diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aeca25c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+openbox/
+openbox_1/
+include.tgz
+lib.tgz
+case.tgz
diff --git a/case.tgz b/case.tgz
deleted file mode 100644
index c89016a..0000000
Binary files a/case.tgz and /dev/null differ
diff --git a/openflow/Makefile b/openflow/Makefile
index e566bc1..ada5719 100644
--- a/openflow/Makefile
+++ b/openflow/Makefile
@@ -1,8 +1,11 @@
-CC=gcc
+CC = arm-linux-gnueabihf-gcc
+
+CFLAGS += -I./include -L./lib
+
+LDLIBS	=  -lofp -lrule -lua -lreg -lpcap -lnet -lpthread  
 
-LDLIBS  =  -lofp -lrule -lua -lreg -lpcap -lnet -lpthread  
 user_openflow:main_user_openflow.c
-	$(CC) -o user_openflow main_user_openflow.c $(LDLIBS)
+	$(CC) $(CFLAGS) -o user_openflow main_user_openflow.c $(LDLIBS)
 	
 clean:
 	rm -rf user_openflow *.o
diff --git a/openflow/include.tgz b/openflow/include.tgz
deleted file mode 100644
index ce2b475..0000000
Binary files a/openflow/include.tgz and /dev/null differ
diff --git a/openflow/include/click/algorithm.hh b/openflow/include/click/algorithm.hh
new file mode 100644
index 0000000..21f3515
--- /dev/null
+++ b/openflow/include/click/algorithm.hh
@@ -0,0 +1,94 @@
+#ifndef CLICK_ALGORITHM_HH
+#define CLICK_ALGORITHM_HH
+CLICK_DECLS
+
+template <typename T>
+inline T *find(T *begin, T *end, const T &val)
+{
+    while (begin < end && *begin != val)
+	++begin;
+    return begin;
+}
+
+template <typename T>
+inline const T *find(const T *begin, const T *end, const T &val)
+{
+    while (begin < end && *begin != val)
+	++begin;
+    return begin;
+}
+
+template <typename T>
+inline void ignore_result(T result)
+{
+    (void) result;
+}
+
+/** @brief Exchange the values of @a a and @a b.
+ *
+ * The generic version constructs a temporary copy of @a a.  Some
+ * specializations avoid this copy. */
+template <typename T>
+inline void click_swap(T &a, T &b)
+{
+    T tmp(a);
+    a = b;
+    b = tmp;
+}
+
+/** @brief Replace @a x with a default-constructed object.
+ *
+ * Unlike @a x.clear(), this function usually frees all memory associated with
+ * @a x. */
+template <typename T>
+inline void clear_by_swap(T &x)
+{
+    T tmp;
+    click_swap(x, tmp);
+}
+
+/** @brief Assign @a x to a copy of @a y, possibly modifying @a y.
+ *
+ * This is like @a x = @a y, except that under certain circumstances
+ * it can modify @a y (for example, by calling @a x.swap(@a y)). */
+template <typename T, typename V>
+inline void assign_consume(T &x, const V &y)
+{
+    x = y;
+}
+
+
+template <typename T, typename U = void> struct do_nothing;
+
+/** @brief Binary function object that does nothing when called. */
+template <typename T, typename U>
+struct do_nothing {
+    typedef T first_argument_type;
+    typedef U second_argument_type;
+    typedef void result_type;
+    void operator()(const T &, const U &) {
+    }
+};
+
+/** @brief Unary function object that does nothing when called. */
+template <typename T>
+struct do_nothing<T, void> {
+    typedef T argument_type;
+    typedef void result_type;
+    void operator()(const T &) {
+    }
+};
+
+/** @brief Function object that encapsulates operator<(). */
+template <typename T>
+struct less {
+    typedef T first_argument_type;
+    typedef T second_argument_type;
+    typedef bool result_type;
+    bool operator()(const T &x, const T &y) {
+	return x < y;
+    }
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/archive.hh b/openflow/include/click/archive.hh
new file mode 100644
index 0000000..7093f04
--- /dev/null
+++ b/openflow/include/click/archive.hh
@@ -0,0 +1,76 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/archive.cc" -*-
+#ifndef CLICK_ARCHIVE_HH
+#define CLICK_ARCHIVE_HH
+#include <click/string.hh>
+#include <click/vector.hh>
+CLICK_DECLS
+class ErrorHandler;
+
+/** @file <click/archive.hh>
+ * @brief Class for handling 'ar' archives. */
+
+/** @class ArchiveElement
+ * @brief Member of an 'ar' archive.
+ *
+ * The ArchiveElement class represents members of ar(1) archives.  Click uses
+ * the simple ar(1) format for passing configurations with additional
+ * information, such as compiled packages and element maps.  An archive member
+ * consists of a name, data, and additional metadata.  Complete archives are
+ * represented as vectors of ArchiveElement objects. */
+struct ArchiveElement {
+
+    String name;		///< Member name (no slashes allowed)
+    int date;			///< Decimal seconds since the epoch (1/1/1970)
+    int uid;			///< User ID of member
+    int gid;			///< Group ID of member
+    int mode;			///< File mode
+    String data;		///< Member contents
+
+    /** @brief Return true iff the member should be included in an archive. */
+    bool live() const {
+	return name;
+    }
+
+    /** @brief Kill a member, preventing it from being archived. */
+    void kill() {
+	name = String();
+    }
+
+    /** @brief Parse a string into a vector of ArchiveElement objects.
+     * @param str input string
+     * @param[out] ar archive elements
+     * @param errh error message receiver
+     * @return 0 on success, < 0 on failure */
+    static int parse(const String &str, Vector<ArchiveElement> &ar,
+		     ErrorHandler *errh = 0);
+
+    /** @brief Unparse a vector of ArchiveElement objects into a string.
+     * @param ar archive elements
+     * @param errh error message receiver
+     * @return archive string, suitable for parse() */
+    static String unparse(const Vector<ArchiveElement> &ar,
+			  ErrorHandler *errh = 0);
+
+    /** @brief Locate an ArchiveElement in an archive by name.
+     * @param ar archive elements
+     * @param name element name
+     * @return pointer to matching archive element, or 0 if none exists */
+    static ArchiveElement *find(Vector<ArchiveElement> &ar, const String &name) {
+	for (ArchiveElement *ae = ar.begin(); ae != ar.end(); ++ae)
+	    if (ae->name == name)
+		return ae;
+	return 0;
+    }
+
+    /** @overload */
+    static const ArchiveElement *find(const Vector<ArchiveElement> &ar, const String &name) {
+	for (const ArchiveElement *ae = ar.begin(); ae != ar.end(); ++ae)
+	    if (ae->name == name)
+		return ae;
+	return 0;
+    }
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/args.hh b/openflow/include/click/args.hh
new file mode 100644
index 0000000..3dec217
--- /dev/null
+++ b/openflow/include/click/args.hh
@@ -0,0 +1,1409 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/args.cc" -*-
+#ifndef CLICK_ARGS_HH
+#define CLICK_ARGS_HH
+#include <click/type_traits.hh>
+#include <click/vector.hh>
+#include <click/string.hh>
+#include <click/confparse.hh>
+#include <click/timestamp.hh>
+#if CLICK_BSDMODULE
+# include <machine/stdarg.h>
+#else
+# include <stdarg.h>
+#endif
+CLICK_DECLS
+class Element;
+class ErrorHandler;
+
+/** @class ArgContext
+  @brief Argument context class.
+
+  The ArgContext class encapsulates state useful for parsing arguments: an
+  element context and an ErrorHandler for reporting parse errors.
+
+  Args is derived from ArgContext.  Some parser functions take an ArgContext
+  reference rather than an Args reference.  This clarifies that the parser
+  function doesn't modify Args internals.  Also, ArgContext objects are smaller
+  and quicker to construct than Args objects.
+*/
+class ArgContext { public:
+
+    /** @brief Construct an argument context.
+     * @param errh optional error handler */
+    ArgContext(ErrorHandler *errh = 0)
+        : _errh(errh), _arg_keyword(0), _read_status(false) {
+#if !CLICK_TOOL
+        _context = 0;
+#endif
+    }
+
+#if !CLICK_TOOL
+    /** @brief Construct an argument context.
+     * @param context optional element context
+     * @param errh optional error handler */
+    ArgContext(const Element *context, ErrorHandler *errh = 0)
+        : _context(context), _errh(errh), _arg_keyword(0), _read_status(false) {
+    }
+
+    /** @brief Return the element context. */
+    const Element *context() const {
+        return _context;
+    }
+#endif
+
+    /** @brief Return the associated error handler. */
+    ErrorHandler *errh() const {
+        return _errh;
+    }
+
+    /** @brief Return a prefix string associated with the current argument.
+     *
+     * If the current argument is keyword FOO, returns "FOO: ". */
+    String error_prefix() const;
+
+    /** @brief Report a parse error for the current argument. */
+    void error(const char *fmt, ...) const;
+
+    /** @brief Report a parse warning for the current argument. */
+    void warning(const char *fmt, ...) const;
+
+    /** @brief Report a message for the current argument. */
+    void message(const char *fmt, ...) const;
+
+    void xmessage(const String &anno, const String &str) const;
+    void xmessage(const String &anno, const char *fmt, va_list val) const;
+
+  protected:
+
+#if !CLICK_TOOL
+    const Element *_context;
+#endif
+    ErrorHandler *_errh;
+    const char *_arg_keyword;
+    mutable bool _read_status;
+
+};
+
+
+/** @cond never */
+template <typename T> struct Args_has_enable_direct_parse {
+  private:
+    template <typename X> static char test(typename X::enable_direct_parse *);
+    template <typename> static int test(...);
+  public:
+    enum { value = (sizeof(test<T>(0)) == 1) };
+};
+template <typename P, bool direct = Args_has_enable_direct_parse<P>::value>
+struct Args_parse_helper;
+template <typename P> struct Args_parse_helper<P, false> {
+    template <typename T, typename A>
+    static inline T *slot(T &variable, A &args) {
+        return args.slot(variable);
+    }
+    template <typename T, typename A>
+    static inline T *initialized_slot(T &variable, A &args) {
+        return args.initialized_slot(variable);
+    }
+    template <typename T, typename A>
+    static inline bool parse(P parser, const String &str, T &s, A &args) {
+        return parser.parse(str, s, args);
+    }
+    template <typename T1, typename T2, typename A>
+    static inline bool parse(P parser, const String &str, T1 &s1, T2 &s2, A &args) {
+        return parser.parse(str, s1, s2, args);
+    }
+};
+template <typename P> struct Args_parse_helper<P, true> {
+    template <typename T, typename A>
+    static inline T *slot(T &variable, A &) {
+        return &variable;
+    }
+    template <typename T, typename A>
+    static inline T *initialized_slot(T &variable, A &) {
+        return &variable;
+    }
+    template <typename T, typename A>
+    static inline bool parse(P parser, const String &str, T &s, A &args) {
+        return parser.direct_parse(str, s, args);
+    }
+    template <typename T1, typename T2, typename A>
+    static inline bool parse(P parser, const String &str, T1 &s1, T2 &s2, A &args) {
+        return parser.direct_parse(str, s1, s2, args);
+    }
+};
+/** @endcond never */
+
+
+/** @class Args
+  @brief Argument parser class.
+
+  Args parses Click configuration strings in a type-safe manner.
+
+  Args manages <em>arguments</em> and <em>result slots</em>. Arguments are
+  strings to be parsed and result slots are parsed values.
+
+  The read() functions parse arguments into result slots.
+
+  @code
+  Args args;
+  args.push_back("A 1"); // add argument
+
+  int a_result;
+  args.read("A", a_result); // parse "A" into a result slot
+  @endcode
+
+  As arguments are parsed, Args marks them off and adds new result slots.
+  Each result slot is paired with a variable belonging to the caller.
+  However, the caller's variables aren't modified until the parse
+  <em>executes</em> via complete(), consume(), or execute().
+
+  @code
+  Args args; args.push_back("A 1");
+
+  int a_result = 0;
+  args.read("A", a_result);
+  assert(a_result == 0);  // parsed value not yet assigned
+  args.execute();         // this call assigns results
+  assert(a_result == 1);
+  @endcode
+
+  If Args encounters a parse error, then execution doesn't modify
+  <em>any</em> of the caller's variables.
+
+  @code
+  Args args; args.push_back("A 1, B NOT_AN_INTEGER");
+
+  int a_result = 0, b_result = 0;
+  args.read("A", a_result)   // succeeds
+      .read("B", b_result)   // fails, since B is not an integer
+      .execute();
+  assert(a_result == 0 && b_result == 0);
+  @endcode
+
+  Each read() function comes in five variants. read() reads an optional
+  keyword argument. read_m() reads a mandatory keyword argument: if the
+  argument was not supplied, Args will report a parse error. read_p() reads
+  an optional positional argument. If the keyword was not supplied, but a
+  positional argument was, that is used. read_mp() reads a mandatory
+  positional argument. Positional arguments are parsed in order. The fifth
+  variant of read() takes an integer <em>flags</em> argument; flags include
+  Args::positional, Args::mandatory, and others, such as Args::deprecated.
+
+  The complete() execution method checks that every argument has been
+  successfully parsed and reports an error if not.  consume()
+  doesn't check for completion, but removes parsed arguments from the
+  argument set.  Execution methods return 0 on success and <0 on failure.
+  You can check the parse status before execution using status().
+
+  Args methods are designed to chain. All read() methods (and some others)
+  return a reference to the Args itself. It is often possible to parse a
+  whole set of arguments using a single temporary Args. For example:
+
+  @code
+  Vector<String> conf;
+  conf.push_back("A 1");
+  conf.push_back("B 2");
+
+  int a, b;
+  if (Args(conf).read("A", a)
+      .read("B", b)
+      .complete() >= 0)
+      click_chatter("Success! a=%d, b=%d", a, b);
+  @endcode
+
+  The actual work of parsing is handled by <em>parser objects</em>. Many
+  common variable types have default parsers defined by the DefaultArg<T>
+  template. For example, the default parser for an integer value understands
+  the common textual representations of integers. You can also pass a parser
+  explicitly. For example:
+
+  @code
+  int a, b, c;
+  args.read("A", a)      // parse A using DefaultArg<int> = IntArg()
+      .read("B", IntArg(2), b);   // parse B using IntArg(2): base-2
+  @endcode
+
+  Args generally calls a parser object's parse() method with three arguments:
+
+  <ol>
+  <li>const String &<b>str</b>: The string to be parsed.</li>
+  <li>T &<b>result</b>: A reference to the result.  The parsed value, if any,
+     should be stored here.  (This points to storage local to Args, not to
+     the caller's variable.)</li>
+  <li>Args &<b>args</b>: A reference to the calling Args object, for error
+     reporting.</li>
+  </ol>
+
+  The parse() method should return true if the parse succeeds and false if it
+  fails.  Type-specific error messages should be reported using methods like
+  <b>args</b>.error().  For generic errors, the parse() method can simply
+  return false; Args will generate a "KEYWORD: parse error" message.
+
+  Most parsers are <em>disciplined</em>, meaning that they modify
+  <b>result</b> only if the parse succeeds. This doesn't matter in the
+  context of Args, but can matter to users who call a parse function
+  directly.
+*/
+class Args : public ArgContext {
+    struct Slot;
+
+  public:
+
+    /** @brief Construct an argument parser.
+     * @param errh optional error handler */
+    Args(ErrorHandler *errh = 0);
+
+    /** @brief Construct an argument parser parsing a copy of @a conf.
+     * @param conf list of configuration arguments
+     * @param errh optional error handler */
+    Args(const Vector<String> &conf, ErrorHandler *errh = 0);
+
+#if !CLICK_TOOL
+    /** @brief Construct an argument parser.
+     * @param context optional element context
+     * @param errh optional error handler */
+    Args(const Element *context, ErrorHandler *errh = 0);
+
+    /** @brief Construct an argument parser parsing a copy of @a conf.
+     * @param conf list of configuration arguments
+     * @param context optional element context
+     * @param errh optional error handler */
+    Args(const Vector<String> &conf, const Element *context,
+         ErrorHandler *errh = 0);
+#endif
+
+
+
+    /** @brief Copy construct an argument parser.
+     * @note @a x's results are not copied. */
+    Args(const Args &x);
+
+    ~Args();
+
+    /** @brief Assign to a copy of @a x.
+     * @pre results_empty() && @a x.results_empty() */
+    Args &operator=(const Args &x);
+
+
+    /** @brief Return true iff this parser has no arguments or results. */
+    bool empty() const {
+        return (!_conf || !_conf->size()) && !_slots && _simple_slotbuf[0] == 0;
+    }
+
+    /** @brief Return true iff this parser has no results. */
+    bool results_empty() const {
+        return !_slots && _simple_slotbuf[0] == 0;
+    }
+
+
+    /** @brief Remove all arguments.
+     * @return *this */
+    Args &clear() {
+        if (_conf)
+            _conf->clear();
+        _kwpos.clear();
+        return *this;
+    }
+
+    /** @brief Bind this parser's arguments to @a conf.
+     * @param conf reference to new arguments
+     * @return *this
+     * @post This Args shares @a conf with the caller.
+     * For instance, consume() will modify @a conf. */
+    Args &bind(Vector<String> &conf);
+
+    /** @brief Append argument @a arg to this parser.
+     * @return *this */
+    Args &push_back(const String &arg);
+
+    /** @brief Append arguments in the range [@a begin, @a end) to this parser.
+     * @return *this */
+    template<typename Iter> Args &push_back(Iter begin, Iter end) {
+        while (begin != end) {
+            push_back(*begin);
+            ++begin;
+        }
+        return *this;
+    }
+
+    /** @brief Append the space-separated words in @a str to this parser.
+     * @return *this */
+    Args &push_back_words(const String &str);
+
+    /** @brief Append the comma-separated arguments in @a str to this parser.
+     * @return *this */
+    Args &push_back_args(const String &str);
+
+    /** @brief Reset the parse status for every argument.
+     * @return *this
+     *
+     * For example:
+     * @code
+     * Vector<String> conf; conf.push_back("1"); conf.push_back("2");
+     * int a, b;
+     * Args(conf).read_p("A", a).read_p("B", b).execute();
+     * assert(a == 1 && b == 2);
+     * Args(conf).read_p("A", a).reset().read_p("B", b).execute();
+     * assert(a == 1 && b == 1);
+     * @endcode
+     * Results are not affected. */
+    Args &reset() {
+        reset_from(0);
+        return *this;
+    }
+
+
+    static constexpr int mandatory = 1;  ///< read flag for mandatory arguments
+    static constexpr int positional = 2; ///< read flag for positional arguments
+    static constexpr int deprecated = 4; ///< read flag for deprecated arguments
+    static constexpr int firstmatch = 8; ///< read flag to take first matching argument
+
+    /** @brief Read an argument using its type's default parser.
+     * @param keyword argument name
+     * @param x reference to result
+     * @return *this
+     *
+     * Creates a result slot for @a x and calls
+     * DefaultArg<T>().parse(string, result, *this). */
+    template <typename T>
+    Args &read(const char *keyword, T &x) {
+        return read(keyword, 0, x);
+    }
+    template <typename T>
+    Args &read_m(const char *keyword, T &x) {
+        return read(keyword, mandatory, x);
+    }
+    template <typename T>
+    Args &read_p(const char *keyword, T &x) {
+        return read(keyword, positional, x);
+    }
+    template <typename T>
+    Args &read_mp(const char *keyword, T &x) {
+        return read(keyword, mandatory | positional, x);
+    }
+    template <typename T>
+    Args &read(const char *keyword, int flags, T &x) {
+        args_base_read(this, keyword, flags, x);
+        return *this;
+    }
+
+    /** @brief Read an argument using the default parser, or set it to a
+     *    default value if the argument is was not supplied.
+     * @param keyword argument name
+     * @param x reference to result
+     * @param default_value default value
+     * @return *this
+     *
+     * Creates a result slot for @a x. If @a keyword was supplied, calls
+     * DefaultArg<T>().parse(string, result, this). Otherwise, assigns the
+     * result to @a value. */
+    template <typename T, typename V>
+    Args &read_or_set(const char *keyword, T &x, const V &default_value) {
+        return read_or_set(keyword, 0, x, default_value);
+    }
+    template <typename T, typename V>
+    Args &read_or_set_p(const char *keyword, T &x, const V &default_value) {
+        return read_or_set(keyword, positional, x, default_value);
+    }
+    template <typename T, typename V>
+    Args &read_or_set(const char *keyword, int flags, T &x, const V &default_value) {
+        args_base_read_or_set(this, keyword, flags, x, default_value);
+        return *this;
+    }
+
+    /** @brief Read an argument using a specified parser.
+     * @param keyword argument name
+     * @param parser parser object
+     * @param x reference to result
+     * @return *this
+     *
+     * Creates a result slot for @a x and calls @a parser.parse(string,
+     * result, *this). */
+    template <typename P, typename T>
+    Args &read(const char *keyword, P parser, T &x) {
+        return read(keyword, 0, parser, x);
+    }
+    template <typename P, typename T>
+    Args &read_m(const char *keyword, P parser, T &x) {
+        return read(keyword, mandatory, parser, x);
+    }
+    template <typename P, typename T>
+    Args &read_p(const char *keyword, P parser, T &x) {
+        return read(keyword, positional, parser, x);
+    }
+    template <typename P, typename T>
+    Args &read_mp(const char *keyword, P parser, T &x) {
+        return read(keyword, mandatory | positional, parser, x);
+    }
+    template <typename P, typename T>
+    Args &read(const char *keyword, int flags, P parser, T &x) {
+        args_base_read(this, keyword, flags, parser, x);
+        return *this;
+    }
+
+    /** @brief Read an argument using a specified parser, or set it to a
+     *    default value if the argument is was not supplied.
+     * @param keyword argument name
+     * @param parser parser object
+     * @param x reference to result variable
+     * @param default_value default value
+     * @return *this
+     *
+     * Creates a result slot for @a x. If argument @a keyword was supplied,
+     * calls @a parser.parse(string, result, *this). Otherwise, assigns the
+     * result to @a default_value. */
+    template <typename P, typename T, typename V>
+    Args &read_or_set(const char *keyword, P parser, T &x, const V &default_value) {
+        return read_or_set(keyword, 0, parser, x, default_value);
+    }
+    template <typename P, typename T, typename V>
+    Args &read_or_set_p(const char *keyword, P parser, T &x, const V &default_value) {
+        return read_or_set(keyword, positional, parser, x, default_value);
+    }
+    template <typename P, typename T, typename V>
+    Args &read_or_set(const char *keyword, int flags, P parser, T &x, const V &default_value) {
+        args_base_read_or_set(this, keyword, flags, parser, x, default_value);
+        return *this;
+    }
+
+    /** @brief Read an argument using a specified parser with two results.
+     * @param keyword argument name
+     * @param parser parser object
+     * @param x1 reference to first result
+     * @param x2 reference to second result
+     * @return *this
+     *
+     * Creates results for @a x1 and @a x2 and calls @a parser.parse(string,
+     * result1, result2, *this). */
+    template<typename P, typename T1, typename T2>
+    Args &read(const char *keyword, P parser, T1 &x1, T2 &x2) {
+        return read(keyword, 0, parser, x1, x2);
+    }
+    template<typename P, typename T1, typename T2>
+    Args &read_m(const char *keyword, P parser, T1 &x1, T2 &x2) {
+        return read(keyword, mandatory, parser, x1, x2);
+    }
+    template<typename P, typename T1, typename T2>
+    Args &read_p(const char *keyword, P parser, T1 &x1, T2 &x2) {
+        return read(keyword, positional, parser, x1, x2);
+    }
+    template<typename P, typename T1, typename T2>
+    Args &read_mp(const char *keyword, P parser, T1 &x1, T2 &x2) {
+        return read(keyword, mandatory | positional, parser, x1, x2);
+    }
+    template<typename P, typename T1, typename T2>
+    Args &read(const char *keyword, int flags, P parser, T1 &x1, T2 &x2) {
+        args_base_read(this, keyword, flags, parser, x1, x2);
+        return *this;
+    }
+
+    /** @brief Pass an argument to a specified parser.
+     * @param keyword argument name
+     * @param parser parser object
+     * @return *this
+     *
+     * Calls @a parser.parse(string, *this). */
+    template <typename P>
+    Args &read_with(const char *keyword, P parser) {
+        return read_with(keyword, 0, parser);
+    }
+    template <typename P>
+    Args &read_m_with(const char *keyword, P parser) {
+        return read_with(keyword, mandatory, parser);
+    }
+    template <typename P>
+    Args &read_p_with(const char *keyword, P parser) {
+        return read_with(keyword, positional, parser);
+    }
+    template <typename P>
+    Args &read_mp_with(const char *keyword, P parser) {
+        return read_with(keyword, mandatory | positional, parser);
+    }
+    template <typename P>
+    Args &read_with(const char *keyword, int flags, P parser) {
+        args_base_read_with(this, keyword, flags, parser);
+        return *this;
+    }
+
+    /** @brief Pass an argument to a specified parser.
+     * @param keyword argument name
+     * @param parser parser object
+     * @param x reference to result
+     * @return *this
+     *
+     * Creates a result slot for @a x and calls @a parser.parse(string,
+     * result, *this).
+     *
+     * @deprecated Use read(keyword, parser, variable) instead. */
+    template <typename P, typename T>
+    Args &read_with(const char *keyword, P parser, T &x) {
+        return read(keyword, parser, x);
+    }
+    template <typename P, typename T>
+    Args &read_m_with(const char *keyword, P parser, T &x) {
+        return read_m(keyword, parser, x);
+    }
+    template <typename P, typename T>
+    Args &read_p_with(const char *keyword, P parser, T &x) {
+        return read_p(keyword, parser, x);
+    }
+    template <typename P, typename T>
+    Args &read_mp_with(const char *keyword, P parser, T &x) {
+        return read_mp(keyword, parser, x);
+    }
+    template <typename P, typename T>
+    Args &read_with(const char *keyword, int flags, P parser, T &x) {
+        return read(keyword, flags, parser, x);
+    }
+
+    /** @brief Pass all matching arguments to a specified parser.
+     * @param keyword argument name
+     * @param parser parser object
+     * @return *this
+     *
+     * Calls @a parser.parse(string, *this) zero or more times.
+     *
+     * @note The value of read_status() is true iff at least one argument
+     * matched and all matching arguments successfully parsed. */
+    template <typename P>
+    Args &read_all_with(const char *keyword, P parser) {
+        return read_all_with(keyword, 0, parser);
+    }
+    template <typename P>
+    Args &read_all_with(const char *keyword, int flags, P parser) {
+        args_base_read_all_with(this, keyword, flags | firstmatch, parser);
+        return *this;
+    }
+
+    /** @brief Pass all matching arguments to a specified parser.
+     * @param keyword argument name
+     * @param parser parser object
+     * @param x reference to result
+     * @return *this
+     *
+     * Creates a result for @a x and calls @a parser.parse(string, result,
+     * *this) zero or more times, once per matching argument.
+     *
+     * @note The value of read_status() is true iff at least one argument
+     * matched and all matching arguments successfully parsed. */
+    template <typename P, typename T>
+    Args &read_all_with(const char *keyword, P parser, T &x) {
+        return read_all_with(keyword, 0, parser, x);
+    }
+    template <typename P, typename T>
+    Args &read_all_with(const char *keyword, int flags, P parser, T &x) {
+        args_base_read_all_with(this, keyword, flags | firstmatch, parser, x);
+        return *this;
+    }
+
+    /** @brief Pass all matching arguments to a specified parser.
+     * @param keyword argument name
+     * @param parser parser object
+     * @param x reference to vector of results
+     * @return *this
+     *
+     * For each @a keyword argument, calls @a parser.parse(string, value,
+     * *this). The resulting values are collected into a vector result slot
+     * for @a x.
+     *
+     * @note The value of read_status() is true iff at least one argument
+     * matched and all matching arguments successfully parsed. */
+    template <typename P, typename T>
+    Args &read_all(const char *keyword, P parser, Vector<T> &x) {
+        return read_all(keyword, 0, parser, x);
+    }
+    template <typename T>
+    Args &read_all(const char *keyword, Vector<T> &x) {
+        return read_all(keyword, 0, DefaultArg<T>(), x);
+    }
+    template <typename P, typename T>
+    Args &read_all(const char *keyword, int flags, P parser, Vector<T> &x) {
+        args_base_read_all(this, keyword, flags | firstmatch, parser, x);
+        return *this;
+    }
+    template <typename P, typename T>
+    Args &read_all(const char *keyword, int flags, Vector<T> &x) {
+        return read_all(keyword, flags, DefaultArg<T>(), x);
+    }
+
+
+    /** @brief Return the current parse status. */
+    bool status() const {
+        return _status;
+    }
+    /** @brief Set @a x to the current parse status.
+     * @return *this */
+    Args &status(bool &x) {
+        x = _status;
+        return *this;
+    }
+    /** @overload */
+    const Args &status(bool &x) const {
+        x = _status;
+        return *this;
+    }
+
+    /** @brief Return true iff the last read request succeeded.
+     *
+     * This function should only be called after a read. */
+    bool read_status() const {
+        return _read_status;
+    }
+    /** @brief Set @a x to the success status of the last read request.
+     *
+     * This function should only be called after a read. */
+    Args &read_status(bool &x) {
+        x = _read_status;
+        return *this;
+    }
+    /** @overload */
+    const Args &read_status(bool &x) const {
+        x = _read_status;
+        return *this;
+    }
+
+
+    /** @brief Remove all arguments matched so far. */
+    Args &strip();
+
+    /** @brief Assign results.
+     * @return 0 if the parse succeeded, <0 otherwise
+     * @post results_empty()
+     *
+     * Results are only assigned if status() is true (the parse is successful
+     * so far).  Clears results as a side effect. */
+    int execute();
+
+    /** @brief Assign results and remove matched arguments.
+     * @return 0 if the parse succeeded, <0 otherwise
+     * @post results_empty()
+     *
+     * Matched arguments are always removed.  Results are only assigned if
+     * status() is true (the parse is successful so far).  Clears results as a
+     * side effect. */
+    int consume();
+
+    /** @brief Assign results if all arguments matched.
+     * @return 0 if the parse succeeded, <0 otherwise
+     * @post results_empty()
+     *
+     * Results are only assigned if status() is true (the parse is successful
+     * so far) and all arguments have been parsed.  Clears results as a side
+     * effect. */
+    int complete();
+
+
+    /** @brief Create and return a result slot for @a x.
+     *
+     * If T is a trivially copyable type, such as int, then the resulting
+     * slot might not be initialized. */
+    template <typename T>
+    T *slot(T &x) {
+        if (has_trivial_copy<T>::value)
+            return reinterpret_cast<T *>(simple_slot(&x, sizeof(T)));
+        else
+            return complex_slot(x);
+    }
+
+    /** @brief Create and return a result slot for @a x.
+     *
+     * The resulting slot is always default-initialized. */
+    template <typename T>
+    T *initialized_slot(T &x) {
+        T *s = slot(x);
+        if (has_trivial_copy<T>::value)
+            *s = T();
+        return s;
+    }
+
+    /** @brief Add a result that assigns @a x to @a value.
+     * @return *this */
+    template <typename T, typename V>
+    Args &set(T &x, const V &value) {
+        if (T *s = slot(x))
+            *s = value;
+        return *this;
+    }
+
+
+    /** @cond never */
+    template<typename T>
+    void base_read(const char *keyword, int flags, T &variable) {
+        Slot *slot_status;
+        if (String str = find(keyword, flags, slot_status)) {
+            T *s = Args_parse_helper<DefaultArg<T> >::slot(variable, *this);
+            postparse(s && Args_parse_helper<DefaultArg<T> >::parse(DefaultArg<T>(), str, *s, *this), slot_status);
+        }
+    }
+
+    template<typename T, typename V>
+    void base_read_or_set(const char *keyword, int flags, T &variable, const V &value) {
+        Slot *slot_status;
+        String str = find(keyword, flags, slot_status);
+        T *s = Args_parse_helper<DefaultArg<T> >::slot(variable, *this);
+        postparse(s && (str ? Args_parse_helper<DefaultArg<T> >::parse(DefaultArg<T>(), str, *s, *this) : (*s = value, true)), slot_status);
+    }
+
+    template<typename P, typename T>
+    void base_read(const char *keyword, int flags, P parser, T &variable) {
+        Slot *slot_status;
+        if (String str = find(keyword, flags, slot_status)) {
+            T *s = Args_parse_helper<P>::slot(variable, *this);
+            postparse(s && Args_parse_helper<P>::parse(parser, str, *s, *this), slot_status);
+        }
+    }
+
+    template<typename T, typename P, typename V>
+    void base_read_or_set(const char *keyword, int flags, P parser, T &variable, const V &value) {
+        Slot *slot_status;
+        String str = find(keyword, flags, slot_status);
+        T *s = Args_parse_helper<P>::slot(variable, *this);
+        postparse(s && (str ? Args_parse_helper<P>::parse(parser, str, *s, *this) : (*s = value, true)), slot_status);
+    }
+
+    template<typename P, typename T1, typename T2>
+    void base_read(const char *keyword, int flags,
+                   P parser, T1 &variable1, T2 &variable2) {
+        Slot *slot_status;
+        if (String str = find(keyword, flags, slot_status)) {
+            T1 *s1 = Args_parse_helper<P>::slot(variable1, *this);
+            T2 *s2 = Args_parse_helper<P>::slot(variable2, *this);
+            postparse(s1 && s2 && Args_parse_helper<P>::parse(parser, str, *s1, *s2, *this), slot_status);
+        }
+    }
+
+    template<typename P>
+    void base_read_with(const char *keyword, int flags, P parser) {
+        Slot *slot_status;
+        if (String str = find(keyword, flags, slot_status))
+            postparse(parser.parse(str, *this), slot_status);
+    }
+
+    template<typename P>
+    void base_read_all_with(const char *keyword, int flags, P parser) {
+        Slot *slot_status;
+        int read_status = -1;
+        while (String str = find(keyword, flags, slot_status)) {
+            postparse(parser.parse(str, *this), slot_status);
+            read_status = (read_status != 0) && _read_status;
+            flags &= ~mandatory;
+        }
+        _read_status = (read_status == 1);
+    }
+
+    template<typename P, typename T>
+    void base_read_all_with(const char *keyword, int flags, P parser, T &variable) {
+        Slot *slot_status;
+        int read_status = -1;
+        T *s = Args_parse_helper<P>::initialized_slot(variable, *this);
+        while (String str = find(keyword, flags, slot_status)) {
+            postparse(s && Args_parse_helper<P>::parse(parser, str, *s, *this), slot_status);
+            read_status = (read_status != 0) && _read_status;
+            flags &= ~mandatory;
+        }
+        _read_status = (read_status == 1);
+    }
+
+    template<typename P, typename T>
+    void base_read_all(const char *keyword, int flags, P parser, Vector<T> &variable) {
+        Slot *slot_status;
+        int read_status = -1;
+        Vector<T> *s = slot(variable);
+        while (String str = find(keyword, flags, slot_status)) {
+            T sx = T();
+            postparse(parser.parse(str, sx, *this), slot_status);
+            if (_read_status)
+                s->push_back(sx);
+            read_status = (read_status != 0) && _read_status;
+            flags &= ~mandatory;
+        }
+        _read_status = (read_status == 1);
+    }
+    /** @endcond never */
+
+  private:
+
+    struct Slot {
+        Slot() {
+        }
+        virtual ~Slot() {
+        }
+        virtual void store() = 0;
+        Slot *_next;
+    };
+
+    struct BytesSlot : public Slot {
+        BytesSlot(void *ptr, size_t size)
+            : _ptr(ptr), _slot(new char[size]), _size(size) {
+        }
+        ~BytesSlot() {
+            delete[] _slot;
+        }
+        void store() {
+            memcpy(_ptr, _slot, _size);
+        }
+        void *_ptr;
+        char *_slot;
+        size_t _size;
+    };
+
+    template<typename T>
+    struct SlotT : public Slot {
+        SlotT(T *ptr)
+            : _ptr(ptr) {
+        }
+        void store() {
+            assign_consume(*_ptr, _slot);
+        }
+        T *_ptr;
+        T _slot;
+    };
+
+    enum {
+#if SIZEOF_VOID_P == 4
+        simple_slotbuf_size = 24
+#else
+        simple_slotbuf_size = 48
+#endif
+    };
+
+#if !CLICK_DEBUG_ARGS_USAGE
+    bool _my_conf;
+#else
+    bool _my_conf : 1;
+    bool _consumed : 1;
+#endif
+    bool _status;
+    uint8_t _simple_slotpos;
+
+    Vector<String> *_conf;
+    Vector<int> _kwpos;
+
+    Slot *_slots;
+    uint8_t _simple_slotbuf[simple_slotbuf_size];
+
+    inline void initialize(const Vector<String> *conf);
+    void reset_from(int i);
+
+    String find(const char *keyword, int flags, Slot *&slot_status);
+    void postparse(bool ok, Slot *slot_status);
+    void check_complete();
+
+    static inline int simple_slot_size(int size);
+    inline void simple_slot_info(int offset, int size,
+                                 void *&slot, void **&pointer);
+    void *simple_slot(void *data, size_t size);
+    template<typename T> T *complex_slot(T &variable);
+
+};
+
+extern const ArgContext blank_args;
+
+
+template<typename T>
+struct DefaultArg {
+};
+
+template<typename T>
+T *Args::complex_slot(T &variable)
+{
+    if (SlotT<T> *s = new SlotT<T>(&variable)) {
+        s->_next = _slots;
+        _slots = s;
+        return &s->_slot;
+    } else {
+        error("out of memory");
+        return 0;
+    }
+}
+
+
+/** @cond never */
+/* These functions are here because some GCC versions ignore noinline
+   attributes on member function templates. */
+template<typename T>
+void args_base_read(Args *args, const char *keyword, int flags, T &variable)
+    CLICK_NOINLINE;
+template<typename T>
+void args_base_read(Args *args, const char *keyword, int flags, T &variable)
+{
+    args->base_read(keyword, flags, variable);
+}
+
+template<typename T, typename V>
+void args_base_read_or_set(Args *args, const char *keyword, int flags,
+                           T &variable, const V &value) CLICK_NOINLINE;
+template<typename T, typename V>
+void args_base_read_or_set(Args *args, const char *keyword, int flags,
+                           T &variable, const V &value)
+{
+    args->base_read_or_set(keyword, flags, variable, value);
+}
+
+template<typename P, typename T>
+void args_base_read(Args *args, const char *keyword, int flags,
+                    P parser, T &variable) CLICK_NOINLINE;
+template<typename P, typename T>
+void args_base_read(Args *args, const char *keyword, int flags,
+                    P parser, T &variable)
+{
+    args->base_read(keyword, flags, parser, variable);
+}
+
+template<typename P, typename T, typename V>
+void args_base_read_or_set(Args *args, const char *keyword, int flags,
+                           P parser, T &variable, const V &value) CLICK_NOINLINE;
+template<typename P, typename T, typename V>
+void args_base_read_or_set(Args *args, const char *keyword, int flags,
+                           P parser, T &variable, const V &value)
+{
+    args->base_read_or_set(keyword, flags, parser, variable, value);
+}
+
+template<typename P, typename T1, typename T2>
+void args_base_read(Args *args, const char *keyword, int flags,
+                    P parser, T1 &variable1, T2 &variable2) CLICK_NOINLINE;
+template<typename P, typename T1, typename T2>
+void args_base_read(Args *args, const char *keyword, int flags,
+                    P parser, T1 &variable1, T2 &variable2)
+{
+    args->base_read(keyword, flags, parser, variable1, variable2);
+}
+
+template<typename P>
+void args_base_read_with(Args *args, const char *keyword, int flags, P parser)
+    CLICK_NOINLINE;
+template<typename P>
+void args_base_read_with(Args *args, const char *keyword, int flags, P parser)
+{
+    args->base_read_with(keyword, flags, parser);
+}
+
+template<typename P>
+void args_base_read_all_with(Args *args, const char *keyword, int flags, P parser)
+    CLICK_NOINLINE;
+template<typename P>
+void args_base_read_all_with(Args *args, const char *keyword, int flags, P parser)
+{
+    args->base_read_all_with(keyword, flags, parser);
+}
+
+template<typename P, typename T>
+void args_base_read_all_with(Args *args, const char *keyword, int flags,
+                             P parser, T &variable) CLICK_NOINLINE;
+template<typename P, typename T>
+void args_base_read_all_with(Args *args, const char *keyword, int flags,
+                             P parser, T &variable)
+{
+    args->base_read_all_with(keyword, flags, parser, variable);
+}
+
+template <typename P, typename T>
+void args_base_read_all(Args *args, const char *keyword, int flags,
+                        P parser, Vector<T> &variable) CLICK_NOINLINE;
+template <typename P, typename T>
+void args_base_read_all(Args *args, const char *keyword, int flags,
+                        P parser, Vector<T> &variable)
+{
+    args->base_read_all(keyword, flags, parser, variable);
+}
+/** @endcond never */
+
+
+class NumArg { public:
+    enum {
+        status_ok = 0,
+        status_inval = EINVAL,
+        status_range = ERANGE,
+#if defined(ENOTSUP)
+        status_notsup = ENOTSUP,
+#elif defined(ENOTSUPP)
+        status_notsup = ENOTSUPP,
+#else
+        status_notsup,
+#endif
+        status_unitless
+    };
+};
+
+
+/** @class IntArg
+  @brief Parser class for integers.
+
+  IntArg(@a base) reads integers in base @a base.  @a base defaults to 0,
+  which means arguments are parsed in base 10 by default, but prefixes 0x, 0,
+  and 0b parse hexadecimal, octal, and binary numbers, respectively.
+
+  Integer overflow is treated as an error.
+
+  @sa SaturatingIntArg, BoundedIntArg */
+class IntArg : public NumArg { public:
+
+    typedef uint32_t limb_type;
+
+    IntArg(int b = 0)
+        : base(b) {
+    }
+
+    const char *parse(const char *begin, const char *end,
+                      bool is_signed, int size,
+                      limb_type *value, int nlimb);
+
+    template<typename V>
+    bool parse_saturating(const String &str, V &result, const ArgContext &args = blank_args) {
+        constexpr bool is_signed = integer_traits<V>::is_signed;
+        constexpr int nlimb = int((sizeof(V) + sizeof(limb_type) - 1) / sizeof(limb_type));
+        limb_type x[nlimb];
+        if (parse(str.begin(), str.end(), is_signed, int(sizeof(V)), x, nlimb)
+            != str.end())
+            status = status_inval;
+        if (status && status != status_range) {
+            args.error("invalid number");
+            return false;
+        }
+        typedef typename make_unsigned<V>::type unsigned_v_type;
+        extract_integer(x, reinterpret_cast<unsigned_v_type &>(result));
+        return true;
+    }
+
+    template<typename V>
+    bool parse(const String &str, V &result, const ArgContext &args = blank_args) {
+        V x;
+        if (!parse_saturating(str, x, args)
+            || (status && status != status_range))
+            return false;
+        else if (status == status_range) {
+            range_error(args, integer_traits<V>::is_signed,
+                        click_int_large_t(x));
+            return false;
+        } else {
+            result = x;
+            return true;
+        }
+    }
+
+    int base;
+    int status;
+
+  protected:
+
+    static const char *span(const char *begin, const char *end,
+                            bool is_signed, int &b);
+    void range_error(const ArgContext &args, bool is_signed,
+                     click_int_large_t value);
+
+};
+
+/** @class SaturatingIntArg
+  @brief Parser class for integers with saturating overflow.
+
+  SaturatingIntArg(@a base) is like IntArg(@a base), but integer overflow is
+  not an error; instead, the closest representable value is returned.
+
+  @sa IntArg */
+class SaturatingIntArg : public IntArg { public:
+    SaturatingIntArg(int b = 0)
+        : IntArg(b) {
+    }
+
+    template<typename V>
+    bool parse(const String &str, V &result, const ArgContext &args = blank_args) {
+        return parse_saturating(str, result, args);
+    }
+};
+
+/** @class BoundedIntArg
+  @brief Parser class for integers with explicit bounds.
+
+  BoundedIntArg(@a min, @a max, @a base) is like IntArg(@a base), but numbers
+  less than @a min or greater than @a max are treated as errors.
+
+  @sa IntArg */
+class BoundedIntArg : public IntArg { public:
+    template <typename T>
+    BoundedIntArg(T min_value, T max_value, int b = 0)
+        : IntArg(b), min_value(min_value), max_value(max_value) {
+        static_assert(integer_traits<T>::is_integral, "BoundedIntArg argument must be integral");
+        is_signed = integer_traits<T>::is_signed;
+    }
+
+    template <typename V>
+    bool parse(const String &str, V &result, const ArgContext &args = blank_args) {
+        V x;
+        if (!IntArg::parse(str, x, args))
+            return false;
+        else if (!check_min(typename integer_traits<V>::max_type(x))) {
+            range_error(args, is_signed, min_value);
+            return false;
+        } else if (!check_max(typename integer_traits<V>::max_type(x))) {
+            range_error(args, is_signed, max_value);
+            return false;
+        } else {
+            result = x;
+            return true;
+        }
+    }
+
+    inline bool check_min(click_int_large_t x) const {
+        if (is_signed)
+            return x >= min_value;
+        else
+            return x >= 0 && click_uint_large_t(x) >= click_uint_large_t(min_value);
+    }
+    inline bool check_min(click_uint_large_t x) const {
+        if (is_signed)
+            return min_value < 0 || x >= click_uint_large_t(min_value);
+        else
+            return click_uint_large_t(x) >= click_uint_large_t(min_value);
+    }
+    inline bool check_max(click_int_large_t x) const {
+        if (is_signed)
+            return x <= max_value;
+        else
+            return x >= 0 && click_uint_large_t(x) <= click_uint_large_t(max_value);
+    }
+    inline bool check_max(click_uint_large_t x) const {
+        if (is_signed)
+            return max_value >= 0 && x <= click_uint_large_t(max_value);
+        else
+            return click_uint_large_t(x) <= click_uint_large_t(max_value);
+    }
+
+    click_intmax_t min_value;
+    click_intmax_t max_value;
+    bool is_signed;
+};
+
+template<> struct DefaultArg<unsigned char> : public IntArg {};
+template<> struct DefaultArg<signed char> : public IntArg {};
+template<> struct DefaultArg<char> : public IntArg {};
+template<> struct DefaultArg<unsigned short> : public IntArg {};
+template<> struct DefaultArg<short> : public IntArg {};
+template<> struct DefaultArg<unsigned int> : public IntArg {};
+template<> struct DefaultArg<int> : public IntArg {};
+template<> struct DefaultArg<unsigned long> : public IntArg {};
+template<> struct DefaultArg<long> : public IntArg {};
+#if HAVE_LONG_LONG
+template<> struct DefaultArg<unsigned long long> : public IntArg {};
+template<> struct DefaultArg<long long> : public IntArg {};
+#endif
+
+
+/** @class FixedPointArg
+  @brief Parser class for fixed-point numbers with @a b bits of fraction. */
+class FixedPointArg : public NumArg { public:
+    explicit FixedPointArg(int b, int exponent = 0)
+        : fraction_bits(b), exponent_delta(exponent) {
+    }
+    inline bool parse_saturating(const String &str, uint32_t &result, const ArgContext &args = blank_args);
+    bool parse(const String &str, uint32_t &result, const ArgContext &args = blank_args);
+    bool parse_saturating(const String &str, int32_t &result, const ArgContext &args = blank_args);
+    bool parse(const String &str, int32_t &result, const ArgContext &args = blank_args);
+    int fraction_bits;
+    int exponent_delta;
+    int status;
+  private:
+    bool underparse(const String &str, bool is_signed, uint32_t &result);
+};
+
+inline bool
+FixedPointArg::parse_saturating(const String &str, uint32_t &result, const ArgContext &)
+{
+    return underparse(str, false, result);
+}
+
+/** @class DecimalFixedPointArg
+  @brief Parser class for fixed-point numbers with @a d decimal digits of fraction. */
+class DecimalFixedPointArg : public NumArg { public:
+    DecimalFixedPointArg(int d, int exponent = 0)
+        : fraction_digits(d), exponent_delta(exponent) {
+    }
+    inline bool parse_saturating(const String &str, uint32_t &result, const ArgContext &args = blank_args);
+    bool parse(const String &str, uint32_t &result, const ArgContext &args = blank_args);
+    bool parse_saturating(const String &str, int32_t &result, const ArgContext &args = blank_args);
+    bool parse(const String &str, int32_t &result, const ArgContext &args = blank_args);
+    bool parse_saturating(const String &str, uint32_t &iresult, uint32_t &fresult, const ArgContext &args = blank_args);
+    bool parse(const String &str, uint32_t &iresult, uint32_t &fresult, const ArgContext &args = blank_args);
+    int fraction_digits;
+    int exponent_delta;
+    int status;
+  private:
+    bool underparse(const String &str, bool is_signed, uint32_t &result);
+};
+
+inline bool
+DecimalFixedPointArg::parse_saturating(const String &str, uint32_t &result, const ArgContext &)
+{
+    return underparse(str, false, result);
+}
+
+
+#if HAVE_FLOAT_TYPES
+/** @class DoubleArg
+  @brief Parser class for double-precision floating point numbers. */
+class DoubleArg : public NumArg { public:
+    DoubleArg() {
+    }
+    bool parse(const String &str, double &result, const ArgContext &args = blank_args);
+    int status;
+};
+
+template<> struct DefaultArg<double> : public DoubleArg {};
+#endif
+
+
+/** @class BoolArg
+  @brief Parser class for booleans. */
+class BoolArg { public:
+    static bool parse(const String &str, bool &result, const ArgContext &args = blank_args);
+    static String unparse(bool x) {
+        return String(x);
+    }
+};
+
+template<> struct DefaultArg<bool> : public BoolArg {};
+
+
+class UnitArg { public:
+    explicit UnitArg(const char *unit_def, const char *prefix_chars_def)
+        : units_(reinterpret_cast<const unsigned char *>(unit_def)),
+          prefix_chars_(reinterpret_cast<const unsigned char *>(prefix_chars_def)) {
+    }
+    const char *parse(const char *begin, const char *end, int &power, int &factor) const;
+  private:
+    const unsigned char *units_;
+    const unsigned char *prefix_chars_;
+    void check_units();
+};
+
+
+/** @class BandwidthArg
+  @brief Parser class for bandwidth specifications.
+
+  Handles suffixes such as "Gbps", "k", etc. */
+class BandwidthArg : public NumArg { public:
+    bool parse(const String &str, uint32_t &result, const ArgContext & = blank_args);
+    static String unparse(uint32_t x);
+    int status;
+};
+
+
+#if !CLICK_TOOL
+/** @class AnnoArg
+  @brief Parser class for annotation specifications. */
+class AnnoArg { public:
+    AnnoArg(int s)
+        : size(s) {
+    }
+    bool parse(const String &str, int &result, const ArgContext &args = blank_args);
+  private:
+    int size;
+};
+#endif
+
+
+/** @class SecondsArg
+  @brief Parser class for seconds and powers thereof.
+
+  The @a d argument is the number of digits of fraction to parse.
+  For example, to parse milliseconds, use SecondsArg(3). */
+class SecondsArg : public NumArg { public:
+    SecondsArg(int d = 0)
+        : fraction_digits(d) {
+    }
+    bool parse_saturating(const String &str, uint32_t &result, const ArgContext &args = blank_args);
+    bool parse(const String &str, uint32_t &result, const ArgContext &args = blank_args);
+#if HAVE_FLOAT_TYPES
+    bool parse(const String &str, double &result, const ArgContext &args = blank_args);
+#endif
+    int fraction_digits;
+    int status;
+};
+
+
+/** @class AnyArg
+  @brief Parser class that accepts any argument. */
+class AnyArg { public:
+    static bool parse(const String &, const ArgContext & = blank_args) {
+        return true;
+    }
+    static bool parse(const String &str, String &result, const ArgContext & = blank_args) {
+        result = str;
+        return true;
+    }
+    static bool parse(const String &str, Vector<String> &result, const ArgContext & = blank_args) {
+        result.push_back(str);
+        return true;
+    }
+};
+
+
+bool cp_string(const String &str, String *result, String *rest);
+
+/** @class StringArg
+  @brief Parser class for possibly-quoted strings. */
+class StringArg { public:
+    static bool parse(const String &str, String &result, const ArgContext & = blank_args) {
+        return cp_string(str, &result, 0);
+    }
+};
+
+template<> struct DefaultArg<String> : public StringArg {};
+
+
+bool cp_keyword(const String &str, String *result, String *rest);
+
+/** @class KeywordArg
+  @brief Parser class for keywords. */
+class KeywordArg { public:
+    static bool parse(const String &str, String &result, const ArgContext & = blank_args) {
+        return cp_keyword(str, &result, 0);
+    }
+};
+
+
+bool cp_word(const String &str, String *result, String *rest);
+
+/** @class KeywordArg
+  @brief Parser class for words. */
+class WordArg { public:
+    static bool parse(const String &str, String &result, const ArgContext & = blank_args) {
+        return cp_word(str, &result, 0);
+    }
+};
+
+
+#if CLICK_USERLEVEL || CLICK_TOOL
+/** @class FilenameArg
+  @brief Parser class for filenames. */
+class FilenameArg { public:
+    static bool parse(const String &str, String &result, const ArgContext &args = blank_args);
+};
+#endif
+
+
+#if !CLICK_TOOL
+/** @class ElementArg
+  @brief Parser class for elements. */
+class ElementArg { public:
+    static bool parse(const String &str, Element *&result, const ArgContext &args);
+};
+
+template<> struct DefaultArg<Element *> : public ElementArg {};
+
+/** @class ElementCastArg
+  @brief Parser class for elements of type @a t. */
+class ElementCastArg { public:
+    ElementCastArg(const char *t)
+        : type(t) {
+    }
+    bool parse(const String &str, Element *&result, const ArgContext &args);
+    template<typename T> bool parse(const String &str, T *&result, const ArgContext &args) {
+        return parse(str, reinterpret_cast<Element *&>(result), args);
+    }
+    const char *type;
+};
+#endif
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/array_memory.hh b/openflow/include/click/array_memory.hh
new file mode 100644
index 0000000..172a72b
--- /dev/null
+++ b/openflow/include/click/array_memory.hh
@@ -0,0 +1,121 @@
+#ifndef CLICK_ARRAY_MEMORY_HH
+#define CLICK_ARRAY_MEMORY_HH 1
+#include <click/glue.hh>
+#include <click/type_traits.hh>
+#if HAVE_VALGRIND && HAVE_VALGRIND_MEMCHECK_H
+# include <valgrind/memcheck.h>
+#endif
+CLICK_DECLS
+
+template <size_t s> class sized_array_memory { public:
+    typedef char_array<s> type;
+    template <typename T> static type *cast(T *x) {
+	static_assert(sizeof(type) == s, "char_array<> size off");
+	return reinterpret_cast<type *>(x);
+    }
+    template <typename T> static const type *cast(const T *x) {
+	return reinterpret_cast<const type *>(x);
+    }
+    static void fill(void *a, size_t n, const void *x) {
+	for (; n != 0; --n, a = (char *) a + s)
+	    memcpy(a, x, s);
+    }
+    static void move_construct(void* a, void* x) {
+	memcpy(a, x, s);
+    }
+    static void copy(void *dst, const void *src, size_t n) {
+        if (n)
+            memcpy(dst, src, n * s);
+    }
+    static void move(void *dst, const void *src, size_t n) {
+        if (n)
+            memmove(dst, src, n * s);
+    }
+    static void move_onto(void *dst, const void *src, size_t n) {
+        if (n)
+            memmove(dst, src, n * s);
+    }
+    static void destroy(void *a, size_t n) {
+	(void) a, (void) n;
+    }
+    static void mark_noaccess(void *a, size_t n) {
+#ifdef VALGRIND_MAKE_MEM_NOACCESS
+	VALGRIND_MAKE_MEM_NOACCESS(a, n * s);
+#else
+	(void) a, (void) n;
+#endif
+    }
+    static void mark_undefined(void *a, size_t n) {
+#ifdef VALGRIND_MAKE_MEM_UNDEFINED
+	VALGRIND_MAKE_MEM_UNDEFINED(a, n * s);
+#else
+	(void) a, (void) n;
+#endif
+    }
+};
+
+template <typename T> class typed_array_memory { public:
+    typedef T type;
+    static T *cast(T *x) {
+	return x;
+    }
+    static const T *cast(const T *x) {
+	return x;
+    }
+    static void fill(T *a, size_t n, const T *x) {
+	for (size_t i = 0; i != n; ++i)
+	    new((void *) &a[i]) T(*x);
+    }
+    static void move_construct(T* a, T* x) {
+#if HAVE_CXX_RVALUE_REFERENCES
+	new((void *) a) T(click_move(*x));
+#else
+	new((void *) a) T(*x);
+#endif
+    }
+    static void copy(T *dst, const T *src, size_t n) {
+	for (size_t i = 0; i != n; ++i)
+	    new((void *) &dst[i]) T(src[i]);
+    }
+    static void move(T *dst, const T *src, size_t n) {
+	if (dst > src && src + n > dst) {
+	    for (dst += n - 1, src += n - 1; n != 0; --n, --dst, --src) {
+		new((void *) dst) T(*src);
+		src->~T();
+	    }
+	} else {
+	    for (size_t i = 0; i != n; ++i) {
+		new((void *) &dst[i]) T(src[i]);
+		src[i].~T();
+	    }
+	}
+    }
+    static void move_onto(T *dst, const T *src, size_t n) {
+	if (dst > src && src + n > dst) {
+	    for (dst += n - 1, src += n - 1; n != 0; --n, --dst, --src) {
+		dst->~T();
+		new((void *) dst) T(*src);
+	    }
+	} else {
+	    for (size_t i = 0; i != n; ++i) {
+		dst[i].~T();
+		new((void *) &dst[i]) T(src[i]);
+	    }
+	}
+    }
+    static void destroy(T *a, size_t n) {
+	for (size_t i = 0; i != n; ++i)
+	    a[i].~T();
+    }
+    static void mark_noaccess(T *a, size_t n) {
+	sized_array_memory<sizeof(T)>::mark_noaccess(a, n);
+    }
+    static void mark_undefined(T *a, size_t n) {
+	sized_array_memory<sizeof(T)>::mark_undefined(a, n);
+    }
+};
+
+template <typename T> class array_memory : public conditional<has_trivial_copy<T>::value, sized_array_memory<sizeof(T)>, typed_array_memory<T> > {};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/atomic.hh b/openflow/include/click/atomic.hh
new file mode 100644
index 0000000..bde68ec
--- /dev/null
+++ b/openflow/include/click/atomic.hh
@@ -0,0 +1,652 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_ATOMIC_HH
+#define CLICK_ATOMIC_HH
+#if CLICK_LINUXMODULE
+# include <click/glue.hh>
+#endif
+CLICK_DECLS
+#if CLICK_LINUXMODULE
+# if HAVE_LINUX_ASM_SYSTEM_H
+#  include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+#  include <asm/system.h>
+CLICK_CXX_UNPROTECT
+#  include <click/cxxunprotect.h>
+# endif
+# define CLICK_ATOMIC_VAL	_val.counter
+#else
+# define CLICK_ATOMIC_VAL	_val
+#endif
+#if defined(__i386__) || defined(__arch_um__) || defined(__x86_64__)
+# if CLICK_LINUXMODULE || HAVE_MULTITHREAD
+#  define CLICK_ATOMIC_X86	1
+# endif
+# if (CLICK_LINUXMODULE && defined(CONFIG_SMP)) || HAVE_MULTITHREAD
+#  define CLICK_ATOMIC_LOCK	"lock ; "
+# else
+#  define CLICK_ATOMIC_LOCK	/* nothing */
+# endif
+#endif
+
+/** @file <click/atomic.hh>
+ * @brief An atomic 32-bit integer.
+ */
+
+/** @class atomic_uint32_t
+ * @brief A 32-bit integer with support for atomic operations.
+ *
+ * The atomic_uint32_t class represents a 32-bit integer, with support for
+ * atomic operations.  The +=, -=, &=, |=, ++, and -- operations are
+ * implemented using atomic instructions.  There are also atomic swap(),
+ * fetch_and_add(), dec_and_test(), and compare_swap() operations.
+ *
+ * Because of some issues with compiler implementations, atomic_uint32_t has
+ * no explicit constructor; to set an atomic_uint32_t to a value, use
+ * operator=.
+ *
+ * The atomic_uint32_t only provides true atomic semantics when that has been
+ * implemented.  It has been implemented in the Linux kernel, and at userlevel
+ * (when --enable-multithread has been defined) for x86 machines.  In other
+ * situations, it's not truly atomic (because it doesn't need to be).
+ */
+class atomic_uint32_t { public:
+
+    // No constructors because, unfortunately, GCC generates worse code. Use
+    // operator= instead.
+
+    inline uint32_t value() const;
+    inline operator uint32_t() const;
+
+    inline atomic_uint32_t &operator=(uint32_t x);
+
+    inline atomic_uint32_t &operator+=(int32_t delta);
+    inline atomic_uint32_t &operator-=(int32_t delta);
+    inline atomic_uint32_t &operator|=(uint32_t mask);
+    inline atomic_uint32_t &operator&=(uint32_t mask);
+
+    inline void operator++();
+    inline void operator++(int);
+    inline void operator--();
+    inline void operator--(int);
+
+    inline uint32_t swap(uint32_t desired);
+    inline uint32_t fetch_and_add(uint32_t delta);
+    inline bool dec_and_test();
+    inline uint32_t compare_swap(uint32_t expected, uint32_t desired);
+    inline bool compare_and_swap(uint32_t expected, uint32_t desired) CLICK_DEPRECATED;
+
+    inline static uint32_t swap(volatile uint32_t &x, uint32_t desired);
+    inline static void inc(volatile uint32_t &x);
+    inline static bool dec_and_test(volatile uint32_t &x);
+    inline static uint32_t compare_swap(volatile uint32_t &x, uint32_t expected, uint32_t desired);
+    inline static bool compare_and_swap(volatile uint32_t &x, uint32_t expected, uint32_t desired) CLICK_DEPRECATED;
+
+  private:
+
+#if CLICK_LINUXMODULE
+    atomic_t _val;
+#elif HAVE_MULTITHREAD
+    volatile uint32_t _val;
+#else
+    uint32_t _val;
+#endif
+
+};
+
+/** @brief  Return the value. */
+inline uint32_t
+atomic_uint32_t::value() const
+{
+#if CLICK_LINUXMODULE
+    return atomic_read(&_val);
+#else
+    return CLICK_ATOMIC_VAL;
+#endif
+}
+
+/** @brief  Return the value. */
+inline
+atomic_uint32_t::operator uint32_t() const
+{
+    return value();
+}
+
+/** @brief  Set the value to @a x. */
+inline atomic_uint32_t &
+atomic_uint32_t::operator=(uint32_t x)
+{
+#if CLICK_LINUXMODULE
+    atomic_set(&_val, x);
+#else
+    CLICK_ATOMIC_VAL = x;
+#endif
+    return *this;
+}
+
+/** @brief  Atomically add @a delta to the value. */
+inline atomic_uint32_t &
+atomic_uint32_t::operator+=(int32_t delta)
+{
+#if CLICK_LINUXMODULE
+    atomic_add(delta, &_val);
+#elif CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "addl %1,%0"
+		  : "=m" (CLICK_ATOMIC_VAL)
+		  : "r" (delta), "m" (CLICK_ATOMIC_VAL)
+		  : "cc");
+#else
+    CLICK_ATOMIC_VAL += delta;
+#endif
+    return *this;
+}
+
+/** @brief  Atomically subtract @a delta from the value. */
+inline atomic_uint32_t &
+atomic_uint32_t::operator-=(int32_t delta)
+{
+#if CLICK_LINUXMODULE
+    atomic_sub(delta, &_val);
+#elif CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "subl %1,%0"
+		  : "=m" (CLICK_ATOMIC_VAL)
+		  : "r" (delta), "m" (CLICK_ATOMIC_VAL)
+		  : "cc");
+#else
+    CLICK_ATOMIC_VAL -= delta;
+#endif
+    return *this;
+}
+
+/** @brief  Atomically bitwise-or the value with @a mask. */
+inline atomic_uint32_t &
+atomic_uint32_t::operator|=(uint32_t mask)
+{
+#if CLICK_LINUXMODULE && HAVE_LINUX_ATOMIC_SET_MASK
+    atomic_set_mask(mask, &_val);
+#elif CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "orl %1,%0"
+		  : "=m" (CLICK_ATOMIC_VAL)
+		  : "r" (mask), "m" (CLICK_ATOMIC_VAL)
+		  : "cc");
+#elif CLICK_LINUXMODULE
+# warning "using nonatomic approximation for atomic_uint32_t::operator|="
+    unsigned long flags;
+    local_irq_save(flags);
+    CLICK_ATOMIC_VAL |= mask;
+    local_irq_restore(flags);
+#else
+    CLICK_ATOMIC_VAL |= mask;
+#endif
+     return *this;
+}
+
+/** @brief  Atomically bitwise-and the value with @a mask. */
+inline atomic_uint32_t &
+atomic_uint32_t::operator&=(uint32_t mask)
+{
+#if CLICK_LINUXMODULE && HAVE_LINUX_ATOMIC_SET_MASK
+    atomic_clear_mask(~mask, &_val);
+#elif CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "andl %1,%0"
+		  : "=m" (CLICK_ATOMIC_VAL)
+		  : "r" (mask), "m" (CLICK_ATOMIC_VAL)
+		  : "cc");
+#elif CLICK_LINUXMODULE
+# warning "using nonatomic approximation for atomic_uint32_t::operator&="
+    unsigned long flags;
+    local_irq_save(flags);
+    CLICK_ATOMIC_VAL &= mask;
+    local_irq_restore(flags);
+#else
+    CLICK_ATOMIC_VAL &= mask;
+#endif
+    return *this;
+}
+
+/** @brief  Atomically increment value @a x. */
+inline void
+atomic_uint32_t::inc(volatile uint32_t &x)
+{
+#if CLICK_LINUXMODULE
+    static_assert(sizeof(atomic_t) == sizeof(x), "atomic_t expected to take 32 bits.");
+    atomic_inc((atomic_t *) &x);
+#elif CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "incl %0"
+		  : "=m" (x)
+		  : "m" (x)
+		  : "cc");
+#else
+    x++;
+#endif
+}
+
+/** @brief  Atomically increment the value. */
+inline void
+atomic_uint32_t::operator++()
+{
+#if CLICK_LINUXMODULE
+    atomic_inc(&_val);
+#elif CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "incl %0"
+		  : "=m" (CLICK_ATOMIC_VAL)
+		  : "m" (CLICK_ATOMIC_VAL)
+		  : "cc");
+#else
+    CLICK_ATOMIC_VAL++;
+#endif
+}
+
+/** @brief  Atomically increment the value. */
+inline void
+atomic_uint32_t::operator++(int)
+{
+#if CLICK_LINUXMODULE
+    atomic_inc(&_val);
+#elif CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "incl %0"
+		  : "=m" (CLICK_ATOMIC_VAL)
+		  : "m" (CLICK_ATOMIC_VAL)
+		  : "cc");
+#else
+    CLICK_ATOMIC_VAL++;
+#endif
+}
+
+/** @brief  Atomically decrement the value. */
+inline void
+atomic_uint32_t::operator--()
+{
+#if CLICK_LINUXMODULE
+    atomic_dec(&_val);
+#elif CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "decl %0"
+		  : "=m" (CLICK_ATOMIC_VAL)
+		  : "m" (CLICK_ATOMIC_VAL)
+		  : "cc");
+#else
+    CLICK_ATOMIC_VAL--;
+#endif
+}
+
+/** @brief  Atomically decrement the value. */
+inline void
+atomic_uint32_t::operator--(int)
+{
+#if CLICK_LINUXMODULE
+    atomic_dec(&_val);
+#elif CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "decl %0"
+		  : "=m" (CLICK_ATOMIC_VAL)
+		  : "m" (CLICK_ATOMIC_VAL)
+		  : "cc");
+#else
+    CLICK_ATOMIC_VAL--;
+#endif
+}
+
+/** @brief  Atomically assign the value to @a desired, returning the old value.
+ *
+ * Behaves like this, but in one atomic step:
+ * @code
+ * uint32_t actual = x;
+ * x = desired;
+ * return actual;
+ * @endcode
+ *
+ * Also acts as a memory barrier. */
+inline uint32_t
+atomic_uint32_t::swap(volatile uint32_t &x, uint32_t desired)
+{
+#if CLICK_ATOMIC_X86
+    asm volatile ("xchgl %0,%1"
+		  : "=r" (desired), "=m" (x)
+		  : "0" (desired), "m" (x)
+		  : "memory");
+    return desired;
+#elif CLICK_LINUXMODULE && defined(xchg)
+    return xchg(&x, desired);
+#elif CLICK_LINUXMODULE
+# error "need xchg for atomic_uint32_t::swap"
+#else
+    uint32_t actual = x;
+    x = desired;
+    return actual;
+#endif
+}
+
+/** @brief  Atomically assign the value to @a desired, returning the old value.
+ *
+ * Behaves like this, but in one atomic step:
+ * @code
+ * uint32_t old_value = value();
+ * *this = desired;
+ * return old_value;
+ * @endcode
+ *
+ * Also acts as a memory barrier. */
+inline uint32_t
+atomic_uint32_t::swap(uint32_t desired)
+{
+#if CLICK_LINUXMODULE && defined(xchg)
+    return atomic_xchg(&_val, desired);
+#elif CLICK_LINUXMODULE
+# error "need xchg for atomic_uint32_t::swap"
+#else
+    return swap(CLICK_ATOMIC_VAL, desired);
+#endif
+}
+
+/** @brief  Atomically add @a delta to the value, returning the old value.
+ *
+ * Behaves like this, but in one atomic step:
+ * @code
+ * uint32_t old_value = value();
+ * *this += delta;
+ * return old_value;
+ * @endcode */
+inline uint32_t
+atomic_uint32_t::fetch_and_add(uint32_t delta)
+{
+#if CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "xaddl %0,%1"
+		  : "=r" (delta), "=m" (CLICK_ATOMIC_VAL)
+		  : "0" (delta), "m" (CLICK_ATOMIC_VAL)
+		  : "cc");
+    return delta;
+#elif CLICK_LINUXMODULE && HAVE_LINUX_ATOMIC_ADD_RETURN
+    return atomic_add_return(&_val, delta) - delta;
+#elif CLICK_LINUXMODULE
+# warning "using nonatomic approximation for atomic_uint32_t::fetch_and_add"
+    unsigned long flags;
+    local_irq_save(flags);
+    uint32_t old_value = value();
+    CLICK_ATOMIC_VAL += delta;
+    local_irq_restore(flags);
+    return old_value;
+#else
+    uint32_t old_value = value();
+    CLICK_ATOMIC_VAL += delta;
+    return old_value;
+#endif
+}
+
+/** @brief  Atomically decrement @a x, returning true if the new @a x
+ *	    is 0.
+ *
+ * Behaves like this, but in one atomic step:
+ * @code
+ * --x;
+ * return x == 0;
+ * @endcode */
+inline bool
+atomic_uint32_t::dec_and_test(volatile uint32_t &x)
+{
+#if CLICK_LINUXMODULE
+    static_assert(sizeof(atomic_t) == sizeof(x), "atomic_t expected to take 32 bits.");
+    return atomic_dec_and_test((atomic_t *) &x);
+#elif CLICK_ATOMIC_X86
+    uint8_t result;
+    asm volatile (CLICK_ATOMIC_LOCK "decl %0 ; sete %1"
+		  : "=m" (x), "=qm" (result)
+		  : "m" (x)
+		  : "cc");
+    return result;
+#else
+    return (--x == 0);
+#endif
+}
+
+/** @brief  Perform a compare-and-swap operation.
+ *  @param  x         value
+ *  @param  expected  test value
+ *  @param  desired   new value
+ *  @return The actual old value.  If it equaled @a expected, @a x has been
+ *	    set to @a desired.
+ *
+ * Behaves like this, but in one atomic step:
+ * @code
+ * uint32_t actual = x;
+ * if (x == expected)
+ *     x = desired;
+ * return actual;
+ * @endcode
+ *
+ * Also acts as a memory barrier. */
+inline uint32_t
+atomic_uint32_t::compare_swap(volatile uint32_t &x, uint32_t expected, uint32_t desired)
+{
+#if CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "cmpxchgl %2,%1"
+		  : "=a" (expected), "=m" (x)
+		  : "r" (desired), "0" (expected), "m" (x)
+		  : "cc", "memory");
+    return expected;
+#elif CLICK_LINUXMODULE && defined(cmpxchg)
+    return cmpxchg(&x, expected, desired);
+#elif CLICK_LINUXMODULE
+# warning "using nonatomic approximation for atomic_uint32_t::compare_and_swap"
+    unsigned long flags;
+    local_irq_save(flags);
+    uint32_t actual = x;
+    if (actual == expected)
+	x = desired;
+    local_irq_restore(flags);
+    return actual;
+#else
+    uint32_t actual = x;
+    if (actual == expected)
+	x = desired;
+    return actual;
+#endif
+}
+
+
+/** @brief  Perform a compare-and-swap operation.
+ *  @param  x         value
+ *  @param  expected  test value
+ *  @param  desired   new value
+ *  @return True if the old @a x equaled @a expected (in which case @a x
+ *	    was set to @a desired), false otherwise.
+ *  @deprecated Use compare_swap instead.
+ *
+ * Behaves like this, but in one atomic step:
+ * @code
+ * uint32_t old_value = x;
+ * if (x == expected)
+ *     x = desired;
+ * return old_value == expected;
+ * @endcode
+ *
+ * Also acts as a memory barrier. */
+inline bool
+atomic_uint32_t::compare_and_swap(volatile uint32_t &x, uint32_t expected, uint32_t desired)
+{
+#if CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "cmpxchgl %2,%0 ; sete %%al"
+		  : "=m" (x), "=a" (expected)
+		  : "r" (desired), "m" (x), "a" (expected)
+		  : "cc", "memory");
+    return (uint8_t) expected;
+#elif CLICK_LINUXMODULE && defined(cmpxchg)
+    return cmpxchg(&x, expected, desired) == expected;
+#elif CLICK_LINUXMODULE
+# warning "using nonatomic approximation for atomic_uint32_t::compare_and_swap"
+    unsigned long flags;
+    local_irq_save(flags);
+    uint32_t old_value = x;
+    if (old_value == expected)
+	x = desired;
+    local_irq_restore(flags);
+    return old_value == expected;
+#else
+    uint32_t old_value = x;
+    if (old_value == expected)
+	x = desired;
+    return old_value == expected;
+#endif
+}
+
+/** @brief  Atomically decrement the value, returning true if the new value
+ *	    is 0.
+ *
+ * Behaves like this, but in one atomic step:
+ * @code
+ * --*this;
+ * return value() == 0;
+ * @endcode */
+inline bool
+atomic_uint32_t::dec_and_test()
+{
+#if CLICK_LINUXMODULE
+    return atomic_dec_and_test(&_val);
+#elif CLICK_ATOMIC_X86
+    uint8_t result;
+    asm volatile (CLICK_ATOMIC_LOCK "decl %0 ; sete %1"
+		  : "=m" (CLICK_ATOMIC_VAL), "=qm" (result)
+		  : "m" (CLICK_ATOMIC_VAL)
+		  : "cc");
+    return result;
+#else
+    return (--CLICK_ATOMIC_VAL == 0);
+#endif
+}
+
+/** @brief  Perform a compare-and-swap operation.
+ *  @param  expected  test value
+ *  @param  desired   new value
+ *  @return The actual old value.  If @a expected is returned, the
+ *          value has been set to @a desired.
+ *
+ * Behaves like this, but in one atomic step:
+ * @code
+ * uint32_t actual = value();
+ * if (actual == expected)
+ *     *this = desired;
+ * return actual;
+ * @endcode
+ *
+ * Also acts as a memory barrier. */
+inline uint32_t
+atomic_uint32_t::compare_swap(uint32_t expected, uint32_t desired)
+{
+#if CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "cmpxchgl %2,%1"
+		  : "=a" (expected), "=m" (CLICK_ATOMIC_VAL)
+		  : "r" (desired), "0" (expected), "m" (CLICK_ATOMIC_VAL)
+		  : "cc", "memory");
+    return expected;
+#elif CLICK_LINUXMODULE && HAVE_LINUX_ATOMIC_CMPXCHG
+    return atomic_cmpxchg(&_val, expected, desired);
+#elif CLICK_LINUXMODULE
+# warning "using nonatomic approximation for atomic_uint32_t::compare_swap"
+    unsigned long flags;
+    local_irq_save(flags);
+    uint32_t actual = value();
+    if (actual == expected)
+	CLICK_ATOMIC_VAL = desired;
+    local_irq_restore(flags);
+    return actual;
+#else
+    uint32_t actual = value();
+    if (actual == expected)
+	CLICK_ATOMIC_VAL = desired;
+    return actual;
+#endif
+}
+
+/** @brief  Perform a compare-and-swap operation.
+ *  @param  expected  test value
+ *  @param  desired   new value
+ *  @return True if the old value equaled @a expected (in which case the
+ *	    value was set to @a desired), false otherwise.
+ *  @deprecated  Use compare_swap instead.
+ *
+ * Behaves like this, but in one atomic step:
+ * @code
+ * uint32_t old_value = value();
+ * if (old_value == expected)
+ *     *this = desired;
+ * return old_value == expected;
+ * @endcode
+ *
+ * Also acts as a memory barrier. */
+inline bool
+atomic_uint32_t::compare_and_swap(uint32_t expected, uint32_t desired)
+{
+#if CLICK_ATOMIC_X86
+    asm volatile (CLICK_ATOMIC_LOCK "cmpxchgl %2,%0 ; sete %%al"
+		  : "=m" (CLICK_ATOMIC_VAL), "=a" (expected)
+		  : "r" (desired), "m" (CLICK_ATOMIC_VAL), "a" (expected)
+		  : "cc", "memory");
+    return (uint8_t) expected;
+#elif CLICK_LINUXMODULE && HAVE_LINUX_ATOMIC_CMPXCHG
+    return atomic_cmpxchg(&_val, expected, desired) == expected;
+#elif CLICK_LINUXMODULE
+# warning "using nonatomic approximation for atomic_uint32_t::compare_and_swap"
+    unsigned long flags;
+    local_irq_save(flags);
+    uint32_t old_value = value();
+    if (old_value == expected)
+	CLICK_ATOMIC_VAL = desired;
+    local_irq_restore(flags);
+    return old_value == expected;
+#else
+    uint32_t old_value = value();
+    if (old_value == expected)
+	CLICK_ATOMIC_VAL = desired;
+    return old_value == expected;
+#endif
+}
+
+inline uint32_t
+operator+(const atomic_uint32_t &a, const atomic_uint32_t &b)
+{
+    return a.value() + b.value();
+}
+
+inline uint32_t
+operator-(const atomic_uint32_t &a, const atomic_uint32_t &b)
+{
+    return a.value() - b.value();
+}
+
+inline bool
+operator==(const atomic_uint32_t &a, const atomic_uint32_t &b)
+{
+    return a.value() == b.value();
+}
+
+inline bool
+operator!=(const atomic_uint32_t &a, const atomic_uint32_t &b)
+{
+    return a.value() != b.value();
+}
+
+inline bool
+operator>(const atomic_uint32_t &a, const atomic_uint32_t &b)
+{
+    return a.value() > b.value();
+}
+
+inline bool
+operator<(const atomic_uint32_t &a, const atomic_uint32_t &b)
+{
+    return a.value() < b.value();
+}
+
+inline bool
+operator>=(const atomic_uint32_t &a, const atomic_uint32_t &b)
+{
+    return a.value() >= b.value();
+}
+
+inline bool
+operator<=(const atomic_uint32_t &a, const atomic_uint32_t &b)
+{
+    return a.value() <= b.value();
+}
+
+typedef atomic_uint32_t uatomic32_t;
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/bighashmap.cc b/openflow/include/click/bighashmap.cc
new file mode 100644
index 0000000..1d202b0
--- /dev/null
+++ b/openflow/include/click/bighashmap.cc
@@ -0,0 +1,19 @@
+/*
+ * bighashmap.{cc,hh} -- a hash table template that supports removal
+ * Eddie Kohler
+ *
+ * Copyright (c) 2000 Mazu Networks, Inc.
+ * Copyright (c) 2003 International Computer Science Institute
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the conditions
+ * listed in the Click LICENSE file. These conditions include: you must
+ * preserve this copyright notice, and you cannot mention the copyright
+ * holders in advertising related to the Software without their permission.
+ * The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ * notice is a summary of the Click LICENSE file; the license in that file is
+ * legally binding.
+ */
+
+#include <click/hashmap.cc>
diff --git a/openflow/include/click/bighashmap.hh b/openflow/include/click/bighashmap.hh
new file mode 100644
index 0000000..93d660f
--- /dev/null
+++ b/openflow/include/click/bighashmap.hh
@@ -0,0 +1,7 @@
+#ifndef CLICK_BIGHASHMAP_HH
+#define CLICK_BIGHASHMAP_HH
+
+// This file is here for compatibility only.
+#include <click/hashmap.hh>
+
+#endif
diff --git a/openflow/include/click/bighashmap_arena.hh b/openflow/include/click/bighashmap_arena.hh
new file mode 100644
index 0000000..3d4f478
--- /dev/null
+++ b/openflow/include/click/bighashmap_arena.hh
@@ -0,0 +1,101 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/bighashmap_arena.cc" -*-
+#ifndef CLICK_BIGHASHMAP_ARENA_HH
+#define CLICK_BIGHASHMAP_ARENA_HH
+CLICK_DECLS
+
+class HashMap_Arena { public:
+
+    HashMap_Arena(uint32_t element_size);
+
+    void use()			{ _refcount++; }
+    void unuse();
+
+    bool detached() const	{ return _detached; }
+    void detach()		{ _detached = true; }
+
+    void *alloc();
+    void free(void *);
+
+  private:
+
+    struct Link {
+	Link *next;
+    };
+    Link *_free;
+
+    enum { NELEMENTS = 127 };	// not a power of 2 so we don't fall into a
+				// too-large bucket
+    char *_cur_buffer;
+    int _buffer_pos;
+
+    uint32_t _element_size;
+
+    char **_buffers;
+    int _nbuffers;
+    int _buffers_cap;
+
+    uint32_t _refcount;
+    bool _detached;
+
+    HashMap_Arena(const HashMap_Arena &);
+    ~HashMap_Arena();
+    HashMap_Arena &operator=(const HashMap_Arena &);
+
+    void *hard_alloc();
+
+    friend struct Link;		// shut up, compiler
+
+};
+
+class HashMap_ArenaFactory { public:
+
+    HashMap_ArenaFactory();
+    virtual ~HashMap_ArenaFactory();
+
+    static void static_initialize();
+    static void static_cleanup();
+
+    static HashMap_Arena *get_arena(uint32_t, HashMap_ArenaFactory * =0);
+    virtual HashMap_Arena *get_arena_func(uint32_t);
+
+  private:
+
+    HashMap_Arena **_arenas[2];
+    int _narenas[2];
+
+    static HashMap_ArenaFactory *the_factory;
+
+};
+
+inline void
+HashMap_Arena::unuse()
+{
+    _refcount--;
+    if (_refcount <= 0)
+	delete this;
+}
+
+inline void *
+HashMap_Arena::alloc()
+{
+    if (_free) {
+	void *ret = _free;
+	_free = _free->next;
+	return ret;
+    } else if (_buffer_pos > 0) {
+	_buffer_pos -= _element_size;
+	return _cur_buffer + _buffer_pos;
+    } else
+	return hard_alloc();
+}
+
+inline void
+HashMap_Arena::free(void *v)
+{
+    Link *link = reinterpret_cast<Link *>(v);
+    link->next = _free;
+    _free = link;
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/bigint.hh b/openflow/include/click/bigint.hh
new file mode 100644
index 0000000..de00f75
--- /dev/null
+++ b/openflow/include/click/bigint.hh
@@ -0,0 +1,391 @@
+#ifndef CLICK_BIGINT_HH
+#define CLICK_BIGINT_HH 1
+/*
+ * bigint.hh -- multiple-precision arithmetic
+ * Eddie Kohler and the authors of GMP
+ *
+ * Copyright (c) 2008 Meraki, Inc.
+ * Derived from the GNU Multiple Precision Arithmetic Library, which is
+ * Copyright (c) 2001-2008 Free Software Foundation, Inc.
+ *
+ * This source code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ *
+ * Using the interfaces provided by this file does not create a derived work.
+ */
+#include <click/integers.hh>
+#include <click/type_traits.hh>
+#include <click/string.hh>
+CLICK_DECLS
+
+/** @file <click/bigint.hh>
+ * @brief Simple multiple-precision integer arithmetic.
+ */
+
+/** @class Bigint
+ * @brief Template for multiple-precision integer arithmetic.
+ *
+ * The Bigint template provides a couple simple, but useful, functions for
+ * multiple-precision integer arithmetic.  It is a port of a very limited
+ * subset of the GNU Multiple Precision Arithmetic library's mpn functionality
+ * (architecture-generic functions that work on unsigned integers of known
+ * size).
+ *
+ * A multiple-precision integer is an array of "limbs," or machine integers.
+ * The multiply_add() and divide() functions take arrays of limbs as
+ * arguments.  In such arrays, the least significant limb is stored at array
+ * index 0.
+ *
+ * For example, here's Bigint speak for "x = 0x123_4567_89AB_CDEF * 0x45":
+ * @code
+ * // Initialize result
+ * uint32_t x[2] = { 0, 0 };
+ * // Define multiplicand; note that least significant comes first
+ * uint32_t a[2] = { 0x89ABCDEF, 0x1234567 };
+ * Bigint<uint32_t>::multiply_add(x, a, 2, 0x45);
+ * @endcode
+ *
+ * Bigint is not optimized for speed.
+ *
+ * Bigint's template parameter is the type of a limb.  Most users will use
+ * bigint, which is equivalent to Bigint<uint32_t>.
+ */
+template <typename L, typename Lhalf = L>
+class Bigint { public:
+
+    /** @brief Type of a limb, the unit of single arithmetic. */
+    typedef L limb_type;
+
+    /** @brief Type of an arithmetic unit no smaller than one-half limb_type. */
+    typedef Lhalf half_limb_type;
+
+    enum {
+	limb_bits = sizeof(limb_type) * 8,
+	half_limb_bits = sizeof(limb_type) * 4
+    };
+    enum {
+	limb_high_bit = limb_type(1) << (limb_bits - 1),
+	limb_half = limb_type(1) << half_limb_bits,
+	limb_low_mask = limb_half - 1,
+	limb_zero = limb_type(0)
+    };
+
+    /** @brief Return the less significant half of @a x.
+     * @invariant low(@a x) + ((limb_type) high(@a x) << half_limb_bits) ==
+     *    @a x */
+    static inline half_limb_type low(limb_type x) {
+	return x & limb_low_mask;
+    }
+
+    /** @brief Return the more significant half of @a x. */
+    static inline half_limb_type high(limb_type x) {
+	return x >> half_limb_bits;
+    }
+
+    /** @brief Add two-limb integers [@a a1,@a a0] and [@a b1,@a b0], storing
+     * the result in [@a x1,@a x0].
+     * @param[out] x1 most significant limb of result
+     * @param[out] x0 least significant limb of result
+     * @param a1 most significant limb of addend
+     * @param a0 least significant limb of addend
+     * @param b1 most significant limb of addend
+     * @param b0 least significant limb of addend
+     *
+     * Handles carry in the low order limbs. */
+    static void add(limb_type &x1, limb_type &x0,
+		    limb_type a1, limb_type a0, limb_type b1, limb_type b0) {
+	x0 = a0 + b0;
+	x1 = a1 + b1 + (x0 < a0);
+    }
+
+    /** @brief Multiply one-limb integers @a a and @a b, storing the result in
+     * [@a x1,@a x0].
+     * @param[out] x1 most significant limb of result
+     * @param[out] x0 least significant limb of result
+     * @param a multiplicand
+     * @param b multiplicand */
+    static void multiply(limb_type &x1, limb_type &x0,
+			 limb_type a, limb_type b) {
+	int_multiply(a, b, x0, x1);
+    }
+
+    /** @brief Multiply one-limb integer @a a by half-limb integer @a b,
+     * storing the result in [@a x1,@a x0].
+     * @param[out] x1 most significant limb of result
+     * @param[out] x0 least significant limb of result
+     * @param a multiplicand
+     * @param b multiplicand */
+    static void multiply_half(limb_type &x1, limb_type &x0,
+			      limb_type a, half_limb_type b) {
+	if (has_fast_int_multiply<limb_type>::value)
+	    multiply(x1, x0, a, b);
+	else {
+	    half_limb_type al = low(a), ah = high(a);
+
+	    limb_type r0 = (limb_type) al * b;
+
+	    limb_type r1 = (limb_type) ah * b;
+	    limb_type r2 = high(r0) + r1;
+
+	    x1 = (r2 < r1 ? limb_half : limb_zero) + high(r2);
+	    x0 = (r2 << half_limb_bits) + low(r0);
+	}
+    }
+
+    /** @brief Return the inverse of limb @a x.
+     *
+     * Returns the limb @a y that is the largest limb not larger than
+     * (2**(2*limb_bits))/@a x - (2**limb_bits).  If this would yield
+     * overflow, @a y is the largest possible number (i.e., only ones). */
+    static limb_type inverse(limb_type x) {
+	limb_type y1 = ~x, y0 = ~limb_zero;
+
+	// now calculate [y1y0] / x
+	limb_type x1 = high(x), x0 = low(x);
+	limb_type q1 = y1 / x1;
+	limb_type r1 = y1 - q1 * x1;
+	limb_type m = q1 * x0;
+	r1 = r1 * limb_half | high(y0);
+	if (r1 < m) {
+	    --q1, r1 += x;
+	    if (r1 >= x && r1 < m)
+		--q1, r1 += x;
+	}
+	r1 -= m;
+
+	limb_type q0 = r1 / x1;
+	limb_type r0 = r1 - q0 * x1;
+	m = q0 * x0;
+	r0 = r0 * limb_half | low(y0);
+	if (r0 < m) {
+	    --q0, r0 += x;
+	    if (r0 >= x && r0 < m)
+		--q0, r0 += x;
+	}
+
+	return q1 * limb_half | q0;
+    }
+
+    /** @brief Set @a n-limb integer @a a to the value @a b.
+     * @param[out] a points to @a n-limb result
+     * @param n number of limbs in @a a
+     * @param b input value
+     * @return carry */
+    static click_uintmax_t set(limb_type *a, int n, click_uintmax_t b) {
+	while (n > 0) {
+	    *a++ = b;
+	    n--;
+	    b >>= limb_bits;
+	}
+	return b;
+    }
+
+    /** @brief Multiply @a n-limb integer @a a by 1-limb integer @a b and add
+     * the result to @a n-limb integer @a x.
+     * @param[in,out] x points to @a n-limb addend and result
+     * @param a points to @a n-limb multiplicand
+     * @param n number of limbs in @a x and @a a
+     * @param b 1-limb multiplicand
+     * @return overflow
+     *
+     * Like @a x += @a a * @a b.  Both @a x and @a a must have @a n limbs.  It
+     * is safe for @a x and @a a to point to exactly the same memory, but they
+     * must not otherwise overlap. */
+    static limb_type multiply_add(limb_type *x, const limb_type *a, int n,
+				  limb_type b) {
+	limb_type carry = 0;
+	do {
+	    limb_type x0, x1;
+	    multiply(x1, x0, *a++, b);
+	    x0 += carry;
+	    carry = (x0 < carry) + x1;
+	    x0 += *x;
+	    carry += (x0 < *x);
+	    *x++ = x0;
+	} while (--n != 0);
+	return carry;
+    }
+
+    /** @brief Multiply @a n-limb integer @a a by 1-limb integer @a b, add
+     * 1-limb integer @a carry, and store the result in @a n-limb integer @a x.
+     * @param[in,out] x points to @a n-limb result
+     * @param a points to @a n-limb multiplicand
+     * @param n number of limbs in @a x and @a a
+     * @param b 1-limb multiplicand
+     * @param carry 1-limb initial carry
+     * @return overflow
+     *
+     * Like @a x = (@a a * @a b) + @a carry.  Both @a x and @a a must have @a
+     * n limbs.  It is safe for @a x and @a a to point to exactly the same
+     * memory, but they must not otherwise overlap. */
+    static limb_type multiply(limb_type *x, const limb_type *a, int n,
+			      limb_type b, limb_type carry = 0) {
+	do {
+	    limb_type x0, x1;
+	    multiply(x1, x0, *a++, b);
+	    x0 += carry;
+	    carry = (x0 < carry) + x1;
+	    *x++ = x0;
+	} while (--n != 0);
+	return carry;
+    }
+
+    /** @brief Multiply @a n-limb integer @a a by 1/2-limb integer @a b, add
+     * 1-limb integer @a carry, and store the result in @a n-limb integer @a x.
+     * @param[in,out] x points to @a n-limb result
+     * @param a points to @a n-limb multiplicand
+     * @param n number of limbs in @a x and @a a
+     * @param b 1/2-limb multiplicand
+     * @param carry 1-limb initial carry
+     * @return overflow
+     *
+     * Like @a x = (@a a * @a b) + @a carry.  Both @a x and @a a must have @a
+     * n limbs.  It is safe for @a x and @a a to point to exactly the same
+     * memory, but they must not otherwise overlap. */
+    static limb_type multiply_half(limb_type *x, const limb_type *a, int n,
+				   half_limb_type b, limb_type carry = 0) {
+	do {
+	    limb_type x0, x1;
+	    multiply_half(x1, x0, *a++, b);
+	    x0 += carry;
+	    carry = (x0 < carry) + x1;
+	    *x++ = x0;
+	} while (--n != 0);
+	return carry;
+    }
+
+    /** @brief Divide @a n-limb integer @a a by 1-limb integer @a b and store
+     * the result in @a n-limb integer @a x.
+     * @param[out] x points to @a n-limb result
+     * @param a points to @a n-limb dividend
+     * @param n number of limbs in @a x and @a a
+     * @param b 1-limb divisor
+     * @return the remainder
+     *
+     * Like @a x = @a a / @a b.  Both @a x and @a a must have @a n limbs.  It
+     * is safe for @a x and @a a to point to exactly the same memory, but they
+     * must not otherwise overlap. */
+    static limb_type divide(limb_type *x, const limb_type *a, int n,
+			    limb_type b) {
+	x += n - 1;   /* Make x point at most significant quotient limb */
+	a += n - 1;   /* Make a point at most significant dividend limb */
+	limb_type r = 0;
+
+	if (b & limb_high_bit) {
+	    /* High quotient limb is 0 or 1, skip a divide step. */
+	    r = *a;
+	    *x = (r >= b);
+	    r -= (b & -*x);
+	    --x, --a, --n;
+
+	    /* Multiply-by-inverse, divisor already normalized. */
+	    limb_type b_inverse = inverse(b);
+	    while (n > 0) {
+		preinverted_divide(*x, r, r, *a, b, b_inverse);
+		--x, --a, --n;
+	    }
+
+	} else {
+	    /* Most significant bit of divisor == 0.  */
+	    /* Skip a division if high < divisor (high quotient 0).  Testing
+	       here before normalizing will still skip as often as
+	       possible.  */
+	    if (*a < b) {
+		r = *a;
+		*x = 0;
+		--x, --a, --n;
+	    }
+
+	    if (n != 0) {
+		int norm = ffs_msb(b) - 1; // number of most significant 0 bits
+		b <<= norm;
+		r <<= norm;
+		limb_type b_inverse = inverse(b);
+
+		limb_type a1 = *a;
+		r |= (a1 >> (limb_bits - norm));
+		--a, --n;
+		while (n > 0) {
+		    limb_type a0 = *a;
+		    preinverted_divide(*x, r, r, ((a1 << norm) | (a0 >> (limb_bits - norm))), b, b_inverse);
+		    --x, --a, --n;
+		    a1 = a0;
+		}
+		preinverted_divide(*x, r, r, a1 << norm, b, b_inverse);
+		r >>= norm;
+	    }
+	}
+
+	return r;
+    }
+
+    /** @brief Return a string representation of @a n-limb integer @a x and
+     * set @a x to 0.
+     * @param[in,out] x @a n-limb input, set to zero on output
+     * @param n number of limbs in @a x
+     * @param base base (between 2 and 36)
+     * @param uppercase if true, use uppercase letters for digits >= 10 */
+    static String unparse_clear(limb_type *x, int n, int base = 10, bool uppercase = false) {
+	// need d chars, min d s.t. 10^d >= 2^(sizeof(limb_type) * 8 * n)
+	// == min d s.t. d >= sizeof(limb_type) * 8 * n / lg 10
+	int div = (base >= 16 ? 4 : (base >= 8 ? 3 : 1));
+	String s = String::make_uninitialized((n * limb_bits) / div + 1);
+	char *q = const_cast<char *>(s.end());
+	assert(base >= 2 && base <= 36);
+	while (1) {
+	    while (n > 0 && x[n - 1] == 0)
+		--n;
+	    if (n == 0)
+		break;
+	    int r = divide(x, x, n, base);
+	    if (r <= 9)
+		*--q = '0' + r;
+	    else if (uppercase)
+		*--q = 'A' + r - 10;
+	    else
+		*--q = 'a' + r - 10;
+	}
+	assert(q >= s.begin());
+	if (q == s.end())
+	    *--q = '0';
+	return s.substring(q, s.end());
+    }
+
+  private:
+
+    /* Divide the two-limb number in (a1,a0) by b, with b_inverse being the
+       largest limb not larger than (2**(2*limb_bits))/b - (2**limb_bits).  If
+       this would yield overflow, b_inverse should be the largest possible
+       number (i.e., only ones).  For correct operation, the most significant
+       bit of b has to be set.  Put the quotient in q and the remainder in
+       r.  */
+    /* Like udiv_qrnnd_preinv, but branch-free. */
+    static void preinverted_divide(limb_type &q, limb_type &r,
+				   limb_type a1, limb_type a0, limb_type b,
+				   limb_type b_inverse) {
+	limb_type a0_mask = (a0 & limb_high_bit ? ~limb_zero : limb_zero);
+	limb_type a0_adjusted = a0 + (b & a0_mask);
+	limb_type x1, x0;
+	multiply(x1, x0, b_inverse, a1 - a0_mask);
+	add(x1, x0, x1, x0, a1, a0_adjusted);
+	limb_type q1 = ~x1;
+	multiply(x1, x0, q1, b);
+	add(x1, x0, x1, x0, a1, a0);
+	x1 -= b;
+	r = x0 + (b & x1);
+	q = x1 - q1;
+    }
+
+};
+
+/** @brief Typical Bigint usage with uint32_t limb_type. */
+typedef Bigint<uint32_t> bigint;
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/bitvector.hh b/openflow/include/click/bitvector.hh
new file mode 100644
index 0000000..30e199c
--- /dev/null
+++ b/openflow/include/click/bitvector.hh
@@ -0,0 +1,379 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/bitvector.cc" -*-
+#ifndef CLICK_BITVECTOR_HH
+#define CLICK_BITVECTOR_HH
+#include <click/glue.hh>
+CLICK_DECLS
+
+/** @file <click/bitvector.hh>
+ * @brief Click's bitvector class. */
+
+/** @class Bitvector
+  @brief Vector of bits.
+
+  The Bitvector class implements a vector of individually addressable bits.
+  It supports bitwise operations such as |= and &= as well as the usual
+  assignment and indexing operations.
+
+  Bitvectors are stored as arrays of data words with type word_type, each
+  containing wbits bits. For some purposes it may be faster or easier to
+  manipulate data words directly. */
+class Bitvector {
+  public:
+
+    class Bit;
+    typedef bool (Bitvector::*unspecified_bool_type)() const;
+
+    typedef uint32_t word_type;
+    enum { wbits = 32, wshift = 5, wmask = 31 };
+
+    inline Bitvector();
+    explicit inline Bitvector(int n);
+    explicit inline Bitvector(bool bit);
+    inline Bitvector(int n, bool bit);
+    inline Bitvector(const Bitvector &x);
+    inline ~Bitvector();
+
+    inline int size() const;
+    inline Bit operator[](int i);
+    inline bool operator[](int i) const;
+    inline Bit force_bit(int i);
+
+    inline int word_size() const;
+    inline int max_word() const;
+    inline word_type *words();
+    inline const word_type *words() const;
+
+    bool zero() const;
+    inline operator unspecified_bool_type() const;
+    inline bool operator!() const;
+
+    Bitvector &assign(int n, bool bit);
+    Bitvector &operator=(const Bitvector &x);
+    void clear();
+    void resize(int n);
+
+    friend inline bool operator==(const Bitvector &a, const Bitvector &b);
+    friend inline bool operator!=(const Bitvector &a, const Bitvector &b);
+    bool nonzero_intersection(const Bitvector &x) const;
+
+    inline Bitvector operator~() const;
+    friend inline Bitvector operator&(Bitvector a, const Bitvector &b);
+    friend inline Bitvector operator|(Bitvector a, const Bitvector &b);
+    friend inline Bitvector operator^(Bitvector a, const Bitvector &b);
+    friend inline Bitvector operator-(Bitvector a, const Bitvector &b);
+
+    void flip();
+    inline void negate();
+    Bitvector &operator&=(const Bitvector &x);
+    Bitvector &operator|=(const Bitvector &x);
+    Bitvector &operator^=(const Bitvector &x);
+    inline Bitvector &operator-=(const Bitvector &x);
+    void offset_or(const Bitvector &x, int offset);
+    void or_with_difference(const Bitvector &x, Bitvector &difference);
+
+    void swap(Bitvector &x);
+
+    /** @cond never */
+    typedef word_type data_word_type CLICK_DEPRECATED;
+    enum { data_word_bits = wbits };
+    inline word_type *data_words() CLICK_DEPRECATED;
+    inline const word_type *data_words() const CLICK_DEPRECATED;
+    /** @endcond never */
+
+  private:
+
+    enum { ninline = 2, inlinebits = ninline * wbits };
+
+    int _max;
+    word_type *_data;
+    word_type _f[ninline];
+
+    void finish_copy_constructor(const Bitvector &);
+    inline void clear_last();
+    void hard_resize(int, bool);
+
+};
+
+
+/** @class Bitvector::Bit
+  @brief A wrapper class that acts like a single bit.
+
+  Bits are returned by modifiable Bitvectors' operator[].  They act like bools,
+  but Bit operations actually index into individual bits in some shared word. */
+class Bitvector::Bit { public:
+
+    inline Bit(Bitvector::word_type &w, int bit_offset);
+
+    inline operator bool() const;
+
+    inline Bit &operator=(bool x);
+    inline Bit &operator=(const Bit &x);
+    inline void flip();
+
+    inline Bit &operator&=(bool x);
+    inline Bit &operator|=(bool x);
+    inline Bit &operator^=(bool x);
+    inline Bit &operator-=(bool x);
+
+  private:
+
+    Bitvector::word_type &_p;
+    Bitvector::word_type _mask;
+
+};
+
+
+/** @brief Construct an empty bitvector. */
+inline Bitvector::Bitvector()
+    : _max(-1), _data(_f) {
+    _f[0] = 0;
+}
+
+/** @brief Construct an all-false bitvector with @a n elements.
+    @pre @a n >= 0 */
+inline Bitvector::Bitvector(int n)
+    : _data(_f) {
+    assert(n >= 0);
+    if (n <= inlinebits) {
+	_max = n - 1;
+	memset(_f, 0, sizeof(_f));
+    } else {
+	_max = -1;
+	resize(n);
+    }
+}
+
+/** @brief Construct a @a bit-valued length-1 bitvector. */
+inline Bitvector::Bitvector(bool bit)
+    : _max(0), _data(_f) {
+    _f[0] = bit;
+}
+
+/** @brief Construct a @a bit-valued length-@a n bitvector.
+    @pre @a n >= 0 */
+inline Bitvector::Bitvector(int n, bool b)
+    : _max(-1), _data(_f) {
+    assign(n, b);
+}
+
+/** @brief Construct a bitvector as a copy of @a x. */
+inline Bitvector::Bitvector(const Bitvector &x)
+    : _max(x._max), _data(_f) {
+    if (_max < inlinebits)
+	memcpy(_data, x._data, ninline * sizeof(word_type));
+    else
+	finish_copy_constructor(x);
+}
+
+/** @brief Destroy a bitvector.
+
+    All outstanding Bit objects become invalid. */
+inline Bitvector::~Bitvector() {
+    if (_data != _f)
+	delete[] _data;
+}
+
+/** @brief Return the number of bits in the bitvector. */
+inline int Bitvector::size() const {
+    return _max + 1;
+}
+
+/** @brief Test if the bitvector contains at least one true bit.
+    @sa zero() */
+inline Bitvector::operator unspecified_bool_type() const {
+    return !zero() ? &Bitvector::zero : 0;
+}
+
+/** @brief Test if the bitvector contains no true bits.
+    @sa zero() */
+inline bool Bitvector::operator!() const {
+    return zero();
+}
+
+/** @brief Return the bit at position @a i.
+    @pre 0 <= @a i < size() */
+inline Bitvector::Bit Bitvector::operator[](int i) {
+    assert(i >= 0 && i <= _max);
+    return Bit(_data[i>>wshift], i & wmask);
+}
+
+/** @overload */
+inline bool Bitvector::operator[](int i) const {
+    assert(i >= 0 && i <= _max);
+    return (_data[i>>wshift] & (word_type(1) << (i & wmask))) != 0;
+}
+
+/** @brief Return the bit at position @a i, extending if necessary.
+
+    If @a i >= size(), then the bitvector is resize()d to length @a i+1,
+    which adds false bits to fill out the vector.
+
+    @pre 0 <= @a i
+    @post @a i < size() */
+inline Bitvector::Bit Bitvector::force_bit(int i) {
+    assert(i >= 0);
+    if (i > _max)
+	resize(i + 1);
+    return Bit(_data[i>>wshift], i & wmask);
+}
+
+/** @brief Return the number of valid data words. */
+inline int Bitvector::word_size() const {
+    return (_max + wbits) >> wshift;
+}
+
+/** @brief Return the index of the maximum valid data word. */
+inline int Bitvector::max_word() const {
+    return (_max < 0 ? -1 : _max >> wshift);
+}
+
+/** @brief Return a pointer to this bitvector's data words. */
+inline Bitvector::word_type *Bitvector::words() {
+    return _data;
+}
+
+/** @overload */
+inline const Bitvector::word_type *Bitvector::words() const {
+    return _data;
+}
+
+/** @cond never */
+inline Bitvector::word_type *Bitvector::data_words() {
+    return _data;
+}
+inline const Bitvector::word_type *Bitvector::data_words() const {
+    return _data;
+}
+/** @endcond never */
+
+/** @brief Test bitvectors for equality. */
+inline bool operator==(const Bitvector &a, const Bitvector &b) {
+    return a.size() == b.size()
+	&& memcmp(a.words(), b.words(), a.word_size() * sizeof(Bitvector::word_type)) == 0;
+}
+
+/** @brief Test bitvectors for inequality. */
+inline bool operator!=(const Bitvector &a, const Bitvector &b) {
+    return !(a == b);
+}
+
+/** @brief Modify this bitvector by bitwise subtraction with @a x.
+    @pre @a x.size() == size()
+    @return *this
+
+    Equivalent to <code>*this &= ~@a x</code>. */
+inline Bitvector &Bitvector::operator-=(const Bitvector &x) {
+    return *this &= ~x;
+}
+
+/** @brief Flip all bits in this bitvector.
+    @sa negate() */
+inline void Bitvector::negate() {
+    flip();
+}
+
+/** @brief Return the bitwise negation of this bitvector. */
+inline Bitvector Bitvector::operator~() const {
+    Bitvector m = *this;
+    m.flip();
+    return m;
+}
+
+/** @brief Return the bitwise and of two bitvectors.
+    @pre @a a.size() == @a b.size() */
+inline Bitvector operator&(Bitvector a, const Bitvector &b) {
+    return a &= b;
+}
+
+/** @brief Return the bitwise or of two bitvectors.
+    @pre @a a.size() == @a b.size() */
+inline Bitvector operator|(Bitvector a, const Bitvector &b) {
+    return a |= b;
+}
+
+/** @brief Return the bitwise exclusive or of two bitvectors.
+    @pre @a a.size() == @a b.size() */
+inline Bitvector operator^(Bitvector a, const Bitvector &b) {
+    return a ^= b;
+}
+
+/** @brief Return the bitwise subtraction of two bitvectors.
+    @pre @a a.size() == @a b.size()
+
+    <code>a - b</code> is equivalent to <code>a & ~b</code>. */
+inline Bitvector operator-(Bitvector a, const Bitvector &b) {
+    return a & ~b;
+}
+
+inline void click_swap(Bitvector &a, Bitvector &b) {
+    a.swap(b);
+}
+
+inline void assign_consume(Bitvector &a, Bitvector &b) {
+    a.swap(b);
+}
+
+
+/** @brief Construct a bit at offset @a bit_offset in data word @a w. */
+inline Bitvector::Bit::Bit(Bitvector::word_type &w, int bit_offset)
+    : _p(w), _mask(Bitvector::word_type(1) << bit_offset) {
+}
+
+/** @brief Test if this bit is true. */
+inline Bitvector::Bit::operator bool() const {
+    return (_p & _mask) != 0;
+}
+
+/** @brief Set this bit to @a x. */
+inline Bitvector::Bit &Bitvector::Bit::operator=(bool x) {
+    if (x)
+	_p |= _mask;
+    else
+	_p &= ~_mask;
+    return *this;
+}
+
+/** @overload */
+inline Bitvector::Bit &Bitvector::Bit::operator=(const Bit &x) {
+    if (x._p & x._mask)
+	_p |= _mask;
+    else
+	_p &= ~_mask;
+    return *this;
+}
+
+/** @brief Flip this bit. */
+inline void Bitvector::Bit::flip() {
+    _p ^= _mask;
+}
+
+/** @brief Modify this bit by bitwise and with @a x. */
+inline Bitvector::Bit &Bitvector::Bit::operator&=(bool x) {
+    if (!x)
+	_p &= ~_mask;
+    return *this;
+}
+
+/** @brief Modify this bit by bitwise or with @a x. */
+inline Bitvector::Bit &Bitvector::Bit::operator|=(bool x) {
+    if (x)
+	_p |= _mask;
+    return *this;
+}
+
+/** @brief Modify this bit by bitwise exclusive or with @a x. */
+inline Bitvector::Bit &Bitvector::Bit::operator^=(bool x) {
+    if (x)
+	_p ^= _mask;
+    return *this;
+}
+
+/** @brief Modify this bit by bitwise subtraction with @a x. */
+inline Bitvector::Bit &Bitvector::Bit::operator-=(bool x) {
+    if (x)
+	_p &= ~_mask;
+    return *this;
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/clp.h b/openflow/include/click/clp.h
new file mode 100644
index 0000000..58c207c
--- /dev/null
+++ b/openflow/include/click/clp.h
@@ -0,0 +1,334 @@
+/* -*- related-file-name: "../../lib/clp.c" -*- */
+#ifndef LCDF_CLP_H
+#define LCDF_CLP_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* clp.h - Public interface to CLP.
+ * This file is part of CLP, the command line parser package.
+ *
+ * Copyright (c) 1997-2014 Eddie Kohler, ekohler@gmail.com
+ *
+ * CLP is free software. It is distributed under the GNU General Public
+ * License, Version 2, or, alternatively and at your discretion, under the
+ * more permissive (BSD-like) Click LICENSE file as described below.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, subject to the
+ * conditions listed in the Click LICENSE file, which is available in full at
+ * http://github.com/kohler/click/blob/master/LICENSE. The conditions
+ * include: you must preserve this copyright notice, and you cannot mention
+ * the copyright holders in advertising related to the Software without
+ * their permission. The Software is provided WITHOUT ANY WARRANTY, EXPRESS
+ * OR IMPLIED. This notice is a summary of the Click LICENSE file; the
+ * license in that file is binding. */
+
+#include <stdio.h>
+#include <stdarg.h>
+
+typedef struct Clp_Option Clp_Option;
+typedef struct Clp_Parser Clp_Parser;
+typedef struct Clp_ParserState Clp_ParserState;
+
+
+/** @brief Option description.
+ *
+ * CLP users declare arrays of Clp_Option structures to specify what options
+ * should be parsed.
+ * @sa Clp_NewParser, Clp_SetOptions */
+struct Clp_Option {
+    const char *long_name;	/**< Name of long option, or NULL if the option
+				     has no long name. */
+    int short_name;		/**< Character defining short option, or 0 if
+				     the option has no short name. */
+    int option_id;		/**< User-specified ID defining option,
+				     returned by Clp_Next. */
+    int val_type;		/**< ID of option's value type, or 0 if option
+				     takes no value. */
+    int flags;			/**< Option parsing flags. */
+};
+
+/** @name Value types
+ * These values describe the type of an option's argument and are used in
+ * the Clp_Option val_type field.  For example, if an option took integers, its
+ * Clp_Option structure would have val_type set to Clp_ValInt. */
+/**@{*/
+#define Clp_NoVal		0	/**< @brief Option takes no value. */
+#define Clp_ValString		1	/**< @brief Option value is an
+					     arbitrary string. */
+#define Clp_ValStringNotOption	2	/**< @brief Option value is a
+					     non-option string.
+
+		See Clp_DisallowOptions. */
+#define Clp_ValBool		3	/**< @brief Option value is a
+					     boolean.
+
+		Accepts "true", "false", "yes", "no", "1", and "0", or any
+		prefixes thereof.  The match is case-insensitive. */
+#define Clp_ValInt		4	/**< @brief Option value is a
+					     signed int.
+
+		Accepts an optional "+" or "-" sign, followed by one or more
+		digits.  The digits may be include a "0x" or "0X" prefix, for
+		a hexadecimal number, or a "0" prefix, for an octal number;
+		otherwise it is decimal. */
+#define Clp_ValUnsigned		5	/**< @brief Option value is an
+					     unsigned int.
+
+		Accepts an optional "+" sign, followed by one or more
+		digits.  The digits may be include a "0x" or "0X" prefix, for
+		a hexadecimal number, or a "0" prefix, for an octal number;
+		otherwise it is decimal. */
+#define Clp_ValLong             6       /**< @brief Option value is a
+                                             signed long. */
+#define Clp_ValUnsignedLong     7       /**< @brief Option value is an
+                                             unsigned long. */
+#define Clp_ValDouble		8	/**< @brief Option value is a
+					     double.
+		Accepts a real number as defined by strtod(). */
+#define Clp_ValFirstUser	10	/**< @brief Value types >=
+					     Clp_ValFirstUser are available
+					     for user types. */
+/**@}*/
+
+/** @name Option flags
+ * These flags are used in the Clp_Option flags field. */
+/**@{*/
+#define Clp_Mandatory		(1<<0)	/**< @brief Option flag: value
+					     is mandatory.
+
+		It is an error if the option has no value.  This is the
+		default if an option has arg_type != 0 and the Clp_Optional
+		flag is not provided. */
+#define Clp_Optional		(1<<1)	/**< @brief Option flag: value
+					     is optional. */
+#define Clp_Negate		(1<<2)	/**< @brief Option flag: option
+					     may be negated.
+
+		--no-[long_name] will be accepted in argument lists. */
+#define Clp_OnlyNegated		(1<<3)	/**< @brief Option flag: option
+					     <em>must</em> be negated.
+
+		--no-[long_name] will be accepted in argument lists, but
+		--[long_name] will not.  This is the default if long_name
+		begins with "no-". */
+#define Clp_PreferredMatch	(1<<4)	/**< @brief Option flag: prefer this
+					     option when matching.
+
+		Prefixes of --[long_name] should map to this option, even if
+		other options begin with --[long_name]. */
+/**@}*/
+
+/** @name Option character types
+ * These flags are used in to define character types in Clp_SetOptionChar(). */
+/**@{*/
+/*	Clp_NotOption		0 */
+#define Clp_Short		(1<<0)	/**< @brief Option character begins
+					     a set of short options. */
+#define Clp_Long		(1<<1)	/**< @brief Option character begins
+					     a long option. */
+#define Clp_ShortNegated	(1<<2)	/**< @brief Option character begins
+					     a set of negated short options. */
+#define Clp_LongNegated		(1<<3)	/**< @brief Option character begins
+					     a negated long option. */
+#define Clp_LongImplicit	(1<<4)	/**< @brief Option character can begin
+					     a long option, and is part of that
+					     long option. */
+/**@}*/
+
+#define Clp_NotOption		0	/**< @brief Clp_Next value: argument
+					     was not an option. */
+#define Clp_Done		-1	/**< @brief Clp_Next value: there are
+					     no more arguments. */
+#define Clp_BadOption		-2	/**< @brief Clp_Next value: argument
+					     was an erroneous option. */
+#define Clp_Error		-3	/**< @brief Clp_Next value: internal
+					     CLP error. */
+
+#define Clp_ValSize		40	/**< @brief Minimum size of the
+					     Clp_Parser val.cs field. */
+#define Clp_ValIntSize		10	/**< @brief Minimum size of the
+					     Clp_Parser val.is field. */
+
+
+/** @brief A value parsing function.
+ * @param clp the parser
+ * @param vstr the value to be parsed
+ * @param complain if nonzero, report error messages via Clp_OptionError
+ * @param user_data user data passed to Clp_AddType()
+ * @return 1 if parsing succeeded, 0 otherwise
+ */
+typedef int (*Clp_ValParseFunc)(Clp_Parser *clp, const char *vstr,
+				int complain, void *user_data);
+
+/** @brief A function for reporting option errors.
+ * @param clp the parser
+ * @param message error message
+ */
+typedef void (*Clp_ErrorHandler)(Clp_Parser *clp, const char *message);
+
+
+/** @brief Command line parser.
+ *
+ * A Clp_Parser object defines an instance of CLP, including allowed options,
+ * value types, and current arguments.
+ * @sa Clp_NewParser, Clp_SetOptions, Clp_SetArguments */
+struct Clp_Parser {
+    const Clp_Option *option;	/**< The last option. */
+
+    int negated;		/**< Whether the last option was negated. */
+
+    int have_val;		/**< Whether the last option had a value. */
+    const char *vstr;		/**< The string value provided with the last
+				     option. */
+
+    union {
+	int i;
+	unsigned u;
+        long l;
+        unsigned long ul;
+	double d;
+	const char *s;
+	void *pv;
+#ifdef HAVE_INT64_TYPES
+	int64_t i64;
+	uint64_t u64;
+#endif
+	char cs[Clp_ValSize];
+	unsigned char ucs[Clp_ValSize];
+	int is[Clp_ValIntSize];
+	unsigned us[Clp_ValIntSize];
+    } val;			/**< The parsed value provided with the last
+				     option. */
+
+    void *user_data;		/**< Uninterpreted by CLP; users can set
+				     arbitrarily. */
+
+    struct Clp_Internal *internal;
+};
+
+/** @cond never */
+#if __GNUC__ >= 4
+# define CLP_SENTINEL		__attribute__((sentinel))
+#else
+# define CLP_SENTINEL		/* nothing */
+#endif
+/** @endcond never */
+
+
+/** @brief Create a new Clp_Parser. */
+Clp_Parser *Clp_NewParser(int argc, const char * const *argv,
+			  int nopt, const Clp_Option *opt);
+
+/** @brief Destroy a Clp_Parser object. */
+void Clp_DeleteParser(Clp_Parser *clp);
+
+
+/** @brief Return @a clp's program name. */
+const char *Clp_ProgramName(Clp_Parser *clp);
+
+/** @brief Set @a clp's program name. */
+const char *Clp_SetProgramName(Clp_Parser *clp, const char *name);
+
+
+/** @brief Set @a clp's error handler function. */
+Clp_ErrorHandler Clp_SetErrorHandler(Clp_Parser *clp, Clp_ErrorHandler errh);
+
+/** @brief Set @a clp's UTF-8 mode. */
+int Clp_SetUTF8(Clp_Parser *clp, int utf8);
+
+/** @brief Return @a clp's treatment of character @a c. */
+int Clp_OptionChar(Clp_Parser *clp, int c);
+
+/** @brief Set @a clp's treatment of character @a c. */
+int Clp_SetOptionChar(Clp_Parser *clp, int c, int type);
+
+/** @brief Set @a clp's option definitions. */
+int Clp_SetOptions(Clp_Parser *clp, int nopt, const Clp_Option *opt);
+
+/** @brief Set @a clp's arguments. */
+void Clp_SetArguments(Clp_Parser *clp, int argc, const char * const *argv);
+
+/** @brief Set whether @a clp is searching for options. */
+int Clp_SetOptionProcessing(Clp_Parser *clp, int on);
+
+
+#define Clp_DisallowOptions	(1<<0)	/**< @brief Value type flag: value
+					     can't be an option string.
+
+		See Clp_AddType(). */
+
+/** @brief Define a new value type for @a clp. */
+int Clp_AddType(Clp_Parser *clp, int val_type, int flags,
+		Clp_ValParseFunc parser, void *user_data);
+
+
+#define Clp_AllowNumbers	(1<<0)	/**< @brief String list flag: allow
+					     explicit numbers.
+
+		See Clp_AddStringListType() and Clp_AddStringListTypeVec(). */
+#define Clp_StringListLong      (1<<1)  /**< @brief String list flag: values
+                                             have long type. */
+
+/** @brief Define a new string list value type for @a clp. */
+int Clp_AddStringListTypeVec(Clp_Parser *clp, int val_type, int flags,
+			     int nstrs, const char * const *strs,
+			     const int *vals);
+
+/** @brief Define a new string list value type for @a clp. */
+int Clp_AddStringListType(Clp_Parser *clp, int val_type, int flags, ...)
+			  CLP_SENTINEL;
+
+
+/** @brief Parse and return the next argument from @a clp. */
+int Clp_Next(Clp_Parser *clp);
+
+/** @brief Return the next argument from @a clp without option parsing. */
+const char *Clp_Shift(Clp_Parser *clp, int allow_options);
+
+
+/** @brief Create a new Clp_ParserState. */
+Clp_ParserState *Clp_NewParserState(void);
+
+/** @brief Destroy a Clp_ParserState object. */
+void Clp_DeleteParserState(Clp_ParserState *state);
+
+/** @brief Save @a clp's current state in @a state. */
+void Clp_SaveParser(const Clp_Parser *clp, Clp_ParserState *state);
+
+/** @brief Restore parser state from @a state into @a clp. */
+void Clp_RestoreParser(Clp_Parser *clp, const Clp_ParserState *state);
+
+
+/** @brief Report a parser error. */
+int Clp_OptionError(Clp_Parser *clp, const char *format, ...);
+
+/** @brief Format a message. */
+int Clp_vsnprintf(Clp_Parser* clp, char* str, size_t size,
+                  const char* format, va_list val);
+
+/** @brief Print a message. */
+int Clp_fprintf(Clp_Parser* clp, FILE* f, const char* format, ...);
+
+/** @brief Print a message. */
+int Clp_vfprintf(Clp_Parser* clp, FILE* f, const char* format, va_list val);
+
+/** @brief Extract the current option as a string. */
+int Clp_CurOptionNameBuf(Clp_Parser *clp, char *buf, int len);
+
+/** @brief Extract the current option as a string. */
+const char *Clp_CurOptionName(Clp_Parser *clp);
+
+/** @brief Test if the current option had long name @a name. */
+int Clp_IsLong(Clp_Parser *clp, const char *long_name);
+
+/** @brief Test if the current option had short name @a name. */
+int Clp_IsShort(Clp_Parser *clp, int short_name);
+
+#undef CLP_SENTINEL
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/openflow/include/click/config-bsdmodule.h b/openflow/include/click/config-bsdmodule.h
new file mode 100644
index 0000000..1f9ef4d
--- /dev/null
+++ b/openflow/include/click/config-bsdmodule.h
@@ -0,0 +1,87 @@
+/* include/click/config-bsdmodule.h.  Generated from config-bsdmodule.h.in by configure.  */
+/* Process this file with configure to produce config-bsdmodule.h. -*- mode: c -*- */
+#ifndef CLICK_CONFIG_BSDMODULE_H
+#define CLICK_CONFIG_BSDMODULE_H
+
+/* Define stuff under a FreeBSD module. */
+#ifndef __FreeBSD__
+# error "I must be compiled on a FreeBSD machine"
+#endif
+
+/* Define if Click should use an adaptive scheduler to share the CPU(s) more
+   fairly with the kernel. */
+/* #undef HAVE_ADAPTIVE_SCHEDULER */
+
+/* Define if your BSD kernel has polling extensions. */
+/* #undef HAVE_BSD_POLLING */
+
+/* Define if your BSD kernel has Click extensions. */
+/* #undef HAVE_CLICK_BSD_KERNEL */
+
+/* Define if 'int64_t' is typedefed to 'long' in bsdmodule. */
+/* #undef HAVE_INT64_IS_LONG_BSDMODULE */
+
+/* Define if 'int64_t' is typedefed to 'long long' in bsdmodule. */
+/* #undef HAVE_INT64_IS_LONG_LONG_BSDMODULE */
+
+/* Define to enable assertion checking. Failed assertions will print a message
+   and optionally stop the router. */
+/* #undef HAVE_KERNEL_ASSERT */
+
+/* Define if NETISR scheduling should be used. */
+#define BSD_NETISRSCHED 1
+
+/* The size of a `click_jiffies_t', as computed by sizeof. */
+#define SIZEOF_CLICK_JIFFIES_T SIZEOF_INT
+
+/* Include integer and other type definitions. */
+#include <sys/types.h>
+
+/* Define assert macro. */
+# ifdef __cplusplus
+extern "C" {
+# endif
+void click_assert_failed(const char *file, int line, const char *problem_text);
+# ifdef __cplusplus
+}
+# endif
+
+#ifdef HAVE_KERNEL_ASSERT
+# define assert(x)	((x) ? (void)0 : click_assert_failed(__FILE__, __LINE__, #x))
+#else
+# define assert(x)	/* nada */
+#endif
+
+/* Define likely and unlikely macros. */
+#define likely(x)	__builtin_expect(!!(x), 1)
+#define unlikely(x)	__builtin_expect(!!(x), 0)
+
+/* Define HAVE_INT64_IS_LONG based on HAVE_INT64_IS_LONG_BSDMODULE. */
+#ifdef HAVE_INT64_IS_LONG_BSDMODULE
+# define HAVE_INT64_IS_LONG HAVE_INT64_IS_LONG_BSDMODULE
+#endif
+
+/* Define HAVE_INT64_IS_LONG_LONG based on HAVE_INT64_IS_LONG_LONG_BSDMODULE. */
+#if HAVE_LONG_LONG && defined(HAVE_INT64_IS_LONG_LONG_BSDMODULE)
+# define HAVE_INT64_IS_LONG_LONG HAVE_INT64_IS_LONG_LONG_BSDMODULE
+#endif
+
+#ifdef __cplusplus
+
+/* Declare operator new. */
+void *operator new(size_t) throw ();
+void *operator new[](size_t) throw ();
+
+/* Provide placement new. */
+inline void *operator new(size_t, void *v) throw () { return v; }
+#define HAVE_PLACEMENT_NEW 1
+
+/* Define macros that surround Click declarations. */
+#define CLICK_DECLS		namespace Click {
+#define CLICK_ENDDECLS		}
+#define CLICK_USING_DECLS	using namespace Click;
+#define CLICK_NAME(name)	::Click::name
+
+#endif /* __cplusplus */
+
+#endif /* CLICK_CONFIG_BSDMODULE_H */
diff --git a/openflow/include/click/config-linuxmodule.h b/openflow/include/click/config-linuxmodule.h
new file mode 100644
index 0000000..522e2c4
--- /dev/null
+++ b/openflow/include/click/config-linuxmodule.h
@@ -0,0 +1,283 @@
+/* include/click/config-linuxmodule.h.  Generated from config-linuxmodule.h.in by configure.  */
+/* Process this file with configure to produce config-linuxmodule.h. -*- mode: c -*- */
+#ifndef CLICK_CONFIG_LINUXMODULE_H
+#define CLICK_CONFIG_LINUXMODULE_H
+
+/* Define if Click should use an adaptive scheduler to share the CPU(s) more
+   fairly with the kernel. */
+/* #undef HAVE_ADAPTIVE_SCHEDULER */
+
+/* Define if the AUTOCONF_INCLUDED symbol should be checked. */
+/* #undef HAVE_CHECK_AUTOCONF_INCLUDED */
+
+/* Define if your Linux kernel has Click extensions. */
+/* #undef HAVE_CLICK_KERNEL */
+
+/* Define if your Linux kernel has Click transmit notification extensions. */
+/* #undef HAVE_CLICK_KERNEL_TX_NOTIFY */
+
+/* Define if your Linux kernel has Click skb_recycle. */
+/* #undef HAVE_CLICK_SKB_RECYCLE */
+
+/* Define if fast checksum functions available. */
+#define HAVE_FAST_CHECKSUM 1
+
+/* Define if 'int64_t' is typedefed to 'long' in linuxmodule. */
+/* #undef HAVE_INT64_IS_LONG_LINUXMODULE */
+
+/* Define if 'int64_t' is typedefed to 'long long' in linuxmodule. */
+/* #undef HAVE_INT64_IS_LONG_LONG_LINUXMODULE */
+
+/* Define to enable assertion checking. Failed assertions will print a message
+   and optionally stop the router. */
+/* #undef HAVE_KERNEL_ASSERT */
+
+/* Define if you have the <asm/alternative.h> header file. */
+/* #undef HAVE_LINUX_ASM_ALTERNATIVE_H */
+
+/* Define if you have the <asm/scatterlist.h> header file. */
+/* #undef HAVE_LINUX_ASM_SCATTERLIST_H */
+
+/* Define if you have the <asm/system.h> header file. */
+/* #undef HAVE_LINUX_ASM_SYSTEM_H */
+
+/* Define if your Linux kernel architecture defines atomic_add_return. */
+/* #undef HAVE_LINUX_ATOMIC_ADD_RETURN */
+
+/* Define if your Linux kernel architecture defines atomic_set_mask. */
+/* #undef HAVE_LINUX_ATOMIC_SET_MASK */
+
+/* Define if your Linux kernel architecture defines atomic_cmpxchg. */
+/* #undef HAVE_LINUX_ATOMIC_CMPXCHG */
+
+/* Define if your Linux kernel has files_lock. */
+/* #undef HAVE_LINUX_FILES_LOCK */
+
+/* Define if your Linux kernel has files_lglock. */
+/* #undef HAVE_LINUX_FILES_LGLOCK */
+
+/* Define if you have the d_make_root function. */
+/* #undef HAVE_LINUX_D_MAKE_ROOT */
+
+/* Define if 'struct dentry' has a 'd_child' member. */
+/* #undef HAVE_LINUX_DENTRY_D_CHILD */
+
+/* Define if your Linux kernel has dev_ioctl. */
+/* #undef HAVE_LINUX_DEV_IOCTL */
+
+/* Define if your Linux kernel has devinet_ioctl. */
+/* #undef HAVE_LINUX_DEVINET_IOCTL */
+
+/* Define if your Linux kernel exports get_monotonic_coarse. */
+/* #undef HAVE_LINUX_GET_MONOTONIC_COARSE */
+
+/* Define if your Linux kernel exports getboottime. */
+/* #undef HAVE_LINUX_GETBOOTTIME */
+
+/* Define if your Linux kernel has inet_ctl_sock_create. */
+/* #undef HAVE_LINUX_INET_CTL_SOCK_CREATE */
+
+/* Define if your Linux kernel has inet_ioctl. */
+/* #undef HAVE_LINUX_INET_IOCTL */
+
+/* Define if you have the <linux/ktime.h> header file. */
+/* #undef HAVE_LINUX_KTIME_H */
+
+/* Define if your Linux kernel exports ktime_mono_to_any. */
+/* #undef HAVE_LINUX_KTIME_MONO_TO_ANY */
+
+/* Define if your Linux kernel has polling extensions. */
+/* #undef HAVE_LINUX_POLLING */
+
+/* Define if your Linux kernel has read_net_skbcount. */
+/* #undef HAVE_LINUX_READ_NET_SKBCOUNT */
+
+/* Define if your Linux kernel has sb_lock. */
+/* #undef HAVE_LINUX_SB_LOCK */
+
+/* Define if your Linux kernel has set_cpus_allowed_ptr. */
+/* #undef HAVE_LINUX_SET_CPUS_ALLOWED_PTR */
+
+/* Define if 'struct skb_shared_info' has a 'gso_size' member. */
+/* #undef HAVE_LINUX_SKB_SHINFO_GSO_SIZE */
+
+/* Define if 'struct skb_shared_info' has an 'ip6_frag_id' member. */
+/* #undef HAVE_LINUX_SKB_SHINFO_IP6_FRAG_ID */
+
+/* Define if 'struct skb_shared_info' has an 'tx_flags.flags' member. */
+/* #undef HAVE_LINUX_SKB_SHINFO_TX_FLAGS_UNION */
+
+/* Define if 'struct skb_shared_info' has an 'tx_flags' member defining 'SKBTX_DEV_ZEROCOPY'. */
+/* #undef HAVE_LINUX_SKB_SHINFO_TX_FLAGS_SKBTX_DEV_ZEROCOPY */
+
+/* Define if 'struct skb_shared_info' has a 'tso_size' member. */
+/* #undef HAVE_LINUX_SKB_SHINFO_TSO_SIZE */
+
+/* Define if 'struct skb_shared_info' has a 'ufo_size' member. */
+/* #undef HAVE_LINUX_SKB_SHINFO_UFO_SIZE */
+
+/* Define if 'struct sk_buff' has an 'fclone' member. */
+/* #undef HAVE_LINUX_SKBUFF_FCLONE */
+
+/* Define if 'struct sk_buff' has a 'security' member. */
+/* #undef HAVE_LINUX_SKBUFF_SECURITY */
+
+/* Define if your Linux kernel exposes strlen. */
+/* #undef HAVE_LINUX_STRLEN_EXPOSED */
+
+/* Define if 'struct super_block' has an 's_d_op' member. */
+/* #undef HAVE_LINUX_SUPER_BLOCK_S_D_OP */
+
+/* Define if your Linux kernel has tulip_interrupt_hook. */
+/* #undef HAVE_LINUX_TULIP_INTERRUPT_HOOK */
+
+/* Define if the Click linuxmodule is compiled for a 2.6 or later kernel. */
+/* #undef HAVE_LINUXMODULE_2_6 */
+
+/* Define if the linuxmodule driver might run multiple threads. */
+/* #undef HAVE_LINUXMODULE_MULTITHREAD */
+
+/* Define if you have the net_enable_timestamp function. */
+/* #undef HAVE_NET_ENABLE_TIMESTAMP */
+
+/* Define if you have the netdev_get_tx_queue function. */
+/* #undef HAVE_NETDEV_GET_TX_QUEUE */
+
+/* Define if you have the netdev_uses_dsa_tags function. */
+/* #undef HAVE_NETDEV_USES_DSA_TAGS */
+
+/* Define if you have the netdev_uses_trailer_tags function. */
+/* #undef HAVE_NETDEV_USES_TRAILER_TAGS */
+
+/* Define if your Linux kernel has netdev_rx_handler_register. */
+/* #undef HAVE_LINUX_NETDEV_RX_HANDLER_REGISTER */
+
+/* Define if netif_receive_skb takes 3 arguments. */
+/* #undef HAVE_NETIF_RECEIVE_SKB_EXTENDED */
+
+/* Define if you have the netif_tx_lock function. */
+/* #undef HAVE_NETIF_TX_LOCK */
+
+/* Define if you have the netif_tx_queue_frozen function. */
+/* #undef HAVE_NETIF_TX_QUEUE_FROZEN */
+
+/* Define if you have the skb_dst_drop function. */
+/* #undef HAVE_SKB_DST_DROP */
+
+/* Define if you have the skb_linearize function. */
+/* #undef HAVE_SKB_LINEARIZE */
+
+/* Define if you have the skb_recycle function. */
+/* #undef HAVE_SKB_RECYCLE */
+
+/* Define if you have the skb_recycle_check function. */
+/* #undef HAVE_SKB_RECYCLE_CHECK */
+
+/* Define if you have the strnlen function. */
+#define HAVE_STRNLEN 1
+
+/* Define to 1 if Linux defines the type 'uintptr_t'. */
+/* #undef HAVE_UINTPTR_T_LINUXMODULE */
+
+/* The size of a `click_jiffies_t', as computed by sizeof. */
+#define SIZEOF_CLICK_JIFFIES_T SIZEOF_LONG
+
+/* Define HAVE_INT64_IS_LONG based on HAVE_INT64_IS_LONG_LINUXMODULE. */
+#ifdef HAVE_INT64_IS_LONG_LINUXMODULE
+# define HAVE_INT64_IS_LONG HAVE_INT64_IS_LONG_LINUXMODULE
+#endif
+
+/* Define HAVE_INT64_IS_LONG_LONG based on HAVE_INT64_IS_LONG_LONG_LINUXMODULE. */
+#if defined(HAVE_LONG_LONG) && HAVE_LONG_LONG && defined(HAVE_INT64_IS_LONG_LONG_LINUXMODULE)
+# define HAVE_INT64_IS_LONG_LONG HAVE_INT64_IS_LONG_LONG_LINUXMODULE
+#endif
+
+/* Define HAVE_MULTITHREAD based on HAVE_LINUXMODULE_MULTITHREAD. */
+#ifdef HAVE_LINUXMODULE_MULTITHREAD
+# define HAVE_MULTITHREAD HAVE_LINUXMODULE_MULTITHREAD
+#endif
+
+/* Define if fast checksum functions require correct alignment. */
+#if !defined(__i386__) && !defined(__x86_64__)
+# define FAST_CHECKSUM_ALIGNED 1
+#endif
+
+/* Below here only for normal Click compiles. */
+#ifndef CLICK_CONFIG_LINUXMODULE_SYMBOLS_ONLY
+
+/* Define stuff under a Linux module. */
+#ifndef __linux__
+# error "I must be compiled on a Linux machine"
+#endif
+#define __KERNEL__ 1
+#define MODULE 1
+
+/* Include Linux configuration and type definitions. */
+#if HAVE_CHECK_AUTOCONF_INCLUDED && !defined(AUTOCONF_INCLUDED)
+# include <linux/autoconf.h>
+#endif
+#include <linux/version.h>
+#ifdef __cplusplus
+# include <click/cxxprotect.h>
+# include <asm/types.h>
+# include <linux/types.h>
+# include <click/cxxunprotect.h>
+#else
+# include <asm/types.h>
+# include <linux/types.h>
+#endif
+typedef ptrdiff_t intptr_t;
+#if !HAVE_UINTPTR_T_LINUXMODULE
+typedef unsigned long uintptr_t;
+#endif
+
+/* Define KBUILD symbols. */
+#if !defined(KBUILD_STR)
+# define KBUILD_STR(s)		#s
+# define KBUILD_BASENAME	KBUILD_STR(click)
+# define KBUILD_MODNAME		KBUILD_STR(click)
+#endif
+
+#ifdef __cplusplus
+
+/* Declare operator new. */
+void *operator new(size_t) throw ();
+void *operator new[](size_t) throw ();
+
+/* Provide placement new. */
+inline void *operator new(size_t, void *v) { return v; }
+#define HAVE_PLACEMENT_NEW 1
+
+/* Define macros that surround Click declarations. */
+#define CLICK_DECLS		/* */
+#define CLICK_ENDDECLS		/* */
+#define CLICK_USING_DECLS	/* */
+#define CLICK_NAME(name)	::name
+
+/* Fix incompatibilities between some Linux versions and Click/C++. */
+#include <click/fixconfig.h>
+
+#endif /* __cplusplus */
+
+/* Define assert macro. */
+# ifdef __cplusplus
+extern "C" {
+# endif
+void click_assert_failed(const char *file, int line, const char *problem_text);
+# ifdef __cplusplus
+}
+# endif
+
+#ifdef HAVE_KERNEL_ASSERT
+# define assert(x)	((x) ? (void)0 : click_assert_failed(__FILE__, __LINE__, #x))
+#else
+# define assert(x)	/* nada */
+#endif
+
+/* Some architectures do not have builtin integer functions in kernel. */
+#if defined(__MIPSEL__) || defined(__MIPSEB__)
+# define HAVE_NO_INTEGER_BUILTINS 1
+#endif
+
+#endif /* CLICK_CONFIG_LINUXMODULE_SYMBOLS_ONLY */
+#endif /* CLICK_CONFIG_LINUXMODULE_H */
diff --git a/openflow/include/click/config-minios.h b/openflow/include/click/config-minios.h
new file mode 100644
index 0000000..dabeeb9
--- /dev/null
+++ b/openflow/include/click/config-minios.h
@@ -0,0 +1,215 @@
+/* include/click/config-minios.h.  Generated from config-minios.h.in by configure.  */
+/* Process this file with configure to produce config-minios.h. -*- mode: c -*- */
+#ifndef CLICK_CONFIG_MINIOS_H
+#define CLICK_CONFIG_MINIOS_H
+
+/* Define if you have the <byteswap.h> header file. */
+#define HAVE_BYTESWAP_H 1
+
+/* Define if you have the clock_gettime function. */
+#define HAVE_CLOCK_GETTIME 1
+
+/* Define to 1 if you have the declaration
+   of 'clock_gettime', and to 0 if you don't. */
+#define HAVE_DECL_CLOCK_GETTIME 1
+
+/* Define if you have the ffs function. */
+#define HAVE_FFS 1
+
+/* Define if you have the ffsl function. */
+#define HAVE_FFSL 1
+
+/* Define if you have the ffsll function. */
+#define HAVE_FFSLL 1
+
+/* Floating point arithmetic is allowed. */
+#define HAVE_FLOAT_TYPES 1
+
+/* Define if you have the <ifaddrs.h> header file. */
+#define HAVE_IFADDRS_H 1
+
+/* Define if 'int64_t' is typedefed to 'long' at mini-os. */
+#define HAVE_INT64_IS_LONG_MINIOS 1
+
+/* Define if 'int64_t' is typedefed to 'long long' at mini-os. */
+#define HAVE_INT64_IS_LONG_LONG_MINIOS 0
+
+/* Define if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define if you have the mmap function. */
+#define HAVE_MMAP 1
+
+/* Define if you have the <net/bpf.h> header file. */
+/* #undef HAVE_NET_BPF_H */
+
+/* Define if you have the <net/if_dl.h> header file. */
+/* #undef HAVE_NET_IF_DL_H */
+
+/* Define if you have the <net/if_tap.h> header file. */
+/* #undef HAVE_NET_IF_TAP_H */
+
+/* Define if you have the <net/if_tun.h> header file. */
+/* #undef HAVE_NET_IF_TUN_H */
+
+/* Define if you have the <net/if_types.h> header file. */
+/* #undef HAVE_NET_IF_TYPES_H */
+
+/* Define if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define if you have the <netpacket/packet.h> header file. */
+#define HAVE_NETPACKET_PACKET_H 1
+
+/* Define if <new.h> exists and works. */
+/* #undef HAVE_NEW_H */
+
+/* Define if <new> exists and works. */
+#define HAVE_NEW_HDR 1
+
+/* Placement new is always provided below. */
+#define HAVE_PLACEMENT_NEW 1
+
+/* Define if you have the random function. */
+#define HAVE_RANDOM 1
+
+/* Define if you have the snprintf function. */
+#define HAVE_SNPRINTF 1
+
+/* Define if you have the strerror function. */
+#define HAVE_STRERROR 1
+
+/* Define if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define if you have the strnlen function. */
+#define HAVE_STRNLEN 1
+
+/* Define if you have the strtof function. */
+#define HAVE_STRTOF 1
+
+/* Define if you have the strtold function. */
+#define HAVE_STRTOLD 1
+
+/* Define if you have the strtoul function. */
+#define HAVE_STRTOUL 1
+
+/* Define if you have u_intXX_t types but not uintXX_t types. */
+/* #undef HAVE_U_INT_TYPES */
+
+/* Define if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define if you have the vsnprintf function. */
+#define HAVE_VSNPRINTF 1
+
+/* The size of a `click_jiffies_t', as computed by sizeof. */
+#define SIZEOF_CLICK_JIFFIES_T SIZEOF_INT
+
+/* The size of a `off_t', as computed by sizeof. */
+#define SIZEOF_OFF_T 8
+
+/* Use portable LLRPC */
+#define HAVE_PORTABLE_LLRPC 1
+
+/* Set feature test macros before anything is included. */
+#if HAVE_LARGE_FILE_SUPPORT && HAVE_INT64_TYPES
+# if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS != 64
+#  error "bad _FILE_OFFSET_BITS, did you #include <click/config.h> first?"
+# endif
+# define _LARGEFILE_SOURCE 1
+# define _FILE_OFFSET_BITS 64
+#endif
+#ifdef __APPLE__
+# define _DARWIN_UNLIMITED_SELECT 1
+#endif
+
+/* Include integer type definitions. */
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#include <sys/types.h>
+
+/* Define uint types in terms of u_int types, if necessary. */
+#ifdef HAVE_U_INT_TYPES
+typedef u_int8_t uint8_t;
+typedef u_int16_t uint16_t;
+typedef u_int32_t uint32_t;
+# ifdef HAVE_INT64_TYPES
+typedef u_int64_t uint64_t;
+# endif
+typedef long intptr_t;		/* XXX? */
+typedef unsigned long uintptr_t;
+#endif
+
+/* Define HAVE_INT64_IS_LONG based on HAVE_INT64_IS_LONG_MINIOS. */
+#ifdef HAVE_INT64_IS_LONG_MINIOS
+# define HAVE_INT64_IS_LONG HAVE_INT64_IS_LONG_MINIOS
+#endif
+
+/* Define HAVE_INT64_IS_LONG_LONG based on HAVE_INT64_IS_LONG_LONG_MINIOS. */
+#ifdef HAVE_INT64_IS_LONG_LONG_MINIOS
+# define HAVE_INT64_IS_LONG_LONG HAVE_INT64_IS_LONG_LONG_MINIOS
+#endif
+
+/* If 64-bit integers exist, then 64-bit divide exists. */
+#ifdef HAVE_INT64_TYPES
+# define HAVE_INT64_DIVIDE 1
+#endif
+
+/* Define HAVE_USE_CLOCK_GETTIME if the clock_gettime function is usable. */
+#ifndef HAVE_USE_CLOCK_GETTIME
+# if HAVE_DECL_CLOCK_GETTIME && HAVE_CLOCK_GETTIME
+#  define HAVE_USE_CLOCK_GETTIME 1
+# endif
+#endif
+
+/* Include assert macro. */
+#include <assert.h>
+
+/* Include mini-so base header */
+#ifdef __cplusplus
+extern "C"{
+#endif
+#include <mini-os/os.h>
+#ifdef __cplusplus
+}
+#endif
+
+/* Define if mmap is allowed. */
+#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MMAP)
+# define ALLOW_MMAP 1
+#endif
+
+/* Prototype strerror if we don't have it. */
+#ifndef HAVE_STRERROR
+char *strerror(int errno);
+#endif
+
+/* Use nanosecond-granularity timestamps if they are enabled. */
+#if HAVE_NANOTIMESTAMP_ENABLED
+# define TIMESTAMP_NANOSEC 1
+#endif
+
+#ifdef __cplusplus
+
+/* Provide placement new. */
+#if HAVE_NEW_HDR
+# include <new>
+#elif HAVE_NEW_H
+# include <new.h>
+#else
+inline void *operator new(size_t, void *v) { return v; }
+#endif
+
+/* Define macros that surround Click declarations. */
+#ifndef CLICK_DECLS
+# define CLICK_DECLS		/* */
+# define CLICK_ENDDECLS		/* */
+# define CLICK_USING_DECLS	/* */
+# define CLICK_NAME(name)	::name
+#endif
+
+#endif /* __cplusplus */
+
+#endif /* CLICK_CONFIG_MINIOS_H */
diff --git a/openflow/include/click/config-ns.h b/openflow/include/click/config-ns.h
new file mode 100644
index 0000000..8f2d90c
--- /dev/null
+++ b/openflow/include/click/config-ns.h
@@ -0,0 +1,23 @@
+/* include/click/config-ns.h.  Generated from config-ns.h.in by configure.  */
+/* Process this file with configure to produce config-ns.h. -*- mode: c -*- */
+#ifndef CLICK_CONFIG_NS_H
+#define CLICK_CONFIG_NS_H
+
+#ifdef __cplusplus
+
+/* Define macros that surround Click declarations. */
+#define CLICK_DECLS		namespace Click {
+#define CLICK_ENDDECLS		}
+#define CLICK_USING_DECLS	using namespace Click;
+#define CLICK_NAME(name)	::Click::name
+
+#endif /* __cplusplus */
+
+/* The ns driver probably can't use clock_gettime. */
+#define HAVE_USE_CLOCK_GETTIME 0
+
+/* Include userlevel configuration. */
+#define CLICK_USERLEVEL 1
+#include <click/config-userlevel.h>
+
+#endif /* CLICK_CONFIG_NS_H */
diff --git a/openflow/include/click/config-userlevel.h b/openflow/include/click/config-userlevel.h
new file mode 100644
index 0000000..29e480d
--- /dev/null
+++ b/openflow/include/click/config-userlevel.h
@@ -0,0 +1,348 @@
+/* include/click/config-userlevel.h.  Generated from config-userlevel.h.in by configure.  */
+/* Process this file with configure to produce config-userlevel.h. -*- mode: c -*- */
+#ifndef CLICK_CONFIG_USERLEVEL_H
+#define CLICK_CONFIG_USERLEVEL_H
+
+/* Define if you have the __thread storage class specifier. */
+#define HAVE___THREAD_STORAGE_CLASS 1
+
+/* Define if accept() uses socklen_t. */
+#define HAVE_ACCEPT_SOCKLEN_T 1
+
+/* Define if kqueue() may be used to wait for file descriptor events. */
+#define HAVE_ALLOW_KQUEUE 1
+
+/* Define if poll() may be used to wait for file descriptor events. */
+#define HAVE_ALLOW_POLL 1
+
+/* Define if select() may be used to wait for file descriptor events. */
+#define HAVE_ALLOW_SELECT 1
+
+/* Define if <pcap.h> uses bpf_timeval. */
+/* #undef HAVE_BPF_TIMEVAL */
+
+/* Define if you have the <byteswap.h> header file. */
+#define HAVE_BYTESWAP_H 1
+
+/* Define if you have the clock_gettime function. */
+#define HAVE_CLOCK_GETTIME 1
+
+/* Define to 1 if you have the declaration
+   of 'clock_gettime', and to 0 if you don't. */
+#define HAVE_DECL_CLOCK_GETTIME 1
+
+/* Define to 1 if you have the declaration
+   of 'madvise', and to 0 if you don't. */
+#define HAVE_DECL_MADVISE 1
+
+/* Define to 1 if you have the declaration
+   of 'pcap_setnonblock', and to 0 if you don't. */
+#define HAVE_DECL_PCAP_SETNONBLOCK 1
+
+/* Define if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define if dynamic linking is possible. */
+#define HAVE_DYNAMIC_LINKING 1
+
+/* Define if you have the <execinfo.h> header file. */
+#define HAVE_EXECINFO_H 1
+
+/* Define if you have the ffs function. */
+#define HAVE_FFS 1
+
+/* Define if you have the ffsl function. */
+#define HAVE_FFSL 1
+
+/* Define if you have the ffsll function. */
+#define HAVE_FFSLL 1
+
+/* Floating point arithmetic is allowed. */
+#define HAVE_FLOAT_TYPES 1
+
+/* Define if you have the <grp.h> header file. */
+#define HAVE_GRP_H 1
+
+/* Define if the last argument to EV_SET has pointer type. */
+/* #undef HAVE_EV_SET_UDATA_POINTER */
+
+/* Define if 'struct if_data' has an 'ifi_datalen' member. */
+/* #undef HAVE_IF_DATA_IFI_DATALEN */
+
+/* Define if you have the <ifaddrs.h> header file. */
+#define HAVE_IFADDRS_H 1
+
+/* Define if 'int64_t' is typedefed to 'long' at user level. */
+/* #undef HAVE_INT64_IS_LONG_USERLEVEL */
+
+/* Define if 'int64_t' is typedefed to 'long long' at user level. */
+#define HAVE_INT64_IS_LONG_LONG_USERLEVEL 1
+
+/* Define if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define if you have the kqueue function. */
+/* #undef HAVE_KQUEUE */
+
+/* Define if your C library contains large file support. */
+#define HAVE_LARGE_FILE_SUPPORT 1
+
+/* Define if you have the <linux/if_tun.h> header file. */
+#define HAVE_LINUX_IF_TUN_H 1
+
+/* Define if you have the madvise function. */
+#define HAVE_MADVISE 1
+
+/* Define if you have the mmap function. */
+#define HAVE_MMAP 1
+
+/* Define if you have the <net/bpf.h> header file. */
+/* #undef HAVE_NET_BPF_H */
+
+/* Define if you have the <net/if_dl.h> header file. */
+/* #undef HAVE_NET_IF_DL_H */
+
+/* Define if you have the <net/if_tap.h> header file. */
+/* #undef HAVE_NET_IF_TAP_H */
+
+/* Define if you have the <net/if_tun.h> header file. */
+/* #undef HAVE_NET_IF_TUN_H */
+
+/* Define if you have the <net/if_types.h> header file. */
+/* #undef HAVE_NET_IF_TYPES_H */
+
+/* Define if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define if you have the <net/netmap.h> header file. */
+/* #undef HAVE_NET_NETMAP_H */
+
+/* Define if you have the <netpacket/packet.h> header file. */
+#define HAVE_NETPACKET_PACKET_H 1
+
+/* Define if <new.h> exists and works. */
+/* #undef HAVE_NEW_H */
+
+/* Define if <new> exists and works. */
+#define HAVE_NEW_HDR 1
+
+/* Define if you have -lpcap and pcap.h. */
+#define HAVE_PCAP 1
+
+/* Define if you have the pcap_inject function. */
+#define HAVE_PCAP_INJECT 1
+
+/* Define if you have the pcap_sendpacket function. */
+#define HAVE_PCAP_SENDPACKET 1
+
+/* Define if you have the pcap_setdirection function. */
+#define HAVE_PCAP_SETDIRECTION 1
+
+/* Define if you have the pcap_setnonblock function. */
+#define HAVE_PCAP_SETNONBLOCK 1
+
+/* Define if you have the pcap_set_immediate_mode function. */
+#define HAVE_PCAP_SET_IMMEDIATE_MODE 1
+
+/* Define if you have -lproper and prop.h, and proper operations should be
+   preferred to their non-proper counterparts. */
+/* #undef HAVE_PROPER */
+
+/* Define if you have a non-emulated <poll.h> header file. */
+#define HAVE_POLL_H 1
+
+/* Define if you have the pselect function. */
+#define HAVE_PSELECT 1
+
+/* Placement new is always provided below. */
+#define HAVE_PLACEMENT_NEW 1
+
+/* Define to 1 if you have the declaration
+   of 'pthread_setaffinity_np', and to 0 if you don't. */
+/* #undef HAVE_DECL_PTHREAD_SETAFFINITY_NP */
+
+/* Define if you have the <pwd.h> header file. */
+#define HAVE_PWD_H 1
+
+/* Define if you have the random function. */
+#define HAVE_RANDOM 1
+
+/* Define if you have the sigaction function. */
+#define HAVE_SIGACTION 1
+
+/* Define if you have the snprintf function. */
+#define HAVE_SNPRINTF 1
+
+/* Define if 'struct sockaddr_in' has a 'sin_len' member. */
+/* #undef HAVE_SOCKADDR_IN_SIN_LEN */
+
+/* Define if you have the strerror function. */
+#define HAVE_STRERROR 1
+
+/* Define if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define if you have the strnlen function. */
+#define HAVE_STRNLEN 1
+
+/* Define if you have the strtof function. */
+#define HAVE_STRTOF 1
+
+/* Define if you have the strtold function. */
+#define HAVE_STRTOLD 1
+
+/* Define if you have the strtoul function. */
+#define HAVE_STRTOUL 1
+
+/* Define if you have the <sys/event.h> header file. */
+/* #undef HAVE_SYS_EVENT_H */
+
+/* Define if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
+/* Define if you have the tcgetpgrp function. */
+#define HAVE_TCGETPGRP 1
+
+/* Define if you have the <termio.h> header file. */
+#define HAVE_TERMIO_H 1
+
+/* Define if you have u_intXX_t types but not uintXX_t types. */
+/* #undef HAVE_U_INT_TYPES */
+
+/* Define if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define if a Click user-level driver might run multiple threads. */
+/* #undef HAVE_USER_MULTITHREAD */
+
+/* Define if a Click user-level driver uses Intel DPDK. */
+/* #undef HAVE_DPDK */
+
+/* Define if Click should use Valgrind client requests. */
+/* #undef HAVE_VALGRIND */
+
+/* Define if you have the <valgrind/memcheck.h> header file. */
+/* #undef HAVE_VALGRIND_MEMCHECK_H */
+
+/* Define if you have the vsnprintf function. */
+#define HAVE_VSNPRINTF 1
+
+/* The size of a `click_jiffies_t', as computed by sizeof. */
+#define SIZEOF_CLICK_JIFFIES_T SIZEOF_INT
+
+/* The size of a `off_t', as computed by sizeof. */
+#define SIZEOF_OFF_T 8
+
+
+/* Set feature test macros before anything is included. */
+#if HAVE_LARGE_FILE_SUPPORT && HAVE_INT64_TYPES
+# if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS != 64
+#  error "bad _FILE_OFFSET_BITS, did you #include <click/config.h> first?"
+# endif
+# define _LARGEFILE_SOURCE 1
+# define _FILE_OFFSET_BITS 64
+#endif
+#ifdef __APPLE__
+# define _DARWIN_UNLIMITED_SELECT 1
+#endif
+
+/* Include integer type definitions. */
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#include <sys/types.h>
+
+/* Define uint types in terms of u_int types, if necessary. */
+#ifdef HAVE_U_INT_TYPES
+typedef u_int8_t uint8_t;
+typedef u_int16_t uint16_t;
+typedef u_int32_t uint32_t;
+# ifdef HAVE_INT64_TYPES
+typedef u_int64_t uint64_t;
+# endif
+typedef long intptr_t;		/* XXX? */
+typedef unsigned long uintptr_t;
+#endif
+
+/* Define HAVE_INT64_IS_LONG based on HAVE_INT64_IS_LONG_USERLEVEL. */
+#ifdef HAVE_INT64_IS_LONG_USERLEVEL
+# define HAVE_INT64_IS_LONG HAVE_INT64_IS_LONG_USERLEVEL
+#endif
+
+/* Define HAVE_INT64_IS_LONG_LONG based on HAVE_INT64_IS_LONG_LONG_USERLEVEL. */
+#ifdef HAVE_INT64_IS_LONG_LONG_USERLEVEL
+# define HAVE_INT64_IS_LONG_LONG HAVE_INT64_IS_LONG_LONG_USERLEVEL
+#endif
+
+/* If 64-bit integers exist, then 64-bit divide exists. */
+#ifdef HAVE_INT64_TYPES
+# define HAVE_INT64_DIVIDE 1
+#endif
+
+/* Define HAVE_MULTITHREAD based on HAVE_USER_MULTITHREAD. */
+#ifdef HAVE_USER_MULTITHREAD
+# define HAVE_MULTITHREAD HAVE_USER_MULTITHREAD
+#endif
+
+/* Define HAVE_USE_CLOCK_GETTIME if the clock_gettime function is usable. */
+#ifndef HAVE_USE_CLOCK_GETTIME
+# if HAVE_DECL_CLOCK_GETTIME && HAVE_CLOCK_GETTIME
+#  define HAVE_USE_CLOCK_GETTIME 1
+# endif
+#endif
+
+/* Include assert macro. */
+#include <assert.h>
+
+/* Define likely and unlikely macros. */
+#if __GNUC__ >= 3
+# define likely(x)	__builtin_expect(!!(x), 1)
+# define unlikely(x)	__builtin_expect(!!(x), 0)
+#else
+# define likely(x)	(x)
+# define unlikely(x)	(x)
+#endif
+
+/* Define if mmap is allowed. */
+#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MMAP)
+# define ALLOW_MMAP 1
+#endif
+
+/* Prototype strerror if we don't have it. */
+#ifndef HAVE_STRERROR
+char *strerror(int errno);
+#endif
+
+/* Use nanosecond-granularity timestamps if they are enabled. */
+#if HAVE_NANOTIMESTAMP_ENABLED
+# define TIMESTAMP_NANOSEC 1
+# define HAVE_NANOTIMESTAMP 1	/* Deprecated */
+#endif
+
+#ifdef __cplusplus
+
+/* Provide placement new. */
+#if HAVE_NEW_HDR
+# include <new>
+#elif HAVE_NEW_H
+# include <new.h>
+#else
+inline void *operator new(size_t, void *v) { return v; }
+#endif
+
+/* Prototype madvise if we have it, but not the prototype. */
+#if ALLOW_MMAP && HAVE_MADVISE && !HAVE_DECL_MADVISE
+extern "C" int madvise(void *addr, size_t len, int behav);
+#endif
+
+/* Define macros that surround Click declarations. */
+#ifndef CLICK_DECLS
+# define CLICK_DECLS		/* */
+# define CLICK_ENDDECLS		/* */
+# define CLICK_USING_DECLS	/* */
+# define CLICK_NAME(name)	::name
+#endif
+
+#endif /* __cplusplus */
+
+#endif /* CLICK_CONFIG_USERLEVEL_H */
diff --git a/openflow/include/click/config.h b/openflow/include/click/config.h
new file mode 100644
index 0000000..08e2fb9
--- /dev/null
+++ b/openflow/include/click/config.h
@@ -0,0 +1,333 @@
+/* include/click/config.h.  Generated from config.h.in by configure.  */
+/* Process this file with configure to produce config.h. -*- mode: c -*- */
+#ifndef CLICK_CONFIG_H
+#define CLICK_CONFIG_H
+
+/* Define to 1 if type `char' is unsigned and you are not using gcc.  */
+#ifndef __CHAR_UNSIGNED__
+/* # undef __CHAR_UNSIGNED__ */
+#endif
+
+#define CLICK_BIG_ENDIAN	4321
+#define CLICK_LITTLE_ENDIAN	1234
+#define CLICK_NO_ENDIAN		0
+
+/* Define to byte order of target machine. */
+#define CLICK_BYTE_ORDER CLICK_LITTLE_ENDIAN
+
+/* Define to enable debugging support for Click scheduling. */
+/* #undef CLICK_DEBUG_SCHEDULING */
+
+/* Define for Click memory allocation debugging. */
+/* #undef CLICK_DMALLOC */
+
+/* Define to generate smaller object files. */
+/* #undef CLICK_OPTIMIZE_SIZE */
+
+/* Version number of package */
+#define CLICK_VERSION "2.1"
+
+/* Version number of package, in CLICK_MAKE_VERSION_CODE format */
+#define CLICK_VERSION_CODE CLICK_MAKE_VERSION_CODE(2,1,0)
+
+/* Define to desired statistics level. */
+#define CLICK_STATS 0
+
+/* Define if PollDevice should run fast to get good benchmark numbers */
+/* #undef CLICK_WARP9 */
+
+/* Define if you have the __builtin_clz function. */
+#define HAVE___BUILTIN_CLZ 1
+
+/* Define if you have the __builtin_clzl function. */
+#define HAVE___BUILTIN_CLZL 1
+
+/* Define if you have the __builtin_clzll function. */
+#define HAVE___BUILTIN_CLZLL 1
+
+/* Define if you have the __builtin_ffs function. */
+#define HAVE___BUILTIN_FFS 1
+
+/* Define if you have the __builtin_ffsl function. */
+#define HAVE___BUILTIN_FFSL 1
+
+/* Define if you have the __builtin_ffsll function. */
+#define HAVE___BUILTIN_FFSLL 1
+
+/* Define if you have the __has_trivial_copy compiler intrinsic. */
+#define HAVE___HAS_TRIVIAL_COPY 1
+
+/* Define if you have the __sync_synchronize function. */
+#define HAVE___SYNC_SYNCHRONIZE 1
+
+/* Define if the __sync_synchronize function supports arguments. */
+/* #undef HAVE___SYNC_SYNCHRONIZE_ARGUMENTS */
+
+/* Define if the va_list type is addressable. */
+#define HAVE_ADDRESSABLE_VA_LIST 1
+
+/* Define if right shift of signed integers acts by sign extension. */
+#define HAVE_ARITHMETIC_RIGHT_SHIFT 1
+
+/* Define if Port::push/Port::pull should use bound function pointers. */
+/* #undef HAVE_BOUND_PORT_TRANSFER */
+
+/* Define if the C++ compiler understands constexpr. */
+#define HAVE_CXX_CONSTEXPR 1
+
+/* Define if the C++ compiler understands #pragma interface. */
+#define HAVE_CXX_PRAGMA_INTERFACE 1
+
+/* Define if the C++ compiler understands rvalue references. */
+#define HAVE_CXX_RVALUE_REFERENCES 1
+
+/* Define if the C++ compiler understands static_assert. */
+#define HAVE_CXX_STATIC_ASSERT 1
+
+/* Define if the C++ compiler understands template alias. */
+#define HAVE_CXX_TEMPLATE_ALIAS 1
+
+/* Define if the machine is indifferent to alignment. */
+#define HAVE_INDIFFERENT_ALIGNMENT 1
+
+/* Define if you want to use Intel-specific instructions. */
+/* #undef HAVE_INTEL_CPU */
+
+/* Define if 64-bit integer types are enabled. */
+#define HAVE_INT64_TYPES 1
+
+/* Define if IPv6 support is enabled. */
+/* #undef HAVE_IP6 */
+
+/* Define if IPsec support is enabled. */
+/* #undef HAVE_IPSEC */
+
+/* Define to 1 if the system has the type `long long'. */
+#define HAVE_LONG_LONG 1
+
+/* Define if nanosecond-granularity timestamps are enabled. */
+#define HAVE_NANOTIMESTAMP_ENABLED 1
+
+/* Define if you want to use the stride scheduler. */
+#define HAVE_STRIDE_SCHED 1
+
+/* Define to 1 since we have Strings. */
+#define HAVE_STRING 1
+
+/* Define to 1 if the system has the type `struct timespec'. */
+#define HAVE_STRUCT_TIMESPEC 1
+
+#ifdef HAVE_STRIDE_SCHED
+/* Define if you want task scheduling to use a heap, not a linked list. */
+/* #undef HAVE_TASK_HEAP */
+#endif
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of a `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* The size of a `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T 4
+
+/* The size of a `struct timespec', as computed by sizeof. */
+#define SIZEOF_STRUCT_TIMESPEC 8
+
+/* The size of a `struct timeval', as computed by sizeof. */
+#define SIZEOF_STRUCT_TIMEVAL 8
+
+/* The size of a `ptrdiff_t', as computed by sizeof. */
+#define SIZEOF_PTRDIFF_T 4
+
+/* The size of a `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 4
+
+/* Define if you want to run multithreaded Click. */
+/* #undef __MTCLICK__ */
+
+/* Define inline, if necessary. C only. */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define constexpr to const under C or old C++. */
+#if !defined(__cplusplus) || !HAVE_CXX_CONSTEXPR
+# define constexpr const
+#endif
+
+/* Define CLICK_DEBUG_SCHEDULING to 0 if disabled. */
+#ifndef CLICK_DEBUG_SCHEDULING
+# define CLICK_DEBUG_SCHEDULING 0
+#endif
+
+/* Define macro for creating Click version codes (a la Linux version codes). */
+#define CLICK_MAKE_VERSION_CODE(major, minor, patch) \
+		(((major) << 16) | ((minor) << 8) | (patch))
+
+/* Define macro for aligning variables. */
+#if __GNUC__
+# define CLICK_ALIGNED(x) __attribute__((aligned(x)))
+#else
+# define CLICK_ALIGNED(x) /* nothing */
+#endif
+
+/* Define macro for size of a cache line. */
+#define CLICK_CACHE_LINE_SIZE 64
+
+/* Define macro for the difference between 'x' and the next higher multiple
+   of CLICK_CACHE_LINE_SIZE (between 0 and CLICK_CACHE_LINE_SIZE - 1). */
+#define CLICK_CACHE_LINE_PAD_BYTES(x) \
+	((((x) + CLICK_CACHE_LINE_SIZE - 1) / CLICK_CACHE_LINE_SIZE) * CLICK_CACHE_LINE_SIZE - (x))
+
+/* Define macro for deprecated functions. */
+#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ == 0)
+# define CLICK_DEPRECATED /* nothing */
+#else
+# define CLICK_DEPRECATED __attribute__((deprecated))
+#endif
+
+/* Define macro for deprecated functions with message. */
+#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ == 0)
+# define CLICK_DEPRECATED_MSG(m) /* nothing */
+#elif __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)
+# define CLICK_DEPRECATED_MSG(m) __attribute__((deprecated))
+#else
+# define CLICK_DEPRECATED_MSG(m) __attribute__((deprecated(m)))
+#endif
+
+/* Define macro for deprecated enumerations. */
+#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+# define CLICK_DEPRECATED_ENUM /* nothing */
+#else
+# define CLICK_DEPRECATED_ENUM __attribute__((deprecated))
+#endif
+
+/* Define macros for marking types as may-alias. */
+#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+# define CLICK_MAY_ALIAS /* nothing */
+#else
+# define CLICK_MAY_ALIAS __attribute__((__may_alias__))
+#endif
+
+/* Define macro for marking functions noninlinable. */
+#ifdef CLICK_LINUXMODULE
+# define CLICK_NOINLINE noinline
+#elif __GNUC__
+# define CLICK_NOINLINE __attribute__((noinline))
+#else
+# define CLICK_NOINLINE /* nothing */
+#endif
+
+/* Define macro for funtions that should be inline-able even if compiling without optimization. */
+#if __GNUC__
+# define CLICK_ALWAYS_INLINE __attribute__((always_inline))
+#else
+# define CLICK_ALWAYS_INLINE /* nothing */
+#endif
+
+/* Define macros for declaring packed structures. */
+#ifdef __GNUC__
+# define CLICK_PACKED_STRUCTURE(open, close) open close __attribute__((packed))
+# define CLICK_SIZE_PACKED_STRUCTURE(open, close) open close __attribute__((packed)) /* deprecated */
+# define CLICK_SIZE_PACKED_ATTRIBUTE __attribute__((packed))
+#else
+# define CLICK_PACKED_STRUCTURE(open, close) _Cannot_pack_structure__Use_GCC
+# define CLICK_SIZE_PACKED_STRUCTURE(open, close) open close /* deprecated */
+# define CLICK_SIZE_PACKED_ATTRIBUTE
+#endif
+
+/* Define macro for functions whose results should not be ignored. */
+#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+# define CLICK_WARN_UNUSED_RESULT /* nothing */
+#else
+# define CLICK_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+#endif
+
+/* Define macro for cold (rarely used) functions. */
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+# define CLICK_COLD /* nothing */
+#else
+# define CLICK_COLD __attribute__((cold))
+#endif
+
+/* Define ARCH_IS_BIG_ENDIAN based on CLICK_BYTE_ORDER. */
+#if CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN
+# define ARCH_IS_BIG_ENDIAN	1
+#elif CLICK_BYTE_ORDER == CLICK_LITTLE_ENDIAN
+# define ARCH_IS_BIG_ENDIAN	0
+#endif
+
+/* Define macro for htons() on constants (allows htons() in switch cases). */
+#if CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN
+# define click_constant_htons(x)	(x)
+#elif CLICK_BYTE_ORDER == CLICK_LITTLE_ENDIAN
+# define click_constant_htons(x)	((((x) >> 8) & 255) | (((x) & 255) << 8))
+#endif
+
+/* EXPORT_ELEMENT, ELEMENT_REQUIRES, ELEMENT_PROVIDES, ELEMENT_HEADER,
+   ELEMENT_LIBS, and ELEMENT_MT_SAFE are noops. */
+#define EXPORT_ELEMENT(x)
+#define ELEMENT_REQUIRES(x)
+#define ELEMENT_PROVIDES(x)
+#define ELEMENT_HEADER(x)
+#define ELEMENT_LIBS(x)
+#define ELEMENT_MT_SAFE(x)
+
+/* Assume CLICK_USERLEVEL unless otherwise defined. */
+#if !defined(CLICK_USERLEVEL) && !defined(CLICK_TOOL) && !defined(CLICK_LINUXMODULE) && !defined(CLICK_BSDMODULE) && !defined(CLICK_MINIOS)
+# define CLICK_USERLEVEL 1
+#endif
+
+/* Define stuff under a Linux module. */
+#ifdef CLICK_LINUXMODULE
+# include <click/config-linuxmodule.h>
+#endif
+
+/* Define stuff under a FreeBSD module. */
+#ifdef CLICK_BSDMODULE
+# include <click/config-bsdmodule.h>
+#endif
+
+/* Define stuff under nsclick. */
+#ifdef CLICK_NS
+# include <click/config-ns.h>
+#endif
+
+/* Define stuff under tools or a user-level driver. */
+#if defined(CLICK_USERLEVEL) || defined(CLICK_TOOL)
+# include <click/config-userlevel.h>
+#endif
+
+/* Define stuff under a MiniOS application. */
+#ifdef CLICK_MINIOS
+# include <click/config-minios.h>
+#endif
+
+/* Ensure declaration of DefaultArg template. */
+#ifdef __cplusplus
+CLICK_DECLS
+template <typename T> struct DefaultArg;
+
+/** @class uninitialized_type
+    @brief Type tag indicating an object should not be initialized. */
+struct uninitialized_type {
+};
+CLICK_ENDDECLS
+#endif
+
+/* Define aliasing versions of integer and pointer types. */
+typedef uint16_t click_aliasable_uint16_t CLICK_MAY_ALIAS;
+typedef int16_t click_aliasable_int16_t CLICK_MAY_ALIAS;
+typedef uint32_t click_aliasable_uint32_t CLICK_MAY_ALIAS;
+typedef int32_t click_aliasable_int32_t CLICK_MAY_ALIAS;
+#if HAVE_INT64_TYPES
+typedef uint64_t click_aliasable_uint64_t CLICK_MAY_ALIAS;
+typedef int64_t click_aliasable_int64_t CLICK_MAY_ALIAS;
+#endif
+typedef void *click_aliasable_void_pointer_t CLICK_MAY_ALIAS;
+
+#endif /* CLICK_CONFIG_H */
diff --git a/openflow/include/click/confparse.hh b/openflow/include/click/confparse.hh
new file mode 100644
index 0000000..705a08d
--- /dev/null
+++ b/openflow/include/click/confparse.hh
@@ -0,0 +1,743 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/confparse.cc" -*-
+#ifndef CLICK_CONFPARSE_HH
+#define CLICK_CONFPARSE_HH
+/// @cond never
+#include <click/string.hh>
+#include <click/vector.hh>
+struct in_addr;
+#if HAVE_IP6
+struct in6_addr;
+#endif
+CLICK_DECLS
+class ErrorHandler;
+class StringAccum;
+class Timestamp;
+#ifndef CLICK_TOOL
+class Element;
+class Router;
+class Handler;
+class HandlerCall;
+# define CP_VA_PARSE_ARGS_REST	const Element*, ErrorHandler*, ...
+# define CP_OPT_CONTEXT		, const Element* context = 0
+# define CP_CONTEXT		, const Element* context
+# define CP_PASS_CONTEXT	, context
+#else
+# define CP_VA_PARSE_ARGS_REST	ErrorHandler*, ...
+# define CP_OPT_CONTEXT
+# define CP_CONTEXT
+# define CP_PASS_CONTEXT
+#endif
+#ifndef CLICK_COMPILING_CONFPARSE_CC
+# define CLICK_CONFPARSE_DEPRECATED CLICK_DEPRECATED
+#else
+# define CLICK_CONFPARSE_DEPRECATED /* */
+#endif
+#if __GNUC__ <= 3
+# define CP_SENTINEL
+#else
+# define CP_SENTINEL __attribute__((sentinel))
+#endif
+/// @endcond
+
+/// @name Argument Manipulation
+//@{
+const char* cp_skip_space(const char* begin, const char* end);
+const char* cp_skip_comment_space(const char* begin, const char* end);
+const char* cp_skip_double_quote(const char* begin, const char* end);
+bool cp_eat_space(String &str);
+inline bool cp_is_space(const String &str);
+bool cp_is_word(const String &str);
+bool cp_is_click_id(const String &str);
+
+String cp_uncomment(const String &str);
+String cp_unquote(const String &str);
+const char* cp_process_backslash(const char* begin, const char* end, StringAccum &sa);
+String cp_quote(const String &str, bool allow_newlines = false);
+
+void cp_argvec(const String& str, Vector<String>& conf);
+String cp_unargvec(const Vector<String>& conf);
+
+void cp_spacevec(const String& str, Vector<String>& conf);
+
+/// @brief  Remove and return the first space-separated argument from @a str.
+/// @param[in,out]  str  space-separated configuration string
+///
+/// The first space-separated argument in the configuration string is removed
+/// and returned.  The returned argument is passed through cp_uncomment().  @a
+/// str is set to the remaining portion of the string, with any preceding
+/// spaces and comments removed.  If the input string is all spaces and
+/// comments, then both the returned string and @a str will be empty.
+String cp_shift_spacevec(String &str);
+
+String cp_unspacevec(const String *begin, const String *end);
+inline String cp_unspacevec(const Vector<String> &conf);
+//@}
+
+/// @name Direct Parsing Functions
+//@{
+enum CpErrors {
+    CPE_OK = 0,
+    CPE_FORMAT,
+    CPE_NEGATIVE,
+    CPE_OVERFLOW,
+    CPE_INVALID,
+    CPE_MEMORY,
+    CPE_NOUNITS
+};
+extern int cp_errno;
+
+// strings and words
+bool cp_string(const String& str, String* result, String *rest = 0);
+bool cp_word(const String& str, String* result, String *rest = 0);
+bool cp_keyword(const String& str, String* result, String *rest = 0);
+
+bool cp_bool(const String& str, bool* result);
+
+// numbers
+enum { cp_basic_integer_whole = 64 };
+const char *cp_basic_integer(const char *begin, const char *end, int flags, int size, void *result);
+
+inline const char *cp_integer(const char *begin, const char *end, int base, int *result);
+inline const char *cp_integer(const char *begin, const char *end, int base, unsigned *result);
+inline const char *cp_integer(const char *begin, const char *end, int base, long *result);
+inline const char *cp_integer(const char *begin, const char *end, int base, unsigned long *result);
+/// @cond never
+inline const unsigned char *cp_integer(const unsigned char *begin, const unsigned char *end, int base, unsigned *result);
+inline const unsigned char *cp_integer(const unsigned char *begin, const unsigned char *end, int base, unsigned long *result);
+/// @endcond
+#if HAVE_LONG_LONG
+inline const char *cp_integer(const char *begin, const char *end, int base, long long *result);
+inline const char *cp_integer(const char *begin, const char *end, int base, unsigned long long *result);
+/// @cond never
+inline const unsigned char *cp_integer(const unsigned char *begin, const unsigned char *end, int base, unsigned long long *result);
+/// @endcond
+#elif HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG
+inline const char *cp_integer(const char *begin, const char *end, int base, int64_t *result);
+inline const char *cp_integer(const char *begin, const char *end, int base, uint64_t *result);
+/// @cond never
+inline const unsigned char *cp_integer(const unsigned char *begin, const unsigned char *end, int base, uint64_t *result);
+/// @endcond
+#endif
+
+inline bool cp_integer(const String &str, int base, int *result);
+inline bool cp_integer(const String &str, int base, unsigned int *result);
+inline bool cp_integer(const String &str, int base, long *result);
+inline bool cp_integer(const String &str, int base, unsigned long *result);
+#if HAVE_LONG_LONG
+inline bool cp_integer(const String &str, int base, long long *result);
+inline bool cp_integer(const String &str, int base, unsigned long long *result);
+#elif HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG
+inline bool cp_integer(const String &str, int base, int64_t *result);
+inline bool cp_integer(const String &str, int base, uint64_t *result);
+#endif
+
+inline bool cp_integer(const String &str, int *result);
+inline bool cp_integer(const String &str, unsigned int *result);
+inline bool cp_integer(const String &str, long *result);
+inline bool cp_integer(const String &str, unsigned long *result);
+#if HAVE_LONG_LONG
+inline bool cp_integer(const String &str, long long *result);
+inline bool cp_integer(const String &str, unsigned long long *result);
+#elif HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG
+inline bool cp_integer(const String &str, int64_t *result);
+inline bool cp_integer(const String &str, uint64_t *result);
+#endif
+
+#define CP_REAL2_MAX_FRAC_BITS 28
+bool cp_real2(const String& str, int frac_bits, int32_t* result);
+bool cp_real2(const String& str, int frac_bits, uint32_t* result);
+bool cp_real10(const String& str, int frac_digits, int32_t* result);
+bool cp_real10(const String& str, int frac_digits, uint32_t* result);
+bool cp_real10(const String& str, int frac_digits, uint32_t* result_int, uint32_t* result_frac);
+#if HAVE_FLOAT_TYPES
+bool cp_double(const String& str, double* result);
+#endif
+
+bool cp_seconds_as(const String& str, int frac_digits, uint32_t* result);
+bool cp_seconds_as_milli(const String& str, uint32_t* result);
+bool cp_seconds_as_micro(const String& str, uint32_t* result);
+#if HAVE_FLOAT_TYPES
+bool cp_seconds(const String& str, double* result);
+#endif
+bool cp_time(const String &str, Timestamp *result, bool allow_negative = false);
+bool cp_time(const String& str, struct timeval* result);
+
+bool cp_bandwidth(const String& str, uint32_t* result);
+
+// network addresses
+class IPAddressList;
+bool cp_ip_address(const String& str, IPAddress* result  CP_OPT_CONTEXT);
+inline bool cp_ip_address(const String& str, struct in_addr* result  CP_OPT_CONTEXT);
+bool cp_ip_address(const String& str, unsigned char* result  CP_OPT_CONTEXT);
+bool cp_ip_prefix(const String& str, IPAddress* result_addr, IPAddress* result_mask, bool allow_bare_address  CP_OPT_CONTEXT);
+bool cp_ip_prefix(const String& str, unsigned char* result_addr, unsigned char* result_mask, bool allow_bare_address  CP_OPT_CONTEXT);
+bool cp_ip_prefix(const String& str, IPAddress* result_addr, IPAddress* result_mask  CP_OPT_CONTEXT);
+bool cp_ip_prefix(const String& str, unsigned char* result_addr, unsigned char* result_mask  CP_OPT_CONTEXT);
+bool cp_ip_address_list(const String& str, Vector<IPAddress>* result  CP_OPT_CONTEXT);
+
+#if HAVE_IP6
+class IP6Address;
+bool cp_ip6_address(const String& str, IP6Address* result  CP_OPT_CONTEXT);
+inline bool cp_ip6_address(const String& str, struct in6_addr* result  CP_OPT_CONTEXT);
+bool cp_ip6_address(const String& str, unsigned char* result  CP_OPT_CONTEXT);
+bool cp_ip6_prefix(const String& str, IP6Address* result_addr, int* result_prefix, bool allow_bare_address  CP_OPT_CONTEXT);
+bool cp_ip6_prefix(const String& str, unsigned char* result_addr, int* result_prefix, bool allow_bare_address  CP_OPT_CONTEXT);
+bool cp_ip6_prefix(const String& str, unsigned char* result_addr, unsigned char* result_mask, bool allow_bare_address  CP_OPT_CONTEXT);
+bool cp_ip6_prefix(const String& str, IP6Address* result_addr, IP6Address* result_mask, bool allow_bare_address  CP_OPT_CONTEXT);
+#endif
+
+class EtherAddress;
+bool cp_ethernet_address(const String& str, EtherAddress* result  CP_OPT_CONTEXT);
+bool cp_ethernet_address(const String& str, unsigned char* result  CP_OPT_CONTEXT);
+
+bool cp_tcpudp_port(const String& str, int proto, uint16_t* result  CP_OPT_CONTEXT);
+
+#if !CLICK_TOOL
+Element *cp_element(const String &str, const Element *context, ErrorHandler *errh = 0, const char *argname = 0);
+Element *cp_element(const String &str, Router *router, ErrorHandler *errh = 0, const char *argname = 0);
+bool cp_handler_name(const String& str, Element** result_element, String* result_hname, const Element* context, ErrorHandler* errh=0);
+bool cp_handler(const String& str, int flags, Element** result_element, const Handler** result_handler, const Element* context, ErrorHandler* errh=0);
+#endif
+
+#if CLICK_USERLEVEL || CLICK_TOOL
+bool cp_filename(const String& str, String* result);
+bool cp_file_offset(const String& str, off_t* result);
+#endif
+
+#if !CLICK_TOOL
+bool cp_anno(const String &str, int size, int *result  CP_OPT_CONTEXT);
+#endif
+//@}
+
+/// @name cp_va_kparse
+//@{
+int cp_va_kparse(const Vector<String>& conf, CP_VA_PARSE_ARGS_REST) CP_SENTINEL;
+int cp_va_kparse(const String& str, CP_VA_PARSE_ARGS_REST) CP_SENTINEL;
+int cp_va_space_kparse(const String& str, CP_VA_PARSE_ARGS_REST) CP_SENTINEL;
+int cp_va_kparse_keyword(const String& str, CP_VA_PARSE_ARGS_REST) CP_SENTINEL;
+int cp_va_kparse_remove_keywords(Vector<String>& conf, CP_VA_PARSE_ARGS_REST) CP_SENTINEL;
+
+int cp_assign_arguments(const Vector<String> &argv, const String *param_begin, const String *param_end, Vector<String>* values = 0);
+
+void cp_va_static_initialize();
+void cp_va_static_cleanup();
+
+/// @brief Type of flags for cp_va_kparse() items.
+enum CpKparseFlags {
+    cpkN = 0,		///< Default flags
+    cpkM = 1,		///< Argument is mandatory
+    cpkP = 2,		///< Argument may be specified positionally
+    cpkC = 4,		///< Argument presence should be confirmed
+    cpkD = 8,		///< Argument is deprecated
+    cpkNormal = cpkN,
+    cpkMandatory = cpkM,
+    cpkPositional = cpkP,
+    cpkConfirm = cpkC,
+    cpkDeprecated = cpkD
+};
+
+/// @brief Type of argument type names for cp_va_kparse() items.
+typedef const char *CpVaParseCmd;
+
+extern const CpVaParseCmd
+    cpEnd,		///< Use as argument name.  Ends cp_va argument list.
+    cpIgnoreRest,	///< Use as argument name.  No result storage; causes cp_va_kparse() to ignore unparsed arguments and any remaining items.
+    cpIgnore,		///< No result storage, ignores this argument.
+    cpArgument,		///< Result storage String*, accepts any argument.
+    cpArguments,	///< Result storage Vector<String>*, accepts any number of arguments with the same keyword.
+    cpString,		///< Result storage String*, parsed by cp_string().
+    cpWord,		///< Result storage String*, parsed by cp_word().
+    cpKeyword,		///< Result storage String*, parsed by cp_keyword().
+    cpBool,		///< Result storage bool*, parsed by cp_bool().
+    cpByte,		///< Result storage unsigned char*, parsed by cp_integer().
+    cpShort,		///< Result storage short*, parsed by cp_integer().
+    cpUnsignedShort,	///< Result storage unsigned short*, parsed by cp_integer().
+    cpInteger,		///< Result storage int32_t*, parsed by cp_integer().
+    cpUnsigned,		///< Result storage uint32_t*, parsed by cp_integer().
+    cpSize,		///< Result storage size_t*, parsed by cp_integer().
+    cpNamedInteger,	///< Parse parameter uint32_t nameinfo_type, result storage int32_t*, parsed by NameInfo::query_int.
+#if HAVE_INT64_TYPES
+    cpInteger64,	///< Result storage int64_t*, parsed by cp_integer().
+    cpUnsigned64,	///< Result storage uint64_t*, parsed by cp_integer().
+#endif
+    cpUnsignedReal2,	///< Parse parameter int frac_bits, result storage uint32_t*, parsed by cp_real2().
+    cpReal10,		///< Parse parameter int frac_digits, result storage int32_t*, parsed by cp_real10().
+    cpUnsignedReal10,	///< Parse parameter int frac_digits, result storage uint32_t*, parsed by cp_real10().
+#if HAVE_FLOAT_TYPES
+    cpDouble,		///< Result storage double*, parsed by cp_double().
+#endif
+    cpSeconds,		///< Result storage uint32_t*, parsed by cp_seconds_as() with frac_digits 0.
+    cpSecondsAsMilli,	///< Result storage uint32_t*, parsed by cp_seconds_as_milli().
+    cpSecondsAsMicro,	///< Result storage uint32_t*, parsed by cp_seconds_as_micro().
+    cpTimestamp,	///< Result storage Timestamp*, parsed by cp_time().
+    cpTimestampSigned,	///< Result storage Timestamp*, parsed by cp_time().
+    cpTimeval,		///< Result storage struct timeval*, parsed by cp_time().
+    cpBandwidth,	///< Result storage uint32_t*, parsed by cp_bandwidth().
+    cpIPAddress,	///< Result storage IPAddress* or equivalent, parsed by cp_ip_address().
+    cpIPPrefix,		///< Result storage IPAddress* addr and IPAddress *mask, parsed by cp_ip_prefix().
+    cpIPAddressOrPrefix,///< Result storage IPAddress* addr and IPAddress *mask, parsed by cp_ip_prefix().
+    cpIPAddressList,	///< Result storage Vector<IPAddress>*, parsed by cp_ip_address_list().
+    cpEtherAddress,	///< Result storage EtherAddress*, parsed by cp_ethernet_address().
+    cpEthernetAddress,	///< Result storage EtherAddress*, parsed by cp_ethernet_address().  Synonym for cpEtherAddress.
+    cpTCPPort,		///< Result storage uint16_t*, parsed by cp_tcpudp_port().
+    cpUDPPort,		///< Result storage uint16_t*, parsed by cp_tcpudp_port().
+    cpElement,		///< Result storage Element**, parsed by cp_element().
+    cpElementCast,	///< Parse parameter const char*, result storage void**, parsed by cp_element() and Element::cast().
+    cpHandlerName,	///< Result storage Element** and String*, parsed by cp_handler_name().
+    cpHandlerCallRead,	///< Result storage HandlerCall*, parsed by HandlerCall.
+    cpHandlerCallWrite,	///< Result storage HandlerCall*, parsed by HandlerCall.
+    cpHandlerCallPtrRead, ///< Result storage HandlerCall**, parsed by HandlerCall::reset_read.
+    cpHandlerCallPtrWrite, ///< Result storage HandlerCall**, parsed by HandlerCall::reset_write.
+    cpIP6Address,	///< Result storage IP6Address* or equivalent, parsed by cp_ip6_address().
+    cpIP6Prefix,	///< Result storage IP6Address* addr and IP6Address* mask, parsed by cp_ip6_prefix().
+    cpIP6PrefixLen,	///< Result storage IP6Address* addr and int* prefix_len, parsed by cp_ip6_prefix().
+    cpIP6AddressOrPrefix,///< Result storage IP6Address* addr and IP6Address* mask, parsed by cp_ip6_prefix().
+#if CLICK_USERLEVEL || CLICK_TOOL
+    cpFilename,		///< Result storage String*, parsed by cp_filename().
+    cpFileOffset,	///< Result storage off_t*, parsed by cp_integer().
+#endif
+#if !CLICK_TOOL
+    cpAnno,		///< Parse parameter int annotation_size, result storage int*, parsed by cp_anno().
+#endif
+    cpOptional,		///< cp_va_parse only: Following arguments are optional.
+    cpKeywords,		///< cp_va_parse only: Following arguments are keywords.
+    cpConfirmKeywords,	///< cp_va_parse only: Following arguments are confirmed keywords.
+    cpMandatoryKeywords;///< cp_va_parse only: Following arguments are mandatory keywords.
+// old names, here for compatibility:
+extern const CpVaParseCmd
+    cpInterval CLICK_CONFPARSE_DEPRECATED,		// struct timeval*
+    cpReadHandlerCall CLICK_CONFPARSE_DEPRECATED,	// HandlerCall**
+    cpWriteHandlerCall CLICK_CONFPARSE_DEPRECATED;	// HandlerCall**
+//@}
+
+/// @name Unparsing
+//@{
+String cp_unparse_bool(bool value);
+String cp_unparse_real2(int32_t value, int frac_bits);
+String cp_unparse_real2(uint32_t value, int frac_bits);
+#if HAVE_INT64_TYPES
+String cp_unparse_real2(int64_t value, int frac_bits);
+String cp_unparse_real2(uint64_t value, int frac_bits);
+#endif
+String cp_unparse_real10(int32_t value, int frac_digits);
+String cp_unparse_real10(uint32_t value, int frac_digits);
+String cp_unparse_milliseconds(uint32_t value);
+String cp_unparse_microseconds(uint32_t value);
+String cp_unparse_interval(const Timestamp& value) CLICK_DEPRECATED;
+String cp_unparse_interval(const struct timeval& value) CLICK_DEPRECATED;
+String cp_unparse_bandwidth(uint32_t value);
+//@}
+
+/// @name Legacy Functions
+//@{
+int cp_va_parse(const Vector<String>& conf, CP_VA_PARSE_ARGS_REST) CLICK_DEPRECATED;
+int cp_va_parse(const String& str, CP_VA_PARSE_ARGS_REST) CLICK_DEPRECATED;
+int cp_va_space_parse(const String& str, CP_VA_PARSE_ARGS_REST) CLICK_DEPRECATED;
+int cp_va_parse_keyword(const String& str, CP_VA_PARSE_ARGS_REST) CLICK_DEPRECATED;
+int cp_va_parse_remove_keywords(Vector<String>& conf, int first, CP_VA_PARSE_ARGS_REST) CLICK_DEPRECATED;
+// Argument syntax:
+// cp_va_arg ::= cpEnd		// terminates argument list (not 0!)
+//    |   cpOptional | cpKeywords | cpIgnore...		// manipulators
+//    |   CpVaParseCmd cmd, const char *description,
+//	  [Optional Helpers], Results
+//				// Helpers and Results depend on 'cmd';
+//				// see table above
+//    |   const char *keyword, CpVaParseCmd cmd, const char *description,
+//	  [Optional Helpers], Results
+//				// keyword argument, within cpKeywords or
+//				// cpMandatoryKeywords
+//    |   const char *keyword, CpVaParseCmd cmd, const char *description,
+//	  bool *keyword_given, [Optional Helpers], Results
+//				// keyword argument, within cpConfirmKeywords
+// Returns the number of result arguments set, or negative on error.
+// Stores no values in the result arguments on error.
+//@}
+
+/// @name Argument Types for cp_va_kparse()
+//@{
+struct cp_value;
+struct cp_argtype;
+
+typedef void (*cp_parsefunc)(cp_value* value, const String& arg,
+			     ErrorHandler* errh, const char* argdesc  CP_CONTEXT);
+typedef void (*cp_storefunc)(cp_value* value  CP_CONTEXT);
+
+struct cp_argtype {
+    const char* name;
+    cp_argtype* next;
+    cp_parsefunc parse;
+    cp_storefunc store;
+    void* user_data;
+    int flags;
+    const char* description;
+    int internal;
+    int use_count;
+};
+
+struct cp_value {
+    // set by cp_va_parse:
+    const cp_argtype* argtype;
+    const char* keyword;
+    const char* description CLICK_CONFPARSE_DEPRECATED;
+    union {
+	int i;
+	const char *c_str;
+	void *p;
+    } extra;
+    void* store;
+    void* store2;
+    bool* store_confirm;
+    // set by parsefunc, used by storefunc:
+    union {
+	bool b;
+	int i;
+	unsigned u;
+	int16_t s16;
+	uint16_t u16;
+	int32_t s32;
+	uint32_t u32;
+#if HAVE_INT64_TYPES
+	int64_t s64;
+	int64_t i64 CLICK_DEPRECATED;
+	uint64_t u64;
+#endif
+	size_t size;
+#if HAVE_FLOAT_TYPES
+	double d;
+#endif
+	unsigned char address[16];
+	int is[4];
+#ifndef CLICK_TOOL
+	Element *element;
+#endif
+	void *p;
+    } v, v2;
+    String v_string;
+    String v2_string;
+};
+
+enum {
+    cpArgNormal = 0, cpArgStore2 = 1, cpArgExtraInt = 2,
+    cpArgExtraCStr = 4, cpArgAllowNumbers = 8
+};
+int cp_register_argtype(const char* name, const char* description, int flags,
+			cp_parsefunc parsefunc, cp_storefunc storefunc,
+			void* user_data = 0);
+void cp_unregister_argtype(const char* name);
+
+int cp_register_stringlist_argtype(const char* name, const char* description,
+				   int flags);
+int cp_extend_stringlist_argtype(const char* name, ...);
+// Takes: const char* name, int value, ...., const char* ender = (const char*)0
+//@}
+
+/// @cond never
+bool cp_seconds_as(int want_power, const String& str, uint32_t* result) CLICK_DEPRECATED;
+
+#define cp_integer64 cp_integer
+#define cp_unsigned64 cp_integer
+#define cp_unsigned cp_integer
+#define cp_unsigned_real10 cp_real10
+#define cp_unsigned_real2 cp_real2
+/// @endcond
+
+/** @brief  Join the strings in @a conf with spaces and return the result.
+ *
+ *  This function does not quote or otherwise protect the strings in @a conf.
+ *  The caller should do that if necessary.
+ *  @sa cp_unspacevec(const String *, const String *) */
+inline String cp_unspacevec(const Vector<String>& conf)
+{
+    return cp_unspacevec(conf.begin(), conf.end());
+}
+
+/** @brief  Test if @a str is all spaces.
+ *  @return True when every character in @a str is a space. */
+inline bool cp_is_space(const String& str)
+{
+    return cp_skip_space(str.begin(), str.end()) == str.end();
+}
+
+/** @brief  Parse an integer from [@a begin, @a end) in base @a base.
+ * @param  begin  first character in string
+ * @param  end    one past last character in string
+ * @param  base   base of integer: 0 or 2-36
+ * @param[out]  result  stores parsed result
+ * @return  pointer to first unparsed character in string; equals @a begin
+ *	     if the string didn't start with a valid integer
+ *
+ * This function parses an integer from the initial characters of a string.
+ * The resulting integer is stored in *@a result.
+ *
+ * The integer format consists of an optional initial sign <tt>+/-</tt>,
+ * followed by one or more digits.  A negative sign is only accepted if @a
+ * result has a signed type.  Digits may be separated by underscores (to make
+ * numbers easier to read), but the first and last characters in the integer
+ * cannot be underscores, and two underscores can't appear in a row.  Some
+ * examples:
+ *
+ * @code
+ * 0
+ * 0x100
+ * -1_000_023
+ * @endcode
+ *
+ * Digits are numbered from 0-9, then A-Z/a-z.  @a base determines which
+ * digits are legal.  If @a base is 0, then a leading <tt>0x</tt> or
+ * <tt>0X</tt> may precede the digits, indicating base 16; a leading
+ * <tt>0</tt> indicates base 8; anything else is base 10.
+ *
+ * Returns the first character that can't be parsed as part of the integer.
+ * If there is no valid integer at the beginning of the string, then returns
+ * @a begin; *@a result is unchanged.
+ *
+ * This function checks for overflow.  If an integer is too large for @a
+ * result, then the maximum possible value is stored in @a result and the
+ * cp_errno variable is set to CPE_OVERFLOW.  Otherwise, cp_errno is set to
+ * CPE_FORMAT (for no valid integer) or CPE_OK (if all was well).
+ *
+ * Overloaded versions of this function are available for int, unsigned int,
+ * long, unsigned long, and (depending on configuration) long long and
+ * unsigned long long @a result values.
+ */
+inline const char *cp_integer(const char *begin, const char *end, int base, int *result)
+{
+    return cp_basic_integer(begin, end, base, -(int) sizeof(*result), result);
+}
+
+/** @brief  Parse an integer from @a str in base @a base.
+ * @param  str   string
+ * @param  base  base of integer: 0 or 2-36
+ * @param[out]  result  stores parsed result
+ * @return  True if @a str parsed correctly, false otherwise.
+ *
+ * Parses an integer from an input string.  If the string correctly parses as
+ * an integer, then the resulting value is stored in *@a result and the
+ * function returns true.  Otherwise, *@a result remains unchanged and the
+ * function returns false.
+ *
+ * Overloaded versions are available for int, unsigned int, long, unsigned
+ * long, and (depending on configuration) long long and unsigned long long @a
+ * result values.
+ *
+ * @sa cp_integer(const char *, const char *, int, int *) for the rules on
+ * parsing integers.
+ */
+inline bool cp_integer(const String &str, int base, int *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), base + cp_basic_integer_whole, -(int) sizeof(*result), result) != str.begin();
+}
+
+
+inline const char *cp_integer(const char *begin, const char *end, int base, unsigned *result)
+{
+    return cp_basic_integer(begin, end, base, (int) sizeof(*result), result);
+}
+
+/// @cond never
+inline const unsigned char *cp_integer(const unsigned char *begin, const unsigned char *end, int base, unsigned *result)
+{
+    return reinterpret_cast<const unsigned char *>(cp_integer(reinterpret_cast<const char *>(begin), reinterpret_cast<const char *>(end), base, result));
+}
+/// @endcond
+
+
+inline const char *cp_integer(const char *begin, const char *end, int base, long *result)
+{
+    return cp_basic_integer(begin, end, base, -(int) sizeof(*result), result);
+}
+
+inline const char *cp_integer(const char *begin, const char *end, int base, unsigned long *result)
+{
+    return cp_basic_integer(begin, end, base, (int) sizeof(*result), result);
+}
+
+/// @cond never
+inline const unsigned char *cp_integer(const unsigned char *begin, const unsigned char *end, int base, unsigned long *result)
+{
+    return reinterpret_cast<const unsigned char *>(cp_integer(reinterpret_cast<const char *>(begin), reinterpret_cast<const char *>(end), base, result));
+}
+/// @endcond
+
+
+#if HAVE_LONG_LONG
+
+inline const char *cp_integer(const char *begin, const char *end, int base, long long *result)
+{
+    return cp_basic_integer(begin, end, base, -(int) sizeof(*result), result);
+}
+
+inline const char *cp_integer(const char *begin, const char *end, int base, unsigned long long *result)
+{
+    return cp_basic_integer(begin, end, base, (int) sizeof(*result), result);
+}
+
+/// @cond never
+inline const unsigned char *cp_integer(const unsigned char *begin, const unsigned char *end, int base, unsigned long long *result)
+{
+    return reinterpret_cast<const unsigned char *>(cp_integer(reinterpret_cast<const char *>(begin), reinterpret_cast<const char *>(end), base, result));
+}
+/// @endcond
+
+#elif HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG
+
+inline const char *cp_integer(const char *begin, const char *end, int base, int64_t *result)
+{
+    return cp_basic_integer(begin, end, base, -(int) sizeof(*result), result);
+}
+
+inline const char *cp_integer(const char *begin, const char *end, int base, uint64_t *result)
+{
+    return cp_basic_integer(begin, end, base, (int) sizeof(*result), result);
+}
+
+/// @cond never
+inline const unsigned char *cp_integer(const unsigned char *begin, const unsigned char *end, int base, uint64_t *result)
+{
+    return reinterpret_cast<const unsigned char *>(cp_integer(reinterpret_cast<const char *>(begin), reinterpret_cast<const char *>(end), base, result));
+}
+/// @endcond
+
+#endif
+
+inline bool cp_integer(const String &str, int base, int *result);
+
+inline bool cp_integer(const String &str, int base, unsigned int *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), base + cp_basic_integer_whole, (int) sizeof(*result), result) != str.begin();
+}
+
+inline bool cp_integer(const String &str, int base, long *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), base + cp_basic_integer_whole, -(int) sizeof(*result), result) != str.begin();
+}
+
+inline bool cp_integer(const String &str, int base, unsigned long *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), base + cp_basic_integer_whole, (int) sizeof(*result), result) != str.begin();
+}
+
+#if HAVE_LONG_LONG
+
+inline bool cp_integer(const String &str, int base, long long *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), base + cp_basic_integer_whole, -(int) sizeof(*result), result) != str.begin();
+}
+
+inline bool cp_integer(const String &str, int base, unsigned long long *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), base + cp_basic_integer_whole, (int) sizeof(*result), result) != str.begin();
+}
+
+#elif HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG
+
+inline bool cp_integer(const String &str, int base, int64_t *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), base + cp_basic_integer_whole, -(int) sizeof(*result), result) != str.begin();
+}
+
+inline bool cp_integer(const String &str, int base, uint64_t *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), base + cp_basic_integer_whole, (int) sizeof(*result), result) != str.begin();
+}
+
+#endif
+
+/** @brief  Parse an integer from @a str in base 0.
+ *
+ *  Same as cp_integer(str, 0, result). */
+inline bool cp_integer(const String &str, int *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), cp_basic_integer_whole, -(int) sizeof(*result), result) != str.begin();
+}
+
+inline bool cp_integer(const String &str, unsigned int *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), cp_basic_integer_whole, (int) sizeof(*result), result) != str.begin();
+}
+
+inline bool cp_integer(const String &str, long *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), cp_basic_integer_whole, -(int) sizeof(*result), result) != str.begin();
+}
+
+inline bool cp_integer(const String &str, unsigned long *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), cp_basic_integer_whole, (int) sizeof(*result), result) != str.begin();
+}
+
+#if HAVE_LONG_LONG
+
+inline bool cp_integer(const String &str, long long *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), cp_basic_integer_whole, -(int) sizeof(*result), result) != str.begin();
+}
+
+inline bool cp_integer(const String &str, unsigned long long *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), cp_basic_integer_whole, (int) sizeof(*result), result) != str.begin();
+}
+
+#elif HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG
+
+inline bool cp_integer(const String &str, int64_t *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), cp_basic_integer_whole, -(int) sizeof(*result), result) != str.begin();
+}
+
+inline bool cp_integer(const String &str, uint64_t *result)
+{
+    return cp_basic_integer(str.begin(), str.end(), cp_basic_integer_whole, (int) sizeof(*result), result) != str.begin();
+}
+
+#endif
+
+inline bool cp_ip_address(const String& str, struct in_addr *ina  CP_CONTEXT)
+{
+    return cp_ip_address(str, reinterpret_cast<IPAddress *>(ina)  CP_PASS_CONTEXT);
+}
+
+#if HAVE_IP6
+inline bool cp_ip6_address(const String& str, struct in6_addr *x  CP_CONTEXT)
+{
+    return cp_ip6_address(str, reinterpret_cast<IP6Address *>(x)  CP_PASS_CONTEXT);
+}
+#endif
+
+/// @cond never
+inline bool cp_seconds_as(int want_power, const String &str, uint32_t *result)
+{
+    return cp_seconds_as(str, want_power, result);
+}
+
+#if !CLICK_TOOL
+inline int cp_register_argtype(const char* name, const char* description, int flags,
+			       void (*parsefunc)(cp_value *, const String &, ErrorHandler *, const char *, Element *),
+			       void (*storefunc)(cp_value *, Element *),
+			       void *user_data = 0) {
+    return cp_register_argtype(name, description, flags,
+			       (cp_parsefunc) parsefunc,
+			       (cp_storefunc) storefunc,
+			       user_data);
+}
+#endif
+
+inline String cp_pop_spacevec(String &str) CLICK_DEPRECATED;
+
+/// @brief  Remove and return the first space-separated argument from @a str.
+/// @param[in,out]  str  space-separated configuration string
+/// @deprecated This is a deprecated synonym for cp_shift_spacevec().
+inline String cp_pop_spacevec(String &str) {
+    return cp_shift_spacevec(str);
+}
+
+#undef CP_VA_ARGS_REST
+#undef CP_OPT_CONTEXT
+#undef CP_CONTEXT
+#undef CP_PASS_CONTEXT
+#undef CLICK_CONFPARSE_DEPRECATED
+#undef CP_SENTINEL
+#define cpEnd ((CpVaParseCmd) 0)
+/// @endcond
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/crc32.h b/openflow/include/click/crc32.h
new file mode 100644
index 0000000..e1db84c
--- /dev/null
+++ b/openflow/include/click/crc32.h
@@ -0,0 +1,14 @@
+/* -*- related-file-name: "../../lib/crc32.c" -*- */
+#ifndef CLICK_CRC32_H
+#define CLICK_CRC32_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+uint32_t update_crc(uint32_t crc_accum, const char *data_blk_ptr,
+		    int data_blk_size);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/openflow/include/click/cxxprotect.h b/openflow/include/click/cxxprotect.h
new file mode 100644
index 0000000..65662af
--- /dev/null
+++ b/openflow/include/click/cxxprotect.h
@@ -0,0 +1,25 @@
+#ifdef __cplusplus
+# define new		linux_new
+# define this		linux_this
+# define delete		linux_delete
+# define class		linux_class
+# define virtual	linux_virtual
+# define typename	linux_typename
+# define protected	linux_protected
+# define public		linux_public
+# define namespace	linux_namespace
+# define false		linux_false
+# define true		linux_true
+#endif
+
+#ifndef CLICK_CXX_PROTECT
+# ifdef __cplusplus
+#  define CLICK_CXX_PROTECT	extern "C" {
+#  define CLICK_CXX_UNPROTECT	}
+# else
+#  define CLICK_CXX_PROTECT	/* nothing */
+#  define CLICK_CXX_UNPROTECT	/* nothing */
+# endif
+#endif
+
+#define CLICK_CXX_PROTECTED 1
diff --git a/openflow/include/click/cxxunprotect.h b/openflow/include/click/cxxunprotect.h
new file mode 100644
index 0000000..5ff3d94
--- /dev/null
+++ b/openflow/include/click/cxxunprotect.h
@@ -0,0 +1,14 @@
+#ifdef __cplusplus
+# undef new
+# undef this
+# undef delete
+# undef class
+# undef virtual
+# undef typename
+# undef protected
+# undef public
+# undef namespace
+# undef false
+# undef true
+#endif
+#undef CLICK_CXX_PROTECTED
diff --git a/openflow/include/click/deque.cc b/openflow/include/click/deque.cc
new file mode 100644
index 0000000..9877263
--- /dev/null
+++ b/openflow/include/click/deque.cc
@@ -0,0 +1,211 @@
+/*
+ * deque.{cc,hh} -- double-ended queue template class
+ * Eddie Kohler, Douglas S. J. De Couto
+ * Based on code from Click Vector<> class (vector.{cc,hh}).
+ *
+ * Copyright (c) 2003 Massachusetts Institute of Technology
+ * Copyright (c) 2011 Eddie Kohler
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the conditions
+ * listed in the Click LICENSE file. These conditions include: you must
+ * preserve this copyright notice, and you cannot mention the copyright
+ * holders in advertising related to the Software without their permission.
+ * The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ * notice is a summary of the Click LICENSE file; the license in that file is
+ * legally binding.
+ */
+
+#ifndef CLICK_DEQUE_CC
+#define CLICK_DEQUE_CC
+#include <click/deque.hh>
+CLICK_DECLS
+/** @cond never */
+
+template <typename AM>
+deque_memory<AM>::~deque_memory()
+{
+    size_type f = naccess(n_);
+    AM::destroy(l_ + head_, f);
+    AM::destroy(l_, n_ - f);
+    CLICK_LFREE(l_, capacity_ * sizeof(type));
+}
+
+template <typename AM>
+void deque_memory<AM>::assign(const deque_memory<AM> &x)
+{
+    if (&x != this) {
+	size_type f = naccess(n_);
+	AM::destroy(l_ + head_, f);
+	AM::destroy(l_, n_ - f);
+	n_ = head_ = 0;
+	if (reserve_and_push(x.n_, false, 0)) {
+	    n_ = x.n_;
+	    AM::mark_undefined(l_, n_);
+	    f = x.naccess(n_);
+	    AM::copy(l_, x.l_ + x.head_, f);
+	    AM::copy(l_ + f, x.l_, n_ - f);
+	}
+    }
+}
+
+template <typename AM>
+void deque_memory<AM>::assign(size_type n, const type *vp)
+{
+    if (unlikely(need_argument_copy(vp))) {
+	type v_copy(*vp);
+	return assign(n, &v_copy);
+    }
+
+    resize(0, vp);
+    resize(n, vp);
+}
+
+template <typename AM>
+bool deque_memory<AM>::insert(size_type i, const type *vp)
+{
+    assert((unsigned) i <= (unsigned) n_);
+    if (unlikely(need_argument_copy(vp))) {
+	type v_copy(*vp);
+	return insert(i, &v_copy);
+    }
+
+    if (n_ == capacity_ && !reserve_and_push(-1, false, 0))
+	return false;
+    size_type srcpp, dstpp, size;
+    int delta;
+    if (i <= n_ - i) {
+	head_ = prevp(head_);
+	srcpp = head_ + 1;
+	dstpp = head_;
+	size = i;
+	delta = 1;
+    } else {
+	srcpp = head_ + n_ - 1;
+	dstpp = head_ + n_;
+	size = n_ - i;
+	delta = -1;
+    }
+    while (size) {
+	AM::mark_undefined(l_ + canonp(dstpp), 1);
+	AM::move(l_ + canonp(dstpp), l_ + canonp(srcpp), 1);
+	dstpp += delta, srcpp += delta, --size;
+    }
+    AM::mark_undefined(l_ + canonp(dstpp), 1);
+    AM::fill(l_ + canonp(dstpp), 1, vp);
+    ++n_;
+    return true;
+}
+
+template <typename AM>
+int deque_memory<AM>::erase(size_type ai, size_type bi)
+{
+    assert(ai >= bi || (ai >= 0 && (unsigned) bi <= (unsigned) n_));
+    if (ai < bi) {
+	size_type srcpp, dstpp, size;
+	int delta;
+	if (ai < n_ - bi) {
+	    srcpp = head_ + ai - 1;
+	    dstpp = head_ + bi - 1;
+	    size = ai;
+	    delta = -1;
+	    head_ = canonp(head_ + bi - ai);
+	} else {
+	    srcpp = head_ + bi;
+	    dstpp = head_ + ai;
+	    size = n_ - bi;
+	    delta = 1;
+	}
+	while (size) {
+	    AM::destroy(l_ + canonp(dstpp), 1);
+	    AM::copy(l_ + canonp(dstpp), l_ + canonp(srcpp), 1);
+	    dstpp += delta, srcpp += delta, --size;
+	}
+	for (size = bi - ai; size; --size, dstpp += delta) {
+	    AM::destroy(l_ + canonp(dstpp), 1);
+	    AM::mark_noaccess(l_ + canonp(dstpp), 1);
+	}
+	n_ -= bi - ai;
+	return ai;
+    } else
+	return bi;
+}
+
+template <typename AM>
+bool deque_memory<AM>::reserve_and_push(size_type want, bool isfront, const type *push_vp)
+{
+    if (unlikely(push_vp && need_argument_copy(push_vp))) {
+	type push_v_copy(*push_vp);
+	return reserve_and_push(want, isfront, &push_v_copy);
+    }
+
+    if (want < 0)
+	want = (capacity_ > 0 ? capacity_ * 2 : 4);
+
+    if (want > capacity_) {
+	type *new_l = (type *) CLICK_LALLOC(want * sizeof(type));
+	if (!new_l)
+	    return false;
+	AM::mark_noaccess(new_l + n_, want - n_);
+	size_type f = naccess(n_);
+	AM::move(new_l, l_ + head_, f);
+	AM::move(new_l + f, l_, n_ - f);
+	CLICK_LFREE(l_, capacity_ * sizeof(type));
+	l_ = new_l;
+	head_ = 0;
+	capacity_ = want;
+    }
+
+    if (unlikely(push_vp))
+	(isfront ? push_front(push_vp) : push_back(push_vp));
+    return true;
+}
+
+template <typename AM>
+void deque_memory<AM>::resize(size_type n, const type *vp)
+{
+    if (unlikely(need_argument_copy(vp))) {
+	type v_copy(*vp);
+	return resize(n, &v_copy);
+    }
+
+    if (n <= capacity_ || reserve_and_push(n, false, 0)) {
+	assert(n >= 0);
+	if (n < n_)
+	    for (size_type p = i2p(n), x = i2p(n_); p != x; p = nextp(p)) {
+		AM::destroy(l_ + p, 1);
+		AM::mark_noaccess(l_ + p, 1);
+	    }
+	if (n_ < n)
+	    for (size_type p = i2p(n_), x = i2p(n); p != x; p = nextp(p)) {
+		AM::mark_undefined(l_ + p, 1);
+		AM::fill(l_ + p, 1, vp);
+	    }
+	n_ = n;
+    }
+}
+
+template <typename AM>
+void deque_memory<AM>::swap(deque_memory<AM> &x)
+{
+    type *l = l_;
+    l_ = x.l_;
+    x.l_ = l;
+
+    size_type head = head_;
+    head_ = x.head_;
+    x.head_ = head;
+
+    size_type n = n_;
+    n_ = x.n_;
+    x.n_ = n;
+
+    size_type capacity = capacity_;
+    capacity_ = x.capacity_;
+    x.capacity_ = capacity;
+}
+
+/** @endcond never */
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/deque.hh b/openflow/include/click/deque.hh
new file mode 100644
index 0000000..5354430
--- /dev/null
+++ b/openflow/include/click/deque.hh
@@ -0,0 +1,687 @@
+#ifndef CLICK_DEQUE_HH
+#define CLICK_DEQUE_HH 1
+#include <click/algorithm.hh>
+#include <click/array_memory.hh>
+CLICK_DECLS
+
+/** @cond never */
+template <typename AM> class deque_memory { public:
+    typedef int size_type;
+    typedef typename AM::type type;
+    inline bool need_argument_copy(const type *argp) const {
+	return fast_argument<type>::is_reference && (uintptr_t) argp - (uintptr_t) l_ < (size_t) (capacity_ * sizeof(type));
+    }
+    inline size_type canonp(size_type p) const {
+	return p < capacity_ ? p : p - capacity_;
+    }
+    inline size_type i2p(size_type i) const {
+	return canonp(head_ + i);
+    }
+    inline size_type prevp(size_type p) const {
+	return p ? p - 1 : capacity_ - 1;
+    }
+    inline size_type nextp(size_type p) const {
+	return p + 1 != capacity_ ? p + 1 : 0;
+    }
+    inline size_type naccess(size_type n) const {
+	return head_ + n <= capacity_ ? n : capacity_ - head_;
+    }
+
+    deque_memory()
+	: l_(0), head_(0), n_(0), capacity_(0) {
+    }
+    ~deque_memory();
+    void assign(const deque_memory<AM> &x);
+    void assign(size_type n, const type *vp);
+    void resize(size_type n, const type *vp);
+    bool insert(int i, const type *vp);
+    int erase(int ai, int bi);
+    inline void push_back(const type *vp) {
+	if (n_ < capacity_) {
+	    size_type p = i2p(n_);
+	    AM::mark_undefined(l_ + p, 1);
+	    AM::fill(l_ + p, 1, vp);
+	    ++n_;
+	} else
+	    reserve_and_push(-1, false, vp);
+    }
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline void move_construct_back(type* vp) {
+	if (n_ < capacity_) {
+	    size_type p = i2p(n_);
+	    AM::mark_undefined(l_ + p, 1);
+	    AM::move_construct(l_ + p, vp);
+	    ++n_;
+	} else
+	    reserve_and_push(-1, false, vp);
+    }
+#endif
+    inline void pop_back() {
+	assert(n_ > 0);
+	--n_;
+	size_type p = i2p(n_);
+	AM::destroy(l_ + p, 1);
+	AM::mark_noaccess(l_ + p, 1);
+    }
+    inline void push_front(const type *vp) {
+	if (n_ < capacity_) {
+	    head_ = prevp(head_);
+	    AM::mark_undefined(l_ + head_, 1);
+	    AM::fill(l_ + head_, 1, vp);
+	    ++n_;
+	} else
+	    reserve_and_push(-1, true, vp);
+    }
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline void move_construct_front(type* vp) {
+	if (n_ < capacity_) {
+	    head_ = prevp(head_);
+	    AM::mark_undefined(l_ + head_, 1);
+	    AM::move_construct(l_ + head_, vp);
+	    ++n_;
+	} else
+	    reserve_and_push(-1, true, vp);
+    }
+#endif
+    inline void pop_front() {
+	assert(n_ > 0);
+	--n_;
+	AM::destroy(l_ + head_, 1);
+	AM::mark_noaccess(l_ + head_, 1);
+	head_ = nextp(head_);
+    }
+    inline void clear() {
+	size_type f = naccess(n_);
+	AM::destroy(l_ + head_, f);
+	AM::destroy(l_, n_ - f);
+	AM::mark_noaccess(l_, capacity_);
+	head_ = n_ = 0;
+    }
+    bool reserve_and_push(size_type n, bool isfront, const type *vp);
+    void swap(deque_memory<AM> &x);
+    type *l_;
+    size_type head_;
+    size_type n_;
+    size_type capacity_;
+};
+/** @endcond never */
+
+template <typename T> class Deque_iterator;
+template <typename T> class Deque_const_iterator;
+
+/** @class Deque
+  @brief Deque template.
+
+  Deque implements a double-ended queue: a growable array that can efficiently
+  add and remove elements at both ends (see push_back(), pop_back(),
+  push_front(), and pop_front()). Its interface should be compatible with
+  C++'s std::deque, although that type has more methods. Deque elements are
+  accessed with operator[] like arrays.
+
+  Deque is implemented using a circular buffer of elements. This makes its
+  operations slightly slower than those of Vector. If you only need to push
+  elements to the end of an array, prefer Vector.
+
+  Example code:
+  @code
+  Deque<int> d;
+  printf("%d\n", d.size());         // prints "0"
+
+  d.push_back(1);
+  d.push_back(2);
+  printf("%d\n", d.size());         // prints "2"
+  printf("%d %d\n", d[0], d[1]);    // prints "1 2"
+
+  d.push_front(0);
+  d.push_front(-1);
+  printf("%d\n", d.size());         // prints "4"
+  printf("%d %d %d %d\n", d[0], d[1], d[2], d[3]);
+                                    // prints "-1 0 1 2"
+
+  d.pop_front();
+  d.pop_back();
+  printf("%d\n", d.size());         // prints "2"
+  printf("%d %d\n", d[0], d[1]);    // prints "0 1"
+  @endcode
+*/
+template <typename T>
+class Deque {
+
+    typedef typename array_memory<T>::type array_memory_type;
+    mutable deque_memory<array_memory_type> vm_;
+
+  public:
+
+    typedef T value_type;		///< Value type.
+    typedef T &reference;		///< Reference to value type.
+    typedef const T &const_reference;	///< Const reference to value type.
+    typedef T *pointer;			///< Pointer to value type.
+    typedef const T *const_pointer;	///< Pointer to const value type.
+
+    /** @brief Type used for value arguments (either T or const T &). */
+    typedef typename fast_argument<T>::type value_argument_type;
+    typedef const T &const_access_type;
+
+    typedef int size_type;		///< Type of sizes (size()).
+
+    typedef Deque_iterator<T> iterator;	///< Iterator type.
+    typedef Deque_const_iterator<T> const_iterator; ///< Const iterator type.
+
+    /** @brief Constant passed to reserve() to grow the deque. */
+    enum { RESERVE_GROW = (size_type) -1 };
+
+
+    explicit inline Deque();
+    explicit inline Deque(size_type n, value_argument_type v);
+    inline Deque(const Deque<T> &x);
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline Deque(Deque<T> &&x);
+#endif
+
+    inline Deque<T> &operator=(const Deque<T> &x);
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline Deque<T> &operator=(Deque<T> &&x);
+#endif
+    inline Deque<T> &assign(size_type n, value_argument_type v = T());
+
+    inline iterator begin();
+    inline iterator end();
+    inline const_iterator begin() const;
+    inline const_iterator end() const;
+    inline const_iterator cbegin() const;
+    inline const_iterator cend() const;
+
+    inline size_type size() const;
+    inline size_type capacity() const;
+    inline bool empty() const;
+    inline void resize(size_type n, value_argument_type v = T());
+    inline bool reserve(size_type n);
+
+    inline T &operator[](size_type i);
+    inline const T &operator[](size_type i) const;
+    inline T &at(size_type i);
+    inline const T &at(size_type i) const;
+    inline T &front();
+    inline const T &front() const;
+    inline T &back();
+    inline const T &back() const;
+
+    inline T &unchecked_at(size_type i);
+    inline const T &unchecked_at(size_type i) const;
+    inline T &at_u(size_type i) CLICK_DEPRECATED;
+    inline const T &at_u(size_type i) const CLICK_DEPRECATED;
+
+    inline void push_back(value_argument_type v);
+#if HAVE_CXX_RVALUE_REFERENCES
+    template <typename A = fast_argument<T> >
+    inline typename A::enable_rvalue_reference push_back(T &&v);
+#endif
+    inline void pop_back();
+    inline void push_front(value_argument_type v);
+#if HAVE_CXX_RVALUE_REFERENCES
+    template <typename A = fast_argument<T> >
+    inline typename A::enable_rvalue_reference push_front(T &&v);
+#endif
+    inline void pop_front();
+
+    inline iterator insert(iterator it, value_argument_type v);
+    inline iterator erase(iterator it);
+    inline iterator erase(iterator a, iterator b);
+
+    inline void clear();
+
+    inline void swap(Deque<T> &x);
+
+};
+
+template <typename T>
+class Deque_const_iterator {
+    const Deque<T> *q_;
+    typename Deque<T>::size_type p_;
+    friend class Deque<T>;
+  public:
+    typedef typename Deque<T>::size_type size_type;
+    typedef Deque_const_iterator<T> const_iterator;
+    typedef Deque_iterator<T> iterator;
+
+    Deque_const_iterator() {
+    }
+    Deque_const_iterator(const Deque<T> *q, size_type p)
+	: q_(q), p_(p) {
+    }
+    const T *operator->() const {
+	return &(*q_)[p_];
+    }
+    const T &operator*() const {
+	return (*q_)[p_];
+    }
+    const T &operator[](size_type i) const {
+	return (*q_)[p_ + i];
+    }
+    bool operator==(const const_iterator &x) const {
+	return p_ == x.p_ && q_ == x.q_;
+    }
+    bool operator!=(const const_iterator &x) const {
+	return p_ != x.p_ || q_ != x.q_;
+    }
+    bool operator<(const const_iterator &x) const {
+	assert(q_ == x.q_);
+	return p_ < x.p_;
+    }
+    bool operator<=(const const_iterator &x) const {
+	assert(q_ == x.q_);
+	return p_ <= x.p_;
+    }
+    bool operator>=(const const_iterator &x) const {
+	assert(q_ == x.q_);
+	return p_ >= x.p_;
+    }
+    bool operator>(const const_iterator &x) const {
+	assert(q_ == x.q_);
+	return p_ > x.p_;
+    }
+    size_type diff(const const_iterator &x) const {
+	assert(q_ == x.q_);
+	return p_ - x.p_;
+    }
+    void operator++(int) {
+	++p_;
+    }
+    const_iterator &operator++() {
+	++p_;
+	return *this;
+    }
+    void operator--(int) {
+	--p_;
+    }
+    const_iterator &operator--() {
+	--p_;
+	return *this;
+    }
+    const_iterator &operator+=(size_type n) {
+	p_ += n;
+	return *this;
+    }
+    const_iterator &operator-=(size_type n) {
+	p_ -= n;
+	return *this;
+    }
+};
+
+template <typename T>
+class Deque_iterator : public Deque_const_iterator<T> { public:
+    typedef typename Deque<T>::size_type size_type;
+    typedef Deque_const_iterator<T> const_iterator;
+    typedef Deque_iterator<T> iterator;
+
+    Deque_iterator() {
+    }
+    Deque_iterator(Deque<T> *q, int p)
+	: const_iterator(q, p) {
+    }
+    T *operator->() const {
+	return const_cast<T *>(const_iterator::operator->());
+    }
+    T &operator*() const {
+	return const_cast<T &>(const_iterator::operator*());
+    }
+    T &operator[](int n) const {
+	return const_cast<T &>(const_iterator::operator[](n));
+    }
+    iterator &operator+=(size_type n) {
+	const_iterator::operator+=(n);
+	return *this;
+    }
+    iterator &operator-=(size_type n) {
+	const_iterator::operator-=(n);
+	return *this;
+    }
+};
+
+/** @brief Construct an empty deque. */
+template <typename T>
+inline Deque<T>::Deque() {
+}
+
+/** @brief Construct a deque containing @a n copies of @a v. */
+template <typename T>
+inline Deque<T>::Deque(size_type n, value_argument_type v) {
+    vm_.resize(n, array_memory_type::cast(&v));
+}
+
+/** @brief Construct a deque as a copy of @a x. */
+template <typename T>
+inline Deque<T>::Deque(const Deque<T> &x) {
+    vm_.assign(x.vm_);
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+/** @brief Construct a deque as a copy of @a x. */
+template <typename T>
+inline Deque<T>::Deque(Deque<T> &&x) {
+    vm_.assign(x.vm_);
+}
+#endif
+
+/** @brief Return the number of elements. */
+template <typename T>
+inline typename Deque<T>::size_type Deque<T>::size() const {
+    return vm_.n_;
+}
+
+/** @brief Test if the deque is empty (size() == 0). */
+template <typename T>
+inline bool Deque<T>::empty() const {
+    return vm_.n_ == 0;
+}
+
+/** @brief Return the deque's capacity.
+
+    The capacity is greater than or equal to the size(). Functions such as
+    resize(n) will not allocate new memory for the deque if n <=
+    capacity(). */
+template <typename T>
+inline typename Deque<T>::size_type Deque<T>::capacity() const {
+    return vm_.capacity_;
+}
+
+/** @brief Return an iterator for the first element in the deque. */
+template <typename T>
+inline typename Deque<T>::iterator Deque<T>::begin() {
+    return iterator(this, 0);
+}
+
+/** @overload */
+template <typename T>
+inline typename Deque<T>::const_iterator Deque<T>::begin() const {
+    return const_iterator(this, 0);
+}
+
+/** @brief Return an iterator for the end of the deque.
+    @invariant end() == begin() + size() */
+template <typename T>
+inline typename Deque<T>::iterator Deque<T>::end() {
+    return iterator(this, vm_.n_);
+}
+
+/** @overload */
+template <typename T>
+inline typename Deque<T>::const_iterator Deque<T>::end() const {
+    return const_iterator(this, vm_.n_);
+}
+
+/** @brief Return a const_iterator for the beginning of the deque. */
+template <typename T>
+inline typename Deque<T>::const_iterator Deque<T>::cbegin() const {
+    return const_iterator(this, 0);
+}
+
+/** @brief Return a const_iterator for the end of the deque.
+    @invariant end() == begin() + size() */
+template <typename T>
+inline typename Deque<T>::const_iterator Deque<T>::cend() const {
+    return const_iterator(this, vm_.n_);
+}
+
+/** @brief Return a reference to the <em>i</em>th element.
+    @pre 0 <= @a i < size() */
+template <typename T>
+inline T &Deque<T>::operator[](size_type i) {
+    assert((unsigned) i < (unsigned) vm_.n_);
+    return *(T *)&vm_.l_[vm_.i2p(i)];
+}
+
+/** @overload */
+template <typename T>
+inline const T &Deque<T>::operator[](size_type i) const {
+    assert((unsigned) i < (unsigned) vm_.n_);
+    return *(T *)&vm_.l_[vm_.i2p(i)];
+}
+
+/** @brief Return a reference to the <em>i</em>th element.
+    @pre 0 <= @a i < size()
+    @sa operator[]() */
+template <typename T>
+inline T &Deque<T>::at(size_type i) {
+    return operator[](i);
+}
+
+/** @overload */
+template <typename T>
+inline const T &Deque<T>::at(size_type i) const {
+    return operator[](i);
+}
+
+/** @brief Return a reference to the first element.
+    @pre !empty() */
+template <typename T>
+inline T &Deque<T>::front() {
+    return operator[](0);
+}
+
+/** @overload */
+template <typename T>
+inline const T &Deque<T>::front() const {
+    return operator[](0);
+}
+
+/** @brief Return a reference to the last element (number size()-1).
+    @pre !empty() */
+template <typename T>
+inline T &Deque<T>::back() {
+    return operator[](vm_.n_ - 1);
+}
+
+/** @overload */
+template <typename T>
+inline const T &Deque<T>::back() const {
+    return operator[](vm_.n_ - 1);
+}
+
+/** @brief Return a reference to the <em>i</em>th element.
+    @pre 0 <= @a i < size()
+
+    Unlike operator[]() and at(), this function does not check bounds,
+    even if assertions are enabled. Use with caution. */
+template <typename T>
+inline T &Deque<T>::unchecked_at(size_type i) {
+    return *(T *)&vm_.l_[vm_.i2p(i)];
+}
+
+/** @overload */
+template <typename T>
+inline const T &Deque<T>::unchecked_at(size_type i) const {
+    return *(T *)&vm_.l_[vm_.i2p(i)];
+}
+
+/** @cond never */
+template <typename T>
+inline T &Deque<T>::at_u(size_type i) {
+    return unchecked_at(i);
+}
+
+template <typename T>
+inline const T &Deque<T>::at_u(size_type i) const {
+    return unchecked_at(i);
+}
+/** @endcond never */
+
+/** @brief Resize the deque to contain @a n elements.
+    @param n new size
+    @param v value used to fill new elements */
+template <typename T>
+inline void Deque<T>::resize(size_type n, value_argument_type v) {
+    vm_.resize(n, array_memory_type::cast(&v));
+}
+
+/** @brief Append @a v to the end of the deque.
+
+    A copy of @a v is added to position size(). Takes amortized O(1)
+    time. */
+template <typename T>
+inline void Deque<T>::push_back(value_argument_type v) {
+    vm_.push_back(array_memory_type::cast(&v));
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+/** @overload */
+template <typename T> template <typename A>
+inline typename A::enable_rvalue_reference Deque<T>::push_back(T&& v) {
+    vm_.move_construct_back(array_memory_type::cast(&v));
+}
+#endif
+
+/** @brief Remove the last element.
+
+    Takes O(1) time. */
+template <typename T>
+inline void Deque<T>::pop_back() {
+    vm_.pop_back();
+}
+
+/** @brief Prepend element @a v.
+
+    A copy of @a v is added to position 0. Other elements are shifted one
+    position forward. Takes amortized O(1) time. */
+template <typename T>
+inline void Deque<T>::push_front(value_argument_type v) {
+    vm_.push_front(array_memory_type::cast(&v));
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+/** @overload */
+template <typename T> template <typename A>
+inline typename A::enable_rvalue_reference Deque<T>::push_front(T&& v) {
+    vm_.move_construct_front(array_memory_type::cast(&v));
+}
+#endif
+
+/** @brief Remove the first element.
+
+    Other elements are shifted one position backward. Takes O(1) time. */
+template <typename T>
+inline void Deque<T>::pop_front() {
+    vm_.pop_front();
+}
+
+/** @brief Insert @a v before position @a it.
+    @return An iterator pointing at the new element. */
+template <typename T>
+inline typename Deque<T>::iterator
+Deque<T>::insert(iterator it, value_argument_type v) {
+    assert(it.q_ == this);
+    if (likely(vm_.insert(it.p_, array_memory_type::cast(&v))))
+	return it;
+    else
+	return end();
+}
+
+/** @brief Remove the element at position @a it.
+    @return An iterator pointing at the element following @a it. */
+template <typename T>
+inline typename Deque<T>::iterator
+Deque<T>::erase(iterator it) {
+    assert(it.q_ == this);
+    return (it < end() ? erase(it, it + 1) : it);
+}
+
+/** @brief Remove the elements in [@a a, @a b).
+    @return An iterator corresponding to @a b. */
+template <typename T>
+inline typename Deque<T>::iterator
+Deque<T>::erase(iterator a, iterator b) {
+    assert(a.q_ == this && b.q_ == this);
+    return iterator(this, vm_.erase(a.p_, b.p_));
+}
+
+/** @brief Remove all elements.
+    @post size() == 0 */
+template <typename T>
+inline void Deque<T>::clear() {
+    vm_.clear();
+}
+
+/** @brief Reserve space for at least @a n more elements.
+    @return true iff reserve succeeded.
+
+    This function changes the deque's capacity(), not its size(). If
+    reserve(@a n) succeeds, then any succeeding call to resize(@a m) with @a
+    m < @a n will succeed without allocating deque memory. */
+template <typename T>
+inline bool Deque<T>::reserve(size_type n) {
+    return vm_.reserve_and_push(n, false, 0);
+}
+
+/** @brief Swap the contents of this deque and @a x. */
+template <typename T>
+inline void Deque<T>::swap(Deque<T> &x) {
+    vm_.swap(x.vm_);
+}
+
+/** @brief Replace this deque's contents with a copy of @a x. */
+template <typename T>
+inline Deque<T> &Deque<T>::operator=(const Deque<T> &x) {
+    vm_.assign(x.vm_);
+    return *this;
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+/** @brief Replace this deque's contents with those of @a x. */
+template <typename T>
+inline Deque<T> &Deque<T>::operator=(Deque<T> &&x) {
+    vm_.swap(x.vm_);
+    return *this;
+}
+#endif
+
+/** @brief Replace this deque's contents with @a n copies of @a v.
+    @post size() == @a n */
+template <typename T>
+inline Deque<T> &Deque<T>::assign(size_type n, value_argument_type v) {
+    vm_.assign(n, array_memory_type::cast(&v));
+    return *this;
+}
+
+template <typename T>
+Deque_const_iterator<T> operator+(Deque_const_iterator<T> it,
+				  typename Deque<T>::size_type n) {
+    return it += n;
+}
+
+template <typename T>
+Deque_const_iterator<T> operator-(Deque_const_iterator<T> it,
+				  typename Deque<T>::size_type n) {
+    return it -= n;
+}
+
+template <typename T>
+Deque_iterator<T> operator+(Deque_iterator<T> it,
+			    typename Deque<T>::size_type n) {
+    return it += n;
+}
+
+template <typename T>
+Deque_iterator<T> operator-(Deque_iterator<T> it,
+			    typename Deque<T>::size_type n) {
+    return it -= n;
+}
+
+template <typename T>
+typename Deque_const_iterator<T>::size_type
+operator-(const Deque_const_iterator<T> &a, const Deque_const_iterator<T> &b) {
+    return a.diff(b);
+}
+
+template <typename T>
+inline void click_swap(Deque<T> &a, Deque<T> &b) {
+    a.swap(b);
+}
+
+template <typename T>
+inline void assign_consume(Deque<T> &a, Deque<T> &b) {
+    a.swap(b);
+}
+
+CLICK_ENDDECLS
+#include <click/deque.cc>
+#endif
diff --git a/openflow/include/click/dequeue.hh b/openflow/include/click/dequeue.hh
new file mode 100644
index 0000000..aa57683
--- /dev/null
+++ b/openflow/include/click/dequeue.hh
@@ -0,0 +1,5 @@
+#ifndef DEQueue
+#warning "DEQueue is deprecated, use Deque and <click/deque.hh> instead"
+#include <click/deque.hh>
+#define DEQueue Deque
+#endif
diff --git a/openflow/include/click/dpdkdevice.hh b/openflow/include/click/dpdkdevice.hh
new file mode 100644
index 0000000..d556fe8
--- /dev/null
+++ b/openflow/include/click/dpdkdevice.hh
@@ -0,0 +1,210 @@
+#ifndef CLICK_DPDKDEVICE_HH
+#define CLICK_DPDKDEVICE_HH
+
+/**
+ * Prevent bug under some configurations
+ * (like travis-ci's one) where these
+ * macros get undefined.
+ */
+#ifndef UINT8_MAX
+#define UINT8_MAX 255
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX 65535
+#endif
+
+#include <rte_common.h>
+#include <rte_eal.h>
+#include <rte_ethdev.h>
+#include <rte_lcore.h>
+#include <rte_mbuf.h>
+#include <rte_mempool.h>
+#include <rte_pci.h>
+#include <rte_version.h>
+
+#include <click/packet.hh>
+#include <click/error.hh>
+#include <click/hashtable.hh>
+#include <click/vector.hh>
+#include <click/args.hh>
+#include <click/etheraddress.hh>
+
+#if RTE_VERSION < RTE_VERSION_NUM(19,8,0,0)
+#define rte_ipv4_hdr ipv4_hdr
+#define rte_ether_addr ether_addr
+#endif
+
+/**
+ * Unified type for DPDK port IDs.
+ * Until DPDK v17.05 was uint8_t
+ * After DPDK v17.05 has been uint16_t
+ */
+#if RTE_VERSION >= RTE_VERSION_NUM(17,05,0,0)
+    typedef uint16_t portid_t;
+#else
+    typedef uint8_t portid_t;
+#endif
+
+CLICK_DECLS
+class DPDKDeviceArg;
+
+extern bool dpdk_enabled;
+
+class DPDKDevice {
+public:
+
+    portid_t port_id;
+
+    DPDKDevice() CLICK_COLD;
+    DPDKDevice(portid_t port_id) CLICK_COLD;
+    int add_rx_queue(
+        unsigned &queue_id, bool promisc,
+        unsigned n_desc, ErrorHandler *errh
+    ) CLICK_COLD;
+
+    int add_tx_queue(
+        unsigned &queue_id, unsigned n_desc,
+        ErrorHandler *errh
+    ) CLICK_COLD;
+
+    EtherAddress get_mac();
+    void set_init_mac(EtherAddress mac);
+    void set_init_mtu(uint16_t mtu);
+
+    unsigned int get_nb_txdesc();
+    int nbRXQueues();
+    int nbTXQueues();
+    const char *get_device_driver();
+
+    static unsigned int dev_count() {
+#if RTE_VERSION >= RTE_VERSION_NUM(18,05,0,0)
+        return rte_eth_dev_count_avail();
+#else
+        return rte_eth_dev_count();
+#endif
+    }
+
+    static struct rte_mempool *get_mpool(unsigned int);
+
+    static int get_port_numa_node(portid_t port_id);
+
+    static int initialize(ErrorHandler *errh);
+
+    inline static bool is_dpdk_packet(Packet* p) {
+            return p->buffer_destructor() == DPDKDevice::free_pkt || (p->data_packet() && is_dpdk_packet(p->data_packet()));
+    }
+
+    inline static rte_mbuf* get_pkt(unsigned numa_node);
+    inline static rte_mbuf* get_pkt();
+    static void free_pkt(unsigned char *, size_t, void *pktmbuf);
+
+    static int NB_MBUF;
+    static int MBUF_DATA_SIZE;
+    static int MBUF_SIZE;
+    static int MBUF_CACHE_SIZE;
+    static int RX_PTHRESH;
+    static int RX_HTHRESH;
+    static int RX_WTHRESH;
+    static int TX_PTHRESH;
+    static int TX_HTHRESH;
+    static int TX_WTHRESH;
+    static String MEMPOOL_PREFIX;
+
+    static unsigned DEF_DEV_RXDESC;
+    static unsigned DEF_DEV_TXDESC;
+
+    static unsigned DEF_BURST_SIZE;
+
+private:
+
+    enum Dir { RX, TX };
+
+    struct DevInfo {
+        inline DevInfo() :
+            rx_queues(0,false), tx_queues(0,false), promisc(false), n_rx_descs(0),
+            n_tx_descs(0), init_mac(), init_mtu(0) {
+            rx_queues.reserve(128);
+            tx_queues.reserve(128);
+        }
+
+        const char* driver;
+        Vector<bool> rx_queues;
+        Vector<bool> tx_queues;
+        bool promisc;
+        unsigned n_rx_descs;
+        unsigned n_tx_descs;
+        EtherAddress init_mac;
+        uint16_t init_mtu;
+    };
+
+    DevInfo info;
+
+    static bool _is_initialized;
+    static HashTable<portid_t, DPDKDevice> _devs;
+    static struct rte_mempool** _pktmbuf_pools;
+    static unsigned _nr_pktmbuf_pools;
+    static bool no_more_buffer_msg_printed;
+
+    int initialize_device(ErrorHandler *errh) CLICK_COLD;
+    int add_queue(Dir dir, unsigned &queue_id, bool promisc,
+                   unsigned n_desc, ErrorHandler *errh) CLICK_COLD;
+
+    static bool alloc_pktmbufs() CLICK_COLD;
+
+    static DPDKDevice* get_device(const portid_t &port_id) {
+        return &(_devs.find_insert(port_id, DPDKDevice(port_id)).value());
+    }
+
+
+#if RTE_VERSION < RTE_VERSION_NUM(18,05,0,0)
+    static int get_port_from_pci(uint32_t domain, uint8_t bus, uint8_t dev_id, uint8_t function) {
+       struct rte_eth_dev_info dev_info;
+
+       uint16_t count = rte_eth_dev_count();
+       for (portid_t port_id = 0 ; port_id < count; ++port_id) {
+          rte_eth_dev_info_get(port_id, &dev_info);
+          struct rte_pci_addr addr = dev_info.pci_dev->addr;
+          if (addr.domain   == domain &&
+              addr.bus      == bus &&
+              addr.devid    == dev_id &&
+              addr.function == function)
+              return port_id;
+       }
+       return -1;
+    }
+#endif
+
+    friend class DPDKDeviceArg;
+    friend class DPDKInfo;
+};
+
+inline rte_mbuf* DPDKDevice::get_pkt(unsigned numa_node) {
+    struct rte_mbuf* mbuf = rte_pktmbuf_alloc(get_mpool(numa_node));
+    if (unlikely(!mbuf)) {
+        if (!DPDKDevice::no_more_buffer_msg_printed)
+            click_chatter("No more DPDK buffer available ! Try using "
+                               "DPDKInfo to allocate more.");
+        else
+            DPDKDevice::no_more_buffer_msg_printed = true;
+    }
+    return mbuf;
+}
+
+inline rte_mbuf* DPDKDevice::get_pkt() {
+    return get_pkt(rte_socket_id());
+}
+
+/** @class DPDKPortArg
+  @brief Parser class for DPDK Port, either an integer or a PCI address. */
+class DPDKDeviceArg { public:
+    static bool parse(const String &str, DPDKDevice* &result, const ArgContext &args = ArgContext());
+    static String unparse(DPDKDevice* dev) {
+        return String(dev->port_id);
+    }
+};
+
+template<> struct DefaultArg<DPDKDevice*> : public DPDKDeviceArg {};
+
+CLICK_ENDDECLS
+
+#endif
diff --git a/openflow/include/click/driver.hh b/openflow/include/click/driver.hh
new file mode 100644
index 0000000..e60d32b
--- /dev/null
+++ b/openflow/include/click/driver.hh
@@ -0,0 +1,43 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/driver.cc" -*-
+#ifndef CLICK_DRIVER_HH
+#define CLICK_DRIVER_HH
+#include <click/package.hh>
+
+#define CLICK_DEFAULT_PROVIDES  /* nada */
+
+#if defined(CLICK_USERLEVEL) || defined(CLICK_MINIOS)
+CLICK_DECLS
+class Router;
+class Master;
+class ErrorHandler;
+class Lexer;
+struct ArchiveElement;
+
+void click_static_initialize();
+void click_static_cleanup();
+
+Lexer *click_lexer();
+Router *click_read_router(String filename, bool is_expr, ErrorHandler * = 0, bool initialize = true, Master * = 0);
+
+String click_compile_archive_file(const Vector<ArchiveElement> &ar,
+                const ArchiveElement *ae,
+                String package, const String &target, int quiet,
+                bool &tmpdir_populated, ErrorHandler *errh);
+
+CLICK_ENDDECLS
+#elif CLICK_TOOL
+CLICK_DECLS
+class ErrorHandler;
+struct ArchiveElement;
+
+void click_static_initialize();
+
+String click_compile_archive_file(const Vector<ArchiveElement> &archive,
+                const ArchiveElement *ae,
+                String package, const String &target, int quiet,
+                bool &tmpdir_populated, ErrorHandler *errh);
+
+CLICK_ENDDECLS
+#endif
+
+#endif
diff --git a/openflow/include/click/element.hh b/openflow/include/click/element.hh
new file mode 100644
index 0000000..66359c1
--- /dev/null
+++ b/openflow/include/click/element.hh
@@ -0,0 +1,729 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/element.cc" -*-
+#ifndef CLICK_ELEMENT_HH
+#define CLICK_ELEMENT_HH
+#include <click/glue.hh>
+#include <click/vector.hh>
+#include <click/string.hh>
+#include <click/packet.hh>
+#include <click/handler.hh>
+CLICK_DECLS
+class Router;
+class Master;
+class RouterThread;
+class Task;
+class Timer;
+class NotifierSignal;
+class Element;
+class ErrorHandler;
+class Bitvector;
+class EtherAddress;
+
+/** @file <click/element.hh>
+ * @brief Click's Element class.
+ */
+
+#ifndef CLICK_ELEMENT_DEPRECATED
+# define CLICK_ELEMENT_DEPRECATED CLICK_DEPRECATED
+#endif
+
+class Element { public:
+
+    Element();
+    virtual ~Element();
+    static int nelements_allocated;
+
+    // RUNTIME
+    virtual void push(int port, Packet *p);
+    virtual Packet *pull(int port) CLICK_WARN_UNUSED_RESULT;
+    virtual Packet *simple_action(Packet *p);
+
+    virtual bool run_task(Task *task);  // return true iff did useful work
+    virtual void run_timer(Timer *timer);
+#if CLICK_USERLEVEL
+    enum { SELECT_READ = 1, SELECT_WRITE = 2 };
+    virtual void selected(int fd, int mask);
+    virtual void selected(int fd);
+#endif
+
+    inline void checked_output_push(int port, Packet *p) const;
+    inline Packet* checked_input_pull(int port) const;
+
+    // ELEMENT CHARACTERISTICS
+    virtual const char *class_name() const = 0;
+
+    virtual const char *port_count() const;
+    static const char PORTS_0_0[];
+    static const char PORTS_0_1[];
+    static const char PORTS_1_0[];
+    static const char PORTS_1_1[];
+    static const char PORTS_1_1X2[];
+
+    virtual const char *processing() const;
+    static const char AGNOSTIC[];
+    static const char PUSH[];
+    static const char PULL[];
+    static const char PUSH_TO_PULL[];
+    static const char PULL_TO_PUSH[];
+    static const char PROCESSING_A_AH[];
+
+    virtual const char *flow_code() const;
+    static const char COMPLETE_FLOW[];
+
+    virtual const char *flags() const;
+    int flag_value(int flag) const;
+
+    virtual void *cast(const char *name);
+    virtual void *port_cast(bool isoutput, int port, const char *name);
+
+    // CONFIGURATION, INITIALIZATION, AND CLEANUP
+    enum ConfigurePhase {
+        CONFIGURE_PHASE_FIRST = 0,
+        CONFIGURE_PHASE_INFO = 20,
+        CONFIGURE_PHASE_PRIVILEGED = 90,
+        CONFIGURE_PHASE_DEFAULT = 100,
+        CONFIGURE_PHASE_LAST = 2000
+    };
+    virtual int configure_phase() const;
+
+    virtual int configure(Vector<String> &conf, ErrorHandler *errh);
+
+    virtual void add_handlers();
+
+    virtual int initialize(ErrorHandler *errh);
+
+    virtual void take_state(Element *old_element, ErrorHandler *errh);
+    virtual Element *hotswap_element() const;
+
+    enum CleanupStage {
+        CLEANUP_NO_ROUTER,
+        CLEANUP_BEFORE_CONFIGURE = CLEANUP_NO_ROUTER,
+        CLEANUP_CONFIGURE_FAILED,
+        CLEANUP_CONFIGURED,
+        CLEANUP_INITIALIZE_FAILED,
+        CLEANUP_INITIALIZED,
+        CLEANUP_ROUTER_INITIALIZED,
+        CLEANUP_MANUAL
+    };
+    virtual void cleanup(CleanupStage stage);
+
+    static inline void static_initialize();
+    static inline void static_cleanup();
+
+    // ELEMENT ROUTER CONNECTIONS
+    String name() const;
+    virtual String declaration() const;
+
+    inline Router *router() const;
+    inline int eindex() const;
+    inline int eindex(Router *r) const;
+
+    /** @brief Return the element's master. */
+    inline Master *master() const;
+
+    inline void attach_router(Router *r, int eindex) {
+        assert(!_router);
+        _router = r;
+        _eindex = eindex;
+    }
+
+    // INPUTS AND OUTPUTS
+    inline int nports(bool isoutput) const;
+    inline int ninputs() const;
+    inline int noutputs() const;
+
+    class Port;
+    inline const Port &port(bool isoutput, int port) const;
+    inline const Port &input(int port) const;
+    inline const Port &output(int port) const;
+
+    inline bool port_active(bool isoutput, int port) const;
+    inline bool input_is_push(int port) const;
+    inline bool input_is_pull(int port) const;
+    inline bool output_is_push(int port) const;
+    inline bool output_is_pull(int port) const;
+    void port_flow(bool isoutput, int port, Bitvector*) const;
+
+    // LIVE RECONFIGURATION
+    String configuration() const;
+
+    virtual bool can_live_reconfigure() const;
+    virtual int live_reconfigure(Vector<String>&, ErrorHandler*);
+
+    RouterThread *home_thread() const;
+
+#if CLICK_USERLEVEL
+    // SELECT
+    int add_select(int fd, int mask);
+    int remove_select(int fd, int mask);
+#endif
+
+    // HANDLERS
+    void add_read_handler(const String &name, ReadHandlerCallback read_callback, const void *user_data = 0, uint32_t flags = 0);
+    void add_read_handler(const String &name, ReadHandlerCallback read_callback, int user_data, uint32_t flags = 0);
+    void add_read_handler(const char *name, ReadHandlerCallback read_callback, int user_data = 0, uint32_t flags = 0);
+    void add_write_handler(const String &name, WriteHandlerCallback write_callback, const void *user_data = 0, uint32_t flags = 0);
+    void add_write_handler(const String &name, WriteHandlerCallback write_callback, int user_data, uint32_t flags = 0);
+    void add_write_handler(const char *name, WriteHandlerCallback write_callback, int user_data = 0, uint32_t flags = 0);
+    void set_handler(const String &name, int flags, HandlerCallback callback, const void *read_user_data = 0, const void *write_user_data = 0);
+    void set_handler(const String &name, int flags, HandlerCallback callback, int read_user_data, int write_user_data = 0);
+    void set_handler(const char *name, int flags, HandlerCallback callback, int read_user_data = 0, int write_user_data = 0);
+    int set_handler_flags(const String &name, int set_flags, int clear_flags = 0);
+    enum { TASKHANDLER_WRITE_SCHEDULED = 1,
+           TASKHANDLER_WRITE_TICKETS = 2,
+           TASKHANDLER_WRITE_HOME_THREAD = 4,
+           TASKHANDLER_WRITE_ALL = 7,
+           TASKHANDLER_DEFAULT = 6 };
+    void add_task_handlers(Task *task, NotifierSignal *signal, int flags, const String &prefix = String());
+    inline void add_task_handlers(Task *task, NotifierSignal *signal, const String &prefix = String()) {
+        add_task_handlers(task, signal, TASKHANDLER_DEFAULT, prefix);
+    }
+    inline void add_task_handlers(Task *task, const String &prefix = String()) {
+        add_task_handlers(task, 0, TASKHANDLER_DEFAULT, prefix);
+    }
+
+    void add_data_handlers(const char *name, int flags, uint8_t *data);
+    void add_data_handlers(const char *name, int flags, bool *data);
+    void add_data_handlers(const char *name, int flags, uint16_t *data);
+    void add_data_handlers(const char *name, int flags, int *data);
+    void add_data_handlers(const char *name, int flags, unsigned *data);
+    void add_data_handlers(const char *name, int flags, atomic_uint32_t *data);
+    void add_data_handlers(const char *name, int flags, long *data);
+    void add_data_handlers(const char *name, int flags, unsigned long *data);
+#if HAVE_LONG_LONG
+    void add_data_handlers(const char *name, int flags, long long *data);
+    void add_data_handlers(const char *name, int flags, unsigned long long *data);
+#endif
+    void add_net_order_data_handlers(const char *name, int flags, uint16_t *data);
+    void add_net_order_data_handlers(const char *name, int flags, uint32_t *data);
+#if HAVE_FLOAT_TYPES
+    void add_data_handlers(const char *name, int flags, double *data);
+#endif
+    void add_data_handlers(const char *name, int flags, String *data);
+    void add_data_handlers(const char *name, int flags, IPAddress *data);
+    void add_data_handlers(const char *name, int flags, EtherAddress *data);
+    void add_data_handlers(const char *name, int flags, Timestamp *data, bool is_interval = false);
+
+    static String read_positional_handler(Element*, void*);
+    static String read_keyword_handler(Element*, void*);
+    static int reconfigure_positional_handler(const String&, Element*, void*, ErrorHandler*);
+    static int reconfigure_keyword_handler(const String&, Element*, void*, ErrorHandler*);
+
+    virtual int llrpc(unsigned command, void* arg);
+    int local_llrpc(unsigned command, void* arg);
+
+    class Port { public:
+
+        inline bool active() const;
+        inline Element* element() const;
+        inline int port() const;
+
+        inline void push(Packet* p) const;
+        inline Packet* pull() const;
+
+#if CLICK_STATS >= 1
+        unsigned npackets() const       { return _packets; }
+#endif
+
+        inline void assign(bool isoutput, Element *e, int port);
+
+      private:
+
+        Element* _e;
+        int _port;
+#if HAVE_BOUND_PORT_TRANSFER
+        union {
+            void (*push)(Element *e, int port, Packet *p);
+            Packet *(*pull)(Element *e, int port);
+        } _bound;
+#endif
+
+#if CLICK_STATS >= 1
+        mutable unsigned _packets;      // How many packets have we moved?
+#endif
+#if CLICK_STATS >= 2
+        Element* _owner;                // Whose input or output are we?
+#endif
+
+        inline Port();
+        inline void assign(bool isoutput, Element *owner, Element *e, int port);
+
+        friend class Element;
+
+    };
+
+    // DEPRECATED
+    /** @cond never */
+    String id() const CLICK_DEPRECATED;
+    String landmark() const CLICK_DEPRECATED;
+    /** @endcond never */
+
+  private:
+
+    enum { INLINE_PORTS = 4 };
+
+    Port* _ports[2];
+    Port _inline_ports[INLINE_PORTS];
+
+    int _nports[2];
+
+    Router* _router;
+    int _eindex;
+
+#if CLICK_STATS >= 2
+    // STATISTICS
+    unsigned _xfer_calls;       // Push and pull calls into this element.
+    click_cycles_t _xfer_own_cycles;    // Cycles spent in self from push and pull.
+    click_cycles_t _child_cycles;       // Cycles spent in children.
+
+    unsigned _task_calls;       // Calls to tasks owned by this element.
+    click_cycles_t _task_own_cycles;    // Cycles spent in self from tasks.
+
+    unsigned _timer_calls;      // Calls to timers owned by this element.
+    click_cycles_t _timer_own_cycles;   // Cycles spent in self from timers.
+
+    inline void reset_cycles() {
+        _xfer_calls = _task_calls = _timer_calls = 0;
+        _xfer_own_cycles = _task_own_cycles = _timer_own_cycles = _child_cycles = 0;
+    }
+    static String read_cycles_handler(Element *, void *);
+    static int write_cycles_handler(const String &, Element *, void *, ErrorHandler *);
+#endif
+
+    Element(const Element &);
+    Element &operator=(const Element &);
+
+    // METHODS USED BY ROUTER
+    int set_nports(int, int);
+    int notify_nports(int, int, ErrorHandler *);
+    enum Processing { VAGNOSTIC, VPUSH, VPULL };
+    static int next_processing_code(const char*& p, ErrorHandler* errh);
+    void processing_vector(int* input_codes, int* output_codes, ErrorHandler*) const;
+
+    void initialize_ports(const int* input_codes, const int* output_codes);
+    int connect_port(bool isoutput, int port, Element*, int);
+
+    static String read_handlers_handler(Element *e, void *user_data);
+    void add_default_handlers(bool writable_config);
+    inline void add_data_handlers(const char *name, int flags, HandlerCallback callback, void *data);
+
+    friend class Router;
+#if CLICK_STATS >= 2
+    friend class Task;
+    friend class Master;
+    friend class TimerSet;
+# if CLICK_USERLEVEL
+    friend class SelectSet;
+# endif
+#endif
+
+};
+
+
+/** @brief Initialize static data for this element class.
+ *
+ * Place initialization code for an element class's shared global state in the
+ * static_initialize() static member function.  (For example, the IPFilter
+ * element class uses static_initialize() to set up various parsing tables.)
+ * Click drivers will call this function when the element code is loaded,
+ * before any elements of the class are created.
+ *
+ * static_initialize functions are called in an arbitrary and unpredictable
+ * order (not, for example, the configure_phase() order).  Element authors are
+ * responsible for handling static initialization dependencies.
+ *
+ * For Click to find a static_initialize declaration, it must appear inside
+ * the element class's class declaration on its own line and have the
+ * following prototype:
+ *
+ * @code
+ * static void static_initialize();
+ * @endcode
+ *
+ * It must also have public accessibility.
+ *
+ * @note In most cases you should also define a static_cleanup() function to
+ * clean up state initialized by static_initialize().
+ *
+ * @sa Element::static_cleanup
+ */
+inline void
+Element::static_initialize()
+{
+}
+
+/** @brief Clean up static data for this element class.
+ *
+ * Place cleanup code for an element class's shared global state in the
+ * static_cleanup() static member function.  Click drivers will call this
+ * function before unloading the element code.
+ *
+ * static_cleanup functions are called in an arbitrary and unpredictable order
+ * (not, for example, the configure_phase() order, and not the reverse of the
+ * static_initialize order).  Element authors are responsible for handling
+ * static cleanup dependencies.
+ *
+ * For Click to find a static_cleanup declaration, it must appear inside the
+ * element class's class declaration on its own line and have the following
+ * prototype:
+ *
+ * @code
+ * static void static_cleanup();
+ * @endcode
+ *
+ * It must also have public accessibility.
+ *
+ * @sa Element::static_initialize
+ */
+inline void
+Element::static_cleanup()
+{
+}
+
+/** @brief Return the element's router. */
+inline Router*
+Element::router() const
+{
+    return _router;
+}
+
+/** @brief Return the element's index within its router.
+ * @invariant this == router()->element(eindex())
+ */
+inline int
+Element::eindex() const
+{
+    return _eindex;
+}
+
+/** @brief Return the element's index within router @a r.
+ *
+ * Returns -1 if @a r != router(). */
+inline int
+Element::eindex(Router* r) const
+{
+    return (router() == r ? _eindex : -1);
+}
+
+/** @brief Return the number of input or output ports.
+ * @param isoutput false for input ports, true for output ports */
+inline int
+Element::nports(bool isoutput) const
+{
+    return _nports[isoutput];
+}
+
+/** @brief Return the number of input ports. */
+inline int
+Element::ninputs() const
+{
+    return _nports[0];
+}
+
+/** @brief Return the number of output ports. */
+inline int
+Element::noutputs() const
+{
+    return _nports[1];
+}
+
+/** @brief Return one of the element's ports.
+ * @param isoutput false for input ports, true for output ports
+ * @param port port number
+ *
+ * An assertion fails if @a p is out of range. */
+inline const Element::Port&
+Element::port(bool isoutput, int port) const
+{
+    assert((unsigned) port < (unsigned) _nports[isoutput]);
+    return _ports[isoutput][port];
+}
+
+/** @brief Return one of the element's input ports.
+ * @param port port number
+ *
+ * An assertion fails if @a port is out of range.
+ *
+ * @sa Port, port */
+inline const Element::Port&
+Element::input(int port) const
+{
+    return Element::port(false, port);
+}
+
+/** @brief Return one of the element's output ports.
+ * @param port port number
+ *
+ * An assertion fails if @a port is out of range.
+ *
+ * @sa Port, port */
+inline const Element::Port&
+Element::output(int port) const
+{
+    return Element::port(true, port);
+}
+
+/** @brief Check whether a port is active.
+ * @param isoutput false for input ports, true for output ports
+ * @param port port number
+ *
+ * Returns true iff @a port is in range and @a port is active.  Push outputs
+ * and pull inputs are active; pull outputs and push inputs are not.
+ *
+ * @sa Element::Port::active */
+inline bool
+Element::port_active(bool isoutput, int port) const
+{
+    return (unsigned) port < (unsigned) nports(isoutput)
+        && _ports[isoutput][port].active();
+}
+
+/** @brief Check whether output @a port is push.
+ *
+ * Returns true iff output @a port exists and is push.  @sa port_active */
+inline bool
+Element::output_is_push(int port) const
+{
+    return port_active(true, port);
+}
+
+/** @brief Check whether output @a port is pull.
+ *
+ * Returns true iff output @a port exists and is pull. */
+inline bool
+Element::output_is_pull(int port) const
+{
+    return (unsigned) port < (unsigned) nports(true)
+        && !_ports[1][port].active();
+}
+
+/** @brief Check whether input @a port is pull.
+ *
+ * Returns true iff input @a port exists and is pull.  @sa port_active */
+inline bool
+Element::input_is_pull(int port) const
+{
+    return port_active(false, port);
+}
+
+/** @brief Check whether input @a port is push.
+ *
+ * Returns true iff input @a port exists and is push. */
+inline bool
+Element::input_is_push(int port) const
+{
+    return (unsigned) port < (unsigned) nports(false)
+        && !_ports[0][port].active();
+}
+
+#if CLICK_STATS >= 2
+# define PORT_ASSIGN(o) _packets = 0; _owner = (o)
+#elif CLICK_STATS >= 1
+# define PORT_ASSIGN(o) _packets = 0; (void) (o)
+#else
+# define PORT_ASSIGN(o) (void) (o)
+#endif
+
+inline
+Element::Port::Port()
+    : _e(0), _port(-2)
+{
+    PORT_ASSIGN(0);
+}
+
+inline void
+Element::Port::assign(bool isoutput, Element *e, int port)
+{
+    _e = e;
+    _port = port;
+    (void) isoutput;
+#if HAVE_BOUND_PORT_TRANSFER
+    if (e) {
+        if (isoutput) {
+            void (Element::*pusher)(int, Packet *) = &Element::push;
+            _bound.push = (void (*)(Element *, int, Packet *)) (e->*pusher);
+        } else {
+            Packet *(Element::*puller)(int) = &Element::pull;
+            _bound.pull = (Packet *(*)(Element *, int)) (e->*puller);
+        }
+    }
+#endif
+}
+
+inline void
+Element::Port::assign(bool isoutput, Element *owner, Element *e, int port)
+{
+    PORT_ASSIGN(owner);
+    assign(isoutput, e, port);
+}
+
+/** @brief Returns whether this port is active (a push output or a pull input).
+ *
+ * @sa Element::port_active
+ */
+inline bool
+Element::Port::active() const
+{
+    return _port >= 0;
+}
+
+/** @brief Returns the element connected to this active port.
+ *
+ * Returns 0 if this port is not active(). */
+inline Element*
+Element::Port::element() const
+{
+    return _e;
+}
+
+/** @brief Returns the port number of the port connected to this active port.
+ *
+ * Returns < 0 if this port is not active(). */
+inline int
+Element::Port::port() const
+{
+    return _port;
+}
+
+/** @brief Push packet @a p over this port.
+ *
+ * Pushes packet @a p downstream through the router configuration by passing
+ * it to the next element's @link Element::push() push() @endlink function.
+ * Returns when the rest of the router finishes processing @a p.
+ *
+ * This port must be an active() push output port.  Usually called from
+ * element code like @link Element::output output(i) @endlink .push(p).
+ *
+ * When element code calls Element::Port::push(@a p), it relinquishes control
+ * of packet @a p.  When push() returns, @a p may have been altered or even
+ * freed by downstream elements.  Thus, you must not use @a p after pushing it
+ * downstream.  To push a copy and keep a copy, see Packet::clone().
+ *
+ * output(i).push(p) basically behaves like the following code, although it
+ * maintains additional statistics depending on how CLICK_STATS is defined:
+ *
+ * @code
+ * output(i).element()->push(output(i).port(), p);
+ * @endcode
+ */
+inline void
+Element::Port::push(Packet* p) const
+{
+    assert(_e && p);
+#if CLICK_STATS >= 1
+    ++_packets;
+#endif
+#if CLICK_STATS >= 2
+    ++_e->input(_port)._packets;
+    click_cycles_t start_cycles = click_get_cycles(),
+        start_child_cycles = _e->_child_cycles;
+# if HAVE_BOUND_PORT_TRANSFER
+    _bound.push(_e, _port, p);
+# else
+    _e->push(_port, p);
+# endif
+    click_cycles_t all_delta = click_get_cycles() - start_cycles,
+        own_delta = all_delta - (_e->_child_cycles - start_child_cycles);
+    _e->_xfer_calls += 1;
+    _e->_xfer_own_cycles += own_delta;
+    _owner->_child_cycles += all_delta;
+#else
+# if HAVE_BOUND_PORT_TRANSFER
+    _bound.push(_e, _port, p);
+# else
+    _e->push(_port, p);
+# endif
+#endif
+}
+
+/** @brief Pull a packet over this port and return it.
+ *
+ * Pulls a packet from upstream in the router configuration by calling the
+ * previous element's @link Element::pull() pull() @endlink function.  When
+ * the router finishes processing, returns the result.
+ *
+ * This port must be an active() pull input port.  Usually called from element
+ * code like @link Element::input input(i) @endlink .pull().
+ *
+ * input(i).pull() basically behaves like the following code, although it
+ * maintains additional statistics depending on how CLICK_STATS is defined:
+ *
+ * @code
+ * input(i).element()->pull(input(i).port())
+ * @endcode
+ */
+inline Packet*
+Element::Port::pull() const
+{
+    assert(_e);
+#if CLICK_STATS >= 2
+    click_cycles_t start_cycles = click_get_cycles(),
+        old_child_cycles = _e->_child_cycles;
+# if HAVE_BOUND_PORT_TRANSFER
+    Packet *p = _bound.pull(_e, _port);
+# else
+    Packet *p = _e->pull(_port);
+# endif
+    if (p)
+        _e->output(_port)._packets += 1;
+    click_cycles_t all_delta = click_get_cycles() - start_cycles,
+        own_delta = all_delta - (_e->_child_cycles - old_child_cycles);
+    _e->_xfer_calls += 1;
+    _e->_xfer_own_cycles += own_delta;
+    _owner->_child_cycles += all_delta;
+#else
+# if HAVE_BOUND_PORT_TRANSFER
+    Packet *p = _bound.pull(_e, _port);
+# else
+    Packet *p = _e->pull(_port);
+# endif
+#endif
+#if CLICK_STATS >= 1
+    if (p)
+        ++_packets;
+#endif
+    return p;
+}
+
+/** @brief Push packet @a p to output @a port, or kill it if @a port is out of
+ * range.
+ *
+ * @param port output port number
+ * @param p packet to push
+ *
+ * If @a port is in range (>= 0 and < noutputs()), then push packet @a p
+ * forward using output(@a port).push(@a p).  Otherwise, kill @a p with @a p
+ * ->kill().
+ *
+ * @note It is invalid to call checked_output_push() on a pull output @a port.
+ */
+inline void
+Element::checked_output_push(int port, Packet* p) const
+{
+    if ((unsigned) port < (unsigned) noutputs())
+        _ports[1][port].push(p);
+    else
+        p->kill();
+}
+
+/** @brief Pull a packet from input @a port, or return 0 if @a port is out of
+ * range.
+ *
+ * @param port input port number
+ *
+ * If @a port is in range (>= 0 and < ninputs()), then return the result
+ * of input(@a port).pull().  Otherwise, return null.
+ *
+ * @note It is invalid to call checked_input_pull() on a push input @a port.
+ */
+inline Packet*
+Element::checked_input_pull(int port) const
+{
+    if ((unsigned) port < (unsigned) ninputs())
+        return _ports[0][port].pull();
+    else
+        return 0;
+}
+
+#undef PORT_ASSIGN
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/elemfilter.hh b/openflow/include/click/elemfilter.hh
new file mode 100644
index 0000000..725ab47
--- /dev/null
+++ b/openflow/include/click/elemfilter.hh
@@ -0,0 +1,64 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/elemfilter.cc" -*-
+#ifndef CLICK_ELEMFILTER_HH
+#define CLICK_ELEMFILTER_HH
+#include <click/element.hh>
+CLICK_DECLS
+
+class ElementFilter { public:
+
+    /** @brief Construct an ElementFilter. */
+    ElementFilter() {
+    }
+
+    /** @brief Destroy an ElementFilter. */
+    virtual ~ElementFilter() {
+    }
+
+    /** @brief Determine whether an element or port matches this filter.
+     * @param e element
+     * @param isoutput true for output ports, false for input ports
+     * @param port port number, or -1 to check the element as a whole
+     *
+     * This virtual function is the core of ElementFilter's functionality.
+     * The function should return true iff the specified element or port
+     * matches the filter.  @a isoutput and @a port define the interesting
+     * port; if @a port < 0, the element should be checked as a whole.
+     *
+     * The default implementation returns false for any element.
+     */
+    virtual bool check_match(Element *e, bool isoutput, int port);
+
+    /** @brief Remove all non-matching elements from @a es.
+     * @param es array of elements
+     *
+     * Calls check_match(e, false, -1) for each element of @a es, removing
+     * those elements that do not match (i.e., check_match() returns false).
+     */
+    void filter(Vector<Element *> &es);
+
+};
+
+class CastElementFilter : public ElementFilter { public:
+
+    /** @brief Construct a CastElementFilter.
+     * @param name cast name of matching elements
+     */
+    CastElementFilter(const String &name);
+
+    /** @brief Determine whether an element matches this filter.
+     * @param e element
+     * @param isoutput ignored
+     * @param port ignored
+     * @return True iff @a e->cast(@a name) != NULL, where @a name is the
+     *   cast name passed to the constructor.
+     */
+    bool check_match(Element *e, bool isoutput, int port);
+
+  private:
+
+    String _name;
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/error.hh b/openflow/include/click/error.hh
new file mode 100644
index 0000000..c4aef70
--- /dev/null
+++ b/openflow/include/click/error.hh
@@ -0,0 +1,887 @@
+// -*- related-file-name: "../../lib/error.cc" -*-
+#ifndef CLICK_ERROR_HH
+#define CLICK_ERROR_HH
+#include <click/string.hh>
+#if defined(CLICK_USERLEVEL) || defined(CLICK_TOOL) || defined(CLICK_MINIOS)
+# include <stdio.h>
+#endif
+#if CLICK_BSDMODULE
+# include <machine/stdarg.h>
+#else
+# include <stdarg.h>
+#endif
+
+#if HAVE_ADDRESSABLE_VA_LIST
+# define VA_LIST_REF_T		va_list *
+# define VA_LIST_DEREF(val)	(*(val))
+# define VA_LIST_REF(val)	(&(val))
+#else
+# define VA_LIST_REF_T		va_list
+# define VA_LIST_DEREF(val)	(val)
+# define VA_LIST_REF(val)	(val)
+#endif
+#if __GNUC__ <= 3
+# define ERRH_SENTINEL
+#else
+# define ERRH_SENTINEL __attribute__((sentinel))
+#endif
+CLICK_DECLS
+
+/** @class ErrorHandler
+ * @brief Error reporting class.
+ *
+ * Click elements report errors through ErrorHandler objects, which represent
+ * error collectors and printers.  ErrorHandlers are passed to configure() and
+ * initialize() methods explicitly, as well as to write handlers; the
+ * click_chatter() function calls ErrorHandler implicitly.
+ *
+ * <h3>Cooked error messages</h3>
+ *
+ * Most ErrorHandler interactions consist of a simple call like this:
+ * @code
+ * errh->error("not enough arguments (%d needed)", 5);
+ *     // prints something like "not enough arguments (5 needed)\n"
+ * @endcode
+ *
+ * This function constructs an error message string from the format arguments,
+ * annotates the string with a default error level (here, el_error), and
+ * prints it.  Alternate versions take a landmark specifying where the error
+ * took place:
+ * @code
+ * errh->lwarning("file.click:2", "syntax error at '%s'", word.c_str());
+ *     // prints something like "file.click:2: syntax error at 'foo'\n"
+ * @endcode
+ *
+ * <h3>Raw error messages</h3>
+ *
+ * For finer control over error levels and annotations, construct an error
+ * message string directly.  An error message is a string consisting of one or
+ * more lines.  Each line begins with a set of optional textual @em
+ * annotations.  The following error message has a @em level annotation
+ * determining how serious the error is (this one is critical, since
+ * el_critical == 2), and a @em landmark annotation, which specifies where the
+ * error took place (here, "x.click:1"):
+ *
+ * <tt>"<2>{l:x.click:1}syntax error"</tt>
+ *
+ * Click's default ErrorHandlers understand the level and landmark
+ * annotations.  Users can add other arbitrary annotations, which can be
+ * useful to pass error metadata.  A pair of braces ends the annotation area.
+ * This example has one user annotation <tt>eoc</tt>, and a message area that
+ * would be mistaken for an annotation were it not for the <tt>{}</tt>:
+ *
+ * <tt>"<2>{l:x.click:1}{eoc:520}{}{not:an annotation}"</tt>
+ *
+ * <h3>Stacking handlers</h3>
+ *
+ * Some ErrorHandlers stack on top of others, adding useful functionality like
+ * automatic context description and prefixing.  For example,
+ * ContextErrorHandler can be used to print messages like "In function
+ * 'xxx':".
+ * @code
+ * FileErrorHandler errh1(stderr);
+ * ContextErrorHandler errh2(&errh1, "While counting to 2:");
+ * errh2.error("An error occurred.");
+ * errh2.error("Another error occurred.");
+ *     // prints "While counting to 2:\n"
+ *     //        "  An error occurred.\n"
+ *     //        "  Another error occurred.\n"
+ * @endcode */
+class ErrorHandler { public:
+
+    /** @brief Error level constants.
+     *
+     * Lower values represent more serious errors.  Levels 0-7 correspond to
+     * Linux's error levels.  Negative levels request immediate exit; at user
+     * level, the Click process's exit status is the absolute value of the
+     * error level. */
+    enum Level {
+	el_abort = -999,	///< Error level that triggers abort().
+	el_fatal = -1,		///< Fatal exit error level.
+				///  Exit status equals -(level).
+	el_emergency = 0,	///< Emergency error level: system is unusable.
+	el_alert = 1,		///< Alert error level: action must be taken.
+	el_critical = 2,	///< Error level for critical conditions.
+	el_error = 3,		///< Error level for normal error conditions.
+	el_warning = 4,		///< Error level for warning conditions.
+	el_notice = 5,		///< Error level for normal, but significant
+				///  conditions.
+	el_info = 6,		///< Error level for informational messages.
+	el_debug = 7		///< Error level for debug messages.
+    };
+
+    /** @brief Error level indicators. */
+    static const char e_abort[],
+	e_fatal[],
+	e_emergency[],
+	e_alert[],
+	e_critical[],
+	e_error[],
+	e_warning[],
+	e_warning_annotated[],
+	e_notice[],
+	e_info[],
+	e_debug[];
+
+    /** @brief Construct an ErrorHandler. */
+    ErrorHandler()
+	: _nerrors(0) {
+    }
+
+    virtual ~ErrorHandler() {
+    }
+
+
+    /** @brief Initialize the ErrorHandler implementation.
+     * @param errh default error handler
+     * @return @a errh
+     *
+     * Call this function to initialize the ErrorHandler implementation.  The
+     * function installs the default conversions, creates the
+     * silent_handler(), and installs @a errh as the default error handler
+     * (see default_handler()).
+     *
+     * @note The @a errh object becomes the property of the ErrorHandler
+     * implementation and must not be deleted.
+     * (ErrorHandler::static_cleanup() will delete it.)  Only the first call
+     * to static_initialize() has any effect. */
+    static ErrorHandler *static_initialize(ErrorHandler *errh);
+
+    /** @brief Tear down the ErrorHandler implementation.
+     *
+     * Deletes the internal ErrorHandlers and uninstalls default
+     * conversions. */
+    static void static_cleanup();
+
+
+    /** @brief Return the default ErrorHandler.
+     * @sa static_initialize() */
+    static ErrorHandler *default_handler() {
+	return the_default_handler;
+    }
+
+    /** @brief Set the default ErrorHandler to @a errh.
+     * @note @a errh becomes property of the ErrorHandler implementation,
+     * and will be freed by static_cleanup().  However, any prior default
+     * handler is @em not destroyed.  Callers should delete the prior handler
+     * when necessary. */
+    static void set_default_handler(ErrorHandler *errh);
+
+    /** @brief Return the global silent ErrorHandler. */
+    static ErrorHandler *silent_handler() {
+	return the_silent_handler;
+    }
+
+
+    static const int ok_result;		///< Equals 0, used for error levels
+					///  <5> and above
+    static const int error_result;	///< Equals -EINVAL, used for error
+					///  levels <4> and below
+
+
+    /** @brief Print a debug message (level el_debug).
+     *
+     * @a fmt and any following arguments are parsed as by format(), and the
+     * resulting string is passed to xmessage(). */
+    void debug(const char *fmt, ...);
+    /** @brief Print an informational message (level el_info). */
+    void message(const char *fmt, ...);
+    /** @brief Print a warning message (level el_warning).
+     * @return error_result
+     *
+     * The string "warning: " is prepended to every line of the message. */
+    int warning(const char *fmt, ...);
+    /** @brief Print an error message (level el_error).
+     * @return error_result */
+    int error(const char *fmt, ...);
+    /** @brief Print a fatal error message (level el_fatal).
+     * @return error_result
+     *
+     * In many ErrorHandlers, calling fatal() will cause Click to abort. */
+    int fatal(const char *fmt, ...);
+
+    /** @brief Print a debug message with a landmark annotation. */
+    void ldebug(const String &landmark, const char *fmt, ...);
+    /** @brief Print an informational message with a landmark annotation. */
+    void lmessage(const String &landmark, const char *fmt, ...);
+    /** @brief Print a warning message with a landmark annotation. */
+    int lwarning(const String &landmark, const char *fmt, ...);
+    /** @brief Print an error message with a landmark annotation. */
+    int lerror(const String &landmark, const char *fmt, ...);
+    /** @brief Print a fatal error message with a landmark annotation. */
+    int lfatal(const String &landmark, const char *fmt, ...);
+
+
+    /** @brief Print an annotated error message.
+     * @return ok_result if the minimum error level was el_notice or higher,
+     * otherwise error_result
+     *
+     * This function drives the virtual functions actually responsible for
+     * error message decoration and printing.  It passes @a str to decorate(),
+     * separates the result into lines, calls emit() for each line, and calls
+     * account() with the minimum error level of any line.
+     *
+     * Most users will call shorthand functions like error(), warning(), or
+     * lmessage(), which add relevant annotations to the message. */
+    int xmessage(const String &str);
+    /** @brief Print an error message, adding annotations.
+     * @param anno annotations
+     * @param str error message
+     *
+     * Shorthand for xmessage(combine_anno(@a str, @a anno)). */
+    int xmessage(const String &anno, const String &str) {
+	return xmessage(combine_anno(str, anno));
+    }
+    /** @brief Format and print an error message, adding annotations.
+     * @param anno annotations
+     * @param fmt error message format
+     * @param val format arguments
+     *
+     * Shorthand for xmessage(@a anno, vformat(@a fmt, @a val)). */
+    int xmessage(const String &anno, const char *fmt, va_list val) {
+	return xmessage(anno, vformat(fmt, val));
+    }
+    /** @brief Print an error message, adding landmark and other annotations.
+     * @param landmark landmark annotation
+     * @param anno additional annotations
+     * @param str error message
+     *
+     * Shorthand for xmessage(combine_anno(@a anno, make_landmark_anno(@a
+     * landmark)), @a str). */
+    int xmessage(const String &landmark, const String &anno,
+		 const String &str) {
+	return xmessage(combine_anno(anno, make_landmark_anno(landmark)), str);
+    }
+    /** @brief Format and print an error message, adding landmark and other
+     * annotations.
+     * @param landmark landmark annotation
+     * @param anno additional annotations
+     * @param fmt error message format
+     * @param val format arguments
+     *
+     * Shorthand for xmessage(@a landmark, @a anno, vformat(@a fmt, @a
+     * val)). */
+    int xmessage(const String &landmark, const String &anno,
+		 const char *fmt, va_list val) {
+	return xmessage(landmark, anno, vformat(fmt, val));
+    }
+
+
+    /** @brief Return the number of errors reported via this handler.
+     *
+     * An error is any message that contains at least one line with error
+     * level 3 (#el_error) or below.
+     *
+     * @note The error count will also contain errors reported via stacked
+     * handlers.  For instance:
+     * @code
+     * SilentErrorHandler errh1;
+     * PrefixErrorHandler errh2(&errh1, "");
+     * assert(errh1.nerrors() == 0);
+     * errh2.error("blah");
+     * assert(errh1.nerrors() == 1);
+     * @endcode
+     *
+     * @sa account, clear */
+    int nerrors() const {
+	return _nerrors;
+    }
+
+
+    /** @brief Format an error string.
+     * @param default_flags default ConversionFlags
+     * @param fmt printf-like format string
+     * @return formatted error string
+     *
+     * Formats an error string using printf-like % conversions.  Conversions
+     * include:
+     *
+     * <table>
+     *
+     * <tr><td><tt>\%d</tt>, <tt>\%i</tt></td><td>Format an <tt>int</tt> as a
+     * decimal string.  Understands flags in <tt>#0- +</tt>, field widths
+     * (including <tt>*</tt>), and precisions.</td></tr>
+     *
+     * <tr><td><tt>\%hd</tt>, <tt>\%ld</tt>, <tt>\%lld</tt>,
+     * <tt>\%zd</tt></td><td>Format a <tt>short</tt>, <tt>long</tt>, <tt>long
+     * long</tt>, or <tt>size_t</tt>.</td></tr>
+     *
+     * <tr><td><tt>\%^16d</tt>, <tt>\%^32d</tt>, <tt>\%^64d</tt></td>
+     * <td>Format a 16-, 32-, or 64-bit integer.</td></tr>
+     *
+     * <tr><td><tt>\%o</tt>, <tt>\%u</tt>, <tt>\%x</tt>,
+     * <tt>\%X</tt></td><td>Format an unsigned integer in octal, decimal, or
+     * hexadecimal (with lower-case or upper-case letters).</td></tr>
+     *
+     * <tr><td><tt>\%s</tt></td><td>Format a C string (<tt>const char *</tt>).
+     * The alternate form <tt>\%\#s</tt> calls String::printable() on the
+     * input string.  Both <tt>\%\#s</tt> and the alternate form <tt>\%'s</tt>
+     * ensure that no part of the string is mistaken for an error
+     * annotation.</td></tr>
+     *
+     * <tr><td><tt>\%c</tt></td><td>Format a character.  Prints a C-like
+     * escape if the input character isn't printable ASCII.</td></tr>
+     *
+     * <tr><td><tt>\%p</tt></td><td>Format a pointer as a hexadecimal
+     * value.</td></tr>
+     *
+     * <tr><td><tt>\%e</tt>, <tt>\%E</tt>, <tt>\%f</tt>, <tt>\%F</tt>,
+     * <tt>\%g</tt>, <tt>\%G</tt></td><td>Format a <tt>double</tt> (user-level
+     * only).</td></tr>
+     *
+     * <tr><td><tt>\%p{...}</tt><td>Call a user-provided conversion function.
+     * For example, <tt>\%p{ip_ptr}</tt> reads an <tt>IPAddress *</tt> argument
+     * from the argument list, and formats the pointed-to address using
+     * IPAddress::unparse().</td></tr>
+     *
+     * <tr><td><tt>\%\%</tt></td><td>Format a literal \% character.</td></tr>
+     *
+     * <tr><td><tt>\%\<</tt></td><td>Format a left quote string.  Usually
+     * prints a single quote.</td></tr>
+     *
+     * <tr><td><tt>\%\></tt></td><td>Format a right quote string.  Usually
+     * prints a single quote.</td></tr>
+     *
+     * <tr><td><tt>\%,</tt></td><td>Format an apostrophe string.  Usually
+     * prints a single quote.</td></tr>
+     *
+     * </table> */
+    static String xformat(int default_flags, const char *fmt, ...);
+    /** @overload */
+    static String vxformat(int default_flags, const char *fmt, va_list val);
+    /** @overload */
+    static String xformat(const char *fmt, ...);
+    /** @overload */
+    static String vxformat(const char *fmt, va_list val) {
+	return vxformat(0, fmt, val);
+    }
+
+
+    /** @brief Format an error string.
+     * @param fmt format string
+     * @param val argument list
+     *
+     * @warning ErrorHandler users don't need to call this function directly;
+     * it is called implicitly by the error()/xmessage() functions.
+     *
+     * This virtual function is called to format an error message.  The
+     * default implementation returns the result of vxformat(@a fmt, @a val). */
+    virtual String vformat(const char *fmt, va_list val);
+
+    /** @brief Format an error string.
+     * @param fmt format string
+     *
+     * @warning ErrorHandler users don't usually need to call this function
+     * directly.
+     *
+     * This is a convenience function that calls vformat(const char *fmt,
+     * va_list val) for a va_list taken from the ellipsis arguments. */
+    String format(const char *fmt, ...);
+
+    /** @brief Decorate an error message.
+     * @param str error message, possibly with annotations
+     * @return decorated error message
+     *
+     * @warning ErrorHandler users don't need to call this function directly;
+     * it is called implicitly by the error()/xmessage() functions.
+     *
+     * This virtual function is called to decorate an error message before it
+     * is emitted.  The input @a str is an error message string, possibly
+     * annotated.  The default implementation returns @a str unchanged.  Other
+     * ErrorHandlers might add context lines (ContextErrorHandler), prefixes
+     * (PrefixErrorHandler), or a default landmark (LandmarkErrorHandler). */
+    virtual String decorate(const String &str);
+
+    /** @brief Output an error message line.
+     * @param str error message line, possibly with annotations
+     * @param user_data callback data, 0 for first line in a message
+     * @param more true iff this is the last line in the current message
+     * @return @a user_data to be passed to emit() for the next line
+     *
+     * @warning ErrorHandler users don't need to call this function directly;
+     * it is called implicitly by the error()/xmessage() functions.
+     *
+     * After calling decorate(), ErrorHandler splits the message into
+     * individual lines and calls emit() once per line.  ErrorHandler
+     * subclasses should output the error lines as appropriate; for example,
+     * FileErrorHandler outputs the error message to a file.
+     *
+     * @a str does not contain a newline, but may contain annotations,
+     * including a landmark annotation.  Most ErrorHandlers use parse_anno()
+     * to extract the landmark annotation, clean it with clean_landmark(), and
+     * print it ahead of the error message proper.
+     *
+     * ErrorHandler can handle multi-line error messages.  However, the emit()
+     * function takes a line at a time; this is more useful in practice for
+     * most error message printers.  The @a user_data and @a more arguments
+     * can help an ErrorHandler combine the lines of a multi-line error
+     * message.  @a user_data is null for the first line; for second and
+     * subsequent lines, ErrorHandler passes the result of the last line's
+     * emit() call.  @a more is true iff this is the last line in the current
+     * message.
+     *
+     * The default emit() implementation does nothing. */
+    virtual void *emit(const String &str, void *user_data, bool more);
+
+    /** @brief Account for an error message at level @a level.
+     * @param level minimum error level in the message
+     *
+     * @warning ErrorHandler users don't need to call this function directly;
+     * it is called implicitly by the error()/xmessage() functions.
+     *
+     * After calling emit() for the lines of an error message, ErrorHandler
+     * calls account(), passing the minimum (worst) error level of any message
+     * line (or 1000 if no line had a level).  The default implementation
+     * updates the nerrors() counter.  Some other ErrorHandlers
+     * add account() behavior that, for example, exits after printing messages
+     * at el_fatal level or below. */
+    virtual void account(int level) {
+	if (level <= el_error)
+	    ++_nerrors;
+    }
+
+    /** @brief Clear accumulated error state.
+     *
+     * The default implementation sets the nerrors() counter to zero. */
+    virtual void clear() {
+	_nerrors = 0;
+    }
+
+
+    /** @brief Create an error annotation.
+     * @param name annotation name
+     * @param value annotation value
+     * @return annotation string
+     *
+     * Returns an error annotation that associates annotation @a name with @a
+     * value.
+     *
+     * If @a name equals "<>", then returns a level annotation of the form
+     * "<@a value>".  @a value must be valid number; if it isn't, the function
+     * returns the empty string.
+     *
+     * Otherwise, @a name must be a nonempty series of letters and digits.
+     * make_anno() returns a string of the form "{@a name:@a value}", where
+     * special characters in @a value are quoted with backslashes. */
+    static String make_anno(const char *name, const String &value);
+
+    /** @brief Apply annotations from @a anno to every line in @a str.
+     * @param str string
+     * @param anno annotation string
+     *
+     * The annotations from @a anno are applied to every line in @a str.  New
+     * annotations do not override existing annotations with the same names.
+     * If the @a anno string ends with non-annotation characters, this
+     * substring is prefixed to every line in @a str.
+     *
+     * For example:
+     * @code
+     * combine_anno("Line 1\n{l:old}{x:x}Line 2\n", "<0>{l:new}  ")
+     *    // returns "<0>{l:new}  Line 1\n<0>{l:old}{x:x}  Line 2\n"
+     * @endcode */
+    static String combine_anno(const String &str, const String &anno);
+
+    /** @brief Parse error annotations from a string.
+     * @param str the string
+     * @param begin pointer within @a str to start of annotation area
+     * @param end pointer to end of error region, usually @a str.end()
+     * @return pointer to first character after annotation area
+     * @pre @a str.begin() <= {@a begin, @a end} <= @a str.end()
+     * @post @a begin <= returned value <= @a end
+     *
+     * Use this function to skip an error line's annotation area, possibly
+     * extracting named annotations.
+     *
+     * The variable arguments portion consists of a series of pairs of C
+     * strings and value pointers, terminated by a null character pointer.
+     * Each C string is an annotation name.  The corresponding annotation
+     * value, if found, is stored as a String object in the value pointer.
+     * You can also store the <tt>int</tt> value of an annotation by prefixing
+     * an annotation name with the '#' character.
+     *
+     * For example:
+     * @code
+     * String line = "{l:file:30}<4.5>error message\n";
+     * String landmark_str, level_str;
+     * const char *s = ErrorHandler::parse_anno(line, line.begin(), line.end(),
+     *            "l", &landmark_str, "<>", &level_str, (const char *) 0);
+     *     // Results: s points to "error message\n",
+     *     // landmark_str == "file:30", level_str == "4.5"
+     *
+     * int level;
+     * s = ErrorHandler::parse_anno(line, line.begin(), line.end(),
+     *            "#<>", &level, (const char *) 0);
+     *     // Results: s points to "error message\n", level_str == 4
+     * @endcode */
+    static const char *parse_anno(const String &str,
+		const char *begin, const char *end, ...) ERRH_SENTINEL;
+
+    /** @brief Skip a string's error annotations.
+     * @param begin pointer to start of string
+     * @param end pointer one past end of string
+     * @return pointer to first character after annotation area
+     * @post @a begin <= returned value <= @a end
+     *
+     * Use this function to skip an error line's annotation area.  The error
+     * line is defined as a pair of iterators. */
+    static const char *skip_anno(const char *begin, const char *end) {
+	String name, value;
+	const char *x = begin;
+	do {
+	    x = skip_anno(String(), x, end, &name, &value, false);
+	} while (name);
+	return x;
+    }
+
+
+    /** @brief Return a landmark annotation equal to @a x.
+     * @param x landmark
+     *
+     * If @a x is empty, returns the empty string.  Otherwise, if @a x looks
+     * like a formatted annotation (it starts with an open brace), returns @a
+     * x unchanged.  Otherwise, returns make_anno("l", @a x). */
+    static String make_landmark_anno(const String &x) {
+	if (x && x[0] == '{')
+	    return x;
+	else if (x)
+	    return make_anno("l", x);
+	else
+	    return String();
+    }
+
+    /** @brief Clean the @a landmark.
+     * @param landmark landmark text
+     * @param colon if true, append <tt>": "</tt> to a nonempty landmark
+     *
+     * Removes trailing space and an optional trailing colon from @a landmark
+     * and returns the result.  If @a colon is true, and the cleaned landmark
+     * isn't the empty string, then appends <tt>": "</tt> to the result. */
+    static String clean_landmark(const String &landmark, bool colon = false);
+
+
+    // error conversions
+    struct Conversion;
+    typedef String (*ConversionFunction)(int flags, VA_LIST_REF_T);
+    enum ConversionFlags {
+	cf_zero_pad = 1,	///< Set for conversions using the '0' flag.
+	cf_plus_positive = 2,	///< Set for conversions using the '+' flag.
+	cf_space_positive = 4,	///< Set for conversions using the ' ' flag.
+	cf_left_just = 8,	///< Set for conversions using the '-' flag.
+	cf_alternate_form = 16,	///< Set for conversions using the '#' flag.
+	cf_singlequote = 32,	///< Set for conversions using the '\'' flag.
+	cf_uppercase = 64,	///< Set for 'X' conversions (not 'x').
+	cf_signed = 128,	///< Set for conversions of signed numbers.
+	cf_negative = 256,	///< Set for conversions of negative numbers.
+	cf_utf8 = 1024		///< Set to use UTF-8 characters on output.
+    };
+    static Conversion *add_conversion(const String &name, ConversionFunction func);
+    static int remove_conversion(Conversion *conversion);
+
+  private:
+
+    int _nerrors;
+
+    static ErrorHandler *the_default_handler;
+    static ErrorHandler *the_silent_handler;
+
+    static const char *skip_anno(const String &str,
+				 const char *begin, const char *end,
+				 String *name_result, String *value_result,
+				 bool raw);
+
+};
+
+
+/** @class SilentErrorHandler
+ * @brief An ErrorHandler that does not report messages.
+ *
+ * Use SilentErrorHandler when an ErrorHandler object is required, but error
+ * messages should not be printed. */
+class SilentErrorHandler : public ErrorHandler { public:
+
+    SilentErrorHandler() {
+    }
+
+};
+
+
+/** @class ErrorVeneer
+ * @brief Base class for ErrorHandlers that forward messages.
+ *
+ * ErrorHandlers can stack.  Stacking ErrorHandlers simplify modify a message
+ * and then pass the result to a base ErrorHandler, which does the actual
+ * printing.  The ErrorVeneer base class simplifies the implementation of
+ * stacking ErrorHandlers.  It provides versions of ErrorHandler's format(),
+ * decorate(), emit(), and account() methods that forward to the underlying
+ * handler.  Note that the clear() method is <em>not</em> automatically
+ * forwarded. */
+class ErrorVeneer : public ErrorHandler { public:
+
+    /** @brief Construct an ErrorVeneer.
+     * @param errh base ErrorHandler
+     *
+     * If @a errh is 0, then the ErrorVeneer acts like a
+     * SilentErrorHandler. */
+    ErrorVeneer(ErrorHandler *errh)
+	: _errh(errh) {
+    }
+
+    String vformat(const char *fmt, va_list val);
+    String decorate(const String &str);
+    void *emit(const String &str, void *user_data, bool more);
+    void account(int level);
+
+  private:
+
+    ErrorHandler *_errh;
+
+};
+
+
+#if defined(CLICK_USERLEVEL) || defined(CLICK_TOOL) || defined(CLICK_MINIOS)
+/** @class FileErrorHandler
+ * @brief An ErrorHandler that prints error messages to a given file.
+ *
+ * FileErrorHandler is the typical base ErrorHandler used at user level.  It
+ * prints messages to a file passed in to the constructor, and calls exit() or
+ * abort() based on the error level. */
+class FileErrorHandler : public ErrorHandler { public:
+
+    /** @brief Construct a FileErrorHandler.
+     * @param f file to print errors
+     * @param prefix string to prefix every error line */
+    FileErrorHandler(FILE *f, const String &prefix = String());
+
+    void set_default_flags(int default_flags) {
+	_default_flags = default_flags;
+    }
+
+    String vformat(const char *fmt, va_list val);
+    void *emit(const String &str, void *user_data, bool more);
+    void account(int level);
+
+  private:
+
+    FILE *_f;
+    String _context;
+    int _default_flags;
+
+};
+#endif
+
+
+/** @class LocalErrorHandler
+ * @brief A convenience stackable ErrorHandler.
+ *
+ * It's often convenient to pass a null ErrorHandler pointer when errors
+ * should not be printed.  The LocalErrorHandler class simplifies dealing with
+ * ErrorHandler pointers that may or may not be null.  LocalErrorHandler is a
+ * transparent layer on the base handler; but if the base handler is null, it
+ * acts like a SilentErrorHandler.  For example:
+ * @code
+ * void f(ErrorHandler *errh) {   // errh might or might not be null
+ *     LocalErrorHandler lerrh(errh);
+ *     ... lerrh.message("message") ...
+ * }
+ * @endcode */
+class LocalErrorHandler : public ErrorVeneer { public:
+
+    /** @brief Construct a LocalErrorHandler. */
+    LocalErrorHandler(ErrorHandler *errh)
+	: ErrorVeneer(errh) {
+    }
+
+};
+
+
+/** @class ContextErrorHandler
+ * @brief A stackable ErrorHandler that prints context lines.
+ *
+ * The stackable ContextErrorHandler adds context to the first error
+ * message printed, and optionally indent error messages so that they appear
+ * grouped underneath the context.
+ * @code
+ * FileErrorHandler errh1(stderr);
+ * ContextErrorHandler errh2(&errh1, "While counting to 2:");
+ * errh2.error("An error occurred.");
+ * errh2.error("Another error occurred.");
+ *     // prints "While counting to 2:\n"
+ *     //        "  An error occurred.\n"
+ *     //        "  Another error occurred.\n"
+ * @endcode
+ *
+ * To prevent ContextErrorHandler from indenting or printing context for a
+ * message, add a "{context:no}" annotation to the message's first line.  To
+ * turn off the indent but keep the context, add a "{context:noindent}"
+ * annotation.
+ * @code
+ * FileErrorHandler errh1(stderr);
+ * ContextErrorHandler errh2(&errh1, "While counting to 2:");
+ * errh2.error("{context:no}An error occurred.");
+ * errh2.error("Another error occurred.");
+ *     // prints "An error occurred.\n"
+ *     //        "While counting to 2:\n"
+ *     //        "  Another error occurred.\n"
+ *
+ * FileErrorHandler errh1(stderr);
+ * PrefixErrorHandler noctx_errh(stderr, "{context:no}");
+ * ContextErrorHandler errh2(&errh1, "While counting to 2:");
+ * errh2.error("An error occurred.");
+ * errh2.error("Another error occurred.");
+ *     // prints "An error occurred.\n"
+ *     //        "Another error occurred.\n"
+ * @endcode
+ *
+ * ContextErrorHandler adds the "{context:context}" annotation to context
+ * lines. */
+class ContextErrorHandler : public ErrorVeneer { public:
+
+    /** @brief Construct a ContextErrorHandler.
+     * @param errh base ErrorHandler
+     * @param fmt format for context lines
+     *
+     * The context message is formed by @a errh->format() using @a fmt and
+     * any additional arguments. */
+    ContextErrorHandler(ErrorHandler *errh, const char *fmt, ...);
+
+    /** @brief Return true iff the context has already been printed. */
+    bool context_printed() const {
+	return _context_printed;
+    }
+
+    /** @brief Set whether the context has been printed. */
+    void set_context_printed(bool x) {
+	_context_printed = x;
+    }
+
+    /** @brief Set the context string to @a str. */
+    void set_context(const String &str) {
+	_context = str;
+    }
+
+    /** @brief Set the indent string to @a str.
+     *
+     * The indent string is prepended to all non-context messages.  It can
+     * contain landmarks as well as non-landmark text.  The default indent
+     * string is "  " (two spaces). */
+    void set_indent(const String &str) {
+	_indent = str;
+    }
+
+    /** @brief Set the context landmark to @a str.
+     *
+     * The context landmark is used to decorate the context, and also applied
+     * to any error messages that lack landmarks of their own.  The default
+     * context landmark is empty.
+     *
+     * @note The input @a str is passed to
+     * ErrorHandler::make_landmark_anno(). */
+    void set_context_landmark(const String &str) {
+	_context_landmark = make_landmark_anno(str);
+    }
+
+    String decorate(const String &str);
+
+  private:
+
+    String _context;
+    String _indent;
+    String _context_landmark;
+    bool _context_printed;
+
+};
+
+
+/** @class PrefixErrorHandler
+ * @brief A stackable ErrorHandler that adds a prefix to error messages.
+ *
+ * The stackable ContextErrorHandler adds a prefix to every error line
+ * printed.  For example:
+ * @code
+ * FileErrorHandler errh1(stderr);
+ * PrefixErrorHandler errh2(&errh1, "Blah--");
+ * errh2.error("An error occurred.");
+ * errh2.error("Another error occurred.");
+ *     // prints "Blah--An error occurred.\n"
+ *     //        "Blah--Another error occurred.\n"
+ * @endcode */
+class PrefixErrorHandler : public ErrorVeneer { public:
+
+    /** @brief Construct a PrefixErrorHandler.
+     * @param errh base ErrorHandler
+     * @param prefix string to prefix to error lines */
+    PrefixErrorHandler(ErrorHandler *errh, const String &prefix);
+
+    String decorate(const String &str);
+
+  private:
+
+    String _prefix;
+
+};
+
+
+/** @class LandmarkErrorHandler
+ * @brief A stackable ErrorHandler that adds a default landmark to error
+ * messages.
+ *
+ * The stackable ContextErrorHandler adds a default landmark to every error
+ * line printed.  Error lines' own landmarks are preserved when they exist.
+ * For example:
+ * @code
+ * FileErrorHandler errh1(stderr);
+ * LandmarkErrorHandler errh2(&errh1, "file:1");
+ * errh2.error("An error occurred.");
+ * errh2.lerror("file:2", "Another error occurred.");
+ *     // prints "file:1: An error occurred.\n"
+ *     //        "file:2: Another error occurred.\n"
+ * @endcode */
+class LandmarkErrorHandler : public ErrorVeneer { public:
+
+    /** @brief Construct a LandmarkErrorHandler.
+     * @param errh base ErrorHandler
+     * @param landmark default landmark */
+    LandmarkErrorHandler(ErrorHandler *errh, const String &landmark);
+
+    /** @brief Set the default landmark applied to error messages. */
+    void set_landmark(const String &landmark) {
+	_landmark = make_landmark_anno(landmark);
+    }
+
+    String decorate(const String &str);
+
+  private:
+
+    String _landmark;
+
+};
+
+
+#if defined(CLICK_USERLEVEL) || defined(CLICK_TOOL) || defined(CLICK_MINIOS)
+/** @class BailErrorHandler
+ * @brief A stackable ErrorHandler that exits when errors occur.
+ *
+ * The stackable BailErrorHandler, available only at user level, causes the
+ * Click process to exit if an error worse than a configurable level occurs. */
+class BailErrorHandler : public ErrorVeneer { public:
+
+    /** @brief Construct a BailErrorHandler.
+     * @param errh base ErrorHandler
+     * @param level error level that causes premature exit
+     *
+     * An error message with level less than or equal to @a el_error will
+     * cause the process to exit with status 1. */
+    BailErrorHandler(ErrorHandler *errh, int level = el_error);
+
+    void account(int level);
+
+  private:
+
+    int _level;
+
+};
+#endif
+
+#undef ERRH_SENTINEL
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/etheraddress.hh b/openflow/include/click/etheraddress.hh
new file mode 100644
index 0000000..e1e92ca
--- /dev/null
+++ b/openflow/include/click/etheraddress.hh
@@ -0,0 +1,230 @@
+// -*- related-file-name: "../../lib/etheraddress.cc" -*-
+#ifndef CLICK_ETHERADDRESS_HH
+#define CLICK_ETHERADDRESS_HH
+#include <click/string.hh>
+#include <click/glue.hh>
+#include <click/type_traits.hh>
+CLICK_DECLS
+
+class EtherAddress { public:
+
+    typedef uninitialized_type uninitialized_t;
+
+    /** @brief Construct an EtherAddress equal to 00-00-00-00-00-00. */
+    inline EtherAddress() {
+	_data[0] = _data[1] = _data[2] = 0;
+    }
+
+    /** @brief Construct an EtherAddress from data.
+     * @param data the address data, in network byte order
+     *
+     * The bytes data[0]...data[5] are used to construct the address. */
+    explicit inline EtherAddress(const unsigned char *data) {
+	memcpy(_data, data, 6);
+    }
+
+    /** @brief Construct an uninitialized EtherAddress. */
+    inline EtherAddress(const uninitialized_type &unused) {
+	(void) unused;
+    }
+
+    /** @brief Return the broadcast EtherAddress, FF-FF-FF-FF-FF-FF. */
+    static EtherAddress make_broadcast() {
+	return EtherAddress(0xFFFF);
+    }
+
+    static inline EtherAddress broadcast() CLICK_DEPRECATED;
+
+
+    typedef bool (EtherAddress::*unspecified_bool_type)() const;
+    /** @brief Return true iff the address is not 00-00-00-00-00-00. */
+    inline operator unspecified_bool_type() const {
+	return _data[0] || _data[1] || _data[2] ? &EtherAddress::is_group : 0;
+    }
+
+    /** @brief Return true iff this address is a group address.
+     *
+     * Group addresses have the low-order bit of the first byte set to 1, as
+     * in 01-00-00-00-00-00 or 03-00-00-02-04-09. */
+    inline bool is_group() const {
+	return data()[0] & 1;
+    }
+
+    /** @brief Return true iff this address is a "local" address.
+     *
+     * Local addresses have the next-to-lowest-order bit of the first byte set
+     * to 1. */
+    inline bool is_local() const {
+	return data()[0] & 2;
+    }
+
+    /** @brief Return true iff this address is the broadcast address.
+     *
+     * The Ethernet broadcast address is FF-FF-FF-FF-FF-FF. */
+    inline bool is_broadcast() const {
+	return _data[0] + _data[1] + _data[2] == 0x2FFFD;
+    }
+
+    /** @brief Return true if @a data points to a broadcast address. */
+    static inline bool is_broadcast(const unsigned char *data) {
+#if HAVE_INDIFFERENT_ALIGNMENT
+	return reinterpret_cast<const EtherAddress *>(data)->is_broadcast();
+#else
+	return data[0] + data[1] + data[2] + data[3] + data[4] + data[5] == 0x5FA;
+#endif
+    }
+
+    /** @brief Return a pointer to the address data. */
+    inline unsigned char *data() {
+	return reinterpret_cast<unsigned char *>(_data);
+    }
+
+    /** @overload */
+    inline const unsigned char *data() const {
+	return reinterpret_cast<const unsigned char *>(_data);
+    }
+
+    /** @brief Return a pointer to the address data, as an array of
+     * uint16_ts. */
+    inline const uint16_t *sdata() const {
+	return _data;
+    }
+
+    /** @brief Hash function. */
+    inline size_t hashcode() const {
+	return (_data[2] | ((size_t) _data[1] << 16))
+	    ^ ((size_t) _data[0] << 9);
+    }
+
+    // bool operator==(EtherAddress, EtherAddress);
+    // bool operator!=(EtherAddress, EtherAddress);
+
+    /** @brief Unparse this address into a dash-separated hex String.
+     *
+     * Examples include "00-00-00-00-00-00" and "00-05-4E-50-3C-1A".
+     *
+     * @note The IEEE standard for printing Ethernet addresses uses dashes as
+     * separators, not colons.  Use unparse_colon() to unparse into the
+     * nonstandard colon-separated form. */
+    inline String unparse() const {
+	return unparse_dash();
+    }
+
+    /** @brief Unparse this address into a colon-separated hex String.
+     *
+     * Examples include "00:00:00:00:00:00" and "00:05:4E:50:3C:1A".
+     *
+     * @note Use unparse() to create the IEEE standard dash-separated form. */
+    String unparse_colon() const;
+
+    /** @brief Unparse this address into a dash-separated hex String.
+     *
+     * Examples include "00-00-00-00-00-00" and "00-05-4E-50-3C-1A".
+     *
+     * @note This is the IEEE standard for printing Ethernet addresses.
+     * @sa unparse_colon */
+    String unparse_dash() const;
+
+    /** @brief Unparse this address into a dash-separated hex String.
+     * @deprecated The unparse() function should be preferred to s().
+     * @sa unparse */
+    inline String s() const CLICK_DEPRECATED;
+
+    /** @brief Unparse this address into a dash-separated hex String.
+     * @deprecated The unparse() function should be preferred to this cast.
+     * @sa unparse */
+    inline operator String() const CLICK_DEPRECATED;
+
+    typedef const EtherAddress &parameter_type;
+
+ private:
+
+    uint16_t _data[3];
+
+    EtherAddress(uint16_t m) {
+	_data[0] = _data[1] = _data[2] = m;
+    }
+
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+inline EtherAddress EtherAddress::broadcast() {
+    return make_broadcast();
+}
+
+inline
+EtherAddress::operator String() const
+{
+    return unparse();
+}
+
+inline String
+EtherAddress::s() const
+{
+    return unparse();
+}
+
+/** @relates EtherAddress
+    @brief Compares two EtherAddress objects for equality. */
+inline bool
+operator==(const EtherAddress &a, const EtherAddress &b)
+{
+    return (a.sdata()[0] == b.sdata()[0]
+	    && a.sdata()[1] == b.sdata()[1]
+	    && a.sdata()[2] == b.sdata()[2]);
+}
+
+/** @relates EtherAddress
+    @brief Compares two EtherAddress objects for inequality. */
+inline bool
+operator!=(const EtherAddress &a, const EtherAddress &b)
+{
+    return !(a == b);
+}
+
+class StringAccum;
+StringAccum &operator<<(StringAccum &, const EtherAddress &);
+
+
+class ArgContext;
+class Args;
+extern const ArgContext blank_args;
+
+/** @class EtherAddressArg
+  @brief Parser class for Ethernet addresses.
+
+  This is the default parser for objects of EtherAddress type. For 6-byte
+  arrays like "click_ether::ether_shost" and "click_ether::ether_dhost", you
+  must pass an EtherAddressArg() explicitly:
+
+  @code
+  struct click_ether ethh;
+  ... Args(...) ...
+      .read_mp("SRC", EtherAddressArg(), ethh.ether_shost)
+      ...
+  @endcode */
+class EtherAddressArg { public:
+    typedef void enable_direct_parse;
+    EtherAddressArg(int flags = 0) : flags_(flags) {}
+    inline bool parse(const String& str, EtherAddress& value, const ArgContext& args = blank_args) {
+        return parse(str, value, args, flags_);
+    }
+    inline bool parse(const String& str, unsigned char* value, const ArgContext& args = blank_args) {
+	return parse(str, *reinterpret_cast<EtherAddress *>(value), args);
+    }
+    inline bool direct_parse(const String& str, EtherAddress& value, Args& args) {
+        return direct_parse(str, value, args, flags_);
+    }
+    inline bool direct_parse(const String& str, unsigned char* value, Args& args) {
+	return direct_parse(str, *reinterpret_cast<EtherAddress *>(value), args);
+    }
+  private:
+    int flags_;
+    static bool parse(const String& str, EtherAddress& value, const ArgContext& args, int flags);
+    static bool direct_parse(const String& str, EtherAddress& value, Args& args, int flags);
+};
+
+template<> struct DefaultArg<EtherAddress> : public EtherAddressArg {};
+template<> struct has_trivial_copy<EtherAddress> : public true_type {};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/ewma.hh b/openflow/include/click/ewma.hh
new file mode 100644
index 0000000..d8ae25f
--- /dev/null
+++ b/openflow/include/click/ewma.hh
@@ -0,0 +1,521 @@
+#ifndef CLICK_EWMA_HH
+#define CLICK_EWMA_HH
+#include <click/glue.hh>
+#include <click/confparse.hh>
+CLICK_DECLS
+
+/** @file <click/ewma.hh>
+ *  @brief  Click's classes for supporting exponentially weighted moving
+ *  averages.
+ */
+
+/** @class DirectEWMAX include/click/ewma.hh <click/ewma.hh>
+ *  @brief  An exponentially weighted moving average.
+ *
+ *  The DirectEWMAX template class represents a simple exponentially weighted
+ *  moving average.  The average starts out with value 0.  The update()
+ *  function adds a new observation to the average.
+ *
+ *  The template parameter P defines three EWMA parameters: value type,
+ *  stability shift, and scale factor.
+ *
+ *  The value type is simply the unsigned integral type used to store the
+ *  average.  It is also the type of each observation.  <code>unsigned</code>
+ *  and <code>uint64_t</code> are examples.
+ *
+ *  The stability shift specifies alpha, the stability parameter.  Concretely,
+ *  alpha = 1. / (2 ** stability_shift).  Thus, a stability shift of 4
+ *  corresponds to an alpha of 1/16.
+ *
+ *  The scaling factor specifies how many bits of fraction are kept per
+ *  observation.  Fraction bits are necessary to account for small differences
+ *  between observations.  For example, consider a EWMA with value 0, alpha
+ *  1/16, and 0 bits of fraction.  Assume the EWMA begins to observe a stream
+ *  of observations equal to 1.  Despite these observations, the EWMA's value
+ *  will never change from 0, since the 1/16 alpha factor rounds the new
+ *  observations down to 0.  At least 4 bits of fraction are required to
+ *  account for this difference.  There is a tradeoff: the more bits of
+ *  fraction, the more precise the EWMA, but the less bits available to
+ *  account for large values.
+ *
+ *  These EWMA parameters are defined by five of P's members, two typedefs and
+ *  three possibly static member functions.
+ *
+ *  <dl>
+ *  <dt><strong>P::value_type</strong></dt>
+ *  <dd>The EWMA's value type.  Example: <code>unsigned</code>.</dd>
+ *
+ *  <dt><strong>P::signed_value_type</strong></dt>
+ *  <dd>The signed version of <code>P::value_type</code>.  Used internally.
+ *  Example: <code>int</code>.</dd>
+ *
+ *  <dt><strong>unsigned P::stability_shift()</strong></dt>
+ *  <dd>This function should return this EWMA's stability shift
+ *  (see above).</dd>
+ *
+ *  <dt><strong>unsigned P::scale()</strong></dt>
+ *  <dd>This function should return this EWMA's scaling factor
+ *  (see above).</dd>
+ *
+ *  <dt><strong>unsigned P::compensation()</strong></dt>
+ *  <dd>This function should return this EWMA's stability compensation,
+ *  which normally equals 1 @<@< (stability_shift - 1).</dd>
+ *  </dl>
+ *
+ *  Since DirectEWMAX inherits from an object of type P, these members are
+ *  also directly available to callers.
+ *
+ *  The FixedEWMAXParameters and StabilityEWMAXParameters types are good
+ *  template arguments for DirectEWMAX.
+ *
+ *  @sa RateEWMAX
+ */
+template <typename P>
+class DirectEWMAX : public P { public:
+
+    typedef typename P::value_type value_type;
+
+    /** @brief Construct a EWMA with initial average 0. */
+    DirectEWMAX()
+	: _avg(0) {
+    }
+
+    /** @brief Construct a EWMA with initial scaled average @a scaled_value. */
+    DirectEWMAX(value_type scaled_value)
+	: _avg(scaled_value) {
+    }
+
+    /** @brief Return the current scaled moving average.
+     *  @note The returned value has scale() bits of fraction. */
+    value_type scaled_average() const {
+	return _avg;
+    }
+
+    /** @brief Return the current moving average, rounded up.
+     *  @note The returned value is unscaled (has zero bits of fraction). */
+    value_type unscaled_average() const {
+	return (_avg + (P::scaled_one() >> 1)) >> P::scale();
+    }
+
+    /** @brief Reset the EWMA to value 0. */
+    void clear() {
+	_avg = 0;
+    }
+
+    /** @brief  Assign the EWMA to scaled average @a scaled_value. */
+    inline void assign(value_type scaled_value) {
+	_avg = scaled_value;
+    }
+
+    /** @brief  Update the moving average with a new observation.
+     *  @param  x  the observation (unscaled) */
+    inline void update(value_type x);
+
+    /** @brief  Update the moving average with @a n identical observations.
+     *  @param  x  the observation (unscaled)
+     *  @param  n  number of observations
+     *  @note   This may be faster than calling update(@a x) @a n
+     *  times. */
+    void update_n(value_type x, unsigned n);
+
+    /** @brief  Unparse the current average into a String.
+     *  @note   The returned value is unscaled, but may contain a fractional
+     *  part. */
+    String unparse() const;
+
+    /** @brief  Update the moving average with a new observation (deprecated).
+     *  @param  x  the observation (unscaled)
+     *  @deprecated  Use update() instead. */
+    inline void update_with(value_type x) CLICK_DEPRECATED;
+
+  private:
+
+    value_type _avg;
+
+};
+
+template <typename P>
+inline void
+DirectEWMAX<P>::update(value_type x)
+{
+    value_type x_scaled = (x << P::scale()) + P::compensation();
+    unsigned stability = P::stability_shift();
+#if HAVE_ARITHMETIC_RIGHT_SHIFT
+    _avg += static_cast<typename P::signed_value_type>(x_scaled - _avg) >> stability;
+#else
+    if (x_scaled < _avg)
+	_avg -= (_avg - x_scaled) >> stability;
+    else
+	_avg += (x_scaled - _avg) >> stability;
+#endif
+}
+
+template <typename P>
+void
+DirectEWMAX<P>::update_n(value_type x, unsigned n)
+{
+    // XXX use table lookup
+    value_type x_scaled = x << P::scale();
+    if (n >= 100)
+	_avg = x_scaled;
+    else {
+	x_scaled += P::compensation();
+	unsigned stability = P::stability_shift();
+#if HAVE_ARITHMETIC_RIGHT_SHIFT
+	for (; n > 0; n--)
+	    _avg += static_cast<typename P::signed_value_type>(x_scaled - _avg) >> stability;
+#else
+	if (x_scaled < _avg)
+	    for (; n > 0; n--)
+		_avg -= (_avg - x_scaled) >> stability;
+	else
+	    for (; n > 0; n--)
+		_avg += (x_scaled - _avg) >> stability;
+#endif
+    }
+}
+
+template <typename P>
+inline String
+DirectEWMAX<P>::unparse() const
+{
+    return cp_unparse_real2(scaled_average(), P::scale());
+}
+
+template <typename P>
+inline void
+DirectEWMAX<P>::update_with(value_type x)
+{
+    update(x);
+}
+
+/** @class FixedEWMAXParameters include/click/ewma.hh <click/ewma.hh>
+ *  @brief  Parameters for a EWMA with constant scaling factor and stability
+ *  shift.
+ *
+ *  The FixedEWMAXParameters template class is used as a template argument to
+ *  DirectEWMAX.  It defines a EWMA with fixed constant scaling factor and
+ *  stability shift.  FixedEWMAXParameters's first template argument is the
+ *  EWMA's stability shift, its second template argument is the EWMA's scaling
+ *  factor, its third template argument is the EWMA's value type, and the
+ *  fourth template argument is the EWMA's signed value type.
+ *
+ *  Example 1: <code>DirectEWMAX@<FixedEWMAXParameters@<4, 10, unsigned, int@>
+ *  @></code> defines a EWMA with alpha 1/16 (stability shift 4), scaling
+ *  factor 10, and value type unsigned.  (These are the default parameters
+ *  available in the DirectEWMA typedef.)
+ *
+ *  Example 2: <code>DirectEWMAX@<FixedEWMAXParameters@<3, 10, uint64_t,
+ *  int64_t@> @></code> defines a EWMA with alpha 1/8 (stability shift 3),
+ *  scaling factor 10, and value type uint64_t.
+ */
+template <unsigned STABILITY, unsigned SCALE, typename T = unsigned, typename U = int>
+class FixedEWMAXParameters { public:
+
+    typedef T value_type;
+    typedef U signed_value_type;
+
+    /** @brief  Return this EWMA's stability shift.
+     *  @return  the 1st template parameter */
+    static unsigned stability_shift() {
+	return STABILITY;
+    }
+
+    /** @brief  Return this EWMA's scaling factor (bits of fraction).
+     *  @return  the 2nd template parameter */
+    static unsigned scale() {
+	static_assert(SCALE < sizeof(T) * 8, "SCALE too big for EWMA type.");
+	return SCALE;
+    }
+
+    /** @brief  Return this EWMA's scaled value for one. */
+    static value_type scaled_one() {
+	return (value_type) 1 << SCALE;
+    }
+
+    /** @brief  Return this EWMA's compensation.
+     *  @return  1 << (stability_shift() - 1) */
+    static unsigned compensation() {
+	return 1 << (STABILITY - 1);
+    }
+
+};
+
+/** @brief A DirectEWMAX with stability shift 4 (alpha 1/16), scaling factor
+ *  10 (10 bits of fraction), and underlying type <code>unsigned</code>. */
+typedef DirectEWMAX<FixedEWMAXParameters<4, 10> > DirectEWMA;
+
+/** @brief A DirectEWMAX with stability shift 3 (alpha 1/8), scaling factor
+ *  10 (10 bits of fraction), and underlying type <code>unsigned</code>. */
+typedef DirectEWMAX<FixedEWMAXParameters<3, 10> > FastDirectEWMA;
+
+
+/** @class StabilityEWMAXParameters include/click/ewma.hh <click/ewma.hh>
+ *  @brief  Parameters for a EWMA with constant scaling factor
+ *	    and user-settable alpha.
+ *
+ *  The StabilityEWMAXParameters template class is used as a template argument
+ *  to DirectEWMAX.  It defines a EWMA with fixed constant scaling factor.
+ *  StabilityEWMAXParameters's first template argument is the EWMA's scaling
+ *  factor, its second template argument is the EWMA's value type, and the
+ *  third template argument is the EWMA's signed value type.
+ *
+ *  Example: <code>DirectEWMAX@<StabilityEWMAXParameters@<10, unsigned, int@>
+ *  @></code> defines a EWMA with user-settable alpha (stability shift)
+ *  initially equal to 1/16, scaling factor 10, and value type unsigned.
+ *
+ *  A <code>DirectEWMAX@<StabilityEWMAXParameters@<...@> @></code> object has
+ *  stability_shift() and set_stability_shift() methods.
+ */
+template <unsigned SCALE, typename T = unsigned, typename U = int>
+class StabilityEWMAXParameters { public:
+
+    typedef T value_type;
+    typedef U signed_value_type;
+
+    /** @brief  Construct a StabilityEWMAXParameters with initial alpha 1/16. */
+    StabilityEWMAXParameters()
+	: _stability(4) {
+    }
+
+    /** @brief  Return the current stability shift.
+     *
+     *  The current alpha equals 1. / (2 ** stability_shift()). */
+    unsigned stability_shift() const {
+	return _stability;
+    }
+
+    /** @brief  Set the current stability shift.
+     *  @param  stability_shift  new value */
+    void set_stability_shift(unsigned stability_shift) {
+	_stability = stability_shift;
+    }
+
+    /** @brief  Return this EWMA's scaling factor (bits of fraction).
+     *  @return  the 1st template parameter */
+    static unsigned scale() {
+	return SCALE;
+    }
+
+    /** @brief  Return this EWMA's scaled value for one. */
+    static value_type scaled_one() {
+	return (value_type) 1 << SCALE;
+    }
+
+    /** @brief  Return this EWMA's compensation.
+     *  @return  1 << (stability_shift() - 1) */
+    unsigned compensation() const {
+	return 1 << (stability_shift() - 1);
+    }
+
+  private:
+
+    unsigned _stability;
+
+};
+
+
+
+/** @class RateEWMAX include/click/ewma.hh <click/ewma.hh>
+ *  @brief  An exponentially weighted moving average used to measure a rate.
+ *
+ *  The RateEWMAX template class represents an exponentially weighted moving
+ *  average that measures a <em>rate</em>: a count of events per unit time.
+ *  The average starts out with value 0.
+ *
+ *  RateEWMAX adds to DirectEWMAX a concept of epochs, which are periods of
+ *  time.  A RateEWMAX object collects samples over the current epoch.  When
+ *  the epoch closes, the collected sample count is used to update the moving
+ *  average.  Thus, the moving average is measured in samples per epoch.  The
+ *  rate() and unparse_rate() member functions return the rate in samples per
+ *  <em>second</em>, rather than per epoch.  These functions use the epoch
+ *  frequency to translate between epochs and seconds.
+ *
+ *  Note that it often makes sense to call update() before calling
+ *  scaled_average(), rate(), or unparse_rate(), in case an epoch or two has
+ *  passed and the average should take account of passing time.
+ *
+ *  The template parameter P defines the EWMA parameters required by
+ *  DirectEWMAX, and three others: a rate count, an epoch measurement, and an
+ *  epoch frequency.
+ *
+ *  The rate count is the number of rates measured per object.  Usually it is
+ *  1.
+ *
+ *  The epoch measurement is a function that returns the current epoch as an
+ *  unsigned number.  Epochs should increase monotonically.
+ *
+ *  The epoch frequency is the number of epochs per second, and is only used
+ *  by rate() and unparse_rate().
+ *
+ *  These are defined by:
+ *
+ *  <dl>
+ *  <dt><strong>P::rate_count</strong></dt>
+ *  <dd>The rate count, as a static constant (for example, defined by an
+ *  enum).</dd>
+ *
+ *  <dt><strong>unsigned P::epoch()</strong></dt>
+ *  <dd>This function returns the current epoch number.</dd>
+ *
+ *  <dt><strong>unsigned P::epoch_frequency()</strong></dt>
+ *  <dd>This function returns the number of epochs per second.</dd>
+ *  </dl>
+ *
+ *  Since RateEWMAX inherits from an object of type P, these members are
+ *  also directly available to callers.
+ *
+ *  The RateEWMAXParameters type is a good template argument for RateEWMAX.
+ *
+ *  @sa DirectEWMAX
+ */
+template <typename P>
+class RateEWMAX : public P { public:
+
+    typedef typename P::value_type value_type;
+    typedef typename P::signed_value_type signed_value_type;
+
+    /** @brief  Create a rate EWMA with initial value(s) 0. */
+    RateEWMAX() {
+	_current_epoch = P::epoch();
+	for (unsigned i = 0; i < P::rate_count; i++)
+	    _current[i] = 0;
+    }
+
+    /** @brief  Return the current scaled moving average.
+     *  @param  ratenum  rate index (0 <= ratenum < rate_count)
+     *  @note   The returned value has scale() bits of fraction.
+     *  @note   scaled_average() does not check the current epoch.
+     *		If an epoch might have passed since the last update(), you
+     *		should call update(0, @a ratenum) before calling this
+     *		function. */
+    signed_value_type scaled_average(unsigned ratenum = 0) const {
+	// note: return type must be signed!
+	return _avg[ratenum].scaled_average();
+    }
+
+    /** @brief  Returns one of the average's scaling factors (bits of
+     *		fraction). */
+    unsigned scale(unsigned ratenum = 0) const {
+	return _avg[ratenum].scale();
+    }
+
+    /** @brief  Return the current rate in samples per second.
+     *  @param  ratenum  rate index (0 <= ratenum < rate_count)
+     *  @note   The returned value is unscaled.
+     *  @note   rate() does not check the current epoch.
+     *		If an epoch might have passed since the last update(), you
+     *		should call update(0, @a ratenum) before calling this
+     *		function. */
+    inline int rate(unsigned ratenum = 0) const;
+
+    /** @brief  Update the sample count for the current epoch.
+     *  @param  delta    increment for current epoch sample count
+     *  @param  ratenum  rate index (0 <= ratenum < rate_count)
+     *  @note   If the epoch has changed since the last update(),
+     *		this function applies the last epoch's sample count (if any)
+     *		to the relevant moving average, accounts for any passage of
+     *		time (in case one or more epochs have passed with no samples),
+     *		and clears the sample count for	the new epoch. */
+    inline void update(signed_value_type delta, unsigned ratenum = 0);
+
+    /** @brief  Unparse the current average into a String.
+     *  @param  ratenum  rate index (0 <= ratenum < rate_count)
+     *  @note   The returned value is unscaled, but may contain a fractional
+     *  part.
+     *  @note   unparse_rate() does not check the current epoch.
+     *		If an epoch might have passed since the last update(), you
+     *		should call update(0, @a ratenum) before calling this
+     *		function. */
+    String unparse_rate(unsigned ratenum = 0) const;
+
+  private:
+
+    unsigned _current_epoch;
+    value_type _current[P::rate_count];
+    DirectEWMAX<P> _avg[P::rate_count];
+
+    inline void update_time(unsigned now);
+
+};
+
+/** @class RateEWMAXParameters include/click/ewma.hh <click/ewma.hh>
+ *  @brief  Parameters for a RateEWMA with constant scaling factor
+ *	    and alpha, one rate count, and epochs of jiffies.
+ *
+ *  The RateEWMAXParameters template class is used as a template argument
+ *  to RateEWMAX.  It defines a EWMA with fixed constant scaling factor and
+ *  alpha and one rate count.  The EWMA uses jiffies as epochs.  Template
+ *  parameters are as for DirectEWMAXParameters.
+ *
+ *  Example: <code>RateEWMAX@<RateEWMAXParameters@<4, 10, unsigned, int@>
+ *  @></code> defines a rate EWMA with user-settable alpha (stability shift)
+ *  initially equal to 1/16, scaling factor 10, and value type unsigned.
+ */
+template <unsigned STABILITY, unsigned SCALE, typename T = unsigned, typename U = int>
+class RateEWMAXParameters : public FixedEWMAXParameters<STABILITY, SCALE, T, U> { public:
+    enum {
+	rate_count = 1
+    };
+
+    /** @brief  Return the current epoch number.
+     *  @note   RateEWMAXParameters measures epochs in jiffies. */
+    static unsigned epoch() {
+	return click_jiffies();
+    }
+
+    /** @brief  Return the number of epochs (jiffies) per second. */
+    static unsigned epoch_frequency() {
+	return CLICK_HZ;
+    }
+};
+
+/** @brief A RateEWMAX with stability shift 4 (alpha 1/16), scaling factor 10
+ *  (10 bits of fraction), one rate, and underlying type <code>unsigned</code>
+ *  that measures epochs in jiffies. */
+typedef RateEWMAX<RateEWMAXParameters<4, 10> > RateEWMA;
+
+
+template <typename P>
+inline void
+RateEWMAX<P>::update_time(unsigned now)
+{
+    unsigned jj = _current_epoch;
+    if (now != jj) {
+	for (unsigned i = 0; i < P::rate_count; i++) {
+	    // adjust the average rate using the last measured packets
+	    _avg[i].update(_current[i]);
+
+	    // adjust for time w/ no packets
+	    if (jj + 1 != now)
+		_avg[i].update_n(0, now - jj - 1);
+	    _current[i] = 0;
+	}
+	_current_epoch = now;
+    }
+}
+
+template <typename P>
+inline void
+RateEWMAX<P>::update(signed_value_type delta, unsigned ratenum)
+{
+    update_time(P::epoch());
+    _current[ratenum] += delta;
+}
+
+template <typename P>
+inline int
+RateEWMAX<P>::rate(unsigned ratenum) const
+{
+    return (scaled_average(ratenum) * P::epoch_frequency()) >> _avg[ratenum].scale();
+}
+
+template <typename P>
+inline String
+RateEWMAX<P>::unparse_rate(unsigned ratenum) const
+{
+    return cp_unparse_real2(scaled_average(ratenum) * P::epoch_frequency(), _avg[ratenum].scale());
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/fixconfig.h b/openflow/include/click/fixconfig.h
new file mode 100644
index 0000000..08228e1
--- /dev/null
+++ b/openflow/include/click/fixconfig.h
@@ -0,0 +1,24 @@
+#ifndef CLICK_FIXCONFIG_H
+#define CLICK_FIXCONFIG_H
+
+#if CLICK_LINUXMODULE && __cplusplus
+#include <click/type_traits.hh>
+
+#define __builtin_types_compatible_p(a, b) \
+    (types_compatible<typeof(a), typeof(b)>::value)
+#endif
+
+#if CLICK_LINUXMODULE && HAVE_LINUX_ASM_ALTERNATIVE_H
+// The .smp_locks section and C++-style weak linkage interact badly.
+# if CONFIG_SMP && (defined(__i386__) || defined(__x86_64__))
+#  include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+#  include <asm/alternative.h>
+#  undef LOCK_PREFIX
+#  define LOCK_PREFIX "lock ; "
+CLICK_CXX_UNPROTECT
+#  include <click/cxxunprotect.h>
+# endif
+#endif
+
+#endif
diff --git a/openflow/include/click/fromfile.hh b/openflow/include/click/fromfile.hh
new file mode 100644
index 0000000..de0b911
--- /dev/null
+++ b/openflow/include/click/fromfile.hh
@@ -0,0 +1,96 @@
+// -*- related-file-name: "../../lib/fromfile.cc"; c-basic-offset: 4 -*-
+#ifndef CLICK_FROMFILE_HH
+#define CLICK_FROMFILE_HH
+#include <click/string.hh>
+#include <click/vector.hh>
+#include <stdio.h>
+CLICK_DECLS
+class ErrorHandler;
+class Element;
+class Packet;
+class WritablePacket;
+
+class FromFile { public:
+
+    FromFile();
+    ~FromFile()				{ cleanup(); }
+
+    const String &filename() const	{ return _filename; }
+    String &filename()			{ return _filename; }
+    bool initialized() const		{ return _fd != -1; }
+
+    void set_landmark_pattern(const String &lp) { _landmark_pattern = lp; }
+    String landmark(const String &landmark_pattern) const;
+    String landmark() const		{ return landmark(_landmark_pattern); }
+    String print_filename() const;
+    int lineno() const			{ return _lineno; }
+    void set_lineno(int lineno)		{ _lineno = lineno; }
+
+    off_t file_pos() const		{ return _file_offset + _pos; }
+
+    int configure_keywords(Vector<String>& conf, Element* e, ErrorHandler* errh);
+    int set_data(const String& data, ErrorHandler* errh);
+    int initialize(ErrorHandler* errh, bool allow_nonexistent = false);
+    void add_handlers(Element* e, bool filepos_writable = false) const;
+    void cleanup();
+    void take_state(FromFile &, ErrorHandler *);
+
+    int seek(off_t want, ErrorHandler *);
+
+    int read(void*, uint32_t, ErrorHandler * = 0);
+    const uint8_t* get_unaligned(size_t, void*, ErrorHandler* = 0);
+    const uint8_t* get_aligned(size_t, void*, ErrorHandler* = 0);
+    String get_string(size_t, ErrorHandler* = 0);
+    Packet* get_packet(size_t, uint32_t sec, uint32_t subsec, ErrorHandler *);
+    Packet* get_packet_from_data(const void *buf, size_t buf_size, size_t full_size, uint32_t sec, uint32_t subsec, ErrorHandler *);
+    void shift_pos(int delta)		{ _pos += delta; }
+
+    int read_line(String &str, ErrorHandler *errh, bool temporary = false);
+    int peek_line(String &str, ErrorHandler *errh, bool temporary = false);
+
+    int error(ErrorHandler *, const char *format, ...) const;
+    int warning(ErrorHandler *, const char *format, ...) const;
+
+  private:
+
+    enum { BUFFER_SIZE = 32768 };
+
+    int _fd;
+    const uint8_t *_buffer;
+    uint32_t _pos;
+    uint32_t _len;
+
+    WritablePacket *_data_packet;
+
+#ifdef ALLOW_MMAP
+    bool _mmap;
+#endif
+
+#ifdef ALLOW_MMAP
+    enum { WANT_MMAP_UNIT = 4194304 }; // 4 MB
+    size_t _mmap_unit;
+    off_t _mmap_off;
+#endif
+
+    String _filename;
+    FILE *_pipe;
+    off_t _file_offset;
+    String _landmark_pattern;
+    int _lineno;
+
+#ifdef ALLOW_MMAP
+    int read_buffer_mmap(ErrorHandler *);
+#endif
+    int read_buffer(ErrorHandler *);
+    bool read_packet(ErrorHandler *);
+    int skip_ahead(ErrorHandler *);
+
+    static String filename_handler(Element *, void *);
+    static String filesize_handler(Element *, void *);
+    static String filepos_handler(Element *, void *);
+    static int filepos_write_handler(const String&, Element*, void*, ErrorHandler*);
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/gaprate.hh b/openflow/include/click/gaprate.hh
new file mode 100644
index 0000000..69a2fb7
--- /dev/null
+++ b/openflow/include/click/gaprate.hh
@@ -0,0 +1,240 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/gaprate.cc" -*-
+#ifndef CLICK_GAPRATE_HH
+#define CLICK_GAPRATE_HH
+#include <click/timestamp.hh>
+CLICK_DECLS
+class ErrorHandler;
+
+/** @file <click/gaprate.hh>
+ *  @brief  A Click helper class for implementing a uniform rate.
+ */
+
+/** @class GapRate include/click/gaprate.hh <click/gaprate.hh>
+ *  @brief  A helper class for implementing a uniform rate.
+ *
+ *  The GapRate class helps its user implement a process with a uniform rate:
+ *  a process in which one user event happens every T seconds.  GapRate is
+ *  designed to efficiently model high rates.  (Contrast this with Timer,
+ *  which can serve a similar function at low rates.)
+ *
+ *  GapRate is not a great choice for limiting the rates of external
+ *  processes.  See TokenBucketX, a token bucket rate limiter.
+ *
+ *  GapRate models an underlying "true" rated process with the correct rate.
+ *  It also keeps a counter, maintained by its user via the update() method,
+ *  that measures the progress of the user's rated process.  The
+ *  needs_update() method compares this counter with its expected value, which
+ *  is determined by the true rated process.  If the user's rated process is
+ *  running behind, then needs_update() returns true; the user should trigger
+ *  an event and call the update() method.  If the user's rated process is
+ *  just right or is running faster than the true process, then needs_update()
+ *  returns false; the user should <em>not</em> trigger an event.
+ *
+ *  Creating a non-bursty rate can be expensive and difficult.  GapRate
+ *  attempts to create a non-bursty rate using timestamps and some interesting
+ *  microsecond-based arithmetic.  External factors can cause scheduling
+ *  hiccups where GapRate is not called as much as expected.  GapRate
+ *  compensates for hiccups: the user's rated process may fall up to a full
+ *  second behind the true rated process, then catch up in a burst.  More than
+ *  one second's worth of lag is ignored.
+ *
+ *  The maximum rate GapRate can implement is MAX_RATE events per second.
+ *
+ *  @sa  TokenBucketX, Timer
+ */
+class GapRate { public:
+
+    /** @brief  Construct a GapRate object with initial rate 0. */
+    inline GapRate();
+
+    /** @brief  Construct a GapRate object with initial rate @a r.
+     *  @param  r  initial rate (events per second) */
+    inline GapRate(unsigned r);
+
+    /** @brief  Return the current rate. */
+    inline unsigned rate() const;
+
+    /** @brief  Set the current rate to @a r.
+     *  @param  r  desired rate (events per second)
+     *
+     *  Rates larger than MAX_RATE are reduced to MAX_RATE.  Also performs the
+     *  equivalent of a reset() to flush old state. */
+    inline void set_rate(unsigned r);
+
+    /** @brief  Set the current rate to @a r.
+     *  @param  r     desired rate (events per second)
+     *  @param  errh  error handler
+     *
+     *  Acts like set_rate(@a r), except that an warning is reported to @a errh
+     *  if @a r is larger than MAX_RATE. */
+    void set_rate(unsigned r, ErrorHandler *errh);
+
+
+    /** @brief  Returns whether the user's rate is behind the true rate.
+     *  @param  ts  current timestamp
+     *
+     *  Returns true iff the user's rate is currently behind the true rate,
+     *  meaning the user should cause an event and call update(). */
+    inline bool need_update(const Timestamp &ts);
+
+    /** @brief  Returns a time when the user's rate will be behind the true rate.
+     *  @pre  need_update() has been called at least once.
+     *  @return If the rate is 0, or need_update() has not been called,
+     *  returns Timestamp().  If the user's rate is already behind the true
+     *  rate, returns a time no greater than the argument passed to the last
+     *  need_update().  Otherwise, returns a time in the future when
+     *  need_update() will return true.
+     */
+    inline Timestamp expiry() const;
+
+    /** @brief  Increment the user event counter.
+     *
+     *  Call this function when causing a user event. */
+    inline void update();
+
+    /** @brief  Increment the user event counter by @a delta.
+     *  @param  delta  number of user events
+     *
+     *  @note This may be faster than calling update() @a delta times.
+     *  Furthermore, @a delta can be negative. */
+    inline void update_with(int delta);
+
+    /** @brief  Resets the true rate counter.
+     *
+     *  This function flushes any old information about the true rate counter
+     *  and its relationship to the user's rate counter. */
+    inline void reset();
+
+
+    enum { UGAP_SHIFT = 12 };
+    enum { MAX_RATE = 1000000U << UGAP_SHIFT };
+
+  private:
+
+    unsigned _ugap;		// (1000000 << UGAP_SHIFT) / _rate
+    int _sec_count;		// number of updates this second so far
+    Timestamp::seconds_type _tv_sec;	// current second
+    unsigned _rate;		// desired rate
+#if DEBUG_GAPRATE
+    Timestamp _last;
+#endif
+
+    inline void initialize_rate(unsigned rate);
+
+};
+
+/** @brief  Reset the underlying rated process. */
+inline void
+GapRate::reset()
+{
+    _tv_sec = -1;
+#if DEBUG_GAPRATE
+    _last.set_sec(0);
+#endif
+}
+
+inline void
+GapRate::initialize_rate(unsigned r)
+{
+    _rate = r;
+    _ugap = (r == 0 ? MAX_RATE + 1 : MAX_RATE / r);
+#if DEBUG_GAPRATE
+    click_chatter("ugap: %u", _ugap);
+#endif
+}
+
+inline void
+GapRate::set_rate(unsigned r)
+{
+    if (r > MAX_RATE)
+	r = MAX_RATE;
+    if (_rate != r) {
+	initialize_rate(r);
+	if (_tv_sec >= 0 && r != 0) {
+	    Timestamp now = Timestamp::now();
+	    _sec_count = (now.usec() << UGAP_SHIFT) / _ugap;
+	}
+    }
+}
+
+inline
+GapRate::GapRate()
+{
+    initialize_rate(0);
+    reset();
+}
+
+inline
+GapRate::GapRate(unsigned r)
+    : _rate(0)
+{
+    initialize_rate(r);
+    reset();
+}
+
+inline unsigned
+GapRate::rate() const
+{
+    return _rate;
+}
+
+inline bool
+GapRate::need_update(const Timestamp &now)
+{
+    // this is an approximation of:
+    // unsigned need = (unsigned) ((now.usec() / 1000000.0) * _rate)
+    unsigned need = (now.usec() << UGAP_SHIFT) / _ugap;
+
+    if (_tv_sec < 0) {
+	// 27.Feb.2005: often OK to send a packet after reset unless rate is
+	// 0 -- requested by Bart Braem
+	// check include/click/gaprate.hh (1.2)
+	_tv_sec = now.sec();
+	_sec_count = need + ((now.usec() << UGAP_SHIFT) - (need * _ugap) > _ugap / 2);
+    } else if (now.sec() > _tv_sec) {
+	_tv_sec = now.sec();
+	if (_sec_count > 0)
+	    _sec_count -= _rate;
+    }
+
+#if DEBUG_GAPRATE
+    click_chatter("%p{timestamp} -> %u @ %u [%d]", &now, need, _sec_count, (int)need >= _sec_count);
+#endif
+    return ((int)need >= _sec_count);
+}
+
+inline void
+GapRate::update()
+{
+    _sec_count++;
+}
+
+inline void
+GapRate::update_with(int delta)
+{
+    _sec_count += delta;
+}
+
+inline Timestamp
+GapRate::expiry() const
+{
+    if (_tv_sec < 0 || _rate == 0)
+        return Timestamp();
+    else if (_sec_count < 0)
+	return Timestamp(_tv_sec, 0);
+    else {
+	Timestamp::seconds_type sec = _tv_sec;
+	int count = _sec_count;
+	if ((unsigned) count >= _rate) {
+	    sec += count / _rate;
+	    count = count % _rate;
+	}
+
+	// uint32_t usec = (int) (count * 1000000.0 / _rate)
+	uint32_t usec = (count * _ugap) >> UGAP_SHIFT;
+	return Timestamp::make_usec(sec, usec);
+    }
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/glue.hh b/openflow/include/click/glue.hh
new file mode 100644
index 0000000..1493f56
--- /dev/null
+++ b/openflow/include/click/glue.hh
@@ -0,0 +1,702 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/glue.cc" -*-
+#ifndef CLICK_GLUE_HH
+#define CLICK_GLUE_HH
+// Removes many common #include <header>s and abstracts differences between
+// kernel and user space, and between operating systems.
+
+// HEADERS
+
+#if CLICK_LINUXMODULE
+
+# define _LOOSE_KERNEL_NAMES 1 /* define ino_t, off_t, etc. */
+# undef __KERNEL_STRICT_NAMES
+# ifndef __OPTIMIZE__
+#  define __OPTIMIZE__ 1 /* get ntohl() macros. otherwise undefined. */
+# endif
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# ifdef WANT_MOD_USE_COUNT
+#  define __NO_VERSION__
+#  include <linux/module.h>
+#  define HAVE_MOD_USE_COUNT 1
+# endif
+# include <linux/kernel.h>
+# include <linux/string.h>
+# include <linux/skbuff.h>
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+#  include <linux/malloc.h>
+#  include <linux/vmalloc.h>
+#  include <linux/interrupt.h>
+# else
+#  include <linux/hardirq.h>
+# endif
+# include <linux/ctype.h>
+# include <linux/time.h>
+# include <linux/errno.h>
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+
+#elif CLICK_BSDMODULE
+
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# include <sys/ctype.h>
+# include <sys/systm.h>
+# include <sys/time.h>
+# include <sys/param.h>
+# include <sys/kernel.h>
+# include <sys/mbuf.h>
+# include <sys/malloc.h>
+# include <sys/libkern.h>
+# include <sys/proc.h>
+# include <sys/sysproto.h>
+# include <sys/limits.h>
+# include <sys/module.h> /* XXX: for packages */
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+
+#elif CLICK_MINIOS
+
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# include <stdio.h>
+# include <stdlib.h>
+# include <stddef.h>
+# include <stdint.h>
+# include <string.h>
+# include <ctype.h>
+# include <errno.h>
+# include <limits.h>
+# include <time.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <sys/time.h>
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+
+#else /* CLICK_USERLEVEL */
+
+# include <stdio.h>
+# include <stdlib.h>
+# include <stddef.h>
+# include <stdint.h>
+# include <string.h>
+# include <ctype.h>
+# include <errno.h>
+# include <limits.h>
+# include <time.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <sys/time.h>
+# if CLICK_NS
+extern "C" int simclick_gettimeofday(struct timeval *);
+# endif
+# if HAVE_MULTITHREAD
+#  include <pthread.h>
+#  include <sched.h>
+# endif
+
+#endif
+
+
+// DEBUGGING OUTPUT
+extern "C" {
+void click_chatter(const char *fmt, ...);
+}
+
+
+// DEBUG MALLOC
+
+#if CLICK_DMALLOC && (CLICK_LINUXMODULE || CLICK_BSDMODULE || CLICK_MINIOS)
+extern uint32_t click_dmalloc_where;
+# define CLICK_DMALLOC_REG(s) do { const unsigned char *__str = reinterpret_cast<const unsigned char *>(s); click_dmalloc_where = (__str[0]<<24) | (__str[1]<<16) | (__str[2]<<8) | __str[3]; } while (0)
+#else
+# define CLICK_DMALLOC_REG(s)
+#endif
+
+
+// LALLOC
+
+#if CLICK_LINUXMODULE
+# define CLICK_LALLOC(size)	(click_lalloc((size)))
+# define CLICK_LFREE(p, size)	(click_lfree((p), (size)))
+extern "C" {
+void *click_lalloc(size_t size);
+void click_lfree(volatile void *p, size_t size);
+}
+#else
+# define CLICK_LALLOC(size)	((void *)(new uint8_t[(size)]))
+# define CLICK_LFREE(p, size)	delete[] ((void) (size), (uint8_t *)(p))
+#endif
+
+
+// RANDOMNESS
+
+CLICK_DECLS
+
+/** @brief Return a number between 0 and CLICK_RAND_MAX, inclusive.
+ *
+ * CLICK_RAND_MAX is guaranteed to be at least 2^31 - 1. */
+uint32_t click_random();
+
+/** @brief Return a number between @a low and @a high, inclusive.
+ *
+ * Returns @a low if @a low >= @a high. */
+uint32_t click_random(uint32_t low, uint32_t high);
+
+/** @brief Set the click_random() seed to @a seed. */
+void click_srandom(uint32_t seed);
+
+/** @brief Set the click_random() seed using a source of true randomness,
+ * if available. */
+void click_random_srandom();
+
+#if CLICK_BSDMODULE
+# define CLICK_RAND_MAX 0x7FFFFFFFU
+#elif !CLICK_LINUXMODULE && RAND_MAX >= 0x7FFFFFFFU
+# define CLICK_RAND_MAX RAND_MAX
+#else
+# define CLICK_RAND_MAX 0x7FFFFFFFU
+extern uint32_t click_random_seed;
+#endif
+
+#if CLICK_NS
+extern uint32_t click_random();
+#else
+inline uint32_t click_random() {
+# if CLICK_BSDMODULE
+    return random();
+# elif CLICK_LINUXMODULE
+    click_random_seed = click_random_seed * 69069L + 5;
+    return (click_random_seed ^ jiffies) & CLICK_RAND_MAX; // XXX jiffies??
+#elif CLICK_MINIOS
+    return rand();
+# elif HAVE_RANDOM && CLICK_RAND_MAX == RAND_MAX
+    // See also click_random() in ns/nsclick.cc
+    return random();
+# else
+    return rand();
+# endif
+}
+#endif
+
+inline void click_srandom(uint32_t seed) {
+#if CLICK_BSDMODULE
+    srandom(seed);
+#elif CLICK_LINUXMODULE
+    click_random_seed = seed;
+#elif CLICK_MINIOS
+    srand(seed);
+#elif CLICK_NS
+    (void) seed; /* XXX */
+#elif HAVE_RANDOM && CLICK_RAND_MAX == RAND_MAX
+    srandom(seed);
+#else
+    srand(seed);
+#endif
+}
+
+CLICK_ENDDECLS
+
+
+// SORTING
+
+/** @brief Sort array of elements according to @a compar.
+ * @param base pointer to array of elements
+ * @param n number of elements in @a param
+ * @param size size of an element
+ * @param compar comparison function
+ * @param user_data user data for comparison function
+ *
+ * Sorts an array of elements.  The comparison function is called as "@a
+ * param(@i a, @i b, @a user_data)", where @i a and @i b are pointers into the
+ * array starting at @a base, and @a user_data is click_qsort's @a user_data
+ * parameter.  The function should return an integer less than zero, equal to
+ * zero, or greater than zero depending on whether @i a compares less than @i
+ * b, equal to @i b, or greater than @i b, respectively.  On return the
+ * elements in the @a param array have been reordered into strictly increasing
+ * order.  The function always returns 0.
+ *
+ * Click_qsort() is not a stable sort.
+ *
+ * @warning click_qsort() shuffles elements by swapping memory, rather than by
+ * calling copy constructors or swap().  It is thus not safe for all types.
+ * In particular, objects like Bitvector that maintain pointers into their own
+ * representations are not safe to sort with click_qsort().  Conservatively,
+ * it is safe to sort fundamental data types (like int and pointers), plain
+ * old data types, and simple objects.  It is also safe to sort String and
+ * StringAccum objects, and to sort Vector objects that contain objects
+ * that are safe to sort themselves.
+ *
+ * @note The implementation is based closely on "Engineering a Sort Function,"
+ * Jon L. Bentley and M. Douglas McIlroy, <em>Software---Practice &
+ * Experience</em>, 23(11), 1249-1265, Nov. 1993.  It has been coded
+ * iteratively rather than recursively, and does no dynamic memory allocation,
+ * so it will not exhaust stack space in the kernel. */
+int click_qsort(void *base, size_t n, size_t size,
+		int (*compar)(const void *a, const void *b, void *user_data),
+		void *user_data = 0);
+
+/** @brief Sort array of elements according to @a compar.
+ * @param base pointer to array of elements
+ * @param n number of elements in @a param
+ * @param size size of an element
+ * @param compar comparison function
+ *
+ * @deprecated Prefer the variant where @a compar takes an extra void
+ * *user_data argument.  This variant depends on a nonstandard function
+ * pointer cast. */
+int click_qsort(void *base, size_t n, size_t size,
+		int (*compar)(const void *a, const void *b)) CLICK_DEPRECATED;
+
+/** @brief Generic comparison function useful for click_qsort.
+ *
+ * Compares @a a and @a b using operator<(). */
+template <typename T> int click_compare(const void *a, const void *b, void *)
+{
+    const T *ta = static_cast<const T *>(a);
+    const T *tb = static_cast<const T *>(b);
+    return (*ta < *tb ? -1 : (*tb < *ta ? 1 : 0));
+}
+
+/** @brief Sort array of elements using operator<(). */
+template <typename T> int click_qsort(T *base, size_t n)
+{
+    return click_qsort(base, n, sizeof(T), (int (*)(const void *, const void *, void *)) &click_compare<T>);
+}
+
+
+// OTHER
+
+#if CLICK_LINUXMODULE
+
+extern "C" {
+
+long strtol(const char *, char **, int);
+
+inline unsigned long
+strtoul(const char *nptr, char **endptr, int base)
+{
+    return simple_strtoul(nptr, endptr, base);
+}
+
+# if __GNUC__ == 2 && __GNUC_MINOR__ == 96
+int click_strcmp(const char *, const char *);
+
+inline int
+strcmp(const char *a, const char *b)
+{
+    return click_strcmp(a, b);
+}
+# endif
+
+}
+
+#elif CLICK_BSDMODULE
+
+/* Char-type glue */
+
+# define _U	0x01	/* upper */
+# define _L	0x02	/* lower */
+# define _D	0x04	/* digit */
+# define _C	0x08	/* cntrl */
+# define _P	0x10	/* punct */
+# define _S	0x20	/* white space (space/lf/tab) */
+# define _X	0x40	/* hex digit */
+# define _SP	0x80	/* hard space (0x20) */
+
+extern unsigned char _ctype[];
+
+# define __ismask(x)	(_ctype[(int)(unsigned char)(x)])
+# define isalnum(c)	((__ismask(c)&(_U|_L|_D)) != 0)
+
+# define strchr(s, c)	index(s, c)
+
+# if __FreeBSD_version >= 700000 && __FreeBSD_version < 730000
+/* memmove() appeared in the FreeBSD 7.3 kernel */
+extern "C" void *memmove(void *dest, const void *src, size_t len);
+# endif
+
+
+typedef struct ifnet net_device;
+
+#else /* not CLICK_LINUXMODULE || CLICK_BSDMODULE */
+
+// provide a definition for net_device
+typedef struct device net_device;
+
+#endif /* CLICK_LINUXMODULE */
+
+
+// COMPILE-TIME ASSERTION CHECKING
+
+#if (!defined(__cplusplus) || !HAVE_CXX_STATIC_ASSERT) && !defined(static_assert)
+# define static_assert(x, ...) switch ((int) (x)) case 0: case !!((int) (x)):
+#endif
+
+
+// PROCESSOR IDENTITIES
+
+#if CLICK_LINUXMODULE
+typedef uint32_t click_processor_t;
+#  define CLICK_CPU_MAX NR_CPUS
+#elif CLICK_USERLEVEL && HAVE_MULTITHREAD
+typedef pthread_t click_processor_t;
+#  define CLICK_CPU_MAX 256
+#else
+typedef int8_t click_processor_t;
+#  if HAVE_MULTITHREAD
+#    define CLICK_CPU_MAX 256
+#  else
+#    define CLICK_CPU_MAX 1
+#  endif
+#endif
+
+inline click_processor_t
+click_get_processor()
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+    return get_cpu();
+# else
+    return current->processor;
+# endif
+#elif CLICK_USERLEVEL && HAVE_MULTITHREAD
+    return pthread_self();
+#else
+    return 0;
+#endif
+}
+
+inline void
+click_put_processor()
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+#  ifdef put_cpu_no_resched
+    put_cpu_no_resched();
+#  else
+    put_cpu();
+#  endif
+# endif
+#endif
+}
+
+#if CLICK_USERLEVEL && HAVE_MULTITHREAD && HAVE___THREAD_STORAGE_CLASS
+extern __thread int click_current_thread_id;
+#endif
+
+#if CLICK_USERLEVEL
+extern int click_nthreads;
+#endif
+
+inline click_processor_t
+click_current_processor()
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+    return smp_processor_id();
+# else
+    return current->processor;
+# endif
+#elif CLICK_USERLEVEL && HAVE_MULTITHREAD
+    return pthread_self();
+#else
+    return 0;
+#endif
+}
+
+inline unsigned
+click_current_cpu_id()
+{
+#if !HAVE_MULTITHREAD
+    return 0;
+#elif CLICK_USERLEVEL
+#  if HAVE___THREAD_STORAGE_CLASS
+    return click_current_thread_id & 0xffff;
+#  else
+    return sched_getcpu();
+#  endif
+#else
+    return click_current_processor();
+#endif
+}
+
+/**
+ * Return an upper bound to click_current_cpu_id()
+ */
+inline unsigned
+click_max_cpu_ids()
+{
+#if CLICK_LINUXMODULE
+    return NR_CPUS;
+#elif CLICK_USERLEVEL && HAVE___THREAD_STORAGE_CLASS
+    return click_nthreads;
+#else //XXX BSDMODULE?
+    return CLICK_CPU_MAX;
+#endif
+}
+
+
+inline click_processor_t
+click_invalid_processor()
+{
+#if CLICK_LINUXMODULE
+    return -1;
+#elif CLICK_USERLEVEL && HAVE_MULTITHREAD
+    return 0;
+#else
+    return -1;
+#endif
+}
+
+// TIMEVALS AND JIFFIES
+// click_jiffies_t is the type of click_jiffies() and must be unsigned.
+// click_jiffies_difference_t is the signed version of click_jiffies_t.
+// CLICK_JIFFIES_MONOTONIC is true if click_jiffies() never goes backwards.
+
+#if CLICK_LINUXMODULE
+# define click_gettimeofday(tvp)	(do_gettimeofday(tvp))
+typedef unsigned long click_jiffies_t;
+typedef long click_jiffies_difference_t;
+# define click_jiffies()		(jiffies)
+# define CLICK_JIFFIES_MONOTONIC	1
+# define CLICK_HZ			HZ
+# define click_jiffies_less(a, b)	((click_jiffies_difference_t) ((a) - (b)) < 0)
+# define HAS_LONG_CLICK_JIFFIES_T	1
+#elif CLICK_BSDMODULE
+# define click_gettimeofday(tvp)	(getmicrotime(tvp))
+typedef unsigned click_jiffies_t;
+typedef int click_jiffies_difference_t;
+# define click_jiffies()		(ticks)
+# define CLICK_HZ			hz
+# define click_jiffies_less(a, b)	((click_jiffies_difference_t) ((a) - (b)) < 0)
+#else
+CLICK_DECLS
+void click_gettimeofday(timeval *tvp) CLICK_DEPRECATED;
+typedef unsigned click_jiffies_t;
+typedef int click_jiffies_difference_t;
+click_jiffies_t click_jiffies();
+# define click_jiffies_less(a, b)	((click_jiffies_difference_t) ((a) - (b)) < 0)
+CLICK_ENDDECLS
+# define CLICK_HZ			1000
+#endif
+
+#if SIZEOF_CLICK_JIFFIES_T != (HAS_LONG_CLICK_JIFFIES_T ? SIZEOF_LONG : SIZEOF_INT)
+# error "SIZEOF_CLICK_JIFFIES_T declared incorrectly"
+#endif
+
+
+// TIMEVAL OPERATIONS
+
+#ifndef timercmp
+// Convenience macros for operations on timevals.
+// NOTE: 'timercmp' does not work for >= or <=.
+# define timerisset(tvp)	((tvp)->tv_sec || (tvp)->tv_usec)
+# define timerclear(tvp)	((tvp)->tv_sec = (tvp)->tv_usec = 0)
+# define timercmp(a, b, CMP)			\
+  (((a)->tv_sec == (b)->tv_sec) ?		\
+   ((a)->tv_usec CMP (b)->tv_usec) :		\
+   ((a)->tv_sec CMP (b)->tv_sec))
+#endif
+#ifndef timeradd
+# define timeradd(a, b, result)						      \
+  do {									      \
+    (result)->tv_sec = (a)->tv_sec + (b)->tv_sec;			      \
+    (result)->tv_usec = (a)->tv_usec + (b)->tv_usec;			      \
+    if ((result)->tv_usec >= 1000000)					      \
+      {									      \
+	++(result)->tv_sec;						      \
+	(result)->tv_usec -= 1000000;					      \
+      }									      \
+  } while (0)
+#endif
+#ifndef timersub
+# define timersub(a, b, result)						      \
+  do {									      \
+    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			      \
+    (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;			      \
+    if ((result)->tv_usec < 0) {					      \
+      --(result)->tv_sec;						      \
+      (result)->tv_usec += 1000000;					      \
+    }									      \
+  } while (0)
+#endif
+
+#ifndef CLICK_TIMEVAL_OPERATORS
+
+inline timeval make_timeval(int sec, int usec) CLICK_DEPRECATED;
+inline bool operator==(const timeval &a, const timeval &b) CLICK_DEPRECATED;
+inline bool operator!=(const timeval &a, const timeval &b) CLICK_DEPRECATED;
+inline bool operator<(const timeval &a, const timeval &b) CLICK_DEPRECATED;
+inline bool operator<=(const timeval &a, const timeval &b) CLICK_DEPRECATED;
+inline bool operator>(const timeval &a, const timeval &b) CLICK_DEPRECATED;
+inline bool operator>=(const timeval &a, const timeval &b) CLICK_DEPRECATED;
+inline timeval &operator+=(timeval &a, const timeval &b) CLICK_DEPRECATED;
+inline timeval &operator-=(timeval &a, const timeval &b) CLICK_DEPRECATED;
+inline timeval operator+(timeval a, const timeval &b) CLICK_DEPRECATED;
+inline timeval operator-(timeval a, const timeval &b) CLICK_DEPRECATED;
+
+inline struct timeval
+make_timeval(int sec, int usec)
+{
+    struct timeval tv;
+    tv.tv_sec = sec;
+    tv.tv_usec = usec;
+    return tv;
+}
+
+inline bool
+operator==(const struct timeval &a, const struct timeval &b)
+{
+    return a.tv_sec == b.tv_sec && a.tv_usec == b.tv_usec;
+}
+
+inline bool
+operator!=(const struct timeval &a, const struct timeval &b)
+{
+    return a.tv_sec != b.tv_sec || a.tv_usec != b.tv_usec;
+}
+
+inline bool
+operator<(const struct timeval &a, const struct timeval &b)
+{
+    return a.tv_sec < b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_usec < b.tv_usec);
+}
+
+inline bool
+operator<=(const struct timeval &a, const struct timeval &b)
+{
+    return a.tv_sec < b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_usec <= b.tv_usec);
+}
+
+inline bool
+operator>=(const struct timeval &a, const struct timeval &b)
+{
+    return a.tv_sec > b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_usec >= b.tv_usec);
+}
+
+inline bool
+operator>(const struct timeval &a, const struct timeval &b)
+{
+    return a.tv_sec > b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_usec > b.tv_usec);
+}
+
+inline struct timeval &
+operator+=(struct timeval &a, const struct timeval &b)
+{
+    timeradd(&a, &b, &a);
+    return a;
+}
+
+inline struct timeval &
+operator-=(struct timeval &a, const struct timeval &b)
+{
+    timersub(&a, &b, &a);
+    return a;
+}
+
+inline struct timeval
+operator+(struct timeval a, const struct timeval &b)
+{
+    timeradd(&a, &b, &a);
+    return a;
+}
+
+inline struct timeval
+operator-(struct timeval a, const struct timeval &b)
+{
+    timersub(&a, &b, &a);
+    return a;
+}
+
+#endif
+
+CLICK_DECLS
+class StringAccum;
+StringAccum &operator<<(StringAccum &, const struct timeval &);
+CLICK_ENDDECLS
+
+
+// BYTE ORDER
+
+#ifndef le16_to_cpu
+# if CLICK_BYTE_ORDER == CLICK_LITTLE_ENDIAN
+#  define le16_to_cpu(x) (x)
+#  define cpu_to_le16(x) (x)
+#  define le32_to_cpu(x) (x)
+#  define cpu_to_le32(x) (x)
+# elif CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN && defined(__APPLE__)
+#  include <machine/byte_order.h>
+#  define le16_to_cpu(x) NXSwapShort((x))
+#  define cpu_to_le16(x) NXSwapShort((x))
+#  define le32_to_cpu(x) NXSwapInt((x))
+#  define cpu_to_le32(x) NXSwapInt((x))
+# elif CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN && HAVE_BYTESWAP_H
+#  include <byteswap.h>
+#  define le16_to_cpu(x) bswap_16((x))
+#  define cpu_to_le16(x) bswap_16((x))
+#  define le32_to_cpu(x) bswap_32((x))
+#  define cpu_to_le32(x) bswap_32((x))
+# elif CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN
+#  define le16_to_cpu(x) ((((x) & 0x00ff) << 8) | (((x) & 0xff00) >> 8))
+#  define cpu_to_le16(x) le16_to_cpu((x))
+#  define le32_to_cpu(x) (le16_to_cpu((x) >> 16) | (le16_to_cpu(x) << 16))
+#  define cpu_to_le32(x) le32_to_cpu((x))
+# else
+/* leave them undefined */
+# endif
+#endif
+
+
+// CYCLE COUNTS
+
+CLICK_DECLS
+
+#if HAVE_INT64_TYPES
+typedef uint64_t click_cycles_t;
+#else
+typedef uint32_t click_cycles_t;
+#endif
+
+inline click_cycles_t
+click_get_cycles()
+{
+#if CLICK_LINUXMODULE && HAVE_INT64_TYPES && __i386__
+    uint64_t x;
+    __asm__ __volatile__ ("rdtsc" : "=A" (x));
+    return x;
+#elif CLICK_LINUXMODULE && HAVE_INT64_TYPES && __x86_64__
+    uint32_t xlo, xhi;
+    __asm__ __volatile__ ("rdtsc" : "=a" (xlo), "=d" (xhi));
+    return xlo | (((uint64_t) xhi) << 32);
+#elif CLICK_LINUXMODULE && __i386__
+    uint32_t xlo, xhi;
+    __asm__ __volatile__ ("rdtsc" : "=a" (xlo), "=d" (xhi));
+    return xlo;
+#elif CLICK_BSDMODULE
+    return rdtsc();
+#elif CLICK_USERLEVEL && HAVE_INT64_TYPES && __i386__
+    uint64_t x;
+    __asm__ __volatile__ ("rdtsc" : "=A" (x));
+    return x;
+#elif CLICK_USERLEVEL && HAVE_INT64_TYPES && __x86_64__
+    uint32_t xlo, xhi;
+    __asm__ __volatile__ ("rdtsc" : "=a" (xlo), "=d" (xhi));
+    return xlo | (((uint64_t) xhi) << 32);
+#elif CLICK_USERLEVEL && __i386__
+    uint32_t xlo, xhi;
+    __asm__ __volatile__ ("rdtsc" : "=a" (xlo), "=d" (xhi));
+    return xlo;
+#elif CLICK_MINIOS
+    /* FIXME: Implement click_get_cycles for MiniOS */
+    return 0;
+#else
+    // add other architectures here
+    return 0;
+#endif
+}
+
+CLICK_ENDDECLS
+
+#endif
diff --git a/openflow/include/click/handler.hh b/openflow/include/click/handler.hh
new file mode 100644
index 0000000..902a836
--- /dev/null
+++ b/openflow/include/click/handler.hh
@@ -0,0 +1,337 @@
+#ifndef CLICK_HANDLER_HH
+#define CLICK_HANDLER_HH 1
+#include <click/string.hh>
+CLICK_DECLS
+class Element;
+class ErrorHandler;
+class Handler;
+
+/** @file <click/handler.hh>
+ * @brief The Handler class for router handlers.
+ */
+
+typedef int (*HandlerCallback)(int operation, String &data, Element *element,
+			       const Handler *handler, ErrorHandler *errh);
+typedef String (*ReadHandlerCallback)(Element *handler, void *user_data);
+typedef int (*WriteHandlerCallback)(const String &data, Element *element,
+				    void *user_data, ErrorHandler *errh);
+
+class Handler { public:
+
+    enum Flags {
+	f_read = 0x0001,	///< @brief Handler supports read operations.
+	f_write = 0x0002,	///< @brief Handler supports write operations.
+	f_read_param = 0x0004,	///< @brief Read handler takes parameters.
+	f_exclusive = 0,	///< @brief Handler is exclusive (the default):
+				///  router threads must stop while it is
+				///  called.
+	f_nonexclusive = 0x0020,///< @brief Handler is nonexclusive: router
+				///  threads don't need to stop while it is
+				///  called.
+	f_raw = 0x0040,		///< @brief Don't add newline to results.
+	f_read_private = 0x0080,///< @brief Read handler private (invisible
+				///  outside the router configuration).
+	f_write_private = 0x0100,///< @brief Write handler private (invisible
+				///  outside the router configuration).
+	f_deprecated = 0x0200,	///< @brief Handler is deprecated and available
+				///  only for compatibility.
+	f_uncommon = 0x0400,	///< @brief User interfaces should not display
+				///  handler by default.
+	f_calm = 0x0800,	///< @brief Read handler value changes rarely.
+	f_expensive = 0x1000,	///< @brief Read handler is expensive to call.
+	f_button = 0x2000,	///< @brief Write handler ignores data.
+	f_checkbox = 0x4000,	///< @brief Read/write handler is boolean and
+				///  should be rendered as a checkbox.
+	f_driver0 = 1U << 26,
+        f_driver1 = 1U << 27,   ///< @brief Uninterpreted handler flags
+				///  available for drivers.
+	f_user_shift = 28,
+	f_user0 = 1U << f_user_shift,
+				///< @brief First uninterpreted handler flag
+				///  available for element-specific use.
+				///  Equals 1 << f_user_shift.
+
+	f_read_comprehensive = 0x0008,
+	f_write_comprehensive = 0x0010,
+	f_special = f_read | f_write | f_read_param | f_read_comprehensive | f_write_comprehensive
+				///< @brief These flags may not be set by
+				///  Router::set_handler_flags().
+    };
+
+    /** @brief Return this handler's name. */
+    inline const String &name() const {
+	return _name;
+    }
+
+    /** @brief Return this handler's flags.
+     *
+     * The result is a bitwise-or of flags from the Flags enumeration type. */
+    inline uint32_t flags() const {
+	return _flags;
+    }
+
+    /** @brief Return this handler's callback data.
+     * @param op either f_read or f_write. */
+    inline void *user_data(int op) const {
+	return op == f_write ? _write_user_data : _read_user_data;
+    }
+
+    /** @brief Return this handler's read callback data. */
+    inline void *read_user_data() const {
+	return _read_user_data;
+    }
+
+    /** @brief Return this handler's write callback data. */
+    inline void *write_user_data() const {
+	return _write_user_data;
+    }
+
+    /** @cond never */
+    inline void *user_data1() const CLICK_DEPRECATED;
+    inline void *user_data2() const CLICK_DEPRECATED;
+    /** @endcond never */
+
+
+    /** @brief Test if this is a valid read handler. */
+    inline bool readable() const {
+	return _flags & f_read;
+    }
+
+    /** @brief Test if this is a valid read handler that may accept
+     * parameters. */
+    inline bool read_param() const {
+	return _flags & f_read_param;
+    }
+
+    /** @brief Test if this is a public read handler.
+     *
+     * Private handlers may be not called from outside the router
+     * configuration.  Handlers are public by default; to make a read handler
+     * private, add the f_read_private flag. */
+    inline bool read_visible() const {
+	return (_flags & (f_read | f_read_private)) == f_read;
+    }
+
+    /** @brief Test if this is a valid write handler. */
+    inline bool writable() const {
+	return _flags & f_write;
+    }
+
+    /** @brief Test if this is a public write handler.
+     *
+     * Private handlers may not be called from outside the router
+     * configuration.  Handlers are public by default; to make a write handler
+     * private, add the f_write_private flag. */
+    inline bool write_visible() const {
+	return (_flags & (f_write | f_write_private)) == f_write;
+    }
+
+    /** @brief Test if this is a public read or write handler. */
+    inline bool visible() const {
+	return read_visible() || write_visible();
+    }
+
+    /** @brief Test if this handler can execute concurrently with other
+     *         handlers. */
+    inline bool allow_concurrent_handlers() const {
+        return (_flags & f_nonexclusive);
+    }
+
+    /** @brief Test if this handler can execute concurrently with
+     *         router threads. */
+    inline bool allow_concurrent_threads() const {
+        return (_flags & f_nonexclusive);
+    }
+
+    /** @brief Test if spaces should be preserved when calling this handler.
+     *
+     * Some Click drivers perform some convenience processing on handler
+     * values, for example by removing a terminating newline from write
+     * handler values or adding a terminating newline to read handler values.
+     * Raw handlers do not have their values manipulated in this way.  Rawness
+     * is set by the f_raw flag.
+     *
+     * <ul>
+     * <li>The linuxmodule driver adds a terminating newline to non-raw read
+     * handler values, but does not modify raw read handlers' values in any
+     * way.</li>
+     * <li>The same applies to handler values returned by the userlevel
+     * driver's <tt>-h</tt> option.</li>
+     * <li>The linuxmodule driver removes an optional terminating newline from
+     * a one-line non-raw write handler value, but does not modify raw write
+     * handlers' values in any way.</li>
+     * </ul> */
+    inline bool raw() const {
+	return _flags & f_raw;
+    }
+
+
+    /** @brief Call a read handler, possibly with parameters.
+     * @param e element on which to call the handler
+     * @param param parameters, or an empty string if no parameters
+     * @param errh optional error handler
+     *
+     * The element must be nonnull; to call a global handler, pass the
+     * relevant router's Router::root_element().  @a errh may be null, in
+     * which case errors are reported to ErrorHandler::silent_handler(). */
+    String call_read(Element *e, const String &param, ErrorHandler *errh) const;
+
+    /** @brief Call a read handler without parameters.
+     * @param e element on which to call the handler
+     * @param errh error handler
+     *
+     * The element must be nonnull; to call a global handler, pass the
+     * relevant router's Router::root_element().  @a errh may be null, in
+     * which case errors are ignored. */
+    inline String call_read(Element *e, ErrorHandler *errh = 0) const {
+	return call_read(e, String(), errh);
+    }
+
+    /** @brief Call a write handler.
+     * @param value value to write to the handler
+     * @param e element on which to call the handler
+     * @param errh optional error handler
+     *
+     * The element must be nonnull; to call a global handler, pass the
+     * relevant router's Router::root_element().  @a errh may be null, in
+     * which case errors are reported to ErrorHandler::silent_handler(). */
+    int call_write(const String &value, Element *e, ErrorHandler *errh) const;
+
+
+    /** @brief Unparse this handler's name.
+     * @param e relevant element
+     *
+     * If @a e is an actual element, then returns "ENAME.HNAME", where ENAME
+     * is @a e's @link Element::name() name@endlink and HNAME is this
+     * handler's name().  Otherwise, just returns name(). */
+    String unparse_name(Element *e) const;
+
+    /** @brief Unparse a handler name.
+     * @param e relevant element, if any
+     * @param hname handler name
+     *
+     * If @a e is an actual element on some router, then returns
+     * "ENAME.hname", where ENAME is @a e's @link Element::name()
+     * name@endlink.  Otherwise, just returns @a hname.*/
+    static String unparse_name(Element *e, const String &hname);
+
+
+    /** @brief Returns a handler incapable of doing anything.
+     *
+     *  The returned handler returns false for readable() and writable() and
+     *  has flags() of zero. */
+    static inline const Handler *blank_handler() {
+	return the_blank_handler;
+    }
+
+
+    /** @cond never */
+    enum {
+	h_read = f_read,
+	h_write = f_write,
+	h_read_param = f_read_param,
+	h_exclusive = f_exclusive,
+	h_nonexclusive = f_nonexclusive,
+	h_raw = f_raw,
+	h_read_private = f_read_private,
+	h_write_private = f_write_private,
+	h_deprecated = f_deprecated,
+	h_uncommon = f_uncommon,
+	h_calm = f_calm,
+	h_expensive = f_expensive,
+	h_button = f_button,
+	h_checkbox = f_checkbox,
+	h_driver_flag_0 = f_driver0,
+        h_driver_flag_1 = f_driver1,
+	h_user_flag_shift = f_user_shift,
+	h_user_flag_0 = f_user0,
+	h_read_comprehensive = f_read_comprehensive,
+	h_write_comprehensive = f_write_comprehensive,
+	h_special_flags = f_special
+    };
+    enum DeprecatedFlags {
+	OP_READ = f_read,
+	OP_WRITE = f_write,
+	READ_PARAM = f_read_param,
+	RAW = f_raw,
+	// READ_PRIVATE = f_read_private,
+	// WRITE_PRIVATE = f_write_private,
+	// DEPRECATED = f_deprecated,
+	// UNCOMMON = f_uncommon,
+	CALM = f_calm,
+	EXPENSIVE = f_expensive,
+	BUTTON = f_button,
+	CHECKBOX = f_checkbox,
+	USER_FLAG_SHIFT = f_user_shift,
+	USER_FLAG_0 = f_user0
+    };
+    enum CLICK_DEPRECATED {
+	EXCLUSIVE = f_exclusive,
+	NONEXCLUSIVE = f_nonexclusive
+    };
+    /** @endcond never */
+
+    /** @cond never */
+    /** @brief Call a read handler without parameters, passing new user_data().
+     * @param e element on which to call the handler
+     * @param new_user_data new user data
+     *
+     * This function should only be used for special purposes.  It fails
+     * unless called on a handler created with a ReadHandlerCallback. */
+    inline String __call_read(Element *e, void *new_user_data) const {
+	assert((_flags & (f_read | f_read_comprehensive)) == f_read);
+	return _read_hook.r(e, new_user_data);
+    }
+    /** @endcond never */
+
+  private:
+
+    String _name;
+    union {
+	HandlerCallback h;
+	ReadHandlerCallback r;
+    } _read_hook;
+    union {
+	HandlerCallback h;
+	WriteHandlerCallback w;
+    } _write_hook;
+    void *_read_user_data;
+    void *_write_user_data;
+    uint32_t _flags;
+    int _use_count;
+    int _next_by_name;
+
+    static const Handler *the_blank_handler;
+
+    Handler(const String & = String());
+
+    inline void combine(const Handler &x);
+    inline bool compatible(const Handler &x) const;
+
+    friend class Router;
+
+};
+
+/* The largest size a write handler is allowed to have. */
+#define LARGEST_HANDLER_WRITE 65536
+
+typedef HandlerCallback HandlerHook CLICK_DEPRECATED;
+typedef ReadHandlerCallback ReadHandlerHook CLICK_DEPRECATED;
+typedef WriteHandlerCallback WriteHandlerHook CLICK_DEPRECATED;
+
+/** @cond never */
+inline void *
+Handler::user_data1() const
+{
+    return _read_user_data;
+}
+
+inline void *
+Handler::user_data2() const
+{
+    return _write_user_data;
+}
+/** @endcond never */
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/handlercall.hh b/openflow/include/click/handlercall.hh
new file mode 100644
index 0000000..2e116aa
--- /dev/null
+++ b/openflow/include/click/handlercall.hh
@@ -0,0 +1,577 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/handlercall.cc" -*-
+#ifndef CLICK_HANDLERCALL_HH
+#define CLICK_HANDLERCALL_HH
+#include <click/router.hh>
+CLICK_DECLS
+class VariableExpander;
+
+/** @brief  Convenience class for calling handlers.
+ *
+ *  The HandlerCall class simplifies the process of calling Click handlers.
+ *  (The lower-level interface is the Handler class.)  HandlerCall is used in
+ *  two ways: (1) to call handlers immediately via static member functions,
+ *  and (2) to set up future handler calls via HandlerCall objects.  The
+ *  immediate handler call functions take handler names as arguments and
+ *  perform all necessary error checks before calling handlers, if any.  A
+ *  HandlerCall object encapsulates a handler reference (possibly including
+ *  parameters), again automating all necessary error checks.
+ *
+ *  <h2>Immediate Handler Calls</h2>
+ *
+ *  This example code shows how to use the HandlerCall functions for calling
+ *  handlers immediately.
+ *
+ *  @code
+ *  class YourElement { ...
+ *      Element *_other;
+ *  }
+ *
+ *  void YourElement::function() {
+ *      // Call _other's "config" read handler.
+ *      String result = HandlerCall::call_read(_other, "config");
+ *
+ *      // The same, providing an error handler to print errors.
+ *      ErrorHandler *errh = ErrorHandler::default_handler();
+ *      result = HandlerCall::call_read(_other, "config", errh);
+ *      // (Each function takes an optional last argument of "errh".)
+ *
+ *      // Call the "foo.config" read handler.  Search for element "foo" in
+ *      // the current compound element context.
+ *      result = HandlerCall::call_read("foo.config", this);
+ *
+ *      // Call the global "config" read handler for the current router.
+ *      result = HandlerCall::call_read("config", this);
+ *
+ *      // Call _other's "stop" write handler with empty value.
+ *      int success = HandlerCall::call_write(_other, "stop");
+ *
+ *      // Call _other's "config" write handler with value "blah".
+ *      success = HandlerCall::call_write(_other, "config", "blah");
+ *
+ *      // Call the "foo.config" write handler with value "blah".
+ *      success = HandlerCall::call_write("foo.config blah", this);
+ *      // Or, alternately:
+ *      success = HandlerCall::call_write("foo.config", "blah", this);
+ *  }
+ *  @endcode
+ *
+ *  <h2>HandlerCall Objects</h2>
+ *
+ *  This example code shows how to use the HandlerCall objects to call
+ *  handlers with simplified error checking.
+ *
+ *  @code
+ *  class YourElement { ...
+ *      HandlerCall _read_call;
+ *      HandlerCall _write_call;
+ *  }
+ *
+ *  YourElement::YourElement()
+ *      : _read_call(), _write_call() {
+ *  }
+ *
+ *  int YourElement::configure(Vector<String> &conf, ErrorHandler *errh) {
+ *      return cp_va_kparse(conf, this, errh,
+ *                     "READ_CALL", cpkP, cpHandlerCallRead, &_read_call,
+ *                     "WRITE_CALL", cpkP, cpHandlerCallWrite, &_write_call,
+ *                     cpEnd);
+ *  }
+ *
+ *  int YourElement::initialize(ErrorHandler *errh) {
+ *      if ((_read_call && _read_call.initialize_read(this, errh) < 0)
+ *          || (_write_call && _write_call.initialize_write(this, errh) < 0))
+ *          return -1;
+ *      return 0;
+ *  }
+ *
+ *  void YourElement::function() {
+ *      // call _read_call, print result
+ *      if (_read_call)
+ *          click_chatter("%s", _read_call.call_read());
+ *
+ *      // call _write_call with error handler
+ *      if (_write_call)
+ *          _write_call.call_write(ErrorHandler::default_handler());
+ *  }
+ *  @endcode
+ *
+ *  If usually your element's handler calls aren't used, you can save a small
+ *  amount of space by using pointers to HandlerCall objects, as in this
+ *  example.  The cpHandlerCallPtrRead and cpHandlerCallPtrWrite types allow
+ *  the _read_call and _write_call members to start out as null pointers.
+ *
+ *  @code
+ *  class YourElement { ...
+ *      HandlerCall *_read_call;
+ *      HandlerCall *_write_call;
+ *  }
+ *
+ *  YourElement::YourElement()
+ *      : _read_call(0), _write_call(0) {
+ *  }
+ *
+ *  int YourElement::configure(Vector<String> &conf, ErrorHandler *errh) {
+ *      return cp_va_kparse(conf, this, errh,
+ *                     "READ_CALL", cpkP, cpHandlerCallPtrRead, &_read_call,
+ *                     "WRITE_CALL", cpkP, cpHandlerCallPtrWrite, &_write_call,
+ *                     cpEnd);
+ *  }
+ *
+ *  int YourElement::initialize(ErrorHandler *errh) {
+ *      if ((_read_call && _read_call->initialize_read(this, errh) < 0)
+ *          || (_write_call && _write_call->initialize_write(this, errh) < 0))
+ *          return -1;
+ *      return 0;
+ *  }
+ *
+ *  void YourElement::cleanup(CleanupStage) {
+ *      delete _read_call;
+ *      delete _write_call;
+ *  }
+ *
+ *  void YourElement::function() {
+ *      // call _read_call, print result
+ *      if (_read_call)
+ *          click_chatter("%s", _read_call->call_read());
+ *
+ *      // call _write_call with error handler
+ *      if (_write_call)
+ *          _write_call->call_write(ErrorHandler::default_handler());
+ *  }
+ *  @endcode
+ */
+class HandlerCall { public:
+
+    /** @name Immediate Handler Calls */
+    //@{
+    static String call_read(Element *e, const String &hname,
+			    ErrorHandler *errh = 0);
+    static String call_read(const String &hdesc, const Element *context,
+			    ErrorHandler *errh = 0);
+    static int call_write(Element *e, const String &hname,
+			  ErrorHandler *errh = 0);
+    static int call_write(Element *e, const String &hname, const String &value,
+			  ErrorHandler *errh = 0);
+    static int call_write(const String &hdesc,
+			  const Element *context, ErrorHandler *errh = 0);
+    static int call_write(const String &hdesc, const String &value,
+			  const Element *context, ErrorHandler *errh = 0);
+    //@}
+
+
+
+    /** @brief  Construct an empty HandlerCall.
+     *
+     *  Any attempt to read, write, or initialize the HandlerCall will
+     *  fail. */
+    HandlerCall()
+	: _e(0), _h(Handler::blank_handler()) {
+    }
+
+    /** @brief  Construct a HandlerCall described by @a hdesc.
+     *  @param  hdesc  handler description <tt>"[ename.]hname[ value]"</tt>
+     *
+     *  Although the resulting HandlerCall isn't empty, it must be initialized
+     *  before it can be used.  It returns false for initialized().  The
+     *  handler description is not checked for syntax errors, though;
+     *  initialize() does that. */
+    HandlerCall(const String &hdesc)
+	: _e(reinterpret_cast<Element *>(4)), _h(Handler::blank_handler()),
+	  _value(hdesc) {
+    }
+
+
+    enum Flags {
+	readable = Handler::f_read,
+	f_read = Handler::f_read,
+	writable = Handler::f_write,
+	f_write = Handler::f_write,
+	f_preinitialize = 4,
+        f_unquote_param = 8
+    };
+
+    /** @brief  Initialize the HandlerCall.
+     *  @param  flags    zero or more of f_read, f_write, f_preinitialize,
+     *                   f_unquote_param
+     *  @param  context  optional element context
+     *  @param  errh     optional error handler
+     *  @return 0 on success, negative on failure
+     *
+     *  Initializes the HandlerCall object.  The handler description supplied
+     *  to the constructor is parsed and checked for syntax errors.  Any
+     *  element reference is looked up relative to @a context, if any.  (For
+     *  example, if @a hdesc was "x.config" and @a context's name is
+     *  "aaa/bbb/ccc", this will search for elements named aaa/bbb/x, aaa/x,
+     *  and finally x.  If @a context is null, then the description must refer
+     *  to a global handler.)  If f_read is set in @a flags, then there
+     *  must be a read handler named appropriately; if f_write is set,
+     *  then there must be a write handler.  If f_unquote_param is set, then any
+     *  parameters are unquoted.
+     *
+     *  Initialization fails if the handler description was bogus (for
+     *  example, an empty string, or something like "*#!$&!(#&$."), if the
+     *  named handler does not exist, if a read handler description has
+     *  parameters but the read handler doesn't actually take parameters, and
+     *  so forth.  If @a errh is nonnull, errors are reported there.  The
+     *  HandlerCall becomes empty on failure: empty() will return true, and
+     *  (bool) *this will return false.  Future call_read() and call_write()
+     *  attempts will correctly fail.
+     *
+     *  If the f_preinitialize flag is set, the initialize function will check
+     *  whether the router's handlers are ready (Router::handlers_ready()).
+     *  If handlers are not ready, then initialize() will check for syntax
+     *  errors, but not actually look up the handler (since we don't know yet
+     *  whether or not the handler exists).  Absent a syntax error,
+     *  initialize() will return 0 for success even though the HandlerCall
+     *  remains uninitialized. */
+    int initialize(int flags, const Element *context, ErrorHandler *errh = 0);
+
+    /** @brief  Initialize the HandlerCall for reading.
+     *  @param  context  optional element context
+     *  @param  errh     optional error handler
+     *
+     *  Equivalent to @link initialize(int, const Element*, ErrorHandler*)
+     *  initialize@endlink(f_read, @a context, @a errh). */
+    inline int initialize_read(const Element *context, ErrorHandler *errh = 0);
+
+    /** @brief  Initialize the HandlerCall for writing.
+     *  @param  context  optional element context
+     *  @param  errh     optional error handler
+     *
+     *  Equivalent to @link initialize(int, const Element*, ErrorHandler*)
+     *  initialize@endlink(f_write, @a context, @a errh). */
+    inline int initialize_write(const Element *context, ErrorHandler *errh = 0);
+
+
+    typedef bool (HandlerCall::*unspecified_bool_type)() const;
+
+    /** @brief  Test if HandlerCall is empty.
+     *  @return True if HandlerCall is not empty, false otherwise.
+     *
+     *  Valid HandlerCall objects have been successfully initialized. */
+    operator unspecified_bool_type() const {
+	return _h != Handler::blank_handler() || _e ? &HandlerCall::empty : 0;
+    }
+
+    /** @brief  Test if HandlerCall is empty.
+     *  @return True if HandlerCall is empty, false otherwise. */
+    bool empty() const {
+	return _h == Handler::blank_handler() && !_e;
+    }
+
+    /** @brief  Test if HandlerCall is initialized.
+     *  @return True if HandlerCall is initialized, false otherwise. */
+    bool initialized() const {
+	return _h != Handler::blank_handler();
+    }
+
+
+    /** @brief  Call a read handler.
+     *  @param  errh  optional error handler
+     *  @return  Read handler result.
+     *
+     *  Fails and returns the empty string if this HandlerCall is invalid or
+     *  not a read handler.  If @a errh is nonnull, then any errors are
+     *  reported there, whether from HandlerCall or the handler itself. */
+    inline String call_read(ErrorHandler *errh = 0) const;
+
+    /** @brief  Call a write handler.
+     *  @param  errh  optional error handler
+     *  @return  Write handler result.
+     *
+     *  Fails and returns -EINVAL if this HandlerCall is invalid or not a
+     *  write handler.  If @a errh is nonnull, then any errors are reported
+     *  there, whether from HandlerCall or the handler itself. */
+    inline int call_write(ErrorHandler *errh = 0) const;
+
+    /** @brief  Call a write handler, expanding its argument.
+     *  @param  scope  variable scope
+     *  @param  errh  optional error handler
+     *  @return  Write handler result.
+     *
+     *  The write value is expanded in @a scope before the handler is called.
+     *  Fails and returns -EINVAL if this HandlerCall is invalid or not a
+     *  write handler.  If @a errh is nonnull, then any errors are reported
+     *  there, whether from HandlerCall or the handler itself. */
+    inline int call_write(const VariableExpander &scope, ErrorHandler *errh = 0) const;
+
+    /** @brief  Call a write handler with an additional value.
+     *  @param  value_ext  write value extension
+     *  @param  errh       optional error handler
+     *  @return  Write handler result.
+     *
+     *  The @a value_ext is appended to the write value before the handler is
+     *  called.  (For example, consider a handler with description "a.set
+     *  value".  call_write("foo") will call "a.set value foo".)  Fails and
+     *  returns -EINVAL if this HandlerCall is invalid or not a write handler.
+     *  If @a errh is nonnull, then any errors are reported there, whether
+     *  from HandlerCall or the handler itself. */
+    inline int call_write(const String &value_ext, ErrorHandler *errh = 0) const;
+
+
+    /** @brief  Create and initialize a HandlerCall from @a hdesc.
+     *  @param  hcall    stores the HandlerCall result
+     *  @param  hdesc    handler description "[ename.]hname[ value]"
+     *  @param  flags    initialization flags (f_read, f_write, f_preinitialize)
+     *  @param  context  optional element context
+     *  @param  errh     optional error handler
+     *  @return  0 on success, -EINVAL on failure
+     *
+     *  Creates a HandlerCall and initializes it.  Behaves somewhat like:
+     *
+     *  @code
+     *  hcall = new HandlerCall(hdesc);
+     *  return hcall->initialize(flags, context, errh);
+     *  @endcode
+     *
+     *  However, (1) if initialization fails, then @a hcall is untouched; and
+     *  (2) if initialization succeeds and @a hcall is not null, then the
+     *  existing HandlerCall is assigned so that it corresponds to the new one
+     *  (no new memory allocations).
+     *
+     *  If @a errh is nonnull, then any errors are reported there. */
+    static int reset(HandlerCall *&hcall, const String &hdesc, int flags,
+		     const Element *context, ErrorHandler *errh = 0);
+
+    /** @brief  Create and initialize a HandlerCall on element @a e.
+     *  @param  hcall  stores the HandlerCall result
+     *  @param  e      relevant element, if any
+     *  @param  hname  handler name
+     *  @param  value  handler value
+     *  @param  flags  initialization flags (f_read, f_write, f_preinitialize)
+     *  @param  errh   optional error handler
+     *  @return  0 on success, -EINVAL on failure
+     *
+     *  Creates a HandlerCall and initializes it.  Behaves analogously to
+     *  reset(HandlerCall*&, const String&, int, const Element*, ErrorHandler*). */
+    static int reset(HandlerCall *&hcall,
+		     Element *e, const String &hname, const String &value,
+		     int flags, ErrorHandler *errh = 0);
+
+
+    /** @brief  Create and initialize a read HandlerCall from @a hdesc.
+     *  @param  hcall    stores the HandlerCall result
+     *  @param  hdesc    handler description "[ename.]hdesc[ param]"
+     *  @param  context  optional element context
+     *  @param  errh     optional error handler
+     *  @return  0 on success, -EINVAL on failure
+     *
+     *  Equivalent to
+     *  @link reset(HandlerCall*&, const String&, int, const Element*, ErrorHandler*) reset@endlink(@a hcall, @a hdesc, f_read, @a context, @a errh). */
+    static inline int reset_read(HandlerCall *&hcall, const String &hdesc,
+				 const Element *context, ErrorHandler *errh = 0);
+
+    /** @brief  Create and initialize a read HandlerCall from @a hdesc.
+     *  @param  hcall  stores the HandlerCall result
+     *  @param  e      relevant element, if any
+     *  @param  hname  handler name
+     *  @param  errh   optional error handler
+     *  @return  0 on success, -EINVAL on failure
+     *
+     *  Equivalent to
+     *  @link reset(HandlerCall*&, Element*, const String&, const String&, int, ErrorHandler*) reset@endlink(@a hcall, @a e, @a hname, String(), f_read, @a context, @a errh). */
+    static inline int reset_read(HandlerCall *&hcall,
+				 Element *e, const String &hname,
+				 ErrorHandler *errh = 0);
+
+    /** @brief  Create and initialize a write HandlerCall from @a hdesc.
+     *  @param  hcall    stores the HandlerCall result
+     *  @param  hdesc    handler description "[ename.]hdesc[ value]"
+     *  @param  context  optional element context
+     *  @param  errh     optional error handler
+     *  @return  0 on success, -EINVAL on failure
+     *
+     *  Equivalent to
+     *  @link reset(HandlerCall*&, const String&, int, const Element*, ErrorHandler*) reset@endlink(@a hcall, @a hdesc, f_write, @a context, @a errh). */
+    static inline int reset_write(HandlerCall *&hcall, const String &hdesc,
+				  const Element *context, ErrorHandler *errh = 0);
+
+    /** @brief  Create and initialize a read HandlerCall from @a hdesc.
+     *  @param  hcall  stores the HandlerCall result
+     *  @param  e      relevant element, if any
+     *  @param  hname  handler name
+     *  @param  value  write handler value
+     *  @param  errh   optional error handler
+     *  @return  0 on success, -EINVAL on failure
+     *
+     *  Equivalent to
+     *  @link reset(HandlerCall*&, Element*, const String&, const String&, int, ErrorHandler*) reset@endlink(@a hcall, @a e, @a hname, @ value, f_write, @a context, @a errh). */
+    static inline int reset_write(HandlerCall *&hcall,
+				  Element *e, const String &hname,
+				  const String &value = String(),
+				  ErrorHandler *errh = 0);
+
+
+    /** @brief  Return the Element corresponding to this HandlerCall.
+     *
+     *  Returns null if invalid.  A global handler may return some
+     *  Router::root_element() or null. */
+    Element *element() const {
+	return _e;
+    }
+
+    /** @brief  Return the Handler corresponding to this HandlerCall.
+     *
+     *  Returns Handler::blank_handler() if invalid. */
+    const Handler *handler() const {
+	return _h;
+    }
+
+    /** @brief  Return the write handler value and/or read handler parameters.
+     *
+     *  Returns the empty string if invalid. */
+    const String &value() const	{
+	return initialized() ? _value : String::make_empty();
+    }
+
+    /** @brief  Sets the write handler value and/or read handler parameters.
+     *  @param  value  new value and/or parameters
+     *
+     *  Does nothing if invalid. */
+    void set_value(const String &value) {
+	if (initialized())
+	    _value = value;
+    }
+
+    /** @brief  Return a String that will parse into an equivalent HandlerCall.
+     *
+     *  Will work even if the HandlerCall has not been initialized. */
+    String unparse() const;
+
+    /** @brief  Make this HandlerCall empty.
+     *
+     *  Subsequent attempts to read, write, or initialize the HandlerCall will
+     *  fail. */
+    void clear() {
+	_e = 0;
+	_h = Handler::blank_handler();
+	_value = String();
+    }
+
+
+    /** @cond never */
+    enum {
+        CHECK_READ = f_read, OP_READ = f_read, h_read = f_read,
+        CHECK_WRITE = f_write, OP_WRITE = f_write, h_write = f_write,
+        PREINITIALIZE = f_preinitialize, h_preinitialize = f_preinitialize,
+        UNQUOTE_PARAM = f_unquote_param, h_unquote_param = f_unquote_param
+    };
+    /** @endcond never */
+
+  private:
+
+    Element *_e;
+    const Handler *_h;
+    String _value;
+
+    int parse(int flags, Element*, ErrorHandler*);
+    int assign(Element*, const String&, const String&, int flags, ErrorHandler*);
+
+};
+
+inline int
+HandlerCall::reset_read(HandlerCall*& hcall, const String& hdesc, const Element* context, ErrorHandler* errh)
+{
+    return reset(hcall, hdesc, f_read, context, errh);
+}
+
+inline int
+HandlerCall::reset_write(HandlerCall*& hcall, const String& hdesc, const Element* context, ErrorHandler* errh)
+{
+    return reset(hcall, hdesc, f_write, context, errh);
+}
+
+inline int
+HandlerCall::reset_read(HandlerCall*& hcall, Element* e, const String& hname, ErrorHandler* errh)
+{
+    return reset(hcall, e, hname, String(), f_read, errh);
+}
+
+inline int
+HandlerCall::reset_write(HandlerCall*& hcall, Element* e, const String& hname, const String& value, ErrorHandler* errh)
+{
+    return reset(hcall, e, hname, value, f_write, errh);
+}
+
+inline int
+HandlerCall::initialize_read(const Element* context, ErrorHandler* errh)
+{
+    return initialize(f_read, context, errh);
+}
+
+inline int
+HandlerCall::initialize_write(const Element* context, ErrorHandler* errh)
+{
+    return initialize(f_write, context, errh);
+}
+
+inline String
+HandlerCall::call_read(ErrorHandler *errh) const
+{
+    return _h->call_read(_e, _value, errh);
+}
+
+inline int
+HandlerCall::call_write(ErrorHandler *errh) const
+{
+    return _h->call_write(_value, _e, errh);
+}
+
+String cp_expand(const String &str, const VariableExpander &env, bool expand_quote, int depth);
+
+inline int
+HandlerCall::call_write(const VariableExpander &scope, ErrorHandler *errh) const
+{
+    return _h->call_write(cp_expand(_value, scope, false, 0), _e, errh);
+}
+
+inline int
+HandlerCall::call_write(const String &value_ext, ErrorHandler *errh) const
+{
+    if (_value && value_ext)
+	return _h->call_write(_value + " " + value_ext, _e, errh);
+    else
+	return _h->call_write(_value ? _value : value_ext, _e, errh);
+}
+
+/** @brief  Call a write handler specified by element and handler name.
+ *  @param  e      relevant element, if any
+ *  @param  hname  handler name
+ *  @param  errh   optional error handler
+ *  @return  handler result, or -EINVAL on error
+ *
+ *  Searches for a write handler named @a hname on element @a e.  If the
+ *  handler exists, calls it (with empty write value) and returns the result.
+ *  If @a errh is nonnull, then errors, such as a missing handler or a
+ *  read-only handler, are reported there.  If @a e is some router's @link
+ *  Router::root_element() root element@endlink, calls the global write
+ *  handler named @a hname on that router. */
+inline int
+HandlerCall::call_write(Element *e, const String &hname, ErrorHandler *errh)
+{
+    return call_write(e, hname, String(), errh);
+}
+
+
+/** @class HandlerCallArg
+  @brief Parser class for handler call specifications.
+
+  The constructor argument should generally be either HandlerCall::writable or
+  HandlerCall::readable.  For example:
+
+  @code
+  HandlerCall end_h;
+  ... Args(...) ...
+     .read("END_CALL", HandlerCallArg(HandlerCall::writable), end_h)
+     ...
+  @endcode */
+struct HandlerCallArg {
+    HandlerCallArg(int f)
+	: flags(f) {
+    }
+    bool parse(const String &str, HandlerCall &result, const ArgContext &args);
+    int flags;
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/hashallocator.hh b/openflow/include/click/hashallocator.hh
new file mode 100644
index 0000000..38d55ce
--- /dev/null
+++ b/openflow/include/click/hashallocator.hh
@@ -0,0 +1,103 @@
+// -*- related-file-name: "../../lib/hashallocator.cc" -*-
+#ifndef CLICK_HASHALLOCATOR_HH
+#define CLICK_HASHALLOCATOR_HH
+#if HAVE_VALGRIND && HAVE_VALGRIND_MEMCHECK_H
+# include <valgrind/memcheck.h>
+#endif
+CLICK_DECLS
+
+class HashAllocator { public:
+
+    HashAllocator(size_t size);
+    ~HashAllocator();
+
+    inline void increase_size(size_t new_size) {
+	assert(!_free && !_buffer && new_size >= _size);
+	_size = new_size;
+    }
+
+    inline void *allocate();
+    inline void deallocate(void *p);
+
+    void swap(HashAllocator &x);
+
+  private:
+
+    struct link {
+	link *next;
+    };
+
+    struct buffer {
+	buffer *next;
+	size_t pos;
+	size_t maxpos;
+    };
+
+    enum {
+	min_buffer_size = 1024,
+#if CLICK_LINUXMODULE
+	max_buffer_size = 16384,
+#else
+	max_buffer_size = 1048576,
+#endif
+	min_nelements = 8
+    };
+
+    link *_free;
+    buffer *_buffer;
+    size_t _size;
+
+    void *hard_allocate();
+
+    HashAllocator(const HashAllocator &x);
+    HashAllocator &operator=(const HashAllocator &x);
+
+};
+
+
+template <size_t size>
+class SizedHashAllocator : public HashAllocator { public:
+
+    SizedHashAllocator()
+	: HashAllocator(size) {
+    }
+
+};
+
+
+inline void *HashAllocator::allocate()
+{
+    if (link *l = _free) {
+#ifdef VALGRIND_MEMPOOL_ALLOC
+	VALGRIND_MEMPOOL_ALLOC(this, l, _size);
+	VALGRIND_MAKE_MEM_DEFINED(&l->next, sizeof(l->next));
+#endif
+	_free = l->next;
+#ifdef VALGRIND_MAKE_MEM_DEFINED
+	VALGRIND_MAKE_MEM_UNDEFINED(&l->next, sizeof(l->next));
+#endif
+	return l;
+    } else if (_buffer && _buffer->pos < _buffer->maxpos) {
+	void *data = reinterpret_cast<char *>(_buffer) + _buffer->pos;
+	_buffer->pos += _size;
+#ifdef VALGRIND_MEMPOOL_ALLOC
+	VALGRIND_MEMPOOL_ALLOC(this, data, _size);
+#endif
+	return data;
+    } else
+	return hard_allocate();
+}
+
+inline void HashAllocator::deallocate(void *p)
+{
+    if (p) {
+	reinterpret_cast<link *>(p)->next = _free;
+	_free = reinterpret_cast<link *>(p);
+#ifdef VALGRIND_MEMPOOL_FREE
+	VALGRIND_MEMPOOL_FREE(this, p);
+#endif
+    }
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/hashcode.hh b/openflow/include/click/hashcode.hh
new file mode 100644
index 0000000..03d2f12
--- /dev/null
+++ b/openflow/include/click/hashcode.hh
@@ -0,0 +1,103 @@
+#ifndef CLICK_HASHCODE_HH
+#define CLICK_HASHCODE_HH
+CLICK_DECLS
+
+// Notes about the hashcode template: On GCC 4.3.0, "template <>" is required
+// on the specializations or they aren't used.  Just plain overloaded
+// functions aren't used.  The specializations must be e.g. "const char &",
+// not "char", or GCC complains about a specialization not matching the
+// general template.  The main template takes a const reference for two
+// reasons.  First, providing both "hashcode_t hashcode(T)" and "hashcode_t
+// hashcode(const T&)" leads to ambiguity errors.  Second, providing only
+// "hashcode_t hashcode(T)" is slower by looks like 8% when T is a String,
+// because of copy constructors; for types with more expensive non-default
+// copy constructors this would probably be worse.
+
+typedef size_t hashcode_t;	///< Typical type for a hashcode() value.
+
+template <typename T>
+inline hashcode_t hashcode(T const &x) {
+    return x.hashcode();
+}
+
+template <>
+inline hashcode_t hashcode(char const &x) {
+    return x;
+}
+
+template <>
+inline hashcode_t hashcode(signed char const &x) {
+    return x;
+}
+
+template <>
+inline hashcode_t hashcode(unsigned char const &x) {
+    return x;
+}
+
+template <>
+inline hashcode_t hashcode(short const &x) {
+    return x;
+}
+
+template <>
+inline hashcode_t hashcode(unsigned short const &x) {
+    return x;
+}
+
+template <>
+inline hashcode_t hashcode(int const &x) {
+    return x;
+}
+
+template <>
+inline hashcode_t hashcode(unsigned const &x) {
+    return x;
+}
+
+template <>
+inline hashcode_t hashcode(long const &x) {
+    return x;
+}
+
+template <>
+inline hashcode_t hashcode(unsigned long const &x) {
+    return x;
+}
+
+#if HAVE_LONG_LONG
+template <>
+inline hashcode_t hashcode(long long const &x) {
+    return (x >> 32) ^ x;
+}
+
+template <>
+inline hashcode_t hashcode(unsigned long long const &x) {
+    return (x >> 32) ^ x;
+}
+#endif
+
+#if HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG && !HAVE_INT64_IS_LONG_LONG
+template <>
+inline hashcode_t hashcode(int64_t const &x) {
+    return (x >> 32) ^ x;
+}
+
+template <>
+inline hashcode_t hashcode(uint64_t const &x) {
+    return (x >> 32) ^ x;
+}
+#endif
+
+template <typename T>
+inline hashcode_t hashcode(T * const &x) {
+    return reinterpret_cast<uintptr_t>(x) >> 3;
+}
+
+template <typename T>
+inline typename T::key_const_reference hashkey(const T &x) {
+    return x.hashkey();
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/hashcontainer.hh b/openflow/include/click/hashcontainer.hh
new file mode 100644
index 0000000..41e1ecf
--- /dev/null
+++ b/openflow/include/click/hashcontainer.hh
@@ -0,0 +1,724 @@
+#ifndef CLICK_HASHCONTAINER_HH
+#define CLICK_HASHCONTAINER_HH
+#include <click/glue.hh>
+#include <click/hashcode.hh>
+#include <click/libdivide.h>
+#if CLICK_DEBUG_HASHMAP
+# define click_hash_assert(x) assert(x)
+#else
+# define click_hash_assert(x)
+#endif
+CLICK_DECLS
+
+template <typename T> class HashContainer_adapter;
+template <typename T, typename A = HashContainer_adapter<T> > class HashContainer_const_iterator;
+template <typename T, typename A = HashContainer_adapter<T> > class HashContainer_iterator;
+template <typename T, typename A = HashContainer_adapter<T> > class HashContainer;
+
+/** @cond never */
+template <typename T, typename A>
+class HashContainer_rep : public A {
+    T **buckets;
+    uint32_t nbuckets;
+    mutable uint32_t first_bucket;
+    size_t size;
+    libdivide_u32_t bucket_divider;
+    friend class HashContainer<T, A>;
+    friend class HashContainer_const_iterator<T, A>;
+    friend class HashContainer_iterator<T, A>;
+};
+/** @endcond */
+
+template <typename T>
+class HashContainer_adapter { public:
+    typedef typename T::key_type key_type;
+    typedef typename T::key_const_reference key_const_reference;
+    static T *&hashnext(T *e) {
+	return e->_hashnext;
+    }
+    static key_const_reference hashkey(const T *e) {
+	return e->hashkey();
+    }
+    static bool hashkeyeq(const key_type &a, const key_type &b) {
+	return a == b;
+    }
+};
+
+/** @class HashContainer
+  @brief Intrusive hash table template.
+
+  The HashContainer template implements a hash table or associative array
+  suitable for use in the kernel or at user level.
+
+  HashContainer is <em>intrusive.</em> This means it does not manage its
+  contents' memory.  While non-intrusive containers are more common in the
+  STL, intrusive containers make it simple to store objects in more than one
+  container at a time.
+
+  Unlike many hash tables HashContainer does not automatically grow itself to
+  maintain good lookup performance.  Its users are expected to call rehash()
+  when appropriate.  See unbalanced().
+
+  With the default adapter type (A), the template type T must:
+
+  <ul>
+  <li>Define a "key_type" type that supports equality.</li>
+  <li>Define a "key_const_reference" type, usually the same as "key_type."</li>
+  <li>Contain a member "T *_hashnext" accessible to HashContainer_adapter<T>.</li>
+  <li>Define a "hashkey()" member function that returns the relevant hash key.
+  This function must have return type "key_const_reference."</li>
+  </ul>
+
+  These requirements can be changed by supplying a different A, or adapter,
+  type.
+
+  HashContainer can store multiple elements with the same key, although this
+  is not the normal use.  An element stored in a HashContainer should not
+  modify its key.
+
+  HashContainer is used to implement Click's HashTable template.
+*/
+template <typename T, typename A>
+class HashContainer { public:
+
+    /** @brief Key type. */
+    typedef typename A::key_type key_type;
+
+    /** @brief Value type.
+     *
+     * Must meet the HashContainer requirements defined by type A. */
+    typedef T value_type;
+
+    /** @brief Type of sizes. */
+    typedef size_t size_type;
+
+    /** @brief Type of bucket counts. */
+    typedef uint32_t bucket_count_type;
+
+    enum {
+#if CLICK_LINUXMODULE
+	max_bucket_count = 4194303,
+#else
+	max_bucket_count = (bucket_count_type) -1,
+#endif
+	initial_bucket_count = 63
+    };
+
+    /** @brief Construct an empty HashContainer. */
+    HashContainer();
+
+    /** @brief Construct an empty HashContainer with at least @a n buckets. */
+    explicit HashContainer(bucket_count_type n);
+
+    /** @brief Destroy the HashContainer. */
+    ~HashContainer();
+
+
+    /** @brief Return the number of elements stored. */
+    inline size_type size() const {
+	return _rep.size;
+    }
+
+    /** @brief Return true iff size() == 0. */
+    inline bool empty() const {
+	return _rep.size == 0;
+    }
+
+    /** @brief Return the number of buckets. */
+    inline bucket_count_type bucket_count() const {
+	return _rep.nbuckets;
+    }
+
+    /** @brief Return the number of elements in bucket @a n. */
+    inline size_type bucket_size(bucket_count_type n) const {
+	click_hash_assert(n < _rep.nbuckets);
+	size_type s = 0;
+	for (T *element = _rep.buckets[n]; element; element = _rep.hashnext(element))
+	    ++s;
+	return s;
+    }
+
+    /** @brief Return the bucket number containing elements with @a key. */
+    bucket_count_type bucket(const key_type &key) const;
+
+    /** @brief Return true if this HashContainer should be rebalanced. */
+    inline bool unbalanced() const {
+	return _rep.size > 2 * _rep.nbuckets && _rep.nbuckets < max_bucket_count;
+    }
+
+    typedef HashContainer_const_iterator<T, A> const_iterator;
+    typedef HashContainer_iterator<T, A> iterator;
+
+    /** @brief Return an iterator for the first element in the container.
+     *
+     * @note HashContainer iterators return elements in random order. */
+    inline iterator begin();
+    /** @overload */
+    inline const_iterator begin() const;
+
+    /** @brief Return an iterator for the end of the container.
+     * @invariant end().live() == false */
+    inline iterator end();
+    /** @overload */
+    inline const_iterator end() const;
+
+    /** @brief Return an iterator for the first element in bucket @a n. */
+    inline iterator begin(bucket_count_type n);
+    /** @overload */
+    inline const_iterator begin(bucket_count_type n) const;
+
+    /** @brief Test if an element with key @a key exists in the table. */
+    inline bool contains(const key_type& key) const;
+    /** @brief Return the number of elements with key @a key in the table. */
+    inline size_type count(const key_type& key) const;
+
+    /** @brief Return an iterator for an element with @a key, if any.
+     *
+     * If no element with @a key exists in the table, find() returns an
+     * iterator that compares equal to end().  However, this iterator is
+     * special, and can also be used to efficiently insert an element with key
+     * @a key.  In particular, the return value of find() always has
+     * can_insert(), and can thus be passed to insert_at() or set().  (It
+     * will insert elements at the head of the relevant bucket.) */
+    inline iterator find(const key_type &key);
+    /** @overload */
+    inline const_iterator find(const key_type &key) const;
+
+    /** @brief Return an iterator for an element with key @a key, if any.
+     *
+     * Like find(), but additionally moves any found element to the head of
+     * its bucket, possibly speeding up future lookups. */
+    inline iterator find_prefer(const key_type &key);
+
+    /** @brief Return an element for @a key, if any.
+     *
+     * Returns null if no element for @a key currently exists.  Equivalent
+     * to find(key).get(). */
+    inline T *get(const key_type &key) const;
+
+    /** @brief Insert an element at position @a it.
+     * @param it iterator
+     * @param element element
+     * @pre @a it.can_insert()
+     * @pre @a it.bucket() == bucket(@a element->hashkey())
+     * @pre @a element != NULL
+     * @pre @a element is not already in the HashContainer
+     *
+     * Inserts @a element at the position in the hash table indicated by @a
+     * it.  For instance, if @a it == begin(@em n) for some bucket number @em
+     * n, then @a element becomes the first element in bucket @em n.  Other
+     * elements in the bucket, if any, are chained along.
+     *
+     * On return, @a it is updated to point immediately after @a element.
+     * If @a it was not live before, then it will not be live after.
+     *
+     * @note HashContainer never automatically rehashes itself, so element
+     * insertion leaves any existing iterators valid.  For best performance,
+     * however, users must call balance() to resize the container when it
+     * becomes unbalanced(). */
+    inline void insert_at(iterator &it, T *element);
+
+    /** @brief Replace the element at position @a it with @a element.
+     * @param it iterator
+     * @param element element (can be null)
+     * @param balance whether to balance the hash table
+     * @return the previous value of it.get()
+     * @pre @a it.can_insert()
+     * @pre @a it.bucket() == bucket(@a element->hashkey())
+     * @pre @a element is not already in the HashContainer
+     *
+     * Replaces the element pointed to by @a it with @a element, and returns
+     * the former element.  If @a element is null the former element is
+     * removed.  If there is no former element then @a element is inserted.
+     * When inserting an element with @a balance true, set() may rebalance the
+     * hash table.
+     *
+     * As a side effect, @a it is advanced to point at the newly inserted @a
+     * element.  If @a element is null, then @a it is advanced to point at the
+     * next element as by ++@a it. */
+    T *set(iterator &it, T *element, bool balance = false);
+
+    /** @brief Replace the element with @a element->hashkey() with @a element.
+     * @param element element
+     * @return the previous value of find(@a element->hashkey()).get()
+     * @pre @a element is not already in the HashContainer
+     *
+     * Finds an element with the same hashkey as @a element, removes it from
+     * the HashContainer, and replaces it with @a element.  If there is no
+     * former element then @a element is inserted. */
+    inline T *set(T *element);
+
+    /** @brief Remove the element at position @a it.
+     * @param it iterator
+     * @return the previous value of it.get()
+     *
+     * As a side effect, @a it is advanced to the next element as by ++@a it. */
+    inline T *erase(iterator &it);
+
+    /** @brief Remove an element with hashkey @a key.
+     * @return the element removed, if any
+     *
+     * Roughly equivalent to erase(find(key)). */
+    inline T *erase(const key_type &key);
+
+    /** @brief Removes all elements from the container.
+     * @post size() == 0 */
+    void clear();
+
+    /** @brief Swaps the contents of *this and @a x. */
+    inline void swap(HashContainer<T, A> &x);
+
+    /** @brief Rehash the table, ensuring it contains at least @a n buckets.
+     *
+     * If @a n < bucket_count(), this function may make the hash table
+     * slower.
+     *
+     * @note Rehashing invalidates all existing iterators. */
+    void rehash(bucket_count_type n);
+
+    /** @brief Rehash the table if it is unbalanced.
+     *
+     * @note Rehashing invalidates all existing iterators. */
+    inline void balance() {
+	if (unbalanced())
+	    rehash(bucket_count() + 1);
+    }
+
+  private:
+
+    HashContainer_rep<T, A> _rep;
+
+    HashContainer(const HashContainer<T, A> &);
+    HashContainer<T, A> &operator=(const HashContainer<T, A> &);
+
+    friend class HashContainer_iterator<T, A>;
+    friend class HashContainer_const_iterator<T, A>;
+
+};
+
+/** @class HashContainer_const_iterator
+ * @brief The const_iterator type for HashContainer. */
+template <typename T, typename A>
+class HashContainer_const_iterator { public:
+
+    typedef typename HashContainer<T, A>::size_type size_type;
+    typedef typename HashContainer<T, A>::bucket_count_type bucket_count_type;
+
+    /** @brief Construct an uninitialized iterator. */
+    HashContainer_const_iterator() {
+    }
+
+    /** @brief Return a pointer to the element, null if *this == end(). */
+    T *get() const {
+	return _element;
+    }
+
+    /** @brief Return a pointer to the element, null if *this == end(). */
+    T *operator->() const {
+	return _element;
+    }
+
+    /** @brief Return a reference to the element.
+     * @pre *this != end() */
+    T &operator*() const {
+	return *_element;
+    }
+
+    /** @brief Return true iff *this != end(). */
+    inline bool live() const {
+	return _element;
+    }
+
+    typedef T *(HashContainer_const_iterator::*unspecified_bool_type)() const;
+    /** @brief Return true iff *this != end(). */
+    inline operator unspecified_bool_type() const {
+	return _element ? &HashContainer_const_iterator::get : 0;
+    }
+
+    /** @brief Return the corresponding HashContainer. */
+    const HashContainer<T, A> *hashcontainer() const {
+	return _hc;
+    }
+
+    /** @brief Return the bucket number this iterator is in. */
+    bucket_count_type bucket() const {
+	return _bucket;
+    }
+
+    /** @brief Advance this iterator to the next element. */
+    void operator++() {
+	if (_element && _hc->_rep.hashnext(_element)) {
+	    _pprev = &_hc->_rep.hashnext(_element);
+	    _element = *_pprev;
+	} else if (_bucket != _hc->_rep.nbuckets) {
+	    for (++_bucket; _bucket != _hc->_rep.nbuckets; ++_bucket)
+		if (*(_pprev = &_hc->_rep.buckets[_bucket])) {
+		    _element = *_pprev;
+		    return;
+		}
+	    _element = 0;
+	}
+    }
+
+    /** @brief Advance this iterator to the next element. */
+    void operator++(int) {
+	++*this;
+    }
+
+  private:
+
+    T *_element;
+    T **_pprev;
+    bucket_count_type _bucket;
+    const HashContainer<T, A> *_hc;
+
+    inline HashContainer_const_iterator(const HashContainer<T, A> *hc)
+	: _hc(hc) {
+	_bucket = hc->_rep.first_bucket;
+	_pprev = &hc->_rep.buckets[_bucket];
+	if (unlikely(_bucket == hc->_rep.nbuckets))
+	    _element = 0;
+	else if (!(_element = *_pprev)) {
+	    (*this)++;
+	    hc->_rep.first_bucket = _bucket;
+	}
+    }
+
+    inline HashContainer_const_iterator(const HashContainer<T, A> *hc, bucket_count_type b, T **pprev, T *element)
+	: _element(element), _pprev(pprev), _bucket(b), _hc(hc) {
+	click_hash_assert((!_pprev && !_element) || *_pprev == _element);
+    }
+
+    friend class HashContainer<T, A>;
+    friend class HashContainer_iterator<T, A>;
+
+};
+
+/** @class HashContainer_iterator
+  @brief The iterator type for HashContainer. */
+template <typename T, typename A>
+class HashContainer_iterator : public HashContainer_const_iterator<T, A> { public:
+
+    typedef HashContainer_const_iterator<T, A> inherited;
+
+    /** @brief Construct an uninitialized iterator. */
+    HashContainer_iterator() {
+    }
+
+    /** @brief Return true iff elements can be inserted here.
+     *
+     * Specifically, returns true iff this iterator is valid to pass to
+     * HashContainer::insert_at() or HashContainer::set().  All live()
+     * iterators can_insert(), but some !live() iterators can_insert() as
+     * well. */
+    bool can_insert() const {
+	return this->_bucket < this->_hc->bucket_count();
+    }
+
+    /** @brief Return the corresponding HashContainer. */
+    HashContainer<T, A> *hashcontainer() const {
+	return const_cast<HashContainer<T, A> *>(this->_hc);
+    }
+
+  private:
+
+    inline HashContainer_iterator(HashContainer<T, A> *hc)
+	: inherited(hc) {
+    }
+
+    inline HashContainer_iterator(HashContainer<T, A> *hc, typename inherited::bucket_count_type b, T **pprev, T *element)
+	: inherited(hc, b, pprev, element) {
+    }
+
+    friend class HashContainer<T, A>;
+
+};
+
+template <typename T, typename A>
+HashContainer<T, A>::HashContainer()
+{
+    _rep.size = 0;
+    _rep.nbuckets = initial_bucket_count;
+    _rep.buckets = (T **) CLICK_LALLOC(sizeof(T *) * _rep.nbuckets);
+    _rep.first_bucket = _rep.nbuckets;
+    _rep.bucket_divider = libdivide_u32_gen(_rep.nbuckets);
+    click_hash_assert(_rep.nbuckets == libdivide_u32_recover(&_rep.bucket_divider));
+    for (bucket_count_type b = 0; b < _rep.nbuckets; ++b)
+	_rep.buckets[b] = 0;
+}
+
+template <typename T, typename A>
+HashContainer<T, A>::HashContainer(bucket_count_type nb)
+{
+    bucket_count_type b = 1;
+    while (b < nb && b < max_bucket_count)
+	b = ((b + 1) << 1) - 1;
+    _rep.size = 0;
+    _rep.nbuckets = b;
+    _rep.buckets = (T **) CLICK_LALLOC(sizeof(T *) * _rep.nbuckets);
+    _rep.first_bucket = _rep.nbuckets;
+    _rep.bucket_divider = libdivide_u32_gen(_rep.nbuckets);
+    click_hash_assert(_rep.nbuckets == libdivide_u32_recover(&_rep.bucket_divider));
+    for (b = 0; b < _rep.nbuckets; ++b)
+	_rep.buckets[b] = 0;
+}
+
+template <typename T, typename A>
+HashContainer<T, A>::~HashContainer()
+{
+    CLICK_LFREE(_rep.buckets, sizeof(T *) * _rep.nbuckets);
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::bucket_count_type
+HashContainer<T, A>::bucket(const key_type &key) const
+{
+    bucket_count_type h = hashcode(key);
+    bucket_count_type d = libdivide_u32_do(h, &_rep.bucket_divider);
+    bucket_count_type r = h - _rep.nbuckets * d;
+    click_hash_assert(_rep.nbuckets == libdivide_u32_recover(&_rep.bucket_divider));
+    click_hash_assert(r == h % _rep.nbuckets);
+    return r;
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::const_iterator
+HashContainer<T, A>::begin() const
+{
+    return const_iterator(this);
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::iterator
+HashContainer<T, A>::begin()
+{
+    return iterator(this);
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::const_iterator
+HashContainer<T, A>::end() const
+{
+    return const_iterator(this, -1, 0, 0);
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::iterator
+HashContainer<T, A>::end()
+{
+    return iterator(this, -1, 0, 0);
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::iterator
+HashContainer<T, A>::begin(bucket_count_type b)
+{
+    click_hash_assert(b < _rep.nbuckets);
+    return iterator(this, b, &_rep.buckets[b], _rep.buckets[b]);
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::const_iterator
+HashContainer<T, A>::begin(bucket_count_type b) const
+{
+    click_hash_assert(b < _rep.nbuckets);
+    return const_iterator(this, b, &_rep.buckets[b], _rep.buckets[b]);
+}
+
+template <typename T, typename A>
+inline bool HashContainer<T, A>::contains(const key_type& key) const
+{
+    bucket_count_type b = bucket(key);
+    T **pprev;
+    for (pprev = &_rep.buckets[b]; *pprev; pprev = &_rep.hashnext(*pprev))
+	if (_rep.hashkeyeq(_rep.hashkey(*pprev), key))
+            return true;
+    return false;
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::size_type
+HashContainer<T, A>::count(const key_type& key) const
+{
+    bucket_count_type b = bucket(key);
+    size_t c = 0;
+    T **pprev;
+    for (pprev = &_rep.buckets[b]; *pprev; pprev = &_rep.hashnext(*pprev))
+	c += _rep.hashkeyeq(_rep.hashkey(*pprev), key);
+    return c;
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::iterator
+HashContainer<T, A>::find(const key_type &key)
+{
+    bucket_count_type b = bucket(key);
+    T **pprev;
+    for (pprev = &_rep.buckets[b]; *pprev; pprev = &_rep.hashnext(*pprev))
+	if (_rep.hashkeyeq(_rep.hashkey(*pprev), key))
+	    return iterator(this, b, pprev, *pprev);
+    return iterator(this, b, &_rep.buckets[b], 0);
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::const_iterator
+HashContainer<T, A>::find(const key_type &key) const
+{
+    return const_cast<HashContainer<T, A> *>(this)->find(key);
+}
+
+template <typename T, typename A>
+inline typename HashContainer<T, A>::iterator
+HashContainer<T, A>::find_prefer(const key_type &key)
+{
+    bucket_count_type b = bucket(key);
+    T **pprev;
+    for (pprev = &_rep.buckets[b]; *pprev; pprev = &_rep.hashnext(*pprev))
+	if (_rep.hashkeyeq(_rep.hashkey(*pprev), key)) {
+	    T *element = *pprev;
+	    *pprev = _rep.hashnext(element);
+	    _rep.hashnext(element) = _rep.buckets[b];
+	    _rep.buckets[b] = element;
+	    return iterator(this, b, &_rep.buckets[b], element);
+	}
+    return iterator(this, b, &_rep.buckets[b], 0);
+}
+
+template <typename T, typename A>
+inline T *HashContainer<T, A>::get(const key_type &key) const
+{
+    return find(key).get();
+}
+
+template <typename T, typename A>
+T *HashContainer<T, A>::set(iterator &it, T *element, bool balance)
+{
+    click_hash_assert(it._hc == this && it._bucket < _rep.nbuckets);
+    click_hash_assert(bucket(_rep.hashkey(element)) == it._bucket);
+    click_hash_assert(!it._element || _rep.hashkeyeq(_rep.hashkey(element), _rep.hashkey(it._element)));
+    T *old = it.get();
+    if (unlikely(old == element))
+	return old;
+    if (!element) {
+	--_rep.size;
+	if (!(*it._pprev = it._element = _rep.hashnext(old)))
+	    ++it;
+	return old;
+    }
+    if (old)
+	_rep.hashnext(element) = _rep.hashnext(old);
+    else {
+	++_rep.size;
+	if (unlikely(unbalanced()) && balance) {
+	    rehash(bucket_count() + 1);
+	    it._bucket = bucket(_rep.hashkey(element));
+	    it._pprev = &_rep.buckets[it._bucket];
+	}
+	if (!(_rep.hashnext(element) = *it._pprev))
+	    _rep.first_bucket = 0;
+    }
+    *it._pprev = it._element = element;
+    return old;
+}
+
+template <typename T, typename A>
+inline void HashContainer<T, A>::insert_at(iterator &it, T *element)
+{
+    click_hash_assert(it._hc == this && it._bucket < _rep.nbuckets);
+    click_hash_assert(bucket(_rep.hashkey(element)) == it._bucket);
+    ++_rep.size;
+    if (!(_rep.hashnext(element) = *it._pprev))
+	_rep.first_bucket = 0;
+    *it._pprev = element;
+    it._pprev = &_rep.hashnext(element);
+}
+
+template <typename T, typename A>
+inline T *HashContainer<T, A>::set(T *element)
+{
+    iterator it = find(_rep.hashkey(element));
+    return set(it, element);
+}
+
+template <typename T, typename A>
+inline T *HashContainer<T, A>::erase(iterator &it)
+{
+    click_hash_assert(it._hc == this);
+    return set(it, 0);
+}
+
+template <typename T, typename A>
+inline T *HashContainer<T, A>::erase(const key_type &key)
+{
+    iterator it = find(key);
+    return set(it, 0);
+}
+
+template <typename T, typename A>
+inline void HashContainer<T, A>::clear()
+{
+    for (bucket_count_type b = 0; b < _rep.nbuckets; ++b)
+	_rep.buckets[b] = 0;
+    _rep.size = 0;
+}
+
+template <typename T, typename A>
+inline void HashContainer<T, A>::swap(HashContainer<T, A> &o)
+{
+    HashContainer_rep<T, A> rep(_rep);
+    _rep = o._rep;
+    o._rep = rep;
+}
+
+template <typename T, typename A>
+void HashContainer<T, A>::rehash(bucket_count_type n)
+{
+    bucket_count_type new_nbuckets = 1;
+    while (new_nbuckets < n && new_nbuckets < max_bucket_count)
+	new_nbuckets = ((new_nbuckets + 1) << 1) - 1;
+    click_hash_assert(new_nbuckets > 0 && new_nbuckets <= max_bucket_count);
+    if (_rep.nbuckets == new_nbuckets)
+	return;
+
+    T **new_buckets = (T **) CLICK_LALLOC(sizeof(T *) * new_nbuckets);
+    for (bucket_count_type b = 0; b < new_nbuckets; ++b)
+	new_buckets[b] = 0;
+
+    bucket_count_type old_nbuckets = _rep.nbuckets;
+    T **old_buckets = _rep.buckets;
+    _rep.nbuckets = new_nbuckets;
+    _rep.buckets = new_buckets;
+    _rep.first_bucket = 0;
+    _rep.bucket_divider = libdivide_u32_gen(_rep.nbuckets);
+    click_hash_assert(_rep.nbuckets == libdivide_u32_recover(&_rep.bucket_divider));
+
+    for (size_t b = 0; b < old_nbuckets; b++)
+	for (T *element = old_buckets[b]; element; ) {
+	    T *next = _rep.hashnext(element);
+	    bucket_count_type new_b = bucket(_rep.hashkey(element));
+	    _rep.hashnext(element) = new_buckets[new_b];
+	    new_buckets[new_b] = element;
+	    element = next;
+	}
+
+    CLICK_LFREE(old_buckets, sizeof(T *) * old_nbuckets);
+}
+
+template <typename T, typename A>
+inline bool
+operator==(const HashContainer_const_iterator<T, A> &a, const HashContainer_const_iterator<T, A> &b)
+{
+    click_hash_assert(a.hashcontainer() == b.hashcontainer());
+    return a.get() == b.get();
+}
+
+template <typename T, typename A>
+inline bool
+operator!=(const HashContainer_const_iterator<T, A> &a, const HashContainer_const_iterator<T, A> &b)
+{
+    click_hash_assert(a.hashcontainer() == b.hashcontainer());
+    return a.get() != b.get();
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/hashmap.cc b/openflow/include/click/hashmap.cc
new file mode 100644
index 0000000..49ef5be
--- /dev/null
+++ b/openflow/include/click/hashmap.cc
@@ -0,0 +1,723 @@
+/*
+ * hashmap.{cc,hh} -- a hash table template
+ * Eddie Kohler
+ *
+ * Copyright (c) 2000 Mazu Networks, Inc.
+ * Copyright (c) 2003 International Computer Science Institute
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the conditions
+ * listed in the Click LICENSE file. These conditions include: you must
+ * preserve this copyright notice, and you cannot mention the copyright
+ * holders in advertising related to the Software without their permission.
+ * The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ * notice is a summary of the Click LICENSE file; the license in that file is
+ * legally binding.
+ */
+
+#ifndef CLICK_HASHMAP_CC
+#define CLICK_HASHMAP_CC
+#include <click/hashmap.hh>
+#include <click/bighashmap_arena.hh>
+#include <click/glue.hh>
+CLICK_DECLS
+/** @cond never */
+
+#define BIGHASHMAP_REARRANGE_ON_FIND 0
+
+template <class K, class V>
+void
+HashMap<K, V>::initialize(HashMap_ArenaFactory *factory, size_t initial_nbuckets)
+{
+  _nbuckets = initial_nbuckets;
+  _buckets = (Elt **) CLICK_LALLOC(_nbuckets * sizeof(Elt *));
+  for (size_t i = 0; i < _nbuckets; i++)
+    _buckets[i] = 0;
+  set_dynamic_resizing(true);
+
+  _n = 0;
+
+  set_arena(factory);
+}
+
+template <class K, class V>
+HashMap<K, V>::HashMap()
+  : _default_value(), _arena(0)
+{
+  initialize(0, DEFAULT_INITIAL_NBUCKETS);
+}
+
+template <class K, class V>
+HashMap<K, V>::HashMap(const V &def, HashMap_ArenaFactory *factory)
+  : _default_value(def), _arena(0)
+{
+  initialize(factory, DEFAULT_INITIAL_NBUCKETS);
+}
+
+template <class K, class V>
+void
+HashMap<K, V>::copy_from(const HashMap<K, V> &o)
+  // requires that 'this' is empty and has the same number of buckets as 'o'
+  // and the same resize policy
+{
+  for (size_t i = 0; i < _nbuckets; i++) {
+    Elt **pprev = &_buckets[i];
+    *pprev = 0;
+    for (const Elt *e = o._buckets[i]; e; e = e->next) {
+      Elt *ee = reinterpret_cast<Elt *>(_arena->alloc());
+      new(reinterpret_cast<void *>(&ee->key)) K(e->key);
+      new(reinterpret_cast<void *>(&ee->value)) V(e->value);
+      ee->next = 0;
+      *pprev = ee;
+      pprev = &ee->next;
+    }
+  }
+  _n = o._n;
+}
+
+template <class K, class V>
+HashMap<K, V>::HashMap(const HashMap<K, V> &o)
+    : _buckets((Elt **) CLICK_LALLOC(o._nbuckets * sizeof(Elt *))),
+      _nbuckets(o._nbuckets), _default_value(o._default_value),
+      _capacity(o._capacity), _arena(o._arena)
+{
+  _arena->use();
+  copy_from(o);
+}
+
+template <class K, class V>
+HashMap<K, V> &
+HashMap<K, V>::operator=(const HashMap<K, V> &o)
+{
+  if (&o != this) {
+    clear();
+    _default_value = o._default_value;
+    if (_nbuckets < o._nbuckets)
+      resize0(o._nbuckets);
+    _nbuckets = o._nbuckets;
+    _capacity = o._capacity;
+    copy_from(o);
+  }
+  return *this;
+}
+
+template <class K, class V>
+HashMap<K, V>::~HashMap()
+{
+  for (size_t i = 0; i < _nbuckets; i++)
+    for (Elt *e = _buckets[i]; e; ) {
+      Elt *next = e->next;
+      e->key.~K();
+      e->value.~V();
+      _arena->free(e);
+      e = next;
+    }
+  CLICK_LFREE(_buckets, _nbuckets * sizeof(Elt *));
+  _arena->unuse();
+}
+
+template <class K, class V>
+void
+HashMap<K, V>::set_dynamic_resizing(bool on)
+{
+  if (!on)
+    _capacity = 0x7FFFFFFF;
+  else if (_nbuckets >= MAX_NBUCKETS)
+    _capacity = 0x7FFFFFFE;
+  else
+    _capacity = DEFAULT_RESIZE_THRESHOLD * _nbuckets;
+}
+
+template <class K, class V>
+void
+HashMap<K, V>::set_arena(HashMap_ArenaFactory *factory)
+{
+  assert(empty());
+  if (_arena)
+    _arena->unuse();
+  _arena = HashMap_ArenaFactory::get_arena(sizeof(Elt), factory);
+  _arena->use();
+}
+
+template <class K, class V>
+inline size_t
+HashMap<K, V>::bucket(const K &key) const
+{
+  return ((size_t) hashcode(key)) % _nbuckets;
+}
+
+template <class K, class V>
+typename HashMap<K, V>::Pair *
+HashMap<K, V>::find_pair(const K &key) const
+{
+#if BIGHASHMAP_REARRANGE_ON_FIND
+  Elt *prev = 0;
+  size_t b = bucket(key);
+  for (Elt *e = _buckets[b]; e; prev = e, e = e->next)
+    if (e->key == key) {
+      if (prev) {
+        // move to front
+        prev->next = e->next;
+	e->next = _buckets[b];
+	_buckets[b] = e;
+      }
+      return e;
+    }
+  return 0;
+#else
+  for (Elt *e = _buckets[bucket(key)]; e; e = e->next)
+    if (e->key == key)
+      return e;
+  return 0;
+#endif
+}
+
+
+template <class K, class V>
+void
+HashMap<K, V>::resize0(size_t new_nbuckets)
+{
+    Elt **new_buckets = (Elt **) CLICK_LALLOC(new_nbuckets * sizeof(Elt *));
+    for (size_t i = 0; i < new_nbuckets; i++)
+	new_buckets[i] = 0;
+
+  size_t old_nbuckets = _nbuckets;
+  Elt **old_buckets = _buckets;
+  _nbuckets = new_nbuckets;
+  _buckets = new_buckets;
+  if (dynamic_resizing())
+    set_dynamic_resizing(true);	// reset threshold
+
+  for (size_t i = 0; i < old_nbuckets; i++)
+    for (Elt *e = old_buckets[i]; e; ) {
+      Elt *n = e->next;
+      size_t b = bucket(e->key);
+      e->next = new_buckets[b];
+      new_buckets[b] = e;
+      e = n;
+    }
+
+  CLICK_LFREE(old_buckets, old_nbuckets * sizeof(Elt *));
+}
+
+template <class K, class V>
+void
+HashMap<K, V>::resize(size_t want_nbuckets)
+{
+  size_t new_nbuckets = 1;
+  while (new_nbuckets < want_nbuckets && new_nbuckets < MAX_NBUCKETS)
+    new_nbuckets = ((new_nbuckets + 1) << 1) - 1;
+  assert(new_nbuckets > 0 && new_nbuckets <= MAX_NBUCKETS);
+  if (_nbuckets != new_nbuckets)
+    resize0(new_nbuckets);
+}
+
+template <class K, class V>
+bool
+HashMap<K, V>::insert(const K &key, const V &value)
+{
+  size_t b = bucket(key);
+  for (Elt *e = _buckets[b]; e; e = e->next)
+    if (e->key == key) {
+      e->value = value;
+      return false;
+    }
+
+  if (_n >= _capacity) {
+    resize(_nbuckets + 1);
+    b = bucket(key);
+  }
+
+  if (Elt *e = reinterpret_cast<Elt *>(_arena->alloc())) {
+    new(reinterpret_cast<void *>(&e->key)) K(key);
+    new(reinterpret_cast<void *>(&e->value)) V(value);
+    e->next = _buckets[b];
+    _buckets[b] = e;
+    _n++;
+  }
+  return true;
+}
+
+template <class K, class V>
+bool
+HashMap<K, V>::erase(const K &key)
+{
+  size_t b = bucket(key);
+  Elt *prev = 0;
+  Elt *e = _buckets[b];
+  while (e && !(e->key == key)) {
+    prev = e;
+    e = e->next;
+  }
+  if (e) {
+    if (prev)
+      prev->next = e->next;
+    else
+      _buckets[b] = e->next;
+    e->key.~K();
+    e->value.~V();
+    _arena->free(e);
+    _n--;
+    return true;
+  } else
+    return false;
+}
+
+template <class K, class V>
+typename HashMap<K, V>::Pair *
+HashMap<K, V>::find_pair_force(const K &key, const V &default_value)
+{
+  size_t b = bucket(key);
+  for (Elt *e = _buckets[b]; e; e = e->next)
+    if (e->key == key)
+      return e;
+  if (_n >= _capacity) {
+    resize(_nbuckets + 1);
+    b = bucket(key);
+  }
+  if (Elt *e = reinterpret_cast<Elt *>(_arena->alloc())) {
+    new(reinterpret_cast<void *>(&e->key)) K(key);
+    new(reinterpret_cast<void *>(&e->value)) V(default_value);
+    e->next = _buckets[b];
+    _buckets[b] = e;
+    _n++;
+    return e;
+  } else
+    return 0;
+}
+
+template <class K, class V>
+void
+HashMap<K, V>::clear()
+{
+  for (size_t i = 0; i < _nbuckets; i++) {
+    for (Elt *e = _buckets[i]; e; ) {
+      Elt *next = e->next;
+      e->key.~K();
+      e->value.~V();
+      _arena->free(e);
+      e = next;
+    }
+    _buckets[i] = 0;
+  }
+  _n = 0;
+}
+
+template <class K, class V>
+void
+HashMap<K, V>::swap(HashMap<K, V> &o)
+{
+  Elt **t_elts;
+  V t_v;
+  size_t t_size;
+  HashMap_Arena *t_arena;
+
+  t_elts = _buckets; _buckets = o._buckets; o._buckets = t_elts;
+  t_size = _nbuckets; _nbuckets = o._nbuckets; o._nbuckets = t_size;
+  t_v = _default_value; _default_value = o._default_value; o._default_value = t_v;
+
+  t_size = _n; _n = o._n; o._n = t_size;
+  t_size = _capacity; _capacity = o._capacity; o._capacity = t_size;
+
+  t_arena = _arena; _arena = o._arena; o._arena = t_arena;
+}
+
+template <class K, class V>
+_HashMap_const_iterator<K, V>::_HashMap_const_iterator(const HashMap<K, V> *hm, bool begin)
+  : _hm(hm)
+{
+  size_t nb = _hm->_nbuckets;
+  typename HashMap<K, V>::Elt **b = _hm->_buckets;
+  for (_bucket = 0; _bucket < nb && begin; _bucket++)
+    if (b[_bucket]) {
+      _elt = b[_bucket];
+      return;
+    }
+  _elt = 0;
+}
+
+template <class K, class V>
+void
+_HashMap_const_iterator<K, V>::operator++(int)
+{
+  if (_elt->next)
+    _elt = _elt->next;
+  else {
+    size_t nb = _hm->_nbuckets;
+    typename HashMap<K, V>::Elt **b = _hm->_buckets;
+    for (_bucket++; _bucket < nb; _bucket++)
+      if (b[_bucket]) {
+	_elt = b[_bucket];
+	return;
+      }
+    _elt = 0;
+  }
+}
+
+#if 0
+static size_t
+HashMap_partition_elts(void **elts, size_t left, size_t right)
+{
+  void *pivot = elts[(left + right) / 2];
+
+  // loop invariant:
+  // elts[i] < pivot for all left_init <= i < left
+  // elts[i] > pivot for all right < i <= right_init
+  while (left < right) {
+    if (elts[left] < pivot)
+      left++;
+    else if (elts[right] > pivot)
+      right--;
+    else {
+      void *x = elts[left];
+      elts[left] = elts[right];
+      elts[right] = x;
+    }
+  }
+
+  return left;
+}
+
+void
+HashMap_qsort_elts(void **elts, size_t left, size_t right)
+{
+  if (left < right) {
+    size_t split = HashMap_partition_elts(elts, left, right);
+    HashMap_qsort_elts(elts, left, split);
+    HashMap_qsort_elts(elts, split, right);
+  }
+}
+#endif
+
+
+// void * partial specialization
+
+template <class K>
+void
+HashMap<K, void *>::initialize(HashMap_ArenaFactory *factory, size_t initial_nbuckets)
+{
+  _nbuckets = initial_nbuckets;
+  _buckets = (Elt **) CLICK_LALLOC(_nbuckets * sizeof(Elt *));
+  for (size_t i = 0; i < _nbuckets; i++)
+    _buckets[i] = 0;
+  set_dynamic_resizing(true);
+
+  _n = 0;
+
+  set_arena(factory);
+}
+
+template <class K>
+HashMap<K, void *>::HashMap()
+  : _default_value(0), _arena(0)
+{
+  initialize(0, DEFAULT_INITIAL_NBUCKETS);
+}
+
+template <class K>
+HashMap<K, void *>::HashMap(void *def, HashMap_ArenaFactory *factory)
+  : _default_value(def), _arena(0)
+{
+  initialize(factory, DEFAULT_INITIAL_NBUCKETS);
+}
+
+template <class K>
+void
+HashMap<K, void *>::copy_from(const HashMap<K, void *> &o)
+{
+  for (size_t i = 0; i < _nbuckets; i++) {
+    Elt **pprev = &_buckets[i];
+    *pprev = 0;
+    for (const Elt *e = o._buckets[i]; e; e = e->next) {
+      Elt *ee = reinterpret_cast<Elt *>(_arena->alloc());
+      new(reinterpret_cast<void *>(&ee->key)) K(e->key);
+      ee->value = e->value;
+      ee->next = 0;
+      *pprev = ee;
+      pprev = &ee->next;
+    }
+  }
+  _n = o._n;
+}
+
+template <class K>
+HashMap<K, void *>::HashMap(const HashMap<K, void *> &o)
+    : _buckets((Elt **) CLICK_LALLOC(o._nbuckets * sizeof(Elt *))),
+      _nbuckets(o._nbuckets), _default_value(o._default_value),
+      _capacity(o._capacity), _arena(o._arena)
+{
+  _arena->use();
+  copy_from(o);
+}
+
+template <class K>
+HashMap<K, void *> &
+HashMap<K, void *>::operator=(const HashMap<K, void *> &o)
+{
+  if (&o != this) {
+    clear();
+    _default_value = o._default_value;
+    if (_nbuckets < o._nbuckets)
+      resize0(o._nbuckets);
+    _nbuckets = o._nbuckets;
+    _capacity = o._capacity;
+    copy_from(o);
+  }
+  return *this;
+}
+
+template <class K>
+HashMap<K, void *>::~HashMap()
+{
+  for (size_t i = 0; i < _nbuckets; i++)
+    for (Elt *e = _buckets[i]; e; ) {
+      Elt *next = e->next;
+      e->key.~K();
+      _arena->free(e);
+      e = next;
+    }
+  CLICK_LFREE(_buckets, _nbuckets * sizeof(Elt *));
+  _arena->unuse();
+}
+
+template <class K>
+void
+HashMap<K, void *>::set_dynamic_resizing(bool on)
+{
+  if (!on)
+    _capacity = 0x7FFFFFFF;
+  else if (_nbuckets >= MAX_NBUCKETS)
+    _capacity = 0x7FFFFFFE;
+  else
+    _capacity = DEFAULT_RESIZE_THRESHOLD * _nbuckets;
+}
+
+template <class K>
+void
+HashMap<K, void *>::set_arena(HashMap_ArenaFactory *factory)
+{
+  assert(empty());
+  if (_arena)
+    _arena->unuse();
+  _arena = HashMap_ArenaFactory::get_arena(sizeof(Elt), factory);
+  _arena->use();
+}
+
+template <class K>
+inline size_t
+HashMap<K, void *>::bucket(const K &key) const
+{
+  return ((size_t) hashcode(key)) % _nbuckets;
+}
+
+template <class K>
+typename HashMap<K, void *>::Pair *
+HashMap<K, void *>::find_pair(const K &key) const
+{
+#if BIGHASHMAP_REARRANGE_ON_FIND
+  Elt *prev = 0;
+  size_t b = bucket(key);
+  for (Elt *e = _buckets[b]; e; prev = e, e = e->next)
+    if (e->key == key) {
+      if (prev) {
+        // move to front
+        prev->next = e->next;
+	e->next = _buckets[b];
+	_buckets[b] = e;
+      }
+      return e;
+    }
+  return 0;
+#else
+  for (Elt *e = _buckets[bucket(key)]; e; e = e->next)
+    if (e->key == key)
+      return e;
+  return 0;
+#endif
+}
+
+
+template <class K>
+void
+HashMap<K, void *>::resize0(size_t new_nbuckets)
+{
+    Elt **new_buckets = (Elt **) CLICK_LALLOC(new_nbuckets * sizeof(Elt *));
+    for (size_t i = 0; i < new_nbuckets; i++)
+	new_buckets[i] = 0;
+
+  size_t old_nbuckets = _nbuckets;
+  Elt **old_buckets = _buckets;
+  _nbuckets = new_nbuckets;
+  _buckets = new_buckets;
+  if (dynamic_resizing())
+    set_dynamic_resizing(true);	// reset threshold
+
+  for (size_t i = 0; i < old_nbuckets; i++)
+    for (Elt *e = old_buckets[i]; e; ) {
+      Elt *n = e->next;
+      size_t b = bucket(e->key);
+      e->next = new_buckets[b];
+      new_buckets[b] = e;
+      e = n;
+    }
+
+  CLICK_LFREE(old_buckets, old_nbuckets * sizeof(Elt *));
+}
+
+template <class K>
+void
+HashMap<K, void *>::resize(size_t want_nbuckets)
+{
+  size_t new_nbuckets = 1;
+  while (new_nbuckets < want_nbuckets && new_nbuckets < MAX_NBUCKETS)
+    new_nbuckets = ((new_nbuckets + 1) << 1) - 1;
+  assert(new_nbuckets > 0 && new_nbuckets <= MAX_NBUCKETS);
+  if (_nbuckets != new_nbuckets)
+    resize0(new_nbuckets);
+}
+
+template <class K>
+bool
+HashMap<K, void *>::insert(const K &key, void *value)
+{
+  size_t b = bucket(key);
+  for (Elt *e = _buckets[b]; e; e = e->next)
+    if (e->key == key) {
+      e->value = value;
+      return false;
+    }
+
+  if (_n >= _capacity) {
+    resize(_nbuckets + 1);
+    b = bucket(key);
+  }
+
+  if (Elt *e = reinterpret_cast<Elt *>(_arena->alloc())) {
+    new(reinterpret_cast<void *>(&e->key)) K(key);
+    e->value = value;
+    e->next = _buckets[b];
+    _buckets[b] = e;
+    _n++;
+  }
+  return true;
+}
+
+template <class K>
+bool
+HashMap<K, void *>::erase(const K &key)
+{
+  size_t b = bucket(key);
+  Elt *prev = 0;
+  Elt *e = _buckets[b];
+  while (e && !(e->key == key)) {
+    prev = e;
+    e = e->next;
+  }
+  if (e) {
+    if (prev)
+      prev->next = e->next;
+    else
+      _buckets[b] = e->next;
+    e->key.~K();
+    _arena->free(e);
+    _n--;
+    return true;
+  } else
+    return false;
+}
+
+template <class K>
+typename HashMap<K, void *>::Pair *
+HashMap<K, void *>::find_pair_force(const K &key, void *default_value)
+{
+  size_t b = bucket(key);
+  for (Elt *e = _buckets[b]; e; e = e->next)
+    if (e->key == key)
+      return e;
+  if (_n >= _capacity) {
+    resize(_nbuckets + 1);
+    b = bucket(key);
+  }
+  if (Elt *e = reinterpret_cast<Elt *>(_arena->alloc())) {
+    new(reinterpret_cast<void *>(&e->key)) K(key);
+    e->value = default_value;
+    e->next = _buckets[b];
+    _buckets[b] = e;
+    _n++;
+    return e;
+  } else
+    return 0;
+}
+
+template <class K>
+void
+HashMap<K, void *>::clear()
+{
+  for (size_t i = 0; i < _nbuckets; i++) {
+    for (Elt *e = _buckets[i]; e; ) {
+      Elt *next = e->next;
+      e->key.~K();
+      _arena->free(e);
+      e = next;
+    }
+    _buckets[i] = 0;
+  }
+  _n = 0;
+}
+
+template <class K>
+void
+HashMap<K, void *>::swap(HashMap<K, void *> &o)
+{
+  Elt **t_elts;
+  void *t_v;
+  size_t t_size;
+  HashMap_Arena *t_arena;
+
+  t_elts = _buckets; _buckets = o._buckets; o._buckets = t_elts;
+  t_size = _nbuckets; _nbuckets = o._nbuckets; o._nbuckets = t_size;
+  t_v = _default_value; _default_value = o._default_value; o._default_value = t_v;
+
+  t_size = _n; _n = o._n; o._n = t_size;
+  t_size = _capacity; _capacity = o._capacity; o._capacity = t_size;
+
+  t_arena = _arena; _arena = o._arena; o._arena = t_arena;
+}
+
+
+template <class K>
+_HashMap_const_iterator<K, void *>::_HashMap_const_iterator(const HashMap<K, void *> *hm, bool begin)
+  : _hm(hm)
+{
+  size_t nb = _hm->_nbuckets;
+  typename HashMap<K, void *>::Elt **b = _hm->_buckets;
+  for (_bucket = 0; _bucket < nb && begin; _bucket++)
+    if (b[_bucket]) {
+      _elt = b[_bucket];
+      return;
+    }
+  _elt = 0;
+}
+
+template <class K>
+void
+_HashMap_const_iterator<K, void *>::operator++(int)
+{
+  if (_elt->next)
+    _elt = _elt->next;
+  else {
+    size_t nb = _hm->_nbuckets;
+    typename HashMap<K, void *>::Elt **b = _hm->_buckets;
+    for (_bucket++; _bucket < nb; _bucket++)
+      if (b[_bucket]) {
+	_elt = b[_bucket];
+	return;
+      }
+    _elt = 0;
+  }
+}
+
+/** @endcond */
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/hashmap.hh b/openflow/include/click/hashmap.hh
new file mode 100644
index 0000000..3ebef5f
--- /dev/null
+++ b/openflow/include/click/hashmap.hh
@@ -0,0 +1,585 @@
+#ifndef CLICK_HASHMAP_HH
+#define CLICK_HASHMAP_HH
+#include <click/hashcode.hh>
+CLICK_DECLS
+/** @cond never */
+class HashMap_Arena;
+class HashMap_ArenaFactory;
+
+// K AND V REQUIREMENTS:
+//
+//		K::K(const K &)
+//		k1 == k2
+// hashcode_t	hashcode(const K &)
+//			If hashcode(k1) != hashcode(k2), then k1 != k2.
+//			hashcode() can return any unsigned value.
+//
+//		V::V() -- only used for default value
+//		V::V(const V &)
+// V &		V::operator=(const V &)
+
+template <class K, class V = void> class _HashMap_const_iterator;
+template <class K, class V = void> class _HashMap_iterator;
+template <class K, class V = void> class HashMap;
+
+template <class K, class V>
+class HashMap { public:
+
+    typedef K key_type;
+    typedef V mapped_type;
+    struct Pair;
+
+    HashMap();
+    explicit HashMap(const V &, HashMap_ArenaFactory * = 0);
+    HashMap(const HashMap<K, V> &);
+    ~HashMap();
+
+  void set_arena(HashMap_ArenaFactory *);
+
+  size_t size() const			{ return _n; }
+  bool empty() const			{ return _n == 0; }
+  size_t nbuckets() const		{ return _nbuckets; }
+
+  Pair *find_pair(const K &) const;
+  inline V *findp(const K &) const;
+  inline const V &find(const K &, const V &) const;
+  inline const V &find(const K &) const;
+  inline const V &operator[](const K &) const;
+
+  Pair *find_pair_force(const K &, const V &);
+  Pair *find_pair_force(const K &k) { return find_pair_force(k, _default_value); }
+  V *findp_force(const K &k, const V &v) { if (Pair *p = find_pair_force(k, v)) return &p->value; else return 0; }
+  V &find_force(const K &k, const V &v) { return *findp_force(k, v); }
+  V *findp_force(const K &k)	{ return findp_force(k, _default_value); }
+  V &find_force(const K &k)	{ return *findp_force(k, _default_value); }
+
+  bool insert(const K &, const V &);
+  bool erase(const K &);
+  bool remove(const K &key) {
+    return erase(key);
+  }
+  void clear();
+
+  void swap(HashMap<K, V> &);
+
+  // iteration
+  typedef _HashMap_const_iterator<K, V> const_iterator;
+  typedef _HashMap_iterator<K, V> iterator;
+  inline const_iterator begin() const;
+  inline iterator begin();
+  inline const_iterator end() const;
+  inline iterator end();
+
+  // dynamic resizing
+  void resize(size_t);
+  bool dynamic_resizing() const		{ return _capacity < 0x7FFFFFFF; }
+  void set_dynamic_resizing(bool);
+
+  HashMap<K, V> &operator=(const HashMap<K, V> &);
+
+  struct Pair {
+    K key;
+    V value;
+  };
+
+  enum { MAX_NBUCKETS = 4194303,
+	 DEFAULT_INITIAL_NBUCKETS = 127,
+	 DEFAULT_RESIZE_THRESHOLD = 2 };
+
+ private:
+
+    struct Elt : public Pair {
+	Elt *next;
+#if defined(__GNUC__) && __GNUC__ < 4
+	/* Shut up compiler about Pair lacking default constructor */
+	Elt(const Pair &p)		: Pair(p) { }
+#endif
+    };
+
+  Elt **_buckets;
+  size_t _nbuckets;
+  V _default_value;
+
+  size_t _n;
+  size_t _capacity;
+
+  HashMap_Arena *_arena;
+
+  void initialize(HashMap_ArenaFactory *, size_t);
+  void copy_from(const HashMap<K, V> &);
+  void resize0(size_t);
+  size_t bucket(const K &) const;
+
+  friend class _HashMap_iterator<K, V>;
+  friend class _HashMap_const_iterator<K, V>;
+
+};
+
+template <class K, class V>
+class _HashMap_const_iterator { public:
+
+  bool live() const			{ return _elt; }
+  typedef bool (_HashMap_const_iterator::*unspecified_bool_type)() const;
+  inline operator unspecified_bool_type() const CLICK_DEPRECATED;
+  void operator++(int);
+  void operator++()			{ (*this)++; }
+
+  typedef typename HashMap<K, V>::Pair Pair;
+  const Pair *pair() const		{ return _elt; }
+
+  const K &key() const			{ return _elt->key; }
+  const V &value() const		{ return _elt->value; }
+
+ private:
+
+  const HashMap<K, V> *_hm;
+  typename HashMap<K, V>::Elt *_elt;
+  size_t _bucket;
+
+  _HashMap_const_iterator(const HashMap<K, V> *m, bool begin);
+  friend class HashMap<K, V>;
+  friend class _HashMap_iterator<K, V>;
+
+};
+
+template <class K, class V>
+class _HashMap_iterator : public _HashMap_const_iterator<K, V> { public:
+
+  typedef _HashMap_const_iterator<K, V> inherited;
+
+  typedef typename HashMap<K, V>::Pair Pair;
+  Pair *pair() const	{ return const_cast<Pair *>(inherited::pair()); }
+  V &value() const	{ return const_cast<V &>(inherited::value()); }
+
+ private:
+
+  _HashMap_iterator(HashMap<K, V> *m, bool begin) : inherited(m, begin) { }
+  friend class HashMap<K, V>;
+
+};
+
+template <class K, class V>
+inline typename HashMap<K, V>::const_iterator
+HashMap<K, V>::begin() const
+{
+  return const_iterator(this, true);
+}
+
+template <class K, class V>
+inline typename HashMap<K, V>::iterator
+HashMap<K, V>::begin()
+{
+  return iterator(this, true);
+}
+
+template <class K, class V>
+inline typename HashMap<K, V>::const_iterator
+HashMap<K, V>::end() const
+{
+  return const_iterator(this, false);
+}
+
+template <class K, class V>
+inline typename HashMap<K, V>::iterator
+HashMap<K, V>::end()
+{
+  return iterator(this, false);
+}
+
+template <class K, class V>
+inline V *
+HashMap<K, V>::findp(const K &key) const
+{
+  Pair *p = find_pair(key);
+  return (p ? &p->value : 0);
+}
+
+template <class K, class V>
+inline const V &
+HashMap<K, V>::find(const K &key, const V &default_value) const
+{
+  Pair *p = find_pair(key);
+  const V *v = (p ? &p->value : &default_value);
+  return *v;
+}
+
+template <class K, class V>
+inline const V &
+HashMap<K, V>::find(const K &key) const
+{
+  return find(key, _default_value);
+}
+
+template <class K, class V>
+inline const V &
+HashMap<K, V>::operator[](const K &key) const
+{
+  return find(key);
+}
+
+template <class K, class V>
+inline
+_HashMap_const_iterator<K, V>::operator unspecified_bool_type() const
+{
+    return live() ? &_HashMap_const_iterator::live : 0;
+}
+
+
+template <class K>
+class HashMap<K, void *> { public:
+
+    typedef K key_type;
+    typedef void *mapped_type;
+    struct Pair;
+
+  HashMap();
+  explicit HashMap(void *, HashMap_ArenaFactory * = 0);
+  HashMap(const HashMap<K, void *> &);
+  ~HashMap();
+
+  void set_arena(HashMap_ArenaFactory *);
+
+  size_t size() const			{ return _n; }
+  bool empty() const			{ return _n == 0; }
+  size_t nbuckets() const		{ return _nbuckets; }
+
+  Pair *find_pair(const K &) const;
+  inline void **findp(const K &) const;
+  inline void *find(const K &, void *) const;
+  inline void *find(const K &) const;
+  inline void *operator[](const K &) const;
+
+  Pair *find_pair_force(const K &, void *);
+  Pair *find_pair_force(const K &k) { return find_pair_force(k, _default_value); }
+  void **findp_force(const K &k, void *v) { if (Pair *p = find_pair_force(k, v)) return &p->value; else return 0; }
+  void *&find_force(const K &k, void *v) { return *findp_force(k, v); }
+  void **findp_force(const K &k) { return findp_force(k, _default_value); }
+  void *&find_force(const K &k)  { return *findp_force(k, _default_value); }
+
+  bool insert(const K &, void *);
+  bool erase(const K &);
+  bool remove(const K &key) {
+    return erase(key);
+  }
+  void clear();
+
+  void swap(HashMap<K, void *> &);
+
+  // iterators
+  typedef _HashMap_const_iterator<K, void *> const_iterator;
+  typedef _HashMap_iterator<K, void *> iterator;
+  inline const_iterator begin() const;
+  inline iterator begin();
+  inline const_iterator end() const;
+  inline iterator end();
+
+  // dynamic resizing
+  void resize(size_t);
+  bool dynamic_resizing() const		{ return _capacity < 0x7FFFFFFF; }
+  void set_dynamic_resizing(bool);
+
+  HashMap<K, void *> &operator=(const HashMap<K, void *> &);
+
+  struct Pair {
+    K key;
+    void *value;
+  };
+
+  enum { MAX_NBUCKETS = 32767,
+	 DEFAULT_INITIAL_NBUCKETS = 127,
+	 DEFAULT_RESIZE_THRESHOLD = 2 };
+
+  private:
+
+    struct Elt : public Pair {
+	Elt *next;
+#if defined(__GNUC__) && __GNUC__ < 4
+	/* Shut up compiler about Pair lacking default constructor */
+	Elt(const Pair &p)		: Pair(p) { }
+#endif
+    };
+
+  Elt **_buckets;
+  size_t _nbuckets;
+  void *_default_value;
+
+  size_t _n;
+  size_t _capacity;
+
+  HashMap_Arena *_arena;
+
+  void initialize(HashMap_ArenaFactory *, size_t);
+  void copy_from(const HashMap<K, void *> &);
+  void resize0(size_t);
+  size_t bucket(const K &) const;
+
+  friend class _HashMap_iterator<K, void *>;
+  friend class _HashMap_const_iterator<K, void *>;
+
+};
+
+template <class K>
+class _HashMap_const_iterator<K, void *> { public:
+
+  bool live() const			{ return _elt; }
+  typedef bool (_HashMap_const_iterator::*unspecified_bool_type)() const;
+  inline operator unspecified_bool_type() const CLICK_DEPRECATED;
+  void operator++(int);
+  void operator++()			{ (*this)++; }
+
+  typedef typename HashMap<K, void *>::Pair Pair;
+  const Pair *pair() const		{ return _elt; }
+
+  const K &key() const			{ return _elt->key; }
+  void *value() const			{ return _elt->value; }
+
+ private:
+
+  const HashMap<K, void *> *_hm;
+  typename HashMap<K, void *>::Elt *_elt;
+  size_t _bucket;
+
+  _HashMap_const_iterator(const HashMap<K, void *> *, bool begin);
+  template <class, class> friend class _HashMap_const_iterator;
+  template <class, class> friend class _HashMap_iterator;
+  template <class, class> friend class HashMap;
+
+};
+
+template <class K>
+class _HashMap_iterator<K, void *> : public _HashMap_const_iterator<K, void *> { public:
+
+  typedef _HashMap_const_iterator<K, void *> inherited;
+
+  typedef typename HashMap<K, void *>::Pair Pair;
+  Pair *pair() const	{ return const_cast<Pair *>(inherited::pair()); }
+  void *&value() const	{ return this->_elt->value; }
+
+ private:
+
+  _HashMap_iterator(HashMap<K, void *> *m, bool begin) : inherited(m, begin) { }
+  template <class, class> friend class HashMap;
+
+};
+
+template <class K>
+inline typename HashMap<K, void *>::const_iterator
+HashMap<K, void *>::begin() const
+{
+  return const_iterator(this, true);
+}
+
+template <class K>
+inline typename HashMap<K, void *>::iterator
+HashMap<K, void *>::begin()
+{
+  return iterator(this, true);
+}
+
+template <class K>
+inline typename HashMap<K, void *>::const_iterator
+HashMap<K, void *>::end() const
+{
+  return const_iterator(this, false);
+}
+
+template <class K>
+inline typename HashMap<K, void *>::iterator
+HashMap<K, void *>::end()
+{
+  return iterator(this, false);
+}
+
+template <class K>
+inline void **
+HashMap<K, void *>::findp(const K &key) const
+{
+  Pair *p = find_pair(key);
+  return (p ? &p->value : 0);
+}
+
+template <class K>
+inline void *
+HashMap<K, void *>::find(const K &key, void *default_value) const
+{
+  Pair *p = find_pair(key);
+  return (p ? p->value : default_value);
+}
+
+template <class K>
+inline void *
+HashMap<K, void *>::find(const K &key) const
+{
+  return find(key, _default_value);
+}
+
+template <class K>
+inline void *
+HashMap<K, void *>::operator[](const K &key) const
+{
+  return find(key);
+}
+
+template <class K>
+inline
+_HashMap_const_iterator<K, void *>::operator unspecified_bool_type() const
+{
+    return live() ? &_HashMap_const_iterator::live : 0;
+}
+
+
+template <class K, class T>
+class HashMap<K, T *> : public HashMap<K, void *> { public:
+
+    typedef K key_type;
+    typedef T *mapped_type;
+    typedef HashMap<K, void *> inherited;
+    struct Pair;
+
+  HashMap()				: inherited() { }
+  explicit HashMap(T *def, HashMap_ArenaFactory *factory = 0)
+					: inherited(def, factory) { }
+  HashMap(const HashMap<K, T *> &o) : inherited(o) { }
+  ~HashMap()				{ }
+
+  void set_arena(HashMap_ArenaFactory *af) { inherited::set_arena(af); }
+
+  // size_t size() const		inherited
+  // bool empty() const			inherited
+  // size_t nbuckets() const		inherited
+
+  Pair *find_pair(const K &k) const { return reinterpret_cast<Pair *>(inherited::find_pair(k)); }
+  T **findp(const K &k) const { return reinterpret_cast<T **>(inherited::findp(k)); }
+  T *find(const K &k, T *v) const { return reinterpret_cast<T *>(inherited::find(k, v)); }
+  T *find(const K &k) const { return reinterpret_cast<T *>(inherited::find(k)); }
+  T *operator[](const K &k) const { return reinterpret_cast<T *>(inherited::operator[](k)); }
+
+  Pair *find_pair_force(const K &k, T *v) { return reinterpret_cast<Pair *>(inherited::find_pair_force(k, v)); }
+  Pair *find_pair_force(const K &k) { return reinterpret_cast<Pair *>(inherited::find_pair_force(k)); }
+  T **findp_force(const K &k, T *v) { return reinterpret_cast<T **>(inherited::findp_force(k, v)); }
+  T *&find_force(const K &k, T *v) { return *reinterpret_cast<T **>(inherited::findp_force(k, v)); }
+  T **findp_force(const K &k) { return reinterpret_cast<T **>(inherited::findp_force(k)); }
+  T *&find_force(const K &k) { return *reinterpret_cast<T **>(inherited::findp_force(k)); }
+
+  bool insert(const K &k, T *v)		{ return inherited::insert(k, v); }
+  // bool erase(const K &)		inherited
+  // bool remove(const K &)		inherited
+  // void clear()			inherited
+
+  void swap(HashMap<K, T *> &o)	{ inherited::swap(o); }
+
+  // iteration
+  typedef _HashMap_const_iterator<K, T *> const_iterator;
+  typedef _HashMap_iterator<K, T *> iterator;
+  inline const_iterator begin() const;
+  inline iterator begin();
+  inline const_iterator end() const;
+  inline iterator end();
+
+  // dynamic resizing methods		inherited
+
+  HashMap<K, T *> &operator=(const HashMap<K, T *> &o) { return static_cast<HashMap<K, T *> &>(inherited::operator=(o)); }
+
+  struct Pair {
+    K key;
+    T *value;
+  };
+
+};
+
+template <class K, class T>
+class _HashMap_const_iterator<K, T *> { public:
+
+    typedef _HashMap_const_iterator<K, void *> inherited;
+
+    bool live() const		{ return _i.live(); }
+    typedef typename inherited::unspecified_bool_type unspecified_bool_type;
+    inline operator unspecified_bool_type() const CLICK_DEPRECATED;
+    void operator++(int)	{ _i.operator++(0); }
+    void operator++()		{ _i.operator++(); }
+
+    typedef typename HashMap<K, T *>::Pair Pair;
+    const Pair *pair() const { return reinterpret_cast<const Pair *>(_i.pair()); }
+
+    const K &key() const	{ return _i.key(); }
+    T *value() const		{ return reinterpret_cast<T *>(_i.value()); }
+
+ private:
+
+    inherited _i;
+
+    _HashMap_const_iterator(const HashMap<K, T *> *t, bool begin) : _i(t, begin) { }
+    friend class _HashMap_iterator<K, T *>;
+    template <class, class> friend class HashMap;
+
+};
+
+template <class K, class T>
+class _HashMap_iterator<K, T *> : public _HashMap_const_iterator<K, T *> { public:
+
+  typedef _HashMap_const_iterator<K, T *> inherited;
+
+  typedef typename HashMap<K, T *>::Pair Pair;
+  Pair *pair() const	{ return const_cast<Pair *>(inherited::pair()); }
+  T *&value() const	{ return pair()->value; }
+
+ private:
+
+  _HashMap_iterator(HashMap<K, T *> *t, bool begin) : inherited(t, begin) { }
+  template <class, class> friend class HashMap;
+
+};
+
+template <class K, class T>
+inline typename HashMap<K, T *>::const_iterator
+HashMap<K, T *>::begin() const
+{
+  return const_iterator(this, true);
+}
+
+template <class K, class T>
+inline typename HashMap<K, T *>::iterator
+HashMap<K, T *>::begin()
+{
+  return iterator(this, true);
+}
+
+template <class K, class T>
+inline typename HashMap<K, T *>::const_iterator
+HashMap<K, T *>::end() const
+{
+  return const_iterator(this, false);
+}
+
+template <class K, class T>
+inline typename HashMap<K, T *>::iterator
+HashMap<K, T *>::end()
+{
+  return iterator(this, false);
+}
+
+template <class K, class T>
+inline
+_HashMap_const_iterator<K, T *>::operator unspecified_bool_type() const
+{
+    return inherited::live() ? &inherited::live : 0;
+}
+
+template <class K, class V>
+inline bool
+operator==(const _HashMap_const_iterator<K, V> &a, const _HashMap_const_iterator<K, V> &b)
+{
+  return a.pair() == b.pair();
+}
+
+template <class K, class V>
+inline bool
+operator!=(const _HashMap_const_iterator<K, V> &a, const _HashMap_const_iterator<K, V> &b)
+{
+  return a.pair() != b.pair();
+}
+
+/** @endcond */
+CLICK_ENDDECLS
+#include <click/hashmap.cc>
+#endif
diff --git a/openflow/include/click/hashtable.hh b/openflow/include/click/hashtable.hh
new file mode 100644
index 0000000..e482d42
--- /dev/null
+++ b/openflow/include/click/hashtable.hh
@@ -0,0 +1,1120 @@
+#ifndef CLICK_HASHTABLE_HH
+#define CLICK_HASHTABLE_HH
+/*
+ * hashtable.hh -- HashTable template
+ * Eddie Kohler
+ *
+ * Copyright (c) 2008 Meraki, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software")
+ * to deal in the Software without restriction, subject to the conditions
+ * listed in the Click LICENSE file. These conditions include: you must
+ * preserve this copyright notice, and you cannot mention the copyright
+ * holders in advertising related to the Software without their permission.
+ * The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ * notice is a summary of the Click LICENSE file; the license in that file is
+ * legally binding.
+ */
+#include <click/pair.hh>
+#include <click/hashcontainer.hh>
+#include <click/hashallocator.hh>
+CLICK_DECLS
+
+/** @file <click/hashtable.hh>
+ * @brief Click's hash table container template.
+ */
+
+template <typename K, typename V = void> class HashTable;
+template <typename T> class HashTable_iterator;
+template <typename T> class HashTable_const_iterator;
+
+/** @class HashTable
+  @brief Hash table template.
+
+  The HashTable template implements a hash table or associative array suitable
+  for use in the kernel or at user level.  Its interface is similar to C++'s
+  std::map and std::unordered_map, although those types have more methods.
+
+  Used with two template parameters, as HashTable<K, V>, the table maps keys K
+  to values V.  Used with one template parameter, as HashTable<T>, HashTable
+  is a hash set.  The type T must declare types named key_type and
+  key_const_reference.  It also must declare a hashkey() member function
+  returning type key_const_reference.  An object's hashkey() defines its key.
+
+  HashTable is a chained hash table.  (Open coding is not
+  appropriate in the kernel, where large contiguous memory allocations are
+  essentially impossible.)  When run through Google's sparse_hash_table tests
+  (April 2008, sparsehash-1.1), HashTable appears to perform slightly better
+  than g++'s hash_map, better than sparse_hash_map, and worse than
+  dense_hash_map; it takes less memory than hash_map and dense_hash_map.
+
+  HashTable is faster than Click's prior HashMap class and has fewer potential
+  race conditions in multithreaded use.  HashMap remains for backward
+  compatibility but should not be used in new code.
+
+  @warning HashMap users should beware of HashTable's operator[].  HashMap's
+  operator[] returned a non-assignable const reference; it would never add an
+  element to the hash table.  In contrast, the HashTable operator[]
+  <em>may</em> add an element to the table.  (If added, the element will
+  initially have the table's default value.)  For instance, consider:
+  @code
+  HashMap<String, int> h(0);
+  h.insert("A", 1);
+  if (!h["B"])      // Nota bene
+      printf("B wasn't in table, and still isn't\n");
+  for (HashMap<String, int>::iterator it = h.begin(); it; ++it)
+      printf("%s -> %d\n", it.key().c_str(), it.value());
+                    // Prints  B wasn't in table, and still isn't
+                    //         A -> 1
+  @endcode
+
+  @warning Here the h["B"] reference does not add an element to
+  the hash table, as you can see from the iteration.  Similar HashTable code
+  has a different result:
+  @code
+  HashTable<String, int> h(0);
+  h["A"] = 1;
+  if (!h["B"])      // Nota bene
+      printf("B wasn't in table, but it is now\n");
+  for (HashMap<String, int>::iterator it = h.begin(); it; ++it)
+      printf("%s -> %d\n", it.key().c_str(), it.value());
+                    // Prints  B wasn't in table, but it is now
+                    //         A -> 1
+                    //         B -> 0
+  @endcode
+
+  @warning If you don't want operator[] to add an element, either access
+  operator[] through a const hash table, or use get():
+  @code
+  HashTable<String, int> h(0);
+  if (!h.get("B"))
+      printf("B wasn't in table, and still isn't\n");
+  const HashTable<String, int> &const_h = h;
+  if (!const_h["B"])
+      printf("B wasn't in table, and still isn't\n");
+  @endcode
+*/
+template <typename T>
+class HashTable<T> {
+
+    struct elt {
+	T v;
+	elt *_hashnext;
+	elt(const T &v_)
+	    : v(v_) {
+	}
+	typedef typename T::key_type key_type;
+	typedef typename T::key_const_reference key_const_reference;
+	key_const_reference hashkey() const {
+	    return v.hashkey();
+	}
+    };
+
+    typedef HashContainer<elt> rep_type;
+
+  public:
+
+    /** @brief Key type. */
+    typedef typename T::key_type key_type;
+
+    /** @brief Const reference to key type. */
+    typedef typename T::key_const_reference key_const_reference;
+
+    /** @brief Value type.  value_type::key_type must exist. */
+    typedef T value_type;
+
+    /** @brief Type of sizes (size()). */
+    typedef typename rep_type::size_type size_type;
+
+    /** @brief Type of bucket sizes (bucket_count()). */
+    typedef typename rep_type::bucket_count_type bucket_count_type;
+
+
+    /** @brief Construct an empty hash table. */
+    HashTable()
+	: _rep() {
+    }
+
+    /** @brief Construct a hash table with at least @a n buckets.
+     *
+     * In kernel modules HashTable has a maximum bucket count, so
+     * HashTable(n).bucket_count() might be less than @a n. */
+    explicit HashTable(bucket_count_type n)
+	: _rep(n) {
+    }
+
+    /** @brief Construct a hash table as a copy of @a x. */
+    HashTable(const HashTable<T> &x)
+	: _rep(x._rep.bucket_count()) {
+	clone_elements(x);
+    }
+
+#if HAVE_CXX_RVALUE_REFERENCES
+    /** @overload */
+    HashTable(HashTable<T> &&x)
+	: _rep() {
+	x.swap(*this);
+    }
+#endif
+
+    /** @brief Destroy the hash table, freeing its memory. */
+    ~HashTable();
+
+
+    /** @brief Return the number of elements. */
+    inline size_type size() const {
+	return _rep.size();
+    }
+
+    /** @brief Test if size() == 0. */
+    inline bool empty() const {
+	return _rep.empty();
+    }
+
+    /** @brief Return the number of buckets. */
+    inline bucket_count_type bucket_count() const {
+	return _rep.bucket_count();
+    }
+
+    /** @brief Return the number of elements in hash bucket @a n.
+     * @param n bucket number, >= 0 and < bucket_count() */
+    inline size_type bucket_size(bucket_count_type n) const {
+	return _rep.bucket_size(n);
+    }
+
+
+    typedef HashTable_const_iterator<T> const_iterator;
+    typedef HashTable_iterator<T> iterator;
+
+    /** @brief Return an iterator for the first element in the table.
+     *
+     * HashTable iterators return elements in random order. */
+    inline iterator begin();
+    /** @overload */
+    inline const_iterator begin() const;
+
+    /** @brief Return an iterator for the end of the table.
+     * @invariant end().live() == false */
+    inline iterator end();
+    /** @overload */
+    inline const_iterator end() const;
+
+
+    /** @brief Return 1 if an element with key @a key exists, 0 otherwise. */
+    inline size_type count(key_const_reference key) const;
+
+    /** @brief Return an iterator for the element with key @a key, if any.
+     *
+     * Returns end() if no such element exists. */
+    inline iterator find(key_const_reference key);
+    /** @overload */
+    inline const_iterator find(key_const_reference key) const;
+
+    /** @brief Return an iterator for the element with key @a key, if any.
+     *
+     * Like find(), but additionally moves the found element to the head of
+     * its bucket, possibly speeding up future lookups.
+     *
+     * @note find_prefer() rearranges the ordering of a bucket, and therefore
+     * invalidates outstanding iterators. */
+    inline iterator find_prefer(key_const_reference key);
+
+    /** @brief Ensure an element with key @a key and return its iterator.
+     *
+     * If an element with @a key already exists in the table, then, like
+     * find(@a key), returns an iterator pointing at at element.  Otherwise,
+     * find_insert adds a new value T(@a key) to the table and returns its
+     * iterator.
+     *
+     * @note find_insert() may rebalance the hash table, and thus invalidates
+     * outstanding iterators.
+     *
+     * @sa operator[] */
+    inline iterator find_insert(key_const_reference key);
+
+    /** @brief Ensure an element with key @a key and return its reference.
+     *
+     * If an element with @a key already exists in the table, then returns a
+     * reference to that element.  Otherwise, adds a new value T(@a key) to
+     * the table and returns a reference to the new element.
+     *
+     * @note operator[] may rebalance the hash table, and thus invalidates
+     * outstanding iterators.
+     *
+     * @sa find_insert(key_const_reference) */
+    inline value_type &operator[](key_const_reference key);
+
+    /** @brief Ensure an element with key @a value.hashkey() and return its iterator.
+     *
+     * If an element with @a value.hashkey() already exists in the table,
+     * then, like find(), returns an iterator pointing at at element.
+     * Otherwise, find_insert adds a copy of @a value to the table and returns
+     * its iterator.
+     *
+     * @note find_insert() may rebalance the hash table, and thus invalidates
+     * outstanding iterators. */
+    inline iterator find_insert(const value_type &value);
+
+    /** @brief Add @a value to the table, replacing any element with that key.
+     *
+     * Inserts @a value into the table.  If an element with @a value.hashkey()
+     * already exists in the table, then it is replaced, and the function
+     * returns false.  Otherwise, a copy of @a value is added, and the
+     * function returns true.
+     *
+     * @note set() may rebalance the hash table, and thus invalidates
+     * outstanding iterators. */
+    bool set(const value_type &value);
+
+    /** @brief Remove the element indicated by @a it.
+     * @return An iterator pointing at the next element remaining, or end()
+     * if no such element exists. */
+    iterator erase(const iterator &it);
+
+    /** @brief Remove any element with @a key.
+     *
+     * Returns the number of elements removed, which is always 0 or 1. */
+    size_type erase(const key_type &key);
+
+    /** @brief Remove all elements.
+     * @post size() == 0 */
+    void clear();
+
+
+    /** @brief Swap the contents of this hash table and @a x. */
+    void swap(HashTable<T> &x);
+
+
+    /** @brief Rehash the table, ensuring it contains at least @a n buckets.
+     *
+     * If @a n < bucket_count(), this function may make the hash table
+     * slower. */
+    void rehash(bucket_count_type n) {
+	_rep.rehash(n);
+    }
+
+
+    /** @brief Replace this hash table's contents with a copy of @a x. */
+    HashTable<T> &operator=(const HashTable<T> &x);
+
+#if HAVE_CXX_RVALUE_REFERENCES
+    /** @overload */
+    inline HashTable<T> &operator=(HashTable<T> &&x) {
+	x.swap(*this);
+	return *this;
+    }
+#endif
+
+  private:
+
+    rep_type _rep;
+    SizedHashAllocator<sizeof(elt)> _alloc;
+
+    void clone_elements(const HashTable<T> &);
+    void copy_elements(const HashTable<T> &);
+
+    friend class HashTable_iterator<T>;
+    friend class HashTable_const_iterator<T>;
+    template <typename K, typename V> friend class HashTable;
+
+};
+
+/** @class HashTable_const_iterator
+ * @brief The const_iterator type for HashTable. */
+template <typename T>
+class HashTable_const_iterator { public:
+
+    /** @brief Construct an uninitialized iterator. */
+    HashTable_const_iterator() {
+    }
+
+    /** @brief Return a pointer to the element, null if *this == end(). */
+    const T *get() const {
+	if (_rep)
+	    return &_rep.get()->v;
+	else
+	    return 0;
+    }
+
+    /** @brief Return a pointer to the element.
+     * @pre *this != end() */
+    const T *operator->() const {
+	return &_rep.get()->v;
+    }
+
+    /** @brief Return a reference to the element.
+     * @pre *this != end() */
+    const T &operator*() const {
+	return _rep.get()->v;
+    }
+
+    /** @brief Return this element's key.
+     * @pre *this != end() */
+    typename HashTable<T>::key_const_reference key() const {
+	return _rep.get()->hashkey();
+    }
+
+    /** @brief Return true iff *this != end(). */
+    bool live() const {
+	return (bool) _rep;
+    }
+
+    typedef bool (HashTable_const_iterator::*unspecified_bool_type)() const;
+    /** @brief Return true iff *this != end(). */
+    inline operator unspecified_bool_type() const {
+	return _rep ? &HashTable_const_iterator::live : 0;
+    }
+
+    /** @brief Advance this iterator to the next element. */
+    void operator++(int) {
+	_rep++;
+    }
+
+    /** @brief Advance this iterator to the next element. */
+    void operator++() {
+	++_rep;
+    }
+
+  private:
+
+    typename HashTable<T>::rep_type::const_iterator _rep;
+
+    inline HashTable_const_iterator(const typename HashTable<T>::rep_type::const_iterator &i)
+	: _rep(i) {
+    }
+
+    friend class HashTable<T>;
+    friend class HashTable_iterator<T>;
+
+};
+
+/** @class HashTable_iterator
+  @brief The iterator type for HashTable.
+
+  These iterators apply to HashTable classes that store either a unified
+  key-value pair (HashTable<T>), or to HashTable classes that map keys to
+  explicit values (HashTable<K, V>).
+
+  Iterators for HashTable<K, V> objects have additional methods.  Given
+  HashTable<K, V>::iterator it:
+
+  <ul>
+  <li>*it has type Pair<const K, V>.</li>
+  <li>it.key() returns the associated key, and is equivalent to it->first.</li>
+  <li>it.value() returns the associated value, and is equivalent to
+    it->second.</li>
+  <li>it.value() is a mutable reference for iterator objects and a const
+    reference for const_iterator objects.</li>
+  </ul>
+*/
+template <typename T>
+class HashTable_iterator : public HashTable_const_iterator<T> { public:
+
+    typedef HashTable_const_iterator<T> inherited;
+
+    /** @brief Construct an uninitialized iterator. */
+    HashTable_iterator() {
+    }
+
+    /** @brief Return a pointer to the element, null if *this == end(). */
+    T *get() const {
+	return const_cast<T *>(inherited::get());
+    }
+
+    /** @brief Return a pointer to the element.
+     * @pre *this != end() */
+    inline T *operator->() const {
+	return const_cast<T *>(inherited::operator->());
+    }
+
+    /** @brief Return a reference to the element.
+     * @pre *this != end() */
+    inline T &operator*() const {
+	return const_cast<T &>(inherited::operator*());
+    }
+
+  private:
+
+    inline HashTable_iterator(const typename HashTable<T>::rep_type::const_iterator &i)
+	: inherited(i) {
+    }
+
+    friend class HashTable<T>;
+
+};
+
+/** @class HashTable_const_iterator
+ * @brief The const_iterator type for HashTable. */
+template <typename K, typename V>
+class HashTable_const_iterator<Pair<K, V> > { public:
+
+    /** @brief Construct an uninitialized iterator. */
+    HashTable_const_iterator() {
+    }
+
+    /** @brief Return a pointer to the element, null if *this == end(). */
+    const Pair<K, V> *get() const {
+	if (_rep)
+	    return &_rep.get()->v;
+	else
+	    return 0;
+    }
+
+    /** @brief Return a pointer to the element.
+     * @pre *this != end() */
+    const Pair<K, V> *operator->() const {
+	return &_rep.get()->v;
+    }
+
+    /** @brief Return a reference to the element.
+     * @pre *this != end() */
+    const Pair<K, V> &operator*() const {
+	return _rep.get()->v;
+    }
+
+    /** @brief Return a reference to the element's key.
+     * @pre *this != end()
+     * @return operator*().first */
+    const K &key() const {
+	return operator*().first;
+    }
+
+    /** @brief Return a reference to the element's value.
+     * @pre *this != end()
+     * @return operator*().second */
+    const V &value() const {
+	return operator*().second;
+    }
+
+    /** @brief Return true iff *this != end(). */
+    bool live() const {
+	return (bool) _rep;
+    }
+
+    typedef bool (HashTable_const_iterator::*unspecified_bool_type)() const;
+    /** @brief Return true iff *this != end(). */
+    inline operator unspecified_bool_type() const {
+	return _rep ? &HashTable_const_iterator::live : 0;
+    }
+
+    /** @brief Advance this iterator to the next element. */
+    void operator++(int) {
+	_rep++;
+    }
+
+    /** @brief Advance this iterator to the next element. */
+    void operator++() {
+	++_rep;
+    }
+
+  private:
+
+    typename HashTable<Pair<K, V> >::rep_type::const_iterator _rep;
+
+    inline HashTable_const_iterator(const typename HashTable<Pair<K, V> >::rep_type::const_iterator &i)
+	: _rep(i) {
+    }
+
+    friend class HashTable<Pair<K, V> >;
+    friend class HashTable_iterator<Pair<K, V> >;
+
+};
+
+/** @class HashTable_iterator
+ * @brief The iterator type for HashTable. */
+template <typename K, typename V>
+class HashTable_iterator<Pair<K, V> > : public HashTable_const_iterator<Pair<K, V> > { public:
+
+    typedef HashTable_const_iterator<Pair<K, V> > inherited;
+
+    /** @brief Construct an uninitialized iterator. */
+    HashTable_iterator() {
+    }
+
+    /** @brief Return a pointer to the element, null if *this == end(). */
+    Pair<K, V> *get() const {
+	return const_cast<Pair<K, V> *>(inherited::get());
+    }
+
+    /** @brief Return a pointer to the element, null if *this == end(). */
+    inline Pair<K, V> *operator->() const {
+	return const_cast<Pair<K, V> *>(inherited::operator->());
+    }
+
+    /** @brief Return a reference to the element.
+     * @pre *this != end() */
+    inline Pair<K, V> &operator*() const {
+	return const_cast<Pair<K, V> &>(inherited::operator*());
+    }
+
+    /** @brief Return a mutable reference to the element's value.
+     * @pre *this != end()
+     * @return operator*().second */
+    V &value() const {
+	return operator*().second;
+    }
+
+  private:
+
+    inline HashTable_iterator(const typename HashTable<Pair<K, V> >::rep_type::const_iterator &i)
+	: inherited(i) {
+    }
+
+    friend class HashTable<Pair<K, V> >;
+
+};
+
+
+template <typename K, typename V>
+class HashTable {
+
+    typedef HashTable<Pair<const K, V> > rep_type;
+
+  public:
+
+    /** @brief Key type. */
+    typedef K key_type;
+
+    /** @brief Const reference to key type. */
+    typedef const K &key_const_reference;
+
+    /** @brief Value type. */
+    typedef V mapped_type;
+
+    /** @brief Pair of key type and value type. */
+    typedef Pair<const K, V> value_type;
+
+    /** @brief Type of sizes. */
+    typedef typename rep_type::size_type size_type;
+
+    /** @brief Type of bucket sizes. */
+    typedef typename rep_type::bucket_count_type bucket_count_type;
+
+
+    /** @brief Construct an empty hash table with normal default value. */
+    HashTable()
+	: _rep(), _default_value() {
+    }
+
+    /** @brief Construct an empty hash table with default value @a d. */
+    explicit HashTable(const mapped_type &d)
+	: _rep(), _default_value(d) {
+    }
+
+    /** @brief Construct an empty hash table with at least @a n buckets.
+     * @param d default value
+     * @param n minimum number of buckets */
+    HashTable(const mapped_type &d, bucket_count_type n)
+	: _rep(n), _default_value(d) {
+    }
+
+    /** @brief Construct a hash table as a copy of @a x. */
+    HashTable(const HashTable<K, V> &x)
+	: _rep(x._rep), _default_value(x._default_value) {
+    }
+
+#if HAVE_CXX_RVALUE_REFERENCES
+    /** @overload */
+    HashTable(HashTable<K, V> &&x)
+	: _rep(), _default_value() {
+	x.swap(*this);
+    }
+#endif
+
+    /** @brief Destroy this hash table, freeing its memory. */
+    ~HashTable() {
+    }
+
+
+    /** @brief Return the number of elements in the hash table. */
+    inline size_type size() const {
+	return _rep.size();
+    }
+
+    /** @brief Return true iff size() == 0. */
+    inline bool empty() const {
+	return _rep.empty();
+    }
+
+    /** @brief Return the number of buckets in the hash table. */
+    inline bucket_count_type bucket_count() const {
+	return _rep.bucket_count();
+    }
+
+    /** @brief Return the number of elements in bucket @a n.
+     * @param n bucket number, >= 0 and < bucket_count() */
+    inline size_type bucket_size(bucket_count_type n) const {
+	return _rep.bucket_size(n);
+    }
+
+    /** @brief Return the hash table's default value.
+     *
+     * The default value is returned by operator[]() when a key does not
+     * exist. */
+    inline const mapped_type &default_value() const {
+	return _default_value;
+    }
+
+
+    typedef HashTable_const_iterator<value_type> const_iterator;
+    typedef HashTable_iterator<value_type> iterator;
+
+    /** @brief Return an iterator for the first element in the table.
+     *
+     * @note HashTable iterators return elements in undefined order. */
+    inline iterator begin() {
+	return _rep.begin();
+    }
+    /** @overload */
+    inline const_iterator begin() const {
+	return _rep.begin();
+    }
+
+    /** @brief Return an iterator for the end of the table.
+     * @invariant end().live() == false */
+    inline iterator end() {
+	return _rep.end();
+    }
+    /** @overload */
+    inline const_iterator end() const {
+	return _rep.end();
+    }
+
+
+    /** @brief Return 1 if an element with key @a key exists, 0 otherwise. */
+    inline size_type count(key_const_reference key) const {
+        return _rep.count(key);
+    }
+
+    /** @brief Return an iterator for the element with key @a key, if any.
+     *
+     * Returns end() if no such element exists. */
+    inline const_iterator find(key_const_reference key) const {
+	return _rep.find(key);
+    }
+    /** @overload */
+    inline iterator find(key_const_reference key) {
+	return _rep.find(key);
+    }
+
+    /** @brief Return an iterator for the element with key @a key, if any.
+     *
+     * Like find(), but additionally moves the found element to the head of
+     * its bucket, possibly speeding up future lookups. */
+    inline iterator find_prefer(key_const_reference key) {
+	return _rep.find_prefer(key);
+    }
+
+
+    /** @brief Return the value for @a key.
+     *
+     * If no element for @a key currently exists (find(@a key) == end()),
+     * returns default_value(). */
+    const mapped_type &get(key_const_reference key) const {
+	if (const_iterator i = find(key))
+	    return i.value();
+	else
+	    return _default_value;
+    }
+
+    /** @brief Return a pointer to the value for @a key.
+     *
+     * If no element for @a key currently exists (find(@a key) == end()),
+     * returns null. */
+    mapped_type *get_pointer(key_const_reference key) {
+	if (iterator i = find(key))
+	    return &i.value();
+	else
+	    return 0;
+    }
+    /** @overload */
+    const mapped_type *get_pointer(key_const_reference key) const {
+	if (const_iterator i = find(key))
+	    return &i.value();
+	else
+	    return 0;
+    }
+
+    /** @brief Return the value for @a key.
+     *
+     * If no element for @a key currently exists (find(@a key) == end()),
+     * returns default_value().
+     *
+     * @warning The overloaded operator[] on non-const hash tables may add an
+     * element to the table.  If you don't want to add an element, either
+     * access operator[] through a const hash table, or use get().  */
+    const mapped_type &operator[](key_const_reference key) const {
+	if (const_iterator i = find(key))
+	    return i.value();
+	else
+	    return _default_value;
+    }
+
+    /** @brief Return a reference to the value for @a key.
+     *
+     * The caller can assign the reference to change the value.  If no element
+     * for @a key currently exists (find(@a key) == end()), adds a new element
+     * with default_value() and returns a reference to that value.
+     *
+     * @note Inserting an element into a HashTable invalidates all existing
+     * iterators. */
+#if CLICK_HASHMAP_UPGRADE_WARNINGS
+    inline mapped_type &operator[](key_const_reference key) CLICK_DEPRECATED;
+#else
+    inline mapped_type &operator[](key_const_reference key);
+#endif
+
+
+    /** @brief Ensure an element with key @a key and return its iterator.
+     *
+     * If an element with @a key already exists in the table, then find(@a
+     * key) and find_insert(@a key) are equivalent.  Otherwise, find_insert
+     * adds a new element with key @a key and value default_value() to the
+     * table and returns its iterator.
+     *
+     * @note Inserting an element into a HashTable invalidates all existing
+     * iterators. */
+    inline iterator find_insert(key_const_reference key) {
+	return _rep.find_insert(value_type(key, _default_value));
+    }
+
+    /** @brief Ensure an element for key @a key and return its iterator.
+     *
+     * If an element with @a key already exists in the table, then find(@a
+     * key) and find_insert(@a value) are equivalent.  Otherwise,
+     * find_insert(@a key, @a value) adds a new element with key @a key and
+     * value @a value to the table and returns its iterator.
+     *
+     * @note Inserting an element into a HashTable invalidates all existing
+     * iterators. */
+    inline iterator find_insert(key_const_reference key,
+                                const mapped_type &value) {
+	return _rep.find_insert(value_type(key, value));
+    }
+
+
+    /** @brief Set the mapping for @a key to @a value.
+     *
+     * If an element for @a key already exists in the table, then its value is
+     * assigned to @a value and the function returns false.  Otherwise, a new
+     * element mapping @a key to @a value is added and the function returns
+     * true.
+     *
+     * The behavior is basically the same as "(*this)[@a key] = @a value".
+     * (The difference is that if (*this)[@a key] is not already in the hash
+     * table, the new @a value is constructed rather than assigned.)
+     *
+     * @note Inserting an element into a HashTable invalidates all existing
+     * iterators. */
+    bool set(key_const_reference key, const mapped_type &value);
+
+    /** @brief Set the mapping for @a key to @a value.
+     *
+     * This is a deprecated synonym for set().
+     *
+     * @deprecated Use set(). */
+    bool replace(key_const_reference key, const mapped_type &value) CLICK_DEPRECATED;
+
+    /** @brief Remove the element indicated by @a it.
+     * @return A valid iterator pointing at the next element remaining, or
+     * end() if no such element exists. */
+    iterator erase(const iterator &it) {
+	return _rep.erase(it);
+    }
+
+    /** @brief Remove any element with @a key.
+     *
+     * Returns the number of elements removed, which is always 0 or 1. */
+    size_type erase(key_const_reference key) {
+	return _rep.erase(key);
+    }
+
+    /** @brief Remove all elements.
+     * @post size() == 0 */
+    void clear() {
+	_rep.clear();
+    }
+
+
+    /** @brief Swap the contents of this hash table and @a x. */
+    void swap(HashTable<K, V> &x) {
+	_rep.swap(x._rep);
+	click_swap(x._default_value, _default_value);
+    }
+
+
+    /** @brief Rehash the table, ensuring it contains at least @a n buckets.
+     *
+     * All existing iterators are invalidated.  If @a n < bucket_count(), this
+     * function may make the hash table slower. */
+    void rehash(bucket_count_type nb) {
+	_rep.rehash(nb);
+    }
+
+
+    /** @brief Assign this hash table's contents to a copy of @a x. */
+    HashTable<K, V> &operator=(const HashTable<K, V> &x) {
+	_rep = x._rep;
+	_default_value = x._default_value;
+	return *this;
+    }
+
+#if HAVE_CXX_RVALUE_REFERENCES
+    /** @overload */
+    HashTable<K, V> &operator=(HashTable<K, V> &&x) {
+	x.swap(*this);
+	return *this;
+    }
+#endif
+
+  private:
+
+    rep_type _rep;
+    V _default_value;
+
+};
+
+
+
+template <typename T>
+HashTable<T>::~HashTable()
+{
+    for (typename rep_type::iterator it = _rep.begin(); it; ) {
+	elt *e = _rep.erase(it);
+	e->v.~T();
+	_alloc.deallocate(e);
+    }
+}
+
+template <typename T>
+inline typename HashTable<T>::const_iterator HashTable<T>::begin() const
+{
+    return const_iterator(_rep.begin());
+}
+
+template <typename T>
+inline typename HashTable<T>::iterator HashTable<T>::begin()
+{
+    return iterator(_rep.begin());
+}
+
+template <typename T>
+inline typename HashTable<T>::const_iterator HashTable<T>::end() const
+{
+    return const_iterator(_rep.end());
+}
+
+template <typename T>
+inline typename HashTable<T>::iterator HashTable<T>::end()
+{
+    return iterator(_rep.end());
+}
+
+template <typename T>
+inline typename HashTable<T>::size_type HashTable<T>::count(key_const_reference key) const
+{
+    return _rep.contains(key);
+}
+
+template <typename T>
+inline HashTable_const_iterator<T> HashTable<T>::find(key_const_reference key) const
+{
+    return HashTable_const_iterator<T>(_rep.find(key));
+}
+
+template <typename T>
+inline HashTable_iterator<T> HashTable<T>::find(key_const_reference key)
+{
+    return HashTable_iterator<T>(_rep.find(key));
+}
+
+template <typename T>
+inline HashTable_iterator<T> HashTable<T>::find_prefer(key_const_reference key)
+{
+    return HashTable_iterator<T>(_rep.find_prefer(key));
+}
+
+template <typename T>
+HashTable_iterator<T> HashTable<T>::find_insert(key_const_reference key)
+{
+    typename rep_type::iterator i = _rep.find(key);
+    if (!i)
+	if (elt *e = reinterpret_cast<elt *>(_alloc.allocate())) {
+	    new(reinterpret_cast<void *>(&e->v)) T(key);
+	    _rep.set(i, e, true);
+	}
+    return i;
+}
+
+template <typename T>
+typename HashTable<T>::value_type &
+HashTable<T>::operator[](key_const_reference key)
+{
+    return *find_insert(key);
+}
+
+template <typename T>
+HashTable_iterator<T> HashTable<T>::find_insert(const value_type &v)
+{
+    typename rep_type::iterator i = _rep.find(hashkey(v));
+    if (!i)
+	if (elt *e = reinterpret_cast<elt *>(_alloc.allocate())) {
+	    new(reinterpret_cast<void *>(&e->v)) T(v);
+	    _rep.set(i, e, true);
+	}
+    return i;
+}
+
+template <typename T>
+bool HashTable<T>::set(const value_type &value)
+{
+    typename rep_type::iterator i = _rep.find(hashkey(value));
+    if (i)
+	i->v = value;
+    else if (elt *e = reinterpret_cast<elt *>(_alloc.allocate())) {
+	new(reinterpret_cast<void *>(&e->v)) T(value);
+	_rep.set(i, e, true);
+	return true;
+    }
+    return false;
+}
+
+template <typename K, typename V>
+bool HashTable<K, V>::set(const key_type &key, const mapped_type &value)
+{
+    typename rep_type::rep_type::iterator i = _rep._rep.find(key);
+    if (i)
+	i->v.second = value;
+    else if (typename rep_type::elt *e = reinterpret_cast<typename rep_type::elt *>(_rep._alloc.allocate())) {
+	new(reinterpret_cast<void *>(&e->v)) value_type(key, value);
+	_rep._rep.set(i, e, true);
+	return true;
+    }
+    return false;
+}
+
+template <typename T>
+typename HashTable<T>::iterator HashTable<T>::erase(const iterator &it)
+{
+    iterator itx(it);
+    if (elt *e = _rep.erase(reinterpret_cast<typename rep_type::iterator &>(itx._rep))) {
+	e->v.~T();
+	_alloc.deallocate(e);
+    }
+    return itx;
+}
+
+template <typename T>
+typename HashTable<T>::size_type HashTable<T>::erase(const key_type &key)
+{
+    if (elt *e = _rep.erase(key)) {
+	e->v.~T();
+	_alloc.deallocate(e);
+	return 1;
+    } else
+	return 0;
+}
+
+template <typename T>
+void HashTable<T>::clone_elements(const HashTable<T> &o)
+  // requires that 'this' is empty and has the same number of buckets as 'o'
+{
+    bucket_count_type b = (bucket_count_type) -1;
+    typename rep_type::iterator j = _rep.end();
+    for (typename rep_type::const_iterator i = o._rep.begin(); i; ++i) {
+	if (b != i.bucket())
+	    j = _rep.begin((b = i.bucket()));
+	if (elt *e = reinterpret_cast<elt *>(_alloc.allocate())) {
+	    new(reinterpret_cast<void *>(&e->v)) T(i->v);
+	    _rep.insert_at(j, e);
+	}
+    }
+}
+
+template <typename T>
+void HashTable<T>::copy_elements(const HashTable<T> &o)
+{
+    for (typename rep_type::const_iterator i = o._rep.begin(); i; ++i)
+	find_insert(i->v);
+}
+
+template <typename T>
+HashTable<T> &HashTable<T>::operator=(const HashTable<T> &o)
+{
+    if (&o != this) {
+	clear();
+	if (_rep.bucket_count() < o._rep.bucket_count())
+	    _rep.rehash(o._rep.bucket_count());
+	copy_elements(o);
+    }
+    return *this;
+}
+
+template <typename T>
+void HashTable<T>::clear()
+{
+    for (typename rep_type::iterator it = _rep.begin(); it; ) {
+	elt *e = _rep.erase(it);
+	e->v.~T();
+	_alloc.deallocate(e);
+    }
+}
+
+template <typename T>
+void HashTable<T>::swap(HashTable<T> &o)
+{
+    _rep.swap(o._rep);
+    _alloc.swap(o._alloc);
+}
+
+template <typename K, typename V>
+inline typename HashTable<K, V>::mapped_type &HashTable<K, V>::operator[](const key_type &key)
+{
+    return find_insert(key).value();
+}
+
+template <typename K, typename V>
+bool HashTable<K, V>::replace(const key_type &key, const mapped_type &value)
+{
+    return set(key, value);
+}
+
+
+/** @brief Compare two HashTable iterators for equality. */
+template <typename T>
+inline bool operator==(const HashTable_const_iterator<T> &a, const HashTable_const_iterator<T> &b)
+{
+    return a.get() == b.get();
+}
+
+/** @brief Compare two HashTable iterators for inequality. */
+template <typename T>
+inline bool operator!=(const HashTable_const_iterator<T> &a, const HashTable_const_iterator<T> &b)
+{
+    return a.get() != b.get();
+}
+
+
+template <typename K, typename V>
+inline void click_swap(HashTable<K, V> &a, HashTable<K, V> &b)
+{
+    a.swap(b);
+}
+
+template <typename K, typename V>
+inline void assign_consume(HashTable<K, V> &a, HashTable<K, V> &b)
+{
+    a.swap(b);
+}
+
+template <typename K, typename V>
+inline void clear_by_swap(HashTable<K, V> &x)
+{
+    // specialization avoids losing x's default value
+    HashTable<K, V> tmp(x.default_value());
+    x.swap(tmp);
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/heap.hh b/openflow/include/click/heap.hh
new file mode 100644
index 0000000..cafc0f7
--- /dev/null
+++ b/openflow/include/click/heap.hh
@@ -0,0 +1,425 @@
+#ifndef CLICK_HEAP_HH
+#define CLICK_HEAP_HH
+#include <click/algorithm.hh>
+CLICK_DECLS
+
+/** @brief Add an element to a heap.
+ * @param begin begin random-access iterator
+ * @param end end random-access iterator
+ * @param comp compare function object, such as less<>
+ * @param place placement function object, defaults to do_nothing<>
+ * @pre @a begin \< @a end
+ * @pre [@a begin, @a end - 1) is a heap
+ * @post [@a begin, @a end) is a heap
+ *
+ * This function rearranges the elements in [@a begin, @a end) to be a heap.
+ * It assumes that most of the sequence is already a heap -- only the new
+ * element, @a end[-1], might not be in a valid place.
+ *
+ * The comparison function @a comp defines the heap order.
+ *
+ * The placement function @a place is called for each element that
+ * changes place within the heap order; its arguments are @a begin and
+ * an iterator for the element that switched place.  @a place is always
+ * called once with an iterator pointing the new element in its final
+ * place.  @a place is useful when elements need to keep track of
+ * their own positions in the heap order.  @a place defaults to
+ * do_nothing<>().
+ *
+ * @sa change_heap, pop_heap, remove_heap */
+template <typename iterator_type, typename compare_type, typename place_type>
+inline void push_heap(iterator_type begin, iterator_type end,
+		      compare_type comp, place_type place)
+{
+    assert(begin < end);
+    size_t i = end - begin - 1, npos;
+
+    while (i > 0 && (npos = (i-1)/2, comp(begin[i], begin[npos]))) {
+	click_swap(begin[i], begin[npos]);
+	place(begin, begin + i);
+	i = npos;
+    }
+
+    place(begin, begin + i);
+}
+
+/** @overload */
+template <typename iterator_type, typename compare_type>
+inline void push_heap(iterator_type begin, iterator_type end,
+		      compare_type comp)
+{
+    push_heap(begin, end, comp, do_nothing<iterator_type, iterator_type>());
+}
+
+/** @brief Change an element's position within a heap.
+ * @param begin begin random-access iterator
+ * @param end end random-access iterator
+ * @param element iterator pointing to element whose position may change
+ * @param comp compare function object, such as less<>
+ * @param place placement function object, defaults to do_nothing<>
+ * @pre @a begin \<= @a element < @a end
+ * @pre [@a begin, @a end) is a heap, perhaps excluding @a element
+ * @post [@a begin, @a end) is a heap
+ * @return iterator pointing to the new location of *@a element
+ *
+ * This function rearranges the elements in [@a begin, @a end) to be a heap.
+ * It assumes that most of the sequence is already a heap.  Only the element
+ * pointed to by @a element might be out of place.
+ *
+ * The comparison function @a comp defines the heap order.
+ *
+ * The placement function @a place is called for each element that
+ * changes place within the heap order; its arguments are @a begin and
+ * an iterator for the element that switched place.  @a place is
+ * useful when elements need to keep track of their own positions in
+ * the heap order.  @a place defaults to do_nothing<>().
+ *
+ * @sa push_heap, pop_heap, remove_heap */
+template <typename iterator_type, typename compare_type, typename place_type>
+iterator_type change_heap(iterator_type begin, iterator_type end,
+			  iterator_type element,
+			  compare_type comp, place_type place)
+{
+    assert(begin <= element && element < end);
+    size_t i = element - begin, size = end - begin, npos;
+
+    while (i > 0 && (npos = (i-1)/2, comp(begin[i], begin[npos]))) {
+	click_swap(begin[i], begin[npos]);
+	place(begin, begin + i);
+	i = npos;
+    }
+
+    while (1) {
+	size_t smallest = i, trial = i*2 + 1;
+        if (trial < size && comp(begin[trial], begin[smallest]))
+            smallest = trial;
+        if (trial + 1 < size && comp(begin[trial + 1], begin[smallest]))
+            smallest = trial + 1;
+        if (smallest == i)
+            break;
+	click_swap(begin[i], begin[smallest]);
+	place(begin, begin + i);
+        i = smallest;
+    }
+
+    if (begin + i != element)
+	place(begin, begin + i);
+    return begin + i;
+}
+
+/** @overload */
+template <typename iterator_type, typename compare_type>
+inline iterator_type change_heap(iterator_type begin, iterator_type end,
+				 iterator_type element, compare_type comp)
+{
+    return change_heap(begin, end, element, comp, do_nothing<iterator_type, iterator_type>());
+}
+
+/** @brief Remove an element from a heap.
+ * @param begin begin random-access iterator
+ * @param end end random-access iterator
+ * @param element iterator pointing to element to remove
+ * @param comp compare function object, such as less<>
+ * @param place placement function object, defaults to do_nothing<>
+ * @pre @a begin \<= @a element < @a end
+ * @pre [@a begin, @a end) is a heap, possibly excluding @a element
+ * @post [@a begin, @a end - 1) is a heap, and the element formerly at
+ * *@a element has shifted to *(@a end - 1)
+ *
+ * This function removes @a element from the heap in [@a begin, @a end) by
+ * shifting it to the end, preserving the heap property on the remaining
+ * elements.
+ *
+ * The comparison function @a comp defines the heap order.
+ *
+ * The placement function @a place is called for each actual element
+ * that changes place within the heap order; its arguments are @a
+ * begin and an iterator for the element that switched place.  It is
+ * not called on @a element, which is no longer considered a member of
+ * the heap.  @a place is useful when elements need to keep track of
+ * their own positions in the heap order.  @a place defaults to
+ * do_nothing<>().
+ *
+ * @sa push_heap, change_heap, pop_heap */
+template <typename iterator_type, typename compare_type, typename place_type>
+inline void remove_heap(iterator_type begin, iterator_type end,
+			iterator_type element,
+			compare_type comp, place_type place)
+{
+    assert(begin <= element && element < end);
+    if (element + 1 != end) {
+	click_swap(element[0], end[-1]);
+	place(begin, element);
+	change_heap(begin, end - 1, element, comp, place);
+    }
+}
+
+/** @overload */
+template <typename iterator_type, typename compare_type>
+inline void remove_heap(iterator_type begin, iterator_type end,
+			iterator_type element,
+			compare_type comp)
+{
+    remove_heap(begin, end, element, comp, do_nothing<iterator_type, iterator_type>());
+}
+
+/** @brief Remove the first element from a heap.
+ * @param begin begin random-access iterator
+ * @param end end random-access iterator
+ * @param comp compare function object, such as less<>
+ * @param place placement function object, defaults to do_nothing<>
+ * @pre @a begin \< @a end
+ * @pre [@a begin, @a end) is a heap
+ * @post [@a begin, @a end - 1) is a heap, and the element formerly at
+ * *@a begin has shifted to *(@a end - 1)
+ *
+ * This function removes the first element of [@a begin, @a end) from a heap
+ * by shifting it to the end, preserving the heap property on the remaining
+ * elements.
+ *
+ * The comparison function @a comp defines the heap order.
+ *
+ * The placement function @a place is called for each element that
+ * changes place within the heap order; its arguments are @a begin and
+ * an iterator for the element that switched place.  It is not called
+ * on the first element, which is no longer considered a member of the
+ * heap.  @a place is useful when elements need to keep track of their
+ * own positions in the heap order.  @a place defaults to
+ * do_nothing<>().
+ *
+ * @sa push_heap, change_heap, remove_heap */
+template <typename iterator_type, typename compare_type, typename place_type>
+inline void pop_heap(iterator_type begin, iterator_type end,
+		     compare_type comp, place_type place)
+{
+    remove_heap(begin, end, begin, comp, place);
+}
+
+/** @overload */
+template <typename iterator_type, typename compare_type>
+inline void pop_heap(iterator_type begin, iterator_type end,
+		     compare_type comp)
+{
+    pop_heap(begin, end, comp, do_nothing<iterator_type, iterator_type>());
+}
+
+
+
+/** @brief Add an element to a d-ary heap.
+ * @param begin begin random-access iterator
+ * @param end end random-access iterator
+ * @param comp compare function object, such as less<>
+ * @param place placement function object, defaults to do_nothing<>
+ * @pre @a begin \< @a end
+ * @pre [@a begin, @a end - 1) is a d-ary heap
+ * @post [@a begin, @a end) is a d-ary heap
+ *
+ * This function rearranges the elements in [@a begin, @a end) to be
+ * a d-ary heap.  It assumes that most of the sequence is already a
+ * heap -- only the new element, @a end[-1], might not be in a valid
+ * place.  The arity @a n is a template parameter, and must be greater
+ * than 2.
+ *
+ * The comparison function @a comp defines the heap order.
+ *
+ * The placement function @a place is called for each element that
+ * changes place within the heap order; its arguments are @a begin and
+ * an iterator for the element that switched place.  @a place is always
+ * called once with an iterator pointing the new element in its final
+ * place.  @a place is useful when elements need to keep track of
+ * their own positions in the heap order.  @a place defaults to
+ * do_nothing<>().
+ *
+ * @sa change_heap, pop_heap, remove_heap */
+template <int arity,
+	  typename iterator_type, typename compare_type, typename place_type>
+inline void push_heap(iterator_type begin, iterator_type end,
+		      compare_type comp, place_type place)
+{
+    static_assert(arity > 2, "For arity == 2, use push_heap(...), not push_heap<2>(...).");
+    assert(begin < end);
+    size_t i = end - begin - 1, npos;
+
+    while (i > 0 && (npos = i/arity, comp(begin[i], begin[npos]))) {
+	click_swap(begin[i], begin[npos]);
+	place(begin, begin + i);
+	i = npos;
+    }
+
+    place(begin, begin + i);
+}
+
+/** @overload */
+template <int arity, typename iterator_type, typename compare_type>
+inline void push_heap(iterator_type begin, iterator_type end,
+		      compare_type comp)
+{
+    push_heap<arity>(begin, end, comp, do_nothing<iterator_type, iterator_type>());
+}
+
+/** @brief Change an element's position within a d-ary heap.
+ * @param begin begin random-access iterator
+ * @param end end random-access iterator
+ * @param element iterator pointing to element whose position may change
+ * @param comp compare function object, such as less<>
+ * @param place placement function object, defaults to do_nothing<>
+ * @pre @a begin \<= @a element < @a end
+ * @pre [@a begin, @a end) is a d-ary heap, perhaps excluding @a element
+ * @post [@a begin, @a end) is a d-ary heap
+ * @return iterator pointing to the new location of *@a element
+ *
+ * This function rearranges the elements in [@a begin, @a end) to be
+ * a d-ary heap.  It assumes that most of the sequence is already a
+ * heap.  Only the element pointed to by @a element might be out of
+ * place.  The arity @a n is a template parameter, and must be greater
+ * than 2.
+ *
+ * The comparison function @a comp defines the heap order.
+ *
+ * The placement function @a place is called for each element that
+ * changes place within the heap order; its arguments are @a begin and
+ * an iterator for the element that switched place.  @a place is
+ * useful when elements need to keep track of their own positions in
+ * the heap order.  @a place defaults to do_nothing<>().
+ *
+ * @sa push_heap, pop_heap, remove_heap */
+template <int arity,
+	  typename iterator_type, typename compare_type, typename place_type>
+iterator_type change_heap(iterator_type begin, iterator_type end,
+			  iterator_type element,
+			  compare_type comp, place_type place)
+{
+    static_assert(arity > 2, "For arity == 2, use change_heap(...), not change_heap<2>(...).");
+    assert(begin <= element && element < end);
+    size_t i = element - begin, size = end - begin, npos;
+
+    while (i > 0 && (npos = i/arity, comp(begin[i], begin[npos]))) {
+	click_swap(begin[i], begin[npos]);
+	place(begin, begin + i);
+	i = npos;
+    }
+
+    while (1) {
+	size_t smallest = i,
+	    trial = i ? i * arity : 1,
+	    end_trial = i ? trial + arity : arity;
+	end_trial = end_trial < size ? end_trial : size;
+	for (; trial < end_trial; ++trial)
+	    if (comp(begin[trial], begin[smallest]))
+		smallest = trial;
+        if (smallest == i)
+            break;
+	click_swap(begin[i], begin[smallest]);
+	place(begin, begin + i);
+        i = smallest;
+    }
+
+    if (begin + i != element)
+	place(begin, begin + i);
+    return begin + i;
+}
+
+/** @overload */
+template <int arity,
+	  typename iterator_type, typename compare_type>
+inline iterator_type change_heap(iterator_type begin, iterator_type end,
+				 iterator_type element, compare_type comp)
+{
+    return change_heap<arity>(begin, end, element, comp, do_nothing<iterator_type, iterator_type>());
+}
+
+/** @brief Remove an element from a d-ary heap.
+ * @param begin begin random-access iterator
+ * @param end end random-access iterator
+ * @param element iterator pointing to element to remove
+ * @param comp compare function object, such as less<>
+ * @param place placement function object, defaults to do_nothing<>
+ * @pre @a begin \<= @a element < @a end
+ * @pre [@a begin, @a end) is a d-ary heap, possibly excluding @a element
+ * @post [@a begin, @a end - 1) is a d-ary heap, and the element formerly
+ * at *@a element has shifted to *(@a end - 1)
+ *
+ * This function removes @a element from the d-ary heap in [@a begin,
+ * @a end) by shifting it to the end, preserving the heap property on
+ * the remaining elements.  The arity @a n is a template parameter.
+ *
+ * The comparison function @a comp defines the heap order.
+ *
+ * The placement function @a place is called for each actual element
+ * that changes place within the heap order; its arguments are @a
+ * begin and an iterator for the element that switched place.  It is
+ * not called on @a element, which is no longer considered a member of
+ * the heap.  @a place is useful when elements need to keep track of
+ * their own positions in the heap order.  @a place defaults to
+ * do_nothing<>().
+ *
+ * @sa push_heap, change_heap, pop_heap */
+template <int arity,
+	  typename iterator_type, typename compare_type, typename place_type>
+inline void remove_heap(iterator_type begin, iterator_type end,
+			iterator_type element,
+			compare_type comp, place_type place)
+{
+    assert(begin <= element && element < end);
+    if (element + 1 != end) {
+	click_swap(element[0], end[-1]);
+	place(begin, element);
+	change_heap<arity>(begin, end - 1, element, comp, place);
+    }
+}
+
+/** @overload */
+template <int arity,
+	  typename iterator_type, typename compare_type>
+inline void remove_heap(iterator_type begin, iterator_type end,
+			iterator_type element,
+			compare_type comp)
+{
+    remove_heap<arity>(begin, end, element, comp, do_nothing<iterator_type, iterator_type>());
+}
+
+/** @brief Remove the first element from a d-ary heap.
+ * @param begin begin random-access iterator
+ * @param end end random-access iterator
+ * @param comp compare function object, such as less<>
+ * @param place placement function object, defaults to do_nothing<>
+ * @pre @a begin \< @a end
+ * @pre [@a begin, @a end) is a d-ary heap
+ * @post [@a begin, @a end - 1) is a d-ary heap, and the element formerly
+ * at *@a begin has shifted to *(@a end - 1)
+ *
+ * This function removes the first element of [@a begin, @a end) from
+ * a d-ary heap by shifting it to the end, preserving the heap
+ * property on the remaining elements.  The arity @a n is a template
+ * parameter.
+ *
+ * The comparison function @a comp defines the heap order.
+ *
+ * The placement function @a place is called for each element that
+ * changes place within the heap order; its arguments are @a begin and
+ * an iterator for the element that switched place.  It is not called
+ * on the first element, which is no longer considered a member of the
+ * heap.  @a place is useful when elements need to keep track of their
+ * own positions in the heap order.  @a place defaults to
+ * do_nothing<>().
+ *
+ * @sa push_heap, change_heap, remove_heap */
+template <int arity,
+	  typename iterator_type, typename compare_type, typename place_type>
+inline void pop_heap(iterator_type begin, iterator_type end,
+		     compare_type comp, place_type place)
+{
+    remove_heap<arity>(begin, end, begin, comp, place);
+}
+
+/** @overload */
+template <int arity,
+	  typename iterator_type, typename compare_type>
+inline void pop_heap(iterator_type begin, iterator_type end,
+		     compare_type comp)
+{
+    pop_heap<arity>(begin, end, comp, do_nothing<iterator_type, iterator_type>());
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/ino.hh b/openflow/include/click/ino.hh
new file mode 100644
index 0000000..c943b51
--- /dev/null
+++ b/openflow/include/click/ino.hh
@@ -0,0 +1,133 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/ino.cc" -*-
+#ifndef CLICK_INO_HH
+#define CLICK_INO_HH
+#include <click/router.hh>
+CLICK_DECLS
+
+#define INO_DEBUG			0
+
+// /click: .e > .h > element names > global handlers [dt_global]
+// /click/.e: element numbers [dt_u]
+// /click/.e/NUM: handlers [dt_hu]
+// /click/.h: global handlers [dt_hh]
+// /click/ELEMENTNAME: .h > element names > element handlers [dt_hn]
+// /click/ELEMENTNAME/.h: element handlers [dt_hh]
+
+class ClickIno { public:
+
+    void initialize();
+    void cleanup();
+
+    uint32_t generation() const		{ return _generation; }
+
+    // NB: inode number 0 is reserved for the system.
+    enum { dt_u = 1U, dt_hh = 2U, dt_hu = 3U, dt_hn = 4U, dt_global = 5U };
+    enum { ino_globaldir = (unsigned) (dt_global << 28),
+	   ino_enumdir = (unsigned) (dt_u << 28) };
+    static bool is_handler(unsigned ino)   { return (int32_t) ino < 0; }
+    static unsigned dirtype(unsigned ino)  { return ino >> 28; }
+    static bool has_element(unsigned ino)  { return ino & 0xFFFFU; }
+    static bool has_handlers(unsigned ino) { return ino > (dt_u << 28); }
+    static bool has_names(unsigned ino)    { return ino >= (dt_hn << 28); }
+    static int ino_element(unsigned ino)   { return (int) (ino & 0xFFFFU) - 1; }
+    static int ino_handler(unsigned ino) {
+	return (has_element(ino) ? 0 : Router::FIRST_GLOBAL_HANDLER)
+	    + ((ino >> 16) & 0x7FFFU);
+    }
+
+    static unsigned make_handler(int e, int hi) {
+	return 0x80000000U | ((hi & 0x7FFFU) << 16) | ((e + 1) & 0xFFFFU);
+    }
+    static unsigned make_dir(unsigned dtype, int e) {
+	return (dtype << 28) | ((e + 1) & 0xFFFFU);
+    }
+
+
+    // These operations should be called with a configuration lock held.
+    inline int prepare(Router *router, uint32_t generation);
+    int nlink(ino_t ino);
+    ino_t lookup(ino_t dir, const String &component);
+
+    // readdir handles '..' (f_pos 0) and '.' (f_pos 1).
+    // It returns the number of things stored.
+    typedef bool (*filldir_t)(const char *name, int name_len, ino_t ino, int dirtype, loff_t f_pos, void *user_data);
+    int readdir(ino_t dir, loff_t &f_pos, filldir_t fd, void *user_data);
+
+#if INO_DEBUG
+    String info() const;
+#endif
+
+    struct Entry {
+	// Name of this entry.
+	String name;
+
+	// Corresponding eindex plus 1. Might be larger than the number of
+	// elements in the router, because of fake directories added for
+	// compound "elements".
+	uint16_t elementno_plus1;
+
+	// '_x[i].xindex' equals the index in _x of the entry for element
+	// number 'i - 1'.
+	uint16_t xindex;
+
+	// Number of child entries. 'name' is guaranteed to be a prefix of
+	// every child entry.
+	uint16_t skip;
+
+	// See enum below. X_FAKE is true on fake directories added for
+	// compound elements.
+	uint16_t flags;
+    };
+
+  private:
+    enum { X_FAKE = 1 };
+
+    Entry* _x;
+    int _nentries;
+    int _cap;
+    Router* _router;
+    uint32_t _generation;
+
+    inline int xindex(int elementno) const;
+    inline int next_xindex(int elementno) const;
+    inline int elementno(int xindex) const;
+
+    int name_search(const String &n, int first_xi, int last_xi, int name_offset) const;
+    int element_name_search(const String &n, int elementno) const;
+
+    int grow(int min_size);
+    int true_prepare(Router*, uint32_t);
+};
+
+
+inline int
+ClickIno::prepare(Router* router, uint32_t generation)
+{
+    if (generation != _generation)
+	return true_prepare(router, generation);
+    else
+	return 0;
+}
+
+inline int
+ClickIno::xindex(int elementno) const
+{
+    assert(elementno >= -1 && elementno < _nentries - 1);
+    return _x[elementno + 1].xindex;
+}
+
+inline int
+ClickIno::next_xindex(int elementno) const
+{
+    int xi = xindex(elementno);
+    return xi + _x[xi].skip + 1;
+}
+
+inline int
+ClickIno::elementno(int xindex) const
+{
+    return _x[xindex].elementno_plus1 - 1;
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/integers.hh b/openflow/include/click/integers.hh
new file mode 100644
index 0000000..204f3e2
--- /dev/null
+++ b/openflow/include/click/integers.hh
@@ -0,0 +1,503 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/integers.cc" -*-
+#ifndef CLICK_INTEGERS_HH
+#define CLICK_INTEGERS_HH
+#include <click/glue.hh>
+#include <click/type_traits.hh>
+#if !HAVE___BUILTIN_FFS && HAVE_FFS && HAVE_STRINGS_H
+# include <strings.h>
+#endif
+CLICK_DECLS
+
+/** @file <click/integers.hh>
+ * @brief Functions for manipulating integers.
+ */
+
+#if HAVE_INT64_TYPES && !defined(htonq)
+# if CLICK_BYTE_ORDER != CLICK_LITTLE_ENDIAN && CLICK_BYTE_ORDER != CLICK_BIG_ENDIAN
+inline uint64_t htonq(uint64_t x) __attribute__((error("unknown byte order")));
+# endif
+
+/** @brief Return @a x translated from host to network byte order. */
+inline uint64_t htonq(uint64_t x) {
+# if CLICK_BYTE_ORDER == CLICK_LITTLE_ENDIAN
+    uint32_t hi = x >> 32;
+    uint32_t lo = x & 0xffffffff;
+    return (((uint64_t)htonl(lo)) << 32) | htonl(hi);
+# elif CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN
+    return x;
+# else
+    return 0;
+# endif
+}
+#endif
+
+#if HAVE_INT64_TYPES && !defined(ntohq)
+# if CLICK_BYTE_ORDER != CLICK_LITTLE_ENDIAN && CLICK_BYTE_ORDER != CLICK_BIG_ENDIAN
+inline uint64_t htonq(uint64_t x) __attribute__((error("unknown byte order")));
+# endif
+
+/** @brief Return @a x translated from network to host byte order. */
+inline uint64_t ntohq(uint64_t x) {
+# if CLICK_BYTE_ORDER == CLICK_LITTLE_ENDIAN
+    uint32_t hi = x >> 32;
+    uint32_t lo = x & 0xffffffff;
+    return (((uint64_t)ntohl(lo)) << 32) | ntohl(hi);
+# elif CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN
+    return x;
+# else
+    return 0;
+# endif
+}
+#endif
+
+/** @brief Translate @a x to network byte order.
+ *
+ * Compare htons/htonl/htonq.  host_to_net_order is particularly useful in
+ * template functions, where the type to be translated to network byte order
+ * is unknown. */
+inline unsigned char host_to_net_order(unsigned char x) {
+    return x;
+}
+/** @overload */
+inline signed char host_to_net_order(signed char x) {
+    return x;
+}
+/** @overload */
+inline char host_to_net_order(char x) {
+    return x;
+}
+/** @overload */
+inline short host_to_net_order(short x) {
+    return htons(x);
+}
+/** @overload */
+inline unsigned short host_to_net_order(unsigned short x) {
+    return htons(x);
+}
+/** @overload */
+inline int host_to_net_order(int x) {
+    return htonl(x);
+}
+/** @overload */
+inline unsigned host_to_net_order(unsigned x) {
+    return htonl(x);
+}
+#if SIZEOF_LONG == 4
+/** @overload */
+inline long host_to_net_order(long x) {
+    return htonl(x);
+}
+/** @overload */
+inline unsigned long host_to_net_order(unsigned long x) {
+    return htonl(x);
+}
+#endif
+#if HAVE_INT64_TYPES
+# if SIZEOF_LONG == 8
+/** @overload */
+inline long host_to_net_order(long x) {
+    return htonq(x);
+}
+/** @overload */
+inline unsigned long host_to_net_order(unsigned long x) {
+    return htonq(x);
+}
+# endif
+# if HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8
+/** @overload */
+inline long long host_to_net_order(long long x) {
+    return htonq(x);
+}
+/** @overload */
+inline unsigned long long host_to_net_order(unsigned long long x) {
+    return htonq(x);
+}
+# endif
+# if !HAVE_INT64_IS_LONG && !HAVE_INT64_IS_LONG_LONG
+/** @overload */
+inline int64_t host_to_net_order(int64_t x) {
+    return htonq(x);
+}
+/** @overload */
+inline uint64_t host_to_net_order(uint64_t x) {
+    return htonq(x);
+}
+# endif
+#endif
+
+/** @brief Translate @a x to host byte order.
+ *
+ * Compare ntohs/ntohl/ntohq.  net_to_host_order is particularly useful in
+ * template functions, where the type to be translated to network byte order
+ * is unknown. */
+inline unsigned char net_to_host_order(unsigned char x) {
+    return x;
+}
+/** @overload */
+inline signed char net_to_host_order(signed char x) {
+    return x;
+}
+/** @overload */
+inline char net_to_host_order(char x) {
+    return x;
+}
+/** @overload */
+inline short net_to_host_order(short x) {
+    return ntohs(x);
+}
+/** @overload */
+inline unsigned short net_to_host_order(unsigned short x) {
+    return ntohs(x);
+}
+/** @overload */
+inline int net_to_host_order(int x) {
+    return ntohl(x);
+}
+/** @overload */
+inline unsigned net_to_host_order(unsigned x) {
+    return ntohl(x);
+}
+#if SIZEOF_LONG == 4
+/** @overload */
+inline long net_to_host_order(long x) {
+    return ntohl(x);
+}
+/** @overload */
+inline unsigned long net_to_host_order(unsigned long x) {
+    return ntohl(x);
+}
+#endif
+#if HAVE_INT64_TYPES
+# if SIZEOF_LONG == 8
+/** @overload */
+inline long net_to_host_order(long x) {
+    return ntohq(x);
+}
+/** @overload */
+inline unsigned long net_to_host_order(unsigned long x) {
+    return ntohq(x);
+}
+# endif
+# if HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8
+/** @overload */
+inline long long net_to_host_order(long long x) {
+    return ntohq(x);
+}
+/** @overload */
+inline unsigned long long net_to_host_order(unsigned long long x) {
+    return ntohq(x);
+}
+# endif
+# if !HAVE_INT64_IS_LONG && !HAVE_INT64_IS_LONG_LONG
+/** @overload */
+inline int64_t net_to_host_order(int64_t x) {
+    return ntohq(x);
+}
+/** @overload */
+inline uint64_t net_to_host_order(uint64_t x) {
+    return ntohq(x);
+}
+# endif
+#endif
+
+
+// MSB is bit #1
+#if HAVE___BUILTIN_CLZ && !HAVE_NO_INTEGER_BUILTINS
+/** @brief Return the index of the most significant bit set in @a x.
+ * @return 0 if @a x = 0; otherwise the index of first bit set, where the
+ * most significant bit is numbered 1.
+ */
+inline int ffs_msb(unsigned x) {
+    return (x ? __builtin_clz(x) + 1 : 0);
+}
+#else
+# define NEED_FFS_MSB_UNSIGNED 1
+/** @overload */
+int ffs_msb(unsigned x);
+#endif
+
+#if HAVE___BUILTIN_CLZL && !HAVE_NO_INTEGER_BUILTINS
+/** @overload */
+inline int ffs_msb(unsigned long x) {
+    return (x ? __builtin_clzl(x) + 1 : 0);
+}
+#elif SIZEOF_INT == SIZEOF_LONG
+/** @overload */
+inline int ffs_msb(unsigned long x) {
+    return ffs_msb(static_cast<unsigned>(x));
+}
+#else
+# define NEED_FFS_MSB_UNSIGNED_LONG 1
+/** @overload */
+int ffs_msb(unsigned long x);
+#endif
+
+#if HAVE_LONG_LONG && HAVE___BUILTIN_CLZLL && !HAVE_NO_INTEGER_BUILTINS
+/** @overload */
+inline int ffs_msb(unsigned long long x) {
+    return (x ? __builtin_clzll(x) + 1 : 0);
+}
+#elif HAVE_LONG_LONG && SIZEOF_LONG == SIZEOF_LONG_LONG
+/** @overload */
+inline int ffs_msb(unsigned long long x) {
+    return ffs_msb(static_cast<unsigned long>(x));
+}
+#elif HAVE_LONG_LONG
+# define NEED_FFS_MSB_UNSIGNED_LONG_LONG 1
+/** @overload */
+int ffs_msb(unsigned long long x);
+#endif
+
+#if HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG && !HAVE_INT64_IS_LONG_LONG
+# if SIZEOF_LONG >= 8
+/** @overload */
+inline int ffs_msb(uint64_t x) {
+    return ffs_msb(static_cast<unsigned long>(x));
+}
+# elif HAVE_LONG_LONG && SIZEOF_LONG_LONG >= 8
+/** @overload */
+inline int ffs_msb(uint64_t x) {
+    return ffs_msb(static_cast<unsigned long long>(x));
+}
+# else
+#  define NEED_FFS_MSB_UINT64_T 1
+/** @overload */
+int ffs_msb(uint64_t x);
+# endif
+#endif
+
+
+// LSB is bit #1
+#if HAVE___BUILTIN_FFS && !HAVE_NO_INTEGER_BUILTINS
+/** @brief Return the index of the least significant bit set in @a x.
+ * @return 0 if @a x = 0; otherwise the index of first bit set, where the
+ * least significant bit is numbered 1.
+ */
+inline int ffs_lsb(unsigned x) {
+    return __builtin_ffs(x);
+}
+#elif HAVE_FFS && !HAVE_NO_INTEGER_BUILTINS
+/** overload */
+inline int ffs_lsb(unsigned x) {
+    return ffs(x);
+}
+#else
+# define NEED_FFS_LSB_UNSIGNED 1
+/** @overload */
+int ffs_lsb(unsigned x);
+#endif
+
+#if HAVE___BUILTIN_FFSL && !HAVE_NO_INTEGER_BUILTINS
+/** @overload */
+inline int ffs_lsb(unsigned long x) {
+    return __builtin_ffsl(x);
+}
+#elif SIZEOF_INT == SIZEOF_LONG
+/** @overload */
+inline int ffs_lsb(unsigned long x) {
+    return ffs_lsb(static_cast<unsigned>(x));
+}
+#else
+# define NEED_FFS_LSB_UNSIGNED_LONG 1
+/** @overload */
+int ffs_lsb(unsigned long x);
+#endif
+
+#if HAVE_LONG_LONG && HAVE___BUILTIN_FFSLL && !HAVE_NO_INTEGER_BUILTINS
+/** @overload */
+inline int ffs_lsb(unsigned long long x) {
+    return __builtin_ffsll(x);
+}
+#elif HAVE_LONG_LONG && SIZEOF_LONG == SIZEOF_LONG_LONG
+/** @overload */
+inline int ffs_lsb(unsigned long long x) {
+    return ffs_lsb(static_cast<unsigned long>(x));
+}
+#elif HAVE_LONG_LONG
+# define NEED_FFS_LSB_UNSIGNED_LONG_LONG 1
+/** @overload */
+int ffs_lsb(unsigned long long x);
+#endif
+
+#if HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG && !HAVE_INT64_IS_LONG_LONG
+# if SIZEOF_LONG >= 8
+/** @overload */
+inline int ffs_lsb(uint64_t x) {
+    return ffs_lsb(static_cast<unsigned long>(x));
+}
+# elif HAVE_LONG_LONG && SIZEOF_LONG_LONG >= 8
+/** @overload */
+inline int ffs_lsb(uint64_t x) {
+    return ffs_lsb(static_cast<unsigned long long>(x));
+}
+# else
+#  define NEED_FFS_LSB_UINT64_T 1
+/** @overload */
+int ffs_lsb(uint64_t x);
+# endif
+#endif
+
+
+/** @brief Return the integer approximation of @a x's square root.
+ * @return The integer @a y where @a y*@a y <= @a x, but
+ * (@a y+1)*(@a y+1) > @a x.
+ */
+uint32_t int_sqrt(uint32_t x);
+
+#if HAVE_INT64_TYPES && HAVE_INT64_DIVIDE
+/** @overload */
+uint64_t int_sqrt(uint64_t x);
+#endif
+
+
+/** @brief Return @a a / @a b. */
+inline uint32_t int_divide(uint32_t a, uint32_t b) {
+    return a / b;
+}
+
+/** @overload */
+inline int32_t int_divide(int32_t a, uint32_t b) {
+    return a / b;
+}
+
+#if HAVE_INT64_TYPES
+/** @overload */
+inline uint64_t int_divide(uint64_t a, uint32_t b) {
+# if CLICK_LINUXMODULE && BITS_PER_LONG < 64
+    do_div(a, b);
+    return a;
+# else
+    return a / b;
+# endif
+}
+
+/** @overload */
+inline int64_t int_divide(int64_t a, uint32_t b) {
+# if CLICK_LINUXMODULE && BITS_PER_LONG < 64
+    if (unlikely(a < 0)) {
+        uint64_t a_abs = -(a + 1);
+        do_div(a_abs, b);
+        return (int64_t) -a_abs - 1;
+    } else {
+        uint64_t &a_unsigned = reinterpret_cast<uint64_t &>(a);
+        do_div(a_unsigned, b);
+        return a_unsigned;
+    }
+# else
+    return a / b;
+# endif
+}
+
+
+/** @brief Multiply @a a * @a b, placing the low-order bits of the result in @a xlow
+    and the high-order bits in @a xhigh. */
+template<typename T>
+void int_multiply(T a, T b, T &xlow, T &xhigh)
+{
+    typedef fast_half_integer<T> fasthalf;
+    typedef typename fasthalf::half_type half_type;
+
+    half_type al = fasthalf::low(a), ah = fasthalf::high(a),
+        bl = fasthalf::low(b), bh = fasthalf::high(b);
+
+    T r0 = T(al) * bl;
+    T r3 = T(ah) * bh;
+    T r1 = T(ah) * bl;
+    T r2 = T(al) * bh + fasthalf::high(r0) + r1;
+    if (r2 < r1)
+        r3 += fasthalf::half_value;
+
+    xhigh = r3 + fasthalf::high(r2);
+    xlow = (r2 << fasthalf::half_bits) + fasthalf::low(r0);
+}
+
+template<typename T>
+struct has_fast_int_multiply : public false_type {
+    enum { check_t_integral = integer_traits<T>::is_signed };
+};
+
+#if defined(__i386__) || defined(__x86_64__)
+inline void int_multiply(unsigned a, unsigned b, unsigned &xlow, unsigned &xhigh)
+{
+    __asm__("mul %2" : "=a" (xlow), "=d" (xhigh) : "r" (a), "a" (b) : "cc");
+}
+template<> struct has_fast_int_multiply<unsigned> : public true_type {};
+
+# if SIZEOF_LONG == 4 || (defined(__x86_64__) && SIZEOF_LONG == 8)
+inline void int_multiply(unsigned long a, unsigned long b, unsigned long &xlow, unsigned long &xhigh)
+{
+    __asm__("mul %2" : "=a" (xlow), "=d" (xhigh) : "r" (a), "a" (b) : "cc");
+}
+template<> struct has_fast_int_multiply<unsigned long> : public true_type {};
+# endif
+
+# if defined(__x86_64__) && SIZEOF_LONG_LONG == 8
+inline void int_multiply(unsigned long long a, unsigned long long b, unsigned long long &xlow, unsigned long long &xhigh)
+{
+    __asm__("mul %2" : "=a" (xlow), "=d" (xhigh) : "r" (a), "a" (b) : "cc");
+}
+template<> struct has_fast_int_multiply<unsigned long long> : public true_type {};
+# endif
+#endif
+
+
+/** @brief Divide @a a / @a b, placing quotient in @a quot and returning remainder. */
+inline uint32_t int_remainder(uint32_t a, uint32_t b, uint32_t &quot) {
+    quot = a / b;
+    return a - quot * b;
+}
+
+/** @overload */
+inline int32_t int_remainder(int32_t a, uint32_t b, int32_t &quot) {
+    if (unlikely(a < 0))
+        quot = -(-(a + 1) / b) - 1;
+    else
+        quot = a / b;
+    return a - quot * b;
+}
+
+/** @overload */
+inline uint32_t int_remainder(uint64_t a, uint32_t b, uint64_t &quot) {
+# if CLICK_LINUXMODULE && BITS_PER_LONG < 64
+    uint32_t rem = do_div(a, b);
+    quot = a;
+    return rem;
+# else
+    quot = a / b;
+    return a - quot * b;
+# endif
+}
+
+/** @overload */
+inline uint32_t int_remainder(int64_t a, uint32_t b, int64_t &quot) {
+# if CLICK_LINUXMODULE && BITS_PER_LONG < 64
+    if (unlikely(a < 0)) {
+        uint64_t a_abs = -(a + 1);
+        uint32_t rem = do_div(a_abs, b);
+        quot = (int64_t) -a_abs - 1;
+        return rem ? b - rem : 0;
+    } else {
+        uint64_t &a_unsigned = reinterpret_cast<uint64_t &>(a);
+        uint32_t rem = do_div(a_unsigned, b);
+        quot = a_unsigned;
+        return rem;
+    }
+# else
+    // This arithmetic is about twice as fast on my laptop as the
+    // alternative "div = a / b;
+    //          rem = a - (value_type) div * b;
+    //          if (rem < 0) div--, rem += b;",
+    // and 3-4x faster than "div = a / b;
+    //                   rem = a % b;
+    //                   if (rem < 0) div--, rem += b;".
+    if (unlikely(a < 0))
+        quot = -(-(a + 1) / b) - 1;
+    else
+        quot = a / b;
+    return a - quot * b;
+# endif
+}
+#endif
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/ip6address.hh b/openflow/include/click/ip6address.hh
new file mode 100644
index 0000000..b494c25
--- /dev/null
+++ b/openflow/include/click/ip6address.hh
@@ -0,0 +1,408 @@
+// -*- related-file-name: "../../lib/ip6address.cc" -*-
+#ifndef CLICK_IP6ADDRESS_HH
+#define CLICK_IP6ADDRESS_HH
+#include <click/string.hh>
+#include <clicknet/ip6.h>
+#include <click/ipaddress.hh>
+#include <click/etheraddress.hh>
+#if !CLICK_TOOL
+# include <click/packet.hh>
+# include <click/packet_anno.hh>
+#endif
+CLICK_DECLS
+
+class IP6Address { public:
+
+    typedef uninitialized_type uninitialized_t;
+
+    /** @brief Construct a zero-valued IP6Address (equal to ::). */
+    inline IP6Address() {
+	memset(&_addr, 0, sizeof(_addr));
+    }
+
+    /** @brief Construct an IP6Address from a sixteen-byte buffer. */
+    explicit inline IP6Address(const unsigned char *x) {
+	memcpy(&_addr, x, sizeof(_addr));
+    }
+
+    /** @brief Construct an IPv4-Mappped IP6Address (RFC 4291-2.5.5.2)
+     *
+     * The address has format ::FFFF:@a x. */
+    explicit inline IP6Address(IPAddress x) {
+	*this = x;
+    }
+
+    /** @brief Construct an IP6Address from a human-readable string. */
+    explicit IP6Address(const String &x);		// "fec0:0:0:1::1"
+
+    /** @brief Construct an IP6Address from a C structure. */
+    explicit inline IP6Address(const struct in6_addr &x)
+	: _addr(x) {
+    }
+
+    /** @brief Construct an IPv4-Mapped IP6Address from a C structure. */
+    explicit inline IP6Address(const struct in_addr &x) {
+	*this = x;
+    }
+
+    /** @brief Construct an uninitialized IP6Address. */
+    inline IP6Address(const uninitialized_type &unused) {
+	(void) unused;
+    }
+
+    /** @brief Return an IP6Address equal to the prefix mask of length @a
+     * prefix_len.
+     * @param prefix_len prefix length; 0 <= @a prefix_len <= 128
+     *
+     * For example, make_prefix(0) is ::, make_prefix(12) is fff0::, and
+     * make_prefix(128) is ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff.  Causes an
+     * assertion failure if @a prefix_len is out of range.
+     *
+     * @sa mask_to_prefix_len, make_inverted_prefix */
+    static IP6Address make_prefix(int prefix_len);
+
+    /** @brief Return an IP6Address equal to the inversion of make_prefix(@a
+     * prefix_len).
+     * @param prefix_len prefix length; 0 <= @a prefix_len <= 128
+     * @return ~make_prefix(@a prefix_len)
+     * @sa make_prefix */
+    static IP6Address make_inverted_prefix(int prefix_len);
+
+    typedef uint32_t (IP6Address::*unspecified_bool_type)() const;
+    inline operator unspecified_bool_type() const;
+
+    operator const struct in6_addr &() const	{ return _addr; }
+    operator struct in6_addr &()			{ return _addr; }
+    const struct in6_addr &in6_addr() const	{ return _addr;	}
+    struct in6_addr &in6_addr()			{ return _addr;	}
+
+    unsigned char *data()			{ return &_addr.s6_addr[0]; }
+    const unsigned char *data() const		{ return &_addr.s6_addr[0]; }
+    uint16_t *data16()				{ return (uint16_t *)&_addr.s6_addr[0]; }
+    const uint16_t *data16() const		{ return (uint16_t *)&_addr.s6_addr[0]; }
+    uint32_t *data32()				{ return (uint32_t *)&_addr.s6_addr[0]; }
+    const uint32_t *data32() const		{ return (uint32_t *)&_addr.s6_addr[0]; }
+
+    inline uint32_t hashcode() const;
+
+    int mask_to_prefix_len() const;
+    inline bool matches_prefix(const IP6Address &addr, const IP6Address &mask) const;
+    inline bool mask_as_specific(const IP6Address &) const;
+
+    /** @brief Test if this address contains an embedded Ethernet address.
+     *
+     * An IPv6 address with embedded Ethernet address has format
+     * "nnnn:nnnn:nnnn:nnnn:uuvv:wwFF:FExx:yyzz", where the embedded Ethernet
+     * address is "uu-vv-ww-xx-yy-zz". */
+    bool has_ether_address() const {
+	return _addr.s6_addr[11] == 0xFF && _addr.s6_addr[12] == 0xFE;
+    }
+
+    /** @brief Extract embedded Ethernet address into @a x.
+     * @param[out] x Ethernet address
+     * @return true iff has_ether_address() */
+    bool ether_address(EtherAddress &x) const;
+
+    /** @brief Return true iff the address is a IPv4-compatible address.
+     * NOTE: This form has been deprecated in RFC 4291 (2.5.5.1)
+     *
+     * An IPv4-mapped address has format "::w:x:y:z", where the
+     * IPv4 address is "w.x.y.z". */
+    inline bool is_ip4_compatible() const {
+	return data32()[0] == 0 && data32()[1] == 0
+	    && data32()[2] == 0;
+    }
+
+    /** @brief Return true iff the address is a IPv4-mapped address.
+     *
+     * An IPv4-mapped address has format "::FFFF:w:x:y:z", where the
+     * embedded IPv4 address is "w.x.y.z". */
+    inline bool is_ip4_mapped() const {
+	return data32()[0] == 0 && data32()[1] == 0
+	    && data32()[2] == htonl(0x0000FFFFU);
+    }
+
+    /** @brief Return true iff the address is a multicast address
+     * s6_addr[0] = 0xff;
+     *
+     */
+    inline bool is_multicast() const {
+        return _addr.s6_addr[0] == 0xff;
+    }
+
+    /** @brief Return true iff the address is a link-local address.
+     * fe80::/64
+     *
+     */
+    inline bool is_link_local() const {
+        return data32()[0] == htonl(0xfe800000) && data32()[1] == 0;
+    }
+
+    /** @brief Return IPv4-mapped address.
+     *
+     * @return non-empty IPv4 address iff is_ip4_mapped() is
+     *  true. IPAddress() otherwise */
+    IPAddress ip4_address() const;
+
+    // bool operator==(const IP6Address &, const IP6Address &);
+    // bool operator!=(const IP6Address &, const IP6Address &);
+
+    // IP6Address operator&(const IP6Address &, const IP6Address &);
+    // IP6Address operator|(const IP6Address &, const IP6Address &);
+    // IP6Address operator~(const IP6Address &);
+
+    inline IP6Address &operator&=(const IP6Address &);
+    inline IP6Address &operator&=(const struct in6_addr &);
+    inline IP6Address &operator|=(const IP6Address &);
+    inline IP6Address &operator|=(const struct in6_addr &);
+
+    inline IP6Address &operator=(const struct in6_addr &);
+    inline IP6Address &operator=(const struct in_addr &);
+
+    void unparse(StringAccum &sa) const;
+    String unparse() const;
+    String unparse_expanded() const;
+
+    String s() const			{ return unparse(); }
+    inline operator String() const CLICK_DEPRECATED;
+
+    typedef const IP6Address &parameter_type;
+
+  private:
+
+    struct in6_addr _addr;
+
+};
+
+inline
+IP6Address::operator unspecified_bool_type() const
+{
+    const uint32_t *ai = data32();
+    return ai[0] || ai[1] || ai[2] || ai[3] ? &IP6Address::hashcode : 0;
+}
+
+inline
+IP6Address::operator String() const
+{
+    return unparse();
+}
+
+inline bool
+operator==(const IP6Address &a, const IP6Address &b)
+{
+    const uint32_t *ai = a.data32(), *bi = b.data32();
+    return ai[0] == bi[0] && ai[1] == bi[1] && ai[2] == bi[2] && ai[3] == bi[3];
+}
+
+inline bool
+operator!=(const IP6Address &a, const IP6Address &b)
+{
+    const uint32_t *ai = a.data32(), *bi = b.data32();
+    return ai[0] != bi[0] || ai[1] != bi[1] || ai[2] != bi[2] || ai[3] != bi[3];
+}
+
+inline StringAccum &
+operator<<(StringAccum &sa, const IP6Address &a) {
+    a.unparse(sa);
+    return sa;
+}
+
+inline bool
+IP6Address::matches_prefix(const IP6Address &addr, const IP6Address &mask) const
+{
+    const uint32_t *xi = data32(), *ai = addr.data32(), *mi = mask.data32();
+    return ((xi[0] ^ ai[0]) & mi[0]) == 0
+	&& ((xi[1] ^ ai[1]) & mi[1]) == 0
+	&& ((xi[2] ^ ai[2]) & mi[2]) == 0
+	&& ((xi[3] ^ ai[3]) & mi[3]) == 0;
+}
+
+inline bool
+IP6Address::mask_as_specific(const IP6Address &mask) const
+{
+    const uint32_t *xi = data32(), *mi = mask.data32();
+    return ((xi[0] & mi[0]) == mi[0] && (xi[1] & mi[1]) == mi[1]
+	    && (xi[2] & mi[2]) == mi[2] && (xi[3] & mi[3]) == mi[3]);
+}
+
+inline IP6Address &
+IP6Address::operator&=(const IP6Address &x)
+{
+    uint32_t *ai = data32();
+    const uint32_t *bi = x.data32();
+    ai[0] &= bi[0];
+    ai[1] &= bi[1];
+    ai[2] &= bi[2];
+    ai[3] &= bi[3];
+    return *this;
+}
+
+inline IP6Address &
+IP6Address::operator&=(const struct in6_addr &x)
+{
+    uint32_t *ai = data32();
+    const uint32_t *bi = (uint32_t *)&x.s6_addr[0];
+    ai[0] &= bi[0];
+    ai[1] &= bi[1];
+    ai[2] &= bi[2];
+    ai[3] &= bi[3];
+    return *this;
+}
+
+inline IP6Address &
+IP6Address::operator|=(const IP6Address &x)
+{
+    uint32_t *ai = data32();
+    const uint32_t *bi = x.data32();
+    ai[0] |= bi[0];
+    ai[1] |= bi[1];
+    ai[2] |= bi[2];
+    ai[3] |= bi[3];
+    return *this;
+}
+
+inline IP6Address &
+IP6Address::operator|=(const struct in6_addr &x)
+{
+    uint32_t *ai = data32();
+    const uint32_t *bi = (uint32_t *)&x.s6_addr;
+    ai[0] |= bi[0];
+    ai[1] |= bi[1];
+    ai[2] |= bi[2];
+    ai[3] |= bi[3];
+    return *this;
+}
+
+inline IP6Address
+operator&(const IP6Address &a, const IP6Address &b)
+{
+    const uint32_t *ai = a.data32(), *bi = b.data32();
+    IP6Address result = IP6Address::uninitialized_t();
+    uint32_t *ri = result.data32();
+    ri[0] = ai[0] & bi[0];
+    ri[1] = ai[1] & bi[1];
+    ri[2] = ai[2] & bi[2];
+    ri[3] = ai[3] & bi[3];
+    return result;
+}
+
+inline IP6Address
+operator&(const struct in6_addr &a, const IP6Address &b)
+{
+    const uint32_t *ai = (const uint32_t *)&a.s6_addr[0], *bi = b.data32();
+    IP6Address result = IP6Address::uninitialized_t();
+    uint32_t *ri = result.data32();
+    ri[0] = ai[0] & bi[0];
+    ri[1] = ai[1] & bi[1];
+    ri[2] = ai[2] & bi[2];
+    ri[3] = ai[3] & bi[3];
+    return result;
+}
+
+inline IP6Address
+operator|(const IP6Address &a, const IP6Address &b)
+{
+    const uint32_t *ai = a.data32(), *bi = b.data32();
+    IP6Address result = IP6Address::uninitialized_t();
+    uint32_t *ri = result.data32();
+    ri[0] = ai[0] | bi[0];
+    ri[1] = ai[1] | bi[1];
+    ri[2] = ai[2] | bi[2];
+    ri[3] = ai[3] | bi[3];
+    return result;
+}
+
+inline IP6Address
+operator~(const IP6Address &x)
+{
+    const uint32_t *ai = x.data32();
+    IP6Address result = IP6Address::uninitialized_t();
+    uint32_t *ri = result.data32();
+    ri[0] = ~ai[0];
+    ri[1] = ~ai[1];
+    ri[2] = ~ai[2];
+    ri[3] = ~ai[3];
+    return result;
+}
+
+inline IP6Address &
+IP6Address::operator=(const struct in6_addr &a)
+{
+    _addr = a;
+    return *this;
+}
+
+inline IP6Address &
+IP6Address::operator=(const struct in_addr &a)
+{
+    memset(&_addr, 0, 10);
+    data16()[5] = 0xffff;
+    data32()[3] = a.s_addr;
+    return *this;
+}
+
+inline uint32_t
+IP6Address::hashcode() const
+{
+    return (data32()[2] << 1) + data32()[3];
+}
+
+#if !CLICK_TOOL
+inline const IP6Address &
+DST_IP6_ANNO(Packet *p)
+{
+    return *reinterpret_cast<IP6Address *>(p->anno_u8() + DST_IP6_ANNO_OFFSET);
+}
+
+inline void
+SET_DST_IP6_ANNO(Packet *p, const IP6Address &a)
+{
+    memcpy(p->anno_u8() + DST_IP6_ANNO_OFFSET, a.data(), DST_IP6_ANNO_SIZE);
+}
+
+inline void
+SET_DST_IP6_ANNO(Packet *p, const struct in6_addr &a)
+{
+    memcpy(p->anno_u8() + DST_IP6_ANNO_OFFSET, &a, DST_IP6_ANNO_SIZE);
+}
+#endif
+
+
+/** @class IP6AddressArg
+  @brief Parser class for IPv6 addresses. */
+struct IP6AddressArg {
+    static const char *basic_parse(const String &str, IP6Address &result,
+				   const ArgContext &args = blank_args);
+    static bool parse(const String &str, IP6Address &result,
+		      const ArgContext &args = blank_args);
+    static bool parse(const String &str, struct in6_addr &result,
+		      const ArgContext &args = blank_args) {
+        return parse(str, reinterpret_cast<IP6Address &>(result), args);
+    }
+
+};
+
+/** @class IP6PrefixArg
+  @brief Parser class for IPv6 address prefixes. */
+class IP6PrefixArg { public:
+    IP6PrefixArg(bool allow_bare_address_ = false)
+	: allow_bare_address(allow_bare_address_) {
+    }
+    bool parse(const String &str, IP6Address &addr, int &prefix_len,
+	       const ArgContext &args = blank_args) const;
+    bool parse(const String &str, IP6Address &addr, IP6Address &prefix,
+	       const ArgContext &args = blank_args) const;
+    bool parse(const String &str, struct in6_addr &addr, struct in6_addr &prefix,
+	       const ArgContext &args = blank_args) const {
+        return parse(str, reinterpret_cast<IP6Address &>(addr),
+                     reinterpret_cast<IP6Address &>(prefix), args);
+    }
+    bool allow_bare_address;
+};
+
+template<> struct DefaultArg<IP6Address> : public IP6AddressArg {};
+template<> struct DefaultArg<struct in6_addr> : public IP6AddressArg {};
+template<> struct has_trivial_copy<IP6Address> : public true_type {};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/ip6flowid.hh b/openflow/include/click/ip6flowid.hh
new file mode 100644
index 0000000..841606a
--- /dev/null
+++ b/openflow/include/click/ip6flowid.hh
@@ -0,0 +1,250 @@
+// -*- c-basic-offset: 2; related-file-name: "../../lib/ip6flowid.cc" -*-
+#ifndef CLICK_IP6FLOWID_HH
+#define CLICK_IP6FLOWID_HH
+#include <click/ip6address.hh>
+#include <click/ipflowid.hh>
+#include <click/hashcode.hh>
+CLICK_DECLS
+class Packet;
+
+class IP6FlowID { public:
+
+    typedef uninitialized_type uninitialized_t;
+
+  /** @brief Construct an empty flow ID.
+   *
+   * The empty flow ID has zero-valued addresses and ports. */
+  inline IP6FlowID();
+
+  /** @brief Construct a flow ID with the given parts.
+   * @param saddr source address
+   * @param sport source port, in network order
+   * @param daddr destination address
+   * @param dport destination port, in network order */
+  inline IP6FlowID(const IP6Address &, uint16_t, const IP6Address &, uint16_t);
+
+  /** @brief Construct an IPv4-Mapped flow ID with the given parts.
+   * @param saddr source address
+   * @param sport source port, in network order
+   * @param daddr destination address
+   * @param dport destination port, in network order
+   *
+   * The IPv4 addresses are converted to IPv4-mapped IPv6 addresses
+   * in the flow. */
+  inline IP6FlowID(const IPAddress &, uint16_t, const IPAddress &, uint16_t);
+
+  /** @brief Construct a flow ID from @a p's ip/ip6_header() and udp_header().
+   * @param p input packet
+   * @param reverse if true, use the reverse of @a p's flow ID
+   *
+   * @pre @a p's ip/ip6_header() must point to an IPv4 or IPv6
+   * header respectively, and @a p's transport header should have
+   * source and destination ports in the UDP-like positions; TCP,
+   * UDP, and DCCP fit the bill. If the packet is IPv4 the IPv4
+   * addresses are converted to IPv4-mapped IPv6 addresses in the flow.*/
+  explicit IP6FlowID(const Packet *, bool reverse = false);
+
+  /** @brief Construct a flow ID from @a ip6h and the following TCP/UDP header.
+   * @param iph IP header
+   * @param reverse if true, use the reverse of @a p's flow ID
+   *
+   * This assumes a single IPv6 header with no extension headers.The
+   * transport header should have source and destination ports in
+   * the UDP-like positions; TCP, UDP, and DCCP fit the bill. */
+  explicit IP6FlowID(const click_ip6 *ip6h, bool reverse = false);
+
+  /** @brief Construct an IPv4-Mapped flow ID from @a iph and the
+   * following TCP/UDP header.
+   * @param iph IP header
+   * @param reverse if true, use the reverse of @a p's flow ID
+   *
+   * The IPv4 header's header length, @a iph->ip_hl, is used to find
+   * the following transport header.  This transport header should
+   * have source and destination ports in the UDP-like positions;
+   * TCP, UDP, and DCCP fit the bill. The IPv4 addresses are
+   * converted ip IPv4-mapped IPv6 addresses in the flow.*/
+  explicit IP6FlowID(const click_ip *iph, bool reverse = false);
+
+  /** @brief Construct an IPv4-Mapped flow ID from the given IPv4 @a flow.
+   * @param flow and IPv4 IPFlowID
+   *
+   * The parameters IPv4 addresses in the IPFlowID converted to
+   * IPv4-mapped IPv6 addresses. */
+  explicit IP6FlowID(const IPFlowID &);
+
+
+  /** @brief Construct an uninitialized flow ID. */
+  inline IP6FlowID(const uninitialized_type &unused) {
+    (void) unused;
+  }
+
+  typedef const IP6Address &(IP6FlowID::*unspecified_bool_type)() const;
+  inline operator unspecified_bool_type() const;
+
+  const IP6Address &saddr() const	{ return _saddr; }
+  const IP6Address &daddr() const	{ return _daddr; }
+  IPAddress saddr4() const		{ return _saddr.ip4_address(); }
+  IPAddress daddr4() const		{ return _daddr.ip4_address(); }
+  uint16_t sport() const		{ return _sport; }
+  uint16_t dport() const		{ return _dport; }
+
+  void set_saddr(const IP6Address &a)	{ _saddr = a; }
+  void set_daddr(const IP6Address &a)	{ _daddr = a; }
+  void set_saddr(const IPAddress a)	{ _saddr = a; }
+  void set_daddr(const IPAddress a)	{ _daddr = a; }
+  void set_sport(uint16_t p)		{ _sport = p; }
+  void set_dport(uint16_t p)		{ _dport = p; }
+
+  /** @brief Set this flow to the given value.
+   * @param saddr source address
+   * @param sport source port, in network order
+   * @param daddr destination address
+   * @param dport destination port, in network order */
+  void assign(const IP6Address &saddr, uint16_t sport, const IP6Address &daddr, uint16_t dport) {
+    _saddr = saddr;
+    _daddr = daddr;
+    _sport = sport;
+    _dport = dport;
+  }
+
+  /** @brief Set this flow to the given values using IPv4-mapped addresses.
+   * @param saddr source address
+   * @param sport source port, in network order
+   * @param daddr destination address
+   * @param dport destination port, in network order */
+  void assign(IPAddress saddr, uint16_t sport, IPAddress daddr, uint16_t dport) {
+    _saddr = saddr;
+    _daddr = daddr;
+    _sport = sport;
+    _dport = dport;
+  }
+
+  inline IP6FlowID reverse() const;
+  inline IP6FlowID rev() const CLICK_DEPRECATED;
+
+  /** @brief Indicate if this flow is IPv4.
+   * @return true iff the flow is IPv4 */
+  inline bool is_ip4_mapped() const { return _saddr.is_ip4_mapped(); }
+
+  /** @brief Return IPv4 version of a IPv4-mapped IP6FlowID.
+   *
+   * @return non-empty IPFlowID address iff this flow is using
+   *  IPv4-mapped addresses.  IPFlowID() otherwise */
+  IPFlowID flow_id4() const;
+
+  /** @brief Return this IP6FlowID
+   *
+   * @return this IP6FlowID */
+  IP6FlowID flow_id6() const;
+
+  inline IP6FlowID &operator=(const IPFlowID &);
+
+  inline hashcode_t hashcode() const;
+
+  String unparse() const;
+  operator String() const		{ return unparse(); }
+  String s() const			{ return unparse(); }
+
+ protected:
+
+  // note: several functions depend on this field order!
+  IP6Address _saddr;
+  IP6Address _daddr;
+  uint16_t _sport;			// network byte order
+  uint16_t _dport;			// network byte order
+
+};
+
+inline
+IP6FlowID::IP6FlowID()
+  : _saddr(), _daddr(), _sport(0), _dport(0)
+{
+}
+
+inline
+IP6FlowID::IP6FlowID(const IP6Address &saddr, uint16_t sport,
+		     const IP6Address &daddr, uint16_t dport)
+  : _saddr(saddr), _daddr(daddr), _sport(sport), _dport(dport)
+{
+}
+
+inline
+IP6FlowID::IP6FlowID(const IPAddress &saddr, uint16_t sport,
+		     const IPAddress &daddr, uint16_t dport)
+  : _saddr(saddr), _daddr(daddr), _sport(sport), _dport(dport)
+{
+}
+
+inline
+IP6FlowID::IP6FlowID(const IPFlowID &flow)
+{
+  *this = flow;
+}
+
+inline
+IP6FlowID::operator unspecified_bool_type() const
+{
+  return _saddr || _daddr ? &IP6FlowID::saddr : 0;
+}
+
+inline IP6FlowID
+IP6FlowID::reverse() const
+{
+  return IP6FlowID(_daddr, _dport, _saddr, _sport);
+}
+
+inline IP6FlowID
+IP6FlowID::rev() const
+{
+  return reverse();
+}
+
+inline IP6FlowID &
+IP6FlowID::operator=(const IPFlowID &f)
+{
+  assign(f.saddr(), f.sport(), f.daddr(), f.dport());
+  return *this;
+}
+
+#define ROT(v, r) ((v)<<(r) | ((unsigned)(v))>>(32-(r)))
+
+#if 0
+inline hashcode_t
+IP6FlowID::hashcode() const
+{
+  return (ROT(_saddr.hashcode(), 13)
+	  ^ ROT(_daddr.hashcode(), 23) ^ (_sport | (_dport<<16)));
+}
+#endif
+
+inline hashcode_t IP6FlowID::hashcode() const
+{
+  // more complicated hashcode, but causes less collision
+  uint16_t s = ntohs(sport());
+  uint16_t d = ntohs(dport());
+  hashcode_t sx = CLICK_NAME(hashcode)(saddr());
+  hashcode_t dx = CLICK_NAME(hashcode)(daddr());
+  return (ROT(sx, s%16)
+          ^ ROT(dx, 31-d%16))
+	  ^ ((d << 16) | s);
+}
+
+#undef ROT
+
+StringAccum &operator<<(StringAccum &sa, const IP6FlowID &flow_id);
+
+inline bool
+operator==(const IP6FlowID &a, const IP6FlowID &b)
+{
+  return a.dport() == b.dport() && a.sport() == b.sport()
+    && a.daddr() == b.daddr() && a.saddr() == b.saddr();
+}
+
+inline bool
+operator!=(const IP6FlowID &a, const IP6FlowID &b)
+{
+  return !(a == b);
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/ip6table.hh b/openflow/include/click/ip6table.hh
new file mode 100644
index 0000000..e69fe6f
--- /dev/null
+++ b/openflow/include/click/ip6table.hh
@@ -0,0 +1,39 @@
+// -*- c-basic-offset: 2; related-file-name: "../../lib/ip6table.cc" -*-
+#ifndef CLICK_IP6TABLE_HH
+#define CLICK_IP6TABLE_HH
+#include <click/glue.hh>
+#include <click/vector.hh>
+#include <click/ip6address.hh>
+CLICK_DECLS
+
+// IP6 routing table.
+// Lookup by longest prefix.
+// Each entry contains a gateway and an output index.
+
+class IP6Table { public:
+
+  IP6Table();
+  ~IP6Table();
+
+  bool lookup(const IP6Address &dst, IP6Address &gw, int &index) const;
+
+  void add(const IP6Address &dst, const IP6Address &mask, const IP6Address &gw, int index);
+  void del(const IP6Address &dst, const IP6Address &mask);
+  void clear()				{ _v.clear(); }
+  String dump();
+
+ private:
+
+  struct Entry {
+    IP6Address _dst;
+    IP6Address _mask;
+    IP6Address _gw;
+    int _index;
+    int _valid;
+  };
+  Vector<Entry> _v;
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/ipaddress.hh b/openflow/include/click/ipaddress.hh
new file mode 100644
index 0000000..589b9c2
--- /dev/null
+++ b/openflow/include/click/ipaddress.hh
@@ -0,0 +1,419 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/ipaddress.cc" -*-
+#ifndef CLICK_IPADDRESS_HH
+#define CLICK_IPADDRESS_HH
+#include <click/string.hh>
+#include <click/glue.hh>
+#include <click/type_traits.hh>
+#include <clicknet/ip.h>
+CLICK_DECLS
+class StringAccum;
+class ArgContext;
+extern const ArgContext blank_args;
+class IPAddressArg;
+template <typename T> class Vector;
+
+class IPAddress { public:
+
+    typedef uninitialized_type uninitialized_t;
+
+    /** @brief Construct an IPAddress equal to 0.0.0.0. */
+    inline IPAddress()
+	: _addr(0) {
+    }
+
+    /** @brief Construct an IPAddress from an integer in network byte order. */
+    inline IPAddress(unsigned x)
+	: _addr(x) {
+    }
+    /** @overload */
+    explicit inline IPAddress(int x)
+	: _addr(x) {
+    }
+    /** @overload */
+    explicit inline IPAddress(unsigned long x)
+	: _addr(x) {
+    }
+    /** @overload */
+    explicit inline IPAddress(long x)
+	: _addr(x) {
+    }
+
+    /** @brief Construct an IPAddress from a struct in_addr. */
+    inline IPAddress(struct in_addr x)
+	: _addr(x.s_addr) {
+    }
+
+    /** @brief Construct an IPAddress from data.
+     * @param data the address data, in network byte order
+     *
+     * Bytes data[0]...data[3] are used to construct the address. */
+    explicit IPAddress(const unsigned char *data) {
+#if HAVE_INDIFFERENT_ALIGNMENT
+	_addr = *(reinterpret_cast<const unsigned *>(data));
+#else
+	memcpy(&_addr, data, 4);
+#endif
+    }
+
+    /** @brief Constructs an IPAddress from a human-readable dotted-quad
+     * representation.
+     *
+     * If @a x is not a valid dotted-quad address, then the IPAddress is
+     * initialized to 0.0.0.0. */
+    explicit IPAddress(const String &x);
+
+    /** @brief Construct an uninitialized IPAddress. */
+    inline IPAddress(const uninitialized_type &unused) {
+	(void) unused;
+    }
+
+    /** @brief Return an IPAddress equal to the prefix mask of length @a
+     * prefix.
+     * @param prefix_len prefix length; 0 <= @a prefix_len <= 32
+     *
+     * For example, make_prefix(0) is 0.0.0.0, make_prefix(8) is 255.0.0.0, and
+     * make_prefix(32) is 255.255.255.255.  Causes an assertion failure if @a
+     * prefix_len is out of range.
+     * @sa mask_to_prefix_len */
+    static IPAddress make_prefix(int prefix_len);
+
+    /** @brief Return the broadcast IP address, 255.255.255.255. */
+    static inline IPAddress make_broadcast() {
+	return IPAddress(0xFFFFFFFF);
+    }
+
+    /** @brief Test if the address is 0.0.0.0. */
+    inline bool empty() const {
+	return !_addr;
+    }
+
+    /** @brief Return the address as a uint32_t in network byte order. */
+    inline uint32_t addr() const {
+	return _addr;
+    }
+
+    /** @brief Return the address as a uint32_t in network byte order.
+     *
+     * Also suitable for use as an operator bool, returning true iff
+     * the address is not 0.0.0.0. */
+    inline operator uint32_t() const {
+	return _addr;
+    }
+
+    /** @brief Return true iff the address is a multicast address.
+     *
+     * These are the class D addresses, 224.0.0.0-239.255.255.255. */
+    inline bool is_multicast() const {
+	return (_addr & htonl(0xF0000000U)) == htonl(0xE0000000U);
+    }
+
+    inline bool is_link_local() const {
+	return (_addr & htonl(0xFFFF0000)) == htonl(0xA9FE0000);
+    }
+
+    inline struct in_addr in_addr() const;
+    inline operator struct in_addr() const;
+
+    inline unsigned char* data();
+    inline const unsigned char* data() const;
+
+    inline uint32_t hashcode() const;
+
+    int mask_to_prefix_len() const;
+    inline bool matches_prefix(IPAddress addr, IPAddress mask) const;
+    inline bool mask_as_specific(IPAddress mask) const;
+    inline bool mask_more_specific(IPAddress mask) const;
+
+    // bool operator==(IPAddress, IPAddress);
+    // bool operator==(IPAddress, uint32_t);
+    // bool operator!=(IPAddress, IPAddress);
+    // bool operator!=(IPAddress, uint32_t);
+
+    // IPAddress operator&(IPAddress, IPAddress);
+    // IPAddress operator|(IPAddress, IPAddress);
+    // IPAddress operator^(IPAddress, IPAddress);
+    // IPAddress operator~(IPAddress);
+
+    inline IPAddress& operator&=(IPAddress);
+    inline IPAddress& operator|=(IPAddress);
+    inline IPAddress& operator^=(IPAddress);
+
+    String unparse() const;
+    String unparse_mask() const;
+    String unparse_with_mask(IPAddress) const;
+
+    inline String s() const;
+    inline operator String() const CLICK_DEPRECATED;
+
+    typedef IPAddress parameter_type;
+
+  private:
+
+    uint32_t _addr;
+
+};
+
+
+/** @relates IPAddress
+    @brief Compare two IPAddress objects for equality. */
+inline bool
+operator==(IPAddress a, IPAddress b)
+{
+    return a.addr() == b.addr();
+}
+
+/** @relates IPAddress
+    @brief Compare an IPAddress with a network-byte-order address value for
+    equality.
+    @param a an address
+    @param b an address value in network byte order */
+inline bool
+operator==(IPAddress a, uint32_t b)
+{
+    return a.addr() == b;
+}
+
+/** @relates IPAddress
+    @brief Compare two IPAddress objects for inequality. */
+inline bool
+operator!=(IPAddress a, IPAddress b)
+{
+    return a.addr() != b.addr();
+}
+
+/** @relates IPAddress
+    @brief Compare an IPAddress with a network-byte-order address value for
+    inequality.
+    @param a an address
+    @param b an address value in network byte order */
+inline bool
+operator!=(IPAddress a, uint32_t b)
+{
+    return a.addr() != b;
+}
+
+/** @brief Return a pointer to the address data.
+
+    Since the address is stored in network byte order, data()[0] is the top 8
+    bits of the address, data()[1] the next 8 bits, and so forth. */
+inline const unsigned char*
+IPAddress::data() const
+{
+    return reinterpret_cast<const unsigned char*>(&_addr);
+}
+
+/** @brief Return a pointer to the address data.
+
+    Since the address is stored in network byte order, data()[0] is the top 8
+    bits of the address, data()[1] the next 8 bits, and so forth. */
+inline unsigned char*
+IPAddress::data()
+{
+    return reinterpret_cast<unsigned char*>(&_addr);
+}
+
+/** @brief Return a struct in_addr corresponding to the address. */
+inline struct in_addr
+IPAddress::in_addr() const
+{
+    struct in_addr ia;
+    ia.s_addr = _addr;
+    return ia;
+}
+
+/** @brief Return a struct in_addr corresponding to the address. */
+inline
+IPAddress::operator struct in_addr() const
+{
+    return in_addr();
+}
+
+StringAccum& operator<<(StringAccum&, IPAddress);
+
+/** @brief Return true iff this address matches the address prefix
+    @a addr/@a mask.
+    @param addr prefix address
+    @param mask prefix mask
+
+    Equivalent to (@a addr & @a mask) == (*this & @a mask).  The prefix address
+    @a addr may be nonzero outside the @a mask. */
+inline bool
+IPAddress::matches_prefix(IPAddress addr, IPAddress mask) const
+{
+    return ((this->addr() ^ addr.addr()) & mask.addr()) == 0;
+}
+
+/** @brief Return true iff this address, considered as a prefix mask, is at
+    least as specific as @a mask.
+    @param mask prefix mask
+
+    Longer prefix masks are more specific than shorter ones.  For example,
+    make_prefix(20).mask_as_specific(make_prefix(18)) is true, but
+    make_prefix(10).mask_as_specific(make_prefix(14)) is false.
+
+    Equivalent to (*this & @a mask) == @a mask. */
+inline bool
+IPAddress::mask_as_specific(IPAddress mask) const
+{
+    return (addr() & mask.addr()) == mask.addr();
+}
+
+/** @brief Return true iff this prefix mask is more specific than @a mask.
+    @param mask prefix mask
+
+    Both this address and @a mask must be prefix masks -- i.e.,
+    mask_to_prefix_len() returns 0-32.  Returns true iff this address contains
+    a longer prefix than @a mask.  For example,
+    make_prefix(20).mask_more_specific(make_prefix(18)) is true, but
+    make_prefix(20).mask_more_specific(make_prefix(20)) is false. */
+inline bool
+IPAddress::mask_more_specific(IPAddress mask) const
+{
+    return ((addr() << 1) & mask.addr()) == mask.addr();
+}
+
+/** @relates IPAddress
+    @brief Calculate the IPAddress representing the bitwise-and of @a a and
+    @a b. */
+inline IPAddress
+operator&(IPAddress a, IPAddress b)
+{
+    return IPAddress(a.addr() & b.addr());
+}
+
+/** @brief Assign this address to its bitwise-and with @a a. */
+inline IPAddress&
+IPAddress::operator&=(IPAddress a)
+{
+    _addr &= a._addr;
+    return *this;
+}
+
+/** @relates IPAddress
+    @brief Calculate the IPAddress representing the bitwise-or of @a a and
+    @a b. */
+inline IPAddress
+operator|(IPAddress a, IPAddress b)
+{
+    return IPAddress(a.addr() | b.addr());
+}
+
+/** @brief Assign this address to its bitwise-or with @a a. */
+inline IPAddress&
+IPAddress::operator|=(IPAddress a)
+{
+    _addr |= a._addr;
+    return *this;
+}
+
+/** @relates IPAddress
+    @brief Calculate the IPAddress representing the bitwise-xor of @a a and
+    @a b. */
+inline IPAddress
+operator^(IPAddress a, IPAddress b)
+{
+    return IPAddress(a.addr() ^ b.addr());
+}
+
+/** @brief Assign this address to its bitwise-xor with @a a. */
+inline IPAddress&
+IPAddress::operator^=(IPAddress a)
+{
+    _addr ^= a._addr;
+    return *this;
+}
+
+/** @relates IPAddress
+    @brief Calculate the IPAddress representing the bitwise complement
+    of @a a. */
+inline IPAddress
+operator~(IPAddress a)
+{
+    return IPAddress(~a.addr());
+}
+
+/** @brief Hash function.
+ * @return The hash value of this IPAddress.
+ *
+ * Equal IPAddress objects always have equal hashcode() values.
+ */
+inline uint32_t
+IPAddress::hashcode() const
+{
+    return addr();
+}
+
+/** @brief Unparse this address into a dotted-quad format String.
+    @deprecated The unparse() function should be preferred to this cast.
+    @sa unparse */
+inline
+IPAddress::operator String() const
+{
+    return unparse();
+}
+
+/** @brief Unparse this address into a dotted-quad format String.
+    @deprecated The unparse() function should be preferred to s().
+    @sa unparse */
+inline String
+IPAddress::s() const
+{
+    return unparse();
+}
+
+
+/** @class IPAddressArg
+  @brief Parser class for IPv4 addresses. */
+class IPAddressArg { public:
+    static const char *basic_parse(const char *begin, const char *end,
+				   unsigned char value[4], int &nbytes);
+    static bool parse(const String &str, IPAddress &result,
+		      const ArgContext &args = blank_args);
+    static bool parse(const String &str, struct in_addr &result,
+		      const ArgContext &args = blank_args) {
+	return parse(str, reinterpret_cast<IPAddress &>(result), args);
+    }
+    static bool parse(const String &str, Vector<IPAddress> &result,
+		      const ArgContext &args = blank_args);
+};
+
+/** @class IPPrefixArg
+  @brief Parser class for IPv4 prefixes. */
+class IPPrefixArg { public:
+    IPPrefixArg(bool allow_bare_address_ = false)
+	: allow_bare_address(allow_bare_address_) {
+    }
+    bool parse(const String &str,
+	       IPAddress &result_addr, IPAddress &result_mask,
+	       const ArgContext &args = blank_args) const;
+    bool parse(const String &str,
+	       struct in_addr &result_addr, struct in_addr &result_mask,
+	       const ArgContext &args = blank_args) const {
+	return parse(str, reinterpret_cast<IPAddress &>(result_addr),
+		     reinterpret_cast<IPAddress &>(result_mask), args);
+    }
+    bool allow_bare_address;
+};
+
+template<> struct DefaultArg<IPAddress> : public IPAddressArg {};
+template<> struct DefaultArg<struct in_addr> : public IPAddressArg {};
+template<> struct DefaultArg<Vector<IPAddress> > : public IPAddressArg {};
+/* template<> struct has_trivial_copy<IPAddress> : public true_type {}; -- in type_traits.hh */
+
+
+/** @class IPPortArg
+  @brief Parser class for TCP/UDP ports.
+
+  The constructor argument is the relevant IP protocol. */
+class IPPortArg { public:
+    IPPortArg(int p)
+	: ip_p(p) {
+	assert(ip_p > 0 && ip_p < 256);
+    }
+    bool parse(const String &str, uint16_t &result,
+	       const ArgContext &args = blank_args) const;
+    int ip_p;
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/ipaddresslist.hh b/openflow/include/click/ipaddresslist.hh
new file mode 100644
index 0000000..4f2df93
--- /dev/null
+++ b/openflow/include/click/ipaddresslist.hh
@@ -0,0 +1 @@
+#error "The IPAddressList class is no longer available.  Use Vector<IPAddress> instead."
diff --git a/openflow/include/click/ipflowid.hh b/openflow/include/click/ipflowid.hh
new file mode 100644
index 0000000..5b89cfe
--- /dev/null
+++ b/openflow/include/click/ipflowid.hh
@@ -0,0 +1,192 @@
+// -*- related-file-name: "../../lib/ipflowid.cc" -*-
+#ifndef CLICK_IPFLOWID_HH
+#define CLICK_IPFLOWID_HH
+#include <click/ipaddress.hh>
+#include <click/hashcode.hh>
+CLICK_DECLS
+class Packet;
+
+class IPFlowID { public:
+
+    typedef uninitialized_type uninitialized_t;
+
+
+    /** @brief Construct an empty flow ID.
+     *
+     * The empty flow ID has zero-valued addresses and ports. */
+    IPFlowID()
+	: _saddr(), _daddr(), _sport(0), _dport(0) {
+    }
+
+    /** @brief Construct a flow ID with the given parts.
+     * @param saddr source address
+     * @param sport source port, in network order
+     * @param daddr destination address
+     * @param dport destination port, in network order */
+    IPFlowID(IPAddress saddr, uint16_t sport, IPAddress daddr, uint16_t dport)
+	: _saddr(saddr), _daddr(daddr), _sport(sport), _dport(dport) {
+    }
+
+    /** @brief Construct a flow ID from @a p's ip_header() and udp_header().
+     * @param p input packet
+     * @param reverse if true, use the reverse of @a p's flow ID
+     *
+     * @pre @a p's ip_header() must point to a first-fragment IPv4 header, and
+     * @a p's transport header should have source and destination ports in the
+     * UDP-like positions; TCP, UDP, and DCCP fit the bill. */
+    explicit IPFlowID(const Packet *p, bool reverse = false);
+
+    /** @brief Construct a flow ID from @a iph and the following TCP/UDP header.
+     * @param iph IP header
+     * @param reverse if true, use the reverse of @a p's flow ID
+     *
+     * The IP header's header length, @a iph->ip_hl, is used to find the
+     * following transport header.  This transport header should have source
+     * and destination ports in the UDP-like positions; TCP, UDP, and DCCP fit
+     * the bill. */
+    explicit IPFlowID(const click_ip *iph, bool reverse = false);
+
+    /** @brief Construct an uninitialized flow ID. */
+    inline IPFlowID(const uninitialized_type &unused) {
+	(void) unused;
+    }
+
+
+    typedef IPAddress (IPFlowID::*unspecified_bool_type)() const;
+    /** @brief Return true iff the addresses of this flow ID are zero. */
+    operator unspecified_bool_type() const {
+	return _saddr || _daddr ? &IPFlowID::saddr : 0;
+    }
+
+
+    /** @brief Return this flow's source address. */
+    IPAddress saddr() const {
+	return _saddr;
+    }
+    /** @brief Return this flow's source port, in network order. */
+    uint16_t sport() const {
+	return _sport;
+    }
+    /** @brief Return this flow's destination address. */
+    IPAddress daddr() const {
+	return _daddr;
+    }
+    /** @brief Return this flow's destination port, in network order. */
+    uint16_t dport() const {
+	return _dport;
+    }
+
+    /** @brief Set this flow's source address to @a a. */
+    void set_saddr(IPAddress a) {
+	_saddr = a;
+    }
+    /** @brief Set this flow's source port to @a p.
+     * @note @a p should be in network order. */
+    void set_sport(uint16_t p) {
+	_sport = p;
+    }
+    /** @brief Set this flow's destination address to @a a. */
+    void set_daddr(IPAddress a) {
+	_daddr = a;
+    }
+    /** @brief Set this flow's destination port to @a p.
+     * @note @a p should be in network order. */
+    void set_dport(uint16_t p) {
+	_dport = p;
+    }
+
+    /** @brief Set this flow to the given value.
+     * @param saddr source address
+     * @param sport source port, in network order
+     * @param daddr destination address
+     * @param dport destination port, in network order */
+    void assign(IPAddress saddr, uint16_t sport, IPAddress daddr, uint16_t dport) {
+	_saddr = saddr;
+	_daddr = daddr;
+	_sport = sport;
+	_dport = dport;
+    }
+
+
+    /** @brief Return this flow's reverse, which swaps sources and destinations.
+     * @return IPFlowID(daddr(), dport(), saddr(), sport()) */
+    IPFlowID reverse() const {
+	return IPFlowID(_daddr, _dport, _saddr, _sport);
+    }
+    inline IPFlowID rev() const CLICK_DEPRECATED;
+
+    /** @brief Hash function.
+     * @return The hash value of this IPFlowID.
+     *
+     * Equal IPFlowID objects always have equal hashcode() values. */
+    inline hashcode_t hashcode() const;
+
+    /** @brief Unparse this address into a String.
+     *
+     * Returns a string with formatted like "(SADDR, SPORT, DADDR, DPORT)". */
+    String unparse() const;
+
+    inline operator String() const CLICK_DEPRECATED;
+    inline String s() const CLICK_DEPRECATED;
+
+  protected:
+
+    // note: several functions depend on this field order!
+    IPAddress _saddr;
+    IPAddress _daddr;
+    uint16_t _sport;			// network byte order
+    uint16_t _dport;			// network byte order
+
+    int unparse(char *s) const;
+    friend StringAccum &operator<<(StringAccum &sa, const IPFlowID &flow_id);
+
+};
+
+
+inline IPFlowID IPFlowID::rev() const
+{
+    return reverse();
+}
+
+
+#define ROT(v, r) ((v)<<(r) | ((unsigned)(v))>>(32-(r)))
+
+inline hashcode_t IPFlowID::hashcode() const
+{
+    // more complicated hashcode, but causes less collision
+    uint16_t s = ntohs(sport());
+    uint16_t d = ntohs(dport());
+    hashcode_t sx = CLICK_NAME(hashcode)(saddr());
+    hashcode_t dx = CLICK_NAME(hashcode)(daddr());
+    return (ROT(sx, (s % 16) + 1) ^ ROT(dx, 31 - (d % 16)))
+	^ ((d << 16) | s);
+}
+
+#undef ROT
+
+inline bool operator==(const IPFlowID &a, const IPFlowID &b)
+{
+    return a.sport() == b.sport() && a.dport() == b.dport()
+	&& a.saddr() == b.saddr() && a.daddr() == b.daddr();
+}
+
+inline bool operator!=(const IPFlowID &a, const IPFlowID &b)
+{
+    return a.sport() != b.sport() || a.dport() != b.dport()
+	|| a.saddr() != b.saddr() || a.daddr() != b.daddr();
+}
+
+StringAccum &operator<<(StringAccum &, const IPFlowID &);
+
+inline IPFlowID::operator String() const
+{
+    return unparse();
+}
+
+inline String IPFlowID::s() const
+{
+    return unparse();
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/iptable.hh b/openflow/include/click/iptable.hh
new file mode 100644
index 0000000..0793a97
--- /dev/null
+++ b/openflow/include/click/iptable.hh
@@ -0,0 +1,38 @@
+// -*- c-basic-offset: 2; related-file-name: "../../lib/iptable.cc" -*-
+#ifndef CLICK_IPTABLE_HH
+#define CLICK_IPTABLE_HH
+#include <click/glue.hh>
+#include <click/vector.hh>
+#include <click/ipaddress.hh>
+CLICK_DECLS
+
+// IP routing table.
+// Lookup by longest prefix.
+// Each entry contains a gateway and an output index.
+
+class IPTable { public:
+
+  IPTable();
+  ~IPTable();
+
+  bool lookup(IPAddress dst, IPAddress &gw, int &index) const;
+
+  void add(IPAddress dst, IPAddress mask, IPAddress gw, int index);
+  void del(IPAddress dst, IPAddress mask);
+  void clear()				{ _v.clear(); }
+
+ private:
+
+  struct Entry {
+    IPAddress dst;
+    IPAddress mask;
+    IPAddress gw;
+    int index;
+    bool valid() const			{ return mask || !dst; }
+  };
+  Vector<Entry> _v;
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/lexer.hh b/openflow/include/click/lexer.hh
new file mode 100644
index 0000000..bbef9af
--- /dev/null
+++ b/openflow/include/click/lexer.hh
@@ -0,0 +1,252 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/lexer.cc" -*-
+#ifndef CLICK_LEXER_HH
+#define CLICK_LEXER_HH
+#include <click/hashtable.hh>
+#include <click/router.hh>
+#include <click/glue.hh>
+#include <click/variableenv.hh>
+CLICK_DECLS
+class LexerExtra;
+
+enum Lexemes {
+    lexEOF = 0,
+    lexIdent = 256,		// see also Lexer::lexeme_string
+    lexVariable,
+    lexArrow,
+    lex2Arrow,
+    lex2Colon,
+    lex2Bar,
+    lex3Dot,
+    lexElementclass,
+    lexRequire,
+    lexProvide,
+    lexDefine
+};
+
+class Lexeme { public:
+
+    Lexeme()
+	: _kind(lexEOF) {
+    }
+    Lexeme(int k, const String &s, bool compact = false)
+	: _kind(k), _s(compact ? s.compact() : s) {
+    }
+
+    int kind() const			{ return _kind; }
+    bool is(int k) const		{ return _kind == k; }
+
+    const String &string() const	{ return _s; }
+    String &string()			{ return _s; }
+
+  private:
+
+    int _kind;
+    String _s;
+
+};
+
+class Lexer { public:
+
+    enum { TUNNEL_TYPE = 0, ERROR_TYPE = 1 };
+
+    class TunnelEnd;
+    class Compound;
+    typedef Router::Port Port;
+    typedef Router::Connection Connection;
+
+    Lexer();
+    virtual ~Lexer();
+
+    int begin_parse(const String &data, const String &filename, LexerExtra *, ErrorHandler * = 0);
+    void end_parse(int);
+
+    VariableEnvironment &global_scope()	{ return _global_scope; }
+    ErrorHandler *errh() const		{ return _errh; }
+
+    String remaining_text() const;
+    void set_remaining_text(const String &);
+
+    Lexeme lex() {
+	return _unlex_pos ? _unlex[--_unlex_pos] : next_lexeme();
+    }
+    void unlex(const Lexeme &t) {
+	assert(_unlex_pos < UNLEX_SIZE);
+	_unlex[_unlex_pos++] = t;
+    }
+    String lex_config() {
+	assert(!_unlex_pos);
+	return _file.lex_config(this);
+    }
+
+    bool expect(int, bool no_error = false);
+
+    typedef Element *(*ElementFactory)(uintptr_t);
+#ifdef CLICK_LINUXMODULE
+    int add_element_type(const String &, ElementFactory factory, uintptr_t thunk, struct module *module, bool scoped = false);
+#else
+    int add_element_type(const String &, ElementFactory factory, uintptr_t thunk, bool scoped = false);
+#endif
+    int element_type(const String &name) const {
+	return _element_type_map[name];
+    }
+    int force_element_type(String name, bool report_error = true);
+
+    void element_type_names(Vector<String> &) const;
+
+    int remove_element_type(int t)	{ return remove_element_type(t, 0); }
+
+    String element_name(int) const;
+    String element_landmark(int) const;
+
+    void add_tunnels(String name, int *eidexes);
+
+    bool ydone() const			{ return !_ps; }
+    void ystep();
+
+    Router *create_router(Master *);
+
+  private:
+
+    enum {
+	max_depth = 50
+    };
+
+    struct FileState {
+	String _big_string;
+	const char *_end;
+	const char *_pos;
+	String _filename;
+	String _original_filename;
+	unsigned _lineno;
+
+	FileState(const String &data, const String &filename);
+	const char *skip_line(const char *s);
+	const char *skip_slash_star(const char *s);
+	const char *skip_backslash_angle(const char *s);
+	const char *skip_quote(const char *s, char end_c);
+	const char *process_line_directive(const char *s, Lexer *lexer);
+	Lexeme next_lexeme(Lexer *lexer);
+	String lex_config(Lexer *lexer);
+	String landmark() const;
+    };
+
+    struct ElementState;
+    struct ParseState;
+
+    // lexer
+    FileState _file;
+    bool _compact_config;
+    LexerExtra *_lextra;
+
+    Lexeme next_lexeme() {
+	return _file.next_lexeme(this);
+    }
+    static String lexeme_string(int);
+
+    // parser
+    enum { UNLEX_SIZE = 2 };
+    Lexeme _unlex[2];
+    int _unlex_pos;
+
+    // element types
+    struct ElementType {
+	ElementFactory factory;
+	uintptr_t thunk;
+#ifdef CLICK_LINUXMODULE
+	struct module *module;
+#endif
+	String name;
+	int next;
+
+        inline Compound* compound() const {
+            if (factory == compound_element_factory)
+                return reinterpret_cast<Compound*>(thunk);
+            else
+                return 0;
+        }
+    };
+    HashTable<String, int> _element_type_map;
+    Vector<ElementType> _element_types;
+    enum { ET_SCOPED = 0x80000000, ET_TMASK = 0x7FFFFFFF, ET_NULL = 0x7FFFFFFF };
+    int _last_element_type;
+    int _free_element_type;
+    VariableEnvironment _global_scope;
+
+    // elements
+    Compound *_c;
+    ParseState *_ps;
+    int _group_depth;
+
+    Vector<TunnelEnd *> _tunnels;
+
+    // compound elements
+    int _anonymous_offset;
+
+    // requirements
+    Vector<String> _requirements;
+    Vector<String> _libraries;
+
+    // errors
+    ErrorHandler *_errh;
+
+    int lerror(const char *, ...);
+    int lerror_syntax(const Lexeme &t);
+
+    String anon_element_name(const String &) const;
+    int get_element(String name, int etype,
+		    const String &configuration = String(),
+		    const String &filename = String(), unsigned lineno = 0);
+    int lexical_scoping_in() const;
+    void lexical_scoping_out(int);
+    int remove_element_type(int, int *);
+    int make_compound_element(int);
+    void expand_compound_element(int, VariableEnvironment &);
+    void add_router_connections(int, const Vector<int> &);
+    static Element* compound_element_factory(uintptr_t);
+
+    void yport(bool isoutput);
+    void yelement_name();
+    void yelement_type(int type, bool this_ident, bool this_implicit);
+    void yelement_config(ElementState *e, bool this_implicit);
+    void yelement_next();
+
+    void yconnection_connector();
+    void yconnection_check_useless(const Vector<int> &x, bool isoutput);
+    static void yconnection_analyze_ports(const Vector<int> &x, bool isoutput,
+					  int &min_ports, int &expandable);
+    void yconnection_connect_all(Vector<int> &outputs, Vector<int> &inputs, int connector);
+
+    void ycompound_arguments(Compound *ct);
+    void ycompound();
+    void ycompound_next();
+    void ycompound_end(const Lexeme &t);
+    void ygroup();
+    void ygroup_end();
+
+    void yelementclass();
+    void yrequire();
+    void yrequire_library(const String &value);
+    void yvar();
+
+    void ystatement();
+
+    TunnelEnd *find_tunnel(const Port &p, bool isoutput, bool insert);
+    void expand_connection(const Port &p, bool isoutput, Vector<Port> &);
+
+    friend class Compound;
+    friend class TunnelEnd;
+    friend struct FileState;
+
+};
+
+class LexerExtra { public:
+
+    LexerExtra()			{ }
+    virtual ~LexerExtra()		{ }
+
+    virtual void require(String type, String value, ErrorHandler *errh);
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/libdivide.h b/openflow/include/click/libdivide.h
new file mode 100644
index 0000000..33f2f92
--- /dev/null
+++ b/openflow/include/click/libdivide.h
@@ -0,0 +1,342 @@
+// libdivide.h
+// Copyright 2010 - 2016 ridiculous_fish
+
+/*
+  libdivide
+  Copyright (C) 2010 ridiculous_fish
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+libdivide@ridiculousfish.com
+*/
+/* modified from https://github.com/ridiculousfish/libdivide for click */
+
+#ifndef CLICK_LIBDIVIDE_H
+#define CLICK_LIBDIVIDE_H
+#include <click/glue.hh>
+#include <click/integers.hh>
+CLICK_DECLS
+
+#ifndef __has_builtin
+#define __has_builtin(x) 0 // Compatibility with non-clang compilers.
+#endif
+
+#if defined(__SIZEOF_INT128__)
+#define HAS_INT128_T 1
+#endif
+
+#if defined(__x86_64__) || defined(_WIN64) || defined(_M_X64)
+#define LIBDIVIDE_IS_X86_64 1
+#endif
+
+#if defined(__i386__)
+#define LIBDIVIDE_IS_i386 1
+#endif
+
+#if __GNUC__ || __clang__
+#define LIBDIVIDE_GCC_STYLE_ASM 1
+#endif
+
+#define LIBDIVIDE_ASSERT(x) assert(x)
+
+// Explanation of "more" field: bit 6 is whether to use shift path. If we are
+// using the shift path, bit 7 is whether the divisor is negative in the signed
+// case; in the unsigned case it is 0. Bits 0-4 is shift value (for shift
+// path or mult path).  In 32 bit case, bit 5 is always 0. We use bit 7 as the
+// "negative divisor indicator" so that we can use sign extension to
+// efficiently go to a full-width -1.
+//
+// u32: [0-4] shift value
+//      [5] ignored
+//      [6] add indicator
+//      [7] shift path
+//
+// s32: [0-4] shift value
+//      [5] shift path
+//      [6] add indicator
+//      [7] indicates negative divisor
+//
+// u64: [0-5] shift value
+//      [6] add indicator
+//      [7] shift path
+//
+// s64: [0-5] shift value
+//      [6] add indicator
+//      [7] indicates negative divisor
+//      magic number of 0 indicates shift path (we ran out of bits!)
+//
+// In s32 and s64 branchfree modes, the magic number is negated according to
+// whether the divisor is negated. In branchfree strategy, it is not negated.
+
+enum {
+    LIBDIVIDE_32_SHIFT_MASK = 0x1F,
+    LIBDIVIDE_64_SHIFT_MASK = 0x3F,
+    LIBDIVIDE_ADD_MARKER = 0x40,
+    LIBDIVIDE_U32_SHIFT_PATH = 0x80,
+    LIBDIVIDE_U64_SHIFT_PATH = 0x80,
+    LIBDIVIDE_S32_SHIFT_PATH = 0x20,
+    LIBDIVIDE_NEGATIVE_DIVISOR = 0x80    
+};
+
+struct libdivide_u32_t {
+    uint32_t magic;
+    uint8_t more;
+};
+
+struct libdivide_u32_branchfree_t {
+    uint32_t magic;
+    uint8_t more;
+};
+
+#ifndef LIBDIVIDE_API
+#define LIBDIVIDE_API static inline
+#endif
+
+LIBDIVIDE_API struct libdivide_u32_t libdivide_u32_gen(uint32_t y);
+
+LIBDIVIDE_API struct libdivide_u32_branchfree_t libdivide_u32_branchfree_gen(uint32_t y);
+    
+LIBDIVIDE_API uint32_t libdivide_u32_do(uint32_t numer, const struct libdivide_u32_t *denom);
+
+LIBDIVIDE_API uint32_t libdivide_u32_branchfree_do(uint32_t numer, const struct libdivide_u32_branchfree_t *denom);
+    
+LIBDIVIDE_API uint32_t libdivide_u32_recover(const struct libdivide_u32_t *denom);
+
+LIBDIVIDE_API uint32_t libdivide_u32_branchfree_recover(const struct libdivide_u32_branchfree_t *denom);
+
+LIBDIVIDE_API int libdivide_u32_get_algorithm(const struct libdivide_u32_t *denom);
+LIBDIVIDE_API uint32_t libdivide_u32_do_alg0(uint32_t numer, const struct libdivide_u32_t *denom);
+LIBDIVIDE_API uint32_t libdivide_u32_do_alg1(uint32_t numer, const struct libdivide_u32_t *denom);
+LIBDIVIDE_API uint32_t libdivide_u32_do_alg2(uint32_t numer, const struct libdivide_u32_t *denom);
+ 
+
+//////// Internal Utility Functions
+
+static inline uint32_t libdivide__mullhi_u32(uint32_t x, uint32_t y) {
+    uint64_t xl = x, yl = y;
+    uint64_t rl = xl * yl;
+    return (uint32_t)(rl >> 32);
+}
+     
+static inline int32_t libdivide__count_leading_zeros32(uint32_t val) {
+#if __GNUC__ || __has_builtin(__builtin_clz)
+    // Fast way to count leading zeros
+    return __builtin_clz(val);    
+#else
+  int32_t result = 0;
+  uint32_t hi = 1U << 31;
+
+  while (~val & hi) {
+      hi >>= 1;
+      result++;
+  }
+  return result;
+#endif
+}
+
+static inline int32_t libdivide__count_leading_zeros64(uint64_t val) {
+#if __GNUC__ || __has_builtin(__builtin_clzll)
+    // Fast way to count leading zeros
+    return __builtin_clzll(val);
+#else
+    uint32_t hi = val >> 32;
+    uint32_t lo = val & 0xFFFFFFFF;
+    if (hi != 0) return libdivide__count_leading_zeros32(hi);
+    return 32 + libdivide__count_leading_zeros32(lo);
+#endif
+}
+
+// libdivide_64_div_32_to_32: divides a 64 bit uint {u1, u0} by a 32 bit
+// uint {v}. The result must fit in 32 bits.
+// Returns the quotient directly and the remainder in *r
+#if (LIBDIVIDE_IS_i386 || LIBDIVIDE_IS_X86_64) && LIBDIVIDE_GCC_STYLE_ASM
+static uint32_t libdivide_64_div_32_to_32(uint32_t u1, uint32_t u0, uint32_t v, uint32_t *r) {
+    uint32_t result;
+    __asm__("divl %[v]"
+            : "=a"(result), "=d"(*r)
+            : [v] "r"(v), "a"(u0), "d"(u1)
+            );
+    return result;
+}
+#else
+static uint32_t libdivide_64_div_32_to_32(uint32_t u1, uint32_t u0, uint32_t v, uint32_t *r) {
+    uint64_t n = (((uint64_t)u1) << 32) | u0;
+    uint32_t result = (uint32_t)int_divide(n, v);
+    *r = (uint32_t)(n - result * (uint64_t)v);
+    return result;
+}
+#endif
+    
+////////// UINT32
+
+static inline struct libdivide_u32_t libdivide_internal_u32_gen(uint32_t d, int branchfree) {
+    // 1 is not supported with branchfree algorithm
+    LIBDIVIDE_ASSERT(!branchfree || d != 1);
+
+    struct libdivide_u32_t result;
+    const uint32_t floor_log_2_d = 31 - libdivide__count_leading_zeros32(d);
+    if ((d & (d - 1)) == 0) {
+        // Power of 2
+        if (! branchfree) {
+            result.magic = 0;
+            result.more = floor_log_2_d | LIBDIVIDE_U32_SHIFT_PATH;
+        } else {
+            // We want a magic number of 2**32 and a shift of floor_log_2_d
+            // but one of the shifts is taken up by LIBDIVIDE_ADD_MARKER, so we
+            // subtract 1 from the shift
+            result.magic = 0;
+            result.more = (floor_log_2_d-1) | LIBDIVIDE_ADD_MARKER;
+        }
+    } else {
+        uint8_t more;
+        uint32_t rem, proposed_m;
+        proposed_m = libdivide_64_div_32_to_32(1U << floor_log_2_d, 0, d, &rem);
+        
+        LIBDIVIDE_ASSERT(rem > 0 && rem < d);
+        const uint32_t e = d - rem;
+        
+        // This power works if e < 2**floor_log_2_d.
+        if (!branchfree && (e < (1U << floor_log_2_d))) {
+            // This power works
+            more = floor_log_2_d;
+        } else {
+            // We have to use the general 33-bit algorithm.  We need to compute
+            // (2**power) / d. However, we already have (2**(power-1))/d and
+            // its remainder.  By doubling both, and then correcting the
+            // remainder, we can compute the larger division.
+            // don't care about overflow here - in fact, we expect it
+            proposed_m += proposed_m;
+            const uint32_t twice_rem = rem + rem;
+            if (twice_rem >= d || twice_rem < rem) proposed_m += 1;
+            more = floor_log_2_d | LIBDIVIDE_ADD_MARKER;
+        }
+        result.magic = 1 + proposed_m;
+        result.more = more;
+        // result.more's shift should in general be ceil_log_2_d. But if we
+        // used the smaller power, we subtract one from the shift because we're
+        // using the smaller power. If we're using the larger power, we
+        // subtract one from the shift because it's taken care of by the add
+        // indicator. So floor_log_2_d happens to be correct in both cases.
+    }
+    return result;
+}
+    
+struct libdivide_u32_t libdivide_u32_gen(uint32_t d) {
+    return libdivide_internal_u32_gen(d, 0);
+}
+    
+struct libdivide_u32_branchfree_t libdivide_u32_branchfree_gen(uint32_t d) {
+    struct libdivide_u32_t tmp = libdivide_internal_u32_gen(d, 1);
+    struct libdivide_u32_branchfree_t ret = {tmp.magic, (uint8_t)(tmp.more & LIBDIVIDE_32_SHIFT_MASK)};
+    return ret;
+}
+
+uint32_t libdivide_u32_do(uint32_t numer, const struct libdivide_u32_t *denom) {
+    uint8_t more = denom->more;
+    if (more & LIBDIVIDE_U32_SHIFT_PATH) {
+        return numer >> (more & LIBDIVIDE_32_SHIFT_MASK);
+    }
+    else {
+        uint32_t q = libdivide__mullhi_u32(denom->magic, numer);
+        if (more & LIBDIVIDE_ADD_MARKER) {
+            uint32_t t = ((numer - q) >> 1) + q;
+            return t >> (more & LIBDIVIDE_32_SHIFT_MASK);
+        }
+        else {
+            return q >> more; // all upper bits are 0 - don't need to mask them off
+        }
+    }
+}
+
+uint32_t libdivide_u32_recover(const struct libdivide_u32_t *denom) {
+    uint8_t more = denom->more;
+    uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+    if (more & LIBDIVIDE_U32_SHIFT_PATH) {
+        return 1U << shift;
+    } else if (! (more & LIBDIVIDE_ADD_MARKER)) {
+        // We compute q = n/d = n*m / 2^(32 + shift)
+        // Therefore we have d = 2^(32 + shift) / m
+        // We need to ceil it.
+        // We know d is not a power of 2, so m is not a power of 2,
+        // so we can just add 1 to the floor
+        uint32_t hi_dividend = 1U << shift;
+        uint32_t rem_ignored;
+        return 1 + libdivide_64_div_32_to_32(hi_dividend, 0, denom->magic, &rem_ignored);
+    } else {
+        // Here we wish to compute d = 2^(32+shift+1)/(m+2^32).
+        // Notice (m + 2^32) is a 33 bit number. Use 64 bit division for now
+        // Also note that shift may be as high as 31, so shift + 1 will
+        // overflow. So we have to compute it as 2^(32+shift)/(m+2^32), and
+        // then double the quotient and remainder.
+        // TODO: do something better than 64 bit math
+        uint64_t half_n = 1ULL << (32 + shift);
+        uint64_t d = (1ULL << 32) | denom->magic;
+        // Note that the quotient is guaranteed <= 32 bits, but the remainder
+        // may need 33!
+        uint32_t half_q = (uint32_t)int_divide(half_n, d);
+        uint64_t rem = half_n - half_q * d; // broken
+        // We computed 2^(32+shift)/(m+2^32)
+        // Need to double it, and then add 1 to the quotient if doubling th
+        // remainder would increase the quotient.
+        // Note that rem<<1 cannot overflow, since rem < d and d is 33 bits
+        uint32_t full_q = half_q + half_q + ((rem<<1) >= d);
+        
+        // We rounded down in gen unless we're a power of 2 (i.e. in branchfree case)
+        // We can detect that by looking at m. If m zero, we're a power of 2
+        return full_q + (denom->magic != 0);
+    }
+}
+
+uint32_t libdivide_u32_branchfree_recover(const struct libdivide_u32_branchfree_t *denom) {
+    struct libdivide_u32_t denom_u32 = {denom->magic, (uint8_t)(denom->more | LIBDIVIDE_ADD_MARKER)};
+    return libdivide_u32_recover(&denom_u32);
+}
+
+int libdivide_u32_get_algorithm(const struct libdivide_u32_t *denom) {
+    uint8_t more = denom->more;
+    if (more & LIBDIVIDE_U32_SHIFT_PATH) return 0;
+    else if (! (more & LIBDIVIDE_ADD_MARKER)) return 1;
+    else return 2;
+}
+ 
+uint32_t libdivide_u32_do_alg0(uint32_t numer, const struct libdivide_u32_t *denom) {
+    return numer >> (denom->more & LIBDIVIDE_32_SHIFT_MASK);
+}
+ 
+uint32_t libdivide_u32_do_alg1(uint32_t numer, const struct libdivide_u32_t *denom) {
+    uint32_t q = libdivide__mullhi_u32(denom->magic, numer);
+    return q >> denom->more;
+}    
+ 
+uint32_t libdivide_u32_do_alg2(uint32_t numer, const struct libdivide_u32_t *denom) {
+    // denom->add != 0
+    uint32_t q = libdivide__mullhi_u32(denom->magic, numer);
+    uint32_t t = ((numer - q) >> 1) + q;
+    // Note that this mask is typically free. Only the low bits are meaningful
+    // to a shift, so compilers can optimize out this AND.
+    return t >> (denom->more & LIBDIVIDE_32_SHIFT_MASK);
+}
+
+uint32_t libdivide_u32_branchfree_do(uint32_t numer, const struct libdivide_u32_branchfree_t *denom) {
+    // same as alg 2
+    uint32_t q = libdivide__mullhi_u32(denom->magic, numer);
+    uint32_t t = ((numer - q) >> 1) + q;
+    return t >> denom->more;
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/list.hh b/openflow/include/click/list.hh
new file mode 100644
index 0000000..afc9bbb
--- /dev/null
+++ b/openflow/include/click/list.hh
@@ -0,0 +1,564 @@
+#ifndef CLICK_LIST_HH
+#define CLICK_LIST_HH 1
+/*
+ * list.hh -- List template
+ * Eddie Kohler
+ *
+ * Copyright (c) 2008 Meraki, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software")
+ * to deal in the Software without restriction, subject to the conditions
+ * listed in the Click LICENSE file. These conditions include: you must
+ * preserve this copyright notice, and you cannot mention the copyright
+ * holders in advertising related to the Software without their permission.
+ * The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ * notice is a summary of the Click LICENSE file; the license in that file is
+ * legally binding.
+ */
+CLICK_DECLS
+#define LIST_HEAD_MARKER 0 /* ((T *) 1) */
+
+/** @file <click/list.hh>
+ * @brief Click's doubly-linked list container template.
+ */
+
+template <typename T> class List_member;
+template <typename T, List_member<T> T::*member> class List;
+
+/** @class List
+  @brief Doubly-linked list template.
+
+  The List template, and its helper template List_member, implement a generic
+  doubly-linked list.  The list is <em>intrusive</em> in that the container
+  does not manage space for its contents.  The user provides space for
+  contained elements, and must delete elements when they are no longer needed.
+  (This is unlike Vector or HashTable, which manage space for their contents.)
+  The main advantage of intrusive containers is that a single element can be
+  on multiple lists.
+
+  Here's an example linked list of integers built using List and List_member.
+
+  @code
+  #include <click/list.hh>
+
+  struct intlist_node {
+      int value;
+      List_member<intlist_node> link;
+      intlist_node(int v)
+          : value(v) {
+      }
+  };
+
+  typedef List<intlist_node, &intlist_node::link> intlist;
+
+  void make_intlist(intlist &l, int begin, int end, int step) {
+      for (int i = begin; i < end; i += step)
+          l.push_back(new intlist_node(i));
+      // Note that l does not manage its contents' memory!
+      // Whoever destroys l should first delete its contents,
+      // for example by calling trash_intlist(l).
+  }
+
+  void print_intlist(const intlist &l) {
+      size_t n = 0;
+      for (intlist::const_iterator it = l.begin(); it != l.end(); ++it, ++n)
+          click_chatter("#%ld: %d\n", (long) n, it->value);
+  }
+
+  void trash_intlist(intlist &l) {
+      while (!l.empty()) {
+          intlist_node *n = l.front();
+	  l.pop_front();
+	  delete n;
+      }
+  }
+
+  template <typename T>
+  void remove_every_other(T &list) {
+      typename T::iterator it = list.begin();
+      while (it != l.end()) {
+          ++it;
+	  if (it != l.end())
+	      it = list.erase(it);
+      }
+  }
+  @endcode
+*/
+
+/** @class List_member
+  @brief Member of classes to be placed on a List.
+
+  Any class type that will be placed on a List must have a publicly accessible
+  List_member member.  This member is supplied as the second template argument
+  to List.  List_member allows users to fetch the next-element and
+  previous-element pointers, but all modifications must take place via List
+  functions like List::push_back() and List::insert().  List_member has
+  private copy constructor and default assignment operators.
+
+  @sa List
+*/
+template <typename T>
+class List_member { public:
+
+    /** @brief Construct an isolated List_member. */
+    List_member()
+	: _next(), _prev() {
+    }
+
+    /** @brief Return the next element in the list. */
+    T *next() {
+	return _next;
+    }
+    /** @overload */
+    const T *next() const {
+	return _next;
+    }
+
+    /** @brief Return the previous element in the list. */
+    T *prev() {
+	return _prev != LIST_HEAD_MARKER ? _prev : 0;
+    }
+    /** @overload */
+    const T *prev() const {
+	return _prev != LIST_HEAD_MARKER ? _prev : 0;
+    }
+
+  private:
+
+    T *_next;
+    T *_prev;
+
+    List_member(const List_member<T> &x);
+    List_member<T> &operator=(const List_member<T> &x);
+    template <typename X, List_member<X> X::*member> friend class List;
+
+};
+
+template <typename T, List_member<T> T::*member>
+class List { public:
+
+    typedef T *pointer;
+    typedef const T *const_pointer;
+    class const_iterator;
+    class iterator;
+    typedef size_t size_type;
+
+    /** @brief Construct an empty list. */
+    List()
+	: _head(0), _tail(0) {
+    }
+
+
+    /** @brief Return an iterator for the first element in the list. */
+    iterator begin() {
+	return iterator(_head, this);
+    }
+    /** @overload */
+    const_iterator begin() const {
+	return const_iterator(_head, this);
+    }
+    /** @brief Return an iterator for the end of the list.
+     * @invariant end().live() == false */
+    iterator end() {
+	return iterator(this);
+    }
+    /** @overload */
+    const_iterator end() const {
+	return const_iterator(this);
+    }
+
+
+    /** @brief Return true iff size() == 0.
+     * @note Always O(1) time, whereas size() takes O(N) time. */
+    bool empty() const {
+	return _head == 0;
+    }
+
+    /** @brief Return the number of elements in the list.
+     * @note Takes O(N) time, where N is the number of elements. */
+    size_type size() const {
+	size_type n = 0;
+	for (T *x = _head; x; x = (x->*member)._next)
+	    ++n;
+	return n;
+    }
+
+
+    /** @brief Return the first element in the list.
+     *
+     * Returns a null pointer if the list is empty. */
+    pointer front() {
+	return _head;
+    }
+    /** @overload */
+    const_pointer front() const {
+	return _head;
+    }
+    /** @brief Return the last element in the list.
+     *
+     * Returns a null pointer if the list is empty. */
+    pointer back() {
+	return _tail;
+    }
+    /** @overload */
+    const_pointer back() const {
+	return _tail;
+    }
+
+
+    /** @brief Insert a new element at the beginning of the list.
+     * @param x new element
+     * @pre isolated(@a x) */
+    void push_front(pointer x) {
+	assert(x && isolated(x));
+	if (((x->*member)._next = _head))
+	    (_head->*member)._prev = x;
+	else
+	    _tail = x;
+	_head = x;
+	(_head->*member)._prev = LIST_HEAD_MARKER;
+    }
+
+    /** @brief Insert a new element at the end of the list.
+     * @param x new element
+     * @pre isolated(@a x) */
+    void push_back(pointer x) {
+	assert(x && !(x->*member)._next && !(x->*member)._prev);
+	if (((x->*member)._prev = _tail))
+	    (_tail->*member)._next = x;
+	else {
+	    _head = x;
+	    (_head->*member)._prev = LIST_HEAD_MARKER;
+	}
+	_tail = x;
+    }
+
+    /** @brief Remove the element at the beginning of the list.
+     * @pre !empty() */
+    void pop_front() {
+	assert(_head);
+	pointer x = _head;
+	if ((_head = (x->*member)._next) != LIST_HEAD_MARKER)
+	    (_head->*member)._prev = LIST_HEAD_MARKER;
+	else
+	    _head = _tail = 0;
+	(x->*member)._next = (x->*member)._prev = 0;
+    }
+
+    /** @brief Remove the element at the end of the list.
+     * @pre !empty() */
+    void pop_back() {
+	assert(_head);
+	pointer x = _tail;
+	if ((_tail = (x->*member)._prev) != LIST_HEAD_MARKER)
+	    (_tail->*member)._next = 0;
+	else
+	    _head = _tail = 0;
+	(x->*member)._next = (x->*member)._prev = 0;
+    }
+
+
+    /** @brief Insert an element before @a pos.
+     * @param pos position to insert (if null, insert at end of list)
+     * @param x new element
+     * @pre (!@a pos || contains(@a pos)) && isolated(@a x) */
+    void insert(pointer pos, pointer x) {
+	assert(x && isolated(x));
+	T **pprev = (pos ? &(pos->*member)._prev : &_tail);
+	if (((x->*member)._prev = *pprev) != LIST_HEAD_MARKER)
+	    ((x->*member)._prev->*member)._next = x;
+	else
+	    _head = x;
+	*pprev = x;
+	(x->*member)._next = pos;
+    }
+
+    /** @brief Insert an element before @a it.
+     * @param it position to insert
+     * @param x new element
+     * @return an iterator pointing to @a x
+     * @pre isolated(@a x) */
+    iterator insert(iterator it, pointer x) {
+	insert(it.get(), x);
+	return iterator(x);
+    }
+
+    /** @brief Insert the elements in [@a first, @a last) before @a it.
+     * @param it position to insert
+     * @param first iterator to beginning of insertion sequence
+     * @param last iterator to end of insertion sequence
+     * @pre isolated(@a x) for each @a x in [@a first, @a last) */
+    template <typename InputIterator>
+    void insert(iterator it, InputIterator first, InputIterator last) {
+	while (first != last) {
+	    insert(it, *first);
+	    ++first;
+	}
+    }
+
+
+    /** @brief Remove @a x from the list.
+     * @param x element to remove
+     * @pre contains(@a x) */
+    void erase(pointer x) {
+	assert(x);
+	T *n = (x->*member)._next, *p = (x->*member)._prev;
+	if (n)
+	    (n->*member)._prev = p;
+	else
+	    _tail = (p != LIST_HEAD_MARKER ? p : 0);
+	if (p != LIST_HEAD_MARKER)
+	    (p->*member)._next = n;
+	else
+	    _head = n;
+	(x->*member)._next = (x->*member)._prev = 0;
+    }
+
+    /** @brief Remove the element pointed to by @a it from the list.
+     * @param it element to remove
+     * @return iterator pointing to the element after the removed element
+     * @pre @a it.live() */
+    iterator erase(iterator it) {
+	assert(it);
+	iterator next = iterator((it.get()->*member)._next);
+	erase(it.get());
+	return next;
+    }
+
+    /** @brief Remove the elements in [@a first, @a last) from the list.
+     * @param first iterator to beginning of removal subsequence
+     * @param last iterator to end of removal subsequence
+     * @return iterator pointing to the element after the removed subsequence */
+    iterator erase(iterator first, iterator last) {
+	while (first != last)
+	    first = erase(first);
+	return first;
+    }
+
+    /** @brief Remove all elements from the list.
+     * @note Equivalent to erase(begin(), end()). */
+    void clear() {
+	while (T *x = _head) {
+	    _head = (x->*member)._next;
+	    (x->*member)._next = (x->*member)._prev = 0;
+	}
+	_tail = 0;
+    }
+
+    /** @brief Remove all elements from the list.
+     *
+     * Unlike clear(), this function does not erase() any of the elements of
+     * this list: those elements' next() and prev() members remain
+     * unchanged. */
+    void __clear() {
+	_head = _tail = 0;
+    }
+
+
+    /** @brief Exchange list contents with list @a x. */
+    void swap(List<T, member> &x) {
+	T *h = x._head, *t = x._tail;
+	x._head = _head, x._tail = _tail;
+	_head = h, _tail = t;
+    }
+
+
+    /** @brief Check if @a x is isolated.
+     *
+     * An isolated element is not a member of any list. */
+    bool isolated(const_pointer x) {
+	return !(x->*member)._next && !(x->*member)._prev && x != _head;
+    }
+
+    /** @brief Check if @a x is a member of this list. */
+    bool contains(const_pointer x) const {
+	if (!isolated(x))
+	    for (const_pointer *it = _head; it; it = (it->*member).next())
+		if (x == it)
+		    return true;
+	return false;
+    }
+
+
+    /** @class List::const_iterator
+     * @brief Const iterator type for List. */
+    class const_iterator { public:
+	/** @brief Construct an invalid iterator. */
+	const_iterator()
+	    : _x(), _list() {
+	}
+	/** @brief Construct an iterator pointing at @a x. */
+	const_iterator(const T *x)
+	    : _x(const_cast<T *>(x)), _list() {
+	}
+	/** @brief Construct an end iterator for @a list. */
+	const_iterator(const List<T, member> *list)
+	    : _x(), _list(list) {
+	}
+	/** @brief Construct an iterator pointing at @a x in @a list. */
+	const_iterator(const T *x, const List<T, member> *list)
+	    : _x(const_cast<T *>(x)), _list(list) {
+	}
+	typedef bool (const_iterator::*unspecified_bool_type)() const;
+	/** @brief Test if this iterator points to a valid list element. */
+	operator unspecified_bool_type() const {
+	    return _x != 0 ? &const_iterator::live : 0;
+	}
+	/** @brief Test if this iterator points to a valid list element. */
+	bool live() const {
+	    return _x != 0;
+	}
+	/** @brief Return the current list element or null. */
+	const T *get() const {
+	    return _x;
+	}
+	/** @brief Return the current list element or null. */
+	const T *operator->() const {
+	    return _x;
+	}
+	/** @brief Return the current list element. */
+	const T &operator*() const {
+	    return *_x;
+	}
+	/** @brief Advance this iterator to the next element. */
+	void operator++() {
+	    assert(_x);
+	    _x = (_x->*member).next();
+	}
+	/** @brief Advance this iterator to the next element. */
+	void operator++(int) {
+	    ++*this;
+	}
+	/** @brief Advance this iterator to the previous element. */
+	void operator--() {
+	    assert(_x ? (bool) (_x->*member).prev() : _list && _list->back());
+	    if (_x)
+		_x = (_x->*member).prev();
+	    else
+		_x = const_cast<T *>(_list->back());
+	}
+	/** @brief Advance this iterator to the previous element. */
+	void operator--(int) {
+	    --*this;
+	}
+	/** @brief Move this iterator forward by @a x positions.
+	 * @return reference to this iterator
+	 * @note This function takes O(abs(@a x)) time. */
+	const_iterator &operator+=(int x) {
+	    for (; x > 0; --x)
+		++*this;
+	    for (; x < 0; ++x)
+		--*this;
+	    return *this;
+	}
+	/** @brief Move this iterator backward by @a x positions.
+	 * @return reference to this iterator
+	 * @note This function takes O(abs(@a x)) time. */
+	const_iterator &operator-=(int x) {
+	    for (; x > 0; --x)
+		--*this;
+	    for (; x < 0; ++x)
+		++*this;
+	    return *this;
+	}
+	/** @brief Return an iterator @a x positions ahead. */
+	const_iterator operator+(int x) const {
+	    const_iterator it(*this);
+	    return it += x;
+	}
+	/** @brief Return an iterator @a x positions behind. */
+	const_iterator operator-(int x) const {
+	    const_iterator it(*this);
+	    return it -= x;
+	}
+	/** @brief Test if this iterator equals @a x. */
+	bool operator==(const_iterator x) const {
+	    return _x == x._x;
+	}
+	/** @brief Test if this iterator does not equal @a x. */
+	bool operator!=(const_iterator x) const {
+	    return _x != x._x;
+	}
+      private:
+	T *_x;
+	const List<T, member> *_list;
+	friend class iterator;
+    };
+
+    /** @class List::iterator
+     * @brief Iterator type for List. */
+    class iterator : public const_iterator { public:
+	/** @brief Construct an invalid iterator. */
+	iterator()
+	    : const_iterator() {
+	}
+	/** @brief Construct an iterator pointing at @a x. */
+	iterator(T *x)
+	    : const_iterator(x) {
+	}
+	/** @brief Construct an end iterator for @a list. */
+	iterator(List<T, member> *list)
+	    : const_iterator(list) {
+	}
+	/** @brief Construct an iterator pointing at @a x in @a list. */
+	iterator(T *x, List<T, member> *list)
+	    : const_iterator(x, list) {
+	}
+	/** @brief Return the current list element or null. */
+	T *get() const {
+	    return this->_x;
+	}
+	/** @brief Return the current list element or null. */
+	T *operator->() const {
+	    return this->_x;
+	}
+	/** @brief Return the current list element. */
+	T &operator*() const {
+	    return *this->_x;
+	}
+	/** @brief Move this iterator forward by @a x positions.
+	 * @return reference to this iterator
+	 * @note This function takes O(abs(@a x)) time. */
+	iterator &operator+=(int x) {
+	    for (; x > 0; --x)
+		++*this;
+	    for (; x < 0; ++x)
+		--*this;
+	    return *this;
+	}
+	/** @brief Move this iterator backward by @a x positions.
+	 * @return reference to this iterator
+	 * @note This function takes O(abs(@a x)) time. */
+	iterator &operator-=(int x) {
+	    for (; x > 0; --x)
+		--*this;
+	    for (; x < 0; ++x)
+		++*this;
+	    return *this;
+	}
+	/** @brief Return an iterator @a x positions ahead. */
+	iterator operator+(int x) const {
+	    iterator it(*this);
+	    return it += x;
+	}
+	/** @brief Return an iterator @a x positions behind. */
+	iterator operator-(int x) const {
+	    iterator it(*this);
+	    return it -= x;
+	}
+    };
+
+  private:
+
+    T *_head;
+    T *_tail;
+
+    List(const List<T, member> &x);
+    List<T, member> &operator=(const List<T, member> &x);
+
+};
+
+#undef LIST_HEAD_MARKER
+CLICK_ENDDECLS
+#endif /* CLICK_LIST_HH */
diff --git a/openflow/include/click/llrpc.h b/openflow/include/click/llrpc.h
new file mode 100644
index 0000000..601757c
--- /dev/null
+++ b/openflow/include/click/llrpc.h
@@ -0,0 +1,195 @@
+#ifndef CLICK_LLRPC_H
+#define CLICK_LLRPC_H
+#if CLICK_LINUXMODULE
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# include <linux/errno.h>
+# include <linux/ioctl.h>
+# include <asm/uaccess.h>
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+#elif CLICK_BSDMODULE
+# include <sys/errno.h>
+# include <sys/ioccom.h>
+#else
+# include <errno.h>
+# include <sys/ioctl.h>
+#endif
+
+/* Click low-level RPC interface */
+
+/* Ioctl numbers are not consistent across platforms unless you #define
+   HAVE_PORTABLE_LLRPC. */
+#define _CLICK_NET_IOC_VOID	0x20000000
+#define _CLICK_NET_IOC_OUT	0x40000000
+#define _CLICK_NET_IOC_IN	0x80000000
+#if HAVE_PORTABLE_LLRPC || !defined(__linux__)
+# define _CLICK_IOC_VOID	_CLICK_NET_IOC_VOID
+# define _CLICK_IOC_OUT		_CLICK_NET_IOC_OUT
+# define _CLICK_IOC_IN		_CLICK_NET_IOC_IN
+#else
+# define _CLICK_IOC_VOID	(_IOC_NONE << _IOC_DIRSHIFT)
+# define _CLICK_IOC_OUT		(_IOC_READ << _IOC_DIRSHIFT)
+# define _CLICK_IOC_IN		(_IOC_WRITE << _IOC_DIRSHIFT)
+#endif
+#define _CLICK_IOC_BASE_MASK	0x0FFFFFFF
+#define _CLICK_IOC_SAFE		0x00008000
+#define _CLICK_IOC_FLAT		0x00004000
+#define _CLICK_IOC_SIZE(io)	((io) >> 16 & 0xFFF)
+
+/* _CLICK_IO[S]: data transfer direction unknown, pass pointer unchanged;
+   _CLICK_IOR[S]: data of specified size sent from kernel to user;
+   _CLICK_IOW[S]: data of specified size sent from user to kernel;
+   _CLICK_IOWR[S]: data of specified size transferred in both directions. */
+
+/* "Non-safe" LLRPCs will not be performed in parallel with other LLRPCs or
+   handlers.  They will also block the router threads. */
+#define _CLICK_IOX(d, n, sz)	((d) | ((sz) << 16) | (n))
+#define _CLICK_IO(n)		_CLICK_IOX(_CLICK_IOC_VOID, (n), 0)
+#define _CLICK_IOR(n, sz)	_CLICK_IOX(_CLICK_IOC_OUT, (n), (sz))
+#define _CLICK_IOW(n, sz)	_CLICK_IOX(_CLICK_IOC_IN, (n), (sz))
+#define _CLICK_IOWR(n, sz)	_CLICK_IOX(_CLICK_IOC_IN|_CLICK_IOC_OUT, (n), (sz))
+
+/* "Safe" LLRPCs may be performed in parallel with read handlers and other
+   safe LLRPCs, but not with write handlers or unsafe LLRPCs.  They will not
+   block the router threads. */
+#define _CLICK_IOS(n)		_CLICK_IOX(_CLICK_IOC_VOID|_CLICK_IOC_SAFE, (n), 0)
+#define _CLICK_IORS(n, sz)	_CLICK_IOX(_CLICK_IOC_OUT|_CLICK_IOC_SAFE, (n), (sz))
+#define _CLICK_IOWS(n, sz)	_CLICK_IOX(_CLICK_IOC_IN|_CLICK_IOC_SAFE, (n), (sz))
+#define _CLICK_IOWRS(n, sz)	_CLICK_IOX(_CLICK_IOC_IN|_CLICK_IOC_OUT|_CLICK_IOC_SAFE, (n), (sz))
+
+/* "Flat" LLRPCs do not contain pointers -- all data read or written is
+   contained in the size. They can be safe or unsafe. */
+#define _CLICK_IORF(n, sz)	_CLICK_IOX(_CLICK_IOC_OUT|_CLICK_IOC_FLAT, (n), (sz))
+#define _CLICK_IOWF(n, sz)	_CLICK_IOX(_CLICK_IOC_IN|_CLICK_IOC_FLAT, (n), (sz))
+#define _CLICK_IOWRF(n, sz)	_CLICK_IOX(_CLICK_IOC_IN|_CLICK_IOC_OUT|_CLICK_IOC_FLAT, (n), (sz))
+#define _CLICK_IORSF(n, sz)	_CLICK_IOX(_CLICK_IOC_OUT|_CLICK_IOC_SAFE|_CLICK_IOC_FLAT, (n), (sz))
+#define _CLICK_IOWSF(n, sz)	_CLICK_IOX(_CLICK_IOC_IN|_CLICK_IOC_SAFE|_CLICK_IOC_FLAT, (n), (sz))
+#define _CLICK_IOWRSF(n, sz)	_CLICK_IOX(_CLICK_IOC_IN|_CLICK_IOC_OUT|_CLICK_IOC_SAFE|_CLICK_IOC_FLAT, (n), (sz))
+
+#define CLICK_LLRPC_PROXY			_CLICK_IO(0)
+#define CLICK_LLRPC_GET_RATE			_CLICK_IOWRSF(1, 4)
+#define CLICK_LLRPC_GET_RATES			_CLICK_IOS(2)
+#define CLICK_LLRPC_GET_COUNT			_CLICK_IOWRSF(3, 4)
+#define CLICK_LLRPC_GET_COUNTS			_CLICK_IOS(4)
+#define CLICK_LLRPC_GET_SWITCH			_CLICK_IORSF(5, 4)
+#define CLICK_LLRPC_SET_SWITCH			_CLICK_IOWF(6, 4)
+#define CLICK_LLRPC_MAP_IPADDRESS		_CLICK_IOWRF(7, 4)
+#define CLICK_LLRPC_IPREWRITER_MAP_TCP		_CLICK_IOWRF(8, 12)
+#define CLICK_LLRPC_IPREWRITER_MAP_UDP		_CLICK_IOWRF(9, 12)
+#define CLICK_LLRPC_IPRATEMON_LEVEL_FWD_AVG	_CLICK_IO(10)
+#define CLICK_LLRPC_IPRATEMON_LEVEL_REV_AVG	_CLICK_IO(11)
+#define CLICK_LLRPC_IPRATEMON_FWD_N_REV_AVG	_CLICK_IO(12)
+#define CLICK_LLRPC_IPRATEMON_SET_ANNO_LEVEL	_CLICK_IO(13)
+#define CLICK_IOC_TOUSERDEVICE_GET_MULTI	_CLICK_IOS(15)
+#define CLICK_IOC_TOUSERDEVICE_SET_MULTI	_CLICK_IOS(16)
+#define CLICK_LLRPC_RAW_HANDLER			_CLICK_IOS(17)
+#define CLICK_LLRPC_ABANDON_HANDLER		_CLICK_IOS(18)
+#define CLICK_LLRPC_CALL_HANDLER		_CLICK_IO(19)
+
+struct click_llrpc_proxy_st {
+    void* proxied_handler;	/* const Router::Handler* */
+    uint32_t proxied_command;
+    void* proxied_data;
+};
+
+#define CLICK_LLRPC_COUNTS_SIZE 8
+struct click_llrpc_counts_st {
+    uint32_t n;
+    uint32_t keys[CLICK_LLRPC_COUNTS_SIZE];
+    uint32_t values[CLICK_LLRPC_COUNTS_SIZE];
+};
+
+#define CLICK_LLRPC_CALL_HANDLER_FLAG_RAW 1
+struct click_llrpc_call_handler_st {
+    int flags;
+    size_t errorlen;
+    void *errorbuf;
+};
+
+/* data manipulation */
+
+#if CLICK_USERLEVEL || CLICK_MINIOS
+
+# define CLICK_LLRPC_GET_DATA(local, remote, size) (memcpy(local, remote, size), 0)
+# define CLICK_LLRPC_PUT_DATA(remote, local, size) (memcpy(remote, local, size), 0)
+# define CLICK_LLRPC_GET(local_obj, remote_addr) (memcpy(&(local_obj), remote_addr, sizeof(local_obj)), 0)
+# define CLICK_LLRPC_PUT(remote_addr, local_obj) (memcpy(remote_addr, &(local_obj), sizeof(local_obj)), 0)
+
+#elif CLICK_LINUXMODULE
+
+# ifdef __cplusplus
+#  define __CLICK_LLRPC_CAST(x) reinterpret_cast< x >
+# else
+#  define __CLICK_LLRPC_CAST(x) (x)
+# endif
+
+# define __CLICK_LLRPC_GENERIC_GET_DATA(local, remote, size) \
+		(copy_from_user(local, remote, size) > 0 ? -EFAULT : 0)
+# define __CLICK_LLRPC_CONSTANT_GET_DATA(local, remote, size) \
+		(size == 1 ? get_user(*__CLICK_LLRPC_CAST(unsigned char *)(local), __CLICK_LLRPC_CAST(unsigned char *)(remote)) \
+		 : (size == 2 ? get_user(*__CLICK_LLRPC_CAST(unsigned short *)(local), __CLICK_LLRPC_CAST(unsigned short *)(remote)) \
+		    : (size == 4 ? get_user(*__CLICK_LLRPC_CAST(unsigned *)(local), __CLICK_LLRPC_CAST(unsigned *)(remote)) \
+		       : __CLICK_LLRPC_GENERIC_GET_DATA(local, remote, size))))
+
+# define __CLICK_LLRPC_GENERIC_PUT_DATA(remote, local, size) \
+		(copy_to_user(remote, local, size) > 0 ? -EFAULT : 0)
+# define __CLICK_LLRPC_CONSTANT_PUT_DATA(remote, local, size) \
+		(size == 1 ? put_user(*__CLICK_LLRPC_CAST(const unsigned char *)(local), __CLICK_LLRPC_CAST(unsigned char *)(remote)) \
+		 : (size == 2 ? put_user(*__CLICK_LLRPC_CAST(const unsigned short *)(local), __CLICK_LLRPC_CAST(unsigned short *)(remote)) \
+		    : (size == 4 ? put_user(*__CLICK_LLRPC_CAST(const unsigned *)(local), __CLICK_LLRPC_CAST(unsigned *)(remote)) \
+		       : __CLICK_LLRPC_GENERIC_PUT_DATA(remote, local, size))))
+
+# define CLICK_LLRPC_GET_DATA(local, remote, size) \
+		(__builtin_constant_p(size) && size <= 4 \
+		 ? __CLICK_LLRPC_CONSTANT_GET_DATA(local, remote, size) \
+		 : __CLICK_LLRPC_GENERIC_GET_DATA(local, remote, size))
+# define CLICK_LLRPC_PUT_DATA(remote, local, size) \
+		(__builtin_constant_p(size) && size <= 4 \
+		 ? __CLICK_LLRPC_CONSTANT_PUT_DATA(remote, local, size) \
+		 : __CLICK_LLRPC_GENERIC_PUT_DATA(remote, local, size))
+
+# define CLICK_LLRPC_GET(local_obj, remote_addr) \
+		get_user((local_obj), (remote_addr))
+# define CLICK_LLRPC_PUT(remote_addr, local_obj) \
+		put_user((local_obj), (remote_addr))
+
+#elif CLICK_BSDMODULE
+
+/*
+ * XXX  LLRPC isn't implemented for BSD yet.
+ */
+
+# define CLICK_LLRPC_GET_DATA(local, remote, size) ((void)(local), (void)(remote), (void)(size), -EFAULT)
+# define CLICK_LLRPC_PUT_DATA(remote, local, size) ((void)(local), (void)(remote), (void)(size), -EFAULT)
+# define CLICK_LLRPC_GET(local_obj, remote_addr) ((void)(local_obj), (void)(remote_addr), -EFAULT)
+# define CLICK_LLRPC_PUT(remote_addr, local_obj) ((void)(local_obj), (void)(remote_addr), -EFAULT)
+
+#endif
+
+/* CLICK_NTOH_LLRPC: portable LLRPC numbers to host LLRPC numbers */
+/* CLICK_HTON_LLRPC: host LLRPC numbers to portable LLRPC numbers */
+/* both macros are only suitable for integer constants and the like */
+#if _CLICK_IOC_VOID != _CLICK_NET_IOC_VOID || _CLICK_IOC_OUT != _CLICK_NET_IOC_OUT || _CLICK_IOC_IN != _CLICK_NET_IOC_IN
+# define CLICK_LLRPC_NTOH(command) \
+	(((command) & _CLICK_NET_IOC_VOID ? _CLICK_IOC_VOID : 0) \
+	 | ((command) & _CLICK_NET_IOC_OUT ? _CLICK_IOC_OUT : 0) \
+	 | ((command) & _CLICK_NET_IOC_IN ? _CLICK_IOC_IN : 0) \
+	 | ((command) & _CLICK_IOC_BASE_MASK))
+# define CLICK_LLRPC_HTON(command) \
+	(((command) & _CLICK_IOC_VOID ? _CLICK_NET_IOC_VOID : 0) \
+	 | ((command) & _CLICK_IOC_OUT ? _CLICK_NET_IOC_OUT : 0) \
+	 | ((command) & _CLICK_IOC_IN ? _CLICK_NET_IOC_IN : 0) \
+	 | ((command) & _CLICK_IOC_BASE_MASK))
+#else
+# define CLICK_LLRPC_NTOH(command) (command)
+# define CLICK_LLRPC_HTON(command) (command)
+#endif
+
+/* sanity checks */
+#ifdef __FreeBSD__
+# if _CLICK_IOC_VOID != IOC_VOID || _CLICK_IOC_OUT != IOC_OUT || _CLICK_IOC_IN != IOC_IN
+#  error "bad _CLICK_IOC constants"
+# endif
+#endif
+#endif
diff --git a/openflow/include/click/machine.hh b/openflow/include/click/machine.hh
new file mode 100644
index 0000000..536d30e
--- /dev/null
+++ b/openflow/include/click/machine.hh
@@ -0,0 +1,82 @@
+#ifndef CLICK_MACHINE_HH
+#define CLICK_MACHINE_HH 1
+#if CLICK_LINUXMODULE
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# include <linux/threads.h>
+# include <linux/sched.h>
+# if defined(CONFIG_SMP) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+#  define num_possible_cpus()	smp_num_cpus
+# endif
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+#endif
+
+/** @brief Compiler fence.
+
+    Prevents reordering of loads and stores by the compiler. Not intended to
+    synchronize the processor's caches. */
+inline void
+click_compiler_fence()
+{
+    asm volatile("" : : : "memory");
+}
+
+/** @brief Compiler fence that relaxes the processor.
+
+    Use this in spinloops, for example. */
+inline void
+click_relax_fence()
+{
+#if CLICK_LINUXMODULE
+    cpu_relax();
+#elif HAVE_MULTITHREAD && (defined(__i386__) || defined(__arch_um__) || defined(__x86_64__))
+    asm volatile("rep; nop" : : : "memory"); // equivalent to "pause"
+#else
+    click_compiler_fence();
+#endif
+}
+
+/** @brief Full memory fence. */
+inline void
+click_fence()
+{
+#if CLICK_LINUXMODULE
+    smp_mb();
+#elif HAVE_MULTITHREAD && (defined(__i386__) || defined(__arch_um__) || defined(__x86_64__))
+    // GCC 4.2.1 on Mac has __sync_synchronize, but it doesn't work!
+    asm volatile("mfence" : : : "memory");
+#elif HAVE_MULTITHREAD && HAVE___SYNC_SYNCHRONIZE
+    __sync_synchronize();
+#else
+    click_compiler_fence();
+#endif
+}
+
+/** @brief Read memory fence.
+
+    On x86, equivalent to click_compiler_fence(). */
+inline void click_read_fence() {
+#if CLICK_LINUXMODULE
+    smp_rmb();
+#elif HAVE_MULTITHREAD && (defined(__i386__) || defined(__arch_um__) || defined(__x86_64__))
+    click_compiler_fence();
+#else
+    click_fence();
+#endif
+}
+
+/** @brief Write memory fence.
+
+    On x86, equivalent to click_compiler_fence(). */
+inline void click_write_fence() {
+#if CLICK_LINUXMODULE
+    smp_wmb();
+#elif HAVE_MULTITHREAD && (defined(__i386__) || defined(__arch_um__) || defined(__x86_64__))
+    click_compiler_fence();
+#else
+    click_fence();
+#endif
+}
+
+#endif
diff --git a/openflow/include/click/master.hh b/openflow/include/click/master.hh
new file mode 100644
index 0000000..eda5059
--- /dev/null
+++ b/openflow/include/click/master.hh
@@ -0,0 +1,223 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/master.cc" -*-
+#ifndef CLICK_MASTER_HH
+#define CLICK_MASTER_HH
+#include <click/router.hh>
+#include <click/atomic.hh>
+#if CLICK_USERLEVEL
+# include <signal.h>
+#endif
+#if CLICK_NS
+# include <click/simclick.h>
+#endif
+CLICK_DECLS
+
+#define CLICK_DEBUG_MASTER 0
+
+class Master { public:
+
+    Master(int nthreads);
+    ~Master();
+
+    void use();
+    void unuse();
+
+    void block_all();
+    void unblock_all();
+
+    void pause();
+    inline void unpause();
+    bool paused() const                         { return _master_paused > 0; }
+
+    inline int nthreads() const;
+    inline RouterThread *thread(int id) const;
+    void wake_somebody();
+
+#if CLICK_USERLEVEL
+    int add_signal_handler(int signo, Router *router, String handler);
+    int remove_signal_handler(int signo, Router *router, String handler);
+    void process_signals(RouterThread *thread);
+    static void signal_handler(int signo);      // not really public
+#endif
+
+    void kill_router(Router*);
+
+#if CLICK_NS
+    void initialize_ns(simclick_node_t *simnode);
+    simclick_node_t *simnode() const            { return _simnode; }
+#endif
+
+#if CLICK_DEBUG_MASTER || CLICK_DEBUG_SCHEDULING
+    String info() const;
+#endif
+
+#if CLICK_USERLEVEL
+    static volatile sig_atomic_t signals_pending;
+#endif
+
+  private:
+
+    // THREADS
+    RouterThread **_threads;
+    int _nthreads;
+
+    // ROUTERS
+    Router *_routers;
+    int _refcount;
+    void register_router(Router*);
+    void prepare_router(Router*);
+    void run_router(Router*, bool foreground);
+    void unregister_router(Router*);
+
+#if CLICK_LINUXMODULE
+    spinlock_t _master_lock;
+    struct task_struct *_master_lock_task;
+    int _master_lock_count;
+#elif HAVE_MULTITHREAD
+    Spinlock _master_lock;
+#endif
+    atomic_uint32_t _master_paused;
+    inline void lock_master();
+    inline void unlock_master();
+
+    void request_stop();
+    bool verify_stop(RouterThread* t);
+
+#if CLICK_USERLEVEL
+    // SIGNALS
+    struct SignalInfo {
+        int signo;
+        Router *router;
+        String handler;
+        SignalInfo *next;
+        SignalInfo(int signo_, Router *router_, const String &handler_)
+            : signo(signo_), router(router_), handler(handler_), next() {
+        }
+        bool equals(int signo_, Router *router_, const String &handler_) const {
+            return signo == signo_ && router == router_ && handler == handler_;
+        }
+    };
+    SignalInfo *_siginfo;
+    sigset_t _sig_dispatching;
+    Spinlock _signal_lock;
+#endif
+
+#if CLICK_NS
+    simclick_node_t *_simnode;
+#endif
+
+    Master(const Master&);
+    Master& operator=(const Master&);
+
+    friend class Task;
+    friend class RouterThread;
+    friend class Router;
+};
+
+inline int
+Master::nthreads() const
+{
+    return _nthreads - 1;
+}
+
+inline RouterThread*
+Master::thread(int id) const
+{
+    // return the requested thread, or the quiescent thread if there's no such
+    // thread
+    if (unsigned(id + 1) < unsigned(_nthreads))
+        return _threads[id + 1];
+    else
+        return _threads[0];
+}
+
+inline void
+Master::wake_somebody()
+{
+    _threads[1]->wake();
+}
+
+#if CLICK_USERLEVEL
+inline void
+RouterThread::run_signals()
+{
+    if (Master::signals_pending)
+        _master->process_signals(this);
+}
+
+inline int
+TimerSet::next_timer_delay(bool more_tasks, Timestamp &t) const
+{
+# if CLICK_NS
+    // The simulator should never block.
+    (void) more_tasks, (void) t;
+    return 0;
+# else
+    if (more_tasks || Master::signals_pending)
+        return 0;
+    t = timer_expiry_steady_adjusted();
+    if (!t)
+        return -1;              // block forever
+    else if (unlikely(Timestamp::warp_jumping())) {
+        Timestamp::warp_jump_steady(t);
+        return 0;
+    } else if ((t -= Timestamp::now_steady(), !t.is_negative())) {
+        t = t.warp_real_delay();
+        return 1;
+    } else
+        return 0;
+# endif
+}
+#endif
+
+inline void
+Master::request_stop()
+{
+    for (RouterThread **t = _threads; t != _threads + _nthreads; ++t)
+        (*t)->_stop_flag = true;
+    // ensure that at least one thread is awake to handle the stop event
+    wake_somebody();
+}
+
+inline void
+Master::lock_master()
+{
+#if CLICK_LINUXMODULE
+    if (current != _master_lock_task) {
+        spin_lock(&_master_lock);
+        _master_lock_task = current;
+    } else
+        _master_lock_count++;
+#elif HAVE_MULTITHREAD
+    _master_lock.acquire();
+#endif
+}
+
+inline void
+Master::unlock_master()
+{
+#if CLICK_LINUXMODULE
+    assert(current == _master_lock_task);
+    if (_master_lock_count == 0) {
+        _master_lock_task = 0;
+        spin_unlock(&_master_lock);
+    } else
+        _master_lock_count--;
+#elif HAVE_MULTITHREAD
+    _master_lock.release();
+#endif
+}
+
+inline void
+Master::unpause()
+{
+    _master_paused--;
+}
+
+inline Master *
+Element::master() const
+{
+    return _router->master();
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/md5.h b/openflow/include/click/md5.h
new file mode 100644
index 0000000..6023b07
--- /dev/null
+++ b/openflow/include/click/md5.h
@@ -0,0 +1,203 @@
+/* -*- related-file-name: "../../lib/md5.cc" -*-
+  Copyright (c) 2006-2007 Regents of the University of California
+  Altered for Click by Eddie Kohler. */
+/*
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+	references to Ghostscript; clarified derivation from RFC 1321;
+	now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+	added conditionalization for C++ compilation from Martin
+	Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+#ifndef CLICK_MD5_H
+#define CLICK_MD5_H
+#if CLICK_LINUXMODULE
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# include <linux/err.h>
+# include <linux/crypto.h>
+# if HAVE_LINUX_ASM_SCATTERLIST_H
+#  include <asm/scatterlist.h>
+# endif
+# include <linux/scatterlist.h>
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+typedef struct hash_desc md5_state_t;
+#else
+typedef struct crypto_tfm *md5_state_t;
+#endif
+
+static inline int md5_init(md5_state_t *pms) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+    pms->tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
+    if (IS_ERR(pms->tfm))
+	return PTR_ERR(pms->tfm);
+    pms->flags = 0;
+    crypto_hash_init(pms);
+    return 0;
+#else
+    *pms = crypto_alloc_tfm("md5", 0);
+    if (IS_ERR(*pms))
+	return PTR_ERR(*pms);
+    crypto_digest_init(*pms);
+    return 0;
+#endif
+}
+
+static inline void md5_reinit(md5_state_t *pms) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+    crypto_hash_init(pms);
+#else
+    crypto_digest_init(*pms);
+#endif
+}
+
+static inline void md5_append(md5_state_t *pms, const unsigned char *data, int nbytes) {
+    struct scatterlist sg;
+    if (likely(virt_addr_valid((unsigned long)data))) {
+        sg_init_one(&sg, const_cast<uint8_t *>(data), nbytes);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+        crypto_hash_update(pms, &sg, nbytes);
+#else
+        crypto_digest_update(*pms, &sg, 1);
+#endif
+    } else {
+        while (nbytes > 0) {
+            int len = nbytes;
+            int off = offset_in_page(data);
+            if (off + len > (int)PAGE_SIZE)
+                len = PAGE_SIZE - off;
+            sg_init_table(&sg, 1);
+            sg_set_page(&sg, vmalloc_to_page(const_cast<uint8_t *>(data)), len, off);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+            crypto_hash_update(pms, &sg, len);
+#else
+            crypto_digest_update(*pms, &sg, 1);
+#endif
+            data += len;
+            nbytes -= len;
+        }
+    }
+}
+
+static inline void md5_finish(md5_state_t *pms, unsigned char digest[16]) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+    crypto_hash_final(pms, digest);
+#else
+    crypto_digest_final(*pms, digest);
+#endif
+}
+
+static inline void md5_free(md5_state_t *pms) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+    crypto_free_hash(pms->tfm);
+#else
+    crypto_free_tfm(*pms);
+#endif
+}
+
+#else
+
+/*
+ * This package supports both compile-time and run-time determination of CPU
+ * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
+ * defined as non-zero, the code will be compiled to run only on big-endian
+ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
+ * run on either big- or little-endian CPUs, but will run slightly less
+ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
+ */
+
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef uint32_t md5_word_t; /* 32-bit word */
+
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    md5_word_t count[2];	/* message length in bits, lsw first */
+    md5_word_t abcd[4];		/* digest buffer */
+    md5_byte_t buf[64];		/* accumulate block */
+} md5_state_t;
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* Initialize the algorithm. */
+int md5_init(md5_state_t *pms);
+
+/* Re-initialize the algorithm after a prior md5_init(). */
+static inline void md5_reinit(md5_state_t *pms) {
+    md5_init(pms);
+}
+
+/* Append a string to the message. */
+void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
+
+/* Finish the message and return the digest. */
+#define MD5_DIGEST_SIZE			16
+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
+
+/* Finish the message and return the digest in ASCII.  DOES NOT write a
+   terminating NUL character.
+   If 'allow_at == 0', the digest uses characters [A-Za-z0-9_], and has
+   length between MD5_TEXT_DIGEST_SIZE and MD5_TEXT_DIGEST_MAX_SIZE.
+   If 'allow_at != 0', the digest uses characters [A-Za-z0-9_@], and has
+   length of exactly MD5_TEXT_DIGEST_SIZE.
+   Returns the number of characters written.  Again, this will NOT include
+   a terminating NUL. */
+#define MD5_TEXT_DIGEST_SIZE		22	/* min len */
+#define MD5_TEXT_DIGEST_MAX_SIZE	26	/* max len if !allow_at */
+int md5_finish_text(md5_state_t *pms, char *text_digest, int allow_at);
+
+#define md5_free(pms)		/* do nothing */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+#endif
+
diff --git a/openflow/include/click/nameinfo.hh b/openflow/include/click/nameinfo.hh
new file mode 100644
index 0000000..efd7a59
--- /dev/null
+++ b/openflow/include/click/nameinfo.hh
@@ -0,0 +1,528 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/nameinfo.cc" -*-
+#ifndef CLICK_NAMEINFO_HH
+#define CLICK_NAMEINFO_HH
+#include <click/args.hh>
+#include <click/straccum.hh>
+CLICK_DECLS
+class Element;
+class NameDB;
+class ErrorHandler;
+
+class NameInfo { public:
+
+    /** @brief Construct a NameInfo element.
+     *
+     * Users never need to call this. */
+    NameInfo();
+
+    /** @brief Destroy a NameInfo object.
+     *
+     * Also destroys all NameDB objects installed on this NameInfo.
+     *
+     * Users never need to call this. */
+    ~NameInfo();
+
+    /** @brief Static initialization for NameInfo.
+     *
+     * Creates the global NameInfo used for databases unconnected to any
+     * router.  Users never need to call this. */
+    static void static_initialize();
+
+    /** @brief Static cleanup for NameInfo.
+     *
+     * Destroys the global NameInfo used for databases unconnected to any
+     * router.  Users never need to call this. */
+    static void static_cleanup();
+
+    /** @brief Known name database types. */
+    enum DBType {
+	T_NONE = 0,			///< Nonexistent names database
+	T_SCHEDULEINFO = 0x00000001,	///< ScheduleInfo database
+	T_ANNOTATION = 0x00000002,	///< Packet annotation database
+	T_SCRIPT_INSN = 0x00000003,	///< Script instruction names database
+	T_SIGNO = 0x00000004,		///< User-level signal names database
+	T_SPINLOCK = 0x00000005,	///< Spinlock names database
+	T_ETHERNET_ADDR = 0x01000001,	///< Ethernet address names database
+	T_IP_ADDR = 0x04000001,		///< IP address names database
+	T_IP_PREFIX = 0x04000002,	///< IP prefix names database
+	T_IP_PROTO = 0x04000003,	///< IP protocol names database
+	T_IPFILTER_TYPE = 0x04000004,	///< IPFilter instruction names database
+	T_TCP_OPT = 0x04000005,		///< TCP option names database
+	T_IPREWRITER_PATTERN = 0x04000006, ///< IPRewriterPattern database
+	T_ICMP_TYPE = 0x04010000,	///< ICMP type names database
+	T_ICMP_CODE = 0x04010100,	///< ICMP code names database
+	T_IP_PORT = 0x04020000,		///< Starting point for IP per-protocol port names databases
+	T_TCP_PORT = 0x04020006,	///< TCP port names database
+	T_UDP_PORT = 0x04020011,	///< UDP port names database
+	T_IP_FIELDNAME = 0x04030000,	///< Starting point for IP per-protocol field names databases
+	T_ICMP_FIELDNAME = 0x04030001,	///< ICMP field names database
+	T_TCP_FIELDNAME = 0x04030006,	///< TCP field names database
+	T_UDP_FIELDNAME = 0x04030011,	///< UDP field names database
+	T_IP6_ADDR = 0x06000001,	///< IPv6 address names database
+	T_IP6_PREFIX = 0x06000002	///< IPv6 prefix names database
+    };
+
+    /** @brief Find or create a name database.
+     * @param type database type
+     * @param context compound element context
+     * @param value_size size of values stored in database
+     * @param create whether to create a DynamicNameDB if no database exists
+     *
+     * Returns an installed name database matching @a type and @a context.
+     * (If @a context is non-null, then the database matches the implied
+     * router and compound element context.  Otherwise, the database is the
+     * unique global database for the given @a type.)  If @a create is true,
+     * and no database exists exactly matching @a type and @a context, then a
+     * DynamicNameDB is created and installed with that @a type, @a context,
+     * and @a value_size.  Otherwise, the search bubbles up through the
+     * prefixes of @a context until an installed database is found.
+     *
+     * Returns null if no installed database is found.  @a value_size must
+     * match the value size in the returned database.
+     *
+     * Most users will use query() and define() directly, not call getdb().
+     */
+    static NameDB *getdb(uint32_t type, const Element *context,
+			 size_t value_size, bool create);
+
+    /** @brief Install a name database.
+     * @param db name database
+     * @param context compound element context
+     *
+     * Installs the given name database for the compound element context
+     * implied by @a context.  (If @a context is non-null, then the database
+     * is installed for the implied router and compound element context.  If
+     * it is null, the database is installed globally.)  The query() and
+     * define() operations apply only to installed databases.
+     *
+     * It is an error to install a database that has already been installed.
+     * It is also an error to install a database for a compound element
+     * context that already has a different database installed.  An installed
+     * NameDB is automatically destroyed when its containing NameInfo is
+     * destroyed (for example, when @a context's router is destroyed).
+     */
+    static void installdb(NameDB *db, const Element *context);
+
+    /** @brief Uninstall a name database.
+     * @param db name database
+     *
+     * Undoes the effects of installdb().  The given database will no longer
+     * be used for query() and define() operations.
+     */
+    static void uninstalldb(NameDB *db);
+
+    /** @brief Query installed databases for @a name.
+     * @param type database type
+     * @param context compound element context
+     * @param name name to look up
+     * @param value_store value storage
+     * @param value_size size of value storage
+     * @return true iff the query succeeded
+     *
+     * Queries all installed @a type databases that apply to the compound
+     * element @a context, returning the most specific value matching @a name.
+     * The value is stored in @a value_store.  The installed databases must
+     * have the given @a value_size.
+     */
+    static bool query(uint32_t type, const Element *context,
+		      const String &name, void *value_store, size_t value_size);
+
+    /** @brief Query installed databases for @a name, returning a 32-bit integer value.
+     * @param type database type
+     * @param context compound element context
+     * @param name name to look up
+     * @param value_store value storage
+     * @return true iff the query succeeded
+     *
+     * Queries all installed @a type databases that apply to the compound
+     * element @a context, returning the most specific value matching @a name.
+     * The value is stored in @a value_store.  The installed databases must
+     * have a value size of 4.
+     *
+     * If no matching name is found, query_int checks whether @a name unparses
+     * into a 32-bit integer value (for example, "30").  If so, *@a
+     * value_store is set to the corresponding integer and true is returned.
+     * Otherwise, false is returned.
+     */
+    static bool query_int(uint32_t type, const Element *context,
+			  const String &name, int32_t *value_store);
+
+    /** @overload */
+    static bool query_int(uint32_t type, const Element *context,
+			  const String &name, uint32_t *value_store);
+
+    /** @brief Query installed databases for @a value.
+     * @param type database type
+     * @param context compound element context
+     * @param value points to value to look up
+     * @param value_size size of value
+     * @return the name, or the empty string if the query failed
+     *
+     * Queries all installed @a type databases that apply to the compound
+     * element @a context, returning the name in the most specific database
+     * whose value matches @a value, or the empty string if the relevant
+     * databases don't support reverse queries or no such value exists.  The
+     * installed databases must have the given @a value_size.
+     */
+    static String revquery(uint32_t type, const Element *context,
+			   const void *value, size_t value_size);
+
+    /** @brief Query installed databases for a 32-bit integer @a value.
+     * @param type database type
+     * @param context compound element context
+     * @param value value to look up
+     * @return the name, or the empty string if the query failed
+     *
+     * Queries all installed @a type databases that apply to the compound
+     * element @a context, returning the name in the most specific database
+     * whose value matches @a value, or the empty string if the relevant
+     * databases don't support reverse queries or no such value exists.  The
+     * installed databases must have value size 4.
+     */
+    static inline String revquery_int(uint32_t type, const Element *context,
+				      int32_t value);
+
+    /** @brief Define @a name to equal @a value in the installed databases.
+     * @param type database type
+     * @param context compound element context
+     * @param name name to define
+     * @param value points to defined value
+     * @param value_size size of value
+     * @return true iff the name was defined
+     *
+     * Defines the given @a name to @a value in the installed @a type database
+     * with compound element @a context.  If no database exists exactly
+     * matching that @a type and @a context, a new DynamicNameDB is created
+     * and installed with those values (and the given @a value_size).  A name
+     * might not be defined if the existing database for that @a type and @a
+     * context doesn't support definitions, or if no new database can be
+     * created.  If any database exists, it must match the given @a
+     * value_size.
+     */
+    static inline bool define(uint32_t type, const Element *context,
+			      const String &name, const void *value, size_t value_size);
+
+    /** @brief Define @a name to equal 32-bit integer @a value in the installed databases.
+     * @param type database type
+     * @param context compound element context
+     * @param name name to define
+     * @param value defined value
+     * @return true iff the value was defined
+     *
+     * Defines the given @a name to @a value in the installed @a type database
+     * with compound element @a context.  If no database exists exactly
+     * matching that @a type and @a context, a new DynamicNameDB is created
+     * and installed with those values (and value size 4).  A name might not
+     * be defined if the existing database for that @a type and @a context
+     * doesn't support definitions, or if no new database can be created.  If
+     * any database exists, it must have value size 4.
+     */
+    static inline bool define_int(uint32_t type, const Element *context,
+				  const String &name, int32_t value);
+
+#if CLICK_NAMEDB_CHECK
+    /** @cond never */
+    void check(ErrorHandler *);
+    static void check(const Element *, ErrorHandler *);
+    /** @endcond never */
+#endif
+
+  private:
+
+    Vector<NameDB *> _namedb_roots;
+    Vector<NameDB *> _namedbs;
+
+    inline NameDB *install_dynamic_sentinel() { return (NameDB *) this; }
+    NameDB *namedb(uint32_t type, size_t size, const String &prefix, NameDB *installer);
+
+#if CLICK_NAMEDB_CHECK
+    uintptr_t _check_generation;
+    void checkdb(NameDB *db, NameDB *parent, ErrorHandler *errh);
+#endif
+
+};
+
+class NameDB { public:
+
+    /** @brief Construct a database.
+     * @param type database type
+     * @param context database compound element context, as a String
+     * @param value_size database value size
+     *
+     * @a value_size must be greater than 0. */
+    inline NameDB(uint32_t type, const String &context, size_t value_size);
+
+    /** @brief Destroy a database.
+     *
+     * Destroying an installed database automatically uninstalls it.
+     * See NameInfo::uninstalldb(). */
+    virtual ~NameDB() {
+	NameInfo::uninstalldb(this);
+    }
+
+    /** @brief Return the database type. */
+    uint32_t type() const {
+	return _type;
+    }
+
+    /** @brief Return the database's compound element context as a string. */
+    const String &context() const {
+	return _context;
+    }
+
+    /** @brief Return the contextual parent database, if any.
+     *
+     * The contextual parent database is the unique database, for the same
+     * router, with the same type(), whose context() is a prefix of this
+     * database's context(), that has the longest context() of any matching
+     * database.  If there is no such database returns null. */
+    NameDB *context_parent() const {
+	return _context_parent;
+    }
+
+    /** @brief Return the database's value size. */
+    size_t value_size() const {
+	return _value_size;
+    }
+
+    /** @brief Query this database for a given name.
+     * @param name name to look up
+     * @param value points to value storage
+     * @param value_size size of value storage
+     * @return true iff the query succeeded
+     *
+     * The @a value_size parameter must equal this database's value size. */
+    virtual bool query(const String &name, void *value, size_t value_size) = 0;
+
+    /** @brief Query this database for a given value.
+     * @param value points to value to look up
+     * @param value_size size of value storage
+     * @return the name for the given value, or an empty string if the value
+     * has not been defined
+     *
+     * The @a value_size parameter must equal this database's value size.
+     * The default implementation always returns the empty string. */
+    virtual String revquery(const void *value, size_t value_size);
+
+    /** @brief Define a name in this database to a given value.
+     * @param name name to define
+     * @param value points to value to define
+     * @param value_size size of value storage
+     * @return true iff the name was defined
+     *
+     * The @a value_size parameter must equal this database's value size.
+     * The default implementation always returns false. */
+    virtual bool define(const String &name, const void *value, size_t value_size);
+
+    /** @brief Define a name in this database to a 32-bit integer value.
+     * @param name name to define
+     * @param value value to define
+     * @return true iff the name was defined
+     *
+     * The database's value size must equal 4.  The implementation is the same
+     * as <code>define(name, &value, 4)</code>. */
+    inline bool define_int(const String &name, int32_t value);
+
+#if CLICK_NAMEDB_CHECK
+    /** @cond never */
+    virtual void check(ErrorHandler *);
+    /** @endcond never */
+#endif
+
+  private:
+
+    uint32_t _type;
+    String _context;
+    size_t _value_size;
+    NameDB *_context_parent;
+    NameDB *_context_sibling;
+    NameDB *_context_child;
+    NameInfo *_installed;
+
+#if CLICK_NAMEDB_CHECK
+    uintptr_t _check_generation;
+#endif
+
+    friend class NameInfo;
+
+};
+
+class StaticNameDB : public NameDB { public:
+
+    struct Entry {
+	const char *name;
+	uint32_t value;
+    };
+
+    /** @brief Construct a static name database.
+     * @param type database type
+     * @param context database compound element context, as a String
+     * @param entry pointer to static entry list
+     * @param nentry number of entries
+     *
+     * The entry array specifies the contents of the database.  It must be
+     * sorted by name: entry[i].name < entry[i+1].name for all 0 <= i <
+     * nentry-1.  The entry array must also persist as long as the database is
+     * in use; the database doesn't copy the entry array into its own memory,
+     * but continues to use the array passed in.  The resulting database has
+     * value_size() 4. */
+    inline StaticNameDB(uint32_t type, const String &context,
+			const Entry *entry, size_t nentry);
+
+    /** @brief Query this database for a given name.
+     * @param name name to look up
+     * @param value points to value storage
+     * @param value_size size of value storage
+     * @return true iff the query succeeded
+     *
+     * The @a value_size parameter must equal 4. */
+    bool query(const String &name, void *value, size_t value_size);
+
+    /** @brief Query this database for a given value.
+     * @param value points to value to look up
+     * @param value_size size of value storage
+     * @return the name for the given value, or an empty string if the value
+     * has not been defined
+     *
+     * The @a value_size parameter must equal 4. */
+    String revquery(const void *value, size_t value_size);
+
+#if CLICK_NAMEDB_CHECK
+    /** @cond never */
+    void check(ErrorHandler *);
+    /** @endcond never */
+#endif
+
+  private:
+
+    const Entry *_entries;
+    size_t _nentries;
+
+};
+
+class DynamicNameDB : public NameDB { public:
+
+    /** @brief Construct a dynamic name database.
+     * @param type database type
+     * @param context database compound element context, as a String
+     * @param value_size database value size
+     *
+     * @a value_size must be greater than 0.  The database is initially
+     * empty. */
+    inline DynamicNameDB(uint32_t type, const String &context, size_t value_size);
+
+    /** @brief Query this database for a given name.
+     * @param name name to look up
+     * @param value points to value storage
+     * @param value_size size of value storage
+     * @return true iff the query succeeded
+     *
+     * The @a value_size parameter must equal this database's value size. */
+    bool query(const String &name, void *value, size_t value_size);
+
+    /** @brief Query this database for a given value.
+     * @param value points to value to look up
+     * @param value_size size of value storage
+     * @return the name for the given value, or an empty string if the value
+     * has not been defined
+     *
+     * The @a value_size parameter must equal this database's value size. */
+    String revquery(const void *value, size_t value_size);
+
+    /** @brief Define a name in this database to a given value.
+     * @param name name to define
+     * @param value points to value to define
+     * @param value_size size of value storage
+     * @return true iff the name was defined
+     *
+     * The @a value_size parameter must equal this database's value size. */
+    bool define(const String &name, const void *value, size_t value_size);
+
+#if CLICK_NAMEDB_CHECK
+    /** @cond never */
+    void check(ErrorHandler *);
+    /** @endcond never */
+#endif
+
+  private:
+
+    Vector<String> _names;
+    StringAccum _values;
+    int _sorted;
+
+    void *find(const String &name, bool create);
+    void sort();
+
+};
+
+
+inline
+NameDB::NameDB(uint32_t type, const String &context, size_t vsize)
+    : _type(type), _context(context), _value_size(vsize),
+      _context_parent(0), _context_sibling(0), _context_child(0), _installed(0)
+{
+#if CLICK_NAMEDB_CHECK
+    _check_generation = 0;
+#endif
+    assert(_value_size > 0);
+}
+
+inline
+StaticNameDB::StaticNameDB(uint32_t type, const String &context, const Entry *entry, size_t nentry)
+    : NameDB(type, context, sizeof(entry->value)), _entries(entry), _nentries(nentry)
+{
+}
+
+inline
+DynamicNameDB::DynamicNameDB(uint32_t type, const String &context, size_t vsize)
+    : NameDB(type, context, vsize), _sorted(0)
+{
+}
+
+inline String
+NameInfo::revquery_int(uint32_t type, const Element *e, int32_t value)
+{
+    return revquery(type, e, &value, sizeof(value));
+}
+
+inline bool
+NameInfo::define(uint32_t type, const Element *e, const String &name, const void *value, size_t vsize)
+{
+    if (NameDB *db = getdb(type, e, vsize, true))
+	return db->define(name, value, vsize);
+    else
+	return false;
+}
+
+inline bool
+NameInfo::define_int(uint32_t type, const Element *e, const String &name, const int32_t value)
+{
+    if (NameDB *db = getdb(type, e, sizeof(value), true))
+	return db->define(name, &value, sizeof(value));
+    else
+	return false;
+}
+
+inline bool
+NameDB::define_int(const String &name, const int32_t value)
+{
+    return define(name, &value, sizeof(value));
+}
+
+
+/** @class NamedIntArg
+  @brief Parser class for named integers. */
+struct NamedIntArg {
+    NamedIntArg(uint32_t type)
+	: _type(type) {
+    }
+    bool parse(const String &str, int &value, const ArgContext &args) {
+	return NameInfo::query(_type, args.context(), str,
+			       &value, sizeof(value))
+	    || IntArg().parse(str, value, args);
+    }
+    int _type;
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/notifier.hh b/openflow/include/click/notifier.hh
new file mode 100644
index 0000000..71fed7a
--- /dev/null
+++ b/openflow/include/click/notifier.hh
@@ -0,0 +1,730 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/notifier.cc" -*-
+#ifndef CLICK_NOTIFIER_HH
+#define CLICK_NOTIFIER_HH
+#include <click/task.hh>
+#include <click/atomic.hh>
+#include <click/algorithm.hh>
+#if HAVE_CXX_PRAGMA_INTERFACE
+# pragma interface "click/notifier.hh"
+#endif
+CLICK_DECLS
+
+class NotifierSignal {
+  public:
+    typedef bool (NotifierSignal::*unspecified_bool_type)() const;
+
+    inline NotifierSignal();
+    inline NotifierSignal(atomic_uint32_t* value, uint32_t mask);
+    inline NotifierSignal(const NotifierSignal& x);
+    inline ~NotifierSignal();
+
+    static inline NotifierSignal idle_signal();
+    static inline NotifierSignal busy_signal();
+    static inline NotifierSignal overderived_signal();
+    static inline NotifierSignal uninitialized_signal();
+
+    inline bool active() const;
+    inline operator unspecified_bool_type() const;
+
+    inline bool set_active(bool active);
+
+    inline bool idle() const;
+    inline bool busy() const;
+    inline bool overderived() const;
+    inline bool initialized() const;
+
+    friend bool operator==(const NotifierSignal &a, const NotifierSignal &b);
+    friend bool operator!=(const NotifierSignal &a, const NotifierSignal &b);
+
+    NotifierSignal& operator=(const NotifierSignal& x);
+    NotifierSignal& operator+=(const NotifierSignal& x);
+    friend NotifierSignal operator+(NotifierSignal a, const NotifierSignal &b);
+
+    inline void swap(NotifierSignal& x);
+
+    String unparse(Router *router) const;
+
+    static void static_initialize();
+
+  private:
+    struct vmpair {
+	atomic_uint32_t *value;
+	uint32_t mask;
+    };
+    union vmvalue {
+	atomic_uint32_t *v1;
+	vmpair *vm;
+    };
+
+    vmvalue _v;
+    uint32_t _mask;
+
+    enum {
+	true_mask = 1, false_mask = 2, overderived_mask = 4,
+	uninitialized_mask = 8
+    };
+    static atomic_uint32_t static_value;
+
+    void hard_assign_vm(const NotifierSignal &x);
+    void hard_derive_one(atomic_uint32_t *value, uint32_t mask);
+    static bool hard_equals(const vmpair *a, const vmpair *b);
+};
+
+class Notifier { public:
+
+    enum SearchOp { SEARCH_STOP = 0, SEARCH_CONTINUE, SEARCH_CONTINUE_WAKE };
+    typedef void (*callback_type)(void *, Notifier *);
+
+    inline Notifier(SearchOp op = SEARCH_STOP);
+    inline Notifier(const NotifierSignal &signal, SearchOp op = SEARCH_STOP);
+    virtual ~Notifier();
+
+    /** @brief Return whether the Notifier is initialized. */
+    inline bool initialized() const {
+	return _signal.initialized();
+    }
+
+    int initialize(const char *name, Router *router);
+
+    inline const NotifierSignal &signal() const;
+    inline SearchOp search_op() const;
+
+    inline bool active() const;
+
+    inline bool set_active(bool active);
+    inline void wake();
+    inline void sleep();
+
+    virtual int add_activate_callback(callback_type f, void *user_data);
+    virtual void remove_activate_callback(callback_type f, void *user_data);
+    inline int add_listener(Task *task);
+    inline void remove_listener(Task *task);
+    inline int add_dependent_signal(NotifierSignal *signal);
+    inline void remove_dependent_signal(NotifierSignal *signal);
+
+    static const char EMPTY_NOTIFIER[];
+    static const char FULL_NOTIFIER[];
+
+    static inline NotifierSignal upstream_empty_signal(Element *e, int port);
+    static inline NotifierSignal upstream_empty_signal(Element *e, int port, Task *task);
+    static inline NotifierSignal upstream_empty_signal(Element *e, int port, Notifier *dependent_notifier);
+    static NotifierSignal upstream_empty_signal(Element *e, int port, callback_type f, void *user_data);
+
+    static inline NotifierSignal downstream_full_signal(Element *e, int port);
+    static inline NotifierSignal downstream_full_signal(Element *e, int port, Task *task);
+    static inline NotifierSignal downstream_full_signal(Element *e, int port, Notifier *dependent_notifier);
+    static NotifierSignal downstream_full_signal(Element *e, int port, callback_type f, void *user_data);
+
+    static inline NotifierSignal upstream_empty_signal(Element *e, int port, int) CLICK_DEPRECATED;
+    static inline NotifierSignal upstream_empty_signal(Element *e, int port, int, Notifier *) CLICK_DEPRECATED;
+    static inline NotifierSignal downstream_full_signal(Element *e, int port, int) CLICK_DEPRECATED;
+    static inline NotifierSignal downstream_full_signal(Element *e, int port, int, Notifier *) CLICK_DEPRECATED;
+
+  private:
+
+    NotifierSignal _signal;
+    SearchOp _search_op;
+
+    static void dependent_signal_callback(void *, Notifier *);
+
+};
+
+class ActiveNotifier : public Notifier { public:
+
+    ActiveNotifier(SearchOp op = SEARCH_STOP);
+    ~ActiveNotifier();
+
+    int add_activate_callback(callback_type f, void *v);
+    void remove_activate_callback(callback_type f, void *v);
+    void listeners(Vector<Task*> &v) const CLICK_DEPRECATED;
+
+    inline void set_active(bool active, bool schedule = true);
+    inline void wake();
+    inline void sleep();
+
+#if CLICK_DEBUG_SCHEDULING
+    String unparse(Router *router) const;
+#endif
+
+  private:
+
+    typedef union {
+	Task *t;
+	callback_type f;
+	void *v;
+	uintptr_t p;
+    } task_or_signal_t;
+
+    Task* _listener1;
+    task_or_signal_t* _listeners;
+
+    int listener_add(callback_type f, void *v);
+    int listener_remove(callback_type f, void *v);
+
+    ActiveNotifier(const ActiveNotifier&); // does not exist
+    ActiveNotifier& operator=(const ActiveNotifier&); // does not exist
+
+};
+
+
+/** @brief Construct a busy signal.
+ *
+ * The returned signal is always active. */
+inline NotifierSignal::NotifierSignal()
+    : _mask(true_mask) {
+    _v.v1 = &static_value;
+}
+
+/** @brief Construct an activity signal.
+ *
+ * Elements should not use this constructor directly.
+ * @sa Router::new_notifier_signal */
+inline NotifierSignal::NotifierSignal(atomic_uint32_t* value, uint32_t mask)
+    : _mask(mask) {
+    _v.v1 = value;
+}
+
+/** @brief Copy construct a signal. */
+inline NotifierSignal::NotifierSignal(const NotifierSignal& x)
+    : _mask(x._mask) {
+    if (likely(_mask))
+	_v.v1 = x._v.v1;
+    else
+	hard_assign_vm(x);
+}
+
+/** @brief Destroy a signal. */
+inline NotifierSignal::~NotifierSignal() {
+    if (unlikely(_mask == 0))
+	delete[] _v.vm;
+}
+
+/** @brief Return an idle signal.
+ *
+ * The returned signal is never active. */
+inline NotifierSignal NotifierSignal::idle_signal() {
+    return NotifierSignal(&static_value, false_mask);
+}
+
+/** @brief Return a busy signal.
+ *
+ * The returned signal is always active. */
+inline NotifierSignal NotifierSignal::busy_signal() {
+    return NotifierSignal(&static_value, true_mask);
+}
+
+/** @brief Return an overderived busy signal.
+ *
+ * Overderived signals replace derived signals that are too complex to
+ * represent.  An overderived signal, like a busy signal, is always
+ * active. */
+inline NotifierSignal NotifierSignal::overderived_signal() {
+    return NotifierSignal(&static_value, overderived_mask | true_mask);
+}
+
+/** @brief Return an uninitialized signal.
+ *
+ * Uninitialized signals may be used occasionally as placeholders for true
+ * signals to be added later.  Uninitialized signals are never active. */
+inline NotifierSignal NotifierSignal::uninitialized_signal() {
+    return NotifierSignal(&static_value, uninitialized_mask);
+}
+
+/** @brief Test if the signal is active. */
+inline bool NotifierSignal::active() const {
+    // 2012.May.16 This fence is necessary; consider, for example,
+    // InfiniteSource's checking of nonfull notifiers.
+    click_fence();
+    if (likely(_mask))
+	return (*_v.v1 & _mask) != 0;
+    else {
+	for (vmpair *vm = _v.vm; vm->mask; ++vm)
+	    if ((*vm->value & vm->mask) != 0)
+		return true;
+	return false;
+    }
+}
+
+/** @brief Test if the signal is active. */
+inline NotifierSignal::operator unspecified_bool_type() const {
+    return active() ? &NotifierSignal::active : 0;
+}
+
+/** @brief Test if the signal is idle.
+ * @return true iff the signal is idle, i.e. it will never be active. */
+inline bool NotifierSignal::idle() const {
+    return (_mask == false_mask && _v.v1 == &static_value);
+}
+
+/** @brief Test if the signal is busy.
+ * @return true iff the signal is busy, i.e. it will always be active.
+ *
+ * @note An overderived_signal() is busy(), but a busy_signal() is not
+ * overderived(). */
+inline bool NotifierSignal::busy() const {
+    return ((_mask & true_mask) && _v.v1 == &static_value);
+}
+
+/** @brief Test if the signal is overderived.
+ * @return true iff the signal equals overderived_signal().
+ *
+ * @note An overderived_signal() is busy(), but a busy_signal() is not
+ * overderived(). */
+inline bool NotifierSignal::overderived() const {
+    return ((_mask & overderived_mask) && _v.v1 == &static_value);
+}
+
+/** @brief Test if the signal is initialized.
+ * @return true iff the signal doesn't equal uninitialized_signal(). */
+inline bool NotifierSignal::initialized() const {
+    return (!(_mask & uninitialized_mask) || _v.v1 != &static_value);
+}
+
+/** @brief Set whether the basic signal is active.
+ * @param active true iff the basic signal is active
+ * @return previous active state
+ *
+ * Use this function to set whether a basic signal is active.
+ *
+ * It is illegal to call set_active() on derived, idle, busy, or
+ * overderived signals.  Some of these actions may cause an assertion
+ * failure. */
+inline bool NotifierSignal::set_active(bool active) {
+    assert(_v.v1 != &static_value && !(_mask & (_mask - 1)));
+    uint32_t expected = *_v.v1;
+#if !CLICK_USERLEVEL || HAVE_MULTITHREAD
+    while (_mask) {
+	uint32_t desired = (active ? expected | _mask : expected & ~_mask);
+	uint32_t actual = _v.v1->compare_swap(expected, desired);
+	if (expected == actual)
+	    break;
+	expected = actual;
+    }
+#else
+    *_v.v1 = (active ? expected | _mask : expected & ~_mask);
+#endif
+    return expected & _mask;
+}
+
+/** @brief Assign a signal. */
+inline NotifierSignal& NotifierSignal::operator=(const NotifierSignal& x) {
+    if (likely(this != &x)) {
+	if (unlikely(_mask == 0))
+	    delete[] _v.vm;
+	_mask = x._mask;
+	if (likely(_mask))
+	    _v.v1 = x._v.v1;
+	else
+	    hard_assign_vm(x);
+    }
+    return *this;
+}
+
+/** @brief Exchange the values of this signal and @a x. */
+inline void NotifierSignal::swap(NotifierSignal& x) {
+    click_swap(_v, x._v);
+    click_swap(_mask, x._mask);
+}
+
+/** @relates NotifierSignal
+ * @brief Test if two NotifierSignals are equal.
+ *
+ * Returns true iff the two NotifierSignals are the same -- i.e., they
+ * combine information about exactly the same sets of basic signals.
+ *
+ * All idle() signals compare equal.  busy_signal() and
+ * overderived_signal() do not compare equal, however. */
+inline bool operator==(const NotifierSignal& a, const NotifierSignal& b) {
+    if (a._mask == b._mask) {
+	if (likely(a._mask))
+	    return a._v.v1 == b._v.v1;
+	else
+	    return NotifierSignal::hard_equals(a._v.vm, b._v.vm);
+    } else
+	return false;
+}
+
+/** @relates NotifierSignal
+ * @brief Test if two NotifierSignals are unequal.
+ *
+ * Returns true iff !(@a a == @a b). */
+inline bool operator!=(const NotifierSignal& a, const NotifierSignal& b) {
+    return !(a == b);
+}
+
+/** @relates NotifierSignal
+ * @brief Return a derived signal.
+ *
+ * Returns a derived signal that combines information from its arguments.
+ * The result will be active whenever @a a and/or @a b is active.  If the
+ * combination of @a a and @a b is too complex to represent, returns an
+ * overderived signal; this trivially follows the invariant since it is
+ * always active.
+ *
+ * Signal derivation is commutative and associative.  The following
+ * special combinations are worth remembering:
+ *
+ *  - An uninitialized signal plus any other signal is uninitialized.
+ *  - An idle signal plus any signal @a a equals @a a.
+ *  - A busy signal plus any other initialized signal is busy.
+ *  - overderived_signal() plus busy_signal() equals busy_signal().
+ *
+ * @sa NotifierSignal::operator+= */
+inline NotifierSignal operator+(NotifierSignal a, const NotifierSignal& b) {
+    return a += b;
+}
+
+/** @brief Constructs a Notifier.
+ * @param op controls notifier path search
+ *
+ * This function constructs a Notifier object.  The Notifier's associated
+ * NotifierSignal is initially idle; it becomes associated with a signal after
+ * initialize() is called.
+ *
+ * The @a op argument controls path search.  The rest of this entry
+ * describes it further.
+ *
+ * Elements interested in notification generally search for Notifier objects
+ * along all possible packet paths upstream (or downstream) of one of their
+ * ports.  When a Notifier is found along a path, further searching along that
+ * path is cut off, so only the closest Notifiers are found.  Sometimes,
+ * however, it makes more sense to continue searching for more Notifiers.  The
+ * correct behavior is Notifier-specific, and is controlled by this method.
+ * When the search encounters a Notifier, it consults the Notifier's @a
+ * op variable supplied to the constructor.  It should equal one of
+ * three SearchOp constants, which correspond to the following behavior:
+ *
+ * <dl>
+ * <dt>SEARCH_STOP</dt>
+ * <dd>Stop searching along this path.  This is the default.</dd>
+ * <dt>SEARCH_CONTINUE</dt>
+ * <dd>Continue searching along this path.</dd>
+ * <dt>SEARCH_CONTINUE_WAKE</dt>
+ * <dd>Continue searching along this path, but any further Notifiers should
+ * only be used for adding and removing listeners; ignore their NotifierSignal
+ * objects.  This operation is useful, for example, for schedulers that store
+ * packets temporarily.  Such schedulers provide their own NotifierSignal,
+ * since the scheduler may still hold a packet even when all upstream sources
+ * are empty, but since they aren't packet sources, they don't know when
+ * new packets arrive and can't wake up sleeping listeners.  During
+ * initialization, such schedulers should call Notifier::upstream_empty_signal,
+ * passing their own Notifier as the fourth argument.  This will ensure that
+ * their signal is turned on appropriately whenever an upstream queue becomes
+ * nonempty.</dd>
+ * </dl>
+ */
+inline Notifier::Notifier(SearchOp op)
+    : _signal(NotifierSignal::uninitialized_signal()), _search_op(op) {
+}
+
+/** @brief Constructs a Notifier associated with a given signal.
+ * @param signal the associated NotifierSignal
+ * @param op controls notifier path search
+ *
+ * This function constructs a Notifier object associated with a specific
+ * NotifierSignal, such as NotifierSignal::idle_signal().  Calling
+ * initialize() on this Notifier will not change the associated
+ * NotifierSignal.  The @a op argument is as in
+ * Notifier::Notifier(SearchOp), above.
+ */
+inline Notifier::Notifier(const NotifierSignal &signal, SearchOp op)
+    : _signal(signal), _search_op(op) {
+}
+
+/** @brief Return this Notifier's associated NotifierSignal.
+ *
+ * Every Notifier object corresponds to one NotifierSignal; this method
+ * returns it.  The signal is @link NotifierSignal::idle idle() @endlink
+ * before initialize() is called.
+ */
+inline const NotifierSignal& Notifier::signal() const {
+    return _signal;
+}
+
+/** @brief Return this Notifier's search operation.
+ *
+ * @sa Notifier() for a detailed explanation of search operations.
+ */
+inline Notifier::SearchOp Notifier::search_op() const {
+    return _search_op;
+}
+
+/** @brief Returns whether the associated signal is active.
+ *
+ * Same as signal().active().
+ */
+inline bool Notifier::active() const {
+    return _signal.active();
+}
+
+/** @brief Set the associated signal's activity.
+ * @param active true iff the signal should be active
+ * @return previous active state
+ */
+inline bool Notifier::set_active(bool active) {
+    return _signal.set_active(active);
+}
+
+/** @brief Set the associated signal to active.
+ * @sa set_active
+ */
+inline void Notifier::wake() {
+    set_active(true);
+}
+
+/** @brief Set the associated signal to inactive.
+ * @sa set_active
+ */
+inline void Notifier::sleep() {
+    set_active(false);
+}
+
+/** @brief Register a listener with this Notifier.
+ * @param task Task to reschedule when this Notifier becomes active
+ *
+ * When this Notifier's associated signal is activated, the Notifier should
+ * schedule @a task. Not all types of Notifier provide this functionality. The
+ * default implementation does nothing.
+ *
+ * @sa remove_listener, add_activate_callback, add_dependent_signal
+ */
+inline int Notifier::add_listener(Task* task) {
+    return add_activate_callback(0, task);
+}
+
+/** @brief Unregister a listener with this Notifier.
+ * @param task listener Task
+ *
+ * Undoes the effect of all prior add_listener(@a task) calls. Does nothing if
+ * @a task was never added. The default implementation does nothing.
+ *
+ * @sa add_listener
+ */
+inline void Notifier::remove_listener(Task* task) {
+    remove_activate_callback(0, task);
+}
+
+/** @brief Register a dependent signal with this Notifier.
+ * @param signal dependent signal
+ *
+ * When this Notifier's associated signal is activated, the Notifier should
+ * also activate @a signal. Not all types of Notifier provide this
+ * functionality. The default implementation does nothing.
+ *
+ * @sa add_listener, add_activate_callback, remove_dependent_signal
+ */
+inline int Notifier::add_dependent_signal(NotifierSignal* signal) {
+    return add_activate_callback(dependent_signal_callback, signal);
+}
+
+/** @brief Unregister a dependent signal with this Notifier.
+ * @param signal dependent signal
+ *
+ * Undoes the effect of all prior add_dependent_signal(@a signal) calls. Does
+ * nothing if @a signal was never added. The default implementation does
+ * nothing.
+ *
+ * @sa add_dependent_signal
+ */
+inline void Notifier::remove_dependent_signal(NotifierSignal* signal) {
+    remove_activate_callback(dependent_signal_callback, signal);
+}
+
+/** @brief Calculate and return the NotifierSignal derived from all empty
+ * notifiers upstream of element @a e's input @a port.
+ * @param e an element
+ * @param port the input port of @a e at which to start the upstream search
+ *
+ * Searches the configuration upstream of element @a e's input @a port for @e
+ * empty @e notifiers.  These notifiers are associated with packet storage,
+ * and should be true when packets are available (or likely to be available
+ * quite soon), and false when they are not.  All notifiers found are combined
+ * into a single derived signal.  Thus, if any of the base notifiers are
+ * active, indicating that at least one packet is available upstream, the
+ * derived signal will also be active.  Element @a e's code generally uses the
+ * resulting signal to decide whether or not to reschedule itself.
+ *
+ * The returned signal is generally conservative, meaning that the signal
+ * is true whenever a packet exists upstream, but the elements that provide
+ * notification are responsible for ensuring this.
+ *
+ * Overloaded versions of this function can also register a task (as in
+ * add_listener()), a signal (as in add_dependent_notifier()), or a callback
+ * function (as in add_active_callback()) for each located notifier. When
+ * packets become available, the task will be scheduled, the signal will be
+ * activated, or the callback will be called.
+ *
+ * <h3>Supporting upstream_empty_signal()</h3>
+ *
+ * Elements that have an empty notifier must override the Element::cast()
+ * method.  When passed the @a name Notifier::EMPTY_NOTIFIER, this method
+ * should return a pointer to the corresponding Notifier object.
+ *
+ * @sa downstream_full_signal
+ */
+inline NotifierSignal Notifier::upstream_empty_signal(Element* e, int port) {
+    return upstream_empty_signal(e, port, (callback_type) 0, 0);
+}
+
+/** @brief Calculate and return the NotifierSignal derived from all empty
+ * notifiers upstream of element @a e's input @a port.
+ * @param e an element
+ * @param port the input port of @a e at which to start the upstream search
+ * @param task task to schedule when packets become available
+ * @sa add_listener */
+inline NotifierSignal Notifier::upstream_empty_signal(Element* e, int port,
+                                                      Task* task) {
+    return upstream_empty_signal(e, port, (callback_type) 0, task);
+}
+
+/** @brief Calculate and return the NotifierSignal derived from all empty
+ * notifiers upstream of element @a e's input @a port.
+ * @param e an element
+ * @param port the input port of @a e at which to start the upstream search
+ * @param notifier notifier to activate when packets become available
+ * @sa add_dependent_signal */
+inline NotifierSignal Notifier::upstream_empty_signal(Element* e, int port,
+                                                      Notifier* dependent_notifier) {
+    return upstream_empty_signal(e, port, dependent_signal_callback, &dependent_notifier->_signal);
+}
+
+/** @brief Calculate and return the NotifierSignal derived from all full
+ * notifiers downstream of element @a e's output @a port.
+ * @param e an element
+ * @param port the output port of @a e at which to start the downstream search
+ *
+ * Searches the configuration downstream of element @a e's output @a port for
+ * @e full @e notifiers.  These notifiers are associated with packet storage,
+ * and should be true when there is space for at least one packet, and false
+ * when there is not.  All notifiers found are combined into a single derived
+ * signal.  Thus, if any of the base notifiers are active, indicating that at
+ * least one path has available space, the derived signal will also be active.
+ * Element @a e's code generally uses the resulting signal to decide whether
+ * or not to reschedule itself.
+ *
+ * Overloaded versions of this function can also register a task (as in
+ * add_listener()), a signal (as in add_dependent_notifier()), or a callback
+ * function (as in add_active_callback()) for each located notifier. When
+ * space becomes available, the task will be scheduled, the signal will be
+ * activated, or the callback will be called.
+ *
+ * In current Click, the returned signal is conservative: if it's inactive,
+ * then there is no space for packets downstream.
+ *
+ * <h3>Supporting downstream_full_signal()</h3>
+ *
+ * Elements that have a full notifier must override the Element::cast()
+ * method.  When passed the @a name Notifier::FULL_NOTIFIER, this method
+ * should return a pointer to the corresponding Notifier object.
+ *
+ * @sa upstream_empty_signal
+ */
+inline NotifierSignal Notifier::downstream_full_signal(Element* e, int port) {
+    return downstream_full_signal(e, port, (callback_type) 0, 0);
+}
+
+/** @brief Calculate and return the NotifierSignal derived from all full
+ * notifiers downstream of element @a e's output @a port.
+ * @param e an element
+ * @param port the output port of @a e at which to start the downstream search
+ * @param task task to schedule when packets become available
+ * @sa add_listener */
+inline NotifierSignal Notifier::downstream_full_signal(Element* e, int port,
+                                                       Task* task) {
+    return downstream_full_signal(e, port, (callback_type) 0, task);
+}
+
+/** @brief Calculate and return the NotifierSignal derived from all full
+ * notifiers downstream of element @a e's output @a port.
+ * @param e an element
+ * @param port the output port of @a e at which to start the downstream search
+ * @param notifier notifier to activate when packets become available
+ * @sa add_dependent_signal */
+inline NotifierSignal Notifier::downstream_full_signal(Element* e, int port,
+                                                       Notifier* dependent_notifier) {
+    return downstream_full_signal(e, port, dependent_signal_callback, &dependent_notifier->_signal);
+}
+
+/** @cond never */
+inline NotifierSignal Notifier::upstream_empty_signal(Element* e, int port, int x) {
+    (void) x;
+    assert(x == 0);
+    return upstream_empty_signal(e, port);
+}
+
+inline NotifierSignal Notifier::upstream_empty_signal(Element* e, int port, int x,
+                                                      Notifier* notifier) {
+    (void) x;
+    assert(x == 0);
+    return upstream_empty_signal(e, port, notifier);
+}
+
+inline NotifierSignal Notifier::downstream_full_signal(Element* e, int port, int x) {
+    (void) x;
+    assert(x == 0);
+    return downstream_full_signal(e, port);
+}
+
+inline NotifierSignal Notifier::downstream_full_signal(Element* e, int port, int x,
+                                                       Notifier* notifier) {
+    (void) x;
+    assert(x == 0);
+    return downstream_full_signal(e, port, notifier);
+}
+/** @endcond never */
+
+/** @brief Set the associated signal's activity, possibly scheduling any
+ * listener tasks.
+ * @param active true iff the signal should be active
+ * @param schedule if true, wake up listener tasks
+ *
+ * If @a active and @a schedule are both true, and the signal was previously
+ * inactive, then any listener Tasks are scheduled with Task::reschedule().
+ *
+ * @sa wake, sleep, add_listener
+ */
+inline void ActiveNotifier::set_active(bool active, bool schedule) {
+    bool was_active = Notifier::set_active(active);
+    if (active && schedule && !was_active) {
+	// 2007.Sep.6: Perhaps there was a race condition here.  Make sure
+	// that we set the notifier to active BEFORE rescheduling downstream
+	// tasks.  This is because, in a multithreaded environment, a task we
+	// reschedule might run BEFORE we set the notifier; after which it
+	// would go to sleep forever.
+	if (_listener1)
+	    _listener1->reschedule();
+	else if (task_or_signal_t *tos = _listeners) {
+	    for (; tos->p > 1; tos++)
+		tos->t->reschedule();
+	    if (tos->p == 1)
+		for (tos++; tos->p; tos += 2)
+		    tos->f(tos[1].v, this);
+	}
+    }
+}
+
+/** @brief Set the associated signal to active and schedule any listener
+ * tasks.
+ *
+ * If the signal was previously inactive, then any listener Tasks are
+ * scheduled with Task::reschedule().
+ *
+ * @sa set_active, add_listener
+ */
+inline void ActiveNotifier::wake() {
+    set_active(true, true);
+}
+
+/** @brief Set the associated signal to inactive.
+ * @sa set_active
+ */
+inline void ActiveNotifier::sleep() {
+    set_active(false, true);
+}
+
+inline void click_swap(NotifierSignal& x, NotifierSignal& y) {
+    x.swap(y);
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/package.hh b/openflow/include/click/package.hh
new file mode 100644
index 0000000..6f3c3b5
--- /dev/null
+++ b/openflow/include/click/package.hh
@@ -0,0 +1,30 @@
+#ifndef CLICK_PACKAGE_HH
+#define CLICK_PACKAGE_HH
+#include <click/vector.hh>
+#include <click/string.hh>
+CLICK_DECLS
+#ifndef CLICK_TOOL
+class Element;
+#endif
+CLICK_ENDDECLS
+
+extern "C" {
+
+void click_provide(const char *);
+void click_unprovide(const char *);
+bool click_has_provision(const char *);
+void click_public_packages(CLICK_NAME(Vector)<CLICK_NAME(String)> &);
+
+#if CLICK_LINUXMODULE
+int click_add_element_type(const char *element_name, CLICK_NAME(Element) *(*factory)(uintptr_t thunk), uintptr_t thunk, struct module *);
+int click_add_element_type_stable(const char *element_name, CLICK_NAME(Element) *(*factory)(uintptr_t thunk), uintptr_t thunk, struct module *);
+void click_remove_element_type(int);
+#elif !CLICK_TOOL
+int click_add_element_type(const char *element_name, CLICK_NAME(Element) *(*factory)(uintptr_t thunk), uintptr_t thunk);
+int click_add_element_type_stable(const char *element_name, CLICK_NAME(Element) *(*factory)(uintptr_t thunk), uintptr_t thunk);
+void click_remove_element_type(int);
+#endif
+
+}
+
+#endif
diff --git a/openflow/include/click/packet.hh b/openflow/include/click/packet.hh
new file mode 100644
index 0000000..9ec693f
--- /dev/null
+++ b/openflow/include/click/packet.hh
@@ -0,0 +1,2434 @@
+// -*- related-file-name: "../../lib/packet.cc" -*-
+#ifndef CLICK_PACKET_HH
+#define CLICK_PACKET_HH
+#include <click/ipaddress.hh>
+#include <click/glue.hh>
+#include <click/timestamp.hh>
+#if CLICK_LINUXMODULE
+# include <click/skbmgr.hh>
+#else
+# include <click/atomic.hh>
+#endif
+#if CLICK_BSDMODULE
+# include <sys/stddef.h>
+#endif
+#if CLICK_NS
+# include <click/simclick.h>
+#endif
+#if (CLICK_USERLEVEL || CLICK_NS || CLICK_MINIOS) && (!HAVE_MULTITHREAD || HAVE___THREAD_STORAGE_CLASS)
+# define HAVE_CLICK_PACKET_POOL 1
+#endif
+#ifndef CLICK_PACKET_DEPRECATED_ENUM
+# define CLICK_PACKET_DEPRECATED_ENUM CLICK_DEPRECATED_ENUM
+#endif
+struct click_ether;
+struct click_ip;
+struct click_icmp;
+struct click_ip6;
+struct click_tcp;
+struct click_udp;
+CLICK_DECLS
+
+class IP6Address;
+class WritablePacket;
+
+class Packet { public:
+
+    /** @name Data */
+    //@{
+    // PACKET CREATION
+
+    enum {
+#ifdef CLICK_MINIOS
+	default_headroom = 48,		///< Increase headroom for improved performance.
+#else
+	default_headroom = 28,		///< Default packet headroom() for
+					///  Packet::make().  4-byte aligned.
+#endif
+	min_buffer_length = 64		///< Minimum buffer_length() for
+					///  Packet::make()
+    };
+
+    static WritablePacket *make(uint32_t headroom, const void *data,
+				uint32_t length, uint32_t tailroom) CLICK_WARN_UNUSED_RESULT;
+    static inline WritablePacket *make(const void *data, uint32_t length) CLICK_WARN_UNUSED_RESULT;
+    static inline WritablePacket *make(uint32_t length) CLICK_WARN_UNUSED_RESULT;
+#if CLICK_LINUXMODULE
+    static Packet *make(struct sk_buff *skb) CLICK_WARN_UNUSED_RESULT;
+#endif
+#if CLICK_BSDMODULE
+    // Packet::make(mbuf *) wraps a Packet around an existing mbuf.
+    // Packet now owns the mbuf.
+    static inline Packet *make(struct mbuf *mbuf) CLICK_WARN_UNUSED_RESULT;
+#endif
+#if CLICK_USERLEVEL || CLICK_MINIOS
+    typedef void (*buffer_destructor_type)(unsigned char* buf, size_t sz, void* argument);
+    static WritablePacket* make(unsigned char* data, uint32_t length,
+				buffer_destructor_type buffer_destructor,
+                                void* argument = (void*) 0, int headroom = 0, int tailroom = 0) CLICK_WARN_UNUSED_RESULT;
+#endif
+
+    static void static_cleanup();
+
+    inline void kill();
+
+    inline bool shared() const;
+    Packet *clone() CLICK_WARN_UNUSED_RESULT;
+    inline WritablePacket *uniqueify() CLICK_WARN_UNUSED_RESULT;
+
+    inline const unsigned char *data() const;
+    inline const unsigned char *end_data() const;
+    inline uint32_t length() const;
+    inline uint32_t headroom() const;
+    inline uint32_t tailroom() const;
+    inline const unsigned char *buffer() const;
+    inline const unsigned char *end_buffer() const;
+    inline uint32_t buffer_length() const;
+
+#if CLICK_LINUXMODULE
+    struct sk_buff *skb()		{ return (struct sk_buff *)this; }
+    const struct sk_buff *skb() const	{ return (const struct sk_buff*)this; }
+#elif CLICK_BSDMODULE
+    struct mbuf *m()			{ return _m; }
+    const struct mbuf *m() const	{ return (const struct mbuf *)_m; }
+    struct mbuf *steal_m();
+    struct mbuf *dup_jumbo_m(struct mbuf *mbuf);
+#elif CLICK_USERLEVEL || CLICK_MINIOS
+    buffer_destructor_type buffer_destructor() const {
+	return _destructor;
+    }
+
+    void set_buffer_destructor(buffer_destructor_type destructor) {
+        _destructor = destructor;
+    }
+
+    void* destructor_argument() {
+        return _destructor_argument;
+    }
+
+    void reset_buffer() {
+	assert(!shared());
+	_head = _data = _tail = _end = 0;
+	_destructor = 0;
+    }
+#endif
+
+
+    /** @brief Add space for a header before the packet.
+     * @param len amount of space to add
+     * @return packet with added header space, or null on failure
+     *
+     * Returns a packet with an additional @a len bytes of uninitialized space
+     * before the current packet's data().  A copy of the packet data is made
+     * if there isn't enough headroom() in the current packet, or if the
+     * current packet is shared().  If no copy is made, this operation is
+     * quite efficient.
+     *
+     * If a data copy would be required, but the copy fails because of lack of
+     * memory, then the current packet is freed.
+     *
+     * push() is usually used like this:
+     * @code
+     * WritablePacket *q = p->push(14);
+     * if (!q)
+     *     return 0;
+     * // p must not be used here.
+     * @endcode
+     *
+     * @post new length() == old length() + @a len (if no failure)
+     *
+     * @sa nonunique_push, push_mac_header, pull */
+    WritablePacket *push(uint32_t len) CLICK_WARN_UNUSED_RESULT;
+
+    /** @brief Add space for a MAC header before the packet.
+     * @param len amount of space to add and length of MAC header
+     * @return packet with added header space, or null on failure
+     *
+     * Combines the action of push() and set_mac_header().  @a len bytes are
+     * pushed for a MAC header, and on success, the packet's returned MAC and
+     * network header pointers are set as by set_mac_header(data(), @a len).
+     *
+     * @sa push */
+    WritablePacket *push_mac_header(uint32_t len) CLICK_WARN_UNUSED_RESULT;
+
+    /** @brief Add space for a header before the packet.
+     * @param len amount of space to add
+     * @return packet with added header space, or null on failure
+     *
+     * This is a variant of push().  Returns a packet with an additional @a
+     * len bytes of uninitialized space before the current packet's data().  A
+     * copy of the packet data is made if there isn't enough headroom() in the
+     * current packet.  However, no copy is made if the current packet is
+     * shared; and if no copy is made, this operation is quite efficient.
+     *
+     * If a data copy would be required, but the copy fails because of lack of
+     * memory, then the current packet is freed.
+     *
+     * @note Unlike push(), nonunique_push() returns a Packet object, which
+     * has non-writable data.
+     *
+     * @sa push */
+    Packet *nonunique_push(uint32_t len) CLICK_WARN_UNUSED_RESULT;
+
+    /** @brief Remove a header from the front of the packet.
+     * @param len amount of space to remove
+     *
+     * Removes @a len bytes from the initial part of the packet, usually
+     * corresponding to some network header (for example, pull(14) removes an
+     * Ethernet header).  This operation is efficient: it just bumps a
+     * pointer.
+     *
+     * It is an error to attempt to pull more than length() bytes.
+     *
+     * @post new data() == old data() + @a len
+     * @post new length() == old length() - @a len
+     *
+     * @sa push */
+    void pull(uint32_t len);
+
+    /** @brief Add space for data after the packet.
+     * @param len amount of space to add
+     * @return packet with added trailer space, or null on failure
+     *
+     * Returns a packet with an additional @a len bytes of uninitialized space
+     * after the current packet's data (starting at end_data()).  A copy of
+     * the packet data is made if there isn't enough tailroom() in the current
+     * packet, or if the current packet is shared().  If no copy is made, this
+     * operation is quite efficient.
+     *
+     * If a data copy would be required, but the copy fails because of lack of
+     * memory, then the current packet is freed.
+     *
+     * put() is usually used like this:
+     * @code
+     * WritablePacket *q = p->put(100);
+     * if (!q)
+     *     return 0;
+     * // p must not be used here.
+     * @endcode
+     *
+     * @post new length() == old length() + @a len (if no failure)
+     *
+     * @sa nonunique_put, take */
+    WritablePacket *put(uint32_t len) CLICK_WARN_UNUSED_RESULT;
+
+    /** @brief Add space for data after the packet.
+     * @param len amount of space to add
+     * @return packet with added trailer space, or null on failure
+     *
+     * This is a variant of put().  Returns a packet with an additional @a len
+     * bytes of uninitialized space after the current packet's data (starting
+     * at end_data()).  A copy of the packet data is made if there isn't
+     * enough tailroom() in the current packet.  However, no copy is made if
+     * the current packet is shared; and if no copy is made, this operation is
+     * quite efficient.
+     *
+     * If a data copy would be required, but the copy fails because of lack of
+     * memory, then the current packet is freed.
+     *
+     * @sa put */
+    Packet *nonunique_put(uint32_t len) CLICK_WARN_UNUSED_RESULT;
+
+    /** @brief Remove space from the end of the packet.
+     * @param len amount of space to remove
+     *
+     * Removes @a len bytes from the end of the packet.  This operation is
+     * efficient: it just bumps a pointer.
+     *
+     * It is an error to attempt to pull more than length() bytes.
+     *
+     * @post new data() == old data()
+     * @post new end_data() == old end_data() - @a len
+     * @post new length() == old length() - @a len
+     *
+     * @sa push */
+    void take(uint32_t len);
+
+
+    /** @brief Shift packet data within the data buffer.
+     * @param offset amount to shift packet data
+     * @param free_on_failure if true, then delete the input packet on failure
+     * @return a packet with shifted data, or null on failure
+     *
+     * Useful to align packet data.  For example, if the packet's embedded IP
+     * header is located at pointer value 0x8CCA03, then shift_data(1) or
+     * shift_data(-3) will both align the header on a 4-byte boundary.
+     *
+     * If the packet is shared() or there isn't enough headroom or tailroom
+     * for the operation, the packet is passed to uniqueify() first.  This can
+     * fail if there isn't enough memory.  If it fails, shift_data returns
+     * null, and if @a free_on_failure is true (the default), the input packet
+     * is freed.
+     *
+     * The packet's mac_header, network_header, and transport_header areas are
+     * preserved, even if they lie within the headroom.  Any headroom outside
+     * these regions may be overwritten, as may any tailroom.
+     *
+     * @post new data() == old data() + @a offset (if no copy is made)
+     * @post new buffer() == old buffer() (if no copy is made) */
+    Packet *shift_data(int offset, bool free_on_failure = true) CLICK_WARN_UNUSED_RESULT;
+#if CLICK_USERLEVEL || CLICK_MINIOS
+    inline void shrink_data(const unsigned char *data, uint32_t length);
+    inline void change_headroom_and_length(uint32_t headroom, uint32_t length);
+#endif
+    bool copy(Packet* p, int headroom=0);
+    //@}
+
+    /** @name Header Pointers */
+    //@{
+    inline bool has_mac_header() const;
+    inline const unsigned char *mac_header() const;
+    inline int mac_header_offset() const;
+    inline uint32_t mac_header_length() const;
+    inline int mac_length() const;
+    inline void set_mac_header(const unsigned char *p);
+    inline void set_mac_header(const unsigned char *p, uint32_t len);
+    inline void clear_mac_header();
+
+    inline bool has_network_header() const;
+    inline const unsigned char *network_header() const;
+    inline int network_header_offset() const;
+    inline uint32_t network_header_length() const;
+    inline int network_length() const;
+    inline void set_network_header(const unsigned char *p, uint32_t len);
+    inline void set_network_header_length(uint32_t len);
+    inline void clear_network_header();
+
+    inline bool has_transport_header() const;
+    inline const unsigned char *transport_header() const;
+    inline int transport_header_offset() const;
+    inline int transport_length() const;
+    inline void clear_transport_header();
+
+    // CONVENIENCE HEADER ANNOTATIONS
+    inline const click_ether *ether_header() const;
+    inline void set_ether_header(const click_ether *ethh);
+
+    inline const click_ip *ip_header() const;
+    inline int ip_header_offset() const;
+    inline uint32_t ip_header_length() const;
+    inline void set_ip_header(const click_ip *iph, uint32_t len);
+
+    inline const click_ip6 *ip6_header() const;
+    inline int ip6_header_offset() const;
+    inline uint32_t ip6_header_length() const;
+    inline void set_ip6_header(const click_ip6 *ip6h);
+    inline void set_ip6_header(const click_ip6 *ip6h, uint32_t len);
+
+    inline const click_icmp *icmp_header() const;
+    inline const click_tcp *tcp_header() const;
+    inline const click_udp *udp_header() const;
+    //@}
+
+#if CLICK_LINUXMODULE
+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) && NET_SKBUFF_DATA_USES_OFFSET) || \
+     (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
+  protected:
+    typedef typeof(((struct sk_buff*)0)->mac_header) mac_header_type;
+    typedef typeof(((struct sk_buff*)0)->network_header) network_header_type;
+    typedef typeof(((struct sk_buff*)0)->transport_header) transport_header_type;
+# endif
+#endif
+
+  private:
+    /** @cond never */
+    union Anno;
+#if CLICK_LINUXMODULE
+    const Anno *xanno() const		{ return (const Anno *)skb()->cb; }
+    Anno *xanno()			{ return (Anno *)skb()->cb; }
+#else
+    const Anno *xanno() const		{ return &_aa.cb; }
+    Anno *xanno()			{ return &_aa.cb; }
+#endif
+    /** @endcond never */
+  public:
+
+    /** @name Annotations */
+    //@{
+
+    enum {
+	anno_size = 48			///< Size of annotation area.
+    };
+
+    /** @brief Return the timestamp annotation. */
+    inline const Timestamp &timestamp_anno() const;
+    /** @overload */
+    inline Timestamp &timestamp_anno();
+    /** @brief Set the timestamp annotation.
+     * @param t new timestamp */
+    inline void set_timestamp_anno(const Timestamp &t);
+
+    /** @brief Return the device annotation. */
+    inline net_device *device_anno() const;
+    /** @brief Set the device annotation */
+    inline void set_device_anno(net_device *dev);
+
+    /** @brief Values for packet_type_anno().
+     * Must agree with Linux's PACKET_ constants in <linux/if_packet.h>. */
+    enum PacketType {
+	HOST = 0,		/**< Packet was sent to this host. */
+	BROADCAST = 1,		/**< Packet was sent to a link-level multicast
+				     address. */
+	MULTICAST = 2,		/**< Packet was sent to a link-level multicast
+				     address. */
+	OTHERHOST = 3,		/**< Packet was sent to a different host, but
+				     received anyway.  The receiving device is
+				     probably in promiscuous mode. */
+	OUTGOING = 4,		/**< Packet was generated by this host and is
+				     being sent elsewhere. */
+	LOOPBACK = 5,
+	FASTROUTE = 6
+    };
+    /** @brief Return the packet type annotation. */
+    inline PacketType packet_type_anno() const;
+    /** @brief Set the packet type annotation. */
+    inline void set_packet_type_anno(PacketType t);
+
+#if CLICK_NS
+    class SimPacketinfoWrapper { public:
+	simclick_simpacketinfo _pinfo;
+	SimPacketinfoWrapper() {
+	    // The uninitialized value for the simulator packet data can't be
+	    // all zeros (0 is a valid packet id) or random junk out of memory
+	    // since the simulator will look at this info to see if the packet
+	    // was originally generated by it. Accidental collisions with
+	    // other packet IDs or bogus packet IDs can cause weird things to
+	    // happen. So we set it to all -1 here to keep the simulator from
+	    // getting confused.
+	    memset(&_pinfo,-1,sizeof(_pinfo));
+	}
+    };
+    simclick_simpacketinfo *get_sim_packetinfo() {
+	return &(_sim_packetinfo._pinfo);
+    }
+    void set_sim_packetinfo(simclick_simpacketinfo* pinfo) {
+	_sim_packetinfo._pinfo = *pinfo;
+    }
+#endif
+
+    /** @brief Return the next packet annotation. */
+    inline Packet *next() const;
+    /** @overload */
+    inline Packet *&next();
+    /** @brief Set the next packet annotation. */
+    inline void set_next(Packet *p);
+
+    /** @brief Return the previous packet annotation. */
+    inline Packet *prev() const;
+    /** @overload */
+    inline Packet *&prev();
+    /** @brief Set the previous packet annotation. */
+    inline void set_prev(Packet *p);
+
+    enum {
+	dst_ip_anno_offset = 0, dst_ip_anno_size = 4,
+	dst_ip6_anno_offset = 0, dst_ip6_anno_size = 16
+    };
+
+    /** @brief Return the destination IPv4 address annotation.
+     *
+     * The value is taken from the address annotation area. */
+    inline IPAddress dst_ip_anno() const;
+
+    /** @brief Set the destination IPv4 address annotation.
+     *
+     * The value is stored in the address annotation area. */
+    inline void set_dst_ip_anno(IPAddress addr);
+
+    /** @brief Return a pointer to the annotation area.
+     *
+     * The area is @link Packet::anno_size anno_size @endlink bytes long. */
+    void *anno()			{ return xanno(); }
+
+    /** @overload */
+    const void *anno() const		{ return xanno(); }
+
+    /** @brief Return a pointer to the annotation area as uint8_ts. */
+    uint8_t *anno_u8()			{ return &xanno()->u8[0]; }
+
+    /** @brief overload */
+    const uint8_t *anno_u8() const	{ return &xanno()->u8[0]; }
+
+    /** @brief Return a pointer to the annotation area as uint32_ts. */
+    uint32_t *anno_u32()		{ return &xanno()->u32[0]; }
+
+    /** @brief overload */
+    const uint32_t *anno_u32() const	{ return &xanno()->u32[0]; }
+
+    /** @brief Return annotation byte at offset @a i.
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink */
+    uint8_t anno_u8(int i) const {
+	assert(i >= 0 && i < anno_size);
+	return xanno()->u8[i];
+    }
+
+    /** @brief Set annotation byte at offset @a i.
+     * @param i annotation offset in bytes
+     * @param x value
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink */
+    void set_anno_u8(int i, uint8_t x) {
+	assert(i >= 0 && i < anno_size);
+	xanno()->u8[i] = x;
+    }
+
+    /** @brief Return 16-bit annotation at offset @a i.
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - 1
+     * @pre On aligned targets, @a i must be evenly divisible by 2.
+     *
+     * Affects annotation bytes [@a i, @a i+1]. */
+    uint16_t anno_u16(int i) const {
+	assert(i >= 0 && i < anno_size - 1);
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % 2 == 0);
+#endif
+	return *reinterpret_cast<const click_aliasable_uint16_t *>(xanno()->c + i);
+    }
+
+    /** @brief Set 16-bit annotation at offset @a i.
+     * @param i annotation offset in bytes
+     * @param x value
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - 1
+     * @pre On aligned targets, @a i must be evenly divisible by 2.
+     *
+     * Affects annotation bytes [@a i, @a i+1]. */
+    void set_anno_u16(int i, uint16_t x) {
+	assert(i >= 0 && i < anno_size - 1);
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % 2 == 0);
+#endif
+	*reinterpret_cast<click_aliasable_uint16_t *>(xanno()->c + i) = x;
+    }
+
+    /** @brief Return 16-bit annotation at offset @a i.
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - 1
+     * @pre On aligned targets, @a i must be evenly divisible by 2.
+     *
+     * Affects annotation bytes [@a i, @a i+1]. */
+    int16_t anno_s16(int i) const {
+	assert(i >= 0 && i < anno_size - 1);
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % 2 == 0);
+#endif
+	return *reinterpret_cast<const click_aliasable_int16_t *>(xanno()->c + i);
+    }
+
+    /** @brief Set 16-bit annotation at offset @a i.
+     * @param i annotation offset in bytes
+     * @param x value
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - 1
+     * @pre On aligned targets, @a i must be evenly divisible by 2.
+     *
+     * Affects annotation bytes [@a i, @a i+1]. */
+    void set_anno_s16(int i, int16_t x) {
+	assert(i >= 0 && i < anno_size - 1);
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % 2 == 0);
+#endif
+	*reinterpret_cast<click_aliasable_int16_t *>(xanno()->c + i) = x;
+    }
+
+    /** @brief Return 32-bit annotation at offset @a i.
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - 3
+     * @pre On aligned targets, @a i must be evenly divisible by 4.
+     *
+     * Affects user annotation bytes [@a i, @a i+3]. */
+    uint32_t anno_u32(int i) const {
+	assert(i >= 0 && i < anno_size - 3);
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % 4 == 0);
+#endif
+	return *reinterpret_cast<const click_aliasable_uint32_t *>(xanno()->c + i);
+    }
+
+    /** @brief Set 32-bit annotation at offset @a i.
+     * @param i annotation offset in bytes
+     * @param x value
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - 3
+     * @pre On aligned targets, @a i must be evenly divisible by 4.
+     *
+     * Affects user annotation bytes [@a i, @a i+3]. */
+    void set_anno_u32(int i, uint32_t x) {
+	assert(i >= 0 && i < anno_size - 3);
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % 4 == 0);
+#endif
+	*reinterpret_cast<click_aliasable_uint32_t *>(xanno()->c + i) = x;
+    }
+
+    /** @brief Return 32-bit annotation at offset @a i.
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - 3
+     *
+     * Affects user annotation bytes [4*@a i, 4*@a i+3]. */
+    int32_t anno_s32(int i) const {
+	assert(i >= 0 && i < anno_size - 3);
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % 4 == 0);
+#endif
+	return *reinterpret_cast<const click_aliasable_int32_t *>(xanno()->c + i);
+    }
+
+    /** @brief Set 32-bit annotation at offset @a i.
+     * @param i annotation offset in bytes
+     * @param x value
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - 3
+     * @pre On aligned targets, @a i must be evenly divisible by 4.
+     *
+     * Affects user annotation bytes [@a i, @a i+3]. */
+    void set_anno_s32(int i, int32_t x) {
+	assert(i >= 0 && i < anno_size - 3);
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % 4 == 0);
+#endif
+	*reinterpret_cast<click_aliasable_int32_t *>(xanno()->c + i) = x;
+    }
+
+#if HAVE_INT64_TYPES
+    /** @brief Return 64-bit annotation at offset @a i.
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - 7
+     * @pre On aligned targets, @a i must be aligned properly for uint64_t.
+     *
+     * Affects user annotation bytes [@a i, @a i+7]. */
+    uint64_t anno_u64(int i) const {
+	assert(i >= 0 && i < anno_size - 7);
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % __alignof__(uint64_t) == 0);
+#endif
+	return *reinterpret_cast<const click_aliasable_uint64_t *>(xanno()->c + i);
+    }
+
+    /** @brief Set 64-bit annotation at offset @a i.
+     * @param i annotation offset in bytes
+     * @param x value
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - 7
+     * @pre On aligned targets, @a i must be aligned properly for uint64_t.
+     *
+     * Affects user annotation bytes [@a i, @a i+7]. */
+    void set_anno_u64(int i, uint64_t x) {
+	assert(i >= 0 && i < anno_size - 7);
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % __alignof__(uint64_t) == 0);
+#endif
+	*reinterpret_cast<click_aliasable_uint64_t *>(xanno()->c + i) = x;
+    }
+#endif
+
+    /** @brief Return void * sized annotation at offset @a i.
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - sizeof(void *)
+     * @pre On aligned targets, @a i must be aligned properly.
+     *
+     * Affects user annotation bytes [@a i, @a i+sizeof(void *)]. */
+    void *anno_ptr(int i) const {
+	assert(i >= 0 && i <= anno_size - (int)sizeof(void *));
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % __alignof__(void *) == 0);
+#endif
+	return *reinterpret_cast<const click_aliasable_void_pointer_t *>(xanno()->c + i);
+    }
+
+    /** @brief Set void * sized annotation at offset @a i.
+     * @param i annotation offset in bytes
+     * @param x value
+     * @pre 0 <= @a i < @link Packet::anno_size anno_size @endlink - sizeof(void *)
+     * @pre On aligned targets, @a i must be aligned properly.
+     *
+     * Affects user annotation bytes [@a i, @a i+sizeof(void *)]. */
+    void set_anno_ptr(int i, const void *x) {
+	assert(i >= 0 && i <= anno_size - (int)sizeof(void *));
+#if !HAVE_INDIFFERENT_ALIGNMENT
+	assert(i % __alignof__(void *) == 0);
+#endif
+	*reinterpret_cast<click_aliasable_void_pointer_t *>(xanno()->c + i) = const_cast<void *>(x);
+    }
+
+#if !CLICK_LINUXMODULE
+    inline Packet* data_packet() {
+        return _data_packet;
+    }
+#endif
+
+    inline void clear_annotations(bool all = true);
+    inline void copy_annotations(const Packet *);
+    //@}
+
+    /** @cond never */
+    enum {
+	DEFAULT_HEADROOM = default_headroom,
+	MIN_BUFFER_LENGTH = min_buffer_length,
+	addr_anno_offset = 0,
+	addr_anno_size = 16,
+	user_anno_offset = 16,
+	user_anno_size = 32,
+	ADDR_ANNO_SIZE = addr_anno_size,
+	USER_ANNO_SIZE = user_anno_size,
+	USER_ANNO_U16_SIZE = USER_ANNO_SIZE / 2,
+	USER_ANNO_U32_SIZE = USER_ANNO_SIZE / 4,
+	USER_ANNO_U64_SIZE = USER_ANNO_SIZE / 8
+    } CLICK_PACKET_DEPRECATED_ENUM;
+    inline const unsigned char *buffer_data() const CLICK_DEPRECATED;
+    inline void *addr_anno() CLICK_DEPRECATED;
+    inline const void *addr_anno() const CLICK_DEPRECATED;
+    inline void *user_anno() CLICK_DEPRECATED;
+    inline const void *user_anno() const CLICK_DEPRECATED;
+    inline uint8_t *user_anno_u8() CLICK_DEPRECATED;
+    inline const uint8_t *user_anno_u8() const CLICK_DEPRECATED;
+    inline uint32_t *user_anno_u32() CLICK_DEPRECATED;
+    inline const uint32_t *user_anno_u32() const CLICK_DEPRECATED;
+    inline uint8_t user_anno_u8(int i) const CLICK_DEPRECATED;
+    inline void set_user_anno_u8(int i, uint8_t v) CLICK_DEPRECATED;
+    inline uint16_t user_anno_u16(int i) const CLICK_DEPRECATED;
+    inline void set_user_anno_u16(int i, uint16_t v) CLICK_DEPRECATED;
+    inline uint32_t user_anno_u32(int i) const CLICK_DEPRECATED;
+    inline void set_user_anno_u32(int i, uint32_t v) CLICK_DEPRECATED;
+    inline int32_t user_anno_s32(int i) const CLICK_DEPRECATED;
+    inline void set_user_anno_s32(int i, int32_t v) CLICK_DEPRECATED;
+#if HAVE_INT64_TYPES
+    inline uint64_t user_anno_u64(int i) const CLICK_DEPRECATED;
+    inline void set_user_anno_u64(int i, uint64_t v) CLICK_DEPRECATED;
+#endif
+    inline const uint8_t *all_user_anno() const CLICK_DEPRECATED;
+    inline uint8_t *all_user_anno() CLICK_DEPRECATED;
+    inline const uint32_t *all_user_anno_u() const CLICK_DEPRECATED;
+    inline uint32_t *all_user_anno_u() CLICK_DEPRECATED;
+    inline uint8_t user_anno_c(int) const CLICK_DEPRECATED;
+    inline void set_user_anno_c(int, uint8_t) CLICK_DEPRECATED;
+    inline int16_t user_anno_s(int) const CLICK_DEPRECATED;
+    inline void set_user_anno_s(int, int16_t) CLICK_DEPRECATED;
+    inline uint16_t user_anno_us(int) const CLICK_DEPRECATED;
+    inline void set_user_anno_us(int, uint16_t) CLICK_DEPRECATED;
+    inline int32_t user_anno_i(int) const CLICK_DEPRECATED;
+    inline void set_user_anno_i(int, int32_t) CLICK_DEPRECATED;
+    inline uint32_t user_anno_u(int) const CLICK_DEPRECATED;
+    inline void set_user_anno_u(int, uint32_t) CLICK_DEPRECATED;
+    /** @endcond never */
+
+  private:
+
+    // Anno must fit in sk_buff's char cb[48].
+    /** @cond never */
+    union Anno {
+	char c[anno_size];
+	uint8_t u8[anno_size];
+	uint16_t u16[anno_size / 2];
+	uint32_t u32[anno_size / 4];
+#if HAVE_INT64_TYPES
+	uint64_t u64[anno_size / 8];
+#endif
+	// allocations: see packet_anno.hh
+    };
+
+#if !CLICK_LINUXMODULE
+    // All packet annotations are stored in AllAnno so that
+    // clear_annotations(true) can memset() the structure to zero.
+    struct AllAnno {
+	Anno cb;
+	unsigned char *mac;
+	unsigned char *nh;
+	unsigned char *h;
+	PacketType pkt_type;
+	char timestamp[sizeof(Timestamp)];
+	Packet *next;
+	Packet *prev;
+    };
+#endif
+    /** @endcond never */
+
+#if !CLICK_LINUXMODULE
+    // User-space and BSD kernel module implementations.
+    atomic_uint32_t _use_count;
+    Packet *_data_packet;
+    /* mimic Linux sk_buff */
+    unsigned char *_head; /* start of allocated buffer */
+    unsigned char *_data; /* where the packet starts */
+    unsigned char *_tail; /* one beyond end of packet */
+    unsigned char *_end;  /* one beyond end of allocated buffer */
+# if CLICK_BSDMODULE
+    struct mbuf *_m;
+# endif
+    AllAnno _aa;
+# if CLICK_NS
+    SimPacketinfoWrapper _sim_packetinfo;
+# endif
+# if CLICK_USERLEVEL || CLICK_MINIOS
+    buffer_destructor_type _destructor;
+    void* _destructor_argument;
+# endif
+#endif
+
+    inline Packet() {
+#if CLICK_LINUXMODULE
+	panic("Packet constructor");
+#endif
+    }
+    Packet(const Packet &x);
+    ~Packet();
+    Packet &operator=(const Packet &x);
+
+#if !CLICK_LINUXMODULE
+    bool alloc_data(uint32_t headroom, uint32_t length, uint32_t tailroom);
+#endif
+#if CLICK_BSDMODULE
+    static void assimilate_mbuf(Packet *p);
+    void assimilate_mbuf();
+#endif
+
+    inline void shift_header_annotations(const unsigned char *old_head, int32_t extra_headroom);
+    WritablePacket *expensive_uniqueify(int32_t extra_headroom, int32_t extra_tailroom, bool free_on_failure);
+    WritablePacket *expensive_push(uint32_t nbytes);
+    WritablePacket *expensive_put(uint32_t nbytes);
+
+    friend class WritablePacket;
+
+};
+
+
+class WritablePacket : public Packet { public:
+
+    inline unsigned char *data() const;
+    inline unsigned char *end_data() const;
+    inline unsigned char *buffer() const;
+    inline unsigned char *end_buffer() const;
+    inline unsigned char *mac_header() const;
+    inline click_ether *ether_header() const;
+    inline unsigned char *network_header() const;
+    inline click_ip *ip_header() const;
+    inline click_ip6 *ip6_header() const;
+    inline unsigned char *transport_header() const;
+    inline click_icmp *icmp_header() const;
+    inline click_tcp *tcp_header() const;
+    inline click_udp *udp_header() const;
+
+    /** @cond never */
+    inline unsigned char *buffer_data() const CLICK_DEPRECATED;
+    /** @endcond never */
+
+ private:
+
+    inline WritablePacket() { }
+#if !CLICK_LINUXMODULE
+    inline void initialize();
+#endif
+    WritablePacket(const Packet &x);
+    ~WritablePacket() { }
+
+#if HAVE_CLICK_PACKET_POOL
+    static WritablePacket *pool_allocate(bool with_data);
+    static WritablePacket *pool_allocate(uint32_t headroom, uint32_t length,
+					 uint32_t tailroom);
+    static void recycle(WritablePacket *p);
+#endif
+
+    friend class Packet;
+
+};
+
+
+/** @brief Clear all packet annotations.
+ * @param  all  If true, clear all annotations.  If false, clear only Click's
+ *   internal annotations.
+ *
+ * All user annotations and the address annotation are set to zero, the packet
+ * type annotation is set to HOST, the device annotation and all header
+ * pointers are set to null, the timestamp annotation is cleared, and the
+ * next/prev-packet annotations are set to null.
+ *
+ * If @a all is false, then the packet type, device, timestamp, header, and
+ * next/prev-packet annotations are left alone.
+ */
+inline void
+Packet::clear_annotations(bool all)
+{
+#if CLICK_LINUXMODULE
+    memset(xanno(), 0, sizeof(Anno));
+    if (all) {
+	set_packet_type_anno(HOST);
+	set_device_anno(0);
+	set_timestamp_anno(Timestamp());
+
+	clear_mac_header();
+	clear_network_header();
+	clear_transport_header();
+
+	set_next(0);
+	set_prev(0);
+    }
+#else
+    memset(&_aa, 0, all ? sizeof(AllAnno) : sizeof(Anno));
+#endif
+}
+
+/** @brief Copy most packet annotations from @a p.
+ * @param p source of annotations
+ *
+ * This packet's user annotations, address annotation, packet type annotation,
+ * device annotation, and timestamp annotation are set to the corresponding
+ * annotations from @a p.
+ *
+ * @note The next/prev-packet and header annotations are not copied. */
+inline void
+Packet::copy_annotations(const Packet *p)
+{
+    *xanno() = *p->xanno();
+    set_packet_type_anno(p->packet_type_anno());
+    set_device_anno(p->device_anno());
+    set_timestamp_anno(p->timestamp_anno());
+}
+
+
+#if !CLICK_LINUXMODULE
+inline void
+WritablePacket::initialize()
+{
+    _use_count = 1;
+    _data_packet = 0;
+# if CLICK_USERLEVEL || CLICK_MINIOS
+    _destructor = 0;
+# elif CLICK_BSDMODULE
+    _m = 0;
+# endif
+    clear_annotations();
+}
+#endif
+
+/** @brief Return the packet's data pointer.
+ *
+ * This is the pointer to the first byte of packet data. */
+inline const unsigned char *
+Packet::data() const
+{
+#if CLICK_LINUXMODULE
+    return skb()->data;
+#else
+    return _data;
+#endif
+}
+
+/** @brief Return the packet's end data pointer.
+ *
+ * The result points at the byte following the packet data.
+ * @invariant end_data() == data() + length() */
+inline const unsigned char *
+Packet::end_data() const
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    return skb_tail_pointer(skb());
+# else
+    return skb()->tail;
+# endif
+#else
+    return _tail;
+#endif
+}
+
+/** @brief Return a pointer to the packet's data buffer.
+ *
+ * The result points at the packet's headroom, not its data.
+ * @invariant buffer() == data() - headroom() */
+inline const unsigned char *
+Packet::buffer() const
+{
+#if CLICK_LINUXMODULE
+    return skb()->head;
+#else
+    return _head;
+#endif
+}
+
+/** @brief Return the packet's end data buffer pointer.
+ *
+ * The result points past the packet's tailroom.
+ * @invariant end_buffer() == end_data() + tailroom() */
+inline const unsigned char *
+Packet::end_buffer() const
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    return skb_end_pointer(skb());
+# else
+    return skb()->end;
+# endif
+#else
+    return _end;
+#endif
+}
+
+/** @brief Return the packet's length. */
+inline uint32_t
+Packet::length() const
+{
+#if CLICK_LINUXMODULE
+    return skb()->len;
+#else
+    return _tail - _data;
+#endif
+}
+
+/** @brief Return the packet's headroom.
+ *
+ * The headroom is the amount of space available in the current packet buffer
+ * before data().  A push() operation is cheap if the packet's unshared and
+ * the length pushed is less than headroom(). */
+inline uint32_t
+Packet::headroom() const
+{
+    return data() - buffer();
+}
+
+/** @brief Return the packet's tailroom.
+ *
+ * The tailroom is the amount of space available in the current packet buffer
+ * following end_data().  A put() operation is cheap if the packet's unshared
+ * and the length put is less than tailroom(). */
+inline uint32_t
+Packet::tailroom() const
+{
+    return end_buffer() - end_data();
+}
+
+/** @brief Return the packet's buffer length.
+ * @invariant buffer_length() == headroom() + length() + tailroom()
+ * @invariant buffer() + buffer_length() == end_buffer() */
+inline uint32_t
+Packet::buffer_length() const
+{
+    return end_buffer() - buffer();
+}
+
+inline Packet *
+Packet::next() const
+{
+#if CLICK_LINUXMODULE
+    return (Packet *)(skb()->next);
+#else
+    return _aa.next;
+#endif
+}
+
+inline Packet *&
+Packet::next()
+{
+#if CLICK_LINUXMODULE
+    return (Packet *&)(skb()->next);
+#else
+    return _aa.next;
+#endif
+}
+
+inline void
+Packet::set_next(Packet *p)
+{
+#if CLICK_LINUXMODULE
+    skb()->next = p->skb();
+#else
+    _aa.next = p;
+#endif
+}
+
+inline Packet *
+Packet::prev() const
+{
+#if CLICK_LINUXMODULE
+    return (Packet *)(skb()->prev);
+#else
+    return _aa.prev;
+#endif
+}
+
+inline Packet *&
+Packet::prev()
+{
+#if CLICK_LINUXMODULE
+    return (Packet *&)(skb()->prev);
+#else
+    return _aa.prev;
+#endif
+}
+
+inline void
+Packet::set_prev(Packet *p)
+{
+#if CLICK_LINUXMODULE
+    skb()->prev = p->skb();
+#else
+    _aa.prev = p;
+#endif
+}
+
+/** @brief Return true iff the packet's MAC header pointer is set.
+ * @sa set_mac_header, clear_mac_header */
+inline bool
+Packet::has_mac_header() const
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    return skb_mac_header_was_set(skb());
+# else
+    return skb()->mac.raw != 0;
+# endif
+#else
+    return _aa.mac != 0;
+#endif
+}
+
+/** @brief Return the packet's MAC header pointer.
+ * @warning Not useful if !has_mac_header().
+ * @sa ether_header, set_mac_header, clear_mac_header, mac_header_length,
+ * mac_length */
+inline const unsigned char *
+Packet::mac_header() const
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    return skb_mac_header(skb());
+# else
+    return skb()->mac.raw;
+# endif
+#else
+    return _aa.mac;
+#endif
+}
+
+/** @brief Return true iff the packet's network header pointer is set.
+ * @sa set_network_header, clear_network_header */
+inline bool
+Packet::has_network_header() const
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+#  if NET_SKBUFF_DATA_USES_OFFSET
+    return skb()->network_header != (network_header_type) ~0U;
+#  else
+    return skb()->network_header != 0;
+#  endif
+# else
+    return skb()->nh.raw != 0;
+# endif
+#else
+    return _aa.nh != 0;
+#endif
+}
+
+/** @brief Return the packet's network header pointer.
+ * @warning Not useful if !has_network_header().
+ * @sa ip_header, ip6_header, set_network_header, clear_network_header,
+ * network_header_length, network_length */
+inline const unsigned char *
+Packet::network_header() const
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    return skb_network_header(skb());
+# else
+    return skb()->nh.raw;
+# endif
+#else
+    return _aa.nh;
+#endif
+}
+
+/** @brief Return true iff the packet's network header pointer is set.
+ * @sa set_network_header, clear_transport_header */
+inline bool
+Packet::has_transport_header() const
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+#  if NET_SKBUFF_DATA_USES_OFFSET
+    return skb()->transport_header != (transport_header_type) ~0U;
+#  else
+    return skb()->transport_header != 0;
+#  endif
+# else
+    return skb()->h.raw != 0;
+# endif
+#else
+    return _aa.h != 0;
+#endif
+}
+
+/** @brief Return the packet's transport header pointer.
+ * @warning Not useful if !has_transport_header().
+ * @sa tcp_header, udp_header, icmp_header, set_transport_header,
+ * clear_transport_header, transport_length */
+inline const unsigned char *
+Packet::transport_header() const
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    return skb_transport_header(skb());
+# else
+    return skb()->h.raw;
+# endif
+#else
+    return _aa.h;
+#endif
+}
+
+/** @brief Return the packet's MAC header pointer as Ethernet.
+ * @invariant (void *) ether_header() == (void *) mac_header()
+ * @warning Not useful if !has_mac_header().
+ * @sa mac_header */
+inline const click_ether *
+Packet::ether_header() const
+{
+    return reinterpret_cast<const click_ether *>(mac_header());
+}
+
+/** @brief Return the packet's network header pointer as IPv4.
+ * @invariant (void *) ip_header() == (void *) network_header()
+ * @warning Not useful if !has_network_header().
+ * @sa network_header */
+inline const click_ip *
+Packet::ip_header() const
+{
+    return reinterpret_cast<const click_ip *>(network_header());
+}
+
+/** @brief Return the packet's network header pointer as IPv6.
+ * @invariant (void *) ip6_header() == (void *) network_header()
+ * @warning Not useful if !has_network_header().
+ * @sa network_header */
+inline const click_ip6 *
+Packet::ip6_header() const
+{
+    return reinterpret_cast<const click_ip6 *>(network_header());
+}
+
+/** @brief Return the packet's transport header pointer as ICMP.
+ * @invariant (void *) icmp_header() == (void *) transport_header()
+ * @warning Not useful if !has_transport_header().
+ * @sa transport_header */
+inline const click_icmp *
+Packet::icmp_header() const
+{
+    return reinterpret_cast<const click_icmp *>(transport_header());
+}
+
+/** @brief Return the packet's transport header pointer as TCP.
+ * @invariant (void *) tcp_header() == (void *) transport_header()
+ * @warning Not useful if !has_transport_header().
+ * @sa transport_header */
+inline const click_tcp *
+Packet::tcp_header() const
+{
+    return reinterpret_cast<const click_tcp *>(transport_header());
+}
+
+/** @brief Return the packet's transport header pointer as UDP.
+ * @invariant (void *) udp_header() == (void *) transport_header()
+ * @warning Not useful if !has_transport_header().
+ * @sa transport_header */
+inline const click_udp *
+Packet::udp_header() const
+{
+    return reinterpret_cast<const click_udp *>(transport_header());
+}
+
+/** @brief Return the packet's length starting from its MAC header pointer.
+ * @invariant mac_length() == end_data() - mac_header()
+ * @warning Not useful if !has_mac_header(). */
+inline int
+Packet::mac_length() const
+{
+    return end_data() - mac_header();
+}
+
+/** @brief Return the packet's length starting from its network header pointer.
+ * @invariant network_length() == end_data() - network_header()
+ * @warning Not useful if !has_network_header(). */
+inline int
+Packet::network_length() const
+{
+    return end_data() - network_header();
+}
+
+/** @brief Return the packet's length starting from its transport header pointer.
+ * @invariant transport_length() == end_data() - transport_header()
+ * @warning Not useful if !has_transport_header(). */
+inline int
+Packet::transport_length() const
+{
+    return end_data() - transport_header();
+}
+
+inline const Timestamp&
+Packet::timestamp_anno() const
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 13)
+    return *reinterpret_cast<const Timestamp*>(&skb()->stamp);
+# else
+    return *reinterpret_cast<const Timestamp*>(&skb()->tstamp);
+# endif
+#else
+    return *reinterpret_cast<const Timestamp*>(&_aa.timestamp);
+#endif
+}
+
+inline Timestamp&
+Packet::timestamp_anno()
+{
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 13)
+    return *reinterpret_cast<Timestamp*>(&skb()->stamp);
+# else
+    return *reinterpret_cast<Timestamp*>(&skb()->tstamp);
+# endif
+#else
+    return *reinterpret_cast<Timestamp*>(&_aa.timestamp);
+#endif
+}
+
+inline void
+Packet::set_timestamp_anno(const Timestamp &timestamp)
+{
+    timestamp_anno() = timestamp;
+}
+
+inline net_device *
+Packet::device_anno() const
+{
+#if CLICK_LINUXMODULE
+    return skb()->dev;
+#elif CLICK_BSDMODULE
+    if (m())
+	return m()->m_pkthdr.rcvif;
+    else
+	return 0;
+#else
+    return 0;
+#endif
+}
+
+inline void
+Packet::set_device_anno(net_device *dev)
+{
+#if CLICK_LINUXMODULE
+    skb()->dev = dev;
+#elif CLICK_BSDMODULE
+    if (m())
+	m()->m_pkthdr.rcvif = dev;
+#else
+    (void) dev;
+#endif
+}
+
+inline Packet::PacketType
+Packet::packet_type_anno() const
+{
+#if CLICK_LINUXMODULE && PACKET_TYPE_MASK
+    return (PacketType)(skb()->pkt_type & PACKET_TYPE_MASK);
+#elif CLICK_LINUXMODULE
+    return (PacketType)(skb()->pkt_type);
+#else
+    return _aa.pkt_type;
+#endif
+}
+
+inline void
+Packet::set_packet_type_anno(PacketType p)
+{
+#if CLICK_LINUXMODULE && PACKET_TYPE_MASK
+    skb()->pkt_type = (skb()->pkt_type & PACKET_CLEAN) | p;
+#elif CLICK_LINUXMODULE
+    skb()->pkt_type = p;
+#else
+    _aa.pkt_type = p;
+#endif
+}
+
+/** @brief Create and return a new packet.
+ * @param data data to be copied into the new packet
+ * @param length length of packet
+ * @return new packet, or null if no packet could be created
+ *
+ * The @a data is copied into the new packet.  If @a data is null, the
+ * packet's data is left uninitialized.  The new packet's headroom equals
+ * @link Packet::default_headroom default_headroom @endlink, its tailroom is 0.
+ *
+ * The returned packet's annotations are cleared and its header pointers are
+ * null. */
+inline WritablePacket *
+Packet::make(const void *data, uint32_t length)
+{
+    return make(default_headroom, data, length, 0);
+}
+
+/** @brief Create and return a new packet.
+ * @param length length of packet
+ * @return new packet, or null if no packet could be created
+ *
+ * The packet's data is left uninitialized.  The new packet's headroom equals
+ * @link Packet::default_headroom default_headroom @endlink, its tailroom is 0.
+ *
+ * The returned packet's annotations are cleared and its header pointers are
+ * null. */
+inline WritablePacket *
+Packet::make(uint32_t length)
+{
+    return make(default_headroom, (const unsigned char *) 0, length, 0);
+}
+
+#if CLICK_LINUXMODULE
+/** @brief Change an sk_buff into a Packet (linuxmodule).
+ * @param skb input sk_buff
+ * @return the packet
+ *
+ * In the Linux kernel module, Packet objects are sk_buff objects.  This
+ * function simply changes an sk_buff into a Packet by claiming its @a skb
+ * argument.  If <tt>skb->users</tt> is 1, then @a skb is orphaned by
+ * <tt>skb_orphan(skb)</tt> and returned.  If it is larger than 1, then @a skb
+ * is cloned and the clone is returned.  (sk_buffs used for Click Packet
+ * objects must have <tt>skb->users</tt> == 1.)  Null might be returned if
+ * there's no memory for the clone.
+ *
+ * The returned packet's annotations and header pointers <em>are not
+ * cleared</em>: they have the same values they did in the sk_buff.  If the
+ * packet came from Linux, then the header pointers and shared annotations
+ * (timestamp, packet type, next/prev packet) might have valid values, but the
+ * Click annotations (address, user) likely do not.  Use clear_annotations()
+ * to clear them. */
+inline Packet *
+Packet::make(struct sk_buff *skb)
+{
+    struct sk_buff *nskb;
+    if (atomic_read(&skb->users) == 1) {
+	skb_orphan(skb);
+	nskb = skb;
+    } else {
+	nskb = skb_clone(skb, GFP_ATOMIC);
+	atomic_dec(&skb->users);
+    }
+# if HAVE_SKB_LINEARIZE
+#  if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
+    if (nskb && skb_linearize(nskb, GFP_ATOMIC) != 0)
+#  else
+    if (nskb && skb_linearize(nskb) != 0)
+#  endif
+    {
+	kfree_skb(nskb);
+	nskb = 0;
+    }
+# endif
+    return reinterpret_cast<Packet *>(nskb);
+}
+#endif
+
+/** @brief Delete this packet.
+ *
+ * The packet header (including annotations) is destroyed and its memory
+ * returned to the system.  The packet's data is also freed if this is the
+ * last clone. */
+inline void
+Packet::kill()
+{
+#if CLICK_LINUXMODULE
+    struct sk_buff *b = skb();
+    b->next = b->prev = 0;
+# if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 15)
+    b->list = 0;
+# endif
+    skbmgr_recycle_skbs(b);
+#elif HAVE_CLICK_PACKET_POOL
+    if (_use_count.dec_and_test())
+	WritablePacket::recycle(static_cast<WritablePacket *>(this));
+#else
+    if (_use_count.dec_and_test())
+	delete this;
+#endif
+}
+
+#if CLICK_BSDMODULE		/* BSD kernel module */
+inline void
+Packet::assimilate_mbuf(Packet *p)
+{
+  struct mbuf *m = p->m();
+
+  if (!m) return;
+
+  p->_head = (unsigned char *)
+	     (m->m_flags & M_EXT    ? m->m_ext.ext_buf :
+	      m->m_flags & M_PKTHDR ? m->m_pktdat :
+				      m->m_dat);
+  p->_data = (unsigned char *)m->m_data;
+  p->_tail = (unsigned char *)(m->m_data + m->m_len);
+  p->_end = p->_head +
+	    (m->m_flags & M_EXT    ? min(m->m_pkthdr.len, m->m_ext.ext_size) :
+	     m->m_flags & M_PKTHDR ? MHLEN :
+				     MLEN);
+}
+
+inline void
+Packet::assimilate_mbuf()
+{
+  assimilate_mbuf(this);
+}
+
+inline Packet *
+Packet::make(struct mbuf *m)
+{
+  if (!(m->m_flags & M_PKTHDR))
+    panic("trying to construct Packet from a non-packet mbuf");
+
+  Packet *p = new Packet;
+  if (!p) {
+    m_freem(m);
+    return 0;
+  }
+  p->_use_count = 1;
+  p->_data_packet = NULL;
+
+  if (m->m_pkthdr.len != m->m_len) {
+    struct mbuf *m2;
+    /* click needs contiguous data */
+
+    if (m->m_pkthdr.len <= MCLBYTES) {
+      // click_chatter("m_pulldown, Click needs contiguous data");
+      m2 = m_pulldown(m, 0, m->m_pkthdr.len, NULL);
+      if (m2 == NULL)
+        panic("m_pulldown failed");
+      if (m2 != m) {
+        /*
+         * XXX: m_pulldown ensures that the data is contiguous, but
+         * it's not necessarily in the first mbuf in the chain.
+         * Currently that's not OK for Click, so we need to
+         * defragment the mbuf - which involves more copying etc.
+         */
+        m2 = m_defrag(m, M_DONTWAIT);
+        if (m2 == NULL) {
+          m_freem(m);
+          delete p;
+          return 0;
+        }
+        m = m2;
+      }
+    } else {
+      m2 = p->dup_jumbo_m(m);
+      m_freem(m);
+      if (m2 == NULL) {
+        delete p;
+        return 0;
+      }
+      m = m2;
+    }
+  }
+  p->_m = m;
+  assimilate_mbuf(p);
+
+  return p;
+}
+#endif
+
+/** @brief Test whether this packet's data is shared.
+ *
+ * Returns true iff the packet's data is shared.  If shared() is false, then
+ * the result of uniqueify() will equal @c this. */
+inline bool
+Packet::shared() const
+{
+#if CLICK_LINUXMODULE
+    return skb_cloned(const_cast<struct sk_buff *>(skb()));
+#else
+    return (_data_packet || _use_count > 1);
+#endif
+}
+
+/** @brief Return an unshared packet containing this packet's data.
+ * @return the unshared packet, which is writable
+ *
+ * The returned packet's data is unshared with any other packet, so it's safe
+ * to write the data.  If shared() is false, this operation simply returns the
+ * input packet.  If shared() is true, uniqueify() makes a copy of the data.
+ * The input packet is freed if the copy fails.
+ *
+ * The returned WritablePacket pointer may not equal the input Packet pointer,
+ * so do not use the input pointer after the uniqueify() call.
+ *
+ * The input packet's headroom and tailroom areas are copied in addition to
+ * its true contents.  The header annotations are shifted to point into the
+ * new packet data if necessary.
+ *
+ * uniqueify() is usually used like this:
+ * @code
+ * WritablePacket *q = p->uniqueify();
+ * if (!q)
+ *     return 0;
+ * // p must not be used here.
+ * @endcode
+ */
+inline WritablePacket *
+Packet::uniqueify()
+{
+    if (!shared())
+	return static_cast<WritablePacket *>(this);
+    else
+	return expensive_uniqueify(0, 0, true);
+}
+
+inline WritablePacket *
+Packet::push(uint32_t len)
+{
+    if (headroom() >= len && !shared()) {
+	WritablePacket *q = (WritablePacket *)this;
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+	__skb_push(q->skb(), len);
+#else				/* User-space and BSD kernel module */
+	q->_data -= len;
+# if CLICK_BSDMODULE
+	q->m()->m_data -= len;
+	q->m()->m_len += len;
+	q->m()->m_pkthdr.len += len;
+# endif
+#endif
+	return q;
+    } else
+	return expensive_push(len);
+}
+
+inline Packet *
+Packet::nonunique_push(uint32_t len)
+{
+    if (headroom() >= len) {
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+	__skb_push(skb(), len);
+#else				/* User-space and BSD kernel module */
+	_data -= len;
+# if CLICK_BSDMODULE
+	m()->m_data -= len;
+	m()->m_len += len;
+	m()->m_pkthdr.len += len;
+# endif
+#endif
+	return this;
+    } else
+	return expensive_push(len);
+}
+
+inline void
+Packet::pull(uint32_t len)
+{
+    if (len > length()) {
+	click_chatter("Packet::pull %d > length %d\n", len, length());
+	len = length();
+    }
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+    __skb_pull(skb(), len);
+#else				/* User-space and BSD kernel module */
+    _data += len;
+# if CLICK_BSDMODULE
+    m()->m_data += len;
+    m()->m_len -= len;
+    m()->m_pkthdr.len -= len;
+# endif
+#endif
+}
+
+inline WritablePacket *
+Packet::put(uint32_t len)
+{
+    if (tailroom() >= len && !shared()) {
+	WritablePacket *q = (WritablePacket *)this;
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+	__skb_put(q->skb(), len);
+#else				/* User-space and BSD kernel module */
+	q->_tail += len;
+# if CLICK_BSDMODULE
+	q->m()->m_len += len;
+	q->m()->m_pkthdr.len += len;
+# endif
+#endif
+	return q;
+    } else
+	return expensive_put(len);
+}
+
+inline Packet *
+Packet::nonunique_put(uint32_t len)
+{
+    if (tailroom() >= len) {
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+	__skb_put(skb(), len);
+#else				/* User-space and BSD kernel module */
+	_tail += len;
+# if CLICK_BSDMODULE
+	m()->m_len += len;
+	m()->m_pkthdr.len += len;
+# endif
+#endif
+	return this;
+    } else
+	return expensive_put(len);
+}
+
+inline void
+Packet::take(uint32_t len)
+{
+    if (len > length()) {
+	click_chatter("Packet::take %d > length %d\n", len, length());
+	len = length();
+    }
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+    skb()->tail -= len;
+    skb()->len -= len;
+#else				/* User-space and BSD kernel module */
+    _tail -= len;
+# if CLICK_BSDMODULE
+    m()->m_len -= len;
+    m()->m_pkthdr.len -= len;
+# endif
+#endif
+}
+
+#if CLICK_USERLEVEL || CLICK_MINIOS
+/** @brief Shrink the packet's data.
+ * @param data new data pointer
+ * @param length new length
+ *
+ * @warning This function is useful only in special contexts.
+ * @note Only available at user level
+ *
+ * User-level programs that read packet logs commonly read a large chunk of
+ * data (32 kB or more) into a base Packet object.  The log reader then works
+ * over the data buffer and, for each packet contained therein, outputs a
+ * clone that shares memory with the base packet.  This is space- and
+ * time-efficient, but the generated packets have gigantic headroom and
+ * tailroom.  Uniqueifying a generated packet will wastefully copy this
+ * headroom and tailroom as well.  The shrink_data function addresses this
+ * problem.
+ *
+ * shrink_data() removes all of a packet's headroom and tailroom.  The
+ * resulting packet has data() equal to @a data, length() equal to @a length,
+ * and headroom() and tailroom() equal to zero.
+ *
+ * @pre The packet @em must be a clone() of another existing packet.
+ * @pre @a data >= data(), @a data <= end_data(), @a data + @a length >=
+ * data(), and @a data + @a length <= end_data()
+ *
+ * @sa change_headroom_and_length */
+inline void
+Packet::shrink_data(const unsigned char *data, uint32_t length)
+{
+    assert(_data_packet);
+    if (data >= _head && data + length >= data && data + length <= _end) {
+	_head = _data = const_cast<unsigned char *>(data);
+	_tail = _end = const_cast<unsigned char *>(data + length);
+    }
+}
+
+/** @brief Shift the packet's data view to a different part of its buffer.
+ * @param headroom new headroom
+ * @param length new length
+ *
+ * @warning This function is useful only in special contexts.
+ * @note Only available at user level
+ *
+ * Shifts the packet's data() pointer to a different part of the packet's data
+ * buffer.  The buffer pointer itself is not changed, and the packet's
+ * contents are not affected (except by the new view).
+ *
+ * @pre @a headroom + @a length <= buffer_length()
+ * @post new buffer() == old buffer()
+ * @post new end_buffer() == old end_buffer()
+ * @post new headroom() == @a headroom
+ * @post new length() == @a length
+ *
+ * @sa shrink_data */
+inline void
+Packet::change_headroom_and_length(uint32_t headroom, uint32_t length)
+{
+    if (headroom + length <= buffer_length()) {
+	_data = _head + headroom;
+	_tail = _data + length;
+    }
+}
+#endif
+
+inline IPAddress
+Packet::dst_ip_anno() const
+{
+    return IPAddress(xanno()->u32[dst_ip_anno_offset / 4]);
+}
+
+inline void
+Packet::set_dst_ip_anno(IPAddress a)
+{
+    xanno()->u32[dst_ip_anno_offset / 4] = a.addr();
+}
+
+/** @brief Set the MAC header pointer.
+ * @param p new header pointer */
+inline void
+Packet::set_mac_header(const unsigned char *p)
+{
+    assert(p >= buffer() && p <= end_buffer());
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    skb_set_mac_header(skb(), p - data());
+# else
+    skb()->mac.raw = const_cast<unsigned char *>(p);
+# endif
+#else				/* User-space and BSD kernel module */
+    _aa.mac = const_cast<unsigned char *>(p);
+#endif
+}
+
+/** @brief Set the MAC and network header pointers.
+ * @param p new MAC header pointer
+ * @param len new MAC header length
+ * @post mac_header() == @a p and network_header() == @a p + @a len */
+inline void
+Packet::set_mac_header(const unsigned char *p, uint32_t len)
+{
+    assert(p >= buffer() && p + len <= end_buffer());
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    skb_set_mac_header(skb(), p - data());
+    skb_set_network_header(skb(), (p + len) - data());
+# else
+    skb()->mac.raw = const_cast<unsigned char *>(p);
+    skb()->nh.raw = const_cast<unsigned char *>(p) + len;
+# endif
+#else				/* User-space and BSD kernel module */
+    _aa.mac = const_cast<unsigned char *>(p);
+    _aa.nh = const_cast<unsigned char *>(p) + len;
+#endif
+}
+
+/** @brief Set the MAC header pointer to an Ethernet header.
+ * @param ethh new Ethernet header pointer
+ * @post (void *) mac_header() == (void *) @a ethh
+ * @post mac_header_length() == 14
+ * @post (void *) network_header() == (void *) (@a ethh + 1) */
+inline void
+Packet::set_ether_header(const click_ether *ethh)
+{
+    set_mac_header(reinterpret_cast<const unsigned char *>(ethh), 14);
+}
+
+/** @brief Unset the MAC header pointer.
+ * @post has_mac_header() == false
+ * Does not affect the network or transport header pointers. */
+inline void
+Packet::clear_mac_header()
+{
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) && NET_SKBUFF_DATA_USES_OFFSET
+    skb()->mac_header = (mac_header_type) ~0U;
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    skb()->mac_header = 0;
+# else
+    skb()->mac.raw = 0;
+# endif
+#else				/* User-space and BSD kernel module */
+    _aa.mac = 0;
+#endif
+}
+
+inline WritablePacket *
+Packet::push_mac_header(uint32_t len)
+{
+    WritablePacket *q;
+    if (headroom() >= len && !shared()) {
+	q = (WritablePacket *)this;
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+	__skb_push(q->skb(), len);
+#else				/* User-space and BSD kernel module */
+	q->_data -= len;
+# if CLICK_BSDMODULE
+	q->m()->m_data -= len;
+	q->m()->m_len += len;
+	q->m()->m_pkthdr.len += len;
+# endif
+#endif
+    } else if ((q = expensive_push(len)))
+	/* nada */;
+    else
+	return 0;
+    q->set_mac_header(q->data(), len);
+    return q;
+}
+
+/** @brief Set the network and transport header pointers.
+ * @param p new network header pointer
+ * @param len new network header length
+ * @post network_header() == @a p and transport_header() == @a p + @a len */
+inline void
+Packet::set_network_header(const unsigned char *p, uint32_t len)
+{
+    assert(p >= buffer() && p + len <= end_buffer());
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    skb_set_network_header(skb(), p - data());
+    skb_set_transport_header(skb(), (p + len) - data());
+# else
+    skb()->nh.raw = const_cast<unsigned char *>(p);
+    skb()->h.raw = const_cast<unsigned char *>(p) + len;
+# endif
+#else				/* User-space and BSD kernel module */
+    _aa.nh = const_cast<unsigned char *>(p);
+    _aa.h = const_cast<unsigned char *>(p) + len;
+#endif
+}
+
+/** @brief Set the network header length.
+ * @param len new network header length
+ *
+ * Setting the network header length really just sets the transport header
+ * pointer.
+ * @post transport_header() == network_header() + @a len */
+inline void
+Packet::set_network_header_length(uint32_t len)
+{
+    assert(network_header() + len <= end_buffer());
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    skb_set_transport_header(skb(), (network_header() + len) - data());
+# else
+    skb()->h.raw = skb()->nh.raw + len;
+# endif
+#else				/* User-space and BSD kernel module */
+    _aa.h = _aa.nh + len;
+#endif
+}
+
+/** @brief Set the network header pointer to an IPv4 header.
+ * @param iph new IP header pointer
+ * @param len new IP header length in bytes
+ * @post (char *) network_header() == (char *) @a iph
+ * @post network_header_length() == @a len
+ * @post (char *) transport_header() == (char *) @a iph + @a len */
+inline void
+Packet::set_ip_header(const click_ip *iph, uint32_t len)
+{
+    set_network_header(reinterpret_cast<const unsigned char *>(iph), len);
+}
+
+/** @brief Set the network header pointer to an IPv6 header.
+ * @param ip6h new IP header pointer
+ * @param len new IP header length in bytes
+ * @post (char *) network_header() == (char *) @a ip6h
+ * @post network_header_length() == @a len
+ * @post (char *) transport_header() == (char *) @a ip6h + @a len */
+inline void
+Packet::set_ip6_header(const click_ip6 *ip6h, uint32_t len)
+{
+    set_network_header(reinterpret_cast<const unsigned char *>(ip6h), len);
+}
+
+/** @brief Set the network header pointer to an IPv6 header.
+ * @param ip6h new IP header pointer
+ * @post (char *) network_header() == (char *) @a ip6h
+ * @post network_header_length() == 40
+ * @post (char *) transport_header() == (char *) (@a ip6h + 1) */
+inline void
+Packet::set_ip6_header(const click_ip6 *ip6h)
+{
+    set_ip6_header(ip6h, 40);
+}
+
+/** @brief Unset the network header pointer.
+ * @post has_network_header() == false
+ * Does not affect the MAC or transport header pointers. */
+inline void
+Packet::clear_network_header()
+{
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) && NET_SKBUFF_DATA_USES_OFFSET
+    skb()->network_header = (network_header_type) ~0U;
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    skb()->network_header = 0;
+# else
+    skb()->nh.raw = 0;
+# endif
+#else				/* User-space and BSD kernel module */
+    _aa.nh = 0;
+#endif
+}
+
+/** @brief Return the offset from the packet data to the MAC header.
+ * @return mac_header() - data()
+ * @warning Not useful if !has_mac_header(). */
+inline int
+Packet::mac_header_offset() const
+{
+    return mac_header() - data();
+}
+
+/** @brief Return the MAC header length.
+ * @return network_header() - mac_header()
+ *
+ * This equals the offset from the MAC header pointer to the network header
+ * pointer.
+ * @warning Not useful if !has_mac_header() or !has_network_header(). */
+inline uint32_t
+Packet::mac_header_length() const
+{
+    return network_header() - mac_header();
+}
+
+/** @brief Return the offset from the packet data to the network header.
+ * @return network_header() - data()
+ * @warning Not useful if !has_network_header(). */
+inline int
+Packet::network_header_offset() const
+{
+    return network_header() - data();
+}
+
+/** @brief Return the network header length.
+ * @return transport_header() - network_header()
+ *
+ * This equals the offset from the network header pointer to the transport
+ * header pointer.
+ * @warning Not useful if !has_network_header() or !has_transport_header(). */
+inline uint32_t
+Packet::network_header_length() const
+{
+    return transport_header() - network_header();
+}
+
+/** @brief Return the offset from the packet data to the IP header.
+ * @return network_header() - mac_header()
+ * @warning Not useful if !has_network_header().
+ * @sa network_header_offset */
+inline int
+Packet::ip_header_offset() const
+{
+    return network_header_offset();
+}
+
+/** @brief Return the IP header length.
+ * @return transport_header() - network_header()
+ *
+ * This equals the offset from the network header pointer to the transport
+ * header pointer.
+ * @warning Not useful if !has_network_header() or !has_transport_header().
+ * @sa network_header_length */
+inline uint32_t
+Packet::ip_header_length() const
+{
+    return network_header_length();
+}
+
+/** @brief Return the offset from the packet data to the IPv6 header.
+ * @return network_header() - data()
+ * @warning Not useful if !has_network_header().
+ * @sa network_header_offset */
+inline int
+Packet::ip6_header_offset() const
+{
+    return network_header_offset();
+}
+
+/** @brief Return the IPv6 header length.
+ * @return transport_header() - network_header()
+ *
+ * This equals the offset from the network header pointer to the transport
+ * header pointer.
+ * @warning Not useful if !has_network_header() or !has_transport_header().
+ * @sa network_header_length */
+inline uint32_t
+Packet::ip6_header_length() const
+{
+    return network_header_length();
+}
+
+/** @brief Return the offset from the packet data to the transport header.
+ * @return transport_header() - data()
+ * @warning Not useful if !has_transport_header(). */
+inline int
+Packet::transport_header_offset() const
+{
+    return transport_header() - data();
+}
+
+/** @brief Unset the transport header pointer.
+ * @post has_transport_header() == false
+ * Does not affect the MAC or network header pointers. */
+inline void
+Packet::clear_transport_header()
+{
+#if CLICK_LINUXMODULE	/* Linux kernel module */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) && NET_SKBUFF_DATA_USES_OFFSET
+    skb()->transport_header = (transport_header_type) ~0U;
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    skb()->transport_header = 0;
+# else
+    skb()->h.raw = 0;
+# endif
+#else				/* User-space and BSD kernel module */
+    _aa.h = 0;
+#endif
+}
+
+inline void
+Packet::shift_header_annotations(const unsigned char *old_head,
+				 int32_t extra_headroom)
+{
+#if CLICK_LINUXMODULE
+    struct sk_buff *mskb = skb();
+    /* From Linux 2.6.24 - 3.10, the header offsets are integers if
+     * NET_SKBUFF_DATA_USES_OFFSET is 1.  From 3.11 onward, they're
+     * always integers. */
+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) && NET_SKBUFF_DATA_USES_OFFSET) || \
+     (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
+    (void) old_head;
+    mskb->mac_header += (mskb->mac_header == (mac_header_type) ~0U ? 0 : extra_headroom);
+    mskb->network_header += (mskb->network_header == (network_header_type) ~0U ? 0 : extra_headroom);
+    mskb->transport_header += (mskb->transport_header == (transport_header_type) ~0U ? 0 : extra_headroom);
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+    ptrdiff_t shift = (mskb->head - old_head) + extra_headroom;
+    mskb->mac_header += (mskb->mac_header ? shift : 0);
+    mskb->network_header += (mskb->network_header ? shift : 0);
+    mskb->transport_header += (mskb->transport_header ? shift : 0);
+# else
+    ptrdiff_t shift = (mskb->head - old_head) + extra_headroom;
+    mskb->mac.raw += (mskb->mac.raw ? shift : 0);
+    mskb->nh.raw += (mskb->nh.raw ? shift : 0);
+    mskb->h.raw += (mskb->h.raw ? shift : 0);
+# endif
+#else
+    ptrdiff_t shift = (_head - old_head) + extra_headroom;
+    _aa.mac += (_aa.mac ? shift : 0);
+    _aa.nh += (_aa.nh ? shift : 0);
+    _aa.h += (_aa.h ? shift : 0);
+#endif
+}
+
+/** @cond never */
+/** @brief Return a pointer to the packet's data buffer.
+ * @deprecated Use buffer() instead. */
+inline const unsigned char *
+Packet::buffer_data() const
+{
+#if CLICK_LINUXMODULE
+    return skb()->head;
+#else
+    return _head;
+#endif
+}
+
+/** @brief Return a pointer to the address annotation area.
+ * @deprecated Use anno() instead.
+ *
+ * The area is ADDR_ANNO_SIZE bytes long. */
+inline void *Packet::addr_anno() {
+    return anno_u8() + addr_anno_offset;
+}
+
+/** @overload */
+inline const void *Packet::addr_anno() const {
+    return anno_u8() + addr_anno_offset;
+}
+
+/** @brief Return a pointer to the user annotation area.
+ * @deprecated Use Packet::anno() instead.
+ *
+ * The area is USER_ANNO_SIZE bytes long. */
+inline void *Packet::user_anno() {
+    return anno_u8() + user_anno_offset;
+}
+
+/** @overload */
+inline const void *Packet::user_anno() const {
+    return anno_u8() + user_anno_offset;
+}
+
+/** @brief Return a pointer to the user annotation area as uint8_ts.
+ * @deprecated Use Packet::anno_u8() instead. */
+inline uint8_t *Packet::user_anno_u8() {
+    return anno_u8() + user_anno_offset;
+}
+
+/** @brief overload */
+inline const uint8_t *Packet::user_anno_u8() const {
+    return anno_u8() + user_anno_offset;
+}
+
+/** @brief Return a pointer to the user annotation area as uint32_ts.
+ * @deprecated Use Packet::anno_u32() instead. */
+inline uint32_t *Packet::user_anno_u32() {
+    return anno_u32() + user_anno_offset / 4;
+}
+
+/** @brief overload */
+inline const uint32_t *Packet::user_anno_u32() const {
+    return anno_u32() + user_anno_offset / 4;
+}
+
+/** @brief Return user annotation byte @a i.
+ * @param i annotation index
+ * @pre 0 <= @a i < USER_ANNO_SIZE
+ * @deprecated Use Packet::anno_u8(@a i) instead. */
+inline uint8_t Packet::user_anno_u8(int i) const {
+    return anno_u8(user_anno_offset + i);
+}
+
+/** @brief Set user annotation byte @a i.
+ * @param i annotation index
+ * @param v value
+ * @pre 0 <= @a i < USER_ANNO_SIZE
+ * @deprecated Use Packet::set_anno_u8(@a i, @a v) instead. */
+inline void Packet::set_user_anno_u8(int i, uint8_t v) {
+    set_anno_u8(user_anno_offset + i, v);
+}
+
+/** @brief Return 16-bit user annotation @a i.
+ * @param i annotation index
+ * @pre 0 <= @a i < USER_ANNO_U16_SIZE
+ * @deprecated Use Packet::anno_u16(@a i * 2) instead.
+ *
+ * Affects user annotation bytes [2*@a i, 2*@a i+1]. */
+inline uint16_t Packet::user_anno_u16(int i) const {
+    return anno_u16(user_anno_offset + i * 2);
+}
+
+/** @brief Set 16-bit user annotation @a i.
+ * @param i annotation index
+ * @param v value
+ * @pre 0 <= @a i < USER_ANNO_U16_SIZE
+ * @deprecated Use Packet::set_anno_u16(@a i * 2, @a v) instead.
+ *
+ * Affects user annotation bytes [2*@a i, 2*@a i+1]. */
+inline void Packet::set_user_anno_u16(int i, uint16_t v) {
+    set_anno_u16(user_anno_offset + i * 2, v);
+}
+
+/** @brief Return 32-bit user annotation @a i.
+ * @param i annotation index
+ * @pre 0 <= @a i < USER_ANNO_U32_SIZE
+ * @deprecated Use Packet::anno_u32(@a i * 4) instead.
+ *
+ * Affects user annotation bytes [4*@a i, 4*@a i+3]. */
+inline uint32_t Packet::user_anno_u32(int i) const {
+    return anno_u32(user_anno_offset + i * 4);
+}
+
+/** @brief Set 32-bit user annotation @a i.
+ * @param i annotation index
+ * @param v value
+ * @pre 0 <= @a i < USER_ANNO_U32_SIZE
+ * @deprecated Use Packet::set_anno_u32(@a i * 4, @a v) instead.
+ *
+ * Affects user annotation bytes [4*@a i, 4*@a i+3]. */
+inline void Packet::set_user_anno_u32(int i, uint32_t v) {
+    set_anno_u32(user_anno_offset + i * 4, v);
+}
+
+/** @brief Return 32-bit user annotation @a i.
+ * @param i annotation index
+ * @pre 0 <= @a i < USER_ANNO_U32_SIZE
+ * @deprecated Use Packet::anno_s32(@a i * 4) instead.
+ *
+ * Affects user annotation bytes [4*@a i, 4*@a i+3]. */
+inline int32_t Packet::user_anno_s32(int i) const {
+    return anno_s32(user_anno_offset + i * 4);
+}
+
+/** @brief Set 32-bit user annotation @a i.
+ * @param i annotation index
+ * @param v value
+ * @pre 0 <= @a i < USER_ANNO_U32_SIZE
+ * @deprecated Use Packet::set_anno_s32(@a i * 4, @a v) instead.
+ *
+ * Affects user annotation bytes [4*@a i, 4*@a i+3]. */
+inline void Packet::set_user_anno_s32(int i, int32_t v) {
+    set_anno_s32(user_anno_offset + i * 4, v);
+}
+
+#if HAVE_INT64_TYPES
+/** @brief Return 64-bit user annotation @a i.
+ * @param i annotation index
+ * @pre 0 <= @a i < USER_ANNO_U64_SIZE
+ * @deprecated Use Packet::anno_u64(@a i * 8) instead.
+ *
+ * Affects user annotation bytes [8*@a i, 8*@a i+7]. */
+inline uint64_t Packet::user_anno_u64(int i) const {
+    return anno_u64(user_anno_offset + i * 8);
+}
+
+/** @brief Set 64-bit user annotation @a i.
+ * @param i annotation index
+ * @param v value
+ * @pre 0 <= @a i < USER_ANNO_U64_SIZE
+ * @deprecated Use Packet::set_anno_u64(@a i * 8, @a v) instead.
+ *
+ * Affects user annotation bytes [8*@a i, 8*@a i+7]. */
+inline void Packet::set_user_anno_u64(int i, uint64_t v) {
+    set_anno_u64(user_anno_offset + i * 8, v);
+}
+#endif
+
+/** @brief Return a pointer to the user annotation area.
+ * @deprecated Use anno() instead. */
+inline const uint8_t *Packet::all_user_anno() const {
+    return anno_u8() + user_anno_offset;
+}
+
+/** @overload
+ * @deprecated Use anno() instead. */
+inline uint8_t *Packet::all_user_anno() {
+    return anno_u8() + user_anno_offset;
+}
+
+/** @brief Return a pointer to the user annotation area as uint32_ts.
+ * @deprecated Use anno_u32() instead. */
+inline const uint32_t *Packet::all_user_anno_u() const {
+    return anno_u32() + user_anno_offset / 4;
+}
+
+/** @overload
+ * @deprecated Use anno_u32() instead. */
+inline uint32_t *Packet::all_user_anno_u() {
+    return anno_u32() + user_anno_offset / 4;
+}
+
+/** @brief Return user annotation byte @a i.
+ * @deprecated Use anno_u8() instead. */
+inline uint8_t Packet::user_anno_c(int i) const {
+    return anno_u8(user_anno_offset + i);
+}
+
+/** @brief Set user annotation byte @a i.
+ * @deprecated Use set_anno_u8() instead. */
+inline void Packet::set_user_anno_c(int i, uint8_t v) {
+    set_anno_u8(user_anno_offset + i, v);
+}
+
+/** @brief Return 16-bit user annotation @a i.
+ * @deprecated Use anno_u16() instead. */
+inline uint16_t Packet::user_anno_us(int i) const {
+    return anno_u16(user_anno_offset + i * 2);
+}
+
+/** @brief Set 16-bit user annotation @a i.
+ * @deprecated Use set_anno_u16() instead. */
+inline void Packet::set_user_anno_us(int i, uint16_t v) {
+    set_anno_u16(user_anno_offset + i * 2, v);
+}
+
+/** @brief Return 16-bit user annotation @a i.
+ * @deprecated Use anno_u16() instead. */
+inline int16_t Packet::user_anno_s(int i) const {
+    return (int16_t) anno_u16(user_anno_offset + i * 2);
+}
+
+/** @brief Set 16-bit user annotation @a i.
+ * @deprecated Use set_anno_u16() instead. */
+inline void Packet::set_user_anno_s(int i, int16_t v) {
+    set_anno_u16(user_anno_offset + i * 2, v);
+}
+
+/** @brief Return 32-bit user annotation @a i.
+ * @deprecated Use anno_u32() instead. */
+inline uint32_t Packet::user_anno_u(int i) const {
+    return anno_u32(user_anno_offset + i * 4);
+}
+
+/** @brief Set 32-bit user annotation @a i.
+ * @deprecated Use set_anno_u32() instead. */
+inline void Packet::set_user_anno_u(int i, uint32_t v) {
+    set_anno_u32(user_anno_offset + i * 4, v);
+}
+
+/** @brief Return 32-bit user annotation @a i.
+ * @deprecated Use anno_s32() instead. */
+inline int32_t Packet::user_anno_i(int i) const {
+    return anno_s32(user_anno_offset + i * 4);
+}
+
+/** @brief Set 32-bit user annotation @a i.
+ * @deprecated Use set_anno_s32() instead. */
+inline void Packet::set_user_anno_i(int i, int32_t v) {
+    set_anno_s32(user_anno_offset + i * 4, v);
+}
+/** @endcond never */
+
+inline unsigned char *
+WritablePacket::data() const
+{
+    return const_cast<unsigned char *>(Packet::data());
+}
+
+inline unsigned char *
+WritablePacket::end_data() const
+{
+    return const_cast<unsigned char *>(Packet::end_data());
+}
+
+inline unsigned char *
+WritablePacket::buffer() const
+{
+    return const_cast<unsigned char *>(Packet::buffer());
+}
+
+inline unsigned char *
+WritablePacket::end_buffer() const
+{
+    return const_cast<unsigned char *>(Packet::end_buffer());
+}
+
+inline unsigned char *
+WritablePacket::mac_header() const
+{
+    return const_cast<unsigned char *>(Packet::mac_header());
+}
+
+inline unsigned char *
+WritablePacket::network_header() const
+{
+    return const_cast<unsigned char *>(Packet::network_header());
+}
+
+inline unsigned char *
+WritablePacket::transport_header() const
+{
+    return const_cast<unsigned char *>(Packet::transport_header());
+}
+
+inline click_ether *
+WritablePacket::ether_header() const
+{
+    return const_cast<click_ether *>(Packet::ether_header());
+}
+
+inline click_ip *
+WritablePacket::ip_header() const
+{
+    return const_cast<click_ip *>(Packet::ip_header());
+}
+
+inline click_ip6 *
+WritablePacket::ip6_header() const
+{
+    return const_cast<click_ip6 *>(Packet::ip6_header());
+}
+
+inline click_icmp *
+WritablePacket::icmp_header() const
+{
+    return const_cast<click_icmp *>(Packet::icmp_header());
+}
+
+inline click_tcp *
+WritablePacket::tcp_header() const
+{
+    return const_cast<click_tcp *>(Packet::tcp_header());
+}
+
+inline click_udp *
+WritablePacket::udp_header() const
+{
+    return const_cast<click_udp *>(Packet::udp_header());
+}
+
+/** @cond never */
+inline unsigned char *
+WritablePacket::buffer_data() const
+{
+    return const_cast<unsigned char *>(Packet::buffer());
+}
+/** @endcond never */
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/packet_anno.hh b/openflow/include/click/packet_anno.hh
new file mode 100644
index 0000000..80b7ee6
--- /dev/null
+++ b/openflow/include/click/packet_anno.hh
@@ -0,0 +1,137 @@
+#ifndef CLICK_PACKET_ANNO_HH
+#define CLICK_PACKET_ANNO_HH
+
+#define MAKE_ANNOTATIONINFO(offset, size)	((size) << 16 | (offset))
+#define ANNOTATIONINFO_SIZE(ai)			((ai) >> 16)
+#define ANNOTATIONINFO_OFFSET(ai)		((uint16_t) (ai))
+
+#define DST_IP_ANNO_OFFSET		0
+#define DST_IP_ANNO_SIZE		4
+
+#define DST_IP6_ANNO_OFFSET		0
+#define DST_IP6_ANNO_SIZE		16
+
+// bytes 16-31
+#define WIFI_EXTRA_ANNO_OFFSET		16
+#define WIFI_EXTRA_ANNO_SIZE		24
+#define WIFI_EXTRA_ANNO(p)		((click_wifi_extra *) ((p)->anno_u8() + WIFI_EXTRA_ANNO_OFFSET))
+
+// byte 16
+#define PAINT_ANNO_OFFSET		16
+#define PAINT_ANNO_SIZE			1
+#define PAINT_ANNO(p)			((p)->anno_u8(PAINT_ANNO_OFFSET))
+#define SET_PAINT_ANNO(p, v)		((p)->set_anno_u8(PAINT_ANNO_OFFSET, (v)))
+
+// byte 17
+#define ICMP_PARAMPROB_ANNO_OFFSET	17
+#define ICMP_PARAMPROB_ANNO_SIZE	1
+#define ICMP_PARAMPROB_ANNO(p)		((p)->anno_u8(ICMP_PARAMPROB_ANNO_OFFSET))
+#define SET_ICMP_PARAMPROB_ANNO(p, v)	((p)->set_anno_u8(ICMP_PARAMPROB_ANNO_OFFSET, (v)))
+
+// byte 19
+#define FIX_IP_SRC_ANNO_OFFSET		19
+#define FIX_IP_SRC_ANNO_SIZE		1
+#define FIX_IP_SRC_ANNO(p)		((p)->anno_u8(FIX_IP_SRC_ANNO_OFFSET))
+#define SET_FIX_IP_SRC_ANNO(p, v)	((p)->set_anno_u8(FIX_IP_SRC_ANNO_OFFSET, (v)))
+
+// bytes 20-21
+#define VLAN_TCI_ANNO_OFFSET		20
+#define VLAN_TCI_ANNO_SIZE		2
+#define VLAN_TCI_ANNO(p)		((p)->anno_u16(VLAN_TCI_ANNO_OFFSET))
+#define SET_VLAN_TCI_ANNO(p, v)		((p)->set_anno_u16(VLAN_TCI_ANNO_OFFSET, (v)))
+
+// bytes 20-23
+#define AGGREGATE_ANNO_OFFSET		20
+#define AGGREGATE_ANNO_SIZE		4
+#define AGGREGATE_ANNO(p)		((p)->anno_u32(AGGREGATE_ANNO_OFFSET))
+#define SET_AGGREGATE_ANNO(p, v)	((p)->set_anno_u32(AGGREGATE_ANNO_OFFSET, (v)))
+
+#define FWD_RATE_ANNO_OFFSET		20
+#define FWD_RATE_ANNO_SIZE		4
+#define FWD_RATE_ANNO(p)		((p)->anno_s32(FWD_RATE_ANNO_OFFSET))
+#define SET_FWD_RATE_ANNO(p, v)		((p)->set_anno_s32(FWD_RATE_ANNO_OFFSET, (v)))
+
+#define MISC_IP_ANNO_OFFSET		20
+#define MISC_IP_ANNO_SIZE		4
+#define MISC_IP_ANNO(p)                 ((p)->anno_u32(MISC_IP_ANNO_OFFSET))
+#define SET_MISC_IP_ANNO(p, v)		((p)->set_anno_u32(MISC_IP_ANNO_OFFSET, (v).addr()))
+
+// bytes 24-27
+#define EXTRA_PACKETS_ANNO_OFFSET	24
+#define EXTRA_PACKETS_ANNO_SIZE		4
+#define EXTRA_PACKETS_ANNO(p)		((p)->anno_u32(EXTRA_PACKETS_ANNO_OFFSET))
+#define SET_EXTRA_PACKETS_ANNO(p, v)	((p)->set_anno_u32(EXTRA_PACKETS_ANNO_OFFSET, (v)))
+
+#define REV_RATE_ANNO_OFFSET		24
+#define REV_RATE_ANNO_SIZE		4
+#define REV_RATE_ANNO(p)		((p)->anno_s32(REV_RATE_ANNO_OFFSET))
+#define SET_REV_RATE_ANNO(p, v)		((p)->set_anno_s32(REV_RATE_ANNO_OFFSET, (v)))
+
+// byte 26
+#define SEND_ERR_ANNO_OFFSET		26
+#define SEND_ERR_ANNO_SIZE		1
+#define SEND_ERR_ANNO(p)                ((p)->anno_u8(SEND_ERR_ANNO_OFFSET))
+#define SET_SEND_ERR_ANNO(p, v)         ((p)->set_anno_u8(SEND_ERR_ANNO_OFFSET, (v)))
+
+// byte 27
+#define GRID_ROUTE_CB_ANNO_OFFSET	27
+#define GRID_ROUTE_CB_ANNO_SIZE		1
+#define GRID_ROUTE_CB_ANNO(p)           ((p)->anno_u8(GRID_ROUTE_CB_ANNO_OFFSET))
+#define SET_GRID_ROUTE_CB_ANNO(p, v)    ((p)->set_anno_u8(GRID_ROUTE_CB_ANNO_OFFSET, (v)))
+
+// bytes 28-31
+#define IPREASSEMBLER_ANNO_OFFSET	28
+#define IPREASSEMBLER_ANNO_SIZE		4
+
+#define EXTRA_LENGTH_ANNO_OFFSET	28
+#define EXTRA_LENGTH_ANNO_SIZE		4
+#define EXTRA_LENGTH_ANNO(p)		((p)->anno_u32(EXTRA_LENGTH_ANNO_OFFSET))
+#define SET_EXTRA_LENGTH_ANNO(p, v)	((p)->set_anno_u32(EXTRA_LENGTH_ANNO_OFFSET, (v)))
+
+// bytes 32-39
+#define FIRST_TIMESTAMP_ANNO_OFFSET	32
+#define FIRST_TIMESTAMP_ANNO_SIZE	8
+#define CONST_FIRST_TIMESTAMP_ANNO(p)	(*(reinterpret_cast<const Timestamp *>((p)->anno_u8() + FIRST_TIMESTAMP_ANNO_OFFSET)))
+#define FIRST_TIMESTAMP_ANNO(p)		(*(reinterpret_cast<Timestamp *>((p)->anno_u8() + FIRST_TIMESTAMP_ANNO_OFFSET)))
+#define SET_FIRST_TIMESTAMP_ANNO(p, v)	(*(reinterpret_cast<Timestamp *>((p)->anno_u8() + FIRST_TIMESTAMP_ANNO_OFFSET)) = (v))
+
+// bytes 32-35
+#define PACKET_NUMBER_ANNO_OFFSET	32
+#define PACKET_NUMBER_ANNO_SIZE		4
+#define PACKET_NUMBER_ANNO(p)		((p)->anno_u32(PACKET_NUMBER_ANNO_OFFSET))
+#define SET_PACKET_NUMBER_ANNO(p, v)	((p)->set_anno_u32(PACKET_NUMBER_ANNO_OFFSET, (v)))
+
+#define IPSEC_SPI_ANNO_OFFSET		32
+#define IPSEC_SPI_ANNO_SIZE		4
+#define IPSEC_SPI_ANNO(p)		((p)->anno_u32(IPSEC_SPI_ANNO_OFFSET))
+#define SET_IPSEC_SPI_ANNO(p, v)	((p)->set_anno_u32(IPSEC_SPI_ANNO_OFFSET, (v)))
+
+// bytes 36-39
+#define SEQUENCE_NUMBER_ANNO_OFFSET	36
+#define SEQUENCE_NUMBER_ANNO_SIZE	4
+#define SEQUENCE_NUMBER_ANNO(p)		((p)->anno_u32(SEQUENCE_NUMBER_ANNO_OFFSET))
+#define SET_SEQUENCE_NUMBER_ANNO(p, v)	((p)->set_anno_u32(SEQUENCE_NUMBER_ANNO_OFFSET, (v)))
+
+#if SIZEOF_VOID_P == 4
+# define IPSEC_SA_DATA_REFERENCE_ANNO_OFFSET	36
+# define IPSEC_SA_DATA_REFERENCE_ANNO_SIZE	4
+# define IPSEC_SA_DATA_REFERENCE_ANNO(p)	((p)->anno_u32(IPSEC_SA_DATA_REFERENCE_ANNO_OFFSET))
+# define SET_IPSEC_SA_DATA_REFERENCE_ANNO(p, v) ((p)->set_anno_u32(IPSEC_SA_DATA_REFERENCE_ANNO_OFFSET, (v)))
+#endif
+
+#if HAVE_INT64_TYPES
+// bytes 40-47
+# define PERFCTR_ANNO_OFFSET		40
+# define PERFCTR_ANNO_SIZE		8
+# define PERFCTR_ANNO(p)		((p)->anno_u64(PERFCTR_ANNO_OFFSET))
+# define SET_PERFCTR_ANNO(p, v)		((p)->set_anno_u64(PERFCTR_ANNO_OFFSET, (v)))
+
+# if SIZEOF_VOID_P == 8
+#  define IPSEC_SA_DATA_REFERENCE_ANNO_OFFSET	40
+#  define IPSEC_SA_DATA_REFERENCE_ANNO_SIZE	8
+#  define IPSEC_SA_DATA_REFERENCE_ANNO(p)	((p)->anno_u64(IPSEC_SA_DATA_REFERENCE_ANNO_OFFSET))
+#  define SET_IPSEC_SA_DATA_REFERENCE_ANNO(p, v) ((p)->set_anno_u64(IPSEC_SA_DATA_REFERENCE_ANNO_OFFSET, (v)))
+# endif
+#endif
+
+#endif
diff --git a/openflow/include/click/pair.hh b/openflow/include/click/pair.hh
new file mode 100644
index 0000000..76b6f8f
--- /dev/null
+++ b/openflow/include/click/pair.hh
@@ -0,0 +1,89 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_PAIR_HH
+#define CLICK_PAIR_HH
+#include <click/hashcode.hh>
+#include <click/type_traits.hh>
+CLICK_DECLS
+
+template <class T, class U>
+struct Pair {
+
+    typedef T first_type;
+    typedef U second_type;
+    typedef T key_type;
+    typedef const T &key_const_reference;
+
+    T first;
+    U second;
+
+    inline Pair()
+	: first(), second() {
+    }
+
+    inline Pair(typename fast_argument<T>::type t,
+		typename fast_argument<U>::type u)
+	: first(t), second(u) {
+    }
+
+    inline Pair(const Pair<T, U> &p)
+	: first(p.first), second(p.second) {
+    }
+
+    template <typename V, typename W>
+    inline Pair(const Pair<V, W> &p)
+	: first(p.first), second(p.second) {
+    }
+
+    typedef hashcode_t (Pair<T, U>::*unspecified_bool_type)() const;
+    inline operator unspecified_bool_type() const {
+	return first || second ? &Pair<T, U>::hashcode : 0;
+    }
+
+    inline const T &hashkey() const {
+	return first;
+    }
+
+    inline hashcode_t hashcode() const;
+
+    template <typename V, typename W>
+    Pair<T, U> &operator=(const Pair<V, W> &p) {
+	first = p.first;
+	second = p.second;
+	return *this;
+    }
+
+};
+
+template <class T, class U>
+inline bool operator==(const Pair<T, U> &a, const Pair<T, U> &b)
+{
+    return a.first == b.first && a.second == b.second;
+}
+
+template <class T, class U>
+inline bool operator!=(const Pair<T, U> &a, const Pair<T, U> &b)
+{
+    return a.first != b.first || a.second != b.second;
+}
+
+template <class T, class U>
+inline bool operator<(const Pair<T, U> &a, const Pair<T, U> &b)
+{
+    return a.first < b.first
+	|| (!(b.first < a.first) && a.second < b.second);
+}
+
+template <class T, class U>
+inline hashcode_t Pair<T, U>::hashcode() const
+{
+    return (CLICK_NAME(hashcode)(first) << 7) ^ CLICK_NAME(hashcode)(second);
+}
+
+template <class T, class U>
+inline Pair<T, U> make_pair(T t, U u)
+{
+    return Pair<T, U>(t, u);
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/pathvars.h b/openflow/include/click/pathvars.h
new file mode 100644
index 0000000..9a5ddc2
--- /dev/null
+++ b/openflow/include/click/pathvars.h
@@ -0,0 +1,42 @@
+/* include/click/pathvars.h.  Generated from pathvars.h.in by configure.  */
+/* Process this file with configure to produce pathvars.h. -*- mode: c -*- */
+#ifndef CLICK_PATHVARS_H
+#define CLICK_PATHVARS_H
+
+/* Install directory for Click executables. */
+#define CLICK_BINDIR "/usr/local/bin"
+
+/* Install directory for Click libraries and packages. */
+#define CLICK_LIBDIR "/usr/local/lib"
+
+/* Install directory for Click shared data. */
+#define CLICK_DATADIR "/usr/local/share/click"
+
+/* FreeBSD kernel include directory. */
+#define FREEBSD_INCLUDEDIR "/usr/include"
+
+/* Define if the BSD kernel module driver was compiled. */
+/* #undef HAVE_BSDMODULE_DRIVER */
+
+/* Define if the Click kernel module should provide clickfs. */
+#define HAVE_CLICKFS 1
+
+/* Define if the expat library is available. */
+#define HAVE_EXPAT 1
+
+/* Define if the Click linuxmodule is compiled for a 2.6 kernel. */
+/* #undef HAVE_LINUXMODULE_2_6 */
+
+/* Define if the Linux kernel module driver was compiled. */
+/* #undef HAVE_LINUXMODULE_DRIVER */
+
+/* Define if the minios driver was compiled. */
+/* #undef HAVE_MINIOS_DRIVER */
+
+/* Define if the user-level driver was compiled. */
+#define HAVE_USERLEVEL_DRIVER 1
+
+/* Directory containing Linux sources. */
+#define LINUX_SRCDIR "NONE"
+
+#endif
diff --git a/openflow/include/click/perfctr-i586.hh b/openflow/include/click/perfctr-i586.hh
new file mode 100644
index 0000000..713bc9d
--- /dev/null
+++ b/openflow/include/click/perfctr-i586.hh
@@ -0,0 +1,37 @@
+#ifndef CLICK_PERFCTR_HH
+#define CLICK_PERFCTR_HH
+#ifdef __KERNEL__
+# include <click/glue.hh>
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# include <asm/msr.h>
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+#endif
+
+#define DCU_MISS_OUTSTANDING	0x48
+#define INST_RETIRED		0xC0
+#define IFU_FETCH		0x80
+#define IFU_FETCH_MISS		0x81
+#define IFU_MEM_STALL		0x86
+#define L2_LINES_IN		0x24
+#define L2_LINES_OUT		0x26
+#define L2_IFETCH		0x28 | (0xF<<8)
+#define L2_LD			0x29 | (0xF<<8)
+#define L2_LINES_OUTM		0x27
+#define L2_RQSTS		0x2E | (0xF<<8)
+#define BUS_LOCK_CLOCKS         0x63
+#define BUS_TRAN_RFO            0x66
+#define BUS_TRAN_INVAL		0x69
+#define BUS_TRAN_MEM		0x6F
+
+#define MSR_OS (1<<17)
+#define MSR_OCCURRENCE (1<<18)
+#define MSR_ENABLE (1<<22)
+#define MSR_FLAGS0 (MSR_OS|MSR_OCCURRENCE|MSR_ENABLE)
+#define MSR_FLAGS1 (MSR_OS|MSR_OCCURRENCE)
+
+#define MSR_EVNTSEL0 0x186
+#define MSR_EVNTSEL1 0x187
+
+#endif
diff --git a/openflow/include/click/router.hh b/openflow/include/click/router.hh
new file mode 100644
index 0000000..e4eb40c
--- /dev/null
+++ b/openflow/include/click/router.hh
@@ -0,0 +1,624 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/router.cc" -*-
+#ifndef CLICK_ROUTER_HH
+#define CLICK_ROUTER_HH
+#include <click/element.hh>
+#include <click/timer.hh>
+#include <click/sync.hh>
+#include <click/task.hh>
+#include <click/standard/threadsched.hh>
+#if CLICK_NS
+# include <click/simclick.h>
+#endif
+CLICK_DECLS
+class Master;
+class ElementFilter;
+class RouterVisitor;
+class RouterThread;
+class HashMap_ArenaFactory;
+class NotifierSignal;
+class ThreadSched;
+class Handler;
+class NameInfo;
+
+class Router { public:
+
+    /** @name Public Member Functions */
+    //@{
+    // MASTER
+    inline Master* master() const;
+
+    // STATUS
+    inline bool initialized() const;
+    inline bool handlers_ready() const;
+    inline bool running() const;
+    inline bool dying() const;
+
+    // RUNCOUNT AND RUNCLASS
+    enum { STOP_RUNCOUNT = -2147483647 - 1 };
+    inline int32_t runcount() const;
+    void adjust_runcount(int32_t delta);
+    void set_runcount(int32_t rc);
+    inline void please_stop_driver();
+
+    // ELEMENTS
+    inline const Vector<Element*>& elements() const;
+    inline int nelements() const;
+    inline Element* element(int i) const;
+    inline Element* root_element() const;
+    static Element* element(const Router *router, int i);
+
+    const String& ename(int i) const;
+    String ename_context(int i) const;
+    String elandmark(int i) const;
+    const String& econfiguration(int i) const;
+    void set_econfiguration(int i, const String& conf);
+
+    Element* find(const String& name, ErrorHandler* errh = 0) const;
+    Element* find(const String& name, String context, ErrorHandler* errh = 0) const;
+    Element* find(const String& name, const Element* context, ErrorHandler* errh = 0) const;
+
+    int visit(Element *e, bool isoutput, int port, RouterVisitor *visitor) const;
+    int visit_downstream(Element *e, int port, RouterVisitor *visitor) const;
+    int visit_upstream(Element *e, int port, RouterVisitor *visitor) const;
+
+    int downstream_elements(Element *e, int port, ElementFilter *filter, Vector<Element*> &result) CLICK_DEPRECATED;
+    int upstream_elements(Element *e, int port, ElementFilter *filter, Vector<Element*> &result) CLICK_DEPRECATED;
+
+    inline const char *flow_code_override(int eindex) const;
+    void set_flow_code_override(int eindex, const String &flow_code);
+
+    // HANDLERS
+    // 'const Handler *' results last until that element/handlername modified
+    static const Handler *handler(const Element *e, const String &hname);
+    static void add_read_handler(const Element *e, const String &hname, ReadHandlerCallback callback, void *user_data, uint32_t flags = 0);
+    static void add_write_handler(const Element *e, const String &hname, WriteHandlerCallback callback, void *user_data, uint32_t flags = 0);
+    static void set_handler(const Element *e, const String &hname, uint32_t flags, HandlerCallback callback, void *read_user_data = 0, void *write_user_data = 0);
+    static int set_handler_flags(const Element *e, const String &hname, uint32_t set_flags, uint32_t clear_flags = 0);
+
+    enum { FIRST_GLOBAL_HANDLER = 0x40000000 };
+    static int hindex(const Element *e, const String &hname);
+    static const Handler *handler(const Router *router, int hindex);
+    static void element_hindexes(const Element *e, Vector<int> &result);
+
+    // ATTACHMENTS AND REQUIREMENTS
+    void* attachment(const String& aname) const;
+    void*& force_attachment(const String& aname);
+    void* set_attachment(const String& aname, void* value);
+
+    ErrorHandler* chatter_channel(const String& channel_name) const;
+    HashMap_ArenaFactory* arena_factory() const;
+
+    inline ThreadSched* thread_sched() const;
+    inline void set_thread_sched(ThreadSched* scheduler);
+    inline int home_thread_id(const Element* e) const;
+    inline void set_home_thread_id(const Element* e, int home_thread);
+
+    /** @cond never */
+    // Needs to be public for NameInfo, but not useful outside
+    inline NameInfo* name_info() const;
+    NameInfo* force_name_info();
+    /** @endcond never */
+
+    // UNPARSING
+    String configuration_string() const;
+    void unparse(StringAccum& sa, const String& indent = String()) const;
+    void unparse_requirements(StringAccum& sa, const String& indent = String()) const;
+    void unparse_declarations(StringAccum& sa, const String& indent = String()) const;
+    void unparse_connections(StringAccum& sa, const String& indent = String()) const;
+
+    String element_ports_string(const Element *e) const;
+    //@}
+
+    // INITIALIZATION
+    /** @name Internal Functions */
+    //@{
+    Router(const String& configuration, Master* master);
+    ~Router();
+
+    static void static_initialize();
+    static void static_cleanup();
+
+    inline void use();
+    void unuse();
+
+    void add_requirement(const String &type, const String &value);
+    int add_element(Element *e, const String &name, const String &conf, const String &filename, unsigned lineno);
+    int add_connection(int from_idx, int from_port, int to_idx, int to_port);
+#if CLICK_LINUXMODULE
+    int add_module_ref(struct module* module);
+#endif
+
+    inline Router* hotswap_router() const;
+    void set_hotswap_router(Router* router);
+
+    int initialize(ErrorHandler* errh);
+    void activate(bool foreground, ErrorHandler* errh);
+    inline void activate(ErrorHandler* errh);
+    inline void set_foreground(bool foreground);
+
+    int new_notifier_signal(const char *name, NotifierSignal &signal);
+    String notifier_signal_name(const atomic_uint32_t *signal) const;
+    //@}
+
+    /** @cond never */
+    // Needs to be public for Lexer, etc., but not useful outside
+    struct Port {
+        int idx;
+        int port;
+
+        Port() {
+        }
+        Port(int i, int p)
+            : idx(i), port(p) {
+        }
+
+        bool operator==(const Port &x) const {
+            return idx == x.idx && port == x.port;
+        }
+        bool operator!=(const Port &x) const {
+            return idx != x.idx || port != x.port;
+        }
+        bool operator<(const Port &x) const {
+            return idx < x.idx || (idx == x.idx && port < x.port);
+        }
+        bool operator<=(const Port &x) const {
+            return idx < x.idx || (idx == x.idx && port <= x.port);
+        }
+    };
+
+    struct Connection {
+        Port p[2];
+
+        Connection() {
+        }
+        Connection(int from_idx, int from_port, int to_idx, int to_port) {
+            p[0] = Port(to_idx, to_port);
+            p[1] = Port(from_idx, from_port);
+        }
+
+        const Port &operator[](int i) const {
+            assert(i >= 0 && i < 2);
+            return p[i];
+        }
+        Port &operator[](int i) {
+            assert(i >= 0 && i < 2);
+            return p[i];
+        }
+
+        bool operator==(const Connection &x) const {
+            return p[0] == x.p[0] && p[1] == x.p[1];
+        }
+        bool operator<(const Connection &x) const {
+            return p[0] < x.p[0] || (p[0] == x.p[0] && p[1] < x.p[1]);
+        }
+    };
+    /** @endcond never */
+
+#if CLICK_NS
+    simclick_node_t *simnode() const;
+    int sim_get_ifid(const char* ifname);
+    int sim_listen(int ifid, int element);
+    int sim_if_ready(int ifid);
+    int sim_write(int ifid, int ptype, const unsigned char *, int len,
+                  simclick_simpacketinfo *pinfo);
+    int sim_incoming_packet(int ifid, int ptype, const unsigned char *,
+                            int len, simclick_simpacketinfo* pinfo);
+    void sim_trace(const char* event);
+    int sim_get_node_id();
+    int sim_get_next_pkt_id();
+    int sim_if_promisc(int ifid);
+
+  protected:
+    Vector<Vector<int> *> _listenvecs;
+    Vector<int>* sim_listenvec(int ifid);
+#endif
+
+  private:
+
+    class RouterContextErrh;
+
+    enum {
+        ROUTER_NEW, ROUTER_PRECONFIGURE, ROUTER_PREINITIALIZE,
+        ROUTER_LIVE, ROUTER_DEAD                // order is important
+    };
+    enum {
+        RUNNING_DEAD = -2, RUNNING_INACTIVE = -1, RUNNING_PREPARING = 0,
+        RUNNING_BACKGROUND = 1, RUNNING_ACTIVE = 2
+    };
+
+    Master* _master;
+
+    atomic_uint32_t _runcount;
+
+    volatile int _state;
+    bool _have_connections : 1;
+    mutable bool _conn_sorted : 1;
+    bool _have_configuration : 1;
+    volatile int _running;
+
+    atomic_uint32_t _refcount;
+
+    Vector<Element *> _elements;
+    Vector<String> _element_names;
+    Vector<String> _element_configurations;
+    Vector<uint32_t> _element_landmarkids;
+    mutable Vector<int> _element_home_thread_ids;
+
+    struct element_landmark_t {
+        uint32_t first_landmarkid;
+        String filename;
+    };
+    Vector<element_landmark_t> _element_landmarks;
+    uint32_t _last_landmarkid;
+
+    mutable Vector<int> _element_name_sorter;
+    Vector<int> _element_gport_offset[2];
+    Vector<int> _element_configure_order;
+
+    mutable Vector<Connection> _conn;
+    mutable Vector<int> _conn_output_sorter;
+
+    Vector<String> _requirements;
+
+    Vector<int> _ehandler_first_by_element;
+    Vector<int> _ehandler_to_handler;
+    Vector<int> _ehandler_next;
+
+    Vector<int> _handler_first_by_name;
+
+    enum { HANDLER_BUFSIZ = 256 };
+    Handler** _handler_bufs;
+    int _nhandlers_bufs;
+    int _free_handler;
+
+    Vector<String> _attachment_names;
+    Vector<void*> _attachments;
+
+    Element* _root_element;
+    String _configuration;
+
+    struct notifier_signals_t {
+        enum { capacity = 4096 };
+        String name;
+        int nsig;
+        atomic_uint32_t sig[capacity / 32];
+        notifier_signals_t *next;
+        notifier_signals_t(const String &n, notifier_signals_t *nx)
+            : name(n), nsig(0), next(nx) {
+            memset(&sig[0], 0, sizeof(sig));
+        }
+    };
+    notifier_signals_t *_notifier_signals;
+    HashMap_ArenaFactory* _arena_factory;
+    Router* _hotswap_router;
+    ThreadSched* _thread_sched;
+    mutable NameInfo* _name_info;
+    Vector<int> _flow_code_override_eindex;
+    Vector<String> _flow_code_override;
+
+    Router* _next_router;
+
+#if CLICK_LINUXMODULE
+    Vector<struct module*> _modules;
+#endif
+
+    Router(const Router&);
+    Router& operator=(const Router&);
+
+    Connection *remove_connection(Connection *cp);
+    void hookup_error(const Port &p, bool isoutput, const char *message,
+                      ErrorHandler *errh, bool active = false);
+    int check_hookup_elements(ErrorHandler*);
+    int check_hookup_range(ErrorHandler*);
+    int check_hookup_completeness(ErrorHandler*);
+
+    const char *hard_flow_code_override(int e) const;
+    int processing_error(const Connection &conn, bool, int, ErrorHandler*);
+    int check_push_and_pull(ErrorHandler*);
+
+    void set_connections();
+    void sort_connections() const;
+    int connindex_lower_bound(bool isoutput, const Port &port) const;
+
+    void make_gports();
+    inline int ngports(bool isout) const {
+        return _element_gport_offset[isout].back();
+    }
+    inline int gport(bool isoutput, const Port &port) const;
+
+    int hard_home_thread_id(const Element *e) const;
+
+    int element_lerror(ErrorHandler*, Element*, const char*, ...) const;
+
+    // private handler methods
+    void initialize_handlers(bool, bool);
+    inline Handler* xhandler(int) const;
+    int find_ehandler(int, const String&, bool allow_star) const;
+    static inline Handler fetch_handler(const Element*, const String&);
+    void store_local_handler(int eindex, Handler &h);
+    static void store_global_handler(Handler &h);
+    static inline void store_handler(const Element *element, Handler &h);
+
+    // global handlers
+    static String router_read_handler(Element *e, void *user_data);
+    static int router_write_handler(const String &str, Element *e, void *user_data, ErrorHandler *errh);
+
+    /** @cond never */
+    friend class Master;
+    friend class Task;
+    friend int Element::set_nports(int, int);
+    /** @endcond never */
+
+};
+
+
+/** @brief  Increment the router's reference count.
+ *
+ *  Routers are reference counted objects.  A Router is created with one
+ *  reference, which is held by its Master object.  Normally the Router and
+ *  all its elements will be deleted when the Master drops this reference, but
+ *  you can preserve the Router for longer by adding a reference yourself. */
+inline void
+Router::use()
+{
+    _refcount++;
+}
+
+/** @brief  Return true iff the router is currently running.
+ *
+ *  A running router has been successfully initialized (so running() implies
+ *  initialized()), and has not stopped yet. */
+inline bool
+Router::running() const
+{
+    return _running > 0;
+}
+
+/** @brief  Return true iff the router is in the process of being killed. */
+inline bool
+Router::dying() const
+{
+    return _running == RUNNING_DEAD;
+}
+
+/** @brief  Return true iff the router has been successfully initialized. */
+inline bool
+Router::initialized() const
+{
+    return _state == ROUTER_LIVE;
+}
+
+/** @brief  Return true iff the router's handlers have been initialized.
+ *
+ *  handlers_ready() returns false until each element's
+ *  Element::add_handlers() method has been called.  This happens after
+ *  Element::configure(), but before Element::initialize(). */
+inline bool
+Router::handlers_ready() const
+{
+    return _state > ROUTER_PRECONFIGURE;
+}
+
+/** @brief  Returns a vector containing all the router's elements.
+ *  @invariant  elements()[i] == element(i) for all i in range. */
+inline const Vector<Element*>&
+Router::elements() const
+{
+    return _elements;
+}
+
+/** @brief  Returns the number of elements in the router. */
+inline int
+Router::nelements() const
+{
+    return _elements.size();
+}
+
+/** @brief  Returns the element with index @a i.
+ *  @param  i  element index, or -1 for root_element()
+ *  @invariant  If element(i) isn't null, then element(i)->@link Element::eindex eindex@endlink() == i.
+ *
+ *  This function returns the element with index @a i.  If @a i ==
+ *  -1, returns root_element().  If @a i is otherwise out of range,
+ *  returns null. */
+inline Element*
+Router::element(int i) const
+{
+    return element(this, i);
+}
+
+/** @brief  Returns this router's root element.
+ *
+ *  Every router has a root Element.  This element has Element::eindex() -1 and
+ *  name "".  It is not configured or initialized, and doesn't appear in the
+ *  configuration; it exists only for convenience, when other Click code needs
+ *  to refer to some arbitrary element at the top level of the compound
+ *  element hierarchy. */
+inline Element*
+Router::root_element() const
+{
+    return _root_element;
+}
+
+inline ThreadSched*
+Router::thread_sched() const
+{
+    return _thread_sched;
+}
+
+inline void
+Router::set_thread_sched(ThreadSched* ts)
+{
+    _thread_sched = ts;
+}
+
+inline int
+Router::home_thread_id(const Element* e) const
+{
+    if (initialized())
+        return _element_home_thread_ids[e->eindex() + 1];
+    else
+        return hard_home_thread_id(e);
+}
+
+inline void
+Router::set_home_thread_id(const Element* e, int home_thread_id)
+{
+    _element_home_thread_ids[e->eindex() + 1] = home_thread_id;
+}
+
+/** @cond never */
+/** @brief  Return the NameInfo object for this router, if it exists.
+ *
+ * Users never need to call this. */
+inline NameInfo*
+Router::name_info() const
+{
+    return _name_info;
+}
+/** @endcond never */
+
+/** @brief  Return the Master object for this router. */
+inline Master*
+Router::master() const
+{
+    return _master;
+}
+
+/** @brief  Return the router's runcount.
+ *
+ *  The runcount is an integer that determines whether the router is running.
+ *  A running router has positive runcount.  Decrementing the router's runcount
+ *  to zero or below will cause the router to stop, although elements like
+ *  DriverManager can intercept the stop request and continue processing.
+ *
+ *  Elements request that the router stop its processing by calling
+ *  adjust_runcount() or please_stop_driver(). */
+inline int32_t
+Router::runcount() const
+{
+    return _runcount.value();
+}
+
+/** @brief  Request a driver stop by adjusting the runcount by -1.
+ *  @note   Equivalent to adjust_runcount(-1). */
+inline void
+Router::please_stop_driver()
+{
+    adjust_runcount(-1);
+}
+
+/** @brief Returns the overriding flow code for element @a e, if any.
+ *  @param eindex element index
+ *  @return The flow code, or null if none has been set. */
+inline const char *
+Router::flow_code_override(int eindex) const
+{
+    if (_flow_code_override.size())
+        return hard_flow_code_override(eindex);
+    else
+        return 0;
+}
+
+inline void
+Router::activate(ErrorHandler* errh)
+{
+    activate(true, errh);
+}
+
+inline void
+Router::set_foreground(bool foreground)
+{
+    assert(_running >= RUNNING_BACKGROUND);
+    _running = foreground ? RUNNING_ACTIVE : RUNNING_BACKGROUND;
+}
+
+/** @brief  Finds an element named @a name.
+ *  @param  name     element name
+ *  @param  errh     optional error handler
+ *
+ *  Returns the unique element named @a name, if any.  If no element named @a
+ *  name is found, reports an error to @a errh and returns null.  The error is
+ *  "<tt>no element named 'name'</tt>".  If @a errh is null, no error is
+ *  reported.
+ *
+ *  This function is equivalent to find(const String&, String, ErrorHandler*)
+ *  with a context argument of the empty string. */
+inline Element *
+Router::find(const String& name, ErrorHandler *errh) const
+{
+    return find(name, "", errh);
+}
+
+/** @brief Traverse the router configuration downstream of @a e[@a port].
+ * @param e element to start search
+ * @param port output port (or -1 to search all output ports)
+ * @param visitor RouterVisitor traversal object
+ * @return 0 on success, -1 in early router configuration stages
+ *
+ * Calls @a visitor ->@link RouterVisitor::visit visit() @endlink on each
+ * reachable input port starting from the output port @a e[@a port].  Follows
+ * connections and traverses inside elements from port to port by
+ * Element::flow_code().  The visitor can stop a traversal path by returning
+ * false from visit().
+ *
+ * @sa visit_upstream(), visit()
+ */
+inline int
+Router::visit_downstream(Element *e, int port, RouterVisitor *visitor) const
+{
+    return visit(e, true, port, visitor);
+}
+
+/** @brief Traverse the router configuration upstream of [@a port]@a e.
+ * @param e element to start search
+ * @param port input port (or -1 to search all input ports)
+ * @param visitor RouterVisitor traversal object
+ * @return 0 on success, -1 in early router configuration stages
+ *
+ * Calls @a visitor ->@link RouterVisitor::visit visit() @endlink on each
+ * reachable output port starting from the input port [@a port]@a e.  Follows
+ * connections and traverses inside elements from port to port by
+ * Element::flow_code().  The visitor can stop a traversal path by returning
+ * false from visit().
+ *
+ * @sa visit_downstream(), visit()
+ */
+inline int
+Router::visit_upstream(Element *e, int port, RouterVisitor *visitor) const
+{
+    return visit(e, false, port, visitor);
+}
+
+inline HashMap_ArenaFactory*
+Router::arena_factory() const
+{
+    return _arena_factory;
+}
+
+/** @brief Returns the currently-installed router this router will eventually
+ * replace.
+ *
+ * This function is only meaningful during a router's initialization.  If this
+ * router was installed with the hotswap option, then hotswap_router() will
+ * return the currently-installed router that this router will eventually
+ * replace (assuming error-free initialization).  Otherwise, hotswap_router()
+ * will return 0.
+ */
+inline Router*
+Router::hotswap_router() const
+{
+    return _hotswap_router;
+}
+
+inline
+Handler::Handler(const String &name)
+    : _name(name), _read_user_data(0), _write_user_data(0), _flags(0),
+      _use_count(0), _next_by_name(-1)
+{
+    _read_hook.r = 0;
+    _write_hook.w = 0;
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/routerthread.hh b/openflow/include/click/routerthread.hh
new file mode 100644
index 0000000..8763577
--- /dev/null
+++ b/openflow/include/click/routerthread.hh
@@ -0,0 +1,527 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/routerthread.cc" -*-
+#ifndef CLICK_ROUTERTHREAD_HH
+#define CLICK_ROUTERTHREAD_HH
+#include <click/sync.hh>
+#include <click/vector.hh>
+#include <click/timerset.hh>
+#if CLICK_LINUXMODULE
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# include <linux/sched.h>
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+#elif CLICK_BSDMODULE
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# include <sys/systm.h>
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+#elif CLICK_USERLEVEL
+# include <click/selectset.hh>
+#endif
+
+// NB: user must #include <click/task.hh> before <click/routerthread.hh>.
+// We cannot #include <click/task.hh> ourselves because of circular #include
+// dependency.
+CLICK_DECLS
+
+class RouterThread { public:
+
+    enum { THREAD_QUIESCENT = -1, THREAD_UNKNOWN = -1000 };
+
+    inline int thread_id() const;
+
+    inline Master *master() const;
+    inline TimerSet &timer_set()                { return _timers; }
+    inline const TimerSet &timer_set() const    { return _timers; }
+#if CLICK_USERLEVEL
+    inline SelectSet &select_set()              { return _selects; }
+    inline const SelectSet &select_set() const  { return _selects; }
+#endif
+
+    // Task list functions
+    inline bool active() const;
+    inline Task *task_begin() const;
+    inline Task *task_next(Task *task) const;
+    inline Task *task_end() const;
+    void scheduled_tasks(Router *router, Vector<Task *> &x);
+
+    inline void lock_tasks();
+    inline void unlock_tasks();
+
+    inline void schedule_block_tasks();
+    inline void block_tasks(bool scheduled);
+    inline void unblock_tasks();
+
+    inline bool stop_flag() const;
+
+    inline void mark_driver_entry();
+    void driver();
+
+    void kill_router(Router *router);
+
+#if HAVE_ADAPTIVE_SCHEDULER
+    // min_cpu_share() and max_cpu_share() are expressed on a scale with
+    // Task::MAX_UTILIZATION == 100%.
+    unsigned min_cpu_share() const      { return _min_click_share; }
+    unsigned max_cpu_share() const      { return _max_click_share; }
+    unsigned cur_cpu_share() const      { return _cur_click_share; }
+    void set_cpu_share(unsigned min_share, unsigned max_share);
+#endif
+
+#if CLICK_LINUXMODULE || CLICK_BSDMODULE
+    bool greedy() const                 { return _greedy; }
+    void set_greedy(bool g)             { _greedy = g; }
+#endif
+
+    inline void wake();
+
+#if CLICK_USERLEVEL
+    inline void run_signals();
+#endif
+
+    enum { S_PAUSED, S_BLOCKED, S_TIMERWAIT,
+           S_LOCKSELECT, S_LOCKTASKS,
+           S_RUNTASK, S_RUNTIMER, S_RUNSIGNAL, S_RUNPENDING, S_RUNSELECT,
+           NSTATES };
+    inline void set_thread_state(int state);
+    inline void set_thread_state_for_blocking(int delay_type);
+#if CLICK_DEBUG_SCHEDULING
+    int thread_state() const            { return _thread_state; }
+    static String thread_state_name(int state);
+    uint32_t driver_epoch() const       { return _driver_epoch; }
+    uint32_t driver_task_epoch() const  { return _driver_task_epoch; }
+    Timestamp task_epoch_time(uint32_t epoch) const;
+# if CLICK_LINUXMODULE
+    struct task_struct *sleeper() const { return _linux_task; }
+# endif
+# if CLICK_DEBUG_SCHEDULING > 1
+    inline Timestamp thread_state_time(int state) const;
+    inline uint64_t thread_state_count(int state) const;
+# endif
+#endif
+
+  private:
+
+#if HAVE_TASK_HEAP
+    struct task_heap_element {
+        unsigned pass;
+        Task *t;
+        task_heap_element() {
+        }
+        task_heap_element(Task *t_)
+            : pass(t_->_pass), t(t_) {
+        }
+    };
+#endif
+
+    // LOCAL STATE GROUP
+    TaskLink _task_link;
+    volatile bool _stop_flag;
+#if HAVE_TASK_HEAP
+    Vector<task_heap_element> _task_heap;
+#endif
+
+    TimerSet _timers;
+#if CLICK_USERLEVEL
+    SelectSet _selects;
+#endif
+
+#if HAVE_ADAPTIVE_SCHEDULER
+    enum { C_CLICK, C_KERNEL, NCLIENTS };
+    struct Client {                     // top-level stride clients
+        unsigned pass;
+        unsigned stride;
+        int tickets;
+        Client() : pass(0), tickets(0)  { }
+    };
+    Client _clients[NCLIENTS];
+    unsigned _global_pass;              // global pass
+    unsigned _max_click_share;          // maximum allowed Click share of CPU
+    unsigned _min_click_share;          // minimum allowed Click share of CPU
+    unsigned _cur_click_share;          // current Click share
+    Timestamp _adaptive_restride_timestamp;
+    int _adaptive_restride_iter;
+#endif
+
+    // EXTERNAL STATE GROUP
+    Spinlock _task_lock CLICK_ALIGNED(CLICK_CACHE_LINE_SIZE);
+    atomic_uint32_t _task_blocker;
+    atomic_uint32_t _task_blocker_waiting;
+
+    Task::Pending _pending_head;
+    Task::Pending *_pending_tail;
+    SpinlockIRQ _pending_lock;
+
+    // SHARED STATE GROUP
+    Master *_master CLICK_ALIGNED(CLICK_CACHE_LINE_SIZE);
+    int _id;
+    bool _driver_entered;
+#if HAVE_MULTITHREAD && !(CLICK_LINUXMODULE || CLICK_MINIOS)
+    click_processor_t _running_processor;
+#endif
+#if CLICK_LINUXMODULE
+    bool _greedy;
+    struct task_struct *_linux_task;
+#endif
+#if CLICK_MINIOS
+    struct thread *_minios_thread;
+#endif
+  public:
+    unsigned _tasks_per_iter;
+    unsigned _iters_per_os;
+  private:
+
+#if CLICK_NS
+    Timestamp _ns_scheduled;
+    Timestamp _ns_last_active;
+    int _ns_active_iter;
+    enum { ns_iters_per_time = 1000 };
+#endif
+
+#if CLICK_BSDMODULE
+    // XXX FreeBSD
+    u_int64_t _old_tsc; /* MARKO - temp. */
+    void *_sleep_ident;
+    int _oticks;
+    bool _greedy;
+#endif
+
+#if CLICK_DEBUG_SCHEDULING
+    int _thread_state;
+    uint32_t _driver_epoch;
+    uint32_t _driver_task_epoch;
+    enum { TASK_EPOCH_BUFSIZ = 32 };
+    uint32_t _task_epoch_first;
+    Timestamp _task_epoch_time[TASK_EPOCH_BUFSIZ];
+# if CLICK_DEBUG_SCHEDULING > 1
+    Timestamp _thread_state_time[NSTATES];
+    uint64_t _thread_state_count[NSTATES];
+    Timestamp _thread_state_timestamp;
+# endif
+#endif
+
+    // called by Master
+    RouterThread(Master *master, int threadno);
+    ~RouterThread();
+
+    // task requests
+    inline void add_pending();
+#if HAVE_STRIDE_SCHED
+    inline unsigned pass() const {
+# if HAVE_TASK_HEAP
+        return _task_heap.size() ? _task_heap.unchecked_at(0).pass : 0;
+# else
+        return _task_link._next->_pass;
+# endif
+    }
+#endif
+
+    // task running functions
+    void driver_lock_tasks();
+    inline void driver_unlock_tasks() {
+        uint32_t val = _task_blocker.compare_swap((uint32_t) -1, 0);
+        (void) val;
+        assert(val == (uint32_t) -1);
+    }
+
+    inline void run_tasks(int ntasks);
+    inline void process_pending();
+    inline void run_os();
+#if HAVE_ADAPTIVE_SCHEDULER
+    void client_set_tickets(int client, int tickets);
+    inline void client_update_pass(int client, const Timestamp &before);
+#endif
+#if HAVE_TASK_HEAP
+    void task_reheapify_from(int pos, Task*);
+#endif
+    static inline bool running_in_interrupt();
+    inline bool current_thread_is_running() const;
+    inline bool current_thread_is_running_cleanup() const;
+
+    friend class Task;
+    friend class Master;
+#if CLICK_USERLEVEL
+    friend class SelectSet;
+#endif
+
+};
+
+
+/** @brief Returns this thread's ID.
+ *
+ * The result is >= 0 for true threads, and < 0 for threads that never run any
+ * of their associated Tasks.
+ */
+inline int
+RouterThread::thread_id() const
+{
+    return _id;
+}
+
+/** @brief Returns this thread's associated Master. */
+inline Master*
+RouterThread::master() const
+{
+    return _master;
+}
+
+/** @brief Returns whether any tasks are scheduled.
+ *
+ * Returns false iff no tasks are scheduled and no events are pending.  Since
+ * not all events actually matter (for example, a Task might have been
+ * scheduled and then subsequently unscheduled), active() may temporarily
+ * return true even when no real events are outstanding.
+ */
+inline bool
+RouterThread::active() const
+{
+    click_compiler_fence();
+#if HAVE_TASK_HEAP
+    return _task_heap.size() != 0 || _pending_head.x;
+#else
+    return _task_link._next != &_task_link || _pending_head.x;
+#endif
+}
+
+/** @brief Returns the beginning of the scheduled task list.
+ *
+ * Each RouterThread maintains a list of all currently-scheduled tasks.
+ * Elements may traverse this list with the task_begin(), task_next(), and
+ * task_end() functions, using iterator-like code such as:
+ *
+ * @code
+ * thread->lock_tasks();
+ * for (Task *t = thread->task_begin();
+ *      t != thread->task_end();
+ *      t = thread->task_next(t)) {
+ *     // ... do something with t...
+ * }
+ * thread->unlock_tasks();
+ * @endcode
+ *
+ * The thread's task lock must be held during the traversal, as shown above.
+ *
+ * The return value may not be a real task.  Test it against task_end() before
+ * use.
+ *
+ * @sa task_next, task_end, lock_tasks, unlock_tasks
+ */
+inline Task *
+RouterThread::task_begin() const
+{
+#if HAVE_TASK_HEAP
+    return (_task_heap.size() ? _task_heap.unchecked_at(0).t : 0);
+#else
+    return static_cast<Task *>(_task_link._next);
+#endif
+}
+
+/** @brief Returns the task following @a task in the scheduled task list.
+ * @param task the current task
+ *
+ * The return value may not be a real task.  Test it against task_end() before
+ * use.  However, the @a task argument must be a real task; do not attempt to
+ * call task_next(task_end()).
+ *
+ * @sa task_begin for usage, task_end
+ */
+inline Task *
+RouterThread::task_next(Task *task) const
+{
+#if HAVE_TASK_HEAP
+    int p = task->_schedpos + 1;
+    return (p < _task_heap.size() ? _task_heap.unchecked_at(p).t : 0);
+#else
+    return static_cast<Task *>(task->_next);
+#endif
+}
+
+/** @brief Returns the end of the scheduled task list.
+ *
+ * The return value is not a real task.
+ *
+ * @sa task_begin for usage, task_next
+ */
+inline Task *
+RouterThread::task_end() const
+{
+#if HAVE_TASK_HEAP
+    return 0;
+#else
+    return static_cast<Task *>(const_cast<TaskLink *>(&_task_link));
+#endif
+}
+
+inline bool
+RouterThread::running_in_interrupt()
+{
+#if CLICK_LINUXMODULE
+    return in_interrupt();
+#else
+    return false;
+#endif
+}
+
+inline void
+RouterThread::mark_driver_entry()
+{
+    _driver_entered = true;
+}
+
+inline bool
+RouterThread::current_thread_is_running() const
+{
+#if CLICK_LINUXMODULE
+    return current == _linux_task && !running_in_interrupt();
+#elif CLICK_MINIOS
+    return get_current() == _minios_thread;
+#elif CLICK_USERLEVEL && HAVE_MULTITHREAD && HAVE___THREAD_STORAGE_CLASS
+    return click_current_thread_id == (_id | 0x40000000);
+#elif CLICK_USERLEVEL && HAVE_MULTITHREAD
+    return click_current_processor() == _running_processor;
+#else
+    return true;
+#endif
+}
+
+inline bool
+RouterThread::current_thread_is_running_cleanup() const
+{
+    return current_thread_is_running() || (!_driver_entered && _id >= 0);
+}
+
+inline void
+RouterThread::schedule_block_tasks()
+{
+    assert(!current_thread_is_running());
+    ++_task_blocker_waiting;
+}
+
+inline void
+RouterThread::block_tasks(bool scheduled)
+{
+    assert(!current_thread_is_running() && !running_in_interrupt());
+    if (!scheduled)
+        ++_task_blocker_waiting;
+    while (1) {
+        uint32_t blocker = _task_blocker.value();
+        if ((int32_t) blocker >= 0
+            && _task_blocker.compare_swap(blocker, blocker + 1) == blocker)
+            break;
+#if CLICK_LINUXMODULE
+        // 3.Nov.2008: Must allow other threads a chance to run.  Otherwise,
+        // soft lock is possible: the thread in block_tasks() waits for
+        // RouterThread::_linux_task to complete a task set, but
+        // RouterThread::_linux_task can't run until the thread in
+        // block_tasks() relinquishes the CPU.
+        //
+        // We might be able to avoid schedule() in some cases, but don't
+        // bother to try.
+        schedule();
+#endif
+    }
+    --_task_blocker_waiting;
+}
+
+inline void
+RouterThread::unblock_tasks()
+{
+    assert((int32_t) _task_blocker.value() > 0);
+    --_task_blocker;
+}
+
+inline void
+RouterThread::lock_tasks()
+{
+    assert(!running_in_interrupt());
+    if (unlikely(!current_thread_is_running())) {
+        block_tasks(false);
+        _task_lock.acquire();
+    }
+}
+
+inline void
+RouterThread::unlock_tasks()
+{
+    assert(!running_in_interrupt());
+    if (unlikely(!current_thread_is_running())) {
+        _task_lock.release();
+        unblock_tasks();
+    }
+}
+
+inline void
+RouterThread::wake()
+{
+#if CLICK_LINUXMODULE
+    struct task_struct *task = _linux_task;
+    if (task)
+        wake_up_process(task);
+#elif CLICK_USERLEVEL
+    // see also Master::add_select()
+    if (!current_thread_is_running())
+        _selects.wake_immediate();
+#elif CLICK_BSDMODULE && !BSD_NETISRSCHED
+    if (_sleep_ident)
+        wakeup_one(&_sleep_ident);
+#endif
+}
+
+inline void
+RouterThread::add_pending()
+{
+    wake();
+}
+
+inline bool
+RouterThread::stop_flag() const
+{
+    return _stop_flag;
+}
+
+inline void
+RouterThread::set_thread_state(int state)
+{
+    (void) state;
+#if CLICK_DEBUG_SCHEDULING
+    assert(state >= 0 && state < NSTATES);
+# if CLICK_DEBUG_SCHEDULING > 1
+    Timestamp now = Timestamp::now();
+    if (_thread_state_timestamp)
+        _thread_state_time[_thread_state] += now - _thread_state_timestamp;
+    if (_thread_state != state)
+        ++_thread_state_count[_thread_state];
+    _thread_state_timestamp = now;
+# endif
+    _thread_state = state;
+#endif
+}
+
+inline void
+RouterThread::set_thread_state_for_blocking(int delay_type)
+{
+    if (delay_type < 0)
+        set_thread_state(S_BLOCKED);
+    else
+        set_thread_state(delay_type ? S_TIMERWAIT : S_PAUSED);
+}
+
+#if CLICK_DEBUG_SCHEDULING > 1
+inline Timestamp
+RouterThread::thread_state_time(int state) const
+{
+    assert(state >= 0 && state < NSTATES);
+    return _thread_state_time[state];
+}
+
+inline uint64_t
+RouterThread::thread_state_count(int state) const
+{
+    assert(state >= 0 && state < NSTATES);
+    return _thread_state_count[state];
+}
+#endif
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/routervisitor.hh b/openflow/include/click/routervisitor.hh
new file mode 100644
index 0000000..6374f3e
--- /dev/null
+++ b/openflow/include/click/routervisitor.hh
@@ -0,0 +1,193 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/routervisitor.cc" -*-
+#ifndef CLICK_ROUTERVISITOR_HH
+#define CLICK_ROUTERVISITOR_HH
+#include <click/element.hh>
+#include <click/bitvector.hh>
+CLICK_DECLS
+
+/** @class RouterVisitor
+ * @brief Base class for router configuration visitors.
+ *
+ * RouterVisitor objects are used to traverse the router configuration graph.
+ * They are usually passed to the Router::visit_downstream() and
+ * Router::visit_upstream() functions.
+ */
+class RouterVisitor { public:
+
+    /** @brief Construct an RouterVisitor. */
+    RouterVisitor() {
+    }
+
+    /** @brief Destroy an RouterVisitor. */
+    virtual ~RouterVisitor() {
+    }
+
+    /** @brief Visit an element.
+     * @param e element being visited
+     * @param isoutput true for output ports, false for input ports
+     * @param port port number being visited
+     * @param from_e element by which @a e was reached
+     * @param from_port port by which @a e/@a port was reached
+     * @param distance connection distance in breadth-first search
+     * @return true to continue traversing, false to stop
+     *
+     * A Router configuration traversal calls this function once on each
+     * reached port.  Configuration traversal is breadth-first; @a distance is
+     * the minimum connection distance from the traversal's start point to @a
+     * e/@a port.  A traversal will call a port's visit() function at most
+     * once.  @a from_e and @a from_port specify one port that is connected to
+     * @a e and @a port (there may be more than one).  If @a isoutput is true,
+     * then @a e/@a port is an output port and @a from_e/@a from_port is an
+     * input port; if @a isoutput is false, the opposite holds.
+     *
+     * The return value specifies whether traversal should continue through
+     * the @a e element.  If it is true, then the traversal will continue
+     * based on @a e's packet flow specifier, via ports that connect to @a
+     * e/@a port (see Element::flow_code() for more).
+     *
+     * The default implementation always returns true.
+     */
+    virtual bool visit(Element *e, bool isoutput, int port,
+		       Element *from_e, int from_port, int distance);
+
+};
+
+/** @class ElementTracker
+ * @brief Base class for router configuration visitors that collect elements.
+ *
+ * ElementTracker is a type of RouterVisitor used to traverse the router
+ * configuration graph and collect matching elements.  A subclass's @link
+ * RouterVisitor::visit visit() @endlink function will call insert() to store
+ * elements that match.  ElementTracker objects are usually passed to the
+ * Router::visit_downstream() and Router::visit_upstream() functions.
+ */
+class ElementTracker : public RouterVisitor { public:
+
+    /** @brief Construct an ElementTracker.
+     * @param router the router to be traversed */
+    ElementTracker(Router *router);
+
+    /** @brief Return the elements that matched. */
+    const Vector<Element *> &elements() const {
+	return _elements;
+    }
+    /** @brief Return the number of matching elements. */
+    int size() const {
+	return _elements.size();
+    }
+    /** @brief Return the @a i'th matching element.
+     *
+     * Elements are ordered by their time of first insertion. */
+    Element *operator[](int i) const {
+	return _elements[i];
+    }
+
+    /** @brief Iterator type. */
+    typedef Vector<Element *>::const_iterator const_iterator;
+    /** @brief Return an iterator for the first matching element. */
+    const_iterator begin() const {
+	return _elements.begin();
+    }
+    /** @brief Return an iterator for the end of the container. */
+    const_iterator end() const {
+	return _elements.end();
+    }
+
+    /** @brief Return true iff element @a e is a matching element. */
+    bool contains(const Element *e) const {
+	return _reached[e->eindex()];
+    }
+
+    /** @brief Add element @a e to the set of matching elements. */
+    void insert(Element *e) {
+	if (!_reached[e->eindex()]) {
+	    _reached[e->eindex()] = true;
+	    _elements.push_back(e);
+	}
+    }
+
+    /** @brief Clear the set of matching elements. */
+    void clear() {
+	_reached.clear();
+	_elements.clear();
+    }
+
+  private:
+
+    Bitvector _reached;
+    Vector<Element *> _elements;
+
+};
+
+/** @class ElementCastTracker
+ * @brief Router configuration visitor that collects elements that match a
+ * certain cast.
+ *
+ * When passed to Router::visit_upstream() or Router::visit_downstream(),
+ * ElementCastTracker collects the closest elements that successfully cast to
+ * @a name.  For instance, this code will find the closest Storage elements
+ * upstream of [0]@a e:
+ * @code
+ * ElementCastTracker tracker(e->router(), "Storage");
+ * e->router()->visit_upstream(e, 0, &tracker);
+ * tracker.elements();  // a Vector<Element *> containing the Storage elements
+ * @endcode
+ *
+ * Graph traversal stops at each matching element, so in the above example, a
+ * Storage element that is "behind" another Storage element won't be returned.
+ */
+class ElementCastTracker : public ElementTracker { public:
+
+    /** @brief Construct an ElementCastTracker.
+     * @param router the router to be traversed
+     * @param name the cast of interest */
+    ElementCastTracker(Router *router, const String &name)
+	: ElementTracker(router), _name(name) {
+    }
+
+    bool visit(Element *e, bool isoutput, int port,
+	       Element *from_e, int from_port, int distance);
+
+  private:
+
+    String _name;
+
+};
+
+/** @class ElementNeighborhoodTracker
+ * @brief Router configuration visitor that collects close-by elements.
+ *
+ * When passed to Router::visit_upstream() or Router::visit_downstream(),
+ * ElementNeighborhoodTracker collects the elements that are within a certain
+ * number of connections of the source element.  For instance, this code will
+ * find all the elements connected to [0]@a e:
+ * @code
+ * ElementNeighborhoodTracker tracker(e->router());
+ * e->router()->visit_upstream(e, 0, &tracker);
+ * tracker.elements();  // Vector<Element *> containing neighboring elements
+ * @endcode
+ *
+ * Supply the constructor's @a diameter argument to find a larger neighborhood
+ * than just the directly-connected elements.
+ */
+class ElementNeighborhoodTracker : public ElementTracker { public:
+
+    /** @brief Construct an ElementNeighborhoodTracker.
+     * @param router the router to be traversed
+     * @param diameter neighborhood diameter (maximum number of connections to
+     * traverse) */
+    ElementNeighborhoodTracker(Router *router, int diameter = 1)
+	: ElementTracker(router), _diameter(diameter) {
+    }
+
+    bool visit(Element *e, bool isoutput, int port,
+	       Element *from_e, int from_port, int distance);
+
+  private:
+
+    int _diameter;
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/selectset.hh b/openflow/include/click/selectset.hh
new file mode 100644
index 0000000..34c619d
--- /dev/null
+++ b/openflow/include/click/selectset.hh
@@ -0,0 +1,137 @@
+// -*- related-file-name: "../../lib/selectset.cc" -*-
+#ifndef CLICK_SELECTSET_HH
+#define CLICK_SELECTSET_HH 1
+#if !CLICK_USERLEVEL
+# error "<click/selectset.hh> only meaningful at user level"
+#endif
+#include <click/vector.hh>
+#include <click/sync.hh>
+#include <unistd.h>
+#if !HAVE_ALLOW_SELECT && !HAVE_ALLOW_POLL && !HAVE_ALLOW_KQUEUE
+# define HAVE_ALLOW_SELECT 1
+#endif
+#if defined(__APPLE__) && HAVE_ALLOW_SELECT && HAVE_ALLOW_POLL
+// Apple's poll() is often broken
+# undef HAVE_ALLOW_POLL
+#endif
+#if HAVE_POLL_H && HAVE_ALLOW_POLL
+# include <poll.h>
+#else
+# undef HAVE_ALLOW_POLL
+# if !HAVE_ALLOW_SELECT && !HAVE_ALLOW_KQUEUE
+#  error "poll is not supported on this system, try --enable-select"
+# endif
+#endif
+#if !HAVE_SYS_EVENT_H || !HAVE_KQUEUE
+# undef HAVE_ALLOW_KQUEUE
+# if !HAVE_ALLOW_SELECT && !HAVE_ALLOW_POLL
+#  error "kqueue is not supported on this system, try --enable-select"
+# endif
+#endif
+CLICK_DECLS
+class Element;
+class Router;
+class RouterThread;
+
+class SelectSet { public:
+
+    SelectSet();
+    ~SelectSet();
+
+    void initialize();
+
+    int add_select(int fd, Element *element, int mask);
+    int remove_select(int fd, Element *element, int mask);
+
+    void run_selects(RouterThread *thread);
+    inline void wake_immediate() {
+	_wake_pipe_pending = true;
+	ignore_result(write(_wake_pipe[1], "", 1));
+    }
+
+    void kill_router(Router *router);
+
+    inline void fence();
+
+  private:
+
+    struct SelectorInfo {
+	Element *read;
+	Element *write;
+	int pollfd;
+	SelectorInfo()
+	    : read(0), write(0), pollfd(-1)
+	{
+	}
+    };
+
+    int _wake_pipe[2];
+    volatile bool _wake_pipe_pending;
+#if HAVE_ALLOW_KQUEUE
+    int _kqueue;
+#endif
+#if !HAVE_ALLOW_POLL
+    struct pollfd {
+	int fd;
+	int events;
+    };
+    fd_set _read_select_fd_set;
+    fd_set _write_select_fd_set;
+    int _max_select_fd;
+#endif /* !HAVE_ALLOW_POLL */
+    Vector<struct pollfd> _pollfds;
+    Vector<SelectorInfo> _selinfo;
+#if HAVE_MULTITHREAD
+    SimpleSpinlock _select_lock;
+    click_processor_t _select_processor;
+#endif
+
+    void register_select(int fd, bool add_read, bool add_write);
+    void remove_pollfd(int pi, int event);
+    inline void call_selected(int fd, int mask) const;
+    inline bool post_select(RouterThread *thread, bool acquire);
+#if HAVE_ALLOW_KQUEUE
+    void run_selects_kqueue(RouterThread *thread);
+#endif
+#if HAVE_ALLOW_POLL
+    void run_selects_poll(RouterThread *thread);
+#else
+    void run_selects_select(RouterThread *thread);
+#endif
+
+    inline void lock();
+    inline void unlock();
+
+#if CLICK_DEBUG_MASTER || CLICK_DEBUG_SCHEDULING
+    friend class Master;
+#endif
+
+};
+
+inline void
+SelectSet::lock()
+{
+#if HAVE_MULTITHREAD
+    if (click_get_processor() != _select_processor)
+	_select_lock.acquire();
+#endif
+}
+
+inline void
+SelectSet::unlock()
+{
+#if HAVE_MULTITHREAD
+    if (click_get_processor() != _select_processor)
+	_select_lock.release();
+#endif
+}
+
+inline void
+SelectSet::fence()
+{
+    lock();
+    unlock();
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/simclick.h b/openflow/include/click/simclick.h
new file mode 100644
index 0000000..bc9f4d6
--- /dev/null
+++ b/openflow/include/click/simclick.h
@@ -0,0 +1,118 @@
+#ifndef SIMCLICK_H
+#define SIMCLICK_H
+/*
+ * simclick.h
+ *
+ * API for sending packets to Click. Mostly intended for use
+ * by a network simulator which wants to use Click to do routing.
+ *
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Packet types used - generally going to be ethernet, but could
+ * possibly be something else I suppose...
+ */
+#define SIMCLICK_PTYPE_UNKNOWN 0
+#define SIMCLICK_PTYPE_ETHER 1
+#define SIMCLICK_PTYPE_IP 2
+
+/*
+ * Not a whole lot to this. We have to create a click router object
+ * and also send packets and trigger events.
+ */
+
+/*
+ * This contains per packet data we need to preserve when the packet gets
+ * dragged through click. Heavily biased towards ns-2 right now.
+ */
+typedef struct {
+    int id;			/* Simulator ID number for the packet */
+    int fid;			/* Simulator flow ID number for the packet */
+    int simtype;		/* Original simulator packet type - useful
+				 * for morphing between raw and simulator
+				 * packet types */
+} simclick_simpacketinfo;
+
+
+/*
+ * Opaque handles for the sim and click instances
+ */
+typedef struct simclick_node {
+    void *clickinfo;
+    struct timeval curtime;
+} simclick_node_t;
+
+int simclick_click_create(simclick_node_t *sim, const char *router_file);
+
+int simclick_click_send(simclick_node_t *sim,
+			int ifid,int type,const unsigned char* data,int len,
+			simclick_simpacketinfo* pinfo);
+int simclick_sim_send(simclick_node_t *sim,
+		      int ifid,int type, const unsigned char* data,int len,
+		      simclick_simpacketinfo*);
+
+void simclick_click_run(simclick_node_t *sim);
+
+void simclick_click_kill(simclick_node_t *sim);
+
+/*
+ * simclick_click_read_handler will allocate a buffer of adequate length
+ * to receive the handler information. This buffer must be freed
+ * by the caller. If a non-null value for the "memalloc" parameter
+ * is passed in, simclick_click_read_handler will use that function
+ * to allocate the memory. If there's a null value there, "malloc" will
+ * be used by default. The "memparam" parameter is a caller-specified
+ * value which will be passed back to the memory allocation function.
+ */
+typedef void* (*SIMCLICK_MEM_ALLOC)(size_t,void*);
+char* simclick_click_read_handler(simclick_node_t *sim,
+				  const char* elementname,
+				  const char* handlername,
+				  SIMCLICK_MEM_ALLOC memalloc,
+				  void* memparam);
+
+int simclick_click_write_handler(simclick_node_t *sim,
+				 const char* elemname, const char* handlername,
+				 const char* writestring);
+
+/*
+ * We also provide a gettimeofday substitute which utilizes the
+ * state info passed to us by the simulator.
+ */
+int simclick_gettimeofday(struct timeval* tv);
+
+/*
+ * The simulated system also has to provide a few services to click,
+ * notably some way of injecting packets back into the system,
+ * mapping interface names to id numbers, and arranging for click
+ * to execute at a specified time in the future.
+ * We implement
+ */
+#define SIMCLICK_VERSION		0  // none
+#define SIMCLICK_SUPPORTS		1  // int call
+#define SIMCLICK_IFID_FROM_NAME		2  // const char *ifname
+#define SIMCLICK_IPADDR_FROM_NAME	3  // const char *ifname, char *buf, int len
+#define SIMCLICK_MACADDR_FROM_NAME	4  // const char *ifname, char *buf, int len
+#define SIMCLICK_SCHEDULE		5  // struct timeval *when
+#define SIMCLICK_GET_NODE_NAME		6  // char *buf, int len
+#define SIMCLICK_IF_READY		7  // int ifid
+#define SIMCLICK_TRACE			8  // const char *event
+#define SIMCLICK_GET_NODE_ID		9  // none
+#define SIMCLICK_GET_NEXT_PKT_ID	10 // none
+#define SIMCLICK_CHANGE_CHANNEL		11 // int ifid, int channelid
+#define SIMCLICK_IF_PROMISC		12 // int ifid
+#define SIMCLICK_IPPREFIX_FROM_NAME	13 // const char *ifname, char *buf, int len
+#define SIMCLICK_GET_RANDOM_INT		14 // uint32_t *result, uint32_t max
+#define SIMCLICK_GET_DEFINES		15 // char *buf, size_t *size
+
+int simclick_sim_command(simclick_node_t *sim, int cmd, ...);
+int simclick_click_command(simclick_node_t *sim, int cmd, ...);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/openflow/include/click/skbmgr.hh b/openflow/include/click/skbmgr.hh
new file mode 100644
index 0000000..5674fe9
--- /dev/null
+++ b/openflow/include/click/skbmgr.hh
@@ -0,0 +1,16 @@
+// -*- c-basic-offset: 2; related-file-name: "../../linuxmodule/skbmgr.cc" -*-
+#ifndef CLICK_SKBMGR_HH
+#define CLICK_SKBMGR_HH
+CLICK_DECLS
+
+void skbmgr_init();
+void skbmgr_cleanup();
+
+/* allocate skbs. Number of skbs allocated is stored in the want variable */
+struct sk_buff *skbmgr_allocate_skbs(unsigned headroom, unsigned size, int *want);
+
+/* recycle skb back into pool */
+void skbmgr_recycle_skbs(struct sk_buff *);
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/standard/addressinfo.hh b/openflow/include/click/standard/addressinfo.hh
new file mode 100644
index 0000000..147c566
--- /dev/null
+++ b/openflow/include/click/standard/addressinfo.hh
@@ -0,0 +1,135 @@
+// -*- related-file-name: "../../../elements/standard/addressinfo.cc" -*-
+#ifndef CLICK_ADDRESSINFO_HH
+#define CLICK_ADDRESSINFO_HH
+#include <click/element.hh>
+CLICK_DECLS
+
+/*
+=c
+
+AddressInfo(NAME ADDRESS [ADDRESS...], ...)
+
+=s information
+
+specifies address information
+
+=io
+
+None
+
+=d
+
+Lets you use mnemonic names for IPv4 and IPv6 addresses, IPv4 and IPv6
+address prefixes, and Ethernet addresses. Each argument has the form `NAME
+ADDRESS [ADDRESS...]', which associates the given ADDRESSes with NAME. For
+example, if a configuration contains this AddressInfo element,
+
+   AddressInfo(mauer 10.0.0.1, mazu 10.0.0.10);
+
+then other configuration strings can use C<mauer> and C<mazu> as mnemonics
+for the IP addresses 10.0.0.1 and 10.0.0.10, respectively.
+
+The mnemonic names introduced by AddressInfo elements are local with
+respect to compound elements. That is, names created inside a compound
+element apply only within that compound element and its subelements. For
+example:
+
+   AddressInfo(mauer 10.0.0.1);
+   compound :: {
+     AddressInfo(mazu 10.0.0.10);
+     ... -> IPEncap(6, mauer, mazu) -> ...  // OK
+   };
+   ... -> IPEncap(6, mauer, mazu) -> ...    // error: `mazu' undefined
+
+Any name can be simultaneously associated with an IP address, an IP network
+address, and an Ethernet address. The kind of address that is returned is
+generally determined from context. For example:
+
+   AddressInfo(mauer 10.0.0.1 00-50-BA-85-84-A9);
+   ... -> IPEncap(6, mauer, ...)                  // as IP address
+       -> EtherEncap(0x0800, mauer, ...) -> ...   // as Ethernet address
+   ... -> ARPResponder(mauer) -> ...              // as IP address and Ethernet address!
+
+An optional suffix makes the context unambiguous. C<NAME> is an ambiguous
+reference to some address, but C<NAME:ip> is always an IPv4 address,
+C<NAME:ipnet> is always an IPv4 network address (IPv4 address prefix),
+C<NAME:ip6> is always an IPv6 address, C<NAME:ip6net> is always an IPv6
+network address, and C<NAME:eth> is always an Ethernet address.
+
+Names with both address and prefix definitions are preferentially parsed as
+addresses.  For example:
+
+   AddressInfo(boojum 10.0.0.1/24);         // defines address and prefix
+   a1 :: ARPResponder(boojum 00-01-02-03-04-05);
+   // a1 will have the same configuration as:
+   a2 :: ARPResponder(10.0.0.1/32 00-01-02-03-04-05);
+
+To prefer the network prefix, use C<NAME:ipnet>.
+
+If C<NAME:ipnet> is a valid IPv4 network address, then C<NAME:bcast> is a
+valid IPv4 address equaling the broadcast address for that network.  This is
+obtained by setting all the host bits in the address prefix to 1.
+
+C<NAME:gw> usually equals the default gateway address for network
+C<NAME>. If C<NAME> is a device, then C<NAME:gw> can sometimes be
+looked up explicitly; otherwise, C<NAME:gw> is calculated from
+C<NAME:ipnet> by setting the lowest-order bit in the network address.
+
+=head1 DEFAULT ADDRESSES
+
+If you do not define an address for a given NAME, AddressInfo will use the
+default, if any.  Defaults are as follows:
+
+=over 2
+
+=item *
+
+For Ethernet addresses, Click checks for an Ethernet device named NAME, and
+uses its address. (At userlevel, this works only on BSD and Linux.)
+
+=item *
+
+For IPv4 addresses, Click checks for a network device named NAME, and uses
+its primary IPv4 address.
+
+=item *
+
+For C<NAME:gw>, Click checks for a network device named NAME, and uses its
+default gateway.
+
+=back
+
+These defaults are not available on all platforms.
+
+=a
+
+PortInfo */
+
+class AddressInfo : public Element { public:
+
+    AddressInfo();
+
+    const char *class_name() const	{ return "AddressInfo"; }
+
+    int configure_phase() const		{ return CONFIGURE_PHASE_FIRST; }
+    int configure(Vector<String> &conf, ErrorHandler *errh);
+
+    enum {
+        f_nodevice = 1
+    };
+    static bool query_ip(const String &s, unsigned char *store, const Element *context, int flags = 0);
+    static bool query_ip_prefix(String s, unsigned char *store_addr, unsigned char *store_mask, const Element *context, int flags = 0);
+#if HAVE_IP6
+    static bool query_ip6(String s, unsigned char *store, const Element *context, int flags = 0);
+    static bool query_ip6_prefix(String s, unsigned char *store_addr, int *store_prefixlen, const Element *context, int flags = 0);
+#endif
+    static bool query_ethernet(String s, unsigned char *store, const Element *context, int flags = 0);
+
+  private:
+
+    static bool query_netdevice(const String &name, unsigned char *store, int type, int len, const Element *context, int flags);
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/standard/alignmentinfo.hh b/openflow/include/click/standard/alignmentinfo.hh
new file mode 100644
index 0000000..12160f8
--- /dev/null
+++ b/openflow/include/click/standard/alignmentinfo.hh
@@ -0,0 +1,48 @@
+// -*- related-file-name: "../../../elements/standard/alignmentinfo.cc" -*-
+#ifndef CLICK_ALIGNMENTINFO_HH
+#define CLICK_ALIGNMENTINFO_HH
+#include <click/element.hh>
+CLICK_DECLS
+
+/*
+ * =c
+ * AlignmentInfo(ELEMENT [MODULUS OFFSET ...], ...)
+ * =s information
+ * specifies alignment information
+ * =io
+ * None
+ * =d
+ * Provides information about the packet alignment specified elements can
+ * expect. Each configuration argument has the form
+ * `ELEMENT [MODULUS0 OFFSET0 MODULUS1 OFFSET1 ...]',
+ * where there are zero or more MODULUS-OFFSET pairs.
+ * All packets arriving at ELEMENT's
+ * I<n>th input will start `OFFSETI<n>' bytes
+ * off from a `MODULUSI<n>'-byte boundary.
+ * =n
+ * This element is inserted automatically by click-align(1).
+ * =a Align, click-align(1)
+ */
+
+class AlignmentInfo : public Element { public:
+
+    AlignmentInfo();
+
+    const char *class_name() const	{ return "AlignmentInfo"; }
+    int configure_phase() const		{ return CONFIGURE_PHASE_INFO; }
+    int configure(Vector<String> &, ErrorHandler *);
+
+    bool query1(const Element *e, int port, int &chunk, int &offset) const;
+    static bool query(const Element *e, int port, int &chunk, int &offset);
+
+  private:
+
+    Vector<int> _elem_offset;
+    Vector<int> _elem_icount;
+    Vector<int> _chunks;
+    Vector<int> _offsets;
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/standard/errorelement.hh b/openflow/include/click/standard/errorelement.hh
new file mode 100644
index 0000000..c6f66bb
--- /dev/null
+++ b/openflow/include/click/standard/errorelement.hh
@@ -0,0 +1,35 @@
+// -*- c-basic-offset: 4; related-file-name: "../../../elements/standard/errorelement.cc" -*-
+#ifndef CLICK_ERRORELEMENT_HH
+#define CLICK_ERRORELEMENT_HH
+#include <click/element.hh>
+CLICK_DECLS
+
+/*
+ * =c
+ * Error(...)
+ * =s debugging
+ * always fails
+ * =d
+ * The Error element always fails to initialize. It has any number of inputs
+ * and outputs, and accepts any configuration string without complaint. It is
+ * useful to prevent a router from initializing while avoiding
+ * spurious error messages about bad configuration strings or connections.
+ * =a Message
+ */
+
+class ErrorElement : public Element { public:
+
+    ErrorElement();
+
+    const char *class_name() const		{ return "Error"; }
+    const char *port_count() const		{ return "-/-"; }
+    const char *processing() const		{ return AGNOSTIC; }
+    const char *flow_code() const		{ return "x/y"; }
+
+    int configure(Vector<String> &, ErrorHandler *);
+    int initialize(ErrorHandler *);
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/standard/portinfo.hh b/openflow/include/click/standard/portinfo.hh
new file mode 100644
index 0000000..c7ea6d4
--- /dev/null
+++ b/openflow/include/click/standard/portinfo.hh
@@ -0,0 +1,71 @@
+// -*- c-basic-offset: 4; related-file-name: "../../../elements/standard/portinfo.cc" -*-
+#ifndef CLICK_PORTINFO_HH
+#define CLICK_PORTINFO_HH
+#include <click/element.hh>
+CLICK_DECLS
+
+/*
+=c
+
+PortInfo(NAME PORT[/PROTOCOL], ...)
+
+=s information
+
+stores named TCP/UDP port information
+
+=io
+
+None
+
+=d
+
+Lets you use mnemonic names for TCP and UDP ports.  Each argument has the form
+`NAME PORT[/PROTOCOL]', which associates the given PORT/PROTOCOL pair with the
+NAME.  If PROTOCOL is left off, the NAME applies to both TCP and UDP.  For
+example, in a configuration containing
+
+   PortInfo(ssh 22, http 80),
+
+configuration strings can use C<ssh> and C<http> as mnemonics for the port
+numbers 22 and 80, respectively.
+
+PortInfo names are local with respect to compound elements.  That is, names
+created inside a compound element apply only within that compound element and
+its subelements.  For example:
+
+   PortInfo(src 10);
+   compound :: {
+     PortInfo(dst 100);
+     ... -> UDPIPEncap(1.0.0.1, src, 2.0.0.1, dst) -> ...  // OK
+   };
+   ... -> UDPIPEncap(1.0.0.1, src, 2.0.0.1, dst) -> ...
+                                         // error: `dst' undefined
+
+=n
+
+If you do not define a port for a given name, PortInfo will use the default,
+if any.  At user level, PortInfo uses the L<getservbyname(3)> function to look
+up ports by name.  In the kernel, there are no default ports.
+
+PortInfo will parse arguments containing more than one name, as `C<NAME
+PORT/PROTOCOL NAME...>', and comments starting with `C<#>' are ignored.  Thus,
+lines from F</etc/services> can be used verbatim as PortInfo configuration
+arguments.
+
+=a
+
+AddressInfo */
+
+class PortInfo : public Element { public:
+
+    PortInfo();
+
+    const char *class_name() const	{ return "PortInfo"; }
+
+    int configure_phase() const		{ return CONFIGURE_PHASE_FIRST; }
+    int configure(Vector<String> &, ErrorHandler *);
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/standard/scheduleinfo.hh b/openflow/include/click/standard/scheduleinfo.hh
new file mode 100644
index 0000000..6bce624
--- /dev/null
+++ b/openflow/include/click/standard/scheduleinfo.hh
@@ -0,0 +1,104 @@
+// -*- c-basic-offset: 4; related-file-name: "../../../elements/standard/scheduleinfo.cc" -*-
+#ifndef CLICK_SCHEDULEINFO_HH
+#define CLICK_SCHEDULEINFO_HH
+#include <click/element.hh>
+CLICK_DECLS
+
+/*
+=c
+
+ScheduleInfo(ELEMENT PARAM, ...)
+
+=s information
+
+specifies scheduling parameters
+
+=io
+
+None
+
+=d
+
+Provides scheduling parameters for specified elements. Each configuration
+argument has the form `ELEMENT PARAM', meaning that the element
+named ELEMENT has scheduling parameter PARAM. Scheduling
+parameters are real numbers that set how often one element should be
+scheduled in relation to another. For example,
+if elements A and B have
+scheduling parameters 2 and 0.5, respectively, then A will be scheduled
+2/0.5 = 4 times as often as B. The default scheduling parameter is 1.
+
+ScheduleInfo elements inside a compound element can specify scheduling
+parameters for that compound's components.
+Outer ScheduleInfo elements
+can specify a ``scheduling parameter'' for the compound
+element as a whole. This ``scheduling parameter'' is really a scaling
+factor affecting the compound's components. For example, consider this
+configuration,
+
+   elementclass Compound {
+     i :: InfiniteSource -> output;
+     ScheduleInfo(i 0.5);
+   }
+   c :: Compound -> Discard;
+   ScheduleInfo(c 4);
+
+which is the same as the following configuration, after compound elements
+are expanded.
+
+   c/i :: InfiniteSource -> Discard@3 :: Discard;
+   c/ScheduleInfo@2 :: ScheduleInfo(i 0.5);
+   ScheduleInfo@4 :: ScheduleInfo(c 4);
+
+The name of the first ScheduleInfo element starts with `c/', so it is
+used to look up scheduling parameters for elements named `c/I<whatever>'.
+V<>(This includes all components of the compound element `c'.)
+The second ScheduleInfo element, however, has no slash in its name,
+so it is used to look up all scheduling parameters,
+including scaling factors for compound elements.
+The InfiniteSource's final scaling parameter will be 2:
+the scaling factor 4 times the local scheduling parameter 0.5.
+
+An outer ScheduleInfo element can override local scheduling parameters.
+For example, if the second ScheduleInfo element above was
+
+   ScheduleInfo@4 :: ScheduleInfo(c 4, c/i 10.5)
+
+then the InfiniteSource's final scaling parameter would be 10.5.
+*/
+
+class ScheduleInfo : public Element { public:
+
+    enum { FRAC_BITS = 10 };
+
+    ScheduleInfo();
+
+    const char* class_name() const	{ return "ScheduleInfo"; }
+
+    int configure_phase() const		{ return CONFIGURE_PHASE_INFO; }
+    int configure(Vector<String>&, ErrorHandler*);
+
+    bool query(const String&, int&) const;
+    bool query_prefixes(const String&, int&, String&) const;
+    static int query(Element*, ErrorHandler*);
+    static void initialize_task(Element*, Task*, bool sched, ErrorHandler*);
+    static void initialize_task(Element*, Task*, ErrorHandler*);
+    static void join_scheduler(Element*, Task*, ErrorHandler*);
+
+};
+
+
+inline void
+ScheduleInfo::initialize_task(Element* e, Task* t, ErrorHandler* errh)
+{
+    initialize_task(e, t, true, errh);
+}
+
+inline void
+ScheduleInfo::join_scheduler(Element* e, Task* t, ErrorHandler* errh)
+{
+    initialize_task(e, t, true, errh);
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/standard/storage.hh b/openflow/include/click/standard/storage.hh
new file mode 100644
index 0000000..263a9f7
--- /dev/null
+++ b/openflow/include/click/standard/storage.hh
@@ -0,0 +1,123 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_STORAGE_HH
+#define CLICK_STORAGE_HH
+#include <click/machine.hh>
+#include <click/atomic.hh>
+CLICK_DECLS
+class Packet;
+
+class Storage { public:
+
+    typedef uint32_t index_type;
+    typedef int32_t signed_index_type;
+    static const index_type invalid_index = (index_type) -1;
+
+    Storage()				: _head(0), _tail(0) { }
+
+    operator bool() const		{ return _head != _tail; }
+    bool empty() const			{ return _head == _tail; }
+    int size() const;
+    int size(index_type head, index_type tail) const;
+    int capacity() const		{ return _capacity; }
+
+    index_type head() const		{ return _head; }
+    index_type tail() const		{ return _tail; }
+
+    index_type next_i(index_type i) const {
+	return (i!=_capacity ? i+1 : 0);
+    }
+    index_type prev_i(index_type i) const {
+	return (i!=0 ? i-1 : _capacity);
+    }
+
+    // to be used with care
+    void set_capacity(index_type c)	{ _capacity = c; }
+    inline void set_head(index_type h); // acquire barrier (read pkt)
+    inline void set_tail(index_type t); // release barrier (write pkt)
+    inline void set_head_release(index_type h); // release barrier (LIFO)
+    inline void set_tail_acquire(index_type t); // acquire barrier (LIFO)
+    inline index_type reserve_tail_atomic();
+
+    static inline void packet_memory_barrier(Packet* volatile& packet,
+                                             volatile index_type& index)
+        __attribute__((deprecated));
+    inline void packet_memory_barrier(Packet* volatile& packet)
+        __attribute__((deprecated));
+
+  protected:
+    index_type _capacity;
+
+  private:
+    volatile index_type _head;
+    volatile index_type _tail;
+
+};
+
+inline int
+Storage::size(index_type head, index_type tail) const
+{
+    index_type x = tail - head;
+    return (signed_index_type(x) >= 0 ? x : _capacity + x + 1);
+}
+
+inline int
+Storage::size() const
+{
+    return size(_head, _tail);
+}
+
+inline void
+Storage::set_head(index_type h)
+{
+    click_read_fence();
+    _head = h;
+}
+
+inline void
+Storage::set_tail(index_type t)
+{
+    click_write_fence();
+    _tail = t;
+}
+
+inline void
+Storage::set_head_release(index_type h)
+{
+    click_write_fence();
+    _head = h;
+}
+
+inline void
+Storage::set_tail_acquire(index_type t)
+{
+    click_read_fence();
+    _tail = t;
+}
+
+inline Storage::index_type
+Storage::reserve_tail_atomic()
+{
+    index_type t, nt;
+    do {
+        t = _tail;
+        nt = next_i(t);
+        if (nt == _head)
+            return invalid_index;
+    } while (atomic_uint32_t::compare_swap(_tail, t, nt) != t);
+    return t;
+}
+
+inline void
+Storage::packet_memory_barrier(Packet* volatile& packet, volatile index_type& index)
+{
+    __asm__ volatile("" : : "m" (packet), "m" (index));
+}
+
+inline void
+Storage::packet_memory_barrier(Packet * volatile &packet)
+{
+    __asm__ volatile("" : : "m" (packet), "m" (_head), "m" (_tail));
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/standard/threadsched.hh b/openflow/include/click/standard/threadsched.hh
new file mode 100644
index 0000000..800b6e4
--- /dev/null
+++ b/openflow/include/click/standard/threadsched.hh
@@ -0,0 +1,18 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_THREADSCHED_HH
+#define CLICK_THREADSCHED_HH
+CLICK_DECLS
+
+class ThreadSched { public:
+
+    enum { THREAD_QUIESCENT = -1, THREAD_UNKNOWN = -1000 };
+
+    ThreadSched()			{ }
+    virtual ~ThreadSched()		{ }
+
+    virtual int initial_home_thread_id(const Element *e);
+
+};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/straccum.hh b/openflow/include/click/straccum.hh
new file mode 100644
index 0000000..d5638e3
--- /dev/null
+++ b/openflow/include/click/straccum.hh
@@ -0,0 +1,624 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/straccum.cc" -*-
+#ifndef CLICK_STRACCUM_HH
+#define CLICK_STRACCUM_HH
+#include <click/glue.hh>
+#include <click/string.hh>
+#ifdef CLICK_LINUXMODULE
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# include <asm/string.h>
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+#elif defined(CLICK_BSDMODULE)
+# include <sys/systm.h>
+#else	/* User-space */
+# include <string.h>
+#endif
+#if __GNUC__ > 4
+# define CLICK_SNPRINTF_ATTR __attribute__((__format__(__printf__, 3, 4)))
+#else
+# define CLICK_SNPRINTF_ATTR /* nothing */
+#endif
+CLICK_DECLS
+
+/** @file <click/straccum.hh>
+    @brief Click's StringAccum class, used to construct Strings efficiently from pieces.
+*/
+
+class StringAccum { public:
+
+    typedef const char *const_iterator;
+    typedef char *iterator;
+
+    typedef int (StringAccum::*unspecified_bool_type)() const;
+
+    inline StringAccum();
+    explicit inline StringAccum(int capacity);
+    inline StringAccum(const String &str);
+    inline StringAccum(const StringAccum &x);
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline StringAccum(StringAccum &&x);
+#endif
+    inline ~StringAccum();
+
+    inline StringAccum &operator=(const StringAccum &x);
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline StringAccum &operator=(StringAccum &&x);
+#endif
+
+    inline const char *data() const;
+    inline char *data();
+    inline int length() const;
+    inline int capacity() const;
+
+    const char *c_str();
+
+    inline operator unspecified_bool_type() const;
+    inline bool empty() const;
+    inline bool operator!() const;
+
+    inline const_iterator begin() const;
+    inline iterator begin();
+    inline const_iterator end() const;
+    inline iterator end();
+
+    inline char operator[](int i) const;
+    inline char &operator[](int i);
+    inline char front() const;
+    inline char &front();
+    inline char back() const;
+    inline char &back();
+
+    inline bool out_of_memory() const;
+    void assign_out_of_memory();
+
+    inline void clear();
+    inline char *reserve(int n);
+    inline void set_length(int len);
+    int resize(int len);
+    inline void adjust_length(int delta);
+    inline char *extend(int nadjust, int nreserve = 0);
+
+    inline void pop_back(int n = 1);
+
+    inline void append(char c);
+    inline void append(unsigned char c);
+    inline bool append_utf8(int ch);
+    inline void append(const char *cstr);
+    inline void append(const char *s, int len);
+    inline void append(const unsigned char *s, int len);
+    inline void append(const char *first, const char *last);
+    inline void append(const unsigned char *first, const unsigned char *last);
+    void append_fill(int c, int len);
+    void append_numeric(String::intmax_t x, int base = 10, bool uppercase = true);
+    void append_numeric(String::uintmax_t x, int base = 10, bool uppercase = true);
+
+    StringAccum &snprintf(int n, const char *format, ...) CLICK_SNPRINTF_ATTR;
+
+    String take_string();
+
+    void swap(StringAccum &x);
+
+    // see also operator<< declarations below
+
+    inline void forward(int delta) CLICK_DEPRECATED;
+
+  private:
+
+    enum {
+	MEMO_SPACE = String::MEMO_SPACE
+    };
+
+    struct rep_t {
+	unsigned char *s;
+	int len;
+	int cap;
+	rep_t()
+	    : s(reinterpret_cast<unsigned char *>(const_cast<char *>(String::empty_data()))),
+	      len(0), cap(0) {
+	}
+	explicit rep_t(uninitialized_type) {
+	}
+    };
+
+    rep_t r_;
+
+    char *grow(int);
+    char *hard_extend(int nadjust, int nreserve);
+    void hard_append(const char *s, int len);
+    void hard_append_cstr(const char *cstr);
+    bool append_utf8_hard(int ch);
+
+    friend StringAccum &operator<<(StringAccum &sa, const String &str);
+#if HAVE_PERMSTRING
+    friend StringAccum &operator<<(StringAccum &sa, PermString s);
+#endif
+
+};
+
+inline StringAccum &operator<<(StringAccum &sa, char c);
+inline StringAccum &operator<<(StringAccum &sa, unsigned char c);
+inline StringAccum &operator<<(StringAccum &sa, const char *cstr);
+inline StringAccum &operator<<(StringAccum &sa, const String &s);
+inline StringAccum &operator<<(StringAccum &sa, const StringAccum &x);
+
+inline StringAccum &operator<<(StringAccum &sa, bool x);
+inline StringAccum &operator<<(StringAccum &sa, short x);
+inline StringAccum &operator<<(StringAccum &sa, unsigned short x);
+inline StringAccum &operator<<(StringAccum &sa, int x);
+inline StringAccum &operator<<(StringAccum &sa, unsigned x);
+StringAccum &operator<<(StringAccum &sa, long x);
+StringAccum &operator<<(StringAccum &sa, unsigned long x);
+#if HAVE_LONG_LONG
+inline StringAccum &operator<<(StringAccum &sa, long long x);
+inline StringAccum &operator<<(StringAccum &sa, unsigned long long x);
+#endif
+#if HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG && !HAVE_INT64_IS_LONG_LONG
+inline StringAccum &operator<<(StringAccum &sa, int64_t x);
+inline StringAccum &operator<<(StringAccum &sa, uint64_t x);
+#endif
+#if defined(CLICK_USERLEVEL) || defined(CLICK_TOOL) || defined(CLICK_MINIOS)
+StringAccum &operator<<(StringAccum &sa, double x);
+#endif
+StringAccum &operator<<(StringAccum &sa, const void *ptr);
+
+
+/** @brief Construct an empty StringAccum (with length 0). */
+inline StringAccum::StringAccum() {
+}
+
+/** @brief Construct a StringAccum with room for at least @a capacity
+    characters.
+    @param capacity initial capacity
+
+    If @a capacity == 0, the StringAccum is created empty. If @a capacity is
+    too large (so that @a capacity bytes of memory can't be allocated), the
+    StringAccum falls back to a smaller capacity (possibly zero). */
+inline StringAccum::StringAccum(int capacity) {
+    assert(capacity >= 0);
+    unsigned char *s;
+    if (capacity
+	&& (s = (unsigned char *) CLICK_LALLOC(capacity + MEMO_SPACE))) {
+	r_.s = s + MEMO_SPACE;
+	r_.cap = capacity;
+    }
+}
+
+/** @brief Construct a StringAccum containing the characters in @a str. */
+inline StringAccum::StringAccum(const String &str) {
+    append(str.begin(), str.end());
+}
+
+/** @brief Construct a StringAccum containing a copy of @a x. */
+inline StringAccum::StringAccum(const StringAccum &x) {
+    append(x.data(), x.length());
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+/** @brief Move-construct a StringAccum from @a x. */
+inline StringAccum::StringAccum(StringAccum &&x)
+    : r_(x.r_) {
+    x.r_.cap = 0;
+}
+#endif
+
+/** @brief Destroy a StringAccum, freeing its memory. */
+inline StringAccum::~StringAccum() {
+    if (r_.cap > 0)
+	CLICK_LFREE(r_.s - MEMO_SPACE, r_.cap + MEMO_SPACE);
+}
+
+/** @brief Return the contents of the StringAccum.
+    @return The StringAccum's contents.
+
+    The returned data() value points to length() bytes of writable memory
+    (unless the StringAccum itself is const). */
+inline const char *StringAccum::data() const {
+    return reinterpret_cast<const char *>(r_.s);
+}
+
+/** @overload */
+inline char *StringAccum::data() {
+    return reinterpret_cast<char *>(r_.s);
+}
+
+/** @brief Return the length of the StringAccum. */
+inline int StringAccum::length() const {
+    return r_.len;
+}
+
+/** @brief Return the StringAccum's current capacity.
+
+    The capacity is the maximum length the StringAccum can hold without
+    incurring a memory allocation. Returns -1 for out-of-memory
+    StringAccums. */
+inline int StringAccum::capacity() const {
+    return r_.cap;
+}
+
+/** @brief Return an iterator for the first character in the StringAccum.
+
+    StringAccum iterators are simply pointers into string data, so they are
+    quite efficient. @sa StringAccum::data */
+inline StringAccum::const_iterator StringAccum::begin() const {
+    return reinterpret_cast<char *>(r_.s);
+}
+
+/** @overload */
+inline StringAccum::iterator StringAccum::begin() {
+    return reinterpret_cast<char *>(r_.s);
+}
+
+/** @brief Return an iterator for the end of the StringAccum.
+
+    The return value points one character beyond the last character in the
+    StringAccum. */
+inline StringAccum::const_iterator StringAccum::end() const {
+    return reinterpret_cast<char *>(r_.s + r_.len);
+}
+
+/** @overload */
+inline StringAccum::iterator StringAccum::end() {
+    return reinterpret_cast<char *>(r_.s + r_.len);
+}
+
+/** @brief Test if the StringAccum contains characters. */
+inline StringAccum::operator unspecified_bool_type() const {
+    return r_.len != 0 ? &StringAccum::capacity : 0;
+}
+
+/** @brief Test if the StringAccum is empty.
+
+    Returns true iff length() == 0. */
+inline bool StringAccum::operator!() const {
+    return r_.len == 0;
+}
+
+/** @brief Test if the StringAccum is empty. */
+inline bool StringAccum::empty() const {
+    return r_.len == 0;
+}
+
+/** @brief Test if the StringAccum is out-of-memory. */
+inline bool StringAccum::out_of_memory() const {
+    return unlikely(r_.cap < 0);
+}
+
+/** @brief Return the <a>i</a>th character in the string.
+    @param i character index
+    @pre 0 <= @a i < length() */
+inline char StringAccum::operator[](int i) const {
+    assert((unsigned) i < (unsigned) r_.len);
+    return static_cast<char>(r_.s[i]);
+}
+
+/** @brief Return a reference to the <a>i</a>th character in the string.
+    @param i character index
+    @pre 0 <= @a i < length() */
+inline char &StringAccum::operator[](int i) {
+    assert((unsigned) i < (unsigned) r_.len);
+    return reinterpret_cast<char &>(r_.s[i]);
+}
+
+/** @brief Return the first character in the string.
+    @pre length() > 0 */
+inline char StringAccum::front() const {
+    assert(r_.len > 0);
+    return static_cast<char>(r_.s[0]);
+}
+
+/** @brief Return a reference to the first character in the string.
+    @pre length() > 0 */
+inline char &StringAccum::front() {
+    assert(r_.len > 0);
+    return reinterpret_cast<char &>(r_.s[0]);
+}
+
+/** @brief Return the last character in the string.
+    @pre length() > 0 */
+inline char StringAccum::back() const {
+    assert(r_.len > 0);
+    return static_cast<char>(r_.s[r_.len - 1]);
+}
+
+/** @brief Return a reference to the last character in the string.
+    @pre length() > 0 */
+inline char &StringAccum::back() {
+    assert(r_.len > 0);
+    return reinterpret_cast<char &>(r_.s[r_.len - 1]);
+}
+
+/** @brief Clear the StringAccum's comments.
+
+    All characters in the StringAccum are erased. Also resets the
+    StringAccum's out-of-memory status. */
+inline void StringAccum::clear() {
+    if (r_.cap < 0)
+	r_.cap = 0;
+    r_.len = 0;
+}
+
+/** @brief Reserve space for at least @a n characters.
+    @return a pointer to at least @a n characters, or null if allocation
+    fails
+    @pre @a n >= 0
+
+    reserve() does not change the string's length(), only its capacity(). In
+    a frequent usage pattern, code calls reserve(), passing an upper bound
+    on the characters that could be written by a series of operations. After
+    writing into the returned buffer, adjust_length() is called to account
+    for the number of characters actually written. */
+inline char *StringAccum::reserve(int n) {
+    assert(n >= 0);
+    if (r_.len + n <= r_.cap)
+	return reinterpret_cast<char *>(r_.s + r_.len);
+    else
+	return grow(r_.len + n);
+}
+
+/** @brief Set the StringAccum's length to @a len.
+    @param len new length in characters
+    @pre 0 <= @a len <= capacity()
+    @sa adjust_length */
+inline void StringAccum::set_length(int len) {
+    assert(len >= 0 && r_.len <= r_.cap);
+    r_.len = len;
+}
+
+/** @brief Adjust the StringAccum's length.
+    @param delta  length adjustment
+    @pre If @a delta > 0, then length() + @a delta <= capacity().
+    If @a delta < 0, then length() + delta >= 0.
+
+    The StringAccum's length after adjust_length(@a delta) equals its old
+    length plus @a delta. Generally adjust_length() is used after a call to
+    reserve(). @sa set_length */
+inline void StringAccum::adjust_length(int delta) {
+    assert(r_.len + delta >= 0 && r_.len + delta <= r_.cap);
+    r_.len += delta;
+}
+
+/** @brief Reserve space and adjust length in one operation.
+    @param nadjust number of characters to reserve and adjust length
+    @param nreserve additional characters to reserve
+    @pre @a nadjust >= 0 and @a nreserve >= 0
+
+    This operation combines the effects of reserve(@a nadjust + @a nreserve)
+    and adjust_length(@a nadjust). Returns the result of the reserve()
+    call. */
+inline char *StringAccum::extend(int nadjust, int nreserve) {
+#if CLICK_OPTIMIZE_SIZE || __OPTIMIZE_SIZE__
+    return hard_extend(nadjust, nreserve);
+#else
+    assert(nadjust >= 0 && nreserve >= 0);
+    if (r_.len + nadjust + nreserve <= r_.cap) {
+	char *x = reinterpret_cast<char *>(r_.s + r_.len);
+	r_.len += nadjust;
+	return x;
+    } else
+	return hard_extend(nadjust, nreserve);
+#endif
+}
+
+/** @brief Remove characters from the end of the StringAccum.
+    @param n number of characters to remove
+    @pre @a n >= 0 and @a n <= length()
+
+    Same as adjust_length(-@a n). */
+inline void StringAccum::pop_back(int n) {
+    assert(n >= 0 && r_.len >= n);
+    r_.len -= n;
+}
+
+/** @brief Append character @a c to the StringAccum.
+    @param c character to append */
+inline void StringAccum::append(char c) {
+    if (r_.len < r_.cap || grow(r_.len))
+	r_.s[r_.len++] = c;
+}
+
+/** @overload */
+inline void StringAccum::append(unsigned char c) {
+    append(static_cast<char>(c));
+}
+
+/** @brief Append the first @a len characters of @a s to this StringAccum.
+    @param s data to append
+    @param len length of data
+    @pre @a len >= 0 */
+inline void StringAccum::append(const char *s, int len) {
+#if CLICK_OPTIMIZE_SIZE || __OPTIMIZE_SIZE__
+    hard_append(s, len);
+#else
+    assert(len >= 0);
+    if (r_.len + len <= r_.cap) {
+	memcpy(r_.s + r_.len, s, len);
+	r_.len += len;
+    } else
+	hard_append(s, len);
+#endif
+}
+
+/** @overload */
+inline void StringAccum::append(const unsigned char *s, int len) {
+    append(reinterpret_cast<const char *>(s), len);
+}
+
+/** @brief Append the null-terminated C string @a s to this StringAccum.
+    @param s data to append */
+inline void StringAccum::append(const char *cstr) {
+    if (CLICK_CONSTANT_CSTR(cstr))
+	append(cstr, strlen(cstr));
+    else
+	hard_append_cstr(cstr);
+}
+
+/** @brief Append the data from @a first to @a last to the end of this
+    StringAccum.
+
+    Does nothing if @a first >= @a last. */
+inline void StringAccum::append(const char *first, const char *last) {
+    if (first < last)
+	append(first, last - first);
+}
+
+/** @overload */
+inline void StringAccum::append(const unsigned char *first, const unsigned char *last) {
+    if (first < last)
+	append(first, last - first);
+}
+
+/** @brief Append Unicode character @a ch encoded in UTF-8.
+    @return true if character was valid.
+
+    Appends nothing if @a ch is not a valid Unicode character. */
+inline bool StringAccum::append_utf8(int ch) {
+    if (unlikely(ch <= 0))
+	return false;
+    else if (likely(ch <= 0x7F)) {
+	append(static_cast<char>(ch));
+	return true;
+    } else
+	return append_utf8_hard(ch);
+}
+
+/** @brief Assign this StringAccum to @a x. */
+inline StringAccum &StringAccum::operator=(const StringAccum &x) {
+    if (&x != this) {
+	if (out_of_memory())
+	    r_.cap = 0;
+	r_.len = 0;
+	append(x.data(), x.length());
+    }
+    return *this;
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+/** @brief Move-assign this StringAccum to @a x. */
+inline StringAccum &StringAccum::operator=(StringAccum &&x) {
+    x.swap(*this);
+    return *this;
+}
+#endif
+
+/** @cond never */
+/** @brief Adjust the StringAccum's length (deprecated).
+    @param delta length adjustment
+    @deprecated Use adjust_length() instead. */
+inline void StringAccum::forward(int delta) {
+    adjust_length(delta);
+}
+/** @endcond never */
+
+/** @relates StringAccum
+    @brief Append character @a c to StringAccum @a sa.
+    @return @a sa
+    @note Same as @a sa.append(@a c). */
+inline StringAccum &operator<<(StringAccum &sa, char c) {
+    sa.append(c);
+    return sa;
+}
+
+/** @relates StringAccum
+    @brief Append character @a c to StringAccum @a sa.
+    @return @a sa
+    @note Same as @a sa.append(@a c). */
+inline StringAccum &operator<<(StringAccum &sa, unsigned char c) {
+    sa.append(c);
+    return sa;
+}
+
+/** @relates StringAccum
+    @brief Append null-terminated C string @a cstr to StringAccum @a sa.
+    @return @a sa
+    @note Same as @a sa.append(@a cstr). */
+inline StringAccum &operator<<(StringAccum &sa, const char *cstr) {
+    sa.append(cstr);
+    return sa;
+}
+
+/** @relates StringAccum
+    @brief Append "true" or "false" to @a sa, depending on @a x.
+    @return @a sa */
+inline StringAccum &operator<<(StringAccum &sa, bool x) {
+    sa.append(String::bool_data + (-x & 6), 5 - x);
+    return sa;
+}
+
+/** @relates StringAccum
+    @brief Append decimal representation of @a x to @a sa.
+    @return @a sa */
+inline StringAccum &operator<<(StringAccum &sa, short x) {
+    return sa << static_cast<long>(x);
+}
+
+/** @overload */
+inline StringAccum &operator<<(StringAccum &sa, unsigned short x) {
+    return sa << static_cast<unsigned long>(x);
+}
+
+/** @overload */
+inline StringAccum &operator<<(StringAccum &sa, int x) {
+    return sa << static_cast<long>(x);
+}
+
+/** @overload */
+inline StringAccum &operator<<(StringAccum &sa, unsigned x) {
+    return sa << static_cast<unsigned long>(x);
+}
+
+#if HAVE_LONG_LONG
+/** @overload */
+inline StringAccum &operator<<(StringAccum &sa, long long x) {
+    sa.append_numeric(static_cast<String::intmax_t>(x));
+    return sa;
+}
+
+/** @overload */
+inline StringAccum &operator<<(StringAccum &sa, unsigned long long x) {
+    sa.append_numeric(static_cast<String::uintmax_t>(x));
+    return sa;
+}
+#endif
+
+#if HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG && !HAVE_INT64_IS_LONG_LONG
+/** @overload */
+inline StringAccum &operator<<(StringAccum &sa, int64_t x) {
+    sa.append_numeric(static_cast<String::intmax_t>(x));
+    return sa;
+}
+
+/** @overload */
+inline StringAccum &operator<<(StringAccum &sa, uint64_t x) {
+    sa.append_numeric(static_cast<String::uintmax_t>(x));
+    return sa;
+}
+#endif
+
+/** @relates StringAccum
+    @brief Append the contents of @a str to @a sa.
+    @return @a sa */
+inline StringAccum &operator<<(StringAccum &sa, const String &str) {
+    sa.append(str.data(), str.length());
+    return sa;
+}
+
+/** @relates StringAccum
+    @brief Append the contents of @a x to @a sa.
+    @return @a sa */
+inline StringAccum &operator<<(StringAccum &sa, const StringAccum &x) {
+    sa.append(x.begin(), x.end());
+    return sa;
+}
+
+inline void click_swap(StringAccum &a, StringAccum &b) {
+    a.swap(b);
+}
+
+inline void assign_consume(StringAccum &a, StringAccum &b) {
+    a.swap(b);
+}
+
+#undef CLICK_SNPRINTF_ATTR
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/string.hh b/openflow/include/click/string.hh
new file mode 100644
index 0000000..969a820
--- /dev/null
+++ b/openflow/include/click/string.hh
@@ -0,0 +1,1021 @@
+// -*- related-file-name: "../../lib/string.cc" -*-
+#ifndef CLICK_STRING_HH
+#define CLICK_STRING_HH
+#include <click/algorithm.hh>
+#include <click/atomic.hh>
+#if HAVE_STRING_PROFILING
+# include <click/integers.hh>
+#endif
+#if CLICK_LINUXMODULE || CLICK_BSDMODULE
+# include <click/glue.hh>
+#else
+# include <string.h>
+#endif
+#define CLICK_CONSTANT_CSTR(cstr) ((cstr) && __builtin_constant_p(strlen((cstr))))
+CLICK_DECLS
+class StringAccum;
+
+class String { public:
+
+    typedef const char *const_iterator;
+    typedef const_iterator iterator;
+
+    typedef int (String::*unspecified_bool_type)() const;
+
+#if HAVE_INT64_TYPES && (!HAVE_LONG_LONG || SIZEOF_LONG_LONG <= 8)
+    typedef int64_t intmax_t;
+    typedef uint64_t uintmax_t;
+#elif HAVE_LONG_LONG
+    typedef long long intmax_t;
+    typedef unsigned long long uintmax_t;
+#else
+    typedef long intmax_t;
+    typedef unsigned long uintmax_t;
+#endif
+    typedef intmax_t int_large_t;
+    typedef uintmax_t uint_large_t;
+
+    inline String();
+    inline String(const String& x);
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline String(String&& x);
+#endif
+    inline String(const char* cstr);
+    inline String(const char* s, int len);
+    inline String(const unsigned char* s, int len);
+    inline String(const char* first, const char* last);
+    inline String(const unsigned char* first, const unsigned char* last);
+    explicit inline String(bool x);
+    explicit inline String(char c);
+    explicit inline String(unsigned char c);
+    explicit String(int x);
+    explicit String(unsigned x);
+    explicit String(long x);
+    explicit String(unsigned long x);
+#if HAVE_LONG_LONG
+    explicit String(long long x);
+    explicit String(unsigned long long x);
+#endif
+#if HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG && !HAVE_INT64_IS_LONG_LONG
+    explicit String(int64_t x);
+    explicit String(uint64_t x);
+#endif
+#if HAVE_FLOAT_TYPES
+    explicit String(double x);
+#endif
+    inline ~String();
+
+    static inline const String& make_empty();
+    static inline String make_uninitialized(int len);
+    static inline String make_garbage(int len) CLICK_DEPRECATED;
+    static inline String make_stable(const char* cstr);
+    static inline String make_stable(const char* s, int len);
+    static inline String make_stable(const char* first, const char* last);
+    static String make_numeric(intmax_t x, int base = 10, bool uppercase = true);
+    static String make_numeric(uintmax_t x, int base = 10, bool uppercase = true);
+
+    inline const char* data() const;
+    inline int length() const;
+
+    inline const char *c_str() const;
+
+    inline operator unspecified_bool_type() const;
+    inline bool empty() const;
+    inline bool operator!() const;
+
+    inline const_iterator begin() const;
+    inline const_iterator end() const;
+
+    inline char operator[](int i) const;
+    inline char at(int i) const;
+    inline char front() const;
+    inline char back() const;
+
+    static uint32_t hashcode(const char *begin, const char *end);
+    static inline uint32_t hashcode(const unsigned char *begin,
+				    const unsigned char *end);
+    inline uint32_t hashcode() const;
+
+    inline String substring(const char *begin, const char *end) const;
+    String substring(int pos, int len) const;
+    inline String substring(int pos) const;
+    String trim_space() const;
+
+    inline bool equals(const String &x) const;
+    inline bool equals(const char *s, int len) const;
+    static inline int compare(const String &a, const String &b);
+    inline int compare(const String &x) const;
+    int compare(const char *s, int len) const;
+    inline bool starts_with(const String &x) const;
+    bool starts_with(const char *s, int len) const;
+    bool glob_match(const String& pattern) const;
+
+    // bool operator==(const String &, const String &);
+    // bool operator==(const String &, const char *);
+    // bool operator==(const char *, const String &);
+    // bool operator!=(const String &, const String &);
+    // bool operator!=(const String &, const char *);
+    // bool operator!=(const char *, const String &);
+    // bool operator<(const String &, const String &);
+    // bool operator<=(const String &, const String &);
+    // bool operator>(const String &, const String &);
+    // bool operator>=(const String &, const String &);
+
+    int find_left(char c, int start = 0) const;
+    int find_left(const String &x, int start = 0) const;
+    int find_right(char c, int start = 0x7FFFFFFF) const;
+
+    String lower() const;
+    String upper() const;
+    String printable() const;
+    String quoted_hex() const;
+    String encode_json() const;
+
+    inline String &operator=(const String &x);
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline String &operator=(String &&x);
+#endif
+    inline String &operator=(const char *cstr);
+
+    inline void swap(String &x);
+
+    inline void append(const String &x);
+    inline void append(const char *cstr);
+    inline void append(const char *s, int len);
+    inline void append(const char *first, const char *last);
+    inline void append(char c);
+    void append_fill(int c, int len);
+    char *append_uninitialized(int len);
+    inline char *append_garbage(int len) CLICK_DEPRECATED;
+
+    inline String &operator+=(const String &x);
+    inline String &operator+=(const char *cstr);
+    inline String &operator+=(char c);
+
+    // String operator+(String, const String &);
+    // String operator+(String, const char *);
+    // String operator+(const char *, const String &);
+
+    inline bool is_shared() const;
+    inline bool is_stable() const;
+
+    inline String unique() const CLICK_DEPRECATED;
+    inline String unshared() const;
+    inline String compact() const;
+
+    char *mutable_data();
+    char *mutable_c_str();
+
+    static inline const String &make_out_of_memory();
+    inline bool out_of_memory() const;
+    static inline const char *out_of_memory_data();
+    static inline int out_of_memory_length();
+    static inline const char *empty_data();
+
+#if HAVE_STRING_PROFILING
+    static void profile_report(StringAccum &sa, int examples = 0);
+#endif
+
+    static inline const char *skip_utf8_char(const char *first, const char *last);
+    static const unsigned char *skip_utf8_char(const unsigned char *first,
+					       const unsigned char *last);
+
+    static const char bool_data[11];
+
+  private:
+
+    /** @cond never */
+    struct memo_t {
+	volatile uint32_t refcount;
+	uint32_t capacity;
+	volatile uint32_t dirty;
+#if HAVE_STRING_PROFILING > 1
+	memo_t **pprev;
+	memo_t *next;
+#endif
+	char real_data[8];	// but it might be more or less
+    };
+
+    enum {
+	MEMO_SPACE = sizeof(memo_t) - 8
+    };
+
+    struct rep_t {
+	const char *data;
+	int length;
+	memo_t *memo;
+    };
+    /** @endcond never */
+
+    mutable rep_t _r;		// mutable for c_str()
+
+#if HAVE_STRING_PROFILING
+    static uint64_t live_memo_count;
+    static uint64_t memo_sizes[55];
+    static uint64_t live_memo_sizes[55];
+    static uint64_t live_memo_bytes[55];
+# if HAVE_STRING_PROFILING > 1
+    static memo_t *live_memos[55];
+# endif
+
+    static inline int profile_memo_size_bucket(uint32_t dirty, uint32_t capacity) {
+	if (capacity <= 16)
+	    return dirty;
+	else if (capacity <= 32)
+	    return 17 + (capacity - 17) / 2;
+	else if (capacity <= 64)
+	    return 25 + (capacity - 33) / 8;
+	else
+	    return 29 + 26 - ffs_msb(capacity - 1);
+    }
+
+    static void profile_update_memo_dirty(memo_t *memo, uint32_t old_dirty, uint32_t new_dirty, uint32_t capacity) {
+	if (capacity <= 16 && new_dirty != old_dirty) {
+	    ++memo_sizes[new_dirty];
+	    ++live_memo_sizes[new_dirty];
+	    live_memo_bytes[new_dirty] += capacity;
+	    --live_memo_sizes[old_dirty];
+	    live_memo_bytes[old_dirty] -= capacity;
+# if HAVE_STRING_PROFILING > 1
+	    if ((*memo->pprev = memo->next))
+		memo->next->pprev = memo->pprev;
+	    memo->pprev = &live_memos[new_dirty];
+	    if ((memo->next = *memo->pprev))
+		memo->next->pprev = &memo->next;
+	    *memo->pprev = memo;
+# else
+	    (void) memo;
+# endif
+	}
+    }
+
+    static void one_profile_report(StringAccum &sa, int i, int examples);
+#endif
+
+    inline void assign_memo(const char *data, int length, memo_t *memo) const {
+	_r.data = data;
+	_r.length = length;
+	if ((_r.memo = memo))
+	    atomic_uint32_t::inc(memo->refcount);
+    }
+
+    inline String(const char *data, int length, memo_t *memo) {
+	assign_memo(data, length, memo);
+    }
+
+    inline void assign(const String &x) const {
+	assign_memo(x._r.data, x._r.length, x._r.memo);
+    }
+
+    inline void deref() const {
+	if (_r.memo) {
+	    assert(_r.memo->refcount);
+	    if (atomic_uint32_t::dec_and_test(_r.memo->refcount))
+		delete_memo(_r.memo);
+	    _r.memo = 0;
+	}
+    }
+
+    void assign(const char *s, int len, bool need_deref);
+    void assign_out_of_memory();
+    void append(const char *s, int len, memo_t *memo);
+    static String hard_make_stable(const char *s, int len);
+    static inline memo_t *absent_memo() {
+	return reinterpret_cast<memo_t *>(uintptr_t(1));
+    }
+    static memo_t *create_memo(char *space, int dirty, int capacity);
+    static void delete_memo(memo_t *memo);
+    const char *hard_c_str() const;
+    bool hard_equals(const char *s, int len) const;
+
+    static const char null_data;
+    static const char oom_data[15];
+    static const char int_data[20];
+    static const rep_t null_string_rep;
+    static const rep_t oom_string_rep;
+    enum { oom_len = 14 };
+
+    static String make_claim(char *, int, int); // claim memory
+
+    friend struct rep_t;
+    friend class StringAccum;
+
+};
+
+class StringRef {
+  public:
+
+    inline StringRef();
+    inline StringRef(const StringRef &x);
+    inline StringRef(const char *cstr);
+    inline StringRef(const char *s, int len);
+    inline StringRef(const String &x);
+
+    inline const char *data() const;
+    inline int length() const;
+
+    inline const char *begin() const;
+    inline const char *end() const;
+
+    inline uint32_t hashcode() const;
+
+  private:
+    const char *data_;
+    int len_;
+};
+
+/** @brief Construct an empty String (with length 0). */
+inline String::String() {
+    assign_memo(&null_data, 0, 0);
+}
+
+/** @brief Construct a copy of the String @a x. */
+inline String::String(const String &x) {
+    assign(x);
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+/** @brief Move-construct a String from @a x. */
+inline String::String(String &&x)
+    : _r(x._r) {
+    x._r.memo = 0;
+}
+#endif
+
+/** @brief Construct a String containing the C string @a cstr.
+    @param cstr a null-terminated C string
+    @return A String containing the characters of @a cstr, up to but not
+    including the terminating null character. */
+inline String::String(const char *cstr) {
+    if (CLICK_CONSTANT_CSTR(cstr))
+	assign_memo(cstr, strlen(cstr), 0);
+    else
+	assign(cstr, -1, false);
+}
+
+/** @brief Construct a String containing the first @a len characters of
+    string @a s.
+    @param s a string
+    @param len number of characters to take from @a s.  If @a len @< 0,
+    then takes @c strlen(@a s) characters.
+    @return A String containing @a len characters of @a s. */
+inline String::String(const char *s, int len) {
+    assign(s, len, false);
+}
+
+/** @overload */
+inline String::String(const unsigned char *s, int len) {
+    assign(reinterpret_cast<const char *>(s), len, false);
+}
+
+/** @brief Construct a String containing the characters from @a first
+    to @a last.
+    @param first first character in string (begin iterator)
+    @param last pointer one past last character in string (end iterator)
+    @return A String containing the characters from @a first to @a last.
+
+    Constructs an empty string if @a first @>= @a last. */
+inline String::String(const char *first, const char *last) {
+    assign(first, (first < last ? last - first : 0), false);
+}
+
+/** @overload */
+inline String::String(const unsigned char *first, const unsigned char *last) {
+    assign(reinterpret_cast<const char *>(first),
+	   (first < last ? last - first : 0), false);
+}
+
+/** @brief Construct a String equal to "true" or "false" depending on the
+    value of @a x. */
+inline String::String(bool x) {
+    // bool_data equals "false\0true\0"
+    assign_memo(bool_data + (-x & 6), 5 - x, 0);
+}
+
+/** @brief Construct a String containing the single character @a c. */
+inline String::String(char c) {
+    assign(&c, 1, false);
+}
+
+/** @overload */
+inline String::String(unsigned char c) {
+    assign(reinterpret_cast<char *>(&c), 1, false);
+}
+
+/** @brief Destroy a String, freeing memory if necessary. */
+inline String::~String() {
+    deref();
+}
+
+/** @brief Return a const reference to an empty String.
+
+    May be quicker than String::String(). */
+inline const String &String::make_empty() {
+    return reinterpret_cast<const String &>(null_string_rep);
+}
+
+/** @brief Return a String containing @a len unknown characters. */
+inline String String::make_uninitialized(int len) {
+    String s;
+    s.append_uninitialized(len);
+    return s;
+}
+
+/** @cond never */
+inline String String::make_garbage(int len) {
+    return make_uninitialized(len);
+}
+/** @endcond never */
+
+/** @brief Return a String that directly references the C string @a cstr.
+
+    The make_stable() functions are suitable for static constant strings
+    whose data is known to stay around forever, such as C string constants.
+
+    @warning The String implementation may access @a cstr's terminating null
+    character. */
+inline String String::make_stable(const char *cstr) {
+    if (CLICK_CONSTANT_CSTR(cstr))
+	return String(cstr, strlen(cstr), 0);
+    else
+	return hard_make_stable(cstr, -1);
+}
+
+/** @brief Return a String that directly references the first @a len
+    characters of @a s.
+
+    If @a len @< 0, treats @a s as a null-terminated C string.
+
+    @warning The String implementation may access @a s[@a len], which
+    should remain constant even though it's not part of the String. */
+inline String String::make_stable(const char *s, int len) {
+    if (__builtin_constant_p(len) && len >= 0)
+	return String(s, len, 0);
+    else
+	return hard_make_stable(s, len);
+}
+
+/** @brief Return a String that directly references the character data in
+    [@a first, @a last).
+    @param first pointer to the first character in the character data
+    @param last pointer one beyond the last character in the character data
+    (but see the warning)
+
+    This function is suitable for static constant strings whose data is
+    known to stay around forever, such as C string constants.  Returns an
+    empty string if @a first @>= @a last.
+
+    @warning The String implementation may access *@a last, which should
+    remain constant even though it's not part of the String. */
+inline String String::make_stable(const char *first, const char *last) {
+    return String(first, (first < last ? last - first : 0), 0);
+}
+
+/** @brief Return a pointer to the string's data.
+
+    Only the first length() characters are valid, and the string
+    might not be null-terminated. */
+inline const char *String::data() const {
+    return _r.data;
+}
+
+/** @brief Return the string's length. */
+inline int String::length() const {
+    return _r.length;
+}
+
+/** @brief Null-terminate the string.
+
+    The terminating null character isn't considered part of the string, so
+    this->length() doesn't change.  Returns a corresponding C string
+    pointer.  The returned pointer is semi-temporary; it will persist until
+    the string is destroyed or appended to. */
+inline const char *String::c_str() const {
+    // See also hard_c_str().
+#if CLICK_OPTIMIZE_SIZE || __OPTIMIZE_SIZE__
+    return hard_c_str();
+#else
+    // We may already have a '\0' in the right place.  If _memo has no
+    // capacity, then this is one of the special strings (null or
+    // stable). We are guaranteed, in these strings, that _data[_length]
+    // exists. Otherwise must check that _data[_length] exists.
+    const char *end_data = _r.data + _r.length;
+    if ((_r.memo && end_data >= _r.memo->real_data + _r.memo->dirty)
+	|| *end_data != '\0') {
+	if (char *x = const_cast<String *>(this)->append_uninitialized(1)) {
+	    *x = '\0';
+	    --_r.length;
+	}
+    }
+    return _r.data;
+#endif
+}
+
+/** @brief Return a substring of the current string starting at @a first
+    and ending before @a last.
+    @param first pointer to the first substring character
+    @param last pointer one beyond the last substring character
+
+    Returns an empty string if @a first @>= @a last. Also returns an empty
+    string if @a first or @a last is out of range (i.e., either less than
+    this->begin() or greater than this->end()), but this should be
+    considered a programming error; a future version may generate a warning
+    for this case. */
+inline String String::substring(const char *first, const char *last) const {
+    if (first < last && first >= _r.data && last <= _r.data + _r.length)
+	return String(first, last - first, _r.memo);
+    else
+	return String();
+}
+
+/** @brief Return the suffix of the current string starting at index @a pos.
+
+    If @a pos is negative, starts that far from the end of the string.
+    If @a pos is so negative that the suffix starts outside the string,
+    then the entire string is returned. If the substring is beyond the
+    end of the string (@a pos > length()), returns an empty string (but
+    this should be considered a programming error; a future version may
+    generate a warning for this case).
+
+    @note String::substring() is intended to behave like Perl's
+    substr(). */
+inline String String::substring(int pos) const {
+    return substring((pos <= -_r.length ? 0 : pos), _r.length);
+}
+
+/** @brief Return an iterator for the first character in the string.
+
+    String iterators are simply pointers into string data, so they are
+    quite efficient.  @sa String::data */
+inline String::const_iterator String::begin() const {
+    return _r.data;
+}
+
+/** @brief Return an iterator for the end of the string.
+
+    The return value points one character beyond the last character in the
+    string. */
+inline String::const_iterator String::end() const {
+    return _r.data + _r.length;
+}
+
+/** @brief Test if the string is nonempty. */
+inline String::operator unspecified_bool_type() const {
+    return (_r.length != 0 ? &String::length : 0);
+}
+
+/** @brief Test if the string is empty. */
+inline bool String::empty() const {
+    return _r.length == 0;
+}
+
+/** @brief Test if the string is empty. */
+inline bool String::operator!() const {
+    return empty();
+}
+
+/** @brief Return the @a i th character in the string.
+
+    Does not check bounds.  @sa String::at */
+inline char String::operator[](int i) const {
+    return _r.data[i];
+}
+
+/** @brief Return the @a i th character in the string.
+
+    Checks bounds: an assertion will fail if @a i is less than 0 or not less
+    than length(). @sa String::operator[] */
+inline char String::at(int i) const {
+    assert((unsigned) i < (unsigned) _r.length);
+    return _r.data[i];
+}
+
+/** @brief Return the first character in the string.
+
+    Does not check bounds.  Same as (*this)[0]. */
+inline char String::front() const {
+    return _r.data[0];
+}
+
+/** @brief Return the last character in the string.
+
+    Does not check bounds.  Same as (*this)[length() - 1]. */
+inline char String::back() const {
+    return _r.data[_r.length - 1];
+}
+
+/** @overload */
+inline uint32_t String::hashcode(const unsigned char *first,
+				 const unsigned char *last) {
+    return hashcode(reinterpret_cast<const char *>(first),
+		    reinterpret_cast<const char *>(last));
+}
+
+/** @brief Returns a 32-bit hash function of this string's characters.
+
+    Equivalent to String::hashcode(begin(), end()).  Uses Paul Hsieh's
+    "SuperFastHash."
+
+    @invariant  If s1 == s2, then s1.hashcode() == s2.hashcode(). */
+inline uint32_t String::hashcode() const {
+    return (length() ? hashcode(begin(), end()) : 0);
+}
+
+/** @brief Test if this string equals @a x. */
+inline bool String::equals(const String &x) const {
+    return equals(x.data(), x.length());
+}
+
+/** @brief Test if this string is equal to the data in @a s.
+    @param s string data to compare to
+    @param len length of @a s
+
+    Same as String::compare(*this, String(s, len)) == 0. If @a len @< 0,
+    then treats @a s as a null-terminated C string.
+
+    @sa String::compare(const String &a, const String &b) */
+inline bool String::equals(const char *s, int len) const {
+#if CLICK_OPTIMIZE_SIZE || __OPTIMIZE_SIZE__
+    return hard_equals(s, len);
+#else
+    if (__builtin_constant_p(len) && len >= 0)
+	return length() == len && memcmp(data(), s, len) == 0;
+    else
+	return hard_equals(s, len);
+#endif
+}
+
+/** @brief Compare two strings.
+    @param a first string to compare
+    @param b second string to compare
+
+    Returns 0 if @a a == @a b, negative if @a a @< @a b in lexicographic
+    order, and positive if @a a @> @a b in lexicographic order. The
+    lexicographic order treats all characters as unsigned. */
+inline int String::compare(const String &a, const String &b) {
+    return a.compare(b);
+}
+
+/** @brief Compare this string with string @a x.
+
+    Same as String::compare(*this, @a x).
+    @sa String::compare(const String &a, const String &b) */
+inline int String::compare(const String &x) const {
+    return compare(x.data(), x.length());
+}
+
+/** @brief Test if this string begins with prefix @a x.
+
+    Same as String::starts_with(@a x.data(), @a x.length()). */
+inline bool String::starts_with(const String &x) const {
+    return starts_with(x.data(), x.length());
+}
+
+/** @brief Assign this string to @a x. */
+inline String &String::operator=(const String &x) {
+    if (likely(&x != this)) {
+	deref();
+	assign(x);
+    }
+    return *this;
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+/** @brief Move-assign this string to @a x. */
+inline String &String::operator=(String &&x) {
+    deref();
+    _r = x._r;
+    x._r.memo = 0;
+    return *this;
+}
+#endif
+
+/** @brief Assign this string to the C string @a cstr. */
+inline String &String::operator=(const char *cstr) {
+    if (CLICK_CONSTANT_CSTR(cstr)) {
+	deref();
+	assign_memo(cstr, strlen(cstr), 0);
+    } else
+	assign(cstr, -1, true);
+    return *this;
+}
+
+/** @brief Swap the values of this string and @a x. */
+inline void String::swap(String &x) {
+    rep_t r = _r;
+    _r = x._r;
+    x._r = r;
+}
+
+/** @brief Append @a x to this string. */
+inline void String::append(const String &x) {
+    append(x.data(), x.length(), x._r.memo);
+}
+
+/** @brief Append the null-terminated C string @a cstr to this string.
+    @param cstr data to append */
+inline void String::append(const char *cstr) {
+    if (CLICK_CONSTANT_CSTR(cstr))
+	append(cstr, strlen(cstr), absent_memo());
+    else
+	append(cstr, -1, absent_memo());
+}
+
+/** @brief Append the first @a len characters of @a s to this string.
+    @param s data to append
+    @param len length of data
+    @pre @a len @>= 0 */
+inline void String::append(const char *s, int len) {
+    append(s, len, absent_memo());
+}
+
+/** @brief Appends the data from @a first to @a last to this string.
+
+    Does nothing if @a first @>= @a last. */
+inline void String::append(const char *first, const char *last) {
+    if (first < last)
+	append(first, last - first);
+}
+
+/** @brief Append the character @a c to this string. */
+inline void String::append(char c) {
+    append(&c, 1, absent_memo());
+}
+
+/** @cond never */
+inline char *String::append_garbage(int len) {
+    return append_uninitialized(len);
+}
+/** @endcond never */
+
+/** @brief Append @a x to this string.
+    @return *this */
+inline String &String::operator+=(const String &x) {
+    append(x.data(), x.length(), x._r.memo);
+    return *this;
+}
+
+/** @brief Append the null-terminated C string @a cstr to this string.
+    @return *this */
+inline String &String::operator+=(const char *cstr) {
+    append(cstr);
+    return *this;
+}
+
+/** @brief Append the character @a c to this string.
+    @return *this */
+inline String &String::operator+=(char c) {
+    append(&c, 1);
+    return *this;
+}
+
+/** @brief Test if the String's data is shared or immutable. */
+inline bool String::is_shared() const {
+    return !_r.memo || _r.memo->refcount != 1;
+}
+
+/** @brief Test if the String's data is immutable. */
+inline bool String::is_stable() const {
+    return !_r.memo;
+}
+
+/** @brief Return an unshared version of this String.
+
+    The return value shares no data with any other non-stable String. */
+inline String String::unshared() const {
+    if (!_r.memo || _r.memo->refcount == 1)
+	return *this;
+    else
+	return String(_r.data, _r.data + _r.length);
+}
+
+/** @brief Return an unshared version of this String.
+    @deprecated Use String::unshared() instead.
+
+    The return value shares no data with any other non-stable String. */
+inline String String::unique() const {
+    return unshared();
+}
+
+/** @brief Return a compact version of this String.
+
+    The return value shares no more than 256 bytes of data with any other
+    non-stable String. */
+inline String String::compact() const {
+    if (!_r.memo || _r.memo->refcount == 1
+	|| (uint32_t) _r.length + 256 >= _r.memo->capacity)
+	return *this;
+    else
+	return String(_r.data, _r.data + _r.length);
+}
+
+/** @brief Test if this is an out-of-memory string. */
+inline bool String::out_of_memory() const {
+    return unlikely(data() == oom_data);
+}
+
+/** @brief Return a const reference to a canonical out-of-memory String. */
+inline const String &String::make_out_of_memory() {
+    return reinterpret_cast<const String &>(oom_string_rep);
+}
+
+/** @brief Return the data pointer used for out-of-memory strings. */
+inline const char *String::out_of_memory_data() {
+    return oom_data;
+}
+
+/** @brief Return the length of canonical out-of-memory strings. */
+inline int String::out_of_memory_length() {
+    return oom_len;
+}
+
+/** @brief Return the data pointer used for canonical empty strings.
+
+    The returned value may be dereferenced; it points to a null
+    character. */
+inline const char *String::empty_data() {
+    return &null_data;
+}
+
+/** @brief Return a pointer to the next character in UTF-8 encoding.
+    @pre @a first @< @a last
+
+    If @a first doesn't point at a valid UTF-8 character, returns @a first. */
+inline const char *String::skip_utf8_char(const char *first, const char *last) {
+    return reinterpret_cast<const char *>(skip_utf8_char(reinterpret_cast<const unsigned char *>(first), reinterpret_cast<const unsigned char *>(last)));
+}
+
+inline StringRef::StringRef()
+    : data_(0), len_(0) {
+}
+
+inline StringRef::StringRef(const StringRef &x)
+    : data_(x.data_), len_(x.len_) {
+}
+
+inline StringRef::StringRef(const char *cstr)
+    : data_(cstr), len_(strlen(cstr)) {
+}
+
+inline StringRef::StringRef(const char *s, int len)
+    : data_(s), len_(len) {
+}
+
+inline StringRef::StringRef(const String &x)
+    : data_(x.data()), len_(x.length()) {
+}
+
+inline const char *StringRef::data() const {
+    return data_;
+}
+
+inline int StringRef::length() const {
+    return len_;
+}
+
+inline const char *StringRef::begin() const {
+    return data();
+}
+
+inline const char *StringRef::end() const {
+    return data() + length();
+}
+
+/** @relates String
+    @brief Compares two strings for equality.
+
+    Returns true iff the two operands have the same lengths and the same
+    characters in the same order.  At most one of the operands can be a
+    null-terminated C string.
+    @sa String::compare */
+inline bool operator==(const String &a, const String &b) {
+    return a.equals(b.data(), b.length());
+}
+
+/** @relates String */
+inline bool operator==(const char *a, const String &b) {
+    if (CLICK_CONSTANT_CSTR(a))
+	return b.equals(a, strlen(a));
+    else
+	return b.equals(a, -1);
+}
+
+/** @relates String */
+inline bool operator==(const String &a, const char *b) {
+    if (CLICK_CONSTANT_CSTR(b))
+	return a.equals(b, strlen(b));
+    else
+	return a.equals(b, -1);
+}
+
+/** @relates String
+    @brief Compare two Strings for inequality.
+
+    Returns true iff !(@a a == @a b).  At most one of the operands can be a
+    null-terminated C string. */
+inline bool operator!=(const String &a, const String &b) {
+    return !(a == b);
+}
+
+/** @relates String */
+inline bool operator!=(const char *a, const String &b) {
+    return !(a == b);
+}
+
+/** @relates String */
+inline bool operator!=(const String &a, const char *b) {
+    return !(a == b);
+}
+
+/** @relates String
+    @brief Compare two Strings.
+
+    Returns true iff @a a @< @a b in lexicographic order.
+    @sa String::compare */
+inline bool operator<(const String &a, const String &b) {
+    return a.compare(b.data(), b.length()) < 0;
+}
+
+/** @relates String
+    @brief Compare two Strings.
+
+    Returns true iff @a a @<= @a b in lexicographic order.
+    @sa String::compare */
+inline bool operator<=(const String &a, const String &b) {
+    return a.compare(b.data(), b.length()) <= 0;
+}
+
+/** @relates String
+    @brief Compare two Strings.
+
+    Returns true iff @a a @> @a b in lexicographic order.
+    @sa String::compare */
+inline bool operator>(const String &a, const String &b) {
+    return a.compare(b.data(), b.length()) > 0;
+}
+
+/** @relates String
+    @brief Compare two Strings.
+
+    Returns true iff @a a @>= @a b in lexicographic order.
+    @sa String::compare */
+inline bool operator>=(const String &a, const String &b) {
+    return a.compare(b.data(), b.length()) >= 0;
+}
+
+/** @relates String
+    @brief Concatenate the operands and return the result.
+
+    At most one of the two operands can be a null-terminated C string. */
+inline String operator+(String a, const String &b) {
+    a += b;
+    return a;
+}
+
+/** @relates String */
+inline String operator+(String a, const char *b) {
+    a.append(b);
+    return a;
+}
+
+/** @relates String */
+inline String operator+(const char *a, const String &b) {
+    String s1(a);
+    s1 += b;
+    return s1;
+}
+
+/** @relates String
+    @brief Concatenate the operands and return the result.
+
+    The second operand is a single character. */
+inline String operator+(String a, char b) {
+    a.append(&b, 1);
+    return a;
+}
+
+// find methods
+
+inline const char *rfind(const char *first, const char *last, char c) {
+    for (const char *bb = last - 1; bb >= first; bb--)
+	if (*bb == c)
+	    return bb;
+    return last;
+}
+
+inline const char *find(const String &s, char c) {
+    return find(s.begin(), s.end(), c);
+}
+
+// sort methods
+
+template <typename T> int click_compare(const void *, const void *);
+
+template <> inline int click_compare<String>(const void *a, const void *b) {
+    const String *ta = reinterpret_cast<const String *>(a);
+    const String *tb = reinterpret_cast<const String *>(b);
+    return String::compare(*ta, *tb);
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/sync.hh b/openflow/include/click/sync.hh
new file mode 100644
index 0000000..bdf4cf9
--- /dev/null
+++ b/openflow/include/click/sync.hh
@@ -0,0 +1,568 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_SYNC_HH
+#define CLICK_SYNC_HH
+#include <click/machine.hh>
+#include <click/glue.hh>
+#include <click/atomic.hh>
+#if CLICK_LINUXMODULE || (CLICK_USERLEVEL && HAVE_MULTITHREAD)
+# define CLICK_MULTITHREAD_SPINLOCK 1
+#endif
+#if CLICK_USERLEVEL && !NDEBUG
+# define SPINLOCK_ASSERTLEVEL "<-999>"
+#else
+# define SPINLOCK_ASSERTLEVEL "<1>"
+#endif
+CLICK_DECLS
+
+/** @file <click/sync.hh>
+ * @brief Classes for synchronizing among multiple CPUs, particularly in the
+ * Linux kernel.
+ */
+
+/** @class Spinlock
+ * @brief A recursive spinlock for SMP Click threads.
+ *
+ * The Spinlock class abstracts a recursive spinlock, or polling mutex, in SMP
+ * Click.  This is a type of mutual-exclusion lock in which acquiring the lock
+ * is a polling operation (basically a "while (lock.acquired()) do nothing;"
+ * loop).  Spinlocks can be used to synchronize access to shared data among
+ * multiple Click SMP threads.  Spinlocks should not be held for long periods
+ * of time: use them for quick updates and such.
+ *
+ * Spinlock operations do nothing unless Click was compiled with SMP support
+ * (with --enable-multithread).  Therefore, Spinlock should not be used to,
+ * for example, synchronize handlers with main element threads.  See also
+ * SpinlockIRQ.
+ *
+ * The main Spinlock operations are acquire(), which acquires the lock, and
+ * release(), which releases the lock.  attempt() acquires the lock only if it
+ * can be acquired instantaneously.
+ *
+ * It is OK for a thread to acquire a lock it has already acquired, but you
+ * must release it as many times as you have acquired it.
+ *
+ * @sa SimpleSpinlock, SpinlockIRQ
+ */
+class Spinlock { public:
+
+    inline Spinlock();
+    inline ~Spinlock();
+
+    inline void acquire();
+    inline void release();
+    inline bool attempt();
+    inline bool nested() const;
+
+#if CLICK_MULTITHREAD_SPINLOCK
+  private:
+
+    atomic_uint32_t _lock;
+    int32_t _depth;
+    click_processor_t _owner;
+#endif
+
+};
+
+/** @brief Create a Spinlock. */
+inline
+Spinlock::Spinlock()
+#if CLICK_MULTITHREAD_SPINLOCK
+    : _depth(0), _owner(click_invalid_processor())
+#endif
+{
+#if CLICK_MULTITHREAD_SPINLOCK
+    _lock = 0;
+#endif
+}
+
+inline
+Spinlock::~Spinlock()
+{
+#if CLICK_MULTITHREAD_SPINLOCK
+    if (_depth != 0)
+	click_chatter(SPINLOCK_ASSERTLEVEL "Spinlock::~Spinlock(): assertion \"_depth == 0\" failed");
+#endif
+}
+
+/** @brief Acquires the Spinlock.
+ *
+ * On return, this thread has acquired the lock.  The function will spin
+ * indefinitely until the lock is acquired.  It is OK to acquire a lock you
+ * have already acquired, but you must release it as many times as you have
+ * acquired it.
+ */
+inline void
+Spinlock::acquire()
+{
+#if CLICK_MULTITHREAD_SPINLOCK
+    click_processor_t my_cpu = click_get_processor();
+    if (_owner != my_cpu) {
+	while (_lock.swap(1) != 0)
+	    do {
+		click_relax_fence();
+	    } while (_lock != 0);
+	_owner = my_cpu;
+    }
+    _depth++;
+#endif
+}
+
+/** @brief Attempts to acquire the Spinlock.
+ * @return True iff the Spinlock was acquired.
+ *
+ * This function will acquire the lock and return true only if the Spinlock
+ * can be acquired right away, without retries.
+ */
+inline bool
+Spinlock::attempt()
+{
+#if CLICK_MULTITHREAD_SPINLOCK
+    click_processor_t my_cpu = click_get_processor();
+    if (_owner != my_cpu) {
+	if (_lock.swap(1) != 0) {
+	    click_put_processor();
+	    return false;
+	}
+	_owner = my_cpu;
+    }
+    _depth++;
+    return true;
+#else
+    return true;
+#endif
+}
+
+/** @brief Releases the Spinlock.
+ *
+ * The Spinlock must have been previously acquired by either Spinlock::acquire
+ * or Spinlock::attempt.
+ */
+inline void
+Spinlock::release()
+{
+#if CLICK_MULTITHREAD_SPINLOCK
+    if (unlikely(_owner != click_current_processor()))
+	click_chatter(SPINLOCK_ASSERTLEVEL "Spinlock::release(): assertion \"owner == click_current_processor()\" failed");
+    if (likely(_depth > 0)) {
+	if (--_depth == 0) {
+	    _owner = click_invalid_processor();
+	    _lock = 0;
+	}
+    } else
+	click_chatter(SPINLOCK_ASSERTLEVEL "Spinlock::release(): assertion \"_depth > 0\" failed");
+    click_put_processor();
+#endif
+}
+
+/** @brief Returns true iff the Spinlock has been acquired more than once by
+ * the current thread.
+ */
+inline bool
+Spinlock::nested() const
+{
+#if CLICK_MULTITHREAD_SPINLOCK
+    return _depth > 1;
+#else
+    return false;
+#endif
+}
+
+
+/** @class SimpleSpinlock
+ * @brief A non-recursive spinlock for SMP Click threads.
+ *
+ * The Spinlock class abstracts a non-recursive spinlock, or polling mutex, in
+ * SMP Click.  This is a type of mutual-exclusion lock in which acquiring the
+ * lock is a polling operation (basically a "while (lock.acquired()) do
+ * nothing;" loop).  Spinlocks can be used to synchronize access to shared
+ * data among multiple Click SMP threads.  Spinlocks should not be held for
+ * long periods of time: use them for quick updates and such.
+ *
+ * Spinlock operations do nothing unless Click was compiled with SMP support
+ * (with --enable-multithread).  Therefore, Spinlock should not be used to,
+ * for example, synchronize handlers with main element threads.  See also
+ * SpinlockIRQ.
+ *
+ * The main Spinlock operations are acquire(), which acquires the lock, and
+ * release(), which releases the lock.  attempt() acquires the lock only if it
+ * can be acquired instantaneously.
+ *
+ * It is NOT OK for a thread to acquire a lock it has already acquired.
+ *
+ * @sa Spinlock, SpinlockIRQ
+ */
+class SimpleSpinlock { public:
+
+    inline SimpleSpinlock();
+    inline ~SimpleSpinlock();
+
+    inline void acquire();
+    inline void release();
+    inline bool attempt();
+
+#if CLICK_LINUXMODULE
+  private:
+    spinlock_t _lock;
+#elif CLICK_MULTITHREAD_SPINLOCK
+  private:
+    atomic_uint32_t _lock;
+#endif
+
+};
+
+/** @brief Create a SimpleSpinlock. */
+inline
+SimpleSpinlock::SimpleSpinlock()
+{
+#if CLICK_LINUXMODULE
+    spin_lock_init(&_lock);
+#elif CLICK_MULTITHREAD_SPINLOCK
+    _lock = 0;
+#endif
+}
+
+inline
+SimpleSpinlock::~SimpleSpinlock()
+{
+}
+
+/** @brief Acquires the SimpleSpinlock.
+ *
+ * On return, this thread has acquired the lock.  The function will spin
+ * indefinitely until the lock is acquired.
+ */
+inline void
+SimpleSpinlock::acquire()
+{
+#if CLICK_LINUXMODULE
+    spin_lock(&_lock);
+#elif CLICK_MULTITHREAD_SPINLOCK
+    while (_lock.swap(1) != 0)
+	do {
+	    click_relax_fence();
+	} while (_lock != 0);
+#endif
+}
+
+/** @brief Attempts to acquire the SimpleSpinlock.
+ * @return True iff the SimpleSpinlock was acquired.
+ *
+ * This function will acquire the lock and return true only if the
+ * SimpleSpinlock can be acquired right away, without retries.
+ */
+inline bool
+SimpleSpinlock::attempt()
+{
+#if CLICK_LINUXMODULE
+    return spin_trylock(&_lock);
+#elif CLICK_MULTITHREAD_SPINLOCK
+    return _lock.swap(1) == 0;
+#else
+    return true;
+#endif
+}
+
+/** @brief Releases the SimpleSpinlock.
+ *
+ * The SimpleSpinlock must have been previously acquired by either
+ * SimpleSpinlock::acquire or SimpleSpinlock::attempt.
+ */
+inline void
+SimpleSpinlock::release()
+{
+#if CLICK_LINUXMODULE
+    spin_unlock(&_lock);
+#elif CLICK_MULTITHREAD_SPINLOCK
+    _lock = 0;
+#endif
+}
+
+
+/** @class SpinlockIRQ
+ * @brief A spinlock that disables interrupts.
+ *
+ * The SpinlockIRQ class abstracts a spinlock, or polling mutex, that also
+ * turns off interrupts.  Spinlocks are a type of mutual-exclusion lock in
+ * which acquiring the lock is a polling operation (basically a "while
+ * (lock.acquired()) do nothing;" loop).  The SpinlockIRQ variant can be used
+ * to protect Click data structures from interrupts and from other threads.
+ * Very few objects in Click need this protection; the Click Master object,
+ * which protects the task list, uses it, but that's hidden from users.
+ * Spinlocks should not be held for long periods of time: use them for quick
+ * updates and such.
+ *
+ * In the Linux kernel, SpinlockIRQ is equivalent to a combination of
+ * local_irq_save and the spinlock_t type.
+ *
+ * The SpinlockIRQ operations are acquire(), which acquires the lock, and
+ * release(), which releases the lock.
+ *
+ * It is NOT OK for a SpinlockIRQ thread to acquire a lock it has already
+ * acquired.
+ */
+class SpinlockIRQ { public:
+
+    inline SpinlockIRQ();
+
+#if CLICK_LINUXMODULE
+    typedef unsigned long flags_t;
+#else
+    typedef int flags_t;
+#endif
+
+    inline flags_t acquire() CLICK_ALWAYS_INLINE;
+    inline void release(flags_t) CLICK_ALWAYS_INLINE;
+
+#if CLICK_LINUXMODULE
+  private:
+    spinlock_t _lock;
+#elif CLICK_USERLEVEL && HAVE_MULTITHREAD
+  private:
+    Spinlock _lock;
+#endif
+
+};
+
+/** @brief Creates a SpinlockIRQ. */
+inline
+SpinlockIRQ::SpinlockIRQ()
+{
+#if CLICK_LINUXMODULE
+    spin_lock_init(&_lock);
+#endif
+}
+
+/** @brief Acquires the SpinlockIRQ.
+ * @return The current state of the interrupt flags.
+ */
+inline SpinlockIRQ::flags_t
+SpinlockIRQ::acquire()
+{
+#if CLICK_LINUXMODULE
+    flags_t flags;
+    spin_lock_irqsave(&_lock, flags);
+    return flags;
+#elif CLICK_USERLEVEL && HAVE_MULTITHREAD
+    _lock.acquire();
+    return 0;
+#else
+    return 0;
+#endif
+}
+
+/** @brief Releases the SpinlockIRQ.
+ * @param flags The value returned by SpinlockIRQ::acquire().
+ */
+inline void
+SpinlockIRQ::release(flags_t flags)
+{
+#if CLICK_LINUXMODULE
+    spin_unlock_irqrestore(&_lock, flags);
+#elif CLICK_USERLEVEL && HAVE_MULTITHREAD
+    (void) flags;
+    _lock.release();
+#else
+    (void) flags;
+#endif
+}
+
+
+// read-write lock
+//
+// on read: acquire local read lock
+// on write: acquire every read lock
+//
+// alternatively, we could use a read counter and a write lock. we don't do
+// that because we'd like to avoid a cache miss for read acquires. this makes
+// reads very fast, and writes more expensive
+
+/** @class ReadWriteLock
+ * @brief A read/write lock.
+ *
+ * The ReadWriteLock class abstracts a read/write lock in SMP Click.  Multiple
+ * SMP Click threads can hold read locks simultaneously, but if any thread
+ * holds a write lock, then no other thread holds any kind of lock.  The
+ * read/write lock is implemented with Spinlock objects, so acquiring a lock
+ * is a polling operation.  ReadWriteLocks can be used to synchronize access
+ * to shared data among multiple Click SMP threads.  ReadWriteLocks should not
+ * be held for long periods of time.
+ *
+ * ReadWriteLock operations do nothing unless Click was compiled with
+ * --enable-multithread.  Therefore, ReadWriteLock should not be used to, for
+ * example, synchronize handlers with main element threads.
+ *
+ * The main ReadWriteLock operations are acquire_read() and acquire_write(),
+ * which acquire the lock for reading or writing, respectively, and
+ * release_read() and release_write(), which similarly release the lock.
+ * attempt_read() and attempt_write() acquire the lock only if it can be
+ * acquired instantaneously.
+ *
+ * It is OK for a thread to acquire a lock it has already acquired, but you
+ * must release it as many times as you have acquired it.
+ *
+ * ReadWriteLock objects are relatively large in terms of memory usage; don't
+ * create too many of them.
+ */
+class ReadWriteLock { public:
+
+    inline ReadWriteLock();
+#if CLICK_LINUXMODULE && defined(CONFIG_SMP)
+    inline ~ReadWriteLock();
+#endif
+
+    inline void acquire_read();
+    inline bool attempt_read();
+    inline void release_read();
+    inline void acquire_write();
+    inline bool attempt_write();
+    inline void release_write();
+
+#if CLICK_LINUXMODULE && defined(CONFIG_SMP)
+  private:
+    // allocate a cache line for every member
+    struct lock_t {
+	Spinlock _lock;
+	unsigned char reserved[L1_CACHE_BYTES - sizeof(Spinlock)];
+    } *_l;
+#endif
+
+};
+
+/** @brief Creates a ReadWriteLock. */
+inline
+ReadWriteLock::ReadWriteLock()
+{
+#if CLICK_LINUXMODULE && defined(CONFIG_SMP)
+    _l = new lock_t[num_possible_cpus()];
+#endif
+}
+
+#if CLICK_LINUXMODULE && defined(CONFIG_SMP)
+inline
+ReadWriteLock::~ReadWriteLock()
+{
+    delete[] _l;
+}
+#endif
+
+/** @brief Acquires the ReadWriteLock for reading.
+ *
+ * On return, this thread has acquired the lock for reading.  The function
+ * will spin indefinitely until the lock is acquired.  It is OK to acquire a
+ * lock you have already acquired, but you must release it as many times as
+ * you have acquired it.
+ *
+ * @sa Spinlock::acquire
+ */
+inline void
+ReadWriteLock::acquire_read()
+{
+#if CLICK_LINUXMODULE && defined(CONFIG_SMP)
+    click_processor_t my_cpu = click_get_processor();
+    _l[my_cpu]._lock.acquire();
+#endif
+}
+
+/** @brief Attempts to acquire the ReadWriteLock for reading.
+ * @return True iff the ReadWriteLock was acquired.
+ *
+ * This function will acquire the lock for reading and return true only if the
+ * ReadWriteLock can be acquired right away, without retries.
+ */
+inline bool
+ReadWriteLock::attempt_read()
+{
+#if CLICK_LINUXMODULE && defined(CONFIG_SMP)
+    click_processor_t my_cpu = click_get_processor();
+    bool result = _l[my_cpu]._lock.attempt();
+    if (!result)
+	click_put_processor();
+    return result;
+#else
+    return true;
+#endif
+}
+
+/** @brief Releases the ReadWriteLock for reading.
+ *
+ * The ReadWriteLock must have been previously acquired by either
+ * ReadWriteLock::acquire_read or ReadWriteLock::attempt_read.  Do not call
+ * release_read() on a lock that was acquired for writing.
+ */
+inline void
+ReadWriteLock::release_read()
+{
+#if CLICK_LINUXMODULE && defined(CONFIG_SMP)
+    _l[click_current_processor()]._lock.release();
+    click_put_processor();
+#endif
+}
+
+/** @brief Acquires the ReadWriteLock for writing.
+ *
+ * On return, this thread has acquired the lock for writing.  The function
+ * will spin indefinitely until the lock is acquired.  It is OK to acquire a
+ * lock you have already acquired, but you must release it as many times as
+ * you have acquired it.
+ *
+ * @sa ReadWriteLock::acquire_read
+ */
+inline void
+ReadWriteLock::acquire_write()
+{
+#if CLICK_LINUXMODULE && defined(CONFIG_SMP)
+    for (unsigned i = 0; i < (unsigned) num_possible_cpus(); i++)
+	_l[i]._lock.acquire();
+#endif
+}
+
+/** @brief Attempts to acquire the ReadWriteLock for writing.
+ * @return True iff the ReadWriteLock was acquired.
+ *
+ * This function will acquire the lock for writing and return true only if the
+ * ReadWriteLock can be acquired right away, without retries.  Note, however,
+ * that acquiring a ReadWriteLock requires as many operations as there are
+ * CPUs.
+ *
+ * @sa ReadWriteLock::attempt_read
+ */
+inline bool
+ReadWriteLock::attempt_write()
+{
+#if CLICK_LINUXMODULE && defined(CONFIG_SMP)
+    bool all = true;
+    unsigned i;
+    for (i = 0; i < (unsigned) num_possible_cpus(); i++)
+	if (!(_l[i]._lock.attempt())) {
+	    all = false;
+	    break;
+	}
+    if (!all)
+	for (unsigned j = 0; j < i; j++)
+	    _l[j]._lock.release();
+    return all;
+#else
+    return true;
+#endif
+}
+
+/** @brief Releases the ReadWriteLock for writing.
+ *
+ * The ReadWriteLock must have been previously acquired by either
+ * ReadWriteLock::acquire_write or ReadWriteLock::attempt_write.  Do not call
+ * release_write() on a lock that was acquired for reading.
+ *
+ * @sa ReadWriteLock::release_read
+ */
+inline void
+ReadWriteLock::release_write()
+{
+#if CLICK_LINUXMODULE && defined(CONFIG_SMP)
+    for (unsigned i = 0; i < (unsigned) num_possible_cpus(); i++)
+	_l[i]._lock.release();
+#endif
+}
+
+CLICK_ENDDECLS
+#undef SPINLOCK_ASSERTLEVEL
+#endif
diff --git a/openflow/include/click/task.hh b/openflow/include/click/task.hh
new file mode 100644
index 0000000..4bfb127
--- /dev/null
+++ b/openflow/include/click/task.hh
@@ -0,0 +1,648 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/task.cc" -*-
+#ifndef CLICK_TASK_HH
+#define CLICK_TASK_HH
+#include <click/element.hh>
+#include <click/sync.hh>
+#if HAVE_MULTITHREAD
+# include <click/atomic.hh>
+# include <click/ewma.hh>
+#endif
+CLICK_DECLS
+
+#if CLICK_BSDMODULE
+# include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+# include <sys/lock.h>
+# include <sys/mutex.h>
+CLICK_CXX_UNPROTECT
+# include <click/cxxunprotect.h>
+#else
+#define GIANT_REQUIRED
+#endif
+
+#define PASS_GT(a, b)   ((int)(a - b) > 0)
+
+typedef bool (*TaskCallback)(Task *, void *);
+typedef TaskCallback TaskHook CLICK_DEPRECATED;
+class RouterThread;
+class TaskList;
+class Master;
+
+struct TaskLink {
+#if !HAVE_TASK_HEAP
+    TaskLink *_prev;
+    TaskLink *_next;
+#endif
+#if HAVE_STRIDE_SCHED
+    unsigned _pass;
+#endif
+    TaskLink() {
+#if !HAVE_TASK_HEAP
+        _prev = _next = 0;
+#endif
+#if HAVE_STRIDE_SCHED
+        _pass = 0;
+#endif
+    }
+};
+
+class Task : private TaskLink { public:
+
+#if HAVE_STRIDE_SCHED
+    enum { STRIDE1 = 1U<<16, MAX_STRIDE = 1U<<31 };
+    enum { MAX_TICKETS = 1<<15, DEFAULT_TICKETS = 1<<10 };
+#endif
+#if HAVE_ADAPTIVE_SCHEDULER
+    enum { MAX_UTILIZATION = 1000 };
+#endif
+
+    /** @brief Construct a task that calls @a f with @a user_data argument.
+     *
+     * @param f callback function
+     * @param user_data argument for callback function
+     *
+     * Constructs a task that, when fired, calls @a f like so:
+     *
+     * @code
+     * bool work_done = f(task, user_data);
+     * @endcode
+     *
+     * where @a task is a pointer to this task.  @a f should return true if
+     * the task accomplished some meaningful work, and false if it did not.
+     * For example, a task that polls a network driver for packets should
+     * return true if it emits at least one packet, and false if no packets
+     * were available. */
+    inline Task(TaskCallback f, void *user_data);
+
+    /** @brief Construct a task that calls @a e ->@link Element::run_task(Task*) run_task()@endlink.
+     *
+     * @param e element to call
+     *
+     * Constructs a task that, when fired, calls the element @a e's @link
+     * Element::run_task(Task *) run_task()@endlink method, passing this Task
+     * as an argument.
+     *
+     * @sa Task(TaskCallback, void *) */
+    inline Task(Element *e);
+
+    /** @brief Destroy a task.
+     *
+     * Unschedules the task if necessary. */
+    ~Task();
+
+
+    /** @brief Return the task's callback function.
+     *
+     * Returns null if the task was constructed with the Task(Element *)
+     * constructor. */
+    inline TaskCallback callback() const {
+        return _hook;
+    }
+
+    /** @brief Return the task callback function's user data. */
+    inline void *user_data() const {
+        return _thunk;
+    }
+
+    /** @brief Return the task's owning element. */
+    inline Element *element() const {
+        return _owner;
+    }
+
+
+    /** @brief Return true iff the task has been initialize()d. */
+    inline bool initialized() const;
+
+    /** @brief Return the task's home thread ID.
+     *
+     * This is the @link RouterThread::thread_id() thread_id()@endlink of the
+     * thread on which this Task would run if it were scheduled. This need
+     * not equal the ID of the current thread(), since changes in
+     * home_thread_id() aren't always implemented immediately (because of
+     * locking issues). */
+    inline int home_thread_id() const;
+
+    /** @brief Return the thread on which this task is currently scheduled,
+     * or would be scheduled.
+     *
+     * Usually, task->thread()->@link RouterThread::thread_id()
+     * thread_id()@endlink == task->home_thread_id().  They can differ,
+     * however, if move_thread() was called but the task hasn't yet been moved
+     * to the new thread. */
+    inline RouterThread *thread() const;
+
+    /** @brief Return the router to which this task belongs. */
+    inline Router *router() const {
+        return _owner->router();
+    }
+
+    /** @brief Return the master where this task will be scheduled. */
+    Master *master() const;
+
+
+    /** @brief Initialize the Task, and optionally schedule it.
+     * @param owner specifies the element owning the Task
+     * @param schedule if true, the Task will be scheduled immediately
+     *
+     * This function must be called on every Task before it is used.  The
+     * corresponding router's ThreadSched, if any, is used to determine the
+     * task's initial thread assignment.  The task initially has the default
+     * number of tickets, and is scheduled iff @a schedule is true.
+     *
+     * An assertion will fail if a Task is initialized twice.
+     *
+     * Most elements call ScheduleInfo::initialize_task() to initialize a Task
+     * object.  The ScheduleInfo method additionally sets the task's
+     * scheduling parameters, such as ticket count and thread preference,
+     * based on a router's ScheduleInfo.  ScheduleInfo::initialize_task()
+     * calls Task::initialize(). */
+    void initialize(Element *owner, bool schedule);
+
+    /** @brief Initialize the Task, and optionally schedule it.
+     * @param router specifies the router owning the Task
+     * @param schedule if true, the Task will be scheduled immediately
+     *
+     * This function is shorthand for @link Task::initialize(Element *, bool)
+     * Task::initialize@endlink(@a router ->@link Router::root_element
+     * root_element@endlink(), @a scheduled).  However, it is better to
+     * explicitly associate tasks with real elements. */
+    void initialize(Router *router, bool schedule);
+
+
+    /** @brief Return true iff the task is currently scheduled to run.
+     *
+     * @note A scheduled task will usually run very soon, but not
+     * always; due to locking issues, the effects of some reschedule()
+     * requests may be delayed. Although a task unscheduled with
+     * strong_unschedule() may appear scheduled(), it will not run
+     * until strong_reschedule() is called. */
+    inline bool scheduled() const {
+        return _status.is_scheduled;
+    }
+
+
+    /** @brief Unschedule the task.
+     *
+     * After unschedule() returns, the task will not run until it is
+     * rescheduled with reschedule().
+     *
+     * @sa reschedule, strong_unschedule */
+    inline void unschedule() {
+        _status.is_scheduled = false;
+    }
+
+    /** @brief Reschedule the task.
+     *
+     * The task is rescheduled on its home thread. It will eventually run,
+     * unless its home thread is quiescent or it has been
+     * strong_unschedule()d.
+     *
+     * @sa unschedule, strong_reschedule */
+    inline void reschedule() {
+        _status.is_scheduled = true;
+        click_fence();
+        if (_pending_nextptr.x < 2)
+            complete_schedule(0);
+    }
+
+    /** @brief Reschedule a task from the task's callback function.
+     *
+     * @warning Only call @a task.fast_reschedule() while @a task is being
+     * fired, i.e., in its callback function. It is an error to call
+     * @task.fast_reschedule() at other times -- the task may not actually be
+     * rescheduled.
+     *
+     * Here's a typical, correct use of fast_reschedule():
+     *
+     * @code
+     * class MyElement : public Element {
+     *     ... Task _task; ... bool run_task(Task *t); ...
+     * };
+     * bool MyElement::run_task(Task *) {
+     *     do_some_work();
+     *     _task.fast_reschedule();
+     *     return true;
+     * }
+     * @endcode
+     *
+     * This assumes, however, that run_task() is only called directly by the
+     * driver. If you call run_task() from another context, _task may not
+     * actually be scheduled.
+     *
+     * @code
+     * void MyElement::run_timer(Timer *) {
+     *     run_task();   // XXX might not reschedule _task!
+     * }
+     * @endcode
+     */
+    inline void fast_reschedule() {
+        _status.is_scheduled = true;
+    }
+
+
+    /** @brief Unschedule the Task until strong_reschedule().
+     *
+     * Like unschedule(), but in addition, future reschedule() calls
+     * will not actually schedule the task.  Only after strong_reschedule()
+     * will the task run again.
+     * @sa strong_reschedule, unschedule
+     */
+    inline void strong_unschedule() {
+        _status.is_scheduled = false;
+        _status.is_strong_unscheduled = true;
+    }
+
+    /** @brief Reschedule the Task, undoing a prior strong_unschedule().
+     *
+     * This function undoes any previous strong_unschedule() and
+     * reschedules the task.
+     * @sa reschedule, strong_unschedule
+     */
+    inline void strong_reschedule() {
+        _status.is_strong_unscheduled = false;
+        reschedule();
+    }
+
+
+    /** @brief Move the Task to a new home thread.
+     *
+     * The home thread ID is set to @a new_thread_id.  The task, if it is
+     * currently scheduled, is rescheduled on thread @a new_thread_id
+     * (which generally takes some time to take effect).  If @a new_thread_id
+     * is less than zero or greater than the number of threads on the router,
+     * the task is scheduled on a quiescent thread that never actually runs.
+     */
+    void move_thread(int new_thread_id);
+
+
+#if HAVE_STRIDE_SCHED
+    inline int tickets() const;
+    inline void set_tickets(int n);
+    inline void adjust_tickets(int delta);
+#endif
+
+    inline bool fire();
+
+#if HAVE_ADAPTIVE_SCHEDULER
+    inline unsigned runs() const;
+    inline unsigned work_done() const;
+    inline unsigned utilization() const;
+    inline void clear_runs();
+#endif
+#if HAVE_MULTITHREAD
+    inline int cycles() const;
+    inline unsigned cycle_runs() const;
+    inline void update_cycles(unsigned c);
+#endif
+
+    /** @cond never */
+    inline TaskCallback hook() const CLICK_DEPRECATED;
+    inline void *thunk() const CLICK_DEPRECATED;
+    /** @endcond never */
+
+  private:
+
+#if HAVE_TASK_HEAP
+    int _schedpos;
+#endif
+
+#if HAVE_STRIDE_SCHED
+    unsigned _stride;
+    int _tickets;
+#endif
+
+    union Status {
+        struct {
+            int16_t home_thread_id;
+            uint8_t is_scheduled;
+            uint8_t is_strong_unscheduled;
+        };
+        uint32_t status;
+    } _status;
+
+    TaskCallback _hook;
+    void *_thunk;
+
+#if HAVE_ADAPTIVE_SCHEDULER
+    unsigned _runs;
+    unsigned _work_done;
+#endif
+#if HAVE_MULTITHREAD
+    DirectEWMA _cycles;
+    unsigned _cycle_runs;
+#endif
+
+    RouterThread *_thread;
+
+    Element *_owner;
+
+    union Pending {
+        Task *t;
+        uintptr_t x;
+    };
+    Pending _pending_nextptr;
+
+    Task(const Task &x);
+    Task &operator=(const Task &x);
+    void cleanup();
+
+#if CLICK_DEBUG_SCHEDULING
+ public:
+#endif
+    inline bool on_scheduled_list() const;
+    inline bool on_pending_list() const {
+        return _pending_nextptr.x != 0;
+    }
+    inline bool needs_cleanup() const;
+#if CLICK_DEBUG_SCHEDULING
+ private:
+#endif
+
+    void add_pending(bool always);
+    void process_pending(RouterThread* thread);
+
+    void complete_schedule(RouterThread* process_pending_thread);
+    inline void remove_from_scheduled_list();
+
+    static bool error_hook(Task *task, void *user_data);
+
+    friend class RouterThread;
+    friend class Master;
+};
+
+
+// need RouterThread's definition for inline functions
+CLICK_ENDDECLS
+#include <click/routerthread.hh>
+CLICK_DECLS
+
+
+inline
+Task::Task(TaskCallback f, void *user_data)
+    :
+#if HAVE_TASK_HEAP
+      _schedpos(-1),
+#endif
+#if HAVE_STRIDE_SCHED
+      _stride(0), _tickets(-1),
+#endif
+      _hook(f), _thunk(user_data),
+#if HAVE_ADAPTIVE_SCHEDULER
+      _runs(0), _work_done(0),
+#endif
+#if HAVE_MULTITHREAD
+      _cycle_runs(0),
+#endif
+      _thread(0), _owner(0)
+{
+    _status.home_thread_id = -2;
+    _status.is_scheduled = _status.is_strong_unscheduled = false;
+    _pending_nextptr.x = 0;
+}
+
+inline
+Task::Task(Element* e)
+    :
+#if HAVE_TASK_HEAP
+      _schedpos(-1),
+#endif
+#if HAVE_STRIDE_SCHED
+      _stride(0), _tickets(-1),
+#endif
+      _hook(0), _thunk(e),
+#if HAVE_ADAPTIVE_SCHEDULER
+      _runs(0), _work_done(0),
+#endif
+#if HAVE_MULTITHREAD
+      _cycle_runs(0),
+#endif
+      _thread(0), _owner(0)
+{
+    _status.home_thread_id = -2;
+    _status.is_scheduled = _status.is_strong_unscheduled = false;
+    _pending_nextptr.x = 0;
+}
+
+inline bool
+Task::initialized() const
+{
+    return _owner != 0;
+}
+
+inline bool
+Task::on_scheduled_list() const
+{
+#if HAVE_TASK_HEAP
+    return _schedpos >= 0;
+#else
+    return _prev != 0;
+#endif
+}
+
+inline bool
+Task::needs_cleanup() const
+{
+#if HAVE_TASK_HEAP
+    int a;
+    uintptr_t b;
+    do {
+        a = _schedpos;
+        b = _pending_nextptr.x;
+        click_fence();
+    } while (a != _schedpos || b != _pending_nextptr.x);
+    return a >= 0 || b != 0;
+#else
+    TaskLink* a;
+    uintptr_t b;
+    do {
+        a = _prev;
+        b = _pending_nextptr.x;
+        click_fence();
+    } while (a != _prev || b != _pending_nextptr.x);
+    return a != 0 || b != 0;
+#endif
+}
+
+/** @cond never */
+/** @brief Return the task's callback function.
+ * @deprecated Use callback() instead. */
+inline TaskCallback
+Task::hook() const
+{
+    return _hook;
+}
+
+/** @brief Return the task's callback data.
+ * @deprecated Use user_data() instead. */
+inline void *
+Task::thunk() const
+{
+    return _thunk;
+}
+/** @endcond never */
+
+inline int
+Task::home_thread_id() const
+{
+    return _status.home_thread_id;
+}
+
+inline RouterThread *
+Task::thread() const
+{
+    return _thread;
+}
+
+inline void
+Task::remove_from_scheduled_list()
+{
+    if (on_scheduled_list()) {
+#if HAVE_TASK_HEAP
+        Task *back = _thread->_task_heap.back().t;
+        _thread->_task_heap.pop_back();
+        if (_thread->_task_heap.size() > 0)
+            _thread->task_reheapify_from(_schedpos, back);
+        click_fence();
+        _schedpos = -1;
+#else
+        _next->_prev = _prev;
+        _prev->_next = _next;
+        _next = 0;
+        click_fence();
+        _prev = 0;
+#endif
+    }
+}
+
+#if HAVE_STRIDE_SCHED
+
+/** @brief Return the task's number of tickets.
+ *
+ * Tasks with larger numbers of tickets are scheduled more often.  Tasks are
+ * initialized with tickets() == DEFAULT_TICKETS.
+ *
+ * @sa set_tickets, adjust_tickets
+ */
+inline int
+Task::tickets() const
+{
+    return _tickets;
+}
+
+/** @brief Set the task's ticket count.
+ * @param n the ticket count
+ *
+ * The ticket count @a n is pinned to the range [1, MAX_TICKETS].
+ *
+ * @sa tickets, adjust_tickets
+ */
+inline void
+Task::set_tickets(int n)
+{
+    if (n > MAX_TICKETS)
+        n = MAX_TICKETS;
+    else if (n < 1)
+        n = 1;
+    _tickets = n;
+    _stride = STRIDE1 / n;
+    assert(_stride < MAX_STRIDE);
+}
+
+/** @brief Add @a delta to the Task's ticket count.
+ * @param delta adjustment to the ticket count
+ *
+ * The ticket count cannot be adjusted below 1 or above MAX_TICKETS.
+ *
+ * @sa set_tickets
+ */
+inline void
+Task::adjust_tickets(int delta)
+{
+    set_tickets(_tickets + delta);
+}
+
+#endif /* HAVE_STRIDE_SCHED */
+
+
+/** @brief Fire the task by calling its callback function.
+ *
+ * This function is generally called by the RouterThread implementation; there
+ * should be no need to call it yourself.
+ */
+inline bool
+Task::fire()
+{
+#if CLICK_STATS >= 2
+    click_cycles_t start_cycles = click_get_cycles(),
+        start_child_cycles = _owner->_child_cycles;
+#endif
+#if HAVE_MULTITHREAD
+    _cycle_runs++;
+#endif
+    bool work_done;
+    if (!_hook)
+        work_done = ((Element*)_thunk)->run_task(this);
+    else
+        work_done = _hook(this, _thunk);
+#if HAVE_ADAPTIVE_SCHEDULER
+    ++_runs;
+    _work_done += work_done;
+#endif
+#if CLICK_STATS >= 2
+    click_cycles_t all_delta = click_get_cycles() - start_cycles,
+        own_delta = all_delta - (_owner->_child_cycles - start_child_cycles);
+    _owner->_task_calls += 1;
+    _owner->_task_own_cycles += own_delta;
+#endif
+    return work_done;
+}
+
+#if HAVE_ADAPTIVE_SCHEDULER
+inline unsigned
+Task::runs() const
+{
+    return _runs;
+}
+
+inline unsigned
+Task::work_done() const
+{
+    return _work_done;
+}
+
+inline unsigned
+Task::utilization() const
+{
+    return (_runs ? (MAX_UTILIZATION * _work_done) / _runs : 0);
+}
+
+inline void
+Task::clear_runs()
+{
+    _runs = _work_done = 0;
+}
+#endif
+
+#if HAVE_MULTITHREAD
+inline int
+Task::cycles() const
+{
+    return _cycles.unscaled_average();
+}
+
+inline unsigned
+Task::cycle_runs() const
+{
+    return _cycle_runs;
+}
+
+inline void
+Task::update_cycles(unsigned c)
+{
+    _cycles.update(c);
+    _cycle_runs = 0;
+}
+#endif
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/timer.hh b/openflow/include/click/timer.hh
new file mode 100644
index 0000000..174d570
--- /dev/null
+++ b/openflow/include/click/timer.hh
@@ -0,0 +1,397 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/timer.cc" -*-
+#ifndef CLICK_TIMER_HH
+#define CLICK_TIMER_HH
+#include <click/sync.hh>
+#include <click/glue.hh>
+#include <click/element.hh>
+#include <click/timestamp.hh>
+CLICK_DECLS
+class RouterThread;
+
+typedef void (*TimerCallback)(Timer *timer, void *user_data);
+typedef TimerCallback TimerHook CLICK_DEPRECATED;
+
+class Timer { public:
+
+    /** @brief Construct a Timer that does nothing when fired.
+     *
+     * This constructor is most useful for a Timer that will be assigned a
+     * true callback later, using one of the Timer::assign() methods.
+     * Timer::initialize() will report a warning if called on a Timer created
+     * by this constructor. */
+    Timer();
+
+    struct do_nothing_t {
+    };
+
+    /** @brief Construct a Timer that does nothing when fired.
+     *
+     * Unlike with the default Timer() constructor, Timer::initialize() will
+     * not report a warning if called on a Timer created by this
+     * constructor. */
+    Timer(const do_nothing_t &unused);
+
+    /** @brief Construct a Timer that calls @a f(this, @a user_data) when
+     * fired.
+     * @param f callback function
+     * @param user_data argument for callback function */
+    Timer(TimerCallback f, void *user_data);
+
+    /** @brief Construct a Timer that calls @a element ->@link
+     * Element::run_timer() run_timer@endlink(this) when fired.
+     * @param element the element */
+    Timer(Element *element);
+
+    /** @brief Construct a Timer that schedules @a task when fired.
+     * @param task the task */
+    Timer(Task *task);
+
+    /** @brief Construct a Timer that acts like @a x when fired.
+     *
+     * The newly-constructed Timer is not initialized. */
+    Timer(const Timer &x);
+
+    /** @brief Destroy a Timer, unscheduling it first if necessary. */
+    inline ~Timer() {
+	if (scheduled())
+	    unschedule();
+    }
+
+
+    /** @brief Change the Timer to do nothing when fired. */
+    inline void assign() {
+	_hook.callback = do_nothing_hook;
+	_thunk = (void *) 1;
+    }
+
+    /** @brief Change the Timer to do nothing when fired. */
+    inline void assign(const do_nothing_t &unused) {
+	(void) unused;
+	assign();
+    }
+
+    /** @brief Change the Timer to call @a f(this, @a user_data) when fired.
+     * @param f callback function
+     * @param user_data argument for callback function */
+    inline void assign(TimerCallback f, void *user_data) {
+	_hook.callback = f;
+	_thunk = user_data;
+    }
+
+    /** @brief Change the Timer to call @a element ->@link
+     * Element::run_timer() run_timer@endlink(this) when fired.
+     * @param element the element */
+    void assign(Element *element) {
+	_hook.callback = element_hook;
+	_thunk = element;
+    }
+
+    /** @brief Change the Timer to schedule @a task when fired.
+     * @param task the task */
+    void assign(Task *task) {
+	_hook.callback = task_hook;
+	_thunk = task;
+    }
+
+
+    /** @brief Return true iff the Timer has been initialized. */
+    inline bool initialized() const {
+	return _owner != 0;
+    }
+
+    /** @brief Return true iff the Timer is currently scheduled. */
+    inline bool scheduled() const {
+	return _schedpos1 != 0;
+    }
+
+
+    /** @brief Return the Timer's steady-clock expiration time.
+     *
+     * This is the absolute time, according to the steady clock, at which the
+     * timer is next scheduled to fire.  If the timer is not currently
+     * scheduled, then expiry_steady() returns the last assigned expiration
+     * time.
+     *
+     * @sa expiry() */
+    inline const Timestamp &expiry_steady() const {
+	return _expiry_s;
+    }
+
+    /** @brief Return the Timer's system-clock expiration time.
+     *
+     * Timer expirations are measured using the system's steady clock, which
+     * increases monotonically.  (See Timestamp::now_steady().)  The expiry()
+     * function, however, returns the timer's expiration time according to the
+     * system clock.  This is a calculated value: if the system clock changes
+     * -- because the user changes the current system time, for example --
+     * then the timer's expiry() will also change.  (The timer's
+     * expiry_steady() value will not change, however.)
+     *
+     * @sa expiry_steady() */
+    inline Timestamp expiry() const {
+	if (_expiry_s)
+	    return _expiry_s + Timestamp::recent() - Timestamp::recent_steady();
+	else
+	    return _expiry_s;
+    }
+
+    /** @brief Return the Timer's associated Router. */
+    inline Router *router() const {
+	return _owner->router();
+    }
+
+    /** @brief Return the Timer's owning element. */
+    inline Element *element() const {
+	return _owner;
+    }
+
+    /** @brief Return the Timer's associated RouterThread. */
+    inline RouterThread *thread() const {
+	return _thread;
+    }
+
+    /** @brief Return the Timer's associated home thread ID. */
+    int home_thread_id() const;
+
+
+    /** @brief Initialize the timer.
+     * @param owner the owner element
+     * @param quiet do not produce default-constructor warning if true
+     *
+     * Before a timer can be used, it must be attached to a containing router.
+     * When that router is destroyed, the timer is automatically
+     * unscheduled.  It is safe to initialize the timer multiple times
+     * on the same router.
+     *
+     * If Click is compiled with statistics support, time spent in this
+     * Timer will be charged to the @a owner element.
+     *
+     * Initializing a Timer constructed by the default constructor, Timer(),
+     * will produce a warning. */
+    void initialize(Element *owner, bool quiet = false);
+
+    /** @brief Initialize the timer.
+     * @param router the owner router
+     *
+     * This function is shorthand for @link
+     * Timer::initialize(Element*,bool) Timer::initialize@endlink(@a
+     * router ->@link Router::root_element root_element@endlink()).
+     * However, it is better to explicitly associate timers with real
+     * elements. */
+    void initialize(Router *router);
+
+
+    /** @brief Schedule the timer to fire at @a when_steady.
+     * @param when_steady expiration time according to the steady clock
+     *
+     * If @a when_steady is more than 2 seconds behind the current time, then
+     * the expiration time is silently updated to the current time.
+     *
+     * @sa schedule_at() */
+    void schedule_at_steady(const Timestamp &when_steady);
+
+    /** @brief Schedule the timer to fire at @a when_steady.
+     * @param when_steady expiration time according to the steady clock
+     *
+     * This is a synonym for schedule_at_steady(). */
+    void reschedule_at_steady(const Timestamp &when_steady);
+
+    /** @brief Schedule the timer to fire at @a when.
+     * @param when expiration time according to the system clock
+     *
+     * If @a when is more than 2 seconds behind system time, then the
+     * expiration time is silently updated to the current system time.
+     *
+     * @note The schedule_at_steady() function should generally be preferred
+     * to schedule_at().  schedule_at() is implemented in terms of
+     * schedule_at_steady().
+     *
+     * @sa schedule_at_steady() */
+    inline void schedule_at(const Timestamp &when);
+
+    /** @brief Schedule the timer to fire at @a when.
+     * @param when expiration time
+     *
+     * This is a synonym for schedule_at(). */
+    inline void reschedule_at(const Timestamp &when);
+
+    /** @brief Shedule the timer to fire immediately.
+     *
+     * Equivalent to schedule_at(Timestamp::recent()). */
+    inline void schedule_now() {
+	schedule_at_steady(Timestamp::recent_steady());
+    }
+
+    /** @brief Schedule the timer to fire @a delta time in the future.
+     * @param delta interval until expiration time
+     *
+     * The schedule_after methods schedule the timer relative to the current
+     * time.  When called from a timer's callback function, this will usually
+     * be slightly after the timer's nominal expiration time.  To schedule a
+     * timer at a strict interval, compensating for small amounts of drift,
+     * use the reschedule_after methods. */
+    void schedule_after(const Timestamp &delta);
+
+    /** @brief Schedule the timer to fire after @a delta_sec seconds.
+     * @param delta_sec interval until expiration time, in seconds
+     *
+     * @sa schedule_after, reschedule_after_sec */
+    inline void schedule_after_sec(uint32_t delta_sec) {
+	schedule_after(Timestamp(delta_sec, 0));
+    }
+
+    /** @brief Schedule the timer to fire after @a delta_msec milliseconds.
+     * @param delta_msec interval until expiration time, in milliseconds
+     *
+     * @sa schedule_after, reschedule_after_msec */
+    inline void schedule_after_msec(uint32_t delta_msec) {
+	schedule_after(Timestamp::make_msec(delta_msec));
+    }
+
+    /** @brief Schedule the timer to fire @a delta time after its previous
+     * expiry.
+     * @param delta interval until expiration time
+     *
+     * If the expiration time is too far in the past, then the new expiration
+     * time will be silently updated to the current system time.
+     *
+     * @sa schedule_after */
+    inline void reschedule_after(const Timestamp &delta) {
+	schedule_at_steady(_expiry_s + delta);
+    }
+
+    /** @brief Schedule the timer to fire @a delta_sec seconds after its
+     * previous expiry.
+     * @param delta_sec interval until expiration time, in seconds
+     *
+     * @sa schedule_after_sec, reschedule_after */
+    inline void reschedule_after_sec(uint32_t delta_sec) {
+	schedule_at_steady(Timestamp(_expiry_s.sec() + delta_sec, _expiry_s.subsec()));
+    }
+
+    /** @brief Schedule the timer to fire @a delta_msec milliseconds after its
+     * previous expiry.
+     * @param delta_msec interval until expiration time, in milliseconds
+     *
+     * @sa schedule_after_msec, reschedule_after */
+    inline void reschedule_after_msec(uint32_t delta_msec) {
+	schedule_at_steady(_expiry_s + Timestamp::make_msec(delta_msec));
+    }
+
+
+    /** @brief Unschedule the timer.
+     *
+     * The timer's expiration time is not modified. */
+    void unschedule();
+
+    /** @brief Unschedule the timer and reset its expiration time. */
+    inline void clear() {
+	unschedule();
+	_expiry_s = Timestamp();
+    }
+
+
+    /** @brief Return an adjustment interval useful for precise timers.
+     *
+     * Due to scheduling granularity, other tasks running on the same machine,
+     * and similar effects, a Timer object can trigger some time after its
+     * nominal expiry().  Functions that require precise timers should combine
+     * a Timer and a Task object.  The Timer's job is to schedule the Task;
+     * the Timer's expiry is set to go off a short interval before the true
+     * expiry, and the Task is used to busy-wait the difference.
+     * Timer::adjustment() is an appropriate value for this time
+     * difference. */
+    static inline Timestamp adjustment() {
+#if TIMESTAMP_WARPABLE
+	if (Timestamp::warp_jumping())
+	    return Timestamp();
+#endif
+	return Timestamp::make_usec(500);
+    }
+
+
+    /** @brief Schedule the timer to fire after @a delta_sec seconds
+     * (deprecated).
+     *
+     * @deprecated Use schedule_after_sec() instead. */
+    inline void schedule_after_s(uint32_t delta_sec) CLICK_DEPRECATED;
+
+    /** @brief Schedule the timer to fire after @a delta_msec milliseconds
+     * (deprecated).
+     *
+     * @deprecated Use schedule_after_msec() instead. */
+    inline void schedule_after_ms(uint32_t delta_sec) CLICK_DEPRECATED;
+
+    /** @brief Schedule the timer to fire @a delta_sec seconds after its
+     * previous expiry time (deprecated).
+     *
+     * @deprecated Use reschedule_after_sec() instead. */
+    inline void reschedule_after_s(uint32_t delta_sec) CLICK_DEPRECATED;
+
+    /** @brief Schedule the timer to fire @a delta_msec milliseconds after its
+     * previous expiry time (deprecated).
+     *
+     * @deprecated Use reschedule_after_msec() instead. */
+    inline void reschedule_after_ms(uint32_t delta_sec) CLICK_DEPRECATED;
+
+    enum { behind_sec = 1 };
+
+  private:
+
+    int _schedpos1;
+    Timestamp _expiry_s;
+    union {
+	TimerCallback callback;
+    } _hook;
+    void *_thunk;
+    Element *_owner;
+    RouterThread *_thread;
+
+    Timer &operator=(const Timer &x);
+
+    static void do_nothing_hook(Timer *t, void *user_data);
+    static void element_hook(Timer *t, void *user_data);
+    static void task_hook(Timer *t, void *user_data);
+
+    friend class TimerSet;
+
+};
+
+inline void
+Timer::schedule_at(const Timestamp &when)
+{
+    schedule_at_steady(when + Timestamp::recent_steady() - Timestamp::recent());
+}
+
+inline void
+Timer::reschedule_at(const Timestamp &when)
+{
+    schedule_at(when);
+}
+
+inline void
+Timer::schedule_after_s(uint32_t delta_sec)
+{
+    schedule_after_sec(delta_sec);
+}
+
+inline void
+Timer::schedule_after_ms(uint32_t delta_msec)
+{
+    schedule_after_msec(delta_msec);
+}
+
+inline void
+Timer::reschedule_after_s(uint32_t delta_sec)
+{
+    reschedule_after_sec(delta_sec);
+}
+
+inline void
+Timer::reschedule_after_ms(uint32_t delta_msec)
+{
+    reschedule_after_msec(delta_msec);
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/timerset.hh b/openflow/include/click/timerset.hh
new file mode 100644
index 0000000..9f38485
--- /dev/null
+++ b/openflow/include/click/timerset.hh
@@ -0,0 +1,162 @@
+// -*- related-file-name: "../../lib/timerset.cc" -*-
+#ifndef CLICK_TIMERSET_HH
+#define CLICK_TIMERSET_HH 1
+#include <click/timer.hh>
+#include <click/sync.hh>
+#include <click/vector.hh>
+CLICK_DECLS
+class Router;
+class RouterThread;
+class Timer;
+
+class TimerSet { public:
+
+    TimerSet();
+
+    Timestamp timer_expiry_steady() const	{ return _timer_expiry; }
+    inline Timestamp timer_expiry_steady_adjusted() const;
+#if CLICK_USERLEVEL
+    inline int next_timer_delay(bool more_tasks, Timestamp &t) const;
+#endif
+
+    Timer *next_timer();			// useful for benchmarking
+
+    unsigned max_timer_stride() const		{ return _max_timer_stride; }
+    unsigned timer_stride() const		{ return _timer_stride; }
+    void set_max_timer_stride(unsigned timer_stride);
+
+    void kill_router(Router *router);
+
+    void run_timers(RouterThread *thread, Master *master);
+
+    inline void fence();
+
+  private:
+
+    struct heap_element {
+	Timestamp expiry_s;
+	Timer *t;
+#if SIZEOF_VOID_P == 4
+	uint32_t padding; /* the structure should have size 16 */
+#endif
+	heap_element(Timer *t_)
+	    : expiry_s(t_->expiry_steady()), t(t_) {
+	}
+    };
+    struct heap_less {
+	inline bool operator()(const heap_element &a, const heap_element &b) {
+	    return a.expiry_s < b.expiry_s;
+	}
+    };
+    struct heap_place {
+	inline void operator()(heap_element *begin, heap_element *t) {
+	    t->t->_schedpos1 = (t - begin) + 1;
+	}
+    };
+
+    // Most likely _timer_expiry now fits in a cache line
+    Timestamp _timer_expiry CLICK_ALIGNED(8);
+
+    unsigned _max_timer_stride;
+    unsigned _timer_stride;
+    unsigned _timer_count;
+    Vector<heap_element> _timer_heap;
+    Vector<Timer *> _timer_runchunk;
+    SimpleSpinlock _timer_lock;
+#if CLICK_LINUXMODULE
+    struct task_struct *_timer_task;
+#elif HAVE_MULTITHREAD
+    click_processor_t _timer_processor;
+#endif
+    Timestamp _timer_check;
+    uint32_t _timer_check_reports;
+
+    inline void run_one_timer(Timer *);
+
+    void set_timer_expiry() {
+	if (_timer_heap.size())
+	    _timer_expiry = _timer_heap.unchecked_at(0).expiry_s;
+	else
+	    _timer_expiry = Timestamp();
+    }
+    void check_timer_expiry(Timer *t);
+
+    inline void lock_timers();
+    inline bool attempt_lock_timers();
+    inline void unlock_timers();
+
+    friend class Timer;
+
+};
+
+inline Timestamp
+TimerSet::timer_expiry_steady_adjusted() const
+{
+    Timestamp e = _timer_expiry;
+#if TIMESTAMP_WARPABLE
+    if (likely(!Timestamp::warp_jumping())) {
+#endif
+    if (_timer_stride >= 8 || !e)
+	/* do nothing */;
+    else if (_timer_stride >= 4)
+	e -= Timer::adjustment();
+    else
+	e -= Timer::adjustment() + Timer::adjustment();
+#if TIMESTAMP_WARPABLE
+    }
+#endif
+    return e;
+}
+
+inline void
+TimerSet::lock_timers()
+{
+#if CLICK_LINUXMODULE
+    if (current != _timer_task)
+	_timer_lock.acquire();
+#elif HAVE_MULTITHREAD
+    if (click_current_processor() != _timer_processor)
+	_timer_lock.acquire();
+#endif
+}
+
+inline bool
+TimerSet::attempt_lock_timers()
+{
+#if CLICK_LINUXMODULE || HAVE_MULTITHREAD
+    return _timer_lock.attempt();
+#else
+    return true;
+#endif
+}
+
+inline void
+TimerSet::unlock_timers()
+{
+#if CLICK_LINUXMODULE
+    if (current != _timer_task)
+	_timer_lock.release();
+#elif HAVE_MULTITHREAD
+    if (click_current_processor() != _timer_processor)
+	_timer_lock.release();
+#endif
+}
+
+inline void
+TimerSet::fence()
+{
+    lock_timers();
+    unlock_timers();
+}
+
+inline Timer *
+TimerSet::next_timer()
+{
+    lock_timers();
+    Timer *t = _timer_heap.empty() ? 0 : _timer_heap.unchecked_at(0).t;
+    unlock_timers();
+    return t;
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/timestamp.hh b/openflow/include/click/timestamp.hh
new file mode 100644
index 0000000..9b8e773
--- /dev/null
+++ b/openflow/include/click/timestamp.hh
@@ -0,0 +1,1540 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/timestamp.cc" -*-
+#ifndef CLICK_TIMESTAMP_HH
+#define CLICK_TIMESTAMP_HH
+#include <click/glue.hh>
+#include <click/type_traits.hh>
+#include <click/integers.hh>
+#if !CLICK_LINUXMODULE && !CLICK_BSDMODULE
+# include <math.h>
+#endif
+CLICK_DECLS
+class String;
+class Timestamp;
+Timestamp operator+(Timestamp, const Timestamp &);
+
+// Timestamp has three possible internal representations, selected by #defines.
+// * TIMESTAMP_REP_FLAT64: a 64-bit integer number of nanoseconds
+// * TIMESTAMP_REP_BIG_ENDIAN: 32 bits of seconds plus 32 bits of subseconds
+// * TIMESTAMP_REP_LITTLE_ENDIAN: 32 bits of subseconds plus 32 bits of seconds
+//
+// Rationale: The linuxmodule driver must select the same representation as
+// Linux's sk_buff tstamp member, which may use any of these representations.
+// (Linuxmodule Packet objects are equivalent to sk_buffs, and
+// Packet::timestamp_anno() maps to sk_buff::tstamp.  We want to avoid
+// conversion expense when accessing timestamp_anno().  More seriously, it is
+// very convenient to treat timestamp_anno() as a modifiable reference.)
+
+#if !TIMESTAMP_REP_FLAT64 && !TIMESTAMP_REP_BIG_ENDIAN && !TIMESTAMP_REP_LITTLE_ENDIAN
+# if CLICK_LINUXMODULE
+#  if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
+#   define TIMESTAMP_REP_BIG_ENDIAN 1
+#  elif BITS_PER_LONG == 64 || defined(CONFIG_KTIME_SCALAR)
+#   define TIMESTAMP_REP_FLAT64 1
+#  elif defined(__BIG_ENDIAN)
+#   define TIMESTAMP_REP_BIG_ENDIAN 1
+#  else
+#   define TIMESTAMP_REP_LITTLE_ENDIAN 1
+#  endif
+# elif HAVE_INT64_TYPES && SIZEOF_LONG == 8
+#  define TIMESTAMP_REP_FLAT64 1
+# elif HAVE_INT64_TYPES && CLICK_BYTE_ORDER == CLICK_LITTLE_ENDIAN
+#  define TIMESTAMP_REP_LITTLE_ENDIAN 1
+# else
+#  define TIMESTAMP_REP_BIG_ENDIAN 1
+# endif
+#endif
+
+
+// Timestamp can use microsecond or nanosecond precision.  Nanosecond
+// precision is used if TIMESTAMP_NANOSEC == 1.  In the Linux kernel, we
+// choose what Linux uses for sk_buff::tstamp.  Elsewhere, we default to
+// microsecond precision (XXX); "./configure --enable-nanotimestamp" selects
+// nanosecond precision.
+
+#ifndef TIMESTAMP_NANOSEC
+# if CLICK_LINUXMODULE
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+#   define TIMESTAMP_NANOSEC 1
+#  endif
+# endif
+#endif
+
+
+// Define TIMESTAMP_MATH_FLAT64 if despite a seconds-and-subseconds
+// representation, 64-bit arithmetic should be used for timestamp addition,
+// subtraction, and comparisons.  This can be faster than operating on two
+// separate 32-bit integers.
+
+#if HAVE_INT64_TYPES && !TIMESTAMP_REP_FLAT64
+# if (TIMESTAMP_REP_BIG_ENDIAN && CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN) \
+    || (TIMESTAMP_REP_LITTLE_ENDIAN && CLICK_BYTE_ORDER == CLICK_LITTLE_ENDIAN)
+#  define TIMESTAMP_MATH_FLAT64 1
+# endif
+#endif
+
+
+// If a Timestamp's internal representation is identical to struct timespec
+// or struct timeval, define TIMESTAMP_PUNS_TIMESPEC or TIMESTAMP_PUNS_TIMEVAL.
+
+#if TIMESTAMP_REP_BIG_ENDIAN
+# if !TIMESTAMP_NANOSEC && SIZEOF_STRUCT_TIMEVAL == 8
+#  define TIMESTAMP_PUNS_TIMEVAL 1
+# elif TIMESTAMP_NANOSEC && HAVE_STRUCT_TIMESPEC && SIZEOF_STRUCT_TIMESPEC == 8
+#  define TIMESTAMP_PUNS_TIMESPEC 1
+# endif
+#endif
+
+
+// Timestamp::value_type is the type of arguments to, for example,
+// Timestamp::make_msec(), and should be as large as possible.  This is
+// int64_t at userlevel.  In the linuxmodule driver, int64_t can only be used
+// if the relevant Linux provides 64-bit divide, which is do_div.
+// TIMESTAMP_VALUE_INT64 is defined to 1 if Timestamp::value_type is int64_t.
+
+#if !defined(TIMESTAMP_VALUE_INT64) && HAVE_INT64_TYPES
+# if CLICK_LINUXMODULE && defined(do_div)
+#  define TIMESTAMP_VALUE_INT64 1
+# elif !CLICK_LINUXMODULE && !CLICK_BSDMODULE
+#  define TIMESTAMP_VALUE_INT64 1
+# endif
+#endif
+
+
+// PRITIMESTAMP is a printf format string for Timestamps.  The corresponding
+// printf argument list is Timestamp::sec() and Timestamp::subsec(), in that
+// order.
+
+#if TIMESTAMP_NANOSEC
+# define PRITIMESTAMP "%d.%09d"
+#else
+# define PRITIMESTAMP "%d.%06d"
+#endif
+
+
+// TIMESTAMP_WARPABLE is defined if this Timestamp implementation supports
+// timewarping.
+
+#if !CLICK_LINUXMODULE && !CLICK_BSDMODULE && !CLICK_NS
+# define TIMESTAMP_WARPABLE 1
+#endif
+
+
+class Timestamp { public:
+
+    /** @brief  Type represents a number of seconds. */
+    typedef int32_t seconds_type;
+    /** @brief  Return type for msecval(), usecval(), and nsecval(). */
+#if TIMESTAMP_VALUE_INT64
+    typedef int64_t value_type;
+#else
+    typedef int32_t value_type;
+#endif
+
+    enum {
+        max_seconds = (seconds_type) 2147483647U,
+                        /**< Maximum number of seconds representable in a
+                             Timestamp. */
+        min_seconds = (seconds_type) -2147483648U
+                        /**< Minimum number of seconds representable in a
+                             Timestamp. */
+    };
+
+    enum {
+        nsec_per_sec = 1000000000,
+        nsec_per_msec = 1000000,
+        nsec_per_usec = 1000,
+        usec_per_sec = 1000000,
+        usec_per_msec = 1000,
+        msec_per_sec = 1000,
+#if TIMESTAMP_NANOSEC
+        subsec_per_sec = nsec_per_sec,
+                                /**< Number of subseconds in a second.  Can be
+                                     1000000 or 1000000000, depending on how
+                                     Click is compiled. */
+#else
+        subsec_per_sec = usec_per_sec,
+#endif
+        subsec_per_msec = subsec_per_sec / msec_per_sec,
+        subsec_per_usec = subsec_per_sec / usec_per_sec
+#if CLICK_NS
+        , schedule_granularity = usec_per_sec
+#endif
+    };
+
+    enum {
+        NSUBSEC = subsec_per_sec
+    };
+
+    typedef uninitialized_type uninitialized_t;
+
+    union rep_t;
+
+
+    /** @brief Construct a zero-valued Timestamp. */
+    inline Timestamp() {
+        assign(0, 0);
+    }
+
+    /** @brief Construct a Timestamp of @a sec seconds plus @a subsec
+     *     subseconds.
+     * @param sec number of seconds
+     * @param subsec number of subseconds (defaults to 0)
+     *
+     * The @a subsec parameter must be between 0 and subsec_per_sec - 1, and
+     * the @a sec parameter must be between @link Timestamp::min_seconds
+     * min_seconds @endlink and @link Timestamp::max_seconds max_seconds
+     * @endlink.  Errors are not necessarily checked. */
+    explicit inline Timestamp(long sec, uint32_t subsec = 0) {
+        assign(sec, subsec);
+    }
+    /** @overload */
+    explicit inline Timestamp(int sec, uint32_t subsec = 0) {
+        assign(sec, subsec);
+    }
+    /** @overload */
+    explicit inline Timestamp(unsigned long sec, uint32_t subsec = 0) {
+        assign(sec, subsec);
+    }
+    /** @overload */
+    explicit inline Timestamp(unsigned sec, uint32_t subsec = 0) {
+        assign(sec, subsec);
+    }
+#if HAVE_FLOAT_TYPES
+    explicit inline Timestamp(double);
+#endif
+
+    inline Timestamp(const struct timeval &tv);
+#if HAVE_STRUCT_TIMESPEC
+    inline Timestamp(const struct timespec &ts);
+#endif
+
+    /** @brief Construct a Timestamp from its internal representation. */
+    inline Timestamp(const rep_t &rep)
+        : _t(rep) {
+    }
+
+    /** @brief Construct an uninitialized timestamp. */
+    inline Timestamp(const uninitialized_t &unused) {
+        (void) unused;
+    }
+
+    typedef seconds_type (Timestamp::*unspecified_bool_type)() const;
+    inline operator unspecified_bool_type() const;
+
+    /** @brief Test if this Timestamp is negative (< Timestamp(0, 0)). */
+    inline bool is_negative() const {
+#if TIMESTAMP_REP_FLAT64 || TIMESTAMP_MATH_FLAT64
+        return _t.x < 0;
+#else
+        return sec() < 0;
+#endif
+    }
+
+    inline seconds_type sec() const;
+    inline uint32_t subsec() const;
+    inline uint32_t msec() const;
+    inline uint32_t usec() const;
+    inline uint32_t nsec() const;
+
+    inline void set_sec(seconds_type sec);
+    inline void set_subsec(uint32_t subsec);
+
+    inline seconds_type msec1() const CLICK_DEPRECATED;
+    inline seconds_type usec1() const CLICK_DEPRECATED;
+    inline seconds_type nsec1() const CLICK_DEPRECATED;
+
+#if TIMESTAMP_PUNS_TIMEVAL
+    inline const struct timeval &timeval() const;
+    inline const struct timeval &timeval_ceil() const;
+#else
+    inline struct timeval timeval() const;
+    inline struct timeval timeval_ceil() const;
+#endif
+#if HAVE_STRUCT_TIMESPEC
+# if TIMESTAMP_PUNS_TIMESPEC
+    inline const struct timespec &timespec() const;
+# else
+    inline struct timespec timespec() const;
+# endif
+#endif
+
+#if HAVE_FLOAT_TYPES
+    inline double doubleval() const;
+#endif
+    /** @brief Return this timestamp's interval length in milliseconds. */
+    inline value_type msecval() const {
+#if TIMESTAMP_REP_FLAT64
+        return value_div(_t.x, subsec_per_sec / msec_per_sec);
+#else
+        return (value_type) _t.sec * msec_per_sec + subsec_to_msec(_t.subsec);
+#endif
+    }
+    /** @brief Return this timestamp's interval length in microseconds. */
+    inline value_type usecval() const {
+#if TIMESTAMP_REP_FLAT64
+        return value_div(_t.x, subsec_per_sec / usec_per_sec);
+#else
+        return (value_type) _t.sec * usec_per_sec + subsec_to_usec(_t.subsec);
+#endif
+    }
+    /** @brief Return this timestamp's interval length in nanoseconds. */
+    inline value_type nsecval() const {
+#if TIMESTAMP_REP_FLAT64
+        return _t.x * (nsec_per_sec / subsec_per_sec);
+#else
+        return (value_type) _t.sec * nsec_per_sec + subsec_to_nsec(_t.subsec);
+#endif
+    }
+
+    /** @brief Return the next millisecond-valued timestamp no smaller than *this. */
+    inline Timestamp msec_ceil() const {
+        uint32_t x = subsec() % subsec_per_msec;
+        return (x ? *this + Timestamp(0, subsec_per_msec - x) : *this);
+    }
+    /** @brief Return the next microsecond-valued timestamp no smaller than *this. */
+    inline Timestamp usec_ceil() const {
+#if TIMESTAMP_NANOSEC
+        uint32_t x = subsec() % subsec_per_usec;
+        return (x ? *this + Timestamp(0, subsec_per_usec - x) : *this);
+#else
+        return *this;
+#endif
+    }
+    /** @brief Return the next nanosecond-valued timestamp no smaller than *this. */
+    inline Timestamp nsec_ceil() const {
+        return *this;
+    }
+
+#if !CLICK_TOOL
+    /** @brief Return a timestamp representing an interval of @a jiffies. */
+    static inline Timestamp make_jiffies(click_jiffies_t jiffies);
+    /** @overload */
+    static inline Timestamp make_jiffies(click_jiffies_difference_t jiffies);
+    /** @brief Return the number of jiffies represented by this timestamp. */
+    inline click_jiffies_t jiffies() const;
+#endif
+
+    /** @brief Return a timestamp representing @a sec seconds. */
+    static inline Timestamp make_sec(seconds_type sec) {
+        return Timestamp(sec, 0);
+    }
+    /** @brief Return a timestamp representing @a sec seconds plus @a msec
+     *  milliseconds.
+     *  @pre 0 <= @a msec < 1000 */
+    static inline Timestamp make_msec(seconds_type sec, uint32_t msec) {
+        return Timestamp(sec, msec_to_subsec(msec));
+    }
+    /** @brief Return a timestamp representing @a msec milliseconds. */
+    static inline Timestamp make_msec(value_type msec) {
+        Timestamp t = Timestamp::uninitialized_t();
+#if TIMESTAMP_REP_FLAT64
+        t._t.x = msec * (subsec_per_sec / msec_per_sec);
+#else
+        value_div_mod(t._t.sec, t._t.subsec, msec, msec_per_sec);
+        t._t.subsec *= subsec_per_sec / msec_per_sec;
+#endif
+        return t;
+    }
+    /** @brief Return a timestamp representing @a sec seconds plus @a usec
+     *  microseconds.
+     *  @pre 0 <= @a usec < 1000000 */
+    static inline Timestamp make_usec(seconds_type sec, uint32_t usec) {
+        return Timestamp(sec, usec_to_subsec(usec));
+    }
+    /** @brief Return a timestamp representing @a usec microseconds. */
+    static inline Timestamp make_usec(value_type usec) {
+        Timestamp t = Timestamp::uninitialized_t();
+#if TIMESTAMP_REP_FLAT64
+        t._t.x = usec * (subsec_per_sec / usec_per_sec);
+#else
+        value_div_mod(t._t.sec, t._t.subsec, usec, usec_per_sec);
+        t._t.subsec *= subsec_per_sec / usec_per_sec;
+#endif
+        return t;
+    }
+    /** @brief Return a timestamp representing @a sec seconds plus @a nsec
+     *  nanoseconds.
+     *  @pre 0 <= @a nsec < 1000000000 */
+    static inline Timestamp make_nsec(seconds_type sec, uint32_t nsec) {
+        return Timestamp(sec, nsec_to_subsec(nsec));
+    }
+    /** @brief Return a timestamp representing @a nsec nanoseconds. */
+    static inline Timestamp make_nsec(value_type nsec) {
+        Timestamp t = Timestamp::uninitialized_t();
+#if TIMESTAMP_REP_FLAT64
+        t._t.x = value_div(nsec, nsec_per_sec / subsec_per_sec);
+#else
+        value_div_mod(t._t.sec, t._t.subsec, nsec, nsec_per_sec);
+        t._t.subsec /= nsec_per_sec / subsec_per_sec;
+#endif
+        return t;
+    }
+
+
+    /** @brief Return the smallest nonzero timestamp, Timestamp(0, 1). */
+    static inline Timestamp epsilon() {
+        return Timestamp(0, 1);
+    }
+
+    /** @brief Clear this timestamp. */
+    inline void clear() {
+        assign(0, 0);
+    }
+
+
+    /** Set this timestamp to a seconds-and-subseconds value.
+     *
+     * @sa Timestamp(int, int) */
+    inline void assign(seconds_type sec, uint32_t subsec = 0) {
+#if TIMESTAMP_REP_FLAT64
+        _t.x = (int64_t) sec * subsec_per_sec + subsec;
+#else
+        _t.sec = sec;
+        _t.subsec = subsec;
+#endif
+    }
+    /** Assign this timestamp to a seconds-and-microseconds value. */
+    inline void assign_usec(seconds_type sec, uint32_t usec) {
+        assign(sec, usec_to_subsec(usec));
+    }
+    /** Assign this timestamp to a seconds-and-nanoseconds value. */
+    inline void assign_nsec(seconds_type sec, uint32_t nsec) {
+        assign(sec, nsec_to_subsec(nsec));
+    }
+
+    /** @cond never */
+    /** Assign this timestamp to a seconds-and-subseconds value.
+     * @deprecated Use assign() instead. */
+    inline void set(seconds_type sec, uint32_t subsec = 0) CLICK_DEPRECATED;
+    /** Assign this timestamp to a seconds-and-microseconds value.
+     * @deprecated Use assign_usec() instead. */
+    inline void set_usec(seconds_type sec, uint32_t usec) CLICK_DEPRECATED;
+    /** Assign this timestamp to a seconds-and-nanoseconds value.
+     * @deprecated Use assign_nsec() instead. */
+    inline void set_nsec(seconds_type sec, uint32_t nsec) CLICK_DEPRECATED;
+    /** @brief Deprecated synonym for assign_now().
+     * @deprecated Use Timestamp::assign_now() instead. */
+    inline void set_now() CLICK_DEPRECATED;
+    /** @endcond never */
+#if !CLICK_LINUXMODULE && !CLICK_BSDMODULE && !CLICK_MINIOS
+    int set_timeval_ioctl(int fd, int ioctl_selector);
+#endif
+
+
+    /** @brief Return the current system time.
+     *
+     * System time is measured in seconds since January 1, 1970 GMT.
+     * Produces the most precise timestamp available.
+     *
+     * @note System time can jump forwards or backwards as a result of user
+     * actions.  For a clock that never moves backwards, see now_steady().
+     * @sa recent(), assign_now(), now_steady() */
+    static inline Timestamp now();
+
+    /** @brief Set this timestamp to the current system time.
+     *
+     * Like "*this = Timestamp::now()".
+     * @sa now(), assign_recent() */
+    inline void assign_now();
+
+    /** @brief Return a recent system time.
+     *
+     * The Timestamp::now() function calculates the current system time, which
+     * is relatively expensive.  Timestamp::recent() can be faster, but is
+     * less precise: it returns a cached copy of a recent system time.
+     * @sa now(), assign_recent() */
+    static inline Timestamp recent();
+
+    /** @brief Set this timestamp to a recent system time.
+     *
+     * Like "*this = Timestamp::recent()".
+     * @sa recent(), assign_now() */
+    inline void assign_recent();
+
+
+    /** @brief Return the current steady-clock time.
+     *
+     * The steady clock, often called a monotonic clock, is a system clock
+     * that never moves backwards.  Steady-clock time is measured in seconds
+     * since an undefined start point (often related to the most recent boot).
+     * Produces the most precise timestamp available.
+     *
+     * @note Steady-clock times and system times are incomparable, since they
+     * have different start points.
+     *
+     * @sa recent_steady(), assign_now_steady() */
+    static inline Timestamp now_steady();
+
+    /** @brief Set this timestamp to the current steady-clock time.
+     *
+     * Like "*this = Timestamp::now_steady()".
+     * @sa now_steady() */
+    inline void assign_now_steady();
+
+    /** @brief Return a recent steady-clock time.
+     *
+     * The Timestamp::now_steady() function calculates the current
+     * steady-clock time, which is relatively expensive.
+     * Timestamp::recent_steady() can be faster, but is less precise: it
+     * returns a cached copy of a recent steady-clock time.
+     * @sa now_steady(), assign_recent_steady() */
+    static inline Timestamp recent_steady();
+
+    /** @brief Set this timestamp to a recent steady-clock time.
+     *
+     * Like "*this = Timestamp::recent_steady()".
+     * @sa recent_steady(), assign_now_steady() */
+    inline void assign_recent_steady();
+
+
+    /** @brief Unparse this timestamp into a String.
+     *
+     * Returns a string formatted like "10.000000", with at least six
+     * subsecond digits.  (Nanosecond-precision timestamps where the number of
+     * nanoseconds is not evenly divisible by 1000 are given nine subsecond
+     * digits.) */
+    String unparse() const;
+
+    /** @brief Unparse this timestamp into a String as an interval.
+     *
+     * Returns a string formatted like "1us" or "1.000002s". */
+    String unparse_interval() const;
+
+
+    /** @brief Convert milliseconds to subseconds.
+     *
+     * Subseconds are either microseconds or nanoseconds, depending on
+     * configuration options and driver choice.
+     * @sa usec_to_subsec(), nsec_to_subsec(), subsec_to_msec(),
+     * subsec_to_usec(), subsec_to_nsec() */
+    inline static uint32_t msec_to_subsec(uint32_t msec) {
+        return msec * (subsec_per_sec / msec_per_sec);
+    }
+    /** @brief Convert microseconds to subseconds. */
+    inline static uint32_t usec_to_subsec(uint32_t usec) {
+        return usec * (subsec_per_sec / usec_per_sec);
+    }
+    /** @brief Convert nanoseconds to subseconds. */
+    inline static uint32_t nsec_to_subsec(uint32_t nsec) {
+        return nsec / (nsec_per_sec / subsec_per_sec);
+    }
+    /** @brief Convert subseconds to milliseconds. */
+    inline static uint32_t subsec_to_msec(uint32_t subsec) {
+        return subsec / (subsec_per_sec / msec_per_sec);
+    }
+    /** @brief Convert subseconds to microseconds. */
+    inline static uint32_t subsec_to_usec(uint32_t subsec) {
+        return subsec / (subsec_per_sec / usec_per_sec);
+    }
+    /** @brief Convert subseconds to nanoseconds. */
+    inline static uint32_t subsec_to_nsec(uint32_t subsec) {
+        return subsec * (nsec_per_sec / subsec_per_sec);
+    }
+
+
+    /** @brief  Type of a Timestamp representation.
+     *
+     * This type is rarely useful for Timestamp users; we export it to avoid
+     * strict-aliasing warnings in unions. */
+    union rep_t {
+#if TIMESTAMP_REP_FLAT64 || TIMESTAMP_MATH_FLAT64
+        int64_t x;
+#endif
+#if TIMESTAMP_REP_BIG_ENDIAN
+        struct {
+            int32_t sec;
+            int32_t subsec;
+        };
+#elif TIMESTAMP_REP_LITTLE_ENDIAN
+        struct {
+            int32_t subsec;
+            int32_t sec;
+        };
+#endif
+#if CLICK_LINUXMODULE
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+        ktime_t ktime;
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+        skb_timeval skbtime;
+# endif
+#endif
+#if TIMESTAMP_PUNS_TIMEVAL
+        struct timeval tv;
+#elif TIMESTAMP_PUNS_TIMESPEC
+        struct timespec tspec;
+#endif
+    };
+
+#if TIMESTAMP_WARPABLE
+    /** @name Timewarping */
+    //@{
+    enum warp_class_type {
+        warp_none = 0,          ///< Run in real time (the default).
+        warp_linear = 1,        ///< Run in speeded-up or slowed-down real time.
+        warp_nowait = 2,        ///< Run in speeded-up or slowed-down real time,
+                                //   but don't wait for timers.
+        warp_simulation = 3     ///< Run in simulation time.
+    };
+
+
+    /** @brief Return the active timewarp class. */
+    static inline int warp_class();
+
+    /** @brief Return the timewarp speed.
+     *
+     * Timewarp speed measures how much faster Timestamp::now() appears to
+     * move compared with wall-clock time.  Only meaningful if warp_class() is
+     * #warp_linear or #warp_nowait. */
+    static inline double warp_speed();
+
+
+    /** @brief Set the timewarp class to @a w.
+     * @param w warp class
+     * @param s speed (\> 0, meaningful when @a w == #warp_linear)
+     *
+     * The timewarp classes are as follows:
+     *
+     * <dl>
+     * <dt>#warp_none</dt>
+     * <dd>Click time corresponds to real time.  This is the default.</dd>
+     *
+     * <dt>#warp_linear</dt>
+     * <dd>Click time is a speeded-up or slowed-down version of real time.
+     * The speedup factor is @a s.  If @a s \> 1, then time as measured by
+     * Timestamp::now() will appear to move a factor of @a s faster than real
+     * time: for instance, a Timer set using Timer::schedule_after_s(2) from
+     * now will fire after just 1 second of wall-clock time.</dd>
+     *
+     * <dt>#warp_nowait</dt>
+     * <dd>Like #warp_linear, but the Click driver never waits for a timer to
+     * expire.  Instead, time appears to "jump" ahead to the next expiration
+     * time.</dd>
+     *
+     * <dt>#warp_simulation</dt>
+     * <dd>Click time is completely divorced from real time.  Every call to
+     * Timestamp::now() appears to increase the current time by
+     * Timestamp::epsilon() and the Click driver never waits for a timer to
+     * expire.  This mode effectively turns Click into an event-driven
+     * simulator.</dd>
+     * </dl>
+     */
+    static void warp_set_class(warp_class_type w, double s = 1.0);
+
+    /** @brief Reset current time.
+     * @a t_system new system time
+     * @a t_steady new steady-clock time
+     *
+     * Only usable when warp_class() is not #warp_none. */
+    static void warp_set_now(const Timestamp &t_system, const Timestamp &t_steady);
+
+
+    /** @brief Return the wall-clock time corresponding to a delay. */
+    inline Timestamp warp_real_delay() const;
+
+    /** @brief Return true iff time skips ahead around timer expirations. */
+    static inline bool warp_jumping();
+
+    /** @brief Move Click time past a timer expiration.
+     *
+     * Does nothing if warp_jumping() is false or @a expiry is in the past. */
+    static void warp_jump_steady(const Timestamp &expiry);
+
+
+    /** @brief Return the warp-free current system time.
+     *
+     * Like now(), but the time returned is unaffected by timewarping.
+     * @sa now(), assign_now_unwarped() */
+    static inline Timestamp now_unwarped();
+
+    /** @brief Set this timestamp to the warp-free current system time.
+     *
+     * Like assign_now(), but the time assigned is unaffected by timewarping.
+     * @sa assign_now(), now_unwarped() */
+    inline void assign_now_unwarped();
+
+    /** @brief Return the warp-free current steady-clock time.
+     *
+     * Like now_steady(), but the time returned is unaffected by timewarping.
+     * @sa now_steady(), assign_now_steady_unwarped() */
+    static inline Timestamp now_steady_unwarped();
+
+    /** @brief Set this timestamp to the warp-free current steady-clock time.
+     *
+     * Like assign_now_steady(), but the time assigned is unaffected by
+     * timewarping.
+     * @sa assign_now_steady(), now_steady_unwarped() */
+    inline void assign_now_steady_unwarped();
+    //@}
+#endif
+
+  private:
+
+    rep_t _t;
+
+    inline void add_fix() {
+#if TIMESTAMP_REP_FLAT64
+        /* no fix necessary */
+#elif TIMESTAMP_MATH_FLAT64
+        if (_t.subsec >= subsec_per_sec)
+            _t.x += (uint32_t) -subsec_per_sec;
+#else
+        if (_t.subsec >= subsec_per_sec)
+            _t.sec++, _t.subsec -= subsec_per_sec;
+#endif
+    }
+
+    inline void sub_fix() {
+#if TIMESTAMP_REP_FLAT64
+        /* no fix necessary */
+#elif TIMESTAMP_MATH_FLAT64
+        if (_t.subsec < 0)
+            _t.subsec += subsec_per_sec;
+#else
+        if (_t.subsec < 0)
+            _t.sec--, _t.subsec += subsec_per_sec;
+#endif
+    }
+
+    static inline value_type value_div(value_type a, uint32_t b) {
+        return int_divide(a, b);
+    }
+
+    static inline void value_div_mod(int32_t &div, int32_t &rem,
+                                     value_type a, uint32_t b) {
+        value_type quot;
+        rem = int_remainder(a, b, quot);
+        div = quot;
+    }
+
+    inline void assign_now(bool recent, bool steady, bool unwarped);
+
+#if TIMESTAMP_WARPABLE
+    static inline void warp_adjust(bool steady, const Timestamp &t_raw, const Timestamp &t_warped);
+    inline Timestamp warped(bool steady) const;
+    void warp(bool steady, bool from_now);
+#endif
+
+    friend inline bool operator==(const Timestamp &a, const Timestamp &b);
+    friend inline bool operator<(const Timestamp &a, const Timestamp &b);
+    friend inline Timestamp operator-(const Timestamp &b);
+    friend inline Timestamp &operator+=(Timestamp &a, const Timestamp &b);
+    friend inline Timestamp &operator-=(Timestamp &a, const Timestamp &b);
+
+};
+
+
+#if TIMESTAMP_WARPABLE
+/** @cond never */
+class TimestampWarp {
+    static Timestamp::warp_class_type kind;
+    static double speed;
+    static Timestamp flat_offset[2];
+    static double offset[2];
+    friend class Timestamp;
+};
+/** @endcond never */
+
+inline int Timestamp::warp_class() {
+    return TimestampWarp::kind;
+}
+
+inline double Timestamp::warp_speed() {
+    return TimestampWarp::speed;
+}
+
+inline bool Timestamp::warp_jumping() {
+    return TimestampWarp::kind >= warp_nowait;
+}
+
+inline Timestamp Timestamp::warped(bool steady) const {
+    Timestamp t = *this;
+    if (TimestampWarp::kind)
+        t.warp(steady, false);
+    return t;
+}
+#endif
+
+
+/** @brief Create a Timestamp measuring @a tv.
+    @param tv timeval structure */
+inline
+Timestamp::Timestamp(const struct timeval& tv)
+{
+    assign(tv.tv_sec, usec_to_subsec(tv.tv_usec));
+}
+
+#if HAVE_STRUCT_TIMESPEC
+/** @brief Create a Timestamp measuring @a ts.
+    @param ts timespec structure */
+inline
+Timestamp::Timestamp(const struct timespec& ts)
+{
+    assign(ts.tv_sec, nsec_to_subsec(ts.tv_nsec));
+}
+#endif
+
+/** @brief Return true iff this timestamp is not zero-valued. */
+inline
+Timestamp::operator unspecified_bool_type() const
+{
+#if TIMESTAMP_REP_FLAT64 || TIMESTAMP_MATH_FLAT64
+    return _t.x ? &Timestamp::sec : 0;
+#else
+    return _t.sec || _t.subsec ? &Timestamp::sec : 0;
+#endif
+}
+
+inline void
+Timestamp::assign_now(bool recent, bool steady, bool unwarped)
+{
+    (void) recent, (void) steady, (void) unwarped;
+
+#if TIMESTAMP_PUNS_TIMESPEC
+# define TIMESTAMP_DECLARE_TSP struct timespec &tsp = _t.tspec
+# define TIMESTAMP_RESOLVE_TSP /* nothing */
+#else
+# define TIMESTAMP_DECLARE_TSP struct timespec ts, &tsp = ts
+# define TIMESTAMP_RESOLVE_TSP assign(tsp.tv_sec, nsec_to_subsec(tsp.tv_nsec))
+#endif
+#if TIMESTAMP_PUNS_TIMEVAL
+# define TIMESTAMP_DECLARE_TVP struct timeval &tvp = _t.tv
+# define TIMESTAMP_RESOLVE_TVP /* nothing */
+#else
+# define TIMESTAMP_DECLARE_TVP struct timeval tv, &tvp = tv
+# define TIMESTAMP_RESOLVE_TVP assign(tvp.tv_sec, usec_to_subsec(tvp.tv_usec))
+#endif
+
+#if CLICK_LINUXMODULE
+# if !TIMESTAMP_NANOSEC
+    if (!recent && !steady) {
+        TIMESTAMP_DECLARE_TVP;
+        do_gettimeofday(&tvp);
+        TIMESTAMP_RESOLVE_TVP;
+        return;
+    }
+# endif
+    TIMESTAMP_DECLARE_TSP;
+    if (recent && steady) {
+# if HAVE_LINUX_GET_MONOTONIC_COARSE
+        tsp = get_monotonic_coarse();
+# elif HAVE_LINUX_GETBOOTTIME && HAVE_LINUX_KTIME_MONO_TO_ANY
+        // XXX Is this even worth it????? Would it be faster to just get the
+        // current time?
+        tsp = current_kernel_time();
+        struct timespec delta =
+            ktime_to_timespec(ktime_mono_to_any(ktime_set(0, 0), TK_OFFS_REAL));
+        set_normalized_timespec(&tsp, tsp.tv_sec - delta.tv_sec,
+                                tsp.tv_nsec - delta.tv_nsec);
+# elif HAVE_LINUX_GETBOOTTIME
+        tsp = current_kernel_time();
+        struct timespec delta;
+        getboottime(&delta);
+        monotonic_to_bootbased(&delta);
+        set_normalized_timespec(&tsp, tsp.tv_sec - delta.tv_sec,
+                                tsp.tv_nsec - delta.tv_nsec);
+# else
+        // older kernels don't export enough information to produce a recent
+        // steady timestamp; produce a current steady timestamp
+        ktime_get_ts(&tsp);
+# endif
+    } else if (recent)
+        tsp = current_kernel_time();
+    else if (steady)
+        ktime_get_ts(&tsp);
+    else
+        getnstimeofday(&tsp);
+    TIMESTAMP_RESOLVE_TSP;
+
+#elif TIMESTAMP_NANOSEC && CLICK_BSDMODULE
+    TIMESTAMP_DECLARE_TSP;
+    if (recent && steady)
+        getnanouptime(&tsp);
+    else if (recent)
+        getnanotime(&tsp);
+    else if (steady)
+        nanouptime(&tsp);
+    else
+        nanotime(&tsp);
+    TIMESTAMP_RESOLVE_TSP;
+
+#elif CLICK_BSDMODULE
+    TIMESTAMP_DECLARE_TVP;
+    if (recent && steady)
+        getmicrouptime(&tvp);
+    else if (recent)
+        getmicrotime(&tvp);
+    else if (steady)
+        microuptime(&tvp);
+    else
+        microtime(&tvp);
+    TIMESTAMP_RESOLVE_TVP;
+
+#elif CLICK_MINIOS
+    TIMESTAMP_DECLARE_TVP;
+    gettimeofday(&tvp, (struct timezone *) 0);
+    TIMESTAMP_RESOLVE_TVP;
+
+#elif CLICK_NS
+    if (schedule_granularity == usec_per_sec) {
+        TIMESTAMP_DECLARE_TVP;
+        simclick_gettimeofday(&tvp);
+        TIMESTAMP_RESOLVE_TVP;
+    } else {
+        assert(0 && "nanosecond precision not available yet");
+    }
+
+#elif HAVE_USE_CLOCK_GETTIME
+    TIMESTAMP_DECLARE_TSP;
+    if (steady)
+        clock_gettime(CLOCK_MONOTONIC, &tsp);
+    else
+        clock_gettime(CLOCK_REALTIME, &tsp);
+    TIMESTAMP_RESOLVE_TSP;
+
+#else
+    TIMESTAMP_DECLARE_TVP;
+    gettimeofday(&tvp, (struct timezone *) 0);
+    TIMESTAMP_RESOLVE_TVP;
+#endif
+
+#undef TIMESTAMP_DECLARE_TSP
+#undef TIMESTAMP_RESOLVE_TSP
+#undef TIMESTAMP_DECLARE_TVP
+#undef TIMESTAMP_RESOLVE_TVP
+
+#if TIMESTAMP_WARPABLE
+    // timewarping
+    if (!unwarped && TimestampWarp::kind)
+        warp(steady, true);
+#endif
+}
+
+inline void
+Timestamp::assign_now()
+{
+    assign_now(false, false, false);
+}
+
+inline Timestamp
+Timestamp::now()
+{
+    Timestamp t = Timestamp::uninitialized_t();
+    t.assign_now();
+    return t;
+}
+
+inline void
+Timestamp::assign_recent()
+{
+    assign_now(true, false, false);
+}
+
+inline Timestamp
+Timestamp::recent()
+{
+    Timestamp t = Timestamp::uninitialized_t();
+    t.assign_recent();
+    return t;
+}
+
+inline void
+Timestamp::assign_now_steady()
+{
+    assign_now(false, true, false);
+}
+
+inline Timestamp
+Timestamp::now_steady()
+{
+    Timestamp t = Timestamp::uninitialized_t();
+    t.assign_now_steady();
+    return t;
+}
+
+inline void
+Timestamp::assign_recent_steady()
+{
+    assign_now(true, true, false);
+}
+
+inline Timestamp
+Timestamp::recent_steady()
+{
+    Timestamp t = Timestamp::uninitialized_t();
+    t.assign_recent_steady();
+    return t;
+}
+
+#if TIMESTAMP_WARPABLE
+inline void
+Timestamp::assign_now_unwarped()
+{
+    assign_now(false, false, true);
+}
+
+inline Timestamp
+Timestamp::now_unwarped()
+{
+    Timestamp t = Timestamp::uninitialized_t();
+    t.assign_now_unwarped();
+    return t;
+}
+
+inline void
+Timestamp::assign_now_steady_unwarped()
+{
+    assign_now(false, true, true);
+}
+
+inline Timestamp
+Timestamp::now_steady_unwarped()
+{
+    Timestamp t = Timestamp::uninitialized_t();
+    t.assign_now_steady_unwarped();
+    return t;
+}
+#endif
+
+/** @brief Set this timestamp's seconds component.
+
+    The subseconds component is left unchanged. */
+inline void
+Timestamp::set_sec(seconds_type sec)
+{
+#if TIMESTAMP_REP_FLAT64
+    uint32_t ss = subsec();
+    _t.x = (int64_t) sec * subsec_per_sec + ss;
+#else
+    _t.sec = sec;
+#endif
+}
+
+/** @brief Set this timestamp's subseconds component.
+    @param subsec number of subseconds
+
+    The seconds component is left unchanged. */
+inline void
+Timestamp::set_subsec(uint32_t subsec)
+{
+#if TIMESTAMP_REP_FLAT64
+    seconds_type s = sec();
+    _t.x = (int64_t) s * subsec_per_sec + subsec;
+#else
+    _t.subsec = subsec;
+#endif
+}
+
+/** @brief Return this timestamp's seconds component. */
+inline Timestamp::seconds_type
+Timestamp::sec() const
+{
+#if TIMESTAMP_REP_FLAT64
+    if (unlikely(_t.x < 0))
+        return -value_div(-(_t.x + 1), subsec_per_sec) - 1;
+    else
+        return value_div(_t.x, subsec_per_sec);
+#else
+    return _t.sec;
+#endif
+}
+
+/** @brief Return this timestamp's subseconds component. */
+inline uint32_t
+Timestamp::subsec() const
+{
+#if TIMESTAMP_REP_FLAT64
+    return _t.x - (uint32_t) sec() * subsec_per_sec;
+#else
+    return _t.subsec;
+#endif
+}
+
+/** @brief Return this timestamp's subseconds component, converted to
+    milliseconds. */
+inline uint32_t
+Timestamp::msec() const
+{
+    return subsec_to_msec(subsec());
+}
+
+/** @brief Return this timestamp's subseconds component, converted to
+    microseconds. */
+inline uint32_t
+Timestamp::usec() const
+{
+    return subsec_to_usec(subsec());
+}
+
+/** @brief Return this timestamp's subseconds component, converted to
+    nanoseconds. */
+inline uint32_t
+Timestamp::nsec() const
+{
+    return subsec_to_nsec(subsec());
+}
+
+/** @brief Return this timestamp's interval length, converted to
+    milliseconds.
+
+    Will overflow on intervals of more than 2147483.647 seconds. */
+inline Timestamp::seconds_type
+Timestamp::msec1() const
+{
+#if TIMESTAMP_REP_FLAT64
+    return value_div(_t.x, subsec_per_sec / msec_per_sec);
+#else
+    return _t.sec * msec_per_sec + subsec_to_msec(_t.subsec);
+#endif
+}
+
+/** @brief Return this timestamp's interval length, converted to
+    microseconds.
+
+    Will overflow on intervals of more than 2147.483647 seconds. */
+inline Timestamp::seconds_type
+Timestamp::usec1() const
+{
+#if TIMESTAMP_REP_FLAT64
+    return value_div(_t.x, subsec_per_sec / usec_per_sec);
+#else
+    return _t.sec * usec_per_sec + subsec_to_usec(_t.subsec);
+#endif
+}
+
+/** @brief Return this timestamp's interval length, converted to
+    nanoseconds.
+
+    Will overflow on intervals of more than 2.147483647 seconds. */
+inline Timestamp::seconds_type
+Timestamp::nsec1() const
+{
+#if TIMESTAMP_REP_FLAT64
+    return _t.x * (nsec_per_sec / subsec_per_sec);
+#else
+    return _t.sec * nsec_per_sec + subsec_to_nsec(_t.subsec);
+#endif
+}
+
+#if !CLICK_TOOL
+inline click_jiffies_t
+Timestamp::jiffies() const
+{
+# if TIMESTAMP_REP_FLAT64
+    // This is not very precise when CLICK_HZ doesn't divide NSUBSEC evenly.
+    return value_div(_t.x, subsec_per_sec / CLICK_HZ);
+# else
+    click_jiffies_t j = ((click_jiffies_t) sec()) * CLICK_HZ;
+#  if CLICK_HZ == 100 || CLICK_HZ == 1000 || CLICK_HZ == 10000 || CLICK_HZ == 100000 || CLICK_HZ == 1000000
+    return j + ((click_jiffies_t) subsec()) / (subsec_per_sec / CLICK_HZ);
+#  else
+    // This is not very precise when CLICK_HZ doesn't divide NSUBSEC evenly.
+    return j + ((click_jiffies_t) subsec()) / (subsec_per_sec / CLICK_HZ);
+#  endif
+# endif
+}
+
+inline Timestamp
+Timestamp::make_jiffies(click_jiffies_t jiffies)
+{
+    // Not very precise when CLICK_HZ doesn't evenly divide subsec_per_sec.
+    Timestamp t = Timestamp::uninitialized_t();
+# if TIMESTAMP_REP_FLAT64
+    t._t.x = (int64_t) jiffies * (subsec_per_sec / CLICK_HZ);
+# else
+    t._t.sec = jiffies / CLICK_HZ;
+    t._t.subsec = (jiffies - t._t.sec * CLICK_HZ) * (subsec_per_sec / CLICK_HZ);
+# endif
+    return t;
+}
+
+inline Timestamp
+Timestamp::make_jiffies(click_jiffies_difference_t jiffies)
+{
+    // Not very precise when CLICK_HZ doesn't evenly divide subsec_per_sec.
+    Timestamp t = Timestamp::uninitialized_t();
+# if TIMESTAMP_REP_FLAT64
+    t._t.x = (int64_t) jiffies * (subsec_per_sec / CLICK_HZ);
+# else
+    if (jiffies < 0)
+        t._t.sec = -(-(jiffies + 1) / CLICK_HZ) - 1;
+    else
+        t._t.sec = jiffies / CLICK_HZ;
+    t._t.subsec = (jiffies - t._t.sec * CLICK_HZ) * (subsec_per_sec / CLICK_HZ);
+# endif
+    return t;
+}
+#endif
+
+/** @cond never */
+inline void Timestamp::set_now() {
+    assign_now(false, false, false);
+}
+
+inline void Timestamp::set(seconds_type sec, uint32_t subsec) {
+    assign(sec, subsec);
+}
+
+inline void Timestamp::set_usec(seconds_type sec, uint32_t usec) {
+    assign_usec(sec, usec);
+}
+
+inline void Timestamp::set_nsec(seconds_type sec, uint32_t nsec) {
+    assign_nsec(sec, nsec);
+}
+/** @endcond never */
+
+/** @relates Timestamp
+    @brief Compare two timestamps for equality.
+
+    Returns true iff the two operands have the same seconds and subseconds
+    components. */
+inline bool
+operator==(const Timestamp &a, const Timestamp &b)
+{
+#if TIMESTAMP_REP_FLAT64 || TIMESTAMP_MATH_FLAT64
+    return a._t.x == b._t.x;
+#else
+    return a.sec() == b.sec() && a.subsec() == b.subsec();
+#endif
+}
+
+/** @relates Timestamp
+    @brief Compare two timestamps for inequality.
+
+    Returns true iff !(@a a == @a b). */
+inline bool
+operator!=(const Timestamp &a, const Timestamp &b)
+{
+    return !(a == b);
+}
+
+/** @relates Timestamp
+    @brief Compare two timestamps.
+
+    Returns true iff @a a represents a shorter interval than @a b, or
+    considered as absolute time, @a a happened before @a b.  */
+inline bool
+operator<(const Timestamp &a, const Timestamp &b)
+{
+#if TIMESTAMP_REP_FLAT64 || TIMESTAMP_MATH_FLAT64
+    return a._t.x < b._t.x;
+#else
+    return a.sec() < b.sec() || (a.sec() == b.sec() && a.subsec() < b.subsec());
+#endif
+}
+
+/** @overload */
+inline bool
+operator<(const Timestamp &a, int b)
+{
+    return a < Timestamp(b);
+}
+
+/** @relates Timestamp
+    @brief Compare two timestamps.
+
+    Returns true iff @a a measures an interval no larger than @a b, or
+    considered as absolute time, @a a happened at or before @a b.  */
+inline bool
+operator<=(const Timestamp &a, const Timestamp &b)
+{
+    return !(b < a);
+}
+
+/** @overload */
+inline bool
+operator<=(const Timestamp &a, int b)
+{
+    return a <= Timestamp(b);
+}
+
+/** @relates Timestamp
+    @brief Compare two timestamps.
+
+    Returns true iff @a a measures an interval no shorter than @a b, or
+    considered as absolute time, @a a happened at or after @a b.  */
+inline bool
+operator>=(const Timestamp &a, const Timestamp &b)
+{
+    return !(a < b);
+}
+
+/** @overload */
+inline bool
+operator>=(const Timestamp &a, int b)
+{
+    return a >= Timestamp(b);
+}
+
+/** @relates Timestamp
+    @brief Compare two timestamps.
+
+    Returns true iff @a a measures a longer interval than @a b, or considered
+    as absolute time, @a a happened after @a b.  */
+inline bool
+operator>(const Timestamp &a, const Timestamp &b)
+{
+    return b < a;
+}
+
+/** @overload */
+inline bool
+operator>(const Timestamp &a, int b)
+{
+    return a > Timestamp(b);
+}
+
+/** @brief Add @a b to @a a.
+
+    Returns the result (the new value of @a a). */
+inline Timestamp &
+operator+=(Timestamp &a, const Timestamp &b)
+{
+#if TIMESTAMP_REP_FLAT64 || TIMESTAMP_MATH_FLAT64
+    a._t.x += b._t.x;
+#else
+    a._t.sec += b._t.sec;
+    a._t.subsec += b._t.subsec;
+#endif
+    a.add_fix();
+    return a;
+}
+
+/** @brief Subtract @a b from @a a.
+
+    Returns the result (the new value of @a a). */
+inline Timestamp &
+operator-=(Timestamp &a, const Timestamp &b)
+{
+#if TIMESTAMP_REP_FLAT64 || TIMESTAMP_MATH_FLAT64
+    a._t.x -= b._t.x;
+#else
+    a._t.sec -= b._t.sec;
+    a._t.subsec -= b._t.subsec;
+#endif
+    a.sub_fix();
+    return a;
+}
+
+/** @brief Add the two operands and return the result. */
+inline Timestamp
+operator+(Timestamp a, const Timestamp &b)
+{
+    a += b;
+    return a;
+}
+
+/** @brief Subtract @a b from @a a and return the result. */
+inline Timestamp
+operator-(Timestamp a, const Timestamp &b)
+{
+    a -= b;
+    return a;
+}
+
+/** @brief Negate @a a and return the result. */
+inline Timestamp
+operator-(const Timestamp &a)
+{
+#if TIMESTAMP_REP_FLAT64
+    Timestamp t = Timestamp::uninitialized_t();
+    t._t.x = -a._t.x;
+    return t;
+#else
+    if (a.subsec())
+        return Timestamp(-(a.sec() + 1), Timestamp::subsec_per_sec - a.subsec());
+    else
+        return Timestamp(-a.sec(), 0);
+#endif
+}
+
+#if HAVE_FLOAT_TYPES
+/** @brief Return this timestamp's value, converted to a real number. */
+inline double
+Timestamp::doubleval() const
+{
+# if TIMESTAMP_REP_FLAT64
+    return _t.x / (double) subsec_per_sec;
+# else
+    return _t.sec + (_t.subsec / (double) subsec_per_sec);
+# endif
+}
+
+/** @brief Create a timestamp measuring @a d seconds. */
+inline
+Timestamp::Timestamp(double d)
+{
+# if TIMESTAMP_REP_FLAT64
+    _t.x = (int64_t) floor(d * subsec_per_sec + 0.5);
+# else
+    double dfloor = floor(d);
+    _t.sec = (seconds_type) dfloor;
+    _t.subsec = (uint32_t) ((d - dfloor) * subsec_per_sec + 0.5);
+    add_fix();
+# endif
+}
+
+/** @brief Scale @a a by a factor of @a b and return the result. */
+inline Timestamp
+operator*(const Timestamp &a, double b)
+{
+    return Timestamp(a.doubleval() * b);
+}
+
+inline Timestamp
+operator*(const Timestamp &a, int b)
+{
+    return Timestamp(a.doubleval() * b);
+}
+
+inline Timestamp
+operator*(const Timestamp &a, unsigned b)
+{
+    return Timestamp(a.doubleval() * b);
+}
+
+inline Timestamp
+operator*(double a, const Timestamp &b)
+{
+    return Timestamp(b.doubleval() * a);
+}
+
+inline Timestamp
+operator*(int a, const Timestamp &b)
+{
+    return Timestamp(b.doubleval() * a);
+}
+
+inline Timestamp
+operator*(unsigned a, const Timestamp &b)
+{
+    return Timestamp(b.doubleval() * a);
+}
+
+/** @brief Scale @a a down by a factor of @a b and return the result. */
+inline Timestamp
+operator/(const Timestamp &a, double b)
+{
+    return Timestamp(a.doubleval() / b);
+}
+
+inline Timestamp
+operator/(const Timestamp &a, int b)
+{
+    return Timestamp(a.doubleval() / b);
+}
+
+inline Timestamp
+operator/(const Timestamp &a, unsigned b)
+{
+    return Timestamp(a.doubleval() / b);
+}
+
+/** @brief Divide @a a by @a b and return the result. */
+inline double
+operator/(const Timestamp &a, const Timestamp &b)
+{
+    return a.doubleval() / b.doubleval();
+}
+#endif /* HAVE_FLOAT_TYPES */
+
+StringAccum& operator<<(StringAccum&, const Timestamp&);
+
+#if TIMESTAMP_WARPABLE
+inline Timestamp
+Timestamp::warp_real_delay() const
+{
+    if (likely(!TimestampWarp::kind) || TimestampWarp::speed == 1.0)
+        return *this;
+    else
+        return *this / TimestampWarp::speed;
+}
+#endif
+
+#if TIMESTAMP_PUNS_TIMEVAL
+inline const struct timeval &
+Timestamp::timeval() const
+{
+    return _t.tv;
+}
+
+inline const struct timeval &
+Timestamp::timeval_ceil() const
+{
+    return _t.tv;
+}
+#else
+/** @brief Return a struct timeval that approximates this timestamp.
+
+    If Timestamp and struct timeval have the same size and representation,
+    then this operation returns a "const struct timeval &" whose address is
+    the same as this Timestamp. If Timestamps have nanosecond precision,
+    the conversion rounds down, so Timestamp(t.timeval()) <= t. */
+inline struct timeval
+Timestamp::timeval() const
+{
+    struct timeval tv;
+    tv.tv_sec = sec();
+    tv.tv_usec = usec();
+    return tv;
+}
+
+/** @brief Return the minimum struct timeval >= this timestamp.
+
+    If Timestamp and struct timeval have the same size and representation,
+    then this operation returns a "const struct timeval &" whose address is
+    the same as this Timestamp. */
+inline struct timeval
+Timestamp::timeval_ceil() const
+{
+    return (*this + Timestamp(0, subsec_per_usec - 1)).timeval();
+}
+#endif
+
+#if HAVE_STRUCT_TIMESPEC
+# if TIMESTAMP_PUNS_TIMESPEC
+inline const struct timespec &
+Timestamp::timespec() const
+{
+    return _t.tspec;
+}
+# else
+/** @brief Return a struct timespec with the same value as this timestamp.
+
+    If Timestamp and struct timespec have the same size and representation,
+    then this operation returns a "const struct timespec &" whose address is
+    the same as this Timestamp. */
+inline struct timespec
+Timestamp::timespec() const
+{
+    struct timespec ts;
+    ts.tv_sec = sec();
+    ts.tv_nsec = nsec();
+    return ts;
+}
+# endif
+#endif
+
+
+class ArgContext;
+extern const ArgContext blank_args;
+bool cp_time(const String &str, Timestamp *result, bool allow_negative);
+
+/** @class TimestampArg
+  @brief Parser class for timestamps. */
+class TimestampArg { public:
+    TimestampArg(bool is_signed = false)
+        : is_signed(is_signed) {
+    }
+    bool parse(const String &str, Timestamp &value, const ArgContext &args = blank_args) {
+        (void) args;
+        return cp_time(str, &value, is_signed);
+    }
+    bool is_signed;
+};
+
+template<> struct DefaultArg<Timestamp> : public TimestampArg {};
+template<> struct has_trivial_copy<Timestamp> : public true_type {};
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/tokenbucket.hh b/openflow/include/click/tokenbucket.hh
new file mode 100644
index 0000000..4439c32
--- /dev/null
+++ b/openflow/include/click/tokenbucket.hh
@@ -0,0 +1,1021 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_TOKENBUCKET_HH
+#define CLICK_TOKENBUCKET_HH
+#include <click/timestamp.hh>
+#include <click/bigint.hh>
+CLICK_DECLS
+
+/** @file <click/tokenbucket.hh>
+ @brief  Token bucket rate limiter templates.
+
+ Related template classes that support token bucket rate limiters.
+
+ The TokenRateX template class represents a token bucket rate: a refill
+ I<rate> in tokens per period, plus a I<capacity>, the maximum number of
+ tokens allowed to accumulate.
+
+ The TokenCounterX template class represents an active count of tokens.
+ Member functions are provided to update the count according to a particular
+ TokenRateX argument.  The counter will fill up with tokens according to the
+ given rate, to a maximum of the capacity.
+
+ A TokenRateX object's state depends only on the rate and capacity, and thus
+ may be shared by several distinct TokenCounterX objects.  But for the common
+ case that a single counter is paired with a unique rate, the TokenBucketX
+ template class combines a TokenRateX and a TokenCounterX.
+
+ The token bucket templates divide time into discrete units called I<ticks>.
+ Token counters are refilled up to once per tick.  A tick may be less than a
+ full period.  For example, if periods and ticks are 1 second and 1
+ millisecond, respectively, then a TokenCounterX with associated rate 1000
+ tokens per second would be refilled at 1 token per millisecond.  The
+ TokenRateX template parameter P defines the time tick unit and frequency.
+ The provided TokenBucketJiffyParameters class is designed to be used as
+ TokenRateX's parameter; it measures ticks in units of jiffies.
+
+ @sa GapRate */
+
+/** @class TokenRateX include/click/tokenbucket.hh <click/tokenbucket.hh>
+ @brief  Token bucket rate template.
+
+ The TokenRateX class implements a token bucket rate.  TokenBucketX is
+ initialized with a rate, in tokens per second, and a capacity in tokens.
+ Associated token buckets fill up with tokens at the given rate, to a maximum
+ of the capacity.
+
+ Two special types of rate are supported.  An <em>unlimited</em> TokenRateX
+ always refills associated counters to full capacity.  Its capacity() equals
+ token_max.  An <em>idle</em> TokenRateX never refills.
+
+ Most users will be satisfied with the TokenRate type, which is equal to
+ TokenRateX<TokenBucketJiffyParameters<unsigned> >.
+
+ @sa TokenCounterX, TokenBucketX */
+
+template <typename P> class TokenRateX;
+
+template <typename P>
+class TokenRateX : public P { public:
+
+    /** @brief The template parameter type. */
+    typedef P parameter_type;
+
+    /** @brief Unsigned type of token counts. */
+    typedef typename P::token_type token_type;
+
+    /** @brief Type of time points. */
+    typedef typename P::time_point_type time_point_type;
+
+    /** @brief Unsigned type of tick counts (differences between time points). */
+    typedef typename make_unsigned<typename P::duration_type>::type ticks_type;
+
+    enum {
+	max_tokens = (token_type) -1
+    };
+
+    /** @brief Construct an idle token rate. */
+    TokenRateX() {
+	assign();
+    }
+
+    /** @brief Construct an idle or unlimited token rate.
+     * @param unlimited idle if false, unlimited if true */
+    explicit TokenRateX(bool unlimited) {
+	assign(unlimited);
+    }
+
+    /** @brief Construct a token rate representing @a rate.
+     * @param rate refill rate in tokens per period
+     * @param capacity maximum token accumulation
+     *
+     * The rate is idle if either @a rate or @a capacity is 0.
+     *
+     * @sa assign(@a rate, @a capacity) */
+    TokenRateX(token_type rate, token_type capacity) {
+	assign(rate, capacity);
+    }
+
+    /** @brief Set the token rate to idle or unlimited.
+     * @param unlimited idle if false, unlimited if true */
+    inline void assign(bool unlimited = false);
+
+    /** @brief Set the token rate and capacity.
+     * @param rate refill rate in tokens per period
+     * @param capacity maximum token accumulation
+     *
+     * Sets the token bucket's rate to @a rate and capacity to @a capacity.
+     * If either @a rate or @a capacity is 0, the rate becomes idle. */
+    inline void assign(token_type rate, token_type capacity);
+
+    /** @brief Return true iff the token rate is unlimited. */
+    bool unlimited() const {
+	return _time_until_full == 0;
+    }
+
+    /** @brief Return true iff the token rate is idle. */
+    bool idle() const {
+	return _tokens_per_tick == 0;
+    }
+
+    /** @brief Return the rate in tokens per period.
+     *
+     * Returns max_tokens for unlimited rates.  Imprecise computer arithmetic
+     * may cause the result to differ from the configured rate. */
+    token_type rate() const;
+
+    /** @brief Return the capacity in tokens.
+     *
+     * Returns max_tokens for unlimited rates.  Imprecise computer arithmetic
+     * may cause the result to differ from the configured capacity. */
+    token_type capacity() const {
+	return max_tokens / _token_scale;
+    }
+
+    /** @brief Return the number of tokens per tick. */
+    token_type tokens_per_tick() const {
+	return _tokens_per_tick;
+    }
+
+    /** @brief Return the ratio of fractional tokens to real tokens. */
+    token_type token_scale() const {
+	return _token_scale;
+    }
+
+    /** @brief Return the number of ticks required to refill a counter to
+     * capacity.
+     *
+     * Returns (ticks_type) -1 for idle rates. */
+    ticks_type time_until_full() const {
+	return _time_until_full;
+    }
+
+    /** @brief Return the current time point.
+     *
+     * Implemented as P::now(). */
+    time_point_type now() const {
+	return P::now();
+    }
+
+    /** @brief Return the time point corresponding to the @a time parameter.
+     *
+     * May not be available for all U types.  Implemented as P::time_point(@a
+     * time). */
+    template <typename U>
+    time_point_type time_point(U time) const {
+	return P::time_point(time);
+    }
+
+    /** @brief Return @a b - @a a, assuming that @a b was measured after @a a.
+     *
+     * Some time measurements can, in rare cases, appear to jump backwards,
+     * as timestamps do when the user changes the current time.  If this
+     * happens (@a b < @a a), time_monotonic_difference returns 0.
+     * Implemented as P::time_monotonic_difference(@a a, @a b). */
+    ticks_type time_monotonic_difference(time_point_type a, time_point_type b) const {
+	return P::time_monotonic_difference(a, b);
+    }
+
+
+    /** @cond never */
+    typedef time_point_type epoch_type CLICK_DEPRECATED;
+    inline token_type tokens_per_epoch() const CLICK_DEPRECATED;
+    inline ticks_type epochs_until_full() const CLICK_DEPRECATED;
+    /** @endcond never */
+
+ private:
+
+    token_type _tokens_per_tick;	// 0 iff idle()
+    token_type _token_scale;
+    ticks_type _time_until_full;	// 0 iff unlimited()
+
+};
+
+template <typename P>
+void TokenRateX<P>::assign(bool unlimited)
+{
+    _token_scale = 1;
+    if (unlimited) {
+	_tokens_per_tick = max_tokens;
+	_time_until_full = 0;
+    } else {
+	_tokens_per_tick = 0;
+	_time_until_full = (ticks_type) -1;
+    }
+}
+
+template <typename P>
+void TokenRateX<P>::assign(token_type rate, token_type capacity)
+{
+    if (capacity == 0) {
+	rate = 0;
+	capacity = max_tokens;
+    }
+
+    token_type frequency = P::frequency();
+    if (rate != 0) {
+	// constrain capacity so _tokens_per_tick fits in 1 limb
+	unsigned min_capacity = (rate - 1) / frequency + 1;
+	if (capacity < min_capacity)
+	    capacity = min_capacity;
+    }
+    _token_scale = max_tokens / capacity;
+
+    // XXX on non-32 bit types
+    static_assert(sizeof(bigint::limb_type) == sizeof(token_type),
+		  "bigint::limb_type should have the same size as token_type.");
+    bigint::limb_type l[2] = { 0, 0 };
+    bigint::limb_type a[2] = { rate, 0 };
+    bigint::multiply_add(l, a, 2, _token_scale);
+    (void) bigint::divide(l, l, 2, frequency);
+    assert(l[1] == 0);
+
+    if (rate != 0) {
+	// constrain _tokens_per_tick to be at least 1
+	_tokens_per_tick = (l[0] != 0 ? l[0] : 1);
+	_time_until_full = (max_tokens - 1) / _tokens_per_tick + 1;
+    } else {
+	_tokens_per_tick = 0;
+	_time_until_full = (ticks_type) -1;
+    }
+}
+
+template <typename P>
+typename P::token_type TokenRateX<P>::rate() const
+{
+    static_assert(sizeof(bigint::limb_type) == sizeof(token_type),
+		  "bigint::limb_type should have the same size as token_type.");
+    bigint::limb_type l[2] = { _tokens_per_tick / 2, 0 };
+    bigint::limb_type a[2] = { _tokens_per_tick, 0 };
+    bigint::multiply_add(l, a, 2, P::frequency());
+    (void) bigint::divide(l, l, 2, token_scale());
+    return l[1] ? (token_type) max_tokens : l[0];
+}
+
+/** @cond never */
+template <typename P>
+inline typename TokenRateX<P>::token_type TokenRateX<P>::tokens_per_epoch() const
+{
+    return tokens_per_tick();
+}
+
+template <typename P>
+inline typename TokenRateX<P>::ticks_type TokenRateX<P>::epochs_until_full() const
+{
+    return time_until_full();
+}
+/** @endcond never */
+
+
+/** @cond never */
+/* TokenRateConverter safely scales token counts according to an input rate.
+   Template specializations let us make use of a fast int_multiply() when one
+   is available. */
+template<typename rate_type, bool FM> struct TokenRateConverter {
+};
+template<typename rate_type> struct TokenRateConverter<rate_type, true> {
+    static bool cvt(const rate_type &rate, typename rate_type::token_type &t) {
+	typename rate_type::token_type high;
+	int_multiply(t, rate.token_scale(), t, high);
+	if (high)
+	    t = rate_type::max_tokens;
+	return !high;
+    }
+};
+template<typename rate_type> struct TokenRateConverter<rate_type, false> {
+    static bool cvt(const rate_type &rate, typename rate_type::token_type &t) {
+	if (t <= rate.capacity()) {
+	    t *= rate.token_scale();
+	    return true;
+	} else {
+	    t = rate_type::max_tokens;
+	    return false;
+	}
+    }
+};
+/** @endcond never */
+
+
+/** @class TokenCounterX include/click/tokenbucket.hh <click/tokenbucket.hh>
+ @brief  Token bucket counter template.
+
+ The TokenCounterX class implements a token counter associated with a token
+ bucket rate.  The rate type, normally a TokenRateX, is specified as a
+ template parameter.  Most of its member functions take an explicit rate
+ argument.  The contains() method reports whether the counter has at least a
+ given number of tokens.  The counter is emptied by the remove() and
+ remove_if() methods and refilled by the refill() methods.
+
+ Often the token rate associated with a counter will not change during the
+ counter's lifetime.  TokenCounterX will work correctly if the rate changes,
+ however.  (See the adjust() method for details.)
+
+ TokenCounterX internally maintains fractional tokens, so it should be
+ relatively precise.
+
+ Idle and unlimited rates affect how TokenCounters are refilled.  For idle
+ rates, refill() is a no-op.  For unlimited rates, any refill() makes the
+ counter full(), containing max_tokens tokens.  The set(), empty(), full(),
+ remove(), and similar functions act as normal for idle and unlimited rates.
+
+ Most users will be satisfied with the TokenCounter type, which is equal to
+ TokenCounterX<TokenRateX<TokenBucketJiffyParameters<unsigned> > >.
+
+ @sa TokenRateX, TokenBucketX */
+
+template <typename R>
+class TokenCounterX { public:
+
+    /** @brief The token rate type. */
+    typedef R rate_type;
+
+    /** @brief Unsigned type of token counts. */
+    typedef typename R::token_type token_type;
+
+    /** @brief Type of time points. */
+    typedef typename R::time_point_type time_point_type;
+
+    /** @brief Unsigned type of tick counts (differences between time points). */
+    typedef typename R::ticks_type ticks_type;
+
+    enum {
+	max_tokens = R::max_tokens
+    };
+
+    /** @brief Construct an empty TokenCounter.
+     *
+     * The initial time point is 0. */
+    TokenCounterX()
+	: _tokens(0), _time_point() {
+    }
+
+    /** @brief Construct a TokenCounter.
+     * @param full whether the counter is created full
+     *
+     * The counter is initially full() if @a full is true, otherwise it is
+     * empty.  The initial time point is 0. */
+    explicit TokenCounterX(bool full)
+	: _tokens(full ? (token_type) max_tokens : 0), _time_point() {
+    }
+
+    /** @brief Return the number of tokens in the counter.
+     * @param rate associated token rate
+     *
+     * The return value is a lower bound on the number of tokens, since
+     * TokenCounterX keeps track of fractional tokens. */
+    token_type size(const rate_type &rate) const {
+	return _tokens / rate.token_scale();
+    }
+
+    /** @brief Return the counter's fullness fraction.
+     *
+     * The return value is a number between 0 and max_tokens, where max_tokens
+     * represents full capacity. */
+    token_type fraction() const {
+	return _tokens;
+    }
+
+    /** @brief Test if the token counter is completely empty. */
+    bool empty() const {
+	return _tokens == 0;
+    }
+
+    /** @brief Test if the token counter is at full capacity. */
+    bool full() const {
+	return _tokens == (token_type) max_tokens;
+    }
+
+    /** @brief Test if the token counter has at least @a t tokens.
+     * @param rate associated token rate
+     * @param t token count
+     *
+     * Returns false whenever @a t is greater than <em>rate</em>.@link
+     * TokenRateX::capacity capacity()@endlink. */
+    bool contains(const rate_type &rate, token_type t) const {
+	return cvt_type::cvt(rate, t) && contains_fraction(t);
+    }
+
+    /** @brief Test if the token counter is above a fraction of its capacity.
+     * @param f fullness fraction, where max_tokens is full capacity */
+    bool contains_fraction(token_type f) const {
+	return f <= _tokens;
+    }
+
+    /** @brief Clear the token counter.
+     *
+     * @sa set(), set_full() */
+    void clear() {
+	_tokens = 0;
+    }
+
+    /** @brief Fill the token counter to capacity.
+     *
+     * @sa clear(), set() */
+    void set_full() {
+	_tokens = max_tokens;
+    }
+
+    /** @brief Set the token counter to contain @a t tokens.
+     * @param rate associated token rate
+     * @param t number of tokens
+     *
+     * The result will never have more tokens than the associated capacity. */
+    void set(const rate_type &rate, token_type t) {
+	(void) cvt_type::cvt(rate, t);
+	_tokens = t;
+    }
+
+    /** @brief Set the token counter to a fraction of its capacity.
+     * @param f fullness fraction, where max_tokens is full capacity */
+    void set_fraction(token_type f) {
+	_tokens = f;
+    }
+
+    /** @brief Compensate the counter for a change of rate.
+     * @param old_rate old associated token rate
+     * @param new_rate new associated token rate
+     *
+     * TokenCounterX's internal representation stores the token count as a
+     * fraction of the rate's capacity.  This means that if you change the
+     * associated rate to have a different capacity, the token count will
+     * appear to change.  To keep the token count roughly the same, call
+     * adjust() with the old and new rates; TokenCounterX will as far as
+     * possible compensate for the rate change. */
+    void adjust(const rate_type &old_rate, const rate_type &new_rate) {
+	if (old_rate.token_scale() != new_rate.token_scale()) {
+	    static_assert(sizeof(bigint::limb_type) == sizeof(token_type),
+			  "bigint::limb_type should have the same size as token_type.");
+	    bigint::limb_type l[2] = { 0, 0 };
+	    bigint::limb_type a[2] = { _tokens, 0 };
+	    bigint::multiply_add(l, a, 2, new_rate.token_scale());
+	    (void) bigint::divide(l, l, 2, old_rate.token_scale());
+	    _tokens = l[1] ? (token_type) max_tokens : l[0];
+	}
+    }
+
+    /** @brief Refill the token counter to time @a rate.now().
+     * @param rate associated token rate
+     *
+     * There are three refill() methods, useful for different methods of
+     * measuring time.  This method calls @a rate.now(), which returns the
+     * current time.  Other methods use an explicit time point and a @a
+     * rate.time_point(U) method.
+     *
+     * @sa set_time_point */
+    void refill(const rate_type &rate);
+
+    /** @brief Refill the token counter for @a time.
+     * @param rate associated token rate
+     * @param time new time point */
+    void refill(const rate_type &rate, time_point_type time);
+
+    /** @brief Refill the token counter for @a time.
+     * @param rate associated token rate
+     * @param time new time */
+    template <typename U> void refill(const rate_type &rate, U time);
+
+    /** @brief Set the token counter's internal time point to @a time.
+     * @param time new time point
+     *
+     * Unlike refill(), this method does not refill the counter.
+     *
+     * @sa refill */
+    void set_time_point(time_point_type time) {
+	_time_point = time;
+    }
+
+    /** @brief Remove @a t tokens from the counter.
+     * @param rate associated token rate
+     * @param t number of tokens
+     *
+     * If the token counter contains less than @a t tokens, the new token
+     * count is 0. */
+    void remove(const rate_type &rate, token_type t) {
+	(void) cvt_type::cvt(rate, t);
+	remove_fraction(t);
+    }
+
+    /** @brief Remove @a t tokens from the counter if it contains @a t tokens.
+     * @param rate associated token rate
+     * @param t number of tokens
+     * @return true if @a t tokens were removed, false otherwise
+     *
+     * If the counter contains @a t or more tokens, calls remove(@a t) and
+     * returns true.  If it contains less than @a t tokens, returns false
+     * without removing any tokens. */
+    bool remove_if(const rate_type &rate, token_type t) {
+	return cvt_type::cvt(rate, t) && remove_fraction_if(t);
+    }
+
+    /** @brief Remove a fullness fraction from the counter.
+     * @param f fullness fraction, where max_tokens is full capacity
+     *
+     * If the token counter is less than @a f full, the new token count is 0. */
+    void remove_fraction(token_type f) {
+	_tokens = (f <= _tokens ? _tokens - f : 0);
+    }
+
+    /** @brief Remove a fullness fraction from the counter if it is full enough.
+     * @param f fullness fraction, where max_tokens is full capacity
+     * @return true if @a f was removed, false otherwise
+     *
+     * If fraction() is at least @a f, calls remove_fraction(@a f) and returns
+     * true.  Otherwise, returns false without removing any tokens. */
+    bool remove_fraction_if(token_type f) {
+	if (f <= _tokens) {
+	    _tokens -= f;
+	    return true;
+	} else
+	    return false;
+    }
+
+    /** @brief Return the number of ticks until contains(<em>rate</em>, <em>t</em>).
+     *
+     * @param rate associated token rate
+     * @param t token count
+     *
+     * Returns (ticks_type) -1 if passing time will never make
+     * @link contains() contains(<em>rate</em>, <em>t</em>)@endlink
+     * true. */
+    ticks_type time_until_contains(const rate_type &rate,
+				   token_type t) const {
+	if (cvt_type::cvt(rate, t))
+	    return time_until_contains_fraction(rate, t);
+	else
+	    return (ticks_type) -1;
+    }
+
+    /** @brief Return the number of ticks until contains_fraction(<em>f</em>).
+     * @param rate associated token rate
+     * @param f fullness fraction, where max_tokens is full capacity
+     *
+     * Returns (ticks_type) -1 if passing time will never make
+     * @link contains_fraction() contains_fraction(<em>f</em>)@endlink
+     * true. */
+    ticks_type time_until_contains_fraction(const rate_type &rate,
+					    token_type f) const {
+	if (f <= _tokens || rate.time_until_full() == 0)
+	    return 0;
+	else if (rate.tokens_per_tick() == 0)
+	    return (ticks_type) -1;
+	else
+	    return (f - _tokens - 1) / rate.tokens_per_tick() + 1;
+    }
+
+
+    /** @cond never */
+    inline ticks_type epochs_until_contains(const rate_type &rate, token_type t) const CLICK_DEPRECATED;
+    inline ticks_type epochs_until_contains_fraction(const rate_type &rate, token_type f) const CLICK_DEPRECATED;
+    /** @endcond never */
+
+  private:
+
+    token_type _tokens;
+    time_point_type _time_point;
+
+    typedef TokenRateConverter<rate_type, has_fast_int_multiply<token_type>::value> cvt_type;
+
+};
+
+template <typename R>
+void TokenCounterX<R>::refill(const rate_type &rate, time_point_type time)
+{
+    ticks_type diff = rate.time_monotonic_difference(_time_point, time);
+    if (diff >= rate.time_until_full()) {
+	// ignore special case of idle rates -- we assume that
+	// rate.time_monotonic_difference() will never return (ticks_type) -1,
+	// and ensure that ticks_type is unsigned
+	_tokens = max_tokens;
+    } else if (diff > 0) {
+	token_type new_tokens = _tokens + diff * rate.tokens_per_tick();
+	_tokens = (new_tokens < _tokens ? (token_type) max_tokens : new_tokens);
+    }
+    _time_point = time;
+}
+
+template <typename R>
+void TokenCounterX<R>::refill(const rate_type &rate)
+{
+    refill(rate, rate.now());
+}
+
+template <typename R> template <typename U>
+void TokenCounterX<R>::refill(const rate_type &rate, U time)
+{
+    refill(rate, rate.time_point(time));
+}
+
+/** @cond never */
+template <typename R>
+inline typename TokenCounterX<R>::ticks_type TokenCounterX<R>::epochs_until_contains(const rate_type &rate, token_type t) const
+{
+    return time_until_contains(rate, t);
+}
+template <typename R>
+inline typename TokenCounterX<R>::ticks_type TokenCounterX<R>::epochs_until_contains_fraction(const rate_type &rate, token_type f) const
+{
+    return time_until_contains_fraction(rate, f);
+}
+/** @endcond never */
+
+
+/** @class TokenBucketJiffyParameters include/click/tokenbucket.hh <click/tokenbucket.hh>
+ @brief  Helper class for token bucket rate limiter.
+
+ Pass this class as the parameter to TokenRateX.  TokenBucketJiffyParameters
+ measures ticks in units of jiffies.  The template parameter is the type of
+ tokens. */
+
+template <typename T>
+class TokenBucketJiffyParameters { public:
+
+    /** @brief The type of tokens.  Always unsigned. */
+    typedef T token_type;
+
+    /** @brief The type of a time point.  Always unsigned. */
+    typedef click_jiffies_t time_point_type;
+
+    /** @brief The type of a difference between time points.  Always signed. */
+    typedef click_jiffies_difference_t duration_type;
+
+    /** @brief Return the current time point.
+     * @note TokenBucketJiffyParameters measures time points in jiffies. */
+    static time_point_type now() {
+	return click_jiffies();
+    }
+
+    static time_point_type time_point(time_point_type t) {
+	return t;
+    }
+
+    /** @brief Return @a b - @a a, assuming that @a b was measured after @a a.
+     *
+     * Some time measurements can, in rare cases, appear to jump backwards,
+     * as timestamps do when the user changes the current time.  If this
+     * happens, and @a b < @a a (even though @a b happened after @a a),
+     * time_monotonic_difference must return 0. */
+    static duration_type time_monotonic_difference(time_point_type a, time_point_type b) {
+#if CLICK_JIFFIES_MONOTONIC
+	return b - a;
+#else
+	return (likely(a <= b) ? b - a : 0);
+#endif
+    }
+
+    /** @brief Return true if @a a happened before @a b. */
+    static bool time_less(time_point_type a, time_point_type b) {
+	return click_jiffies_less(a, b);
+    }
+
+    /** @brief Return the number of time points per period.
+     *
+     * Here, this is the number of jiffies per second. */
+    static unsigned frequency() {
+	return CLICK_HZ;
+    }
+
+    /** @brief Return the Timestamp representing a given time point. */
+    static Timestamp timestamp(time_point_type x) {
+	return Timestamp::make_jiffies(x);
+    }
+
+    /** @brief Return the Timestamp representing a given tick count. */
+    static Timestamp timestamp(duration_type x) {
+	return Timestamp::make_jiffies(x);
+    }
+
+};
+
+
+/** @class TokenBucketX include/click/tokenbucket.hh <click/tokenbucket.hh>
+ @brief  Token bucket rate limiter.
+
+ The TokenBucketX class implements a token bucket rate limiter.  It is
+ implemented as a pair of TokenRateX and TokenCounterX.
+
+ Most users will be satisfied with the TokenBucket type, which is equal to
+ TokenBucketX<TokenBucketJiffyParameters<unsigned> >.
+
+ @sa GapRate */
+
+template <typename P>
+class TokenBucketX { public:
+
+    /** @brief The template parameter type. */
+    typedef P parameter_type;
+
+    /** @brief The token rate type. */
+    typedef TokenRateX<P> rate_type;
+
+    /** @brief The token counter type. */
+    typedef TokenCounterX<rate_type> counter_type;
+
+    /** @brief Unsigned type of token counts. */
+    typedef typename rate_type::token_type token_type;
+
+    /** @brief Type of time ticks. */
+    typedef typename rate_type::time_point_type time_point_type;
+
+    /** @brief Unsigned type of differences between time ticks. */
+    typedef typename rate_type::ticks_type ticks_type;
+
+    enum {
+	max_tokens = rate_type::max_tokens
+    };
+
+    /** @brief Construct an idle token bucket.
+     *
+     * The initial time point is 0. */
+    TokenBucketX() {
+    }
+
+    /** @brief Construct an idle or unlimited token bucket.
+     * @param unlimited idle if false, unlimited if true
+     *
+     * The initial time point is 0. */
+    explicit TokenBucketX(bool unlimited)
+	: _rate(unlimited), _bucket(unlimited) {
+    }
+
+    /** @brief Construct a token bucket representing @a rate.
+     * @param rate refill rate in tokens per period
+     * @param capacity maximum token accumulation
+     *
+     * The initial time point is 0 and the token bucket is initially full (the
+     * initial token count equals @a capacity).  The rate is idle if either @a
+     * rate or @a capacity is 0.
+     *
+     * @sa assign(@a rate, @a capacity) */
+    TokenBucketX(token_type rate, token_type capacity)
+	: _rate(rate, capacity), _bucket(rate != 0 && capacity != 0) {
+    }
+
+    /** @brief Set the token bucket rate to idle or unlimited.
+     * @param unlimited idle if false, unlimited if true */
+    void assign(bool unlimited = false) {
+	_rate.assign(unlimited);
+    }
+
+    /** @brief Set the token bucket rate and capacity.
+     * @param rate refill rate in tokens per period
+     * @param capacity maximum token accumulation
+     *
+     * Sets the token bucket's rate to @a rate and capacity to @a capacity.
+     * If either @a rate or @a capacity is 0, the token bucket becomes idle.
+     * The time point is unchanged.
+     *
+     * The ratio of tokens/burst is unchanged by the assignment, so the actual
+     * number of tokens could go up or down, depending on how the rate is
+     * changed.
+     *
+     * @sa assign_adjust */
+    void assign(token_type rate, token_type capacity) {
+	_rate.assign(rate, capacity);
+    }
+
+    /** @brief Set the token bucket rate and capacity, preserving the
+     *  token count.
+     * @param rate refill rate in tokens per period
+     * @param capacity maximum token accumulation
+     *
+     * This performs the same function as assign(), but additionally
+     * keeps the number of tokens roughly stable.
+     *
+     * @sa assign */
+    void assign_adjust(token_type rate, token_type capacity) {
+	rate_type old_rate(_rate);
+	_rate.assign(rate, capacity);
+	_bucket.adjust(old_rate, _rate);
+    }
+
+    /** @brief Return true iff the token rate is unlimited. */
+    bool unlimited() const {
+	return _rate.unlimited();
+    }
+
+    /** @brief Return true iff the token rate is idle. */
+    bool idle() const {
+	return _rate.idle();
+    }
+
+    /** @brief Return the rate in tokens per period.
+     *
+     * Returns max_tokens for unlimited rates.  Imprecise computer arithmetic
+     * may cause the result to differ from the configured rate. */
+    token_type rate() const {
+	return _rate.rate();
+    }
+
+    /** @brief Return the capacity in tokens.
+     *
+     * Returns max_tokens for unlimited rates.  Imprecise computer arithmetic
+     * may cause the result to differ from the configured capacity. */
+    token_type capacity() const {
+	return _rate.capacity();
+    }
+
+    /** @brief Return the number of tokens in the bucket.
+     *
+     * The return value is a lower bound on the number of tokens, since
+     * TokenBucketX keeps track of fractional tokens. */
+    token_type size() const {
+	return _bucket.size(_rate);
+    }
+
+    /** @brief Return the bucket's fullness fraction.
+     *
+     * The return value is a number between 0 and max_tokens, where max_tokens
+     * represents full capacity. */
+    token_type fraction() const {
+	return _bucket.fraction();
+    }
+
+    /** @brief Test if the token bucket is completely empty. */
+    bool empty() const {
+	return _bucket.empty();
+    }
+
+    /** @brief Test if the token bucket is at full capacity. */
+    bool full() const {
+	return _bucket.full();
+    }
+
+    /** @brief Test if the token bucket has at least @a t tokens.
+     *
+     * Returns true whenever @a t is zero or @a rate is unlimited.  Returns
+     * false whenever @a t is greater than @a rate.capacity(). */
+    bool contains(token_type t) const {
+	return _bucket.contains(_rate, t);
+    }
+
+    /** @brief Test if the token bucket is above a fraction of its capacity.
+     * @param f fullness fraction, where max_tokens is full capacity */
+    bool contains_fraction(token_type f) const {
+	return _bucket.contains_fraction(f);
+    }
+
+    /** @brief Clear the token bucket.
+     *
+     * @sa set(), set_full() */
+    void clear() {
+	_bucket.clear();
+    }
+
+    /** @brief Fill the token bucket to capacity.
+     *
+     * @sa clear(), set() */
+    void set_full() {
+	_bucket.set_full();
+    }
+
+    /** @brief Set the token bucket to contain @a t tokens.
+     * @param t number of tokens
+     *
+     * The result will never have more tokens than the associated capacity. */
+    void set(token_type t) {
+	_bucket.set(_rate, t);
+    }
+
+    /** @brief Set the token bucket to a fraction of its capacity.
+     * @param f fullness fraction, where max_tokens is full capacity */
+    void set_fraction(token_type f) {
+	_bucket.set_fraction(f);
+    }
+
+    /** @brief Refill the token bucket to time P::now().
+     *
+     * There are three refill() methods, useful for different methods of
+     * measuring ticks.  This method call parameter_type::now(), which returns
+     * the current time.  Other methods use an explicit time point and a
+     * parameter_type::time(U) method.
+     *
+     * @sa set_time_point */
+    void refill() {
+	_bucket.refill(_rate);
+    }
+
+    /** @brief Refill the token bucket for @a time. */
+    void refill(time_point_type time) {
+	_bucket.refill(_rate, time);
+    }
+
+    /** @brief Refill the token bucket for time P::time_point(@a time). */
+    template <typename U> void refill(U time) {
+	_bucket.refill(_rate, time);
+    }
+
+    /** @brief Set the token bucket's internal time point to @a time.
+     *
+     * Unlike refill(), this method does not refill the counter.
+     *
+     * @sa refill */
+    void set_time_point(time_point_type time) {
+	_bucket.set_time_point(time);
+    }
+
+    /** @brief Remove @a t tokens from the bucket.
+     * @param t number of tokens
+     *
+     * If the token bucket contains less than @a t tokens, the new token
+     * count is 0. */
+    void remove(token_type t) {
+	_bucket.remove(_rate, t);
+    }
+
+    /** @brief Remove @a t tokens from the bucket if it contains @a t tokens.
+     * @param t number of tokens
+     * @return true if @a t tokens were removed, false otherwise
+     *
+     * If the token bucket contains @a t or more tokens, calls remove(@a t)
+     * and returns true.  If it contains less than @a t tokens, returns false
+     * without removing any tokens. */
+    bool remove_if(token_type t) {
+	return _bucket.remove_if(_rate, t);
+    }
+
+    /** @brief Remove a fullness fraction from the bucket.
+     * @param f fullness fraction, where max_tokens is full capacity
+     *
+     * If the token counter is less than @a f full, the new token count is 0. */
+    void remove_fraction(token_type f) {
+	_bucket.remove_fraction(f);
+    }
+
+    /** @brief Remove a fullness fraction from the bucket if it is full enough.
+     * @param f fullness fraction, where max_tokens is full capacity
+     * @return true if @a f was removed, false otherwise
+     *
+     * If fraction() is at least @a f, calls remove_fraction(@a f) and returns
+     * true.  Otherwise, returns false without removing any tokens. */
+    bool remove_fraction_if(token_type f) {
+	return _bucket.remove_fraction_if(f);
+    }
+
+    /** @brief Return the number of ticks until contains(@a t).
+     *
+     * Returns (ticks_type) -1 if passing time will never make contains(@a t)
+     * true. */
+    ticks_type time_until_contains(token_type t) const {
+	return _bucket.time_until_contains(_rate, t);
+    }
+
+    /** @brief Return the number of ticks until contains_fraction(@a f).
+     *
+     * Returns (ticks_type) -1 if passing time will never make
+     * contains_fraction(@a f) true. */
+    ticks_type time_until_contains_fraction(ticks_type f) const {
+	return _bucket.time_until_contains_fraction(_rate, f);
+    }
+
+
+    /** @cond never */
+    inline ticks_type epochs_until_contains(const rate_type &rate, token_type t) const CLICK_DEPRECATED;
+    inline ticks_type epochs_until_contains_fraction(const rate_type &rate, token_type f) const CLICK_DEPRECATED;
+    /** @endcond never */
+
+  private:
+
+    rate_type _rate;
+    counter_type _bucket;
+
+};
+
+/** @cond never */
+template <typename P>
+inline typename TokenBucketX<P>::ticks_type TokenBucketX<P>::epochs_until_contains(const rate_type &rate, token_type t) const
+{
+    return time_until_contains(rate, t);
+}
+template <typename P>
+inline typename TokenBucketX<P>::ticks_type TokenBucketX<P>::epochs_until_contains_fraction(const rate_type &rate, token_type f) const
+{
+    return time_until_contains_fraction(rate, f);
+}
+/** @endcond never */
+
+
+/** @class TokenRate include/click/tokenbucket.hh <click/tokenbucket.hh>
+ * @brief Jiffy-based token bucket rate
+ *
+ * Equivalent to
+ * @link TokenRateX TokenRateX<TokenBucketJiffyParameters<unsigned> >@endlink.
+ * @sa TokenRateX, TokenBucketJiffyParameters */
+typedef TokenRateX<TokenBucketJiffyParameters<unsigned> > TokenRate;
+
+/** @class TokenCounter include/click/tokenbucket.hh <click/tokenbucket.hh>
+ * @brief Jiffy-based token counter
+ *
+ * Equivalent to
+ * @link TokenCounterX TokenCounterX<TokenRate>@endlink.
+ * @sa TokenCounterX, TokenRate */
+typedef TokenCounterX<TokenRate> TokenCounter;
+
+/** @class TokenBucket include/click/tokenbucket.hh <click/tokenbucket.hh>
+ * @brief Jiffy-based token bucket rate limiter
+ *
+ * Equivalent to
+ * @link TokenBucketX TokenBucketX<TokenBucketJiffyParameters<unsigned> >@endlink.
+ * @sa TokenBucketX, TokenBucketJiffyParameters */
+typedef TokenBucketX<TokenBucketJiffyParameters<unsigned> > TokenBucket;
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/type_traits.hh b/openflow/include/click/type_traits.hh
new file mode 100644
index 0000000..1d989a8
--- /dev/null
+++ b/openflow/include/click/type_traits.hh
@@ -0,0 +1,522 @@
+#ifndef CLICK_TYPE_TRAITS_HH
+#define CLICK_TYPE_TRAITS_HH
+CLICK_DECLS
+
+/** @file <click/type_traits.hh>
+  @brief Type traits structures. */
+
+/** @class integral_constant
+  @brief Type wrapper for an integral constant V.
+
+  Offers the following members:
+
+  <dl>
+  <dt>type</dt>
+  <dd>The type itself.</dd>
+  <dt>value_type</dt>
+  <dd>The type argument T.</dd>
+  <dt>value</dt>
+  <dd>The value argument V.</dd>
+  </dl> */
+template <typename T, T V>
+struct integral_constant {
+    typedef integral_constant<T, V> type;
+    typedef T value_type;
+    static constexpr T value = V;
+};
+template <typename T, T V> constexpr T integral_constant<T, V>::value;
+
+/** @class true_type
+  @brief Type wrapper for the constant true. */
+typedef integral_constant<bool, true> true_type;
+
+/** @class false_type
+  @brief Type wrapper for the constant false. */
+typedef integral_constant<bool, false> false_type;
+
+
+/** @class conditional
+  @brief Conditional type transformation.
+
+  If B is true, then conditional<B, T, F>::type is equivalent to T.
+  Otherwise, it is equivalent to F. */
+template <bool B, typename T, typename F> struct conditional {};
+
+template <typename T, typename F>
+struct conditional<true, T, F> {
+    typedef T type;
+};
+
+template <typename T, typename F>
+struct conditional<false, T, F> {
+    typedef F type;
+};
+
+
+/** @class has_trivial_copy
+  @brief Template determining whether T may be copied by memcpy.
+
+  has_trivial_copy<T> is equivalent to true_type if T has a trivial
+  copy constructor, false_type if it does not. */
+#if HAVE___HAS_TRIVIAL_COPY
+template <typename T> struct has_trivial_copy : public integral_constant<bool, __has_trivial_copy(T)> {};
+#else
+template <typename T> struct has_trivial_copy : public false_type {};
+template <> struct has_trivial_copy<unsigned char> : public true_type {};
+template <> struct has_trivial_copy<signed char> : public true_type {};
+template <> struct has_trivial_copy<char> : public true_type {};
+template <> struct has_trivial_copy<unsigned short> : public true_type {};
+template <> struct has_trivial_copy<short> : public true_type {};
+template <> struct has_trivial_copy<unsigned> : public true_type {};
+template <> struct has_trivial_copy<int> : public true_type {};
+template <> struct has_trivial_copy<unsigned long> : public true_type {};
+template <> struct has_trivial_copy<long> : public true_type {};
+# if HAVE_LONG_LONG
+template <> struct has_trivial_copy<unsigned long long> : public true_type {};
+template <> struct has_trivial_copy<long long> : public true_type {};
+# endif
+template <typename T> struct has_trivial_copy<T*> : public true_type {};
+#endif
+class IPAddress;
+template <> struct has_trivial_copy<IPAddress> : public true_type {};
+
+/** @class is_reference
+  @brief Template determining whether T is a reference type.
+
+  is_reference<T> is equivalent to true_type if T is a reference type (T& or
+  T&&), false_type if it is not. */
+template <typename T> struct is_reference : public false_type {};
+template <typename T> struct is_reference<T&> : public true_type {};
+#if HAVE_CXX_RVALUE_REFERENCES
+template <typename T> struct is_reference<T&&> : public true_type {};
+#endif
+
+/** @class remove_reference
+  @brief Template removing any reference layer from T.
+
+  Assuming T is a non-reference type, then all of remove_reference<T>::type,
+  remove_reference<T&>::type, and remove_reference<T&&>::type are equivalent
+  to T. */
+template <typename T> struct remove_reference {
+    typedef T type;
+};
+template <typename T> struct remove_reference<T&> {
+    typedef T type;
+};
+#if HAVE_CXX_RVALUE_REFERENCES
+template <typename T> struct remove_reference<T&&> {
+    typedef T type;
+};
+template <typename T>
+inline typename remove_reference<T>::type&& click_move(T&& x) {
+    return static_cast<typename remove_reference<T>::type&&>(x);
+}
+#endif
+
+template <typename T> struct remove_cv {
+    typedef T type;
+};
+template <typename T> struct remove_cv<const T> {
+    typedef T type;
+};
+template <typename T> struct remove_cv<volatile T> {
+    typedef T type;
+};
+template <typename T> struct remove_cv<const volatile T> {
+    typedef T type;
+};
+
+template <typename T, typename U> struct same_type : public false_type {};
+template <typename T> struct same_type<T, T> : public true_type {};
+
+template <typename T, typename U> struct types_compatible
+    : public same_type<typename remove_cv<T>::type, typename remove_cv<U>::type> {};
+
+/** @class fast_argument
+  @brief Template defining a fast argument type for objects of type T.
+
+  fast_argument<T>::type equals either "const T &" or "T".
+  fast_argument<T>::is_reference is true iff fast_argument<T>::type is
+  a reference. If fast_argument<T>::is_reference is true, then
+  fast_argument<T>::enable_rvalue_reference is a typedef to void; otherwise
+  it is not defined. */
+template <typename T, bool use_reference = (!is_reference<T>::value
+					    && (!has_trivial_copy<T>::value
+						|| sizeof(T) > sizeof(void *)))>
+struct fast_argument;
+
+template <typename T> struct fast_argument<T, true> {
+    static constexpr bool is_reference = true;
+    typedef const T &type;
+#if HAVE_CXX_RVALUE_REFERENCES
+    typedef void enable_rvalue_reference;
+#endif
+};
+template <typename T> struct fast_argument<T, false> {
+    static constexpr bool is_reference = false;
+    typedef T type;
+};
+template <typename T> constexpr bool fast_argument<T, true>::is_reference;
+template <typename T> constexpr bool fast_argument<T, false>::is_reference;
+
+
+/** @class char_array
+    @brief Template defining a fixed-size character array. */
+template <size_t S> struct char_array {
+    char x[S];
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+template <size_t S> struct has_trivial_copy<char_array<S> > : public true_type {};
+
+
+#if HAVE_INT64_TYPES && (!HAVE_LONG_LONG || SIZEOF_LONG_LONG < 8)
+typedef int64_t click_intmax_t;
+typedef uint64_t click_uintmax_t;
+# define SIZEOF_CLICK_INTMAX_T 8
+# define CLICK_ERRHdMAX "^64d"
+# define CLICK_ERRHuMAX "^64u"
+# define CLICK_ERRHoMAX "^64o"
+# define CLICK_ERRHxMAX "^64x"
+# define CLICK_ERRHXMAX "^64X"
+#elif HAVE_LONG_LONG
+typedef long long click_intmax_t;
+typedef unsigned long long click_uintmax_t;
+# define SIZEOF_CLICK_INTMAX_T SIZEOF_LONG_LONG
+# define CLICK_ERRHdMAX "lld"
+# define CLICK_ERRHuMAX "llu"
+# define CLICK_ERRHoMAX "llo"
+# define CLICK_ERRHxMAX "llx"
+# define CLICK_ERRHXMAX "llX"
+#else
+typedef long click_intmax_t;
+typedef unsigned long click_uintmax_t;
+# define SIZEOF_CLICK_INTMAX_T SIZEOF_LONG
+# define CLICK_ERRHdMAX "ld"
+# define CLICK_ERRHuMAX "lu"
+# define CLICK_ERRHoMAX "lo"
+# define CLICK_ERRHxMAX "lx"
+# define CLICK_ERRHXMAX "lX"
+#endif
+
+typedef click_intmax_t click_int_large_t;
+typedef click_uintmax_t click_uint_large_t;
+#define SIZEOF_CLICK_INT_LARGE_T SIZEOF_CLICK_INTMAX_T
+#define CLICK_ERRHdLARGE CLICK_ERRHdMAX
+#define CLICK_ERRHuLARGE CLICK_ERRHuMAX
+#define CLICK_ERRHoLARGE CLICK_ERRHoMAX
+#define CLICK_ERRHxLARGE CLICK_ERRHxMAX
+#define CLICK_ERRHXLARGE CLICK_ERRHXMAX
+
+
+/** @class integer_traits
+  @brief Numeric traits template.
+
+  The integer_traits template defines constants and type definitions related
+  to integers.  Where T is an integer, integer_traits<T> defines:
+
+  <dl>
+  <dt>const T const_min</dt>
+  <dd>The minimum value defined for the type.</dd>
+  <dt>const T const_max</dt>
+  <dd>The maximum value available for the type.</dd>
+  <dt>const bool is_numeric</dt>
+  <dd>True.</dd>
+  <dt>const bool is_integral</dt>
+  <dd>True.</dd>
+  <dt>const bool is_signed</dt>
+  <dd>True iff the type is signed.</dd>
+  <dt>signed_type (typedef)</dt>
+  <dd>Signed version of the type.</dd>
+  <dt>unsigned_type (typedef)</dt>
+  <dd>Unsigned version of the type.</dd>
+  </dl>
+
+  If T is <em>not</em> an integer, integer_traits<T> defines:
+
+  <dl>
+  <dt>constexpr bool is_numeric</dt>
+  <dd>False.</dd>
+  <dt>constexpr bool is_integral</dt>
+  <dd>False.</dd>
+  </dl> */
+template <typename T>
+struct integer_traits {
+    static constexpr bool is_numeric = false;
+    static constexpr bool is_integral = false;
+};
+template <typename T> constexpr bool integer_traits<T>::is_numeric;
+template <typename T> constexpr bool integer_traits<T>::is_integral;
+
+template <>
+struct integer_traits<unsigned char> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr unsigned char const_min = 0;
+    static constexpr unsigned char const_max = ~const_min;
+    static constexpr bool is_signed = false;
+    typedef signed char signed_type;
+    typedef unsigned char unsigned_type;
+    typedef unsigned char type;
+    typedef click_uintmax_t max_type;
+    static bool negative(type) { return false; }
+};
+
+template <>
+struct integer_traits<signed char> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr signed char const_min = -128;
+    static constexpr signed char const_max = 127;
+    static constexpr bool is_signed = true;
+    typedef signed char signed_type;
+    typedef unsigned char unsigned_type;
+    typedef signed char type;
+    typedef click_intmax_t max_type;
+    static bool negative(type x) { return x < 0; }
+};
+
+#if __CHAR_UNSIGNED__
+template <>
+struct integer_traits<char> : public integer_traits<unsigned char> {
+    static constexpr char const_min = 0;
+    static constexpr char const_max = ~const_min;
+    typedef char type;
+    static bool negative(type) { return false; }
+};
+#else
+template <>
+struct integer_traits<char> : public integer_traits<signed char> {
+    static constexpr char const_min = -128;
+    static constexpr char const_max = 127;
+    typedef char type;
+    static bool negative(type x) { return x < 0; }
+};
+#endif
+
+template <>
+struct integer_traits<unsigned short> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr unsigned short const_min = 0;
+    static constexpr unsigned short const_max = ~const_min;
+    static constexpr bool is_signed = false;
+    typedef short signed_type;
+    typedef unsigned short unsigned_type;
+    typedef unsigned short type;
+    typedef click_uintmax_t max_type;
+    static bool negative(type) { return false; }
+};
+
+template <>
+struct integer_traits<short> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr short const_min = -32768;
+    static constexpr short const_max = 32767;
+    static constexpr bool is_signed = true;
+    typedef short signed_type;
+    typedef unsigned short unsigned_type;
+    typedef short type;
+    typedef click_intmax_t max_type;
+    static bool negative(type x) { return x < 0; }
+};
+
+template <>
+struct integer_traits<unsigned int> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr unsigned int const_min = 0;
+    static constexpr unsigned int const_max = ~const_min;
+    static constexpr bool is_signed = false;
+    typedef int signed_type;
+    typedef unsigned int unsigned_type;
+    typedef unsigned int type;
+    typedef click_uintmax_t max_type;
+    static bool negative(type) { return false; }
+};
+
+template <>
+struct integer_traits<int> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr int const_min = 1 << (8*SIZEOF_INT - 1);
+    static constexpr int const_max = (unsigned) const_min - 1;
+    static constexpr bool is_signed = true;
+    typedef int signed_type;
+    typedef unsigned int unsigned_type;
+    typedef int type;
+    typedef click_intmax_t max_type;
+    static bool negative(type x) { return x < 0; }
+};
+
+template <>
+struct integer_traits<unsigned long> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr unsigned long const_min = 0;
+    static constexpr unsigned long const_max = ~const_min;
+    static constexpr bool is_signed = false;
+    typedef long signed_type;
+    typedef unsigned long unsigned_type;
+    typedef unsigned long type;
+    typedef click_uintmax_t max_type;
+    static bool negative(type) { return false; }
+};
+
+template <>
+struct integer_traits<long> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr long const_min = (long) 1 << (8*SIZEOF_LONG - 1);
+    static constexpr long const_max = (unsigned long) const_min - 1;
+    static constexpr bool is_signed = true;
+    typedef long signed_type;
+    typedef unsigned long unsigned_type;
+    typedef long type;
+    typedef click_intmax_t max_type;
+    static bool negative(type x) { return x < 0; }
+};
+
+#if HAVE_LONG_LONG
+template <>
+struct integer_traits<unsigned long long> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr unsigned long long const_min = 0;
+    static constexpr unsigned long long const_max = ~const_min;
+    static constexpr bool is_signed = false;
+    typedef long long signed_type;
+    typedef unsigned long long unsigned_type;
+    typedef unsigned long long type;
+    typedef click_uintmax_t max_type;
+    static bool negative(type) { return false; }
+};
+
+template <>
+struct integer_traits<long long> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr long long const_min = (long long) 1 << (8*SIZEOF_LONG_LONG - 1);
+    static constexpr long long const_max = (unsigned long long) const_min - 1;
+    static constexpr bool is_signed = true;
+    typedef long long signed_type;
+    typedef unsigned long long unsigned_type;
+    typedef long long type;
+    typedef click_intmax_t max_type;
+    static bool negative(type x) { return x < 0; }
+};
+#endif
+
+#if HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG && !HAVE_INT64_IS_LONG_LONG
+template <>
+struct integer_traits<uint64_t> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr uint64_t const_min = 0;
+    static constexpr uint64_t const_max = ~const_min;
+    static constexpr bool is_signed = false;
+    typedef int64_t signed_type;
+    typedef uint64_t unsigned_type;
+    typedef uint64_t type;
+    typedef click_uintmax_t max_type;
+    static bool negative(type) { return false; }
+};
+
+template <>
+struct integer_traits<int64_t> {
+    static constexpr bool is_numeric = true;
+    static constexpr bool is_integral = true;
+    static constexpr int64_t const_min = (int64_t) 1 << 63;
+    static constexpr int64_t const_max = (uint64_t) const_min - 1;
+    static constexpr bool is_signed = true;
+    typedef int64_t signed_type;
+    typedef uint64_t unsigned_type;
+    typedef int64_t type;
+    typedef click_intmax_t max_type;
+    static bool negative(type x) { return x < 0; }
+};
+#endif
+
+
+/** @class make_signed
+  @brief Signed integer type transformation.
+
+  Given an integer type T, the type make_signed<T>::type is the signed version
+  of T.
+
+  @sa integer_traits */
+template <typename T>
+struct make_signed {
+    typedef typename integer_traits<T>::signed_type type;
+};
+
+/** @class make_unsigned
+  @brief Unsigned integer type transformation.
+
+  Given an integer type T, the type make_unsigned<T>::type is the unsigned
+  version of T.
+
+  @sa integer_traits */
+template <typename T>
+struct make_unsigned {
+    typedef typename integer_traits<T>::unsigned_type type;
+};
+
+
+/** @cond never */
+template <typename T, typename Thalf>
+struct make_fast_half_integer {
+    typedef T type;
+    typedef Thalf half_type;
+    static constexpr int half_bits = int(sizeof(type) * 4);
+    static constexpr type half_value = type(1) << half_bits;
+    static half_type low(type x) {
+	return x & (half_value - 1);
+    }
+    static half_type high(type x) {
+	return x >> (sizeof(type) * 4);
+    }
+};
+/** @endcond never */
+
+/** @class fast_half_integer
+  @brief Type transformation for big integers. */
+template <typename T> struct fast_half_integer : public make_fast_half_integer<T, T> {};
+
+#if SIZEOF_LONG >= 8 && SIZEOF_LONG <= 2 * SIZEOF_INT
+template <> struct fast_half_integer<unsigned long> : public make_fast_half_integer<unsigned long, unsigned int> {};
+#endif
+
+#if HAVE_LONG_LONG && SIZEOF_LONG_LONG <= 2 * SIZEOF_INT
+template <> struct fast_half_integer<unsigned long long> : public make_fast_half_integer<unsigned long long, unsigned int> {};
+#endif
+
+#if HAVE_INT64_TYPES && !HAVE_INT64_IS_LONG_LONG && !HAVE_INT64_IS_LONG && SIZEOF_INT >= 4
+template <> struct fast_half_integer<uint64_t> : public make_fast_half_integer<uint64_t, unsigned int> {};
+#endif
+
+
+template <int n, typename Limb, typename V>
+struct extract_integer_helper {
+    static void extract(const Limb *x, V &value) {
+	extract_integer_helper<n - 1, Limb, V>::extract(x + 1, value);
+	value = (value << (sizeof(Limb) * 8)) | *x;
+    }
+};
+
+template <typename Limb, typename V>
+struct extract_integer_helper<1, Limb, V> {
+    static void extract(const Limb *x, V &value) {
+	value = x[0];
+    }
+};
+
+/** @brief Extract an integral type from a multi-limb integer. */
+template <typename Limb, typename V>
+inline void extract_integer(const Limb *x, V &value) {
+    extract_integer_helper<
+	int((sizeof(V) + sizeof(Limb) - 1) / sizeof(Limb)), Limb, V
+	>::extract(x, value);
+}
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/userutils.hh b/openflow/include/click/userutils.hh
new file mode 100644
index 0000000..af28375
--- /dev/null
+++ b/openflow/include/click/userutils.hh
@@ -0,0 +1,97 @@
+// -*- c-basic-offset: 2; related-file-name: "../../lib/userutils.cc" -*-
+#ifndef CLICK_USERUTILS_HH
+#define CLICK_USERUTILS_HH
+#include <click/archive.hh>
+#include <stdio.h>
+CLICK_DECLS
+class ErrorHandler;
+
+inline bool glob_match(const String &string, const String &pattern) {
+    return string.glob_match(pattern);
+}
+
+String percent_substitute(const String &string, int format1, ...);
+
+/** @brief strcmp() replacement that compares numbers numerically.
+ * @return < 0 if @a a < @a b, > 0 if @a a > @a b, 0 if @a a == @a b
+ *
+ * Compares strings of digit characters like decimal numbers, and other
+ * characters using character-by-character comparison.  For example:
+ * @code
+ * assert(click_strcmp("a", "b") < 0);
+ * assert(click_strcmp("a9", "a10") < 0);
+ * assert(click_strcmp("a001", "a2") < 0);   // 1 < 2
+ * assert(click_strcmp("a001", "a1") > 0);   // longer string of initial zeros
+ * @endcode
+ *
+ * Letters are compared first by lowercase.  If two strings are identical
+ * except for case, then uppercase letters compare less than lowercase
+ * letters.  For example:
+ * @code
+ * assert(click_strcmp("a", "B") < 0);
+ * assert(click_strcmp("Baa", "baa") < 0);
+ * assert(click_strcmp("Baa", "caa") < 0);
+ * assert(click_strcmp("baa", "Caa") < 0);
+ * @endcode
+ *
+ * Two strings compare as equal only if they are character-by-character
+ * equal. */
+int click_strcmp(const String &a, const String &b);
+
+/** @brief Portable replacement for sigaction().
+ * @param signum signal number
+ * @param handler signal action function
+ * @param resethand true if the handler should be reset when the signal is
+ * received, false otherwise
+ *
+ * Expands to either sigaction() or signal(). */
+void click_signal(int signum, void (*handler)(int), bool resethand);
+
+const char *filename_landmark(const char *, bool file_is_expr = false);
+
+String file_string(FILE *, ErrorHandler * = 0);
+String file_string(String, ErrorHandler * = 0);
+
+String unique_tmpnam(const String &, ErrorHandler * = 0);
+void remove_file_on_exit(const String &);
+bool path_allows_default_path(String path);
+String click_mktmpdir(ErrorHandler * = 0);
+
+const char *clickpath();
+void set_clickpath(const char *);
+
+String clickpath_find_file(const String& filename, const char *subdir,
+			   String default_path, ErrorHandler * = 0);
+void clickpath_expand_path(const char* subdir, const String& default_path, Vector<String>&);
+
+void parse_tabbed_lines(const String &, Vector<String> *, ...);
+
+ArchiveElement init_archive_element(const String &, int);
+
+String shell_quote(const String &, bool quote_tilde = false);
+String shell_command_output_string(String command_line, const String &command_stdin, ErrorHandler *);
+
+
+/** @brief Return true iff @a buf looks like it contains compressed data.
+ * @param buf buffer
+ * @param len number of characters in @a buf, should be >= 10
+ *
+ * Checks @a buf for signatures corresponding to zip, gzip, and bzip2
+ * compressed data, returning true iff a signature matches.  @a len can be any
+ * number, but should be relatively large or compression might not be
+ * detected.  Currently it must be at least 10 to detect bzip2 compression. */
+bool compressed_data(const unsigned char *buf, int len);
+
+FILE *open_uncompress_pipe(const String &filename, const unsigned char *buf,
+			   int len, ErrorHandler *errh);
+
+int compressed_filename(const String &filename);
+FILE *open_compress_pipe(const String &filename, ErrorHandler *);
+
+#if HAVE_DYNAMIC_LINKING
+int clickdl_load_package(String, ErrorHandler *);
+void clickdl_load_requirement(String, const Vector<ArchiveElement> *archive, ErrorHandler *);
+#endif
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/variableenv.hh b/openflow/include/click/variableenv.hh
new file mode 100644
index 0000000..4ccb74d
--- /dev/null
+++ b/openflow/include/click/variableenv.hh
@@ -0,0 +1,50 @@
+// -*- c-basic-offset: 4; related-file-name: "../../lib/variableenv.cc" -*-
+#ifndef CLICK_VARIABLEENVIRONMENT_HH
+#define CLICK_VARIABLEENVIRONMENT_HH
+#include <click/string.hh>
+#include <click/vector.hh>
+CLICK_DECLS
+class StringAccum;
+
+class VariableExpander { public:
+
+    VariableExpander()			{ }
+    virtual ~VariableExpander()		{ }
+
+    virtual int expand(const String &var, String &expansion, int vartype, int depth) const = 0;
+
+};
+
+class VariableEnvironment : public VariableExpander { public:
+
+    VariableEnvironment(VariableEnvironment *parent);
+
+    int depth() const			{ return _depth; }
+    int size() const			{ return _names.size(); }
+
+    bool defines(const String &name) const;
+    const String &name(int i) const	{ return _names[i]; }
+    const Vector<String> &values() const { return _values; }
+    const String &value(int i) const	{ return _values[i]; }
+    const String &value(const String &name, bool &found) const;
+
+    void clear()			{ _names.clear(); _values.clear(); }
+
+    VariableEnvironment *parent_of(int depth) const;
+    bool define(const String &name, const String &value, bool override);
+    int expand(const String &var, String &expansion, int vartype, int depth) const;
+
+  private:
+
+    Vector<String> _names;
+    Vector<String> _values;
+    int _depth;
+    VariableEnvironment *_parent;
+
+};
+
+String cp_expand(const String &str, const VariableExpander &env,
+		 bool expand_quote = false, int depth = 0);
+
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/vector.cc b/openflow/include/click/vector.cc
new file mode 100644
index 0000000..1944622
--- /dev/null
+++ b/openflow/include/click/vector.cc
@@ -0,0 +1,165 @@
+/*
+ * vector.{cc,hh} -- simple array template class
+ * Eddie Kohler
+ *
+ * Copyright (c) 1999-2000 Massachusetts Institute of Technology
+ * Copyright (c) 2006 Regents of the University of California
+ * Copyright (c) 2011 Eddie Kohler
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the conditions
+ * listed in the Click LICENSE file. These conditions include: you must
+ * preserve this copyright notice, and you cannot mention the copyright
+ * holders in advertising related to the Software without their permission.
+ * The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ * notice is a summary of the Click LICENSE file; the license in that file is
+ * legally binding.
+ */
+
+#ifndef CLICK_VECTOR_CC
+#define CLICK_VECTOR_CC
+#include <click/glue.hh>
+#include <click/vector.hh>
+CLICK_DECLS
+/** @cond never */
+
+template <typename AM>
+vector_memory<AM>::~vector_memory()
+{
+    AM::destroy(l_, n_);
+    CLICK_LFREE(l_, capacity_ * sizeof(type));
+}
+
+template <typename AM>
+void vector_memory<AM>::assign(const vector_memory<AM> &x)
+{
+    if (&x != this) {
+	AM::destroy(l_, n_);
+	AM::mark_noaccess(l_, n_);
+	n_ = 0;
+	if (reserve_and_push_back(x.n_, 0)) {
+	    n_ = x.n_;
+	    AM::mark_undefined(l_, n_);
+	    AM::copy(l_, x.l_, n_);
+	}
+    }
+}
+
+template <typename AM>
+void vector_memory<AM>::assign(size_type n, const type *vp)
+{
+    if (unlikely(need_argument_copy(vp))) {
+	type v_copy(*vp);
+	return assign(n, &v_copy);
+    }
+
+    resize(0, vp);
+    resize(n, vp);
+}
+
+template <typename AM>
+typename vector_memory<AM>::iterator vector_memory<AM>::insert(iterator it, const type *vp)
+{
+    assert(it >= begin() && it <= end());
+    if (unlikely(need_argument_copy(vp))) {
+	type v_copy(*vp);
+	return insert(it, &v_copy);
+    }
+
+    if (n_ == capacity_) {
+	size_type pos = it - begin();
+	if (!reserve_and_push_back(-1, 0))
+	    return end();
+	it = begin() + pos;
+    }
+    AM::mark_undefined(l_ + n_, 1);
+    AM::move(it + 1, it, end() - it);
+    AM::mark_undefined(it, 1);
+    AM::fill(it, 1, vp);
+    ++n_;
+    return it;
+}
+
+template <typename AM>
+typename vector_memory<AM>::iterator vector_memory<AM>::erase(iterator a, iterator b)
+{
+    if (a < b) {
+	assert(a >= begin() && b <= end());
+	AM::move_onto(a, b, end() - b);
+	n_ -= b - a;
+	AM::destroy(end(), b - a);
+	AM::mark_noaccess(end(), b - a);
+	return a;
+    } else
+	return b;
+}
+
+template <typename AM>
+bool vector_memory<AM>::reserve_and_push_back(size_type want, const type *push_vp)
+{
+    if (unlikely(push_vp && need_argument_copy(push_vp))) {
+	type push_v_copy(*push_vp);
+	return reserve_and_push_back(want, &push_v_copy);
+    }
+
+    if (want < 0)
+	want = (capacity_ > 0 ? capacity_ * 2 : 4);
+
+    if (want > capacity_) {
+	type *new_l = (type *) CLICK_LALLOC(want * sizeof(type));
+	if (!new_l)
+	    return false;
+	AM::mark_noaccess(new_l + n_, want - n_);
+	AM::move(new_l, l_, n_);
+	CLICK_LFREE(l_, capacity_ * sizeof(type));
+	l_ = new_l;
+	capacity_ = want;
+    }
+
+    if (unlikely(push_vp))
+	push_back(push_vp);
+    return true;
+}
+
+template <typename AM>
+void vector_memory<AM>::resize(size_type n, const type *vp)
+{
+    if (unlikely(need_argument_copy(vp))) {
+	type v_copy(*vp);
+	return resize(n, &v_copy);
+    }
+
+    if (n <= capacity_ || reserve_and_push_back(n, 0)) {
+	assert(n >= 0);
+	if (n < n_) {
+	    AM::destroy(l_ + n, n_ - n);
+	    AM::mark_noaccess(l_ + n, n_ - n);
+	}
+	if (n_ < n) {
+	    AM::mark_undefined(l_ + n_, n - n_);
+	    AM::fill(l_ + n_, n - n_, vp);
+	}
+	n_ = n;
+    }
+}
+
+template <typename AM>
+void vector_memory<AM>::swap(vector_memory<AM> &x)
+{
+    type *l = l_;
+    l_ = x.l_;
+    x.l_ = l;
+
+    size_type n = n_;
+    n_ = x.n_;
+    x.n_ = n;
+
+    size_type capacity = capacity_;
+    capacity_ = x.capacity_;
+    x.capacity_ = capacity;
+}
+
+/** @endcond never */
+CLICK_ENDDECLS
+#endif
diff --git a/openflow/include/click/vector.hh b/openflow/include/click/vector.hh
new file mode 100644
index 0000000..9cce68e
--- /dev/null
+++ b/openflow/include/click/vector.hh
@@ -0,0 +1,518 @@
+#ifndef CLICK_VECTOR_HH
+#define CLICK_VECTOR_HH
+#include <click/algorithm.hh>
+#include <click/array_memory.hh>
+CLICK_DECLS
+
+/** @file <click/vector.hh>
+  @brief Click's vector container template. */
+
+/** @cond never */
+template <typename AM> class vector_memory { public:
+    typedef int size_type;
+    typedef typename AM::type type;
+    typedef type *iterator;
+    inline bool need_argument_copy(const type *argp) const {
+	return fast_argument<type>::is_reference
+	    && (uintptr_t) argp - (uintptr_t) l_ < (size_t) (n_ * sizeof(type));
+    }
+
+    vector_memory()
+	: l_(0), n_(0), capacity_(0) {
+    }
+    ~vector_memory();
+
+    void assign(const vector_memory<AM> &x);
+    void assign(size_type n, const type *vp);
+    void resize(size_type n, const type *vp);
+    iterator begin() {
+	return l_;
+    }
+    iterator end() {
+	return l_ + n_;
+    }
+    iterator insert(iterator it, const type *vp);
+    iterator erase(iterator a, iterator b);
+    inline void push_back(const type *vp) {
+	if (n_ < capacity_) {
+	    AM::mark_undefined(l_ + n_, 1);
+	    AM::fill(l_ + n_, 1, vp);
+	    ++n_;
+	} else
+	    reserve_and_push_back(-1, vp);
+    }
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline void move_construct_back(type* vp) {
+	if (n_ < capacity_) {
+	    AM::mark_undefined(l_ + n_, 1);
+	    AM::move_construct(l_ + n_, vp);
+	    ++n_;
+	} else
+	    reserve_and_push_back(-1, vp);
+    }
+#endif
+    inline void pop_back() {
+	assert(n_ > 0);
+	--n_;
+	AM::destroy(l_ + n_, 1);
+	AM::mark_noaccess(l_ + n_, 1);
+    }
+    inline void clear() {
+	AM::destroy(l_, n_);
+	AM::mark_noaccess(l_, n_);
+	n_ = 0;
+    }
+    bool reserve_and_push_back(size_type n, const type *vp);
+    void swap(vector_memory<AM> &x);
+
+    type *l_;
+    size_type n_;
+    size_type capacity_;
+};
+/** @endcond never */
+
+
+/** @class Vector
+  @brief Vector template.
+
+  Vector implements a vector, or growable array, suitable for use in the
+  kernel or at user level. Its interface should be compatible with C++'s
+  std::vector, although that type has more methods. Vector elements are
+  accessed with operator[] like arrays, and can be resized and expanded
+  through append operations (see push_back() and resize()). A common (and
+  efficient) usage pattern grows a Vector through repeated push_back() calls.
+
+  Vector iterators are pointers into the underlying array. This can simplify
+  interactions between Vector and code that expects conventional C arrays.
+
+  Vector's push_front() and pop_front() operations are quite expensive (O(size())
+  complexity). For fast push_front() and pop_front() operations, use Deque.
+
+  Example code:
+  @code
+  Vector<int> v;
+  printf("%d\n", v.size());         // prints "0"
+
+  v.push_back(1);
+  v.push_back(2);
+  printf("%d\n", v.size());         // prints "2"
+  printf("%d %d\n", v[0], v[1]);    // prints "1 2"
+
+  Vector<int>::iterator it = v.begin();
+  int *ip = it;                     // Vector iterators are pointers
+  assert(it == v.end() - 2);
+
+  v.erase(v.begin());
+  printf("%d\n", v.size());         // prints "1"
+  printf("%d\n", v[0]);             // prints "2"
+  @endcode
+*/
+template <typename T>
+class Vector {
+
+    typedef typename array_memory<T>::type array_memory_type;
+    mutable vector_memory<array_memory_type> vm_;
+
+  public:
+
+    typedef T value_type;		///< Value type.
+    typedef T &reference;		///< Reference to value type.
+    typedef const T &const_reference;	///< Const reference to value type.
+    typedef T *pointer;			///< Pointer to value type.
+    typedef const T *const_pointer;	///< Pointer to const value type.
+
+    /** @brief Type used for value arguments (either T or const T &). */
+    typedef typename fast_argument<T>::type value_argument_type;
+    typedef const T &const_access_type;
+
+    typedef int size_type;		///< Type of sizes (size()).
+
+    typedef T *iterator;		///< Iterator type.
+    typedef const T *const_iterator;	///< Const iterator type.
+
+    /** @brief Constant passed to reserve() to grow the Vector. */
+    enum { RESERVE_GROW = (size_type) -1 };
+
+
+    explicit inline Vector();
+    explicit inline Vector(size_type n, value_argument_type v);
+    inline Vector(const Vector<T> &x);
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline Vector(Vector<T> &&x);
+#endif
+
+    inline Vector<T> &operator=(const Vector<T> &x);
+#if HAVE_CXX_RVALUE_REFERENCES
+    inline Vector<T> &operator=(Vector<T> &&x);
+#endif
+    inline Vector<T> &assign(size_type n, value_argument_type v = T());
+
+    inline iterator begin();
+    inline iterator end();
+    inline const_iterator begin() const;
+    inline const_iterator end() const;
+    inline const_iterator cbegin() const;
+    inline const_iterator cend() const;
+
+    inline size_type size() const;
+    inline size_type capacity() const;
+    inline bool empty() const;
+    inline void resize(size_type n, value_argument_type v = T());
+    inline bool reserve(size_type n);
+
+    inline T &operator[](size_type i);
+    inline const T &operator[](size_type i) const;
+    inline T &at(size_type i);
+    inline const T &at(size_type i) const;
+    inline T &front();
+    inline const T &front() const;
+    inline T &back();
+    inline const T &back() const;
+
+    inline T &unchecked_at(size_type i);
+    inline const T &unchecked_at(size_type i) const;
+    inline T &at_u(size_type i) CLICK_DEPRECATED;
+    inline const T &at_u(size_type i) const CLICK_DEPRECATED;
+
+    inline T *data();
+    inline const T *data() const;
+
+    inline void push_back(value_argument_type v);
+#if HAVE_CXX_RVALUE_REFERENCES
+    template <typename A = fast_argument<T> >
+    inline typename A::enable_rvalue_reference push_back(T &&v);
+#endif
+    inline void pop_back();
+    inline void push_front(value_argument_type v);
+    inline void pop_front();
+
+    inline iterator insert(iterator it, value_argument_type v);
+    inline iterator erase(iterator it);
+    inline iterator erase(iterator a, iterator b);
+
+    inline void clear();
+
+    inline void swap(Vector<T> &x);
+
+};
+
+/** @brief Construct an empty vector. */
+template <typename T>
+inline Vector<T>::Vector() {
+}
+
+/** @brief Construct a vector containing @a n copies of @a v. */
+template <typename T>
+inline Vector<T>::Vector(size_type n, value_argument_type v) {
+    vm_.resize(n, array_memory_type::cast(&v));
+}
+
+/** @brief Construct a vector as a copy of @a x. */
+template <typename T>
+inline Vector<T>::Vector(const Vector<T> &x) {
+    vm_.assign(x.vm_);
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+/** @overload */
+template <typename T>
+inline Vector<T>::Vector(Vector<T> &&x) {
+    vm_.swap(x.vm_);
+}
+#endif
+
+/** @brief Return the number of elements. */
+template <typename T>
+inline typename Vector<T>::size_type Vector<T>::size() const {
+    return vm_.n_;
+}
+
+/** @brief Test if the vector is empty (size() == 0). */
+template <typename T>
+inline bool Vector<T>::empty() const {
+    return vm_.n_ == 0;
+}
+
+/** @brief Return the vector's capacity.
+
+    The capacity is greater than or equal to the size(). Functions such as
+    resize(n) will not allocate new memory for the vector if n <=
+    capacity(). */
+template <typename T>
+inline typename Vector<T>::size_type Vector<T>::capacity() const {
+    return vm_.capacity_;
+}
+
+/** @brief Return an iterator for the first element in the vector. */
+template <typename T>
+inline typename Vector<T>::iterator Vector<T>::begin() {
+    return (iterator) vm_.l_;
+}
+
+/** @overload */
+template <typename T>
+inline typename Vector<T>::const_iterator Vector<T>::begin() const {
+    return (const_iterator) vm_.l_;
+}
+
+/** @brief Return an iterator for the end of the vector.
+    @invariant end() == begin() + size() */
+template <typename T>
+inline typename Vector<T>::iterator Vector<T>::end() {
+    return (iterator) vm_.l_ + vm_.n_;
+}
+
+/** @overload */
+template <typename T>
+inline typename Vector<T>::const_iterator Vector<T>::end() const {
+    return (const_iterator) vm_.l_ + vm_.n_;
+}
+
+/** @brief Return a const_iterator for the beginning of the vector. */
+template <typename T>
+inline typename Vector<T>::const_iterator Vector<T>::cbegin() const {
+    return (const_iterator) vm_.l_;
+}
+
+/** @brief Return a const_iterator for the end of the vector.
+    @invariant cend() == cbegin() + size() */
+template <typename T>
+inline typename Vector<T>::const_iterator Vector<T>::cend() const {
+    return (iterator) vm_.l_ + vm_.n_;
+}
+
+/** @brief Return a reference to the <em>i</em>th element.
+    @pre 0 <= @a i < size() */
+template <typename T>
+inline T &Vector<T>::operator[](size_type i) {
+    assert((unsigned) i < (unsigned) vm_.n_);
+    return *(T *)&vm_.l_[i];
+}
+
+/** @overload */
+template <typename T>
+inline const T &Vector<T>::operator[](size_type i) const {
+    assert((unsigned) i < (unsigned) vm_.n_);
+    return *(T *)&vm_.l_[i];
+}
+
+/** @brief Return a reference to the <em>i</em>th element.
+    @pre 0 <= @a i < size()
+    @sa operator[]() */
+template <typename T>
+inline T &Vector<T>::at(size_type i) {
+    return operator[](i);
+}
+
+/** @overload */
+template <typename T>
+inline const T &Vector<T>::at(size_type i) const {
+    return operator[](i);
+}
+
+/** @brief Return a reference to the first element.
+    @pre !empty() */
+template <typename T>
+inline T &Vector<T>::front() {
+    return operator[](0);
+}
+
+/** @overload */
+template <typename T>
+inline const T &Vector<T>::front() const {
+    return operator[](0);
+}
+
+/** @brief Return a reference to the last element (number size()-1).
+    @pre !empty() */
+template <typename T>
+inline T &Vector<T>::back() {
+    return operator[](vm_.n_ - 1);
+}
+
+/** @overload */
+template <typename T>
+inline const T &Vector<T>::back() const {
+    return operator[](vm_.n_ - 1);
+}
+
+/** @brief Return a reference to the <em>i</em>th element.
+    @pre 0 <= @a i < size()
+
+    Unlike operator[]() and at(), this function does not check bounds,
+    even if assertions are enabled. Use with caution. */
+template <typename T>
+inline T &Vector<T>::unchecked_at(size_type i) {
+    return *(T *)&vm_.l_[i];
+}
+
+/** @overload */
+template <typename T>
+inline const T &Vector<T>::unchecked_at(size_type i) const {
+    return *(T *)&vm_.l_[i];
+}
+
+/** @cond never */
+template <typename T>
+inline T &Vector<T>::at_u(size_type i) {
+    return unchecked_at(i);
+}
+
+template <typename T>
+inline const T &Vector<T>::at_u(size_type i) const {
+    return unchecked_at(i);
+}
+/** @endcond never */
+
+/** @brief Return a pointer to the vector's data.
+
+    May be null if empty(). */
+template <typename T>
+inline T *Vector<T>::data() {
+    return (T *) vm_.l_;
+}
+
+/** @overload */
+template <typename T>
+inline const T *Vector<T>::data() const {
+    return (const T *) vm_.l_;
+}
+
+/** @brief Resize the vector to contain @a n elements.
+    @param n new size
+    @param v value used to fill new elements */
+template <typename T>
+inline void Vector<T>::resize(size_type n, value_argument_type v) {
+    vm_.resize(n, array_memory_type::cast(&v));
+}
+
+/** @brief Append element @a v.
+
+    A copy of @a v is inserted at position size(). Takes amortized O(1)
+    time. */
+template <typename T>
+inline void Vector<T>::push_back(value_argument_type v) {
+    vm_.push_back(array_memory_type::cast(&v));
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+/** @overload */
+template <typename T> template <typename A>
+inline typename A::enable_rvalue_reference Vector<T>::push_back(T&& v)
+{
+    vm_.move_construct_back(array_memory_type::cast(&v));
+}
+#endif
+
+/** @brief Remove the last element.
+
+    Takes O(1) time. */
+template <typename T>
+inline void Vector<T>::pop_back() {
+    vm_.pop_back();
+}
+
+/** @brief Prepend element @a v.
+
+    A copy of @a v is added to position 0. Other elements are shifted one
+    position forward. Takes O(size()) time. */
+template <typename T>
+inline void Vector<T>::push_front(value_argument_type v) {
+    vm_.insert(vm_.l_, array_memory_type::cast(&v));
+}
+
+/** @brief Remove the first element.
+
+    Other elements are shifted one position backward. Takes O(size())
+    time. */
+template <typename T>
+inline void Vector<T>::pop_front() {
+    vm_.erase(vm_.l_, vm_.l_ + 1);
+}
+
+/** @brief Insert @a v before position @a it.
+    @return An iterator pointing at the new element. */
+template <typename T>
+inline typename Vector<T>::iterator
+Vector<T>::insert(iterator it, value_argument_type v) {
+    return (iterator) vm_.insert(array_memory_type::cast(it),
+				 array_memory_type::cast(&v));
+}
+
+/** @brief Remove the element at position @a it.
+    @return An iterator pointing at the element following @a it. */
+template <typename T>
+inline typename Vector<T>::iterator
+Vector<T>::erase(iterator it) {
+    return (it < end() ? erase(it, it + 1) : it);
+}
+
+/** @brief Remove the elements in [@a a, @a b).
+    @return An iterator corresponding to @a b. */
+template <typename T>
+inline typename Vector<T>::iterator
+Vector<T>::erase(iterator a, iterator b) {
+    return (iterator) vm_.erase(array_memory_type::cast(a),
+				array_memory_type::cast(b));
+}
+
+/** @brief Remove all elements.
+    @post size() == 0 */
+template <typename T>
+inline void Vector<T>::clear() {
+    vm_.clear();
+}
+
+/** @brief Reserve space for at least @a n more elements.
+    @return true iff reserve succeeded.
+
+    This function changes the vector's capacity(), not its size(). If
+    reserve(@a n) succeeds, then any succeeding call to resize(@a m) with @a
+    m < @a n will succeed without allocating vector memory. */
+template <typename T>
+inline bool Vector<T>::reserve(size_type n) {
+    return vm_.reserve_and_push_back(n, 0);
+}
+
+/** @brief Swap the contents of this vector and @a x. */
+template <typename T>
+inline void Vector<T>::swap(Vector<T> &x) {
+    vm_.swap(x.vm_);
+}
+
+/** @brief Replace this vector's contents with a copy of @a x. */
+template <typename T>
+inline Vector<T> &Vector<T>::operator=(const Vector<T> &x) {
+    vm_.assign(x.vm_);
+    return *this;
+}
+
+#if HAVE_CXX_RVALUE_REFERENCES
+template <typename T>
+inline Vector<T> &Vector<T>::operator=(Vector<T> &&x) {
+    vm_.swap(x.vm_);
+    return *this;
+}
+#endif
+
+/** @brief Replace this vector's contents with @a n copies of @a v.
+    @post size() == @a n */
+template <typename T>
+inline Vector<T> &Vector<T>::assign(size_type n, value_argument_type v) {
+    vm_.assign(n, array_memory_type::cast(&v));
+    return *this;
+}
+
+template <typename T>
+inline void click_swap(Vector<T> &a, Vector<T> &b) {
+    a.swap(b);
+}
+
+template <typename T>
+inline void assign_consume(Vector<T> &a, Vector<T> &b) {
+    a.swap(b);
+}
+
+CLICK_ENDDECLS
+#include <click/vector.cc>
+#endif
diff --git a/openflow/include/clicknet/dhcp.h b/openflow/include/clicknet/dhcp.h
new file mode 100644
index 0000000..a996da1
--- /dev/null
+++ b/openflow/include/clicknet/dhcp.h
@@ -0,0 +1,129 @@
+#ifndef CLICKNET_DHCP_H
+#define CLICKNET_DHCP_H
+
+struct click_dhcp {
+	uint8_t  op;           /* message type */
+	uint8_t  htype;        /* hardware address type */
+	uint8_t  hlen;         /* hardware address length */
+	uint8_t  hops;         /* should be zero in client's message */
+	uint32_t xid;          /* transaction id */
+	uint16_t secs;         /* elapsed time in sec. from trying to boot */
+	uint16_t flags;
+	uint32_t ciaddr;       /* (previously allocated) client IP address */
+	uint32_t yiaddr;       /* 'your' client IP address */
+	uint32_t siaddr;       /* should be zero in client's messages */
+	uint32_t giaddr;       /* should be zero in client's messages */
+	uint8_t  chaddr[16];   /* client's hardware address */
+	uint8_t  sname[64];    /* server host name, null terminated string */
+	uint8_t  file[128];    /* boot file name, null terminated string */
+	uint32_t magic;        /* magic cookie */
+	uint8_t  options[312]; /* message options */
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+
+#define ETH_10MB	1 /* htype */
+#define ETH_10MB_LEN	6 /* hlen */
+
+/* DHCP message OP code */
+#define DHCP_BOOTREQUEST	1
+#define DHCP_BOOTREPLY		2
+
+/* DHCP Client State*/
+enum dhcp_client_state {
+	DHCP_CLIENT_INIT_STATE = 1,
+	DHCP_CLIENT_SELECTING_STATE,
+	DHCP_CLIENT_REQUESTING_STATE,
+	DHCP_CLIENT_INIT_REBOOT,
+	DHCP_CLIENT_REBOOTING,
+	DHCP_CLIENT_BOUND,
+	DHCP_CLIENT_RENEWING,
+	DHCP_CLIENT_REBINDING
+};
+
+
+/* DHCP message type */
+#define DHCP_DISCOVER           1
+#define DHCP_OFFER              2
+#define DHCP_REQUEST            3
+#define DHCP_DECLINE            4
+#define DHCP_ACK                5
+#define DHCP_NACK               6
+#define DHCP_RELEASE            7
+#define DHCP_INFORM             8
+
+#define DHCP_MAGIC 0x63538263
+
+
+
+/* DHCP Option codes: */
+#define DHO_PAD				0
+#define DHO_SUBNET_MASK			1
+#define DHO_TIME_OFFSET			2
+#define DHO_ROUTERS			3
+#define DHO_TIME_SERVERS		4
+#define DHO_NAME_SERVERS		5
+#define DHO_DOMAIN_NAME_SERVERS		6
+#define DHO_LOG_SERVERS			7
+#define DHO_COOKIE_SERVERS		8
+#define DHO_LPR_SERVERS			9
+#define DHO_IMPRESS_SERVERS		10
+#define DHO_RESOURCE_LOCATION_SERVERS	11
+#define DHO_HOST_NAME			12
+#define DHO_BOOT_SIZE			13
+#define DHO_MERIT_DUMP			14
+#define DHO_DOMAIN_NAME			15
+#define DHO_SWAP_SERVER			16
+#define DHO_ROOT_PATH			17
+#define DHO_EXTENSIONS_PATH		18
+#define DHO_IP_FORWARDING		19
+#define DHO_NON_LOCAL_SOURCE_ROUTING	20
+#define DHO_POLICY_FILTER		21
+#define DHO_MAX_DGRAM_REASSEMBLY	22
+#define DHO_DEFAULT_IP_TTL		23
+#define DHO_PATH_MTU_AGING_TIMEOUT	24
+#define DHO_PATH_MTU_PLATEAU_TABLE	25
+#define DHO_INTERFACE_MTU		26
+#define DHO_ALL_SUBNETS_LOCAL		27
+#define DHO_BROADCAST_ADDRESS		28
+#define DHO_PERFORM_MASK_DISCOVERY	29
+#define DHO_MASK_SUPPLIER		30
+#define DHO_ROUTER_DISCOVERY		31
+#define DHO_ROUTER_SOLICITATION_ADDRESS	32
+#define DHO_STATIC_ROUTES		33
+#define DHO_TRAILER_ENCAPSULATION	34
+#define DHO_ARP_CACHE_TIMEOUT		35
+#define DHO_IEEE802_3_ENCAPSULATION	36
+#define DHO_DEFAULT_TCP_TTL		37
+#define DHO_TCP_KEEPALIVE_INTERVAL	38
+#define DHO_TCP_KEEPALIVE_GARBAGE	39
+#define DHO_NIS_DOMAIN			40
+#define DHO_NIS_SERVERS			41
+#define DHO_NTP_SERVERS			42
+#define DHO_VENDOR_ENCAPSULATED_OPTIONS	43
+#define DHO_NETBIOS_NAME_SERVERS	44
+#define DHO_NETBIOS_DD_SERVER		45
+#define DHO_NETBIOS_NODE_TYPE		46
+#define DHO_NETBIOS_SCOPE		47
+#define DHO_FONT_SERVERS		48
+#define DHO_X_DISPLAY_MANAGER		49
+#define DHO_DHCP_REQUESTED_ADDRESS	50
+#define DHO_DHCP_LEASE_TIME		51
+#define DHO_DHCP_OPTION_OVERLOAD	52
+#define DHO_DHCP_MESSAGE_TYPE		53
+#define DHO_DHCP_SERVER_IDENTIFIER	54
+#define DHO_DHCP_PARAMETER_REQUEST_LIST	55
+#define DHO_DHCP_MESSAGE		56
+#define DHO_DHCP_MAX_MESSAGE_SIZE	57
+#define DHO_DHCP_RENEWAL_TIME		58
+#define DHO_DHCP_REBINDING_TIME		59
+#define DHO_VENDOR_CLASS_IDENTIFIER	60
+#define DHO_DHCP_CLIENT_IDENTIFIER	61
+#define DHO_NWIP_DOMAIN_NAME		62
+#define DHO_NWIP_SUBOPTIONS		63
+#define DHO_USER_CLASS			77
+#define DHO_FQDN			81
+#define DHO_DHCP_AGENT_OPTIONS		82
+#define DHO_SUBNET_SELECTION		118 /* RFC3011! */
+#define DHO_END				255
+
+#endif /* CLICKNET_DHCP_H */
diff --git a/openflow/include/clicknet/ether.h b/openflow/include/clicknet/ether.h
new file mode 100644
index 0000000..ca0ea41
--- /dev/null
+++ b/openflow/include/clicknet/ether.h
@@ -0,0 +1,130 @@
+/* -*- mode: c; c-basic-offset: 4 -*- */
+#ifndef CLICKNET_ETHER_H
+#define CLICKNET_ETHER_H
+
+/*
+ * <clicknet/ether.h> -- Ethernet and ARP headers, based on one of the BSDs.
+ *
+ * Relevant RFCs include:
+ *   RFC826	Ethernet Address Resolution Protocol: or, Converting Network
+ *		Protocol Addresses to 48.bit Ethernet Address for Transmission
+ *		on Ethernet Hardware
+ *   RFC894	Standard for the transmission of IP datagrams over Ethernet
+ *		networks
+ * Also see the relevant IEEE 802 standards.
+ */
+
+struct click_ether {
+    uint8_t	ether_dhost[6];		/* 0-5   Ethernet destination address */
+    uint8_t	ether_shost[6];		/* 6-11  Ethernet source address      */
+    uint16_t	ether_type;		/* 12-13 Ethernet protocol	      */
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+#define ETHERTYPE_IP		0x0800
+#define ETHERTYPE_ARP		0x0806
+#define ETHERTYPE_TRAIL		0x1000
+#define ETHERTYPE_8021Q		0x8100
+#define ETHERTYPE_IP6		0x86DD
+#define ETHERTYPE_MACCONTROL	0x8808
+#define ETHERTYPE_PPPOE_DISC	0x8863
+#define ETHERTYPE_PPPOE_SESSION	0x8864
+#define ETHERTYPE_GRID		0x7fff	/* wvlan_cs driver won't transmit frames with high bit of protocol number set */
+
+struct click_arp {		/* Offsets relative to ARP (Ethernet) header */
+    uint16_t	ar_hrd;		/* 0-1 (14-15)  hardware address format      */
+#define ARPHRD_ETHER    1	/*		  Ethernet 10Mbps	     */
+#define ARPHRD_IEEE802	6	/*		  token ring     	     */
+#define ARPHRD_ARCNET	7	/*		  Arcnet         	     */
+#define ARPHRD_FRELAY	15	/*		  frame relay    	     */
+#define ARPHRD_STRIP	23	/*		  Ricochet Starmode Radio    */
+#define ARPHRD_IEEE1394	24	/*		  IEEE 1394 (FireWire)	     */
+#define ARPHRD_80211    801	/*		  IEEE 802.11 (wifi)	     */
+    uint16_t	ar_pro;		/* 2-3 (16-17)  protocol address format      */
+    uint8_t	ar_hln;		/* 4   (18)     hardware address length      */
+    uint8_t	ar_pln;		/* 5   (19)     protocol address length      */
+    uint16_t	ar_op;		/* 6-7 (20-21)  opcode (command)	     */
+#define ARPOP_REQUEST   1	/*		  ARP request		     */
+#define ARPOP_REPLY	2	/*		  ARP reply		     */
+#define ARPOP_REVREQUEST 3	/*		  reverse request: hw->proto */
+#define ARPOP_REVREPLY	4	/*		  reverse reply		     */
+#define ARPOP_INVREQUEST 8	/*		  peer identification req    */
+#define ARPOP_INVREPLY	9	/*		  peer identification reply  */
+};
+
+struct click_ether_arp {
+    struct click_arp ea_hdr;	/* 0-7   (14-21)  fixed-size ARP header	     */
+    uint8_t	arp_sha[6];	/* 8-13  (22-27)  sender hardware address    */
+    uint8_t	arp_spa[4];	/* 14-17 (28-31)  sender protocol address    */
+    uint8_t	arp_tha[6];	/* 18-23 (32-37)  target hardware address    */
+    uint8_t	arp_tpa[4];	/* 24-27 (38-41)  target protocol address    */
+};
+
+
+/* Ethernet with VLAN (802.1q) */
+
+struct click_ether_vlan {
+    uint8_t     ether_dhost[6];		/* 0-5   Ethernet source address      */
+    uint8_t     ether_shost[6];		/* 6-11  Ethernet destination address */
+    uint16_t    ether_vlan_proto;	/* 12-13 == ETHERTYPE_8021Q	      */
+    uint16_t    ether_vlan_tci;		/* 14-15 tag control information      */
+    uint16_t    ether_vlan_encap_proto;	/* 16-17 Ethernet protocol	      */
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+
+/* Ethernet MAC control (802.3) */
+
+struct click_ether_macctl {
+    uint16_t	ether_macctl_opcode;
+    uint16_t	ether_macctl_param;
+    uint8_t	ether_macctl_reserved[42];
+};
+
+#define ETHER_MACCTL_OP_PAUSE	0x0001
+
+
+#define ND_SOL 0x0087       /* Neighborhood Solicitation Message Type */
+#define ND_ADV 0x0088       /* Neighborhood Advertisement Message Type */
+
+/* define structure of Neighborhood Solicitation Message */
+struct click_nd_sol {
+    uint8_t type;
+    uint8_t code;
+    uint16_t checksum;
+    uint32_t reserved;
+    uint8_t nd_tpa[16];
+    uint8_t option_type;   /*option type: 1 (source link-layer add) */
+    uint8_t option_length; /*option length: 1 (in units of 8 octets) */
+    uint8_t nd_sha[6];    /*source link-layer address */
+};
+
+/* define structure of Neighborhood Advertisement Message -reply to multicast neighborhood solitation message */
+struct click_nd_adv {
+    uint8_t type;
+    uint8_t code;
+    uint16_t checksum;
+    uint8_t flags; /* bit 1: sender_is_router
+                      bit 2: solicited
+		      bit 3: override
+		      all other bits should be zero */
+    uint8_t reserved[3];
+    uint8_t nd_tpa[16];
+    uint8_t option_type;    /* option type: 2 (target link-layer add) */
+    uint8_t option_length;  /* option length: 1 (in units of 8 octets) */
+    uint8_t nd_tha[6];     /* source link-layer address */
+};
+
+
+/* define structure of Neighborhood Advertisement Message - reply to unicast neighborhood solitation message */
+struct click_nd_adv2 {
+    uint8_t type;
+    uint8_t code;
+    uint16_t checksum;
+    uint8_t flags; /* bit 1: sender_is_router
+		      bit 2: solicited
+		      bit 3: override
+		      all other bits should be zero */
+    uint8_t reserved[3];
+    uint8_t nd_tpa[16];
+};
+
+#endif
diff --git a/openflow/include/clicknet/fddi.h b/openflow/include/clicknet/fddi.h
new file mode 100644
index 0000000..09b4e24
--- /dev/null
+++ b/openflow/include/clicknet/fddi.h
@@ -0,0 +1,43 @@
+/* -*- mode: c; c-basic-offset: 4 -*- */
+#ifndef CLICKNET_FDDI_H
+#define CLICKNET_FDDI_H
+
+/*
+ * <clicknet/fddi.h> -- our own definitions of FDDI headers
+ * based on a file from Linux
+ */
+
+struct click_fddi {
+    uint8_t	fc;
+    uint8_t	daddr[6];
+    uint8_t	saddr[6];
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+struct click_fddi_8022_1 {
+    struct click_fddi h;
+    uint8_t	dsap;
+    uint8_t	ssap;
+    uint8_t	ctrl;
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+struct click_fddi_8022_2 {
+    struct click_fddi h;
+    uint8_t	dsap;
+    uint8_t	ssap;
+    uint8_t	ctrl1;
+    uint8_t	ctrl2;
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+struct click_fddi_snap {
+    struct click_fddi h;
+    uint8_t	dsap;
+    uint8_t	ssap;
+    uint8_t	ctrl;
+    uint8_t	oui[3];
+    uint16_t	ether_type;
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+#define	FDDI_FC_LLC_ASYNC	0x50
+#define	FDDI_FC_LLCMASK 	0xF0    	/* length/class/format bits */
+
+#endif
diff --git a/openflow/include/clicknet/icmp.h b/openflow/include/clicknet/icmp.h
new file mode 100644
index 0000000..67bc8b3
--- /dev/null
+++ b/openflow/include/clicknet/icmp.h
@@ -0,0 +1,133 @@
+/* -*- c-basic-offset: 4 -*- */
+#ifndef CLICKNET_ICMP_H
+#define CLICKNET_ICMP_H
+#include <clicknet/ip.h>
+
+/*
+ * <clicknet/icmp.h> -- ICMP packet definitions, based on FreeBSD.
+ *
+ * Relevant RFCs include:
+ *   RFC792	Internet Control Message Protocol
+ *   RFC1122	Requirements for Internet Hosts - Communication Layers
+ *   RFC1123	Requirements for Internet Hosts - Application and Support
+ *   RFC1812	Requirements for IP Version 4 Routers
+ */
+
+/* most icmp request types: ICMP_UNREACH, ICMP_SOURCEQUENCH, ICMP_TIMXCEED */
+struct click_icmp {
+    uint8_t	icmp_type;		/* 0     ICMP type (see below)	     */
+    uint8_t	icmp_code;		/* 1     ICMP code (see below)	     */
+    uint16_t	icmp_cksum;		/* 2-3   checksum		     */
+    uint32_t	padding;		/* 4-7   should be zero		     */
+    /* followed by original IP header and initial portion of data */
+};
+
+/* header for types with sequence numbers: ICMP_ECHO, ICMP_ECHOREPLY,
+   ICMP_IREQ, ICMP_IREQREPLY */
+struct click_icmp_sequenced {
+    uint8_t	icmp_type;		/* 0     ICMP type (see below)	     */
+    uint8_t	icmp_code;		/* 1     ICMP code (see below)	     */
+    uint16_t	icmp_cksum;		/* 2-3   checksum		     */
+    uint16_t	icmp_identifier;	/* 4-5   flow identifier	     */
+    uint16_t	icmp_sequence;		/* 6-7   sequence number in flow     */
+};
+
+/* ICMP_PARAMPROB header */
+struct click_icmp_paramprob {
+    uint8_t	icmp_type;		/* 0     ICMP type (see below)	     */
+    uint8_t	icmp_code;		/* 1     ICMP code (see below)	     */
+    uint16_t	icmp_cksum;		/* 2-3   checksum		     */
+    uint8_t	icmp_pointer;		/* 4     parameter pointer	     */
+    uint8_t	padding[3];		/* 5-7   should be zero		     */
+    /* followed by original IP header and initial portion of data */
+};
+
+/* Redirect header: ICMP_REDIRECT */
+struct click_icmp_redirect {
+    uint8_t	icmp_type;		/* 0     ICMP_REDIRECT (see below)   */
+    uint8_t	icmp_code;		/* 1     ICMP code (see below)	     */
+    uint16_t	icmp_cksum;		/* 2-3   checksum		     */
+    struct in_addr icmp_gateway;	/* 4-7   address of gateway	     */
+    /* followed by original IP header and initial portion of data */
+};
+
+/* Timestamp and TimestampReply header: ICMP_TSTAMP and ICMP_TSTAMPREPLY */
+struct click_icmp_tstamp {
+    uint8_t	icmp_type;		/* 0     ICMP type (see below)	     */
+    uint8_t	icmp_code;		/* 1     ICMP code (see below)	     */
+    uint16_t	icmp_cksum;		/* 2-3   checksum		     */
+    uint16_t	icmp_identifier;	/* 4-5   flow identifier	     */
+    uint16_t	icmp_sequence;		/* 6-7   sequence number in flow     */
+    uint32_t	icmp_originate;		/* 8-11  originate timestamp	     */
+    uint32_t	icmp_receive;		/* 12-15 receive timestamp	     */
+    uint32_t	icmp_transmit;		/* 16-19 transmit timestamp	     */
+};
+
+/* Path MTU Discovery header: ICMP_UNREACH_NEEDFRAG */
+struct click_icmp_needfrag {
+    uint8_t	icmp_type;		/* 0     ICMP_UNREACH (see below)    */
+    uint8_t	icmp_code;		/* 1     ICMP_UNREACH_NEEDFRAG	     */
+    uint16_t	icmp_cksum;		/* 2-3   checksum		     */
+    uint16_t	padding;		/* 4-5   should be zero		     */
+    uint16_t	icmp_nextmtu;		/* 6-7   Next-Hop MTU		     */
+    /* followed by original IP header and initial portion of data */
+};
+
+#define click_icmp_unreach	click_icmp
+#define click_icmp_sourcequench	click_icmp
+#define click_icmp_timxceed	click_icmp
+#define click_icmp_echo		click_icmp_sequenced
+
+
+/* ICMP type definitions and (indented) code definitions */
+#define	ICMP_ECHOREPLY		0		/* echo reply		     */
+#define	ICMP_UNREACH		3		/* dest unreachable, codes:  */
+#define	  ICMP_UNREACH_NET		0	/*   bad net		     */
+#define	  ICMP_UNREACH_HOST		1	/*   bad host		     */
+#define	  ICMP_UNREACH_PROTOCOL		2	/*   bad protocol	     */
+#define	  ICMP_UNREACH_PORT		3	/*   bad port		     */
+#define	  ICMP_UNREACH_NEEDFRAG		4	/*   IP_DF caused drop	     */
+#define	  ICMP_UNREACH_SRCFAIL		5	/*   src route failed	     */
+#define	  ICMP_UNREACH_NET_UNKNOWN	6	/*   unknown net	     */
+#define	  ICMP_UNREACH_HOST_UNKNOWN	7	/*   unknown host	     */
+#define	  ICMP_UNREACH_ISOLATED		8	/*   src host isolated	     */
+#define	  ICMP_UNREACH_NET_PROHIB	9	/*   net prohibited access   */
+#define	  ICMP_UNREACH_HOST_PROHIB	10	/*   host prohibited access  */
+#define	  ICMP_UNREACH_TOSNET		11	/*   bad tos for net	     */
+#define	  ICMP_UNREACH_TOSHOST		12	/*   bad tos for host	     */
+#define	  ICMP_UNREACH_FILTER_PROHIB	13	/*   admin prohib	     */
+#define	  ICMP_UNREACH_HOST_PRECEDENCE	14	/*   host prec violation     */
+#define	  ICMP_UNREACH_PRECEDENCE_CUTOFF 15	/*   prec cutoff	     */
+#define	ICMP_SOURCEQUENCH	4		/* packet lost, slow down    */
+#define	ICMP_REDIRECT		5		/* shorter route, codes:     */
+#define	  ICMP_REDIRECT_NET		0	/*   for network	     */
+#define	  ICMP_REDIRECT_HOST		1	/*   for host		     */
+#define	  ICMP_REDIRECT_TOSNET		2	/*   for tos and net	     */
+#define	  ICMP_REDIRECT_TOSHOST		3	/*   for tos and host	     */
+#define	ICMP_ECHO		8		/* echo service		     */
+#define	ICMP_ROUTERADVERT	9		/* router advertisement	     */
+#define	ICMP_ROUTERSOLICIT	10		/* router solicitation	     */
+#define	ICMP_TIMXCEED		11		/* time exceeded, code:	     */
+#define	  ICMP_TIMXCEED_TRANSIT		0	/*   ttl==0 in transit	     */
+#define	  ICMP_TIMXCEED_REASSEMBLY	1	/*   ttl==0 in reassembly    */
+#define	ICMP_PARAMPROB		12		/* ip header bad	     */
+#define	  ICMP_PARAMPROB_ERRATPTR	0	/*   error at param ptr	     */
+#define	  ICMP_PARAMPROB_OPTABSENT	1	/*   req. opt. absent	     */
+#define	  ICMP_PARAMPROB_LENGTH 	2	/*   bad length		     */
+#define	ICMP_TSTAMP		13		/* timestamp request	     */
+#define	ICMP_TSTAMPREPLY	14		/* timestamp reply	     */
+#define	ICMP_IREQ		15		/* information request	     */
+#define	ICMP_IREQREPLY		16		/* information reply	     */
+#define	ICMP_MASKREQ		17		/* address mask request	     */
+#define	ICMP_MASKREQREPLY	18		/* address mask reply	     */
+
+static inline size_t
+click_icmp_hl(uint8_t icmp_type)
+{
+    if (icmp_type == ICMP_TSTAMP || icmp_type == ICMP_TSTAMPREPLY)
+	return sizeof(click_icmp_tstamp);
+    else
+	return sizeof(click_icmp);
+}
+
+#endif
diff --git a/openflow/include/clicknet/icmp6.h b/openflow/include/clicknet/icmp6.h
new file mode 100644
index 0000000..cb2b441
--- /dev/null
+++ b/openflow/include/clicknet/icmp6.h
@@ -0,0 +1,114 @@
+/* -*- c-basic-offset: 4 -*- */
+#ifndef CLICKNET_ICMP6_H
+#define CLICKNET_ICMP6_H
+#include <clicknet/ip6.h>
+
+/*
+ * <clicknet/icmp6.h> -- our own definitions for ICMP6 packets
+ * Based on RFC 1885
+ */
+
+/* types for ICMP6 packets */
+#define ICMP6_UNREACH		1
+#define ICMP6_PKTTOOBIG		2
+#define ICMP6_TIMXCEED		3
+#define ICMP6_PARAMPROB		4
+
+#define ICMP6_ECHO		128
+#define ICMP6_ECHOREPLY		129
+#define ICMP6_MEMBERSHIPQUERY	130
+#define ICMP6_MEMBERSHIPREPORT	131
+#define ICMP6_MEMBERSHIPREDUCTION 132
+
+#define ICMP6_REDIRECT		137
+
+/* codes for spefic types of ICMP6 packets */
+/* ICMP6 Error Message - Type: 1 */
+#define ICMP6_UNREACH_NOROUTE	0
+#define ICMP6_UNREACH_ADMIN	1
+#define ICMP6_UNREACH_NOTNEIGHBOR 2
+#define ICMP6_UNREACH_ADDR	3
+#define ICMP6_UNREACH_NOPORT	4
+
+/* ICMP6 Time Exceeded Message - Type: 3 */
+#define ICMP6_TIMXCEED_TRANSIT	0
+#define ICMP6_TIMXCEED_REASSEMBLY 1
+
+/* ICMP6 Parameter Problem Message - Type: 4 */
+#define ICMP6_PARAMPROB_HEADER	0
+#define ICMP6_PARAMPROB_NEXTHEADER 1
+#define ICMP6_PARAMPROB_OPTION	2
+
+/* remove possible definitions for symbols */
+#undef icmp6_identifier
+#undef icmp6_sequence
+#undef icmp6_pointer
+#undef icmp6_maxdelay
+
+
+/* most ICMP6 request types */
+struct click_icmp6 {
+    uint8_t icmp6_type;		/* one of the ICMP6_TYPE_*'s above */
+    uint8_t icmp6_code;		/* one of the ICMP6_CODE_*'s above */
+    uint16_t icmp6_cksum;		/* 16 1's comp csum */
+    uint32_t padding;			/* should be zero */
+    /* followed by as much of invoking packet as will fit without the ICMPv6 packet exceeding 576 octets*/
+};
+
+/* packet too big header */
+struct click_icmp6_pkttoobig {
+    uint8_t icmp6_type;		/* one of the ICMP6_TYPE_*'s above */
+    uint8_t icmp6_code;		/* one of the ICMP6_CODE_*'s above */
+    uint16_t icmp6_cksum;		/* 16 1's comp csum */
+    uint32_t icmp6_mtusize;			/* maximum packet size */
+  /* followed by as much of invoking packet as will fit without the ICMPv6 packet exceeding 576 octets*/
+};
+
+/* parameter problem header */
+struct click_icmp6_paramprob {
+    uint8_t icmp6_type;		/* one of the ICMP_TYPE_*'s above */
+    uint8_t icmp6_code;		/* one of the ICMP6_CODE_*'s above */
+    uint16_t icmp6_cksum;		/* 16 1's comp csum */
+    uint32_t icmp6_pointer;		/* which octect in orig. IP6 pkt was a problem */
+  /* followed by as much of invoking packet as will fit without the ICMPv6 packet exceeding 576 octets*/
+};
+
+
+/* struct for things with sequence numbers - echo request & echo reply msgs*/
+struct click_icmp6_sequenced {
+    uint8_t icmp6_type;		/* one of the ICMP6_TYPE_*'s above */
+    uint8_t icmp6_code;		/* one of the ICMP6_CODE_*'s above */
+    uint16_t icmp6_cksum;		/* 16 1's comp csum */
+    uint16_t icmp6_identifier;
+    uint16_t icmp6_sequence;
+    /* Followed by: */
+    /* Echo Request: zero or more octets of arbitary data */
+    /* Echo Reply: the data fromm the invoking Echo Request msg */
+};
+
+/* struct for group membership messages */
+struct click_icmp6_membership {
+    uint8_t icmp6_type;		/* one of the ICMP6_TYPE_*'s above */
+    uint8_t icmp6_code;		/* one of the ICMP6_CODE_*'s above */
+    uint16_t icmp6_cksum;		/* 16 1's comp csum */
+    uint16_t icmp6_maxdelay;   /* maximum response delay, in milliseconds */
+    uint16_t padding;
+    /* followed by multicast address */
+};
+
+/* struct for redirect messages */
+struct click_icmp6_redirect {
+    uint8_t icmp6_type;
+    uint8_t icmp6_code;
+    uint16_t icmp6_cksum;
+    uint32_t padding;
+    struct in6_addr icmp6_target;
+    struct in6_addr icmp6_dst;
+};
+
+/* different struct names for each type of packet */
+#define click_icmp6_unreach	click_icmp6
+#define click_icmp6_timxceed	click_icmp6
+#define click_icmp6_echo	click_icmp6_sequenced
+
+#endif
diff --git a/openflow/include/clicknet/ip.h b/openflow/include/clicknet/ip.h
new file mode 100644
index 0000000..c2be511
--- /dev/null
+++ b/openflow/include/clicknet/ip.h
@@ -0,0 +1,205 @@
+/* -*- mode: c; c-basic-offset: 4 -*- */
+#ifndef CLICKNET_IP_H
+#define CLICKNET_IP_H
+/* get struct in_addr */
+#include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+#if CLICK_LINUXMODULE
+# include <net/checksum.h>
+# include <linux/in.h>
+#else
+# include <sys/types.h>
+#undef true
+# include <netinet/in.h>
+#define true linux_true
+#endif
+
+/*
+ * <clicknet/ip.h> -- IP header definitions, based on one of the BSDs.
+ *
+ * Relevant RFCs include:
+ *   RFC791	Internet Protocol
+ *   RFC3168	The Addition of Explicit Congestion Notification (ECN) to IP
+ */
+
+struct click_ip {
+#if CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN
+    unsigned	ip_v : 4;		/* 0     version == 4		     */
+    unsigned	ip_hl : 4;		/*       header length		     */
+#elif CLICK_BYTE_ORDER == CLICK_LITTLE_ENDIAN
+    unsigned	ip_hl : 4;		/* 0     header length		     */
+    unsigned	ip_v : 4;		/*       version == 4		     */
+#else
+#   error "unknown byte order"
+#endif
+    uint8_t	ip_tos;			/* 1     type of service	     */
+#define IP_DSCPMASK	0xFC		/*         diffserv code point	     */
+#define IP_ECNMASK	0x03		/*	   ECN code point	     */
+#define   IP_ECN_NOT_ECT  0x00		/*         not ECN capable transport */
+#define   IP_ECN_ECT1	  0x01		/*         ECN capable transport     */
+#define   IP_ECN_ECT2	  0x02		/*         ECN capable transport     */
+#define   IP_ECN_CE	  0x03		/*         ECN congestion exp'd	     */
+    uint16_t	ip_len;			/* 2-3   total length		     */
+    uint16_t	ip_id;			/* 4-5   identification		     */
+    uint16_t	ip_off;			/* 6-7   fragment offset field	     */
+#define	IP_RF		0x8000		/*         reserved fragment flag    */
+#define	IP_DF		0x4000		/*         don't fragment flag	     */
+#define	IP_MF		0x2000		/*         more fragments flag	     */
+#define	IP_OFFMASK	0X1FFF		/*         mask for fragmenting bits */
+    uint8_t	ip_ttl;			/* 8     time to live		     */
+    uint8_t	ip_p;			/* 9     protocol		     */
+    uint16_t	ip_sum;			/* 10-11 checksum		     */
+    struct in_addr ip_src;		/* 12-15 source address		     */
+    struct in_addr ip_dst;		/* 16-19 destination address	     */
+};
+
+/* ip_protocol */
+#define IP_PROTO_ICMP		1
+#define IP_PROTO_IGMP		2
+#define IP_PROTO_GGP		3
+#define IP_PROTO_IPIP		4
+#define IP_PROTO_ST		5
+#define IP_PROTO_TCP		6
+#define IP_PROTO_UCL		7
+#define IP_PROTO_EGP		8
+#define IP_PROTO_IGP		9
+#define IP_PROTO_BBN		10
+#define IP_PROTO_NVPII		11
+#define IP_PROTO_PUP		12
+#define IP_PROTO_ARGUS		13
+#define IP_PROTO_EMCON		14
+#define IP_PROTO_XNET		15
+#define IP_PROTO_CHAOS		16
+#define IP_PROTO_UDP		17
+#define IP_PROTO_MUX		18
+#define IP_PROTO_DCN		19
+#define IP_PROTO_HMP		20
+#define IP_PROTO_PRM		21
+#define IP_PROTO_XNS		22
+#define IP_PROTO_TRUNK1		23
+#define IP_PROTO_TRUNK2		24
+#define IP_PROTO_LEAF1		25
+#define IP_PROTO_LEAF2		26
+#define IP_PROTO_RDP		27
+#define IP_PROTO_IRTP		28
+#define IP_PROTO_ISOTP4		29
+#define IP_PROTO_NETBLT		30
+#define IP_PROTO_MFENSP		31
+#define IP_PROTO_MERIT		32
+#define IP_PROTO_DCCP		33
+#define IP_PROTO_RSVP		46
+#define IP_PROTO_GRE		47
+#define IP_PROTO_ICMP6          58
+#define IP_PROTO_CFTP		62
+#define IP_PROTO_SATNET		64
+#define IP_PROTO_MITSUBNET	65
+#define IP_PROTO_RVD		66
+#define IP_PROTO_IPPC		67
+#define IP_PROTO_SATMON		69
+#define IP_PROTO_IPCV		71
+#define IP_PROTO_BRSATMON	76
+#define IP_PROTO_WBMON		78
+#define IP_PROTO_WBEXPAK	79
+#define IP_PROTO_SCTP		132
+#define IP_PROTO_UDPLITE	136
+
+#define IP_PROTO_NONE		257
+#define IP_PROTO_TRANSP		258
+#define IP_PROTO_TCP_OR_UDP	256
+#define IP_PROTO_PAYLOAD	259
+
+#define	IPOPT_EOL		0	/* end of option list */
+#define	IPOPT_NOP		1	/* no operation */
+#define IPOPT_RR		7	/* record packet route */
+#define IPOPT_TS		68	/* timestamp */
+#define IPOPT_SECURITY		130	/* provide s,c,h,tcc */
+#define IPOPT_LSRR		131	/* loose source route */
+#define IPOPT_SATID		136	/* satnet id */
+#define IPOPT_SSRR		137	/* strict source route */
+#define IPOPT_RA		148	/* router alert */
+
+#define IP_ISFRAG(iph)	  (((iph)->ip_off & htons(IP_MF | IP_OFFMASK)) != 0)
+#define IP_FIRSTFRAG(iph) (((iph)->ip_off & htons(IP_OFFMASK)) == 0)
+
+
+/* checksum functions */
+
+#if !CLICK_LINUXMODULE
+/** @brief Calculate an Internet checksum over a data range.
+ * @param x data to checksum
+ * @param len number of bytes to checksum
+ *
+ * @a x must be two-byte aligned. */
+uint16_t click_in_cksum(const unsigned char *x, int len);
+uint16_t click_in_cksum_pseudohdr_raw(uint32_t csum, uint32_t src, uint32_t dst, int proto, int packet_len);
+#else
+# define click_in_cksum(addr, len) \
+		ip_compute_csum((unsigned char *)(addr), (len))
+# define click_in_cksum_pseudohdr_raw(csum, src, dst, proto, transport_len) \
+		csum_tcpudp_magic((src), (dst), (transport_len), (proto), ~(csum) & 0xFFFF)
+#endif
+uint16_t click_in_cksum_pseudohdr_hard(uint32_t csum, const struct click_ip *iph, int packet_len);
+void click_update_zero_in_cksum_hard(uint16_t *csum, const unsigned char *addr, int len);
+
+/** @brief Adjust an Internet checksum according to a pseudoheader.
+ * @param data_csum initial checksum (may be a 16-bit checksum)
+ * @param iph IP header from which to extract pseudoheader information
+ * @param transport_len length of transport header
+ *
+ * This function correctly handles Internet headers that contain source
+ * routing options.  The final destination from the source routing option is
+ * used to compute the pseudoheader checksum.  */
+static inline uint16_t
+click_in_cksum_pseudohdr(uint32_t data_csum, const struct click_ip *iph,
+			 int transport_len)
+{
+    if (iph->ip_hl == 5)
+	return click_in_cksum_pseudohdr_raw(data_csum, iph->ip_src.s_addr, iph->ip_dst.s_addr, iph->ip_p, transport_len);
+    else
+	return click_in_cksum_pseudohdr_hard(data_csum, iph, transport_len);
+}
+
+/** @brief Incrementally adjust an Internet checksum.
+ * @param[in, out] csum points to checksum
+ * @param old_hw old halfword
+ * @param new_hw new halfword
+ *
+ * The checksum stored in *@a csum is updated to account for a change of @a
+ * old_hw to @a new_hw.
+ *
+ * Because of the vagaries of one's-complement arithmetic, this function will
+ * never produce a new checksum of ~+0 = 0xFFFF.  This is usually OK, since
+ * IP, TCP, and UDP checksums will never have this value.  (Only all-zero data
+ * can checksum to ~+0, but IP, TCP, and UDP checksums always cover at least
+ * one non-zero byte.)  If you are checksumming data that is potentially all
+ * zero, then call click_update_zero_in_cksum() after calling
+ * click_update_in_cksum(). */
+static inline void
+click_update_in_cksum(uint16_t *csum, uint16_t old_hw, uint16_t new_hw)
+{
+    /* incrementally update IP checksum according to RFC1624:
+       new_sum = ~(~old_sum + ~old_halfword + new_halfword) */
+    uint32_t sum = (~*csum & 0xFFFF) + (~old_hw & 0xFFFF) + new_hw;
+    sum = (sum & 0xFFFF) + (sum >> 16);
+    *csum = ~(sum + (sum >> 16));
+}
+
+/** @brief Potentially fix a zero-valued Internet checksum.
+ * @param[in, out] csum points to checksum
+ * @param x data to checksum
+ * @param len number of bytes to checksum
+ *
+ * If all the data bytes in [x, x+len) are zero, then its checksum should be
+ * ~+0 = 0xFFFF, but click_update_in_cksum may have set the checksum to ~-0 =
+ * 0x0000.  This function checks for such a case and sets the checksum
+ * correctly. */
+static inline void
+click_update_zero_in_cksum(uint16_t *csum, const unsigned char *x, int len)
+{
+    if (*csum == 0)
+	click_update_zero_in_cksum_hard(csum, x, len);
+}
+
+CLICK_CXX_UNPROTECT
+#include <click/cxxunprotect.h>
+#endif
diff --git a/openflow/include/clicknet/ip6.h b/openflow/include/clicknet/ip6.h
new file mode 100644
index 0000000..f1fa1c5
--- /dev/null
+++ b/openflow/include/clicknet/ip6.h
@@ -0,0 +1,98 @@
+/* -*- mode: c; c-basic-offset: 4 -*- */
+#ifndef CLICKNET_IP6_H
+#define CLICKNET_IP6_H
+//#include <clicknet/ip.h>
+/* get struct in6_addr */
+#include <click/cxxprotect.h>
+CLICK_CXX_PROTECT
+#if CLICK_LINUXMODULE
+# include <net/checksum.h>
+# include <linux/in6.h>
+#else
+# include <sys/types.h>
+# undef true
+# include <netinet/in.h>
+# define true linux_true
+#endif
+
+struct click_ip6 {
+    union {
+	struct {
+	    uint32_t ip6_un1_flow;	/* 0-3	 bits 0-3: version == 6	     */
+					/*	 bits 4-11: traffic class    */
+					/*	   bits 4-9: DSCP	     */
+					/*	   bits 10-11: ECN	     */
+					/*	 bits 12-31: flow label	     */
+	    uint16_t ip6_un1_plen;	/* 4-5	 payload length		     */
+	    uint8_t ip6_un1_nxt;	/* 6	 next header		     */
+	    uint8_t ip6_un1_hlim;	/* 7	 hop limit		     */
+	} ip6_un1;
+	uint8_t ip6_un2_vfc;		/* 0	 bits 0-3: version == 6	     */
+					/*	 bits 4-7: top 4 class bits  */
+	struct {
+#if CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN
+	    unsigned ip6_un3_v : 4;	/* 0	 version == 6		     */
+	    unsigned ip6_un3_fc : 4;	/*	 header length		     */
+#elif CLICK_BYTE_ORDER == CLICK_LITTLE_ENDIAN
+	    unsigned ip6_un3_fc : 4;	/* 0	 header length		     */
+	    unsigned ip6_un3_v : 4;	/*	 version == 6		     */
+#endif
+	} ip6_un3;
+    } ip6_ctlun;
+    struct in6_addr ip6_src;	/* 8-23	 source address */
+    struct in6_addr ip6_dst;	/* 24-39 dest address */
+};
+
+#define ip6_v			ip6_ctlun.ip6_un3.ip6_un3_v
+#define ip6_vfc			ip6_ctlun.ip6_un2_vfc
+#define ip6_flow		ip6_ctlun.ip6_un1.ip6_un1_flow
+#define ip6_plen		ip6_ctlun.ip6_un1.ip6_un1_plen
+#define ip6_nxt			ip6_ctlun.ip6_un1.ip6_un1_nxt
+#define ip6_hlim		ip6_ctlun.ip6_un1.ip6_un1_hlim
+
+#define IP6_FLOW_MASK		0x000FFFFFU
+#define IP6_FLOW_SHIFT		0
+#define IP6_CLASS_MASK		0x0FF00000U
+#define IP6_CLASS_SHIFT		20
+#define IP6_DSCP_MASK		0x0FC00000U
+#define IP6_DSCP_SHIFT		22
+#define IP6_V_MASK		0xF0000000U
+#define IP6_V_SHIFT		28
+
+#define IP6_CHECK_V(hdr)	(((hdr).ip6_vfc & htonl(IP6_V_MASK)) == htonl(6 << IP6_V_SHIFT))
+
+#ifndef IP6PROTO_FRAGMENT
+#define IP6PROTO_FRAGMENT 0x2c
+#endif
+struct click_ip6_fragment {
+    uint8_t ip6_frag_nxt;
+    uint8_t ip6_frag_reserved;
+    uint16_t ip6_frag_offset;
+#define IP6_MF		0x0001
+#define IP6_OFFMASK	0xFFF8
+					/*	 bits 0-12: Fragment offset  */
+					/*	 bit 13-14: reserved	     */
+					/*	 bit 15: More Fragment	     */
+    uint32_t ip6_frag_id;
+};
+
+
+uint16_t in6_fast_cksum(const struct in6_addr *saddr,
+			const struct in6_addr *daddr,
+			uint16_t len,
+			uint8_t proto,
+			uint16_t ori_csum,
+			const unsigned char *addr,
+			uint16_t len2);
+
+uint16_t in6_cksum(const struct in6_addr *saddr,
+		   const struct in6_addr *daddr,
+		   uint16_t len,
+		   uint8_t proto,
+		   uint16_t ori_csum,
+		   unsigned char *addr,
+		   uint16_t len2);
+
+CLICK_CXX_UNPROTECT
+#include <click/cxxunprotect.h>
+#endif
diff --git a/openflow/include/clicknet/llc.h b/openflow/include/clicknet/llc.h
new file mode 100644
index 0000000..afaa0cd
--- /dev/null
+++ b/openflow/include/clicknet/llc.h
@@ -0,0 +1,153 @@
+/*
+ * <clicknet/llc.h> - contains the definitions for llc frames.
+ * It was originally taken from freebsd and modified for click use.
+ * John Bicket
+ */
+
+/*
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      @(#)if_llc.h	8.1 (Berkeley) 6/10/93
+ * $FreeBSD: src/sys/net/if_llc.h,v 1.7 1999/08/28 00:48:18 peter Exp $
+ */
+
+#ifndef CLICKNET_LLC_H
+#define CLICKNET_LLC_H
+
+/*
+ * IEEE 802.2 Link Level Control headers, for use in conjunction with
+ * 802.{3,4,5} media access control methods.
+ *
+ * Headers here do not use bit fields due to shortcomings in many
+ * compilers.
+ */
+
+struct click_llc {
+	uint8_t	llc_dsap;
+	uint8_t	llc_ssap;
+	union {
+	    struct {
+		uint8_t control;
+		uint8_t format_id;
+	        uint8_t _class;
+		uint8_t window_x2;
+	    } type_u;
+	    struct {
+		uint8_t num_snd_x2;
+		uint8_t num_rcv_x2;
+	    } type_i;
+	    struct {
+		uint8_t control;
+		uint8_t num_rcv_x2;
+	    } type_s;
+	    struct {
+	        uint8_t control;
+		struct frmrinfo {
+			uint8_t rej_pdu_0;
+			uint8_t rej_pdu_1;
+			uint8_t frmr_control;
+			uint8_t frmr_control_ext;
+			uint8_t frmr_cause;
+		} frmrinfo;
+	    } type_frmr;
+	    struct {
+		uint8_t control;
+		uint8_t org_code[3];
+		uint16_t ether_type;
+	    } type_snap;
+	    struct {
+		uint8_t control;
+		uint8_t control_ext;
+	    } type_raw;
+	} llc_un;
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+#define llc_control            llc_un.type_u.control
+#define	llc_control_ext        llc_un.type_raw.control_ext
+#define llc_fid                llc_un.type_u.format_id
+#define llc_class              llc_un.type_u._class
+#define llc_window             llc_un.type_u.window_x2
+#define llc_frmrinfo           llc_un.type_frmr.frmrinfo
+#define llc_frmr_pdu0          llc_un.type_frmr.frmrinfo.rej_pdu0
+#define llc_frmr_pdu1          llc_un.type_frmr.frmrinfo.rej_pdu1
+#define llc_frmr_control       llc_un.type_frmr.frmrinfo.frmr_control
+#define llc_frmr_control_ext   llc_un.type_frmr.frmrinfo.frmr_control_ext
+#define llc_frmr_cause         llc_un.type_frmr.frmrinfo.frmr_control_ext
+
+/*
+ * Don't use sizeof(struct llc_un) for LLC header sizes
+ */
+#define LLC_ISFRAMELEN 4
+#define LLC_UFRAMELEN  3
+#define LLC_FRMRLEN    7
+
+/*
+ * Unnumbered LLC format commands
+ */
+#define LLC_UI		0x3
+#define LLC_UI_P	0x13
+#define LLC_DISC	0x43
+#define	LLC_DISC_P	0x53
+#define LLC_UA		0x63
+#define LLC_UA_P	0x73
+#define LLC_TEST	0xe3
+#define LLC_TEST_P	0xf3
+#define LLC_FRMR	0x87
+#define	LLC_FRMR_P	0x97
+#define LLC_DM		0x0f
+#define	LLC_DM_P	0x1f
+#define LLC_XID		0xaf
+#define LLC_XID_P	0xbf
+#define LLC_SABME	0x6f
+#define LLC_SABME_P	0x7f
+
+/*
+ * Supervisory LLC commands
+ */
+#define	LLC_RR		0x01
+#define	LLC_RNR		0x05
+#define	LLC_REJ		0x09
+
+/*
+ * Info format - dummy only
+ */
+#define	LLC_INFO	0x00
+
+/*
+ * ISO PDTR 10178 contains among others
+ */
+#define LLC_IP_LSAP	0x06
+#define LLC_X25_LSAP	0x7e
+#define LLC_SNAP_LSAP	0xaa
+#define LLC_ISO_LSAP	0xfe
+
+#endif
diff --git a/openflow/include/clicknet/ppp.h b/openflow/include/clicknet/ppp.h
new file mode 100644
index 0000000..88a36b1
--- /dev/null
+++ b/openflow/include/clicknet/ppp.h
@@ -0,0 +1,69 @@
+#ifndef CLICKNET_PPP_H
+#define CLICKNET_PPP_H
+
+/*
+ * <clicknet/ppp.h> -- our own definition of the PPP header, borrowed from
+ * tcpdump
+ *
+ * Copyright 1989 by Carnegie Mellon.
+ *
+ * Permission to use, copy, modify, and distribute this program for any
+ * purpose and without fee is hereby granted, provided that this copyright
+ * and permission notice appear on all copies and supporting documentation,
+ * the name of Carnegie Mellon not be used in advertising or publicity
+ * pertaining to distribution of the program without specific prior
+ * permission, and notice be given in supporting documentation that copying
+ * and distribution is by permission of Carnegie Mellon and Stanford
+ * University.  Carnegie Mellon makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#define PPP_ADDRESS	0xff	/* The address byte value */
+#define PPP_CONTROL	0x03	/* The control byte value */
+
+/* Protocol numbers */
+#define PPP_IP		0x0021	/* Raw IP */
+#define PPP_OSI		0x0023	/* OSI Network Layer */
+#define PPP_NS		0x0025	/* Xerox NS IDP */
+#define PPP_DECNET	0x0027	/* DECnet Phase IV */
+#define PPP_APPLE	0x0029	/* Appletalk */
+#define PPP_IPX		0x002b	/* Novell IPX */
+#define PPP_VJC		0x002d	/* Van Jacobson Compressed TCP/IP */
+#define PPP_VJNC	0x002f	/* Van Jacobson Uncompressed TCP/IP */
+#define PPP_BRPDU	0x0031	/* Bridging PDU */
+#define PPP_STII	0x0033	/* Stream Protocol (ST-II) */
+#define PPP_VINES	0x0035	/* Banyan Vines */
+#define PPP_IPV6	0x0057	/* IPv6 */
+#define	PPP_COMP	0x00fd	/* Compressed Datagram */
+
+#define PPP_HELLO	0x0201	/* 802.1d Hello Packets */
+#define PPP_LUXCOM	0x0231	/* Luxcom */
+#define PPP_SNS		0x0233	/* Sigma Network Systems */
+#define PPP_MPLS_UCAST  0x0281  /* rfc 3032 */
+#define PPP_MPLS_MCAST  0x0283  /* rfc 3022 */
+
+#define PPP_IPCP	0x8021	/* IP Control Protocol */
+#define PPP_OSICP	0x8023	/* OSI Network Layer Control Protocol */
+#define PPP_NSCP	0x8025	/* Xerox NS IDP Control Protocol */
+#define PPP_DECNETCP	0x8027	/* DECnet Control Protocol */
+#define PPP_APPLECP	0x8029	/* Appletalk Control Protocol */
+#define PPP_IPXCP	0x802b	/* Novell IPX Control Protocol */
+#define PPP_STIICP	0x8033	/* Strean Protocol Control Protocol */
+#define PPP_VINESCP	0x8035	/* Banyan Vines Control Protocol */
+#define PPP_IPV6CP	0x8057	/* IPv6 Control Protocol */
+#define PPP_CCP		0x80fd	/* Compress Control Protocol */
+#define PPP_MPLSCP      0x8281  /* rfc 3022 */
+
+#define PPP_LCP		0xc021	/* Link Control Protocol */
+#define PPP_PAP		0xc023	/* Password Authentication Protocol */
+#define PPP_LQM		0xc025	/* Link Quality Monitoring */
+#define PPP_SPAP        0xc027
+#define PPP_CHAP	0xc223	/* Challenge Handshake Authentication Protocol */
+#define PPP_BACP	0xc02b	/* Bandwidth Allocation Control Protocol */
+#define PPP_BAP		0xc02d	/* BAP */
+#define PPP_MP		0xc03d	/* Multi-Link */
+#define PPP_SPAP_OLD    0xc123
+#define PPP_EAP         0xc227
+
+#endif
diff --git a/openflow/include/clicknet/radiotap.h b/openflow/include/clicknet/radiotap.h
new file mode 100644
index 0000000..49207a1
--- /dev/null
+++ b/openflow/include/clicknet/radiotap.h
@@ -0,0 +1,249 @@
+/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
+/* $NetBSD: ieee80211_radiotap.h,v 1.10 2005/01/04 00:34:58 dyoung Exp $ */
+
+/*-
+ * Copyright (c) 2003, 2004 David Young.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of David Young may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DAVID
+ * YOUNG BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+#ifndef _NET_IF_IEEE80211RADIOTAP_H_
+#define _NET_IF_IEEE80211RADIOTAP_H_
+
+/* A generic radio capture format is desirable. There is one for
+ * Linux, but it is neither rigidly defined (there were not even
+ * units given for some fields) nor easily extensible.
+ *
+ * I suggest the following extensible radio capture format. It is
+ * based on a bitmap indicating which fields are present.
+ *
+ * I am trying to describe precisely what the application programmer
+ * should expect in the following, and for that reason I tell the
+ * units and origin of each measurement (where it applies), or else I
+ * use sufficiently weaselly language ("is a monotonically nondecreasing
+ * function of...") that I cannot set false expectations for lawyerly
+ * readers.
+ */
+#if defined(__KERNEL__) || defined(_KERNEL)
+#ifndef DLT_IEEE802_11_RADIO
+#define	DLT_IEEE802_11_RADIO	127	/* 802.11 plus WLAN header */
+#endif
+#endif /* defined(__KERNEL__) || defined(_KERNEL) */
+
+/* XXX tcpdump/libpcap do not tolerate variable-length headers,
+ * yet, so we pad every radiotap header to 64 bytes. Ugh.
+ */
+#define IEEE80211_RADIOTAP_HDRLEN	64
+
+/* The radio capture header precedes the 802.11 header. */
+struct ieee80211_radiotap_header {
+	u_int8_t	it_version;	/* Version 0. Only increases
+					 * for drastic changes,
+					 * introduction of compatible
+					 * new fields does not count.
+					 */
+	u_int8_t	it_pad;
+	u_int16_t       it_len;         /* length of the whole
+					 * header in bytes, including
+					 * it_version, it_pad,
+					 * it_len, and data fields.
+					 */
+	u_int32_t       it_present;     /* A bitmap telling which
+					 * fields are present. Set bit 31
+					 * (0x80000000) to extend the
+					 * bitmap by another 32 bits.
+					 * Additional extensions are made
+					 * by setting bit 31.
+					 */
+} __attribute__((__packed__));
+
+/* Name                                 Data type       Units
+ * ----                                 ---------       -----
+ *
+ * IEEE80211_RADIOTAP_TSFT              u_int64_t       microseconds
+ *
+ *      Value in microseconds of the MAC's 64-bit 802.11 Time
+ *      Synchronization Function timer when the first bit of the
+ *      MPDU arrived at the MAC. For received frames, only.
+ *
+ * IEEE80211_RADIOTAP_CHANNEL           2 x u_int16_t   MHz, bitmap
+ *
+ *      Tx/Rx frequency in MHz, followed by flags (see below).
+ *
+ * IEEE80211_RADIOTAP_FHSS              u_int16_t       see below
+ *
+ *      For frequency-hopping radios, the hop set (first byte)
+ *      and pattern (second byte).
+ *
+ * IEEE80211_RADIOTAP_RATE              u_int8_t        500kb/s
+ *
+ *      Tx/Rx data rate
+ *
+ * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     int8_t          decibels from
+ *                                                      one milliwatt (dBm)
+ *
+ *      RF signal power at the antenna, decibel difference from
+ *      one milliwatt.
+ *
+ * IEEE80211_RADIOTAP_DBM_ANTNOISE      int8_t          decibels from
+ *                                                      one milliwatt (dBm)
+ *
+ *      RF noise power at the antenna, decibel difference from one
+ *      milliwatt.
+ *
+ * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u_int8_t        decibel (dB)
+ *
+ *      RF signal power at the antenna, decibel difference from an
+ *      arbitrary, fixed reference.
+ *
+ * IEEE80211_RADIOTAP_DB_ANTNOISE       u_int8_t        decibel (dB)
+ *
+ *      RF noise power at the antenna, decibel difference from an
+ *      arbitrary, fixed reference point.
+ *
+ * IEEE80211_RADIOTAP_LOCK_QUALITY      u_int16_t       unitless
+ *
+ *      Quality of Barker code lock. Unitless. Monotonically
+ *      nondecreasing with "better" lock strength. Called "Signal
+ *      Quality" in datasheets.  (Is there a standard way to measure
+ *      this?)
+ *
+ * IEEE80211_RADIOTAP_TX_ATTENUATION    u_int16_t       unitless
+ *
+ *      Transmit power expressed as unitless distance from max
+ *      power set at factory calibration.  0 is max power.
+ *      Monotonically nondecreasing with lower power levels.
+ *
+ * IEEE80211_RADIOTAP_DB_TX_ATTENUATION u_int16_t       decibels (dB)
+ *
+ *      Transmit power expressed as decibel distance from max power
+ *      set at factory calibration.  0 is max power.  Monotonically
+ *      nondecreasing with lower power levels.
+ *
+ * IEEE80211_RADIOTAP_DBM_TX_POWER      int8_t          decibels from
+ *                                                      one milliwatt (dBm)
+ *
+ *      Transmit power expressed as dBm (decibels from a 1 milliwatt
+ *      reference). This is the absolute power level measured at
+ *      the antenna port.
+ *
+ * IEEE80211_RADIOTAP_FLAGS             u_int8_t        bitmap
+ *
+ *      Properties of transmitted and received frames. See flags
+ *      defined below.
+ *
+ * IEEE80211_RADIOTAP_ANTENNA           u_int8_t        antenna index
+ *
+ *      Unitless indication of the Rx/Tx antenna for this packet.
+ *      The first antenna is antenna 0.
+ *
+ * IEEE80211_RADIOTAP_RX_FLAGS          u_int16_t       bitmap
+ *
+ *	Properties of received frames. See flags defined below.
+ *
+ * IEEE80211_RADIOTAP_TX_FLAGS          u_int16_t       bitmap
+ *
+ *	Properties of transmitted frames. See flags defined below.
+ *
+ * IEEE80211_RADIOTAP_RTS_RETRIES       u_int8_t        data
+ *
+ *	Number of rts retries a transmitted frame used.
+ * 
+ * IEEE80211_RADIOTAP_DATA_RETRIES      u_int8_t        data
+ *
+ *	Number of unicast retries a transmitted frame used.
+ * 
+ */
+enum ieee80211_radiotap_type {
+	IEEE80211_RADIOTAP_TSFT = 0,
+	IEEE80211_RADIOTAP_FLAGS = 1,
+	IEEE80211_RADIOTAP_RATE = 2,
+	IEEE80211_RADIOTAP_CHANNEL = 3,
+	IEEE80211_RADIOTAP_FHSS = 4,
+	IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,
+	IEEE80211_RADIOTAP_DBM_ANTNOISE = 6,
+	IEEE80211_RADIOTAP_LOCK_QUALITY = 7,
+	IEEE80211_RADIOTAP_TX_ATTENUATION = 8,
+	IEEE80211_RADIOTAP_DB_TX_ATTENUATION = 9,
+	IEEE80211_RADIOTAP_DBM_TX_POWER = 10,
+	IEEE80211_RADIOTAP_ANTENNA = 11,
+	IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
+	IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
+	IEEE80211_RADIOTAP_RX_FLAGS = 14,
+	IEEE80211_RADIOTAP_TX_FLAGS = 15,
+	IEEE80211_RADIOTAP_RTS_RETRIES = 16,
+	IEEE80211_RADIOTAP_DATA_RETRIES = 17,
+	IEEE80211_RADIOTAP_XCHANNEL = 18,
+	IEEE80211_RADIOTAP_MCS = 19,
+	IEEE80211_RADIOTAP_A_MPDU_STATUS = 20,
+	IEEE80211_RADIOTAP_VHT = 21,
+	IEEE80211_RADIOTAP_EXT = 31
+};
+
+#if !defined(__KERNEL__) && !defined(_KERNEL)
+/* Channel flags. */
+#define IEEE80211_CHAN_TURBO    0x0010  /* Turbo channel */
+#define IEEE80211_CHAN_CCK      0x0020  /* CCK channel */
+#define IEEE80211_CHAN_OFDM     0x0040  /* OFDM channel */
+#define IEEE80211_CHAN_2GHZ     0x0080  /* 2 GHz spectrum channel. */
+#define IEEE80211_CHAN_5GHZ     0x0100  /* 5 GHz spectrum channel */
+#define IEEE80211_CHAN_PASSIVE  0x0200  /* Only passive scan allowed */
+#define	IEEE80211_CHAN_DYN	0x0400	/* Dynamic CCK-OFDM channel */
+#define	IEEE80211_CHAN_GFSK	0x0800	/* GFSK channel (FHSS PHY) */
+#endif /* !defined(__KERNEL__) && !defined(_KERNEL) */
+
+/* For IEEE80211_RADIOTAP_FLAGS */
+#define	IEEE80211_RADIOTAP_F_CFP	0x01	/* sent/received
+						 * during CFP
+						 */
+#define	IEEE80211_RADIOTAP_F_SHORTPRE	0x02	/* sent/received
+						 * with short
+						 * preamble
+						 */
+#define	IEEE80211_RADIOTAP_F_WEP	0x04	/* sent/received
+						 * with WEP encryption
+						 */
+#define	IEEE80211_RADIOTAP_F_FRAG	0x08	/* sent/received
+						 * with fragmentation
+						 */
+#define	IEEE80211_RADIOTAP_F_FCS	0x10	/* frame includes FCS */
+#define	IEEE80211_RADIOTAP_F_DATAPAD	0x20	/* frame has padding between
+						 * 802.11 header and payload
+						 * (to 32-bit boundary)
+						 */
+/* For IEEE80211_RADIOTAP_RX_FLAGS */
+#define	IEEE80211_RADIOTAP_F_RX_BADFCS	0x0001	/* frame failed crc check */
+
+/* For IEEE80211_RADIOTAP_TX_FLAGS */
+#define	IEEE80211_RADIOTAP_F_TX_FAIL	0x0001	/* failed due to excessive 
+						 * retries */
+#define	IEEE80211_RADIOTAP_F_TX_CTS	0x0002	/* used cts 'protection' */
+#define	IEEE80211_RADIOTAP_F_TX_RTS	0x0004	/* used rts/cts handshake */
+
+#define IEEE80211_RADIOTAP_F_TX_NOACK   0x0008  /* Receiver will not ack */
+
+
+
+#endif /* _NET_IF_IEEE80211RADIOTAP_H_ */
diff --git a/openflow/include/clicknet/rfc1483.h b/openflow/include/clicknet/rfc1483.h
new file mode 100644
index 0000000..f3e1a33
--- /dev/null
+++ b/openflow/include/clicknet/rfc1483.h
@@ -0,0 +1,20 @@
+/* -*- mode: c; c-basic-offset: 4 -*- */
+#ifndef CLICKNET_RFC1483_H
+#define CLICKNET_RFC1483_H
+
+/*
+ * <clicknet/rfc1483.h>
+ */
+
+struct click_rfc1483 {
+    uint8_t	dsap;
+    uint8_t	ssap;
+    uint8_t	ui;
+    uint8_t	orgcode[3];
+    uint16_t	ether_type;
+};
+
+#define RFC1483_SNAP_IP_EXPECTED	"\xAA\xAA\x03\x00\x00\x00"
+#define RFC1483_SNAP_IP_EXPECTED_LEN	6
+
+#endif
diff --git a/openflow/include/clicknet/tcp.h b/openflow/include/clicknet/tcp.h
new file mode 100644
index 0000000..1fc175d
--- /dev/null
+++ b/openflow/include/clicknet/tcp.h
@@ -0,0 +1,78 @@
+/* -*- c-basic-offset: 4 -*- */
+#ifndef CLICKNET_TCP_H
+#define CLICKNET_TCP_H
+
+/*
+ * <clicknet/tcp.h> -- TCP header definitions, based on one of the BSDs.
+ *
+ * Relevant RFCs include:
+ *   RFC793	Transmission Control Protocol
+ *   RFC1323	TCP Extensions for High Performance
+ *   RFC2018	TCP Selective Acknowledgement Options
+ *   RFC2581	TCP Congestion Control
+ *   RFC2883	An Extension to the Selective Acknowledgement (SACK) Option
+ *		for TCP
+ *   RFC3168	The Addition of Explicit Congestion Notification (ECN) to IP
+ *   RFC3540	Robust Explicit Congestion Notification (ECN) Signaling with
+ *		Nonces
+ * among many others.  See "A Roadmap for TCP Specification Documents",
+ * currently an Internet-Draft.
+ */
+
+typedef	uint32_t tcp_seq_t;
+
+struct click_tcp {
+    uint16_t	th_sport;		/* 0-1   source port		     */
+    uint16_t	th_dport;		/* 2-3   destination port	     */
+    tcp_seq_t	th_seq;			/* 4-7   sequence number	     */
+    tcp_seq_t	th_ack;			/* 8-11  acknowledgement number	     */
+#if CLICK_BYTE_ORDER == CLICK_LITTLE_ENDIAN
+    unsigned	th_flags2 : 4;		/* 12    more flags		     */
+    unsigned	th_off : 4;		/*       data offset in words	     */
+#elif CLICK_BYTE_ORDER == CLICK_BIG_ENDIAN
+    unsigned	th_off : 4;		/* 12    data offset in words	     */
+    unsigned	th_flags2 : 4;		/*       more flags		     */
+#else
+#   error "unknown byte order"
+#endif
+#define TH_NS		0x01		/*       in 'th_flags2'		     */
+    uint8_t	th_flags;		/* 13    flags			     */
+#define	TH_FIN		0x01
+#define	TH_SYN		0x02
+#define	TH_RST		0x04
+#define	TH_PUSH		0x08
+#define	TH_ACK		0x10
+#define	TH_URG		0x20
+#define	TH_ECE		0x40
+#define	TH_CWR		0x80
+    uint16_t	th_win;			/* 14-15 window			     */
+    uint16_t	th_sum;			/* 16-17 checksum		     */
+    uint16_t	th_urp;			/* 18-19 urgent pointer		     */
+};
+
+/*
+ * TCP sequence number comparisons
+ */
+
+#define SEQ_LT(x,y)	((int)((x)-(y)) < 0)
+#define SEQ_LEQ(x,y)	((int)((x)-(y)) <= 0)
+#define SEQ_GT(x,y)	((int)((x)-(y)) > 0)
+#define SEQ_GEQ(x,y)	((int)((x)-(y)) >= 0)
+
+/*
+ * TCP options
+ */
+
+#define TCPOPT_EOL		0
+#define TCPOPT_NOP		1
+#define TCPOPT_MAXSEG		2
+#define TCPOLEN_MAXSEG		4
+#define TCPOPT_WSCALE		3
+#define TCPOLEN_WSCALE		3
+#define TCPOPT_SACK_PERMITTED	4
+#define TCPOLEN_SACK_PERMITTED	2
+#define TCPOPT_SACK		5
+#define TCPOPT_TIMESTAMP	8
+#define TCPOLEN_TIMESTAMP	10
+
+#endif
diff --git a/openflow/include/clicknet/udp.h b/openflow/include/clicknet/udp.h
new file mode 100644
index 0000000..0082be7
--- /dev/null
+++ b/openflow/include/clicknet/udp.h
@@ -0,0 +1,18 @@
+#ifndef CLICKNET_UDP_H
+#define CLICKNET_UDP_H
+
+/*
+ * <clicknet/udp.h> -- UDP header definitions, based on one of the BSDs.
+ *
+ * Relevant RFCs include:
+ *   RFC768	User Datagram Protocol
+ */
+
+struct click_udp {
+    uint16_t	uh_sport;		/* 0-1   source port		     */
+    uint16_t	uh_dport;		/* 2-3   destination port	     */
+    uint16_t	uh_ulen;		/* 4-5   UDP length		     */
+    uint16_t	uh_sum;			/* 6-7   checksum		     */
+};
+
+#endif
diff --git a/openflow/include/clicknet/wifi.h b/openflow/include/clicknet/wifi.h
new file mode 100644
index 0000000..c6ca313
--- /dev/null
+++ b/openflow/include/clicknet/wifi.h
@@ -0,0 +1,409 @@
+/*
+ * <clicknet/wifi.h> - contains the definitions for 802.11 frames. 
+ * It was originally taken from freebsd and modified for click use.
+ * John Bicket
+ */
+
+/*	$NetBSD: if_ieee80211.h,v 1.5 2000/07/21 04:47:40 onoe Exp $	*/
+/* $FreeBSD: src/sys/net/if_ieee80211.h,v 1.3.2.3 2001/07/04 00:12:38 brooks Exp $ */
+
+#ifndef _CLICKNET_WIFI_H_
+#define _CLICKNET_WIFI_H_
+
+
+#define WIFI_EXTRA_MAGIC  0x7492001
+
+enum {
+  WIFI_EXTRA_TX			= (1<<0), /* packet transmission */
+  WIFI_EXTRA_TX_FAIL		= (1<<1), /* transmission failed */
+  WIFI_EXTRA_TX_USED_ALT_RATE	= (1<<2), /* used alternate bitrate */
+  WIFI_EXTRA_RX_ERR		= (1<<3), /* failed crc check */
+  WIFI_EXTRA_RX_MORE		= (1<<4), /* first part of a fragmented skb */
+  WIFI_EXTRA_NO_SEQ		= (1<<5),
+  WIFI_EXTRA_NO_TXF		= (1<<6),
+  WIFI_EXTRA_DO_RTS_CTS		= (1<<7),
+  WIFI_EXTRA_DO_CTS		= (1<<8),
+  WIFI_EXTRA_TX_NOACK		= (1<<9)
+};
+
+
+
+struct click_wifi_extra {
+  uint32_t magic;
+  uint32_t flags;
+
+  uint8_t rssi;
+  uint8_t silence;
+  uint8_t power;
+  uint8_t pad;
+
+  uint8_t rate;			/* bitrate in Mbps*2 */
+  uint8_t rate1;		/* bitrate in Mbps*2 */
+  uint8_t rate2;		/* bitrate in Mbps*2 */
+  uint8_t rate3;		/* bitrate in Mbps*2 */
+
+  uint8_t max_tries;
+  uint8_t max_tries1;
+  uint8_t max_tries2;
+  uint8_t max_tries3;
+
+  uint8_t virt_col;
+  uint8_t retries;
+  uint16_t len;
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+
+/*
+ * generic definitions for IEEE 802.11 frames
+ */
+#define WIFI_ADDR_LEN 6
+
+struct click_wifi {
+	uint8_t		i_fc[2];
+	uint16_t	i_dur;
+	uint8_t		i_addr1[WIFI_ADDR_LEN];
+	uint8_t		i_addr2[WIFI_ADDR_LEN];
+	uint8_t		i_addr3[WIFI_ADDR_LEN];
+	uint16_t	i_seq;
+} CLICK_SIZE_PACKED_ATTRIBUTE;
+
+#define	WIFI_FC0_VERSION_MASK		0x03
+#define	WIFI_FC0_VERSION_0		0x00
+#define	WIFI_FC0_TYPE_MASK		0x0c
+#define	WIFI_FC0_TYPE_MGT		0x00
+#define	WIFI_FC0_TYPE_CTL		0x04
+#define	WIFI_FC0_TYPE_DATA		0x08
+
+#define	WIFI_FC0_SUBTYPE_MASK		0xf0
+/* for TYPE_MGT */
+#define	WIFI_FC0_SUBTYPE_ASSOC_REQ	0x00
+#define	WIFI_FC0_SUBTYPE_ASSOC_RESP	0x10
+#define	WIFI_FC0_SUBTYPE_REASSOC_REQ	0x20
+#define	WIFI_FC0_SUBTYPE_REASSOC_RESP	0x30
+#define	WIFI_FC0_SUBTYPE_PROBE_REQ	0x40
+#define	WIFI_FC0_SUBTYPE_PROBE_RESP	0x50
+#define	WIFI_FC0_SUBTYPE_BEACON		0x80
+#define	WIFI_FC0_SUBTYPE_ATIM		0x90
+#define	WIFI_FC0_SUBTYPE_DISASSOC	0xa0
+#define	WIFI_FC0_SUBTYPE_AUTH		0xb0
+#define	WIFI_FC0_SUBTYPE_DEAUTH		0xc0
+/* for TYPE_CTL */
+#define	WIFI_FC0_SUBTYPE_PS_POLL	0xa0
+#define	WIFI_FC0_SUBTYPE_RTS		0xb0
+#define	WIFI_FC0_SUBTYPE_CTS		0xc0
+#define	WIFI_FC0_SUBTYPE_ACK		0xd0
+#define	WIFI_FC0_SUBTYPE_CF_END		0xe0
+#define	WIFI_FC0_SUBTYPE_CF_END_ACK	0xf0
+/* for TYPE_DATA (bit combination) */
+#define WIFI_FC0_SUBTYPE_DATA		0x00
+#define	WIFI_FC0_SUBTYPE_CF_ACK		0x10
+#define	WIFI_FC0_SUBTYPE_CF_POLL	0x20
+#define	WIFI_FC0_SUBTYPE_CF_ACPL	0x30
+#define	WIFI_FC0_SUBTYPE_NODATA		0x40
+#define	WIFI_FC0_SUBTYPE_CFACK		0x50
+#define	WIFI_FC0_SUBTYPE_CFPOLL		0x60
+#define	WIFI_FC0_SUBTYPE_CF_ACK_CF_ACK	0x70
+#define WIFI_FC0_SUBTYPE_QOS               0x80
+#define WIFI_FC0_SUBTYPE_QOS_NULL          0xc0
+
+
+#define	WIFI_FC1_DIR_MASK		0x03
+#define	WIFI_FC1_DIR_NODS		0x00	/* STA->STA */
+#define	WIFI_FC1_DIR_TODS		0x01	/* STA->AP  */
+#define	WIFI_FC1_DIR_FROMDS		0x02	/* AP ->STA */
+#define	WIFI_FC1_DIR_DSTODS		0x03	/* AP ->AP  */
+
+#define	WIFI_FC1_MORE_FRAG		0x04
+#define	WIFI_FC1_RETRY			0x08
+#define	WIFI_FC1_PWR_MGT		0x10
+#define	WIFI_FC1_MORE_DATA		0x20
+#define	WIFI_FC1_WEP			0x40
+#define	WIFI_FC1_ORDER			0x80
+
+#define	WIFI_NWID_LEN			32
+
+/*
+ * BEACON management packets
+ *
+ *	octect timestamp[8]
+ *	octect beacon interval[2]
+ *	octect capability information[2]
+ *	information element
+ *		octect elemid
+ *		octect length
+ *		octect information[length]
+ */
+typedef uint8_t *	wifi_mgt_beacon_t;
+
+#define WIFI_BEACON_INTERVAL(beacon) \
+	(beacon[8] + (beacon[9] << 8))
+#define WIFI_BEACON_CAPABILITY(beacon) \
+	(beacon[10] + (beacon[11] << 8))
+
+#define	WIFI_CAPINFO_ESS		0x01
+#define	WIFI_CAPINFO_IBSS		0x02
+#define	WIFI_CAPINFO_CF_POLLABLE	0x04
+#define	WIFI_CAPINFO_CF_POLLREQ		0x08
+#define	WIFI_CAPINFO_PRIVACY		0x10
+
+
+
+#define WIFI_MAX_RETRIES 11
+
+#define WIFI_QOS_HAS_SEQ(wh) \
+        (((wh)->i_fc[0] & \
+          (WIFI_FC0_TYPE_MASK | WIFI_FC0_SUBTYPE_QOS)) == \
+          (WIFI_FC0_TYPE_DATA | WIFI_FC0_SUBTYPE_QOS))
+
+
+/*
+ * Management information elements
+ */
+struct wifi_information {
+	char	ssid[WIFI_NWID_LEN+1];
+	struct rates {
+		uint8_t 	*p;
+	} rates;
+	struct fh {
+		uint16_t 	dwell;
+		uint8_t 	set;
+		uint8_t 	pattern;
+		uint8_t 	index;
+	} fh;
+	struct ds {
+		uint8_t		channel;
+	} ds;
+	struct cf {
+		uint8_t		count;
+		uint8_t		period;
+		uint8_t		maxdur[2];
+		uint8_t		dur[2];
+	} cf;
+	struct tim {
+		uint8_t 	count;
+		uint8_t 	period;
+		uint8_t 	bitctl;
+		/* uint8_t 	pvt[251]; The driver never needs to use this */
+	} tim;
+	struct ibss {
+	    	uint16_t	atim;
+	} ibss;
+	struct challenge {
+		uint8_t 	*p;
+		uint8_t		len;
+	} challenge;
+};
+
+#define WIFI_RATES_MAXSIZE	15
+#define WIFI_NWID_MAXSIZE	32
+
+enum {
+  WIFI_ELEMID_SSID		= 0,
+  WIFI_ELEMID_RATES		= 1,
+  WIFI_ELEMID_FHPARMS		= 2,
+  WIFI_ELEMID_DSPARMS		= 3,
+  WIFI_ELEMID_CFPARMS		= 4,
+  WIFI_ELEMID_TIM		= 5,
+  WIFI_ELEMID_IBSSPARMS		= 6,
+  WIFI_ELEMID_CHALLENGE		= 16,
+  WIFI_ELEMID_ERP		= 42,
+  WIFI_ELEMID_XRATES		= 50,
+  WIFI_ELEMID_VENDOR		= 221
+};
+/*
+ * AUTH management packets
+ *
+ *	octect algo[2]
+ *	octect seq[2]
+ *	octect status[2]
+ *	octect chal.id
+ *	octect chal.length
+ *	octect chal.text[253]
+ */
+typedef uint8_t *	wifi_mgt_auth_t;
+
+#define WIFI_AUTH_ALGORITHM(auth) \
+    (auth[0] + (auth[1] << 8))
+#define WIFI_AUTH_TRANSACTION(auth) \
+    (auth[2] + (auth[3] << 8))
+#define WIFI_AUTH_STATUS(auth) \
+    (auth[4] + (auth[5] << 8))
+
+#define	WIFI_AUTH_ALG_OPEN		0x0000
+#define	WIFI_AUTH_ALG_SHARED		0x0001
+
+#define WIFI_AUTH_OPEN_REQUEST		1
+#define WIFI_AUTH_OPEN_RESPONSE		2
+
+#define WIFI_AUTH_SHARED_REQUEST	1
+#define WIFI_AUTH_SHARED_CHALLENGE	2
+#define WIFI_AUTH_SHARED_RESPONSE	3
+#define WIFI_AUTH_SHARED_PASS		4
+
+/*
+ * Reason codes
+ *
+ * Unlisted codes are reserved
+ */
+#define	WIFI_REASON_UNSPECIFIED		1
+#define	WIFI_REASON_AUTH_EXPIRE		2
+#define	WIFI_REASON_AUTH_LEAVE		3
+#define	WIFI_REASON_ASSOC_EXPIRE	4
+#define	WIFI_REASON_ASSOC_TOOMANY	5
+#define	WIFI_REASON_NOT_AUTHED		6  
+#define	WIFI_REASON_NOT_ASSOCED		7
+#define	WIFI_REASON_ASSOC_LEAVE		8
+#define	WIFI_REASON_ASSOC_NOT_AUTHED	9
+
+/*
+ * Status code
+ *
+ * Unlisted codes are reserved
+ */
+#define WIFI_STATUS_SUCCESS		0x0000
+#define	WIFI_STATUS_UNSPECIFIED		1
+#define	WIFI_STATUS_CAPINFO		10
+#define	WIFI_STATUS_NOT_ASSOCED		11
+#define	WIFI_STATUS_OTHER		12
+#define	WIFI_STATUS_ALG			13
+#define	WIFI_STATUS_SEQUENCE		14
+#define	WIFI_STATUS_CHALLENGE		15
+#define	WIFI_STATUS_TIMEOUT		16
+#define	WIFI_STATUS_BASIC_RATES		18
+#define WIFI_STATUS_TOO_MANY_STATIONS   22
+#define	WIFI_STATUS_RATES		23
+#define WIFI_STATUS_SHORTSLOT_REQUIRED  25
+
+
+#define	WIFI_WEP_KEYLEN			5	/* 40bit */
+#define	WIFI_WEP_IVLEN			3	/* 24bit */
+#define	WIFI_WEP_KIDLEN			1	/* 1 octet */
+#define	WIFI_WEP_CRCLEN			4	/* CRC-32 */
+#define	WIFI_WEP_NKID			4	/* number of key ids */
+
+#define WIFI_WEP_HEADERSIZE (WIFI_WEP_IVLEN + WIFI_WEP_KIDLEN)
+
+
+#define WIFI_WEP_NOSUP	-1
+#define WIFI_WEP_OFF	0
+#define WIFI_WEP_ON	1
+#define WIFI_WEP_MIXED	2
+
+#define WIFI_AUTH_NONE	0
+#define WIFI_AUTH_OPEN	1
+#define WIFI_AUTH_SHARED	2
+
+#define WIFI_POWERSAVE_NOSUP	-1
+#define WIFI_POWERSAVE_OFF		0
+#define WIFI_POWERSAVE_CAM		1
+#define WIFI_POWERSAVE_PSP		2
+#define WIFI_POWERSAVE_PSP_CAM	3
+#define WIFI_POWERSAVE_ON		WIFI_POWERSAVE_CAM
+
+#define	WIFI_RATE_BASIC			0x80
+#define	WIFI_RATE_VAL			0x7f
+
+#define WIFI_RATE_SIZE             0x08
+
+#define WIFI_SEQ_FRAG_MASK                 0x000f
+#define WIFI_SEQ_FRAG_SHIFT                0
+#define WIFI_SEQ_SEQ_MASK                  0xfff0
+#define WIFI_SEQ_SEQ_SHIFT                 4
+
+
+/*
+ * 802.11 protocol crypto-related definitions.
+ */
+#define	WIFI_KEYBUF_SIZE	16
+#define	WIFI_MICBUF_SIZE	(8+8)	/* space for both tx+rx keys */
+
+
+#ifndef WIFI_MAX
+#define WIFI_MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef WIFI_MIN
+#define WIFI_MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+
+
+/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
+ * (from linux-wlan-ng) */
+
+/*
+ * For packet capture, define the same physical layer packet header
+ * structure as used in the wlan-ng driver
+ */
+enum {
+  DIDmsg_lnxind_wlansniffrm               = 0x00000044,
+  DIDmsg_lnxind_wlansniffrm_hosttime      = 0x00010044,
+  DIDmsg_lnxind_wlansniffrm_mactime       = 0x00020044,
+  DIDmsg_lnxind_wlansniffrm_channel       = 0x00030044,
+  DIDmsg_lnxind_wlansniffrm_rssi          = 0x00040044,
+  DIDmsg_lnxind_wlansniffrm_sq            = 0x00050044,
+  DIDmsg_lnxind_wlansniffrm_signal        = 0x00060044,
+  DIDmsg_lnxind_wlansniffrm_noise         = 0x00070044,
+  DIDmsg_lnxind_wlansniffrm_rate          = 0x00080044,
+  DIDmsg_lnxind_wlansniffrm_istx          = 0x00090044,
+  DIDmsg_lnxind_wlansniffrm_frmlen        = 0x000A0044
+};
+enum {
+        P80211ENUM_msgitem_status_no_value      = 0x00
+};
+enum {
+        P80211ENUM_truth_false                  = 0x00
+};
+
+
+typedef struct {
+  uint32_t did;
+  uint16_t status;
+  uint16_t len;
+  uint32_t data;
+} p80211item_uint32_t;
+
+typedef struct {
+  uint32_t msgcode;
+  uint32_t msglen;
+#define WLAN_DEVNAMELEN_MAX 16
+  uint8_t devname[WLAN_DEVNAMELEN_MAX];
+  p80211item_uint32_t hosttime;
+  p80211item_uint32_t mactime;
+  p80211item_uint32_t channel;
+  p80211item_uint32_t rssi;
+  p80211item_uint32_t sq;
+  p80211item_uint32_t signal;
+  p80211item_uint32_t noise;
+  p80211item_uint32_t rate;
+  p80211item_uint32_t istx;
+  p80211item_uint32_t frmlen;
+} wlan_ng_prism2_header;
+
+
+#define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
+#define LWNG_CAPHDR_VERSION 0x80211001
+
+#define WIFI_SLOT_B 20
+#define WIFI_DIFS_B 50
+#define WIFI_SIFS_B 10
+#define WIFI_ACK_B 304
+#define WIFI_PLCP_HEADER_LONG_B 192
+#define WIFI_PLCP_HEADER_SHORT_B 192
+
+#define WIFI_SLOT_A 9
+#define WIFI_DIFS_A 28
+#define WIFI_SIFS_A 9
+#define WIFI_ACK_A 30
+#define WIFI_PLCP_HEADER_A 20
+
+
+#define is_b_rate(b) ((b == 2) || (b == 4) || (b == 11) || (b == 22))
+
+#define WIFI_CW_MIN 31
+#define WIFI_CW_MAX 1023
+
+// 6-byte LLC header (last byte is terminating NUL)
+#define WIFI_LLC_HEADER		((const uint8_t *) "\xAA\xAA\x03\x00\x00")
+#define WIFI_LLC_HEADER_LEN	6
+
+#endif /* !_CLICKNET_WIFI_H_ */
diff --git a/openflow/include/clicktool/eclasst.hh b/openflow/include/clicktool/eclasst.hh
new file mode 100644
index 0000000..841526f
--- /dev/null
+++ b/openflow/include/clicktool/eclasst.hh
@@ -0,0 +1,228 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_ECLASST_HH
+#define CLICK_ECLASST_HH
+#include <click/string.hh>
+#include <stddef.h>
+#include <click/vector.hh>
+#include <click/hashtable.hh>
+#include "elementmap.hh"
+class ErrorHandler;
+class StringAccum;
+class RouterT;
+class ElementT;
+class VariableEnvironment;
+class ElementMap;
+class SynonymElementClassT;
+class LandmarkT;
+
+class ElementClassT { public:
+
+    ElementClassT(const String &name);
+    virtual ~ElementClassT();
+
+    static void set_base_type_factory(ElementClassT *(*factory)(const String &));
+    static ElementClassT *base_type(const String &);
+    static ElementClassT *tunnel_type();
+
+    void use()				{ _use_count++; }
+    void unuse()			{ if (--_use_count <= 0) delete this; }
+
+    const String &name() const		{ return _name; }
+    String printable_name() const	{ return _printable_name; }
+    const char *printable_name_c_str() const { return _printable_name.c_str(); }
+    void set_printable_name(const String &s) { _printable_name = s; }
+    virtual String landmark() const	{ return String(); }
+
+    // 'primitive' means 'not tunnel, not compound, not synonym'.
+    virtual bool primitive() const	{ return true; }
+    virtual bool overloaded() const	{ return false; }
+    bool tunnel() const			{ return this == tunnel_type(); }
+
+    ElementTraits &force_traits() const;
+    ElementTraits &force_traits(ElementMap *emap) const;
+    inline const ElementTraits &traits() const;
+    inline const ElementTraits &traits(ElementMap *emap) const;
+    virtual const ElementTraits *find_traits(ElementMap *emap) const;
+
+    inline const String &port_count_code() const;
+    inline const String &processing_code() const;
+    inline bool requires(const String &) const;
+    inline bool provides(const String &) const;
+    const String &package() const;
+    const String &documentation_name() const;
+    String documentation_url() const;
+
+    // where was this type declared?
+    virtual RouterT *declaration_scope() const;
+    virtual ElementClassT *overload_type() const;
+
+    virtual void collect_types(HashTable<ElementClassT *, int> &) const;
+    virtual void collect_overloads(Vector<ElementClassT *> &) const;
+
+    static ElementT *expand_element(ElementT *element, RouterT *dest,
+				    const String &prefix,
+				    const VariableEnvironment &env,
+				    ErrorHandler *errh);
+
+    virtual bool need_resolve() const;
+
+    /** @brief Resolve an element declaration.
+     * @param ninputs number of inputs used
+     * @param noutputs number of outputs used
+     * @param[in,out] args configuration arguments
+     * @param errh error handler
+     * @param landmark landmark for errors
+     */
+    virtual ElementClassT *resolve(int ninputs, int noutputs,
+				   Vector<String> &args,
+				   ErrorHandler *errh,
+				   const LandmarkT &landmark);
+
+    /** @brief Create a new scope with the appropriate declarations.
+     * @param args configuration arguments
+     * @param scope original scope
+     * @param[out] new_scope new scope
+     * @pre &scope != &new_scope
+     *
+     * The new scope equals the old scope, possibly restricted according to
+     * lexical scoping, plus declarations for the configuration arguments. */
+    virtual void create_scope(const Vector<String> &args,
+			      const VariableEnvironment &scope,
+			      VariableEnvironment &new_scope);
+
+    virtual ElementT *complex_expand_element(ElementT *element,
+					     const Vector<String> &conf,
+					     RouterT *dest,
+					     const String &prefix,
+					     const VariableEnvironment &env,
+					     ErrorHandler *errh);
+
+    enum UnparseKind { UNPARSE_NAMED, UNPARSE_ANONYMOUS, UNPARSE_OVERLOAD };
+    virtual void unparse_declaration(StringAccum &, const String &, UnparseKind, ElementClassT *stop);
+    virtual String unparse_signature() const;
+    static String unparse_signature(const String &name, const Vector<String> *formal_types, int nargs, int ninputs, int noutputs);
+
+    virtual void *cast(const char *)		{ return 0; }
+    virtual SynonymElementClassT *cast_synonym() { return 0; }
+    virtual RouterT *cast_router()		{ return 0; }
+
+  private:
+
+    String _name;
+    String _printable_name;
+    int _use_count;
+
+    mutable int _traits_version;
+    mutable const ElementTraits *_traits;
+
+    static ElementClassT *the_tunnel_type;
+
+    ElementClassT(const ElementClassT &);
+    ElementClassT &operator=(const ElementClassT &);
+
+    ElementT *direct_expand_element(ElementT *element, RouterT *dest,
+				    const String &prefix,
+				    const VariableEnvironment &env,
+				    ErrorHandler *errh);
+
+};
+
+class SynonymElementClassT : public ElementClassT { public:
+
+    SynonymElementClassT(const String &, ElementClassT *, RouterT *);
+
+    ElementClassT *synonym_of() const	{ return _eclass; }
+
+    bool need_resolve() const;
+    ElementClassT *resolve(int, int, Vector<String> &, ErrorHandler *, const LandmarkT &);
+    void create_scope(const Vector<String> &, const VariableEnvironment &, VariableEnvironment &);
+    ElementT *complex_expand_element(ElementT *, const Vector<String> &, RouterT *, const String &prefix, const VariableEnvironment &, ErrorHandler *);
+
+    void collect_types(HashTable<ElementClassT *, int> &) const;
+    void collect_overloads(Vector<ElementClassT *> &) const;
+
+    void unparse_declaration(StringAccum &, const String &, UnparseKind, ElementClassT *);
+
+    bool primitive() const		{ return false; }
+    bool overloaded() const		{ return _eclass->overloaded(); }
+    const ElementTraits *find_traits(ElementMap *emap) const;
+
+    RouterT *declaration_scope() const;
+    ElementClassT *overload_type() const { return _eclass; }
+
+    SynonymElementClassT *cast_synonym() { return this; }
+    RouterT *cast_router();
+
+  private:
+
+    ElementClassT *_eclass;
+    RouterT *_declaration_scope;
+
+};
+
+
+inline ElementClassT *
+ElementClassT::tunnel_type()
+{
+    assert(the_tunnel_type);
+    return the_tunnel_type;
+}
+
+inline const ElementTraits &
+ElementClassT::traits(ElementMap *emap) const
+{
+    if (_traits_version != emap->version()) {
+	_traits = find_traits(emap);
+	_traits_version = emap->version();
+    }
+    return *_traits;
+}
+
+inline const ElementTraits &
+ElementClassT::traits() const
+{
+    return traits(ElementMap::default_map());
+}
+
+inline ElementTraits &
+ElementClassT::force_traits() const
+{
+    return force_traits(ElementMap::default_map());
+}
+
+inline const String &
+ElementClassT::documentation_name() const
+{
+    return traits().documentation_name;
+}
+
+inline const String &
+ElementClassT::port_count_code() const
+{
+    return traits().port_count_code;
+}
+
+inline const String &
+ElementClassT::processing_code() const
+{
+    return traits().processing_code;
+}
+
+inline bool
+ElementClassT::requires(const String &req) const
+{
+    return traits().requires(req);
+}
+
+inline bool
+ElementClassT::provides(const String &req) const
+{
+    return traits().provides(req);
+}
+
+template <>
+inline size_t hashcode(const ElementClassT * const &e) {
+    return CLICK_NAME(hashcode)(static_cast<const void *>(e));
+}
+
+#endif
diff --git a/openflow/include/clicktool/elementmap.hh b/openflow/include/clicktool/elementmap.hh
new file mode 100644
index 0000000..da486a5
--- /dev/null
+++ b/openflow/include/clicktool/elementmap.hh
@@ -0,0 +1,179 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_ELEMENTMAP_HH
+#define CLICK_ELEMENTMAP_HH
+#include "etraits.hh"
+#include <click/hashtable.hh>
+class RouterT;
+class ErrorHandler;
+
+class ElementMap { public:
+
+    ElementMap();
+    ElementMap(const String&, ErrorHandler* = 0);
+    ~ElementMap();
+
+    static ElementMap* default_map()		{ return the_element_map; }
+    static void push_default(ElementMap *emap);
+    static void pop_default(ElementMap *emap);
+    static void pop_default();
+
+    void use()					{ _use_count++; }
+    void unuse()				{ _use_count--; }
+
+    int size() const				{ return _e.size(); }
+    bool empty() const				{ return _e.size() == 1; }
+    int32_t version() const			{ return _version; }
+
+    Traits &force_traits(const String &class_name);
+    inline const Traits &traits(const String &class_name) const;
+    const Traits &traits_at(int i) const	{ return _e[i]; }
+    inline bool has_traits(const String &class_name) const;
+    inline int traits_index(const String &class_name) const;
+
+    bool provides_global(const String&) const;
+
+    int definition_index(int i) const		{ return _e[i].def_index; }
+    const String& source_directory(const Traits&) const;
+    const String& package(const Traits&) const;
+    const String& package(const String&) const;
+    String documentation_url(const Traits&) const;
+
+    class TraitsIterator;
+    TraitsIterator begin_elements() const;
+
+    int add(const Traits &traits);
+    void remove_at(int i);
+
+    void parse(const String& data, ErrorHandler* = 0);
+    void parse(const String& data, const String& package_name, ErrorHandler* = 0);
+    void parse_xml(const String& data, const String& package_name, ErrorHandler*);
+    bool parse_default_file(const String& default_path, ErrorHandler* errh, bool verbose = false);
+    bool parse_package_file(const String& package_name, const RouterT* router, const String& default_path, ErrorHandler* errh, bool verbose = false);
+    bool parse_requirement_files(RouterT*, const String& default_path, ErrorHandler* errh, bool verbose = false);
+    bool parse_all_files(RouterT*, const String& default_path, ErrorHandler*);
+    static void report_file_not_found(String default_path, bool found_default, ErrorHandler*);
+    String unparse(const String& package = String()) const;
+    String unparse_nonxml() const;
+
+    int check_completeness(const RouterT*, ErrorHandler*) const;
+    bool driver_indifferent(const RouterT*, int driver_mask = Driver::ALLMASK, ErrorHandler* = 0) const;
+    bool driver_compatible(const RouterT*, int driver, ErrorHandler* = 0) const;
+
+    int provided_driver_mask() const	{ return _provided_driver_mask; }
+    int driver_mask() const		{ return _driver_mask; }
+    void set_driver(int d)		{ set_driver_mask(1 << d); }
+    void set_driver_mask(int mask);
+    int pick_driver(int wanted_driver, const RouterT* router, ErrorHandler* = 0) const;
+
+  private:
+
+    struct Globals {
+	String srcdir;
+	String compile_flags;
+	String package;
+	String dochref;
+	int driver_mask;
+    };
+
+    Vector<Traits> _e;
+    HashTable<String, int> _name_map;
+
+    Vector<Globals> _def;
+
+    int _use_count;
+    int _driver_mask;
+    int _provided_driver_mask;
+    mutable int32_t _version;
+
+    int get_driver_mask(const String&);
+    int driver_elt_index(int) const;
+
+    void collect_indexes(const RouterT*, Vector<int>&, ErrorHandler*) const;
+    int compatible_driver_mask(const RouterT*, ErrorHandler* = 0) const;
+
+    static int32_t version_counter;
+    static ElementMap* the_element_map;
+    void incr_version() const;
+
+    bool find_and_parse_package_file(const String& package_name, const RouterT* router, const String& default_path, ErrorHandler* errh, const String& filetype, bool verbose);
+
+};
+
+
+class ElementMap::TraitsIterator { public:
+
+    TraitsIterator(const ElementMap*, bool elements_only);
+
+    operator bool()			{ return _index < _emap->size(); }
+    void operator++(int);
+
+    const ElementTraits& value() const	{ return _emap->traits_at(_index); }
+    int traits_index() const		{ return _index; }
+
+  private:
+
+    const ElementMap* _emap;
+    int _index;
+    bool _elements_only;
+
+};
+
+
+inline int
+ElementMap::traits_index(const String &class_name) const
+{
+    int i = _name_map[class_name];
+    if (!(_e[i].driver_mask & _driver_mask) && i > 0)
+	i = driver_elt_index(i);
+    return i;
+}
+
+inline const Traits &
+ElementMap::traits(const String &class_name) const
+{
+    return _e[traits_index(class_name)];
+}
+
+inline bool
+ElementMap::has_traits(const String &class_name) const
+{
+    return traits_index(class_name) > 0;
+}
+
+inline const String&
+ElementMap::source_directory(const ElementTraits& t) const
+{
+    return _def[t.def_index].srcdir;
+}
+
+inline const String&
+ElementMap::package(const ElementTraits& t) const
+{
+    return _def[t.def_index].package;
+}
+
+inline const String&
+ElementMap::package(const String& name) const
+{
+    return package(traits(name));
+}
+
+inline void
+ElementMap::incr_version() const
+{
+    _version = version_counter = (version_counter + 1) & 0x7FFFFFFF;
+}
+
+inline bool
+ElementMap::provides_global(const String& req) const
+{
+    return _e[0].provides(req);
+}
+
+inline ElementMap::TraitsIterator
+ElementMap::begin_elements() const
+{
+    return TraitsIterator(this, true);
+}
+
+#endif
diff --git a/openflow/include/clicktool/elementt.hh b/openflow/include/clicktool/elementt.hh
new file mode 100644
index 0000000..6b0d2b9
--- /dev/null
+++ b/openflow/include/clicktool/elementt.hh
@@ -0,0 +1,313 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_ELEMENTT_HH
+#define CLICK_ELEMENTT_HH
+#include "eclasst.hh"
+#include "landmarkt.hh"
+
+class ElementT { public:
+
+    int flags;
+
+    ElementT();
+    ElementT(const String &name, ElementClassT *type, const String &config, const LandmarkT &landmark = LandmarkT::empty_landmark());
+    ~ElementT();
+
+    RouterT *router() const		{ return _owner; }
+    int eindex() const			{ return _eindex; }
+
+    bool live() const			{ return _type; }
+    bool dead() const			{ return !_type; }
+    void kill();
+
+    const String &name() const		{ return _name; }
+    const char *name_c_str() const	{ return _name.c_str(); }
+    bool name_unassigned() const	{ return _name && _name[0] == ';'; }
+    bool was_anonymous() const		{ return _was_anonymous; }
+
+    ElementClassT *type() const		{ return _type; }
+    ElementClassT *resolve(const VariableEnvironment &env,
+			   VariableEnvironment *new_env,
+			   ErrorHandler *errh = 0) const;
+    ElementClassT *resolved_type(const VariableEnvironment &env, ErrorHandler *errh = 0) const;
+
+    String type_name() const		{ return _type->name(); }
+    String printable_type_name() const	{ return _type->printable_name(); }
+    const char *type_name_c_str() const	{ return _type->printable_name_c_str(); }
+
+    void set_type(ElementClassT *);
+    inline RouterT *resolved_router(const VariableEnvironment &env, ErrorHandler *errh = 0) const;
+
+    inline const String &flow_code(ElementMap *emap) const;
+    inline const String &flow_code() const;
+
+    const String &config() const	{ return _configuration; }
+    const String &configuration() const	{ return _configuration; }
+    inline void set_configuration(const String &s);
+
+    const LandmarkT &landmarkt() const	{ return _landmark; }
+    String landmark() const		{ return _landmark.str(); }
+    String decorated_landmark() const	{ return _landmark.decorated_str(); }
+    void set_landmark(const LandmarkT &lm) { _landmark = lm; }
+
+    inline bool tunnel() const;
+    inline bool tunnel_connected() const;
+    ElementT *tunnel_input() const	{ return _tunnel_input; }
+    ElementT *tunnel_output() const	{ return _tunnel_output; }
+
+    int nports(bool isoutput) const	{ return isoutput ? _noutputs : _ninputs; }
+    int ninputs() const			{ return _ninputs; }
+    int noutputs() const		{ return _noutputs; }
+
+    inline String declaration() const;
+    inline String reverse_declaration() const;
+
+    void *user_data() const		{ return _user_data; }
+    void set_user_data(void *v)		{ _user_data = v; }
+    void set_user_data(intptr_t v)	{ _user_data = (void *)v; }
+
+    static bool name_ok(const String &, bool allow_anon_names = false);
+    static void redeclaration_error(ErrorHandler *, const char *type, String name, const String &landmark, const String &old_landmark);
+
+  private:
+
+    int _eindex;
+    String _name;
+    ElementClassT *_type;
+    mutable ElementClassT *_resolved_type;
+    enum { resolved_type_error = 1, resolved_type_fragile = 2 };
+    mutable short _resolved_type_status;
+    bool _was_anonymous;
+    String _configuration;
+    LandmarkT _landmark;
+    int _ninputs;
+    int _noutputs;
+    ElementT *_tunnel_input;
+    ElementT *_tunnel_output;
+    RouterT *_owner;
+    void *_user_data;
+
+    ElementT(const ElementT &);
+    ElementT &operator=(const ElementT &);
+
+    inline void semiresolve_type() const {
+	if (!_resolved_type && _type && _type->primitive()) {
+	    _resolved_type = _type;
+	    _resolved_type->use();
+	}
+    }
+    inline void unresolve_type() {
+	if (_resolved_type) {
+	    _resolved_type->unuse();
+	    _resolved_type = 0;
+	}
+    }
+    inline void set_ninputs(int n) {
+	unresolve_type();
+	_ninputs = n;
+    }
+    inline void set_noutputs(int n) {
+	unresolve_type();
+	_noutputs = n;
+    }
+
+    friend class RouterT;
+
+};
+
+struct PortT {
+
+    ElementT *element;
+    int port;
+
+    PortT()				: element(0), port(-1) { }
+    PortT(ElementT *e, int p)		: element(e), port(p) { }
+
+    static const PortT null_port;
+
+    typedef bool (PortT::*unspecified_bool_type)() const;
+
+    operator unspecified_bool_type() const {
+	return element != 0 ? &PortT::live : 0;
+    }
+
+    bool live() const			{ return element != 0; }
+    bool dead() const			{ return element == 0; }
+    RouterT *router() const		{ return (element ? element->router() : 0); }
+
+    int eindex() const			{ return (element ? element->eindex() : -1); }
+
+    int index_in(const Vector<PortT> &, int start = 0) const;
+    int force_index_in(Vector<PortT> &, int start = 0) const;
+
+    String unparse(bool isoutput, bool with_class = false) const;
+    String unparse_input(bool with_class = false) const {
+	return unparse(false, with_class);
+    }
+    String unparse_output(bool with_class = false) const {
+	return unparse(true, with_class);
+    }
+
+    static void sort(Vector<PortT> &);
+
+};
+
+class ConnectionT { public:
+
+    inline ConnectionT();
+    ConnectionT(const PortT &from, const PortT &to,
+		const LandmarkT &landmark = LandmarkT::empty_landmark());
+
+    typedef PortT::unspecified_bool_type unspecified_bool_type;
+    inline operator unspecified_bool_type() const;
+
+    enum { end_to = 0, end_from = 1 };
+
+    bool live() const			{ return _end[end_from].live(); }
+    bool dead() const			{ return _end[end_from].dead(); }
+
+    RouterT *router() const		{ return _end[end_to].router(); }
+
+    const PortT &end(bool isoutput) const {
+	return _end[isoutput];
+    }
+    ElementT *element(bool isoutput) const {
+	return _end[isoutput].element;
+    }
+    int eindex(bool isoutput) const {
+	return _end[isoutput].eindex();
+    }
+    int port(bool isoutput) const {
+	return _end[isoutput].port;
+    }
+
+    const PortT &from() const		{ return end(end_from); }
+    const PortT &to() const		{ return end(end_to); }
+    ElementT *from_element() const	{ return element(end_from); }
+    int from_eindex() const		{ return eindex(end_from); }
+    int from_port() const		{ return port(end_from); }
+    ElementT *to_element() const	{ return element(end_to); }
+    int to_eindex() const		{ return eindex(end_to); }
+    int to_port() const			{ return port(end_to); }
+    String landmark() const		{ return _landmark.str(); }
+    String decorated_landmark() const	{ return _landmark.decorated_str(); }
+    const LandmarkT &landmarkt() const	{ return _landmark; }
+
+    String unparse(bool with_class = false) const;
+    String unparse_end(bool isoutput, bool with_class = false) const {
+	return end(isoutput).unparse(isoutput, with_class);
+    }
+
+  private:
+
+    PortT _end[2];
+    LandmarkT _landmark;
+
+    friend class RouterT;
+
+};
+
+
+inline RouterT *
+ElementT::resolved_router(const VariableEnvironment &env, ErrorHandler *errh) const
+{
+    if (ElementClassT *t = resolved_type(env, errh))
+	return t->cast_router();
+    else
+	return 0;
+}
+
+inline void
+ElementT::set_configuration(const String &configuration)
+{
+    _configuration = configuration;
+    unresolve_type();
+}
+
+inline String
+ElementT::declaration() const
+{
+    assert(_type);
+    return _name + " :: " + _type->printable_name();
+}
+
+inline String
+ElementT::reverse_declaration() const
+{
+    assert(_type);
+    return _type->printable_name() + " " + _name;
+}
+
+inline bool
+ElementT::tunnel() const
+{
+    return _type == ElementClassT::tunnel_type();
+}
+
+inline bool
+ElementT::tunnel_connected() const
+{
+    return _tunnel_input || _tunnel_output;
+}
+
+inline const String &
+ElementT::flow_code(ElementMap *emap) const
+{
+    semiresolve_type();
+    return _resolved_type->traits(emap).flow_code;
+}
+
+inline const String &
+ElementT::flow_code() const
+{
+    semiresolve_type();
+    return _resolved_type->traits(ElementMap::default_map()).flow_code;
+}
+
+inline bool
+operator==(const PortT &h1, const PortT &h2)
+{
+    return h1.element == h2.element && h1.port == h2.port;
+}
+
+inline bool
+operator!=(const PortT &h1, const PortT &h2)
+{
+    return h1.element != h2.element || h1.port != h2.port;
+}
+
+inline bool
+operator<(const PortT &h1, const PortT &h2)
+{
+    return h1.eindex() < h2.eindex() || (h1.element == h2.element && h1.port < h2.port);
+}
+
+inline bool
+operator>(const PortT &h1, const PortT &h2)
+{
+    return h1.eindex() > h2.eindex() || (h1.element == h2.element && h1.port > h2.port);
+}
+
+inline bool
+operator<=(const PortT &h1, const PortT &h2)
+{
+    return h1.eindex() < h2.eindex() || (h1.element == h2.element && h1.port <= h2.port);
+}
+
+inline bool
+operator>=(const PortT &h1, const PortT &h2)
+{
+    return h1.eindex() > h2.eindex() || (h1.element == h2.element && h1.port >= h2.port);
+}
+
+inline
+ConnectionT::ConnectionT()
+{
+}
+
+inline
+ConnectionT::operator unspecified_bool_type() const
+{
+    return (unspecified_bool_type) _end[end_from];
+}
+
+#endif
diff --git a/openflow/include/clicktool/etraits.hh b/openflow/include/clicktool/etraits.hh
new file mode 100644
index 0000000..9baa19b
--- /dev/null
+++ b/openflow/include/clicktool/etraits.hh
@@ -0,0 +1,94 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_ETRAITS_HH
+#define CLICK_ETRAITS_HH
+#include <click/string.hh>
+
+struct Driver {
+    enum {
+	USERLEVEL = 0, LINUXMODULE = 1, BSDMODULE = 2, NSMODULE = 3,
+	ALLMASK = 0xF, COUNT = 4, MULTITHREAD = COUNT
+    };
+    static const char *name(int);
+    static const char *multithread_name(int);
+    static const char *requirement(int);
+    static int driver(const String&);
+    static int driver_mask(const String&);
+};
+
+
+struct ElementTraits {
+
+    String name;
+    String cxx;
+    String documentation_name;
+    String header_file;
+    String source_file;
+    String port_count_code;
+    String processing_code;
+    String flow_code;
+    String flags;
+    String methods;
+    String requirements;
+    String provisions;
+    String libs;
+    String noexport;
+    int def_index;
+    int driver_mask;
+    int name_next;
+
+    ElementTraits();
+
+    static const ElementTraits &null_traits()	{ return the_null_traits; }
+
+    bool allows_driver(int d) const	{ return (driver_mask&(1<<d)) != 0; }
+
+    bool requires(const String &str) const;
+    bool provides(const String &str) const;
+    inline int flag_value(const String &str) const;
+    int hard_flag_value(const String &str) const;
+
+    String *component(int);
+    String *component(const String &);
+
+    void calculate_driver_mask();
+
+    enum {
+	D_NONE,
+	D_CLASS, D_CXX_CLASS, D_HEADER_FILE, D_PORT_COUNT, D_PROCESSING,
+	D_FLOW_CODE, D_FLAGS, D_METHODS, D_REQUIREMENTS, D_PROVISIONS, D_LIBS,
+	D_SOURCE_FILE, D_DOC_NAME, D_NOEXPORT,
+	D_FIRST_DEFAULT = D_CLASS, D_LAST_DEFAULT = D_LIBS
+    };
+    static int parse_component(const String &);
+    static ElementTraits make(int, ...);
+
+  private:
+
+    static ElementTraits the_null_traits;
+
+    friend class ElementMap;
+
+};
+
+typedef ElementTraits Traits;
+
+
+inline
+ElementTraits::ElementTraits()
+    : def_index(0), driver_mask(Driver::ALLMASK), name_next(0)
+{
+}
+
+inline String *
+ElementTraits::component(const String &s)
+{
+    return component(parse_component(s));
+}
+
+inline int
+ElementTraits::flag_value(const String &str) const
+{
+    return flags ? hard_flag_value(str) : -1;
+}
+
+#endif
diff --git a/openflow/include/clicktool/landmarkt.hh b/openflow/include/clicktool/landmarkt.hh
new file mode 100644
index 0000000..d389bb9
--- /dev/null
+++ b/openflow/include/clicktool/landmarkt.hh
@@ -0,0 +1,180 @@
+#ifndef CLICKTOOL_LANDMARKT_HH
+#define CLICKTOOL_LANDMARKT_HH 1
+#include <click/string.hh>
+#include <click/vector.hh>
+class LandmarkSetT;
+
+class LandmarkT { public:
+
+    inline LandmarkT();
+    inline LandmarkT(const String &filename, unsigned lineno);
+    //inline LandmarkT(LandmarkSetT *lset, unsigned offset);
+    inline LandmarkT(LandmarkSetT *lset, unsigned offset1, unsigned offset2);
+    inline LandmarkT(const LandmarkT &o);
+    inline ~LandmarkT();
+
+    static void static_initialize();
+
+    static const LandmarkT &empty_landmark();
+
+    typedef String (LandmarkT::*unspecified_bool_type)() const;
+    inline operator unspecified_bool_type() const;
+
+    String str() const;
+    operator String() const;
+    String decorated_str() const;
+
+    unsigned offset1() const		{ return _offset1; }
+    unsigned offset2() const		{ return _offset2; }
+
+    inline LandmarkT &operator=(const LandmarkT &o);
+
+    enum { noffset = (unsigned) -1 };
+
+  private:
+
+    LandmarkSetT *_lset;
+    unsigned _offset1;
+    unsigned _offset2;
+
+    static LandmarkT *empty;
+
+};
+
+class LandmarkSetT { public:
+
+    LandmarkSetT();
+    LandmarkSetT(const String &filename, unsigned lineno);
+
+    inline void ref();
+    inline void unref();
+
+    String offset_to_string(unsigned offset) const;
+    String offset_to_decorated_string(unsigned offset1, unsigned offset2) const;
+    void new_line(unsigned offset, const String &filename, unsigned lineno);
+
+    struct LandmarkInfo {
+	unsigned end_offset;
+	int filename;
+	unsigned lineno;
+
+	LandmarkInfo(unsigned o, int f, unsigned l)
+	    : end_offset(o), filename(f), lineno(l) {
+	}
+    };
+
+  private:
+
+    int _refcount;
+    Vector<LandmarkInfo> _linfo;
+    Vector<String> _fnames;
+
+    LandmarkSetT(const LandmarkSetT &);
+    ~LandmarkSetT();
+    LandmarkSetT &operator=(const LandmarkSetT &);
+
+    static LandmarkSetT *the_empty_set;
+    friend class LandmarkT;
+
+};
+
+inline void
+LandmarkSetT::ref()
+{
+    assert(_refcount >= 1);
+    ++_refcount;
+}
+
+inline void
+LandmarkSetT::unref()
+{
+    assert(_refcount >= 1);
+    if (--_refcount == 0)
+	delete this;
+}
+
+inline
+LandmarkT::LandmarkT()
+    : _lset(empty->_lset), _offset1(noffset), _offset2(noffset)
+{
+    _lset->ref();
+}
+
+inline
+LandmarkT::LandmarkT(const String &filename, unsigned lineno = 0)
+    : _lset(new LandmarkSetT(filename, lineno)), _offset1(noffset), _offset2(noffset)
+{
+}
+
+#if 0
+inline
+LandmarkT::LandmarkT(LandmarkSetT *lset, unsigned offset)
+    : _lset(lset), _offset1(offset), _offset2(offset)
+{
+    _lset->ref();
+}
+#endif
+
+inline
+LandmarkT::LandmarkT(LandmarkSetT *lset, unsigned offset1, unsigned offset2)
+    : _lset(lset), _offset1(offset1), _offset2(offset2)
+{
+    _lset->ref();
+}
+
+inline
+LandmarkT::LandmarkT(const LandmarkT &lm)
+    : _lset(lm._lset), _offset1(lm._offset1), _offset2(lm._offset2)
+{
+    _lset->ref();
+}
+
+inline
+LandmarkT::~LandmarkT()
+{
+    _lset->unref();
+}
+
+inline const LandmarkT &
+LandmarkT::empty_landmark()
+{
+    assert(empty);
+    return *empty;
+}
+
+inline LandmarkT &
+LandmarkT::operator=(const LandmarkT &lm)
+{
+    lm._lset->ref();
+    _lset->unref();
+    _lset = lm._lset;
+    _offset1 = lm._offset1;
+    _offset2 = lm._offset2;
+    return *this;
+}
+
+inline
+LandmarkT::operator unspecified_bool_type() const
+{
+    return _lset != empty->_lset ? &LandmarkT::str : 0;
+}
+
+inline String
+LandmarkT::str() const
+{
+    return _lset->offset_to_string(_offset1);
+}
+
+inline
+LandmarkT::operator String() const
+{
+    return _lset->offset_to_string(_offset1);
+}
+
+inline String
+LandmarkT::decorated_str() const
+{
+    return _lset->offset_to_decorated_string(_offset1, _offset2);
+}
+
+#endif
diff --git a/openflow/include/clicktool/lexert.hh b/openflow/include/clicktool/lexert.hh
new file mode 100644
index 0000000..1cb5755
--- /dev/null
+++ b/openflow/include/clicktool/lexert.hh
@@ -0,0 +1,207 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_LEXERT_HH
+#define CLICK_LEXERT_HH
+#include <click/error.hh>
+#include <click/hashtable.hh>
+#include <click/archive.hh>
+#include "landmarkt.hh"
+#include <stdio.h>
+class RouterT;
+class ElementClassT;
+class StringAccum;
+class LexerTInfo;
+class VariableEnvironment;
+struct ArchiveElement;
+
+enum {
+    lexEOF = 0,
+    lexIdent = 256,		// see also LexerT::lexeme_string
+    lexVariable,
+    lexConfig,
+    lexArrow,
+    lex2Arrow,
+    lex2Colon,
+    lex2Bar,
+    lex3Dot,
+    lexElementclass,
+    lexRequire,
+    lexProvide,
+    lexDefine
+};
+
+class Lexeme { public:
+
+    Lexeme()				: _kind(lexEOF), _pos(0) { }
+    Lexeme(int k, const String &s, const char *p) : _kind(k), _s(s), _pos(p) { }
+
+    int kind() const			{ return _kind; }
+    bool is(int k) const		{ return _kind == k; }
+    operator bool() const		{ return _kind != lexEOF; }
+
+    const String &string() const	{ return _s; }
+    String &string()			{ return _s; }
+
+    const char *pos1() const		{ return _pos; }
+    const char *pos2() const		{ return _pos + _s.length(); }
+
+  private:
+
+    int _kind;
+    String _s;
+    const char *_pos;
+
+};
+
+class LexerT { public:
+
+    LexerT(ErrorHandler *, bool ignore_line_directives);
+    virtual ~LexerT();
+
+    void reset(const String &data, const Vector<ArchiveElement> &archive, const String &filename);
+    void clear();
+    void set_lexinfo(LexerTInfo *);
+    void ignore_line_directives(bool x)	{ _ignore_line_directives = x; }
+    void expand_groups(bool x)		{ _expand_groups = x; }
+
+    String remaining_text() const;
+    void set_remaining_text(const String &);
+
+    Lexeme lex() {
+	return _unlex_pos ? _unlex[--_unlex_pos] : next_lexeme();
+    }
+    void unlex(const Lexeme &t) {
+	assert(_unlex_pos < UNLEX_SIZE);
+	_unlex[_unlex_pos++] = t;
+    }
+    Lexeme lex_config() {
+	assert(!_unlex_pos);
+	return _file.lex_config(this);
+    }
+    String landmark() const;
+    inline LandmarkT landmarkt(const char *pos1, const char *pos2) const;
+
+    bool yport(Vector<int> &ports, const char *pos[2]);
+    bool yelement(Vector<int> &result, bool in_allowed, const char *epos[5]);
+    bool yconnection();
+    void ycompound_arguments(RouterT *);
+    void yelementclass(const char *pos1);
+    ElementClassT *ycompound(String, const char *decl_pos1, const char *name_pos1);
+    void ygroup(String name, int group_nports[2], const char *open_pos1, const char *open_pos2);
+    void yrequire();
+    void yvar();
+    bool ystatement(int nested = 0);
+
+    RouterT *router() const		{ return _router; }
+    RouterT *finish(const VariableEnvironment &global_scope);
+
+  protected:
+
+    struct FileState {
+	String _big_string;
+	const char *_end;
+	const char *_pos;
+	String _filename;
+	String _original_filename;
+	unsigned _lineno;
+	LandmarkSetT *_lset;
+
+	FileState(const String &text, const String &filename);
+	FileState(const FileState &x)
+	    : _big_string(x._big_string), _end(x._end), _pos(x._pos),
+	      _filename(x._filename), _original_filename(x._original_filename),
+	      _lineno(x._lineno), _lset(x._lset) {
+	    _lset->ref();
+	}
+	~FileState() {
+	    _lset->unref();
+	}
+	FileState &operator=(const FileState &x);
+	const char *skip_line(const char *s);
+	const char *skip_slash_star(const char *s);
+	const char *skip_backslash_angle(const char *s);
+	const char *skip_quote(const char *s, char end_c);
+	const char *process_line_directive(const char *s, LexerT *lexer);
+	Lexeme next_lexeme(LexerT *lexer);
+	Lexeme lex_config(LexerT *lexer);
+	String landmark() const;
+	unsigned offset(const char *s) const {
+	    assert(s >= _big_string.begin() && s <= _end);
+	    return s - _big_string.begin();
+	}
+	LandmarkT landmarkt(const char *pos1, const char *pos2) const {
+	    return LandmarkT(_lset, offset(pos1), offset(pos2));
+	}
+    };
+
+    // lexer
+    FileState _file;
+    bool _ignore_line_directives;
+    bool _expand_groups;
+
+    bool get_data();
+    Lexeme next_lexeme() {
+	return _file.next_lexeme(this);
+    }
+    static String lexeme_string(int);
+
+    // parser
+    enum { UNLEX_SIZE = 2 };
+    Lexeme _unlex[UNLEX_SIZE];
+    int _unlex_pos;
+
+    // router
+    RouterT *_router;
+
+    int _anonymous_offset;
+    int _anonymous_class_count;
+    int _group_depth;
+    int _ngroups;
+    bool _last_connection_ends_output;
+
+    Vector<String> _libraries;
+
+    // what names represent types? (builds up linearly)
+    HashTable<String, ElementClassT *> _base_type_map;
+
+    // errors
+    LexerTInfo *_lexinfo;
+    ErrorHandler *_errh;
+
+    void xlerror(const char *pos1, const char *pos2, const String &landmark,
+		 const char *anno, const char *format, va_list val);
+    int lerror(const char *pos1, const char *pos2, const char *format, ...);
+    int lerror(const Lexeme &t, const char *format, ...);
+    int lwarning(const Lexeme &t, const char *format, ...);
+    String anon_element_name(const String &) const;
+
+    bool expect(int, bool no_error = false);
+    const char *next_pos() const {
+	return _unlex_pos ? _unlex[_unlex_pos - 1].pos1() : _file._pos;
+    }
+
+    ElementClassT *element_type(const Lexeme &) const;
+    ElementClassT *force_element_type(const Lexeme &);
+    void ydefine(RouterT *, const String &name, const String &value, const Lexeme &, bool &scope_order_error);
+    void yrequire_library(const Lexeme &lexeme, const String &value);
+    void yconnection_check_useless(const Vector<int> &x, bool isoutput, const char *epos[2], bool done);
+    static void yconnection_analyze_ports(const Vector<int> &x, bool isoutput,
+					  int &min_ports, int &expandable);
+    void yconnection_connect_all(Vector<int> &outputs, Vector<int> &inputs, int connector, const char *pos1, const char *pos2);
+
+    LexerT(const LexerT &);
+    LexerT &operator=(const LexerT &);
+    int make_element(String, const Lexeme &, const char *decl_pos2, ElementClassT *, const String &);
+    int make_anon_element(const Lexeme &, const char *decl_pos2, ElementClassT *, const String &);
+    void connect(int f1, int p1, int p2, int f2, const char *pos1, const char *pos2);
+
+    friend struct FileState;
+
+};
+
+inline LandmarkT
+LexerT::landmarkt(const char *pos1, const char *pos2) const
+{
+    return _file.landmarkt(pos1, pos2);
+}
+
+#endif
diff --git a/openflow/include/clicktool/lexertinfo.hh b/openflow/include/clicktool/lexertinfo.hh
new file mode 100644
index 0000000..8413710
--- /dev/null
+++ b/openflow/include/clicktool/lexertinfo.hh
@@ -0,0 +1,29 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_LEXERTINFO_HH
+#define CLICK_LEXERTINFO_HH
+#include "lexert.hh"
+class ElementT;
+class ElementClassT;
+
+class LexerTInfo { public:
+
+    LexerTInfo()		{ }
+    virtual ~LexerTInfo()	{ }
+
+    virtual void notify_comment(const char *pos1, const char *pos2);
+    virtual void notify_error(const String &message, const char *pos1, const char *pos2);
+    virtual void notify_line_directive(const char *pos1, const char *pos2);
+    virtual void notify_keyword(const String &keyword, const char *pos1, const char *pos2);
+    virtual void notify_config_string(const char *pos1, const char *pos2);
+    virtual void notify_class_declaration(ElementClassT *, bool anonymous,
+		const char *pos1, const char *name_pos1, const char *pos2);
+    virtual void notify_class_extension(ElementClassT *, const char *pos1, const char *pos2);
+    virtual void notify_class_reference(ElementClassT *, const char *pos1, const char *pos2);
+    virtual void notify_element_declaration(
+		ElementT *e, const char *pos1, const char *name_pos2, const char *decl_pos2);
+    virtual void notify_element_reference(
+		ElementT *e, const char *pos1, const char *pos2);
+
+};
+
+#endif
diff --git a/openflow/include/clicktool/processingt.hh b/openflow/include/clicktool/processingt.hh
new file mode 100644
index 0000000..ad33d73
--- /dev/null
+++ b/openflow/include/clicktool/processingt.hh
@@ -0,0 +1,260 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_PROCESSINGT_HH
+#define CLICK_PROCESSINGT_HH
+#include "routert.hh"
+class ElementMap;
+class Bitvector;
+
+class ProcessingT { public:
+
+    enum {
+	end_to = ConnectionT::end_to,
+	end_from = ConnectionT::end_from
+    };
+
+    enum ProcessingCode {
+	ppush = 1, ppull = 2, pagnostic = 4, perror = 8
+    };
+    static const char processing_letters[];
+    static const char decorated_processing_letters[];
+
+    ProcessingT(bool resolve_agnostics, RouterT *router, ElementMap *emap,
+		ErrorHandler *errh = 0);
+    ProcessingT(RouterT *router, ElementMap *emap, ErrorHandler *errh = 0);
+    ProcessingT(const ProcessingT &processing, ElementT *element,
+		ErrorHandler *errh = 0);
+    void check_types(ErrorHandler *errh = 0);
+
+    RouterT *router() const {
+	return _router;
+    }
+    const VariableEnvironment &scope() const {
+	return _scope;
+    }
+    int nelements() const {
+	return _pidx[end_to].size() - 1;
+    }
+    int npidx(bool isoutput) const {
+	return _pidx[isoutput].back();
+    }
+    ElementMap *element_map() const {
+	return _element_map;
+    }
+
+    int pidx(int eindex, int port, bool isoutput) const {
+	return _pidx[isoutput][eindex] + port;
+    }
+    int pidx(const PortT &port, bool isoutput) const {
+	assert(port.router() == _router);
+	return pidx(port.eindex(), port.port, isoutput);
+    }
+    int pidx(const ConnectionT &conn, bool isoutput) const {
+	return pidx(conn.end(isoutput), isoutput);
+    }
+
+    PortT port(int pidx, bool isoutput) const {
+	const ElementT *e = _elt[isoutput][pidx];
+	return PortT(const_cast<ElementT *>(e), pidx - _pidx[isoutput][e->eindex()]);
+    }
+
+    int ninput_pidx() const {
+	return npidx(end_to);
+    }
+    int input_pidx(int eindex, int port = 0) const {
+	return pidx(eindex, port, end_to);
+    }
+    int input_pidx(const PortT &port) const {
+	return pidx(port, end_to);
+    }
+    int input_pidx(const ConnectionT &conn) const {
+	return pidx(conn, end_to);
+    }
+    PortT input_port(int pidx) const {
+	return port(pidx, end_to);
+    }
+
+    int noutput_pidx() const {
+	return npidx(end_from);
+    }
+    int output_pidx(int eindex, int port = 0) const {
+	return pidx(eindex, port, end_from);
+    }
+    int output_pidx(const PortT &port) const {
+	return pidx(port, end_from);
+    }
+    int output_pidx(const ConnectionT &conn) const {
+	return pidx(conn, end_from);
+    }
+    PortT output_port(int pidx) const {
+	return port(pidx, end_from);
+    }
+
+    const String &flow_code(ElementT *e) const {
+	if (_flow_overrides.size())
+	    if (const String &fc = _flow_overrides.get(e->name()))
+		return fc;
+	return e->flow_code(_element_map);
+    }
+
+    int input_processing(const PortT &port) const;
+    int output_processing(const PortT &port) const;
+    char decorated_input_processing_letter(const PortT &port) const;
+    char decorated_output_processing_letter(const PortT &port) const;
+    int input_processing(int eindex, int port) const;
+    int output_processing(int eindex, int port) const;
+
+    bool input_is_pull(int eindex, int port) const;
+    bool output_is_push(int eindex, int port) const;
+
+    bool processing_error(int pidx, bool isoutput) const {
+	return _processing[isoutput][pidx] & perror;
+    }
+
+    bool same_processing(int a_eindex, int b_eindex) const;
+
+    String processing_code(const ElementT *element) const;
+    String decorated_processing_code(const ElementT *element) const;
+
+    static const char *processing_code_next(const char *pos, const char *end_code, int &processing);
+    static const char *processing_code_output(const char *code, const char *end_code, const char *pos = 0);
+    static String processing_code_reverse(const String &pcode);
+
+    /** @brief Set @a x to those ports reachable from @a port in @a code.
+     * @param code flow code
+     * @param port port number
+     * @param isoutput whether @a port is an output port
+     * @param[out] x output bitvector
+     * @param size size of @a x (number of !@a isoutput ports)
+     * @param errh error handler
+     * @return 0 on success, -1 if @a code is invalid
+     *
+     * On return, @a x.size() == @a size, and @a x[@em i] is true if and only
+     * if @a code indicates flow between port @a port and port @em i.  If @a
+     * port < 0, then @a x is all false.
+     *
+     * For example, if @a code is @c "x/x", then @a x is all true.
+     */
+    static int code_flow(const String &code, int port, bool isoutput, Bitvector *x, int size, ErrorHandler *errh = 0);
+    int port_flow(const PortT &port, bool isoutput, Bitvector *x, ErrorHandler *errh = 0) const {
+	return code_flow(flow_code(port.element), port.port, isoutput,
+			 x, port.element->nports(!isoutput), errh);
+    }
+
+    static int forward_flow(const String &code, int input_port, Bitvector *x, int noutputs, ErrorHandler *errh = 0) {
+	return code_flow(code, input_port, false, x, noutputs, errh);
+    }
+    int forward_flow(const PortT &port, Bitvector *x, ErrorHandler *errh = 0) {
+	return port_flow(port, false, x, errh);
+    }
+    static int backward_flow(const String &code, int output_port, Bitvector *x, int ninputs, ErrorHandler *errh = 0) {
+	return code_flow(code, output_port, true, x, ninputs, errh);
+    }
+    int backward_flow(const PortT &port, Bitvector *x, ErrorHandler *errh = 0) {
+	return port_flow(port, true, x, errh);
+    }
+
+    /** @brief Set bits in @a sink that are connected to ports in @a source.
+     * @param source source ports
+     * @param source_isoutput whether @a source represents output ports
+     * @param[out] sink sink ports (input if @a source_isoutput, and vice versa)
+     */
+    void follow_connections(const Bitvector &source, bool source_isoutput, Bitvector &sink) const;
+    void follow_connections(const PortT &source, bool source_isoutput, Bitvector &sink) const;
+    void follow_flow(const Bitvector &source, bool source_isoutput, Bitvector &sink, ErrorHandler *errh = 0) const;
+    void follow_reachable(Bitvector &ports, bool isoutput, bool forward, ErrorHandler *errh = 0, ErrorHandler *debug_errh = 0) const;
+
+    String compound_port_count_code() const;
+    String compound_processing_code() const;
+    String compound_flow_code(ErrorHandler *errh = 0) const;
+
+  private:
+
+    RouterT *_router;
+    String _router_name;
+    ElementMap *_element_map;
+    VariableEnvironment _scope;
+    HashTable<String, String> _flow_overrides;
+
+    Vector<int> _pidx[2];
+    Vector<const ElementT *> _elt[2];
+    Vector<int> _processing[2];
+    bool _pidx_created;
+
+    enum { classwarn_unknown = 1, classwarn_pcode = 2 };
+    HashTable<ElementClassT *, int> _class_warnings;
+
+    void parse_flow_info(ElementT *e, ErrorHandler *errh);
+    void create_pidx(ErrorHandler *errh);
+    void create(const String &compound_pcode, bool resolve_agnostics, ErrorHandler *errh);
+
+    void initial_processing_for(int, const String &compound_pcode, ErrorHandler *);
+    void initial_processing(const String &compound_pcode, ErrorHandler *);
+    void processing_error(const ConnectionT &, int, ErrorHandler *);
+    void check_processing(Vector<ConnectionT> &conn, Bitvector &invalid_conn, ErrorHandler *errh);
+    void check_connections(Vector<ConnectionT> &conn, Bitvector &invalid_conn, ErrorHandler *errh);
+    void check_nports(Vector<ConnectionT> &conn, const ElementT *, const int *, const int *, ErrorHandler *);
+    void resolve_agnostics();	// change remaining AGNOSTICs to PUSH
+    void debug_print_pidxes(const Bitvector &ports, bool isoutput, const String &prefix, ErrorHandler *debug_errh) const;
+
+};
+
+
+inline int
+ProcessingT::input_processing(const PortT &h) const
+{
+    return _processing[end_to][input_pidx(h)] & 3;
+}
+
+inline int
+ProcessingT::output_processing(const PortT &h) const
+{
+    return _processing[end_from][output_pidx(h)] & 3;
+}
+
+inline char
+ProcessingT::decorated_input_processing_letter(const PortT &h) const
+{
+    return decorated_processing_letters[_processing[end_to][input_pidx(h)] & 7];
+}
+
+inline char
+ProcessingT::decorated_output_processing_letter(const PortT &h) const
+{
+    return decorated_processing_letters[_processing[end_from][output_pidx(h)] & 7];
+}
+
+inline int
+ProcessingT::input_processing(int i, int p) const
+{
+    return _processing[end_to][input_pidx(i, p)] & 3;
+}
+
+inline int
+ProcessingT::output_processing(int i, int p) const
+{
+    return _processing[end_from][output_pidx(i, p)] & 3;
+}
+
+inline bool
+ProcessingT::input_is_pull(int i, int p) const
+{
+    return _processing[end_to][input_pidx(i, p)] & ppull;
+}
+
+inline bool
+ProcessingT::output_is_push(int i, int p) const
+{
+    return _processing[end_from][output_pidx(i, p)] & ppush;
+}
+
+inline const char *
+ProcessingT::processing_code_output(const char *code, const char *end_code, const char *pos)
+{
+    if (!pos)
+	pos = code;
+    while (pos < end_code && *pos != '/')
+	pos++;
+    return (pos == end_code ? code : pos + 1);
+}
+
+#endif
diff --git a/openflow/include/clicktool/routert.hh b/openflow/include/clicktool/routert.hh
new file mode 100644
index 0000000..b558968
--- /dev/null
+++ b/openflow/include/clicktool/routert.hh
@@ -0,0 +1,672 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_ROUTERT_HH
+#define CLICK_ROUTERT_HH
+#include "elementt.hh"
+#include "eclasst.hh"
+#include <click/error.hh>
+#include <click/hashtable.hh>
+#include <click/archive.hh>
+#include <click/variableenv.hh>
+typedef HashTable<String, int> StringMap;
+
+class RouterT : public ElementClassT { public:
+
+    RouterT();
+    RouterT(const String &name, const LandmarkT &landmark, RouterT *declaration_scope = 0);
+    virtual ~RouterT();
+
+    // ELEMENTS
+    int nelements() const		{ return _elements.size(); }
+    int n_live_elements() const		{ return _n_live_elements; }
+
+    inline const ElementT *element(const String &) const;
+    inline ElementT *element(const String &);
+    int eindex(const String &name) const { return _element_name_map[name]; }
+
+    const ElementT *element(int i) const{ return _elements[i]; }
+    ElementT *element(int i)		{ return _elements[i]; }
+
+    class iterator;
+    class const_iterator;
+    class type_iterator;
+    class const_type_iterator;
+    inline iterator begin_elements();
+    inline const_iterator begin_elements() const;
+    inline type_iterator begin_elements(ElementClassT *);
+    inline const_type_iterator begin_elements(ElementClassT *) const;
+    inline iterator end_elements();
+    inline const_iterator end_elements() const;
+
+    bool elive(int i) const		{ return _elements[i]->live(); }
+    bool edead(int i) const		{ return _elements[i]->dead(); }
+    inline String ename(int) const;
+    inline ElementClassT *etype(int) const;
+    inline String etype_name(int) const;
+
+    ElementT *get_element(const String &name, ElementClassT *eclass, const String &configuration, const LandmarkT &landmark);
+    ElementT *add_anon_element(ElementClassT *eclass, const String &configuration = String(), const LandmarkT &landmark = LandmarkT::empty_landmark());
+    void change_ename(int, const String &);
+    int __map_element_name(const String &name, int new_eindex);
+    void assign_element_names();
+    void free_element(ElementT *);
+    void free_dead_elements();
+
+    void set_new_eindex_collector(Vector<int> *v) { _new_eindex_collector=v; }
+
+    // TYPES
+    ElementClassT *locally_declared_type(const String &) const;
+    inline ElementClassT *declared_type(const String &) const;
+    void add_declared_type(ElementClassT *, bool anonymous);
+
+    void collect_types(HashTable<ElementClassT *, int> &) const;
+    void collect_locally_declared_types(Vector<ElementClassT *> &) const;
+    void collect_overloads(Vector<ElementClassT *> &) const;
+
+    // CONNECTIONS
+    enum { end_to = ConnectionT::end_to, end_from = ConnectionT::end_from };
+
+    class conn_iterator;
+    inline conn_iterator begin_connections() const;
+    inline conn_iterator end_connections() const;
+
+    conn_iterator find_connections_touching(int eindex, int port, bool isoutput) const;
+    inline conn_iterator find_connections_touching(const PortT &port, bool isoutput) const;
+    inline conn_iterator find_connections_touching(ElementT *e, bool isoutput) const;
+    inline conn_iterator find_connections_touching(ElementT *e, int port, bool isoutput) const;
+
+    inline conn_iterator find_connections_from(const PortT &port) const;
+    inline conn_iterator find_connections_from(ElementT *e) const;
+    inline conn_iterator find_connections_from(ElementT *e, int port) const;
+    inline conn_iterator find_connections_to(const PortT &port) const;
+    inline conn_iterator find_connections_to(ElementT *e) const;
+    inline conn_iterator find_connections_to(ElementT *e, int port) const;
+
+    bool has_connection(const PortT &from, const PortT &to) const;
+
+    void find_connections_touching(const PortT &port, bool isoutput, Vector<PortT> &v, bool clear = true) const;
+    inline void find_connections_from(const PortT &output, Vector<PortT> &v, bool clear = true) const {
+	find_connections_touching(output, end_from, v, clear);
+    }
+    void find_connections_to(const PortT &input, Vector<PortT> &v) const {
+	find_connections_touching(input, end_to, v);
+    }
+
+    void find_connection_vector_touching(const ElementT *e, bool isoutput, Vector<conn_iterator> &x) const;
+    inline void find_connection_vector_from(const ElementT *e, Vector<conn_iterator> &x) const {
+	find_connection_vector_touching(e, end_from, x);
+    }
+    inline void find_connection_vector_to(const ElementT *e, Vector<conn_iterator> &x) const {
+	find_connection_vector_touching(e, end_to, x);
+    }
+
+    void add_tunnel(const String &namein, const String &nameout, const LandmarkT &landmark, ErrorHandler *errh);
+
+    bool add_connection(const PortT &, const PortT &, const LandmarkT &landmark = LandmarkT::empty_landmark());
+    inline bool add_connection(ElementT *, int, ElementT *, int, const LandmarkT &landmark = LandmarkT::empty_landmark());
+    conn_iterator erase(conn_iterator it);
+    void kill_bad_connections();
+
+    conn_iterator change_connection_to(conn_iterator it, PortT new_to);
+    conn_iterator change_connection_from(conn_iterator it, PortT new_from);
+
+    bool insert_before(const PortT &, const PortT &);
+    bool insert_after(const PortT &, const PortT &);
+    inline bool insert_before(ElementT *, const PortT &);
+    inline bool insert_after(ElementT *, const PortT &);
+
+    // REQUIREMENTS
+    void add_requirement(const String &type, const String &value);
+    void remove_requirement(const String &type, const String &value);
+    const Vector<String> &requirements() const	{ return _requirements; }
+
+    // ARCHIVE
+    void add_archive(const ArchiveElement &);
+    int narchive() const			{ return _archive.size(); }
+    int archive_index(const String &s) const	{ return _archive_map[s]; }
+    const Vector<ArchiveElement> &archive() const{ return _archive; }
+    ArchiveElement &archive(int i)		{ return _archive[i]; }
+    const ArchiveElement &archive(int i) const	{ return _archive[i]; }
+    inline ArchiveElement &archive(const String &s);
+    inline const ArchiveElement &archive(const String &s) const;
+
+    void add_components_to(RouterT *, const String &prefix = String()) const;
+
+    // CHECKING, FLATTENING AND EXPANDING
+    void check() const;
+
+    void remove_duplicate_connections();
+    void remove_dead_elements();
+
+    void remove_compound_elements(ErrorHandler *, bool expand_vars);
+    void remove_tunnels(ErrorHandler *errh = 0);
+    void compact();
+
+    void expand_into(RouterT *dest, const String &prefix, VariableEnvironment &env, ErrorHandler *errh);
+    void flatten(ErrorHandler *errh, bool expand_vars = false);
+
+    // UNPARSING
+    void unparse(StringAccum &, const String & = String()) const;
+    void unparse_requirements(StringAccum &, const String & = String()) const;
+    void unparse_defines(StringAccum &, const String & = String()) const;
+    void unparse_declarations(StringAccum &, const String & = String()) const;
+    void unparse_connections(StringAccum &, const String & = String()) const;
+    String configuration_string() const;
+
+    // COMPOUND ELEMENTS
+    String landmark() const		{ return _type_landmark.str(); }
+    String decorated_landmark() const	{ return _type_landmark.decorated_str(); }
+    void set_landmarkt(const LandmarkT &l) { _type_landmark = l; }
+    const ElementTraits *find_traits(ElementMap *emap) const;
+
+    bool primitive() const		{ return false; }
+    bool overloaded() const;
+
+    inline bool defines(const String &name) const;
+
+    int nformals() const		{ return _formals.size(); }
+    inline bool add_formal(const String &name, const String &type);
+    const String &formal_name(int i) const { return _formals[i]; }
+    const String &formal_type(int i) const { return _formal_types[i]; }
+
+    const VariableEnvironment &scope() const { return _scope; }
+    inline bool define(const String &name, const String &value);
+    inline void redefine(const VariableEnvironment &);
+    int ninputs() const			{ return _ninputs; }
+    int noutputs() const		{ return _noutputs; }
+
+    RouterT *declaration_scope() const	{ return _declaration_scope; }
+    ElementClassT *overload_type() const { return _overload_type; }
+    void set_overload_type(ElementClassT *);
+
+    int check_pseudoelement(const ElementT *e, bool isoutput, const char *name, ErrorHandler *errh) const;
+    int finish_type(ErrorHandler *errh);
+
+    bool need_resolve() const;
+    ElementClassT *resolve(int, int, Vector<String> &, ErrorHandler *, const LandmarkT &landmark);
+    void create_scope(const Vector<String> &args, const VariableEnvironment &env, VariableEnvironment &new_env);
+    ElementT *complex_expand_element(ElementT *, const Vector<String> &, RouterT *, const String &prefix, const VariableEnvironment &, ErrorHandler *);
+
+    String unparse_signature() const;
+    void unparse_declaration(StringAccum &, const String &, UnparseKind, ElementClassT *);
+
+    RouterT *cast_router()		{ return this; }
+
+  private:
+
+    struct ElementType {
+	ElementClassT * const type;
+	int scope_cookie;
+	int prev_name;
+	ElementType(ElementClassT *c, int sc, int pn) : type(c), scope_cookie(sc), prev_name(pn) { assert(type); type->use(); }
+	ElementType(const ElementType &o) : type(o.type), scope_cookie(o.scope_cookie), prev_name(o.prev_name) { type->use(); }
+	~ElementType()			{ type->unuse(); }
+	const String &name() const	{ return type->name(); }
+      private:
+	ElementType &operator=(const ElementType &);
+    };
+
+    enum { end_all = 2 };
+
+    struct ConnectionX : public ConnectionT {
+	ConnectionX **_pprev;
+	ConnectionX *_next[3];
+	ConnectionX(const PortT &from, const PortT &to,
+		    const LandmarkT &landmark)
+	    : ConnectionT(from, to, landmark) {
+	}
+	ConnectionX *next_from() const {
+	    return _next[end_from];
+	}
+	ConnectionX *next_to() const {
+	    return _next[end_to];
+	}
+    };
+
+    struct ConnectionSet {
+	ConnectionSet *next;
+	ConnectionX c[1];
+    };
+
+    struct Pair {
+	ConnectionX *end[2];
+	Pair() { end[0] = end[1] = 0; }
+	Pair(ConnectionX *from, ConnectionX *to) { end[end_from] = from; end[end_to] = to; }
+	ConnectionX *&operator[](int i) { assert(i >= 0 && i <= 1); return end[i]; }
+	ConnectionX *operator[](int i) const { assert(i >= 0 && i <= 1); return end[i]; }
+    };
+
+    StringMap _element_name_map;
+    Vector<ElementT *> _elements;
+    ElementT *_free_element;
+    int _n_live_elements;
+    Vector<int> *_new_eindex_collector;
+
+    ConnectionSet *_connsets;
+    int _nconnx;
+    Vector<Pair> _first_conn;
+    ConnectionX *_conn_head;
+    ConnectionX **_conn_tail;
+    ConnectionX *_free_conn;
+
+    StringMap _declared_type_map;
+    Vector<ElementType> _declared_types;
+
+    Vector<String> _requirements;
+
+    StringMap _archive_map;
+    Vector<ArchiveElement> _archive;
+
+    RouterT *_declaration_scope;
+    int _declaration_scope_cookie;
+    int _scope_cookie;
+
+    VariableEnvironment _scope;
+    Vector<String> _formals;
+    Vector<String> _formal_types;
+    int _ninputs;
+    int _noutputs;
+    bool _scope_order_error;
+    bool _circularity_flag;
+    bool _potential_duplicate_connections;
+    ElementClassT *_overload_type;
+    LandmarkT _type_landmark;
+    mutable ElementTraits _traits;
+
+    RouterT(const RouterT &);
+    RouterT &operator=(const RouterT &);
+
+    ElementClassT *declared_type(const String &, int scope_cookie) const;
+    void update_noutputs(int);
+    void update_ninputs(int);
+    ElementT *add_element(const ElementT &);
+    void assign_element_name(int);
+    void free_connection(ConnectionX *c);
+    void unlink_connection_from(ConnectionX *c);
+    void unlink_connection_to(ConnectionX *c);
+    void expand_tunnel(Vector<PortT> *port_expansions, const Vector<PortT> &ports, bool is_output, int which, ErrorHandler *) const;
+    int assign_arguments(const Vector<String> &, Vector<String> *) const;
+
+    friend class RouterUnparserT;
+    friend class conn_iterator;
+
+};
+
+class RouterT::const_iterator { public:
+    typedef int (const_iterator::*unspecified_bool_type)() const;
+    operator unspecified_bool_type() const { return _e ? &const_iterator::eindex : 0; }
+    int eindex() const			{ return _e->eindex(); }
+    void operator++()			{ if (_e) step(_e->router(), eindex()+1);}
+    void operator++(int)		{ ++(*this); }
+    const ElementT *operator->() const	{ return _e; }
+    const ElementT *get() const		{ return _e; }
+    const ElementT &operator*() const	{ return *_e; }
+  private:
+    const ElementT *_e;
+    const_iterator()			: _e(0) { }
+    const_iterator(const RouterT *r, int ei) { step(r, ei); }
+    void step(const RouterT *, int);
+    friend class RouterT;
+    friend class RouterT::iterator;
+};
+
+class RouterT::iterator : public RouterT::const_iterator { public:
+    ElementT *operator->() const	{ return const_cast<ElementT *>(_e); }
+    ElementT *get() const		{ return const_cast<ElementT *>(_e); }
+    ElementT &operator*() const		{ return const_cast<ElementT &>(*_e); }
+  private:
+    iterator()				: const_iterator() { }
+    iterator(RouterT *r, int ei)	: const_iterator(r, ei) { }
+    friend class RouterT;
+};
+
+class RouterT::const_type_iterator { public:
+    typedef int (const_type_iterator::*unspecified_bool_type)() const;
+    operator unspecified_bool_type() const { return _e ? &const_type_iterator::eindex : 0; }
+    int eindex() const			{ return _e->eindex(); }
+    inline void operator++();
+    inline void operator++(int);
+    const ElementT *operator->() const	{ return _e; }
+    const ElementT *get() const		{ return _e; }
+    const ElementT &operator*() const	{ return *_e; }
+  private:
+    const ElementT *_e;
+    ElementClassT *_t;
+    const_type_iterator()		: _e(0), _t(0) { }
+    const_type_iterator(const RouterT *r, ElementClassT *t, int i) : _t(t) { step(r, i); }
+    void step(const RouterT *, int);
+    friend class RouterT;
+    friend class RouterT::type_iterator;
+};
+
+class RouterT::type_iterator : public RouterT::const_type_iterator { public:
+    ElementT *operator->() const	{ return const_cast<ElementT *>(_e); }
+    ElementT *get() const		{ return const_cast<ElementT *>(_e); }
+    ElementT &operator*() const		{ return const_cast<ElementT &>(*_e); }
+  private:
+    type_iterator()			: const_type_iterator() { }
+    type_iterator(RouterT *r, ElementClassT *t, int ei)	: const_type_iterator(r, t, ei) { }
+    friend class RouterT;
+};
+
+class RouterT::conn_iterator { public:
+    inline conn_iterator()			: _conn(0), _by(0) { }
+    typedef bool (conn_iterator::*unspecified_bool_type)() const;
+    operator unspecified_bool_type() const	{ return _conn ? &conn_iterator::empty : 0; }
+    inline bool empty() const			{ return !_conn; }
+    inline bool is_back() const;
+    inline conn_iterator &operator++();
+    inline void operator++(int);
+    const ConnectionT *operator->() const	{ return _conn; }
+    const ConnectionT *get() const		{ return _conn; }
+    const ConnectionT &operator*() const	{ return *_conn; }
+  private:
+    const ConnectionX *_conn;
+    int _by;
+    inline conn_iterator(const ConnectionX *conn, int by);
+    void assign(const ConnectionX *conn, int by) {
+	_conn = conn;
+	_by = by;
+    }
+    void complex_step();
+    friend class RouterT;
+};
+
+
+inline RouterT::iterator
+RouterT::begin_elements()
+{
+    return iterator(this, 0);
+}
+
+inline RouterT::const_iterator
+RouterT::begin_elements() const
+{
+    return const_iterator(this, 0);
+}
+
+inline RouterT::type_iterator
+RouterT::begin_elements(ElementClassT *t)
+{
+    return type_iterator(this, t, 0);
+}
+
+inline RouterT::const_type_iterator
+RouterT::begin_elements(ElementClassT *t) const
+{
+    return const_type_iterator(this, t, 0);
+}
+
+inline RouterT::const_iterator
+RouterT::end_elements() const
+{
+    return const_iterator();
+}
+
+inline RouterT::iterator
+RouterT::end_elements()
+{
+    return iterator();
+}
+
+inline void
+RouterT::const_type_iterator::operator++()
+{
+    if (_e)
+	step(_e->router(), _e->eindex() + 1);
+}
+
+inline void
+RouterT::const_type_iterator::operator++(int)
+{
+    ++(*this);
+}
+
+inline
+RouterT::conn_iterator::conn_iterator(const ConnectionX *conn, int by)
+    : _conn(conn), _by(by)
+{
+}
+
+inline RouterT::conn_iterator
+RouterT::begin_connections() const
+{
+    return conn_iterator(_conn_head, end_all);
+}
+
+inline RouterT::conn_iterator
+RouterT::end_connections() const
+{
+    return conn_iterator();
+}
+
+inline RouterT::conn_iterator RouterT::find_connections_touching(const PortT &port, bool isoutput) const
+{
+    assert(port.router() == this);
+    return find_connections_touching(port.eindex(), port.port, isoutput);
+}
+
+inline RouterT::conn_iterator RouterT::find_connections_touching(ElementT *e, bool isoutput) const
+{
+    assert(e->router() == this);
+    return find_connections_touching(e->eindex(), -1, isoutput);
+}
+
+inline RouterT::conn_iterator RouterT::find_connections_touching(ElementT *e, int port, bool isoutput) const
+{
+    assert(e->router() == this);
+    return find_connections_touching(e->eindex(), port, isoutput);
+}
+
+inline RouterT::conn_iterator RouterT::find_connections_from(const PortT &port) const
+{
+    return find_connections_touching(port, end_from);
+}
+
+inline RouterT::conn_iterator RouterT::find_connections_from(ElementT *e) const
+{
+    return find_connections_touching(e, end_from);
+}
+
+inline RouterT::conn_iterator RouterT::find_connections_from(ElementT *e, int port) const
+{
+    return find_connections_touching(e, port, end_from);
+}
+
+inline RouterT::conn_iterator RouterT::find_connections_to(const PortT &port) const
+{
+    return find_connections_touching(port, end_to);
+}
+
+inline RouterT::conn_iterator RouterT::find_connections_to(ElementT *e) const
+{
+    return find_connections_touching(e, end_to);
+}
+
+inline RouterT::conn_iterator RouterT::find_connections_to(ElementT *e, int port) const
+{
+    return find_connections_touching(e, port, end_to);
+}
+
+inline RouterT::conn_iterator &
+RouterT::conn_iterator::operator++()
+{
+    if (_conn && unsigned(_by) <= end_all)
+	_conn = _conn->_next[_by];
+    else
+	complex_step();
+    return *this;
+}
+
+inline void
+RouterT::conn_iterator::operator++(int)
+{
+    ++(*this);
+}
+
+inline bool
+RouterT::conn_iterator::is_back() const
+{
+    conn_iterator x(*this);
+    return x && !++x;
+}
+
+inline const ElementT *
+RouterT::element(const String &s) const
+{
+    int i = _element_name_map[s];
+    return (i >= 0 ? _elements[i] : 0);
+}
+
+inline ElementT *
+RouterT::element(const String &s)
+{
+    int i = _element_name_map.get(s);
+    return (i >= 0 ? _elements[i] : 0);
+}
+
+inline String
+RouterT::ename(int e) const
+{
+    return _elements[e]->name();
+}
+
+inline ElementClassT *
+RouterT::etype(int e) const
+{
+    return _elements[e]->type();
+}
+
+inline String
+RouterT::etype_name(int e) const
+{
+    return _elements[e]->type()->name();
+}
+
+inline ElementClassT *
+RouterT::declared_type(const String &name) const
+{
+    return declared_type(name, 0x7FFFFFFF);
+}
+
+inline bool
+RouterT::add_connection(ElementT *from_elt, int from_port, ElementT *to_elt,
+			int to_port, const LandmarkT &landmark)
+{
+    return add_connection(PortT(from_elt, from_port), PortT(to_elt, to_port), landmark);
+}
+
+inline bool
+RouterT::insert_before(ElementT *e, const PortT &h)
+{
+    return insert_before(PortT(e, 0), h);
+}
+
+inline bool
+RouterT::insert_after(ElementT *e, const PortT &h)
+{
+    return insert_after(PortT(e, 0), h);
+}
+
+inline bool
+RouterT::defines(const String &name) const
+{
+    for (const String *f = _formals.begin(); f != _formals.end(); ++f)
+	if (*f == name)
+	    return true;
+    return _scope.defines(name);
+}
+
+inline bool
+RouterT::add_formal(const String &name, const String &type)
+{
+    if (defines(name))
+	return false;
+    _formals.push_back(name);
+    _formal_types.push_back(type);
+    return true;
+}
+
+inline bool
+RouterT::define(const String &name, const String &value)
+{
+    if (defines(name))
+	return false;
+    return _scope.define(name, value, false);
+}
+
+inline void
+RouterT::redefine(const VariableEnvironment &ve)
+{
+    for (int i = 0; i < ve.size(); i++)
+	_scope.define(ve.name(i), ve.value(i), true);
+}
+
+inline ArchiveElement &
+RouterT::archive(const String &name)
+{
+    return _archive[_archive_map.get(name)];
+}
+
+inline const ArchiveElement &
+RouterT::archive(const String &name) const
+{
+    return _archive[_archive_map[name]];
+}
+
+inline bool
+operator==(const RouterT::const_iterator &i, const RouterT::const_iterator &j)
+{
+    return i.get() == j.get();
+}
+
+inline bool
+operator!=(const RouterT::const_iterator &i, const RouterT::const_iterator &j)
+{
+    return i.get() != j.get();
+}
+
+inline bool
+operator==(const RouterT::const_type_iterator &i, const RouterT::const_type_iterator &j)
+{
+    return i.get() == j.get();
+}
+
+inline bool
+operator!=(const RouterT::const_type_iterator &i, const RouterT::const_type_iterator &j)
+{
+    return i.get() != j.get();
+}
+
+inline bool
+operator==(const RouterT::const_type_iterator &i, const RouterT::const_iterator &j)
+{
+    return i.get() == j.get();
+}
+
+inline bool
+operator!=(const RouterT::const_type_iterator &i, const RouterT::const_iterator &j)
+{
+    return i.get() != j.get();
+}
+
+inline bool
+operator==(const RouterT::conn_iterator &i, const RouterT::conn_iterator &j)
+{
+    return i.get() == j.get();
+}
+
+inline bool
+operator!=(const RouterT::conn_iterator &i, const RouterT::conn_iterator &j)
+{
+    return i.get() != j.get();
+}
+
+inline RouterT::conn_iterator
+operator+(RouterT::conn_iterator it, int x)
+{
+    while (x-- > 0)
+	++it;
+    return it;
+}
+
+#endif
diff --git a/openflow/include/clicktool/runparse.hh b/openflow/include/clicktool/runparse.hh
new file mode 100644
index 0000000..537a930
--- /dev/null
+++ b/openflow/include/clicktool/runparse.hh
@@ -0,0 +1,31 @@
+// -*- c-basic-offset: 4 -*-
+#ifndef CLICK_RUNPARSE_HH
+#define CLICK_RUNPARSE_HH
+#include "routert.hh"
+#include <click/pair.hh>
+
+class RouterUnparserT { public:
+
+    RouterUnparserT(ErrorHandler *);
+
+    struct Pair {
+	ElementClassT *first;
+	ElementClassT *second;
+	Pair(ElementClassT *a, ElementClassT *b) : first(a), second(b) { }
+    };
+
+  private:
+
+    HashTable<int, int> _tuid_map;
+    Vector<ElementClassT *> _types;
+
+    enum { X_BAD = 0, X_UNK = 1, X_LT = 2, X_LEQ = 3, X_EQ = 4, X_GEQ = 5, X_GT = 6, X_NUM = 7 };
+    static int relation_negater[X_NUM];
+    static uint8_t relation_combiner[X_NUM][X_NUM];
+    HashTable<Pair<ElementClassT *, ElementClassT *>, int> _relation;
+
+    ErrorHandler *_errh;
+
+};
+
+#endif
diff --git a/openflow/include/clicktool/toolutils.hh b/openflow/include/clicktool/toolutils.hh
new file mode 100644
index 0000000..b723d19
--- /dev/null
+++ b/openflow/include/clicktool/toolutils.hh
@@ -0,0 +1,21 @@
+#ifndef CLICK_TOOLUTILS_HH
+#define CLICK_TOOLUTILS_HH
+#include <click/userutils.hh>
+class RouterT;
+class VariableEnvironment;
+
+extern VariableEnvironment global_scope;
+extern bool ignore_line_directives;
+
+int click_maybe_define(const char *arg, ErrorHandler *errh);
+RouterT *read_router_string(const String &text, const String &landmark, ErrorHandler *);
+RouterT *read_router_string(String text, const String &landmark, bool, RouterT *, ErrorHandler *);
+RouterT *read_router_file(const char *filename, ErrorHandler *);
+RouterT *read_router_file(const char *filename, bool empty_ok, ErrorHandler *);
+RouterT *read_router(const String &, bool is_expr, ErrorHandler *);
+void write_router_file(RouterT *, FILE *, ErrorHandler * = 0);
+int write_router_file(RouterT *, const char *, ErrorHandler * = 0);
+
+String xml_quote(const String &);
+
+#endif
diff --git a/openflow/fast.h b/openflow/include/fast.h
similarity index 100%
rename from openflow/fast.h
rename to openflow/include/fast.h
diff --git a/openflow/fast_err.h b/openflow/include/fast_err.h
similarity index 100%
rename from openflow/fast_err.h
rename to openflow/include/fast_err.h
diff --git a/openflow/fast_struct.h b/openflow/include/fast_struct.h
similarity index 100%
rename from openflow/fast_struct.h
rename to openflow/include/fast_struct.h
diff --git a/openflow/fast_sys_dev.h b/openflow/include/fast_sys_dev.h
similarity index 100%
rename from openflow/fast_sys_dev.h
rename to openflow/include/fast_sys_dev.h
diff --git a/openflow/fast_type.h b/openflow/include/fast_type.h
similarity index 100%
rename from openflow/fast_type.h
rename to openflow/include/fast_type.h
diff --git a/openflow/fast_vaddr.h b/openflow/include/fast_vaddr.h
similarity index 100%
rename from openflow/fast_vaddr.h
rename to openflow/include/fast_vaddr.h
diff --git a/openflow/fast_version.h b/openflow/include/fast_version.h
similarity index 100%
rename from openflow/fast_version.h
rename to openflow/include/fast_version.h
diff --git a/openflow/usr/include/libnet.h b/openflow/include/libnet.h
similarity index 100%
rename from openflow/usr/include/libnet.h
rename to openflow/include/libnet.h
diff --git a/openflow/usr/include/libnet/libnet-asn1.h b/openflow/include/libnet/libnet-asn1.h
similarity index 100%
rename from openflow/usr/include/libnet/libnet-asn1.h
rename to openflow/include/libnet/libnet-asn1.h
diff --git a/openflow/usr/include/libnet/libnet-functions.h b/openflow/include/libnet/libnet-functions.h
similarity index 100%
rename from openflow/usr/include/libnet/libnet-functions.h
rename to openflow/include/libnet/libnet-functions.h
diff --git a/openflow/usr/include/libnet/libnet-headers.h b/openflow/include/libnet/libnet-headers.h
similarity index 100%
rename from openflow/usr/include/libnet/libnet-headers.h
rename to openflow/include/libnet/libnet-headers.h
diff --git a/openflow/usr/include/libnet/libnet-macros.h b/openflow/include/libnet/libnet-macros.h
similarity index 100%
rename from openflow/usr/include/libnet/libnet-macros.h
rename to openflow/include/libnet/libnet-macros.h
diff --git a/openflow/usr/include/libnet/libnet-structures.h b/openflow/include/libnet/libnet-structures.h
similarity index 100%
rename from openflow/usr/include/libnet/libnet-structures.h
rename to openflow/include/libnet/libnet-structures.h
diff --git a/openflow/usr/include/libnet/libnet-types.h b/openflow/include/libnet/libnet-types.h
similarity index 100%
rename from openflow/usr/include/libnet/libnet-types.h
rename to openflow/include/libnet/libnet-types.h
diff --git a/openflow/include/main_libofp.h b/openflow/include/main_libofp.h
new file mode 100755
index 0000000..e9e46ca
--- /dev/null
+++ b/openflow/include/main_libofp.h
@@ -0,0 +1,222 @@
+/***************************************************************************
+ *            main_libofp.h
+ *
+ *  2017/02/27 09:51:58 星期一
+ *  Copyright  2017  XuDongLai
+ *  <XuDongLai0923@163.com>
+ ****************************************************************************/
+/*
+ * main_libofp.h
+ *
+ * Copyright (C) 2017 - XuDongLai
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef __MAIN_LIBOFP_H__
+#define __MAIN_LIBOFP_H__
+
+#include <sys/prctl.h>
+#include <libnet.h>
+#include <pcap.h>
+#include <linux/if_ether.h>
+#include <ifaddrs.h>
+#include <linux/ethtool.h>
+#include <linux/sockios.h>
+
+#include "ofp_v4.h"
+
+#undef NMS_METER
+/***************************/
+#if 0
+#define NMS_METER
+#endif
+
+#define MAX_IF_CNT 16
+#define MAX_RULE_CNT 256
+#define MAX_NEIGH_CNT 256
+
+
+
+/*打印控制使用*/
+static int print_idx_nms[MAX_IF_CNT] = {0};
+static int __oft = 3;
+/*打印控制使用*/
+
+/*颜色控制*/
+#define NONE          "\033[m"   
+#define RED           "\033[0;32;31m"   
+#define LIGHT_RED     "\033[1;31m"   
+#define GREEN         "\033[0;32;32m"   
+#define LIGHT_GREEN   "\033[1;32m"   
+#define BLUE          "\033[0;32;34m"   
+#define LIGHT_BLUE    "\033[1;34m"   
+#define DARY_GRAY     "\033[1;30m"   
+#define CYAN          "\033[0;36m"   
+#define LIGHT_CYAN    "\033[1;36m"   
+#define PURPLE        "\033[0;35m"   
+#define LIGHT_PURPLE  "\033[1;35m"   
+#define BROWN         "\033[0;33m"   
+#define YELLOW        "\033[1;33m"   
+#define LIGHT_GRAY    "\033[0;37m"   
+#define WHITE         "\033[1;37m" 
+/*颜色控制*/
+
+static int debug = 0xFFF;/*默认不输出任何打印信息*/
+enum
+{
+	_FUN = 1<<0,
+	_DBG = 1<<1,
+	_ERR = 1<<2,
+};
+
+static char P_COLOR[MAX_IF_CNT][24]  = 
+{
+	NONE,WHITE,YELLOW,LIGHT_BLUE,DARY_GRAY,CYAN,PURPLE,BROWN,LIGHT_GRAY,GREEN
+};
+
+#define IDX(x) (x=='n'?0:x-48)
+
+#define PRINT(fmt,argv...)do{ \
+	char _thread_name[16] = {0}; \
+	prctl(PR_GET_NAME,_thread_name);  \
+	printf(YELLOW"%s)"fmt,_thread_name,##argv); \
+	}while(0);
+
+#define LOG_DBG(fmt,argv...)do{ \
+	char _thread_name[16] = {0}; \
+	prctl(PR_GET_NAME,_thread_name); \
+	int tid = IDX(_thread_name[0]); \
+	if(debug < 1 || (debug & (1<<tid)) != (1<<tid))break; \
+	int __print_idx_nms = print_idx_nms[tid]; \
+	int _cnt = __print_idx_nms + __oft; \
+	char _out[1024] = "=="; \
+	while(_cnt-->0)sprintf(_out,"%s%s",_out," "); \
+	printf("%s%s)%s"fmt,P_COLOR[tid],_thread_name,_out,##argv); \
+}while(0);
+
+#define LOG_ERR(fmt,argv...)do{ \
+	char _thread_name[16] = {0}; \
+	prctl(PR_GET_NAME,_thread_name); \
+	if(1){printf(RED "ERROR! %s)%s:%s[%d]\n" fmt NONE,_thread_name,__func__,__FILE__,__LINE__,##argv);} \
+	exit(0); \
+}while(0);
+
+#define SHOW_FUN(a)do{ \
+	char _thread_name[16] = {0}; \
+	prctl(PR_GET_NAME,_thread_name); \
+	int _cnt = 0; \
+	int tid = IDX(_thread_name[0]); \
+	if(debug < 1 || (debug & (1<<tid)) != (1<<tid))break; \
+	char _out[1024] = {0}; \
+	int __print_idx_nms = print_idx_nms[tid]; \
+	if(!a){__print_idx_nms += __oft;sprintf(_out,"%s",">>");}else{sprintf(_out,"%s","<<");} \
+	_cnt = __print_idx_nms; \
+	while(_cnt-->0)sprintf(_out,"%s%s",_out," "); \
+	printf("%s%s)%s%s :%s[%d]\n",P_COLOR[tid],_thread_name,_out,__func__,__FILE__,__LINE__); \
+	if(a){__print_idx_nms -= __oft;} \
+	print_idx_nms[tid] = __print_idx_nms; \
+}while(0);
+
+#define DIV_ROUND_UP(X,Y) (((X) + ((Y) - 1)) / (Y))
+#define ROUND_UP(X,Y) (DIV_ROUND_UP(X,Y) * Y)
+
+
+
+struct eth_header
+{
+	u8 dmac[6];
+	u8 smac[6];
+	u16 frame;
+	u8 data[0];
+}__attribute__((packed));
+
+struct meter_buffer
+{
+	u8 data[60];
+	u32 ts;
+	u8 in_port;
+	u8 pad[3];
+}__attribute__((packed));
+
+struct netdev_stats {
+	unsigned long long rx_packets;    /* total packets received       */
+	unsigned long long tx_packets;        /* total packets transmitted    */
+	unsigned long long rx_bytes;  /* total bytes received         */
+	unsigned long long tx_bytes;  /* total bytes transmitted      */
+	unsigned long rx_errors;      /* bad packets received         */
+	unsigned long tx_errors;      /* packet transmit problems     */
+	unsigned long rx_dropped;     /* no space in linux buffers    */
+	unsigned long tx_dropped;     /* no space available in linux  */
+	unsigned long rx_multicast;   /* multicast packets received   */
+	unsigned long rx_compressed;
+	unsigned long tx_compressed;
+	unsigned long collisions;
+	 
+	/* detailed rx_errors: */
+	unsigned long rx_length_errors;
+	unsigned long rx_over_errors; /* receiver ring buff overflow  */
+	unsigned long rx_crc_errors;  /* recved pkt with crc error    */
+	unsigned long rx_frame_errors;        /* recv'd frame alignment error */
+	unsigned long rx_fifo_errors; /* recv'r fifo overrun          */
+	unsigned long rx_missed_errors;       /* receiver missed packet     */
+	/* detailed tx_errors */
+	unsigned long tx_aborted_errors;
+	unsigned long tx_carrier_errors;
+	unsigned long tx_fifo_errors;
+	unsigned long tx_heartbeat_errors;
+	unsigned long tx_window_errors;
+};
+
+
+
+struct nms_port
+{
+	u8 name[16];
+	struct ofp_port state;
+	struct ofp_port_stats stats;
+	union
+	{
+		u32 port_ip4;
+		struct in6_addr port_ip6;
+		u8 ip[16];
+	};
+	union
+	{
+		u32 gw_ip4;
+		struct in6_addr gw_ip6;
+		u8 gw[16];
+		u64 gw_value[2];
+	};
+	u8 gwmac[6];
+	u8 port_mac[6];
+	pcap_t *pcap;
+	libnet_t *net;
+	u32 logport;
+	u32 phyport;
+	u32 old_state;
+	u16 speed;
+	u16 updown;
+	pthread_mutex_t port_send_mutex;
+};
+
+struct nms_ports_info
+{
+	int cnt;	
+	struct nms_port ports[MAX_IF_CNT];
+};
+
+
+
+
+#endif //__MAIN_LIBOFP_H__
diff --git a/openflow/include/md5.h b/openflow/include/md5.h
new file mode 100755
index 0000000..569a4a6
--- /dev/null
+++ b/openflow/include/md5.h
@@ -0,0 +1,46 @@
+#ifndef __MD5_H__
+#define __MD5_H__  
+   
+typedef struct  
+{  
+	unsigned int count[2];  
+	unsigned int state[4];  
+	unsigned char buffer[64];     
+}MD5_CTX;  
+   
+						   
+#define F(x,y,z) ((x & y) | (~x & z))  
+#define G(x,y,z) ((x & z) | (y & ~z))  
+#define H(x,y,z) (x^y^z)  
+#define I(x,y,z) (y ^ (x | ~z))  
+#define ROTATE_LEFT(x,n) ((x << n) | (x >> (32-n)))  
+
+#define FF(a,b,c,d,x,s,ac){ \
+		a += F(b,c,d) + x + ac; \
+		a = ROTATE_LEFT(a,s); \
+		a += b; \
+		  }  
+#define GG(a,b,c,d,x,s,ac){ \
+		a += G(b,c,d) + x + ac; \
+		a = ROTATE_LEFT(a,s); \
+		a += b; \
+		}  
+#define HH(a,b,c,d,x,s,ac){ \
+		a += H(b,c,d) + x + ac; \
+		a = ROTATE_LEFT(a,s); \
+		a += b; \
+		}  
+#define II(a,b,c,d,x,s,ac){ \
+		a += I(b,c,d) + x + ac; \
+		a = ROTATE_LEFT(a,s); \
+		a += b; \
+		}                                              
+
+void MD5Init(MD5_CTX *context);  
+void MD5Update(MD5_CTX *context,unsigned char *input,unsigned int inputlen);  
+void MD5Final(MD5_CTX *context,unsigned char digest[16]);  
+void MD5Transform(unsigned int state[4],unsigned char block[64]);  
+void MD5Encode(unsigned char *output,unsigned int *input,unsigned int len);  
+void MD5Decode(unsigned int *output,unsigned char *input,unsigned int len);  
+   
+#endif  //__MD5_H__
diff --git a/openflow/usr/include/netmagic08.h b/openflow/include/netmagic08.h
similarity index 100%
rename from openflow/usr/include/netmagic08.h
rename to openflow/include/netmagic08.h
diff --git a/openflow/ofp_v4.h b/openflow/include/ofp_v4.h
similarity index 99%
rename from openflow/ofp_v4.h
rename to openflow/include/ofp_v4.h
index 20c1aa8..d812f79 100755
--- a/openflow/ofp_v4.h
+++ b/openflow/include/ofp_v4.h
@@ -337,7 +337,9 @@ enum eth_packet_type {
 	//ETH_IPv4 = 0x0800,
 	//ETH_ARP = 0x0806,
 	//ETH_IPv6 = 0x86DD,
+#ifndef ETH_P_LLDP
 	ETH_P_LLDP = 0x88CC,
+#endif
 	ETH_P_XX = 0x8942,
 };
 
diff --git a/openflow/usr/include/openboxS28.h b/openflow/include/openboxS28.h
similarity index 100%
rename from openflow/usr/include/openboxS28.h
rename to openflow/include/openboxS28.h
diff --git a/openflow/usr/include/openboxS4.h b/openflow/include/openboxS4.h
similarity index 100%
rename from openflow/usr/include/openboxS4.h
rename to openflow/include/openboxS4.h
diff --git a/openflow/include/openflow/intel-ext.h b/openflow/include/openflow/intel-ext.h
new file mode 100644
index 0000000..974e63e
--- /dev/null
+++ b/openflow/include/openflow/intel-ext.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright(c) 2016 Intel Corporation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENFLOW_INTEL_EXT_H
+#define OPENFLOW_INTEL_EXT_H
+
+/* This file presents Intel vendor extension. It is not anyhow
+ * standardized, so all those definitions are not part of
+ * official openflow headers (openflow.h).  Nevertheless below
+ * features introduces real value so it could be suitable for
+ * standardization */
+
+/* Intel extended statistics type */
+
+enum intel_port_stats_subtype {
+    INTEL_PORT_STATS_RFC2819 = 1,
+};
+
+#define INTEL_PORT_STATS_RFC2819_SIZE 184
+
+/* Struct implements custom property type based on
+ * 'ofp_prop_experimenter'. */
+struct intel_port_stats_rfc2819 {
+    ovs_be16 type;              /* OFPPSPT14_EXPERIMENTER. */
+    ovs_be16 length;            /* Length in bytes of this property excluding
+                                 * trailing padding. */
+    ovs_be32 experimenter;      /* INTEL_VENDOR_ID. */
+    ovs_be32 exp_type;          /* INTEL_PORT_STATS_*. */
+
+    uint8_t pad[4];
+
+    ovs_be64 rx_1_to_64_packets;
+    ovs_be64 rx_65_to_127_packets;
+    ovs_be64 rx_128_to_255_packets;
+    ovs_be64 rx_256_to_511_packets;
+    ovs_be64 rx_512_to_1023_packets;
+    ovs_be64 rx_1024_to_1522_packets;
+    ovs_be64 rx_1523_to_max_packets;
+
+    ovs_be64 tx_1_to_64_packets;
+    ovs_be64 tx_65_to_127_packets;
+    ovs_be64 tx_128_to_255_packets;
+    ovs_be64 tx_256_to_511_packets;
+    ovs_be64 tx_512_to_1023_packets;
+    ovs_be64 tx_1024_to_1522_packets;
+    ovs_be64 tx_1523_to_max_packets;
+
+    ovs_be64 tx_multicast_packets;
+    ovs_be64 rx_broadcast_packets;
+    ovs_be64 tx_broadcast_packets;
+    ovs_be64 rx_undersized_errors;
+    ovs_be64 rx_oversize_errors;
+    ovs_be64 rx_fragmented_errors;
+    ovs_be64 rx_jabber_errors;
+
+};
+OFP_ASSERT(sizeof (struct intel_port_stats_rfc2819) ==
+           INTEL_PORT_STATS_RFC2819_SIZE);
+
+#endif /* openflow/intel-ext.h */
diff --git a/openflow/include/openflow/netronome-ext.h b/openflow/include/openflow/netronome-ext.h
new file mode 100644
index 0000000..8db7b79
--- /dev/null
+++ b/openflow/include/openflow/netronome-ext.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2014 Netronome.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENFLOW_NETRONOME_EXT_H
+#define OPENFLOW_NETRONOME_EXT_H 1
+
+#include "openflow/openflow.h"
+#include "openvswitch/types.h"
+
+/* The following vendor extension, proposed by Netronome, is not yet
+ * standardized, so they are not included in openflow.h.  It may
+ * be suitable for standardization */
+
+
+/* Netronome enhanced select group */
+
+enum ntr_group_mod_subtype {
+        NTRT_SELECTION_METHOD = 1,
+};
+
+#define NTR_MAX_SELECTION_METHOD_LEN 16
+
+struct ntr_group_prop_selection_method {
+    ovs_be16 type;                  /* OFPGPT15_EXPERIMENTER. */
+    ovs_be16 length;                /* Length in bytes of this property
+                                     * excluding trailing padding. */
+    ovs_be32 experimenter;          /* NTR_VENDOR_ID. */
+    ovs_be32 exp_type;              /* NTRT_SELECTION_METHOD. */
+    ovs_be32 pad;
+    char selection_method[NTR_MAX_SELECTION_METHOD_LEN];
+                                    /* Null-terminated */
+    ovs_be64 selection_method_param;  /* Non-Field parameter for
+                                       * bucket selection. */
+
+    /* Followed by:
+     *   - Exactly (length - 40) (possibly 0) bytes containing OXM TLVs, then
+     *   - Exactly ((length + 7)/8*8 - length) (between 0 and 7) bytes of
+     *     all-zero bytes
+     * In summary, ntr_group_prop_selection_method is padded as needed,
+     * to make its overall size a multiple of 8, to preserve alignment
+     * in structures using it.
+     */
+    /* uint8_t field_array[0]; */   /* Zero or more fields encoded as
+                                     * OXM TLVs where the has_mask bit must
+                                     * be zero and the value it specifies is
+                                     * a mask to apply to packet fields and
+                                     * then input them to the selection
+                                     * method of a select group. */
+    /* uint8_t pad2[0]; */
+};
+OFP_ASSERT(sizeof(struct ntr_group_prop_selection_method) == 40);
+
+#endif /* openflow/netronome-ext.h */
diff --git a/openflow/include/openflow/nicira-ext.h b/openflow/include/openflow/nicira-ext.h
new file mode 100644
index 0000000..9d53623
--- /dev/null
+++ b/openflow/include/openflow/nicira-ext.h
@@ -0,0 +1,1141 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENFLOW_NICIRA_EXT_H
+#define OPENFLOW_NICIRA_EXT_H 1
+
+#include <openflow/openflow.h>
+#include <openvswitch/types.h>
+
+/* The following vendor extensions, proposed by Nicira, are not yet
+ * standardized, so they are not included in openflow.h.  Some of them may be
+ * suitable for standardization; others we never expect to standardize. */
+
+
+/* Nicira vendor-specific error messages extension.
+ *
+ * OpenFlow 1.0 has a set of predefined error types (OFPET_*) and codes (which
+ * are specific to each type).  It does not have any provision for
+ * vendor-specific error codes, and it does not even provide "generic" error
+ * codes that can apply to problems not anticipated by the OpenFlow
+ * specification authors.
+ *
+ * This extension attempts to address the problem by adding a generic "error
+ * vendor extension".  The extension works as follows: use NXET_VENDOR as type
+ * and NXVC_VENDOR_ERROR as code, followed by struct nx_vendor_error with
+ * vendor-specific details, followed by at least 64 bytes of the failed
+ * request.
+ *
+ * It would be better to have a type-specific vendor extension, e.g. so that
+ * OFPET_BAD_ACTION could be used with vendor-specific code values.  But
+ * OFPET_BAD_ACTION and most other standardized types already specify that
+ * their 'data' values are (the start of) the OpenFlow message being replied
+ * to, so there is no room to insert a vendor ID.
+ *
+ * Currently this extension is only implemented by Open vSwitch, but it seems
+ * like a reasonable candidate for future standardization.
+ */
+
+/* This is a random number to avoid accidental collision with any other
+ * vendor's extension. */
+#define NXET_VENDOR 0xb0c2
+
+/* ofp_error msg 'code' values for NXET_VENDOR. */
+enum nx_vendor_code {
+    NXVC_VENDOR_ERROR           /* 'data' contains struct nx_vendor_error. */
+};
+
+/* 'data' for 'type' == NXET_VENDOR, 'code' == NXVC_VENDOR_ERROR. */
+struct nx_vendor_error {
+    ovs_be32 vendor;            /* Vendor ID as in struct ofp_vendor_header. */
+    ovs_be16 type;              /* Vendor-defined type. */
+    ovs_be16 code;              /* Vendor-defined subtype. */
+    /* Followed by at least the first 64 bytes of the failed request. */
+};
+
+/* Nicira vendor requests and replies. */
+
+/* Fields to use when hashing flows. */
+enum nx_hash_fields {
+    /* Ethernet source address (NXM_OF_ETH_SRC) only. */
+    NX_HASH_FIELDS_ETH_SRC,
+
+    /* L2 through L4, symmetric across src/dst.  Specifically, each of the
+     * following fields, if present, is hashed (slashes separate symmetric
+     * pairs):
+     *
+     *  - NXM_OF_ETH_DST / NXM_OF_ETH_SRC
+     *  - NXM_OF_ETH_TYPE
+     *  - The VID bits from NXM_OF_VLAN_TCI, ignoring PCP and CFI.
+     *  - NXM_OF_IP_PROTO
+     *  - NXM_OF_IP_SRC / NXM_OF_IP_DST
+     *  - NXM_OF_TCP_SRC / NXM_OF_TCP_DST
+     */
+    NX_HASH_FIELDS_SYMMETRIC_L4,
+
+    /* L3+L4 only, including the following fields:
+     *
+     *  - NXM_OF_IP_PROTO
+     *  - NXM_OF_IP_SRC / NXM_OF_IP_DST
+     *  - NXM_OF_SCTP_SRC / NXM_OF_SCTP_DST
+     *  - NXM_OF_TCP_SRC / NXM_OF_TCP_DST
+     */
+    NX_HASH_FIELDS_SYMMETRIC_L3L4,
+
+    /* L3+L4 only with UDP ports, including the following fields:
+     *
+     *  - NXM_OF_IP_PROTO
+     *  - NXM_OF_IP_SRC / NXM_OF_IP_DST
+     *  - NXM_OF_SCTP_SRC / NXM_OF_SCTP_DST
+     *  - NXM_OF_TCP_SRC / NXM_OF_TCP_DST
+     *  - NXM_OF_UDP_SRC / NXM_OF_UDP_DST
+     */
+    NX_HASH_FIELDS_SYMMETRIC_L3L4_UDP
+
+
+};
+
+/* This command enables or disables an Open vSwitch extension that allows a
+ * controller to specify the OpenFlow table to which a flow should be added,
+ * instead of having the switch decide which table is most appropriate as
+ * required by OpenFlow 1.0.  Because NXM was designed as an extension to
+ * OpenFlow 1.0, the extension applies equally to ofp10_flow_mod and
+ * nx_flow_mod.  By default, the extension is disabled.
+ *
+ * When this feature is enabled, Open vSwitch treats struct ofp10_flow_mod's
+ * and struct nx_flow_mod's 16-bit 'command' member as two separate fields.
+ * The upper 8 bits are used as the table ID, the lower 8 bits specify the
+ * command as usual.  A table ID of 0xff is treated like a wildcarded table ID.
+ *
+ * The specific treatment of the table ID depends on the type of flow mod:
+ *
+ *    - OFPFC_ADD: Given a specific table ID, the flow is always placed in that
+ *      table.  If an identical flow already exists in that table only, then it
+ *      is replaced.  If the flow cannot be placed in the specified table,
+ *      either because the table is full or because the table cannot support
+ *      flows of the given type, the switch replies with an OFPFMFC_TABLE_FULL
+ *      error.  (A controller can distinguish these cases by comparing the
+ *      current and maximum number of entries reported in ofp_table_stats.)
+ *
+ *      If the table ID is wildcarded, the switch picks an appropriate table
+ *      itself.  If an identical flow already exist in the selected flow table,
+ *      then it is replaced.  The choice of table might depend on the flows
+ *      that are already in the switch; for example, if one table fills up then
+ *      the switch might fall back to another one.
+ *
+ *    - OFPFC_MODIFY, OFPFC_DELETE: Given a specific table ID, only flows
+ *      within that table are matched and modified or deleted.  If the table ID
+ *      is wildcarded, flows within any table may be matched and modified or
+ *      deleted.
+ *
+ *    - OFPFC_MODIFY_STRICT, OFPFC_DELETE_STRICT: Given a specific table ID,
+ *      only a flow within that table may be matched and modified or deleted.
+ *      If the table ID is wildcarded and exactly one flow within any table
+ *      matches, then it is modified or deleted; if flows in more than one
+ *      table match, then none is modified or deleted.
+ */
+struct nx_flow_mod_table_id {
+    uint8_t set;                /* Nonzero to enable, zero to disable. */
+    uint8_t pad[7];
+};
+OFP_ASSERT(sizeof(struct nx_flow_mod_table_id) == 8);
+
+enum nx_packet_in_format {
+    NXPIF_STANDARD = 0,         /* OFPT_PACKET_IN for this OpenFlow version. */
+    NXPIF_NXT_PACKET_IN = 1,    /* NXT_PACKET_IN (since OVS v1.1). */
+    NXPIF_NXT_PACKET_IN2 = 2,   /* NXT_PACKET_IN2 (since OVS v2.6). */
+};
+
+/* NXT_SET_PACKET_IN_FORMAT request.
+ *
+ * For any given OpenFlow version, Open vSwitch supports multiple formats for
+ * "packet-in" messages.  The default is always the standard format for the
+ * OpenFlow version in question, but NXT_SET_PACKET_IN_FORMAT can be used to
+ * set an alternative format.
+ *
+ * From OVS v1.1 to OVS v2.5, this request was only honored for OpenFlow 1.0.
+ * Requests to set format NXPIF_NXT_PACKET_IN were accepted for OF1.1+ but they
+ * had no effect.  (Requests to set formats other than NXPIF_STANDARD or
+ * NXPIF_NXT_PACKET_IN were rejected with OFPBRC_EPERM.)
+ *
+ * From OVS v2.6 onward, this request is honored for all OpenFlow versions.
+ */
+struct nx_set_packet_in_format {
+    ovs_be32 format;            /* One of NXPIF_*. */
+};
+OFP_ASSERT(sizeof(struct nx_set_packet_in_format) == 4);
+
+/* NXT_PACKET_IN (analogous to OFPT_PACKET_IN).
+ *
+ * NXT_PACKET_IN is similar to the OpenFlow 1.2 OFPT_PACKET_IN.  The
+ * differences are:
+ *
+ *     - NXT_PACKET_IN includes the cookie of the rule that triggered the
+ *       message.  (OpenFlow 1.3 OFPT_PACKET_IN also includes the cookie.)
+ *
+ *     - The metadata fields use NXM (instead of OXM) field numbers.
+ *
+ * Open vSwitch 1.9.0 and later omits metadata fields that are zero (as allowed
+ * by OpenFlow 1.2).  Earlier versions included all implemented metadata
+ * fields.
+ *
+ * Open vSwitch does not include non-metadata in the nx_match, because by
+ * definition that information can be found in the packet itself.  The format
+ * and the standards allow this, however, so controllers should be prepared to
+ * tolerate future changes.
+ *
+ * The NXM format is convenient for reporting metadata values, but it is
+ * important not to interpret the format as matching against a flow, because it
+ * does not.  Nothing is being matched; arbitrary metadata masks would not be
+ * meaningful.
+ *
+ * Whereas in most cases a controller can expect to only get back NXM fields
+ * that it set up itself (e.g. flow dumps will ordinarily report only NXM
+ * fields from flows that the controller added), NXT_PACKET_IN messages might
+ * contain fields that the controller does not understand, because the switch
+ * might support fields (new registers, new protocols, etc.) that the
+ * controller does not.  The controller must prepared to tolerate these.
+ *
+ * The 'cookie' field has no meaning when 'reason' is OFPR_NO_MATCH.  In this
+ * case it should be UINT64_MAX. */
+struct nx_packet_in {
+    ovs_be32 buffer_id;       /* ID assigned by datapath. */
+    ovs_be16 total_len;       /* Full length of frame. */
+    uint8_t reason;           /* Reason packet is sent (one of OFPR_*). */
+    uint8_t table_id;         /* ID of the table that was looked up. */
+    ovs_be64 cookie;          /* Cookie of the rule that was looked up. */
+    ovs_be16 match_len;       /* Size of nx_match. */
+    uint8_t pad[6];           /* Align to 64-bits. */
+    /* Followed by:
+     *   - Exactly match_len (possibly 0) bytes containing the nx_match, then
+     *   - Exactly (match_len + 7)/8*8 - match_len (between 0 and 7) bytes of
+     *     all-zero bytes, then
+     *   - Exactly 2 all-zero padding bytes, then
+     *   - An Ethernet frame whose length is inferred from nxh.header.length.
+     *
+     * The padding bytes preceding the Ethernet frame ensure that the IP
+     * header (if any) following the Ethernet header is 32-bit aligned. */
+
+    /* uint8_t nxm_fields[...]; */ /* NXM headers. */
+    /* uint8_t pad[2]; */          /* Align to 64 bit + 16 bit. */
+    /* uint8_t data[0]; */         /* Ethernet frame. */
+};
+OFP_ASSERT(sizeof(struct nx_packet_in) == 24);
+
+/* NXT_PACKET_IN2
+ * ==============
+ *
+ * NXT_PACKET_IN2 is conceptually similar to OFPT_PACKET_IN but it is expressed
+ * as an extensible set of properties instead of using a fixed structure.
+ *
+ * Added in Open vSwitch 2.6
+ *
+ *
+ * Continuations
+ * -------------
+ *
+ * When a "controller" action specifies the "pause" flag, the controller action
+ * freezes the packet's trip through Open vSwitch flow tables and serializes
+ * that state into the packet-in message as a "continuation".  The controller
+ * can later send the continuation back to the switch, which will restart the
+ * packet's traversal from the point where it was interrupted.  This permits an
+ * OpenFlow controller to interpose on a packet midway through processing in
+ * Open vSwitch.
+ *
+ * Continuations fit into packet processing this way:
+ *
+ * 1. A packet ingresses into Open vSwitch, which runs it through the OpenFlow
+ *    tables.
+ *
+ * 2. An OpenFlow flow executes a "controller" action that includes the "pause"
+ *    flag.  Open vSwitch serializes the packet processing state and sends it,
+ *    as an NXT_PACKET_IN2 that includes an additional NXPINT_CONTINUATION
+ *    property (the continuation), to the OpenFlow controller.
+ *
+ *    (The controller must use NXAST_CONTROLLER2 to generate the packet-in,
+ *    because only this form of the "controller" action has a "pause" flag.
+ *    Similarly, the controller must use NXT_SET_PACKET_IN_FORMAT to select
+ *    NXT_PACKET_IN2 as the packet-in format, because this is the only format
+ *    that supports continuation passing.)
+ *
+ * 3. The controller receives the NXT_PACKET_IN2 and processes it.  The
+ *    controller can interpret and, if desired, modify some of the contents of
+ *    the packet-in, such as the packet and the metadata being processed.
+ *
+ * 4. The controller sends the continuation back to the switch, using an
+ *    NXT_RESUME message.  Packet processing resumes where it left off.
+ *
+ * The controller might change the pipeline configuration concurrently with
+ * steps 2 through 4.  For example, it might add or remove OpenFlow flows.  If
+ * that happens, then the packet will experience a mix of processing from the
+ * two configurations, that is, the initial processing (before
+ * NXAST_CONTROLLER2) uses the initial flow table, and the later processing
+ * (after NXT_RESUME) uses the later flow table.  This means that the
+ * controller needs to take care to avoid incompatible pipeline changes while
+ * processing continuations.
+ *
+ * External side effects (e.g. "output") of OpenFlow actions processed before
+ * NXAST_CONTROLLER2 is encountered might be executed during step 2 or step 4,
+ * and the details may vary among Open vSwitch features and versions.  Thus, a
+ * controller that wants to make sure that side effects are executed must pass
+ * the continuation back to the switch, that is, must not skip step 4.
+ *
+ * Architecturally, continuations may be "stateful" or "stateless", that is,
+ * they may or may not refer to buffered state maintained in Open vSwitch.
+ * This means that a controller should not attempt to resume a given
+ * continuations more than once (because the switch might have discarded the
+ * buffered state after the first use).  For the same reason, continuations
+ * might become "stale" if the controller takes too long to resume them
+ * (because the switch might have discarded old buffered state).  Taken
+ * together with the previous note, this means that a controller should resume
+ * each continuation exactly once (and promptly).
+ *
+ * Without the information in NXPINT_CONTINUATION, the controller can (with
+ * careful design, and help from the flow cookie) determine where the packet is
+ * in the pipeline, but in the general case it can't determine what nested
+ * "resubmit"s that may be in progress, or what data is on the stack maintained
+ * by NXAST_STACK_PUSH and NXAST_STACK_POP actions, what is in the OpenFlow
+ * action set, etc.
+ *
+ * Continuations are expensive because they require a round trip between the
+ * switch and the controller.  Thus, they should not be used to implement
+ * processing that needs to happen at "line rate".
+ *
+ * The contents of NXPINT_CONTINUATION are private to the switch, may change
+ * unpredictably from one version of Open vSwitch to another, and are not
+ * documented here.  The contents are also tied to a given Open vSwitch process
+ * and bridge, so that restarting Open vSwitch or deleting and recreating a
+ * bridge will cause the corresponding NXT_RESUME to be rejected.
+ *
+ * In the current implementation, Open vSwitch forks the packet processing
+ * pipeline across patch ports.  Suppose, for example, that the pipeline for
+ * br0 outputs to a patch port whose peer belongs to br1, and that the pipeline
+ * for br1 executes a controller action with the "pause" flag.  This only
+ * pauses processing within br1, and processing in br0 continues and possibly
+ * completes with visible side effects, such as outputting to ports, before
+ * br1's controller receives or processes the continuation.  This
+ * implementation maintains the independence of separate bridges and, since
+ * processing in br1 cannot affect the behavior of br0 anyway, should not cause
+ * visible behavioral changes.
+ *
+ * A stateless implementation of continuations may ignore the "controller"
+ * action max_len, always sending the whole packet, because the full packet is
+ * required to continue traversal.
+ */
+enum nx_packet_in2_prop_type {
+    /* Packet. */
+    NXPINT_PACKET,              /* Raw packet data. */
+    NXPINT_FULL_LEN,            /* ovs_be32: Full packet len, if truncated. */
+    NXPINT_BUFFER_ID,           /* ovs_be32: Buffer ID, if buffered. */
+
+    /* Information about the flow that triggered the packet-in. */
+    NXPINT_TABLE_ID,            /* uint8_t: Table ID. */
+    NXPINT_COOKIE,              /* ovs_be64: Flow cookie. */
+
+    /* Other. */
+    NXPINT_REASON,              /* uint8_t, one of OFPR_*. */
+    NXPINT_METADATA,            /* NXM or OXM for metadata fields. */
+    NXPINT_USERDATA,            /* From NXAST_CONTROLLER2 userdata. */
+    NXPINT_CONTINUATION,        /* Private data for continuing processing. */
+};
+
+/* Configures the "role" of the sending controller.  The default role is:
+ *
+ *    - Other (NX_ROLE_OTHER), which allows the controller access to all
+ *      OpenFlow features.
+ *
+ * The other possible roles are a related pair:
+ *
+ *    - Master (NX_ROLE_MASTER) is equivalent to Other, except that there may
+ *      be at most one Master controller at a time: when a controller
+ *      configures itself as Master, any existing Master is demoted to the
+ *      Slave role.
+ *
+ *    - Slave (NX_ROLE_SLAVE) allows the controller read-only access to
+ *      OpenFlow features.  In particular attempts to modify the flow table
+ *      will be rejected with an OFPBRC_EPERM error.
+ *
+ *      Slave controllers do not receive OFPT_PACKET_IN or OFPT_FLOW_REMOVED
+ *      messages, but they do receive OFPT_PORT_STATUS messages.
+ */
+struct nx_role_request {
+    ovs_be32 role;              /* One of NX_ROLE_*. */
+};
+OFP_ASSERT(sizeof(struct nx_role_request) == 4);
+
+enum nx_role {
+    NX_ROLE_OTHER,              /* Default role, full access. */
+    NX_ROLE_MASTER,             /* Full access, at most one. */
+    NX_ROLE_SLAVE               /* Read-only access. */
+};
+
+/* NXT_SET_ASYNC_CONFIG.
+ *
+ * Sent by a controller, this message configures the asynchronous messages that
+ * the controller wants to receive.  Element 0 in each array specifies messages
+ * of interest when the controller has an "other" or "master" role; element 1,
+ * when the controller has a "slave" role.
+ *
+ * Each array element is a bitmask in which a 0-bit disables receiving a
+ * particular message and a 1-bit enables receiving it.  Each bit controls the
+ * message whose 'reason' corresponds to the bit index.  For example, the bit
+ * with value 1<<2 == 4 in port_status_mask[1] determines whether the
+ * controller will receive OFPT_PORT_STATUS messages with reason OFPPR_MODIFY
+ * (value 2) when the controller has a "slave" role.
+ *
+ * As a side effect, for service controllers, this message changes the
+ * miss_send_len from default of zero to OFP_DEFAULT_MISS_SEND_LEN (128).
+ */
+struct nx_async_config {
+    ovs_be32 packet_in_mask[2];    /* Bitmasks of OFPR_* values. */
+    ovs_be32 port_status_mask[2];  /* Bitmasks of OFPRR_* values. */
+    ovs_be32 flow_removed_mask[2]; /* Bitmasks of OFPPR_* values. */
+};
+OFP_ASSERT(sizeof(struct nx_async_config) == 24);
+
+/* Flexible flow specifications (aka NXM = Nicira Extended Match).
+ *
+ * OpenFlow 1.0 has "struct ofp10_match" for specifying flow matches.  This
+ * structure is fixed-length and hence difficult to extend.  This section
+ * describes a more flexible, variable-length flow match, called "nx_match" for
+ * short, that is also supported by Open vSwitch.  This section also defines a
+ * replacement for each OpenFlow message that includes struct ofp10_match.
+ *
+ * OpenFlow 1.2+ introduced OpenFlow Extensible Match (OXM), adapting
+ * the design of NXM.  The format of NXM and OXM are compatible.
+ *
+ *
+ * Format
+ * ======
+ *
+ * An nx_match is a sequence of zero or more "nxm_entry"s, which are
+ * type-length-value (TLV) entries, each 5 to 259 (inclusive) bytes long.
+ * "nxm_entry"s are not aligned on or padded to any multibyte boundary.  The
+ * first 4 bytes of an nxm_entry are its "header", followed by the entry's
+ * "body".
+ *
+ * An nxm_entry's header is interpreted as a 32-bit word in network byte order:
+ *
+ * |<-------------------- nxm_type ------------------>|
+ * |                                                  |
+ * |31                              16 15            9| 8 7                0
+ * +----------------------------------+---------------+--+------------------+
+ * |            nxm_vendor            |   nxm_field   |hm|    nxm_length    |
+ * +----------------------------------+---------------+--+------------------+
+ *
+ * The most-significant 23 bits of the header are collectively "nxm_type".
+ * Bits 16...31 are "nxm_vendor", one of OFPXMC12_* values.  In case of
+ * NXM, it's either OFPXMC12_NXM_0 or OFPXMC12_NXM_1.
+ * Bits 9...15 are "nxm_field", which is a vendor-specific value.  nxm_type
+ * normally designates a protocol header, such as the Ethernet type, but it
+ * can also refer to packet metadata, such as the switch port on which a packet
+ * arrived.
+ *
+ * Bit 8 is "nxm_hasmask" (labeled "hm" above for space reasons).  The meaning
+ * of this bit is explained later.
+ *
+ * The least-significant 8 bits are "nxm_length", a positive integer.  The
+ * length of the nxm_entry, including the header, is exactly 4 + nxm_length
+ * bytes.
+ *
+ * For a given nxm_vendor, nxm_field, and nxm_hasmask value, nxm_length is a
+ * constant.  It is included only to allow software to minimally parse
+ * "nxm_entry"s of unknown types.  (Similarly, for a given nxm_vendor,
+ * nxm_field, and nxm_length, nxm_hasmask is a constant.)
+ *
+ *
+ * Semantics
+ * =========
+ *
+ * A zero-length nx_match (one with no "nxm_entry"s) matches every packet.
+ *
+ * An nxm_entry places a constraint on the packets matched by the nx_match:
+ *
+ *   - If nxm_hasmask is 0, the nxm_entry's body contains a value for the
+ *     field, called "nxm_value".  The nx_match matches only packets in which
+ *     the field equals nxm_value.
+ *
+ *   - If nxm_hasmask is 1, then the nxm_entry's body contains a value for the
+ *     field (nxm_value), followed by a bitmask of the same length as the
+ *     value, called "nxm_mask".  For each 1-bit in position J in nxm_mask, the
+ *     nx_match matches only packets for which bit J in the given field's value
+ *     matches bit J in nxm_value.  A 0-bit in nxm_mask causes the
+ *     corresponding bit in nxm_value is ignored (it should be 0; Open vSwitch
+ *     may enforce this someday), as is the corresponding bit in the field's
+ *     value.  (The sense of the nxm_mask bits is the opposite of that used by
+ *     the "wildcards" member of struct ofp10_match.)
+ *
+ *     When nxm_hasmask is 1, nxm_length is always even.
+ *
+ *     An all-zero-bits nxm_mask is equivalent to omitting the nxm_entry
+ *     entirely.  An all-one-bits nxm_mask is equivalent to specifying 0 for
+ *     nxm_hasmask.
+ *
+ * When there are multiple "nxm_entry"s, all of the constraints must be met.
+ *
+ *
+ * Mask Restrictions
+ * =================
+ *
+ * Masks may be restricted:
+ *
+ *   - Some nxm_types may not support masked wildcards, that is, nxm_hasmask
+ *     must always be 0 when these fields are specified.  For example, the
+ *     field that identifies the port on which a packet was received may not be
+ *     masked.
+ *
+ *   - Some nxm_types that do support masked wildcards may only support certain
+ *     nxm_mask patterns.  For example, fields that have IPv4 address values
+ *     may be restricted to CIDR masks.
+ *
+ * These restrictions should be noted in specifications for individual fields.
+ * A switch may accept an nxm_hasmask or nxm_mask value that the specification
+ * disallows, if the switch correctly implements support for that nxm_hasmask
+ * or nxm_mask value.  A switch must reject an attempt to set up a flow that
+ * contains a nxm_hasmask or nxm_mask value that it does not support.
+ *
+ *
+ * Prerequisite Restrictions
+ * =========================
+ *
+ * The presence of an nxm_entry with a given nxm_type may be restricted based
+ * on the presence of or values of other "nxm_entry"s.  For example:
+ *
+ *   - An nxm_entry for nxm_type=NXM_OF_IP_TOS is allowed only if it is
+ *     preceded by another entry with nxm_type=NXM_OF_ETH_TYPE, nxm_hasmask=0,
+ *     and nxm_value=0x0800.  That is, matching on the IP source address is
+ *     allowed only if the Ethernet type is explicitly set to IP.
+ *
+ *   - An nxm_entry for nxm_type=NXM_OF_TCP_SRC is allowed only if it is
+ *     preceded by an entry with nxm_type=NXM_OF_ETH_TYPE, nxm_hasmask=0, and
+ *     nxm_value either 0x0800 or 0x86dd, and another with
+ *     nxm_type=NXM_OF_IP_PROTO, nxm_hasmask=0, nxm_value=6, in that order.
+ *     That is, matching on the TCP source port is allowed only if the Ethernet
+ *     type is IP or IPv6 and the IP protocol is TCP.
+ *
+ * These restrictions should be noted in specifications for individual fields.
+ * A switch may implement relaxed versions of these restrictions.  A switch
+ * must reject an attempt to set up a flow that violates its restrictions.
+ *
+ *
+ * Ordering Restrictions
+ * =====================
+ *
+ * An nxm_entry that has prerequisite restrictions must appear after the
+ * "nxm_entry"s for its prerequisites.  Ordering of "nxm_entry"s within an
+ * nx_match is not otherwise constrained.
+ *
+ * Any given nxm_type may appear in an nx_match at most once.
+ *
+ *
+ * nxm_entry Examples
+ * ==================
+ *
+ * These examples show the format of a single nxm_entry with particular
+ * nxm_hasmask and nxm_length values.  The diagrams are labeled with field
+ * numbers and byte indexes.
+ *
+ *
+ * 8-bit nxm_value, nxm_hasmask=1, nxm_length=2:
+ *
+ *  0          3  4   5
+ * +------------+---+---+
+ * |   header   | v | m |
+ * +------------+---+---+
+ *
+ *
+ * 16-bit nxm_value, nxm_hasmask=0, nxm_length=2:
+ *
+ *  0          3 4    5
+ * +------------+------+
+ * |   header   | value|
+ * +------------+------+
+ *
+ *
+ * 32-bit nxm_value, nxm_hasmask=0, nxm_length=4:
+ *
+ *  0          3 4           7
+ * +------------+-------------+
+ * |   header   |  nxm_value  |
+ * +------------+-------------+
+ *
+ *
+ * 48-bit nxm_value, nxm_hasmask=0, nxm_length=6:
+ *
+ *  0          3 4                9
+ * +------------+------------------+
+ * |   header   |     nxm_value    |
+ * +------------+------------------+
+ *
+ *
+ * 48-bit nxm_value, nxm_hasmask=1, nxm_length=12:
+ *
+ *  0          3 4                9 10              15
+ * +------------+------------------+------------------+
+ * |   header   |     nxm_value    |      nxm_mask    |
+ * +------------+------------------+------------------+
+ *
+ *
+ * Error Reporting
+ * ===============
+ *
+ * A switch should report an error in an nx_match using error type
+ * OFPET_BAD_REQUEST and one of the NXBRC_NXM_* codes.  Ideally the switch
+ * should report a specific error code, if one is assigned for the particular
+ * problem, but NXBRC_NXM_INVALID is also available to report a generic
+ * nx_match error.
+ */
+
+/* Number of registers allocated NXM field IDs. */
+#define NXM_NX_MAX_REGS 16
+
+/* Bits in the value of NXM_NX_IP_FRAG. */
+#define NX_IP_FRAG_ANY   (1 << 0) /* Is this a fragment? */
+#define NX_IP_FRAG_LATER (1 << 1) /* Is this a fragment with nonzero offset? */
+
+/* Bits in the value of NXM_NX_TUN_FLAGS. */
+#define NX_TUN_FLAG_OAM  (1 << 0) /* Is this an OAM packet? */
+
+/* ## --------------------- ## */
+/* ## Requests and replies. ## */
+/* ## --------------------- ## */
+
+enum nx_flow_format {
+    NXFF_OPENFLOW10 = 0,         /* Standard OpenFlow 1.0 compatible. */
+    NXFF_NXM = 2                 /* Nicira extended match. */
+};
+
+/* NXT_SET_FLOW_FORMAT request. */
+struct nx_set_flow_format {
+    ovs_be32 format;            /* One of NXFF_*. */
+};
+OFP_ASSERT(sizeof(struct nx_set_flow_format) == 4);
+
+/* NXT_FLOW_MOD (analogous to OFPT_FLOW_MOD).
+ *
+ * It is possible to limit flow deletions and modifications to certain
+ * cookies by using the NXM_NX_COOKIE(_W) matches.  The "cookie" field
+ * is used only to add or modify flow cookies.
+ */
+struct nx_flow_mod {
+    ovs_be64 cookie;              /* Opaque controller-issued identifier. */
+    ovs_be16 command;             /* OFPFC_* + possibly a table ID (see comment
+                                   * on struct nx_flow_mod_table_id). */
+    ovs_be16 idle_timeout;        /* Idle time before discarding (seconds). */
+    ovs_be16 hard_timeout;        /* Max time before discarding (seconds). */
+    ovs_be16 priority;            /* Priority level of flow entry. */
+    ovs_be32 buffer_id;           /* Buffered packet to apply to (or -1).
+                                     Not meaningful for OFPFC_DELETE*. */
+    ovs_be16 out_port;            /* For OFPFC_DELETE* commands, require
+                                     matching entries to include this as an
+                                     output port.  A value of OFPP_NONE
+                                     indicates no restriction. */
+    ovs_be16 flags;               /* One of OFPFF_*. */
+    ovs_be16 match_len;           /* Size of nx_match. */
+    uint8_t pad[6];               /* Align to 64-bits. */
+    /* Followed by:
+     *   - Exactly match_len (possibly 0) bytes containing the nx_match, then
+     *   - Exactly (match_len + 7)/8*8 - match_len (between 0 and 7) bytes of
+     *     all-zero bytes, then
+     *   - Actions to fill out the remainder of the message length (always a
+     *     multiple of 8).
+     */
+};
+OFP_ASSERT(sizeof(struct nx_flow_mod) == 32);
+
+/* NXT_FLOW_REMOVED (analogous to OFPT_FLOW_REMOVED).
+ *
+ * 'table_id' is present only in Open vSwitch 1.11 and later.  In earlier
+ * versions of Open vSwitch, this is a padding byte that is always zeroed.
+ * Therefore, a 'table_id' value of 0 indicates that the table ID is not known,
+ * and other values may be interpreted as one more than the flow's former table
+ * ID. */
+struct nx_flow_removed {
+    ovs_be64 cookie;          /* Opaque controller-issued identifier. */
+    ovs_be16 priority;        /* Priority level of flow entry. */
+    uint8_t reason;           /* One of OFPRR_*. */
+    uint8_t table_id;         /* Flow's former table ID, plus one. */
+    ovs_be32 duration_sec;    /* Time flow was alive in seconds. */
+    ovs_be32 duration_nsec;   /* Time flow was alive in nanoseconds beyond
+                                 duration_sec. */
+    ovs_be16 idle_timeout;    /* Idle timeout from original flow mod. */
+    ovs_be16 match_len;       /* Size of nx_match. */
+    ovs_be64 packet_count;
+    ovs_be64 byte_count;
+    /* Followed by:
+     *   - Exactly match_len (possibly 0) bytes containing the nx_match, then
+     *   - Exactly (match_len + 7)/8*8 - match_len (between 0 and 7) bytes of
+     *     all-zero bytes. */
+};
+OFP_ASSERT(sizeof(struct nx_flow_removed) == 40);
+
+/* Nicira vendor stats request of type NXST_FLOW (analogous to OFPST_FLOW
+ * request).
+ *
+ * It is possible to limit matches to certain cookies by using the
+ * NXM_NX_COOKIE and NXM_NX_COOKIE_W matches.
+ */
+struct nx_flow_stats_request {
+    ovs_be16 out_port;        /* Require matching entries to include this
+                                 as an output port.  A value of OFPP_NONE
+                                 indicates no restriction. */
+    ovs_be16 match_len;       /* Length of nx_match. */
+    uint8_t table_id;         /* ID of table to read (from ofp_table_stats)
+                                 or 0xff for all tables. */
+    uint8_t pad[3];           /* Align to 64 bits. */
+    /* Followed by:
+     *   - Exactly match_len (possibly 0) bytes containing the nx_match, then
+     *   - Exactly (match_len + 7)/8*8 - match_len (between 0 and 7) bytes of
+     *     all-zero bytes, which must also exactly fill out the length of the
+     *     message.
+     */
+};
+OFP_ASSERT(sizeof(struct nx_flow_stats_request) == 8);
+
+/* Body for Nicira vendor stats reply of type NXST_FLOW (analogous to
+ * OFPST_FLOW reply).
+ *
+ * The values of 'idle_age' and 'hard_age' are only meaningful when talking to
+ * a switch that implements the NXT_FLOW_AGE extension.  Zero means that the
+ * true value is unknown, perhaps because hardware does not track the value.
+ * (Zero is also the value that one should ordinarily expect to see talking to
+ * a switch that does not implement NXT_FLOW_AGE, since those switches zero the
+ * padding bytes that these fields replaced.)  A nonzero value X represents X-1
+ * seconds.  A value of 65535 represents 65534 or more seconds.
+ *
+ * 'idle_age' is the number of seconds that the flow has been idle, that is,
+ * the number of seconds since a packet passed through the flow.  'hard_age' is
+ * the number of seconds since the flow was last modified (e.g. OFPFC_MODIFY or
+ * OFPFC_MODIFY_STRICT).  (The 'duration_*' fields are the elapsed time since
+ * the flow was added, regardless of subsequent modifications.)
+ *
+ * For a flow with an idle or hard timeout, 'idle_age' or 'hard_age',
+ * respectively, will ordinarily be smaller than the timeout, but flow
+ * expiration times are only approximate and so one must be prepared to
+ * tolerate expirations that occur somewhat early or late.
+ */
+struct nx_flow_stats {
+    ovs_be16 length;          /* Length of this entry. */
+    uint8_t table_id;         /* ID of table flow came from. */
+    uint8_t pad;
+    ovs_be32 duration_sec;    /* Time flow has been alive in seconds. */
+    ovs_be32 duration_nsec;   /* Time flow has been alive in nanoseconds
+                                 beyond duration_sec. */
+    ovs_be16 priority;        /* Priority of the entry. */
+    ovs_be16 idle_timeout;    /* Number of seconds idle before expiration. */
+    ovs_be16 hard_timeout;    /* Number of seconds before expiration. */
+    ovs_be16 match_len;       /* Length of nx_match. */
+    ovs_be16 idle_age;        /* Seconds since last packet, plus one. */
+    ovs_be16 hard_age;        /* Seconds since last modification, plus one. */
+    ovs_be64 cookie;          /* Opaque controller-issued identifier. */
+    ovs_be64 packet_count;    /* Number of packets, UINT64_MAX if unknown. */
+    ovs_be64 byte_count;      /* Number of bytes, UINT64_MAX if unknown. */
+    /* Followed by:
+     *   - Exactly match_len (possibly 0) bytes containing the nx_match, then
+     *   - Exactly (match_len + 7)/8*8 - match_len (between 0 and 7) bytes of
+     *     all-zero bytes, then
+     *   - Actions to fill out the remainder 'length' bytes (always a multiple
+     *     of 8).
+     */
+};
+OFP_ASSERT(sizeof(struct nx_flow_stats) == 48);
+
+/* Nicira vendor stats request of type NXST_AGGREGATE (analogous to
+ * OFPST_AGGREGATE request).
+ *
+ * The reply format is identical to the reply format for OFPST_AGGREGATE,
+ * except for the header. */
+struct nx_aggregate_stats_request {
+    ovs_be16 out_port;        /* Require matching entries to include this
+                                 as an output port.  A value of OFPP_NONE
+                                 indicates no restriction. */
+    ovs_be16 match_len;       /* Length of nx_match. */
+    uint8_t table_id;         /* ID of table to read (from ofp_table_stats)
+                                 or 0xff for all tables. */
+    uint8_t pad[3];           /* Align to 64 bits. */
+    /* Followed by:
+     *   - Exactly match_len (possibly 0) bytes containing the nx_match, then
+     *   - Exactly (match_len + 7)/8*8 - match_len (between 0 and 7) bytes of
+     *     all-zero bytes, which must also exactly fill out the length of the
+     *     message.
+     */
+};
+OFP_ASSERT(sizeof(struct nx_aggregate_stats_request) == 8);
+
+struct nx_ipfix_stats_reply {
+    ovs_be64 total_flows;
+    ovs_be64 current_flows;
+    ovs_be64 pkts;
+    ovs_be64 ipv4_pkts;
+    ovs_be64 ipv6_pkts;
+    ovs_be64 error_pkts;
+    ovs_be64 ipv4_error_pkts;
+    ovs_be64 ipv6_error_pkts;
+    ovs_be64 tx_pkts;
+    ovs_be64 tx_errors;
+    ovs_be32 collector_set_id; /* Range 0 to 4,294,967,295. */
+    uint8_t pad[4];            /* Pad to a multiple of 8 bytes. */
+};
+OFP_ASSERT(sizeof(struct nx_ipfix_stats_reply) == 88);
+
+
+/* NXT_SET_CONTROLLER_ID.
+ *
+ * Each OpenFlow controller connection has a 16-bit identifier that is
+ * initially 0.  This message changes the connection's ID to 'id'.
+ *
+ * Controller connection IDs need not be unique.
+ *
+ * The NXAST_CONTROLLER action is the only current user of controller
+ * connection IDs. */
+struct nx_controller_id {
+    uint8_t zero[6];            /* Must be zero. */
+    ovs_be16 controller_id;     /* New controller connection ID. */
+};
+OFP_ASSERT(sizeof(struct nx_controller_id) == 8);
+
+/* Flow Table Monitoring
+ * =====================
+ *
+ * NXST_FLOW_MONITOR allows a controller to keep track of changes to OpenFlow
+ * flow table(s) or subsets of them, with the following workflow:
+ *
+ * 1. The controller sends an NXST_FLOW_MONITOR request to begin monitoring
+ *    flows.  The 'id' in the request must be unique among all monitors that
+ *    the controller has started and not yet canceled on this OpenFlow
+ *    connection.
+ *
+ * 2. The switch responds with an NXST_FLOW_MONITOR reply.  If the request's
+ *    'flags' included NXFMF_INITIAL, the reply includes all the flows that
+ *    matched the request at the time of the request (with event NXFME_ADDED).
+ *    If 'flags' did not include NXFMF_INITIAL, the reply is empty.
+ *
+ *    The reply uses the xid of the request (as do all replies to OpenFlow
+ *    requests).
+ *
+ * 3. Whenever a change to a flow table entry matches some outstanding monitor
+ *    request's criteria and flags, the switch sends a notification to the
+ *    controller as an additional NXST_FLOW_MONITOR reply with xid 0.
+ *
+ *    When multiple outstanding monitors match a single change, only a single
+ *    notification is sent.  This merged notification includes the information
+ *    requested in any of the individual monitors.  That is, if any of the
+ *    matching monitors requests actions (NXFMF_ACTIONS), the notification
+ *    includes actions, and if any of the monitors request full changes for the
+ *    controller's own changes (NXFMF_OWN), the controller's own changes will
+ *    be included in full.
+ *
+ * 4. The controller may cancel a monitor with NXT_FLOW_MONITOR_CANCEL.  No
+ *    further notifications will be sent on the basis of the canceled monitor
+ *    afterward.
+ *
+ *
+ * Buffer Management
+ * =================
+ *
+ * OpenFlow messages for flow monitor notifications can overflow the buffer
+ * space available to the switch, either temporarily (e.g. due to network
+ * conditions slowing OpenFlow traffic) or more permanently (e.g. the sustained
+ * rate of flow table change exceeds the network bandwidth between switch and
+ * controller).
+ *
+ * When Open vSwitch's notification buffer space reaches a limiting threshold,
+ * OVS reacts as follows:
+ *
+ * 1. OVS sends an NXT_FLOW_MONITOR_PAUSED message to the controller, following
+ *    all the already queued notifications.  After it receives this message,
+ *    the controller knows that its view of the flow table, as represented by
+ *    flow monitor notifications, is incomplete.
+ *
+ * 2. As long as the notification buffer is not empty:
+ *
+ *        - NXMFE_ADD and NXFME_MODIFIED notifications will not be sent.
+ *
+ *        - NXFME_DELETED notifications will still be sent, but only for flows
+ *          that existed before OVS sent NXT_FLOW_MONITOR_PAUSED.
+ *
+ *        - NXFME_ABBREV notifications will not be sent.  They are treated as
+ *          the expanded version (and therefore only the NXFME_DELETED
+ *          components, if any, are sent).
+ *
+ * 3. When the notification buffer empties, OVS sends NXFME_ADD notifications
+ *    for flows added since the buffer reached its limit and NXFME_MODIFIED
+ *    notifications for flows that existed before the limit was reached and
+ *    changed after the limit was reached.
+ *
+ * 4. OVS sends an NXT_FLOW_MONITOR_RESUMED message to the controller.  After
+ *    it receives this message, the controller knows that its view of the flow
+ *    table, as represented by flow monitor notifications, is again complete.
+ *
+ * This allows the maximum buffer space requirement for notifications to be
+ * bounded by the limit plus the maximum number of supported flows.
+ *
+ *
+ * "Flow Removed" messages
+ * =======================
+ *
+ * The flow monitor mechanism is independent of OFPT_FLOW_REMOVED and
+ * NXT_FLOW_REMOVED.  Flow monitor updates for deletion are sent if
+ * NXFMF_DELETE is set on a monitor, regardless of whether the
+ * OFPFF_SEND_FLOW_REM flag was set when the flow was added. */
+
+/* NXST_FLOW_MONITOR request.
+ *
+ * The NXST_FLOW_MONITOR request's body consists of an array of zero or more
+ * instances of this structure.  The request arranges to monitor the flows
+ * that match the specified criteria, which are interpreted in the same way as
+ * for NXST_FLOW.
+ *
+ * 'id' identifies a particular monitor for the purpose of allowing it to be
+ * canceled later with NXT_FLOW_MONITOR_CANCEL.  'id' must be unique among
+ * existing monitors that have not already been canceled.
+ *
+ * The reply includes the initial flow matches for monitors that have the
+ * NXFMF_INITIAL flag set.  No single flow will be included in the reply more
+ * than once, even if more than one requested monitor matches that flow.  The
+ * reply will be empty if none of the monitors has NXFMF_INITIAL set or if none
+ * of the monitors initially matches any flows.
+ *
+ * For NXFMF_ADD, an event will be reported if 'out_port' matches against the
+ * actions of the flow being added or, for a flow that is replacing an existing
+ * flow, if 'out_port' matches against the actions of the flow being replaced.
+ * For NXFMF_DELETE, 'out_port' matches against the actions of a flow being
+ * deleted.  For NXFMF_MODIFY, an event will be reported if 'out_port' matches
+ * either the old or the new actions. */
+struct nx_flow_monitor_request {
+    ovs_be32 id;                /* Controller-assigned ID for this monitor. */
+    ovs_be16 flags;             /* NXFMF_*. */
+    ovs_be16 out_port;          /* Required output port, if not OFPP_NONE. */
+    ovs_be16 match_len;         /* Length of nx_match. */
+    uint8_t table_id;           /* One table's ID or 0xff for all tables. */
+    uint8_t zeros[5];           /* Align to 64 bits (must be zero). */
+    /* Followed by:
+     *   - Exactly match_len (possibly 0) bytes containing the nx_match, then
+     *   - Exactly (match_len + 7)/8*8 - match_len (between 0 and 7) bytes of
+     *     all-zero bytes. */
+};
+OFP_ASSERT(sizeof(struct nx_flow_monitor_request) == 16);
+
+/* 'flags' bits in struct nx_flow_monitor_request. */
+enum nx_flow_monitor_flags {
+    /* When to send updates. */
+    NXFMF_INITIAL = 1 << 0,     /* Initially matching flows. */
+    NXFMF_ADD = 1 << 1,         /* New matching flows as they are added. */
+    NXFMF_DELETE = 1 << 2,      /* Old matching flows as they are removed. */
+    NXFMF_MODIFY = 1 << 3,      /* Matching flows as they are changed. */
+
+    /* What to include in updates. */
+    NXFMF_ACTIONS = 1 << 4,     /* If set, actions are included. */
+    NXFMF_OWN = 1 << 5,         /* If set, include own changes in full. */
+};
+
+/* NXST_FLOW_MONITOR reply header.
+ *
+ * The body of an NXST_FLOW_MONITOR reply is an array of variable-length
+ * structures, each of which begins with this header.  The 'length' member may
+ * be used to traverse the array, and the 'event' member may be used to
+ * determine the particular structure.
+ *
+ * Every instance is a multiple of 8 bytes long. */
+struct nx_flow_update_header {
+    ovs_be16 length;            /* Length of this entry. */
+    ovs_be16 event;             /* One of NXFME_*. */
+    /* ...other data depending on 'event'... */
+};
+OFP_ASSERT(sizeof(struct nx_flow_update_header) == 4);
+
+/* 'event' values in struct nx_flow_update_header. */
+enum nx_flow_update_event {
+    /* struct nx_flow_update_full. */
+    NXFME_ADDED = 0,            /* Flow was added. */
+    NXFME_DELETED = 1,          /* Flow was deleted. */
+    NXFME_MODIFIED = 2,         /* Flow (generally its actions) was changed. */
+
+    /* struct nx_flow_update_abbrev. */
+    NXFME_ABBREV = 3,           /* Abbreviated reply. */
+};
+
+/* NXST_FLOW_MONITOR reply for NXFME_ADDED, NXFME_DELETED, and
+ * NXFME_MODIFIED. */
+struct nx_flow_update_full {
+    ovs_be16 length;            /* Length is 24. */
+    ovs_be16 event;             /* One of NXFME_*. */
+    ovs_be16 reason;            /* OFPRR_* for NXFME_DELETED, else zero. */
+    ovs_be16 priority;          /* Priority of the entry. */
+    ovs_be16 idle_timeout;      /* Number of seconds idle before expiration. */
+    ovs_be16 hard_timeout;      /* Number of seconds before expiration. */
+    ovs_be16 match_len;         /* Length of nx_match. */
+    uint8_t table_id;           /* ID of flow's table. */
+    uint8_t pad;                /* Reserved, currently zeroed. */
+    ovs_be64 cookie;            /* Opaque controller-issued identifier. */
+    /* Followed by:
+     *   - Exactly match_len (possibly 0) bytes containing the nx_match, then
+     *   - Exactly (match_len + 7)/8*8 - match_len (between 0 and 7) bytes of
+     *     all-zero bytes, then
+     *   - Actions to fill out the remainder 'length' bytes (always a multiple
+     *     of 8).  If NXFMF_ACTIONS was not specified, or 'event' is
+     *     NXFME_DELETED, no actions are included.
+     */
+};
+OFP_ASSERT(sizeof(struct nx_flow_update_full) == 24);
+
+/* NXST_FLOW_MONITOR reply for NXFME_ABBREV.
+ *
+ * When the controller does not specify NXFMF_OWN in a monitor request, any
+ * flow tables changes due to the controller's own requests (on the same
+ * OpenFlow channel) will be abbreviated, when possible, to this form, which
+ * simply specifies the 'xid' of the OpenFlow request (e.g. an OFPT_FLOW_MOD or
+ * NXT_FLOW_MOD) that caused the change.
+ *
+ * Some changes cannot be abbreviated and will be sent in full:
+ *
+ *   - Changes that only partially succeed.  This can happen if, for example,
+ *     a flow_mod with type OFPFC_MODIFY affects multiple flows, but only some
+ *     of those modifications succeed (e.g. due to hardware limitations).
+ *
+ *     This cannot occur with the Open vSwitch software datapath.  This also
+ *     cannot occur in Open vSwitch 2.4 and later, because these versions only
+ *     execute any flow modifications if all of them will succeed.
+ *
+ *   - Changes that race with conflicting changes made by other controllers or
+ *     other flow_mods (not separated by barriers) by the same controller.
+ *
+ *     This cannot occur with the current Open vSwitch implementation
+ *     (regardless of datapath) because Open vSwitch internally serializes
+ *     potentially conflicting changes.
+ *
+ *   - Changes that occur when flow notification is paused (see "Buffer
+ *     Management" above).
+ *
+ * A flow_mod that does not change the flow table will not trigger any
+ * notification, even an abbreviated one.  For example, a "modify" or "delete"
+ * flow_mod that does not match any flows will not trigger a notification.
+ * Whether an "add" or "modify" that specifies all the same parameters that a
+ * flow already has triggers a notification is unspecified and subject to
+ * change in future versions of Open vSwitch.
+ *
+ * OVS will always send the notifications for a given flow table change before
+ * the reply to a OFPT_BARRIER_REQUEST request that follows the flow table
+ * change.  Thus, if the controller does not receive an abbreviated (or
+ * unabbreviated) notification for a flow_mod before the next
+ * OFPT_BARRIER_REPLY, it will never receive one. */
+struct nx_flow_update_abbrev {
+    ovs_be16 length;            /* Length is 8. */
+    ovs_be16 event;             /* NXFME_ABBREV. */
+    ovs_be32 xid;               /* Controller-specified xid from flow_mod. */
+};
+OFP_ASSERT(sizeof(struct nx_flow_update_abbrev) == 8);
+
+/* NXT_FLOW_MONITOR_CANCEL.
+ *
+ * Used by a controller to cancel an outstanding monitor. */
+struct nx_flow_monitor_cancel {
+    ovs_be32 id;                /* 'id' from nx_flow_monitor_request. */
+};
+OFP_ASSERT(sizeof(struct nx_flow_monitor_cancel) == 4);
+
+/* Variable-length option TLV table maintenance commands.
+ *
+ * The option in Type-Length-Value format is widely used in tunnel options,
+ * e.g., the base Geneve header is followed by zero or more options in TLV
+ * format. Each option consists of a four byte option header and a variable
+ * amount of option data interpreted according to the type. The generic TLV
+ * format in tunnel options is as following:
+ *
+ * 0                   1                   2                   3
+ * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |          Option Class         |      Type     |R|R|R| Length  |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * |                      Variable Option Data                     |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ * In order to work with this variable-length options in TLV format in
+ * tunnel options, we need to maintain a mapping table between an option
+ * TLV (defined by <class, type, length>) and an NXM field that can be
+ * operated on for the purposes of matches, actions, etc. This mapping
+ * must be explicitly specified by the user.
+ *
+ * There are two primary groups of OpenFlow messages that are introduced
+ * as Nicira extensions: modification commands (add, delete, clear mappings)
+ * and table status request/reply to dump the current table along with switch
+ * information.
+ *
+ * Note that mappings should not be changed while they are in active use by
+ * a flow. The result of doing so is undefined. */
+
+/* TLV table commands */
+enum nx_tlv_table_mod_command {
+    NXTTMC_ADD,          /* New mappings (fails if an option is already
+                            mapped). */
+    NXTTMC_DELETE,       /* Delete mappings, identified by index
+                          * (unmapped options are ignored). */
+    NXTTMC_CLEAR,        /* Clear all mappings. Additional information
+                            in this command is ignored. */
+};
+
+/* Map between an option TLV and an NXM field. */
+struct nx_tlv_map {
+    ovs_be16 option_class; /* TLV class. */
+    uint8_t  option_type;  /* TLV type. */
+    uint8_t  option_len;   /* TLV length (multiple of 4). */
+    ovs_be16 index;        /* NXM_NX_TUN_METADATA<n> index */
+    uint8_t  pad[2];
+};
+OFP_ASSERT(sizeof(struct nx_tlv_map) == 8);
+
+/* NXT_TLV_TABLE_MOD.
+ *
+ * Use to configure a mapping between option TLVs (class, type, length)
+ * and NXM fields (NXM_NX_TUN_METADATA<n> where 'index' is <n>).
+ *
+ * This command is atomic: all operations on different options will
+ * either succeed or fail. */
+struct nx_tlv_table_mod {
+    ovs_be16 command;           /* One of NTTTMC_* */
+    uint8_t pad[6];
+    /* struct nx_tlv_map[0]; Array of maps between indicies and option
+                                TLVs. The number of elements is inferred
+                                from the length field in the header. */
+};
+OFP_ASSERT(sizeof(struct nx_tlv_table_mod) == 8);
+
+/* NXT_TLV_TABLE_REPLY.
+ *
+ * Issued in reponse to an NXT_TLV_TABLE_REQUEST to give information
+ * about the current status of the TLV table in the switch. Provides
+ * both static information about the switch's capabilities as well as
+ * the configured TLV table. */
+struct nx_tlv_table_reply {
+    ovs_be32 max_option_space; /* Maximum total of option sizes supported. */
+    ovs_be16 max_fields;       /* Maximum number of match fields supported. */
+    uint8_t reserved[10];
+    /* struct nx_tlv_map[0]; Array of maps between indicies and option
+                                TLVs. The number of elements is inferred
+                                from the length field in the header. */
+};
+OFP_ASSERT(sizeof(struct nx_tlv_table_reply) == 16);
+
+/* NXT_CT_FLUSH_ZONE.
+ *
+ * Flushes the connection tracking table. */
+struct nx_zone_id {
+    uint8_t zero[6];            /* Must be zero. */
+    ovs_be16 zone_id;           /* Connection tracking zone. */
+};
+OFP_ASSERT(sizeof(struct nx_zone_id) == 8);
+
+#endif /* openflow/nicira-ext.h */
diff --git a/openflow/include/openflow/openflow-1.0.h b/openflow/include/openflow/openflow-1.0.h
new file mode 100644
index 0000000..68c7952
--- /dev/null
+++ b/openflow/include/openflow/openflow-1.0.h
@@ -0,0 +1,438 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* OpenFlow: protocol between controller and datapath. */
+
+#ifndef OPENFLOW_OPENFLOW10_H
+#define OPENFLOW_OPENFLOW10_H 1
+
+#include <openflow/openflow-common.h>
+
+/* Port number(s)   meaning
+ * ---------------  --------------------------------------
+ * 0x0000           not assigned a meaning by OpenFlow 1.0
+ * 0x0001...0xfeff  "physical" ports
+ * 0xff00...0xfff6  "reserved" but not assigned a meaning by OpenFlow 1.x
+ * 0xfff7...0xffff  "reserved" OFPP_* ports with assigned meanings
+ */
+
+/* Ranges. */
+#define OFPP_MAX        OFP_PORT_C(0xff00) /* Max # of switch ports. */
+#define OFPP_FIRST_RESV OFP_PORT_C(0xfff7) /* First assigned reserved port. */
+#define OFPP_LAST_RESV  OFP_PORT_C(0xffff) /* Last assigned reserved port. */
+
+/* Reserved output "ports". */
+#define OFPP_UNSET      OFP_PORT_C(0xfff7) /* For OXM_OF_ACTSET_OUTPUT only. */
+#define OFPP_IN_PORT    OFP_PORT_C(0xfff8) /* Where the packet came in. */
+#define OFPP_TABLE      OFP_PORT_C(0xfff9) /* Perform actions in flow table. */
+#define OFPP_NORMAL     OFP_PORT_C(0xfffa) /* Process with normal L2/L3. */
+#define OFPP_FLOOD      OFP_PORT_C(0xfffb) /* All ports except input port and
+                                            * ports disabled by STP. */
+#define OFPP_ALL        OFP_PORT_C(0xfffc) /* All ports except input port. */
+#define OFPP_CONTROLLER OFP_PORT_C(0xfffd) /* Send to controller. */
+#define OFPP_LOCAL      OFP_PORT_C(0xfffe) /* Local openflow "port". */
+#define OFPP_NONE       OFP_PORT_C(0xffff) /* Not associated with any port. */
+
+/* OpenFlow 1.0 specific capabilities supported by the datapath (struct
+ * ofp_switch_features, member capabilities). */
+enum ofp10_capabilities {
+    OFPC10_STP            = 1 << 3,  /* 802.1d spanning tree. */
+    OFPC10_RESERVED       = 1 << 4,  /* Reserved, must not be set. */
+};
+
+/* OpenFlow 1.0 specific flags to indicate behavior of the physical port.
+ * These flags are used in ofp10_phy_port to describe the current
+ * configuration.  They are used in the ofp10_port_mod message to configure the
+ * port's behavior.
+ */
+enum ofp10_port_config {
+    OFPPC10_NO_STP       = 1 << 1, /* Disable 802.1D spanning tree on port. */
+    OFPPC10_NO_RECV_STP  = 1 << 3, /* Drop received 802.1D STP packets. */
+    OFPPC10_NO_FLOOD     = 1 << 4, /* Do not include port when flooding. */
+#define OFPPC10_ALL (OFPPC_PORT_DOWN | OFPPC10_NO_STP | OFPPC_NO_RECV | \
+                     OFPPC10_NO_RECV_STP | OFPPC10_NO_FLOOD | OFPPC_NO_FWD | \
+                     OFPPC_NO_PACKET_IN)
+};
+
+/* OpenFlow 1.0 specific current state of the physical port.  These are not
+ * configurable from the controller.
+ */
+enum ofp10_port_state {
+    /* The OFPPS10_STP_* bits have no effect on switch operation.  The
+     * controller must adjust OFPPC_NO_RECV, OFPPC_NO_FWD, and
+     * OFPPC_NO_PACKET_IN appropriately to fully implement an 802.1D spanning
+     * tree. */
+    OFPPS10_STP_LISTEN  = 0 << 8, /* Not learning or relaying frames. */
+    OFPPS10_STP_LEARN   = 1 << 8, /* Learning but not relaying frames. */
+    OFPPS10_STP_FORWARD = 2 << 8, /* Learning and relaying frames. */
+    OFPPS10_STP_BLOCK   = 3 << 8, /* Not part of spanning tree. */
+    OFPPS10_STP_MASK    = 3 << 8  /* Bit mask for OFPPS10_STP_* values. */
+
+#define OFPPS10_ALL (OFPPS_LINK_DOWN | OFPPS10_STP_MASK)
+};
+
+/* OpenFlow 1.0 specific features of physical ports available in a datapath. */
+enum ofp10_port_features {
+    OFPPF10_COPPER     = 1 << 7,  /* Copper medium. */
+    OFPPF10_FIBER      = 1 << 8,  /* Fiber medium. */
+    OFPPF10_AUTONEG    = 1 << 9,  /* Auto-negotiation. */
+    OFPPF10_PAUSE      = 1 << 10, /* Pause. */
+    OFPPF10_PAUSE_ASYM = 1 << 11  /* Asymmetric pause. */
+};
+
+/* Description of a physical port */
+struct ofp10_phy_port {
+    ovs_be16 port_no;
+    struct eth_addr hw_addr;
+    char name[OFP_MAX_PORT_NAME_LEN]; /* Null-terminated */
+
+    ovs_be32 config;        /* Bitmap of OFPPC_* and OFPPC10_* flags. */
+    ovs_be32 state;         /* Bitmap of OFPPS_* and OFPPS10_* flags. */
+
+    /* Bitmaps of OFPPF_* and OFPPF10_* that describe features.  All bits
+     * zeroed if unsupported or unavailable. */
+    ovs_be32 curr;          /* Current features. */
+    ovs_be32 advertised;    /* Features being advertised by the port. */
+    ovs_be32 supported;     /* Features supported by the port. */
+    ovs_be32 peer;          /* Features advertised by peer. */
+};
+OFP_ASSERT(sizeof(struct ofp10_phy_port) == 48);
+
+/* Modify behavior of the physical port */
+struct ofp10_port_mod {
+    ovs_be16 port_no;
+    struct eth_addr hw_addr; /* The hardware address is not configurable.  This
+                                is used to sanity-check the request, so it must
+                                be the same as returned in an ofp10_phy_port
+                                struct. */
+
+    ovs_be32 config;        /* Bitmap of OFPPC_* flags. */
+    ovs_be32 mask;          /* Bitmap of OFPPC_* flags to be changed. */
+
+    ovs_be32 advertise;     /* Bitmap of "ofp_port_features"s.  Zero all
+                               bits to prevent any action taking place. */
+    uint8_t pad[4];         /* Pad to 64-bits. */
+};
+OFP_ASSERT(sizeof(struct ofp10_port_mod) == 24);
+
+struct ofp10_packet_queue {
+    ovs_be32 queue_id;          /* id for the specific queue. */
+    ovs_be16 len;               /* Length in bytes of this queue desc. */
+    uint8_t pad[2];             /* 64-bit alignment. */
+    /* Followed by any number of queue properties expressed using
+     * ofp_queue_prop_header, to fill out a total of 'len' bytes. */
+};
+OFP_ASSERT(sizeof(struct ofp10_packet_queue) == 8);
+
+/* Queue properties for OF1.0 to OF1.3.
+ *
+ * OF1.4+ use the same numbers but rename them and change the property formats
+ * in incompatible ways, so there's not much benefit to sharing the names. */
+enum ofp10_queue_properties {
+    /* Introduced in OF1.0. */
+    OFPQT10_MIN_RATE = 1,          /* Minimum datarate guaranteed. */
+
+    /* Introduced in OF1.1. */
+    OFPQT11_MAX_RATE = 2,          /* Maximum guaranteed rate. */
+    OFPQT11_EXPERIMENTER = 0xffff, /* Experimenter defined property. */
+};
+
+/* Description for a queue in OpenFlow 1.0 to 1.3.
+ *
+ * OF1.4+ also use a TLV format but an incompatible one. */
+struct ofp10_queue_prop_header {
+    ovs_be16 property; /* One of OFPQT*. */
+    ovs_be16 len;      /* Length of property, including this header. */
+    uint8_t pad[4];    /* 64-bit alignemnt. */
+};
+OFP_ASSERT(sizeof(struct ofp10_queue_prop_header) == 8);
+
+/* Min-Rate and Max-Rate queue property description (OFPQT10_MIN and
+ * OFPQT11_MAX).
+ *
+ * OF1.4+ use similar TLVs but they are incompatible due to different padding.
+ */
+struct ofp10_queue_prop_rate {
+    struct ofp10_queue_prop_header prop_header;
+    ovs_be16 rate;        /* In 1/10 of a percent; >1000 -> disabled. */
+    uint8_t pad[6];       /* 64-bit alignment */
+};
+OFP_ASSERT(sizeof(struct ofp10_queue_prop_rate) == 16);
+
+/* Query for port queue configuration. */
+struct ofp10_queue_get_config_request {
+    ovs_be16 port;          /* Port to be queried. Should refer
+                               to a valid physical port (i.e. < OFPP_MAX) */
+    uint8_t pad[2];
+    /* 32-bit alignment. */
+};
+OFP_ASSERT(sizeof(struct ofp10_queue_get_config_request) == 4);
+
+/* Queue configuration for a given port. */
+struct ofp10_queue_get_config_reply {
+    ovs_be16 port;
+    uint8_t pad[6];
+    /* struct ofp10_packet_queue queues[0]; List of configured queues. */
+};
+OFP_ASSERT(sizeof(struct ofp10_queue_get_config_reply) == 8);
+
+/* Packet received on port (datapath -> controller). */
+struct ofp10_packet_in {
+    ovs_be32 buffer_id;     /* ID assigned by datapath. */
+    ovs_be16 total_len;     /* Full length of frame. */
+    ovs_be16 in_port;       /* Port on which frame was received. */
+    uint8_t reason;         /* Reason packet is being sent (one of OFPR_*) */
+    uint8_t pad;
+    uint8_t data[0];        /* Ethernet frame, halfway through 32-bit word,
+                               so the IP header is 32-bit aligned.  The
+                               amount of data is inferred from the length
+                               field in the header.  Because of padding,
+                               offsetof(struct ofp_packet_in, data) ==
+                               sizeof(struct ofp_packet_in) - 2. */
+};
+OFP_ASSERT(sizeof(struct ofp10_packet_in) == 12);
+
+/* Send packet (controller -> datapath). */
+struct ofp10_packet_out {
+    ovs_be32 buffer_id;           /* ID assigned by datapath or UINT32_MAX. */
+    ovs_be16 in_port;             /* Packet's input port (OFPP_NONE if none). */
+    ovs_be16 actions_len;         /* Size of action array in bytes. */
+    /* Followed by:
+     *   - Exactly 'actions_len' bytes (possibly 0 bytes, and always a multiple
+     *     of 8) containing actions.
+     *   - If 'buffer_id' == UINT32_MAX, packet data to fill out the remainder
+     *     of the message length.
+     */
+};
+OFP_ASSERT(sizeof(struct ofp10_packet_out) == 8);
+
+/* Flow wildcards. */
+enum ofp10_flow_wildcards {
+    OFPFW10_IN_PORT    = 1 << 0,  /* Switch input port. */
+    OFPFW10_DL_VLAN    = 1 << 1,  /* VLAN vid. */
+    OFPFW10_DL_SRC     = 1 << 2,  /* Ethernet source address. */
+    OFPFW10_DL_DST     = 1 << 3,  /* Ethernet destination address. */
+    OFPFW10_DL_TYPE    = 1 << 4,  /* Ethernet frame type. */
+    OFPFW10_NW_PROTO   = 1 << 5,  /* IP protocol. */
+    OFPFW10_TP_SRC     = 1 << 6,  /* TCP/UDP source port. */
+    OFPFW10_TP_DST     = 1 << 7,  /* TCP/UDP destination port. */
+
+    /* IP source address wildcard bit count.  0 is exact match, 1 ignores the
+     * LSB, 2 ignores the 2 least-significant bits, ..., 32 and higher wildcard
+     * the entire field.  This is the *opposite* of the usual convention where
+     * e.g. /24 indicates that 8 bits (not 24 bits) are wildcarded. */
+    OFPFW10_NW_SRC_SHIFT = 8,
+    OFPFW10_NW_SRC_BITS = 6,
+    OFPFW10_NW_SRC_MASK = (((1 << OFPFW10_NW_SRC_BITS) - 1)
+                           << OFPFW10_NW_SRC_SHIFT),
+    OFPFW10_NW_SRC_ALL = 32 << OFPFW10_NW_SRC_SHIFT,
+
+    /* IP destination address wildcard bit count.  Same format as source. */
+    OFPFW10_NW_DST_SHIFT = 14,
+    OFPFW10_NW_DST_BITS = 6,
+    OFPFW10_NW_DST_MASK = (((1 << OFPFW10_NW_DST_BITS) - 1)
+                           << OFPFW10_NW_DST_SHIFT),
+    OFPFW10_NW_DST_ALL = 32 << OFPFW10_NW_DST_SHIFT,
+
+    OFPFW10_DL_VLAN_PCP = 1 << 20, /* VLAN priority. */
+    OFPFW10_NW_TOS = 1 << 21, /* IP ToS (DSCP field, 6 bits). */
+
+    /* Wildcard all fields. */
+    OFPFW10_ALL = ((1 << 22) - 1)
+};
+
+/* The wildcards for ICMP type and code fields use the transport source
+ * and destination port fields, respectively. */
+#define OFPFW10_ICMP_TYPE OFPFW10_TP_SRC
+#define OFPFW10_ICMP_CODE OFPFW10_TP_DST
+
+/* The VLAN id is 12-bits, so we can use the entire 16 bits to indicate
+ * special conditions.  All ones indicates that 802.1Q header is not present.
+ */
+#define OFP10_VLAN_NONE      0xffff
+
+/* Fields to match against flows */
+struct ofp10_match {
+    ovs_be32 wildcards;        /* Wildcard fields. */
+    ovs_be16 in_port;          /* Input switch port. */
+    struct eth_addr dl_src;    /* Ethernet source address. */
+    struct eth_addr dl_dst;    /* Ethernet destination address. */
+    ovs_be16 dl_vlan;          /* Input VLAN. */
+    uint8_t dl_vlan_pcp;       /* Input VLAN priority. */
+    uint8_t pad1[1];           /* Align to 64-bits. */
+    ovs_be16 dl_type;          /* Ethernet frame type. */
+    uint8_t nw_tos;            /* IP ToS (DSCP field, 6 bits). */
+    uint8_t nw_proto;          /* IP protocol or lower 8 bits of
+                                  ARP opcode. */
+    uint8_t pad2[2];           /* Align to 64-bits. */
+    ovs_be32 nw_src;           /* IP source address. */
+    ovs_be32 nw_dst;           /* IP destination address. */
+    ovs_be16 tp_src;           /* TCP/UDP source port. */
+    ovs_be16 tp_dst;           /* TCP/UDP destination port. */
+};
+OFP_ASSERT(sizeof(struct ofp10_match) == 40);
+
+enum ofp10_flow_mod_flags {
+    OFPFF10_EMERG       = 1 << 2 /* Part of "emergency flow cache". */
+};
+
+/* Flow setup and teardown (controller -> datapath). */
+struct ofp10_flow_mod {
+    struct ofp10_match match;    /* Fields to match */
+    ovs_be64 cookie;             /* Opaque controller-issued identifier. */
+
+    /* Flow actions. */
+    ovs_be16 command;             /* One of OFPFC_*. */
+    ovs_be16 idle_timeout;        /* Idle time before discarding (seconds). */
+    ovs_be16 hard_timeout;        /* Max time before discarding (seconds). */
+    ovs_be16 priority;            /* Priority level of flow entry. */
+    ovs_be32 buffer_id;           /* Buffered packet to apply to (or -1).
+                                     Not meaningful for OFPFC_DELETE*. */
+    ovs_be16 out_port;            /* For OFPFC_DELETE* commands, require
+                                     matching entries to include this as an
+                                     output port.  A value of OFPP_NONE
+                                     indicates no restriction. */
+    ovs_be16 flags;               /* One of OFPFF_*. */
+
+    /* Followed by OpenFlow actions whose length is inferred from the length
+     * field in the OpenFlow header. */
+};
+OFP_ASSERT(sizeof(struct ofp10_flow_mod) == 64);
+
+/* Flow removed (datapath -> controller). */
+struct ofp10_flow_removed {
+    struct ofp10_match match; /* Description of fields. */
+    ovs_be64 cookie;          /* Opaque controller-issued identifier. */
+
+    ovs_be16 priority;        /* Priority level of flow entry. */
+    uint8_t reason;           /* One of OFPRR_*. */
+    uint8_t pad[1];           /* Align to 32-bits. */
+
+    ovs_be32 duration_sec;    /* Time flow was alive in seconds. */
+    ovs_be32 duration_nsec;   /* Time flow was alive in nanoseconds beyond
+                                 duration_sec. */
+    ovs_be16 idle_timeout;    /* Idle timeout from original flow mod. */
+    uint8_t pad2[2];          /* Align to 64-bits. */
+    ovs_be64 packet_count;
+    ovs_be64 byte_count;
+};
+OFP_ASSERT(sizeof(struct ofp10_flow_removed) == 80);
+
+/* Stats request of type OFPST_AGGREGATE or OFPST_FLOW. */
+struct ofp10_flow_stats_request {
+    struct ofp10_match match; /* Fields to match. */
+    uint8_t table_id;         /* ID of table to read (from ofp_table_stats)
+                                 or 0xff for all tables. */
+    uint8_t pad;              /* Align to 32 bits. */
+    ovs_be16 out_port;        /* Require matching entries to include this
+                                 as an output port.  A value of OFPP_NONE
+                                 indicates no restriction. */
+};
+OFP_ASSERT(sizeof(struct ofp10_flow_stats_request) == 44);
+
+/* Body of reply to OFPST_FLOW request. */
+struct ofp10_flow_stats {
+    ovs_be16 length;          /* Length of this entry. */
+    uint8_t table_id;         /* ID of table flow came from. */
+    uint8_t pad;
+    struct ofp10_match match; /* Description of fields. */
+    ovs_be32 duration_sec;    /* Time flow has been alive in seconds. */
+    ovs_be32 duration_nsec;   /* Time flow has been alive in nanoseconds
+                                 beyond duration_sec. */
+    ovs_be16 priority;        /* Priority of the entry. Only meaningful
+                                 when this is not an exact-match entry. */
+    ovs_be16 idle_timeout;    /* Number of seconds idle before expiration. */
+    ovs_be16 hard_timeout;    /* Number of seconds before expiration. */
+    uint8_t pad2[6];          /* Align to 64 bits. */
+    ovs_32aligned_be64 cookie;       /* Opaque controller-issued identifier. */
+    ovs_32aligned_be64 packet_count; /* Number of packets in flow. */
+    ovs_32aligned_be64 byte_count;   /* Number of bytes in flow. */
+    /* Followed by OpenFlow actions whose length is inferred from 'length'. */
+};
+OFP_ASSERT(sizeof(struct ofp10_flow_stats) == 88);
+
+/* Body of reply to OFPST_TABLE request. */
+struct ofp10_table_stats {
+    uint8_t table_id;        /* Identifier of table.  Lower numbered tables
+                                are consulted first. */
+    uint8_t pad[3];          /* Align to 32-bits. */
+    char name[OFP_MAX_TABLE_NAME_LEN];
+    ovs_be32 wildcards;      /* Bitmap of OFPFW10_* wildcards that are
+                                supported by the table. */
+    ovs_be32 max_entries;    /* Max number of entries supported. */
+    ovs_be32 active_count;   /* Number of active entries. */
+    ovs_32aligned_be64 lookup_count;  /* # of packets looked up in table. */
+    ovs_32aligned_be64 matched_count; /* Number of packets that hit table. */
+};
+OFP_ASSERT(sizeof(struct ofp10_table_stats) == 64);
+
+/* Stats request of type OFPST_PORT. */
+struct ofp10_port_stats_request {
+    ovs_be16 port_no;        /* OFPST_PORT message may request statistics
+                                for a single port (specified with port_no)
+                                or for all ports (port_no == OFPP_NONE). */
+    uint8_t pad[6];
+};
+OFP_ASSERT(sizeof(struct ofp10_port_stats_request) == 8);
+
+/* Body of reply to OFPST_PORT request. If a counter is unsupported, set
+ * the field to all ones. */
+struct ofp10_port_stats {
+    ovs_be16 port_no;
+    uint8_t pad[6];          /* Align to 64-bits. */
+    ovs_32aligned_be64 rx_packets;     /* Number of received packets. */
+    ovs_32aligned_be64 tx_packets;     /* Number of transmitted packets. */
+    ovs_32aligned_be64 rx_bytes;       /* Number of received bytes. */
+    ovs_32aligned_be64 tx_bytes;       /* Number of transmitted bytes. */
+    ovs_32aligned_be64 rx_dropped;     /* Number of packets dropped by RX. */
+    ovs_32aligned_be64 tx_dropped;     /* Number of packets dropped by TX. */
+    ovs_32aligned_be64 rx_errors; /* Number of receive errors.  This is a
+                                     super-set of receive errors and should be
+                                     great than or equal to the sum of all
+                                     rx_*_err values. */
+    ovs_32aligned_be64 tx_errors; /* Number of transmit errors.  This is a
+                                     super-set of transmit errors. */
+    ovs_32aligned_be64 rx_frame_err; /* Number of frame alignment errors. */
+    ovs_32aligned_be64 rx_over_err;  /* Number of packets with RX overrun. */
+    ovs_32aligned_be64 rx_crc_err;   /* Number of CRC errors. */
+    ovs_32aligned_be64 collisions;   /* Number of collisions. */
+};
+OFP_ASSERT(sizeof(struct ofp10_port_stats) == 104);
+
+/* All ones is used to indicate all queues in a port (for stats retrieval). */
+#define OFPQ_ALL      0xffffffff
+
+/* Body for stats request of type OFPST_QUEUE. */
+struct ofp10_queue_stats_request {
+    ovs_be16 port_no;        /* All ports if OFPP_ALL. */
+    uint8_t pad[2];          /* Align to 32-bits. */
+    ovs_be32 queue_id;       /* All queues if OFPQ_ALL. */
+};
+OFP_ASSERT(sizeof(struct ofp10_queue_stats_request) == 8);
+
+/* Body for stats reply of type OFPST_QUEUE consists of an array of this
+ * structure type. */
+struct ofp10_queue_stats {
+    ovs_be16 port_no;
+    uint8_t pad[2];          /* Align to 32-bits. */
+    ovs_be32 queue_id;       /* Queue id. */
+    ovs_32aligned_be64 tx_bytes;   /* Number of transmitted bytes. */
+    ovs_32aligned_be64 tx_packets; /* Number of transmitted packets. */
+    ovs_32aligned_be64 tx_errors;  /* # of packets dropped due to overrun. */
+};
+OFP_ASSERT(sizeof(struct ofp10_queue_stats) == 32);
+
+#endif /* openflow/openflow-1.0.h */
diff --git a/openflow/include/openflow/openflow-1.1.h b/openflow/include/openflow/openflow-1.1.h
new file mode 100644
index 0000000..de28475
--- /dev/null
+++ b/openflow/include/openflow/openflow-1.1.h
@@ -0,0 +1,606 @@
+/* Copyright (c) 2008, 2011, 2012, 2013, 2014, 2016 The Board of Trustees of The Leland Stanford
+ * Junior University
+ *
+ * We are making the OpenFlow specification and associated documentation
+ * (Software) available for public use and benefit with the expectation
+ * that others will use, modify and enhance the Software and contribute
+ * those enhancements back to the community. However, since we would
+ * like to make the Software available for broadest use, with as few
+ * restrictions as possible permission is hereby granted, free of
+ * charge, to any person obtaining a copy of this Software to deal in
+ * the Software under the copyrights without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * The name and trademarks of copyright holder(s) may NOT be used in
+ * advertising or publicity pertaining to the Software or any
+ * derivatives without specific, written prior permission.
+ */
+
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* OpenFlow: protocol between controller and datapath. */
+
+#ifndef OPENFLOW_11_H
+#define OPENFLOW_11_H 1
+
+#include <openflow/openflow-common.h>
+
+/* OpenFlow 1.1 uses 32-bit port numbers.  Open vSwitch, for now, uses OpenFlow
+ * 1.0 port numbers internally.  We map them to OpenFlow 1.0 as follows:
+ *
+ * OF1.1                    <=>  OF1.0
+ * -----------------------       ---------------
+ * 0x00000000...0x0000feff  <=>  0x0000...0xfeff  "physical" ports
+ * 0x0000ff00...0xfffffeff  <=>  not supported
+ * 0xffffff00...0xffffffff  <=>  0xff00...0xffff  "reserved" OFPP_* ports
+ *
+ * OFPP11_OFFSET is the value that must be added or subtracted to convert
+ * an OpenFlow 1.0 reserved port number to or from, respectively, the
+ * corresponding OpenFlow 1.1 reserved port number.
+ */
+#define OFPP11_MAX    OFP11_PORT_C(0xffffff00)
+#define OFPP11_OFFSET 0xffff0000    /* OFPP11_MAX - OFPP_MAX */
+
+/* Reserved wildcard port used only for flow mod (delete) and flow stats
+ * requests. Selects all flows regardless of output port
+ * (including flows with no output port)
+ *
+ * Define it via OFPP_NONE (0xFFFF) so that OFPP_ANY is still an enum ofp_port
+ */
+#define OFPP_ANY OFPP_NONE
+
+/* OpenFlow 1.1 port config flags are just the common flags. */
+#define OFPPC11_ALL \
+    (OFPPC_PORT_DOWN | OFPPC_NO_RECV | OFPPC_NO_FWD | OFPPC_NO_PACKET_IN)
+
+/* OpenFlow 1.1 specific current state of the physical port.  These are not
+ * configurable from the controller.
+ */
+enum ofp11_port_state {
+    OFPPS11_BLOCKED      = 1 << 1,  /* Port is blocked */
+    OFPPS11_LIVE         = 1 << 2,  /* Live for Fast Failover Group. */
+#define OFPPS11_ALL (OFPPS_LINK_DOWN | OFPPS11_BLOCKED | OFPPS11_LIVE)
+};
+
+/* OpenFlow 1.1 specific features of ports available in a datapath. */
+enum ofp11_port_features {
+    OFPPF11_40GB_FD    = 1 << 7,  /* 40 Gb full-duplex rate support. */
+    OFPPF11_100GB_FD   = 1 << 8,  /* 100 Gb full-duplex rate support. */
+    OFPPF11_1TB_FD     = 1 << 9,  /* 1 Tb full-duplex rate support. */
+    OFPPF11_OTHER      = 1 << 10, /* Other rate, not in the list. */
+
+    OFPPF11_COPPER     = 1 << 11, /* Copper medium. */
+    OFPPF11_FIBER      = 1 << 12, /* Fiber medium. */
+    OFPPF11_AUTONEG    = 1 << 13, /* Auto-negotiation. */
+    OFPPF11_PAUSE      = 1 << 14, /* Pause. */
+    OFPPF11_PAUSE_ASYM = 1 << 15  /* Asymmetric pause. */
+#define OFPPF11_ALL ((1 << 16) - 1)
+};
+
+/* Description of a port */
+struct ofp11_port {
+    ovs_be32 port_no;
+    uint8_t pad[4];
+    struct eth_addr hw_addr;
+    uint8_t pad2[2];                  /* Align to 64 bits. */
+    char name[OFP_MAX_PORT_NAME_LEN]; /* Null-terminated */
+
+    ovs_be32 config;        /* Bitmap of OFPPC_* flags. */
+    ovs_be32 state;         /* Bitmap of OFPPS_* and OFPPS11_* flags. */
+
+    /* Bitmaps of OFPPF_* and OFPPF11_* that describe features.  All bits
+     * zeroed if unsupported or unavailable. */
+    ovs_be32 curr;          /* Current features. */
+    ovs_be32 advertised;    /* Features being advertised by the port. */
+    ovs_be32 supported;     /* Features supported by the port. */
+    ovs_be32 peer;          /* Features advertised by peer. */
+
+    ovs_be32 curr_speed;    /* Current port bitrate in kbps. */
+    ovs_be32 max_speed;     /* Max port bitrate in kbps */
+};
+OFP_ASSERT(sizeof(struct ofp11_port) == 64);
+
+/* Modify behavior of the physical port */
+struct ofp11_port_mod {
+    ovs_be32 port_no;
+    uint8_t pad[4];
+    struct eth_addr hw_addr; /* The hardware address is not configurable.  This
+                                is used to sanity-check the request, so it must
+                                be the same as returned in an ofp11_port
+                                struct. */
+    uint8_t pad2[2];        /* Pad to 64 bits. */
+    ovs_be32 config;        /* Bitmap of OFPPC_* flags. */
+    ovs_be32 mask;          /* Bitmap of OFPPC_* flags to be changed. */
+
+    ovs_be32 advertise;     /* Bitmap of OFPPF_* and OFPPF11_*.  Zero all bits
+                               to prevent any action taking place. */
+    uint8_t pad3[4];        /* Pad to 64 bits. */
+};
+OFP_ASSERT(sizeof(struct ofp11_port_mod) == 32);
+
+/* Group setup and teardown (controller -> datapath). */
+struct ofp11_group_mod {
+    ovs_be16 command;             /* One of OFPGC11_*. */
+    uint8_t type;                 /* One of OFPGT11_*. */
+    uint8_t pad;                  /* Pad to 64 bits. */
+    ovs_be32 group_id;            /* Group identifier. */
+    /* struct ofp11_bucket buckets[0]; The bucket length is inferred from the
+                                       length field in the header. */
+};
+OFP_ASSERT(sizeof(struct ofp11_group_mod) == 8);
+
+/* Query for port queue configuration. */
+struct ofp11_queue_get_config_request {
+    ovs_be32 port;
+    /* Port to be queried. Should refer
+       to a valid physical port (i.e. < OFPP_MAX) */
+    uint8_t pad[4];
+};
+OFP_ASSERT(sizeof(struct ofp11_queue_get_config_request) == 8);
+
+/* Group commands */
+enum ofp11_group_mod_command {
+    OFPGC11_ADD,          /* New group. */
+    OFPGC11_MODIFY,       /* Modify all matching groups. */
+    OFPGC11_DELETE,       /* Delete all matching groups. */
+    OFPGC11_ADD_OR_MOD = 0x8000, /* Create new or modify existing group. */
+};
+
+/* OpenFlow 1.1 specific capabilities supported by the datapath (struct
+ * ofp_switch_features, member capabilities). */
+enum ofp11_capabilities {
+    OFPC11_GROUP_STATS    = 1 << 3,  /* Group statistics. */
+};
+
+#define OFPMT11_STANDARD_LENGTH 88
+
+struct ofp11_match_header {
+    ovs_be16 type;             /* One of OFPMT_* */
+    ovs_be16 length;           /* Length of match */
+};
+OFP_ASSERT(sizeof(struct ofp11_match_header) == 4);
+
+/* Fields to match against flows */
+struct ofp11_match {
+    struct ofp11_match_header omh;
+    ovs_be32 in_port;          /* Input switch port. */
+    ovs_be32 wildcards;        /* Wildcard fields. */
+    struct eth_addr dl_src;    /* Ethernet source address. */
+    struct eth_addr dl_src_mask; /* Ethernet source address mask.  */
+    struct eth_addr dl_dst;    /* Ethernet destination address. */
+    struct eth_addr dl_dst_mask; /* Ethernet destination address mask. */
+    ovs_be16 dl_vlan;          /* Input VLAN id. */
+    uint8_t dl_vlan_pcp;       /* Input VLAN priority. */
+    uint8_t pad1[1];           /* Align to 32-bits */
+    ovs_be16 dl_type;          /* Ethernet frame type. */
+    uint8_t nw_tos;            /* IP ToS (actually DSCP field, 6 bits). */
+    uint8_t nw_proto;          /* IP protocol or lower 8 bits of ARP opcode. */
+    ovs_be32 nw_src;           /* IP source address. */
+    ovs_be32 nw_src_mask;      /* IP source address mask. */
+    ovs_be32 nw_dst;           /* IP destination address. */
+    ovs_be32 nw_dst_mask;      /* IP destination address mask. */
+    ovs_be16 tp_src;           /* TCP/UDP/SCTP source port. */
+    ovs_be16 tp_dst;           /* TCP/UDP/SCTP destination port. */
+    ovs_be32 mpls_label;       /* MPLS label. */
+    uint8_t mpls_tc;           /* MPLS TC. */
+    uint8_t pad2[3];           /* Align to 64-bits */
+    ovs_be64 metadata;         /* Metadata passed between tables. */
+    ovs_be64 metadata_mask;    /* Mask for metadata. */
+};
+OFP_ASSERT(sizeof(struct ofp11_match) == OFPMT11_STANDARD_LENGTH);
+
+/* Flow wildcards. */
+enum ofp11_flow_wildcards {
+    OFPFW11_IN_PORT     = 1 << 0,  /* Switch input port. */
+    OFPFW11_DL_VLAN     = 1 << 1,  /* VLAN id. */
+    OFPFW11_DL_VLAN_PCP = 1 << 2,  /* VLAN priority. */
+    OFPFW11_DL_TYPE     = 1 << 3,  /* Ethernet frame type. */
+    OFPFW11_NW_TOS      = 1 << 4,  /* IP ToS (DSCP field, 6 bits). */
+    OFPFW11_NW_PROTO    = 1 << 5,  /* IP protocol. */
+    OFPFW11_TP_SRC      = 1 << 6,  /* TCP/UDP/SCTP source port. */
+    OFPFW11_TP_DST      = 1 << 7,  /* TCP/UDP/SCTP destination port. */
+    OFPFW11_MPLS_LABEL  = 1 << 8,  /* MPLS label. */
+    OFPFW11_MPLS_TC     = 1 << 9,  /* MPLS TC. */
+
+    /* Wildcard all fields. */
+    OFPFW11_ALL           = ((1 << 10) - 1)
+};
+
+/* The VLAN id is 12-bits, so we can use the entire 16 bits to indicate
+ * special conditions.
+ */
+enum ofp11_vlan_id {
+    OFPVID11_ANY = 0xfffe,  /* Indicate that a VLAN id is set but don't care
+                               about it's value. Note: only valid when
+                               specifying the VLAN id in a match */
+    OFPVID11_NONE = 0xffff, /* No VLAN id was set. */
+};
+
+enum ofp11_instruction_type {
+    OFPIT11_GOTO_TABLE = 1,        /* Setup the next table in the lookup
+                                      pipeline */
+    OFPIT11_WRITE_METADATA = 2,    /* Setup the metadata field for use later
+                                      in pipeline */
+    OFPIT11_WRITE_ACTIONS = 3,     /* Write the action(s) onto the datapath
+                                      action set */
+    OFPIT11_APPLY_ACTIONS = 4,     /* Applies the action(s) immediately */
+    OFPIT11_CLEAR_ACTIONS = 5,     /* Clears all actions from the datapath
+                                      action set */
+    OFPIT11_EXPERIMENTER = 0xFFFF  /* Experimenter instruction */
+};
+
+#define OFP11_INSTRUCTION_ALIGN 8
+
+/* Generic ofp_instruction structure. */
+struct ofp11_instruction {
+    ovs_be16 type;              /* Instruction type */
+    ovs_be16 len;               /* Length of this struct in bytes. */
+    uint8_t pad[4];             /* Align to 64-bits */
+};
+OFP_ASSERT(sizeof(struct ofp11_instruction) == 8);
+
+/* Instruction structure for OFPIT_GOTO_TABLE */
+struct ofp11_instruction_goto_table {
+    ovs_be16 type;                 /* OFPIT_GOTO_TABLE */
+    ovs_be16 len;                  /* Length of this struct in bytes. */
+    uint8_t table_id;              /* Set next table in the lookup pipeline */
+    uint8_t pad[3];                /* Pad to 64 bits. */
+};
+OFP_ASSERT(sizeof(struct ofp11_instruction_goto_table) == 8);
+
+/* Instruction structure for OFPIT_WRITE_METADATA */
+struct ofp11_instruction_write_metadata {
+    ovs_be16 type;              /* OFPIT_WRITE_METADATA */
+    ovs_be16 len;               /* Length of this struct in bytes. */
+    uint8_t pad[4];             /* Align to 64-bits */
+    ovs_be64 metadata;          /* Metadata value to write */
+    ovs_be64 metadata_mask;     /* Metadata write bitmask */
+};
+OFP_ASSERT(sizeof(struct ofp11_instruction_write_metadata) == 24);
+
+/* Instruction structure for OFPIT_WRITE/APPLY/CLEAR_ACTIONS */
+struct ofp11_instruction_actions {
+    ovs_be16 type;              /* One of OFPIT_*_ACTIONS */
+    ovs_be16 len;               /* Length of this struct in bytes. */
+    uint8_t pad[4];             /* Align to 64-bits */
+    /* struct ofp_action_header actions[0];  Actions associated with
+                                             OFPIT_WRITE_ACTIONS and
+                                             OFPIT_APPLY_ACTIONS */
+};
+OFP_ASSERT(sizeof(struct ofp11_instruction_actions) == 8);
+
+/* Instruction structure for experimental instructions */
+struct ofp11_instruction_experimenter {
+    ovs_be16 type;              /* OFPIT11_EXPERIMENTER */
+    ovs_be16 len;               /* Length of this struct in bytes */
+    ovs_be32 experimenter;      /* Experimenter ID which takes the same form
+                                   as in struct ofp_vendor_header. */
+    /* Experimenter-defined arbitrary additional data. */
+};
+OFP_ASSERT(sizeof(struct ofp11_instruction_experimenter) == 8);
+
+/* Configure/Modify behavior of a flow table */
+struct ofp11_table_mod {
+    uint8_t table_id;       /* ID of the table, 0xFF indicates all tables */
+    uint8_t pad[3];         /* Pad to 32 bits */
+    ovs_be32 config;        /* Bitmap of OFPTC_* flags */
+};
+OFP_ASSERT(sizeof(struct ofp11_table_mod) == 8);
+
+/* Flow setup and teardown (controller -> datapath). */
+struct ofp11_flow_mod {
+    ovs_be64 cookie;             /* Opaque controller-issued identifier. */
+    ovs_be64 cookie_mask;        /* Mask used to restrict the cookie bits
+                                    that must match when the command is
+                                    OFPFC_MODIFY* or OFPFC_DELETE*. A value
+                                    of 0 indicates no restriction. */
+    /* Flow actions. */
+    uint8_t table_id;            /* ID of the table to put the flow in */
+    uint8_t command;             /* One of OFPFC_*. */
+    ovs_be16 idle_timeout;       /* Idle time before discarding (seconds). */
+    ovs_be16 hard_timeout;       /* Max time before discarding (seconds). */
+    ovs_be16 priority;           /* Priority level of flow entry. */
+    ovs_be32 buffer_id;          /* Buffered packet to apply to (or -1).
+                                    Not meaningful for OFPFC_DELETE*. */
+    ovs_be32 out_port;           /* For OFPFC_DELETE* commands, require
+                                    matching entries to include this as an
+                                    output port. A value of OFPP_ANY
+                                    indicates no restriction. */
+    ovs_be32 out_group;          /* For OFPFC_DELETE* commands, require
+                                    matching entries to include this as an
+                                    output group. A value of OFPG_ANY
+                                    indicates no restriction. */
+    ovs_be16 flags;              /* One of OFPFF_*. */
+    ovs_be16 importance;         /* Eviction precedence (OF1.4+). */
+    /* Followed by an ofp11_match structure. */
+    /* Followed by an instruction set. */
+};
+OFP_ASSERT(sizeof(struct ofp11_flow_mod) == 40);
+
+/* Group types. Values in the range [128, 255] are reserved for experimental
+ * use. */
+enum ofp11_group_type {
+    OFPGT11_ALL,      /* All (multicast/broadcast) group. */
+    OFPGT11_SELECT,   /* Select group. */
+    OFPGT11_INDIRECT, /* Indirect group. */
+    OFPGT11_FF        /* Fast failover group. */
+};
+
+/* Bucket for use in groups. */
+struct ofp11_bucket {
+    ovs_be16 len;                    /* Length the bucket in bytes, including
+                                        this header and any padding to make it
+                                        64-bit aligned. */
+    ovs_be16 weight;                 /* Relative weight of bucket. Only
+                                        defined for select groups. */
+    ovs_be32 watch_port;             /* Port whose state affects whether this
+                                        bucket is live. Only required for fast
+                                        failover groups. */
+    ovs_be32 watch_group;            /* Group whose state affects whether this
+                                        bucket is live. Only required for fast
+                                        failover groups. */
+    uint8_t pad[4];
+    /* struct ofp_action_header actions[0]; The action length is inferred
+                                            from the length field in the
+                                            header. */
+};
+OFP_ASSERT(sizeof(struct ofp11_bucket) == 16);
+
+/* Queue configuration for a given port. */
+struct ofp11_queue_get_config_reply {
+    ovs_be32 port;
+    uint8_t pad[4];
+    /* struct ofp_packet_queue queues[0];  List of configured queues. */
+};
+OFP_ASSERT(sizeof(struct ofp11_queue_get_config_reply) == 8);
+
+/* Stats request of type OFPST_FLOW. */
+struct ofp11_flow_stats_request {
+    uint8_t table_id;         /* ID of table to read (from ofp_table_stats),
+                                 0xff for all tables. */
+    uint8_t pad[3];           /* Align to 64 bits. */
+    ovs_be32 out_port;        /* Require matching entries to include this
+                                 as an output port. A value of OFPP_ANY
+                                 indicates no restriction. */
+    ovs_be32 out_group;       /* Require matching entries to include this
+                                 as an output group. A value of OFPG_ANY
+                                 indicates no restriction. */
+    uint8_t pad2[4];          /* Align to 64 bits. */
+    ovs_be64 cookie;          /* Require matching entries to contain this
+                                 cookie value */
+    ovs_be64 cookie_mask;     /* Mask used to restrict the cookie bits that
+                                 must match. A value of 0 indicates
+                                 no restriction. */
+    /* Followed by an ofp11_match structure. */
+};
+OFP_ASSERT(sizeof(struct ofp11_flow_stats_request) == 32);
+
+/* Body of reply to OFPST_FLOW request. */
+struct ofp11_flow_stats {
+    ovs_be16 length;           /* Length of this entry. */
+    uint8_t table_id;          /* ID of table flow came from. */
+    uint8_t pad;
+    ovs_be32 duration_sec;     /* Time flow has been alive in seconds. */
+    ovs_be32 duration_nsec;    /* Time flow has been alive in nanoseconds beyond
+                                  duration_sec. */
+    ovs_be16 priority;         /* Priority of the entry. Only meaningful
+                                  when this is not an exact-match entry. */
+    ovs_be16 idle_timeout;     /* Number of seconds idle before expiration. */
+    ovs_be16 hard_timeout;     /* Number of seconds before expiration. */
+    ovs_be16 flags;            /* OF 1.3: Set of OFPFF*. */
+    ovs_be16 importance;       /* Eviction precedence (OF1.4+). */
+    uint8_t  pad2[2];          /* Align to 64-bits. */
+    ovs_be64 cookie;           /* Opaque controller-issued identifier. */
+    ovs_be64 packet_count;     /* Number of packets in flow. */
+    ovs_be64 byte_count;       /* Number of bytes in flow. */
+    /* OpenFlow version specific match */
+    /* struct ofp11_instruction instructions[0];  Instruction set. */
+};
+OFP_ASSERT(sizeof(struct ofp11_flow_stats) == 48);
+
+/* Body for ofp_stats_request of type OFPST_AGGREGATE. */
+/* Identical to ofp11_flow_stats_request */
+
+/* Flow match fields. */
+enum ofp11_flow_match_fields {
+    OFPFMF11_IN_PORT     = 1 << 0,  /* Switch input port. */
+    OFPFMF11_DL_VLAN     = 1 << 1,  /* VLAN id. */
+    OFPFMF11_DL_VLAN_PCP = 1 << 2,  /* VLAN priority. */
+    OFPFMF11_DL_TYPE     = 1 << 3,  /* Ethernet frame type. */
+    OFPFMF11_NW_TOS      = 1 << 4,  /* IP ToS (DSCP field, 6 bits). */
+    OFPFMF11_NW_PROTO    = 1 << 5,  /* IP protocol. */
+    OFPFMF11_TP_SRC      = 1 << 6,  /* TCP/UDP/SCTP source port. */
+    OFPFMF11_TP_DST      = 1 << 7,  /* TCP/UDP/SCTP destination port. */
+    OFPFMF11_MPLS_LABEL  = 1 << 8,  /* MPLS label. */
+    OFPFMF11_MPLS_TC     = 1 << 9,  /* MPLS TC. */
+    OFPFMF11_TYPE        = 1 << 10, /* Match type. */
+    OFPFMF11_DL_SRC      = 1 << 11, /* Ethernet source address. */
+    OFPFMF11_DL_DST      = 1 << 12, /* Ethernet destination address. */
+    OFPFMF11_NW_SRC      = 1 << 13, /* IP source address. */
+    OFPFMF11_NW_DST      = 1 << 14, /* IP destination address. */
+    OFPFMF11_METADATA    = 1 << 15, /* Metadata passed between tables. */
+};
+
+/* Body of reply to OFPST_TABLE request. */
+struct ofp11_table_stats {
+    uint8_t table_id;        /* Identifier of table. Lower numbered tables
+                                are consulted first. */
+    uint8_t pad[7];          /* Align to 64-bits. */
+    char name[OFP_MAX_TABLE_NAME_LEN];
+    ovs_be32 wildcards;      /* Bitmap of OFPFMF_* wildcards that are
+                                supported by the table. */
+    ovs_be32 match;          /* Bitmap of OFPFMF_* that indicate the fields
+                                the table can match on. */
+    ovs_be32 instructions;   /* Bitmap of OFPIT_* values supported. */
+    ovs_be32 write_actions;  /* Bitmap of OFPAT_* that are supported
+                                by the table with OFPIT_WRITE_ACTIONS.  */
+    ovs_be32 apply_actions;  /* Bitmap of OFPAT_* that are supported
+                                by the table with OFPIT_APPLY_ACTIONS. */
+    ovs_be32 config;         /* Bitmap of OFPTC_* values */
+    ovs_be32 max_entries;    /* Max number of entries supported. */
+    ovs_be32 active_count;   /* Number of active entries. */
+    ovs_be64 lookup_count;   /* Number of packets looked up in table. */
+    ovs_be64 matched_count;  /* Number of packets that hit table. */
+};
+OFP_ASSERT(sizeof(struct ofp11_table_stats) == 88);
+
+/* Body for ofp_stats_request of type OFPST_PORT. */
+struct ofp11_port_stats_request {
+    ovs_be32 port_no;        /* OFPST_PORT message must request statistics
+                              * either for a single port (specified in
+                              * port_no) or for all ports (if port_no ==
+                              * OFPP_ANY). */
+    uint8_t pad[4];
+};
+OFP_ASSERT(sizeof(struct ofp11_port_stats_request) == 8);
+
+/* Body of reply to OFPST_PORT request. If a counter is unsupported, set
+ * the field to all ones. */
+struct ofp11_port_stats {
+    ovs_be32 port_no;
+    uint8_t pad[4];           /* Align to 64-bits. */
+    ovs_be64 rx_packets;      /* Number of received packets. */
+    ovs_be64 tx_packets;      /* Number of transmitted packets. */
+    ovs_be64 rx_bytes;        /* Number of received bytes. */
+    ovs_be64 tx_bytes;        /* Number of transmitted bytes. */
+    ovs_be64 rx_dropped;      /* Number of packets dropped by RX. */
+    ovs_be64 tx_dropped;      /* Number of packets dropped by TX. */
+    ovs_be64 rx_errors;       /* Number of receive errors.  This is a
+                                 super-set of receive errors and should be
+                                 great than or equal to the sum of all
+                                 rx_*_err values. */
+    ovs_be64 tx_errors;       /* Number of transmit errors.  This is a
+                                 super-set of transmit errors. */
+    ovs_be64 rx_frame_err;    /* Number of frame alignment errors. */
+    ovs_be64 rx_over_err;     /* Number of packets with RX overrun. */
+    ovs_be64 rx_crc_err;      /* Number of CRC errors. */
+    ovs_be64 collisions;      /* Number of collisions. */
+};
+OFP_ASSERT(sizeof(struct ofp11_port_stats) == 104);
+
+struct ofp11_queue_stats_request {
+    ovs_be32 port_no;         /* All ports if OFPP_ANY. */
+    ovs_be32 queue_id;        /* All queues if OFPQ_ALL. */
+};
+OFP_ASSERT(sizeof(struct ofp11_queue_stats_request) == 8);
+
+struct ofp11_queue_stats {
+    ovs_be32 port_no;
+    ovs_be32 queue_id;         /* Queue id. */
+    ovs_be64 tx_bytes;         /* Number of transmitted bytes. */
+    ovs_be64 tx_packets;       /* Number of transmitted packets. */
+    ovs_be64 tx_errors;        /* # of packets dropped due to overrun. */
+};
+OFP_ASSERT(sizeof(struct ofp11_queue_stats) == 32);
+
+struct ofp11_group_stats_request {
+    ovs_be32 group_id;         /* All groups if OFPG_ALL. */
+    uint8_t pad[4];            /* Align to 64 bits. */
+};
+OFP_ASSERT(sizeof(struct ofp11_group_stats_request) == 8);
+
+/* Used in group stats replies. */
+struct ofp11_bucket_counter {
+    ovs_be64 packet_count;   /* Number of packets processed by bucket. */
+    ovs_be64 byte_count;     /* Number of bytes processed by bucket. */
+};
+OFP_ASSERT(sizeof(struct ofp11_bucket_counter) == 16);
+
+/* Body of reply to OFPST11_GROUP request */
+struct ofp11_group_stats {
+    ovs_be16 length;           /* Length of this entry. */
+    uint8_t pad[2];            /* Align to 64 bits. */
+    ovs_be32 group_id;         /* Group identifier. */
+    ovs_be32 ref_count;        /* Number of flows or groups that
+                                  directly forward to this group. */
+    uint8_t pad2[4];           /* Align to 64 bits. */
+    ovs_be64 packet_count;     /* Number of packets processed by group. */
+    ovs_be64 byte_count;       /* Number of bytes processed by group. */
+    /* struct ofp11_bucket_counter bucket_stats[]; */
+};
+OFP_ASSERT(sizeof(struct ofp11_group_stats) == 32);
+
+/* Body of reply to OFPST11_GROUP_DESC request. */
+struct ofp11_group_desc_stats {
+    ovs_be16 length;            /* Length of this entry. */
+    uint8_t type;               /* One of OFPGT11_*. */
+    uint8_t pad;                /* Pad to 64 bits. */
+    ovs_be32 group_id;          /* Group identifier. */
+    /* struct ofp11_bucket buckets[0]; */
+};
+OFP_ASSERT(sizeof(struct ofp11_group_desc_stats) == 8);
+
+/* Send packet (controller -> datapath). */
+struct ofp11_packet_out {
+    ovs_be32 buffer_id;       /* ID assigned by datapath (-1 if none). */
+    ovs_be32 in_port;         /* Packet's input port or OFPP_CONTROLLER. */
+    ovs_be16 actions_len;     /* Size of action array in bytes. */
+    uint8_t pad[6];
+    /* struct ofp_action_header actions[0];  Action list. */
+    /* uint8_t data[0]; */    /* Packet data. The length is inferred
+                                 from the length field in the header.
+                                 (Only meaningful if buffer_id == -1.) */
+};
+OFP_ASSERT(sizeof(struct ofp11_packet_out) == 16);
+
+/* Packet received on port (datapath -> controller). */
+struct ofp11_packet_in {
+    ovs_be32 buffer_id;     /* ID assigned by datapath. */
+    ovs_be32 in_port;       /* Port on which frame was received. */
+    ovs_be32 in_phy_port;   /* Physical Port on which frame was received. */
+    ovs_be16 total_len;     /* Full length of frame. */
+    uint8_t reason;         /* Reason packet is being sent (one of OFPR_*) */
+    uint8_t table_id;       /* ID of the table that was looked up */
+    /* Followed by Ethernet frame. */
+};
+OFP_ASSERT(sizeof(struct ofp11_packet_in) == 16);
+
+/* Flow removed (datapath -> controller). */
+struct ofp11_flow_removed {
+    ovs_be64 cookie;          /* Opaque controller-issued identifier. */
+
+    ovs_be16 priority;        /* Priority level of flow entry. */
+    uint8_t reason;           /* One of OFPRR_*. */
+    uint8_t table_id;         /* ID of the table */
+
+    ovs_be32 duration_sec;    /* Time flow was alive in seconds. */
+    ovs_be32 duration_nsec;   /* Time flow was alive in nanoseconds beyond
+                                 duration_sec. */
+    ovs_be16 idle_timeout;    /* Idle timeout from original flow mod. */
+    uint8_t pad2[2];          /* Align to 64-bits. */
+    ovs_be64 packet_count;
+    ovs_be64 byte_count;
+    /* Followed by an ofp11_match structure. */
+};
+OFP_ASSERT(sizeof(struct ofp11_flow_removed) == 40);
+
+#endif /* openflow/openflow-1.1.h */
diff --git a/openflow/include/openflow/openflow-1.2.h b/openflow/include/openflow/openflow-1.2.h
new file mode 100644
index 0000000..30e220c
--- /dev/null
+++ b/openflow/include/openflow/openflow-1.2.h
@@ -0,0 +1,229 @@
+/* Copyright (c) 2008, 2011, 2012, 2013, 2014 The Board of Trustees of The Leland Stanford
+ * Junior University
+ *
+ * We are making the OpenFlow specification and associated documentation
+ * (Software) available for public use and benefit with the expectation
+ * that others will use, modify and enhance the Software and contribute
+ * those enhancements back to the community. However, since we would
+ * like to make the Software available for broadest use, with as few
+ * restrictions as possible permission is hereby granted, free of
+ * charge, to any person obtaining a copy of this Software to deal in
+ * the Software under the copyrights without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * The name and trademarks of copyright holder(s) may NOT be used in
+ * advertising or publicity pertaining to the Software or any
+ * derivatives without specific, written prior permission.
+ */
+
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2012 Horms Solutions Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* OpenFlow: protocol between controller and datapath. */
+
+#ifndef OPENFLOW_12_H
+#define OPENFLOW_12_H 1
+
+#include <openflow/openflow-1.1.h>
+
+/* Error type for experimenter error messages. */
+#define OFPET12_EXPERIMENTER 0xffff
+
+/* The VLAN id is 12-bits, so we can use the entire 16 bits to indicate
+ * special conditions.
+ */
+enum ofp12_vlan_id {
+    OFPVID12_PRESENT = 0x1000, /* Bit that indicate that a VLAN id is set */
+    OFPVID12_NONE    = 0x0000, /* No VLAN id was set. */
+};
+
+/* Bit definitions for IPv6 Extension Header pseudo-field. */
+enum ofp12_ipv6exthdr_flags {
+    OFPIEH12_NONEXT = 1 << 0,   /* "No next header" encountered. */
+    OFPIEH12_ESP    = 1 << 1,   /* Encrypted Sec Payload header present. */
+    OFPIEH12_AUTH   = 1 << 2,   /* Authentication header present. */
+    OFPIEH12_DEST   = 1 << 3,   /* 1 or 2 dest headers present. */
+    OFPIEH12_FRAG   = 1 << 4,   /* Fragment header present. */
+    OFPIEH12_ROUTER = 1 << 5,   /* Router header present. */
+    OFPIEH12_HOP    = 1 << 6,   /* Hop-by-hop header present. */
+    OFPIEH12_UNREP  = 1 << 7,   /* Unexpected repeats encountered. */
+    OFPIEH12_UNSEQ  = 1 << 8    /* Unexpected sequencing encountered. */
+};
+
+/* Header for OXM experimenter match fields. */
+struct ofp12_oxm_experimenter_header {
+    ovs_be32 oxm_header;   /* oxm_class = OFPXMC_EXPERIMENTER */
+    ovs_be32 experimenter; /* Experimenter ID which takes the same
+                              form as in struct ofp11_experimenter_header. */
+};
+OFP_ASSERT(sizeof(struct ofp12_oxm_experimenter_header) == 8);
+
+enum ofp12_controller_max_len {
+    OFPCML12_MAX       = 0xffe5, /* maximum max_len value which can be used
+                                  * to request a specific byte length. */
+    OFPCML12_NO_BUFFER = 0xffff  /* indicates that no buffering should be
+                                  * applied and the whole packet is to be
+                                  * sent to the controller. */
+};
+
+/* OpenFlow 1.2 specific flags
+ * (struct ofp12_flow_mod, member flags). */
+enum ofp12_flow_mod_flags {
+    OFPFF12_RESET_COUNTS  = 1 << 2   /* Reset flow packet and byte counts. */
+};
+
+/* OpenFlow 1.2 specific capabilities
+ * (struct ofp_switch_features, member capabilities). */
+enum ofp12_capabilities {
+    OFPC12_PORT_BLOCKED   = 1 << 8   /* Switch will block looping ports. */
+};
+
+/* Full description for a queue. */
+struct ofp12_packet_queue {
+    ovs_be32 queue_id;     /* id for the specific queue. */
+    ovs_be32 port;         /* Port this queue is attached to. */
+    ovs_be16 len;          /* Length in bytes of this queue desc. */
+    uint8_t pad[6];        /* 64-bit alignment. */
+    /* Followed by any number of queue properties expressed using
+     * ofp_queue_prop_header, to fill out a total of 'len' bytes. */
+};
+OFP_ASSERT(sizeof(struct ofp12_packet_queue) == 16);
+
+/* Body of reply to OFPST_TABLE request. */
+struct ofp12_table_stats {
+    uint8_t table_id;        /* Identifier of table.  Lower numbered tables
+                                are consulted first. */
+    uint8_t pad[7];          /* Align to 64-bits. */
+    char name[OFP_MAX_TABLE_NAME_LEN];
+    ovs_be64 match;          /* Bitmap of (1 << OFPXMT_*) that indicate the
+                                fields the table can match on. */
+    ovs_be64 wildcards;      /* Bitmap of (1 << OFPXMT_*) wildcards that are
+                                supported by the table. */
+    ovs_be32 write_actions;  /* Bitmap of OFPAT_* that are supported
+                                by the table with OFPIT_WRITE_ACTIONS. */
+    ovs_be32 apply_actions;  /* Bitmap of OFPAT_* that are supported
+                                by the table with OFPIT_APPLY_ACTIONS. */
+    ovs_be64 write_setfields;/* Bitmap of (1 << OFPXMT_*) header fields that
+                                can be set with OFPIT_WRITE_ACTIONS. */
+    ovs_be64 apply_setfields;/* Bitmap of (1 << OFPXMT_*) header fields that
+                                can be set with OFPIT_APPLY_ACTIONS. */
+    ovs_be64 metadata_match; /* Bits of metadata table can match. */
+    ovs_be64 metadata_write; /* Bits of metadata table can write. */
+    ovs_be32 instructions;   /* Bitmap of OFPIT_* values supported. */
+    ovs_be32 config;         /* Bitmap of OFPTC_* values */
+    ovs_be32 max_entries;    /* Max number of entries supported. */
+    ovs_be32 active_count;   /* Number of active entries. */
+    ovs_be64 lookup_count;   /* Number of packets looked up in table. */
+    ovs_be64 matched_count;  /* Number of packets that hit table. */
+};
+OFP_ASSERT(sizeof(struct ofp12_table_stats) == 128);
+
+/* Number of types of groups supported by ofp12_group_features_stats. */
+#define OFPGT12_N_TYPES 4
+
+/* Body of reply to OFPST12_GROUP_FEATURES request. Group features. */
+struct ofp12_group_features_stats {
+    ovs_be32  types;           /* Bitmap of OFPGT11_* values supported. */
+    ovs_be32  capabilities;    /* Bitmap of OFPGFC12_* capability supported. */
+
+    /* Each element in the following arrays corresponds to the group type with
+     * the same number, e.g. max_groups[0] is the maximum number of OFPGT11_ALL
+     * groups, actions[2] is the actions supported by OFPGT11_INDIRECT
+     * groups. */
+    ovs_be32  max_groups[OFPGT12_N_TYPES]; /* Max number of groups. */
+    ovs_be32  actions[OFPGT12_N_TYPES];    /* Bitmaps of supported OFPAT_*. */
+};
+OFP_ASSERT(sizeof(struct ofp12_group_features_stats) == 40);
+
+/* Group configuration flags */
+enum ofp12_group_capabilities {
+    OFPGFC12_SELECT_WEIGHT   = 1 << 0, /* Support weight for select groups */
+    OFPGFC12_SELECT_LIVENESS = 1 << 1, /* Support liveness for select groups */
+    OFPGFC12_CHAINING        = 1 << 2, /* Support chaining groups */
+    OFPGFC12_CHAINING_CHECKS = 1 << 3, /* Check chaining for loops and delete */
+};
+
+/* Role request and reply message. */
+struct ofp12_role_request {
+    ovs_be32 role;            /* One of OFPCR12_ROLE_*. */
+    uint8_t pad[4];           /* Align to 64 bits. */
+    ovs_be64 generation_id;   /* Master Election Generation Id */
+};
+OFP_ASSERT(sizeof(struct ofp12_role_request) == 16);
+
+/* Controller roles. */
+enum ofp12_controller_role {
+    OFPCR12_ROLE_NOCHANGE,    /* Don't change current role. */
+    OFPCR12_ROLE_EQUAL,       /* Default role, full access. */
+    OFPCR12_ROLE_MASTER,      /* Full access, at most one master. */
+    OFPCR12_ROLE_SLAVE,       /* Read-only access. */
+};
+
+/* Packet received on port (datapath -> controller). */
+struct ofp12_packet_in {
+    ovs_be32 buffer_id;     /* ID assigned by datapath. */
+    ovs_be16 total_len;     /* Full length of frame. */
+    uint8_t reason;         /* Reason packet is being sent (one of OFPR_*) */
+    uint8_t table_id;       /* ID of the table that was looked up */
+    /* Followed by:
+     *   - Match
+     *   - Exactly 2 all-zero padding bytes, then
+     *   - An Ethernet frame whose length is inferred from header.length.
+     * The padding bytes preceding the Ethernet frame ensure that the IP
+     * header (if any) following the Ethernet header is 32-bit aligned.
+     */
+    /* struct ofp12_match match; */
+    /* uint8_t pad[2];         Align to 64 bit + 16 bit */
+    /* uint8_t data[0];        Ethernet frame */
+};
+OFP_ASSERT(sizeof(struct ofp12_packet_in) == 8);
+
+/* Flow removed (datapath -> controller). */
+struct ofp12_flow_removed {
+    ovs_be64 cookie;          /* Opaque controller-issued identifier. */
+
+    ovs_be16 priority;        /* Priority level of flow entry. */
+    uint8_t reason;           /* One of OFPRR_*. */
+    uint8_t table_id;         /* ID of the table */
+
+    ovs_be32 duration_sec;    /* Time flow was alive in seconds. */
+    ovs_be32 duration_nsec;   /* Time flow was alive in nanoseconds beyond
+                                 duration_sec. */
+    ovs_be16 idle_timeout;    /* Idle timeout from original flow mod. */
+    ovs_be16 hard_timeout;    /* Hard timeout from original flow mod. */
+    ovs_be64 packet_count;
+    ovs_be64 byte_count;
+    /* struct ofp12_match match;  Description of fields. Variable size. */
+};
+OFP_ASSERT(sizeof(struct ofp12_flow_removed) == 40);
+
+#endif /* openflow/openflow-1.2.h */
diff --git a/openflow/include/openflow/openflow-1.3.h b/openflow/include/openflow/openflow-1.3.h
new file mode 100644
index 0000000..a521995
--- /dev/null
+++ b/openflow/include/openflow/openflow-1.3.h
@@ -0,0 +1,355 @@
+/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford
+* Junior University
+* Copyright (c) 2011, 2012 Open Networking Foundation
+*
+* We are making the OpenFlow specification and associated documentation
+* (Software) available for public use and benefit with the expectation
+* that others will use, modify and enhance the Software and contribute
+* those enhancements back to the community. However, since we would
+* like to make the Software available for broadest use, with as few
+* restrictions as possible permission is hereby granted, free of
+* charge, to any person obtaining a copy of this Software to deal in
+* the Software under the copyrights without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*
+* The name and trademarks of copyright holder(s) may NOT be used in
+* advertising or publicity pertaining to the Software or any
+* derivatives without specific, written prior permission.
+*/
+
+/* OpenFlow: protocol between controller and datapath. */
+
+#ifndef OPENFLOW_13_H
+#define OPENFLOW_13_H 1
+
+#include <openflow/openflow-1.2.h>
+
+/*
+ * OpenFlow 1.3 modifies the syntax of the following message types:
+ *
+ * OFPT_FEATURES_REPLY     = 6    (opf13_switch_features)
+ *                                 - new field: auxiliary_id
+ *                                 - removed: ofp_ports at the end
+ *
+ * OFPT_PACKET_IN          = 10   (appends an ovs_be64 to ofp12_packet_in)
+ *
+ * OpenFlow 1.3 adds following new message types:
+ *
+ * * Asynchronous message configuration. *
+ * OFPT13_GET_ASYNC_REQUEST  = 26   (void)
+ * OFPT13_GET_ASYNC_REPLY    = 27   (ofp13_async_config)
+ * OFPT13_SET_ASYNC          = 28   (ofp13_async_config)
+ *
+ * * Meters and rate limiters configuration messages. *
+ * OFPT13_METER_MOD          = 29   (ofp13_meter_mod)
+ *
+ * OpenFlow 1.3 modifies the syntax of the following statistics message types
+ * (now called multipart message types):
+ *
+ * OFPMP13_FLOW_REPLY = 1 (struct ofp13_flow_stats[])
+ * OFPMP13_TABLE_REPLY = 3 (struct ofp13_table_stats[])
+ * OFPMP13_PORT_REPLY = 4 (struct ofp13_port_stats[])
+ * OFPMP13_QUEUE_REPLY = 5, (struct ofp13_queue_stats[])
+ * OFPMP13_GROUP_REPLY = 6, (struct ofp13_group_stats[])
+ *
+ * OpenFlow 1.3 adds the following multipart message types
+ *
+ * Meter statistics:
+ * OFPMP13_METER_REQUEST = 9, (struct ofp13_meter_multipart_request)
+ * OFPMP13_METER_REPLY = 9, (struct ofp13_meter_stats[])
+ *
+ * Meter configuration:
+ * OFPMP13_METER_CONFIG_REQUEST = 10, (struct ofp13_meter_multipart_request)
+ * OFPMP13_METER_CONFIG_REPLY = 10, (struct ofp13_meter_config[])
+ *
+ * Meter features:
+ * OFPMP13_METER_FEATURES_REQUEST = 11 (void)
+ * OFPMP13_METER_FEATURES_REPLY = 11 (struct ofp13_meter_features)
+ *
+ * Table features:
+ * OFPMP13_TABLE_FEATURES_REQUEST = 12, (struct ofp13_table_features[])
+ * OFPMP13_TABLE_FEATURES_REPLY = 12, (struct ofp13_table_features[])
+ *
+ */
+
+enum ofp13_instruction_type {
+    OFPIT13_METER = 6           /* Apply meter (rate limiter) */
+};
+
+/* Instruction structure for OFPIT_METER */
+struct ofp13_instruction_meter {
+    ovs_be16 type;              /* OFPIT13_METER */
+    ovs_be16 len;               /* Length is 8. */
+    ovs_be32 meter_id;          /* Meter instance. */
+};
+OFP_ASSERT(sizeof(struct ofp13_instruction_meter) == 8);
+
+/* enum ofp_config_flags value OFPC_INVALID_TTL_TO_CONTROLLER
+ * is deprecated in OpenFlow 1.3 */
+
+/* Flags to configure the table. Reserved for future use. */
+enum ofp13_table_config {
+    OFPTC13_DEPRECATED_MASK = 3  /* Deprecated bits */
+};
+
+/* OpenFlow 1.3 specific flags for flow_mod messages. */
+enum ofp13_flow_mod_flags {
+    OFPFF13_NO_PKT_COUNTS = 1 << 3, /* Don't keep track of packet count. */
+    OFPFF13_NO_BYT_COUNTS = 1 << 4  /* Don't keep track of byte count. */
+};
+
+/* Common header for all meter bands */
+struct ofp13_meter_band_header {
+    ovs_be16 type;       /* One of OFPMBT_*. */
+    ovs_be16 len;        /* Length in bytes of this band. */
+    ovs_be32 rate;       /* Rate for this band. */
+    ovs_be32 burst_size; /* Size of bursts. */
+};
+OFP_ASSERT(sizeof(struct ofp13_meter_band_header) == 12);
+
+/* Meter configuration. OFPT_METER_MOD. */
+struct ofp13_meter_mod {
+    ovs_be16          command;      /* One of OFPMC_*. */
+    ovs_be16          flags;        /* Set of OFPMF_*. */
+    ovs_be32          meter_id;     /* Meter instance. */
+    /* struct ofp13_meter_band_header bands[0];  The bands length is inferred
+                                                 from the length field in the
+                                                 header. */
+};
+OFP_ASSERT(sizeof(struct ofp13_meter_mod) == 8);
+
+/* Meter numbering. Flow meters can use any number up to OFPM_MAX. */
+enum ofp13_meter {
+    /* Last usable meter. */
+    OFPM13_MAX        = 0xffff0000,
+    /* Virtual meters. */
+    OFPM13_SLOWPATH   = 0xfffffffd, /* Meter for slow datapath. */
+    OFPM13_CONTROLLER = 0xfffffffe, /* Meter for controller connection. */
+    OFPM13_ALL        = 0xffffffff, /* Represents all meters for stat requests
+                                     commands. */
+};
+
+/* Meter commands */
+enum ofp13_meter_mod_command {
+    OFPMC13_ADD,           /* New meter. */
+    OFPMC13_MODIFY,        /* Modify specified meter. */
+    OFPMC13_DELETE         /* Delete specified meter. */
+};
+
+/* Meter configuration flags */
+enum ofp13_meter_flags {
+    OFPMF13_KBPS    = 1 << 0,   /* Rate value in kb/s (kilo-bit per second). */
+    OFPMF13_PKTPS   = 1 << 1,   /* Rate value in packet/sec. */
+    OFPMF13_BURST   = 1 << 2,   /* Do burst size. */
+    OFPMF13_STATS   = 1 << 3    /* Collect statistics. */
+};
+
+/* Meter band types */
+enum ofp13_meter_band_type {
+    OFPMBT13_DROP         = 1,     /* Drop packet. */
+    OFPMBT13_DSCP_REMARK  = 2,     /* Remark DSCP in the IP header. */
+    OFPMBT13_EXPERIMENTER = 0xFFFF /* Experimenter meter band. */
+};
+
+/* OFPMBT_DROP band - drop packets */
+struct ofp13_meter_band_drop {
+    ovs_be16    type;        /* OFPMBT_DROP. */
+    ovs_be16    len;         /* Length in bytes of this band. */
+    ovs_be32    rate;        /* Rate for dropping packets. */
+    ovs_be32    burst_size;  /* Size of bursts. */
+    uint8_t     pad[4];
+};
+OFP_ASSERT(sizeof(struct ofp13_meter_band_drop) == 16);
+
+/* OFPMBT_DSCP_REMARK band - Remark DSCP in the IP header */
+struct ofp13_meter_band_dscp_remark {
+    ovs_be16    type;        /* OFPMBT_DSCP_REMARK. */
+    ovs_be16    len;         /* Length in bytes of this band. */
+    ovs_be32    rate;        /* Rate for remarking packets. */
+    ovs_be32    burst_size;  /* Size of bursts. */
+    uint8_t     prec_level;  /* Number of drop precedence level to add. */
+    uint8_t     pad[3];
+};
+OFP_ASSERT(sizeof(struct ofp13_meter_band_dscp_remark) == 16);
+
+/* OFPMBT_EXPERIMENTER band - Write actions in action set */
+struct ofp13_meter_band_experimenter {
+    ovs_be16    type;        /* OFPMBT_EXPERIMENTER. */
+    ovs_be16    len;         /* Length in bytes of this band. */
+    ovs_be32    rate;        /* Rate for dropping packets. */
+    ovs_be32    burst_size;  /* Size of bursts. */
+    ovs_be32    experimenter; /* Experimenter ID which takes the same form as
+                                 in struct ofp_experimenter_header. */
+};
+OFP_ASSERT(sizeof(struct ofp13_meter_band_experimenter) == 16);
+
+/* OF 1.3 adds MORE flag also for requests */
+enum ofp13_multipart_request_flags {
+    OFPMPF13_REQ_MORE = 1 << 0 /* More requests to follow. */
+};
+
+/* OF 1.3 splits table features off the ofp_table_stats */
+/* Body of reply to OFPMP13_TABLE request. */
+struct ofp13_table_stats {
+    uint8_t  table_id;      /* Identifier of table. Lower numbered tables are
+                               consulted first. */
+    uint8_t  pad[3];        /* Align to 32-bits. */
+    ovs_be32 active_count;  /* Number of active entries. */
+    ovs_be64 lookup_count;  /* Number of packets looked up in table. */
+    ovs_be64 matched_count; /* Number of packets that hit table. */
+};
+OFP_ASSERT(sizeof(struct ofp13_table_stats) == 24);
+
+/* Body for ofp_multipart_request of type OFPMP_TABLE_FEATURES./
+ * Body of reply to OFPMP_TABLE_FEATURES request. */
+struct ofp13_table_features {
+    ovs_be16 length;          /* Length is padded to 64 bits. */
+    uint8_t table_id;         /* Identifier of table. Lower numbered tables
+                                 are consulted first. */
+    uint8_t pad[5];           /* Align to 64-bits. */
+    char name[OFP_MAX_TABLE_NAME_LEN];
+    ovs_be64 metadata_match;  /* Bits of metadata table can match. */
+    ovs_be64 metadata_write;  /* Bits of metadata table can write. */
+
+    /* In OF1.3 this field was named 'config' and it was useless because OF1.3
+     * did not define any OFPTC_* bits.
+     *
+     * OF1.4 renamed this field to 'capabilities' and added OFPTC14_EVICTION
+     * and OFPTC14_VACANCY_EVENTS. */
+    ovs_be32 capabilities;    /* Bitmap of OFPTC_* values */
+
+    ovs_be32 max_entries;     /* Max number of entries supported. */
+
+    /* Table Feature Property list */
+    /* struct ofp13_table_feature_prop_header properties[0]; */
+};
+OFP_ASSERT(sizeof(struct ofp13_table_features) == 64);
+
+/* Table Feature property types.
+ * Low order bit cleared indicates a property for a regular Flow Entry.
+ * Low order bit set indicates a property for the Table-Miss Flow Entry. */
+enum ofp13_table_feature_prop_type {
+    OFPTFPT13_INSTRUCTIONS         = 0, /* Instructions property. */
+    OFPTFPT13_INSTRUCTIONS_MISS    = 1, /* Instructions for table-miss. */
+    OFPTFPT13_NEXT_TABLES          = 2, /* Next Table property. */
+    OFPTFPT13_NEXT_TABLES_MISS     = 3, /* Next Table for table-miss. */
+    OFPTFPT13_WRITE_ACTIONS        = 4, /* Write Actions property. */
+    OFPTFPT13_WRITE_ACTIONS_MISS   = 5, /* Write Actions for table-miss. */
+    OFPTFPT13_APPLY_ACTIONS        = 6, /* Apply Actions property. */
+    OFPTFPT13_APPLY_ACTIONS_MISS   = 7, /* Apply Actions for table-miss. */
+    OFPTFPT13_MATCH                = 8, /* Match property. */
+    OFPTFPT13_WILDCARDS            = 10, /* Wildcards property. */
+    OFPTFPT13_WRITE_SETFIELD       = 12, /* Write Set-Field property. */
+    OFPTFPT13_WRITE_SETFIELD_MISS  = 13, /* Write Set-Field for table-miss. */
+    OFPTFPT13_APPLY_SETFIELD       = 14, /* Apply Set-Field property. */
+    OFPTFPT13_APPLY_SETFIELD_MISS  = 15, /* Apply Set-Field for table-miss. */
+    OFPTFPT13_EXPERIMENTER         = 0xFFFE, /* Experimenter property. */
+    OFPTFPT13_EXPERIMENTER_MISS    = 0xFFFF, /* Experimenter for table-miss. */
+};
+
+/* Body of reply to OFPMP13_PORT request. If a counter is unsupported, set
+ * the field to all ones. */
+struct ofp13_port_stats {
+    struct ofp11_port_stats ps;
+    ovs_be32 duration_sec;    /* Time port has been alive in seconds. */
+    ovs_be32 duration_nsec;   /* Time port has been alive in nanoseconds
+                                 beyond duration_sec. */
+};
+OFP_ASSERT(sizeof(struct ofp13_port_stats) == 112);
+
+/* Body of reply to OFPMP13_QUEUE request */
+struct ofp13_queue_stats {
+    struct ofp11_queue_stats qs;
+    ovs_be32 duration_sec;    /* Time queue has been alive in seconds. */
+    ovs_be32 duration_nsec;   /* Time queue has been alive in nanoseconds
+                                 beyond duration_sec. */
+};
+OFP_ASSERT(sizeof(struct ofp13_queue_stats) == 40);
+
+/* Body of reply to OFPMP13_GROUP request */
+struct ofp13_group_stats {
+    struct ofp11_group_stats gs;
+    ovs_be32 duration_sec;    /* Time group has been alive in seconds. */
+    ovs_be32 duration_nsec;   /* Time group has been alive in nanoseconds
+                                 beyond duration_sec. */
+    /* struct ofp11_bucket_counter bucket_stats[]; */
+};
+OFP_ASSERT(sizeof(struct ofp13_group_stats) == 40);
+
+/* Body of OFPMP13_METER and OFPMP13_METER_CONFIG requests. */
+struct ofp13_meter_multipart_request {
+    ovs_be32 meter_id;  /* Meter instance, or OFPM_ALL. */
+    uint8_t pad[4];     /* Align to 64 bits. */
+};
+OFP_ASSERT(sizeof(struct ofp13_meter_multipart_request) == 8);
+
+/* Statistics for each meter band */
+struct ofp13_meter_band_stats {
+    ovs_be64    packet_band_count;      /* Number of packets in band. */
+    ovs_be64    byte_band_count;        /* Number of bytes in band. */
+};
+OFP_ASSERT(sizeof(struct ofp13_meter_band_stats) == 16);
+
+/* Body of reply to OFPMP13_METER request. Meter statistics. */
+struct ofp13_meter_stats {
+    ovs_be32  meter_id;          /* Meter instance. */
+    ovs_be16  len;               /* Length in bytes of this stats. */
+    uint8_t   pad[6];
+    ovs_be32  flow_count;        /* Number of flows bound to meter. */
+    ovs_be64  packet_in_count;   /* Number of packets in input. */
+    ovs_be64  byte_in_count;     /* Number of bytes in input. */
+    ovs_be32  duration_sec;      /* Time meter has been alive in seconds. */
+    ovs_be32  duration_nsec;     /* Time meter has been alive in nanoseconds
+                                    beyond duration_sec. */
+    struct ofp13_meter_band_stats band_stats[0];  /* The band_stats length is
+                                             inferred from the length field. */
+};
+OFP_ASSERT(sizeof(struct ofp13_meter_stats) == 40);
+
+/* Body of reply to OFPMP13_METER_CONFIG request. Meter configuration. */
+struct ofp13_meter_config {
+    ovs_be16          length;       /* Length of this entry. */
+    ovs_be16          flags;        /* Set of OFPMC_* that apply. */
+    ovs_be32          meter_id;     /* Meter instance. */
+    /* struct ofp13_meter_band_header bands[0];   The bands length is inferred
+                                               from the length field. */
+};
+OFP_ASSERT(sizeof(struct ofp13_meter_config) == 8);
+
+/* Body of reply to OFPMP13_METER_FEATURES request. Meter features. */
+struct ofp13_meter_features {
+    ovs_be32   max_meter;     /* Maximum number of meters. */
+    ovs_be32   band_types;    /* Bitmaps of OFPMBT13_* values supported. */
+    ovs_be32   capabilities;  /* Bitmaps of "ofp13_meter_flags". */
+    uint8_t    max_bands;     /* Maximum bands per meters */
+    uint8_t    max_color;     /* Maximum color value */
+    uint8_t    pad[2];
+};
+OFP_ASSERT(sizeof(struct ofp13_meter_features) == 16);
+
+/* Asynchronous message configuration. */
+/* The body of this is the same as nx_async_config */
+/* OFPT_GET_ASYNC_REPLY or OFPT_SET_ASYNC. */
+struct ofp13_async_config {
+    ovs_be32 packet_in_mask[2];   /* Bitmasks of OFPR_* values. */
+    ovs_be32 port_status_mask[2]; /* Bitmasks of OFPPR_* values. */
+    ovs_be32 flow_removed_mask[2];/* Bitmasks of OFPRR_* values. */
+};
+OFP_ASSERT(sizeof(struct ofp13_async_config) == 24);
+
+#endif /* openflow/openflow-1.3.h */
diff --git a/openflow/include/openflow/openflow-1.4.h b/openflow/include/openflow/openflow-1.4.h
new file mode 100644
index 0000000..fcebe4e
--- /dev/null
+++ b/openflow/include/openflow/openflow-1.4.h
@@ -0,0 +1,384 @@
+/* Copyright (c) 2008, 2014 The Board of Trustees of The Leland Stanford
+* Junior University
+* Copyright (c) 2011, 2012 Open Networking Foundation
+*
+* We are making the OpenFlow specification and associated documentation
+* (Software) available for public use and benefit with the expectation
+* that others will use, modify and enhance the Software and contribute
+* those enhancements back to the community. However, since we would
+* like to make the Software available for broadest use, with as few
+* restrictions as possible permission is hereby granted, free of
+* charge, to any person obtaining a copy of this Software to deal in
+* the Software under the copyrights without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*
+* The name and trademarks of copyright holder(s) may NOT be used in
+* advertising or publicity pertaining to the Software or any
+* derivatives without specific, written prior permission.
+*/
+
+/* OpenFlow: protocol between controller and datapath. */
+
+#ifndef OPENFLOW_14_H
+#define OPENFLOW_14_H 1
+
+#include <openflow/openflow-1.3.h>
+
+/* OpenFlow 1.4.1+ specific capabilities
+ * (struct ofp_switch_features, member capabilities). */
+enum ofp14_capabilities {
+    OFPC14_BUNDLES        = 1 << 9,    /* Switch supports bundles. */
+    OFPC14_FLOW_MONITORING = 1 << 10,  /* Switch supports flow monitoring. */
+};
+
+/* ## ---------- ## */
+/* ## ofp14_port ## */
+/* ## ---------- ## */
+
+/* Port description property types. */
+enum ofp_port_desc_prop_type {
+    OFPPDPT14_ETHERNET          = 0,      /* Ethernet property. */
+    OFPPDPT14_OPTICAL           = 1,      /* Optical property. */
+    OFPPDPT14_EXPERIMENTER      = 0xFFFF, /* Experimenter property. */
+};
+
+/* Ethernet port description property. */
+struct ofp14_port_desc_prop_ethernet {
+    ovs_be16         type;    /* OFPPDPT14_ETHERNET. */
+    ovs_be16         length;  /* Length in bytes of this property. */
+    uint8_t          pad[4];  /* Align to 64 bits. */
+    /* Bitmaps of OFPPF_* that describe features.  All bits zeroed if
+     * unsupported or unavailable. */
+    ovs_be32 curr;          /* Current features. */
+    ovs_be32 advertised;    /* Features being advertised by the port. */
+    ovs_be32 supported;     /* Features supported by the port. */
+    ovs_be32 peer;          /* Features advertised by peer. */
+
+    ovs_be32 curr_speed;    /* Current port bitrate in kbps. */
+    ovs_be32 max_speed;     /* Max port bitrate in kbps */
+};
+OFP_ASSERT(sizeof(struct ofp14_port_desc_prop_ethernet) == 32);
+
+struct ofp14_port {
+    ovs_be32 port_no;
+    ovs_be16 length;
+    uint8_t pad[2];
+    struct eth_addr hw_addr;
+    uint8_t pad2[2];                  /* Align to 64 bits. */
+    char name[OFP_MAX_PORT_NAME_LEN]; /* Null-terminated */
+
+    ovs_be32 config;        /* Bitmap of OFPPC_* flags. */
+    ovs_be32 state;         /* Bitmap of OFPPS_* flags. */
+
+    /* Followed by 0 or more OFPPDPT14_* properties. */
+};
+OFP_ASSERT(sizeof(struct ofp14_port) == 40);
+
+
+/* ## -------------- ## */
+/* ## ofp14_port_mod ## */
+/* ## -------------- ## */
+
+enum ofp14_port_mod_prop_type {
+    OFPPMPT14_ETHERNET          = 0,      /* Ethernet property. */
+    OFPPMPT14_OPTICAL           = 1,      /* Optical property. */
+    OFPPMPT14_EXPERIMENTER      = 0xFFFF, /* Experimenter property. */
+};
+
+struct ofp14_port_mod {
+    ovs_be32 port_no;
+    uint8_t pad[4];
+    struct eth_addr hw_addr;
+    uint8_t pad2[2];
+    ovs_be32 config;        /* Bitmap of OFPPC_* flags. */
+    ovs_be32 mask;          /* Bitmap of OFPPC_* flags to be changed. */
+    /* Followed by 0 or more OFPPMPT14_* properties. */
+};
+OFP_ASSERT(sizeof(struct ofp14_port_mod) == 24);
+
+/* ## --------------- ## */
+/* ## ofp14_table_mod ## */
+/* ## --------------- ## */
+
+enum ofp14_table_mod_prop_type {
+    OFPTMPT14_EVICTION               = 0x2,    /* Eviction property. */
+    OFPTMPT14_VACANCY                = 0x3,    /* Vacancy property. */
+    OFPTMPT14_EXPERIMENTER           = 0xFFFF, /* Experimenter property. */
+};
+
+enum ofp14_table_mod_prop_eviction_flag {
+    OFPTMPEF14_OTHER           = 1 << 0,     /* Using other factors. */
+    OFPTMPEF14_IMPORTANCE      = 1 << 1,     /* Using flow entry importance. */
+    OFPTMPEF14_LIFETIME        = 1 << 2,     /* Using flow entry lifetime. */
+};
+
+/* What changed about the table */
+enum ofp14_table_reason {
+    OFPTR_VACANCY_DOWN = 3,    /* Vacancy down threshold event. */
+    OFPTR_VACANCY_UP   = 4,    /* Vacancy up threshold event. */
+#define OFPTR_BITS ((1u << OFPTR_VACANCY_DOWN) | (1u << OFPTR_VACANCY_UP))
+};
+
+struct ofp14_table_mod_prop_vacancy {
+    ovs_be16         type;   /* OFPTMPT14_VACANCY. */
+    ovs_be16         length; /* Length in bytes of this property. */
+    uint8_t vacancy_down;    /* Vacancy threshold when space decreases (%). */
+    uint8_t vacancy_up;      /* Vacancy threshold when space increases (%). */
+    uint8_t vacancy;      /* Current vacancy (%) - only in ofp14_table_desc. */
+    uint8_t pad[1];          /* Align to 64 bits. */
+};
+OFP_ASSERT(sizeof(struct ofp14_table_mod_prop_vacancy) == 8);
+
+struct ofp14_table_mod {
+    uint8_t table_id;     /* ID of the table, OFPTT_ALL indicates all tables */
+    uint8_t pad[3];         /* Pad to 32 bits */
+    ovs_be32 config;        /* Bitmap of OFPTC_* flags */
+    /* Followed by 0 or more OFPTMPT14_* properties. */
+};
+OFP_ASSERT(sizeof(struct ofp14_table_mod) == 8);
+
+/* Body of reply to OFPMP_TABLE_DESC request. */
+struct ofp14_table_desc {
+    ovs_be16 length;       /* Length is padded to 64 bits. */
+    uint8_t table_id;      /* Identifier of table. Lower numbered tables
+                              are consulted first. */
+    uint8_t pad[1];        /* Align to 32-bits. */
+    ovs_be32 config;       /* Bitmap of OFPTC_* values. */
+    /* Followed by 0 or more OFPTMPT14_* properties. */
+};
+OFP_ASSERT(sizeof(struct ofp14_table_desc) == 8);
+
+/* A table config has changed in the datapath */
+struct ofp14_table_status {
+    uint8_t reason;    /* One of OFPTR_*. */
+    uint8_t pad[7];    /* Pad to 64 bits */
+    /* Followed by struct ofp14_table_desc */
+};
+OFP_ASSERT(sizeof(struct ofp14_table_status) == 8);
+
+/* ## ---------------- ## */
+/* ## ofp14_port_stats ## */
+/* ## ---------------- ## */
+
+enum ofp14_port_stats_prop_type {
+    OFPPSPT14_ETHERNET          = 0,      /* Ethernet property. */
+    OFPPSPT14_OPTICAL           = 1,      /* Optical property. */
+    OFPPSPT14_EXPERIMENTER      = 0xFFFF, /* Experimenter property. */
+};
+
+struct ofp14_port_stats_prop_ethernet {
+    ovs_be16         type;    /* OFPPSPT14_ETHERNET. */
+    ovs_be16         length;  /* Length in bytes of this property. */
+    uint8_t          pad[4];  /* Align to 64 bits. */
+
+    ovs_be64 rx_frame_err;   /* Number of frame alignment errors. */
+    ovs_be64 rx_over_err;    /* Number of packets with RX overrun. */
+    ovs_be64 rx_crc_err;     /* Number of CRC errors. */
+    ovs_be64 collisions;     /* Number of collisions. */
+};
+OFP_ASSERT(sizeof(struct ofp14_port_stats_prop_ethernet) == 40);
+
+struct ofp14_port_stats {
+    ovs_be16 length;         /* Length of this entry. */
+    uint8_t pad[2];          /* Align to 64 bits. */
+    ovs_be32 port_no;
+    ovs_be32 duration_sec;   /* Time port has been alive in seconds. */
+    ovs_be32 duration_nsec;  /* Time port has been alive in nanoseconds beyond
+                                duration_sec. */
+    ovs_be64 rx_packets;     /* Number of received packets. */
+    ovs_be64 tx_packets;     /* Number of transmitted packets. */
+    ovs_be64 rx_bytes;       /* Number of received bytes. */
+    ovs_be64 tx_bytes;       /* Number of transmitted bytes. */
+
+    ovs_be64 rx_dropped;     /* Number of packets dropped by RX. */
+    ovs_be64 tx_dropped;     /* Number of packets dropped by TX. */
+    ovs_be64 rx_errors;      /* Number of receive errors.  This is a super-set
+                                of more specific receive errors and should be
+                                greater than or equal to the sum of all
+                                rx_*_err values in properties. */
+    ovs_be64 tx_errors;      /* Number of transmit errors.  This is a super-set
+                                of more specific transmit errors and should be
+                                greater than or equal to the sum of all
+                                tx_*_err values (none currently defined.) */
+    /* Followed by 0 or more OFPPSPT14_* properties. */
+};
+OFP_ASSERT(sizeof(struct ofp14_port_stats) == 80);
+
+
+/* ## ----------------- ## */
+/* ## ofp14_queue_stats ## */
+/* ## ----------------- ## */
+
+struct ofp14_queue_stats {
+    ovs_be16 length;         /* Length of this entry. */
+    uint8_t pad[6];          /* Align to 64 bits. */
+    struct ofp13_queue_stats qs;
+    /* Followed by 0 or more properties (none yet defined). */
+};
+OFP_ASSERT(sizeof(struct ofp14_queue_stats) == 48);
+
+
+/* ## ---------------- ## */
+/* ## ofp14_queue_desc ## */
+/* ## ---------------- ## */
+
+struct ofp14_queue_desc_request {
+    ovs_be32 port;              /* All ports if OFPP_ANY. */
+    ovs_be32 queue;             /* All queues if OFPQ_ALL. */
+};
+OFP_ASSERT(sizeof(struct ofp14_queue_desc_request) == 8);
+
+/* Body of reply to OFPMP_QUEUE_DESC request. */
+struct ofp14_queue_desc {
+    ovs_be32 port_no;           /* Port this queue is attached to. */
+    ovs_be32 queue_id;          /* ID for the specific queue. */
+    ovs_be16 len;               /* Length in bytes of this queue desc. */
+    uint8_t pad[6];             /* 64-bit alignment. */
+};
+OFP_ASSERT(sizeof(struct ofp14_queue_desc) == 16);
+
+enum ofp14_queue_desc_prop_type {
+    OFPQDPT14_MIN_RATE = 1,
+    OFPQDPT14_MAX_RATE = 2,
+    OFPQDPT14_EXPERIMENTER = 0xffff
+};
+
+/* ## -------------- ## */
+/* ## Miscellaneous. ## */
+/* ## -------------- ## */
+
+/* Request forward reason */
+enum ofp14_requestforward_reason {
+    OFPRFR_GROUP_MOD = 0,      /* Forward group mod requests. */
+    OFPRFR_METER_MOD = 1,      /* Forward meter mod requests. */
+    OFPRFR_N_REASONS           /* Denotes number of reasons. */
+};
+
+/* Role status event message. */
+struct ofp14_role_status {
+    ovs_be32 role;              /* One of OFPCR_ROLE_*. */
+    uint8_t  reason;            /* One of OFPCRR_*. */
+    uint8_t  pad[3];            /* Align to 64 bits. */
+    ovs_be64 generation_id;     /* Master Election Generation Id */
+
+    /* Followed by a list of struct ofp14_role_prop_header */
+};
+OFP_ASSERT(sizeof(struct ofp14_role_status) == 16);
+
+/* What changed about the controller role */
+enum ofp14_controller_role_reason {
+    OFPCRR_MASTER_REQUEST = 0,  /* Another controller asked to be master. */
+    OFPCRR_CONFIG         = 1,  /* Configuration changed on the switch. */
+    OFPCRR_EXPERIMENTER   = 2,  /* Experimenter data changed. */
+    OFPCRR_N_REASONS            /* Denotes number of reasons. */
+};
+
+/* Role property types.
+*/
+enum ofp14_role_prop_type {
+    OFPRPT_EXPERIMENTER         = 0xFFFF, /* Experimenter property. */
+};
+
+/* Group/Meter request forwarding. */
+struct ofp14_requestforward {
+    struct ofp_header request;  /* Request being forwarded. */
+};
+OFP_ASSERT(sizeof(struct ofp14_requestforward) == 8);
+
+/* Bundle control message types */
+enum ofp14_bundle_ctrl_type {
+    OFPBCT_OPEN_REQUEST    = 0,
+    OFPBCT_OPEN_REPLY      = 1,
+    OFPBCT_CLOSE_REQUEST   = 2,
+    OFPBCT_CLOSE_REPLY     = 3,
+    OFPBCT_COMMIT_REQUEST  = 4,
+    OFPBCT_COMMIT_REPLY    = 5,
+    OFPBCT_DISCARD_REQUEST = 6,
+    OFPBCT_DISCARD_REPLY   = 7,
+};
+
+/* Bundle configuration flags. */
+enum ofp14_bundle_flags {
+    OFPBF_ATOMIC  = 1 << 0,  /* Execute atomically. */
+    OFPBF_ORDERED = 1 << 1,  /* Execute in specified order. */
+};
+
+/* Message structure for OFPT_BUNDLE_CONTROL and OFPT_BUNDLE_ADD_MESSAGE. */
+struct ofp14_bundle_ctrl_msg {
+    ovs_be32 bundle_id;     /* Identify the bundle. */
+    ovs_be16 type;          /* OFPT_BUNDLE_CONTROL: one of OFPBCT_*.
+                             * OFPT_BUNDLE_ADD_MESSAGE: not used. */
+    ovs_be16 flags;         /* Bitmap of OFPBF_* flags. */
+    /* Followed by:
+     * - For OFPT_BUNDLE_ADD_MESSAGE only, an encapsulated OpenFlow message,
+     *   beginning with an ofp_header whose xid is identical to this message's
+     *   outer xid.
+     * - For OFPT_BUNDLE_ADD_MESSAGE only, and only if at least one property is
+     *   present, 0 to 7 bytes of padding to align on a 64-bit boundary.
+     * - Zero or more properties (see struct ofp14_bundle_prop_header). */
+};
+OFP_ASSERT(sizeof(struct ofp14_bundle_ctrl_msg) == 8);
+
+/* Body for ofp14_multipart_request of type OFPMP_FLOW_MONITOR.
+ *
+ * The OFPMP_FLOW_MONITOR request's body consists of an array of zero or more
+ * instances of this structure. The request arranges to monitor the flows
+ * that match the specified criteria, which are interpreted in the same way as
+ * for OFPMP_FLOW.
+ *
+ * 'id' identifies a particular monitor for the purpose of allowing it to be
+ * canceled later with OFPFMC_DELETE. 'id' must be unique among
+ * existing monitors that have not already been canceled.
+ */
+struct ofp14_flow_monitor_request {
+    ovs_be32 monitor_id;        /* Controller-assigned ID for this monitor. */
+    ovs_be32 out_port;          /* Required output port, if not OFPP_ANY. */
+    ovs_be32 out_group;         /* Required output port, if not OFPG_ANY. */
+    ovs_be16 flags;             /* OFPMF14_*. */
+    uint8_t table_id;           /* One table's ID or OFPTT_ALL (all tables). */
+    uint8_t command;            /* One of OFPFMC14_*. */
+    /* Followed by an ofp11_match structure. */
+};
+OFP_ASSERT(sizeof(struct ofp14_flow_monitor_request) == 16);
+
+/* Flow monitor commands */
+enum ofp14_flow_monitor_command {
+    OFPFMC14_ADD = 0, /* New flow monitor. */
+    OFPFMC14_MODIFY = 1, /* Modify existing flow monitor. */
+    OFPFMC14_DELETE = 2, /* Delete/cancel existing flow monitor. */
+};
+
+/* 'flags' bits in struct of_flow_monitor_request. */
+enum ofp14_flow_monitor_flags {
+    /* When to send updates. */
+    /* Common to NX and OpenFlow 1.4 */
+    OFPFMF14_INITIAL = 1 << 0,     /* Initially matching flows. */
+    OFPFMF14_ADD = 1 << 1,         /* New matching flows as they are added. */
+    OFPFMF14_REMOVED = 1 << 2,     /* Old matching flows as they are removed. */
+    OFPFMF14_MODIFY = 1 << 3,      /* Matching flows as they are changed. */
+
+    /* What to include in updates. */
+    /* Common to NX and OpenFlow 1.4 */
+    OFPFMF14_INSTRUCTIONS = 1 << 4, /* If set, instructions are included. */
+    OFPFMF14_NO_ABBREV = 1 << 5,    /* If set, include own changes in full. */
+    /* OpenFlow 1.4 */
+    OFPFMF14_ONLY_OWN = 1 << 6,     /* If set, don't include other controllers.
+                                     */
+};
+
+#endif /* openflow/openflow-1.4.h */
diff --git a/openflow/include/openflow/openflow-1.5.h b/openflow/include/openflow/openflow-1.5.h
new file mode 100644
index 0000000..3649e6c
--- /dev/null
+++ b/openflow/include/openflow/openflow-1.5.h
@@ -0,0 +1,153 @@
+/* Copyright (c) 2008, 2014 The Board of Trustees of The Leland Stanford
+* Junior University
+* Copyright (c) 2011, 2014 Open Networking Foundation
+*
+* We are making the OpenFlow specification and associated documentation
+* (Software) available for public use and benefit with the expectation
+* that others will use, modify and enhance the Software and contribute
+* those enhancements back to the community. However, since we would
+* like to make the Software available for broadest use, with as few
+* restrictions as possible permission is hereby granted, free of
+* charge, to any person obtaining a copy of this Software to deal in
+* the Software under the copyrights without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*
+* The name and trademarks of copyright holder(s) may NOT be used in
+* advertising or publicity pertaining to the Software or any
+* derivatives without specific, written prior permission.
+*/
+
+/* OpenFlow: protocol between controller and datapath. */
+
+#ifndef OPENFLOW_15_H
+#define OPENFLOW_15_H 1
+
+#include <openflow/openflow-common.h>
+
+/* Body for ofp15_multipart_request of type OFPMP_PORT_DESC. */
+struct ofp15_port_desc_request {
+    ovs_be32 port_no;         /* All ports if OFPP_ANY. */
+    uint8_t pad[4];            /* Align to 64 bits. */
+};
+OFP_ASSERT(sizeof(struct ofp15_port_desc_request) == 8);
+
+/* Group commands */
+enum ofp15_group_mod_command {
+    /* Present since OpenFlow 1.1 - 1.4 */
+    OFPGC15_ADD    = 0,       /* New group. */
+    OFPGC15_MODIFY = 1,       /* Modify all matching groups. */
+    OFPGC15_DELETE = 2,       /* Delete all matching groups. */
+
+    /* New in OpenFlow 1.5 */
+    OFPGC15_INSERT_BUCKET = 3,/* Insert action buckets to the already available
+                                 list of action buckets in a matching group */
+    /* OFPGCXX_YYY = 4, */    /* Reserved for future use. */
+    OFPGC15_REMOVE_BUCKET = 5,/* Remove all action buckets or any specific
+                                 action bucket from matching group */
+    OFPGC15_ADD_OR_MOD = 0x8000, /* Create new or modify existing group. */
+};
+
+/* Group bucket property types.  */
+enum ofp15_group_bucket_prop_type {
+    OFPGBPT15_WEIGHT                 = 0,  /* Select groups only. */
+    OFPGBPT15_WATCH_PORT             = 1,  /* Fast failover groups only. */
+    OFPGBPT15_WATCH_GROUP            = 2,  /* Fast failover groups only. */
+    OFPGBPT15_EXPERIMENTER      = 0xFFFF,  /* Experimenter defined. */
+};
+
+/* Bucket for use in groups. */
+struct ofp15_bucket {
+    ovs_be16 len;                   /* Length the bucket in bytes, including
+                                       this header and any padding to make it
+                                       64-bit aligned. */
+    ovs_be16 action_array_len;      /* Length of all actions in bytes. */
+    ovs_be32 bucket_id;             /* Bucket Id used to identify bucket*/
+    /* Followed by exactly len - 8 bytes of group bucket properties. */
+    /* Followed by:
+     *   - Exactly 'action_array_len' bytes containing an array of
+     *     struct ofp_action_*.
+     *   - Zero or more bytes of group bucket properties to fill out the
+     *     overall length in header.length. */
+};
+OFP_ASSERT(sizeof(struct ofp15_bucket) == 8);
+
+/* Bucket Id can be any value between 0 and OFPG_BUCKET_MAX */
+enum ofp15_group_bucket {
+    OFPG15_BUCKET_MAX   = 0xffffff00, /* Last usable bucket ID */
+    OFPG15_BUCKET_FIRST = 0xfffffffd, /* First bucket ID in the list of action
+                                         buckets of a group. This is applicable
+                                         for OFPGC15_INSERT_BUCKET and
+                                         OFPGC15_REMOVE_BUCKET commands */
+    OFPG15_BUCKET_LAST  = 0xfffffffe, /* Last bucket ID in the list of action
+                                         buckets of a group. This is applicable
+                                         for OFPGC15_INSERT_BUCKET and
+                                         OFPGC15_REMOVE_BUCKET commands */
+    OFPG15_BUCKET_ALL   = 0xffffffff  /* All action buckets in a group,
+                                         This is applicable for
+                                         only OFPGC15_REMOVE_BUCKET command */
+};
+
+/* Group property types.  */
+enum ofp_group_prop_type {
+    OFPGPT15_EXPERIMENTER      = 0xFFFF,  /* Experimenter defined. */
+};
+
+/* Group setup and teardown (controller -> datapath). */
+struct ofp15_group_mod {
+    ovs_be16 command;             /* One of OFPGC15_*. */
+    uint8_t type;                 /* One of OFPGT11_*. */
+    uint8_t pad;                  /* Pad to 64 bits. */
+    ovs_be32 group_id;            /* Group identifier. */
+    ovs_be16 bucket_array_len;    /* Length of action buckets data. */
+    uint8_t pad1[2];              /* Pad to 64 bits. */
+    ovs_be32 command_bucket_id;   /* Bucket Id used as part of
+                                   * OFPGC15_INSERT_BUCKET and
+                                   * OFPGC15_REMOVE_BUCKET commands
+                                   * execution.*/
+    /* Followed by:
+     *   - Exactly 'bucket_array_len' bytes containing an array of
+     *     struct ofp15_bucket.
+     *   - Zero or more bytes of group properties to fill out the overall
+     *     length in header.length. */
+};
+OFP_ASSERT(sizeof(struct ofp15_group_mod) == 16);
+
+/* Body for ofp15_multipart_request of type OFPMP_GROUP_DESC. */
+struct ofp15_group_desc_request {
+    ovs_be32 group_id;         /* All groups if OFPG_ALL. */
+    uint8_t pad[4];            /* Align to 64 bits. */
+};
+OFP_ASSERT(sizeof(struct ofp15_group_desc_request) == 8);
+
+/* Body of reply to OFPMP_GROUP_DESC request. */
+struct ofp15_group_desc_stats {
+    ovs_be16 length;              /* Length of this entry. */
+    uint8_t type;                 /* One of OFPGT11_*. */
+    uint8_t pad;                  /* Pad to 64 bits. */
+    ovs_be32 group_id;            /* Group identifier. */
+    ovs_be16 bucket_list_len;     /* Length of action buckets data. */
+    uint8_t pad2[6];              /* Pad to 64 bits. */
+    /* Followed by:
+     *   - Exactly 'bucket_list_len' bytes containing an array of
+     *     struct ofp_bucket.
+     *   - Zero or more bytes of group properties to fill out the overall
+     *     length in header.length. */
+};
+OFP_ASSERT(sizeof(struct ofp15_group_desc_stats) == 16);
+
+#endif /* openflow/openflow-1.5.h */
diff --git a/openflow/include/openflow/openflow-common.h b/openflow/include/openflow/openflow-common.h
new file mode 100644
index 0000000..7b619a9
--- /dev/null
+++ b/openflow/include/openflow/openflow-common.h
@@ -0,0 +1,457 @@
+/* Copyright (c) 2008, 2011, 2012, 2013, 2014, 2016 The Board of Trustees of The Leland Stanford
+ * Junior University
+ *
+ * We are making the OpenFlow specification and associated documentation
+ * (Software) available for public use and benefit with the expectation
+ * that others will use, modify and enhance the Software and contribute
+ * those enhancements back to the community. However, since we would
+ * like to make the Software available for broadest use, with as few
+ * restrictions as possible permission is hereby granted, free of
+ * charge, to any person obtaining a copy of this Software to deal in
+ * the Software under the copyrights without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * The name and trademarks of copyright holder(s) may NOT be used in
+ * advertising or publicity pertaining to the Software or any
+ * derivatives without specific, written prior permission.
+ */
+
+/*
+ * Copyright (c) 2008-2015 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENFLOW_COMMON_H
+#define OPENFLOW_COMMON_H 1
+
+#include <openvswitch/types.h>
+
+#ifdef SWIG
+#define OFP_ASSERT(EXPR)        /* SWIG can't handle OFP_ASSERT. */
+#elif !defined(__cplusplus)
+/* Build-time assertion for use in a declaration context. */
+#define OFP_ASSERT(EXPR)                                                \
+        extern int (*build_assert(void))[ sizeof(struct {               \
+                    unsigned int build_assert_failed : (EXPR) ? 1 : -1; })]
+#else /* __cplusplus */
+#include <boost/static_assert.hpp>
+#define OFP_ASSERT BOOST_STATIC_ASSERT
+#endif /* __cplusplus */
+
+/* Version number:
+ * Non-experimental versions released: 0x01 0x02
+ * Experimental versions released: 0x81 -- 0x99
+ */
+/* The most significant bit being set in the version field indicates an
+ * experimental OpenFlow version.
+ */
+enum ofp_version {
+    OFP10_VERSION = 0x01,
+    OFP11_VERSION = 0x02,
+    OFP12_VERSION = 0x03,
+    OFP13_VERSION = 0x04,
+    OFP14_VERSION = 0x05,
+    OFP15_VERSION = 0x06,
+    OFP16_VERSION = 0x07
+};
+
+/* Vendor (aka experimenter) IDs.
+ *
+ * These are used in various places in OpenFlow to identify an extension
+ * defined by some vendor, as opposed to a standardized part of the core
+ * OpenFlow protocol.
+ *
+ * Vendor IDs whose top 8 bits are 0 hold an Ethernet OUI in their low 24 bits.
+ * The Open Networking Foundation assigns vendor IDs whose top 8 bits are
+ * nonzero.
+ *
+ * A few vendor IDs are special:
+ *
+ *    - OF_VENDOR_ID is not a real vendor ID and does not appear in the
+ *      OpenFlow protocol itself.  It can occasionally be useful within Open
+ *      vSwitch to identify a standardized part of OpenFlow.
+ *
+ *    - ONF_VENDOR_ID is being used within the ONF "extensibility" working
+ *      group to identify extensions being proposed for standardization.
+ *
+ * The list is sorted numerically.
+ */
+#define OF_VENDOR_ID    0
+#define HPL_VENDOR_ID   0x000004EA /* HP Labs. */
+#define NTR_VENDOR_ID   0x0000154d /* Netronome. */
+#define NTR_COMPAT_VENDOR_ID   0x00001540 /* Incorrect value used in v2.4. */
+#define NX_VENDOR_ID    0x00002320 /* Nicira. */
+#define ONF_VENDOR_ID   0x4f4e4600 /* Open Networking Foundation. */
+#define INTEL_VENDOR_ID 0x0000AA01 /* Intel */
+
+#define OFP_MAX_TABLE_NAME_LEN 32
+#define OFP_MAX_PORT_NAME_LEN  16
+
+#define OFP_OLD_PORT  6633
+#define OFP_PORT  6653
+
+#define OFP_DEFAULT_MISS_SEND_LEN   128
+
+/* Values below this cutoff are 802.3 packets and the two bytes
+ * following MAC addresses are used as a frame length.  Otherwise, the
+ * two bytes are used as the Ethernet type.
+ */
+#define OFP_DL_TYPE_ETH2_CUTOFF   0x0600
+
+/* Value of dl_type to indicate that the frame does not include an
+ * Ethernet type.
+ */
+#define OFP_DL_TYPE_NOT_ETH_TYPE  0x05ff
+
+/* Value used in "idle_timeout" and "hard_timeout" to indicate that the entry
+ * is permanent. */
+#define OFP_FLOW_PERMANENT 0
+
+/* By default, choose a priority in the middle. */
+#define OFP_DEFAULT_PRIORITY 0x8000
+
+
+/* Header on all OpenFlow packets. */
+struct ofp_header {
+    uint8_t version;    /* An OpenFlow version number, e.g. OFP10_VERSION. */
+    uint8_t type;       /* One of the OFPT_ constants. */
+    ovs_be16 length;    /* Length including this ofp_header. */
+    ovs_be32 xid;       /* Transaction id associated with this packet.
+                           Replies use the same id as was in the request
+                           to facilitate pairing. */
+};
+OFP_ASSERT(sizeof(struct ofp_header) == 8);
+
+/* OFPT_ERROR: Error message (datapath -> controller). */
+struct ofp_error_msg {
+    ovs_be16 type;
+    ovs_be16 code;
+    uint8_t data[0];          /* Variable-length data.  Interpreted based
+                                 on the type and code. */
+};
+OFP_ASSERT(sizeof(struct ofp_error_msg) == 4);
+
+enum ofp_config_flags {
+    /* Handling of IP fragments. */
+    OFPC_FRAG_NORMAL   = 0,  /* No special handling for fragments. */
+    OFPC_FRAG_DROP     = 1,  /* Drop fragments. */
+    OFPC_FRAG_REASM    = 2,  /* Reassemble (only if OFPC_IP_REASM set). */
+    OFPC_FRAG_NX_MATCH = 3,  /* Make first fragments available for matching. */
+    OFPC_FRAG_MASK     = 3,
+
+    /* OFPC_INVALID_TTL_TO_CONTROLLER is deprecated in OpenFlow 1.3 */
+
+    /* TTL processing - applicable for IP and MPLS packets. */
+    OFPC_INVALID_TTL_TO_CONTROLLER = 1 << 2, /* Send packets with invalid TTL
+                                                to the controller. */
+};
+
+/* Switch configuration. */
+struct ofp_switch_config {
+    ovs_be16 flags;             /* OFPC_* flags. */
+    ovs_be16 miss_send_len;     /* Max bytes of new flow that datapath should
+                                   send to the controller. */
+};
+OFP_ASSERT(sizeof(struct ofp_switch_config) == 4);
+
+
+/* Common flags to indicate behavior of the physical port.  These flags are
+ * used in ofp_port to describe the current configuration.  They are used in
+ * the ofp_port_mod message to configure the port's behavior.
+ */
+enum ofp_port_config {
+    OFPPC_PORT_DOWN    = 1 << 0,  /* Port is administratively down. */
+
+    OFPPC_NO_RECV      = 1 << 2,  /* Drop all packets received by port. */
+    OFPPC_NO_FWD       = 1 << 5,  /* Drop packets forwarded to port. */
+    OFPPC_NO_PACKET_IN = 1 << 6   /* Do not send packet-in msgs for port. */
+};
+
+/* Common current state of the physical port.  These are not configurable from
+ * the controller.
+ */
+enum ofp_port_state {
+    OFPPS_LINK_DOWN    = 1 << 0,  /* No physical link present. */
+};
+
+/* Common features of physical ports available in a datapath. */
+enum ofp_port_features {
+    OFPPF_10MB_HD    = 1 << 0,  /* 10 Mb half-duplex rate support. */
+    OFPPF_10MB_FD    = 1 << 1,  /* 10 Mb full-duplex rate support. */
+    OFPPF_100MB_HD   = 1 << 2,  /* 100 Mb half-duplex rate support. */
+    OFPPF_100MB_FD   = 1 << 3,  /* 100 Mb full-duplex rate support. */
+    OFPPF_1GB_HD     = 1 << 4,  /* 1 Gb half-duplex rate support. */
+    OFPPF_1GB_FD     = 1 << 5,  /* 1 Gb full-duplex rate support. */
+    OFPPF_10GB_FD    = 1 << 6,  /* 10 Gb full-duplex rate support. */
+};
+
+/* Generic OpenFlow property header, as used by various messages in OF1.3+, and
+ * especially in OF1.4.
+ *
+ * The OpenFlow specs prefer to define a new structure with a specialized name
+ * each time this property structure comes up: struct
+ * ofp_port_desc_prop_header, struct ofp_controller_status_prop_header, struct
+ * ofp_table_mod_prop_header, and more.  They're all the same, so it's easier
+ * to unify them.
+ */
+struct ofp_prop_header {
+    ovs_be16 type;
+    ovs_be16 len;
+    /* Followed by:
+     *     - 'len - 4' bytes of payload.
+     *     - PAD_SIZE(len, 8) bytes of zeros. */
+};
+OFP_ASSERT(sizeof(struct ofp_prop_header) == 4);
+
+/* Generic OpenFlow experimenter property header.
+ *
+ * Again the OpenFlow specs define this over and over again and it's easier to
+ * unify them. */
+struct ofp_prop_experimenter {
+    ovs_be16 type;          /* Generally 0xffff (in one case 0xfffe). */
+    ovs_be16 len;           /* Length in bytes of this property. */
+    ovs_be32 experimenter;  /* Experimenter ID which takes the same form as
+                             * in struct ofp_experimenter_header. */
+    ovs_be32 exp_type;      /* Experimenter defined. */
+    /* Followed by:
+     *     - 'len - 12' bytes of payload.
+     *     - PAD_SIZE(len, 8) bytes of zeros. */
+};
+OFP_ASSERT(sizeof(struct ofp_prop_experimenter) == 12);
+
+/* Switch features. */
+struct ofp_switch_features {
+    ovs_be64 datapath_id;   /* Datapath unique ID.  The lower 48-bits are for
+                               a MAC address, while the upper 16-bits are
+                               implementer-defined. */
+
+    ovs_be32 n_buffers;     /* Max packets buffered at once. */
+
+    uint8_t n_tables;       /* Number of tables supported by datapath. */
+    uint8_t auxiliary_id;   /* OF 1.3: Identify auxiliary connections */
+    uint8_t pad[2];         /* Align to 64-bits. */
+
+    /* Features. */
+    ovs_be32 capabilities;  /* OFPC_*, OFPC10_*, OFPC11_*, OFPC12_*. */
+    ovs_be32 actions;       /* Bitmap of supported "ofp_action_type"s.
+                             * DEPRECATED in OpenFlow 1.1 */
+
+    /* Followed by an array of struct ofp10_phy_port or struct ofp11_port
+     * structures.  The number is inferred from header.length.
+     * REMOVED in OpenFlow 1.3 */
+};
+OFP_ASSERT(sizeof(struct ofp_switch_features) == 24);
+
+/* Common capabilities supported by the datapath (struct ofp_switch_features,
+ * member capabilities). */
+enum ofp_capabilities {
+    OFPC_FLOW_STATS     = 1 << 0,  /* Flow statistics. */
+    OFPC_TABLE_STATS    = 1 << 1,  /* Table statistics. */
+    OFPC_PORT_STATS     = 1 << 2,  /* Port statistics. */
+    OFPC_IP_REASM       = 1 << 5,  /* Can reassemble IP fragments. */
+    OFPC_QUEUE_STATS    = 1 << 6,  /* Queue statistics. */
+    OFPC_ARP_MATCH_IP   = 1 << 7   /* Match IP addresses in ARP
+                                      pkts. */
+};
+
+/* Why is this packet being sent to the controller? */
+enum ofp_packet_in_reason {
+    /* Standard reasons. */
+    OFPR_NO_MATCH,          /* No matching flow. */
+    OFPR_ACTION,            /* Action explicitly output to controller. */
+    OFPR_INVALID_TTL,       /* Packet has invalid TTL. */
+    OFPR_ACTION_SET,        /* Output to controller in action set */
+    OFPR_GROUP,             /* Output to controller in group bucket */
+    OFPR_PACKET_OUT,        /* Output to controller in packet-out */
+
+#define OFPR10_BITS                                                     \
+    ((1u << OFPR_NO_MATCH) | (1u << OFPR_ACTION) | (1u << OFPR_INVALID_TTL))
+#define OFPR14_BITS                                                     \
+    (OFPR10_BITS |                                                      \
+     (1u << OFPR_ACTION_SET) | (1u << OFPR_GROUP) | (1u << OFPR_PACKET_OUT))
+
+    /* Nonstandard reason--not exposed via OpenFlow. */
+    OFPR_EXPLICIT_MISS,
+    OFPR_IMPLICIT_MISS,
+
+    OFPR_N_REASONS
+};
+
+enum ofp_flow_mod_command {
+    OFPFC_ADD,              /* New flow. */
+    OFPFC_MODIFY,           /* Modify all matching flows. */
+    OFPFC_MODIFY_STRICT,    /* Modify entry strictly matching wildcards */
+    OFPFC_DELETE,           /* Delete all matching flows. */
+    OFPFC_DELETE_STRICT     /* Strictly match wildcards and priority. */
+};
+
+enum ofp_flow_mod_flags {
+    OFPFF_SEND_FLOW_REM = 1 << 0,  /* Send flow removed message when flow
+                                    * expires or is deleted. */
+    OFPFF_CHECK_OVERLAP = 1 << 1,  /* Check for overlapping entries first. */
+};
+
+/* Why was this flow removed? */
+enum ofp_flow_removed_reason {
+    OFPRR_IDLE_TIMEOUT,         /* Flow idle time exceeded idle_timeout. */
+    OFPRR_HARD_TIMEOUT,         /* Time exceeded hard_timeout. */
+    OFPRR_DELETE,               /* Evicted by a DELETE flow mod. */
+    OFPRR_GROUP_DELETE,         /* Group was removed. */
+    OFPRR_METER_DELETE,         /* Meter was removed. */
+    OFPRR_EVICTION,             /* Switch eviction to free resources. */
+
+#define OFPRR10_BITS                            \
+    ((1u << OFPRR_IDLE_TIMEOUT) |               \
+     (1u << OFPRR_HARD_TIMEOUT) |               \
+     (1u << OFPRR_DELETE))
+#define OFPRR14_BITS                            \
+    (OFPRR10_BITS |                             \
+     (1u << OFPRR_GROUP_DELETE) |               \
+     (1u << OFPRR_METER_DELETE) |               \
+     (1u << OFPRR_EVICTION))
+
+    OVS_OFPRR_NONE              /* OVS internal_use only, keep last!. */
+};
+
+/* What changed about the physical port */
+enum ofp_port_reason {
+    OFPPR_ADD,              /* The port was added. */
+    OFPPR_DELETE,           /* The port was removed. */
+    OFPPR_MODIFY,           /* Some attribute of the port has changed. */
+
+#define OFPPR_BITS ((1u << OFPPR_ADD) |         \
+                    (1u << OFPPR_DELETE) |      \
+                    (1u << OFPPR_MODIFY))
+
+    OFPPR_N_REASONS         /* Denotes number of reasons. */
+};
+
+/* A physical port has changed in the datapath */
+struct ofp_port_status {
+    uint8_t reason;          /* One of OFPPR_*. */
+    uint8_t pad[7];          /* Align to 64-bits. */
+    /* Followed by struct ofp10_phy_port, struct ofp11_port, or struct
+     * ofp14_port.  */
+};
+OFP_ASSERT(sizeof(struct ofp_port_status) == 8);
+
+enum ofp_stats_reply_flags {
+    OFPSF_REPLY_MORE  = 1 << 0  /* More replies to follow. */
+};
+
+#define DESC_STR_LEN   256
+#define SERIAL_NUM_LEN 32
+/* Body of reply to OFPST_DESC request.  Each entry is a NULL-terminated ASCII
+ * string. */
+struct ofp_desc_stats {
+    char mfr_desc[DESC_STR_LEN];       /* Manufacturer description. */
+    char hw_desc[DESC_STR_LEN];        /* Hardware description. */
+    char sw_desc[DESC_STR_LEN];        /* Software description. */
+    char serial_num[SERIAL_NUM_LEN];   /* Serial number. */
+    char dp_desc[DESC_STR_LEN];        /* Human readable description of
+                                          the datapath. */
+};
+OFP_ASSERT(sizeof(struct ofp_desc_stats) == 1056);
+
+/* Reply to OFPST_AGGREGATE request. */
+struct ofp_aggregate_stats_reply {
+    ovs_32aligned_be64 packet_count; /* Number of packets in flows. */
+    ovs_32aligned_be64 byte_count;   /* Number of bytes in flows. */
+    ovs_be32 flow_count;      /* Number of flows. */
+    uint8_t pad[4];           /* Align to 64 bits. */
+};
+OFP_ASSERT(sizeof(struct ofp_aggregate_stats_reply) == 24);
+
+/* The match type indicates the match structure (set of fields that compose the
+ * match) in use. The match type is placed in the type field at the beginning
+ * of all match structures. The "OpenFlow Extensible Match" type corresponds
+ * to OXM TLV format described below and must be supported by all OpenFlow
+ * switches. Extensions that define other match types may be published on the
+ * ONF wiki. Support for extensions is optional.
+ */
+enum ofp_match_type {
+    OFPMT_STANDARD = 0,         /* The match fields defined in the ofp11_match
+                                   structure apply */
+    OFPMT_OXM = 1,              /* OpenFlow Extensible Match */
+};
+
+/* Group numbering. Groups can use any number up to OFPG_MAX. */
+enum ofp_group {
+    /* Last usable group number. */
+    OFPG_MAX        = 0xffffff00,
+
+    /* Fake groups. */
+    OFPG_ALL        = 0xfffffffc,  /* All groups, for group delete commands. */
+    OFPG_ANY        = 0xffffffff   /* Wildcard, for flow stats requests. */
+};
+
+/* Group configuration flags */
+enum ofp_group_capabilities {
+    OFPGFC_SELECT_WEIGHT   = 1 << 0, /* Support weight for select groups */
+    OFPGFC_SELECT_LIVENESS = 1 << 1, /* Support liveness for select groups */
+    OFPGFC_CHAINING        = 1 << 2, /* Support chaining groups */
+    OFPGFC_CHAINING_CHECKS = 1 << 3, /* Check chaining for loops and delete */
+};
+
+enum ofp_hello_elem_type {
+    OFPHET_VERSIONBITMAP          = 1, /* Bitmap of version supported. */
+};
+
+/* Common header for all Hello Elements */
+struct ofp_hello_elem_header {
+    ovs_be16    type;        /* One of OFPHET_*. */
+    ovs_be16    length;      /* Length in bytes of this element. */
+};
+OFP_ASSERT(sizeof(struct ofp_hello_elem_header) == 4);
+
+/* Table numbering. Tables can use any number up to OFPT_MAX. */
+enum ofp_table {
+    /* Last usable table number. */
+    OFPTT_MAX = 0xfe,
+
+    /* Fake tables. */
+    OFPTT_ALL = 0xff         /* Wildcard table used for table config,
+                                flow stats and flow deletes. */
+};
+
+enum ofp_table_config {
+    /* OpenFlow 1.1 and 1.2 defined this field as shown.
+     * OpenFlow 1.3 and later mark this field as deprecated, but have not
+     * reused it for any new purpose. */
+    OFPTC11_TABLE_MISS_CONTROLLER = 0 << 0, /* Send to controller. */
+    OFPTC11_TABLE_MISS_CONTINUE   = 1 << 0, /* Go to next table, like OF1.0. */
+    OFPTC11_TABLE_MISS_DROP       = 2 << 0, /* Drop the packet. */
+    OFPTC11_TABLE_MISS_MASK       = 3 << 0,
+
+    /* OpenFlow 1.4. */
+    OFPTC14_EVICTION              = 1 << 2, /* Allow table to evict flows. */
+    OFPTC14_VACANCY_EVENTS        = 1 << 3, /* Enable vacancy events. */
+};
+
+#endif /* openflow/openflow-common.h */
diff --git a/openflow/include/openflow/openflow.h b/openflow/include/openflow/openflow.h
new file mode 100644
index 0000000..7976fbb
--- /dev/null
+++ b/openflow/include/openflow/openflow.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENFLOW_OPENFLOW_H
+#define OPENFLOW_OPENFLOW_H 1
+
+#include <openflow/openflow-1.0.h>
+#include <openflow/openflow-1.1.h>
+#include <openflow/openflow-1.2.h>
+#include <openflow/openflow-1.3.h>
+#include <openflow/openflow-1.4.h>
+#include <openflow/openflow-1.5.h>
+
+#endif /* openflow/openflow.h */
diff --git a/openflow/include/openvswitch/compiler.h b/openflow/include/openvswitch/compiler.h
new file mode 100644
index 0000000..6e779f3
--- /dev/null
+++ b/openflow/include/openvswitch/compiler.h
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_COMPILER_H
+#define OPENVSWITCH_COMPILER_H 1
+
+#include <stddef.h>
+#include <stdbool.h>
+
+#ifndef __has_feature
+  #define __has_feature(x) 0
+#endif
+#ifndef __has_extension
+  #define __has_extension(x) 0
+#endif
+
+/* To make OVS_NO_RETURN portable across gcc/clang and MSVC, it should be
+ * added at the beginning of the function declaration. */
+#if __GNUC__ && !__CHECKER__
+#define OVS_NO_RETURN __attribute__((__noreturn__))
+#elif _MSC_VER
+#define OVS_NO_RETURN __declspec(noreturn)
+#else
+#define OVS_NO_RETURN
+#endif
+
+#if __GNUC__ && !__CHECKER__
+#define OVS_UNUSED __attribute__((__unused__))
+#define OVS_PRINTF_FORMAT(FMT, ARG1) __attribute__((__format__(printf, FMT, ARG1)))
+#define OVS_SCANF_FORMAT(FMT, ARG1) __attribute__((__format__(scanf, FMT, ARG1)))
+#define OVS_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+#define OVS_LIKELY(CONDITION) __builtin_expect(!!(CONDITION), 1)
+#define OVS_UNLIKELY(CONDITION) __builtin_expect(!!(CONDITION), 0)
+#else
+#define OVS_UNUSED
+#define OVS_PRINTF_FORMAT(FMT, ARG1)
+#define OVS_SCANF_FORMAT(FMT, ARG1)
+#define OVS_WARN_UNUSED_RESULT
+#define OVS_LIKELY(CONDITION) (!!(CONDITION))
+#define OVS_UNLIKELY(CONDITION) (!!(CONDITION))
+#endif
+
+#if __has_feature(c_thread_safety_attributes)
+/* "clang" annotations for thread safety check.
+ *
+ * OVS_LOCKABLE indicates that the struct contains mutex element
+ * which can be locked by functions like ovs_mutex_lock().
+ *
+ * Below, the word MUTEX stands for the name of an object with an OVS_LOCKABLE
+ * struct type.  It can also be a comma-separated list of multiple structs,
+ * e.g. to require a function to hold multiple locks while invoked.
+ *
+ *
+ * On a variable:
+ *
+ *    - OVS_GUARDED indicates that the variable may only be accessed some mutex
+ *      is held.
+ *
+ *    - OVS_GUARDED_BY(MUTEX) indicates that the variable may only be accessed
+ *      while the specific MUTEX is held.
+ *
+ *
+ * On a variable A of mutex type:
+ *
+ *    - OVS_ACQ_BEFORE(B), where B is a mutex or a comma-separated list of
+ *      mutexes, declare that if both A and B are acquired at the same time,
+ *      then A must be acquired before B.  That is, B nests inside A.
+ *
+ *    - OVS_ACQ_AFTER(B) is the opposite of OVS_ACQ_BEFORE(B), that is, it
+ *      declares that A nests inside B.
+ *
+ *
+ * On a function, the following attributes apply to mutexes:
+ *
+ *    - OVS_ACQUIRES(MUTEX) indicate that the function must be called without
+ *      holding MUTEX and that it returns holding MUTEX.
+ *
+ *    - OVS_RELEASES(MUTEX) indicates that the function may only be called with
+ *      MUTEX held and that it returns with MUTEX released.  It can be used for
+ *      all types of MUTEX.
+ *
+ *    - OVS_TRY_LOCK(RETVAL, MUTEX) indicate that the function will try to
+ *      acquire MUTEX.  RETVAL is an integer or boolean value specifying the
+ *      return value of a successful lock acquisition.
+ *
+ *    - OVS_REQUIRES(MUTEX) indicate that the function may only be called with
+ *      MUTEX held and that the function does not release MUTEX.
+ *
+ *    - OVS_EXCLUDED(MUTEX) indicates that the function may only be called when
+ *      MUTEX is not held.
+ *
+ *
+ * The following variants, with the same syntax, apply to reader-writer locks:
+ *
+ *    mutex                rwlock, for reading  rwlock, for writing
+ *    -------------------  -------------------  -------------------
+ *    OVS_ACQUIRES         OVS_ACQ_RDLOCK       OVS_ACQ_WRLOCK
+ *    OVS_RELEASES         OVS_RELEASES         OVS_RELEASES
+ *    OVS_TRY_LOCK         OVS_TRY_RDLOCK       OVS_TRY_WRLOCK
+ *    OVS_REQUIRES         OVS_REQ_RDLOCK       OVS_REQ_WRLOCK
+ *    OVS_EXCLUDED         OVS_EXCLUDED         OVS_EXCLUDED
+ */
+#define OVS_LOCKABLE __attribute__((lockable))
+#define OVS_REQ_RDLOCK(...) __attribute__((shared_locks_required(__VA_ARGS__)))
+#define OVS_ACQ_RDLOCK(...) __attribute__((shared_lock_function(__VA_ARGS__)))
+#define OVS_REQ_WRLOCK(...) \
+    __attribute__((exclusive_locks_required(__VA_ARGS__)))
+#define OVS_ACQ_WRLOCK(...) \
+    __attribute__((exclusive_lock_function(__VA_ARGS__)))
+#define OVS_REQUIRES(...) \
+    __attribute__((exclusive_locks_required(__VA_ARGS__)))
+#define OVS_ACQUIRES(...) \
+    __attribute__((exclusive_lock_function(__VA_ARGS__)))
+#define OVS_TRY_WRLOCK(RETVAL, ...)                              \
+    __attribute__((exclusive_trylock_function(RETVAL, __VA_ARGS__)))
+#define OVS_TRY_RDLOCK(RETVAL, ...)                          \
+    __attribute__((shared_trylock_function(RETVAL, __VA_ARGS__)))
+#define OVS_TRY_LOCK(RETVAL, ...)                                \
+    __attribute__((exclusive_trylock_function(RETVAL, __VA_ARGS__)))
+#define OVS_GUARDED __attribute__((guarded_var))
+#define OVS_GUARDED_BY(...) __attribute__((guarded_by(__VA_ARGS__)))
+#define OVS_RELEASES(...) __attribute__((unlock_function(__VA_ARGS__)))
+#define OVS_EXCLUDED(...) __attribute__((locks_excluded(__VA_ARGS__)))
+#define OVS_ACQ_BEFORE(...) __attribute__((acquired_before(__VA_ARGS__)))
+#define OVS_ACQ_AFTER(...) __attribute__((acquired_after(__VA_ARGS__)))
+#define OVS_NO_THREAD_SAFETY_ANALYSIS \
+    __attribute__((no_thread_safety_analysis))
+#else  /* not Clang */
+#define OVS_LOCKABLE
+#define OVS_REQ_RDLOCK(...)
+#define OVS_ACQ_RDLOCK(...)
+#define OVS_REQ_WRLOCK(...)
+#define OVS_ACQ_WRLOCK(...)
+#define OVS_REQUIRES(...)
+#define OVS_ACQUIRES(...)
+#define OVS_TRY_WRLOCK(...)
+#define OVS_TRY_RDLOCK(...)
+#define OVS_TRY_LOCK(...)
+#define OVS_GUARDED
+#define OVS_GUARDED_BY(...)
+#define OVS_EXCLUDED(...)
+#define OVS_RELEASES(...)
+#define OVS_ACQ_BEFORE(...)
+#define OVS_ACQ_AFTER(...)
+#define OVS_NO_THREAD_SAFETY_ANALYSIS
+#endif
+
+/* ISO C says that a C implementation may choose any integer type for an enum
+ * that is sufficient to hold all of its values.  Common ABIs (such as the
+ * System V ABI used on i386 GNU/Linux) always use a full-sized "int", even
+ * when a smaller type would suffice.
+ *
+ * In GNU C, "enum __attribute__((packed)) name { ... }" defines 'name' as an
+ * enum compatible with a type that is no bigger than necessary.  This is the
+ * intended use of OVS_PACKED_ENUM.
+ *
+ * OVS_PACKED_ENUM is intended for use only as a space optimization, since it
+ * only works with GCC.  That means that it must not be used in wire protocols
+ * or otherwise exposed outside of a single process. */
+#if __GNUC__ && !__CHECKER__
+#define OVS_PACKED_ENUM __attribute__((__packed__))
+#define HAVE_PACKED_ENUM
+#else
+#define OVS_PACKED_ENUM
+#endif
+
+#ifndef _MSC_VER
+#define OVS_PACKED(DECL) DECL __attribute__((__packed__))
+#else
+#define OVS_PACKED(DECL) __pragma(pack(push, 1)) DECL __pragma(pack(pop))
+#endif
+
+/* OVS_ALIGNED_STRUCT may be used to define a structure whose instances should
+ * aligned on an N-byte boundary.  This:
+ *     OVS_ALIGNED_STRUCT(64, mystruct) { ... };
+ * is equivalent to the following except that it specifies 64-byte alignment:
+ *     struct mystruct { ... };
+ *
+ * OVS_ALIGNED_VAR defines a variable aligned on an N-byte boundary.  For
+ * example,
+ *     OVS_ALIGNED_VAR(64) int x;
+ * defines a "int" variable that is aligned on a 64-byte boundary.
+ */
+#ifndef _MSC_VER
+#define OVS_ALIGNED_STRUCT(N, TAG) struct __attribute__((aligned(N))) TAG
+#define OVS_ALIGNED_VAR(N) __attribute__((aligned(N)))
+#else
+#define OVS_ALIGNED_STRUCT(N, TAG) __declspec(align(N)) struct TAG
+#define OVS_ALIGNED_VAR(N) __declspec(align(N))
+#endif
+
+/* Supplies code to be run at startup time before invoking main().
+ * Use as:
+ *
+ *     OVS_CONSTRUCTOR(my_constructor) {
+ *         ...some code...
+ *     }
+ */
+#ifdef _MSC_VER
+#define CCALL __cdecl
+#pragma section(".CRT$XCU",read)
+#define OVS_CONSTRUCTOR(f) \
+    static void __cdecl f(void); \
+    __declspec(allocate(".CRT$XCU")) static void (__cdecl*f##_)(void) = f; \
+    static void __cdecl f(void)
+#else
+#define OVS_CONSTRUCTOR(f) \
+    static void f(void) __attribute__((constructor)); \
+    static void f(void)
+#endif
+
+/* OVS_PREFETCH() can be used to instruct the CPU to fetch the cache
+ * line containing the given address to a CPU cache.
+ * OVS_PREFETCH_WRITE() should be used when the memory is going to be
+ * written to.  Depending on the target CPU, this can generate the same
+ * instruction as OVS_PREFETCH(), or bring the data into the cache in an
+ * exclusive state. */
+#if __GNUC__
+#define OVS_PREFETCH(addr) __builtin_prefetch((addr))
+#define OVS_PREFETCH_WRITE(addr) __builtin_prefetch((addr), 1)
+#else
+#define OVS_PREFETCH(addr)
+#define OVS_PREFETCH_WRITE(addr)
+#endif
+
+/* Build assertions. */
+#ifdef __CHECKER__
+#define BUILD_ASSERT(EXPR) ((void) 0)
+#define BUILD_ASSERT_DECL(EXPR) extern int (*build_assert(void))[1]
+#elif !defined(__cplusplus)
+/* Build-time assertion building block. */
+#define BUILD_ASSERT__(EXPR) \
+        sizeof(struct { unsigned int build_assert_failed : (EXPR) ? 1 : -1; })
+
+/* Build-time assertion for use in a statement context. */
+#define BUILD_ASSERT(EXPR) (void) BUILD_ASSERT__(EXPR)
+
+/* Build-time assertion for use in a declaration context. */
+#define BUILD_ASSERT_DECL(EXPR) \
+        extern int (*build_assert(void))[BUILD_ASSERT__(EXPR)]
+#else /* __cplusplus */
+#include <boost/static_assert.hpp>
+#define BUILD_ASSERT BOOST_STATIC_ASSERT
+#define BUILD_ASSERT_DECL BOOST_STATIC_ASSERT
+#endif /* __cplusplus */
+
+#ifdef __GNUC__
+#define BUILD_ASSERT_GCCONLY(EXPR) BUILD_ASSERT(EXPR)
+#define BUILD_ASSERT_DECL_GCCONLY(EXPR) BUILD_ASSERT_DECL(EXPR)
+#else
+#define BUILD_ASSERT_GCCONLY(EXPR) ((void) 0)
+#define BUILD_ASSERT_DECL_GCCONLY(EXPR) ((void) 0)
+#endif
+
+
+#endif /* compiler.h */
diff --git a/openflow/include/openvswitch/dynamic-string.h b/openflow/include/openvswitch/dynamic-string.h
new file mode 100644
index 0000000..bf1f64a
--- /dev/null
+++ b/openflow/include/openvswitch/dynamic-string.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_DYNAMIC_STRING_H
+#define OPENVSWITCH_DYNAMIC_STRING_H 1
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include "openvswitch/compiler.h"
+
+/* A "dynamic string", that is, a buffer that can be used to construct a
+ * string across a series of operations that extend or modify it.
+ *
+ * The 'string' member does not always point to a null-terminated string.
+ * Initially it is NULL, and even when it is nonnull, some operations do not
+ * ensure that it is null-terminated.  Use ds_cstr() to ensure that memory is
+ * allocated for the string and that it is null-terminated. */
+struct ds {
+    char *string;       /* Null-terminated string. */
+    size_t length;      /* Bytes used, not including null terminator. */
+    size_t allocated;   /* Bytes allocated, not including null terminator. */
+};
+
+#define DS_EMPTY_INITIALIZER { NULL, 0, 0 }
+
+void ds_init(struct ds *);
+void ds_clear(struct ds *);
+void ds_truncate(struct ds *, size_t new_length);
+void ds_reserve(struct ds *, size_t min_length);
+char *ds_put_uninit(struct ds *, size_t n);
+static inline void ds_put_char(struct ds *, char);
+void ds_put_utf8(struct ds *, int uc);
+void ds_put_char_multiple(struct ds *, char, size_t n);
+void ds_put_buffer(struct ds *, const char *, size_t n);
+void ds_put_cstr(struct ds *, const char *);
+void ds_put_and_free_cstr(struct ds *, char *);
+void ds_put_format(struct ds *, const char *, ...) OVS_PRINTF_FORMAT(2, 3);
+void ds_put_format_valist(struct ds *, const char *, va_list)
+    OVS_PRINTF_FORMAT(2, 0);
+void ds_put_printable(struct ds *, const char *, size_t);
+void ds_put_hex(struct ds *ds, const void *buf, size_t size);
+void ds_put_hex_dump(struct ds *ds, const void *buf_, size_t size,
+                     uintptr_t ofs, bool ascii);
+int ds_get_line(struct ds *, FILE *);
+int ds_get_preprocessed_line(struct ds *, FILE *, int *line_number);
+int ds_get_test_line(struct ds *, FILE *);
+
+void ds_put_strftime_msec(struct ds *, const char *format, long long int when,
+                          bool utc);
+char *xastrftime_msec(const char *format, long long int when, bool utc);
+
+char *ds_cstr(struct ds *);
+const char *ds_cstr_ro(const struct ds *);
+char *ds_steal_cstr(struct ds *);
+void ds_destroy(struct ds *);
+void ds_swap(struct ds *, struct ds *);
+
+int ds_last(const struct ds *);
+bool ds_chomp(struct ds *, int c);
+void ds_clone(struct ds *, struct ds *);
+
+/* Inline functions. */
+
+void ds_put_char__(struct ds *, char);
+
+static inline void
+ds_put_char(struct ds *ds, char c)
+{
+    if (ds->length < ds->allocated) {
+        ds->string[ds->length++] = c;
+        ds->string[ds->length] = '\0';
+    } else {
+        ds_put_char__(ds, c);
+    }
+}
+
+#endif /* dynamic-string.h */
diff --git a/openflow/include/openvswitch/flow.h b/openflow/include/openvswitch/flow.h
new file mode 100644
index 0000000..df80dfe
--- /dev/null
+++ b/openflow/include/openvswitch/flow.h
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef OPENVSWITCH_FLOW_H
+#define OPENVSWITCH_FLOW_H 1
+
+#include "openflow/nicira-ext.h"
+#include "openvswitch/packets.h"
+#include "openvswitch/util.h"
+
+/* This sequence number should be incremented whenever anything involving flows
+ * or the wildcarding of flows changes.  This will cause build assertion
+ * failures in places which likely need to be updated. */
+#define FLOW_WC_SEQ 36
+
+/* Number of Open vSwitch extension 32-bit registers. */
+#define FLOW_N_REGS 16
+BUILD_ASSERT_DECL(FLOW_N_REGS <= NXM_NX_MAX_REGS);
+BUILD_ASSERT_DECL(FLOW_N_REGS % 4 == 0); /* Handle xxregs. */
+
+/* Number of OpenFlow 1.5+ 64-bit registers.
+ *
+ * Each of these overlays a pair of Open vSwitch 32-bit registers, so there
+ * are half as many of them.*/
+#define FLOW_N_XREGS (FLOW_N_REGS / 2)
+
+/* Number of 128-bit registers.
+ *
+ * Each of these overlays four Open vSwitch 32-bit registers, so there
+ * are a quarter as many of them.*/
+#define FLOW_N_XXREGS (FLOW_N_REGS / 4)
+
+/* Used for struct flow's dl_type member for frames that have no Ethernet
+ * type, that is, pure 802.2 frames. */
+#define FLOW_DL_TYPE_NONE 0x5ff
+
+/* Fragment bits, used for IPv4 and IPv6, always zero for non-IP flows. */
+#define FLOW_NW_FRAG_ANY   (1 << 0) /* Set for any IP frag. */
+#define FLOW_NW_FRAG_LATER (1 << 1) /* Set for IP frag with nonzero offset. */
+#define FLOW_NW_FRAG_MASK  (FLOW_NW_FRAG_ANY | FLOW_NW_FRAG_LATER)
+
+BUILD_ASSERT_DECL(FLOW_NW_FRAG_ANY == NX_IP_FRAG_ANY);
+BUILD_ASSERT_DECL(FLOW_NW_FRAG_LATER == NX_IP_FRAG_LATER);
+
+BUILD_ASSERT_DECL(FLOW_TNL_F_OAM == NX_TUN_FLAG_OAM);
+
+const char *flow_tun_flag_to_string(uint32_t flags);
+
+/* Maximum number of supported MPLS labels. */
+#define FLOW_MAX_MPLS_LABELS 3
+
+/*
+ * A flow in the network.
+ *
+ * Must be initialized to all zeros to make any compiler-induced padding
+ * zeroed.  Helps also in keeping unused fields (such as mutually exclusive
+ * IPv4 and IPv6 addresses) zeroed out.
+ *
+ * The meaning of 'in_port' is context-dependent.  In most cases, it is a
+ * 16-bit OpenFlow 1.0 port number.  In the software datapath interface (dpif)
+ * layer and its implementations (e.g. dpif-netlink, dpif-netdev), it is
+ * instead a 32-bit datapath port number.
+ *
+ * The fields are organized in four segments to facilitate staged lookup, where
+ * lower layer fields are first used to determine if the later fields need to
+ * be looked at.  This enables better wildcarding for datapath flows.
+ *
+ * NOTE: Order of the fields is significant, any change in the order must be
+ * reflected in miniflow_extract()!
+ */
+struct flow {
+    /* Metadata */
+    struct flow_tnl tunnel;     /* Encapsulating tunnel parameters. */
+    ovs_be64 metadata;          /* OpenFlow Metadata. */
+    uint32_t regs[FLOW_N_REGS]; /* Registers. */
+    uint32_t skb_priority;      /* Packet priority for QoS. */
+    uint32_t pkt_mark;          /* Packet mark. */
+    uint32_t dp_hash;           /* Datapath computed hash value. The exact
+                                 * computation is opaque to the user space. */
+    union flow_in_port in_port; /* Input port.*/
+    uint32_t recirc_id;         /* Must be exact match. */
+    uint16_t ct_state;          /* Connection tracking state. */
+    uint16_t ct_zone;           /* Connection tracking zone. */
+    uint32_t ct_mark;           /* Connection mark.*/
+    uint8_t pad1[4];            /* Pad to 64 bits. */
+    ovs_u128 ct_label;          /* Connection label. */
+    uint32_t conj_id;           /* Conjunction ID. */
+    ofp_port_t actset_output;   /* Output port in action set. */
+
+    /* L2, Order the same as in the Ethernet header! (64-bit aligned) */
+    struct eth_addr dl_dst;     /* Ethernet destination address. */
+    struct eth_addr dl_src;     /* Ethernet source address. */
+    ovs_be16 dl_type;           /* Ethernet frame type. */
+    ovs_be16 vlan_tci;          /* If 802.1Q, TCI | VLAN_CFI; otherwise 0. */
+    ovs_be32 mpls_lse[ROUND_UP(FLOW_MAX_MPLS_LABELS, 2)]; /* MPLS label stack
+                                                             (with padding). */
+    /* L3 (64-bit aligned) */
+    ovs_be32 nw_src;            /* IPv4 source address or ARP SPA. */
+    ovs_be32 nw_dst;            /* IPv4 destination address or ARP TPA. */
+    struct in6_addr ipv6_src;   /* IPv6 source address. */
+    struct in6_addr ipv6_dst;   /* IPv6 destination address. */
+    ovs_be32 ipv6_label;        /* IPv6 flow label. */
+    uint8_t nw_frag;            /* FLOW_FRAG_* flags. */
+    uint8_t nw_tos;             /* IP ToS (including DSCP and ECN). */
+    uint8_t nw_ttl;             /* IP TTL/Hop Limit. */
+    uint8_t nw_proto;           /* IP protocol or low 8 bits of ARP opcode. */
+    struct in6_addr nd_target;  /* IPv6 neighbor discovery (ND) target. */
+    struct eth_addr arp_sha;    /* ARP/ND source hardware address. */
+    struct eth_addr arp_tha;    /* ARP/ND target hardware address. */
+    ovs_be16 tcp_flags;         /* TCP flags. With L3 to avoid matching L4. */
+    ovs_be16 pad3;              /* Pad to 64 bits. */
+
+    /* L4 (64-bit aligned) */
+    ovs_be16 tp_src;            /* TCP/UDP/SCTP source port/ICMP type. */
+    ovs_be16 tp_dst;            /* TCP/UDP/SCTP destination port/ICMP code. */
+    ovs_be32 igmp_group_ip4;    /* IGMP group IPv4 address.
+                                 * Keep last for BUILD_ASSERT_DECL below. */
+};
+BUILD_ASSERT_DECL(sizeof(struct flow) % sizeof(uint64_t) == 0);
+BUILD_ASSERT_DECL(sizeof(struct flow_tnl) % sizeof(uint64_t) == 0);
+
+#define FLOW_U64S (sizeof(struct flow) / sizeof(uint64_t))
+
+/* Remember to update FLOW_WC_SEQ when changing 'struct flow'. */
+BUILD_ASSERT_DECL(offsetof(struct flow, igmp_group_ip4) + sizeof(uint32_t)
+                  == sizeof(struct flow_tnl) + 248
+                  && FLOW_WC_SEQ == 36);
+
+/* Incremental points at which flow classification may be performed in
+ * segments.
+ * This is located here since this is dependent on the structure of the
+ * struct flow defined above:
+ * Each offset must be on a distinct, successive U64 boundary strictly
+ * within the struct flow. */
+enum {
+    FLOW_SEGMENT_1_ENDS_AT = offsetof(struct flow, dl_dst),
+    FLOW_SEGMENT_2_ENDS_AT = offsetof(struct flow, nw_src),
+    FLOW_SEGMENT_3_ENDS_AT = offsetof(struct flow, tp_src),
+};
+BUILD_ASSERT_DECL(FLOW_SEGMENT_1_ENDS_AT % sizeof(uint64_t) == 0);
+BUILD_ASSERT_DECL(FLOW_SEGMENT_2_ENDS_AT % sizeof(uint64_t) == 0);
+BUILD_ASSERT_DECL(FLOW_SEGMENT_3_ENDS_AT % sizeof(uint64_t) == 0);
+BUILD_ASSERT_DECL(                     0 < FLOW_SEGMENT_1_ENDS_AT);
+BUILD_ASSERT_DECL(FLOW_SEGMENT_1_ENDS_AT < FLOW_SEGMENT_2_ENDS_AT);
+BUILD_ASSERT_DECL(FLOW_SEGMENT_2_ENDS_AT < FLOW_SEGMENT_3_ENDS_AT);
+BUILD_ASSERT_DECL(FLOW_SEGMENT_3_ENDS_AT < sizeof(struct flow));
+
+/* Wildcards for a flow.
+ *
+ * A 1-bit in each bit in 'masks' indicates that the corresponding bit of
+ * the flow is significant (must match).  A 0-bit indicates that the
+ * corresponding bit of the flow is wildcarded (need not match). */
+struct flow_wildcards {
+    struct flow masks;
+};
+
+#define WC_MASK_FIELD(WC, FIELD) \
+    memset(&(WC)->masks.FIELD, 0xff, sizeof (WC)->masks.FIELD)
+#define WC_MASK_FIELD_MASK(WC, FIELD, MASK)     \
+    ((WC)->masks.FIELD |= (MASK))
+#define WC_UNMASK_FIELD(WC, FIELD) \
+    memset(&(WC)->masks.FIELD, 0, sizeof (WC)->masks.FIELD)
+
+void flow_wildcards_init_catchall(struct flow_wildcards *);
+
+void flow_wildcards_init_for_packet(struct flow_wildcards *,
+                                    const struct flow *);
+
+void flow_wildcards_clear_non_packet_fields(struct flow_wildcards *);
+
+bool flow_wildcards_is_catchall(const struct flow_wildcards *);
+
+void flow_wildcards_set_reg_mask(struct flow_wildcards *,
+                                 int idx, uint32_t mask);
+void flow_wildcards_set_xreg_mask(struct flow_wildcards *,
+                                  int idx, uint64_t mask);
+void flow_wildcards_set_xxreg_mask(struct flow_wildcards *,
+                                   int idx, ovs_u128 mask);
+
+void flow_wildcards_and(struct flow_wildcards *dst,
+                        const struct flow_wildcards *src1,
+                        const struct flow_wildcards *src2);
+void flow_wildcards_or(struct flow_wildcards *dst,
+                       const struct flow_wildcards *src1,
+                       const struct flow_wildcards *src2);
+bool flow_wildcards_has_extra(const struct flow_wildcards *,
+                              const struct flow_wildcards *);
+uint32_t flow_wildcards_hash(const struct flow_wildcards *, uint32_t basis);
+bool flow_wildcards_equal(const struct flow_wildcards *,
+                          const struct flow_wildcards *);
+
+#endif /* flow.h */
diff --git a/openflow/include/openvswitch/geneve.h b/openflow/include/openvswitch/geneve.h
new file mode 100644
index 0000000..7311985
--- /dev/null
+++ b/openflow/include/openvswitch/geneve.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2015 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_GENEVE_H
+#define OPENVSWITCH_GENEVE_H 1
+
+#include "openvswitch/types.h"
+
+#define TLV_MAX_OPT_SIZE 124
+#define TLV_TOT_OPT_SIZE 252
+
+#define GENEVE_CRIT_OPT_TYPE (1 << 7)
+
+struct geneve_opt {
+    ovs_be16  opt_class;
+    uint8_t   type;
+#ifdef WORDS_BIGENDIAN
+    uint8_t   r1:1;
+    uint8_t   r2:1;
+    uint8_t   r3:1;
+    uint8_t   length:5;
+#else
+    uint8_t   length:5;
+    uint8_t   r3:1;
+    uint8_t   r2:1;
+    uint8_t   r1:1;
+#endif
+    /* Option data */
+};
+
+struct genevehdr {
+#ifdef WORDS_BIGENDIAN
+    uint8_t ver:2;
+    uint8_t opt_len:6;
+    uint8_t oam:1;
+    uint8_t critical:1;
+    uint8_t rsvd1:6;
+#else
+    uint8_t opt_len:6;
+    uint8_t ver:2;
+    uint8_t rsvd1:6;
+    uint8_t critical:1;
+    uint8_t oam:1;
+#endif
+    ovs_be16 proto_type;
+    ovs_16aligned_be32 vni;
+    struct geneve_opt options[];
+};
+
+#endif /* geneve.h */
diff --git a/openflow/include/openvswitch/hmap.h b/openflow/include/openvswitch/hmap.h
new file mode 100644
index 0000000..8aea9c2
--- /dev/null
+++ b/openflow/include/openvswitch/hmap.h
@@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2012, 2013, 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef HMAP_H
+#define HMAP_H 1
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include "openvswitch/util.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* A hash map node, to be embedded inside the data structure being mapped. */
+struct hmap_node {
+    size_t hash;                /* Hash value. */
+    struct hmap_node *next;     /* Next in linked list. */
+};
+
+/* Returns the hash value embedded in 'node'. */
+static inline size_t hmap_node_hash(const struct hmap_node *node)
+{
+    return node->hash;
+}
+
+#define HMAP_NODE_NULL ((struct hmap_node *) 1)
+#define HMAP_NODE_NULL_INITIALIZER { 0, HMAP_NODE_NULL }
+
+/* Returns true if 'node' has been set to null by hmap_node_nullify() and has
+ * not been un-nullified by being inserted into an hmap. */
+static inline bool
+hmap_node_is_null(const struct hmap_node *node)
+{
+    return node->next == HMAP_NODE_NULL;
+}
+
+/* Marks 'node' with a distinctive value that can be tested with
+ * hmap_node_is_null().  */
+static inline void
+hmap_node_nullify(struct hmap_node *node)
+{
+    node->next = HMAP_NODE_NULL;
+}
+
+/* A hash map. */
+struct hmap {
+    struct hmap_node **buckets; /* Must point to 'one' iff 'mask' == 0. */
+    struct hmap_node *one;
+    size_t mask;
+    size_t n;
+};
+
+/* Initializer for an empty hash map. */
+#define HMAP_INITIALIZER(HMAP) \
+    { (struct hmap_node **const) &(HMAP)->one, NULL, 0, 0 }
+
+/* Initializer for an immutable struct hmap 'HMAP' that contains 'N' nodes
+ * linked together starting at 'NODE'.  The hmap only has a single chain of
+ * hmap_nodes, so 'N' should be small. */
+#define HMAP_CONST(HMAP, N, NODE) {                                 \
+        CONST_CAST(struct hmap_node **, &(HMAP)->one), NODE, 0, N }
+
+/* Initialization. */
+void hmap_init(struct hmap *);
+void hmap_destroy(struct hmap *);
+void hmap_clear(struct hmap *);
+void hmap_swap(struct hmap *a, struct hmap *b);
+void hmap_moved(struct hmap *hmap);
+static inline size_t hmap_count(const struct hmap *);
+static inline bool hmap_is_empty(const struct hmap *);
+
+/* Adjusting capacity. */
+void hmap_expand_at(struct hmap *, const char *where);
+#define hmap_expand(HMAP) hmap_expand_at(HMAP, OVS_SOURCE_LOCATOR)
+
+void hmap_shrink_at(struct hmap *, const char *where);
+#define hmap_shrink(HMAP) hmap_shrink_at(HMAP, OVS_SOURCE_LOCATOR)
+
+void hmap_reserve_at(struct hmap *, size_t capacity, const char *where);
+#define hmap_reserve(HMAP, CAPACITY) \
+    hmap_reserve_at(HMAP, CAPACITY, OVS_SOURCE_LOCATOR)
+
+/* Insertion and deletion. */
+static inline void hmap_insert_at(struct hmap *, struct hmap_node *,
+                                  size_t hash, const char *where);
+#define hmap_insert(HMAP, NODE, HASH) \
+    hmap_insert_at(HMAP, NODE, HASH, OVS_SOURCE_LOCATOR)
+
+static inline void hmap_insert_fast(struct hmap *,
+                                    struct hmap_node *, size_t hash);
+static inline void hmap_remove(struct hmap *, struct hmap_node *);
+
+void hmap_node_moved(struct hmap *, struct hmap_node *, struct hmap_node *);
+static inline void hmap_replace(struct hmap *, const struct hmap_node *old,
+                                struct hmap_node *new_node);
+
+struct hmap_node *hmap_random_node(const struct hmap *);
+
+/* Search.
+ *
+ * HMAP_FOR_EACH_WITH_HASH iterates NODE over all of the nodes in HMAP that
+ * have hash value equal to HASH.  HMAP_FOR_EACH_IN_BUCKET iterates NODE over
+ * all of the nodes in HMAP that would fall in the same bucket as HASH.  MEMBER
+ * must be the name of the 'struct hmap_node' member within NODE.
+ *
+ * These macros may be used interchangeably to search for a particular value in
+ * an hmap, see, e.g. shash_find() for an example.  Usually, using
+ * HMAP_FOR_EACH_WITH_HASH provides an optimization, because comparing a hash
+ * value is usually cheaper than comparing an entire hash map key.  But for
+ * simple hash map keys, it makes sense to use HMAP_FOR_EACH_IN_BUCKET because
+ * it avoids doing two comparisons when a single simple comparison suffices.
+ *
+ * The loop should not change NODE to point to a different node or insert or
+ * delete nodes in HMAP (unless it "break"s out of the loop to terminate
+ * iteration).
+ *
+ * HASH is only evaluated once.
+ *
+ * When the loop terminates normally, meaning the iteration has completed
+ * without using 'break', NODE will be NULL.  This is true for all of the
+ * HMAP_FOR_EACH_*() macros.
+ */
+#define HMAP_FOR_EACH_WITH_HASH(NODE, MEMBER, HASH, HMAP)               \
+    for (INIT_CONTAINER(NODE, hmap_first_with_hash(HMAP, HASH), MEMBER); \
+         (NODE != OBJECT_CONTAINING(NULL, NODE, MEMBER)) || (NODE = NULL); \
+         ASSIGN_CONTAINER(NODE, hmap_next_with_hash(&(NODE)->MEMBER),   \
+                          MEMBER))
+#define HMAP_FOR_EACH_IN_BUCKET(NODE, MEMBER, HASH, HMAP)               \
+    for (INIT_CONTAINER(NODE, hmap_first_in_bucket(HMAP, HASH), MEMBER); \
+         (NODE != OBJECT_CONTAINING(NULL, NODE, MEMBER)) || (NODE = NULL); \
+         ASSIGN_CONTAINER(NODE, hmap_next_in_bucket(&(NODE)->MEMBER), MEMBER))
+
+static inline struct hmap_node *hmap_first_with_hash(const struct hmap *,
+                                                     size_t hash);
+static inline struct hmap_node *hmap_next_with_hash(const struct hmap_node *);
+static inline struct hmap_node *hmap_first_in_bucket(const struct hmap *,
+                                                     size_t hash);
+static inline struct hmap_node *hmap_next_in_bucket(const struct hmap_node *);
+
+bool hmap_contains(const struct hmap *, const struct hmap_node *);
+
+/* Iteration.
+ *
+ * The *_INIT variants of these macros additionally evaluate the expressions
+ * supplied following the HMAP argument once during the loop initialization.
+ * This makes it possible for data structures that wrap around hmaps to insert
+ * additional initialization into their iteration macros without having to
+ * completely rewrite them.  In particular, it can be a good idea to insert
+ * BUILD_ASSERT_TYPE checks for map and node types that wrap hmap, since
+ * otherwise it is possible for clients to accidentally confuse two derived
+ * data structures that happen to use the same member names for struct hmap and
+ * struct hmap_node. */
+
+/* Iterates through every node in HMAP. */
+#define HMAP_FOR_EACH(NODE, MEMBER, HMAP) \
+    HMAP_FOR_EACH_INIT(NODE, MEMBER, HMAP, (void) 0)
+#define HMAP_FOR_EACH_INIT(NODE, MEMBER, HMAP, ...)                     \
+    for (INIT_CONTAINER(NODE, hmap_first(HMAP), MEMBER), __VA_ARGS__;   \
+         (NODE != OBJECT_CONTAINING(NULL, NODE, MEMBER)) || (NODE = NULL); \
+         ASSIGN_CONTAINER(NODE, hmap_next(HMAP, &(NODE)->MEMBER), MEMBER))
+
+/* Safe when NODE may be freed (not needed when NODE may be removed from the
+ * hash map but its members remain accessible and intact). */
+#define HMAP_FOR_EACH_SAFE(NODE, NEXT, MEMBER, HMAP) \
+    HMAP_FOR_EACH_SAFE_INIT(NODE, NEXT, MEMBER, HMAP, (void) 0)
+#define HMAP_FOR_EACH_SAFE_INIT(NODE, NEXT, MEMBER, HMAP, ...)          \
+    for (INIT_CONTAINER(NODE, hmap_first(HMAP), MEMBER), __VA_ARGS__;   \
+         ((NODE != OBJECT_CONTAINING(NULL, NODE, MEMBER)) || (NODE = NULL) \
+          ? INIT_CONTAINER(NEXT, hmap_next(HMAP, &(NODE)->MEMBER), MEMBER), 1 \
+          : 0);                                                         \
+         (NODE) = (NEXT))
+
+/* Continues an iteration from just after NODE. */
+#define HMAP_FOR_EACH_CONTINUE(NODE, MEMBER, HMAP) \
+    HMAP_FOR_EACH_CONTINUE_INIT(NODE, MEMBER, HMAP, (void) 0)
+#define HMAP_FOR_EACH_CONTINUE_INIT(NODE, MEMBER, HMAP, ...)            \
+    for (ASSIGN_CONTAINER(NODE, hmap_next(HMAP, &(NODE)->MEMBER), MEMBER), \
+         __VA_ARGS__;                                                   \
+         (NODE != OBJECT_CONTAINING(NULL, NODE, MEMBER)) || (NODE = NULL); \
+         ASSIGN_CONTAINER(NODE, hmap_next(HMAP, &(NODE)->MEMBER), MEMBER))
+
+static inline struct hmap_node *
+hmap_pop_helper__(struct hmap *hmap, size_t *bucket) {
+
+    for (; *bucket <= hmap->mask; (*bucket)++) {
+        struct hmap_node *node = hmap->buckets[*bucket];
+
+        if (node) {
+            hmap_remove(hmap, node);
+            return node;
+        }
+    }
+
+    return NULL;
+}
+
+#define HMAP_FOR_EACH_POP(NODE, MEMBER, HMAP)                               \
+    for (size_t bucket__ = 0;                                               \
+         INIT_CONTAINER(NODE, hmap_pop_helper__(HMAP, &bucket__), MEMBER),  \
+         (NODE != OBJECT_CONTAINING(NULL, NODE, MEMBER)) || (NODE = NULL);)
+
+static inline struct hmap_node *hmap_first(const struct hmap *);
+static inline struct hmap_node *hmap_next(const struct hmap *,
+                                          const struct hmap_node *);
+
+struct hmap_position {
+    unsigned int bucket;
+    unsigned int offset;
+};
+
+struct hmap_node *hmap_at_position(const struct hmap *,
+                                   struct hmap_position *);
+
+/* Returns the number of nodes currently in 'hmap'. */
+static inline size_t
+hmap_count(const struct hmap *hmap)
+{
+    return hmap->n;
+}
+
+/* Returns the maximum number of nodes that 'hmap' may hold before it should be
+ * rehashed. */
+static inline size_t
+hmap_capacity(const struct hmap *hmap)
+{
+    return hmap->mask * 2 + 1;
+}
+
+/* Returns true if 'hmap' currently contains no nodes,
+ * false otherwise.
+ * Note: While hmap in general is not thread-safe without additional locking,
+ * hmap_is_empty() is. */
+static inline bool
+hmap_is_empty(const struct hmap *hmap)
+{
+    return hmap->n == 0;
+}
+
+/* Inserts 'node', with the given 'hash', into 'hmap'.  'hmap' is never
+ * expanded automatically. */
+static inline void
+hmap_insert_fast(struct hmap *hmap, struct hmap_node *node, size_t hash)
+{
+    struct hmap_node **bucket = &hmap->buckets[hash & hmap->mask];
+    node->hash = hash;
+    node->next = *bucket;
+    *bucket = node;
+    hmap->n++;
+}
+
+/* Inserts 'node', with the given 'hash', into 'hmap', and expands 'hmap' if
+ * necessary to optimize search performance.
+ *
+ * ('where' is used in debug logging.  Commonly one would use hmap_insert() to
+ * automatically provide the caller's source file and line number for
+ * 'where'.) */
+static inline void
+hmap_insert_at(struct hmap *hmap, struct hmap_node *node, size_t hash,
+               const char *where)
+{
+    hmap_insert_fast(hmap, node, hash);
+    if (hmap->n / 2 > hmap->mask) {
+        hmap_expand_at(hmap, where);
+    }
+}
+
+/* Removes 'node' from 'hmap'.  Does not shrink the hash table; call
+ * hmap_shrink() directly if desired. */
+static inline void
+hmap_remove(struct hmap *hmap, struct hmap_node *node)
+{
+    struct hmap_node **bucket = &hmap->buckets[node->hash & hmap->mask];
+    while (*bucket != node) {
+        bucket = &(*bucket)->next;
+    }
+    *bucket = node->next;
+    hmap->n--;
+}
+
+/* Puts 'new_node' in the position in 'hmap' currently occupied by 'old_node'.
+ * The 'new_node' must hash to the same value as 'old_node'.  The client is
+ * responsible for ensuring that the replacement does not violate any
+ * client-imposed invariants (e.g. uniqueness of keys within a map).
+ *
+ * Afterward, 'old_node' is not part of 'hmap', and the client is responsible
+ * for freeing it (if this is desirable). */
+static inline void
+hmap_replace(struct hmap *hmap,
+             const struct hmap_node *old_node, struct hmap_node *new_node)
+{
+    struct hmap_node **bucket = &hmap->buckets[old_node->hash & hmap->mask];
+    while (*bucket != old_node) {
+        bucket = &(*bucket)->next;
+    }
+    *bucket = new_node;
+    new_node->hash = old_node->hash;
+    new_node->next = old_node->next;
+}
+
+static inline struct hmap_node *
+hmap_next_with_hash__(const struct hmap_node *node, size_t hash)
+{
+    while (node != NULL && node->hash != hash) {
+        node = node->next;
+    }
+    return CONST_CAST(struct hmap_node *, node);
+}
+
+/* Returns the first node in 'hmap' with the given 'hash', or a null pointer if
+ * no nodes have that hash value. */
+static inline struct hmap_node *
+hmap_first_with_hash(const struct hmap *hmap, size_t hash)
+{
+    return hmap_next_with_hash__(hmap->buckets[hash & hmap->mask], hash);
+}
+
+/* Returns the first node in 'hmap' in the bucket in which the given 'hash'
+ * would land, or a null pointer if that bucket is empty. */
+static inline struct hmap_node *
+hmap_first_in_bucket(const struct hmap *hmap, size_t hash)
+{
+    return hmap->buckets[hash & hmap->mask];
+}
+
+/* Returns the next node in the same bucket as 'node', or a null pointer if
+ * there are no more nodes in that bucket.
+ *
+ * If the hash map has been reallocated since 'node' was visited, some nodes
+ * may be skipped; if new nodes with the same hash value have been added, they
+ * will be skipped.  (Removing 'node' from the hash map does not prevent
+ * calling this function, since node->next is preserved, although freeing
+ * 'node' of course does.) */
+static inline struct hmap_node *
+hmap_next_in_bucket(const struct hmap_node *node)
+{
+    return node->next;
+}
+
+/* Returns the next node in the same hash map as 'node' with the same hash
+ * value, or a null pointer if no more nodes have that hash value.
+ *
+ * If the hash map has been reallocated since 'node' was visited, some nodes
+ * may be skipped; if new nodes with the same hash value have been added, they
+ * will be skipped.  (Removing 'node' from the hash map does not prevent
+ * calling this function, since node->next is preserved, although freeing
+ * 'node' of course does.) */
+static inline struct hmap_node *
+hmap_next_with_hash(const struct hmap_node *node)
+{
+    return hmap_next_with_hash__(node->next, node->hash);
+}
+
+static inline struct hmap_node *
+hmap_next__(const struct hmap *hmap, size_t start)
+{
+    size_t i;
+    for (i = start; i <= hmap->mask; i++) {
+        struct hmap_node *node = hmap->buckets[i];
+        if (node) {
+            return node;
+        }
+    }
+    return NULL;
+}
+
+/* Returns the first node in 'hmap', in arbitrary order, or a null pointer if
+ * 'hmap' is empty. */
+static inline struct hmap_node *
+hmap_first(const struct hmap *hmap)
+{
+    return hmap_next__(hmap, 0);
+}
+
+/* Returns the next node in 'hmap' following 'node', in arbitrary order, or a
+ * null pointer if 'node' is the last node in 'hmap'.
+ *
+ * If the hash map has been reallocated since 'node' was visited, some nodes
+ * may be skipped or visited twice.  (Removing 'node' from the hash map does
+ * not prevent calling this function, since node->next is preserved, although
+ * freeing 'node' of course does.) */
+static inline struct hmap_node *
+hmap_next(const struct hmap *hmap, const struct hmap_node *node)
+{
+    return (node->next
+            ? node->next
+            : hmap_next__(hmap, (node->hash & hmap->mask) + 1));
+}
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* hmap.h */
diff --git a/openflow/include/openvswitch/json.h b/openflow/include/openvswitch/json.h
new file mode 100644
index 0000000..83775ed
--- /dev/null
+++ b/openflow/include/openvswitch/json.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2009, 2010, 2015 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JSON_H
+#define JSON_H 1
+
+/* This is an implementation of JavaScript Object Notation (JSON) as specified
+ * by RFC 4627.  It is intended to fully comply with RFC 4627, with the
+ * following known exceptions and clarifications:
+ *
+ *      - Null bytes (\u0000) are not allowed in strings.
+ *
+ *      - Only UTF-8 encoding is supported (RFC 4627 allows for other Unicode
+ *        encodings).
+ *
+ *      - Names within an object must be unique (RFC 4627 says that they
+ *        "should" be unique).
+ */
+
+#include <stdio.h>
+#include "openvswitch/shash.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct ds;
+
+/* Type of a JSON value. */
+enum json_type {
+    JSON_NULL,                  /* null */
+    JSON_FALSE,                 /* false */
+    JSON_TRUE,                  /* true */
+    JSON_OBJECT,                /* {"a": b, "c": d, ...} */
+    JSON_ARRAY,                 /* [1, 2, 3, ...] */
+    JSON_INTEGER,               /* 123. */
+    JSON_REAL,                  /* 123.456. */
+    JSON_STRING,                /* "..." */
+    JSON_N_TYPES
+};
+
+const char *json_type_to_string(enum json_type);
+
+/* A JSON array. */
+struct json_array {
+    size_t n, n_allocated;
+    struct json **elems;
+};
+
+/* A JSON value. */
+struct json {
+    enum json_type type;
+    size_t count;
+    union {
+        struct shash *object;   /* Contains "struct json *"s. */
+        struct json_array array;
+        long long int integer;
+        double real;
+        char *string;
+    } u;
+};
+
+struct json *json_null_create(void);
+struct json *json_boolean_create(bool);
+struct json *json_string_create(const char *);
+struct json *json_string_create_nocopy(char *);
+struct json *json_integer_create(long long int);
+struct json *json_real_create(double);
+
+struct json *json_array_create_empty(void);
+void json_array_add(struct json *, struct json *element);
+void json_array_trim(struct json *);
+struct json *json_array_create(struct json **, size_t n);
+struct json *json_array_create_1(struct json *);
+struct json *json_array_create_2(struct json *, struct json *);
+struct json *json_array_create_3(struct json *, struct json *, struct json *);
+
+struct json *json_object_create(void);
+void json_object_put(struct json *, const char *name, struct json *value);
+void json_object_put_string(struct json *,
+                            const char *name, const char *value);
+
+const char *json_string(const struct json *);
+struct json_array *json_array(const struct json *);
+struct shash *json_object(const struct json *);
+bool json_boolean(const struct json *);
+double json_real(const struct json *);
+int64_t json_integer(const struct json *);
+
+struct json *json_deep_clone(const struct json *);
+struct json *json_clone(const struct json *);
+void json_destroy(struct json *);
+
+size_t json_hash(const struct json *, size_t basis);
+bool json_equal(const struct json *, const struct json *);
+
+/* Parsing JSON. */
+enum {
+    JSPF_TRAILER = 1 << 0       /* Check for garbage following input.  */
+};
+
+struct json_parser *json_parser_create(int flags);
+size_t json_parser_feed(struct json_parser *, const char *, size_t);
+bool json_parser_is_done(const struct json_parser *);
+struct json *json_parser_finish(struct json_parser *);
+void json_parser_abort(struct json_parser *);
+
+struct json *json_from_string(const char *string);
+struct json *json_from_file(const char *file_name);
+struct json *json_from_stream(FILE *stream);
+
+/* Serializing JSON. */
+
+enum {
+    JSSF_PRETTY = 1 << 0,       /* Multiple lines with indentation, if true. */
+    JSSF_SORT = 1 << 1          /* Object members in sorted order, if true. */
+};
+char *json_to_string(const struct json *, int flags);
+void json_to_ds(const struct json *, int flags, struct ds *);
+
+/* JSON string formatting operations. */
+
+bool json_string_unescape(const char *in, size_t in_len, char **outp);
+void json_string_escape(const char *in, struct ds *out);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* json.h */
diff --git a/openflow/include/openvswitch/list.h b/openflow/include/openvswitch/list.h
new file mode 100644
index 0000000..2bc294c
--- /dev/null
+++ b/openflow/include/openvswitch/list.h
@@ -0,0 +1,304 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2013, 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef OPENVSWITCH_LIST_H
+#define OPENVSWITCH_LIST_H 1
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <openvswitch/types.h>
+#include <openvswitch/util.h>
+
+/* Doubly linked list head or element. */
+struct ovs_list {
+    struct ovs_list *prev;     /* Previous list element. */
+    struct ovs_list *next;     /* Next list element. */
+};
+
+#define OVS_LIST_INITIALIZER(LIST) { LIST, LIST }
+
+/* "struct ovs_list" with pointers that will (probably) cause segfaults if
+ * dereferenced and, better yet, show up clearly in a debugger.
+
+ * MSVC2015 doesn't support designated initializers when compiling C++,
+ * and doesn't support ternary operators with non-designated initializers.
+ * So we use these static definitions rather than using initializer macros. */
+static const struct ovs_list OVS_LIST_POISON =
+    { (struct ovs_list *) (UINTPTR_MAX / 0xf * 0xc),
+      (struct ovs_list *) (UINTPTR_MAX / 0xf * 0xc) };
+
+static inline void ovs_list_init(struct ovs_list *);
+static inline void ovs_list_poison(struct ovs_list *);
+
+/* List insertion. */
+static inline void ovs_list_insert(struct ovs_list *, struct ovs_list *);
+static inline void ovs_list_splice(struct ovs_list *before, struct ovs_list *first,
+                               struct ovs_list *last);
+static inline void ovs_list_push_front(struct ovs_list *, struct ovs_list *);
+static inline void ovs_list_push_back(struct ovs_list *, struct ovs_list *);
+static inline void ovs_list_replace(struct ovs_list *, const struct ovs_list *);
+static inline void ovs_list_moved(struct ovs_list *, const struct ovs_list *orig);
+static inline void ovs_list_move(struct ovs_list *dst, struct ovs_list *src);
+
+/* List removal. */
+static inline struct ovs_list *ovs_list_remove(struct ovs_list *);
+static inline struct ovs_list *ovs_list_pop_front(struct ovs_list *);
+static inline struct ovs_list *ovs_list_pop_back(struct ovs_list *);
+
+/* List elements. */
+static inline struct ovs_list *ovs_list_front(const struct ovs_list *);
+static inline struct ovs_list *ovs_list_back(const struct ovs_list *);
+
+/* List properties. */
+static inline size_t ovs_list_size(const struct ovs_list *);
+static inline bool ovs_list_is_empty(const struct ovs_list *);
+static inline bool ovs_list_is_singleton(const struct ovs_list *);
+static inline bool ovs_list_is_short(const struct ovs_list *);
+
+#define LIST_FOR_EACH(ITER, MEMBER, LIST)                               \
+    for (INIT_CONTAINER(ITER, (LIST)->next, MEMBER);                    \
+         &(ITER)->MEMBER != (LIST);                                     \
+         ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.next, MEMBER))
+#define LIST_FOR_EACH_CONTINUE(ITER, MEMBER, LIST)                      \
+    for (ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.next, MEMBER);             \
+         &(ITER)->MEMBER != (LIST);                                     \
+         ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.next, MEMBER))
+#define LIST_FOR_EACH_REVERSE(ITER, MEMBER, LIST)                       \
+    for (INIT_CONTAINER(ITER, (LIST)->prev, MEMBER);                    \
+         &(ITER)->MEMBER != (LIST);                                     \
+         ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.prev, MEMBER))
+#define LIST_FOR_EACH_REVERSE_SAFE(ITER, PREV, MEMBER, LIST)        \
+    for (INIT_CONTAINER(ITER, (LIST)->prev, MEMBER);                \
+         (&(ITER)->MEMBER != (LIST)                                 \
+          ? INIT_CONTAINER(PREV, (ITER)->MEMBER.prev, MEMBER), 1    \
+          : 0);                                                     \
+         (ITER) = (PREV))
+#define LIST_FOR_EACH_REVERSE_CONTINUE(ITER, MEMBER, LIST)              \
+    for (ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.prev, MEMBER);           \
+         &(ITER)->MEMBER != (LIST);                                     \
+         ASSIGN_CONTAINER(ITER, (ITER)->MEMBER.prev, MEMBER))
+#define LIST_FOR_EACH_SAFE(ITER, NEXT, MEMBER, LIST)               \
+    for (INIT_CONTAINER(ITER, (LIST)->next, MEMBER);               \
+         (&(ITER)->MEMBER != (LIST)                                \
+          ? INIT_CONTAINER(NEXT, (ITER)->MEMBER.next, MEMBER), 1   \
+          : 0);                                                    \
+         (ITER) = (NEXT))
+#define LIST_FOR_EACH_POP(ITER, MEMBER, LIST)                      \
+    while (!ovs_list_is_empty(LIST)                                    \
+           && (INIT_CONTAINER(ITER, ovs_list_pop_front(LIST), MEMBER), 1))
+
+/* Inline implementations. */
+
+/* Initializes 'list' as an empty list. */
+static inline void
+ovs_list_init(struct ovs_list *list)
+{
+    list->next = list->prev = list;
+}
+
+/* Initializes 'list' with pointers that will (probably) cause segfaults if
+ * dereferenced and, better yet, show up clearly in a debugger. */
+static inline void
+ovs_list_poison(struct ovs_list *list)
+{
+    *list = OVS_LIST_POISON;
+}
+
+/* Inserts 'elem' just before 'before'. */
+static inline void
+ovs_list_insert(struct ovs_list *before, struct ovs_list *elem)
+{
+    elem->prev = before->prev;
+    elem->next = before;
+    before->prev->next = elem;
+    before->prev = elem;
+}
+
+/* Removes elements 'first' though 'last' (exclusive) from their current list,
+   then inserts them just before 'before'. */
+static inline void
+ovs_list_splice(struct ovs_list *before, struct ovs_list *first, struct ovs_list *last)
+{
+    if (first == last) {
+        return;
+    }
+    last = last->prev;
+
+    /* Cleanly remove 'first'...'last' from its current list. */
+    first->prev->next = last->next;
+    last->next->prev = first->prev;
+
+    /* Splice 'first'...'last' into new list. */
+    first->prev = before->prev;
+    last->next = before;
+    before->prev->next = first;
+    before->prev = last;
+}
+
+/* Inserts 'elem' at the beginning of 'list', so that it becomes the front in
+   'list'. */
+static inline void
+ovs_list_push_front(struct ovs_list *list, struct ovs_list *elem)
+{
+    ovs_list_insert(list->next, elem);
+}
+
+/* Inserts 'elem' at the end of 'list', so that it becomes the back in
+ * 'list'. */
+static inline void
+ovs_list_push_back(struct ovs_list *list, struct ovs_list *elem)
+{
+    ovs_list_insert(list, elem);
+}
+
+/* Puts 'elem' in the position currently occupied by 'position'.
+ * Afterward, 'position' is not part of a list. */
+static inline void
+ovs_list_replace(struct ovs_list *element, const struct ovs_list *position)
+{
+    element->next = position->next;
+    element->next->prev = element;
+    element->prev = position->prev;
+    element->prev->next = element;
+}
+
+/* Adjusts pointers around 'list' to compensate for 'list' having been moved
+ * around in memory (e.g. as a consequence of realloc()), with original
+ * location 'orig'.
+ *
+ * ('orig' likely points to freed memory, but this function does not
+ * dereference 'orig', it only compares it to 'list'.  In a very pedantic
+ * language lawyer sense, this still yields undefined behavior, but it works
+ * with actual compilers.) */
+static inline void
+ovs_list_moved(struct ovs_list *list, const struct ovs_list *orig)
+{
+    if (list->next == orig) {
+        ovs_list_init(list);
+    } else {
+        list->prev->next = list->next->prev = list;
+    }
+}
+
+/* Initializes 'dst' with the contents of 'src', compensating for moving it
+ * around in memory.  The effect is that, if 'src' was the head of a list, now
+ * 'dst' is the head of a list containing the same elements. */
+static inline void
+ovs_list_move(struct ovs_list *dst, struct ovs_list *src)
+{
+    *dst = *src;
+    ovs_list_moved(dst, src);
+}
+
+/* Removes 'elem' from its list and returns the element that followed it.
+   Undefined behavior if 'elem' is not in a list. */
+static inline struct ovs_list *
+ovs_list_remove(struct ovs_list *elem)
+{
+    elem->prev->next = elem->next;
+    elem->next->prev = elem->prev;
+    return elem->next;
+}
+
+/* Removes the front element from 'list' and returns it.  Undefined behavior if
+   'list' is empty before removal. */
+static inline struct ovs_list *
+ovs_list_pop_front(struct ovs_list *list)
+{
+    struct ovs_list *front = list->next;
+
+    ovs_list_remove(front);
+    return front;
+}
+
+/* Removes the back element from 'list' and returns it.
+   Undefined behavior if 'list' is empty before removal. */
+static inline struct ovs_list *
+ovs_list_pop_back(struct ovs_list *list)
+{
+    struct ovs_list *back = list->prev;
+
+    ovs_list_remove(back);
+    return back;
+}
+
+/* Returns the front element in 'list_'.
+   Undefined behavior if 'list_' is empty. */
+static inline struct ovs_list *
+ovs_list_front(const struct ovs_list *list_)
+{
+    struct ovs_list *list = CONST_CAST(struct ovs_list *, list_);
+
+    ovs_assert(!ovs_list_is_empty(list));
+
+    return list->next;
+}
+
+/* Returns the back element in 'list_'.
+   Undefined behavior if 'list_' is empty. */
+static inline struct ovs_list *
+ovs_list_back(const struct ovs_list *list_)
+{
+    struct ovs_list *list = CONST_CAST(struct ovs_list *, list_);
+
+    ovs_assert(!ovs_list_is_empty(list));
+
+    return list->prev;
+}
+
+/* Returns the number of elements in 'list'.
+   Runs in O(n) in the number of elements. */
+static inline size_t
+ovs_list_size(const struct ovs_list *list)
+{
+    const struct ovs_list *e;
+    size_t cnt = 0;
+
+    for (e = list->next; e != list; e = e->next) {
+        cnt++;
+    }
+    return cnt;
+}
+
+/* Returns true if 'list' is empty, false otherwise. */
+static inline bool
+ovs_list_is_empty(const struct ovs_list *list)
+{
+    return list->next == list;
+}
+
+/* Returns true if 'list' has exactly 1 element, false otherwise. */
+static inline bool
+ovs_list_is_singleton(const struct ovs_list *list)
+{
+    return ovs_list_is_short(list) && !ovs_list_is_empty(list);
+}
+
+/* Returns true if 'list' has 0 or 1 elements, false otherwise. */
+static inline bool
+ovs_list_is_short(const struct ovs_list *list)
+{
+    return list->next == list->prev;
+}
+
+/* Transplant a list into another, and resets the origin list */
+static inline void
+ovs_list_push_back_all(struct ovs_list *dst, struct ovs_list *src)
+{
+    ovs_list_splice(dst, src->next, src);
+}
+
+#endif /* list.h */
diff --git a/openflow/include/openvswitch/match.h b/openflow/include/openvswitch/match.h
new file mode 100644
index 0000000..0b5f050
--- /dev/null
+++ b/openflow/include/openvswitch/match.h
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_MATCH_H
+#define OPENVSWITCH_MATCH_H 1
+
+#include "openvswitch/flow.h"
+#include "openvswitch/packets.h"
+#include "openvswitch/tun-metadata.h"
+
+struct ds;
+
+/* A flow classification match.
+ *
+ * Use one of the match_*() functions to initialize a "struct match".
+ *
+ * The match_*() functions below maintain the following important invariant.
+ * If a bit or a field is wildcarded in 'wc', then the corresponding bit or
+ * field in 'flow' is set to all-0-bits.  (The match_zero_wildcarded_fields()
+ * function can be used to restore this invariant after adding wildcards.) */
+struct match {
+    struct flow flow;
+    struct flow_wildcards wc;
+    struct tun_metadata_allocation tun_md;
+};
+
+/* Initializer for a "struct match" that matches every packet. */
+#define MATCH_CATCHALL_INITIALIZER { .flow = { .dl_type = 0 } }
+
+void match_init(struct match *,
+                const struct flow *, const struct flow_wildcards *);
+void match_wc_init(struct match *match, const struct flow *flow);
+void match_init_catchall(struct match *);
+
+void match_zero_wildcarded_fields(struct match *);
+
+void match_set_dp_hash(struct match *, uint32_t value);
+void match_set_dp_hash_masked(struct match *, uint32_t value, uint32_t mask);
+
+void match_set_recirc_id(struct match *, uint32_t value);
+
+void match_set_conj_id(struct match *, uint32_t value);
+
+void match_set_reg(struct match *, unsigned int reg_idx, uint32_t value);
+void match_set_reg_masked(struct match *, unsigned int reg_idx,
+                          uint32_t value, uint32_t mask);
+void match_set_xreg(struct match *, unsigned int xreg_idx, uint64_t value);
+void match_set_xreg_masked(struct match *, unsigned int xreg_idx,
+                           uint64_t value, uint64_t mask);
+void match_set_xxreg(struct match *, unsigned int xxreg_idx, ovs_u128 value);
+void match_set_xxreg_masked(struct match *, unsigned int xxreg_idx,
+                           ovs_u128 value, ovs_u128 mask);
+void match_set_actset_output(struct match *, ofp_port_t actset_output);
+void match_set_metadata(struct match *, ovs_be64 metadata);
+void match_set_metadata_masked(struct match *,
+                               ovs_be64 metadata, ovs_be64 mask);
+void match_set_tun_id(struct match *, ovs_be64 tun_id);
+void match_set_tun_id_masked(struct match *, ovs_be64 tun_id, ovs_be64 mask);
+void match_set_tun_src(struct match *match, ovs_be32 src);
+void match_set_tun_src_masked(struct match *match, ovs_be32 src, ovs_be32 mask);
+void match_set_tun_dst(struct match *match, ovs_be32 dst);
+void match_set_tun_dst_masked(struct match *match, ovs_be32 dst, ovs_be32 mask);
+void match_set_tun_ipv6_src(struct match *, const struct in6_addr *);
+void match_set_tun_ipv6_src_masked(struct match *, const struct in6_addr *,
+                                   const struct in6_addr *);
+void match_set_tun_ipv6_dst(struct match *, const struct in6_addr *);
+void match_set_tun_ipv6_dst_masked(struct match *, const struct in6_addr *,
+                                   const struct in6_addr *);
+void match_set_tun_ttl(struct match *match, uint8_t ttl);
+void match_set_tun_ttl_masked(struct match *match, uint8_t ttl, uint8_t mask);
+void match_set_tun_tos(struct match *match, uint8_t tos);
+void match_set_tun_tos_masked(struct match *match, uint8_t tos, uint8_t mask);
+void match_set_tun_flags(struct match *match, uint16_t flags);
+void match_set_tun_flags_masked(struct match *match, uint16_t flags, uint16_t mask);
+void match_set_tun_gbp_id_masked(struct match *match, ovs_be16 gbp_id, ovs_be16 mask);
+void match_set_tun_gbp_id(struct match *match, ovs_be16 gbp_id);
+void match_set_tun_gbp_flags_masked(struct match *match, uint8_t flags, uint8_t mask);
+void match_set_tun_gbp_flags(struct match *match, uint8_t flags);
+void match_set_in_port(struct match *, ofp_port_t ofp_port);
+void match_set_pkt_mark(struct match *, uint32_t pkt_mark);
+void match_set_pkt_mark_masked(struct match *, uint32_t pkt_mark, uint32_t mask);
+void match_set_ct_state(struct match *, uint32_t ct_state);
+void match_set_ct_state_masked(struct match *, uint32_t ct_state, uint32_t mask);
+void match_set_ct_zone(struct match *, uint16_t ct_zone);
+void match_set_ct_mark(struct match *, uint32_t ct_mark);
+void match_set_ct_mark_masked(struct match *, uint32_t ct_mark, uint32_t mask);
+void match_set_ct_label(struct match *, ovs_u128 ct_label);
+void match_set_ct_label_masked(struct match *, ovs_u128 ct_label, ovs_u128 mask);
+void match_set_skb_priority(struct match *, uint32_t skb_priority);
+void match_set_dl_type(struct match *, ovs_be16);
+void match_set_dl_src(struct match *, const struct eth_addr );
+void match_set_dl_src_masked(struct match *, const struct eth_addr dl_src,
+                             const struct eth_addr mask);
+void match_set_dl_dst(struct match *, const struct eth_addr);
+void match_set_dl_dst_masked(struct match *, const struct eth_addr dl_dst,
+                             const struct eth_addr mask);
+void match_set_dl_tci(struct match *, ovs_be16 tci);
+void match_set_dl_tci_masked(struct match *, ovs_be16 tci, ovs_be16 mask);
+void match_set_any_vid(struct match *);
+void match_set_dl_vlan(struct match *, ovs_be16);
+void match_set_vlan_vid(struct match *, ovs_be16);
+void match_set_vlan_vid_masked(struct match *, ovs_be16 vid, ovs_be16 mask);
+void match_set_any_pcp(struct match *);
+void match_set_dl_vlan_pcp(struct match *, uint8_t);
+void match_set_any_mpls_lse(struct match *, int idx);
+void match_set_mpls_lse(struct match *, int idx, ovs_be32);
+void match_set_any_mpls_label(struct match *, int idx);
+void match_set_mpls_label(struct match *, int idx, ovs_be32);
+void match_set_any_mpls_tc(struct match *, int idx);
+void match_set_mpls_tc(struct match *, int idx, uint8_t);
+void match_set_any_mpls_bos(struct match *, int idx);
+void match_set_mpls_bos(struct match *, int idx, uint8_t);
+void match_set_any_mpls_ttl(struct match *, int idx);
+void match_set_mpls_ttl(struct match *, int idx, uint8_t);
+void match_set_tp_src(struct match *, ovs_be16);
+void match_set_mpls_lse(struct match *, int idx, ovs_be32 lse);
+void match_set_tp_src_masked(struct match *, ovs_be16 port, ovs_be16 mask);
+void match_set_tp_dst(struct match *, ovs_be16);
+void match_set_tp_dst_masked(struct match *, ovs_be16 port, ovs_be16 mask);
+void match_set_tcp_flags(struct match *, ovs_be16);
+void match_set_tcp_flags_masked(struct match *, ovs_be16 flags, ovs_be16 mask);
+void match_set_nw_proto(struct match *, uint8_t);
+void match_set_nw_src(struct match *, ovs_be32);
+void match_set_nw_src_masked(struct match *, ovs_be32 ip, ovs_be32 mask);
+void match_set_nw_dst(struct match *, ovs_be32);
+void match_set_nw_dst_masked(struct match *, ovs_be32 ip, ovs_be32 mask);
+void match_set_nw_dscp(struct match *, uint8_t);
+void match_set_nw_ecn(struct match *, uint8_t);
+void match_set_nw_ttl(struct match *, uint8_t);
+void match_set_nw_frag(struct match *, uint8_t nw_frag);
+void match_set_nw_frag_masked(struct match *, uint8_t nw_frag, uint8_t mask);
+void match_set_icmp_type(struct match *, uint8_t);
+void match_set_icmp_code(struct match *, uint8_t);
+void match_set_arp_sha(struct match *, const struct eth_addr);
+void match_set_arp_sha_masked(struct match *,
+                              const struct eth_addr arp_sha,
+                              const struct eth_addr mask);
+void match_set_arp_tha(struct match *, const struct eth_addr);
+void match_set_arp_tha_masked(struct match *,
+                              const struct eth_addr arp_tha,
+                              const struct eth_addr mask);
+void match_set_ipv6_src(struct match *, const struct in6_addr *);
+void match_set_ipv6_src_masked(struct match *, const struct in6_addr *,
+                               const struct in6_addr *);
+void match_set_ipv6_dst(struct match *, const struct in6_addr *);
+void match_set_ipv6_dst_masked(struct match *, const struct in6_addr *,
+                               const struct in6_addr *);
+void match_set_ipv6_label(struct match *, ovs_be32);
+void match_set_ipv6_label_masked(struct match *, ovs_be32, ovs_be32);
+void match_set_nd_target(struct match *, const struct in6_addr *);
+void match_set_nd_target_masked(struct match *, const struct in6_addr *,
+                                const struct in6_addr *);
+
+bool match_equal(const struct match *, const struct match *);
+uint32_t match_hash(const struct match *, uint32_t basis);
+
+void match_init_hidden_fields(struct match *);
+bool match_has_default_hidden_fields(const struct match *);
+
+void match_format(const struct match *, struct ds *, int priority);
+char *match_to_string(const struct match *, int priority);
+void match_print(const struct match *);
+
+/* Compressed match. */
+
+/* A sparse representation of a "struct match".
+ *
+ * 'flows' is used for allocating both 'flow' and 'mask' with one
+ * miniflow_alloc() call.
+ *
+ * There are two invariants:
+ *
+ *   - The same invariant as "struct match", that is, a 1-bit in the 'flow'
+ *     must correspond to a 1-bit in 'mask'.
+ *
+ *   - 'flow' and 'mask' have the same 'map'.  This implies that 'flow' and
+ *     'mask' have the same part of "struct flow" at the same offset into
+ *     'values', which makes minimatch_matches_flow() faster.
+ */
+struct minimatch {
+    union {
+        struct {
+            struct miniflow *flow;
+            struct minimask *mask;
+        };
+        struct miniflow *flows[2];
+    };
+};
+
+void minimatch_init(struct minimatch *, const struct match *);
+void minimatch_clone(struct minimatch *, const struct minimatch *);
+void minimatch_move(struct minimatch *dst, struct minimatch *src);
+void minimatch_destroy(struct minimatch *);
+
+void minimatch_expand(const struct minimatch *, struct match *);
+
+bool minimatch_equal(const struct minimatch *a, const struct minimatch *b);
+
+bool minimatch_matches_flow(const struct minimatch *, const struct flow *);
+
+void minimatch_format(const struct minimatch *, const struct tun_table *,
+                      struct ds *, int priority);
+char *minimatch_to_string(const struct minimatch *, int priority);
+
+#endif /* match.h */
diff --git a/openflow/include/openvswitch/meta-flow.h b/openflow/include/openvswitch/meta-flow.h
new file mode 100644
index 0000000..83e2599
--- /dev/null
+++ b/openflow/include/openvswitch/meta-flow.h
@@ -0,0 +1,1977 @@
+/*
+ * Copyright (c) 2011-2017 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_META_FLOW_H
+#define OPENVSWITCH_META_FLOW_H 1
+
+#include <limits.h>
+#include <stdarg.h>
+#include <string.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/ip6.h>
+#include "openvswitch/flow.h"
+#include "openvswitch/ofp-errors.h"
+#include "openvswitch/packets.h"
+#include "openvswitch/util.h"
+
+struct ds;
+struct match;
+struct ofputil_tlv_table_mod;
+
+/* Open vSwitch fields
+ * ===================
+ *
+ * Refer to ovs-fields(7) for a detailed introduction to Open vSwitch fields.
+ *
+ *
+ * Field specifications
+ * ====================
+ *
+ * Each of the enumeration values below represents a field.  The comments
+ * preceding each enum must be in a stylized form that is parsed at compile
+ * time by the extract-ofp-fields program.  The comment itself consists of a
+ * series of paragraphs separate by blank lines.  The paragraphs consist of:
+ *
+ *     - The first paragraph gives the user-visible name of the field as a
+ *       quoted string.  This is the name used for parsing and formatting the
+ *       field.
+ *
+ *       For historical reasons, some fields have an additional name that is
+ *       accepted as an alternative in parsing.  This name, when there is one,
+ *       is given as a quoted string in parentheses along with "aka".  For
+ *       example:
+ *
+ *           "tun_id" (aka "tunnel_id").
+ *
+ *       New fields should have only one name.
+ *
+ *     - Any number of paragraphs of free text that describe the field.  These
+ *       are kept brief because the main description is in meta-flow.xml.
+ *
+ *     - A final paragraph that consists of a series of key-value pairs, one
+ *       per line, in the form "key: value." where the period at the end of the
+ *       line is a mandatory part of the syntax.
+ *
+ * Every field must specify the following key-value pairs:
+ *
+ *   Type:
+ *
+ *     The format and size of the field's value.  Some possible values are
+ *     generic:
+ *
+ *         u8: A one-byte field.
+ *         be16: A two-byte field.
+ *         be32: A four-byte field.
+ *         be64: An eight-byte field.
+ *
+ *     The remaining values imply more about the value's semantics, though OVS
+ *     does not currently take advantage of this additional information:
+ *
+ *         MAC: A six-byte field whose value is an Ethernet address.
+ *         IPv6: A 16-byte field whose value is an IPv6 address.
+ *         tunnelMD: A variable length field, up to 124 bytes, that carries
+ *                   tunnel metadata.
+ *
+ *   Maskable:
+ *
+ *     Either "bitwise", if OVS supports matching any subset of bits in the
+ *     field, or "no", if OVS only supports matching or wildcarding the entire
+ *     field.
+ *
+ *   Formatting:
+ *
+ *     Explains how a field's value is formatted and parsed for human
+ *     consumption.  Some of the options are fairly generally useful:
+ *
+ *       decimal: Formats the value as a decimal number.  On parsing, accepts
+ *         decimal (with no prefix), hexadecimal with 0x prefix, or octal
+ *         with 0 prefix.
+ *
+ *       hexadecimal: Same as decimal except nonzero values are formatted in
+ *         hex with 0x prefix.  The default for parsing is *not* hexadecimal:
+ *         only with a 0x prefix is the input in hexadecimal.
+ *
+ *       Ethernet: Formats and accepts the common format xx:xx:xx:xx:xx:xx.
+ *         6-byte fields only.
+ *
+ *       IPv4: Formats and accepts the common format w.x.y.z.  4-byte fields
+ *         only.
+ *
+ *       IPv6: Formats and accepts the common IPv6 formats.  16-byte fields
+ *         only.
+ *
+ *       OpenFlow 1.0 port: Accepts an OpenFlow well-known port name
+ *         (e.g. "IN_PORT") in uppercase or lowercase, or a 16-bit port
+ *         number in decimal.  Formats ports using their well-known names in
+ *         uppercase, or in decimal otherwise.  2-byte fields only.
+ *
+ *       OpenFlow 1.1+ port: Same syntax as for OpenFlow 1.0 ports but for
+ *         4-byte OpenFlow 1.1+ port number fields.
+ *
+ *     Others are very specific to particular fields:
+ *
+ *       frag: One of the strings "no", "first", "later", "yes", "not_later"
+ *         describing which IPv4/v6 fragments are matched.
+ *
+ *       tunnel flags: Any number of the strings "df", "csum", "key", or
+ *         "oam" separated by "|".
+ *
+ *       TCP flags: See the description of tcp_flags in ovs-ofctl(8).
+ *
+ *   Prerequisites:
+ *
+ *     The field's prerequisites.  The values should be straightfoward.
+ *
+ *   Access:
+ *
+ *     Either "read-only", for a field that cannot be changed via OpenFlow, or
+ *     "read/write" for a modifiable field.
+ *
+ *   NXM:
+ *
+ *     If the field has an NXM field assignment, then this specifies the NXM
+ *     name of the field (e.g. "NXM_OF_ETH_SRC"), followed by its nxm_type in
+ *     parentheses, followed by "since v<x>.<y>" specifying the version of Open
+ *     vSwitch that first supported this field in NXM (e.g. "since v1.1" if it
+ *     was introduced in Open vSwitch 1.1).
+ *
+ *     The NXM name must begin with NXM_OF_ or NXM_NX_.  This allows OVS to
+ *     determine the correct NXM class.
+ *
+ *     If the field does not have an NXM field assignment, specify "none".
+ *
+ *   OXM:
+ *
+ *     If the field has an OXM field assignment, then this specifies the OXM
+ *     name of the field (e.g. "OXM_OF_ETH_SRC"), followed by its nxm_type in
+ *     parentheses, followed by "since OF<a>.<b> v<x>.<y>" specifying the
+ *     versions of OpenFlow and Open vSwitch that first supported this field in
+ *     OXM (e.g. "since OF1.3 and v1.10" if it was introduced in OpenFlow 1.3
+ *     and first supported by Open vSwitch in version 1.10).
+ *
+ *     Some fields have more than one OXM field assignment.  For example,
+ *     actset_output has an experimenter OXM assignment in OpenFlow 1.3 and a
+ *     standard OXM assignment in OpenFlow 1.5.  In such a case, specify both,
+ *     separated by commas.
+ *
+ *     OVS uses the start of the OXM field name to determine the correct OXM
+ *     class.  To support a new OXM class, edit the mapping table in
+ *     build-aux/extract-ofp-fields.
+ *
+ *     If the field does not have an OXM field assignment, specify "none".
+ *
+ * The following key-value pairs are optional.  Open vSwitch already supports
+ * all the fields to which they apply, so new fields should probably not
+ * include these pairs:
+ *
+ *   OF1.0:
+ *
+ *     Specify this as "exact match" if OpenFlow 1.0 can match or wildcard the
+ *     entire field, or as "CIDR mask" if OpenFlow 1.0 can match any CIDR
+ *     prefix of the field.  (OpenFlow 1.0 did not support bitwise matching.)
+ *     Omit, if OpenFlow 1.0 did not support this field.
+ *
+ *   OF1.1:
+ *
+ *     Specify this as "exact match" if OpenFlow 1.1 can match or wildcard the
+ *     entire field, or as "bitwise" if OpenFlow 1.1 can match any subset of
+ *     bits in the field.  Omit, if OpenFlow 1.1 did not support this field.
+ *
+ * The following key-value pair is optional:
+ *
+ *   Prefix lookup member:
+ *
+ *     If this field makes sense for use with classifier_set_prefix_fields(),
+ *     specify the name of the "struct flow" member that corresponds to the
+ *     field.
+ *
+ * Finally, a few "register" fields have very similar names and purposes,
+ * e.g. MFF_REG0 through MFF_REG15.  For these, the comments may be merged
+ * together using <N> as a metasyntactic variable for the numeric suffix.
+ * Lines in the comment that are specific to one of the particular fields by
+ * writing, e.g. <1>, to consider that line only for e.g. MFF_REG1.
+ */
+
+enum OVS_PACKED_ENUM mf_field_id {
+/* ## -------- ## */
+/* ## Metadata ## */
+/* ## -------- ## */
+
+    /* "dp_hash".
+     *
+     * Flow hash computed in the datapath.  Internal use only, not programmable
+     * from controller.
+     *
+     * The OXM code point for this is an attempt to test OXM experimenter
+     * support, which is otherwise difficult to test due to the dearth of use
+     * out in the wild.  Because controllers can't add flows that match on
+     * dp_hash, this doesn't commit OVS to supporting this OXM experimenter
+     * code point in the future.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read-only.
+     * NXM: NXM_NX_DP_HASH(35) since v2.2.
+     * OXM: NXOXM_ET_DP_HASH(0) since OF1.5 and v2.4.
+     */
+    MFF_DP_HASH,
+
+    /* "recirc_id".
+     *
+     * ID for recirculation.  The value 0 is reserved for initially received
+     * packets.  Internal use only, not programmable from controller.
+     *
+     * Type: be32.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: none.
+     * Access: read-only.
+     * NXM: NXM_NX_RECIRC_ID(36) since v2.2.
+     * OXM: none.
+     */
+    MFF_RECIRC_ID,
+
+    /* "conj_id".
+     *
+     * ID for "conjunction" actions.  Please refer to ovs-ofctl(8)
+     * documentation of "conjunction" for details.
+     *
+     * Type: be32.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: none.
+     * Access: read-only.
+     * NXM: NXM_NX_CONJ_ID(37) since v2.4.
+     * OXM: none. */
+    MFF_CONJ_ID,
+
+    /* "tun_id" (aka "tunnel_id").
+     *
+     * The "key" or "tunnel ID" or "VNI" in a packet received via a keyed
+     * tunnel.  For protocols in which the key is shorter than 64 bits, the key
+     * is stored in the low bits and the high bits are zeroed.  For non-keyed
+     * tunnels and packets not received via a tunnel, the value is 0.
+     *
+     * Type: be64.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_TUN_ID(16) since v1.1.
+     * OXM: OXM_OF_TUNNEL_ID(38) since OF1.3 and v1.10.
+     * Prefix lookup member: tunnel.tun_id.
+     */
+    MFF_TUN_ID,
+
+    /* "tun_src".
+     *
+     * The IPv4 source address in the outer IP header of a tunneled packet.
+     *
+     * For non-tunneled packets, the value is 0.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: IPv4.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_TUN_IPV4_SRC(31) since v2.0.
+     * OXM: none.
+     * Prefix lookup member: tunnel.ip_src.
+     */
+    MFF_TUN_SRC,
+
+    /* "tun_dst".
+     *
+     * The IPv4 destination address in the outer IP header of a tunneled
+     * packet.
+     *
+     * For non-tunneled packets, the value is 0.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: IPv4.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_TUN_IPV4_DST(32) since v2.0.
+     * OXM: none.
+     * Prefix lookup member: tunnel.ip_dst.
+     */
+    MFF_TUN_DST,
+
+    /* "tun_ipv6_src".
+     *
+     * The IPv6 source address in the outer IP header of a tunneled packet.
+     *
+     * For non-tunneled packets, the value is 0.
+     *
+     * Type: be128.
+     * Maskable: bitwise.
+     * Formatting: IPv6.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_TUN_IPV6_SRC(109) since v2.5.
+     * OXM: none.
+     * Prefix lookup member: tunnel.ipv6_src.
+     */
+    MFF_TUN_IPV6_SRC,
+
+    /* "tun_ipv6_dst".
+     *
+     * The IPv6 destination address in the outer IP header of a tunneled
+     * packet.
+     *
+     * For non-tunneled packets, the value is 0.
+     *
+     * Type: be128.
+     * Maskable: bitwise.
+     * Formatting: IPv6.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_TUN_IPV6_DST(110) since v2.5.
+     * OXM: none.
+     * Prefix lookup member: tunnel.ipv6_dst.
+     */
+    MFF_TUN_IPV6_DST,
+
+    /* "tun_flags".
+     *
+     * Flags representing aspects of tunnel behavior.
+     *
+     * For non-tunneled packets, the value is 0.
+     *
+     * Type: be16 (low 1 bits).
+     * Maskable: bitwise.
+     * Formatting: tunnel flags.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_TUN_FLAGS(104) since v2.5.
+     * OXM: none.
+     */
+    MFF_TUN_FLAGS,
+
+    /* "tun_ttl".
+     *
+     * The TTL in the outer IP header of a tunneled packet.  Internal use only,
+     * not programmable from controller.
+     *
+     * For non-tunneled packets, the value is 0.
+     *
+     * Type: u8.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: none.
+     * Access: read-only.
+     * NXM: none.
+     * OXM: none.
+     */
+    MFF_TUN_TTL,
+
+    /* "tun_tos".
+     *
+     * The ToS value in the outer IP header of a tunneled packet.  Internal use
+     * only, not programmable from controller.
+     *
+     * Type: u8.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: none.
+     * Access: read-only.
+     * NXM: none.
+     * OXM: none.
+     */
+    MFF_TUN_TOS,
+
+    /* "tun_gbp_id".
+     *
+     * VXLAN Group Policy ID
+     *
+     * Type: be16.
+     * Maskable: bitwise.
+     * Formatting: decimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_TUN_GBP_ID(38) since v2.4.
+     * OXM: none.
+     */
+    MFF_TUN_GBP_ID,
+
+    /* "tun_gbp_flags".
+     *
+     * VXLAN Group Policy flags
+     *
+     * Type: u8.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_TUN_GBP_FLAGS(39) since v2.4.
+     * OXM: none.
+     */
+    MFF_TUN_GBP_FLAGS,
+
+#if TUN_METADATA_NUM_OPTS == 64
+    /* "tun_metadata<N>".
+     *
+     * Encapsulation metadata for tunnels.
+     *
+     * Each NXM can be dynamically mapped onto a particular tunnel field using
+     * OpenFlow commands. The individual NXMs can each carry up to 124 bytes
+     * of data and a combined total of 256 across all allocated fields.
+     *
+     * Type: tunnelMD.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_TUN_METADATA0(40) since v2.5.        <0>
+     * NXM: NXM_NX_TUN_METADATA1(41) since v2.5.        <1>
+     * NXM: NXM_NX_TUN_METADATA2(42) since v2.5.        <2>
+     * NXM: NXM_NX_TUN_METADATA3(43) since v2.5.        <3>
+     * NXM: NXM_NX_TUN_METADATA4(44) since v2.5.        <4>
+     * NXM: NXM_NX_TUN_METADATA5(45) since v2.5.        <5>
+     * NXM: NXM_NX_TUN_METADATA6(46) since v2.5.        <6>
+     * NXM: NXM_NX_TUN_METADATA7(47) since v2.5.        <7>
+     * NXM: NXM_NX_TUN_METADATA8(48) since v2.5.        <8>
+     * NXM: NXM_NX_TUN_METADATA9(49) since v2.5.        <9>
+     * NXM: NXM_NX_TUN_METADATA10(50) since v2.5.       <10>
+     * NXM: NXM_NX_TUN_METADATA11(51) since v2.5.       <11>
+     * NXM: NXM_NX_TUN_METADATA12(52) since v2.5.       <12>
+     * NXM: NXM_NX_TUN_METADATA13(53) since v2.5.       <13>
+     * NXM: NXM_NX_TUN_METADATA14(54) since v2.5.       <14>
+     * NXM: NXM_NX_TUN_METADATA15(55) since v2.5.       <15>
+     * NXM: NXM_NX_TUN_METADATA16(56) since v2.5.       <16>
+     * NXM: NXM_NX_TUN_METADATA17(57) since v2.5.       <17>
+     * NXM: NXM_NX_TUN_METADATA18(58) since v2.5.       <18>
+     * NXM: NXM_NX_TUN_METADATA19(59) since v2.5.       <19>
+     * NXM: NXM_NX_TUN_METADATA20(60) since v2.5.       <20>
+     * NXM: NXM_NX_TUN_METADATA21(61) since v2.5.       <21>
+     * NXM: NXM_NX_TUN_METADATA22(62) since v2.5.       <22>
+     * NXM: NXM_NX_TUN_METADATA23(63) since v2.5.       <23>
+     * NXM: NXM_NX_TUN_METADATA24(64) since v2.5.       <24>
+     * NXM: NXM_NX_TUN_METADATA25(65) since v2.5.       <25>
+     * NXM: NXM_NX_TUN_METADATA26(66) since v2.5.       <26>
+     * NXM: NXM_NX_TUN_METADATA27(67) since v2.5.       <27>
+     * NXM: NXM_NX_TUN_METADATA28(68) since v2.5.       <28>
+     * NXM: NXM_NX_TUN_METADATA29(69) since v2.5.       <29>
+     * NXM: NXM_NX_TUN_METADATA30(70) since v2.5.       <30>
+     * NXM: NXM_NX_TUN_METADATA31(71) since v2.5.       <31>
+     * NXM: NXM_NX_TUN_METADATA32(72) since v2.5.       <32>
+     * NXM: NXM_NX_TUN_METADATA33(73) since v2.5.       <33>
+     * NXM: NXM_NX_TUN_METADATA34(74) since v2.5.       <34>
+     * NXM: NXM_NX_TUN_METADATA35(75) since v2.5.       <35>
+     * NXM: NXM_NX_TUN_METADATA36(76) since v2.5.       <36>
+     * NXM: NXM_NX_TUN_METADATA37(77) since v2.5.       <37>
+     * NXM: NXM_NX_TUN_METADATA38(78) since v2.5.       <38>
+     * NXM: NXM_NX_TUN_METADATA39(79) since v2.5.       <39>
+     * NXM: NXM_NX_TUN_METADATA40(80) since v2.5.       <40>
+     * NXM: NXM_NX_TUN_METADATA41(81) since v2.5.       <41>
+     * NXM: NXM_NX_TUN_METADATA42(82) since v2.5.       <42>
+     * NXM: NXM_NX_TUN_METADATA43(83) since v2.5.       <43>
+     * NXM: NXM_NX_TUN_METADATA44(84) since v2.5.       <44>
+     * NXM: NXM_NX_TUN_METADATA45(85) since v2.5.       <45>
+     * NXM: NXM_NX_TUN_METADATA46(86) since v2.5.       <46>
+     * NXM: NXM_NX_TUN_METADATA47(87) since v2.5.       <47>
+     * NXM: NXM_NX_TUN_METADATA48(88) since v2.5.       <48>
+     * NXM: NXM_NX_TUN_METADATA49(89) since v2.5.       <49>
+     * NXM: NXM_NX_TUN_METADATA50(90) since v2.5.       <50>
+     * NXM: NXM_NX_TUN_METADATA51(91) since v2.5.       <51>
+     * NXM: NXM_NX_TUN_METADATA52(92) since v2.5.       <52>
+     * NXM: NXM_NX_TUN_METADATA53(93) since v2.5.       <53>
+     * NXM: NXM_NX_TUN_METADATA54(94) since v2.5.       <54>
+     * NXM: NXM_NX_TUN_METADATA55(95) since v2.5.       <55>
+     * NXM: NXM_NX_TUN_METADATA56(96) since v2.5.       <56>
+     * NXM: NXM_NX_TUN_METADATA57(97) since v2.5.       <57>
+     * NXM: NXM_NX_TUN_METADATA58(98) since v2.5.       <58>
+     * NXM: NXM_NX_TUN_METADATA59(99) since v2.5.       <59>
+     * NXM: NXM_NX_TUN_METADATA60(100) since v2.5.      <60>
+     * NXM: NXM_NX_TUN_METADATA61(101) since v2.5.      <61>
+     * NXM: NXM_NX_TUN_METADATA62(102) since v2.5.      <62>
+     * NXM: NXM_NX_TUN_METADATA63(103) since v2.5.      <63>
+     * OXM: none.
+     */
+    MFF_TUN_METADATA0,
+    MFF_TUN_METADATA1,
+    MFF_TUN_METADATA2,
+    MFF_TUN_METADATA3,
+    MFF_TUN_METADATA4,
+    MFF_TUN_METADATA5,
+    MFF_TUN_METADATA6,
+    MFF_TUN_METADATA7,
+    MFF_TUN_METADATA8,
+    MFF_TUN_METADATA9,
+    MFF_TUN_METADATA10,
+    MFF_TUN_METADATA11,
+    MFF_TUN_METADATA12,
+    MFF_TUN_METADATA13,
+    MFF_TUN_METADATA14,
+    MFF_TUN_METADATA15,
+    MFF_TUN_METADATA16,
+    MFF_TUN_METADATA17,
+    MFF_TUN_METADATA18,
+    MFF_TUN_METADATA19,
+    MFF_TUN_METADATA20,
+    MFF_TUN_METADATA21,
+    MFF_TUN_METADATA22,
+    MFF_TUN_METADATA23,
+    MFF_TUN_METADATA24,
+    MFF_TUN_METADATA25,
+    MFF_TUN_METADATA26,
+    MFF_TUN_METADATA27,
+    MFF_TUN_METADATA28,
+    MFF_TUN_METADATA29,
+    MFF_TUN_METADATA30,
+    MFF_TUN_METADATA31,
+    MFF_TUN_METADATA32,
+    MFF_TUN_METADATA33,
+    MFF_TUN_METADATA34,
+    MFF_TUN_METADATA35,
+    MFF_TUN_METADATA36,
+    MFF_TUN_METADATA37,
+    MFF_TUN_METADATA38,
+    MFF_TUN_METADATA39,
+    MFF_TUN_METADATA40,
+    MFF_TUN_METADATA41,
+    MFF_TUN_METADATA42,
+    MFF_TUN_METADATA43,
+    MFF_TUN_METADATA44,
+    MFF_TUN_METADATA45,
+    MFF_TUN_METADATA46,
+    MFF_TUN_METADATA47,
+    MFF_TUN_METADATA48,
+    MFF_TUN_METADATA49,
+    MFF_TUN_METADATA50,
+    MFF_TUN_METADATA51,
+    MFF_TUN_METADATA52,
+    MFF_TUN_METADATA53,
+    MFF_TUN_METADATA54,
+    MFF_TUN_METADATA55,
+    MFF_TUN_METADATA56,
+    MFF_TUN_METADATA57,
+    MFF_TUN_METADATA58,
+    MFF_TUN_METADATA59,
+    MFF_TUN_METADATA60,
+    MFF_TUN_METADATA61,
+    MFF_TUN_METADATA62,
+    MFF_TUN_METADATA63,
+#else
+#error "Need to update MFF_TUN_METADATA* to match TUN_METADATA_NUM_OPTS"
+#endif
+
+    /* "metadata".
+     *
+     * A scratch pad value standardized in OpenFlow 1.1+.  Initially zero, at
+     * the beginning of the pipeline.
+     *
+     * Type: be64.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: OXM_OF_METADATA(2) since OF1.2 and v1.8.
+     * OF1.1: bitwise mask.
+     */
+    MFF_METADATA,
+
+    /* "in_port".
+     *
+     * 16-bit (OpenFlow 1.0) view of the physical or virtual port on which the
+     * packet was received.
+     *
+     * Type: be16.
+     * Maskable: no.
+     * Formatting: OpenFlow 1.0 port.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_OF_IN_PORT(0) since v1.1.
+     * OXM: none.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_IN_PORT,
+
+    /* "in_port_oxm".
+     *
+     * 32-bit (OpenFlow 1.1+) view of the physical or virtual port on which the
+     * packet was received.
+     *
+     * Type: be32.
+     * Maskable: no.
+     * Formatting: OpenFlow 1.1+ port.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: OXM_OF_IN_PORT(0) since OF1.2 and v1.7.
+     * OF1.1: exact match.
+     */
+    MFF_IN_PORT_OXM,
+
+    /* "actset_output".
+     *
+     * Type: be32.
+     * Maskable: no.
+     * Formatting: OpenFlow 1.1+ port.
+     * Prerequisites: none.
+     * Access: read-only.
+     * NXM: none.
+     * OXM: ONFOXM_ET_ACTSET_OUTPUT(43) since OF1.3 and v2.4,
+     *      OXM_OF_ACTSET_OUTPUT(43) since OF1.5 and v2.4.
+     */
+    MFF_ACTSET_OUTPUT,
+
+    /* "skb_priority".
+     *
+     * Designates the queue to which output will be directed.  The value in
+     * this field is not necessarily the OpenFlow queue number; with the Linux
+     * kernel switch, it instead has a pair of subfields designating the
+     * "major" and "minor" numbers of a Linux kernel qdisc handle.
+     *
+     * This field is "semi-internal" in that it can be set with the "set_queue"
+     * action but not matched or read or written other ways.
+     *
+     * Type: be32.
+     * Maskable: no.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read-only.
+     * NXM: none.
+     * OXM: none.
+     */
+    MFF_SKB_PRIORITY,
+
+    /* "pkt_mark".
+     *
+     * Packet metadata mark.  The mark may be passed into other system
+     * components in order to facilitate interaction between subsystems.  On
+     * Linux this corresponds to struct sk_buff's "skb_mark" member but the
+     * exact implementation is platform-dependent.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_PKT_MARK(33) since v2.0.
+     * OXM: none.
+     */
+    MFF_PKT_MARK,
+
+    /* "ct_state".
+     *
+     * Connection tracking state.  The field is populated by the NXAST_CT
+     * action.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: ct state.
+     * Prerequisites: none.
+     * Access: read-only.
+     * NXM: NXM_NX_CT_STATE(105) since v2.5.
+     * OXM: none.
+     */
+    MFF_CT_STATE,
+
+    /* "ct_zone".
+     *
+     * Connection tracking zone.  The field is populated by the
+     * NXAST_CT action.
+     *
+     * Type: be16.
+     * Maskable: no.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read-only.
+     * NXM: NXM_NX_CT_ZONE(106) since v2.5.
+     * OXM: none.
+     */
+    MFF_CT_ZONE,
+
+    /* "ct_mark".
+     *
+     * Connection tracking mark.  The mark is carried with the
+     * connection tracking state.  On Linux this corresponds to the
+     * nf_conn's "mark" member but the exact implementation is
+     * platform-dependent.
+     *
+     * Writable only from nested actions within the NXAST_CT action.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_CT_MARK(107) since v2.5.
+     * OXM: none.
+     */
+    MFF_CT_MARK,
+
+    /* "ct_label".
+     *
+     * Connection tracking label.  The label is carried with the
+     * connection tracking state.  On Linux this is held in the
+     * conntrack label extension but the exact implementation is
+     * platform-dependent.
+     *
+     * Writable only from nested actions within the NXAST_CT action.
+     *
+     * Type: be128.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_CT_LABEL(108) since v2.5.
+     * OXM: none.
+     */
+    MFF_CT_LABEL,
+
+#if FLOW_N_REGS == 16
+    /* "reg<N>".
+     *
+     * Nicira extension scratch pad register with initial value 0.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_REG0(0) since v1.1.        <0>
+     * NXM: NXM_NX_REG1(1) since v1.1.        <1>
+     * NXM: NXM_NX_REG2(2) since v1.1.        <2>
+     * NXM: NXM_NX_REG3(3) since v1.1.        <3>
+     * NXM: NXM_NX_REG4(4) since v1.3.        <4>
+     * NXM: NXM_NX_REG5(5) since v1.7.        <5>
+     * NXM: NXM_NX_REG6(6) since v1.7.        <6>
+     * NXM: NXM_NX_REG7(7) since v1.7.        <7>
+     * NXM: NXM_NX_REG8(8) since v2.6.        <8>
+     * NXM: NXM_NX_REG9(9) since v2.6.        <9>
+     * NXM: NXM_NX_REG10(10) since v2.6.      <10>
+     * NXM: NXM_NX_REG11(11) since v2.6.      <11>
+     * NXM: NXM_NX_REG12(12) since v2.6.      <12>
+     * NXM: NXM_NX_REG13(13) since v2.6.      <13>
+     * NXM: NXM_NX_REG14(14) since v2.6.      <14>
+     * NXM: NXM_NX_REG15(15) since v2.6.      <15>
+     * OXM: none.
+     */
+    MFF_REG0,
+    MFF_REG1,
+    MFF_REG2,
+    MFF_REG3,
+    MFF_REG4,
+    MFF_REG5,
+    MFF_REG6,
+    MFF_REG7,
+    MFF_REG8,
+    MFF_REG9,
+    MFF_REG10,
+    MFF_REG11,
+    MFF_REG12,
+    MFF_REG13,
+    MFF_REG14,
+    MFF_REG15,
+#else
+#error "Need to update MFF_REG* to match FLOW_N_REGS"
+#endif
+
+#if FLOW_N_XREGS == 8
+    /* "xreg<N>".
+     *
+     * OpenFlow 1.5 ``extended register".
+     *
+     * Type: be64.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: OXM_OF_PKT_REG<N>(<N>) since OF1.3 and v2.4.
+     */
+    MFF_XREG0,
+    MFF_XREG1,
+    MFF_XREG2,
+    MFF_XREG3,
+    MFF_XREG4,
+    MFF_XREG5,
+    MFF_XREG6,
+    MFF_XREG7,
+#else
+#error "Need to update MFF_REG* to match FLOW_N_XREGS"
+#endif
+
+#if FLOW_N_XXREGS == 4
+    /* "xxreg<N>".
+     *
+     * ``extended-extended register".
+     *
+     * Type: be128.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_NX_XXREG0(111) since v2.6.              <0>
+     * NXM: NXM_NX_XXREG1(112) since v2.6.              <1>
+     * NXM: NXM_NX_XXREG2(113) since v2.6.              <2>
+     * NXM: NXM_NX_XXREG3(114) since v2.6.              <3>
+     * NXM: NXM_NX_XXREG4(115) since vX.Y.              <4>
+     * NXM: NXM_NX_XXREG5(116) since vX.Y.              <5>
+     * NXM: NXM_NX_XXREG6(117) since vX.Y.              <6>
+     * NXM: NXM_NX_XXREG7(118) since vX.Y.              <7>
+     * OXM: none.
+     */
+    MFF_XXREG0,
+    MFF_XXREG1,
+    MFF_XXREG2,
+    MFF_XXREG3,
+#else
+#error "Need to update MFF_REG* to match FLOW_N_XXREGS"
+#endif
+
+/* ## -------- ## */
+/* ## Ethernet ## */
+/* ## -------- ## */
+
+    /* "eth_src" (aka "dl_src").
+     *
+     * Source address in Ethernet header.
+     *
+     * Type: MAC.
+     * Maskable: bitwise.
+     * Formatting: Ethernet.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_OF_ETH_SRC(2) since v1.1.
+     * OXM: OXM_OF_ETH_SRC(4) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: bitwise mask.
+     */
+    MFF_ETH_SRC,
+
+    /* "eth_dst" (aka "dl_dst").
+     *
+     * Destination address in Ethernet header.
+     *
+     * Type: MAC.
+     * Maskable: bitwise.
+     * Formatting: Ethernet.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_OF_ETH_DST(1) since v1.1.
+     * OXM: OXM_OF_ETH_DST(3) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: bitwise mask.
+     */
+    MFF_ETH_DST,
+
+    /* "eth_type" (aka "dl_type").
+     *
+     * Packet's Ethernet type.
+     *
+     * For a packet with an 802.1Q header, this is the type of the encapsulated
+     * frame.
+     *
+     * Type: be16.
+     * Maskable: no.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read-only.
+     * NXM: NXM_OF_ETH_TYPE(3) since v1.1.
+     * OXM: OXM_OF_ETH_TYPE(5) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_ETH_TYPE,
+
+/* ## ---- ## */
+/* ## VLAN ## */
+/* ## ---- ## */
+
+/* It looks odd for vlan_tci, vlan_vid, and vlan_pcp to say that they are
+ * supported in OF1.0 and OF1.1, since the detailed semantics of these fields
+ * only apply to NXM or OXM.  They are marked as supported for exact matches in
+ * OF1.0 and OF1.1 because exact matches on those fields can be successfully
+ * translated into the OF1.0 and OF1.1 flow formats. */
+
+    /* "vlan_tci".
+     *
+     * 802.1Q TCI.
+     *
+     * For a packet with an 802.1Q header, this is the Tag Control Information
+     * (TCI) field, with the CFI bit forced to 1.  For a packet with no 802.1Q
+     * header, this has value 0.
+     *
+     * Type: be16.
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: NXM_OF_VLAN_TCI(4) since v1.1.
+     * OXM: none.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_VLAN_TCI,
+
+    /* "dl_vlan" (OpenFlow 1.0).
+     *
+     * VLAN ID field.  Zero if no 802.1Q header is present.
+     *
+     * Type: be16 (low 12 bits).
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: none.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_DL_VLAN,
+
+    /* "vlan_vid" (OpenFlow 1.2+).
+     *
+     * If an 802.1Q header is present, this field's value is 0x1000
+     * bitwise-or'd with the VLAN ID.  If no 802.1Q is present, this field's
+     * value is 0.
+     *
+     * Type: be16 (low 12 bits).
+     * Maskable: bitwise.
+     * Formatting: decimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: OXM_OF_VLAN_VID(6) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_VLAN_VID,
+
+    /* "dl_vlan_pcp" (OpenFlow 1.0).
+     *
+     * VLAN priority (PCP) field.  Zero if no 802.1Q header is present.
+     *
+     * Type: u8 (low 3 bits).
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: none.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: none.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_DL_VLAN_PCP,
+
+    /* "vlan_pcp" (OpenFlow 1.2+).
+     *
+     * VLAN priority (PCP) field.  Zero if no 802.1Q header is present.
+     *
+     * Type: u8 (low 3 bits).
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: VLAN VID.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: OXM_OF_VLAN_PCP(7) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_VLAN_PCP,
+
+/* ## ---- ## */
+/* ## MPLS ## */
+/* ## ---- ## */
+
+    /* "mpls_label".
+     *
+     * The outermost MPLS label, or 0 if no MPLS labels are present.
+     *
+     * Type: be32 (low 20 bits).
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: MPLS.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: OXM_OF_MPLS_LABEL(34) since OF1.2 and v1.11.
+     * OF1.1: exact match.
+     */
+    MFF_MPLS_LABEL,
+
+    /* "mpls_tc".
+     *
+     * The outermost MPLS label's traffic control (TC) field, or 0 if no MPLS
+     * labels are present.
+     *
+     * Type: u8 (low 3 bits).
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: MPLS.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: OXM_OF_MPLS_TC(35) since OF1.2 and v1.11.
+     * OF1.1: exact match.
+     */
+    MFF_MPLS_TC,
+
+    /* "mpls_bos".
+     *
+     * The outermost MPLS label's bottom of stack (BoS) field, or 0 if no MPLS
+     * labels are present.
+     *
+     * Type: u8 (low 1 bits).
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: MPLS.
+     * Access: read-only.
+     * NXM: none.
+     * OXM: OXM_OF_MPLS_BOS(36) since OF1.3 and v1.11.
+     */
+    MFF_MPLS_BOS,
+
+    /* "mpls_ttl".
+     *
+     * The outermost MPLS label's time-to-live (TTL) field, or 0 if no MPLS
+     * labels are present.
+     *
+     * Type: u8.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: MPLS.
+     * Access: read/write.
+     * NXM: NXM_NX_MPLS_TTL(30) since v2.6.
+     * OXM: none.
+     */
+    MFF_MPLS_TTL,
+
+/* ## ---- ## */
+/* ## IPv4 ## */
+/* ## ---- ## */
+
+/* Update mf_is_l3_or_higher() if MFF_IPV4_SRC is no longer the first element
+ * for a field of layer 3 or higher */
+
+    /* "ip_src" (aka "nw_src").
+     *
+     * The source address in the IPv4 header.
+     *
+     * Before Open vSwitch 1.8, only CIDR masks were supported.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: IPv4.
+     * Prerequisites: IPv4.
+     * Access: read/write.
+     * NXM: NXM_OF_IP_SRC(7) since v1.1.
+     * OXM: OXM_OF_IPV4_SRC(11) since OF1.2 and v1.7.
+     * OF1.0: CIDR mask.
+     * OF1.1: bitwise mask.
+     * Prefix lookup member: nw_src.
+     */
+    MFF_IPV4_SRC,
+
+    /* "ip_dst" (aka "nw_dst").
+     *
+     * The destination address in the IPv4 header.
+     *
+     * Before Open vSwitch 1.8, only CIDR masks were supported.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: IPv4.
+     * Prerequisites: IPv4.
+     * Access: read/write.
+     * NXM: NXM_OF_IP_DST(8) since v1.1.
+     * OXM: OXM_OF_IPV4_DST(12) since OF1.2 and v1.7.
+     * OF1.0: CIDR mask.
+     * OF1.1: bitwise mask.
+     * Prefix lookup member: nw_dst.
+     */
+    MFF_IPV4_DST,
+
+/* ## ---- ## */
+/* ## IPv6 ## */
+/* ## ---- ## */
+
+    /* "ipv6_src".
+     *
+     * The source address in the IPv6 header.
+     *
+     * Type: be128.
+     * Maskable: bitwise.
+     * Formatting: IPv6.
+     * Prerequisites: IPv6.
+     * Access: read/write.
+     * NXM: NXM_NX_IPV6_SRC(19) since v1.1.
+     * OXM: OXM_OF_IPV6_SRC(26) since OF1.2 and v1.1.
+     * Prefix lookup member: ipv6_src.
+     */
+    MFF_IPV6_SRC,
+
+    /* "ipv6_dst".
+     *
+     * The destination address in the IPv6 header.
+     *
+     * Type: be128.
+     * Maskable: bitwise.
+     * Formatting: IPv6.
+     * Prerequisites: IPv6.
+     * Access: read/write.
+     * NXM: NXM_NX_IPV6_DST(20) since v1.1.
+     * OXM: OXM_OF_IPV6_DST(27) since OF1.2 and v1.1.
+     * Prefix lookup member: ipv6_dst.
+     */
+    MFF_IPV6_DST,
+
+    /* "ipv6_label".
+     *
+     * The flow label in the IPv6 header.
+     *
+     * Type: be32 (low 20 bits).
+     * Maskable: bitwise.
+     * Formatting: hexadecimal.
+     * Prerequisites: IPv6.
+     * Access: read/write.
+     * NXM: NXM_NX_IPV6_LABEL(27) since v1.4.
+     * OXM: OXM_OF_IPV6_FLABEL(28) since OF1.2 and v1.7.
+     */
+    MFF_IPV6_LABEL,
+
+/* ## ----------------------- ## */
+/* ## IPv4/IPv6 common fields ## */
+/* ## ----------------------- ## */
+
+    /* "nw_proto" (aka "ip_proto").
+     *
+     * The "protocol" byte in the IPv4 or IPv6 header.
+     *
+     * Type: u8.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: IPv4/IPv6.
+     * Access: read-only.
+     * NXM: NXM_OF_IP_PROTO(6) since v1.1.
+     * OXM: OXM_OF_IP_PROTO(10) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_IP_PROTO,
+
+/* Both views of the DSCP below are marked as supported in all of the versions
+ * of OpenFlow because a match on either view can be successfully translated
+ * into every OpenFlow flow format. */
+
+    /* "nw_tos" (OpenFlow 1.0/1.1).
+     *
+     * The DSCP byte in the IPv4 header or the traffic class byte from the IPv6
+     * header, with the ECN bits forced to 0.  (That is, bits 2-7 contain the
+     * type of service and bits 0-1 are zero.)
+     *
+     * Type: u8.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: IPv4/IPv6.
+     * Access: read/write.
+     * NXM: NXM_OF_IP_TOS(5) since v1.1.
+     * OXM: none.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_IP_DSCP,
+
+    /* "ip_dscp" (OpenFlow 1.2+).
+     *
+     * The DSCP byte in the IPv4 header or the traffic class byte from the IPv6
+     * header, shifted right 2 bits.  (That is, bits 0-5 contain the type of
+     * service and bits 6-7 are zero.)
+     *
+     * Type: u8 (low 6 bits).
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: IPv4/IPv6.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: OXM_OF_IP_DSCP(8) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_IP_DSCP_SHIFTED,
+
+    /* "nw_ecn" (aka "ip_ecn").
+     *
+     * The ECN bits in the IPv4 or IPv6 header.
+     *
+     * Type: u8 (low 2 bits).
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: IPv4/IPv6.
+     * Access: read/write.
+     * NXM: NXM_NX_IP_ECN(28) since v1.4.
+     * OXM: OXM_OF_IP_ECN(9) since OF1.2 and v1.7.
+     */
+    MFF_IP_ECN,
+
+    /* "nw_ttl".
+     *
+     * The time-to-live (TTL) in the IPv4 header or hop limit in the IPv6
+     * header.
+     *
+     * Type: u8.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: IPv4/IPv6.
+     * Access: read/write.
+     * NXM: NXM_NX_IP_TTL(29) since v1.4.
+     * OXM: none.
+     */
+    MFF_IP_TTL,
+
+    /* "ip_frag".
+     *
+     * IP fragment information.
+     *
+     * Type: u8 (low 2 bits).
+     * Maskable: bitwise.
+     * Formatting: frag.
+     * Prerequisites: IPv4/IPv6.
+     * Access: read-only.
+     * NXM: NXM_NX_IP_FRAG(26) since v1.3.
+     * OXM: none.
+     */
+    MFF_IP_FRAG,
+
+/* ## --- ## */
+/* ## ARP ## */
+/* ## --- ## */
+
+    /* "arp_op".
+     *
+     * ARP opcode.
+     *
+     * For an Ethernet+IP ARP packet, the opcode in the ARP header.  Always 0
+     * otherwise.  Only ARP opcodes between 1 and 255 should be specified for
+     * matching.
+     *
+     * Type: be16.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: ARP.
+     * Access: read/write.
+     * NXM: NXM_OF_ARP_OP(15) since v1.1.
+     * OXM: OXM_OF_ARP_OP(21) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_ARP_OP,
+
+    /* "arp_spa".
+     *
+     * For an Ethernet+IP ARP packet, the source protocol (IPv4) address in the
+     * ARP header.  Always 0 otherwise.
+     *
+     * Before Open vSwitch 1.8, only CIDR masks were supported.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: IPv4.
+     * Prerequisites: ARP.
+     * Access: read/write.
+     * NXM: NXM_OF_ARP_SPA(16) since v1.1.
+     * OXM: OXM_OF_ARP_SPA(22) since OF1.2 and v1.7.
+     * OF1.0: CIDR mask.
+     * OF1.1: bitwise mask.
+     */
+    MFF_ARP_SPA,
+
+    /* "arp_tpa".
+     *
+     * For an Ethernet+IP ARP packet, the target protocol (IPv4) address in the
+     * ARP header.  Always 0 otherwise.
+     *
+     * Before Open vSwitch 1.8, only CIDR masks were supported.
+     *
+     * Type: be32.
+     * Maskable: bitwise.
+     * Formatting: IPv4.
+     * Prerequisites: ARP.
+     * Access: read/write.
+     * NXM: NXM_OF_ARP_TPA(17) since v1.1.
+     * OXM: OXM_OF_ARP_TPA(23) since OF1.2 and v1.7.
+     * OF1.0: CIDR mask.
+     * OF1.1: bitwise mask.
+     */
+    MFF_ARP_TPA,
+
+    /* "arp_sha".
+     *
+     * For an Ethernet+IP ARP packet, the source hardware (Ethernet) address in
+     * the ARP header.  Always 0 otherwise.
+     *
+     * Type: MAC.
+     * Maskable: bitwise.
+     * Formatting: Ethernet.
+     * Prerequisites: ARP.
+     * Access: read/write.
+     * NXM: NXM_NX_ARP_SHA(17) since v1.1.
+     * OXM: OXM_OF_ARP_SHA(24) since OF1.2 and v1.7.
+     */
+    MFF_ARP_SHA,
+
+    /* "arp_tha".
+     *
+     * For an Ethernet+IP ARP packet, the target hardware (Ethernet) address in
+     * the ARP header.  Always 0 otherwise.
+     *
+     * Type: MAC.
+     * Maskable: bitwise.
+     * Formatting: Ethernet.
+     * Prerequisites: ARP.
+     * Access: read/write.
+     * NXM: NXM_NX_ARP_THA(18) since v1.1.
+     * OXM: OXM_OF_ARP_THA(25) since OF1.2 and v1.7.
+     */
+    MFF_ARP_THA,
+
+/* ## --- ## */
+/* ## TCP ## */
+/* ## --- ## */
+
+    /* "tcp_src" (aka "tp_src").
+     *
+     * TCP source port.
+     *
+     * Type: be16.
+     * Maskable: bitwise.
+     * Formatting: decimal.
+     * Prerequisites: TCP.
+     * Access: read/write.
+     * NXM: NXM_OF_TCP_SRC(9) since v1.1.
+     * OXM: OXM_OF_TCP_SRC(13) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_TCP_SRC,
+
+    /* "tcp_dst" (aka "tp_dst").
+     *
+     * TCP destination port.
+     *
+     * Type: be16.
+     * Maskable: bitwise.
+     * Formatting: decimal.
+     * Prerequisites: TCP.
+     * Access: read/write.
+     * NXM: NXM_OF_TCP_DST(10) since v1.1.
+     * OXM: OXM_OF_TCP_DST(14) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_TCP_DST,
+
+    /* "tcp_flags".
+     *
+     * Flags in the TCP header.
+     *
+     * TCP currently defines 9 flag bits, and additional 3 bits are reserved
+     * (must be transmitted as zero).  See RFCs 793, 3168, and 3540.
+     *
+     * Type: be16 (low 12 bits).
+     * Maskable: bitwise.
+     * Formatting: TCP flags.
+     * Prerequisites: TCP.
+     * Access: read-only.
+     * NXM: NXM_NX_TCP_FLAGS(34) since v2.1.
+     * OXM: ONFOXM_ET_TCP_FLAGS(42) since OF1.3 and v2.4,
+     *      OXM_OF_TCP_FLAGS(42) since OF1.5 and v2.3.
+     */
+    MFF_TCP_FLAGS,
+
+/* ## --- ## */
+/* ## UDP ## */
+/* ## --- ## */
+
+    /* "udp_src".
+     *
+     * UDP source port.
+     *
+     * Type: be16.
+     * Maskable: bitwise.
+     * Formatting: decimal.
+     * Prerequisites: UDP.
+     * Access: read/write.
+     * NXM: NXM_OF_UDP_SRC(11) since v1.1.
+     * OXM: OXM_OF_UDP_SRC(15) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_UDP_SRC,
+
+    /* "udp_dst".
+     *
+     * UDP destination port
+     *
+     * Type: be16.
+     * Maskable: bitwise.
+     * Formatting: decimal.
+     * Prerequisites: UDP.
+     * Access: read/write.
+     * NXM: NXM_OF_UDP_DST(12) since v1.1.
+     * OXM: OXM_OF_UDP_DST(16) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_UDP_DST,
+
+/* ## ---- ## */
+/* ## SCTP ## */
+/* ## ---- ## */
+
+    /* "sctp_src".
+     *
+     * SCTP source port.
+     *
+     * Type: be16.
+     * Maskable: bitwise.
+     * Formatting: decimal.
+     * Prerequisites: SCTP.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: OXM_OF_SCTP_SRC(17) since OF1.2 and v2.0.
+     * OF1.1: exact match.
+     */
+    MFF_SCTP_SRC,
+
+    /* "sctp_dst".
+     *
+     * SCTP destination port.
+     *
+     * Type: be16.
+     * Maskable: bitwise.
+     * Formatting: decimal.
+     * Prerequisites: SCTP.
+     * Access: read/write.
+     * NXM: none.
+     * OXM: OXM_OF_SCTP_DST(18) since OF1.2 and v2.0.
+     * OF1.1: exact match.
+     */
+    MFF_SCTP_DST,
+
+/* ## ---- ## */
+/* ## ICMP ## */
+/* ## ---- ## */
+
+    /* "icmp_type".
+     *
+     * ICMPv4 type.
+     *
+     * Type: u8.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: ICMPv4.
+     * Access: read/write.
+     * NXM: NXM_OF_ICMP_TYPE(13) since v1.1.
+     * OXM: OXM_OF_ICMPV4_TYPE(19) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_ICMPV4_TYPE,
+
+    /* "icmp_code".
+     *
+     * ICMPv4 code.
+     *
+     * Type: u8.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: ICMPv4.
+     * Access: read/write.
+     * NXM: NXM_OF_ICMP_CODE(14) since v1.1.
+     * OXM: OXM_OF_ICMPV4_CODE(20) since OF1.2 and v1.7.
+     * OF1.0: exact match.
+     * OF1.1: exact match.
+     */
+    MFF_ICMPV4_CODE,
+
+    /* "icmpv6_type".
+     *
+     * ICMPv6 type.
+     *
+     * Type: u8.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: ICMPv6.
+     * Access: read/write.
+     * NXM: NXM_NX_ICMPV6_TYPE(21) since v1.1.
+     * OXM: OXM_OF_ICMPV6_TYPE(29) since OF1.2 and v1.7.
+     */
+    MFF_ICMPV6_TYPE,
+
+    /* "icmpv6_code".
+     *
+     * ICMPv6 code.
+     *
+     * Type: u8.
+     * Maskable: no.
+     * Formatting: decimal.
+     * Prerequisites: ICMPv6.
+     * Access: read/write.
+     * NXM: NXM_NX_ICMPV6_CODE(22) since v1.1.
+     * OXM: OXM_OF_ICMPV6_CODE(30) since OF1.2 and v1.7.
+     */
+    MFF_ICMPV6_CODE,
+
+/* ## ------------------------- ## */
+/* ## ICMPv6 Neighbor Discovery ## */
+/* ## ------------------------- ## */
+
+    /* "nd_target".
+     *
+     * The target address in an IPv6 Neighbor Discovery message.
+     *
+     * Before Open vSwitch 1.8, only CIDR masks were supported.
+     *
+     * Type: be128.
+     * Maskable: bitwise.
+     * Formatting: IPv6.
+     * Prerequisites: ND.
+     * Access: read/write.
+     * NXM: NXM_NX_ND_TARGET(23) since v1.1.
+     * OXM: OXM_OF_IPV6_ND_TARGET(31) since OF1.2 and v1.7.
+     */
+    MFF_ND_TARGET,
+
+    /* "nd_sll".
+     *
+     * The source link layer address in an IPv6 Neighbor Discovery message.
+     *
+     * Type: MAC.
+     * Maskable: bitwise.
+     * Formatting: Ethernet.
+     * Prerequisites: ND solicit.
+     * Access: read/write.
+     * NXM: NXM_NX_ND_SLL(24) since v1.1.
+     * OXM: OXM_OF_IPV6_ND_SLL(32) since OF1.2 and v1.7.
+     */
+    MFF_ND_SLL,
+
+    /* "nd_tll".
+     *
+     * The target link layer address in an IPv6 Neighbor Discovery message.
+     *
+     * Type: MAC.
+     * Maskable: bitwise.
+     * Formatting: Ethernet.
+     * Prerequisites: ND advert.
+     * Access: read/write.
+     * NXM: NXM_NX_ND_TLL(25) since v1.1.
+     * OXM: OXM_OF_IPV6_ND_TLL(33) since OF1.2 and v1.7.
+     */
+    MFF_ND_TLL,
+
+    MFF_N_IDS
+};
+
+/* A set of mf_field_ids. */
+struct mf_bitmap {
+    unsigned long bm[BITMAP_N_LONGS(MFF_N_IDS)];
+};
+#define MF_BITMAP_INITIALIZER { { [0] = 0 } }
+
+/* Use this macro as CASE_MFF_REGS: in a switch statement to choose all of the
+ * MFF_REGn cases. */
+#if FLOW_N_REGS ==16
+#define CASE_MFF_REGS                                             \
+    case MFF_REG0: case MFF_REG1: case MFF_REG2: case MFF_REG3:   \
+    case MFF_REG4: case MFF_REG5: case MFF_REG6: case MFF_REG7:   \
+    case MFF_REG8: case MFF_REG9: case MFF_REG10: case MFF_REG11: \
+    case MFF_REG12: case MFF_REG13: case MFF_REG14: case MFF_REG15
+#else
+#error "Need to update CASE_MFF_REGS to match FLOW_N_REGS"
+#endif
+
+/* Use this macro as CASE_MFF_XREGS: in a switch statement to choose all of the
+ * MFF_REGn cases. */
+#if FLOW_N_XREGS == 8
+#define CASE_MFF_XREGS                                              \
+    case MFF_XREG0: case MFF_XREG1: case MFF_XREG2: case MFF_XREG3: \
+    case MFF_XREG4: case MFF_XREG5: case MFF_XREG6: case MFF_XREG7
+#else
+#error "Need to update CASE_MFF_XREGS to match FLOW_N_XREGS"
+#endif
+
+/* Use this macro as CASE_MFF_XXREGS: in a switch statement to choose
+ * all of the MFF_REGn cases. */
+#if FLOW_N_XXREGS == 4
+#define CASE_MFF_XXREGS                                              \
+    case MFF_XXREG0: case MFF_XXREG1: case MFF_XXREG2: case MFF_XXREG3
+#else
+#error "Need to update CASE_MFF_XXREGS to match FLOW_N_XXREGS"
+#endif
+
+static inline bool
+mf_is_register(enum mf_field_id id)
+{
+    return ((id >= MFF_REG0   && id < MFF_REG0   + FLOW_N_REGS) ||
+            (id >= MFF_XREG0  && id < MFF_XREG0  + FLOW_N_XREGS) ||
+            (id >= MFF_XXREG0 && id < MFF_XXREG0 + FLOW_N_XXREGS));
+}
+
+/* Use this macro as CASE_MFF_TUN_METADATA: in a switch statement to choose
+ * all of the MFF_TUN_METADATAn cases. */
+#define CASE_MFF_TUN_METADATA                         \
+    case MFF_TUN_METADATA0: case MFF_TUN_METADATA1:   \
+    case MFF_TUN_METADATA2: case MFF_TUN_METADATA3:   \
+    case MFF_TUN_METADATA4: case MFF_TUN_METADATA5:   \
+    case MFF_TUN_METADATA6: case MFF_TUN_METADATA7:   \
+    case MFF_TUN_METADATA8: case MFF_TUN_METADATA9:   \
+    case MFF_TUN_METADATA10: case MFF_TUN_METADATA11: \
+    case MFF_TUN_METADATA12: case MFF_TUN_METADATA13: \
+    case MFF_TUN_METADATA14: case MFF_TUN_METADATA15: \
+    case MFF_TUN_METADATA16: case MFF_TUN_METADATA17: \
+    case MFF_TUN_METADATA18: case MFF_TUN_METADATA19: \
+    case MFF_TUN_METADATA20: case MFF_TUN_METADATA21: \
+    case MFF_TUN_METADATA22: case MFF_TUN_METADATA23: \
+    case MFF_TUN_METADATA24: case MFF_TUN_METADATA25: \
+    case MFF_TUN_METADATA26: case MFF_TUN_METADATA27: \
+    case MFF_TUN_METADATA28: case MFF_TUN_METADATA29: \
+    case MFF_TUN_METADATA30: case MFF_TUN_METADATA31: \
+    case MFF_TUN_METADATA32: case MFF_TUN_METADATA33: \
+    case MFF_TUN_METADATA34: case MFF_TUN_METADATA35: \
+    case MFF_TUN_METADATA36: case MFF_TUN_METADATA37: \
+    case MFF_TUN_METADATA38: case MFF_TUN_METADATA39: \
+    case MFF_TUN_METADATA40: case MFF_TUN_METADATA41: \
+    case MFF_TUN_METADATA42: case MFF_TUN_METADATA43: \
+    case MFF_TUN_METADATA44: case MFF_TUN_METADATA45: \
+    case MFF_TUN_METADATA46: case MFF_TUN_METADATA47: \
+    case MFF_TUN_METADATA48: case MFF_TUN_METADATA49: \
+    case MFF_TUN_METADATA50: case MFF_TUN_METADATA51: \
+    case MFF_TUN_METADATA52: case MFF_TUN_METADATA53: \
+    case MFF_TUN_METADATA54: case MFF_TUN_METADATA55: \
+    case MFF_TUN_METADATA56: case MFF_TUN_METADATA57: \
+    case MFF_TUN_METADATA58: case MFF_TUN_METADATA59: \
+    case MFF_TUN_METADATA60: case MFF_TUN_METADATA61: \
+    case MFF_TUN_METADATA62: case MFF_TUN_METADATA63
+
+/* Prerequisites for matching a field.
+ *
+ * A field may only be matched if the correct lower-level protocols are also
+ * matched.  For example, the TCP port may be matched only if the Ethernet type
+ * matches ETH_TYPE_IP and the IP protocol matches IPPROTO_TCP. */
+enum OVS_PACKED_ENUM mf_prereqs {
+    MFP_NONE,
+
+    /* L2 requirements. */
+    MFP_ARP,
+    MFP_VLAN_VID,
+    MFP_IPV4,
+    MFP_IPV6,
+    MFP_IP_ANY,
+
+    /* L2.5 requirements. */
+    MFP_MPLS,
+
+    /* L2+L3 requirements. */
+    MFP_TCP,                    /* On IPv4 or IPv6. */
+    MFP_UDP,                    /* On IPv4 or IPv6. */
+    MFP_SCTP,                   /* On IPv4 or IPv6. */
+    MFP_ICMPV4,
+    MFP_ICMPV6,
+
+    /* L2+L3+L4 requirements. */
+    MFP_ND,
+    MFP_ND_SOLICIT,
+    MFP_ND_ADVERT
+};
+
+/* Forms of partial-field masking allowed for a field.
+ *
+ * Every field may be masked as a whole. */
+enum OVS_PACKED_ENUM mf_maskable {
+    MFM_NONE,                   /* No sub-field masking. */
+    MFM_FULLY,                  /* Every bit is individually maskable. */
+};
+
+/* How to format or parse a field's value. */
+enum OVS_PACKED_ENUM mf_string {
+    /* Integer formats.
+     *
+     * The particular MFS_* constant sets the output format.  On input, either
+     * decimal or hexadecimal (prefixed with 0x) is accepted. */
+    MFS_DECIMAL,
+    MFS_HEXADECIMAL,
+
+    /* Other formats. */
+    MFS_CT_STATE,               /* Connection tracking state */
+    MFS_ETHERNET,
+    MFS_IPV4,
+    MFS_IPV6,
+    MFS_OFP_PORT,               /* 16-bit OpenFlow 1.0 port number or name. */
+    MFS_OFP_PORT_OXM,           /* 32-bit OpenFlow 1.1+ port number or name. */
+    MFS_FRAG,                   /* no, yes, first, later, not_later */
+    MFS_TNL_FLAGS,              /* FLOW_TNL_F_* flags */
+    MFS_TCP_FLAGS,              /* TCP_* flags */
+};
+
+struct mf_field {
+    /* Identification. */
+    enum mf_field_id id;        /* MFF_*. */
+    const char *name;           /* Name of this field, e.g. "eth_type". */
+    const char *extra_name;     /* Alternate name, e.g. "dl_type", or NULL. */
+
+    /* Size.
+     *
+     * Most fields have n_bytes * 8 == n_bits.  There are a few exceptions:
+     *
+     *     - "dl_vlan" is 2 bytes but only 12 bits.
+     *     - "dl_vlan_pcp" is 1 byte but only 3 bits.
+     *     - "is_frag" is 1 byte but only 2 bits.
+     *     - "ipv6_label" is 4 bytes but only 20 bits.
+     *     - "mpls_label" is 4 bytes but only 20 bits.
+     *     - "mpls_tc"    is 1 byte but only 3 bits.
+     *     - "mpls_bos"   is 1 byte but only 1 bit.
+     */
+    unsigned int n_bytes;       /* Width of the field in bytes. */
+    unsigned int n_bits;        /* Number of significant bits in field. */
+    bool variable_len;          /* Length is variable, if so width is max. */
+
+    /* Properties. */
+    enum mf_maskable maskable;
+    enum mf_string string;
+    enum mf_prereqs prereqs;
+    bool writable;              /* May be written by actions? */
+    bool mapped;                /* Variable length mf_field is mapped. */
+
+    /* Usable protocols.
+     *
+     * NXM and OXM are extensible, allowing later extensions to be sent in
+     * earlier protocol versions, so this does not necessarily correspond to
+     * the OpenFlow protocol version the field was introduced in.
+     * Also, some field types are tranparently mapped to each other via the
+     * struct flow (like vlan and dscp/tos fields), so each variant supports
+     * all protocols.
+     *
+     * These are combinations of OFPUTIL_P_*.  (They are not declared as type
+     * enum ofputil_protocol because that would give meta-flow.h and ofp-util.h
+     * a circular dependency.) */
+    uint32_t usable_protocols_exact;   /* Matching or setting whole field. */
+    uint32_t usable_protocols_cidr;    /* Matching a CIDR mask in field. */
+    uint32_t usable_protocols_bitwise; /* Matching arbitrary bits in field. */
+
+    int flow_be32ofs;  /* Field's be32 offset in "struct flow", if prefix tree
+                        * lookup is supported for the field, or -1. */
+};
+
+/* The representation of a field's value. */
+union mf_value {
+    uint8_t b[128];
+    uint8_t tun_metadata[128];
+    struct in6_addr ipv6;
+    struct eth_addr mac;
+    ovs_be128 be128;
+    ovs_be64 be64;
+    ovs_be32 be32;
+    ovs_be16 be16;
+    uint8_t u8;
+};
+BUILD_ASSERT_DECL(sizeof(union mf_value) == 128);
+BUILD_ASSERT_DECL(sizeof(union mf_value) >= TLV_MAX_OPT_SIZE);
+
+/* A const mf_value with all bits initialized to ones. */
+extern const union mf_value exact_match_mask;
+
+/* Part of a field. */
+struct mf_subfield {
+    const struct mf_field *field;
+    unsigned int ofs;           /* Bit offset. */
+    unsigned int n_bits;        /* Number of bits. */
+};
+
+/* Data for some part of an mf_field.
+ *
+ * The data is stored "right-justified".  For example, if "union mf_subvalue
+ * value" contains NXM_OF_VLAN_TCI[0..11], then one could access the
+ * corresponding data in value.be16[7] as the bits in the mask htons(0xfff). */
+union mf_subvalue {
+    /* Access to full data. */
+    uint8_t u8[128];
+    ovs_be16 be16[64];
+    ovs_be32 be32[32];
+    ovs_be64 be64[16];
+    ovs_be128 be128[8];
+
+    /* Convenient access to just least-significant bits in various forms. */
+    struct {
+        uint8_t dummy_u8[127];
+        uint8_t u8_val;
+    };
+    struct {
+        ovs_be16 dummy_be16[63];
+        ovs_be16 be16_int;
+    };
+    struct {
+        ovs_be32 dummy_be32[31];
+        ovs_be32 be32_int;
+    };
+    struct {
+        ovs_be64 dummy_integer[15];
+        ovs_be64 integer;
+    };
+    struct {
+        ovs_be128 dummy_be128[7];
+        ovs_be128 be128_int;
+    };
+    struct {
+        uint8_t dummy_mac[122];
+        struct eth_addr mac;
+    };
+    struct {
+        ovs_be32 dummy_ipv4[31];
+        ovs_be32 ipv4;
+    };
+    struct {
+        struct in6_addr dummy_ipv6[7];
+        struct in6_addr ipv6;
+    };
+};
+BUILD_ASSERT_DECL(sizeof(union mf_value) == sizeof (union mf_subvalue));
+
+bool mf_subvalue_intersect(const union mf_subvalue *a_value,
+                           const union mf_subvalue *a_mask,
+                           const union mf_subvalue *b_value,
+                           const union mf_subvalue *b_mask,
+                           union mf_subvalue *dst_value,
+                           union mf_subvalue *dst_mask);
+int mf_subvalue_width(const union mf_subvalue *);
+void mf_subvalue_shift(union mf_subvalue *, int n);
+void mf_subvalue_format(const union mf_subvalue *, struct ds *);
+
+static inline void mf_subvalue_from_value(const struct mf_subfield *sf,
+                                          union mf_subvalue *sv,
+                                          const void *value)
+{
+    unsigned int n_bytes = DIV_ROUND_UP(sf->n_bits, 8);
+    memset(sv, 0, sizeof *sv - n_bytes);
+    memcpy(&sv->u8[sizeof sv->u8 - n_bytes], value, n_bytes);
+}
+
+
+/* Set of field values. 'values' only includes the actual data bytes for each
+ * field for which is used, as marked by 1-bits in 'used'. */
+struct field_array {
+    struct mf_bitmap used;
+    size_t values_size;      /* Number of bytes currently in 'values'. */
+    uint8_t *values;     /* Dynamically allocated to the correct size. */
+};
+
+/* Finding mf_fields. */
+const struct mf_field *mf_from_name(const char *name);
+const struct mf_field *mf_from_name_len(const char *name, size_t len);
+
+static inline const struct mf_field *
+mf_from_id(enum mf_field_id id)
+{
+    extern const struct mf_field mf_fields[MFF_N_IDS];
+    ovs_assert((unsigned int) id < MFF_N_IDS);
+    return &mf_fields[id];
+}
+
+/* Inspecting wildcarded bits. */
+bool mf_is_all_wild(const struct mf_field *, const struct flow_wildcards *);
+
+bool mf_is_mask_valid(const struct mf_field *, const union mf_value *mask);
+void mf_get_mask(const struct mf_field *, const struct flow_wildcards *,
+                 union mf_value *mask);
+
+/* Prerequisites. */
+bool mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow,
+                       struct flow_wildcards *wc);
+
+static inline bool
+mf_is_l3_or_higher(const struct mf_field *mf)
+{
+    return mf->id >= MFF_IPV4_SRC;
+}
+
+/* Field values. */
+bool mf_is_value_valid(const struct mf_field *, const union mf_value *value);
+
+void mf_get_value(const struct mf_field *, const struct flow *,
+                  union mf_value *value);
+void mf_set_value(const struct mf_field *, const union mf_value *value,
+                  struct match *, char **err_str);
+void mf_set_flow_value(const struct mf_field *, const union mf_value *value,
+                       struct flow *);
+void mf_set_flow_value_masked(const struct mf_field *,
+                              const union mf_value *value,
+                              const union mf_value *mask,
+                              struct flow *);
+bool mf_is_tun_metadata(const struct mf_field *);
+bool mf_is_set(const struct mf_field *, const struct flow *);
+void mf_mask_field(const struct mf_field *, struct flow_wildcards *);
+void mf_mask_field_masked(const struct mf_field *, const union mf_value *mask,
+                          struct flow_wildcards *);
+int mf_field_len(const struct mf_field *, const union mf_value *value,
+                 const union mf_value *mask, bool *is_masked);
+
+void mf_get(const struct mf_field *, const struct match *,
+            union mf_value *value, union mf_value *mask);
+
+/* Returns the set of usable protocols. */
+uint32_t mf_set(const struct mf_field *, const union mf_value *value,
+                const union mf_value *mask, struct match *, char **err_str);
+
+void mf_set_wild(const struct mf_field *, struct match *, char **err_str);
+
+/* Subfields. */
+void mf_write_subfield_flow(const struct mf_subfield *,
+                            const union mf_subvalue *, struct flow *);
+void mf_write_subfield(const struct mf_subfield *, const union mf_subvalue *,
+                       struct match *);
+void mf_write_subfield_value(const struct mf_subfield *, const void *src,
+                             struct match *);
+
+void mf_mask_subfield(const struct mf_field *,
+                      const union mf_subvalue *value,
+                      const union mf_subvalue *mask,
+                      struct match *);
+
+void mf_read_subfield(const struct mf_subfield *, const struct flow *,
+                      union mf_subvalue *);
+uint64_t mf_get_subfield(const struct mf_subfield *, const struct flow *);
+
+void mf_subfield_copy(const struct mf_subfield *src,
+                      const struct mf_subfield *dst,
+                      struct flow *, struct flow_wildcards *);
+void mf_subfield_swap(const struct mf_subfield *,
+                      const struct mf_subfield *,
+                      struct flow *flow, struct flow_wildcards *);
+
+enum ofperr mf_check_src(const struct mf_subfield *, const struct flow *);
+enum ofperr mf_check_dst(const struct mf_subfield *, const struct flow *);
+
+/* Parsing and formatting. */
+char *mf_parse(const struct mf_field *, const char *,
+               union mf_value *value, union mf_value *mask);
+char *mf_parse_value(const struct mf_field *, const char *, union mf_value *);
+void mf_format(const struct mf_field *,
+               const union mf_value *value, const union mf_value *mask,
+               struct ds *);
+void mf_format_subvalue(const union mf_subvalue *subvalue, struct ds *s);
+
+/* Field Arrays. */
+void field_array_set(enum mf_field_id id, const union mf_value *,
+                     struct field_array *);
+#endif /* meta-flow.h */
diff --git a/openflow/include/openvswitch/netdev.h b/openflow/include/openvswitch/netdev.h
new file mode 100644
index 0000000..88a25dd
--- /dev/null
+++ b/openflow/include/openvswitch/netdev.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_NETDEV_H
+#define OPENVSWITCH_NETDEV_H 1
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+struct netdev;
+
+/* Network device statistics.
+ *
+ * Values of unsupported statistics are set to all-1-bits (UINT64_MAX). */
+struct netdev_stats {
+    uint64_t rx_packets;        /* Total packets received. */
+    uint64_t tx_packets;        /* Total packets transmitted. */
+    uint64_t rx_bytes;          /* Total bytes received. */
+    uint64_t tx_bytes;          /* Total bytes transmitted. */
+    uint64_t rx_errors;         /* Bad packets received. */
+    uint64_t tx_errors;         /* Packet transmit problems. */
+    uint64_t rx_dropped;        /* No buffer space. */
+    uint64_t tx_dropped;        /* No buffer space. */
+    uint64_t multicast;         /* Multicast packets received. */
+    uint64_t collisions;
+
+    /* Detailed receive errors. */
+    uint64_t rx_length_errors;
+    uint64_t rx_over_errors;    /* Receiver ring buff overflow. */
+    uint64_t rx_crc_errors;     /* Recved pkt with crc error. */
+    uint64_t rx_frame_errors;   /* Recv'd frame alignment error. */
+    uint64_t rx_fifo_errors;    /* Recv'r fifo overrun . */
+    uint64_t rx_missed_errors;  /* Receiver missed packet. */
+
+    /* Detailed transmit errors. */
+    uint64_t tx_aborted_errors;
+    uint64_t tx_carrier_errors;
+    uint64_t tx_fifo_errors;
+    uint64_t tx_heartbeat_errors;
+    uint64_t tx_window_errors;
+
+    /* Extended statistics based on RFC2819. */
+    uint64_t rx_1_to_64_packets;
+    uint64_t rx_65_to_127_packets;
+    uint64_t rx_128_to_255_packets;
+    uint64_t rx_256_to_511_packets;
+    uint64_t rx_512_to_1023_packets;
+    uint64_t rx_1024_to_1522_packets;
+    uint64_t rx_1523_to_max_packets;
+
+    uint64_t tx_1_to_64_packets;
+    uint64_t tx_65_to_127_packets;
+    uint64_t tx_128_to_255_packets;
+    uint64_t tx_256_to_511_packets;
+    uint64_t tx_512_to_1023_packets;
+    uint64_t tx_1024_to_1522_packets;
+    uint64_t tx_1523_to_max_packets;
+
+    uint64_t tx_multicast_packets;
+
+    uint64_t rx_broadcast_packets;
+    uint64_t tx_broadcast_packets;
+
+    uint64_t rx_undersized_errors;
+    uint64_t rx_oversize_errors;
+    uint64_t rx_fragmented_errors;
+    uint64_t rx_jabber_errors;
+};
+
+/* Features. */
+enum netdev_features {
+    NETDEV_F_10MB_HD =    1 << 0,  /* 10 Mb half-duplex rate support. */
+    NETDEV_F_10MB_FD =    1 << 1,  /* 10 Mb full-duplex rate support. */
+    NETDEV_F_100MB_HD =   1 << 2,  /* 100 Mb half-duplex rate support. */
+    NETDEV_F_100MB_FD =   1 << 3,  /* 100 Mb full-duplex rate support. */
+    NETDEV_F_1GB_HD =     1 << 4,  /* 1 Gb half-duplex rate support. */
+    NETDEV_F_1GB_FD =     1 << 5,  /* 1 Gb full-duplex rate support. */
+    NETDEV_F_10GB_FD =    1 << 6,  /* 10 Gb full-duplex rate support. */
+    NETDEV_F_40GB_FD =    1 << 7,  /* 40 Gb full-duplex rate support. */
+    NETDEV_F_100GB_FD =   1 << 8,  /* 100 Gb full-duplex rate support. */
+    NETDEV_F_1TB_FD =     1 << 9,  /* 1 Tb full-duplex rate support. */
+    NETDEV_F_OTHER =      1 << 10, /* Other rate, not in the list. */
+    NETDEV_F_COPPER =     1 << 11, /* Copper medium. */
+    NETDEV_F_FIBER =      1 << 12, /* Fiber medium. */
+    NETDEV_F_AUTONEG =    1 << 13, /* Auto-negotiation. */
+    NETDEV_F_PAUSE =      1 << 14, /* Pause. */
+    NETDEV_F_PAUSE_ASYM = 1 << 15, /* Asymmetric pause. */
+};
+
+int netdev_get_features(const struct netdev *,
+                        enum netdev_features *current,
+                        enum netdev_features *advertised,
+                        enum netdev_features *supported,
+                        enum netdev_features *peer);
+uint64_t netdev_features_to_bps(enum netdev_features features,
+                                uint64_t default_bps);
+bool netdev_features_is_full_duplex(enum netdev_features features);
+int netdev_set_advertisements(struct netdev *, enum netdev_features advertise);
+
+#endif /* netdev.h */
diff --git a/openflow/include/openvswitch/ofp-actions.h b/openflow/include/openvswitch/ofp-actions.h
new file mode 100644
index 0000000..88f573d
--- /dev/null
+++ b/openflow/include/openvswitch/ofp-actions.h
@@ -0,0 +1,1160 @@
+/*
+ * Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_OFP_ACTIONS_H
+#define OPENVSWITCH_OFP_ACTIONS_H 1
+
+#include <stddef.h>
+#include <stdint.h>
+#include "openflow/openflow.h"
+#include "openflow/nicira-ext.h"
+#include "openvswitch/meta-flow.h"
+#include "openvswitch/ofp-util.h"
+#include "openvswitch/ofp-errors.h"
+#include "openvswitch/types.h"
+
+struct vl_mff_map;
+
+/* List of OVS abstracted actions.
+ *
+ * This macro is used directly only internally by this header, but the list is
+ * still of interest to developers.
+ *
+ * Each OFPACT invocation has the following parameters:
+ *
+ * 1. <ENUM>, used below in the enum definition of OFPACT_<ENUM>, and
+ *    elsewhere.
+ *
+ * 2. <STRUCT> corresponding to a structure "struct <STRUCT>", that must be
+ *    defined below.  This structure must be an abstract definition of the
+ *    action.  Its first member must have type "struct ofpact" and name
+ *    "ofpact".  It may be fixed length or end with a flexible array member
+ *    (e.g. "int member[];").
+ *
+ * 3. <MEMBER>, which has one of two possible values:
+ *
+ *        - If "struct <STRUCT>" is fixed-length, it must be "ofpact".
+ *
+ *        - If "struct <STRUCT>" is variable-length, it must be the name of the
+ *          flexible array member.
+ *
+ * 4. <NAME>, a quoted string that gives the name of the action, for use in
+ *    parsing actions from text.
+ */
+#define OFPACTS                                                         \
+    /* Output. */                                                       \
+    OFPACT(OUTPUT,          ofpact_output,      ofpact, "output")       \
+    OFPACT(GROUP,           ofpact_group,       ofpact, "group")        \
+    OFPACT(CONTROLLER,      ofpact_controller,  userdata, "controller") \
+    OFPACT(ENQUEUE,         ofpact_enqueue,     ofpact, "enqueue")      \
+    OFPACT(OUTPUT_REG,      ofpact_output_reg,  ofpact, "output_reg")   \
+    OFPACT(BUNDLE,          ofpact_bundle,      slaves, "bundle")       \
+                                                                        \
+    /* Header changes. */                                               \
+    OFPACT(SET_FIELD,       ofpact_set_field,   ofpact, "set_field")    \
+    OFPACT(SET_VLAN_VID,    ofpact_vlan_vid,    ofpact, "set_vlan_vid") \
+    OFPACT(SET_VLAN_PCP,    ofpact_vlan_pcp,    ofpact, "set_vlan_pcp") \
+    OFPACT(STRIP_VLAN,      ofpact_null,        ofpact, "strip_vlan")   \
+    OFPACT(PUSH_VLAN,       ofpact_null,        ofpact, "push_vlan")    \
+    OFPACT(SET_ETH_SRC,     ofpact_mac,         ofpact, "mod_dl_src")   \
+    OFPACT(SET_ETH_DST,     ofpact_mac,         ofpact, "mod_dl_dst")   \
+    OFPACT(SET_IPV4_SRC,    ofpact_ipv4,        ofpact, "mod_nw_src")   \
+    OFPACT(SET_IPV4_DST,    ofpact_ipv4,        ofpact, "mod_nw_dst")   \
+    OFPACT(SET_IP_DSCP,     ofpact_dscp,        ofpact, "mod_nw_tos")   \
+    OFPACT(SET_IP_ECN,      ofpact_ecn,         ofpact, "mod_nw_ecn")   \
+    OFPACT(SET_IP_TTL,      ofpact_ip_ttl,      ofpact, "mod_nw_ttl")   \
+    OFPACT(SET_L4_SRC_PORT, ofpact_l4_port,     ofpact, "mod_tp_src")   \
+    OFPACT(SET_L4_DST_PORT, ofpact_l4_port,     ofpact, "mod_tp_dst")   \
+    OFPACT(REG_MOVE,        ofpact_reg_move,    ofpact, "move")         \
+    OFPACT(STACK_PUSH,      ofpact_stack,       ofpact, "push")         \
+    OFPACT(STACK_POP,       ofpact_stack,       ofpact, "pop")          \
+    OFPACT(DEC_TTL,         ofpact_cnt_ids,     cnt_ids, "dec_ttl")     \
+    OFPACT(SET_MPLS_LABEL,  ofpact_mpls_label,  ofpact, "set_mpls_label") \
+    OFPACT(SET_MPLS_TC,     ofpact_mpls_tc,     ofpact, "set_mpls_tc")  \
+    OFPACT(SET_MPLS_TTL,    ofpact_mpls_ttl,    ofpact, "set_mpls_ttl") \
+    OFPACT(DEC_MPLS_TTL,    ofpact_null,        ofpact, "dec_mpls_ttl") \
+    OFPACT(PUSH_MPLS,       ofpact_push_mpls,   ofpact, "push_mpls")    \
+    OFPACT(POP_MPLS,        ofpact_pop_mpls,    ofpact, "pop_mpls")     \
+                                                                        \
+    /* Metadata. */                                                     \
+    OFPACT(SET_TUNNEL,      ofpact_tunnel,      ofpact, "set_tunnel")   \
+    OFPACT(SET_QUEUE,       ofpact_queue,       ofpact, "set_queue")    \
+    OFPACT(POP_QUEUE,       ofpact_null,        ofpact, "pop_queue")    \
+    OFPACT(FIN_TIMEOUT,     ofpact_fin_timeout, ofpact, "fin_timeout")  \
+                                                                        \
+    /* Flow table interaction. */                                       \
+    OFPACT(RESUBMIT,        ofpact_resubmit,    ofpact, "resubmit")     \
+    OFPACT(LEARN,           ofpact_learn,       specs, "learn")         \
+    OFPACT(CONJUNCTION,     ofpact_conjunction, ofpact, "conjunction")  \
+                                                                        \
+    /* Arithmetic. */                                                   \
+    OFPACT(MULTIPATH,       ofpact_multipath,   ofpact, "multipath")    \
+                                                                        \
+    /* Other. */                                                        \
+    OFPACT(NOTE,            ofpact_note,        data, "note")           \
+    OFPACT(EXIT,            ofpact_null,        ofpact, "exit")         \
+    OFPACT(SAMPLE,          ofpact_sample,      ofpact, "sample")       \
+    OFPACT(UNROLL_XLATE,    ofpact_unroll_xlate, ofpact, "unroll_xlate") \
+    OFPACT(CT,              ofpact_conntrack,   ofpact, "ct")           \
+    OFPACT(CT_CLEAR,        ofpact_null,        ofpact, "ct_clear")     \
+    OFPACT(NAT,             ofpact_nat,         ofpact, "nat")          \
+    OFPACT(OUTPUT_TRUNC,    ofpact_output_trunc,ofpact, "output_trunc") \
+    OFPACT(CLONE,           ofpact_nest,        actions, "clone")       \
+                                                                        \
+    /* Debugging actions.                                               \
+     *                                                                  \
+     * These are intentionally undocumented, subject to change, and     \
+     * only accepted if ovs-vswitchd is started with --enable-dummy. */ \
+    OFPACT(DEBUG_RECIRC, ofpact_null,           ofpact, "debug_recirc") \
+                                                                        \
+    /* Instructions. */                                                 \
+    OFPACT(METER,           ofpact_meter,       ofpact, "meter")        \
+    OFPACT(CLEAR_ACTIONS,   ofpact_null,        ofpact, "clear_actions") \
+    OFPACT(WRITE_ACTIONS,   ofpact_nest,        actions, "write_actions") \
+    OFPACT(WRITE_METADATA,  ofpact_metadata,    ofpact, "write_metadata") \
+    OFPACT(GOTO_TABLE,      ofpact_goto_table,  ofpact, "goto_table")
+
+/* enum ofpact_type, with a member OFPACT_<ENUM> for each action. */
+enum OVS_PACKED_ENUM ofpact_type {
+#define OFPACT(ENUM, STRUCT, MEMBER, NAME) OFPACT_##ENUM,
+    OFPACTS
+#undef OFPACT
+};
+
+/* Define N_OFPACTS to the number of types of ofpacts. */
+enum {
+#define OFPACT(ENUM, STRUCT, MEMBER, NAME) + 1
+    N_OFPACTS = OFPACTS
+#undef OFPACT
+};
+
+/* Header for an action.
+ *
+ * Each action is a structure "struct ofpact_*" that begins with "struct
+ * ofpact", usually followed by other data that describes the action.  Actions
+ * are padded out to a multiple of OFPACT_ALIGNTO bytes in length.
+ *
+ * The 'raw' member is special:
+ *
+ *     - Most "struct ofpact"s correspond to one particular kind of OpenFlow
+ *       action, at least in a given OpenFlow version.  For example,
+ *       OFPACT_SET_VLAN_VID corresponds to OFPAT10_SET_VLAN_VID in OpenFlow
+ *       1.0.
+ *
+ *       For such actions, the 'raw' member is not meaningful and generally
+ *       should be zero.
+ *
+ *     - A few "struct ofpact"s correspond to multiple OpenFlow actions.  For
+ *       example, OFPACT_SET_TUNNEL can be NXAST_SET_TUNNEL or
+ *       NXAST_SET_TUNNEL64.  In these cases, if the "struct ofpact" originated
+ *       from OpenFlow, then we want to make sure that, if it gets translated
+ *       back to OpenFlow later, it is translated back to the same action type.
+ *       (Otherwise, we'd violate the promise made in the topics/design doc, in
+ *       the "Action Reproduction" section.)
+ *
+ *       For such actions, the 'raw' member should be the "enum ofp_raw_action"
+ *       originally extracted from the OpenFlow action.  (If the action didn't
+ *       originate from OpenFlow, then setting 'raw' to zero should be fine:
+ *       code to translate the ofpact to OpenFlow must tolerate this case.)
+ */
+struct ofpact {
+    /* We want the space advantage of an 8-bit type here on every
+     * implementation, without giving up the advantage of having a useful type
+     * on implementations that support packed enums. */
+#ifdef HAVE_PACKED_ENUM
+    enum ofpact_type type;      /* OFPACT_*. */
+#else
+    uint8_t type;               /* OFPACT_* */
+#endif
+
+    uint8_t raw;                /* Original type when added, if any. */
+    uint16_t len;               /* Length of the action, in bytes, including
+                                 * struct ofpact, excluding padding. */
+};
+BUILD_ASSERT_DECL(sizeof(struct ofpact) == 4);
+
+/* Alignment. */
+#define OFPACT_ALIGNTO 8
+#define OFPACT_ALIGN(SIZE) ROUND_UP(SIZE, OFPACT_ALIGNTO)
+#define OFPACT_PADDED_MEMBERS(MEMBERS) PADDED_MEMBERS(OFPACT_ALIGNTO, MEMBERS)
+
+/* Returns the ofpact following 'ofpact'. */
+static inline struct ofpact *
+ofpact_next(const struct ofpact *ofpact)
+{
+    return (void *) ((uint8_t *) ofpact + OFPACT_ALIGN(ofpact->len));
+}
+
+struct ofpact *ofpact_next_flattened(const struct ofpact *);
+
+static inline struct ofpact *
+ofpact_end(const struct ofpact *ofpacts, size_t ofpacts_len)
+{
+    return (void *) ((uint8_t *) ofpacts + ofpacts_len);
+}
+
+static inline const struct ofpact *
+ofpact_find_type_flattened(const struct ofpact *a, enum ofpact_type type,
+                           const struct ofpact * const end)
+{
+    while (a < end) {
+        if (a->type == type) {
+            return a;
+        }
+        a = ofpact_next_flattened(a);
+    }
+    return NULL;
+}
+
+#define OFPACT_FIND_TYPE_FLATTENED(A, TYPE, END) \
+    ofpact_get_##TYPE##_nullable(                       \
+        ofpact_find_type_flattened(A, OFPACT_##TYPE, END))
+
+/* Assigns POS to each ofpact, in turn, in the OFPACTS_LEN bytes of ofpacts
+ * starting at OFPACTS. */
+#define OFPACT_FOR_EACH(POS, OFPACTS, OFPACTS_LEN)                      \
+    for ((POS) = (OFPACTS); (POS) < ofpact_end(OFPACTS, OFPACTS_LEN);  \
+         (POS) = ofpact_next(POS))
+
+/* Assigns POS to each ofpact, in turn, in the OFPACTS_LEN bytes of ofpacts
+ * starting at OFPACTS.
+ *
+ * For ofpacts that contain nested ofpacts, this visits each of the inner
+ * ofpacts as well. */
+#define OFPACT_FOR_EACH_FLATTENED(POS, OFPACTS, OFPACTS_LEN)           \
+    for ((POS) = (OFPACTS); (POS) < ofpact_end(OFPACTS, OFPACTS_LEN);  \
+         (POS) = ofpact_next_flattened(POS))
+
+#define OFPACT_FOR_EACH_TYPE_FLATTENED(POS, TYPE, OFPACTS, OFPACTS_LEN) \
+    for ((POS) = OFPACT_FIND_TYPE_FLATTENED(OFPACTS, TYPE,              \
+                                  ofpact_end(OFPACTS, OFPACTS_LEN));    \
+         (POS);                                                         \
+         (POS) = OFPACT_FIND_TYPE_FLATTENED(                            \
+             ofpact_next_flattened(&(POS)->ofpact), TYPE,               \
+             ofpact_end(OFPACTS, OFPACTS_LEN)))
+
+/* Action structure for each OFPACT_*. */
+
+/* OFPACT_STRIP_VLAN, OFPACT_POP_QUEUE, OFPACT_EXIT, OFPACT_CLEAR_ACTIONS.
+ *
+ * Used for OFPAT10_STRIP_VLAN, NXAST_POP_QUEUE, NXAST_EXIT,
+ * OFPAT11_POP_VLAN, OFPIT11_CLEAR_ACTIONS.
+ *
+ * Action structure for actions that do not have any extra data beyond the
+ * action type. */
+struct ofpact_null {
+    struct ofpact ofpact;
+};
+
+/* OFPACT_OUTPUT.
+ *
+ * Used for OFPAT10_OUTPUT. */
+struct ofpact_output {
+    struct ofpact ofpact;
+    ofp_port_t port;            /* Output port. */
+    uint16_t max_len;           /* Max send len, for port OFPP_CONTROLLER. */
+};
+
+/* OFPACT_CONTROLLER.
+ *
+ * Used for NXAST_CONTROLLER. */
+struct ofpact_controller {
+    OFPACT_PADDED_MEMBERS(
+        struct ofpact ofpact;
+        uint16_t max_len;   /* Max length to send to controller. */
+        uint16_t controller_id; /* Controller ID to send packet-in. */
+        enum ofp_packet_in_reason reason; /* Reason to put in packet-in. */
+
+        /* If true, this action freezes packet traversal of the OpenFlow
+         * tables and adds a continuation to the packet-in message, that
+         * a controller can use to resume that traversal. */
+        bool pause;
+
+        /* Arbitrary data to include in the packet-in message (currently,
+         * only in NXT_PACKET_IN2). */
+        uint16_t userdata_len;
+    );
+    uint8_t userdata[0];
+};
+
+/* OFPACT_ENQUEUE.
+ *
+ * Used for OFPAT10_ENQUEUE. */
+struct ofpact_enqueue {
+    struct ofpact ofpact;
+    ofp_port_t port;
+    uint32_t queue;
+};
+
+/* OFPACT_OUTPUT_REG.
+ *
+ * Used for NXAST_OUTPUT_REG. */
+struct ofpact_output_reg {
+    struct ofpact ofpact;
+    uint16_t max_len;
+    struct mf_subfield src;
+};
+
+/* OFPACT_OUTPUT_TRUNC.
+ *
+ * Used for NXAST_OUTPUT_TRUNC. */
+struct ofpact_output_trunc {
+    struct ofpact ofpact;
+    ofp_port_t port;            /* Output port. */
+    uint32_t max_len;           /* Max send len. */
+};
+
+/* Bundle slave choice algorithm to apply.
+ *
+ * In the descriptions below, 'slaves' is the list of possible slaves in the
+ * order they appear in the OpenFlow action. */
+enum nx_bd_algorithm {
+    /* Chooses the first live slave listed in the bundle.
+     *
+     * O(n_slaves) performance. */
+    NX_BD_ALG_ACTIVE_BACKUP = 0,
+
+    /* Highest Random Weight.
+     *
+     * for i in [0,n_slaves):
+     *   weights[i] = hash(flow, i)
+     * slave = { slaves[i] such that weights[i] >= weights[j] for all j != i }
+     *
+     * Redistributes 1/n_slaves of traffic when a slave's liveness changes.
+     * O(n_slaves) performance.
+     *
+     * Uses the 'fields' and 'basis' parameters. */
+    NX_BD_ALG_HRW = 1
+};
+
+/* OFPACT_BUNDLE.
+ *
+ * Used for NXAST_BUNDLE. */
+struct ofpact_bundle {
+    struct ofpact ofpact;
+
+    /* Slave choice algorithm to apply to hash value. */
+    enum nx_bd_algorithm algorithm;
+
+    /* What fields to hash and how. */
+    enum nx_hash_fields fields;
+    uint16_t basis;             /* Universal hash parameter. */
+
+    struct mf_subfield dst;
+
+    /* Slaves for output. */
+    unsigned int n_slaves;
+    ofp_port_t slaves[];
+};
+
+/* OFPACT_SET_VLAN_VID.
+ *
+ * We keep track if vlan was present at action validation time to avoid a
+ * PUSH_VLAN when translating to OpenFlow 1.1+.
+ *
+ * We also keep the originating OFPUTIL action code in ofpact.compat.
+ *
+ * Used for OFPAT10_SET_VLAN_VID and OFPAT11_SET_VLAN_VID. */
+struct ofpact_vlan_vid {
+    struct ofpact ofpact;
+    uint16_t vlan_vid;          /* VLAN VID in low 12 bits, 0 in other bits. */
+    bool push_vlan_if_needed;   /* OF 1.0 semantics if true. */
+    bool flow_has_vlan;         /* VLAN present at action validation time? */
+};
+
+/* OFPACT_SET_VLAN_PCP.
+ *
+ * We keep track if vlan was present at action validation time to avoid a
+ * PUSH_VLAN when translating to OpenFlow 1.1+.
+ *
+ * We also keep the originating OFPUTIL action code in ofpact.compat.
+ *
+ * Used for OFPAT10_SET_VLAN_PCP and OFPAT11_SET_VLAN_PCP. */
+struct ofpact_vlan_pcp {
+    struct ofpact ofpact;
+    uint8_t vlan_pcp;           /* VLAN PCP in low 3 bits, 0 in other bits. */
+    bool push_vlan_if_needed;   /* OF 1.0 semantics if true. */
+    bool flow_has_vlan;         /* VLAN present at action validation time? */
+};
+
+/* OFPACT_SET_ETH_SRC, OFPACT_SET_ETH_DST.
+ *
+ * Used for OFPAT10_SET_DL_SRC, OFPAT10_SET_DL_DST. */
+struct ofpact_mac {
+    struct ofpact ofpact;
+    struct eth_addr mac;
+};
+
+/* OFPACT_SET_IPV4_SRC, OFPACT_SET_IPV4_DST.
+ *
+ * Used for OFPAT10_SET_NW_SRC, OFPAT10_SET_NW_DST. */
+struct ofpact_ipv4 {
+    struct ofpact ofpact;
+    ovs_be32 ipv4;
+};
+
+/* OFPACT_SET_IP_DSCP.
+ *
+ * Used for OFPAT10_SET_NW_TOS. */
+struct ofpact_dscp {
+    struct ofpact ofpact;
+    uint8_t dscp;               /* DSCP in high 6 bits, rest ignored. */
+};
+
+/* OFPACT_SET_IP_ECN.
+ *
+ * Used for OFPAT11_SET_NW_ECN. */
+struct ofpact_ecn {
+    struct ofpact ofpact;
+    uint8_t ecn;               /* ECN in low 2 bits, rest ignored. */
+};
+
+/* OFPACT_SET_IP_TTL.
+ *
+ * Used for OFPAT11_SET_NW_TTL. */
+struct ofpact_ip_ttl {
+    struct ofpact ofpact;
+    uint8_t ttl;
+};
+
+/* OFPACT_SET_L4_SRC_PORT, OFPACT_SET_L4_DST_PORT.
+ *
+ * Used for OFPAT10_SET_TP_SRC, OFPAT10_SET_TP_DST. */
+struct ofpact_l4_port {
+    struct ofpact ofpact;
+    uint16_t port;              /* TCP, UDP or SCTP port number. */
+    uint8_t  flow_ip_proto;     /* IP proto from corresponding match, or 0 */
+};
+
+/* OFPACT_REG_MOVE.
+ *
+ * Used for NXAST_REG_MOVE. */
+struct ofpact_reg_move {
+    struct ofpact ofpact;
+    struct mf_subfield src;
+    struct mf_subfield dst;
+};
+
+/* OFPACT_STACK_PUSH.
+ *
+ * Used for NXAST_STACK_PUSH and NXAST_STACK_POP. */
+struct ofpact_stack {
+    struct ofpact ofpact;
+    struct mf_subfield subfield;
+};
+
+/* OFPACT_SET_FIELD.
+ *
+ * Used for NXAST_REG_LOAD and OFPAT12_SET_FIELD. */
+struct ofpact_set_field {
+    OFPACT_PADDED_MEMBERS(
+        struct ofpact ofpact;
+        bool flow_has_vlan;   /* VLAN present at action validation time. */
+        const struct mf_field *field;
+    );
+    union mf_value value[];  /* Significant value bytes followed by
+                              * significant mask bytes. */
+};
+BUILD_ASSERT_DECL(offsetof(struct ofpact_set_field, value)
+                  % OFPACT_ALIGNTO == 0);
+BUILD_ASSERT_DECL(offsetof(struct ofpact_set_field, value)
+                  == sizeof(struct ofpact_set_field));
+
+/* Use macro to not have to deal with constness. */
+#define ofpact_set_field_mask(SF)                               \
+    ALIGNED_CAST(union mf_value *,                              \
+                 (uint8_t *)(SF)->value + (SF)->field->n_bytes)
+
+/* OFPACT_PUSH_VLAN/MPLS/PBB
+ *
+ * Used for NXAST_PUSH_MPLS, OFPAT11_PUSH_MPLS. */
+struct ofpact_push_mpls {
+    struct ofpact ofpact;
+    ovs_be16 ethertype;
+};
+
+/* OFPACT_POP_MPLS
+ *
+ * Used for NXAST_POP_MPLS, OFPAT11_POP_MPLS.. */
+struct ofpact_pop_mpls {
+    struct ofpact ofpact;
+    ovs_be16 ethertype;
+};
+
+/* OFPACT_SET_TUNNEL.
+ *
+ * Used for NXAST_SET_TUNNEL, NXAST_SET_TUNNEL64. */
+struct ofpact_tunnel {
+    struct ofpact ofpact;
+    uint64_t tun_id;
+};
+
+/* OFPACT_SET_QUEUE.
+ *
+ * Used for NXAST_SET_QUEUE. */
+struct ofpact_queue {
+    struct ofpact ofpact;
+    uint32_t queue_id;
+};
+
+/* OFPACT_FIN_TIMEOUT.
+ *
+ * Used for NXAST_FIN_TIMEOUT. */
+struct ofpact_fin_timeout {
+    struct ofpact ofpact;
+    uint16_t fin_idle_timeout;
+    uint16_t fin_hard_timeout;
+};
+
+/* OFPACT_WRITE_METADATA.
+ *
+ * Used for NXAST_WRITE_METADATA. */
+struct ofpact_metadata {
+    struct ofpact ofpact;
+    ovs_be64 metadata;
+    ovs_be64 mask;
+};
+
+/* OFPACT_METER.
+ *
+ * Used for OFPIT13_METER. */
+struct ofpact_meter {
+    struct ofpact ofpact;
+    uint32_t meter_id;
+};
+
+/* OFPACT_WRITE_ACTIONS, OFPACT_CLONE.
+ *
+ * Used for OFPIT11_WRITE_ACTIONS, NXAST_CLONE. */
+struct ofpact_nest {
+    OFPACT_PADDED_MEMBERS(struct ofpact ofpact;);
+    struct ofpact actions[];
+};
+BUILD_ASSERT_DECL(offsetof(struct ofpact_nest, actions) % OFPACT_ALIGNTO == 0);
+BUILD_ASSERT_DECL(offsetof(struct ofpact_nest, actions)
+                  == sizeof(struct ofpact_nest));
+
+static inline size_t
+ofpact_nest_get_action_len(const struct ofpact_nest *on)
+{
+    return on->ofpact.len - offsetof(struct ofpact_nest, actions);
+}
+
+/* Bits for 'flags' in struct nx_action_conntrack.
+ *
+ * If NX_CT_F_COMMIT is set, then the connection entry is moved from the
+ * unconfirmed to confirmed list in the tracker. */
+enum nx_conntrack_flags {
+    NX_CT_F_COMMIT = 1 << 0,
+};
+
+/* Magic value for struct nx_action_conntrack 'recirc_table' field, to specify
+ * that the packet should not be recirculated. */
+#define NX_CT_RECIRC_NONE OFPTT_ALL
+
+#if !defined(IPPORT_FTP)
+#define IPPORT_FTP  21
+#endif
+
+#if !defined(IPPORT_TFTP)
+#define IPPORT_TFTP  69
+#endif
+
+/* OFPACT_CT.
+ *
+ * Used for NXAST_CT. */
+struct ofpact_conntrack {
+    OFPACT_PADDED_MEMBERS(
+        struct ofpact ofpact;
+        uint16_t flags;
+        uint16_t zone_imm;
+        struct mf_subfield zone_src;
+        uint16_t alg;
+        uint8_t recirc_table;
+    );
+    struct ofpact actions[0];
+};
+BUILD_ASSERT_DECL(offsetof(struct ofpact_conntrack, actions)
+                  % OFPACT_ALIGNTO == 0);
+BUILD_ASSERT_DECL(offsetof(struct ofpact_conntrack, actions)
+                  == sizeof(struct ofpact_conntrack));
+
+static inline size_t
+ofpact_ct_get_action_len(const struct ofpact_conntrack *oc)
+{
+    return oc->ofpact.len - offsetof(struct ofpact_conntrack, actions);
+}
+
+void ofpacts_execute_action_set(struct ofpbuf *action_list,
+                                const struct ofpbuf *action_set);
+
+/* Bits for 'flags' in struct nx_action_nat.
+ */
+enum nx_nat_flags {
+    NX_NAT_F_SRC          = 1 << 0, /* Mutually exclusive with NX_NAT_F_DST. */
+    NX_NAT_F_DST          = 1 << 1,
+    NX_NAT_F_PERSISTENT   = 1 << 2,
+    NX_NAT_F_PROTO_HASH   = 1 << 3, /* Mutually exclusive with PROTO_RANDOM. */
+    NX_NAT_F_PROTO_RANDOM = 1 << 4,
+    NX_NAT_F_MASK = (NX_NAT_F_SRC | NX_NAT_F_DST | NX_NAT_F_PERSISTENT | NX_NAT_F_PROTO_HASH | NX_NAT_F_PROTO_RANDOM)
+};
+
+/* OFPACT_NAT.
+ *
+ * Used for NXAST_NAT. */
+struct ofpact_nat {
+    struct ofpact ofpact;
+    uint8_t range_af; /* AF_UNSPEC, AF_INET, or AF_INET6 */
+    uint16_t flags;  /* NX_NAT_F_* */
+    struct {
+        struct {
+            uint16_t min;
+            uint16_t max;
+        } proto;
+        union {
+            struct {
+                ovs_be32 min;
+                ovs_be32 max;
+            } ipv4;
+            struct {
+                struct in6_addr min;
+                struct in6_addr max;
+            } ipv6;
+        } addr;
+    } range;
+};
+
+
+/* OFPACT_RESUBMIT.
+ *
+ * Used for NXAST_RESUBMIT, NXAST_RESUBMIT_TABLE. */
+struct ofpact_resubmit {
+    struct ofpact ofpact;
+    ofp_port_t in_port;
+    uint8_t table_id;
+};
+
+/* Bits for 'flags' in struct nx_action_learn.
+ *
+ * If NX_LEARN_F_SEND_FLOW_REM is set, then the learned flows will have their
+ * OFPFF_SEND_FLOW_REM flag set.
+ *
+ * If NX_LEARN_F_DELETE_LEARNED is set, then removing this action will delete
+ * all the flows from the learn action's 'table_id' that have the learn
+ * action's 'cookie'.  Important points:
+ *
+ *     - The deleted flows include those created by this action, those created
+ *       by other learn actions with the same 'table_id' and 'cookie', those
+ *       created by flow_mod requests by a controller in the specified table
+ *       with the specified cookie, and those created through any other
+ *       means.
+ *
+ *     - If multiple flows specify "learn" actions with
+ *       NX_LEARN_F_DELETE_LEARNED with the same 'table_id' and 'cookie', then
+ *       no deletion occurs until all of those "learn" actions are deleted.
+ *
+ *     - Deleting a flow that contains a learn action is the most obvious way
+ *       to delete a learn action.  Modifying a flow's actions, or replacing it
+ *       by a new flow, can also delete a learn action.  Finally, replacing a
+ *       learn action with NX_LEARN_F_DELETE_LEARNED with a learn action
+ *       without that flag also effectively deletes the learn action and can
+ *       trigger flow deletion.
+ *
+ * NX_LEARN_F_DELETE_LEARNED was added in Open vSwitch 2.4. */
+enum nx_learn_flags {
+    NX_LEARN_F_SEND_FLOW_REM = 1 << 0,
+    NX_LEARN_F_DELETE_LEARNED = 1 << 1,
+};
+
+#define NX_LEARN_N_BITS_MASK    0x3ff
+
+#define NX_LEARN_SRC_FIELD     (0 << 13) /* Copy from field. */
+#define NX_LEARN_SRC_IMMEDIATE (1 << 13) /* Copy from immediate value. */
+#define NX_LEARN_SRC_MASK      (1 << 13)
+
+#define NX_LEARN_DST_MATCH     (0 << 11) /* Add match criterion. */
+#define NX_LEARN_DST_LOAD      (1 << 11) /* Add NXAST_REG_LOAD action. */
+#define NX_LEARN_DST_OUTPUT    (2 << 11) /* Add OFPAT_OUTPUT action. */
+#define NX_LEARN_DST_RESERVED  (3 << 11) /* Not yet defined. */
+#define NX_LEARN_DST_MASK      (3 << 11)
+
+/* Part of struct ofpact_learn, below. */
+struct ofpact_learn_spec {
+    OFPACT_PADDED_MEMBERS(
+        struct mf_subfield src;    /* NX_LEARN_SRC_FIELD only. */
+        struct mf_subfield dst;    /* NX_LEARN_DST_MATCH,
+                                    * NX_LEARN_DST_LOAD only. */
+        uint16_t src_type;         /* One of NX_LEARN_SRC_*. */
+        uint16_t dst_type;         /* One of NX_LEARN_DST_*. */
+        uint8_t n_bits;            /* Number of bits in source and dest. */
+    );
+    /* Followed by 'DIV_ROUND_UP(n_bits, 8)' bytes of immediate data for
+     * match 'dst_type's NX_LEARN_DST_MATCH and NX_LEARN_DST_LOAD when
+     * NX_LEARN_SRC_IMMEDIATE is set in 'src_type', followed by zeroes to align
+     * to OFPACT_ALIGNTO. */
+};
+BUILD_ASSERT_DECL(sizeof(struct ofpact_learn_spec) % OFPACT_ALIGNTO == 0);
+
+static inline const void *
+ofpact_learn_spec_imm(const struct ofpact_learn_spec *spec)
+{
+    return spec + 1;
+}
+
+static inline const struct ofpact_learn_spec *
+ofpact_learn_spec_next(const struct ofpact_learn_spec *spec)
+{
+    if (spec->src_type == NX_LEARN_SRC_IMMEDIATE) {
+        unsigned int n_bytes = OFPACT_ALIGN(DIV_ROUND_UP(spec->n_bits, 8));
+        return ALIGNED_CAST(const struct ofpact_learn_spec *,
+                            (const uint8_t *)(spec + 1) + n_bytes);
+    }
+    return spec + 1;
+}
+
+/* OFPACT_LEARN.
+ *
+ * Used for NXAST_LEARN. */
+struct ofpact_learn {
+    OFPACT_PADDED_MEMBERS(
+        struct ofpact ofpact;
+
+        uint16_t idle_timeout;     /* Idle time before discarding (seconds). */
+        uint16_t hard_timeout;     /* Max time before discarding (seconds). */
+        uint16_t priority;         /* Priority level of flow entry. */
+        uint8_t table_id;          /* Table to insert flow entry. */
+        enum nx_learn_flags flags; /* NX_LEARN_F_*. */
+        ovs_be64 cookie;           /* Cookie for new flow. */
+        uint16_t fin_idle_timeout; /* Idle timeout after FIN, if nonzero. */
+        uint16_t fin_hard_timeout; /* Hard timeout after FIN, if nonzero. */
+    );
+
+    struct ofpact_learn_spec specs[];
+};
+
+static inline const struct ofpact_learn_spec *
+ofpact_learn_spec_end(const struct ofpact_learn *learn)
+{
+    return ALIGNED_CAST(const struct ofpact_learn_spec *,
+                        ofpact_next(&learn->ofpact));
+}
+
+#define OFPACT_LEARN_SPEC_FOR_EACH(SPEC, LEARN) \
+    for ((SPEC) = (LEARN)->specs;               \
+         (SPEC) < ofpact_learn_spec_end(LEARN); \
+         (SPEC) = ofpact_learn_spec_next(SPEC))
+
+/* Multipath link choice algorithm to apply.
+ *
+ * In the descriptions below, 'n_links' is max_link + 1. */
+enum nx_mp_algorithm {
+    /* link = hash(flow) % n_links.
+     *
+     * Redistributes all traffic when n_links changes.  O(1) performance.  See
+     * RFC 2992.
+     *
+     * Use UINT16_MAX for max_link to get a raw hash value. */
+    NX_MP_ALG_MODULO_N = 0,
+
+    /* link = hash(flow) / (MAX_HASH / n_links).
+     *
+     * Redistributes between one-quarter and one-half of traffic when n_links
+     * changes.  O(1) performance.  See RFC 2992.
+     */
+    NX_MP_ALG_HASH_THRESHOLD = 1,
+
+    /* Highest Random Weight.
+     *
+     * for i in [0,n_links):
+     *   weights[i] = hash(flow, i)
+     * link = { i such that weights[i] >= weights[j] for all j != i }
+     *
+     * Redistributes 1/n_links of traffic when n_links changes.  O(n_links)
+     * performance.  If n_links is greater than a threshold (currently 64, but
+     * subject to change), Open vSwitch will substitute another algorithm
+     * automatically.  See RFC 2992. */
+    NX_MP_ALG_HRW = 2,
+
+    /* Iterative Hash.
+     *
+     * i = 0
+     * repeat:
+     *     i = i + 1
+     *     link = hash(flow, i) % arg
+     * while link > max_link
+     *
+     * Redistributes 1/n_links of traffic when n_links changes.  O(1)
+     * performance when arg/max_link is bounded by a constant.
+     *
+     * Redistributes all traffic when arg changes.
+     *
+     * arg must be greater than max_link and for best performance should be no
+     * more than approximately max_link * 2.  If arg is outside the acceptable
+     * range, Open vSwitch will automatically substitute the least power of 2
+     * greater than max_link.
+     *
+     * This algorithm is specific to Open vSwitch.
+     */
+    NX_MP_ALG_ITER_HASH = 3,
+};
+
+/* OFPACT_CONJUNCTION.
+ *
+ * Used for NXAST_CONJUNCTION. */
+struct ofpact_conjunction {
+    struct ofpact ofpact;
+    uint8_t clause;
+    uint8_t n_clauses;
+    uint32_t id;
+};
+
+/* OFPACT_MULTIPATH.
+ *
+ * Used for NXAST_MULTIPATH. */
+struct ofpact_multipath {
+    struct ofpact ofpact;
+
+    /* What fields to hash and how. */
+    enum nx_hash_fields fields;
+    uint16_t basis;             /* Universal hash parameter. */
+
+    /* Multipath link choice algorithm to apply to hash value. */
+    enum nx_mp_algorithm algorithm;
+    uint16_t max_link;          /* Number of output links, minus 1. */
+    uint32_t arg;               /* Algorithm-specific argument. */
+
+    /* Where to store the result. */
+    struct mf_subfield dst;
+};
+
+/* OFPACT_NOTE.
+ *
+ * Used for NXAST_NOTE. */
+struct ofpact_note {
+    struct ofpact ofpact;
+    size_t length;
+    uint8_t data[];
+};
+
+/* Direction of sampled packets. */
+enum nx_action_sample_direction {
+    /* OVS will attempt to infer the sample's direction based on whether
+     * 'sampling_port' is the packet's output port.  This is generally
+     * effective except when sampling happens as part of an output to a patch
+     * port, which doesn't involve a datapath output action. */
+    NX_ACTION_SAMPLE_DEFAULT,
+
+    /* Explicit direction.  This is useful for sampling packets coming in from
+     * or going out of a patch port, where the direction cannot be inferred. */
+    NX_ACTION_SAMPLE_INGRESS,
+    NX_ACTION_SAMPLE_EGRESS
+};
+
+/* OFPACT_SAMPLE.
+ *
+ * Used for NXAST_SAMPLE, NXAST_SAMPLE2, and NXAST_SAMPLE3. */
+struct ofpact_sample {
+    struct ofpact ofpact;
+    uint16_t probability;  /* Always positive. */
+    uint32_t collector_set_id;
+    uint32_t obs_domain_id;
+    uint32_t obs_point_id;
+    ofp_port_t sampling_port;
+    enum nx_action_sample_direction direction;
+};
+
+/* OFPACT_DEC_TTL.
+ *
+ * Used for OFPAT11_DEC_NW_TTL, NXAST_DEC_TTL and NXAST_DEC_TTL_CNT_IDS. */
+struct ofpact_cnt_ids {
+    struct ofpact ofpact;
+
+    /* Controller ids. */
+    unsigned int n_controllers;
+    uint16_t cnt_ids[];
+};
+
+/* OFPACT_SET_MPLS_LABEL.
+ *
+ * Used for OFPAT11_SET_MPLS_LABEL and NXAST_SET_MPLS_LABEL */
+struct ofpact_mpls_label {
+    struct ofpact ofpact;
+
+    ovs_be32 label;
+};
+
+/* OFPACT_SET_MPLS_TC.
+ *
+ * Used for OFPAT11_SET_MPLS_TC and NXAST_SET_MPLS_TC */
+struct ofpact_mpls_tc {
+    struct ofpact ofpact;
+
+    uint8_t tc;
+};
+
+/* OFPACT_SET_MPLS_TTL.
+ *
+ * Used for OFPAT11_SET_MPLS_TTL and NXAST_SET_MPLS_TTL */
+struct ofpact_mpls_ttl {
+    struct ofpact ofpact;
+
+    uint8_t ttl;
+};
+
+/* OFPACT_GOTO_TABLE
+ *
+ * Used for OFPIT11_GOTO_TABLE */
+struct ofpact_goto_table {
+    struct ofpact ofpact;
+    uint8_t table_id;
+};
+
+/* OFPACT_GROUP.
+ *
+ * Used for OFPAT11_GROUP. */
+struct ofpact_group {
+    struct ofpact ofpact;
+    uint32_t group_id;
+};
+
+/* OFPACT_UNROLL_XLATE.
+ *
+ * Used only internally. */
+struct ofpact_unroll_xlate {
+    struct ofpact ofpact;
+
+    /* Metadata in xlate context, visible to controller via PACKET_INs. */
+    uint8_t  rule_table_id;       /* 0xFF if none. */
+    ovs_be64 rule_cookie;         /* OVS_BE64_MAX if none. */
+};
+
+/* Converting OpenFlow to ofpacts. */
+enum ofperr ofpacts_pull_openflow_actions(struct ofpbuf *openflow,
+                                          unsigned int actions_len,
+                                          enum ofp_version version,
+                                          const struct vl_mff_map *,
+                                          struct ofpbuf *ofpacts);
+enum ofperr
+ofpacts_pull_openflow_instructions(struct ofpbuf *openflow,
+                                   unsigned int instructions_len,
+                                   enum ofp_version version,
+                                   const struct vl_mff_map *vl_mff_map,
+                                   struct ofpbuf *ofpacts);
+enum ofperr ofpacts_check(struct ofpact[], size_t ofpacts_len,
+                          struct flow *, ofp_port_t max_ports,
+                          uint8_t table_id, uint8_t n_tables,
+                          enum ofputil_protocol *usable_protocols);
+enum ofperr ofpacts_check_consistency(struct ofpact[], size_t ofpacts_len,
+                                      struct flow *, ofp_port_t max_ports,
+                                      uint8_t table_id, uint8_t n_tables,
+                                      enum ofputil_protocol usable_protocols);
+enum ofperr ofpact_check_output_port(ofp_port_t port, ofp_port_t max_ports);
+
+/* Converting ofpacts to OpenFlow. */
+size_t ofpacts_put_openflow_actions(const struct ofpact[], size_t ofpacts_len,
+                                    struct ofpbuf *openflow, enum ofp_version);
+void ofpacts_put_openflow_instructions(const struct ofpact[],
+                                       size_t ofpacts_len,
+                                       struct ofpbuf *openflow,
+                                       enum ofp_version ofp_version);
+
+/* Sets of supported actions. */
+ovs_be32 ofpact_bitmap_to_openflow(uint64_t ofpacts_bitmap, enum ofp_version);
+uint64_t ofpact_bitmap_from_openflow(ovs_be32 ofpat_bitmap, enum ofp_version);
+void ofpact_bitmap_format(uint64_t ofpacts_bitmap, struct ds *);
+
+/* Working with ofpacts. */
+bool ofpacts_output_to_port(const struct ofpact[], size_t ofpacts_len,
+                            ofp_port_t port);
+bool ofpacts_output_to_group(const struct ofpact[], size_t ofpacts_len,
+                             uint32_t group_id);
+bool ofpacts_equal(const struct ofpact a[], size_t a_len,
+                   const struct ofpact b[], size_t b_len);
+const struct mf_field *ofpact_get_mf_dst(const struct ofpact *ofpact);
+uint32_t ofpacts_get_meter(const struct ofpact[], size_t ofpacts_len);
+
+/* Formatting and parsing ofpacts. */
+void ofpacts_format(const struct ofpact[], size_t ofpacts_len, struct ds *);
+char *ofpacts_parse_actions(const char *, struct ofpbuf *ofpacts,
+                            enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+char *ofpacts_parse_instructions(const char *, struct ofpbuf *ofpacts,
+                                 enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+const char *ofpact_name(enum ofpact_type);
+
+/* Internal use by the helpers below. */
+void ofpact_init(struct ofpact *, enum ofpact_type, size_t len);
+void *ofpact_put(struct ofpbuf *, enum ofpact_type, size_t len);
+void *ofpact_finish(struct ofpbuf *, struct ofpact *);
+
+/* For each OFPACT_<ENUM> with a corresponding struct <STRUCT>, this defines
+ * the following commonly useful functions:
+ *
+ *   struct <STRUCT> *ofpact_put_<ENUM>(struct ofpbuf *ofpacts);
+ *
+ *     Appends a new 'ofpact', of length OFPACT_<ENUM>_SIZE, to 'ofpacts',
+ *     initializes it with ofpact_init_<ENUM>(), and returns it.  Also sets
+ *     'ofpacts->header' to the returned action.
+ *
+ *     After using this function to add a variable-length action, add the
+ *     elements of the flexible array (e.g. with ofpbuf_put()), then use
+ *     ofpact_finish() to pad the action to a multiple of OFPACT_ALIGNTO bytes
+ *     and update its embedded length field.  (Keep in mind the need to refresh
+ *     the structure from 'ofpacts->header' after adding data to 'ofpacts'.)
+ *
+ *   struct <STRUCT> *ofpact_get_<ENUM>(const struct ofpact *ofpact);
+ *
+ *     Returns 'ofpact' cast to "struct <STRUCT> *".  'ofpact->type' must be
+ *     OFPACT_<ENUM>.
+ *
+ *   void ofpact_finish_<ENUM>(struct ofpbuf *ofpacts, struct <STRUCT> **ap);
+ *
+ *     Finishes composing variable-length action '*ap' (begun using
+ *     ofpact_put_<NAME>() on 'ofpacts'), by padding the action to a multiple
+ *     of OFPACT_ALIGNTO bytes and updating its embedded length field.
+ *
+ *     May reallocate 'ofpacts', and so as a convenience automatically updates
+ *     '*ap' to point to the new location.  If the caller has other pointers
+ *     within 'ap' or 'ofpacts', it needs to update them manually.
+ *
+ * as well as the following more rarely useful definitions:
+ *
+ *   void ofpact_init_<ENUM>(struct <STRUCT> *ofpact);
+ *
+ *     Initializes the parts of 'ofpact' that identify it as having type
+ *     OFPACT_<ENUM> and length OFPACT_<ENUM>_SIZE and zeros the rest.
+ *
+ *   <ENUM>_SIZE
+ *
+ *     The size of the action structure.  For a fixed-length action, this is
+ *     sizeof(struct <STRUCT>) rounded up to a multiple of OFPACT_ALIGNTO.  For
+ *     a variable-length action, this is the offset to the variable-length
+ *     part.
+ */
+#define OFPACT(ENUM, STRUCT, MEMBER, NAME)                              \
+    BUILD_ASSERT_DECL(offsetof(struct STRUCT, ofpact) == 0);            \
+                                                                        \
+    enum { OFPACT_##ENUM##_SIZE                                         \
+           = (offsetof(struct STRUCT, MEMBER)                           \
+              ? offsetof(struct STRUCT, MEMBER)                         \
+              : OFPACT_ALIGN(sizeof(struct STRUCT))) };                 \
+                                                                        \
+    static inline struct STRUCT *                                       \
+    ofpact_get_##ENUM(const struct ofpact *ofpact)                      \
+    {                                                                   \
+        ovs_assert(ofpact->type == OFPACT_##ENUM);                      \
+        return ALIGNED_CAST(struct STRUCT *, ofpact);                   \
+    }                                                                   \
+                                                                        \
+    static inline struct STRUCT *                                       \
+    ofpact_get_##ENUM##_nullable(const struct ofpact *ofpact)           \
+    {                                                                   \
+        ovs_assert(!ofpact || ofpact->type == OFPACT_##ENUM);           \
+        return ALIGNED_CAST(struct STRUCT *, ofpact);                   \
+    }                                                                   \
+                                                                        \
+    static inline struct STRUCT *                                       \
+    ofpact_put_##ENUM(struct ofpbuf *ofpacts)                           \
+    {                                                                   \
+        return ofpact_put(ofpacts, OFPACT_##ENUM,                       \
+                          OFPACT_##ENUM##_SIZE);                        \
+    }                                                                   \
+                                                                        \
+    static inline void                                                  \
+    ofpact_init_##ENUM(struct STRUCT *ofpact)                           \
+    {                                                                   \
+        ofpact_init(&ofpact->ofpact, OFPACT_##ENUM,                     \
+                    OFPACT_##ENUM##_SIZE);                              \
+    }                                                                   \
+                                                                        \
+    static inline void                                                  \
+    ofpact_finish_##ENUM(struct ofpbuf *ofpbuf, struct STRUCT **ofpactp) \
+    {                                                                   \
+        struct ofpact *ofpact = &(*ofpactp)->ofpact;                    \
+        ovs_assert(ofpact->type == OFPACT_##ENUM);                      \
+        *ofpactp = ofpact_finish(ofpbuf, ofpact);                       \
+    }
+OFPACTS
+#undef OFPACT
+
+/* Additional functions for composing ofpacts. */
+struct ofpact_set_field *ofpact_put_set_field(struct ofpbuf *ofpacts,
+                                              const struct mf_field *,
+                                              const void *value,
+                                              const void *mask);
+struct ofpact_set_field *ofpact_put_reg_load(struct ofpbuf *ofpacts,
+                                             const struct mf_field *,
+                                             const void *value,
+                                             const void *mask);
+struct ofpact_set_field *ofpact_put_reg_load2(struct ofpbuf *ofpacts,
+                                              const struct mf_field *,
+                                              const void *value,
+                                              const void *mask);
+
+/* OpenFlow 1.1 instructions.
+ * The order is sorted in execution order. Not in the value of OFPIT11_xxx.
+ * It is enforced on parser from text string.
+ */
+#define OVS_INSTRUCTIONS                                    \
+    DEFINE_INST(OFPIT13_METER,                              \
+                ofp13_instruction_meter,          false,    \
+                "meter")                                    \
+                                                            \
+    DEFINE_INST(OFPIT11_APPLY_ACTIONS,                      \
+                ofp11_instruction_actions,        true,     \
+                "apply_actions")                            \
+                                                            \
+    DEFINE_INST(OFPIT11_CLEAR_ACTIONS,                      \
+                ofp11_instruction,                false,    \
+                "clear_actions")                            \
+                                                            \
+    DEFINE_INST(OFPIT11_WRITE_ACTIONS,                      \
+                ofp11_instruction_actions,        true,     \
+                "write_actions")                            \
+                                                            \
+    DEFINE_INST(OFPIT11_WRITE_METADATA,                     \
+                ofp11_instruction_write_metadata, false,    \
+                "write_metadata")                           \
+                                                            \
+    DEFINE_INST(OFPIT11_GOTO_TABLE,                         \
+                ofp11_instruction_goto_table,     false,    \
+                "goto_table")
+
+enum ovs_instruction_type {
+#define DEFINE_INST(ENUM, STRUCT, EXTENSIBLE, NAME) OVSINST_##ENUM,
+    OVS_INSTRUCTIONS
+#undef DEFINE_INST
+};
+
+enum {
+#define DEFINE_INST(ENUM, STRUCT, EXTENSIBLE, NAME) + 1
+    N_OVS_INSTRUCTIONS = OVS_INSTRUCTIONS
+#undef DEFINE_INST
+};
+
+const char *ovs_instruction_name_from_type(enum ovs_instruction_type type);
+int ovs_instruction_type_from_name(const char *name);
+enum ovs_instruction_type ovs_instruction_type_from_ofpact_type(
+    enum ofpact_type);
+enum ofperr ovs_instruction_type_from_inst_type(
+    enum ovs_instruction_type *instruction_type, const uint16_t inst_type);
+
+ovs_be32 ovsinst_bitmap_to_openflow(uint32_t ovsinst_bitmap, enum ofp_version);
+uint32_t ovsinst_bitmap_from_openflow(ovs_be32 ofpit_bitmap,
+                                      enum ofp_version);
+
+#endif /* ofp-actions.h */
diff --git a/openflow/include/openvswitch/ofp-errors.h b/openflow/include/openvswitch/ofp-errors.h
new file mode 100644
index 0000000..8182581
--- /dev/null
+++ b/openflow/include/openvswitch/ofp-errors.h
@@ -0,0 +1,819 @@
+/*
+ * Copyright (c) 2008-2017 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_OFP_ERRORS_H
+#define OPENVSWITCH_OFP_ERRORS_H 1
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "openflow/openflow.h"
+
+struct ds;
+struct ofpbuf;
+
+/* Error codes.
+ *
+ * We embed system errno values and OpenFlow standard and vendor extension
+ * error codes into the positive range of "int":
+ *
+ *   - Errno values are assumed to use the range 1 through 2**30 - 1.
+ *
+ *     (C and POSIX say that errno values are positive.  We assume that they
+ *     are less than 2**29.  They are actually less than 65536 on at least
+ *     Linux, FreeBSD, OpenBSD, and Windows.)
+ *
+ *   - OpenFlow standard and vendor extension error codes use the range
+ *     starting at 2**30 (OFPERR_OFS).
+ *
+ * Zero and negative values are not used.
+ */
+
+#define OFPERR_OFS (1 << 30)
+
+/* OpenFlow error codes
+ * --------------------
+ *
+ * The comments below are parsed by the extract-ofp-errors program at build
+ * time and used to determine the mapping between "enum ofperr" constants and
+ * error type/code values used in the OpenFlow protocol:
+ *
+ *   - The first part of each comment specifies the vendor, OpenFlow versions,
+ *     type, and sometimes a code for each protocol that supports the error:
+ *
+ *         # The vendor is OF for standard OpenFlow error codes.  Otherwise it
+ *           is one of the *_VENDOR_ID codes defined in openflow-common.h.
+ *
+ *         # The version can specify a specific OpenFlow version, a version
+ *           range delimited by "-", or an open-ended range with "+".
+ *
+ *         # Standard OpenFlow errors have both a type and a code.  Extension
+ *           errors generally have only a type, no code.  There is one
+ *           exception: Nicira extension (NX) errors for OpenFlow 1.0 and 1.1
+ *           have both a type and a code.  (This means that the version
+ *           specification for NX errors may not include version 1.0 or 1.1 (or
+ *           both) along with version 1.2 or later, because the requirements
+ *           for those versions are different.)
+ *
+ *   - Additional text is a human-readable description of the meaning of each
+ *     error, used to explain the error to the user.  Any text enclosed in
+ *     square brackets is omitted; this can be used to explain rationale for
+ *     choice of error codes in the case where this is desirable.
+ *
+ *
+ * Expected duplications
+ * ---------------------
+ *
+ * Occasionally, in one version of OpenFlow a single named error can indicate
+ * two or more distinct errors, then a later version of OpenFlow splits those
+ * meanings into different error codes.  When that happens, both errors are
+ * assigned the same value in the earlier version.  That is ordinarily a
+ * mistake, so the build system reports an error.  When that happens, add the
+ * error message to the list of "Expected duplications" below to suppress the
+ * error.  In such a case, the named error defined earlier is how OVS
+ * interprets the earlier, merged form of the error.
+ *
+ * For example, OpenFlow 1.1 defined (3,5) as OFPBIC_UNSUP_EXP_INST, then
+ * OpenFlow 1.2 broke this error into OFPBIC_BAD_EXPERIMENTER as (3,5) and
+ * OFPBIC_BAD_EXT_TYPE as (3,6).  To allow the OVS code to report just a single
+ * error code, instead of protocol version dependent errors, this list of
+ * errors only lists the latter two errors, giving both of them the same code
+ * (3,5) for OpenFlow 1.1.  Then, when OVS serializes either error into
+ * OpenFlow 1.1, it uses the same code (3,5).  In the other direction, when OVS
+ * deserializes (3,5) from OpenFlow 1.1, it translates it into
+ * OFPBIC_BAD_EXPERIMENTER (because its definition precedes that of
+ * OFPBIC_BAD_EXT_TYPE below).  See the "encoding OFPBIC_* experimenter errors"
+ * and "decoding OFPBIC_* experimenter errors" tests in tests/ofp-errors.at for
+ * full details.
+ */
+enum ofperr {
+/* Expected duplications. */
+
+    /* Expected: 0x0,3,5 in OF1.1 means both OFPBIC_BAD_EXPERIMENTER and
+     * OFPBIC_BAD_EXP_TYPE. */
+
+    /* Expected: 0x0,1,5 in OF1.0 means both OFPBRC_EPERM and
+     * OFPBRC_IS_SLAVE. */
+
+    /* Expected: 0x0,1,5 in OF1.1 means both OFPBRC_EPERM and
+     * OFPBRC_IS_SLAVE. */
+
+/* ## ------------------ ## */
+/* ## OFPET_HELLO_FAILED ## */
+/* ## ------------------ ## */
+
+    /* OF1.0+(0,0).  No compatible version. */
+    OFPERR_OFPHFC_INCOMPATIBLE = OFPERR_OFS,
+
+    /* OF1.0+(0,1).  Permissions error. */
+    OFPERR_OFPHFC_EPERM,
+
+/* ## ----------------- ## */
+/* ## OFPET_BAD_REQUEST ## */
+/* ## ----------------- ## */
+
+    /* OF1.0+(1,0).  ofp_header.version not supported. */
+    OFPERR_OFPBRC_BAD_VERSION,
+
+    /* OF1.0+(1,1).  ofp_header.type not supported. */
+    OFPERR_OFPBRC_BAD_TYPE,
+
+    /* OF1.0+(1,2).  ofp_stats_msg.type not supported. */
+    OFPERR_OFPBRC_BAD_STAT,
+
+    /* OF1.0+(1,3).  Vendor not supported (in ofp_vendor_header or
+     * ofp_stats_msg). */
+    OFPERR_OFPBRC_BAD_VENDOR,
+
+    /* OF1.0+(1,4).  Vendor subtype not supported. */
+    OFPERR_OFPBRC_BAD_SUBTYPE,
+
+    /* OF1.0+(1,5).  Permissions error. */
+    OFPERR_OFPBRC_EPERM,
+
+    /* OF1.0+(1,6).  Wrong request length for type. */
+    OFPERR_OFPBRC_BAD_LEN,
+
+    /* OF1.0+(1,7).  Specified buffer has already been used. */
+    OFPERR_OFPBRC_BUFFER_EMPTY,
+
+    /* OF1.0+(1,8).  Specified buffer does not exist. */
+    OFPERR_OFPBRC_BUFFER_UNKNOWN,
+
+    /* NX1.0(1,512), OF1.1+(1,9).  Specified table-id invalid or does not exist.
+     * [ A non-standard error (1,512), formerly OFPERR_NXBRC_BAD_TABLE_ID,
+     *   is used for OpenFlow 1.0 as there seems to be no appropriate error
+     *   code defined the specification. ] */
+    OFPERR_OFPBRC_BAD_TABLE_ID,
+
+    /* OF1.0-1.1(1,5), OF1.2+(1,10).  Denied because controller is slave. */
+    OFPERR_OFPBRC_IS_SLAVE,
+
+    /* NX1.0-1.1(1,514), OF1.2+(1,11).  Invalid port.  [ A non-standard error
+     * (1,514), formerly OFPERR_NXBRC_BAD_IN_PORT is used for OpenFlow 1.0 and
+     * 1.1 as there seems to be no appropriate error code defined the
+     * specifications. ] */
+    OFPERR_OFPBRC_BAD_PORT,
+
+    /* OF1.2+(1,12).  Invalid packet in packet-out. */
+    OFPERR_OFPBRC_BAD_PACKET,
+
+    /* OF1.3+(1,13).  Multipart request overflowed the assigned buffer. */
+    OFPERR_OFPBRC_MULTIPART_BUFFER_OVERFLOW,
+
+    /* NX1.0-1.1(1,256), NX1.2+(2).  Invalid NXM flow match. */
+    OFPERR_NXBRC_NXM_INVALID,
+
+    /* NX1.0-1.1(1,257), NX1.2+(3).  The nxm_type, or nxm_type taken in
+     * combination with nxm_hasmask or nxm_length or both, is invalid or not
+     * implemented. */
+    OFPERR_NXBRC_NXM_BAD_TYPE,
+
+    /* NX1.0-1.1(1,515), NX1.2+(4).  Must-be-zero field had nonzero value. */
+    OFPERR_NXBRC_MUST_BE_ZERO,
+
+    /* NX1.0-1.1(1,516), NX1.2+(5).  The reason in an ofp_port_status message
+     * is not valid. */
+    OFPERR_NXBRC_BAD_REASON,
+
+    /* NX1.0-1.1(1,520), NX1.2+(9).  The 'event' in an NXST_FLOW_MONITOR reply
+     * does not specify one of the NXFME_ABBREV, NXFME_ADD, NXFME_DELETE, or
+     * NXFME_MODIFY. */
+    OFPERR_NXBRC_FM_BAD_EVENT,
+
+    /* NX1.0-1.1(1,521), NX1.2+(10).  The error that occurred cannot be
+     * represented in this OpenFlow version. */
+    OFPERR_NXBRC_UNENCODABLE_ERROR,
+
+/* ## ---------------- ## */
+/* ## OFPET_BAD_ACTION ## */
+/* ## ---------------- ## */
+
+    /* OF1.0+(2,0).  Unknown action type. */
+    OFPERR_OFPBAC_BAD_TYPE,
+
+    /* OF1.0+(2,1).  Length problem in actions. */
+    OFPERR_OFPBAC_BAD_LEN,
+
+    /* OF1.0+(2,2).  Unknown experimenter id specified. */
+    OFPERR_OFPBAC_BAD_VENDOR,
+
+    /* OF1.0+(2,3).  Unknown action type for experimenter id. */
+    OFPERR_OFPBAC_BAD_VENDOR_TYPE,
+
+    /* OF1.0+(2,4).  Problem validating output port. */
+    OFPERR_OFPBAC_BAD_OUT_PORT,
+
+    /* OF1.0+(2,5).  Bad action argument. */
+    OFPERR_OFPBAC_BAD_ARGUMENT,
+
+    /* OF1.0+(2,6).  Permissions error. */
+    OFPERR_OFPBAC_EPERM,
+
+    /* OF1.0+(2,7).  Can't handle this many actions. */
+    OFPERR_OFPBAC_TOO_MANY,
+
+    /* OF1.0+(2,8).  Problem validating output queue. */
+    OFPERR_OFPBAC_BAD_QUEUE,
+
+    /* OF1.1+(2,9).  Invalid group id in forward action. */
+    OFPERR_OFPBAC_BAD_OUT_GROUP,
+
+    /* NX1.0(1,522), OF1.1+(2,10).  Action can't apply for this match or a
+     * prerequisite for use of this field is unmet. */
+    OFPERR_OFPBAC_MATCH_INCONSISTENT,
+
+    /* OF1.1+(2,11).  Action order is unsupported for the action list in an
+     * Apply-Actions instruction */
+    OFPERR_OFPBAC_UNSUPPORTED_ORDER,
+
+    /* OF1.1+(2,12).  Actions uses an unsupported tag/encap. */
+    OFPERR_OFPBAC_BAD_TAG,
+
+    /* NX1.0-1.1(1,523), OF1.2+(2,13).  Action uses unknown or unsupported OXM
+     * or NXM field. */
+    OFPERR_OFPBAC_BAD_SET_TYPE,
+
+    /* NX1.0-1.1(1,524), OF1.2+(2,14).  Action references past the end of an
+     * OXM or NXM field, or uses a length of zero. */
+    OFPERR_OFPBAC_BAD_SET_LEN,
+
+    /* NX1.0-1.1(1,525), OF1.2+(2,15).  Action sets a field to an invalid or
+     * unsupported value, or modifies a read-only field. */
+    OFPERR_OFPBAC_BAD_SET_ARGUMENT,
+
+    /* ONF1.3-1.4(4250), OF1.5+(2,16).  Field in Set-Field action has Has-Mask
+     * bit set to 1. */
+    OFPERR_OFPBAC_BAD_SET_MASK,
+
+    /* NX1.0-1.1(2,256), NX1.2+(11).  Must-be-zero action argument had nonzero
+     * value. */
+    OFPERR_NXBAC_MUST_BE_ZERO,
+
+    /* NX1.0-1.1(2,526), NX1.2+(15).  Conjunction action must be only action
+     * present.  conjunction(id, k/n) must satisfy 1 <= k <= n and 2 <= n <=
+     * 64. */
+    OFPERR_NXBAC_BAD_CONJUNCTION,
+
+/* ## --------------------- ## */
+/* ## OFPET_BAD_INSTRUCTION ## */
+/* ## --------------------- ## */
+
+    /* OF1.1+(3,0).  Unknown instruction. */
+    OFPERR_OFPBIC_UNKNOWN_INST,
+
+    /* NX1.0(2,257), OF1.1+(3,1).  Switch or table does not support the
+     * instruction. */
+    OFPERR_OFPBIC_UNSUP_INST,
+
+    /* OF1.1+(3,2).  Invalid Table-ID specified. */
+    OFPERR_OFPBIC_BAD_TABLE_ID,
+
+    /* OF1.1+(3,3).  Metadata value unsupported by datapath. */
+    OFPERR_OFPBIC_UNSUP_METADATA,
+
+    /* OF1.1+(3,4).  Metadata mask value unsupported by datapath. */
+    OFPERR_OFPBIC_UNSUP_METADATA_MASK,
+
+    /* OF1.1+(3,5).  Unknown experimenter id specified. */
+    OFPERR_OFPBIC_BAD_EXPERIMENTER,
+
+    /* OF1.1(3,5), OF1.2+(3,6).  Unknown instruction for experimenter id. */
+    OFPERR_OFPBIC_BAD_EXP_TYPE,
+
+    /* OF1.2+(3,7).  Length problem in instructions. */
+    OFPERR_OFPBIC_BAD_LEN,
+
+    /* OF1.2+(3,8).  Permissions error. */
+    OFPERR_OFPBIC_EPERM,
+
+    /* NX1.1(3,256), ONF1.2-1.3(2600), OF1.4+(3,9).  Duplicate instruction. */
+    OFPERR_OFPBIC_DUP_INST,
+
+/* ## --------------- ## */
+/* ## OFPET_BAD_MATCH ## */
+/* ## --------------- ## */
+
+    /* OF1.1+(4,0).  Unsupported match type specified by the match */
+    OFPERR_OFPBMC_BAD_TYPE,
+
+    /* OF1.1+(4,1).  Length problem in match. */
+    OFPERR_OFPBMC_BAD_LEN,
+
+    /* OF1.1+(4,2).  Match uses an unsupported tag/encap. */
+    OFPERR_OFPBMC_BAD_TAG,
+
+    /* OF1.1+(4,3).  Unsupported datalink addr mask - switch does not support
+     * arbitrary datalink address mask. */
+    OFPERR_OFPBMC_BAD_DL_ADDR_MASK,
+
+    /* OF1.1+(4,4).  Unsupported network addr mask - switch does not support
+     * arbitrary network address mask. */
+    OFPERR_OFPBMC_BAD_NW_ADDR_MASK,
+
+    /* NX1.0(1,262), OF1.1+(4,5).  Unsupported wildcard specified in the
+     * match. */
+    OFPERR_OFPBMC_BAD_WILDCARDS,
+
+    /* NX1.0(0,263), OF1.1+(4,6).  Unsupported field in the match. */
+    OFPERR_OFPBMC_BAD_FIELD,
+
+    /* NX1.0(1,258), OF1.1+(4,7).  Unsupported value in a match
+     * field. */
+    OFPERR_OFPBMC_BAD_VALUE,
+
+    /* NX1.0-1.1(1,259), OF1.2+(4,8).  Unsupported mask specified in the match,
+     * field is not dl-address or nw-address. */
+    OFPERR_OFPBMC_BAD_MASK,
+
+    /* NX1.0-1.1(1,260), OF1.2+(4,9).  A prerequisite was not met. */
+    OFPERR_OFPBMC_BAD_PREREQ,
+
+    /* NX1.0-1.1(1,261), OF1.2+(4,10).  A field type was duplicated. */
+    OFPERR_OFPBMC_DUP_FIELD,
+
+    /* OF1.2+(4,11).  Permissions error. */
+    OFPERR_OFPBMC_EPERM,
+
+/* ## --------------------- ## */
+/* ## OFPET_FLOW_MOD_FAILED ## */
+/* ## --------------------- ## */
+
+    /* OF1.1+(5,0).  Unspecified error. */
+    OFPERR_OFPFMFC_UNKNOWN,
+
+    /* OF1.0(3,0), OF1.1+(5,1).  Flow not added because of full table(s). */
+    OFPERR_OFPFMFC_TABLE_FULL,
+
+    /* OF1.1+(5,2).  Table does not exist */
+    OFPERR_OFPFMFC_BAD_TABLE_ID,
+
+    /* OF1.0(3,1), OF1.1+(5,3).  Attempted to add overlapping flow with
+     * CHECK_OVERLAP flag set. */
+    OFPERR_OFPFMFC_OVERLAP,
+
+    /* OF1.0(3,2), OF1.1+(5,4).  Permissions error. */
+    OFPERR_OFPFMFC_EPERM,
+
+    /* OF1.1+(5,5).  Flow not added because of unsupported idle/hard
+     * timeout. */
+    OFPERR_OFPFMFC_BAD_TIMEOUT,
+
+    /* OF1.0(3,3).  Flow not added because of non-zero idle/hard timeout. */
+    OFPERR_OFPFMFC_BAD_EMERG_TIMEOUT,
+
+    /* OF1.0(3,4), OF1.1+(5,6).  Unsupported or unknown command. */
+    OFPERR_OFPFMFC_BAD_COMMAND,
+
+    /* NX1.0(3,258), NX1.1(5,258), OF1.2+(5,7).  Unsupported or unknown
+     * flags. */
+    OFPERR_OFPFMFC_BAD_FLAGS,
+
+    /* OF1.0(3,5).  Unsupported action list - cannot process in the order
+     * specified. */
+    OFPERR_OFPFMFC_UNSUPPORTED,
+
+    /* NX1.0-1.1(5,256), NX1.2+(12).  Generic hardware error. */
+    OFPERR_NXFMFC_HARDWARE,
+
+    /* NX1.0-1.1(5,257), NX1.2+(13).  A nonexistent table ID was specified in
+     * the "command" field of struct ofp_flow_mod, when the
+     * nxt_flow_mod_table_id extension is enabled. */
+    OFPERR_NXFMFC_BAD_TABLE_ID,
+
+    /* NX1.0-1.1(1,536), NX1.2+(37).  Attempted to add a flow with an invalid
+     * variable length meta-flow field. */
+    OFPERR_NXFMFC_INVALID_TLV_FIELD,
+
+/* ## ---------------------- ## */
+/* ## OFPET_GROUP_MOD_FAILED ## */
+/* ## ---------------------- ## */
+
+    /* OF1.1+(6,0).  Group not added because a group ADD attempted to replace
+     * an already-present group. */
+    OFPERR_OFPGMFC_GROUP_EXISTS,
+
+    /* OF1.1+(6,1).  Group not added because Group specified is invalid. */
+    OFPERR_OFPGMFC_INVALID_GROUP,
+
+    /* OF1.1+(6,2).  Switch does not support unequal load sharing with select
+     * groups. */
+    OFPERR_OFPGMFC_WEIGHT_UNSUPPORTED,
+
+    /* OF1.1+(6,3).  The group table is full. */
+    OFPERR_OFPGMFC_OUT_OF_GROUPS,
+
+    /* OF1.1+(6,4).  The maximum number of action buckets for a group has been
+     * exceeded. */
+    OFPERR_OFPGMFC_OUT_OF_BUCKETS,
+
+    /* OF1.1+(6,5).  Switch does not support groups that forward to groups. */
+    OFPERR_OFPGMFC_CHAINING_UNSUPPORTED,
+
+    /* OF1.1+(6,6).  This group cannot watch the watch_port or watch_group
+     * specified. */
+    OFPERR_OFPGMFC_WATCH_UNSUPPORTED,
+
+    /* OF1.1+(6,7).  Group entry would cause a loop. */
+    OFPERR_OFPGMFC_LOOP,
+
+    /* OF1.1+(6,8).  Group not modified because a group MODIFY attempted to
+     * modify a non-existent group. */
+    OFPERR_OFPGMFC_UNKNOWN_GROUP,
+
+    /* OF1.2+(6,9).  Group not deleted because another
+                    group is forwarding to it. */
+    OFPERR_OFPGMFC_CHAINED_GROUP,
+
+    /* OF1.2+(6,10).  Unsupported or unknown group type. */
+    OFPERR_OFPGMFC_BAD_TYPE,
+
+    /* OF1.2+(6,11).  Unsupported or unknown command. */
+    OFPERR_OFPGMFC_BAD_COMMAND,
+
+    /* OF1.2+(6,12).  Error in bucket. */
+    OFPERR_OFPGMFC_BAD_BUCKET,
+
+    /* OF1.2+(6,13).  Error in watch port/group. */
+    OFPERR_OFPGMFC_BAD_WATCH,
+
+    /* OF1.2+(6,14).  Permissions error. */
+    OFPERR_OFPGMFC_EPERM,
+
+    /* OF1.5+(6,15).  Invalid bucket identifier used in
+     * INSERT BUCKET or REMOVE BUCKET command. */
+    OFPERR_OFPGMFC_UNKNOWN_BUCKET,
+
+    /* OF1.5+(6,16).  Can't insert bucket because a bucket
+     * already exist with that bucket-id. */
+    OFPERR_OFPGMFC_BUCKET_EXISTS,
+
+/* ## --------------------- ## */
+/* ## OFPET_PORT_MOD_FAILED ## */
+/* ## --------------------- ## */
+
+    /* OF1.0(4,0), OF1.1+(7,0).  Specified port does not exist. */
+    OFPERR_OFPPMFC_BAD_PORT,
+
+    /* OF1.0(4,1), OF1.1+(7,1).  Specified hardware address does not match the
+     * port number. */
+    OFPERR_OFPPMFC_BAD_HW_ADDR,
+
+    /* OF1.1+(7,2).  Specified config is invalid. */
+    OFPERR_OFPPMFC_BAD_CONFIG,
+
+    /* OF1.1+(7,3).  Specified advertise is invalid. */
+    OFPERR_OFPPMFC_BAD_ADVERTISE,
+
+    /* OF1.2+(7,4).  Permissions error. */
+    OFPERR_OFPPMFC_EPERM,
+
+/* ## ---------------------- ## */
+/* ## OFPET_TABLE_MOD_FAILED ## */
+/* ## ---------------------- ## */
+
+    /* OF1.1+(8,0).  Specified table does not exist. */
+    OFPERR_OFPTMFC_BAD_TABLE,
+
+    /* OF1.1+(8,1).  Specified config is invalid. */
+    OFPERR_OFPTMFC_BAD_CONFIG,
+
+    /* OF1.2+(8,2).  Permissions error. */
+    OFPERR_OFPTMFC_EPERM,
+
+/* ## --------------------- ## */
+/* ## OFPET_QUEUE_OP_FAILED ## */
+/* ## --------------------- ## */
+
+    /* OF1.0(5,0), OF1.1+(9,0).  Invalid port (or port does not exist). */
+    OFPERR_OFPQOFC_BAD_PORT,
+
+    /* OF1.0(5,1), OF1.1+(9,1).  Queue does not exist. */
+    OFPERR_OFPQOFC_BAD_QUEUE,
+
+    /* OF1.0(5,2), OF1.1+(9,2).  Permissions error. */
+    OFPERR_OFPQOFC_EPERM,
+
+    /* NX1.4+(23).  System error retrieving queue details. */
+    OFPERR_NXQOFC_QUEUE_ERROR,
+
+/* ## -------------------------- ## */
+/* ## OFPET_SWITCH_CONFIG_FAILED ## */
+/* ## -------------------------- ## */
+
+    /* OF1.1+(10,0).  Specified flags is invalid. */
+    OFPERR_OFPSCFC_BAD_FLAGS,
+
+    /* OF1.1+(10,1).  Specified len is invalid. */
+    OFPERR_OFPSCFC_BAD_LEN,
+
+    /* OF1.2+(10,2).  Permissions error. */
+    OFPERR_OFPSCFC_EPERM,
+
+/* ## ------------------------- ## */
+/* ## OFPET_ROLE_REQUEST_FAILED ## */
+/* ## ------------------------- ## */
+
+    /* OF1.2+(11,0).  Stale Message: old generation_id. */
+    OFPERR_OFPRRFC_STALE,
+
+    /* OF1.2+(11,1).  Controller role change unsupported. */
+    OFPERR_OFPRRFC_UNSUP,
+
+    /* NX1.0-1.1(1,513), OF1.2+(11,2).  Invalid role. */
+    OFPERR_OFPRRFC_BAD_ROLE,
+
+/* ## ---------------------- ## */
+/* ## OFPET_METER_MOD_FAILED ## */
+/* ## ---------------------- ## */
+
+    /* OF1.3+(12,0).  Unspecified error. */
+    OFPERR_OFPMMFC_UNKNOWN,
+
+    /* OF1.3+(12,1).  Meter not added because a Meter ADD attempted to
+     * replace an existing Meter. */
+    OFPERR_OFPMMFC_METER_EXISTS,
+
+    /* OF1.3+(12,2).  Meter not added because Meter specified is invalid. */
+    OFPERR_OFPMMFC_INVALID_METER,
+
+    /* OF1.3+(12,3).  Meter not modified because a Meter MODIFY attempted
+     * to modify a non-existent Meter. */
+    OFPERR_OFPMMFC_UNKNOWN_METER,
+
+    /* OF1.3+(12,4).  Unsupported or unknown command. */
+    OFPERR_OFPMMFC_BAD_COMMAND,
+
+    /* OF1.3+(12,5).  Flag configuration unsupported. */
+    OFPERR_OFPMMFC_BAD_FLAGS,
+
+    /* OF1.3+(12,6).  Rate unsupported. */
+    OFPERR_OFPMMFC_BAD_RATE,
+
+    /* OF1.3+(12,7).  Burst size unsupported. */
+    OFPERR_OFPMMFC_BAD_BURST,
+
+    /* OF1.3+(12,8).  Band unsupported. */
+    OFPERR_OFPMMFC_BAD_BAND,
+
+    /* OF1.3+(12,9).  Band value unsupported. */
+    OFPERR_OFPMMFC_BAD_BAND_VALUE,
+
+    /* OF1.3+(12,10).  No more meters available. */
+    OFPERR_OFPMMFC_OUT_OF_METERS,
+
+    /* OF1.3+(12,11).  The maximum number of properties for a meter has
+     * been exceeded. */
+    OFPERR_OFPMMFC_OUT_OF_BANDS,
+
+/* ## --------------------------- ## */
+/* ## OFPET_TABLE_FEATURES_FAILED ## */
+/* ## --------------------------- ## */
+
+    /* OF1.3+(13,0).  Specified table does not exist. */
+    OFPERR_OFPTFFC_BAD_TABLE,
+
+    /* OF1.3+(13,1).  Invalid metadata mask. */
+    OFPERR_OFPTFFC_BAD_METADATA,
+
+    /* OF1.3+(13,5).  Permissions error. */
+    OFPERR_OFPTFFC_EPERM,
+
+/* ## ------------------ ## */
+/* ## OFPET_BAD_PROPERTY ## */
+/* ## ------------------ ## */
+
+    /* NX1.0-1.1(13,2), NX1.2(25), OF1.3(13,2), OF1.4+(14,0).  Unknown property
+     * type.
+     *
+     * [Known as OFPTFFC_BAD_TYPE in OF1.3.] */
+    OFPERR_OFPBPC_BAD_TYPE,
+
+    /* NX1.0-1.1(13,3), NX1.2(26), OF1.3(13,3), OF1.4+(14,1).  Length problem
+     * in property.
+     *
+     * [Known as OFPTFFC_BAD_LEN in OF1.3.] */
+    OFPERR_OFPBPC_BAD_LEN,
+
+    /* NX1.0-1.1(13,4), NX1.2(27), OF1.3(13,4), OF1.4+(14,2).  Unsupported
+     * property value.
+     *
+     * [Known as OFPTFFC_BAD_ARGUMENT in OF1.3.] */
+    OFPERR_OFPBPC_BAD_VALUE,
+
+    /* NX1.0-1.1(14,3), NX1.2(28), ONF1.3(4443), OF1.4+(14,3).  Can't handle
+     * this many properties. */
+    OFPERR_OFPBPC_TOO_MANY,
+
+    /* NX1.0-1.1(14,4), NX1.2(29), ONF1.3(4444), OF1.4+(14,4).  A property type
+     * was duplicated. */
+    OFPERR_OFPBPC_DUP_TYPE,
+
+    /* NX1.0-1.1(14,5), NX1.2(30), ONF1.3(4445), OF1.4+(14,5).  Unknown
+     * experimenter id specified. */
+    OFPERR_OFPBPC_BAD_EXPERIMENTER,
+
+    /* NX1.0-1.1(14,6), NX1.2(31), ONF1.3(4446), OF1.4+(14,6).  Unknown
+     * exp_type for experimenter id. */
+    OFPERR_OFPBPC_BAD_EXP_TYPE,
+
+    /* NX1.0-1.1(14,7), NX1.2(32), ONF1.3(4447), OF1.4+(14,7).  Unknown value
+     * for experimenter id. */
+    OFPERR_OFPBPC_BAD_EXP_VALUE,
+
+    /* NX1.0-1.1(14,8), NX1.2(33), ONF1.3(4448), OF1.4+(14,8).  Permissions
+     * error. */
+    OFPERR_OFPBPC_EPERM,
+
+/* ## -------------------------- ## */
+/* ## OFPET_ASYNC_CONFIG_FAILED  ## */
+/* ## -------------------------- ## */
+
+    /* OF1.4+(15,0).  One mask is invalid. */
+    OFPERR_OFPACFC_INVALID,
+
+    /* OF1.4+(15,1).  Requested configuration not supported. */
+    OFPERR_OFPACFC_UNSUPPORTED,
+
+    /* OF1.4+(15,2).  Permissions error. */
+    OFPERR_OFPACFC_EPERM,
+
+/* ## -------------------- ## */
+/* ## OFPET_BUNDLE_FAILED  ## */
+/* ## -------------------- ## */
+
+    /* ONF1.3(2300), OF1.4+(17,0).  Unspecified error. */
+    OFPERR_OFPBFC_UNKNOWN,
+
+    /* ONF1.3(2301), OF1.4+(17,1).  Permissions error. */
+    OFPERR_OFPBFC_EPERM,
+
+    /* ONF1.3(2302), OF1.4+(17,2).  Bundle ID doesn't exist. */
+    OFPERR_OFPBFC_BAD_ID,
+
+    /* ONF1.3(2303), OF1.4+(17,3).  Bundle ID already exists. */
+    OFPERR_OFPBFC_BUNDLE_EXIST,
+
+    /* ONF1.3(2304), OF1.4+(17,4).  Bundle ID is closed. */
+    OFPERR_OFPBFC_BUNDLE_CLOSED,
+
+    /* ONF1.3(2305), OF1.4+(17,5).  Too many bundle IDs. */
+    OFPERR_OFPBFC_OUT_OF_BUNDLES,
+
+    /* ONF1.3(2306), OF1.4+(17,6).  Unsupported of unknown message control
+     * type. */
+    OFPERR_OFPBFC_BAD_TYPE,
+
+    /* ONF1.3(2307), OF1.4+(17,7).  Unsupported, unknown, or inconsistent
+     * flags. */
+    OFPERR_OFPBFC_BAD_FLAGS,
+
+    /* ONF1.3(2308), OF1.4+(17,8).  Length problem in included message. */
+    OFPERR_OFPBFC_MSG_BAD_LEN,
+
+    /* ONF1.3(2309), OF1.4+(17,9).  Inconsistent or duplicate XID. */
+    OFPERR_OFPBFC_MSG_BAD_XID,
+
+    /* ONF1.3(2310), OF1.4+(17,10).  Unsupported message in this bundle. */
+    OFPERR_OFPBFC_MSG_UNSUP,
+
+    /* ONF1.3(2311), OF1.4+(17,11).  Unsupported message combination in this
+     * bundle. */
+    OFPERR_OFPBFC_MSG_CONFLICT,
+
+    /* ONF1.3(2312), OF1.4+(17,12).  Cant handle this many messages in
+     * bundle. */
+    OFPERR_OFPBFC_MSG_TOO_MANY,
+
+    /* ONF1.3(2313), OF1.4+(17,13).  One message in bundle failed. */
+    OFPERR_OFPBFC_MSG_FAILED,
+
+    /* ONF1.3(2314), OF1.4+(17,14).  Bundle is taking too long. */
+    OFPERR_OFPBFC_TIMEOUT,
+
+    /* ONF1.3(2315), OF1.4+(17,15).  Bundle is locking the resource. */
+    OFPERR_OFPBFC_BUNDLE_IN_PROGRESS,
+
+    /* NX1.4-1.5(22), OF1.6+(17,19).  In an OFPT_BUNDLE_ADD_MESSAGE, the
+     * OpenFlow version in the inner and outer messages differ. */
+    OFPERR_OFPBFC_BAD_VERSION,
+
+/* ## ------------------------- ## */
+/* ## OFPET_FLOW_MONITOR_FAILED ## */
+/* ## ------------------------- ## */
+
+    /* OF1.4+(16,0).  Unspecified error. */
+    OFPERR_OFPMOFC_UNKNOWN,
+
+    /* NX1.0-1.1(1,517), NX1.2-1.3(6), OF1.4+(16,1).  Monitor not added
+     * because a Monitor ADD attempted to replace an existing Monitor. */
+    OFPERR_OFPMOFC_MONITOR_EXISTS,
+
+    /* OF1.4+(16,2).  Monitor not added because
+     * Monitor specified is invalid. */
+    OFPERR_OFPMOFC_INVALID_MONITOR,
+
+    /* NX1.0-1.1(1,519), NX1.2-1.3(8), OF1.4+(16,3).  Monitor not modified
+     * because a Monitor MODIFY attempted to modify a non-existent Monitor. */
+    OFPERR_OFPMOFC_UNKNOWN_MONITOR,
+
+    /* OF1.4+(16,4).  Unsupported or unknown command. */
+    OFPERR_OFPMOFC_BAD_COMMAND,
+
+    /* NX1.0-1.1(1,518), NX1.2-1.3(7), OF1.4+(16,5).  Flag configuration
+     * unsupported. */
+    OFPERR_OFPMOFC_BAD_FLAGS,
+
+    /* OF1.4+(16,6).  Specified table does not exist. */
+    OFPERR_OFPMOFC_BAD_TABLE_ID,
+
+    /* OF1.4+(16,7).  Error in output port/group. */
+    OFPERR_OFPMOFC_BAD_OUT,
+
+/* ## ----------------------------- ## */
+/* ## OFPET_TLV_TABLE_MOD_FAILED ## */
+/* ## ----------------------------- ## */
+
+    /* NX1.0-1.1(1,527), NX1.2+(16).  The TLV table mod command is not
+     * recognized as a valid operation. */
+    OFPERR_NXTTMFC_BAD_COMMAND,
+
+    /* NX1.0-1.1(1,528), NX1.2+(17).  The option length is not a valid
+     * option size for TLVs. */
+    OFPERR_NXTTMFC_BAD_OPT_LEN,
+
+    /* NX1.0-1.1(1,529), NX1.2+(18).  The field index is out of range for
+     * the supported NX_TUN_METADATA<n> match. */
+    OFPERR_NXTTMFC_BAD_FIELD_IDX,
+
+    /* NX1.0-1.1(1,530), NX1.2+(19).  The total set of configured options
+     * exceeds the maximum supported by the switch. */
+    OFPERR_NXTTMFC_TABLE_FULL,
+
+    /* NX1.0-1.1(1,531), NX1.2+(20).  The controller issued an NXTTMC_ADD
+     * command for a field index that is already mapped. */
+    OFPERR_NXTTMFC_ALREADY_MAPPED,
+
+    /* NX1.0-1.1(1,532), NX1.2+(21).  The option TLV that is attempting
+     * to be mapped is the same as one assigned to a different field. */
+    OFPERR_NXTTMFC_DUP_ENTRY,
+
+/* ## ---------- ## */
+/* ## NXT_RESUME ## */
+/* ## ---------- ## */
+
+    /* NX1.0-1.1(1,533), NX1.2+(34).  This datapath doesn't support
+     * NXT_RESUME. */
+    OFPERR_NXR_NOT_SUPPORTED,
+
+    /* NX1.0-1.1(1,534), NX1.2+(35).  Continuation is stale: Open vSwitch
+     * process has been restarted or bridge has been destroyed since
+     * continuation was generated, or continuation was not generated by this
+     * Open vSwitch instance. */
+    OFPERR_NXR_STALE,
+
+/* ## ---------- ## */
+/* ## NXT_STATS  ## */
+/* ## ---------- ## */
+
+    /* NX1.0-1.1(1,535), NX1.2+(36).  Protocol is not configured on this
+     * Open vSwitch instance. */
+    OFPERR_NXST_NOT_CONFIGURED,
+};
+
+const char *ofperr_domain_get_name(enum ofp_version);
+
+bool ofperr_is_valid(enum ofperr);
+
+enum ofperr ofperr_from_name(const char *);
+
+enum ofperr ofperr_decode_msg(const struct ofp_header *,
+                              struct ofpbuf *payload);
+struct ofpbuf *ofperr_encode_reply(enum ofperr, const struct ofp_header *);
+struct ofpbuf *ofperr_encode_hello(enum ofperr, enum ofp_version ofp_version,
+                                   const char *);
+int ofperr_get_vendor(enum ofperr, enum ofp_version);
+int ofperr_get_type(enum ofperr, enum ofp_version);
+int ofperr_get_code(enum ofperr, enum ofp_version);
+
+const char *ofperr_get_name(enum ofperr);
+const char *ofperr_get_description(enum ofperr);
+
+void ofperr_format(struct ds *, enum ofperr);
+const char *ofperr_to_string(enum ofperr);
+
+#endif /* ofp-errors.h */
diff --git a/openflow/include/openvswitch/ofp-msgs.h b/openflow/include/openvswitch/ofp-msgs.h
new file mode 100644
index 0000000..07fd8aa
--- /dev/null
+++ b/openflow/include/openvswitch/ofp-msgs.h
@@ -0,0 +1,771 @@
+/*
+ * Copyright (c) 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_OFP_MSGS_H
+#define OPENVSWITCH_OFP_MSGS_H 1
+
+/* OpenFlow message headers abstraction.
+ *
+ * OpenFlow headers are unnecessarily complicated:
+ *
+ *   - Some messages with the same meaning were renumbered between 1.0 and 1.1.
+ *
+ *   - "Statistics" (aka multipart) messages have a different format from other
+ *     messages.
+ *
+ *   - The 1.0 header for statistics messages is an odd number of 32-bit words
+ *     long, leaving 64-bit quantities in the body misaligned.  The 1.1 header
+ *     for statistics added a padding word to fix this misalignment, although
+ *     many statistic message bodies did not change.
+ *
+ *   - Vendor-defined messages have an additional header but no standard way to
+ *     distinguish individual types of message within a given vendor.
+ *
+ * This file attempts to abstract out the differences between the various forms
+ * of headers.
+ */
+
+#include "openvswitch/ofp-errors.h"
+#include "openvswitch/types.h"
+
+struct ovs_list;
+
+/* Raw identifiers for OpenFlow messages.
+ *
+ * Some OpenFlow messages with similar meanings have multiple variants across
+ * OpenFlow versions or vendor extensions.  Each variant has a different
+ * OFPRAW_* enumeration constant.  More specifically, if two messages have
+ * different types, different numbers, or different arguments, then they must
+ * have different OFPRAW_* values.
+ *
+ * The comments here must follow a stylized form because the "extract-ofp-msgs"
+ * program parses them at build time to generate data tables.  The syntax of
+ * each comment is:
+ *
+ *    type versions (number): arguments.
+ *
+ * where the syntax of each part is:
+ *
+ *    - type: One of the following:
+ *
+ *          * OFPT: standard OpenFlow message.
+ *          * OFPST: standard OpenFlow statistics or multipart message.
+ *          * NXT: Nicira extension message.
+ *          * NXST: Nicira extension statistics or multipart message.
+ *          * ONFT: Open Networking Foundation extension message.
+ *          * ONFST: Open Networking Foundation multipart message.
+ *
+ *      As new vendors implement extensions it will make sense to expand the
+ *      dictionary of possible types.
+ *
+ *    - versions: The OpenFlow version or versions in which this message is
+ *      supported, e.g. "1.0" or "1.1" or "1.0+".
+ *
+ *    - number:
+ *         For OFPT, the 'type' in struct ofp_header.
+ *         For OFPST, the 'type' in struct ofp_stats_msg or ofp11_stats_msg.
+ *         For NXT or ONFT, the 'subtype' in struct ofp_vendor_header.
+ *         For NXST or ONFST, the 'subtype' in an appropriate vendor stats
+ *         struct.
+ *
+ *    - arguments: The types of data that follow the OpenFlow headers (the
+ *      message "body").  This can be "void" if the message has no body.
+ *      Otherwise, it should be a comma-separated sequence of C types.  The
+ *      last type in the sequence can end with [] if the body ends in a
+ *      variable-length sequence.
+ *
+ *      The arguments are used to validate the lengths of messages when a
+ *      header is parsed.  Any message whose length isn't valid as a length of
+ *      the specified types will be rejected with OFPERR_OFPBRC_BAD_LEN.
+ *
+ *      A few OpenFlow messages, such as OFPT_PACKET_IN, intentionally end with
+ *      only part of a structure, up to some specified member.  The syntax "up
+ *      to <member>" indicates this, e.g. "struct ofp11_packet_in up to data".
+ */
+enum ofpraw {
+/* Immutable standard messages.
+ *
+ * The OpenFlow standard promises to preserve these messages and their numbers
+ * in future versions, so we mark them as <all>, which covers every OpenFlow
+ * version numbered 0x01...0xff, rather than as OF1.0+, which covers only
+ * OpenFlow versions that we otherwise implement.
+ *
+ * Without <all> here, then we would fail to decode "hello" messages that
+ * announce a version higher than we understand, even though there still could
+ * be a version in common with the peer that we do understand.  The <all>
+ * keyword is less useful for the other messages, because our OpenFlow channels
+ * accept only OpenFlow messages with a previously negotiated version.
+ */
+
+    /* OFPT <all> (0): uint8_t[]. */
+    OFPRAW_OFPT_HELLO,
+
+    /* OFPT <all> (1): struct ofp_error_msg, uint8_t[]. */
+    OFPRAW_OFPT_ERROR,
+
+    /* OFPT <all> (2): uint8_t[]. */
+    OFPRAW_OFPT_ECHO_REQUEST,
+
+    /* OFPT <all> (3): uint8_t[]. */
+    OFPRAW_OFPT_ECHO_REPLY,
+
+/* Other standard messages.
+ *
+ * The meanings of these messages can (and often do) change from one version
+ * of OpenFlow to another. */
+
+    /* OFPT 1.0+ (5): void. */
+    OFPRAW_OFPT_FEATURES_REQUEST,
+
+    /* OFPT 1.0 (6): struct ofp_switch_features, struct ofp10_phy_port[]. */
+    OFPRAW_OFPT10_FEATURES_REPLY,
+    /* OFPT 1.1-1.2 (6): struct ofp_switch_features, struct ofp11_port[]. */
+    OFPRAW_OFPT11_FEATURES_REPLY,
+    /* OFPT 1.3+ (6): struct ofp_switch_features. */
+    OFPRAW_OFPT13_FEATURES_REPLY,
+
+    /* OFPT 1.0+ (7): void. */
+    OFPRAW_OFPT_GET_CONFIG_REQUEST,
+
+    /* OFPT 1.0+ (8): struct ofp_switch_config. */
+    OFPRAW_OFPT_GET_CONFIG_REPLY,
+
+    /* OFPT 1.0+ (9): struct ofp_switch_config. */
+    OFPRAW_OFPT_SET_CONFIG,
+
+    /* OFPT 1.0 (10): struct ofp10_packet_in up to data, uint8_t[]. */
+    OFPRAW_OFPT10_PACKET_IN,
+    /* OFPT 1.1 (10): struct ofp11_packet_in, uint8_t[]. */
+    OFPRAW_OFPT11_PACKET_IN,
+    /* OFPT 1.2 (10): struct ofp12_packet_in, uint8_t[]. */
+    OFPRAW_OFPT12_PACKET_IN,
+    /* OFPT 1.3+ (10): struct ofp12_packet_in, ovs_be64, uint8_t[]. */
+    OFPRAW_OFPT13_PACKET_IN,
+    /* NXT 1.0+ (17): struct nx_packet_in, uint8_t[]. */
+    OFPRAW_NXT_PACKET_IN,
+    /* NXT 1.0+ (30): uint8_t[8][]. */
+    OFPRAW_NXT_PACKET_IN2,
+
+    /* OFPT 1.0 (11): struct ofp10_flow_removed. */
+    OFPRAW_OFPT10_FLOW_REMOVED,
+    /* OFPT 1.1+ (11): struct ofp11_flow_removed, uint8_t[8][]. */
+    OFPRAW_OFPT11_FLOW_REMOVED,
+    /* NXT 1.0+ (14): struct nx_flow_removed, uint8_t[8][]. */
+    OFPRAW_NXT_FLOW_REMOVED,
+
+    /* OFPT 1.0 (12): struct ofp_port_status, struct ofp10_phy_port. */
+    OFPRAW_OFPT10_PORT_STATUS,
+    /* OFPT 1.1-1.3 (12): struct ofp_port_status, struct ofp11_port. */
+    OFPRAW_OFPT11_PORT_STATUS,
+    /* OFPT 1.4+ (12): struct ofp_port_status, struct ofp14_port, uint8_t[8][]. */
+    OFPRAW_OFPT14_PORT_STATUS,
+
+    /* OFPT 1.0 (13): struct ofp10_packet_out, uint8_t[]. */
+    OFPRAW_OFPT10_PACKET_OUT,
+    /* OFPT 1.1+ (13): struct ofp11_packet_out, uint8_t[]. */
+    OFPRAW_OFPT11_PACKET_OUT,
+
+    /* OFPT 1.0 (14): struct ofp10_flow_mod, uint8_t[8][]. */
+    OFPRAW_OFPT10_FLOW_MOD,
+    /* OFPT 1.1+ (14): struct ofp11_flow_mod, struct ofp11_instruction[]. */
+    OFPRAW_OFPT11_FLOW_MOD,
+    /* NXT 1.0+ (13): struct nx_flow_mod, uint8_t[8][]. */
+    OFPRAW_NXT_FLOW_MOD,
+
+    /* OFPT 1.1-1.4 (15): struct ofp11_group_mod, uint8_t[8][]. */
+    OFPRAW_OFPT11_GROUP_MOD,
+    /* OFPT 1.5+ (15): struct ofp15_group_mod, uint8_t[8][]. */
+    OFPRAW_OFPT15_GROUP_MOD,
+
+    /* OFPT 1.0 (15): struct ofp10_port_mod. */
+    OFPRAW_OFPT10_PORT_MOD,
+    /* OFPT 1.1-1.3 (16): struct ofp11_port_mod. */
+    OFPRAW_OFPT11_PORT_MOD,
+    /* OFPT 1.4+ (16): struct ofp14_port_mod, uint8_t[8][]. */
+    OFPRAW_OFPT14_PORT_MOD,
+
+    /* OFPT 1.1-1.3 (17): struct ofp11_table_mod. */
+    OFPRAW_OFPT11_TABLE_MOD,
+    /* OFPT 1.4+ (17): struct ofp14_table_mod, uint8_t[8][]. */
+    OFPRAW_OFPT14_TABLE_MOD,
+
+    /* OFPT 1.0 (18): void. */
+    OFPRAW_OFPT10_BARRIER_REQUEST,
+    /* OFPT 1.1+ (20): void. */
+    OFPRAW_OFPT11_BARRIER_REQUEST,
+
+    /* OFPT 1.0 (19): void. */
+    OFPRAW_OFPT10_BARRIER_REPLY,
+    /* OFPT 1.1+ (21): void. */
+    OFPRAW_OFPT11_BARRIER_REPLY,
+
+    /* OFPT 1.0 (20): struct ofp10_queue_get_config_request. */
+    OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST,
+    /* OFPT 1.1-1.3 (22): struct ofp11_queue_get_config_request. */
+    OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST,
+
+    /* OFPT 1.0 (21): struct ofp10_queue_get_config_reply, uint8_t[8][]. */
+    OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY,
+    /* OFPT 1.1-1.3 (23): struct ofp11_queue_get_config_reply, uint8_t[8][]. */
+    OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY,
+
+    /* OFPT 1.2+ (24): struct ofp12_role_request. */
+    OFPRAW_OFPT12_ROLE_REQUEST,
+    /* NXT 1.0+ (10): struct nx_role_request. */
+    OFPRAW_NXT_ROLE_REQUEST,
+
+    /* OFPT 1.2+ (25): struct ofp12_role_request. */
+    OFPRAW_OFPT12_ROLE_REPLY,
+    /* NXT 1.0+ (11): struct nx_role_request. */
+    OFPRAW_NXT_ROLE_REPLY,
+
+    /* OFPT 1.3 (26): void. */
+    OFPRAW_OFPT13_GET_ASYNC_REQUEST,
+    /* OFPT 1.4+ (26): void. */
+    OFPRAW_OFPT14_GET_ASYNC_REQUEST,
+    /* OFPT 1.3 (27): struct ofp13_async_config. */
+    OFPRAW_OFPT13_GET_ASYNC_REPLY,
+    /* OFPT 1.4+ (27): uint8_t[8][]. */
+    OFPRAW_OFPT14_GET_ASYNC_REPLY,
+    /* OFPT 1.3 (28): struct ofp13_async_config. */
+    OFPRAW_OFPT13_SET_ASYNC,
+    /* NXT 1.0+ (19): struct nx_async_config. */
+    OFPRAW_NXT_SET_ASYNC_CONFIG,
+    /* NXT 1.0-1.3 (27): uint8_t[8][]. */
+    OFPRAW_NXT_SET_ASYNC_CONFIG2,
+    /* OFPT 1.4+ (28): uint8_t[8][]. */
+    OFPRAW_OFPT14_SET_ASYNC,
+
+    /* OFPT 1.3+ (29): struct ofp13_meter_mod, uint8_t[8][]. */
+    OFPRAW_OFPT13_METER_MOD,
+
+    /* OFPT 1.4+ (30): struct ofp14_role_status, uint8_t[8][]. */
+    OFPRAW_OFPT14_ROLE_STATUS,
+
+    /* OFPT 1.4+ (31): struct ofp14_table_status, uint8_t[8][]. */
+    OFPRAW_OFPT14_TABLE_STATUS,
+
+    /* OFPT 1.4+ (32): struct ofp14_requestforward, uint8_t[8][]. */
+    OFPRAW_OFPT14_REQUESTFORWARD,
+
+    /* OFPT 1.4+ (33): struct ofp14_bundle_ctrl_msg, uint8_t[8][]. */
+    OFPRAW_OFPT14_BUNDLE_CONTROL,
+    /* ONFT 1.3 (2300): struct ofp14_bundle_ctrl_msg, uint8_t[8][]. */
+    OFPRAW_ONFT13_BUNDLE_CONTROL,
+
+    /* OFPT 1.4+ (34): struct ofp14_bundle_ctrl_msg, uint8_t[]. */
+    OFPRAW_OFPT14_BUNDLE_ADD_MESSAGE,
+    /* ONFT 1.3 (2301): struct ofp14_bundle_ctrl_msg, uint8_t[]. */
+    OFPRAW_ONFT13_BUNDLE_ADD_MESSAGE,
+
+/* Standard statistics. */
+
+    /* OFPST 1.0+ (0): void. */
+    OFPRAW_OFPST_DESC_REQUEST,
+
+    /* OFPST 1.0+ (0): struct ofp_desc_stats. */
+    OFPRAW_OFPST_DESC_REPLY,
+
+    /* OFPST 1.0 (1): struct ofp10_flow_stats_request. */
+    OFPRAW_OFPST10_FLOW_REQUEST,
+    /* OFPST 1.1+ (1): struct ofp11_flow_stats_request, uint8_t[8][]. */
+    OFPRAW_OFPST11_FLOW_REQUEST,
+    /* NXST 1.0 (0): struct nx_flow_stats_request, uint8_t[8][]. */
+    OFPRAW_NXST_FLOW_REQUEST,
+
+    /* OFPST 1.0 (1): uint8_t[]. */
+    OFPRAW_OFPST10_FLOW_REPLY,
+    /* OFPST 1.1-1.2 (1): uint8_t[]. */
+    OFPRAW_OFPST11_FLOW_REPLY,
+    /* OFPST 1.3+ (1): uint8_t[]. */
+    OFPRAW_OFPST13_FLOW_REPLY,
+    /* NXST 1.0 (0): uint8_t[]. */
+    OFPRAW_NXST_FLOW_REPLY,
+
+    /* OFPST 1.0 (2): struct ofp10_flow_stats_request. */
+    OFPRAW_OFPST10_AGGREGATE_REQUEST,
+    /* OFPST 1.1+ (2): struct ofp11_flow_stats_request, uint8_t[8][]. */
+    OFPRAW_OFPST11_AGGREGATE_REQUEST,
+    /* NXST 1.0 (1): struct nx_flow_stats_request, uint8_t[8][]. */
+    OFPRAW_NXST_AGGREGATE_REQUEST,
+
+    /* OFPST 1.0+ (2): struct ofp_aggregate_stats_reply. */
+    OFPRAW_OFPST_AGGREGATE_REPLY,
+    /* NXST 1.0 (1): struct ofp_aggregate_stats_reply. */
+    OFPRAW_NXST_AGGREGATE_REPLY,
+
+    /* OFPST 1.0+ (3): void. */
+    OFPRAW_OFPST_TABLE_REQUEST,
+
+    /* OFPST 1.0 (3): struct ofp10_table_stats[]. */
+    OFPRAW_OFPST10_TABLE_REPLY,
+    /* OFPST 1.1 (3): struct ofp11_table_stats[]. */
+    OFPRAW_OFPST11_TABLE_REPLY,
+    /* OFPST 1.2 (3): struct ofp12_table_stats[]. */
+    OFPRAW_OFPST12_TABLE_REPLY,
+    /* OFPST 1.3+ (3): struct ofp13_table_stats[]. */
+    OFPRAW_OFPST13_TABLE_REPLY,
+
+    /* OFPST 1.0 (4): struct ofp10_port_stats_request. */
+    OFPRAW_OFPST10_PORT_REQUEST,
+    /* OFPST 1.1+ (4): struct ofp11_port_stats_request. */
+    OFPRAW_OFPST11_PORT_REQUEST,
+
+    /* OFPST 1.0 (4): struct ofp10_port_stats[]. */
+    OFPRAW_OFPST10_PORT_REPLY,
+    /* OFPST 1.1-1.2 (4): struct ofp11_port_stats[]. */
+    OFPRAW_OFPST11_PORT_REPLY,
+    /* OFPST 1.3 (4): struct ofp13_port_stats[]. */
+    OFPRAW_OFPST13_PORT_REPLY,
+    /* OFPST 1.4+ (4): uint8_t[8][]. */
+    OFPRAW_OFPST14_PORT_REPLY,
+
+    /* OFPST 1.0 (5): struct ofp10_queue_stats_request. */
+    OFPRAW_OFPST10_QUEUE_REQUEST,
+    /* OFPST 1.1+ (5): struct ofp11_queue_stats_request. */
+    OFPRAW_OFPST11_QUEUE_REQUEST,
+
+    /* OFPST 1.0 (5): struct ofp10_queue_stats[]. */
+    OFPRAW_OFPST10_QUEUE_REPLY,
+    /* OFPST 1.1-1.2 (5): struct ofp11_queue_stats[]. */
+    OFPRAW_OFPST11_QUEUE_REPLY,
+    /* OFPST 1.3 (5): struct ofp13_queue_stats[]. */
+    OFPRAW_OFPST13_QUEUE_REPLY,
+    /* OFPST 1.4+ (5): uint8_t[8][]. */
+    OFPRAW_OFPST14_QUEUE_REPLY,
+
+    /* OFPST 1.1+ (6): struct ofp11_group_stats_request. */
+    OFPRAW_OFPST11_GROUP_REQUEST,
+
+    /* OFPST 1.1-1.2 (6): uint8_t[8][]. */
+    OFPRAW_OFPST11_GROUP_REPLY,
+    /* OFPST 1.3+ (6): uint8_t[8][]. */
+    OFPRAW_OFPST13_GROUP_REPLY,
+
+    /* OFPST 1.1-1.4 (7): void. */
+    OFPRAW_OFPST11_GROUP_DESC_REQUEST,
+    /* OFPST 1.5+ (7): struct ofp15_group_desc_request. */
+    OFPRAW_OFPST15_GROUP_DESC_REQUEST,
+
+    /* OFPST 1.1+ (7): uint8_t[8][]. */
+    OFPRAW_OFPST11_GROUP_DESC_REPLY,
+
+    /* OFPST 1.2+ (8): void. */
+    OFPRAW_OFPST12_GROUP_FEATURES_REQUEST,
+
+    /* OFPST 1.2+ (8): struct ofp12_group_features_stats. */
+    OFPRAW_OFPST12_GROUP_FEATURES_REPLY,
+
+    /* OFPST 1.3+ (9): struct ofp13_meter_multipart_request. */
+    OFPRAW_OFPST13_METER_REQUEST,
+
+    /* OFPST 1.3+ (9): uint8_t[8][]. */
+    OFPRAW_OFPST13_METER_REPLY,
+
+    /* OFPST 1.3+ (10): struct ofp13_meter_multipart_request. */
+    OFPRAW_OFPST13_METER_CONFIG_REQUEST,
+
+    /* OFPST 1.3+ (10): uint8_t[8][]. */
+    OFPRAW_OFPST13_METER_CONFIG_REPLY,
+
+    /* OFPST 1.3+ (11): void. */
+    OFPRAW_OFPST13_METER_FEATURES_REQUEST,
+
+    /* OFPST 1.3+ (11): struct ofp13_meter_features. */
+    OFPRAW_OFPST13_METER_FEATURES_REPLY,
+
+    /* OFPST 1.3+ (12): void. */
+    OFPRAW_OFPST13_TABLE_FEATURES_REQUEST,
+
+    /* OFPST 1.3+ (12): struct ofp13_table_features, uint8_t[8][]. */
+    OFPRAW_OFPST13_TABLE_FEATURES_REPLY,
+
+    /* OFPST 1.4+ (14): void. */
+    OFPRAW_OFPST14_TABLE_DESC_REQUEST,
+
+    /* OFPST 1.4+ (14): struct ofp14_table_desc, uint8_t[8][]. */
+    OFPRAW_OFPST14_TABLE_DESC_REPLY,
+
+    /* OFPST 1.0-1.4 (13): void. */
+    OFPRAW_OFPST10_PORT_DESC_REQUEST,
+    /* OFPST 1.5+ (13): struct ofp15_port_desc_request. */
+    OFPRAW_OFPST15_PORT_DESC_REQUEST,
+
+    /* OFPST 1.0 (13): struct ofp10_phy_port[]. */
+    OFPRAW_OFPST10_PORT_DESC_REPLY,
+    /* OFPST 1.1-1.3 (13): struct ofp11_port[]. */
+    OFPRAW_OFPST11_PORT_DESC_REPLY,
+    /* OFPST 1.4+ (13): uint8_t[8][]. */
+    OFPRAW_OFPST14_PORT_DESC_REPLY,
+
+    /* OFPST 1.4+ (15): struct ofp14_queue_desc_request. */
+    OFPRAW_OFPST14_QUEUE_DESC_REQUEST,
+    /* OFPST 1.4+ (15): uint8_t[8][]. */
+    OFPRAW_OFPST14_QUEUE_DESC_REPLY,
+
+    /* OFPST 1.4+ (16): uint8_t[8][]. */
+    OFPRAW_OFPST14_FLOW_MONITOR_REQUEST,
+    /* NXST 1.0 (2): uint8_t[8][]. */
+    OFPRAW_NXST_FLOW_MONITOR_REQUEST,
+
+    /* OFPST 1.4+ (16): uint8_t[8][]. */
+    OFPRAW_OFPST14_FLOW_MONITOR_REPLY,
+    /* NXST 1.0 (2): uint8_t[8][]. */
+    OFPRAW_NXST_FLOW_MONITOR_REPLY,
+
+/* Nicira extension messages.
+ *
+ * Nicira extensions that correspond to standard OpenFlow messages are listed
+ * alongside the standard versions above. */
+
+    /* NXT 1.0 (12): struct nx_set_flow_format. */
+    OFPRAW_NXT_SET_FLOW_FORMAT,
+
+    /* NXT 1.0+ (15): struct nx_flow_mod_table_id. */
+    OFPRAW_NXT_FLOW_MOD_TABLE_ID,
+
+    /* NXT 1.0+ (16): struct nx_set_packet_in_format. */
+    OFPRAW_NXT_SET_PACKET_IN_FORMAT,
+
+    /* NXT 1.0+ (18): void. */
+    OFPRAW_NXT_FLOW_AGE,
+
+    /* NXT 1.0+ (20): struct nx_controller_id. */
+    OFPRAW_NXT_SET_CONTROLLER_ID,
+
+    /* NXT 1.0+ (21): struct nx_flow_monitor_cancel. */
+    OFPRAW_NXT_FLOW_MONITOR_CANCEL,
+
+    /* NXT 1.0+ (22): void. */
+    OFPRAW_NXT_FLOW_MONITOR_PAUSED,
+
+    /* NXT 1.0+ (23): void. */
+    OFPRAW_NXT_FLOW_MONITOR_RESUMED,
+
+    /* NXT 1.0+ (24): struct nx_tlv_table_mod, struct nx_tlv_map[]. */
+    OFPRAW_NXT_TLV_TABLE_MOD,
+
+    /* NXT 1.0+ (25): void. */
+    OFPRAW_NXT_TLV_TABLE_REQUEST,
+
+    /* NXT 1.0+ (26): struct nx_tlv_table_reply, struct nx_tlv_map[]. */
+    OFPRAW_NXT_TLV_TABLE_REPLY,
+
+    /* NXT 1.0+ (28): uint8_t[8][]. */
+    OFPRAW_NXT_RESUME,
+
+    /* NXT 1.0+ (29): struct nx_zone_id. */
+    OFPRAW_NXT_CT_FLUSH_ZONE,
+
+    /* NXST 1.0+ (3): void. */
+    OFPRAW_NXST_IPFIX_BRIDGE_REQUEST,
+
+    /* NXST 1.0+ (3): struct nx_ipfix_stats_reply. */
+    OFPRAW_NXST_IPFIX_BRIDGE_REPLY,
+
+    /* NXST 1.0+ (4): void. */
+    OFPRAW_NXST_IPFIX_FLOW_REQUEST,
+
+    /* NXST 1.0+ (4): struct nx_ipfix_stats_reply[]. */
+    OFPRAW_NXST_IPFIX_FLOW_REPLY,
+};
+
+/* Decoding messages into OFPRAW_* values. */
+enum ofperr ofpraw_decode(enum ofpraw *, const struct ofp_header *);
+enum ofpraw ofpraw_decode_assert(const struct ofp_header *);
+enum ofperr ofpraw_pull(enum ofpraw *, struct ofpbuf *);
+enum ofpraw ofpraw_pull_assert(struct ofpbuf *);
+
+enum ofperr ofpraw_decode_partial(enum ofpraw *,
+                                  const struct ofp_header *, size_t length);
+
+/* Encoding messages using OFPRAW_* values. */
+struct ofpbuf *ofpraw_alloc(enum ofpraw, uint8_t ofp_version,
+                            size_t extra_tailroom);
+struct ofpbuf *ofpraw_alloc_xid(enum ofpraw, uint8_t ofp_version,
+                                ovs_be32 xid, size_t extra_tailroom);
+struct ofpbuf *ofpraw_alloc_reply(enum ofpraw,
+                                  const struct ofp_header *request,
+                                  size_t extra_tailroom);
+struct ofpbuf *ofpraw_alloc_stats_reply(const struct ofp_header *request,
+                                        size_t extra_tailroom);
+
+void ofpraw_put(enum ofpraw, uint8_t ofp_version, struct ofpbuf *);
+void ofpraw_put_xid(enum ofpraw, uint8_t ofp_version, ovs_be32 xid,
+                    struct ofpbuf *);
+void ofpraw_put_reply(enum ofpraw, const struct ofp_header *request,
+                      struct ofpbuf *);
+void ofpraw_put_stats_reply(const struct ofp_header *request, struct ofpbuf *);
+
+/* Information about OFPRAW_* values. */
+const char *ofpraw_get_name(enum ofpraw);
+enum ofpraw ofpraw_stats_request_to_reply(enum ofpraw, uint8_t version);
+
+/* Semantic identifiers for OpenFlow messages.
+ *
+ * Each OFPTYPE_* enumeration constant represents one or more concrete format
+ * of OpenFlow message.  When two variants of a message have essentially the
+ * same meaning, they are assigned a single OFPTYPE_* value.
+ *
+ * The comments here must follow a stylized form because the "extract-ofp-msgs"
+ * program parses them at build time to generate data tables.  The format is
+ * simply to list each OFPRAW_* enumeration constant for a given OFPTYPE_*,
+ * each followed by a period. */
+enum ofptype {
+    /* Immutable messages. */
+    OFPTYPE_HELLO,               /* OFPRAW_OFPT_HELLO. */
+    OFPTYPE_ERROR,               /* OFPRAW_OFPT_ERROR. */
+    OFPTYPE_ECHO_REQUEST,        /* OFPRAW_OFPT_ECHO_REQUEST. */
+    OFPTYPE_ECHO_REPLY,          /* OFPRAW_OFPT_ECHO_REPLY. */
+
+    /* Switch configuration messages. */
+    OFPTYPE_FEATURES_REQUEST,    /* OFPRAW_OFPT_FEATURES_REQUEST. */
+    OFPTYPE_FEATURES_REPLY,      /* OFPRAW_OFPT10_FEATURES_REPLY.
+                                  * OFPRAW_OFPT11_FEATURES_REPLY.
+                                  * OFPRAW_OFPT13_FEATURES_REPLY. */
+    OFPTYPE_GET_CONFIG_REQUEST,  /* OFPRAW_OFPT_GET_CONFIG_REQUEST. */
+    OFPTYPE_GET_CONFIG_REPLY,    /* OFPRAW_OFPT_GET_CONFIG_REPLY. */
+    OFPTYPE_SET_CONFIG,          /* OFPRAW_OFPT_SET_CONFIG. */
+
+    /* Asynchronous messages. */
+    OFPTYPE_PACKET_IN,           /* OFPRAW_OFPT10_PACKET_IN.
+                                  * OFPRAW_OFPT11_PACKET_IN.
+                                  * OFPRAW_OFPT12_PACKET_IN.
+                                  * OFPRAW_OFPT13_PACKET_IN.
+                                  * OFPRAW_NXT_PACKET_IN2.
+                                  * OFPRAW_NXT_PACKET_IN. */
+    OFPTYPE_FLOW_REMOVED,        /* OFPRAW_OFPT10_FLOW_REMOVED.
+                                  * OFPRAW_OFPT11_FLOW_REMOVED.
+                                  * OFPRAW_NXT_FLOW_REMOVED. */
+    OFPTYPE_PORT_STATUS,         /* OFPRAW_OFPT10_PORT_STATUS.
+                                  * OFPRAW_OFPT11_PORT_STATUS.
+                                  * OFPRAW_OFPT14_PORT_STATUS. */
+
+    /* Controller command messages. */
+    OFPTYPE_PACKET_OUT,          /* OFPRAW_OFPT10_PACKET_OUT.
+                                  * OFPRAW_OFPT11_PACKET_OUT. */
+    OFPTYPE_FLOW_MOD,            /* OFPRAW_OFPT10_FLOW_MOD.
+                                  * OFPRAW_OFPT11_FLOW_MOD.
+                                  * OFPRAW_NXT_FLOW_MOD. */
+    OFPTYPE_GROUP_MOD,           /* OFPRAW_OFPT11_GROUP_MOD.
+                                  * OFPRAW_OFPT15_GROUP_MOD. */
+    OFPTYPE_PORT_MOD,            /* OFPRAW_OFPT10_PORT_MOD.
+                                  * OFPRAW_OFPT11_PORT_MOD.
+                                  * OFPRAW_OFPT14_PORT_MOD. */
+    OFPTYPE_TABLE_MOD,           /* OFPRAW_OFPT11_TABLE_MOD.
+                                  * OFPRAW_OFPT14_TABLE_MOD. */
+
+    /* Barrier messages. */
+    OFPTYPE_BARRIER_REQUEST,     /* OFPRAW_OFPT10_BARRIER_REQUEST.
+                                  * OFPRAW_OFPT11_BARRIER_REQUEST. */
+    OFPTYPE_BARRIER_REPLY,       /* OFPRAW_OFPT10_BARRIER_REPLY.
+                                  * OFPRAW_OFPT11_BARRIER_REPLY. */
+
+    /* Queue Configuration messages. */
+    OFPTYPE_QUEUE_GET_CONFIG_REQUEST, /* OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST.
+                                       * OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST.
+                                       * OFPRAW_OFPST14_QUEUE_DESC_REQUEST. */
+    OFPTYPE_QUEUE_GET_CONFIG_REPLY, /* OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY.
+                                     * OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY.
+                                     * OFPRAW_OFPST14_QUEUE_DESC_REPLY. */
+
+    /* Controller role change request messages. */
+    OFPTYPE_ROLE_REQUEST,         /* OFPRAW_OFPT12_ROLE_REQUEST.
+                                   * OFPRAW_NXT_ROLE_REQUEST. */
+    OFPTYPE_ROLE_REPLY,           /* OFPRAW_OFPT12_ROLE_REPLY.
+                                   * OFPRAW_NXT_ROLE_REPLY. */
+
+    /* Asynchronous message configuration. */
+    OFPTYPE_GET_ASYNC_REQUEST,    /* OFPRAW_OFPT13_GET_ASYNC_REQUEST.
+                                   * OFPRAW_OFPT14_GET_ASYNC_REQUEST. */
+    OFPTYPE_GET_ASYNC_REPLY,      /* OFPRAW_OFPT13_GET_ASYNC_REPLY.
+                                   * OFPRAW_OFPT14_GET_ASYNC_REPLY. */
+    OFPTYPE_SET_ASYNC_CONFIG,     /* OFPRAW_NXT_SET_ASYNC_CONFIG.
+                                   * OFPRAW_NXT_SET_ASYNC_CONFIG2.
+                                   * OFPRAW_OFPT13_SET_ASYNC.
+                                   * OFPRAW_OFPT14_SET_ASYNC. */
+
+    /* Meters and rate limiters configuration messages. */
+    OFPTYPE_METER_MOD,            /* OFPRAW_OFPT13_METER_MOD. */
+
+    /* Controller role change event messages. */
+    OFPTYPE_ROLE_STATUS,          /* OFPRAW_OFPT14_ROLE_STATUS. */
+
+    /* Request forwarding by the switch. */
+    OFPTYPE_REQUESTFORWARD,       /* OFPRAW_OFPT14_REQUESTFORWARD. */
+
+    /* Asynchronous messages. */
+    OFPTYPE_TABLE_STATUS,          /* OFPRAW_OFPT14_TABLE_STATUS. */
+
+    OFPTYPE_BUNDLE_CONTROL,       /* OFPRAW_OFPT14_BUNDLE_CONTROL.
+                                   * OFPRAW_ONFT13_BUNDLE_CONTROL. */
+
+    OFPTYPE_BUNDLE_ADD_MESSAGE,   /* OFPRAW_OFPT14_BUNDLE_ADD_MESSAGE.
+                                   * OFPRAW_ONFT13_BUNDLE_ADD_MESSAGE. */
+
+    /* Statistics. */
+    OFPTYPE_DESC_STATS_REQUEST,      /* OFPRAW_OFPST_DESC_REQUEST. */
+    OFPTYPE_DESC_STATS_REPLY,        /* OFPRAW_OFPST_DESC_REPLY. */
+    OFPTYPE_FLOW_STATS_REQUEST,      /* OFPRAW_OFPST10_FLOW_REQUEST.
+                                      * OFPRAW_OFPST11_FLOW_REQUEST.
+                                      * OFPRAW_NXST_FLOW_REQUEST. */
+    OFPTYPE_FLOW_STATS_REPLY,        /* OFPRAW_OFPST10_FLOW_REPLY.
+                                      * OFPRAW_OFPST11_FLOW_REPLY.
+                                      * OFPRAW_OFPST13_FLOW_REPLY.
+                                      * OFPRAW_NXST_FLOW_REPLY. */
+    OFPTYPE_AGGREGATE_STATS_REQUEST, /* OFPRAW_OFPST10_AGGREGATE_REQUEST.
+                                      * OFPRAW_OFPST11_AGGREGATE_REQUEST.
+                                      * OFPRAW_NXST_AGGREGATE_REQUEST. */
+    OFPTYPE_AGGREGATE_STATS_REPLY,   /* OFPRAW_OFPST_AGGREGATE_REPLY.
+                                      * OFPRAW_NXST_AGGREGATE_REPLY. */
+    OFPTYPE_TABLE_STATS_REQUEST,     /* OFPRAW_OFPST_TABLE_REQUEST. */
+    OFPTYPE_TABLE_STATS_REPLY,       /* OFPRAW_OFPST10_TABLE_REPLY.
+                                      * OFPRAW_OFPST11_TABLE_REPLY.
+                                      * OFPRAW_OFPST12_TABLE_REPLY.
+                                      * OFPRAW_OFPST13_TABLE_REPLY. */
+    OFPTYPE_PORT_STATS_REQUEST,      /* OFPRAW_OFPST10_PORT_REQUEST.
+                                      * OFPRAW_OFPST11_PORT_REQUEST. */
+    OFPTYPE_PORT_STATS_REPLY,        /* OFPRAW_OFPST10_PORT_REPLY.
+                                      * OFPRAW_OFPST11_PORT_REPLY.
+                                      * OFPRAW_OFPST13_PORT_REPLY.
+                                      * OFPRAW_OFPST14_PORT_REPLY. */
+    OFPTYPE_QUEUE_STATS_REQUEST,     /* OFPRAW_OFPST10_QUEUE_REQUEST.
+                                      * OFPRAW_OFPST11_QUEUE_REQUEST. */
+    OFPTYPE_QUEUE_STATS_REPLY,       /* OFPRAW_OFPST10_QUEUE_REPLY.
+                                      * OFPRAW_OFPST11_QUEUE_REPLY.
+                                      * OFPRAW_OFPST13_QUEUE_REPLY.
+                                      * OFPRAW_OFPST14_QUEUE_REPLY. */
+
+    OFPTYPE_GROUP_STATS_REQUEST,     /* OFPRAW_OFPST11_GROUP_REQUEST. */
+
+    OFPTYPE_GROUP_STATS_REPLY,       /* OFPRAW_OFPST11_GROUP_REPLY.
+                                      * OFPRAW_OFPST13_GROUP_REPLY. */
+
+    OFPTYPE_GROUP_DESC_STATS_REQUEST, /* OFPRAW_OFPST11_GROUP_DESC_REQUEST.
+                                       * OFPRAW_OFPST15_GROUP_DESC_REQUEST. */
+
+    OFPTYPE_GROUP_DESC_STATS_REPLY,  /* OFPRAW_OFPST11_GROUP_DESC_REPLY. */
+
+    OFPTYPE_GROUP_FEATURES_STATS_REQUEST, /* OFPRAW_OFPST12_GROUP_FEATURES_REQUEST. */
+
+    OFPTYPE_GROUP_FEATURES_STATS_REPLY, /* OFPRAW_OFPST12_GROUP_FEATURES_REPLY. */
+
+    OFPTYPE_METER_STATS_REQUEST,     /* OFPRAW_OFPST13_METER_REQUEST. */
+
+    OFPTYPE_METER_STATS_REPLY,       /* OFPRAW_OFPST13_METER_REPLY. */
+
+    OFPTYPE_METER_CONFIG_STATS_REQUEST, /* OFPRAW_OFPST13_METER_CONFIG_REQUEST. */
+
+    OFPTYPE_METER_CONFIG_STATS_REPLY, /* OFPRAW_OFPST13_METER_CONFIG_REPLY. */
+
+    OFPTYPE_METER_FEATURES_STATS_REQUEST, /* OFPRAW_OFPST13_METER_FEATURES_REQUEST. */
+
+    OFPTYPE_METER_FEATURES_STATS_REPLY, /* OFPRAW_OFPST13_METER_FEATURES_REPLY. */
+
+    OFPTYPE_TABLE_FEATURES_STATS_REQUEST, /* OFPRAW_OFPST13_TABLE_FEATURES_REQUEST. */
+
+    OFPTYPE_TABLE_FEATURES_STATS_REPLY, /* OFPRAW_OFPST13_TABLE_FEATURES_REPLY. */
+
+    OFPTYPE_TABLE_DESC_REQUEST,      /* OFPRAW_OFPST14_TABLE_DESC_REQUEST. */
+
+    OFPTYPE_TABLE_DESC_REPLY,        /* OFPRAW_OFPST14_TABLE_DESC_REPLY. */
+
+    OFPTYPE_PORT_DESC_STATS_REQUEST, /* OFPRAW_OFPST10_PORT_DESC_REQUEST.
+                                      * OFPRAW_OFPST15_PORT_DESC_REQUEST. */
+
+    OFPTYPE_PORT_DESC_STATS_REPLY,   /* OFPRAW_OFPST10_PORT_DESC_REPLY.
+                                      * OFPRAW_OFPST11_PORT_DESC_REPLY.
+                                      * OFPRAW_OFPST14_PORT_DESC_REPLY. */
+
+    OFPTYPE_FLOW_MONITOR_STATS_REQUEST, /* OFPRAW_OFPST14_FLOW_MONITOR_REQUEST.
+                                         * OFPRAW_NXST_FLOW_MONITOR_REQUEST. */
+    OFPTYPE_FLOW_MONITOR_STATS_REPLY,   /* OFPRAW_OFPST14_FLOW_MONITOR_REPLY.
+                                         * OFPRAW_NXST_FLOW_MONITOR_REPLY. */
+
+    /* Nicira extensions. */
+    OFPTYPE_SET_FLOW_FORMAT,      /* OFPRAW_NXT_SET_FLOW_FORMAT. */
+    OFPTYPE_FLOW_MOD_TABLE_ID,    /* OFPRAW_NXT_FLOW_MOD_TABLE_ID. */
+    OFPTYPE_SET_PACKET_IN_FORMAT, /* OFPRAW_NXT_SET_PACKET_IN_FORMAT. */
+    OFPTYPE_FLOW_AGE,             /* OFPRAW_NXT_FLOW_AGE. */
+    OFPTYPE_SET_CONTROLLER_ID,    /* OFPRAW_NXT_SET_CONTROLLER_ID. */
+    OFPTYPE_NXT_TLV_TABLE_MOD, /* OFPRAW_NXT_TLV_TABLE_MOD. */
+    OFPTYPE_NXT_TLV_TABLE_REQUEST, /* OFPRAW_NXT_TLV_TABLE_REQUEST. */
+    OFPTYPE_NXT_TLV_TABLE_REPLY, /* OFPRAW_NXT_TLV_TABLE_REPLY. */
+    OFPTYPE_NXT_RESUME,          /* OFPRAW_NXT_RESUME. */
+    OFPTYPE_IPFIX_BRIDGE_STATS_REQUEST, /* OFPRAW_NXST_IPFIX_BRIDGE_REQUEST */
+    OFPTYPE_IPFIX_BRIDGE_STATS_REPLY, /* OFPRAW_NXST_IPFIX_BRIDGE_REPLY */
+    OFPTYPE_IPFIX_FLOW_STATS_REQUEST, /* OFPRAW_NXST_IPFIX_FLOW_REQUEST */
+    OFPTYPE_IPFIX_FLOW_STATS_REPLY,   /* OFPRAW_NXST_IPFIX_FLOW_REPLY */
+    OFPTYPE_CT_FLUSH_ZONE,            /* OFPRAW_NXT_CT_FLUSH_ZONE. */
+
+    /* Flow monitor extension. */
+    OFPTYPE_FLOW_MONITOR_CANCEL,        /* OFPRAW_NXT_FLOW_MONITOR_CANCEL. */
+    OFPTYPE_FLOW_MONITOR_PAUSED,        /* OFPRAW_NXT_FLOW_MONITOR_PAUSED. */
+    OFPTYPE_FLOW_MONITOR_RESUMED,       /* OFPRAW_NXT_FLOW_MONITOR_RESUMED. */
+};
+
+/* Decoding messages into OFPTYPE_* values. */
+enum ofperr ofptype_decode(enum ofptype *, const struct ofp_header *);
+enum ofperr ofptype_pull(enum ofptype *, struct ofpbuf *);
+enum ofptype ofptype_from_ofpraw(enum ofpraw);
+
+/* Information about OFTYPE_* values. */
+const char *ofptype_get_name(enum ofptype);
+
+/* OpenFlow message properties. */
+void ofpmsg_update_length(struct ofpbuf *);
+const void *ofpmsg_body(const struct ofp_header *);
+bool ofpmsg_is_stat_request(const struct ofp_header *);
+
+/* Multipart messages (aka "statistics").
+ *
+ * Individual OpenFlow messages are limited to 64 kB in size, but some messages
+ * need to be longer.  Therefore, multipart messages allow a longer message to
+ * be divided into multiple parts at some convenient boundary.  For example,
+ * limiting the response to a "flow dump" request to 64 kB would unreasonably
+ * limit the maximum number of flows in an OpenFlow switch, so a "flow dump" is
+ * expressed as a multipart request/reply pair, with the reply broken into
+ * pieces between flows.
+ *
+ * Multipart messages always consist of a request/reply pair.
+ *
+ * In OpenFlow 1.0, 1.1, and 1.2, requests must always fit in a single message,
+ * that is, only a multipart reply may have more than one part.  OpenFlow 1.3
+ * adds one multipart request.  This code does not yet support multipart
+ * requests. */
+
+/* Encoding multipart replies.
+ *
+ * These functions are useful for multipart replies that might really require
+ * more than one message.  A multipart message that is known in advance to fit
+ * within 64 kB doesn't need any special treatment, so you might as well use
+ * the ofpraw_alloc_*() functions.
+ *
+ * These functions work with a "struct ovs_list" of "struct ofpbuf"s, each of
+ * which represents one part of a multipart message. */
+void ofpmp_init(struct ovs_list *, const struct ofp_header *request);
+struct ofpbuf *ofpmp_reserve(struct ovs_list *, size_t len);
+void *ofpmp_append(struct ovs_list *, size_t len);
+void ofpmp_postappend(struct ovs_list *, size_t start_ofs);
+
+enum ofp_version ofpmp_version(struct ovs_list *);
+enum ofpraw ofpmp_decode_raw(struct ovs_list *);
+
+/* Decoding multipart replies. */
+uint16_t ofpmp_flags(const struct ofp_header *);
+bool ofpmp_more(const struct ofp_header *);
+
+#endif /* ofp-msgs.h */
diff --git a/openflow/include/openvswitch/ofp-parse.h b/openflow/include/openvswitch/ofp-parse.h
new file mode 100644
index 0000000..ed7a09c
--- /dev/null
+++ b/openflow/include/openvswitch/ofp-parse.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* OpenFlow protocol string to flow parser. */
+
+#ifndef OPENVSWITCH_OFP_PARSE_H
+#define OPENVSWITCH_OFP_PARSE_H 1
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include "openvswitch/compiler.h"
+#include "openvswitch/types.h"
+
+struct flow;
+struct ofpbuf;
+struct ofputil_flow_mod;
+struct ofputil_packet_out;
+struct ofputil_flow_monitor_request;
+struct ofputil_flow_stats_request;
+struct ofputil_group_mod;
+struct ofputil_meter_mod;
+struct ofputil_table_mod;
+struct ofputil_bundle_msg;
+struct ofputil_tlv_table_mod;
+struct simap;
+enum ofputil_protocol;
+
+char *parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_,
+                    enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_ofp_flow_mod_str(struct ofputil_flow_mod *, const char *string,
+                             int command,
+                             enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_ofp_packet_out_str(struct ofputil_packet_out *po, const char *str_,
+                               enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_ofp_table_mod(struct ofputil_table_mod *,
+                          const char *table_id, const char *flow_miss_handling,
+                          uint32_t *usable_versions)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_ofp_flow_mod_file(const char *file_name, int command,
+                              struct ofputil_flow_mod **fms, size_t *n_fms,
+                              enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *,
+                                       bool aggregate, const char *string,
+                                       enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_ofp_exact_flow(struct flow *flow, struct flow_wildcards *wc,
+                           const struct tun_table *tun_table, const char *s,
+                           const struct simap *portno_names);
+
+char *parse_ofp_meter_mod_str(struct ofputil_meter_mod *, const char *string,
+                              int command,
+                              enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_flow_monitor_request(struct ofputil_flow_monitor_request *,
+                                 const char *,
+                                 enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_ofp_group_mod_file(const char *file_name, int command,
+                               struct ofputil_group_mod **gms, size_t *n_gms,
+                               enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_ofp_group_mod_str(struct ofputil_group_mod *, int command,
+                              const char *string,
+                              enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_ofp_bundle_file(const char *file_name,
+                            struct ofputil_bundle_msg **, size_t *n_bms,
+                            enum ofputil_protocol *)
+    OVS_WARN_UNUSED_RESULT;
+
+char *parse_ofp_tlv_table_mod_str(struct ofputil_tlv_table_mod *,
+                                     uint16_t command, const char *string,
+                                     enum ofputil_protocol *usable_protocols)
+    OVS_WARN_UNUSED_RESULT;
+
+char *str_to_u8(const char *str, const char *name, uint8_t *valuep)
+    OVS_WARN_UNUSED_RESULT;
+char *str_to_u16(const char *str, const char *name, uint16_t *valuep)
+    OVS_WARN_UNUSED_RESULT;
+char *str_to_u32(const char *str, uint32_t *valuep) OVS_WARN_UNUSED_RESULT;
+char *str_to_u64(const char *str, uint64_t *valuep) OVS_WARN_UNUSED_RESULT;
+char *str_to_be64(const char *str, ovs_be64 *valuep) OVS_WARN_UNUSED_RESULT;
+char *str_to_mac(const char *str, struct eth_addr *mac) OVS_WARN_UNUSED_RESULT;
+char *str_to_ip(const char *str, ovs_be32 *ip) OVS_WARN_UNUSED_RESULT;
+char *str_to_connhelper(const char *str, uint16_t *alg) OVS_WARN_UNUSED_RESULT;
+char *parse_ofp_table_vacancy(struct ofputil_table_mod *,
+                              const char *flow_miss_handling)
+    OVS_WARN_UNUSED_RESULT;
+
+#endif /* ofp-parse.h */
diff --git a/openflow/include/openvswitch/ofp-print.h b/openflow/include/openvswitch/ofp-print.h
new file mode 100644
index 0000000..58fd403
--- /dev/null
+++ b/openflow/include/openvswitch/ofp-print.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2008, 2009, 2011, 2012, 2015 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* OpenFlow protocol pretty-printer. */
+
+#ifndef OPENVSWITCH_OFP_PRINT_H
+#define OPENVSWITCH_OFP_PRINT_H 1
+
+#include <stdint.h>
+#include <stdio.h>
+
+struct ds;
+struct ofp10_match;
+struct ofp_flow_mod;
+struct ofp_header;
+struct ofputil_flow_stats;
+struct ofputil_table_features;
+struct ofputil_table_stats;
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+void ofp_print(FILE *, const void *, size_t, int verbosity);
+void ofp_print_packet(FILE *stream, const void *data, size_t len);
+
+void ofp10_match_print(struct ds *, const struct ofp10_match *, int verbosity);
+
+char *ofp_to_string(const void *, size_t, int verbosity);
+char *ofp10_match_to_string(const struct ofp10_match *, int verbosity);
+char *ofp_packet_to_string(const void *data, size_t len);
+
+void ofp_print_flow_stats(struct ds *, struct ofputil_flow_stats *);
+void ofp_print_version(const struct ofp_header *, struct ds *);
+void ofp_print_table_features(
+    struct ds *, const struct ofputil_table_features *features,
+    const struct ofputil_table_features *prev_features,
+    const struct ofputil_table_stats *stats,
+    const struct ofputil_table_stats *prev_stats);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* ofp-print.h */
diff --git a/openflow/include/openvswitch/ofp-prop.h b/openflow/include/openvswitch/ofp-prop.h
new file mode 100644
index 0000000..0ba2d35
--- /dev/null
+++ b/openflow/include/openvswitch/ofp-prop.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2014, 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_OFP_PROP_H
+#define OPENVSWITCH_OFP_PROP_H 1
+
+/* OpenFlow 1.3+ property support
+ * ==============================
+ *
+ * Several OpenFlow 1.3+ messages use type-length-value (TLV) properties that
+ * take the common form shown by "struct ofp_prop_header".  This module
+ * provides support for serializing and deserializing properties in this
+ * format.
+ *
+ *
+ * Property types
+ * --------------
+ *
+ * This module uses uint64_t values to identify property types
+ *
+ *     - OpenFlow assigns 16-bit type values to its own standardized
+ *       properties.  ofpprop uses these values directly in uint64_t.
+ *
+ *       The 16-bit value 0xffff (and for some kinds of properties  0xfffe) is
+ *       reserved as a kind of escape to introduce an "experimenter" property
+ *       (see below).
+ *
+ *     - Vendor-specific "experimenter" properties have a 32-bit "experimenter
+ *       ID" (generally an Ethernet OUI) and a 32-bit experimenter-defined
+ *       "exp_type".  ofpprop encodes these with the experimenter ID in the
+ *       high 32 bits and exp_type in the low 32 bits.  (All existing
+ *       experimenter IDs are nonzero, so this is unambiguous.)  Use
+ *       OFPPROP_EXP to encode these property types.
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include "openvswitch/ofp-errors.h"
+#include "openvswitch/types.h"
+
+struct ofpbuf;
+struct uuid;
+struct vlog_module;
+
+/* Given an OpenFlow experimenter ID (e.g. NX_VENDOR_ID) 'exp_id' and type
+ * 'exp_type', yields the code that ofpprop_pull() would use to identify the
+ * given experimenter property. */
+#define OFPPROP_EXP(EXP_ID, EXP_TYPE) \
+    (((uint64_t) (EXP_ID) << 32) | (EXP_TYPE))
+
+/* Returns true if 'type' represents an experimenter property type,
+ * false if it represents a standard property type.*/
+static inline bool
+ofpprop_is_experimenter(uint64_t type)
+{
+    return type > UINT16_MAX;
+}
+
+/* Deserializing properties.  */
+enum ofperr ofpprop_pull__(struct ofpbuf *msg, struct ofpbuf *property,
+                           unsigned int alignment, unsigned int min_exp,
+                           uint64_t *typep);
+enum ofperr ofpprop_pull(struct ofpbuf *msg, struct ofpbuf *property,
+                         uint64_t *typep);
+
+enum ofperr ofpprop_parse_be16(const struct ofpbuf *, ovs_be16 *value);
+enum ofperr ofpprop_parse_be32(const struct ofpbuf *, ovs_be32 *value);
+enum ofperr ofpprop_parse_be64(const struct ofpbuf *, ovs_be64 *value);
+enum ofperr ofpprop_parse_u8(const struct ofpbuf *, uint8_t *value);
+enum ofperr ofpprop_parse_u16(const struct ofpbuf *, uint16_t *value);
+enum ofperr ofpprop_parse_u32(const struct ofpbuf *, uint32_t *value);
+enum ofperr ofpprop_parse_u64(const struct ofpbuf *, uint64_t *value);
+enum ofperr ofpprop_parse_uuid(const struct ofpbuf *, struct uuid *);
+enum ofperr ofpprop_parse_nested(const struct ofpbuf *, struct ofpbuf *);
+
+/* Serializing properties. */
+void ofpprop_put(struct ofpbuf *, uint64_t type,
+                 const void *value, size_t len);
+void *ofpprop_put_zeros(struct ofpbuf *, uint64_t type, size_t len);
+void ofpprop_put_be16(struct ofpbuf *, uint64_t type, ovs_be16 value);
+void ofpprop_put_be32(struct ofpbuf *, uint64_t type, ovs_be32 value);
+void ofpprop_put_be64(struct ofpbuf *, uint64_t type, ovs_be64 value);
+void ofpprop_put_u8(struct ofpbuf *, uint64_t type, uint8_t value);
+void ofpprop_put_u16(struct ofpbuf *, uint64_t type, uint16_t value);
+void ofpprop_put_u32(struct ofpbuf *, uint64_t type, uint32_t value);
+void ofpprop_put_u64(struct ofpbuf *, uint64_t type, uint64_t value);
+void ofpprop_put_bitmap(struct ofpbuf *, uint64_t type, uint64_t bitmap);
+void ofpprop_put_flag(struct ofpbuf *, uint64_t type);
+void ofpprop_put_uuid(struct ofpbuf *, uint64_t type, const struct uuid *);
+void ofpprop_put_nested(struct ofpbuf *, uint64_t type, const struct ofpbuf *);
+
+size_t ofpprop_start(struct ofpbuf *, uint64_t type);
+void ofpprop_end(struct ofpbuf *, size_t start_ofs);
+
+size_t ofpprop_start_nested(struct ofpbuf *, uint64_t type);
+
+/* Logging errors while deserializing properties.
+ *
+ * The attitude that a piece of code should take when it deserializes an
+ * unknown property type depends on the code in question:
+ *
+ *    - In a "loose" context (with LOOSE set to true), that is, where the code
+ *      is parsing the property to find out about the state or the capabilities
+ *      of some piece of the system, generally an unknown property type is not
+ *      a big deal, because it only means that there is additional information
+ *      that the receiver does not understand.
+ *
+ *    - In a "strict" context (with LOOSE set to false), that is, where the
+ *      code is parsing the property to change the state or configuration of a
+ *      part of the system, generally an unknown property type is an error,
+ *      because it means that the receiver is being asked to configure the
+ *      system in some way it doesn't understand.
+ *
+ * Given LOOSE, this macro automatically logs chooses an appropriate log
+ * level. */
+#define OFPPROP_LOG(RL, LOOSE, ...)                         \
+    VLOG_RL(RL, (LOOSE) ? VLL_DBG : VLL_WARN, __VA_ARGS__)
+
+enum ofperr ofpprop_unknown(struct vlog_module *, bool loose, const char *msg,
+                            uint64_t type);
+#define OFPPROP_UNKNOWN(LOOSE, MSG, TYPE) \
+    ofpprop_unknown(&this_module, LOOSE, MSG, TYPE)
+
+#endif /* ofp-prop.h */
diff --git a/openflow/include/openvswitch/ofp-util.h b/openflow/include/openvswitch/ofp-util.h
new file mode 100644
index 0000000..0c3a10a
--- /dev/null
+++ b/openflow/include/openvswitch/ofp-util.h
@@ -0,0 +1,1467 @@
+/*
+ * Copyright (c) 2008-2017 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_OFP_UTIL_H
+#define OPENVSWITCH_OFP_UTIL_H 1
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include "openvswitch/flow.h"
+#include "openvswitch/list.h"
+#include "openvswitch/match.h"
+#include "openvswitch/meta-flow.h"
+#include "openvswitch/netdev.h"
+#include "openflow/netronome-ext.h"
+#include "openflow/nicira-ext.h"
+#include "openvswitch/ofp-msgs.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/types.h"
+#include "openvswitch/type-props.h"
+#include "openvswitch/uuid.h"
+
+struct ofpbuf;
+union ofp_action;
+struct ofpact_set_field;
+struct vl_mff_map;
+
+/* Port numbers. */
+enum ofperr ofputil_port_from_ofp11(ovs_be32 ofp11_port,
+                                    ofp_port_t *ofp10_port);
+ovs_be32 ofputil_port_to_ofp11(ofp_port_t ofp10_port);
+
+bool ofputil_port_from_string(const char *, ofp_port_t *portp);
+void ofputil_format_port(ofp_port_t port, struct ds *);
+void ofputil_port_to_string(ofp_port_t, char namebuf[OFP_MAX_PORT_NAME_LEN],
+                            size_t bufsize);
+
+/* Group numbers. */
+enum { MAX_GROUP_NAME_LEN = INT_STRLEN(uint32_t) };
+bool ofputil_group_from_string(const char *, uint32_t *group_id);
+void ofputil_format_group(uint32_t group_id, struct ds *);
+void ofputil_group_to_string(uint32_t group_id,
+                             char namebuf[MAX_GROUP_NAME_LEN + 1],
+                             size_t bufsize);
+
+/* Converting OFPFW10_NW_SRC_MASK and OFPFW10_NW_DST_MASK wildcard bit counts
+ * to and from IP bitmasks. */
+ovs_be32 ofputil_wcbits_to_netmask(int wcbits);
+int ofputil_netmask_to_wcbits(ovs_be32 netmask);
+
+/* Protocols.
+ *
+ * A "protocol" is an OpenFlow version plus, for some OpenFlow versions,
+ * a bit extra about the flow match format in use.
+ *
+ * These are arranged from most portable to least portable, or alternatively
+ * from least powerful to most powerful.  Protocols earlier on the list are
+ * more likely to be understood for the purpose of making requests, but
+ * protocol later on the list are more likely to accurately describe a flow
+ * within a switch.
+ *
+ * On any given OpenFlow connection, a single protocol is in effect at any
+ * given time.  These values use separate bits only because that makes it easy
+ * to test whether a particular protocol is within a given set of protocols and
+ * to implement set union and intersection.
+ */
+enum ofputil_protocol {
+    /* OpenFlow 1.0 protocols.
+     *
+     * The "STD" protocols use the standard OpenFlow 1.0 flow format.
+     * The "NXM" protocols use the Nicira Extensible Match (NXM) flow format.
+     *
+     * The protocols with "TID" mean that the nx_flow_mod_table_id Nicira
+     * extension has been enabled.  The other protocols have it disabled.
+     */
+#define OFPUTIL_P_NONE 0
+    OFPUTIL_P_OF10_STD     = 1 << 0,
+    OFPUTIL_P_OF10_STD_TID = 1 << 1,
+    OFPUTIL_P_OF10_NXM     = 1 << 2,
+    OFPUTIL_P_OF10_NXM_TID = 1 << 3,
+#define OFPUTIL_P_OF10_STD_ANY (OFPUTIL_P_OF10_STD | OFPUTIL_P_OF10_STD_TID)
+#define OFPUTIL_P_OF10_NXM_ANY (OFPUTIL_P_OF10_NXM | OFPUTIL_P_OF10_NXM_TID)
+#define OFPUTIL_P_OF10_ANY (OFPUTIL_P_OF10_STD_ANY | OFPUTIL_P_OF10_NXM_ANY)
+
+    /* OpenFlow 1.1 protocol.
+     *
+     * We only support the standard OpenFlow 1.1 flow format.
+     *
+     * OpenFlow 1.1 always operates with an equivalent of the
+     * nx_flow_mod_table_id Nicira extension enabled, so there is no "TID"
+     * variant. */
+    OFPUTIL_P_OF11_STD     = 1 << 4,
+
+    /* OpenFlow 1.2+ protocols (only one variant each).
+     *
+     * These use the standard OpenFlow Extensible Match (OXM) flow format.
+     *
+     * OpenFlow 1.2+ always operates with an equivalent of the
+     * nx_flow_mod_table_id Nicira extension enabled, so there is no "TID"
+     * variant. */
+    OFPUTIL_P_OF12_OXM      = 1 << 5,
+    OFPUTIL_P_OF13_OXM      = 1 << 6,
+    OFPUTIL_P_OF14_OXM      = 1 << 7,
+    OFPUTIL_P_OF15_OXM      = 1 << 8,
+    OFPUTIL_P_OF16_OXM      = 1 << 9,
+#define OFPUTIL_P_ANY_OXM (OFPUTIL_P_OF12_OXM | \
+                           OFPUTIL_P_OF13_OXM | \
+                           OFPUTIL_P_OF14_OXM | \
+                           OFPUTIL_P_OF15_OXM | \
+                           OFPUTIL_P_OF16_OXM)
+
+#define OFPUTIL_P_NXM_OF11_UP (OFPUTIL_P_OF10_NXM_ANY | OFPUTIL_P_OF11_STD | \
+                               OFPUTIL_P_ANY_OXM)
+
+#define OFPUTIL_P_NXM_OXM_ANY (OFPUTIL_P_OF10_NXM_ANY | OFPUTIL_P_ANY_OXM)
+
+#define OFPUTIL_P_OF11_UP (OFPUTIL_P_OF11_STD | OFPUTIL_P_ANY_OXM)
+
+#define OFPUTIL_P_OF12_UP (OFPUTIL_P_OF12_OXM | OFPUTIL_P_OF13_UP)
+#define OFPUTIL_P_OF13_UP (OFPUTIL_P_OF13_OXM | OFPUTIL_P_OF14_UP)
+#define OFPUTIL_P_OF14_UP (OFPUTIL_P_OF14_OXM | OFPUTIL_P_OF15_UP)
+#define OFPUTIL_P_OF15_UP (OFPUTIL_P_OF15_OXM | OFPUTIL_P_OF16_UP)
+#define OFPUTIL_P_OF16_UP OFPUTIL_P_OF16_OXM
+
+    /* All protocols. */
+#define OFPUTIL_P_ANY ((1 << 10) - 1)
+
+    /* Protocols in which a specific table may be specified in flow_mods. */
+#define OFPUTIL_P_TID (OFPUTIL_P_OF10_STD_TID | \
+                       OFPUTIL_P_OF10_NXM_TID | \
+                       OFPUTIL_P_OF11_STD |     \
+                       OFPUTIL_P_ANY_OXM)
+};
+
+/* Protocols to use for flow dumps, from most to least preferred. */
+extern enum ofputil_protocol ofputil_flow_dump_protocols[];
+extern size_t ofputil_n_flow_dump_protocols;
+
+enum ofputil_protocol ofputil_protocol_from_ofp_version(enum ofp_version);
+enum ofputil_protocol ofputil_protocols_from_ofp_version(enum ofp_version);
+enum ofp_version ofputil_protocol_to_ofp_version(enum ofputil_protocol);
+
+bool ofputil_protocol_is_valid(enum ofputil_protocol);
+enum ofputil_protocol ofputil_protocol_set_tid(enum ofputil_protocol,
+                                               bool enable);
+enum ofputil_protocol ofputil_protocol_to_base(enum ofputil_protocol);
+enum ofputil_protocol ofputil_protocol_set_base(
+    enum ofputil_protocol cur, enum ofputil_protocol new_base);
+
+const char *ofputil_protocol_to_string(enum ofputil_protocol);
+char *ofputil_protocols_to_string(enum ofputil_protocol);
+enum ofputil_protocol ofputil_protocols_from_string(const char *);
+
+void ofputil_format_version(struct ds *, enum ofp_version);
+void ofputil_format_version_name(struct ds *, enum ofp_version);
+
+/* A bitmap of version numbers
+ *
+ * Bit offsets correspond to ofp_version numbers which in turn correspond to
+ * wire-protocol numbers for OpenFlow versions, e.g. (1u << OFP11_VERSION)
+ * is the mask for OpenFlow 1.1.  If the bit for a version is set then it is
+ * allowed, otherwise it is disallowed. */
+
+void ofputil_format_version_bitmap(struct ds *msg, uint32_t bitmap);
+void ofputil_format_version_bitmap_names(struct ds *msg, uint32_t bitmap);
+
+enum ofp_version ofputil_version_from_string(const char *s);
+
+uint32_t ofputil_protocols_to_version_bitmap(enum ofputil_protocol);
+enum ofputil_protocol ofputil_protocols_from_version_bitmap(uint32_t bitmap);
+
+/* Bitmaps of OpenFlow versions that Open vSwitch supports, and that it enables
+ * by default.  When Open vSwitch has experimental or incomplete support for
+ * newer versions of OpenFlow, those versions should not be supported by
+ * default and thus should be omitted from the latter bitmap. */
+#define OFPUTIL_SUPPORTED_VERSIONS ((1u << OFP10_VERSION) | \
+                                    (1u << OFP11_VERSION) | \
+                                    (1u << OFP12_VERSION) | \
+                                    (1u << OFP13_VERSION))
+#define OFPUTIL_DEFAULT_VERSIONS OFPUTIL_SUPPORTED_VERSIONS
+
+enum ofputil_protocol ofputil_protocols_from_string(const char *s);
+
+const char *ofputil_version_to_string(enum ofp_version ofp_version);
+uint32_t ofputil_versions_from_string(const char *s);
+uint32_t ofputil_versions_from_strings(char ** const s, size_t count);
+
+bool ofputil_decode_hello(const struct ofp_header *,
+                          uint32_t *allowed_versions);
+struct ofpbuf *ofputil_encode_hello(uint32_t version_bitmap);
+
+struct ofpbuf *ofputil_encode_set_protocol(enum ofputil_protocol current,
+                                           enum ofputil_protocol want,
+                                           enum ofputil_protocol *next);
+
+/* nx_flow_format */
+struct ofpbuf *ofputil_encode_nx_set_flow_format(enum nx_flow_format);
+enum ofputil_protocol ofputil_nx_flow_format_to_protocol(enum nx_flow_format);
+bool ofputil_nx_flow_format_is_valid(enum nx_flow_format);
+const char *ofputil_nx_flow_format_to_string(enum nx_flow_format);
+
+/* Work with ofp10_match. */
+void ofputil_wildcard_from_ofpfw10(uint32_t ofpfw, struct flow_wildcards *);
+void ofputil_match_from_ofp10_match(const struct ofp10_match *,
+                                    struct match *);
+void ofputil_normalize_match(struct match *);
+void ofputil_normalize_match_quiet(struct match *);
+void ofputil_match_to_ofp10_match(const struct match *, struct ofp10_match *);
+
+/* Work with ofp11_match. */
+enum ofperr ofputil_pull_ofp11_match(struct ofpbuf *, const struct tun_table *,
+                                     struct match *,
+                                     uint16_t *padded_match_len);
+enum ofperr ofputil_pull_ofp11_mask(struct ofpbuf *, struct match *,
+                                    struct mf_bitmap *bm);
+enum ofperr ofputil_match_from_ofp11_match(const struct ofp11_match *,
+                                           struct match *);
+int ofputil_put_ofp11_match(struct ofpbuf *, const struct match *,
+                            enum ofputil_protocol);
+void ofputil_match_to_ofp11_match(const struct match *, struct ofp11_match *);
+int ofputil_match_typical_len(enum ofputil_protocol);
+
+/* dl_type translation between OpenFlow and 'struct flow' format. */
+ovs_be16 ofputil_dl_type_to_openflow(ovs_be16 flow_dl_type);
+ovs_be16 ofputil_dl_type_from_openflow(ovs_be16 ofp_dl_type);
+
+/* PACKET_IN. */
+bool ofputil_packet_in_format_is_valid(enum nx_packet_in_format);
+int ofputil_packet_in_format_from_string(const char *);
+const char *ofputil_packet_in_format_to_string(enum nx_packet_in_format);
+struct ofpbuf *ofputil_make_set_packet_in_format(enum ofp_version,
+                                                 enum nx_packet_in_format);
+
+/* NXT_FLOW_MOD_TABLE_ID extension. */
+struct ofpbuf *ofputil_make_flow_mod_table_id(bool flow_mod_table_id);
+
+/* Protocol-independent flow_mod flags. */
+enum ofputil_flow_mod_flags {
+    /* Flags that are maintained with a flow as part of its state.
+     *
+     * (OFPUTIL_FF_EMERG would be here too, if OVS supported it.) */
+    OFPUTIL_FF_SEND_FLOW_REM = 1 << 0, /* All versions. */
+    OFPUTIL_FF_NO_PKT_COUNTS = 1 << 1, /* OpenFlow 1.3+. */
+    OFPUTIL_FF_NO_BYT_COUNTS = 1 << 2, /* OpenFlow 1.3+. */
+
+    /* These flags primarily affects flow_mod behavior.  They are not
+     * particularly useful as part of flow state.  We include them in flow
+     * state only because OpenFlow implies that they should be. */
+    OFPUTIL_FF_CHECK_OVERLAP = 1 << 3, /* All versions. */
+    OFPUTIL_FF_RESET_COUNTS  = 1 << 4, /* OpenFlow 1.2+. */
+
+    /* Not supported by OVS. */
+    OFPUTIL_FF_EMERG         = 1 << 5, /* OpenFlow 1.0 only. */
+
+    /* The set of flags maintained as part of a flow table entry. */
+#define OFPUTIL_FF_STATE (OFPUTIL_FF_SEND_FLOW_REM      \
+                          | OFPUTIL_FF_NO_PKT_COUNTS    \
+                          | OFPUTIL_FF_NO_BYT_COUNTS    \
+                          | OFPUTIL_FF_CHECK_OVERLAP    \
+                          | OFPUTIL_FF_RESET_COUNTS)
+
+    /* Flags that are only set by OVS for its internal use.  Cannot be set via
+     * OpenFlow. */
+    OFPUTIL_FF_HIDDEN_FIELDS = 1 << 6, /* Allow hidden match fields to be
+                                          set or modified. */
+    OFPUTIL_FF_NO_READONLY   = 1 << 7, /* Allow rules within read only tables
+                                          to be modified */
+};
+
+/* Protocol-independent flow_mod.
+ *
+ * The handling of cookies across multiple versions of OpenFlow is a bit
+ * confusing.  See the topics/design doc for the details. */
+struct ofputil_flow_mod {
+    struct ovs_list list_node; /* For queuing flow_mods. */
+
+    struct match match;
+    int priority;
+
+    /* Cookie matching.  The flow_mod affects only flows that have cookies that
+     * bitwise match 'cookie' bits in positions where 'cookie_mask has 1-bits.
+     *
+     * 'cookie_mask' should be zero for OFPFC_ADD flow_mods. */
+    ovs_be64 cookie;         /* Cookie bits to match. */
+    ovs_be64 cookie_mask;    /* 1-bit in each 'cookie' bit to match. */
+
+    /* Cookie changes.
+     *
+     * OFPFC_ADD uses 'new_cookie' as the new flow's cookie.  'new_cookie'
+     * should not be UINT64_MAX.
+     *
+     * OFPFC_MODIFY and OFPFC_MODIFY_STRICT have two cases:
+     *
+     *   - If one or more matching flows exist and 'modify_cookie' is true,
+     *     then the flow_mod changes the existing flows' cookies to
+     *     'new_cookie'.  'new_cookie' should not be UINT64_MAX.
+     *
+     *   - If no matching flow exists, 'new_cookie' is not UINT64_MAX, and
+     *     'cookie_mask' is 0, then the flow_mod adds a new flow with
+     *     'new_cookie' as its cookie.
+     */
+    ovs_be64 new_cookie;     /* New cookie to install or UINT64_MAX. */
+    bool modify_cookie;      /* Set cookie of existing flow to 'new_cookie'? */
+
+    uint8_t table_id;
+    uint16_t command;
+    uint16_t idle_timeout;
+    uint16_t hard_timeout;
+    uint32_t buffer_id;
+    ofp_port_t out_port;
+    uint32_t out_group;
+    enum ofputil_flow_mod_flags flags;
+    uint16_t importance;     /* Eviction precedence. */
+    struct ofpact *ofpacts;  /* Series of "struct ofpact"s. */
+    size_t ofpacts_len;      /* Length of ofpacts, in bytes. */
+};
+
+enum ofperr ofputil_decode_flow_mod(struct ofputil_flow_mod *,
+                                    const struct ofp_header *,
+                                    enum ofputil_protocol,
+                                    const struct tun_table *,
+                                    const struct vl_mff_map *,
+                                    struct ofpbuf *ofpacts,
+                                    ofp_port_t max_port,
+                                    uint8_t max_table);
+struct ofpbuf *ofputil_encode_flow_mod(const struct ofputil_flow_mod *,
+                                       enum ofputil_protocol);
+
+/* Flow stats or aggregate stats request, independent of protocol. */
+struct ofputil_flow_stats_request {
+    bool aggregate;             /* Aggregate results? */
+    struct match match;
+    ovs_be64 cookie;
+    ovs_be64 cookie_mask;
+    ofp_port_t out_port;
+    uint32_t out_group;
+    uint8_t table_id;
+};
+
+enum ofperr ofputil_decode_flow_stats_request(
+    struct ofputil_flow_stats_request *, const struct ofp_header *,
+    const struct tun_table *);
+struct ofpbuf *ofputil_encode_flow_stats_request(
+    const struct ofputil_flow_stats_request *, enum ofputil_protocol);
+
+/* Flow stats reply, independent of protocol. */
+struct ofputil_flow_stats {
+    struct match match;
+    ovs_be64 cookie;
+    uint8_t table_id;
+    uint16_t priority;
+    uint16_t idle_timeout;
+    uint16_t hard_timeout;
+    uint32_t duration_sec;
+    uint32_t duration_nsec;
+    int idle_age;               /* Seconds since last packet, -1 if unknown. */
+    int hard_age;               /* Seconds since last change, -1 if unknown. */
+    uint64_t packet_count;      /* Packet count, UINT64_MAX if unknown. */
+    uint64_t byte_count;        /* Byte count, UINT64_MAX if unknown. */
+    const struct ofpact *ofpacts;
+    size_t ofpacts_len;
+    enum ofputil_flow_mod_flags flags;
+    uint16_t importance;        /* Eviction precedence. */
+};
+
+int ofputil_decode_flow_stats_reply(struct ofputil_flow_stats *,
+                                    struct ofpbuf *msg,
+                                    bool flow_age_extension,
+                                    struct ofpbuf *ofpacts);
+void ofputil_append_flow_stats_reply(const struct ofputil_flow_stats *,
+                                     struct ovs_list *replies,
+                                     const struct tun_table *);
+
+/* Aggregate stats reply, independent of protocol. */
+struct ofputil_aggregate_stats {
+    uint64_t packet_count;      /* Packet count, UINT64_MAX if unknown. */
+    uint64_t byte_count;        /* Byte count, UINT64_MAX if unknown. */
+    uint32_t flow_count;
+};
+
+struct ofpbuf *ofputil_encode_aggregate_stats_reply(
+    const struct ofputil_aggregate_stats *stats,
+    const struct ofp_header *request);
+enum ofperr ofputil_decode_aggregate_stats_reply(
+    struct ofputil_aggregate_stats *,
+    const struct ofp_header *reply);
+
+/* Flow removed message, independent of protocol. */
+struct ofputil_flow_removed {
+    struct match match;
+    ovs_be64 cookie;
+    uint16_t priority;
+    uint8_t reason;             /* One of OFPRR_*. */
+    uint8_t table_id;           /* 255 if message didn't include table ID. */
+    uint32_t duration_sec;
+    uint32_t duration_nsec;
+    uint16_t idle_timeout;
+    uint16_t hard_timeout;
+    uint64_t packet_count;      /* Packet count, UINT64_MAX if unknown. */
+    uint64_t byte_count;        /* Byte count, UINT64_MAX if unknown. */
+};
+
+enum ofperr ofputil_decode_flow_removed(struct ofputil_flow_removed *,
+                                        const struct ofp_header *);
+struct ofpbuf *ofputil_encode_flow_removed(const struct ofputil_flow_removed *,
+                                           enum ofputil_protocol);
+
+/* Abstract packet-in message.
+ *
+ * This omits the 'total_len' and 'buffer_id' fields, which we handle
+ * differently for encoding and decoding.*/
+struct ofputil_packet_in {
+    /* Packet data and metadata.
+     *
+     * On encoding, the full packet should be supplied, but depending on its
+     * other parameters ofputil_encode_packet_in() might send only the first
+     * part of the packet.
+     *
+     * On decoding, the 'len' bytes in 'packet' might only be the first part of
+     * the original packet.  ofputil_decode_packet_in() reports the full
+     * original length of the packet using its 'total_len' output parameter. */
+    void *packet;               /* The packet. */
+    size_t packet_len;          /* Length of 'packet' in bytes. */
+
+    /* Input port and other metadata for packet. */
+    struct match flow_metadata;
+
+    /* Reason that the packet-in is being sent. */
+    enum ofp_packet_in_reason reason;    /* One of OFPR_*. */
+
+    /* Information about the OpenFlow flow that triggered the packet-in.
+     *
+     * A packet-in triggered by a flow table miss has no associated flow.  In
+     * that case, 'cookie' is UINT64_MAX. */
+    uint8_t table_id;                    /* OpenFlow table ID. */
+    ovs_be64 cookie;                     /* Flow's cookie. */
+
+    /* Arbitrary user-provided data. */
+    uint8_t *userdata;
+    size_t userdata_len;
+};
+
+void ofputil_packet_in_destroy(struct ofputil_packet_in *);
+
+enum ofperr ofputil_decode_packet_in(const struct ofp_header *, bool loose,
+                                     const struct tun_table *,
+                                     struct ofputil_packet_in *,
+                                     size_t *total_len, uint32_t *buffer_id,
+                                     struct ofpbuf *continuation);
+
+struct ofpbuf *ofputil_encode_resume(const struct ofputil_packet_in *pin,
+                                     const struct ofpbuf *continuation,
+                                     enum ofputil_protocol);
+
+enum { OFPUTIL_PACKET_IN_REASON_BUFSIZE = INT_STRLEN(int) + 1 };
+const char *ofputil_packet_in_reason_to_string(enum ofp_packet_in_reason,
+                                               char *reasonbuf,
+                                               size_t bufsize);
+bool ofputil_packet_in_reason_from_string(const char *,
+                                          enum ofp_packet_in_reason *);
+
+/* A packet-in message, including continuation data.  The format of
+ * continuation data is subject to change and thus it is supposed to be opaque
+ * to any process other than ovs-vswitchd.  Therefore, only ovs-vswitchd should
+ * use ofputil_packet_in_private and the functions that operate on it. */
+struct ofputil_packet_in_private {
+    struct ofputil_packet_in public;
+
+    /* NXCPT_BRIDGE. */
+    struct uuid bridge;
+
+    /* NXCPT_STACK. */
+    uint8_t *stack;
+    size_t stack_size;
+
+    /* NXCPT_MIRRORS. */
+    uint32_t mirrors;
+
+    /* NXCPT_CONNTRACKED. */
+    bool conntracked;
+
+    /* NXCPT_ACTIONS. */
+    struct ofpact *actions;
+    size_t actions_len;
+
+    /* NXCPT_ACTION_SET. */
+    struct ofpact *action_set;
+    size_t action_set_len;
+};
+
+struct ofpbuf *ofputil_encode_packet_in_private(
+    const struct ofputil_packet_in_private *,
+    enum ofputil_protocol protocol,
+    enum nx_packet_in_format);
+
+enum ofperr ofputil_decode_packet_in_private(
+    const struct ofp_header *, bool loose,
+    const struct tun_table *,
+    struct ofputil_packet_in_private *,
+    size_t *total_len, uint32_t *buffer_id);
+
+void ofputil_packet_in_private_destroy(struct ofputil_packet_in_private *);
+
+/* Abstract packet-out message.
+ *
+ * ofputil_decode_packet_out() will ensure that 'in_port' is a physical port
+ * (OFPP_MAX or less) or one of OFPP_LOCAL, OFPP_NONE, or OFPP_CONTROLLER. */
+struct ofputil_packet_out {
+    const void *packet;         /* Packet data, if buffer_id == UINT32_MAX. */
+    size_t packet_len;          /* Length of packet data in bytes. */
+    uint32_t buffer_id;         /* Buffer id or UINT32_MAX if no buffer. */
+    ofp_port_t in_port;         /* Packet's input port. */
+    struct ofpact *ofpacts;     /* Actions. */
+    size_t ofpacts_len;         /* Size of ofpacts in bytes. */
+};
+
+enum ofperr ofputil_decode_packet_out(struct ofputil_packet_out *,
+                                      const struct ofp_header *,
+                                      struct ofpbuf *ofpacts);
+struct ofpbuf *ofputil_encode_packet_out(const struct ofputil_packet_out *,
+                                         enum ofputil_protocol protocol);
+
+enum ofputil_frag_handling {
+    OFPUTIL_FRAG_NORMAL = OFPC_FRAG_NORMAL,    /* No special handling. */
+    OFPUTIL_FRAG_DROP = OFPC_FRAG_DROP,        /* Drop fragments. */
+    OFPUTIL_FRAG_REASM = OFPC_FRAG_REASM,      /* Reassemble (if supported). */
+    OFPUTIL_FRAG_NX_MATCH = OFPC_FRAG_NX_MATCH /* Match on frag bits. */
+};
+
+const char *ofputil_frag_handling_to_string(enum ofputil_frag_handling);
+bool ofputil_frag_handling_from_string(const char *,
+                                       enum ofputil_frag_handling *);
+
+/* Abstract struct ofp_switch_config. */
+struct ofputil_switch_config {
+    /* Fragment handling. */
+    enum ofputil_frag_handling frag;
+
+    /* 0: Do not send packet to controller when decrementing invalid IP TTL.
+     * 1: Do send packet to controller when decrementing invalid IP TTL.
+     * -1: Unspecified (only OpenFlow 1.1 and 1.2 support this setting. */
+    int invalid_ttl_to_controller;
+
+    /* Maximum bytes of packet to send to controller on miss. */
+    uint16_t miss_send_len;
+};
+
+void ofputil_decode_get_config_reply(const struct ofp_header *,
+                                     struct ofputil_switch_config *);
+struct ofpbuf *ofputil_encode_get_config_reply(
+    const struct ofp_header *request, const struct ofputil_switch_config *);
+
+enum ofperr ofputil_decode_set_config(const struct ofp_header *,
+                                      struct ofputil_switch_config *);
+struct ofpbuf *ofputil_encode_set_config(
+    const struct ofputil_switch_config *, enum ofp_version);
+
+enum ofputil_port_config {
+    /* OpenFlow 1.0 and 1.1 share these values for these port config bits. */
+    OFPUTIL_PC_PORT_DOWN    = 1 << 0, /* Port is administratively down. */
+    OFPUTIL_PC_NO_RECV      = 1 << 2, /* Drop all packets received by port. */
+    OFPUTIL_PC_NO_FWD       = 1 << 5, /* Drop packets forwarded to port. */
+    OFPUTIL_PC_NO_PACKET_IN = 1 << 6, /* No send packet-in msgs for port. */
+    /* OpenFlow 1.0 only. */
+    OFPUTIL_PC_NO_STP       = 1 << 1, /* No 802.1D spanning tree for port. */
+    OFPUTIL_PC_NO_RECV_STP  = 1 << 3, /* Drop received 802.1D STP packets. */
+    OFPUTIL_PC_NO_FLOOD     = 1 << 4, /* Do not include port when flooding. */
+    /* There are no OpenFlow 1.1-only bits. */
+};
+
+enum ofputil_port_state {
+    /* OpenFlow 1.0 and 1.1 share this values for these port state bits. */
+    OFPUTIL_PS_LINK_DOWN   = 1 << 0, /* No physical link present. */
+    /* OpenFlow 1.1 only. */
+    OFPUTIL_PS_BLOCKED     = 1 << 1, /* Port is blocked */
+    OFPUTIL_PS_LIVE        = 1 << 2, /* Live for Fast Failover Group. */
+    /* OpenFlow 1.0 only. */
+    OFPUTIL_PS_STP_LISTEN  = 0 << 8, /* Not learning or relaying frames. */
+    OFPUTIL_PS_STP_LEARN   = 1 << 8, /* Learning but not relaying frames. */
+    OFPUTIL_PS_STP_FORWARD = 2 << 8, /* Learning and relaying frames. */
+    OFPUTIL_PS_STP_BLOCK   = 3 << 8, /* Not part of spanning tree. */
+    OFPUTIL_PS_STP_MASK    = 3 << 8  /* Bit mask for OFPPS10_STP_* values. */
+};
+
+/* Abstract ofp10_phy_port or ofp11_port. */
+struct ofputil_phy_port {
+    ofp_port_t port_no;
+    struct eth_addr hw_addr;
+    char name[OFP_MAX_PORT_NAME_LEN];
+    enum ofputil_port_config config;
+    enum ofputil_port_state state;
+
+    /* NETDEV_F_* feature bitmasks. */
+    enum netdev_features curr;       /* Current features. */
+    enum netdev_features advertised; /* Features advertised by the port. */
+    enum netdev_features supported;  /* Features supported by the port. */
+    enum netdev_features peer;       /* Features advertised by peer. */
+
+    /* Speed. */
+    uint32_t curr_speed;        /* Current speed, in kbps. */
+    uint32_t max_speed;         /* Maximum supported speed, in kbps. */
+};
+
+enum ofputil_capabilities {
+    /* All OpenFlow versions share these capability values. */
+    OFPUTIL_C_FLOW_STATS     = 1 << 0,  /* Flow statistics. */
+    OFPUTIL_C_TABLE_STATS    = 1 << 1,  /* Table statistics. */
+    OFPUTIL_C_PORT_STATS     = 1 << 2,  /* Port statistics. */
+    OFPUTIL_C_IP_REASM       = 1 << 5,  /* Can reassemble IP fragments. */
+    OFPUTIL_C_QUEUE_STATS    = 1 << 6,  /* Queue statistics. */
+
+    /* OpenFlow 1.0 and 1.1 share this capability. */
+    OFPUTIL_C_ARP_MATCH_IP   = 1 << 7,  /* Match IP addresses in ARP pkts. */
+
+    /* OpenFlow 1.0 only. */
+    OFPUTIL_C_STP            = 1 << 3,  /* 802.1d spanning tree. */
+
+    /* OpenFlow 1.1+ only.  Note that this bit value does not match the one
+     * in the OpenFlow message. */
+    OFPUTIL_C_GROUP_STATS    = 1 << 4,  /* Group statistics. */
+
+    /* OpenFlow 1.2+ only. */
+    OFPUTIL_C_PORT_BLOCKED   = 1 << 8,  /* Switch will block looping ports */
+
+    /* OpenFlow 1.4+ only. */
+    OFPUTIL_C_BUNDLES         = 1 << 9,  /* Switch supports bundles. */
+    OFPUTIL_C_FLOW_MONITORING = 1 << 10, /* Switch supports flow monitoring. */
+};
+
+/* Abstract ofp_switch_features. */
+struct ofputil_switch_features {
+    uint64_t datapath_id;       /* Datapath unique ID. */
+    uint32_t n_buffers;         /* Max packets buffered at once. */
+    uint8_t n_tables;           /* Number of tables supported by datapath. */
+    uint8_t auxiliary_id;       /* Identify auxiliary connections */
+    enum ofputil_capabilities capabilities;
+    uint64_t ofpacts;           /* Bitmap of OFPACT_* bits. */
+};
+
+enum ofperr ofputil_pull_switch_features(struct ofpbuf *,
+                                         struct ofputil_switch_features *);
+
+struct ofpbuf *ofputil_encode_switch_features(
+    const struct ofputil_switch_features *, enum ofputil_protocol,
+    ovs_be32 xid);
+void ofputil_put_switch_features_port(const struct ofputil_phy_port *,
+                                      struct ofpbuf *);
+bool ofputil_switch_features_has_ports(struct ofpbuf *b);
+
+/* phy_port helper functions. */
+int ofputil_pull_phy_port(enum ofp_version ofp_version, struct ofpbuf *,
+                          struct ofputil_phy_port *);
+
+/* Abstract ofp_port_status. */
+struct ofputil_port_status {
+    enum ofp_port_reason reason;
+    struct ofputil_phy_port desc;
+};
+
+enum ofperr ofputil_decode_port_status(const struct ofp_header *,
+                                       struct ofputil_port_status *);
+struct ofpbuf *ofputil_encode_port_status(const struct ofputil_port_status *,
+                                          enum ofputil_protocol);
+
+/* Abstract ofp_port_mod. */
+struct ofputil_port_mod {
+    ofp_port_t port_no;
+    struct eth_addr hw_addr;
+    enum ofputil_port_config config;
+    enum ofputil_port_config mask;
+    enum netdev_features advertise;
+};
+
+enum ofperr ofputil_decode_port_mod(const struct ofp_header *,
+                                    struct ofputil_port_mod *, bool loose);
+struct ofpbuf *ofputil_encode_port_mod(const struct ofputil_port_mod *,
+                                       enum ofputil_protocol);
+
+/* Abstract version of OFPTC11_TABLE_MISS_*.
+ *
+ * OpenFlow 1.0 always sends packets that miss to the next flow table, or to
+ * the controller if they miss in the last flow table.
+ *
+ * OpenFlow 1.1 and 1.2 can configure table miss behavior via a "table-mod"
+ * that specifies "send to controller", "miss", or "drop".
+ *
+ * OpenFlow 1.3 and later never sends packets that miss to the controller.
+ */
+enum ofputil_table_miss {
+    /* Protocol-specific default behavior.  On OpenFlow 1.0 through 1.2
+     * connections, the packet is sent to the controller, and on OpenFlow 1.3
+     * and later connections, the packet is dropped.
+     *
+     * This is also used as a result of decoding OpenFlow 1.3+ "config" values
+     * in table-mods, to indicate that no table-miss was specified. */
+    OFPUTIL_TABLE_MISS_DEFAULT,    /* Protocol default behavior. */
+
+    /* These constants have the same meanings as those in OpenFlow with the
+     * same names. */
+    OFPUTIL_TABLE_MISS_CONTROLLER, /* Send to controller. */
+    OFPUTIL_TABLE_MISS_CONTINUE,   /* Go to next table. */
+    OFPUTIL_TABLE_MISS_DROP,       /* Drop the packet. */
+};
+
+/* Abstract version of OFPTC14_EVICTION.
+ *
+ * OpenFlow 1.0 through 1.3 don't know anything about eviction, so decoding a
+ * message for one of these protocols always yields
+ * OFPUTIL_TABLE_EVICTION_DEFAULT. */
+enum ofputil_table_eviction {
+    OFPUTIL_TABLE_EVICTION_DEFAULT, /* No value. */
+    OFPUTIL_TABLE_EVICTION_ON,      /* Enable eviction. */
+    OFPUTIL_TABLE_EVICTION_OFF      /* Disable eviction. */
+};
+
+/* Abstract version of OFPTC14_VACANCY_EVENTS.
+ *
+ * OpenFlow 1.0 through 1.3 don't know anything about vacancy events, so
+ * decoding a message for one of these protocols always yields
+ * OFPUTIL_TABLE_VACANCY_DEFAULT. */
+enum ofputil_table_vacancy {
+    OFPUTIL_TABLE_VACANCY_DEFAULT, /* No value. */
+    OFPUTIL_TABLE_VACANCY_ON,      /* Enable vacancy events. */
+    OFPUTIL_TABLE_VACANCY_OFF      /* Disable vacancy events. */
+};
+
+/* Abstract version of OFPTMPT_VACANCY.
+ *
+ * Openflow 1.4+ defines vacancy events.
+ * The fields vacancy_down and vacancy_up are the threshold for generating
+ * vacancy events that should be configured on the flow table, expressed as
+ * a percent.
+ * The vacancy field is only used when this property in included in a
+ * OFPMP_TABLE_DESC multipart reply or a OFPT_TABLE_STATUS message and
+ * represent the current vacancy of the table, expressed as a percent. In
+ * OFP_TABLE_MOD requests, this field must be set to 0 */
+struct ofputil_table_mod_prop_vacancy {
+    uint8_t vacancy_down;    /* Vacancy threshold when space decreases (%). */
+    uint8_t vacancy_up;      /* Vacancy threshold when space increases (%). */
+    uint8_t vacancy;         /* Current vacancy (%). */
+};
+
+/* Abstract ofp_table_mod. */
+struct ofputil_table_mod {
+    uint8_t table_id;         /* ID of the table, 0xff indicates all tables. */
+
+    /* OpenFlow 1.1 and 1.2 only.  For other versions, ignored on encoding,
+     * decoded to OFPUTIL_TABLE_MISS_DEFAULT. */
+    enum ofputil_table_miss miss;
+
+    /* OpenFlow 1.4+ only.  For other versions, ignored on encoding, decoded to
+     * OFPUTIL_TABLE_EVICTION_DEFAULT. */
+    enum ofputil_table_eviction eviction;
+
+    /* OpenFlow 1.4+ only and optional even there; UINT32_MAX indicates
+     * absence.  For other versions, ignored on encoding, decoded to
+     * UINT32_MAX.*/
+    uint32_t eviction_flags;    /* OFPTMPEF14_*. */
+
+    /* OpenFlow 1.4+ only. For other versions, ignored on encoding, decoded to
+     * OFPUTIL_TABLE_VACANCY_DEFAULT. */
+    enum ofputil_table_vacancy vacancy;
+
+    /* Openflow 1.4+ only. Defines threshold values of vacancy expressed as
+     * percent, value of current vacancy is set to zero for table-mod.
+     * For other versions, ignored on encoding, all values decoded to
+     * zero. */
+    struct ofputil_table_mod_prop_vacancy table_vacancy;
+};
+
+/* Abstract ofp14_table_desc. */
+struct ofputil_table_desc {
+    uint8_t table_id;         /* ID of the table. */
+    enum ofputil_table_eviction eviction;
+    uint32_t eviction_flags;    /* UINT32_MAX if not present. */
+    enum ofputil_table_vacancy vacancy;
+    struct ofputil_table_mod_prop_vacancy table_vacancy;
+};
+
+enum ofperr ofputil_decode_table_mod(const struct ofp_header *,
+                                    struct ofputil_table_mod *);
+struct ofpbuf *ofputil_encode_table_mod(const struct ofputil_table_mod *,
+                                       enum ofputil_protocol);
+
+/* Abstract ofp_table_features.
+ *
+ * This is used for all versions of OpenFlow, even though ofp_table_features
+ * was only introduced in OpenFlow 1.3, because earlier versions of OpenFlow
+ * include support for a subset of ofp_table_features through OFPST_TABLE (aka
+ * OFPMP_TABLE). */
+struct ofputil_table_features {
+    uint8_t table_id;         /* Identifier of table. Lower numbered tables
+                                 are consulted first. */
+    char name[OFP_MAX_TABLE_NAME_LEN];
+    ovs_be64 metadata_match;  /* Bits of metadata table can match. */
+    ovs_be64 metadata_write;  /* Bits of metadata table can write. */
+    uint32_t max_entries;     /* Max number of entries supported. */
+
+    /* Flags.
+     *
+     * 'miss_config' is relevant for OpenFlow 1.1 and 1.2 only, because those
+     * versions include OFPTC_MISS_* flags in OFPST_TABLE.  For other versions,
+     * it is decoded to OFPUTIL_TABLE_MISS_DEFAULT and ignored for encoding.
+     *
+     * 'supports_eviction' and 'supports_vacancy_events' are relevant only for
+     * OpenFlow 1.4 and later only.  For OF1.4, they are boolean: 1 if
+     * supported, otherwise 0.  For other versions, they are decoded as -1 and
+     * ignored for encoding.
+     *
+     * Search for "OFPTC_* Table Configuration" in the documentation for more
+     * details of how OpenFlow has changed in this area.
+     */
+    enum ofputil_table_miss miss_config; /* OF1.1 and 1.2 only. */
+    int supports_eviction;               /* OF1.4+ only. */
+    int supports_vacancy_events;         /* OF1.4+ only. */
+
+    /* Table features related to instructions.  There are two instances:
+     *
+     *   - 'miss' reports features available in the table miss flow.
+     *
+     *   - 'nonmiss' reports features available in other flows. */
+    struct ofputil_table_instruction_features {
+        /* Tables that "goto-table" may jump to. */
+        unsigned long int next[BITMAP_N_LONGS(255)];
+
+        /* Bitmap of OVSINST_* for supported instructions. */
+        uint32_t instructions;
+
+        /* Table features related to actions.  There are two instances:
+         *
+         *    - 'write' reports features available in a "write_actions"
+         *      instruction.
+         *
+         *    - 'apply' reports features available in an "apply_actions"
+         *      instruction. */
+        struct ofputil_table_action_features {
+            uint64_t ofpacts;     /* Bitmap of supported OFPACT_*. */
+            struct mf_bitmap set_fields; /* Fields for "set-field". */
+        } write, apply;
+    } nonmiss, miss;
+
+    /* MFF_* bitmaps.
+     *
+     * For any given field the following combinations are valid:
+     *
+     *    - match=0, wildcard=0, mask=0: Flows in this table cannot match on
+     *      this field.
+     *
+     *    - match=1, wildcard=0, mask=0: Flows in this table must match on all
+     *      the bits in this field.
+     *
+     *    - match=1, wildcard=1, mask=0: Flows in this table must either match
+     *      on all the bits in the field or wildcard the field entirely.
+     *
+     *    - match=1, wildcard=1, mask=1: Flows in this table may arbitrarily
+     *      mask this field (as special cases, they may match on all the bits
+     *      or wildcard it entirely).
+     *
+     * Other combinations do not make sense.
+     */
+    struct mf_bitmap match;     /* Fields that may be matched. */
+    struct mf_bitmap mask;      /* Subset of 'match' that may have masks. */
+    struct mf_bitmap wildcard;  /* Subset of 'match' that may be wildcarded. */
+};
+
+int ofputil_decode_table_features(struct ofpbuf *,
+                                  struct ofputil_table_features *, bool loose);
+
+int ofputil_decode_table_desc(struct ofpbuf *,
+                              struct ofputil_table_desc *,
+                              enum ofp_version);
+
+struct ofpbuf *ofputil_encode_table_features_request(enum ofp_version);
+
+struct ofpbuf *ofputil_encode_table_desc_request(enum ofp_version);
+
+void ofputil_append_table_features_reply(
+    const struct ofputil_table_features *tf, struct ovs_list *replies);
+
+void ofputil_append_table_desc_reply(const struct ofputil_table_desc *td,
+                                     struct ovs_list *replies,
+                                     enum ofp_version);
+
+/* Meter band configuration for all supported band types. */
+struct ofputil_meter_band {
+    uint16_t type;
+    uint8_t prec_level;         /* Non-zero if type == OFPMBT_DSCP_REMARK. */
+    uint32_t rate;
+    uint32_t burst_size;
+};
+
+struct ofputil_meter_band_stats {
+    uint64_t packet_count;
+    uint64_t byte_count;
+};
+
+struct ofputil_meter_config {
+    uint32_t meter_id;
+    uint16_t flags;
+    uint16_t n_bands;
+    struct ofputil_meter_band *bands;
+};
+
+/* Abstract ofp_meter_mod. */
+struct ofputil_meter_mod {
+    uint16_t command;
+    struct ofputil_meter_config meter;
+};
+
+struct ofputil_meter_stats {
+    uint32_t meter_id;
+    uint32_t flow_count;
+    uint64_t packet_in_count;
+    uint64_t byte_in_count;
+    uint32_t duration_sec;
+    uint32_t duration_nsec;
+    uint16_t n_bands;
+    struct ofputil_meter_band_stats *bands;
+};
+
+struct ofputil_meter_features {
+    uint32_t max_meters;        /* Maximum number of meters. */
+    uint32_t band_types;        /* Can support max 32 band types. */
+    uint32_t capabilities;      /* Supported flags. */
+    uint8_t  max_bands;
+    uint8_t  max_color;
+};
+
+enum ofperr ofputil_decode_meter_mod(const struct ofp_header *,
+                                     struct ofputil_meter_mod *,
+                                     struct ofpbuf *bands);
+struct ofpbuf *ofputil_encode_meter_mod(enum ofp_version,
+                                        const struct ofputil_meter_mod *);
+
+void ofputil_decode_meter_features(const struct ofp_header *,
+                                   struct ofputil_meter_features *);
+struct ofpbuf *ofputil_encode_meter_features_reply(const struct
+                                                   ofputil_meter_features *,
+                                                   const struct ofp_header *
+                                                   request);
+void ofputil_decode_meter_request(const struct ofp_header *,
+                                  uint32_t *meter_id);
+
+void ofputil_append_meter_config(struct ovs_list *replies,
+                                 const struct ofputil_meter_config *);
+
+void ofputil_append_meter_stats(struct ovs_list *replies,
+                                const struct ofputil_meter_stats *);
+
+enum ofputil_meter_request_type {
+    OFPUTIL_METER_FEATURES,
+    OFPUTIL_METER_CONFIG,
+    OFPUTIL_METER_STATS
+};
+
+struct ofpbuf *ofputil_encode_meter_request(enum ofp_version,
+                                            enum ofputil_meter_request_type,
+                                            uint32_t meter_id);
+
+int ofputil_decode_meter_stats(struct ofpbuf *,
+                               struct ofputil_meter_stats *,
+                               struct ofpbuf *bands);
+
+int ofputil_decode_meter_config(struct ofpbuf *,
+                                struct ofputil_meter_config *,
+                                struct ofpbuf *bands);
+
+/* Type for meter_id in ofproto provider interface, UINT32_MAX if invalid. */
+typedef struct { uint32_t uint32; } ofproto_meter_id;
+
+/* Abstract ofp_role_request and reply. */
+struct ofputil_role_request {
+    enum ofp12_controller_role role;
+    bool have_generation_id;
+    uint64_t generation_id;
+};
+
+struct ofputil_role_status {
+    enum ofp12_controller_role role;
+    enum ofp14_controller_role_reason reason;
+    uint64_t generation_id;
+};
+
+enum ofperr ofputil_decode_role_message(const struct ofp_header *,
+                                        struct ofputil_role_request *);
+struct ofpbuf *ofputil_encode_role_reply(const struct ofp_header *,
+                                         const struct ofputil_role_request *);
+
+struct ofpbuf *ofputil_encode_role_status(
+                                const struct ofputil_role_status *status,
+                                enum ofputil_protocol protocol);
+
+enum ofperr ofputil_decode_role_status(const struct ofp_header *oh,
+                                       struct ofputil_role_status *rs);
+
+/* Abstract table stats.
+ *
+ * This corresponds to the OpenFlow 1.3 table statistics structure, which only
+ * includes actual statistics.  In earlier versions of OpenFlow, several
+ * members describe table features, so this structure has to be paired with
+ * struct ofputil_table_features to get all information. */
+struct ofputil_table_stats {
+    uint8_t table_id;           /* Identifier of table. */
+    uint32_t active_count;      /* Number of active entries. */
+    uint64_t lookup_count;      /* Number of packets looked up in table. */
+    uint64_t matched_count;     /* Number of packets that hit table. */
+};
+
+struct ofpbuf *ofputil_encode_table_stats_reply(const struct ofp_header *rq);
+
+struct ofpbuf *ofputil_encode_table_desc_reply(const struct ofp_header *rq);
+
+void ofputil_append_table_stats_reply(struct ofpbuf *reply,
+                                      const struct ofputil_table_stats *,
+                                      const struct ofputil_table_features *);
+
+int ofputil_decode_table_stats_reply(struct ofpbuf *reply,
+                                     struct ofputil_table_stats *,
+                                     struct ofputil_table_features *);
+
+/* Queue configuration request. */
+struct ofpbuf *ofputil_encode_queue_get_config_request(enum ofp_version,
+                                                       ofp_port_t port,
+                                                       uint32_t queue);
+enum ofperr ofputil_decode_queue_get_config_request(const struct ofp_header *,
+                                                    ofp_port_t *port,
+                                                    uint32_t *queue);
+
+/* Queue configuration reply. */
+struct ofputil_queue_config {
+    ofp_port_t port;
+    uint32_t queue;
+
+    /* Each of these optional values is expressed in tenths of a percent.
+     * Values greater than 1000 indicate that the feature is disabled.
+     * UINT16_MAX indicates that the value is omitted. */
+    uint16_t min_rate;
+    uint16_t max_rate;
+};
+
+void ofputil_start_queue_get_config_reply(const struct ofp_header *request,
+                                          struct ovs_list *replies);
+void ofputil_append_queue_get_config_reply(
+    const struct ofputil_queue_config *, struct ovs_list *replies);
+
+int ofputil_pull_queue_get_config_reply(struct ofpbuf *reply,
+                                        struct ofputil_queue_config *);
+
+
+/* Abstract nx_flow_monitor_request. */
+struct ofputil_flow_monitor_request {
+    uint32_t id;
+    enum nx_flow_monitor_flags flags;
+    ofp_port_t out_port;
+    uint8_t table_id;
+    struct match match;
+};
+
+int ofputil_decode_flow_monitor_request(struct ofputil_flow_monitor_request *,
+                                        struct ofpbuf *msg);
+void ofputil_append_flow_monitor_request(
+    const struct ofputil_flow_monitor_request *, struct ofpbuf *msg);
+
+/* Abstract nx_flow_update. */
+struct ofputil_flow_update {
+    enum nx_flow_update_event event;
+
+    /* Used only for NXFME_ADDED, NXFME_DELETED, NXFME_MODIFIED. */
+    enum ofp_flow_removed_reason reason;
+    uint16_t idle_timeout;
+    uint16_t hard_timeout;
+    uint8_t table_id;
+    uint16_t priority;
+    ovs_be64 cookie;
+    struct match match;
+    const struct ofpact *ofpacts;
+    size_t ofpacts_len;
+
+    /* Used only for NXFME_ABBREV. */
+    ovs_be32 xid;
+};
+
+int ofputil_decode_flow_update(struct ofputil_flow_update *,
+                               struct ofpbuf *msg, struct ofpbuf *ofpacts);
+void ofputil_start_flow_update(struct ovs_list *replies);
+void ofputil_append_flow_update(const struct ofputil_flow_update *,
+                                struct ovs_list *replies,
+                                const struct tun_table *);
+
+/* Abstract nx_flow_monitor_cancel. */
+uint32_t ofputil_decode_flow_monitor_cancel(const struct ofp_header *);
+struct ofpbuf *ofputil_encode_flow_monitor_cancel(uint32_t id);
+
+/* Port desc stats requests and replies. */
+enum ofperr ofputil_decode_port_desc_stats_request(const struct ofp_header *,
+                                                   ofp_port_t *portp);
+struct ofpbuf *ofputil_encode_port_desc_stats_request(
+    enum ofp_version ofp_version, ofp_port_t);
+
+void ofputil_append_port_desc_stats_reply(const struct ofputil_phy_port *pp,
+                                          struct ovs_list *replies);
+
+/* Encoding simple OpenFlow messages. */
+struct ofpbuf *make_echo_request(enum ofp_version);
+struct ofpbuf *make_echo_reply(const struct ofp_header *rq);
+
+struct ofpbuf *ofputil_encode_barrier_request(enum ofp_version);
+
+/* Actions. */
+
+bool action_outputs_to_port(const union ofp_action *, ovs_be16 port);
+
+enum ofperr ofputil_pull_actions(struct ofpbuf *, unsigned int actions_len,
+                                 union ofp_action **, size_t *);
+
+bool ofputil_actions_equal(const union ofp_action *a, size_t n_a,
+                           const union ofp_action *b, size_t n_b);
+union ofp_action *ofputil_actions_clone(const union ofp_action *, size_t n);
+
+/* Handy utility for parsing flows and actions. */
+bool ofputil_parse_key_value(char **stringp, char **keyp, char **valuep);
+
+struct ofputil_port_stats {
+    ofp_port_t port_no;
+    struct netdev_stats stats;
+    uint32_t duration_sec;      /* UINT32_MAX if unknown. */
+    uint32_t duration_nsec;
+};
+
+struct ofpbuf *ofputil_encode_dump_ports_request(enum ofp_version ofp_version,
+                                                 ofp_port_t port);
+void ofputil_append_port_stat(struct ovs_list *replies,
+                              const struct ofputil_port_stats *ops);
+size_t ofputil_count_port_stats(const struct ofp_header *);
+int ofputil_decode_port_stats(struct ofputil_port_stats *, struct ofpbuf *msg);
+enum ofperr ofputil_decode_port_stats_request(const struct ofp_header *request,
+                                              ofp_port_t *ofp10_port);
+
+struct ofputil_ipfix_stats {
+    uint32_t collector_set_id;  /* Used only for flow-based IPFIX statistics. */
+    uint64_t total_flows;  /* Totabl flows of this IPFIX exporter. */
+    uint64_t current_flows;  /* Current flows of this IPFIX exporter. */
+    uint64_t pkts;  /* Successfully sampled packets. */
+    uint64_t ipv4_pkts;  /* Successfully sampled IPV4 packets. */
+    uint64_t ipv6_pkts;  /* Successfully sampled IPV6 packets. */
+    uint64_t error_pkts;  /* Error packets when sampling. */
+    uint64_t ipv4_error_pkts;  /* Error IPV4 packets when sampling. */
+    uint64_t ipv6_error_pkts;  /* Error IPV6 packets when sampling. */
+    uint64_t tx_pkts;  /* TX IPFIX packets. */
+    uint64_t tx_errors;  /* IPFIX packets TX errors. */
+};
+
+void ofputil_append_ipfix_stat(struct ovs_list *replies,
+                              const struct ofputil_ipfix_stats *ois);
+size_t ofputil_count_ipfix_stats(const struct ofp_header *);
+int ofputil_pull_ipfix_stats(struct ofputil_ipfix_stats *, struct ofpbuf *msg);
+
+struct ofputil_queue_stats_request {
+    ofp_port_t port_no;           /* OFPP_ANY means "all ports". */
+    uint32_t queue_id;
+};
+
+enum ofperr
+ofputil_decode_queue_stats_request(const struct ofp_header *request,
+                                   struct ofputil_queue_stats_request *oqsr);
+struct ofpbuf *
+ofputil_encode_queue_stats_request(enum ofp_version ofp_version,
+                                   const struct ofputil_queue_stats_request *oqsr);
+
+struct ofputil_queue_stats {
+    ofp_port_t port_no;
+    uint32_t queue_id;
+
+    /* Values of unsupported statistics are set to all-1-bits (UINT64_MAX). */
+    uint64_t tx_bytes;
+    uint64_t tx_packets;
+    uint64_t tx_errors;
+
+    /* UINT32_MAX if unknown. */
+    uint32_t duration_sec;
+    uint32_t duration_nsec;
+};
+
+size_t ofputil_count_queue_stats(const struct ofp_header *);
+int ofputil_decode_queue_stats(struct ofputil_queue_stats *qs, struct ofpbuf *msg);
+void ofputil_append_queue_stat(struct ovs_list *replies,
+                               const struct ofputil_queue_stats *oqs);
+
+struct bucket_counter {
+    uint64_t packet_count;   /* Number of packets processed by bucket. */
+    uint64_t byte_count;     /* Number of bytes processed by bucket. */
+};
+
+/* Bucket for use in groups. */
+struct ofputil_bucket {
+    struct ovs_list list_node;
+    uint16_t weight;            /* Relative weight, for "select" groups. */
+    ofp_port_t watch_port;      /* Port whose state affects whether this bucket
+                                 * is live. Only required for fast failover
+                                 * groups. */
+    uint32_t watch_group;       /* Group whose state affects whether this
+                                 * bucket is live. Only required for fast
+                                 * failover groups. */
+    uint32_t bucket_id;         /* Bucket Id used to identify bucket*/
+    struct ofpact *ofpacts;     /* Series of "struct ofpact"s. */
+    size_t ofpacts_len;         /* Length of ofpacts, in bytes. */
+
+    struct bucket_counter stats;
+};
+
+/* Protocol-independent group_mod. */
+struct ofputil_group_props {
+    /* NTR selection method */
+    char selection_method[NTR_MAX_SELECTION_METHOD_LEN];
+    uint64_t selection_method_param;
+    struct field_array fields;
+};
+
+/* Protocol-independent group_mod. */
+struct ofputil_group_mod {
+    uint16_t command;             /* One of OFPGC15_*. */
+    uint8_t type;                 /* One of OFPGT11_*. */
+    uint32_t group_id;            /* Group identifier. */
+    uint32_t command_bucket_id;   /* Bucket Id used as part of
+                                   * OFPGC15_INSERT_BUCKET and
+                                   * OFPGC15_REMOVE_BUCKET commands
+                                   * execution.*/
+    struct ovs_list buckets;      /* Contains "struct ofputil_bucket"s. */
+    struct ofputil_group_props props; /* Group properties. */
+};
+
+/* Group stats reply, independent of protocol. */
+struct ofputil_group_stats {
+    uint32_t group_id;    /* Group identifier. */
+    uint32_t ref_count;
+    uint64_t packet_count;      /* Packet count, UINT64_MAX if unknown. */
+    uint64_t byte_count;        /* Byte count, UINT64_MAX if unknown. */
+    uint32_t duration_sec;      /* UINT32_MAX if unknown. */
+    uint32_t duration_nsec;
+    uint32_t n_buckets;
+    struct bucket_counter *bucket_stats;
+};
+
+/* Group features reply, independent of protocol.
+ *
+ * Only OF1.2 and later support group features replies. */
+struct ofputil_group_features {
+    uint32_t  types;           /* Bitmap of OFPGT_* values supported. */
+    uint32_t  capabilities;    /* Bitmap of OFPGFC12_* capability supported. */
+    uint32_t  max_groups[4];   /* Maximum number of groups for each type. */
+    uint64_t  ofpacts[4];      /* Bitmaps of supported OFPACT_* */
+};
+
+/* Group desc reply, independent of protocol. */
+struct ofputil_group_desc {
+    uint8_t type;               /* One of OFPGT_*. */
+    uint32_t group_id;          /* Group identifier. */
+    struct ovs_list buckets;    /* Contains "struct ofputil_bucket"s. */
+    struct ofputil_group_props props; /* Group properties. */
+};
+
+void ofputil_group_properties_destroy(struct ofputil_group_props *);
+void ofputil_group_properties_copy(struct ofputil_group_props *to,
+                                   const struct ofputil_group_props *from);
+void ofputil_bucket_list_destroy(struct ovs_list *buckets);
+void ofputil_bucket_clone_list(struct ovs_list *dest,
+                               const struct ovs_list *src,
+                               const struct ofputil_bucket *);
+struct ofputil_bucket *ofputil_bucket_find(const struct ovs_list *,
+                                           uint32_t bucket_id);
+bool ofputil_bucket_check_duplicate_id(const struct ovs_list *);
+struct ofputil_bucket *ofputil_bucket_list_front(const struct ovs_list *);
+struct ofputil_bucket *ofputil_bucket_list_back(const struct ovs_list *);
+
+static inline bool
+ofputil_bucket_has_liveness(const struct ofputil_bucket *bucket)
+{
+    return (bucket->watch_port != OFPP_ANY ||
+            bucket->watch_group != OFPG_ANY);
+}
+
+struct ofpbuf *ofputil_encode_group_stats_request(enum ofp_version,
+                                                  uint32_t group_id);
+enum ofperr ofputil_decode_group_stats_request(
+    const struct ofp_header *request, uint32_t *group_id);
+void ofputil_append_group_stats(struct ovs_list *replies,
+                                const struct ofputil_group_stats *);
+struct ofpbuf *ofputil_encode_group_features_request(enum ofp_version);
+struct ofpbuf *ofputil_encode_group_features_reply(
+    const struct ofputil_group_features *, const struct ofp_header *request);
+void ofputil_decode_group_features_reply(const struct ofp_header *,
+                                         struct ofputil_group_features *);
+void ofputil_uninit_group_mod(struct ofputil_group_mod *gm);
+struct ofpbuf *ofputil_encode_group_mod(enum ofp_version ofp_version,
+                                        const struct ofputil_group_mod *gm);
+
+enum ofperr ofputil_decode_group_mod(const struct ofp_header *,
+                                     struct ofputil_group_mod *);
+
+int ofputil_decode_group_stats_reply(struct ofpbuf *,
+                                     struct ofputil_group_stats *);
+
+void ofputil_uninit_group_desc(struct ofputil_group_desc *gd);
+uint32_t ofputil_decode_group_desc_request(const struct ofp_header *);
+struct ofpbuf *ofputil_encode_group_desc_request(enum ofp_version,
+                                                 uint32_t group_id);
+
+int ofputil_decode_group_desc_reply(struct ofputil_group_desc *,
+                                    struct ofpbuf *, enum ofp_version);
+
+void ofputil_append_group_desc_reply(const struct ofputil_group_desc *,
+                                     const struct ovs_list *buckets,
+                                     struct ovs_list *replies);
+
+struct ofputil_bundle_ctrl_msg {
+    uint32_t    bundle_id;
+    uint16_t    type;
+    uint16_t    flags;
+};
+
+struct ofputil_bundle_add_msg {
+    uint32_t            bundle_id;
+    uint16_t            flags;
+    const struct ofp_header   *msg;
+};
+
+enum ofperr ofputil_decode_bundle_ctrl(const struct ofp_header *,
+                                       struct ofputil_bundle_ctrl_msg *);
+
+struct ofpbuf *ofputil_encode_bundle_ctrl_request(enum ofp_version,
+                                                  struct ofputil_bundle_ctrl_msg *);
+struct ofpbuf *ofputil_encode_bundle_ctrl_reply(const struct ofp_header *,
+                                                struct ofputil_bundle_ctrl_msg *);
+
+struct ofpbuf *ofputil_encode_bundle_add(enum ofp_version ofp_version,
+                                         struct ofputil_bundle_add_msg *msg);
+
+enum ofperr ofputil_decode_bundle_add(const struct ofp_header *,
+                                      struct ofputil_bundle_add_msg *,
+                                      enum ofptype *type);
+
+/* Bundle message as produced by ofp-parse. */
+struct ofputil_bundle_msg {
+    enum ofptype type;
+    union {
+        struct ofputil_flow_mod fm;
+        struct ofputil_group_mod gm;
+        struct ofputil_packet_out po;
+    };
+};
+
+void ofputil_encode_bundle_msgs(const struct ofputil_bundle_msg *bms,
+                                size_t n_bms, struct ovs_list *requests,
+                                enum ofputil_protocol);
+void ofputil_free_bundle_msgs(struct ofputil_bundle_msg *bms, size_t n_bms);
+
+struct ofputil_tlv_map {
+    struct ovs_list list_node;
+
+    uint16_t option_class;
+    uint8_t  option_type;
+    uint8_t  option_len;
+    uint16_t index;
+};
+
+struct ofputil_tlv_table_mod {
+    uint16_t command;
+    struct ovs_list mappings;      /* Contains "struct ofputil_tlv_map"s. */
+};
+
+struct ofputil_tlv_table_reply {
+    uint32_t max_option_space;
+    uint16_t max_fields;
+    struct ovs_list mappings;      /* Contains "struct ofputil_tlv_map"s. */
+};
+
+struct ofpbuf *ofputil_encode_tlv_table_mod(enum ofp_version ofp_version,
+                                               struct ofputil_tlv_table_mod *);
+enum ofperr ofputil_decode_tlv_table_mod(const struct ofp_header *,
+                                            struct ofputil_tlv_table_mod *);
+struct ofpbuf *ofputil_encode_tlv_table_reply(const struct ofp_header *,
+                                               struct ofputil_tlv_table_reply *);
+enum ofperr ofputil_decode_tlv_table_reply(const struct ofp_header *,
+                                              struct ofputil_tlv_table_reply *);
+void ofputil_uninit_tlv_table(struct ovs_list *mappings);
+
+enum ofputil_async_msg_type {
+    /* Standard asynchronous messages. */
+    OAM_PACKET_IN,              /* OFPT_PACKET_IN or NXT_PACKET_IN. */
+    OAM_PORT_STATUS,            /* OFPT_PORT_STATUS. */
+    OAM_FLOW_REMOVED,           /* OFPT_FLOW_REMOVED or NXT_FLOW_REMOVED. */
+    OAM_ROLE_STATUS,            /* OFPT_ROLE_STATUS. */
+    OAM_TABLE_STATUS,           /* OFPT_TABLE_STATUS. */
+    OAM_REQUESTFORWARD,         /* OFPT_REQUESTFORWARD. */
+
+    /* Extension asynchronous messages (none yet--coming soon!). */
+#define OAM_EXTENSIONS 0        /* Bitmap of all extensions. */
+
+    OAM_N_TYPES
+};
+const char *ofputil_async_msg_type_to_string(enum ofputil_async_msg_type);
+
+struct ofputil_async_cfg {
+    uint32_t master[OAM_N_TYPES];
+    uint32_t slave[OAM_N_TYPES];
+};
+#define OFPUTIL_ASYNC_CFG_INIT (struct ofputil_async_cfg) { .master[0] = 0 }
+
+enum ofperr ofputil_decode_set_async_config(const struct ofp_header *,
+                                            bool loose,
+                                            const struct ofputil_async_cfg *,
+                                            struct ofputil_async_cfg *);
+
+struct ofpbuf *ofputil_encode_get_async_reply(
+    const struct ofp_header *, const struct ofputil_async_cfg *);
+struct ofpbuf *ofputil_encode_set_async_config(
+    const struct ofputil_async_cfg *, uint32_t oams, enum ofp_version);
+
+struct ofputil_async_cfg ofputil_async_cfg_default(enum ofp_version);
+
+struct ofputil_requestforward {
+    ovs_be32 xid;
+    enum ofp14_requestforward_reason reason;
+    union {
+        /* reason == OFPRFR_METER_MOD. */
+        struct {
+            struct ofputil_meter_mod *meter_mod;
+            struct ofpbuf bands;
+        };
+
+        /* reason == OFPRFR_GROUP_MOD. */
+        struct ofputil_group_mod *group_mod;
+    };
+};
+
+struct ofpbuf *ofputil_encode_requestforward(
+    const struct ofputil_requestforward *, enum ofputil_protocol);
+enum ofperr ofputil_decode_requestforward(const struct ofp_header *,
+                                          struct ofputil_requestforward *);
+void ofputil_destroy_requestforward(struct ofputil_requestforward *);
+
+/* Abstract ofp14_table_status. */
+struct ofputil_table_status {
+    enum ofp14_table_reason reason;     /* One of OFPTR_*. */
+    struct ofputil_table_desc desc;   /* New table config. */
+};
+
+enum ofperr ofputil_decode_table_status(const struct ofp_header *oh,
+                                        struct ofputil_table_status *ts);
+
+struct ofpbuf *
+ofputil_encode_table_status(const struct ofputil_table_status *ts,
+                            enum ofputil_protocol protocol);
+#endif /* ofp-util.h */
diff --git a/openflow/include/openvswitch/ofpbuf.h b/openflow/include/openvswitch/ofpbuf.h
new file mode 100644
index 0000000..bc25bb8
--- /dev/null
+++ b/openflow/include/openvswitch/ofpbuf.h
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_OFPBUF_H
+#define OPENVSWITCH_OFPBUF_H 1
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/list.h"
+#include "openvswitch/util.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+enum OVS_PACKED_ENUM ofpbuf_source {
+    OFPBUF_MALLOC,              /* Obtained via malloc(). */
+    OFPBUF_STACK,               /* Un-movable stack space or static buffer. */
+    OFPBUF_STUB,                /* Starts on stack, may expand into heap. */
+};
+
+/* Buffer for holding arbitrary data.  An ofpbuf is automatically reallocated
+ * as necessary if it grows too large for the available memory.
+ *
+ * 'header' and 'msg' conventions:
+ *
+ * OpenFlow messages: 'header' points to the start of the OpenFlow
+ *    header, while 'msg' is the OpenFlow msg body.
+ *    When parsing, the 'data' will move past these, as data is being
+ *    pulled from the OpenFlow message.
+ *
+ *    Caution: buffer manipulation of 'struct ofpbuf' must always update
+ *             the 'header' and 'msg' pointers.
+ *
+ *
+ * Actions: When encoding OVS action lists, the 'header' is used
+ *    as a pointer to the beginning of the current action (see ofpact_put()).
+ *
+ * rconn: Reuses 'header' as a private pointer while queuing.
+ */
+struct ofpbuf {
+    void *base;                 /* First byte of allocated space. */
+    void *data;                 /* First byte actually in use. */
+    uint32_t size;              /* Number of bytes in use. */
+    uint32_t allocated;         /* Number of bytes allocated. */
+
+    void *header;               /* OpenFlow header. */
+    void *msg;                  /* message's body */
+    struct ovs_list list_node;  /* Private list element for use by owner. */
+    enum ofpbuf_source source;  /* Source of memory allocated as 'base'. */
+};
+
+/* An initializer for a struct ofpbuf that will be initially empty and uses the
+ * space in STUB (which should be an array) as a stub.  This is the initializer
+ * form of ofpbuf_use_stub().
+ *
+ * Usage example:
+ *
+ *     uint64_t stub[1024 / 8]; // 1 kB stub properly aligned for 64-bit data.
+ *     struct ofpbuf ofpbuf = OFPBUF_STUB_INITIALIZER(stub);
+ */
+#define OFPBUF_STUB_INITIALIZER(STUB) {         \
+        .base = (STUB),                         \
+        .data = (STUB),                         \
+        .size = 0,                              \
+        .allocated = sizeof (STUB),             \
+        .header = NULL,                         \
+        .msg = NULL,                            \
+        .list_node = OVS_LIST_POISON,           \
+        .source = OFPBUF_STUB,                  \
+    }
+
+/* An initializer for a struct ofpbuf whose data starts at DATA and continues
+ * for SIZE bytes.  This is appropriate for an ofpbuf that will be used to
+ * inspect existing data, without moving it around or reallocating it, and
+ * generally without modifying it at all.  This is the initializer form of
+ * ofpbuf_use_const().
+ */
+static inline struct ofpbuf
+ofpbuf_const_initializer(const void *data, size_t size)
+{
+    return (struct ofpbuf) {
+        .base = CONST_CAST(void *, data),
+        .data = CONST_CAST(void *, data),
+        .size = size,
+        .allocated = size,
+        .header = NULL,
+        .msg = NULL,
+        .list_node = OVS_LIST_POISON,
+        .source = OFPBUF_STACK,
+    };
+}
+
+void ofpbuf_use_ds(struct ofpbuf *, const struct ds *);
+void ofpbuf_use_stack(struct ofpbuf *, void *, size_t);
+void ofpbuf_use_stub(struct ofpbuf *, void *, size_t);
+void ofpbuf_use_const(struct ofpbuf *, const void *, size_t);
+
+void ofpbuf_init(struct ofpbuf *, size_t);
+void ofpbuf_uninit(struct ofpbuf *);
+void ofpbuf_reinit(struct ofpbuf *, size_t);
+
+struct ofpbuf *ofpbuf_new(size_t);
+struct ofpbuf *ofpbuf_new_with_headroom(size_t, size_t headroom);
+struct ofpbuf *ofpbuf_clone(const struct ofpbuf *);
+struct ofpbuf *ofpbuf_clone_with_headroom(const struct ofpbuf *,
+                                          size_t headroom);
+struct ofpbuf *ofpbuf_clone_data(const void *, size_t);
+struct ofpbuf *ofpbuf_clone_data_with_headroom(const void *, size_t,
+                                               size_t headroom);
+static inline void ofpbuf_delete(struct ofpbuf *);
+
+static inline void *ofpbuf_at(const struct ofpbuf *, size_t offset,
+                              size_t size);
+static inline void *ofpbuf_at_assert(const struct ofpbuf *, size_t offset,
+                                     size_t size);
+static inline void *ofpbuf_tail(const struct ofpbuf *);
+static inline void *ofpbuf_end(const struct ofpbuf *);
+
+void *ofpbuf_put_uninit(struct ofpbuf *, size_t);
+void *ofpbuf_put_zeros(struct ofpbuf *, size_t);
+void *ofpbuf_put(struct ofpbuf *, const void *, size_t);
+char *ofpbuf_put_hex(struct ofpbuf *, const char *s, size_t *n);
+void ofpbuf_reserve(struct ofpbuf *, size_t);
+void *ofpbuf_push_uninit(struct ofpbuf *b, size_t);
+void *ofpbuf_push_zeros(struct ofpbuf *, size_t);
+void *ofpbuf_push(struct ofpbuf *b, const void *, size_t);
+
+static inline size_t ofpbuf_headroom(const struct ofpbuf *);
+static inline size_t ofpbuf_tailroom(const struct ofpbuf *);
+static inline size_t ofpbuf_msgsize(const struct ofpbuf *);
+void ofpbuf_prealloc_headroom(struct ofpbuf *, size_t);
+void ofpbuf_prealloc_tailroom(struct ofpbuf *, size_t);
+void ofpbuf_trim(struct ofpbuf *);
+void ofpbuf_padto(struct ofpbuf *, size_t);
+void ofpbuf_shift(struct ofpbuf *, int);
+
+static inline void ofpbuf_clear(struct ofpbuf *);
+static inline void *ofpbuf_pull(struct ofpbuf *, size_t);
+static inline void *ofpbuf_try_pull(struct ofpbuf *, size_t);
+
+void *ofpbuf_steal_data(struct ofpbuf *);
+
+char *ofpbuf_to_string(const struct ofpbuf *, size_t maxbytes);
+static inline struct ofpbuf *ofpbuf_from_list(const struct ovs_list *);
+void ofpbuf_list_delete(struct ovs_list *);
+static inline bool ofpbuf_equal(const struct ofpbuf *, const struct ofpbuf *);
+
+
+/* Frees memory that 'b' points to, as well as 'b' itself. */
+static inline void ofpbuf_delete(struct ofpbuf *b)
+{
+    if (b) {
+        ofpbuf_uninit(b);
+        free(b);
+    }
+}
+
+/* If 'b' contains at least 'offset + size' bytes of data, returns a pointer to
+ * byte 'offset'.  Otherwise, returns a null pointer. */
+static inline void *ofpbuf_at(const struct ofpbuf *b, size_t offset,
+                              size_t size)
+{
+    return offset + size <= b->size ? (char *) b->data + offset : NULL;
+}
+
+/* Returns a pointer to byte 'offset' in 'b', which must contain at least
+ * 'offset + size' bytes of data. */
+static inline void *ofpbuf_at_assert(const struct ofpbuf *b, size_t offset,
+                                     size_t size)
+{
+    ovs_assert(offset + size <= b->size);
+    return ((char *) b->data) + offset;
+}
+
+/* Returns a pointer to byte following the last byte of data in use in 'b'. */
+static inline void *ofpbuf_tail(const struct ofpbuf *b)
+{
+    return (char *) b->data + b->size;
+}
+
+/* Returns a pointer to byte following the last byte allocated for use (but
+ * not necessarily in use) in 'b'. */
+static inline void *ofpbuf_end(const struct ofpbuf *b)
+{
+    return (char *) b->base + b->allocated;
+}
+
+/* Returns the number of bytes of headroom in 'b', that is, the number of bytes
+ * of unused space in ofpbuf 'b' before the data that is in use.  (Most
+ * commonly, the data in a ofpbuf is at its beginning, and thus the ofpbuf's
+ * headroom is 0.) */
+static inline size_t ofpbuf_headroom(const struct ofpbuf *b)
+{
+    return (char*)b->data - (char*)b->base;
+}
+
+/* Returns the number of bytes that may be appended to the tail end of ofpbuf
+ * 'b' before the ofpbuf must be reallocated. */
+static inline size_t ofpbuf_tailroom(const struct ofpbuf *b)
+{
+    return (char*)ofpbuf_end(b) - (char*)ofpbuf_tail(b);
+}
+
+/* Returns the number of bytes from 'b->header' to 'b->msg', that is, the
+ * length of 'b''s header. */
+static inline size_t
+ofpbuf_headersize(const struct ofpbuf *b)
+{
+    return (char *)b->msg - (char *)b->header;
+}
+
+/* Returns the number of bytes from 'b->msg' to 'b->data + b->size', that is,
+ * the length of the used space in 'b' starting from 'msg'. */
+static inline size_t
+ofpbuf_msgsize(const struct ofpbuf *b)
+{
+    return (char *)ofpbuf_tail(b) - (char *)b->msg;
+}
+
+/* Clears any data from 'b'. */
+static inline void ofpbuf_clear(struct ofpbuf *b)
+{
+    b->data = b->base;
+    b->size = 0;
+}
+
+/* Removes 'size' bytes from the head end of 'b', which must contain at least
+ * 'size' bytes of data.  Returns the first byte of data removed. */
+static inline void *ofpbuf_pull(struct ofpbuf *b, size_t size)
+{
+    void *data = b->data;
+    b->data = (char*)b->data + size;
+    b->size = b->size - size;
+    return data;
+}
+
+/* If 'b' has at least 'size' bytes of data, removes that many bytes from the
+ * head end of 'b' and returns the first byte removed.  Otherwise, returns a
+ * null pointer without modifying 'b'. */
+static inline void *ofpbuf_try_pull(struct ofpbuf *b, size_t size)
+{
+    return b->size >= size ? ofpbuf_pull(b, size) : NULL;
+}
+
+static inline struct ofpbuf *ofpbuf_from_list(const struct ovs_list *list)
+{
+    return CONTAINER_OF(list, struct ofpbuf, list_node);
+}
+
+static inline bool ofpbuf_equal(const struct ofpbuf *a, const struct ofpbuf *b)
+{
+    return a->size == b->size &&
+           memcmp(a->data, b->data, a->size) == 0;
+}
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* ofpbuf.h */
diff --git a/openflow/include/openvswitch/packets.h b/openflow/include/openvswitch/packets.h
new file mode 100644
index 0000000..5d97309
--- /dev/null
+++ b/openflow/include/openvswitch/packets.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_PACKETS_H
+#define OPENVSWITCH_PACKETS_H 1
+
+#include <netinet/in.h>
+#include "openvswitch/tun-metadata.h"
+
+/* Tunnel information used in flow key and metadata. */
+struct flow_tnl {
+    ovs_be32 ip_dst;
+    struct in6_addr ipv6_dst;
+    ovs_be32 ip_src;
+    struct in6_addr ipv6_src;
+    ovs_be64 tun_id;
+    uint16_t flags;
+    uint8_t ip_tos;
+    uint8_t ip_ttl;
+    ovs_be16 tp_src;
+    ovs_be16 tp_dst;
+    ovs_be16 gbp_id;
+    uint8_t  gbp_flags;
+    uint8_t  pad1[5];        /* Pad to 64 bits. */
+    struct tun_metadata metadata;
+};
+
+/* Some flags are exposed through OpenFlow while others are used only
+ * internally. */
+
+/* Public flags */
+#define FLOW_TNL_F_OAM (1 << 0)
+
+#define FLOW_TNL_PUB_F_MASK ((1 << 1) - 1)
+
+/* Private flags */
+#define FLOW_TNL_F_DONT_FRAGMENT (1 << 1)
+#define FLOW_TNL_F_CSUM (1 << 2)
+#define FLOW_TNL_F_KEY (1 << 3)
+
+#define FLOW_TNL_F_MASK ((1 << 4) - 1)
+
+/* Unfortunately, a "struct flow" sometimes has to handle OpenFlow port
+ * numbers and other times datapath (dpif) port numbers.  This union allows
+ * access to both. */
+union flow_in_port {
+    odp_port_t odp_port;
+    ofp_port_t ofp_port;
+};
+
+#endif /* packets.h */
diff --git a/openflow/include/openvswitch/shash.h b/openflow/include/openvswitch/shash.h
new file mode 100644
index 0000000..afc4823
--- /dev/null
+++ b/openflow/include/openvswitch/shash.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2009, 2010, 2011, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SHASH_H
+#define SHASH_H 1
+
+#include "openvswitch/hmap.h"
+#include "openvswitch/util.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct shash_node {
+    struct hmap_node node;
+    char *name;
+    void *data;
+};
+
+struct shash {
+    struct hmap map;
+};
+
+#define SHASH_INITIALIZER(SHASH) { HMAP_INITIALIZER(&(SHASH)->map) }
+
+#define SHASH_FOR_EACH(SHASH_NODE, SHASH)                               \
+    HMAP_FOR_EACH_INIT (SHASH_NODE, node, &(SHASH)->map,                \
+                        BUILD_ASSERT_TYPE(SHASH_NODE, struct shash_node *), \
+                        BUILD_ASSERT_TYPE(SHASH, struct shash *))
+
+#define SHASH_FOR_EACH_SAFE(SHASH_NODE, NEXT, SHASH)        \
+    HMAP_FOR_EACH_SAFE_INIT (                               \
+        SHASH_NODE, NEXT, node, &(SHASH)->map,              \
+        BUILD_ASSERT_TYPE(SHASH_NODE, struct shash_node *), \
+        BUILD_ASSERT_TYPE(NEXT, struct shash_node *),       \
+        BUILD_ASSERT_TYPE(SHASH, struct shash *))
+
+void shash_init(struct shash *);
+void shash_destroy(struct shash *);
+void shash_destroy_free_data(struct shash *);
+void shash_swap(struct shash *, struct shash *);
+void shash_moved(struct shash *);
+void shash_clear(struct shash *);
+void shash_clear_free_data(struct shash *);
+bool shash_is_empty(const struct shash *);
+size_t shash_count(const struct shash *);
+struct shash_node *shash_add(struct shash *, const char *, const void *);
+struct shash_node *shash_add_nocopy(struct shash *, char *, const void *);
+bool shash_add_once(struct shash *, const char *, const void *);
+void shash_add_assert(struct shash *, const char *, const void *);
+void *shash_replace(struct shash *, const char *, const void *data);
+void shash_delete(struct shash *, struct shash_node *);
+char *shash_steal(struct shash *, struct shash_node *);
+struct shash_node *shash_find(const struct shash *, const char *);
+struct shash_node *shash_find_len(const struct shash *, const char *, size_t);
+void *shash_find_data(const struct shash *, const char *);
+void *shash_find_and_delete(struct shash *, const char *);
+void *shash_find_and_delete_assert(struct shash *, const char *);
+struct shash_node *shash_first(const struct shash *);
+const struct shash_node **shash_sort(const struct shash *);
+bool shash_equal_keys(const struct shash *, const struct shash *);
+struct shash_node *shash_random_node(struct shash *);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* shash.h */
diff --git a/openflow/include/openvswitch/thread.h b/openflow/include/openvswitch/thread.h
new file mode 100644
index 0000000..af6f2bb
--- /dev/null
+++ b/openflow/include/openvswitch/thread.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2013, 2014 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_THREAD_H
+#define OPENVSWITCH_THREAD_H 1
+
+#include <pthread.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <sys/types.h>
+#include "openvswitch/compiler.h"
+
+/* Mutex. */
+struct OVS_LOCKABLE ovs_mutex {
+    pthread_mutex_t lock;
+    const char *where;          /* NULL if and only if uninitialized. */
+};
+
+/* "struct ovs_mutex" initializer. */
+#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+#define OVS_MUTEX_INITIALIZER { PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP, \
+                                "<unlocked>" }
+#else
+#define OVS_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER, "<unlocked>" }
+#endif
+
+#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+#define OVS_ADAPTIVE_MUTEX_INITIALIZER                  \
+    { PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP, "<unlocked>" }
+#else
+#define OVS_ADAPTIVE_MUTEX_INITIALIZER OVS_MUTEX_INITIALIZER
+#endif
+
+/* ovs_mutex functions analogous to pthread_mutex_*() functions.
+ *
+ * Most of these functions abort the process with an error message on any
+ * error.  ovs_mutex_trylock() is an exception: it passes through a 0 or EBUSY
+ * return value to the caller and aborts on any other error. */
+void ovs_mutex_init(const struct ovs_mutex *);
+void ovs_mutex_init_recursive(const struct ovs_mutex *);
+void ovs_mutex_init_adaptive(const struct ovs_mutex *);
+void ovs_mutex_destroy(const struct ovs_mutex *);
+void ovs_mutex_unlock(const struct ovs_mutex *mutex) OVS_RELEASES(mutex);
+void ovs_mutex_lock_at(const struct ovs_mutex *mutex, const char *where)
+    OVS_ACQUIRES(mutex);
+#define ovs_mutex_lock(mutex) \
+        ovs_mutex_lock_at(mutex, OVS_SOURCE_LOCATOR)
+
+int ovs_mutex_trylock_at(const struct ovs_mutex *mutex, const char *where)
+    OVS_TRY_LOCK(0, mutex);
+#define ovs_mutex_trylock(mutex) \
+        ovs_mutex_trylock_at(mutex, OVS_SOURCE_LOCATOR)
+
+void ovs_mutex_cond_wait(pthread_cond_t *, const struct ovs_mutex *);
+
+/* Convenient once-only execution.
+ *
+ *
+ * Problem
+ * =======
+ *
+ * POSIX provides pthread_once_t and pthread_once() as primitives for running a
+ * set of code only once per process execution.  They are used like this:
+ *
+ *     static void run_once(void) { ...initialization... }
+ *     static pthread_once_t once = PTHREAD_ONCE_INIT;
+ * ...
+ *     pthread_once(&once, run_once);
+ *
+ * pthread_once() does not allow passing any parameters to the initialization
+ * function, which is often inconvenient, because it means that the function
+ * can only access data declared at file scope.
+ *
+ *
+ * Solution
+ * ========
+ *
+ * Use ovsthread_once, like this, instead:
+ *
+ *     static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
+ *
+ *     if (ovsthread_once_start(&once)) {
+ *         ...initialization...
+ *         ovsthread_once_done(&once);
+ *     }
+ */
+
+struct ovsthread_once {
+    bool done;               /* Non-atomic, false negatives possible. */
+    struct ovs_mutex mutex;
+};
+
+#define OVSTHREAD_ONCE_INITIALIZER              \
+    {                                           \
+        false,                                  \
+        OVS_MUTEX_INITIALIZER,                  \
+    }
+
+static inline bool ovsthread_once_start(struct ovsthread_once *once)
+    OVS_TRY_LOCK(true, once->mutex);
+void ovsthread_once_done(struct ovsthread_once *once)
+    OVS_RELEASES(once->mutex);
+
+bool ovsthread_once_start__(struct ovsthread_once *once)
+    OVS_TRY_LOCK(true, once->mutex);
+
+/* Returns true if this is the first call to ovsthread_once_start() for
+ * 'once'.  In this case, the caller should perform whatever initialization
+ * actions it needs to do, then call ovsthread_once_done() for 'once'.
+ *
+ * Returns false if this is not the first call to ovsthread_once_start() for
+ * 'once'.  In this case, the call will not return until after
+ * ovsthread_once_done() has been called. */
+static inline bool
+ovsthread_once_start(struct ovsthread_once *once)
+{
+    /* We may be reading 'done' at the same time as the first thread
+     * is writing on it, or we can be using a stale copy of it.  The
+     * worst that can happen is that we call ovsthread_once_start__()
+     * once when strictly not necessary. */
+    return OVS_UNLIKELY(!once->done && ovsthread_once_start__(once));
+}
+
+#endif /* ovs-thread.h */
diff --git a/openflow/include/openvswitch/token-bucket.h b/openflow/include/openvswitch/token-bucket.h
new file mode 100644
index 0000000..6bb6040
--- /dev/null
+++ b/openflow/include/openvswitch/token-bucket.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2012 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_TOKEN_BUCKET_H
+#define OPENVSWITCH_TOKEN_BUCKET_H 1
+
+#include <limits.h>
+#include <stdbool.h>
+
+struct token_bucket {
+    /* Configuration settings. */
+    unsigned int rate;          /* Tokens added per millisecond. */
+    unsigned int burst;         /* Max cumulative tokens credit. */
+
+    /* Current status. */
+    unsigned int tokens;        /* Current number of tokens. */
+    long long int last_fill;    /* Last time tokens added. */
+};
+
+#define TOKEN_BUCKET_INIT(RATE, BURST) { RATE, BURST, 0, LLONG_MIN }
+
+void token_bucket_init(struct token_bucket *,
+                       unsigned int rate, unsigned int burst);
+void token_bucket_set(struct token_bucket *,
+                       unsigned int rate, unsigned int burst);
+bool token_bucket_withdraw(struct token_bucket *, unsigned int n);
+void token_bucket_wait_at(struct token_bucket *, unsigned int n,
+                          const char *where);
+#define token_bucket_wait(bucket, n)                    \
+    token_bucket_wait_at(bucket, n, OVS_SOURCE_LOCATOR)
+
+#endif /* token-bucket.h */
diff --git a/openflow/include/openvswitch/tun-metadata.h b/openflow/include/openvswitch/tun-metadata.h
new file mode 100644
index 0000000..1d6b737
--- /dev/null
+++ b/openflow/include/openvswitch/tun-metadata.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2015 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_TUN_METADATA_H
+#define OPENVSWITCH_TUN_METADATA_H 1
+
+#include "openvswitch/geneve.h"
+
+#define TUN_METADATA_NUM_OPTS 64
+#define TUN_METADATA_TOT_OPT_SIZE 256
+
+/* Tunnel option data, plus metadata to aid in their interpretation.
+ *
+ * The option data exists in two forms and is interpreted differently depending
+ * on whether FLOW_TNL_F_UDPIF is set in struct flow_tnl flags:
+ *
+ * When FLOW_TNL_F_UDPIF is set, the tunnel metadata is in "userspace datapath
+ * format". This is typically used for fast-path packet processing to avoid
+ * the cost of translating options and in situations where we need to maintain
+ * tunnel metadata exactly as it came in. In this case 'opts.gnv' is raw
+ * packet data from the tunnel header and 'present.len' indicates the length
+ * of the data stored there. In these situations, 'tab' is NULL.
+ *
+ * In all other cases, we are doing flow-based processing (such as during
+ * upcalls). FLOW_TNL_F_UDPIF is not set and options are reordered into
+ * pre-allocated locations. 'present.map' is indexed by type, that is, by the
+ * <i> in TUN_METADATA<i>, so that e.g. TUN_METADATA5 is present if
+ * 'present.map & (1ULL << 5)' is nonzero. The actual data for TUN_METADATA5,
+ * if present, might be anywhere in 'opts.u8' (not necessarily even contiguous),
+ * and finding it requires referring to 'tab', if set, or the global metadata
+ * table. */
+struct tun_metadata {
+    union { /* Valid members of 'opts'. When 'opts' is sorted into known types,
+             * 'map' is used. When 'opts' is raw packet data, 'len' is used. */
+        uint64_t map;                      /* 1-bit for each present TLV. */
+        uint8_t len;                       /* Length of data in 'opts'. */
+    } present;
+    const struct tun_table *tab; /* Types & lengths for 'opts' and 'opt_map'. */
+
+#if UINTPTR_MAX == UINT32_MAX
+    uint8_t pad[4];             /* Pad to 64-bit boundary. */
+#endif
+
+    union {
+        uint8_t u8[TUN_METADATA_TOT_OPT_SIZE]; /* Values from tunnel TLVs. */
+        struct geneve_opt gnv[TLV_TOT_OPT_SIZE / sizeof(struct geneve_opt)];
+    } opts;
+};
+BUILD_ASSERT_DECL(offsetof(struct tun_metadata, opts) % 8 == 0);
+BUILD_ASSERT_DECL(sizeof(((struct tun_metadata *)0)->present.map) * 8 >=
+                  TUN_METADATA_NUM_OPTS);
+
+/* The location of an option can be stored either as a single offset/len
+ * pair (hopefully) or if the address space is fragmented then it is a
+ * linked list of these blocks. */
+struct tun_metadata_loc_chain {
+    struct tun_metadata_loc_chain *next;
+    int offset;       /* In bytes, from start of 'opts', multiple of 4.  */
+    int len;          /* In bytes, multiple of 4. */
+};
+
+struct tun_metadata_loc {
+    int len;                    /* Sum of 'len' over elements in chain. */
+    struct tun_metadata_loc_chain c;
+};
+
+/* Bookkeeping information to keep track of an option that was allocated
+ * inside struct match. */
+struct tun_metadata_match_entry {
+    struct tun_metadata_loc loc; /* Allocated position. */
+    bool masked; /* Source value had a mask. Otherwise we can't tell if the
+                  * entire field was exact matched or only the portion that
+                  * is the same size as the value. */
+};
+
+/* Allocation of options inside struct match.  This is important if we don't
+ * have access to an allocation table - either because there isn't one
+ * (ovs-ofctl) or if we need to keep the allocation outside of packet
+ * processing context (Packet-In). These structures never have dynamically
+ * allocated memory because the address space is never fragmented. */
+struct tun_metadata_allocation {
+    struct tun_metadata_match_entry entry[TUN_METADATA_NUM_OPTS];
+    int alloc_offset;           /* Byte offset into 'opts', multiple of 4.  */
+    bool valid;                 /* Set to true after any allocation occurs. */
+};
+
+
+#endif /* tun-metadata.h */
diff --git a/openflow/include/openvswitch/type-props.h b/openflow/include/openvswitch/type-props.h
new file mode 100644
index 0000000..bf879cd
--- /dev/null
+++ b/openflow/include/openvswitch/type-props.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2008, 2011, 2015 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_TYPE_PROPS_H
+#define OPENVSWITCH_TYPE_PROPS_H 1
+
+#include <limits.h>
+
+/* True if TYPE is _Bool, false otherwise. */
+#define TYPE_IS_BOOL(TYPE) ((TYPE) 1 == (TYPE) 2)
+
+/* True if TYPE is an integer type (including _Bool), false if it is a
+ * floating-point type. */
+#define TYPE_IS_INTEGER(TYPE) ((TYPE) 1.5 == (TYPE) 1)
+
+/* True if TYPE is a signed integer or floating point type, otherwise false. */
+#define TYPE_IS_SIGNED(TYPE) ((TYPE) 1 > (TYPE) -1)
+
+/* The number of value bits in an signed or unsigned integer TYPE:
+ *
+ *    - _Bool has 1 value bit.
+ *
+ *    - An N-bit unsigned integer type has N value bits.
+ *
+ *    - An N-bit signed integer type has N-1 value bits.
+ */
+#define TYPE_VALUE_BITS(TYPE) \
+    (TYPE_IS_BOOL(TYPE) ? 1 : sizeof(TYPE) * CHAR_BIT - TYPE_IS_SIGNED(TYPE))
+
+/* The minimum or maximum value of a signed or unsigned integer TYPE. */
+#define TYPE_MINIMUM(TYPE) (TYPE_IS_SIGNED(TYPE) ? -TYPE_MAXIMUM(TYPE) - 1 : 0)
+#define TYPE_MAXIMUM(TYPE) \
+    ((((TYPE)1 << (TYPE_VALUE_BITS(TYPE) - 1)) - 1) * 2 + 1)
+
+/* Number of decimal digits required to format an integer of the given TYPE.
+ * Includes space for a sign, if TYPE is signed, but not for a null
+ * terminator.
+ *
+ * The value is an overestimate. */
+#define INT_STRLEN(TYPE) (TYPE_IS_SIGNED(TYPE) + TYPE_VALUE_BITS(TYPE) / 3 + 1)
+
+#endif /* type-props.h */
diff --git a/openflow/include/openvswitch/types.h b/openflow/include/openvswitch/types.h
new file mode 100644
index 0000000..2f5fcca
--- /dev/null
+++ b/openflow/include/openvswitch/types.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2010, 2011, 2013, 2014, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_TYPES_H
+#define OPENVSWITCH_TYPES_H 1
+
+#include <sys/types.h>
+#include <stdint.h>
+#include "openvswitch/compiler.h"
+
+#ifdef __CHECKER__
+#define OVS_BITWISE __attribute__((bitwise))
+#define OVS_FORCE __attribute__((force))
+#else
+#define OVS_BITWISE
+#define OVS_FORCE
+#endif
+
+/* The ovs_be<N> types indicate that an object is in big-endian, not
+ * native-endian, byte order.  They are otherwise equivalent to uint<N>_t. */
+typedef uint16_t OVS_BITWISE ovs_be16;
+typedef uint32_t OVS_BITWISE ovs_be32;
+typedef uint64_t OVS_BITWISE ovs_be64;
+
+#define OVS_BE16_MAX ((OVS_FORCE ovs_be16) 0xffff)
+#define OVS_BE32_MAX ((OVS_FORCE ovs_be32) 0xffffffff)
+#define OVS_BE64_MAX ((OVS_FORCE ovs_be64) 0xffffffffffffffffULL)
+
+/* These types help with a few funny situations:
+ *
+ *   - The Ethernet header is 14 bytes long, which misaligns everything after
+ *     that.  One can put 2 "shim" bytes before the Ethernet header, but this
+ *     helps only if there is exactly one Ethernet header.  If there are two,
+ *     as with GRE and VXLAN (and if the inner header doesn't use this
+ *     trick--GRE and VXLAN don't) then you have the choice of aligning the
+ *     inner data or the outer data.  So it seems better to treat 32-bit fields
+ *     in protocol headers as aligned only on 16-bit boundaries.
+ *
+ *   - ARP headers contain misaligned 32-bit fields.
+ *
+ *   - Netlink and OpenFlow contain 64-bit values that are only guaranteed to
+ *     be aligned on 32-bit boundaries.
+ *
+ * lib/unaligned.h has helper functions for accessing these. */
+
+/* A 32-bit value, in host byte order, that is only aligned on a 16-bit
+ * boundary.  */
+typedef struct {
+#ifdef WORDS_BIGENDIAN
+        uint16_t hi, lo;
+#else
+        uint16_t lo, hi;
+#endif
+} ovs_16aligned_u32;
+
+/* A 32-bit value, in network byte order, that is only aligned on a 16-bit
+ * boundary. */
+typedef struct {
+        ovs_be16 hi, lo;
+} ovs_16aligned_be32;
+
+/* A 64-bit value, in host byte order, that is only aligned on a 32-bit
+ * boundary.  */
+typedef struct {
+#ifdef WORDS_BIGENDIAN
+        uint32_t hi, lo;
+#else
+        uint32_t lo, hi;
+#endif
+} ovs_32aligned_u64;
+
+typedef union {
+    uint32_t u32[4];
+    struct {
+#ifdef WORDS_BIGENDIAN
+        uint64_t hi, lo;
+#else
+        uint64_t lo, hi;
+#endif
+    } u64;
+} ovs_u128;
+
+typedef union {
+    ovs_be32 be32[4];
+    struct {
+        ovs_be64 hi, lo;
+    } be64;
+} ovs_be128;
+
+/* MSVC2015 doesn't support designated initializers when compiling C++,
+ * and doesn't support ternary operators with non-designated initializers.
+ * So we use these static definitions rather than using initializer macros. */
+static const ovs_u128 OVS_U128_ZERO = { { 0, 0, 0, 0 } };
+static const ovs_u128 OVS_U128_MAX = { { UINT32_MAX, UINT32_MAX,
+                                         UINT32_MAX, UINT32_MAX } };
+static const ovs_be128 OVS_BE128_MAX OVS_UNUSED = { { OVS_BE32_MAX, OVS_BE32_MAX,
+                                           OVS_BE32_MAX, OVS_BE32_MAX } };
+static const ovs_u128 OVS_U128_MIN OVS_UNUSED = { {0, 0, 0, 0} };
+static const ovs_u128 OVS_BE128_MIN OVS_UNUSED = { {0, 0, 0, 0} };
+
+#define OVS_U128_ZERO OVS_U128_MIN
+
+/* A 64-bit value, in network byte order, that is only aligned on a 32-bit
+ * boundary. */
+typedef struct {
+        ovs_be32 hi, lo;
+} ovs_32aligned_be64;
+
+/* Port numbers
+ * ------------
+ *
+ * None of these types are directly interchangeable, hence the OVS_BITWISE
+ * annotation.
+ *
+ * ofp_port_t is an OpenFlow 1.0 port number.  It uses a 16-bit range, even
+ * though it is a 32-bit type.  This allows it to be overlaid on an odp_port_t
+ * for a few situations where this is useful, e.g. in union flow_in_port.
+ *
+ * ofp11_port_t is an OpenFlow-1.1 port number.
+ *
+ * odp_port_t is a port number within a datapath (e.g. see lib/dpif.h).
+ */
+typedef uint32_t OVS_BITWISE ofp_port_t;
+typedef uint32_t OVS_BITWISE odp_port_t;
+typedef uint32_t OVS_BITWISE ofp11_port_t;
+
+/* Macro functions that cast int types to ofp/odp/ofp11 types. */
+#define OFP_PORT_C(X) ((OVS_FORCE ofp_port_t) (X))
+#define ODP_PORT_C(X) ((OVS_FORCE odp_port_t) (X))
+#define OFP11_PORT_C(X) ((OVS_FORCE ofp11_port_t) (X))
+
+/* Using this struct instead of a bare array makes an ethernet address field
+ * assignable.  The size of the array is also part of the type, so it is easier
+ * to deal with. */
+struct eth_addr {
+    union {
+        uint8_t ea[6];
+        ovs_be16 be16[3];
+    };
+};
+
+#endif /* openvswitch/types.h */
diff --git a/openflow/include/openvswitch/util.h b/openflow/include/openvswitch/util.h
new file mode 100644
index 0000000..8453550
--- /dev/null
+++ b/openflow/include/openvswitch/util.h
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_UTIL_H
+#define OPENVSWITCH_UTIL_H 1
+
+#include <openvswitch/compiler.h>
+#include <openvswitch/version.h>
+#include <openvswitch/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void ovs_set_program_name(const char *name, const char *version);
+
+const char *ovs_get_program_name(void);
+const char *ovs_get_program_version(void);
+
+/* Expands to a string that looks like "<file>:<line>", e.g. "tmp.c:10".
+ *
+ * See http://c-faq.com/ansi/stringize.html for an explanation of OVS_STRINGIZE
+ * and OVS_STRINGIZE2. */
+#define OVS_SOURCE_LOCATOR __FILE__ ":" OVS_STRINGIZE(__LINE__)
+#define OVS_STRINGIZE(ARG) OVS_STRINGIZE2(ARG)
+#define OVS_STRINGIZE2(ARG) #ARG
+
+/* Saturating multiplication of "unsigned int"s: overflow yields UINT_MAX. */
+#define OVS_SAT_MUL(X, Y)                                               \
+    ((Y) == 0 ? 0                                                       \
+     : (X) <= UINT_MAX / (Y) ? (unsigned int) (X) * (unsigned int) (Y)  \
+     : UINT_MAX)
+
+/* Like the standard assert macro, except writes the failure message to the
+ * log. */
+#ifndef NDEBUG
+#define ovs_assert(CONDITION)                                           \
+    if (!OVS_LIKELY(CONDITION)) {                                       \
+        ovs_assert_failure(OVS_SOURCE_LOCATOR, __func__, #CONDITION);       \
+    }
+#else
+#define ovs_assert(CONDITION) ((void) (CONDITION))
+#endif
+OVS_NO_RETURN void ovs_assert_failure(const char *, const char *, const char *);
+
+/* This is a void expression that issues a compiler error if POINTER cannot be
+ * compared for equality with the given pointer TYPE.  This generally means
+ * that POINTER is a qualified or unqualified TYPE.  However,
+ * BUILD_ASSERT_TYPE(POINTER, void *) will accept any pointer to object type,
+ * because any pointer to object can be compared for equality with "void *".
+ *
+ * POINTER can be any expression.  The use of "sizeof" ensures that the
+ * expression is not actually evaluated, so that any side effects of the
+ * expression do not occur.
+ *
+ * The cast to int is present only to suppress an "expression using sizeof
+ * bool" warning from "sparse" (see
+ * http://permalink.gmane.org/gmane.comp.parsers.sparse/2967). */
+#define BUILD_ASSERT_TYPE(POINTER, TYPE) \
+    ((void) sizeof ((int) ((POINTER) == (TYPE) (POINTER))))
+
+/* Casts 'pointer' to 'type' and issues a compiler warning if the cast changes
+ * anything other than an outermost "const" or "volatile" qualifier. */
+#define CONST_CAST(TYPE, POINTER)                               \
+    (BUILD_ASSERT_TYPE(POINTER, TYPE),                          \
+     (TYPE) (POINTER))
+
+/* Given a pointer-typed lvalue OBJECT, expands to a pointer type that may be
+ * assigned to OBJECT. */
+#ifdef __GNUC__
+#define OVS_TYPEOF(OBJECT) typeof(OBJECT)
+#else
+#define OVS_TYPEOF(OBJECT) void *
+#endif
+
+/* Given OBJECT of type pointer-to-structure, expands to the offset of MEMBER
+ * within an instance of the structure.
+ *
+ * The GCC-specific version avoids the technicality of undefined behavior if
+ * OBJECT is null, invalid, or not yet initialized.  This makes some static
+ * checkers (like Coverity) happier.  But the non-GCC version does not actually
+ * dereference any pointer, so it would be surprising for it to cause any
+ * problems in practice.
+ */
+#ifdef __GNUC__
+#define OBJECT_OFFSETOF(OBJECT, MEMBER) offsetof(typeof(*(OBJECT)), MEMBER)
+#else
+#define OBJECT_OFFSETOF(OBJECT, MEMBER) \
+    ((char *) &(OBJECT)->MEMBER - (char *) (OBJECT))
+#endif
+
+/* Yields the size of MEMBER within STRUCT. */
+#define MEMBER_SIZEOF(STRUCT, MEMBER) (sizeof(((STRUCT *) NULL)->MEMBER))
+
+/* Yields the offset of the end of MEMBER within STRUCT. */
+#define OFFSETOFEND(STRUCT, MEMBER) \
+        (offsetof(STRUCT, MEMBER) + MEMBER_SIZEOF(STRUCT, MEMBER))
+
+/* Given POINTER, the address of the given MEMBER in a STRUCT object, returns
+   the STRUCT object. */
+#define CONTAINER_OF(POINTER, STRUCT, MEMBER)                           \
+        ((STRUCT *) (void *) ((char *) (POINTER) - offsetof (STRUCT, MEMBER)))
+
+/* Given POINTER, the address of the given MEMBER within an object of the type
+ * that that OBJECT points to, returns OBJECT as an assignment-compatible
+ * pointer type (either the correct pointer type or "void *").  OBJECT must be
+ * an lvalue.
+ *
+ * This is the same as CONTAINER_OF except that it infers the structure type
+ * from the type of '*OBJECT'. */
+#define OBJECT_CONTAINING(POINTER, OBJECT, MEMBER)                      \
+    ((OVS_TYPEOF(OBJECT)) (void *)                                      \
+     ((char *) (POINTER) - OBJECT_OFFSETOF(OBJECT, MEMBER)))
+
+/* Given POINTER, the address of the given MEMBER within an object of the type
+ * that that OBJECT points to, assigns the address of the outer object to
+ * OBJECT, which must be an lvalue.
+ *
+ * Evaluates to (void) 0 as the result is not to be used. */
+#define ASSIGN_CONTAINER(OBJECT, POINTER, MEMBER) \
+    ((OBJECT) = OBJECT_CONTAINING(POINTER, OBJECT, MEMBER), (void) 0)
+
+/* As explained in the comment above OBJECT_OFFSETOF(), non-GNUC compilers
+ * like MSVC will complain about un-initialized variables if OBJECT
+ * hasn't already been initialized. To prevent such warnings, INIT_CONTAINER()
+ * can be used as a wrapper around ASSIGN_CONTAINER. */
+#define INIT_CONTAINER(OBJECT, POINTER, MEMBER) \
+    ((OBJECT) = NULL, ASSIGN_CONTAINER(OBJECT, POINTER, MEMBER))
+
+/* Returns the number of elements in ARRAY. */
+#define ARRAY_SIZE(ARRAY) __ARRAY_SIZE(ARRAY)
+
+/* Returns X / Y, rounding up.  X must be nonnegative to round correctly. */
+#define DIV_ROUND_UP(X, Y) (((X) + ((Y) - 1)) / (Y))
+
+/* Returns X rounded up to the nearest multiple of Y. */
+#define ROUND_UP(X, Y) (DIV_ROUND_UP(X, Y) * (Y))
+
+/* Returns the least number that, when added to X, yields a multiple of Y. */
+#define PAD_SIZE(X, Y) (ROUND_UP(X, Y) - (X))
+
+/* Returns X rounded down to the nearest multiple of Y. */
+#define ROUND_DOWN(X, Y) ((X) / (Y) * (Y))
+
+/* Returns true if X is a power of 2, otherwise false. */
+#define IS_POW2(X) ((X) && !((X) & ((X) - 1)))
+
+/* Expands to an anonymous union that contains:
+ *
+ *    - MEMBERS in a nested anonymous struct.
+ *
+ *    - An array as large as MEMBERS plus padding to a multiple of UNIT bytes.
+ *
+ * The effect is to pad MEMBERS to a multiple of UNIT bytes.
+ *
+ * For example, the struct below is 8 bytes long, with 6 bytes of padding:
+ *
+ *     struct padded_struct {
+ *         PADDED_MEMBERS(8, uint8_t x; uint8_t y;);
+ *     };
+ */
+#define PADDED_MEMBERS(UNIT, MEMBERS)                               \
+    union {                                                         \
+        struct { MEMBERS };                                         \
+        uint8_t pad[ROUND_UP(sizeof(struct { MEMBERS }), UNIT)];    \
+    }
+
+static inline bool
+is_pow2(uintmax_t x)
+{
+    return IS_POW2(x);
+}
+
+/* Returns X rounded up to a power of 2.  X must be a constant expression. */
+#define ROUND_UP_POW2(X) RUP2__(X)
+#define RUP2__(X) (RUP2_1(X) + 1)
+#define RUP2_1(X) (RUP2_2(X) | (RUP2_2(X) >> 16))
+#define RUP2_2(X) (RUP2_3(X) | (RUP2_3(X) >> 8))
+#define RUP2_3(X) (RUP2_4(X) | (RUP2_4(X) >> 4))
+#define RUP2_4(X) (RUP2_5(X) | (RUP2_5(X) >> 2))
+#define RUP2_5(X) (RUP2_6(X) | (RUP2_6(X) >> 1))
+#define RUP2_6(X) ((X) - 1)
+
+/* Returns X rounded down to a power of 2.  X must be a constant expression. */
+#define ROUND_DOWN_POW2(X) RDP2__(X)
+#define RDP2__(X) (RDP2_1(X) - (RDP2_1(X) >> 1))
+#define RDP2_1(X) (RDP2_2(X) | (RDP2_2(X) >> 16))
+#define RDP2_2(X) (RDP2_3(X) | (RDP2_3(X) >> 8))
+#define RDP2_3(X) (RDP2_4(X) | (RDP2_4(X) >> 4))
+#define RDP2_4(X) (RDP2_5(X) | (RDP2_5(X) >> 2))
+#define RDP2_5(X) (      (X) | (      (X) >> 1))
+
+/* Macros for sizing bitmaps */
+#define BITMAP_ULONG_BITS (sizeof(unsigned long) * CHAR_BIT)
+#define BITMAP_N_LONGS(N_BITS) DIV_ROUND_UP(N_BITS, BITMAP_ULONG_BITS)
+
+/* Given ATTR, and TYPE, cast the ATTR to TYPE by first casting ATTR to
+ * (void *). This is to suppress the alignment warning issued by clang. */
+#define ALIGNED_CAST(TYPE, ATTR) ((TYPE) (void *) (ATTR))
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/openflow/include/openvswitch/uuid.h b/openflow/include/openvswitch/uuid.h
new file mode 100644
index 0000000..383a408
--- /dev/null
+++ b/openflow/include/openvswitch/uuid.h
@@ -0,0 +1,35 @@
+/* Copyright (c) 2008, 2009, 2010 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_UUID_H
+#define OPENVSWITCH_UUID_H 1
+
+#include "openvswitch/util.h"
+
+#define UUID_BIT 128            /* Number of bits in a UUID. */
+#define UUID_OCTET (UUID_BIT / 8) /* Number of bytes in a UUID. */
+
+/* A Universally Unique IDentifier (UUID) compliant with RFC 4122.
+ *
+ * Each of the parts is stored in host byte order, but the parts themselves are
+ * ordered from left to right.  That is, (parts[0] >> 24) is the first 8 bits
+ * of the UUID when output in the standard form, and (parts[3] & 0xff) is the
+ * final 8 bits. */
+struct uuid {
+    uint32_t parts[4];
+};
+BUILD_ASSERT_DECL(sizeof(struct uuid) == UUID_OCTET);
+
+#endif /* uuid.h */
diff --git a/openflow/include/openvswitch/vconn.h b/openflow/include/openvswitch/vconn.h
new file mode 100644
index 0000000..40ca9ed
--- /dev/null
+++ b/openflow/include/openvswitch/vconn.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2008-2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_VCONN_H
+#define OPENVSWITCH_VCONN_H 1
+
+#include <stdbool.h>
+#include "openvswitch/list.h"
+#include "openvswitch/types.h"
+#include "openvswitch/ofp-util.h"
+#include "openflow/openflow.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ofpbuf;
+struct pvconn;
+struct pvconn_class;
+struct vconn;
+struct vconn_class;
+
+void vconn_usage(bool active, bool passive, bool bootstrap);
+
+/* Active vconns: virtual connections to OpenFlow devices. */
+int vconn_verify_name(const char *name);
+int vconn_open(const char *name, uint32_t allowed_versions, uint8_t dscp,
+               struct vconn **vconnp);
+void vconn_close(struct vconn *);
+const char *vconn_get_name(const struct vconn *);
+
+uint32_t vconn_get_allowed_versions(const struct vconn *vconn);
+void vconn_set_allowed_versions(struct vconn *vconn,
+                                uint32_t allowed_versions);
+int vconn_get_version(const struct vconn *);
+void vconn_set_recv_any_version(struct vconn *);
+
+int vconn_connect(struct vconn *);
+int vconn_recv(struct vconn *, struct ofpbuf **);
+int vconn_send(struct vconn *, struct ofpbuf *);
+int vconn_recv_xid(struct vconn *, ovs_be32 xid, struct ofpbuf **);
+int vconn_transact(struct vconn *, struct ofpbuf *, struct ofpbuf **);
+int vconn_transact_noreply(struct vconn *, struct ofpbuf *, struct ofpbuf **);
+int vconn_transact_multiple_noreply(struct vconn *, struct ovs_list *requests,
+                                    struct ofpbuf **replyp);
+
+int vconn_dump_flows(struct vconn *, const struct ofputil_flow_stats_request *,
+                     enum ofputil_protocol,
+                     struct ofputil_flow_stats **fsesp, size_t *n_fsesp);
+
+/* Bundle errors must be free()d by the caller. */
+struct vconn_bundle_error {
+    struct ovs_list list_node;
+
+    /* OpenFlow header and some of the message contents for error reporting. */
+    union {
+        struct ofp_header ofp_msg;
+        uint8_t ofp_msg_data[64];
+    };
+};
+
+/* Bundle errors must be free()d by the caller. */
+int vconn_bundle_transact(struct vconn *, struct ovs_list *requests,
+                          uint16_t bundle_flags,
+                          struct ovs_list *errors);
+
+void vconn_run(struct vconn *);
+void vconn_run_wait(struct vconn *);
+
+int vconn_get_status(const struct vconn *);
+
+int vconn_open_block(const char *name, uint32_t allowed_versions, uint8_t dscp,
+                     struct vconn **);
+int vconn_connect_block(struct vconn *);
+int vconn_send_block(struct vconn *, struct ofpbuf *);
+int vconn_recv_block(struct vconn *, struct ofpbuf **);
+
+enum vconn_wait_type {
+    WAIT_CONNECT,
+    WAIT_RECV,
+    WAIT_SEND
+};
+void vconn_wait(struct vconn *, enum vconn_wait_type);
+void vconn_connect_wait(struct vconn *);
+void vconn_recv_wait(struct vconn *);
+void vconn_send_wait(struct vconn *);
+
+/* Passive vconns: virtual listeners for incoming OpenFlow connections. */
+int pvconn_verify_name(const char *name);
+int pvconn_open(const char *name, uint32_t allowed_versions, uint8_t dscp,
+                struct pvconn **pvconnp);
+const char *pvconn_get_name(const struct pvconn *);
+void pvconn_close(struct pvconn *);
+int pvconn_accept(struct pvconn *, struct vconn **);
+void pvconn_wait(struct pvconn *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* vconn.h */
diff --git a/openflow/include/openvswitch/version.h b/openflow/include/openvswitch/version.h
new file mode 100644
index 0000000..f05409d
--- /dev/null
+++ b/openflow/include/openvswitch/version.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2014 Nicira, Inc.
+ * Copyright (c) 2014 Cisco Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_VERSION_H
+#define OPENVSWITCH_VERSION_H 1
+
+#define OVS_PACKAGE_STRING  "openvswitch 2.7.0"
+#define OVS_PACKAGE_VERSION "2.7.0"
+
+#define OVS_LIB_VERSION     1
+#define OVS_LIB_REVISION    0
+#define OVS_LIB_AGE         0
+
+#endif /* openvswitch/version.h */
diff --git a/openflow/include/openvswitch/vlog.h b/openflow/include/openvswitch/vlog.h
new file mode 100644
index 0000000..3a40421
--- /dev/null
+++ b/openflow/include/openvswitch/vlog.h
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_VLOG_H
+#define OPENVSWITCH_VLOG_H 1
+
+/* Logging.
+ *
+ *
+ * Thread-safety
+ * =============
+ *
+ * Fully thread safe.
+ */
+
+#include <limits.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <time.h>
+#include <openvswitch/compiler.h>
+#include <openvswitch/list.h>
+#include <openvswitch/thread.h>
+#include <openvswitch/token-bucket.h>
+#include <openvswitch/util.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* Logging severity levels.
+ *
+ * ovs-appctl(8) defines each of the log levels. */
+#define VLOG_LEVELS                             \
+    VLOG_LEVEL(OFF,  LOG_ALERT,   1)            \
+    VLOG_LEVEL(EMER, LOG_ALERT,   1)            \
+    VLOG_LEVEL(ERR,  LOG_ERR,     3)            \
+    VLOG_LEVEL(WARN, LOG_WARNING, 4)            \
+    VLOG_LEVEL(INFO, LOG_NOTICE,  5)            \
+    VLOG_LEVEL(DBG,  LOG_DEBUG,   7)
+enum vlog_level {
+#define VLOG_LEVEL(NAME, SYSLOG_LEVEL, RFC5424_LEVEL) VLL_##NAME,
+    VLOG_LEVELS
+#undef VLOG_LEVEL
+    VLL_N_LEVELS
+};
+
+const char *vlog_get_level_name(enum vlog_level);
+enum vlog_level vlog_get_level_val(const char *name);
+
+/* Destinations that we can log to. */
+#define VLOG_DESTINATIONS                                                 \
+    VLOG_DESTINATION(SYSLOG, "ovs|%05N|%c%T|%p|%m")                        \
+    VLOG_DESTINATION(CONSOLE, "%D{%Y-%m-%dT%H:%M:%SZ}|%05N|%c%T|%p|%m")    \
+    VLOG_DESTINATION(FILE, "%D{%Y-%m-%dT%H:%M:%S.###Z}|%05N|%c%T|%p|%m")
+enum vlog_destination {
+#define VLOG_DESTINATION(NAME, PATTERN) VLF_##NAME,
+    VLOG_DESTINATIONS
+#undef VLOG_DESTINATION
+    VLF_N_DESTINATIONS,
+    VLF_ANY_DESTINATION = -1
+};
+
+const char *vlog_get_destination_name(enum vlog_destination);
+enum vlog_destination vlog_get_destination_val(const char *name);
+
+/* A log module. */
+struct vlog_module {
+    struct ovs_list list;
+    const char *name;             /* User-visible name. */
+    int levels[VLF_N_DESTINATIONS]; /* Minimum log level for each
+                                       destination. */
+    int min_level;                /* Minimum log level for any destination. */
+    bool honor_rate_limits;       /* Set false to ignore rate limits. */
+};
+
+void vlog_insert_module(struct ovs_list *);
+
+const char *vlog_get_module_name(const struct vlog_module *);
+struct vlog_module *vlog_module_from_name(const char *name);
+
+/* Rate-limiter for log messages. */
+struct vlog_rate_limit {
+    struct token_bucket token_bucket;
+    time_t first_dropped;       /* Time first message was dropped. */
+    time_t last_dropped;        /* Time of most recent message drop. */
+    unsigned int n_dropped;     /* Number of messages dropped. */
+    struct ovs_mutex mutex;     /* Mutual exclusion for rate limit. */
+};
+
+/* Number of tokens to emit a message.  We add 'rate' tokens per millisecond,
+ * thus 60,000 tokens are required to emit one message per minute. */
+#define VLOG_MSG_TOKENS (60 * 1000)
+
+/* Initializer for a struct vlog_rate_limit, to set up a maximum rate of RATE
+ * messages per minute and a maximum burst size of BURST messages. */
+#define VLOG_RATE_LIMIT_INIT(RATE, BURST)                                 \
+        {                                                                 \
+            TOKEN_BUCKET_INIT(RATE, OVS_SAT_MUL(BURST, VLOG_MSG_TOKENS)), \
+            0,                              /* first_dropped */           \
+            0,                              /* last_dropped */            \
+            0,                              /* n_dropped */               \
+            OVS_MUTEX_INITIALIZER           /* mutex */                   \
+        }
+
+/* Configuring how each module logs messages. */
+enum vlog_level vlog_get_level(const struct vlog_module *,
+                               enum vlog_destination);
+void vlog_set_levels(struct vlog_module *,
+                     enum vlog_destination, enum vlog_level);
+char *vlog_set_levels_from_string(const char *) OVS_WARN_UNUSED_RESULT;
+void vlog_set_levels_from_string_assert(const char *);
+char *vlog_get_levels(void);
+char *vlog_get_patterns(void);
+bool vlog_is_enabled(const struct vlog_module *, enum vlog_level);
+bool vlog_should_drop(const struct vlog_module *, enum vlog_level,
+                      struct vlog_rate_limit *);
+void vlog_set_verbosity(const char *arg);
+
+/* Configuring log destinations. */
+void vlog_set_pattern(enum vlog_destination, const char *pattern);
+int vlog_set_log_file(const char *file_name);
+int vlog_reopen_log_file(void);
+#ifndef _WIN32
+void vlog_change_owner_unix(uid_t, gid_t);
+#endif
+
+/* Configure method how vlog should send messages to syslog server. */
+void vlog_set_syslog_method(const char *method);
+
+/* Configure syslog target. */
+void vlog_set_syslog_target(const char *target);
+
+/* Initialization. */
+void vlog_init(void);
+void vlog_enable_async(void);
+
+/* Functions for actual logging. */
+void vlog(const struct vlog_module *, enum vlog_level, const char *format, ...)
+    OVS_PRINTF_FORMAT (3, 4);
+void vlog_valist(const struct vlog_module *, enum vlog_level,
+                 const char *, va_list)
+    OVS_PRINTF_FORMAT (3, 0);
+
+OVS_NO_RETURN void vlog_fatal(const struct vlog_module *, const char *format, ...)
+    OVS_PRINTF_FORMAT (2, 3);
+OVS_NO_RETURN void vlog_fatal_valist(const struct vlog_module *,
+                                 const char *format, va_list)
+    OVS_PRINTF_FORMAT (2, 0);
+
+OVS_NO_RETURN void vlog_abort(const struct vlog_module *, const char *format, ...)
+    OVS_PRINTF_FORMAT (2, 3);
+OVS_NO_RETURN void vlog_abort_valist(const struct vlog_module *,
+                                 const char *format, va_list)
+    OVS_PRINTF_FORMAT (2, 0);
+
+void vlog_rate_limit(const struct vlog_module *, enum vlog_level,
+                     struct vlog_rate_limit *, const char *, ...)
+    OVS_PRINTF_FORMAT (4, 5);
+
+/* Defines a logging module whose name is MODULE, which should generally be
+ * roughly the name of the source file, and makes it the module used by the
+ * logging convenience macros defined below. */
+#define VLOG_DEFINE_THIS_MODULE(MODULE)                                 \
+        static struct vlog_module this_module = {                       \
+            OVS_LIST_INITIALIZER(&this_module.list),                    \
+            #MODULE,                                        /* name */  \
+            { VLL_INFO, VLL_INFO, VLL_INFO },             /* levels */  \
+            VLL_INFO,                                  /* min_level */  \
+            true                               /* honor_rate_limits */  \
+        };                                                              \
+        OVS_CONSTRUCTOR(init_this_module_##MODULE) {                    \
+            vlog_insert_module(&this_module.list);                      \
+        }                                                               \
+                                                                        \
+        /* Prevent duplicate module names, via linker error.            \
+         * The extra "extern" declaration makes sparse happy. */        \
+        extern struct vlog_module *VLM_##MODULE;                        \
+        struct vlog_module *VLM_##MODULE = &this_module;
+
+/* Macros for the current module as set up by VLOG_DEFINE_THIS_MODULE.
+ * These are usually what you want to use.
+ *
+ * Guaranteed to preserve errno.
+ */
+#define VLOG_FATAL(...) vlog_fatal(&this_module, __VA_ARGS__)
+#define VLOG_ABORT(...) vlog_abort(&this_module, __VA_ARGS__)
+#define VLOG_EMER(...) VLOG(VLL_EMER, __VA_ARGS__)
+#define VLOG_ERR(...) VLOG(VLL_ERR, __VA_ARGS__)
+#define VLOG_WARN(...) VLOG(VLL_WARN, __VA_ARGS__)
+#define VLOG_INFO(...) VLOG(VLL_INFO, __VA_ARGS__)
+#define VLOG_DBG(...) VLOG(VLL_DBG, __VA_ARGS__)
+
+/* More convenience macros, for testing whether a given level is enabled.  When
+ * constructing a log message is expensive, this enables it to be skipped. */
+#define VLOG_IS_ERR_ENABLED() vlog_is_enabled(&this_module, VLL_ERR)
+#define VLOG_IS_WARN_ENABLED() vlog_is_enabled(&this_module, VLL_WARN)
+#define VLOG_IS_INFO_ENABLED() vlog_is_enabled(&this_module, VLL_INFO)
+#define VLOG_IS_DBG_ENABLED() vlog_is_enabled(&this_module, VLL_DBG)
+
+/* Convenience macros for rate-limiting.
+ * Guaranteed to preserve errno.
+ */
+#define VLOG_ERR_RL(RL, ...) VLOG_RL(RL, VLL_ERR, __VA_ARGS__)
+#define VLOG_WARN_RL(RL, ...) VLOG_RL(RL, VLL_WARN, __VA_ARGS__)
+#define VLOG_INFO_RL(RL, ...) VLOG_RL(RL, VLL_INFO, __VA_ARGS__)
+#define VLOG_DBG_RL(RL, ...) VLOG_RL(RL, VLL_DBG, __VA_ARGS__)
+
+/* Convenience macros to additionally store log message in buffer
+ * Caller is responsible for freeing *ERRP afterwards */
+#define VLOG_ERR_BUF(ERRP, ...) VLOG_ERRP(ERRP, VLL_ERR, __VA_ARGS__)
+#define VLOG_WARN_BUF(ERRP, ...) VLOG_ERRP(ERRP, VLL_WARN, __VA_ARGS__)
+
+#define VLOG_DROP_ERR(RL) vlog_should_drop(&this_module, VLL_ERR, RL)
+#define VLOG_DROP_WARN(RL) vlog_should_drop(&this_module, VLL_WARN, RL)
+#define VLOG_DROP_INFO(RL) vlog_should_drop(&this_module, VLL_INFO, RL)
+#define VLOG_DROP_DBG(RL) vlog_should_drop(&this_module, VLL_DBG, RL)
+
+/* Macros for logging at most once per execution. */
+#define VLOG_ERR_ONCE(...) VLOG_ONCE(VLL_ERR, __VA_ARGS__)
+#define VLOG_WARN_ONCE(...) VLOG_ONCE(VLL_WARN, __VA_ARGS__)
+#define VLOG_INFO_ONCE(...) VLOG_ONCE(VLL_INFO, __VA_ARGS__)
+#define VLOG_DBG_ONCE(...) VLOG_ONCE(VLL_DBG, __VA_ARGS__)
+
+/* Command line processing. */
+#define VLOG_OPTION_ENUMS                       \
+        OPT_LOG_FILE,                           \
+        OPT_SYSLOG_IMPL,                        \
+        OPT_SYSLOG_TARGET
+
+#define VLOG_LONG_OPTIONS                                               \
+        {"verbose",       optional_argument, NULL, 'v'},                \
+        {"log-file",      optional_argument, NULL, OPT_LOG_FILE},       \
+        {"syslog-method", required_argument, NULL, OPT_SYSLOG_IMPL},    \
+        {"syslog-target", required_argument, NULL, OPT_SYSLOG_TARGET}
+
+#define VLOG_OPTION_HANDLERS                    \
+        case 'v':                               \
+            vlog_set_verbosity(optarg);         \
+            break;                              \
+        case OPT_LOG_FILE:                      \
+            vlog_set_log_file(optarg);          \
+            break;                              \
+        case OPT_SYSLOG_IMPL:                   \
+            vlog_set_syslog_method(optarg);     \
+            break;                              \
+        case OPT_SYSLOG_TARGET:                 \
+            vlog_set_syslog_target(optarg);     \
+            break;
+
+void vlog_usage(void);
+
+/* Implementation details. */
+#define VLOG(LEVEL, ...)                                \
+    do {                                                \
+        enum vlog_level level__ = LEVEL;                \
+        if (this_module.min_level >= level__) {         \
+            vlog(&this_module, level__, __VA_ARGS__);   \
+        }                                               \
+    } while (0)
+#define VLOG_RL(RL, LEVEL, ...)                                         \
+    do {                                                                \
+        enum vlog_level level__ = LEVEL;                                \
+        if (this_module.min_level >= level__) {                         \
+            vlog_rate_limit(&this_module, level__, RL, __VA_ARGS__);    \
+        }                                                               \
+    } while (0)
+#define VLOG_ONCE(LEVEL, ...)                                           \
+    do {                                                                \
+        static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; \
+        if (ovsthread_once_start(&once)) {                              \
+            vlog(&this_module, LEVEL, __VA_ARGS__);                     \
+            ovsthread_once_done(&once);                                 \
+        }                                                               \
+    } while (0)
+#define VLOG_ERRP(ERRP, LEVEL, ...)                                     \
+    do {                                                                \
+        VLOG(LEVEL, __VA_ARGS__);                                       \
+        if (ERRP) {                                                     \
+            *(ERRP) = xasprintf(__VA_ARGS__);                           \
+        }                                                               \
+    } while (0)
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* vlog.h */
diff --git a/openflow/include/ovn/actions.h b/openflow/include/ovn/actions.h
new file mode 100644
index 0000000..d2510fd
--- /dev/null
+++ b/openflow/include/ovn/actions.h
@@ -0,0 +1,489 @@
+/*
+ * Copyright (c) 2015, 2016, 2017 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OVN_ACTIONS_H
+#define OVN_ACTIONS_H 1
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "compiler.h"
+#include "expr.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/hmap.h"
+#include "openvswitch/uuid.h"
+#include "util.h"
+
+struct expr;
+struct lexer;
+struct ofpbuf;
+struct shash;
+struct simap;
+
+/* List of OVN logical actions.
+ *
+ * This macro is used directly only internally by this header and its
+ * corresponding .c file, but the list is still of interest to developers.
+ *
+ * Each OVNACT invocation has the following parameters:
+ *
+ * 1. <ENUM>, used below in the enum definition of OVNACT_<ENUM>, and
+ *    elsewhere.
+ *
+ * 2. <STRUCT> corresponding to a structure "struct <STRUCT>", that must be a
+ *    defined below.  This structure must be an abstract definition of the
+ *    action.  Its first member must have type "struct ovnact" and name
+ *    "ovnact".  The structure must have a fixed length, that is, it may not
+ *    end with a flexible array member.
+ */
+#define OVNACTS                                     \
+    OVNACT(OUTPUT,        ovnact_null)              \
+    OVNACT(NEXT,          ovnact_next)              \
+    OVNACT(LOAD,          ovnact_load)              \
+    OVNACT(MOVE,          ovnact_move)              \
+    OVNACT(EXCHANGE,      ovnact_move)              \
+    OVNACT(DEC_TTL,       ovnact_null)              \
+    OVNACT(CT_NEXT,       ovnact_ct_next)           \
+    OVNACT(CT_COMMIT,     ovnact_ct_commit)         \
+    OVNACT(CT_DNAT,       ovnact_ct_nat)            \
+    OVNACT(CT_SNAT,       ovnact_ct_nat)            \
+    OVNACT(CT_LB,         ovnact_ct_lb)             \
+    OVNACT(CT_CLEAR,      ovnact_null)              \
+    OVNACT(CLONE,         ovnact_nest)              \
+    OVNACT(ARP,           ovnact_nest)              \
+    OVNACT(ND_NA,         ovnact_nest)              \
+    OVNACT(GET_ARP,       ovnact_get_mac_bind)      \
+    OVNACT(PUT_ARP,       ovnact_put_mac_bind)      \
+    OVNACT(GET_ND,        ovnact_get_mac_bind)      \
+    OVNACT(PUT_ND,        ovnact_put_mac_bind)      \
+    OVNACT(PUT_DHCPV4_OPTS, ovnact_put_dhcp_opts)   \
+    OVNACT(PUT_DHCPV6_OPTS, ovnact_put_dhcp_opts)   \
+    OVNACT(SET_QUEUE,       ovnact_set_queue)
+
+/* enum ovnact_type, with a member OVNACT_<ENUM> for each action. */
+enum OVS_PACKED_ENUM ovnact_type {
+#define OVNACT(ENUM, STRUCT) OVNACT_##ENUM,
+    OVNACTS
+#undef OVNACT
+};
+
+/* Define N_OVNACTS to the number of types of ovnacts. */
+enum {
+#define OVNACT(ENUM, STRUCT) + 1
+    N_OVNACTS = OVNACTS
+#undef OVNACT
+};
+
+/* Header for an action.
+ *
+ * Each action is a structure "struct ovnact_*" that begins with "struct
+ * ovnact", usually followed by other data that describes the action.  Actions
+ * are padded out to a multiple of OVNACT_ALIGNTO bytes in length.
+ */
+struct ovnact {
+    /* We want the space advantage of an 8-bit type here on every
+     * implementation, without giving up the advantage of having a useful type
+     * on implementations that support packed enums. */
+#ifdef HAVE_PACKED_ENUM
+    enum ovnact_type type;      /* OVNACT_*. */
+#else
+    uint8_t type;               /* OVNACT_* */
+#endif
+    uint8_t pad;                /* Pad to multiple of 16 bits. */
+
+    uint16_t len;               /* Length of the action, in bytes, including
+                                 * struct ovnact, excluding padding. */
+};
+BUILD_ASSERT_DECL(sizeof(struct ovnact) == 4);
+
+/* Alignment. */
+#define OVNACT_ALIGNTO 8
+#define OVNACT_ALIGN(SIZE) ROUND_UP(SIZE, OVNACT_ALIGNTO)
+
+/* Returns the ovnact following 'ovnact'. */
+static inline struct ovnact *
+ovnact_next(const struct ovnact *ovnact)
+{
+    return (void *) ((uint8_t *) ovnact + OVNACT_ALIGN(ovnact->len));
+}
+
+struct ovnact *ovnact_next_flattened(const struct ovnact *);
+
+static inline struct ovnact *
+ovnact_end(const struct ovnact *ovnacts, size_t ovnacts_len)
+{
+    return (void *) ((uint8_t *) ovnacts + ovnacts_len);
+}
+
+/* Assigns POS to each ovnact, in turn, in the OVNACTS_LEN bytes of ovnacts
+ * starting at OVNACTS. */
+#define OVNACT_FOR_EACH(POS, OVNACTS, OVNACTS_LEN)                      \
+    for ((POS) = (OVNACTS); (POS) < ovnact_end(OVNACTS, OVNACTS_LEN);  \
+         (POS) = ovnact_next(POS))
+
+/* Action structure for each OVNACT_*. */
+
+/* Action structure for actions that do not have any extra data beyond the
+ * action type. */
+struct ovnact_null {
+    struct ovnact ovnact;
+};
+
+/* Logical pipeline in which a set of actions is executed. */
+enum ovnact_pipeline {
+    OVNACT_P_INGRESS,
+    OVNACT_P_EGRESS,
+};
+
+/* OVNACT_NEXT. */
+struct ovnact_next {
+    struct ovnact ovnact;
+
+    /* Arguments. */
+    uint8_t ltable;                /* Logical table ID of next table. */
+    enum ovnact_pipeline pipeline; /* Pipeline of next table. */
+
+    /* Information about the flow that the action is in.  This does not affect
+     * behavior, since the implementation of "next" doesn't depend on the
+     * source table or pipeline.  It does affect how ovnacts_format() prints
+     * the action. */
+    uint8_t src_ltable;                /* Logical table ID of source table. */
+    enum ovnact_pipeline src_pipeline; /* Pipeline of source table. */
+};
+
+/* OVNACT_LOAD. */
+struct ovnact_load {
+    struct ovnact ovnact;
+    struct expr_field dst;
+    union expr_constant imm;
+};
+
+/* OVNACT_MOVE, OVNACT_EXCHANGE. */
+struct ovnact_move {
+    struct ovnact ovnact;
+    struct expr_field lhs;
+    struct expr_field rhs;
+};
+
+/* OVNACT_CT_NEXT. */
+struct ovnact_ct_next {
+    struct ovnact ovnact;
+    uint8_t ltable;                /* Logical table ID of next table. */
+};
+
+/* OVNACT_CT_COMMIT. */
+struct ovnact_ct_commit {
+    struct ovnact ovnact;
+    uint32_t ct_mark, ct_mark_mask;
+    ovs_be128 ct_label, ct_label_mask;
+};
+
+/* OVNACT_CT_DNAT, OVNACT_CT_SNAT. */
+struct ovnact_ct_nat {
+    struct ovnact ovnact;
+    ovs_be32 ip;
+    uint8_t ltable;             /* Logical table ID of next table. */
+};
+
+struct ovnact_ct_lb_dst {
+    ovs_be32 ip;
+    uint16_t port;
+};
+
+/* OVNACT_CT_LB. */
+struct ovnact_ct_lb {
+    struct ovnact ovnact;
+    struct ovnact_ct_lb_dst *dsts;
+    size_t n_dsts;
+    uint8_t ltable;             /* Logical table ID of next table. */
+};
+
+/* OVNACT_ARP, OVNACT_ND_NA, OVNACT_CLONE. */
+struct ovnact_nest {
+    struct ovnact ovnact;
+    struct ovnact *nested;
+    size_t nested_len;
+};
+
+/* OVNACT_GET_ARP, OVNACT_GET_ND. */
+struct ovnact_get_mac_bind {
+    struct ovnact ovnact;
+    struct expr_field port;     /* Logical port name. */
+    struct expr_field ip;       /* 32-bit or 128-bit IP address. */
+};
+
+/* OVNACT_PUT_ARP, ONVACT_PUT_ND. */
+struct ovnact_put_mac_bind {
+    struct ovnact ovnact;
+    struct expr_field port;     /* Logical port name. */
+    struct expr_field ip;       /* 32-bit or 128-bit IP address. */
+    struct expr_field mac;      /* 48-bit Ethernet address. */
+};
+
+struct ovnact_dhcp_option {
+    const struct dhcp_opts_map *option;
+    struct expr_constant_set value;
+};
+
+/* OVNACT_PUT_DHCPV4_OPTS, OVNACT_PUT_DHCPV6_OPTS. */
+struct ovnact_put_dhcp_opts {
+    struct ovnact ovnact;
+    struct expr_field dst;      /* 1-bit destination field. */
+    struct ovnact_dhcp_option *options;
+    size_t n_options;
+};
+
+/* Valid arguments to SET_QUEUE action.
+ *
+ * QDISC_MIN_QUEUE_ID is the default queue, so user-defined queues should
+ * start at QDISC_MIN_QUEUE_ID+1. */
+#define QDISC_MIN_QUEUE_ID  0
+#define QDISC_MAX_QUEUE_ID  0xf000
+
+/* OVNACT_SET_QUEUE. */
+struct ovnact_set_queue {
+    struct ovnact ovnact;
+    uint16_t queue_id;
+};
+
+/* Internal use by the helpers below. */
+void ovnact_init(struct ovnact *, enum ovnact_type, size_t len);
+void *ovnact_put(struct ofpbuf *, enum ovnact_type, size_t len);
+
+/* For each OVNACT_<ENUM> with a corresponding struct <STRUCT>, this defines
+ * the following commonly useful functions:
+ *
+ *   struct <STRUCT> *ovnact_put_<ENUM>(struct ofpbuf *ovnacts);
+ *
+ *     Appends a new 'ovnact', of length OVNACT_<ENUM>_SIZE, to 'ovnacts',
+ *     initializes it with ovnact_init_<ENUM>(), and returns it.  Also sets
+ *     'ovnacts->header' to the returned action.
+ *
+ *   struct <STRUCT> *ovnact_get_<ENUM>(const struct ovnact *ovnact);
+ *
+ *     Returns 'ovnact' cast to "struct <STRUCT> *".  'ovnact->type' must be
+ *     OVNACT_<ENUM>.
+ *
+ * as well as the following more rarely useful definitions:
+ *
+ *   void ovnact_init_<ENUM>(struct <STRUCT> *ovnact);
+ *
+ *     Initializes the parts of 'ovnact' that identify it as having type
+ *     OVNACT_<ENUM> and length OVNACT_<ENUM>_SIZE and zeros the rest.
+ *
+ *   <ENUM>_SIZE
+ *
+ *     The size of the action structure, that is, sizeof(struct <STRUCT>)
+ *     rounded up to a multiple of OVNACT_ALIGNTO.
+ */
+#define OVNACT(ENUM, STRUCT)                                            \
+    BUILD_ASSERT_DECL(offsetof(struct STRUCT, ovnact) == 0);            \
+                                                                        \
+    enum { OVNACT_##ENUM##_SIZE = OVNACT_ALIGN(sizeof(struct STRUCT)) }; \
+                                                                        \
+    static inline struct STRUCT *                                       \
+    ovnact_get_##ENUM(const struct ovnact *ovnact)                      \
+    {                                                                   \
+        ovs_assert(ovnact->type == OVNACT_##ENUM);                      \
+        return ALIGNED_CAST(struct STRUCT *, ovnact);                   \
+    }                                                                   \
+                                                                        \
+    static inline struct STRUCT *                                       \
+    ovnact_put_##ENUM(struct ofpbuf *ovnacts)                           \
+    {                                                                   \
+        return ovnact_put(ovnacts, OVNACT_##ENUM,                       \
+                          OVNACT_##ENUM##_SIZE);                        \
+    }                                                                   \
+                                                                        \
+    static inline void                                                  \
+    ovnact_init_##ENUM(struct STRUCT *ovnact)                           \
+    {                                                                   \
+        ovnact_init(&ovnact->ovnact, OVNACT_##ENUM,                     \
+                    OVNACT_##ENUM##_SIZE);                              \
+    }
+OVNACTS
+#undef OVNACT
+
+#define MAX_OVN_GROUPS 65535
+
+struct group_table {
+    unsigned long *group_ids;  /* Used as a bitmap with value set
+                                * for allocated group ids in either
+                                * desired_groups or existing_groups. */
+    struct hmap desired_groups;
+    struct hmap existing_groups;
+};
+
+struct group_info {
+    struct hmap_node hmap_node;
+    struct ds group;
+    uint32_t group_id;
+    bool new_group_id;  /* 'True' if 'group_id' was reserved from
+                         * group_table's 'group_ids' bitmap. */
+};
+
+enum action_opcode {
+    /* "arp { ...actions... }".
+     *
+     * The actions, in OpenFlow 1.3 format, follow the action_header.
+     */
+    ACTION_OPCODE_ARP,
+
+    /* "put_arp(port, ip, mac)"
+     *
+     * Arguments are passed through the packet metadata and data, as follows:
+     *
+     *     MFF_REG0 = ip
+     *     MFF_LOG_INPORT = port
+     *     MFF_ETH_SRC = mac
+     */
+    ACTION_OPCODE_PUT_ARP,
+
+    /* "result = put_dhcp_opts(offer_ip, option, ...)".
+     *
+     * Arguments follow the action_header, in this format:
+     *   - A 32-bit or 64-bit OXM header designating the result field.
+     *   - A 32-bit integer specifying a bit offset within the result field.
+     *   - The 32-bit DHCP offer IP.
+     *   - Any number of DHCP options.
+     */
+    ACTION_OPCODE_PUT_DHCP_OPTS,
+
+    /* "nd_na { ...actions... }".
+     *
+     * The actions, in OpenFlow 1.3 format, follow the action_header.
+     */
+    ACTION_OPCODE_ND_NA,
+
+    /* "put_nd(port, ip6, mac)"
+     *
+     * Arguments are passed through the packet metadata and data, as follows:
+     *
+     *     MFF_XXREG0 = ip6
+     *     MFF_LOG_INPORT = port
+     *     MFF_ETH_SRC = mac
+     */
+    ACTION_OPCODE_PUT_ND,
+
+    /* "result = put_dhcpv6_opts(option, ...)".
+     *
+     * Arguments follow the action_header, in this format:
+     *   - A 32-bit or 64-bit OXM header designating the result field.
+     *   - A 32-bit integer specifying a bit offset within the result field.
+     *   - Any number of DHCPv6 options.
+     */
+    ACTION_OPCODE_PUT_DHCPV6_OPTS,
+};
+
+/* Header. */
+struct action_header {
+    ovs_be32 opcode;            /* One of ACTION_OPCODE_* */
+    uint8_t pad[4];
+};
+BUILD_ASSERT_DECL(sizeof(struct action_header) == 8);
+
+struct ovnact_parse_params {
+    /* A table of "struct expr_symbol"s to support (as one would provide to
+     * expr_parse()). */
+    const struct shash *symtab;
+
+    /* hmap of 'struct dhcp_opts_map' to support 'put_dhcp_opts' action */
+    const struct hmap *dhcp_opts;
+
+    /* hmap of 'struct dhcp_opts_map'  to support 'put_dhcpv6_opts' action */
+    const struct hmap *dhcpv6_opts;
+
+    /* Each OVN flow exists in a logical table within a logical pipeline.
+     * These parameters express this context for a set of OVN actions being
+     * parsed:
+     *
+     *     - 'n_tables' is the number of tables in the logical ingress and
+     *        egress pipelines, that is, "next" may specify a table less than
+     *        or equal to 'n_tables'.  If 'n_tables' is 0 then "next" is
+     *        disallowed entirely.
+     *
+     *     - 'cur_ltable' is the logical table of the current flow, within
+     *       'pipeline'.  If cur_ltable + 1 < n_tables, then this defines the
+     *       default table that "next" will jump to.
+     *
+     *     - 'pipeline' is the logical pipeline.  It is the default pipeline to
+     *       which 'next' will jump.  If 'pipeline' is OVNACT_P_EGRESS, then
+     *       'next' will also be able to jump into the ingress pipeline, but
+     *       the reverse is not true. */
+    enum ovnact_pipeline pipeline; /* Logical pipeline. */
+    uint8_t n_tables;              /* Number of logical flow tables. */
+    uint8_t cur_ltable;            /* 0 <= cur_ltable < n_tables. */
+};
+
+bool ovnacts_parse(struct lexer *, const struct ovnact_parse_params *,
+                    struct ofpbuf *ovnacts, struct expr **prereqsp);
+char *ovnacts_parse_string(const char *s, const struct ovnact_parse_params *,
+                           struct ofpbuf *ovnacts, struct expr **prereqsp)
+    OVS_WARN_UNUSED_RESULT;
+
+void ovnacts_format(const struct ovnact[], size_t ovnacts_len, struct ds *);
+
+struct ovnact_encode_params {
+    /* Looks up logical port 'port_name'.  If found, stores its port number in
+     * '*portp' and returns true; otherwise, returns false. */
+    bool (*lookup_port)(const void *aux, const char *port_name,
+                        unsigned int *portp);
+    const void *aux;
+
+    /* 'true' if the flow is for a switch. */
+    bool is_switch;
+
+    /* 'true' if the flow is for a gateway router. */
+    bool is_gateway_router;
+
+    /* A map from a port name to its connection tracking zone. */
+    const struct simap *ct_zones;
+
+    /* A struct to figure out the group_id for group actions. */
+    struct group_table *group_table;
+
+    /* OVN maps each logical flow table (ltable), one-to-one, onto a physical
+     * OpenFlow flow table (ptable).  A number of parameters describe this
+     * mapping and data related to flow tables:
+     *
+     *     - 'pipeline' is the logical pipeline in which the actions are
+     *       executing.
+     *
+     *     - 'ingress_ptable' is the OpenFlow table that corresponds to OVN
+     *       ingress table 0.
+     *
+     *     - 'egress_ptable' is the OpenFlow table that corresponds to OVN
+     *       egress table 0.
+     *
+     *     - 'output_ptable' should be the OpenFlow table to which the logical
+     *       "output" action will resubmit.
+     *
+     *     - 'mac_bind_ptable' should be the OpenFlow table used to track MAC
+     *       bindings. */
+    enum ovnact_pipeline pipeline; /* Logical pipeline. */
+    uint8_t ingress_ptable;     /* First OpenFlow ingress table. */
+    uint8_t egress_ptable;      /* First OpenFlow egress table. */
+    uint8_t output_ptable;      /* OpenFlow table for 'output' to resubmit. */
+    uint8_t mac_bind_ptable;    /* OpenFlow table for 'get_arp'/'get_nd' to
+                                   resubmit. */
+};
+
+void ovnacts_encode(const struct ovnact[], size_t ovnacts_len,
+                    const struct ovnact_encode_params *,
+                    struct ofpbuf *ofpacts);
+
+void ovnacts_free(struct ovnact[], size_t ovnacts_len);
+
+#endif /* ovn/actions.h */
diff --git a/openflow/include/ovn/expr.h b/openflow/include/ovn/expr.h
new file mode 100644
index 0000000..711713e
--- /dev/null
+++ b/openflow/include/ovn/expr.h
@@ -0,0 +1,504 @@
+/*
+ * Copyright (c) 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OVN_EXPR_H
+#define OVN_EXPR_H 1
+
+/* OVN matching expression tree
+ * ============================
+ *
+ * The data structures here form an abstract expression tree for matching
+ * expressions in OVN.
+ *
+ * The abstract syntax tree representation of a matching expression is one of:
+ *
+ *    - A Boolean literal ("true" or "false").
+ *
+ *    - A comparison of a field (or part of a field) against a constant
+ *      with one of the operators == != < <= > >=.
+ *
+ *    - The logical AND or OR of two or more matching expressions.
+ *
+ * Literals and comparisons are called "terminal" nodes, logical AND and OR
+ * nodes are "nonterminal" nodes.
+ *
+ * The syntax for expressions includes a few other concepts that are not part
+ * of the abstract syntax tree.  In these examples, x is a field, a, b, and c
+ * are constants, and e1 and e2 are arbitrary expressions:
+ *
+ *    - Logical NOT.  The parser implements NOT by inverting the sense of the
+ *      operand: !(x == a) becomes x != a, !(e1 && e2) becomes !e1 || !e2, and
+ *      so on.
+ *
+ *    - Set membership.  The parser translates x == {a, b, c} into
+ *      x == a || x == b || x == c.
+ *
+ *    - Reversed comparisons.  The parser translates a < x into x > a.
+ *
+ *    - Range expressions.  The parser translates a < x < b into
+ *      x > a && x < b.
+ */
+
+#include "classifier.h"
+#include "lex.h"
+#include "openvswitch/hmap.h"
+#include "openvswitch/list.h"
+#include "openvswitch/match.h"
+#include "openvswitch/meta-flow.h"
+
+struct ds;
+struct expr;
+struct flow;
+struct ofpbuf;
+struct shash;
+struct simap;
+
+/* "Measurement level" of a field.  See "Level of Measurement" in the large
+ * comment on struct expr_symbol below for more information. */
+enum expr_level {
+    EXPR_L_NOMINAL,
+
+    /* Boolean values are nominal, however because of their simple nature OVN
+     * can allow both equality and inequality tests on them. */
+    EXPR_L_BOOLEAN,
+
+    /* Ordinal values can at least be ordered on a scale.  OVN allows equality
+     * and inequality and relational tests on ordinal values.  These are the
+     * fields on which OVS allows bitwise matching. */
+    EXPR_L_ORDINAL
+};
+
+const char *expr_level_to_string(enum expr_level);
+
+/* A symbol.
+ *
+ *
+ * Name
+ * ====
+ *
+ * Every symbol must have a name.  To be useful, the name must satisfy the
+ * lexer's syntax for an identifier.
+ *
+ *
+ * Width
+ * =====
+ *
+ * Every symbol has a width.  For integer symbols, this is the number of bits
+ * in the value; for string symbols, this is 0.
+ *
+ *
+ * Types
+ * =====
+ *
+ * There are three kinds of symbols:
+ *
+ *   Fields:
+ *
+ *     One might, for example, define a field named "vlan.tci" to refer to
+ *     MFF_VLAN_TCI.  'field' specifies the field.
+ *
+ *     'parent' and 'predicate' are NULL, and 'parent_ofs' is 0.
+ *
+ *     Integer fields can be nominal or ordinal (see below).  String fields are
+ *     always nominal.
+ *
+ *   Subfields:
+ *
+ *     'parent' specifies the field (which may itself be a subfield,
+ *     recursively) in which the subfield is embedded, and 'parent_ofs' a
+ *     bitwise offset from the least-significant bit of the parent.  The
+ *     subfield can contain a subset of the bits of the parent or all of them
+ *     (in the latter case the subfield is really just a synonym for the
+ *     parent).
+ *
+ *     'field' and 'predicate' are NULL.
+ *
+ *     Only ordinal fields (see below) may have subfields, and subfields are
+ *     always ordinal.
+ *
+ *   Predicates:
+ *
+ *     A predicate is an arbitrary Boolean expression that can be used in an
+ *     expression much like a 1-bit field.  'predicate' specifies the Boolean
+ *     expression, e.g. "ip4" might expand to "eth.type == 0x800".  The
+ *     epxression might refer to other predicates, e.g. "icmp4" might expand to
+ *     "ip4 && ip4.proto == 1".
+ *
+ *     'field' and 'parent' are NULL, and 'parent_ofs' is 0.
+ *
+ *     A predicate that refers to any nominal field or predicate (see below) is
+ *     nominal; other predicates have Boolean level of measurement.
+ *
+ *
+ * Level of Measurement
+ * ====================
+ *
+ * See http://en.wikipedia.org/wiki/Level_of_measurement for the statistical
+ * concept on which this classification is based.  There are three levels:
+ *
+ *   Ordinal:
+ *
+ *     In statistics, ordinal values can be ordered on a scale.  Here, we
+ *     consider a field (or subfield) to be ordinal if its bits can be examined
+ *     individually.  This is true for the OpenFlow fields that OpenFlow or
+ *     Open vSwitch makes "maskable".
+ *
+ *     OVN supports all the usual arithmetic relations (== != < <= > >=) on
+ *     ordinal fields and their subfields, because all of these can be
+ *     implemented as collections of bitwise tests.
+ *
+ *   Nominal:
+ *
+ *     In statistics, nominal values cannot be usefully compared except for
+ *     equality.  This is true of OpenFlow port numbers, Ethernet types, and IP
+ *     protocols are examples: all of these are just identifiers assigned
+ *     arbitrarily with no deeper meaning.  In OpenFlow and Open vSwitch, bits
+ *     in these fields generally aren't individually addressable.
+ *
+ *     OVN only supports arithmetic tests for equality on nominal fields,
+ *     because OpenFlow and Open vSwitch provide no way for a flow to
+ *     efficiently implement other comparisons on them.  (A test for inequality
+ *     can be sort of built out of two flows with different priorities, but OVN
+ *     matching expressions always generate flows with a single priority.)
+ *
+ *     String fields are always nominal.
+ *
+ *   Boolean:
+ *
+ *     A nominal field that has only two values, 0 and 1, is somewhat
+ *     exceptional, since it is easy to support both equality and inequality
+ *     tests on such a field: either one can be implemented as a test for 0 or
+ *     1.
+ *
+ *     Only predicates (see above) have a Boolean level of measurement.
+ *
+ *     This isn't a standard level of measurement.
+ *
+ *
+ * Prerequisites
+ * =============
+ *
+ * Any symbol can have prerequisites, which are specified as a string giving an
+ * additional expression that must be true whenever the symbol is referenced.
+ * For example, the "icmp4.type" symbol might have prerequisite "icmp4", which
+ * would cause an expression "icmp4.type == 0" to be interpreted as "icmp4.type
+ * == 0 && icmp4", which would in turn expand to "icmp4.type == 0 && eth.type
+ * == 0x800 && ip4.proto == 1" (assuming "icmp4" is a predicate defined as
+ * suggested under "Types" above).
+ *
+ *
+ * Crossproducting
+ * ===============
+ *
+ * Ordinarily OVN is willing to consider using any field as a dimension in the
+ * Open vSwitch "conjunctive match" extension (see ovs-ofctl(8)).  However,
+ * some fields can't actually be used that way because they are necessary as
+ * prerequisites.  For example, from an expression like "tcp.src == {1,2,3}
+ * && tcp.dst == {4,5,6}", OVN might naturally generate flows like this:
+ *
+ *     conj_id=1,actions=...
+ *     ip,actions=conjunction(1,1/3)
+ *     ip6,actions=conjunction(1,1/3)
+ *     tp_src=1,actions=conjunction(1,2/3)
+ *     tp_src=2,actions=conjunction(1,2/3)
+ *     tp_src=3,actions=conjunction(1,2/3)
+ *     tp_dst=4,actions=conjunction(1,3/3)
+ *     tp_dst=5,actions=conjunction(1,3/3)
+ *     tp_dst=6,actions=conjunction(1,3/3)
+ *
+ * but that's not valid because any flow that matches on tp_src or tp_dst must
+ * also match on either ip or ip6.  Thus, one would mark eth.type as "must
+ * crossproduct", to force generating flows like this:
+ *
+ *     conj_id=1,actions=...
+ *     ip,tp_src=1,actions=conjunction(1,1/2)
+ *     ip,tp_src=2,actions=conjunction(1,1/2)
+ *     ip,tp_src=3,actions=conjunction(1,1/2)
+ *     ip6,tp_src=1,actions=conjunction(1,1/2)
+ *     ip6,tp_src=2,actions=conjunction(1,1/2)
+ *     ip6,tp_src=3,actions=conjunction(1,1/2)
+ *     ip,tp_dst=4,actions=conjunction(1,2/2)
+ *     ip,tp_dst=5,actions=conjunction(1,2/2)
+ *     ip,tp_dst=6,actions=conjunction(1,2/2)
+ *     ip6,tp_dst=4,actions=conjunction(1,2/2)
+ *     ip6,tp_dst=5,actions=conjunction(1,2/2)
+ *     ip6,tp_dst=6,actions=conjunction(1,2/2)
+ *
+ * which are acceptable.
+ */
+struct expr_symbol {
+    char *name;
+    int width;
+
+    const struct mf_field *field;     /* Fields only, otherwise NULL. */
+    const struct expr_symbol *parent; /* Subfields only, otherwise NULL. */
+    int parent_ofs;                   /* Subfields only, otherwise 0. */
+    char *predicate;                  /* Predicates only, otherwise NULL. */
+
+    enum expr_level level;
+
+    char *prereqs;
+    bool must_crossproduct;
+    bool rw;
+};
+
+void expr_symbol_format(const struct expr_symbol *, struct ds *);
+
+/* A reference to a symbol or a subfield of a symbol.
+ *
+ * For string fields, ofs and n_bits are 0. */
+struct expr_field {
+    const struct expr_symbol *symbol; /* The symbol. */
+    int ofs;                          /* Starting bit offset. */
+    int n_bits;                       /* Number of bits. */
+};
+
+bool expr_field_parse(struct lexer *, const struct shash *symtab,
+                      struct expr_field *, struct expr **prereqsp);
+void expr_field_format(const struct expr_field *, struct ds *);
+
+struct expr_symbol *expr_symtab_add_field(struct shash *symtab,
+                                          const char *name, enum mf_field_id,
+                                          const char *prereqs,
+                                          bool must_crossproduct);
+struct expr_symbol *expr_symtab_add_subfield(struct shash *symtab,
+                                             const char *name,
+                                             const char *prereqs,
+                                             const char *subfield);
+struct expr_symbol *expr_symtab_add_string(struct shash *symtab,
+                                           const char *name, enum mf_field_id,
+                                           const char *prereqs);
+struct expr_symbol *expr_symtab_add_predicate(struct shash *symtab,
+                                              const char *name,
+                                              const char *expansion);
+void expr_symtab_destroy(struct shash *symtab);
+
+/* Expression type. */
+enum expr_type {
+    EXPR_T_CMP,                 /* Compare symbol with constant. */
+    EXPR_T_AND,                 /* Logical AND of 2 or more subexpressions. */
+    EXPR_T_OR,                  /* Logical OR of 2 or more subexpressions. */
+    EXPR_T_BOOLEAN,             /* True or false constant. */
+    EXPR_T_CONDITION,           /* Conditional to be evaluated in the
+                                 * controller during expr_simplify(),
+                                 * prior to constructing OpenFlow matches. */
+};
+
+/* Expression condition type. */
+enum expr_cond_type {
+    EXPR_COND_CHASSIS_RESIDENT, /* Check if specified logical port name is
+                                 * resident on the controller chassis. */
+};
+
+/* Relational operator. */
+enum expr_relop {
+    EXPR_R_EQ,                  /* == */
+    EXPR_R_NE,                  /* != */
+    EXPR_R_LT,                  /* < */
+    EXPR_R_LE,                  /* <= */
+    EXPR_R_GT,                  /* > */
+    EXPR_R_GE,                  /* >= */
+};
+const char *expr_relop_to_string(enum expr_relop);
+bool expr_relop_from_token(enum lex_type type, enum expr_relop *relop);
+
+/* An abstract syntax tree for a matching expression.
+ *
+ * The expression code maintains and relies on a few important invariants:
+ *
+ *     - An EXPR_T_AND or EXPR_T_OR node never has a child of the same type.
+ *       (Any such children could be merged into their parent.)  A node may
+ *       have grandchildren of its own type.
+ *
+ *       As a consequence, every nonterminal node at the same distance from the
+ *       root has the same type.
+ *
+ *     - EXPR_T_AND and EXPR_T_OR nodes must have at least two children.
+ *
+ *     - An EXPR_T_CMP node always has a nonzero mask, and never has a 1-bit
+ *       in its value in a position where the mask is a 0-bit.
+ *
+ * The expr_honors_invariants() function can check invariants. */
+struct expr {
+    struct ovs_list node;       /* In parent EXPR_T_AND or EXPR_T_OR if any. */
+    enum expr_type type;        /* Expression type. */
+
+    union {
+        /* EXPR_T_CMP.
+         *
+         * The symbol is on the left, e.g. "field < constant". */
+        struct {
+            const struct expr_symbol *symbol;
+            enum expr_relop relop;
+
+            union {
+                char *string;
+                struct {
+                    union mf_subvalue value;
+                    union mf_subvalue mask;
+                };
+            };
+        } cmp;
+
+        /* EXPR_T_AND, EXPR_T_OR. */
+        struct ovs_list andor;
+
+        /* EXPR_T_BOOLEAN. */
+        bool boolean;
+
+        /* EXPR_T_CONDITION. */
+        struct {
+            enum expr_cond_type type;
+            bool not;
+            /* XXX Should arguments for conditions be generic? */
+            char *string;
+        } cond;
+    };
+};
+
+struct expr *expr_create_boolean(bool b);
+struct expr *expr_create_andor(enum expr_type);
+struct expr *expr_combine(enum expr_type, struct expr *a, struct expr *b);
+
+static inline struct expr *
+expr_from_node(const struct ovs_list *node)
+{
+    return CONTAINER_OF(node, struct expr, node);
+}
+
+void expr_format(const struct expr *, struct ds *);
+void expr_print(const struct expr *);
+struct expr *expr_parse(struct lexer *, const struct shash *symtab,
+                        const struct shash *addr_sets);
+struct expr *expr_parse_string(const char *, const struct shash *symtab,
+                               const struct shash *addr_sets,
+                               char **errorp);
+
+struct expr *expr_clone(struct expr *);
+void expr_destroy(struct expr *);
+
+struct expr *expr_annotate(struct expr *, const struct shash *symtab,
+                           char **errorp);
+struct expr *expr_simplify(struct expr *,
+                           bool (*is_chassis_resident)(const void *c_aux,
+                                                       const char *port_name),
+                           const void *c_aux);
+struct expr *expr_normalize(struct expr *);
+
+bool expr_honors_invariants(const struct expr *);
+bool expr_is_simplified(const struct expr *);
+bool expr_is_normalized(const struct expr *);
+
+char *expr_parse_microflow(const char *, const struct shash *symtab,
+                           const struct shash *addr_sets,
+                           bool (*lookup_port)(const void *aux,
+                                               const char *port_name,
+                                               unsigned int *portp),
+                           const void *aux, struct flow *uflow)
+    OVS_WARN_UNUSED_RESULT;
+
+bool expr_evaluate(const struct expr *, const struct flow *uflow,
+                   bool (*lookup_port)(const void *aux, const char *port_name,
+                                       unsigned int *portp),
+                   const void *aux);
+
+/* Converting expressions to OpenFlow flows. */
+
+/* An OpenFlow match generated from a Boolean expression.  See
+ * expr_to_matches() for more information. */
+struct expr_match {
+    struct hmap_node hmap_node;
+    struct match match;
+    struct cls_conjunction *conjunctions;
+    size_t n, allocated;
+};
+
+uint32_t expr_to_matches(const struct expr *,
+                         bool (*lookup_port)(const void *aux,
+                                             const char *port_name,
+                                             unsigned int *portp),
+                         const void *aux,
+                         struct hmap *matches);
+void expr_matches_destroy(struct hmap *matches);
+void expr_matches_print(const struct hmap *matches, FILE *);
+
+/* Action parsing helper. */
+
+char *expr_type_check(const struct expr_field *, int n_bits, bool rw)
+    OVS_WARN_UNUSED_RESULT;
+struct mf_subfield expr_resolve_field(const struct expr_field *);
+
+/* Type of a "union expr_constant" or "struct expr_constant_set". */
+enum expr_constant_type {
+    EXPR_C_INTEGER,
+    EXPR_C_STRING
+};
+
+/* A string or integer constant (one must know which from context). */
+union expr_constant {
+    /* Integer constant.
+     *
+     * The width of a constant isn't always clear, e.g. if you write "1",
+     * there's no way to tell whether you mean for that to be a 1-bit constant
+     * or a 128-bit constant or somewhere in between. */
+    struct {
+        union mf_subvalue value;
+        union mf_subvalue mask; /* Only initialized if 'masked'. */
+        bool masked;
+
+        enum lex_format format; /* From the constant's lex_token. */
+    };
+
+    /* Null-terminated string constant. */
+    char *string;
+};
+
+bool expr_constant_parse(struct lexer *, const struct expr_field *,
+                         union expr_constant *);
+void expr_constant_format(const union expr_constant *,
+                          enum expr_constant_type, struct ds *);
+void expr_constant_destroy(const union expr_constant *,
+                           enum expr_constant_type);
+
+/* A collection of "union expr_constant"s of the same type. */
+struct expr_constant_set {
+    union expr_constant *values;  /* Constants. */
+    size_t n_values;              /* Number of constants. */
+    enum expr_constant_type type; /* Type of the constants. */
+    bool in_curlies;              /* Whether the constants were in {}. */
+};
+
+bool expr_constant_set_parse(struct lexer *, struct expr_constant_set *);
+void expr_constant_set_format(const struct expr_constant_set *, struct ds *);
+void expr_constant_set_destroy(struct expr_constant_set *cs);
+
+
+/* Address sets.
+ *
+ * Instead of referring to a set of value as:
+ *    {addr1, addr2, ..., addrN}
+ * You can register a set of values and refer to them as:
+ *    $name
+ * The address set entries should all have integer/masked-integer values.
+ * The values that don't qualify are ignored.
+ */
+
+void expr_addr_sets_add(struct shash *addr_sets, const char *name,
+                        const char * const *values, size_t n_values);
+void expr_addr_sets_remove(struct shash *addr_sets, const char *name);
+void expr_addr_sets_destroy(struct shash *addr_sets);
+
+#endif /* ovn/expr.h */
diff --git a/openflow/include/ovn/lex.h b/openflow/include/ovn/lex.h
new file mode 100644
index 0000000..afa4a23
--- /dev/null
+++ b/openflow/include/ovn/lex.h
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2015, 2016, 2017 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OVN_LEX_H
+#define OVN_LEX_H 1
+
+/* OVN lexical analyzer
+ * ====================
+ *
+ * This is a simple lexical analyzer (or tokenizer) for OVN match expressions
+ * and ACLs. */
+
+#include "openvswitch/meta-flow.h"
+
+struct ds;
+
+/* Token type. */
+enum lex_type {
+    LEX_T_END,                  /* end of input */
+
+    /* Tokens with auxiliary data. */
+    LEX_T_ID,                   /* foo */
+    LEX_T_STRING,               /* "foo" */
+    LEX_T_INTEGER,              /* 12345 or 1.2.3.4 or ::1 or 01:02:03:04:05 */
+    LEX_T_MASKED_INTEGER,       /* 12345/10 or 1.2.0.0/16 or ::2/127 or... */
+    LEX_T_MACRO,                /* $NAME */
+    LEX_T_ERROR,                /* invalid input */
+
+    /* Bare tokens. */
+    LEX_T_LPAREN,               /* ( */
+    LEX_T_RPAREN,               /* ) */
+    LEX_T_LCURLY,               /* { */
+    LEX_T_RCURLY,               /* } */
+    LEX_T_LSQUARE,              /* [ */
+    LEX_T_RSQUARE,              /* ] */
+    LEX_T_EQ,                   /* == */
+    LEX_T_NE,                   /* != */
+    LEX_T_LT,                   /* < */
+    LEX_T_LE,                   /* <= */
+    LEX_T_GT,                   /* > */
+    LEX_T_GE,                   /* >= */
+    LEX_T_LOG_NOT,              /* ! */
+    LEX_T_LOG_AND,              /* && */
+    LEX_T_LOG_OR,               /* || */
+    LEX_T_ELLIPSIS,             /* .. */
+    LEX_T_COMMA,                /* , */
+    LEX_T_SEMICOLON,            /* ; */
+    LEX_T_EQUALS,               /* = */
+    LEX_T_EXCHANGE,             /* <-> */
+    LEX_T_DECREMENT,            /* -- */
+    LEX_T_COLON,                /* : */
+};
+
+/* Subtype for LEX_T_INTEGER and LEX_T_MASKED_INTEGER tokens.
+ *
+ * These do not change the semantics of a token; instead, they determine the
+ * format used when a token is serialized back to a text form.  That's
+ * important because 3232268289 is meaningless to a human whereas 192.168.128.1
+ * has some actual significance. */
+enum lex_format {
+    LEX_F_DECIMAL,
+    LEX_F_HEXADECIMAL,
+    LEX_F_IPV4,
+    LEX_F_IPV6,
+    LEX_F_ETHERNET,
+};
+const char *lex_format_to_string(enum lex_format);
+
+/* A token. */
+struct lex_token {
+    /* One of LEX_*. */
+    enum lex_type type;
+
+    /* Meaningful for LEX_T_ID, LEX_T_STRING, LEX_T_ERROR, LEX_T_MACRO only.
+     * For these token types, 's' may point to 'buffer'; otherwise, it points
+     * to malloc()ed memory owned by the token.
+     *
+     * Must be NULL for other token types.
+     *
+     * For LEX_T_MACRO, 's' does not include the leading $. */
+    char *s;
+
+    /* LEX_T_INTEGER, LEX_T_MASKED_INTEGER only. */
+    enum lex_format format;
+
+    union {
+        /* LEX_T_INTEGER, LEX_T_MASKED_INTEGER only. */
+        struct {
+            union mf_subvalue value; /* LEX_T_INTEGER, LEX_T_MASKED_INTEGER. */
+            union mf_subvalue mask;  /* LEX_T_MASKED_INTEGER only. */
+        };
+
+        /* LEX_T_ID, LEX_T_STRING, LEX_T_ERROR, LEX_T_MACRO only. */
+        char buffer[256];
+    };
+};
+
+void lex_token_init(struct lex_token *);
+void lex_token_destroy(struct lex_token *);
+void lex_token_swap(struct lex_token *, struct lex_token *);
+void lex_token_strcpy(struct lex_token *, const char *s, size_t length);
+void lex_token_strset(struct lex_token *, char *s);
+void lex_token_vsprintf(struct lex_token *, const char *format, va_list args);
+
+void lex_token_format(const struct lex_token *, struct ds *);
+const char *lex_token_parse(struct lex_token *, const char *input,
+                            const char **startp);
+
+/* A lexical analyzer. */
+struct lexer {
+    const char *input;          /* Remaining input (not owned by lexer). */
+    const char *start;          /* Start of current token in 'input'. */
+    struct lex_token token;     /* Current token (owned by lexer). */
+    char *error;                /* Error message, if any (owned by lexer). */
+};
+
+void lexer_init(struct lexer *, const char *input);
+void lexer_destroy(struct lexer *);
+
+enum lex_type lexer_get(struct lexer *);
+enum lex_type lexer_lookahead(const struct lexer *);
+bool lexer_match(struct lexer *, enum lex_type);
+bool lexer_force_match(struct lexer *, enum lex_type);
+bool lexer_match_id(struct lexer *, const char *id);
+bool lexer_is_int(const struct lexer *);
+bool lexer_get_int(struct lexer *, int *value);
+bool lexer_force_int(struct lexer *, int *value);
+
+bool lexer_force_end(struct lexer *);
+
+void lexer_error(struct lexer *, const char *message, ...)
+    OVS_PRINTF_FORMAT(2, 3);
+void lexer_syntax_error(struct lexer *, const char *message, ...)
+    OVS_PRINTF_FORMAT(2, 3);
+
+char *lexer_steal_error(struct lexer *);
+
+#endif /* ovn/lex.h */
diff --git a/openflow/usr/include/pcap.h b/openflow/include/pcap.h
similarity index 100%
rename from openflow/usr/include/pcap.h
rename to openflow/include/pcap.h
diff --git a/openflow/usr/include/pcap/bluetooth.h b/openflow/include/pcap/bluetooth.h
similarity index 100%
rename from openflow/usr/include/pcap/bluetooth.h
rename to openflow/include/pcap/bluetooth.h
diff --git a/openflow/usr/include/pcap/bpf.h b/openflow/include/pcap/bpf.h
similarity index 100%
rename from openflow/usr/include/pcap/bpf.h
rename to openflow/include/pcap/bpf.h
diff --git a/openflow/usr/include/pcap/ipnet.h b/openflow/include/pcap/ipnet.h
similarity index 100%
rename from openflow/usr/include/pcap/ipnet.h
rename to openflow/include/pcap/ipnet.h
diff --git a/openflow/usr/include/pcap/namedb.h b/openflow/include/pcap/namedb.h
similarity index 100%
rename from openflow/usr/include/pcap/namedb.h
rename to openflow/include/pcap/namedb.h
diff --git a/openflow/usr/include/pcap/nflog.h b/openflow/include/pcap/nflog.h
similarity index 100%
rename from openflow/usr/include/pcap/nflog.h
rename to openflow/include/pcap/nflog.h
diff --git a/openflow/usr/include/pcap/pcap.h b/openflow/include/pcap/pcap.h
similarity index 100%
rename from openflow/usr/include/pcap/pcap.h
rename to openflow/include/pcap/pcap.h
diff --git a/openflow/usr/include/pcap/sll.h b/openflow/include/pcap/sll.h
similarity index 100%
rename from openflow/usr/include/pcap/sll.h
rename to openflow/include/pcap/sll.h
diff --git a/openflow/usr/include/pcap/usb.h b/openflow/include/pcap/usb.h
similarity index 100%
rename from openflow/usr/include/pcap/usb.h
rename to openflow/include/pcap/usb.h
diff --git a/openflow/usr/include/pcap/vlan.h b/openflow/include/pcap/vlan.h
similarity index 100%
rename from openflow/usr/include/pcap/vlan.h
rename to openflow/include/pcap/vlan.h
diff --git a/openflow/include/python3.8/Python-ast.h b/openflow/include/python3.8/Python-ast.h
new file mode 100644
index 0000000..5fe4f2b
--- /dev/null
+++ b/openflow/include/python3.8/Python-ast.h
@@ -0,0 +1,715 @@
+/* File automatically generated by Parser/asdl_c.py. */
+
+#ifndef Py_PYTHON_AST_H
+#define Py_PYTHON_AST_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "asdl.h"
+
+#undef Yield   /* undefine macro conflicting with <winbase.h> */
+
+typedef struct _mod *mod_ty;
+
+typedef struct _stmt *stmt_ty;
+
+typedef struct _expr *expr_ty;
+
+typedef enum _expr_context { Load=1, Store=2, Del=3, AugLoad=4, AugStore=5,
+                             Param=6 } expr_context_ty;
+
+typedef struct _slice *slice_ty;
+
+typedef enum _boolop { And=1, Or=2 } boolop_ty;
+
+typedef enum _operator { Add=1, Sub=2, Mult=3, MatMult=4, Div=5, Mod=6, Pow=7,
+                         LShift=8, RShift=9, BitOr=10, BitXor=11, BitAnd=12,
+                         FloorDiv=13 } operator_ty;
+
+typedef enum _unaryop { Invert=1, Not=2, UAdd=3, USub=4 } unaryop_ty;
+
+typedef enum _cmpop { Eq=1, NotEq=2, Lt=3, LtE=4, Gt=5, GtE=6, Is=7, IsNot=8,
+                      In=9, NotIn=10 } cmpop_ty;
+
+typedef struct _comprehension *comprehension_ty;
+
+typedef struct _excepthandler *excepthandler_ty;
+
+typedef struct _arguments *arguments_ty;
+
+typedef struct _arg *arg_ty;
+
+typedef struct _keyword *keyword_ty;
+
+typedef struct _alias *alias_ty;
+
+typedef struct _withitem *withitem_ty;
+
+typedef struct _type_ignore *type_ignore_ty;
+
+
+enum _mod_kind {Module_kind=1, Interactive_kind=2, Expression_kind=3,
+                 FunctionType_kind=4, Suite_kind=5};
+struct _mod {
+    enum _mod_kind kind;
+    union {
+        struct {
+            asdl_seq *body;
+            asdl_seq *type_ignores;
+        } Module;
+
+        struct {
+            asdl_seq *body;
+        } Interactive;
+
+        struct {
+            expr_ty body;
+        } Expression;
+
+        struct {
+            asdl_seq *argtypes;
+            expr_ty returns;
+        } FunctionType;
+
+        struct {
+            asdl_seq *body;
+        } Suite;
+
+    } v;
+};
+
+enum _stmt_kind {FunctionDef_kind=1, AsyncFunctionDef_kind=2, ClassDef_kind=3,
+                  Return_kind=4, Delete_kind=5, Assign_kind=6,
+                  AugAssign_kind=7, AnnAssign_kind=8, For_kind=9,
+                  AsyncFor_kind=10, While_kind=11, If_kind=12, With_kind=13,
+                  AsyncWith_kind=14, Raise_kind=15, Try_kind=16,
+                  Assert_kind=17, Import_kind=18, ImportFrom_kind=19,
+                  Global_kind=20, Nonlocal_kind=21, Expr_kind=22, Pass_kind=23,
+                  Break_kind=24, Continue_kind=25};
+struct _stmt {
+    enum _stmt_kind kind;
+    union {
+        struct {
+            identifier name;
+            arguments_ty args;
+            asdl_seq *body;
+            asdl_seq *decorator_list;
+            expr_ty returns;
+            string type_comment;
+        } FunctionDef;
+
+        struct {
+            identifier name;
+            arguments_ty args;
+            asdl_seq *body;
+            asdl_seq *decorator_list;
+            expr_ty returns;
+            string type_comment;
+        } AsyncFunctionDef;
+
+        struct {
+            identifier name;
+            asdl_seq *bases;
+            asdl_seq *keywords;
+            asdl_seq *body;
+            asdl_seq *decorator_list;
+        } ClassDef;
+
+        struct {
+            expr_ty value;
+        } Return;
+
+        struct {
+            asdl_seq *targets;
+        } Delete;
+
+        struct {
+            asdl_seq *targets;
+            expr_ty value;
+            string type_comment;
+        } Assign;
+
+        struct {
+            expr_ty target;
+            operator_ty op;
+            expr_ty value;
+        } AugAssign;
+
+        struct {
+            expr_ty target;
+            expr_ty annotation;
+            expr_ty value;
+            int simple;
+        } AnnAssign;
+
+        struct {
+            expr_ty target;
+            expr_ty iter;
+            asdl_seq *body;
+            asdl_seq *orelse;
+            string type_comment;
+        } For;
+
+        struct {
+            expr_ty target;
+            expr_ty iter;
+            asdl_seq *body;
+            asdl_seq *orelse;
+            string type_comment;
+        } AsyncFor;
+
+        struct {
+            expr_ty test;
+            asdl_seq *body;
+            asdl_seq *orelse;
+        } While;
+
+        struct {
+            expr_ty test;
+            asdl_seq *body;
+            asdl_seq *orelse;
+        } If;
+
+        struct {
+            asdl_seq *items;
+            asdl_seq *body;
+            string type_comment;
+        } With;
+
+        struct {
+            asdl_seq *items;
+            asdl_seq *body;
+            string type_comment;
+        } AsyncWith;
+
+        struct {
+            expr_ty exc;
+            expr_ty cause;
+        } Raise;
+
+        struct {
+            asdl_seq *body;
+            asdl_seq *handlers;
+            asdl_seq *orelse;
+            asdl_seq *finalbody;
+        } Try;
+
+        struct {
+            expr_ty test;
+            expr_ty msg;
+        } Assert;
+
+        struct {
+            asdl_seq *names;
+        } Import;
+
+        struct {
+            identifier module;
+            asdl_seq *names;
+            int level;
+        } ImportFrom;
+
+        struct {
+            asdl_seq *names;
+        } Global;
+
+        struct {
+            asdl_seq *names;
+        } Nonlocal;
+
+        struct {
+            expr_ty value;
+        } Expr;
+
+    } v;
+    int lineno;
+    int col_offset;
+    int end_lineno;
+    int end_col_offset;
+};
+
+enum _expr_kind {BoolOp_kind=1, NamedExpr_kind=2, BinOp_kind=3, UnaryOp_kind=4,
+                  Lambda_kind=5, IfExp_kind=6, Dict_kind=7, Set_kind=8,
+                  ListComp_kind=9, SetComp_kind=10, DictComp_kind=11,
+                  GeneratorExp_kind=12, Await_kind=13, Yield_kind=14,
+                  YieldFrom_kind=15, Compare_kind=16, Call_kind=17,
+                  FormattedValue_kind=18, JoinedStr_kind=19, Constant_kind=20,
+                  Attribute_kind=21, Subscript_kind=22, Starred_kind=23,
+                  Name_kind=24, List_kind=25, Tuple_kind=26};
+struct _expr {
+    enum _expr_kind kind;
+    union {
+        struct {
+            boolop_ty op;
+            asdl_seq *values;
+        } BoolOp;
+
+        struct {
+            expr_ty target;
+            expr_ty value;
+        } NamedExpr;
+
+        struct {
+            expr_ty left;
+            operator_ty op;
+            expr_ty right;
+        } BinOp;
+
+        struct {
+            unaryop_ty op;
+            expr_ty operand;
+        } UnaryOp;
+
+        struct {
+            arguments_ty args;
+            expr_ty body;
+        } Lambda;
+
+        struct {
+            expr_ty test;
+            expr_ty body;
+            expr_ty orelse;
+        } IfExp;
+
+        struct {
+            asdl_seq *keys;
+            asdl_seq *values;
+        } Dict;
+
+        struct {
+            asdl_seq *elts;
+        } Set;
+
+        struct {
+            expr_ty elt;
+            asdl_seq *generators;
+        } ListComp;
+
+        struct {
+            expr_ty elt;
+            asdl_seq *generators;
+        } SetComp;
+
+        struct {
+            expr_ty key;
+            expr_ty value;
+            asdl_seq *generators;
+        } DictComp;
+
+        struct {
+            expr_ty elt;
+            asdl_seq *generators;
+        } GeneratorExp;
+
+        struct {
+            expr_ty value;
+        } Await;
+
+        struct {
+            expr_ty value;
+        } Yield;
+
+        struct {
+            expr_ty value;
+        } YieldFrom;
+
+        struct {
+            expr_ty left;
+            asdl_int_seq *ops;
+            asdl_seq *comparators;
+        } Compare;
+
+        struct {
+            expr_ty func;
+            asdl_seq *args;
+            asdl_seq *keywords;
+        } Call;
+
+        struct {
+            expr_ty value;
+            int conversion;
+            expr_ty format_spec;
+        } FormattedValue;
+
+        struct {
+            asdl_seq *values;
+        } JoinedStr;
+
+        struct {
+            constant value;
+            string kind;
+        } Constant;
+
+        struct {
+            expr_ty value;
+            identifier attr;
+            expr_context_ty ctx;
+        } Attribute;
+
+        struct {
+            expr_ty value;
+            slice_ty slice;
+            expr_context_ty ctx;
+        } Subscript;
+
+        struct {
+            expr_ty value;
+            expr_context_ty ctx;
+        } Starred;
+
+        struct {
+            identifier id;
+            expr_context_ty ctx;
+        } Name;
+
+        struct {
+            asdl_seq *elts;
+            expr_context_ty ctx;
+        } List;
+
+        struct {
+            asdl_seq *elts;
+            expr_context_ty ctx;
+        } Tuple;
+
+    } v;
+    int lineno;
+    int col_offset;
+    int end_lineno;
+    int end_col_offset;
+};
+
+enum _slice_kind {Slice_kind=1, ExtSlice_kind=2, Index_kind=3};
+struct _slice {
+    enum _slice_kind kind;
+    union {
+        struct {
+            expr_ty lower;
+            expr_ty upper;
+            expr_ty step;
+        } Slice;
+
+        struct {
+            asdl_seq *dims;
+        } ExtSlice;
+
+        struct {
+            expr_ty value;
+        } Index;
+
+    } v;
+};
+
+struct _comprehension {
+    expr_ty target;
+    expr_ty iter;
+    asdl_seq *ifs;
+    int is_async;
+};
+
+enum _excepthandler_kind {ExceptHandler_kind=1};
+struct _excepthandler {
+    enum _excepthandler_kind kind;
+    union {
+        struct {
+            expr_ty type;
+            identifier name;
+            asdl_seq *body;
+        } ExceptHandler;
+
+    } v;
+    int lineno;
+    int col_offset;
+    int end_lineno;
+    int end_col_offset;
+};
+
+struct _arguments {
+    asdl_seq *posonlyargs;
+    asdl_seq *args;
+    arg_ty vararg;
+    asdl_seq *kwonlyargs;
+    asdl_seq *kw_defaults;
+    arg_ty kwarg;
+    asdl_seq *defaults;
+};
+
+struct _arg {
+    identifier arg;
+    expr_ty annotation;
+    string type_comment;
+    int lineno;
+    int col_offset;
+    int end_lineno;
+    int end_col_offset;
+};
+
+struct _keyword {
+    identifier arg;
+    expr_ty value;
+};
+
+struct _alias {
+    identifier name;
+    identifier asname;
+};
+
+struct _withitem {
+    expr_ty context_expr;
+    expr_ty optional_vars;
+};
+
+enum _type_ignore_kind {TypeIgnore_kind=1};
+struct _type_ignore {
+    enum _type_ignore_kind kind;
+    union {
+        struct {
+            int lineno;
+            string tag;
+        } TypeIgnore;
+
+    } v;
+};
+
+
+// Note: these macros affect function definitions, not only call sites.
+#define Module(a0, a1, a2) _Py_Module(a0, a1, a2)
+mod_ty _Py_Module(asdl_seq * body, asdl_seq * type_ignores, PyArena *arena);
+#define Interactive(a0, a1) _Py_Interactive(a0, a1)
+mod_ty _Py_Interactive(asdl_seq * body, PyArena *arena);
+#define Expression(a0, a1) _Py_Expression(a0, a1)
+mod_ty _Py_Expression(expr_ty body, PyArena *arena);
+#define FunctionType(a0, a1, a2) _Py_FunctionType(a0, a1, a2)
+mod_ty _Py_FunctionType(asdl_seq * argtypes, expr_ty returns, PyArena *arena);
+#define Suite(a0, a1) _Py_Suite(a0, a1)
+mod_ty _Py_Suite(asdl_seq * body, PyArena *arena);
+#define FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)
+stmt_ty _Py_FunctionDef(identifier name, arguments_ty args, asdl_seq * body,
+                        asdl_seq * decorator_list, expr_ty returns, string
+                        type_comment, int lineno, int col_offset, int
+                        end_lineno, int end_col_offset, PyArena *arena);
+#define AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) _Py_AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)
+stmt_ty _Py_AsyncFunctionDef(identifier name, arguments_ty args, asdl_seq *
+                             body, asdl_seq * decorator_list, expr_ty returns,
+                             string type_comment, int lineno, int col_offset,
+                             int end_lineno, int end_col_offset, PyArena
+                             *arena);
+#define ClassDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9) _Py_ClassDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)
+stmt_ty _Py_ClassDef(identifier name, asdl_seq * bases, asdl_seq * keywords,
+                     asdl_seq * body, asdl_seq * decorator_list, int lineno,
+                     int col_offset, int end_lineno, int end_col_offset,
+                     PyArena *arena);
+#define Return(a0, a1, a2, a3, a4, a5) _Py_Return(a0, a1, a2, a3, a4, a5)
+stmt_ty _Py_Return(expr_ty value, int lineno, int col_offset, int end_lineno,
+                   int end_col_offset, PyArena *arena);
+#define Delete(a0, a1, a2, a3, a4, a5) _Py_Delete(a0, a1, a2, a3, a4, a5)
+stmt_ty _Py_Delete(asdl_seq * targets, int lineno, int col_offset, int
+                   end_lineno, int end_col_offset, PyArena *arena);
+#define Assign(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Assign(a0, a1, a2, a3, a4, a5, a6, a7)
+stmt_ty _Py_Assign(asdl_seq * targets, expr_ty value, string type_comment, int
+                   lineno, int col_offset, int end_lineno, int end_col_offset,
+                   PyArena *arena);
+#define AugAssign(a0, a1, a2, a3, a4, a5, a6, a7) _Py_AugAssign(a0, a1, a2, a3, a4, a5, a6, a7)
+stmt_ty _Py_AugAssign(expr_ty target, operator_ty op, expr_ty value, int
+                      lineno, int col_offset, int end_lineno, int
+                      end_col_offset, PyArena *arena);
+#define AnnAssign(a0, a1, a2, a3, a4, a5, a6, a7, a8) _Py_AnnAssign(a0, a1, a2, a3, a4, a5, a6, a7, a8)
+stmt_ty _Py_AnnAssign(expr_ty target, expr_ty annotation, expr_ty value, int
+                      simple, int lineno, int col_offset, int end_lineno, int
+                      end_col_offset, PyArena *arena);
+#define For(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9) _Py_For(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)
+stmt_ty _Py_For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq *
+                orelse, string type_comment, int lineno, int col_offset, int
+                end_lineno, int end_col_offset, PyArena *arena);
+#define AsyncFor(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9) _Py_AsyncFor(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)
+stmt_ty _Py_AsyncFor(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq *
+                     orelse, string type_comment, int lineno, int col_offset,
+                     int end_lineno, int end_col_offset, PyArena *arena);
+#define While(a0, a1, a2, a3, a4, a5, a6, a7) _Py_While(a0, a1, a2, a3, a4, a5, a6, a7)
+stmt_ty _Py_While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
+                  int col_offset, int end_lineno, int end_col_offset, PyArena
+                  *arena);
+#define If(a0, a1, a2, a3, a4, a5, a6, a7) _Py_If(a0, a1, a2, a3, a4, a5, a6, a7)
+stmt_ty _Py_If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
+               int col_offset, int end_lineno, int end_col_offset, PyArena
+               *arena);
+#define With(a0, a1, a2, a3, a4, a5, a6, a7) _Py_With(a0, a1, a2, a3, a4, a5, a6, a7)
+stmt_ty _Py_With(asdl_seq * items, asdl_seq * body, string type_comment, int
+                 lineno, int col_offset, int end_lineno, int end_col_offset,
+                 PyArena *arena);
+#define AsyncWith(a0, a1, a2, a3, a4, a5, a6, a7) _Py_AsyncWith(a0, a1, a2, a3, a4, a5, a6, a7)
+stmt_ty _Py_AsyncWith(asdl_seq * items, asdl_seq * body, string type_comment,
+                      int lineno, int col_offset, int end_lineno, int
+                      end_col_offset, PyArena *arena);
+#define Raise(a0, a1, a2, a3, a4, a5, a6) _Py_Raise(a0, a1, a2, a3, a4, a5, a6)
+stmt_ty _Py_Raise(expr_ty exc, expr_ty cause, int lineno, int col_offset, int
+                  end_lineno, int end_col_offset, PyArena *arena);
+#define Try(a0, a1, a2, a3, a4, a5, a6, a7, a8) _Py_Try(a0, a1, a2, a3, a4, a5, a6, a7, a8)
+stmt_ty _Py_Try(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse,
+                asdl_seq * finalbody, int lineno, int col_offset, int
+                end_lineno, int end_col_offset, PyArena *arena);
+#define Assert(a0, a1, a2, a3, a4, a5, a6) _Py_Assert(a0, a1, a2, a3, a4, a5, a6)
+stmt_ty _Py_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset, int
+                   end_lineno, int end_col_offset, PyArena *arena);
+#define Import(a0, a1, a2, a3, a4, a5) _Py_Import(a0, a1, a2, a3, a4, a5)
+stmt_ty _Py_Import(asdl_seq * names, int lineno, int col_offset, int
+                   end_lineno, int end_col_offset, PyArena *arena);
+#define ImportFrom(a0, a1, a2, a3, a4, a5, a6, a7) _Py_ImportFrom(a0, a1, a2, a3, a4, a5, a6, a7)
+stmt_ty _Py_ImportFrom(identifier module, asdl_seq * names, int level, int
+                       lineno, int col_offset, int end_lineno, int
+                       end_col_offset, PyArena *arena);
+#define Global(a0, a1, a2, a3, a4, a5) _Py_Global(a0, a1, a2, a3, a4, a5)
+stmt_ty _Py_Global(asdl_seq * names, int lineno, int col_offset, int
+                   end_lineno, int end_col_offset, PyArena *arena);
+#define Nonlocal(a0, a1, a2, a3, a4, a5) _Py_Nonlocal(a0, a1, a2, a3, a4, a5)
+stmt_ty _Py_Nonlocal(asdl_seq * names, int lineno, int col_offset, int
+                     end_lineno, int end_col_offset, PyArena *arena);
+#define Expr(a0, a1, a2, a3, a4, a5) _Py_Expr(a0, a1, a2, a3, a4, a5)
+stmt_ty _Py_Expr(expr_ty value, int lineno, int col_offset, int end_lineno, int
+                 end_col_offset, PyArena *arena);
+#define Pass(a0, a1, a2, a3, a4) _Py_Pass(a0, a1, a2, a3, a4)
+stmt_ty _Py_Pass(int lineno, int col_offset, int end_lineno, int
+                 end_col_offset, PyArena *arena);
+#define Break(a0, a1, a2, a3, a4) _Py_Break(a0, a1, a2, a3, a4)
+stmt_ty _Py_Break(int lineno, int col_offset, int end_lineno, int
+                  end_col_offset, PyArena *arena);
+#define Continue(a0, a1, a2, a3, a4) _Py_Continue(a0, a1, a2, a3, a4)
+stmt_ty _Py_Continue(int lineno, int col_offset, int end_lineno, int
+                     end_col_offset, PyArena *arena);
+#define BoolOp(a0, a1, a2, a3, a4, a5, a6) _Py_BoolOp(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset,
+                   int end_lineno, int end_col_offset, PyArena *arena);
+#define NamedExpr(a0, a1, a2, a3, a4, a5, a6) _Py_NamedExpr(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_NamedExpr(expr_ty target, expr_ty value, int lineno, int
+                      col_offset, int end_lineno, int end_col_offset, PyArena
+                      *arena);
+#define BinOp(a0, a1, a2, a3, a4, a5, a6, a7) _Py_BinOp(a0, a1, a2, a3, a4, a5, a6, a7)
+expr_ty _Py_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int
+                  col_offset, int end_lineno, int end_col_offset, PyArena
+                  *arena);
+#define UnaryOp(a0, a1, a2, a3, a4, a5, a6) _Py_UnaryOp(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset,
+                    int end_lineno, int end_col_offset, PyArena *arena);
+#define Lambda(a0, a1, a2, a3, a4, a5, a6) _Py_Lambda(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset,
+                   int end_lineno, int end_col_offset, PyArena *arena);
+#define IfExp(a0, a1, a2, a3, a4, a5, a6, a7) _Py_IfExp(a0, a1, a2, a3, a4, a5, a6, a7)
+expr_ty _Py_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int
+                  col_offset, int end_lineno, int end_col_offset, PyArena
+                  *arena);
+#define Dict(a0, a1, a2, a3, a4, a5, a6) _Py_Dict(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_Dict(asdl_seq * keys, asdl_seq * values, int lineno, int
+                 col_offset, int end_lineno, int end_col_offset, PyArena
+                 *arena);
+#define Set(a0, a1, a2, a3, a4, a5) _Py_Set(a0, a1, a2, a3, a4, a5)
+expr_ty _Py_Set(asdl_seq * elts, int lineno, int col_offset, int end_lineno,
+                int end_col_offset, PyArena *arena);
+#define ListComp(a0, a1, a2, a3, a4, a5, a6) _Py_ListComp(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_ListComp(expr_ty elt, asdl_seq * generators, int lineno, int
+                     col_offset, int end_lineno, int end_col_offset, PyArena
+                     *arena);
+#define SetComp(a0, a1, a2, a3, a4, a5, a6) _Py_SetComp(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_SetComp(expr_ty elt, asdl_seq * generators, int lineno, int
+                    col_offset, int end_lineno, int end_col_offset, PyArena
+                    *arena);
+#define DictComp(a0, a1, a2, a3, a4, a5, a6, a7) _Py_DictComp(a0, a1, a2, a3, a4, a5, a6, a7)
+expr_ty _Py_DictComp(expr_ty key, expr_ty value, asdl_seq * generators, int
+                     lineno, int col_offset, int end_lineno, int
+                     end_col_offset, PyArena *arena);
+#define GeneratorExp(a0, a1, a2, a3, a4, a5, a6) _Py_GeneratorExp(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int
+                         col_offset, int end_lineno, int end_col_offset,
+                         PyArena *arena);
+#define Await(a0, a1, a2, a3, a4, a5) _Py_Await(a0, a1, a2, a3, a4, a5)
+expr_ty _Py_Await(expr_ty value, int lineno, int col_offset, int end_lineno,
+                  int end_col_offset, PyArena *arena);
+#define Yield(a0, a1, a2, a3, a4, a5) _Py_Yield(a0, a1, a2, a3, a4, a5)
+expr_ty _Py_Yield(expr_ty value, int lineno, int col_offset, int end_lineno,
+                  int end_col_offset, PyArena *arena);
+#define YieldFrom(a0, a1, a2, a3, a4, a5) _Py_YieldFrom(a0, a1, a2, a3, a4, a5)
+expr_ty _Py_YieldFrom(expr_ty value, int lineno, int col_offset, int
+                      end_lineno, int end_col_offset, PyArena *arena);
+#define Compare(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Compare(a0, a1, a2, a3, a4, a5, a6, a7)
+expr_ty _Py_Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators,
+                    int lineno, int col_offset, int end_lineno, int
+                    end_col_offset, PyArena *arena);
+#define Call(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Call(a0, a1, a2, a3, a4, a5, a6, a7)
+expr_ty _Py_Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, int
+                 lineno, int col_offset, int end_lineno, int end_col_offset,
+                 PyArena *arena);
+#define FormattedValue(a0, a1, a2, a3, a4, a5, a6, a7) _Py_FormattedValue(a0, a1, a2, a3, a4, a5, a6, a7)
+expr_ty _Py_FormattedValue(expr_ty value, int conversion, expr_ty format_spec,
+                           int lineno, int col_offset, int end_lineno, int
+                           end_col_offset, PyArena *arena);
+#define JoinedStr(a0, a1, a2, a3, a4, a5) _Py_JoinedStr(a0, a1, a2, a3, a4, a5)
+expr_ty _Py_JoinedStr(asdl_seq * values, int lineno, int col_offset, int
+                      end_lineno, int end_col_offset, PyArena *arena);
+#define Constant(a0, a1, a2, a3, a4, a5, a6) _Py_Constant(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_Constant(constant value, string kind, int lineno, int col_offset,
+                     int end_lineno, int end_col_offset, PyArena *arena);
+#define Attribute(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Attribute(a0, a1, a2, a3, a4, a5, a6, a7)
+expr_ty _Py_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int
+                      lineno, int col_offset, int end_lineno, int
+                      end_col_offset, PyArena *arena);
+#define Subscript(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Subscript(a0, a1, a2, a3, a4, a5, a6, a7)
+expr_ty _Py_Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int
+                      lineno, int col_offset, int end_lineno, int
+                      end_col_offset, PyArena *arena);
+#define Starred(a0, a1, a2, a3, a4, a5, a6) _Py_Starred(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_Starred(expr_ty value, expr_context_ty ctx, int lineno, int
+                    col_offset, int end_lineno, int end_col_offset, PyArena
+                    *arena);
+#define Name(a0, a1, a2, a3, a4, a5, a6) _Py_Name(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_Name(identifier id, expr_context_ty ctx, int lineno, int
+                 col_offset, int end_lineno, int end_col_offset, PyArena
+                 *arena);
+#define List(a0, a1, a2, a3, a4, a5, a6) _Py_List(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_List(asdl_seq * elts, expr_context_ty ctx, int lineno, int
+                 col_offset, int end_lineno, int end_col_offset, PyArena
+                 *arena);
+#define Tuple(a0, a1, a2, a3, a4, a5, a6) _Py_Tuple(a0, a1, a2, a3, a4, a5, a6)
+expr_ty _Py_Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int
+                  col_offset, int end_lineno, int end_col_offset, PyArena
+                  *arena);
+#define Slice(a0, a1, a2, a3) _Py_Slice(a0, a1, a2, a3)
+slice_ty _Py_Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena);
+#define ExtSlice(a0, a1) _Py_ExtSlice(a0, a1)
+slice_ty _Py_ExtSlice(asdl_seq * dims, PyArena *arena);
+#define Index(a0, a1) _Py_Index(a0, a1)
+slice_ty _Py_Index(expr_ty value, PyArena *arena);
+#define comprehension(a0, a1, a2, a3, a4) _Py_comprehension(a0, a1, a2, a3, a4)
+comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq *
+                                   ifs, int is_async, PyArena *arena);
+#define ExceptHandler(a0, a1, a2, a3, a4, a5, a6, a7) _Py_ExceptHandler(a0, a1, a2, a3, a4, a5, a6, a7)
+excepthandler_ty _Py_ExceptHandler(expr_ty type, identifier name, asdl_seq *
+                                   body, int lineno, int col_offset, int
+                                   end_lineno, int end_col_offset, PyArena
+                                   *arena);
+#define arguments(a0, a1, a2, a3, a4, a5, a6, a7) _Py_arguments(a0, a1, a2, a3, a4, a5, a6, a7)
+arguments_ty _Py_arguments(asdl_seq * posonlyargs, asdl_seq * args, arg_ty
+                           vararg, asdl_seq * kwonlyargs, asdl_seq *
+                           kw_defaults, arg_ty kwarg, asdl_seq * defaults,
+                           PyArena *arena);
+#define arg(a0, a1, a2, a3, a4, a5, a6, a7) _Py_arg(a0, a1, a2, a3, a4, a5, a6, a7)
+arg_ty _Py_arg(identifier arg, expr_ty annotation, string type_comment, int
+               lineno, int col_offset, int end_lineno, int end_col_offset,
+               PyArena *arena);
+#define keyword(a0, a1, a2) _Py_keyword(a0, a1, a2)
+keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena);
+#define alias(a0, a1, a2) _Py_alias(a0, a1, a2)
+alias_ty _Py_alias(identifier name, identifier asname, PyArena *arena);
+#define withitem(a0, a1, a2) _Py_withitem(a0, a1, a2)
+withitem_ty _Py_withitem(expr_ty context_expr, expr_ty optional_vars, PyArena
+                         *arena);
+#define TypeIgnore(a0, a1, a2) _Py_TypeIgnore(a0, a1, a2)
+type_ignore_ty _Py_TypeIgnore(int lineno, string tag, PyArena *arena);
+
+PyObject* PyAST_mod2obj(mod_ty t);
+mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode);
+int PyAST_Check(PyObject* obj);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_PYTHON_AST_H */
diff --git a/openflow/usr/include/python3.5m/Python.h b/openflow/include/python3.8/Python.h
similarity index 77%
rename from openflow/usr/include/python3.5m/Python.h
rename to openflow/include/python3.8/Python.h
index 858dbd1..d6e5b13 100644
--- a/openflow/usr/include/python3.5m/Python.h
+++ b/openflow/include/python3.8/Python.h
@@ -18,7 +18,7 @@
 #error "Python's source code assumes C's unsigned char is an 8-bit type."
 #endif
 
-#if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE)
+#if defined(__sgi) && !defined(_SGI_MP_SOURCE)
 #define _SGI_MP_SOURCE
 #endif
 
@@ -32,9 +32,22 @@
 #include <errno.h>
 #endif
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
+#ifndef MS_WINDOWS
 #include <unistd.h>
 #endif
+#ifdef HAVE_CRYPT_H
+#if defined(HAVE_CRYPT_R) && !defined(_GNU_SOURCE)
+/* Required for glibc to expose the crypt_r() function prototype. */
+#  define _GNU_SOURCE
+#  define _Py_GNU_SOURCE_FOR_CRYPT
+#endif
+#include <crypt.h>
+#ifdef _Py_GNU_SOURCE_FOR_CRYPT
+/* Don't leak the _GNU_SOURCE define to other headers. */
+#  undef _GNU_SOURCE
+#  undef _Py_GNU_SOURCE_FOR_CRYPT
+#endif
+#endif
 
 /* For size_t? */
 #ifdef HAVE_STDDEF_H
@@ -50,7 +63,14 @@
 #include "pyport.h"
 #include "pymacro.h"
 
-#include "pyatomic.h"
+/* A convenient way for code to know if clang's memory sanitizer is enabled. */
+#if defined(__has_feature)
+#  if __has_feature(memory_sanitizer)
+#    if !defined(_Py_MEMORY_SANITIZER)
+#      define _Py_MEMORY_SANITIZER
+#    endif
+#  endif
+#endif
 
 /* Debug-mode build with pymalloc implies PYMALLOC_DEBUG.
  *  PYMALLOC_DEBUG is in error if pymalloc is not in use.
@@ -104,25 +124,29 @@
 #include "weakrefobject.h"
 #include "structseq.h"
 #include "namespaceobject.h"
+#include "picklebufobject.h"
 
 #include "codecs.h"
 #include "pyerrors.h"
 
+#include "cpython/initconfig.h"
 #include "pystate.h"
+#include "context.h"
 
 #include "pyarena.h"
 #include "modsupport.h"
+#include "compile.h"
 #include "pythonrun.h"
 #include "pylifecycle.h"
 #include "ceval.h"
 #include "sysmodule.h"
+#include "osmodule.h"
 #include "intrcheck.h"
 #include "import.h"
 
 #include "abstract.h"
 #include "bltinmodule.h"
 
-#include "compile.h"
 #include "eval.h"
 
 #include "pyctype.h"
@@ -131,5 +155,6 @@
 #include "dtoa.h"
 #include "fileutils.h"
 #include "pyfpe.h"
+#include "tracemalloc.h"
 
 #endif /* !Py_PYTHON_H */
diff --git a/openflow/include/python3.8/abstract.h b/openflow/include/python3.8/abstract.h
new file mode 100644
index 0000000..c226aab
--- /dev/null
+++ b/openflow/include/python3.8/abstract.h
@@ -0,0 +1,844 @@
+/* Abstract Object Interface (many thanks to Jim Fulton) */
+
+#ifndef Py_ABSTRACTOBJECT_H
+#define Py_ABSTRACTOBJECT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* === Object Protocol ================================================== */
+
+/* Implemented elsewhere:
+
+   int PyObject_Print(PyObject *o, FILE *fp, int flags);
+
+   Print an object 'o' on file 'fp'.  Returns -1 on error. The flags argument
+   is used to enable certain printing options. The only option currently
+   supported is Py_Print_RAW.
+
+   (What should be said about Py_Print_RAW?). */
+
+
+/* Implemented elsewhere:
+
+   int PyObject_HasAttrString(PyObject *o, const char *attr_name);
+
+   Returns 1 if object 'o' has the attribute attr_name, and 0 otherwise.
+
+   This is equivalent to the Python expression: hasattr(o,attr_name).
+
+   This function always succeeds. */
+
+
+/* Implemented elsewhere:
+
+   PyObject* PyObject_GetAttrString(PyObject *o, const char *attr_name);
+
+   Retrieve an attributed named attr_name form object o.
+   Returns the attribute value on success, or NULL on failure.
+
+   This is the equivalent of the Python expression: o.attr_name. */
+
+
+/* Implemented elsewhere:
+
+   int PyObject_HasAttr(PyObject *o, PyObject *attr_name);
+
+   Returns 1 if o has the attribute attr_name, and 0 otherwise.
+
+   This is equivalent to the Python expression: hasattr(o,attr_name).
+
+   This function always succeeds. */
+
+/* Implemented elsewhere:
+
+   PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name);
+
+   Retrieve an attributed named 'attr_name' form object 'o'.
+   Returns the attribute value on success, or NULL on failure.
+
+   This is the equivalent of the Python expression: o.attr_name. */
+
+
+/* Implemented elsewhere:
+
+   int PyObject_SetAttrString(PyObject *o, const char *attr_name, PyObject *v);
+
+   Set the value of the attribute named attr_name, for object 'o',
+   to the value 'v'. Raise an exception and return -1 on failure; return 0 on
+   success.
+
+   This is the equivalent of the Python statement o.attr_name=v. */
+
+
+/* Implemented elsewhere:
+
+   int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v);
+
+   Set the value of the attribute named attr_name, for object 'o', to the value
+   'v'. an exception and return -1 on failure; return 0 on success.
+
+   This is the equivalent of the Python statement o.attr_name=v. */
+
+/* Implemented as a macro:
+
+   int PyObject_DelAttrString(PyObject *o, const char *attr_name);
+
+   Delete attribute named attr_name, for object o. Returns
+   -1 on failure.
+
+   This is the equivalent of the Python statement: del o.attr_name. */
+#define PyObject_DelAttrString(O,A) PyObject_SetAttrString((O),(A), NULL)
+
+
+/* Implemented as a macro:
+
+   int PyObject_DelAttr(PyObject *o, PyObject *attr_name);
+
+   Delete attribute named attr_name, for object o. Returns -1
+   on failure.  This is the equivalent of the Python
+   statement: del o.attr_name. */
+#define  PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A), NULL)
+
+
+/* Implemented elsewhere:
+
+   PyObject *PyObject_Repr(PyObject *o);
+
+   Compute the string representation of object 'o'.  Returns the
+   string representation on success, NULL on failure.
+
+   This is the equivalent of the Python expression: repr(o).
+
+   Called by the repr() built-in function. */
+
+
+/* Implemented elsewhere:
+
+   PyObject *PyObject_Str(PyObject *o);
+
+   Compute the string representation of object, o.  Returns the
+   string representation on success, NULL on failure.
+
+   This is the equivalent of the Python expression: str(o).
+
+   Called by the str() and print() built-in functions. */
+
+
+/* Declared elsewhere
+
+   PyAPI_FUNC(int) PyCallable_Check(PyObject *o);
+
+   Determine if the object, o, is callable.  Return 1 if the object is callable
+   and 0 otherwise.
+
+   This function always succeeds. */
+
+
+#ifdef PY_SSIZE_T_CLEAN
+#  define PyObject_CallFunction _PyObject_CallFunction_SizeT
+#  define PyObject_CallMethod _PyObject_CallMethod_SizeT
+#endif
+
+
+/* Call a callable Python object 'callable' with arguments given by the
+   tuple 'args' and keywords arguments given by the dictionary 'kwargs'.
+
+   'args' must not be *NULL*, use an empty tuple if no arguments are
+   needed. If no named arguments are needed, 'kwargs' can be NULL.
+
+   This is the equivalent of the Python expression:
+   callable(*args, **kwargs). */
+PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable,
+                                     PyObject *args, PyObject *kwargs);
+
+
+/* Call a callable Python object 'callable', with arguments given by the
+   tuple 'args'.  If no arguments are needed, then 'args' can be *NULL*.
+
+   Returns the result of the call on success, or *NULL* on failure.
+
+   This is the equivalent of the Python expression:
+   callable(*args). */
+PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable,
+                                           PyObject *args);
+
+/* Call a callable Python object, callable, with a variable number of C
+   arguments. The C arguments are described using a mkvalue-style format
+   string.
+
+   The format may be NULL, indicating that no arguments are provided.
+
+   Returns the result of the call on success, or NULL on failure.
+
+   This is the equivalent of the Python expression:
+   callable(arg1, arg2, ...). */
+PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable,
+                                             const char *format, ...);
+
+/* Call the method named 'name' of object 'obj' with a variable number of
+   C arguments.  The C arguments are described by a mkvalue format string.
+
+   The format can be NULL, indicating that no arguments are provided.
+
+   Returns the result of the call on success, or NULL on failure.
+
+   This is the equivalent of the Python expression:
+   obj.name(arg1, arg2, ...). */
+PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *obj,
+                                           const char *name,
+                                           const char *format, ...);
+
+PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable,
+                                                    const char *format,
+                                                    ...);
+
+PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *obj,
+                                                  const char *name,
+                                                  const char *format,
+                                                  ...);
+
+/* Call a callable Python object 'callable' with a variable number of C
+   arguments. The C arguments are provided as PyObject* values, terminated
+   by a NULL.
+
+   Returns the result of the call on success, or NULL on failure.
+
+   This is the equivalent of the Python expression:
+   callable(arg1, arg2, ...). */
+PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable,
+                                                    ...);
+
+/* Call the method named 'name' of object 'obj' with a variable number of
+   C arguments.  The C arguments are provided as PyObject* values, terminated
+   by NULL.
+
+   Returns the result of the call on success, or NULL on failure.
+
+   This is the equivalent of the Python expression: obj.name(*args). */
+
+PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(
+    PyObject *obj,
+    PyObject *name,
+    ...);
+
+
+/* Implemented elsewhere:
+
+   Py_hash_t PyObject_Hash(PyObject *o);
+
+   Compute and return the hash, hash_value, of an object, o.  On
+   failure, return -1.
+
+   This is the equivalent of the Python expression: hash(o). */
+
+
+/* Implemented elsewhere:
+
+   int PyObject_IsTrue(PyObject *o);
+
+   Returns 1 if the object, o, is considered to be true, 0 if o is
+   considered to be false and -1 on failure.
+
+   This is equivalent to the Python expression: not not o. */
+
+
+/* Implemented elsewhere:
+
+   int PyObject_Not(PyObject *o);
+
+   Returns 0 if the object, o, is considered to be true, 1 if o is
+   considered to be false and -1 on failure.
+
+   This is equivalent to the Python expression: not o. */
+
+
+/* Get the type of an object.
+
+   On success, returns a type object corresponding to the object type of object
+   'o'. On failure, returns NULL.
+
+   This is equivalent to the Python expression: type(o) */
+PyAPI_FUNC(PyObject *) PyObject_Type(PyObject *o);
+
+
+/* Return the size of object 'o'.  If the object 'o' provides both sequence and
+   mapping protocols, the sequence size is returned.
+
+   On error, -1 is returned.
+
+   This is the equivalent to the Python expression: len(o) */
+PyAPI_FUNC(Py_ssize_t) PyObject_Size(PyObject *o);
+
+
+/* For DLL compatibility */
+#undef PyObject_Length
+PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o);
+#define PyObject_Length PyObject_Size
+
+/* Return element of 'o' corresponding to the object 'key'. Return NULL
+  on failure.
+
+  This is the equivalent of the Python expression: o[key] */
+PyAPI_FUNC(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key);
+
+
+/* Map the object 'key' to the value 'v' into 'o'.
+
+   Raise an exception and return -1 on failure; return 0 on success.
+
+   This is the equivalent of the Python statement: o[key]=v. */
+PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v);
+
+/* Remove the mapping for the string 'key' from the object 'o'.
+   Returns -1 on failure.
+
+   This is equivalent to the Python statement: del o[key]. */
+PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, const char *key);
+
+/* Delete the mapping for the object 'key' from the object 'o'.
+   Returns -1 on failure.
+
+   This is the equivalent of the Python statement: del o[key]. */
+PyAPI_FUNC(int) PyObject_DelItem(PyObject *o, PyObject *key);
+
+
+/* === Old Buffer API ============================================ */
+
+/* FIXME:  usage of these should all be replaced in Python itself
+   but for backwards compatibility we will implement them.
+   Their usage without a corresponding "unlock" mechanism
+   may create issues (but they would already be there). */
+
+/* Takes an arbitrary object which must support the (character, single segment)
+   buffer interface and returns a pointer to a read-only memory location
+   useable as character based input for subsequent processing.
+
+   Return 0 on success.  buffer and buffer_len are only set in case no error
+   occurs. Otherwise, -1 is returned and an exception set. */
+Py_DEPRECATED(3.0)
+PyAPI_FUNC(int) PyObject_AsCharBuffer(PyObject *obj,
+                                      const char **buffer,
+                                      Py_ssize_t *buffer_len);
+
+/* Checks whether an arbitrary object supports the (character, single segment)
+   buffer interface.
+
+   Returns 1 on success, 0 on failure. */
+Py_DEPRECATED(3.0) PyAPI_FUNC(int) PyObject_CheckReadBuffer(PyObject *obj);
+
+/* Same as PyObject_AsCharBuffer() except that this API expects (readable,
+   single segment) buffer interface and returns a pointer to a read-only memory
+   location which can contain arbitrary data.
+
+   0 is returned on success.  buffer and buffer_len are only set in case no
+   error occurs.  Otherwise, -1 is returned and an exception set. */
+Py_DEPRECATED(3.0)
+PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj,
+                                      const void **buffer,
+                                      Py_ssize_t *buffer_len);
+
+/* Takes an arbitrary object which must support the (writable, single segment)
+   buffer interface and returns a pointer to a writable memory location in
+   buffer of size 'buffer_len'.
+
+   Return 0 on success.  buffer and buffer_len are only set in case no error
+   occurs. Otherwise, -1 is returned and an exception set. */
+Py_DEPRECATED(3.0)
+PyAPI_FUNC(int) PyObject_AsWriteBuffer(PyObject *obj,
+                                       void **buffer,
+                                       Py_ssize_t *buffer_len);
+
+
+/* === New Buffer API ============================================ */
+
+/* Takes an arbitrary object and returns the result of calling
+   obj.__format__(format_spec). */
+PyAPI_FUNC(PyObject *) PyObject_Format(PyObject *obj,
+                                       PyObject *format_spec);
+
+
+/* ==== Iterators ================================================ */
+
+/* Takes an object and returns an iterator for it.
+   This is typically a new iterator but if the argument is an iterator, this
+   returns itself. */
+PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *);
+
+/* Returns 1 if the object 'obj' provides iterator protocols, and 0 otherwise.
+
+   This function always succeeds. */
+PyAPI_FUNC(int) PyIter_Check(PyObject *);
+
+/* Takes an iterator object and calls its tp_iternext slot,
+   returning the next value.
+
+   If the iterator is exhausted, this returns NULL without setting an
+   exception.
+
+   NULL with an exception means an error occurred. */
+PyAPI_FUNC(PyObject *) PyIter_Next(PyObject *);
+
+
+/* === Number Protocol ================================================== */
+
+/* Returns 1 if the object 'o' provides numeric protocols, and 0 otherwise.
+
+   This function always succeeds. */
+PyAPI_FUNC(int) PyNumber_Check(PyObject *o);
+
+/* Returns the result of adding o1 and o2, or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 + o2. */
+PyAPI_FUNC(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2);
+
+/* Returns the result of subtracting o2 from o1, or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 - o2. */
+PyAPI_FUNC(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2);
+
+/* Returns the result of multiplying o1 and o2, or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 * o2. */
+PyAPI_FUNC(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2);
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
+/* This is the equivalent of the Python expression: o1 @ o2. */
+PyAPI_FUNC(PyObject *) PyNumber_MatrixMultiply(PyObject *o1, PyObject *o2);
+#endif
+
+/* Returns the result of dividing o1 by o2 giving an integral result,
+   or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 // o2. */
+PyAPI_FUNC(PyObject *) PyNumber_FloorDivide(PyObject *o1, PyObject *o2);
+
+/* Returns the result of dividing o1 by o2 giving a float result, or NULL on
+   failure.
+
+   This is the equivalent of the Python expression: o1 / o2. */
+PyAPI_FUNC(PyObject *) PyNumber_TrueDivide(PyObject *o1, PyObject *o2);
+
+/* Returns the remainder of dividing o1 by o2, or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 % o2. */
+PyAPI_FUNC(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2);
+
+/* See the built-in function divmod.
+
+   Returns NULL on failure.
+
+   This is the equivalent of the Python expression: divmod(o1, o2). */
+PyAPI_FUNC(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2);
+
+/* See the built-in function pow. Returns NULL on failure.
+
+   This is the equivalent of the Python expression: pow(o1, o2, o3),
+   where o3 is optional. */
+PyAPI_FUNC(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2,
+                                      PyObject *o3);
+
+/* Returns the negation of o on success, or NULL on failure.
+
+ This is the equivalent of the Python expression: -o. */
+PyAPI_FUNC(PyObject *) PyNumber_Negative(PyObject *o);
+
+/* Returns the positive of o on success, or NULL on failure.
+
+   This is the equivalent of the Python expression: +o. */
+PyAPI_FUNC(PyObject *) PyNumber_Positive(PyObject *o);
+
+/* Returns the absolute value of 'o', or NULL on failure.
+
+   This is the equivalent of the Python expression: abs(o). */
+PyAPI_FUNC(PyObject *) PyNumber_Absolute(PyObject *o);
+
+/* Returns the bitwise negation of 'o' on success, or NULL on failure.
+
+   This is the equivalent of the Python expression: ~o. */
+PyAPI_FUNC(PyObject *) PyNumber_Invert(PyObject *o);
+
+/* Returns the result of left shifting o1 by o2 on success, or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 << o2. */
+PyAPI_FUNC(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2);
+
+/* Returns the result of right shifting o1 by o2 on success, or NULL on
+   failure.
+
+   This is the equivalent of the Python expression: o1 >> o2. */
+PyAPI_FUNC(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2);
+
+/* Returns the result of bitwise and of o1 and o2 on success, or NULL on
+   failure.
+
+   This is the equivalent of the Python expression: o1 & o2. */
+PyAPI_FUNC(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2);
+
+/* Returns the bitwise exclusive or of o1 by o2 on success, or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 ^ o2. */
+PyAPI_FUNC(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2);
+
+/* Returns the result of bitwise or on o1 and o2 on success, or NULL on
+   failure.
+
+   This is the equivalent of the Python expression: o1 | o2. */
+PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2);
+
+/* Returns 1 if obj is an index integer (has the nb_index slot of the
+   tp_as_number structure filled in), and 0 otherwise. */
+PyAPI_FUNC(int) PyIndex_Check(PyObject *);
+
+/* Returns the object 'o' converted to a Python int, or NULL with an exception
+   raised on failure. */
+PyAPI_FUNC(PyObject *) PyNumber_Index(PyObject *o);
+
+/* Returns the object 'o' converted to Py_ssize_t by going through
+   PyNumber_Index() first.
+
+   If an overflow error occurs while converting the int to Py_ssize_t, then the
+   second argument 'exc' is the error-type to return.  If it is NULL, then the
+   overflow error is cleared and the value is clipped. */
+PyAPI_FUNC(Py_ssize_t) PyNumber_AsSsize_t(PyObject *o, PyObject *exc);
+
+/* Returns the object 'o' converted to an integer object on success, or NULL
+   on failure.
+
+   This is the equivalent of the Python expression: int(o). */
+PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
+
+/* Returns the object 'o' converted to a float object on success, or NULL
+  on failure.
+
+  This is the equivalent of the Python expression: float(o). */
+PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o);
+
+
+/* --- In-place variants of (some of) the above number protocol functions -- */
+
+/* Returns the result of adding o2 to o1, possibly in-place, or NULL
+   on failure.
+
+   This is the equivalent of the Python expression: o1 += o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceAdd(PyObject *o1, PyObject *o2);
+
+/* Returns the result of subtracting o2 from o1, possibly in-place or
+   NULL on failure.
+
+   This is the equivalent of the Python expression: o1 -= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceSubtract(PyObject *o1, PyObject *o2);
+
+/* Returns the result of multiplying o1 by o2, possibly in-place, or NULL on
+   failure.
+
+   This is the equivalent of the Python expression: o1 *= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceMultiply(PyObject *o1, PyObject *o2);
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
+/* This is the equivalent of the Python expression: o1 @= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceMatrixMultiply(PyObject *o1, PyObject *o2);
+#endif
+
+/* Returns the result of dividing o1 by o2 giving an integral result, possibly
+   in-place, or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 /= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceFloorDivide(PyObject *o1,
+                                                   PyObject *o2);
+
+/* Returns the result of dividing o1 by o2 giving a float result, possibly
+   in-place, or null on failure.
+
+   This is the equivalent of the Python expression: o1 /= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceTrueDivide(PyObject *o1,
+                                                  PyObject *o2);
+
+/* Returns the remainder of dividing o1 by o2, possibly in-place, or NULL on
+   failure.
+
+   This is the equivalent of the Python expression: o1 %= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2);
+
+/* Returns the result of raising o1 to the power of o2, possibly in-place,
+   or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 **= o2,
+   or o1 = pow(o1, o2, o3) if o3 is present. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlacePower(PyObject *o1, PyObject *o2,
+                                             PyObject *o3);
+
+/* Returns the result of left shifting o1 by o2, possibly in-place, or NULL
+   on failure.
+
+   This is the equivalent of the Python expression: o1 <<= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceLshift(PyObject *o1, PyObject *o2);
+
+/* Returns the result of right shifting o1 by o2, possibly in-place or NULL
+   on failure.
+
+   This is the equivalent of the Python expression: o1 >>= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceRshift(PyObject *o1, PyObject *o2);
+
+/* Returns the result of bitwise and of o1 and o2, possibly in-place, or NULL
+   on failure.
+
+   This is the equivalent of the Python expression: o1 &= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceAnd(PyObject *o1, PyObject *o2);
+
+/* Returns the bitwise exclusive or of o1 by o2, possibly in-place, or NULL
+   on failure.
+
+   This is the equivalent of the Python expression: o1 ^= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceXor(PyObject *o1, PyObject *o2);
+
+/* Returns the result of bitwise or of o1 and o2, possibly in-place,
+   or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 |= o2. */
+PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2);
+
+/* Returns the integer n converted to a string with a base, with a base
+   marker of 0b, 0o or 0x prefixed if applicable.
+
+   If n is not an int object, it is converted with PyNumber_Index first. */
+PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base);
+
+
+/* === Sequence protocol ================================================ */
+
+/* Return 1 if the object provides sequence protocol, and zero
+   otherwise.
+
+   This function always succeeds. */
+PyAPI_FUNC(int) PySequence_Check(PyObject *o);
+
+/* Return the size of sequence object o, or -1 on failure. */
+PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject *o);
+
+/* For DLL compatibility */
+#undef PySequence_Length
+PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject *o);
+#define PySequence_Length PySequence_Size
+
+
+/* Return the concatenation of o1 and o2 on success, and NULL on failure.
+
+   This is the equivalent of the Python expression: o1 + o2. */
+PyAPI_FUNC(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2);
+
+/* Return the result of repeating sequence object 'o' 'count' times,
+  or NULL on failure.
+
+  This is the equivalent of the Python expression: o * count. */
+PyAPI_FUNC(PyObject *) PySequence_Repeat(PyObject *o, Py_ssize_t count);
+
+/* Return the ith element of o, or NULL on failure.
+
+   This is the equivalent of the Python expression: o[i]. */
+PyAPI_FUNC(PyObject *) PySequence_GetItem(PyObject *o, Py_ssize_t i);
+
+/* Return the slice of sequence object o between i1 and i2, or NULL on failure.
+
+   This is the equivalent of the Python expression: o[i1:i2]. */
+PyAPI_FUNC(PyObject *) PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
+
+/* Assign object 'v' to the ith element of the sequence 'o'. Raise an exception
+   and return -1 on failure; return 0 on success.
+
+   This is the equivalent of the Python statement o[i] = v. */
+PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v);
+
+/* Delete the 'i'-th element of the sequence 'v'. Returns -1 on failure.
+
+   This is the equivalent of the Python statement: del o[i]. */
+PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i);
+
+/* Assign the sequence object 'v' to the slice in sequence object 'o',
+   from 'i1' to 'i2'. Returns -1 on failure.
+
+   This is the equivalent of the Python statement: o[i1:i2] = v. */
+PyAPI_FUNC(int) PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2,
+                                    PyObject *v);
+
+/* Delete the slice in sequence object 'o' from 'i1' to 'i2'.
+   Returns -1 on failure.
+
+   This is the equivalent of the Python statement: del o[i1:i2]. */
+PyAPI_FUNC(int) PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
+
+/* Returns the sequence 'o' as a tuple on success, and NULL on failure.
+
+   This is equivalent to the Python expression: tuple(o). */
+PyAPI_FUNC(PyObject *) PySequence_Tuple(PyObject *o);
+
+/* Returns the sequence 'o' as a list on success, and NULL on failure.
+   This is equivalent to the Python expression: list(o) */
+PyAPI_FUNC(PyObject *) PySequence_List(PyObject *o);
+
+/* Return the sequence 'o' as a list, unless it's already a tuple or list.
+
+   Use PySequence_Fast_GET_ITEM to access the members of this list, and
+   PySequence_Fast_GET_SIZE to get its length.
+
+   Returns NULL on failure.  If the object does not support iteration, raises a
+   TypeError exception with 'm' as the message text. */
+PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
+
+/* Return the size of the sequence 'o', assuming that 'o' was returned by
+   PySequence_Fast and is not NULL. */
+#define PySequence_Fast_GET_SIZE(o) \
+    (PyList_Check(o) ? PyList_GET_SIZE(o) : PyTuple_GET_SIZE(o))
+
+/* Return the 'i'-th element of the sequence 'o', assuming that o was returned
+   by PySequence_Fast, and that i is within bounds. */
+#define PySequence_Fast_GET_ITEM(o, i)\
+     (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
+
+/* Return a pointer to the underlying item array for
+   an object retured by PySequence_Fast */
+#define PySequence_Fast_ITEMS(sf) \
+    (PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \
+                      : ((PyTupleObject *)(sf))->ob_item)
+
+/* Return the number of occurrences on value on 'o', that is, return
+   the number of keys for which o[key] == value.
+
+   On failure, return -1.  This is equivalent to the Python expression:
+   o.count(value). */
+PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject *o, PyObject *value);
+
+/* Return 1 if 'ob' is in the sequence 'seq'; 0 if 'ob' is not in the sequence
+   'seq'; -1 on error.
+
+   Use __contains__ if possible, else _PySequence_IterSearch(). */
+PyAPI_FUNC(int) PySequence_Contains(PyObject *seq, PyObject *ob);
+
+/* For DLL-level backwards compatibility */
+#undef PySequence_In
+/* Determine if the sequence 'o' contains 'value'. If an item in 'o' is equal
+   to 'value', return 1, otherwise return 0. On error, return -1.
+
+   This is equivalent to the Python expression: value in o. */
+PyAPI_FUNC(int) PySequence_In(PyObject *o, PyObject *value);
+
+/* For source-level backwards compatibility */
+#define PySequence_In PySequence_Contains
+
+
+/* Return the first index for which o[i] == value.
+   On error, return -1.
+
+   This is equivalent to the Python expression: o.index(value). */
+PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject *o, PyObject *value);
+
+
+/* --- In-place versions of some of the above Sequence functions --- */
+
+/* Append sequence 'o2' to sequence 'o1', in-place when possible. Return the
+   resulting object, which could be 'o1', or NULL on failure.
+
+  This is the equivalent of the Python expression: o1 += o2. */
+PyAPI_FUNC(PyObject *) PySequence_InPlaceConcat(PyObject *o1, PyObject *o2);
+
+/* Repeat sequence 'o' by 'count', in-place when possible. Return the resulting
+   object, which could be 'o', or NULL on failure.
+
+   This is the equivalent of the Python expression: o1 *= count.  */
+PyAPI_FUNC(PyObject *) PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count);
+
+
+/* === Mapping protocol ================================================= */
+
+/* Return 1 if the object provides mapping protocol, and 0 otherwise.
+
+   This function always succeeds. */
+PyAPI_FUNC(int) PyMapping_Check(PyObject *o);
+
+/* Returns the number of keys in mapping object 'o' on success, and -1 on
+  failure. This is equivalent to the Python expression: len(o). */
+PyAPI_FUNC(Py_ssize_t) PyMapping_Size(PyObject *o);
+
+/* For DLL compatibility */
+#undef PyMapping_Length
+PyAPI_FUNC(Py_ssize_t) PyMapping_Length(PyObject *o);
+#define PyMapping_Length PyMapping_Size
+
+
+/* Implemented as a macro:
+
+   int PyMapping_DelItemString(PyObject *o, const char *key);
+
+   Remove the mapping for the string 'key' from the mapping 'o'. Returns -1 on
+   failure.
+
+   This is equivalent to the Python statement: del o[key]. */
+#define PyMapping_DelItemString(O,K) PyObject_DelItemString((O),(K))
+
+/* Implemented as a macro:
+
+   int PyMapping_DelItem(PyObject *o, PyObject *key);
+
+   Remove the mapping for the object 'key' from the mapping object 'o'.
+   Returns -1 on failure.
+
+   This is equivalent to the Python statement: del o[key]. */
+#define PyMapping_DelItem(O,K) PyObject_DelItem((O),(K))
+
+/* On success, return 1 if the mapping object 'o' has the key 'key',
+   and 0 otherwise.
+
+   This is equivalent to the Python expression: key in o.
+
+   This function always succeeds. */
+PyAPI_FUNC(int) PyMapping_HasKeyString(PyObject *o, const char *key);
+
+/* Return 1 if the mapping object has the key 'key', and 0 otherwise.
+
+   This is equivalent to the Python expression: key in o.
+
+   This function always succeeds. */
+PyAPI_FUNC(int) PyMapping_HasKey(PyObject *o, PyObject *key);
+
+/* On success, return a list or tuple of the keys in mapping object 'o'.
+   On failure, return NULL. */
+PyAPI_FUNC(PyObject *) PyMapping_Keys(PyObject *o);
+
+/* On success, return a list or tuple of the values in mapping object 'o'.
+   On failure, return NULL. */
+PyAPI_FUNC(PyObject *) PyMapping_Values(PyObject *o);
+
+/* On success, return a list or tuple of the items in mapping object 'o',
+   where each item is a tuple containing a key-value pair. On failure, return
+   NULL. */
+PyAPI_FUNC(PyObject *) PyMapping_Items(PyObject *o);
+
+/* Return element of 'o' corresponding to the string 'key' or NULL on failure.
+
+   This is the equivalent of the Python expression: o[key]. */
+PyAPI_FUNC(PyObject *) PyMapping_GetItemString(PyObject *o,
+                                               const char *key);
+
+/* Map the string 'key' to the value 'v' in the mapping 'o'.
+   Returns -1 on failure.
+
+   This is the equivalent of the Python statement: o[key]=v. */
+PyAPI_FUNC(int) PyMapping_SetItemString(PyObject *o, const char *key,
+                                        PyObject *value);
+
+/* isinstance(object, typeorclass) */
+PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass);
+
+/* issubclass(object, typeorclass) */
+PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass);
+
+#ifndef Py_LIMITED_API
+#  define Py_CPYTHON_ABSTRACTOBJECT_H
+#  include  "cpython/abstract.h"
+#  undef Py_CPYTHON_ABSTRACTOBJECT_H
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* Py_ABSTRACTOBJECT_H */
diff --git a/openflow/usr/include/python3.5m/asdl.h b/openflow/include/python3.8/asdl.h
similarity index 93%
rename from openflow/usr/include/python3.5m/asdl.h
rename to openflow/include/python3.8/asdl.h
index 495153c..fc6d223 100644
--- a/openflow/usr/include/python3.5m/asdl.h
+++ b/openflow/include/python3.8/asdl.h
@@ -6,6 +6,7 @@ typedef PyObject * string;
 typedef PyObject * bytes;
 typedef PyObject * object;
 typedef PyObject * singleton;
+typedef PyObject * constant;
 
 /* It would be nice if the code generated by asdl_c.py was completely
    independent of Python, but it is a goal the requires too much work
@@ -35,7 +36,7 @@ asdl_int_seq *_Py_asdl_int_seq_new(Py_ssize_t size, PyArena *arena);
     do { \
         Py_ssize_t _asdl_i = (I); \
         assert((S) != NULL); \
-        assert(_asdl_i < (S)->size); \
+        assert(0 <= _asdl_i && _asdl_i < (S)->size); \
         (S)->elements[_asdl_i] = (V); \
     } while (0)
 #else
diff --git a/openflow/usr/include/python3.5m/ast.h b/openflow/include/python3.8/ast.h
similarity index 50%
rename from openflow/usr/include/python3.5m/ast.h
rename to openflow/include/python3.8/ast.h
index 6a8c816..f1d7348 100644
--- a/openflow/usr/include/python3.5m/ast.h
+++ b/openflow/include/python3.8/ast.h
@@ -4,6 +4,9 @@
 extern "C" {
 #endif
 
+#include "Python-ast.h"   /* mod_ty */
+#include "node.h"         /* node */
+
 PyAPI_FUNC(int) PyAST_Validate(mod_ty);
 PyAPI_FUNC(mod_ty) PyAST_FromNode(
     const node *n,
@@ -16,6 +19,18 @@ PyAPI_FUNC(mod_ty) PyAST_FromNodeObject(
     PyObject *filename,
     PyArena *arena);
 
+#ifndef Py_LIMITED_API
+
+/* _PyAST_ExprAsUnicode is defined in ast_unparse.c */
+PyAPI_FUNC(PyObject *) _PyAST_ExprAsUnicode(expr_ty);
+
+/* Return the borrowed reference to the first literal string in the
+   sequence of statemnts or NULL if it doesn't start from a literal string.
+   Doesn't set exception. */
+PyAPI_FUNC(PyObject *) _PyAST_GetDocString(asdl_seq *);
+
+#endif /* !Py_LIMITED_API */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/openflow/include/python3.8/bitset.h b/openflow/include/python3.8/bitset.h
new file mode 100644
index 0000000..6a2ac97
--- /dev/null
+++ b/openflow/include/python3.8/bitset.h
@@ -0,0 +1,23 @@
+
+#ifndef Py_BITSET_H
+#define Py_BITSET_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Bitset interface */
+
+#define BYTE            char
+typedef BYTE *bitset;
+
+#define testbit(ss, ibit) (((ss)[BIT2BYTE(ibit)] & BIT2MASK(ibit)) != 0)
+
+#define BITSPERBYTE     (8*sizeof(BYTE))
+#define BIT2BYTE(ibit)  ((ibit) / BITSPERBYTE)
+#define BIT2SHIFT(ibit) ((ibit) % BITSPERBYTE)
+#define BIT2MASK(ibit)  (1 << BIT2SHIFT(ibit))
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_BITSET_H */
diff --git a/openflow/usr/include/python3.5m/bltinmodule.h b/openflow/include/python3.8/bltinmodule.h
similarity index 100%
rename from openflow/usr/include/python3.5m/bltinmodule.h
rename to openflow/include/python3.8/bltinmodule.h
diff --git a/openflow/usr/include/python3.5m/boolobject.h b/openflow/include/python3.8/boolobject.h
similarity index 100%
rename from openflow/usr/include/python3.5m/boolobject.h
rename to openflow/include/python3.8/boolobject.h
diff --git a/openflow/usr/include/python3.5m/bytearrayobject.h b/openflow/include/python3.8/bytearrayobject.h
similarity index 100%
rename from openflow/usr/include/python3.5m/bytearrayobject.h
rename to openflow/include/python3.8/bytearrayobject.h
diff --git a/openflow/usr/include/python3.5m/bytes_methods.h b/openflow/include/python3.8/bytes_methods.h
similarity index 55%
rename from openflow/usr/include/python3.5m/bytes_methods.h
rename to openflow/include/python3.8/bytes_methods.h
index 11d5f42..8434a50 100644
--- a/openflow/usr/include/python3.5m/bytes_methods.h
+++ b/openflow/include/python3.8/bytes_methods.h
@@ -9,6 +9,7 @@
 extern PyObject* _Py_bytes_isspace(const char *cptr, Py_ssize_t len);
 extern PyObject* _Py_bytes_isalpha(const char *cptr, Py_ssize_t len);
 extern PyObject* _Py_bytes_isalnum(const char *cptr, Py_ssize_t len);
+extern PyObject* _Py_bytes_isascii(const char *cptr, Py_ssize_t len);
 extern PyObject* _Py_bytes_isdigit(const char *cptr, Py_ssize_t len);
 extern PyObject* _Py_bytes_islower(const char *cptr, Py_ssize_t len);
 extern PyObject* _Py_bytes_isupper(const char *cptr, Py_ssize_t len);
@@ -17,9 +18,18 @@ extern PyObject* _Py_bytes_istitle(const char *cptr, Py_ssize_t len);
 /* These store their len sized answer in the given preallocated *result arg. */
 extern void _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len);
 extern void _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len);
-extern void _Py_bytes_title(char *result, char *s, Py_ssize_t len);
-extern void _Py_bytes_capitalize(char *result, char *s, Py_ssize_t len);
-extern void _Py_bytes_swapcase(char *result, char *s, Py_ssize_t len);
+extern void _Py_bytes_title(char *result, const char *s, Py_ssize_t len);
+extern void _Py_bytes_capitalize(char *result, const char *s, Py_ssize_t len);
+extern void _Py_bytes_swapcase(char *result, const char *s, Py_ssize_t len);
+
+extern PyObject *_Py_bytes_find(const char *str, Py_ssize_t len, PyObject *args);
+extern PyObject *_Py_bytes_index(const char *str, Py_ssize_t len, PyObject *args);
+extern PyObject *_Py_bytes_rfind(const char *str, Py_ssize_t len, PyObject *args);
+extern PyObject *_Py_bytes_rindex(const char *str, Py_ssize_t len, PyObject *args);
+extern PyObject *_Py_bytes_count(const char *str, Py_ssize_t len, PyObject *args);
+extern int _Py_bytes_contains(const char *str, Py_ssize_t len, PyObject *arg);
+extern PyObject *_Py_bytes_startswith(const char *str, Py_ssize_t len, PyObject *args);
+extern PyObject *_Py_bytes_endswith(const char *str, Py_ssize_t len, PyObject *args);
 
 /* The maketrans() static method. */
 extern PyObject* _Py_bytes_maketrans(Py_buffer *frm, Py_buffer *to);
@@ -28,6 +38,7 @@ extern PyObject* _Py_bytes_maketrans(Py_buffer *frm, Py_buffer *to);
 extern const char _Py_isspace__doc__[];
 extern const char _Py_isalpha__doc__[];
 extern const char _Py_isalnum__doc__[];
+extern const char _Py_isascii__doc__[];
 extern const char _Py_isdigit__doc__[];
 extern const char _Py_islower__doc__[];
 extern const char _Py_isupper__doc__[];
@@ -37,7 +48,19 @@ extern const char _Py_upper__doc__[];
 extern const char _Py_title__doc__[];
 extern const char _Py_capitalize__doc__[];
 extern const char _Py_swapcase__doc__[];
+extern const char _Py_count__doc__[];
+extern const char _Py_find__doc__[];
+extern const char _Py_index__doc__[];
+extern const char _Py_rfind__doc__[];
+extern const char _Py_rindex__doc__[];
+extern const char _Py_startswith__doc__[];
+extern const char _Py_endswith__doc__[];
 extern const char _Py_maketrans__doc__[];
+extern const char _Py_expandtabs__doc__[];
+extern const char _Py_ljust__doc__[];
+extern const char _Py_rjust__doc__[];
+extern const char _Py_center__doc__[];
+extern const char _Py_zfill__doc__[];
 
 /* this is needed because some docs are shared from the .o, not static */
 #define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str)
diff --git a/openflow/usr/include/python3.5m/bytesobject.h b/openflow/include/python3.8/bytesobject.h
similarity index 55%
rename from openflow/usr/include/python3.5m/bytesobject.h
rename to openflow/include/python3.8/bytesobject.h
index 6c1e0c3..3fde4a2 100644
--- a/openflow/usr/include/python3.5m/bytesobject.h
+++ b/openflow/include/python3.8/bytesobject.h
@@ -52,9 +52,9 @@ PyAPI_FUNC(PyObject *) PyBytes_FromStringAndSize(const char *, Py_ssize_t);
 PyAPI_FUNC(PyObject *) PyBytes_FromString(const char *);
 PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *);
 PyAPI_FUNC(PyObject *) PyBytes_FromFormatV(const char*, va_list)
-				Py_GCC_ATTRIBUTE((format(printf, 1, 0)));
+                                Py_GCC_ATTRIBUTE((format(printf, 1, 0)));
 PyAPI_FUNC(PyObject *) PyBytes_FromFormat(const char*, ...)
-				Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
+                                Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
 PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *);
 PyAPI_FUNC(char *) PyBytes_AsString(PyObject *);
 PyAPI_FUNC(PyObject *) PyBytes_Repr(PyObject *, int);
@@ -62,11 +62,25 @@ PyAPI_FUNC(void) PyBytes_Concat(PyObject **, PyObject *);
 PyAPI_FUNC(void) PyBytes_ConcatAndDel(PyObject **, PyObject *);
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyBytes_Resize(PyObject **, Py_ssize_t);
-PyAPI_FUNC(PyObject *) _PyBytes_Format(PyObject *, PyObject *);
+PyAPI_FUNC(PyObject*) _PyBytes_FormatEx(
+    const char *format,
+    Py_ssize_t format_len,
+    PyObject *args,
+    int use_bytearray);
+PyAPI_FUNC(PyObject*) _PyBytes_FromHex(
+    PyObject *string,
+    int use_bytearray);
 #endif
 PyAPI_FUNC(PyObject *) PyBytes_DecodeEscape(const char *, Py_ssize_t,
-						   const char *, Py_ssize_t,
-						   const char *);
+                                            const char *, Py_ssize_t,
+                                            const char *);
+#ifndef Py_LIMITED_API
+/* Helper for PyBytes_DecodeEscape that detects invalid escape chars. */
+PyAPI_FUNC(PyObject *) _PyBytes_DecodeEscape(const char *, Py_ssize_t,
+                                             const char *, Py_ssize_t,
+                                             const char *,
+                                             const char **);
+#endif
 
 /* Macro, trading safety for speed */
 #ifndef Py_LIMITED_API
@@ -118,10 +132,91 @@ PyAPI_FUNC(Py_ssize_t) _PyBytes_InsertThousandsGrouping(char *buffer,
 
 /* Flags used by string formatting */
 #define F_LJUST (1<<0)
-#define F_SIGN	(1<<1)
+#define F_SIGN  (1<<1)
 #define F_BLANK (1<<2)
-#define F_ALT	(1<<3)
-#define F_ZERO	(1<<4)
+#define F_ALT   (1<<3)
+#define F_ZERO  (1<<4)
+
+#ifndef Py_LIMITED_API
+/* The _PyBytesWriter structure is big: it contains an embedded "stack buffer".
+   A _PyBytesWriter variable must be declared at the end of variables in a
+   function to optimize the memory allocation on the stack. */
+typedef struct {
+    /* bytes, bytearray or NULL (when the small buffer is used) */
+    PyObject *buffer;
+
+    /* Number of allocated size. */
+    Py_ssize_t allocated;
+
+    /* Minimum number of allocated bytes,
+       incremented by _PyBytesWriter_Prepare() */
+    Py_ssize_t min_size;
+
+    /* If non-zero, use a bytearray instead of a bytes object for buffer. */
+    int use_bytearray;
+
+    /* If non-zero, overallocate the buffer (default: 0).
+       This flag must be zero if use_bytearray is non-zero. */
+    int overallocate;
+
+    /* Stack buffer */
+    int use_small_buffer;
+    char small_buffer[512];
+} _PyBytesWriter;
+
+/* Initialize a bytes writer
+
+   By default, the overallocation is disabled. Set the overallocate attribute
+   to control the allocation of the buffer. */
+PyAPI_FUNC(void) _PyBytesWriter_Init(_PyBytesWriter *writer);
+
+/* Get the buffer content and reset the writer.
+   Return a bytes object, or a bytearray object if use_bytearray is non-zero.
+   Raise an exception and return NULL on error. */
+PyAPI_FUNC(PyObject *) _PyBytesWriter_Finish(_PyBytesWriter *writer,
+    void *str);
+
+/* Deallocate memory of a writer (clear its internal buffer). */
+PyAPI_FUNC(void) _PyBytesWriter_Dealloc(_PyBytesWriter *writer);
+
+/* Allocate the buffer to write size bytes.
+   Return the pointer to the beginning of buffer data.
+   Raise an exception and return NULL on error. */
+PyAPI_FUNC(void*) _PyBytesWriter_Alloc(_PyBytesWriter *writer,
+    Py_ssize_t size);
+
+/* Ensure that the buffer is large enough to write *size* bytes.
+   Add size to the writer minimum size (min_size attribute).
+
+   str is the current pointer inside the buffer.
+   Return the updated current pointer inside the buffer.
+   Raise an exception and return NULL on error. */
+PyAPI_FUNC(void*) _PyBytesWriter_Prepare(_PyBytesWriter *writer,
+    void *str,
+    Py_ssize_t size);
+
+/* Resize the buffer to make it larger.
+   The new buffer may be larger than size bytes because of overallocation.
+   Return the updated current pointer inside the buffer.
+   Raise an exception and return NULL on error.
+
+   Note: size must be greater than the number of allocated bytes in the writer.
+
+   This function doesn't use the writer minimum size (min_size attribute).
+
+   See also _PyBytesWriter_Prepare().
+   */
+PyAPI_FUNC(void*) _PyBytesWriter_Resize(_PyBytesWriter *writer,
+    void *str,
+    Py_ssize_t size);
+
+/* Write bytes.
+   Raise an exception and return NULL on error. */
+PyAPI_FUNC(void*) _PyBytesWriter_WriteBytes(_PyBytesWriter *writer,
+    void *str,
+    const void *bytes,
+    Py_ssize_t size);
+#endif   /* Py_LIMITED_API */
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/cellobject.h b/openflow/include/python3.8/cellobject.h
similarity index 87%
rename from openflow/usr/include/python3.5m/cellobject.h
rename to openflow/include/python3.8/cellobject.h
index a0aa4d9..2f9b5b7 100644
--- a/openflow/usr/include/python3.5m/cellobject.h
+++ b/openflow/include/python3.8/cellobject.h
@@ -7,8 +7,8 @@ extern "C" {
 #endif
 
 typedef struct {
-	PyObject_HEAD
-	PyObject *ob_ref;	/* Content of the cell or NULL when empty */
+    PyObject_HEAD
+    PyObject *ob_ref;       /* Content of the cell or NULL when empty */
 } PyCellObject;
 
 PyAPI_DATA(PyTypeObject) PyCell_Type;
diff --git a/openflow/usr/include/python3.5m/ceval.h b/openflow/include/python3.8/ceval.h
similarity index 74%
rename from openflow/usr/include/python3.5m/ceval.h
rename to openflow/include/python3.8/ceval.h
index b5373a9..36fd014 100644
--- a/openflow/usr/include/python3.5m/ceval.h
+++ b/openflow/include/python3.8/ceval.h
@@ -7,24 +7,36 @@ extern "C" {
 
 /* Interface to random parts in ceval.c */
 
+/* PyEval_CallObjectWithKeywords(), PyEval_CallObject(), PyEval_CallFunction
+ * and PyEval_CallMethod are kept for backward compatibility: PyObject_Call(),
+ * PyObject_CallFunction() and PyObject_CallMethod() are recommended to call
+ * a callable object.
+ */
+
 PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords(
-    PyObject *, PyObject *, PyObject *);
+    PyObject *callable,
+    PyObject *args,
+    PyObject *kwargs);
 
 /* Inline this */
-#define PyEval_CallObject(func,arg) \
-    PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
+#define PyEval_CallObject(callable, arg) \
+    PyEval_CallObjectWithKeywords(callable, arg, (PyObject *)NULL)
 
-PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *obj,
+PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *callable,
                                            const char *format, ...);
 PyAPI_FUNC(PyObject *) PyEval_CallMethod(PyObject *obj,
-                                         const char *methodname,
+                                         const char *name,
                                          const char *format, ...);
 
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *);
 PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
-PyAPI_FUNC(void) _PyEval_SetCoroutineWrapper(PyObject *);
-PyAPI_FUNC(PyObject *) _PyEval_GetCoroutineWrapper(void);
+PyAPI_FUNC(void) _PyEval_SetCoroutineOriginTrackingDepth(int new_depth);
+PyAPI_FUNC(int) _PyEval_GetCoroutineOriginTrackingDepth(void);
+PyAPI_FUNC(void) _PyEval_SetAsyncGenFirstiter(PyObject *);
+PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFirstiter(void);
+PyAPI_FUNC(void) _PyEval_SetAsyncGenFinalizer(PyObject *);
+PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFinalizer(void);
 #endif
 
 struct _frame; /* Avoid including frameobject.h */
@@ -34,10 +46,12 @@ PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void);
 PyAPI_FUNC(PyObject *) PyEval_GetLocals(void);
 PyAPI_FUNC(struct _frame *) PyEval_GetFrame(void);
 
+#ifndef Py_LIMITED_API
+/* Helper to look up a builtin object */
+PyAPI_FUNC(PyObject *) _PyEval_GetBuiltinId(_Py_Identifier *);
 /* Look at the current frame's (if any) code's co_flags, and turn on
    the corresponding compiler flags in cf->cf_flags.  Return 1 if any
    flag was set, else return 0. */
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf);
 #endif
 
@@ -80,16 +94,19 @@ PyAPI_FUNC(int) Py_GetRecursionLimit(void);
       PyThreadState_GET()->overflowed = 0;  \
     } while(0)
 PyAPI_FUNC(int) _Py_CheckRecursiveCall(const char *where);
+
+/* Due to the macros in which it's used, _Py_CheckRecursionLimit is in
+   the stable ABI.  It should be removed therefrom when possible.
+*/
 PyAPI_DATA(int) _Py_CheckRecursionLimit;
 
 #ifdef USE_STACKCHECK
-/* With USE_STACKCHECK, we artificially decrement the recursion limit in order
-   to trigger regular stack checks in _Py_CheckRecursiveCall(), except if
-   the "overflowed" flag is set, in which case we need the true value
-   of _Py_CheckRecursionLimit for _Py_MakeEndRecCheck() to function properly.
+/* With USE_STACKCHECK, trigger stack checks in _Py_CheckRecursiveCall()
+   on every 64th call to Py_EnterRecursiveCall.
 */
 #  define _Py_MakeRecCheck(x)  \
-    (++(x) > (_Py_CheckRecursionLimit += PyThreadState_GET()->overflowed - 1))
+    (++(x) > _Py_CheckRecursionLimit || \
+     ++(PyThreadState_GET()->stackcheck_counter) > 64)
 #else
 #  define _Py_MakeRecCheck(x)  (++(x) > _Py_CheckRecursionLimit)
 #endif
@@ -116,9 +133,11 @@ PyAPI_DATA(int) _Py_CheckRecursionLimit;
 PyAPI_FUNC(const char *) PyEval_GetFuncName(PyObject *);
 PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *);
 
-PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *);
 PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *);
 PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc);
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault(struct _frame *f, int exc);
+#endif
 
 /* Interface for threads.
 
@@ -139,7 +158,7 @@ PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc);
 
     if (...premature_exit...) {
         Py_BLOCK_THREADS
-        PyErr_SetFromErrno(PyExc_IOError);
+        PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
 
@@ -147,7 +166,7 @@ PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc);
 
     Py_BLOCK_THREADS
     if (...premature_exit...) {
-        PyErr_SetFromErrno(PyExc_IOError);
+        PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
     Py_UNBLOCK_THREADS
@@ -168,22 +187,22 @@ PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc);
 PyAPI_FUNC(PyThreadState *) PyEval_SaveThread(void);
 PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState *);
 
-#ifdef WITH_THREAD
-
 PyAPI_FUNC(int)  PyEval_ThreadsInitialized(void);
 PyAPI_FUNC(void) PyEval_InitThreads(void);
-PyAPI_FUNC(void) _PyEval_FiniThreads(void);
-PyAPI_FUNC(void) PyEval_AcquireLock(void);
-PyAPI_FUNC(void) PyEval_ReleaseLock(void);
+Py_DEPRECATED(3.2) PyAPI_FUNC(void) PyEval_AcquireLock(void);
+/* Py_DEPRECATED(3.2) */ PyAPI_FUNC(void) PyEval_ReleaseLock(void);
 PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate);
 PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate);
-PyAPI_FUNC(void) PyEval_ReInitThreads(void);
 
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds);
 PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void);
 #endif
 
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(Py_ssize_t) _PyEval_RequestCodeExtraIndex(freefunc);
+#endif
+
 #define Py_BEGIN_ALLOW_THREADS { \
                         PyThreadState *_save; \
                         _save = PyEval_SaveThread();
@@ -192,20 +211,19 @@ PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void);
 #define Py_END_ALLOW_THREADS    PyEval_RestoreThread(_save); \
                  }
 
-#else /* !WITH_THREAD */
-
-#define Py_BEGIN_ALLOW_THREADS {
-#define Py_BLOCK_THREADS
-#define Py_UNBLOCK_THREADS
-#define Py_END_ALLOW_THREADS }
-
-#endif /* !WITH_THREAD */
-
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(void) _PyEval_SignalAsyncExc(void);
+PyAPI_FUNC(int) _PyEval_SliceIndexNotNone(PyObject *, Py_ssize_t *);
 #endif
 
+/* Masks and values used by FORMAT_VALUE opcode. */
+#define FVC_MASK      0x3
+#define FVC_NONE      0x0
+#define FVC_STR       0x1
+#define FVC_REPR      0x2
+#define FVC_ASCII     0x3
+#define FVS_MASK      0x4
+#define FVS_HAVE_SPEC 0x4
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/classobject.h b/openflow/include/python3.8/classobject.h
similarity index 93%
rename from openflow/usr/include/python3.5m/classobject.h
rename to openflow/include/python3.8/classobject.h
index eeeb3e9..c83303c 100644
--- a/openflow/usr/include/python3.5m/classobject.h
+++ b/openflow/include/python3.8/classobject.h
@@ -14,6 +14,7 @@ typedef struct {
     PyObject *im_func;   /* The callable object implementing the method */
     PyObject *im_self;   /* The instance it is bound to */
     PyObject *im_weakreflist; /* List of weak references */
+    vectorcallfunc vectorcall;
 } PyMethodObject;
 
 PyAPI_DATA(PyTypeObject) PyMethod_Type;
@@ -30,13 +31,13 @@ PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *);
 #define PyMethod_GET_FUNCTION(meth) \
         (((PyMethodObject *)meth) -> im_func)
 #define PyMethod_GET_SELF(meth) \
-	(((PyMethodObject *)meth) -> im_self)
+        (((PyMethodObject *)meth) -> im_self)
 
 PyAPI_FUNC(int) PyMethod_ClearFreeList(void);
 
 typedef struct {
-	PyObject_HEAD
-	PyObject *func;
+    PyObject_HEAD
+    PyObject *func;
 } PyInstanceMethodObject;
 
 PyAPI_DATA(PyTypeObject) PyInstanceMethod_Type;
diff --git a/openflow/usr/include/python3.5m/code.h b/openflow/include/python3.8/code.h
similarity index 51%
rename from openflow/usr/include/python3.5m/code.h
rename to openflow/include/python3.8/code.h
index 8ecf38a..3afddd2 100644
--- a/openflow/usr/include/python3.5m/code.h
+++ b/openflow/include/python3.8/code.h
@@ -7,41 +7,72 @@
 extern "C" {
 #endif
 
+typedef uint16_t _Py_CODEUNIT;
+
+#ifdef WORDS_BIGENDIAN
+#  define _Py_OPCODE(word) ((word) >> 8)
+#  define _Py_OPARG(word) ((word) & 255)
+#else
+#  define _Py_OPCODE(word) ((word) & 255)
+#  define _Py_OPARG(word) ((word) >> 8)
+#endif
+
+typedef struct _PyOpcache _PyOpcache;
+
 /* Bytecode object */
 typedef struct {
     PyObject_HEAD
-    int co_argcount;		/* #arguments, except *args */
-    int co_kwonlyargcount;	/* #keyword only arguments */
-    int co_nlocals;		/* #local variables */
-    int co_stacksize;		/* #entries needed for evaluation stack */
-    int co_flags;		/* CO_..., see below */
-    PyObject *co_code;		/* instruction opcodes */
-    PyObject *co_consts;	/* list (constants used) */
-    PyObject *co_names;		/* list of strings (names used) */
-    PyObject *co_varnames;	/* tuple of strings (local variable names) */
-    PyObject *co_freevars;	/* tuple of strings (free variable names) */
+    int co_argcount;            /* #arguments, except *args */
+    int co_posonlyargcount;     /* #positional only arguments */
+    int co_kwonlyargcount;      /* #keyword only arguments */
+    int co_nlocals;             /* #local variables */
+    int co_stacksize;           /* #entries needed for evaluation stack */
+    int co_flags;               /* CO_..., see below */
+    int co_firstlineno;         /* first source line number */
+    PyObject *co_code;          /* instruction opcodes */
+    PyObject *co_consts;        /* list (constants used) */
+    PyObject *co_names;         /* list of strings (names used) */
+    PyObject *co_varnames;      /* tuple of strings (local variable names) */
+    PyObject *co_freevars;      /* tuple of strings (free variable names) */
     PyObject *co_cellvars;      /* tuple of strings (cell variable names) */
-    /* The rest aren't used in either hash or comparisons, except for
-       co_name (used in both) and co_firstlineno (used only in
-       comparisons).  This is done to preserve the name and line number
+    /* The rest aren't used in either hash or comparisons, except for co_name,
+       used in both. This is done to preserve the name and line number
        for tracebacks and debuggers; otherwise, constant de-duplication
        would collapse identical functions/lambdas defined on different lines.
     */
-    unsigned char *co_cell2arg; /* Maps cell vars which are arguments. */
-    PyObject *co_filename;	/* unicode (where it was loaded from) */
-    PyObject *co_name;		/* unicode (name, for reference) */
-    int co_firstlineno;		/* first source line number */
-    PyObject *co_lnotab;	/* string (encoding addr<->lineno mapping) See
-				   Objects/lnotab_notes.txt for details. */
-    void *co_zombieframe;     /* for optimization only (see frameobject.c) */
+    Py_ssize_t *co_cell2arg;    /* Maps cell vars which are arguments. */
+    PyObject *co_filename;      /* unicode (where it was loaded from) */
+    PyObject *co_name;          /* unicode (name, for reference) */
+    PyObject *co_lnotab;        /* string (encoding addr<->lineno mapping) See
+                                   Objects/lnotab_notes.txt for details. */
+    void *co_zombieframe;       /* for optimization only (see frameobject.c) */
     PyObject *co_weakreflist;   /* to support weakrefs to code objects */
+    /* Scratch space for extra data relating to the code object.
+       Type is a void* to keep the format private in codeobject.c to force
+       people to go through the proper APIs. */
+    void *co_extra;
+
+    /* Per opcodes just-in-time cache
+     *
+     * To reduce cache size, we use indirect mapping from opcode index to
+     * cache object:
+     *   cache = co_opcache[co_opcache_map[next_instr - first_instr] - 1]
+     */
+
+    // co_opcache_map is indexed by (next_instr - first_instr).
+    //  * 0 means there is no cache for this opcode.
+    //  * n > 0 means there is cache in co_opcache[n-1].
+    unsigned char *co_opcache_map;
+    _PyOpcache *co_opcache;
+    int co_opcache_flag;  // used to determine when create a cache.
+    unsigned char co_opcache_size;  // length of co_opcache.
 } PyCodeObject;
 
 /* Masks for co_flags above */
-#define CO_OPTIMIZED	0x0001
-#define CO_NEWLOCALS	0x0002
-#define CO_VARARGS	0x0004
-#define CO_VARKEYWORDS	0x0008
+#define CO_OPTIMIZED    0x0001
+#define CO_NEWLOCALS    0x0002
+#define CO_VARARGS      0x0004
+#define CO_VARKEYWORDS  0x0008
 #define CO_NESTED       0x0010
 #define CO_GENERATOR    0x0020
 /* The CO_NOFREE flag is set if there are no free or cell variables.
@@ -55,12 +86,13 @@ typedef struct {
    ``async def`` keywords) */
 #define CO_COROUTINE            0x0080
 #define CO_ITERABLE_COROUTINE   0x0100
+#define CO_ASYNC_GENERATOR      0x0200
 
 /* These are no longer used. */
 #if 0
 #define CO_GENERATOR_ALLOWED    0x1000
 #endif
-#define CO_FUTURE_DIVISION    	0x2000
+#define CO_FUTURE_DIVISION      0x2000
 #define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */
 #define CO_FUTURE_WITH_STATEMENT  0x8000
 #define CO_FUTURE_PRINT_FUNCTION  0x10000
@@ -68,11 +100,11 @@ typedef struct {
 
 #define CO_FUTURE_BARRY_AS_BDFL  0x40000
 #define CO_FUTURE_GENERATOR_STOP  0x80000
+#define CO_FUTURE_ANNOTATIONS    0x100000
 
 /* This value is found in the co_cell2arg array when the associated cell
-   variable does not correspond to an argument. The maximum number of
-   arguments is 255 (indexed up to 254), so 255 work as a special flag.*/
-#define CO_CELL_NOT_AN_ARG 255
+   variable does not correspond to an argument. */
+#define CO_CELL_NOT_AN_ARG (-1)
 
 /* This should be defined if a future statement modifies the syntax.
    For example, when a keyword is added.
@@ -88,9 +120,14 @@ PyAPI_DATA(PyTypeObject) PyCode_Type;
 
 /* Public interface */
 PyAPI_FUNC(PyCodeObject *) PyCode_New(
-	int, int, int, int, int, PyObject *, PyObject *,
-	PyObject *, PyObject *, PyObject *, PyObject *,
-	PyObject *, PyObject *, int, PyObject *);
+        int, int, int, int, int, PyObject *, PyObject *,
+        PyObject *, PyObject *, PyObject *, PyObject *,
+        PyObject *, PyObject *, int, PyObject *);
+
+PyAPI_FUNC(PyCodeObject *) PyCode_NewWithPosOnlyArgs(
+        int, int, int, int, int, int, PyObject *, PyObject *,
+        PyObject *, PyObject *, PyObject *, PyObject *,
+        PyObject *, PyObject *, int, PyObject *);
         /* same as struct above */
 
 /* Creates a new empty code object with the specified source location. */
@@ -126,7 +163,15 @@ PyAPI_FUNC(PyObject*) _PyCode_ConstantKey(PyObject *obj);
 #endif
 
 PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts,
-                                      PyObject *names, PyObject *lineno_obj);
+                                      PyObject *names, PyObject *lnotab);
+
+
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(int) _PyCode_GetExtra(PyObject *code, Py_ssize_t index,
+                                 void **extra);
+PyAPI_FUNC(int) _PyCode_SetExtra(PyObject *code, Py_ssize_t index,
+                                 void *extra);
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/codecs.h b/openflow/include/python3.8/codecs.h
similarity index 98%
rename from openflow/usr/include/python3.5m/codecs.h
rename to openflow/include/python3.8/codecs.h
index f8275a1..3ad0f2b 100644
--- a/openflow/usr/include/python3.5m/codecs.h
+++ b/openflow/include/python3.8/codecs.h
@@ -225,10 +225,14 @@ PyAPI_FUNC(PyObject *) PyCodec_XMLCharRefReplaceErrors(PyObject *exc);
 /* replace the unicode encode error with backslash escapes (\x, \u and \U) */
 PyAPI_FUNC(PyObject *) PyCodec_BackslashReplaceErrors(PyObject *exc);
 
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
 /* replace the unicode encode error with backslash escapes (\N, \x, \u and \U) */
 PyAPI_FUNC(PyObject *) PyCodec_NameReplaceErrors(PyObject *exc);
+#endif
 
+#ifndef Py_LIMITED_API
 PyAPI_DATA(const char *) Py_hexdigits;
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/compile.h b/openflow/include/python3.8/compile.h
similarity index 64%
rename from openflow/usr/include/python3.5m/compile.h
rename to openflow/include/python3.8/compile.h
index ecd8dc1..1cda955 100644
--- a/openflow/usr/include/python3.5m/compile.h
+++ b/openflow/include/python3.8/compile.h
@@ -11,6 +11,29 @@ extern "C" {
 /* Public interface */
 struct _node; /* Declare the existence of this type */
 PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *);
+/* XXX (ncoghlan): Unprefixed type name in a public API! */
+
+#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
+                   CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \
+                   CO_FUTURE_UNICODE_LITERALS | CO_FUTURE_BARRY_AS_BDFL | \
+                   CO_FUTURE_GENERATOR_STOP | CO_FUTURE_ANNOTATIONS)
+#define PyCF_MASK_OBSOLETE (CO_NESTED)
+#define PyCF_SOURCE_IS_UTF8  0x0100
+#define PyCF_DONT_IMPLY_DEDENT 0x0200
+#define PyCF_ONLY_AST 0x0400
+#define PyCF_IGNORE_COOKIE 0x0800
+#define PyCF_TYPE_COMMENTS 0x1000
+#define PyCF_ALLOW_TOP_LEVEL_AWAIT 0x2000
+
+#ifndef Py_LIMITED_API
+typedef struct {
+    int cf_flags;  /* bitmask of CO_xxx flags relevant to future */
+    int cf_feature_version;  /* minor Python version (PyCF_ONLY_AST) */
+} PyCompilerFlags;
+
+#define _PyCompilerFlags_INIT \
+    (PyCompilerFlags){.cf_flags = 0, .cf_feature_version = PY_MINOR_VERSION}
+#endif
 
 /* Future feature support */
 
@@ -28,6 +51,7 @@ typedef struct {
 #define FUTURE_UNICODE_LITERALS "unicode_literals"
 #define FUTURE_BARRY_AS_BDFL "barry_as_FLUFL"
 #define FUTURE_GENERATOR_STOP "generator_stop"
+#define FUTURE_ANNOTATIONS "annotations"
 
 struct _mod; /* Declare the existence of this type */
 #define PyAST_Compile(mod, s, f, ar) PyAST_CompileEx(mod, s, f, -1, ar)
@@ -57,6 +81,9 @@ PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name);
 
 #define PY_INVALID_STACK_EFFECT INT_MAX
 PyAPI_FUNC(int) PyCompile_OpcodeStackEffect(int opcode, int oparg);
+PyAPI_FUNC(int) PyCompile_OpcodeStackEffectWithJump(int opcode, int oparg, int jump);
+
+PyAPI_FUNC(int) _PyAST_Optimize(struct _mod *, PyArena *arena, int optimize);
 
 #ifdef __cplusplus
 }
@@ -64,10 +91,10 @@ PyAPI_FUNC(int) PyCompile_OpcodeStackEffect(int opcode, int oparg);
 
 #endif /* !Py_LIMITED_API */
 
-/* These definitions must match corresponding definitions in graminit.h.
-   There's code in compile.c that checks that they are the same. */
+/* These definitions must match corresponding definitions in graminit.h. */
 #define Py_single_input 256
 #define Py_file_input 257
 #define Py_eval_input 258
+#define Py_func_type_input 345
 
 #endif /* !Py_COMPILE_H */
diff --git a/openflow/usr/include/python3.5m/complexobject.h b/openflow/include/python3.8/complexobject.h
similarity index 100%
rename from openflow/usr/include/python3.5m/complexobject.h
rename to openflow/include/python3.8/complexobject.h
diff --git a/openflow/include/python3.8/context.h b/openflow/include/python3.8/context.h
new file mode 100644
index 0000000..9581285
--- /dev/null
+++ b/openflow/include/python3.8/context.h
@@ -0,0 +1,84 @@
+#ifndef Py_CONTEXT_H
+#define Py_CONTEXT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_LIMITED_API
+
+
+PyAPI_DATA(PyTypeObject) PyContext_Type;
+typedef struct _pycontextobject PyContext;
+
+PyAPI_DATA(PyTypeObject) PyContextVar_Type;
+typedef struct _pycontextvarobject PyContextVar;
+
+PyAPI_DATA(PyTypeObject) PyContextToken_Type;
+typedef struct _pycontexttokenobject PyContextToken;
+
+
+#define PyContext_CheckExact(o) (Py_TYPE(o) == &PyContext_Type)
+#define PyContextVar_CheckExact(o) (Py_TYPE(o) == &PyContextVar_Type)
+#define PyContextToken_CheckExact(o) (Py_TYPE(o) == &PyContextToken_Type)
+
+
+PyAPI_FUNC(PyObject *) PyContext_New(void);
+PyAPI_FUNC(PyObject *) PyContext_Copy(PyObject *);
+PyAPI_FUNC(PyObject *) PyContext_CopyCurrent(void);
+
+PyAPI_FUNC(int) PyContext_Enter(PyObject *);
+PyAPI_FUNC(int) PyContext_Exit(PyObject *);
+
+
+/* Create a new context variable.
+
+   default_value can be NULL.
+*/
+PyAPI_FUNC(PyObject *) PyContextVar_New(
+    const char *name, PyObject *default_value);
+
+
+/* Get a value for the variable.
+
+   Returns -1 if an error occurred during lookup.
+
+   Returns 0 if value either was or was not found.
+
+   If value was found, *value will point to it.
+   If not, it will point to:
+
+   - default_value, if not NULL;
+   - the default value of "var", if not NULL;
+   - NULL.
+
+   '*value' will be a new ref, if not NULL.
+*/
+PyAPI_FUNC(int) PyContextVar_Get(
+    PyObject *var, PyObject *default_value, PyObject **value);
+
+
+/* Set a new value for the variable.
+   Returns NULL if an error occurs.
+*/
+PyAPI_FUNC(PyObject *) PyContextVar_Set(PyObject *var, PyObject *value);
+
+
+/* Reset a variable to its previous value.
+   Returns 0 on success, -1 on error.
+*/
+PyAPI_FUNC(int) PyContextVar_Reset(PyObject *var, PyObject *token);
+
+
+/* This method is exposed only for CPython tests. Don not use it. */
+PyAPI_FUNC(PyObject *) _PyContext_NewHamtForTests(void);
+
+
+PyAPI_FUNC(int) PyContext_ClearFreeList(void);
+
+
+#endif /* !Py_LIMITED_API */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_CONTEXT_H */
diff --git a/openflow/include/python3.8/cpython/abstract.h b/openflow/include/python3.8/cpython/abstract.h
new file mode 100644
index 0000000..2ea3209
--- /dev/null
+++ b/openflow/include/python3.8/cpython/abstract.h
@@ -0,0 +1,319 @@
+#ifndef Py_CPYTHON_ABSTRACTOBJECT_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* === Object Protocol ================================================== */
+
+#ifdef PY_SSIZE_T_CLEAN
+#  define _PyObject_CallMethodId _PyObject_CallMethodId_SizeT
+#endif
+
+/* Convert keyword arguments from the FASTCALL (stack: C array, kwnames: tuple)
+   format to a Python dictionary ("kwargs" dict).
+
+   The type of kwnames keys is not checked. The final function getting
+   arguments is responsible to check if all keys are strings, for example using
+   PyArg_ParseTupleAndKeywords() or PyArg_ValidateKeywordArguments().
+
+   Duplicate keys are merged using the last value. If duplicate keys must raise
+   an exception, the caller is responsible to implement an explicit keys on
+   kwnames. */
+PyAPI_FUNC(PyObject *) _PyStack_AsDict(
+    PyObject *const *values,
+    PyObject *kwnames);
+
+/* Convert (args, nargs, kwargs: dict) into a (stack, nargs, kwnames: tuple).
+
+   Return 0 on success, raise an exception and return -1 on error.
+
+   Write the new stack into *p_stack. If *p_stack is differen than args, it
+   must be released by PyMem_Free().
+
+   The stack uses borrowed references.
+
+   The type of keyword keys is not checked, these checks should be done
+   later (ex: _PyArg_ParseStackAndKeywords). */
+PyAPI_FUNC(int) _PyStack_UnpackDict(
+    PyObject *const *args,
+    Py_ssize_t nargs,
+    PyObject *kwargs,
+    PyObject *const **p_stack,
+    PyObject **p_kwnames);
+
+/* Suggested size (number of positional arguments) for arrays of PyObject*
+   allocated on a C stack to avoid allocating memory on the heap memory. Such
+   array is used to pass positional arguments to call functions of the
+   _PyObject_Vectorcall() family.
+
+   The size is chosen to not abuse the C stack and so limit the risk of stack
+   overflow. The size is also chosen to allow using the small stack for most
+   function calls of the Python standard library. On 64-bit CPU, it allocates
+   40 bytes on the stack. */
+#define _PY_FASTCALL_SMALL_STACK 5
+
+PyAPI_FUNC(PyObject *) _Py_CheckFunctionResult(PyObject *callable,
+                                               PyObject *result,
+                                               const char *where);
+
+/* === Vectorcall protocol (PEP 590) ============================= */
+
+/* Call callable using tp_call. Arguments are like _PyObject_Vectorcall()
+   or _PyObject_FastCallDict() (both forms are supported),
+   except that nargs is plainly the number of arguments without flags. */
+PyAPI_FUNC(PyObject *) _PyObject_MakeTpCall(
+    PyObject *callable,
+    PyObject *const *args, Py_ssize_t nargs,
+    PyObject *keywords);
+
+#define PY_VECTORCALL_ARGUMENTS_OFFSET ((size_t)1 << (8 * sizeof(size_t) - 1))
+
+static inline Py_ssize_t
+PyVectorcall_NARGS(size_t n)
+{
+    return n & ~PY_VECTORCALL_ARGUMENTS_OFFSET;
+}
+
+static inline vectorcallfunc
+_PyVectorcall_Function(PyObject *callable)
+{
+    PyTypeObject *tp = Py_TYPE(callable);
+    Py_ssize_t offset = tp->tp_vectorcall_offset;
+    vectorcallfunc *ptr;
+    if (!PyType_HasFeature(tp, _Py_TPFLAGS_HAVE_VECTORCALL)) {
+        return NULL;
+    }
+    assert(PyCallable_Check(callable));
+    assert(offset > 0);
+    ptr = (vectorcallfunc*)(((char *)callable) + offset);
+    return *ptr;
+}
+
+/* Call the callable object 'callable' with the "vectorcall" calling
+   convention.
+
+   args is a C array for positional arguments.
+
+   nargsf is the number of positional arguments plus optionally the flag
+   PY_VECTORCALL_ARGUMENTS_OFFSET which means that the caller is allowed to
+   modify args[-1].
+
+   kwnames is a tuple of keyword names. The values of the keyword arguments
+   are stored in "args" after the positional arguments (note that the number
+   of keyword arguments does not change nargsf). kwnames can also be NULL if
+   there are no keyword arguments.
+
+   keywords must only contains str strings (no subclass), and all keys must
+   be unique.
+
+   Return the result on success. Raise an exception and return NULL on
+   error. */
+static inline PyObject *
+_PyObject_Vectorcall(PyObject *callable, PyObject *const *args,
+                     size_t nargsf, PyObject *kwnames)
+{
+    PyObject *res;
+    vectorcallfunc func;
+    assert(kwnames == NULL || PyTuple_Check(kwnames));
+    assert(args != NULL || PyVectorcall_NARGS(nargsf) == 0);
+    func = _PyVectorcall_Function(callable);
+    if (func == NULL) {
+        Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+        return _PyObject_MakeTpCall(callable, args, nargs, kwnames);
+    }
+    res = func(callable, args, nargsf, kwnames);
+    return _Py_CheckFunctionResult(callable, res, NULL);
+}
+
+/* Same as _PyObject_Vectorcall except that keyword arguments are passed as
+   dict, which may be NULL if there are no keyword arguments. */
+PyAPI_FUNC(PyObject *) _PyObject_FastCallDict(
+    PyObject *callable,
+    PyObject *const *args,
+    size_t nargsf,
+    PyObject *kwargs);
+
+/* Call "callable" (which must support vectorcall) with positional arguments
+   "tuple" and keyword arguments "dict". "dict" may also be NULL */
+PyAPI_FUNC(PyObject *) PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *dict);
+
+/* Same as _PyObject_Vectorcall except without keyword arguments */
+static inline PyObject *
+_PyObject_FastCall(PyObject *func, PyObject *const *args, Py_ssize_t nargs)
+{
+    return _PyObject_Vectorcall(func, args, (size_t)nargs, NULL);
+}
+
+/* Call a callable without any arguments */
+static inline PyObject *
+_PyObject_CallNoArg(PyObject *func) {
+    return _PyObject_Vectorcall(func, NULL, 0, NULL);
+}
+
+PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(
+    PyObject *callable,
+    PyObject *obj,
+    PyObject *args,
+    PyObject *kwargs);
+
+PyAPI_FUNC(PyObject *) _PyObject_FastCall_Prepend(
+    PyObject *callable,
+    PyObject *obj,
+    PyObject *const *args,
+    Py_ssize_t nargs);
+
+/* Like PyObject_CallMethod(), but expect a _Py_Identifier*
+   as the method name. */
+PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *obj,
+                                              _Py_Identifier *name,
+                                              const char *format, ...);
+
+PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *obj,
+                                                    _Py_Identifier *name,
+                                                    const char *format,
+                                                    ...);
+
+PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(
+    PyObject *obj,
+    struct _Py_Identifier *name,
+    ...);
+
+PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o);
+
+/* Guess the size of object 'o' using len(o) or o.__length_hint__().
+   If neither of those return a non-negative value, then return the default
+   value.  If one of the calls fails, this function returns -1. */
+PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t);
+
+/* === New Buffer API ============================================ */
+
+/* Return 1 if the getbuffer function is available, otherwise return 0. */
+#define PyObject_CheckBuffer(obj) \
+    (((obj)->ob_type->tp_as_buffer != NULL) &&  \
+     ((obj)->ob_type->tp_as_buffer->bf_getbuffer != NULL))
+
+/* This is a C-API version of the getbuffer function call.  It checks
+   to make sure object has the required function pointer and issues the
+   call.
+
+   Returns -1 and raises an error on failure and returns 0 on success. */
+PyAPI_FUNC(int) PyObject_GetBuffer(PyObject *obj, Py_buffer *view,
+                                   int flags);
+
+/* Get the memory area pointed to by the indices for the buffer given.
+   Note that view->ndim is the assumed size of indices. */
+PyAPI_FUNC(void *) PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices);
+
+/* Return the implied itemsize of the data-format area from a
+   struct-style description. */
+PyAPI_FUNC(int) PyBuffer_SizeFromFormat(const char *);
+
+/* Implementation in memoryobject.c */
+PyAPI_FUNC(int) PyBuffer_ToContiguous(void *buf, Py_buffer *view,
+                                      Py_ssize_t len, char order);
+
+PyAPI_FUNC(int) PyBuffer_FromContiguous(Py_buffer *view, void *buf,
+                                        Py_ssize_t len, char order);
+
+/* Copy len bytes of data from the contiguous chunk of memory
+   pointed to by buf into the buffer exported by obj.  Return
+   0 on success and return -1 and raise a PyBuffer_Error on
+   error (i.e. the object does not have a buffer interface or
+   it is not working).
+
+   If fort is 'F', then if the object is multi-dimensional,
+   then the data will be copied into the array in
+   Fortran-style (first dimension varies the fastest).  If
+   fort is 'C', then the data will be copied into the array
+   in C-style (last dimension varies the fastest).  If fort
+   is 'A', then it does not matter and the copy will be made
+   in whatever way is more efficient. */
+PyAPI_FUNC(int) PyObject_CopyData(PyObject *dest, PyObject *src);
+
+/* Copy the data from the src buffer to the buffer of destination. */
+PyAPI_FUNC(int) PyBuffer_IsContiguous(const Py_buffer *view, char fort);
+
+/*Fill the strides array with byte-strides of a contiguous
+  (Fortran-style if fort is 'F' or C-style otherwise)
+  array of the given shape with the given number of bytes
+  per element. */
+PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims,
+                                               Py_ssize_t *shape,
+                                               Py_ssize_t *strides,
+                                               int itemsize,
+                                               char fort);
+
+/* Fills in a buffer-info structure correctly for an exporter
+   that can only share a contiguous chunk of memory of
+   "unsigned bytes" of the given length.
+
+   Returns 0 on success and -1 (with raising an error) on error. */
+PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, PyObject *o, void *buf,
+                                  Py_ssize_t len, int readonly,
+                                  int flags);
+
+/* Releases a Py_buffer obtained from getbuffer ParseTuple's "s*". */
+PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view);
+
+/* ==== Iterators ================================================ */
+
+#define PyIter_Check(obj) \
+    ((obj)->ob_type->tp_iternext != NULL && \
+     (obj)->ob_type->tp_iternext != &_PyObject_NextNotImplemented)
+
+/* === Number Protocol ================================================== */
+
+#define PyIndex_Check(obj)                              \
+    ((obj)->ob_type->tp_as_number != NULL &&            \
+     (obj)->ob_type->tp_as_number->nb_index != NULL)
+
+/* === Sequence protocol ================================================ */
+
+/* Assume tp_as_sequence and sq_item exist and that 'i' does not
+   need to be corrected for a negative index. */
+#define PySequence_ITEM(o, i)\
+    ( Py_TYPE(o)->tp_as_sequence->sq_item(o, i) )
+
+#define PY_ITERSEARCH_COUNT    1
+#define PY_ITERSEARCH_INDEX    2
+#define PY_ITERSEARCH_CONTAINS 3
+
+/* Iterate over seq.
+
+   Result depends on the operation:
+
+   PY_ITERSEARCH_COUNT:  return # of times obj appears in seq; -1 if
+     error.
+   PY_ITERSEARCH_INDEX:  return 0-based index of first occurrence of
+     obj in seq; set ValueError and return -1 if none found;
+     also return -1 on error.
+   PY_ITERSEARCH_CONTAINS:  return 1 if obj in seq, else 0; -1 on
+     error. */
+PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq,
+                                              PyObject *obj, int operation);
+
+/* === Mapping protocol ================================================= */
+
+PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls);
+
+PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls);
+
+PyAPI_FUNC(char *const *) _PySequence_BytesToCharpArray(PyObject* self);
+
+PyAPI_FUNC(void) _Py_FreeCharPArray(char *const array[]);
+
+/* For internal use by buffer API functions */
+PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index,
+                                        const Py_ssize_t *shape);
+PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index,
+                                        const Py_ssize_t *shape);
+
+/* Convert Python int to Py_ssize_t. Do nothing if the argument is None. */
+PyAPI_FUNC(int) _Py_convert_optional_to_ssize_t(PyObject *, void *);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/dictobject.h b/openflow/include/python3.8/cpython/dictobject.h
new file mode 100644
index 0000000..64c012a
--- /dev/null
+++ b/openflow/include/python3.8/cpython/dictobject.h
@@ -0,0 +1,94 @@
+#ifndef Py_CPYTHON_DICTOBJECT_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _dictkeysobject PyDictKeysObject;
+
+/* The ma_values pointer is NULL for a combined table
+ * or points to an array of PyObject* for a split table
+ */
+typedef struct {
+    PyObject_HEAD
+
+    /* Number of items in the dictionary */
+    Py_ssize_t ma_used;
+
+    /* Dictionary version: globally unique, value change each time
+       the dictionary is modified */
+    uint64_t ma_version_tag;
+
+    PyDictKeysObject *ma_keys;
+
+    /* If ma_values is NULL, the table is "combined": keys and values
+       are stored in ma_keys.
+
+       If ma_values is not NULL, the table is splitted:
+       keys are stored in ma_keys and values are stored in ma_values */
+    PyObject **ma_values;
+} PyDictObject;
+
+PyAPI_FUNC(PyObject *) _PyDict_GetItem_KnownHash(PyObject *mp, PyObject *key,
+                                       Py_hash_t hash);
+PyAPI_FUNC(PyObject *) _PyDict_GetItemIdWithError(PyObject *dp,
+                                                  struct _Py_Identifier *key);
+PyAPI_FUNC(PyObject *) _PyDict_GetItemStringWithError(PyObject *, const char *);
+PyAPI_FUNC(PyObject *) PyDict_SetDefault(
+    PyObject *mp, PyObject *key, PyObject *defaultobj);
+PyAPI_FUNC(int) _PyDict_SetItem_KnownHash(PyObject *mp, PyObject *key,
+                                          PyObject *item, Py_hash_t hash);
+PyAPI_FUNC(int) _PyDict_DelItem_KnownHash(PyObject *mp, PyObject *key,
+                                          Py_hash_t hash);
+PyAPI_FUNC(int) _PyDict_DelItemIf(PyObject *mp, PyObject *key,
+                                  int (*predicate)(PyObject *value));
+PyDictKeysObject *_PyDict_NewKeysForClass(void);
+PyAPI_FUNC(PyObject *) PyObject_GenericGetDict(PyObject *, void *);
+PyAPI_FUNC(int) _PyDict_Next(
+    PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, Py_hash_t *hash);
+
+/* Get the number of items of a dictionary. */
+#define PyDict_GET_SIZE(mp)  (assert(PyDict_Check(mp)),((PyDictObject *)mp)->ma_used)
+PyAPI_FUNC(int) _PyDict_Contains(PyObject *mp, PyObject *key, Py_hash_t hash);
+PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused);
+PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp);
+PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp);
+Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys);
+PyAPI_FUNC(Py_ssize_t) _PyDict_SizeOf(PyDictObject *);
+PyAPI_FUNC(PyObject *) _PyDict_Pop(PyObject *, PyObject *, PyObject *);
+PyObject *_PyDict_Pop_KnownHash(PyObject *, PyObject *, Py_hash_t, PyObject *);
+PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *);
+#define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL)
+
+PyAPI_FUNC(int) PyDict_ClearFreeList(void);
+
+/* Like PyDict_Merge, but override can be 0, 1 or 2.  If override is 0,
+   the first occurrence of a key wins, if override is 1, the last occurrence
+   of a key wins, if override is 2, a KeyError with conflicting key as
+   argument is raised.
+*/
+PyAPI_FUNC(int) _PyDict_MergeEx(PyObject *mp, PyObject *other, int override);
+PyAPI_FUNC(PyObject *) _PyDict_GetItemId(PyObject *dp, struct _Py_Identifier *key);
+PyAPI_FUNC(int) _PyDict_SetItemId(PyObject *dp, struct _Py_Identifier *key, PyObject *item);
+
+PyAPI_FUNC(int) _PyDict_DelItemId(PyObject *mp, struct _Py_Identifier *key);
+PyAPI_FUNC(void) _PyDict_DebugMallocStats(FILE *out);
+
+int _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr, PyObject *name, PyObject *value);
+PyObject *_PyDict_LoadGlobal(PyDictObject *, PyDictObject *, PyObject *);
+
+/* _PyDictView */
+
+typedef struct {
+    PyObject_HEAD
+    PyDictObject *dv_dict;
+} _PyDictViewObject;
+
+PyAPI_FUNC(PyObject *) _PyDictView_New(PyObject *, PyTypeObject *);
+PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/fileobject.h b/openflow/include/python3.8/cpython/fileobject.h
new file mode 100644
index 0000000..57eac13
--- /dev/null
+++ b/openflow/include/python3.8/cpython/fileobject.h
@@ -0,0 +1,32 @@
+#ifndef Py_CPYTHON_FILEOBJECT_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
+PyAPI_DATA(const char *) Py_FileSystemDefaultEncodeErrors;
+#endif
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
+PyAPI_DATA(int) Py_UTF8Mode;
+#endif
+
+/* The std printer acts as a preliminary sys.stderr until the new io
+   infrastructure is in place. */
+PyAPI_FUNC(PyObject *) PyFile_NewStdPrinter(int);
+PyAPI_DATA(PyTypeObject) PyStdPrinter_Type;
+
+typedef PyObject * (*Py_OpenCodeHookFunction)(PyObject *, void *);
+
+PyAPI_FUNC(PyObject *) PyFile_OpenCode(const char *utf8path);
+PyAPI_FUNC(PyObject *) PyFile_OpenCodeObject(PyObject *path);
+PyAPI_FUNC(int) PyFile_SetOpenCodeHook(Py_OpenCodeHookFunction hook, void *userData);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/initconfig.h b/openflow/include/python3.8/cpython/initconfig.h
new file mode 100644
index 0000000..4b5ceaf
--- /dev/null
+++ b/openflow/include/python3.8/cpython/initconfig.h
@@ -0,0 +1,434 @@
+#ifndef Py_PYCORECONFIG_H
+#define Py_PYCORECONFIG_H
+#ifndef Py_LIMITED_API
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* --- PyStatus ----------------------------------------------- */
+
+typedef struct {
+    enum {
+        _PyStatus_TYPE_OK=0,
+        _PyStatus_TYPE_ERROR=1,
+        _PyStatus_TYPE_EXIT=2
+    } _type;
+    const char *func;
+    const char *err_msg;
+    int exitcode;
+} PyStatus;
+
+PyAPI_FUNC(PyStatus) PyStatus_Ok(void);
+PyAPI_FUNC(PyStatus) PyStatus_Error(const char *err_msg);
+PyAPI_FUNC(PyStatus) PyStatus_NoMemory(void);
+PyAPI_FUNC(PyStatus) PyStatus_Exit(int exitcode);
+PyAPI_FUNC(int) PyStatus_IsError(PyStatus err);
+PyAPI_FUNC(int) PyStatus_IsExit(PyStatus err);
+PyAPI_FUNC(int) PyStatus_Exception(PyStatus err);
+
+/* --- PyWideStringList ------------------------------------------------ */
+
+typedef struct {
+    /* If length is greater than zero, items must be non-NULL
+       and all items strings must be non-NULL */
+    Py_ssize_t length;
+    wchar_t **items;
+} PyWideStringList;
+
+PyAPI_FUNC(PyStatus) PyWideStringList_Append(PyWideStringList *list,
+    const wchar_t *item);
+PyAPI_FUNC(PyStatus) PyWideStringList_Insert(PyWideStringList *list,
+    Py_ssize_t index,
+    const wchar_t *item);
+
+
+/* --- PyPreConfig ----------------------------------------------- */
+
+typedef struct {
+    int _config_init;     /* _PyConfigInitEnum value */
+
+    /* Parse Py_PreInitializeFromBytesArgs() arguments?
+       See PyConfig.parse_argv */
+    int parse_argv;
+
+    /* If greater than 0, enable isolated mode: sys.path contains
+       neither the script's directory nor the user's site-packages directory.
+
+       Set to 1 by the -I command line option. If set to -1 (default), inherit
+       Py_IsolatedFlag value. */
+    int isolated;
+
+    /* If greater than 0: use environment variables.
+       Set to 0 by -E command line option. If set to -1 (default), it is
+       set to !Py_IgnoreEnvironmentFlag. */
+    int use_environment;
+
+    /* Set the LC_CTYPE locale to the user preferred locale? If equals to 0,
+       set coerce_c_locale and coerce_c_locale_warn to 0. */
+    int configure_locale;
+
+    /* Coerce the LC_CTYPE locale if it's equal to "C"? (PEP 538)
+
+       Set to 0 by PYTHONCOERCECLOCALE=0. Set to 1 by PYTHONCOERCECLOCALE=1.
+       Set to 2 if the user preferred LC_CTYPE locale is "C".
+
+       If it is equal to 1, LC_CTYPE locale is read to decide if it should be
+       coerced or not (ex: PYTHONCOERCECLOCALE=1). Internally, it is set to 2
+       if the LC_CTYPE locale must be coerced.
+
+       Disable by default (set to 0). Set it to -1 to let Python decide if it
+       should be enabled or not. */
+    int coerce_c_locale;
+
+    /* Emit a warning if the LC_CTYPE locale is coerced?
+
+       Set to 1 by PYTHONCOERCECLOCALE=warn.
+
+       Disable by default (set to 0). Set it to -1 to let Python decide if it
+       should be enabled or not. */
+    int coerce_c_locale_warn;
+
+#ifdef MS_WINDOWS
+    /* If greater than 1, use the "mbcs" encoding instead of the UTF-8
+       encoding for the filesystem encoding.
+
+       Set to 1 if the PYTHONLEGACYWINDOWSFSENCODING environment variable is
+       set to a non-empty string. If set to -1 (default), inherit
+       Py_LegacyWindowsFSEncodingFlag value.
+
+       See PEP 529 for more details. */
+    int legacy_windows_fs_encoding;
+#endif
+
+    /* Enable UTF-8 mode? (PEP 540)
+
+       Disabled by default (equals to 0).
+
+       Set to 1 by "-X utf8" and "-X utf8=1" command line options.
+       Set to 1 by PYTHONUTF8=1 environment variable.
+
+       Set to 0 by "-X utf8=0" and PYTHONUTF8=0.
+
+       If equals to -1, it is set to 1 if the LC_CTYPE locale is "C" or
+       "POSIX", otherwise it is set to 0. Inherit Py_UTF8Mode value value. */
+    int utf8_mode;
+
+    int dev_mode;           /* Development mode. PYTHONDEVMODE, -X dev */
+
+    /* Memory allocator: PYTHONMALLOC env var.
+       See PyMemAllocatorName for valid values. */
+    int allocator;
+} PyPreConfig;
+
+PyAPI_FUNC(void) PyPreConfig_InitPythonConfig(PyPreConfig *config);
+PyAPI_FUNC(void) PyPreConfig_InitIsolatedConfig(PyPreConfig *config);
+
+
+/* --- PyConfig ---------------------------------------------- */
+
+typedef struct {
+    int _config_init;     /* _PyConfigInitEnum value */
+
+    int isolated;         /* Isolated mode? see PyPreConfig.isolated */
+    int use_environment;  /* Use environment variables? see PyPreConfig.use_environment */
+    int dev_mode;         /* Development mode? See PyPreConfig.dev_mode */
+
+    /* Install signal handlers? Yes by default. */
+    int install_signal_handlers;
+
+    int use_hash_seed;      /* PYTHONHASHSEED=x */
+    unsigned long hash_seed;
+
+    /* Enable faulthandler?
+       Set to 1 by -X faulthandler and PYTHONFAULTHANDLER. -1 means unset. */
+    int faulthandler;
+
+    /* Enable tracemalloc?
+       Set by -X tracemalloc=N and PYTHONTRACEMALLOC. -1 means unset */
+    int tracemalloc;
+
+    int import_time;        /* PYTHONPROFILEIMPORTTIME, -X importtime */
+    int show_ref_count;     /* -X showrefcount */
+    int show_alloc_count;   /* -X showalloccount */
+    int dump_refs;          /* PYTHONDUMPREFS */
+    int malloc_stats;       /* PYTHONMALLOCSTATS */
+
+    /* Python filesystem encoding and error handler:
+       sys.getfilesystemencoding() and sys.getfilesystemencodeerrors().
+
+       Default encoding and error handler:
+
+       * if Py_SetStandardStreamEncoding() has been called: they have the
+         highest priority;
+       * PYTHONIOENCODING environment variable;
+       * The UTF-8 Mode uses UTF-8/surrogateescape;
+       * If Python forces the usage of the ASCII encoding (ex: C locale
+         or POSIX locale on FreeBSD or HP-UX), use ASCII/surrogateescape;
+       * locale encoding: ANSI code page on Windows, UTF-8 on Android and
+         VxWorks, LC_CTYPE locale encoding on other platforms;
+       * On Windows, "surrogateescape" error handler;
+       * "surrogateescape" error handler if the LC_CTYPE locale is "C" or "POSIX";
+       * "surrogateescape" error handler if the LC_CTYPE locale has been coerced
+         (PEP 538);
+       * "strict" error handler.
+
+       Supported error handlers: "strict", "surrogateescape" and
+       "surrogatepass". The surrogatepass error handler is only supported
+       if Py_DecodeLocale() and Py_EncodeLocale() use directly the UTF-8 codec;
+       it's only used on Windows.
+
+       initfsencoding() updates the encoding to the Python codec name.
+       For example, "ANSI_X3.4-1968" is replaced with "ascii".
+
+       On Windows, sys._enablelegacywindowsfsencoding() sets the
+       encoding/errors to mbcs/replace at runtime.
+
+
+       See Py_FileSystemDefaultEncoding and Py_FileSystemDefaultEncodeErrors.
+       */
+    wchar_t *filesystem_encoding;
+    wchar_t *filesystem_errors;
+
+    wchar_t *pycache_prefix;  /* PYTHONPYCACHEPREFIX, -X pycache_prefix=PATH */
+    int parse_argv;           /* Parse argv command line arguments? */
+
+    /* Command line arguments (sys.argv).
+
+       Set parse_argv to 1 to parse argv as Python command line arguments
+       and then strip Python arguments from argv.
+
+       If argv is empty, an empty string is added to ensure that sys.argv
+       always exists and is never empty. */
+    PyWideStringList argv;
+
+    /* Program name:
+
+       - If Py_SetProgramName() was called, use its value.
+       - On macOS, use PYTHONEXECUTABLE environment variable if set.
+       - If WITH_NEXT_FRAMEWORK macro is defined, use __PYVENV_LAUNCHER__
+         environment variable is set.
+       - Use argv[0] if available and non-empty.
+       - Use "python" on Windows, or "python3 on other platforms. */
+    wchar_t *program_name;
+
+    PyWideStringList xoptions;     /* Command line -X options */
+
+    /* Warnings options: lowest to highest priority. warnings.filters
+       is built in the reverse order (highest to lowest priority). */
+    PyWideStringList warnoptions;
+
+    /* If equal to zero, disable the import of the module site and the
+       site-dependent manipulations of sys.path that it entails. Also disable
+       these manipulations if site is explicitly imported later (call
+       site.main() if you want them to be triggered).
+
+       Set to 0 by the -S command line option. If set to -1 (default), it is
+       set to !Py_NoSiteFlag. */
+    int site_import;
+
+    /* Bytes warnings:
+
+       * If equal to 1, issue a warning when comparing bytes or bytearray with
+         str or bytes with int.
+       * If equal or greater to 2, issue an error.
+
+       Incremented by the -b command line option. If set to -1 (default), inherit
+       Py_BytesWarningFlag value. */
+    int bytes_warning;
+
+    /* If greater than 0, enable inspect: when a script is passed as first
+       argument or the -c option is used, enter interactive mode after
+       executing the script or the command, even when sys.stdin does not appear
+       to be a terminal.
+
+       Incremented by the -i command line option. Set to 1 if the PYTHONINSPECT
+       environment variable is non-empty. If set to -1 (default), inherit
+       Py_InspectFlag value. */
+    int inspect;
+
+    /* If greater than 0: enable the interactive mode (REPL).
+
+       Incremented by the -i command line option. If set to -1 (default),
+       inherit Py_InteractiveFlag value. */
+    int interactive;
+
+    /* Optimization level.
+
+       Incremented by the -O command line option. Set by the PYTHONOPTIMIZE
+       environment variable. If set to -1 (default), inherit Py_OptimizeFlag
+       value. */
+    int optimization_level;
+
+    /* If greater than 0, enable the debug mode: turn on parser debugging
+       output (for expert only, depending on compilation options).
+
+       Incremented by the -d command line option. Set by the PYTHONDEBUG
+       environment variable. If set to -1 (default), inherit Py_DebugFlag
+       value. */
+    int parser_debug;
+
+    /* If equal to 0, Python won't try to write ``.pyc`` files on the
+       import of source modules.
+
+       Set to 0 by the -B command line option and the PYTHONDONTWRITEBYTECODE
+       environment variable. If set to -1 (default), it is set to
+       !Py_DontWriteBytecodeFlag. */
+    int write_bytecode;
+
+    /* If greater than 0, enable the verbose mode: print a message each time a
+       module is initialized, showing the place (filename or built-in module)
+       from which it is loaded.
+
+       If greater or equal to 2, print a message for each file that is checked
+       for when searching for a module. Also provides information on module
+       cleanup at exit.
+
+       Incremented by the -v option. Set by the PYTHONVERBOSE environment
+       variable. If set to -1 (default), inherit Py_VerboseFlag value. */
+    int verbose;
+
+    /* If greater than 0, enable the quiet mode: Don't display the copyright
+       and version messages even in interactive mode.
+
+       Incremented by the -q option. If set to -1 (default), inherit
+       Py_QuietFlag value. */
+    int quiet;
+
+   /* If greater than 0, don't add the user site-packages directory to
+      sys.path.
+
+      Set to 0 by the -s and -I command line options , and the PYTHONNOUSERSITE
+      environment variable. If set to -1 (default), it is set to
+      !Py_NoUserSiteDirectory. */
+    int user_site_directory;
+
+    /* If non-zero, configure C standard steams (stdio, stdout,
+       stderr):
+
+       - Set O_BINARY mode on Windows.
+       - If buffered_stdio is equal to zero, make streams unbuffered.
+         Otherwise, enable streams buffering if interactive is non-zero. */
+    int configure_c_stdio;
+
+    /* If equal to 0, enable unbuffered mode: force the stdout and stderr
+       streams to be unbuffered.
+
+       Set to 0 by the -u option. Set by the PYTHONUNBUFFERED environment
+       variable.
+       If set to -1 (default), it is set to !Py_UnbufferedStdioFlag. */
+    int buffered_stdio;
+
+    /* Encoding of sys.stdin, sys.stdout and sys.stderr.
+       Value set from PYTHONIOENCODING environment variable and
+       Py_SetStandardStreamEncoding() function.
+       See also 'stdio_errors' attribute. */
+    wchar_t *stdio_encoding;
+
+    /* Error handler of sys.stdin and sys.stdout.
+       Value set from PYTHONIOENCODING environment variable and
+       Py_SetStandardStreamEncoding() function.
+       See also 'stdio_encoding' attribute. */
+    wchar_t *stdio_errors;
+
+#ifdef MS_WINDOWS
+    /* If greater than zero, use io.FileIO instead of WindowsConsoleIO for sys
+       standard streams.
+
+       Set to 1 if the PYTHONLEGACYWINDOWSSTDIO environment variable is set to
+       a non-empty string. If set to -1 (default), inherit
+       Py_LegacyWindowsStdioFlag value.
+
+       See PEP 528 for more details. */
+    int legacy_windows_stdio;
+#endif
+
+    /* Value of the --check-hash-based-pycs command line option:
+
+       - "default" means the 'check_source' flag in hash-based pycs
+         determines invalidation
+       - "always" causes the interpreter to hash the source file for
+         invalidation regardless of value of 'check_source' bit
+       - "never" causes the interpreter to always assume hash-based pycs are
+         valid
+
+       The default value is "default".
+
+       See PEP 552 "Deterministic pycs" for more details. */
+    wchar_t *check_hash_pycs_mode;
+
+    /* --- Path configuration inputs ------------ */
+
+    /* If greater than 0, suppress _PyPathConfig_Calculate() warnings on Unix.
+       The parameter has no effect on Windows.
+
+       If set to -1 (default), inherit !Py_FrozenFlag value. */
+    int pathconfig_warnings;
+
+    wchar_t *pythonpath_env; /* PYTHONPATH environment variable */
+    wchar_t *home;          /* PYTHONHOME environment variable,
+                               see also Py_SetPythonHome(). */
+
+    /* --- Path configuration outputs ----------- */
+
+    int module_search_paths_set;  /* If non-zero, use module_search_paths */
+    PyWideStringList module_search_paths;  /* sys.path paths. Computed if
+                                       module_search_paths_set is equal
+                                       to zero. */
+
+    wchar_t *executable;        /* sys.executable */
+    wchar_t *base_executable;   /* sys._base_executable */
+    wchar_t *prefix;            /* sys.prefix */
+    wchar_t *base_prefix;       /* sys.base_prefix */
+    wchar_t *exec_prefix;       /* sys.exec_prefix */
+    wchar_t *base_exec_prefix;  /* sys.base_exec_prefix */
+
+    /* --- Parameter only used by Py_Main() ---------- */
+
+    /* Skip the first line of the source ('run_filename' parameter), allowing use of non-Unix forms of
+       "#!cmd".  This is intended for a DOS specific hack only.
+
+       Set by the -x command line option. */
+    int skip_source_first_line;
+
+    wchar_t *run_command;   /* -c command line argument */
+    wchar_t *run_module;    /* -m command line argument */
+    wchar_t *run_filename;  /* Trailing command line argument without -c or -m */
+
+    /* --- Private fields ---------------------------- */
+
+    /* Install importlib? If set to 0, importlib is not initialized at all.
+       Needed by freeze_importlib. */
+    int _install_importlib;
+
+    /* If equal to 0, stop Python initialization before the "main" phase */
+    int _init_main;
+} PyConfig;
+
+PyAPI_FUNC(void) PyConfig_InitPythonConfig(PyConfig *config);
+PyAPI_FUNC(void) PyConfig_InitIsolatedConfig(PyConfig *config);
+PyAPI_FUNC(void) PyConfig_Clear(PyConfig *);
+PyAPI_FUNC(PyStatus) PyConfig_SetString(
+    PyConfig *config,
+    wchar_t **config_str,
+    const wchar_t *str);
+PyAPI_FUNC(PyStatus) PyConfig_SetBytesString(
+    PyConfig *config,
+    wchar_t **config_str,
+    const char *str);
+PyAPI_FUNC(PyStatus) PyConfig_Read(PyConfig *config);
+PyAPI_FUNC(PyStatus) PyConfig_SetBytesArgv(
+    PyConfig *config,
+    Py_ssize_t argc,
+    char * const *argv);
+PyAPI_FUNC(PyStatus) PyConfig_SetArgv(PyConfig *config,
+    Py_ssize_t argc,
+    wchar_t * const *argv);
+PyAPI_FUNC(PyStatus) PyConfig_SetWideStringList(PyConfig *config,
+    PyWideStringList *list,
+    Py_ssize_t length, wchar_t **items);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_LIMITED_API */
+#endif /* !Py_PYCORECONFIG_H */
diff --git a/openflow/include/python3.8/cpython/interpreteridobject.h b/openflow/include/python3.8/cpython/interpreteridobject.h
new file mode 100644
index 0000000..67ec587
--- /dev/null
+++ b/openflow/include/python3.8/cpython/interpreteridobject.h
@@ -0,0 +1,19 @@
+#ifndef Py_CPYTHON_INTERPRETERIDOBJECT_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Interpreter ID Object */
+
+PyAPI_DATA(PyTypeObject) _PyInterpreterID_Type;
+
+PyAPI_FUNC(PyObject *) _PyInterpreterID_New(int64_t);
+PyAPI_FUNC(PyObject *) _PyInterpreterState_GetIDObject(PyInterpreterState *);
+PyAPI_FUNC(PyInterpreterState *) _PyInterpreterID_LookUp(PyObject *);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/object.h b/openflow/include/python3.8/cpython/object.h
new file mode 100644
index 0000000..5a0ac4a
--- /dev/null
+++ b/openflow/include/python3.8/cpython/object.h
@@ -0,0 +1,470 @@
+#ifndef Py_CPYTHON_OBJECT_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/********************* String Literals ****************************************/
+/* This structure helps managing static strings. The basic usage goes like this:
+   Instead of doing
+
+       r = PyObject_CallMethod(o, "foo", "args", ...);
+
+   do
+
+       _Py_IDENTIFIER(foo);
+       ...
+       r = _PyObject_CallMethodId(o, &PyId_foo, "args", ...);
+
+   PyId_foo is a static variable, either on block level or file level. On first
+   usage, the string "foo" is interned, and the structures are linked. On interpreter
+   shutdown, all strings are released (through _PyUnicode_ClearStaticStrings).
+
+   Alternatively, _Py_static_string allows choosing the variable name.
+   _PyUnicode_FromId returns a borrowed reference to the interned string.
+   _PyObject_{Get,Set,Has}AttrId are __getattr__ versions using _Py_Identifier*.
+*/
+typedef struct _Py_Identifier {
+    struct _Py_Identifier *next;
+    const char* string;
+    PyObject *object;
+} _Py_Identifier;
+
+#define _Py_static_string_init(value) { .next = NULL, .string = value, .object = NULL }
+#define _Py_static_string(varname, value)  static _Py_Identifier varname = _Py_static_string_init(value)
+#define _Py_IDENTIFIER(varname) _Py_static_string(PyId_##varname, #varname)
+
+/* buffer interface */
+typedef struct bufferinfo {
+    void *buf;
+    PyObject *obj;        /* owned reference */
+    Py_ssize_t len;
+    Py_ssize_t itemsize;  /* This is Py_ssize_t so it can be
+                             pointed to by strides in simple case.*/
+    int readonly;
+    int ndim;
+    char *format;
+    Py_ssize_t *shape;
+    Py_ssize_t *strides;
+    Py_ssize_t *suboffsets;
+    void *internal;
+} Py_buffer;
+
+typedef int (*getbufferproc)(PyObject *, Py_buffer *, int);
+typedef void (*releasebufferproc)(PyObject *, Py_buffer *);
+
+typedef PyObject *(*vectorcallfunc)(PyObject *callable, PyObject *const *args,
+                                    size_t nargsf, PyObject *kwnames);
+
+/* Maximum number of dimensions */
+#define PyBUF_MAX_NDIM 64
+
+/* Flags for getting buffers */
+#define PyBUF_SIMPLE 0
+#define PyBUF_WRITABLE 0x0001
+/*  we used to include an E, backwards compatible alias  */
+#define PyBUF_WRITEABLE PyBUF_WRITABLE
+#define PyBUF_FORMAT 0x0004
+#define PyBUF_ND 0x0008
+#define PyBUF_STRIDES (0x0010 | PyBUF_ND)
+#define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)
+#define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)
+#define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)
+#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
+
+#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE)
+#define PyBUF_CONTIG_RO (PyBUF_ND)
+
+#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE)
+#define PyBUF_STRIDED_RO (PyBUF_STRIDES)
+
+#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT)
+#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT)
+
+#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT)
+#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT)
+
+
+#define PyBUF_READ  0x100
+#define PyBUF_WRITE 0x200
+/* End buffer interface */
+
+
+typedef struct {
+    /* Number implementations must check *both*
+       arguments for proper type and implement the necessary conversions
+       in the slot functions themselves. */
+
+    binaryfunc nb_add;
+    binaryfunc nb_subtract;
+    binaryfunc nb_multiply;
+    binaryfunc nb_remainder;
+    binaryfunc nb_divmod;
+    ternaryfunc nb_power;
+    unaryfunc nb_negative;
+    unaryfunc nb_positive;
+    unaryfunc nb_absolute;
+    inquiry nb_bool;
+    unaryfunc nb_invert;
+    binaryfunc nb_lshift;
+    binaryfunc nb_rshift;
+    binaryfunc nb_and;
+    binaryfunc nb_xor;
+    binaryfunc nb_or;
+    unaryfunc nb_int;
+    void *nb_reserved;  /* the slot formerly known as nb_long */
+    unaryfunc nb_float;
+
+    binaryfunc nb_inplace_add;
+    binaryfunc nb_inplace_subtract;
+    binaryfunc nb_inplace_multiply;
+    binaryfunc nb_inplace_remainder;
+    ternaryfunc nb_inplace_power;
+    binaryfunc nb_inplace_lshift;
+    binaryfunc nb_inplace_rshift;
+    binaryfunc nb_inplace_and;
+    binaryfunc nb_inplace_xor;
+    binaryfunc nb_inplace_or;
+
+    binaryfunc nb_floor_divide;
+    binaryfunc nb_true_divide;
+    binaryfunc nb_inplace_floor_divide;
+    binaryfunc nb_inplace_true_divide;
+
+    unaryfunc nb_index;
+
+    binaryfunc nb_matrix_multiply;
+    binaryfunc nb_inplace_matrix_multiply;
+} PyNumberMethods;
+
+typedef struct {
+    lenfunc sq_length;
+    binaryfunc sq_concat;
+    ssizeargfunc sq_repeat;
+    ssizeargfunc sq_item;
+    void *was_sq_slice;
+    ssizeobjargproc sq_ass_item;
+    void *was_sq_ass_slice;
+    objobjproc sq_contains;
+
+    binaryfunc sq_inplace_concat;
+    ssizeargfunc sq_inplace_repeat;
+} PySequenceMethods;
+
+typedef struct {
+    lenfunc mp_length;
+    binaryfunc mp_subscript;
+    objobjargproc mp_ass_subscript;
+} PyMappingMethods;
+
+typedef struct {
+    unaryfunc am_await;
+    unaryfunc am_aiter;
+    unaryfunc am_anext;
+} PyAsyncMethods;
+
+typedef struct {
+     getbufferproc bf_getbuffer;
+     releasebufferproc bf_releasebuffer;
+} PyBufferProcs;
+
+/* Allow printfunc in the tp_vectorcall_offset slot for
+ * backwards-compatibility */
+typedef Py_ssize_t printfunc;
+
+typedef struct _typeobject {
+    PyObject_VAR_HEAD
+    const char *tp_name; /* For printing, in format "<module>.<name>" */
+    Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */
+
+    /* Methods to implement standard operations */
+
+    destructor tp_dealloc;
+    Py_ssize_t tp_vectorcall_offset;
+    getattrfunc tp_getattr;
+    setattrfunc tp_setattr;
+    PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 2)
+                                    or tp_reserved (Python 3) */
+    reprfunc tp_repr;
+
+    /* Method suites for standard classes */
+
+    PyNumberMethods *tp_as_number;
+    PySequenceMethods *tp_as_sequence;
+    PyMappingMethods *tp_as_mapping;
+
+    /* More standard operations (here for binary compatibility) */
+
+    hashfunc tp_hash;
+    ternaryfunc tp_call;
+    reprfunc tp_str;
+    getattrofunc tp_getattro;
+    setattrofunc tp_setattro;
+
+    /* Functions to access object as input/output buffer */
+    PyBufferProcs *tp_as_buffer;
+
+    /* Flags to define presence of optional/expanded features */
+    unsigned long tp_flags;
+
+    const char *tp_doc; /* Documentation string */
+
+    /* Assigned meaning in release 2.0 */
+    /* call function for all accessible objects */
+    traverseproc tp_traverse;
+
+    /* delete references to contained objects */
+    inquiry tp_clear;
+
+    /* Assigned meaning in release 2.1 */
+    /* rich comparisons */
+    richcmpfunc tp_richcompare;
+
+    /* weak reference enabler */
+    Py_ssize_t tp_weaklistoffset;
+
+    /* Iterators */
+    getiterfunc tp_iter;
+    iternextfunc tp_iternext;
+
+    /* Attribute descriptor and subclassing stuff */
+    struct PyMethodDef *tp_methods;
+    struct PyMemberDef *tp_members;
+    struct PyGetSetDef *tp_getset;
+    struct _typeobject *tp_base;
+    PyObject *tp_dict;
+    descrgetfunc tp_descr_get;
+    descrsetfunc tp_descr_set;
+    Py_ssize_t tp_dictoffset;
+    initproc tp_init;
+    allocfunc tp_alloc;
+    newfunc tp_new;
+    freefunc tp_free; /* Low-level free-memory routine */
+    inquiry tp_is_gc; /* For PyObject_IS_GC */
+    PyObject *tp_bases;
+    PyObject *tp_mro; /* method resolution order */
+    PyObject *tp_cache;
+    PyObject *tp_subclasses;
+    PyObject *tp_weaklist;
+    destructor tp_del;
+
+    /* Type attribute cache version tag. Added in version 2.6 */
+    unsigned int tp_version_tag;
+
+    destructor tp_finalize;
+    vectorcallfunc tp_vectorcall;
+
+    /* bpo-37250: kept for backwards compatibility in CPython 3.8 only */
+    Py_DEPRECATED(3.8) int (*tp_print)(PyObject *, FILE *, int);
+
+#ifdef COUNT_ALLOCS
+    /* these must be last and never explicitly initialized */
+    Py_ssize_t tp_allocs;
+    Py_ssize_t tp_frees;
+    Py_ssize_t tp_maxalloc;
+    struct _typeobject *tp_prev;
+    struct _typeobject *tp_next;
+#endif
+} PyTypeObject;
+
+/* The *real* layout of a type object when allocated on the heap */
+typedef struct _heaptypeobject {
+    /* Note: there's a dependency on the order of these members
+       in slotptr() in typeobject.c . */
+    PyTypeObject ht_type;
+    PyAsyncMethods as_async;
+    PyNumberMethods as_number;
+    PyMappingMethods as_mapping;
+    PySequenceMethods as_sequence; /* as_sequence comes after as_mapping,
+                                      so that the mapping wins when both
+                                      the mapping and the sequence define
+                                      a given operator (e.g. __getitem__).
+                                      see add_operators() in typeobject.c . */
+    PyBufferProcs as_buffer;
+    PyObject *ht_name, *ht_slots, *ht_qualname;
+    struct _dictkeysobject *ht_cached_keys;
+    /* here are optional user slots, followed by the members. */
+} PyHeapTypeObject;
+
+/* access macro to the members which are floating "behind" the object */
+#define PyHeapType_GET_MEMBERS(etype) \
+    ((PyMemberDef *)(((char *)etype) + Py_TYPE(etype)->tp_basicsize))
+
+PyAPI_FUNC(const char *) _PyType_Name(PyTypeObject *);
+PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *);
+PyAPI_FUNC(PyObject *) _PyType_LookupId(PyTypeObject *, _Py_Identifier *);
+PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, _Py_Identifier *);
+PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *);
+PyAPI_FUNC(PyObject *) _PyType_GetDocFromInternalDoc(const char *, const char *);
+PyAPI_FUNC(PyObject *) _PyType_GetTextSignatureFromInternalDoc(const char *, const char *);
+
+struct _Py_Identifier;
+PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int);
+PyAPI_FUNC(void) _Py_BreakPoint(void);
+PyAPI_FUNC(void) _PyObject_Dump(PyObject *);
+PyAPI_FUNC(int) _PyObject_IsFreed(PyObject *);
+
+PyAPI_FUNC(int) _PyObject_IsAbstract(PyObject *);
+PyAPI_FUNC(PyObject *) _PyObject_GetAttrId(PyObject *, struct _Py_Identifier *);
+PyAPI_FUNC(int) _PyObject_SetAttrId(PyObject *, struct _Py_Identifier *, PyObject *);
+PyAPI_FUNC(int) _PyObject_HasAttrId(PyObject *, struct _Py_Identifier *);
+/* Replacements of PyObject_GetAttr() and _PyObject_GetAttrId() which
+   don't raise AttributeError.
+
+   Return 1 and set *result != NULL if an attribute is found.
+   Return 0 and set *result == NULL if an attribute is not found;
+   an AttributeError is silenced.
+   Return -1 and set *result == NULL if an error other than AttributeError
+   is raised.
+*/
+PyAPI_FUNC(int) _PyObject_LookupAttr(PyObject *, PyObject *, PyObject **);
+PyAPI_FUNC(int) _PyObject_LookupAttrId(PyObject *, struct _Py_Identifier *, PyObject **);
+PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *);
+PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *);
+PyAPI_FUNC(void) PyObject_CallFinalizer(PyObject *);
+PyAPI_FUNC(int) PyObject_CallFinalizerFromDealloc(PyObject *);
+
+/* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes
+   dict as the last parameter. */
+PyAPI_FUNC(PyObject *)
+_PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *, int);
+PyAPI_FUNC(int)
+_PyObject_GenericSetAttrWithDict(PyObject *, PyObject *,
+                                 PyObject *, PyObject *);
+
+#define PyType_HasFeature(t,f)  (((t)->tp_flags & (f)) != 0)
+
+static inline void _Py_Dealloc_inline(PyObject *op)
+{
+    destructor dealloc = Py_TYPE(op)->tp_dealloc;
+#ifdef Py_TRACE_REFS
+    _Py_ForgetReference(op);
+#else
+    _Py_INC_TPFREES(op);
+#endif
+    (*dealloc)(op);
+}
+#define _Py_Dealloc(op) _Py_Dealloc_inline(op)
+
+
+/* Safely decref `op` and set `op` to `op2`.
+ *
+ * As in case of Py_CLEAR "the obvious" code can be deadly:
+ *
+ *     Py_DECREF(op);
+ *     op = op2;
+ *
+ * The safe way is:
+ *
+ *      Py_SETREF(op, op2);
+ *
+ * That arranges to set `op` to `op2` _before_ decref'ing, so that any code
+ * triggered as a side-effect of `op` getting torn down no longer believes
+ * `op` points to a valid object.
+ *
+ * Py_XSETREF is a variant of Py_SETREF that uses Py_XDECREF instead of
+ * Py_DECREF.
+ */
+
+#define Py_SETREF(op, op2)                      \
+    do {                                        \
+        PyObject *_py_tmp = _PyObject_CAST(op); \
+        (op) = (op2);                           \
+        Py_DECREF(_py_tmp);                     \
+    } while (0)
+
+#define Py_XSETREF(op, op2)                     \
+    do {                                        \
+        PyObject *_py_tmp = _PyObject_CAST(op); \
+        (op) = (op2);                           \
+        Py_XDECREF(_py_tmp);                    \
+    } while (0)
+
+
+PyAPI_DATA(PyTypeObject) _PyNone_Type;
+PyAPI_DATA(PyTypeObject) _PyNotImplemented_Type;
+
+/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE.
+ * Defined in object.c.
+ */
+PyAPI_DATA(int) _Py_SwappedOp[];
+
+/* This is the old private API, invoked by the macros before 3.2.4.
+   Kept for binary compatibility of extensions using the stable ABI. */
+PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
+PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
+
+PyAPI_FUNC(void)
+_PyDebugAllocatorStats(FILE *out, const char *block_name, int num_blocks,
+                       size_t sizeof_block);
+PyAPI_FUNC(void)
+_PyObject_DebugTypeStats(FILE *out);
+
+/* Define a pair of assertion macros:
+   _PyObject_ASSERT_FROM(), _PyObject_ASSERT_WITH_MSG() and _PyObject_ASSERT().
+
+   These work like the regular C assert(), in that they will abort the
+   process with a message on stderr if the given condition fails to hold,
+   but compile away to nothing if NDEBUG is defined.
+
+   However, before aborting, Python will also try to call _PyObject_Dump() on
+   the given object.  This may be of use when investigating bugs in which a
+   particular object is corrupt (e.g. buggy a tp_visit method in an extension
+   module breaking the garbage collector), to help locate the broken objects.
+
+   The WITH_MSG variant allows you to supply an additional message that Python
+   will attempt to print to stderr, after the object dump. */
+#ifdef NDEBUG
+   /* No debugging: compile away the assertions: */
+#  define _PyObject_ASSERT_FROM(obj, expr, msg, filename, lineno, func) \
+    ((void)0)
+#else
+   /* With debugging: generate checks: */
+#  define _PyObject_ASSERT_FROM(obj, expr, msg, filename, lineno, func) \
+    ((expr) \
+      ? (void)(0) \
+      : _PyObject_AssertFailed((obj), Py_STRINGIFY(expr), \
+                               (msg), (filename), (lineno), (func)))
+#endif
+
+#define _PyObject_ASSERT_WITH_MSG(obj, expr, msg) \
+    _PyObject_ASSERT_FROM(obj, expr, msg, __FILE__, __LINE__, __func__)
+#define _PyObject_ASSERT(obj, expr) \
+    _PyObject_ASSERT_WITH_MSG(obj, expr, NULL)
+
+#define _PyObject_ASSERT_FAILED_MSG(obj, msg) \
+    _PyObject_AssertFailed((obj), NULL, (msg), __FILE__, __LINE__, __func__)
+
+/* Declare and define _PyObject_AssertFailed() even when NDEBUG is defined,
+   to avoid causing compiler/linker errors when building extensions without
+   NDEBUG against a Python built with NDEBUG defined.
+
+   msg, expr and function can be NULL. */
+PyAPI_FUNC(void) _PyObject_AssertFailed(
+    PyObject *obj,
+    const char *expr,
+    const char *msg,
+    const char *file,
+    int line,
+    const char *function);
+
+/* Check if an object is consistent. For example, ensure that the reference
+   counter is greater than or equal to 1, and ensure that ob_type is not NULL.
+
+   Call _PyObject_AssertFailed() if the object is inconsistent.
+
+   If check_content is zero, only check header fields: reduce the overhead.
+
+   The function always return 1. The return value is just here to be able to
+   write:
+
+   assert(_PyObject_CheckConsistency(obj, 1)); */
+PyAPI_FUNC(int) _PyObject_CheckConsistency(
+    PyObject *op,
+    int check_content);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/objimpl.h b/openflow/include/python3.8/cpython/objimpl.h
new file mode 100644
index 0000000..f121922
--- /dev/null
+++ b/openflow/include/python3.8/cpython/objimpl.h
@@ -0,0 +1,113 @@
+#ifndef Py_CPYTHON_OBJIMPL_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This function returns the number of allocated memory blocks, regardless of size */
+PyAPI_FUNC(Py_ssize_t) _Py_GetAllocatedBlocks(void);
+
+/* Macros */
+#ifdef WITH_PYMALLOC
+PyAPI_FUNC(int) _PyObject_DebugMallocStats(FILE *out);
+#endif
+
+
+typedef struct {
+    /* user context passed as the first argument to the 2 functions */
+    void *ctx;
+
+    /* allocate an arena of size bytes */
+    void* (*alloc) (void *ctx, size_t size);
+
+    /* free an arena */
+    void (*free) (void *ctx, void *ptr, size_t size);
+} PyObjectArenaAllocator;
+
+/* Get the arena allocator. */
+PyAPI_FUNC(void) PyObject_GetArenaAllocator(PyObjectArenaAllocator *allocator);
+
+/* Set the arena allocator. */
+PyAPI_FUNC(void) PyObject_SetArenaAllocator(PyObjectArenaAllocator *allocator);
+
+
+PyAPI_FUNC(Py_ssize_t) _PyGC_CollectNoFail(void);
+PyAPI_FUNC(Py_ssize_t) _PyGC_CollectIfEnabled(void);
+
+
+/* Test if an object has a GC head */
+#define PyObject_IS_GC(o) \
+    (PyType_IS_GC(Py_TYPE(o)) \
+     && (Py_TYPE(o)->tp_is_gc == NULL || Py_TYPE(o)->tp_is_gc(o)))
+
+/* GC information is stored BEFORE the object structure. */
+typedef struct {
+    // Pointer to next object in the list.
+    // 0 means the object is not tracked
+    uintptr_t _gc_next;
+
+    // Pointer to previous object in the list.
+    // Lowest two bits are used for flags documented later.
+    uintptr_t _gc_prev;
+} PyGC_Head;
+
+#define _Py_AS_GC(o) ((PyGC_Head *)(o)-1)
+
+/* True if the object is currently tracked by the GC. */
+#define _PyObject_GC_IS_TRACKED(o) (_Py_AS_GC(o)->_gc_next != 0)
+
+/* True if the object may be tracked by the GC in the future, or already is.
+   This can be useful to implement some optimizations. */
+#define _PyObject_GC_MAY_BE_TRACKED(obj) \
+    (PyObject_IS_GC(obj) && \
+        (!PyTuple_CheckExact(obj) || _PyObject_GC_IS_TRACKED(obj)))
+
+
+/* Bit flags for _gc_prev */
+/* Bit 0 is set when tp_finalize is called */
+#define _PyGC_PREV_MASK_FINALIZED  (1)
+/* Bit 1 is set when the object is in generation which is GCed currently. */
+#define _PyGC_PREV_MASK_COLLECTING (2)
+/* The (N-2) most significant bits contain the real address. */
+#define _PyGC_PREV_SHIFT           (2)
+#define _PyGC_PREV_MASK            (((uintptr_t) -1) << _PyGC_PREV_SHIFT)
+
+// Lowest bit of _gc_next is used for flags only in GC.
+// But it is always 0 for normal code.
+#define _PyGCHead_NEXT(g)        ((PyGC_Head*)(g)->_gc_next)
+#define _PyGCHead_SET_NEXT(g, p) ((g)->_gc_next = (uintptr_t)(p))
+
+// Lowest two bits of _gc_prev is used for _PyGC_PREV_MASK_* flags.
+#define _PyGCHead_PREV(g) ((PyGC_Head*)((g)->_gc_prev & _PyGC_PREV_MASK))
+#define _PyGCHead_SET_PREV(g, p) do { \
+    assert(((uintptr_t)p & ~_PyGC_PREV_MASK) == 0); \
+    (g)->_gc_prev = ((g)->_gc_prev & ~_PyGC_PREV_MASK) \
+        | ((uintptr_t)(p)); \
+    } while (0)
+
+#define _PyGCHead_FINALIZED(g) \
+    (((g)->_gc_prev & _PyGC_PREV_MASK_FINALIZED) != 0)
+#define _PyGCHead_SET_FINALIZED(g) \
+    ((g)->_gc_prev |= _PyGC_PREV_MASK_FINALIZED)
+
+#define _PyGC_FINALIZED(o) \
+    _PyGCHead_FINALIZED(_Py_AS_GC(o))
+#define _PyGC_SET_FINALIZED(o) \
+    _PyGCHead_SET_FINALIZED(_Py_AS_GC(o))
+
+
+PyAPI_FUNC(PyObject *) _PyObject_GC_Malloc(size_t size);
+PyAPI_FUNC(PyObject *) _PyObject_GC_Calloc(size_t size);
+
+
+/* Test if a type supports weak references */
+#define PyType_SUPPORTS_WEAKREFS(t) ((t)->tp_weaklistoffset > 0)
+
+#define PyObject_GET_WEAKREFS_LISTPTR(o) \
+    ((PyObject **) (((char *) (o)) + Py_TYPE(o)->tp_weaklistoffset))
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/pyerrors.h b/openflow/include/python3.8/cpython/pyerrors.h
new file mode 100644
index 0000000..e3098b3
--- /dev/null
+++ b/openflow/include/python3.8/cpython/pyerrors.h
@@ -0,0 +1,182 @@
+#ifndef Py_CPYTHON_ERRORS_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Error objects */
+
+/* PyException_HEAD defines the initial segment of every exception class. */
+#define PyException_HEAD PyObject_HEAD PyObject *dict;\
+             PyObject *args; PyObject *traceback;\
+             PyObject *context; PyObject *cause;\
+             char suppress_context;
+
+typedef struct {
+    PyException_HEAD
+} PyBaseExceptionObject;
+
+typedef struct {
+    PyException_HEAD
+    PyObject *msg;
+    PyObject *filename;
+    PyObject *lineno;
+    PyObject *offset;
+    PyObject *text;
+    PyObject *print_file_and_line;
+} PySyntaxErrorObject;
+
+typedef struct {
+    PyException_HEAD
+    PyObject *msg;
+    PyObject *name;
+    PyObject *path;
+} PyImportErrorObject;
+
+typedef struct {
+    PyException_HEAD
+    PyObject *encoding;
+    PyObject *object;
+    Py_ssize_t start;
+    Py_ssize_t end;
+    PyObject *reason;
+} PyUnicodeErrorObject;
+
+typedef struct {
+    PyException_HEAD
+    PyObject *code;
+} PySystemExitObject;
+
+typedef struct {
+    PyException_HEAD
+    PyObject *myerrno;
+    PyObject *strerror;
+    PyObject *filename;
+    PyObject *filename2;
+#ifdef MS_WINDOWS
+    PyObject *winerror;
+#endif
+    Py_ssize_t written;   /* only for BlockingIOError, -1 otherwise */
+} PyOSErrorObject;
+
+typedef struct {
+    PyException_HEAD
+    PyObject *value;
+} PyStopIterationObject;
+
+/* Compatibility typedefs */
+typedef PyOSErrorObject PyEnvironmentErrorObject;
+#ifdef MS_WINDOWS
+typedef PyOSErrorObject PyWindowsErrorObject;
+#endif
+
+/* Error handling definitions */
+
+PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *);
+_PyErr_StackItem *_PyErr_GetTopmostException(PyThreadState *tstate);
+
+/* Context manipulation (PEP 3134) */
+
+PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
+
+/* */
+
+#define PyExceptionClass_Name(x)  (((PyTypeObject*)(x))->tp_name)
+
+/* Convenience functions */
+
+#ifdef MS_WINDOWS
+Py_DEPRECATED(3.3)
+PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename(
+    PyObject *, const Py_UNICODE *);
+#endif /* MS_WINDOWS */
+
+/* Like PyErr_Format(), but saves current exception as __context__ and
+   __cause__.
+ */
+PyAPI_FUNC(PyObject *) _PyErr_FormatFromCause(
+    PyObject *exception,
+    const char *format,   /* ASCII-encoded string  */
+    ...
+    );
+
+#ifdef MS_WINDOWS
+/* XXX redeclare to use WSTRING */
+Py_DEPRECATED(3.3)
+PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename(
+    int, const Py_UNICODE *);
+Py_DEPRECATED(3.3)
+PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename(
+    PyObject *,int, const Py_UNICODE *);
+#endif
+
+/* In exceptions.c */
+
+/* Helper that attempts to replace the current exception with one of the
+ * same type but with a prefix added to the exception text. The resulting
+ * exception description looks like:
+ *
+ *     prefix (exc_type: original_exc_str)
+ *
+ * Only some exceptions can be safely replaced. If the function determines
+ * it isn't safe to perform the replacement, it will leave the original
+ * unmodified exception in place.
+ *
+ * Returns a borrowed reference to the new exception (if any), NULL if the
+ * existing exception was left in place.
+ */
+PyAPI_FUNC(PyObject *) _PyErr_TrySetFromCause(
+    const char *prefix_format,   /* ASCII-encoded string  */
+    ...
+    );
+
+/* In signalmodule.c */
+
+int PySignal_SetWakeupFd(int fd);
+PyAPI_FUNC(int) _PyErr_CheckSignals(void);
+
+/* Support for adding program text to SyntaxErrors */
+
+PyAPI_FUNC(void) PyErr_SyntaxLocationObject(
+    PyObject *filename,
+    int lineno,
+    int col_offset);
+
+PyAPI_FUNC(PyObject *) PyErr_ProgramTextObject(
+    PyObject *filename,
+    int lineno);
+
+/* Create a UnicodeEncodeError object */
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create(
+    const char *encoding,       /* UTF-8 encoded string */
+    const Py_UNICODE *object,
+    Py_ssize_t length,
+    Py_ssize_t start,
+    Py_ssize_t end,
+    const char *reason          /* UTF-8 encoded string */
+    );
+
+/* Create a UnicodeTranslateError object */
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create(
+    const Py_UNICODE *object,
+    Py_ssize_t length,
+    Py_ssize_t start,
+    Py_ssize_t end,
+    const char *reason          /* UTF-8 encoded string */
+    );
+PyAPI_FUNC(PyObject *) _PyUnicodeTranslateError_Create(
+    PyObject *object,
+    Py_ssize_t start,
+    Py_ssize_t end,
+    const char *reason          /* UTF-8 encoded string */
+    );
+
+PyAPI_FUNC(void) _PyErr_WriteUnraisableMsg(
+    const char *err_msg,
+    PyObject *obj);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/pylifecycle.h b/openflow/include/python3.8/cpython/pylifecycle.h
new file mode 100644
index 0000000..2f3a0db
--- /dev/null
+++ b/openflow/include/python3.8/cpython/pylifecycle.h
@@ -0,0 +1,78 @@
+#ifndef Py_CPYTHON_PYLIFECYCLE_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Only used by applications that embed the interpreter and need to
+ * override the standard encoding determination mechanism
+ */
+PyAPI_FUNC(int) Py_SetStandardStreamEncoding(const char *encoding,
+                                             const char *errors);
+
+/* PEP 432 Multi-phase initialization API (Private while provisional!) */
+
+PyAPI_FUNC(PyStatus) Py_PreInitialize(
+    const PyPreConfig *src_config);
+PyAPI_FUNC(PyStatus) Py_PreInitializeFromBytesArgs(
+    const PyPreConfig *src_config,
+    Py_ssize_t argc,
+    char **argv);
+PyAPI_FUNC(PyStatus) Py_PreInitializeFromArgs(
+    const PyPreConfig *src_config,
+    Py_ssize_t argc,
+    wchar_t **argv);
+
+PyAPI_FUNC(int) _Py_IsCoreInitialized(void);
+
+
+/* Initialization and finalization */
+
+PyAPI_FUNC(PyStatus) Py_InitializeFromConfig(
+    const PyConfig *config);
+PyAPI_FUNC(PyStatus) _Py_InitializeFromArgs(
+    const PyConfig *config,
+    Py_ssize_t argc,
+    char * const *argv);
+PyAPI_FUNC(PyStatus) _Py_InitializeFromWideArgs(
+    const PyConfig *config,
+    Py_ssize_t argc,
+    wchar_t * const *argv);
+PyAPI_FUNC(PyStatus) _Py_InitializeMain(void);
+
+PyAPI_FUNC(int) Py_RunMain(void);
+
+
+PyAPI_FUNC(void) _Py_NO_RETURN Py_ExitStatusException(PyStatus err);
+
+/* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level
+ * exit functions.
+ */
+PyAPI_FUNC(void) _Py_PyAtExit(void (*func)(PyObject *), PyObject *);
+
+/* Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. */
+PyAPI_FUNC(void) _Py_RestoreSignals(void);
+
+PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *);
+
+PyAPI_FUNC(void) _Py_SetProgramFullPath(const wchar_t *);
+
+PyAPI_FUNC(const char *) _Py_gitidentifier(void);
+PyAPI_FUNC(const char *) _Py_gitversion(void);
+
+PyAPI_FUNC(int) _Py_IsFinalizing(void);
+
+/* Random */
+PyAPI_FUNC(int) _PyOS_URandom(void *buffer, Py_ssize_t size);
+PyAPI_FUNC(int) _PyOS_URandomNonblock(void *buffer, Py_ssize_t size);
+
+/* Legacy locale support */
+PyAPI_FUNC(int) _Py_CoerceLegacyLocale(int warn);
+PyAPI_FUNC(int) _Py_LegacyLocaleDetected(int warn);
+PyAPI_FUNC(char *) _Py_SetLocaleFromEnv(int category);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/pymem.h b/openflow/include/python3.8/cpython/pymem.h
new file mode 100644
index 0000000..79f063b
--- /dev/null
+++ b/openflow/include/python3.8/cpython/pymem.h
@@ -0,0 +1,108 @@
+#ifndef Py_CPYTHON_PYMEM_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+PyAPI_FUNC(void *) PyMem_RawMalloc(size_t size);
+PyAPI_FUNC(void *) PyMem_RawCalloc(size_t nelem, size_t elsize);
+PyAPI_FUNC(void *) PyMem_RawRealloc(void *ptr, size_t new_size);
+PyAPI_FUNC(void) PyMem_RawFree(void *ptr);
+
+/* Try to get the allocators name set by _PyMem_SetupAllocators(). */
+PyAPI_FUNC(const char*) _PyMem_GetCurrentAllocatorName(void);
+
+PyAPI_FUNC(void *) PyMem_Calloc(size_t nelem, size_t elsize);
+
+/* strdup() using PyMem_RawMalloc() */
+PyAPI_FUNC(char *) _PyMem_RawStrdup(const char *str);
+
+/* strdup() using PyMem_Malloc() */
+PyAPI_FUNC(char *) _PyMem_Strdup(const char *str);
+
+/* wcsdup() using PyMem_RawMalloc() */
+PyAPI_FUNC(wchar_t*) _PyMem_RawWcsdup(const wchar_t *str);
+
+
+typedef enum {
+    /* PyMem_RawMalloc(), PyMem_RawRealloc() and PyMem_RawFree() */
+    PYMEM_DOMAIN_RAW,
+
+    /* PyMem_Malloc(), PyMem_Realloc() and PyMem_Free() */
+    PYMEM_DOMAIN_MEM,
+
+    /* PyObject_Malloc(), PyObject_Realloc() and PyObject_Free() */
+    PYMEM_DOMAIN_OBJ
+} PyMemAllocatorDomain;
+
+typedef enum {
+    PYMEM_ALLOCATOR_NOT_SET = 0,
+    PYMEM_ALLOCATOR_DEFAULT = 1,
+    PYMEM_ALLOCATOR_DEBUG = 2,
+    PYMEM_ALLOCATOR_MALLOC = 3,
+    PYMEM_ALLOCATOR_MALLOC_DEBUG = 4,
+#ifdef WITH_PYMALLOC
+    PYMEM_ALLOCATOR_PYMALLOC = 5,
+    PYMEM_ALLOCATOR_PYMALLOC_DEBUG = 6,
+#endif
+} PyMemAllocatorName;
+
+
+typedef struct {
+    /* user context passed as the first argument to the 4 functions */
+    void *ctx;
+
+    /* allocate a memory block */
+    void* (*malloc) (void *ctx, size_t size);
+
+    /* allocate a memory block initialized by zeros */
+    void* (*calloc) (void *ctx, size_t nelem, size_t elsize);
+
+    /* allocate or resize a memory block */
+    void* (*realloc) (void *ctx, void *ptr, size_t new_size);
+
+    /* release a memory block */
+    void (*free) (void *ctx, void *ptr);
+} PyMemAllocatorEx;
+
+/* Get the memory block allocator of the specified domain. */
+PyAPI_FUNC(void) PyMem_GetAllocator(PyMemAllocatorDomain domain,
+                                    PyMemAllocatorEx *allocator);
+
+/* Set the memory block allocator of the specified domain.
+
+   The new allocator must return a distinct non-NULL pointer when requesting
+   zero bytes.
+
+   For the PYMEM_DOMAIN_RAW domain, the allocator must be thread-safe: the GIL
+   is not held when the allocator is called.
+
+   If the new allocator is not a hook (don't call the previous allocator), the
+   PyMem_SetupDebugHooks() function must be called to reinstall the debug hooks
+   on top on the new allocator. */
+PyAPI_FUNC(void) PyMem_SetAllocator(PyMemAllocatorDomain domain,
+                                    PyMemAllocatorEx *allocator);
+
+/* Setup hooks to detect bugs in the following Python memory allocator
+   functions:
+
+   - PyMem_RawMalloc(), PyMem_RawRealloc(), PyMem_RawFree()
+   - PyMem_Malloc(), PyMem_Realloc(), PyMem_Free()
+   - PyObject_Malloc(), PyObject_Realloc() and PyObject_Free()
+
+   Newly allocated memory is filled with the byte 0xCB, freed memory is filled
+   with the byte 0xDB. Additional checks:
+
+   - detect API violations, ex: PyObject_Free() called on a buffer allocated
+     by PyMem_Malloc()
+   - detect write before the start of the buffer (buffer underflow)
+   - detect write after the end of the buffer (buffer overflow)
+
+   The function does nothing if Python is not compiled is debug mode. */
+PyAPI_FUNC(void) PyMem_SetupDebugHooks(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/pystate.h b/openflow/include/python3.8/cpython/pystate.h
new file mode 100644
index 0000000..94b0809
--- /dev/null
+++ b/openflow/include/python3.8/cpython/pystate.h
@@ -0,0 +1,251 @@
+#ifndef Py_CPYTHON_PYSTATE_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "cpython/initconfig.h"
+
+PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *);
+PyAPI_FUNC(void) _PyInterpreterState_RequireIDRef(PyInterpreterState *, int);
+
+PyAPI_FUNC(PyObject *) _PyInterpreterState_GetMainModule(PyInterpreterState *);
+
+/* State unique per thread */
+
+/* Py_tracefunc return -1 when raising an exception, or 0 for success. */
+typedef int (*Py_tracefunc)(PyObject *, struct _frame *, int, PyObject *);
+
+/* The following values are used for 'what' for tracefunc functions
+ *
+ * To add a new kind of trace event, also update "trace_init" in
+ * Python/sysmodule.c to define the Python level event name
+ */
+#define PyTrace_CALL 0
+#define PyTrace_EXCEPTION 1
+#define PyTrace_LINE 2
+#define PyTrace_RETURN 3
+#define PyTrace_C_CALL 4
+#define PyTrace_C_EXCEPTION 5
+#define PyTrace_C_RETURN 6
+#define PyTrace_OPCODE 7
+
+
+typedef struct _err_stackitem {
+    /* This struct represents an entry on the exception stack, which is a
+     * per-coroutine state. (Coroutine in the computer science sense,
+     * including the thread and generators).
+     * This ensures that the exception state is not impacted by "yields"
+     * from an except handler.
+     */
+    PyObject *exc_type, *exc_value, *exc_traceback;
+
+    struct _err_stackitem *previous_item;
+
+} _PyErr_StackItem;
+
+
+// The PyThreadState typedef is in Include/pystate.h.
+struct _ts {
+    /* See Python/ceval.c for comments explaining most fields */
+
+    struct _ts *prev;
+    struct _ts *next;
+    PyInterpreterState *interp;
+
+    struct _frame *frame;
+    int recursion_depth;
+    char overflowed; /* The stack has overflowed. Allow 50 more calls
+                        to handle the runtime error. */
+    char recursion_critical; /* The current calls must not cause
+                                a stack overflow. */
+    int stackcheck_counter;
+
+    /* 'tracing' keeps track of the execution depth when tracing/profiling.
+       This is to prevent the actual trace/profile code from being recorded in
+       the trace/profile. */
+    int tracing;
+    int use_tracing;
+
+    Py_tracefunc c_profilefunc;
+    Py_tracefunc c_tracefunc;
+    PyObject *c_profileobj;
+    PyObject *c_traceobj;
+
+    /* The exception currently being raised */
+    PyObject *curexc_type;
+    PyObject *curexc_value;
+    PyObject *curexc_traceback;
+
+    /* The exception currently being handled, if no coroutines/generators
+     * are present. Always last element on the stack referred to be exc_info.
+     */
+    _PyErr_StackItem exc_state;
+
+    /* Pointer to the top of the stack of the exceptions currently
+     * being handled */
+    _PyErr_StackItem *exc_info;
+
+    PyObject *dict;  /* Stores per-thread state */
+
+    int gilstate_counter;
+
+    PyObject *async_exc; /* Asynchronous exception to raise */
+    unsigned long thread_id; /* Thread id where this tstate was created */
+
+    int trash_delete_nesting;
+    PyObject *trash_delete_later;
+
+    /* Called when a thread state is deleted normally, but not when it
+     * is destroyed after fork().
+     * Pain:  to prevent rare but fatal shutdown errors (issue 18808),
+     * Thread.join() must wait for the join'ed thread's tstate to be unlinked
+     * from the tstate chain.  That happens at the end of a thread's life,
+     * in pystate.c.
+     * The obvious way doesn't quite work:  create a lock which the tstate
+     * unlinking code releases, and have Thread.join() wait to acquire that
+     * lock.  The problem is that we _are_ at the end of the thread's life:
+     * if the thread holds the last reference to the lock, decref'ing the
+     * lock will delete the lock, and that may trigger arbitrary Python code
+     * if there's a weakref, with a callback, to the lock.  But by this time
+     * _PyRuntime.gilstate.tstate_current is already NULL, so only the simplest
+     * of C code can be allowed to run (in particular it must not be possible to
+     * release the GIL).
+     * So instead of holding the lock directly, the tstate holds a weakref to
+     * the lock:  that's the value of on_delete_data below.  Decref'ing a
+     * weakref is harmless.
+     * on_delete points to _threadmodule.c's static release_sentinel() function.
+     * After the tstate is unlinked, release_sentinel is called with the
+     * weakref-to-lock (on_delete_data) argument, and release_sentinel releases
+     * the indirectly held lock.
+     */
+    void (*on_delete)(void *);
+    void *on_delete_data;
+
+    int coroutine_origin_tracking_depth;
+
+    PyObject *async_gen_firstiter;
+    PyObject *async_gen_finalizer;
+
+    PyObject *context;
+    uint64_t context_ver;
+
+    /* Unique thread state id. */
+    uint64_t id;
+
+    /* XXX signal handlers should also be here */
+
+};
+
+/* Get the current interpreter state.
+
+   Issue a fatal error if there no current Python thread state or no current
+   interpreter. It cannot return NULL.
+
+   The caller must hold the GIL.*/
+PyAPI_FUNC(PyInterpreterState *) _PyInterpreterState_Get(void);
+
+PyAPI_FUNC(int) _PyState_AddModule(PyObject*, struct PyModuleDef*);
+PyAPI_FUNC(void) _PyState_ClearModules(void);
+PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *);
+
+/* Similar to PyThreadState_Get(), but don't issue a fatal error
+ * if it is NULL. */
+PyAPI_FUNC(PyThreadState *) _PyThreadState_UncheckedGet(void);
+
+/* PyGILState */
+
+/* Helper/diagnostic function - return 1 if the current thread
+   currently holds the GIL, 0 otherwise.
+
+   The function returns 1 if _PyGILState_check_enabled is non-zero. */
+PyAPI_FUNC(int) PyGILState_Check(void);
+
+/* Get the single PyInterpreterState used by this process' GILState
+   implementation.
+
+   This function doesn't check for error. Return NULL before _PyGILState_Init()
+   is called and after _PyGILState_Fini() is called.
+
+   See also _PyInterpreterState_Get() and _PyInterpreterState_GET_UNSAFE(). */
+PyAPI_FUNC(PyInterpreterState *) _PyGILState_GetInterpreterStateUnsafe(void);
+
+/* The implementation of sys._current_frames()  Returns a dict mapping
+   thread id to that thread's current frame.
+*/
+PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void);
+
+/* Routines for advanced debuggers, requested by David Beazley.
+   Don't use unless you know what you are doing! */
+PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Main(void);
+PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void);
+PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *);
+PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *);
+PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *);
+
+typedef struct _frame *(*PyThreadFrameGetter)(PyThreadState *self_);
+
+/* cross-interpreter data */
+
+struct _xid;
+
+// _PyCrossInterpreterData is similar to Py_buffer as an effectively
+// opaque struct that holds data outside the object machinery.  This
+// is necessary to pass safely between interpreters in the same process.
+typedef struct _xid {
+    // data is the cross-interpreter-safe derivation of a Python object
+    // (see _PyObject_GetCrossInterpreterData).  It will be NULL if the
+    // new_object func (below) encodes the data.
+    void *data;
+    // obj is the Python object from which the data was derived.  This
+    // is non-NULL only if the data remains bound to the object in some
+    // way, such that the object must be "released" (via a decref) when
+    // the data is released.  In that case the code that sets the field,
+    // likely a registered "crossinterpdatafunc", is responsible for
+    // ensuring it owns the reference (i.e. incref).
+    PyObject *obj;
+    // interp is the ID of the owning interpreter of the original
+    // object.  It corresponds to the active interpreter when
+    // _PyObject_GetCrossInterpreterData() was called.  This should only
+    // be set by the cross-interpreter machinery.
+    //
+    // We use the ID rather than the PyInterpreterState to avoid issues
+    // with deleted interpreters.  Note that IDs are never re-used, so
+    // each one will always correspond to a specific interpreter
+    // (whether still alive or not).
+    int64_t interp;
+    // new_object is a function that returns a new object in the current
+    // interpreter given the data.  The resulting object (a new
+    // reference) will be equivalent to the original object.  This field
+    // is required.
+    PyObject *(*new_object)(struct _xid *);
+    // free is called when the data is released.  If it is NULL then
+    // nothing will be done to free the data.  For some types this is
+    // okay (e.g. bytes) and for those types this field should be set
+    // to NULL.  However, for most the data was allocated just for
+    // cross-interpreter use, so it must be freed when
+    // _PyCrossInterpreterData_Release is called or the memory will
+    // leak.  In that case, at the very least this field should be set
+    // to PyMem_RawFree (the default if not explicitly set to NULL).
+    // The call will happen with the original interpreter activated.
+    void (*free)(void *);
+} _PyCrossInterpreterData;
+
+PyAPI_FUNC(int) _PyObject_GetCrossInterpreterData(PyObject *, _PyCrossInterpreterData *);
+PyAPI_FUNC(PyObject *) _PyCrossInterpreterData_NewObject(_PyCrossInterpreterData *);
+PyAPI_FUNC(void) _PyCrossInterpreterData_Release(_PyCrossInterpreterData *);
+
+PyAPI_FUNC(int) _PyObject_CheckCrossInterpreterData(PyObject *);
+
+/* cross-interpreter data registry */
+
+typedef int (*crossinterpdatafunc)(PyObject *, struct _xid *);
+
+PyAPI_FUNC(int) _PyCrossInterpreterData_RegisterClass(PyTypeObject *, crossinterpdatafunc);
+PyAPI_FUNC(crossinterpdatafunc) _PyCrossInterpreterData_Lookup(PyObject *);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/sysmodule.h b/openflow/include/python3.8/cpython/sysmodule.h
new file mode 100644
index 0000000..72d8ffe
--- /dev/null
+++ b/openflow/include/python3.8/cpython/sysmodule.h
@@ -0,0 +1,21 @@
+#ifndef Py_CPYTHON_SYSMODULE_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+PyAPI_FUNC(PyObject *) _PySys_GetObjectId(_Py_Identifier *key);
+PyAPI_FUNC(int) _PySys_SetObjectId(_Py_Identifier *key, PyObject *);
+
+PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *);
+
+typedef int(*Py_AuditHookFunction)(const char *, PyObject *, void *);
+
+PyAPI_FUNC(int) PySys_Audit(const char*, const char *, ...);
+PyAPI_FUNC(int) PySys_AddAuditHook(Py_AuditHookFunction, void*);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/traceback.h b/openflow/include/python3.8/cpython/traceback.h
new file mode 100644
index 0000000..746097d
--- /dev/null
+++ b/openflow/include/python3.8/cpython/traceback.h
@@ -0,0 +1,22 @@
+#ifndef Py_CPYTHON_TRACEBACK_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _traceback {
+    PyObject_HEAD
+    struct _traceback *tb_next;
+    struct _frame *tb_frame;
+    int tb_lasti;
+    int tb_lineno;
+} PyTracebackObject;
+
+PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, PyObject *, int, int);
+PyAPI_FUNC(void) _PyTraceback_Add(const char *, const char *, int);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/include/python3.8/cpython/tupleobject.h b/openflow/include/python3.8/cpython/tupleobject.h
new file mode 100644
index 0000000..1565f2a
--- /dev/null
+++ b/openflow/include/python3.8/cpython/tupleobject.h
@@ -0,0 +1,36 @@
+#ifndef Py_CPYTHON_TUPLEOBJECT_H
+#  error "this header file must not be included directly"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+    PyObject_VAR_HEAD
+    /* ob_item contains space for 'ob_size' elements.
+       Items must normally not be NULL, except during construction when
+       the tuple is not yet visible outside the function that builds it. */
+    PyObject *ob_item[1];
+} PyTupleObject;
+
+PyAPI_FUNC(int) _PyTuple_Resize(PyObject **, Py_ssize_t);
+PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *);
+
+/* Macros trading safety for speed */
+
+/* Cast argument to PyTupleObject* type. */
+#define _PyTuple_CAST(op) (assert(PyTuple_Check(op)), (PyTupleObject *)(op))
+
+#define PyTuple_GET_SIZE(op)    Py_SIZE(_PyTuple_CAST(op))
+
+#define PyTuple_GET_ITEM(op, i) (_PyTuple_CAST(op)->ob_item[i])
+
+/* Macro, *only* to be used to fill in brand new tuples */
+#define PyTuple_SET_ITEM(op, i, v) (_PyTuple_CAST(op)->ob_item[i] = v)
+
+PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/openflow/usr/include/python3.5m/unicodeobject.h b/openflow/include/python3.8/cpython/unicodeobject.h
similarity index 52%
rename from openflow/usr/include/python3.5m/unicodeobject.h
rename to openflow/include/python3.8/cpython/unicodeobject.h
index 533dd75..54a13e3 100644
--- a/openflow/usr/include/python3.5m/unicodeobject.h
+++ b/openflow/include/python3.8/cpython/unicodeobject.h
@@ -1,137 +1,17 @@
-#ifndef Py_UNICODEOBJECT_H
-#define Py_UNICODEOBJECT_H
-
-#include <stdarg.h>
-
-/*
-
-Unicode implementation based on original code by Fredrik Lundh,
-modified by Marc-Andre Lemburg (mal@lemburg.com) according to the
-Unicode Integration Proposal. (See
-http://www.egenix.com/files/python/unicode-proposal.txt).
-
-Copyright (c) Corporation for National Research Initiatives.
-
-
- Original header:
- --------------------------------------------------------------------
-
- * Yet another Unicode string type for Python.  This type supports the
- * 16-bit Basic Multilingual Plane (BMP) only.
- *
- * Written by Fredrik Lundh, January 1999.
- *
- * Copyright (c) 1999 by Secret Labs AB.
- * Copyright (c) 1999 by Fredrik Lundh.
- *
- * fredrik@pythonware.com
- * http://www.pythonware.com
- *
- * --------------------------------------------------------------------
- * This Unicode String Type is
- *
- * Copyright (c) 1999 by Secret Labs AB
- * Copyright (c) 1999 by Fredrik Lundh
- *
- * By obtaining, using, and/or copying this software and/or its
- * associated documentation, you agree that you have read, understood,
- * and will comply with the following terms and conditions:
- *
- * Permission to use, copy, modify, and distribute this software and its
- * associated documentation for any purpose and without fee is hereby
- * granted, provided that the above copyright notice appears in all
- * copies, and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Secret Labs
- * AB or the author not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission.
- *
- * SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * -------------------------------------------------------------------- */
-
-#include <ctype.h>
-
-/* === Internal API ======================================================= */
-
-/* --- Internal Unicode Format -------------------------------------------- */
-
-/* Python 3.x requires unicode */
-#define Py_USING_UNICODE
-
-#ifndef SIZEOF_WCHAR_T
-#error Must define SIZEOF_WCHAR_T
+#ifndef Py_CPYTHON_UNICODEOBJECT_H
+#  error "this header file must not be included directly"
 #endif
 
-#define Py_UNICODE_SIZE SIZEOF_WCHAR_T
-
-/* If wchar_t can be used for UCS-4 storage, set Py_UNICODE_WIDE.
-   Otherwise, Unicode strings are stored as UCS-2 (with limited support
-   for UTF-16) */
-
-#if Py_UNICODE_SIZE >= 4
-#define Py_UNICODE_WIDE
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-/* Set these flags if the platform has "wchar.h" and the
-   wchar_t type is a 16-bit unsigned type */
-/* #define HAVE_WCHAR_H */
-/* #define HAVE_USABLE_WCHAR_T */
-
 /* Py_UNICODE was the native Unicode storage format (code unit) used by
    Python and represents a single Unicode element in the Unicode type.
    With PEP 393, Py_UNICODE is deprecated and replaced with a
    typedef to wchar_t. */
-
-#ifndef Py_LIMITED_API
 #define PY_UNICODE_TYPE wchar_t
-typedef wchar_t Py_UNICODE;
-#endif
-
-/* If the compiler provides a wchar_t type we try to support it
-   through the interface functions PyUnicode_FromWideChar(),
-   PyUnicode_AsWideChar() and PyUnicode_AsWideCharString(). */
-
-#ifdef HAVE_USABLE_WCHAR_T
-# ifndef HAVE_WCHAR_H
-#  define HAVE_WCHAR_H
-# endif
-#endif
-
-#if defined(MS_WINDOWS)
-#  define HAVE_MBCS
-#endif
-
-#ifdef HAVE_WCHAR_H
-/* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */
-# ifdef _HAVE_BSDI
-#  include <time.h>
-# endif
-#  include <wchar.h>
-#endif
-
-/* Py_UCS4 and Py_UCS2 are typedefs for the respective
-   unicode representations. */
-#if SIZEOF_INT == 4
-typedef unsigned int Py_UCS4;
-#elif SIZEOF_LONG == 4
-typedef unsigned long Py_UCS4;
-#else
-#error "Could not find a proper typedef for Py_UCS4"
-#endif
-
-#if SIZEOF_SHORT == 2
-typedef unsigned short Py_UCS2;
-#else
-#error "Could not find a proper typedef for Py_UCS2"
-#endif
-
-typedef unsigned char Py_UCS1;
+/* Py_DEPRECATED(3.3) */ typedef wchar_t Py_UNICODE;
 
 /* --- Internal Unicode Operations ---------------------------------------- */
 
@@ -141,7 +21,6 @@ typedef unsigned char Py_UCS1;
    _Py_ascii_whitespace (see below) with an inlined check.
 
  */
-#ifndef Py_LIMITED_API
 #define Py_UNICODE_ISSPACE(ch) \
     ((ch) < 128U ? _Py_ascii_whitespace[(ch)] : _PyUnicode_IsWhitespace(ch))
 
@@ -172,11 +51,11 @@ typedef unsigned char Py_UCS1;
     Py_UNICODE_ISNUMERIC(ch))
 
 #define Py_UNICODE_COPY(target, source, length) \
-    Py_MEMCPY((target), (source), (length)*sizeof(Py_UNICODE))
+    memcpy((target), (source), (length)*sizeof(Py_UNICODE))
 
 #define Py_UNICODE_FILL(target, value, length) \
     do {Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\
-    for (i_ = 0; i_ < (length); i_++) t_[i_] = v_;\
+        for (i_ = 0; i_ < (length); i_++) t_[i_] = v_;\
     } while (0)
 
 /* macros to work with surrogates */
@@ -200,16 +79,8 @@ typedef unsigned char Py_UCS1;
      ((*((string)->wstr + (offset) + (substring)->wstr_length-1) == *((substring)->wstr + (substring)->wstr_length-1))) && \
      !memcmp((string)->wstr + (offset), (substring)->wstr, (substring)->wstr_length*sizeof(Py_UNICODE)))
 
-#endif /* Py_LIMITED_API */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* --- Unicode Type ------------------------------------------------------- */
 
-#ifndef Py_LIMITED_API
-
 /* ASCII-only strings created through PyUnicode_New use the PyASCIIObject
    structure. state.ascii and state.compact are set, and the data
    immediately follow the structure. utf8_length and wstr_length can be found
@@ -374,18 +245,12 @@ typedef struct {
         Py_UCS4 *ucs4;
     } data;                     /* Canonical, smallest-form Unicode buffer */
 } PyUnicodeObject;
-#endif
 
-PyAPI_DATA(PyTypeObject) PyUnicode_Type;
-PyAPI_DATA(PyTypeObject) PyUnicodeIter_Type;
-
-#define PyUnicode_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_UNICODE_SUBCLASS)
-#define PyUnicode_CheckExact(op) (Py_TYPE(op) == &PyUnicode_Type)
+PyAPI_FUNC(int) _PyUnicode_CheckConsistency(
+    PyObject *op,
+    int check_content);
 
 /* Fast access macros */
-#ifndef Py_LIMITED_API
-
 #define PyUnicode_WSTR_LENGTH(op) \
     (PyUnicode_IS_COMPACT_ASCII(op) ?                  \
      ((PyASCIIObject*)op)->length :                    \
@@ -396,14 +261,16 @@ PyAPI_DATA(PyTypeObject) PyUnicodeIter_Type;
    If the Py_UNICODE representation is not available, it will be computed
    on request.  Use PyUnicode_GET_LENGTH() for the length in code points. */
 
+/* Py_DEPRECATED(3.3) */
 #define PyUnicode_GET_SIZE(op)                       \
     (assert(PyUnicode_Check(op)),                    \
      (((PyASCIIObject *)(op))->wstr) ?               \
       PyUnicode_WSTR_LENGTH(op) :                    \
-      ((void)PyUnicode_AsUnicode((PyObject *)(op)),  \
+      ((void)PyUnicode_AsUnicode(_PyObject_CAST(op)),\
        assert(((PyASCIIObject *)(op))->wstr),        \
        PyUnicode_WSTR_LENGTH(op)))
 
+/* Py_DEPRECATED(3.3) */
 #define PyUnicode_GET_DATA_SIZE(op) \
     (PyUnicode_GET_SIZE(op) * Py_UNICODE_SIZE)
 
@@ -412,11 +279,13 @@ PyAPI_DATA(PyTypeObject) PyUnicodeIter_Type;
    try to port your code to use the new PyUnicode_*BYTE_DATA() macros or
    use PyUnicode_WRITE() and PyUnicode_READ(). */
 
+/* Py_DEPRECATED(3.3) */
 #define PyUnicode_AS_UNICODE(op) \
     (assert(PyUnicode_Check(op)), \
      (((PyASCIIObject *)(op))->wstr) ? (((PyASCIIObject *)(op))->wstr) : \
-      PyUnicode_AsUnicode((PyObject *)(op)))
+      PyUnicode_AsUnicode(_PyObject_CAST(op)))
 
+/* Py_DEPRECATED(3.3) */
 #define PyUnicode_AS_DATA(op) \
     ((const char *)(PyUnicode_AS_UNICODE(op)))
 
@@ -565,7 +434,7 @@ enum PyUnicode_Kind {
 #define PyUnicode_READY(op)                        \
     (assert(PyUnicode_Check(op)),                       \
      (PyUnicode_IS_READY(op) ?                          \
-      0 : _PyUnicode_Ready((PyObject *)(op))))
+      0 : _PyUnicode_Ready(_PyObject_CAST(op))))
 
 /* Return a maximum character value which is suitable for creating another
    string based on op.  This is always an approximation but more efficient
@@ -580,17 +449,6 @@ enum PyUnicode_Kind {
         (0xffffU) :                                                     \
         (0x10ffffU)))))
 
-#endif
-
-/* --- Constants ---------------------------------------------------------- */
-
-/* This Unicode character will be used as replacement character during
-   decoding if the errors argument is set to "replace". Note: the
-   Unicode character U+FFFD is the official REPLACEMENT CHARACTER in
-   Unicode 3.0. */
-
-#define Py_UNICODE_REPLACEMENT_CHARACTER ((Py_UCS4) 0xFFFD)
-
 /* === Public API ========================================================= */
 
 /* --- Plain Py_UNICODE --------------------------------------------------- */
@@ -598,12 +456,10 @@ enum PyUnicode_Kind {
 /* With PEP 393, this is the recommended way to allocate a new unicode object.
    This function will allocate the object and its buffer in a single memory
    block.  Objects created using this function are not resizable. */
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject*) PyUnicode_New(
     Py_ssize_t size,            /* Number of code points in the new string */
     Py_UCS4 maxchar             /* maximum code point value in the string */
     );
-#endif
 
 /* Initializes the canonical string representation from the deprecated
    wstr/Py_UNICODE representation. This function is used to convert Unicode
@@ -612,18 +468,14 @@ PyAPI_FUNC(PyObject*) PyUnicode_New(
 
    Don't call this function directly, use the public PyUnicode_READY() macro
    instead. */
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PyUnicode_Ready(
     PyObject *unicode           /* Unicode object */
     );
-#endif
 
 /* Get a copy of a Unicode string. */
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject*) _PyUnicode_Copy(
     PyObject *unicode
     );
-#endif
 
 /* Copy character from one unicode object into another, this function performs
    character conversion when necessary and falls back to memcpy() if possible.
@@ -643,7 +495,6 @@ PyAPI_FUNC(PyObject*) _PyUnicode_Copy(
 
    Note: The function doesn't write a terminating null character.
    */
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(Py_ssize_t) PyUnicode_CopyCharacters(
     PyObject *to,
     Py_ssize_t to_start,
@@ -662,9 +513,7 @@ PyAPI_FUNC(void) _PyUnicode_FastCopyCharacters(
     Py_ssize_t from_start,
     Py_ssize_t how_many
     );
-#endif
 
-#ifndef Py_LIMITED_API
 /* Fill a string with a character: write fill_char into
    unicode[start:start+length].
 
@@ -688,7 +537,6 @@ PyAPI_FUNC(void) _PyUnicode_FastFill(
     Py_ssize_t length,
     Py_UCS4 fill_char
     );
-#endif
 
 /* Create a Unicode Object from the Py_UNICODE buffer u of the given
    size.
@@ -699,27 +547,11 @@ PyAPI_FUNC(void) _PyUnicode_FastFill(
    only allowed if u was set to NULL.
 
    The buffer is copied into the new object. */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode(
+/* Py_DEPRECATED(3.3) */ PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode(
     const Py_UNICODE *u,        /* Unicode buffer */
     Py_ssize_t size             /* size of buffer */
     );
-#endif
 
-/* Similar to PyUnicode_FromUnicode(), but u points to UTF-8 encoded bytes */
-PyAPI_FUNC(PyObject*) PyUnicode_FromStringAndSize(
-    const char *u,             /* UTF-8 encoded string */
-    Py_ssize_t size            /* size of buffer */
-    );
-
-/* Similar to PyUnicode_FromUnicode(), but u points to null-terminated
-   UTF-8 encoded bytes.  The size is determined with strlen(). */
-PyAPI_FUNC(PyObject*) PyUnicode_FromString(
-    const char *u              /* UTF-8 encoded string */
-    );
-
-#ifndef Py_LIMITED_API
 /* Create a new string from a buffer of Py_UCS1, Py_UCS2 or Py_UCS4 characters.
    Scan the string to find the maximum character. */
 PyAPI_FUNC(PyObject*) PyUnicode_FromKindAndData(
@@ -732,160 +564,44 @@ PyAPI_FUNC(PyObject*) PyUnicode_FromKindAndData(
 PyAPI_FUNC(PyObject*) _PyUnicode_FromASCII(
     const char *buffer,
     Py_ssize_t size);
-#endif
 
-PyAPI_FUNC(PyObject*) PyUnicode_Substring(
-    PyObject *str,
-    Py_ssize_t start,
-    Py_ssize_t end);
-
-#ifndef Py_LIMITED_API
 /* Compute the maximum character of the substring unicode[start:end].
    Return 127 for an empty string. */
 PyAPI_FUNC(Py_UCS4) _PyUnicode_FindMaxChar (
     PyObject *unicode,
     Py_ssize_t start,
     Py_ssize_t end);
-#endif
-
-/* Copy the string into a UCS4 buffer including the null character if copy_null
-   is set. Return NULL and raise an exception on error. Raise a ValueError if
-   the buffer is smaller than the string. Return buffer on success.
-
-   buflen is the length of the buffer in (Py_UCS4) characters. */
-PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4(
-    PyObject *unicode,
-    Py_UCS4* buffer,
-    Py_ssize_t buflen,
-    int copy_null);
-
-/* Copy the string into a UCS4 buffer. A new buffer is allocated using
- * PyMem_Malloc; if this fails, NULL is returned with a memory error
-   exception set. */
-PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4Copy(PyObject *unicode);
 
 /* Return a read-only pointer to the Unicode object's internal
    Py_UNICODE buffer.
    If the wchar_t/Py_UNICODE representation is not yet available, this
    function will calculate it. */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode(
+/* Py_DEPRECATED(3.3) */ PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode(
+    PyObject *unicode           /* Unicode object */
+    );
+
+/* Similar to PyUnicode_AsUnicode(), but raises a ValueError if the string
+   contains null characters. */
+PyAPI_FUNC(const Py_UNICODE *) _PyUnicode_AsUnicode(
     PyObject *unicode           /* Unicode object */
     );
-#endif
 
 /* Return a read-only pointer to the Unicode object's internal
    Py_UNICODE buffer and save the length at size.
    If the wchar_t/Py_UNICODE representation is not yet available, this
    function will calculate it. */
 
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicodeAndSize(
+/* Py_DEPRECATED(3.3) */ PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicodeAndSize(
     PyObject *unicode,          /* Unicode object */
     Py_ssize_t *size            /* location where to save the length */
     );
-#endif
 
-/* Get the length of the Unicode object. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_GetLength(
-    PyObject *unicode
-);
-
-/* Get the number of Py_UNICODE units in the
-   string representation. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Read a character from the string. */
-
-PyAPI_FUNC(Py_UCS4) PyUnicode_ReadChar(
-    PyObject *unicode,
-    Py_ssize_t index
-    );
-
-/* Write a character to the string. The string must have been created through
-   PyUnicode_New, must not be shared, and must not have been hashed yet.
-
-   Return 0 on success, -1 on error. */
-
-PyAPI_FUNC(int) PyUnicode_WriteChar(
-    PyObject *unicode,
-    Py_ssize_t index,
-    Py_UCS4 character
-    );
-
-#ifndef Py_LIMITED_API
 /* Get the maximum ordinal for a Unicode character. */
-PyAPI_FUNC(Py_UNICODE) PyUnicode_GetMax(void);
-#endif
+Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE) PyUnicode_GetMax(void);
 
-/* Resize a Unicode object. The length is the number of characters, except
-   if the kind of the string is PyUnicode_WCHAR_KIND: in this case, the length
-   is the number of Py_UNICODE characters.
 
-   *unicode is modified to point to the new (resized) object and 0
-   returned on success.
+/* --- _PyUnicodeWriter API ----------------------------------------------- */
 
-   Try to resize the string in place (which is usually faster than allocating
-   a new string and copy characters), or create a new string.
-
-   Error handling is implemented as follows: an exception is set, -1
-   is returned and *unicode left untouched.
-
-   WARNING: The function doesn't check string content, the result may not be a
-            string in canonical representation. */
-
-PyAPI_FUNC(int) PyUnicode_Resize(
-    PyObject **unicode,         /* Pointer to the Unicode object */
-    Py_ssize_t length           /* New length */
-    );
-
-/* Decode obj to a Unicode object.
-
-   bytes, bytearray and other bytes-like objects are decoded according to the
-   given encoding and error handler. The encoding and error handler can be
-   NULL to have the interface use UTF-8 and "strict".
-
-   All other objects (including Unicode objects) raise an exception.
-
-   The API returns NULL in case of an error. The caller is responsible
-   for decref'ing the returned objects.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromEncodedObject(
-    PyObject *obj,              /* Object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Copy an instance of a Unicode subtype to a new true Unicode object if
-   necessary. If obj is already a true Unicode object (not a subtype), return
-   the reference with *incremented* refcount.
-
-   The API returns NULL in case of an error. The caller is responsible
-   for decref'ing the returned objects.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromObject(
-    PyObject *obj      /* Object */
-    );
-
-PyAPI_FUNC(PyObject *) PyUnicode_FromFormatV(
-    const char *format,   /* ASCII-encoded string  */
-    va_list vargs
-    );
-PyAPI_FUNC(PyObject *) PyUnicode_FromFormat(
-    const char *format,   /* ASCII-encoded string  */
-    ...
-    );
-
-#ifndef Py_LIMITED_API
 typedef struct {
     PyObject *buffer;
     void *data;
@@ -900,7 +616,7 @@ typedef struct {
     /* minimum character (default: 127, ASCII) */
     Py_UCS4 min_char;
 
-    /* If non-zero, overallocate the buffer by 25% (default: 0). */
+    /* If non-zero, overallocate the buffer (default: 0). */
     unsigned char overallocate;
 
     /* If readonly is 1, buffer is a shared string (cannot be modified)
@@ -934,6 +650,23 @@ PyAPI_FUNC(int)
 _PyUnicodeWriter_PrepareInternal(_PyUnicodeWriter *writer,
                                  Py_ssize_t length, Py_UCS4 maxchar);
 
+/* Prepare the buffer to have at least the kind KIND.
+   For example, kind=PyUnicode_2BYTE_KIND ensures that the writer will
+   support characters in range U+000-U+FFFF.
+
+   Return 0 on success, raise an exception and return -1 on error. */
+#define _PyUnicodeWriter_PrepareKind(WRITER, KIND)                    \
+    (assert((KIND) != PyUnicode_WCHAR_KIND),                          \
+     (KIND) <= (WRITER)->kind                                         \
+     ? 0                                                              \
+     : _PyUnicodeWriter_PrepareKindInternal((WRITER), (KIND)))
+
+/* Don't call this function directly, use the _PyUnicodeWriter_PrepareKind()
+   macro instead. */
+PyAPI_FUNC(int)
+_PyUnicodeWriter_PrepareKindInternal(_PyUnicodeWriter *writer,
+                                     enum PyUnicode_Kind kind);
+
 /* Append a Unicode character.
    Return 0 on success, raise an exception and return -1 on error. */
 PyAPI_FUNC(int)
@@ -982,9 +715,8 @@ _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer);
 /* Deallocate memory of a writer (clear its internal buffer). */
 PyAPI_FUNC(void)
 _PyUnicodeWriter_Dealloc(_PyUnicodeWriter *writer);
-#endif
 
-#ifndef Py_LIMITED_API
+
 /* Format the object based on the format_spec, as defined in PEP 3101
    (Advanced String Formatting). */
 PyAPI_FUNC(int) _PyUnicode_FormatAdvancedWriter(
@@ -993,112 +725,13 @@ PyAPI_FUNC(int) _PyUnicode_FormatAdvancedWriter(
     PyObject *format_spec,
     Py_ssize_t start,
     Py_ssize_t end);
-#endif
-
-PyAPI_FUNC(void) PyUnicode_InternInPlace(PyObject **);
-PyAPI_FUNC(void) PyUnicode_InternImmortal(PyObject **);
-PyAPI_FUNC(PyObject *) PyUnicode_InternFromString(
-    const char *u              /* UTF-8 encoded string */
-    );
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _Py_ReleaseInternedUnicodeStrings(void);
-#endif
-
-/* Use only if you know it's a string */
-#define PyUnicode_CHECK_INTERNED(op) \
-    (((PyASCIIObject *)(op))->state.interned)
 
 /* --- wchar_t support for platforms which support it --------------------- */
 
 #ifdef HAVE_WCHAR_H
-
-/* Create a Unicode Object from the wchar_t buffer w of the given
-   size.
-
-   The buffer is copied into the new object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromWideChar(
-    const wchar_t *w,           /* wchar_t buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-
-/* Copies the Unicode Object contents into the wchar_t buffer w.  At
-   most size wchar_t characters are copied.
-
-   Note that the resulting wchar_t string may or may not be
-   0-terminated.  It is the responsibility of the caller to make sure
-   that the wchar_t string is 0-terminated in case this is required by
-   the application.
-
-   Returns the number of wchar_t characters copied (excluding a
-   possibly trailing 0-termination character) or -1 in case of an
-   error. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar(
-    PyObject *unicode,          /* Unicode object */
-    wchar_t *w,                 /* wchar_t buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-
-/* Convert the Unicode object to a wide character string. The output string
-   always ends with a nul character. If size is not NULL, write the number of
-   wide characters (excluding the null character) into *size.
-
-   Returns a buffer allocated by PyMem_Malloc() (use PyMem_Free() to free it)
-   on success. On error, returns NULL, *size is undefined and raises a
-   MemoryError. */
-
-PyAPI_FUNC(wchar_t*) PyUnicode_AsWideCharString(
-    PyObject *unicode,          /* Unicode object */
-    Py_ssize_t *size            /* number of characters of the result */
-    );
-
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(void*) _PyUnicode_AsKind(PyObject *s, unsigned int kind);
 #endif
 
-#endif
-
-/* --- Unicode ordinals --------------------------------------------------- */
-
-/* Create a Unicode Object from the given Unicode code point ordinal.
-
-   The ordinal must be in range(0x110000). A ValueError is
-   raised in case it is not.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal);
-
-/* --- Free-list management ----------------------------------------------- */
-
-/* Clear the free list used by the Unicode implementation.
-
-   This can be used to release memory used for objects on the free
-   list back to the Python memory allocator.
-
-*/
-
-PyAPI_FUNC(int) PyUnicode_ClearFreeList(void);
-
-/* === Builtin Codecs =====================================================
-
-   Many of these APIs take two arguments encoding and errors. These
-   parameters encoding and errors have the same semantics as the ones
-   of the builtin str() API.
-
-   Setting encoding to NULL causes the default encoding (UTF-8) to be used.
-
-   Error handling is set by errors which may also be set to NULL
-   meaning to use the default handling defined for the codec. Default
-   error handling for all builtin codecs is "strict" (ValueErrors are
-   raised).
-
-   The codecs all use a similar interface. Only deviation from the
-   generic ones are documented.
-
-*/
-
 /* --- Manage the default encoding ---------------------------------------- */
 
 /* Returns a pointer to the default encoding (UTF-8) of the
@@ -1121,12 +754,11 @@ PyAPI_FUNC(int) PyUnicode_ClearFreeList(void);
    *** please use PyUnicode_AsUTF8String() instead.
 */
 
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(char *) PyUnicode_AsUTF8AndSize(
+PyAPI_FUNC(const char *) PyUnicode_AsUTF8AndSize(
     PyObject *unicode,
     Py_ssize_t *size);
+
 #define _PyUnicode_AsStringAndSize PyUnicode_AsUTF8AndSize
-#endif
 
 /* Returns a pointer to the default encoding (UTF-8) of the
    Unicode object unicode.
@@ -1148,284 +780,67 @@ PyAPI_FUNC(char *) PyUnicode_AsUTF8AndSize(
 
 */
 
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(char *) PyUnicode_AsUTF8(PyObject *unicode);
+PyAPI_FUNC(const char *) PyUnicode_AsUTF8(PyObject *unicode);
+
 #define _PyUnicode_AsString PyUnicode_AsUTF8
-#endif
-
-/* Returns "utf-8".  */
-
-PyAPI_FUNC(const char*) PyUnicode_GetDefaultEncoding(void);
 
 /* --- Generic Codecs ----------------------------------------------------- */
 
-/* Create a Unicode object by decoding the encoded string s of the
-   given size. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Decode(
-    const char *s,              /* encoded string */
-    Py_ssize_t size,            /* size of buffer */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Decode a Unicode object unicode and return the result as Python
-   object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedObject(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Decode a Unicode object unicode and return the result as Unicode
-   object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedUnicode(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
 /* Encodes a Py_UNICODE buffer of the given size and returns a
    Python string object. */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_Encode(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_Encode(
     const Py_UNICODE *s,        /* Unicode char buffer */
     Py_ssize_t size,            /* number of Py_UNICODE chars to encode */
     const char *encoding,       /* encoding */
     const char *errors          /* error handling */
     );
-#endif
-
-/* Encodes a Unicode object and returns the result as Python
-   object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a Unicode object and returns the result as Python string
-   object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a Unicode object and returns the result as Unicode
-   object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedUnicode(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Build an encoding map. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap(
-    PyObject* string            /* 256 character map */
-   );
 
 /* --- UTF-7 Codecs ------------------------------------------------------- */
 
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7(
-    const char *string,         /* UTF-7 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful(
-    const char *string,         /* UTF-7 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
     int base64SetO,             /* Encode RFC2152 Set O characters in base64 */
     int base64WhiteSpace,       /* Encode whitespace (sp, ht, nl, cr) in base64 */
     const char *errors          /* error handling */
     );
+
 PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF7(
     PyObject *unicode,          /* Unicode object */
     int base64SetO,             /* Encode RFC2152 Set O characters in base64 */
     int base64WhiteSpace,       /* Encode whitespace (sp, ht, nl, cr) in base64 */
     const char *errors          /* error handling */
     );
-#endif
 
 /* --- UTF-8 Codecs ------------------------------------------------------- */
 
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8(
-    const char *string,         /* UTF-8 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8Stateful(
-    const char *string,         /* UTF-8 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF8String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject*) _PyUnicode_AsUTF8String(
     PyObject *unicode,
     const char *errors);
 
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF8(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF8(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
     const char *errors          /* error handling */
     );
-#endif
 
 /* --- UTF-32 Codecs ------------------------------------------------------ */
 
-/* Decodes length bytes from a UTF-32 encoded buffer string and returns
-   the corresponding Unicode object.
-
-   errors (if non-NULL) defines the error handling. It defaults
-   to "strict".
-
-   If byteorder is non-NULL, the decoder starts decoding using the
-   given byte order:
-
-    *byteorder == -1: little endian
-    *byteorder == 0:  native order
-    *byteorder == 1:  big endian
-
-   In native mode, the first four bytes of the stream are checked for a
-   BOM mark. If found, the BOM mark is analysed, the byte order
-   adjusted and the BOM skipped.  In the other modes, no BOM mark
-   interpretation is done. After completion, *byteorder is set to the
-   current byte order at the end of input data.
-
-   If byteorder is NULL, the codec starts in native order mode.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32(
-    const char *string,         /* UTF-32 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder              /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32Stateful(
-    const char *string,         /* UTF-32 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder,             /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-/* Returns a Python string using the UTF-32 encoding in native byte
-   order. The string always starts with a BOM mark.  */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF32String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Returns a Python string object holding the UTF-32 encoded value of
-   the Unicode data.
-
-   If byteorder is not 0, output is written according to the following
-   byte order:
-
-   byteorder == -1: little endian
-   byteorder == 0:  native byte order (writes a BOM mark)
-   byteorder == 1:  big endian
-
-   If byteorder is 0, the output string will always start with the
-   Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is
-   prepended.
-
-*/
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF32(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF32(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
     const char *errors,         /* error handling */
     int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
     );
+
 PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF32(
     PyObject *object,           /* Unicode object */
     const char *errors,         /* error handling */
     int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
     );
-#endif
 
 /* --- UTF-16 Codecs ------------------------------------------------------ */
 
-/* Decodes length bytes from a UTF-16 encoded buffer string and returns
-   the corresponding Unicode object.
-
-   errors (if non-NULL) defines the error handling. It defaults
-   to "strict".
-
-   If byteorder is non-NULL, the decoder starts decoding using the
-   given byte order:
-
-    *byteorder == -1: little endian
-    *byteorder == 0:  native order
-    *byteorder == 1:  big endian
-
-   In native mode, the first two bytes of the stream are checked for a
-   BOM mark. If found, the BOM mark is analysed, the byte order
-   adjusted and the BOM skipped.  In the other modes, no BOM mark
-   interpretation is done. After completion, *byteorder is set to the
-   current byte order at the end of input data.
-
-   If byteorder is NULL, the codec starts in native order mode.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16(
-    const char *string,         /* UTF-16 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder              /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16Stateful(
-    const char *string,         /* UTF-16 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder,             /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-/* Returns a Python string using the UTF-16 encoding in native byte
-   order. The string always starts with a BOM mark.  */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String(
-    PyObject *unicode           /* Unicode object */
-    );
-
 /* Returns a Python string object holding the UTF-16 encoded value of
    the Unicode data.
 
@@ -1445,246 +860,112 @@ PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String(
    at a later point without compromising the APIs.
 
 */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF16(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF16(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
     const char *errors,         /* error handling */
     int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
     );
+
 PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF16(
     PyObject* unicode,          /* Unicode object */
     const char *errors,         /* error handling */
     int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
     );
-#endif
 
 /* --- Unicode-Escape Codecs ---------------------------------------------- */
 
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape(
-    const char *string,         /* Unicode-Escape encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
+/* Helper for PyUnicode_DecodeUnicodeEscape that detects invalid escape
+   chars. */
+PyAPI_FUNC(PyObject*) _PyUnicode_DecodeUnicodeEscape(
+        const char *string,     /* Unicode-Escape encoded string */
+        Py_ssize_t length,      /* size of string */
+        const char *errors,     /* error handling */
+        const char **first_invalid_escape  /* on return, points to first
+                                              invalid escaped char in
+                                              string. */
+);
 
-PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUnicodeEscape(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUnicodeEscape(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length           /* Number of Py_UNICODE chars to encode */
     );
-#endif
 
 /* --- Raw-Unicode-Escape Codecs ------------------------------------------ */
 
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeRawUnicodeEscape(
-    const char *string,         /* Raw-Unicode-Escape encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsRawUnicodeEscapeString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeRawUnicodeEscape(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeRawUnicodeEscape(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length           /* Number of Py_UNICODE chars to encode */
     );
-#endif
 
-/* --- Unicode Internal Codec ---------------------------------------------
+/* --- Latin-1 Codecs ----------------------------------------------------- */
 
-    Only for internal use in _codecsmodule.c */
-
-#ifndef Py_LIMITED_API
-PyObject *_PyUnicode_DecodeUnicodeInternal(
-    const char *string,
-    Py_ssize_t length,
-    const char *errors
-    );
-#endif
-
-/* --- Latin-1 Codecs -----------------------------------------------------
-
-   Note: Latin-1 corresponds to the first 256 Unicode ordinals.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeLatin1(
-    const char *string,         /* Latin-1 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsLatin1String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject*) _PyUnicode_AsLatin1String(
     PyObject* unicode,
     const char* errors);
 
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeLatin1(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeLatin1(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
     const char *errors          /* error handling */
     );
-#endif
 
-/* --- ASCII Codecs -------------------------------------------------------
+/* --- ASCII Codecs ------------------------------------------------------- */
 
-   Only 7-bit ASCII data is excepted. All other codes generate errors.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeASCII(
-    const char *string,         /* ASCII encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsASCIIString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject*) _PyUnicode_AsASCIIString(
     PyObject* unicode,
     const char* errors);
 
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
     const char *errors          /* error handling */
     );
-#endif
 
-/* --- Character Map Codecs -----------------------------------------------
+/* --- Character Map Codecs ----------------------------------------------- */
 
-   This codec uses mappings to encode and decode characters.
-
-   Decoding mappings must map single string characters to single
-   Unicode characters, integers (which are then interpreted as Unicode
-   ordinals) or None (meaning "undefined mapping" and causing an
-   error).
-
-   Encoding mappings must map single Unicode characters to single
-   string characters, integers (which are then interpreted as Latin-1
-   ordinals) or None (meaning "undefined mapping" and causing an
-   error).
-
-   If a character lookup fails with a LookupError, the character is
-   copied as-is meaning that its ordinal value will be interpreted as
-   Unicode or Latin-1 ordinal resp. Because of this mappings only need
-   to contain those mappings which map characters to different code
-   points.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap(
-    const char *string,         /* Encoded string */
-    Py_ssize_t length,          /* size of string */
-    PyObject *mapping,          /* character mapping
-                                   (char ordinal -> unicode ordinal) */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString(
-    PyObject *unicode,          /* Unicode object */
-    PyObject *mapping           /* character mapping
-                                   (unicode ordinal -> char ordinal) */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    PyObject *mapping,          /* character mapping
-                                   (unicode ordinal -> char ordinal) */
+    PyObject *mapping,          /* encoding mapping */
     const char *errors          /* error handling */
     );
+
 PyAPI_FUNC(PyObject*) _PyUnicode_EncodeCharmap(
     PyObject *unicode,          /* Unicode object */
-    PyObject *mapping,          /* character mapping
-                                   (unicode ordinal -> char ordinal) */
+    PyObject *mapping,          /* encoding mapping */
     const char *errors          /* error handling */
     );
-#endif
 
 /* Translate a Py_UNICODE buffer of the given length by applying a
    character mapping table to it and return the resulting Unicode
    object.
 
-   The mapping table must map Unicode ordinal integers to Unicode
-   ordinal integers or None (causing deletion of the character).
+   The mapping table must map Unicode ordinal integers to Unicode strings,
+   Unicode ordinal integers or None (causing deletion of the character).
 
    Mapping tables may be dictionaries or sequences. Unmapped character
    ordinals (ones which cause a LookupError) are left untouched and
    are copied as-is.
 
 */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap(
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
     PyObject *table,            /* Translate table */
     const char *errors          /* error handling */
     );
-#endif
-
-#ifdef HAVE_MBCS
 
 /* --- MBCS codecs for Windows -------------------------------------------- */
 
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS(
-    const char *string,         /* MBCS encoded string */
-    Py_ssize_t length,              /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCSStateful(
-    const char *string,         /* MBCS encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeCodePageStateful(
-    int code_page,              /* code page number */
-    const char *string,         /* encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsMBCSString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeMBCS(
+#ifdef MS_WINDOWS
+Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeMBCS(
     const Py_UNICODE *data,     /* Unicode char buffer */
     Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
     const char *errors          /* error handling */
     );
 #endif
 
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeCodePage(
-    int code_page,              /* code page number */
-    PyObject *unicode,          /* Unicode object */
-    const char *errors          /* error handling */
-    );
-
-#endif /* HAVE_MBCS */
-
 /* --- Decimal Encoder ---------------------------------------------------- */
 
 /* Takes a Unicode string holding a decimal value and writes it into
@@ -1709,14 +990,12 @@ PyAPI_FUNC(PyObject*) PyUnicode_EncodeCodePage(
 
 */
 
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) PyUnicode_EncodeDecimal(
+/* Py_DEPRECATED(3.3) */ PyAPI_FUNC(int) PyUnicode_EncodeDecimal(
     Py_UNICODE *s,              /* Unicode buffer */
     Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
     char *output,               /* Output buffer; must have size >= length */
     const char *errors          /* error handling */
     );
-#endif
 
 /* Transforms code points that have decimal digit property to the
    corresponding ASCII digit code points.
@@ -1724,367 +1003,72 @@ PyAPI_FUNC(int) PyUnicode_EncodeDecimal(
    Returns a new Unicode string on success, NULL on failure.
 */
 
-#ifndef Py_LIMITED_API
+/* Py_DEPRECATED(3.3) */
 PyAPI_FUNC(PyObject*) PyUnicode_TransformDecimalToASCII(
     Py_UNICODE *s,              /* Unicode buffer */
     Py_ssize_t length           /* Number of Py_UNICODE chars to transform */
     );
-#endif
 
-/* Similar to PyUnicode_TransformDecimalToASCII(), but takes a PyObject
-   as argument instead of a raw buffer and length.  This function additionally
-   transforms spaces to ASCII because this is what the callers in longobject,
-   floatobject, and complexobject did anyways. */
+/* Coverts a Unicode object holding a decimal value to an ASCII string
+   for using in int, float and complex parsers.
+   Transforms code points that have decimal digit property to the
+   corresponding ASCII digit code points.  Transforms spaces to ASCII.
+   Transforms code points starting from the first non-ASCII code point that
+   is neither a decimal digit nor a space to the end into '?'. */
 
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject*) _PyUnicode_TransformDecimalAndSpaceToASCII(
     PyObject *unicode           /* Unicode object */
     );
-#endif
 
-/* --- Locale encoding --------------------------------------------------- */
+/* --- Methods & Slots ---------------------------------------------------- */
 
-/* Decode a string from the current locale encoding. The decoder is strict if
-   *surrogateescape* is equal to zero, otherwise it uses the 'surrogateescape'
-   error handler (PEP 383) to escape undecodable bytes. If a byte sequence can
-   be decoded as a surrogate character and *surrogateescape* is not equal to
-   zero, the byte sequence is escaped using the 'surrogateescape' error handler
-   instead of being decoded. *str* must end with a null character but cannot
-   contain embedded null characters. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocaleAndSize(
-    const char *str,
-    Py_ssize_t len,
-    const char *errors);
-
-/* Similar to PyUnicode_DecodeLocaleAndSize(), but compute the string
-   length using strlen(). */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocale(
-    const char *str,
-    const char *errors);
-
-/* Encode a Unicode object to the current locale encoding. The encoder is
-   strict is *surrogateescape* is equal to zero, otherwise the
-   "surrogateescape" error handler is used. Return a bytes object. The string
-   cannot contain embedded null characters. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeLocale(
-    PyObject *unicode,
-    const char *errors
+PyAPI_FUNC(PyObject *) _PyUnicode_JoinArray(
+    PyObject *separator,
+    PyObject *const *items,
+    Py_ssize_t seqlen
     );
 
-/* --- File system encoding ---------------------------------------------- */
-
-/* ParseTuple converter: encode str objects to bytes using
-   PyUnicode_EncodeFSDefault(); bytes objects are output as-is. */
-
-PyAPI_FUNC(int) PyUnicode_FSConverter(PyObject*, void*);
-
-/* ParseTuple converter: decode bytes objects to unicode using
-   PyUnicode_DecodeFSDefaultAndSize(); str objects are output as-is. */
-
-PyAPI_FUNC(int) PyUnicode_FSDecoder(PyObject*, void*);
-
-/* Decode a null-terminated string using Py_FileSystemDefaultEncoding
-   and the "surrogateescape" error handler.
-
-   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
-   encoding.
-
-   Use PyUnicode_DecodeFSDefaultAndSize() if the string length is known.
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefault(
-    const char *s               /* encoded string */
-    );
-
-/* Decode a string using Py_FileSystemDefaultEncoding
-   and the "surrogateescape" error handler.
-
-   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
-   encoding.
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefaultAndSize(
-    const char *s,               /* encoded string */
-    Py_ssize_t size              /* size */
-    );
-
-/* Encode a Unicode object to Py_FileSystemDefaultEncoding with the
-   "surrogateescape" error handler, and return bytes.
-
-   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
-   encoding.
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeFSDefault(
-    PyObject *unicode
-    );
-
-/* --- Methods & Slots ----------------------------------------------------
-
-   These are capable of handling Unicode objects and strings on input
-   (we refer to them as strings in the descriptions) and return
-   Unicode objects or integers as appropriate. */
-
-/* Concat two strings giving a new Unicode string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Concat(
-    PyObject *left,             /* Left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Concat two strings and put the result in *pleft
-   (sets *pleft to NULL on error) */
-
-PyAPI_FUNC(void) PyUnicode_Append(
-    PyObject **pleft,           /* Pointer to left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Concat two strings, put the result in *pleft and drop the right object
-   (sets *pleft to NULL on error) */
-
-PyAPI_FUNC(void) PyUnicode_AppendAndDel(
-    PyObject **pleft,           /* Pointer to left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Split a string giving a list of Unicode strings.
-
-   If sep is NULL, splitting will be done at all whitespace
-   substrings. Otherwise, splits occur at the given separator.
-
-   At most maxsplit splits will be done. If negative, no limit is set.
-
-   Separators are not included in the resulting list.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_Split(
-    PyObject *s,                /* String to split */
-    PyObject *sep,              /* String separator */
-    Py_ssize_t maxsplit         /* Maxsplit count */
-    );
-
-/* Dito, but split at line breaks.
-
-   CRLF is considered to be one line break. Line breaks are not
-   included in the resulting list. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Splitlines(
-    PyObject *s,                /* String to split */
-    int keepends                /* If true, line end markers are included */
-    );
-
-/* Partition a string using a given separator. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Partition(
-    PyObject *s,                /* String to partition */
-    PyObject *sep               /* String separator */
-    );
-
-/* Partition a string using a given separator, searching from the end of the
-   string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_RPartition(
-    PyObject *s,                /* String to partition */
-    PyObject *sep               /* String separator */
-    );
-
-/* Split a string giving a list of Unicode strings.
-
-   If sep is NULL, splitting will be done at all whitespace
-   substrings. Otherwise, splits occur at the given separator.
-
-   At most maxsplit splits will be done. But unlike PyUnicode_Split
-   PyUnicode_RSplit splits from the end of the string. If negative,
-   no limit is set.
-
-   Separators are not included in the resulting list.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_RSplit(
-    PyObject *s,                /* String to split */
-    PyObject *sep,              /* String separator */
-    Py_ssize_t maxsplit         /* Maxsplit count */
-    );
-
-/* Translate a string by applying a character mapping table to it and
-   return the resulting Unicode object.
-
-   The mapping table must map Unicode ordinal integers to Unicode
-   ordinal integers or None (causing deletion of the character).
-
-   Mapping tables may be dictionaries or sequences. Unmapped character
-   ordinals (ones which cause a LookupError) are left untouched and
-   are copied as-is.
-
-*/
-
-PyAPI_FUNC(PyObject *) PyUnicode_Translate(
-    PyObject *str,              /* String */
-    PyObject *table,            /* Translate table */
-    const char *errors          /* error handling */
-    );
-
-/* Join a sequence of strings using the given separator and return
-   the resulting Unicode string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Join(
-    PyObject *separator,        /* Separator string */
-    PyObject *seq               /* Sequence object */
-    );
-
-/* Return 1 if substr matches str[start:end] at the given tail end, 0
-   otherwise. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Tailmatch(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Prefix or Suffix string */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end,             /* Stop index */
-    int direction               /* Tail end: -1 prefix, +1 suffix */
-    );
-
-/* Return the first position of substr in str[start:end] using the
-   given search direction or -1 if not found. -2 is returned in case
-   an error occurred and an exception is set. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Find(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to find */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end,             /* Stop index */
-    int direction               /* Find direction: +1 forward, -1 backward */
-    );
-
-/* Like PyUnicode_Find, but search for single character only. */
-PyAPI_FUNC(Py_ssize_t) PyUnicode_FindChar(
-    PyObject *str,
-    Py_UCS4 ch,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    int direction
-    );
-
-/* Count the number of occurrences of substr in str[start:end]. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Count(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to count */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end              /* Stop index */
-    );
-
-/* Replace at most maxcount occurrences of substr in str with replstr
-   and return the resulting Unicode object. */
-
-PyAPI_FUNC(PyObject *) PyUnicode_Replace(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to find */
-    PyObject *replstr,          /* Substring to replace */
-    Py_ssize_t maxcount         /* Max. number of replacements to apply;
-                                   -1 = all */
-    );
-
-/* Compare two strings and return -1, 0, 1 for less than, equal,
-   greater than resp.
-   Raise an exception and return -1 on error. */
-
-PyAPI_FUNC(int) PyUnicode_Compare(
-    PyObject *left,             /* Left string */
-    PyObject *right             /* Right string */
-    );
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyUnicode_CompareWithId(
+/* Test whether a unicode is equal to ASCII identifier.  Return 1 if true,
+   0 otherwise.  The right argument must be ASCII identifier.
+   Any error occurs inside will be cleared before return. */
+PyAPI_FUNC(int) _PyUnicode_EqualToASCIIId(
     PyObject *left,             /* Left string */
     _Py_Identifier *right       /* Right identifier */
     );
-#endif
 
-PyAPI_FUNC(int) PyUnicode_CompareWithASCIIString(
+/* Test whether a unicode is equal to ASCII string.  Return 1 if true,
+   0 otherwise.  The right argument must be ASCII-encoded string.
+   Any error occurs inside will be cleared before return. */
+PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString(
     PyObject *left,
     const char *right           /* ASCII-encoded string */
     );
 
-/* Rich compare two strings and return one of the following:
-
-   - NULL in case an exception was raised
-   - Py_True or Py_False for successfully comparisons
-   - Py_NotImplemented in case the type combination is unknown
-
-   Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in
-   case the conversion of the arguments to Unicode fails with a
-   UnicodeDecodeError.
-
-   Possible values for op:
-
-     Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE
-
-*/
-
-PyAPI_FUNC(PyObject *) PyUnicode_RichCompare(
-    PyObject *left,             /* Left string */
-    PyObject *right,            /* Right string */
-    int op                      /* Operation: Py_EQ, Py_NE, Py_GT, etc. */
-    );
-
-/* Apply an argument tuple or dictionary to a format string and return
-   the resulting Unicode string. */
-
-PyAPI_FUNC(PyObject *) PyUnicode_Format(
-    PyObject *format,           /* Format string */
-    PyObject *args              /* Argument tuple or dictionary */
-    );
-
-/* Checks whether element is contained in container and return 1/0
-   accordingly.
-
-   element has to coerce to a one element Unicode string. -1 is
-   returned in case of an error. */
-
-PyAPI_FUNC(int) PyUnicode_Contains(
-    PyObject *container,        /* Container string */
-    PyObject *element           /* Element string */
-    );
-
-/* Checks whether argument is a valid identifier. */
-
-PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s);
-
-#ifndef Py_LIMITED_API
 /* Externally visible for str.strip(unicode) */
 PyAPI_FUNC(PyObject *) _PyUnicode_XStrip(
     PyObject *self,
     int striptype,
     PyObject *sepobj
     );
-#endif
 
 /* Using explicit passed-in values, insert the thousands grouping
    into the string pointed to by buffer.  For the argument descriptions,
    see Objects/stringlib/localeutil.h */
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(Py_ssize_t) _PyUnicode_InsertThousandsGrouping(
-    PyObject *unicode,
-    Py_ssize_t index,
+    _PyUnicodeWriter *writer,
     Py_ssize_t n_buffer,
-    void *digits,
+    PyObject *digits,
+    Py_ssize_t d_pos,
     Py_ssize_t n_digits,
     Py_ssize_t min_width,
     const char *grouping,
     PyObject *thousands_sep,
     Py_UCS4 *maxchar);
-#endif
+
 /* === Characters Type APIs =============================================== */
 
 /* Helper array used by Py_UNICODE_ISSPACE(). */
 
-#ifndef Py_LIMITED_API
 PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[];
 
 /* These should not be used directly. Use the Py_UNICODE_IS* and
@@ -2122,15 +1106,15 @@ PyAPI_FUNC(int) _PyUnicode_IsLinebreak(
     const Py_UCS4 ch         /* Unicode character */
     );
 
-PyAPI_FUNC(Py_UCS4) _PyUnicode_ToLowercase(
+/* Py_DEPRECATED(3.3) */ PyAPI_FUNC(Py_UCS4) _PyUnicode_ToLowercase(
     Py_UCS4 ch       /* Unicode character */
     );
 
-PyAPI_FUNC(Py_UCS4) _PyUnicode_ToUppercase(
+/* Py_DEPRECATED(3.3) */ PyAPI_FUNC(Py_UCS4) _PyUnicode_ToUppercase(
     Py_UCS4 ch       /* Unicode character */
     );
 
-PyAPI_FUNC(Py_UCS4) _PyUnicode_ToTitlecase(
+Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UCS4) _PyUnicode_ToTitlecase(
     Py_UCS4 ch       /* Unicode character */
     );
 
@@ -2194,39 +1178,39 @@ PyAPI_FUNC(int) _PyUnicode_IsAlpha(
     Py_UCS4 ch       /* Unicode character */
     );
 
-PyAPI_FUNC(size_t) Py_UNICODE_strlen(
+Py_DEPRECATED(3.3) PyAPI_FUNC(size_t) Py_UNICODE_strlen(
     const Py_UNICODE *u
     );
 
-PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strcpy(
+Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strcpy(
     Py_UNICODE *s1,
     const Py_UNICODE *s2);
 
-PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strcat(
+Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strcat(
     Py_UNICODE *s1, const Py_UNICODE *s2);
 
-PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strncpy(
+Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strncpy(
     Py_UNICODE *s1,
     const Py_UNICODE *s2,
     size_t n);
 
-PyAPI_FUNC(int) Py_UNICODE_strcmp(
+Py_DEPRECATED(3.3) PyAPI_FUNC(int) Py_UNICODE_strcmp(
     const Py_UNICODE *s1,
     const Py_UNICODE *s2
     );
 
-PyAPI_FUNC(int) Py_UNICODE_strncmp(
+Py_DEPRECATED(3.3) PyAPI_FUNC(int) Py_UNICODE_strncmp(
     const Py_UNICODE *s1,
     const Py_UNICODE *s2,
     size_t n
     );
 
-PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strchr(
+Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strchr(
     const Py_UNICODE *s,
     Py_UNICODE c
     );
 
-PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strrchr(
+Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strrchr(
     const Py_UNICODE *s,
     Py_UNICODE c
     );
@@ -2237,23 +1221,19 @@ PyAPI_FUNC(PyObject*) _PyUnicode_FormatLong(PyObject *, int, int, int);
    and raise a MemoryError exception on memory allocation failure, otherwise
    return a new allocated buffer (use PyMem_Free() to free the buffer). */
 
-PyAPI_FUNC(Py_UNICODE*) PyUnicode_AsUnicodeCopy(
+Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) PyUnicode_AsUnicodeCopy(
     PyObject *unicode
     );
-#endif /* Py_LIMITED_API */
-
-#if defined(Py_DEBUG) && !defined(Py_LIMITED_API)
-PyAPI_FUNC(int) _PyUnicode_CheckConsistency(
-    PyObject *op,
-    int check_content);
-#endif
 
 /* Return an interned Unicode object for an Identifier; may fail if there is no memory.*/
 PyAPI_FUNC(PyObject*) _PyUnicode_FromId(_Py_Identifier*);
 /* Clear all static strings. */
 PyAPI_FUNC(void) _PyUnicode_ClearStaticStrings(void);
 
+/* Fast equality check when the inputs are known to be exact unicode types
+   and where the hash values are equal (i.e. a very probable match) */
+PyAPI_FUNC(int) _PyUnicode_EQ(PyObject *, PyObject *);
+
 #ifdef __cplusplus
 }
 #endif
-#endif /* !Py_UNICODEOBJECT_H */
diff --git a/openflow/usr/include/python3.5m/datetime.h b/openflow/include/python3.8/datetime.h
similarity index 83%
rename from openflow/usr/include/python3.5m/datetime.h
rename to openflow/include/python3.8/datetime.h
index 06cbc4a..00507cb 100644
--- a/openflow/usr/include/python3.5m/datetime.h
+++ b/openflow/include/python3.8/datetime.h
@@ -81,6 +81,7 @@ typedef struct
 typedef struct
 {
     _PyDateTime_TIMEHEAD
+    unsigned char fold;
     PyObject *tzinfo;
 } PyDateTime_Time;              /* hastzinfo true */
 
@@ -108,6 +109,7 @@ typedef struct
 typedef struct
 {
     _PyDateTime_DATETIMEHEAD
+    unsigned char fold;
     PyObject *tzinfo;
 } PyDateTime_DateTime;          /* hastzinfo true */
 
@@ -125,6 +127,7 @@ typedef struct
     ((((PyDateTime_DateTime*)o)->data[7] << 16) |       \
      (((PyDateTime_DateTime*)o)->data[8] << 8)  |       \
       ((PyDateTime_DateTime*)o)->data[9])
+#define PyDateTime_DATE_GET_FOLD(o)        (((PyDateTime_DateTime*)o)->fold)
 
 /* Apply for time instances. */
 #define PyDateTime_TIME_GET_HOUR(o)        (((PyDateTime_Time*)o)->data[0])
@@ -134,6 +137,7 @@ typedef struct
     ((((PyDateTime_Time*)o)->data[3] << 16) |           \
      (((PyDateTime_Time*)o)->data[4] << 8)  |           \
       ((PyDateTime_Time*)o)->data[5])
+#define PyDateTime_TIME_GET_FOLD(o)        (((PyDateTime_Time*)o)->fold)
 
 /* Apply for time delta instances */
 #define PyDateTime_DELTA_GET_DAYS(o)         (((PyDateTime_Delta*)o)->days)
@@ -151,48 +155,45 @@ typedef struct {
     PyTypeObject *DeltaType;
     PyTypeObject *TZInfoType;
 
+    /* singletons */
+    PyObject *TimeZone_UTC;
+
     /* constructors */
     PyObject *(*Date_FromDate)(int, int, int, PyTypeObject*);
     PyObject *(*DateTime_FromDateAndTime)(int, int, int, int, int, int, int,
         PyObject*, PyTypeObject*);
     PyObject *(*Time_FromTime)(int, int, int, int, PyObject*, PyTypeObject*);
     PyObject *(*Delta_FromDelta)(int, int, int, int, PyTypeObject*);
+    PyObject *(*TimeZone_FromTimeZone)(PyObject *offset, PyObject *name);
 
     /* constructors for the DB API */
     PyObject *(*DateTime_FromTimestamp)(PyObject*, PyObject*, PyObject*);
     PyObject *(*Date_FromTimestamp)(PyObject*, PyObject*);
 
+    /* PEP 495 constructors */
+    PyObject *(*DateTime_FromDateAndTimeAndFold)(int, int, int, int, int, int, int,
+        PyObject*, int, PyTypeObject*);
+    PyObject *(*Time_FromTimeAndFold)(int, int, int, int, PyObject*, int, PyTypeObject*);
+
 } PyDateTime_CAPI;
 
 #define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI"
 
 
-#ifdef Py_BUILD_CORE
-
-/* Macros for type checking when building the Python core. */
-#define PyDate_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateType)
-#define PyDate_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateType)
-
-#define PyDateTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateTimeType)
-#define PyDateTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateTimeType)
-
-#define PyTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_TimeType)
-#define PyTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TimeType)
-
-#define PyDelta_Check(op) PyObject_TypeCheck(op, &PyDateTime_DeltaType)
-#define PyDelta_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DeltaType)
-
-#define PyTZInfo_Check(op) PyObject_TypeCheck(op, &PyDateTime_TZInfoType)
-#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TZInfoType)
-
-#else
-
+/* This block is only used as part of the public API and should not be
+ * included in _datetimemodule.c, which does not use the C API capsule.
+ * See bpo-35081 for more details.
+ * */
+#ifndef _PY_DATETIME_IMPL
 /* Define global variable for the C API and a macro for setting it. */
 static PyDateTime_CAPI *PyDateTimeAPI = NULL;
 
 #define PyDateTime_IMPORT \
     PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)
 
+/* Macro for access to the UTC singleton */
+#define PyDateTime_TimeZone_UTC PyDateTimeAPI->TimeZone_UTC
+
 /* Macros for type checking when not building the Python core. */
 #define PyDate_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateType)
 #define PyDate_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateType)
@@ -209,6 +210,7 @@ static PyDateTime_CAPI *PyDateTimeAPI = NULL;
 #define PyTZInfo_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TZInfoType)
 #define PyTZInfo_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TZInfoType)
 
+
 /* Macros for accessing constructors in a simplified fashion. */
 #define PyDate_FromDate(year, month, day) \
     PyDateTimeAPI->Date_FromDate(year, month, day, PyDateTimeAPI->DateType)
@@ -217,14 +219,28 @@ static PyDateTime_CAPI *PyDateTimeAPI = NULL;
     PyDateTimeAPI->DateTime_FromDateAndTime(year, month, day, hour, \
         min, sec, usec, Py_None, PyDateTimeAPI->DateTimeType)
 
+#define PyDateTime_FromDateAndTimeAndFold(year, month, day, hour, min, sec, usec, fold) \
+    PyDateTimeAPI->DateTime_FromDateAndTimeAndFold(year, month, day, hour, \
+        min, sec, usec, Py_None, fold, PyDateTimeAPI->DateTimeType)
+
 #define PyTime_FromTime(hour, minute, second, usecond) \
     PyDateTimeAPI->Time_FromTime(hour, minute, second, usecond, \
         Py_None, PyDateTimeAPI->TimeType)
 
+#define PyTime_FromTimeAndFold(hour, minute, second, usecond, fold) \
+    PyDateTimeAPI->Time_FromTimeAndFold(hour, minute, second, usecond, \
+        Py_None, fold, PyDateTimeAPI->TimeType)
+
 #define PyDelta_FromDSU(days, seconds, useconds) \
     PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, \
         PyDateTimeAPI->DeltaType)
 
+#define PyTimeZone_FromOffset(offset) \
+    PyDateTimeAPI->TimeZone_FromTimeZone(offset, NULL)
+
+#define PyTimeZone_FromOffsetAndName(offset, name) \
+    PyDateTimeAPI->TimeZone_FromTimeZone(offset, name)
+
 /* Macros supporting the DB API. */
 #define PyDateTime_FromTimestamp(args) \
     PyDateTimeAPI->DateTime_FromTimestamp( \
@@ -234,7 +250,7 @@ static PyDateTime_CAPI *PyDateTimeAPI = NULL;
     PyDateTimeAPI->Date_FromTimestamp( \
         (PyObject*) (PyDateTimeAPI->DateType), args)
 
-#endif  /* Py_BUILD_CORE */
+#endif   /* !defined(_PY_DATETIME_IMPL) */
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/descrobject.h b/openflow/include/python3.8/descrobject.h
similarity index 94%
rename from openflow/usr/include/python3.5m/descrobject.h
rename to openflow/include/python3.8/descrobject.h
index e2ba97f..ead269d 100644
--- a/openflow/usr/include/python3.5m/descrobject.h
+++ b/openflow/include/python3.8/descrobject.h
@@ -9,10 +9,10 @@ typedef PyObject *(*getter)(PyObject *, void *);
 typedef int (*setter)(PyObject *, PyObject *, void *);
 
 typedef struct PyGetSetDef {
-    char *name;
+    const char *name;
     getter get;
     setter set;
-    char *doc;
+    const char *doc;
     void *closure;
 } PyGetSetDef;
 
@@ -24,11 +24,11 @@ typedef PyObject *(*wrapperfunc_kwds)(PyObject *self, PyObject *args,
                                       void *wrapped, PyObject *kwds);
 
 struct wrapperbase {
-    char *name;
+    const char *name;
     int offset;
     void *function;
     wrapperfunc wrapper;
-    char *doc;
+    const char *doc;
     int flags;
     PyObject *name_strobj;
 };
@@ -53,6 +53,7 @@ typedef struct {
 typedef struct {
     PyDescr_COMMON;
     PyMethodDef *d_method;
+    vectorcallfunc vectorcall;
 } PyMethodDescrObject;
 
 typedef struct {
@@ -78,7 +79,9 @@ PyAPI_DATA(PyTypeObject) PyMemberDescr_Type;
 PyAPI_DATA(PyTypeObject) PyMethodDescr_Type;
 PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type;
 PyAPI_DATA(PyTypeObject) PyDictProxy_Type;
+#ifndef Py_LIMITED_API
 PyAPI_DATA(PyTypeObject) _PyMethodWrapper_Type;
+#endif /* Py_LIMITED_API */
 
 PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *);
 PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *);
diff --git a/openflow/usr/include/python3.5m/dictobject.h b/openflow/include/python3.8/dictobject.h
similarity index 51%
rename from openflow/usr/include/python3.5m/dictobject.h
rename to openflow/include/python3.8/dictobject.h
index ba90aaf..b37573a 100644
--- a/openflow/usr/include/python3.5m/dictobject.h
+++ b/openflow/include/python3.8/dictobject.h
@@ -4,7 +4,6 @@
 extern "C" {
 #endif
 
-
 /* Dictionary object type -- mapping from hashable object to object */
 
 /* The distribution includes a separate file, Objects/dictnotes.txt,
@@ -13,98 +12,26 @@ extern "C" {
    tuning dictionaries, and several ideas for possible optimizations.
 */
 
-#ifndef Py_LIMITED_API
-
-typedef struct _dictkeysobject PyDictKeysObject;
-
-/* The ma_values pointer is NULL for a combined table
- * or points to an array of PyObject* for a split table
- */
-typedef struct {
-    PyObject_HEAD
-    Py_ssize_t ma_used;
-    PyDictKeysObject *ma_keys;
-    PyObject **ma_values;
-} PyDictObject;
-
-typedef struct {
-    PyObject_HEAD
-    PyDictObject *dv_dict;
-} _PyDictViewObject;
-
-#endif /* Py_LIMITED_API */
-
 PyAPI_DATA(PyTypeObject) PyDict_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterKey_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterValue_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterItem_Type;
-PyAPI_DATA(PyTypeObject) PyDictKeys_Type;
-PyAPI_DATA(PyTypeObject) PyDictItems_Type;
-PyAPI_DATA(PyTypeObject) PyDictValues_Type;
 
 #define PyDict_Check(op) \
                  PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_DICT_SUBCLASS)
 #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
-#define PyDictKeys_Check(op) PyObject_TypeCheck(op, &PyDictKeys_Type)
-#define PyDictItems_Check(op) PyObject_TypeCheck(op, &PyDictItems_Type)
-#define PyDictValues_Check(op) PyObject_TypeCheck(op, &PyDictValues_Type)
-/* This excludes Values, since they are not sets. */
-# define PyDictViewSet_Check(op) \
-    (PyDictKeys_Check(op) || PyDictItems_Check(op))
-
 
 PyAPI_FUNC(PyObject *) PyDict_New(void);
 PyAPI_FUNC(PyObject *) PyDict_GetItem(PyObject *mp, PyObject *key);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyDict_GetItem_KnownHash(PyObject *mp, PyObject *key,
-                                       Py_hash_t hash);
-#endif
 PyAPI_FUNC(PyObject *) PyDict_GetItemWithError(PyObject *mp, PyObject *key);
-PyAPI_FUNC(PyObject *) _PyDict_GetItemIdWithError(PyObject *dp,
-                                                  struct _Py_Identifier *key);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyDict_SetDefault(
-    PyObject *mp, PyObject *key, PyObject *defaultobj);
-#endif
 PyAPI_FUNC(int) PyDict_SetItem(PyObject *mp, PyObject *key, PyObject *item);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyDict_SetItem_KnownHash(PyObject *mp, PyObject *key,
-                                          PyObject *item, Py_hash_t hash);
-#endif
 PyAPI_FUNC(int) PyDict_DelItem(PyObject *mp, PyObject *key);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyDict_DelItem_KnownHash(PyObject *mp, PyObject *key,
-                                          Py_hash_t hash);
-#endif
 PyAPI_FUNC(void) PyDict_Clear(PyObject *mp);
 PyAPI_FUNC(int) PyDict_Next(
     PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value);
-#ifndef Py_LIMITED_API
-PyDictKeysObject *_PyDict_NewKeysForClass(void);
-PyAPI_FUNC(PyObject *) PyObject_GenericGetDict(PyObject *, void *);
-PyAPI_FUNC(int) _PyDict_Next(
-    PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, Py_hash_t *hash);
-PyObject *_PyDictView_New(PyObject *, PyTypeObject *);
-#endif
 PyAPI_FUNC(PyObject *) PyDict_Keys(PyObject *mp);
 PyAPI_FUNC(PyObject *) PyDict_Values(PyObject *mp);
 PyAPI_FUNC(PyObject *) PyDict_Items(PyObject *mp);
 PyAPI_FUNC(Py_ssize_t) PyDict_Size(PyObject *mp);
 PyAPI_FUNC(PyObject *) PyDict_Copy(PyObject *mp);
 PyAPI_FUNC(int) PyDict_Contains(PyObject *mp, PyObject *key);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyDict_Contains(PyObject *mp, PyObject *key, Py_hash_t hash);
-PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused);
-PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp);
-PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp);
-Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys);
-Py_ssize_t _PyDict_SizeOf(PyDictObject *);
-PyObject *_PyDict_Pop(PyDictObject *, PyObject *, PyObject *);
-PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *);
-#define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL)
-
-PyAPI_FUNC(int) PyDict_ClearFreeList(void);
-#endif
 
 /* PyDict_Update(mp, other) is equivalent to PyDict_Merge(mp, other, 1). */
 PyAPI_FUNC(int) PyDict_Update(PyObject *mp, PyObject *other);
@@ -115,12 +42,8 @@ PyAPI_FUNC(int) PyDict_Update(PyObject *mp, PyObject *other);
    dict.update(other) is equivalent to PyDict_Merge(dict, other, 1).
 */
 PyAPI_FUNC(int) PyDict_Merge(PyObject *mp,
-                                   PyObject *other,
-                                   int override);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
-#endif
+                             PyObject *other,
+                             int override);
 
 /* PyDict_MergeFromSeq2 updates/merges from an iterable object producing
    iterable objects of length 2.  If override is true, the last occurrence
@@ -128,21 +51,41 @@ PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
    is equivalent to dict={}; PyDict_MergeFromSeq(dict, seq2, 1).
 */
 PyAPI_FUNC(int) PyDict_MergeFromSeq2(PyObject *d,
-                                           PyObject *seq2,
-                                           int override);
+                                     PyObject *seq2,
+                                     int override);
 
 PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key);
-PyAPI_FUNC(PyObject *) _PyDict_GetItemId(PyObject *dp, struct _Py_Identifier *key);
 PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item);
-PyAPI_FUNC(int) _PyDict_SetItemId(PyObject *dp, struct _Py_Identifier *key, PyObject *item);
 PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key);
 
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyDict_DelItemId(PyObject *mp, struct _Py_Identifier *key);
-PyAPI_FUNC(void) _PyDict_DebugMallocStats(FILE *out);
+/* Dictionary (keys, values, items) views */
 
-int _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr, PyObject *name, PyObject *value);
-PyObject *_PyDict_LoadGlobal(PyDictObject *, PyDictObject *, PyObject *);
+PyAPI_DATA(PyTypeObject) PyDictKeys_Type;
+PyAPI_DATA(PyTypeObject) PyDictValues_Type;
+PyAPI_DATA(PyTypeObject) PyDictItems_Type;
+
+#define PyDictKeys_Check(op) PyObject_TypeCheck(op, &PyDictKeys_Type)
+#define PyDictValues_Check(op) PyObject_TypeCheck(op, &PyDictValues_Type)
+#define PyDictItems_Check(op) PyObject_TypeCheck(op, &PyDictItems_Type)
+/* This excludes Values, since they are not sets. */
+# define PyDictViewSet_Check(op) \
+    (PyDictKeys_Check(op) || PyDictItems_Check(op))
+
+/* Dictionary (key, value, items) iterators */
+
+PyAPI_DATA(PyTypeObject) PyDictIterKey_Type;
+PyAPI_DATA(PyTypeObject) PyDictIterValue_Type;
+PyAPI_DATA(PyTypeObject) PyDictIterItem_Type;
+
+PyAPI_DATA(PyTypeObject) PyDictRevIterKey_Type;
+PyAPI_DATA(PyTypeObject) PyDictRevIterItem_Type;
+PyAPI_DATA(PyTypeObject) PyDictRevIterValue_Type;
+
+
+#ifndef Py_LIMITED_API
+#  define Py_CPYTHON_DICTOBJECT_H
+#  include  "cpython/dictobject.h"
+#  undef Py_CPYTHON_DICTOBJECT_H
 #endif
 
 #ifdef __cplusplus
diff --git a/openflow/usr/include/python3.5m/dtoa.h b/openflow/include/python3.8/dtoa.h
similarity index 100%
rename from openflow/usr/include/python3.5m/dtoa.h
rename to openflow/include/python3.8/dtoa.h
diff --git a/openflow/usr/include/python3.5m/dynamic_annotations.h b/openflow/include/python3.8/dynamic_annotations.h
similarity index 100%
rename from openflow/usr/include/python3.5m/dynamic_annotations.h
rename to openflow/include/python3.8/dynamic_annotations.h
diff --git a/openflow/usr/include/python3.5m/enumobject.h b/openflow/include/python3.8/enumobject.h
similarity index 100%
rename from openflow/usr/include/python3.5m/enumobject.h
rename to openflow/include/python3.8/enumobject.h
diff --git a/openflow/include/python3.8/errcode.h b/openflow/include/python3.8/errcode.h
new file mode 100644
index 0000000..b37cd26
--- /dev/null
+++ b/openflow/include/python3.8/errcode.h
@@ -0,0 +1,38 @@
+#ifndef Py_ERRCODE_H
+#define Py_ERRCODE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Error codes passed around between file input, tokenizer, parser and
+   interpreter.  This is necessary so we can turn them into Python
+   exceptions at a higher level.  Note that some errors have a
+   slightly different meaning when passed from the tokenizer to the
+   parser than when passed from the parser to the interpreter; e.g.
+   the parser only returns E_EOF when it hits EOF immediately, and it
+   never returns E_OK. */
+
+#define E_OK            10      /* No error */
+#define E_EOF           11      /* End Of File */
+#define E_INTR          12      /* Interrupted */
+#define E_TOKEN         13      /* Bad token */
+#define E_SYNTAX        14      /* Syntax error */
+#define E_NOMEM         15      /* Ran out of memory */
+#define E_DONE          16      /* Parsing complete */
+#define E_ERROR         17      /* Execution error */
+#define E_TABSPACE      18      /* Inconsistent mixing of tabs and spaces */
+#define E_OVERFLOW      19      /* Node had too many children */
+#define E_TOODEEP       20      /* Too many indentation levels */
+#define E_DEDENT        21      /* No matching outer block for dedent */
+#define E_DECODE        22      /* Error in decoding into Unicode */
+#define E_EOFS          23      /* EOF in triple-quoted string */
+#define E_EOLS          24      /* EOL in single-quoted string */
+#define E_LINECONT      25      /* Unexpected characters after a line continuation */
+#define E_IDENTIFIER    26      /* Invalid characters in identifier */
+#define E_BADSINGLE     27      /* Ill-formed single statement input */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_ERRCODE_H */
diff --git a/openflow/include/python3.8/eval.h b/openflow/include/python3.8/eval.h
new file mode 100644
index 0000000..2c1c2d0
--- /dev/null
+++ b/openflow/include/python3.8/eval.h
@@ -0,0 +1,37 @@
+
+/* Interface to execute compiled code */
+
+#ifndef Py_EVAL_H
+#define Py_EVAL_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+PyAPI_FUNC(PyObject *) PyEval_EvalCode(PyObject *, PyObject *, PyObject *);
+
+PyAPI_FUNC(PyObject *) PyEval_EvalCodeEx(PyObject *co,
+                                         PyObject *globals,
+                                         PyObject *locals,
+                                         PyObject *const *args, int argc,
+                                         PyObject *const *kwds, int kwdc,
+                                         PyObject *const *defs, int defc,
+                                         PyObject *kwdefs, PyObject *closure);
+
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(PyObject *) _PyEval_EvalCodeWithName(
+    PyObject *co,
+    PyObject *globals, PyObject *locals,
+    PyObject *const *args, Py_ssize_t argcount,
+    PyObject *const *kwnames, PyObject *const *kwargs,
+    Py_ssize_t kwcount, int kwstep,
+    PyObject *const *defs, Py_ssize_t defcount,
+    PyObject *kwdefs, PyObject *closure,
+    PyObject *name, PyObject *qualname);
+
+PyAPI_FUNC(PyObject *) _PyEval_CallTracing(PyObject *func, PyObject *args);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_EVAL_H */
diff --git a/openflow/usr/include/python3.5m/fileobject.h b/openflow/include/python3.8/fileobject.h
similarity index 67%
rename from openflow/usr/include/python3.5m/fileobject.h
rename to openflow/include/python3.8/fileobject.h
index 03155d3..456887e 100644
--- a/openflow/usr/include/python3.5m/fileobject.h
+++ b/openflow/include/python3.8/fileobject.h
@@ -15,9 +15,6 @@ PyAPI_FUNC(PyObject *) PyFile_GetLine(PyObject *, int);
 PyAPI_FUNC(int) PyFile_WriteObject(PyObject *, PyObject *, int);
 PyAPI_FUNC(int) PyFile_WriteString(const char *, PyObject *);
 PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
-#endif
 
 /* The default encoding used by the platform file system APIs
    If non-NULL, this is different than the default encoding for strings
@@ -25,21 +22,19 @@ PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
 PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding;
 PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding;
 
-/* Internal API
-
-   The std printer acts as a preliminary sys.stderr until the new io
-   infrastructure is in place. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyFile_NewStdPrinter(int);
-PyAPI_DATA(PyTypeObject) PyStdPrinter_Type;
-#endif /* Py_LIMITED_API */
-
 /* A routine to check if a file descriptor can be select()-ed. */
-#ifdef HAVE_SELECT
- #define _PyIsSelectable_fd(FD) (((FD) >= 0) && ((FD) < FD_SETSIZE))
+#ifdef _MSC_VER
+    /* On Windows, any socket fd can be select()-ed, no matter how high */
+    #define _PyIsSelectable_fd(FD) (1)
 #else
- #define _PyIsSelectable_fd(FD) (1)
-#endif /* HAVE_SELECT */
+    #define _PyIsSelectable_fd(FD) ((unsigned int)(FD) < (unsigned int)FD_SETSIZE)
+#endif
+
+#ifndef Py_LIMITED_API
+#  define Py_CPYTHON_FILEOBJECT_H
+#  include  "cpython/fileobject.h"
+#  undef Py_CPYTHON_FILEOBJECT_H
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/fileutils.h b/openflow/include/python3.8/fileutils.h
similarity index 54%
rename from openflow/usr/include/python3.5m/fileutils.h
rename to openflow/include/python3.8/fileutils.h
index b4a683c..359dd0a 100644
--- a/openflow/usr/include/python3.5m/fileutils.h
+++ b/openflow/include/python3.8/fileutils.h
@@ -1,12 +1,10 @@
 #ifndef Py_FILEUTILS_H
 #define Py_FILEUTILS_H
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-PyAPI_FUNC(PyObject *) _Py_device_encoding(int);
-
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
 PyAPI_FUNC(wchar_t *) Py_DecodeLocale(
     const char *arg,
     size_t *size);
@@ -15,12 +13,64 @@ PyAPI_FUNC(char*) Py_EncodeLocale(
     const wchar_t *text,
     size_t *error_pos);
 
+PyAPI_FUNC(char*) _Py_EncodeLocaleRaw(
+    const wchar_t *text,
+    size_t *error_pos);
+#endif
+
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03080000
+typedef enum {
+    _Py_ERROR_UNKNOWN=0,
+    _Py_ERROR_STRICT,
+    _Py_ERROR_SURROGATEESCAPE,
+    _Py_ERROR_REPLACE,
+    _Py_ERROR_IGNORE,
+    _Py_ERROR_BACKSLASHREPLACE,
+    _Py_ERROR_SURROGATEPASS,
+    _Py_ERROR_XMLCHARREFREPLACE,
+    _Py_ERROR_OTHER
+} _Py_error_handler;
+
+PyAPI_FUNC(_Py_error_handler) _Py_GetErrorHandler(const char *errors);
+
+PyAPI_FUNC(int) _Py_DecodeLocaleEx(
+    const char *arg,
+    wchar_t **wstr,
+    size_t *wlen,
+    const char **reason,
+    int current_locale,
+    _Py_error_handler errors);
+
+PyAPI_FUNC(int) _Py_EncodeLocaleEx(
+    const wchar_t *text,
+    char **str,
+    size_t *error_pos,
+    const char **reason,
+    int current_locale,
+    _Py_error_handler errors);
+#endif
+
 #ifndef Py_LIMITED_API
+PyAPI_FUNC(PyObject *) _Py_device_encoding(int);
+
+#if defined(MS_WINDOWS) || defined(__APPLE__)
+    /* On Windows, the count parameter of read() is an int (bpo-9015, bpo-9611).
+       On macOS 10.13, read() and write() with more than INT_MAX bytes
+       fail with EINVAL (bpo-24658). */
+#   define _PY_READ_MAX  INT_MAX
+#   define _PY_WRITE_MAX INT_MAX
+#else
+    /* write() should truncate the input to PY_SSIZE_T_MAX bytes,
+       but it's safer to do it ourself to have a portable behaviour */
+#   define _PY_READ_MAX  PY_SSIZE_T_MAX
+#   define _PY_WRITE_MAX PY_SSIZE_T_MAX
+#endif
 
 #ifdef MS_WINDOWS
 struct _Py_stat_struct {
     unsigned long st_dev;
-    __int64 st_ino;
+    uint64_t st_ino;
     unsigned short st_mode;
     int st_nlink;
     int st_uid;
@@ -34,6 +84,7 @@ struct _Py_stat_struct {
     time_t st_ctime;
     int st_ctime_nsec;
     unsigned long st_file_attributes;
+    unsigned long st_reparse_tag;
 };
 #else
 #  define _Py_stat_struct stat
@@ -46,13 +97,11 @@ PyAPI_FUNC(int) _Py_fstat(
 PyAPI_FUNC(int) _Py_fstat_noraise(
     int fd,
     struct _Py_stat_struct *status);
-#endif   /* Py_LIMITED_API */
 
 PyAPI_FUNC(int) _Py_stat(
     PyObject *path,
     struct stat *status);
 
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _Py_open(
     const char *pathname,
     int flags);
@@ -60,7 +109,6 @@ PyAPI_FUNC(int) _Py_open(
 PyAPI_FUNC(int) _Py_open_noraise(
     const char *pathname,
     int flags);
-#endif
 
 PyAPI_FUNC(FILE *) _Py_wfopen(
     const wchar_t *path,
@@ -93,26 +141,34 @@ PyAPI_FUNC(Py_ssize_t) _Py_write_noraise(
 PyAPI_FUNC(int) _Py_wreadlink(
     const wchar_t *path,
     wchar_t *buf,
-    size_t bufsiz);
+    /* Number of characters of 'buf' buffer
+       including the trailing NUL character */
+    size_t buflen);
 #endif
 
 #ifdef HAVE_REALPATH
 PyAPI_FUNC(wchar_t*) _Py_wrealpath(
     const wchar_t *path,
     wchar_t *resolved_path,
-    size_t resolved_path_size);
+    /* Number of characters of 'resolved_path' buffer
+       including the trailing NUL character */
+    size_t resolved_path_len);
 #endif
 
 PyAPI_FUNC(wchar_t*) _Py_wgetcwd(
     wchar_t *buf,
-    size_t size);
+    /* Number of characters of 'buf' buffer
+       including the trailing NUL character */
+    size_t buflen);
 
-#ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _Py_get_inheritable(int fd);
 
 PyAPI_FUNC(int) _Py_set_inheritable(int fd, int inheritable,
                                     int *atomic_flag_works);
 
+PyAPI_FUNC(int) _Py_set_inheritable_async_safe(int fd, int inheritable,
+                                               int *atomic_flag_works);
+
 PyAPI_FUNC(int) _Py_dup(int fd);
 
 #ifndef MS_WINDOWS
@@ -121,22 +177,9 @@ PyAPI_FUNC(int) _Py_get_blocking(int fd);
 PyAPI_FUNC(int) _Py_set_blocking(int fd, int blocking);
 #endif   /* !MS_WINDOWS */
 
-#if defined _MSC_VER && _MSC_VER >= 1400 && _MSC_VER < 1900
-/* A routine to check if a file descriptor is valid on Windows.  Returns 0
- * and sets errno to EBADF if it isn't.  This is to avoid Assertions
- * from various functions in the Windows CRT beginning with
- * Visual Studio 2005
- */
-int _PyVerify_fd(int fd);
-
-#else
-#define _PyVerify_fd(A) (1) /* dummy */
-#endif
-
 #endif   /* Py_LIMITED_API */
 
 #ifdef __cplusplus
 }
 #endif
-
 #endif /* !Py_FILEUTILS_H */
diff --git a/openflow/usr/include/python3.5m/floatobject.h b/openflow/include/python3.8/floatobject.h
similarity index 90%
rename from openflow/usr/include/python3.5m/floatobject.h
rename to openflow/include/python3.8/floatobject.h
index e240fdb..f1044d6 100644
--- a/openflow/usr/include/python3.5m/floatobject.h
+++ b/openflow/include/python3.8/floatobject.h
@@ -74,9 +74,9 @@ PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *);
  * happens in such cases is partly accidental (alas).
  */
 
-/* The pack routines write 4 or 8 bytes, starting at p.  le is a bool
+/* The pack routines write 2, 4 or 8 bytes, starting at p.  le is a bool
  * argument, true if you want the string in little-endian format (exponent
- * last, at p+3 or p+7), false if you want big-endian format (exponent
+ * last, at p+1, p+3 or p+7), false if you want big-endian format (exponent
  * first, at p).
  * Return value:  0 if all is OK, -1 if error (and an exception is
  * set, most likely OverflowError).
@@ -84,6 +84,7 @@ PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *);
  * 1):  What this does is undefined if x is a NaN or infinity.
  * 2):  -0.0 and +0.0 produce the same string.
  */
+PyAPI_FUNC(int) _PyFloat_Pack2(double x, unsigned char *p, int le);
 PyAPI_FUNC(int) _PyFloat_Pack4(double x, unsigned char *p, int le);
 PyAPI_FUNC(int) _PyFloat_Pack8(double x, unsigned char *p, int le);
 
@@ -96,14 +97,15 @@ PyAPI_FUNC(int) _PyFloat_Repr(double x, char *p, size_t len);
 PyAPI_FUNC(int) _PyFloat_Digits(char *buf, double v, int *signum);
 PyAPI_FUNC(void) _PyFloat_DigitsInit(void);
 
-/* The unpack routines read 4 or 8 bytes, starting at p.  le is a bool
+/* The unpack routines read 2, 4 or 8 bytes, starting at p.  le is a bool
  * argument, true if the string is in little-endian format (exponent
- * last, at p+3 or p+7), false if big-endian (exponent first, at p).
+ * last, at p+1, p+3 or p+7), false if big-endian (exponent first, at p).
  * Return value:  The unpacked double.  On error, this is -1.0 and
  * PyErr_Occurred() is true (and an exception is set, most likely
  * OverflowError).  Note that on a non-IEEE platform this will refuse
  * to unpack a string that represents a NaN or infinity.
  */
+PyAPI_FUNC(double) _PyFloat_Unpack2(const unsigned char *p, int le);
 PyAPI_FUNC(double) _PyFloat_Unpack4(const unsigned char *p, int le);
 PyAPI_FUNC(double) _PyFloat_Unpack8(const unsigned char *p, int le);
 
diff --git a/openflow/usr/include/python3.5m/frameobject.h b/openflow/include/python3.8/frameobject.h
similarity index 83%
rename from openflow/usr/include/python3.5m/frameobject.h
rename to openflow/include/python3.8/frameobject.h
index 00c5093..3bad86a 100644
--- a/openflow/usr/include/python3.5m/frameobject.h
+++ b/openflow/include/python3.8/frameobject.h
@@ -1,4 +1,3 @@
-
 /* Frame object interface */
 
 #ifndef Py_LIMITED_API
@@ -27,15 +26,9 @@ typedef struct _frame {
        to the current stack top. */
     PyObject **f_stacktop;
     PyObject *f_trace;          /* Trace function */
+    char f_trace_lines;         /* Emit per-line trace events? */
+    char f_trace_opcodes;       /* Emit per-opcode trace events? */
 
-    /* In a generator, we need to be able to swap between the exception
-       state inside the generator and the exception state of the calling
-       frame (which shouldn't be impacted when the generator "yields"
-       from an except handler).
-       These three fields exist exactly for that, and are unused for
-       non-generator frames. See the save_exc_state and swap_exc_state
-       functions in ceval.c for details of their use. */
-    PyObject *f_exc_type, *f_exc_value, *f_exc_traceback;
     /* Borrowed reference to a generator, or NULL */
     PyObject *f_gen;
 
@@ -60,7 +53,11 @@ PyAPI_DATA(PyTypeObject) PyFrame_Type;
 #define PyFrame_Check(op) (Py_TYPE(op) == &PyFrame_Type)
 
 PyAPI_FUNC(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *,
-                                       PyObject *, PyObject *);
+                                        PyObject *, PyObject *);
+
+/* only internal use */
+PyFrameObject* _PyFrame_New_NoTrack(PyThreadState *, PyCodeObject *,
+                                    PyObject *, PyObject *);
 
 
 /* The rest of the interface is specific for frame objects */
diff --git a/openflow/usr/include/python3.5m/funcobject.h b/openflow/include/python3.8/funcobject.h
similarity index 65%
rename from openflow/usr/include/python3.5m/funcobject.h
rename to openflow/include/python3.8/funcobject.h
index cc1426c..e563a74 100644
--- a/openflow/usr/include/python3.5m/funcobject.h
+++ b/openflow/include/python3.8/funcobject.h
@@ -20,18 +20,19 @@ extern "C" {
 
 typedef struct {
     PyObject_HEAD
-    PyObject *func_code;	/* A code object, the __code__ attribute */
-    PyObject *func_globals;	/* A dictionary (other mappings won't do) */
-    PyObject *func_defaults;	/* NULL or a tuple */
-    PyObject *func_kwdefaults;	/* NULL or a dict */
-    PyObject *func_closure;	/* NULL or a tuple of cell objects */
-    PyObject *func_doc;		/* The __doc__ attribute, can be anything */
-    PyObject *func_name;	/* The __name__ attribute, a string object */
-    PyObject *func_dict;	/* The __dict__ attribute, a dict or NULL */
-    PyObject *func_weakreflist;	/* List of weak references */
-    PyObject *func_module;	/* The __module__ attribute, can be anything */
-    PyObject *func_annotations;	/* Annotations, a dict or NULL */
+    PyObject *func_code;        /* A code object, the __code__ attribute */
+    PyObject *func_globals;     /* A dictionary (other mappings won't do) */
+    PyObject *func_defaults;    /* NULL or a tuple */
+    PyObject *func_kwdefaults;  /* NULL or a dict */
+    PyObject *func_closure;     /* NULL or a tuple of cell objects */
+    PyObject *func_doc;         /* The __doc__ attribute, can be anything */
+    PyObject *func_name;        /* The __name__ attribute, a string object */
+    PyObject *func_dict;        /* The __dict__ attribute, a dict or NULL */
+    PyObject *func_weakreflist; /* List of weak references */
+    PyObject *func_module;      /* The __module__ attribute, can be anything */
+    PyObject *func_annotations; /* Annotations, a dict or NULL */
     PyObject *func_qualname;    /* The qualified name */
+    vectorcallfunc vectorcall;
 
     /* Invariant:
      *     func_closure contains the bindings for func_code->co_freevars, so
@@ -58,22 +59,36 @@ PyAPI_FUNC(int) PyFunction_SetClosure(PyObject *, PyObject *);
 PyAPI_FUNC(PyObject *) PyFunction_GetAnnotations(PyObject *);
 PyAPI_FUNC(int) PyFunction_SetAnnotations(PyObject *, PyObject *);
 
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(PyObject *) _PyFunction_FastCallDict(
+    PyObject *func,
+    PyObject *const *args,
+    Py_ssize_t nargs,
+    PyObject *kwargs);
+
+PyAPI_FUNC(PyObject *) _PyFunction_Vectorcall(
+    PyObject *func,
+    PyObject *const *stack,
+    size_t nargsf,
+    PyObject *kwnames);
+#endif
+
 /* Macros for direct access to these values. Type checks are *not*
    done, so use with care. */
 #define PyFunction_GET_CODE(func) \
         (((PyFunctionObject *)func) -> func_code)
 #define PyFunction_GET_GLOBALS(func) \
-	(((PyFunctionObject *)func) -> func_globals)
+        (((PyFunctionObject *)func) -> func_globals)
 #define PyFunction_GET_MODULE(func) \
-	(((PyFunctionObject *)func) -> func_module)
+        (((PyFunctionObject *)func) -> func_module)
 #define PyFunction_GET_DEFAULTS(func) \
-	(((PyFunctionObject *)func) -> func_defaults)
+        (((PyFunctionObject *)func) -> func_defaults)
 #define PyFunction_GET_KW_DEFAULTS(func) \
-	(((PyFunctionObject *)func) -> func_kwdefaults)
+        (((PyFunctionObject *)func) -> func_kwdefaults)
 #define PyFunction_GET_CLOSURE(func) \
-	(((PyFunctionObject *)func) -> func_closure)
+        (((PyFunctionObject *)func) -> func_closure)
 #define PyFunction_GET_ANNOTATIONS(func) \
-	(((PyFunctionObject *)func) -> func_annotations)
+        (((PyFunctionObject *)func) -> func_annotations)
 
 /* The classmethod and staticmethod types lives here, too */
 PyAPI_DATA(PyTypeObject) PyClassMethod_Type;
diff --git a/openflow/usr/include/python3.5m/genobject.h b/openflow/include/python3.8/genobject.h
similarity index 66%
rename from openflow/usr/include/python3.5m/genobject.h
rename to openflow/include/python3.8/genobject.h
index 1ff32a8..59ede28 100644
--- a/openflow/usr/include/python3.5m/genobject.h
+++ b/openflow/include/python3.8/genobject.h
@@ -8,6 +8,8 @@
 extern "C" {
 #endif
 
+#include "pystate.h"   /* _PyErr_StackItem */
+
 struct _frame; /* Avoid including frameobject.h */
 
 /* _PyGenObject_HEAD defines the initial segment of generator
@@ -25,7 +27,8 @@ struct _frame; /* Avoid including frameobject.h */
     /* Name of the generator. */                                            \
     PyObject *prefix##_name;                                                \
     /* Qualified name of the generator. */                                  \
-    PyObject *prefix##_qualname;
+    PyObject *prefix##_qualname;                                            \
+    _PyErr_StackItem prefix##_exc_state;
 
 typedef struct {
     /* The gi_ prefix is intended to remind of generator-iterator. */
@@ -41,26 +44,60 @@ PyAPI_FUNC(PyObject *) PyGen_New(struct _frame *);
 PyAPI_FUNC(PyObject *) PyGen_NewWithQualName(struct _frame *,
     PyObject *name, PyObject *qualname);
 PyAPI_FUNC(int) PyGen_NeedsFinalizing(PyGenObject *);
+PyAPI_FUNC(int) _PyGen_SetStopIterationValue(PyObject *);
 PyAPI_FUNC(int) _PyGen_FetchStopIterationValue(PyObject **);
-PyObject *_PyGen_Send(PyGenObject *, PyObject *);
+PyAPI_FUNC(PyObject *) _PyGen_Send(PyGenObject *, PyObject *);
 PyObject *_PyGen_yf(PyGenObject *);
 PyAPI_FUNC(void) _PyGen_Finalize(PyObject *self);
 
 #ifndef Py_LIMITED_API
 typedef struct {
     _PyGenObject_HEAD(cr)
+    PyObject *cr_origin;
 } PyCoroObject;
 
 PyAPI_DATA(PyTypeObject) PyCoro_Type;
 PyAPI_DATA(PyTypeObject) _PyCoroWrapper_Type;
 
 PyAPI_DATA(PyTypeObject) _PyAIterWrapper_Type;
-PyObject *_PyAIterWrapper_New(PyObject *aiter);
 
 #define PyCoro_CheckExact(op) (Py_TYPE(op) == &PyCoro_Type)
 PyObject *_PyCoro_GetAwaitableIter(PyObject *o);
 PyAPI_FUNC(PyObject *) PyCoro_New(struct _frame *,
     PyObject *name, PyObject *qualname);
+
+/* Asynchronous Generators */
+
+typedef struct {
+    _PyGenObject_HEAD(ag)
+    PyObject *ag_finalizer;
+
+    /* Flag is set to 1 when hooks set up by sys.set_asyncgen_hooks
+       were called on the generator, to avoid calling them more
+       than once. */
+    int ag_hooks_inited;
+
+    /* Flag is set to 1 when aclose() is called for the first time, or
+       when a StopAsyncIteration exception is raised. */
+    int ag_closed;
+
+    int ag_running_async;
+} PyAsyncGenObject;
+
+PyAPI_DATA(PyTypeObject) PyAsyncGen_Type;
+PyAPI_DATA(PyTypeObject) _PyAsyncGenASend_Type;
+PyAPI_DATA(PyTypeObject) _PyAsyncGenWrappedValue_Type;
+PyAPI_DATA(PyTypeObject) _PyAsyncGenAThrow_Type;
+
+PyAPI_FUNC(PyObject *) PyAsyncGen_New(struct _frame *,
+    PyObject *name, PyObject *qualname);
+
+#define PyAsyncGen_CheckExact(op) (Py_TYPE(op) == &PyAsyncGen_Type)
+
+PyObject *_PyAsyncGenValueWrapperNew(PyObject *);
+
+int PyAsyncGen_ClearFreeLists(void);
+
 #endif
 
 #undef _PyGenObject_HEAD
diff --git a/openflow/include/python3.8/graminit.h b/openflow/include/python3.8/graminit.h
new file mode 100644
index 0000000..d1027b7
--- /dev/null
+++ b/openflow/include/python3.8/graminit.h
@@ -0,0 +1,94 @@
+/* Generated by Parser/pgen */
+
+#define single_input 256
+#define file_input 257
+#define eval_input 258
+#define decorator 259
+#define decorators 260
+#define decorated 261
+#define async_funcdef 262
+#define funcdef 263
+#define parameters 264
+#define typedargslist 265
+#define tfpdef 266
+#define varargslist 267
+#define vfpdef 268
+#define stmt 269
+#define simple_stmt 270
+#define small_stmt 271
+#define expr_stmt 272
+#define annassign 273
+#define testlist_star_expr 274
+#define augassign 275
+#define del_stmt 276
+#define pass_stmt 277
+#define flow_stmt 278
+#define break_stmt 279
+#define continue_stmt 280
+#define return_stmt 281
+#define yield_stmt 282
+#define raise_stmt 283
+#define import_stmt 284
+#define import_name 285
+#define import_from 286
+#define import_as_name 287
+#define dotted_as_name 288
+#define import_as_names 289
+#define dotted_as_names 290
+#define dotted_name 291
+#define global_stmt 292
+#define nonlocal_stmt 293
+#define assert_stmt 294
+#define compound_stmt 295
+#define async_stmt 296
+#define if_stmt 297
+#define while_stmt 298
+#define for_stmt 299
+#define try_stmt 300
+#define with_stmt 301
+#define with_item 302
+#define except_clause 303
+#define suite 304
+#define namedexpr_test 305
+#define test 306
+#define test_nocond 307
+#define lambdef 308
+#define lambdef_nocond 309
+#define or_test 310
+#define and_test 311
+#define not_test 312
+#define comparison 313
+#define comp_op 314
+#define star_expr 315
+#define expr 316
+#define xor_expr 317
+#define and_expr 318
+#define shift_expr 319
+#define arith_expr 320
+#define term 321
+#define factor 322
+#define power 323
+#define atom_expr 324
+#define atom 325
+#define testlist_comp 326
+#define trailer 327
+#define subscriptlist 328
+#define subscript 329
+#define sliceop 330
+#define exprlist 331
+#define testlist 332
+#define dictorsetmaker 333
+#define classdef 334
+#define arglist 335
+#define argument 336
+#define comp_iter 337
+#define sync_comp_for 338
+#define comp_for 339
+#define comp_if 340
+#define encoding_decl 341
+#define yield_expr 342
+#define yield_arg 343
+#define func_body_suite 344
+#define func_type_input 345
+#define func_type 346
+#define typelist 347
diff --git a/openflow/include/python3.8/grammar.h b/openflow/include/python3.8/grammar.h
new file mode 100644
index 0000000..4b66b1e
--- /dev/null
+++ b/openflow/include/python3.8/grammar.h
@@ -0,0 +1,77 @@
+
+/* Grammar interface */
+
+#ifndef Py_GRAMMAR_H
+#define Py_GRAMMAR_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "bitset.h" /* Sigh... */
+
+/* A label of an arc */
+
+typedef struct {
+    int          lb_type;
+    const char  *lb_str;
+} label;
+
+#define EMPTY 0         /* Label number 0 is by definition the empty label */
+
+/* A list of labels */
+
+typedef struct {
+    int          ll_nlabels;
+    const label *ll_label;
+} labellist;
+
+/* An arc from one state to another */
+
+typedef struct {
+    short       a_lbl;          /* Label of this arc */
+    short       a_arrow;        /* State where this arc goes to */
+} arc;
+
+/* A state in a DFA */
+
+typedef struct {
+    int          s_narcs;
+    const arc   *s_arc;         /* Array of arcs */
+
+    /* Optional accelerators */
+    int          s_lower;       /* Lowest label index */
+    int          s_upper;       /* Highest label index */
+    int         *s_accel;       /* Accelerator */
+    int          s_accept;      /* Nonzero for accepting state */
+} state;
+
+/* A DFA */
+
+typedef struct {
+    int          d_type;        /* Non-terminal this represents */
+    char        *d_name;        /* For printing */
+    int          d_nstates;
+    state       *d_state;       /* Array of states */
+    bitset       d_first;
+} dfa;
+
+/* A grammar */
+
+typedef struct {
+    int          g_ndfas;
+    const dfa   *g_dfa;         /* Array of DFAs */
+    const labellist g_ll;
+    int          g_start;       /* Start symbol of the grammar */
+    int          g_accel;       /* Set if accelerators present */
+} grammar;
+
+/* FUNCTIONS */
+const dfa *PyGrammar_FindDFA(grammar *g, int type);
+const char *PyGrammar_LabelRepr(label *lb);
+void PyGrammar_AddAccelerators(grammar *g);
+void PyGrammar_RemoveAccelerators(grammar *);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_GRAMMAR_H */
diff --git a/openflow/usr/include/python3.5m/import.h b/openflow/include/python3.8/import.h
similarity index 73%
rename from openflow/usr/include/python3.5m/import.h
rename to openflow/include/python3.8/import.h
index afdfac2..13c6149 100644
--- a/openflow/usr/include/python3.5m/import.h
+++ b/openflow/include/python3.8/import.h
@@ -7,9 +7,9 @@
 extern "C" {
 #endif
 
-PyAPI_FUNC(void) _PyImportZip_Init(void);
-
-PyMODINIT_FUNC PyInit_imp(void);
+#ifndef Py_LIMITED_API
+PyMODINIT_FUNC PyInit__imp(void);
+#endif /* !Py_LIMITED_API */
 PyAPI_FUNC(long) PyImport_GetMagicNumber(void);
 PyAPI_FUNC(const char *) PyImport_GetMagicTag(void);
 PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule(
@@ -27,16 +27,31 @@ PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleWithPathnames(
     const char *pathname,       /* decoded from the filesystem encoding */
     const char *cpathname       /* decoded from the filesystem encoding */
     );
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleObject(
     PyObject *name,
     PyObject *co,
     PyObject *pathname,
     PyObject *cpathname
     );
+#endif
 PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
+PyAPI_FUNC(PyObject *) PyImport_GetModule(PyObject *name);
+#endif
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *);
+PyAPI_FUNC(PyObject *) _PyImport_GetModuleId(struct _Py_Identifier *name);
+PyAPI_FUNC(PyObject *) _PyImport_AddModuleObject(PyObject *name,
+                                                 PyObject *modules);
+PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *module);
+PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject* module);
+#endif
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(PyObject *) PyImport_AddModuleObject(
     PyObject *name
     );
+#endif
 PyAPI_FUNC(PyObject *) PyImport_AddModule(
     const char *name            /* UTF-8 encoded string */
     );
@@ -53,6 +68,7 @@ PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(
     PyObject *fromlist,
     int level
     );
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
 PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevelObject(
     PyObject *name,
     PyObject *globals,
@@ -60,6 +76,7 @@ PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevelObject(
     PyObject *fromlist,
     int level
     );
+#endif
 
 #define PyImport_ImportModuleEx(n, g, l, f) \
     PyImport_ImportModuleLevel(n, g, l, f, 0)
@@ -68,33 +85,35 @@ PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path);
 PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name);
 PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m);
 PyAPI_FUNC(void) PyImport_Cleanup(void);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(int) PyImport_ImportFrozenModuleObject(
     PyObject *name
     );
+#endif
 PyAPI_FUNC(int) PyImport_ImportFrozenModule(
     const char *name            /* UTF-8 encoded string */
     );
 
 #ifndef Py_LIMITED_API
-#ifdef WITH_THREAD
 PyAPI_FUNC(void) _PyImport_AcquireLock(void);
 PyAPI_FUNC(int) _PyImport_ReleaseLock(void);
-#else
-#define _PyImport_AcquireLock()
-#define _PyImport_ReleaseLock() 1
-#endif
 
 PyAPI_FUNC(void) _PyImport_ReInitLock(void);
 
 PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin(
-    const char *name            /* UTF-8 encoded string */
+    const char *name,            /* UTF-8 encoded string */
+    PyObject *modules
     );
 PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *);
+PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObjectEx(PyObject *, PyObject *,
+                                                       PyObject *);
 PyAPI_FUNC(int) _PyImport_FixupBuiltin(
     PyObject *mod,
-    const char *name            /* UTF-8 encoded string */
+    const char *name,            /* UTF-8 encoded string */
+    PyObject *modules
     );
-PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *);
+PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *,
+                                               PyObject *, PyObject *);
 
 struct _inittab {
     const char *name;           /* ASCII encoded string */
diff --git a/openflow/usr/include/python3.5m/accu.h b/openflow/include/python3.8/internal/pycore_accu.h
similarity index 82%
rename from openflow/usr/include/python3.5m/accu.h
rename to openflow/include/python3.8/internal/pycore_accu.h
index 3636ea6..d346222 100644
--- a/openflow/usr/include/python3.5m/accu.h
+++ b/openflow/include/python3.8/internal/pycore_accu.h
@@ -1,21 +1,24 @@
 #ifndef Py_LIMITED_API
-#ifndef Py_ACCU_H
-#define Py_ACCU_H
+#ifndef Py_INTERNAL_ACCU_H
+#define Py_INTERNAL_ACCU_H
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*** This is a private API for use by the interpreter and the stdlib.
  *** Its definition may be changed or removed at any moment.
  ***/
 
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
 /*
  * A two-level accumulator of unicode objects that avoids both the overhead
  * of keeping a huge number of small separate objects, and the quadratic
  * behaviour of using a naive repeated concatenation scheme.
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #undef small /* defined by some Windows headers */
 
 typedef struct {
@@ -32,6 +35,5 @@ PyAPI_FUNC(void) _PyAccu_Destroy(_PyAccu *acc);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* Py_ACCU_H */
-#endif /* Py_LIMITED_API */
+#endif /* !Py_INTERNAL_ACCU_H */
+#endif /* !Py_LIMITED_API */
diff --git a/openflow/include/python3.8/internal/pycore_atomic.h b/openflow/include/python3.8/internal/pycore_atomic.h
new file mode 100644
index 0000000..336bc3f
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_atomic.h
@@ -0,0 +1,558 @@
+#ifndef Py_ATOMIC_H
+#define Py_ATOMIC_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "dynamic_annotations.h"
+
+#include "pyconfig.h"
+
+#if defined(HAVE_STD_ATOMIC)
+#include <stdatomic.h>
+#endif
+
+
+#if defined(_MSC_VER)
+#include <intrin.h>
+#if defined(_M_IX86) || defined(_M_X64)
+#  include <immintrin.h>
+#endif
+#endif
+
+/* This is modeled after the atomics interface from C1x, according to
+ * the draft at
+ * http://www.open-std.org/JTC1/SC22/wg14/www/docs/n1425.pdf.
+ * Operations and types are named the same except with a _Py_ prefix
+ * and have the same semantics.
+ *
+ * Beware, the implementations here are deep magic.
+ */
+
+#if defined(HAVE_STD_ATOMIC)
+
+typedef enum _Py_memory_order {
+    _Py_memory_order_relaxed = memory_order_relaxed,
+    _Py_memory_order_acquire = memory_order_acquire,
+    _Py_memory_order_release = memory_order_release,
+    _Py_memory_order_acq_rel = memory_order_acq_rel,
+    _Py_memory_order_seq_cst = memory_order_seq_cst
+} _Py_memory_order;
+
+typedef struct _Py_atomic_address {
+    atomic_uintptr_t _value;
+} _Py_atomic_address;
+
+typedef struct _Py_atomic_int {
+    atomic_int _value;
+} _Py_atomic_int;
+
+#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) \
+    atomic_signal_fence(ORDER)
+
+#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) \
+    atomic_thread_fence(ORDER)
+
+#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
+    atomic_store_explicit(&((ATOMIC_VAL)->_value), NEW_VAL, ORDER)
+
+#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
+    atomic_load_explicit(&((ATOMIC_VAL)->_value), ORDER)
+
+/* Use builtin atomic operations in GCC >= 4.7 */
+#elif defined(HAVE_BUILTIN_ATOMIC)
+
+typedef enum _Py_memory_order {
+    _Py_memory_order_relaxed = __ATOMIC_RELAXED,
+    _Py_memory_order_acquire = __ATOMIC_ACQUIRE,
+    _Py_memory_order_release = __ATOMIC_RELEASE,
+    _Py_memory_order_acq_rel = __ATOMIC_ACQ_REL,
+    _Py_memory_order_seq_cst = __ATOMIC_SEQ_CST
+} _Py_memory_order;
+
+typedef struct _Py_atomic_address {
+    uintptr_t _value;
+} _Py_atomic_address;
+
+typedef struct _Py_atomic_int {
+    int _value;
+} _Py_atomic_int;
+
+#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) \
+    __atomic_signal_fence(ORDER)
+
+#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) \
+    __atomic_thread_fence(ORDER)
+
+#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
+    (assert((ORDER) == __ATOMIC_RELAXED                       \
+            || (ORDER) == __ATOMIC_SEQ_CST                    \
+            || (ORDER) == __ATOMIC_RELEASE),                  \
+     __atomic_store_n(&((ATOMIC_VAL)->_value), NEW_VAL, ORDER))
+
+#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER)           \
+    (assert((ORDER) == __ATOMIC_RELAXED                       \
+            || (ORDER) == __ATOMIC_SEQ_CST                    \
+            || (ORDER) == __ATOMIC_ACQUIRE                    \
+            || (ORDER) == __ATOMIC_CONSUME),                  \
+     __atomic_load_n(&((ATOMIC_VAL)->_value), ORDER))
+
+/* Only support GCC (for expression statements) and x86 (for simple
+ * atomic semantics) and MSVC x86/x64/ARM */
+#elif defined(__GNUC__) && (defined(__i386__) || defined(__amd64))
+typedef enum _Py_memory_order {
+    _Py_memory_order_relaxed,
+    _Py_memory_order_acquire,
+    _Py_memory_order_release,
+    _Py_memory_order_acq_rel,
+    _Py_memory_order_seq_cst
+} _Py_memory_order;
+
+typedef struct _Py_atomic_address {
+    uintptr_t _value;
+} _Py_atomic_address;
+
+typedef struct _Py_atomic_int {
+    int _value;
+} _Py_atomic_int;
+
+
+static __inline__ void
+_Py_atomic_signal_fence(_Py_memory_order order)
+{
+    if (order != _Py_memory_order_relaxed)
+        __asm__ volatile("":::"memory");
+}
+
+static __inline__ void
+_Py_atomic_thread_fence(_Py_memory_order order)
+{
+    if (order != _Py_memory_order_relaxed)
+        __asm__ volatile("mfence":::"memory");
+}
+
+/* Tell the race checker about this operation's effects. */
+static __inline__ void
+_Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
+{
+    (void)address;              /* shut up -Wunused-parameter */
+    switch(order) {
+    case _Py_memory_order_release:
+    case _Py_memory_order_acq_rel:
+    case _Py_memory_order_seq_cst:
+        _Py_ANNOTATE_HAPPENS_BEFORE(address);
+        break;
+    case _Py_memory_order_relaxed:
+    case _Py_memory_order_acquire:
+        break;
+    }
+    switch(order) {
+    case _Py_memory_order_acquire:
+    case _Py_memory_order_acq_rel:
+    case _Py_memory_order_seq_cst:
+        _Py_ANNOTATE_HAPPENS_AFTER(address);
+        break;
+    case _Py_memory_order_relaxed:
+    case _Py_memory_order_release:
+        break;
+    }
+}
+
+#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
+    __extension__ ({ \
+        __typeof__(ATOMIC_VAL) atomic_val = ATOMIC_VAL; \
+        __typeof__(atomic_val->_value) new_val = NEW_VAL;\
+        volatile __typeof__(new_val) *volatile_data = &atomic_val->_value; \
+        _Py_memory_order order = ORDER; \
+        _Py_ANNOTATE_MEMORY_ORDER(atomic_val, order); \
+        \
+        /* Perform the operation. */ \
+        _Py_ANNOTATE_IGNORE_WRITES_BEGIN(); \
+        switch(order) { \
+        case _Py_memory_order_release: \
+            _Py_atomic_signal_fence(_Py_memory_order_release); \
+            /* fallthrough */ \
+        case _Py_memory_order_relaxed: \
+            *volatile_data = new_val; \
+            break; \
+        \
+        case _Py_memory_order_acquire: \
+        case _Py_memory_order_acq_rel: \
+        case _Py_memory_order_seq_cst: \
+            __asm__ volatile("xchg %0, %1" \
+                         : "+r"(new_val) \
+                         : "m"(atomic_val->_value) \
+                         : "memory"); \
+            break; \
+        } \
+        _Py_ANNOTATE_IGNORE_WRITES_END(); \
+    })
+
+#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
+    __extension__ ({  \
+        __typeof__(ATOMIC_VAL) atomic_val = ATOMIC_VAL; \
+        __typeof__(atomic_val->_value) result; \
+        volatile __typeof__(result) *volatile_data = &atomic_val->_value; \
+        _Py_memory_order order = ORDER; \
+        _Py_ANNOTATE_MEMORY_ORDER(atomic_val, order); \
+        \
+        /* Perform the operation. */ \
+        _Py_ANNOTATE_IGNORE_READS_BEGIN(); \
+        switch(order) { \
+        case _Py_memory_order_release: \
+        case _Py_memory_order_acq_rel: \
+        case _Py_memory_order_seq_cst: \
+            /* Loads on x86 are not releases by default, so need a */ \
+            /* thread fence. */ \
+            _Py_atomic_thread_fence(_Py_memory_order_release); \
+            break; \
+        default: \
+            /* No fence */ \
+            break; \
+        } \
+        result = *volatile_data; \
+        switch(order) { \
+        case _Py_memory_order_acquire: \
+        case _Py_memory_order_acq_rel: \
+        case _Py_memory_order_seq_cst: \
+            /* Loads on x86 are automatically acquire operations so */ \
+            /* can get by with just a compiler fence. */ \
+            _Py_atomic_signal_fence(_Py_memory_order_acquire); \
+            break; \
+        default: \
+            /* No fence */ \
+            break; \
+        } \
+        _Py_ANNOTATE_IGNORE_READS_END(); \
+        result; \
+    })
+
+#elif defined(_MSC_VER)
+/*  _Interlocked* functions provide a full memory barrier and are therefore
+    enough for acq_rel and seq_cst. If the HLE variants aren't available
+    in hardware they will fall back to a full memory barrier as well.
+
+    This might affect performance but likely only in some very specific and
+    hard to meassure scenario.
+*/
+#if defined(_M_IX86) || defined(_M_X64)
+typedef enum _Py_memory_order {
+    _Py_memory_order_relaxed,
+    _Py_memory_order_acquire,
+    _Py_memory_order_release,
+    _Py_memory_order_acq_rel,
+    _Py_memory_order_seq_cst
+} _Py_memory_order;
+
+typedef struct _Py_atomic_address {
+    volatile uintptr_t _value;
+} _Py_atomic_address;
+
+typedef struct _Py_atomic_int {
+    volatile int _value;
+} _Py_atomic_int;
+
+
+#if defined(_M_X64)
+#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \
+    switch (ORDER) { \
+    case _Py_memory_order_acquire: \
+      _InterlockedExchange64_HLEAcquire((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)(NEW_VAL)); \
+      break; \
+    case _Py_memory_order_release: \
+      _InterlockedExchange64_HLERelease((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)(NEW_VAL)); \
+      break; \
+    default: \
+      _InterlockedExchange64((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)(NEW_VAL)); \
+      break; \
+  }
+#else
+#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) ((void)0);
+#endif
+
+#define _Py_atomic_store_32bit(ATOMIC_VAL, NEW_VAL, ORDER) \
+  switch (ORDER) { \
+  case _Py_memory_order_acquire: \
+    _InterlockedExchange_HLEAcquire((volatile long*)&((ATOMIC_VAL)->_value), (int)(NEW_VAL)); \
+    break; \
+  case _Py_memory_order_release: \
+    _InterlockedExchange_HLERelease((volatile long*)&((ATOMIC_VAL)->_value), (int)(NEW_VAL)); \
+    break; \
+  default: \
+    _InterlockedExchange((volatile long*)&((ATOMIC_VAL)->_value), (int)(NEW_VAL)); \
+    break; \
+  }
+
+#if defined(_M_X64)
+/*  This has to be an intptr_t for now.
+    gil_created() uses -1 as a sentinel value, if this returns
+    a uintptr_t it will do an unsigned compare and crash
+*/
+inline intptr_t _Py_atomic_load_64bit_impl(volatile uintptr_t* value, int order) {
+    __int64 old;
+    switch (order) {
+    case _Py_memory_order_acquire:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64_HLEAcquire((volatile __int64*)value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_release:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64_HLERelease((volatile __int64*)value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_relaxed:
+      old = *value;
+      break;
+    default:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64((volatile __int64*)value, old, old) != old);
+      break;
+    }
+    }
+    return old;
+}
+
+#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) \
+    _Py_atomic_load_64bit_impl((volatile uintptr_t*)&((ATOMIC_VAL)->_value), (ORDER))
+
+#else
+#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) ((ATOMIC_VAL)->_value)
+#endif
+
+inline int _Py_atomic_load_32bit_impl(volatile int* value, int order) {
+    long old;
+    switch (order) {
+    case _Py_memory_order_acquire:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange_HLEAcquire((volatile long*)value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_release:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange_HLERelease((volatile long*)value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_relaxed:
+      old = *value;
+      break;
+    default:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange((volatile long*)value, old, old) != old);
+      break;
+    }
+    }
+    return old;
+}
+
+#define _Py_atomic_load_32bit(ATOMIC_VAL, ORDER) \
+    _Py_atomic_load_32bit_impl((volatile int*)&((ATOMIC_VAL)->_value), (ORDER))
+
+#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
+  if (sizeof((ATOMIC_VAL)->_value) == 8) { \
+    _Py_atomic_store_64bit((ATOMIC_VAL), NEW_VAL, ORDER) } else { \
+    _Py_atomic_store_32bit((ATOMIC_VAL), NEW_VAL, ORDER) }
+
+#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
+  ( \
+    sizeof((ATOMIC_VAL)->_value) == 8 ? \
+    _Py_atomic_load_64bit((ATOMIC_VAL), ORDER) : \
+    _Py_atomic_load_32bit((ATOMIC_VAL), ORDER) \
+  )
+#elif defined(_M_ARM) || defined(_M_ARM64)
+typedef enum _Py_memory_order {
+    _Py_memory_order_relaxed,
+    _Py_memory_order_acquire,
+    _Py_memory_order_release,
+    _Py_memory_order_acq_rel,
+    _Py_memory_order_seq_cst
+} _Py_memory_order;
+
+typedef struct _Py_atomic_address {
+    volatile uintptr_t _value;
+} _Py_atomic_address;
+
+typedef struct _Py_atomic_int {
+    volatile int _value;
+} _Py_atomic_int;
+
+
+#if defined(_M_ARM64)
+#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \
+    switch (ORDER) { \
+    case _Py_memory_order_acquire: \
+      _InterlockedExchange64_acq((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)NEW_VAL); \
+      break; \
+    case _Py_memory_order_release: \
+      _InterlockedExchange64_rel((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)NEW_VAL); \
+      break; \
+    default: \
+      _InterlockedExchange64((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)NEW_VAL); \
+      break; \
+  }
+#else
+#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) ((void)0);
+#endif
+
+#define _Py_atomic_store_32bit(ATOMIC_VAL, NEW_VAL, ORDER) \
+  switch (ORDER) { \
+  case _Py_memory_order_acquire: \
+    _InterlockedExchange_acq((volatile long*)&((ATOMIC_VAL)->_value), (int)NEW_VAL); \
+    break; \
+  case _Py_memory_order_release: \
+    _InterlockedExchange_rel((volatile long*)&((ATOMIC_VAL)->_value), (int)NEW_VAL); \
+    break; \
+  default: \
+    _InterlockedExchange((volatile long*)&((ATOMIC_VAL)->_value), (int)NEW_VAL); \
+    break; \
+  }
+
+#if defined(_M_ARM64)
+/*  This has to be an intptr_t for now.
+    gil_created() uses -1 as a sentinel value, if this returns
+    a uintptr_t it will do an unsigned compare and crash
+*/
+inline intptr_t _Py_atomic_load_64bit_impl(volatile uintptr_t* value, int order) {
+    uintptr_t old;
+    switch (order) {
+    case _Py_memory_order_acquire:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64_acq(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_release:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64_rel(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_relaxed:
+      old = *value;
+      break;
+    default:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange64(value, old, old) != old);
+      break;
+    }
+    }
+    return old;
+}
+
+#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) \
+    _Py_atomic_load_64bit_impl((volatile uintptr_t*)&((ATOMIC_VAL)->_value), (ORDER))
+
+#else
+#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) ((ATOMIC_VAL)->_value)
+#endif
+
+inline int _Py_atomic_load_32bit_impl(volatile int* value, int order) {
+    int old;
+    switch (order) {
+    case _Py_memory_order_acquire:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange_acq(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_release:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange_rel(value, old, old) != old);
+      break;
+    }
+    case _Py_memory_order_relaxed:
+      old = *value;
+      break;
+    default:
+    {
+      do {
+        old = *value;
+      } while(_InterlockedCompareExchange(value, old, old) != old);
+      break;
+    }
+    }
+    return old;
+}
+
+#define _Py_atomic_load_32bit(ATOMIC_VAL, ORDER) \
+    _Py_atomic_load_32bit_impl((volatile int*)&((ATOMIC_VAL)->_value), (ORDER))
+
+#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
+  if (sizeof((ATOMIC_VAL)->_value) == 8) { \
+    _Py_atomic_store_64bit((ATOMIC_VAL), (NEW_VAL), (ORDER)) } else { \
+    _Py_atomic_store_32bit((ATOMIC_VAL), (NEW_VAL), (ORDER)) }
+
+#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
+  ( \
+    sizeof((ATOMIC_VAL)->_value) == 8 ? \
+    _Py_atomic_load_64bit((ATOMIC_VAL), (ORDER)) : \
+    _Py_atomic_load_32bit((ATOMIC_VAL), (ORDER)) \
+  )
+#endif
+#else  /* !gcc x86  !_msc_ver */
+typedef enum _Py_memory_order {
+    _Py_memory_order_relaxed,
+    _Py_memory_order_acquire,
+    _Py_memory_order_release,
+    _Py_memory_order_acq_rel,
+    _Py_memory_order_seq_cst
+} _Py_memory_order;
+
+typedef struct _Py_atomic_address {
+    uintptr_t _value;
+} _Py_atomic_address;
+
+typedef struct _Py_atomic_int {
+    int _value;
+} _Py_atomic_int;
+/* Fall back to other compilers and processors by assuming that simple
+   volatile accesses are atomic.  This is false, so people should port
+   this. */
+#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) ((void)0)
+#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) ((void)0)
+#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
+    ((ATOMIC_VAL)->_value = NEW_VAL)
+#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
+    ((ATOMIC_VAL)->_value)
+#endif
+
+/* Standardized shortcuts. */
+#define _Py_atomic_store(ATOMIC_VAL, NEW_VAL) \
+    _Py_atomic_store_explicit((ATOMIC_VAL), (NEW_VAL), _Py_memory_order_seq_cst)
+#define _Py_atomic_load(ATOMIC_VAL) \
+    _Py_atomic_load_explicit((ATOMIC_VAL), _Py_memory_order_seq_cst)
+
+/* Python-local extensions */
+
+#define _Py_atomic_store_relaxed(ATOMIC_VAL, NEW_VAL) \
+    _Py_atomic_store_explicit((ATOMIC_VAL), (NEW_VAL), _Py_memory_order_relaxed)
+#define _Py_atomic_load_relaxed(ATOMIC_VAL) \
+    _Py_atomic_load_explicit((ATOMIC_VAL), _Py_memory_order_relaxed)
+
+#ifdef __cplusplus
+}
+#endif
+#endif  /* Py_ATOMIC_H */
diff --git a/openflow/include/python3.8/internal/pycore_ceval.h b/openflow/include/python3.8/internal/pycore_ceval.h
new file mode 100644
index 0000000..4c1c0e2
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_ceval.h
@@ -0,0 +1,37 @@
+#ifndef Py_INTERNAL_CEVAL_H
+#define Py_INTERNAL_CEVAL_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "pycore_atomic.h"
+#include "pycore_pystate.h"
+#include "pythread.h"
+
+PyAPI_FUNC(void) _Py_FinishPendingCalls(_PyRuntimeState *runtime);
+PyAPI_FUNC(void) _PyEval_Initialize(struct _ceval_runtime_state *);
+PyAPI_FUNC(void) _PyEval_FiniThreads(
+    struct _ceval_runtime_state *ceval);
+PyAPI_FUNC(void) _PyEval_SignalReceived(
+    struct _ceval_runtime_state *ceval);
+PyAPI_FUNC(int) _PyEval_AddPendingCall(
+    PyThreadState *tstate,
+    struct _ceval_runtime_state *ceval,
+    int (*func)(void *),
+    void *arg);
+PyAPI_FUNC(void) _PyEval_SignalAsyncExc(
+    struct _ceval_runtime_state *ceval);
+PyAPI_FUNC(void) _PyEval_ReInitThreads(
+    _PyRuntimeState *runtime);
+
+/* Private function */
+void _PyEval_Fini(void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_CEVAL_H */
diff --git a/openflow/include/python3.8/internal/pycore_code.h b/openflow/include/python3.8/internal/pycore_code.h
new file mode 100644
index 0000000..88956f1
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_code.h
@@ -0,0 +1,27 @@
+#ifndef Py_INTERNAL_CODE_H
+#define Py_INTERNAL_CODE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+ 
+typedef struct {
+    PyObject *ptr;  /* Cached pointer (borrowed reference) */
+    uint64_t globals_ver;  /* ma_version of global dict */
+    uint64_t builtins_ver; /* ma_version of builtin dict */
+} _PyOpcache_LoadGlobal;
+
+struct _PyOpcache {
+    union {
+        _PyOpcache_LoadGlobal lg;
+    } u;
+    char optimized;
+};
+
+/* Private API */
+int _PyCode_InitOpcache(PyCodeObject *co);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_CODE_H */
diff --git a/openflow/include/python3.8/internal/pycore_condvar.h b/openflow/include/python3.8/internal/pycore_condvar.h
new file mode 100644
index 0000000..8b89d70
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_condvar.h
@@ -0,0 +1,95 @@
+#ifndef Py_INTERNAL_CONDVAR_H
+#define Py_INTERNAL_CONDVAR_H
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#ifndef _POSIX_THREADS
+/* This means pthreads are not implemented in libc headers, hence the macro
+   not present in unistd.h. But they still can be implemented as an external
+   library (e.g. gnu pth in pthread emulation) */
+# ifdef HAVE_PTHREAD_H
+#  include <pthread.h> /* _POSIX_THREADS */
+# endif
+#endif
+
+#ifdef _POSIX_THREADS
+/*
+ * POSIX support
+ */
+#define Py_HAVE_CONDVAR
+
+#include <pthread.h>
+
+#define PyMUTEX_T pthread_mutex_t
+#define PyCOND_T pthread_cond_t
+
+#elif defined(NT_THREADS)
+/*
+ * Windows (XP, 2003 server and later, as well as (hopefully) CE) support
+ *
+ * Emulated condition variables ones that work with XP and later, plus
+ * example native support on VISTA and onwards.
+ */
+#define Py_HAVE_CONDVAR
+
+/* include windows if it hasn't been done before */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+/* options */
+/* non-emulated condition variables are provided for those that want
+ * to target Windows Vista.  Modify this macro to enable them.
+ */
+#ifndef _PY_EMULATED_WIN_CV
+#define _PY_EMULATED_WIN_CV 1  /* use emulated condition variables */
+#endif
+
+/* fall back to emulation if not targeting Vista */
+#if !defined NTDDI_VISTA || NTDDI_VERSION < NTDDI_VISTA
+#undef _PY_EMULATED_WIN_CV
+#define _PY_EMULATED_WIN_CV 1
+#endif
+
+#if _PY_EMULATED_WIN_CV
+
+typedef CRITICAL_SECTION PyMUTEX_T;
+
+/* The ConditionVariable object.  From XP onwards it is easily emulated
+   with a Semaphore.
+   Semaphores are available on Windows XP (2003 server) and later.
+   We use a Semaphore rather than an auto-reset event, because although
+   an auto-resent event might appear to solve the lost-wakeup bug (race
+   condition between releasing the outer lock and waiting) because it
+   maintains state even though a wait hasn't happened, there is still
+   a lost wakeup problem if more than one thread are interrupted in the
+   critical place.  A semaphore solves that, because its state is
+   counted, not Boolean.
+   Because it is ok to signal a condition variable with no one
+   waiting, we need to keep track of the number of
+   waiting threads.  Otherwise, the semaphore's state could rise
+   without bound.  This also helps reduce the number of "spurious wakeups"
+   that would otherwise happen.
+ */
+
+typedef struct _PyCOND_T
+{
+    HANDLE sem;
+    int waiting; /* to allow PyCOND_SIGNAL to be a no-op */
+} PyCOND_T;
+
+#else /* !_PY_EMULATED_WIN_CV */
+
+/* Use native Win7 primitives if build target is Win7 or higher */
+
+/* SRWLOCK is faster and better than CriticalSection */
+typedef SRWLOCK PyMUTEX_T;
+
+typedef CONDITION_VARIABLE  PyCOND_T;
+
+#endif /* _PY_EMULATED_WIN_CV */
+
+#endif /* _POSIX_THREADS, NT_THREADS */
+
+#endif /* Py_INTERNAL_CONDVAR_H */
diff --git a/openflow/include/python3.8/internal/pycore_context.h b/openflow/include/python3.8/internal/pycore_context.h
new file mode 100644
index 0000000..5e1ba0d
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_context.h
@@ -0,0 +1,42 @@
+#ifndef Py_INTERNAL_CONTEXT_H
+#define Py_INTERNAL_CONTEXT_H
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "pycore_hamt.h"
+
+struct _pycontextobject {
+    PyObject_HEAD
+    PyContext *ctx_prev;
+    PyHamtObject *ctx_vars;
+    PyObject *ctx_weakreflist;
+    int ctx_entered;
+};
+
+
+struct _pycontextvarobject {
+    PyObject_HEAD
+    PyObject *var_name;
+    PyObject *var_default;
+    PyObject *var_cached;
+    uint64_t var_cached_tsid;
+    uint64_t var_cached_tsver;
+    Py_hash_t var_hash;
+};
+
+
+struct _pycontexttokenobject {
+    PyObject_HEAD
+    PyContext *tok_ctx;
+    PyContextVar *tok_var;
+    PyObject *tok_oldval;
+    int tok_used;
+};
+
+
+int _PyContext_Init(void);
+void _PyContext_Fini(void);
+
+#endif /* !Py_INTERNAL_CONTEXT_H */
diff --git a/openflow/include/python3.8/internal/pycore_fileutils.h b/openflow/include/python3.8/internal/pycore_fileutils.h
new file mode 100644
index 0000000..bbee586
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_fileutils.h
@@ -0,0 +1,54 @@
+#ifndef Py_INTERNAL_FILEUTILS_H
+#define Py_INTERNAL_FILEUTILS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "Py_BUILD_CORE must be defined to include this header"
+#endif
+
+#include <locale.h>   /* struct lconv */
+
+PyAPI_DATA(int) _Py_HasFileSystemDefaultEncodeErrors;
+
+PyAPI_FUNC(int) _Py_DecodeUTF8Ex(
+    const char *arg,
+    Py_ssize_t arglen,
+    wchar_t **wstr,
+    size_t *wlen,
+    const char **reason,
+    _Py_error_handler errors);
+
+PyAPI_FUNC(int) _Py_EncodeUTF8Ex(
+    const wchar_t *text,
+    char **str,
+    size_t *error_pos,
+    const char **reason,
+    int raw_malloc,
+    _Py_error_handler errors);
+
+PyAPI_FUNC(wchar_t*) _Py_DecodeUTF8_surrogateescape(
+    const char *arg,
+    Py_ssize_t arglen,
+    size_t *wlen);
+
+PyAPI_FUNC(int) _Py_GetForceASCII(void);
+
+/* Reset "force ASCII" mode (if it was initialized).
+
+   This function should be called when Python changes the LC_CTYPE locale,
+   so the "force ASCII" mode can be detected again on the new locale
+   encoding. */
+PyAPI_FUNC(void) _Py_ResetForceASCII(void);
+
+
+PyAPI_FUNC(int) _Py_GetLocaleconvNumeric(
+    struct lconv *lc,
+    PyObject **decimal_point,
+    PyObject **thousands_sep);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_FILEUTILS_H */
diff --git a/openflow/include/python3.8/internal/pycore_getopt.h b/openflow/include/python3.8/internal/pycore_getopt.h
new file mode 100644
index 0000000..7f0dd13
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_getopt.h
@@ -0,0 +1,22 @@
+#ifndef Py_INTERNAL_PYGETOPT_H
+#define Py_INTERNAL_PYGETOPT_H
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+extern int _PyOS_opterr;
+extern Py_ssize_t _PyOS_optind;
+extern const wchar_t *_PyOS_optarg;
+
+extern void _PyOS_ResetGetOpt(void);
+
+typedef struct {
+    const wchar_t *name;
+    int has_arg;
+    int val;
+} _PyOS_LongOption;
+
+extern int _PyOS_GetOpt(Py_ssize_t argc, wchar_t * const *argv, int *longindex);
+
+#endif /* !Py_INTERNAL_PYGETOPT_H */
diff --git a/openflow/include/python3.8/internal/pycore_gil.h b/openflow/include/python3.8/internal/pycore_gil.h
new file mode 100644
index 0000000..7de3163
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_gil.h
@@ -0,0 +1,50 @@
+#ifndef Py_INTERNAL_GIL_H
+#define Py_INTERNAL_GIL_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "pycore_condvar.h"
+#include "pycore_atomic.h"
+
+#ifndef Py_HAVE_CONDVAR
+#  error You need either a POSIX-compatible or a Windows system!
+#endif
+
+/* Enable if you want to force the switching of threads at least
+   every `interval`. */
+#undef FORCE_SWITCHING
+#define FORCE_SWITCHING
+
+struct _gil_runtime_state {
+    /* microseconds (the Python API uses seconds, though) */
+    unsigned long interval;
+    /* Last PyThreadState holding / having held the GIL. This helps us
+       know whether anyone else was scheduled after we dropped the GIL. */
+    _Py_atomic_address last_holder;
+    /* Whether the GIL is already taken (-1 if uninitialized). This is
+       atomic because it can be read without any lock taken in ceval.c. */
+    _Py_atomic_int locked;
+    /* Number of GIL switches since the beginning. */
+    unsigned long switch_number;
+    /* This condition variable allows one or several threads to wait
+       until the GIL is released. In addition, the mutex also protects
+       the above variables. */
+    PyCOND_T cond;
+    PyMUTEX_T mutex;
+#ifdef FORCE_SWITCHING
+    /* This condition variable helps the GIL-releasing thread wait for
+       a GIL-awaiting thread to be scheduled and take the GIL. */
+    PyCOND_T switch_cond;
+    PyMUTEX_T switch_mutex;
+#endif
+};
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_GIL_H */
diff --git a/openflow/include/python3.8/internal/pycore_hamt.h b/openflow/include/python3.8/internal/pycore_hamt.h
new file mode 100644
index 0000000..e65aef5
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_hamt.h
@@ -0,0 +1,116 @@
+#ifndef Py_INTERNAL_HAMT_H
+#define Py_INTERNAL_HAMT_H
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#define _Py_HAMT_MAX_TREE_DEPTH 7
+
+
+#define PyHamt_Check(o) (Py_TYPE(o) == &_PyHamt_Type)
+
+
+/* Abstract tree node. */
+typedef struct {
+    PyObject_HEAD
+} PyHamtNode;
+
+
+/* An HAMT immutable mapping collection. */
+typedef struct {
+    PyObject_HEAD
+    PyHamtNode *h_root;
+    PyObject *h_weakreflist;
+    Py_ssize_t h_count;
+} PyHamtObject;
+
+
+/* A struct to hold the state of depth-first traverse of the tree.
+
+   HAMT is an immutable collection.  Iterators will hold a strong reference
+   to it, and every node in the HAMT has strong references to its children.
+
+   So for iterators, we can implement zero allocations and zero reference
+   inc/dec depth-first iteration.
+
+   - i_nodes: an array of seven pointers to tree nodes
+   - i_level: the current node in i_nodes
+   - i_pos: an array of positions within nodes in i_nodes.
+*/
+typedef struct {
+    PyHamtNode *i_nodes[_Py_HAMT_MAX_TREE_DEPTH];
+    Py_ssize_t i_pos[_Py_HAMT_MAX_TREE_DEPTH];
+    int8_t i_level;
+} PyHamtIteratorState;
+
+
+/* Base iterator object.
+
+   Contains the iteration state, a pointer to the HAMT tree,
+   and a pointer to the 'yield function'.  The latter is a simple
+   function that returns a key/value tuple for the 'Items' iterator,
+   just a key for the 'Keys' iterator, and a value for the 'Values'
+   iterator.
+*/
+typedef struct {
+    PyObject_HEAD
+    PyHamtObject *hi_obj;
+    PyHamtIteratorState hi_iter;
+    binaryfunc hi_yield;
+} PyHamtIterator;
+
+
+PyAPI_DATA(PyTypeObject) _PyHamt_Type;
+PyAPI_DATA(PyTypeObject) _PyHamt_ArrayNode_Type;
+PyAPI_DATA(PyTypeObject) _PyHamt_BitmapNode_Type;
+PyAPI_DATA(PyTypeObject) _PyHamt_CollisionNode_Type;
+PyAPI_DATA(PyTypeObject) _PyHamtKeys_Type;
+PyAPI_DATA(PyTypeObject) _PyHamtValues_Type;
+PyAPI_DATA(PyTypeObject) _PyHamtItems_Type;
+
+
+/* Create a new HAMT immutable mapping. */
+PyHamtObject * _PyHamt_New(void);
+
+/* Return a new collection based on "o", but with an additional
+   key/val pair. */
+PyHamtObject * _PyHamt_Assoc(PyHamtObject *o, PyObject *key, PyObject *val);
+
+/* Return a new collection based on "o", but without "key". */
+PyHamtObject * _PyHamt_Without(PyHamtObject *o, PyObject *key);
+
+/* Find "key" in the "o" collection.
+
+   Return:
+   - -1: An error occurred.
+   - 0: "key" wasn't found in "o".
+   - 1: "key" is in "o"; "*val" is set to its value (a borrowed ref).
+*/
+int _PyHamt_Find(PyHamtObject *o, PyObject *key, PyObject **val);
+
+/* Check if "v" is equal to "w".
+
+   Return:
+   - 0: v != w
+   - 1: v == w
+   - -1: An error occurred.
+*/
+int _PyHamt_Eq(PyHamtObject *v, PyHamtObject *w);
+
+/* Return the size of "o"; equivalent of "len(o)". */
+Py_ssize_t _PyHamt_Len(PyHamtObject *o);
+
+/* Return a Keys iterator over "o". */
+PyObject * _PyHamt_NewIterKeys(PyHamtObject *o);
+
+/* Return a Values iterator over "o". */
+PyObject * _PyHamt_NewIterValues(PyHamtObject *o);
+
+/* Return a Items iterator over "o". */
+PyObject * _PyHamt_NewIterItems(PyHamtObject *o);
+
+int _PyHamt_Init(void);
+void _PyHamt_Fini(void);
+
+#endif /* !Py_INTERNAL_HAMT_H */
diff --git a/openflow/include/python3.8/internal/pycore_initconfig.h b/openflow/include/python3.8/internal/pycore_initconfig.h
new file mode 100644
index 0000000..40831c4
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_initconfig.h
@@ -0,0 +1,166 @@
+#ifndef Py_INTERNAL_CORECONFIG_H
+#define Py_INTERNAL_CORECONFIG_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "pycore_pystate.h"   /* _PyRuntimeState */
+
+/* --- PyStatus ----------------------------------------------- */
+
+/* Almost all errors causing Python initialization to fail */
+#ifdef _MSC_VER
+   /* Visual Studio 2015 doesn't implement C99 __func__ in C */
+#  define _PyStatus_GET_FUNC() __FUNCTION__
+#else
+#  define _PyStatus_GET_FUNC() __func__
+#endif
+
+#define _PyStatus_OK() \
+    (PyStatus){._type = _PyStatus_TYPE_OK,}
+    /* other fields are set to 0 */
+#define _PyStatus_ERR(ERR_MSG) \
+    (PyStatus){ \
+        ._type = _PyStatus_TYPE_ERROR, \
+        .func = _PyStatus_GET_FUNC(), \
+        .err_msg = (ERR_MSG)}
+        /* other fields are set to 0 */
+#define _PyStatus_NO_MEMORY() _PyStatus_ERR("memory allocation failed")
+#define _PyStatus_EXIT(EXITCODE) \
+    (PyStatus){ \
+        ._type = _PyStatus_TYPE_EXIT, \
+        .exitcode = (EXITCODE)}
+#define _PyStatus_IS_ERROR(err) \
+    (err._type == _PyStatus_TYPE_ERROR)
+#define _PyStatus_IS_EXIT(err) \
+    (err._type == _PyStatus_TYPE_EXIT)
+#define _PyStatus_EXCEPTION(err) \
+    (err._type != _PyStatus_TYPE_OK)
+#define _PyStatus_UPDATE_FUNC(err) \
+    do { err.func = _PyStatus_GET_FUNC(); } while (0)
+
+/* --- PyWideStringList ------------------------------------------------ */
+
+#define _PyWideStringList_INIT (PyWideStringList){.length = 0, .items = NULL}
+
+#ifndef NDEBUG
+PyAPI_FUNC(int) _PyWideStringList_CheckConsistency(const PyWideStringList *list);
+#endif
+PyAPI_FUNC(void) _PyWideStringList_Clear(PyWideStringList *list);
+PyAPI_FUNC(int) _PyWideStringList_Copy(PyWideStringList *list,
+    const PyWideStringList *list2);
+PyAPI_FUNC(PyStatus) _PyWideStringList_Extend(PyWideStringList *list,
+    const PyWideStringList *list2);
+PyAPI_FUNC(PyObject*) _PyWideStringList_AsList(const PyWideStringList *list);
+
+
+/* --- _PyArgv ---------------------------------------------------- */
+
+typedef struct {
+    Py_ssize_t argc;
+    int use_bytes_argv;
+    char * const *bytes_argv;
+    wchar_t * const *wchar_argv;
+} _PyArgv;
+
+PyAPI_FUNC(PyStatus) _PyArgv_AsWstrList(const _PyArgv *args,
+    PyWideStringList *list);
+
+
+/* --- Helper functions ------------------------------------------- */
+
+PyAPI_FUNC(int) _Py_str_to_int(
+    const char *str,
+    int *result);
+PyAPI_FUNC(const wchar_t*) _Py_get_xoption(
+    const PyWideStringList *xoptions,
+    const wchar_t *name);
+PyAPI_FUNC(const char*) _Py_GetEnv(
+    int use_environment,
+    const char *name);
+PyAPI_FUNC(void) _Py_get_env_flag(
+    int use_environment,
+    int *flag,
+    const char *name);
+
+/* Py_GetArgcArgv() helper */
+PyAPI_FUNC(void) _Py_ClearArgcArgv(void);
+
+
+/* --- _PyPreCmdline ------------------------------------------------- */
+
+typedef struct {
+    PyWideStringList argv;
+    PyWideStringList xoptions;     /* "-X value" option */
+    int isolated;             /* -I option */
+    int use_environment;      /* -E option */
+    int dev_mode;             /* -X dev and PYTHONDEVMODE */
+} _PyPreCmdline;
+
+#define _PyPreCmdline_INIT \
+    (_PyPreCmdline){ \
+        .use_environment = -1, \
+        .isolated = -1, \
+        .dev_mode = -1}
+/* Note: _PyPreCmdline_INIT sets other fields to 0/NULL */
+
+extern void _PyPreCmdline_Clear(_PyPreCmdline *cmdline);
+extern PyStatus _PyPreCmdline_SetArgv(_PyPreCmdline *cmdline,
+    const _PyArgv *args);
+extern PyStatus _PyPreCmdline_SetConfig(
+    const _PyPreCmdline *cmdline,
+    PyConfig *config);
+extern PyStatus _PyPreCmdline_Read(_PyPreCmdline *cmdline,
+    const PyPreConfig *preconfig);
+
+
+/* --- PyPreConfig ----------------------------------------------- */
+
+PyAPI_FUNC(void) _PyPreConfig_InitCompatConfig(PyPreConfig *preconfig);
+extern void _PyPreConfig_InitFromConfig(
+    PyPreConfig *preconfig,
+    const PyConfig *config);
+extern PyStatus _PyPreConfig_InitFromPreConfig(
+    PyPreConfig *preconfig,
+    const PyPreConfig *config2);
+extern PyObject* _PyPreConfig_AsDict(const PyPreConfig *preconfig);
+extern void _PyPreConfig_GetConfig(PyPreConfig *preconfig,
+    const PyConfig *config);
+extern PyStatus _PyPreConfig_Read(PyPreConfig *preconfig,
+    const _PyArgv *args);
+extern PyStatus _PyPreConfig_Write(const PyPreConfig *preconfig);
+
+
+/* --- PyConfig ---------------------------------------------- */
+
+typedef enum {
+    /* Py_Initialize() API: backward compatibility with Python 3.6 and 3.7 */
+    _PyConfig_INIT_COMPAT = 1,
+    _PyConfig_INIT_PYTHON = 2,
+    _PyConfig_INIT_ISOLATED = 3
+} _PyConfigInitEnum;
+
+PyAPI_FUNC(void) _PyConfig_InitCompatConfig(PyConfig *config);
+extern PyStatus _PyConfig_Copy(
+    PyConfig *config,
+    const PyConfig *config2);
+extern PyStatus _PyConfig_InitPathConfig(PyConfig *config);
+extern void _PyConfig_Write(const PyConfig *config,
+    _PyRuntimeState *runtime);
+extern PyStatus _PyConfig_SetPyArgv(
+    PyConfig *config,
+    const _PyArgv *args);
+
+
+/* --- Function used for testing ---------------------------------- */
+
+PyAPI_FUNC(PyObject*) _Py_GetConfigsAsDict(void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_CORECONFIG_H */
diff --git a/openflow/include/python3.8/internal/pycore_object.h b/openflow/include/python3.8/internal/pycore_object.h
new file mode 100644
index 0000000..7418c69
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_object.h
@@ -0,0 +1,81 @@
+#ifndef Py_INTERNAL_OBJECT_H
+#define Py_INTERNAL_OBJECT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "pycore_pystate.h"   /* _PyRuntime */
+
+PyAPI_FUNC(int) _PyType_CheckConsistency(PyTypeObject *type);
+PyAPI_FUNC(int) _PyDict_CheckConsistency(PyObject *mp, int check_content);
+
+/* Tell the GC to track this object.
+ *
+ * NB: While the object is tracked by the collector, it must be safe to call the
+ * ob_traverse method.
+ *
+ * Internal note: _PyRuntime.gc.generation0->_gc_prev doesn't have any bit flags
+ * because it's not object header.  So we don't use _PyGCHead_PREV() and
+ * _PyGCHead_SET_PREV() for it to avoid unnecessary bitwise operations.
+ *
+ * The PyObject_GC_Track() function is the public version of this macro.
+ */
+static inline void _PyObject_GC_TRACK_impl(const char *filename, int lineno,
+                                           PyObject *op)
+{
+    _PyObject_ASSERT_FROM(op, !_PyObject_GC_IS_TRACKED(op),
+                          "object already tracked by the garbage collector",
+                          filename, lineno, "_PyObject_GC_TRACK");
+
+    PyGC_Head *gc = _Py_AS_GC(op);
+    _PyObject_ASSERT_FROM(op,
+                          (gc->_gc_prev & _PyGC_PREV_MASK_COLLECTING) == 0,
+                          "object is in generation which is garbage collected",
+                          filename, lineno, "_PyObject_GC_TRACK");
+
+    PyGC_Head *last = (PyGC_Head*)(_PyRuntime.gc.generation0->_gc_prev);
+    _PyGCHead_SET_NEXT(last, gc);
+    _PyGCHead_SET_PREV(gc, last);
+    _PyGCHead_SET_NEXT(gc, _PyRuntime.gc.generation0);
+    _PyRuntime.gc.generation0->_gc_prev = (uintptr_t)gc;
+}
+
+#define _PyObject_GC_TRACK(op) \
+    _PyObject_GC_TRACK_impl(__FILE__, __LINE__, _PyObject_CAST(op))
+
+/* Tell the GC to stop tracking this object.
+ *
+ * Internal note: This may be called while GC. So _PyGC_PREV_MASK_COLLECTING
+ * must be cleared. But _PyGC_PREV_MASK_FINALIZED bit is kept.
+ *
+ * The object must be tracked by the GC.
+ *
+ * The PyObject_GC_UnTrack() function is the public version of this macro.
+ */
+static inline void _PyObject_GC_UNTRACK_impl(const char *filename, int lineno,
+                                             PyObject *op)
+{
+    _PyObject_ASSERT_FROM(op, _PyObject_GC_IS_TRACKED(op),
+                          "object not tracked by the garbage collector",
+                          filename, lineno, "_PyObject_GC_UNTRACK");
+
+    PyGC_Head *gc = _Py_AS_GC(op);
+    PyGC_Head *prev = _PyGCHead_PREV(gc);
+    PyGC_Head *next = _PyGCHead_NEXT(gc);
+    _PyGCHead_SET_NEXT(prev, next);
+    _PyGCHead_SET_PREV(next, prev);
+    gc->_gc_next = 0;
+    gc->_gc_prev &= _PyGC_PREV_MASK_FINALIZED;
+}
+
+#define _PyObject_GC_UNTRACK(op) \
+    _PyObject_GC_UNTRACK_impl(__FILE__, __LINE__, _PyObject_CAST(op))
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_OBJECT_H */
diff --git a/openflow/include/python3.8/internal/pycore_pathconfig.h b/openflow/include/python3.8/internal/pycore_pathconfig.h
new file mode 100644
index 0000000..ce75cce
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_pathconfig.h
@@ -0,0 +1,75 @@
+#ifndef Py_INTERNAL_PATHCONFIG_H
+#define Py_INTERNAL_PATHCONFIG_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+typedef struct _PyPathConfig {
+    /* Full path to the Python program */
+    wchar_t *program_full_path;
+    wchar_t *prefix;
+    wchar_t *exec_prefix;
+    /* Set by Py_SetPath(), or computed by _PyConfig_InitPathConfig() */
+    wchar_t *module_search_path;
+    /* Python program name */
+    wchar_t *program_name;
+    /* Set by Py_SetPythonHome() or PYTHONHOME environment variable */
+    wchar_t *home;
+#ifdef MS_WINDOWS
+    /* isolated and site_import are used to set Py_IsolatedFlag and
+       Py_NoSiteFlag flags on Windows in read_pth_file(). These fields
+       are ignored when their value are equal to -1 (unset). */
+    int isolated;
+    int site_import;
+    /* Set when a venv is detected */
+    wchar_t *base_executable;
+#endif
+} _PyPathConfig;
+
+#ifdef MS_WINDOWS
+#  define _PyPathConfig_INIT \
+      {.module_search_path = NULL, \
+       .isolated = -1, \
+       .site_import = -1}
+#else
+#  define _PyPathConfig_INIT \
+      {.module_search_path = NULL}
+#endif
+/* Note: _PyPathConfig_INIT sets other fields to 0/NULL */
+
+PyAPI_DATA(_PyPathConfig) _Py_path_config;
+#ifdef MS_WINDOWS
+PyAPI_DATA(wchar_t*) _Py_dll_path;
+#endif
+
+extern void _PyPathConfig_ClearGlobal(void);
+extern PyStatus _PyPathConfig_SetGlobal(
+    const struct _PyPathConfig *pathconfig);
+
+extern PyStatus _PyPathConfig_Calculate(
+    _PyPathConfig *pathconfig,
+    const PyConfig *config);
+extern int _PyPathConfig_ComputeSysPath0(
+    const PyWideStringList *argv,
+    PyObject **path0);
+extern int _Py_FindEnvConfigValue(
+    FILE *env_file,
+    const wchar_t *key,
+    wchar_t *value,
+    size_t value_size);
+
+#ifdef MS_WINDOWS
+extern wchar_t* _Py_GetDLLPath(void);
+#endif
+
+extern PyStatus _PyConfig_WritePathConfig(const PyConfig *config);
+extern void _Py_DumpPathConfig(PyThreadState *tstate);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_PATHCONFIG_H */
diff --git a/openflow/include/python3.8/internal/pycore_pyerrors.h b/openflow/include/python3.8/internal/pycore_pyerrors.h
new file mode 100644
index 0000000..23327ef
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_pyerrors.h
@@ -0,0 +1,62 @@
+#ifndef Py_INTERNAL_PYERRORS_H
+#define Py_INTERNAL_PYERRORS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+static inline PyObject* _PyErr_Occurred(PyThreadState *tstate)
+{
+    return tstate == NULL ? NULL : tstate->curexc_type;
+}
+
+
+PyAPI_FUNC(void) _PyErr_Fetch(
+    PyThreadState *tstate,
+    PyObject **type,
+    PyObject **value,
+    PyObject **traceback);
+
+PyAPI_FUNC(int) _PyErr_ExceptionMatches(
+    PyThreadState *tstate,
+    PyObject *exc);
+
+PyAPI_FUNC(void) _PyErr_Restore(
+    PyThreadState *tstate,
+    PyObject *type,
+    PyObject *value,
+    PyObject *traceback);
+
+PyAPI_FUNC(void) _PyErr_SetObject(
+    PyThreadState *tstate,
+    PyObject *type,
+    PyObject *value);
+
+PyAPI_FUNC(void) _PyErr_Clear(PyThreadState *tstate);
+
+PyAPI_FUNC(void) _PyErr_SetNone(PyThreadState *tstate, PyObject *exception);
+
+PyAPI_FUNC(void) _PyErr_SetString(
+    PyThreadState *tstate,
+    PyObject *exception,
+    const char *string);
+
+PyAPI_FUNC(PyObject *) _PyErr_Format(
+    PyThreadState *tstate,
+    PyObject *exception,
+    const char *format,
+    ...);
+
+PyAPI_FUNC(void) _PyErr_NormalizeException(
+    PyThreadState *tstate,
+    PyObject **exc,
+    PyObject **val,
+    PyObject **tb);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_PYERRORS_H */
diff --git a/openflow/include/python3.8/internal/pycore_pyhash.h b/openflow/include/python3.8/internal/pycore_pyhash.h
new file mode 100644
index 0000000..a229f8d
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_pyhash.h
@@ -0,0 +1,10 @@
+#ifndef Py_INTERNAL_HASH_H
+#define Py_INTERNAL_HASH_H
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+uint64_t _Py_KeyedHash(uint64_t, const char *, Py_ssize_t);
+
+#endif
diff --git a/openflow/include/python3.8/internal/pycore_pylifecycle.h b/openflow/include/python3.8/internal/pycore_pylifecycle.h
new file mode 100644
index 0000000..d4f0ae2
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_pylifecycle.h
@@ -0,0 +1,116 @@
+#ifndef Py_INTERNAL_LIFECYCLE_H
+#define Py_INTERNAL_LIFECYCLE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "pycore_initconfig.h"   /* _PyArgv */
+#include "pycore_pystate.h"      /* _PyRuntimeState */
+
+/* True if the main interpreter thread exited due to an unhandled
+ * KeyboardInterrupt exception, suggesting the user pressed ^C. */
+PyAPI_DATA(int) _Py_UnhandledKeyboardInterrupt;
+
+extern int _Py_SetFileSystemEncoding(
+    const char *encoding,
+    const char *errors);
+extern void _Py_ClearFileSystemEncoding(void);
+extern PyStatus _PyUnicode_InitEncodings(PyThreadState *tstate);
+#ifdef MS_WINDOWS
+extern int _PyUnicode_EnableLegacyWindowsFSEncoding(void);
+#endif
+
+PyAPI_FUNC(void) _Py_ClearStandardStreamEncoding(void);
+
+PyAPI_FUNC(int) _Py_IsLocaleCoercionTarget(const char *ctype_loc);
+
+/* Various one-time initializers */
+
+extern PyStatus _PyUnicode_Init(void);
+extern int _PyStructSequence_Init(void);
+extern int _PyLong_Init(void);
+extern PyStatus _PyFaulthandler_Init(int enable);
+extern int _PyTraceMalloc_Init(int enable);
+extern PyObject * _PyBuiltin_Init(void);
+extern PyStatus _PySys_Create(
+    _PyRuntimeState *runtime,
+    PyInterpreterState *interp,
+    PyObject **sysmod_p);
+extern PyStatus _PySys_SetPreliminaryStderr(PyObject *sysdict);
+extern PyStatus _PySys_ReadPreinitWarnOptions(PyWideStringList *options);
+extern PyStatus _PySys_ReadPreinitXOptions(PyConfig *config);
+extern int _PySys_InitMain(
+    _PyRuntimeState *runtime,
+    PyInterpreterState *interp);
+extern PyStatus _PyImport_Init(PyInterpreterState *interp);
+extern PyStatus _PyExc_Init(void);
+extern PyStatus _PyErr_Init(void);
+extern PyStatus _PyBuiltins_AddExceptions(PyObject * bltinmod);
+extern PyStatus _PyImportHooks_Init(void);
+extern int _PyFloat_Init(void);
+extern PyStatus _Py_HashRandomization_Init(const PyConfig *);
+
+extern PyStatus _PyTypes_Init(void);
+extern PyStatus _PyImportZip_Init(PyInterpreterState *interp);
+
+
+/* Various internal finalizers */
+
+extern void PyMethod_Fini(void);
+extern void PyFrame_Fini(void);
+extern void PyCFunction_Fini(void);
+extern void PyDict_Fini(void);
+extern void PyTuple_Fini(void);
+extern void PyList_Fini(void);
+extern void PySet_Fini(void);
+extern void PyBytes_Fini(void);
+extern void PyFloat_Fini(void);
+extern void PyOS_FiniInterrupts(void);
+extern void PySlice_Fini(void);
+extern void PyAsyncGen_Fini(void);
+
+extern void _PyExc_Fini(void);
+extern void _PyImport_Fini(void);
+extern void _PyImport_Fini2(void);
+extern void _PyGC_Fini(_PyRuntimeState *runtime);
+extern void _PyType_Fini(void);
+extern void _Py_HashRandomization_Fini(void);
+extern void _PyUnicode_Fini(void);
+extern void PyLong_Fini(void);
+extern void _PyFaulthandler_Fini(void);
+extern void _PyHash_Fini(void);
+extern void _PyTraceMalloc_Fini(void);
+extern void _PyWarnings_Fini(PyInterpreterState *interp);
+
+extern void _PyGILState_Init(
+    _PyRuntimeState *runtime,
+    PyInterpreterState *interp,
+    PyThreadState *tstate);
+extern void _PyGILState_Fini(_PyRuntimeState *runtime);
+
+PyAPI_FUNC(void) _PyGC_DumpShutdownStats(_PyRuntimeState *runtime);
+
+PyAPI_FUNC(PyStatus) _Py_PreInitializeFromPyArgv(
+    const PyPreConfig *src_config,
+    const _PyArgv *args);
+PyAPI_FUNC(PyStatus) _Py_PreInitializeFromConfig(
+    const PyConfig *config,
+    const _PyArgv *args);
+
+
+PyAPI_FUNC(int) _Py_HandleSystemExit(int *exitcode_p);
+
+PyAPI_FUNC(PyObject*) _PyErr_WriteUnraisableDefaultHook(PyObject *unraisable);
+
+PyAPI_FUNC(void) _PyErr_Print(PyThreadState *tstate);
+PyAPI_FUNC(void) _PyErr_Display(PyObject *file, PyObject *exception,
+                                PyObject *value, PyObject *tb);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_LIFECYCLE_H */
diff --git a/openflow/include/python3.8/internal/pycore_pymem.h b/openflow/include/python3.8/internal/pycore_pymem.h
new file mode 100644
index 0000000..22677d3
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_pymem.h
@@ -0,0 +1,194 @@
+#ifndef Py_INTERNAL_PYMEM_H
+#define Py_INTERNAL_PYMEM_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "objimpl.h"
+#include "pymem.h"
+
+
+/* GC runtime state */
+
+/* If we change this, we need to change the default value in the
+   signature of gc.collect. */
+#define NUM_GENERATIONS 3
+
+/*
+   NOTE: about the counting of long-lived objects.
+
+   To limit the cost of garbage collection, there are two strategies;
+     - make each collection faster, e.g. by scanning fewer objects
+     - do less collections
+   This heuristic is about the latter strategy.
+
+   In addition to the various configurable thresholds, we only trigger a
+   full collection if the ratio
+    long_lived_pending / long_lived_total
+   is above a given value (hardwired to 25%).
+
+   The reason is that, while "non-full" collections (i.e., collections of
+   the young and middle generations) will always examine roughly the same
+   number of objects -- determined by the aforementioned thresholds --,
+   the cost of a full collection is proportional to the total number of
+   long-lived objects, which is virtually unbounded.
+
+   Indeed, it has been remarked that doing a full collection every
+   <constant number> of object creations entails a dramatic performance
+   degradation in workloads which consist in creating and storing lots of
+   long-lived objects (e.g. building a large list of GC-tracked objects would
+   show quadratic performance, instead of linear as expected: see issue #4074).
+
+   Using the above ratio, instead, yields amortized linear performance in
+   the total number of objects (the effect of which can be summarized
+   thusly: "each full garbage collection is more and more costly as the
+   number of objects grows, but we do fewer and fewer of them").
+
+   This heuristic was suggested by Martin von Löwis on python-dev in
+   June 2008. His original analysis and proposal can be found at:
+    http://mail.python.org/pipermail/python-dev/2008-June/080579.html
+*/
+
+/*
+   NOTE: about untracking of mutable objects.
+
+   Certain types of container cannot participate in a reference cycle, and
+   so do not need to be tracked by the garbage collector. Untracking these
+   objects reduces the cost of garbage collections. However, determining
+   which objects may be untracked is not free, and the costs must be
+   weighed against the benefits for garbage collection.
+
+   There are two possible strategies for when to untrack a container:
+
+   i) When the container is created.
+   ii) When the container is examined by the garbage collector.
+
+   Tuples containing only immutable objects (integers, strings etc, and
+   recursively, tuples of immutable objects) do not need to be tracked.
+   The interpreter creates a large number of tuples, many of which will
+   not survive until garbage collection. It is therefore not worthwhile
+   to untrack eligible tuples at creation time.
+
+   Instead, all tuples except the empty tuple are tracked when created.
+   During garbage collection it is determined whether any surviving tuples
+   can be untracked. A tuple can be untracked if all of its contents are
+   already not tracked. Tuples are examined for untracking in all garbage
+   collection cycles. It may take more than one cycle to untrack a tuple.
+
+   Dictionaries containing only immutable objects also do not need to be
+   tracked. Dictionaries are untracked when created. If a tracked item is
+   inserted into a dictionary (either as a key or value), the dictionary
+   becomes tracked. During a full garbage collection (all generations),
+   the collector will untrack any dictionaries whose contents are not
+   tracked.
+
+   The module provides the python function is_tracked(obj), which returns
+   the CURRENT tracking status of the object. Subsequent garbage
+   collections may change the tracking status of the object.
+
+   Untracking of certain containers was introduced in issue #4688, and
+   the algorithm was refined in response to issue #14775.
+*/
+
+struct gc_generation {
+    PyGC_Head head;
+    int threshold; /* collection threshold */
+    int count; /* count of allocations or collections of younger
+                  generations */
+};
+
+/* Running stats per generation */
+struct gc_generation_stats {
+    /* total number of collections */
+    Py_ssize_t collections;
+    /* total number of collected objects */
+    Py_ssize_t collected;
+    /* total number of uncollectable objects (put into gc.garbage) */
+    Py_ssize_t uncollectable;
+};
+
+struct _gc_runtime_state {
+    /* List of objects that still need to be cleaned up, singly linked
+     * via their gc headers' gc_prev pointers.  */
+    PyObject *trash_delete_later;
+    /* Current call-stack depth of tp_dealloc calls. */
+    int trash_delete_nesting;
+
+    int enabled;
+    int debug;
+    /* linked lists of container objects */
+    struct gc_generation generations[NUM_GENERATIONS];
+    PyGC_Head *generation0;
+    /* a permanent generation which won't be collected */
+    struct gc_generation permanent_generation;
+    struct gc_generation_stats generation_stats[NUM_GENERATIONS];
+    /* true if we are currently running the collector */
+    int collecting;
+    /* list of uncollectable objects */
+    PyObject *garbage;
+    /* a list of callbacks to be invoked when collection is performed */
+    PyObject *callbacks;
+    /* This is the number of objects that survived the last full
+       collection. It approximates the number of long lived objects
+       tracked by the GC.
+
+       (by "full collection", we mean a collection of the oldest
+       generation). */
+    Py_ssize_t long_lived_total;
+    /* This is the number of objects that survived all "non-full"
+       collections, and are awaiting to undergo a full collection for
+       the first time. */
+    Py_ssize_t long_lived_pending;
+};
+
+PyAPI_FUNC(void) _PyGC_Initialize(struct _gc_runtime_state *);
+
+
+/* Set the memory allocator of the specified domain to the default.
+   Save the old allocator into *old_alloc if it's non-NULL.
+   Return on success, or return -1 if the domain is unknown. */
+PyAPI_FUNC(int) _PyMem_SetDefaultAllocator(
+    PyMemAllocatorDomain domain,
+    PyMemAllocatorEx *old_alloc);
+
+/* Heuristic checking if a pointer value is newly allocated
+   (uninitialized) or newly freed. The pointer is not dereferenced, only the
+   pointer value is checked.
+
+   The heuristic relies on the debug hooks on Python memory allocators which
+   fills newly allocated memory with CLEANBYTE (0xCD) and newly freed memory
+   with DEADBYTE (0xDD). Detect also "untouchable bytes" marked
+   with FORBIDDENBYTE (0xFD). */
+static inline int _PyMem_IsPtrFreed(void *ptr)
+{
+    uintptr_t value = (uintptr_t)ptr;
+#if SIZEOF_VOID_P == 8
+    return (value == (uintptr_t)0xCDCDCDCDCDCDCDCD
+            || value == (uintptr_t)0xDDDDDDDDDDDDDDDD
+            || value == (uintptr_t)0xFDFDFDFDFDFDFDFD);
+#elif SIZEOF_VOID_P == 4
+    return (value == (uintptr_t)0xCDCDCDCD
+            || value == (uintptr_t)0xDDDDDDDD
+            || value == (uintptr_t)0xFDFDFDFD);
+#else
+#  error "unknown pointer size"
+#endif
+}
+
+PyAPI_FUNC(int) _PyMem_GetAllocatorName(
+    const char *name,
+    PyMemAllocatorName *allocator);
+
+/* Configure the Python memory allocators.
+   Pass PYMEM_ALLOCATOR_DEFAULT to use default allocators.
+   PYMEM_ALLOCATOR_NOT_SET does nothing. */
+PyAPI_FUNC(int) _PyMem_SetupAllocators(PyMemAllocatorName allocator);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_PYMEM_H */
diff --git a/openflow/include/python3.8/internal/pycore_pystate.h b/openflow/include/python3.8/internal/pycore_pystate.h
new file mode 100644
index 0000000..f90e7e1
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_pystate.h
@@ -0,0 +1,323 @@
+#ifndef Py_INTERNAL_PYSTATE_H
+#define Py_INTERNAL_PYSTATE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "cpython/initconfig.h"
+#include "fileobject.h"
+#include "pystate.h"
+#include "pythread.h"
+#include "sysmodule.h"
+
+#include "pycore_gil.h"   /* _gil_runtime_state  */
+#include "pycore_pathconfig.h"
+#include "pycore_pymem.h"
+#include "pycore_warnings.h"
+
+
+/* ceval state */
+
+struct _pending_calls {
+    int finishing;
+    PyThread_type_lock lock;
+    /* Request for running pending calls. */
+    _Py_atomic_int calls_to_do;
+    /* Request for looking at the `async_exc` field of the current
+       thread state.
+       Guarded by the GIL. */
+    int async_exc;
+#define NPENDINGCALLS 32
+    struct {
+        int (*func)(void *);
+        void *arg;
+    } calls[NPENDINGCALLS];
+    int first;
+    int last;
+};
+
+struct _ceval_runtime_state {
+    int recursion_limit;
+    /* Records whether tracing is on for any thread.  Counts the number
+       of threads for which tstate->c_tracefunc is non-NULL, so if the
+       value is 0, we know we don't have to check this thread's
+       c_tracefunc.  This speeds up the if statement in
+       PyEval_EvalFrameEx() after fast_next_opcode. */
+    int tracing_possible;
+    /* This single variable consolidates all requests to break out of
+       the fast path in the eval loop. */
+    _Py_atomic_int eval_breaker;
+    /* Request for dropping the GIL */
+    _Py_atomic_int gil_drop_request;
+    struct _pending_calls pending;
+    /* Request for checking signals. */
+    _Py_atomic_int signals_pending;
+    struct _gil_runtime_state gil;
+};
+
+/* interpreter state */
+
+typedef PyObject* (*_PyFrameEvalFunction)(struct _frame *, int);
+
+// The PyInterpreterState typedef is in Include/pystate.h.
+struct _is {
+
+    struct _is *next;
+    struct _ts *tstate_head;
+
+    int64_t id;
+    int64_t id_refcount;
+    int requires_idref;
+    PyThread_type_lock id_mutex;
+
+    int finalizing;
+
+    PyObject *modules;
+    PyObject *modules_by_index;
+    PyObject *sysdict;
+    PyObject *builtins;
+    PyObject *importlib;
+
+    /* Used in Python/sysmodule.c. */
+    int check_interval;
+
+    /* Used in Modules/_threadmodule.c. */
+    long num_threads;
+    /* Support for runtime thread stack size tuning.
+       A value of 0 means using the platform's default stack size
+       or the size specified by the THREAD_STACK_SIZE macro. */
+    /* Used in Python/thread.c. */
+    size_t pythread_stacksize;
+
+    PyObject *codec_search_path;
+    PyObject *codec_search_cache;
+    PyObject *codec_error_registry;
+    int codecs_initialized;
+
+    /* fs_codec.encoding is initialized to NULL.
+       Later, it is set to a non-NULL string by _PyUnicode_InitEncodings(). */
+    struct {
+        char *encoding;   /* Filesystem encoding (encoded to UTF-8) */
+        char *errors;     /* Filesystem errors (encoded to UTF-8) */
+        _Py_error_handler error_handler;
+    } fs_codec;
+
+    PyConfig config;
+#ifdef HAVE_DLOPEN
+    int dlopenflags;
+#endif
+
+    PyObject *dict;  /* Stores per-interpreter state */
+
+    PyObject *builtins_copy;
+    PyObject *import_func;
+    /* Initialized to PyEval_EvalFrameDefault(). */
+    _PyFrameEvalFunction eval_frame;
+
+    Py_ssize_t co_extra_user_count;
+    freefunc co_extra_freefuncs[MAX_CO_EXTRA_USERS];
+
+#ifdef HAVE_FORK
+    PyObject *before_forkers;
+    PyObject *after_forkers_parent;
+    PyObject *after_forkers_child;
+#endif
+    /* AtExit module */
+    void (*pyexitfunc)(PyObject *);
+    PyObject *pyexitmodule;
+
+    uint64_t tstate_next_unique_id;
+
+    struct _warnings_runtime_state warnings;
+
+    PyObject *audit_hooks;
+};
+
+PyAPI_FUNC(struct _is*) _PyInterpreterState_LookUpID(PY_INT64_T);
+
+PyAPI_FUNC(int) _PyInterpreterState_IDInitref(struct _is *);
+PyAPI_FUNC(void) _PyInterpreterState_IDIncref(struct _is *);
+PyAPI_FUNC(void) _PyInterpreterState_IDDecref(struct _is *);
+
+
+/* cross-interpreter data registry */
+
+/* For now we use a global registry of shareable classes.  An
+   alternative would be to add a tp_* slot for a class's
+   crossinterpdatafunc. It would be simpler and more efficient. */
+
+struct _xidregitem;
+
+struct _xidregitem {
+    PyTypeObject *cls;
+    crossinterpdatafunc getdata;
+    struct _xidregitem *next;
+};
+
+/* runtime audit hook state */
+
+typedef struct _Py_AuditHookEntry {
+    struct _Py_AuditHookEntry *next;
+    Py_AuditHookFunction hookCFunction;
+    void *userData;
+} _Py_AuditHookEntry;
+
+/* GIL state */
+
+struct _gilstate_runtime_state {
+    int check_enabled;
+    /* Assuming the current thread holds the GIL, this is the
+       PyThreadState for the current thread. */
+    _Py_atomic_address tstate_current;
+    PyThreadFrameGetter getframe;
+    /* The single PyInterpreterState used by this process'
+       GILState implementation
+    */
+    /* TODO: Given interp_main, it may be possible to kill this ref */
+    PyInterpreterState *autoInterpreterState;
+    Py_tss_t autoTSSkey;
+};
+
+/* hook for PyEval_GetFrame(), requested for Psyco */
+#define _PyThreadState_GetFrame _PyRuntime.gilstate.getframe
+
+/* Issue #26558: Flag to disable PyGILState_Check().
+   If set to non-zero, PyGILState_Check() always return 1. */
+#define _PyGILState_check_enabled _PyRuntime.gilstate.check_enabled
+
+
+/* Full Python runtime state */
+
+typedef struct pyruntimestate {
+    /* Is running Py_PreInitialize()? */
+    int preinitializing;
+
+    /* Is Python preinitialized? Set to 1 by Py_PreInitialize() */
+    int preinitialized;
+
+    /* Is Python core initialized? Set to 1 by _Py_InitializeCore() */
+    int core_initialized;
+
+    /* Is Python fully initialized? Set to 1 by Py_Initialize() */
+    int initialized;
+
+    /* Set by Py_FinalizeEx(). Only reset to NULL if Py_Initialize()
+       is called again. */
+    PyThreadState *finalizing;
+
+    struct pyinterpreters {
+        PyThread_type_lock mutex;
+        PyInterpreterState *head;
+        PyInterpreterState *main;
+        /* _next_interp_id is an auto-numbered sequence of small
+           integers.  It gets initialized in _PyInterpreterState_Init(),
+           which is called in Py_Initialize(), and used in
+           PyInterpreterState_New().  A negative interpreter ID
+           indicates an error occurred.  The main interpreter will
+           always have an ID of 0.  Overflow results in a RuntimeError.
+           If that becomes a problem later then we can adjust, e.g. by
+           using a Python int. */
+        int64_t next_id;
+    } interpreters;
+    // XXX Remove this field once we have a tp_* slot.
+    struct _xidregistry {
+        PyThread_type_lock mutex;
+        struct _xidregitem *head;
+    } xidregistry;
+
+    unsigned long main_thread;
+
+#define NEXITFUNCS 32
+    void (*exitfuncs[NEXITFUNCS])(void);
+    int nexitfuncs;
+
+    struct _gc_runtime_state gc;
+    struct _ceval_runtime_state ceval;
+    struct _gilstate_runtime_state gilstate;
+
+    PyPreConfig preconfig;
+
+    Py_OpenCodeHookFunction open_code_hook;
+    void *open_code_userdata;
+    _Py_AuditHookEntry *audit_hook_head;
+
+    // XXX Consolidate globals found via the check-c-globals script.
+} _PyRuntimeState;
+
+#define _PyRuntimeState_INIT \
+    {.preinitialized = 0, .core_initialized = 0, .initialized = 0}
+/* Note: _PyRuntimeState_INIT sets other fields to 0/NULL */
+
+PyAPI_DATA(_PyRuntimeState) _PyRuntime;
+PyAPI_FUNC(PyStatus) _PyRuntimeState_Init(_PyRuntimeState *runtime);
+PyAPI_FUNC(void) _PyRuntimeState_Fini(_PyRuntimeState *runtime);
+PyAPI_FUNC(void) _PyRuntimeState_ReInitThreads(_PyRuntimeState *runtime);
+
+/* Initialize _PyRuntimeState.
+   Return NULL on success, or return an error message on failure. */
+PyAPI_FUNC(PyStatus) _PyRuntime_Initialize(void);
+
+PyAPI_FUNC(void) _PyRuntime_Finalize(void);
+
+#define _Py_CURRENTLY_FINALIZING(runtime, tstate) \
+    (runtime->finalizing == tstate)
+
+
+/* Variable and macro for in-line access to current thread
+   and interpreter state */
+
+#define _PyRuntimeState_GetThreadState(runtime) \
+    ((PyThreadState*)_Py_atomic_load_relaxed(&(runtime)->gilstate.tstate_current))
+
+/* Get the current Python thread state.
+
+   Efficient macro reading directly the 'gilstate.tstate_current' atomic
+   variable. The macro is unsafe: it does not check for error and it can
+   return NULL.
+
+   The caller must hold the GIL.
+
+   See also PyThreadState_Get() and PyThreadState_GET(). */
+#define _PyThreadState_GET() _PyRuntimeState_GetThreadState(&_PyRuntime)
+
+/* Redefine PyThreadState_GET() as an alias to _PyThreadState_GET() */
+#undef PyThreadState_GET
+#define PyThreadState_GET() _PyThreadState_GET()
+
+/* Get the current interpreter state.
+
+   The macro is unsafe: it does not check for error and it can return NULL.
+
+   The caller must hold the GIL.
+
+   See also _PyInterpreterState_Get()
+   and _PyGILState_GetInterpreterStateUnsafe(). */
+#define _PyInterpreterState_GET_UNSAFE() (_PyThreadState_GET()->interp)
+
+
+/* Other */
+
+PyAPI_FUNC(void) _PyThreadState_Init(
+    _PyRuntimeState *runtime,
+    PyThreadState *tstate);
+PyAPI_FUNC(void) _PyThreadState_DeleteExcept(
+    _PyRuntimeState *runtime,
+    PyThreadState *tstate);
+
+PyAPI_FUNC(PyThreadState *) _PyThreadState_Swap(
+    struct _gilstate_runtime_state *gilstate,
+    PyThreadState *newts);
+
+PyAPI_FUNC(PyStatus) _PyInterpreterState_Enable(_PyRuntimeState *runtime);
+PyAPI_FUNC(void) _PyInterpreterState_DeleteExceptMain(_PyRuntimeState *runtime);
+
+PyAPI_FUNC(void) _PyGILState_Reinit(_PyRuntimeState *runtime);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_PYSTATE_H */
diff --git a/openflow/include/python3.8/internal/pycore_traceback.h b/openflow/include/python3.8/internal/pycore_traceback.h
new file mode 100644
index 0000000..bf4d7fe
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_traceback.h
@@ -0,0 +1,96 @@
+#ifndef Py_INTERNAL_TRACEBACK_H
+#define Py_INTERNAL_TRACEBACK_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "pystate.h"   /* PyInterpreterState */
+
+/* Write the Python traceback into the file 'fd'. For example:
+
+       Traceback (most recent call first):
+         File "xxx", line xxx in <xxx>
+         File "xxx", line xxx in <xxx>
+         ...
+         File "xxx", line xxx in <xxx>
+
+   This function is written for debug purpose only, to dump the traceback in
+   the worst case: after a segmentation fault, at fatal error, etc. That's why,
+   it is very limited. Strings are truncated to 100 characters and encoded to
+   ASCII with backslashreplace. It doesn't write the source code, only the
+   function name, filename and line number of each frame. Write only the first
+   100 frames: if the traceback is truncated, write the line " ...".
+
+   This function is signal safe. */
+
+PyAPI_FUNC(void) _Py_DumpTraceback(
+    int fd,
+    PyThreadState *tstate);
+
+/* Write the traceback of all threads into the file 'fd'. current_thread can be
+   NULL.
+
+   Return NULL on success, or an error message on error.
+
+   This function is written for debug purpose only. It calls
+   _Py_DumpTraceback() for each thread, and so has the same limitations. It
+   only write the traceback of the first 100 threads: write "..." if there are
+   more threads.
+
+   If current_tstate is NULL, the function tries to get the Python thread state
+   of the current thread. It is not an error if the function is unable to get
+   the current Python thread state.
+
+   If interp is NULL, the function tries to get the interpreter state from
+   the current Python thread state, or from
+   _PyGILState_GetInterpreterStateUnsafe() in last resort.
+
+   It is better to pass NULL to interp and current_tstate, the function tries
+   different options to retrieve these informations.
+
+   This function is signal safe. */
+
+PyAPI_FUNC(const char*) _Py_DumpTracebackThreads(
+    int fd,
+    PyInterpreterState *interp,
+    PyThreadState *current_tstate);
+
+/* Write a Unicode object into the file descriptor fd. Encode the string to
+   ASCII using the backslashreplace error handler.
+
+   Do nothing if text is not a Unicode object. The function accepts Unicode
+   string which is not ready (PyUnicode_WCHAR_KIND).
+
+   This function is signal safe. */
+PyAPI_FUNC(void) _Py_DumpASCII(int fd, PyObject *text);
+
+/* Format an integer as decimal into the file descriptor fd.
+
+   This function is signal safe. */
+PyAPI_FUNC(void) _Py_DumpDecimal(
+    int fd,
+    unsigned long value);
+
+/* Format an integer as hexadecimal into the file descriptor fd with at least
+   width digits.
+
+   The maximum width is sizeof(unsigned long)*2 digits.
+
+   This function is signal safe. */
+PyAPI_FUNC(void) _Py_DumpHexadecimal(
+    int fd,
+    unsigned long value,
+    Py_ssize_t width);
+
+PyAPI_FUNC(PyObject*) _PyTraceBack_FromFrame(
+    PyObject *tb_next,
+    struct _frame *frame);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_TRACEBACK_H */
diff --git a/openflow/include/python3.8/internal/pycore_tupleobject.h b/openflow/include/python3.8/internal/pycore_tupleobject.h
new file mode 100644
index 0000000..9fcfc5c
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_tupleobject.h
@@ -0,0 +1,19 @@
+#ifndef Py_INTERNAL_TUPLEOBJECT_H
+#define Py_INTERNAL_TUPLEOBJECT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "tupleobject.h"
+
+#define _PyTuple_ITEMS(op) (_PyTuple_CAST(op)->ob_item)
+PyAPI_FUNC(PyObject *) _PyTuple_FromArray(PyObject *const *, Py_ssize_t);
+
+#ifdef __cplusplus
+}
+#endif
+#endif   /* !Py_INTERNAL_TUPLEOBJECT_H */
diff --git a/openflow/include/python3.8/internal/pycore_warnings.h b/openflow/include/python3.8/internal/pycore_warnings.h
new file mode 100644
index 0000000..73e5350
--- /dev/null
+++ b/openflow/include/python3.8/internal/pycore_warnings.h
@@ -0,0 +1,25 @@
+#ifndef Py_INTERNAL_WARNINGS_H
+#define Py_INTERNAL_WARNINGS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+#include "object.h"
+
+struct _warnings_runtime_state {
+    /* Both 'filters' and 'onceregistry' can be set in warnings.py;
+       get_warnings_attr() will reset these variables accordingly. */
+    PyObject *filters;  /* List */
+    PyObject *once_registry;  /* Dict */
+    PyObject *default_action; /* String */
+    long filters_version;
+};
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_WARNINGS_H */
diff --git a/openflow/include/python3.8/interpreteridobject.h b/openflow/include/python3.8/interpreteridobject.h
new file mode 100644
index 0000000..e744fcd
--- /dev/null
+++ b/openflow/include/python3.8/interpreteridobject.h
@@ -0,0 +1,17 @@
+#ifndef Py_INTERPRETERIDOBJECT_H
+#define Py_INTERPRETERIDOBJECT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_LIMITED_API
+#  define Py_CPYTHON_INTERPRETERIDOBJECT_H
+#  include  "cpython/interpreteridobject.h"
+#  undef Py_CPYTHON_INTERPRETERIDOBJECT_H
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERPRETERIDOBJECT_H */
diff --git a/openflow/include/python3.8/intrcheck.h b/openflow/include/python3.8/intrcheck.h
new file mode 100644
index 0000000..e5bf5a8
--- /dev/null
+++ b/openflow/include/python3.8/intrcheck.h
@@ -0,0 +1,33 @@
+
+#ifndef Py_INTRCHECK_H
+#define Py_INTRCHECK_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+PyAPI_FUNC(int) PyOS_InterruptOccurred(void);
+PyAPI_FUNC(void) PyOS_InitInterrupts(void);
+#ifdef HAVE_FORK
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
+PyAPI_FUNC(void) PyOS_BeforeFork(void);
+PyAPI_FUNC(void) PyOS_AfterFork_Parent(void);
+PyAPI_FUNC(void) PyOS_AfterFork_Child(void);
+#endif
+#endif
+/* Deprecated, please use PyOS_AfterFork_Child() instead */
+Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyOS_AfterFork(void);
+
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(int) _PyOS_IsMainThread(void);
+PyAPI_FUNC(void) _PySignal_AfterFork(void);
+
+#ifdef MS_WINDOWS
+/* windows.h is not included by Python.h so use void* instead of HANDLE */
+PyAPI_FUNC(void*) _PyOS_SigintEvent(void);
+#endif
+#endif /* !Py_LIMITED_API */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTRCHECK_H */
diff --git a/openflow/usr/include/python3.5m/iterobject.h b/openflow/include/python3.8/iterobject.h
similarity index 100%
rename from openflow/usr/include/python3.5m/iterobject.h
rename to openflow/include/python3.8/iterobject.h
diff --git a/openflow/usr/include/python3.5m/listobject.h b/openflow/include/python3.8/listobject.h
similarity index 97%
rename from openflow/usr/include/python3.5m/listobject.h
rename to openflow/include/python3.8/listobject.h
index 31843b5..6057279 100644
--- a/openflow/usr/include/python3.5m/listobject.h
+++ b/openflow/include/python3.8/listobject.h
@@ -71,7 +71,7 @@ PyAPI_FUNC(void) _PyList_DebugMallocStats(FILE *out);
 #ifndef Py_LIMITED_API
 #define PyList_GET_ITEM(op, i) (((PyListObject *)(op))->ob_item[i])
 #define PyList_SET_ITEM(op, i, v) (((PyListObject *)(op))->ob_item[i] = (v))
-#define PyList_GET_SIZE(op)    Py_SIZE(op)
+#define PyList_GET_SIZE(op)    (assert(PyList_Check(op)),Py_SIZE(op))
 #define _PyList_ITEMS(op)      (((PyListObject *)(op))->ob_item)
 #endif
 
diff --git a/openflow/usr/include/python3.5m/longintrepr.h b/openflow/include/python3.8/longintrepr.h
similarity index 75%
rename from openflow/usr/include/python3.5m/longintrepr.h
rename to openflow/include/python3.8/longintrepr.h
index bbba4d8..ff4155f 100644
--- a/openflow/usr/include/python3.5m/longintrepr.h
+++ b/openflow/include/python3.8/longintrepr.h
@@ -42,30 +42,26 @@ extern "C" {
 */
 
 #if PYLONG_BITS_IN_DIGIT == 30
-#if !(defined HAVE_UINT64_T && defined HAVE_UINT32_T &&          \
-      defined HAVE_INT64_T && defined HAVE_INT32_T)
-#error "30-bit long digits requested, but the necessary types are not available on this platform"
-#endif
-typedef PY_UINT32_T digit;
-typedef PY_INT32_T sdigit; /* signed variant of digit */
-typedef PY_UINT64_T twodigits;
-typedef PY_INT64_T stwodigits; /* signed variant of twodigits */
-#define PyLong_SHIFT	30
-#define _PyLong_DECIMAL_SHIFT	9 /* max(e such that 10**e fits in a digit) */
-#define _PyLong_DECIMAL_BASE	((digit)1000000000) /* 10 ** DECIMAL_SHIFT */
+typedef uint32_t digit;
+typedef int32_t sdigit; /* signed variant of digit */
+typedef uint64_t twodigits;
+typedef int64_t stwodigits; /* signed variant of twodigits */
+#define PyLong_SHIFT    30
+#define _PyLong_DECIMAL_SHIFT   9 /* max(e such that 10**e fits in a digit) */
+#define _PyLong_DECIMAL_BASE    ((digit)1000000000) /* 10 ** DECIMAL_SHIFT */
 #elif PYLONG_BITS_IN_DIGIT == 15
 typedef unsigned short digit;
 typedef short sdigit; /* signed variant of digit */
 typedef unsigned long twodigits;
 typedef long stwodigits; /* signed variant of twodigits */
-#define PyLong_SHIFT	15
-#define _PyLong_DECIMAL_SHIFT	4 /* max(e such that 10**e fits in a digit) */
-#define _PyLong_DECIMAL_BASE	((digit)10000) /* 10 ** DECIMAL_SHIFT */
+#define PyLong_SHIFT    15
+#define _PyLong_DECIMAL_SHIFT   4 /* max(e such that 10**e fits in a digit) */
+#define _PyLong_DECIMAL_BASE    ((digit)10000) /* 10 ** DECIMAL_SHIFT */
 #else
 #error "PYLONG_BITS_IN_DIGIT should be 15 or 30"
 #endif
-#define PyLong_BASE	((digit)1 << PyLong_SHIFT)
-#define PyLong_MASK	((digit)(PyLong_BASE - 1))
+#define PyLong_BASE     ((digit)1 << PyLong_SHIFT)
+#define PyLong_MASK     ((digit)(PyLong_BASE - 1))
 
 #if PyLong_SHIFT % 5 != 0
 #error "longobject.c requires that PyLong_SHIFT be divisible by 5"
@@ -73,12 +69,12 @@ typedef long stwodigits; /* signed variant of twodigits */
 
 /* Long integer representation.
    The absolute value of a number is equal to
-   	SUM(for i=0 through abs(ob_size)-1) ob_digit[i] * 2**(SHIFT*i)
+        SUM(for i=0 through abs(ob_size)-1) ob_digit[i] * 2**(SHIFT*i)
    Negative numbers are represented with ob_size < 0;
    zero is represented by ob_size == 0.
    In a normalized number, ob_digit[abs(ob_size)-1] (the most significant
    digit) is never zero.  Also, in all cases, for all valid i,
-   	0 <= ob_digit[i] <= MASK.
+        0 <= ob_digit[i] <= MASK.
    The allocation function takes care of allocating extra memory
    so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available.
 
@@ -87,8 +83,8 @@ typedef long stwodigits; /* signed variant of twodigits */
 */
 
 struct _longobject {
-	PyObject_VAR_HEAD
-	digit ob_digit[1];
+    PyObject_VAR_HEAD
+    digit ob_digit[1];
 };
 
 PyAPI_FUNC(PyLongObject *) _PyLong_New(Py_ssize_t);
diff --git a/openflow/usr/include/python3.5m/longobject.h b/openflow/include/python3.8/longobject.h
similarity index 80%
rename from openflow/usr/include/python3.5m/longobject.h
rename to openflow/include/python3.8/longobject.h
index aed59ce..1e7a58d 100644
--- a/openflow/usr/include/python3.5m/longobject.h
+++ b/openflow/include/python3.8/longobject.h
@@ -65,7 +65,16 @@ PyAPI_FUNC(PyObject *) PyLong_GetInfo(void);
 #  error "void* different in size from int, long and long long"
 #endif /* SIZEOF_VOID_P */
 
-/* Used by Python/mystrtoul.c. */
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(int) _PyLong_UnsignedShort_Converter(PyObject *, void *);
+PyAPI_FUNC(int) _PyLong_UnsignedInt_Converter(PyObject *, void *);
+PyAPI_FUNC(int) _PyLong_UnsignedLong_Converter(PyObject *, void *);
+PyAPI_FUNC(int) _PyLong_UnsignedLongLong_Converter(PyObject *, void *);
+PyAPI_FUNC(int) _PyLong_Size_t_Converter(PyObject *, void *);
+#endif
+
+/* Used by Python/mystrtoul.c, _PyBytes_FromHex(),
+   _PyBytes_DecodeEscapeRecode(), etc. */
 #ifndef Py_LIMITED_API
 PyAPI_DATA(unsigned char) _PyLong_DigitValue[256];
 #endif
@@ -84,17 +93,16 @@ PyAPI_FUNC(double) PyLong_AsDouble(PyObject *);
 PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *);
 PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *);
 
-#ifdef HAVE_LONG_LONG
-PyAPI_FUNC(PyObject *) PyLong_FromLongLong(PY_LONG_LONG);
-PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG);
-PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLong(PyObject *);
-PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *);
-PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLongMask(PyObject *);
-PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLongAndOverflow(PyObject *, int *);
-#endif /* HAVE_LONG_LONG */
+PyAPI_FUNC(PyObject *) PyLong_FromLongLong(long long);
+PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned long long);
+PyAPI_FUNC(long long) PyLong_AsLongLong(PyObject *);
+PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLong(PyObject *);
+PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLongMask(PyObject *);
+PyAPI_FUNC(long long) PyLong_AsLongLongAndOverflow(PyObject *, int *);
 
 PyAPI_FUNC(PyObject *) PyLong_FromString(const char *, char **, int);
 #ifndef Py_LIMITED_API
+Py_DEPRECATED(3.3)
 PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int);
 PyAPI_FUNC(PyObject *) PyLong_FromUnicodeObject(PyObject *u, int base);
 PyAPI_FUNC(PyObject *) _PyLong_FromBytes(const char *, Py_ssize_t, int);
@@ -159,7 +167,7 @@ PyAPI_FUNC(PyObject *) _PyLong_FromByteArray(
      example, if is_signed is 0 and there are more digits in the v than
      fit in n; or if is_signed is 1, v < 0, and n is just 1 bit shy of
      being large enough to hold a sign bit.  OverflowError is set in this
-     case, but bytes holds the least-signficant n bytes of the true value.
+     case, but bytes holds the least-significant n bytes of the true value.
 */
 PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v,
     unsigned char* bytes, size_t n,
@@ -170,7 +178,17 @@ PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v,
    nb_int slot is not available or the result of the call to nb_int
    returns something not of type int.
 */
-PyAPI_FUNC(PyLongObject *)_PyLong_FromNbInt(PyObject *);
+PyAPI_FUNC(PyObject *) _PyLong_FromNbInt(PyObject *);
+
+/* Convert the given object to a PyLongObject using the nb_index or
+   nb_int slots, if available (the latter is deprecated).
+   Raise TypeError if either nb_index and nb_int slots are not
+   available or the result of the call to nb_index or nb_int
+   returns something not of type int.
+   Should be replaced with PyNumber_Index after the end of the
+   deprecation period.
+*/
+PyAPI_FUNC(PyObject *) _PyLong_FromNbIndexOrNbInt(PyObject *);
 
 /* _PyLong_Format: Convert the long to a string object with given base,
    appending a base prefix of 0[box] if base is 2, 8 or 16. */
@@ -182,6 +200,13 @@ PyAPI_FUNC(int) _PyLong_FormatWriter(
     int base,
     int alternate);
 
+PyAPI_FUNC(char*) _PyLong_FormatBytesWriter(
+    _PyBytesWriter *writer,
+    char *str,
+    PyObject *obj,
+    int base,
+    int alternate);
+
 /* Format the object based on the format_spec, as defined in PEP 3101
    (Advanced String Formatting). */
 PyAPI_FUNC(int) _PyLong_FormatAdvancedWriter(
@@ -198,8 +223,18 @@ PyAPI_FUNC(int) _PyLong_FormatAdvancedWriter(
 PyAPI_FUNC(unsigned long) PyOS_strtoul(const char *, char **, int);
 PyAPI_FUNC(long) PyOS_strtol(const char *, char **, int);
 
+#ifndef Py_LIMITED_API
 /* For use by the gcd function in mathmodule.c */
 PyAPI_FUNC(PyObject *) _PyLong_GCD(PyObject *, PyObject *);
+#endif /* !Py_LIMITED_API */
+
+#ifndef Py_LIMITED_API
+PyAPI_DATA(PyObject *) _PyLong_Zero;
+PyAPI_DATA(PyObject *) _PyLong_One;
+
+PyAPI_FUNC(PyObject *) _PyLong_Rshift(PyObject *, size_t);
+PyAPI_FUNC(PyObject *) _PyLong_Lshift(PyObject *, size_t);
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/marshal.h b/openflow/include/python3.8/marshal.h
similarity index 100%
rename from openflow/usr/include/python3.5m/marshal.h
rename to openflow/include/python3.8/marshal.h
diff --git a/openflow/usr/include/python3.5m/memoryobject.h b/openflow/include/python3.8/memoryobject.h
similarity index 97%
rename from openflow/usr/include/python3.5m/memoryobject.h
rename to openflow/include/python3.8/memoryobject.h
index ab5ee09..990a716 100644
--- a/openflow/usr/include/python3.5m/memoryobject.h
+++ b/openflow/include/python3.8/memoryobject.h
@@ -21,8 +21,10 @@ PyAPI_DATA(PyTypeObject) PyMemoryView_Type;
 #endif
 
 PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(PyObject *) PyMemoryView_FromMemory(char *mem, Py_ssize_t size,
                                                int flags);
+#endif
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) PyMemoryView_FromBuffer(Py_buffer *info);
 #endif
diff --git a/openflow/usr/include/python3.5m/methodobject.h b/openflow/include/python3.8/methodobject.h
similarity index 76%
rename from openflow/usr/include/python3.5m/methodobject.h
rename to openflow/include/python3.8/methodobject.h
index e2ad804..ba3b887 100644
--- a/openflow/usr/include/python3.5m/methodobject.h
+++ b/openflow/include/python3.8/methodobject.h
@@ -16,8 +16,12 @@ PyAPI_DATA(PyTypeObject) PyCFunction_Type;
 #define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type)
 
 typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
+typedef PyObject *(*_PyCFunctionFast) (PyObject *, PyObject *const *, Py_ssize_t);
 typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *,
                                              PyObject *);
+typedef PyObject *(*_PyCFunctionFastWithKeywords) (PyObject *,
+                                                   PyObject *const *, Py_ssize_t,
+                                                   PyObject *);
 typedef PyObject *(*PyNoArgsFunction)(PyObject *);
 
 PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *);
@@ -37,6 +41,13 @@ PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *);
 #endif
 PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *);
 
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(PyObject *) _PyCFunction_FastCallDict(PyObject *func,
+    PyObject *const *args,
+    Py_ssize_t nargs,
+    PyObject *kwargs);
+#endif
+
 struct PyMethodDef {
     const char  *ml_name;   /* The name of the built-in function/method */
     PyCFunction ml_meth;    /* The C function that implements it */
@@ -71,6 +82,17 @@ PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *,
 
 #define METH_COEXIST   0x0040
 
+#ifndef Py_LIMITED_API
+#define METH_FASTCALL  0x0080
+#endif
+
+/* This bit is preserved for Stackless Python */
+#ifdef STACKLESS
+#define METH_STACKLESS 0x0100
+#else
+#define METH_STACKLESS 0x0000
+#endif
+
 #ifndef Py_LIMITED_API
 typedef struct {
     PyObject_HEAD
@@ -78,7 +100,22 @@ typedef struct {
     PyObject    *m_self; /* Passed as 'self' arg to the C func, can be NULL */
     PyObject    *m_module; /* The __module__ attribute, can be anything */
     PyObject    *m_weakreflist; /* List of weak references */
+    vectorcallfunc vectorcall;
 } PyCFunctionObject;
+
+PyAPI_FUNC(PyObject *) _PyMethodDef_RawFastCallDict(
+    PyMethodDef *method,
+    PyObject *self,
+    PyObject *const *args,
+    Py_ssize_t nargs,
+    PyObject *kwargs);
+
+PyAPI_FUNC(PyObject *) _PyMethodDef_RawFastCallKeywords(
+    PyMethodDef *method,
+    PyObject *self,
+    PyObject *const *args,
+    Py_ssize_t nargs,
+    PyObject *kwnames);
 #endif
 
 PyAPI_FUNC(int) PyCFunction_ClearFreeList(void);
diff --git a/openflow/usr/include/python3.5m/modsupport.h b/openflow/include/python3.8/modsupport.h
similarity index 62%
rename from openflow/usr/include/python3.5m/modsupport.h
rename to openflow/include/python3.8/modsupport.h
index 829aaf8..f90ede4 100644
--- a/openflow/usr/include/python3.5m/modsupport.h
+++ b/openflow/include/python3.8/modsupport.h
@@ -19,8 +19,19 @@ extern "C" {
 #define PyArg_VaParseTupleAndKeywords   _PyArg_VaParseTupleAndKeywords_SizeT
 #define Py_BuildValue                   _Py_BuildValue_SizeT
 #define Py_VaBuildValue                 _Py_VaBuildValue_SizeT
+#ifndef Py_LIMITED_API
+#define _Py_VaBuildStack                _Py_VaBuildStack_SizeT
+#endif
 #else
+#ifndef Py_LIMITED_API
 PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list);
+PyAPI_FUNC(PyObject **) _Py_VaBuildStack_SizeT(
+    PyObject **small_stack,
+    Py_ssize_t small_stack_len,
+    const char *format,
+    va_list va,
+    Py_ssize_t *p_nargs);
+#endif /* !Py_LIMITED_API */
 #endif
 
 /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */
@@ -29,20 +40,98 @@ PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...);
 PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...);
 PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
                                                   const char *, char **, ...);
-PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *);
-PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...);
-PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...);
-PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
-#endif
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kw);
-PyAPI_FUNC(int) _PyArg_NoPositional(const char *funcname, PyObject *args);
-
 PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list);
 PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *,
                                                   const char *, char **, va_list);
 #endif
+PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *);
+PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...);
+PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...);
+PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
+
+
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(int) _PyArg_UnpackStack(
+    PyObject *const *args,
+    Py_ssize_t nargs,
+    const char *name,
+    Py_ssize_t min,
+    Py_ssize_t max,
+    ...);
+
+PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kwargs);
+PyAPI_FUNC(int) _PyArg_NoPositional(const char *funcname, PyObject *args);
+#define _PyArg_NoKeywords(funcname, kwargs) \
+    ((kwargs) == NULL || _PyArg_NoKeywords((funcname), (kwargs)))
+#define _PyArg_NoPositional(funcname, args) \
+    ((args) == NULL || _PyArg_NoPositional((funcname), (args)))
+
+PyAPI_FUNC(void) _PyArg_BadArgument(const char *, const char *, const char *, PyObject *);
+PyAPI_FUNC(int) _PyArg_CheckPositional(const char *, Py_ssize_t,
+                                       Py_ssize_t, Py_ssize_t);
+#define _PyArg_CheckPositional(funcname, nargs, min, max) \
+    (((min) <= (nargs) && (nargs) <= (max)) \
+     || _PyArg_CheckPositional((funcname), (nargs), (min), (max)))
+
+#endif
+
 PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list);
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(PyObject **) _Py_VaBuildStack(
+    PyObject **small_stack,
+    Py_ssize_t small_stack_len,
+    const char *format,
+    va_list va,
+    Py_ssize_t *p_nargs);
+#endif
+
+#ifndef Py_LIMITED_API
+typedef struct _PyArg_Parser {
+    const char *format;
+    const char * const *keywords;
+    const char *fname;
+    const char *custom_msg;
+    int pos;            /* number of positional-only arguments */
+    int min;            /* minimal number of arguments */
+    int max;            /* maximal number of positional arguments */
+    PyObject *kwtuple;  /* tuple of keyword parameter names */
+    struct _PyArg_Parser *next;
+} _PyArg_Parser;
+#ifdef PY_SSIZE_T_CLEAN
+#define _PyArg_ParseTupleAndKeywordsFast  _PyArg_ParseTupleAndKeywordsFast_SizeT
+#define _PyArg_ParseStack  _PyArg_ParseStack_SizeT
+#define _PyArg_ParseStackAndKeywords  _PyArg_ParseStackAndKeywords_SizeT
+#define _PyArg_VaParseTupleAndKeywordsFast  _PyArg_VaParseTupleAndKeywordsFast_SizeT
+#endif
+PyAPI_FUNC(int) _PyArg_ParseTupleAndKeywordsFast(PyObject *, PyObject *,
+                                                 struct _PyArg_Parser *, ...);
+PyAPI_FUNC(int) _PyArg_ParseStack(
+    PyObject *const *args,
+    Py_ssize_t nargs,
+    const char *format,
+    ...);
+PyAPI_FUNC(int) _PyArg_ParseStackAndKeywords(
+    PyObject *const *args,
+    Py_ssize_t nargs,
+    PyObject *kwnames,
+    struct _PyArg_Parser *,
+    ...);
+PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywordsFast(PyObject *, PyObject *,
+                                                   struct _PyArg_Parser *, va_list);
+PyAPI_FUNC(PyObject * const *) _PyArg_UnpackKeywords(
+        PyObject *const *args, Py_ssize_t nargs,
+        PyObject *kwargs, PyObject *kwnames,
+        struct _PyArg_Parser *parser,
+        int minpos, int maxpos, int minkw,
+        PyObject **buf);
+#define _PyArg_UnpackKeywords(args, nargs, kwargs, kwnames, parser, minpos, maxpos, minkw, buf) \
+    (((minkw) == 0 && (kwargs) == NULL && (kwnames) == NULL && \
+      (minpos) <= (nargs) && (nargs) <= (maxpos) && args != NULL) ? (args) : \
+     _PyArg_UnpackKeywords((args), (nargs), (kwargs), (kwnames), (parser), \
+                           (minpos), (maxpos), (minkw), (buf)))
+
+void _PyArg_Fini(void);
+#endif   /* Py_LIMITED_API */
 
 PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *);
 PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
@@ -121,6 +210,10 @@ PyAPI_FUNC(int) PyModule_ExecDef(PyObject *module, PyModuleDef *def);
 
 PyAPI_FUNC(PyObject *) PyModule_Create2(struct PyModuleDef*,
                                      int apiver);
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(PyObject *) _PyModule_CreateInitialized(struct PyModuleDef*,
+                                                   int apiver);
+#endif
 
 #ifdef Py_LIMITED_API
 #define PyModule_Create(module) \
@@ -146,7 +239,7 @@ PyAPI_FUNC(PyObject *) PyModule_FromDefAndSpec2(PyModuleDef *def,
 #endif /* New in 3.5 */
 
 #ifndef Py_LIMITED_API
-PyAPI_DATA(char *) _Py_PackageContext;
+PyAPI_DATA(const char *) _Py_PackageContext;
 #endif
 
 #ifdef __cplusplus
diff --git a/openflow/usr/include/python3.5m/moduleobject.h b/openflow/include/python3.8/moduleobject.h
similarity index 87%
rename from openflow/usr/include/python3.5m/moduleobject.h
rename to openflow/include/python3.8/moduleobject.h
index 229d7fa..e246fd2 100644
--- a/openflow/usr/include/python3.5m/moduleobject.h
+++ b/openflow/include/python3.8/moduleobject.h
@@ -12,20 +12,25 @@ PyAPI_DATA(PyTypeObject) PyModule_Type;
 #define PyModule_Check(op) PyObject_TypeCheck(op, &PyModule_Type)
 #define PyModule_CheckExact(op) (Py_TYPE(op) == &PyModule_Type)
 
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(PyObject *) PyModule_NewObject(
     PyObject *name
     );
+#endif
 PyAPI_FUNC(PyObject *) PyModule_New(
     const char *name            /* UTF-8 encoded string */
     );
 PyAPI_FUNC(PyObject *) PyModule_GetDict(PyObject *);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(PyObject *) PyModule_GetNameObject(PyObject *);
+#endif
 PyAPI_FUNC(const char *) PyModule_GetName(PyObject *);
-PyAPI_FUNC(const char *) PyModule_GetFilename(PyObject *);
+Py_DEPRECATED(3.2) PyAPI_FUNC(const char *) PyModule_GetFilename(PyObject *);
 PyAPI_FUNC(PyObject *) PyModule_GetFilenameObject(PyObject *);
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(void) _PyModule_Clear(PyObject *);
 PyAPI_FUNC(void) _PyModule_ClearDict(PyObject *);
+PyAPI_FUNC(int) _PyModuleSpec_IsInitializing(PyObject *);
 #endif
 PyAPI_FUNC(struct PyModuleDef*) PyModule_GetDef(PyObject*);
 PyAPI_FUNC(void*) PyModule_GetState(PyObject*);
@@ -77,7 +82,7 @@ typedef struct PyModuleDef{
   traverseproc m_traverse;
   inquiry m_clear;
   freefunc m_free;
-}PyModuleDef;
+} PyModuleDef;
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/namespaceobject.h b/openflow/include/python3.8/namespaceobject.h
similarity index 85%
rename from openflow/usr/include/python3.5m/namespaceobject.h
rename to openflow/include/python3.8/namespaceobject.h
index a412f05..0c8d95c 100644
--- a/openflow/usr/include/python3.5m/namespaceobject.h
+++ b/openflow/include/python3.8/namespaceobject.h
@@ -7,9 +7,11 @@
 extern "C" {
 #endif
 
+#ifndef Py_LIMITED_API
 PyAPI_DATA(PyTypeObject) _PyNamespace_Type;
 
 PyAPI_FUNC(PyObject *) _PyNamespace_New(PyObject *kwds);
+#endif /* !Py_LIMITED_API */
 
 #ifdef __cplusplus
 }
diff --git a/openflow/include/python3.8/node.h b/openflow/include/python3.8/node.h
new file mode 100644
index 0000000..2b39074
--- /dev/null
+++ b/openflow/include/python3.8/node.h
@@ -0,0 +1,48 @@
+
+/* Parse tree node interface */
+
+#ifndef Py_NODE_H
+#define Py_NODE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _node {
+    short               n_type;
+    char                *n_str;
+    int                 n_lineno;
+    int                 n_col_offset;
+    int                 n_nchildren;
+    struct _node        *n_child;
+    int                 n_end_lineno;
+    int                 n_end_col_offset;
+} node;
+
+PyAPI_FUNC(node *) PyNode_New(int type);
+PyAPI_FUNC(int) PyNode_AddChild(node *n, int type,
+                                char *str, int lineno, int col_offset,
+                                int end_lineno, int end_col_offset);
+PyAPI_FUNC(void) PyNode_Free(node *n);
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
+#endif
+
+/* Node access functions */
+#define NCH(n)          ((n)->n_nchildren)
+
+#define CHILD(n, i)     (&(n)->n_child[i])
+#define RCHILD(n, i)    (CHILD(n, NCH(n) + i))
+#define TYPE(n)         ((n)->n_type)
+#define STR(n)          ((n)->n_str)
+#define LINENO(n)       ((n)->n_lineno)
+
+/* Assert that the type of a node is what we expect */
+#define REQ(n, type) assert(TYPE(n) == (type))
+
+PyAPI_FUNC(void) PyNode_ListTree(node *);
+void _PyNode_FinalizeEndPos(node *n);  // helper also used in parsetok.c
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_NODE_H */
diff --git a/openflow/usr/include/python3.5m/object.h b/openflow/include/python3.8/object.h
similarity index 56%
rename from openflow/usr/include/python3.5m/object.h
rename to openflow/include/python3.8/object.h
index 50d9747..cc98d8a 100644
--- a/openflow/usr/include/python3.5m/object.h
+++ b/openflow/include/python3.8/object.h
@@ -1,5 +1,8 @@
 #ifndef Py_OBJECT_H
 #define Py_OBJECT_H
+
+#include "pymem.h"   /* _Py_tracemalloc_config */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -51,13 +54,8 @@ A standard interface exists for objects that contain an array of items
 whose size is determined when the object is allocated.
 */
 
-/* Py_DEBUG implies Py_TRACE_REFS. */
-#if defined(Py_DEBUG) && !defined(Py_TRACE_REFS)
-#define Py_TRACE_REFS
-#endif
-
-/* Py_TRACE_REFS implies Py_REF_DEBUG. */
-#if defined(Py_TRACE_REFS) && !defined(Py_REF_DEBUG)
+/* Py_DEBUG implies Py_REF_DEBUG. */
+#if defined(Py_DEBUG) && !defined(Py_REF_DEBUG)
 #define Py_REF_DEBUG
 #endif
 
@@ -109,44 +107,20 @@ typedef struct _object {
     struct _typeobject *ob_type;
 } PyObject;
 
+/* Cast argument to PyObject* type. */
+#define _PyObject_CAST(op) ((PyObject*)(op))
+
 typedef struct {
     PyObject ob_base;
     Py_ssize_t ob_size; /* Number of items in variable part */
 } PyVarObject;
 
-#define Py_REFCNT(ob)           (((PyObject*)(ob))->ob_refcnt)
-#define Py_TYPE(ob)             (((PyObject*)(ob))->ob_type)
-#define Py_SIZE(ob)             (((PyVarObject*)(ob))->ob_size)
+/* Cast argument to PyVarObject* type. */
+#define _PyVarObject_CAST(op) ((PyVarObject*)(op))
 
-/********************* String Literals ****************************************/
-/* This structure helps managing static strings. The basic usage goes like this:
-   Instead of doing
-
-       r = PyObject_CallMethod(o, "foo", "args", ...);
-
-   do
-
-       _Py_IDENTIFIER(foo);
-       ...
-       r = _PyObject_CallMethodId(o, &PyId_foo, "args", ...);
-
-   PyId_foo is a static variable, either on block level or file level. On first
-   usage, the string "foo" is interned, and the structures are linked. On interpreter
-   shutdown, all strings are released (through _PyUnicode_ClearStaticStrings).
-
-   Alternatively, _Py_static_string allows choosing the variable name.
-   _PyUnicode_FromId returns a borrowed reference to the interned string.
-   _PyObject_{Get,Set,Has}AttrId are __getattr__ versions using _Py_Identifier*.
-*/
-typedef struct _Py_Identifier {
-    struct _Py_Identifier *next;
-    const char* string;
-    PyObject *object;
-} _Py_Identifier;
-
-#define _Py_static_string_init(value) { 0, value, 0 }
-#define _Py_static_string(varname, value)  static _Py_Identifier varname = _Py_static_string_init(value)
-#define _Py_IDENTIFIER(varname) _Py_static_string(PyId_##varname, #varname)
+#define Py_REFCNT(ob)           (_PyObject_CAST(ob)->ob_refcnt)
+#define Py_TYPE(ob)             (_PyObject_CAST(ob)->ob_type)
+#define Py_SIZE(ob)             (_PyVarObject_CAST(ob)->ob_size)
 
 /*
 Type objects contain a string containing the type name (to help somewhat
@@ -174,154 +148,13 @@ typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *);
 typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *);
 typedef int(*objobjargproc)(PyObject *, PyObject *, PyObject *);
 
-#ifndef Py_LIMITED_API
-/* buffer interface */
-typedef struct bufferinfo {
-    void *buf;
-    PyObject *obj;        /* owned reference */
-    Py_ssize_t len;
-    Py_ssize_t itemsize;  /* This is Py_ssize_t so it can be
-                             pointed to by strides in simple case.*/
-    int readonly;
-    int ndim;
-    char *format;
-    Py_ssize_t *shape;
-    Py_ssize_t *strides;
-    Py_ssize_t *suboffsets;
-    void *internal;
-} Py_buffer;
-
-typedef int (*getbufferproc)(PyObject *, Py_buffer *, int);
-typedef void (*releasebufferproc)(PyObject *, Py_buffer *);
-
-/* Maximum number of dimensions */
-#define PyBUF_MAX_NDIM 64
-
-/* Flags for getting buffers */
-#define PyBUF_SIMPLE 0
-#define PyBUF_WRITABLE 0x0001
-/*  we used to include an E, backwards compatible alias  */
-#define PyBUF_WRITEABLE PyBUF_WRITABLE
-#define PyBUF_FORMAT 0x0004
-#define PyBUF_ND 0x0008
-#define PyBUF_STRIDES (0x0010 | PyBUF_ND)
-#define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)
-#define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)
-#define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)
-#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
-
-#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE)
-#define PyBUF_CONTIG_RO (PyBUF_ND)
-
-#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE)
-#define PyBUF_STRIDED_RO (PyBUF_STRIDES)
-
-#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT)
-#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT)
-
-#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT)
-#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT)
-
-
-#define PyBUF_READ  0x100
-#define PyBUF_WRITE 0x200
-
-/* End buffer interface */
-#endif /* Py_LIMITED_API */
-
 typedef int (*objobjproc)(PyObject *, PyObject *);
 typedef int (*visitproc)(PyObject *, void *);
 typedef int (*traverseproc)(PyObject *, visitproc, void *);
 
-#ifndef Py_LIMITED_API
-typedef struct {
-    /* Number implementations must check *both*
-       arguments for proper type and implement the necessary conversions
-       in the slot functions themselves. */
-
-    binaryfunc nb_add;
-    binaryfunc nb_subtract;
-    binaryfunc nb_multiply;
-    binaryfunc nb_remainder;
-    binaryfunc nb_divmod;
-    ternaryfunc nb_power;
-    unaryfunc nb_negative;
-    unaryfunc nb_positive;
-    unaryfunc nb_absolute;
-    inquiry nb_bool;
-    unaryfunc nb_invert;
-    binaryfunc nb_lshift;
-    binaryfunc nb_rshift;
-    binaryfunc nb_and;
-    binaryfunc nb_xor;
-    binaryfunc nb_or;
-    unaryfunc nb_int;
-    void *nb_reserved;  /* the slot formerly known as nb_long */
-    unaryfunc nb_float;
-
-    binaryfunc nb_inplace_add;
-    binaryfunc nb_inplace_subtract;
-    binaryfunc nb_inplace_multiply;
-    binaryfunc nb_inplace_remainder;
-    ternaryfunc nb_inplace_power;
-    binaryfunc nb_inplace_lshift;
-    binaryfunc nb_inplace_rshift;
-    binaryfunc nb_inplace_and;
-    binaryfunc nb_inplace_xor;
-    binaryfunc nb_inplace_or;
-
-    binaryfunc nb_floor_divide;
-    binaryfunc nb_true_divide;
-    binaryfunc nb_inplace_floor_divide;
-    binaryfunc nb_inplace_true_divide;
-
-    unaryfunc nb_index;
-
-    binaryfunc nb_matrix_multiply;
-    binaryfunc nb_inplace_matrix_multiply;
-} PyNumberMethods;
-
-typedef struct {
-    lenfunc sq_length;
-    binaryfunc sq_concat;
-    ssizeargfunc sq_repeat;
-    ssizeargfunc sq_item;
-    void *was_sq_slice;
-    ssizeobjargproc sq_ass_item;
-    void *was_sq_ass_slice;
-    objobjproc sq_contains;
-
-    binaryfunc sq_inplace_concat;
-    ssizeargfunc sq_inplace_repeat;
-} PySequenceMethods;
-
-typedef struct {
-    lenfunc mp_length;
-    binaryfunc mp_subscript;
-    objobjargproc mp_ass_subscript;
-} PyMappingMethods;
-
-typedef struct {
-    unaryfunc am_await;
-    unaryfunc am_aiter;
-    unaryfunc am_anext;
-} PyAsyncMethods;
-
-typedef struct {
-     getbufferproc bf_getbuffer;
-     releasebufferproc bf_releasebuffer;
-} PyBufferProcs;
-#endif /* Py_LIMITED_API */
 
 typedef void (*freefunc)(void *);
 typedef void (*destructor)(PyObject *);
-#ifndef Py_LIMITED_API
-/* We can't provide a full compile-time check that limited-API
-   users won't implement tp_print. However, not defining printfunc
-   and making tp_print of a different function pointer type
-   should at least cause a warning in most cases. */
-typedef int (*printfunc)(PyObject *, FILE *, int);
-#endif
 typedef PyObject *(*getattrfunc)(PyObject *, char *);
 typedef PyObject *(*getattrofunc)(PyObject *, PyObject *);
 typedef int (*setattrfunc)(PyObject *, char *, PyObject *);
@@ -338,98 +171,10 @@ typedef PyObject *(*newfunc)(struct _typeobject *, PyObject *, PyObject *);
 typedef PyObject *(*allocfunc)(struct _typeobject *, Py_ssize_t);
 
 #ifdef Py_LIMITED_API
-typedef struct _typeobject PyTypeObject; /* opaque */
+/* In Py_LIMITED_API, PyTypeObject is an opaque structure. */
+typedef struct _typeobject PyTypeObject;
 #else
-typedef struct _typeobject {
-    PyObject_VAR_HEAD
-    const char *tp_name; /* For printing, in format "<module>.<name>" */
-    Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */
-
-    /* Methods to implement standard operations */
-
-    destructor tp_dealloc;
-    printfunc tp_print;
-    getattrfunc tp_getattr;
-    setattrfunc tp_setattr;
-    PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 2)
-                                    or tp_reserved (Python 3) */
-    reprfunc tp_repr;
-
-    /* Method suites for standard classes */
-
-    PyNumberMethods *tp_as_number;
-    PySequenceMethods *tp_as_sequence;
-    PyMappingMethods *tp_as_mapping;
-
-    /* More standard operations (here for binary compatibility) */
-
-    hashfunc tp_hash;
-    ternaryfunc tp_call;
-    reprfunc tp_str;
-    getattrofunc tp_getattro;
-    setattrofunc tp_setattro;
-
-    /* Functions to access object as input/output buffer */
-    PyBufferProcs *tp_as_buffer;
-
-    /* Flags to define presence of optional/expanded features */
-    unsigned long tp_flags;
-
-    const char *tp_doc; /* Documentation string */
-
-    /* Assigned meaning in release 2.0 */
-    /* call function for all accessible objects */
-    traverseproc tp_traverse;
-
-    /* delete references to contained objects */
-    inquiry tp_clear;
-
-    /* Assigned meaning in release 2.1 */
-    /* rich comparisons */
-    richcmpfunc tp_richcompare;
-
-    /* weak reference enabler */
-    Py_ssize_t tp_weaklistoffset;
-
-    /* Iterators */
-    getiterfunc tp_iter;
-    iternextfunc tp_iternext;
-
-    /* Attribute descriptor and subclassing stuff */
-    struct PyMethodDef *tp_methods;
-    struct PyMemberDef *tp_members;
-    struct PyGetSetDef *tp_getset;
-    struct _typeobject *tp_base;
-    PyObject *tp_dict;
-    descrgetfunc tp_descr_get;
-    descrsetfunc tp_descr_set;
-    Py_ssize_t tp_dictoffset;
-    initproc tp_init;
-    allocfunc tp_alloc;
-    newfunc tp_new;
-    freefunc tp_free; /* Low-level free-memory routine */
-    inquiry tp_is_gc; /* For PyObject_IS_GC */
-    PyObject *tp_bases;
-    PyObject *tp_mro; /* method resolution order */
-    PyObject *tp_cache;
-    PyObject *tp_subclasses;
-    PyObject *tp_weaklist;
-    destructor tp_del;
-
-    /* Type attribute cache version tag. Added in version 2.6 */
-    unsigned int tp_version_tag;
-
-    destructor tp_finalize;
-
-#ifdef COUNT_ALLOCS
-    /* these must be last and never explicitly initialized */
-    Py_ssize_t tp_allocs;
-    Py_ssize_t tp_frees;
-    Py_ssize_t tp_maxalloc;
-    struct _typeobject *tp_prev;
-    struct _typeobject *tp_next;
-#endif
-} PyTypeObject;
+/* PyTypeObject is defined in cpython/object.h */
 #endif
 
 typedef struct{
@@ -450,74 +195,32 @@ PyAPI_FUNC(PyObject*) PyType_FromSpec(PyType_Spec*);
 PyAPI_FUNC(PyObject*) PyType_FromSpecWithBases(PyType_Spec*, PyObject*);
 #endif
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000
-PyAPI_FUNC(void*) PyType_GetSlot(PyTypeObject*, int);
-#endif
-
-#ifndef Py_LIMITED_API
-/* The *real* layout of a type object when allocated on the heap */
-typedef struct _heaptypeobject {
-    /* Note: there's a dependency on the order of these members
-       in slotptr() in typeobject.c . */
-    PyTypeObject ht_type;
-    PyAsyncMethods as_async;
-    PyNumberMethods as_number;
-    PyMappingMethods as_mapping;
-    PySequenceMethods as_sequence; /* as_sequence comes after as_mapping,
-                                      so that the mapping wins when both
-                                      the mapping and the sequence define
-                                      a given operator (e.g. __getitem__).
-                                      see add_operators() in typeobject.c . */
-    PyBufferProcs as_buffer;
-    PyObject *ht_name, *ht_slots, *ht_qualname;
-    struct _dictkeysobject *ht_cached_keys;
-    /* here are optional user slots, followed by the members. */
-} PyHeapTypeObject;
-
-/* access macro to the members which are floating "behind" the object */
-#define PyHeapType_GET_MEMBERS(etype) \
-    ((PyMemberDef *)(((char *)etype) + Py_TYPE(etype)->tp_basicsize))
+PyAPI_FUNC(void*) PyType_GetSlot(struct _typeobject*, int);
 #endif
 
 /* Generic type check */
-PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *);
+PyAPI_FUNC(int) PyType_IsSubtype(struct _typeobject *, struct _typeobject *);
 #define PyObject_TypeCheck(ob, tp) \
     (Py_TYPE(ob) == (tp) || PyType_IsSubtype(Py_TYPE(ob), (tp)))
 
-PyAPI_DATA(PyTypeObject) PyType_Type; /* built-in 'type' */
-PyAPI_DATA(PyTypeObject) PyBaseObject_Type; /* built-in 'object' */
-PyAPI_DATA(PyTypeObject) PySuper_Type; /* built-in 'super' */
+PyAPI_DATA(struct _typeobject) PyType_Type; /* built-in 'type' */
+PyAPI_DATA(struct _typeobject) PyBaseObject_Type; /* built-in 'object' */
+PyAPI_DATA(struct _typeobject) PySuper_Type; /* built-in 'super' */
 
-PyAPI_FUNC(unsigned long) PyType_GetFlags(PyTypeObject*);
+PyAPI_FUNC(unsigned long) PyType_GetFlags(struct _typeobject*);
 
 #define PyType_Check(op) \
     PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS)
 #define PyType_CheckExact(op) (Py_TYPE(op) == &PyType_Type)
 
-PyAPI_FUNC(int) PyType_Ready(PyTypeObject *);
-PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *,
+PyAPI_FUNC(int) PyType_Ready(struct _typeobject *);
+PyAPI_FUNC(PyObject *) PyType_GenericAlloc(struct _typeobject *, Py_ssize_t);
+PyAPI_FUNC(PyObject *) PyType_GenericNew(struct _typeobject *,
                                                PyObject *, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *);
-PyAPI_FUNC(PyObject *) _PyType_LookupId(PyTypeObject *, _Py_Identifier *);
-PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, _Py_Identifier *);
-PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *);
-#endif
 PyAPI_FUNC(unsigned int) PyType_ClearCache(void);
-PyAPI_FUNC(void) PyType_Modified(PyTypeObject *);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyType_GetDocFromInternalDoc(const char *, const char *);
-PyAPI_FUNC(PyObject *) _PyType_GetTextSignatureFromInternalDoc(const char *, const char *);
-#endif
+PyAPI_FUNC(void) PyType_Modified(struct _typeobject *);
 
 /* Generic operations on objects */
-struct _Py_Identifier;
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int);
-PyAPI_FUNC(void) _Py_BreakPoint(void);
-PyAPI_FUNC(void) _PyObject_Dump(PyObject *);
-#endif
 PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_ASCII(PyObject *);
@@ -530,46 +233,19 @@ PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *);
 PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *);
 PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *);
 PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *);
-PyAPI_FUNC(int) _PyObject_IsAbstract(PyObject *);
-PyAPI_FUNC(PyObject *) _PyObject_GetAttrId(PyObject *, struct _Py_Identifier *);
-PyAPI_FUNC(int) _PyObject_SetAttrId(PyObject *, struct _Py_Identifier *, PyObject *);
-PyAPI_FUNC(int) _PyObject_HasAttrId(PyObject *, struct _Py_Identifier *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *);
-#endif
 PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *);
-#endif
 PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *);
 PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *,
                                               PyObject *, PyObject *);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(int) PyObject_GenericSetDict(PyObject *, PyObject *, void *);
+#endif
 PyAPI_FUNC(Py_hash_t) PyObject_Hash(PyObject *);
 PyAPI_FUNC(Py_hash_t) PyObject_HashNotImplemented(PyObject *);
 PyAPI_FUNC(int) PyObject_IsTrue(PyObject *);
 PyAPI_FUNC(int) PyObject_Not(PyObject *);
 PyAPI_FUNC(int) PyCallable_Check(PyObject *);
-
 PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) PyObject_CallFinalizer(PyObject *);
-PyAPI_FUNC(int) PyObject_CallFinalizerFromDealloc(PyObject *);
-#endif
-
-/* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes
-   dict as the last parameter. */
-PyAPI_FUNC(PyObject *)
-_PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *);
-PyAPI_FUNC(int)
-_PyObject_GenericSetAttrWithDict(PyObject *, PyObject *,
-                                 PyObject *, PyObject *);
-
-/* Helper to look up a builtin object */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *)
-_PyObject_GetBuiltin(const char *name);
-#endif
 
 /* PyObject_Dir(obj) acts like Python builtins.dir(obj), returning a
    list of strings.  PyObject_Dir(NULL) is like builtins.dir(),
@@ -587,17 +263,14 @@ PyAPI_FUNC(void) Py_ReprLeave(PyObject *);
 #define Py_PRINT_RAW    1       /* No string quotes etc. */
 
 /*
-`Type flags (tp_flags)
+Type flags (tp_flags)
 
-These flags are used to extend the type structure in a backwards-compatible
-fashion. Extensions can use the flags to indicate (and test) when a given
-type structure contains a new feature. The Python core will use these when
-introducing new functionality between major revisions (to avoid mid-version
-changes in the PYTHON_API_VERSION).
+These flags are used to change expected features and behavior for a
+particular type.
 
 Arbitration of the flag bit positions will need to be coordinated among
-all extension writers who publically release their extensions (this will
-be fewer than you might expect!)..
+all extension writers who publicly release their extensions (this will
+be fewer than you might expect!).
 
 Most flags were removed as of Python 3.0 to make room for new flags.  (Some
 flags are not for backwards compatibility but to indicate the presence of an
@@ -615,13 +288,18 @@ given type object has a specified feature.
 /* Set if the type allows subclassing */
 #define Py_TPFLAGS_BASETYPE (1UL << 10)
 
+/* Set if the type implements the vectorcall protocol (PEP 590) */
+#ifndef Py_LIMITED_API
+#define _Py_TPFLAGS_HAVE_VECTORCALL (1UL << 11)
+#endif
+
 /* Set if the type is 'ready' -- fully initialized */
 #define Py_TPFLAGS_READY (1UL << 12)
 
 /* Set while the type is being 'readied', to prevent recursive ready calls */
 #define Py_TPFLAGS_READYING (1UL << 13)
 
-/* Objects support garbage collection (see objimp.h) */
+/* Objects support garbage collection (see objimpl.h) */
 #define Py_TPFLAGS_HAVE_GC (1UL << 14)
 
 /* These two bits are preserved for Stackless Python, next after this is 17 */
@@ -631,6 +309,9 @@ given type object has a specified feature.
 #define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION 0
 #endif
 
+/* Objects behave like an unbound method */
+#define Py_TPFLAGS_METHOD_DESCRIPTOR (1UL << 17)
+
 /* Objects support type attribute cache */
 #define Py_TPFLAGS_HAVE_VERSION_TAG   (1UL << 18)
 #define Py_TPFLAGS_VALID_VERSION_TAG  (1UL << 19)
@@ -656,13 +337,16 @@ given type object has a specified feature.
 /* NOTE: The following flags reuse lower bits (removed as part of the
  * Python 3.0 transition). */
 
+/* The following flag is kept for compatibility.  Starting with 3.8,
+ * binary compatibility of C extensions accross feature releases of
+ * Python is not supported anymore, except when using the stable ABI.
+ */
+
 /* Type structure has tp_finalize member (3.4) */
 #define Py_TPFLAGS_HAVE_FINALIZE (1UL << 0)
 
 #ifdef Py_LIMITED_API
-#define PyType_HasFeature(t,f)  ((PyType_GetFlags(t) & (f)) != 0)
-#else
-#define PyType_HasFeature(t,f)  (((t)->tp_flags & (f)) != 0)
+#  define PyType_HasFeature(t,f)  ((PyType_GetFlags(t) & (f)) != 0)
 #endif
 #define PyType_FastSubclass(t,f)  PyType_HasFeature(t,f)
 
@@ -706,36 +390,26 @@ you can count such references to the type object.)
  */
 #ifdef Py_REF_DEBUG
 PyAPI_DATA(Py_ssize_t) _Py_RefTotal;
-PyAPI_FUNC(void) _Py_NegativeRefcount(const char *fname,
-                                            int lineno, PyObject *op);
-PyAPI_FUNC(PyObject *) _PyDict_Dummy(void);
+PyAPI_FUNC(void) _Py_NegativeRefcount(const char *filename, int lineno,
+                                      PyObject *op);
 PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void);
 #define _Py_INC_REFTOTAL        _Py_RefTotal++
 #define _Py_DEC_REFTOTAL        _Py_RefTotal--
-#define _Py_REF_DEBUG_COMMA     ,
-#define _Py_CHECK_REFCNT(OP)                                    \
-{       if (((PyObject*)OP)->ob_refcnt < 0)                             \
-                _Py_NegativeRefcount(__FILE__, __LINE__,        \
-                                     (PyObject *)(OP));         \
-}
+
 /* Py_REF_DEBUG also controls the display of refcounts and memory block
  * allocations at the interactive prompt and at interpreter shutdown
  */
 PyAPI_FUNC(void) _PyDebug_PrintTotalRefs(void);
-#define _PY_DEBUG_PRINT_TOTAL_REFS() _PyDebug_PrintTotalRefs()
 #else
 #define _Py_INC_REFTOTAL
 #define _Py_DEC_REFTOTAL
-#define _Py_REF_DEBUG_COMMA
-#define _Py_CHECK_REFCNT(OP)    /* a semicolon */;
-#define _PY_DEBUG_PRINT_TOTAL_REFS()
 #endif /* Py_REF_DEBUG */
 
 #ifdef COUNT_ALLOCS
-PyAPI_FUNC(void) inc_count(PyTypeObject *);
-PyAPI_FUNC(void) dec_count(PyTypeObject *);
-#define _Py_INC_TPALLOCS(OP)    inc_count(Py_TYPE(OP))
-#define _Py_INC_TPFREES(OP)     dec_count(Py_TYPE(OP))
+PyAPI_FUNC(void) _Py_inc_count(struct _typeobject *);
+PyAPI_FUNC(void) _Py_dec_count(struct _typeobject *);
+#define _Py_INC_TPALLOCS(OP)    _Py_inc_count(Py_TYPE(OP))
+#define _Py_INC_TPFREES(OP)     _Py_dec_count(Py_TYPE(OP))
 #define _Py_DEC_TPFREES(OP)     Py_TYPE(OP)->tp_frees--
 #define _Py_COUNT_ALLOCS_COMMA  ,
 #else
@@ -745,48 +419,68 @@ PyAPI_FUNC(void) dec_count(PyTypeObject *);
 #define _Py_COUNT_ALLOCS_COMMA
 #endif /* COUNT_ALLOCS */
 
+/* Update the Python traceback of an object. This function must be called
+   when a memory block is reused from a free list. */
+PyAPI_FUNC(int) _PyTraceMalloc_NewReference(PyObject *op);
+
 #ifdef Py_TRACE_REFS
 /* Py_TRACE_REFS is such major surgery that we call external routines. */
 PyAPI_FUNC(void) _Py_NewReference(PyObject *);
 PyAPI_FUNC(void) _Py_ForgetReference(PyObject *);
-PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
 PyAPI_FUNC(void) _Py_PrintReferences(FILE *);
 PyAPI_FUNC(void) _Py_PrintReferenceAddresses(FILE *);
 PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force);
-
 #else
 /* Without Py_TRACE_REFS, there's little enough to do that we expand code
- * inline.
- */
-#define _Py_NewReference(op) (                          \
-    _Py_INC_TPALLOCS(op) _Py_COUNT_ALLOCS_COMMA         \
-    _Py_INC_REFTOTAL  _Py_REF_DEBUG_COMMA               \
-    Py_REFCNT(op) = 1)
+   inline. */
+static inline void _Py_NewReference(PyObject *op)
+{
+    if (_Py_tracemalloc_config.tracing) {
+        _PyTraceMalloc_NewReference(op);
+    }
+    _Py_INC_TPALLOCS(op);
+    _Py_INC_REFTOTAL;
+    Py_REFCNT(op) = 1;
+}
 
-#define _Py_ForgetReference(op) _Py_INC_TPFREES(op)
-
-#ifdef Py_LIMITED_API
-PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
-#else
-#define _Py_Dealloc(op) (                               \
-    _Py_INC_TPFREES(op) _Py_COUNT_ALLOCS_COMMA          \
-    (*Py_TYPE(op)->tp_dealloc)((PyObject *)(op)))
-#endif
+static inline void _Py_ForgetReference(PyObject *op)
+{
+    (void)op; /* may be unused, shut up -Wunused-parameter */
+    _Py_INC_TPFREES(op);
+}
 #endif /* !Py_TRACE_REFS */
 
-#define Py_INCREF(op) (                         \
-    _Py_INC_REFTOTAL  _Py_REF_DEBUG_COMMA       \
-    ((PyObject *)(op))->ob_refcnt++)
 
-#define Py_DECREF(op)                                   \
-    do {                                                \
-        PyObject *_py_decref_tmp = (PyObject *)(op);    \
-        if (_Py_DEC_REFTOTAL  _Py_REF_DEBUG_COMMA       \
-        --(_py_decref_tmp)->ob_refcnt != 0)             \
-            _Py_CHECK_REFCNT(_py_decref_tmp)            \
-        else                                            \
-        _Py_Dealloc(_py_decref_tmp);                    \
-    } while (0)
+PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
+
+static inline void _Py_INCREF(PyObject *op)
+{
+    _Py_INC_REFTOTAL;
+    op->ob_refcnt++;
+}
+
+#define Py_INCREF(op) _Py_INCREF(_PyObject_CAST(op))
+
+static inline void _Py_DECREF(const char *filename, int lineno,
+                              PyObject *op)
+{
+    (void)filename; /* may be unused, shut up -Wunused-parameter */
+    (void)lineno; /* may be unused, shut up -Wunused-parameter */
+    _Py_DEC_REFTOTAL;
+    if (--op->ob_refcnt != 0) {
+#ifdef Py_REF_DEBUG
+        if (op->ob_refcnt < 0) {
+            _Py_NegativeRefcount(filename, lineno, op);
+        }
+#endif
+    }
+    else {
+        _Py_Dealloc(op);
+    }
+}
+
+#define Py_DECREF(op) _Py_DECREF(__FILE__, __LINE__, _PyObject_CAST(op))
+
 
 /* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
  * and tp_dealloc implementations.
@@ -824,63 +518,31 @@ PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
  */
 #define Py_CLEAR(op)                            \
     do {                                        \
-        PyObject *_py_tmp = (PyObject *)(op);   \
+        PyObject *_py_tmp = _PyObject_CAST(op); \
         if (_py_tmp != NULL) {                  \
             (op) = NULL;                        \
             Py_DECREF(_py_tmp);                 \
         }                                       \
     } while (0)
 
-/* Macros to use in case the object pointer may be NULL: */
-#define Py_XINCREF(op)                                \
-    do {                                              \
-        PyObject *_py_xincref_tmp = (PyObject *)(op); \
-        if (_py_xincref_tmp != NULL)                  \
-            Py_INCREF(_py_xincref_tmp);               \
-    } while (0)
+/* Function to use in case the object pointer can be NULL: */
+static inline void _Py_XINCREF(PyObject *op)
+{
+    if (op != NULL) {
+        Py_INCREF(op);
+    }
+}
 
-#define Py_XDECREF(op)                                \
-    do {                                              \
-        PyObject *_py_xdecref_tmp = (PyObject *)(op); \
-        if (_py_xdecref_tmp != NULL)                  \
-            Py_DECREF(_py_xdecref_tmp);               \
-    } while (0)
+#define Py_XINCREF(op) _Py_XINCREF(_PyObject_CAST(op))
 
-#ifndef Py_LIMITED_API
-/* Safely decref `op` and set `op` to `op2`.
- *
- * As in case of Py_CLEAR "the obvious" code can be deadly:
- *
- *     Py_DECREF(op);
- *     op = op2;
- *
- * The safe way is:
- *
- *      Py_SETREF(op, op2);
- *
- * That arranges to set `op` to `op2` _before_ decref'ing, so that any code
- * triggered as a side-effect of `op` getting torn down no longer believes
- * `op` points to a valid object.
- *
- * Py_XSETREF is a variant of Py_SETREF that uses Py_XDECREF instead of
- * Py_DECREF.
- */
+static inline void _Py_XDECREF(PyObject *op)
+{
+    if (op != NULL) {
+        Py_DECREF(op);
+    }
+}
 
-#define Py_SETREF(op, op2)                      \
-    do {                                        \
-        PyObject *_py_tmp = (PyObject *)(op);   \
-        (op) = (op2);                           \
-        Py_DECREF(_py_tmp);                     \
-    } while (0)
-
-#define Py_XSETREF(op, op2)                     \
-    do {                                        \
-        PyObject *_py_tmp = (PyObject *)(op);   \
-        (op) = (op2);                           \
-        Py_XDECREF(_py_tmp);                    \
-    } while (0)
-
-#endif /* ifndef Py_LIMITED_API */
+#define Py_XDECREF(op) _Py_XDECREF(_PyObject_CAST(op))
 
 /*
 These are provided as conveniences to Python runtime embedders, so that
@@ -889,9 +551,6 @@ they can have object code that is not dependent on Python compilation flags.
 PyAPI_FUNC(void) Py_IncRef(PyObject *);
 PyAPI_FUNC(void) Py_DecRef(PyObject *);
 
-PyAPI_DATA(PyTypeObject) _PyNone_Type;
-PyAPI_DATA(PyTypeObject) _PyNotImplemented_Type;
-
 /*
 _Py_NoneStruct is an object of undefined type which can be used in contexts
 where NULL (nil) is not suitable (since NULL often means 'error').
@@ -923,10 +582,24 @@ PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */
 #define Py_GT 4
 #define Py_GE 5
 
-/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE.
- * Defined in object.c.
+/*
+ * Macro for implementing rich comparisons
+ *
+ * Needs to be a macro because any C-comparable type can be used.
  */
-PyAPI_DATA(int) _Py_SwappedOp[];
+#define Py_RETURN_RICHCOMPARE(val1, val2, op)                               \
+    do {                                                                    \
+        switch (op) {                                                       \
+        case Py_EQ: if ((val1) == (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;  \
+        case Py_NE: if ((val1) != (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;  \
+        case Py_LT: if ((val1) < (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;   \
+        case Py_GT: if ((val1) > (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;   \
+        case Py_LE: if ((val1) <= (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;  \
+        case Py_GE: if ((val1) >= (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;  \
+        default:                                                            \
+            Py_UNREACHABLE();                                               \
+        }                                                                   \
+    } while (0)
 
 
 /*
@@ -986,11 +659,11 @@ times.
 
 When deallocating a container object, it's possible to trigger an unbounded
 chain of deallocations, as each Py_DECREF in turn drops the refcount on "the
-next" object in the chain to 0.  This can easily lead to stack faults, and
+next" object in the chain to 0.  This can easily lead to stack overflows,
 especially in threads (which typically have less stack space to work with).
 
-A container object that participates in cyclic gc can avoid this by
-bracketing the body of its tp_dealloc function with a pair of macros:
+A container object can avoid this by bracketing the body of its tp_dealloc
+function with a pair of macros:
 
 static void
 mytype_dealloc(mytype *p)
@@ -998,14 +671,14 @@ mytype_dealloc(mytype *p)
     ... declarations go here ...
 
     PyObject_GC_UnTrack(p);        // must untrack first
-    Py_TRASHCAN_SAFE_BEGIN(p)
+    Py_TRASHCAN_BEGIN(p, mytype_dealloc)
     ... The body of the deallocator goes here, including all calls ...
     ... to Py_DECREF on contained objects.                         ...
-    Py_TRASHCAN_SAFE_END(p)
+    Py_TRASHCAN_END                // there should be no code after this
 }
 
 CAUTION:  Never return from the middle of the body!  If the body needs to
-"get out early", put a label immediately before the Py_TRASHCAN_SAFE_END
+"get out early", put a label immediately before the Py_TRASHCAN_END
 call, and goto it.  Else the call-depth counter (see below) will stay
 above 0 forever, and the trashcan will never get emptied.
 
@@ -1019,16 +692,15 @@ without deallocating anything (and so unbounded call-stack depth is avoided).
 When the call stack finishes unwinding again, code generated by the END macro
 notices this, and calls another routine to deallocate all the objects that
 may have been added to the list of deferred deallocations.  In effect, a
-chain of N deallocations is broken into N / PyTrash_UNWIND_LEVEL pieces,
+chain of N deallocations is broken into (N-1)/(PyTrash_UNWIND_LEVEL-1) pieces,
 with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL.
-*/
 
-/* This is the old private API, invoked by the macros before 3.2.4.
-   Kept for binary compatibility of extensions using the stable ABI. */
-PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
-PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
-PyAPI_DATA(int) _PyTrash_delete_nesting;
-PyAPI_DATA(PyObject *) _PyTrash_delete_later;
+Since the tp_dealloc of a subclass typically calls the tp_dealloc of the base
+class, we need to ensure that the trashcan is only triggered on the tp_dealloc
+of the actual class being deallocated. Otherwise we might end up with a
+partially-deallocated object. To check this, the tp_dealloc function must be
+passed as second argument to Py_TRASHCAN_BEGIN().
+*/
 
 /* The new thread-safe private API, invoked by the macros below. */
 PyAPI_FUNC(void) _PyTrash_thread_deposit_object(PyObject*);
@@ -1036,28 +708,44 @@ PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);
 
 #define PyTrash_UNWIND_LEVEL 50
 
-#define Py_TRASHCAN_SAFE_BEGIN(op) \
+#define Py_TRASHCAN_BEGIN_CONDITION(op, cond) \
     do { \
-        PyThreadState *_tstate = PyThreadState_GET(); \
-        if (_tstate->trash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
-            ++_tstate->trash_delete_nesting;
-            /* The body of the deallocator is here. */
-#define Py_TRASHCAN_SAFE_END(op) \
+        PyThreadState *_tstate = NULL; \
+        /* If "cond" is false, then _tstate remains NULL and the deallocator \
+         * is run normally without involving the trashcan */ \
+        if (cond) { \
+            _tstate = PyThreadState_GET(); \
+            if (_tstate->trash_delete_nesting >= PyTrash_UNWIND_LEVEL) { \
+                /* Store the object (to be deallocated later) and jump past \
+                 * Py_TRASHCAN_END, skipping the body of the deallocator */ \
+                _PyTrash_thread_deposit_object(_PyObject_CAST(op)); \
+                break; \
+            } \
+            ++_tstate->trash_delete_nesting; \
+        }
+        /* The body of the deallocator is here. */
+#define Py_TRASHCAN_END \
+        if (_tstate) { \
             --_tstate->trash_delete_nesting; \
             if (_tstate->trash_delete_later && _tstate->trash_delete_nesting <= 0) \
                 _PyTrash_thread_destroy_chain(); \
         } \
-        else \
-            _PyTrash_thread_deposit_object((PyObject*)op); \
     } while (0);
 
+#define Py_TRASHCAN_BEGIN(op, dealloc) Py_TRASHCAN_BEGIN_CONDITION(op, \
+        Py_TYPE(op)->tp_dealloc == (destructor)(dealloc))
+
+/* For backwards compatibility, these macros enable the trashcan
+ * unconditionally */
+#define Py_TRASHCAN_SAFE_BEGIN(op) Py_TRASHCAN_BEGIN_CONDITION(op, 1)
+#define Py_TRASHCAN_SAFE_END(op) Py_TRASHCAN_END
+
+
 #ifndef Py_LIMITED_API
-PyAPI_FUNC(void)
-_PyDebugAllocatorStats(FILE *out, const char *block_name, int num_blocks,
-                       size_t sizeof_block);
-PyAPI_FUNC(void)
-_PyObject_DebugTypeStats(FILE *out);
-#endif /* ifndef Py_LIMITED_API */
+#  define Py_CPYTHON_OBJECT_H
+#  include  "cpython/object.h"
+#  undef Py_CPYTHON_OBJECT_H
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/objimpl.h b/openflow/include/python3.8/objimpl.h
similarity index 64%
rename from openflow/usr/include/python3.5m/objimpl.h
rename to openflow/include/python3.8/objimpl.h
index 65b6d91..2337d8a 100644
--- a/openflow/usr/include/python3.5m/objimpl.h
+++ b/openflow/include/python3.8/objimpl.h
@@ -56,7 +56,7 @@ must use the platform malloc heap(s), or shared memory, or C++ local storage or
 operator new), you must first allocate the object with your custom allocator,
 then pass its pointer to PyObject_{Init, InitVar} for filling in its Python-
 specific fields:  reference count, type pointer, possibly others.  You should
-be aware that Python no control over these objects because they don't
+be aware that Python has no control over these objects because they don't
 cooperate with the Python memory manager.  Such objects may not be eligible
 for automatic garbage collection and you have to make sure that they are
 released accordingly whenever their destructor gets called (cf. the specific
@@ -95,19 +95,12 @@ PyObject_{New, NewVar, Del}.
    the raw memory.
 */
 PyAPI_FUNC(void *) PyObject_Malloc(size_t size);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
 PyAPI_FUNC(void *) PyObject_Calloc(size_t nelem, size_t elsize);
+#endif
 PyAPI_FUNC(void *) PyObject_Realloc(void *ptr, size_t new_size);
 PyAPI_FUNC(void) PyObject_Free(void *ptr);
 
-/* This function returns the number of allocated memory blocks, regardless of size */
-PyAPI_FUNC(Py_ssize_t) _Py_GetAllocatedBlocks(void);
-
-/* Macros */
-#ifdef WITH_PYMALLOC
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyObject_DebugMallocStats(FILE *out);
-#endif /* #ifndef Py_LIMITED_API */
-#endif
 
 /* Macros */
 #define PyObject_MALLOC         PyObject_Malloc
@@ -134,12 +127,38 @@ PyAPI_FUNC(PyVarObject *) _PyObject_NewVar(PyTypeObject *, Py_ssize_t);
 #define PyObject_NewVar(type, typeobj, n) \
                 ( (type *) _PyObject_NewVar((typeobj), (n)) )
 
-/* Macros trading binary compatibility for speed. See also pymem.h.
-   Note that these macros expect non-NULL object pointers.*/
+/* Inline functions trading binary compatibility for speed:
+   PyObject_INIT() is the fast version of PyObject_Init(), and
+   PyObject_INIT_VAR() is the fast version of PyObject_InitVar.
+   See also pymem.h.
+
+   These inline functions expect non-NULL object pointers. */
+static inline PyObject*
+_PyObject_INIT(PyObject *op, PyTypeObject *typeobj)
+{
+    assert(op != NULL);
+    Py_TYPE(op) = typeobj;
+    if (PyType_GetFlags(typeobj) & Py_TPFLAGS_HEAPTYPE) {
+        Py_INCREF(typeobj);
+    }
+    _Py_NewReference(op);
+    return op;
+}
+
 #define PyObject_INIT(op, typeobj) \
-    ( Py_TYPE(op) = (typeobj), _Py_NewReference((PyObject *)(op)), (op) )
+    _PyObject_INIT(_PyObject_CAST(op), (typeobj))
+
+static inline PyVarObject*
+_PyObject_INIT_VAR(PyVarObject *op, PyTypeObject *typeobj, Py_ssize_t size)
+{
+    assert(op != NULL);
+    Py_SIZE(op) = size;
+    PyObject_INIT((PyObject *)op, typeobj);
+    return op;
+}
+
 #define PyObject_INIT_VAR(op, typeobj, size) \
-    ( Py_SIZE(op) = (size), PyObject_INIT((op), (typeobj)) )
+    _PyObject_INIT_VAR(_PyVarObject_CAST(op), (typeobj), (size))
 
 #define _PyObject_SIZE(typeobj) ( (typeobj)->tp_basicsize )
 
@@ -199,24 +218,6 @@ PyAPI_FUNC(PyVarObject *) _PyObject_NewVar(PyTypeObject *, Py_ssize_t);
    constructor you would start directly with PyObject_Init/InitVar
 */
 
-#ifndef Py_LIMITED_API
-typedef struct {
-    /* user context passed as the first argument to the 2 functions */
-    void *ctx;
-
-    /* allocate an arena of size bytes */
-    void* (*alloc) (void *ctx, size_t size);
-
-    /* free an arena */
-    void (*free) (void *ctx, void *ptr, size_t size);
-} PyObjectArenaAllocator;
-
-/* Get the arena allocator. */
-PyAPI_FUNC(void) PyObject_GetArenaAllocator(PyObjectArenaAllocator *allocator);
-
-/* Set the arena allocator. */
-PyAPI_FUNC(void) PyObject_SetArenaAllocator(PyObjectArenaAllocator *allocator);
-#endif
 
 
 /*
@@ -224,110 +225,31 @@ PyAPI_FUNC(void) PyObject_SetArenaAllocator(PyObjectArenaAllocator *allocator);
  * ==========================
  */
 
-/* C equivalent of gc.collect(). */
+/* C equivalent of gc.collect() which ignores the state of gc.enabled. */
 PyAPI_FUNC(Py_ssize_t) PyGC_Collect(void);
 
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) _PyGC_CollectNoFail(void);
-#endif
-
 /* Test if a type has a GC head */
 #define PyType_IS_GC(t) PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC)
 
-/* Test if an object has a GC head */
-#define PyObject_IS_GC(o) (PyType_IS_GC(Py_TYPE(o)) && \
-    (Py_TYPE(o)->tp_is_gc == NULL || Py_TYPE(o)->tp_is_gc(o)))
-
 PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t);
 #define PyObject_GC_Resize(type, op, n) \
-                ( (type *) _PyObject_GC_Resize((PyVarObject *)(op), (n)) )
+                ( (type *) _PyObject_GC_Resize(_PyVarObject_CAST(op), (n)) )
 
-/* GC information is stored BEFORE the object structure. */
-#ifndef Py_LIMITED_API
-typedef union _gc_head {
-    struct {
-        union _gc_head *gc_next;
-        union _gc_head *gc_prev;
-        Py_ssize_t gc_refs;
-    } gc;
-    double dummy;  /* force worst-case alignment */
-} PyGC_Head;
 
-extern PyGC_Head *_PyGC_generation0;
 
-#define _Py_AS_GC(o) ((PyGC_Head *)(o)-1)
-
-/* Bit 0 is set when tp_finalize is called */
-#define _PyGC_REFS_MASK_FINALIZED  (1 << 0)
-/* The (N-1) most significant bits contain the gc state / refcount */
-#define _PyGC_REFS_SHIFT           (1)
-#define _PyGC_REFS_MASK            (((size_t) -1) << _PyGC_REFS_SHIFT)
-
-#define _PyGCHead_REFS(g) ((g)->gc.gc_refs >> _PyGC_REFS_SHIFT)
-#define _PyGCHead_SET_REFS(g, v) do { \
-    (g)->gc.gc_refs = ((g)->gc.gc_refs & ~_PyGC_REFS_MASK) \
-        | (((size_t)(v)) << _PyGC_REFS_SHIFT);             \
-    } while (0)
-#define _PyGCHead_DECREF(g) ((g)->gc.gc_refs -= 1 << _PyGC_REFS_SHIFT)
-
-#define _PyGCHead_FINALIZED(g) (((g)->gc.gc_refs & _PyGC_REFS_MASK_FINALIZED) != 0)
-#define _PyGCHead_SET_FINALIZED(g, v) do {  \
-    (g)->gc.gc_refs = ((g)->gc.gc_refs & ~_PyGC_REFS_MASK_FINALIZED) \
-        | (v != 0); \
-    } while (0)
-
-#define _PyGC_FINALIZED(o) _PyGCHead_FINALIZED(_Py_AS_GC(o))
-#define _PyGC_SET_FINALIZED(o, v) _PyGCHead_SET_FINALIZED(_Py_AS_GC(o), v)
-
-#define _PyGC_REFS(o) _PyGCHead_REFS(_Py_AS_GC(o))
-
-#define _PyGC_REFS_UNTRACKED                    (-2)
-#define _PyGC_REFS_REACHABLE                    (-3)
-#define _PyGC_REFS_TENTATIVELY_UNREACHABLE      (-4)
-
-/* Tell the GC to track this object.  NB: While the object is tracked the
- * collector it must be safe to call the ob_traverse method. */
-#define _PyObject_GC_TRACK(o) do { \
-    PyGC_Head *g = _Py_AS_GC(o); \
-    if (_PyGCHead_REFS(g) != _PyGC_REFS_UNTRACKED) \
-        Py_FatalError("GC object already tracked"); \
-    _PyGCHead_SET_REFS(g, _PyGC_REFS_REACHABLE); \
-    g->gc.gc_next = _PyGC_generation0; \
-    g->gc.gc_prev = _PyGC_generation0->gc.gc_prev; \
-    g->gc.gc_prev->gc.gc_next = g; \
-    _PyGC_generation0->gc.gc_prev = g; \
-    } while (0);
-
-/* Tell the GC to stop tracking this object.
- * gc_next doesn't need to be set to NULL, but doing so is a good
- * way to provoke memory errors if calling code is confused.
- */
-#define _PyObject_GC_UNTRACK(o) do { \
-    PyGC_Head *g = _Py_AS_GC(o); \
-    assert(_PyGCHead_REFS(g) != _PyGC_REFS_UNTRACKED); \
-    _PyGCHead_SET_REFS(g, _PyGC_REFS_UNTRACKED); \
-    g->gc.gc_prev->gc.gc_next = g->gc.gc_next; \
-    g->gc.gc_next->gc.gc_prev = g->gc.gc_prev; \
-    g->gc.gc_next = NULL; \
-    } while (0);
-
-/* True if the object is currently tracked by the GC. */
-#define _PyObject_GC_IS_TRACKED(o) \
-    (_PyGC_REFS(o) != _PyGC_REFS_UNTRACKED)
-
-/* True if the object may be tracked by the GC in the future, or already is.
-   This can be useful to implement some optimizations. */
-#define _PyObject_GC_MAY_BE_TRACKED(obj) \
-    (PyObject_IS_GC(obj) && \
-        (!PyTuple_CheckExact(obj) || _PyObject_GC_IS_TRACKED(obj)))
-#endif /* Py_LIMITED_API */
-
-PyAPI_FUNC(PyObject *) _PyObject_GC_Malloc(size_t size);
-PyAPI_FUNC(PyObject *) _PyObject_GC_Calloc(size_t size);
 PyAPI_FUNC(PyObject *) _PyObject_GC_New(PyTypeObject *);
 PyAPI_FUNC(PyVarObject *) _PyObject_GC_NewVar(PyTypeObject *, Py_ssize_t);
+
+/* Tell the GC to track this object.
+ *
+ * See also private _PyObject_GC_TRACK() macro. */
 PyAPI_FUNC(void) PyObject_GC_Track(void *);
+
+/* Tell the GC to stop tracking this object.
+ *
+ * See also private _PyObject_GC_UNTRACK() macro. */
 PyAPI_FUNC(void) PyObject_GC_UnTrack(void *);
+
 PyAPI_FUNC(void) PyObject_GC_Del(void *);
 
 #define PyObject_GC_New(type, typeobj) \
@@ -344,18 +266,17 @@ PyAPI_FUNC(void) PyObject_GC_Del(void *);
 #define Py_VISIT(op)                                                    \
     do {                                                                \
         if (op) {                                                       \
-            int vret = visit((PyObject *)(op), arg);                    \
+            int vret = visit(_PyObject_CAST(op), arg);                  \
             if (vret)                                                   \
                 return vret;                                            \
         }                                                               \
     } while (0)
 
-
-/* Test if a type supports weak references */
-#define PyType_SUPPORTS_WEAKREFS(t) ((t)->tp_weaklistoffset > 0)
-
-#define PyObject_GET_WEAKREFS_LISTPTR(o) \
-    ((PyObject **) (((char *) (o)) + Py_TYPE(o)->tp_weaklistoffset))
+#ifndef Py_LIMITED_API
+#  define Py_CPYTHON_OBJIMPL_H
+#  include  "cpython/objimpl.h"
+#  undef Py_CPYTHON_OBJIMPL_H
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/odictobject.h b/openflow/include/python3.8/odictobject.h
similarity index 66%
rename from openflow/usr/include/python3.5m/odictobject.h
rename to openflow/include/python3.8/odictobject.h
index c1d9592..35aff8a 100644
--- a/openflow/usr/include/python3.5m/odictobject.h
+++ b/openflow/include/python3.8/odictobject.h
@@ -6,6 +6,7 @@ extern "C" {
 
 
 /* OrderedDict */
+/* This API is optional and mostly redundant. */
 
 #ifndef Py_LIMITED_API
 
@@ -17,25 +18,24 @@ PyAPI_DATA(PyTypeObject) PyODictKeys_Type;
 PyAPI_DATA(PyTypeObject) PyODictItems_Type;
 PyAPI_DATA(PyTypeObject) PyODictValues_Type;
 
-#endif /* Py_LIMITED_API */
-
 #define PyODict_Check(op) PyObject_TypeCheck(op, &PyODict_Type)
 #define PyODict_CheckExact(op) (Py_TYPE(op) == &PyODict_Type)
-#define PyODict_SIZE(op) ((PyDictObject *)op)->ma_used
-#define PyODict_HasKey(od, key) (PyMapping_HasKey(PyObject *)od, key)
+#define PyODict_SIZE(op) PyDict_GET_SIZE((op))
 
 PyAPI_FUNC(PyObject *) PyODict_New(void);
 PyAPI_FUNC(int) PyODict_SetItem(PyObject *od, PyObject *key, PyObject *item);
 PyAPI_FUNC(int) PyODict_DelItem(PyObject *od, PyObject *key);
 
 /* wrappers around PyDict* functions */
-#define PyODict_GetItem(od, key) PyDict_GetItem((PyObject *)od, key)
+#define PyODict_GetItem(od, key) PyDict_GetItem(_PyObject_CAST(od), key)
 #define PyODict_GetItemWithError(od, key) \
-    PyDict_GetItemWithError((PyObject *)od, key)
-#define PyODict_Contains(od, key) PyDict_Contains((PyObject *)od, key)
-#define PyODict_Size(od) PyDict_Size((PyObject *)od)
+    PyDict_GetItemWithError(_PyObject_CAST(od), key)
+#define PyODict_Contains(od, key) PyDict_Contains(_PyObject_CAST(od), key)
+#define PyODict_Size(od) PyDict_Size(_PyObject_CAST(od))
 #define PyODict_GetItemString(od, key) \
-    PyDict_GetItemString((PyObject *)od, key)
+    PyDict_GetItemString(_PyObject_CAST(od), key)
+
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/opcode.h b/openflow/include/python3.8/opcode.h
similarity index 89%
rename from openflow/usr/include/python3.5m/opcode.h
rename to openflow/include/python3.8/opcode.h
index 3f917fb..2a29e97 100644
--- a/openflow/usr/include/python3.5m/opcode.h
+++ b/openflow/include/python3.8/opcode.h
@@ -1,4 +1,4 @@
-/* Auto-generated by Tools/scripts/generate_opcode_h.py */
+/* Auto-generated by Tools/scripts/generate_opcode_h.py from Lib/opcode.py */
 #ifndef Py_OPCODE_H
 #define Py_OPCODE_H
 #ifdef __cplusplus
@@ -12,6 +12,7 @@ extern "C" {
 #define ROT_THREE                 3
 #define DUP_TOP                   4
 #define DUP_TOP_TWO               5
+#define ROT_FOUR                  6
 #define NOP                       9
 #define UNARY_POSITIVE           10
 #define UNARY_NEGATIVE           11
@@ -32,6 +33,8 @@ extern "C" {
 #define GET_AITER                50
 #define GET_ANEXT                51
 #define BEFORE_ASYNC_WITH        52
+#define BEGIN_FINALLY            53
+#define END_ASYNC_FOR            54
 #define INPLACE_ADD              55
 #define INPLACE_SUBTRACT         56
 #define INPLACE_MULTIPLY         57
@@ -55,11 +58,11 @@ extern "C" {
 #define INPLACE_AND              77
 #define INPLACE_XOR              78
 #define INPLACE_OR               79
-#define BREAK_LOOP               80
 #define WITH_CLEANUP_START       81
 #define WITH_CLEANUP_FINISH      82
 #define RETURN_VALUE             83
 #define IMPORT_STAR              84
+#define SETUP_ANNOTATIONS        85
 #define YIELD_VALUE              86
 #define POP_BLOCK                87
 #define END_FINALLY              88
@@ -91,9 +94,6 @@ extern "C" {
 #define POP_JUMP_IF_FALSE       114
 #define POP_JUMP_IF_TRUE        115
 #define LOAD_GLOBAL             116
-#define CONTINUE_LOOP           119
-#define SETUP_LOOP              120
-#define SETUP_EXCEPT            121
 #define SETUP_FINALLY           122
 #define LOAD_FAST               124
 #define STORE_FAST              125
@@ -102,14 +102,12 @@ extern "C" {
 #define CALL_FUNCTION           131
 #define MAKE_FUNCTION           132
 #define BUILD_SLICE             133
-#define MAKE_CLOSURE            134
 #define LOAD_CLOSURE            135
 #define LOAD_DEREF              136
 #define STORE_DEREF             137
 #define DELETE_DEREF            138
-#define CALL_FUNCTION_VAR       140
 #define CALL_FUNCTION_KW        141
-#define CALL_FUNCTION_VAR_KW    142
+#define CALL_FUNCTION_EX        142
 #define SETUP_WITH              143
 #define EXTENDED_ARG            144
 #define LIST_APPEND             145
@@ -122,6 +120,14 @@ extern "C" {
 #define BUILD_TUPLE_UNPACK      152
 #define BUILD_SET_UNPACK        153
 #define SETUP_ASYNC_WITH        154
+#define FORMAT_VALUE            155
+#define BUILD_CONST_KEY_MAP     156
+#define BUILD_STRING            157
+#define BUILD_TUPLE_UNPACK_WITH_CALL 158
+#define LOAD_METHOD             160
+#define CALL_METHOD             161
+#define CALL_FINALLY            162
+#define POP_FINALLY             163
 
 /* EXCEPT_HANDLER is a special, implicit block type which is created when
    entering an except handler. It is not an opcode but we define it here
diff --git a/openflow/usr/include/python3.5m/osdefs.h b/openflow/include/python3.8/osdefs.h
similarity index 93%
rename from openflow/usr/include/python3.5m/osdefs.h
rename to openflow/include/python3.8/osdefs.h
index bd84c1c..3243944 100644
--- a/openflow/usr/include/python3.5m/osdefs.h
+++ b/openflow/include/python3.8/osdefs.h
@@ -14,6 +14,10 @@ extern "C" {
 #define DELIM L';'
 #endif
 
+#ifdef __VXWORKS__
+#define DELIM L';'
+#endif
+
 /* Filename separator */
 #ifndef SEP
 #define SEP L'/'
diff --git a/openflow/include/python3.8/osmodule.h b/openflow/include/python3.8/osmodule.h
new file mode 100644
index 0000000..9095c2f
--- /dev/null
+++ b/openflow/include/python3.8/osmodule.h
@@ -0,0 +1,17 @@
+
+/* os module interface */
+
+#ifndef Py_OSMODULE_H
+#define Py_OSMODULE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
+PyAPI_FUNC(PyObject *) PyOS_FSPath(PyObject *path);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_OSMODULE_H */
diff --git a/openflow/usr/include/python3.5m/parsetok.h b/openflow/include/python3.8/parsetok.h
similarity index 90%
rename from openflow/usr/include/python3.5m/parsetok.h
rename to openflow/include/python3.8/parsetok.h
index 2acb854..935d733 100644
--- a/openflow/usr/include/python3.5m/parsetok.h
+++ b/openflow/include/python3.8/parsetok.h
@@ -1,5 +1,5 @@
-
 /* Parser-tokenizer link interface */
+
 #ifndef Py_LIMITED_API
 #ifndef Py_PARSETOK_H
 #define Py_PARSETOK_H
@@ -7,12 +7,12 @@
 extern "C" {
 #endif
 
+#include "grammar.h"      /* grammar */
+#include "node.h"         /* node */
+
 typedef struct {
     int error;
-#ifndef PGEN
-    /* The filename is useless for pgen, see comment in tok_state structure */
     PyObject *filename;
-#endif
     int lineno;
     int offset;
     char *text;                 /* UTF-8-encoded string */
@@ -21,19 +21,21 @@ typedef struct {
 } perrdetail;
 
 #if 0
-#define PyPARSE_YIELD_IS_KEYWORD	0x0001
+#define PyPARSE_YIELD_IS_KEYWORD        0x0001
 #endif
 
-#define PyPARSE_DONT_IMPLY_DEDENT	0x0002
+#define PyPARSE_DONT_IMPLY_DEDENT       0x0002
 
 #if 0
-#define PyPARSE_WITH_IS_KEYWORD		0x0003
+#define PyPARSE_WITH_IS_KEYWORD         0x0003
 #define PyPARSE_PRINT_IS_FUNCTION       0x0004
 #define PyPARSE_UNICODE_LITERALS        0x0008
 #endif
 
 #define PyPARSE_IGNORE_COOKIE 0x0010
 #define PyPARSE_BARRY_AS_BDFL 0x0020
+#define PyPARSE_TYPE_COMMENTS 0x0040
+#define PyPARSE_ASYNC_HACKS   0x0080
 
 PyAPI_FUNC(node *) PyParser_ParseString(const char *, grammar *, int,
                                               perrdetail *);
diff --git a/openflow/include/python3.8/patchlevel.h b/openflow/include/python3.8/patchlevel.h
new file mode 100644
index 0000000..d685a85
--- /dev/null
+++ b/openflow/include/python3.8/patchlevel.h
@@ -0,0 +1,35 @@
+
+/* Python version identification scheme.
+
+   When the major or minor version changes, the VERSION variable in
+   configure.ac must also be changed.
+
+   There is also (independent) API version information in modsupport.h.
+*/
+
+/* Values for PY_RELEASE_LEVEL */
+#define PY_RELEASE_LEVEL_ALPHA  0xA
+#define PY_RELEASE_LEVEL_BETA   0xB
+#define PY_RELEASE_LEVEL_GAMMA  0xC     /* For release candidates */
+#define PY_RELEASE_LEVEL_FINAL  0xF     /* Serial should be 0 here */
+                                        /* Higher for patch releases */
+
+/* Version parsed out into numeric values */
+/*--start constants--*/
+#define PY_MAJOR_VERSION        3
+#define PY_MINOR_VERSION        8
+#define PY_MICRO_VERSION        0
+#define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL       0
+
+/* Version as a string */
+#define PY_VERSION              "3.8.0"
+/*--end constants--*/
+
+/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
+   Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
+#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \
+                        (PY_MINOR_VERSION << 16) | \
+                        (PY_MICRO_VERSION <<  8) | \
+                        (PY_RELEASE_LEVEL <<  4) | \
+                        (PY_RELEASE_SERIAL << 0))
diff --git a/openflow/include/python3.8/picklebufobject.h b/openflow/include/python3.8/picklebufobject.h
new file mode 100644
index 0000000..f07e900
--- /dev/null
+++ b/openflow/include/python3.8/picklebufobject.h
@@ -0,0 +1,31 @@
+/* PickleBuffer object. This is built-in for ease of use from third-party
+ * C extensions.
+ */
+
+#ifndef Py_PICKLEBUFOBJECT_H
+#define Py_PICKLEBUFOBJECT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_LIMITED_API
+
+PyAPI_DATA(PyTypeObject) PyPickleBuffer_Type;
+
+#define PyPickleBuffer_Check(op) (Py_TYPE(op) == &PyPickleBuffer_Type)
+
+/* Create a PickleBuffer redirecting to the given buffer-enabled object */
+PyAPI_FUNC(PyObject *) PyPickleBuffer_FromObject(PyObject *);
+/* Get the PickleBuffer's underlying view to the original object
+ * (NULL if released)
+ */
+PyAPI_FUNC(const Py_buffer *) PyPickleBuffer_GetBuffer(PyObject *);
+/* Release the PickleBuffer.  Returns 0 on success, -1 on error. */
+PyAPI_FUNC(int) PyPickleBuffer_Release(PyObject *);
+
+#endif /* !Py_LIMITED_API */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_PICKLEBUFOBJECT_H */
diff --git a/openflow/include/python3.8/py_curses.h b/openflow/include/python3.8/py_curses.h
new file mode 100644
index 0000000..2702b37
--- /dev/null
+++ b/openflow/include/python3.8/py_curses.h
@@ -0,0 +1,100 @@
+
+#ifndef Py_CURSES_H
+#define Py_CURSES_H
+
+#ifdef __APPLE__
+/*
+** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards
+** against multiple definition of wchar_t.
+*/
+#ifdef _BSD_WCHAR_T_DEFINED_
+#define _WCHAR_T
+#endif
+#endif /* __APPLE__ */
+
+/* On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
+   against multiple definition of wchar_t and wint_t. */
+#if defined(__FreeBSD__) && defined(_XOPEN_SOURCE_EXTENDED)
+# ifndef __wchar_t
+#   define __wchar_t
+# endif
+# ifndef __wint_t
+#   define __wint_t
+# endif
+#endif
+
+#if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS)
+/* The following definition is necessary for ncurses 5.7; without it,
+   some of [n]curses.h set NCURSES_OPAQUE to 1, and then Python
+   can't get at the WINDOW flags field. */
+#define NCURSES_OPAQUE 0
+#endif
+
+#ifdef HAVE_NCURSES_H
+#include <ncurses.h>
+#else
+#include <curses.h>
+#endif
+
+#ifdef HAVE_NCURSES_H
+/* configure was checking <curses.h>, but we will
+   use <ncurses.h>, which has some or all these features. */
+#if !defined(WINDOW_HAS_FLAGS) && !(NCURSES_OPAQUE+0)
+#define WINDOW_HAS_FLAGS 1
+#endif
+#if !defined(HAVE_CURSES_IS_PAD) && NCURSES_VERSION_PATCH+0 >= 20090906
+#define HAVE_CURSES_IS_PAD 1
+#endif
+#ifndef MVWDELCH_IS_EXPRESSION
+#define MVWDELCH_IS_EXPRESSION 1
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define PyCurses_API_pointers 4
+
+/* Type declarations */
+
+typedef struct {
+    PyObject_HEAD
+    WINDOW *win;
+    char *encoding;
+} PyCursesWindowObject;
+
+#define PyCursesWindow_Check(v)  (Py_TYPE(v) == &PyCursesWindow_Type)
+
+#define PyCurses_CAPSULE_NAME "_curses._C_API"
+
+
+#ifdef CURSES_MODULE
+/* This section is used when compiling _cursesmodule.c */
+
+#else
+/* This section is used in modules that use the _cursesmodule API */
+
+static void **PyCurses_API;
+
+#define PyCursesWindow_Type (*(PyTypeObject *) PyCurses_API[0])
+#define PyCursesSetupTermCalled  {if (! ((int (*)(void))PyCurses_API[1]) () ) return NULL;}
+#define PyCursesInitialised      {if (! ((int (*)(void))PyCurses_API[2]) () ) return NULL;}
+#define PyCursesInitialisedColor {if (! ((int (*)(void))PyCurses_API[3]) () ) return NULL;}
+
+#define import_curses() \
+    PyCurses_API = (void **)PyCapsule_Import(PyCurses_CAPSULE_NAME, 1);
+
+#endif
+
+/* general error messages */
+static const char catchall_ERR[]  = "curses function returned ERR";
+static const char catchall_NULL[] = "curses function returned NULL";
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !defined(Py_CURSES_H) */
+
+
diff --git a/openflow/usr/include/python3.5m/pyarena.h b/openflow/include/python3.8/pyarena.h
similarity index 100%
rename from openflow/usr/include/python3.5m/pyarena.h
rename to openflow/include/python3.8/pyarena.h
diff --git a/openflow/usr/include/python3.5m/pycapsule.h b/openflow/include/python3.8/pycapsule.h
similarity index 100%
rename from openflow/usr/include/python3.5m/pycapsule.h
rename to openflow/include/python3.8/pycapsule.h
diff --git a/openflow/usr/include/arm-linux-gnueabihf/python3.5m/pyconfig.h b/openflow/include/python3.8/pyconfig.h
similarity index 85%
rename from openflow/usr/include/arm-linux-gnueabihf/python3.5m/pyconfig.h
rename to openflow/include/python3.8/pyconfig.h
index a638031..3986cd6 100644
--- a/openflow/usr/include/arm-linux-gnueabihf/python3.5m/pyconfig.h
+++ b/openflow/include/python3.8/pyconfig.h
@@ -13,6 +13,13 @@
    support for AIX C++ shared extension modules. */
 /* #undef AIX_GENUINE_CPLUSPLUS */
 
+/* Alternative SOABI used in debug build to load C extensions built in release
+   mode */
+/* #undef ALT_SOABI */
+
+/* The Android API level. */
+/* #undef ANDROID_API_LEVEL */
+
 /* Define if C doubles are 64-bit IEEE 754 binary format, stored in ARM
    mixed-endian order (byte order 45670123) */
 /* #undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 */
@@ -28,6 +35,10 @@
 /* Define if --enable-ipv6 is specified */
 #define ENABLE_IPV6 1
 
+/* Define to 1 if your system stores words within floats with the most
+   significant word first */
+/* #undef FLOAT_WORDS_BIGENDIAN */
+
 /* Define if flock needs to be linked with bsd library. */
 /* #undef FLOCK_NEEDS_LIBBSD */
 
@@ -72,7 +83,7 @@
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 
 /* Define to 1 if you have the <bluetooth/bluetooth.h> header file. */
-#define HAVE_BLUETOOTH_BLUETOOTH_H 1
+/* #undef HAVE_BLUETOOTH_BLUETOOTH_H */
 
 /* Define to 1 if you have the <bluetooth.h> header file. */
 /* #undef HAVE_BLUETOOTH_H */
@@ -105,9 +116,6 @@
 /* Has builtin atomics */
 #define HAVE_BUILTIN_ATOMIC 1
 
-/* Define this if you have the type _Bool. */
-#define HAVE_C99_BOOL 1
-
 /* Define to 1 if you have the 'chflags' function. */
 /* #undef HAVE_CHFLAGS */
 
@@ -126,6 +134,9 @@
 /* Define to 1 if you have the `clock_gettime' function. */
 #define HAVE_CLOCK_GETTIME 1
 
+/* Define to 1 if you have the `clock_settime' function. */
+#define HAVE_CLOCK_SETTIME 1
+
 /* Define if the C compiler supports computed gotos. */
 #define HAVE_COMPUTED_GOTOS 1
 
@@ -138,15 +149,36 @@
 /* Define to 1 if you have the `copysign' function. */
 #define HAVE_COPYSIGN 1
 
+/* Define to 1 if you have the `copy_file_range' function. */
+/* #undef HAVE_COPY_FILE_RANGE */
+
+/* Define to 1 if you have the <crypt.h> header file. */
+#define HAVE_CRYPT_H 1
+
+/* Define if you have the crypt_r() function. */
+#define HAVE_CRYPT_R 1
+
 /* Define to 1 if you have the `ctermid' function. */
 #define HAVE_CTERMID 1
 
 /* Define if you have the 'ctermid_r' function. */
 /* #undef HAVE_CTERMID_R */
 
+/* Define if you have the 'filter' function. */
+#define HAVE_CURSES_FILTER 1
+
 /* Define to 1 if you have the <curses.h> header file. */
 #define HAVE_CURSES_H 1
 
+/* Define if you have the 'has_key' function. */
+#define HAVE_CURSES_HAS_KEY 1
+
+/* Define if you have the 'immedok' function. */
+#define HAVE_CURSES_IMMEDOK 1
+
+/* Define if you have the 'is_pad' function or macro. */
+#define HAVE_CURSES_IS_PAD 1
+
 /* Define if you have the 'is_term_resized' function. */
 #define HAVE_CURSES_IS_TERM_RESIZED 1
 
@@ -156,6 +188,18 @@
 /* Define if you have the 'resize_term' function. */
 #define HAVE_CURSES_RESIZE_TERM 1
 
+/* Define if you have the 'syncok' function. */
+#define HAVE_CURSES_SYNCOK 1
+
+/* Define if you have the 'typeahead' function. */
+#define HAVE_CURSES_TYPEAHEAD 1
+
+/* Define if you have the 'use_env' function. */
+#define HAVE_CURSES_USE_ENV 1
+
+/* Define if you have the 'wchgat' function. */
+#define HAVE_CURSES_WCHGAT 1
+
 /* Define to 1 if you have the declaration of `isfinite', and to 0 if you
    don't. */
 #define HAVE_DECL_ISFINITE 1
@@ -168,6 +212,38 @@
    */
 #define HAVE_DECL_ISNAN 1
 
+/* Define to 1 if you have the declaration of `RTLD_DEEPBIND', and to 0 if you
+   don't. */
+#define HAVE_DECL_RTLD_DEEPBIND 1
+
+/* Define to 1 if you have the declaration of `RTLD_GLOBAL', and to 0 if you
+   don't. */
+#define HAVE_DECL_RTLD_GLOBAL 1
+
+/* Define to 1 if you have the declaration of `RTLD_LAZY', and to 0 if you
+   don't. */
+#define HAVE_DECL_RTLD_LAZY 1
+
+/* Define to 1 if you have the declaration of `RTLD_LOCAL', and to 0 if you
+   don't. */
+#define HAVE_DECL_RTLD_LOCAL 1
+
+/* Define to 1 if you have the declaration of `RTLD_MEMBER', and to 0 if you
+   don't. */
+#define HAVE_DECL_RTLD_MEMBER 0
+
+/* Define to 1 if you have the declaration of `RTLD_NODELETE', and to 0 if you
+   don't. */
+#define HAVE_DECL_RTLD_NODELETE 1
+
+/* Define to 1 if you have the declaration of `RTLD_NOLOAD', and to 0 if you
+   don't. */
+#define HAVE_DECL_RTLD_NOLOAD 1
+
+/* Define to 1 if you have the declaration of `RTLD_NOW', and to 0 if you
+   don't. */
+#define HAVE_DECL_RTLD_NOW 1
+
 /* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
    */
 /* #undef HAVE_DECL_TZNAME */
@@ -230,6 +306,12 @@
 /* Define to 1 if you have the `execv' function. */
 #define HAVE_EXECV 1
 
+/* Define to 1 if you have the `explicit_bzero' function. */
+/* #undef HAVE_EXPLICIT_BZERO */
+
+/* Define to 1 if you have the `explicit_memset' function. */
+/* #undef HAVE_EXPLICIT_MEMSET */
+
 /* Define to 1 if you have the `expm1' function. */
 #define HAVE_EXPM1 1
 
@@ -260,6 +342,9 @@
 /* Define to 1 if you have the `fdopendir' function. */
 #define HAVE_FDOPENDIR 1
 
+/* Define to 1 if you have the `fdwalk' function. */
+/* #undef HAVE_FDWALK */
+
 /* Define to 1 if you have the `fexecve' function. */
 #define HAVE_FEXECVE 1
 
@@ -342,6 +427,12 @@
 /* Define to 1 if you have the `getentropy' function. */
 /* #undef HAVE_GETENTROPY */
 
+/* Define to 1 if you have the `getgrgid_r' function. */
+#define HAVE_GETGRGID_R 1
+
+/* Define to 1 if you have the `getgrnam_r' function. */
+#define HAVE_GETGRNAM_R 1
+
 /* Define to 1 if you have the `getgrouplist' function. */
 #define HAVE_GETGROUPLIST 1
 
@@ -396,6 +487,12 @@
 /* Define to 1 if you have the `getpwent' function. */
 #define HAVE_GETPWENT 1
 
+/* Define to 1 if you have the `getpwnam_r' function. */
+#define HAVE_GETPWNAM_R 1
+
+/* Define to 1 if you have the `getpwuid_r' function. */
+#define HAVE_GETPWUID_R 1
+
 /* Define to 1 if the getrandom() function is available */
 /* #undef HAVE_GETRANDOM */
 
@@ -454,12 +551,6 @@
 /* Define to 1 if you have the `initgroups' function. */
 #define HAVE_INITGROUPS 1
 
-/* Define if your compiler provides int32_t. */
-#define HAVE_INT32_T 1
-
-/* Define if your compiler provides int64_t. */
-#define HAVE_INT64_T 1
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
@@ -482,9 +573,9 @@
 #define HAVE_LANGINFO_H 1
 
 /* Defined to enable large file support when an off_t is bigger than a long
-   and long long is available and at least as big as an off_t. You may need to
-   add some flags for configuration and compilation to enable this mode. (For
-   Solaris and Linux, the necessary defines are already defined.) */
+   and long long is at least as big as an off_t. You may need to add some
+   flags for configuration and compilation to enable this mode. (For Solaris
+   and Linux, the necessary defines are already defined.) */
 #define HAVE_LARGEFILE_SUPPORT 1
 
 /* Define to 1 if you have the 'lchflags' function. */
@@ -541,14 +632,23 @@
 /* Define to 1 if you have the <linux/can/raw.h> header file. */
 #define HAVE_LINUX_CAN_RAW_H 1
 
+/* Define to 1 if you have the <linux/memfd.h> header file. */
+#define HAVE_LINUX_MEMFD_H 1
+
 /* Define to 1 if you have the <linux/netlink.h> header file. */
 #define HAVE_LINUX_NETLINK_H 1
 
+/* Define to 1 if you have the <linux/qrtr.h> header file. */
+/* #undef HAVE_LINUX_QRTR_H */
+
+/* Define to 1 if you have the <linux/random.h> header file. */
+#define HAVE_LINUX_RANDOM_H 1
+
 /* Define to 1 if you have the <linux/tipc.h> header file. */
 #define HAVE_LINUX_TIPC_H 1
 
-/* Define to 1 if you have the <linux/random.h> header file. */
-#define HAVE_LINUX_RANDOM_H 1
+/* Define to 1 if you have the <linux/vm_sockets.h> header file. */
+#define HAVE_LINUX_VM_SOCKETS_H 1
 
 /* Define to 1 if you have the `lockf' function. */
 #define HAVE_LOCKF 1
@@ -559,26 +659,26 @@
 /* Define to 1 if you have the `log2' function. */
 #define HAVE_LOG2 1
 
-/* Define this if you have the type long double. */
+/* Define to 1 if the system has the type `long double'. */
 #define HAVE_LONG_DOUBLE 1
 
-/* Define this if you have the type long long. */
-#define HAVE_LONG_LONG 1
-
 /* Define to 1 if you have the `lstat' function. */
 #define HAVE_LSTAT 1
 
 /* Define to 1 if you have the `lutimes' function. */
 #define HAVE_LUTIMES 1
 
+/* Define to 1 if you have the `madvise' function. */
+#define HAVE_MADVISE 1
+
 /* Define this if you have the makedev macro. */
 #define HAVE_MAKEDEV 1
 
 /* Define to 1 if you have the `mbrtowc' function. */
 #define HAVE_MBRTOWC 1
 
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
+/* Define if you have the 'memfd_create' function. */
+/* #undef HAVE_MEMFD_CREATE */
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
@@ -631,9 +731,6 @@
 /* Define to 1 if you have the `openpty' function. */
 #define HAVE_OPENPTY 1
 
-/* Define if compiling using MacOS X 10.5 SDK or later. */
-/* #undef HAVE_OSX105_SDK */
-
 /* Define to 1 if you have the `pathconf' function. */
 #define HAVE_PATHCONF 1
 
@@ -658,9 +755,21 @@
 /* Define to 1 if you have the `posix_fallocate' function. */
 #define HAVE_POSIX_FALLOCATE 1
 
+/* Define to 1 if you have the `posix_spawn' function. */
+#define HAVE_POSIX_SPAWN 1
+
+/* Define to 1 if you have the `posix_spawnp' function. */
+#define HAVE_POSIX_SPAWNP 1
+
 /* Define to 1 if you have the `pread' function. */
 #define HAVE_PREAD 1
 
+/* Define to 1 if you have the `preadv' function. */
+#define HAVE_PREADV 1
+
+/* Define to 1 if you have the `preadv2' function. */
+/* #undef HAVE_PREADV2 */
+
 /* Define if you have the 'prlimit' functions. */
 #define HAVE_PRLIMIT 1
 
@@ -670,12 +779,15 @@
 /* Define if your compiler supports function prototype */
 #define HAVE_PROTOTYPES 1
 
-/* Define to 1 if you have the `pthread_atfork' function. */
-#define HAVE_PTHREAD_ATFORK 1
+/* Define to 1 if you have the `pthread_condattr_setclock' function. */
+#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1
 
 /* Defined for Solaris 2.6 bug in pthread header. */
 /* #undef HAVE_PTHREAD_DESTRUCTOR */
 
+/* Define to 1 if you have the `pthread_getcpuclockid' function. */
+#define HAVE_PTHREAD_GETCPUCLOCKID 1
+
 /* Define to 1 if you have the <pthread.h> header file. */
 #define HAVE_PTHREAD_H 1
 
@@ -697,8 +809,11 @@
 /* Define to 1 if you have the `pwrite' function. */
 #define HAVE_PWRITE 1
 
-/* Define if the libcrypto has RAND_egd */
-#define HAVE_RAND_EGD 1
+/* Define to 1 if you have the `pwritev' function. */
+#define HAVE_PWRITEV 1
+
+/* Define to 1 if you have the `pwritev2' function. */
+/* #undef HAVE_PWRITEV2 */
 
 /* Define to 1 if you have the `readlink' function. */
 #define HAVE_READLINK 1
@@ -718,9 +833,6 @@
 /* Define if readline supports append_history */
 #define HAVE_RL_APPEND_HISTORY 1
 
-/* Define if you have readline 2.1 */
-#define HAVE_RL_CALLBACK 1
-
 /* Define if you can turn off readline's signal handling. */
 #define HAVE_RL_CATCH_SIGNAL 1
 
@@ -745,6 +857,9 @@
 /* Define to 1 if you have the `round' function. */
 #define HAVE_ROUND 1
 
+/* Define to 1 if you have the `rtpSpawn' function. */
+/* #undef HAVE_RTPSPAWN */
+
 /* Define to 1 if you have the `sched_get_priority_max' function. */
 #define HAVE_SCHED_GET_PRIORITY_MAX 1
 
@@ -763,9 +878,6 @@
 /* Define to 1 if you have the `sched_setscheduler' function. */
 #define HAVE_SCHED_SETSCHEDULER 1
 
-/* Define to 1 if you have the `select' function. */
-#define HAVE_SELECT 1
-
 /* Define to 1 if you have the `sem_getvalue' function. */
 #define HAVE_SEM_GETVALUE 1
 
@@ -835,12 +947,24 @@
 /* Define to 1 if you have the <shadow.h> header file. */
 #define HAVE_SHADOW_H 1
 
+/* Define to 1 if you have the `shm_open' function. */
+#define HAVE_SHM_OPEN 1
+
+/* Define to 1 if you have the `shm_unlink' function. */
+#define HAVE_SHM_UNLINK 1
+
 /* Define to 1 if you have the `sigaction' function. */
 #define HAVE_SIGACTION 1
 
 /* Define to 1 if you have the `sigaltstack' function. */
 #define HAVE_SIGALTSTACK 1
 
+/* Define to 1 if you have the `sigfillset' function. */
+#define HAVE_SIGFILLSET 1
+
+/* Define to 1 if `si_band' is a member of `siginfo_t'. */
+#define HAVE_SIGINFO_T_SI_BAND 1
+
 /* Define to 1 if you have the `siginterrupt' function. */
 #define HAVE_SIGINTERRUPT 1
 
@@ -865,6 +989,9 @@
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 
+/* struct sockaddr_alg (linux/if_alg.h) */
+#define HAVE_SOCKADDR_ALG 1
+
 /* Define if sockaddr has sa_len member */
 /* #undef HAVE_SOCKADDR_SA_LEN */
 
@@ -899,7 +1026,7 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
-/* Has stdatomic.h, atomic_int and _Atomic void* types work */
+/* Has stdatomic.h with atomic_int */
 #define HAVE_STD_ATOMIC 1
 
 /* Define to 1 if you have the `strdup' function. */
@@ -920,6 +1047,15 @@
 /* Define to 1 if you have the <stropts.h> header file. */
 #define HAVE_STROPTS_H 1
 
+/* Define to 1 if you have the `strsignal' function. */
+#define HAVE_STRSIGNAL 1
+
+/* Define to 1 if `pw_gecos' is a member of `struct passwd'. */
+#define HAVE_STRUCT_PASSWD_PW_GECOS 1
+
+/* Define to 1 if `pw_passwd' is a member of `struct passwd'. */
+#define HAVE_STRUCT_PASSWD_PW_PASSWD 1
+
 /* Define to 1 if `st_birthtime' is a member of `struct stat'. */
 /* #undef HAVE_STRUCT_STAT_ST_BIRTHTIME */
 
@@ -993,9 +1129,15 @@
 /* Define to 1 if you have the <sys/lock.h> header file. */
 /* #undef HAVE_SYS_LOCK_H */
 
+/* Define to 1 if you have the <sys/memfd.h> header file. */
+/* #undef HAVE_SYS_MEMFD_H */
+
 /* Define to 1 if you have the <sys/mkdev.h> header file. */
 /* #undef HAVE_SYS_MKDEV_H */
 
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
 /* Define to 1 if you have the <sys/modem.h> header file. */
 /* #undef HAVE_SYS_MODEM_H */
 
@@ -1009,6 +1151,9 @@
 /* Define to 1 if you have the <sys/poll.h> header file. */
 #define HAVE_SYS_POLL_H 1
 
+/* Define to 1 if you have the <sys/random.h> header file. */
+/* #undef HAVE_SYS_RANDOM_H */
+
 /* Define to 1 if you have the <sys/resource.h> header file. */
 #define HAVE_SYS_RESOURCE_H 1
 
@@ -1030,6 +1175,9 @@
 /* Define to 1 if you have the <sys/syscall.h> header file. */
 #define HAVE_SYS_SYSCALL_H 1
 
+/* Define to 1 if you have the <sys/sysmacros.h> header file. */
+#define HAVE_SYS_SYSMACROS_H 1
+
 /* Define to 1 if you have the <sys/sys_domain.h> header file. */
 /* #undef HAVE_SYS_SYS_DOMAIN_H */
 
@@ -1107,15 +1255,6 @@
 /* Define this if you have tcl and TCL_UTF_MAX==6 */
 /* #undef HAVE_UCS4_TCL */
 
-/* Define if your compiler provides uint32_t. */
-#define HAVE_UINT32_T 1
-
-/* Define if your compiler provides uint64_t. */
-#define HAVE_UINT64_T 1
-
-/* Define to 1 if the system has the type `uintptr_t'. */
-#define HAVE_UINTPTR_T 1
-
 /* Define to 1 if you have the `uname' function. */
 #define HAVE_UNAME 1
 
@@ -1145,6 +1284,21 @@
 /* Define to 1 if you have the <utime.h> header file. */
 #define HAVE_UTIME_H 1
 
+/* Define if uuid_create() exists. */
+/* #undef HAVE_UUID_CREATE */
+
+/* Define if uuid_enc_be() exists. */
+/* #undef HAVE_UUID_ENC_BE */
+
+/* Define if uuid_generate_time_safe() exists. */
+/* #undef HAVE_UUID_GENERATE_TIME_SAFE */
+
+/* Define to 1 if you have the <uuid.h> header file. */
+/* #undef HAVE_UUID_H */
+
+/* Define to 1 if you have the <uuid/uuid.h> header file. */
+/* #undef HAVE_UUID_UUID_H */
+
 /* Define to 1 if you have the `wait3' function. */
 #define HAVE_WAIT3 1
 
@@ -1179,15 +1333,15 @@
 /* Define to 1 if you have the `writev' function. */
 #define HAVE_WRITEV 1
 
+/* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */
+#define HAVE_X509_VERIFY_PARAM_SET1_HOST 1
+
 /* Define if the zlib library has inflateCopy */
 #define HAVE_ZLIB_COPY 1
 
 /* Define to 1 if you have the `_getpty' function. */
 /* #undef HAVE__GETPTY */
 
-/* Define if log1p(-0.) is 0. rather than -0. */
-/* #undef LOG1P_DROPS_ZERO_SIGN */
-
 /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
    */
 /* #undef MAJOR_IN_MKDEV */
@@ -1220,18 +1374,28 @@
 /* Define if POSIX semaphores aren't enabled on your system */
 /* #undef POSIX_SEMAPHORES_NOT_ENABLED */
 
+/* Define if pthread_key_t is compatible with int. */
+#define PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT 1
+
 /* Defined if PTHREAD_SCOPE_SYSTEM supported. */
 #define PTHREAD_SYSTEM_SCHED_SUPPORTED 1
 
 /* Define as the preferred size in bits of long digits */
 /* #undef PYLONG_BITS_IN_DIGIT */
 
-/* Define to printf format modifier for long long type */
-#define PY_FORMAT_LONG_LONG "ll"
+/* Define if you want to coerce the C locale to a UTF-8 based locale */
+#define PY_COERCE_C_LOCALE 1
 
 /* Define to printf format modifier for Py_ssize_t */
 #define PY_FORMAT_SIZE_T "z"
 
+/* Default cipher suites list for ssl module. 1: Python's preferred selection,
+   2: leave OpenSSL defaults untouched, 0: custom string */
+#define PY_SSL_DEFAULT_CIPHERS 1
+
+/* Cipher suite string for PY_SSL_DEFAULT_CIPHERS=0 */
+/* #undef PY_SSL_DEFAULT_CIPHER_STRING */
+
 /* Define if you want to build an interpreter with many run-time checks. */
 /* #undef Py_DEBUG */
 
@@ -1242,12 +1406,18 @@
    externally defined: 0 */
 /* #undef Py_HASH_ALGORITHM */
 
+/* Define if you want to enable tracing references for debugging purpose */
+/* #undef Py_TRACE_REFS */
+
 /* assume C89 semantics that RETSIGTYPE is always void */
 #define RETSIGTYPE void
 
 /* Define if setpgrp() must be called as setpgrp(0, 0). */
 /* #undef SETPGRP_HAVE_ARG */
 
+/* Define to 1 if you must link with -lrt for shm_open(). */
+#define SHM_NEEDS_LIBRT 1
+
 /* Define if i>>j for signed int i does not extend the sign bit when i < 0 */
 /* #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS */
 
@@ -1278,6 +1448,9 @@
 /* The size of `pid_t', as computed by sizeof. */
 #define SIZEOF_PID_T 4
 
+/* The size of `pthread_key_t', as computed by sizeof. */
+#define SIZEOF_PTHREAD_KEY_T 4
+
 /* The size of `pthread_t', as computed by sizeof. */
 #define SIZEOF_PTHREAD_T 4
 
@@ -1309,9 +1482,6 @@
    (which you can't on SCO ODT 3.0). */
 #define SYS_SELECT_WITH_SYS_TIME 1
 
-/* Define if tanh(-0.) is -0., or if platform doesn't have signed zeros */
-#define TANH_PRESERVES_ZERO_SIGN 1
-
 /* Library needed by timemodule.c: librt may be needed for clock_gettime() */
 /* #undef TIMEMODULE_LIB */
 
@@ -1322,10 +1492,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Define if you want to use computed gotos in ceval.c. */
-#define USE_COMPUTED_GOTOS 1
-
-/* Define to use the C99 inline keyword. */
-#define USE_INLINE 1
+/* #undef USE_COMPUTED_GOTOS */
 
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
@@ -1349,18 +1516,15 @@
 #endif
 
 
-/* Define if a va_list is an array of some kind */
-/* #undef VA_LIST_IS_ARRAY */
-
-/* Define if you want SIGFPE handled (see Include/pyfpe.h). */
-#define WANT_SIGFPE_HANDLER 1
-
 /* Define if WINDOW in curses.h offers a field _flags. */
 #define WINDOW_HAS_FLAGS 1
 
 /* Define if you want documentation strings in extension modules */
 #define WITH_DOC_STRINGS 1
 
+/* Define if you want to compile in DTrace support */
+/* #undef WITH_DTRACE */
+
 /* Define if you want to use the new-style (Openstep, Rhapsody, MacOS) dynamic
    linker (dyld) instead of the old-style (NextStep) dynamic linker (rld).
    Dyld is necessary to support frameworks. */
@@ -1376,12 +1540,6 @@
 /* Define if you want to compile in Python-specific mallocs */
 #define WITH_PYMALLOC 1
 
-/* Define if you want to compile in rudimentary thread support */
-#define WITH_THREAD 1
-
-/* Define to profile with the Pentium timestamp counter */
-/* #undef WITH_TSC */
-
 /* Define if you want pymalloc to be disabled when running under valgrind */
 /* #undef WITH_VALGRIND */
 
@@ -1403,9 +1561,6 @@
 /* Define on OpenBSD to activate all library features */
 /* #undef _BSD_SOURCE */
 
-/* Define on Irix to enable u_int */
-#define _BSD_TYPES 1
-
 /* Define on Darwin to activate all library features */
 #define _DARWIN_C_SOURCE 1
 
@@ -1443,19 +1598,12 @@
 /* Define if you have POSIX threads, and your system does not define that. */
 /* #undef _POSIX_THREADS */
 
+/* framework name */
+#define _PYTHONFRAMEWORK ""
+
 /* Define to force use of thread-safe errno, h_errno, and other functions */
 /* #undef _REENTRANT */
 
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-/* #undef _UINT32_T */
-
-/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-/* #undef _UINT64_T */
-
 /* Define to the level of X/Open that your system supports */
 #define _XOPEN_SOURCE 700
 
@@ -1479,20 +1627,6 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef gid_t */
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to the type of a signed integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef int32_t */
-
-/* Define to the type of a signed integer type of width exactly 64 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef int64_t */
-
 /* Define to `int' if <sys/types.h> does not define. */
 /* #undef mode_t */
 
@@ -1514,17 +1648,6 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef uid_t */
 
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef uint32_t */
-
-/* Define to the type of an unsigned integer type of width exactly 64 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef uint64_t */
-
-/* Define to empty if the keyword does not work. */
-/* #undef volatile */
-
 
 /* Define the macros needed if on a UnixWare 7.x system. */
 #if defined(__USLC__) && defined(__SCO_VERSION__)
diff --git a/openflow/usr/include/python3.5m/pyctype.h b/openflow/include/python3.8/pyctype.h
similarity index 100%
rename from openflow/usr/include/python3.5m/pyctype.h
rename to openflow/include/python3.8/pyctype.h
diff --git a/openflow/usr/include/python3.5m/pydebug.h b/openflow/include/python3.8/pydebug.h
similarity index 90%
rename from openflow/usr/include/python3.5m/pydebug.h
rename to openflow/include/python3.8/pydebug.h
index 19bec2b..bd4aafe 100644
--- a/openflow/usr/include/python3.5m/pydebug.h
+++ b/openflow/include/python3.8/pydebug.h
@@ -15,7 +15,6 @@ PyAPI_DATA(int) Py_InspectFlag;
 PyAPI_DATA(int) Py_OptimizeFlag;
 PyAPI_DATA(int) Py_NoSiteFlag;
 PyAPI_DATA(int) Py_BytesWarningFlag;
-PyAPI_DATA(int) Py_UseClassExceptionsFlag;
 PyAPI_DATA(int) Py_FrozenFlag;
 PyAPI_DATA(int) Py_IgnoreEnvironmentFlag;
 PyAPI_DATA(int) Py_DontWriteBytecodeFlag;
@@ -24,6 +23,11 @@ PyAPI_DATA(int) Py_UnbufferedStdioFlag;
 PyAPI_DATA(int) Py_HashRandomizationFlag;
 PyAPI_DATA(int) Py_IsolatedFlag;
 
+#ifdef MS_WINDOWS
+PyAPI_DATA(int) Py_LegacyWindowsFSEncodingFlag;
+PyAPI_DATA(int) Py_LegacyWindowsStdioFlag;
+#endif
+
 /* this is a wrapper around getenv() that pays attention to
    Py_IgnoreEnvironmentFlag.  It should be used for getting variables like
    PYTHONPATH and PYTHONHOME from the environment */
diff --git a/openflow/include/python3.8/pydtrace.h b/openflow/include/python3.8/pydtrace.h
new file mode 100644
index 0000000..75f8e7f
--- /dev/null
+++ b/openflow/include/python3.8/pydtrace.h
@@ -0,0 +1,59 @@
+/* Static DTrace probes interface */
+
+#ifndef Py_DTRACE_H
+#define Py_DTRACE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef WITH_DTRACE
+
+#include "pydtrace_probes.h"
+
+/* pydtrace_probes.h, on systems with DTrace, is auto-generated to include
+   `PyDTrace_{PROBE}` and `PyDTrace_{PROBE}_ENABLED()` macros for every probe
+   defined in pydtrace_provider.d.
+
+   Calling these functions must be guarded by a `PyDTrace_{PROBE}_ENABLED()`
+   check to minimize performance impact when probing is off. For example:
+
+       if (PyDTrace_FUNCTION_ENTRY_ENABLED())
+           PyDTrace_FUNCTION_ENTRY(f);
+*/
+
+#else
+
+/* Without DTrace, compile to nothing. */
+
+static inline void PyDTrace_LINE(const char *arg0, const char *arg1, int arg2) {}
+static inline void PyDTrace_FUNCTION_ENTRY(const char *arg0, const char *arg1, int arg2)  {}
+static inline void PyDTrace_FUNCTION_RETURN(const char *arg0, const char *arg1, int arg2) {}
+static inline void PyDTrace_GC_START(int arg0) {}
+static inline void PyDTrace_GC_DONE(Py_ssize_t arg0) {}
+static inline void PyDTrace_INSTANCE_NEW_START(int arg0) {}
+static inline void PyDTrace_INSTANCE_NEW_DONE(int arg0) {}
+static inline void PyDTrace_INSTANCE_DELETE_START(int arg0) {}
+static inline void PyDTrace_INSTANCE_DELETE_DONE(int arg0) {}
+static inline void PyDTrace_IMPORT_FIND_LOAD_START(const char *arg0) {}
+static inline void PyDTrace_IMPORT_FIND_LOAD_DONE(const char *arg0, int arg1) {}
+static inline void PyDTrace_AUDIT(const char *arg0, void *arg1) {}
+
+static inline int PyDTrace_LINE_ENABLED(void) { return 0; }
+static inline int PyDTrace_FUNCTION_ENTRY_ENABLED(void) { return 0; }
+static inline int PyDTrace_FUNCTION_RETURN_ENABLED(void) { return 0; }
+static inline int PyDTrace_GC_START_ENABLED(void) { return 0; }
+static inline int PyDTrace_GC_DONE_ENABLED(void) { return 0; }
+static inline int PyDTrace_INSTANCE_NEW_START_ENABLED(void) { return 0; }
+static inline int PyDTrace_INSTANCE_NEW_DONE_ENABLED(void) { return 0; }
+static inline int PyDTrace_INSTANCE_DELETE_START_ENABLED(void) { return 0; }
+static inline int PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void) { return 0; }
+static inline int PyDTrace_IMPORT_FIND_LOAD_START_ENABLED(void) { return 0; }
+static inline int PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED(void) { return 0; }
+static inline int PyDTrace_AUDIT_ENABLED(void) { return 0; }
+
+#endif /* !WITH_DTRACE */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_DTRACE_H */
diff --git a/openflow/usr/include/python3.5m/pyerrors.h b/openflow/include/python3.8/pyerrors.h
similarity index 72%
rename from openflow/usr/include/python3.5m/pyerrors.h
rename to openflow/include/python3.8/pyerrors.h
index 35aedb7..5125a51 100644
--- a/openflow/usr/include/python3.5m/pyerrors.h
+++ b/openflow/include/python3.8/pyerrors.h
@@ -4,81 +4,10 @@
 extern "C" {
 #endif
 
-/* Error objects */
-
-#ifndef Py_LIMITED_API
-/* PyException_HEAD defines the initial segment of every exception class. */
-#define PyException_HEAD PyObject_HEAD PyObject *dict;\
-             PyObject *args; PyObject *traceback;\
-             PyObject *context; PyObject *cause;\
-             char suppress_context;
-
-typedef struct {
-    PyException_HEAD
-} PyBaseExceptionObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *msg;
-    PyObject *filename;
-    PyObject *lineno;
-    PyObject *offset;
-    PyObject *text;
-    PyObject *print_file_and_line;
-} PySyntaxErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *msg;
-    PyObject *name;
-    PyObject *path;
-} PyImportErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *encoding;
-    PyObject *object;
-    Py_ssize_t start;
-    Py_ssize_t end;
-    PyObject *reason;
-} PyUnicodeErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *code;
-} PySystemExitObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *myerrno;
-    PyObject *strerror;
-    PyObject *filename;
-    PyObject *filename2;
-#ifdef MS_WINDOWS
-    PyObject *winerror;
-#endif
-    Py_ssize_t written;   /* only for BlockingIOError, -1 otherwise */
-} PyOSErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *value;
-} PyStopIterationObject;
-
-/* Compatibility typedefs */
-typedef PyOSErrorObject PyEnvironmentErrorObject;
-#ifdef MS_WINDOWS
-typedef PyOSErrorObject PyWindowsErrorObject;
-#endif
-#endif /* !Py_LIMITED_API */
-
 /* Error handling definitions */
 
 PyAPI_FUNC(void) PyErr_SetNone(PyObject *);
 PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *);
-#endif
 PyAPI_FUNC(void) PyErr_SetString(
     PyObject *exception,
     const char *string   /* decoded from utf-8 */
@@ -87,20 +16,13 @@ PyAPI_FUNC(PyObject *) PyErr_Occurred(void);
 PyAPI_FUNC(void) PyErr_Clear(void);
 PyAPI_FUNC(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **);
 PyAPI_FUNC(void) PyErr_Restore(PyObject *, PyObject *, PyObject *);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(void) PyErr_GetExcInfo(PyObject **, PyObject **, PyObject **);
 PyAPI_FUNC(void) PyErr_SetExcInfo(PyObject *, PyObject *, PyObject *);
-
-#if defined(__clang__) || \
-    (defined(__GNUC_MAJOR__) && \
-     ((__GNUC_MAJOR__ >= 3) || \
-      (__GNUC_MAJOR__ == 2) && (__GNUC_MINOR__ >= 5)))
-#define _Py_NO_RETURN __attribute__((__noreturn__))
-#else
-#define _Py_NO_RETURN
 #endif
 
 /* Defined in Python/pylifecycle.c */
-PyAPI_FUNC(void) Py_FatalError(const char *message) _Py_NO_RETURN;
+PyAPI_FUNC(void) _Py_NO_RETURN Py_FatalError(const char *message);
 
 #if defined(Py_DEBUG) || defined(Py_LIMITED_API)
 #define _PyErr_OCCURRED() PyErr_Occurred()
@@ -124,9 +46,6 @@ PyAPI_FUNC(void) PyException_SetCause(PyObject *, PyObject *);
 /* Context manipulation (PEP 3134) */
 PyAPI_FUNC(PyObject *) PyException_GetContext(PyObject *);
 PyAPI_FUNC(void) PyException_SetContext(PyObject *, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
-#endif
 
 /* */
 
@@ -137,8 +56,7 @@ PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
 #define PyExceptionInstance_Check(x)                    \
     PyType_FastSubclass((x)->ob_type, Py_TPFLAGS_BASE_EXC_SUBCLASS)
 
-#define PyExceptionClass_Name(x) \
-     ((char *)(((PyTypeObject*)(x))->tp_name))
+PyAPI_FUNC(const char *) PyExceptionClass_Name(PyObject *);
 
 #define PyExceptionInstance_Class(x) ((PyObject*)((x)->ob_type))
 
@@ -147,7 +65,9 @@ PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
 
 PyAPI_DATA(PyObject *) PyExc_BaseException;
 PyAPI_DATA(PyObject *) PyExc_Exception;
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
 PyAPI_DATA(PyObject *) PyExc_StopAsyncIteration;
+#endif
 PyAPI_DATA(PyObject *) PyExc_StopIteration;
 PyAPI_DATA(PyObject *) PyExc_GeneratorExit;
 PyAPI_DATA(PyObject *) PyExc_ArithmeticError;
@@ -160,6 +80,9 @@ PyAPI_DATA(PyObject *) PyExc_EOFError;
 PyAPI_DATA(PyObject *) PyExc_FloatingPointError;
 PyAPI_DATA(PyObject *) PyExc_OSError;
 PyAPI_DATA(PyObject *) PyExc_ImportError;
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
+PyAPI_DATA(PyObject *) PyExc_ModuleNotFoundError;
+#endif
 PyAPI_DATA(PyObject *) PyExc_IndexError;
 PyAPI_DATA(PyObject *) PyExc_KeyError;
 PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt;
@@ -167,7 +90,9 @@ PyAPI_DATA(PyObject *) PyExc_MemoryError;
 PyAPI_DATA(PyObject *) PyExc_NameError;
 PyAPI_DATA(PyObject *) PyExc_OverflowError;
 PyAPI_DATA(PyObject *) PyExc_RuntimeError;
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
 PyAPI_DATA(PyObject *) PyExc_RecursionError;
+#endif
 PyAPI_DATA(PyObject *) PyExc_NotImplementedError;
 PyAPI_DATA(PyObject *) PyExc_SyntaxError;
 PyAPI_DATA(PyObject *) PyExc_IndentationError;
@@ -184,6 +109,7 @@ PyAPI_DATA(PyObject *) PyExc_UnicodeTranslateError;
 PyAPI_DATA(PyObject *) PyExc_ValueError;
 PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError;
 
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_DATA(PyObject *) PyExc_BlockingIOError;
 PyAPI_DATA(PyObject *) PyExc_BrokenPipeError;
 PyAPI_DATA(PyObject *) PyExc_ChildProcessError;
@@ -199,6 +125,7 @@ PyAPI_DATA(PyObject *) PyExc_NotADirectoryError;
 PyAPI_DATA(PyObject *) PyExc_PermissionError;
 PyAPI_DATA(PyObject *) PyExc_ProcessLookupError;
 PyAPI_DATA(PyObject *) PyExc_TimeoutError;
+#endif
 
 
 /* Compatibility aliases */
@@ -208,8 +135,6 @@ PyAPI_DATA(PyObject *) PyExc_IOError;
 PyAPI_DATA(PyObject *) PyExc_WindowsError;
 #endif
 
-PyAPI_DATA(PyObject *) PyExc_RecursionErrorInst;
-
 /* Predefined warning categories */
 PyAPI_DATA(PyObject *) PyExc_Warning;
 PyAPI_DATA(PyObject *) PyExc_UserWarning;
@@ -231,16 +156,14 @@ PyAPI_FUNC(PyObject *) PyErr_NoMemory(void);
 PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *);
 PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject(
     PyObject *, PyObject *);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000
 PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObjects(
     PyObject *, PyObject *, PyObject *);
+#endif
 PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename(
     PyObject *exc,
     const char *filename   /* decoded from the filesystem encoding */
     );
-#if defined(MS_WINDOWS) && !defined(Py_LIMITED_API)
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename(
-    PyObject *, const Py_UNICODE *);
-#endif /* MS_WINDOWS */
 
 PyAPI_FUNC(PyObject *) PyErr_Format(
     PyObject *exception,
@@ -259,32 +182,29 @@ PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename(
     int ierr,
     const char *filename        /* decoded from the filesystem encoding */
     );
-#ifndef Py_LIMITED_API
-/* XXX redeclare to use WSTRING */
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename(
-    int, const Py_UNICODE *);
-#endif
 PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int);
 PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject(
     PyObject *,int, PyObject *);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000
 PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObjects(
     PyObject *,int, PyObject *, PyObject *);
+#endif
 PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename(
     PyObject *exc,
     int ierr,
     const char *filename        /* decoded from the filesystem encoding */
     );
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename(
-    PyObject *,int, const Py_UNICODE *);
-#endif
 PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int);
 #endif /* MS_WINDOWS */
 
-PyAPI_FUNC(PyObject *) PyErr_SetExcWithArgsKwargs(PyObject *, PyObject *,
-    PyObject *);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
+PyAPI_FUNC(PyObject *) PyErr_SetImportErrorSubclass(PyObject *, PyObject *,
+    PyObject *, PyObject *);
+#endif
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(PyObject *) PyErr_SetImportError(PyObject *, PyObject *,
     PyObject *);
+#endif
 
 /* Export the old function so that the existing API remains available: */
 PyAPI_FUNC(void) PyErr_BadInternalCall(void);
@@ -300,36 +220,10 @@ PyAPI_FUNC(PyObject *) PyErr_NewExceptionWithDoc(
     const char *name, const char *doc, PyObject *base, PyObject *dict);
 PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *);
 
-/* In exceptions.c */
-#ifndef Py_LIMITED_API
-/* Helper that attempts to replace the current exception with one of the
- * same type but with a prefix added to the exception text. The resulting
- * exception description looks like:
- *
- *     prefix (exc_type: original_exc_str)
- *
- * Only some exceptions can be safely replaced. If the function determines
- * it isn't safe to perform the replacement, it will leave the original
- * unmodified exception in place.
- *
- * Returns a borrowed reference to the new exception (if any), NULL if the
- * existing exception was left in place.
- */
-PyAPI_FUNC(PyObject *) _PyErr_TrySetFromCause(
-    const char *prefix_format,   /* ASCII-encoded string  */
-    ...
-    );
-#endif
-
-
-/* In sigcheck.c or signalmodule.c */
-PyAPI_FUNC(int) PyErr_CheckSignals(void);
-PyAPI_FUNC(void) PyErr_SetInterrupt(void);
 
 /* In signalmodule.c */
-#ifndef Py_LIMITED_API
-int PySignal_SetWakeupFd(int fd);
-#endif
+PyAPI_FUNC(int) PyErr_CheckSignals(void);
+PyAPI_FUNC(void) PyErr_SetInterrupt(void);
 
 /* Support for adding program text to SyntaxErrors */
 PyAPI_FUNC(void) PyErr_SyntaxLocation(
@@ -339,20 +233,9 @@ PyAPI_FUNC(void) PyErr_SyntaxLocationEx(
     const char *filename,       /* decoded from the filesystem encoding */
     int lineno,
     int col_offset);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) PyErr_SyntaxLocationObject(
-    PyObject *filename,
-    int lineno,
-    int col_offset);
-#endif
 PyAPI_FUNC(PyObject *) PyErr_ProgramText(
     const char *filename,       /* decoded from the filesystem encoding */
     int lineno);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyErr_ProgramTextObject(
-    PyObject *filename,
-    int lineno);
-#endif
 
 /* The following functions are used to create and modify unicode
    exceptions from C */
@@ -367,35 +250,6 @@ PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create(
     const char *reason          /* UTF-8 encoded string */
     );
 
-/* create a UnicodeEncodeError object */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create(
-    const char *encoding,       /* UTF-8 encoded string */
-    const Py_UNICODE *object,
-    Py_ssize_t length,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-#endif
-
-/* create a UnicodeTranslateError object */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create(
-    const Py_UNICODE *object,
-    Py_ssize_t length,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) _PyUnicodeTranslateError_Create(
-    PyObject *object,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-#endif
-
 /* get the encoding attribute */
 PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetEncoding(PyObject *);
 PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetEncoding(PyObject *);
@@ -469,6 +323,12 @@ PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char  *format, ...)
 PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char  *format, va_list va)
                         Py_GCC_ATTRIBUTE((format(printf, 3, 0)));
 
+#ifndef Py_LIMITED_API
+#  define Py_CPYTHON_ERRORS_H
+#  include  "cpython/pyerrors.h"
+#  undef Py_CPYTHON_ERRORS_H
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/openflow/usr/include/python3.5m/pyexpat.h b/openflow/include/python3.8/pyexpat.h
similarity index 100%
rename from openflow/usr/include/python3.5m/pyexpat.h
rename to openflow/include/python3.8/pyexpat.h
diff --git a/openflow/include/python3.8/pyfpe.h b/openflow/include/python3.8/pyfpe.h
new file mode 100644
index 0000000..5a99e39
--- /dev/null
+++ b/openflow/include/python3.8/pyfpe.h
@@ -0,0 +1,12 @@
+#ifndef Py_PYFPE_H
+#define Py_PYFPE_H
+
+/* These macros used to do something when Python was built with --with-fpectl,
+ * but support for that was dropped in 3.7. We continue to define them though,
+ * to avoid breaking API users.
+ */
+
+#define PyFPE_START_PROTECT(err_string, leave_stmt)
+#define PyFPE_END_PROTECT(v)
+
+#endif /* !Py_PYFPE_H */
diff --git a/openflow/usr/include/python3.5m/pyhash.h b/openflow/include/python3.8/pyhash.h
similarity index 88%
rename from openflow/usr/include/python3.5m/pyhash.h
rename to openflow/include/python3.8/pyhash.h
index a7ca937..dbcc974 100644
--- a/openflow/usr/include/python3.5m/pyhash.h
+++ b/openflow/include/python3.8/pyhash.h
@@ -16,7 +16,7 @@ PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void*, Py_ssize_t);
 #define _PyHASH_MULTIPLIER 1000003UL  /* 0xf4243 */
 
 /* Parameters used for the numeric hash implementation.  See notes for
-   _Py_HashDouble in Objects/object.c.  Numeric hashes are based on
+   _Py_HashDouble in Python/pyhash.c.  Numeric hashes are based on
    reduction modulo the prime 2**_PyHASH_BITS - 1. */
 
 #if SIZEOF_VOID_P >= 8
@@ -36,14 +36,14 @@ PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void*, Py_ssize_t);
  * memory layout on 64 bit systems
  *   cccccccc cccccccc cccccccc  uc -- unsigned char[24]
  *   pppppppp ssssssss ........  fnv -- two Py_hash_t
- *   k0k0k0k0 k1k1k1k1 ........  siphash -- two PY_UINT64_T
+ *   k0k0k0k0 k1k1k1k1 ........  siphash -- two uint64_t
  *   ........ ........ ssssssss  djbx33a -- 16 bytes padding + one Py_hash_t
  *   ........ ........ eeeeeeee  pyexpat XML hash salt
  *
  * memory layout on 32 bit systems
  *   cccccccc cccccccc cccccccc  uc
  *   ppppssss ........ ........  fnv -- two Py_hash_t
- *   k0k0k0k0 k1k1k1k1 ........  siphash -- two PY_UINT64_T (*)
+ *   k0k0k0k0 k1k1k1k1 ........  siphash -- two uint64_t (*)
  *   ........ ........ ssss....  djbx33a -- 16 bytes padding + one Py_hash_t
  *   ........ ........ eeee....  pyexpat XML hash salt
  *
@@ -59,13 +59,11 @@ typedef union {
         Py_hash_t prefix;
         Py_hash_t suffix;
     } fnv;
-#ifdef PY_UINT64_T
     /* two uint64 for SipHash24 */
     struct {
-        PY_UINT64_T k0;
-        PY_UINT64_T k1;
+        uint64_t k0;
+        uint64_t k1;
     } siphash;
-#endif
     /* a different (!) Py_hash_t for small string optimization */
     struct {
         unsigned char padding[16];
@@ -121,8 +119,7 @@ PyAPI_FUNC(PyHash_FuncDef*) PyHash_GetFuncDef(void);
  * configure script.
  *
  * - FNV is available on all platforms and architectures.
- * - SIPHASH24 only works on plaforms that provide PY_UINT64_T and doesn't
- *   require aligned memory for integers.
+ * - SIPHASH24 only works on platforms that don't require aligned memory for integers.
  * - With EXTERNAL embedders can provide an alternative implementation with::
  *
  *     PyHash_FuncDef PyHash_Func = {...};
@@ -134,8 +131,7 @@ PyAPI_FUNC(PyHash_FuncDef*) PyHash_GetFuncDef(void);
 #define Py_HASH_FNV 2
 
 #ifndef Py_HASH_ALGORITHM
-#  if (defined(PY_UINT64_T) && defined(PY_UINT32_T) \
-       && !defined(HAVE_ALIGNED_REQUIRED))
+#  ifndef HAVE_ALIGNED_REQUIRED
 #    define Py_HASH_ALGORITHM Py_HASH_SIPHASH24
 #  else
 #    define Py_HASH_ALGORITHM Py_HASH_FNV
diff --git a/openflow/include/python3.8/pylifecycle.h b/openflow/include/python3.8/pylifecycle.h
new file mode 100644
index 0000000..c5368b3
--- /dev/null
+++ b/openflow/include/python3.8/pylifecycle.h
@@ -0,0 +1,75 @@
+
+/* Interfaces to configure, query, create & destroy the Python runtime */
+
+#ifndef Py_PYLIFECYCLE_H
+#define Py_PYLIFECYCLE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Initialization and finalization */
+PyAPI_FUNC(void) Py_Initialize(void);
+PyAPI_FUNC(void) Py_InitializeEx(int);
+PyAPI_FUNC(void) Py_Finalize(void);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
+PyAPI_FUNC(int) Py_FinalizeEx(void);
+#endif
+PyAPI_FUNC(int) Py_IsInitialized(void);
+
+/* Subinterpreter support */
+PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void);
+PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
+
+
+/* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level
+ * exit functions.
+ */
+PyAPI_FUNC(int) Py_AtExit(void (*func)(void));
+
+PyAPI_FUNC(void) _Py_NO_RETURN Py_Exit(int);
+
+/* Bootstrap __main__ (defined in Modules/main.c) */
+PyAPI_FUNC(int) Py_Main(int argc, wchar_t **argv);
+
+PyAPI_FUNC(int) Py_BytesMain(int argc, char **argv);
+
+/* In pathconfig.c */
+PyAPI_FUNC(void) Py_SetProgramName(const wchar_t *);
+PyAPI_FUNC(wchar_t *) Py_GetProgramName(void);
+
+PyAPI_FUNC(void) Py_SetPythonHome(const wchar_t *);
+PyAPI_FUNC(wchar_t *) Py_GetPythonHome(void);
+
+PyAPI_FUNC(wchar_t *) Py_GetProgramFullPath(void);
+
+PyAPI_FUNC(wchar_t *) Py_GetPrefix(void);
+PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void);
+PyAPI_FUNC(wchar_t *) Py_GetPath(void);
+PyAPI_FUNC(void)      Py_SetPath(const wchar_t *);
+#ifdef MS_WINDOWS
+int _Py_CheckPython3(void);
+#endif
+
+/* In their own files */
+PyAPI_FUNC(const char *) Py_GetVersion(void);
+PyAPI_FUNC(const char *) Py_GetPlatform(void);
+PyAPI_FUNC(const char *) Py_GetCopyright(void);
+PyAPI_FUNC(const char *) Py_GetCompiler(void);
+PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
+
+/* Signals */
+typedef void (*PyOS_sighandler_t)(int);
+PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int);
+PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t);
+
+#ifndef Py_LIMITED_API
+#  define Py_CPYTHON_PYLIFECYCLE_H
+#  include  "cpython/pylifecycle.h"
+#  undef Py_CPYTHON_PYLIFECYCLE_H
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_PYLIFECYCLE_H */
diff --git a/openflow/usr/include/python3.5m/pymacconfig.h b/openflow/include/python3.8/pymacconfig.h
similarity index 95%
rename from openflow/usr/include/python3.5m/pymacconfig.h
rename to openflow/include/python3.8/pymacconfig.h
index 0c28f5c..9dde11b 100644
--- a/openflow/usr/include/python3.5m/pymacconfig.h
+++ b/openflow/include/python3.8/pymacconfig.h
@@ -63,7 +63,7 @@
 #    if defined(__LP64__)
      /* MacOSX 10.4 (the first release to support 64-bit code
       * at all) only supports 64-bit in the UNIX layer.
-      * Therefore surpress the toolbox-glue in 64-bit mode.
+      * Therefore suppress the toolbox-glue in 64-bit mode.
       */
 
     /* In 64-bit mode setpgrp always has no arguments, in 32-bit
@@ -91,7 +91,7 @@
      *
      * Specifically: OSX 10.4 has limited supported for '%zd', while
      * 10.5 has full support for '%zd'. A binary built on 10.5 won't
-     * work properly on 10.4 unless we surpress the definition
+     * work properly on 10.4 unless we suppress the definition
      * of PY_FORMAT_SIZE_T
      */
 #undef  PY_FORMAT_SIZE_T
diff --git a/openflow/usr/include/python3.5m/pymacro.h b/openflow/include/python3.8/pymacro.h
similarity index 73%
rename from openflow/usr/include/python3.5m/pymacro.h
rename to openflow/include/python3.8/pymacro.h
index 3f6f5dc..495c2c2 100644
--- a/openflow/usr/include/python3.5m/pymacro.h
+++ b/openflow/include/python3.8/pymacro.h
@@ -18,6 +18,9 @@
    by "__LINE__". */
 #define Py_STRINGIFY(x) _Py_XSTRINGIFY(x)
 
+/* Get the size of a structure member in bytes */
+#define Py_MEMBER_SIZE(type, member) sizeof(((type *)0)->member)
+
 /* Argument must be a char or an int in [-128, 127] or [0, 255]. */
 #define Py_CHARMASK(c) ((unsigned char)((c) & 0xff))
 
@@ -36,6 +39,10 @@
 #define Py_BUILD_ASSERT_EXPR(cond) \
     (sizeof(char [1 - 2*!(cond)]) - 1)
 
+#define Py_BUILD_ASSERT(cond)  do {         \
+        (void)Py_BUILD_ASSERT_EXPR(cond);   \
+    } while(0)
+
 /* Get the number of elements in a visible array
 
    This does not work on pointers, or arrays declared as [], or function
@@ -46,7 +53,7 @@
 
    Requires at GCC 3.1+ */
 #if (defined(__GNUC__) && !defined(__STRICT_ANSI__) && \
-    (((__GNUC__ == 3) && (__GNU_MINOR__ >= 1)) || (__GNUC__ >= 4)))
+    (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)) || (__GNUC__ >= 4)))
 /* Two gcc extensions.
    &a[0] degrades to a pointer: a different type from an array */
 #define Py_ARRAY_LENGTH(array) \
@@ -60,7 +67,7 @@
 
 
 /* Define macros for inline documentation. */
-#define PyDoc_VAR(name) static char name[]
+#define PyDoc_VAR(name) static const char name[]
 #define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str)
 #ifdef WITH_DOC_STRINGS
 #define PyDoc_STR(str) str
@@ -75,17 +82,25 @@
 #define _Py_SIZE_ROUND_UP(n, a) (((size_t)(n) + \
         (size_t)((a) - 1)) & ~(size_t)((a) - 1))
 /* Round pointer "p" down to the closest "a"-aligned address <= "p". */
-#define _Py_ALIGN_DOWN(p, a) ((void *)((Py_uintptr_t)(p) & ~(Py_uintptr_t)((a) - 1)))
+#define _Py_ALIGN_DOWN(p, a) ((void *)((uintptr_t)(p) & ~(uintptr_t)((a) - 1)))
 /* Round pointer "p" up to the closest "a"-aligned address >= "p". */
-#define _Py_ALIGN_UP(p, a) ((void *)(((Py_uintptr_t)(p) + \
-        (Py_uintptr_t)((a) - 1)) & ~(Py_uintptr_t)((a) - 1)))
+#define _Py_ALIGN_UP(p, a) ((void *)(((uintptr_t)(p) + \
+        (uintptr_t)((a) - 1)) & ~(uintptr_t)((a) - 1)))
 /* Check if pointer "p" is aligned to "a"-bytes boundary. */
-#define _Py_IS_ALIGNED(p, a) (!((Py_uintptr_t)(p) & (Py_uintptr_t)((a) - 1)))
+#define _Py_IS_ALIGNED(p, a) (!((uintptr_t)(p) & (uintptr_t)((a) - 1)))
 
-#ifdef __GNUC__
-#define Py_UNUSED(name) _unused_ ## name __attribute__((unused))
+/* Use this for unused arguments in a function definition to silence compiler
+ * warnings. Example:
+ *
+ * int func(int a, int Py_UNUSED(b)) { return a; }
+ */
+#if defined(__GNUC__) || defined(__clang__)
+#  define Py_UNUSED(name) _unused_ ## name __attribute__((unused))
 #else
-#define Py_UNUSED(name) _unused_ ## name
+#  define Py_UNUSED(name) _unused_ ## name
 #endif
 
+#define Py_UNREACHABLE() \
+    Py_FatalError("Unreachable C code path reached")
+
 #endif /* Py_PYMACRO_H */
diff --git a/openflow/usr/include/python3.5m/pymath.h b/openflow/include/python3.8/pymath.h
similarity index 78%
rename from openflow/usr/include/python3.5m/pymath.h
rename to openflow/include/python3.8/pymath.h
index 1ea9ac1..6cf69f9 100644
--- a/openflow/usr/include/python3.5m/pymath.h
+++ b/openflow/include/python3.8/pymath.h
@@ -37,7 +37,7 @@ extern double pow(double, double);
 #endif /* __STDC__ */
 #endif /* _MSC_VER */
 
-/* High precision defintion of pi and e (Euler)
+/* High precision definition of pi and e (Euler)
  * The values are taken from libc6's math.h.
  */
 #ifndef Py_MATH_PIl
@@ -55,6 +55,12 @@ extern double pow(double, double);
 #define Py_MATH_E 2.7182818284590452354
 #endif
 
+/* Tau (2pi) to 40 digits, taken from tauday.com/tau-digits. */
+#ifndef Py_MATH_TAU
+#define Py_MATH_TAU 6.2831853071795864769252867665590057683943L
+#endif
+
+
 /* On x86, Py_FORCE_DOUBLE forces a floating-point number out of an x87 FPU
    register and into a 64-bit memory location, rounding from extended
    precision to double precision in the process.  On other platforms it does
@@ -169,7 +175,7 @@ PyAPI_FUNC(void) _Py_set_387controlword(unsigned short);
         #pragma float_control (pop)
         #define Py_NAN __icc_nan()
     #else /* ICC_NAN_RELAXED as default for Intel Compiler */
-        static union { unsigned char buf[8]; double __icc_nan; } __nan_store = {0,0,0,0,0,0,0xf8,0x7f};
+        static const union { unsigned char buf[8]; double __icc_nan; } __nan_store = {0,0,0,0,0,0,0xf8,0x7f};
         #define Py_NAN (__nan_store.__icc_nan)
     #endif /* ICC_NAN_STRICT */
 #endif /* __INTEL_COMPILER */
@@ -181,14 +187,14 @@ PyAPI_FUNC(void) _Py_set_387controlword(unsigned short);
  * result.
  * Caution:
  *    This isn't reliable.  C99 no longer requires libm to set errno under
- *	  any exceptional condition, but does require +- HUGE_VAL return
- *	  values on overflow.  A 754 box *probably* maps HUGE_VAL to a
- *	  double infinity, and we're cool if that's so, unless the input
- *	  was an infinity and an infinity is the expected result.  A C89
- *	  system sets errno to ERANGE, so we check for that too.  We're
- *	  out of luck if a C99 754 box doesn't map HUGE_VAL to +Inf, or
- *	  if the returned result is a NaN, or if a C89 box returns HUGE_VAL
- *	  in non-overflow cases.
+ *        any exceptional condition, but does require +- HUGE_VAL return
+ *        values on overflow.  A 754 box *probably* maps HUGE_VAL to a
+ *        double infinity, and we're cool if that's so, unless the input
+ *        was an infinity and an infinity is the expected result.  A C89
+ *        system sets errno to ERANGE, so we check for that too.  We're
+ *        out of luck if a C99 754 box doesn't map HUGE_VAL to +Inf, or
+ *        if the returned result is a NaN, or if a C89 box returns HUGE_VAL
+ *        in non-overflow cases.
  *    X is evaluated more than once.
  * Some platforms have better way to spell this, so expect some #ifdef'ery.
  *
@@ -205,8 +211,20 @@ PyAPI_FUNC(void) _Py_set_387controlword(unsigned short);
 #define Py_OVERFLOWED(X) isinf(X)
 #else
 #define Py_OVERFLOWED(X) ((X) != 0.0 && (errno == ERANGE ||    \
-					 (X) == Py_HUGE_VAL || \
-					 (X) == -Py_HUGE_VAL))
+                                         (X) == Py_HUGE_VAL || \
+                                         (X) == -Py_HUGE_VAL))
 #endif
 
+/* Return whether integral type *type* is signed or not. */
+#define _Py_IntegralTypeSigned(type) ((type)(-1) < 0)
+/* Return the maximum value of integral type *type*. */
+#define _Py_IntegralTypeMax(type) ((_Py_IntegralTypeSigned(type)) ? (((((type)1 << (sizeof(type)*CHAR_BIT - 2)) - 1) << 1) + 1) : ~(type)0)
+/* Return the minimum value of integral type *type*. */
+#define _Py_IntegralTypeMin(type) ((_Py_IntegralTypeSigned(type)) ? -_Py_IntegralTypeMax(type) - 1 : 0)
+/* Check whether *v* is in the range of integral type *type*. This is most
+ * useful if *v* is floating-point, since demoting a floating-point *v* to an
+ * integral type that cannot represent *v*'s integral part is undefined
+ * behavior. */
+#define _Py_InIntegralTypeRange(type, v) (_Py_IntegralTypeMin(type) <= v && v <= _Py_IntegralTypeMax(type))
+
 #endif /* Py_PYMATH_H */
diff --git a/openflow/usr/include/python3.5m/pymem.h b/openflow/include/python3.8/pymem.h
similarity index 54%
rename from openflow/usr/include/python3.5m/pymem.h
rename to openflow/include/python3.8/pymem.h
index 043db64..07b380a 100644
--- a/openflow/usr/include/python3.5m/pymem.h
+++ b/openflow/include/python3.8/pymem.h
@@ -11,14 +11,6 @@
 extern "C" {
 #endif
 
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void *) PyMem_RawMalloc(size_t size);
-PyAPI_FUNC(void *) PyMem_RawCalloc(size_t nelem, size_t elsize);
-PyAPI_FUNC(void *) PyMem_RawRealloc(void *ptr, size_t new_size);
-PyAPI_FUNC(void) PyMem_RawFree(void *ptr);
-#endif
-
-
 /* BEWARE:
 
    Each interface exports both functions and macros.  Extension modules should
@@ -58,15 +50,9 @@ PyAPI_FUNC(void) PyMem_RawFree(void *ptr);
 */
 
 PyAPI_FUNC(void *) PyMem_Malloc(size_t size);
-PyAPI_FUNC(void *) PyMem_Calloc(size_t nelem, size_t elsize);
 PyAPI_FUNC(void *) PyMem_Realloc(void *ptr, size_t new_size);
 PyAPI_FUNC(void) PyMem_Free(void *ptr);
 
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(char *) _PyMem_RawStrdup(const char *str);
-PyAPI_FUNC(char *) _PyMem_Strdup(const char *str);
-#endif
-
 /* Macros. */
 
 /* PyMem_MALLOC(0) means malloc(1). Some systems would return NULL
@@ -90,11 +76,11 @@ PyAPI_FUNC(char *) _PyMem_Strdup(const char *str);
  */
 
 #define PyMem_New(type, n) \
-  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
+  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :      \
+        ( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
 #define PyMem_NEW(type, n) \
-  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )
+  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :      \
+        ( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )
 
 /*
  * The value of (p) is always clobbered by this macro regardless of success.
@@ -103,82 +89,58 @@ PyAPI_FUNC(char *) _PyMem_Strdup(const char *str);
  * caller's memory error handler to not lose track of it.
  */
 #define PyMem_Resize(p, type, n) \
-  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	(type *) PyMem_Realloc((p), (n) * sizeof(type)) )
+  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :        \
+        (type *) PyMem_Realloc((p), (n) * sizeof(type)) )
 #define PyMem_RESIZE(p, type, n) \
-  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	(type *) PyMem_REALLOC((p), (n) * sizeof(type)) )
+  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :        \
+        (type *) PyMem_REALLOC((p), (n) * sizeof(type)) )
 
 /* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used
  * anymore.  They're just confusing aliases for PyMem_{Free,FREE} now.
  */
-#define PyMem_Del		PyMem_Free
-#define PyMem_DEL		PyMem_FREE
+#define PyMem_Del               PyMem_Free
+#define PyMem_DEL               PyMem_FREE
+
+/* bpo-35053: expose _Py_tracemalloc_config for performance:
+   _Py_NewReference() needs an efficient check to test if tracemalloc is
+   tracing.
+
+   It has to be defined in pymem.h, before object.h is included. */
+struct _PyTraceMalloc_Config {
+    /* Module initialized?
+       Variable protected by the GIL */
+    enum {
+        TRACEMALLOC_NOT_INITIALIZED,
+        TRACEMALLOC_INITIALIZED,
+        TRACEMALLOC_FINALIZED
+    } initialized;
+
+    /* Is tracemalloc tracing memory allocations?
+       Variable protected by the GIL */
+    int tracing;
+
+    /* limit of the number of frames in a traceback, 1 by default.
+       Variable protected by the GIL. */
+    int max_nframe;
+
+    /* use domain in trace key?
+       Variable protected by the GIL. */
+    int use_domain;
+};
+
+PyAPI_DATA(struct _PyTraceMalloc_Config) _Py_tracemalloc_config;
+
+#define _PyTraceMalloc_Config_INIT \
+    {.initialized = TRACEMALLOC_NOT_INITIALIZED, \
+     .tracing = 0, \
+     .max_nframe = 1, \
+     .use_domain = 0}
+
 
 #ifndef Py_LIMITED_API
-typedef enum {
-    /* PyMem_RawMalloc(), PyMem_RawRealloc() and PyMem_RawFree() */
-    PYMEM_DOMAIN_RAW,
-
-    /* PyMem_Malloc(), PyMem_Realloc() and PyMem_Free() */
-    PYMEM_DOMAIN_MEM,
-
-    /* PyObject_Malloc(), PyObject_Realloc() and PyObject_Free() */
-    PYMEM_DOMAIN_OBJ
-} PyMemAllocatorDomain;
-
-typedef struct {
-    /* user context passed as the first argument to the 4 functions */
-    void *ctx;
-
-    /* allocate a memory block */
-    void* (*malloc) (void *ctx, size_t size);
-
-    /* allocate a memory block initialized by zeros */
-    void* (*calloc) (void *ctx, size_t nelem, size_t elsize);
-
-    /* allocate or resize a memory block */
-    void* (*realloc) (void *ctx, void *ptr, size_t new_size);
-
-    /* release a memory block */
-    void (*free) (void *ctx, void *ptr);
-} PyMemAllocatorEx;
-
-/* Get the memory block allocator of the specified domain. */
-PyAPI_FUNC(void) PyMem_GetAllocator(PyMemAllocatorDomain domain,
-                                    PyMemAllocatorEx *allocator);
-
-/* Set the memory block allocator of the specified domain.
-
-   The new allocator must return a distinct non-NULL pointer when requesting
-   zero bytes.
-
-   For the PYMEM_DOMAIN_RAW domain, the allocator must be thread-safe: the GIL
-   is not held when the allocator is called.
-
-   If the new allocator is not a hook (don't call the previous allocator), the
-   PyMem_SetupDebugHooks() function must be called to reinstall the debug hooks
-   on top on the new allocator. */
-PyAPI_FUNC(void) PyMem_SetAllocator(PyMemAllocatorDomain domain,
-                                    PyMemAllocatorEx *allocator);
-
-/* Setup hooks to detect bugs in the following Python memory allocator
-   functions:
-
-   - PyMem_RawMalloc(), PyMem_RawRealloc(), PyMem_RawFree()
-   - PyMem_Malloc(), PyMem_Realloc(), PyMem_Free()
-   - PyObject_Malloc(), PyObject_Realloc() and PyObject_Free()
-
-   Newly allocated memory is filled with the byte 0xCB, freed memory is filled
-   with the byte 0xDB. Additionnal checks:
-
-   - detect API violations, ex: PyObject_Free() called on a buffer allocated
-     by PyMem_Malloc()
-   - detect write before the start of the buffer (buffer underflow)
-   - detect write after the end of the buffer (buffer overflow)
-
-   The function does nothing if Python is not compiled is debug mode. */
-PyAPI_FUNC(void) PyMem_SetupDebugHooks(void);
+#  define Py_CPYTHON_PYMEM_H
+#  include  "cpython/pymem.h"
+#  undef Py_CPYTHON_PYMEM_H
 #endif
 
 #ifdef __cplusplus
diff --git a/openflow/usr/include/python3.5m/pyport.h b/openflow/include/python3.8/pyport.h
similarity index 78%
rename from openflow/usr/include/python3.5m/pyport.h
rename to openflow/include/python3.8/pyport.h
index 66e00d4..71f5794 100644
--- a/openflow/usr/include/python3.5m/pyport.h
+++ b/openflow/include/python3.8/pyport.h
@@ -3,15 +3,28 @@
 
 #include "pyconfig.h" /* include for defines */
 
-/* Some versions of HP-UX & Solaris need inttypes.h for int32_t,
-   INT32_MAX, etc. */
-#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+
+
+/* Defines to build Python and its standard library:
+ *
+ * - Py_BUILD_CORE: Build Python core. Give access to Python internals, but
+ *   should not be used by third-party modules.
+ * - Py_BUILD_CORE_BUILTIN: Build a Python stdlib module as a built-in module.
+ * - Py_BUILD_CORE_MODULE: Build a Python stdlib module as a dynamic library.
+ *
+ * Py_BUILD_CORE_BUILTIN and Py_BUILD_CORE_MODULE imply Py_BUILD_CORE.
+ *
+ * On Windows, Py_BUILD_CORE_MODULE exports "PyInit_xxx" symbol, whereas
+ * Py_BUILD_CORE_BUILTIN does not.
+ */
+#if defined(Py_BUILD_CORE_BUILTIN) && !defined(Py_BUILD_CORE)
+#  define Py_BUILD_CORE
+#endif
+#if defined(Py_BUILD_CORE_MODULE) && !defined(Py_BUILD_CORE)
+#  define Py_BUILD_CORE
 #endif
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
 
 /**************************************************************************
 Symbols and macros to supply platform-independent interfaces to basic
@@ -31,14 +44,6 @@ Py_DEBUG
 Meaning:  Extra checks compiled in for debug mode.
 Used in:  Py_SAFE_DOWNCAST
 
-HAVE_UINTPTR_T
-Meaning:  The C9X type uintptr_t is supported by the compiler
-Used in:  Py_uintptr_t
-
-HAVE_LONG_LONG
-Meaning:  The compiler supports the C type "long long"
-Used in:  PY_LONG_LONG
-
 **************************************************************************/
 
 /* typedefs for some C9X-defined synonyms for integral types.
@@ -53,91 +58,31 @@ Used in:  PY_LONG_LONG
  * integral synonyms.  Only define the ones we actually need.
  */
 
-#ifdef HAVE_LONG_LONG
+/* long long is required. Ensure HAVE_LONG_LONG is defined for compatibility. */
+#ifndef HAVE_LONG_LONG
+#define HAVE_LONG_LONG 1
+#endif
 #ifndef PY_LONG_LONG
 #define PY_LONG_LONG long long
-#if defined(LLONG_MAX)
 /* If LLONG_MAX is defined in limits.h, use that. */
 #define PY_LLONG_MIN LLONG_MIN
 #define PY_LLONG_MAX LLONG_MAX
 #define PY_ULLONG_MAX ULLONG_MAX
-#elif defined(__LONG_LONG_MAX__)
-/* Otherwise, if GCC has a builtin define, use that.  (Definition of
- * PY_LLONG_MIN assumes two's complement with no trap representation.) */
-#define PY_LLONG_MAX __LONG_LONG_MAX__
-#define PY_LLONG_MIN (-PY_LLONG_MAX - 1)
-#define PY_ULLONG_MAX (PY_LLONG_MAX * Py_ULL(2) + 1)
-#elif defined(SIZEOF_LONG_LONG)
-/* Otherwise compute from SIZEOF_LONG_LONG, assuming two's complement, no
-   padding bits, and no trap representation.  Note: PY_ULLONG_MAX was
-   previously #defined as (~0ULL) here; but that'll give the wrong value in a
-   preprocessor expression on systems where long long != intmax_t. */
-#define PY_LLONG_MAX                                                    \
-    (1 + 2 * ((Py_LL(1) << (CHAR_BIT * SIZEOF_LONG_LONG - 2)) - 1))
-#define PY_LLONG_MIN (-PY_LLONG_MAX - 1)
-#define PY_ULLONG_MAX (PY_LLONG_MAX * Py_ULL(2) + 1)
-#endif /* LLONG_MAX */
-#endif
-#endif /* HAVE_LONG_LONG */
-
-/* a build with 30-bit digits for Python integers needs an exact-width
- * 32-bit unsigned integer type to store those digits.  (We could just use
- * type 'unsigned long', but that would be wasteful on a system where longs
- * are 64-bits.)  On Unix systems, the autoconf macro AC_TYPE_UINT32_T defines
- * uint32_t to be such a type unless stdint.h or inttypes.h defines uint32_t.
- * However, it doesn't set HAVE_UINT32_T, so we do that here.
- */
-#ifdef uint32_t
-#define HAVE_UINT32_T 1
 #endif
 
-#ifdef HAVE_UINT32_T
-#ifndef PY_UINT32_T
 #define PY_UINT32_T uint32_t
-#endif
-#endif
-
-/* Macros for a 64-bit unsigned integer type; used for type 'twodigits' in the
- * integer implementation, when 30-bit digits are enabled.
- */
-#ifdef uint64_t
-#define HAVE_UINT64_T 1
-#endif
-
-#ifdef HAVE_UINT64_T
-#ifndef PY_UINT64_T
 #define PY_UINT64_T uint64_t
-#endif
-#endif
 
 /* Signed variants of the above */
-#ifdef int32_t
-#define HAVE_INT32_T 1
-#endif
-
-#ifdef HAVE_INT32_T
-#ifndef PY_INT32_T
 #define PY_INT32_T int32_t
-#endif
-#endif
-
-#ifdef int64_t
-#define HAVE_INT64_T 1
-#endif
-
-#ifdef HAVE_INT64_T
-#ifndef PY_INT64_T
 #define PY_INT64_T int64_t
-#endif
-#endif
 
 /* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all
    the necessary integer types are available, and we're on a 64-bit platform
    (as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits. */
 
 #ifndef PYLONG_BITS_IN_DIGIT
-#if (defined HAVE_UINT64_T && defined HAVE_INT64_T && \
-     defined HAVE_UINT32_T && defined HAVE_INT32_T && SIZEOF_VOID_P >= 8)
+#if SIZEOF_VOID_P >= 8
 #define PYLONG_BITS_IN_DIGIT 30
 #else
 #define PYLONG_BITS_IN_DIGIT 15
@@ -149,26 +94,9 @@ Used in:  PY_LONG_LONG
  * without loss of information.  Similarly for intptr_t, wrt a signed
  * integral type.
  */
-#ifdef HAVE_UINTPTR_T
 typedef uintptr_t       Py_uintptr_t;
 typedef intptr_t        Py_intptr_t;
 
-#elif SIZEOF_VOID_P <= SIZEOF_INT
-typedef unsigned int    Py_uintptr_t;
-typedef int             Py_intptr_t;
-
-#elif SIZEOF_VOID_P <= SIZEOF_LONG
-typedef unsigned long   Py_uintptr_t;
-typedef long            Py_intptr_t;
-
-#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P <= SIZEOF_LONG_LONG)
-typedef unsigned PY_LONG_LONG   Py_uintptr_t;
-typedef PY_LONG_LONG            Py_intptr_t;
-
-#else
-#   error "Python needs a typedef for Py_uintptr_t in pyport.h."
-#endif /* HAVE_UINTPTR_T */
-
 /* Py_ssize_t is a signed integral type such that sizeof(Py_ssize_t) ==
  * sizeof(size_t).  C99 doesn't define such a thing directly (size_t is an
  * unsigned integral type).  See PEP 353 for details.
@@ -195,16 +123,8 @@ typedef Py_ssize_t Py_ssize_clean_t;
 typedef int Py_ssize_clean_t;
 #endif
 
-/* Largest possible value of size_t.
-   SIZE_MAX is part of C99, so it might be defined on some
-   platforms. If it is not defined, (size_t)-1 is a portable
-   definition for C89, due to the way signed->unsigned
-   conversion is defined. */
-#ifdef SIZE_MAX
+/* Largest possible value of size_t. */
 #define PY_SIZE_MAX SIZE_MAX
-#else
-#define PY_SIZE_MAX ((size_t)-1)
-#endif
 
 /* Largest positive value of type Py_ssize_t. */
 #define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1))
@@ -247,22 +167,6 @@ typedef int Py_ssize_clean_t;
 #   endif
 #endif
 
-/* PY_FORMAT_LONG_LONG is analogous to PY_FORMAT_SIZE_T above, but for
- * the long long type instead of the size_t type.  It's only available
- * when HAVE_LONG_LONG is defined. The "high level" Python format
- * functions listed above will interpret "lld" or "llu" correctly on
- * all platforms.
- */
-#ifdef HAVE_LONG_LONG
-#   ifndef PY_FORMAT_LONG_LONG
-#       ifdef MS_WINDOWS
-#           define PY_FORMAT_LONG_LONG "I64"
-#       else
-#           error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG"
-#       endif
-#   endif
-#endif
-
 /* Py_LOCAL can be used instead of static to get the fastest possible calling
  * convention for functions that are local to a given module.
  *
@@ -281,43 +185,23 @@ typedef int Py_ssize_clean_t;
  */
 
 #if defined(_MSC_VER)
-#if defined(PY_LOCAL_AGGRESSIVE)
-/* enable more aggressive optimization for visual studio */
-#pragma optimize("agtw", on)
+#  if defined(PY_LOCAL_AGGRESSIVE)
+   /* enable more aggressive optimization for visual studio */
+#  pragma optimize("agtw", on)
 #endif
-/* ignore warnings if the compiler decides not to inline a function */
-#pragma warning(disable: 4710)
-/* fastest possible local call under MSVC */
-#define Py_LOCAL(type) static type __fastcall
-#define Py_LOCAL_INLINE(type) static __inline type __fastcall
-#elif defined(USE_INLINE)
-#define Py_LOCAL(type) static type
-#define Py_LOCAL_INLINE(type) static inline type
+   /* ignore warnings if the compiler decides not to inline a function */
+#  pragma warning(disable: 4710)
+   /* fastest possible local call under MSVC */
+#  define Py_LOCAL(type) static type __fastcall
+#  define Py_LOCAL_INLINE(type) static __inline type __fastcall
 #else
-#define Py_LOCAL(type) static type
-#define Py_LOCAL_INLINE(type) static type
+#  define Py_LOCAL(type) static type
+#  define Py_LOCAL_INLINE(type) static inline type
 #endif
 
-/* Py_MEMCPY can be used instead of memcpy in cases where the copied blocks
- * are often very short.  While most platforms have highly optimized code for
- * large transfers, the setup costs for memcpy are often quite high.  MEMCPY
- * solves this by doing short copies "in line".
- */
-
-#if defined(_MSC_VER)
-#define Py_MEMCPY(target, source, length) do {                          \
-        size_t i_, n_ = (length);                                       \
-        char *t_ = (void*) (target);                                    \
-        const char *s_ = (void*) (source);                              \
-        if (n_ >= 16)                                                   \
-            memcpy(t_, s_, n_);                                         \
-        else                                                            \
-            for (i_ = 0; i_ < n_; i_++)                                 \
-                t_[i_] = s_[i_];                                        \
-    } while (0)
-#else
+/* Py_MEMCPY is kept for backwards compatibility,
+ * see https://bugs.python.org/issue28126 */
 #define Py_MEMCPY memcpy
-#endif
 
 #include <stdlib.h>
 
@@ -461,7 +345,7 @@ extern "C" {
         } \
     } while(0)
 
-/* Py_SET_ERANGE_ON_OVERFLOW(x)
+/* Py_SET_ERANGE_IF_OVERFLOW(x)
  * An alias of Py_SET_ERRNO_ON_MATH_ERROR for backward-compatibility.
  */
 #define Py_SET_ERANGE_IF_OVERFLOW(X) Py_SET_ERRNO_ON_MATH_ERROR(X)
@@ -543,7 +427,7 @@ extern "C" {
 #endif
 
 /* get and set x87 control word for VisualStudio/x86 */
-#if defined(_MSC_VER) && !defined(_WIN64) /* x87 not supported in 64-bit */
+#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_M_ARM) /* x87 not supported in 64-bit or ARM */
 #define HAVE_PY_SET_53BIT_PRECISION 1
 #define _Py_SET_53BIT_PRECISION_HEADER \
     unsigned int old_387controlword, new_387controlword, out_387controlword
@@ -570,18 +454,18 @@ extern "C" {
 #define HAVE_PY_SET_53BIT_PRECISION 1
 #define _Py_SET_53BIT_PRECISION_HEADER \
   unsigned int old_fpcr, new_fpcr
-#define _Py_SET_53BIT_PRECISION_START					\
-  do {									\
-    __asm__ ("fmove.l %%fpcr,%0" : "=g" (old_fpcr));			\
-    /* Set double precision / round to nearest.  */			\
-    new_fpcr = (old_fpcr & ~0xf0) | 0x80;				\
-    if (new_fpcr != old_fpcr)						\
-      __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (new_fpcr));	\
+#define _Py_SET_53BIT_PRECISION_START                                   \
+  do {                                                                  \
+    __asm__ ("fmove.l %%fpcr,%0" : "=g" (old_fpcr));                    \
+    /* Set double precision / round to nearest.  */                     \
+    new_fpcr = (old_fpcr & ~0xf0) | 0x80;                               \
+    if (new_fpcr != old_fpcr)                                           \
+      __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (new_fpcr));        \
   } while (0)
-#define _Py_SET_53BIT_PRECISION_END					\
-  do {									\
-    if (new_fpcr != old_fpcr)						\
-      __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (old_fpcr));	\
+#define _Py_SET_53BIT_PRECISION_END                                     \
+  do {                                                                  \
+    if (new_fpcr != old_fpcr)                                           \
+      __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (old_fpcr));        \
   } while (0)
 #endif
 
@@ -620,18 +504,60 @@ extern "C" {
 
 /* Py_DEPRECATED(version)
  * Declare a variable, type, or function deprecated.
+ * The macro must be placed before the declaration.
  * Usage:
- *    extern int old_var Py_DEPRECATED(2.3);
- *    typedef int T1 Py_DEPRECATED(2.4);
- *    extern int x() Py_DEPRECATED(2.5);
+ *    Py_DEPRECATED(3.3) extern int old_var;
+ *    Py_DEPRECATED(3.4) typedef int T1;
+ *    Py_DEPRECATED(3.8) PyAPI_FUNC(int) Py_OldFunction(void);
  */
-#if defined(__GNUC__) && ((__GNUC__ >= 4) || \
-              (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
+#if defined(__GNUC__) \
+    && ((__GNUC__ >= 4) || (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
 #define Py_DEPRECATED(VERSION_UNUSED) __attribute__((__deprecated__))
+#elif defined(_MSC_VER)
+#define Py_DEPRECATED(VERSION) __declspec(deprecated( \
+                                          "deprecated in " #VERSION))
 #else
 #define Py_DEPRECATED(VERSION_UNUSED)
 #endif
 
+
+/* _Py_HOT_FUNCTION
+ * The hot attribute on a function is used to inform the compiler that the
+ * function is a hot spot of the compiled program. The function is optimized
+ * more aggressively and on many target it is placed into special subsection of
+ * the text section so all hot functions appears close together improving
+ * locality.
+ *
+ * Usage:
+ *    int _Py_HOT_FUNCTION x(void) { return 3; }
+ *
+ * Issue #28618: This attribute must not be abused, otherwise it can have a
+ * negative effect on performance. Only the functions were Python spend most of
+ * its time must use it. Use a profiler when running performance benchmark
+ * suite to find these functions.
+ */
+#if defined(__GNUC__) \
+    && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
+#define _Py_HOT_FUNCTION __attribute__((hot))
+#else
+#define _Py_HOT_FUNCTION
+#endif
+
+/* _Py_NO_INLINE
+ * Disable inlining on a function. For example, it helps to reduce the C stack
+ * consumption.
+ *
+ * Usage:
+ *    int _Py_NO_INLINE x(void) { return 3; }
+ */
+#if defined(_MSC_VER)
+#  define _Py_NO_INLINE __declspec(noinline)
+#elif defined(__GNUC__) || defined(__clang__)
+#  define _Py_NO_INLINE __attribute__ ((noinline))
+#else
+#  define _Py_NO_INLINE
+#endif
+
 /**************************************************************************
 Prototypes that are missing from the standard include files on some systems
 (and possibly only some versions of such systems.)
@@ -657,16 +583,6 @@ extern char * _getpty(int *, int, mode_t, int);
 #include <sys/termio.h>
 #endif
 
-#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY)
-#if !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H)
-/* BSDI does not supply a prototype for the 'openpty' and 'forkpty'
-   functions, even though they are included in libutil. */
-#include <termios.h>
-extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
-extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
-#endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */
-#endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) */
-
 
 /* On 4.4BSD-descendants, ctype functions serves the whole range of
  * wchar_t character set rather than single byte code points only.
@@ -675,19 +591,17 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
  * workaround was provided by Tim Robbins of FreeBSD project.
  */
 
-#ifdef __FreeBSD__
-#include <osreldate.h>
-#if __FreeBSD_version > 500039
-# define _PY_PORT_CTYPE_UTF8_ISSUE
-#endif
-#endif
-
-
 #if defined(__APPLE__)
-# define _PY_PORT_CTYPE_UTF8_ISSUE
+#  define _PY_PORT_CTYPE_UTF8_ISSUE
 #endif
 
 #ifdef _PY_PORT_CTYPE_UTF8_ISSUE
+#ifndef __cplusplus
+   /* The workaround below is unsafe in C++ because
+    * the <locale> defines these symbols as real functions,
+    * with a slightly different signature.
+    * See issue #10910
+    */
 #include <ctype.h>
 #include <wctype.h>
 #undef isalnum
@@ -705,6 +619,7 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 #undef toupper
 #define toupper(c) towupper(btowc(c))
 #endif
+#endif
 
 
 /* Declarations for symbol visibility.
@@ -733,7 +648,7 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 /* only get special linkage if built as shared or platform is Cygwin */
 #if defined(Py_ENABLE_SHARED) || defined(__CYGWIN__)
 #       if defined(HAVE_DECLSPEC_DLL)
-#               ifdef Py_BUILD_CORE
+#               if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
 #                       define PyAPI_FUNC(RTYPE) __declspec(dllexport) RTYPE
 #                       define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE
         /* module init functions inside the core need no external linkage */
@@ -760,7 +675,7 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 #                               define PyMODINIT_FUNC __declspec(dllexport) PyObject*
 #                       endif /* __cplusplus */
 #               endif /* Py_BUILD_CORE */
-#       endif /* HAVE_DECLSPEC */
+#       endif /* HAVE_DECLSPEC_DLL */
 #endif /* Py_ENABLE_SHARED */
 
 /* If no external linkage macros defined by now, create defaults */
@@ -841,10 +756,6 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 #pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
 #endif
 
-/*
- * Older Microsoft compilers don't support the C99 long long literal suffixes,
- * so these will be defined in PC/pyconfig.h for those compilers.
- */
 #ifndef Py_LL
 #define Py_LL(x) x##LL
 #endif
@@ -853,15 +764,7 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 #define Py_ULL(x) Py_LL(x##U)
 #endif
 
-#ifdef VA_LIST_IS_ARRAY
-#define Py_VA_COPY(x, y) Py_MEMCPY((x), (y), sizeof(va_list))
-#else
-#ifdef __va_copy
-#define Py_VA_COPY __va_copy
-#else
-#define Py_VA_COPY(x, y) (x) = (y)
-#endif
-#endif
+#define Py_VA_COPY va_copy
 
 /*
  * Convenient macros to deal with endianness of the platform. WORDS_BIGENDIAN is
@@ -877,7 +780,7 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 #define PY_LITTLE_ENDIAN 1
 #endif
 
-#ifdef Py_BUILD_CORE 
+#ifdef Py_BUILD_CORE
 /*
  * Macros to protect CRT calls against instant termination when passed an
  * invalid parameter (issue23524).
@@ -897,4 +800,51 @@ extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
 #endif /* _MSC_VER >= 1900 */
 #endif /* Py_BUILD_CORE */
 
+#ifdef __ANDROID__
+   /* The Android langinfo.h header is not used. */
+#  undef HAVE_LANGINFO_H
+#  undef CODESET
+#endif
+
+/* Maximum value of the Windows DWORD type */
+#define PY_DWORD_MAX 4294967295U
+
+/* This macro used to tell whether Python was built with multithreading
+ * enabled.  Now multithreading is always enabled, but keep the macro
+ * for compatibility.
+ */
+#ifndef WITH_THREAD
+#  define WITH_THREAD
+#endif
+
+/* Check that ALT_SOABI is consistent with Py_TRACE_REFS:
+   ./configure --with-trace-refs should must be used to define Py_TRACE_REFS */
+#if defined(ALT_SOABI) && defined(Py_TRACE_REFS)
+#  error "Py_TRACE_REFS ABI is not compatible with release and debug ABI"
+#endif
+
+#if defined(__ANDROID__) || defined(__VXWORKS__)
+   /* Ignore the locale encoding: force UTF-8 */
+#  define _Py_FORCE_UTF8_LOCALE
+#endif
+
+#if defined(_Py_FORCE_UTF8_LOCALE) || defined(__APPLE__)
+   /* Use UTF-8 as filesystem encoding */
+#  define _Py_FORCE_UTF8_FS_ENCODING
+#endif
+
+/* Mark a function which cannot return. Example:
+
+   PyAPI_FUNC(void) _Py_NO_RETURN PyThread_exit_thread(void); */
+#if defined(__clang__) || \
+    (defined(__GNUC__) && \
+     ((__GNUC__ >= 3) || \
+      (__GNUC__ == 2) && (__GNUC_MINOR__ >= 5)))
+#  define _Py_NO_RETURN __attribute__((__noreturn__))
+#elif defined(_MSC_VER)
+#  define _Py_NO_RETURN __declspec(noreturn)
+#else
+#  define _Py_NO_RETURN
+#endif
+
 #endif /* Py_PYPORT_H */
diff --git a/openflow/include/python3.8/pystate.h b/openflow/include/python3.8/pystate.h
new file mode 100644
index 0000000..4c25e3f
--- /dev/null
+++ b/openflow/include/python3.8/pystate.h
@@ -0,0 +1,136 @@
+/* Thread and interpreter state structures and their interfaces */
+
+
+#ifndef Py_PYSTATE_H
+#define Py_PYSTATE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "pythread.h"
+
+/* This limitation is for performance and simplicity. If needed it can be
+removed (with effort). */
+#define MAX_CO_EXTRA_USERS 255
+
+/* Forward declarations for PyFrameObject, PyThreadState
+   and PyInterpreterState */
+struct _frame;
+struct _ts;
+struct _is;
+
+/* struct _ts is defined in cpython/pystate.h */
+typedef struct _ts PyThreadState;
+/* struct _is is defined in internal/pycore_pystate.h */
+typedef struct _is PyInterpreterState;
+
+PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void);
+PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *);
+PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *);
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03080000
+/* New in 3.8 */
+PyAPI_FUNC(PyObject *) PyInterpreterState_GetDict(PyInterpreterState *);
+#endif
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
+/* New in 3.7 */
+PyAPI_FUNC(int64_t) PyInterpreterState_GetID(PyInterpreterState *);
+#endif
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
+
+/* State unique per thread */
+
+/* New in 3.3 */
+PyAPI_FUNC(int) PyState_AddModule(PyObject*, struct PyModuleDef*);
+PyAPI_FUNC(int) PyState_RemoveModule(struct PyModuleDef*);
+#endif
+PyAPI_FUNC(PyObject*) PyState_FindModule(struct PyModuleDef*);
+
+PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *);
+PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *);
+PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
+PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
+
+/* Get the current thread state.
+
+   When the current thread state is NULL, this issues a fatal error (so that
+   the caller needn't check for NULL).
+
+   The caller must hold the GIL.
+
+   See also PyThreadState_GET() and _PyThreadState_GET(). */
+PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
+
+/* Get the current Python thread state.
+
+   Macro using PyThreadState_Get() or _PyThreadState_GET() depending if
+   pycore_pystate.h is included or not (this header redefines the macro).
+
+   If PyThreadState_Get() is used, issue a fatal error if the current thread
+   state is NULL.
+
+   See also PyThreadState_Get() and _PyThreadState_GET(). */
+#define PyThreadState_GET() PyThreadState_Get()
+
+PyAPI_FUNC(PyThreadState *) PyThreadState_Swap(PyThreadState *);
+PyAPI_FUNC(PyObject *) PyThreadState_GetDict(void);
+PyAPI_FUNC(int) PyThreadState_SetAsyncExc(unsigned long, PyObject *);
+
+typedef
+    enum {PyGILState_LOCKED, PyGILState_UNLOCKED}
+        PyGILState_STATE;
+
+
+/* Ensure that the current thread is ready to call the Python
+   C API, regardless of the current state of Python, or of its
+   thread lock.  This may be called as many times as desired
+   by a thread so long as each call is matched with a call to
+   PyGILState_Release().  In general, other thread-state APIs may
+   be used between _Ensure() and _Release() calls, so long as the
+   thread-state is restored to its previous state before the Release().
+   For example, normal use of the Py_BEGIN_ALLOW_THREADS/
+   Py_END_ALLOW_THREADS macros are acceptable.
+
+   The return value is an opaque "handle" to the thread state when
+   PyGILState_Ensure() was called, and must be passed to
+   PyGILState_Release() to ensure Python is left in the same state. Even
+   though recursive calls are allowed, these handles can *not* be shared -
+   each unique call to PyGILState_Ensure must save the handle for its
+   call to PyGILState_Release.
+
+   When the function returns, the current thread will hold the GIL.
+
+   Failure is a fatal error.
+*/
+PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure(void);
+
+/* Release any resources previously acquired.  After this call, Python's
+   state will be the same as it was prior to the corresponding
+   PyGILState_Ensure() call (but generally this state will be unknown to
+   the caller, hence the use of the GILState API.)
+
+   Every call to PyGILState_Ensure must be matched by a call to
+   PyGILState_Release on the same thread.
+*/
+PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE);
+
+/* Helper/diagnostic function - get the current thread state for
+   this thread.  May return NULL if no GILState API has been used
+   on the current thread.  Note that the main thread always has such a
+   thread-state, even if no auto-thread-state call has been made
+   on the main thread.
+*/
+PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void);
+
+
+#ifndef Py_LIMITED_API
+#  define Py_CPYTHON_PYSTATE_H
+#  include  "cpython/pystate.h"
+#  undef Py_CPYTHON_PYSTATE_H
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_PYSTATE_H */
diff --git a/openflow/usr/include/python3.5m/pystrcmp.h b/openflow/include/python3.8/pystrcmp.h
similarity index 100%
rename from openflow/usr/include/python3.5m/pystrcmp.h
rename to openflow/include/python3.8/pystrcmp.h
diff --git a/openflow/usr/include/python3.5m/pystrhex.h b/openflow/include/python3.8/pystrhex.h
similarity index 52%
rename from openflow/usr/include/python3.5m/pystrhex.h
rename to openflow/include/python3.8/pystrhex.h
index 1dc1255..a4f3630 100644
--- a/openflow/usr/include/python3.5m/pystrhex.h
+++ b/openflow/include/python3.8/pystrhex.h
@@ -5,10 +5,15 @@
 extern "C" {
 #endif
 
+#ifndef Py_LIMITED_API
 /* Returns a str() containing the hex representation of argbuf. */
 PyAPI_FUNC(PyObject*) _Py_strhex(const char* argbuf, const Py_ssize_t arglen);
 /* Returns a bytes() containing the ASCII hex representation of argbuf. */
 PyAPI_FUNC(PyObject*) _Py_strhex_bytes(const char* argbuf, const Py_ssize_t arglen);
+/* These variants include support for a separator between every N bytes: */
+PyAPI_FUNC(PyObject*) _Py_strhex_with_sep(const char* argbuf, const Py_ssize_t arglen, const PyObject* sep, const int bytes_per_group);
+PyAPI_FUNC(PyObject*) _Py_strhex_bytes_with_sep(const char* argbuf, const Py_ssize_t arglen, const PyObject* sep, const int bytes_per_group);
+#endif /* !Py_LIMITED_API */
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/pystrtod.h b/openflow/include/python3.8/pystrtod.h
similarity index 86%
rename from openflow/usr/include/python3.5m/pystrtod.h
rename to openflow/include/python3.8/pystrtod.h
index 23fd1c6..c1e84de 100644
--- a/openflow/usr/include/python3.5m/pystrtod.h
+++ b/openflow/include/python3.8/pystrtod.h
@@ -19,6 +19,10 @@ PyAPI_FUNC(char *) PyOS_double_to_string(double val,
                                          int *type);
 
 #ifndef Py_LIMITED_API
+PyAPI_FUNC(PyObject *) _Py_string_to_number_with_underscores(
+    const char *str, Py_ssize_t len, const char *what, PyObject *obj, void *arg,
+    PyObject *(*innerfunc)(const char *, Py_ssize_t, void *));
+
 PyAPI_FUNC(double) _Py_parse_inf_or_nan(const char *p, char **endptr);
 #endif
 
diff --git a/openflow/usr/include/python3.5m/pythonrun.h b/openflow/include/python3.8/pythonrun.h
similarity index 78%
rename from openflow/usr/include/python3.5m/pythonrun.h
rename to openflow/include/python3.8/pythonrun.h
index 9c2e813..46091e0 100644
--- a/openflow/usr/include/python3.5m/pythonrun.h
+++ b/openflow/include/python3.8/pythonrun.h
@@ -7,25 +7,8 @@
 extern "C" {
 #endif
 
-#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
-                   CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \
-                   CO_FUTURE_UNICODE_LITERALS | CO_FUTURE_BARRY_AS_BDFL | \
-                   CO_FUTURE_GENERATOR_STOP)
-#define PyCF_MASK_OBSOLETE (CO_NESTED)
-#define PyCF_SOURCE_IS_UTF8  0x0100
-#define PyCF_DONT_IMPLY_DEDENT 0x0200
-#define PyCF_ONLY_AST 0x0400
-#define PyCF_IGNORE_COOKIE 0x0800
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    int cf_flags;  /* bitmask of CO_xxx flags relevant to future */
-} PyCompilerFlags;
-#endif
-
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
-PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
 PyAPI_FUNC(int) PyRun_AnyFileExFlags(
     FILE *fp,
     const char *filename,       /* decoded from the filesystem encoding */
@@ -66,8 +49,8 @@ PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile(
     const char *filename,       /* decoded from the filesystem encoding */
     const char* enc,
     int start,
-    char *ps1,
-    char *ps2,
+    const char *ps1,
+    const char *ps2,
     PyCompilerFlags *flags,
     int *errcode,
     PyArena *arena);
@@ -76,8 +59,8 @@ PyAPI_FUNC(struct _mod *) PyParser_ASTFromFileObject(
     PyObject *filename,
     const char* enc,
     int start,
-    char *ps1,
-    char *ps2,
+    const char *ps1,
+    const char *ps2,
     PyCompilerFlags *flags,
     int *errcode,
     PyArena *arena);
@@ -91,9 +74,11 @@ PyAPI_FUNC(struct _mod *) PyParser_ASTFromFileObject(
 #endif
 PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int,
                                                            int);
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlagsFilename(const char *,
                                                                    const char *,
                                                                    int, int);
+#endif
 PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *,
                                                          int, int);
 
@@ -133,10 +118,23 @@ PyAPI_FUNC(struct symtable *) Py_SymtableString(
     const char *filename,       /* decoded from the filesystem encoding */
     int start);
 #ifndef Py_LIMITED_API
+PyAPI_FUNC(const char *) _Py_SourceAsString(
+    PyObject *cmd,
+    const char *funcname,
+    const char *what,
+    PyCompilerFlags *cf,
+    PyObject **cmd_copy);
+
 PyAPI_FUNC(struct symtable *) Py_SymtableStringObject(
     const char *str,
     PyObject *filename,
     int start);
+
+PyAPI_FUNC(struct symtable *) _Py_SymtableStringObjectFlags(
+    const char *str,
+    PyObject *filename,
+    int start,
+    PyCompilerFlags *flags);
 #endif
 
 PyAPI_FUNC(void) PyErr_Print(void);
@@ -144,6 +142,23 @@ PyAPI_FUNC(void) PyErr_PrintEx(int);
 PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *);
 
 #ifndef Py_LIMITED_API
+/* A function flavor is also exported by libpython. It is required when
+    libpython is accessed directly rather than using header files which defines
+    macros below. On Windows, for example, PyAPI_FUNC() uses dllexport to
+    export functions in pythonXX.dll. */
+PyAPI_FUNC(PyObject *) PyRun_String(const char *str, int s, PyObject *g, PyObject *l);
+PyAPI_FUNC(int) PyRun_AnyFile(FILE *fp, const char *name);
+PyAPI_FUNC(int) PyRun_AnyFileEx(FILE *fp, const char *name, int closeit);
+PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
+PyAPI_FUNC(int) PyRun_SimpleString(const char *s);
+PyAPI_FUNC(int) PyRun_SimpleFile(FILE *f, const char *p);
+PyAPI_FUNC(int) PyRun_SimpleFileEx(FILE *f, const char *p, int c);
+PyAPI_FUNC(int) PyRun_InteractiveOne(FILE *f, const char *p);
+PyAPI_FUNC(int) PyRun_InteractiveLoop(FILE *f, const char *p);
+PyAPI_FUNC(PyObject *) PyRun_File(FILE *fp, const char *p, int s, PyObject *g, PyObject *l);
+PyAPI_FUNC(PyObject *) PyRun_FileEx(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, int c);
+PyAPI_FUNC(PyObject *) PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, PyCompilerFlags *flags);
+
 /* Use macros for a bunch of old variants */
 #define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL)
 #define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL)
@@ -179,7 +194,7 @@ PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState;
    to an 8k margin. */
 #define PYOS_STACK_MARGIN 2048
 
-#if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1300
+#if defined(WIN32) && !defined(MS_WIN64) && !defined(_M_ARM) && defined(_MSC_VER) && _MSC_VER >= 1300
 /* Enable stack checking under Microsoft C */
 #define USE_STACKCHECK
 #endif
diff --git a/openflow/include/python3.8/pythread.h b/openflow/include/python3.8/pythread.h
new file mode 100644
index 0000000..f22e8c4
--- /dev/null
+++ b/openflow/include/python3.8/pythread.h
@@ -0,0 +1,161 @@
+
+#ifndef Py_PYTHREAD_H
+#define Py_PYTHREAD_H
+
+typedef void *PyThread_type_lock;
+typedef void *PyThread_type_sema;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Return status codes for Python lock acquisition.  Chosen for maximum
+ * backwards compatibility, ie failure -> 0, success -> 1.  */
+typedef enum PyLockStatus {
+    PY_LOCK_FAILURE = 0,
+    PY_LOCK_ACQUIRED = 1,
+    PY_LOCK_INTR
+} PyLockStatus;
+
+#ifndef Py_LIMITED_API
+#define PYTHREAD_INVALID_THREAD_ID ((unsigned long)-1)
+#endif
+
+PyAPI_FUNC(void) PyThread_init_thread(void);
+PyAPI_FUNC(unsigned long) PyThread_start_new_thread(void (*)(void *), void *);
+PyAPI_FUNC(void) _Py_NO_RETURN PyThread_exit_thread(void);
+PyAPI_FUNC(unsigned long) PyThread_get_thread_ident(void);
+
+#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(_WIN32) || defined(_AIX)
+#define PY_HAVE_THREAD_NATIVE_ID
+PyAPI_FUNC(unsigned long) PyThread_get_thread_native_id(void);
+#endif
+
+PyAPI_FUNC(PyThread_type_lock) PyThread_allocate_lock(void);
+PyAPI_FUNC(void) PyThread_free_lock(PyThread_type_lock);
+PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int);
+#define WAIT_LOCK       1
+#define NOWAIT_LOCK     0
+
+/* PY_TIMEOUT_T is the integral type used to specify timeouts when waiting
+   on a lock (see PyThread_acquire_lock_timed() below).
+   PY_TIMEOUT_MAX is the highest usable value (in microseconds) of that
+   type, and depends on the system threading API.
+
+   NOTE: this isn't the same value as `_thread.TIMEOUT_MAX`.  The _thread
+   module exposes a higher-level API, with timeouts expressed in seconds
+   and floating-point numbers allowed.
+*/
+#define PY_TIMEOUT_T long long
+
+#if defined(_POSIX_THREADS)
+   /* PyThread_acquire_lock_timed() uses _PyTime_FromNanoseconds(us * 1000),
+      convert microseconds to nanoseconds. */
+#  define PY_TIMEOUT_MAX (PY_LLONG_MAX / 1000)
+#elif defined (NT_THREADS)
+   /* In the NT API, the timeout is a DWORD and is expressed in milliseconds */
+#  if 0xFFFFFFFFLL * 1000 < PY_LLONG_MAX
+#    define PY_TIMEOUT_MAX (0xFFFFFFFFLL * 1000)
+#  else
+#    define PY_TIMEOUT_MAX PY_LLONG_MAX
+#  endif
+#else
+#  define PY_TIMEOUT_MAX PY_LLONG_MAX
+#endif
+
+
+/* If microseconds == 0, the call is non-blocking: it returns immediately
+   even when the lock can't be acquired.
+   If microseconds > 0, the call waits up to the specified duration.
+   If microseconds < 0, the call waits until success (or abnormal failure)
+
+   microseconds must be less than PY_TIMEOUT_MAX. Behaviour otherwise is
+   undefined.
+
+   If intr_flag is true and the acquire is interrupted by a signal, then the
+   call will return PY_LOCK_INTR.  The caller may reattempt to acquire the
+   lock.
+*/
+PyAPI_FUNC(PyLockStatus) PyThread_acquire_lock_timed(PyThread_type_lock,
+                                                     PY_TIMEOUT_T microseconds,
+                                                     int intr_flag);
+
+PyAPI_FUNC(void) PyThread_release_lock(PyThread_type_lock);
+
+PyAPI_FUNC(size_t) PyThread_get_stacksize(void);
+PyAPI_FUNC(int) PyThread_set_stacksize(size_t);
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
+PyAPI_FUNC(PyObject*) PyThread_GetInfo(void);
+#endif
+
+
+/* Thread Local Storage (TLS) API
+   TLS API is DEPRECATED.  Use Thread Specific Storage (TSS) API.
+
+   The existing TLS API has used int to represent TLS keys across all
+   platforms, but it is not POSIX-compliant.  Therefore, the new TSS API uses
+   opaque data type to represent TSS keys to be compatible (see PEP 539).
+*/
+Py_DEPRECATED(3.7) PyAPI_FUNC(int) PyThread_create_key(void);
+Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyThread_delete_key(int key);
+Py_DEPRECATED(3.7) PyAPI_FUNC(int) PyThread_set_key_value(int key,
+                                                          void *value);
+Py_DEPRECATED(3.7) PyAPI_FUNC(void *) PyThread_get_key_value(int key);
+Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyThread_delete_key_value(int key);
+
+/* Cleanup after a fork */
+Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyThread_ReInitTLS(void);
+
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
+/* New in 3.7 */
+/* Thread Specific Storage (TSS) API */
+
+typedef struct _Py_tss_t Py_tss_t;  /* opaque */
+
+#ifndef Py_LIMITED_API
+#if defined(_POSIX_THREADS)
+    /* Darwin needs pthread.h to know type name the pthread_key_t. */
+#   include <pthread.h>
+#   define NATIVE_TSS_KEY_T     pthread_key_t
+#elif defined(NT_THREADS)
+    /* In Windows, native TSS key type is DWORD,
+       but hardcode the unsigned long to avoid errors for include directive.
+    */
+#   define NATIVE_TSS_KEY_T     unsigned long
+#else
+#   error "Require native threads. See https://bugs.python.org/issue31370"
+#endif
+
+/* When Py_LIMITED_API is not defined, the type layout of Py_tss_t is
+   exposed to allow static allocation in the API clients.  Even in this case,
+   you must handle TSS keys through API functions due to compatibility.
+*/
+struct _Py_tss_t {
+    int _is_initialized;
+    NATIVE_TSS_KEY_T _key;
+};
+
+#undef NATIVE_TSS_KEY_T
+
+/* When static allocation, you must initialize with Py_tss_NEEDS_INIT. */
+#define Py_tss_NEEDS_INIT   {0}
+#endif  /* !Py_LIMITED_API */
+
+PyAPI_FUNC(Py_tss_t *) PyThread_tss_alloc(void);
+PyAPI_FUNC(void) PyThread_tss_free(Py_tss_t *key);
+
+/* The parameter key must not be NULL. */
+PyAPI_FUNC(int) PyThread_tss_is_created(Py_tss_t *key);
+PyAPI_FUNC(int) PyThread_tss_create(Py_tss_t *key);
+PyAPI_FUNC(void) PyThread_tss_delete(Py_tss_t *key);
+PyAPI_FUNC(int) PyThread_tss_set(Py_tss_t *key, void *value);
+PyAPI_FUNC(void *) PyThread_tss_get(Py_tss_t *key);
+#endif  /* New in 3.7 */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !Py_PYTHREAD_H */
diff --git a/openflow/usr/include/python3.5m/pytime.h b/openflow/include/python3.8/pytime.h
similarity index 71%
rename from openflow/usr/include/python3.5m/pytime.h
rename to openflow/include/python3.8/pytime.h
index 494322c..bdda1da 100644
--- a/openflow/usr/include/python3.5m/pytime.h
+++ b/openflow/include/python3.8/pytime.h
@@ -13,16 +13,12 @@ functions and constants
 extern "C" {
 #endif
 
-#ifdef PY_INT64_T
 /* _PyTime_t: Python timestamp with subsecond precision. It can be used to
    store a duration, and so indirectly a date (related to another date, like
    UNIX epoch). */
-typedef PY_INT64_T _PyTime_t;
-#define _PyTime_MIN PY_LLONG_MIN
-#define _PyTime_MAX PY_LLONG_MAX
-#else
-#  error "_PyTime_t need signed 64-bit integer type"
-#endif
+typedef int64_t _PyTime_t;
+#define _PyTime_MIN INT64_MIN
+#define _PyTime_MAX INT64_MAX
 
 typedef enum {
     /* Round towards minus infinity (-inf).
@@ -30,9 +26,23 @@ typedef enum {
     _PyTime_ROUND_FLOOR=0,
     /* Round towards infinity (+inf).
        For example, used for timeout to wait "at least" N seconds. */
-    _PyTime_ROUND_CEILING
+    _PyTime_ROUND_CEILING=1,
+    /* Round to nearest with ties going to nearest even integer.
+       For example, used to round from a Python float. */
+    _PyTime_ROUND_HALF_EVEN=2,
+    /* Round away from zero
+       For example, used for timeout. _PyTime_ROUND_CEILING rounds
+       -1e-9 to 0 milliseconds which causes bpo-31786 issue.
+       _PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps
+       the timeout sign as expected. select.poll(timeout) must block
+       for negative values." */
+    _PyTime_ROUND_UP=3,
+    /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be
+       used for timeouts. */
+    _PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP
 } _PyTime_round_t;
 
+
 /* Convert a time_t to a PyLong. */
 PyAPI_FUNC(PyObject *) _PyLong_FromTime_t(
     time_t sec);
@@ -75,7 +85,11 @@ PyAPI_FUNC(_PyTime_t) _PyTime_FromSeconds(int seconds);
             ((_PyTime_t)(seconds) * (1000 * 1000 * 1000))
 
 /* Create a timestamp from a number of nanoseconds. */
-PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(PY_LONG_LONG ns);
+PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(_PyTime_t ns);
+
+/* Create a timestamp from nanoseconds (Python int). */
+PyAPI_FUNC(int) _PyTime_FromNanosecondsObject(_PyTime_t *t,
+    PyObject *obj);
 
 /* Convert a number of seconds (Python float or int) to a timetamp.
    Raise an exception and return -1 on error, return 0 on success. */
@@ -104,6 +118,10 @@ PyAPI_FUNC(_PyTime_t) _PyTime_AsMicroseconds(_PyTime_t t,
    object. */
 PyAPI_FUNC(PyObject *) _PyTime_AsNanosecondsObject(_PyTime_t t);
 
+/* Create a timestamp from a timeval structure.
+   Raise an exception and return -1 on overflow, return 0 on success. */
+PyAPI_FUNC(int) _PyTime_FromTimeval(_PyTime_t *tp, struct timeval *tv);
+
 /* Convert a timestamp to a timeval structure (microsecond resolution).
    tv_usec is always positive.
    Raise an exception and return -1 if the conversion overflowed,
@@ -130,12 +148,22 @@ PyAPI_FUNC(int) _PyTime_AsTimevalTime_t(
     _PyTime_round_t round);
 
 #if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_KQUEUE)
+/* Create a timestamp from a timespec structure.
+   Raise an exception and return -1 on overflow, return 0 on success. */
+PyAPI_FUNC(int) _PyTime_FromTimespec(_PyTime_t *tp, struct timespec *ts);
+
 /* Convert a timestamp to a timespec structure (nanosecond resolution).
    tv_nsec is always positive.
    Raise an exception and return -1 on error, return 0 on success. */
 PyAPI_FUNC(int) _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts);
 #endif
 
+/* Compute ticks * mul / div.
+   The caller must ensure that ((div - 1) * mul) cannot overflow. */
+PyAPI_FUNC(_PyTime_t) _PyTime_MulDiv(_PyTime_t ticks,
+    _PyTime_t mul,
+    _PyTime_t div);
+
 /* Get the current time from the system clock.
 
    The function cannot fail. _PyTime_Init() ensures that the system clock
@@ -185,6 +213,31 @@ PyAPI_FUNC(int) _PyTime_GetMonotonicClockWithInfo(
    Return 0 on success, raise an exception and return -1 on error. */
 PyAPI_FUNC(int) _PyTime_Init(void);
 
+/* Converts a timestamp to the Gregorian time, using the local time zone.
+   Return 0 on success, raise an exception and return -1 on error. */
+PyAPI_FUNC(int) _PyTime_localtime(time_t t, struct tm *tm);
+
+/* Converts a timestamp to the Gregorian time, assuming UTC.
+   Return 0 on success, raise an exception and return -1 on error. */
+PyAPI_FUNC(int) _PyTime_gmtime(time_t t, struct tm *tm);
+
+/* Get the performance counter: clock with the highest available resolution to
+   measure a short duration.
+
+   The function cannot fail. _PyTime_Init() ensures that the system clock
+   works. */
+PyAPI_FUNC(_PyTime_t) _PyTime_GetPerfCounter(void);
+
+/* Get the performance counter: clock with the highest available resolution to
+   measure a short duration.
+
+   Fill info (if set) with information of the function used to get the time.
+
+   Return 0 on success, raise an exception and return -1 on error. */
+PyAPI_FUNC(int) _PyTime_GetPerfCounterWithInfo(
+    _PyTime_t *t,
+    _Py_clock_info_t *info);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/openflow/usr/include/python3.5m/rangeobject.h b/openflow/include/python3.8/rangeobject.h
similarity index 100%
rename from openflow/usr/include/python3.5m/rangeobject.h
rename to openflow/include/python3.8/rangeobject.h
diff --git a/openflow/usr/include/python3.5m/setobject.h b/openflow/include/python3.8/setobject.h
similarity index 90%
rename from openflow/usr/include/python3.5m/setobject.h
rename to openflow/include/python3.8/setobject.h
index f17bc1b..fc0ea83 100644
--- a/openflow/usr/include/python3.5m/setobject.h
+++ b/openflow/include/python3.8/setobject.h
@@ -10,12 +10,13 @@ extern "C" {
 
 /* There are three kinds of entries in the table:
 
-1. Unused:  key == NULL
-2. Active:  key != NULL and key != dummy
-3. Dummy:   key == dummy
+1. Unused:  key == NULL and hash == 0
+2. Dummy:   key == dummy and hash == -1
+3. Active:  key != NULL and key != dummy and hash != -1
 
-The hash field of Unused slots have no meaning.
-The hash field of Dummny slots are set to -1
+The hash field of Unused slots is always zero.
+
+The hash field of Dummy slots are set to -1
 meaning that dummy entries can be detected by
 either entry->key==dummy or by entry->hash==-1.
 */
@@ -63,7 +64,7 @@ typedef struct {
     PyObject *weakreflist;      /* List of weak references */
 } PySetObject;
 
-#define PySet_GET_SIZE(so) (((PySetObject *)(so))->used)
+#define PySet_GET_SIZE(so) (assert(PyAnySet_Check(so)),(((PySetObject *)(so))->used))
 
 PyAPI_DATA(PyObject *) _PySet_Dummy;
 
diff --git a/openflow/usr/include/python3.5m/sliceobject.h b/openflow/include/python3.8/sliceobject.h
similarity index 57%
rename from openflow/usr/include/python3.5m/sliceobject.h
rename to openflow/include/python3.8/sliceobject.h
index 26370e0..aae6f3c 100644
--- a/openflow/usr/include/python3.5m/sliceobject.h
+++ b/openflow/include/python3.8/sliceobject.h
@@ -21,7 +21,7 @@ let these be any arbitrary python type.  Py_None stands for omitted values.
 #ifndef Py_LIMITED_API
 typedef struct {
     PyObject_HEAD
-    PyObject *start, *stop, *step;	/* not NULL */
+    PyObject *start, *stop, *step;      /* not NULL */
 } PySliceObject;
 #endif
 
@@ -40,9 +40,24 @@ PyAPI_FUNC(int) _PySlice_GetLongIndices(PySliceObject *self, PyObject *length,
 #endif
 PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length,
                                   Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
+Py_DEPRECATED(3.7)
 PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length,
-				    Py_ssize_t *start, Py_ssize_t *stop,
-				    Py_ssize_t *step, Py_ssize_t *slicelength);
+                                     Py_ssize_t *start, Py_ssize_t *stop,
+                                     Py_ssize_t *step,
+                                     Py_ssize_t *slicelength);
+
+#if !defined(Py_LIMITED_API) || (Py_LIMITED_API+0 >= 0x03050400 && Py_LIMITED_API+0 < 0x03060000) || Py_LIMITED_API+0 >= 0x03060100
+#define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) (  \
+    PySlice_Unpack((slice), (start), (stop), (step)) < 0 ?                  \
+    ((*(slicelen) = 0), -1) :                                               \
+    ((*(slicelen) = PySlice_AdjustIndices((length), (start), (stop), *(step))), \
+     0))
+PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice,
+                               Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
+PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length,
+                                             Py_ssize_t *start, Py_ssize_t *stop,
+                                             Py_ssize_t step);
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/structmember.h b/openflow/include/python3.8/structmember.h
similarity index 96%
rename from openflow/usr/include/python3.5m/structmember.h
rename to openflow/include/python3.8/structmember.h
index 948f690..b54f708 100644
--- a/openflow/usr/include/python3.5m/structmember.h
+++ b/openflow/include/python3.8/structmember.h
@@ -16,11 +16,11 @@ extern "C" {
    pointer is NULL. */
 
 typedef struct PyMemberDef {
-    char *name;
+    const char *name;
     int type;
     Py_ssize_t offset;
     int flags;
-    char *doc;
+    const char *doc;
 } PyMemberDef;
 
 /* Types */
@@ -49,10 +49,8 @@ typedef struct PyMemberDef {
 #define T_OBJECT_EX 16  /* Like T_OBJECT, but raises AttributeError
                            when the value is NULL, instead of
                            converting to None. */
-#ifdef HAVE_LONG_LONG
 #define T_LONGLONG      17
 #define T_ULONGLONG     18
-#endif /* HAVE_LONG_LONG */
 
 #define T_PYSSIZET      19      /* Py_ssize_t */
 #define T_NONE          20      /* Value is always None */
diff --git a/openflow/usr/include/python3.5m/structseq.h b/openflow/include/python3.8/structseq.h
similarity index 93%
rename from openflow/usr/include/python3.5m/structseq.h
rename to openflow/include/python3.8/structseq.h
index af22716..e5e5d5c 100644
--- a/openflow/usr/include/python3.5m/structseq.h
+++ b/openflow/include/python3.8/structseq.h
@@ -8,13 +8,13 @@ extern "C" {
 #endif
 
 typedef struct PyStructSequence_Field {
-    char *name;
-    char *doc;
+    const char *name;
+    const char *doc;
 } PyStructSequence_Field;
 
 typedef struct PyStructSequence_Desc {
-    char *name;
-    char *doc;
+    const char *name;
+    const char *doc;
     struct PyStructSequence_Field *fields;
     int n_in_sequence;
 } PyStructSequence_Desc;
diff --git a/openflow/usr/include/python3.5m/symtable.h b/openflow/include/python3.8/symtable.h
similarity index 89%
rename from openflow/usr/include/python3.5m/symtable.h
rename to openflow/include/python3.8/symtable.h
index 1409cd9..5dcfa7e 100644
--- a/openflow/usr/include/python3.5m/symtable.h
+++ b/openflow/include/python3.8/symtable.h
@@ -1,11 +1,12 @@
 #ifndef Py_LIMITED_API
 #ifndef Py_SYMTABLE_H
 #define Py_SYMTABLE_H
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "Python-ast.h"   /* mod_ty */
+
 /* XXX(ncoghlan): This is a weird mix of public names and interpreter internal
  *                names.
  */
@@ -48,6 +49,8 @@ typedef struct _symtable_entry {
     unsigned ste_child_free : 1;  /* true if a child block has free vars,
                                      including free refs to globals */
     unsigned ste_generator : 1;   /* true if namespace is a generator */
+    unsigned ste_coroutine : 1;   /* true if namespace is a coroutine */
+    unsigned ste_comprehension : 1; /* true if namespace is a list comprehension */
     unsigned ste_varargs : 1;     /* true if block has varargs */
     unsigned ste_varkeywords : 1; /* true if block has varkeywords */
     unsigned ste_returns_value : 1;  /* true if namespace uses return with
@@ -55,11 +58,12 @@ typedef struct _symtable_entry {
     unsigned ste_needs_class_closure : 1; /* for class scopes, true if a
                                              closure over __class__
                                              should be created */
+    unsigned ste_comp_iter_target : 1; /* true if visiting comprehension target */
+    int ste_comp_iter_expr; /* non-zero if visiting a comprehension range expression */
     int ste_lineno;          /* first line of block */
     int ste_col_offset;      /* offset of first line of block */
     int ste_opt_lineno;      /* lineno of last exec or import * */
     int ste_opt_col_offset;  /* offset of last exec or import * */
-    int ste_tmpname;         /* counter for listcomp temp vars */
     struct symtable *ste_table;
 } PySTEntryObject;
 
@@ -91,6 +95,8 @@ PyAPI_FUNC(void) PySymtable_Free(struct symtable *);
 #define DEF_FREE 2<<4          /* name used but not defined in nested block */
 #define DEF_FREE_CLASS 2<<5    /* free variable from class's method */
 #define DEF_IMPORT 2<<6        /* assignment occurred via import */
+#define DEF_ANNOT 2<<7         /* this name is annotated */
+#define DEF_COMP_ITER 2<<8     /* this name is a comprehension iteration variable */
 
 #define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT)
 
@@ -114,4 +120,4 @@ PyAPI_FUNC(void) PySymtable_Free(struct symtable *);
 }
 #endif
 #endif /* !Py_SYMTABLE_H */
-#endif /* Py_LIMITED_API */
+#endif /* !Py_LIMITED_API */
diff --git a/openflow/usr/include/python3.5m/sysmodule.h b/openflow/include/python3.8/sysmodule.h
similarity index 84%
rename from openflow/usr/include/python3.5m/sysmodule.h
rename to openflow/include/python3.8/sysmodule.h
index cde10ac..670e5d2 100644
--- a/openflow/usr/include/python3.5m/sysmodule.h
+++ b/openflow/include/python3.8/sysmodule.h
@@ -8,11 +8,7 @@ extern "C" {
 #endif
 
 PyAPI_FUNC(PyObject *) PySys_GetObject(const char *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PySys_GetObjectId(_Py_Identifier *key);
-#endif
 PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *);
-PyAPI_FUNC(int) _PySys_SetObjectId(_Py_Identifier *key, PyObject *);
 
 PyAPI_FUNC(void) PySys_SetArgv(int, wchar_t **);
 PyAPI_FUNC(void) PySys_SetArgvEx(int, wchar_t **, int);
@@ -34,7 +30,9 @@ PyAPI_FUNC(void) PySys_AddXOption(const wchar_t *);
 PyAPI_FUNC(PyObject *) PySys_GetXOptions(void);
 
 #ifndef Py_LIMITED_API
-PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *);
+#  define Py_CPYTHON_SYSMODULE_H
+#  include  "cpython/sysmodule.h"
+#  undef Py_CPYTHON_SYSMODULE_H
 #endif
 
 #ifdef __cplusplus
diff --git a/openflow/include/python3.8/token.h b/openflow/include/python3.8/token.h
new file mode 100644
index 0000000..e08708b
--- /dev/null
+++ b/openflow/include/python3.8/token.h
@@ -0,0 +1,92 @@
+/* Auto-generated by Tools/scripts/generate_token.py */
+
+/* Token types */
+#ifndef Py_LIMITED_API
+#ifndef Py_TOKEN_H
+#define Py_TOKEN_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef TILDE   /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */
+
+#define ENDMARKER       0
+#define NAME            1
+#define NUMBER          2
+#define STRING          3
+#define NEWLINE         4
+#define INDENT          5
+#define DEDENT          6
+#define LPAR            7
+#define RPAR            8
+#define LSQB            9
+#define RSQB            10
+#define COLON           11
+#define COMMA           12
+#define SEMI            13
+#define PLUS            14
+#define MINUS           15
+#define STAR            16
+#define SLASH           17
+#define VBAR            18
+#define AMPER           19
+#define LESS            20
+#define GREATER         21
+#define EQUAL           22
+#define DOT             23
+#define PERCENT         24
+#define LBRACE          25
+#define RBRACE          26
+#define EQEQUAL         27
+#define NOTEQUAL        28
+#define LESSEQUAL       29
+#define GREATEREQUAL    30
+#define TILDE           31
+#define CIRCUMFLEX      32
+#define LEFTSHIFT       33
+#define RIGHTSHIFT      34
+#define DOUBLESTAR      35
+#define PLUSEQUAL       36
+#define MINEQUAL        37
+#define STAREQUAL       38
+#define SLASHEQUAL      39
+#define PERCENTEQUAL    40
+#define AMPEREQUAL      41
+#define VBAREQUAL       42
+#define CIRCUMFLEXEQUAL 43
+#define LEFTSHIFTEQUAL  44
+#define RIGHTSHIFTEQUAL 45
+#define DOUBLESTAREQUAL 46
+#define DOUBLESLASH     47
+#define DOUBLESLASHEQUAL 48
+#define AT              49
+#define ATEQUAL         50
+#define RARROW          51
+#define ELLIPSIS        52
+#define COLONEQUAL      53
+#define OP              54
+#define AWAIT           55
+#define ASYNC           56
+#define TYPE_IGNORE     57
+#define TYPE_COMMENT    58
+#define ERRORTOKEN      59
+#define N_TOKENS        63
+#define NT_OFFSET       256
+
+/* Special definitions for cooperation with parser */
+
+#define ISTERMINAL(x)           ((x) < NT_OFFSET)
+#define ISNONTERMINAL(x)        ((x) >= NT_OFFSET)
+#define ISEOF(x)                ((x) == ENDMARKER)
+
+
+PyAPI_DATA(const char * const) _PyParser_TokenNames[]; /* Token names */
+PyAPI_FUNC(int) PyToken_OneChar(int);
+PyAPI_FUNC(int) PyToken_TwoChars(int, int);
+PyAPI_FUNC(int) PyToken_ThreeChars(int, int, int);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_TOKEN_H */
+#endif /* Py_LIMITED_API */
diff --git a/openflow/include/python3.8/traceback.h b/openflow/include/python3.8/traceback.h
new file mode 100644
index 0000000..b451927
--- /dev/null
+++ b/openflow/include/python3.8/traceback.h
@@ -0,0 +1,28 @@
+#ifndef Py_TRACEBACK_H
+#define Py_TRACEBACK_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct _frame;
+
+/* Traceback interface */
+
+PyAPI_FUNC(int) PyTraceBack_Here(struct _frame *);
+PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *);
+
+/* Reveal traceback type so we can typecheck traceback objects */
+PyAPI_DATA(PyTypeObject) PyTraceBack_Type;
+#define PyTraceBack_Check(v) (Py_TYPE(v) == &PyTraceBack_Type)
+
+
+#ifndef Py_LIMITED_API
+#  define Py_CPYTHON_TRACEBACK_H
+#  include  "cpython/traceback.h"
+#  undef Py_CPYTHON_TRACEBACK_H
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_TRACEBACK_H */
diff --git a/openflow/include/python3.8/tracemalloc.h b/openflow/include/python3.8/tracemalloc.h
new file mode 100644
index 0000000..bd14217
--- /dev/null
+++ b/openflow/include/python3.8/tracemalloc.h
@@ -0,0 +1,38 @@
+#ifndef Py_TRACEMALLOC_H
+#define Py_TRACEMALLOC_H
+
+#ifndef Py_LIMITED_API
+/* Track an allocated memory block in the tracemalloc module.
+   Return 0 on success, return -1 on error (failed to allocate memory to store
+   the trace).
+
+   Return -2 if tracemalloc is disabled.
+
+   If memory block is already tracked, update the existing trace. */
+PyAPI_FUNC(int) PyTraceMalloc_Track(
+    unsigned int domain,
+    uintptr_t ptr,
+    size_t size);
+
+/* Untrack an allocated memory block in the tracemalloc module.
+   Do nothing if the block was not tracked.
+
+   Return -2 if tracemalloc is disabled, otherwise return 0. */
+PyAPI_FUNC(int) PyTraceMalloc_Untrack(
+    unsigned int domain,
+    uintptr_t ptr);
+
+/* Get the traceback where a memory block was allocated.
+
+   Return a tuple of (filename: str, lineno: int) tuples.
+
+   Return None if the tracemalloc module is disabled or if the memory block
+   is not tracked by tracemalloc.
+
+   Raise an exception and return NULL on error. */
+PyAPI_FUNC(PyObject*) _PyTraceMalloc_GetTraceback(
+    unsigned int domain,
+    uintptr_t ptr);
+#endif
+
+#endif /* !Py_TRACEMALLOC_H */
diff --git a/openflow/usr/include/python3.5m/tupleobject.h b/openflow/include/python3.8/tupleobject.h
similarity index 60%
rename from openflow/usr/include/python3.5m/tupleobject.h
rename to openflow/include/python3.8/tupleobject.h
index c273ce7..590902d 100644
--- a/openflow/usr/include/python3.5m/tupleobject.h
+++ b/openflow/include/python3.8/tupleobject.h
@@ -1,4 +1,3 @@
-
 /* Tuple object interface */
 
 #ifndef Py_TUPLEOBJECT_H
@@ -10,7 +9,7 @@ extern "C" {
 /*
 Another generally useful object type is a tuple of object pointers.
 For Python, this is an immutable type.  C code can change the tuple items
-(but not their number), and even use tuples are general-purpose arrays of
+(but not their number), and even use tuples as general-purpose arrays of
 object references, but in general only brand new tuples should be mutated,
 not ones that might already have been exposed to Python code.
 
@@ -21,18 +20,6 @@ inserted in the tuple.  Similarly, PyTuple_GetItem does not increment the
 returned item's reference count.
 */
 
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_VAR_HEAD
-    PyObject *ob_item[1];
-
-    /* ob_item contains space for 'ob_size' elements.
-     * Items must normally not be NULL, except during construction when
-     * the tuple is not yet visible outside the function that builds it.
-     */
-} PyTupleObject;
-#endif
-
 PyAPI_DATA(PyTypeObject) PyTuple_Type;
 PyAPI_DATA(PyTypeObject) PyTupleIter_Type;
 
@@ -45,27 +32,15 @@ PyAPI_FUNC(Py_ssize_t) PyTuple_Size(PyObject *);
 PyAPI_FUNC(PyObject *) PyTuple_GetItem(PyObject *, Py_ssize_t);
 PyAPI_FUNC(int) PyTuple_SetItem(PyObject *, Py_ssize_t, PyObject *);
 PyAPI_FUNC(PyObject *) PyTuple_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyTuple_Resize(PyObject **, Py_ssize_t);
-#endif
 PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *);
-#endif
-
-/* Macro, trading safety for speed */
-#ifndef Py_LIMITED_API
-#define PyTuple_GET_ITEM(op, i) (((PyTupleObject *)(op))->ob_item[i])
-#define PyTuple_GET_SIZE(op)    Py_SIZE(op)
-
-/* Macro, *only* to be used to fill in brand new tuples */
-#define PyTuple_SET_ITEM(op, i, v) (((PyTupleObject *)(op))->ob_item[i] = v)
-#endif
 
 PyAPI_FUNC(int) PyTuple_ClearFreeList(void);
+
 #ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);
-#endif /* Py_LIMITED_API */
+#  define Py_CPYTHON_TUPLEOBJECT_H
+#  include  "cpython/tupleobject.h"
+#  undef Py_CPYTHON_TUPLEOBJECT_H
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/openflow/usr/include/python3.5m/typeslots.h b/openflow/include/python3.8/typeslots.h
similarity index 100%
rename from openflow/usr/include/python3.5m/typeslots.h
rename to openflow/include/python3.8/typeslots.h
diff --git a/openflow/usr/include/python3.5m/ucnhash.h b/openflow/include/python3.8/ucnhash.h
similarity index 100%
rename from openflow/usr/include/python3.5m/ucnhash.h
rename to openflow/include/python3.8/ucnhash.h
diff --git a/openflow/include/python3.8/unicodeobject.h b/openflow/include/python3.8/unicodeobject.h
new file mode 100644
index 0000000..97d8cd1
--- /dev/null
+++ b/openflow/include/python3.8/unicodeobject.h
@@ -0,0 +1,1044 @@
+#ifndef Py_UNICODEOBJECT_H
+#define Py_UNICODEOBJECT_H
+
+#include <stdarg.h>
+
+/*
+
+Unicode implementation based on original code by Fredrik Lundh,
+modified by Marc-Andre Lemburg (mal@lemburg.com) according to the
+Unicode Integration Proposal. (See
+http://www.egenix.com/files/python/unicode-proposal.txt).
+
+Copyright (c) Corporation for National Research Initiatives.
+
+
+ Original header:
+ --------------------------------------------------------------------
+
+ * Yet another Unicode string type for Python.  This type supports the
+ * 16-bit Basic Multilingual Plane (BMP) only.
+ *
+ * Written by Fredrik Lundh, January 1999.
+ *
+ * Copyright (c) 1999 by Secret Labs AB.
+ * Copyright (c) 1999 by Fredrik Lundh.
+ *
+ * fredrik@pythonware.com
+ * http://www.pythonware.com
+ *
+ * --------------------------------------------------------------------
+ * This Unicode String Type is
+ *
+ * Copyright (c) 1999 by Secret Labs AB
+ * Copyright (c) 1999 by Fredrik Lundh
+ *
+ * By obtaining, using, and/or copying this software and/or its
+ * associated documentation, you agree that you have read, understood,
+ * and will comply with the following terms and conditions:
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * associated documentation for any purpose and without fee is hereby
+ * granted, provided that the above copyright notice appears in all
+ * copies, and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of Secret Labs
+ * AB or the author not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission.
+ *
+ * SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * -------------------------------------------------------------------- */
+
+#include <ctype.h>
+
+/* === Internal API ======================================================= */
+
+/* --- Internal Unicode Format -------------------------------------------- */
+
+/* Python 3.x requires unicode */
+#define Py_USING_UNICODE
+
+#ifndef SIZEOF_WCHAR_T
+#error Must define SIZEOF_WCHAR_T
+#endif
+
+#define Py_UNICODE_SIZE SIZEOF_WCHAR_T
+
+/* If wchar_t can be used for UCS-4 storage, set Py_UNICODE_WIDE.
+   Otherwise, Unicode strings are stored as UCS-2 (with limited support
+   for UTF-16) */
+
+#if Py_UNICODE_SIZE >= 4
+#define Py_UNICODE_WIDE
+#endif
+
+/* Set these flags if the platform has "wchar.h" and the
+   wchar_t type is a 16-bit unsigned type */
+/* #define HAVE_WCHAR_H */
+/* #define HAVE_USABLE_WCHAR_T */
+
+/* If the compiler provides a wchar_t type we try to support it
+   through the interface functions PyUnicode_FromWideChar(),
+   PyUnicode_AsWideChar() and PyUnicode_AsWideCharString(). */
+
+#ifdef HAVE_USABLE_WCHAR_T
+# ifndef HAVE_WCHAR_H
+#  define HAVE_WCHAR_H
+# endif
+#endif
+
+#ifdef HAVE_WCHAR_H
+#  include <wchar.h>
+#endif
+
+/* Py_UCS4 and Py_UCS2 are typedefs for the respective
+   unicode representations. */
+typedef uint32_t Py_UCS4;
+typedef uint16_t Py_UCS2;
+typedef uint8_t Py_UCS1;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+PyAPI_DATA(PyTypeObject) PyUnicode_Type;
+PyAPI_DATA(PyTypeObject) PyUnicodeIter_Type;
+
+#define PyUnicode_Check(op) \
+                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_UNICODE_SUBCLASS)
+#define PyUnicode_CheckExact(op) (Py_TYPE(op) == &PyUnicode_Type)
+
+/* --- Constants ---------------------------------------------------------- */
+
+/* This Unicode character will be used as replacement character during
+   decoding if the errors argument is set to "replace". Note: the
+   Unicode character U+FFFD is the official REPLACEMENT CHARACTER in
+   Unicode 3.0. */
+
+#define Py_UNICODE_REPLACEMENT_CHARACTER ((Py_UCS4) 0xFFFD)
+
+/* === Public API ========================================================= */
+
+/* Similar to PyUnicode_FromUnicode(), but u points to UTF-8 encoded bytes */
+PyAPI_FUNC(PyObject*) PyUnicode_FromStringAndSize(
+    const char *u,             /* UTF-8 encoded string */
+    Py_ssize_t size            /* size of buffer */
+    );
+
+/* Similar to PyUnicode_FromUnicode(), but u points to null-terminated
+   UTF-8 encoded bytes.  The size is determined with strlen(). */
+PyAPI_FUNC(PyObject*) PyUnicode_FromString(
+    const char *u              /* UTF-8 encoded string */
+    );
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
+PyAPI_FUNC(PyObject*) PyUnicode_Substring(
+    PyObject *str,
+    Py_ssize_t start,
+    Py_ssize_t end);
+#endif
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
+/* Copy the string into a UCS4 buffer including the null character if copy_null
+   is set. Return NULL and raise an exception on error. Raise a SystemError if
+   the buffer is smaller than the string. Return buffer on success.
+
+   buflen is the length of the buffer in (Py_UCS4) characters. */
+PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4(
+    PyObject *unicode,
+    Py_UCS4* buffer,
+    Py_ssize_t buflen,
+    int copy_null);
+
+/* Copy the string into a UCS4 buffer. A new buffer is allocated using
+ * PyMem_Malloc; if this fails, NULL is returned with a memory error
+   exception set. */
+PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4Copy(PyObject *unicode);
+#endif
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
+/* Get the length of the Unicode object. */
+
+PyAPI_FUNC(Py_ssize_t) PyUnicode_GetLength(
+    PyObject *unicode
+);
+#endif
+
+/* Get the number of Py_UNICODE units in the
+   string representation. */
+
+Py_DEPRECATED(3.3) PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize(
+    PyObject *unicode           /* Unicode object */
+    );
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
+/* Read a character from the string. */
+
+PyAPI_FUNC(Py_UCS4) PyUnicode_ReadChar(
+    PyObject *unicode,
+    Py_ssize_t index
+    );
+
+/* Write a character to the string. The string must have been created through
+   PyUnicode_New, must not be shared, and must not have been hashed yet.
+
+   Return 0 on success, -1 on error. */
+
+PyAPI_FUNC(int) PyUnicode_WriteChar(
+    PyObject *unicode,
+    Py_ssize_t index,
+    Py_UCS4 character
+    );
+#endif
+
+/* Resize a Unicode object. The length is the number of characters, except
+   if the kind of the string is PyUnicode_WCHAR_KIND: in this case, the length
+   is the number of Py_UNICODE characters.
+
+   *unicode is modified to point to the new (resized) object and 0
+   returned on success.
+
+   Try to resize the string in place (which is usually faster than allocating
+   a new string and copy characters), or create a new string.
+
+   Error handling is implemented as follows: an exception is set, -1
+   is returned and *unicode left untouched.
+
+   WARNING: The function doesn't check string content, the result may not be a
+            string in canonical representation. */
+
+PyAPI_FUNC(int) PyUnicode_Resize(
+    PyObject **unicode,         /* Pointer to the Unicode object */
+    Py_ssize_t length           /* New length */
+    );
+
+/* Decode obj to a Unicode object.
+
+   bytes, bytearray and other bytes-like objects are decoded according to the
+   given encoding and error handler. The encoding and error handler can be
+   NULL to have the interface use UTF-8 and "strict".
+
+   All other objects (including Unicode objects) raise an exception.
+
+   The API returns NULL in case of an error. The caller is responsible
+   for decref'ing the returned objects.
+
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_FromEncodedObject(
+    PyObject *obj,              /* Object */
+    const char *encoding,       /* encoding */
+    const char *errors          /* error handling */
+    );
+
+/* Copy an instance of a Unicode subtype to a new true Unicode object if
+   necessary. If obj is already a true Unicode object (not a subtype), return
+   the reference with *incremented* refcount.
+
+   The API returns NULL in case of an error. The caller is responsible
+   for decref'ing the returned objects.
+
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_FromObject(
+    PyObject *obj      /* Object */
+    );
+
+PyAPI_FUNC(PyObject *) PyUnicode_FromFormatV(
+    const char *format,   /* ASCII-encoded string  */
+    va_list vargs
+    );
+PyAPI_FUNC(PyObject *) PyUnicode_FromFormat(
+    const char *format,   /* ASCII-encoded string  */
+    ...
+    );
+
+PyAPI_FUNC(void) PyUnicode_InternInPlace(PyObject **);
+PyAPI_FUNC(void) PyUnicode_InternImmortal(PyObject **);
+PyAPI_FUNC(PyObject *) PyUnicode_InternFromString(
+    const char *u              /* UTF-8 encoded string */
+    );
+
+/* Use only if you know it's a string */
+#define PyUnicode_CHECK_INTERNED(op) \
+    (((PyASCIIObject *)(op))->state.interned)
+
+/* --- wchar_t support for platforms which support it --------------------- */
+
+#ifdef HAVE_WCHAR_H
+
+/* Create a Unicode Object from the wchar_t buffer w of the given
+   size.
+
+   The buffer is copied into the new object. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_FromWideChar(
+    const wchar_t *w,           /* wchar_t buffer */
+    Py_ssize_t size             /* size of buffer */
+    );
+
+/* Copies the Unicode Object contents into the wchar_t buffer w.  At
+   most size wchar_t characters are copied.
+
+   Note that the resulting wchar_t string may or may not be
+   0-terminated.  It is the responsibility of the caller to make sure
+   that the wchar_t string is 0-terminated in case this is required by
+   the application.
+
+   Returns the number of wchar_t characters copied (excluding a
+   possibly trailing 0-termination character) or -1 in case of an
+   error. */
+
+PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar(
+    PyObject *unicode,          /* Unicode object */
+    wchar_t *w,                 /* wchar_t buffer */
+    Py_ssize_t size             /* size of buffer */
+    );
+
+/* Convert the Unicode object to a wide character string. The output string
+   always ends with a nul character. If size is not NULL, write the number of
+   wide characters (excluding the null character) into *size.
+
+   Returns a buffer allocated by PyMem_Malloc() (use PyMem_Free() to free it)
+   on success. On error, returns NULL, *size is undefined and raises a
+   MemoryError. */
+
+PyAPI_FUNC(wchar_t*) PyUnicode_AsWideCharString(
+    PyObject *unicode,          /* Unicode object */
+    Py_ssize_t *size            /* number of characters of the result */
+    );
+
+#endif
+
+/* --- Unicode ordinals --------------------------------------------------- */
+
+/* Create a Unicode Object from the given Unicode code point ordinal.
+
+   The ordinal must be in range(0x110000). A ValueError is
+   raised in case it is not.
+
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal);
+
+/* --- Free-list management ----------------------------------------------- */
+
+/* Clear the free list used by the Unicode implementation.
+
+   This can be used to release memory used for objects on the free
+   list back to the Python memory allocator.
+
+*/
+
+PyAPI_FUNC(int) PyUnicode_ClearFreeList(void);
+
+/* === Builtin Codecs =====================================================
+
+   Many of these APIs take two arguments encoding and errors. These
+   parameters encoding and errors have the same semantics as the ones
+   of the builtin str() API.
+
+   Setting encoding to NULL causes the default encoding (UTF-8) to be used.
+
+   Error handling is set by errors which may also be set to NULL
+   meaning to use the default handling defined for the codec. Default
+   error handling for all builtin codecs is "strict" (ValueErrors are
+   raised).
+
+   The codecs all use a similar interface. Only deviation from the
+   generic ones are documented.
+
+*/
+
+/* --- Manage the default encoding ---------------------------------------- */
+
+/* Returns "utf-8".  */
+PyAPI_FUNC(const char*) PyUnicode_GetDefaultEncoding(void);
+
+/* --- Generic Codecs ----------------------------------------------------- */
+
+/* Create a Unicode object by decoding the encoded string s of the
+   given size. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_Decode(
+    const char *s,              /* encoded string */
+    Py_ssize_t size,            /* size of buffer */
+    const char *encoding,       /* encoding */
+    const char *errors          /* error handling */
+    );
+
+/* Decode a Unicode object unicode and return the result as Python
+   object.
+
+   This API is DEPRECATED. The only supported standard encoding is rot13.
+   Use PyCodec_Decode() to decode with rot13 and non-standard codecs
+   that decode from str. */
+
+Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedObject(
+    PyObject *unicode,          /* Unicode object */
+    const char *encoding,       /* encoding */
+    const char *errors          /* error handling */
+    );
+
+/* Decode a Unicode object unicode and return the result as Unicode
+   object.
+
+   This API is DEPRECATED. The only supported standard encoding is rot13.
+   Use PyCodec_Decode() to decode with rot13 and non-standard codecs
+   that decode from str to str. */
+
+Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedUnicode(
+    PyObject *unicode,          /* Unicode object */
+    const char *encoding,       /* encoding */
+    const char *errors          /* error handling */
+    );
+
+/* Encodes a Unicode object and returns the result as Python
+   object.
+
+   This API is DEPRECATED.  It is superseded by PyUnicode_AsEncodedString()
+   since all standard encodings (except rot13) encode str to bytes.
+   Use PyCodec_Encode() for encoding with rot13 and non-standard codecs
+   that encode form str to non-bytes. */
+
+Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject(
+    PyObject *unicode,          /* Unicode object */
+    const char *encoding,       /* encoding */
+    const char *errors          /* error handling */
+    );
+
+/* Encodes a Unicode object and returns the result as Python string
+   object. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString(
+    PyObject *unicode,          /* Unicode object */
+    const char *encoding,       /* encoding */
+    const char *errors          /* error handling */
+    );
+
+/* Encodes a Unicode object and returns the result as Unicode
+   object.
+
+   This API is DEPRECATED.  The only supported standard encodings is rot13.
+   Use PyCodec_Encode() to encode with rot13 and non-standard codecs
+   that encode from str to str. */
+
+Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedUnicode(
+    PyObject *unicode,          /* Unicode object */
+    const char *encoding,       /* encoding */
+    const char *errors          /* error handling */
+    );
+
+/* Build an encoding map. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap(
+    PyObject* string            /* 256 character map */
+   );
+
+/* --- UTF-7 Codecs ------------------------------------------------------- */
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7(
+    const char *string,         /* UTF-7 encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors          /* error handling */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful(
+    const char *string,         /* UTF-7 encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors,         /* error handling */
+    Py_ssize_t *consumed        /* bytes consumed */
+    );
+
+/* --- UTF-8 Codecs ------------------------------------------------------- */
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8(
+    const char *string,         /* UTF-8 encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors          /* error handling */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8Stateful(
+    const char *string,         /* UTF-8 encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors,         /* error handling */
+    Py_ssize_t *consumed        /* bytes consumed */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_AsUTF8String(
+    PyObject *unicode           /* Unicode object */
+    );
+
+/* --- UTF-32 Codecs ------------------------------------------------------ */
+
+/* Decodes length bytes from a UTF-32 encoded buffer string and returns
+   the corresponding Unicode object.
+
+   errors (if non-NULL) defines the error handling. It defaults
+   to "strict".
+
+   If byteorder is non-NULL, the decoder starts decoding using the
+   given byte order:
+
+    *byteorder == -1: little endian
+    *byteorder == 0:  native order
+    *byteorder == 1:  big endian
+
+   In native mode, the first four bytes of the stream are checked for a
+   BOM mark. If found, the BOM mark is analysed, the byte order
+   adjusted and the BOM skipped.  In the other modes, no BOM mark
+   interpretation is done. After completion, *byteorder is set to the
+   current byte order at the end of input data.
+
+   If byteorder is NULL, the codec starts in native order mode.
+
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32(
+    const char *string,         /* UTF-32 encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors,         /* error handling */
+    int *byteorder              /* pointer to byteorder to use
+                                   0=native;-1=LE,1=BE; updated on
+                                   exit */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32Stateful(
+    const char *string,         /* UTF-32 encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors,         /* error handling */
+    int *byteorder,             /* pointer to byteorder to use
+                                   0=native;-1=LE,1=BE; updated on
+                                   exit */
+    Py_ssize_t *consumed        /* bytes consumed */
+    );
+
+/* Returns a Python string using the UTF-32 encoding in native byte
+   order. The string always starts with a BOM mark.  */
+
+PyAPI_FUNC(PyObject*) PyUnicode_AsUTF32String(
+    PyObject *unicode           /* Unicode object */
+    );
+
+/* Returns a Python string object holding the UTF-32 encoded value of
+   the Unicode data.
+
+   If byteorder is not 0, output is written according to the following
+   byte order:
+
+   byteorder == -1: little endian
+   byteorder == 0:  native byte order (writes a BOM mark)
+   byteorder == 1:  big endian
+
+   If byteorder is 0, the output string will always start with the
+   Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is
+   prepended.
+
+*/
+
+/* --- UTF-16 Codecs ------------------------------------------------------ */
+
+/* Decodes length bytes from a UTF-16 encoded buffer string and returns
+   the corresponding Unicode object.
+
+   errors (if non-NULL) defines the error handling. It defaults
+   to "strict".
+
+   If byteorder is non-NULL, the decoder starts decoding using the
+   given byte order:
+
+    *byteorder == -1: little endian
+    *byteorder == 0:  native order
+    *byteorder == 1:  big endian
+
+   In native mode, the first two bytes of the stream are checked for a
+   BOM mark. If found, the BOM mark is analysed, the byte order
+   adjusted and the BOM skipped.  In the other modes, no BOM mark
+   interpretation is done. After completion, *byteorder is set to the
+   current byte order at the end of input data.
+
+   If byteorder is NULL, the codec starts in native order mode.
+
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16(
+    const char *string,         /* UTF-16 encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors,         /* error handling */
+    int *byteorder              /* pointer to byteorder to use
+                                   0=native;-1=LE,1=BE; updated on
+                                   exit */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16Stateful(
+    const char *string,         /* UTF-16 encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors,         /* error handling */
+    int *byteorder,             /* pointer to byteorder to use
+                                   0=native;-1=LE,1=BE; updated on
+                                   exit */
+    Py_ssize_t *consumed        /* bytes consumed */
+    );
+
+/* Returns a Python string using the UTF-16 encoding in native byte
+   order. The string always starts with a BOM mark.  */
+
+PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String(
+    PyObject *unicode           /* Unicode object */
+    );
+
+/* --- Unicode-Escape Codecs ---------------------------------------------- */
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape(
+    const char *string,         /* Unicode-Escape encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors          /* error handling */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString(
+    PyObject *unicode           /* Unicode object */
+    );
+
+/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeRawUnicodeEscape(
+    const char *string,         /* Raw-Unicode-Escape encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors          /* error handling */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_AsRawUnicodeEscapeString(
+    PyObject *unicode           /* Unicode object */
+    );
+
+/* --- Latin-1 Codecs -----------------------------------------------------
+
+   Note: Latin-1 corresponds to the first 256 Unicode ordinals. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeLatin1(
+    const char *string,         /* Latin-1 encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors          /* error handling */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_AsLatin1String(
+    PyObject *unicode           /* Unicode object */
+    );
+
+/* --- ASCII Codecs -------------------------------------------------------
+
+   Only 7-bit ASCII data is excepted. All other codes generate errors.
+
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeASCII(
+    const char *string,         /* ASCII encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors          /* error handling */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_AsASCIIString(
+    PyObject *unicode           /* Unicode object */
+    );
+
+/* --- Character Map Codecs -----------------------------------------------
+
+   This codec uses mappings to encode and decode characters.
+
+   Decoding mappings must map byte ordinals (integers in the range from 0 to
+   255) to Unicode strings, integers (which are then interpreted as Unicode
+   ordinals) or None.  Unmapped data bytes (ones which cause a LookupError)
+   as well as mapped to None, 0xFFFE or '\ufffe' are treated as "undefined
+   mapping" and cause an error.
+
+   Encoding mappings must map Unicode ordinal integers to bytes objects,
+   integers in the range from 0 to 255 or None.  Unmapped character
+   ordinals (ones which cause a LookupError) as well as mapped to
+   None are treated as "undefined mapping" and cause an error.
+
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap(
+    const char *string,         /* Encoded string */
+    Py_ssize_t length,          /* size of string */
+    PyObject *mapping,          /* decoding mapping */
+    const char *errors          /* error handling */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString(
+    PyObject *unicode,          /* Unicode object */
+    PyObject *mapping           /* encoding mapping */
+    );
+
+/* --- MBCS codecs for Windows -------------------------------------------- */
+
+#ifdef MS_WINDOWS
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS(
+    const char *string,         /* MBCS encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors          /* error handling */
+    );
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCSStateful(
+    const char *string,         /* MBCS encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors,         /* error handling */
+    Py_ssize_t *consumed        /* bytes consumed */
+    );
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeCodePageStateful(
+    int code_page,              /* code page number */
+    const char *string,         /* encoded string */
+    Py_ssize_t length,          /* size of string */
+    const char *errors,         /* error handling */
+    Py_ssize_t *consumed        /* bytes consumed */
+    );
+#endif
+
+PyAPI_FUNC(PyObject*) PyUnicode_AsMBCSString(
+    PyObject *unicode           /* Unicode object */
+    );
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeCodePage(
+    int code_page,              /* code page number */
+    PyObject *unicode,          /* Unicode object */
+    const char *errors          /* error handling */
+    );
+#endif
+
+#endif /* MS_WINDOWS */
+
+/* --- Locale encoding --------------------------------------------------- */
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
+/* Decode a string from the current locale encoding. The decoder is strict if
+   *surrogateescape* is equal to zero, otherwise it uses the 'surrogateescape'
+   error handler (PEP 383) to escape undecodable bytes. If a byte sequence can
+   be decoded as a surrogate character and *surrogateescape* is not equal to
+   zero, the byte sequence is escaped using the 'surrogateescape' error handler
+   instead of being decoded. *str* must end with a null character but cannot
+   contain embedded null characters. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocaleAndSize(
+    const char *str,
+    Py_ssize_t len,
+    const char *errors);
+
+/* Similar to PyUnicode_DecodeLocaleAndSize(), but compute the string
+   length using strlen(). */
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocale(
+    const char *str,
+    const char *errors);
+
+/* Encode a Unicode object to the current locale encoding. The encoder is
+   strict is *surrogateescape* is equal to zero, otherwise the
+   "surrogateescape" error handler is used. Return a bytes object. The string
+   cannot contain embedded null characters. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeLocale(
+    PyObject *unicode,
+    const char *errors
+    );
+#endif
+
+/* --- File system encoding ---------------------------------------------- */
+
+/* ParseTuple converter: encode str objects to bytes using
+   PyUnicode_EncodeFSDefault(); bytes objects are output as-is. */
+
+PyAPI_FUNC(int) PyUnicode_FSConverter(PyObject*, void*);
+
+/* ParseTuple converter: decode bytes objects to unicode using
+   PyUnicode_DecodeFSDefaultAndSize(); str objects are output as-is. */
+
+PyAPI_FUNC(int) PyUnicode_FSDecoder(PyObject*, void*);
+
+/* Decode a null-terminated string using Py_FileSystemDefaultEncoding
+   and the "surrogateescape" error handler.
+
+   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
+   encoding.
+
+   Use PyUnicode_DecodeFSDefaultAndSize() if the string length is known.
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefault(
+    const char *s               /* encoded string */
+    );
+
+/* Decode a string using Py_FileSystemDefaultEncoding
+   and the "surrogateescape" error handler.
+
+   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
+   encoding.
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefaultAndSize(
+    const char *s,               /* encoded string */
+    Py_ssize_t size              /* size */
+    );
+
+/* Encode a Unicode object to Py_FileSystemDefaultEncoding with the
+   "surrogateescape" error handler, and return bytes.
+
+   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
+   encoding.
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeFSDefault(
+    PyObject *unicode
+    );
+
+/* --- Methods & Slots ----------------------------------------------------
+
+   These are capable of handling Unicode objects and strings on input
+   (we refer to them as strings in the descriptions) and return
+   Unicode objects or integers as appropriate. */
+
+/* Concat two strings giving a new Unicode string. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_Concat(
+    PyObject *left,             /* Left string */
+    PyObject *right             /* Right string */
+    );
+
+/* Concat two strings and put the result in *pleft
+   (sets *pleft to NULL on error) */
+
+PyAPI_FUNC(void) PyUnicode_Append(
+    PyObject **pleft,           /* Pointer to left string */
+    PyObject *right             /* Right string */
+    );
+
+/* Concat two strings, put the result in *pleft and drop the right object
+   (sets *pleft to NULL on error) */
+
+PyAPI_FUNC(void) PyUnicode_AppendAndDel(
+    PyObject **pleft,           /* Pointer to left string */
+    PyObject *right             /* Right string */
+    );
+
+/* Split a string giving a list of Unicode strings.
+
+   If sep is NULL, splitting will be done at all whitespace
+   substrings. Otherwise, splits occur at the given separator.
+
+   At most maxsplit splits will be done. If negative, no limit is set.
+
+   Separators are not included in the resulting list.
+
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_Split(
+    PyObject *s,                /* String to split */
+    PyObject *sep,              /* String separator */
+    Py_ssize_t maxsplit         /* Maxsplit count */
+    );
+
+/* Dito, but split at line breaks.
+
+   CRLF is considered to be one line break. Line breaks are not
+   included in the resulting list. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_Splitlines(
+    PyObject *s,                /* String to split */
+    int keepends                /* If true, line end markers are included */
+    );
+
+/* Partition a string using a given separator. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_Partition(
+    PyObject *s,                /* String to partition */
+    PyObject *sep               /* String separator */
+    );
+
+/* Partition a string using a given separator, searching from the end of the
+   string. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_RPartition(
+    PyObject *s,                /* String to partition */
+    PyObject *sep               /* String separator */
+    );
+
+/* Split a string giving a list of Unicode strings.
+
+   If sep is NULL, splitting will be done at all whitespace
+   substrings. Otherwise, splits occur at the given separator.
+
+   At most maxsplit splits will be done. But unlike PyUnicode_Split
+   PyUnicode_RSplit splits from the end of the string. If negative,
+   no limit is set.
+
+   Separators are not included in the resulting list.
+
+*/
+
+PyAPI_FUNC(PyObject*) PyUnicode_RSplit(
+    PyObject *s,                /* String to split */
+    PyObject *sep,              /* String separator */
+    Py_ssize_t maxsplit         /* Maxsplit count */
+    );
+
+/* Translate a string by applying a character mapping table to it and
+   return the resulting Unicode object.
+
+   The mapping table must map Unicode ordinal integers to Unicode strings,
+   Unicode ordinal integers or None (causing deletion of the character).
+
+   Mapping tables may be dictionaries or sequences. Unmapped character
+   ordinals (ones which cause a LookupError) are left untouched and
+   are copied as-is.
+
+*/
+
+PyAPI_FUNC(PyObject *) PyUnicode_Translate(
+    PyObject *str,              /* String */
+    PyObject *table,            /* Translate table */
+    const char *errors          /* error handling */
+    );
+
+/* Join a sequence of strings using the given separator and return
+   the resulting Unicode string. */
+
+PyAPI_FUNC(PyObject*) PyUnicode_Join(
+    PyObject *separator,        /* Separator string */
+    PyObject *seq               /* Sequence object */
+    );
+
+/* Return 1 if substr matches str[start:end] at the given tail end, 0
+   otherwise. */
+
+PyAPI_FUNC(Py_ssize_t) PyUnicode_Tailmatch(
+    PyObject *str,              /* String */
+    PyObject *substr,           /* Prefix or Suffix string */
+    Py_ssize_t start,           /* Start index */
+    Py_ssize_t end,             /* Stop index */
+    int direction               /* Tail end: -1 prefix, +1 suffix */
+    );
+
+/* Return the first position of substr in str[start:end] using the
+   given search direction or -1 if not found. -2 is returned in case
+   an error occurred and an exception is set. */
+
+PyAPI_FUNC(Py_ssize_t) PyUnicode_Find(
+    PyObject *str,              /* String */
+    PyObject *substr,           /* Substring to find */
+    Py_ssize_t start,           /* Start index */
+    Py_ssize_t end,             /* Stop index */
+    int direction               /* Find direction: +1 forward, -1 backward */
+    );
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
+/* Like PyUnicode_Find, but search for single character only. */
+PyAPI_FUNC(Py_ssize_t) PyUnicode_FindChar(
+    PyObject *str,
+    Py_UCS4 ch,
+    Py_ssize_t start,
+    Py_ssize_t end,
+    int direction
+    );
+#endif
+
+/* Count the number of occurrences of substr in str[start:end]. */
+
+PyAPI_FUNC(Py_ssize_t) PyUnicode_Count(
+    PyObject *str,              /* String */
+    PyObject *substr,           /* Substring to count */
+    Py_ssize_t start,           /* Start index */
+    Py_ssize_t end              /* Stop index */
+    );
+
+/* Replace at most maxcount occurrences of substr in str with replstr
+   and return the resulting Unicode object. */
+
+PyAPI_FUNC(PyObject *) PyUnicode_Replace(
+    PyObject *str,              /* String */
+    PyObject *substr,           /* Substring to find */
+    PyObject *replstr,          /* Substring to replace */
+    Py_ssize_t maxcount         /* Max. number of replacements to apply;
+                                   -1 = all */
+    );
+
+/* Compare two strings and return -1, 0, 1 for less than, equal,
+   greater than resp.
+   Raise an exception and return -1 on error. */
+
+PyAPI_FUNC(int) PyUnicode_Compare(
+    PyObject *left,             /* Left string */
+    PyObject *right             /* Right string */
+    );
+
+/* Compare a Unicode object with C string and return -1, 0, 1 for less than,
+   equal, and greater than, respectively.  It is best to pass only
+   ASCII-encoded strings, but the function interprets the input string as
+   ISO-8859-1 if it contains non-ASCII characters.
+   This function does not raise exceptions. */
+
+PyAPI_FUNC(int) PyUnicode_CompareWithASCIIString(
+    PyObject *left,
+    const char *right           /* ASCII-encoded string */
+    );
+
+/* Rich compare two strings and return one of the following:
+
+   - NULL in case an exception was raised
+   - Py_True or Py_False for successful comparisons
+   - Py_NotImplemented in case the type combination is unknown
+
+   Possible values for op:
+
+     Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE
+
+*/
+
+PyAPI_FUNC(PyObject *) PyUnicode_RichCompare(
+    PyObject *left,             /* Left string */
+    PyObject *right,            /* Right string */
+    int op                      /* Operation: Py_EQ, Py_NE, Py_GT, etc. */
+    );
+
+/* Apply an argument tuple or dictionary to a format string and return
+   the resulting Unicode string. */
+
+PyAPI_FUNC(PyObject *) PyUnicode_Format(
+    PyObject *format,           /* Format string */
+    PyObject *args              /* Argument tuple or dictionary */
+    );
+
+/* Checks whether element is contained in container and return 1/0
+   accordingly.
+
+   element has to coerce to a one element Unicode string. -1 is
+   returned in case of an error. */
+
+PyAPI_FUNC(int) PyUnicode_Contains(
+    PyObject *container,        /* Container string */
+    PyObject *element           /* Element string */
+    );
+
+/* Checks whether argument is a valid identifier. */
+
+PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s);
+
+/* === Characters Type APIs =============================================== */
+
+#ifndef Py_LIMITED_API
+#  define Py_CPYTHON_UNICODEOBJECT_H
+#  include  "cpython/unicodeobject.h"
+#  undef Py_CPYTHON_UNICODEOBJECT_H
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_UNICODEOBJECT_H */
diff --git a/openflow/usr/include/python3.5m/warnings.h b/openflow/include/python3.8/warnings.h
similarity index 80%
rename from openflow/usr/include/python3.5m/warnings.h
rename to openflow/include/python3.8/warnings.h
index effb9fa..a675bb5 100644
--- a/openflow/usr/include/python3.5m/warnings.h
+++ b/openflow/include/python3.8/warnings.h
@@ -17,6 +17,15 @@ PyAPI_FUNC(int) PyErr_WarnFormat(
     Py_ssize_t stack_level,
     const char *format,         /* ASCII-encoded string  */
     ...);
+
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
+/* Emit a ResourceWarning warning */
+PyAPI_FUNC(int) PyErr_ResourceWarning(
+    PyObject *source,
+    Py_ssize_t stack_level,
+    const char *format,         /* ASCII-encoded string  */
+    ...);
+#endif
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(int) PyErr_WarnExplicitObject(
     PyObject *category,
@@ -47,6 +56,10 @@ PyErr_WarnExplicitFormat(PyObject *category,
 #define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1)
 #endif
 
+#ifndef Py_LIMITED_API
+void _PyErr_WarnUnawaitedCoroutine(PyObject *coro);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/openflow/usr/include/python3.5m/weakrefobject.h b/openflow/include/python3.8/weakrefobject.h
similarity index 100%
rename from openflow/usr/include/python3.5m/weakrefobject.h
rename to openflow/include/python3.8/weakrefobject.h
diff --git a/openflow/usr/include/xdl_debug.h b/openflow/include/xdl_debug.h
similarity index 100%
rename from openflow/usr/include/xdl_debug.h
rename to openflow/include/xdl_debug.h
diff --git a/openflow/lib/libams.a b/openflow/lib/libams.a
new file mode 100644
index 0000000..6481338
Binary files /dev/null and b/openflow/lib/libams.a differ
diff --git a/openflow/lib/libclick.a b/openflow/lib/libclick.a
new file mode 100755
index 0000000..fbf144b
Binary files /dev/null and b/openflow/lib/libclick.a differ
diff --git a/openflow/lib/libclicktool.a b/openflow/lib/libclicktool.a
new file mode 100755
index 0000000..c86f171
Binary files /dev/null and b/openflow/lib/libclicktool.a differ
diff --git a/openflow/lib/libnet.a b/openflow/lib/libnet.a
new file mode 100644
index 0000000..fae704f
Binary files /dev/null and b/openflow/lib/libnet.a differ
diff --git a/openflow/lib/libnet.so b/openflow/lib/libnet.so
new file mode 100644
index 0000000..7a7a62c
Binary files /dev/null and b/openflow/lib/libnet.so differ
diff --git a/openflow/lib/libnet.so.1 b/openflow/lib/libnet.so.1
new file mode 100644
index 0000000..7a7a62c
Binary files /dev/null and b/openflow/lib/libnet.so.1 differ
diff --git a/openflow/lib/libnet.so.1.7.0 b/openflow/lib/libnet.so.1.7.0
new file mode 100644
index 0000000..7a7a62c
Binary files /dev/null and b/openflow/lib/libnet.so.1.7.0 differ
diff --git a/openflow/lib/libnetfilter_conntrack.so.3 b/openflow/lib/libnetfilter_conntrack.so.3
new file mode 100644
index 0000000..82950ea
Binary files /dev/null and b/openflow/lib/libnetfilter_conntrack.so.3 differ
diff --git a/openflow/lib/libnetfilter_conntrack.so.3.5.0 b/openflow/lib/libnetfilter_conntrack.so.3.5.0
new file mode 100644
index 0000000..82950ea
Binary files /dev/null and b/openflow/lib/libnetfilter_conntrack.so.3.5.0 differ
diff --git a/openflow/lib/libnettle.so.6 b/openflow/lib/libnettle.so.6
new file mode 100644
index 0000000..bb73cdf
Binary files /dev/null and b/openflow/lib/libnettle.so.6 differ
diff --git a/openflow/lib/libnettle.so.6.2 b/openflow/lib/libnettle.so.6.2
new file mode 100644
index 0000000..bb73cdf
Binary files /dev/null and b/openflow/lib/libnettle.so.6.2 differ
diff --git a/openflow/lib/libofp.a b/openflow/lib/libofp.a
new file mode 100644
index 0000000..c1800e7
Binary files /dev/null and b/openflow/lib/libofp.a differ
diff --git a/openflow/lib/libofproto.a b/openflow/lib/libofproto.a
new file mode 100644
index 0000000..fc6acd2
Binary files /dev/null and b/openflow/lib/libofproto.a differ
diff --git a/openflow/lib/libofproto.la b/openflow/lib/libofproto.la
new file mode 100755
index 0000000..ac43d93
--- /dev/null
+++ b/openflow/lib/libofproto.la
@@ -0,0 +1,41 @@
+# libofproto.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='libofproto.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=' /usr/local/lib/libsflow.la -latomic -lpthread -lrt -lm'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libofproto.
+current=7
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/local/lib'
diff --git a/openflow/lib/libopenvswitch.a b/openflow/lib/libopenvswitch.a
new file mode 100644
index 0000000..de37e01
Binary files /dev/null and b/openflow/lib/libopenvswitch.a differ
diff --git a/openflow/lib/libopenvswitch.la b/openflow/lib/libopenvswitch.la
new file mode 100755
index 0000000..b30f8b2
--- /dev/null
+++ b/openflow/lib/libopenvswitch.la
@@ -0,0 +1,41 @@
+# libopenvswitch.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='libopenvswitch.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -lssl -lcrypto -latomic -lpthread -lrt -lm'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libopenvswitch.
+current=7
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/local/lib'
diff --git a/openflow/lib/libovn.a b/openflow/lib/libovn.a
new file mode 100644
index 0000000..f8f69c0
Binary files /dev/null and b/openflow/lib/libovn.a differ
diff --git a/openflow/lib/libovn.la b/openflow/lib/libovn.la
new file mode 100755
index 0000000..7117e4b
--- /dev/null
+++ b/openflow/lib/libovn.la
@@ -0,0 +1,41 @@
+# libovn.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='libovn.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -latomic -lpthread -lrt -lm'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libovn.
+current=7
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/local/lib'
diff --git a/openflow/lib/libovsdb.a b/openflow/lib/libovsdb.a
new file mode 100644
index 0000000..5a07084
Binary files /dev/null and b/openflow/lib/libovsdb.a differ
diff --git a/openflow/lib/libovsdb.la b/openflow/lib/libovsdb.la
new file mode 100755
index 0000000..bd159cb
--- /dev/null
+++ b/openflow/lib/libovsdb.la
@@ -0,0 +1,41 @@
+# libovsdb.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='libovsdb.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -latomic -lpthread -lrt -lm'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libovsdb.
+current=7
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/local/lib'
diff --git a/openflow/lib/libpcap.a b/openflow/lib/libpcap.a
new file mode 100644
index 0000000..3ab460b
Binary files /dev/null and b/openflow/lib/libpcap.a differ
diff --git a/openflow/lib/libpcap.so b/openflow/lib/libpcap.so
new file mode 100644
index 0000000..d5ddb5b
Binary files /dev/null and b/openflow/lib/libpcap.so differ
diff --git a/openflow/lib/libpcap.so.0.8 b/openflow/lib/libpcap.so.0.8
new file mode 100644
index 0000000..d5ddb5b
Binary files /dev/null and b/openflow/lib/libpcap.so.0.8 differ
diff --git a/openflow/lib/libpcap.so.1.7.4 b/openflow/lib/libpcap.so.1.7.4
new file mode 100644
index 0000000..d5ddb5b
Binary files /dev/null and b/openflow/lib/libpcap.so.1.7.4 differ
diff --git a/openflow/lib/libreg.a b/openflow/lib/libreg.a
new file mode 100644
index 0000000..ea03fab
Binary files /dev/null and b/openflow/lib/libreg.a differ
diff --git a/openflow/lib/librule.a b/openflow/lib/librule.a
new file mode 100644
index 0000000..265ef1a
Binary files /dev/null and b/openflow/lib/librule.a differ
diff --git a/openflow/lib/libsflow.a b/openflow/lib/libsflow.a
new file mode 100644
index 0000000..6220eb5
Binary files /dev/null and b/openflow/lib/libsflow.a differ
diff --git a/openflow/lib/libsflow.la b/openflow/lib/libsflow.la
new file mode 100755
index 0000000..e232910
--- /dev/null
+++ b/openflow/lib/libsflow.la
@@ -0,0 +1,41 @@
+# libsflow.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='libsflow.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -latomic -lpthread -lrt -lm'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libsflow.
+current=7
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/local/lib'
diff --git a/openflow/lib/libua.a b/openflow/lib/libua.a
new file mode 100644
index 0000000..86ac978
Binary files /dev/null and b/openflow/lib/libua.a differ
diff --git a/openflow/lib/libvtep.a b/openflow/lib/libvtep.a
new file mode 100644
index 0000000..3f0ebae
Binary files /dev/null and b/openflow/lib/libvtep.a differ
diff --git a/openflow/lib/libvtep.la b/openflow/lib/libvtep.la
new file mode 100755
index 0000000..b66c880
--- /dev/null
+++ b/openflow/lib/libvtep.la
@@ -0,0 +1,41 @@
+# libvtep.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='libvtep.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -latomic -lpthread -lrt -lm'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libvtep.
+current=7
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/local/lib'
diff --git a/openflow/lib/pkgconfig/libofproto.pc b/openflow/lib/pkgconfig/libofproto.pc
new file mode 100644
index 0000000..5cc86ba
--- /dev/null
+++ b/openflow/lib/pkgconfig/libofproto.pc
@@ -0,0 +1,11 @@
+prefix=/usr/local
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libofproto
+Description: OpenFlow library of Open vSwitch
+Version: 2.7.0
+Libs: -L${libdir} -lofproto
+Libs.private: -latomic -lpthread -lrt -lm 
+Cflags: -I${includedir}/openvswitch
diff --git a/openflow/lib/pkgconfig/libopenvswitch.pc b/openflow/lib/pkgconfig/libopenvswitch.pc
new file mode 100644
index 0000000..cdaa3d1
--- /dev/null
+++ b/openflow/lib/pkgconfig/libopenvswitch.pc
@@ -0,0 +1,11 @@
+prefix=/usr/local
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libopenvswitch
+Description: Open vSwitch library
+Version: 2.7.0
+Libs: -L${libdir} -lopenvswitch
+Libs.private: -latomic -lpthread -lrt -lm 
+Cflags: -I${includedir}/openvswitch
diff --git a/openflow/lib/pkgconfig/libovsdb.pc b/openflow/lib/pkgconfig/libovsdb.pc
new file mode 100644
index 0000000..9939887
--- /dev/null
+++ b/openflow/lib/pkgconfig/libovsdb.pc
@@ -0,0 +1,11 @@
+prefix=/usr/local
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libovsdb
+Description: OVSDB library of Open vSwitch
+Version: 2.7.0
+Libs: -L${libdir} -lovsdb
+Libs.private: -latomic -lpthread -lrt -lm 
+Cflags: -I${includedir}/openvswitch
diff --git a/openflow/lib/pkgconfig/libsflow.pc b/openflow/lib/pkgconfig/libsflow.pc
new file mode 100644
index 0000000..090139a
--- /dev/null
+++ b/openflow/lib/pkgconfig/libsflow.pc
@@ -0,0 +1,11 @@
+prefix=/usr/local
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libofproto
+Description: sFlow library of Open vSwitch
+Version: 2.7.0
+Libs: -L${libdir} -lsflow
+Libs.private: -latomic -lpthread -lrt -lm 
+Cflags: -I${includedir}/openvswitch
diff --git a/openflow/lib/pkgconfig/python-3.8-embed.pc b/openflow/lib/pkgconfig/python-3.8-embed.pc
new file mode 100644
index 0000000..db3039c
--- /dev/null
+++ b/openflow/lib/pkgconfig/python-3.8-embed.pc
@@ -0,0 +1,13 @@
+# See: man pkg-config
+prefix=/usr/local
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Python
+Description: Embed Python into an application
+Requires:
+Version: 3.8
+Libs.private: -lcrypt -lpthread -ldl  -lutil -lm
+Libs: -L${libdir} -lpython3.8
+Cflags: -I${includedir}/python3.8
diff --git a/openflow/lib/pkgconfig/python-3.8.pc b/openflow/lib/pkgconfig/python-3.8.pc
new file mode 100644
index 0000000..cbcf9d4
--- /dev/null
+++ b/openflow/lib/pkgconfig/python-3.8.pc
@@ -0,0 +1,13 @@
+# See: man pkg-config
+prefix=/usr/local
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Python
+Description: Build a C extension for Python
+Requires:
+Version: 3.8
+Libs.private: -lcrypt -lpthread -ldl  -lutil -lm
+Libs:
+Cflags: -I${includedir}/python3.8
diff --git a/openflow/lib/pkgconfig/python3-embed.pc b/openflow/lib/pkgconfig/python3-embed.pc
new file mode 120000
index 0000000..f476584
--- /dev/null
+++ b/openflow/lib/pkgconfig/python3-embed.pc
@@ -0,0 +1 @@
+python-3.8-embed.pc
\ No newline at end of file
diff --git a/openflow/lib/pkgconfig/python3.pc b/openflow/lib/pkgconfig/python3.pc
new file mode 120000
index 0000000..8d20751
--- /dev/null
+++ b/openflow/lib/pkgconfig/python3.pc
@@ -0,0 +1 @@
+python-3.8.pc
\ No newline at end of file
diff --git a/openflow/main_user_openflow.c b/openflow/main_user_openflow.c
index 25654d5..2441613 100644
--- a/openflow/main_user_openflow.c
+++ b/openflow/main_user_openflow.c
@@ -1,518 +1,619 @@
-/***************************************************************************
- *            main_opfmsg.c
- *
- *  2017/02/28 15:52:34 星期二
- *  Copyright  2017  XuDongLai
- *  <XuDongLai0923@163.com>
- ****************************************************************************/
-/*
- * main_opfmsg.c
- *
- * Copyright (C) 2017 - XuDongLai
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "fast.h"
-#include <main_libofp.h>
-#include <ofp_v4.h>
-
-struct eth_header;
-void nms_exec_action(u32 inport,u32 outport,struct eth_header *eth,int len,int hit_idx);
-extern void pkt_print(u8 *pkt, uint16_t len);
-static struct ofp_buffer *build_opfmsg_reply_ofpbuf(uint8_t type,uint32_t xid,uint16_t len);
-
-#ifndef htobe64
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define htobe64(x) __builtin_bswap64((u64)(x))
-#define be64toh(x) __builtin_bswap64((u64)(x))
-#else
-#define htobe64(x) (x)
-#define be64toh(x) (x)
-#endif
-#endif
-
-static inline uint64_t host_to_be64(uint64_t value)
-{
-        return htobe64(value);
-}
-
-static struct ofp_buffer *build_multipart_reply(struct ofp_buffer *request,
-                                                uint16_t mp_type,
-                                                size_t body_len,
-                                                struct ofp_multipart **mp_out)
-{
-        size_t reply_len = sizeof(struct ofp_header) + sizeof(struct ofp_multipart) + body_len;
-        struct ofp_buffer *reply = build_opfmsg_reply_ofpbuf(
-                OFPT_MULTIPART_REPLY, request->header.xid, reply_len);
-        if (!reply) {
-                return NULL;
-        }
-        struct ofp_multipart *mp = (struct ofp_multipart *)reply->data;
-
-        memset(mp, 0, sizeof(*mp));
-        mp->type = htons(mp_type);
-        if (mp_out) {
-                *mp_out = mp;
-        }
-        return reply;
-}
-
-static enum opfmsg_hook_ret handle_opfmsg_get_config_request(struct ofp_buffer *ofpbuf);
-static enum opfmsg_hook_ret handle_opfmsg_multipart_request(struct ofp_buffer *ofpbuf);
-static enum opfmsg_hook_ret handle_opfmsg_packet_out(struct ofp_buffer *ofpbuf);
-static enum opfmsg_hook_ret handle_opfmsg_flow_mod(struct ofp_buffer *ofpbuf);
-static enum opfmsg_hook_ret handle_opfmsg_role_request(struct ofp_buffer *ofpbuf);
-
-
-/**
-* @brief
-*
-* 构建openflow报文头
-*
-*/
-
-void build_opfmsg_header(struct ofp_header *ofpbuf_header,uint16_t len,uint8_t type,uint32_t xid)
-{
-
-        ofpbuf_header->version = OFP13_VERSION;
-        ofpbuf_header->length = htons(len);
-        ofpbuf_header->type = type;
-        ofpbuf_header->xid = xid;
-
-        printf("ofpbuf_header->length=%d\n",ntohs(ofpbuf_header->length));
-}
-
-/**
-* @brief
-*
-*  构建回应报文
-*
-* @return
-*/
-static struct ofp_buffer *build_opfmsg_reply_ofpbuf(uint8_t type,uint32_t xid,uint16_t len)
-{
-
-        struct ofp_buffer *reply = (struct ofp_buffer *)malloc(len);
-        if (!reply) {
-                return NULL;
-        }
-
-        memset(reply,0,len);
-        build_opfmsg_header(&reply->header,len,type,xid);
-
-        printf("ofpbuf_reply,malloc:%p,type:%d,len:%d\n",reply,type,len);
-
-        return reply;
-}
-
-
-static enum opfmsg_hook_ret
-handle_opfmsg_hello(struct ofp_buffer *ofpbuf)
-{
-        
-    	printf("header.version:%d\n",ofpbuf->header.version);
-		if(ofpbuf->header.version == 0x04)
-        {
-            printf("RECV HELLO!\n\n\n");
-        }else //不是openflow1.3协议，则发送error消息
-        {
-            int reply_len = sizeof(struct ofp_header);	
-            //填充openflow协议头，协议类型为OFPT_ERROR
-            struct ofp_buffer *ofpbuf_reply =
-                build_opfmsg_reply_ofpbuf(OFPT_ERROR,ofpbuf->header.xid,reply_len);
-            if (!ofpbuf_reply) {
-                return CONTINUE;
-            }
-            //打印error消息
-            pkt_print((u8 *)ofpbuf,htons(ofpbuf->header.length));
-            //发送error消息
-            send_openflow_message(ofpbuf_reply,reply_len);
-        }  
-    
-         //返回已处理状态码
-        return HANDLE;
-}
-
-
-
-static enum opfmsg_hook_ret
-handle_opfmsg_features_request(struct ofp_buffer *ofpbuf)
-{
-        int feature_reply_len = sizeof(struct ofp_switch_features)+sizeof(struct ofp_header);
-    	//填充openflow协议头，协议类型为 OFPT_FEATURES_REPLY
-        struct ofp_buffer *ofpbuf_reply = build_opfmsg_reply_ofpbuf(OFPT_FEATURES_REPLY,
-                ofpbuf->header.xid,feature_reply_len);
-        if (!ofpbuf_reply) {
-                return CONTINUE;
-        }
-    	//获取交换机的功能信息 指针变量 feature_reply_msg
-        struct ofp_switch_features *feature_reply_msg =(struct ofp_switch_features *)ofpbuf_reply->data;
-
-
-        //TODO
-    	/* 构建feature回应报文，把交换机的功能信息发送给控制器（指针变量feature_reply_msg赋值）  	*/
-        memset(feature_reply_msg,0,sizeof(*feature_reply_msg));
-        feature_reply_msg->datapath_id = host_to_be64(0x0100000000000001ULL);
-        feature_reply_msg->n_buffers = htonl(256);
-        feature_reply_msg->n_tables = 4;
-        feature_reply_msg->capabilities = htonl(0);
-
-        //调用系统发送接口，发送回应报文
-        send_openflow_message(ofpbuf_reply,feature_reply_len);
-
-        //返回已处理状态码
-        return HANDLE;
-}
-
-static enum opfmsg_hook_ret handle_opfmsg_get_config_request(struct ofp_buffer *ofpbuf)
-{
-        size_t reply_len = sizeof(struct ofp_header) + sizeof(struct ofp_switch_config);
-        struct ofp_buffer *reply = build_opfmsg_reply_ofpbuf(
-                OFPT_GET_CONFIG_REPLY, ofpbuf->header.xid, reply_len);
-        if (!reply) {
-                return CONTINUE;
-        }
-        struct ofp_switch_config *cfg = (struct ofp_switch_config *)reply->data;
-
-        memset(cfg, 0, sizeof(*cfg));
-        cfg->flags = htons(0);
-        cfg->miss_send_len = htons(0xffff);
-
-        send_openflow_message(reply, reply_len);
-        return HANDLE;
-}
-
-static void handle_multipart_desc(struct ofp_buffer *ofpbuf)
-{
-        struct ofp_multipart *mp_reply = NULL;
-        struct ofp_buffer *reply = build_multipart_reply(ofpbuf, OFPMP_DESC,
-                                                         sizeof(struct ofp_desc_stats), &mp_reply);
-        if (!reply || !mp_reply) {
-                return;
-        }
-        struct ofp_desc_stats *desc = mp_reply->ofpmp_desc;
-
-        memset(desc, 0, sizeof(*desc));
-        snprintf(desc->mfr_desc, sizeof(desc->mfr_desc), "FAST Reference Switch");
-        snprintf(desc->hw_desc, sizeof(desc->hw_desc), "FAST Virtual datapath");
-        snprintf(desc->sw_desc, sizeof(desc->sw_desc), "OF1.3 Example Stack");
-        snprintf(desc->serial_num, sizeof(desc->serial_num), "FAST-0001");
-        snprintf(desc->dp_desc, sizeof(desc->dp_desc), "FAST educational datapath");
-
-        size_t reply_len = sizeof(struct ofp_header) + sizeof(struct ofp_multipart) + sizeof(struct ofp_desc_stats);
-        send_openflow_message(reply, reply_len);
-}
-
-static void handle_multipart_flow(struct ofp_buffer *ofpbuf)
-{
-        struct ofp_multipart *mp_reply = NULL;
-        struct ofp_buffer *reply = build_multipart_reply(ofpbuf, OFPMP_FLOW, 0, &mp_reply);
-        if (!reply) {
-                return;
-        }
-        size_t reply_len = sizeof(struct ofp_header) + sizeof(struct ofp_multipart);
-        send_openflow_message(reply, reply_len);
-}
-
-static void handle_multipart_aggregate(struct ofp_buffer *ofpbuf)
-{
-        struct ofp_multipart *mp_reply = NULL;
-        struct ofp_buffer *reply = build_multipart_reply(ofpbuf, OFPMP_AGGREGATE,
-                                                         sizeof(struct ofp_aggregate_stats_reply), &mp_reply);
-        if (!reply || !mp_reply) {
-                return;
-        }
-        struct ofp_aggregate_stats_reply *body = mp_reply->ofpmp_aggregate_reply;
-
-        memset(body, 0, sizeof(*body));
-        body->packet_count = host_to_be64(0);
-        body->byte_count = host_to_be64(0);
-        body->flow_count = htonl(0);
-
-        size_t reply_len = sizeof(struct ofp_header) + sizeof(struct ofp_multipart) +
-                           sizeof(struct ofp_aggregate_stats_reply);
-        send_openflow_message(reply, reply_len);
-}
-
-static void handle_multipart_table(struct ofp_buffer *ofpbuf)
-{
-        struct ofp_multipart *mp_reply = NULL;
-        struct ofp_buffer *reply = build_multipart_reply(ofpbuf, OFPMP_TABLE,
-                                                         sizeof(struct ofp_table_stats), &mp_reply);
-        if (!reply || !mp_reply) {
-                return;
-        }
-        struct ofp_table_stats *table = mp_reply->table_stats;
-
-        memset(table, 0, sizeof(*table));
-        table->table_id = 0;
-        table->active_count = htonl(0);
-        table->lookup_count = host_to_be64(0);
-        table->matched_count = host_to_be64(0);
-
-        size_t reply_len = sizeof(struct ofp_header) + sizeof(struct ofp_multipart) + sizeof(struct ofp_table_stats);
-        send_openflow_message(reply, reply_len);
-}
-
-static void handle_multipart_port_stats(struct ofp_buffer *ofpbuf)
-{
-        struct ofp_multipart *mp_reply = NULL;
-        struct ofp_buffer *reply = build_multipart_reply(ofpbuf, OFPMP_PORT_STATS,
-                                                         sizeof(struct ofp_port_stats), &mp_reply);
-        if (!reply || !mp_reply) {
-                return;
-        }
-        struct ofp_port_stats *stats = mp_reply->ofpmp_port_stats;
-
-        memset(stats, 0, sizeof(*stats));
-        stats->port_no = htonl(1);
-        stats->rx_packets = host_to_be64(0);
-        stats->tx_packets = host_to_be64(0);
-        stats->rx_bytes = host_to_be64(0);
-        stats->tx_bytes = host_to_be64(0);
-        stats->rx_dropped = host_to_be64(0);
-        stats->tx_dropped = host_to_be64(0);
-        stats->rx_errors = host_to_be64(0);
-        stats->tx_errors = host_to_be64(0);
-        stats->rx_frame_err = host_to_be64(0);
-        stats->rx_over_err = host_to_be64(0);
-        stats->rx_crc_err = host_to_be64(0);
-        stats->collisions = host_to_be64(0);
-        stats->duration_sec = htonl(0);
-        stats->duration_nsec = htonl(0);
-
-        size_t reply_len = sizeof(struct ofp_header) + sizeof(struct ofp_multipart) + sizeof(struct ofp_port_stats);
-        send_openflow_message(reply, reply_len);
-}
-
-static void handle_multipart_group_features(struct ofp_buffer *ofpbuf)
-{
-        struct ofp_multipart *mp_reply = NULL;
-        struct ofp_buffer *reply = build_multipart_reply(ofpbuf, OFPMP_GROUP_FEATURES,
-                                                         sizeof(struct ofp_group_features), &mp_reply);
-        if (!reply || !mp_reply) {
-                return;
-        }
-        struct ofp_group_features *features = (struct ofp_group_features *)mp_reply->body;
-
-        memset(features, 0, sizeof(*features));
-        features->types = htonl(0);
-        features->capabilities = htonl(0);
-
-        size_t reply_len = sizeof(struct ofp_header) + sizeof(struct ofp_multipart) +
-                           sizeof(struct ofp_group_features);
-        send_openflow_message(reply, reply_len);
-}
-
-static void fill_port(struct ofp_port *port, uint32_t port_no, const char *name)
-{
-        memset(port, 0, sizeof(*port));
-        port->port_no = htonl(port_no);
-        snprintf(port->name, sizeof(port->name), "%s", name);
-        port->curr_speed = htonl(1000000);
-        port->max_speed = htonl(1000000);
-}
-
-static void handle_multipart_port_desc(struct ofp_buffer *ofpbuf)
-{
-        size_t ports_count = 2;
-        size_t body_len = ports_count * sizeof(struct ofp_port);
-        struct ofp_multipart *mp_reply = NULL;
-        struct ofp_buffer *reply = build_multipart_reply(ofpbuf, OFPMP_PORT_DESC, body_len, &mp_reply);
-        if (!reply || !mp_reply) {
-                return;
-        }
-        struct ofp_port *ports = mp_reply->ofpmp_port_desc;
-
-        fill_port(&ports[0], 1, "fast-eth1");
-        fill_port(&ports[1], 2, "fast-eth2");
-
-        size_t reply_len = sizeof(struct ofp_header) + sizeof(struct ofp_multipart) + body_len;
-        send_openflow_message(reply, reply_len);
-}
-
-static enum opfmsg_hook_ret handle_opfmsg_multipart_request(struct ofp_buffer *ofpbuf)
-{
-        if (ntohs(ofpbuf->header.length) < sizeof(struct ofp_header) + sizeof(struct ofp_multipart)) {
-                printf("multipart request too short\n");
-                return HANDLE;
-        }
-
-        struct ofp_multipart *mp = (struct ofp_multipart *)ofpbuf->data;
-        uint16_t type = ntohs(mp->type);
-
-        printf("multipart request type=%u\n", type);
-        switch (type) {
-        case OFPMP_DESC:
-                handle_multipart_desc(ofpbuf);
-                break;
-        case OFPMP_FLOW:
-                handle_multipart_flow(ofpbuf);
-                break;
-        case OFPMP_AGGREGATE:
-                handle_multipart_aggregate(ofpbuf);
-                break;
-        case OFPMP_TABLE:
-                handle_multipart_table(ofpbuf);
-                break;
-        case OFPMP_PORT_STATS:
-                handle_multipart_port_stats(ofpbuf);
-                break;
-        case OFPMP_GROUP_FEATURES:
-                handle_multipart_group_features(ofpbuf);
-                break;
-        case OFPMP_PORT_DESC:
-                handle_multipart_port_desc(ofpbuf);
-                break;
-        default:
-                printf("unsupported multipart type %u\n", type);
-                break;
-        }
-
-        return HANDLE;
-}
-
-static enum opfmsg_hook_ret handle_opfmsg_packet_out(struct ofp_buffer *ofpbuf)
-{
-        struct ofp_packet_out *pkt_out = (struct ofp_packet_out *)&ofpbuf->header;
-        uint16_t actions_len = ntohs(pkt_out->actions_len);
-        uint16_t total_len = ntohs(ofpbuf->header.length);
-
-        if (total_len < sizeof(struct ofp_packet_out)) {
-                printf("packet_out length %u shorter than header\n", total_len);
-                return HANDLE;
-        }
-        if (actions_len > total_len - sizeof(struct ofp_packet_out)) {
-                printf("packet_out invalid actions_len=%u total_len=%u\n", actions_len, total_len);
-                return HANDLE;
-        }
-
-        uint32_t in_port = ntohl(pkt_out->in_port);
-        uint8_t *payload = (uint8_t *)pkt_out->actions + actions_len;
-        int payload_len = total_len - (payload - (uint8_t *)&ofpbuf->header);
-
-        if (payload_len <= 0) {
-                printf("packet_out without payload\n");
-                return HANDLE;
-        }
-
-        uint32_t out_port = 0;
-        if (actions_len >= sizeof(struct ofp_action_output)) {
-                struct ofp_action_output *action = (struct ofp_action_output *)pkt_out->actions;
-                out_port = ntohl(action->port);
-        }
-
-        printf("packet_out in_port=%u out_port=%u len=%d\n", in_port, out_port, payload_len);
-        nms_exec_action(in_port, out_port, (struct eth_header *)payload, payload_len, -1);
-        return HANDLE;
-}
-
-static enum opfmsg_hook_ret handle_opfmsg_flow_mod(struct ofp_buffer *ofpbuf)
-{
-        uint16_t total_len = ntohs(ofpbuf->header.length);
-        if (total_len < sizeof(struct ofp_header) + sizeof(struct fast_rule)) {
-                printf("flow_mod payload too small: %u\n", total_len);
-                return HANDLE;
-        }
-
-        struct fast_rule *rule = (struct fast_rule *)ofpbuf->data;
-        print_user_rule(rule);
-        int idx = fast_add_rule(rule);
-        printf("fast_add_rule result index=%d\n", idx);
-        return HANDLE;
-}
-
-static enum opfmsg_hook_ret handle_opfmsg_role_request(struct ofp_buffer *ofpbuf)
-{
-        size_t reply_len = sizeof(struct ofp_header) + sizeof(struct ofp_role);
-        struct ofp_buffer *reply = build_opfmsg_reply_ofpbuf(
-                OFPT_ROLE_REPLY, ofpbuf->header.xid, reply_len);
-        if (!reply) {
-                return CONTINUE;
-        }
-        struct ofp_role *req = (struct ofp_role *)ofpbuf->data;
-        struct ofp_role *rsp = (struct ofp_role *)reply->data;
-
-        memcpy(rsp, req, sizeof(*rsp));
-        send_openflow_message(reply, reply_len);
-        return HANDLE;
-}
-
-
-/**
-*
-*   callback 的返回值必须有且只能存在两种返回值：
-*
-*		已处理: HANDLE = 0x1,
-*		不处理：CONTINUE = 0x2
-*		
-*/
-
-static int handle_openflow_callback(struct ofp_buffer *ofpbuf,int len)
-{
-	int oftype = ofpbuf->header.type;
-	printf("header.version:%d,type:%d,len:%d\n",ofpbuf->header.version,ofpbuf->header.type,htons(ofpbuf->header.length));
-	
-	switch(oftype)
-	{
-		case OFPT_HELLO:
-			return handle_opfmsg_hello(ofpbuf);
-       
-		case OFPT_FEATURES_REQUEST:
-			return handle_opfmsg_features_request(ofpbuf);
-        case OFPT_GET_CONFIG_REQUEST:
-                return handle_opfmsg_get_config_request(ofpbuf);
-        case OFPT_MULTIPART_REQUEST:
-                return handle_opfmsg_multipart_request(ofpbuf);
-        case OFPT_PACKET_OUT:
-                return handle_opfmsg_packet_out(ofpbuf);
-        case OFPT_FLOW_MOD:
-                return handle_opfmsg_flow_mod(ofpbuf);
-        case OFPT_ROLE_REQUEST:
-                return handle_opfmsg_role_request(ofpbuf);
-
-		default:
-			printf(" --do not handle the message!\n");
-	}
-	//返回不处理状态码
-	return CONTINUE;
-}
-
-/** mask 为获取openflow消息的bimap掩码,openflow消息枚举见 "enum ofp_type"
-*
-*	如：获取 OFPT_HELLO(0) 和 OFPT_FEATURES_REQUEST(5)消息，
-*		mask值设为 mask = 0b'100001 = 0x21
-*
-*/
-int main(int argc,char* argv[])
-{
-	int mask = 0;
-	
-	ofp_init(argc,argv);
-	
-	//获取 OFPT_HELLO(0) 和 OFPT_FEATURES_REQUEST (5)消息
-	mask = (1U << OFPT_HELLO) |
-	       (1U << OFPT_FEATURES_REQUEST) |
-	       (1U << OFPT_GET_CONFIG_REQUEST) |
-	       (1U << OFPT_MULTIPART_REQUEST) |
-	       (1U << OFPT_PACKET_OUT) |
-	       (1U << OFPT_FLOW_MOD) |
-	       (1U << OFPT_ROLE_REQUEST);
-	
-	openflow_hook_init(mask,handle_openflow_callback);
-	
-	pause();
-	
-	return 0;
-}
+/***************************************************************************
+ *            main_opfmsg.c
+ *
+ *  2017/02/28 15:52:34 星期二
+ *  Copyright  2017  XuDongLai
+ *  <XuDongLai0923@163.com>
+ ****************************************************************************/
+/*
+ * main_opfmsg.c
+ *
+ * Copyright (C) 2017 - XuDongLai
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <fast.h>
+#include <main_libofp.h>
+#include <ofp_v4.h>
+
+void nms_exec_action(u32 inport,u32 outport,struct eth_header *eth,int len,int hit_idx);
+void pkt_print(u8 *data, u16 len);
+#include <stdint.h>
+
+
+
+extern uintptr_t *flow_stats_addr;
+extern struct timeval flow_stats_time[];
+extern struct nms_ports_info nmps;
+extern struct timeval start_tv;
+
+/**
+* @brief 
+*
+* @param n
+*
+* @return 
+*/
+/*64位主机序转网络序*/
+static inline uint64_t
+htonll(uint64_t n)
+{
+    return htonl(1) == 1 ? n : (((uint64_t)htonl(n)) << 32) | htonl(n >> 32);
+}
+
+/*64位网络序转主机序*/
+/**
+* @brief 
+*
+* @param n
+*
+* @return 
+*/
+static inline uint64_t
+ntohll(uint64_t n)
+{
+    return htonl(1) == 1 ? n : (((uint64_t)ntohl(n)) << 32) | ntohl(n >> 32);
+}
+
+/**
+* @brief 构建OpenFlow报文头
+*
+* 该函数用于填充OpenFlow报文头，包括版本、长度、类型和事务ID。
+*
+* @param ofpbuf_header OpenFlow报文头结构体指针
+* @param len 报文长度
+* @param type 报文类型
+* @param xid 事务ID
+*/
+void build_opfmsg_header(struct ofp_header *ofpbuf_header,uint16_t len,uint8_t type,uint32_t xid)
+{
+
+		ofpbuf_header->version = OFP13_VERSION;
+		ofpbuf_header->length = htons(len);
+		ofpbuf_header->type = type;
+		ofpbuf_header->xid = xid;
+
+		printf("ofpbuf_header->length=%d\n",ntohs(ofpbuf_header->length));
+}
+
+/**
+* @brief 构建OpenFlow回应报文
+*
+* 该函数用于构建并返回一个OpenFlow回应报文，报文类型和长度由参数指定。
+*
+* @param type 报文类型
+* @param xid 事务ID
+* @param len 报文长度
+*
+* @return 返回构建的报文缓冲区指针
+*/
+u8 *build_opfmsg_reply_ofpbuf(uint8_t type,uint32_t xid,uint16_t len)
+{
+
+		struct ofp_header *reply = (struct ofp_header *)malloc(len);
+
+		memset((u8 *)reply,0,len);
+		build_opfmsg_header(reply,len,type,xid);
+
+		printf("ofpbuf_reply,malloc:%p,type:%d,len:%d\n",reply,type,len);
+
+		return (u8 *)reply;
+}
+
+/**
+* @brief 处理OpenFlow Hello消息
+*
+* 该函数用于处理接收到的OpenFlow Hello消息。如果协议版本不是1.3，则发送错误消息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_opfmsg_hello(struct ofp_buffer *ofpbuf)
+{
+		
+		printf("header.version:%d\n",ofpbuf->header.version);
+		if(ofpbuf->header.version == 0x04)
+		{
+			printf("RECV HELLO!\n\n\n");
+		}else //不是openflow1.3协议，则发送error消息
+		{
+			int reply_len = sizeof(struct ofp_header);	
+			//填充openflow协议头，协议类型为OFPT_ERROR
+			struct ofp_buffer *ofpbuf_reply = 
+				(struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_ERROR,ofpbuf->header.xid,reply_len);
+			//打印error消息
+			pkt_print((u8 *)ofpbuf,htons(ofpbuf->header.length));
+			//发送error消息
+			send_openflow_message(ofpbuf_reply,reply_len);            
+		}  
+	
+		 //返回已处理状态码
+		return HANDLE;
+}
+
+/**
+* @brief 处理OpenFlow Features Request消息
+*
+* 该函数用于处理接收到的OpenFlow Features Request消息，并返回交换机的功能信息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_opfmsg_features_request(struct ofp_buffer *ofpbuf)
+{
+		int feature_reply_len = sizeof(struct ofp_switch_features)+sizeof(struct ofp_header);
+		//填充openflow协议头，协议类型为 OFPT_FEATURES_REPLY
+		struct ofp_buffer *ofpbuf_reply = (struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_FEATURES_REPLY,
+				ofpbuf->header.xid,feature_reply_len);
+		//获取交换机的功能信息 指针变量 feature_reply_msg
+		struct ofp_switch_features *feature_reply_msg =(struct ofp_switch_features *)ofpbuf_reply->data;
+
+
+		//TODO
+		/* 构建feature回应报文，把交换机的功能信息发送给控制器（指针变量feature_reply_msg赋值）  	*/
+		feature_reply_msg->datapath_id = htonll(0x1234ULL << 48);
+		feature_reply_msg->n_buffers = 0x100; // 256
+		feature_reply_msg->n_tables = 1;
+		feature_reply_msg->auxiliary_id = 0;
+		feature_reply_msg->capabilities = htonl(0x0007);
+		feature_reply_msg->reserved = htonl(0x0000);
+		//调用系统发送接口，发送回应报文
+		send_openflow_message(ofpbuf_reply,feature_reply_len);
+
+		//返回已处理状态码
+		return HANDLE;
+}
+
+/**
+* @brief 处理OpenFlow Get Config Request消息
+*
+* 该函数用于处理接收到的OpenFlow Get Config Request消息，并返回交换机的配置信息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_ofpmsg_get_config_request(struct ofp_buffer *ofpbuf)
+{
+	int reply_len = sizeof(struct ofp_switch_config)+sizeof(struct ofp_header);	
+	//填充openflow协议头，协议类型为 OFPT_GET_CONFIG_REPLY
+	struct ofp_buffer *ofpbuf_reply = (struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_GET_CONFIG_REPLY,
+		ofpbuf->header.xid,reply_len);
+	struct ofp_switch_config *switch_config_reply =(struct ofp_switch_config *)ofpbuf_reply->data;
+
+	switch_config_reply->flags = htons(0x0000);
+	switch_config_reply->miss_send_len = htons(0xffe5); //65509,基于协议
+	send_openflow_message(ofpbuf_reply,reply_len);
+
+	return HANDLE;
+}
+
+/**
+* @brief 处理OpenFlow Description Request消息
+*
+* 该函数用于处理接收到的OpenFlow Description Request消息，并返回交换机的描述信息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_ofpmsg_desc(struct ofp_buffer *ofpbuf)
+{	
+	int reply_len = sizeof(struct ofp_header)+sizeof(struct ofp_multipart)+sizeof(struct ofp_desc_stats);
+	struct ofp_buffer *ofpbuf_reply = 
+		(struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_MULTIPART_REPLY,ofpbuf->header.xid,reply_len);
+	struct ofp_multipart *ofpmp_reply = (struct ofp_multipart *)ofpbuf_reply->data;
+
+	static const char *default_mfr_desc = "Wanglixuan";
+	static const char *default_hw_desc = "Lixuan_OpenBox";
+	static const char *default_sw_desc = "Lixuan_Driver";
+	static const char *default_serial_desc = "Lixuan OpenBox Series";
+	static const char *default_dp_desc = "None";
+	
+	ofpmp_reply->type = htons(OFPMP_DESC);
+	ofpmp_reply->flags = htonl(OFPMP_REPLY_MORE_NO);
+    snprintf(ofpmp_reply->ofpmp_desc[0].mfr_desc, sizeof ofpmp_reply->ofpmp_desc[0].mfr_desc, "%s", default_mfr_desc);
+    snprintf(ofpmp_reply->ofpmp_desc[0].hw_desc, sizeof ofpmp_reply->ofpmp_desc[0].hw_desc, "%s", default_hw_desc);
+    snprintf(ofpmp_reply->ofpmp_desc[0].sw_desc, sizeof ofpmp_reply->ofpmp_desc[0].sw_desc, "%s", default_sw_desc);
+    snprintf(ofpmp_reply->ofpmp_desc[0].serial_num, sizeof ofpmp_reply->ofpmp_desc[0].serial_num, "%s", default_serial_desc);
+    snprintf(ofpmp_reply->ofpmp_desc[0].dp_desc, sizeof ofpmp_reply->ofpmp_desc[0].dp_desc, "%s", default_dp_desc);
+	send_openflow_message(ofpbuf_reply,reply_len);
+    
+	return HANDLE;
+}
+
+/**
+* @brief 处理OpenFlow Flow Stats Request消息
+*
+* 该函数用于处理接收到的OpenFlow Flow Stats Request消息，并返回流统计信息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_ofpmsg_flow_stats(struct ofp_buffer *ofpbuf)
+{
+    int i = 0, reply_len = 0, flow_stats_offset;
+    struct ofp_flow_stats *current_flow_stats = NULL;
+    struct ofp_buffer *reply_buffer = NULL;
+    struct ofp_multipart *multipart_reply = NULL;
+
+    // 计算长度
+    for (; i < FAST_RULE_CNT; i++) {
+        if (flow_stats_addr[i] != 0) {
+            reply_len += ntohs(((struct ofp_flow_stats *)flow_stats_addr[i])->length);
+        }
+    }
+    reply_len += sizeof(struct ofp_header) + sizeof(struct ofp_multipart);
+
+    // 构造响应包
+    reply_buffer = (struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_MULTIPART_REPLY, ofpbuf->header.xid, reply_len);
+    multipart_reply = (struct ofp_multipart *)reply_buffer->data;
+    multipart_reply->type = htons(OFPMP_FLOW);	// 标识信息
+    multipart_reply->flags = htonl(OFPMP_REPLY_MORE_NO); //这条不用回
+
+    // 填充包体
+    flow_stats_offset = sizeof(struct ofp_multipart);
+    current_flow_stats = (struct ofp_flow_stats *)&reply_buffer->data[flow_stats_offset];
+
+    for (i = 0; i < FAST_RULE_CNT; i++) {
+        if (flow_stats_addr[i] != 0) {
+            memcpy(current_flow_stats, (void *)(uintptr_t)flow_stats_addr[i], ntohs(((struct ofp_flow_stats *)flow_stats_addr[i])->length));
+            flow_stats_offset += ntohs(current_flow_stats->length);
+            current_flow_stats = (struct ofp_flow_stats *)&reply_buffer->data[flow_stats_offset];
+        }
+    }
+
+    send_openflow_message(reply_buffer, reply_len);
+
+    return HANDLE;
+}
+
+/**
+* @brief 处理OpenFlow Aggregate Stats Request消息
+*
+* 该函数用于处理接收到的OpenFlow Aggregate Stats Request消息，并返回聚合统计信息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_ofpmsg_aggregate(struct ofp_buffer *ofpbuf)
+{	
+	int reply_len = sizeof(struct ofp_header)+ sizeof(struct ofp_multipart)+sizeof(struct ofp_aggregate_stats_reply);
+	struct ofp_buffer *ofpbuf_reply = (struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_MULTIPART_REPLY,
+		ofpbuf->header.xid,reply_len);
+	struct ofp_multipart *ofpmp_reply = (struct ofp_multipart *)ofpbuf_reply->data;
+	int i = 0,flow_count = 0;
+	u64 byte_count = 0,packet_count = 0;
+	struct timeval tv;
+	
+	ofpmp_reply->type = htons(OFPMP_AGGREGATE);
+    ofpmp_reply->flags = htonl(OFPMP_REPLY_MORE_NO);
+    gettimeofday(&tv, NULL);
+
+    for (; i < FAST_RULE_CNT; i++) {
+        if (flow_stats_addr[i] != 0) {
+            ((struct ofp_flow_stats *)flow_stats_addr[i])->duration_sec = htonl(tv.tv_sec - flow_stats_time[i].tv_sec);
+            ((struct ofp_flow_stats *)flow_stats_addr[i])->duration_nsec = htonl(tv.tv_usec - flow_stats_time[i].tv_usec);
+			((struct ofp_flow_stats *)flow_stats_addr[i])->packet_count = ((uint64_t)0x100); // 涉及硬件地址，拼尽全力无法找到，姑且填充256
+			((struct ofp_flow_stats *)flow_stats_addr[i])->byte_count = ((uint64_t)0x40000); // 涉及硬件地址，拼尽全力无法找到，姑且填充262144=256*1024
+			
+			packet_count += ((struct ofp_flow_stats *)flow_stats_addr[i])->packet_count;
+			byte_count += ((struct ofp_flow_stats *)flow_stats_addr[i])->byte_count;
+			flow_count++;			
+		}
+	}	
+	ofpmp_reply->ofpmp_aggregate_reply[0].packet_count = packet_count;
+	ofpmp_reply->ofpmp_aggregate_reply[0].byte_count = byte_count;
+	ofpmp_reply->ofpmp_aggregate_reply[0].flow_count = flow_count;
+
+	send_openflow_message(ofpbuf_reply,reply_len);
+	
+	return HANDLE;
+}
+
+
+/**
+* @brief 处理OpenFlow Table Stats Request消息
+*
+* 该函数用于处理接收到的OpenFlow Table Stats Request消息，并返回表统计信息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_ofpmsg_table(struct ofp_buffer *ofpbuf)
+{
+		int i = 0;
+	    int reply_len = sizeof(struct ofp_header)+sizeof(struct ofp_multipart)+ 
+	        sizeof(struct ofp_table_stats)*1;
+	    struct ofp_buffer *ofpbuf_reply = (struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_MULTIPART_REPLY,
+	        ofpbuf->header.xid,reply_len);	struct ofp_multipart *ofpmp_reply = (struct ofp_multipart *)ofpbuf_reply->data;
+
+	ofpmp_reply->type = htons(OFPMP_TABLE);
+	ofpmp_reply->flags = htonl(OFPMP_REPLY_MORE_NO);	
+	for(i=0;i<1;i++) // 关于为什么写成1，见line 114
+	{
+		ofpmp_reply->table_stats[i].matched_count = htonll(0);
+		ofpmp_reply->table_stats[i].table_id = i;
+		ofpmp_reply->table_stats[i].lookup_count = htonll(0);
+		ofpmp_reply->table_stats[i].active_count = htonl(1);
+	}	
+	send_openflow_message(ofpbuf_reply,reply_len);
+	
+    return HANDLE;
+}
+
+/**
+* @brief 处理OpenFlow Port Stats Request消息
+*
+* 该函数用于处理接收到的OpenFlow Port Stats Request消息，并返回端口统计信息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_ofpmsg_port_stats(struct ofp_buffer *ofpbuf)
+{
+	int i = 0;
+	int reply_len = sizeof(struct ofp_header)+sizeof(struct ofp_multipart)+ 
+		sizeof(struct ofp_port_stats)*nmps.cnt;
+	struct ofp_buffer *ofpbuf_reply = (struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_MULTIPART_REPLY,
+		ofpbuf->header.xid,reply_len);
+	struct ofp_multipart *ofpmp_reply = (struct ofp_multipart *)ofpbuf_reply->data;
+	struct timeval tv;
+	
+	ofpmp_reply->type = htons(OFPMP_PORT_STATS);
+	ofpmp_reply->flags = htonl(OFPMP_REPLY_MORE_NO);
+
+	for(i=0;i<nmps.cnt;i++){
+		gettimeofday(&tv,NULL);		
+		ofpmp_reply->ofpmp_port_stats[i] = nmps.ports[i].stats;
+		ofpmp_reply->ofpmp_port_stats[i].duration_sec = htonl(start_tv.tv_sec - tv.tv_sec);
+		ofpmp_reply->ofpmp_port_stats[i].duration_nsec = htonl(tv.tv_usec);
+	}	
+	send_openflow_message(ofpbuf_reply,reply_len);	
+	
+	return HANDLE;
+}
+
+/**
+* @brief 处理OpenFlow Group Features Request消息
+*
+* 该函数用于处理接收到的OpenFlow Group Features Request消息，并返回组功能信息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_ofpmsg_group_features(struct ofp_buffer *ofpbuf)
+{
+	
+	int i = 0;
+	int reply_len = sizeof(struct ofp_header)+sizeof(struct ofp_group_features)+8;
+	struct ofp_buffer *ofpbuf_reply = (struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_MULTIPART_REPLY,
+		ofpbuf->header.xid,reply_len);
+	struct ofp_group_features *group = (struct ofp_group_features *)ofpbuf_reply->data;
+	
+	group->types = htons(OFPMP_GROUP_FEATURES);
+
+	send_openflow_message(ofpbuf_reply,reply_len);
+	
+    return HANDLE;
+}
+
+
+/**
+* @brief 处理OpenFlow Port Description Request消息
+*
+* 该函数用于处理接收到的OpenFlow Port Description Request消息，并返回端口描述信息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_ofpmsg_port_desc(struct ofp_buffer *ofpbuf)
+{
+	int i = 0;
+	int reply_len = sizeof(struct ofp_header)+sizeof(struct ofp_multipart)+ 
+		sizeof(struct ofp_port)*nmps.cnt;
+	struct ofp_buffer *ofpbuf_reply = (struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_MULTIPART_REPLY,
+		ofpbuf->header.xid,reply_len);
+	struct ofp_multipart *ofpmp_reply = (struct ofp_multipart *)ofpbuf_reply->data;
+
+	ofpmp_reply->type = htons(OFPMP_PORT_DESC);
+	ofpmp_reply->flags = htonl(OFPMP_REPLY_MORE_NO);	
+	for(i=0;i<nmps.cnt;i++)
+	{
+		ofpmp_reply->ofpmp_port_desc[i] = nmps.ports[i].state;
+	}	
+	send_openflow_message(ofpbuf_reply,reply_len);
+	
+    return HANDLE;
+}
+
+/**
+* @brief 处理OpenFlow Packet Out消息
+*
+* 该函数用于处理接收到的OpenFlow Packet Out消息，并根据消息中的动作执行相应的操作。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle_ofpmsg_packet_out(struct ofp_buffer *ofpbuf)
+{
+	struct ofp_packet_out *out = (struct ofp_packet_out *)ofpbuf;
+	struct ofp_action_output *action = (struct ofp_action_output *)&out->actions[0];
+	int action_len = ntohs(out->actions_len);
+	struct eth_header *eth = (struct eth_header *)&ofpbuf->data[sizeof(struct ofp_packet_out) - sizeof(struct ofp_header) + action_len];
+	int i = 0,send_len = ntohs(ofpbuf->header.length) - sizeof(struct ofp_packet_out) - action_len;
+	
+
+	if(action_len == 0)
+	{
+		nms_exec_action(ntohl(out->in_port),OFPP_FLOOD,eth,send_len,-1);
+	}
+	else
+	{
+	
+		while(action_len > 0)
+		{
+			if(action->type == OFPAT_OUTPUT)
+			{				
+				nms_exec_action(ntohl(out->in_port),ntohl(action->port),eth,send_len,-1);
+			}
+			action_len -= sizeof(struct ofp_action_output);
+			action++;
+		}
+	}
+	
+	return HANDLE;
+}
+
+/**
+* @brief 处理OpenFlow Role Request消息
+*
+* 该函数用于处理接收到的OpenFlow Role Request消息，并返回角色信息。
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+*
+* @return 返回处理状态码
+*/
+static enum ofperr
+handle__opfmsg_role_request(struct ofp_buffer *ofpbuf)
+{	
+	int reply_len = sizeof(struct ofp_header)+sizeof(struct ofp_role);	
+	struct ofp_buffer *ofpbuf_reply = 
+		(struct ofp_buffer *)build_opfmsg_reply_ofpbuf(OFPT_ROLE_REPLY,ofpbuf->header.xid,reply_len);
+	
+	SHOW_FUN(0);
+	memcpy(ofpbuf_reply->data,ofpbuf->data,sizeof(struct ofp_role));	
+	ofpbuf_reply->header.type = OFPT_ROLE_REPLY;	
+	send_openflow_message(ofpbuf_reply,reply_len);
+	SHOW_FUN(1);
+	
+	return HANDLE;
+}
+
+/**
+* @brief OpenFlow消息回调处理函数
+*
+* 该函数根据接收到的OpenFlow消息类型调用相应的处理函数。
+* callback 的返回值必须有且只能存在两种返回值：
+* 已处理: HANDLE = 0x1,
+* 不处理：CONTINUE = 0x2
+*
+* @param ofpbuf 接收到的OpenFlow消息缓冲区
+* @param len 消息长度
+*
+* @return 返回处理状态码
+*/
+int handle_openflow_callback(struct ofp_buffer *ofpbuf, int len)
+{
+    int oftype = ofpbuf->header.type;
+    printf("header.version:%d, type:%d, len:%d\n", ofpbuf->header.version, ofpbuf->header.type, htons(ofpbuf->header.length));
+
+    switch (oftype) {
+        case OFPT_HELLO:
+            return handle_opfmsg_hello(ofpbuf);
+        case OFPT_FEATURES_REQUEST:
+            return handle_opfmsg_features_request(ofpbuf);
+        case OFPT_GET_CONFIG_REQUEST:
+            return handle_ofpmsg_get_config_request(ofpbuf);
+        case OFPT_MULTIPART_REQUEST:
+            // 根据 multipart 请求的具体类型进一步处理
+            {
+                struct ofp_multipart *multipart = (struct ofp_multipart *)ofpbuf->data;
+                switch (ntohs(multipart->type)) {
+                    case OFPMP_DESC:
+                        return handle_ofpmsg_desc(ofpbuf);
+                    case OFPMP_FLOW:
+                        return handle_ofpmsg_flow_stats(ofpbuf);
+                    case OFPMP_AGGREGATE:
+                        return handle_ofpmsg_aggregate(ofpbuf);
+                    case OFPMP_TABLE:
+                        return handle_ofpmsg_table(ofpbuf);
+                    case OFPMP_PORT_STATS:
+                        return handle_ofpmsg_port_stats(ofpbuf);
+                    case OFPMP_GROUP_FEATURES:
+                        return handle_ofpmsg_group_features(ofpbuf);
+                    case OFPMP_PORT_DESC:
+                        return handle_ofpmsg_port_desc(ofpbuf);
+                    default:
+                        printf("Unsupported multipart request type: %d\n", ntohs(multipart->type));
+                        break;
+                }
+            }
+            break;
+        case OFPT_PACKET_OUT:
+            return handle_ofpmsg_packet_out(ofpbuf);
+        case OFPT_ROLE_REQUEST:
+            return handle__opfmsg_role_request(ofpbuf);
+        default:
+            printf(" --do not handle the message!\n");
+    }
+
+    // 返回不处理状态码
+    return CONTINUE;
+}
+
+
+#define MASK_HELLO               (1 << OFPT_HELLO)               // 1 << 0
+#define MASK_FEATURES_REQUEST    (1 << OFPT_FEATURES_REQUEST)    // 1 << 5
+#define MASK_GET_CONFIG_REQUEST  (1 << OFPT_GET_CONFIG_REQUEST)  // 1 << 7
+#define MASK_PACKET_OUT          (1 << OFPT_PACKET_OUT)          // 1 << 13
+#define MASK_MULTIPART_REQUEST   (1 << OFPT_MULTIPART_REQUEST)   // 1 << 18
+#define MASK_ROLE_REQUEST        (1 << OFPT_ROLE_REQUEST)        // 1 << 24
+
+
+/** mask 为获取openflow消息的bimap掩码,openflow消息枚举见 "enum ofp_type"
+*
+*	如：获取 OFPT_HELLO(0) 和 OFPT_FEATURES_REQUEST(5)消息，
+*		mask值设为 mask = 0b'100001 = 0x21
+*
+*/
+int main(int argc,char* argv[])
+{
+	int mask = 0;
+	
+	ofp_init(argc,argv);
+	
+	// 使用宏为 mask 赋值，监听以下消息类型：
+    // OFPT_HELLO, OFPT_FEATURES_REQUEST, OFPT_GET_CONFIG_REQUEST,
+    // OFPT_PACKET_OUT, OFPT_MULTIPART_REQUEST, OFPT_ROLE_REQUEST
+    mask = MASK_HELLO | MASK_FEATURES_REQUEST | MASK_GET_CONFIG_REQUEST |
+           MASK_PACKET_OUT | MASK_MULTIPART_REQUEST | MASK_ROLE_REQUEST;
+	
+	openflow_hook_init(mask,handle_openflow_callback);
+	
+	pause();
+	
+	return 0;
+}
+// sudo xofp -4 127.0.0.1 -c eth0 -i obx0,obx1,obx2,obx3
diff --git a/openflow/make.log b/openflow/make.log
deleted file mode 100644
index d47122f..0000000
--- a/openflow/make.log
+++ /dev/null
@@ -1,25 +0,0 @@
-main_user_openflow.c: In function ‘build_multipart_reply’:
-main_user_openflow.c:54:57: warning: implicit declaration of function ‘build_opfmsg_reply_ofpbuf’ [-Wimplicit-function-declaration]
-         struct ofp_buffer *reply = (struct ofp_buffer *)build_opfmsg_reply_ofpbuf(
-                                                         ^
-main_user_openflow.c: At top level:
-main_user_openflow.c:98:5: error: conflicting types for ‘build_opfmsg_reply_ofpbuf’
- u8 *build_opfmsg_reply_ofpbuf(uint8_t type,uint32_t xid,uint16_t len)
-     ^
-main_user_openflow.c:54:57: note: previous implicit declaration of ‘build_opfmsg_reply_ofpbuf’ was here
-         struct ofp_buffer *reply = (struct ofp_buffer *)build_opfmsg_reply_ofpbuf(
-                                                         ^
-main_user_openflow.c: In function ‘handle_opfmsg_hello’:
-main_user_openflow.c:127:13: warning: implicit declaration of function ‘pkt_print’ [-Wimplicit-function-declaration]
-             pkt_print((u8 *)ofpbuf,htons(ofpbuf->header.length));
-             ^
-main_user_openflow.c: In function ‘main’:
-main_user_openflow.c:472:26: warning: passing argument 2 of ‘openflow_hook_init’ from incompatible pointer type [-Wincompatible-pointer-types]
-  openflow_hook_init(mask,handle_openflow_callback);
-                          ^
-In file included from /usr/local/include/fast.h:87:0,
-                 from main_user_openflow.c:26:
-/usr/local/include/fast_sys_dev.h:69:5: note: expected ‘openflow_msg_callback {aka int (*)(struct ofp_buffer *, int)}’ but argument is of type ‘enum ofperr (*)(struct ofp_buffer *, int)’
- int openflow_hook_init(int mask,openflow_msg_callback callback);
-     ^
-
diff --git a/openflow/user_openflow b/openflow/user_openflow
index 4e64137..3207c72 100755
Binary files a/openflow/user_openflow and b/openflow/user_openflow differ
diff --git a/openflow/usr/include/X11/CallbackI.h b/openflow/usr/include/X11/CallbackI.h
deleted file mode 100644
index 5d958f4..0000000
--- a/openflow/usr/include/X11/CallbackI.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/****************************************************************
- *
- * Callbacks
- *
- ****************************************************************/
-
-typedef XrmResource **CallbackTable;
-
-#define _XtCBCalling 1
-#define _XtCBFreeAfterCalling 2
-
-_XFUNCPROTOBEGIN
-
-typedef struct internalCallbackRec {
-    unsigned short count;
-    char	   is_padded;	/* contains NULL padding for external form */
-    char	   call_state;  /* combination of _XtCB{FreeAfter}Calling */
-#ifdef LONG64
-    unsigned int   align_pad;	/* padding to align callback list */
-#endif
-    /* XtCallbackList */
-} InternalCallbackRec, *InternalCallbackList;
-
-typedef Boolean (*_XtConditionProc)(
-    XtPointer	/* data */
-);
-
-extern void _XtAddCallback(
-    InternalCallbackList*	/* callbacks */,
-    XtCallbackProc		/* callback */,
-    XtPointer 			/* closure */
-);
-
-extern void _XtAddCallbackOnce(
-    InternalCallbackList*	/* callbacks */,
-    XtCallbackProc		/* callback */,
-    XtPointer 			/* closure */
-);
-
-extern InternalCallbackList _XtCompileCallbackList(
-    XtCallbackList		/* xtcallbacks */
-);
-
-extern XtCallbackList _XtGetCallbackList(
-    InternalCallbackList*	/* callbacks */
-);
-
-extern void _XtRemoveAllCallbacks(
-    InternalCallbackList*	/* callbacks */
-);
-
-extern void _XtRemoveCallback(
-    InternalCallbackList*	/* callbacks */,
-    XtCallbackProc		/* callback */,
-    XtPointer			/* closure */
-);
-
-extern void _XtPeekCallback(
-    Widget			/* widget */,
-    XtCallbackList		/* callbacks */,
-    XtCallbackProc *		/* callback */,
-    XtPointer *			/* closure */
-);
-
-extern void _XtCallConditionalCallbackList(
-    Widget			/* widget */,
-    XtCallbackList		/* callbacks */,
-    XtPointer			/* call_data */,
-    _XtConditionProc		/* cond_proc */
-);
-
-_XFUNCPROTOEND
diff --git a/openflow/usr/include/X11/Composite.h b/openflow/usr/include/X11/Composite.h
deleted file mode 100644
index d33234f..0000000
--- a/openflow/usr/include/X11/Composite.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtComposite_h
-#define _XtComposite_h
-
-typedef struct _CompositeClassRec *CompositeWidgetClass;
-
-typedef Cardinal (*XtOrderProc)(
-    Widget 	/* child */
-);
-
-_XFUNCPROTOBEGIN
-
-extern void XtManageChildren(
-    WidgetList 		/* children */,
-    Cardinal 		/* num_children */
-);
-
-extern void XtManageChild(
-    Widget 		/* child */
-);
-
-extern void XtUnmanageChildren(
-    WidgetList 		/* children */,
-    Cardinal 		/* num_children */
-);
-
-extern void XtUnmanageChild(
-    Widget 		/* child */
-);
-
-typedef void (*XtDoChangeProc)(
-    Widget		/* composite_parent */,
-    WidgetList		/* unmanage_children */,
-    Cardinal *		/* num_unmanage_children */,
-    WidgetList		/* manage_children */,
-    Cardinal *		/* num_manage_children */,
-    XtPointer		/* client_data */
-);
-
-extern void XtChangeManagedSet(
-    WidgetList		/* unmanage_children */,
-    Cardinal		/* num_unmanage_children */,
-    XtDoChangeProc	/* do_change_proc */,
-    XtPointer		/* client_data */,
-    WidgetList		/* manage_children */,
-    Cardinal		/* num_manage_children */
-);
-
-_XFUNCPROTOEND
-
-#ifndef VMS
-externalref WidgetClass compositeWidgetClass;
-#endif
-
-#endif /* _XtComposite_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/CompositeP.h b/openflow/usr/include/X11/CompositeP.h
deleted file mode 100644
index b1b8559..0000000
--- a/openflow/usr/include/X11/CompositeP.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtCompositeP_h
-#define _XtCompositeP_h
-
-#include <X11/Composite.h>
-
-_XFUNCPROTOBEGIN
-
-/************************************************************************
- *
- * Additional instance fields for widgets of (sub)class 'Composite'
- *
- ************************************************************************/
-
-typedef struct _CompositePart {
-    WidgetList  children;	     /* array of ALL widget children	     */
-    Cardinal    num_children;	     /* total number of widget children	     */
-    Cardinal    num_slots;           /* number of slots in children array    */
-    XtOrderProc insert_position;     /* compute position of new child	     */
-} CompositePart,*CompositePtr;
-
-typedef struct _CompositeRec {
-    CorePart      core;
-    CompositePart composite;
-} CompositeRec;
-
-/*********************************************************************
- *
- *  Additional class fields for widgets of (sub)class 'Composite'
- *
- ********************************************************************/
-
-typedef struct _CompositeClassPart {
-    XtGeometryHandler geometry_manager;	  /* geometry manager for children   */
-    XtWidgetProc      change_managed;	  /* change managed state of child   */
-    XtWidgetProc      insert_child;	  /* physically add child to parent  */
-    XtWidgetProc      delete_child;	  /* physically remove child	     */
-    XtPointer	      extension;	  /* pointer to extension record     */
-} CompositeClassPart,*CompositePartPtr;
-
-typedef struct {
-    XtPointer next_extension;	/* 1st 4 mandated for all extension records */
-    XrmQuark record_type;	/* NULLQUARK; on CompositeClassPart */
-    long version;		/* must be XtCompositeExtensionVersion */
-    Cardinal record_size;	/* sizeof(CompositeClassExtensionRec) */
-    Boolean accepts_objects;
-    Boolean allows_change_managed_set;
-} CompositeClassExtensionRec, *CompositeClassExtension;
-
-
-typedef struct _CompositeClassRec {
-     CoreClassPart      core_class;
-     CompositeClassPart composite_class;
-} CompositeClassRec;
-
-externalref CompositeClassRec compositeClassRec;
-
-_XFUNCPROTOEND
-
-#define XtCompositeExtensionVersion 2L
-#define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)
-#define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)
-#define XtInheritInsertChild ((XtWidgetProc) _XtInherit)
-#define XtInheritDeleteChild ((XtWidgetProc) _XtInherit)
-
-#endif /* _XtCompositeP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/ConstrainP.h b/openflow/usr/include/X11/ConstrainP.h
deleted file mode 100644
index 40ff9b9..0000000
--- a/openflow/usr/include/X11/ConstrainP.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtConstraintP_h
-#define _XtConstraintP_h
-
-#include <X11/Constraint.h>
-
-_XFUNCPROTOBEGIN
-
-typedef struct _ConstraintPart {
-    XtPointer   mumble;		/* No new fields, keep C compiler happy */
-} ConstraintPart;
-
-typedef struct _ConstraintRec {
-    CorePart	    core;
-    CompositePart   composite;
-    ConstraintPart  constraint;
-} ConstraintRec, *ConstraintWidget;
-
-typedef struct _ConstraintClassPart {
-    XtResourceList resources;	      /* constraint resource list	     */
-    Cardinal   num_resources;         /* number of constraints in list       */
-    Cardinal   constraint_size;       /* size of constraint record           */
-    XtInitProc initialize;            /* constraint initialization           */
-    XtWidgetProc destroy;             /* constraint destroy proc             */
-    XtSetValuesFunc set_values;       /* constraint set_values proc          */
-    XtPointer	    extension;		/* pointer to extension record      */
-} ConstraintClassPart;
-
-typedef struct {
-    XtPointer next_extension;	/* 1st 4 mandated for all extension records */
-    XrmQuark record_type;	/* NULLQUARK; on ConstraintClassPart */
-    long version;		/* must be XtConstraintExtensionVersion */
-    Cardinal record_size;	/* sizeof(ConstraintClassExtensionRec) */
-    XtArgsProc get_values_hook;
-} ConstraintClassExtensionRec, *ConstraintClassExtension;
-
-typedef struct _ConstraintClassRec {
-    CoreClassPart       core_class;
-    CompositeClassPart  composite_class;
-    ConstraintClassPart constraint_class;
-} ConstraintClassRec;
-
-externalref ConstraintClassRec constraintClassRec;
-
-_XFUNCPROTOEND
-
-#define XtConstraintExtensionVersion 1L
-
-#endif /* _XtConstraintP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/Constraint.h b/openflow/usr/include/X11/Constraint.h
deleted file mode 100644
index 20abead..0000000
--- a/openflow/usr/include/X11/Constraint.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtConstraint_h
-#define _XtConstraint_h
-
-_XFUNCPROTOBEGIN
-
-typedef struct _ConstraintClassRec *ConstraintWidgetClass;
-
-#ifndef VMS
-externalref WidgetClass constraintWidgetClass;
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XtConstraint_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/ConvertI.h b/openflow/usr/include/X11/ConvertI.h
deleted file mode 100644
index 760d477..0000000
--- a/openflow/usr/include/X11/ConvertI.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-_XFUNCPROTOBEGIN
-
-/* Representation types */
-
-extern	XrmQuark  _XtQString;
-
-/*
- * Resource conversions
- */
-
-typedef struct _ConverterRec **ConverterTable;
-
-extern void _XtAddDefaultConverters(
-    ConverterTable	/* table */
-);
-
-extern void _XtSetDefaultConverterTable(
-    ConverterTable* 		/* table */
-);
-
-extern void _XtFreeConverterTable(
-    ConverterTable 		/* table */
-);
-
-extern void _XtTableAddConverter(
-    ConverterTable		/* table */,
-    XrmRepresentation    	/* from_type */,
-    XrmRepresentation    	/* to_type */,
-    XtTypeConverter      	/* converter */,
-    XtConvertArgList     	/* convert_args */,
-    Cardinal             	/* num_args */,
-    _XtBoolean              	/* new_style */,
-    XtCacheType	    		/* cache_type */,
-    XtDestructor         	/* destructor */,
-    _XtBoolean			/* global */
-);
-
-extern Boolean _XtConvert(
-    Widget			/* widget */,
-    XrmRepresentation    	/* from_type */,
-    XrmValuePtr			/* from */,
-    XrmRepresentation		/* to_type */,
-    XrmValuePtr			/* to */,
-    XtCacheRef*			/* cache_ref_return */
-);
-
-void _XtConvertInitialize(void);
-
-_XFUNCPROTOEND
diff --git a/openflow/usr/include/X11/Core.h b/openflow/usr/include/X11/Core.h
deleted file mode 100644
index 08a86f6..0000000
--- a/openflow/usr/include/X11/Core.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtCore_h
-#define _XtCore_h
-
-_XFUNCPROTOBEGIN
-
-typedef struct _WidgetClassRec *CoreWidgetClass;
-typedef struct _WidgetRec *CoreWidget;
-externalref WidgetClass coreWidgetClass;
-
-#ifndef VMS
-externalref WidgetClass widgetClass;
-
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XtCore_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/CoreP.h b/openflow/usr/include/X11/CoreP.h
deleted file mode 100644
index a4cb16e..0000000
--- a/openflow/usr/include/X11/CoreP.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef XtCoreP_h
-#define XtCoreP_h
-
-#include <X11/Core.h>
-
-_XFUNCPROTOBEGIN
-
-externalref int _XtInheritTranslations;
-
-#define XtInheritTranslations  ((String) &_XtInheritTranslations)
-#define XtInheritRealize ((XtRealizeProc) _XtInherit)
-#define XtInheritResize ((XtWidgetProc) _XtInherit)
-#define XtInheritExpose ((XtExposeProc) _XtInherit)
-#define XtInheritSetValuesAlmost ((XtAlmostProc) _XtInherit)
-#define XtInheritAcceptFocus ((XtAcceptFocusProc) _XtInherit)
-#define XtInheritQueryGeometry ((XtGeometryHandler) _XtInherit)
-#define XtInheritDisplayAccelerator ((XtStringProc) _XtInherit)
-
-/***************************************************************
- * Widget Core Data Structures
- *
- *
- **************************************************************/
-
-typedef struct _CorePart {
-    Widget	    self;		/* pointer to widget itself	     */
-    WidgetClass	    widget_class;	/* pointer to Widget's ClassRec	     */
-    Widget	    parent;		/* parent widget	  	     */
-    XrmName         xrm_name;		/* widget resource name quarkified   */
-    Boolean         being_destroyed;	/* marked for destroy		     */
-    XtCallbackList  destroy_callbacks;	/* who to call when widget destroyed */
-    XtPointer       constraints;        /* constraint record                 */
-    Position        x, y;		/* window position		     */
-    Dimension       width, height;	/* window dimensions		     */
-    Dimension       border_width;	/* window border width		     */
-    Boolean         managed;            /* is widget geometry managed?       */
-    Boolean	    sensitive;		/* is widget sensitive to user events*/
-    Boolean         ancestor_sensitive;	/* are all ancestors sensitive?      */
-    XtEventTable    event_table;	/* private to event dispatcher       */
-    XtTMRec	    tm;                 /* translation management            */
-    XtTranslations  accelerators;       /* accelerator translations          */
-    Pixel	    border_pixel;	/* window border pixel		     */
-    Pixmap          border_pixmap;	/* window border pixmap or NULL      */
-    WidgetList      popup_list;         /* list of popups                    */
-    Cardinal        num_popups;         /* how many popups                   */
-    String          name;		/* widget resource name		     */
-    Screen	    *screen;		/* window's screen		     */
-    Colormap        colormap;           /* colormap                          */
-    Window	    window;		/* window ID			     */
-    Cardinal        depth;		/* number of planes in window        */
-    Pixel	    background_pixel;	/* window background pixel	     */
-    Pixmap          background_pixmap;	/* window background pixmap or NULL  */
-    Boolean         visible;		/* is window mapped and not occluded?*/
-    Boolean	    mapped_when_managed;/* map window if it's managed?       */
-} CorePart;
-
-typedef struct _WidgetRec {
-    CorePart    core;
- } WidgetRec, CoreRec;
-
-
-
-/******************************************************************
- *
- * Core Class Structure. Widgets, regardless of their class, will have
- * these fields.  All widgets of a given class will have the same values
- * for these fields.  Widgets of a given class may also have additional
- * common fields.  These additional fields are included in incremental
- * class structures, such as CommandClass.
- *
- * The fields that are specific to this subclass, as opposed to fields that
- * are part of the superclass, are called "subclass fields" below.  Many
- * procedures are responsible only for the subclass fields, and not for
- * any superclass fields.
- *
- ********************************************************************/
-
-typedef struct _CoreClassPart {
-    WidgetClass     superclass;		/* pointer to superclass ClassRec   */
-    String          class_name;		/* widget resource class name       */
-    Cardinal        widget_size;	/* size in bytes of widget record   */
-    XtProc	    class_initialize;   /* class initialization proc	    */
-    XtWidgetClassProc class_part_initialize; /* dynamic initialization	    */
-    XtEnum          class_inited;       /* has class been initialized?      */
-    XtInitProc      initialize;		/* initialize subclass fields       */
-    XtArgsProc      initialize_hook;    /* notify that initialize called    */
-    XtRealizeProc   realize;		/* XCreateWindow for widget	    */
-    XtActionList    actions;		/* widget semantics name to proc map */
-    Cardinal	    num_actions;	/* number of entries in actions     */
-    XtResourceList  resources;		/* resources for subclass fields    */
-    Cardinal        num_resources;      /* number of entries in resources   */
-    XrmClass        xrm_class;		/* resource class quarkified	    */
-    Boolean         compress_motion;    /* compress MotionNotify for widget */
-    XtEnum          compress_exposure;  /* compress Expose events for widget*/
-    Boolean         compress_enterleave;/* compress enter and leave events  */
-    Boolean         visible_interest;   /* select for VisibilityNotify      */
-    XtWidgetProc    destroy;		/* free data for subclass pointers  */
-    XtWidgetProc    resize;		/* geom manager changed widget size */
-    XtExposeProc    expose;		/* rediplay window		    */
-    XtSetValuesFunc set_values;		/* set subclass resource values     */
-    XtArgsFunc      set_values_hook;    /* notify that set_values called    */
-    XtAlmostProc    set_values_almost;  /* set_values got "Almost" geo reply */
-    XtArgsProc      get_values_hook;    /* notify that get_values called    */
-    XtAcceptFocusProc accept_focus;     /* assign input focus to widget     */
-    XtVersionType   version;	        /* version of intrinsics used	    */
-    XtPointer       callback_private;   /* list of callback offsets       */
-    String          tm_table;           /* state machine                    */
-    XtGeometryHandler query_geometry;	/* return preferred geometry        */
-    XtStringProc    display_accelerator;/* display your accelerator	    */
-    XtPointer	    extension;		/* pointer to extension record      */
- } CoreClassPart;
-
-typedef struct _WidgetClassRec {
-    CoreClassPart core_class;
-} WidgetClassRec, CoreClassRec;
-
-externalref WidgetClassRec widgetClassRec;
-#define coreClassRec widgetClassRec
-
-_XFUNCPROTOEND
-
-#endif /* _XtCoreP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/CreateI.h b/openflow/usr/include/X11/CreateI.h
deleted file mode 100644
index e00ba65..0000000
--- a/openflow/usr/include/X11/CreateI.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _XtcreateI_h
-#define _XtcreateI_h
-
-_XFUNCPROTOBEGIN
-
-extern Widget _XtCreateWidget(String name, WidgetClass widget_class,
-			      Widget parent, ArgList args, Cardinal num_args,
-			      XtTypedArgList typed_args,
-			      Cardinal num_typed_args);
-extern Widget _XtCreatePopupShell(String name, WidgetClass widget_class,
-				  Widget parent, ArgList args,
-				  Cardinal num_args, XtTypedArgList typed_args,
-				  Cardinal num_typed_args);
-extern Widget _XtAppCreateShell(String name, String class,
-				WidgetClass widget_class, Display *display,
-				ArgList args, Cardinal num_args,
-				XtTypedArgList typed_args,
-				Cardinal num_typed_args);
-extern Widget _XtCreateHookObj(Screen *screen);
-
-_XFUNCPROTOEND
-
-#include <stdarg.h>
-
-_XFUNCPROTOBEGIN
-
-/* VarCreate.c */
-extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
-			_Xconst char* application_class,
-			XrmOptionDescList options, Cardinal num_options,
-			int *argc_in_out, String *argv_in_out,
-			String *fallback_resources, WidgetClass widget_class,
-			va_list var_args);
-extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
-			_Xconst char* application_class,
-			XrmOptionDescList options, Cardinal num_options,
-			int *argc_in_out, String *argv_in_out,
-			String *fallback_resources, va_list var_args);
-
-_XFUNCPROTOEND
-
-#endif /* _XtcreateI_h */
diff --git a/openflow/usr/include/X11/DECkeysym.h b/openflow/usr/include/X11/DECkeysym.h
deleted file mode 100644
index 0730716..0000000
--- a/openflow/usr/include/X11/DECkeysym.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/***********************************************************
-
-Copyright 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * DEC private keysyms
- * (29th bit set)
- */
-
-/* two-key compose sequence initiators, chosen to map to Latin1 characters */
-
-#define DXK_ring_accent         0x1000FEB0
-#define DXK_circumflex_accent   0x1000FE5E
-#define DXK_cedilla_accent      0x1000FE2C
-#define DXK_acute_accent        0x1000FE27
-#define DXK_grave_accent        0x1000FE60
-#define DXK_tilde               0x1000FE7E
-#define DXK_diaeresis           0x1000FE22
-
-/* special keysym for LK2** "Remove" key on editing keypad */
-
-#define DXK_Remove	0x1000FF00   /* Remove */
diff --git a/openflow/usr/include/X11/EventI.h b/openflow/usr/include/X11/EventI.h
deleted file mode 100644
index 4aae5af..0000000
--- a/openflow/usr/include/X11/EventI.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * Event.h - exported types and functions for toolkit event handler
- *
- * Author:	Charles Haynes
- * 		Digital Equipment Corporation
- * 		Western Software Laboratory
- * Date:	Sun Dec  6 1987
- */
-
-#ifndef _Event_h_
-#define _Event_h_
-
-typedef struct _XtGrabRec  *XtGrabList;
-
-#include "PassivGraI.h"
-
-_XFUNCPROTOBEGIN
-
-extern void _XtEventInitialize(
-    void
-);
-
-typedef struct _XtEventRec {
-     XtEventTable	next;
-     EventMask		mask;	/*  also select_data count for RecExt */
-     XtEventHandler	proc;
-     XtPointer		closure;
-     unsigned int	select:1;
-     unsigned int	has_type_specifier:1;
-     unsigned int	async:1; /* not used, here for Digital extension? */
-} XtEventRec;
-
-typedef struct _XtGrabRec {
-    XtGrabList next;
-    Widget   widget;
-    unsigned int exclusive:1;
-    unsigned int spring_loaded:1;
-}XtGrabRec;
-
-typedef struct _BlockHookRec {
-    struct _BlockHookRec* next;
-    XtAppContext app;
-    XtBlockHookProc proc;
-    XtPointer closure;
-} BlockHookRec, *BlockHook;
-
-extern void _XtFreeEventTable(
-    XtEventTable*	/* event_table */
-);
-
-extern Boolean _XtOnGrabList(
-    Widget	/* widget */,
-    XtGrabRec*	/* grabList */
-);
-
-extern void _XtRemoveAllInputs(
-    XtAppContext /* app */
-);
-
-extern void _XtRefreshMapping(
-    XEvent*	/* event */,
-    _XtBoolean	/* dispatch */
-);
-
-extern void _XtSendFocusEvent(
-    Widget	/* child */,
-    int		/* type */);
-
-extern EventMask _XtConvertTypeToMask(
-    int		/* eventType */
-);
-
-/* EventUtil.c */
-extern Widget _XtFindRemapWidget(XEvent *event, Widget widget,
-				 EventMask mask, XtPerDisplayInput pdi);
-extern void _XtUngrabBadGrabs(XEvent *event, Widget widget,
-				 EventMask mask, XtPerDisplayInput pdi);
-extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
-				int *numElemsPtr, Widget start,
-				Widget breakWidget);
-
-/* NextEvent.c */
-extern Boolean XtAppPeekEvent_SkipTimer;
-
-_XFUNCPROTOEND
-
-#endif /* _Event_h_ */
diff --git a/openflow/usr/include/X11/HPkeysym.h b/openflow/usr/include/X11/HPkeysym.h
deleted file mode 100644
index 4a0655a..0000000
--- a/openflow/usr/include/X11/HPkeysym.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Hewlett Packard
-or Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  Hewlett-Packard shall not be liable for errors
-contained herein or direct, indirect, special, incidental or
-consequential damages in connection with the furnishing,
-performance, or use of this material.
-
-*/
-
-#ifndef _HPKEYSYM_H
-
-#define _HPKEYSYM_H
-
-#define hpXK_ClearLine		0x1000FF6F
-#define hpXK_InsertLine		0x1000FF70
-#define hpXK_DeleteLine		0x1000FF71
-#define hpXK_InsertChar		0x1000FF72
-#define hpXK_DeleteChar		0x1000FF73
-#define hpXK_BackTab		0x1000FF74
-#define hpXK_KP_BackTab		0x1000FF75
-#define hpXK_Modelock1		0x1000FF48
-#define hpXK_Modelock2		0x1000FF49
-#define hpXK_Reset		0x1000FF6C
-#define hpXK_System		0x1000FF6D
-#define hpXK_User		0x1000FF6E
-#define hpXK_mute_acute		0x100000A8
-#define hpXK_mute_grave		0x100000A9
-#define hpXK_mute_asciicircum	0x100000AA
-#define hpXK_mute_diaeresis	0x100000AB
-#define hpXK_mute_asciitilde	0x100000AC
-#define hpXK_lira		0x100000AF
-#define hpXK_guilder		0x100000BE
-#define hpXK_Ydiaeresis		0x100000EE
-#define hpXK_IO			0x100000EE
-#define hpXK_longminus		0x100000F6
-#define hpXK_block		0x100000FC
-
-
-#ifndef _OSF_Keysyms
-#define _OSF_Keysyms
-
-#define osfXK_Copy		0x1004FF02
-#define osfXK_Cut		0x1004FF03
-#define osfXK_Paste		0x1004FF04
-#define osfXK_BackTab		0x1004FF07
-#define osfXK_BackSpace		0x1004FF08
-#define osfXK_Clear		0x1004FF0B
-#define osfXK_Escape		0x1004FF1B
-#define osfXK_AddMode		0x1004FF31
-#define osfXK_PrimaryPaste	0x1004FF32
-#define osfXK_QuickPaste	0x1004FF33
-#define osfXK_PageLeft		0x1004FF40
-#define osfXK_PageUp		0x1004FF41
-#define osfXK_PageDown		0x1004FF42
-#define osfXK_PageRight		0x1004FF43
-#define osfXK_Activate		0x1004FF44
-#define osfXK_MenuBar		0x1004FF45
-#define osfXK_Left		0x1004FF51
-#define osfXK_Up		0x1004FF52
-#define osfXK_Right		0x1004FF53
-#define osfXK_Down		0x1004FF54
-#define osfXK_EndLine		0x1004FF57
-#define osfXK_BeginLine		0x1004FF58
-#define osfXK_EndData		0x1004FF59
-#define osfXK_BeginData		0x1004FF5A
-#define osfXK_PrevMenu		0x1004FF5B
-#define osfXK_NextMenu		0x1004FF5C
-#define osfXK_PrevField		0x1004FF5D
-#define osfXK_NextField		0x1004FF5E
-#define osfXK_Select		0x1004FF60
-#define osfXK_Insert		0x1004FF63
-#define osfXK_Undo		0x1004FF65
-#define osfXK_Menu		0x1004FF67
-#define osfXK_Cancel		0x1004FF69
-#define osfXK_Help		0x1004FF6A
-#define osfXK_SelectAll		0x1004FF71
-#define osfXK_DeselectAll	0x1004FF72
-#define osfXK_Reselect		0x1004FF73
-#define osfXK_Extend		0x1004FF74
-#define osfXK_Restore		0x1004FF78
-#define osfXK_Delete		0x1004FFFF
-
-#endif /* _OSF_Keysyms */
-
-
-/**************************************************************
- * The use of the following macros is deprecated.
- * They are listed below only for backwards compatibility.
- */
-#define XK_Reset                0x1000FF6C
-#define XK_System               0x1000FF6D
-#define XK_User                 0x1000FF6E
-#define XK_ClearLine            0x1000FF6F
-#define XK_InsertLine           0x1000FF70
-#define XK_DeleteLine           0x1000FF71
-#define XK_InsertChar           0x1000FF72
-#define XK_DeleteChar           0x1000FF73
-#define XK_BackTab              0x1000FF74
-#define XK_KP_BackTab           0x1000FF75
-#define XK_Ext16bit_L           0x1000FF76
-#define XK_Ext16bit_R           0x1000FF77
-#define XK_mute_acute           0x100000a8
-#define XK_mute_grave           0x100000a9
-#define XK_mute_asciicircum     0x100000aa
-#define XK_mute_diaeresis       0x100000ab
-#define XK_mute_asciitilde      0x100000ac
-#define XK_lira                 0x100000af
-#define XK_guilder              0x100000be
-#ifndef XK_Ydiaeresis
-#define XK_Ydiaeresis           0x100000ee
-#endif
-#define XK_IO                   0x100000ee
-#define XK_longminus            0x100000f6
-#define XK_block                0x100000fc
-
-#endif /* _HPKEYSYM_H */
diff --git a/openflow/usr/include/X11/HookObjI.h b/openflow/usr/include/X11/HookObjI.h
deleted file mode 100644
index 94c0cbb..0000000
--- a/openflow/usr/include/X11/HookObjI.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-
-Copyright 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#ifndef _XtHookObjI_h
-#define _XtHookObjI_h
-
-_XFUNCPROTOBEGIN
-
-/* This object is implementation-dependent and private to the library. */
-
-typedef struct _HookObjRec *HookObject;
-typedef struct _HookObjClassRec *HookObjectClass;
-
-externalref WidgetClass hookObjectClass;
-
-typedef struct _HookObjPart {
-    /* resources */
-    XtCallbackList createhook_callbacks;
-    XtCallbackList changehook_callbacks;
-    XtCallbackList confighook_callbacks;
-    XtCallbackList geometryhook_callbacks;
-    XtCallbackList destroyhook_callbacks;
-    WidgetList shells;
-    Cardinal num_shells;
-    /* private data */
-    Cardinal max_shells;
-    Screen* screen;
-}HookObjPart;
-
-typedef struct _HookObjRec {
-    ObjectPart object;
-    HookObjPart hooks;
-} HookObjRec;
-
-typedef struct _HookObjClassPart {
-    int unused;
-} HookObjClassPart;
-
-typedef struct _HookObjClassRec {
-    ObjectClassPart object_class;
-    HookObjClassPart hook_class;
-} HookObjClassRec;
-
-externalref HookObjClassRec hookObjClassRec;
-
-_XFUNCPROTOEND
-
-#endif /* ifndef _Xt_HookObjI_h */
-
-
diff --git a/openflow/usr/include/X11/ICE/ICE.h b/openflow/usr/include/X11/ICE/ICE.h
deleted file mode 100644
index 7560647..0000000
--- a/openflow/usr/include/X11/ICE/ICE.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/******************************************************************************
-
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Author: Ralph Mor, X Consortium
-
-******************************************************************************/
-
-#ifndef _ICE_H_
-#define _ICE_H_
-
-/*
- * Protocol Version
- */
-
-#define IceProtoMajor 1
-#define IceProtoMinor 0
-
-
-/*
- * Byte Order
- */
-
-#define IceLSBfirst		0
-#define IceMSBfirst		1
-
-
-/*
- * ICE minor opcodes
- */
-
-#define ICE_Error 		0
-#define ICE_ByteOrder		1
-#define ICE_ConnectionSetup	2
-#define ICE_AuthRequired	3
-#define ICE_AuthReply 		4
-#define ICE_AuthNextPhase	5
-#define ICE_ConnectionReply	6
-#define ICE_ProtocolSetup	7
-#define ICE_ProtocolReply	8
-#define ICE_Ping		9
-#define ICE_PingReply		10
-#define ICE_WantToClose		11
-#define ICE_NoClose		12
-
-
-/*
- * Error severity
- */
-
-#define IceCanContinue		0
-#define IceFatalToProtocol	1
-#define IceFatalToConnection	2
-
-
-/*
- * ICE error classes that are common to all protocols
- */
-
-#define IceBadMinor	0x8000
-#define IceBadState	0x8001
-#define IceBadLength	0x8002
-#define IceBadValue	0x8003
-
-
-/*
- * ICE error classes that are specific to the ICE protocol
- */
-
-#define IceBadMajor			0
-#define IceNoAuth			1
-#define IceNoVersion			2
-#define IceSetupFailed			3
-#define IceAuthRejected			4
-#define IceAuthFailed			5
-#define IceProtocolDuplicate		6
-#define IceMajorOpcodeDuplicate		7
-#define IceUnknownProtocol		8
-
-#endif /* _ICE_H_ */
diff --git a/openflow/usr/include/X11/ICE/ICEconn.h b/openflow/usr/include/X11/ICE/ICEconn.h
deleted file mode 100644
index e5d493a..0000000
--- a/openflow/usr/include/X11/ICE/ICEconn.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/******************************************************************************
-
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Author: Ralph Mor, X Consortium
-******************************************************************************/
-
-#ifndef _ICECONN_H_
-#define _ICECONN_H_
-
-#include <X11/ICE/ICElib.h>
-
-/*
- * Data structures for ICE connection object
- */
-
-typedef struct _IceSavedReplyWait {
-    IceReplyWaitInfo		*reply_wait;
-    Bool			reply_ready;
-    struct _IceSavedReplyWait	*next;
-} _IceSavedReplyWait;
-
-typedef struct _IcePingWait {
-    IcePingReplyProc		ping_reply_proc;
-    IcePointer			client_data;
-    struct _IcePingWait 	*next;
-} _IcePingWait;
-
-typedef struct {
-    char		*vendor;
-    char		*release;
-    int			version_count;
-    IcePoVersionRec	*version_recs;
-    int			auth_count;
-    char		**auth_names;
-    IcePoAuthProc	*auth_procs;
-    IceIOErrorProc	io_error_proc;
-} _IcePoProtocol;
-
-typedef struct {
-    char			*vendor;
-    char			*release;
-    int				version_count;
-    IcePaVersionRec		*version_recs;
-    IceProtocolSetupProc	protocol_setup_proc;
-    IceProtocolActivateProc	protocol_activate_proc;
-    int				auth_count;
-    char			**auth_names;
-    IcePaAuthProc		*auth_procs;
-    IceHostBasedAuthProc	host_based_auth_proc;
-    IceIOErrorProc		io_error_proc;
-} _IcePaProtocol;
-
-typedef struct {
-    char		*protocol_name;
-    _IcePoProtocol	*orig_client;
-    _IcePaProtocol   	*accept_client;
-} _IceProtocol;
-
-typedef struct {
-    Bool			in_use;
-    int				my_opcode;
-    _IceProtocol		*protocol;
-    IcePointer			client_data;
-    Bool			accept_flag;
-    union {
-	IcePaProcessMsgProc	accept_client;
-	IcePoProcessMsgProc	orig_client;
-    } process_msg_proc;
-} _IceProcessMsgInfo;
-
-typedef struct {
-    int		his_version_index;
-    int		my_version_index;
-    char	*his_vendor;
-    char	*his_release;
-    char	my_auth_index;
-    IcePointer 	my_auth_state;
-    Bool	must_authenticate;
-} _IceConnectToMeInfo;
-
-typedef struct {
-    int		his_opcode;
-    int		my_opcode;
-    int		his_version_index;
-    int		my_version_index;
-    char	*his_vendor;
-    char	*his_release;
-    char	my_auth_index;
-    IcePointer 	my_auth_state;
-    Bool	must_authenticate;
-} _IceProtoSetupToMeInfo;
-
-typedef struct {
-    Bool 	auth_active;
-    char	my_auth_index;
-    IcePointer 	my_auth_state;
-} _IceConnectToYouInfo;
-
-typedef struct {
-    int		my_opcode;
-    int		my_auth_count;
-    int		*my_auth_indices;
-    Bool 	auth_active;
-    char	my_auth_index;
-    IcePointer	my_auth_state;
-} _IceProtoSetupToYouInfo;
-
-
-struct _IceConn {
-
-    unsigned int io_ok : 1;		     /* did an IO error occur? */
-    unsigned int swap : 1;  		     /* do we need to swap on reads? */
-    unsigned int waiting_for_byteorder : 1;  /* waiting for a ByteOrder msg? */
-    unsigned int skip_want_to_close : 1;     /* avoid shutdown negotiation? */
-    unsigned int want_to_close : 1;	     /* did we send a WantToClose? */
-    unsigned int free_asap : 1;		     /* free as soon as possible */
-    unsigned int unused1 : 2;		     /* future use */
-    unsigned int unused2 : 8;		     /* future use */
-
-    IceConnectStatus connection_status; /* pending, accepted, rejected */
-
-    unsigned char my_ice_version_index; /* which version are we using? */
-
-    struct _XtransConnInfo *trans_conn; /* transport connection object */
-    unsigned long send_sequence;     	/* Sequence # of last msg sent */
-    unsigned long receive_sequence;    	/* Sequence # of last msg received */
-
-    char *connection_string;		/* network connection string */
-    char *vendor;			/* other client's vendor */
-    char *release;			/* other client's release */
-
-    char *inbuf;			/* Input buffer starting address */
-    char *inbufptr;			/* Input buffer index pointer */
-    char *inbufmax;			/* Input buffer maximum+1 address */
-
-    char *outbuf;			/* Output buffer starting address */
-    char *outbufptr;			/* Output buffer index pointer */
-    char *outbufmax;			/* Output buffer maximum+1 address */
-
-    char *scratch;			/* scratch buffer */
-    unsigned long scratch_size;		/* scratch size */
-
-    int dispatch_level;			/* IceProcessMessages dispatch level */
-
-    IcePointer context;			/* context associated with caller
-					   of IceOpenConnection */
-
-    /*
-     * Before we read a message, the major opcode of the message must be
-     * mapped to our corresponding major opcode (the two clients can use
-     * different opcodes for the same protocol).  In order to save space,
-     * we keep track of the mininum and maximum major opcodes used by the
-     * other client.  To get the information on how to process this message,
-     * we do the following...
-     *
-     * processMsgInfo = iceConn->process_msg_info[
-     *     message->majorOpcode - iceConn->his_min_opcode]
-     *
-     * Note that the number of elements in the iceConn->process_msg_info
-     * array is always (iceConn->his_max_opcode - iceConn->his_min_opcode + 1).
-     * We check process_msg_info->in_use to see if the opcode is being used.
-     */
-
-    _IceProcessMsgInfo		*process_msg_info;
-    char 			his_min_opcode;   /* [1..255] */
-    char			his_max_opcode;	  /* [1..255] */
-
-
-    /*
-     * Number of times this iceConn was returned in IceOpenConnection
-     * or IceAcceptConnection.
-     */
-
-    unsigned char		open_ref_count;
-
-
-    /*
-     * Number of active protocols.
-     */
-
-    unsigned char		proto_ref_count;
-
-
-    /*
-     * If this ICE connection was created with IceAcceptConnection,
-     * the listen_obj field is set to the listen object.  Otherwise,
-     * the listen_obj field is NULL.
-     */
-
-    IceListenObj		listen_obj;
-
-
-
-
-    /*
-     * We need to keep track of all the replies we're waiting for.
-     * Check the comments in process.c for how this works.
-     */
-
-    _IceSavedReplyWait		*saved_reply_waits;
-
-
-    /*
-     * We keep track of all Pings sent from the client.  When the Ping reply
-     * arrives, we remove it from the list.
-     */
-
-    _IcePingWait		*ping_waits;
-
-
-    /*
-     * Some state for a client doing a Connection/Protocol Setup
-     */
-
-    _IceConnectToYouInfo	*connect_to_you;
-    _IceProtoSetupToYouInfo	*protosetup_to_you;
-
-
-    /*
-     * Some state for a client receiving a Connection/Protocol Setup
-     */
-
-    _IceConnectToMeInfo		*connect_to_me;
-    _IceProtoSetupToMeInfo	*protosetup_to_me;
-
-};
-
-#endif /* _ICECONN_H_ */
diff --git a/openflow/usr/include/X11/ICE/ICElib.h b/openflow/usr/include/X11/ICE/ICElib.h
deleted file mode 100644
index 402cbc8..0000000
--- a/openflow/usr/include/X11/ICE/ICElib.h
+++ /dev/null
@@ -1,431 +0,0 @@
-/******************************************************************************
-
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Author: Ralph Mor, X Consortium
-******************************************************************************/
-
-#ifndef _ICELIB_H_
-#define _ICELIB_H_
-
-#include <X11/ICE/ICE.h>
-#include <X11/Xfuncproto.h>
-
-#define Bool int
-#define Status int
-#define True 1
-#define False 0
-
-typedef void *IcePointer;
-
-typedef enum {
-    IcePoAuthHaveReply,
-    IcePoAuthRejected,
-    IcePoAuthFailed,
-    IcePoAuthDoneCleanup
-} IcePoAuthStatus;
-
-typedef enum {
-    IcePaAuthContinue,
-    IcePaAuthAccepted,
-    IcePaAuthRejected,
-    IcePaAuthFailed
-} IcePaAuthStatus;
-
-typedef enum {
-    IceConnectPending,
-    IceConnectAccepted,
-    IceConnectRejected,
-    IceConnectIOError
-} IceConnectStatus;
-
-typedef enum {
-    IceProtocolSetupSuccess,
-    IceProtocolSetupFailure,
-    IceProtocolSetupIOError,
-    IceProtocolAlreadyActive
-} IceProtocolSetupStatus;
-
-typedef enum {
-    IceAcceptSuccess,
-    IceAcceptFailure,
-    IceAcceptBadMalloc
-} IceAcceptStatus;
-
-typedef enum {
-    IceClosedNow,
-    IceClosedASAP,
-    IceConnectionInUse,
-    IceStartedShutdownNegotiation
-} IceCloseStatus;
-
-typedef enum {
-    IceProcessMessagesSuccess,
-    IceProcessMessagesIOError,
-    IceProcessMessagesConnectionClosed
-} IceProcessMessagesStatus;
-
-typedef struct {
-    unsigned long	sequence_of_request;
-    int			major_opcode_of_request;
-    int			minor_opcode_of_request;
-    IcePointer		reply;
-} IceReplyWaitInfo;
-
-typedef struct _IceConn *IceConn;
-typedef struct _IceListenObj *IceListenObj;
-
-typedef void (*IceWatchProc) (
-    IceConn		/* iceConn */,
-    IcePointer		/* clientData */,
-    Bool		/* opening */,
-    IcePointer *	/* watchData */
-);
-
-typedef void (*IcePoProcessMsgProc) (
-    IceConn 		/* iceConn */,
-    IcePointer		/* clientData */,
-    int			/* opcode */,
-    unsigned long	/* length */,
-    Bool		/* swap */,
-    IceReplyWaitInfo *  /* replyWait */,
-    Bool *		/* replyReadyRet */
-);
-
-typedef void (*IcePaProcessMsgProc) (
-    IceConn 		/* iceConn */,
-    IcePointer		/* clientData */,
-    int			/* opcode */,
-    unsigned long	/* length */,
-    Bool		/* swap */
-);
-
-typedef struct {
-    int			 major_version;
-    int			 minor_version;
-    IcePoProcessMsgProc  process_msg_proc;
-} IcePoVersionRec;
-
-typedef struct {
-    int			 major_version;
-    int			 minor_version;
-    IcePaProcessMsgProc  process_msg_proc;
-} IcePaVersionRec;
-
-typedef IcePoAuthStatus (*IcePoAuthProc) (
-    IceConn		/* iceConn */,
-    IcePointer *	/* authStatePtr */,
-    Bool		/* cleanUp */,
-    Bool		/* swap */,
-    int			/* authDataLen */,
-    IcePointer		/* authData */,
-    int *		/* replyDataLenRet */,
-    IcePointer *	/* replyDataRet */,
-    char **		/* errorStringRet */
-);
-
-typedef IcePaAuthStatus (*IcePaAuthProc) (
-    IceConn		/* iceConn */,
-    IcePointer *	/* authStatePtr */,
-    Bool		/* swap */,
-    int			/* authDataLen */,
-    IcePointer		/* authData */,
-    int *		/* replyDataLenRet */,
-    IcePointer *	/* replyDataRet */,
-    char **		/* errorStringRet */
-);
-
-typedef Bool (*IceHostBasedAuthProc) (
-    char *		/* hostName */
-);
-
-typedef Status (*IceProtocolSetupProc) (
-    IceConn 		/* iceConn */,
-    int			/* majorVersion */,
-    int			/* minorVersion */,
-    char *		/* vendor */,
-    char *		/* release */,
-    IcePointer *	/* clientDataRet */,
-    char **		/* failureReasonRet */
-);
-
-typedef void (*IceProtocolActivateProc) (
-    IceConn 		/* iceConn */,
-    IcePointer		/* clientData */
-);
-
-typedef void (*IceIOErrorProc) (
-    IceConn 		/* iceConn */
-);
-
-typedef void (*IcePingReplyProc) (
-    IceConn 		/* iceConn */,
-    IcePointer		/* clientData */
-);
-
-typedef void (*IceErrorHandler) (
-    IceConn 		/* iceConn */,
-    Bool		/* swap */,
-    int			/* offendingMinorOpcode */,
-    unsigned long 	/* offendingSequence */,
-    int 		/* errorClass */,
-    int			/* severity */,
-    IcePointer		/* values */
-);
-
-typedef void (*IceIOErrorHandler) (
-    IceConn 		/* iceConn */
-);
-
-
-/*
- * Function prototypes
- */
-
-_XFUNCPROTOBEGIN
-
-extern int IceRegisterForProtocolSetup (
-    const char *		/* protocolName */,
-    const char *		/* vendor */,
-    const char *		/* release */,
-    int				/* versionCount */,
-    IcePoVersionRec *		/* versionRecs */,
-    int				/* authCount */,
-    const char **		/* authNames */,
-    IcePoAuthProc *		/* authProcs */,
-    IceIOErrorProc		/* IOErrorProc */
-);
-
-extern int IceRegisterForProtocolReply (
-    const char *		/* protocolName */,
-    const char *		/* vendor */,
-    const char *		/* release */,
-    int				/* versionCount */,
-    IcePaVersionRec *		/* versionRecs */,
-    int				/* authCount */,
-    const char **		/* authNames */,
-    IcePaAuthProc *		/* authProcs */,
-    IceHostBasedAuthProc	/* hostBasedAuthProc */,
-    IceProtocolSetupProc	/* protocolSetupProc */,
-    IceProtocolActivateProc	/* protocolActivateProc */,
-    IceIOErrorProc		/* IOErrorProc */
-);
-
-extern IceConn IceOpenConnection (
-    char *		/* networkIdsList */,
-    IcePointer		/* context */,
-    Bool		/* mustAuthenticate */,
-    int			/* majorOpcodeCheck */,
-    int			/* errorLength */,
-    char *		/* errorStringRet */
-);
-
-extern IcePointer IceGetConnectionContext (
-    IceConn		/* iceConn */
-);
-
-extern Status IceListenForConnections (
-    int *		/* countRet */,
-    IceListenObj **	/* listenObjsRet */,
-    int			/* errorLength */,
-    char *		/* errorStringRet */
-);
-
-extern Status IceListenForWellKnownConnections (
-    char *		/* port */,
-    int *		/* countRet */,
-    IceListenObj **	/* listenObjsRet */,
-    int			/* errorLength */,
-    char *		/* errorStringRet */
-);
-
-extern int IceGetListenConnectionNumber (
-    IceListenObj	/* listenObj */
-);
-
-extern char *IceGetListenConnectionString (
-    IceListenObj	/* listenObj */
-);
-
-extern char *IceComposeNetworkIdList (
-    int			/* count */,
-    IceListenObj *	/* listenObjs */
-);
-
-extern void IceFreeListenObjs (
-    int			/* count */,
-    IceListenObj *	/* listenObjs */
-);
-
-extern void IceSetHostBasedAuthProc (
-    IceListenObj		/* listenObj */,
-    IceHostBasedAuthProc   	/* hostBasedAuthProc */
-);
-
-extern IceConn IceAcceptConnection (
-    IceListenObj	/* listenObj */,
-    IceAcceptStatus *	/* statusRet */
-);
-
-extern void IceSetShutdownNegotiation (
-    IceConn		/* iceConn */,
-    Bool		/* negotiate */
-);
-
-extern Bool IceCheckShutdownNegotiation (
-    IceConn		/* iceConn */
-);
-
-extern IceCloseStatus IceCloseConnection (
-    IceConn		/* iceConn */
-);
-
-extern Status IceAddConnectionWatch (
-    IceWatchProc		/* watchProc */,
-    IcePointer			/* clientData */
-);
-
-extern void IceRemoveConnectionWatch (
-    IceWatchProc		/* watchProc */,
-    IcePointer			/* clientData */
-);
-
-extern IceProtocolSetupStatus IceProtocolSetup (
-    IceConn		/* iceConn */,
-    int 		/* myOpcode */,
-    IcePointer		/* clientData */,
-    Bool		/* mustAuthenticate */,
-    int	*		/* majorVersionRet */,
-    int	*		/* minorVersionRet */,
-    char **		/* vendorRet */,
-    char **		/* releaseRet */,
-    int			/* errorLength */,
-    char *		/* errorStringRet */
-);
-
-extern Status IceProtocolShutdown (
-    IceConn		/* iceConn */,
-    int			/* majorOpcode */
-);
-
-extern IceProcessMessagesStatus IceProcessMessages (
-    IceConn		/* iceConn */,
-    IceReplyWaitInfo *	/* replyWait */,
-    Bool *		/* replyReadyRet */
-);
-
-extern Status IcePing (
-   IceConn		/* iceConn */,
-   IcePingReplyProc	/* pingReplyProc */,
-   IcePointer		/* clientData */
-);
-
-extern char *IceAllocScratch (
-   IceConn		/* iceConn */,
-   unsigned long	/* size */
-);
-
-extern int IceFlush (
-   IceConn		/* iceConn */
-);
-
-extern int IceGetOutBufSize (
-   IceConn		/* iceConn */
-);
-
-extern int IceGetInBufSize (
-   IceConn		/* iceConn */
-);
-
-extern IceConnectStatus IceConnectionStatus (
-    IceConn		/* iceConn */
-);
-
-extern char *IceVendor (
-    IceConn		/* iceConn */
-);
-
-extern char *IceRelease (
-    IceConn		/* iceConn */
-);
-
-extern int IceProtocolVersion (
-    IceConn		/* iceConn */
-);
-
-extern int IceProtocolRevision (
-    IceConn		/* iceConn */
-);
-
-extern int IceConnectionNumber (
-    IceConn		/* iceConn */
-);
-
-extern char *IceConnectionString (
-    IceConn		/* iceConn */
-);
-
-extern unsigned long IceLastSentSequenceNumber (
-    IceConn		/* iceConn */
-);
-
-extern unsigned long IceLastReceivedSequenceNumber (
-    IceConn		/* iceConn */
-);
-
-extern Bool IceSwapping (
-    IceConn		/* iceConn */
-);
-
-extern IceErrorHandler IceSetErrorHandler (
-    IceErrorHandler 	/* handler */
-);
-
-extern IceIOErrorHandler IceSetIOErrorHandler (
-    IceIOErrorHandler 	/* handler */
-);
-
-extern char *IceGetPeerName (
-    IceConn		/* iceConn */
-);
-
-/*
- * Multithread Routines
- */
-
-extern Status IceInitThreads (
-    void
-);
-
-extern void IceAppLockConn (
-    IceConn		/* iceConn */
-);
-
-extern void IceAppUnlockConn (
-    IceConn		/* iceConn */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _ICELIB_H_ */
diff --git a/openflow/usr/include/X11/ICE/ICEmsg.h b/openflow/usr/include/X11/ICE/ICEmsg.h
deleted file mode 100644
index f6e7121..0000000
--- a/openflow/usr/include/X11/ICE/ICEmsg.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/******************************************************************************
-
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Author: Ralph Mor, X Consortium
-******************************************************************************/
-
-#ifndef _ICEMSG_H_
-#define _ICEMSG_H_
-
-#include <X11/Xfuncproto.h>
-
-#include <X11/ICE/ICEconn.h>
-
-_XFUNCPROTOBEGIN
-
-/*
- * Function prototypes for internal ICElib functions
- */
-
-extern Status _IceRead (
-    IceConn		/* iceConn */,
-    unsigned long	/* nbytes */,
-    char *		/* ptr */
-);
-
-extern void _IceReadSkip (
-    IceConn		/* iceConn */,
-    unsigned long	/* nbytes */
-);
-
-extern void _IceWrite (
-    IceConn		/* iceConn */,
-    unsigned long	/* nbytes */,
-    char *		/* ptr */
-);
-
-
-extern void _IceErrorBadMinor (
-    IceConn		/* iceConn */,
-    int			/* majorOpcode */,
-    int			/* offendingMinor */,
-    int			/* severity */
-);
-
-extern void _IceErrorBadState (
-    IceConn		/* iceConn */,
-    int			/* majorOpcode */,
-    int			/* offendingMinor */,
-    int			/* severity */
-);
-
-extern void _IceErrorBadLength (
-    IceConn		/* iceConn */,
-    int			/* majorOpcode */,
-    int			/* offendingMinor */,
-    int			/* severity */
-);
-
-extern void _IceErrorBadValue (
-    IceConn		/* iceConn */,
-    int			/* majorOpcode */,
-    int			/* offendingMinor */,
-    int			/* offset */,
-    int			/* length */,
-    IcePointer		/* value */
-);
-
-extern IcePoAuthStatus _IcePoMagicCookie1Proc (
-    IceConn		/* iceConn */,
-    IcePointer *	/* authStatePtr */,
-    Bool 		/* cleanUp */,
-    Bool		/* swap */,
-    int     		/* authDataLen */,
-    IcePointer		/* authData */,
-    int *		/* replyDataLenRet */,
-    IcePointer *	/* replyDataRet */,
-    char **		/* errorStringRet */
-);
-
-extern IcePaAuthStatus _IcePaMagicCookie1Proc (
-    IceConn		/* iceConn */,
-    IcePointer *	/* authStatePtr */,
-    Bool		/* swap */,
-    int     		/* authDataLen */,
-    IcePointer		/* authData */,
-    int *		/* replyDataLenRet */,
-    IcePointer *	/* replyDataRet */,
-    char **		/* errorStringRet */
-);
-
-
-/*
- * Macro to check if IO operations are valid on an ICE connection.
- */
-
-#define IceValidIO(_iceConn) _iceConn->io_ok
-
-
-/*
- * Macros for writing messages.
- */
-
-#define IceGetHeader(_iceConn, _major, _minor, _headerSize, _msgType, _pMsg) \
-    if ((_iceConn->outbufptr + _headerSize) > _iceConn->outbufmax) \
-        IceFlush (_iceConn); \
-    _pMsg = (_msgType *) _iceConn->outbufptr; \
-    _pMsg->majorOpcode = _major; \
-    _pMsg->minorOpcode = _minor; \
-    _pMsg->length = (_headerSize - SIZEOF (iceMsg)) >> 3; \
-    _iceConn->outbufptr += _headerSize; \
-    _iceConn->send_sequence++
-
-#define IceGetHeaderExtra(_iceConn, _major, _minor, _headerSize, _extra, _msgType, _pMsg, _pData) \
-    if ((_iceConn->outbufptr + \
-	_headerSize + ((_extra) << 3)) > _iceConn->outbufmax) \
-        IceFlush (_iceConn); \
-    _pMsg = (_msgType *) _iceConn->outbufptr; \
-    if ((_iceConn->outbufptr + \
-	_headerSize + ((_extra) << 3)) <= _iceConn->outbufmax) \
-        _pData = (char *) _pMsg + _headerSize; \
-    else \
-        _pData = NULL; \
-    _pMsg->majorOpcode = _major; \
-    _pMsg->minorOpcode = _minor; \
-    _pMsg->length = ((_headerSize - SIZEOF (iceMsg)) >> 3) + (_extra); \
-    _iceConn->outbufptr += (_headerSize + ((_extra) << 3)); \
-    _iceConn->send_sequence++
-
-#define IceSimpleMessage(_iceConn, _major, _minor) \
-{ \
-    iceMsg *_pMsg; \
-    IceGetHeader (_iceConn, _major, _minor, SIZEOF (iceMsg), iceMsg, _pMsg); \
-}
-
-#define IceErrorHeader(_iceConn, _offendingMajorOpcode, _offendingMinorOpcode, _offendingSequenceNum, _severity, _errorClass, _dataLength) \
-{ \
-    iceErrorMsg	*_pMsg; \
-\
-    IceGetHeader (_iceConn, _offendingMajorOpcode, ICE_Error, \
-	SIZEOF (iceErrorMsg), iceErrorMsg, _pMsg); \
-    _pMsg->length += (_dataLength); \
-    _pMsg->offendingMinorOpcode = (CARD8) _offendingMinorOpcode; \
-    _pMsg->severity = (CARD8) _severity; \
-    _pMsg->offendingSequenceNum = (CARD32) _offendingSequenceNum; \
-    _pMsg->errorClass = (CARD16) _errorClass; \
-}
-
-
-/*
- * Write data into the ICE output buffer.
- */
-
-#define IceWriteData(_iceConn, _bytes, _data) \
-{ \
-    if ((_iceConn->outbufptr + (_bytes)) > _iceConn->outbufmax) \
-    { \
-	IceFlush (_iceConn); \
-        _IceWrite (_iceConn, (unsigned long) (_bytes), _data); \
-    } \
-    else \
-    { \
-        memcpy (_iceConn->outbufptr, _data, _bytes); \
-        _iceConn->outbufptr += (_bytes); \
-    } \
-}
-
-#define IceWriteData16(_iceConn, _bytes, _data) \
-    IceWriteData (_iceConn, _bytes, (char *) _data)
-
-#define IceWriteData32(_iceConn, _bytes, _data) \
-    IceWriteData (_iceConn, _bytes, (char *) _data)
-
-
-/*
- * The IceSendData macro bypasses copying the data to the
- * ICE connection buffer and sends the data directly.  If necessary,
- * the ICE connection buffer is first flushed.
- */
-
-#define IceSendData(_iceConn, _bytes, _data) \
-{ \
-    if (_iceConn->outbufptr > _iceConn->outbuf) \
-	IceFlush (_iceConn); \
-    _IceWrite (_iceConn, (unsigned long) (_bytes), _data); \
-}
-
-
-/*
- * Write pad bytes.  Used to force 32 or 64 bit alignment.
- * A maximum of 7 pad bytes can be specified.
- */
-
-#define IceWritePad(_iceConn, _bytes) \
-{ \
-    if ((_iceConn->outbufptr + (_bytes)) > _iceConn->outbufmax) \
-    { \
-        char _dummy[7] = { 0 }; \
-        IceFlush (_iceConn); \
-        _IceWrite (_iceConn, (unsigned long) (_bytes), _dummy); \
-    } \
-    else \
-    { \
-        _iceConn->outbufptr += (_bytes); \
-    } \
-}
-
-
-/*
- * Macros for reading messages.
- */
-
-#define IceReadCompleteMessage(_iceConn, _headerSize, _msgType, _pMsg, _pData)\
-{ \
-    unsigned long _bytes; \
-    IceReadMessageHeader (_iceConn, _headerSize, _msgType, _pMsg); \
-    _bytes = (_pMsg->length << 3) - (_headerSize - SIZEOF (iceMsg)); \
-    if ((_iceConn->inbufmax - _iceConn->inbufptr) >= _bytes) \
-    { \
-	_IceRead (_iceConn, _bytes, _iceConn->inbufptr); \
-	_pData = _iceConn->inbufptr; \
-	_iceConn->inbufptr += _bytes; \
-    } \
-    else \
-    { \
-	_pData = malloc (_bytes); \
-        if (_pData) \
-	    _IceRead (_iceConn, _bytes, _pData); \
-        else \
-	    _IceReadSkip (_iceConn, _bytes); \
-    } \
-}
-
-#define IceDisposeCompleteMessage(_iceConn, _pData) \
-    if ((char *) _pData < _iceConn->inbuf || \
-	(char *) _pData >= _iceConn->inbufmax) \
-        free (_pData);
-
-
-#define IceReadSimpleMessage(_iceConn, _msgType, _pMsg) \
-    _pMsg = (_msgType *) (_iceConn->inbuf);
-
-#define IceReadMessageHeader(_iceConn, _headerSize, _msgType, _pMsg) \
-{ \
-    _IceRead (_iceConn, \
-	(unsigned long) (_headerSize - SIZEOF (iceMsg)), \
-	_iceConn->inbufptr); \
-    _pMsg = (_msgType *) (_iceConn->inbuf); \
-    _iceConn->inbufptr += (_headerSize - SIZEOF (iceMsg)); \
-}
-
-#define IceReadData(_iceConn, _bytes, _pData) \
-    _IceRead (_iceConn, (unsigned long) (_bytes), (char *) _pData); \
-
-#define IceReadData16(_iceConn, _swap, _bytes, _pData) \
-{ \
-    _IceRead (_iceConn, (unsigned long) (_bytes), (char *) _pData); \
-}
-
-#define IceReadData32(_iceConn, _swap, _bytes, _pData) \
-{ \
-    _IceRead (_iceConn, (unsigned long) (_bytes), (char *) _pData); \
-}
-
-
-/*
- * Read pad bytes (for 32 or 64 bit alignment).
- * A maxium of 7 pad bytes can be specified.
- */
-
-#define IceReadPad(_iceConn, _bytes) \
-{ \
-    char _dummy[7]; \
-    _IceRead (_iceConn, (unsigned long) (_bytes), _dummy); \
-}
-
-_XFUNCPROTOEND
-
-#endif /* _ICEMSG_H_ */
diff --git a/openflow/usr/include/X11/ICE/ICEproto.h b/openflow/usr/include/X11/ICE/ICEproto.h
deleted file mode 100644
index 1fcbe6b..0000000
--- a/openflow/usr/include/X11/ICE/ICEproto.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/******************************************************************************
-
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Author: Ralph Mor, X Consortium
-******************************************************************************/
-
-#ifndef _ICEPROTO_H_
-#define _ICEPROTO_H_
-
-#include <X11/Xmd.h>
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	data[2];
-    CARD32	length B32;
-} iceMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD16	errorClass B16;
-    CARD32	length B32;
-    CARD8	offendingMinorOpcode;
-    CARD8	severity;
-    CARD16	unused B16;
-    CARD32	offendingSequenceNum B32;
-    /* n	varying values */
-    /* p	p = pad (n, 8) */
-} iceErrorMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	byteOrder;
-    CARD8	unused;
-    CARD32	length B32;
-} iceByteOrderMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	versionCount;
-    CARD8	authCount;
-    CARD32	length B32;
-    CARD8	mustAuthenticate;
-    CARD8	unused[7];
-    /* i	STRING		vendor */
-    /* j	STRING		release */
-    /* k	LIST of STRING	authentication-protocol-names */
-    /* m	LIST of VERSION version-list */
-    /* p	p = pad (i+j+k+m, 8) */
-} iceConnectionSetupMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	authIndex;
-    CARD8	unused1;
-    CARD32	length B32;
-    CARD16	authDataLength B16;
-    CARD8	unused2[6];
-    /* n	varying data */
-    /* p	p = pad (n, 8) */
-} iceAuthRequiredMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused1[2];
-    CARD32	length B32;
-    CARD16	authDataLength B16;
-    CARD8	unused2[6];
-    /* n	varying data */
-    /* p	p = pad (n, 8) */
-} iceAuthReplyMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused1[2];
-    CARD32	length B32;
-    CARD16	authDataLength B16;
-    CARD8	unused2[6];
-    /* n	varying data */
-    /* p	p = pad (n, 8) */
-} iceAuthNextPhaseMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	versionIndex;
-    CARD8	unused;
-    CARD32	length B32;
-    /* i	STRING		vendor */
-    /* j	STRING		release */
-    /* p	p = pad (i+j, 8) */
-} iceConnectionReplyMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	protocolOpcode;
-    CARD8	mustAuthenticate;
-    CARD32	length B32;
-    CARD8	versionCount;
-    CARD8	authCount;
-    CARD8	unused[6];
-    /* i	STRING		protocol-name */
-    /* j	STRING		vendor */
-    /* k	STRING		release */
-    /* m	LIST of STRING	authentication-protocol-names */
-    /* n	LIST of VERSION version-list */
-    /* p        p = pad (i+j+k+m+n, 8) */
-} iceProtocolSetupMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	versionIndex;
-    CARD8	protocolOpcode;
-    CARD32	length B32;
-    /* i	STRING		vendor */
-    /* j	STRING		release */
-    /* p	p = pad (i+j, 8) */
-} iceProtocolReplyMsg;
-
-typedef iceMsg  icePingMsg;
-typedef iceMsg  icePingReplyMsg;
-typedef iceMsg  iceWantToCloseMsg;
-typedef iceMsg  iceNoCloseMsg;
-
-
-/*
- * SIZEOF values.  These better be multiples of 8.
- */
-
-#define sz_iceMsg			8
-#define sz_iceErrorMsg			16
-#define sz_iceByteOrderMsg		8
-#define sz_iceConnectionSetupMsg        16
-#define sz_iceAuthRequiredMsg		16
-#define sz_iceAuthReplyMsg		16
-#define sz_iceAuthNextPhaseMsg		16
-#define sz_iceConnectionReplyMsg	8
-#define sz_iceProtocolSetupMsg		16
-#define sz_iceProtocolReplyMsg		8
-#define sz_icePingMsg			8
-#define sz_icePingReplyMsg		8
-#define sz_iceWantToCloseMsg		8
-#define sz_iceNoCloseMsg		8
-
-#endif /* _ICEPROTO_H_ */
diff --git a/openflow/usr/include/X11/ICE/ICEutil.h b/openflow/usr/include/X11/ICE/ICEutil.h
deleted file mode 100644
index dbf1490..0000000
--- a/openflow/usr/include/X11/ICE/ICEutil.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/******************************************************************************
-
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Author: Ralph Mor, X Consortium
-******************************************************************************/
-
-#ifndef _ICEUTIL_H_
-#define _ICEUTIL_H_
-
-#include <X11/Xfuncproto.h>
-
-#include <stdio.h>
-
-_XFUNCPROTOBEGIN
-
-/*
- * Data structure for entry in ICE authority file
- */
-
-typedef struct {
-    char    	    *protocol_name;
-    unsigned short  protocol_data_length;
-    char   	    *protocol_data;
-    char    	    *network_id;
-    char    	    *auth_name;
-    unsigned short  auth_data_length;
-    char   	    *auth_data;
-} IceAuthFileEntry;
-
-
-/*
- * Authentication data maintained in memory.
- */
-
-typedef struct {
-    char    	    *protocol_name;
-    char	    *network_id;
-    char    	    *auth_name;
-    unsigned short  auth_data_length;
-    char   	    *auth_data;
-} IceAuthDataEntry;
-
-
-/*
- * Return values from IceLockAuthFile
- */
-
-#define IceAuthLockSuccess	0   /* lock succeeded */
-#define IceAuthLockError	1   /* lock unexpectely failed, check errno */
-#define IceAuthLockTimeout	2   /* lock failed, timeouts expired */
-
-
-/*
- * Function Prototypes
- */
-
-extern char *IceAuthFileName (
-    void
-);
-
-extern int IceLockAuthFile (
-    const char *	/* file_name */,
-    int			/* retries */,
-    int			/* timeout */,
-    long		/* dead */
-);
-
-extern void IceUnlockAuthFile (
-    const char *	/* file_name */
-);
-
-extern IceAuthFileEntry *IceReadAuthFileEntry (
-    FILE *		/* auth_file */
-);
-
-extern void IceFreeAuthFileEntry (
-    IceAuthFileEntry *	/* auth */
-);
-
-extern Status IceWriteAuthFileEntry (
-    FILE *		/* auth_file */,
-    IceAuthFileEntry *	/* auth */
-);
-
-extern IceAuthFileEntry *IceGetAuthFileEntry (
-    const char *	/* protocol_name */,
-    const char *	/* network_id */,
-    const char *	/* auth_name */
-);
-
-extern char *IceGenerateMagicCookie (
-    int			/* len */
-);
-
-extern void IceSetPaAuthData (
-    int			/* numEntries */,
-    IceAuthDataEntry *	/* entries */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _ICEUTIL_H_ */
diff --git a/openflow/usr/include/X11/ImUtil.h b/openflow/usr/include/X11/ImUtil.h
deleted file mode 100644
index ffdba1a..0000000
--- a/openflow/usr/include/X11/ImUtil.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#ifndef _X11_IMUTIL_H_
-#define _X11_IMUTIL_H_
-
-extern int
-_XGetScanlinePad(
-    Display *dpy,
-    int depth);
-
-extern int
-_XGetBitsPerPixel(
- Display *dpy,
- int depth);
-
-extern int
-_XSetImage(
-    XImage *srcimg,
-    register XImage *dstimg,
-    register int x,
-    register int y);
-
-extern int
-_XReverse_Bytes(
-    register unsigned char *bpt,
-    register int nb);
-extern void
-_XInitImageFuncPtrs(
-    register XImage *image);
-
-#endif /* _X11_IMUTIL_H_ */
diff --git a/openflow/usr/include/X11/InitialI.h b/openflow/usr/include/X11/InitialI.h
deleted file mode 100644
index 0827df0..0000000
--- a/openflow/usr/include/X11/InitialI.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtinitialI_h
-#define _XtinitialI_h
-
-/****************************************************************
- *
- * Displays
- *
- ****************************************************************/
-
-#ifndef X_NOT_POSIX
-#ifdef _POSIX_SOURCE
-#include <limits.h>
-#else
-#define _POSIX_SOURCE
-#include <limits.h>
-#undef _POSIX_SOURCE
-#endif
-#endif
-#ifndef PATH_MAX
-#ifdef WIN32
-#define PATH_MAX 512
-#else
-#include <sys/param.h>
-#endif
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-#endif
-
-#include <X11/Xos.h>
-#include <X11/Xpoll.h>
-
-_XFUNCPROTOBEGIN
-
-typedef struct _TimerEventRec {
-        struct timeval        te_timer_value;
-	struct _TimerEventRec *te_next;
-	XtTimerCallbackProc   te_proc;
-	XtAppContext	      app;
-	XtPointer	      te_closure;
-} TimerEventRec;
-
-typedef struct _InputEvent {
-	XtInputCallbackProc   ie_proc;
-	XtPointer	      ie_closure;
-	struct _InputEvent    *ie_next;
-	struct _InputEvent    *ie_oq;
-	XtAppContext	      app;
-	int		      ie_source;
-	XtInputMask	      ie_condition;
-} InputEvent;
-
-typedef struct _SignalEventRec {
-	XtSignalCallbackProc  se_proc;
-	XtPointer	      se_closure;
-	struct _SignalEventRec *se_next;
-	XtAppContext	      app;
-	Boolean		      se_notice;
-} SignalEventRec;
-
-typedef struct _WorkProcRec {
-	XtWorkProc proc;
-	XtPointer closure;
-	struct _WorkProcRec *next;
-	XtAppContext app;
-} WorkProcRec;
-
-
-typedef struct
-{
-#ifndef USE_POLL
-  	fd_set rmask;
-	fd_set wmask;
-	fd_set emask;
-#endif
-	int	nfds;
-} FdStruct;
-
-typedef struct _LangProcRec {
-    XtLanguageProc	proc;
-    XtPointer		closure;
-} LangProcRec;
-
-typedef struct _ProcessContextRec {
-    XtAppContext	defaultAppContext;
-    XtAppContext	appContextList;
-    ConverterTable	globalConverterTable;
-    LangProcRec		globalLangProcRec;
-} ProcessContextRec, *ProcessContext;
-
-typedef struct {
-    char*	start;
-    char*	current;
-    int		bytes_remaining;
-} Heap;
-
-typedef struct _DestroyRec DestroyRec;
-
-
-typedef struct _XtAppStruct {
-    XtAppContext next;		/* link to next app in process context */
-    ProcessContext process;	/* back pointer to our process context */
-    InternalCallbackList destroy_callbacks;
-    Display **list;
-    TimerEventRec *timerQueue;
-    WorkProcRec *workQueue;
-    InputEvent **input_list;
-    InputEvent *outstandingQueue;
-    SignalEventRec *signalQueue;
-    XrmDatabase errorDB;
-    XtErrorMsgHandler errorMsgHandler, warningMsgHandler;
-    XtErrorHandler errorHandler, warningHandler;
-    struct _ActionListRec *action_table;
-    ConverterTable converterTable;
-    unsigned long selectionTimeout;
-    FdStruct fds;
-    short count;			/* num of assigned entries in list */
-    short max;				/* allocate size of list */
-    short last;
-    short input_count;
-    short input_max;			/* elts input_list init'd with */
-    Boolean sync, being_destroyed, error_inited;
-#ifndef NO_IDENTIFY_WINDOWS
-    Boolean identify_windows;		/* debugging hack */
-#endif
-    Heap heap;
-    String * fallback_resources;	/* Set by XtAppSetFallbackResources. */
-    struct _ActionHookRec* action_hook_list;
-    struct _BlockHookRec* block_hook_list;
-    int destroy_list_size;		/* state data for 2-phase destroy */
-    int destroy_count;
-    int dispatch_level;
-    DestroyRec* destroy_list;
-    Widget in_phase2_destroy;
-    LangProcRec langProcRec;
-    struct _TMBindCacheRec * free_bindings;
-    String display_name_tried;
-    Display **dpy_destroy_list;
-    int dpy_destroy_count;
-    Boolean exit_flag;
-    Boolean rebuild_fdlist;
-#ifdef XTHREADS
-    LockPtr lock_info;
-    ThreadAppProc lock;
-    ThreadAppProc unlock;
-    ThreadAppYieldLockProc yield_lock;
-    ThreadAppRestoreLockProc restore_lock;
-    ThreadAppProc free_lock;
-#endif
-} XtAppStruct;
-
-extern void _XtHeapInit(Heap* heap);
-extern void _XtHeapFree(Heap* heap);
-
-#ifdef XTTRACEMEMORY
-
-
-extern char *_XtHeapMalloc(
-    Heap*	/* heap */,
-    Cardinal	/* size */,
-    char *	/* file */,
-    int		/* line */
-);
-
-#define _XtHeapAlloc(heap,bytes) _XtHeapMalloc(heap, bytes, __FILE__, __LINE__)
-
-#else /* XTTRACEMEMORY */
-
-extern char* _XtHeapAlloc(
-    Heap*	/* heap */,
-    Cardinal	/* size */
-);
-
-#endif /* XTTRACEMEMORY */
-
-extern void _XtSetDefaultErrorHandlers(
-    XtErrorMsgHandler*	/* errMsg */,
-    XtErrorMsgHandler*	/* warnMsg */,
-    XtErrorHandler*	/* err */,
-    XtErrorHandler*	/* warn */
-);
-
-extern void _XtSetDefaultSelectionTimeout(
-    unsigned long* /* timeout */
-);
-
-extern XtAppContext _XtDefaultAppContext(
-    void
-);
-
-extern ProcessContext _XtGetProcessContext(
-    void
-);
-
-Display *
-_XtAppInit(
-    XtAppContext*	/* app_context_return */,
-    String		/* application_class */,
-    XrmOptionDescRec*	/* options */,
-    Cardinal		/* num_options */,
-    int*		/* argc_in_out */,
-    String**		/* argv_in_out */,
-    String*		/* fallback_resources */
-);
-
-extern void _XtDestroyAppContexts(
-    void
-);
-
-extern void _XtCloseDisplays(
-    XtAppContext	/* app */
-);
-
-extern int _XtAppDestroyCount;
-
-extern int _XtWaitForSomething(
-    XtAppContext	/* app */,
-    _XtBoolean 		/* ignoreEvents */,
-    _XtBoolean 		/* ignoreTimers */,
-    _XtBoolean 		/* ignoreInputs */,
-    _XtBoolean		/* ignoreSignals */,
-    _XtBoolean 		/* block */,
-#ifdef XTHREADS
-    _XtBoolean		/* drop_lock */,
-#endif
-    unsigned long*	/* howlong */
-);
-
-typedef struct _CaseConverterRec *CaseConverterPtr;
-typedef struct _CaseConverterRec {
-    KeySym		start;		/* first KeySym valid in converter */
-    KeySym		stop;		/* last KeySym valid in converter */
-    XtCaseProc		proc;		/* case converter function */
-    CaseConverterPtr	next;		/* next converter record */
-} CaseConverterRec;
-
-typedef struct _ExtensionSelectorRec {
-    XtExtensionSelectProc proc;
-    int min, max;
-    XtPointer client_data;
-} ExtSelectRec;
-
-typedef struct _XtPerDisplayStruct {
-    InternalCallbackList destroy_callbacks;
-    Region region;
-    CaseConverterPtr case_cvt;		/* user-registered case converters */
-    XtKeyProc defaultKeycodeTranslator;
-    XtAppContext appContext;
-    unsigned long keysyms_serial;      /* for tracking MappingNotify events */
-    KeySym *keysyms;                   /* keycode to keysym table */
-    int keysyms_per_keycode;           /* number of keysyms for each keycode*/
-    int min_keycode, max_keycode;      /* range of keycodes */
-    KeySym *modKeysyms;                /* keysym values for modToKeysysm */
-    ModToKeysymTable *modsToKeysyms;   /* modifiers to Keysysms index table*/
-    unsigned char isModifier[32];      /* key-is-modifier-p bit table */
-    KeySym lock_meaning;	       /* Lock modifier meaning */
-    Modifiers mode_switch;	       /* keyboard group modifiers */
-    Modifiers num_lock;		       /* keyboard numlock modifiers */
-    Boolean being_destroyed;
-    Boolean rv;			       /* reverse_video resource */
-    XrmName name;		       /* resolved app name */
-    XrmClass class;		       /* application class */
-    Heap heap;
-    struct _GCrec *GClist;	       /* support for XtGetGC */
-    Drawable **pixmap_tab;             /* ditto for XtGetGC */
-    String language;		       /* XPG language string */
-    XEvent last_event;		       /* last event dispatched */
-    Time last_timestamp;	       /* from last event dispatched */
-    int multi_click_time;	       /* for XtSetMultiClickTime */
-    struct _TMKeyContextRec* tm_context;     /* for XtGetActionKeysym */
-    InternalCallbackList mapping_callbacks;  /* special case for TM */
-    XtPerDisplayInputRec pdi;	       /* state for modal grabs & kbd focus */
-    struct _WWTable *WWtable;	       /* window to widget table */
-    XrmDatabase *per_screen_db;        /* per screen resource databases */
-    XrmDatabase cmd_db;		       /* db from command line, if needed */
-    XrmDatabase server_db;	       /* resource property else .Xdefaults */
-    XtEventDispatchProc* dispatcher_list;
-    ExtSelectRec* ext_select_list;
-    int ext_select_count;
-    Widget hook_object;
-#ifndef X_NO_RESOURCE_CONFIGURATION_MANAGEMENT
-    Atom rcm_init;			/* ResConfig - initialize */
-    Atom rcm_data;			/* ResConfig - data atom */
-#endif
-} XtPerDisplayStruct, *XtPerDisplay;
-
-typedef struct _PerDisplayTable {
-	Display *dpy;
-	XtPerDisplayStruct perDpy;
-	struct _PerDisplayTable *next;
-} PerDisplayTable, *PerDisplayTablePtr;
-
-extern PerDisplayTablePtr _XtperDisplayList;
-
-extern XtPerDisplay _XtSortPerDisplayList(
-    Display* /* dpy */
-);
-
-extern XtPerDisplay _XtGetPerDisplay(
-    Display*		/* dpy */
-);
-
-extern XtPerDisplayInputRec* _XtGetPerDisplayInput(
-    Display* 		/* dpy */
-);
-
-#if 0
-#ifdef DEBUG
-#define _XtGetPerDisplay(display) \
-    ((_XtperDisplayList != NULL && (_XtperDisplayList->dpy == (display))) \
-     ? &_XtperDisplayList->perDpy \
-     : _XtSortPerDisplayList(display))
-#define _XtGetPerDisplayInput(display) \
-    ((_XtperDisplayList != NULL && (_XtperDisplayList->dpy == (display))) \
-     ? &_XtperDisplayList->perDpy.pdi \
-     : &_XtSortPerDisplayList(display)->pdi)
-#else
-#define _XtGetPerDisplay(display) \
-    ((_XtperDisplayList->dpy == (display)) \
-     ? &_XtperDisplayList->perDpy \
-     : _XtSortPerDisplayList(display))
-#define _XtGetPerDisplayInput(display) \
-    ((_XtperDisplayList->dpy == (display)) \
-     ? &_XtperDisplayList->perDpy.pdi \
-     : &_XtSortPerDisplayList(display)->pdi)
-#endif /*DEBUG*/
-#endif
-
-extern void _XtDisplayInitialize(
-    Display*		/* dpy */,
-    XtPerDisplay	/* pd */,
-    _Xconst char*	/* name */,
-    XrmOptionDescRec*	/* urlist */,
-    Cardinal 		/* num_urs */,
-    int*		/* argc */,
-    char** 		/* argv */
-);
-
-extern void _XtCacheFlushTag(
-    XtAppContext /* app */,
-    XtPointer	 /* tag */
-);
-
-extern void _XtFreeActions(
-    struct _ActionListRec* /* action_table */
-);
-
-extern void _XtDoPhase2Destroy(
-    XtAppContext /* app */,
-    int		 /* dispatch_level */
-);
-
-extern void _XtDoFreeBindings(
-    XtAppContext /* app */
-);
-
-extern void _XtExtensionSelect(
-    Widget /* widget */
-);
-
-#define _XtSafeToDestroy(app) ((app)->dispatch_level == 0)
-
-extern void _XtAllocWWTable(
-    XtPerDisplay pd
-);
-
-extern void _XtFreeWWTable(
-    XtPerDisplay pd
-);
-
-extern String _XtGetUserName(String dest, int len);
-extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
-			Cardinal num_urs, int argc, String *argv,
-			String *applName, String *displayName,
-			String *language);
-
-_XFUNCPROTOEND
-
-#endif /* _XtinitialI_h */
diff --git a/openflow/usr/include/X11/Intrinsic.h b/openflow/usr/include/X11/Intrinsic.h
deleted file mode 100644
index 794b820..0000000
--- a/openflow/usr/include/X11/Intrinsic.h
+++ /dev/null
@@ -1,2585 +0,0 @@
-/***********************************************************
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-			All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#ifndef _XtIntrinsic_h
-#define _XtIntrinsic_h
-
-#include	<X11/Xlib.h>
-#include	<X11/Xutil.h>
-#include	<X11/Xresource.h>
-#include	<X11/Xfuncproto.h>
-#ifdef XT_BC
-#include <X11/Xos.h>		/* for R4 compatibility */
-#else
-#include <X11/Xosdefs.h>
-#include <string.h>		/* for XtNewString */
-#endif /* XT_BC else */
-
-#define XtSpecificationRelease 6
-
-typedef char *String;
-
-/* We do this in order to get "const" declarations to work right.  We
- * use _XtString instead of String so that C++ applications can
- * #define String to something else if they choose, to avoid conflicts
- * with other C++ libraries.
- */
-#define _XtString char*
-
-/* _Xt names are private to Xt implementation, do not use in client code */
-#if NeedWidePrototypes
-#define _XtBoolean	int
-#define _XtDimension	unsigned int
-#define _XtKeyCode	unsigned int
-#define _XtPosition	int
-#define _XtXtEnum	unsigned int
-#else
-#define _XtBoolean	Boolean
-#define _XtDimension	Dimension
-#define _XtKeyCode	KeyCode
-#define _XtPosition	Position
-#define _XtXtEnum	XtEnum
-#endif /* NeedWidePrototypes */
-
-#include <stddef.h>
-
-#ifdef VMS
-#define externalref globalref
-#define externaldef(psect) globaldef {"psect"} noshare
-#else
-#define externalref extern
-#define externaldef(psect)
-#endif /* VMS */
-
-#ifndef FALSE
-#define FALSE 0
-#define TRUE 1
-#endif
-
-#define XtNumber(arr)		((Cardinal) (sizeof(arr) / sizeof(arr[0])))
-
-typedef struct _WidgetRec *Widget;
-typedef Widget *WidgetList;
-typedef struct _WidgetClassRec *WidgetClass;
-typedef struct _CompositeRec *CompositeWidget;
-typedef struct _XtActionsRec *XtActionList;
-typedef struct _XtEventRec *XtEventTable;
-
-typedef struct _XtAppStruct *XtAppContext;
-typedef unsigned long	XtValueMask;
-typedef unsigned long	XtIntervalId;
-typedef unsigned long	XtInputId;
-typedef unsigned long	XtWorkProcId;
-typedef unsigned long	XtSignalId;
-typedef unsigned int	XtGeometryMask;
-typedef unsigned long	XtGCMask;   /* Mask of values that are used by widget*/
-typedef unsigned long	Pixel;	    /* Index into colormap		*/
-typedef int		XtCacheType;
-#define			XtCacheNone	  0x001
-#define			XtCacheAll	  0x002
-#define			XtCacheByDisplay  0x003
-#define			XtCacheRefCount	  0x100
-
-/****************************************************************
- *
- * System Dependent Definitions; see spec for specific range
- * requirements.  Do not assume every implementation uses the
- * same base types!
- *
- *
- * XtArgVal ought to be a union of XtPointer, char *, long, int *, and proc *
- * but casting to union types is not really supported.
- *
- * So the typedef for XtArgVal should be chosen such that
- *
- *	sizeof (XtArgVal) >=	sizeof(XtPointer)
- *				sizeof(char *)
- *				sizeof(long)
- *				sizeof(int *)
- *				sizeof(proc *)
- *
- * ArgLists rely heavily on the above typedef.
- *
- ****************************************************************/
-typedef char		Boolean;
-typedef long		XtArgVal;
-typedef unsigned char	XtEnum;
-
-typedef unsigned int	Cardinal;
-typedef unsigned short	Dimension;  /* Size in pixels			*/
-typedef short		Position;   /* Offset from 0 coordinate		*/
-
-typedef void*		XtPointer;
-
-/* The type Opaque is NOT part of the Xt standard, do NOT use it. */
-/* (It remains here only for backward compatibility.) */
-typedef XtPointer	Opaque;
-
-#include <X11/Core.h>
-#include <X11/Composite.h>
-#include <X11/Constraint.h>
-#include <X11/Object.h>
-#include <X11/RectObj.h>
-
-typedef struct _TranslationData *XtTranslations;
-typedef struct _TranslationData *XtAccelerators;
-typedef unsigned int Modifiers;
-
-typedef void (*XtActionProc)(
-    Widget 		/* widget */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-typedef XtActionProc* XtBoundActions;
-
-typedef struct _XtActionsRec{
-    String	 string;
-    XtActionProc proc;
-} XtActionsRec;
-
-typedef enum {
-/* address mode		parameter representation    */
-/* ------------		------------------------    */
-    XtAddress,		/* address		    */
-    XtBaseOffset,	/* offset		    */
-    XtImmediate,	/* constant		    */
-    XtResourceString,	/* resource name string	    */
-    XtResourceQuark,	/* resource name quark	    */
-    XtWidgetBaseOffset,	/* offset from ancestor	    */
-    XtProcedureArg	/* procedure to invoke	    */
-} XtAddressMode;
-
-typedef struct {
-    XtAddressMode   address_mode;
-    XtPointer	    address_id;
-    Cardinal	    size;
-} XtConvertArgRec, *XtConvertArgList;
-
-typedef void (*XtConvertArgProc)(
-    Widget 		/* widget */,
-    Cardinal*		/* size */,
-    XrmValue*		/* value */
-);
-
-typedef struct {
-    XtGeometryMask request_mode;
-    Position x, y;
-    Dimension width, height, border_width;
-    Widget sibling;
-    int stack_mode;   /* Above, Below, TopIf, BottomIf, Opposite, DontChange */
-} XtWidgetGeometry;
-
-/* Additions to Xlib geometry requests: ask what would happen, don't do it */
-#define XtCWQueryOnly	(1 << 7)
-
-/* Additions to Xlib stack modes: don't change stack order */
-#define XtSMDontChange	5
-
-typedef void (*XtConverter)( /* obsolete */
-    XrmValue*		/* args */,
-    Cardinal*		/* num_args */,
-    XrmValue*		/* from */,
-    XrmValue*		/* to */
-);
-
-typedef Boolean (*XtTypeConverter)(
-    Display*		/* dpy */,
-    XrmValue*		/* args */,
-    Cardinal*		/* num_args */,
-    XrmValue*		/* from */,
-    XrmValue*		/* to */,
-    XtPointer*		/* converter_data */
-);
-
-typedef void (*XtDestructor)(
-    XtAppContext	/* app */,
-    XrmValue*		/* to */,
-    XtPointer 		/* converter_data */,
-    XrmValue*		/* args */,
-    Cardinal*		/* num_args */
-);
-
-typedef Opaque XtCacheRef;
-
-typedef Opaque XtActionHookId;
-
-typedef void (*XtActionHookProc)(
-    Widget		/* w */,
-    XtPointer		/* client_data */,
-    String		/* action_name */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-typedef unsigned long XtBlockHookId;
-
-typedef void (*XtBlockHookProc)(
-    XtPointer		/* client_data */
-);
-
-typedef void (*XtKeyProc)(
-    Display*		/* dpy */,
-    _XtKeyCode 		/* keycode */,
-    Modifiers		/* modifiers */,
-    Modifiers*		/* modifiers_return */,
-    KeySym*		/* keysym_return */
-);
-
-typedef void (*XtCaseProc)(
-    Display*		/* display */,
-    KeySym		/* keysym */,
-    KeySym*		/* lower_return */,
-    KeySym*		/* upper_return */
-);
-
-typedef void (*XtEventHandler)(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    XEvent*		/* event */,
-    Boolean*		/* continue_to_dispatch */
-);
-typedef unsigned long EventMask;
-
-typedef enum {XtListHead, XtListTail } XtListPosition;
-
-typedef unsigned long	XtInputMask;
-#define XtInputNoneMask		0L
-#define XtInputReadMask		(1L<<0)
-#define XtInputWriteMask	(1L<<1)
-#define XtInputExceptMask	(1L<<2)
-
-typedef void (*XtTimerCallbackProc)(
-    XtPointer 		/* closure */,
-    XtIntervalId*	/* id */
-);
-
-typedef void (*XtInputCallbackProc)(
-    XtPointer 		/* closure */,
-    int*		/* source */,
-    XtInputId*		/* id */
-);
-
-typedef void (*XtSignalCallbackProc)(
-    XtPointer		/* closure */,
-    XtSignalId*		/* id */
-);
-
-typedef struct {
-    String	name;
-    XtArgVal	value;
-} Arg, *ArgList;
-
-typedef XtPointer	XtVarArgsList;
-
-typedef void (*XtCallbackProc)(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,	/* data the application registered */
-    XtPointer 		/* call_data */	/* callback specific data */
-);
-
-typedef struct _XtCallbackRec {
-    XtCallbackProc  callback;
-    XtPointer	    closure;
-} XtCallbackRec, *XtCallbackList;
-
-typedef enum {
-	XtCallbackNoList,
-	XtCallbackHasNone,
-	XtCallbackHasSome
-} XtCallbackStatus;
-
-typedef enum  {
-    XtGeometryYes,	  /* Request accepted. */
-    XtGeometryNo,	  /* Request denied. */
-    XtGeometryAlmost,	  /* Request denied, but willing to take replyBox. */
-    XtGeometryDone	  /* Request accepted and done. */
-} XtGeometryResult;
-
-typedef enum {XtGrabNone, XtGrabNonexclusive, XtGrabExclusive} XtGrabKind;
-
-typedef struct {
-    Widget  shell_widget;
-    Widget  enable_widget;
-} XtPopdownIDRec, *XtPopdownID;
-
-typedef struct _XtResource {
-    String	resource_name;	/* Resource name			    */
-    String	resource_class;	/* Resource class			    */
-    String	resource_type;	/* Representation type desired		    */
-    Cardinal	resource_size;	/* Size in bytes of representation	    */
-    Cardinal	resource_offset;/* Offset from base to put resource value   */
-    String	default_type;	/* representation type of specified default */
-    XtPointer	default_addr;	/* Address of default resource		    */
-} XtResource, *XtResourceList;
-
-typedef void (*XtResourceDefaultProc)(
-    Widget	/* widget */,
-    int		/* offset */,
-    XrmValue*	/* value */
-);
-
-typedef String (*XtLanguageProc)(
-    Display*	/* dpy */,
-    String	/* xnl */,
-    XtPointer	/* client_data */
-);
-
-typedef void (*XtErrorMsgHandler)(
-    String 		/* name */,
-    String		/* type */,
-    String		/* class */,
-    String		/* default */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-typedef void (*XtErrorHandler)(
-  String		/* msg */
-);
-
-typedef void (*XtCreatePopupChildProc)(
-    Widget	/* shell */
-);
-
-typedef Boolean (*XtWorkProc)(
-    XtPointer 		/* closure */	/* data the application registered */
-);
-
-typedef struct {
-    char match;
-    String substitution;
-} SubstitutionRec, *Substitution;
-
-typedef Boolean (*XtFilePredicate)(
-   String /* filename */
-);
-
-typedef XtPointer XtRequestId;
-
-typedef Boolean (*XtConvertSelectionProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    Atom*		/* target */,
-    Atom*		/* type_return */,
-    XtPointer*		/* value_return */,
-    unsigned long*	/* length_return */,
-    int*		/* format_return */
-);
-
-typedef void (*XtLoseSelectionProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */
-);
-
-typedef void (*XtSelectionDoneProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    Atom*		/* target */
-);
-
-typedef void (*XtSelectionCallbackProc)(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    Atom*		/* selection */,
-    Atom*		/* type */,
-    XtPointer 		/* value */,
-    unsigned long*	/* length */,
-    int*		/* format */
-);
-
-typedef void (*XtLoseSelectionIncrProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    XtPointer 		/* client_data */
-);
-
-typedef void (*XtSelectionDoneIncrProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    Atom*		/* target */,
-    XtRequestId*	/* receiver_id */,
-    XtPointer 		/* client_data */
-);
-
-typedef Boolean (*XtConvertSelectionIncrProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    Atom*		/* target */,
-    Atom*		/* type */,
-    XtPointer*		/* value */,
-    unsigned long*	/* length */,
-    int*		/* format */,
-    unsigned long*	/* max_length */,
-    XtPointer 		/* client_data */,
-    XtRequestId*	/* receiver_id */
-);
-
-typedef void (*XtCancelConvertSelectionProc)(
-    Widget 		/* widget */,
-    Atom*		/* selection */,
-    Atom*		/* target */,
-    XtRequestId*	/* receiver_id */,
-    XtPointer 		/* client_data */
-);
-
-typedef Boolean (*XtEventDispatchProc)(
-    XEvent*		/* event */
-);
-
-typedef void (*XtExtensionSelectProc)(
-    Widget		/* widget */,
-    int*		/* event_types */,
-    XtPointer*		/* select_data */,
-    int			/* count */,
-    XtPointer		/* client_data */
-);
-
-/***************************************************************
- *
- * Exported Interfaces
- *
- ****************************************************************/
-
-_XFUNCPROTOBEGIN
-
-extern Boolean XtConvertAndStore(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* from_type */,
-    XrmValue*		/* from */,
-    _Xconst _XtString 	/* to_type */,
-    XrmValue*		/* to_in_out */
-);
-
-extern Boolean XtCallConverter(
-    Display*		/* dpy */,
-    XtTypeConverter 	/* converter */,
-    XrmValuePtr 	/* args */,
-    Cardinal 		/* num_args */,
-    XrmValuePtr 	/* from */,
-    XrmValue*		/* to_in_out */,
-    XtCacheRef*		/* cache_ref_return */
-);
-
-extern Boolean XtDispatchEvent(
-    XEvent* 		/* event */
-);
-
-extern Boolean XtCallAcceptFocus(
-    Widget 		/* widget */,
-    Time*		/* time */
-);
-
-extern Boolean XtPeekEvent( /* obsolete */
-    XEvent*		/* event_return */
-);
-
-extern Boolean XtAppPeekEvent(
-    XtAppContext 	/* app_context */,
-    XEvent*		/* event_return */
-);
-
-extern Boolean XtIsSubclass(
-    Widget 		/* widget */,
-    WidgetClass 	/* widgetClass */
-);
-
-extern Boolean XtIsObject(
-    Widget 		/* object */
-);
-
-extern Boolean _XtCheckSubclassFlag( /* implementation-private */
-    Widget		/* object */,
-    _XtXtEnum		/* type_flag */
-);
-
-extern Boolean _XtIsSubclassOf( /* implementation-private */
-    Widget		/* object */,
-    WidgetClass		/* widget_class */,
-    WidgetClass		/* flag_class */,
-    _XtXtEnum		/* type_flag */
-);
-
-extern Boolean XtIsManaged(
-    Widget 		/* rectobj */
-);
-
-extern Boolean XtIsRealized(
-    Widget 		/* widget */
-);
-
-extern Boolean XtIsSensitive(
-    Widget 		/* widget */
-);
-
-extern Boolean XtOwnSelection(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Time 		/* time */,
-    XtConvertSelectionProc /* convert */,
-    XtLoseSelectionProc	/* lose */,
-    XtSelectionDoneProc /* done */
-);
-
-extern Boolean XtOwnSelectionIncremental(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Time 		/* time */,
-    XtConvertSelectionIncrProc	/* convert_callback */,
-    XtLoseSelectionIncrProc	/* lose_callback */,
-    XtSelectionDoneIncrProc	/* done_callback */,
-    XtCancelConvertSelectionProc /* cancel_callback */,
-    XtPointer 		/* client_data */
-);
-
-extern XtGeometryResult XtMakeResizeRequest(
-    Widget 		/* widget */,
-    _XtDimension	/* width */,
-    _XtDimension	/* height */,
-    Dimension*		/* width_return */,
-    Dimension*		/* height_return */
-);
-
-extern void XtTranslateCoords(
-    Widget 		/* widget */,
-    _XtPosition		/* x */,
-    _XtPosition		/* y */,
-    Position*		/* rootx_return */,
-    Position*		/* rooty_return */
-);
-
-extern KeySym* XtGetKeysymTable(
-    Display*		/* dpy */,
-    KeyCode*		/* min_keycode_return */,
-    int*		/* keysyms_per_keycode_return */
-);
-
-extern void XtKeysymToKeycodeList(
-    Display*		/* dpy */,
-    KeySym 		/* keysym */,
-    KeyCode**		/* keycodes_return */,
-    Cardinal*		/* keycount_return */
-);
-
-extern void XtStringConversionWarning( /* obsolete */
-    _Xconst _XtString	/* from_value */,
-    _Xconst _XtString	/* to_type */
-);
-
-extern void XtDisplayStringConversionWarning(
-    Display*	 	/* dpy */,
-    _Xconst _XtString	/* from_value */,
-    _Xconst _XtString	/* to_type */
-);
-
-externalref XtConvertArgRec const colorConvertArgs[];
-externalref XtConvertArgRec const screenConvertArg[];
-
-extern void XtAppAddConverter( /* obsolete */
-    XtAppContext	/* app_context */,
-    _Xconst _XtString	/* from_type */,
-    _Xconst _XtString	/* to_type */,
-    XtConverter 	/* converter */,
-    XtConvertArgList	/* convert_args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtAddConverter( /* obsolete */
-    _Xconst _XtString	/* from_type */,
-    _Xconst _XtString 	/* to_type */,
-    XtConverter 	/* converter */,
-    XtConvertArgList 	/* convert_args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtSetTypeConverter(
-    _Xconst _XtString 	/* from_type */,
-    _Xconst _XtString 	/* to_type */,
-    XtTypeConverter 	/* converter */,
-    XtConvertArgList 	/* convert_args */,
-    Cardinal 		/* num_args */,
-    XtCacheType 	/* cache_type */,
-    XtDestructor 	/* destructor */
-);
-
-extern void XtAppSetTypeConverter(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString 	/* from_type */,
-    _Xconst _XtString 	/* to_type */,
-    XtTypeConverter 	/* converter */,
-    XtConvertArgList 	/* convert_args */,
-    Cardinal 		/* num_args */,
-    XtCacheType 	/* cache_type */,
-    XtDestructor 	/* destructor */
-);
-
-extern void XtConvert( /* obsolete */
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* from_type */,
-    XrmValue*		/* from */,
-    _Xconst _XtString 	/* to_type */,
-    XrmValue*		/* to_return */
-);
-
-extern void XtDirectConvert( /* obsolete */
-    XtConverter 	/* converter */,
-    XrmValuePtr 	/* args */,
-    Cardinal 		/* num_args */,
-    XrmValuePtr 	/* from */,
-    XrmValue*		/* to_return */
-);
-
-/****************************************************************
- *
- * Translation Management
- *
- ****************************************************************/
-
-extern XtTranslations XtParseTranslationTable(
-    _Xconst _XtString	/* table */
-);
-
-extern XtAccelerators XtParseAcceleratorTable(
-    _Xconst _XtString	/* source */
-);
-
-extern void XtOverrideTranslations(
-    Widget 		/* widget */,
-    XtTranslations 	/* translations */
-);
-
-extern void XtAugmentTranslations(
-    Widget 		/* widget */,
-    XtTranslations 	/* translations */
-);
-
-extern void XtInstallAccelerators(
-    Widget 		/* destination */,
-    Widget		/* source */
-);
-
-extern void XtInstallAllAccelerators(
-    Widget 		/* destination */,
-    Widget		/* source */
-);
-
-extern void XtUninstallTranslations(
-    Widget 		/* widget */
-);
-
-extern void XtAppAddActions(
-    XtAppContext 	/* app_context */,
-    XtActionList 	/* actions */,
-    Cardinal 		/* num_actions */
-);
-
-extern void XtAddActions( /* obsolete */
-    XtActionList 	/* actions */,
-    Cardinal 		/* num_actions */
-);
-
-extern XtActionHookId XtAppAddActionHook(
-    XtAppContext 	/* app_context */,
-    XtActionHookProc 	/* proc */,
-    XtPointer 		/* client_data */
-);
-
-extern void XtRemoveActionHook(
-    XtActionHookId 	/* id */
-);
-
-extern void XtGetActionList(
-    WidgetClass		/* widget_class */,
-    XtActionList*	/* actions_return */,
-    Cardinal*		/* num_actions_return */
-);
-
-extern void XtCallActionProc(
-    Widget		/* widget */,
-    _Xconst _XtString	/* action */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal		/* num_params */
-);
-
-extern void XtRegisterGrabAction(
-    XtActionProc 	/* action_proc */,
-    _XtBoolean 		/* owner_events */,
-    unsigned int 	/* event_mask */,
-    int			/* pointer_mode */,
-    int	 		/* keyboard_mode */
-);
-
-extern void XtSetMultiClickTime(
-    Display*		/* dpy */,
-    int 		/* milliseconds */
-);
-
-extern int XtGetMultiClickTime(
-    Display*		/* dpy */
-);
-
-extern KeySym XtGetActionKeysym(
-    XEvent*		/* event */,
-    Modifiers*		/* modifiers_return */
-);
-
-/***************************************************************
- *
- * Keycode and Keysym procedures for translation management
- *
- ****************************************************************/
-
-extern void XtTranslateKeycode(
-    Display*		/* dpy */,
-    _XtKeyCode 		/* keycode */,
-    Modifiers 		/* modifiers */,
-    Modifiers*		/* modifiers_return */,
-    KeySym*		/* keysym_return */
-);
-
-extern void XtTranslateKey(
-    Display*		/* dpy */,
-    _XtKeyCode		/* keycode */,
-    Modifiers		/* modifiers */,
-    Modifiers*		/* modifiers_return */,
-    KeySym*		/* keysym_return */
-);
-
-extern void XtSetKeyTranslator(
-    Display*		/* dpy */,
-    XtKeyProc 		/* proc */
-);
-
-extern void XtRegisterCaseConverter(
-    Display*		/* dpy */,
-    XtCaseProc 		/* proc */,
-    KeySym 		/* start */,
-    KeySym 		/* stop */
-);
-
-extern void XtConvertCase(
-    Display*		/* dpy */,
-    KeySym 		/* keysym */,
-    KeySym*		/* lower_return */,
-    KeySym*		/* upper_return */
-);
-
-/****************************************************************
- *
- * Event Management
- *
- ****************************************************************/
-
-/* XtAllEvents is valid only for XtRemoveEventHandler and
- * XtRemoveRawEventHandler; don't use it to select events!
- */
-#define XtAllEvents ((EventMask) -1L)
-
-extern void XtAddEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtAddRawEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveRawEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtInsertEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */,
-    XtListPosition 	/* position */
-);
-
-extern void XtInsertRawEventHandler(
-    Widget 		/* widget */,
-    EventMask 		/* event_mask */,
-    _XtBoolean 		/* nonmaskable */,
-    XtEventHandler 	/* proc */,
-    XtPointer 		/* closure */,
-    XtListPosition 	/* position */
-);
-
-extern XtEventDispatchProc XtSetEventDispatcher(
-    Display*		/* dpy */,
-    int			/* event_type */,
-    XtEventDispatchProc	/* proc */
-);
-
-extern Boolean XtDispatchEventToWidget(
-    Widget		/* widget */,
-    XEvent*		/* event */
-);
-
-extern void XtInsertEventTypeHandler(
-    Widget		/* widget */,
-    int			/* type */,
-    XtPointer		/* select_data */,
-    XtEventHandler	/* proc */,
-    XtPointer		/* closure */,
-    XtListPosition	/* position */
-);
-
-extern void XtRemoveEventTypeHandler(
-    Widget		/* widget */,
-    int			/* type */,
-    XtPointer		/* select_data */,
-    XtEventHandler	/* proc */,
-    XtPointer		/* closure */
-);
-
-extern EventMask XtBuildEventMask(
-    Widget 		/* widget */
-);
-
-extern void XtRegisterExtensionSelector(
-    Display*		/* dpy */,
-    int			/* min_event_type */,
-    int			/* max_event_type */,
-    XtExtensionSelectProc /* proc */,
-    XtPointer		/* client_data */
-);
-
-extern void XtAddGrab(
-    Widget 		/* widget */,
-    _XtBoolean 		/* exclusive */,
-    _XtBoolean 		/* spring_loaded */
-);
-
-extern void XtRemoveGrab(
-    Widget 		/* widget */
-);
-
-extern void XtProcessEvent( /* obsolete */
-    XtInputMask 		/* mask */
-);
-
-extern void XtAppProcessEvent(
-    XtAppContext 		/* app_context */,
-    XtInputMask 		/* mask */
-);
-
-extern void XtMainLoop( /* obsolete */
-    void
-);
-
-extern void XtAppMainLoop(
-    XtAppContext 		/* app_context */
-);
-
-extern void XtAddExposureToRegion(
-    XEvent*		/* event */,
-    Region 		/* region */
-);
-
-extern void XtSetKeyboardFocus(
-    Widget		/* subtree */,
-    Widget 		/* descendent */
-);
-
-extern Widget XtGetKeyboardFocusWidget(
-    Widget		/* widget */
-);
-
-extern XEvent* XtLastEventProcessed(
-    Display*		/* dpy */
-);
-
-extern Time XtLastTimestampProcessed(
-    Display*		/* dpy */
-);
-
-/****************************************************************
- *
- * Event Gathering Routines
- *
- ****************************************************************/
-
-extern XtIntervalId XtAddTimeOut( /* obsolete */
-    unsigned long 	/* interval */,
-    XtTimerCallbackProc /* proc */,
-    XtPointer 		/* closure */
-);
-
-extern XtIntervalId XtAppAddTimeOut(
-    XtAppContext 	/* app_context */,
-    unsigned long 	/* interval */,
-    XtTimerCallbackProc /* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveTimeOut(
-    XtIntervalId 	/* timer */
-);
-
-extern XtInputId XtAddInput( /* obsolete */
-    int 		/* source */,
-    XtPointer 		/* condition */,
-    XtInputCallbackProc /* proc */,
-    XtPointer 		/* closure */
-);
-
-extern XtInputId XtAppAddInput(
-    XtAppContext       	/* app_context */,
-    int 		/* source */,
-    XtPointer 		/* condition */,
-    XtInputCallbackProc /* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveInput(
-    XtInputId 		/* id */
-);
-
-extern XtSignalId XtAddSignal(
-    XtSignalCallbackProc /* proc */,
-    XtPointer		/* closure */);
-
-extern XtSignalId XtAppAddSignal(
-    XtAppContext       	/* app_context */,
-    XtSignalCallbackProc /* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveSignal(
-    XtSignalId 		/* id */
-);
-
-extern void XtNoticeSignal(
-    XtSignalId		/* id */
-);
-
-extern void XtNextEvent( /* obsolete */
-    XEvent* 		/* event */
-);
-
-extern void XtAppNextEvent(
-    XtAppContext 	/* app_context */,
-    XEvent*		/* event_return */
-);
-
-#define XtIMXEvent		1
-#define XtIMTimer		2
-#define XtIMAlternateInput	4
-#define XtIMSignal		8
-#define XtIMAll (XtIMXEvent | XtIMTimer | XtIMAlternateInput | XtIMSignal)
-
-extern Boolean XtPending( /* obsolete */
-    void
-);
-
-extern XtInputMask XtAppPending(
-    XtAppContext 	/* app_context */
-);
-
-extern XtBlockHookId XtAppAddBlockHook(
-    XtAppContext 	/* app_context */,
-    XtBlockHookProc 	/* proc */,
-    XtPointer 		/* client_data */
-);
-
-extern void XtRemoveBlockHook(
-    XtBlockHookId 	/* id */
-);
-
-/****************************************************************
- *
- * Random utility routines
- *
- ****************************************************************/
-
-#define XtIsRectObj(object)	(_XtCheckSubclassFlag(object, (XtEnum)0x02))
-#define XtIsWidget(object)	(_XtCheckSubclassFlag(object, (XtEnum)0x04))
-#define XtIsComposite(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x08))
-#define XtIsConstraint(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x10))
-#define XtIsShell(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x20))
-
-#undef XtIsOverrideShell
-extern Boolean XtIsOverrideShell(Widget /* object */);
-#define XtIsOverrideShell(widget) \
-    (_XtIsSubclassOf(widget, (WidgetClass)overrideShellWidgetClass, \
-		     (WidgetClass)shellWidgetClass, (XtEnum)0x20))
-
-#define XtIsWMShell(widget)	(_XtCheckSubclassFlag(widget, (XtEnum)0x40))
-
-#undef XtIsVendorShell
-extern Boolean XtIsVendorShell(Widget /* object */);
-#define XtIsVendorShell(widget)	\
-    (_XtIsSubclassOf(widget, (WidgetClass)vendorShellWidgetClass, \
-		     (WidgetClass)wmShellWidgetClass, (XtEnum)0x40))
-
-#undef XtIsTransientShell
-extern Boolean XtIsTransientShell(Widget /* object */);
-#define XtIsTransientShell(widget) \
-    (_XtIsSubclassOf(widget, (WidgetClass)transientShellWidgetClass, \
-		     (WidgetClass)wmShellWidgetClass, (XtEnum)0x40))
-#define XtIsTopLevelShell(widget) (_XtCheckSubclassFlag(widget, (XtEnum)0x80))
-
-#undef XtIsApplicationShell
-extern Boolean XtIsApplicationShell(Widget /* object */);
-#define XtIsApplicationShell(widget) \
-    (_XtIsSubclassOf(widget, (WidgetClass)applicationShellWidgetClass, \
-		     (WidgetClass)topLevelShellWidgetClass, (XtEnum)0x80))
-
-#undef XtIsSessionShell
-extern Boolean XtIsSessionShell(Widget /* object */);
-#define XtIsSessionShell(widget) \
-    (_XtIsSubclassOf(widget, (WidgetClass)sessionShellWidgetClass, \
-		     (WidgetClass)topLevelShellWidgetClass, (XtEnum)0x80))
-
-extern void XtRealizeWidget(
-    Widget 		/* widget */
-);
-
-void XtUnrealizeWidget(
-    Widget 		/* widget */
-);
-
-extern void XtDestroyWidget(
-    Widget 		/* widget */
-);
-
-extern void XtSetSensitive(
-    Widget 		/* widget */,
-    _XtBoolean 		/* sensitive */
-);
-
-extern void XtSetMappedWhenManaged(
-    Widget 		/* widget */,
-    _XtBoolean 		/* mapped_when_managed */
-);
-
-extern Widget XtNameToWidget(
-    Widget 		/* reference */,
-    _Xconst _XtString	/* names */
-);
-
-extern Widget XtWindowToWidget(
-    Display*		/* display */,
-    Window 		/* window */
-);
-
-extern XtPointer XtGetClassExtension(
-    WidgetClass		/* object_class */,
-    Cardinal		/* byte_offset */,
-    XrmQuark		/* type */,
-    long		/* version */,
-    Cardinal		/* record_size */
-);
-
-/***************************************************************
- *
- * Arg lists
- *
- ****************************************************************/
-
-
-#define XtSetArg(arg, n, d) \
-    ((void)( (arg).name = (n), (arg).value = (XtArgVal)(d) ))
-
-extern ArgList XtMergeArgLists(
-    ArgList 		/* args1 */,
-    Cardinal 		/* num_args1 */,
-    ArgList 		/* args2 */,
-    Cardinal 		/* num_args2 */
-);
-
-/***************************************************************
- *
- * Vararg lists
- *
- ****************************************************************/
-
-#define XtVaNestedList  "XtVaNestedList"
-#define XtVaTypedArg    "XtVaTypedArg"
-
-extern XtVarArgsList XtVaCreateArgsList(
-    XtPointer		/*unused*/, ...
-) _X_SENTINEL(0);
-
-/*************************************************************
- *
- * Information routines
- *
- ************************************************************/
-
-#ifndef _XtIntrinsicP_h
-
-/* We're not included from the private file, so define these */
-
-extern Display *XtDisplay(
-    Widget 		/* widget */
-);
-
-extern Display *XtDisplayOfObject(
-    Widget 		/* object */
-);
-
-extern Screen *XtScreen(
-    Widget 		/* widget */
-);
-
-extern Screen *XtScreenOfObject(
-    Widget 		/* object */
-);
-
-extern Window XtWindow(
-    Widget 		/* widget */
-);
-
-extern Window XtWindowOfObject(
-    Widget 		/* object */
-);
-
-extern String XtName(
-    Widget 		/* object */
-);
-
-extern WidgetClass XtSuperclass(
-    Widget 		/* object */
-);
-
-extern WidgetClass XtClass(
-    Widget 		/* object */
-);
-
-extern Widget XtParent(
-    Widget 		/* widget */
-);
-
-#endif /*_XtIntrinsicP_h*/
-
-#undef XtMapWidget
-extern void XtMapWidget(Widget /* w */);
-#define XtMapWidget(widget)	XMapWindow(XtDisplay(widget), XtWindow(widget))
-
-#undef XtUnmapWidget
-extern void XtUnmapWidget(Widget /* w */);
-#define XtUnmapWidget(widget)	\
-		XUnmapWindow(XtDisplay(widget), XtWindow(widget))
-
-extern void XtAddCallback(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */,
-    XtCallbackProc 	/* callback */,
-    XtPointer 		/* closure */
-);
-
-extern void XtRemoveCallback(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */,
-    XtCallbackProc 	/* callback */,
-    XtPointer 		/* closure */
-);
-
-extern void XtAddCallbacks(
-    Widget 		/* widget */,
-    _Xconst _XtString	/* callback_name */,
-    XtCallbackList 	/* callbacks */
-);
-
-extern void XtRemoveCallbacks(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */,
-    XtCallbackList 	/* callbacks */
-);
-
-extern void XtRemoveAllCallbacks(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */
-);
-
-
-extern void XtCallCallbacks(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */,
-    XtPointer 		/* call_data */
-);
-
-extern void XtCallCallbackList(
-    Widget		/* widget */,
-    XtCallbackList 	/* callbacks */,
-    XtPointer 		/* call_data */
-);
-
-extern XtCallbackStatus XtHasCallbacks(
-    Widget 		/* widget */,
-    _Xconst _XtString 	/* callback_name */
-);
-
-/****************************************************************
- *
- * Geometry Management
- *
- ****************************************************************/
-
-
-extern XtGeometryResult XtMakeGeometryRequest(
-    Widget 		/* widget */,
-    XtWidgetGeometry*	/* request */,
-    XtWidgetGeometry*	/* reply_return */
-);
-
-extern XtGeometryResult XtQueryGeometry(
-    Widget 		/* widget */,
-    XtWidgetGeometry*	/* intended */,
-    XtWidgetGeometry*	/* preferred_return */
-);
-
-extern Widget XtCreatePopupShell(
-    _Xconst _XtString	/* name */,
-    WidgetClass 	/* widgetClass */,
-    Widget 		/* parent */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtVaCreatePopupShell(
-    _Xconst _XtString	/* name */,
-    WidgetClass		/* widgetClass */,
-    Widget		/* parent */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtPopup(
-    Widget 		/* popup_shell */,
-    XtGrabKind 		/* grab_kind */
-);
-
-extern void XtPopupSpringLoaded(
-    Widget 		/* popup_shell */
-);
-
-extern void XtCallbackNone(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    XtPointer 		/* call_data */
-);
-
-extern void XtCallbackNonexclusive(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    XtPointer 		/* call_data */
-);
-
-extern void XtCallbackExclusive(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    XtPointer 		/* call_data */
-);
-
-extern void XtPopdown(
-    Widget 		/* popup_shell */
-);
-
-extern void XtCallbackPopdown(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,
-    XtPointer 		/* call_data */
-);
-
-extern void XtMenuPopupAction(
-    Widget 		/* widget */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern Widget XtCreateWidget(
-    _Xconst _XtString 	/* name */,
-    WidgetClass 	/* widget_class */,
-    Widget 		/* parent */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtCreateManagedWidget(
-    _Xconst _XtString 	/* name */,
-    WidgetClass 	/* widget_class */,
-    Widget 		/* parent */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtVaCreateWidget(
-    _Xconst _XtString	/* name */,
-    WidgetClass		/* widget */,
-    Widget		/* parent */,
-    ...
-) _X_SENTINEL(0);
-
-extern Widget XtVaCreateManagedWidget(
-    _Xconst _XtString	/* name */,
-    WidgetClass		/* widget_class */,
-    Widget		/* parent */,
-    ...
-) _X_SENTINEL(0);
-
-extern Widget XtCreateApplicationShell( /* obsolete */
-    _Xconst _XtString 	/* name */,
-    WidgetClass 	/* widget_class */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtAppCreateShell(
-    _Xconst _XtString	/* application_name */,
-    _Xconst _XtString	/* application_class */,
-    WidgetClass 	/* widget_class */,
-    Display*		/* display */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtVaAppCreateShell(
-    _Xconst _XtString	/* application_name */,
-    _Xconst _XtString	/* application_class */,
-    WidgetClass		/* widget_class */,
-    Display*		/* display */,
-    ...
-) _X_SENTINEL(0);
-
-/****************************************************************
- *
- * Toolkit initialization
- *
- ****************************************************************/
-
-extern void XtToolkitInitialize(
-    void
-);
-
-extern XtLanguageProc XtSetLanguageProc(
-    XtAppContext	/* app_context */,
-    XtLanguageProc	/* proc */,
-    XtPointer		/* client_data */
-);
-
-extern void XtDisplayInitialize(
-    XtAppContext 	/* app_context */,
-    Display*		/* dpy */,
-    _Xconst _XtString	/* application_name */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescRec* 	/* options */,
-    Cardinal 		/* num_options */,
-    int*		/* argc */,
-    char**		/* argv */
-);
-
-extern Widget XtOpenApplication(
-    XtAppContext*	/* app_context_return */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescList 	/* options */,
-    Cardinal 		/* num_options */,
-    int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
-    String*		/* fallback_resources */,
-    WidgetClass		/* widget_class */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtVaOpenApplication(
-    XtAppContext*	/* app_context_return */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescList	/* options */,
-    Cardinal		/* num_options */,
-    int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
-    String*		/* fallback_resources */,
-    WidgetClass		/* widget_class */,
-    ...
-) _X_SENTINEL(0);
-
-extern Widget XtAppInitialize( /* obsolete */
-    XtAppContext*	/* app_context_return */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescList 	/* options */,
-    Cardinal 		/* num_options */,
-    int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
-    String*		/* fallback_resources */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern Widget XtVaAppInitialize( /* obsolete */
-    XtAppContext*	/* app_context_return */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescList	/* options */,
-    Cardinal		/* num_options */,
-    int*		/* argc_in_out */,
-    String*		/* argv_in_out */,
-    String*		/* fallback_resources */,
-    ...
-) _X_SENTINEL(0);
-
-extern Widget XtInitialize( /* obsolete */
-    _Xconst _XtString 	/* shell_name */,
-    _Xconst _XtString 	/* application_class */,
-    XrmOptionDescRec* 	/* options */,
-    Cardinal 		/* num_options */,
-    int*		/* argc */,
-    char**		/* argv */
-);
-
-extern Display *XtOpenDisplay(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString	/* display_string */,
-    _Xconst _XtString	/* application_name */,
-    _Xconst _XtString	/* application_class */,
-    XrmOptionDescRec*	/* options */,
-    Cardinal 		/* num_options */,
-    int*		/* argc */,
-    char**		/* argv */
-);
-
-extern XtAppContext XtCreateApplicationContext(
-    void
-);
-
-extern void XtAppSetFallbackResources(
-    XtAppContext 	/* app_context */,
-    String*		/* specification_list */
-);
-
-extern void XtDestroyApplicationContext(
-    XtAppContext 	/* app_context */
-);
-
-extern void XtInitializeWidgetClass(
-    WidgetClass 	/* widget_class */
-);
-
-extern XtAppContext XtWidgetToApplicationContext(
-    Widget 		/* widget */
-);
-
-extern XtAppContext XtDisplayToApplicationContext(
-    Display*		/* dpy */
-);
-
-extern XrmDatabase XtDatabase(
-    Display*		/* dpy */
-);
-
-extern XrmDatabase XtScreenDatabase(
-    Screen*		/* screen */
-);
-
-extern void XtCloseDisplay(
-    Display*		/* dpy */
-);
-
-extern void XtGetApplicationResources(
-    Widget 		/* widget */,
-    XtPointer 		/* base */,
-    XtResourceList 	/* resources */,
-    Cardinal 		/* num_resources */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaGetApplicationResources(
-    Widget		/* widget */,
-    XtPointer		/* base */,
-    XtResourceList	/* resources */,
-    Cardinal		/* num_resources */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtGetSubresources(
-    Widget 		/* widget */,
-    XtPointer 		/* base */,
-    _Xconst _XtString 	/* name */,
-    _Xconst _XtString 	/* class */,
-    XtResourceList 	/* resources */,
-    Cardinal 		/* num_resources */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaGetSubresources(
-    Widget		/* widget */,
-    XtPointer		/* base */,
-    _Xconst _XtString	/* name */,
-    _Xconst _XtString	/* class */,
-    XtResourceList	/* resources */,
-    Cardinal		/* num_resources */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtSetValues(
-    Widget 		/* widget */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaSetValues(
-    Widget		/* widget */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtGetValues(
-    Widget 		/* widget */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaGetValues(
-    Widget		/* widget */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtSetSubvalues(
-    XtPointer 		/* base */,
-    XtResourceList 	/* resources */,
-    Cardinal 		/* num_resources */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaSetSubvalues(
-    XtPointer		/* base */,
-    XtResourceList	/* resources */,
-    Cardinal		/* num_resources */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtGetSubvalues(
-    XtPointer 		/* base */,
-    XtResourceList 	/* resources */,
-    Cardinal 		/* num_resources */,
-    ArgList 		/* args */,
-    Cardinal 		/* num_args */
-);
-
-extern void XtVaGetSubvalues(
-    XtPointer		/* base */,
-    XtResourceList	/* resources */,
-    Cardinal		/* num_resources */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XtGetResourceList(
-    WidgetClass 	/* widget_class */,
-    XtResourceList*	/* resources_return */,
-    Cardinal*		/* num_resources_return */
-);
-
-extern void XtGetConstraintResourceList(
-    WidgetClass 	/* widget_class */,
-    XtResourceList*	/* resources_return */,
-    Cardinal*		/* num_resources_return */
-);
-
-#define XtUnspecifiedPixmap	((Pixmap)2)
-#define XtUnspecifiedShellInt	(-1)
-#define XtUnspecifiedWindow	((Window)2)
-#define XtUnspecifiedWindowGroup ((Window)3)
-#define XtCurrentDirectory	"XtCurrentDirectory"
-#define XtDefaultForeground	"XtDefaultForeground"
-#define XtDefaultBackground	"XtDefaultBackground"
-#define XtDefaultFont		"XtDefaultFont"
-#define XtDefaultFontSet	"XtDefaultFontSet"
-
-#define XtOffset(p_type,field) \
-	((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
-
-#ifdef offsetof
-#define XtOffsetOf(s_type,field) offsetof(s_type,field)
-#else
-#define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
-#endif
-
-/*************************************************************
- *
- * Session Management
- *
- ************************************************************/
-
-typedef struct _XtCheckpointTokenRec {
-    int		save_type;
-    int		interact_style;
-    Boolean	shutdown;
-    Boolean	fast;
-    Boolean	cancel_shutdown;
-    int		phase;
-    int		interact_dialog_type;	/* return */
-    Boolean	request_cancel;		/* return */
-    Boolean	request_next_phase;	/* return */
-    Boolean	save_success;		/* return */
-    int		type;		/* implementation private */
-    Widget	widget;		/* implementation private */
-} XtCheckpointTokenRec, *XtCheckpointToken;
-
-XtCheckpointToken XtSessionGetToken(
-    Widget		/* widget */
-);
-
-void XtSessionReturnToken(
-    XtCheckpointToken	/* token */
-);
-
-/*************************************************************
- *
- * Error Handling
- *
- ************************************************************/
-
-extern XtErrorMsgHandler XtAppSetErrorMsgHandler(
-    XtAppContext 	/* app_context */,
-    XtErrorMsgHandler 	/* handler */
-);
-
-extern void XtSetErrorMsgHandler( /* obsolete */
-    XtErrorMsgHandler 	/* handler */
-);
-
-extern XtErrorMsgHandler XtAppSetWarningMsgHandler(
-    XtAppContext 	/* app_context */,
-    XtErrorMsgHandler 	/* handler */
-);
-
-extern void XtSetWarningMsgHandler( /* obsolete */
-    XtErrorMsgHandler 	/* handler */
-);
-
-extern void XtAppErrorMsg(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString 	/* name */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* class */,
-    _Xconst _XtString	/* default */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern void XtErrorMsg( /* obsolete */
-    _Xconst _XtString 	/* name */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* class */,
-    _Xconst _XtString	/* default */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern void XtAppWarningMsg(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString 	/* name */,
-    _Xconst _XtString 	/* type */,
-    _Xconst _XtString 	/* class */,
-    _Xconst _XtString 	/* default */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern void XtWarningMsg( /* obsolete */
-    _Xconst _XtString	/* name */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* class */,
-    _Xconst _XtString	/* default */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern XtErrorHandler XtAppSetErrorHandler(
-    XtAppContext 	/* app_context */,
-    XtErrorHandler 	/* handler */
-);
-
-extern void XtSetErrorHandler( /* obsolete */
-    XtErrorHandler 	/* handler */
-);
-
-extern XtErrorHandler XtAppSetWarningHandler(
-    XtAppContext 	/* app_context */,
-    XtErrorHandler 	/* handler */
-);
-
-extern void XtSetWarningHandler( /* obsolete */
-    XtErrorHandler 	/* handler */
-);
-
-extern void XtAppError(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString	/* message */
-);
-
-extern void XtError( /* obsolete */
-    _Xconst _XtString	/* message */
-);
-
-extern void XtAppWarning(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString	/* message */
-);
-
-extern void XtWarning( /* obsolete */
-    _Xconst _XtString	/* message */
-);
-
-extern XrmDatabase *XtAppGetErrorDatabase(
-    XtAppContext 	/* app_context */
-);
-
-extern XrmDatabase *XtGetErrorDatabase( /* obsolete */
-    void
-);
-
-extern void XtAppGetErrorDatabaseText(
-    XtAppContext 	/* app_context */,
-    _Xconst _XtString	/* name */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* class */,
-    _Xconst _XtString 	/* default */,
-    String 		/* buffer_return */,
-    int 		/* nbytes */,
-    XrmDatabase 	/* database */
-);
-
-extern void XtGetErrorDatabaseText( /* obsolete */
-    _Xconst _XtString	/* name */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* class */,
-    _Xconst _XtString 	/* default */,
-    String 		/* buffer_return */,
-    int 		/* nbytes */
-);
-
-/****************************************************************
- *
- * Memory Management
- *
- ****************************************************************/
-
-extern char *XtMalloc(
-    Cardinal 		/* size */
-);
-
-extern char *XtCalloc(
-    Cardinal		/* num */,
-    Cardinal 		/* size */
-);
-
-extern char *XtRealloc(
-    char* 		/* ptr */,
-    Cardinal 		/* num */
-);
-
-extern void XtFree(
-    char*		/* ptr */
-);
-
-#ifndef _X_RESTRICT_KYWD
-# define _X_RESTRICT_KYWD
-#endif
-extern Cardinal XtAsprintf(
-    String *new_string,
-    _Xconst char * _X_RESTRICT_KYWD format,
-    ...
-) _X_ATTRIBUTE_PRINTF(2,3);
-
-#ifdef XTTRACEMEMORY
-
-extern char *_XtMalloc( /* implementation-private */
-    Cardinal	/* size */,
-    char *	/* file */,
-    int	        /* line */
-);
-
-extern char *_XtRealloc( /* implementation-private */
-    char *	/* ptr */,
-    Cardinal    /* size */,
-    char *	/* file */,
-    int		/* line */
-);
-
-extern char *_XtCalloc( /* implementation-private */
-    Cardinal	/* num */,
-    Cardinal 	/* size */,
-    char *	/* file */,
-    int		/* line */
-);
-
-extern void _XtFree( /* implementation-private */
-    char *	/* ptr */
-);
-
-#define XtMalloc(size) _XtMalloc(size, __FILE__, __LINE__)
-#define XtRealloc(ptr,size) _XtRealloc(ptr, size, __FILE__, __LINE__)
-#define XtCalloc(num,size) _XtCalloc(num, size, __FILE__, __LINE__)
-#define XtFree(ptr) _XtFree(ptr)
-
-#endif /* ifdef XTTRACEMEMORY */
-
-#define XtNew(type) ((type *) XtMalloc((unsigned) sizeof(type)))
-
-#undef XtNewString
-extern String XtNewString(String /* str */);
-#define XtNewString(str) \
-    ((str) != NULL ? (strcpy(XtMalloc((unsigned)strlen(str) + 1), str)) : NULL)
-
-/*************************************************************
- *
- *  Work procs
- *
- **************************************************************/
-
-extern XtWorkProcId XtAddWorkProc( /* obsolete */
-    XtWorkProc 		/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern XtWorkProcId XtAppAddWorkProc(
-    XtAppContext 	/* app_context */,
-    XtWorkProc 		/* proc */,
-    XtPointer 		/* closure */
-);
-
-extern void  XtRemoveWorkProc(
-    XtWorkProcId 	/* id */
-);
-
-
-/****************************************************************
- *
- * Graphic Context Management
- *****************************************************************/
-
-extern GC XtGetGC(
-    Widget 		/* widget */,
-    XtGCMask 		/* valueMask */,
-    XGCValues* 		/* values */
-);
-
-extern GC XtAllocateGC(
-    Widget 		/* widget */,
-    Cardinal		/* depth */,
-    XtGCMask 		/* valueMask */,
-    XGCValues* 		/* values */,
-    XtGCMask		/* dynamicMask */,
-    XtGCMask		/* unusedMask */
-);
-
-/* This implementation of XtDestroyGC differs from the formal specification
- * for historic backwards compatibility reasons.  As other implementations
- * may conform to the spec, use of XtReleaseGC is strongly encouraged.
- */
-extern void XtDestroyGC( /* obsolete */
-    GC 			/* gc */
-);
-
-extern void XtReleaseGC(
-    Widget 		/* object */,
-    GC 			/* gc */
-);
-
-
-
-extern void XtAppReleaseCacheRefs(
-    XtAppContext	/* app_context */,
-    XtCacheRef*		/* cache_ref */
-);
-
-extern void XtCallbackReleaseCacheRef(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,	/* XtCacheRef */
-    XtPointer 		/* call_data */
-);
-
-extern void XtCallbackReleaseCacheRefList(
-    Widget 		/* widget */,
-    XtPointer 		/* closure */,	/* XtCacheRef* */
-    XtPointer 		/* call_data */
-);
-
-extern void XtSetWMColormapWindows(
-    Widget 		/* widget */,
-    Widget*		/* list */,
-    Cardinal		/* count */
-);
-
-extern String XtFindFile(
-    _Xconst _XtString	/* path */,
-    Substitution	/* substitutions */,
-    Cardinal 		/* num_substitutions */,
-    XtFilePredicate	/* predicate */
-);
-
-extern String XtResolvePathname(
-    Display*		/* dpy */,
-    _Xconst _XtString	/* type */,
-    _Xconst _XtString	/* filename */,
-    _Xconst _XtString	/* suffix */,
-    _Xconst _XtString	/* path */,
-    Substitution	/* substitutions */,
-    Cardinal		/* num_substitutions */,
-    XtFilePredicate 	/* predicate */
-);
-
-/****************************************************************
- *
- * Selections
- *
- *****************************************************************/
-
-#define XT_CONVERT_FAIL (Atom)0x80000001
-
-extern void XtDisownSelection(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Time 		/* time */
-);
-
-extern void XtGetSelectionValue(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Atom 		/* target */,
-    XtSelectionCallbackProc /* callback */,
-    XtPointer 		/* closure */,
-    Time 		/* time */
-);
-
-extern void XtGetSelectionValues(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Atom*		/* targets */,
-    int 		/* count */,
-    XtSelectionCallbackProc /* callback */,
-    XtPointer*		/* closures */,
-    Time 		/* time */
-);
-
-extern void XtAppSetSelectionTimeout(
-    XtAppContext 	/* app_context */,
-    unsigned long 	/* timeout */
-);
-
-extern void XtSetSelectionTimeout( /* obsolete */
-    unsigned long 	/* timeout */
-);
-
-extern unsigned long XtAppGetSelectionTimeout(
-    XtAppContext 	/* app_context */
-);
-
-extern unsigned long XtGetSelectionTimeout( /* obsolete */
-    void
-);
-
-extern XSelectionRequestEvent *XtGetSelectionRequest(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    XtRequestId 	/* request_id */
-);
-
-extern void XtGetSelectionValueIncremental(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Atom 		/* target */,
-    XtSelectionCallbackProc /* selection_callback */,
-    XtPointer 		/* client_data */,
-    Time 		/* time */
-);
-
-extern void XtGetSelectionValuesIncremental(
-    Widget 		/* widget */,
-    Atom 		/* selection */,
-    Atom*		/* targets */,
-    int 		/* count */,
-    XtSelectionCallbackProc /* callback */,
-    XtPointer*		/* client_data */,
-    Time 		/* time */
-);
-
-extern void XtSetSelectionParameters(
-    Widget		/* requestor */,
-    Atom		/* selection */,
-    Atom		/* type */,
-    XtPointer		/* value */,
-    unsigned long	/* length */,
-    int			/* format */
-);
-
-extern void XtGetSelectionParameters(
-    Widget		/* owner */,
-    Atom		/* selection */,
-    XtRequestId		/* request_id */,
-    Atom*		/* type_return */,
-    XtPointer*		/* value_return */,
-    unsigned long*	/* length_return */,
-    int*		/* format_return */
-);
-
-extern void XtCreateSelectionRequest(
-    Widget		/* requestor */,
-    Atom		/* selection */
-);
-
-extern void XtSendSelectionRequest(
-    Widget		/* requestor */,
-    Atom		/* selection */,
-    Time		/* time */
-);
-
-extern void XtCancelSelectionRequest(
-    Widget		/* requestor */,
-    Atom		/* selection */
-);
-
-extern Atom XtReservePropertyAtom(
-    Widget		/* widget */
-);
-
-extern void XtReleasePropertyAtom(
-    Widget		/* widget */,
-    Atom		/* selection */
-);
-
-extern void XtGrabKey(
-    Widget 		/* widget */,
-    _XtKeyCode 		/* keycode */,
-    Modifiers	 	/* modifiers */,
-    _XtBoolean 		/* owner_events */,
-    int 		/* pointer_mode */,
-    int 		/* keyboard_mode */
-);
-
-extern void XtUngrabKey(
-    Widget 		/* widget */,
-    _XtKeyCode 		/* keycode */,
-    Modifiers	 	/* modifiers */
-);
-
-extern int XtGrabKeyboard(
-    Widget 		/* widget */,
-    _XtBoolean 		/* owner_events */,
-    int 		/* pointer_mode */,
-    int 		/* keyboard_mode */,
-    Time 		/* time */
-);
-
-extern void XtUngrabKeyboard(
-    Widget 		/* widget */,
-    Time 		/* time */
-);
-
-extern void XtGrabButton(
-    Widget 		/* widget */,
-    int 		/* button */,
-    Modifiers	 	/* modifiers */,
-    _XtBoolean 		/* owner_events */,
-    unsigned int	/* event_mask */,
-    int 		/* pointer_mode */,
-    int 		/* keyboard_mode */,
-    Window 		/* confine_to */,
-    Cursor 		/* cursor */
-);
-
-extern void XtUngrabButton(
-    Widget 		/* widget */,
-    unsigned int	/* button */,
-    Modifiers	 	/* modifiers */
-);
-
-extern int XtGrabPointer(
-    Widget 		/* widget */,
-    _XtBoolean 		/* owner_events */,
-    unsigned int	/* event_mask */,
-    int 		/* pointer_mode */,
-    int 		/* keyboard_mode */,
-    Window 		/* confine_to */,
-    Cursor 		/* cursor */,
-    Time 		/* time */
-);
-
-extern void XtUngrabPointer(
-    Widget 		/* widget */,
-    Time 		/* time */
-);
-
-extern void XtGetApplicationNameAndClass(
-    Display*		/* dpy */,
-    String*		/* name_return */,
-    String*		/* class_return */
-);
-
-extern void XtRegisterDrawable(
-    Display*		/* dpy */,
-    Drawable		/* drawable */,
-    Widget		/* widget */
-);
-
-extern void XtUnregisterDrawable(
-    Display*		/* dpy */,
-    Drawable		/* drawable */
-);
-
-extern Widget XtHooksOfDisplay(
-    Display*		/* dpy */
-);
-
-typedef struct {
-    String type;
-    Widget widget;
-    ArgList args;
-    Cardinal num_args;
-} XtCreateHookDataRec, *XtCreateHookData;
-
-typedef struct {
-    String type;
-    Widget widget;
-    XtPointer event_data;
-    Cardinal num_event_data;
-} XtChangeHookDataRec, *XtChangeHookData;
-
-typedef struct {
-    Widget old, req;
-    ArgList args;
-    Cardinal num_args;
-} XtChangeHookSetValuesDataRec, *XtChangeHookSetValuesData;
-
-typedef struct {
-    String type;
-    Widget widget;
-    XtGeometryMask changeMask;
-    XWindowChanges changes;
-} XtConfigureHookDataRec, *XtConfigureHookData;
-
-typedef struct {
-    String type;
-    Widget widget;
-    XtWidgetGeometry* request;
-    XtWidgetGeometry* reply;
-    XtGeometryResult result;
-} XtGeometryHookDataRec, *XtGeometryHookData;
-
-typedef struct {
-    String type;
-    Widget widget;
-} XtDestroyHookDataRec, *XtDestroyHookData;
-
-extern void XtGetDisplays(
-    XtAppContext	/* app_context */,
-    Display***		/* dpy_return */,
-    Cardinal*		/* num_dpy_return */
-);
-
-extern Boolean XtToolkitThreadInitialize(
-    void
-);
-
-extern void XtAppSetExitFlag(
-    XtAppContext	/* app_context */
-);
-
-extern Boolean XtAppGetExitFlag(
-    XtAppContext	/* app_context */
-);
-
-extern void XtAppLock(
-    XtAppContext	/* app_context */
-);
-
-extern void XtAppUnlock(
-    XtAppContext	/* app_context */
-);
-
-/*
- *	Predefined Resource Converters
- */
-
-
-/* String converters */
-
-extern Boolean XtCvtStringToAcceleratorTable(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToAtom(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Display */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToBool(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToBoolean(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToCommandArgArray(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToCursor(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Display */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToDimension(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToDirectoryString(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToDisplay(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToFile(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToFloat(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToFont(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Display */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToFontSet(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Display, locale */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToFontStruct(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Display */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToGravity(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToInitialState(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToInt(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToPixel(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Screen, Colormap */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-#define XtCvtStringToPosition XtCvtStringToShort
-
-extern Boolean XtCvtStringToRestartStyle(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToShort(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToTranslationTable(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToUnsignedChar(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtStringToVisual(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Screen, depth */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-/* int converters */
-
-extern Boolean XtCvtIntToBool(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToBoolean(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToColor(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* Screen, Colormap */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-#define XtCvtIntToDimension XtCvtIntToShort
-
-extern Boolean XtCvtIntToFloat(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToFont(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToPixel(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToPixmap(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-#define XtCvtIntToPosition XtCvtIntToShort
-
-extern Boolean XtCvtIntToShort(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-extern Boolean XtCvtIntToUnsignedChar(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-/* Color converter */
-
-extern Boolean XtCvtColorToPixel(
-    Display*	/* dpy */,
-    XrmValuePtr /* args */,	/* none */
-    Cardinal*   /* num_args */,
-    XrmValuePtr	/* fromVal */,
-    XrmValuePtr	/* toVal */,
-    XtPointer*	/* closure_ret */
-);
-
-/* Pixel converter */
-
-#define XtCvtPixelToColor XtCvtIntToColor
-
-
-_XFUNCPROTOEND
-
-#endif /*_XtIntrinsic_h*/
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/IntrinsicI.h b/openflow/usr/include/X11/IntrinsicI.h
deleted file mode 100644
index 845ab48..0000000
--- a/openflow/usr/include/X11/IntrinsicI.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtintrinsicI_h
-#define _XtintrinsicI_h
-
-#include "Xtos.h"
-#include "IntrinsicP.h"
-#ifdef WIN32
-#define _WILLWINSOCK_
-#endif
-#include <X11/Xos.h>
-
-#include "Object.h"
-#include "RectObj.h"
-#include "ObjectP.h"
-#include "RectObjP.h"
-
-#include "ConvertI.h"
-#include "TranslateI.h"
-
-#define RectObjClassFlag	0x02
-#define WidgetClassFlag		0x04
-#define CompositeClassFlag	0x08
-#define ConstraintClassFlag	0x10
-#define ShellClassFlag		0x20
-#define WMShellClassFlag	0x40
-#define TopLevelClassFlag	0x80
-
-/*
- * The following macros, though very handy, are not suitable for
- * IntrinsicP.h as they violate the rule that arguments are to
- * be evaluated exactly once.
- */
-
-#define XtDisplayOfObject(object) \
-    (XtIsWidget(object) ? (object)->core.screen->display : \
-    _XtIsHookObject(object) ? ((HookObject)(object))->hooks.screen->display : \
-    _XtWindowedAncestor(object)->core.screen->display)
-
-#define XtScreenOfObject(object) \
-    (XtIsWidget(object) ? (object)->core.screen : \
-    _XtIsHookObject(object) ? ((HookObject)(object))->hooks.screen : \
-    _XtWindowedAncestor(object)->core.screen)
-
-#define XtWindowOfObject(object) \
-    ((XtIsWidget(object) ? (object) : _XtWindowedAncestor(object)) \
-     ->core.window)
-
-#define XtIsManaged(object) \
-    (XtIsRectObj(object) ? (object)->core.managed : False)
-
-#define XtIsSensitive(object) \
-    (XtIsRectObj(object) ? ((object)->core.sensitive && \
-			    (object)->core.ancestor_sensitive) : False)
-
-
-/****************************************************************
- *
- * Byte utilities
- *
- ****************************************************************/
-
-#define _XBCOPYFUNC _XtBcopy
-#include <X11/Xfuncs.h>
-
-#define XtMemmove(dst, src, size)	\
-    if ((char *)(dst) != (char *)(src)) {		    \
-	(void) memcpy((char *) (dst), (char *) (src), (int) (size)); \
-    }
-
-#define XtBZero(dst, size) 	\
-	bzero((char *) (dst), (int) (size))
-
-#define XtMemcmp(b1, b2, size) 		\
-	memcmp((char *) (b1), (char *) (b2), (int) (size))
-
-
-/****************************************************************
- *
- * Stack cache allocation/free
- *
- ****************************************************************/
-
-#define XtStackAlloc(size, stack_cache_array)     \
-    ((size) <= sizeof(stack_cache_array)	  \
-    ?  (XtPointer)(stack_cache_array)		  \
-    :  XtMalloc((unsigned)(size)))
-
-#define XtStackFree(pointer, stack_cache_array) \
-    { if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); }
-
-/***************************************************************
- *
- * Filename defines
- *
- **************************************************************/
-
-/* used by XtResolvePathname */
-#ifndef XFILESEARCHPATHDEFAULT
-#define XFILESEARCHPATHDEFAULT "/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
-#endif
-
-/* the following two were both "X Toolkit " prior to R4 */
-#ifndef XTERROR_PREFIX
-#define XTERROR_PREFIX ""
-#endif
-
-#ifndef XTWARNING_PREFIX
-#define XTWARNING_PREFIX ""
-#endif
-
-#ifndef ERRORDB
-#define ERRORDB "/usr/lib/X11/XtErrorDB"
-#endif
-
-_XFUNCPROTOBEGIN
-
-extern String XtCXtToolkitError;
-
-extern void _XtAllocError(
-    String	/* alloc_type */
-);
-
-extern void _XtCompileResourceList(
-    XtResourceList 	/* resources */,
-    Cardinal 		/* num_resources */
-);
-
-extern XtGeometryResult _XtMakeGeometryRequest(
-    Widget 		/* widget */,
-    XtWidgetGeometry*	/* request */,
-    XtWidgetGeometry*	/* reply_return */,
-    Boolean*		/* clear_rect_obj */
-);
-
-extern Boolean _XtIsHookObject(
-    Widget      /* widget */
-);
-
-extern void _XtAddShellToHookObj(
-    Widget      /* widget */
-);
-
-/* GCManager.c */
-extern void _XtGClistFree(Display *dpy, XtPerDisplay pd);
-
-/** GeoTattler stuff */
-
-#ifdef XT_GEO_TATTLER
-
-extern void _XtGeoTab (int);
-extern void _XtGeoTrace (
-			    Widget widget,
-			    ...
-) _X_ATTRIBUTE_PRINTF(2,3);
-
-#define CALLGEOTAT(f) f
-
-#else /* XT_GEO_TATTLER */
-
-#define CALLGEOTAT(f)
-
-#endif /* XT_GEO_TATTLER */
-
-#ifndef XTTRACEMEMORY
-
-extern char* __XtMalloc (
-    unsigned	/* size */
-);
-extern char* __XtCalloc (
-    unsigned	/* num */,
-    unsigned	/* size */
-);
-
-#else
-
-#define __XtMalloc XtMalloc
-#define __XtCalloc XtCalloc
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XtintrinsicI_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/IntrinsicP.h b/openflow/usr/include/X11/IntrinsicP.h
deleted file mode 100644
index f2ded6f..0000000
--- a/openflow/usr/include/X11/IntrinsicP.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtintrinsicP_h
-#define _XtintrinsicP_h
-
-#include <X11/Intrinsic.h>
-
-/*
- * Field sizes and offsets of XrmResource must match those of XtResource.
- * Type long is used instead of XrmQuark here because XrmQuark and String
- * are not the same size on all systems.
- */
-typedef struct {
-    long	xrm_name;	  /* Resource name quark		*/
-    long	xrm_class;	  /* Resource class quark		*/
-    long	xrm_type;	  /* Resource representation type quark */
-    Cardinal	xrm_size;	  /* Size in bytes of representation	*/
-    int		xrm_offset;	  /* -offset-1				*/
-    long	xrm_default_type; /* Default representation type quark	*/
-    XtPointer	xrm_default_addr; /* Default resource address		*/
-} XrmResource, *XrmResourceList;
-
-typedef unsigned long XtVersionType;
-
-#define XT_VERSION 11
-#ifndef XT_REVISION
-#define XT_REVISION 6
-#endif
-#define XtVersion (XT_VERSION * 1000 + XT_REVISION)
-#define XtVersionDontCheck 0
-
-typedef void (*XtProc)(
-    void
-);
-
-typedef void (*XtWidgetClassProc)(
-    WidgetClass /* class */
-);
-
-typedef void (*XtWidgetProc)(
-    Widget	/* widget */
-);
-
-typedef Boolean (*XtAcceptFocusProc)(
-    Widget	/* widget */,
-    Time*	/* time */
-);
-
-typedef void (*XtArgsProc)(
-    Widget	/* widget */,
-    ArgList	/* args */,
-    Cardinal*	/* num_args */
-);
-
-typedef void (*XtInitProc)(
-    Widget	/* request */,
-    Widget	/* new */,
-    ArgList	/* args */,
-    Cardinal*	/* num_args */
-);
-
-typedef Boolean (*XtSetValuesFunc)(
-    Widget 	/* old */,
-    Widget 	/* request */,
-    Widget 	/* new */,
-    ArgList 	/* args */,
-    Cardinal*	/* num_args */
-);
-
-typedef Boolean (*XtArgsFunc)(
-    Widget	/* widget */,
-    ArgList	/* args */,
-    Cardinal*	/* num_args */
-);
-
-typedef void (*XtAlmostProc)(
-    Widget		/* old */,
-    Widget		/* new */,
-    XtWidgetGeometry*	/* request */,
-    XtWidgetGeometry*	/* reply */
-);
-
-typedef void (*XtExposeProc)(
-    Widget	/* widget */,
-    XEvent*	/* event */,
-    Region	/* region */
-);
-
-/* compress_exposure options*/
-#define XtExposeNoCompress		((XtEnum)False)
-#define XtExposeCompressSeries		((XtEnum)True)
-#define XtExposeCompressMultiple	2
-#define XtExposeCompressMaximal		3
-
-/* modifiers */
-#define XtExposeGraphicsExpose	  	0x10
-#define XtExposeGraphicsExposeMerged	0x20
-#define XtExposeNoExpose	  	0x40
-#define XtExposeNoRegion		0x80
-
-typedef void (*XtRealizeProc)(
-    Widget 		  /* widget */,
-    XtValueMask* 	  /* mask */,
-    XSetWindowAttributes* /* attributes */
-);
-
-typedef XtGeometryResult (*XtGeometryHandler)(
-    Widget		/* widget */,
-    XtWidgetGeometry*	/* request */,
-    XtWidgetGeometry*	/* reply */
-);
-
-typedef void (*XtStringProc)(
-    Widget	/* widget */,
-    String	/* str */
-);
-
-typedef struct {
-    String	name;	/* resource name */
-    String	type;	/* representation type name */
-    XtArgVal	value;	/* representation */
-    int		size;	/* size of representation */
-} XtTypedArg, *XtTypedArgList;
-
-typedef void (*XtAllocateProc)(
-    WidgetClass		/* widget_class */,
-    Cardinal *		/* constraint_size */,
-    Cardinal *		/* more_bytes */,
-    ArgList		/* args */,
-    Cardinal *		/* num_args */,
-    XtTypedArgList	/* typed_args */,
-    Cardinal *		/* num_typed_args */,
-    Widget *		/* widget_return */,
-    XtPointer *		/* more_bytes_return */
-);
-
-typedef void (*XtDeallocateProc)(
-    Widget		/* widget */,
-    XtPointer		/* more_bytes */
-);
-
-struct _XtStateRec;	/* Forward declare before use for C++ */
-
-typedef struct _XtTMRec {
-    XtTranslations  translations;	/* private to Translation Manager    */
-    XtBoundActions  proc_table;		/* procedure bindings for actions    */
-    struct _XtStateRec *current_state;  /* Translation Manager state ptr     */
-    unsigned long   lastEventTime;
-} XtTMRec, *XtTM;
-
-#include <X11/CoreP.h>
-#include <X11/CompositeP.h>
-#include <X11/ConstrainP.h>
-#include <X11/ObjectP.h>
-#include <X11/RectObjP.h>
-
-#define XtDisplay(widget)	DisplayOfScreen((widget)->core.screen)
-#define XtScreen(widget)	((widget)->core.screen)
-#define XtWindow(widget)	((widget)->core.window)
-
-#define XtClass(widget)		((widget)->core.widget_class)
-#define XtSuperclass(widget)	(XtClass(widget)->core_class.superclass)
-#define XtIsRealized(object)	(XtWindowOfObject(object) != None)
-#define XtParent(widget)	((widget)->core.parent)
-
-#undef XtIsRectObj
-extern Boolean XtIsRectObj(Widget);
-#define XtIsRectObj(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x02)
-
-#undef XtIsWidget
-extern Boolean XtIsWidget(Widget);
-#define XtIsWidget(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x04)
-
-#undef XtIsComposite
-extern Boolean XtIsComposite(Widget);
-#define XtIsComposite(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x08)
-
-#undef XtIsConstraint
-extern Boolean XtIsConstraint(Widget);
-#define XtIsConstraint(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x10)
-
-#undef XtIsShell
-extern Boolean XtIsShell(Widget);
-#define XtIsShell(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x20)
-
-#undef XtIsWMShell
-extern Boolean XtIsWMShell(Widget);
-#define XtIsWMShell(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x40)
-
-#undef XtIsTopLevelShell
-extern Boolean XtIsTopLevelShell(Widget);
-#define XtIsTopLevelShell(obj) \
-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x80)
-
-#ifdef DEBUG
-#define XtCheckSubclass(w, widget_class_ptr, message)	\
-	if (!XtIsSubclass(((Widget)(w)), (widget_class_ptr))) {	\
-	    String params[3];				\
-	    Cardinal num_params = 3;			\
-	    params[0] = ((Widget)(w))->core.widget_class->core_class.class_name;\
-	    params[1] = (widget_class_ptr)->core_class.class_name;	     \
-	    params[2] = (message);					     \
-	    XtAppErrorMsg(XtWidgetToApplicationContext((Widget)(w)),	     \
-		    "subclassMismatch", "xtCheckSubclass", "XtToolkitError", \
-		    "Widget class %s found when subclass of %s expected: %s",\
-		    params, &num_params);		\
-	}
-#else
-#define XtCheckSubclass(w, widget_class, message)	/* nothing */
-#endif
-
-_XFUNCPROTOBEGIN
-
-extern Widget _XtWindowedAncestor( /* internal; implementation-dependent */
-    Widget 		/* object */
-);
-
-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(LIBXT_COMPILATION)
-__declspec(dllimport)
-#else
-extern
-#endif
-void _XtInherit(
-    void
-);
-
-extern void _XtHandleFocus(
-    Widget		/* widget */,
-    XtPointer		/* client_data */,
-    XEvent *		/* event */,
-    Boolean *		/* cont */);
-
-extern void XtCreateWindow(
-    Widget 		/* widget */,
-    unsigned int 	/* window_class */,
-    Visual*		/* visual */,
-    XtValueMask		/* value_mask */,
-    XSetWindowAttributes* /* attributes */
-);
-
-extern void XtResizeWidget(
-    Widget 		/* widget */,
-    _XtDimension	/* width */,
-    _XtDimension	/* height */,
-    _XtDimension	/* border_width */
-);
-
-extern void XtMoveWidget(
-    Widget 		/* widget */,
-    _XtPosition		/* x */,
-    _XtPosition		/* y */
-);
-
-extern void XtConfigureWidget(
-    Widget 		/* widget */,
-    _XtPosition		/* x */,
-    _XtPosition		/* y */,
-    _XtDimension	/* width */,
-    _XtDimension	/* height */,
-    _XtDimension	/* border_width */
-);
-
-extern void XtResizeWindow(
-    Widget 		/* widget */
-);
-
-extern void XtProcessLock(
-    void
-);
-
-extern void XtProcessUnlock(
-    void
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XtIntrinsicP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/Object.h b/openflow/usr/include/X11/Object.h
deleted file mode 100644
index 4be1f39..0000000
--- a/openflow/usr/include/X11/Object.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtObject_h
-#define _XtObject_h
-
-_XFUNCPROTOBEGIN
-
-typedef struct _ObjectRec *Object;
-typedef struct _ObjectClassRec *ObjectClass;
-
-#ifndef VMS
-externalref WidgetClass objectClass;
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XtObject_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/ObjectP.h b/openflow/usr/include/X11/ObjectP.h
deleted file mode 100644
index 6e296f7..0000000
--- a/openflow/usr/include/X11/ObjectP.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _Xt_ObjectP_h_
-#define _Xt_ObjectP_h_
-
-#include <X11/Object.h>
-
-_XFUNCPROTOBEGIN
-
-/**********************************************************
- * Object Instance Data Structures
- *
- **********************************************************/
-/* these fields match CorePart and can not be changed */
-
-typedef struct _ObjectPart {
-    Widget          self;               /* pointer to widget itself          */
-    WidgetClass     widget_class;       /* pointer to Widget's ClassRec      */
-    Widget          parent;             /* parent widget                     */
-    XrmName         xrm_name;           /* widget resource name quarkified   */
-    Boolean         being_destroyed;    /* marked for destroy                */
-    XtCallbackList  destroy_callbacks;  /* who to call when widget destroyed */
-    XtPointer       constraints;        /* constraint record                 */
-} ObjectPart;
-
-typedef struct _ObjectRec {
-    ObjectPart  object;
-} ObjectRec;
-
-/********************************************************
- * Object Class Data Structures
- *
- ********************************************************/
-/* these fields match CoreClassPart and can not be changed */
-/* ideally these structures would only contain the fields required;
-   but because the CoreClassPart cannot be changed at this late date
-   extraneous fields are necessary to make the field offsets match */
-
-typedef struct _ObjectClassPart {
-
-    WidgetClass     superclass;         /* pointer to superclass ClassRec   */
-    String          class_name;         /* widget resource class name       */
-    Cardinal        widget_size;        /* size in bytes of widget record   */
-    XtProc          class_initialize;   /* class initialization proc        */
-    XtWidgetClassProc class_part_initialize; /* dynamic initialization      */
-    XtEnum          class_inited;       /* has class been initialized?      */
-    XtInitProc      initialize;         /* initialize subclass fields       */
-    XtArgsProc      initialize_hook;    /* notify that initialize called    */
-    XtProc          obj1;		/* NULL                             */
-    XtPointer       obj2;               /* NULL                             */
-    Cardinal        obj3;               /* NULL                             */
-    XtResourceList  resources;          /* resources for subclass fields    */
-    Cardinal        num_resources;      /* number of entries in resources   */
-    XrmClass        xrm_class;          /* resource class quarkified        */
-    Boolean         obj4;               /* NULL                             */
-    XtEnum          obj5;               /* NULL                             */
-    Boolean         obj6;               /* NULL				    */
-    Boolean         obj7;               /* NULL                             */
-    XtWidgetProc    destroy;            /* free data for subclass pointers  */
-    XtProc          obj8;               /* NULL                             */
-    XtProc          obj9;               /* NULL			            */
-    XtSetValuesFunc set_values;         /* set subclass resource values     */
-    XtArgsFunc      set_values_hook;    /* notify that set_values called    */
-    XtProc          obj10;              /* NULL                             */
-    XtArgsProc      get_values_hook;    /* notify that get_values called    */
-    XtProc          obj11;              /* NULL                             */
-    XtVersionType   version;            /* version of intrinsics used       */
-    XtPointer       callback_private;   /* list of callback offsets         */
-    String          obj12;              /* NULL                             */
-    XtProc          obj13;              /* NULL                             */
-    XtProc          obj14;              /* NULL                             */
-    XtPointer       extension;          /* pointer to extension record      */
-}ObjectClassPart;
-
-typedef struct {
-    XtPointer next_extension;	/* 1st 4 required for all extension records */
-    XrmQuark record_type;	/* NULLQUARK; when on ObjectClassPart */
-    long version;		/* must be XtObjectExtensionVersion */
-    Cardinal record_size;	/* sizeof(ObjectClassExtensionRec) */
-    XtAllocateProc allocate;
-    XtDeallocateProc deallocate;
-} ObjectClassExtensionRec, *ObjectClassExtension;
-
-typedef struct _ObjectClassRec {
-    ObjectClassPart object_class;
-} ObjectClassRec;
-
-externalref ObjectClassRec objectClassRec;
-
-_XFUNCPROTOEND
-
-#define XtObjectExtensionVersion 1L
-#define XtInheritAllocate ((XtAllocateProc) _XtInherit)
-#define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)
-
-#endif /*_Xt_ObjectP_h_*/
diff --git a/openflow/usr/include/X11/PassivGraI.h b/openflow/usr/include/X11/PassivGraI.h
deleted file mode 100644
index 6b8cb52..0000000
--- a/openflow/usr/include/X11/PassivGraI.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/********************************************************
-
-Copyright 1988 by Hewlett-Packard Company
-Copyright 1987, 1988, 1989 by Digital Equipment Corporation, Maynard
-
-Permission to use, copy, modify, and distribute this software
-and its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that copyright notice and this permission
-notice appear in supporting documentation, and that the names of
-Hewlett-Packard or Digital not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-********************************************************/
-
-/*
-
-Copyright 1987, 1988, 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#ifndef _PDI_h_
-#define _PDI_h_
-
-
-#define KEYBOARD TRUE
-#define POINTER  FALSE
-
-_XFUNCPROTOBEGIN
-
-typedef enum {
-    XtNoServerGrab,
-    XtPassiveServerGrab,
-    XtActiveServerGrab,
-    XtPseudoPassiveServerGrab,
-    XtPseudoActiveServerGrab
-}XtServerGrabType;
-
-typedef struct _XtServerGrabRec {
-    struct _XtServerGrabRec 	*next;
-    Widget			widget;
-    unsigned int		ownerEvents:1;
-    unsigned int		pointerMode:1;
-    unsigned int		keyboardMode:1;
-    unsigned int		hasExt:1;
-    unsigned int		confineToIsWidgetWin:1;
-    KeyCode			keybut;
-    unsigned short		modifiers;
-    unsigned short		eventMask;
-} XtServerGrabRec, *XtServerGrabPtr;
-
-typedef struct _XtGrabExtRec {
-    Mask			*pKeyButMask;
-    Mask			*pModifiersMask;
-    Window			confineTo;
-    Cursor			cursor;
-} XtServerGrabExtRec, *XtServerGrabExtPtr;
-
-#define GRABEXT(p) ((XtServerGrabExtPtr)((p)+1))
-
-typedef struct _XtDeviceRec{
-    XtServerGrabRec	grab; 	/* need copy in order to protect
-				   during grab */
-    XtServerGrabType	grabType;
-}XtDeviceRec, *XtDevice;
-
-#define XtMyAncestor	0
-#define XtMyDescendant	1
-#define XtMyCousin	2
-#define XtMySelf	3
-#define XtUnrelated	4
-typedef char XtGeneology; /* do not use an enum makes PerWidgetInput larger */
-
-typedef struct {
-    Widget		focusKid;
-    XtServerGrabPtr	keyList, ptrList;
-    Widget		queryEventDescendant;
-    unsigned int	map_handler_added:1;
-    unsigned int	realize_handler_added:1;
-    unsigned int	active_handler_added:1;
-    unsigned int	haveFocus:1;
-    XtGeneology		focalPoint;
-}XtPerWidgetInputRec, *XtPerWidgetInput;
-
-typedef struct XtPerDisplayInputRec{
-    XtGrabList 	grabList;
-    XtDeviceRec keyboard, pointer;
-    KeyCode	activatingKey;
-    Widget 	*trace;
-    int		traceDepth, traceMax;
-    Widget 	focusWidget;
-}XtPerDisplayInputRec, *XtPerDisplayInput;
-
-#define IsServerGrab(g) ((g == XtPassiveServerGrab) ||\
-			 (g == XtActiveServerGrab))
-
-#define IsAnyGrab(g) ((g == XtPassiveServerGrab) ||\
-		      (g == XtActiveServerGrab)  ||\
-		      (g == XtPseudoPassiveServerGrab))
-
-#define IsEitherPassiveGrab(g) ((g == XtPassiveServerGrab) ||\
-				(g == XtPseudoPassiveServerGrab))
-
-#define IsPseudoGrab(g) ((g == XtPseudoPassiveServerGrab))
-
-extern void _XtDestroyServerGrabs(
-    Widget		/* w */,
-    XtPointer		/* pwi */, /*XtPerWidgetInput*/
-    XtPointer		/* call_data */
-);
-
-extern XtPerWidgetInput _XtGetPerWidgetInput(
-    Widget	/* widget */,
-    _XtBoolean	/* create */
-);
-
-extern XtServerGrabPtr _XtCheckServerGrabsOnWidget(
-    XEvent*		/* event */,
-    Widget		/* widget */,
-    _XtBoolean		/* isKeyboard */
-);
-
-/*
-extern XtGrabList* _XtGetGrabList( XtPerDisplayInput );
-*/
-
-#define _XtGetGrabList(pdi) (&(pdi)->grabList)
-
-extern void _XtFreePerWidgetInput(
-    Widget		/* w */,
-    XtPerWidgetInput	/* pwi */
-);
-
-extern Widget _XtProcessKeyboardEvent(
-    XKeyEvent*		/* event */,
-    Widget		/* widget */,
-    XtPerDisplayInput	/* pdi */
-);
-
-extern Widget _XtProcessPointerEvent(
-    XButtonEvent*	/* event */,
-    Widget		/* widget */,
-    XtPerDisplayInput	/* pdi */
-);
-
-extern void _XtRegisterPassiveGrabs(
-    Widget		/* widget */
-);
-
-extern void _XtClearAncestorCache(
-    Widget		/* widget */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _PDI_h_ */
diff --git a/openflow/usr/include/X11/RectObj.h b/openflow/usr/include/X11/RectObj.h
deleted file mode 100644
index fba883a..0000000
--- a/openflow/usr/include/X11/RectObj.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtRect_h
-#define _XtRect_h
-
-_XFUNCPROTOBEGIN
-
-typedef struct _RectObjRec *RectObj;
-typedef struct _RectObjClassRec *RectObjClass;
-
-#ifndef VMS
-externalref WidgetClass rectObjClass;
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XtRect_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/RectObjP.h b/openflow/usr/include/X11/RectObjP.h
deleted file mode 100644
index bb5a7d3..0000000
--- a/openflow/usr/include/X11/RectObjP.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _Xt_RectObjP_h_
-#define _Xt_RectObjP_h_
-
-#include <X11/RectObj.h>
-#include <X11/ObjectP.h>
-
-_XFUNCPROTOBEGIN
-
-/**********************************************************
- * Rectangle Object Instance Data Structures
- *
- **********************************************************/
-/* these fields match CorePart and can not be changed */
-
-typedef struct _RectObjPart {
-    Position        x, y;               /* rectangle position               */
-    Dimension       width, height;      /* rectangle dimensions             */
-    Dimension       border_width;       /* rectangle border width           */
-    Boolean         managed;            /* is widget geometry managed?       */
-    Boolean         sensitive;          /* is widget sensitive to user events*/
-    Boolean         ancestor_sensitive; /* are all ancestors sensitive?      */
-}RectObjPart;
-
-typedef struct _RectObjRec {
-    ObjectPart object;
-    RectObjPart rectangle;
-} RectObjRec;
-
-
-
-/********************************************************
- * Rectangle Object Class Data Structures
- *
- ********************************************************/
-/* these fields match CoreClassPart and can not be changed */
-/* ideally these structures would only contain the fields required;
-   but because the CoreClassPart cannot be changed at this late date
-   extraneous fields are necessary to make the field offsets match */
-
-typedef struct _RectObjClassPart {
-
-    WidgetClass     superclass;         /* pointer to superclass ClassRec   */
-    String          class_name;         /* widget resource class name       */
-    Cardinal        widget_size;        /* size in bytes of widget record   */
-    XtProc          class_initialize;   /* class initialization proc        */
-    XtWidgetClassProc class_part_initialize; /* dynamic initialization      */
-    XtEnum          class_inited;       /* has class been initialized?      */
-    XtInitProc      initialize;         /* initialize subclass fields       */
-    XtArgsProc      initialize_hook;    /* notify that initialize called    */
-    XtProc          rect1;		/* NULL                             */
-    XtPointer       rect2;              /* NULL                             */
-    Cardinal        rect3;              /* NULL                             */
-    XtResourceList  resources;          /* resources for subclass fields    */
-    Cardinal        num_resources;      /* number of entries in resources   */
-    XrmClass        xrm_class;          /* resource class quarkified        */
-    Boolean         rect4;              /* NULL                             */
-    XtEnum          rect5;              /* NULL                             */
-    Boolean         rect6;              /* NULL				    */
-    Boolean         rect7;              /* NULL                             */
-    XtWidgetProc    destroy;            /* free data for subclass pointers  */
-    XtWidgetProc    resize;             /* geom manager changed widget size */
-    XtExposeProc    expose;             /* rediplay rectangle               */
-    XtSetValuesFunc set_values;         /* set subclass resource values     */
-    XtArgsFunc      set_values_hook;    /* notify that set_values called    */
-    XtAlmostProc    set_values_almost;  /* set values almost for geometry   */
-    XtArgsProc      get_values_hook;    /* notify that get_values called    */
-    XtProc          rect9;              /* NULL                             */
-    XtVersionType   version;            /* version of intrinsics used       */
-    XtPointer       callback_private;   /* list of callback offsets         */
-    String          rect10;             /* NULL                             */
-    XtGeometryHandler query_geometry;   /* return preferred geometry        */
-    XtProc          rect11;             /* NULL                             */
-    XtPointer       extension;          /* pointer to extension record      */
-} RectObjClassPart;
-
-typedef struct _RectObjClassRec {
-    RectObjClassPart rect_class;
-} RectObjClassRec;
-
-externalref RectObjClassRec rectObjClassRec;
-
-_XFUNCPROTOEND
-
-#endif /*_Xt_RectObjP_h_*/
diff --git a/openflow/usr/include/X11/ResConfigP.h b/openflow/usr/include/X11/ResConfigP.h
deleted file mode 100644
index 1e1d85a..0000000
--- a/openflow/usr/include/X11/ResConfigP.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/*****************************************************************
-
-(C) COPYRIGHT International Business Machines Corp. 1992,1997
-    All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE IBM CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the IBM Corporation shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from the IBM
-Corporation.
-
-******************************************************************/
-
-#ifndef _RESCONFIGP_H
-#define _RESCONFIGP_H
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-/*
- * Atom names for resource configuration management customization tool.
- */
-#define RCM_DATA "Custom Data"
-#define RCM_INIT "Custom Init"
-
-extern void _XtResourceConfigurationEH(
-	Widget 		/* w */,
-	XtPointer 	/* client_data */,
-	XEvent * 	/* event */
-);
-
-_XFUNCPROTOEND
-
-#endif
diff --git a/openflow/usr/include/X11/ResourceI.h b/openflow/usr/include/X11/ResourceI.h
deleted file mode 100644
index 4533f06..0000000
--- a/openflow/usr/include/X11/ResourceI.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/****************************************************************
- *
- * Resources
- *
- ****************************************************************/
-
-#ifndef _XtresourceI_h
-#define _XtresourceI_h
-
-#define StringToQuark(string) XrmStringToQuark(string)
-#define StringToName(string) XrmStringToName(string)
-#define StringToClass(string) XrmStringToClass(string)
-
-_XFUNCPROTOBEGIN
-
-extern void _XtDependencies(
-    XtResourceList  * /* class_resp */,
-    Cardinal	    * /* class_num_resp */,
-    XrmResourceList * /* super_res */,
-    Cardinal	     /* super_num_res */,
-    Cardinal	     /* super_widget_size */);
-
-extern void _XtResourceDependencies(
-    WidgetClass  /* wc */
-);
-
-extern void _XtConstraintResDependencies(
-    ConstraintWidgetClass  /* wc */
-);
-
-extern XtCacheRef* _XtGetResources(
-    Widget	    /* w */,
-    ArgList	    /* args */,
-    Cardinal	    /* num_args */,
-    XtTypedArgList  /* typed_args */,
-    Cardinal*	    /* num_typed_args */
-);
-
-extern void _XtCopyFromParent(
-    Widget		/* widget */,
-    int			/* offset */,
-    XrmValue*		/* value */
-);
-
-extern void _XtCopyToArg(char *src, XtArgVal *dst, unsigned int size);
-extern void _XtCopyFromArg(XtArgVal src, char *dst, unsigned int size);
-extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
-						  Cardinal num_resources);
-extern void _XtResourceListInitialize(void);
-
-_XFUNCPROTOEND
-
-#endif /* _XtresourceI_h */
diff --git a/openflow/usr/include/X11/SM/SM.h b/openflow/usr/include/X11/SM/SM.h
deleted file mode 100644
index 1af5ae8..0000000
--- a/openflow/usr/include/X11/SM/SM.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/*
- * Author: Ralph Mor, X Consortium
- */
-
-#ifndef _SM_H_
-#define _SM_H_
-
-/*
- * Protocol Version
- */
-
-#define SmProtoMajor	1
-#define SmProtoMinor	0
-
-
-/*
- * Interact Style
- */
-
-#define SmInteractStyleNone	0
-#define SmInteractStyleErrors	1
-#define SmInteractStyleAny	2
-
-
-/*
- * Dialog Type
- */
-
-#define SmDialogError		0
-#define SmDialogNormal		1
-
-
-/*
- * Save Type
- */
-
-#define SmSaveGlobal	0
-#define SmSaveLocal	1
-#define SmSaveBoth	2
-
-
-/*
- * Restart Style Hints
- */
-
-#define SmRestartIfRunning	0
-#define SmRestartAnyway		1
-#define SmRestartImmediately	2
-#define SmRestartNever		3
-
-
-/*
- * Property names
- */
-
-#define SmCloneCommand		"CloneCommand"
-#define SmCurrentDirectory	"CurrentDirectory"
-#define SmDiscardCommand	"DiscardCommand"
-#define SmEnvironment		"Environment"
-#define SmProcessID		"ProcessID"
-#define SmProgram		"Program"
-#define SmRestartCommand	"RestartCommand"
-#define SmResignCommand		"ResignCommand"
-#define SmRestartStyleHint	"RestartStyleHint"
-#define SmShutdownCommand	"ShutdownCommand"
-#define SmUserID		"UserID"
-
-
-/*
- * Property types
- */
-
-#define SmCARD8			"CARD8"
-#define SmARRAY8		"ARRAY8"
-#define SmLISTofARRAY8		"LISTofARRAY8"
-
-
-/*
- * SM minor opcodes
- */
-
-#define SM_Error			0
-#define SM_RegisterClient 		1
-#define SM_RegisterClientReply 		2
-#define SM_SaveYourself 		3
-#define SM_SaveYourselfRequest 		4
-#define SM_InteractRequest 		5
-#define SM_Interact 			6
-#define SM_InteractDone 		7
-#define SM_SaveYourselfDone 		8
-#define SM_Die 				9
-#define SM_ShutdownCancelled		10
-#define SM_CloseConnection 		11
-#define SM_SetProperties 		12
-#define SM_DeleteProperties 		13
-#define SM_GetProperties 		14
-#define SM_PropertiesReply 		15
-#define SM_SaveYourselfPhase2Request	16
-#define SM_SaveYourselfPhase2		17
-#define SM_SaveComplete			18
-
-#endif /* _SM_H_ */
diff --git a/openflow/usr/include/X11/SM/SMlib.h b/openflow/usr/include/X11/SM/SMlib.h
deleted file mode 100644
index b88ddc0..0000000
--- a/openflow/usr/include/X11/SM/SMlib.h
+++ /dev/null
@@ -1,543 +0,0 @@
-/*
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/*
- * Author: Ralph Mor, X Consortium
- */
-
-#ifndef _SMLIB_H_
-#define _SMLIB_H_
-
-#include <X11/SM/SM.h>
-#include <X11/ICE/ICElib.h>
-
-
-/*
- * Generic SM pointer
- */
-
-typedef IcePointer SmPointer;
-
-
-/*
- * Connection objects.  Defined in SMlibint.h
- */
-
-typedef struct _SmcConn *SmcConn;
-typedef struct _SmsConn *SmsConn;
-
-
-/*
- * Session Management property
- */
-
-typedef struct {
-    int		length;		/* length (in bytes) of the value */
-    SmPointer   value;		/* the value */
-} SmPropValue;
-
-typedef struct {
-    char	*name;		/* name of property */
-    char	*type;		/* type of property */
-    int		num_vals;	/* number of values in property */
-    SmPropValue *vals;		/* the values */
-} SmProp;
-
-
-
-/*
- * SmcCloseConnection status return
- */
-
-typedef enum {
-    SmcClosedNow,
-    SmcClosedASAP,
-    SmcConnectionInUse
-} SmcCloseStatus;
-
-
-
-/*
- * Client callbacks
- */
-
-typedef void (*SmcSaveYourselfProc) (
-    SmcConn		/* smcConn */,
-    SmPointer		/* clientData */,
-    int  		/* saveType */,
-    Bool		/* shutdown */,
-    int			/* interactStyle */,
-    Bool		/* fast */
-);
-
-typedef void (*SmcSaveYourselfPhase2Proc) (
-    SmcConn		/* smcConn */,
-    SmPointer		/* clientData */
-);
-
-typedef void (*SmcInteractProc) (
-    SmcConn		/* smcConn */,
-    SmPointer		/* clientData */
-);
-
-typedef void (*SmcDieProc) (
-    SmcConn		/* smcConn */,
-    SmPointer		/* clientData */
-);
-
-typedef void (*SmcShutdownCancelledProc) (
-    SmcConn		/* smcConn */,
-    SmPointer		/* clientData */
-);
-
-typedef void (*SmcSaveCompleteProc) (
-    SmcConn		/* smcConn */,
-    SmPointer		/* clientData */
-);
-
-typedef void (*SmcPropReplyProc) (
-    SmcConn		/* smcConn */,
-    SmPointer		/* clientData */,
-    int			/* numProps */,
-    SmProp **		/* props */
-);
-
-
-/*
- * Callbacks set up at SmcOpenConnection time
- */
-
-typedef struct {
-
-    struct {
-	SmcSaveYourselfProc	 callback;
-	SmPointer		 client_data;
-    } save_yourself;
-
-    struct {
-	SmcDieProc		 callback;
-	SmPointer		 client_data;
-    } die;
-
-    struct {
-	SmcSaveCompleteProc	 callback;
-	SmPointer		 client_data;
-    } save_complete;
-
-    struct {
-	SmcShutdownCancelledProc callback;
-	SmPointer		 client_data;
-    } shutdown_cancelled;
-
-} SmcCallbacks;
-
-#define SmcSaveYourselfProcMask		(1L << 0)
-#define SmcDieProcMask			(1L << 1)
-#define SmcSaveCompleteProcMask		(1L << 2)
-#define SmcShutdownCancelledProcMask	(1L << 3)
-
-
-
-/*
- * Session manager callbacks
- */
-
-typedef Status (*SmsRegisterClientProc) (
-    SmsConn 		/* smsConn */,
-    SmPointer		/* managerData */,
-    char *		/* previousId */
-);
-
-typedef void (*SmsInteractRequestProc) (
-    SmsConn		/* smsConn */,
-    SmPointer		/* managerData */,
-    int			/* dialogType */
-);
-
-typedef void (*SmsInteractDoneProc) (
-    SmsConn		/* smsConn */,
-    SmPointer		/* managerData */,
-    Bool		/* cancelShutdown */
-);
-
-typedef void (*SmsSaveYourselfRequestProc) (
-    SmsConn		/* smsConn */,
-    SmPointer		/* managerData */,
-    int  		/* saveType */,
-    Bool		/* shutdown */,
-    int			/* interactStyle */,
-    Bool		/* fast */,
-    Bool		/* global */
-);
-
-typedef void (*SmsSaveYourselfPhase2RequestProc) (
-    SmsConn		/* smsConn */,
-    SmPointer		/* managerData */
-);
-
-typedef void (*SmsSaveYourselfDoneProc) (
-    SmsConn		/* smsConn */,
-    SmPointer		/* managerData */,
-    Bool		/* success */
-);
-
-typedef void (*SmsCloseConnectionProc) (
-    SmsConn		/* smsConn */,
-    SmPointer		/* managerData */,
-    int			/* count */,
-    char **		/* reasonMsgs */
-);
-
-typedef void (*SmsSetPropertiesProc) (
-    SmsConn		/* smsConn */,
-    SmPointer		/* managerData */,
-    int			/* numProps */,
-    SmProp **		/* props */
-);
-
-typedef void (*SmsDeletePropertiesProc) (
-    SmsConn		/* smsConn */,
-    SmPointer		/* managerData */,
-    int			/* numProps */,
-    char **		/* propNames */
-);
-
-typedef void (*SmsGetPropertiesProc) (
-    SmsConn		/* smsConn */,
-    SmPointer		/* managerData */
-);
-
-
-/*
- * Callbacks set up by a session manager when a new client connects.
- */
-
-typedef struct {
-
-    struct {
-	SmsRegisterClientProc	callback;
-	SmPointer		manager_data;
-    } register_client;
-
-    struct {
-	SmsInteractRequestProc	callback;
-	SmPointer		manager_data;
-    } interact_request;
-
-    struct {
-	SmsInteractDoneProc	callback;
-	SmPointer		manager_data;
-    } interact_done;
-
-    struct {
-	SmsSaveYourselfRequestProc	callback;
-	SmPointer			manager_data;
-    } save_yourself_request;
-
-    struct {
-	SmsSaveYourselfPhase2RequestProc	callback;
-	SmPointer				manager_data;
-    } save_yourself_phase2_request;
-
-    struct {
-	SmsSaveYourselfDoneProc	callback;
-	SmPointer		manager_data;
-    } save_yourself_done;
-
-    struct {
-	SmsCloseConnectionProc	callback;
-	SmPointer		manager_data;
-    } close_connection;
-
-    struct {
-	SmsSetPropertiesProc	callback;
-	SmPointer		manager_data;
-    } set_properties;
-
-    struct {
-	SmsDeletePropertiesProc	callback;
-	SmPointer		manager_data;
-    } delete_properties;
-
-    struct {
-	SmsGetPropertiesProc	callback;
-	SmPointer		manager_data;
-    } get_properties;
-
-} SmsCallbacks;
-
-
-#define SmsRegisterClientProcMask		(1L << 0)
-#define SmsInteractRequestProcMask		(1L << 1)
-#define SmsInteractDoneProcMask			(1L << 2)
-#define SmsSaveYourselfRequestProcMask  	(1L << 3)
-#define SmsSaveYourselfP2RequestProcMask	(1L << 4)
-#define SmsSaveYourselfDoneProcMask		(1L << 5)
-#define SmsCloseConnectionProcMask		(1L << 6)
-#define SmsSetPropertiesProcMask		(1L << 7)
-#define SmsDeletePropertiesProcMask		(1L << 8)
-#define SmsGetPropertiesProcMask		(1L << 9)
-
-
-
-typedef Status (*SmsNewClientProc) (
-    SmsConn 		/* smsConn */,
-    SmPointer		/* managerData */,
-    unsigned long *	/* maskRet */,
-    SmsCallbacks *	/* callbacksRet */,
-    char **		/* failureReasonRet */
-);
-
-
-
-/*
- * Error handlers
- */
-
-typedef void (*SmcErrorHandler) (
-    SmcConn		/* smcConn */,
-    Bool		/* swap */,
-    int			/* offendingMinorOpcode */,
-    unsigned long 	/* offendingSequence */,
-    int 		/* errorClass */,
-    int			/* severity */,
-    SmPointer		/* values */
-);
-
-typedef void (*SmsErrorHandler) (
-    SmsConn		/* smsConn */,
-    Bool		/* swap */,
-    int			/* offendingMinorOpcode */,
-    unsigned long 	/* offendingSequence */,
-    int 		/* errorClass */,
-    int			/* severity */,
-    SmPointer		/* values */
-);
-
-
-
-/*
- * Function Prototypes
- */
-
-_XFUNCPROTOBEGIN
-
-extern SmcConn SmcOpenConnection (
-    char *		/* networkIdsList */,
-    SmPointer		/* context */,
-    int			/* xsmpMajorRev */,
-    int			/* xsmpMinorRev */,
-    unsigned long	/* mask */,
-    SmcCallbacks *	/* callbacks */,
-    const char *	/* previousId */,
-    char **		/* clientIdRet */,
-    int			/* errorLength */,
-    char *		/* errorStringRet */
-);
-
-extern SmcCloseStatus SmcCloseConnection (
-    SmcConn		/* smcConn */,
-    int			/* count */,
-    char **		/* reasonMsgs */
-);
-
-extern void SmcModifyCallbacks (
-    SmcConn		/* smcConn */,
-    unsigned long	/* mask */,
-    SmcCallbacks *	/* callbacks */
-);
-
-extern void SmcSetProperties (
-    SmcConn		/* smcConn */,
-    int      	        /* numProps */,
-    SmProp **		/* props */
-);
-
-extern void SmcDeleteProperties (
-    SmcConn		/* smcConn */,
-    int      	        /* numProps */,
-    char **		/* propNames */
-);
-
-extern Status SmcGetProperties (
-    SmcConn		/* smcConn */,
-    SmcPropReplyProc	/* propReplyProc */,
-    SmPointer		/* clientData */
-);
-
-extern Status SmcInteractRequest (
-    SmcConn		/* smcConn */,
-    int			/* dialogType */,
-    SmcInteractProc	/* interactProc */,
-    SmPointer		/* clientData */
-);
-
-extern void SmcInteractDone (
-    SmcConn		/* smcConn */,
-    Bool 		/* cancelShutdown */
-);
-
-extern void SmcRequestSaveYourself (
-    SmcConn		/* smcConn */,
-    int			/* saveType */,
-    Bool 		/* shutdown */,
-    int			/* interactStyle */,
-    Bool		/* fast */,
-    Bool		/* global */
-);
-
-extern Status SmcRequestSaveYourselfPhase2 (
-    SmcConn			/* smcConn */,
-    SmcSaveYourselfPhase2Proc	/* saveYourselfPhase2Proc */,
-    SmPointer			/* clientData */
-);
-
-extern void SmcSaveYourselfDone (
-    SmcConn		/* smcConn */,
-    Bool		/* success */
-);
-
-extern int SmcProtocolVersion (
-    SmcConn		/* smcConn */
-);
-
-extern int SmcProtocolRevision (
-    SmcConn		/* smcConn */
-);
-
-extern char *SmcVendor (
-    SmcConn		/* smcConn */
-);
-
-extern char *SmcRelease (
-    SmcConn		/* smcConn */
-);
-
-extern char *SmcClientID (
-    SmcConn		/* smcConn */
-);
-
-extern IceConn SmcGetIceConnection (
-    SmcConn		/* smcConn */
-);
-
-extern Status SmsInitialize (
-    const char *		/* vendor */,
-    const char *		/* release */,
-    SmsNewClientProc		/* newClientProc */,
-    SmPointer			/* managerData */,
-    IceHostBasedAuthProc	/* hostBasedAuthProc */,
-    int				/* errorLength */,
-    char *			/* errorStringRet */
-);
-
-extern char *SmsClientHostName (
-    SmsConn		/* smsConn */
-);
-
-extern char *SmsGenerateClientID (
-    SmsConn		/* smsConn */
-);
-
-extern Status SmsRegisterClientReply (
-    SmsConn		/* smsConn */,
-    char *		/* clientId */
-);
-
-extern void SmsSaveYourself (
-    SmsConn		/* smsConn */,
-    int			/* saveType */,
-    Bool 		/* shutdown */,
-    int			/* interactStyle */,
-    Bool		/* fast */
-);
-
-extern void SmsSaveYourselfPhase2 (
-    SmsConn		/* smsConn */
-);
-
-extern void SmsInteract (
-    SmsConn		/* smsConn */
-);
-
-extern void SmsDie (
-    SmsConn		/* smsConn */
-);
-
-extern void SmsSaveComplete (
-    SmsConn		/* smsConn */
-);
-
-extern void SmsShutdownCancelled (
-    SmsConn		/* smsConn */
-);
-
-extern void SmsReturnProperties (
-    SmsConn		/* smsConn */,
-    int			/* numProps */,
-    SmProp **		/* props */
-);
-
-extern void SmsCleanUp (
-    SmsConn		/* smsConn */
-);
-
-extern int SmsProtocolVersion (
-    SmsConn		/* smsConn */
-);
-
-extern int SmsProtocolRevision (
-    SmsConn		/* smsConn */
-);
-
-extern char *SmsClientID (
-    SmsConn		/* smsConn */
-);
-
-extern IceConn SmsGetIceConnection (
-    SmsConn		/* smsConn */
-);
-
-extern SmcErrorHandler SmcSetErrorHandler (
-    SmcErrorHandler 	/* handler */
-);
-
-extern SmsErrorHandler SmsSetErrorHandler (
-    SmsErrorHandler 	/* handler */
-);
-
-extern void SmFreeProperty (
-    SmProp *		/* prop */
-);
-
-extern void SmFreeReasons (
-    int			/* count */,
-    char **		/* reasonMsgs */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _SMLIB_H_ */
diff --git a/openflow/usr/include/X11/SM/SMproto.h b/openflow/usr/include/X11/SM/SMproto.h
deleted file mode 100644
index 228e0ce..0000000
--- a/openflow/usr/include/X11/SM/SMproto.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/*
- * Author: Ralph Mor, X Consortium
- */
-
-#ifndef _SMPROTO_H_
-#define _SMPROTO_H_
-
-#include <X11/Xmd.h>
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-    /* n	ARRAY8		previousId */
-} smRegisterClientMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-    /* n	ARRAY8		clientId */
-} smRegisterClientReplyMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused1[2];
-    CARD32	length B32;
-    CARD8	saveType;
-    CARD8	shutdown;
-    CARD8	interactStyle;
-    CARD8	fast;
-    CARD8	unused2[4];
-} smSaveYourselfMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused1[2];
-    CARD32	length B32;
-    CARD8	saveType;
-    CARD8	shutdown;
-    CARD8	interactStyle;
-    CARD8	fast;
-    CARD8	global;
-    CARD8	unused2[3];
-} smSaveYourselfRequestMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	dialogType;
-    CARD8	unused;
-    CARD32	length B32;
-} smInteractRequestMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-} smInteractMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	cancelShutdown;
-    CARD8	unused;
-    CARD32	length B32;
-} smInteractDoneMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8       success;
-    CARD8	unused;
-    CARD32	length B32;
-} smSaveYourselfDoneMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-} smDieMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-} smShutdownCancelledMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-    /* b	LISTofARRAY8	reasons */
-} smCloseConnectionMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-    /* a	LISTofPROPERTY	properties */
-} smSetPropertiesMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-    /* a	LISTofARRAY8	property names */
-} smDeletePropertiesMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-} smGetPropertiesMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-    /* a	LISTofPROPERTY	properties */
-} smPropertiesReplyMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-} smSaveYourselfPhase2RequestMsg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-} smSaveYourselfPhase2Msg;
-
-typedef struct {
-    CARD8	majorOpcode;
-    CARD8	minorOpcode;
-    CARD8	unused[2];
-    CARD32	length B32;
-} smSaveCompleteMsg;
-
-
-/*
- * SIZEOF values.  These better be multiples of 8.
- */
-
-#define sz_smRegisterClientMsg 			8
-#define sz_smRegisterClientReplyMsg 		8
-#define sz_smSaveYourselfMsg 			16
-#define sz_smSaveYourselfRequestMsg		16
-#define sz_smInteractRequestMsg 		8
-#define sz_smInteractMsg 			8
-#define sz_smInteractDoneMsg 			8
-#define sz_smSaveYourselfDoneMsg 		8
-#define sz_smDieMsg 				8
-#define sz_smShutdownCancelledMsg 		8
-#define sz_smCloseConnectionMsg 		8
-#define sz_smSetPropertiesMsg 			8
-#define sz_smDeletePropertiesMsg 		8
-#define sz_smGetPropertiesMsg 			8
-#define sz_smPropertiesReplyMsg 		8
-#define sz_smSaveYourselfPhase2RequestMsg	8
-#define sz_smSaveYourselfPhase2Msg 		8
-#define sz_smSaveCompleteMsg 			8
-
-#endif /* _SMPROTO_H_ */
diff --git a/openflow/usr/include/X11/SelectionI.h b/openflow/usr/include/X11/SelectionI.h
deleted file mode 100644
index 7f39b87..0000000
--- a/openflow/usr/include/X11/SelectionI.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtselectionI_h
-#define _XtselectionI_h
-
-#include "Intrinsic.h"
-
-typedef struct _RequestRec *Request;
-typedef struct _SelectRec *Select;
-
-typedef struct _RequestRec {
-   Select ctx;		      /* logical owner */
-   Widget widget;	      /* widget actually receiving Selection events */
-   Window requestor;
-   Atom property;
-   Atom target;
-   Atom type;
-   int format;
-   XtPointer value;
-   unsigned long bytelength;
-   unsigned long offset;
-   XtIntervalId timeout;
-   XSelectionRequestEvent event; /* for XtGetSelectionRequest */
-   Boolean allSent;
-} RequestRec;
-
-typedef struct {
-  Atom prop;
-  Boolean avail;
-} SelectionPropRec, *SelectionProp;
-
-typedef struct {
-  Display *dpy;
-  Atom incr_atom, indirect_atom, timestamp_atom;
-  int propCount;
-  SelectionProp list;
-} PropListRec, *PropList;
-
-typedef struct _SelectRec {
-    Atom selection; 			/* constant */
-    Display *dpy; 			/* constant */
-    Widget widget;
-    Time time;
-    unsigned long serial;
-    XtConvertSelectionProc convert;
-    XtLoseSelectionProc loses;
-    XtSelectionDoneProc notify;
-    XtCancelConvertSelectionProc owner_cancel;
-    XtPointer owner_closure;
-    PropList prop_list;
-    Request req;			/* state for local non-incr xfer */
-    int ref_count;			/* of active transfers */
-    unsigned int incremental:1;
-    unsigned int free_when_done:1;
-    unsigned int was_disowned:1;
-} SelectRec;
-
-typedef struct _ParamRec {
-    Atom selection;
-    Atom param;
-} ParamRec, *Param;
-
-typedef struct _ParamInfoRec {
-    unsigned int count;
-    Param paramlist;
-} ParamInfoRec, *ParamInfo;
-
-typedef struct _QueuedRequestRec {
-    Atom selection;
-    Atom target;
-    Atom param;
-    XtSelectionCallbackProc callback;
-    XtPointer closure;
-    Time time;
-    Boolean incremental;
-} QueuedRequestRec, *QueuedRequest;
-
-typedef struct _QueuedRequestInfoRec {
-    int count;
-    Atom *selections;
-    QueuedRequest *requests;
-} QueuedRequestInfoRec, *QueuedRequestInfo;
-
-typedef struct {
-    XtSelectionCallbackProc *callbacks;
-    XtPointer *req_closure;
-    Atom property;
-    Atom *target;
-    Atom type;
-    int format;
-    char *value;
-    int bytelength;
-    int offset;
-    XtIntervalId timeout;
-    XtEventHandler proc;
-    Widget widget;
-    Time time;
-    Select ctx;
-    Boolean *incremental;
-    int current;
-} CallBackInfoRec, *CallBackInfo;
-
-typedef struct {
-  Atom target;
-  Atom property;
-} IndirectPair;
-
-#define IndirectPairWordSize 2
-
-typedef struct {
-  int active_transfer_count;
-} RequestWindowRec;
-
-#define MAX_SELECTION_INCR(dpy) (((65536 < XMaxRequestSize(dpy)) ? \
-	(65536 << 2)  : (XMaxRequestSize(dpy) << 2))-100)
-
-#define MATCH_SELECT(event, info) ((event->time == info->time) && \
-	    (event->requestor == XtWindow(info->widget)) && \
-	    (event->selection == info->ctx->selection) && \
-	    (event->target == *info->target))
-
-#endif /* _XtselectionI_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/Shell.h b/openflow/usr/include/X11/Shell.h
deleted file mode 100644
index 97e605a..0000000
--- a/openflow/usr/include/X11/Shell.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtShell_h
-#define _XtShell_h
-
-#include <X11/SM/SMlib.h>
-#include <X11/Intrinsic.h>
-
-/***********************************************************************
- *
- * Shell Widget
- *
- ***********************************************************************/
-/*
- * Shell-specific resources names, classes, and a representation type.
- */
-
-#ifndef XTSTRINGDEFINES
-#define _XtShell_h_Const const
-#endif
-
-/* $Xorg: makestrs.c,v 1.6 2001/02/09 02:03:17 xorgcvs Exp $ */
-/* This file is automatically generated. */
-/* Default ABI version -- Do not edit */
-#ifdef XTSTRINGDEFINES
-#define XtNiconName "iconName"
-#define XtCIconName "IconName"
-#define XtNiconPixmap "iconPixmap"
-#define XtCIconPixmap "IconPixmap"
-#define XtNiconWindow "iconWindow"
-#define XtCIconWindow "IconWindow"
-#define XtNiconMask "iconMask"
-#define XtCIconMask "IconMask"
-#define XtNwindowGroup "windowGroup"
-#define XtCWindowGroup "WindowGroup"
-#define XtNvisual "visual"
-#define XtCVisual "Visual"
-#define XtNtitleEncoding "titleEncoding"
-#define XtCTitleEncoding "TitleEncoding"
-#define XtNsaveUnder "saveUnder"
-#define XtCSaveUnder "SaveUnder"
-#define XtNtransient "transient"
-#define XtCTransient "Transient"
-#define XtNoverrideRedirect "overrideRedirect"
-#define XtCOverrideRedirect "OverrideRedirect"
-#define XtNtransientFor "transientFor"
-#define XtCTransientFor "TransientFor"
-#define XtNiconNameEncoding "iconNameEncoding"
-#define XtCIconNameEncoding "IconNameEncoding"
-#define XtNallowShellResize "allowShellResize"
-#define XtCAllowShellResize "AllowShellResize"
-#define XtNcreatePopupChildProc "createPopupChildProc"
-#define XtCCreatePopupChildProc "CreatePopupChildProc"
-#define XtNtitle "title"
-#define XtCTitle "Title"
-#ifndef XtRAtom
-#define XtRAtom "Atom"
-#endif
-#define XtNargc "argc"
-#define XtCArgc "Argc"
-#define XtNargv "argv"
-#define XtCArgv "Argv"
-#define XtNiconX "iconX"
-#define XtCIconX "IconX"
-#define XtNiconY "iconY"
-#define XtCIconY "IconY"
-#define XtNinput "input"
-#define XtCInput "Input"
-#define XtNiconic "iconic"
-#define XtCIconic "Iconic"
-#define XtNinitialState "initialState"
-#define XtCInitialState "InitialState"
-#define XtNgeometry "geometry"
-#define XtCGeometry "Geometry"
-#define XtNbaseWidth "baseWidth"
-#define XtCBaseWidth "BaseWidth"
-#define XtNbaseHeight "baseHeight"
-#define XtCBaseHeight "BaseHeight"
-#define XtNwinGravity "winGravity"
-#define XtCWinGravity "WinGravity"
-#define XtNminWidth "minWidth"
-#define XtCMinWidth "MinWidth"
-#define XtNminHeight "minHeight"
-#define XtCMinHeight "MinHeight"
-#define XtNmaxWidth "maxWidth"
-#define XtCMaxWidth "MaxWidth"
-#define XtNmaxHeight "maxHeight"
-#define XtCMaxHeight "MaxHeight"
-#define XtNwidthInc "widthInc"
-#define XtCWidthInc "WidthInc"
-#define XtNheightInc "heightInc"
-#define XtCHeightInc "HeightInc"
-#define XtNminAspectY "minAspectY"
-#define XtCMinAspectY "MinAspectY"
-#define XtNmaxAspectY "maxAspectY"
-#define XtCMaxAspectY "MaxAspectY"
-#define XtNminAspectX "minAspectX"
-#define XtCMinAspectX "MinAspectX"
-#define XtNmaxAspectX "maxAspectX"
-#define XtCMaxAspectX "MaxAspectX"
-#define XtNwmTimeout "wmTimeout"
-#define XtCWmTimeout "WmTimeout"
-#define XtNwaitForWm "waitforwm"
-#define XtCWaitForWm "Waitforwm"
-#define XtNwaitforwm "waitforwm"
-#define XtCWaitforwm "Waitforwm"
-#define XtNclientLeader "clientLeader"
-#define XtCClientLeader "ClientLeader"
-#define XtNwindowRole "windowRole"
-#define XtCWindowRole "WindowRole"
-#define XtNurgency "urgency"
-#define XtCUrgency "Urgency"
-#define XtNcancelCallback "cancelCallback"
-#define XtNcloneCommand "cloneCommand"
-#define XtCCloneCommand "CloneCommand"
-#define XtNconnection "connection"
-#define XtCConnection "Connection"
-#define XtNcurrentDirectory "currentDirectory"
-#define XtCCurrentDirectory "CurrentDirectory"
-#define XtNdieCallback "dieCallback"
-#define XtNdiscardCommand "discardCommand"
-#define XtCDiscardCommand "DiscardCommand"
-#define XtNenvironment "environment"
-#define XtCEnvironment "Environment"
-#define XtNinteractCallback "interactCallback"
-#define XtNjoinSession "joinSession"
-#define XtCJoinSession "JoinSession"
-#define XtNprogramPath "programPath"
-#define XtCProgramPath "ProgramPath"
-#define XtNresignCommand "resignCommand"
-#define XtCResignCommand "ResignCommand"
-#define XtNrestartCommand "restartCommand"
-#define XtCRestartCommand "RestartCommand"
-#define XtNrestartStyle "restartStyle"
-#define XtCRestartStyle "RestartStyle"
-#define XtNsaveCallback "saveCallback"
-#define XtNsaveCompleteCallback "saveCompleteCallback"
-#define XtNsessionID "sessionID"
-#define XtCSessionID "SessionID"
-#define XtNshutdownCommand "shutdownCommand"
-#define XtCShutdownCommand "ShutdownCommand"
-#define XtNerrorCallback "errorCallback"
-#else
-extern _XtShell_h_Const char XtShellStrings[];
-#ifndef XtNiconName
-#define XtNiconName ((char*)&XtShellStrings[0])
-#endif
-#ifndef XtCIconName
-#define XtCIconName ((char*)&XtShellStrings[9])
-#endif
-#ifndef XtNiconPixmap
-#define XtNiconPixmap ((char*)&XtShellStrings[18])
-#endif
-#ifndef XtCIconPixmap
-#define XtCIconPixmap ((char*)&XtShellStrings[29])
-#endif
-#ifndef XtNiconWindow
-#define XtNiconWindow ((char*)&XtShellStrings[40])
-#endif
-#ifndef XtCIconWindow
-#define XtCIconWindow ((char*)&XtShellStrings[51])
-#endif
-#ifndef XtNiconMask
-#define XtNiconMask ((char*)&XtShellStrings[62])
-#endif
-#ifndef XtCIconMask
-#define XtCIconMask ((char*)&XtShellStrings[71])
-#endif
-#ifndef XtNwindowGroup
-#define XtNwindowGroup ((char*)&XtShellStrings[80])
-#endif
-#ifndef XtCWindowGroup
-#define XtCWindowGroup ((char*)&XtShellStrings[92])
-#endif
-#ifndef XtNvisual
-#define XtNvisual ((char*)&XtShellStrings[104])
-#endif
-#ifndef XtCVisual
-#define XtCVisual ((char*)&XtShellStrings[111])
-#endif
-#ifndef XtNtitleEncoding
-#define XtNtitleEncoding ((char*)&XtShellStrings[118])
-#endif
-#ifndef XtCTitleEncoding
-#define XtCTitleEncoding ((char*)&XtShellStrings[132])
-#endif
-#ifndef XtNsaveUnder
-#define XtNsaveUnder ((char*)&XtShellStrings[146])
-#endif
-#ifndef XtCSaveUnder
-#define XtCSaveUnder ((char*)&XtShellStrings[156])
-#endif
-#ifndef XtNtransient
-#define XtNtransient ((char*)&XtShellStrings[166])
-#endif
-#ifndef XtCTransient
-#define XtCTransient ((char*)&XtShellStrings[176])
-#endif
-#ifndef XtNoverrideRedirect
-#define XtNoverrideRedirect ((char*)&XtShellStrings[186])
-#endif
-#ifndef XtCOverrideRedirect
-#define XtCOverrideRedirect ((char*)&XtShellStrings[203])
-#endif
-#ifndef XtNtransientFor
-#define XtNtransientFor ((char*)&XtShellStrings[220])
-#endif
-#ifndef XtCTransientFor
-#define XtCTransientFor ((char*)&XtShellStrings[233])
-#endif
-#ifndef XtNiconNameEncoding
-#define XtNiconNameEncoding ((char*)&XtShellStrings[246])
-#endif
-#ifndef XtCIconNameEncoding
-#define XtCIconNameEncoding ((char*)&XtShellStrings[263])
-#endif
-#ifndef XtNallowShellResize
-#define XtNallowShellResize ((char*)&XtShellStrings[280])
-#endif
-#ifndef XtCAllowShellResize
-#define XtCAllowShellResize ((char*)&XtShellStrings[297])
-#endif
-#ifndef XtNcreatePopupChildProc
-#define XtNcreatePopupChildProc ((char*)&XtShellStrings[314])
-#endif
-#ifndef XtCCreatePopupChildProc
-#define XtCCreatePopupChildProc ((char*)&XtShellStrings[335])
-#endif
-#ifndef XtNtitle
-#define XtNtitle ((char*)&XtShellStrings[356])
-#endif
-#ifndef XtCTitle
-#define XtCTitle ((char*)&XtShellStrings[362])
-#endif
-#ifndef XtRAtom
-#define XtRAtom ((char*)&XtShellStrings[368])
-#endif
-#ifndef XtNargc
-#define XtNargc ((char*)&XtShellStrings[373])
-#endif
-#ifndef XtCArgc
-#define XtCArgc ((char*)&XtShellStrings[378])
-#endif
-#ifndef XtNargv
-#define XtNargv ((char*)&XtShellStrings[383])
-#endif
-#ifndef XtCArgv
-#define XtCArgv ((char*)&XtShellStrings[388])
-#endif
-#ifndef XtNiconX
-#define XtNiconX ((char*)&XtShellStrings[393])
-#endif
-#ifndef XtCIconX
-#define XtCIconX ((char*)&XtShellStrings[399])
-#endif
-#ifndef XtNiconY
-#define XtNiconY ((char*)&XtShellStrings[405])
-#endif
-#ifndef XtCIconY
-#define XtCIconY ((char*)&XtShellStrings[411])
-#endif
-#ifndef XtNinput
-#define XtNinput ((char*)&XtShellStrings[417])
-#endif
-#ifndef XtCInput
-#define XtCInput ((char*)&XtShellStrings[423])
-#endif
-#ifndef XtNiconic
-#define XtNiconic ((char*)&XtShellStrings[429])
-#endif
-#ifndef XtCIconic
-#define XtCIconic ((char*)&XtShellStrings[436])
-#endif
-#ifndef XtNinitialState
-#define XtNinitialState ((char*)&XtShellStrings[443])
-#endif
-#ifndef XtCInitialState
-#define XtCInitialState ((char*)&XtShellStrings[456])
-#endif
-#ifndef XtNgeometry
-#define XtNgeometry ((char*)&XtShellStrings[469])
-#endif
-#ifndef XtCGeometry
-#define XtCGeometry ((char*)&XtShellStrings[478])
-#endif
-#ifndef XtNbaseWidth
-#define XtNbaseWidth ((char*)&XtShellStrings[487])
-#endif
-#ifndef XtCBaseWidth
-#define XtCBaseWidth ((char*)&XtShellStrings[497])
-#endif
-#ifndef XtNbaseHeight
-#define XtNbaseHeight ((char*)&XtShellStrings[507])
-#endif
-#ifndef XtCBaseHeight
-#define XtCBaseHeight ((char*)&XtShellStrings[518])
-#endif
-#ifndef XtNwinGravity
-#define XtNwinGravity ((char*)&XtShellStrings[529])
-#endif
-#ifndef XtCWinGravity
-#define XtCWinGravity ((char*)&XtShellStrings[540])
-#endif
-#ifndef XtNminWidth
-#define XtNminWidth ((char*)&XtShellStrings[551])
-#endif
-#ifndef XtCMinWidth
-#define XtCMinWidth ((char*)&XtShellStrings[560])
-#endif
-#ifndef XtNminHeight
-#define XtNminHeight ((char*)&XtShellStrings[569])
-#endif
-#ifndef XtCMinHeight
-#define XtCMinHeight ((char*)&XtShellStrings[579])
-#endif
-#ifndef XtNmaxWidth
-#define XtNmaxWidth ((char*)&XtShellStrings[589])
-#endif
-#ifndef XtCMaxWidth
-#define XtCMaxWidth ((char*)&XtShellStrings[598])
-#endif
-#ifndef XtNmaxHeight
-#define XtNmaxHeight ((char*)&XtShellStrings[607])
-#endif
-#ifndef XtCMaxHeight
-#define XtCMaxHeight ((char*)&XtShellStrings[617])
-#endif
-#ifndef XtNwidthInc
-#define XtNwidthInc ((char*)&XtShellStrings[627])
-#endif
-#ifndef XtCWidthInc
-#define XtCWidthInc ((char*)&XtShellStrings[636])
-#endif
-#ifndef XtNheightInc
-#define XtNheightInc ((char*)&XtShellStrings[645])
-#endif
-#ifndef XtCHeightInc
-#define XtCHeightInc ((char*)&XtShellStrings[655])
-#endif
-#ifndef XtNminAspectY
-#define XtNminAspectY ((char*)&XtShellStrings[665])
-#endif
-#ifndef XtCMinAspectY
-#define XtCMinAspectY ((char*)&XtShellStrings[676])
-#endif
-#ifndef XtNmaxAspectY
-#define XtNmaxAspectY ((char*)&XtShellStrings[687])
-#endif
-#ifndef XtCMaxAspectY
-#define XtCMaxAspectY ((char*)&XtShellStrings[698])
-#endif
-#ifndef XtNminAspectX
-#define XtNminAspectX ((char*)&XtShellStrings[709])
-#endif
-#ifndef XtCMinAspectX
-#define XtCMinAspectX ((char*)&XtShellStrings[720])
-#endif
-#ifndef XtNmaxAspectX
-#define XtNmaxAspectX ((char*)&XtShellStrings[731])
-#endif
-#ifndef XtCMaxAspectX
-#define XtCMaxAspectX ((char*)&XtShellStrings[742])
-#endif
-#ifndef XtNwmTimeout
-#define XtNwmTimeout ((char*)&XtShellStrings[753])
-#endif
-#ifndef XtCWmTimeout
-#define XtCWmTimeout ((char*)&XtShellStrings[763])
-#endif
-#ifndef XtNwaitForWm
-#define XtNwaitForWm ((char*)&XtShellStrings[773])
-#endif
-#ifndef XtCWaitForWm
-#define XtCWaitForWm ((char*)&XtShellStrings[783])
-#endif
-#ifndef XtNwaitforwm
-#define XtNwaitforwm ((char*)&XtShellStrings[793])
-#endif
-#ifndef XtCWaitforwm
-#define XtCWaitforwm ((char*)&XtShellStrings[803])
-#endif
-#ifndef XtNclientLeader
-#define XtNclientLeader ((char*)&XtShellStrings[813])
-#endif
-#ifndef XtCClientLeader
-#define XtCClientLeader ((char*)&XtShellStrings[826])
-#endif
-#ifndef XtNwindowRole
-#define XtNwindowRole ((char*)&XtShellStrings[839])
-#endif
-#ifndef XtCWindowRole
-#define XtCWindowRole ((char*)&XtShellStrings[850])
-#endif
-#ifndef XtNurgency
-#define XtNurgency ((char*)&XtShellStrings[861])
-#endif
-#ifndef XtCUrgency
-#define XtCUrgency ((char*)&XtShellStrings[869])
-#endif
-#ifndef XtNcancelCallback
-#define XtNcancelCallback ((char*)&XtShellStrings[877])
-#endif
-#ifndef XtNcloneCommand
-#define XtNcloneCommand ((char*)&XtShellStrings[892])
-#endif
-#ifndef XtCCloneCommand
-#define XtCCloneCommand ((char*)&XtShellStrings[905])
-#endif
-#ifndef XtNconnection
-#define XtNconnection ((char*)&XtShellStrings[918])
-#endif
-#ifndef XtCConnection
-#define XtCConnection ((char*)&XtShellStrings[929])
-#endif
-#ifndef XtNcurrentDirectory
-#define XtNcurrentDirectory ((char*)&XtShellStrings[940])
-#endif
-#ifndef XtCCurrentDirectory
-#define XtCCurrentDirectory ((char*)&XtShellStrings[957])
-#endif
-#ifndef XtNdieCallback
-#define XtNdieCallback ((char*)&XtShellStrings[974])
-#endif
-#ifndef XtNdiscardCommand
-#define XtNdiscardCommand ((char*)&XtShellStrings[986])
-#endif
-#ifndef XtCDiscardCommand
-#define XtCDiscardCommand ((char*)&XtShellStrings[1001])
-#endif
-#ifndef XtNenvironment
-#define XtNenvironment ((char*)&XtShellStrings[1016])
-#endif
-#ifndef XtCEnvironment
-#define XtCEnvironment ((char*)&XtShellStrings[1028])
-#endif
-#ifndef XtNinteractCallback
-#define XtNinteractCallback ((char*)&XtShellStrings[1040])
-#endif
-#ifndef XtNjoinSession
-#define XtNjoinSession ((char*)&XtShellStrings[1057])
-#endif
-#ifndef XtCJoinSession
-#define XtCJoinSession ((char*)&XtShellStrings[1069])
-#endif
-#ifndef XtNprogramPath
-#define XtNprogramPath ((char*)&XtShellStrings[1081])
-#endif
-#ifndef XtCProgramPath
-#define XtCProgramPath ((char*)&XtShellStrings[1093])
-#endif
-#ifndef XtNresignCommand
-#define XtNresignCommand ((char*)&XtShellStrings[1105])
-#endif
-#ifndef XtCResignCommand
-#define XtCResignCommand ((char*)&XtShellStrings[1119])
-#endif
-#ifndef XtNrestartCommand
-#define XtNrestartCommand ((char*)&XtShellStrings[1133])
-#endif
-#ifndef XtCRestartCommand
-#define XtCRestartCommand ((char*)&XtShellStrings[1148])
-#endif
-#ifndef XtNrestartStyle
-#define XtNrestartStyle ((char*)&XtShellStrings[1163])
-#endif
-#ifndef XtCRestartStyle
-#define XtCRestartStyle ((char*)&XtShellStrings[1176])
-#endif
-#ifndef XtNsaveCallback
-#define XtNsaveCallback ((char*)&XtShellStrings[1189])
-#endif
-#ifndef XtNsaveCompleteCallback
-#define XtNsaveCompleteCallback ((char*)&XtShellStrings[1202])
-#endif
-#ifndef XtNsessionID
-#define XtNsessionID ((char*)&XtShellStrings[1223])
-#endif
-#ifndef XtCSessionID
-#define XtCSessionID ((char*)&XtShellStrings[1233])
-#endif
-#ifndef XtNshutdownCommand
-#define XtNshutdownCommand ((char*)&XtShellStrings[1243])
-#endif
-#ifndef XtCShutdownCommand
-#define XtCShutdownCommand ((char*)&XtShellStrings[1259])
-#endif
-#ifndef XtNerrorCallback
-#define XtNerrorCallback ((char*)&XtShellStrings[1275])
-#endif
-#endif /* XTSTRINGDEFINES */
-
-#ifndef XTSTRINGDEFINES
-#undef _XtShell_h_Const
-#endif
-
-/* Class record constants */
-
-typedef struct _ShellClassRec *ShellWidgetClass;
-typedef struct _OverrideShellClassRec *OverrideShellWidgetClass;
-typedef struct _WMShellClassRec *WMShellWidgetClass;
-typedef struct _TransientShellClassRec *TransientShellWidgetClass;
-typedef struct _TopLevelShellClassRec *TopLevelShellWidgetClass;
-typedef struct _ApplicationShellClassRec *ApplicationShellWidgetClass;
-typedef struct _SessionShellClassRec *SessionShellWidgetClass;
-
-#ifndef SHELL
-externalref WidgetClass shellWidgetClass;
-externalref WidgetClass overrideShellWidgetClass;
-externalref WidgetClass wmShellWidgetClass;
-externalref WidgetClass transientShellWidgetClass;
-externalref WidgetClass topLevelShellWidgetClass;
-externalref WidgetClass applicationShellWidgetClass;
-externalref WidgetClass sessionShellWidgetClass;
-#endif
-
-#endif /* _XtShell_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/ShellI.h b/openflow/usr/include/X11/ShellI.h
deleted file mode 100644
index c1ee0b1..0000000
--- a/openflow/usr/include/X11/ShellI.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _XtShellInternal_h
-#define _XtShellInternal_h
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-extern void _XtShellGetCoordinates(Widget widget, Position *x, Position *y);
-
-#endif /* _XtShellInternal_h */
diff --git a/openflow/usr/include/X11/ShellP.h b/openflow/usr/include/X11/ShellP.h
deleted file mode 100644
index 51ac3a0..0000000
--- a/openflow/usr/include/X11/ShellP.h
+++ /dev/null
@@ -1,434 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * ShellP.h - Private definitions for Shell widget
- *
- * Author:	Paul Asente
- * 		Digital Equipment Corporation
- * 		Western Software Laboratory
- * Date:	Thu Dec 3, 1987
- */
-
-#ifndef _XtShellPrivate_h
-#define _XtShellPrivate_h
-
-#include <X11/Shell.h>
-
-/* *****
- * ***** VendorP.h is included later on; it needs fields defined in the first
- * ***** part of this header file
- * *****
- */
-
-_XFUNCPROTOBEGIN
-
-/***********************************************************************
- *
- * Shell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the Shell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} ShellClassPart;
-
-typedef struct {
-    XtPointer next_extension;	/* 1st 4 mandated for all extension records */
-    XrmQuark record_type;	/* NULLQUARK; on ShellClassPart */
-    long version;		/* must be XtShellExtensionVersion */
-    Cardinal record_size;	/* sizeof(ShellClassExtensionRec) */
-    XtGeometryHandler root_geometry_manager;
-} ShellClassExtensionRec, *ShellClassExtension;
-
-#define XtShellExtensionVersion 1L
-#define XtInheritRootGeometryManager ((XtGeometryHandler)_XtInherit)
-
-typedef struct _ShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-} ShellClassRec;
-
-externalref ShellClassRec shellClassRec;
-
-/* New fields for the shell widget */
-
-typedef struct {
-	char       *geometry;
-	XtCreatePopupChildProc	create_popup_child_proc;
-	XtGrabKind	grab_kind;
-	Boolean	    spring_loaded;
-	Boolean	    popped_up;
-	Boolean	    allow_shell_resize;
-	Boolean     client_specified; /* re-using old name */
-#define _XtShellPositionValid	((Boolean)(1<<0))
-#define _XtShellNotReparented	((Boolean)(1<<1))
-#define _XtShellPPositionOK	((Boolean)(1<<2))
-#define _XtShellGeometryParsed	((Boolean)(1<<3))
-	Boolean	    save_under;
-	Boolean	    override_redirect;
-
-	XtCallbackList popup_callback;
-	XtCallbackList popdown_callback;
-	Visual*     visual;
-} ShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-} ShellRec, *ShellWidget;
-
-/***********************************************************************
- *
- * OverrideShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the OverrideShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} OverrideShellClassPart;
-
-typedef struct _OverrideShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	OverrideShellClassPart  override_shell_class;
-} OverrideShellClassRec;
-
-externalref OverrideShellClassRec overrideShellClassRec;
-
-/* No new fields for the override shell widget */
-
-typedef struct {int frabjous;} OverrideShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	OverrideShellPart override;
-} OverrideShellRec, *OverrideShellWidget;
-
-/***********************************************************************
- *
- * WMShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the WMShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} WMShellClassPart;
-
-typedef struct _WMShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart wm_shell_class;
-} WMShellClassRec;
-
-externalref WMShellClassRec wmShellClassRec;
-
-/* New fields for the WM shell widget */
-
-typedef struct {
-	char	   *title;
-	int 	    wm_timeout;
-	Boolean	    wait_for_wm;
-	Boolean	    transient;
-	Boolean     urgency;
-	Widget      client_leader;
-	String      window_role;
-	struct _OldXSizeHints {	/* pre-R4 Xlib structure */
-	    long flags;
-	    int x, y;
-	    int width, height;
-	    int min_width, min_height;
-	    int max_width, max_height;
-	    int width_inc, height_inc;
-	    struct {
-		    int x;
-		    int y;
-	    } min_aspect, max_aspect;
-	} size_hints;
-	XWMHints    wm_hints;
-	int base_width, base_height;
-	int win_gravity;
-	Atom title_encoding;
-} WMShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-} WMShellRec, *WMShellWidget;
-
-_XFUNCPROTOEND
-
-#include <X11/VendorP.h>
-
-_XFUNCPROTOBEGIN
-
-/***********************************************************************
- *
- * TransientShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the TransientShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} TransientShellClassPart;
-
-typedef struct _TransientShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart   wm_shell_class;
-	VendorShellClassPart vendor_shell_class;
-	TransientShellClassPart transient_shell_class;
-} TransientShellClassRec;
-
-externalref TransientShellClassRec transientShellClassRec;
-
-/* New fields for the transient shell widget */
-
-typedef struct {
-	Widget transient_for;
-} TransientShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-	VendorShellPart	vendor;
-	TransientShellPart transient;
-} TransientShellRec, *TransientShellWidget;
-
-/***********************************************************************
- *
- * TopLevelShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the TopLevelShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} TopLevelShellClassPart;
-
-typedef struct _TopLevelShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart   wm_shell_class;
-	VendorShellClassPart vendor_shell_class;
-	TopLevelShellClassPart top_level_shell_class;
-} TopLevelShellClassRec;
-
-externalref TopLevelShellClassRec topLevelShellClassRec;
-
-/* New fields for the top level shell widget */
-
-typedef struct {
-	char	   *icon_name;
-	Boolean	    iconic;
-	Atom	    icon_name_encoding;
-} TopLevelShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-	VendorShellPart	vendor;
-	TopLevelShellPart topLevel;
-} TopLevelShellRec, *TopLevelShellWidget;
-
-/***********************************************************************
- *
- * ApplicationShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the ApplicationShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} ApplicationShellClassPart;
-
-typedef struct _ApplicationShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart   wm_shell_class;
-	VendorShellClassPart vendor_shell_class;
-	TopLevelShellClassPart top_level_shell_class;
-	ApplicationShellClassPart application_shell_class;
-} ApplicationShellClassRec;
-
-externalref ApplicationShellClassRec applicationShellClassRec;
-
-/* New fields for the application shell widget */
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    char *c_class;
-#else
-    char *class;
-#endif
-    XrmClass xrm_class;
-    int argc;
-    char **argv;
-} ApplicationShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-	VendorShellPart	vendor;
-	TopLevelShellPart topLevel;
-	ApplicationShellPart application;
-} ApplicationShellRec, *ApplicationShellWidget;
-
-/***********************************************************************
- *
- * SessionShell Widget Private Data
- *
- ***********************************************************************/
-
-/* New fields for the SessionShell widget class record */
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record */
-} SessionShellClassPart;
-
-typedef struct _SessionShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart   wm_shell_class;
-	VendorShellClassPart vendor_shell_class;
-	TopLevelShellClassPart top_level_shell_class;
-	ApplicationShellClassPart application_shell_class;
-	SessionShellClassPart session_shell_class;
-} SessionShellClassRec;
-
-externalref SessionShellClassRec sessionShellClassRec;
-
-typedef struct _XtSaveYourselfRec *XtSaveYourself; /* implementation-private */
-
-/* New fields for the session shell widget */
-
-typedef struct {
-    SmcConn         connection;
-    String          session_id;
-    String*         restart_command;
-    String*         clone_command;
-    String*         discard_command;
-    String*         resign_command;
-    String*         shutdown_command;
-    String*         environment;
-    String          current_dir;
-    String          program_path;
-    unsigned char   restart_style;
-    unsigned char   checkpoint_state;
-    Boolean         join_session;
-    XtCallbackList  save_callbacks;
-    XtCallbackList  interact_callbacks;
-    XtCallbackList  cancel_callbacks;
-    XtCallbackList  save_complete_callbacks;
-    XtCallbackList  die_callbacks;
-    XtCallbackList  error_callbacks;
-    XtSaveYourself  save;
-    XtInputId       input_id;
-    XtPointer       ses20;
-    XtPointer       ses19;
-    XtPointer       ses18;
-    XtPointer       ses17;
-    XtPointer       ses16;
-    XtPointer       ses15;
-    XtPointer       ses14;
-    XtPointer       ses13;
-    XtPointer       ses12;
-    XtPointer       ses11;
-    XtPointer       ses10;
-    XtPointer       ses9;
-    XtPointer       ses8;
-    XtPointer       ses7;
-    XtPointer       ses6;
-    XtPointer       ses5;
-    XtPointer       ses4;
-    XtPointer       ses3;
-    XtPointer       ses2;
-    XtPointer       ses1;
-} SessionShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-	VendorShellPart	vendor;
-	TopLevelShellPart topLevel;
-	ApplicationShellPart application;
-	SessionShellPart session;
-} SessionShellRec, *SessionShellWidget;
-
-_XFUNCPROTOEND
-
-#endif /* _XtShellPrivate_h */
diff --git a/openflow/usr/include/X11/StringDefs.h b/openflow/usr/include/X11/StringDefs.h
deleted file mode 100644
index 569506b..0000000
--- a/openflow/usr/include/X11/StringDefs.h
+++ /dev/null
@@ -1,1085 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtStringDefs_h_
-#define _XtStringDefs_h_
-
-#ifndef XTSTRINGDEFINES
-#define _XtStringDefs_h_Const const
-#endif
-
-/* $Xorg: makestrs.c,v 1.6 2001/02/09 02:03:17 xorgcvs Exp $ */
-/* This file is automatically generated. */
-/* Default ABI version -- Do not edit */
-#ifdef XTSTRINGDEFINES
-#define XtNaccelerators "accelerators"
-#define XtNallowHoriz "allowHoriz"
-#define XtNallowVert "allowVert"
-#define XtNancestorSensitive "ancestorSensitive"
-#define XtNbackground "background"
-#define XtNbackgroundPixmap "backgroundPixmap"
-#define XtNbitmap "bitmap"
-#define XtNborderColor "borderColor"
-#define XtNborder "borderColor"
-#define XtNborderPixmap "borderPixmap"
-#define XtNborderWidth "borderWidth"
-#define XtNcallback "callback"
-#define XtNchildren "children"
-#define XtNcolormap "colormap"
-#define XtNdepth "depth"
-#define XtNdestroyCallback "destroyCallback"
-#define XtNeditType "editType"
-#define XtNfile "file"
-#define XtNfont "font"
-#define XtNforceBars "forceBars"
-#define XtNforeground "foreground"
-#define XtNfunction "function"
-#define XtNheight "height"
-#define XtNhighlight "highlight"
-#define XtNhSpace "hSpace"
-#define XtNindex "index"
-#define XtNinitialResourcesPersistent "initialResourcesPersistent"
-#define XtNinnerHeight "innerHeight"
-#define XtNinnerWidth "innerWidth"
-#define XtNinnerWindow "innerWindow"
-#define XtNinsertPosition "insertPosition"
-#define XtNinternalHeight "internalHeight"
-#define XtNinternalWidth "internalWidth"
-#define XtNjumpProc "jumpProc"
-#define XtNjustify "justify"
-#define XtNknobHeight "knobHeight"
-#define XtNknobIndent "knobIndent"
-#define XtNknobPixel "knobPixel"
-#define XtNknobWidth "knobWidth"
-#define XtNlabel "label"
-#define XtNlength "length"
-#define XtNlowerRight "lowerRight"
-#define XtNmappedWhenManaged "mappedWhenManaged"
-#define XtNmenuEntry "menuEntry"
-#define XtNname "name"
-#define XtNnotify "notify"
-#define XtNnumChildren "numChildren"
-#define XtNorientation "orientation"
-#define XtNparameter "parameter"
-#define XtNpixmap "pixmap"
-#define XtNpopupCallback "popupCallback"
-#define XtNpopdownCallback "popdownCallback"
-#define XtNresize "resize"
-#define XtNreverseVideo "reverseVideo"
-#define XtNscreen "screen"
-#define XtNscrollProc "scrollProc"
-#define XtNscrollDCursor "scrollDCursor"
-#define XtNscrollHCursor "scrollHCursor"
-#define XtNscrollLCursor "scrollLCursor"
-#define XtNscrollRCursor "scrollRCursor"
-#define XtNscrollUCursor "scrollUCursor"
-#define XtNscrollVCursor "scrollVCursor"
-#define XtNselection "selection"
-#define XtNselectionArray "selectionArray"
-#define XtNsensitive "sensitive"
-#define XtNshown "shown"
-#define XtNspace "space"
-#define XtNstring "string"
-#define XtNtextOptions "textOptions"
-#define XtNtextSink "textSink"
-#define XtNtextSource "textSource"
-#define XtNthickness "thickness"
-#define XtNthumb "thumb"
-#define XtNthumbProc "thumbProc"
-#define XtNtop "top"
-#define XtNtranslations "translations"
-#define XtNunrealizeCallback "unrealizeCallback"
-#define XtNupdate "update"
-#define XtNuseBottom "useBottom"
-#define XtNuseRight "useRight"
-#define XtNvalue "value"
-#define XtNvSpace "vSpace"
-#define XtNwidth "width"
-#define XtNwindow "window"
-#define XtNx "x"
-#define XtNy "y"
-#define XtCAccelerators "Accelerators"
-#define XtCBackground "Background"
-#define XtCBitmap "Bitmap"
-#define XtCBoolean "Boolean"
-#define XtCBorderColor "BorderColor"
-#define XtCBorderWidth "BorderWidth"
-#define XtCCallback "Callback"
-#define XtCColormap "Colormap"
-#define XtCColor "Color"
-#define XtCCursor "Cursor"
-#define XtCDepth "Depth"
-#define XtCEditType "EditType"
-#define XtCEventBindings "EventBindings"
-#define XtCFile "File"
-#define XtCFont "Font"
-#define XtCForeground "Foreground"
-#define XtCFraction "Fraction"
-#define XtCFunction "Function"
-#define XtCHeight "Height"
-#define XtCHSpace "HSpace"
-#define XtCIndex "Index"
-#define XtCInitialResourcesPersistent "InitialResourcesPersistent"
-#define XtCInsertPosition "InsertPosition"
-#define XtCInterval "Interval"
-#define XtCJustify "Justify"
-#define XtCKnobIndent "KnobIndent"
-#define XtCKnobPixel "KnobPixel"
-#define XtCLabel "Label"
-#define XtCLength "Length"
-#define XtCMappedWhenManaged "MappedWhenManaged"
-#define XtCMargin "Margin"
-#define XtCMenuEntry "MenuEntry"
-#define XtCNotify "Notify"
-#define XtCOrientation "Orientation"
-#define XtCParameter "Parameter"
-#define XtCPixmap "Pixmap"
-#define XtCPosition "Position"
-#define XtCReadOnly "ReadOnly"
-#define XtCResize "Resize"
-#define XtCReverseVideo "ReverseVideo"
-#define XtCScreen "Screen"
-#define XtCScrollProc "ScrollProc"
-#define XtCScrollDCursor "ScrollDCursor"
-#define XtCScrollHCursor "ScrollHCursor"
-#define XtCScrollLCursor "ScrollLCursor"
-#define XtCScrollRCursor "ScrollRCursor"
-#define XtCScrollUCursor "ScrollUCursor"
-#define XtCScrollVCursor "ScrollVCursor"
-#define XtCSelection "Selection"
-#define XtCSensitive "Sensitive"
-#define XtCSelectionArray "SelectionArray"
-#define XtCSpace "Space"
-#define XtCString "String"
-#define XtCTextOptions "TextOptions"
-#define XtCTextPosition "TextPosition"
-#define XtCTextSink "TextSink"
-#define XtCTextSource "TextSource"
-#define XtCThickness "Thickness"
-#define XtCThumb "Thumb"
-#define XtCTranslations "Translations"
-#define XtCValue "Value"
-#define XtCVSpace "VSpace"
-#define XtCWidth "Width"
-#define XtCWindow "Window"
-#define XtCX "X"
-#define XtCY "Y"
-#define XtRAcceleratorTable "AcceleratorTable"
-#ifndef XtRAtom
-#define XtRAtom "Atom"
-#endif
-#define XtRBitmap "Bitmap"
-#define XtRBool "Bool"
-#define XtRBoolean "Boolean"
-#define XtRCallback "Callback"
-#define XtRCallProc "CallProc"
-#define XtRCardinal "Cardinal"
-#define XtRColor "Color"
-#define XtRColormap "Colormap"
-#define XtRCursor "Cursor"
-#define XtRDimension "Dimension"
-#define XtRDisplay "Display"
-#define XtREditMode "EditMode"
-#define XtREnum "Enum"
-#define XtRFile "File"
-#define XtRFloat "Float"
-#define XtRFont "Font"
-#define XtRFontStruct "FontStruct"
-#define XtRFunction "Function"
-#define XtRGeometry "Geometry"
-#define XtRImmediate "Immediate"
-#define XtRInitialState "InitialState"
-#define XtRInt "Int"
-#define XtRJustify "Justify"
-#define XtRLongBoolean "Bool"
-#define XtRObject "Object"
-#define XtROrientation "Orientation"
-#define XtRPixel "Pixel"
-#define XtRPixmap "Pixmap"
-#define XtRPointer "Pointer"
-#define XtRPosition "Position"
-#define XtRScreen "Screen"
-#define XtRShort "Short"
-#define XtRString "String"
-#define XtRStringArray "StringArray"
-#define XtRStringTable "StringTable"
-#define XtRUnsignedChar "UnsignedChar"
-#define XtRTranslationTable "TranslationTable"
-#define XtRVisual "Visual"
-#define XtRWidget "Widget"
-#define XtRWidgetClass "WidgetClass"
-#define XtRWidgetList "WidgetList"
-#define XtRWindow "Window"
-#define XtEoff "off"
-#define XtEfalse "false"
-#define XtEno "no"
-#define XtEon "on"
-#define XtEtrue "true"
-#define XtEyes "yes"
-#define XtEvertical "vertical"
-#define XtEhorizontal "horizontal"
-#define XtEtextRead "read"
-#define XtEtextAppend "append"
-#define XtEtextEdit "edit"
-#define XtExtdefaultbackground "xtdefaultbackground"
-#define XtExtdefaultforeground "xtdefaultforeground"
-#define XtExtdefaultfont "xtdefaultfont"
-#define XtNfontSet "fontSet"
-#define XtRFontSet "FontSet"
-#define XtCFontSet "FontSet"
-#define XtRGravity "Gravity"
-#define XtNcreateHook "createHook"
-#define XtNchangeHook "changeHook"
-#define XtNconfigureHook "configureHook"
-#define XtNgeometryHook "geometryHook"
-#define XtNdestroyHook "destroyHook"
-#define XtNshells "shells"
-#define XtNnumShells "numShells"
-#define XtRCommandArgArray "CommandArgArray"
-#define XtRDirectoryString "DirectoryString"
-#define XtREnvironmentArray "EnvironmentArray"
-#define XtRRestartStyle "RestartStyle"
-#define XtRSmcConn "SmcConn"
-#define XtHcreate "Xtcreate"
-#define XtHsetValues "XtsetValues"
-#define XtHmanageChildren "XtmanageChildren"
-#define XtHunmanageChildren "XtunmanageChildren"
-#define XtHmanageSet "XtmanageSet"
-#define XtHunmanageSet "XtunmanageSet"
-#define XtHrealizeWidget "XtrealizeWidget"
-#define XtHunrealizeWidget "XtunrealizeWidget"
-#define XtHaddCallback "XtaddCallback"
-#define XtHaddCallbacks "XtaddCallbacks"
-#define XtHremoveCallback "XtremoveCallback"
-#define XtHremoveCallbacks "XtremoveCallbacks"
-#define XtHremoveAllCallbacks "XtremoveAllCallbacks"
-#define XtHaugmentTranslations "XtaugmentTranslations"
-#define XtHoverrideTranslations "XtoverrideTranslations"
-#define XtHuninstallTranslations "XtuninstallTranslations"
-#define XtHsetKeyboardFocus "XtsetKeyboardFocus"
-#define XtHsetWMColormapWindows "XtsetWMColormapWindows"
-#define XtHsetMappedWhenManaged "XtsetMappedWhenManaged"
-#define XtHmapWidget "XtmapWidget"
-#define XtHunmapWidget "XtunmapWidget"
-#define XtHpopup "Xtpopup"
-#define XtHpopupSpringLoaded "XtpopupSpringLoaded"
-#define XtHpopdown "Xtpopdown"
-#define XtHconfigure "Xtconfigure"
-#define XtHpreGeometry "XtpreGeometry"
-#define XtHpostGeometry "XtpostGeometry"
-#define XtHdestroy "Xtdestroy"
-#else
-extern _XtStringDefs_h_Const char XtStrings[];
-#ifndef XtNaccelerators
-#define XtNaccelerators ((char*)&XtStrings[0])
-#endif
-#ifndef XtNallowHoriz
-#define XtNallowHoriz ((char*)&XtStrings[13])
-#endif
-#ifndef XtNallowVert
-#define XtNallowVert ((char*)&XtStrings[24])
-#endif
-#ifndef XtNancestorSensitive
-#define XtNancestorSensitive ((char*)&XtStrings[34])
-#endif
-#ifndef XtNbackground
-#define XtNbackground ((char*)&XtStrings[52])
-#endif
-#ifndef XtNbackgroundPixmap
-#define XtNbackgroundPixmap ((char*)&XtStrings[63])
-#endif
-#ifndef XtNbitmap
-#define XtNbitmap ((char*)&XtStrings[80])
-#endif
-#ifndef XtNborderColor
-#define XtNborderColor ((char*)&XtStrings[87])
-#endif
-#ifndef XtNborder
-#define XtNborder ((char*)&XtStrings[99])
-#endif
-#ifndef XtNborderPixmap
-#define XtNborderPixmap ((char*)&XtStrings[111])
-#endif
-#ifndef XtNborderWidth
-#define XtNborderWidth ((char*)&XtStrings[124])
-#endif
-#ifndef XtNcallback
-#define XtNcallback ((char*)&XtStrings[136])
-#endif
-#ifndef XtNchildren
-#define XtNchildren ((char*)&XtStrings[145])
-#endif
-#ifndef XtNcolormap
-#define XtNcolormap ((char*)&XtStrings[154])
-#endif
-#ifndef XtNdepth
-#define XtNdepth ((char*)&XtStrings[163])
-#endif
-#ifndef XtNdestroyCallback
-#define XtNdestroyCallback ((char*)&XtStrings[169])
-#endif
-#ifndef XtNeditType
-#define XtNeditType ((char*)&XtStrings[185])
-#endif
-#ifndef XtNfile
-#define XtNfile ((char*)&XtStrings[194])
-#endif
-#ifndef XtNfont
-#define XtNfont ((char*)&XtStrings[199])
-#endif
-#ifndef XtNforceBars
-#define XtNforceBars ((char*)&XtStrings[204])
-#endif
-#ifndef XtNforeground
-#define XtNforeground ((char*)&XtStrings[214])
-#endif
-#ifndef XtNfunction
-#define XtNfunction ((char*)&XtStrings[225])
-#endif
-#ifndef XtNheight
-#define XtNheight ((char*)&XtStrings[234])
-#endif
-#ifndef XtNhighlight
-#define XtNhighlight ((char*)&XtStrings[241])
-#endif
-#ifndef XtNhSpace
-#define XtNhSpace ((char*)&XtStrings[251])
-#endif
-#ifndef XtNindex
-#define XtNindex ((char*)&XtStrings[258])
-#endif
-#ifndef XtNinitialResourcesPersistent
-#define XtNinitialResourcesPersistent ((char*)&XtStrings[264])
-#endif
-#ifndef XtNinnerHeight
-#define XtNinnerHeight ((char*)&XtStrings[291])
-#endif
-#ifndef XtNinnerWidth
-#define XtNinnerWidth ((char*)&XtStrings[303])
-#endif
-#ifndef XtNinnerWindow
-#define XtNinnerWindow ((char*)&XtStrings[314])
-#endif
-#ifndef XtNinsertPosition
-#define XtNinsertPosition ((char*)&XtStrings[326])
-#endif
-#ifndef XtNinternalHeight
-#define XtNinternalHeight ((char*)&XtStrings[341])
-#endif
-#ifndef XtNinternalWidth
-#define XtNinternalWidth ((char*)&XtStrings[356])
-#endif
-#ifndef XtNjumpProc
-#define XtNjumpProc ((char*)&XtStrings[370])
-#endif
-#ifndef XtNjustify
-#define XtNjustify ((char*)&XtStrings[379])
-#endif
-#ifndef XtNknobHeight
-#define XtNknobHeight ((char*)&XtStrings[387])
-#endif
-#ifndef XtNknobIndent
-#define XtNknobIndent ((char*)&XtStrings[398])
-#endif
-#ifndef XtNknobPixel
-#define XtNknobPixel ((char*)&XtStrings[409])
-#endif
-#ifndef XtNknobWidth
-#define XtNknobWidth ((char*)&XtStrings[419])
-#endif
-#ifndef XtNlabel
-#define XtNlabel ((char*)&XtStrings[429])
-#endif
-#ifndef XtNlength
-#define XtNlength ((char*)&XtStrings[435])
-#endif
-#ifndef XtNlowerRight
-#define XtNlowerRight ((char*)&XtStrings[442])
-#endif
-#ifndef XtNmappedWhenManaged
-#define XtNmappedWhenManaged ((char*)&XtStrings[453])
-#endif
-#ifndef XtNmenuEntry
-#define XtNmenuEntry ((char*)&XtStrings[471])
-#endif
-#ifndef XtNname
-#define XtNname ((char*)&XtStrings[481])
-#endif
-#ifndef XtNnotify
-#define XtNnotify ((char*)&XtStrings[486])
-#endif
-#ifndef XtNnumChildren
-#define XtNnumChildren ((char*)&XtStrings[493])
-#endif
-#ifndef XtNorientation
-#define XtNorientation ((char*)&XtStrings[505])
-#endif
-#ifndef XtNparameter
-#define XtNparameter ((char*)&XtStrings[517])
-#endif
-#ifndef XtNpixmap
-#define XtNpixmap ((char*)&XtStrings[527])
-#endif
-#ifndef XtNpopupCallback
-#define XtNpopupCallback ((char*)&XtStrings[534])
-#endif
-#ifndef XtNpopdownCallback
-#define XtNpopdownCallback ((char*)&XtStrings[548])
-#endif
-#ifndef XtNresize
-#define XtNresize ((char*)&XtStrings[564])
-#endif
-#ifndef XtNreverseVideo
-#define XtNreverseVideo ((char*)&XtStrings[571])
-#endif
-#ifndef XtNscreen
-#define XtNscreen ((char*)&XtStrings[584])
-#endif
-#ifndef XtNscrollProc
-#define XtNscrollProc ((char*)&XtStrings[591])
-#endif
-#ifndef XtNscrollDCursor
-#define XtNscrollDCursor ((char*)&XtStrings[602])
-#endif
-#ifndef XtNscrollHCursor
-#define XtNscrollHCursor ((char*)&XtStrings[616])
-#endif
-#ifndef XtNscrollLCursor
-#define XtNscrollLCursor ((char*)&XtStrings[630])
-#endif
-#ifndef XtNscrollRCursor
-#define XtNscrollRCursor ((char*)&XtStrings[644])
-#endif
-#ifndef XtNscrollUCursor
-#define XtNscrollUCursor ((char*)&XtStrings[658])
-#endif
-#ifndef XtNscrollVCursor
-#define XtNscrollVCursor ((char*)&XtStrings[672])
-#endif
-#ifndef XtNselection
-#define XtNselection ((char*)&XtStrings[686])
-#endif
-#ifndef XtNselectionArray
-#define XtNselectionArray ((char*)&XtStrings[696])
-#endif
-#ifndef XtNsensitive
-#define XtNsensitive ((char*)&XtStrings[711])
-#endif
-#ifndef XtNshown
-#define XtNshown ((char*)&XtStrings[721])
-#endif
-#ifndef XtNspace
-#define XtNspace ((char*)&XtStrings[727])
-#endif
-#ifndef XtNstring
-#define XtNstring ((char*)&XtStrings[733])
-#endif
-#ifndef XtNtextOptions
-#define XtNtextOptions ((char*)&XtStrings[740])
-#endif
-#ifndef XtNtextSink
-#define XtNtextSink ((char*)&XtStrings[752])
-#endif
-#ifndef XtNtextSource
-#define XtNtextSource ((char*)&XtStrings[761])
-#endif
-#ifndef XtNthickness
-#define XtNthickness ((char*)&XtStrings[772])
-#endif
-#ifndef XtNthumb
-#define XtNthumb ((char*)&XtStrings[782])
-#endif
-#ifndef XtNthumbProc
-#define XtNthumbProc ((char*)&XtStrings[788])
-#endif
-#ifndef XtNtop
-#define XtNtop ((char*)&XtStrings[798])
-#endif
-#ifndef XtNtranslations
-#define XtNtranslations ((char*)&XtStrings[802])
-#endif
-#ifndef XtNunrealizeCallback
-#define XtNunrealizeCallback ((char*)&XtStrings[815])
-#endif
-#ifndef XtNupdate
-#define XtNupdate ((char*)&XtStrings[833])
-#endif
-#ifndef XtNuseBottom
-#define XtNuseBottom ((char*)&XtStrings[840])
-#endif
-#ifndef XtNuseRight
-#define XtNuseRight ((char*)&XtStrings[850])
-#endif
-#ifndef XtNvalue
-#define XtNvalue ((char*)&XtStrings[859])
-#endif
-#ifndef XtNvSpace
-#define XtNvSpace ((char*)&XtStrings[865])
-#endif
-#ifndef XtNwidth
-#define XtNwidth ((char*)&XtStrings[872])
-#endif
-#ifndef XtNwindow
-#define XtNwindow ((char*)&XtStrings[878])
-#endif
-#ifndef XtNx
-#define XtNx ((char*)&XtStrings[885])
-#endif
-#ifndef XtNy
-#define XtNy ((char*)&XtStrings[887])
-#endif
-#ifndef XtCAccelerators
-#define XtCAccelerators ((char*)&XtStrings[889])
-#endif
-#ifndef XtCBackground
-#define XtCBackground ((char*)&XtStrings[902])
-#endif
-#ifndef XtCBitmap
-#define XtCBitmap ((char*)&XtStrings[913])
-#endif
-#ifndef XtCBoolean
-#define XtCBoolean ((char*)&XtStrings[920])
-#endif
-#ifndef XtCBorderColor
-#define XtCBorderColor ((char*)&XtStrings[928])
-#endif
-#ifndef XtCBorderWidth
-#define XtCBorderWidth ((char*)&XtStrings[940])
-#endif
-#ifndef XtCCallback
-#define XtCCallback ((char*)&XtStrings[952])
-#endif
-#ifndef XtCColormap
-#define XtCColormap ((char*)&XtStrings[961])
-#endif
-#ifndef XtCColor
-#define XtCColor ((char*)&XtStrings[970])
-#endif
-#ifndef XtCCursor
-#define XtCCursor ((char*)&XtStrings[976])
-#endif
-#ifndef XtCDepth
-#define XtCDepth ((char*)&XtStrings[983])
-#endif
-#ifndef XtCEditType
-#define XtCEditType ((char*)&XtStrings[989])
-#endif
-#ifndef XtCEventBindings
-#define XtCEventBindings ((char*)&XtStrings[998])
-#endif
-#ifndef XtCFile
-#define XtCFile ((char*)&XtStrings[1012])
-#endif
-#ifndef XtCFont
-#define XtCFont ((char*)&XtStrings[1017])
-#endif
-#ifndef XtCForeground
-#define XtCForeground ((char*)&XtStrings[1022])
-#endif
-#ifndef XtCFraction
-#define XtCFraction ((char*)&XtStrings[1033])
-#endif
-#ifndef XtCFunction
-#define XtCFunction ((char*)&XtStrings[1042])
-#endif
-#ifndef XtCHeight
-#define XtCHeight ((char*)&XtStrings[1051])
-#endif
-#ifndef XtCHSpace
-#define XtCHSpace ((char*)&XtStrings[1058])
-#endif
-#ifndef XtCIndex
-#define XtCIndex ((char*)&XtStrings[1065])
-#endif
-#ifndef XtCInitialResourcesPersistent
-#define XtCInitialResourcesPersistent ((char*)&XtStrings[1071])
-#endif
-#ifndef XtCInsertPosition
-#define XtCInsertPosition ((char*)&XtStrings[1098])
-#endif
-#ifndef XtCInterval
-#define XtCInterval ((char*)&XtStrings[1113])
-#endif
-#ifndef XtCJustify
-#define XtCJustify ((char*)&XtStrings[1122])
-#endif
-#ifndef XtCKnobIndent
-#define XtCKnobIndent ((char*)&XtStrings[1130])
-#endif
-#ifndef XtCKnobPixel
-#define XtCKnobPixel ((char*)&XtStrings[1141])
-#endif
-#ifndef XtCLabel
-#define XtCLabel ((char*)&XtStrings[1151])
-#endif
-#ifndef XtCLength
-#define XtCLength ((char*)&XtStrings[1157])
-#endif
-#ifndef XtCMappedWhenManaged
-#define XtCMappedWhenManaged ((char*)&XtStrings[1164])
-#endif
-#ifndef XtCMargin
-#define XtCMargin ((char*)&XtStrings[1182])
-#endif
-#ifndef XtCMenuEntry
-#define XtCMenuEntry ((char*)&XtStrings[1189])
-#endif
-#ifndef XtCNotify
-#define XtCNotify ((char*)&XtStrings[1199])
-#endif
-#ifndef XtCOrientation
-#define XtCOrientation ((char*)&XtStrings[1206])
-#endif
-#ifndef XtCParameter
-#define XtCParameter ((char*)&XtStrings[1218])
-#endif
-#ifndef XtCPixmap
-#define XtCPixmap ((char*)&XtStrings[1228])
-#endif
-#ifndef XtCPosition
-#define XtCPosition ((char*)&XtStrings[1235])
-#endif
-#ifndef XtCReadOnly
-#define XtCReadOnly ((char*)&XtStrings[1244])
-#endif
-#ifndef XtCResize
-#define XtCResize ((char*)&XtStrings[1253])
-#endif
-#ifndef XtCReverseVideo
-#define XtCReverseVideo ((char*)&XtStrings[1260])
-#endif
-#ifndef XtCScreen
-#define XtCScreen ((char*)&XtStrings[1273])
-#endif
-#ifndef XtCScrollProc
-#define XtCScrollProc ((char*)&XtStrings[1280])
-#endif
-#ifndef XtCScrollDCursor
-#define XtCScrollDCursor ((char*)&XtStrings[1291])
-#endif
-#ifndef XtCScrollHCursor
-#define XtCScrollHCursor ((char*)&XtStrings[1305])
-#endif
-#ifndef XtCScrollLCursor
-#define XtCScrollLCursor ((char*)&XtStrings[1319])
-#endif
-#ifndef XtCScrollRCursor
-#define XtCScrollRCursor ((char*)&XtStrings[1333])
-#endif
-#ifndef XtCScrollUCursor
-#define XtCScrollUCursor ((char*)&XtStrings[1347])
-#endif
-#ifndef XtCScrollVCursor
-#define XtCScrollVCursor ((char*)&XtStrings[1361])
-#endif
-#ifndef XtCSelection
-#define XtCSelection ((char*)&XtStrings[1375])
-#endif
-#ifndef XtCSensitive
-#define XtCSensitive ((char*)&XtStrings[1385])
-#endif
-#ifndef XtCSelectionArray
-#define XtCSelectionArray ((char*)&XtStrings[1395])
-#endif
-#ifndef XtCSpace
-#define XtCSpace ((char*)&XtStrings[1410])
-#endif
-#ifndef XtCString
-#define XtCString ((char*)&XtStrings[1416])
-#endif
-#ifndef XtCTextOptions
-#define XtCTextOptions ((char*)&XtStrings[1423])
-#endif
-#ifndef XtCTextPosition
-#define XtCTextPosition ((char*)&XtStrings[1435])
-#endif
-#ifndef XtCTextSink
-#define XtCTextSink ((char*)&XtStrings[1448])
-#endif
-#ifndef XtCTextSource
-#define XtCTextSource ((char*)&XtStrings[1457])
-#endif
-#ifndef XtCThickness
-#define XtCThickness ((char*)&XtStrings[1468])
-#endif
-#ifndef XtCThumb
-#define XtCThumb ((char*)&XtStrings[1478])
-#endif
-#ifndef XtCTranslations
-#define XtCTranslations ((char*)&XtStrings[1484])
-#endif
-#ifndef XtCValue
-#define XtCValue ((char*)&XtStrings[1497])
-#endif
-#ifndef XtCVSpace
-#define XtCVSpace ((char*)&XtStrings[1503])
-#endif
-#ifndef XtCWidth
-#define XtCWidth ((char*)&XtStrings[1510])
-#endif
-#ifndef XtCWindow
-#define XtCWindow ((char*)&XtStrings[1516])
-#endif
-#ifndef XtCX
-#define XtCX ((char*)&XtStrings[1523])
-#endif
-#ifndef XtCY
-#define XtCY ((char*)&XtStrings[1525])
-#endif
-#ifndef XtRAcceleratorTable
-#define XtRAcceleratorTable ((char*)&XtStrings[1527])
-#endif
-#ifndef XtRAtom
-#define XtRAtom ((char*)&XtStrings[1544])
-#endif
-#ifndef XtRBitmap
-#define XtRBitmap ((char*)&XtStrings[1549])
-#endif
-#ifndef XtRBool
-#define XtRBool ((char*)&XtStrings[1556])
-#endif
-#ifndef XtRBoolean
-#define XtRBoolean ((char*)&XtStrings[1561])
-#endif
-#ifndef XtRCallback
-#define XtRCallback ((char*)&XtStrings[1569])
-#endif
-#ifndef XtRCallProc
-#define XtRCallProc ((char*)&XtStrings[1578])
-#endif
-#ifndef XtRCardinal
-#define XtRCardinal ((char*)&XtStrings[1587])
-#endif
-#ifndef XtRColor
-#define XtRColor ((char*)&XtStrings[1596])
-#endif
-#ifndef XtRColormap
-#define XtRColormap ((char*)&XtStrings[1602])
-#endif
-#ifndef XtRCursor
-#define XtRCursor ((char*)&XtStrings[1611])
-#endif
-#ifndef XtRDimension
-#define XtRDimension ((char*)&XtStrings[1618])
-#endif
-#ifndef XtRDisplay
-#define XtRDisplay ((char*)&XtStrings[1628])
-#endif
-#ifndef XtREditMode
-#define XtREditMode ((char*)&XtStrings[1636])
-#endif
-#ifndef XtREnum
-#define XtREnum ((char*)&XtStrings[1645])
-#endif
-#ifndef XtRFile
-#define XtRFile ((char*)&XtStrings[1650])
-#endif
-#ifndef XtRFloat
-#define XtRFloat ((char*)&XtStrings[1655])
-#endif
-#ifndef XtRFont
-#define XtRFont ((char*)&XtStrings[1661])
-#endif
-#ifndef XtRFontStruct
-#define XtRFontStruct ((char*)&XtStrings[1666])
-#endif
-#ifndef XtRFunction
-#define XtRFunction ((char*)&XtStrings[1677])
-#endif
-#ifndef XtRGeometry
-#define XtRGeometry ((char*)&XtStrings[1686])
-#endif
-#ifndef XtRImmediate
-#define XtRImmediate ((char*)&XtStrings[1695])
-#endif
-#ifndef XtRInitialState
-#define XtRInitialState ((char*)&XtStrings[1705])
-#endif
-#ifndef XtRInt
-#define XtRInt ((char*)&XtStrings[1718])
-#endif
-#ifndef XtRJustify
-#define XtRJustify ((char*)&XtStrings[1722])
-#endif
-#ifndef XtRLongBoolean
-#define XtRLongBoolean ((char*)&XtStrings[1730])
-#endif
-#ifndef XtRObject
-#define XtRObject ((char*)&XtStrings[1735])
-#endif
-#ifndef XtROrientation
-#define XtROrientation ((char*)&XtStrings[1742])
-#endif
-#ifndef XtRPixel
-#define XtRPixel ((char*)&XtStrings[1754])
-#endif
-#ifndef XtRPixmap
-#define XtRPixmap ((char*)&XtStrings[1760])
-#endif
-#ifndef XtRPointer
-#define XtRPointer ((char*)&XtStrings[1767])
-#endif
-#ifndef XtRPosition
-#define XtRPosition ((char*)&XtStrings[1775])
-#endif
-#ifndef XtRScreen
-#define XtRScreen ((char*)&XtStrings[1784])
-#endif
-#ifndef XtRShort
-#define XtRShort ((char*)&XtStrings[1791])
-#endif
-#ifndef XtRString
-#define XtRString ((char*)&XtStrings[1797])
-#endif
-#ifndef XtRStringArray
-#define XtRStringArray ((char*)&XtStrings[1804])
-#endif
-#ifndef XtRStringTable
-#define XtRStringTable ((char*)&XtStrings[1816])
-#endif
-#ifndef XtRUnsignedChar
-#define XtRUnsignedChar ((char*)&XtStrings[1828])
-#endif
-#ifndef XtRTranslationTable
-#define XtRTranslationTable ((char*)&XtStrings[1841])
-#endif
-#ifndef XtRVisual
-#define XtRVisual ((char*)&XtStrings[1858])
-#endif
-#ifndef XtRWidget
-#define XtRWidget ((char*)&XtStrings[1865])
-#endif
-#ifndef XtRWidgetClass
-#define XtRWidgetClass ((char*)&XtStrings[1872])
-#endif
-#ifndef XtRWidgetList
-#define XtRWidgetList ((char*)&XtStrings[1884])
-#endif
-#ifndef XtRWindow
-#define XtRWindow ((char*)&XtStrings[1895])
-#endif
-#ifndef XtEoff
-#define XtEoff ((char*)&XtStrings[1902])
-#endif
-#ifndef XtEfalse
-#define XtEfalse ((char*)&XtStrings[1906])
-#endif
-#ifndef XtEno
-#define XtEno ((char*)&XtStrings[1912])
-#endif
-#ifndef XtEon
-#define XtEon ((char*)&XtStrings[1915])
-#endif
-#ifndef XtEtrue
-#define XtEtrue ((char*)&XtStrings[1918])
-#endif
-#ifndef XtEyes
-#define XtEyes ((char*)&XtStrings[1923])
-#endif
-#ifndef XtEvertical
-#define XtEvertical ((char*)&XtStrings[1927])
-#endif
-#ifndef XtEhorizontal
-#define XtEhorizontal ((char*)&XtStrings[1936])
-#endif
-#ifndef XtEtextRead
-#define XtEtextRead ((char*)&XtStrings[1947])
-#endif
-#ifndef XtEtextAppend
-#define XtEtextAppend ((char*)&XtStrings[1952])
-#endif
-#ifndef XtEtextEdit
-#define XtEtextEdit ((char*)&XtStrings[1959])
-#endif
-#ifndef XtExtdefaultbackground
-#define XtExtdefaultbackground ((char*)&XtStrings[1964])
-#endif
-#ifndef XtExtdefaultforeground
-#define XtExtdefaultforeground ((char*)&XtStrings[1984])
-#endif
-#ifndef XtExtdefaultfont
-#define XtExtdefaultfont ((char*)&XtStrings[2004])
-#endif
-#ifndef XtNfontSet
-#define XtNfontSet ((char*)&XtStrings[2018])
-#endif
-#ifndef XtRFontSet
-#define XtRFontSet ((char*)&XtStrings[2026])
-#endif
-#ifndef XtCFontSet
-#define XtCFontSet ((char*)&XtStrings[2034])
-#endif
-#ifndef XtRGravity
-#define XtRGravity ((char*)&XtStrings[2042])
-#endif
-#ifndef XtNcreateHook
-#define XtNcreateHook ((char*)&XtStrings[2050])
-#endif
-#ifndef XtNchangeHook
-#define XtNchangeHook ((char*)&XtStrings[2061])
-#endif
-#ifndef XtNconfigureHook
-#define XtNconfigureHook ((char*)&XtStrings[2072])
-#endif
-#ifndef XtNgeometryHook
-#define XtNgeometryHook ((char*)&XtStrings[2086])
-#endif
-#ifndef XtNdestroyHook
-#define XtNdestroyHook ((char*)&XtStrings[2099])
-#endif
-#ifndef XtNshells
-#define XtNshells ((char*)&XtStrings[2111])
-#endif
-#ifndef XtNnumShells
-#define XtNnumShells ((char*)&XtStrings[2118])
-#endif
-#ifndef XtRCommandArgArray
-#define XtRCommandArgArray ((char*)&XtStrings[2128])
-#endif
-#ifndef XtRDirectoryString
-#define XtRDirectoryString ((char*)&XtStrings[2144])
-#endif
-#ifndef XtREnvironmentArray
-#define XtREnvironmentArray ((char*)&XtStrings[2160])
-#endif
-#ifndef XtRRestartStyle
-#define XtRRestartStyle ((char*)&XtStrings[2177])
-#endif
-#ifndef XtRSmcConn
-#define XtRSmcConn ((char*)&XtStrings[2190])
-#endif
-#ifndef XtHcreate
-#define XtHcreate ((char*)&XtStrings[2198])
-#endif
-#ifndef XtHsetValues
-#define XtHsetValues ((char*)&XtStrings[2207])
-#endif
-#ifndef XtHmanageChildren
-#define XtHmanageChildren ((char*)&XtStrings[2219])
-#endif
-#ifndef XtHunmanageChildren
-#define XtHunmanageChildren ((char*)&XtStrings[2236])
-#endif
-#ifndef XtHmanageSet
-#define XtHmanageSet ((char*)&XtStrings[2255])
-#endif
-#ifndef XtHunmanageSet
-#define XtHunmanageSet ((char*)&XtStrings[2267])
-#endif
-#ifndef XtHrealizeWidget
-#define XtHrealizeWidget ((char*)&XtStrings[2281])
-#endif
-#ifndef XtHunrealizeWidget
-#define XtHunrealizeWidget ((char*)&XtStrings[2297])
-#endif
-#ifndef XtHaddCallback
-#define XtHaddCallback ((char*)&XtStrings[2315])
-#endif
-#ifndef XtHaddCallbacks
-#define XtHaddCallbacks ((char*)&XtStrings[2329])
-#endif
-#ifndef XtHremoveCallback
-#define XtHremoveCallback ((char*)&XtStrings[2344])
-#endif
-#ifndef XtHremoveCallbacks
-#define XtHremoveCallbacks ((char*)&XtStrings[2361])
-#endif
-#ifndef XtHremoveAllCallbacks
-#define XtHremoveAllCallbacks ((char*)&XtStrings[2379])
-#endif
-#ifndef XtHaugmentTranslations
-#define XtHaugmentTranslations ((char*)&XtStrings[2400])
-#endif
-#ifndef XtHoverrideTranslations
-#define XtHoverrideTranslations ((char*)&XtStrings[2422])
-#endif
-#ifndef XtHuninstallTranslations
-#define XtHuninstallTranslations ((char*)&XtStrings[2445])
-#endif
-#ifndef XtHsetKeyboardFocus
-#define XtHsetKeyboardFocus ((char*)&XtStrings[2469])
-#endif
-#ifndef XtHsetWMColormapWindows
-#define XtHsetWMColormapWindows ((char*)&XtStrings[2488])
-#endif
-#ifndef XtHsetMappedWhenManaged
-#define XtHsetMappedWhenManaged ((char*)&XtStrings[2511])
-#endif
-#ifndef XtHmapWidget
-#define XtHmapWidget ((char*)&XtStrings[2534])
-#endif
-#ifndef XtHunmapWidget
-#define XtHunmapWidget ((char*)&XtStrings[2546])
-#endif
-#ifndef XtHpopup
-#define XtHpopup ((char*)&XtStrings[2560])
-#endif
-#ifndef XtHpopupSpringLoaded
-#define XtHpopupSpringLoaded ((char*)&XtStrings[2568])
-#endif
-#ifndef XtHpopdown
-#define XtHpopdown ((char*)&XtStrings[2588])
-#endif
-#ifndef XtHconfigure
-#define XtHconfigure ((char*)&XtStrings[2598])
-#endif
-#ifndef XtHpreGeometry
-#define XtHpreGeometry ((char*)&XtStrings[2610])
-#endif
-#ifndef XtHpostGeometry
-#define XtHpostGeometry ((char*)&XtStrings[2624])
-#endif
-#ifndef XtHdestroy
-#define XtHdestroy ((char*)&XtStrings[2639])
-#endif
-#endif /* XTSTRINGDEFINES */
-
-#ifndef XTSTRINGDEFINES
-#undef _XtStringDefs_h_Const
-#endif
-
-#endif /* _XtStringDefs_h_ */
diff --git a/openflow/usr/include/X11/Sunkeysym.h b/openflow/usr/include/X11/Sunkeysym.h
deleted file mode 100644
index 78d1286..0000000
--- a/openflow/usr/include/X11/Sunkeysym.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-/************************************************************
-
-Copyright 1991, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-***********************************************************/
-
-/*
- * Floating Accent
- */
-
-#define	SunXK_FA_Grave		0x1005FF00
-#define	SunXK_FA_Circum		0x1005FF01
-#define	SunXK_FA_Tilde		0x1005FF02
-#define	SunXK_FA_Acute		0x1005FF03
-#define	SunXK_FA_Diaeresis	0x1005FF04
-#define	SunXK_FA_Cedilla	0x1005FF05
-
-/*
- * Miscellaneous Functions
- */
-
-#define	SunXK_F36		0x1005FF10	/* Labeled F11 */
-#define	SunXK_F37		0x1005FF11	/* Labeled F12 */
-
-#define SunXK_Sys_Req   	0x1005FF60
-#define SunXK_Print_Screen	0x0000FF61	/* Same as XK_Print */
-
-/*
- * International & Multi-Key Character Composition
- */
-
-#define SunXK_Compose		0x0000FF20	/* Same as XK_Multi_key */
-#define SunXK_AltGraph		0x0000FF7E	/* Same as XK_Mode_switch */
-
-/*
- * Cursor Control
- */
-
-#define SunXK_PageUp		0x0000FF55 	/* Same as XK_Prior */
-#define SunXK_PageDown		0x0000FF56	/* Same as XK_Next */
-
-/*
- * Open Look Functions
- */
-
-#define SunXK_Undo		0x0000FF65	/* Same as XK_Undo */
-#define SunXK_Again		0x0000FF66	/* Same as XK_Redo */
-#define SunXK_Find		0x0000FF68	/* Same as XK_Find */
-#define SunXK_Stop		0x0000FF69	/* Same as XK_Cancel */
-#define SunXK_Props		0x1005FF70
-#define SunXK_Front		0x1005FF71
-#define SunXK_Copy		0x1005FF72
-#define SunXK_Open		0x1005FF73
-#define SunXK_Paste		0x1005FF74
-#define SunXK_Cut		0x1005FF75
-
-#define SunXK_PowerSwitch		0x1005FF76
-#define SunXK_AudioLowerVolume		0x1005FF77
-#define SunXK_AudioMute			0x1005FF78
-#define SunXK_AudioRaiseVolume		0x1005FF79
-#define SunXK_VideoDegauss		0x1005FF7A
-#define SunXK_VideoLowerBrightness	0x1005FF7B
-#define SunXK_VideoRaiseBrightness	0x1005FF7C
-#define SunXK_PowerSwitchShift		0x1005FF7D
diff --git a/openflow/usr/include/X11/ThreadsI.h b/openflow/usr/include/X11/ThreadsI.h
deleted file mode 100644
index ff6dee3..0000000
--- a/openflow/usr/include/X11/ThreadsI.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/************************************************************
-
-Copyright (c) 1993, Oracle and/or its affiliates. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-********************************************************/
-
-/*
-
-Copyright 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xt/ThreadsI.h,v 3.5 2001/12/14 19:56:31 dawes Exp $ */
-
-#ifndef _XtThreadsI_h
-#define _XtThreadsI_h
-
-#include <X11/XlibConf.h>
-
-#ifdef XTHREADS
-
-typedef struct _LockRec *LockPtr;
-
-typedef void (*ThreadAppProc)(
-    XtAppContext /* app */
-);
-
-typedef void (*ThreadAppYieldLockProc)(
-    XtAppContext, /* app */
-    Boolean*, /* push_thread */
-    Boolean*, /* pushed_thread */
-    int* /* level */
-);
-
-typedef void (*ThreadAppRestoreLockProc)(
-    XtAppContext /* app */,
-    int, /* level */
-    Boolean* /* pushed_thread */
-);
-
-_XFUNCPROTOBEGIN
-
-extern void (*_XtProcessLock)(
-    void
-);
-
-extern void (*_XtProcessUnlock)(
-    void
-);
-
-extern void (*_XtInitAppLock)(
-    XtAppContext /* app */
-);
-
-_XFUNCPROTOEND
-
-#define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app)
-#define FREE_APP_LOCK(app) if(app && app->free_lock)(*app->free_lock)(app)
-
-#define LOCK_PROCESS if(_XtProcessLock)(*_XtProcessLock)()
-#define UNLOCK_PROCESS if(_XtProcessUnlock)(*_XtProcessUnlock)()
-#define LOCK_APP(app) if(app && app->lock)(*app->lock)(app)
-#define UNLOCK_APP(app) if(app && app->unlock)(*app->unlock)(app)
-
-#define YIELD_APP_LOCK(app,push,pushed,level)\
-	 if(app && app->yield_lock) (*app->yield_lock)(app,push,pushed,level)
-#define RESTORE_APP_LOCK(app,level,pushed)\
-	 if(app && app->restore_lock) (*app->restore_lock)(app,level,pushed)
-
-#define WIDGET_TO_APPCON(w) \
-    XtAppContext app = (w && _XtProcessLock ? \
-	XtWidgetToApplicationContext(w) : NULL)
-
-#define DPY_TO_APPCON(d) \
-    XtAppContext app = (_XtProcessLock ? XtDisplayToApplicationContext(d): NULL)
-
-#else /* defined(XTHREADS) */
-
-#define LOCK_PROCESS
-#define UNLOCK_PROCESS
-#define LOCK_APP(app)
-#define UNLOCK_APP(app)
-
-#define INIT_APP_LOCK(app)
-#define FREE_APP_LOCK(app)
-
-#define WIDGET_TO_APPCON(w)
-#define DPY_TO_APPCON(d)
-
-#endif /* !defined(XTHREADS) */
-#endif /* _XtThreadsI_h */
diff --git a/openflow/usr/include/X11/TranslateI.h b/openflow/usr/include/X11/TranslateI.h
deleted file mode 100644
index 7da70b9..0000000
--- a/openflow/usr/include/X11/TranslateI.h
+++ /dev/null
@@ -1,606 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * TranslateI.h - Header file private to translation management
- *
- * Author:	Gabe Beged-Dov, HP
- *
- * Former Author:	Charles Haynes
- * 		Digital Equipment Corporation
- * 		Western Research Laboratory
- * Date:	Sat Aug 29 1987
- */
-
-/*#define REFCNT_TRANSLATIONS*/
-#define CACHE_TRANSLATIONS
-
-#define TM_NO_MATCH (-2)
-
-#define _XtRStateTablePair "_XtStateTablePair"
-
-typedef unsigned char TMByteCard;
-typedef unsigned short TMShortCard;
-typedef unsigned long TMLongCard;
-typedef short TMShortInt;
-
-typedef struct _TMTypeMatchRec *TMTypeMatch;
-typedef struct _TMModifierMatchRec *TMModifierMatch;
-typedef struct _TMEventRec *TMEventPtr;
-
-typedef Boolean (*MatchProc)(TMTypeMatch typeMatch,
-			     TMModifierMatch modMatch,
-			     TMEventPtr eventSeq);
-
-typedef struct _ModToKeysymTable {
-    Modifiers mask;
-    int count;
-    int idx;
-} ModToKeysymTable;
-
-typedef struct _LateBindings {
-    unsigned int knot:1;
-    unsigned int pair:1;
-    unsigned short ref_count;	/* garbage collection */
-    KeySym keysym;
-} LateBindings, *LateBindingsPtr;
-
-typedef short ModifierMask;
-
-typedef struct _ActionsRec *ActionPtr;
-typedef struct _ActionsRec {
-    int idx;			/* index into quarkTable to find proc */
-    String *params;		/* pointer to array of params */
-    Cardinal num_params;	/* number of params */
-    ActionPtr next;		/* next action to perform */
-} ActionRec;
-
-typedef struct _XtStateRec *StatePtr;
-typedef struct _XtStateRec {
-    unsigned int	isCycleStart:1;
-    unsigned int	isCycleEnd:1;
-    TMShortCard		typeIndex;
-    TMShortCard		modIndex;
-    ActionPtr		actions;	/* rhs list of actions to perform */
-    StatePtr 		nextLevel;
-}StateRec;
-
-
-#define XtTableReplace	0
-#define XtTableAugment	1
-#define XtTableOverride	2
-#define XtTableUnmerge  3
-
-typedef unsigned int _XtTranslateOp;
-
-/*
- * New Definitions
- */
-typedef struct _TMModifierMatchRec{
-    TMLongCard	 modifiers;
-    TMLongCard	 modifierMask;
-    LateBindingsPtr lateModifiers;
-    Boolean	 standard;
-}TMModifierMatchRec;
-
-typedef struct _TMTypeMatchRec{
-    TMLongCard	 eventType;
-    TMLongCard	 eventCode;
-    TMLongCard	 eventCodeMask;
-    MatchProc	 matchEvent;
-}TMTypeMatchRec;
-
-typedef struct _TMBranchHeadRec {
-    unsigned int	isSimple:1;
-    unsigned int	hasActions:1;
-    unsigned int	hasCycles:1;
-    unsigned int	more:13;
-    TMShortCard		typeIndex;
-    TMShortCard		modIndex;
-}TMBranchHeadRec, *TMBranchHead;
-
-/* NOTE: elements of this structure must match those of
- * TMComplexStateTreeRec and TMParseStateTreeRec.
- */
-typedef struct _TMSimpleStateTreeRec{
-    unsigned int	isSimple:1;
-    unsigned int	isAccelerator:1;
-    unsigned int	mappingNotifyInterest:1;
-    unsigned int	refCount:13;
-    TMShortCard		numBranchHeads;
-    TMShortCard		numQuarks;   /* # of entries in quarkTbl */
-    TMShortCard		unused;	     /* to ensure same alignment */
-    TMBranchHeadRec	*branchHeadTbl;
-    XrmQuark		*quarkTbl;  /* table of quarkified rhs*/
-}TMSimpleStateTreeRec, *TMSimpleStateTree;
-
-/* NOTE: elements of this structure must match those of
- * TMSimpleStateTreeRec and TMParseStateTreeRec.
- */
-typedef struct _TMComplexStateTreeRec{
-    unsigned int	isSimple:1;
-    unsigned int	isAccelerator:1;
-    unsigned int	mappingNotifyInterest:1;
-    unsigned int	refCount:13;
-    TMShortCard		numBranchHeads;
-    TMShortCard		numQuarks;   /* # of entries in quarkTbl */
-    TMShortCard		numComplexBranchHeads;
-    TMBranchHeadRec	*branchHeadTbl;
-    XrmQuark		*quarkTbl;  /* table of quarkified rhs*/
-    StatePtr		*complexBranchHeadTbl;
-}TMComplexStateTreeRec, *TMComplexStateTree;
-
-/* NOTE: elements of this structure must match those of
- * TMSimpleStateTreeRec and TMComplexStateTreeRec.
- */
-typedef struct _TMParseStateTreeRec{
-    unsigned int	isSimple:1;
-    unsigned int	isAccelerator:1;
-    unsigned int	mappingNotifyInterest:1;
-    unsigned int	isStackQuarks:1;
-    unsigned int	isStackBranchHeads:1;
-    unsigned int	isStackComplexBranchHeads:1;
-    unsigned int	unused:10; /* to ensure correct alignment */
-    TMShortCard		numBranchHeads;
-    TMShortCard		numQuarks;   /* # of entries in quarkTbl */
-    TMShortCard		numComplexBranchHeads;
-    TMBranchHeadRec	*branchHeadTbl;
-    XrmQuark		*quarkTbl;  /* table of quarkified rhs*/
-    StatePtr		*complexBranchHeadTbl;
-    TMShortCard		branchHeadTblSize;
-    TMShortCard		quarkTblSize; /*total size of quarkTbl */
-    TMShortCard		complexBranchHeadTblSize;
-    StatePtr		head;
-}TMParseStateTreeRec, *TMParseStateTree;
-
-typedef union _TMStateTreeRec{
-    TMSimpleStateTreeRec	simple;
-    TMParseStateTreeRec		parse;
-    TMComplexStateTreeRec	complex;
-}*TMStateTree, **TMStateTreePtr, **TMStateTreeList;
-
-typedef struct _TMSimpleBindProcsRec {
-    XtActionProc	*procs;
-}TMSimpleBindProcsRec, *TMSimpleBindProcs;
-
-typedef struct _TMComplexBindProcsRec {
-    Widget	 	widget;		/*widgetID to pass to action Proc*/
-    XtTranslations	aXlations;
-    XtActionProc	*procs;
-}TMComplexBindProcsRec, *TMComplexBindProcs;
-
-typedef struct _TMSimpleBindDataRec {
-    unsigned int		isComplex:1;	/* must be first */
-    TMSimpleBindProcsRec	bindTbl[1];	/* variable length */
-}TMSimpleBindDataRec, *TMSimpleBindData;
-
-typedef struct _TMComplexBindDataRec {
-    unsigned int		isComplex:1;	/* must be first */
-    struct _ATranslationData	*accel_context;	/* for GetValues */
-    TMComplexBindProcsRec	bindTbl[1]; 	/* variable length */
-}TMComplexBindDataRec, *TMComplexBindData;
-
-typedef union _TMBindDataRec{
-    TMSimpleBindDataRec		simple;
-    TMComplexBindDataRec	complex;
-}*TMBindData;
-
-typedef struct _TranslationData{
-    unsigned char		hasBindings;	/* must be first */
-    unsigned char		operation; /*replace,augment,override*/
-    TMShortCard			numStateTrees;
-    struct _TranslationData    	*composers[2];
-    EventMask			eventMask;
-    TMStateTree			stateTreeTbl[1]; /* variable length */
-}TranslationData;
-
-/*
- * ATranslations is returned by GetValues for translations that contain
- * accelerators.  The TM can differentiate between this and TranslationData
- * (that don't have a bindTbl) by looking at the first field (hasBindings)
- * of either structure.  All ATranslationData structures associated with a
- * widget are chained off the BindData record of the widget.
- */
-typedef struct _ATranslationData{
-    unsigned char		hasBindings;	/* must be first */
-    unsigned char		operation;
-    struct _TranslationData	*xlations;  /* actual translations */
-    struct _ATranslationData	*next;      /* chain the contexts together */
-    TMComplexBindProcsRec	bindTbl[1]; /* accelerator bindings */
-}ATranslationData, *ATranslations;
-
-typedef struct _TMConvertRec {
-    XtTranslations	old; /* table to merge into */
-    XtTranslations	new; /* table to merge from */
-} TMConvertRec;
-
-#define _XtEventTimerEventType ((TMLongCard)~0L)
-#define KeysymModMask		(1L<<27) /* private to TM */
-#define AnyButtonMask		(1L<<28) /* private to TM */
-
-typedef struct _EventRec {
-    TMLongCard modifiers;
-    TMLongCard modifierMask;
-    LateBindingsPtr lateModifiers;
-    TMLongCard eventType;
-    TMLongCard eventCode;
-    TMLongCard eventCodeMask;
-    MatchProc matchEvent;
-    Boolean standard;
-} Event;
-
-typedef struct _EventSeqRec *EventSeqPtr;
-typedef struct _EventSeqRec {
-    Event event;	/* X event description */
-    StatePtr state;	/* private to state table builder */
-    EventSeqPtr next;	/* next event on line */
-    ActionPtr actions;	/* r.h.s.   list of actions to perform */
-} EventSeqRec;
-
-typedef EventSeqRec EventRec;
-typedef EventSeqPtr EventPtr;
-
-typedef struct _TMEventRec {
-    XEvent *xev;
-    Event event;
-}TMEventRec;
-
-typedef struct _ActionHookRec {
-    struct _ActionHookRec* next; /* must remain first */
-    XtAppContext app;
-    XtActionHookProc proc;
-    XtPointer closure;
-} ActionHookRec, *ActionHook;
-
-/* choose a number between 2 and 8 */
-#define TMKEYCACHELOG2 6
-#define TMKEYCACHESIZE (1<<TMKEYCACHELOG2)
-
-typedef struct _KeyCacheRec {
-    unsigned char modifiers_return[256]; /* constant per KeyCode, key proc */
-    KeyCode keycode[TMKEYCACHESIZE];
-    unsigned char modifiers[TMKEYCACHESIZE];
-    KeySym keysym[TMKEYCACHESIZE];
-} TMKeyCache;
-
-typedef struct _TMKeyContextRec {
-    XEvent *event;
-    unsigned long serial;
-    KeySym keysym;
-    Modifiers modifiers;
-    TMKeyCache keycache;  /* keep this last, to keep offsets to others small */
-} TMKeyContextRec, *TMKeyContext;
-
-typedef struct _TMGlobalRec{
-    TMTypeMatchRec 		**typeMatchSegmentTbl;
-    TMShortCard			numTypeMatches;
-    TMShortCard			numTypeMatchSegments;
-    TMShortCard			typeMatchSegmentTblSize;
-    TMModifierMatchRec 		**modMatchSegmentTbl;
-    TMShortCard			numModMatches;
-    TMShortCard			numModMatchSegments;
-    TMShortCard			modMatchSegmentTblSize;
-    Boolean			newMatchSemantics;
-#ifdef TRACE_TM
-    XtTranslations		*tmTbl;
-    TMShortCard			numTms;
-    TMShortCard			tmTblSize;
-    struct _TMBindCacheRec	**bindCacheTbl;
-    TMShortCard			numBindCache;
-    TMShortCard			bindCacheTblSize;
-    TMShortCard			numLateBindings;
-    TMShortCard			numBranchHeads;
-    TMShortCard			numComplexStates;
-    TMShortCard			numComplexActions;
-#endif /* TRACE_TM */
-}TMGlobalRec;
-
-_XFUNCPROTOBEGIN
-
-extern TMGlobalRec _XtGlobalTM;
-
-#define TM_MOD_SEGMENT_SIZE 	16
-#define TM_TYPE_SEGMENT_SIZE 	16
-
-#define TMGetTypeMatch(idx) \
-  ((TMTypeMatch) \
-   &((_XtGlobalTM.typeMatchSegmentTbl[((idx) >> 4)])[(idx) & 15]))
-#define TMGetModifierMatch(idx) \
-  ((TMModifierMatch) \
-   &((_XtGlobalTM.modMatchSegmentTbl[(idx) >> 4])[(idx) & 15]))
-
-/* Useful Access Macros */
-#define TMNewMatchSemantics() (_XtGlobalTM.newMatchSemantics)
-#define TMBranchMore(branch) (branch->more)
-#define TMComplexBranchHead(tree, br) \
-  (((TMComplexStateTree)tree)->complexBranchHeadTbl[TMBranchMore(br)])
-
-#define TMGetComplexBindEntry(bindData, idx) \
-  ((TMComplexBindProcs)&(((TMComplexBindData)bindData)->bindTbl[idx]))
-
-#define TMGetSimpleBindEntry(bindData, idx) \
-  ((TMSimpleBindProcs)&(((TMSimpleBindData)bindData)->bindTbl[idx]))
-
-
-#define _InitializeKeysymTables(dpy, pd) \
-    if (pd->keysyms == NULL) \
-        _XtBuildKeysymTables(dpy, pd)
-
-/*
- * Internal Functions
- */
-
-extern void _XtPopup(
-    Widget      /* widget */,
-    XtGrabKind  /* grab_kind */,
-    _XtBoolean	/* spring_loaded */
-);
-
-extern String _XtPrintXlations(
-    Widget		/* w */,
-    XtTranslations 	/* xlations */,
-    Widget		/* accelWidget */,
-    _XtBoolean		/* includeRHS */
-);
-
-extern void _XtRegisterGrabs(
-    Widget	/* widget */
-);
-
-extern XtPointer _XtInitializeActionData(
-    struct _XtActionsRec *	/* actions */,
-    Cardinal 			/* count */,
-    _XtBoolean			/* inPlace */
-);
-
-extern void _XtAddEventSeqToStateTree(
-    EventSeqPtr		/* eventSeq */,
-    TMParseStateTree	/* stateTree */
-);
-
-extern Boolean _XtMatchUsingStandardMods(
-    TMTypeMatch		/* typeMatch */,
-    TMModifierMatch	/* modMatch */,
-    TMEventPtr		/* eventSeq */
-);
-
-extern Boolean _XtMatchUsingDontCareMods(
-    TMTypeMatch		/* typeMatch */,
-    TMModifierMatch	/* modMatch */,
-    TMEventPtr		/* eventSeq */
-);
-
-extern Boolean _XtRegularMatch(
-    TMTypeMatch		/* typeMatch */,
-    TMModifierMatch	/* modMatch */,
-    TMEventPtr		/* eventSeq */
-);
-
-extern Boolean _XtMatchAtom(
-    TMTypeMatch		/* typeMatch */,
-    TMModifierMatch	/* modMatch */,
-    TMEventPtr		/* eventSeq */
-);
-
-extern void _XtTranslateEvent(
-    Widget		/* widget */,
-    XEvent*		/* event */
-);
-
-#include "CallbackI.h"
-#include "EventI.h"
-#include "HookObjI.h"
-#include "PassivGraI.h"
-#include "ThreadsI.h"
-#include "InitialI.h"
-#include "ResourceI.h"
-#include "StringDefs.h"
-
-extern void _XtBuildKeysymTables(Display *dpy, XtPerDisplay pd);
-
-#ifndef NO_MIT_HACKS
-extern void  _XtDisplayTranslations(
-    Widget		/* widget */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern void  _XtDisplayAccelerators(
-    Widget		/* widget */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-
-extern void _XtDisplayInstalledAccelerators(
-    Widget		/* widget */,
-    XEvent*		/* event */,
-    String*		/* params */,
-    Cardinal*		/* num_params */
-);
-#endif /* ifndef NO_MIT_HACKS */
-
-extern void _XtPopupInitialize(
-    XtAppContext	/* app_context */
-);
-
-extern void _XtBindActions(
-    Widget	/* widget */,
-    XtTM 	/* tm_rec */
-);
-
-extern Boolean _XtComputeLateBindings(
-    Display*		/* dpy */,
-    LateBindingsPtr	/* lateModifiers */,
-    Modifiers*		/* computed */,
-    Modifiers*		/* computedMask */
-);
-
-extern XtTranslations _XtCreateXlations(
-    TMStateTree *	/* stateTrees */,
-    TMShortCard		/* numStateTrees */,
-    XtTranslations 	/* first */,
-    XtTranslations	/* second */
-);
-
-extern Boolean _XtCvtMergeTranslations(
-    Display*	/* dpy */,
-    XrmValuePtr	/* args */,
-    Cardinal*	/* num_args */,
-    XrmValuePtr	/* from */,
-    XrmValuePtr	/* to */,
-    XtPointer*	/* closure_ret */
-);
-
-void _XtRemoveStateTreeByIndex(
-    XtTranslations	/* xlations */,
-    TMShortCard	/* i */);
-
-void _XtFreeTranslations(
-    XtAppContext	/* app */,
-    XrmValuePtr		/* toVal */,
-    XtPointer		/* closure */,
-    XrmValuePtr		/* args */,
-    Cardinal*		/* num_args */
-);
-
-extern TMShortCard _XtGetModifierIndex(
-    Event*	/* event */
-);
-
-extern TMShortCard _XtGetQuarkIndex(
-    TMParseStateTree	/* stateTreePtr */,
-    XrmQuark		/* quark */
-);
-
-extern XtTranslations _XtGetTranslationValue(
-    Widget		/* widget */
-);
-
-extern TMShortCard _XtGetTypeIndex(
-    Event*	/* event */
-);
-
-extern void _XtGrabInitialize(
-    XtAppContext	/* app */
-);
-
-extern void _XtInstallTranslations(
-    Widget		/* widget */
-);
-
-extern void _XtRemoveTranslations(
-    Widget		/* widget */
-);
-
-extern void _XtDestroyTMData(
-    Widget		/* widget */
-);
-
-extern void _XtMergeTranslations(
-    Widget		/* widget */,
-    XtTranslations	/* newXlations */,
-    _XtTranslateOp	/* operation */
-);
-
-extern void _XtActionInitialize(
-    XtAppContext	/* app */
-);
-
-extern TMStateTree _XtParseTreeToStateTree(
-    TMParseStateTree 	/* parseTree */
-);
-
-extern String _XtPrintActions(
-    ActionRec*	/* actions */,
-    XrmQuark*	/* quarkTbl */
-);
-
-extern String _XtPrintState(
-    TMStateTree	/* stateTree */,
-    TMBranchHead /* branchHead */);
-
-extern String _XtPrintEventSeq(
-    EventSeqPtr	/* eventSeq */,
-    Display*	/* dpy */
-);
-
-typedef Boolean (*_XtTraversalProc)(
-    StatePtr	/* state */,
-    XtPointer	/* data */
-);
-
-extern void _XtTraverseStateTree(
-    TMStateTree		/* tree */,
-    _XtTraversalProc	/* func */,
-    XtPointer		/* data */
-);
-
-extern void _XtTranslateInitialize(
-    void
-);
-
-extern void _XtAddTMConverters(
-    ConverterTable	/* table */
-);
-
-extern void _XtUnbindActions(
-    Widget		/* widget */,
-    XtTranslations	/* xlations */,
-    TMBindData		/* bindData */
-);
-
-extern void _XtUnmergeTranslations(
-    Widget		/* widget */,
-    XtTranslations 	/* xlations */
-);
-
-/* TMKey.c */
-extern void _XtAllocTMContext(XtPerDisplay pd);
-
-_XFUNCPROTOEND
diff --git a/openflow/usr/include/X11/VarargsI.h b/openflow/usr/include/X11/VarargsI.h
deleted file mode 100644
index 790a271..0000000
--- a/openflow/usr/include/X11/VarargsI.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-
-Copyright 1985, 1986, 1987, 1988, 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#ifndef _VarargsI_h_
-#define _VarargsI_h_
-
-#include <stdarg.h>
-
-/* private routines */
-
-_XFUNCPROTOBEGIN
-
-extern void _XtCountVaList(
-    va_list /*var*/, int* /*total_count*/, int* /*typed_count*/
-);
-
-extern void _XtVaToArgList(
-   Widget /*widget*/, va_list /*var*/, int /*max_count*/, ArgList* /*args_return*/, Cardinal* /*num_args_return*/
-);
-
-extern void _XtVaToTypedArgList(
-    va_list /*var*/, int /*count*/, XtTypedArgList* /*args_return*/, Cardinal* /*num_args_return*/
-);
-
-extern XtTypedArgList _XtVaCreateTypedArgList(
-    va_list /*var*/, int /*count*/
-);
-
-extern void _XtFreeArgList(
-    ArgList /*args*/, int /*total_count*/, int /*typed_count*/
-);
-
-extern void _XtGetApplicationResources(
-    Widget /*w*/, XtPointer /*base*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/
-);
-
-extern void _XtGetSubresources(
-    Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/
-);
-
-_XFUNCPROTOEND
-
-#endif /* _VarargsI_h_ */
diff --git a/openflow/usr/include/X11/Vendor.h b/openflow/usr/include/X11/Vendor.h
deleted file mode 100644
index 6d783c6..0000000
--- a/openflow/usr/include/X11/Vendor.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtVendor_h
-#define _XtVendor_h
-
-#include <X11/Intrinsic.h>
-
-/***********************************************************************
- *
- * VendorShell Widget
- *
- ***********************************************************************/
-
-/* Class record constants */
-
-typedef struct _VendorShellClassRec *VendorShellWidgetClass;
-
-_XFUNCPROTOBEGIN
-
-externalref WidgetClass vendorShellWidgetClass;
-
-_XFUNCPROTOEND
-
-#endif /* _XtVendor_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/VendorP.h b/openflow/usr/include/X11/VendorP.h
deleted file mode 100644
index 4eb9404..0000000
--- a/openflow/usr/include/X11/VendorP.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * VendorP.h - Private definitions for VendorShell widget
- *
- * Author:	Paul Asente
- * 		Digital Equipment Corporation
- * 		Western Software Laboratory
- * Date:	Thu Dec 3, 1987
- */
-
-/***********************************************************************
- *
- * VendorShell Widget Private Data
- *
- ***********************************************************************/
-
-#ifndef  _XtVendorPrivate_h
-#define _XtVendorPrivate_h
-
-#include <X11/Vendor.h>
-
-/* New fields for the VendorShell widget class record */
-
-_XFUNCPROTOBEGIN
-
-typedef struct {
-    XtPointer       extension;          /* pointer to extension record      */
-} VendorShellClassPart;
-
-typedef struct _VendorShellClassRec {
-  	CoreClassPart      core_class;
-	CompositeClassPart composite_class;
-	ShellClassPart  shell_class;
-	WMShellClassPart   wm_shell_class;
-	VendorShellClassPart vendor_shell_class;
-} VendorShellClassRec;
-
-externalref VendorShellClassRec vendorShellClassRec;
-
-/* New fields for the vendor shell widget. */
-
-typedef struct {
-	int		vendor_specific;
-} VendorShellPart;
-
-typedef  struct {
-	CorePart 	core;
-	CompositePart 	composite;
-	ShellPart 	shell;
-	WMShellPart	wm;
-	VendorShellPart	vendor;
-} VendorShellRec, *VendorShellWidget;
-
-_XFUNCPROTOEND
-
-#endif  /* _XtVendorPrivate_h */
diff --git a/openflow/usr/include/X11/X.h b/openflow/usr/include/X11/X.h
deleted file mode 100644
index 5cf695d..0000000
--- a/openflow/usr/include/X11/X.h
+++ /dev/null
@@ -1,717 +0,0 @@
-/* Definitions for the X window system likely to be used by applications */
-
-#ifndef X_H
-#define X_H
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#define X_PROTOCOL	11		/* current protocol version */
-#define X_PROTOCOL_REVISION 0		/* current minor version */
-
-/* Resources */
-
-/*
- * _XSERVER64 must ONLY be defined when compiling X server sources on
- * systems where unsigned long is not 32 bits, must NOT be used in
- * client or library code.
- */
-#ifndef _XSERVER64
-#  ifndef _XTYPEDEF_XID
-#    define _XTYPEDEF_XID
-typedef unsigned long XID;
-#  endif
-#  ifndef _XTYPEDEF_MASK
-#    define _XTYPEDEF_MASK
-typedef unsigned long Mask;
-#  endif
-#  ifndef _XTYPEDEF_ATOM
-#    define _XTYPEDEF_ATOM
-typedef unsigned long Atom;		/* Also in Xdefs.h */
-#  endif
-typedef unsigned long VisualID;
-typedef unsigned long Time;
-#else
-#  include <X11/Xmd.h>
-#  ifndef _XTYPEDEF_XID
-#    define _XTYPEDEF_XID
-typedef CARD32 XID;
-#  endif
-#  ifndef _XTYPEDEF_MASK
-#    define _XTYPEDEF_MASK
-typedef CARD32 Mask;
-#  endif
-#  ifndef _XTYPEDEF_ATOM
-#    define _XTYPEDEF_ATOM
-typedef CARD32 Atom;
-#  endif
-typedef CARD32 VisualID;
-typedef CARD32 Time;
-#endif
-
-typedef XID Window;
-typedef XID Drawable;
-#ifndef _XTYPEDEF_FONT
-#  define _XTYPEDEF_FONT
-typedef XID Font;
-#endif
-typedef XID Pixmap;
-typedef XID Cursor;
-typedef XID Colormap;
-typedef XID GContext;
-typedef XID KeySym;
-
-typedef unsigned char KeyCode;
-
-/*****************************************************************
- * RESERVED RESOURCE AND CONSTANT DEFINITIONS
- *****************************************************************/
-
-#ifndef None
-#define None                 0L	/* universal null resource or null atom */
-#endif
-
-#define ParentRelative       1L	/* background pixmap in CreateWindow
-				    and ChangeWindowAttributes */
-
-#define CopyFromParent       0L	/* border pixmap in CreateWindow
-				       and ChangeWindowAttributes
-				   special VisualID and special window
-				       class passed to CreateWindow */
-
-#define PointerWindow        0L	/* destination window in SendEvent */
-#define InputFocus           1L	/* destination window in SendEvent */
-
-#define PointerRoot          1L	/* focus window in SetInputFocus */
-
-#define AnyPropertyType      0L	/* special Atom, passed to GetProperty */
-
-#define AnyKey		     0L	/* special Key Code, passed to GrabKey */
-
-#define AnyButton            0L	/* special Button Code, passed to GrabButton */
-
-#define AllTemporary         0L	/* special Resource ID passed to KillClient */
-
-#define CurrentTime          0L	/* special Time */
-
-#define NoSymbol	     0L	/* special KeySym */
-
-/***************************************************************** 
- * EVENT DEFINITIONS 
- *****************************************************************/
-
-/* Input Event Masks. Used as event-mask window attribute and as arguments
-   to Grab requests.  Not to be confused with event names.  */
-
-#define NoEventMask			0L
-#define KeyPressMask			(1L<<0)  
-#define KeyReleaseMask			(1L<<1)  
-#define ButtonPressMask			(1L<<2)  
-#define ButtonReleaseMask		(1L<<3)  
-#define EnterWindowMask			(1L<<4)  
-#define LeaveWindowMask			(1L<<5)  
-#define PointerMotionMask		(1L<<6)  
-#define PointerMotionHintMask		(1L<<7)  
-#define Button1MotionMask		(1L<<8)  
-#define Button2MotionMask		(1L<<9)  
-#define Button3MotionMask		(1L<<10) 
-#define Button4MotionMask		(1L<<11) 
-#define Button5MotionMask		(1L<<12) 
-#define ButtonMotionMask		(1L<<13) 
-#define KeymapStateMask			(1L<<14)
-#define ExposureMask			(1L<<15) 
-#define VisibilityChangeMask		(1L<<16) 
-#define StructureNotifyMask		(1L<<17) 
-#define ResizeRedirectMask		(1L<<18) 
-#define SubstructureNotifyMask		(1L<<19) 
-#define SubstructureRedirectMask	(1L<<20) 
-#define FocusChangeMask			(1L<<21) 
-#define PropertyChangeMask		(1L<<22) 
-#define ColormapChangeMask		(1L<<23) 
-#define OwnerGrabButtonMask		(1L<<24) 
-
-/* Event names.  Used in "type" field in XEvent structures.  Not to be
-confused with event masks above.  They start from 2 because 0 and 1
-are reserved in the protocol for errors and replies. */
-
-#define KeyPress		2
-#define KeyRelease		3
-#define ButtonPress		4
-#define ButtonRelease		5
-#define MotionNotify		6
-#define EnterNotify		7
-#define LeaveNotify		8
-#define FocusIn			9
-#define FocusOut		10
-#define KeymapNotify		11
-#define Expose			12
-#define GraphicsExpose		13
-#define NoExpose		14
-#define VisibilityNotify	15
-#define CreateNotify		16
-#define DestroyNotify		17
-#define UnmapNotify		18
-#define MapNotify		19
-#define MapRequest		20
-#define ReparentNotify		21
-#define ConfigureNotify		22
-#define ConfigureRequest	23
-#define GravityNotify		24
-#define ResizeRequest		25
-#define CirculateNotify		26
-#define CirculateRequest	27
-#define PropertyNotify		28
-#define SelectionClear		29
-#define SelectionRequest	30
-#define SelectionNotify		31
-#define ColormapNotify		32
-#define ClientMessage		33
-#define MappingNotify		34
-#define GenericEvent		35
-#define LASTEvent		36	/* must be bigger than any event # */
-
-
-/* Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer,
-   state in various key-, mouse-, and button-related events. */
-
-#define ShiftMask		(1<<0)
-#define LockMask		(1<<1)
-#define ControlMask		(1<<2)
-#define Mod1Mask		(1<<3)
-#define Mod2Mask		(1<<4)
-#define Mod3Mask		(1<<5)
-#define Mod4Mask		(1<<6)
-#define Mod5Mask		(1<<7)
-
-/* modifier names.  Used to build a SetModifierMapping request or
-   to read a GetModifierMapping request.  These correspond to the
-   masks defined above. */
-#define ShiftMapIndex		0
-#define LockMapIndex		1
-#define ControlMapIndex		2
-#define Mod1MapIndex		3
-#define Mod2MapIndex		4
-#define Mod3MapIndex		5
-#define Mod4MapIndex		6
-#define Mod5MapIndex		7
-
-
-/* button masks.  Used in same manner as Key masks above. Not to be confused
-   with button names below. */
-
-#define Button1Mask		(1<<8)
-#define Button2Mask		(1<<9)
-#define Button3Mask		(1<<10)
-#define Button4Mask		(1<<11)
-#define Button5Mask		(1<<12)
-
-#define AnyModifier		(1<<15)  /* used in GrabButton, GrabKey */
-
-
-/* button names. Used as arguments to GrabButton and as detail in ButtonPress
-   and ButtonRelease events.  Not to be confused with button masks above.
-   Note that 0 is already defined above as "AnyButton".  */
-
-#define Button1			1
-#define Button2			2
-#define Button3			3
-#define Button4			4
-#define Button5			5
-
-/* Notify modes */
-
-#define NotifyNormal		0
-#define NotifyGrab		1
-#define NotifyUngrab		2
-#define NotifyWhileGrabbed	3
-
-#define NotifyHint		1	/* for MotionNotify events */
-		       
-/* Notify detail */
-
-#define NotifyAncestor		0
-#define NotifyVirtual		1
-#define NotifyInferior		2
-#define NotifyNonlinear		3
-#define NotifyNonlinearVirtual	4
-#define NotifyPointer		5
-#define NotifyPointerRoot	6
-#define NotifyDetailNone	7
-
-/* Visibility notify */
-
-#define VisibilityUnobscured		0
-#define VisibilityPartiallyObscured	1
-#define VisibilityFullyObscured		2
-
-/* Circulation request */
-
-#define PlaceOnTop		0
-#define PlaceOnBottom		1
-
-/* protocol families */
-
-#define FamilyInternet		0	/* IPv4 */
-#define FamilyDECnet		1
-#define FamilyChaos		2
-#define FamilyInternet6		6	/* IPv6 */
-
-/* authentication families not tied to a specific protocol */
-#define FamilyServerInterpreted 5
-
-/* Property notification */
-
-#define PropertyNewValue	0
-#define PropertyDelete		1
-
-/* Color Map notification */
-
-#define ColormapUninstalled	0
-#define ColormapInstalled	1
-
-/* GrabPointer, GrabButton, GrabKeyboard, GrabKey Modes */
-
-#define GrabModeSync		0
-#define GrabModeAsync		1
-
-/* GrabPointer, GrabKeyboard reply status */
-
-#define GrabSuccess		0
-#define AlreadyGrabbed		1
-#define GrabInvalidTime		2
-#define GrabNotViewable		3
-#define GrabFrozen		4
-
-/* AllowEvents modes */
-
-#define AsyncPointer		0
-#define SyncPointer		1
-#define ReplayPointer		2
-#define AsyncKeyboard		3
-#define SyncKeyboard		4
-#define ReplayKeyboard		5
-#define AsyncBoth		6
-#define SyncBoth		7
-
-/* Used in SetInputFocus, GetInputFocus */
-
-#define RevertToNone		(int)None
-#define RevertToPointerRoot	(int)PointerRoot
-#define RevertToParent		2
-
-/*****************************************************************
- * ERROR CODES 
- *****************************************************************/
-
-#define Success		   0	/* everything's okay */
-#define BadRequest	   1	/* bad request code */
-#define BadValue	   2	/* int parameter out of range */
-#define BadWindow	   3	/* parameter not a Window */
-#define BadPixmap	   4	/* parameter not a Pixmap */
-#define BadAtom		   5	/* parameter not an Atom */
-#define BadCursor	   6	/* parameter not a Cursor */
-#define BadFont		   7	/* parameter not a Font */
-#define BadMatch	   8	/* parameter mismatch */
-#define BadDrawable	   9	/* parameter not a Pixmap or Window */
-#define BadAccess	  10	/* depending on context:
-				 - key/button already grabbed
-				 - attempt to free an illegal 
-				   cmap entry 
-				- attempt to store into a read-only 
-				   color map entry.
- 				- attempt to modify the access control
-				   list from other than the local host.
-				*/
-#define BadAlloc	  11	/* insufficient resources */
-#define BadColor	  12	/* no such colormap */
-#define BadGC		  13	/* parameter not a GC */
-#define BadIDChoice	  14	/* choice not in range or already used */
-#define BadName		  15	/* font or color name doesn't exist */
-#define BadLength	  16	/* Request length incorrect */
-#define BadImplementation 17	/* server is defective */
-
-#define FirstExtensionError	128
-#define LastExtensionError	255
-
-/*****************************************************************
- * WINDOW DEFINITIONS 
- *****************************************************************/
-
-/* Window classes used by CreateWindow */
-/* Note that CopyFromParent is already defined as 0 above */
-
-#define InputOutput		1
-#define InputOnly		2
-
-/* Window attributes for CreateWindow and ChangeWindowAttributes */
-
-#define CWBackPixmap		(1L<<0)
-#define CWBackPixel		(1L<<1)
-#define CWBorderPixmap		(1L<<2)
-#define CWBorderPixel           (1L<<3)
-#define CWBitGravity		(1L<<4)
-#define CWWinGravity		(1L<<5)
-#define CWBackingStore          (1L<<6)
-#define CWBackingPlanes	        (1L<<7)
-#define CWBackingPixel	        (1L<<8)
-#define CWOverrideRedirect	(1L<<9)
-#define CWSaveUnder		(1L<<10)
-#define CWEventMask		(1L<<11)
-#define CWDontPropagate	        (1L<<12)
-#define CWColormap		(1L<<13)
-#define CWCursor	        (1L<<14)
-
-/* ConfigureWindow structure */
-
-#define CWX			(1<<0)
-#define CWY			(1<<1)
-#define CWWidth			(1<<2)
-#define CWHeight		(1<<3)
-#define CWBorderWidth		(1<<4)
-#define CWSibling		(1<<5)
-#define CWStackMode		(1<<6)
-
-
-/* Bit Gravity */
-
-#define ForgetGravity		0
-#define NorthWestGravity	1
-#define NorthGravity		2
-#define NorthEastGravity	3
-#define WestGravity		4
-#define CenterGravity		5
-#define EastGravity		6
-#define SouthWestGravity	7
-#define SouthGravity		8
-#define SouthEastGravity	9
-#define StaticGravity		10
-
-/* Window gravity + bit gravity above */
-
-#define UnmapGravity		0
-
-/* Used in CreateWindow for backing-store hint */
-
-#define NotUseful               0
-#define WhenMapped              1
-#define Always                  2
-
-/* Used in GetWindowAttributes reply */
-
-#define IsUnmapped		0
-#define IsUnviewable		1
-#define IsViewable		2
-
-/* Used in ChangeSaveSet */
-
-#define SetModeInsert           0
-#define SetModeDelete           1
-
-/* Used in ChangeCloseDownMode */
-
-#define DestroyAll              0
-#define RetainPermanent         1
-#define RetainTemporary         2
-
-/* Window stacking method (in configureWindow) */
-
-#define Above                   0
-#define Below                   1
-#define TopIf                   2
-#define BottomIf                3
-#define Opposite                4
-
-/* Circulation direction */
-
-#define RaiseLowest             0
-#define LowerHighest            1
-
-/* Property modes */
-
-#define PropModeReplace         0
-#define PropModePrepend         1
-#define PropModeAppend          2
-
-/*****************************************************************
- * GRAPHICS DEFINITIONS
- *****************************************************************/
-
-/* graphics functions, as in GC.alu */
-
-#define	GXclear			0x0		/* 0 */
-#define GXand			0x1		/* src AND dst */
-#define GXandReverse		0x2		/* src AND NOT dst */
-#define GXcopy			0x3		/* src */
-#define GXandInverted		0x4		/* NOT src AND dst */
-#define	GXnoop			0x5		/* dst */
-#define GXxor			0x6		/* src XOR dst */
-#define GXor			0x7		/* src OR dst */
-#define GXnor			0x8		/* NOT src AND NOT dst */
-#define GXequiv			0x9		/* NOT src XOR dst */
-#define GXinvert		0xa		/* NOT dst */
-#define GXorReverse		0xb		/* src OR NOT dst */
-#define GXcopyInverted		0xc		/* NOT src */
-#define GXorInverted		0xd		/* NOT src OR dst */
-#define GXnand			0xe		/* NOT src OR NOT dst */
-#define GXset			0xf		/* 1 */
-
-/* LineStyle */
-
-#define LineSolid		0
-#define LineOnOffDash		1
-#define LineDoubleDash		2
-
-/* capStyle */
-
-#define CapNotLast		0
-#define CapButt			1
-#define CapRound		2
-#define CapProjecting		3
-
-/* joinStyle */
-
-#define JoinMiter		0
-#define JoinRound		1
-#define JoinBevel		2
-
-/* fillStyle */
-
-#define FillSolid		0
-#define FillTiled		1
-#define FillStippled		2
-#define FillOpaqueStippled	3
-
-/* fillRule */
-
-#define EvenOddRule		0
-#define WindingRule		1
-
-/* subwindow mode */
-
-#define ClipByChildren		0
-#define IncludeInferiors	1
-
-/* SetClipRectangles ordering */
-
-#define Unsorted		0
-#define YSorted			1
-#define YXSorted		2
-#define YXBanded		3
-
-/* CoordinateMode for drawing routines */
-
-#define CoordModeOrigin		0	/* relative to the origin */
-#define CoordModePrevious       1	/* relative to previous point */
-
-/* Polygon shapes */
-
-#define Complex			0	/* paths may intersect */
-#define Nonconvex		1	/* no paths intersect, but not convex */
-#define Convex			2	/* wholly convex */
-
-/* Arc modes for PolyFillArc */
-
-#define ArcChord		0	/* join endpoints of arc */
-#define ArcPieSlice		1	/* join endpoints to center of arc */
-
-/* GC components: masks used in CreateGC, CopyGC, ChangeGC, OR'ed into
-   GC.stateChanges */
-
-#define GCFunction              (1L<<0)
-#define GCPlaneMask             (1L<<1)
-#define GCForeground            (1L<<2)
-#define GCBackground            (1L<<3)
-#define GCLineWidth             (1L<<4)
-#define GCLineStyle             (1L<<5)
-#define GCCapStyle              (1L<<6)
-#define GCJoinStyle		(1L<<7)
-#define GCFillStyle		(1L<<8)
-#define GCFillRule		(1L<<9) 
-#define GCTile			(1L<<10)
-#define GCStipple		(1L<<11)
-#define GCTileStipXOrigin	(1L<<12)
-#define GCTileStipYOrigin	(1L<<13)
-#define GCFont 			(1L<<14)
-#define GCSubwindowMode		(1L<<15)
-#define GCGraphicsExposures     (1L<<16)
-#define GCClipXOrigin		(1L<<17)
-#define GCClipYOrigin		(1L<<18)
-#define GCClipMask		(1L<<19)
-#define GCDashOffset		(1L<<20)
-#define GCDashList		(1L<<21)
-#define GCArcMode		(1L<<22)
-
-#define GCLastBit		22
-/*****************************************************************
- * FONTS 
- *****************************************************************/
-
-/* used in QueryFont -- draw direction */
-
-#define FontLeftToRight		0
-#define FontRightToLeft		1
-
-#define FontChange		255
-
-/*****************************************************************
- *  IMAGING 
- *****************************************************************/
-
-/* ImageFormat -- PutImage, GetImage */
-
-#define XYBitmap		0	/* depth 1, XYFormat */
-#define XYPixmap		1	/* depth == drawable depth */
-#define ZPixmap			2	/* depth == drawable depth */
-
-/*****************************************************************
- *  COLOR MAP STUFF 
- *****************************************************************/
-
-/* For CreateColormap */
-
-#define AllocNone		0	/* create map with no entries */
-#define AllocAll		1	/* allocate entire map writeable */
-
-
-/* Flags used in StoreNamedColor, StoreColors */
-
-#define DoRed			(1<<0)
-#define DoGreen			(1<<1)
-#define DoBlue			(1<<2)
-
-/*****************************************************************
- * CURSOR STUFF
- *****************************************************************/
-
-/* QueryBestSize Class */
-
-#define CursorShape		0	/* largest size that can be displayed */
-#define TileShape		1	/* size tiled fastest */
-#define StippleShape		2	/* size stippled fastest */
-
-/***************************************************************** 
- * KEYBOARD/POINTER STUFF
- *****************************************************************/
-
-#define AutoRepeatModeOff	0
-#define AutoRepeatModeOn	1
-#define AutoRepeatModeDefault	2
-
-#define LedModeOff		0
-#define LedModeOn		1
-
-/* masks for ChangeKeyboardControl */
-
-#define KBKeyClickPercent	(1L<<0)
-#define KBBellPercent		(1L<<1)
-#define KBBellPitch		(1L<<2)
-#define KBBellDuration		(1L<<3)
-#define KBLed			(1L<<4)
-#define KBLedMode		(1L<<5)
-#define KBKey			(1L<<6)
-#define KBAutoRepeatMode	(1L<<7)
-
-#define MappingSuccess     	0
-#define MappingBusy        	1
-#define MappingFailed		2
-
-#define MappingModifier		0
-#define MappingKeyboard		1
-#define MappingPointer		2
-
-/*****************************************************************
- * SCREEN SAVER STUFF 
- *****************************************************************/
-
-#define DontPreferBlanking	0
-#define PreferBlanking		1
-#define DefaultBlanking		2
-
-#define DisableScreenSaver	0
-#define DisableScreenInterval	0
-
-#define DontAllowExposures	0
-#define AllowExposures		1
-#define DefaultExposures	2
-
-/* for ForceScreenSaver */
-
-#define ScreenSaverReset 0
-#define ScreenSaverActive 1
-
-/*****************************************************************
- * HOSTS AND CONNECTIONS
- *****************************************************************/
-
-/* for ChangeHosts */
-
-#define HostInsert		0
-#define HostDelete		1
-
-/* for ChangeAccessControl */
-
-#define EnableAccess		1      
-#define DisableAccess		0
-
-/* Display classes  used in opening the connection 
- * Note that the statically allocated ones are even numbered and the
- * dynamically changeable ones are odd numbered */
-
-#define StaticGray		0
-#define GrayScale		1
-#define StaticColor		2
-#define PseudoColor		3
-#define TrueColor		4
-#define DirectColor		5
-
-
-/* Byte order  used in imageByteOrder and bitmapBitOrder */
-
-#define LSBFirst		0
-#define MSBFirst		1
-
-#endif /* X_H */
diff --git a/openflow/usr/include/X11/XF86keysym.h b/openflow/usr/include/X11/XF86keysym.h
deleted file mode 100644
index 8b5646e..0000000
--- a/openflow/usr/include/X11/XF86keysym.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * XFree86 vendor specific keysyms.
- *
- * The XFree86 keysym range is 0x10080001 - 0x1008FFFF.
- *
- * X.Org will not be adding to the XF86 set of keysyms, though they have
- * been adopted and are considered a "standard" part of X keysym definitions.
- * XFree86 never properly commented these keysyms, so we have done our
- * best to explain the semantic meaning of these keys.
- *
- * XFree86 has removed their mail archives of the period, that might have
- * shed more light on some of these definitions. Until/unless we resurrect
- * these archives, these are from memory and usage.
- */
-
-/*
- * ModeLock
- *
- * This one is old, and not really used any more since XKB offers this
- * functionality.
- */
-
-#define XF86XK_ModeLock		0x1008FF01	/* Mode Switch Lock */
-
-/* Backlight controls. */
-#define XF86XK_MonBrightnessUp   0x1008FF02  /* Monitor/panel brightness */
-#define XF86XK_MonBrightnessDown 0x1008FF03  /* Monitor/panel brightness */
-#define XF86XK_KbdLightOnOff     0x1008FF04  /* Keyboards may be lit     */
-#define XF86XK_KbdBrightnessUp   0x1008FF05  /* Keyboards may be lit     */
-#define XF86XK_KbdBrightnessDown 0x1008FF06  /* Keyboards may be lit     */
-
-/*
- * Keys found on some "Internet" keyboards.
- */
-#define XF86XK_Standby		0x1008FF10   /* System into standby mode   */
-#define XF86XK_AudioLowerVolume	0x1008FF11   /* Volume control down        */
-#define XF86XK_AudioMute	0x1008FF12   /* Mute sound from the system */
-#define XF86XK_AudioRaiseVolume	0x1008FF13   /* Volume control up          */
-#define XF86XK_AudioPlay	0x1008FF14   /* Start playing of audio >   */
-#define XF86XK_AudioStop	0x1008FF15   /* Stop playing audio         */
-#define XF86XK_AudioPrev	0x1008FF16   /* Previous track             */
-#define XF86XK_AudioNext	0x1008FF17   /* Next track                 */
-#define XF86XK_HomePage		0x1008FF18   /* Display user's home page   */
-#define XF86XK_Mail		0x1008FF19   /* Invoke user's mail program */
-#define XF86XK_Start		0x1008FF1A   /* Start application          */
-#define XF86XK_Search		0x1008FF1B   /* Search                     */
-#define XF86XK_AudioRecord	0x1008FF1C   /* Record audio application   */
-
-/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere)   */
-#define XF86XK_Calculator	0x1008FF1D   /* Invoke calculator program  */
-#define XF86XK_Memo		0x1008FF1E   /* Invoke Memo taking program */
-#define XF86XK_ToDoList		0x1008FF1F   /* Invoke To Do List program  */
-#define XF86XK_Calendar		0x1008FF20   /* Invoke Calendar program    */
-#define XF86XK_PowerDown	0x1008FF21   /* Deep sleep the system      */
-#define XF86XK_ContrastAdjust	0x1008FF22   /* Adjust screen contrast     */
-#define XF86XK_RockerUp		0x1008FF23   /* Rocker switches exist up   */
-#define XF86XK_RockerDown	0x1008FF24   /* and down                   */
-#define XF86XK_RockerEnter	0x1008FF25   /* and let you press them     */
-
-/* Some more "Internet" keyboard symbols */
-#define XF86XK_Back		0x1008FF26   /* Like back on a browser     */
-#define XF86XK_Forward		0x1008FF27   /* Like forward on a browser  */
-#define XF86XK_Stop		0x1008FF28   /* Stop current operation     */
-#define XF86XK_Refresh		0x1008FF29   /* Refresh the page           */
-#define XF86XK_PowerOff		0x1008FF2A   /* Power off system entirely  */
-#define XF86XK_WakeUp		0x1008FF2B   /* Wake up system from sleep  */
-#define XF86XK_Eject            0x1008FF2C   /* Eject device (e.g. DVD)    */
-#define XF86XK_ScreenSaver      0x1008FF2D   /* Invoke screensaver         */
-#define XF86XK_WWW              0x1008FF2E   /* Invoke web browser         */
-#define XF86XK_Sleep            0x1008FF2F   /* Put system to sleep        */
-#define XF86XK_Favorites	0x1008FF30   /* Show favorite locations    */
-#define XF86XK_AudioPause	0x1008FF31   /* Pause audio playing        */
-#define XF86XK_AudioMedia	0x1008FF32   /* Launch media collection app */
-#define XF86XK_MyComputer	0x1008FF33   /* Display "My Computer" window */
-#define XF86XK_VendorHome	0x1008FF34   /* Display vendor home web site */
-#define XF86XK_LightBulb	0x1008FF35   /* Light bulb keys exist       */
-#define XF86XK_Shop		0x1008FF36   /* Display shopping web site   */
-#define XF86XK_History		0x1008FF37   /* Show history of web surfing */
-#define XF86XK_OpenURL		0x1008FF38   /* Open selected URL           */
-#define XF86XK_AddFavorite	0x1008FF39   /* Add URL to favorites list   */
-#define XF86XK_HotLinks		0x1008FF3A   /* Show "hot" links            */
-#define XF86XK_BrightnessAdjust	0x1008FF3B   /* Invoke brightness adj. UI   */
-#define XF86XK_Finance		0x1008FF3C   /* Display financial site      */
-#define XF86XK_Community	0x1008FF3D   /* Display user's community    */
-#define XF86XK_AudioRewind	0x1008FF3E   /* "rewind" audio track        */
-#define XF86XK_BackForward	0x1008FF3F   /* ??? */
-#define XF86XK_Launch0		0x1008FF40   /* Launch Application          */
-#define XF86XK_Launch1		0x1008FF41   /* Launch Application          */
-#define XF86XK_Launch2		0x1008FF42   /* Launch Application          */
-#define XF86XK_Launch3		0x1008FF43   /* Launch Application          */
-#define XF86XK_Launch4		0x1008FF44   /* Launch Application          */
-#define XF86XK_Launch5		0x1008FF45   /* Launch Application          */
-#define XF86XK_Launch6		0x1008FF46   /* Launch Application          */
-#define XF86XK_Launch7		0x1008FF47   /* Launch Application          */
-#define XF86XK_Launch8		0x1008FF48   /* Launch Application          */
-#define XF86XK_Launch9		0x1008FF49   /* Launch Application          */
-#define XF86XK_LaunchA		0x1008FF4A   /* Launch Application          */
-#define XF86XK_LaunchB		0x1008FF4B   /* Launch Application          */
-#define XF86XK_LaunchC		0x1008FF4C   /* Launch Application          */
-#define XF86XK_LaunchD		0x1008FF4D   /* Launch Application          */
-#define XF86XK_LaunchE		0x1008FF4E   /* Launch Application          */
-#define XF86XK_LaunchF		0x1008FF4F   /* Launch Application          */
-
-#define XF86XK_ApplicationLeft	0x1008FF50   /* switch to application, left */
-#define XF86XK_ApplicationRight	0x1008FF51   /* switch to application, right*/
-#define XF86XK_Book		0x1008FF52   /* Launch bookreader           */
-#define XF86XK_CD		0x1008FF53   /* Launch CD/DVD player        */
-#define XF86XK_Calculater	0x1008FF54   /* Launch Calculater           */
-#define XF86XK_Clear		0x1008FF55   /* Clear window, screen        */
-#define XF86XK_Close		0x1008FF56   /* Close window                */
-#define XF86XK_Copy		0x1008FF57   /* Copy selection              */
-#define XF86XK_Cut		0x1008FF58   /* Cut selection               */
-#define XF86XK_Display		0x1008FF59   /* Output switch key           */
-#define XF86XK_DOS		0x1008FF5A   /* Launch DOS (emulation)      */
-#define XF86XK_Documents	0x1008FF5B   /* Open documents window       */
-#define XF86XK_Excel		0x1008FF5C   /* Launch spread sheet         */
-#define XF86XK_Explorer		0x1008FF5D   /* Launch file explorer        */
-#define XF86XK_Game		0x1008FF5E   /* Launch game                 */
-#define XF86XK_Go		0x1008FF5F   /* Go to URL                   */
-#define XF86XK_iTouch		0x1008FF60   /* Logitch iTouch- don't use   */
-#define XF86XK_LogOff		0x1008FF61   /* Log off system              */
-#define XF86XK_Market		0x1008FF62   /* ??                          */
-#define XF86XK_Meeting		0x1008FF63   /* enter meeting in calendar   */
-#define XF86XK_MenuKB		0x1008FF65   /* distingush keyboard from PB */
-#define XF86XK_MenuPB		0x1008FF66   /* distinuish PB from keyboard */
-#define XF86XK_MySites		0x1008FF67   /* Favourites                  */
-#define XF86XK_New		0x1008FF68   /* New (folder, document...    */
-#define XF86XK_News		0x1008FF69   /* News                        */
-#define XF86XK_OfficeHome	0x1008FF6A   /* Office home (old Staroffice)*/
-#define XF86XK_Open		0x1008FF6B   /* Open                        */
-#define XF86XK_Option		0x1008FF6C   /* ?? */
-#define XF86XK_Paste		0x1008FF6D   /* Paste                       */
-#define XF86XK_Phone		0x1008FF6E   /* Launch phone; dial number   */
-#define XF86XK_Q		0x1008FF70   /* Compaq's Q - don't use      */
-#define XF86XK_Reply		0x1008FF72   /* Reply e.g., mail            */
-#define XF86XK_Reload		0x1008FF73   /* Reload web page, file, etc. */
-#define XF86XK_RotateWindows	0x1008FF74   /* Rotate windows e.g. xrandr  */
-#define XF86XK_RotationPB	0x1008FF75   /* don't use                   */
-#define XF86XK_RotationKB	0x1008FF76   /* don't use                   */
-#define XF86XK_Save		0x1008FF77   /* Save (file, document, state */
-#define XF86XK_ScrollUp		0x1008FF78   /* Scroll window/contents up   */
-#define XF86XK_ScrollDown	0x1008FF79   /* Scrool window/contentd down */
-#define XF86XK_ScrollClick	0x1008FF7A   /* Use XKB mousekeys instead   */
-#define XF86XK_Send		0x1008FF7B   /* Send mail, file, object     */
-#define XF86XK_Spell		0x1008FF7C   /* Spell checker               */
-#define XF86XK_SplitScreen	0x1008FF7D   /* Split window or screen      */
-#define XF86XK_Support		0x1008FF7E   /* Get support (??)            */
-#define XF86XK_TaskPane		0x1008FF7F   /* Show tasks */
-#define XF86XK_Terminal		0x1008FF80   /* Launch terminal emulator    */
-#define XF86XK_Tools		0x1008FF81   /* toolbox of desktop/app.     */
-#define XF86XK_Travel		0x1008FF82   /* ?? */
-#define XF86XK_UserPB		0x1008FF84   /* ?? */
-#define XF86XK_User1KB		0x1008FF85   /* ?? */
-#define XF86XK_User2KB		0x1008FF86   /* ?? */
-#define XF86XK_Video		0x1008FF87   /* Launch video player       */
-#define XF86XK_WheelButton	0x1008FF88   /* button from a mouse wheel */
-#define XF86XK_Word		0x1008FF89   /* Launch word processor     */
-#define XF86XK_Xfer		0x1008FF8A
-#define XF86XK_ZoomIn		0x1008FF8B   /* zoom in view, map, etc.   */
-#define XF86XK_ZoomOut		0x1008FF8C   /* zoom out view, map, etc.  */
-
-#define XF86XK_Away		0x1008FF8D   /* mark yourself as away     */
-#define XF86XK_Messenger	0x1008FF8E   /* as in instant messaging   */
-#define XF86XK_WebCam		0x1008FF8F   /* Launch web camera app.    */
-#define XF86XK_MailForward	0x1008FF90   /* Forward in mail           */
-#define XF86XK_Pictures		0x1008FF91   /* Show pictures             */
-#define XF86XK_Music		0x1008FF92   /* Launch music application  */
-
-#define XF86XK_Battery		0x1008FF93   /* Display battery information */
-#define XF86XK_Bluetooth	0x1008FF94   /* Enable/disable Bluetooth    */
-#define XF86XK_WLAN		0x1008FF95   /* Enable/disable WLAN         */
-#define XF86XK_UWB		0x1008FF96   /* Enable/disable UWB	    */
-
-#define XF86XK_AudioForward	0x1008FF97   /* fast-forward audio track    */
-#define XF86XK_AudioRepeat	0x1008FF98   /* toggle repeat mode          */
-#define XF86XK_AudioRandomPlay	0x1008FF99   /* toggle shuffle mode         */
-#define XF86XK_Subtitle		0x1008FF9A   /* cycle through subtitle      */
-#define XF86XK_AudioCycleTrack	0x1008FF9B   /* cycle through audio tracks  */
-#define XF86XK_CycleAngle	0x1008FF9C   /* cycle through angles        */
-#define XF86XK_FrameBack	0x1008FF9D   /* video: go one frame back    */
-#define XF86XK_FrameForward	0x1008FF9E   /* video: go one frame forward */
-#define XF86XK_Time		0x1008FF9F   /* display, or shows an entry for time seeking */
-#define XF86XK_Select		0x1008FFA0   /* Select button on joypads and remotes */
-#define XF86XK_View		0x1008FFA1   /* Show a view options/properties */
-#define XF86XK_TopMenu		0x1008FFA2   /* Go to a top-level menu in a video */
-
-#define XF86XK_Red		0x1008FFA3   /* Red button                  */
-#define XF86XK_Green		0x1008FFA4   /* Green button                */
-#define XF86XK_Yellow		0x1008FFA5   /* Yellow button               */
-#define XF86XK_Blue             0x1008FFA6   /* Blue button                 */
-
-#define XF86XK_Suspend		0x1008FFA7   /* Sleep to RAM                */
-#define XF86XK_Hibernate	0x1008FFA8   /* Sleep to disk               */
-#define XF86XK_TouchpadToggle	0x1008FFA9   /* Toggle between touchpad/trackstick */
-#define XF86XK_TouchpadOn	0x1008FFB0   /* The touchpad got switched on */
-#define XF86XK_TouchpadOff	0x1008FFB1   /* The touchpad got switched off */
-
-#define XF86XK_AudioMicMute	0x1008FFB2   /* Mute the Mic from the system */
-
-/* Keys for special action keys (hot keys) */
-/* Virtual terminals on some operating systems */
-#define XF86XK_Switch_VT_1	0x1008FE01
-#define XF86XK_Switch_VT_2	0x1008FE02
-#define XF86XK_Switch_VT_3	0x1008FE03
-#define XF86XK_Switch_VT_4	0x1008FE04
-#define XF86XK_Switch_VT_5	0x1008FE05
-#define XF86XK_Switch_VT_6	0x1008FE06
-#define XF86XK_Switch_VT_7	0x1008FE07
-#define XF86XK_Switch_VT_8	0x1008FE08
-#define XF86XK_Switch_VT_9	0x1008FE09
-#define XF86XK_Switch_VT_10	0x1008FE0A
-#define XF86XK_Switch_VT_11	0x1008FE0B
-#define XF86XK_Switch_VT_12	0x1008FE0C
-
-#define XF86XK_Ungrab		0x1008FE20   /* force ungrab               */
-#define XF86XK_ClearGrab	0x1008FE21   /* kill application with grab */
-#define XF86XK_Next_VMode	0x1008FE22   /* next video mode available  */
-#define XF86XK_Prev_VMode	0x1008FE23   /* prev. video mode available */
-#define XF86XK_LogWindowTree	0x1008FE24   /* print window tree to log   */
-#define XF86XK_LogGrabInfo	0x1008FE25   /* print all active grabs to log */
diff --git a/openflow/usr/include/X11/XKBlib.h b/openflow/usr/include/X11/XKBlib.h
deleted file mode 100644
index 8f6c72c..0000000
--- a/openflow/usr/include/X11/XKBlib.h
+++ /dev/null
@@ -1,1149 +0,0 @@
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#ifndef _X11_XKBLIB_H_
-#define _X11_XKBLIB_H_
-
-#include <X11/Xlib.h>
-#include <X11/extensions/XKBstr.h>
-
-typedef struct _XkbAnyEvent {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* # of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XKB event minor code */
-	unsigned int 	device;		/* device ID */
-} XkbAnyEvent;
-
-typedef struct _XkbNewKeyboardNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbNewKeyboardNotify */
-	int	 	device;		/* device ID */
-	int	 	old_device;	/* device ID of previous keyboard */
-	int	 	min_key_code;	/* minimum key code */
-	int		max_key_code;	/* maximum key code */
-	int	 	old_min_key_code;/* min key code of previous kbd */
-	int		old_max_key_code;/* max key code of previous kbd */
-	unsigned int	changed;	/* changed aspects of the keyboard */
-	char	 	req_major;	/* major and minor opcode of req */
-	char	 	req_minor;	/* that caused change, if applicable */
-} XkbNewKeyboardNotifyEvent;
-
-typedef struct _XkbMapNotifyEvent {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbMapNotify */
-	int 		device;		/* device ID */
-	unsigned int 	changed;	/* fields which have been changed */
-	unsigned int 	flags;		/* reserved */
-	int 		first_type;	/* first changed key type */
-	int 		num_types;	/* number of changed key types */
-	KeyCode		min_key_code;
-	KeyCode		max_key_code;
-	KeyCode		first_key_sym;
-	KeyCode		first_key_act;
-	KeyCode		first_key_behavior;
-	KeyCode		first_key_explicit;
-	KeyCode		first_modmap_key;
-	KeyCode		first_vmodmap_key;
-	int		num_key_syms;
-	int		num_key_acts;
-	int		num_key_behaviors;
-	int		num_key_explicit;
-	int 		num_modmap_keys;
-	int 		num_vmodmap_keys;
-	unsigned int 	vmods;		/* mask of changed virtual mods */
-} XkbMapNotifyEvent;
-
-typedef struct _XkbStateNotifyEvent {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* # of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbStateNotify */
-	int 		device;		/* device ID */
-	unsigned int 	changed;	/* mask of changed state components */
-	int 		group;		/* keyboard group */
-	int 		base_group;	/* base keyboard group */
-	int 		latched_group;	/* latched keyboard group */
-	int 		locked_group;	/* locked keyboard group */
-	unsigned int	mods;		/* modifier state */
-	unsigned int 	base_mods;	/* base modifier state */
-	unsigned int	latched_mods;	/* latched modifiers */
-	unsigned int	locked_mods;	/* locked modifiers */
-	int 		compat_state;	/* compatibility state */
-	unsigned char	grab_mods;	/* mods used for grabs */
-	unsigned char	compat_grab_mods;/* grab mods for non-XKB clients */
-	unsigned char	lookup_mods;	/* mods sent to clients */
-	unsigned char	compat_lookup_mods; /* mods sent to non-XKB clients */
-	int 		ptr_buttons;	/* pointer button state */
-	KeyCode		keycode;	/* keycode that caused the change */
-	char 		event_type;	/* KeyPress or KeyRelease */
-	char 		req_major;	/* Major opcode of request */
-	char 		req_minor;	/* Minor opcode of request */
-} XkbStateNotifyEvent;
-
-typedef struct _XkbControlsNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbControlsNotify */
-	int 		device;		/* device ID */
-	unsigned int	changed_ctrls;	/* controls with changed sub-values */
-	unsigned int 	enabled_ctrls;	/* controls currently enabled */
-	unsigned int	enabled_ctrl_changes;/* controls just {en,dis}abled */
-	int 		num_groups;	/* total groups on keyboard */
-	KeyCode		keycode;	/* key that caused change or 0 */
-	char 		event_type;	/* type of event that caused change */
-	char 		req_major;	/* if keycode==0, major and minor */
-	char 		req_minor;	/* opcode of req that caused change */
-} XkbControlsNotifyEvent;
-
-typedef struct _XkbIndicatorNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbIndicatorNotify */
-	int 		device;		/* device ID */
-	unsigned int	changed;	/* indicators with new state or map */
-	unsigned int	state;	 	/* current state of all indicators */
-} XkbIndicatorNotifyEvent;
-
-typedef struct _XkbNamesNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbNamesNotify */
-	int	 	device;		/* device ID */
-	unsigned int 	changed;	/* names that have changed */
-	int	 	first_type;	/* first key type with new name */
-	int	 	num_types;	/* number of key types with new names */
-	int	 	first_lvl;	/* first key type new new level names */
-	int	 	num_lvls;	/* # of key types w/new level names */
-	int	 	num_aliases;	/* total number of key aliases*/
-	int	 	num_radio_groups;/* total number of radio groups */
-	unsigned int 	changed_vmods;	/* virtual modifiers with new names */
-	unsigned int 	changed_groups;	/* groups with new names */
-	unsigned int 	changed_indicators;/* indicators with new names */
-	int		first_key;	/* first key with new name */
-	int		num_keys;	/* number of keys with new names */
-} XkbNamesNotifyEvent;
-
-typedef struct _XkbCompatMapNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbCompatMapNotify */
-	int	 	device;		/* device ID */
-	unsigned int 	changed_groups; /* groups with new compat maps */
-	int	 	first_si;	/* first new symbol interp */
-	int	 	num_si;		/* number of new symbol interps */
-	int	 	num_total_si;	/* total # of symbol interps */
-} XkbCompatMapNotifyEvent;
-
-typedef struct _XkbBellNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbBellNotify */
-	int	 	device;		/* device ID */
-	int	 	percent;	/* requested volume as a % of maximum */
-	int	 	pitch;		/* requested pitch in Hz */
-	int	 	duration;	/* requested duration in useconds */
-	int	 	bell_class;	/* (input extension) feedback class */
-	int	 	bell_id;	/* (input extension) ID of feedback */
-	Atom 		name;		/* "name" of requested bell */
-	Window 		window;		/* window associated with event */
-	Bool		event_only;	/* "event only" requested */
-} XkbBellNotifyEvent;
-
-typedef struct _XkbActionMessage {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbActionMessage */
-	int	 	device;		/* device ID */
-	KeyCode		keycode;	/* key that generated the event */
-	Bool 		press;		/* true if act caused by key press */
-	Bool 		key_event_follows;/* true if key event also generated */
-	int		group;		/* effective group */
-	unsigned int	mods;		/* effective mods */
-	char 		message[XkbActionMessageLength+1];
-					/* message -- leave space for NUL */
-} XkbActionMessageEvent;
-
-typedef struct _XkbAccessXNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbAccessXNotify */
-	int	 	device;		/* device ID */
-	int	 	detail;		/* XkbAXN_* */
-	int	 	keycode;	/* key of event */
-	int	 	sk_delay;	/* current slow keys delay */
-	int		debounce_delay;	/* current debounce delay */
-} XkbAccessXNotifyEvent;
-
-typedef struct _XkbExtensionDeviceNotify {
-	int 		type;		/* XkbAnyEvent */
-	unsigned long 	serial;		/* of last req processed by server */
-	Bool 		send_event;	/* is this from a SendEvent request? */
-	Display *	display;	/* Display the event was read from */
-	Time 		time;		/* milliseconds */
-	int 		xkb_type;	/* XkbExtensionDeviceNotify */
-	int	 	device;		/* device ID */
-	unsigned int	reason;		/* reason for the event */
-	unsigned int	supported;	/* mask of supported features */
-	unsigned int	unsupported;	/* mask of unsupported features */
-					/* that some app tried to use */
-	int	 	first_btn;	/* first button that changed */
-	int	 	num_btns;	/* range of buttons changed */
-	unsigned int	leds_defined;   /* indicators with names or maps */
-	unsigned int	led_state;	/* current state of the indicators */
-	int		led_class;	/* feedback class for led changes */
-	int		led_id;   	/* feedback id for led changes */
-} XkbExtensionDeviceNotifyEvent;
-
-typedef union _XkbEvent {
-	int				type;
-	XkbAnyEvent			any;
-	XkbNewKeyboardNotifyEvent	new_kbd;
-	XkbMapNotifyEvent		map;
-	XkbStateNotifyEvent		state;
-	XkbControlsNotifyEvent		ctrls;
-	XkbIndicatorNotifyEvent 	indicators;
-	XkbNamesNotifyEvent		names;
-	XkbCompatMapNotifyEvent		compat;
-	XkbBellNotifyEvent		bell;
-	XkbActionMessageEvent		message;
-	XkbAccessXNotifyEvent		accessx;
-	XkbExtensionDeviceNotifyEvent 	device;
-	XEvent				core;
-} XkbEvent;
-
-typedef struct	_XkbKbdDpyState	XkbKbdDpyStateRec,*XkbKbdDpyStatePtr;
-
-	/* XkbOpenDisplay error codes */
-#define	XkbOD_Success		0
-#define	XkbOD_BadLibraryVersion	1
-#define	XkbOD_ConnectionRefused	2
-#define	XkbOD_NonXkbServer	3
-#define	XkbOD_BadServerVersion	4
-
-	/* Values for XlibFlags */
-#define	XkbLC_ForceLatin1Lookup		(1<<0)
-#define	XkbLC_ConsumeLookupMods		(1<<1)
-#define	XkbLC_AlwaysConsumeShiftAndLock (1<<2)
-#define	XkbLC_IgnoreNewKeyboards	(1<<3)
-#define	XkbLC_ControlFallback		(1<<4)
-#define	XkbLC_ConsumeKeysOnComposeFail	(1<<29)
-#define	XkbLC_ComposeLED		(1<<30)
-#define	XkbLC_BeepOnComposeFail		(1<<31)
-
-#define	XkbLC_AllComposeControls	(0xc0000000)
-#define	XkbLC_AllControls		(0xc000001f)
-
-_XFUNCPROTOBEGIN
-
-extern	Bool	XkbIgnoreExtension(
-	Bool			/* ignore */
-);
-
-extern	Display *XkbOpenDisplay(
-	char *			/* name */,
-	int *			/* ev_rtrn */,
-	int *			/* err_rtrn */,
-	int *			/* major_rtrn */,
-	int *			/* minor_rtrn */,
-	int *			/* reason */
-);
-
-extern	Bool	XkbQueryExtension(
-	Display *		/* dpy */,
-	int *			/* opcodeReturn */,
-	int *			/* eventBaseReturn */,
-	int *			/* errorBaseReturn */,
-	int *			/* majorRtrn */,
-	int *			/* minorRtrn */
-);
-
-extern	Bool	XkbUseExtension(
-	Display *		/* dpy */,
-	int *			/* major_rtrn */,
-	int *			/* minor_rtrn */
-);
-
-extern	Bool	XkbLibraryVersion(
-	int *			/* libMajorRtrn */,
-	int *			/* libMinorRtrn */
-);
-
-extern	unsigned int	XkbSetXlibControls(
-	Display*		/* dpy */,
-	unsigned int		/* affect */,
-	unsigned int		/* values */
-);
-
-extern	unsigned int	XkbGetXlibControls(
-	Display*		/* dpy */
-);
-
-extern	unsigned int	XkbXlibControlsImplemented(void);
-
-typedef	Atom	(*XkbInternAtomFunc)(
-	Display *		/* dpy */,
-	_Xconst char *		/* name */,
-	Bool			/* only_if_exists */
-);
-
-typedef char *	(*XkbGetAtomNameFunc)(
-	Display *		/* dpy */,
-	Atom			/* atom */
-);
-
-extern void		XkbSetAtomFuncs(
-	XkbInternAtomFunc	/* getAtom */,
-	XkbGetAtomNameFunc	/* getName */
-);
-
-extern	KeySym XkbKeycodeToKeysym(
-		Display *	/* dpy */,
-#if NeedWidePrototypes
-		 unsigned int 	/* kc */,
-#else
-		 KeyCode 	/* kc */,
-#endif
-		 int 		/* group */,
-		 int		/* level */
-);
-
-extern	unsigned int	XkbKeysymToModifiers(
-    Display *			/* dpy */,
-    KeySym 			/* ks */
-);
-
-extern	Bool		XkbLookupKeySym(
-    Display *			/* dpy */,
-    KeyCode 			/* keycode */,
-    unsigned int 		/* modifiers */,
-    unsigned int *		/* modifiers_return */,
-    KeySym *			/* keysym_return */
-);
-
-extern	int		XkbLookupKeyBinding(
-    Display *			/* dpy */,
-    KeySym 			/* sym_rtrn */,
-    unsigned int 		/* mods */,
-    char *			/* buffer */,
-    int 			/* nbytes */,
-    int * 			/* extra_rtrn */
-);
-
-extern	Bool		XkbTranslateKeyCode(
-    XkbDescPtr			/* xkb */,
-    KeyCode 			/* keycode */,
-    unsigned int 		/* modifiers */,
-    unsigned int *		/* modifiers_return */,
-    KeySym *			/* keysym_return */
-);
-
-extern	int		XkbTranslateKeySym(
-    Display *			/* dpy */,
-    register KeySym *		/* sym_return */,
-    unsigned int 		/* modifiers */,
-    char *			/* buffer */,
-    int 			/* nbytes */,
-    int *			/* extra_rtrn */
-);
-
-extern	Bool	XkbSetAutoRepeatRate(
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* delay */,
-	unsigned int		/* interval */
-);
-
-extern	Bool	XkbGetAutoRepeatRate(
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int *		/* delayRtrn */,
-	unsigned int *		/* intervalRtrn */
-);
-
-extern	Bool	XkbChangeEnabledControls(
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* affect */,
-	unsigned int		/* values */
-);
-
-extern	Bool	XkbDeviceBell(
-	Display *		/* dpy */,
-	Window			/* win */,
-	int			/* deviceSpec */,
-	int			/* bellClass */,
-	int			/* bellID */,
-	int			/* percent */,
-	Atom			/* name */
-);
-
-extern	Bool	XkbForceDeviceBell(
-	Display *		/* dpy */,
-	int			/* deviceSpec */,
-	int			/* bellClass */,
-	int			/* bellID */,
-	int			/* percent */
-);
-
-extern	Bool	XkbDeviceBellEvent(
-	Display *		/* dpy */,
-	Window			/* win */,
-	int			/* deviceSpec */,
-	int			/* bellClass */,
-	int			/* bellID */,
-	int			/* percent */,
-	Atom			/* name */
-);
-
-extern	Bool	XkbBell(
-	Display *		/* dpy */,
-	Window			/* win */,
-	int			/* percent */,
-	Atom			/* name */
-);
-
-extern	Bool	XkbForceBell(
-	Display *		/* dpy */,
-	int			/* percent */
-);
-
-extern	Bool	XkbBellEvent(
-	Display *		/* dpy */,
-	Window			/* win */,
-	int			/* percent */,
-	Atom			/* name */
-);
-
-extern	Bool	XkbSelectEvents(
-	Display *		/* dpy */,
-	unsigned int		/* deviceID */,
-	unsigned int 		/* affect */,
-	unsigned int 		/* values */
-);
-
-extern	Bool	XkbSelectEventDetails(
-	Display *		/* dpy */,
-	unsigned int 		/* deviceID */,
-	unsigned int 		/* eventType */,
-	unsigned long 		/* affect */,
-	unsigned long 		/* details */
-);
-
-extern	void	XkbNoteMapChanges(
-    XkbMapChangesPtr		/* old */,
-    XkbMapNotifyEvent	*	/* new */,
-    unsigned int	 	/* wanted */
-);
-
-extern	void	XkbNoteNameChanges(
-    XkbNameChangesPtr		/* old */,
-    XkbNamesNotifyEvent	*	/* new */,
-    unsigned int	 	/* wanted */
-);
-
-extern	Status	XkbGetIndicatorState(
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int *		/* pStateRtrn */
-);
-
-extern	Status	XkbGetDeviceIndicatorState(
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledID */,
-	unsigned int *		/* pStateRtrn */
-);
-
-extern	Status	 XkbGetIndicatorMap(
-	Display *		/* dpy */,
-	unsigned long		/* which */,
-	XkbDescPtr		/* desc */
-);
-
-extern	Bool	 XkbSetIndicatorMap(
-	Display *		/* dpy */,
-	unsigned long 		/* which */,
-	XkbDescPtr		/* desc */
-);
-
-#define	XkbNoteIndicatorMapChanges(o,n,w) \
-				((o)->map_changes|=((n)->map_changes&(w)))
-#define	XkbNoteIndicatorStateChanges(o,n,w)\
-				((o)->state_changes|=((n)->state_changes&(w)))
-#define	XkbGetIndicatorMapChanges(d,x,c) \
-				(XkbGetIndicatorMap((d),(c)->map_changes,x))
-#define	XkbChangeIndicatorMaps(d,x,c) \
-				(XkbSetIndicatorMap((d),(c)->map_changes,x))
-
-extern	Bool	XkbGetNamedIndicator(
-	Display *		/* dpy */,
-	Atom			/* name */,
-	int *			/* pNdxRtrn */,
-	Bool *			/* pStateRtrn */,
-	XkbIndicatorMapPtr	/* pMapRtrn */,
-	Bool *			/* pRealRtrn */
-);
-
-extern	Bool	XkbGetNamedDeviceIndicator(
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledID */,
-	Atom			/* name */,
-	int *			/* pNdxRtrn */,
-	Bool *			/* pStateRtrn */,
-	XkbIndicatorMapPtr	/* pMapRtrn */,
-	Bool *			/* pRealRtrn */
-);
-
-extern	Bool	XkbSetNamedIndicator(
-	Display *		/* dpy */,
-	Atom			/* name */,
-	Bool			/* changeState */,
-	Bool 			/* state */,
-	Bool			/* createNewMap */,
-	XkbIndicatorMapPtr	/* pMap */
-);
-
-extern	Bool	XkbSetNamedDeviceIndicator(
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledID */,
-	Atom			/* name */,
-	Bool			/* changeState */,
-	Bool 			/* state */,
-	Bool			/* createNewMap */,
-	XkbIndicatorMapPtr	/* pMap */
-);
-
-extern	Bool	XkbLockModifiers(
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* affect */,
-	unsigned int 		/* values */
-);
-
-extern	Bool	XkbLatchModifiers(
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* affect */,
-	unsigned int 		/* values */
-);
-
-extern	Bool	XkbLockGroup(
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* group */
-);
-
-extern	Bool	XkbLatchGroup(
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* group */
-);
-
-extern	Bool	XkbSetServerInternalMods(
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* affectReal */,
-	unsigned int 		/* realValues */,
-	unsigned int		/* affectVirtual */,
-	unsigned int		/* virtualValues */
-);
-
-extern	Bool	XkbSetIgnoreLockMods(
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	unsigned int 		/* affectReal */,
-	unsigned int 		/* realValues */,
-	unsigned int		/* affectVirtual */,
-	unsigned int		/* virtualValues */
-);
-
-
-extern	Bool	XkbVirtualModsToReal(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* virtual_mask */,
-	unsigned int *		/* mask_rtrn */
-);
-
-extern	Bool	XkbComputeEffectiveMap(
-	XkbDescPtr 		/* xkb */,
-	XkbKeyTypePtr		/* type */,
-	unsigned char *		/* map_rtrn */
-);
-
-extern	Status XkbInitCanonicalKeyTypes(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* which */,
-    int				/* keypadVMod */
-);
-
-extern	XkbDescPtr XkbAllocKeyboard(
-	void
-);
-
-extern	void	XkbFreeKeyboard(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeDesc */
-);
-
-extern	Status XkbAllocClientMap(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	unsigned int		/* nTypes */
-);
-
-extern	Status XkbAllocServerMap(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	unsigned int		/* nActions */
-);
-
-extern	void	XkbFreeClientMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* what */,
-    Bool			/* freeMap */
-);
-
-extern	void	XkbFreeServerMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* what */,
-    Bool			/* freeMap */
-);
-
-extern	XkbKeyTypePtr	XkbAddKeyType(
-    XkbDescPtr			/* xkb */,
-    Atom			/* name */,
-    int				/* map_count */,
-    Bool			/* want_preserve */,
-    int				/* num_lvls */
-);
-
-extern	Status XkbAllocIndicatorMaps(
-	XkbDescPtr		/* xkb */
-);
-
-extern	void XkbFreeIndicatorMaps(
-    XkbDescPtr			/* xkb */
-);
-
-extern	XkbDescPtr XkbGetMap(
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	unsigned int 		/* deviceSpec */
-);
-
-extern	Status	XkbGetUpdatedMap(
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	XkbDescPtr		/* desc */
-);
-
-extern	Status	XkbGetMapChanges(
-    Display *			/* dpy */,
-    XkbDescPtr			/* xkb */,
-    XkbMapChangesPtr		/* changes */
-);
-
-
-extern	Status	XkbRefreshKeyboardMapping(
-    XkbMapNotifyEvent *		/* event */
-);
-
-extern	Status	XkbGetKeyTypes(
-    Display *			/* dpy */,
-    unsigned int		/* first */,
-    unsigned int 		/* num */,
-    XkbDescPtr			/* xkb */
-);
-
-extern	Status	XkbGetKeySyms(
-    Display *			/* dpy */,
-    unsigned int		/* first */,
-    unsigned int		/* num */,
-    XkbDescPtr			/* xkb */
-);
-
-extern	Status	XkbGetKeyActions(
-    Display *			/* dpy */,
-    unsigned int 		/* first */,
-    unsigned int 		/* num */,
-    XkbDescPtr			/* xkb */
-);
-
-extern	Status	XkbGetKeyBehaviors(
-	Display *		/* dpy */,
-	unsigned int 		/* firstKey */,
-	unsigned int		/* nKeys */,
-	XkbDescPtr		/* desc */
-);
-
-extern	Status	XkbGetVirtualMods(
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	XkbDescPtr		/* desc */
-);
-
-extern	Status	XkbGetKeyExplicitComponents(
-	Display *		/* dpy */,
-	unsigned int 		/* firstKey */,
-	unsigned int		/* nKeys */,
-	XkbDescPtr		/* desc */
-);
-
-extern	Status	XkbGetKeyModifierMap(
-	Display *		/* dpy */,
-	unsigned int 		/* firstKey */,
-	unsigned int		/* nKeys */,
-	XkbDescPtr		/* desc */
-);
-
-extern	Status	XkbGetKeyVirtualModMap(
-	Display *		/* dpy */,
-	unsigned int		/* first */,
-	unsigned int		/* num */,
-	XkbDescPtr		/* xkb */
-);
-
-extern	Status	XkbAllocControls(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which*/
-);
-
-extern	void	XkbFreeControls(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeMap */
-);
-
-extern	Status	XkbGetControls(
-	Display *		/* dpy */,
-	unsigned long		/* which */,
-	XkbDescPtr		/* desc */
-);
-
-extern	Bool	XkbSetControls(
-	Display *		/* dpy */,
-	unsigned long		/* which */,
-	XkbDescPtr		/* desc */
-);
-
-extern	void	XkbNoteControlsChanges(
-    XkbControlsChangesPtr	/* old */,
-    XkbControlsNotifyEvent *	/* new */,
-    unsigned int	 	/* wanted */
-);
-
-#define	XkbGetControlsChanges(d,x,c)	XkbGetControls(d,(c)->changed_ctrls,x)
-#define	XkbChangeControls(d,x,c)	XkbSetControls(d,(c)->changed_ctrls,x)
-
-extern	Status	XkbAllocCompatMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* which */,
-    unsigned int		/* nInterpret */
-);
-
-extern	void	XkbFreeCompatMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* which */,
-    Bool			/* freeMap */
-);
-
-extern Status XkbGetCompatMap(
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	XkbDescPtr 		/* xkb */
-);
-
-extern Bool XkbSetCompatMap(
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	XkbDescPtr 		/* xkb */,
-	Bool			/* updateActions */
-);
-
-extern	XkbSymInterpretPtr XkbAddSymInterpret(
-	XkbDescPtr		/* xkb */,
-	XkbSymInterpretPtr	/* si */,
-	Bool			/* updateMap */,
-	XkbChangesPtr		/* changes */
-);
-
-extern	Status XkbAllocNames(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	int			/* nTotalRG */,
-	int			/* nTotalAliases */
-);
-
-extern	Status	XkbGetNames(
-	Display *		/* dpy */,
-	unsigned int		/* which */,
-	XkbDescPtr		/* desc */
-);
-
-extern	Bool	XkbSetNames(
-	Display *		/* dpy */,
-	unsigned int		/* which */,
-	unsigned int		/* firstType */,
-	unsigned int		/* nTypes */,
-	XkbDescPtr		/* desc */
-);
-
-extern	Bool	XkbChangeNames(
-	Display *		/* dpy */,
-	XkbDescPtr		/* xkb */,
-	XkbNameChangesPtr	/* changes */
-);
-
-extern	void XkbFreeNames(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeMap */
-);
-
-
-extern	Status	XkbGetState(
-	Display *		/* dpy */,
-	unsigned int 		/* deviceSpec */,
-	XkbStatePtr		/* rtrnState */
-);
-
-extern	Bool	XkbSetMap(
-	Display *		/* dpy */,
-	unsigned int		/* which */,
-	XkbDescPtr		/* desc */
-);
-
-extern	Bool	XkbChangeMap(
-	Display*		/* dpy */,
-	XkbDescPtr		/* desc */,
-	XkbMapChangesPtr	/* changes */
-);
-
-extern	Bool	XkbSetDetectableAutoRepeat(
-	Display *		/* dpy */,
-	Bool			/* detectable */,
-	Bool *			/* supported */
-);
-
-extern	Bool	XkbGetDetectableAutoRepeat(
-	Display *		/* dpy */,
-	Bool *			/* supported */
-);
-
-extern	Bool	XkbSetAutoResetControls(
-    Display *			/* dpy */,
-    unsigned int 		/* changes */,
-    unsigned int *		/* auto_ctrls */,
-    unsigned int *		/* auto_values */
-);
-
-extern	Bool	XkbGetAutoResetControls(
-    Display *			/* dpy */,
-    unsigned int *		/* auto_ctrls */,
-    unsigned int *		/* auto_ctrl_values */
-);
-
-extern	Bool	XkbSetPerClientControls(
-    Display *			/* dpy */,
-    unsigned int		/* change */,
-    unsigned int *		/* values */
-);
-
-extern	Bool	XkbGetPerClientControls(
-    Display *			/* dpy */,
-    unsigned int *		/* ctrls */
-);
-
-extern Status XkbCopyKeyType(
-    XkbKeyTypePtr	/* from */,
-    XkbKeyTypePtr	/* into */
-);
-
-extern Status XkbCopyKeyTypes(
-    XkbKeyTypePtr	/* from */,
-    XkbKeyTypePtr	/* into */,
-    int			/* num_types */
-);
-
-extern	Status	XkbResizeKeyType(
-    XkbDescPtr		/* xkb */,
-    int			/* type_ndx */,
-    int			/* map_count */,
-    Bool		/* want_preserve */,
-    int			/* new_num_lvls */
-);
-
-extern	KeySym *XkbResizeKeySyms(
-	XkbDescPtr		/* desc */,
-	int 			/* forKey */,
-	int 			/* symsNeeded */
-);
-
-extern	XkbAction *XkbResizeKeyActions(
-	XkbDescPtr		/* desc */,
-	int 			/* forKey */,
-	int 			/* actsNeeded */
-);
-
-extern	Status XkbChangeTypesOfKey(
-	XkbDescPtr		/* xkb */,
-	int 			/* key */,
-	int			/* num_groups */,
-	unsigned int		/* groups */,
-	int *			/* newTypes */,
-	XkbMapChangesPtr	/* pChanges */
-);
-
-extern  Status   XkbChangeKeycodeRange(
-	XkbDescPtr		/* xkb */,
-	int			/* minKC */,
-	int			/* maxKC */,
-	XkbChangesPtr		/* changes */
-);
-
-/***====================================================================***/
-
-extern	XkbComponentListPtr	XkbListComponents(
-	Display *		/* dpy */,
-	unsigned int		/* deviceSpec */,
-	XkbComponentNamesPtr	/* ptrns */,
-	int *			/* max_inout */
-);
-
-extern	void XkbFreeComponentList(
-	XkbComponentListPtr	/* list */
-);
-
-extern	XkbDescPtr XkbGetKeyboard(
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	unsigned int 		/* deviceSpec */
-);
-
-extern XkbDescPtr XkbGetKeyboardByName(
-    Display *			/* dpy */,
-    unsigned int		/* deviceSpec */,
-    XkbComponentNamesPtr	/* names */,
-    unsigned int 		/* want */,
-    unsigned int 		/* need */,
-    Bool			/* load */
-);
-
-/***====================================================================***/
-
-extern	int	XkbKeyTypesForCoreSymbols(	/* returns # of groups */
-    XkbDescPtr	/* xkb */,			/* keyboard device */
-    int		/* map_width */,		/* width of core KeySym array */
-    KeySym *	/* core_syms */,		/* always mapWidth symbols */
-    unsigned int	/* protected */,	/* explicit key types */
-    int *	/* types_inout */,		/* always four type indices */
-    KeySym * 	/* xkb_syms_rtrn */		/* must have enough space */
-);
-
-extern	Bool	XkbApplyCompatMapToKey(	/* False only on error */
-    XkbDescPtr		/* xkb */,		/* keymap to be edited */
-    KeyCode		/* key */,		/* key to be updated */
-    XkbChangesPtr	/* changes */		/* resulting changes to map */
-);
-
-extern	Bool	XkbUpdateMapFromCore( /* False only on error */
-    XkbDescPtr		/* xkb */,		/* XKB keyboard to be edited */
-    KeyCode		/* first_key */,	/* first changed key */
-    int			/* num_keys */, 	/* number of changed keys */
-    int			/* map_width */,	/* width of core keymap */
-    KeySym *		/* core_keysyms */,	/* symbols from core keymap */
-    XkbChangesPtr	/* changes */		/* resulting changes */
-);
-
-/***====================================================================***/
-
-extern	XkbDeviceLedInfoPtr	XkbAddDeviceLedInfo(
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledId */
-);
-
-extern	Status			XkbResizeDeviceButtonActions(
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* newTotal */
-);
-
-extern	XkbDeviceInfoPtr	XkbAllocDeviceInfo(
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* nButtons */,
-	unsigned int		/* szLeds */
-);
-
-extern	void XkbFreeDeviceInfo(
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* which */,
-	Bool			/* freeDevI */
-);
-
-extern	void	XkbNoteDeviceChanges(
-    XkbDeviceChangesPtr			/* old */,
-    XkbExtensionDeviceNotifyEvent *	/* new */,
-    unsigned int	 		/* wanted */
-);
-
-extern	XkbDeviceInfoPtr XkbGetDeviceInfo(
-	Display *		/* dpy */,
-	unsigned int 		/* which */,
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledID */
-);
-
-extern	Status	XkbGetDeviceInfoChanges(
-	Display *		/* dpy */,
-	XkbDeviceInfoPtr	/* devi */,
-	XkbDeviceChangesPtr 	/* changes */
-);
-
-extern	Status	XkbGetDeviceButtonActions(
-	Display *		/* dpy */,
-	XkbDeviceInfoPtr	/* devi */,
-	Bool			/* all */,
-	unsigned int		/* first */,
-	unsigned int		/* nBtns */
-);
-
-extern	Status	XkbGetDeviceLedInfo(
-	Display *		/* dpy */,
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* ledClass (class, XIDflt, XIAll) */,
-	unsigned int		/* ledId (id, XIDflt, XIAll) */,
-	unsigned int		/* which (XkbXI_Indicator{Names,Map}Mask */
-);
-
-extern	Bool	XkbSetDeviceInfo(
-	Display *		/* dpy */,
-	unsigned int		/* which */,
-	XkbDeviceInfoPtr	/* devi */
-);
-
-extern	Bool	XkbChangeDeviceInfo(
-	Display*		/* dpy */,
-	XkbDeviceInfoPtr	/* desc */,
-	XkbDeviceChangesPtr	/* changes */
-);
-
-extern  Bool XkbSetDeviceLedInfo(
-	Display *		/* dpy */,
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int 		/* ledClass */,
-	unsigned int		/* ledID */,
-	unsigned int		/* which */
-);
-
-extern	Bool XkbSetDeviceButtonActions(
-	Display *		/* dpy */,
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* first */,
-	unsigned int		/* nBtns */
-);
-
-/***====================================================================***/
-
-extern	char	XkbToControl(
-	char		/* c */
-);
-
-/***====================================================================***/
-
-extern	Bool XkbSetDebuggingFlags(
-    Display *		/* dpy */,
-    unsigned int	/* mask */,
-    unsigned int	/* flags */,
-    char *		/* msg */,
-    unsigned int	/* ctrls_mask */,
-    unsigned int	/* ctrls */,
-    unsigned int *	/* rtrn_flags */,
-    unsigned int *	/* rtrn_ctrls */
-);
-
-extern	Bool XkbApplyVirtualModChanges(
-   XkbDescPtr		/* xkb */,
-   unsigned int		/* changed */,
-   XkbChangesPtr	/* changes */
-);
-
-extern Bool XkbUpdateActionVirtualMods(
-	XkbDescPtr		/* xkb */,
-	XkbAction *		/* act */,
-	unsigned int		/* changed */
-);
-
-extern void XkbUpdateKeyTypeVirtualMods(
-	XkbDescPtr		/* xkb */,
-	XkbKeyTypePtr		/* type */,
-	unsigned int		/* changed */,
-	XkbChangesPtr		/* changes */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _X11_XKBLIB_H_ */
diff --git a/openflow/usr/include/X11/XWDFile.h b/openflow/usr/include/X11/XWDFile.h
deleted file mode 100644
index 50e17df..0000000
--- a/openflow/usr/include/X11/XWDFile.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-
-Copyright 1985, 1986, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/*
- * XWDFile.h	MIT Project Athena, X Window system window raster
- *		image dumper, dump file format header file.
- *
- *  Author:	Tony Della Fera, DEC
- *		27-Jun-85
- * 
- * Modifier:    William F. Wyatt, SAO
- *              18-Nov-86  - version 6 for saving/restoring color maps
- */
-
-#ifndef XWDFILE_H
-#define XWDFILE_H
-
-#include <X11/Xmd.h>
-
-#define XWD_FILE_VERSION 7
-#define sz_XWDheader 100
-#define sz_XWDColor 12
-
-typedef CARD32 xwdval;		/* for old broken programs */
-
-/* Values in the file are most significant byte first. */
-
-typedef struct _xwd_file_header {
-	/* header_size = SIZEOF(XWDheader) + length of null-terminated
-	 * window name. */
-	CARD32 header_size B32;		
-
-	CARD32 file_version B32;	/* = XWD_FILE_VERSION above */
-	CARD32 pixmap_format B32;	/* ZPixmap or XYPixmap */
-	CARD32 pixmap_depth B32;	/* Pixmap depth */
-	CARD32 pixmap_width B32;	/* Pixmap width */
-	CARD32 pixmap_height B32;	/* Pixmap height */
-	CARD32 xoffset B32;		/* Bitmap x offset, normally 0 */
-	CARD32 byte_order B32;		/* of image data: MSBFirst, LSBFirst */
-
-	/* bitmap_unit applies to bitmaps (depth 1 format XY) only.
-	 * It is the number of bits that each scanline is padded to. */
-	CARD32 bitmap_unit B32;		
-
-	CARD32 bitmap_bit_order B32;	/* bitmaps only: MSBFirst, LSBFirst */
-
-	/* bitmap_pad applies to pixmaps (non-bitmaps) only.
-	 * It is the number of bits that each scanline is padded to. */
-	CARD32 bitmap_pad B32;		
-
-	CARD32 bits_per_pixel B32;	/* Bits per pixel */
-
-	/* bytes_per_line is pixmap_width padded to bitmap_unit (bitmaps)
-	 * or bitmap_pad (pixmaps).  It is the delta (in bytes) to get
-	 * to the same x position on an adjacent row. */
-	CARD32 bytes_per_line B32;
-	CARD32 visual_class B32;	/* Class of colormap */
-	CARD32 red_mask B32;		/* Z red mask */
-	CARD32 green_mask B32;		/* Z green mask */
-	CARD32 blue_mask B32;		/* Z blue mask */
-	CARD32 bits_per_rgb B32;	/* Log2 of distinct color values */
-	CARD32 colormap_entries B32;	/* Number of entries in colormap; not used? */
-	CARD32 ncolors B32;		/* Number of XWDColor structures */
-	CARD32 window_width B32;	/* Window width */
-	CARD32 window_height B32;	/* Window height */
-	CARD32 window_x B32;		/* Window upper left X coordinate */
-	CARD32 window_y B32;		/* Window upper left Y coordinate */
-	CARD32 window_bdrwidth B32;	/* Window border width */
-} XWDFileHeader;
-
-/* Null-terminated window name follows the above structure. */
-
-/* Next comes XWDColor structures, at offset XWDFileHeader.header_size in
- * the file.  XWDFileHeader.ncolors tells how many XWDColor structures
- * there are.
- */
-
-typedef struct {
-        CARD32	pixel B32;
-        CARD16	red B16;
-	CARD16	green B16;
-	CARD16	blue B16;
-        CARD8	flags;
-        CARD8	pad;
-} XWDColor;
-
-/* Last comes the image data in the format described by XWDFileHeader. */
-
-#endif /* XWDFILE_H */
-
diff --git a/openflow/usr/include/X11/Xalloca.h b/openflow/usr/include/X11/Xalloca.h
deleted file mode 100644
index 1919884..0000000
--- a/openflow/usr/include/X11/Xalloca.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-
-Copyright 1995, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/*
- * The purpose of this header is to define the macros ALLOCATE_LOCAL and
- * DEALLOCATE_LOCAL appropriately for the platform being compiled on.
- * These macros are used to make fast, function-local memory allocations.
- * Their characteristics are as follows:
- *
- * void *ALLOCATE_LOCAL(int size)
- *    Returns a pointer to size bytes of memory, or NULL if the allocation
- *    failed.  The memory must be freed with DEALLOCATE_LOCAL before the
- *    function that made the allocation returns.  You should not ask for
- *    large blocks of memory with this function, since on many platforms
- *    the memory comes from the stack, which may have limited size.
- *
- * void DEALLOCATE_LOCAL(void *)
- *    Frees the memory allocated by ALLOCATE_LOCAL.  Omission of this
- *    step may be harmless on some platforms, but will result in
- *    memory leaks or worse on others.
- *
- * Before including this file, you should define two macros,
- * ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK, that have the
- * same characteristics as ALLOCATE_LOCAL and DEALLOCATE_LOCAL.  The
- * header uses the fallbacks if it doesn't know a "better" way to define
- * ALLOCATE_LOCAL and DEALLOCATE_LOCAL.  Typical usage would be:
- *
- *    #define ALLOCATE_LOCAL_FALLBACK(_size) malloc(_size)
- *    #define DEALLOCATE_LOCAL_FALLBACK(_ptr) free(_ptr)
- *    #include "Xalloca.h"
- */
-
-#ifndef XALLOCA_H
-#define XALLOCA_H 1
-
-#ifndef INCLUDE_ALLOCA_H
-/* Need to add more here to match Imake *.cf's */
-# if defined(HAVE_ALLOCA_H) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#  define INCLUDE_ALLOCA_H
-# endif
-#endif
-
-#ifdef INCLUDE_ALLOCA_H
-#  include <alloca.h>
-#endif
-
-#ifndef NO_ALLOCA
-/*
- * os-dependent definition of local allocation and deallocation
- * If you want something other than (DE)ALLOCATE_LOCAL_FALLBACK
- * for ALLOCATE/DEALLOCATE_LOCAL then you add that in here.
- */
-
-
-#  ifdef __GNUC__
-#    ifndef alloca
-#      define alloca __builtin_alloca
-#    endif /* !alloca */
-#    define ALLOCATE_LOCAL(size) alloca((int)(size))
-#  else /* ! __GNUC__ */
-
-/*
- * warning: old mips alloca (pre 2.10) is unusable, new one is built in
- * Test is easy, the new one is named __builtin_alloca and comes
- * from alloca.h which #defines alloca.
- */
-#      if defined(__sun) || defined(alloca)
-/*
- * Some System V boxes extract alloca.o from /lib/libPW.a; if you
- * decide that you don't want to use alloca, you might want to fix it here.
- */
-/* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
-#        if !defined(__cplusplus)
-#          define __Xnullarg		/* as nothing */
-           extern void *alloca(__Xnullarg);
-#        endif
-#        define ALLOCATE_LOCAL(size) alloca((int)(size))
-#      endif /* who does alloca */
-#  endif /* __GNUC__ */
-
-#endif /* NO_ALLOCA */
-
-#if !defined(ALLOCATE_LOCAL)
-#  if defined(ALLOCATE_LOCAL_FALLBACK) && defined(DEALLOCATE_LOCAL_FALLBACK)
-#    define ALLOCATE_LOCAL(_size)  ALLOCATE_LOCAL_FALLBACK(_size)
-#    define DEALLOCATE_LOCAL(_ptr) DEALLOCATE_LOCAL_FALLBACK(_ptr)
-#  else /* no fallbacks supplied; error */
-#    define ALLOCATE_LOCAL(_size)  ALLOCATE_LOCAL_FALLBACK undefined!
-#    define DEALLOCATE_LOCAL(_ptr) DEALLOCATE_LOCAL_FALLBACK undefined!
-#  endif /* defined(ALLOCATE_LOCAL_FALLBACK && DEALLOCATE_LOCAL_FALLBACK) */
-#else
-#  if !defined(DEALLOCATE_LOCAL)
-#    define DEALLOCATE_LOCAL(_ptr) do {} while(0)
-#  endif
-#endif /* defined(ALLOCATE_LOCAL) */
-
-#endif /* XALLOCA_H */
diff --git a/openflow/usr/include/X11/Xarch.h b/openflow/usr/include/X11/Xarch.h
deleted file mode 100644
index f80c580..0000000
--- a/openflow/usr/include/X11/Xarch.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef _XARCH_H_
-# define _XARCH_H_
-
-/*
- * Copyright 1997 Metro Link Incorporated
- *
- *                           All Rights Reserved
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of the above listed copyright holder(s)
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission.  The above listed
- * copyright holder(s) make(s) no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-
-/*
- * Determine the machine's byte order.
- */
-
-/* See if it is set in the imake config first */
-# ifdef X_BYTE_ORDER
-
-#  define X_BIG_ENDIAN 4321
-#  define X_LITTLE_ENDIAN 1234
-
-# else
-
-#  if defined(SVR4) || defined(__SVR4)
-#   include <sys/types.h>
-#   include <sys/byteorder.h>
-#  elif defined(CSRG_BASED)
-#   if defined(__NetBSD__) || defined(__OpenBSD__)
-#    include <sys/types.h>
-#   endif
-#   include <machine/endian.h>
-#  elif defined(linux)
-#   if defined __STRICT_ANSI__
-#    undef __STRICT_ANSI__
-#    include <endian.h>
-#    define __STRICT_ANSI__
-#   else
-#    include <endian.h>
-#   endif
-/* 'endian.h' might have been included before 'Xarch.h' */
-#   if !defined(LITTLE_ENDIAN) && defined(__LITTLE_ENDIAN)
-#    define LITTLE_ENDIAN __LITTLE_ENDIAN
-#   endif
-#   if !defined(BIG_ENDIAN) && defined(__BIG_ENDIAN)
-#    define BIG_ENDIAN __BIG_ENDIAN
-#   endif
-#   if !defined(PDP_ENDIAN) && defined(__PDP_ENDIAN)
-#    define PDP_ENDIAN __PDP_ENDIAN
-#   endif
-#   if !defined(BYTE_ORDER) && defined(__BYTE_ORDER)
-#    define BYTE_ORDER __BYTE_ORDER
-#   endif
-#  endif
-
-#  ifndef BYTE_ORDER
-#   define LITTLE_ENDIAN 1234
-#   define BIG_ENDIAN    4321
-
-#   if defined(__sun) && defined(__SVR4)
-#    include <sys/isa_defs.h>
-#    ifdef _LITTLE_ENDIAN
-#     define BYTE_ORDER LITTLE_ENDIAN
-#    endif
-#    ifdef _BIG_ENDIAN
-#     define BYTE_ORDER BIG_ENDIAN
-#    endif
-#   endif /* sun */
-#  endif /* BYTE_ORDER */
-
-#  define X_BYTE_ORDER BYTE_ORDER
-#  define X_BIG_ENDIAN BIG_ENDIAN
-#  define X_LITTLE_ENDIAN LITTLE_ENDIAN
-
-# endif /* not in imake config */
-
-#endif /* _XARCH_H_ */
diff --git a/openflow/usr/include/X11/Xatom.h b/openflow/usr/include/X11/Xatom.h
deleted file mode 100644
index 485a423..0000000
--- a/openflow/usr/include/X11/Xatom.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef XATOM_H
-#define XATOM_H 1
-
-/* THIS IS A GENERATED FILE
- *
- * Do not change!  Changing this file implies a protocol change!
- */
-
-#define XA_PRIMARY ((Atom) 1)
-#define XA_SECONDARY ((Atom) 2)
-#define XA_ARC ((Atom) 3)
-#define XA_ATOM ((Atom) 4)
-#define XA_BITMAP ((Atom) 5)
-#define XA_CARDINAL ((Atom) 6)
-#define XA_COLORMAP ((Atom) 7)
-#define XA_CURSOR ((Atom) 8)
-#define XA_CUT_BUFFER0 ((Atom) 9)
-#define XA_CUT_BUFFER1 ((Atom) 10)
-#define XA_CUT_BUFFER2 ((Atom) 11)
-#define XA_CUT_BUFFER3 ((Atom) 12)
-#define XA_CUT_BUFFER4 ((Atom) 13)
-#define XA_CUT_BUFFER5 ((Atom) 14)
-#define XA_CUT_BUFFER6 ((Atom) 15)
-#define XA_CUT_BUFFER7 ((Atom) 16)
-#define XA_DRAWABLE ((Atom) 17)
-#define XA_FONT ((Atom) 18)
-#define XA_INTEGER ((Atom) 19)
-#define XA_PIXMAP ((Atom) 20)
-#define XA_POINT ((Atom) 21)
-#define XA_RECTANGLE ((Atom) 22)
-#define XA_RESOURCE_MANAGER ((Atom) 23)
-#define XA_RGB_COLOR_MAP ((Atom) 24)
-#define XA_RGB_BEST_MAP ((Atom) 25)
-#define XA_RGB_BLUE_MAP ((Atom) 26)
-#define XA_RGB_DEFAULT_MAP ((Atom) 27)
-#define XA_RGB_GRAY_MAP ((Atom) 28)
-#define XA_RGB_GREEN_MAP ((Atom) 29)
-#define XA_RGB_RED_MAP ((Atom) 30)
-#define XA_STRING ((Atom) 31)
-#define XA_VISUALID ((Atom) 32)
-#define XA_WINDOW ((Atom) 33)
-#define XA_WM_COMMAND ((Atom) 34)
-#define XA_WM_HINTS ((Atom) 35)
-#define XA_WM_CLIENT_MACHINE ((Atom) 36)
-#define XA_WM_ICON_NAME ((Atom) 37)
-#define XA_WM_ICON_SIZE ((Atom) 38)
-#define XA_WM_NAME ((Atom) 39)
-#define XA_WM_NORMAL_HINTS ((Atom) 40)
-#define XA_WM_SIZE_HINTS ((Atom) 41)
-#define XA_WM_ZOOM_HINTS ((Atom) 42)
-#define XA_MIN_SPACE ((Atom) 43)
-#define XA_NORM_SPACE ((Atom) 44)
-#define XA_MAX_SPACE ((Atom) 45)
-#define XA_END_SPACE ((Atom) 46)
-#define XA_SUPERSCRIPT_X ((Atom) 47)
-#define XA_SUPERSCRIPT_Y ((Atom) 48)
-#define XA_SUBSCRIPT_X ((Atom) 49)
-#define XA_SUBSCRIPT_Y ((Atom) 50)
-#define XA_UNDERLINE_POSITION ((Atom) 51)
-#define XA_UNDERLINE_THICKNESS ((Atom) 52)
-#define XA_STRIKEOUT_ASCENT ((Atom) 53)
-#define XA_STRIKEOUT_DESCENT ((Atom) 54)
-#define XA_ITALIC_ANGLE ((Atom) 55)
-#define XA_X_HEIGHT ((Atom) 56)
-#define XA_QUAD_WIDTH ((Atom) 57)
-#define XA_WEIGHT ((Atom) 58)
-#define XA_POINT_SIZE ((Atom) 59)
-#define XA_RESOLUTION ((Atom) 60)
-#define XA_COPYRIGHT ((Atom) 61)
-#define XA_NOTICE ((Atom) 62)
-#define XA_FONT_NAME ((Atom) 63)
-#define XA_FAMILY_NAME ((Atom) 64)
-#define XA_FULL_NAME ((Atom) 65)
-#define XA_CAP_HEIGHT ((Atom) 66)
-#define XA_WM_CLASS ((Atom) 67)
-#define XA_WM_TRANSIENT_FOR ((Atom) 68)
-
-#define XA_LAST_PREDEFINED ((Atom) 68)
-#endif /* XATOM_H */
diff --git a/openflow/usr/include/X11/Xauth.h b/openflow/usr/include/X11/Xauth.h
deleted file mode 100644
index a707bed..0000000
--- a/openflow/usr/include/X11/Xauth.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-
-Copyright 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#ifndef _Xauth_h
-#define _Xauth_h
-
-/* struct xauth is full of implicit padding to properly align the pointers
-   after the length fields.   We can't clean that up without breaking ABI,
-   so tell clang not to bother complaining about it. */
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-typedef struct xauth {
-    unsigned short   family;
-    unsigned short   address_length;
-    char    	    *address;
-    unsigned short   number_length;
-    char    	    *number;
-    unsigned short   name_length;
-    char    	    *name;
-    unsigned short   data_length;
-    char   	    *data;
-} Xauth;
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#ifndef _XAUTH_STRUCT_ONLY
-
-# include   <X11/Xfuncproto.h>
-# include   <X11/Xfuncs.h>
-
-# include   <stdio.h>
-
-# define FamilyLocal (256)	/* not part of X standard (i.e. X.h) */
-# define FamilyWild  (65535)
-# define FamilyNetname    (254)   /* not part of X standard */
-# define FamilyKrb5Principal (253) /* Kerberos 5 principal name */
-# define FamilyLocalHost (252)	/* for local non-net authentication */
-
-
-_XFUNCPROTOBEGIN
-
-char *XauFileName(void);
-
-Xauth *XauReadAuth(
-FILE*	/* auth_file */
-);
-
-int XauLockAuth(
-_Xconst char*	/* file_name */,
-int		/* retries */,
-int		/* timeout */,
-long		/* dead */
-);
-
-int XauUnlockAuth(
-_Xconst char*	/* file_name */
-);
-
-int XauWriteAuth(
-FILE*		/* auth_file */,
-Xauth*		/* auth */
-);
-
-Xauth *XauGetAuthByAddr(
-#if NeedWidePrototypes
-unsigned int	/* family */,
-unsigned int	/* address_length */,
-#else
-unsigned short	/* family */,
-unsigned short	/* address_length */,
-#endif
-_Xconst char*	/* address */,
-#if NeedWidePrototypes
-unsigned int	/* number_length */,
-#else
-unsigned short	/* number_length */,
-#endif
-_Xconst char*	/* number */,
-#if NeedWidePrototypes
-unsigned int	/* name_length */,
-#else
-unsigned short	/* name_length */,
-#endif
-_Xconst char*	/* name */
-);
-
-Xauth *XauGetBestAuthByAddr(
-#if NeedWidePrototypes
-unsigned int	/* family */,
-unsigned int	/* address_length */,
-#else
-unsigned short	/* family */,
-unsigned short	/* address_length */,
-#endif
-_Xconst char*	/* address */,
-#if NeedWidePrototypes
-unsigned int	/* number_length */,
-#else
-unsigned short	/* number_length */,
-#endif
-_Xconst char*	/* number */,
-int		/* types_length */,
-char**		/* type_names */,
-_Xconst int*	/* type_lengths */
-);
-
-void XauDisposeAuth(
-Xauth*		/* auth */
-);
-
-_XFUNCPROTOEND
-
-/* Return values from XauLockAuth */
-
-# define LOCK_SUCCESS	0	/* lock succeeded */
-# define LOCK_ERROR	1	/* lock unexpectely failed, check errno */
-# define LOCK_TIMEOUT	2	/* lock failed, timeouts expired */
-
-#endif /* _XAUTH_STRUCT_ONLY */
-
-#endif /* _Xauth_h */
diff --git a/openflow/usr/include/X11/Xcms.h b/openflow/usr/include/X11/Xcms.h
deleted file mode 100644
index 6631854..0000000
--- a/openflow/usr/include/X11/Xcms.h
+++ /dev/null
@@ -1,815 +0,0 @@
-
-/*
- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
- * 	All Rights Reserved
- *
- * This file is a component of an X Window System-specific implementation
- * of Xcms based on the TekColor Color Management System.  Permission is
- * hereby granted to use, copy, modify, sell, and otherwise distribute this
- * software and its documentation for any purpose and without fee, provided
- * that this copyright, permission, and disclaimer notice is reproduced in
- * all copies of this software and in supporting documentation.  TekColor
- * is a trademark of Tektronix, Inc.
- *
- * Tektronix makes no representation about the suitability of this software
- * for any purpose.  It is provided "as is" and with all faults.
- *
- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *	DESCRIPTION
- *		Public include file for X Color Management System
- */
-#ifndef _X11_XCMS_H_
-#define _X11_XCMS_H_
-
-#include <X11/Xlib.h>
-
-/* The Xcms structs are full of implicit padding to properly align members.
-   We can't clean that up without breaking ABI, so tell clang not to bother
-   complaining about it. */
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-    /*
-     * XCMS Status Values
-     */
-#define XcmsFailure			0
-#define XcmsSuccess			1
-#define XcmsSuccessWithCompression	2
-
-    /*
-     * Color Space Format ID's
-     *    Color Space ID's are of XcmsColorFormat type.
-     *
-     *    bit 31
-     *	    0 == Device-Independent
-     *	    1 == Device-Dependent
-     *
-     *    bit 30:
-     *	    0 == Registered with X Consortium
-     *	    1 == Unregistered
-     */
-#define XcmsUndefinedFormat	(XcmsColorFormat)0x00000000
-#define XcmsCIEXYZFormat	(XcmsColorFormat)0x00000001
-#define XcmsCIEuvYFormat	(XcmsColorFormat)0x00000002
-#define XcmsCIExyYFormat	(XcmsColorFormat)0x00000003
-#define XcmsCIELabFormat	(XcmsColorFormat)0x00000004
-#define XcmsCIELuvFormat	(XcmsColorFormat)0x00000005
-#define XcmsTekHVCFormat	(XcmsColorFormat)0x00000006
-#define XcmsRGBFormat		(XcmsColorFormat)0x80000000
-#define XcmsRGBiFormat		(XcmsColorFormat)0x80000001
-
-    /*
-     * State of XcmsPerScrnInfo
-     */
-#define XcmsInitNone		0x00	/* no initialization attempted */
-#define XcmsInitSuccess		0x01	/* initialization successful */
-#define XcmsInitFailure		0xff	/* failure, use defaults */
-
-#define DisplayOfCCC(ccc)		((ccc)->dpy)
-#define ScreenNumberOfCCC(ccc)		((ccc)->screenNumber)
-#define VisualOfCCC(ccc)		((ccc)->visual)
-#define ClientWhitePointOfCCC(ccc)	(&(ccc)->clientWhitePt)
-#define ScreenWhitePointOfCCC(ccc)	(&(ccc)->pPerScrnInfo->screenWhitePt)
-#define FunctionSetOfCCC(ccc)		((ccc)->pPerScrnInfo->functionSet)
-
-typedef unsigned long XcmsColorFormat;	/* Color Space Format ID */
-
-typedef double XcmsFloat;
-
-    /*
-     * Device RGB
-     */
-typedef struct {
-    unsigned short red;		/* scaled from 0x0000 to 0xffff */
-    unsigned short green;	/* scaled from 0x0000 to 0xffff */
-    unsigned short blue;	/* scaled from 0x0000 to 0xffff */
-} XcmsRGB;
-
-    /*
-     * RGB Intensity
-     */
-typedef struct {
-    XcmsFloat red;	/* 0.0 - 1.0 */
-    XcmsFloat green;	/* 0.0 - 1.0 */
-    XcmsFloat blue;	/* 0.0 - 1.0 */
-} XcmsRGBi;
-
-    /*
-     * CIE XYZ
-     */
-typedef struct {
-    XcmsFloat X;
-    XcmsFloat Y;
-    XcmsFloat Z;
-} XcmsCIEXYZ;
-
-    /*
-     * CIE u'v'Y
-     */
-typedef struct {
-    XcmsFloat u_prime;		/* 0.0 - 1.0 */
-    XcmsFloat v_prime;		/* 0.0 - 1.0 */
-    XcmsFloat Y;		/* 0.0 - 1.0 */
-} XcmsCIEuvY;
-
-    /*
-     * CIE xyY
-     */
-typedef struct {
-    XcmsFloat x;		/* 0.0 - 1.0 */
-    XcmsFloat y;		/* 0.0 - 1.0 */
-    XcmsFloat Y;		/* 0.0 - 1.0 */
-} XcmsCIExyY;
-
-    /*
-     * CIE L*a*b*
-     */
-typedef struct {
-    XcmsFloat L_star;		/* 0.0 - 100.0 */
-    XcmsFloat a_star;
-    XcmsFloat b_star;
-} XcmsCIELab;
-
-    /*
-     * CIE L*u*v*
-     */
-typedef struct {
-    XcmsFloat L_star;		/* 0.0 - 100.0 */
-    XcmsFloat u_star;
-    XcmsFloat v_star;
-} XcmsCIELuv;
-
-    /*
-     * TekHVC
-     */
-typedef struct {
-    XcmsFloat H;		/* 0.0 - 360.0 */
-    XcmsFloat V;		/* 0.0 - 100.0 */
-    XcmsFloat C;		/* 0.0 - 100.0 */
-} XcmsTekHVC;
-
-    /*
-     * PAD
-     */
-typedef struct {
-    XcmsFloat pad0;
-    XcmsFloat pad1;
-    XcmsFloat pad2;
-    XcmsFloat pad3;
-} XcmsPad;
-
-
-    /*
-     * XCMS Color Structure
-     */
-typedef struct {
-    union {
-	XcmsRGB RGB;
-	XcmsRGBi RGBi;
-	XcmsCIEXYZ CIEXYZ;
-	XcmsCIEuvY CIEuvY;
-	XcmsCIExyY CIExyY;
-	XcmsCIELab CIELab;
-	XcmsCIELuv CIELuv;
-	XcmsTekHVC TekHVC;
-	XcmsPad Pad;
-    } spec;			/* the color specification	*/
-    unsigned long pixel;	/* pixel value (as needed)	*/
-    XcmsColorFormat	format;		/* the specification format	*/
-} XcmsColor;
-
-
-    /*
-     * XCMS Per Screen related data
-     */
-
-typedef struct _XcmsPerScrnInfo {
-    XcmsColor	screenWhitePt;	/* Screen White point */
-    XPointer	functionSet;	/* pointer to Screen Color Characterization */
-				/*      Function Set structure		*/
-    XPointer	screenData;	/* pointer to corresponding Screen Color*/
-				/*	Characterization Data		*/
-    unsigned char state;   /* XcmsInitNone, XcmsInitSuccess, XcmsInitFailure */
-    char	pad[3];
-} XcmsPerScrnInfo;
-
-typedef struct _XcmsCCC *XcmsCCC;
-
-typedef Status (*XcmsCompressionProc)(		/* Gamut Compression Proc */
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-);
-
-typedef Status (*XcmsWhiteAdjustProc)(	 	/* White Point Adjust Proc */
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* initial_white_point*/,
-    XcmsColor*		/* target_white_point*/,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-);
-
-    /*
-     * XCMS Color Conversion Context
-     */
-typedef struct _XcmsCCC {
-    Display	*dpy;			/* X Display */
-    int		screenNumber;		/* X screen number */
-    Visual	*visual;		/* X Visual */
-    XcmsColor	clientWhitePt;		/* Client White Point */
-    XcmsCompressionProc	gamutCompProc;	/* Gamut Compression Function */
-    XPointer	gamutCompClientData;	/* Gamut Comp Func Client Data */
-    XcmsWhiteAdjustProc	whitePtAdjProc;	/* White Point Adjustment Function */
-    XPointer	whitePtAdjClientData;	/* White Pt Adj Func Client Data */
-    XcmsPerScrnInfo *pPerScrnInfo;	/* pointer to per screen information */
-					/*  associated with the above display */
-					/*  screenNumber */
-} XcmsCCCRec;
-
-typedef Status (*XcmsScreenInitProc)(	/* Screen Initialization Proc */
-    Display*		/* dpy */,
-    int			/* screen_number */,
-    XcmsPerScrnInfo*	/* screen_info */
-);
-
-typedef void (*XcmsScreenFreeProc)(
-    XPointer		/* screenData */
-);
-
-    /*
-     * Function List Pointer -- pointer to an array of function pointers.
-     *    The end of list is indicated by a NULL pointer.
-     */
-/*
- * XXX:  The use of the XcmsConversionProc type is broken.  The
- *       device-independent colour conversion code uses it as:
-
-typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *,
-				     unsigned int);
-
- *       while the device-dependent code uses it as:
-
-typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, unsigned int,
-				     Bool *);
-
- *       Until this is reworked, it's probably best to leave it unprotoized.
- *       The code works regardless.
- */
-typedef Status (*XcmsDDConversionProc)( /* using device-dependent version */
-    XcmsCCC             /* ccc */,
-    XcmsColor*          /* pcolors_in_out */,
-    unsigned int        /* ncolors */,
-    Bool*               /* pCompressed */
-    );
-
-typedef Status (*XcmsDIConversionProc)( /* using device-independent version */
-    XcmsCCC             /* ccc */,
-    XcmsColor*          /* white_point */,
-    XcmsColor*          /* pcolors_in_out */,
-    unsigned int        /* ncolors */
-    );
-
-typedef XcmsDIConversionProc XcmsConversionProc;
-typedef XcmsConversionProc *XcmsFuncListPtr;
-
-typedef int (*XcmsParseStringProc)(	/* Color String Parsing Proc */
-    char*		/* color_string */,
-    XcmsColor*		/* color_return */
-);
-
-    /*
-     * Color Space -- per Color Space related data (Device-Independent
-     *    or Device-Dependent)
-     */
-typedef struct _XcmsColorSpace {
-    const char *prefix;		/* Prefix of string format.		*/
-    XcmsColorFormat id;		/* Format ID number.			*/
-    XcmsParseStringProc parseString;
-				/* String format parsing function	*/
-    XcmsFuncListPtr to_CIEXYZ;	/* Pointer to an array of function 	*/
-				/*   pointers such that when the	*/
-				/*   functions are executed in sequence	*/
-				/*   will convert a XcmsColor structure	*/
-				/*   from this color space to CIEXYZ	*/
-				/*   space.				*/
-    XcmsFuncListPtr from_CIEXYZ;/* Pointer to an array of function 	*/
-				/*   pointers such that when the	*/
-				/*   functions are executed in sequence	*/
-				/*   will convert a XcmsColor structure	*/
-				/*   from CIEXYZ space to this color	*/
-				/*   space.				*/
-    int inverse_flag;		/* If 1, indicates that for 0 <= i < n	*/
-				/*   where n is the number of function	*/
-				/*   pointers in the lists to_CIEXYZ	*/
-				/*   and from_CIEXYZ; for each function */
-				/*   to_CIEXYZ[i] its inverse function	*/
-				/*   is from_CIEXYZ[n - i].		*/
-
-} XcmsColorSpace;
-
-    /*
-     * Screen Color Characterization Function Set -- per device class
-     *    color space conversion functions.
-     */
-typedef struct _XcmsFunctionSet {
-    XcmsColorSpace **DDColorSpaces;
-				/* Pointer to an array of pointers to	*/
-				/*   Device-DEPENDENT color spaces	*/
-				/*   understood by this SCCFuncSet.	*/
-    XcmsScreenInitProc screenInitProc;
-				/* Screen initialization function that	*/
-				/*   reads Screen Color Characterization*/
-				/*   Data off properties on the screen's*/
-				/*   root window.			*/
-    XcmsScreenFreeProc screenFreeProc;
-				/* Function that frees the SCCData	*/
-				/*   structures.			*/
-} XcmsFunctionSet;
-
-_XFUNCPROTOBEGIN
-
-extern Status XcmsAddColorSpace (
-    XcmsColorSpace*	/* pColorSpace */
-);
-
-extern Status XcmsAddFunctionSet (
-    XcmsFunctionSet*	/* functionSet */
-);
-
-extern Status XcmsAllocColor (
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsColor*		/* color_in_out */,
-    XcmsColorFormat		/* result_format */
-);
-
-extern Status XcmsAllocNamedColor (
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* color_string */,
-    XcmsColor*		/* color_scrn_return */,
-    XcmsColor*		/* color_exact_return */,
-    XcmsColorFormat		/* result_format */
-);
-
-extern XcmsCCC XcmsCCCOfColormap (
-    Display*		/* dpy */,
-    Colormap		/* colormap */
-);
-
-extern Status XcmsCIELabClipab(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsCIELabClipL(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsCIELabClipLab(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsCIELabQueryMaxC (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* L_star */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsCIELabQueryMaxL (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsCIELabQueryMaxLC (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsCIELabQueryMinL (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsCIELabToCIEXYZ (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-);
-
-extern Status XcmsCIELabWhiteShiftColors(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* initial_white_point*/,
-    XcmsColor*		/* target_white_point*/,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsCIELuvClipL(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsCIELuvClipLuv(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsCIELuvClipuv(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsCIELuvQueryMaxC (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* L_star */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsCIELuvQueryMaxL (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsCIELuvQueryMaxLC (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsCIELuvQueryMinL (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue_angle */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsCIELuvToCIEuvY (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-);
-
-extern Status XcmsCIELuvWhiteShiftColors(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* initial_white_point*/,
-    XcmsColor*		/* target_white_point*/,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsCIEXYZToCIELab (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-);
-
-extern Status XcmsCIEXYZToCIEuvY (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-);
-
-extern Status XcmsCIEXYZToCIExyY (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-);
-
-extern Status XcmsCIEXYZToRGBi (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsCIEuvYToCIELuv (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-);
-
-extern Status XcmsCIEuvYToCIEXYZ (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-);
-
-extern Status XcmsCIEuvYToTekHVC (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-);
-
-extern Status XcmsCIExyYToCIEXYZ (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-);
-
-extern XcmsColor *XcmsClientWhitePointOfCCC (
-    XcmsCCC		/* ccc */
-);
-
-extern Status XcmsConvertColors (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colorArry_in_out */,
-    unsigned int	/* nColors */,
-    XcmsColorFormat		/* targetFormat */,
-    Bool*		/* compArry_return */
-);
-
-extern XcmsCCC XcmsCreateCCC (
-    Display*		/* dpy */,
-    int			/* screenNumber */,
-    Visual*		/* visual */,
-    XcmsColor*		/* clientWhitePt */,
-    XcmsCompressionProc /* gamutCompProc */,
-    XPointer		/* gamutCompClientData */,
-    XcmsWhiteAdjustProc	/* whitePtAdjProc */,
-    XPointer		/* whitePtAdjClientData */
-);
-
-extern XcmsCCC XcmsDefaultCCC (
-    Display*		/* dpy */,
-    int			/* screenNumber */
-);
-
-extern Display *XcmsDisplayOfCCC (
-    XcmsCCC		/* ccc */
-);
-
-extern XcmsColorFormat XcmsFormatOfPrefix (
-    char*		/* prefix */
-);
-
-extern void XcmsFreeCCC (
-    XcmsCCC		/* ccc */
-);
-
-extern Status XcmsLookupColor (
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* color_string */,
-    XcmsColor*		/* pColor_exact_in_out */,
-    XcmsColor*		/* pColor_scrn_in_out */,
-    XcmsColorFormat		/* result_format */
-);
-
-extern char *XcmsPrefixOfFormat (
-    XcmsColorFormat		/* id */
-);
-
-extern Status XcmsQueryBlack (
-    XcmsCCC		/* ccc */,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsQueryBlue (
-    XcmsCCC		/* ccc */,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsQueryColor (
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsColor*		/* pColor_in_out */,
-    XcmsColorFormat		/* result_format */
-);
-
-extern Status XcmsQueryColors (
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsColor*		/* colorArry_in_out */,
-    unsigned int	/* nColors */,
-    XcmsColorFormat	/* result_format */
-);
-
-extern Status XcmsQueryGreen (
-    XcmsCCC		/* ccc */,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsQueryRed (
-    XcmsCCC		/* ccc */,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsQueryWhite (
-    XcmsCCC		/* ccc */,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsRGBiToCIEXYZ (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsRGBiToRGB (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsRGBToRGBi (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-);
-
-extern int XcmsScreenNumberOfCCC (
-    XcmsCCC		/* ccc */
-);
-
-extern XcmsColor *XcmsScreenWhitePointOfCCC (
-    XcmsCCC		/* ccc */
-);
-
-extern XcmsCCC XcmsSetCCCOfColormap(
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsCCC		/* ccc */
-);
-
-extern XcmsCompressionProc XcmsSetCompressionProc (
-    XcmsCCC		/* ccc */,
-    XcmsCompressionProc	/* compression_proc */,
-    XPointer		/* client_data */
-);
-
-extern XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc (
-    XcmsCCC		/* ccc */,
-    XcmsWhiteAdjustProc	/* white_adjust_proc */,
-    XPointer		/* client_data */
-);
-
-extern Status XcmsSetWhitePoint (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* color */
-);
-
-extern Status XcmsStoreColor (
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsColor*		/* pColor_in */
-);
-
-extern Status XcmsStoreColors (
-    Display*		/* dpy */,
-    Colormap		/* colormap */,
-    XcmsColor*		/* colorArry_in */,
-    unsigned int	/* nColors */,
-    Bool*		/* compArry_return */
-);
-
-extern Status XcmsTekHVCClipC(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsTekHVCClipV(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsTekHVCClipVC(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    unsigned int	/* index */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Status XcmsTekHVCQueryMaxC (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue */,
-    XcmsFloat		/* value */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsTekHVCQueryMaxV (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsTekHVCQueryMaxVC (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsTekHVCQueryMaxVSamples (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue */,
-    XcmsColor*		/* colors_return */,
-    unsigned int	/* nsamples */
-);
-
-extern Status XcmsTekHVCQueryMinV (
-    XcmsCCC		/* ccc */,
-    XcmsFloat		/* hue */,
-    XcmsFloat		/* chroma */,
-    XcmsColor*		/* color_return */
-);
-
-extern Status XcmsTekHVCToCIEuvY (
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* white_point */,
-    XcmsColor*		/* colors */,
-    unsigned int	/* ncolors */
-);
-
-extern Status XcmsTekHVCWhiteShiftColors(
-    XcmsCCC		/* ccc */,
-    XcmsColor*		/* initial_white_point*/,
-    XcmsColor*		/* target_white_point*/,
-    XcmsColorFormat	/* target_format */,
-    XcmsColor*		/* colors_in_out */,
-    unsigned int	/* ncolors */,
-    Bool*		/* compression_flags_return */
-);
-
-extern Visual *XcmsVisualOfCCC (
-    XcmsCCC		/* ccc */
-);
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _X11_XCMS_H_ */
diff --git a/openflow/usr/include/X11/Xdefs.h b/openflow/usr/include/X11/Xdefs.h
deleted file mode 100644
index e25a208..0000000
--- a/openflow/usr/include/X11/Xdefs.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/***********************************************************
-
-Copyright (c) 1999  The XFree86 Project Inc.
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The XFree86 Project
-Inc. shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization from The XFree86 Project Inc..
-
-*/
-
-/**
- ** Types definitions shared between server and clients 
- **/
-
-#ifndef _XDEFS_H
-#define _XDEFS_H
-
-#ifdef _XSERVER64
-#include <X11/Xmd.h>
-#endif 
-
-#ifndef _XTYPEDEF_ATOM
-#  define _XTYPEDEF_ATOM
-#  ifndef _XSERVER64
-typedef unsigned long Atom;
-#  else
-typedef CARD32 Atom;
-#  endif
-#endif
-
-#ifndef Bool
-#  ifndef _XTYPEDEF_BOOL
-#   define _XTYPEDEF_BOOL
-typedef int Bool;
-#  endif
-#endif
-
-#ifndef _XTYPEDEF_POINTER
-#  define _XTYPEDEF_POINTER
-typedef void *pointer;
-#endif
-
-#ifndef _XTYPEDEF_CLIENTPTR
-typedef struct _Client *ClientPtr;
-#  define _XTYPEDEF_CLIENTPTR
-#endif
-
-#ifndef _XTYPEDEF_XID
-#  define _XTYPEDEF_XID
-#  ifndef _XSERVER64
-typedef unsigned long XID;
-#  else
-typedef CARD32 XID;
-#  endif
-#endif
-
-#ifndef _XTYPEDEF_MASK
-#  define _XTYPEDEF_MASK
-#  ifndef _XSERVER64
-typedef unsigned long Mask;
-#  else
-typedef CARD32 Mask;
-#  endif
-#endif
-
-#ifndef _XTYPEDEF_FONTPTR
-#  define _XTYPEDEF_FONTPTR
-typedef struct _Font *FontPtr; /* also in fonts/include/font.h */
-#endif
-
-#ifndef _XTYPEDEF_FONT
-#  define _XTYPEDEF_FONT
-typedef XID	Font;
-#endif
-
-#ifndef _XTYPEDEF_FSID
-#  ifndef _XSERVER64
-typedef unsigned long FSID;
-#  else
-typedef CARD32 FSID;
-#  endif
-#endif
-
-typedef FSID AccContext;
-
-/* OS independent time value 
-   XXX Should probably go in Xos.h */
-typedef struct timeval **OSTimePtr;
-
-
-typedef void (* BlockHandlerProcPtr)(void * /* blockData */,
-				     OSTimePtr /* pTimeout */,
-				     void * /* pReadmask */);
-
-#endif
diff --git a/openflow/usr/include/X11/Xdmcp.h b/openflow/usr/include/X11/Xdmcp.h
deleted file mode 100644
index 0b531de..0000000
--- a/openflow/usr/include/X11/Xdmcp.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of N.C.D. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  N.C.D. makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- */
-
-#ifndef _XDMCP_H_
-#define _XDMCP_H_
-
-#include <X11/Xmd.h>
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-#define XDM_PROTOCOL_VERSION	1
-#define XDM_UDP_PORT		177
-
-/* IANA has assigned FF0X:0:0:0:0:0:0:12B as the permanently assigned
- * multicast addresses for XDMCP, where X in the prefix may be replaced
- * by any valid scope identifier, such as 1 for Node-Local, 2 for Link-Local,
- * 5 for Site-Local, and so on.  We set the default here to the Link-Local
- * version to most closely match the old IPv4 subnet broadcast behavior.
- * Both xdm and X -query allow specifying a different address if a different
- * scope is defined.
- */
-#define XDM_DEFAULT_MCAST_ADDR6	"ff02:0:0:0:0:0:0:12b"
-
-#define XDM_MAX_MSGLEN		8192
-#define XDM_MIN_RTX		2
-#define XDM_MAX_RTX		32
-#define XDM_RTX_LIMIT		7
-#define XDM_KA_RTX_LIMIT	4
-#define XDM_DEF_DORMANCY	(3 * 60)	/* 3 minutes */
-#define XDM_MAX_DORMANCY	(24 * 60 * 60)	/* 24 hours */
-
-typedef enum {
-    BROADCAST_QUERY = 1, QUERY, INDIRECT_QUERY, FORWARD_QUERY,
-    WILLING, UNWILLING, REQUEST, ACCEPT, DECLINE, MANAGE, REFUSE,
-    FAILED, KEEPALIVE, ALIVE
-} xdmOpCode;
-
-typedef enum {
-    XDM_QUERY, XDM_BROADCAST, XDM_INDIRECT, XDM_COLLECT_QUERY,
-    XDM_COLLECT_BROADCAST_QUERY, XDM_COLLECT_INDIRECT_QUERY,
-    XDM_START_CONNECTION, XDM_AWAIT_REQUEST_RESPONSE,
-    XDM_AWAIT_MANAGE_RESPONSE, XDM_MANAGE, XDM_RUN_SESSION, XDM_OFF,
-    XDM_AWAIT_USER_INPUT, XDM_KEEPALIVE, XDM_AWAIT_ALIVE_RESPONSE,
-#if defined(IPv6) && defined(AF_INET6)
-    XDM_MULTICAST, XDM_COLLECT_MULTICAST_QUERY,
-#endif
-    XDM_KEEP_ME_LAST
-} xdmcp_states;
-
-#ifdef NOTDEF
-/* table of hosts */
-
-#define XDM_MAX_STR_LEN 21
-#define XDM_MAX_HOSTS 20
-struct xdm_host_table {
-  struct sockaddr_in sockaddr;
-  char name[XDM_MAX_STR_LEN];
-  char status[XDM_MAX_STR_LEN];
-};
-#endif /* NOTDEF */
-
-typedef CARD8	*CARD8Ptr;
-typedef CARD16	*CARD16Ptr;
-typedef CARD32	*CARD32Ptr;
-
-typedef struct _ARRAY8 {
-    CARD16	length;
-    CARD8Ptr	data;
-} ARRAY8, *ARRAY8Ptr;
-
-typedef struct _ARRAY16 {
-    CARD8	length;
-    CARD16Ptr	data;
-} ARRAY16, *ARRAY16Ptr;
-
-typedef struct _ARRAY32 {
-    CARD8	length;
-    CARD32Ptr	data;
-} ARRAY32, *ARRAY32Ptr;
-
-typedef struct _ARRAYofARRAY8 {
-    CARD8	length;
-    ARRAY8Ptr	data;
-} ARRAYofARRAY8, *ARRAYofARRAY8Ptr;
-
-typedef struct _XdmcpHeader {
-    CARD16  version, opcode, length;
-} XdmcpHeader, *XdmcpHeaderPtr;
-
-typedef struct _XdmcpBuffer {
-    BYTE    *data;
-    int	    size;		/* size of buffer pointed by to data */
-    int	    pointer;		/* current index into data */
-    int	    count;		/* bytes read from network into data */
-} XdmcpBuffer, *XdmcpBufferPtr;
-
-typedef struct _XdmAuthKey {
-    BYTE    data[8];
-} XdmAuthKeyRec, *XdmAuthKeyPtr;
-
-
-/* implementation-independent network address structure.
-   Equiv to sockaddr* for sockets. */
-
-typedef char *XdmcpNetaddr;
-
-extern int XdmcpWriteARRAY16(XdmcpBufferPtr buffer, const ARRAY16Ptr array);
-extern int XdmcpWriteARRAY32(XdmcpBufferPtr buffer, const ARRAY32Ptr array);
-extern int XdmcpWriteARRAY8(XdmcpBufferPtr buffer, const ARRAY8Ptr array);
-extern int XdmcpWriteARRAYofARRAY8(XdmcpBufferPtr buffer, const ARRAYofARRAY8Ptr array);
-extern int XdmcpWriteCARD16(XdmcpBufferPtr buffer, unsigned value);
-extern int XdmcpWriteCARD32(XdmcpBufferPtr buffer, unsigned value);
-extern int XdmcpWriteCARD8(XdmcpBufferPtr buffer, unsigned value);
-extern int XdmcpWriteHeader(XdmcpBufferPtr  buffer, const XdmcpHeaderPtr  header);
-
-extern int XdmcpFlush(int fd, XdmcpBufferPtr buffer, XdmcpNetaddr to, int tolen);
-
-extern int XdmcpReadARRAY16(XdmcpBufferPtr buffer, ARRAY16Ptr array);
-extern int XdmcpReadARRAY32(XdmcpBufferPtr buffer, ARRAY32Ptr array);
-extern int XdmcpReadARRAY8(XdmcpBufferPtr buffer, ARRAY8Ptr array);
-extern int XdmcpReadARRAYofARRAY8(XdmcpBufferPtr buffer, ARRAYofARRAY8Ptr array);
-extern int XdmcpReadCARD16(XdmcpBufferPtr buffer, CARD16Ptr valuep);
-extern int XdmcpReadCARD32(XdmcpBufferPtr buffer, CARD32Ptr valuep);
-extern int XdmcpReadCARD8(XdmcpBufferPtr buffer, CARD8Ptr valuep);
-extern int XdmcpReadHeader(XdmcpBufferPtr buffer, XdmcpHeaderPtr header);
-
-extern int XdmcpFill(int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen);
-
-extern int XdmcpReadRemaining(const XdmcpBufferPtr buffer);
-
-extern void XdmcpDisposeARRAY8(ARRAY8Ptr array);
-extern void XdmcpDisposeARRAY16(ARRAY16Ptr array);
-extern void XdmcpDisposeARRAY32(ARRAY32Ptr array);
-extern void XdmcpDisposeARRAYofARRAY8(ARRAYofARRAY8Ptr array);
-
-extern int XdmcpCopyARRAY8(const ARRAY8Ptr src, ARRAY8Ptr dst);
-
-extern int XdmcpARRAY8Equal(const ARRAY8Ptr array1, const ARRAY8Ptr array2);
-
-extern void XdmcpGenerateKey (XdmAuthKeyPtr key);
-extern void XdmcpIncrementKey (XdmAuthKeyPtr key);
-extern void XdmcpDecrementKey (XdmAuthKeyPtr key);
-#ifdef HASXDMAUTH
-extern void XdmcpWrap(unsigned char *input, unsigned char *wrapper, unsigned char *output, int bytes);
-extern void XdmcpUnwrap(unsigned char *input, unsigned char *wrapper, unsigned char *output, int bytes);
-#endif
-
-#ifndef TRUE
-#define TRUE	1
-#define FALSE	0
-#endif
-
-extern int XdmcpCompareKeys (const XdmAuthKeyPtr a, const XdmAuthKeyPtr b);
-
-extern int XdmcpAllocARRAY16 (ARRAY16Ptr array, int length);
-extern int XdmcpAllocARRAY32 (ARRAY32Ptr array, int length);
-extern int XdmcpAllocARRAY8 (ARRAY8Ptr array, int length);
-extern int XdmcpAllocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length);
-
-extern int XdmcpReallocARRAY16 (ARRAY16Ptr array, int length);
-extern int XdmcpReallocARRAY32 (ARRAY32Ptr array, int length);
-extern int XdmcpReallocARRAY8 (ARRAY8Ptr array, int length);
-extern int XdmcpReallocARRAYofARRAY8 (ARRAYofARRAY8Ptr array, int length);
-
-_XFUNCPROTOEND
-
-#endif /* _XDMCP_H_ */
diff --git a/openflow/usr/include/X11/Xfuncproto.h b/openflow/usr/include/X11/Xfuncproto.h
deleted file mode 100644
index 61fa8fa..0000000
--- a/openflow/usr/include/X11/Xfuncproto.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* Xfuncproto.h.  Generated from Xfuncproto.h.in by configure.  */
-/*
- *
-Copyright 1989, 1991, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- */
-
-/* Definitions to make function prototypes manageable */
-
-#ifndef _XFUNCPROTO_H_
-#define _XFUNCPROTO_H_
-
-#ifndef NeedFunctionPrototypes
-#define NeedFunctionPrototypes 1
-#endif /* NeedFunctionPrototypes */
-
-#ifndef NeedVarargsPrototypes
-#define NeedVarargsPrototypes 1
-#endif /* NeedVarargsPrototypes */
-
-#if NeedFunctionPrototypes
-
-#ifndef NeedNestedPrototypes
-#define NeedNestedPrototypes 1
-#endif /* NeedNestedPrototypes */
-
-#ifndef _Xconst
-#define _Xconst const
-#endif /* _Xconst */
-
-/* Function prototype configuration (see configure for more info) */
-#ifndef NARROWPROTO
-#define NARROWPROTO /**/
-#endif
-#ifndef FUNCPROTO
-#define FUNCPROTO 15
-#endif
-
-#ifndef NeedWidePrototypes
-#ifdef NARROWPROTO
-#define NeedWidePrototypes 0
-#else
-#define NeedWidePrototypes 1		/* default to make interropt. easier */
-#endif
-#endif /* NeedWidePrototypes */
-
-#endif /* NeedFunctionPrototypes */
-
-#ifndef _XFUNCPROTOBEGIN
-#if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */
-#define _XFUNCPROTOBEGIN extern "C" {	/* do not leave open across includes */
-#define _XFUNCPROTOEND }
-#else
-#define _XFUNCPROTOBEGIN
-#define _XFUNCPROTOEND
-#endif
-#endif /* _XFUNCPROTOBEGIN */
-
-/* http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute */
-#ifndef __has_attribute
-# define __has_attribute(x) 0  /* Compatibility with non-clang compilers. */
-#endif
-#ifndef __has_feature
-# define __has_feature(x) 0    /* Compatibility with non-clang compilers. */
-#endif
-#ifndef __has_extension
-# define __has_extension(x) 0  /* Compatibility with non-clang compilers. */
-#endif
-
-/* Added in X11R6.9, so available in any version of modular xproto */
-#if __has_attribute(__sentinel__) || (defined(__GNUC__) && (__GNUC__ >= 4))
-# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x)))
-#else
-# define _X_SENTINEL(x)
-#endif /* GNUC >= 4 */
-
-/* Added in X11R6.9, so available in any version of modular xproto */
-#if (__has_attribute(visibility) || (defined(__GNUC__) && (__GNUC__ >= 4))) \
-    && !defined(__CYGWIN__) && !defined(__MINGW32__)
-# define _X_EXPORT      __attribute__((visibility("default")))
-# define _X_HIDDEN      __attribute__((visibility("hidden")))
-# define _X_INTERNAL    __attribute__((visibility("internal")))
-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-# define _X_EXPORT      __global
-# define _X_HIDDEN      __hidden
-# define _X_INTERNAL    __hidden
-#else /* not gcc >= 4 and not Sun Studio >= 8 */
-# define _X_EXPORT
-# define _X_HIDDEN
-# define _X_INTERNAL
-#endif /* GNUC >= 4 */
-
-/* Branch prediction hints for individual conditionals */
-/* requires xproto >= 7.0.9 */
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
-# define _X_LIKELY(x)   __builtin_expect(!!(x), 1)
-# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else /* not gcc >= 3.3 */
-# define _X_LIKELY(x)   (x)
-# define _X_UNLIKELY(x) (x)
-#endif
-
-/* Bulk branch prediction hints via marking error path functions as "cold" */
-/* requires xproto >= 7.0.25 */
-#if __has_attribute(__cold__) || \
-    (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403)) /* 4.3+ */
-# define _X_COLD __attribute__((__cold__))
-#else
-# define _X_COLD /* nothing */
-#endif
-
-/* Added in X11R6.9, so available in any version of modular xproto */
-#if __has_attribute(deprecated) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
-    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
-# define _X_DEPRECATED  __attribute__((deprecated))
-#else /* not gcc >= 3.1 */
-# define _X_DEPRECATED
-#endif
-
-/* requires xproto >= 7.0.30 */
-#if __has_extension(attribute_deprecated_with_message) || \
-                (defined(__GNUC__) && ((__GNUC__ >= 5) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))))
-# define _X_DEPRECATED_MSG(_msg) __attribute__((deprecated(_msg)))
-#else
-# define _X_DEPRECATED_MSG(_msg) _X_DEPRECATED
-#endif
-
-/* requires xproto >= 7.0.17 */
-#if __has_attribute(noreturn) \
-    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
-    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-# define _X_NORETURN __attribute((noreturn))
-#else
-# define _X_NORETURN
-#endif /* GNUC  */
-
-/* Added in X11R6.9, so available in any version of modular xproto */
-#if __has_attribute(__format__) \
-    || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
-# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
-#else /* not gcc >= 2.3 */
-# define _X_ATTRIBUTE_PRINTF(x,y)
-#endif
-
-/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable
-   argument macros, must be only used inside #ifdef _X_NONNULL guards, as
-   many legacy X clients are compiled in C89 mode still. */
-#if __has_attribute(nonnull) \
-    && defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
-#define _X_NONNULL(...)  __attribute__((nonnull(__VA_ARGS__)))
-#elif __has_attribute(nonnull) \
-    || defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
-#define _X_NONNULL(args...)  __attribute__((nonnull(args)))
-#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
-#define _X_NONNULL(...)  /* */
-#endif
-
-/* requires xproto >= 7.0.22 */
-#if __has_attribute(__unused__) \
-    || defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
-#define _X_UNUSED  __attribute__((__unused__))
-#else
-#define _X_UNUSED  /* */
-#endif
-
-/* C99 keyword "inline" or equivalent extensions in pre-C99 compilers */
-/* requires xproto >= 7.0.9
-   (introduced in 7.0.8 but didn't support all compilers until 7.0.9) */
-#if defined(inline) /* assume autoconf set it correctly */ || \
-   (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */ || \
-   (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550))
-# define _X_INLINE inline
-#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
-# define _X_INLINE __inline__
-#else
-# define _X_INLINE
-#endif
-
-/* C99 keyword "restrict" or equivalent extensions in pre-C99 compilers */
-/* requires xproto >= 7.0.21 */
-#ifndef _X_RESTRICT_KYWD
-# if defined(restrict) /* assume autoconf set it correctly */ || \
-    (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ \
-     && !defined(__cplusplus)) /* Workaround g++ issue on Solaris */
-#  define _X_RESTRICT_KYWD  restrict
-# elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
-#  define _X_RESTRICT_KYWD __restrict__
-# else
-#  define _X_RESTRICT_KYWD
-# endif
-#endif
-
-/* requires xproto >= 7.0.30 */
-#if __has_attribute(no_sanitize_thread)
-# define _X_NOTSAN __attribute__((no_sanitize_thread))
-#else
-# define _X_NOTSAN
-#endif
-
-#endif /* _XFUNCPROTO_H_ */
diff --git a/openflow/usr/include/X11/Xfuncs.h b/openflow/usr/include/X11/Xfuncs.h
deleted file mode 100644
index b7c4029..0000000
--- a/openflow/usr/include/X11/Xfuncs.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 
-Copyright 1990, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- */
-
-#ifndef _XFUNCS_H_
-# define _XFUNCS_H_
-
-# include <X11/Xosdefs.h>
-
-/* the old Xfuncs.h, for pre-R6 */
-# if !(defined(XFree86LOADER) && defined(IN_MODULE))
-
-#  ifdef X_USEBFUNCS
-void bcopy();
-void bzero();
-int bcmp();
-#  else
-#   if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__) && !defined(_AIX)
-#    include <memory.h>
-void bcopy();
-#    define bzero(b,len) memset(b, 0, len)
-#    define bcmp(b1,b2,len) memcmp(b1, b2, len)
-#   else
-#    include <string.h>
-#    if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__)
-#     include <strings.h>
-#    endif
-#    define _XFUNCS_H_INCLUDED_STRING_H
-#   endif
-#  endif /* X_USEBFUNCS */
-
-/* the new Xfuncs.h */
-
-/* the ANSI C way */
-#  ifndef _XFUNCS_H_INCLUDED_STRING_H
-#   include <string.h>
-#  endif
-#  undef bzero
-#  define bzero(b,len) memset(b,0,len)
-
-#  if defined WIN32 && defined __MINGW32__
-#   define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
-#  endif
-
-# endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
-
-#endif /* _XFUNCS_H_ */
diff --git a/openflow/usr/include/X11/Xlib.h b/openflow/usr/include/X11/Xlib.h
deleted file mode 100644
index 2bffa76..0000000
--- a/openflow/usr/include/X11/Xlib.h
+++ /dev/null
@@ -1,4015 +0,0 @@
-/*
-
-Copyright 1985, 1986, 1987, 1991, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-
-/*
- *	Xlib.h - Header definition and support file for the C subroutine
- *	interface library (Xlib) to the X Window System Protocol (V11).
- *	Structures and symbols starting with "_" are private to the library.
- */
-#ifndef _X11_XLIB_H_
-#define _X11_XLIB_H_
-
-#define XlibSpecificationRelease 6
-
-#include <sys/types.h>
-
-#if defined(__SCO__) || defined(__UNIXWARE__)
-#include <stdint.h>
-#endif
-
-#include <X11/X.h>
-
-/* applications should not depend on these two headers being included! */
-#include <X11/Xfuncproto.h>
-#include <X11/Xosdefs.h>
-
-#ifndef X_WCHAR
-#include <stddef.h>
-#else
-#ifdef __UNIXOS2__
-#include <stdlib.h>
-#else
-/* replace this with #include or typedef appropriate for your system */
-typedef unsigned long wchar_t;
-#endif
-#endif
-
-
-extern int
-_Xmblen(
-    char *str,
-    int len
-    );
-
-/* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
-   November 2000. Its presence is indicated through the following macro. */
-#define X_HAVE_UTF8_STRING 1
-
-/* The Xlib structs are full of implicit padding to properly align members.
-   We can't clean that up without breaking ABI, so tell clang not to bother
-   complaining about it. */
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-typedef char *XPointer;
-
-#define Bool int
-#define Status int
-#define True 1
-#define False 0
-
-#define QueuedAlready 0
-#define QueuedAfterReading 1
-#define QueuedAfterFlush 2
-
-#define ConnectionNumber(dpy) 	(((_XPrivDisplay)dpy)->fd)
-#define RootWindow(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->root)
-#define DefaultScreen(dpy) 	(((_XPrivDisplay)dpy)->default_screen)
-#define DefaultRootWindow(dpy) 	(ScreenOfDisplay(dpy,DefaultScreen(dpy))->root)
-#define DefaultVisual(dpy, scr) (ScreenOfDisplay(dpy,scr)->root_visual)
-#define DefaultGC(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->default_gc)
-#define BlackPixel(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->black_pixel)
-#define WhitePixel(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->white_pixel)
-#define AllPlanes 		((unsigned long)~0L)
-#define QLength(dpy) 		(((_XPrivDisplay)dpy)->qlen)
-#define DisplayWidth(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->width)
-#define DisplayHeight(dpy, scr) (ScreenOfDisplay(dpy,scr)->height)
-#define DisplayWidthMM(dpy, scr)(ScreenOfDisplay(dpy,scr)->mwidth)
-#define DisplayHeightMM(dpy, scr)(ScreenOfDisplay(dpy,scr)->mheight)
-#define DisplayPlanes(dpy, scr) (ScreenOfDisplay(dpy,scr)->root_depth)
-#define DisplayCells(dpy, scr) 	(DefaultVisual(dpy,scr)->map_entries)
-#define ScreenCount(dpy) 	(((_XPrivDisplay)dpy)->nscreens)
-#define ServerVendor(dpy) 	(((_XPrivDisplay)dpy)->vendor)
-#define ProtocolVersion(dpy) 	(((_XPrivDisplay)dpy)->proto_major_version)
-#define ProtocolRevision(dpy) 	(((_XPrivDisplay)dpy)->proto_minor_version)
-#define VendorRelease(dpy) 	(((_XPrivDisplay)dpy)->release)
-#define DisplayString(dpy) 	(((_XPrivDisplay)dpy)->display_name)
-#define DefaultDepth(dpy, scr) 	(ScreenOfDisplay(dpy,scr)->root_depth)
-#define DefaultColormap(dpy, scr)(ScreenOfDisplay(dpy,scr)->cmap)
-#define BitmapUnit(dpy) 	(((_XPrivDisplay)dpy)->bitmap_unit)
-#define BitmapBitOrder(dpy) 	(((_XPrivDisplay)dpy)->bitmap_bit_order)
-#define BitmapPad(dpy) 		(((_XPrivDisplay)dpy)->bitmap_pad)
-#define ImageByteOrder(dpy) 	(((_XPrivDisplay)dpy)->byte_order)
-#define NextRequest(dpy)	(((_XPrivDisplay)dpy)->request + 1)
-#define LastKnownRequestProcessed(dpy)	(((_XPrivDisplay)dpy)->last_request_read)
-
-/* macros for screen oriented applications (toolkit) */
-#define ScreenOfDisplay(dpy, scr)(&((_XPrivDisplay)dpy)->screens[scr])
-#define DefaultScreenOfDisplay(dpy) ScreenOfDisplay(dpy,DefaultScreen(dpy))
-#define DisplayOfScreen(s)	((s)->display)
-#define RootWindowOfScreen(s)	((s)->root)
-#define BlackPixelOfScreen(s)	((s)->black_pixel)
-#define WhitePixelOfScreen(s)	((s)->white_pixel)
-#define DefaultColormapOfScreen(s)((s)->cmap)
-#define DefaultDepthOfScreen(s)	((s)->root_depth)
-#define DefaultGCOfScreen(s)	((s)->default_gc)
-#define DefaultVisualOfScreen(s)((s)->root_visual)
-#define WidthOfScreen(s)	((s)->width)
-#define HeightOfScreen(s)	((s)->height)
-#define WidthMMOfScreen(s)	((s)->mwidth)
-#define HeightMMOfScreen(s)	((s)->mheight)
-#define PlanesOfScreen(s)	((s)->root_depth)
-#define CellsOfScreen(s)	(DefaultVisualOfScreen((s))->map_entries)
-#define MinCmapsOfScreen(s)	((s)->min_maps)
-#define MaxCmapsOfScreen(s)	((s)->max_maps)
-#define DoesSaveUnders(s)	((s)->save_unders)
-#define DoesBackingStore(s)	((s)->backing_store)
-#define EventMaskOfScreen(s)	((s)->root_input_mask)
-
-/*
- * Extensions need a way to hang private data on some structures.
- */
-typedef struct _XExtData {
-	int number;		/* number returned by XRegisterExtension */
-	struct _XExtData *next;	/* next item on list of data for structure */
-	int (*free_private)(	/* called to free private storage */
-	struct _XExtData *extension
-	);
-	XPointer private_data;	/* data private to this extension. */
-} XExtData;
-
-/*
- * This file contains structures used by the extension mechanism.
- */
-typedef struct {		/* public to extension, cannot be changed */
-	int extension;		/* extension number */
-	int major_opcode;	/* major op-code assigned by server */
-	int first_event;	/* first event number for the extension */
-	int first_error;	/* first error number for the extension */
-} XExtCodes;
-
-/*
- * Data structure for retrieving info about pixmap formats.
- */
-
-typedef struct {
-    int depth;
-    int bits_per_pixel;
-    int scanline_pad;
-} XPixmapFormatValues;
-
-
-/*
- * Data structure for setting graphics context.
- */
-typedef struct {
-	int function;		/* logical operation */
-	unsigned long plane_mask;/* plane mask */
-	unsigned long foreground;/* foreground pixel */
-	unsigned long background;/* background pixel */
-	int line_width;		/* line width */
-	int line_style;	 	/* LineSolid, LineOnOffDash, LineDoubleDash */
-	int cap_style;	  	/* CapNotLast, CapButt,
-				   CapRound, CapProjecting */
-	int join_style;	 	/* JoinMiter, JoinRound, JoinBevel */
-	int fill_style;	 	/* FillSolid, FillTiled,
-				   FillStippled, FillOpaeueStippled */
-	int fill_rule;	  	/* EvenOddRule, WindingRule */
-	int arc_mode;		/* ArcChord, ArcPieSlice */
-	Pixmap tile;		/* tile pixmap for tiling operations */
-	Pixmap stipple;		/* stipple 1 plane pixmap for stipping */
-	int ts_x_origin;	/* offset for tile or stipple operations */
-	int ts_y_origin;
-        Font font;	        /* default text font for text operations */
-	int subwindow_mode;     /* ClipByChildren, IncludeInferiors */
-	Bool graphics_exposures;/* boolean, should exposures be generated */
-	int clip_x_origin;	/* origin for clipping */
-	int clip_y_origin;
-	Pixmap clip_mask;	/* bitmap clipping; other calls for rects */
-	int dash_offset;	/* patterned/dashed line information */
-	char dashes;
-} XGCValues;
-
-/*
- * Graphics context.  The contents of this structure are implementation
- * dependent.  A GC should be treated as opaque by application code.
- */
-
-typedef struct _XGC
-#ifdef XLIB_ILLEGAL_ACCESS
-{
-    XExtData *ext_data;	/* hook for extension to hang data */
-    GContext gid;	/* protocol ID for graphics context */
-    /* there is more to this structure, but it is private to Xlib */
-}
-#endif
-*GC;
-
-/*
- * Visual structure; contains information about colormapping possible.
- */
-typedef struct {
-	XExtData *ext_data;	/* hook for extension to hang data */
-	VisualID visualid;	/* visual id of this visual */
-#if defined(__cplusplus) || defined(c_plusplus)
-	int c_class;		/* C++ class of screen (monochrome, etc.) */
-#else
-	int class;		/* class of screen (monochrome, etc.) */
-#endif
-	unsigned long red_mask, green_mask, blue_mask;	/* mask values */
-	int bits_per_rgb;	/* log base 2 of distinct color values */
-	int map_entries;	/* color map entries */
-} Visual;
-
-/*
- * Depth structure; contains information for each possible depth.
- */
-typedef struct {
-	int depth;		/* this depth (Z) of the depth */
-	int nvisuals;		/* number of Visual types at this depth */
-	Visual *visuals;	/* list of visuals possible at this depth */
-} Depth;
-
-/*
- * Information about the screen.  The contents of this structure are
- * implementation dependent.  A Screen should be treated as opaque
- * by application code.
- */
-
-struct _XDisplay;		/* Forward declare before use for C++ */
-
-typedef struct {
-	XExtData *ext_data;	/* hook for extension to hang data */
-	struct _XDisplay *display;/* back pointer to display structure */
-	Window root;		/* Root window id. */
-	int width, height;	/* width and height of screen */
-	int mwidth, mheight;	/* width and height of  in millimeters */
-	int ndepths;		/* number of depths possible */
-	Depth *depths;		/* list of allowable depths on the screen */
-	int root_depth;		/* bits per pixel */
-	Visual *root_visual;	/* root visual */
-	GC default_gc;		/* GC for the root root visual */
-	Colormap cmap;		/* default color map */
-	unsigned long white_pixel;
-	unsigned long black_pixel;	/* White and Black pixel values */
-	int max_maps, min_maps;	/* max and min color maps */
-	int backing_store;	/* Never, WhenMapped, Always */
-	Bool save_unders;
-	long root_input_mask;	/* initial root input mask */
-} Screen;
-
-/*
- * Format structure; describes ZFormat data the screen will understand.
- */
-typedef struct {
-	XExtData *ext_data;	/* hook for extension to hang data */
-	int depth;		/* depth of this image format */
-	int bits_per_pixel;	/* bits/pixel at this depth */
-	int scanline_pad;	/* scanline must padded to this multiple */
-} ScreenFormat;
-
-/*
- * Data structure for setting window attributes.
- */
-typedef struct {
-    Pixmap background_pixmap;	/* background or None or ParentRelative */
-    unsigned long background_pixel;	/* background pixel */
-    Pixmap border_pixmap;	/* border of the window */
-    unsigned long border_pixel;	/* border pixel value */
-    int bit_gravity;		/* one of bit gravity values */
-    int win_gravity;		/* one of the window gravity values */
-    int backing_store;		/* NotUseful, WhenMapped, Always */
-    unsigned long backing_planes;/* planes to be preseved if possible */
-    unsigned long backing_pixel;/* value to use in restoring planes */
-    Bool save_under;		/* should bits under be saved? (popups) */
-    long event_mask;		/* set of events that should be saved */
-    long do_not_propagate_mask;	/* set of events that should not propagate */
-    Bool override_redirect;	/* boolean value for override-redirect */
-    Colormap colormap;		/* color map to be associated with window */
-    Cursor cursor;		/* cursor to be displayed (or None) */
-} XSetWindowAttributes;
-
-typedef struct {
-    int x, y;			/* location of window */
-    int width, height;		/* width and height of window */
-    int border_width;		/* border width of window */
-    int depth;          	/* depth of window */
-    Visual *visual;		/* the associated visual structure */
-    Window root;        	/* root of screen containing window */
-#if defined(__cplusplus) || defined(c_plusplus)
-    int c_class;		/* C++ InputOutput, InputOnly*/
-#else
-    int class;			/* InputOutput, InputOnly*/
-#endif
-    int bit_gravity;		/* one of bit gravity values */
-    int win_gravity;		/* one of the window gravity values */
-    int backing_store;		/* NotUseful, WhenMapped, Always */
-    unsigned long backing_planes;/* planes to be preserved if possible */
-    unsigned long backing_pixel;/* value to be used when restoring planes */
-    Bool save_under;		/* boolean, should bits under be saved? */
-    Colormap colormap;		/* color map to be associated with window */
-    Bool map_installed;		/* boolean, is color map currently installed*/
-    int map_state;		/* IsUnmapped, IsUnviewable, IsViewable */
-    long all_event_masks;	/* set of events all people have interest in*/
-    long your_event_mask;	/* my event mask */
-    long do_not_propagate_mask; /* set of events that should not propagate */
-    Bool override_redirect;	/* boolean value for override-redirect */
-    Screen *screen;		/* back pointer to correct screen */
-} XWindowAttributes;
-
-/*
- * Data structure for host setting; getting routines.
- *
- */
-
-typedef struct {
-	int family;		/* for example FamilyInternet */
-	int length;		/* length of address, in bytes */
-	char *address;		/* pointer to where to find the bytes */
-} XHostAddress;
-
-/*
- * Data structure for ServerFamilyInterpreted addresses in host routines
- */
-typedef struct {
-	int typelength;		/* length of type string, in bytes */
-	int valuelength;	/* length of value string, in bytes */
-	char *type;		/* pointer to where to find the type string */
-	char *value;		/* pointer to where to find the address */
-} XServerInterpretedAddress;
-
-/*
- * Data structure for "image" data, used by image manipulation routines.
- */
-typedef struct _XImage {
-    int width, height;		/* size of image */
-    int xoffset;		/* number of pixels offset in X direction */
-    int format;			/* XYBitmap, XYPixmap, ZPixmap */
-    char *data;			/* pointer to image data */
-    int byte_order;		/* data byte order, LSBFirst, MSBFirst */
-    int bitmap_unit;		/* quant. of scanline 8, 16, 32 */
-    int bitmap_bit_order;	/* LSBFirst, MSBFirst */
-    int bitmap_pad;		/* 8, 16, 32 either XY or ZPixmap */
-    int depth;			/* depth of image */
-    int bytes_per_line;		/* accelarator to next line */
-    int bits_per_pixel;		/* bits per pixel (ZPixmap) */
-    unsigned long red_mask;	/* bits in z arrangment */
-    unsigned long green_mask;
-    unsigned long blue_mask;
-    XPointer obdata;		/* hook for the object routines to hang on */
-    struct funcs {		/* image manipulation routines */
-	struct _XImage *(*create_image)(
-		struct _XDisplay* /* display */,
-		Visual*		/* visual */,
-		unsigned int	/* depth */,
-		int		/* format */,
-		int		/* offset */,
-		char*		/* data */,
-		unsigned int	/* width */,
-		unsigned int	/* height */,
-		int		/* bitmap_pad */,
-		int		/* bytes_per_line */);
-	int (*destroy_image)        (struct _XImage *);
-	unsigned long (*get_pixel)  (struct _XImage *, int, int);
-	int (*put_pixel)            (struct _XImage *, int, int, unsigned long);
-	struct _XImage *(*sub_image)(struct _XImage *, int, int, unsigned int, unsigned int);
-	int (*add_pixel)            (struct _XImage *, long);
-	} f;
-} XImage;
-
-/*
- * Data structure for XReconfigureWindow
- */
-typedef struct {
-    int x, y;
-    int width, height;
-    int border_width;
-    Window sibling;
-    int stack_mode;
-} XWindowChanges;
-
-/*
- * Data structure used by color operations
- */
-typedef struct {
-	unsigned long pixel;
-	unsigned short red, green, blue;
-	char flags;  /* do_red, do_green, do_blue */
-	char pad;
-} XColor;
-
-/*
- * Data structures for graphics operations.  On most machines, these are
- * congruent with the wire protocol structures, so reformatting the data
- * can be avoided on these architectures.
- */
-typedef struct {
-    short x1, y1, x2, y2;
-} XSegment;
-
-typedef struct {
-    short x, y;
-} XPoint;
-
-typedef struct {
-    short x, y;
-    unsigned short width, height;
-} XRectangle;
-
-typedef struct {
-    short x, y;
-    unsigned short width, height;
-    short angle1, angle2;
-} XArc;
-
-
-/* Data structure for XChangeKeyboardControl */
-
-typedef struct {
-        int key_click_percent;
-        int bell_percent;
-        int bell_pitch;
-        int bell_duration;
-        int led;
-        int led_mode;
-        int key;
-        int auto_repeat_mode;   /* On, Off, Default */
-} XKeyboardControl;
-
-/* Data structure for XGetKeyboardControl */
-
-typedef struct {
-        int key_click_percent;
-	int bell_percent;
-	unsigned int bell_pitch, bell_duration;
-	unsigned long led_mask;
-	int global_auto_repeat;
-	char auto_repeats[32];
-} XKeyboardState;
-
-/* Data structure for XGetMotionEvents.  */
-
-typedef struct {
-        Time time;
-	short x, y;
-} XTimeCoord;
-
-/* Data structure for X{Set,Get}ModifierMapping */
-
-typedef struct {
- 	int max_keypermod;	/* The server's max # of keys per modifier */
- 	KeyCode *modifiermap;	/* An 8 by max_keypermod array of modifiers */
-} XModifierKeymap;
-
-
-/*
- * Display datatype maintaining display specific data.
- * The contents of this structure are implementation dependent.
- * A Display should be treated as opaque by application code.
- */
-#ifndef XLIB_ILLEGAL_ACCESS
-typedef struct _XDisplay Display;
-#endif
-
-struct _XPrivate;		/* Forward declare before use for C++ */
-struct _XrmHashBucketRec;
-
-typedef struct
-#ifdef XLIB_ILLEGAL_ACCESS
-_XDisplay
-#endif
-{
-	XExtData *ext_data;	/* hook for extension to hang data */
-	struct _XPrivate *private1;
-	int fd;			/* Network socket. */
-	int private2;
-	int proto_major_version;/* major version of server's X protocol */
-	int proto_minor_version;/* minor version of servers X protocol */
-	char *vendor;		/* vendor of the server hardware */
-        XID private3;
-	XID private4;
-	XID private5;
-	int private6;
-	XID (*resource_alloc)(	/* allocator function */
-		struct _XDisplay*
-	);
-	int byte_order;		/* screen byte order, LSBFirst, MSBFirst */
-	int bitmap_unit;	/* padding and data requirements */
-	int bitmap_pad;		/* padding requirements on bitmaps */
-	int bitmap_bit_order;	/* LeastSignificant or MostSignificant */
-	int nformats;		/* number of pixmap formats in list */
-	ScreenFormat *pixmap_format;	/* pixmap format list */
-	int private8;
-	int release;		/* release of the server */
-	struct _XPrivate *private9, *private10;
-	int qlen;		/* Length of input event queue */
-	unsigned long last_request_read; /* seq number of last event read */
-	unsigned long request;	/* sequence number of last request. */
-	XPointer private11;
-	XPointer private12;
-	XPointer private13;
-	XPointer private14;
-	unsigned max_request_size; /* maximum number 32 bit words in request*/
-	struct _XrmHashBucketRec *db;
-	int (*private15)(
-		struct _XDisplay*
-		);
-	char *display_name;	/* "host:display" string used on this connect*/
-	int default_screen;	/* default screen for operations */
-	int nscreens;		/* number of screens on this server*/
-	Screen *screens;	/* pointer to list of screens */
-	unsigned long motion_buffer;	/* size of motion buffer */
-	unsigned long private16;
-	int min_keycode;	/* minimum defined keycode */
-	int max_keycode;	/* maximum defined keycode */
-	XPointer private17;
-	XPointer private18;
-	int private19;
-	char *xdefaults;	/* contents of defaults from server */
-	/* there is more to this structure, but it is private to Xlib */
-}
-#ifdef XLIB_ILLEGAL_ACCESS
-Display,
-#endif
-*_XPrivDisplay;
-
-#undef _XEVENT_
-#ifndef _XEVENT_
-/*
- * Definitions of specific events.
- */
-typedef struct {
-	int type;		/* of event */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	        /* "event" window it is reported relative to */
-	Window root;	        /* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;		/* milliseconds */
-	int x, y;		/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	unsigned int state;	/* key or button mask */
-	unsigned int keycode;	/* detail */
-	Bool same_screen;	/* same screen flag */
-} XKeyEvent;
-typedef XKeyEvent XKeyPressedEvent;
-typedef XKeyEvent XKeyReleasedEvent;
-
-typedef struct {
-	int type;		/* of event */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	        /* "event" window it is reported relative to */
-	Window root;	        /* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;		/* milliseconds */
-	int x, y;		/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	unsigned int state;	/* key or button mask */
-	unsigned int button;	/* detail */
-	Bool same_screen;	/* same screen flag */
-} XButtonEvent;
-typedef XButtonEvent XButtonPressedEvent;
-typedef XButtonEvent XButtonReleasedEvent;
-
-typedef struct {
-	int type;		/* of event */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	        /* "event" window reported relative to */
-	Window root;	        /* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;		/* milliseconds */
-	int x, y;		/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	unsigned int state;	/* key or button mask */
-	char is_hint;		/* detail */
-	Bool same_screen;	/* same screen flag */
-} XMotionEvent;
-typedef XMotionEvent XPointerMovedEvent;
-
-typedef struct {
-	int type;		/* of event */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;	        /* "event" window reported relative to */
-	Window root;	        /* root window that the event occurred on */
-	Window subwindow;	/* child window */
-	Time time;		/* milliseconds */
-	int x, y;		/* pointer x, y coordinates in event window */
-	int x_root, y_root;	/* coordinates relative to root */
-	int mode;		/* NotifyNormal, NotifyGrab, NotifyUngrab */
-	int detail;
-	/*
-	 * NotifyAncestor, NotifyVirtual, NotifyInferior,
-	 * NotifyNonlinear,NotifyNonlinearVirtual
-	 */
-	Bool same_screen;	/* same screen flag */
-	Bool focus;		/* boolean focus */
-	unsigned int state;	/* key or button mask */
-} XCrossingEvent;
-typedef XCrossingEvent XEnterWindowEvent;
-typedef XCrossingEvent XLeaveWindowEvent;
-
-typedef struct {
-	int type;		/* FocusIn or FocusOut */
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;		/* window of event */
-	int mode;		/* NotifyNormal, NotifyWhileGrabbed,
-				   NotifyGrab, NotifyUngrab */
-	int detail;
-	/*
-	 * NotifyAncestor, NotifyVirtual, NotifyInferior,
-	 * NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
-	 * NotifyPointerRoot, NotifyDetailNone
-	 */
-} XFocusChangeEvent;
-typedef XFocusChangeEvent XFocusInEvent;
-typedef XFocusChangeEvent XFocusOutEvent;
-
-/* generated on EnterWindow and FocusIn  when KeyMapState selected */
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	char key_vector[32];
-} XKeymapEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	int x, y;
-	int width, height;
-	int count;		/* if non-zero, at least this many more */
-} XExposeEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Drawable drawable;
-	int x, y;
-	int width, height;
-	int count;		/* if non-zero, at least this many more */
-	int major_code;		/* core is CopyArea or CopyPlane */
-	int minor_code;		/* not defined in the core */
-} XGraphicsExposeEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Drawable drawable;
-	int major_code;		/* core is CopyArea or CopyPlane */
-	int minor_code;		/* not defined in the core */
-} XNoExposeEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	int state;		/* Visibility state */
-} XVisibilityEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window parent;		/* parent of the window */
-	Window window;		/* window id of window created */
-	int x, y;		/* window location */
-	int width, height;	/* size of window */
-	int border_width;	/* border width */
-	Bool override_redirect;	/* creation should be overridden */
-} XCreateWindowEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-} XDestroyWindowEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	Bool from_configure;
-} XUnmapEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	Bool override_redirect;	/* boolean, is override set... */
-} XMapEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window parent;
-	Window window;
-} XMapRequestEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	Window parent;
-	int x, y;
-	Bool override_redirect;
-} XReparentEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	int x, y;
-	int width, height;
-	int border_width;
-	Window above;
-	Bool override_redirect;
-} XConfigureEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	int x, y;
-} XGravityEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	int width, height;
-} XResizeRequestEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window parent;
-	Window window;
-	int x, y;
-	int width, height;
-	int border_width;
-	Window above;
-	int detail;		/* Above, Below, TopIf, BottomIf, Opposite */
-	unsigned long value_mask;
-} XConfigureRequestEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
-	int place;		/* PlaceOnTop, PlaceOnBottom */
-} XCirculateEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window parent;
-	Window window;
-	int place;		/* PlaceOnTop, PlaceOnBottom */
-} XCirculateRequestEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	Atom atom;
-	Time time;
-	int state;		/* NewValue, Deleted */
-} XPropertyEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	Atom selection;
-	Time time;
-} XSelectionClearEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window owner;
-	Window requestor;
-	Atom selection;
-	Atom target;
-	Atom property;
-	Time time;
-} XSelectionRequestEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window requestor;
-	Atom selection;
-	Atom target;
-	Atom property;		/* ATOM or None */
-	Time time;
-} XSelectionEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	Colormap colormap;	/* COLORMAP or None */
-#if defined(__cplusplus) || defined(c_plusplus)
-	Bool c_new;		/* C++ */
-#else
-	Bool new;
-#endif
-	int state;		/* ColormapInstalled, ColormapUninstalled */
-} XColormapEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
-	Atom message_type;
-	int format;
-	union {
-		char b[20];
-		short s[10];
-		long l[5];
-		} data;
-} XClientMessageEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;		/* unused */
-	int request;		/* one of MappingModifier, MappingKeyboard,
-				   MappingPointer */
-	int first_keycode;	/* first keycode */
-	int count;		/* defines range of change w. first_keycode*/
-} XMappingEvent;
-
-typedef struct {
-	int type;
-	Display *display;	/* Display the event was read from */
-	XID resourceid;		/* resource id */
-	unsigned long serial;	/* serial number of failed request */
-	unsigned char error_code;	/* error code of failed request */
-	unsigned char request_code;	/* Major op-code of failed request */
-	unsigned char minor_code;	/* Minor op-code of failed request */
-} XErrorEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;/* Display the event was read from */
-	Window window;	/* window on which event was requested in event mask */
-} XAnyEvent;
-
-
-/***************************************************************
- *
- * GenericEvent.  This event is the standard event for all newer extensions.
- */
-
-typedef struct
-    {
-    int            type;         /* of event. Always GenericEvent */
-    unsigned long  serial;       /* # of last request processed */
-    Bool           send_event;   /* true if from SendEvent request */
-    Display        *display;     /* Display the event was read from */
-    int            extension;    /* major opcode of extension that caused the event */
-    int            evtype;       /* actual event type. */
-    } XGenericEvent;
-
-typedef struct {
-    int            type;         /* of event. Always GenericEvent */
-    unsigned long  serial;       /* # of last request processed */
-    Bool           send_event;   /* true if from SendEvent request */
-    Display        *display;     /* Display the event was read from */
-    int            extension;    /* major opcode of extension that caused the event */
-    int            evtype;       /* actual event type. */
-    unsigned int   cookie;
-    void           *data;
-} XGenericEventCookie;
-
-/*
- * this union is defined so Xlib can always use the same sized
- * event structure internally, to avoid memory fragmentation.
- */
-typedef union _XEvent {
-        int type;		/* must not be changed; first element */
-	XAnyEvent xany;
-	XKeyEvent xkey;
-	XButtonEvent xbutton;
-	XMotionEvent xmotion;
-	XCrossingEvent xcrossing;
-	XFocusChangeEvent xfocus;
-	XExposeEvent xexpose;
-	XGraphicsExposeEvent xgraphicsexpose;
-	XNoExposeEvent xnoexpose;
-	XVisibilityEvent xvisibility;
-	XCreateWindowEvent xcreatewindow;
-	XDestroyWindowEvent xdestroywindow;
-	XUnmapEvent xunmap;
-	XMapEvent xmap;
-	XMapRequestEvent xmaprequest;
-	XReparentEvent xreparent;
-	XConfigureEvent xconfigure;
-	XGravityEvent xgravity;
-	XResizeRequestEvent xresizerequest;
-	XConfigureRequestEvent xconfigurerequest;
-	XCirculateEvent xcirculate;
-	XCirculateRequestEvent xcirculaterequest;
-	XPropertyEvent xproperty;
-	XSelectionClearEvent xselectionclear;
-	XSelectionRequestEvent xselectionrequest;
-	XSelectionEvent xselection;
-	XColormapEvent xcolormap;
-	XClientMessageEvent xclient;
-	XMappingEvent xmapping;
-	XErrorEvent xerror;
-	XKeymapEvent xkeymap;
-	XGenericEvent xgeneric;
-	XGenericEventCookie xcookie;
-	long pad[24];
-} XEvent;
-#endif
-
-#define XAllocID(dpy) ((*((_XPrivDisplay)dpy)->resource_alloc)((dpy)))
-
-/*
- * per character font metric information.
- */
-typedef struct {
-    short	lbearing;	/* origin to left edge of raster */
-    short	rbearing;	/* origin to right edge of raster */
-    short	width;		/* advance to next char's origin */
-    short	ascent;		/* baseline to top edge of raster */
-    short	descent;	/* baseline to bottom edge of raster */
-    unsigned short attributes;	/* per char flags (not predefined) */
-} XCharStruct;
-
-/*
- * To allow arbitrary information with fonts, there are additional properties
- * returned.
- */
-typedef struct {
-    Atom name;
-    unsigned long card32;
-} XFontProp;
-
-typedef struct {
-    XExtData	*ext_data;	/* hook for extension to hang data */
-    Font        fid;            /* Font id for this font */
-    unsigned	direction;	/* hint about direction the font is painted */
-    unsigned	min_char_or_byte2;/* first character */
-    unsigned	max_char_or_byte2;/* last character */
-    unsigned	min_byte1;	/* first row that exists */
-    unsigned	max_byte1;	/* last row that exists */
-    Bool	all_chars_exist;/* flag if all characters have non-zero size*/
-    unsigned	default_char;	/* char to print for undefined character */
-    int         n_properties;   /* how many properties there are */
-    XFontProp	*properties;	/* pointer to array of additional properties*/
-    XCharStruct	min_bounds;	/* minimum bounds over all existing char*/
-    XCharStruct	max_bounds;	/* maximum bounds over all existing char*/
-    XCharStruct	*per_char;	/* first_char to last_char information */
-    int		ascent;		/* log. extent above baseline for spacing */
-    int		descent;	/* log. descent below baseline for spacing */
-} XFontStruct;
-
-/*
- * PolyText routines take these as arguments.
- */
-typedef struct {
-    char *chars;		/* pointer to string */
-    int nchars;			/* number of characters */
-    int delta;			/* delta between strings */
-    Font font;			/* font to print it in, None don't change */
-} XTextItem;
-
-typedef struct {		/* normal 16 bit characters are two bytes */
-    unsigned char byte1;
-    unsigned char byte2;
-} XChar2b;
-
-typedef struct {
-    XChar2b *chars;		/* two byte characters */
-    int nchars;			/* number of characters */
-    int delta;			/* delta between strings */
-    Font font;			/* font to print it in, None don't change */
-} XTextItem16;
-
-
-typedef union { Display *display;
-		GC gc;
-		Visual *visual;
-		Screen *screen;
-		ScreenFormat *pixmap_format;
-		XFontStruct *font; } XEDataObject;
-
-typedef struct {
-    XRectangle      max_ink_extent;
-    XRectangle      max_logical_extent;
-} XFontSetExtents;
-
-/* unused:
-typedef void (*XOMProc)();
- */
-
-typedef struct _XOM *XOM;
-typedef struct _XOC *XOC, *XFontSet;
-
-typedef struct {
-    char           *chars;
-    int             nchars;
-    int             delta;
-    XFontSet        font_set;
-} XmbTextItem;
-
-typedef struct {
-    wchar_t        *chars;
-    int             nchars;
-    int             delta;
-    XFontSet        font_set;
-} XwcTextItem;
-
-#define XNRequiredCharSet "requiredCharSet"
-#define XNQueryOrientation "queryOrientation"
-#define XNBaseFontName "baseFontName"
-#define XNOMAutomatic "omAutomatic"
-#define XNMissingCharSet "missingCharSet"
-#define XNDefaultString "defaultString"
-#define XNOrientation "orientation"
-#define XNDirectionalDependentDrawing "directionalDependentDrawing"
-#define XNContextualDrawing "contextualDrawing"
-#define XNFontInfo "fontInfo"
-
-typedef struct {
-    int charset_count;
-    char **charset_list;
-} XOMCharSetList;
-
-typedef enum {
-    XOMOrientation_LTR_TTB,
-    XOMOrientation_RTL_TTB,
-    XOMOrientation_TTB_LTR,
-    XOMOrientation_TTB_RTL,
-    XOMOrientation_Context
-} XOrientation;
-
-typedef struct {
-    int num_orientation;
-    XOrientation *orientation;	/* Input Text description */
-} XOMOrientation;
-
-typedef struct {
-    int num_font;
-    XFontStruct **font_struct_list;
-    char **font_name_list;
-} XOMFontInfo;
-
-typedef struct _XIM *XIM;
-typedef struct _XIC *XIC;
-
-typedef void (*XIMProc)(
-    XIM,
-    XPointer,
-    XPointer
-);
-
-typedef Bool (*XICProc)(
-    XIC,
-    XPointer,
-    XPointer
-);
-
-typedef void (*XIDProc)(
-    Display*,
-    XPointer,
-    XPointer
-);
-
-typedef unsigned long XIMStyle;
-
-typedef struct {
-    unsigned short count_styles;
-    XIMStyle *supported_styles;
-} XIMStyles;
-
-#define XIMPreeditArea		0x0001L
-#define XIMPreeditCallbacks	0x0002L
-#define XIMPreeditPosition	0x0004L
-#define XIMPreeditNothing	0x0008L
-#define XIMPreeditNone		0x0010L
-#define XIMStatusArea		0x0100L
-#define XIMStatusCallbacks	0x0200L
-#define XIMStatusNothing	0x0400L
-#define XIMStatusNone		0x0800L
-
-#define XNVaNestedList "XNVaNestedList"
-#define XNQueryInputStyle "queryInputStyle"
-#define XNClientWindow "clientWindow"
-#define XNInputStyle "inputStyle"
-#define XNFocusWindow "focusWindow"
-#define XNResourceName "resourceName"
-#define XNResourceClass "resourceClass"
-#define XNGeometryCallback "geometryCallback"
-#define XNDestroyCallback "destroyCallback"
-#define XNFilterEvents "filterEvents"
-#define XNPreeditStartCallback "preeditStartCallback"
-#define XNPreeditDoneCallback "preeditDoneCallback"
-#define XNPreeditDrawCallback "preeditDrawCallback"
-#define XNPreeditCaretCallback "preeditCaretCallback"
-#define XNPreeditStateNotifyCallback "preeditStateNotifyCallback"
-#define XNPreeditAttributes "preeditAttributes"
-#define XNStatusStartCallback "statusStartCallback"
-#define XNStatusDoneCallback "statusDoneCallback"
-#define XNStatusDrawCallback "statusDrawCallback"
-#define XNStatusAttributes "statusAttributes"
-#define XNArea "area"
-#define XNAreaNeeded "areaNeeded"
-#define XNSpotLocation "spotLocation"
-#define XNColormap "colorMap"
-#define XNStdColormap "stdColorMap"
-#define XNForeground "foreground"
-#define XNBackground "background"
-#define XNBackgroundPixmap "backgroundPixmap"
-#define XNFontSet "fontSet"
-#define XNLineSpace "lineSpace"
-#define XNCursor "cursor"
-
-#define XNQueryIMValuesList "queryIMValuesList"
-#define XNQueryICValuesList "queryICValuesList"
-#define XNVisiblePosition "visiblePosition"
-#define XNR6PreeditCallback "r6PreeditCallback"
-#define XNStringConversionCallback "stringConversionCallback"
-#define XNStringConversion "stringConversion"
-#define XNResetState "resetState"
-#define XNHotKey "hotKey"
-#define XNHotKeyState "hotKeyState"
-#define XNPreeditState "preeditState"
-#define XNSeparatorofNestedList "separatorofNestedList"
-
-#define XBufferOverflow		-1
-#define XLookupNone		1
-#define XLookupChars		2
-#define XLookupKeySym		3
-#define XLookupBoth		4
-
-typedef void *XVaNestedList;
-
-typedef struct {
-    XPointer client_data;
-    XIMProc callback;
-} XIMCallback;
-
-typedef struct {
-    XPointer client_data;
-    XICProc callback;
-} XICCallback;
-
-typedef unsigned long XIMFeedback;
-
-#define XIMReverse		1L
-#define XIMUnderline		(1L<<1)
-#define XIMHighlight		(1L<<2)
-#define XIMPrimary	 	(1L<<5)
-#define XIMSecondary		(1L<<6)
-#define XIMTertiary	 	(1L<<7)
-#define XIMVisibleToForward 	(1L<<8)
-#define XIMVisibleToBackword 	(1L<<9)
-#define XIMVisibleToCenter 	(1L<<10)
-
-typedef struct _XIMText {
-    unsigned short length;
-    XIMFeedback *feedback;
-    Bool encoding_is_wchar;
-    union {
-	char *multi_byte;
-	wchar_t *wide_char;
-    } string;
-} XIMText;
-
-typedef	unsigned long	 XIMPreeditState;
-
-#define	XIMPreeditUnKnown	0L
-#define	XIMPreeditEnable	1L
-#define	XIMPreeditDisable	(1L<<1)
-
-typedef	struct	_XIMPreeditStateNotifyCallbackStruct {
-    XIMPreeditState state;
-} XIMPreeditStateNotifyCallbackStruct;
-
-typedef	unsigned long	 XIMResetState;
-
-#define	XIMInitialState		1L
-#define	XIMPreserveState	(1L<<1)
-
-typedef unsigned long XIMStringConversionFeedback;
-
-#define	XIMStringConversionLeftEdge	(0x00000001)
-#define	XIMStringConversionRightEdge	(0x00000002)
-#define	XIMStringConversionTopEdge	(0x00000004)
-#define	XIMStringConversionBottomEdge	(0x00000008)
-#define	XIMStringConversionConcealed	(0x00000010)
-#define	XIMStringConversionWrapped	(0x00000020)
-
-typedef struct _XIMStringConversionText {
-    unsigned short length;
-    XIMStringConversionFeedback *feedback;
-    Bool encoding_is_wchar;
-    union {
-	char *mbs;
-	wchar_t *wcs;
-    } string;
-} XIMStringConversionText;
-
-typedef	unsigned short	XIMStringConversionPosition;
-
-typedef	unsigned short	XIMStringConversionType;
-
-#define	XIMStringConversionBuffer	(0x0001)
-#define	XIMStringConversionLine		(0x0002)
-#define	XIMStringConversionWord		(0x0003)
-#define	XIMStringConversionChar		(0x0004)
-
-typedef	unsigned short	XIMStringConversionOperation;
-
-#define	XIMStringConversionSubstitution	(0x0001)
-#define	XIMStringConversionRetrieval	(0x0002)
-
-typedef enum {
-    XIMForwardChar, XIMBackwardChar,
-    XIMForwardWord, XIMBackwardWord,
-    XIMCaretUp, XIMCaretDown,
-    XIMNextLine, XIMPreviousLine,
-    XIMLineStart, XIMLineEnd,
-    XIMAbsolutePosition,
-    XIMDontChange
-} XIMCaretDirection;
-
-typedef struct _XIMStringConversionCallbackStruct {
-    XIMStringConversionPosition position;
-    XIMCaretDirection direction;
-    XIMStringConversionOperation operation;
-    unsigned short factor;
-    XIMStringConversionText *text;
-} XIMStringConversionCallbackStruct;
-
-typedef struct _XIMPreeditDrawCallbackStruct {
-    int caret;		/* Cursor offset within pre-edit string */
-    int chg_first;	/* Starting change position */
-    int chg_length;	/* Length of the change in character count */
-    XIMText *text;
-} XIMPreeditDrawCallbackStruct;
-
-typedef enum {
-    XIMIsInvisible,	/* Disable caret feedback */
-    XIMIsPrimary,	/* UI defined caret feedback */
-    XIMIsSecondary	/* UI defined caret feedback */
-} XIMCaretStyle;
-
-typedef struct _XIMPreeditCaretCallbackStruct {
-    int position;		 /* Caret offset within pre-edit string */
-    XIMCaretDirection direction; /* Caret moves direction */
-    XIMCaretStyle style;	 /* Feedback of the caret */
-} XIMPreeditCaretCallbackStruct;
-
-typedef enum {
-    XIMTextType,
-    XIMBitmapType
-} XIMStatusDataType;
-
-typedef struct _XIMStatusDrawCallbackStruct {
-    XIMStatusDataType type;
-    union {
-	XIMText *text;
-	Pixmap  bitmap;
-    } data;
-} XIMStatusDrawCallbackStruct;
-
-typedef struct _XIMHotKeyTrigger {
-    KeySym	 keysym;
-    int		 modifier;
-    int		 modifier_mask;
-} XIMHotKeyTrigger;
-
-typedef struct _XIMHotKeyTriggers {
-    int			 num_hot_key;
-    XIMHotKeyTrigger	*key;
-} XIMHotKeyTriggers;
-
-typedef	unsigned long	 XIMHotKeyState;
-
-#define	XIMHotKeyStateON	(0x0001L)
-#define	XIMHotKeyStateOFF	(0x0002L)
-
-typedef struct {
-    unsigned short count_values;
-    char **supported_values;
-} XIMValuesList;
-
-_XFUNCPROTOBEGIN
-
-#if defined(WIN32) && !defined(_XLIBINT_)
-#define _Xdebug (*_Xdebug_p)
-#endif
-
-extern int _Xdebug;
-
-extern XFontStruct *XLoadQueryFont(
-    Display*		/* display */,
-    _Xconst char*	/* name */
-);
-
-extern XFontStruct *XQueryFont(
-    Display*		/* display */,
-    XID			/* font_ID */
-);
-
-
-extern XTimeCoord *XGetMotionEvents(
-    Display*		/* display */,
-    Window		/* w */,
-    Time		/* start */,
-    Time		/* stop */,
-    int*		/* nevents_return */
-);
-
-extern XModifierKeymap *XDeleteModifiermapEntry(
-    XModifierKeymap*	/* modmap */,
-#if NeedWidePrototypes
-    unsigned int	/* keycode_entry */,
-#else
-    KeyCode		/* keycode_entry */,
-#endif
-    int			/* modifier */
-);
-
-extern XModifierKeymap	*XGetModifierMapping(
-    Display*		/* display */
-);
-
-extern XModifierKeymap	*XInsertModifiermapEntry(
-    XModifierKeymap*	/* modmap */,
-#if NeedWidePrototypes
-    unsigned int	/* keycode_entry */,
-#else
-    KeyCode		/* keycode_entry */,
-#endif
-    int			/* modifier */
-);
-
-extern XModifierKeymap *XNewModifiermap(
-    int			/* max_keys_per_mod */
-);
-
-extern XImage *XCreateImage(
-    Display*		/* display */,
-    Visual*		/* visual */,
-    unsigned int	/* depth */,
-    int			/* format */,
-    int			/* offset */,
-    char*		/* data */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* bitmap_pad */,
-    int			/* bytes_per_line */
-);
-extern Status XInitImage(
-    XImage*		/* image */
-);
-extern XImage *XGetImage(
-    Display*		/* display */,
-    Drawable		/* d */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned long	/* plane_mask */,
-    int			/* format */
-);
-extern XImage *XGetSubImage(
-    Display*		/* display */,
-    Drawable		/* d */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned long	/* plane_mask */,
-    int			/* format */,
-    XImage*		/* dest_image */,
-    int			/* dest_x */,
-    int			/* dest_y */
-);
-
-/*
- * X function declarations.
- */
-extern Display *XOpenDisplay(
-    _Xconst char*	/* display_name */
-);
-
-extern void XrmInitialize(
-    void
-);
-
-extern char *XFetchBytes(
-    Display*		/* display */,
-    int*		/* nbytes_return */
-);
-extern char *XFetchBuffer(
-    Display*		/* display */,
-    int*		/* nbytes_return */,
-    int			/* buffer */
-);
-extern char *XGetAtomName(
-    Display*		/* display */,
-    Atom		/* atom */
-);
-extern Status XGetAtomNames(
-    Display*		/* dpy */,
-    Atom*		/* atoms */,
-    int			/* count */,
-    char**		/* names_return */
-);
-extern char *XGetDefault(
-    Display*		/* display */,
-    _Xconst char*	/* program */,
-    _Xconst char*	/* option */
-);
-extern char *XDisplayName(
-    _Xconst char*	/* string */
-);
-extern char *XKeysymToString(
-    KeySym		/* keysym */
-);
-
-extern int (*XSynchronize(
-    Display*		/* display */,
-    Bool		/* onoff */
-))(
-    Display*		/* display */
-);
-extern int (*XSetAfterFunction(
-    Display*		/* display */,
-    int (*) (
-	     Display*	/* display */
-            )		/* procedure */
-))(
-    Display*		/* display */
-);
-extern Atom XInternAtom(
-    Display*		/* display */,
-    _Xconst char*	/* atom_name */,
-    Bool		/* only_if_exists */
-);
-extern Status XInternAtoms(
-    Display*		/* dpy */,
-    char**		/* names */,
-    int			/* count */,
-    Bool		/* onlyIfExists */,
-    Atom*		/* atoms_return */
-);
-extern Colormap XCopyColormapAndFree(
-    Display*		/* display */,
-    Colormap		/* colormap */
-);
-extern Colormap XCreateColormap(
-    Display*		/* display */,
-    Window		/* w */,
-    Visual*		/* visual */,
-    int			/* alloc */
-);
-extern Cursor XCreatePixmapCursor(
-    Display*		/* display */,
-    Pixmap		/* source */,
-    Pixmap		/* mask */,
-    XColor*		/* foreground_color */,
-    XColor*		/* background_color */,
-    unsigned int	/* x */,
-    unsigned int	/* y */
-);
-extern Cursor XCreateGlyphCursor(
-    Display*		/* display */,
-    Font		/* source_font */,
-    Font		/* mask_font */,
-    unsigned int	/* source_char */,
-    unsigned int	/* mask_char */,
-    XColor _Xconst *	/* foreground_color */,
-    XColor _Xconst *	/* background_color */
-);
-extern Cursor XCreateFontCursor(
-    Display*		/* display */,
-    unsigned int	/* shape */
-);
-extern Font XLoadFont(
-    Display*		/* display */,
-    _Xconst char*	/* name */
-);
-extern GC XCreateGC(
-    Display*		/* display */,
-    Drawable		/* d */,
-    unsigned long	/* valuemask */,
-    XGCValues*		/* values */
-);
-extern GContext XGContextFromGC(
-    GC			/* gc */
-);
-extern void XFlushGC(
-    Display*		/* display */,
-    GC			/* gc */
-);
-extern Pixmap XCreatePixmap(
-    Display*		/* display */,
-    Drawable		/* d */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int	/* depth */
-);
-extern Pixmap XCreateBitmapFromData(
-    Display*		/* display */,
-    Drawable		/* d */,
-    _Xconst char*	/* data */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-);
-extern Pixmap XCreatePixmapFromBitmapData(
-    Display*		/* display */,
-    Drawable		/* d */,
-    char*		/* data */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned long	/* fg */,
-    unsigned long	/* bg */,
-    unsigned int	/* depth */
-);
-extern Window XCreateSimpleWindow(
-    Display*		/* display */,
-    Window		/* parent */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int	/* border_width */,
-    unsigned long	/* border */,
-    unsigned long	/* background */
-);
-extern Window XGetSelectionOwner(
-    Display*		/* display */,
-    Atom		/* selection */
-);
-extern Window XCreateWindow(
-    Display*		/* display */,
-    Window		/* parent */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int	/* border_width */,
-    int			/* depth */,
-    unsigned int	/* class */,
-    Visual*		/* visual */,
-    unsigned long	/* valuemask */,
-    XSetWindowAttributes*	/* attributes */
-);
-extern Colormap *XListInstalledColormaps(
-    Display*		/* display */,
-    Window		/* w */,
-    int*		/* num_return */
-);
-extern char **XListFonts(
-    Display*		/* display */,
-    _Xconst char*	/* pattern */,
-    int			/* maxnames */,
-    int*		/* actual_count_return */
-);
-extern char **XListFontsWithInfo(
-    Display*		/* display */,
-    _Xconst char*	/* pattern */,
-    int			/* maxnames */,
-    int*		/* count_return */,
-    XFontStruct**	/* info_return */
-);
-extern char **XGetFontPath(
-    Display*		/* display */,
-    int*		/* npaths_return */
-);
-extern char **XListExtensions(
-    Display*		/* display */,
-    int*		/* nextensions_return */
-);
-extern Atom *XListProperties(
-    Display*		/* display */,
-    Window		/* w */,
-    int*		/* num_prop_return */
-);
-extern XHostAddress *XListHosts(
-    Display*		/* display */,
-    int*		/* nhosts_return */,
-    Bool*		/* state_return */
-);
-_X_DEPRECATED
-extern KeySym XKeycodeToKeysym(
-    Display*		/* display */,
-#if NeedWidePrototypes
-    unsigned int	/* keycode */,
-#else
-    KeyCode		/* keycode */,
-#endif
-    int			/* index */
-);
-extern KeySym XLookupKeysym(
-    XKeyEvent*		/* key_event */,
-    int			/* index */
-);
-extern KeySym *XGetKeyboardMapping(
-    Display*		/* display */,
-#if NeedWidePrototypes
-    unsigned int	/* first_keycode */,
-#else
-    KeyCode		/* first_keycode */,
-#endif
-    int			/* keycode_count */,
-    int*		/* keysyms_per_keycode_return */
-);
-extern KeySym XStringToKeysym(
-    _Xconst char*	/* string */
-);
-extern long XMaxRequestSize(
-    Display*		/* display */
-);
-extern long XExtendedMaxRequestSize(
-    Display*		/* display */
-);
-extern char *XResourceManagerString(
-    Display*		/* display */
-);
-extern char *XScreenResourceString(
-	Screen*		/* screen */
-);
-extern unsigned long XDisplayMotionBufferSize(
-    Display*		/* display */
-);
-extern VisualID XVisualIDFromVisual(
-    Visual*		/* visual */
-);
-
-/* multithread routines */
-
-extern Status XInitThreads(
-    void
-);
-
-extern void XLockDisplay(
-    Display*		/* display */
-);
-
-extern void XUnlockDisplay(
-    Display*		/* display */
-);
-
-/* routines for dealing with extensions */
-
-extern XExtCodes *XInitExtension(
-    Display*		/* display */,
-    _Xconst char*	/* name */
-);
-
-extern XExtCodes *XAddExtension(
-    Display*		/* display */
-);
-extern XExtData *XFindOnExtensionList(
-    XExtData**		/* structure */,
-    int			/* number */
-);
-extern XExtData **XEHeadOfExtensionList(
-    XEDataObject	/* object */
-);
-
-/* these are routines for which there are also macros */
-extern Window XRootWindow(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-extern Window XDefaultRootWindow(
-    Display*		/* display */
-);
-extern Window XRootWindowOfScreen(
-    Screen*		/* screen */
-);
-extern Visual *XDefaultVisual(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-extern Visual *XDefaultVisualOfScreen(
-    Screen*		/* screen */
-);
-extern GC XDefaultGC(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-extern GC XDefaultGCOfScreen(
-    Screen*		/* screen */
-);
-extern unsigned long XBlackPixel(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-extern unsigned long XWhitePixel(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-extern unsigned long XAllPlanes(
-    void
-);
-extern unsigned long XBlackPixelOfScreen(
-    Screen*		/* screen */
-);
-extern unsigned long XWhitePixelOfScreen(
-    Screen*		/* screen */
-);
-extern unsigned long XNextRequest(
-    Display*		/* display */
-);
-extern unsigned long XLastKnownRequestProcessed(
-    Display*		/* display */
-);
-extern char *XServerVendor(
-    Display*		/* display */
-);
-extern char *XDisplayString(
-    Display*		/* display */
-);
-extern Colormap XDefaultColormap(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-extern Colormap XDefaultColormapOfScreen(
-    Screen*		/* screen */
-);
-extern Display *XDisplayOfScreen(
-    Screen*		/* screen */
-);
-extern Screen *XScreenOfDisplay(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-extern Screen *XDefaultScreenOfDisplay(
-    Display*		/* display */
-);
-extern long XEventMaskOfScreen(
-    Screen*		/* screen */
-);
-
-extern int XScreenNumberOfScreen(
-    Screen*		/* screen */
-);
-
-typedef int (*XErrorHandler) (	    /* WARNING, this type not in Xlib spec */
-    Display*		/* display */,
-    XErrorEvent*	/* error_event */
-);
-
-extern XErrorHandler XSetErrorHandler (
-    XErrorHandler	/* handler */
-);
-
-
-typedef int (*XIOErrorHandler) (    /* WARNING, this type not in Xlib spec */
-    Display*		/* display */
-);
-
-extern XIOErrorHandler XSetIOErrorHandler (
-    XIOErrorHandler	/* handler */
-);
-
-
-extern XPixmapFormatValues *XListPixmapFormats(
-    Display*		/* display */,
-    int*		/* count_return */
-);
-extern int *XListDepths(
-    Display*		/* display */,
-    int			/* screen_number */,
-    int*		/* count_return */
-);
-
-/* ICCCM routines for things that don't require special include files; */
-/* other declarations are given in Xutil.h                             */
-extern Status XReconfigureWMWindow(
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* screen_number */,
-    unsigned int	/* mask */,
-    XWindowChanges*	/* changes */
-);
-
-extern Status XGetWMProtocols(
-    Display*		/* display */,
-    Window		/* w */,
-    Atom**		/* protocols_return */,
-    int*		/* count_return */
-);
-extern Status XSetWMProtocols(
-    Display*		/* display */,
-    Window		/* w */,
-    Atom*		/* protocols */,
-    int			/* count */
-);
-extern Status XIconifyWindow(
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* screen_number */
-);
-extern Status XWithdrawWindow(
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* screen_number */
-);
-extern Status XGetCommand(
-    Display*		/* display */,
-    Window		/* w */,
-    char***		/* argv_return */,
-    int*		/* argc_return */
-);
-extern Status XGetWMColormapWindows(
-    Display*		/* display */,
-    Window		/* w */,
-    Window**		/* windows_return */,
-    int*		/* count_return */
-);
-extern Status XSetWMColormapWindows(
-    Display*		/* display */,
-    Window		/* w */,
-    Window*		/* colormap_windows */,
-    int			/* count */
-);
-extern void XFreeStringList(
-    char**		/* list */
-);
-extern int XSetTransientForHint(
-    Display*		/* display */,
-    Window		/* w */,
-    Window		/* prop_window */
-);
-
-/* The following are given in alphabetical order */
-
-extern int XActivateScreenSaver(
-    Display*		/* display */
-);
-
-extern int XAddHost(
-    Display*		/* display */,
-    XHostAddress*	/* host */
-);
-
-extern int XAddHosts(
-    Display*		/* display */,
-    XHostAddress*	/* hosts */,
-    int			/* num_hosts */
-);
-
-extern int XAddToExtensionList(
-    struct _XExtData**	/* structure */,
-    XExtData*		/* ext_data */
-);
-
-extern int XAddToSaveSet(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern Status XAllocColor(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    XColor*		/* screen_in_out */
-);
-
-extern Status XAllocColorCells(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    Bool	        /* contig */,
-    unsigned long*	/* plane_masks_return */,
-    unsigned int	/* nplanes */,
-    unsigned long*	/* pixels_return */,
-    unsigned int 	/* npixels */
-);
-
-extern Status XAllocColorPlanes(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    Bool		/* contig */,
-    unsigned long*	/* pixels_return */,
-    int			/* ncolors */,
-    int			/* nreds */,
-    int			/* ngreens */,
-    int			/* nblues */,
-    unsigned long*	/* rmask_return */,
-    unsigned long*	/* gmask_return */,
-    unsigned long*	/* bmask_return */
-);
-
-extern Status XAllocNamedColor(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* color_name */,
-    XColor*		/* screen_def_return */,
-    XColor*		/* exact_def_return */
-);
-
-extern int XAllowEvents(
-    Display*		/* display */,
-    int			/* event_mode */,
-    Time		/* time */
-);
-
-extern int XAutoRepeatOff(
-    Display*		/* display */
-);
-
-extern int XAutoRepeatOn(
-    Display*		/* display */
-);
-
-extern int XBell(
-    Display*		/* display */,
-    int			/* percent */
-);
-
-extern int XBitmapBitOrder(
-    Display*		/* display */
-);
-
-extern int XBitmapPad(
-    Display*		/* display */
-);
-
-extern int XBitmapUnit(
-    Display*		/* display */
-);
-
-extern int XCellsOfScreen(
-    Screen*		/* screen */
-);
-
-extern int XChangeActivePointerGrab(
-    Display*		/* display */,
-    unsigned int	/* event_mask */,
-    Cursor		/* cursor */,
-    Time		/* time */
-);
-
-extern int XChangeGC(
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* valuemask */,
-    XGCValues*		/* values */
-);
-
-extern int XChangeKeyboardControl(
-    Display*		/* display */,
-    unsigned long	/* value_mask */,
-    XKeyboardControl*	/* values */
-);
-
-extern int XChangeKeyboardMapping(
-    Display*		/* display */,
-    int			/* first_keycode */,
-    int			/* keysyms_per_keycode */,
-    KeySym*		/* keysyms */,
-    int			/* num_codes */
-);
-
-extern int XChangePointerControl(
-    Display*		/* display */,
-    Bool		/* do_accel */,
-    Bool		/* do_threshold */,
-    int			/* accel_numerator */,
-    int			/* accel_denominator */,
-    int			/* threshold */
-);
-
-extern int XChangeProperty(
-    Display*		/* display */,
-    Window		/* w */,
-    Atom		/* property */,
-    Atom		/* type */,
-    int			/* format */,
-    int			/* mode */,
-    _Xconst unsigned char*	/* data */,
-    int			/* nelements */
-);
-
-extern int XChangeSaveSet(
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* change_mode */
-);
-
-extern int XChangeWindowAttributes(
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned long	/* valuemask */,
-    XSetWindowAttributes* /* attributes */
-);
-
-extern Bool XCheckIfEvent(
-    Display*		/* display */,
-    XEvent*		/* event_return */,
-    Bool (*) (
-	       Display*			/* display */,
-               XEvent*			/* event */,
-               XPointer			/* arg */
-             )		/* predicate */,
-    XPointer		/* arg */
-);
-
-extern Bool XCheckMaskEvent(
-    Display*		/* display */,
-    long		/* event_mask */,
-    XEvent*		/* event_return */
-);
-
-extern Bool XCheckTypedEvent(
-    Display*		/* display */,
-    int			/* event_type */,
-    XEvent*		/* event_return */
-);
-
-extern Bool XCheckTypedWindowEvent(
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* event_type */,
-    XEvent*		/* event_return */
-);
-
-extern Bool XCheckWindowEvent(
-    Display*		/* display */,
-    Window		/* w */,
-    long		/* event_mask */,
-    XEvent*		/* event_return */
-);
-
-extern int XCirculateSubwindows(
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* direction */
-);
-
-extern int XCirculateSubwindowsDown(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XCirculateSubwindowsUp(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XClearArea(
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    Bool		/* exposures */
-);
-
-extern int XClearWindow(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XCloseDisplay(
-    Display*		/* display */
-);
-
-extern int XConfigureWindow(
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned int	/* value_mask */,
-    XWindowChanges*	/* values */
-);
-
-extern int XConnectionNumber(
-    Display*		/* display */
-);
-
-extern int XConvertSelection(
-    Display*		/* display */,
-    Atom		/* selection */,
-    Atom 		/* target */,
-    Atom		/* property */,
-    Window		/* requestor */,
-    Time		/* time */
-);
-
-extern int XCopyArea(
-    Display*		/* display */,
-    Drawable		/* src */,
-    Drawable		/* dest */,
-    GC			/* gc */,
-    int			/* src_x */,
-    int			/* src_y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* dest_x */,
-    int			/* dest_y */
-);
-
-extern int XCopyGC(
-    Display*		/* display */,
-    GC			/* src */,
-    unsigned long	/* valuemask */,
-    GC			/* dest */
-);
-
-extern int XCopyPlane(
-    Display*		/* display */,
-    Drawable		/* src */,
-    Drawable		/* dest */,
-    GC			/* gc */,
-    int			/* src_x */,
-    int			/* src_y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* dest_x */,
-    int			/* dest_y */,
-    unsigned long	/* plane */
-);
-
-extern int XDefaultDepth(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-
-extern int XDefaultDepthOfScreen(
-    Screen*		/* screen */
-);
-
-extern int XDefaultScreen(
-    Display*		/* display */
-);
-
-extern int XDefineCursor(
-    Display*		/* display */,
-    Window		/* w */,
-    Cursor		/* cursor */
-);
-
-extern int XDeleteProperty(
-    Display*		/* display */,
-    Window		/* w */,
-    Atom		/* property */
-);
-
-extern int XDestroyWindow(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XDestroySubwindows(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XDoesBackingStore(
-    Screen*		/* screen */
-);
-
-extern Bool XDoesSaveUnders(
-    Screen*		/* screen */
-);
-
-extern int XDisableAccessControl(
-    Display*		/* display */
-);
-
-
-extern int XDisplayCells(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-
-extern int XDisplayHeight(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-
-extern int XDisplayHeightMM(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-
-extern int XDisplayKeycodes(
-    Display*		/* display */,
-    int*		/* min_keycodes_return */,
-    int*		/* max_keycodes_return */
-);
-
-extern int XDisplayPlanes(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-
-extern int XDisplayWidth(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-
-extern int XDisplayWidthMM(
-    Display*		/* display */,
-    int			/* screen_number */
-);
-
-extern int XDrawArc(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* angle1 */,
-    int			/* angle2 */
-);
-
-extern int XDrawArcs(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XArc*		/* arcs */,
-    int			/* narcs */
-);
-
-extern int XDrawImageString(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* string */,
-    int			/* length */
-);
-
-extern int XDrawImageString16(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst XChar2b*	/* string */,
-    int			/* length */
-);
-
-extern int XDrawLine(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x1 */,
-    int			/* y1 */,
-    int			/* x2 */,
-    int			/* y2 */
-);
-
-extern int XDrawLines(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XPoint*		/* points */,
-    int			/* npoints */,
-    int			/* mode */
-);
-
-extern int XDrawPoint(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */
-);
-
-extern int XDrawPoints(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XPoint*		/* points */,
-    int			/* npoints */,
-    int			/* mode */
-);
-
-extern int XDrawRectangle(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-);
-
-extern int XDrawRectangles(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XRectangle*		/* rectangles */,
-    int			/* nrectangles */
-);
-
-extern int XDrawSegments(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XSegment*		/* segments */,
-    int			/* nsegments */
-);
-
-extern int XDrawString(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* string */,
-    int			/* length */
-);
-
-extern int XDrawString16(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst XChar2b*	/* string */,
-    int			/* length */
-);
-
-extern int XDrawText(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    XTextItem*		/* items */,
-    int			/* nitems */
-);
-
-extern int XDrawText16(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    XTextItem16*	/* items */,
-    int			/* nitems */
-);
-
-extern int XEnableAccessControl(
-    Display*		/* display */
-);
-
-extern int XEventsQueued(
-    Display*		/* display */,
-    int			/* mode */
-);
-
-extern Status XFetchName(
-    Display*		/* display */,
-    Window		/* w */,
-    char**		/* window_name_return */
-);
-
-extern int XFillArc(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* angle1 */,
-    int			/* angle2 */
-);
-
-extern int XFillArcs(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XArc*		/* arcs */,
-    int			/* narcs */
-);
-
-extern int XFillPolygon(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XPoint*		/* points */,
-    int			/* npoints */,
-    int			/* shape */,
-    int			/* mode */
-);
-
-extern int XFillRectangle(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-);
-
-extern int XFillRectangles(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XRectangle*		/* rectangles */,
-    int			/* nrectangles */
-);
-
-extern int XFlush(
-    Display*		/* display */
-);
-
-extern int XForceScreenSaver(
-    Display*		/* display */,
-    int			/* mode */
-);
-
-extern int XFree(
-    void*		/* data */
-);
-
-extern int XFreeColormap(
-    Display*		/* display */,
-    Colormap		/* colormap */
-);
-
-extern int XFreeColors(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    unsigned long*	/* pixels */,
-    int			/* npixels */,
-    unsigned long	/* planes */
-);
-
-extern int XFreeCursor(
-    Display*		/* display */,
-    Cursor		/* cursor */
-);
-
-extern int XFreeExtensionList(
-    char**		/* list */
-);
-
-extern int XFreeFont(
-    Display*		/* display */,
-    XFontStruct*	/* font_struct */
-);
-
-extern int XFreeFontInfo(
-    char**		/* names */,
-    XFontStruct*	/* free_info */,
-    int			/* actual_count */
-);
-
-extern int XFreeFontNames(
-    char**		/* list */
-);
-
-extern int XFreeFontPath(
-    char**		/* list */
-);
-
-extern int XFreeGC(
-    Display*		/* display */,
-    GC			/* gc */
-);
-
-extern int XFreeModifiermap(
-    XModifierKeymap*	/* modmap */
-);
-
-extern int XFreePixmap(
-    Display*		/* display */,
-    Pixmap		/* pixmap */
-);
-
-extern int XGeometry(
-    Display*		/* display */,
-    int			/* screen */,
-    _Xconst char*	/* position */,
-    _Xconst char*	/* default_position */,
-    unsigned int	/* bwidth */,
-    unsigned int	/* fwidth */,
-    unsigned int	/* fheight */,
-    int			/* xadder */,
-    int			/* yadder */,
-    int*		/* x_return */,
-    int*		/* y_return */,
-    int*		/* width_return */,
-    int*		/* height_return */
-);
-
-extern int XGetErrorDatabaseText(
-    Display*		/* display */,
-    _Xconst char*	/* name */,
-    _Xconst char*	/* message */,
-    _Xconst char*	/* default_string */,
-    char*		/* buffer_return */,
-    int			/* length */
-);
-
-extern int XGetErrorText(
-    Display*		/* display */,
-    int			/* code */,
-    char*		/* buffer_return */,
-    int			/* length */
-);
-
-extern Bool XGetFontProperty(
-    XFontStruct*	/* font_struct */,
-    Atom		/* atom */,
-    unsigned long*	/* value_return */
-);
-
-extern Status XGetGCValues(
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* valuemask */,
-    XGCValues*		/* values_return */
-);
-
-extern Status XGetGeometry(
-    Display*		/* display */,
-    Drawable		/* d */,
-    Window*		/* root_return */,
-    int*		/* x_return */,
-    int*		/* y_return */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */,
-    unsigned int*	/* border_width_return */,
-    unsigned int*	/* depth_return */
-);
-
-extern Status XGetIconName(
-    Display*		/* display */,
-    Window		/* w */,
-    char**		/* icon_name_return */
-);
-
-extern int XGetInputFocus(
-    Display*		/* display */,
-    Window*		/* focus_return */,
-    int*		/* revert_to_return */
-);
-
-extern int XGetKeyboardControl(
-    Display*		/* display */,
-    XKeyboardState*	/* values_return */
-);
-
-extern int XGetPointerControl(
-    Display*		/* display */,
-    int*		/* accel_numerator_return */,
-    int*		/* accel_denominator_return */,
-    int*		/* threshold_return */
-);
-
-extern int XGetPointerMapping(
-    Display*		/* display */,
-    unsigned char*	/* map_return */,
-    int			/* nmap */
-);
-
-extern int XGetScreenSaver(
-    Display*		/* display */,
-    int*		/* timeout_return */,
-    int*		/* interval_return */,
-    int*		/* prefer_blanking_return */,
-    int*		/* allow_exposures_return */
-);
-
-extern Status XGetTransientForHint(
-    Display*		/* display */,
-    Window		/* w */,
-    Window*		/* prop_window_return */
-);
-
-extern int XGetWindowProperty(
-    Display*		/* display */,
-    Window		/* w */,
-    Atom		/* property */,
-    long		/* long_offset */,
-    long		/* long_length */,
-    Bool		/* delete */,
-    Atom		/* req_type */,
-    Atom*		/* actual_type_return */,
-    int*		/* actual_format_return */,
-    unsigned long*	/* nitems_return */,
-    unsigned long*	/* bytes_after_return */,
-    unsigned char**	/* prop_return */
-);
-
-extern Status XGetWindowAttributes(
-    Display*		/* display */,
-    Window		/* w */,
-    XWindowAttributes*	/* window_attributes_return */
-);
-
-extern int XGrabButton(
-    Display*		/* display */,
-    unsigned int	/* button */,
-    unsigned int	/* modifiers */,
-    Window		/* grab_window */,
-    Bool		/* owner_events */,
-    unsigned int	/* event_mask */,
-    int			/* pointer_mode */,
-    int			/* keyboard_mode */,
-    Window		/* confine_to */,
-    Cursor		/* cursor */
-);
-
-extern int XGrabKey(
-    Display*		/* display */,
-    int			/* keycode */,
-    unsigned int	/* modifiers */,
-    Window		/* grab_window */,
-    Bool		/* owner_events */,
-    int			/* pointer_mode */,
-    int			/* keyboard_mode */
-);
-
-extern int XGrabKeyboard(
-    Display*		/* display */,
-    Window		/* grab_window */,
-    Bool		/* owner_events */,
-    int			/* pointer_mode */,
-    int			/* keyboard_mode */,
-    Time		/* time */
-);
-
-extern int XGrabPointer(
-    Display*		/* display */,
-    Window		/* grab_window */,
-    Bool		/* owner_events */,
-    unsigned int	/* event_mask */,
-    int			/* pointer_mode */,
-    int			/* keyboard_mode */,
-    Window		/* confine_to */,
-    Cursor		/* cursor */,
-    Time		/* time */
-);
-
-extern int XGrabServer(
-    Display*		/* display */
-);
-
-extern int XHeightMMOfScreen(
-    Screen*		/* screen */
-);
-
-extern int XHeightOfScreen(
-    Screen*		/* screen */
-);
-
-extern int XIfEvent(
-    Display*		/* display */,
-    XEvent*		/* event_return */,
-    Bool (*) (
-	       Display*			/* display */,
-               XEvent*			/* event */,
-               XPointer			/* arg */
-             )		/* predicate */,
-    XPointer		/* arg */
-);
-
-extern int XImageByteOrder(
-    Display*		/* display */
-);
-
-extern int XInstallColormap(
-    Display*		/* display */,
-    Colormap		/* colormap */
-);
-
-extern KeyCode XKeysymToKeycode(
-    Display*		/* display */,
-    KeySym		/* keysym */
-);
-
-extern int XKillClient(
-    Display*		/* display */,
-    XID			/* resource */
-);
-
-extern Status XLookupColor(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* color_name */,
-    XColor*		/* exact_def_return */,
-    XColor*		/* screen_def_return */
-);
-
-extern int XLowerWindow(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XMapRaised(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XMapSubwindows(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XMapWindow(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XMaskEvent(
-    Display*		/* display */,
-    long		/* event_mask */,
-    XEvent*		/* event_return */
-);
-
-extern int XMaxCmapsOfScreen(
-    Screen*		/* screen */
-);
-
-extern int XMinCmapsOfScreen(
-    Screen*		/* screen */
-);
-
-extern int XMoveResizeWindow(
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-);
-
-extern int XMoveWindow(
-    Display*		/* display */,
-    Window		/* w */,
-    int			/* x */,
-    int			/* y */
-);
-
-extern int XNextEvent(
-    Display*		/* display */,
-    XEvent*		/* event_return */
-);
-
-extern int XNoOp(
-    Display*		/* display */
-);
-
-extern Status XParseColor(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* spec */,
-    XColor*		/* exact_def_return */
-);
-
-extern int XParseGeometry(
-    _Xconst char*	/* parsestring */,
-    int*		/* x_return */,
-    int*		/* y_return */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */
-);
-
-extern int XPeekEvent(
-    Display*		/* display */,
-    XEvent*		/* event_return */
-);
-
-extern int XPeekIfEvent(
-    Display*		/* display */,
-    XEvent*		/* event_return */,
-    Bool (*) (
-	       Display*		/* display */,
-               XEvent*		/* event */,
-               XPointer		/* arg */
-             )		/* predicate */,
-    XPointer		/* arg */
-);
-
-extern int XPending(
-    Display*		/* display */
-);
-
-extern int XPlanesOfScreen(
-    Screen*		/* screen */
-);
-
-extern int XProtocolRevision(
-    Display*		/* display */
-);
-
-extern int XProtocolVersion(
-    Display*		/* display */
-);
-
-
-extern int XPutBackEvent(
-    Display*		/* display */,
-    XEvent*		/* event */
-);
-
-extern int XPutImage(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    XImage*		/* image */,
-    int			/* src_x */,
-    int			/* src_y */,
-    int			/* dest_x */,
-    int			/* dest_y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-);
-
-extern int XQLength(
-    Display*		/* display */
-);
-
-extern Status XQueryBestCursor(
-    Display*		/* display */,
-    Drawable		/* d */,
-    unsigned int        /* width */,
-    unsigned int	/* height */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */
-);
-
-extern Status XQueryBestSize(
-    Display*		/* display */,
-    int			/* class */,
-    Drawable		/* which_screen */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */
-);
-
-extern Status XQueryBestStipple(
-    Display*		/* display */,
-    Drawable		/* which_screen */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */
-);
-
-extern Status XQueryBestTile(
-    Display*		/* display */,
-    Drawable		/* which_screen */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */
-);
-
-extern int XQueryColor(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    XColor*		/* def_in_out */
-);
-
-extern int XQueryColors(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    XColor*		/* defs_in_out */,
-    int			/* ncolors */
-);
-
-extern Bool XQueryExtension(
-    Display*		/* display */,
-    _Xconst char*	/* name */,
-    int*		/* major_opcode_return */,
-    int*		/* first_event_return */,
-    int*		/* first_error_return */
-);
-
-extern int XQueryKeymap(
-    Display*		/* display */,
-    char [32]		/* keys_return */
-);
-
-extern Bool XQueryPointer(
-    Display*		/* display */,
-    Window		/* w */,
-    Window*		/* root_return */,
-    Window*		/* child_return */,
-    int*		/* root_x_return */,
-    int*		/* root_y_return */,
-    int*		/* win_x_return */,
-    int*		/* win_y_return */,
-    unsigned int*       /* mask_return */
-);
-
-extern int XQueryTextExtents(
-    Display*		/* display */,
-    XID			/* font_ID */,
-    _Xconst char*	/* string */,
-    int			/* nchars */,
-    int*		/* direction_return */,
-    int*		/* font_ascent_return */,
-    int*		/* font_descent_return */,
-    XCharStruct*	/* overall_return */
-);
-
-extern int XQueryTextExtents16(
-    Display*		/* display */,
-    XID			/* font_ID */,
-    _Xconst XChar2b*	/* string */,
-    int			/* nchars */,
-    int*		/* direction_return */,
-    int*		/* font_ascent_return */,
-    int*		/* font_descent_return */,
-    XCharStruct*	/* overall_return */
-);
-
-extern Status XQueryTree(
-    Display*		/* display */,
-    Window		/* w */,
-    Window*		/* root_return */,
-    Window*		/* parent_return */,
-    Window**		/* children_return */,
-    unsigned int*	/* nchildren_return */
-);
-
-extern int XRaiseWindow(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XReadBitmapFile(
-    Display*		/* display */,
-    Drawable 		/* d */,
-    _Xconst char*	/* filename */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */,
-    Pixmap*		/* bitmap_return */,
-    int*		/* x_hot_return */,
-    int*		/* y_hot_return */
-);
-
-extern int XReadBitmapFileData(
-    _Xconst char*	/* filename */,
-    unsigned int*	/* width_return */,
-    unsigned int*	/* height_return */,
-    unsigned char**	/* data_return */,
-    int*		/* x_hot_return */,
-    int*		/* y_hot_return */
-);
-
-extern int XRebindKeysym(
-    Display*		/* display */,
-    KeySym		/* keysym */,
-    KeySym*		/* list */,
-    int			/* mod_count */,
-    _Xconst unsigned char*	/* string */,
-    int			/* bytes_string */
-);
-
-extern int XRecolorCursor(
-    Display*		/* display */,
-    Cursor		/* cursor */,
-    XColor*		/* foreground_color */,
-    XColor*		/* background_color */
-);
-
-extern int XRefreshKeyboardMapping(
-    XMappingEvent*	/* event_map */
-);
-
-extern int XRemoveFromSaveSet(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XRemoveHost(
-    Display*		/* display */,
-    XHostAddress*	/* host */
-);
-
-extern int XRemoveHosts(
-    Display*		/* display */,
-    XHostAddress*	/* hosts */,
-    int			/* num_hosts */
-);
-
-extern int XReparentWindow(
-    Display*		/* display */,
-    Window		/* w */,
-    Window		/* parent */,
-    int			/* x */,
-    int			/* y */
-);
-
-extern int XResetScreenSaver(
-    Display*		/* display */
-);
-
-extern int XResizeWindow(
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-);
-
-extern int XRestackWindows(
-    Display*		/* display */,
-    Window*		/* windows */,
-    int			/* nwindows */
-);
-
-extern int XRotateBuffers(
-    Display*		/* display */,
-    int			/* rotate */
-);
-
-extern int XRotateWindowProperties(
-    Display*		/* display */,
-    Window		/* w */,
-    Atom*		/* properties */,
-    int			/* num_prop */,
-    int			/* npositions */
-);
-
-extern int XScreenCount(
-    Display*		/* display */
-);
-
-extern int XSelectInput(
-    Display*		/* display */,
-    Window		/* w */,
-    long		/* event_mask */
-);
-
-extern Status XSendEvent(
-    Display*		/* display */,
-    Window		/* w */,
-    Bool		/* propagate */,
-    long		/* event_mask */,
-    XEvent*		/* event_send */
-);
-
-extern int XSetAccessControl(
-    Display*		/* display */,
-    int			/* mode */
-);
-
-extern int XSetArcMode(
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* arc_mode */
-);
-
-extern int XSetBackground(
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* background */
-);
-
-extern int XSetClipMask(
-    Display*		/* display */,
-    GC			/* gc */,
-    Pixmap		/* pixmap */
-);
-
-extern int XSetClipOrigin(
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* clip_x_origin */,
-    int			/* clip_y_origin */
-);
-
-extern int XSetClipRectangles(
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* clip_x_origin */,
-    int			/* clip_y_origin */,
-    XRectangle*		/* rectangles */,
-    int			/* n */,
-    int			/* ordering */
-);
-
-extern int XSetCloseDownMode(
-    Display*		/* display */,
-    int			/* close_mode */
-);
-
-extern int XSetCommand(
-    Display*		/* display */,
-    Window		/* w */,
-    char**		/* argv */,
-    int			/* argc */
-);
-
-extern int XSetDashes(
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* dash_offset */,
-    _Xconst char*	/* dash_list */,
-    int			/* n */
-);
-
-extern int XSetFillRule(
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* fill_rule */
-);
-
-extern int XSetFillStyle(
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* fill_style */
-);
-
-extern int XSetFont(
-    Display*		/* display */,
-    GC			/* gc */,
-    Font		/* font */
-);
-
-extern int XSetFontPath(
-    Display*		/* display */,
-    char**		/* directories */,
-    int			/* ndirs */
-);
-
-extern int XSetForeground(
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* foreground */
-);
-
-extern int XSetFunction(
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* function */
-);
-
-extern int XSetGraphicsExposures(
-    Display*		/* display */,
-    GC			/* gc */,
-    Bool		/* graphics_exposures */
-);
-
-extern int XSetIconName(
-    Display*		/* display */,
-    Window		/* w */,
-    _Xconst char*	/* icon_name */
-);
-
-extern int XSetInputFocus(
-    Display*		/* display */,
-    Window		/* focus */,
-    int			/* revert_to */,
-    Time		/* time */
-);
-
-extern int XSetLineAttributes(
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned int	/* line_width */,
-    int			/* line_style */,
-    int			/* cap_style */,
-    int			/* join_style */
-);
-
-extern int XSetModifierMapping(
-    Display*		/* display */,
-    XModifierKeymap*	/* modmap */
-);
-
-extern int XSetPlaneMask(
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* plane_mask */
-);
-
-extern int XSetPointerMapping(
-    Display*		/* display */,
-    _Xconst unsigned char*	/* map */,
-    int			/* nmap */
-);
-
-extern int XSetScreenSaver(
-    Display*		/* display */,
-    int			/* timeout */,
-    int			/* interval */,
-    int			/* prefer_blanking */,
-    int			/* allow_exposures */
-);
-
-extern int XSetSelectionOwner(
-    Display*		/* display */,
-    Atom	        /* selection */,
-    Window		/* owner */,
-    Time		/* time */
-);
-
-extern int XSetState(
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long 	/* foreground */,
-    unsigned long	/* background */,
-    int			/* function */,
-    unsigned long	/* plane_mask */
-);
-
-extern int XSetStipple(
-    Display*		/* display */,
-    GC			/* gc */,
-    Pixmap		/* stipple */
-);
-
-extern int XSetSubwindowMode(
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* subwindow_mode */
-);
-
-extern int XSetTSOrigin(
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* ts_x_origin */,
-    int			/* ts_y_origin */
-);
-
-extern int XSetTile(
-    Display*		/* display */,
-    GC			/* gc */,
-    Pixmap		/* tile */
-);
-
-extern int XSetWindowBackground(
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned long	/* background_pixel */
-);
-
-extern int XSetWindowBackgroundPixmap(
-    Display*		/* display */,
-    Window		/* w */,
-    Pixmap		/* background_pixmap */
-);
-
-extern int XSetWindowBorder(
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned long	/* border_pixel */
-);
-
-extern int XSetWindowBorderPixmap(
-    Display*		/* display */,
-    Window		/* w */,
-    Pixmap		/* border_pixmap */
-);
-
-extern int XSetWindowBorderWidth(
-    Display*		/* display */,
-    Window		/* w */,
-    unsigned int	/* width */
-);
-
-extern int XSetWindowColormap(
-    Display*		/* display */,
-    Window		/* w */,
-    Colormap		/* colormap */
-);
-
-extern int XStoreBuffer(
-    Display*		/* display */,
-    _Xconst char*	/* bytes */,
-    int			/* nbytes */,
-    int			/* buffer */
-);
-
-extern int XStoreBytes(
-    Display*		/* display */,
-    _Xconst char*	/* bytes */,
-    int			/* nbytes */
-);
-
-extern int XStoreColor(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    XColor*		/* color */
-);
-
-extern int XStoreColors(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    XColor*		/* color */,
-    int			/* ncolors */
-);
-
-extern int XStoreName(
-    Display*		/* display */,
-    Window		/* w */,
-    _Xconst char*	/* window_name */
-);
-
-extern int XStoreNamedColor(
-    Display*		/* display */,
-    Colormap		/* colormap */,
-    _Xconst char*	/* color */,
-    unsigned long	/* pixel */,
-    int			/* flags */
-);
-
-extern int XSync(
-    Display*		/* display */,
-    Bool		/* discard */
-);
-
-extern int XTextExtents(
-    XFontStruct*	/* font_struct */,
-    _Xconst char*	/* string */,
-    int			/* nchars */,
-    int*		/* direction_return */,
-    int*		/* font_ascent_return */,
-    int*		/* font_descent_return */,
-    XCharStruct*	/* overall_return */
-);
-
-extern int XTextExtents16(
-    XFontStruct*	/* font_struct */,
-    _Xconst XChar2b*	/* string */,
-    int			/* nchars */,
-    int*		/* direction_return */,
-    int*		/* font_ascent_return */,
-    int*		/* font_descent_return */,
-    XCharStruct*	/* overall_return */
-);
-
-extern int XTextWidth(
-    XFontStruct*	/* font_struct */,
-    _Xconst char*	/* string */,
-    int			/* count */
-);
-
-extern int XTextWidth16(
-    XFontStruct*	/* font_struct */,
-    _Xconst XChar2b*	/* string */,
-    int			/* count */
-);
-
-extern Bool XTranslateCoordinates(
-    Display*		/* display */,
-    Window		/* src_w */,
-    Window		/* dest_w */,
-    int			/* src_x */,
-    int			/* src_y */,
-    int*		/* dest_x_return */,
-    int*		/* dest_y_return */,
-    Window*		/* child_return */
-);
-
-extern int XUndefineCursor(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XUngrabButton(
-    Display*		/* display */,
-    unsigned int	/* button */,
-    unsigned int	/* modifiers */,
-    Window		/* grab_window */
-);
-
-extern int XUngrabKey(
-    Display*		/* display */,
-    int			/* keycode */,
-    unsigned int	/* modifiers */,
-    Window		/* grab_window */
-);
-
-extern int XUngrabKeyboard(
-    Display*		/* display */,
-    Time		/* time */
-);
-
-extern int XUngrabPointer(
-    Display*		/* display */,
-    Time		/* time */
-);
-
-extern int XUngrabServer(
-    Display*		/* display */
-);
-
-extern int XUninstallColormap(
-    Display*		/* display */,
-    Colormap		/* colormap */
-);
-
-extern int XUnloadFont(
-    Display*		/* display */,
-    Font		/* font */
-);
-
-extern int XUnmapSubwindows(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XUnmapWindow(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern int XVendorRelease(
-    Display*		/* display */
-);
-
-extern int XWarpPointer(
-    Display*		/* display */,
-    Window		/* src_w */,
-    Window		/* dest_w */,
-    int			/* src_x */,
-    int			/* src_y */,
-    unsigned int	/* src_width */,
-    unsigned int	/* src_height */,
-    int			/* dest_x */,
-    int			/* dest_y */
-);
-
-extern int XWidthMMOfScreen(
-    Screen*		/* screen */
-);
-
-extern int XWidthOfScreen(
-    Screen*		/* screen */
-);
-
-extern int XWindowEvent(
-    Display*		/* display */,
-    Window		/* w */,
-    long		/* event_mask */,
-    XEvent*		/* event_return */
-);
-
-extern int XWriteBitmapFile(
-    Display*		/* display */,
-    _Xconst char*	/* filename */,
-    Pixmap		/* bitmap */,
-    unsigned int	/* width */,
-    unsigned int	/* height */,
-    int			/* x_hot */,
-    int			/* y_hot */
-);
-
-extern Bool XSupportsLocale (void);
-
-extern char *XSetLocaleModifiers(
-    const char*		/* modifier_list */
-);
-
-extern XOM XOpenOM(
-    Display*			/* display */,
-    struct _XrmHashBucketRec*	/* rdb */,
-    _Xconst char*		/* res_name */,
-    _Xconst char*		/* res_class */
-);
-
-extern Status XCloseOM(
-    XOM			/* om */
-);
-
-extern char *XSetOMValues(
-    XOM			/* om */,
-    ...
-) _X_SENTINEL(0);
-
-extern char *XGetOMValues(
-    XOM			/* om */,
-    ...
-) _X_SENTINEL(0);
-
-extern Display *XDisplayOfOM(
-    XOM			/* om */
-);
-
-extern char *XLocaleOfOM(
-    XOM			/* om */
-);
-
-extern XOC XCreateOC(
-    XOM			/* om */,
-    ...
-) _X_SENTINEL(0);
-
-extern void XDestroyOC(
-    XOC			/* oc */
-);
-
-extern XOM XOMOfOC(
-    XOC			/* oc */
-);
-
-extern char *XSetOCValues(
-    XOC			/* oc */,
-    ...
-) _X_SENTINEL(0);
-
-extern char *XGetOCValues(
-    XOC			/* oc */,
-    ...
-) _X_SENTINEL(0);
-
-extern XFontSet XCreateFontSet(
-    Display*		/* display */,
-    _Xconst char*	/* base_font_name_list */,
-    char***		/* missing_charset_list */,
-    int*		/* missing_charset_count */,
-    char**		/* def_string */
-);
-
-extern void XFreeFontSet(
-    Display*		/* display */,
-    XFontSet		/* font_set */
-);
-
-extern int XFontsOfFontSet(
-    XFontSet		/* font_set */,
-    XFontStruct***	/* font_struct_list */,
-    char***		/* font_name_list */
-);
-
-extern char *XBaseFontNameListOfFontSet(
-    XFontSet		/* font_set */
-);
-
-extern char *XLocaleOfFontSet(
-    XFontSet		/* font_set */
-);
-
-extern Bool XContextDependentDrawing(
-    XFontSet		/* font_set */
-);
-
-extern Bool XDirectionalDependentDrawing(
-    XFontSet		/* font_set */
-);
-
-extern Bool XContextualDrawing(
-    XFontSet		/* font_set */
-);
-
-extern XFontSetExtents *XExtentsOfFontSet(
-    XFontSet		/* font_set */
-);
-
-extern int XmbTextEscapement(
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */
-);
-
-extern int XwcTextEscapement(
-    XFontSet		/* font_set */,
-    _Xconst wchar_t*	/* text */,
-    int			/* num_wchars */
-);
-
-extern int Xutf8TextEscapement(
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */
-);
-
-extern int XmbTextExtents(
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */,
-    XRectangle*		/* overall_ink_return */,
-    XRectangle*		/* overall_logical_return */
-);
-
-extern int XwcTextExtents(
-    XFontSet		/* font_set */,
-    _Xconst wchar_t*	/* text */,
-    int			/* num_wchars */,
-    XRectangle*		/* overall_ink_return */,
-    XRectangle*		/* overall_logical_return */
-);
-
-extern int Xutf8TextExtents(
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */,
-    XRectangle*		/* overall_ink_return */,
-    XRectangle*		/* overall_logical_return */
-);
-
-extern Status XmbTextPerCharExtents(
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */,
-    XRectangle*		/* ink_extents_buffer */,
-    XRectangle*		/* logical_extents_buffer */,
-    int			/* buffer_size */,
-    int*		/* num_chars */,
-    XRectangle*		/* overall_ink_return */,
-    XRectangle*		/* overall_logical_return */
-);
-
-extern Status XwcTextPerCharExtents(
-    XFontSet		/* font_set */,
-    _Xconst wchar_t*	/* text */,
-    int			/* num_wchars */,
-    XRectangle*		/* ink_extents_buffer */,
-    XRectangle*		/* logical_extents_buffer */,
-    int			/* buffer_size */,
-    int*		/* num_chars */,
-    XRectangle*		/* overall_ink_return */,
-    XRectangle*		/* overall_logical_return */
-);
-
-extern Status Xutf8TextPerCharExtents(
-    XFontSet		/* font_set */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */,
-    XRectangle*		/* ink_extents_buffer */,
-    XRectangle*		/* logical_extents_buffer */,
-    int			/* buffer_size */,
-    int*		/* num_chars */,
-    XRectangle*		/* overall_ink_return */,
-    XRectangle*		/* overall_logical_return */
-);
-
-extern void XmbDrawText(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    XmbTextItem*	/* text_items */,
-    int			/* nitems */
-);
-
-extern void XwcDrawText(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    XwcTextItem*	/* text_items */,
-    int			/* nitems */
-);
-
-extern void Xutf8DrawText(
-    Display*		/* display */,
-    Drawable		/* d */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    XmbTextItem*	/* text_items */,
-    int			/* nitems */
-);
-
-extern void XmbDrawString(
-    Display*		/* display */,
-    Drawable		/* d */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */
-);
-
-extern void XwcDrawString(
-    Display*		/* display */,
-    Drawable		/* d */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst wchar_t*	/* text */,
-    int			/* num_wchars */
-);
-
-extern void Xutf8DrawString(
-    Display*		/* display */,
-    Drawable		/* d */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */
-);
-
-extern void XmbDrawImageString(
-    Display*		/* display */,
-    Drawable		/* d */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */
-);
-
-extern void XwcDrawImageString(
-    Display*		/* display */,
-    Drawable		/* d */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst wchar_t*	/* text */,
-    int			/* num_wchars */
-);
-
-extern void Xutf8DrawImageString(
-    Display*		/* display */,
-    Drawable		/* d */,
-    XFontSet		/* font_set */,
-    GC			/* gc */,
-    int			/* x */,
-    int			/* y */,
-    _Xconst char*	/* text */,
-    int			/* bytes_text */
-);
-
-extern XIM XOpenIM(
-    Display*			/* dpy */,
-    struct _XrmHashBucketRec*	/* rdb */,
-    char*			/* res_name */,
-    char*			/* res_class */
-);
-
-extern Status XCloseIM(
-    XIM /* im */
-);
-
-extern char *XGetIMValues(
-    XIM /* im */, ...
-) _X_SENTINEL(0);
-
-extern char *XSetIMValues(
-    XIM /* im */, ...
-) _X_SENTINEL(0);
-
-extern Display *XDisplayOfIM(
-    XIM /* im */
-);
-
-extern char *XLocaleOfIM(
-    XIM /* im*/
-);
-
-extern XIC XCreateIC(
-    XIM /* im */, ...
-) _X_SENTINEL(0);
-
-extern void XDestroyIC(
-    XIC /* ic */
-);
-
-extern void XSetICFocus(
-    XIC /* ic */
-);
-
-extern void XUnsetICFocus(
-    XIC /* ic */
-);
-
-extern wchar_t *XwcResetIC(
-    XIC /* ic */
-);
-
-extern char *XmbResetIC(
-    XIC /* ic */
-);
-
-extern char *Xutf8ResetIC(
-    XIC /* ic */
-);
-
-extern char *XSetICValues(
-    XIC /* ic */, ...
-) _X_SENTINEL(0);
-
-extern char *XGetICValues(
-    XIC /* ic */, ...
-) _X_SENTINEL(0);
-
-extern XIM XIMOfIC(
-    XIC /* ic */
-);
-
-extern Bool XFilterEvent(
-    XEvent*	/* event */,
-    Window	/* window */
-);
-
-extern int XmbLookupString(
-    XIC			/* ic */,
-    XKeyPressedEvent*	/* event */,
-    char*		/* buffer_return */,
-    int			/* bytes_buffer */,
-    KeySym*		/* keysym_return */,
-    Status*		/* status_return */
-);
-
-extern int XwcLookupString(
-    XIC			/* ic */,
-    XKeyPressedEvent*	/* event */,
-    wchar_t*		/* buffer_return */,
-    int			/* wchars_buffer */,
-    KeySym*		/* keysym_return */,
-    Status*		/* status_return */
-);
-
-extern int Xutf8LookupString(
-    XIC			/* ic */,
-    XKeyPressedEvent*	/* event */,
-    char*		/* buffer_return */,
-    int			/* bytes_buffer */,
-    KeySym*		/* keysym_return */,
-    Status*		/* status_return */
-);
-
-extern XVaNestedList XVaCreateNestedList(
-    int /*unused*/, ...
-) _X_SENTINEL(0);
-
-/* internal connections for IMs */
-
-extern Bool XRegisterIMInstantiateCallback(
-    Display*			/* dpy */,
-    struct _XrmHashBucketRec*	/* rdb */,
-    char*			/* res_name */,
-    char*			/* res_class */,
-    XIDProc			/* callback */,
-    XPointer			/* client_data */
-);
-
-extern Bool XUnregisterIMInstantiateCallback(
-    Display*			/* dpy */,
-    struct _XrmHashBucketRec*	/* rdb */,
-    char*			/* res_name */,
-    char*			/* res_class */,
-    XIDProc			/* callback */,
-    XPointer			/* client_data */
-);
-
-typedef void (*XConnectionWatchProc)(
-    Display*			/* dpy */,
-    XPointer			/* client_data */,
-    int				/* fd */,
-    Bool			/* opening */,	 /* open or close flag */
-    XPointer*			/* watch_data */ /* open sets, close uses */
-);
-
-
-extern Status XInternalConnectionNumbers(
-    Display*			/* dpy */,
-    int**			/* fd_return */,
-    int*			/* count_return */
-);
-
-extern void XProcessInternalConnection(
-    Display*			/* dpy */,
-    int				/* fd */
-);
-
-extern Status XAddConnectionWatch(
-    Display*			/* dpy */,
-    XConnectionWatchProc	/* callback */,
-    XPointer			/* client_data */
-);
-
-extern void XRemoveConnectionWatch(
-    Display*			/* dpy */,
-    XConnectionWatchProc	/* callback */,
-    XPointer			/* client_data */
-);
-
-extern void XSetAuthorization(
-    char *			/* name */,
-    int				/* namelen */,
-    char *			/* data */,
-    int				/* datalen */
-);
-
-extern int _Xmbtowc(
-    wchar_t *			/* wstr */,
-    char *			/* str */,
-    int				/* len */
-);
-
-extern int _Xwctomb(
-    char *			/* str */,
-    wchar_t			/* wc */
-);
-
-extern Bool XGetEventData(
-    Display*			/* dpy */,
-    XGenericEventCookie*	/* cookie*/
-);
-
-extern void XFreeEventData(
-    Display*			/* dpy */,
-    XGenericEventCookie*	/* cookie*/
-);
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _X11_XLIB_H_ */
diff --git a/openflow/usr/include/X11/XlibConf.h b/openflow/usr/include/X11/XlibConf.h
deleted file mode 100644
index 9f9b940..0000000
--- a/openflow/usr/include/X11/XlibConf.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* include/X11/XlibConf.h.  Generated from XlibConf.h.in by configure.  */
-/*
- * Copyright © 2005 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _XLIBCONF_H_
-#define _XLIBCONF_H_
-/*
- * This header file exports defines necessary to correctly
- * use Xlibint.h both inside Xlib and by external libraries
- * such as extensions.
- */
-
-/* Threading support? */
-#define XTHREADS 1
-
-/* Use multi-threaded libc functions? */
-#define XUSE_MTSAFE_API 1
-
-#endif /* _XLIBCONF_H_ */
diff --git a/openflow/usr/include/X11/Xlibint.h b/openflow/usr/include/X11/Xlibint.h
deleted file mode 100644
index 4431559..0000000
--- a/openflow/usr/include/X11/Xlibint.h
+++ /dev/null
@@ -1,1334 +0,0 @@
-
-/*
-
-Copyright 1984, 1985, 1987, 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#ifndef _X11_XLIBINT_H_
-#define _X11_XLIBINT_H_ 1
-
-/*
- *	Xlibint.h - Header definition and support file for the internal
- *	support routines used by the C subroutine interface
- *	library (Xlib) to the X Window System.
- *
- *	Warning, there be dragons here....
- */
-
-#include <X11/Xlib.h>
-#include <X11/Xproto.h>		/* to declare xEvent */
-#include <X11/XlibConf.h>	/* for configured options like XTHREADS */
-
-/* The Xlib structs are full of implicit padding to properly align members.
-   We can't clean that up without breaking ABI, so tell clang not to bother
-   complaining about it. */
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-#ifdef WIN32
-#define _XFlush _XFlushIt
-#endif
-
-/*
- * If your BytesReadable correctly detects broken connections, then
- * you should NOT define XCONN_CHECK_FREQ.
- */
-#ifndef XCONN_CHECK_FREQ
-#define XCONN_CHECK_FREQ 256
-#endif
-
-struct _XGC
-{
-    XExtData *ext_data;	/* hook for extension to hang data */
-    GContext gid;	/* protocol ID for graphics context */
-    Bool rects;		/* boolean: TRUE if clipmask is list of rectangles */
-    Bool dashes;	/* boolean: TRUE if dash-list is really a list */
-    unsigned long dirty;/* cache dirty bits */
-    XGCValues values;	/* shadow structure of values */
-};
-
-struct _XDisplay
-{
-	XExtData *ext_data;	/* hook for extension to hang data */
-	struct _XFreeFuncs *free_funcs; /* internal free functions */
-	int fd;			/* Network socket. */
-	int conn_checker;         /* ugly thing used by _XEventsQueued */
-	int proto_major_version;/* maj. version of server's X protocol */
-	int proto_minor_version;/* minor version of server's X protocol */
-	char *vendor;		/* vendor of the server hardware */
-        XID resource_base;	/* resource ID base */
-	XID resource_mask;	/* resource ID mask bits */
-	XID resource_id;	/* allocator current ID */
-	int resource_shift;	/* allocator shift to correct bits */
-	XID (*resource_alloc)(	/* allocator function */
-		struct _XDisplay*
-		);
-	int byte_order;		/* screen byte order, LSBFirst, MSBFirst */
-	int bitmap_unit;	/* padding and data requirements */
-	int bitmap_pad;		/* padding requirements on bitmaps */
-	int bitmap_bit_order;	/* LeastSignificant or MostSignificant */
-	int nformats;		/* number of pixmap formats in list */
-	ScreenFormat *pixmap_format;	/* pixmap format list */
-	int vnumber;		/* Xlib's X protocol version number. */
-	int release;		/* release of the server */
-	struct _XSQEvent *head, *tail;	/* Input event queue. */
-	int qlen;		/* Length of input event queue */
-	unsigned long last_request_read; /* seq number of last event read */
-	unsigned long request;	/* sequence number of last request. */
-	char *last_req;		/* beginning of last request, or dummy */
-	char *buffer;		/* Output buffer starting address. */
-	char *bufptr;		/* Output buffer index pointer. */
-	char *bufmax;		/* Output buffer maximum+1 address. */
-	unsigned max_request_size; /* maximum number 32 bit words in request*/
-	struct _XrmHashBucketRec *db;
-	int (*synchandler)(	/* Synchronization handler */
-		struct _XDisplay*
-		);
-	char *display_name;	/* "host:display" string used on this connect*/
-	int default_screen;	/* default screen for operations */
-	int nscreens;		/* number of screens on this server*/
-	Screen *screens;	/* pointer to list of screens */
-	unsigned long motion_buffer;	/* size of motion buffer */
-	volatile unsigned long flags;	   /* internal connection flags */
-	int min_keycode;	/* minimum defined keycode */
-	int max_keycode;	/* maximum defined keycode */
-	KeySym *keysyms;	/* This server's keysyms */
-	XModifierKeymap *modifiermap;	/* This server's modifier keymap */
-	int keysyms_per_keycode;/* number of rows */
-	char *xdefaults;	/* contents of defaults from server */
-	char *scratch_buffer;	/* place to hang scratch buffer */
-	unsigned long scratch_length;	/* length of scratch buffer */
-	int ext_number;		/* extension number on this display */
-	struct _XExten *ext_procs; /* extensions initialized on this display */
-	/*
-	 * the following can be fixed size, as the protocol defines how
-	 * much address space is available.
-	 * While this could be done using the extension vector, there
-	 * may be MANY events processed, so a search through the extension
-	 * list to find the right procedure for each event might be
-	 * expensive if many extensions are being used.
-	 */
-	Bool (*event_vec[128])(	/* vector for wire to event */
-		Display *	/* dpy */,
-		XEvent *	/* re */,
-		xEvent *	/* event */
-		);
-	Status (*wire_vec[128])( /* vector for event to wire */
-		Display *	/* dpy */,
-		XEvent *	/* re */,
-		xEvent *	/* event */
-		);
-	KeySym lock_meaning;	   /* for XLookupString */
-	struct _XLockInfo *lock;   /* multi-thread state, display lock */
-	struct _XInternalAsync *async_handlers; /* for internal async */
-	unsigned long bigreq_size; /* max size of big requests */
-	struct _XLockPtrs *lock_fns; /* pointers to threads functions */
-	void (*idlist_alloc)(	   /* XID list allocator function */
-		Display *	/* dpy */,
-		XID *		/* ids */,
-		int		/* count */
-		);
-	/* things above this line should not move, for binary compatibility */
-	struct _XKeytrans *key_bindings; /* for XLookupString */
-	Font cursor_font;	   /* for XCreateFontCursor */
-	struct _XDisplayAtoms *atoms; /* for XInternAtom */
-	unsigned int mode_switch;  /* keyboard group modifiers */
-	unsigned int num_lock;  /* keyboard numlock modifiers */
-	struct _XContextDB *context_db; /* context database */
-	Bool (**error_vec)(	/* vector for wire to error */
-		Display     *	/* display */,
-		XErrorEvent *	/* he */,
-		xError      *	/* we */
-		);
-	/*
-	 * Xcms information
-	 */
-	struct {
-	   XPointer defaultCCCs;  /* pointer to an array of default XcmsCCC */
-	   XPointer clientCmaps;  /* pointer to linked list of XcmsCmapRec */
-	   XPointer perVisualIntensityMaps;
-				  /* linked list of XcmsIntensityMap */
-	} cms;
-	struct _XIMFilter *im_filters;
-	struct _XSQEvent *qfree; /* unallocated event queue elements */
-	unsigned long next_event_serial_num; /* inserted into next queue elt */
-	struct _XExten *flushes; /* Flush hooks */
-	struct _XConnectionInfo *im_fd_info; /* _XRegisterInternalConnection */
-	int im_fd_length;	/* number of im_fd_info */
-	struct _XConnWatchInfo *conn_watchers; /* XAddConnectionWatch */
-	int watcher_count;	/* number of conn_watchers */
-	XPointer filedes;	/* struct pollfd cache for _XWaitForReadable */
-	int (*savedsynchandler)( /* user synchandler when Xlib usurps */
-		Display *	/* dpy */
-		);
-	XID resource_max;	/* allocator max ID */
-	int xcmisc_opcode;	/* major opcode for XC-MISC */
-	struct _XkbInfoRec *xkb_info; /* XKB info */
-	struct _XtransConnInfo *trans_conn; /* transport connection object */
-	struct _X11XCBPrivate *xcb; /* XCB glue private data */
-
-	/* Generic event cookie handling */
-	unsigned int next_cookie; /* next event cookie */
-	/* vector for wire to generic event, index is (extension - 128) */
-	Bool (*generic_event_vec[128])(
-		Display *	/* dpy */,
-		XGenericEventCookie *	/* Xlib event */,
-		xEvent *	/* wire event */);
-	/* vector for event copy, index is (extension - 128) */
-	Bool (*generic_event_copy_vec[128])(
-		Display *	/* dpy */,
-		XGenericEventCookie *	/* in */,
-		XGenericEventCookie *   /* out*/);
-	void *cookiejar;  /* cookie events returned but not claimed */
-};
-
-#define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
-
-#ifndef _XEVENT_
-/*
- * _QEvent datatype for use in input queueing.
- */
-typedef struct _XSQEvent
-{
-    struct _XSQEvent *next;
-    XEvent event;
-    unsigned long qserial_num;	/* so multi-threaded code can find new ones */
-} _XQEvent;
-#endif
-
-#include <X11/Xproto.h>
-#ifdef __sgi
-#define _SGI_MP_SOURCE  /* turn this on to get MP safe errno */
-#endif
-#include <errno.h>
-#define _XBCOPYFUNC _Xbcopy
-#include <X11/Xfuncs.h>
-#include <X11/Xosdefs.h>
-
-/* Utek leaves kernel macros around in include files (bleah) */
-#ifdef dirty
-#undef dirty
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-/*
- * The following definitions can be used for locking requests in multi-threaded
- * address spaces.
- */
-#ifdef XTHREADS
-/* Author: Stephen Gildea, MIT X Consortium
- *
- * declarations for C Threads locking
- */
-
-typedef struct _LockInfoRec *LockInfoPtr;
-
-/* interfaces for locking.c */
-struct _XLockPtrs {
-    /* used by all, including extensions; do not move */
-    void (*lock_display)(
-		Display *dpy
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-		, char *file
-		, int line
-#endif
-	);
-    void (*unlock_display)(
-		Display *dpy
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-		, char *file
-		, int line
-#endif
-	);
-};
-
-#if defined(WIN32) && !defined(_XLIBINT_)
-#define _XCreateMutex_fn (*_XCreateMutex_fn_p)
-#define _XFreeMutex_fn (*_XFreeMutex_fn_p)
-#define _XLockMutex_fn (*_XLockMutex_fn_p)
-#define _XUnlockMutex_fn (*_XUnlockMutex_fn_p)
-#define _Xglobal_lock (*_Xglobal_lock_p)
-#endif
-
-/* in XlibInt.c */
-extern void (*_XCreateMutex_fn)(
-    LockInfoPtr /* lock */
-);
-extern void (*_XFreeMutex_fn)(
-    LockInfoPtr /* lock */
-);
-extern void (*_XLockMutex_fn)(
-    LockInfoPtr	/* lock */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-    , char * /* file */
-    , int /* line */
-#endif
-);
-extern void (*_XUnlockMutex_fn)(
-    LockInfoPtr	/* lock */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-    , char * /* file */
-    , int /* line */
-#endif
-);
-
-extern LockInfoPtr _Xglobal_lock;
-
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-#define LockDisplay(d)	     if ((d)->lock_fns) (*(d)->lock_fns->lock_display)((d),__FILE__,__LINE__)
-#define UnlockDisplay(d)     if ((d)->lock_fns) (*(d)->lock_fns->unlock_display)((d),__FILE__,__LINE__)
-#define _XLockMutex(lock)		if (_XLockMutex_fn) (*_XLockMutex_fn)(lock,__FILE__,__LINE__)
-#define _XUnlockMutex(lock)	if (_XUnlockMutex_fn) (*_XUnlockMutex_fn)(lock,__FILE__,__LINE__)
-#else
-/* used everywhere, so must be fast if not using threads */
-#define LockDisplay(d)	     if ((d)->lock_fns) (*(d)->lock_fns->lock_display)(d)
-#define UnlockDisplay(d)     if ((d)->lock_fns) (*(d)->lock_fns->unlock_display)(d)
-#define _XLockMutex(lock)		if (_XLockMutex_fn) (*_XLockMutex_fn)(lock)
-#define _XUnlockMutex(lock)	if (_XUnlockMutex_fn) (*_XUnlockMutex_fn)(lock)
-#endif
-#define _XCreateMutex(lock)	if (_XCreateMutex_fn) (*_XCreateMutex_fn)(lock);
-#define _XFreeMutex(lock)	if (_XFreeMutex_fn) (*_XFreeMutex_fn)(lock);
-
-#else /* XTHREADS */
-#define LockDisplay(dis)
-#define _XLockMutex(lock)
-#define _XUnlockMutex(lock)
-#define UnlockDisplay(dis)
-#define _XCreateMutex(lock)
-#define _XFreeMutex(lock)
-#endif
-
-#define Xfree(ptr) free((ptr))
-
-/*
- * Note that some machines do not return a valid pointer for malloc(0), in
- * which case we provide an alternate under the control of the
- * define MALLOC_0_RETURNS_NULL.  This is necessary because some
- * Xlib code expects malloc(0) to return a valid pointer to storage.
- */
-#if defined(MALLOC_0_RETURNS_NULL) || defined(__clang_analyzer__)
-
-# define Xmalloc(size) malloc(((size) == 0 ? 1 : (size)))
-# define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size)))
-# define Xcalloc(nelem, elsize) calloc(((nelem) == 0 ? 1 : (nelem)), (elsize))
-
-#else
-
-# define Xmalloc(size) malloc((size))
-# define Xrealloc(ptr, size) realloc((ptr), (size))
-# define Xcalloc(nelem, elsize) calloc((nelem), (elsize))
-
-#endif
-
-#include <stddef.h>
-
-#define LOCKED 1
-#define UNLOCKED 0
-
-#ifndef BUFSIZE
-#define BUFSIZE 2048			/* X output buffer size. */
-#endif
-#ifndef PTSPERBATCH
-#define PTSPERBATCH 1024		/* point batching */
-#endif
-#ifndef WLNSPERBATCH
-#define WLNSPERBATCH 50			/* wide line batching */
-#endif
-#ifndef ZLNSPERBATCH
-#define ZLNSPERBATCH 1024		/* thin line batching */
-#endif
-#ifndef WRCTSPERBATCH
-#define WRCTSPERBATCH 10		/* wide line rectangle batching */
-#endif
-#ifndef ZRCTSPERBATCH
-#define ZRCTSPERBATCH 256		/* thin line rectangle batching */
-#endif
-#ifndef FRCTSPERBATCH
-#define FRCTSPERBATCH 256		/* filled rectangle batching */
-#endif
-#ifndef FARCSPERBATCH
-#define FARCSPERBATCH 256		/* filled arc batching */
-#endif
-#ifndef CURSORFONT
-#define CURSORFONT "cursor"		/* standard cursor fonts */
-#endif
-
-/*
- * Display flags
- */
-#define XlibDisplayIOError	(1L << 0)
-#define XlibDisplayClosing	(1L << 1)
-#define XlibDisplayNoXkb	(1L << 2)
-#define XlibDisplayPrivSync	(1L << 3)
-#define XlibDisplayProcConni	(1L << 4) /* in _XProcessInternalConnection */
-#define XlibDisplayReadEvents	(1L << 5) /* in _XReadEvents */
-#define XlibDisplayReply	(1L << 5) /* in _XReply */
-#define XlibDisplayWriting	(1L << 6) /* in _XFlushInt, _XSend */
-#define XlibDisplayDfltRMDB     (1L << 7) /* mark if RM db from XGetDefault */
-
-/*
- * X Protocol packetizing macros.
- */
-
-/* Leftover from CRAY support - was defined empty on all non-Cray systems */
-#define WORD64ALIGN
-
-/**
- * Return a len-sized request buffer for the request type. This function may
- * flush the output queue.
- *
- * @param dpy The display connection
- * @param type The request type
- * @param len Length of the request in bytes
- *
- * @returns A pointer to the request buffer with a few default values
- * initialized.
- */
-extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);
-
-/* GetReqSized is the same as GetReq but allows the caller to specify the
- * size in bytes. 'sz' must be a multiple of 4! */
-
-#define GetReqSized(name, sz, req) \
-	req = (x##name##Req *) _XGetRequest(dpy, X_##name, sz)
-
-/*
- * GetReq - Get the next available X request packet in the buffer and
- * return it.
- *
- * "name" is the name of the request, e.g. CreatePixmap, OpenFont, etc.
- * "req" is the name of the request pointer.
- *
- */
-
-#define GetReq(name, req) \
-	GetReqSized(name, SIZEOF(x##name##Req), req)
-
-/* GetReqExtra is the same as GetReq, but allocates "n" additional
-   bytes after the request. "n" must be a multiple of 4!  */
-
-#define GetReqExtra(name, n, req) \
-        GetReqSized(name, SIZEOF(x##name##Req) + n, req)
-
-/*
- * GetResReq is for those requests that have a resource ID
- * (Window, Pixmap, GContext, etc.) as their single argument.
- * "rid" is the name of the resource.
- */
-
-#define GetResReq(name, rid, req) \
-	req = (xResourceReq *) _XGetRequest(dpy, X_##name, SIZEOF(xResourceReq)); \
-	req->id = (rid)
-
-/*
- * GetEmptyReq is for those requests that have no arguments
- * at all.
- */
-
-#define GetEmptyReq(name, req) \
-	req = (xReq *) _XGetRequest(dpy, X_##name, SIZEOF(xReq))
-
-/*
- * MakeBigReq sets the CARD16 "req->length" to 0 and inserts a new CARD32
- * length, after req->length, before the data in the request.  The new length
- * includes the "n" extra 32-bit words.
- *
- * Do not use MakeBigReq if there is no data already in the request.
- * req->length must already be >= 2.
- */
-#ifdef LONG64
-#define MakeBigReq(req,n) \
-    { \
-    CARD64 _BRdat; \
-    CARD32 _BRlen = req->length - 1; \
-    req->length = 0; \
-    _BRdat = ((CARD32 *)req)[_BRlen]; \
-    memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) << 2); \
-    ((CARD32 *)req)[1] = _BRlen + n + 2; \
-    Data32(dpy, &_BRdat, 4); \
-    }
-#else
-#define MakeBigReq(req,n) \
-    { \
-    CARD32 _BRdat; \
-    CARD32 _BRlen = req->length - 1; \
-    req->length = 0; \
-    _BRdat = ((CARD32 *)req)[_BRlen]; \
-    memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) << 2); \
-    ((CARD32 *)req)[1] = _BRlen + n + 2; \
-    Data32(dpy, &_BRdat, 4); \
-    }
-#endif
-
-/*
- * SetReqLen increases the count of 32-bit words in the request by "n",
- * or by "badlen" if "n" is too large.
- *
- * Do not use SetReqLen if "req" does not already have data after the
- * xReq header.  req->length must already be >= 2.
- */
-#ifndef __clang_analyzer__
-#define SetReqLen(req,n,badlen) \
-    if ((req->length + n) > (unsigned)65535) { \
-	if (dpy->bigreq_size) { \
-	    MakeBigReq(req,n) \
-	} else { \
-	    n = badlen; \
-	    req->length += n; \
-	} \
-    } else \
-	req->length += n
-#else
-#define SetReqLen(req,n,badlen) \
-    req->length += n
-#endif
-
-#define SyncHandle() \
-	if (dpy->synchandler) (*dpy->synchandler)(dpy)
-
-extern void _XFlushGCCache(Display *dpy, GC gc);
-#define FlushGC(dpy, gc) \
-	if ((gc)->dirty) _XFlushGCCache((dpy), (gc))
-/*
- * Data - Place data in the buffer and pad the end to provide
- * 32 bit word alignment.  Transmit if the buffer fills.
- *
- * "dpy" is a pointer to a Display.
- * "data" is a pointer to a data buffer.
- * "len" is the length of the data buffer.
- */
-#ifndef DataRoutineIsProcedure
-#define Data(dpy, data, len) {\
-	if (dpy->bufptr + (len) <= dpy->bufmax) {\
-		memcpy(dpy->bufptr, data, (int)len);\
-		dpy->bufptr += ((len) + 3) & ~3;\
-	} else\
-		_XSend(dpy, data, len);\
-}
-#endif /* DataRoutineIsProcedure */
-
-
-/* Allocate bytes from the buffer.  No padding is done, so if
- * the length is not a multiple of 4, the caller must be
- * careful to leave the buffer aligned after sending the
- * current request.
- *
- * "type" is the type of the pointer being assigned to.
- * "ptr" is the pointer being assigned to.
- * "n" is the number of bytes to allocate.
- *
- * Example:
- *    xTextElt *elt;
- *    BufAlloc (xTextElt *, elt, nbytes)
- */
-
-#define BufAlloc(type, ptr, n) \
-    if (dpy->bufptr + (n) > dpy->bufmax) \
-        _XFlush (dpy); \
-    ptr = (type) dpy->bufptr; \
-    memset(ptr, '\0', n); \
-    dpy->bufptr += (n);
-
-#define Data16(dpy, data, len) Data((dpy), (_Xconst char *)(data), (len))
-#define _XRead16Pad(dpy, data, len) _XReadPad((dpy), (char *)(data), (len))
-#define _XRead16(dpy, data, len) _XRead((dpy), (char *)(data), (len))
-#ifdef LONG64
-#define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)data, len)
-extern int _XData32(
-	     Display *dpy,
-	     register _Xconst long *data,
-	     unsigned len
-);
-extern void _XRead32(
-	     Display *dpy,
-	     register long *data,
-	     long len
-);
-#else
-#define Data32(dpy, data, len) Data((dpy), (_Xconst char *)(data), (len))
-#define _XRead32(dpy, data, len) _XRead((dpy), (char *)(data), (len))
-#endif
-
-#define PackData16(dpy,data,len) Data16 (dpy, data, len)
-#define PackData32(dpy,data,len) Data32 (dpy, data, len)
-
-/* Xlib manual is bogus */
-#define PackData(dpy,data,len) PackData16 (dpy, data, len)
-
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#define max(a,b) (((a) > (b)) ? (a) : (b))
-
-#define CI_NONEXISTCHAR(cs) (((cs)->width == 0) && \
-			     (((cs)->rbearing|(cs)->lbearing| \
-			       (cs)->ascent|(cs)->descent) == 0))
-
-/*
- * CI_GET_CHAR_INFO_1D - return the charinfo struct for the indicated 8bit
- * character.  If the character is in the column and exists, then return the
- * appropriate metrics (note that fonts with common per-character metrics will
- * return min_bounds).  If none of these hold true, try again with the default
- * char.
- */
-#define CI_GET_CHAR_INFO_1D(fs,col,def,cs) \
-{ \
-    cs = def; \
-    if (col >= fs->min_char_or_byte2 && col <= fs->max_char_or_byte2) { \
-	if (fs->per_char == NULL) { \
-	    cs = &fs->min_bounds; \
-	} else { \
-	    cs = &fs->per_char[(col - fs->min_char_or_byte2)]; \
-	    if (CI_NONEXISTCHAR(cs)) cs = def; \
-	} \
-    } \
-}
-
-#define CI_GET_DEFAULT_INFO_1D(fs,cs) \
-  CI_GET_CHAR_INFO_1D (fs, fs->default_char, NULL, cs)
-
-
-
-/*
- * CI_GET_CHAR_INFO_2D - return the charinfo struct for the indicated row and
- * column.  This is used for fonts that have more than row zero.
- */
-#define CI_GET_CHAR_INFO_2D(fs,row,col,def,cs) \
-{ \
-    cs = def; \
-    if (row >= fs->min_byte1 && row <= fs->max_byte1 && \
-	col >= fs->min_char_or_byte2 && col <= fs->max_char_or_byte2) { \
-	if (fs->per_char == NULL) { \
-	    cs = &fs->min_bounds; \
-	} else { \
-	    cs = &fs->per_char[((row - fs->min_byte1) * \
-			        (fs->max_char_or_byte2 - \
-				 fs->min_char_or_byte2 + 1)) + \
-			       (col - fs->min_char_or_byte2)]; \
-	    if (CI_NONEXISTCHAR(cs)) cs = def; \
-        } \
-    } \
-}
-
-#define CI_GET_DEFAULT_INFO_2D(fs,cs) \
-{ \
-    unsigned int r = (fs->default_char >> 8); \
-    unsigned int c = (fs->default_char & 0xff); \
-    CI_GET_CHAR_INFO_2D (fs, r, c, NULL, cs); \
-}
-
-
-/* srcvar must be a variable for large architecture version */
-#define OneDataCard32(dpy,dstaddr,srcvar) \
-  { *(CARD32 *)(dstaddr) = (srcvar); }
-
-
-typedef struct _XInternalAsync {
-    struct _XInternalAsync *next;
-    /*
-     * handler arguments:
-     * rep is the generic reply that caused this handler
-     * to be invoked.  It must also be passed to _XGetAsyncReply.
-     * buf and len are opaque values that must be passed to
-     * _XGetAsyncReply or _XGetAsyncData.
-     * data is the closure stored in this struct.
-     * The handler returns True iff it handled this reply.
-     */
-    Bool (*handler)(
-		    Display*	/* dpy */,
-		    xReply*	/* rep */,
-		    char*	/* buf */,
-		    int		/* len */,
-		    XPointer	/* data */
-		    );
-    XPointer data;
-} _XAsyncHandler;
-
-typedef struct _XAsyncEState {
-    unsigned long min_sequence_number;
-    unsigned long max_sequence_number;
-    unsigned char error_code;
-    unsigned char major_opcode;
-    unsigned short minor_opcode;
-    unsigned char last_error_received;
-    int error_count;
-} _XAsyncErrorState;
-
-extern void _XDeqAsyncHandler(Display *dpy, _XAsyncHandler *handler);
-#define DeqAsyncHandler(dpy,handler) { \
-    if (dpy->async_handlers == (handler)) \
-	dpy->async_handlers = (handler)->next; \
-    else \
-	_XDeqAsyncHandler(dpy, handler); \
-    }
-
-typedef void (*FreeFuncType) (
-    Display*	/* display */
-);
-
-typedef int (*FreeModmapType) (
-    XModifierKeymap*	/* modmap */
-);
-
-/*
- * This structure is private to the library.
- */
-typedef struct _XFreeFuncs {
-    FreeFuncType atoms;		/* _XFreeAtomTable */
-    FreeModmapType modifiermap;	/* XFreeModifiermap */
-    FreeFuncType key_bindings;	/* _XFreeKeyBindings */
-    FreeFuncType context_db;	/* _XFreeContextDB */
-    FreeFuncType defaultCCCs;	/* _XcmsFreeDefaultCCCs */
-    FreeFuncType clientCmaps;	/* _XcmsFreeClientCmaps */
-    FreeFuncType intensityMaps;	/* _XcmsFreeIntensityMaps */
-    FreeFuncType im_filters;	/* _XFreeIMFilters */
-    FreeFuncType xkb;		/* _XkbFreeInfo */
-} _XFreeFuncRec;
-
-/* types for InitExt.c */
-typedef int (*CreateGCType) (
-    Display*	/* display */,
-    GC		/* gc */,
-    XExtCodes*	/* codes */
-);
-
-typedef int (*CopyGCType)(
-    Display*	/* display */,
-    GC		/* gc */,
-    XExtCodes*	/* codes */
-);
-
-typedef int (*FlushGCType) (
-    Display*	/* display */,
-    GC		/* gc */,
-    XExtCodes*	/* codes */
-);
-
-typedef int (*FreeGCType) (
-    Display*	/* display */,
-    GC		/* gc */,
-    XExtCodes*	/* codes */
-);
-
-typedef int (*CreateFontType) (
-    Display*	/* display */,
-    XFontStruct* /* fs */,
-    XExtCodes*	/* codes */
-);
-
-typedef int (*FreeFontType) (
-    Display*	/* display */,
-    XFontStruct* /* fs */,
-    XExtCodes*	/* codes */
-);
-
-typedef int (*CloseDisplayType) (
-    Display*	/* display */,
-    XExtCodes*	/* codes */
-);
-
-typedef int (*ErrorType) (
-    Display*	/* display */,
-    xError*	/* err */,
-    XExtCodes*	/* codes */,
-    int*	/* ret_code */
-);
-
-typedef char* (*ErrorStringType) (
-    Display*	/* display */,
-    int		/* code */,
-    XExtCodes*	/* codes */,
-    char*	/* buffer */,
-    int		/* nbytes */
-);
-
-typedef void (*PrintErrorType)(
-    Display*	/* display */,
-    XErrorEvent* /* ev */,
-    void*	/* fp */
-);
-
-typedef void (*BeforeFlushType)(
-    Display*	/* display */,
-    XExtCodes*	/* codes */,
-    _Xconst char* /* data */,
-    long	/* len */
-);
-
-/*
- * This structure is private to the library.
- */
-typedef struct _XExten {		/* private to extension mechanism */
-	struct _XExten *next;		/* next in list */
-	XExtCodes codes;		/* public information, all extension told */
-	CreateGCType create_GC;		/* routine to call when GC created */
-	CopyGCType copy_GC;		/* routine to call when GC copied */
-	FlushGCType flush_GC;		/* routine to call when GC flushed */
-	FreeGCType free_GC;		/* routine to call when GC freed */
-	CreateFontType create_Font;	/* routine to call when Font created */
-	FreeFontType free_Font;		/* routine to call when Font freed */
-	CloseDisplayType close_display;	/* routine to call when connection closed */
-	ErrorType error;		/* who to call when an error occurs */
-	ErrorStringType error_string;	/* routine to supply error string */
-	char *name;			/* name of this extension */
-	PrintErrorType error_values;	/* routine to supply error values */
-	BeforeFlushType before_flush;	/* routine to call when sending data */
-	struct _XExten *next_flush;	/* next in list of those with flushes */
-} _XExtension;
-
-/* Temporary definition until we can depend on an xproto release with it */
-#ifdef _X_COLD
-# define _XLIB_COLD _X_COLD
-#elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403) /* 4.3+ */
-# define _XLIB_COLD __attribute__((__cold__))
-#else
-# define _XLIB_COLD /* nothing */
-#endif
-
-/* extension hooks */
-
-#ifdef DataRoutineIsProcedure
-extern void Data(Display *dpy, char *data, long len);
-#endif
-extern int _XError(
-    Display*	/* dpy */,
-    xError*	/* rep */
-);
-extern int _XIOError(
-    Display*	/* dpy */
-) _X_NORETURN;
-extern int (*_XIOErrorFunction)(
-    Display*	/* dpy */
-);
-extern int (*_XErrorFunction)(
-    Display*		/* dpy */,
-    XErrorEvent*	/* error_event */
-);
-extern void _XEatData(
-    Display*		/* dpy */,
-    unsigned long	/* n */
-) _XLIB_COLD;
-extern void _XEatDataWords(
-    Display*		/* dpy */,
-    unsigned long	/* n */
-) _XLIB_COLD;
-#if defined(__SUNPRO_C) /* Studio compiler alternative to "cold" attribute */
-# pragma rarely_called(_XEatData, _XEatDataWords)
-#endif
-extern char *_XAllocScratch(
-    Display*		/* dpy */,
-    unsigned long	/* nbytes */
-);
-extern char *_XAllocTemp(
-    Display*		/* dpy */,
-    unsigned long	/* nbytes */
-);
-extern void _XFreeTemp(
-    Display*		/* dpy */,
-    char*		/* buf */,
-    unsigned long	/* nbytes */
-);
-extern Visual *_XVIDtoVisual(
-    Display*	/* dpy */,
-    VisualID	/* id */
-);
-extern unsigned long _XSetLastRequestRead(
-    Display*		/* dpy */,
-    xGenericReply*	/* rep */
-);
-extern int _XGetHostname(
-    char*	/* buf */,
-    int		/* maxlen */
-);
-extern Screen *_XScreenOfWindow(
-    Display*	/* dpy */,
-    Window	/* w */
-);
-extern Bool _XAsyncErrorHandler(
-    Display*	/* dpy */,
-    xReply*	/* rep */,
-    char*	/* buf */,
-    int		/* len */,
-    XPointer	/* data */
-);
-extern char *_XGetAsyncReply(
-    Display*	/* dpy */,
-    char*	/* replbuf */,
-    xReply*	/* rep */,
-    char*	/* buf */,
-    int		/* len */,
-    int		/* extra */,
-    Bool	/* discard */
-);
-extern void _XGetAsyncData(
-    Display*	/* dpy */,
-    char *	/* data */,
-    char *	/* buf */,
-    int		/* len */,
-    int		/* skip */,
-    int		/* datalen */,
-    int		/* discardtotal */
-);
-extern void _XFlush(
-    Display*	/* dpy */
-);
-extern int _XEventsQueued(
-    Display*	/* dpy */,
-    int 	/* mode */
-);
-extern void _XReadEvents(
-    Display*	/* dpy */
-);
-extern int _XRead(
-    Display*	/* dpy */,
-    char*	/* data */,
-    long	/* size */
-);
-extern void _XReadPad(
-    Display*	/* dpy */,
-    char*	/* data */,
-    long	/* size */
-);
-extern void _XSend(
-    Display*		/* dpy */,
-    _Xconst char*	/* data */,
-    long		/* size */
-);
-extern Status _XReply(
-    Display*	/* dpy */,
-    xReply*	/* rep */,
-    int		/* extra */,
-    Bool	/* discard */
-);
-extern void _XEnq(
-    Display*	/* dpy */,
-    xEvent*	/* event */
-);
-extern void _XDeq(
-    Display*	/* dpy */,
-    _XQEvent*	/* prev */,
-    _XQEvent*	/* qelt */
-);
-
-extern Bool _XUnknownWireEvent(
-    Display*	/* dpy */,
-    XEvent*	/* re */,
-    xEvent*	/* event */
-);
-
-extern Bool _XUnknownWireEventCookie(
-    Display*	/* dpy */,
-    XGenericEventCookie*	/* re */,
-    xEvent*	/* event */
-);
-
-extern Bool _XUnknownCopyEventCookie(
-    Display*	/* dpy */,
-    XGenericEventCookie*	/* in */,
-    XGenericEventCookie*	/* out */
-);
-
-extern Status _XUnknownNativeEvent(
-    Display*	/* dpy */,
-    XEvent*	/* re */,
-    xEvent*	/* event */
-);
-
-extern Bool _XWireToEvent(Display *dpy, XEvent *re, xEvent *event);
-extern Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we);
-extern Bool _XPollfdCacheInit(Display *dpy);
-extern void _XPollfdCacheAdd(Display *dpy, int fd);
-extern void _XPollfdCacheDel(Display *dpy, int fd);
-extern XID _XAllocID(Display *dpy);
-extern void _XAllocIDs(Display *dpy, XID *ids, int count);
-
-extern int _XFreeExtData(
-    XExtData*	/* extension */
-);
-
-extern int (*XESetCreateGC(
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-	      Display*			/* display */,
-	      GC			/* gc */,
-	      XExtCodes*		/* codes */
-	    )		/* proc */
-))(
-    Display*, GC, XExtCodes*
-);
-
-extern int (*XESetCopyGC(
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-	      Display*			/* display */,
-              GC			/* gc */,
-              XExtCodes*		/* codes */
-            )		/* proc */
-))(
-    Display*, GC, XExtCodes*
-);
-
-extern int (*XESetFlushGC(
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-	      Display*			/* display */,
-              GC			/* gc */,
-              XExtCodes*		/* codes */
-            )		/* proc */
-))(
-    Display*, GC, XExtCodes*
-);
-
-extern int (*XESetFreeGC(
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-	      Display*			/* display */,
-              GC			/* gc */,
-              XExtCodes*		/* codes */
-            )		/* proc */
-))(
-    Display*, GC, XExtCodes*
-);
-
-extern int (*XESetCreateFont(
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-	      Display*			/* display */,
-              XFontStruct*		/* fs */,
-              XExtCodes*		/* codes */
-            )		/* proc */
-))(
-    Display*, XFontStruct*, XExtCodes*
-);
-
-extern int (*XESetFreeFont(
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-	      Display*			/* display */,
-              XFontStruct*		/* fs */,
-              XExtCodes*		/* codes */
-            )		/* proc */
-))(
-    Display*, XFontStruct*, XExtCodes*
-);
-
-extern int (*XESetCloseDisplay(
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-	      Display*			/* display */,
-              XExtCodes*		/* codes */
-            )		/* proc */
-))(
-    Display*, XExtCodes*
-);
-
-extern int (*XESetError(
-    Display*		/* display */,
-    int			/* extension */,
-    int (*) (
-	      Display*			/* display */,
-              xError*			/* err */,
-              XExtCodes*		/* codes */,
-              int*			/* ret_code */
-            )		/* proc */
-))(
-    Display*, xError*, XExtCodes*, int*
-);
-
-extern char* (*XESetErrorString(
-    Display*		/* display */,
-    int			/* extension */,
-    char* (*) (
-	        Display*		/* display */,
-                int			/* code */,
-                XExtCodes*		/* codes */,
-                char*			/* buffer */,
-                int			/* nbytes */
-              )		/* proc */
-))(
-    Display*, int, XExtCodes*, char*, int
-);
-
-extern void (*XESetPrintErrorValues (
-    Display*		/* display */,
-    int			/* extension */,
-    void (*)(
-	      Display*			/* display */,
-	      XErrorEvent*		/* ev */,
-	      void*			/* fp */
-	     )		/* proc */
-))(
-    Display*, XErrorEvent*, void*
-);
-
-extern Bool (*XESetWireToEvent(
-    Display*		/* display */,
-    int			/* event_number */,
-    Bool (*) (
-	       Display*			/* display */,
-               XEvent*			/* re */,
-               xEvent*			/* event */
-             )		/* proc */
-))(
-    Display*, XEvent*, xEvent*
-);
-
-extern Bool (*XESetWireToEventCookie(
-    Display*		/* display */,
-    int			/* extension */,
-    Bool (*) (
-	       Display*			/* display */,
-               XGenericEventCookie*	/* re */,
-               xEvent*			/* event */
-             )		/* proc */
-))(
-    Display*, XGenericEventCookie*, xEvent*
-);
-
-extern Bool (*XESetCopyEventCookie(
-    Display*		/* display */,
-    int			/* extension */,
-    Bool (*) (
-	       Display*			/* display */,
-               XGenericEventCookie*	/* in */,
-               XGenericEventCookie*	/* out */
-             )		/* proc */
-))(
-    Display*, XGenericEventCookie*, XGenericEventCookie*
-);
-
-
-extern Status (*XESetEventToWire(
-    Display*		/* display */,
-    int			/* event_number */,
-    Status (*) (
-	      Display*			/* display */,
-              XEvent*			/* re */,
-              xEvent*			/* event */
-            )		/* proc */
-))(
-    Display*, XEvent*, xEvent*
-);
-
-extern Bool (*XESetWireToError(
-    Display*		/* display */,
-    int			/* error_number */,
-    Bool (*) (
-	       Display*			/* display */,
-	       XErrorEvent*		/* he */,
-	       xError*			/* we */
-            )		/* proc */
-))(
-    Display*, XErrorEvent*, xError*
-);
-
-extern void (*XESetBeforeFlush(
-    Display*		/* display */,
-    int			/* error_number */,
-    void (*) (
-	       Display*			/* display */,
-	       XExtCodes*		/* codes */,
-	       _Xconst char*		/* data */,
-	       long			/* len */
-            )		/* proc */
-))(
-    Display*, XExtCodes*, _Xconst char*, long
-);
-
-/* internal connections for IMs */
-
-typedef void (*_XInternalConnectionProc)(
-    Display*			/* dpy */,
-    int				/* fd */,
-    XPointer			/* call_data */
-);
-
-
-extern Status _XRegisterInternalConnection(
-    Display*			/* dpy */,
-    int				/* fd */,
-    _XInternalConnectionProc	/* callback */,
-    XPointer			/* call_data */
-);
-
-extern void _XUnregisterInternalConnection(
-    Display*			/* dpy */,
-    int				/* fd */
-);
-
-extern void _XProcessInternalConnection(
-    Display*			/* dpy */,
-    struct _XConnectionInfo*	/* conn_info */
-);
-
-/* Display structure has pointers to these */
-
-struct _XConnectionInfo {	/* info from _XRegisterInternalConnection */
-    int fd;
-    _XInternalConnectionProc read_callback;
-    XPointer call_data;
-    XPointer *watch_data;	/* set/used by XConnectionWatchProc */
-    struct _XConnectionInfo *next;
-};
-
-struct _XConnWatchInfo {	/* info from XAddConnectionWatch */
-    XConnectionWatchProc fn;
-    XPointer client_data;
-    struct _XConnWatchInfo *next;
-};
-
-#ifdef __UNIXOS2__
-extern char* __XOS2RedirRoot(
-    char*
-);
-#endif
-
-extern int _XTextHeight(
-    XFontStruct*	/* font_struct */,
-    _Xconst char*	/* string */,
-    int			/* count */
-);
-
-extern int _XTextHeight16(
-    XFontStruct*	/* font_struct */,
-    _Xconst XChar2b*	/* string */,
-    int			/* count */
-);
-
-#if defined(WIN32)
-
-extern int _XOpenFile(
-    _Xconst char*	/* path */,
-    int			/* flags */
-);
-
-extern int _XOpenFileMode(
-    _Xconst char*	/* path */,
-    int			/* flags */,
-    mode_t              /* mode */
-);
-
-extern void* _XFopenFile(
-    _Xconst char*	/* path */,
-    _Xconst char*	/* mode */
-);
-
-extern int _XAccessFile(
-    _Xconst char*	/* path */
-);
-#else
-#define _XOpenFile(path,flags) open(path,flags)
-#define _XOpenFileMode(path,flags,mode) open(path,flags,mode)
-#define _XFopenFile(path,mode) fopen(path,mode)
-#endif
-
-/* EvToWire.c */
-extern Status _XEventToWire(Display *dpy, XEvent *re, xEvent *event);
-
-extern int _XF86LoadQueryLocaleFont(
-    Display*		/* dpy */,
-    _Xconst char*	/* name*/,
-    XFontStruct**	/* xfp*/,
-    Font*		/* fidp */
-);
-
-extern void _XProcessWindowAttributes (
-    register Display *dpy,
-    xChangeWindowAttributesReq *req,
-    register unsigned long valuemask,
-    register XSetWindowAttributes *attributes);
-
-extern int _XDefaultError(
-        Display *dpy,
-        XErrorEvent *event);
-
-extern int _XDefaultIOError(
-        Display *dpy);
-
-extern void _XSetClipRectangles (
-    register Display *dpy,
-    GC gc,
-    int clip_x_origin, int clip_y_origin,
-    XRectangle *rectangles,
-    int n,
-    int ordering);
-
-Status _XGetWindowAttributes(
-    register Display *dpy,
-    Window w,
-    XWindowAttributes *attr);
-
-int _XPutBackEvent (
-    register Display *dpy,
-    register XEvent *event);
-
-extern Bool _XIsEventCookie(
-        Display *dpy,
-        XEvent *ev);
-
-extern void _XFreeEventCookies(
-        Display *dpy);
-
-extern void _XStoreEventCookie(
-        Display *dpy,
-        XEvent *ev);
-
-extern Bool _XFetchEventCookie(
-        Display *dpy,
-        XGenericEventCookie *ev);
-
-extern Bool _XCopyEventCookie(
-        Display *dpy,
-        XGenericEventCookie *in,
-        XGenericEventCookie *out);
-
-/* lcFile.c */
-
-extern void xlocaledir(
-    char *buf,
-    int buf_len
-);
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _X11_XLIBINT_H_ */
diff --git a/openflow/usr/include/X11/Xlocale.h b/openflow/usr/include/X11/Xlocale.h
deleted file mode 100644
index db46e70..0000000
--- a/openflow/usr/include/X11/Xlocale.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-
-Copyright 1991, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#ifndef _X11_XLOCALE_H_
-#define _X11_XLOCALE_H_
-
-#include <X11/Xfuncproto.h>
-#include <X11/Xosdefs.h>
-
-#include <locale.h>
-
-#endif /* _X11_XLOCALE_H_ */
diff --git a/openflow/usr/include/X11/Xmd.h b/openflow/usr/include/X11/Xmd.h
deleted file mode 100644
index 492465e..0000000
--- a/openflow/usr/include/X11/Xmd.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-#ifndef XMD_H
-# define XMD_H 1
-/*
- *  Xmd.h: MACHINE DEPENDENT DECLARATIONS.
- */
-
-/*
- * Special per-machine configuration flags.
- */
-# if defined(__sun) && defined(__SVR4)
-#  include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
-# endif
-
-# if defined (_LP64) || defined(__LP64__) || \
-     defined(__alpha) || defined(__alpha__) || \
-     defined(__ia64__) || defined(ia64) || \
-     defined(__sparc64__) || \
-     defined(__s390x__) || \
-     defined(__amd64__) || defined(amd64) || \
-     defined(__powerpc64__)
-#  if !defined(__ILP32__) /* amd64-x32 is 32bit */
-#   define LONG64				/* 32/64-bit architecture */
-#  endif /* !__ILP32__ */
-# endif
-
-/*
- * Definition of macro used to set constants for size of network structures;
- * machines with preprocessors that can't handle all of the sz_ symbols
- * can define this macro to be sizeof(x) if and only if their compiler doesn't
- * pad out structures (esp. the xTextElt structure which contains only two
- * one-byte fields).  Network structures should always define sz_symbols.
- *
- * The sz_ prefix is used instead of something more descriptive so that the
- * symbols are no more than 32 characters long (which causes problems for some
- * compilers and preprocessors).
- *
- * The extra indirection is to get macro arguments to expand correctly before
- * the concatenation, rather than afterward.
- */
-# define _SIZEOF(x) sz_##x
-# define SIZEOF(x) _SIZEOF(x)
-
-/*
- * Bitfield suffixes for the protocol structure elements, if you
- * need them.  Note that bitfields are not guaranteed to be signed
- * (or even unsigned) according to ANSI C.
- */
-# define B32 /* bitfield not needed on architectures with native 32-bit type */
-# define B16 /* bitfield not needed on architectures with native 16-bit type */
-# ifdef LONG64
-typedef long INT64;
-typedef int INT32;
-# else
-typedef long INT32;
-# endif
-typedef short INT16;
-
-typedef signed char    INT8;
-
-# ifdef LONG64
-typedef unsigned long CARD64;
-typedef unsigned int CARD32;
-# else
-typedef unsigned long long CARD64;
-typedef unsigned long CARD32;
-# endif
-typedef unsigned short CARD16;
-typedef unsigned char  CARD8;
-
-typedef CARD32		BITS32;
-typedef CARD16		BITS16;
-
-typedef CARD8		BYTE;
-typedef CARD8		BOOL;
-
-/*
- * was definitions for sign-extending bitfields on architectures without
- * native types smaller than 64-bit, now just backwards compatibility
- */
-# define cvtINT8toInt(val) (val)
-# define cvtINT16toInt(val) (val)
-# define cvtINT32toInt(val) (val)
-# define cvtINT8toShort(val) (val)
-# define cvtINT16toShort(val) (val)
-# define cvtINT32toShort(val) (val)
-# define cvtINT8toLong(val) (val)
-# define cvtINT16toLong(val) (val)
-# define cvtINT32toLong(val) (val)
-
-/*
- * this version should leave result of type (t *), but that should only be
- * used when not in MUSTCOPY
- */
-# define NEXTPTR(p,t) (((t *)(p)) + 1)
-
-#endif /* XMD_H */
diff --git a/openflow/usr/include/X11/Xos.h b/openflow/usr/include/X11/Xos.h
deleted file mode 100644
index 28dfc67..0000000
--- a/openflow/usr/include/X11/Xos.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- *
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * The X Window System is a Trademark of The Open Group.
- *
- */
-
-/* This is a collection of things to try and minimize system dependencies
- * in a "significant" number of source files.
- */
-
-#ifndef _XOS_H_
-# define _XOS_H_
-
-# include <X11/Xosdefs.h>
-
-/*
- * Get major data types (esp. caddr_t)
- */
-
-# include <sys/types.h>
-
-# if defined(__SCO__) || defined(__UNIXWARE__)
-#  include <stdint.h>
-# endif
-
-
-/*
- * Just about everyone needs the strings routines.  We provide both forms here,
- * index/rindex and strchr/strrchr, so any systems that don't provide them all
- * need to have #defines here.
- *
- * These macros are defined this way, rather than, e.g.:
- *    #defined index(s,c) strchr(s,c)
- * because someone might be using them as function pointers, and such
- * a change would break compatibility for anyone who's relying on them
- * being the way they currently are. So we're stuck with them this way,
- * which can be really inconvenient. :-(
- */
-
-# include <string.h>
-# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__)
-#  include <strings.h>
-# else
-#  ifndef index
-#   define index(s,c) (strchr((s),(c)))
-#  endif
-#  ifndef rindex
-#   define rindex(s,c) (strrchr((s),(c)))
-#  endif
-# endif
-
-/*
- * Get open(2) constants
- */
-# if defined(X_NOT_POSIX)
-#  include <fcntl.h>
-#  if defined(USL) || defined(__i386__) && (defined(SYSV) || defined(SVR4))
-#   include <unistd.h>
-#  endif
-#  ifdef WIN32
-#   include <X11/Xw32defs.h>
-#  else
-#   include <sys/file.h>
-#  endif
-# else /* X_NOT_POSIX */
-#  include <fcntl.h>
-#  include <unistd.h>
-# endif /* X_NOT_POSIX else */
-
-/*
- * Get struct timeval and struct tm
- */
-
-# if defined(_POSIX_SOURCE) && defined(SVR4)
-/* need to omit _POSIX_SOURCE in order to get what we want in SVR4 */
-#  undef _POSIX_SOURCE
-#  include <sys/time.h>
-#  define _POSIX_SOURCE
-# elif defined(WIN32)
-#  include <time.h>
-#  if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL)
-struct timeval {
-    long    tv_sec;         /* seconds */
-    long    tv_usec;        /* and microseconds */
-};
-#   define _TIMEVAL_DEFINED
-#  endif
-#  include <sys/timeb.h>
-#  define gettimeofday(t) \
-{ \
-    struct _timeb _gtodtmp; \
-    _ftime (&_gtodtmp); \
-    (t)->tv_sec = _gtodtmp.time; \
-    (t)->tv_usec = _gtodtmp.millitm * 1000; \
-}
-# else
-#  include <sys/time.h>
-#  include <time.h>
-# endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
-
-/* define X_GETTIMEOFDAY macro, a portable gettimeofday() */
-# if defined(_XOPEN_XPG4) || defined(_XOPEN_UNIX) /* _XOPEN_UNIX is XPG4.2 */
-#  define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
-# else
-#  if defined(SVR4) || defined(__SVR4) || defined(WIN32)
-#   define X_GETTIMEOFDAY(t) gettimeofday(t)
-#  else
-#   define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
-#  endif
-# endif /* XPG4 else */
-
-
-# ifdef __GNU__
-#  define PATH_MAX 4096
-#  define MAXPATHLEN 4096
-#  define OPEN_MAX 256 /* We define a reasonable limit.  */
-# endif
-
-/* use POSIX name for signal */
-# if defined(X_NOT_POSIX) && defined(SYSV) && !defined(SIGCHLD)
-#  define SIGCHLD SIGCLD
-# endif
-
-# include <X11/Xarch.h>
-
-#endif /* _XOS_H_ */
diff --git a/openflow/usr/include/X11/Xos_r.h b/openflow/usr/include/X11/Xos_r.h
deleted file mode 100644
index f963b64..0000000
--- a/openflow/usr/include/X11/Xos_r.h
+++ /dev/null
@@ -1,1095 +0,0 @@
-/*
-Copyright 1996, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-*/
-
-/*
- * Various and sundry Thread-Safe functions used by X11, Motif, and CDE.
- *
- * Use this file in MT-safe code where you would have included
- *	<dirent.h>	for readdir()
- *	<grp.h>		for getgrgid() or getgrnam()
- *	<netdb.h>	for gethostbyname(), gethostbyaddr(), or getservbyname()
- *	<pwd.h>		for getpwnam() or getpwuid()
- *	<string.h>	for strtok()
- *	<time.h>	for asctime(), ctime(), localtime(), or gmtime()
- *	<unistd.h>	for getlogin() or ttyname()
- * or their thread-safe analogs.
- *
- * If you are on a platform that defines XTHREADS but does not have
- * MT-safe system API (e.g. UnixWare) you must define _Xos_processLock
- * and _Xos_processUnlock macros before including this header.
- *
- * For convenience XOS_USE_XLIB_LOCKING or XOS_USE_XT_LOCKING may be defined
- * to obtain either Xlib-only or Xt-based versions of these macros.  These
- * macros won't result in truly thread-safe calls, but they are better than
- * nothing.  If you do not want locking in this situation define
- * XOS_USE_NO_LOCKING.
- *
- * NOTE: On systems lacking appropriate _r functions Gethostbyname(),
- *	Gethostbyaddr(), and Getservbyname() do NOT copy the host or
- *	protocol lists!
- *
- * NOTE: On systems lacking appropriate _r functions Getgrgid() and
- *	Getgrnam() do NOT copy the list of group members!
- *
- * This header is nominally intended to simplify porting X11, Motif, and
- * CDE; it may be useful to other people too.  The structure below is
- * complicated, mostly because P1003.1c (the IEEE POSIX Threads spec)
- * went through lots of drafts, and some vendors shipped systems based
- * on draft API that were changed later.  Unfortunately POSIX did not
- * provide a feature-test macro for distinguishing each of the drafts.
- */
-
-/*
- * This header has several parts.  Search for "Effective prototypes"
- * to locate the beginning of a section.
- */
-
-/* This header can be included multiple times with different defines! */
-#ifndef _XOS_R_H_
-# define _XOS_R_H_
-
-# include <X11/Xos.h>
-# include <X11/Xfuncs.h>
-
-# ifndef X_NOT_POSIX
-#  ifdef _POSIX_SOURCE
-#   include <limits.h>
-#  else
-#   define _POSIX_SOURCE
-#   include <limits.h>
-#   undef _POSIX_SOURCE
-#  endif
-#  ifndef LINE_MAX
-#   define X_LINE_MAX 2048
-#  else
-#   define X_LINE_MAX LINE_MAX
-#  endif
-# endif
-#endif /* _XOS_R_H */
-
-#ifndef WIN32
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# if defined(XOS_USE_XLIB_LOCKING)
-#  ifndef XAllocIDs /* Xlibint.h does not have multiple include protection */
-typedef struct _LockInfoRec *LockInfoPtr;
-extern LockInfoPtr _Xglobal_lock;
-#  endif
-#  ifndef _Xos_isThreadInitialized
-#   define _Xos_isThreadInitialized	(_Xglobal_lock)
-#  endif
-#  if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-#   ifndef XAllocIDs /* Xlibint.h does not have multiple include protection */
-#    include <X11/Xfuncproto.h>	/* for NeedFunctionPrototypes */
-extern void (*_XLockMutex_fn)(
-#    if NeedFunctionPrototypes
-    LockInfoPtr	/* lock */, char * /* file */, int /* line */
-#    endif
-);
-extern void (*_XUnlockMutex_fn)(
-#    if NeedFunctionPrototypes
-    LockInfoPtr	/* lock */, char * /* file */, int /* line */
-#    endif
-);
-#   endif
-#   ifndef _Xos_processLock
-#    define _Xos_processLock	\
-  (_XLockMutex_fn ? (*_XLockMutex_fn)(_Xglobal_lock,__FILE__,__LINE__) : 0)
-#   endif
-#   ifndef _Xos_processUnlock
-#    define _Xos_processUnlock	\
-  (_XUnlockMutex_fn ? (*_XUnlockMutex_fn)(_Xglobal_lock,__FILE__,__LINE__) : 0)
-#   endif
-#  else
-#   ifndef XAllocIDs /* Xlibint.h does not have multiple include protection */
-#    include <X11/Xfuncproto.h>	/* for NeedFunctionPrototypes */
-extern void (*_XLockMutex_fn)(
-#    if NeedFunctionPrototypes
-    LockInfoPtr	/* lock */
-#    endif
-);
-extern void (*_XUnlockMutex_fn)(
-#    if NeedFunctionPrototypes
-    LockInfoPtr	/* lock */
-#    endif
-);
-#   endif
-#   ifndef _Xos_processLock
-#    define _Xos_processLock	\
-  (_XLockMutex_fn ? ((*_XLockMutex_fn)(_Xglobal_lock), 0) : 0)
-#   endif
-#   ifndef _Xos_processUnlock
-#    define _Xos_processUnlock	\
-  (_XUnlockMutex_fn ? ((*_XUnlockMutex_fn)(_Xglobal_lock), 0) : 0)
-#   endif
-#  endif
-# elif defined(XOS_USE_XT_LOCKING)
-#  ifndef _XtThreadsI_h
-extern void (*_XtProcessLock)(void);
-#  endif
-#  ifndef _XtintrinsicP_h
-#   include <X11/Xfuncproto.h>	/* for NeedFunctionPrototypes */
-extern void XtProcessLock(
-#   if NeedFunctionPrototypes
-    void
-#   endif
-);
-extern void XtProcessUnlock(
-#   if NeedFunctionPrototypes
-    void
-#   endif
-);
-#  endif
-#  ifndef _Xos_isThreadInitialized
-#   define _Xos_isThreadInitialized	_XtProcessLock
-#  endif
-#  ifndef _Xos_processLock
-#   define _Xos_processLock		XtProcessLock()
-#  endif
-#  ifndef _Xos_processUnlock
-#   define _Xos_processUnlock		XtProcessUnlock()
-#  endif
-# elif defined(XOS_USE_NO_LOCKING)
-#  ifndef _Xos_isThreadInitialized
-#   define _Xos_isThreadInitialized	0
-#  endif
-#  ifndef _Xos_processLock
-#   define _Xos_processLock		0
-#  endif
-#  ifndef _Xos_processUnlock
-#   define _Xos_processUnlock		0
-#  endif
-# endif
-
-#endif /* !defined WIN32 */
-
-/*
- * Solaris defines the POSIX thread-safe feature test macro, but
- * uses the older SVR4 thread-safe functions unless the POSIX ones
- * are specifically requested.  Fix the feature test macro.
- */
-#if defined(__sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && \
-	(_POSIX_C_SOURCE - 0 < 199506L) && !defined(_POSIX_PTHREAD_SEMANTICS)
-# undef _POSIX_THREAD_SAFE_FUNCTIONS
-#endif
-
-/***** <pwd.h> wrappers *****/
-
-/*
- * Effective prototypes for <pwd.h> wrappers:
- *
- * #define X_INCLUDE_PWD_H
- * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
- *
- * typedef ... _Xgetpwparams;
- *
- * struct passwd* _XGetpwnam(const char *name, _Xgetpwparams);
- * struct passwd* _XGetpwuid(uid_t uid, _Xgetpwparams);
- */
-
-#if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
-# include <pwd.h>
-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_PWDAPI)
-#  define XOS_USE_MTSAFE_PWDAPI 1
-# endif
-#endif
-
-#undef X_NEEDS_PWPARAMS
-#if !defined(X_INCLUDE_PWD_H) || defined(_XOS_INCLUDED_PWD_H)
-/* Do nothing */
-
-#elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
-/* Use regular, unsafe API. */
-# if defined(X_NOT_POSIX) && !defined(__i386__) && !defined(SYSV)
-extern struct passwd *getpwuid(), *getpwnam();
-# endif
-typedef int _Xgetpwparams;	/* dummy */
-# define _XGetpwuid(u,p)	getpwuid((u))
-# define _XGetpwnam(u,p)	getpwnam((u))
-
-#elif !defined(XOS_USE_MTSAFE_PWDAPI) || defined(XNO_MTSAFE_PWDAPI)
-/* UnixWare 2.0, or other systems with thread support but no _r API. */
-# define X_NEEDS_PWPARAMS
-typedef struct {
-  struct passwd pws;
-  char   pwbuf[1024];
-  struct passwd* pwp;
-  size_t len;
-} _Xgetpwparams;
-
-/*
- * NetBSD and FreeBSD, at least, are missing several of the unixware passwd
- * fields.
- */
-
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-    defined(__APPLE__) || defined(__DragonFly__)
-static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
-{
-   memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
-
-   (p).pws.pw_name = (p).pwbuf;
-   (p).len = strlen((p).pwp->pw_name);
-   strcpy((p).pws.pw_name, (p).pwp->pw_name);
-
-   (p).pws.pw_passwd = (p).pws.pw_name + (p).len + 1;
-   (p).len = strlen((p).pwp->pw_passwd);
-   strcpy((p).pws.pw_passwd,(p).pwp->pw_passwd);
-
-   (p).pws.pw_class = (p).pws.pw_passwd + (p).len + 1;
-   (p).len = strlen((p).pwp->pw_class);
-   strcpy((p).pws.pw_class, (p).pwp->pw_class);
-
-   (p).pws.pw_gecos = (p).pws.pw_class + (p).len + 1;
-   (p).len = strlen((p).pwp->pw_gecos);
-   strcpy((p).pws.pw_gecos, (p).pwp->pw_gecos);
-
-   (p).pws.pw_dir = (p).pws.pw_gecos + (p).len + 1;
-   (p).len = strlen((p).pwp->pw_dir);
-   strcpy((p).pws.pw_dir, (p).pwp->pw_dir);
-
-   (p).pws.pw_shell = (p).pws.pw_dir + (p).len + 1;
-   (p).len = strlen((p).pwp->pw_shell);
-   strcpy((p).pws.pw_shell, (p).pwp->pw_shell);
-
-   (p).pwp = &(p).pws;
-}
-
-#else
-# define _Xpw_copyPasswd(p) \
-   (memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)), \
-    ((p).pws.pw_name = (p).pwbuf), \
-    ((p).len = strlen((p).pwp->pw_name)), \
-    strcpy((p).pws.pw_name, (p).pwp->pw_name), \
-    ((p).pws.pw_passwd = (p).pws.pw_name + (p).len + 1), \
-    ((p).len = strlen((p).pwp->pw_passwd)), \
-    strcpy((p).pws.pw_passwd,(p).pwp->pw_passwd), \
-    ((p).pws.pw_age = (p).pws.pw_passwd + (p).len + 1), \
-    ((p).len = strlen((p).pwp->pw_age)), \
-    strcpy((p).pws.pw_age, (p).pwp->pw_age), \
-    ((p).pws.pw_comment = (p).pws.pw_age + (p).len + 1), \
-    ((p).len = strlen((p).pwp->pw_comment)), \
-    strcpy((p).pws.pw_comment, (p).pwp->pw_comment), \
-    ((p).pws.pw_gecos = (p).pws.pw_comment + (p).len + 1), \
-    ((p).len = strlen((p).pwp->pw_gecos)), \
-    strcpy((p).pws.pw_gecos, (p).pwp->pw_gecos), \
-    ((p).pws.pw_dir = (p).pws.pw_comment + (p).len + 1), \
-    ((p).len = strlen((p).pwp->pw_dir)), \
-    strcpy((p).pws.pw_dir, (p).pwp->pw_dir), \
-    ((p).pws.pw_shell = (p).pws.pw_dir + (p).len + 1), \
-    ((p).len = strlen((p).pwp->pw_shell)), \
-    strcpy((p).pws.pw_shell, (p).pwp->pw_shell), \
-    ((p).pwp = &(p).pws), \
-    0 )
-#endif
-# define _XGetpwuid(u,p) \
-( (_Xos_processLock), \
-  (((p).pwp = getpwuid((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
-  (_Xos_processUnlock), \
-  (p).pwp )
-# define _XGetpwnam(u,p) \
-( (_Xos_processLock), \
-  (((p).pwp = getpwnam((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
-  (_Xos_processUnlock), \
-  (p).pwp )
-
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__)
-# define X_NEEDS_PWPARAMS
-typedef struct {
-  struct passwd pws;
-  char pwbuf[X_LINE_MAX];
-} _Xgetpwparams;
-# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4)
-#   define _XGetpwuid(u,p) \
-((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-#   define _XGetpwnam(u,p) \
-((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-# else /* SVR4 */
-#  define _XGetpwuid(u,p) \
-((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == NULL) ? NULL : &(p).pws)
-#  define _XGetpwnam(u,p) \
-((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == NULL) ? NULL : &(p).pws)
-# endif /* SVR4 */
-
-#else /* _POSIX_THREAD_SAFE_FUNCTIONS */
-# define X_NEEDS_PWPARAMS
-typedef struct {
-  struct passwd pws;
-  char pwbuf[X_LINE_MAX];
-  struct passwd* pwp;
-} _Xgetpwparams;
-typedef int _Xgetpwret;
-# define _XGetpwuid(u,p) \
-((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == 0) ? \
- (p).pwp : NULL)
-# define _XGetpwnam(u,p) \
-((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),&(p).pwp) == 0) ? \
- (p).pwp : NULL)
-#endif /* X_INCLUDE_PWD_H */
-
-#if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
-# define _XOS_INCLUDED_PWD_H
-#endif
-
-
-/***** <netdb.h> wrappers *****/
-
-/*
- * Effective prototypes for <netdb.h> wrappers:
- *
- * NOTE: On systems lacking the appropriate _r functions Gethostbyname(),
- *	Gethostbyaddr(), and Getservbyname() do NOT copy the host or
- *	protocol lists!
- *
- * #define X_INCLUDE_NETDB_H
- * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
- *
- * typedef ... _Xgethostbynameparams;
- * typedef ... _Xgetservbynameparams;
- *
- * struct hostent* _XGethostbyname(const char* name,_Xgethostbynameparams);
- * struct hostent* _XGethostbyaddr(const char* addr, int len, int type,
- *				   _Xgethostbynameparams);
- * struct servent* _XGetservbyname(const char* name, const char* proto,
- *				 _Xgetservbynameparams);
- */
-
-#undef XTHREADS_NEEDS_BYNAMEPARAMS
-#if defined(X_INCLUDE_NETDB_H) && !defined(_XOS_INCLUDED_NETDB_H) \
-    && !defined(WIN32)
-# include <netdb.h>
-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_NETDBAPI)
-#  define XOS_USE_MTSAFE_NETDBAPI 1
-# endif
-#endif
-
-#if !defined(X_INCLUDE_NETDB_H) || defined(_XOS_INCLUDED_NETDB_H)
-/* Do nothing. */
-
-#elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
-/* Use regular, unsafe API. */
-typedef int _Xgethostbynameparams; /* dummy */
-typedef int _Xgetservbynameparams; /* dummy */
-# define _XGethostbyname(h,hp)		gethostbyname((h))
-# define _XGethostbyaddr(a,al,t,hp)	gethostbyaddr((a),(al),(t))
-# define _XGetservbyname(s,p,sp)	getservbyname((s),(p))
-
-#elif !defined(XOS_USE_MTSAFE_NETDBAPI) || defined(XNO_MTSAFE_NETDBAPI)
-/* WARNING:  The h_addr_list and s_aliases values are *not* copied! */
-
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-#include <sys/param.h>
-#endif
-
-typedef struct {
-  struct hostent hent;
-  char           h_name[MAXHOSTNAMELEN];
-  struct hostent *hptr;
-} _Xgethostbynameparams;
-typedef struct {
-  struct servent sent;
-  char           s_name[255];
-  char		 s_proto[255];
-  struct servent *sptr;
-} _Xgetservbynameparams;
-
-# define XTHREADS_NEEDS_BYNAMEPARAMS
-
-# define _Xg_copyHostent(hp) \
-   (memcpy(&(hp).hent, (hp).hptr, sizeof(struct hostent)), \
-    strcpy((hp).h_name, (hp).hptr->h_name), \
-    ((hp).hent.h_name = (hp).h_name), \
-    ((hp).hptr = &(hp).hent), \
-     0 )
-# define _Xg_copyServent(sp) \
-   (memcpy(&(sp).sent, (sp).sptr, sizeof(struct servent)), \
-    strcpy((sp).s_name, (sp).sptr->s_name), \
-    ((sp).sent.s_name = (sp).s_name), \
-    strcpy((sp).s_proto, (sp).sptr->s_proto), \
-    ((sp).sent.s_proto = (sp).s_proto), \
-    ((sp).sptr = &(sp).sent), \
-    0 )
-# define _XGethostbyname(h,hp) \
-   ((_Xos_processLock), \
-    (((hp).hptr = gethostbyname((h))) ? _Xg_copyHostent(hp) : 0), \
-    (_Xos_processUnlock), \
-    (hp).hptr )
-# define _XGethostbyaddr(a,al,t,hp) \
-   ((_Xos_processLock), \
-    (((hp).hptr = gethostbyaddr((a),(al),(t))) ? _Xg_copyHostent(hp) : 0), \
-    (_Xos_processUnlock), \
-    (hp).hptr )
-# define _XGetservbyname(s,p,sp) \
-   ((_Xos_processLock), \
-    (((sp).sptr = getservbyname((s),(p))) ? _Xg_copyServent(sp) : 0), \
-    (_Xos_processUnlock), \
-    (sp).sptr )
-
-#elif defined(XUSE_NETDB_R_API)
-/*
- * POSIX does not specify _r equivalents for <netdb.h> API, but some
- * vendors provide them anyway.  Use them only when explicitly asked.
- */
-# ifdef _POSIX_REENTRANT_FUNCTIONS
-#  ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-#  endif
-# endif
-# ifdef _POSIX_THREAD_SAFE_FUNCTIONS
-#  define X_POSIX_THREAD_SAFE_FUNCTIONS 1
-# endif
-
-# define XTHREADS_NEEDS_BYNAMEPARAMS
-
-# ifndef X_POSIX_THREAD_SAFE_FUNCTIONS
-typedef struct {
-    struct hostent      hent;
-    char                hbuf[X_LINE_MAX];
-    int                 herr;
-} _Xgethostbynameparams;
-typedef struct {
-    struct servent      sent;
-    char                sbuf[X_LINE_MAX];
-} _Xgetservbynameparams;
-#  define _XGethostbyname(h,hp) \
-  gethostbyname_r((h),&(hp).hent,(hp).hbuf,sizeof((hp).hbuf),&(hp).herr)
-#  define _XGethostbyaddr(a,al,t,hp) \
-  gethostbyaddr_r((a),(al),(t),&(hp).hent,(hp).hbuf,sizeof((hp).hbuf),&(hp).herr)
-#  define _XGetservbyname(s,p,sp) \
-  getservbyname_r((s),(p),&(sp).sent,(sp).sbuf,sizeof((sp).sbuf))
-# else
-typedef struct {
-  struct hostent      hent;
-  struct hostent_data hdata;
-} _Xgethostbynameparams;
-typedef struct {
-  struct servent      sent;
-  struct servent_data sdata;
-} _Xgetservbynameparams;
-#  define _XGethostbyname(h,hp) \
-  (bzero((char*)&(hp).hdata,sizeof((hp).hdata)),	\
-   ((gethostbyname_r((h),&(hp).hent,&(hp).hdata) == -1) ? NULL : &(hp).hent))
-#  define _XGethostbyaddr(a,al,t,hp) \
-  (bzero((char*)&(hp).hdata,sizeof((hp).hdata)),	\
-   ((gethostbyaddr_r((a),(al),(t),&(hp).hent,&(hp).hdata) == -1) ? NULL : &(hp).hent))
-#  define _XGetservbyname(s,p,sp) \
-  (bzero((char*)&(sp).sdata,sizeof((sp).sdata)),	\
-   ((getservbyname_r((s),(p),&(sp).sent,&(sp).sdata) == -1) ? NULL : &(sp).sent) )
-# endif
-# ifdef X_POSIX_THREAD_SAFE_FUNCTIONS
-#  undef X_POSIX_THREAD_SAFE_FUNCTIONS
-# endif
-
-#else
-/* The regular API is assumed to be MT-safe under POSIX. */
-typedef int _Xgethostbynameparams; /* dummy */
-typedef int _Xgetservbynameparams; /* dummy */
-# define _XGethostbyname(h,hp)		gethostbyname((h))
-# define _XGethostbyaddr(a,al,t,hp)	gethostbyaddr((a),(al),(t))
-# define _XGetservbyname(s,p,sp)	getservbyname((s),(p))
-#endif /* X_INCLUDE_NETDB_H */
-
-#if defined(X_INCLUDE_NETDB_H) && !defined(_XOS_INCLUDED_NETDB_H)
-# define _XOS_INCLUDED_NETDB_H
-#endif
-
-
-/***** <dirent.h> wrappers *****/
-
-/*
- * Effective prototypes for <dirent.h> wrappers:
- *
- * #define X_INCLUDE_DIRENT_H
- * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
- *
- * typedef ... _Xreaddirparams;
- *
- * struct dirent *_XReaddir(DIR *dir_pointer, _Xreaddirparams);
- */
-
-#if defined(X_INCLUDE_DIRENT_H) && !defined(_XOS_INCLUDED_DIRENT_H)
-# include <sys/types.h>
-# if !defined(X_NOT_POSIX) || defined(SYSV)
-#  include <dirent.h>
-# else
-#  include <sys/dir.h>
-#  ifndef dirent
-#   define dirent direct
-#  endif
-# endif
-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_DIRENTAPI)
-#  define XOS_USE_MTSAFE_DIRENTAPI 1
-# endif
-#endif
-
-#if !defined(X_INCLUDE_DIRENT_H) || defined(_XOS_INCLUDED_DIRENT_H)
-/* Do nothing. */
-
-#elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
-/* Use regular, unsafe API. */
-typedef int _Xreaddirparams;	/* dummy */
-# define _XReaddir(d,p)	readdir(d)
-
-#elif !defined(XOS_USE_MTSAFE_DIRENTAPI) || defined(XNO_MTSAFE_DIRENTAPI)
-/* Systems with thread support but no _r API. */
-typedef struct {
-  struct dirent *result;
-  struct dirent dir_entry;
-# ifdef _POSIX_PATH_MAX
-  char buf[_POSIX_PATH_MAX];
-# elif defined(NAME_MAX)
-  char buf[NAME_MAX];
-# else
-  char buf[255];
-# endif
-} _Xreaddirparams;
-
-# define _XReaddir(d,p)	\
- ( (_Xos_processLock),						 \
-   (((p).result = readdir((d))) ?				 \
-    (memcpy(&((p).dir_entry), (p).result, (p).result->d_reclen), \
-     ((p).result = &(p).dir_entry), 0) :			 \
-    0),								 \
-   (_Xos_processUnlock),					 \
-   (p).result )
-
-#else
-typedef struct {
-  struct dirent *result;
-  struct dirent dir_entry;
-# ifdef _POSIX_PATH_MAX
-  char buf[_POSIX_PATH_MAX];
-# elif defined(NAME_MAX)
-  char buf[NAME_MAX];
-# else
-  char buf[255];
-# endif
-} _Xreaddirparams;
-
-# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(__APPLE__)
-/* POSIX final API, returns (int)0 on success. */
-#  define _XReaddir(d,p)						\
-    (readdir_r((d), &((p).dir_entry), &((p).result)) ? NULL : (p).result)
-# elif defined(_POSIX_REENTRANT_FUNCTIONS)
-/* POSIX draft API, returns (int)0 on success. */
-#  define _XReaddir(d,p)	\
-    (readdir_r((d),&((p).dir_entry)) ? NULL : &((p).dir_entry))
-# elif defined(SVR4)
-/* Pre-POSIX API, returns non-NULL on success. */
-#  define _XReaddir(d,p)	(readdir_r((d), &(p).dir_entry))
-# else
-/* We have no idea what is going on.  Fake it all using process locks. */
-#  define _XReaddir(d,p)	\
-    ( (_Xos_processLock),						\
-      (((p).result = readdir((d))) ?					\
-       (memcpy(&((p).dir_entry), (p).result, (p).result->d_reclen),	\
-	((p).result = &(p).dir_entry), 0) :				\
-       0),								\
-      (_Xos_processUnlock),						\
-      (p).result )
-# endif
-#endif /* X_INCLUDE_DIRENT_H */
-
-#if defined(X_INCLUDE_DIRENT_H) && !defined(_XOS_INCLUDED_DIRENT_H)
-# define _XOS_INCLUDED_DIRENT_H
-#endif
-
-
-/***** <unistd.h> wrappers *****/
-
-/*
- * Effective prototypes for <unistd.h> wrappers:
- *
- * #define X_INCLUDE_UNISTD_H
- * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
- *
- * typedef ... _Xgetloginparams;
- * typedef ... _Xttynameparams;
- *
- * char *_XGetlogin(_Xgetloginparams);
- * char *_XTtyname(int, _Xttynameparams);
- */
-
-#if defined(X_INCLUDE_UNISTD_H) && !defined(_XOS_INCLUDED_UNISTD_H)
-/* <unistd.h> already included by <X11/Xos.h> */
-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_UNISTDAPI)
-#  define XOS_USE_MTSAFE_UNISTDAPI 1
-# endif
-#endif
-
-#if !defined(X_INCLUDE_UNISTD_H) || defined(_XOS_INCLUDED_UNISTD_H)
-/* Do nothing. */
-
-#elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
-/* Use regular, unsafe API. */
-typedef int _Xgetloginparams;	/* dummy */
-typedef int _Xttynameparams;	/* dummy */
-# define _XGetlogin(p)	getlogin()
-# define _XTtyname(f)	ttyname((f))
-
-#elif !defined(XOS_USE_MTSAFE_UNISTDAPI) || defined(XNO_MTSAFE_UNISTDAPI)
-/* Systems with thread support but no _r API. */
-typedef struct {
-  char *result;
-# if defined(MAXLOGNAME)
-  char buf[MAXLOGNAME];
-# elif defined(LOGIN_NAME_MAX)
-  char buf[LOGIN_NAME_MAX];
-# else
-  char buf[64];
-# endif
-} _Xgetloginparams;
-typedef struct {
-  char *result;
-# ifdef TTY_NAME_MAX
-  char buf[TTY_NAME_MAX];
-# elif defined(_POSIX_TTY_NAME_MAX)
-  char buf[_POSIX_TTY_NAME_MAX];
-# elif defined(_POSIX_PATH_MAX)
-  char buf[_POSIX_PATH_MAX];
-# else
-  char buf[256];
-# endif
-} _Xttynameparams;
-
-# define _XGetlogin(p) \
- ( (_Xos_processLock), \
-   (((p).result = getlogin()) ? \
-    (strncpy((p).buf, (p).result, sizeof((p).buf)), \
-     ((p).buf[sizeof((p).buf)-1] = '\0'), \
-     ((p).result = (p).buf), 0) : 0), \
-   (_Xos_processUnlock), \
-   (p).result )
-#define _XTtyname(f,p) \
- ( (_Xos_processLock), \
-   (((p).result = ttyname(f)) ? \
-    (strncpy((p).buf, (p).result, sizeof((p).buf)), \
-     ((p).buf[sizeof((p).buf)-1] = '\0'), \
-     ((p).result = (p).buf), 0) : 0), \
-   (_Xos_processUnlock), \
-   (p).result )
-
-#elif defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(_POSIX_REENTRANT_FUNCTIONS)
-/* POSIX API.
- *
- * extern int getlogin_r(char *, size_t);
- * extern int ttyname_r(int, char *, size_t);
- */
-typedef struct {
-# if defined(MAXLOGNAME)
-  char buf[MAXLOGNAME];
-# elif defined(LOGIN_NAME_MAX)
-  char buf[LOGIN_NAME_MAX];
-# else
-  char buf[64];
-# endif
-} _Xgetloginparams;
-typedef struct {
-# ifdef TTY_NAME_MAX
-  char buf[TTY_NAME_MAX];
-# elif defined(_POSIX_TTY_NAME_MAX)
-  char buf[_POSIX_TTY_NAME_MAX];
-# elif defined(_POSIX_PATH_MAX)
-  char buf[_POSIX_PATH_MAX];
-# else
-  char buf[256];
-# endif
-} _Xttynameparams;
-
-# define _XGetlogin(p)	(getlogin_r((p).buf, sizeof((p).buf)) ? NULL : (p).buf)
-# define _XTtyname(f,p)	\
-	(ttyname_r((f), (p).buf, sizeof((p).buf)) ? NULL : (p).buf)
-
-#else
-/* Pre-POSIX API.
- *
- * extern char *getlogin_r(char *, size_t);
- * extern char *ttyname_r(int, char *, size_t);
- */
-typedef struct {
-# if defined(MAXLOGNAME)
-  char buf[MAXLOGNAME];
-# elif defined(LOGIN_NAME_MAX)
-  char buf[LOGIN_NAME_MAX];
-# else
-  char buf[64];
-# endif
-} _Xgetloginparams;
-typedef struct {
-# ifdef TTY_NAME_MAX
-  char buf[TTY_NAME_MAX];
-# elif defined(_POSIX_TTY_NAME_MAX)
-  char buf[_POSIX_TTY_NAME_MAX];
-# elif defined(_POSIX_PATH_MAX)
-  char buf[_POSIX_PATH_MAX];
-# else
-  char buf[256];
-# endif
-} _Xttynameparams;
-
-# define _XGetlogin(p)	getlogin_r((p).buf, sizeof((p).buf))
-# define _XTtyname(f,p)	ttyname_r((f), (p).buf, sizeof((p).buf))
-#endif /* X_INCLUDE_UNISTD_H */
-
-#if defined(X_INCLUDE_UNISTD_H) && !defined(_XOS_INCLUDED_UNISTD_H)
-# define _XOS_INCLUDED_UNISTD_H
-#endif
-
-
-/***** <string.h> wrappers *****/
-
-/*
- * Effective prototypes for <string.h> wrappers:
- *
- * #define X_INCLUDE_STRING_H
- * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
- *
- * typedef ... _Xstrtokparams;
- *
- * char *_XStrtok(char *, const char*, _Xstrtokparams);
- */
-
-#if defined(X_INCLUDE_STRING_H) && !defined(_XOS_INCLUDED_STRING_H)
-/* <string.h> has already been included by <X11/Xos.h> */
-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_STRINGAPI)
-#  define XOS_USE_MTSAFE_STRINGAPI 1
-# endif
-#endif
-
-#if !defined(X_INCLUDE_STRING_H) || defined(_XOS_INCLUDED_STRING_H)
-/* Do nothing. */
-
-#elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
-/* Use regular, unsafe API. */
-typedef int _Xstrtokparams;	/* dummy */
-# define _XStrtok(s1,s2,p) \
- ( p = 0, (void)p, strtok((s1),(s2)) )
-
-#elif !defined(XOS_USE_MTSAFE_STRINGAPI) || defined(XNO_MTSAFE_STRINGAPI)
-/* Systems with thread support but no _r API. */
-typedef char *_Xstrtokparams;
-# define _XStrtok(s1,s2,p) \
- ( (_Xos_processLock), \
-   ((p) = strtok((s1),(s2))), \
-   (_Xos_processUnlock), \
-   (p) )
-
-#else
-/* POSIX or pre-POSIX API. */
-typedef char * _Xstrtokparams;
-# define _XStrtok(s1,s2,p)	strtok_r((s1),(s2),&(p))
-#endif /* X_INCLUDE_STRING_H */
-
-
-/***** <time.h> wrappers *****/
-
-/*
- * Effective prototypes for <time.h> wrappers:
- *
- * #define X_INCLUDE_TIME_H
- * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
- *
- * typedef ... _Xatimeparams;
- * typedef ... _Xctimeparams;
- * typedef ... _Xgtimeparams;
- * typedef ... _Xltimeparams;
- *
- * char *_XAsctime(const struct tm *, _Xatimeparams);
- * char *_XCtime(const time_t *, _Xctimeparams);
- * struct tm *_XGmtime(const time_t *, _Xgtimeparams);
- * struct tm *_XLocaltime(const time_t *, _Xltimeparams);
- */
-
-#if defined(X_INCLUDE_TIME_H) && !defined(_XOS_INCLUDED_TIME_H)
-# include <time.h>
-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_TIMEAPI)
-#  define XOS_USE_MTSAFE_TIMEAPI 1
-# endif
-#endif
-
-#if !defined(X_INCLUDE_TIME_H) || defined(_XOS_INCLUDED_TIME_H)
-/* Do nothing. */
-
-#elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
-/* Use regular, unsafe API. */
-typedef int _Xatimeparams;	/* dummy */
-# define _XAsctime(t,p)		asctime((t))
-typedef int _Xctimeparams;	/* dummy */
-# define _XCtime(t,p)		ctime((t))
-typedef int _Xgtimeparams;	/* dummy */
-# define _XGmtime(t,p)		gmtime((t))
-typedef int _Xltimeparams;	/* dummy */
-# define _XLocaltime(t,p)	localtime((t))
-
-#elif !defined(XOS_USE_MTSAFE_TIMEAPI) || defined(XNO_MTSAFE_TIMEAPI)
-/* Systems with thread support but no _r API. */
-typedef struct {
-# ifdef TIMELEN
-  char buf[TIMELEN];
-# else
-  char buf[26];
-# endif
-  char *result;
-} _Xctimeparams, _Xatimeparams;
-typedef struct {
-  struct tm buf;
-  struct tm *result;
-} _Xgtimeparams, _Xltimeparams;
-# define _XAsctime(t,p) \
- ( (_Xos_processLock), \
-   (((p).result = asctime((t))) ? \
-    (strncpy((p).buf, (p).result, sizeof((p).buf)), (p).result = &(p).buf) : \
-    0), \
-   (_Xos_processUnlock), \
-   (p).result )
-# define _XCtime(t,p) \
- ( (_Xos_processLock), \
-   (((p).result = ctime((t))) ? \
-    (strncpy((p).buf, (p).result, sizeof((p).buf)), (p).result = &(p).buf) : \
-    0), \
-   (_Xos_processUnlock), \
-   (p).result )
-# define _XGmtime(t,p) \
- ( (_Xos_processLock), \
-   (((p).result = gmtime(t)) ? \
-    (memcpy(&(p).buf, (p).result, sizeof((p).buf)), (p).result = &(p).buf) : \
-    0), \
-   (_Xos_processUnlock), \
-   (p).result )
-# define _XLocaltime(t,p) \
- ( (_Xos_processLock), \
-   (((p).result = localtime(t)) ? \
-    (memcpy(&(p).buf, (p).result, sizeof((p).buf)), (p).result = &(p).buf) : \
-    0), \
-   (_Xos_processUnlock), \
-   (p).result )
-
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) &&  defined(hpV4)
-/* Returns (int)0 on success.
- *
- * extern int asctime_r(const struct tm *timeptr, char *buffer, int buflen);
- * extern int ctime_r(const time_t *timer, char *buffer, int buflen);
- * extern int gmtime_r(const time_t *timer, struct tm *result);
- * extern int localtime_r(const time_t *timer, struct tm *result);
- */
-# ifdef TIMELEN
-typedef char _Xatimeparams[TIMELEN];
-typedef char _Xctimeparams[TIMELEN];
-# else
-typedef char _Xatimeparams[26];
-typedef char _Xctimeparams[26];
-# endif
-typedef struct tm _Xgtimeparams;
-typedef struct tm _Xltimeparams;
-# define _XAsctime(t,p)		(asctime_r((t),(p),sizeof((p))) ? NULL : (p))
-# define _XCtime(t,p)		(ctime_r((t),(p),sizeof((p))) ? NULL : (p))
-# define _XGmtime(t,p)		(gmtime_r((t),&(p)) ? NULL : &(p))
-# define _XLocaltime(t,p)	(localtime_r((t),&(p)) ? NULL : &(p))
-
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(__sun)
-/* Returns NULL on failure.  Solaris 2.5
- *
- * extern char *asctime_r(const struct tm *tm,char *buf, int buflen);
- * extern char *ctime_r(const time_t *clock, char *buf, int buflen);
- * extern struct tm *gmtime_r(const time_t *clock, struct tm *res);
- * extern struct tm *localtime_r(const time_t *clock, struct tm *res);
- */
-# ifdef TIMELEN
-typedef char _Xatimeparams[TIMELEN];
-typedef char _Xctimeparams[TIMELEN];
-# else
-typedef char _Xatimeparams[26];
-typedef char _Xctimeparams[26];
-# endif
-typedef struct tm _Xgtimeparams;
-typedef struct tm _Xltimeparams;
-# define _XAsctime(t,p)		asctime_r((t),(p),sizeof((p)))
-# define _XCtime(t,p)		ctime_r((t),(p),sizeof((p)))
-# define _XGmtime(t,p)		gmtime_r((t),&(p))
-# define _XLocaltime(t,p)	localtime_r((t),&(p))
-
-#else /* defined(_POSIX_THREAD_SAFE_FUNCTIONS) */
-/* POSIX final API.
- * extern char *asctime_r(const struct tm *timeptr, char *buffer);
- * extern char *ctime_r(const time_t *timer, char *buffer);
- * extern struct tm *gmtime_r(const time_t *timer, struct tm *result);
- * extern struct tm *localtime_r(const time_t *timer, struct tm *result);
- */
-# ifdef TIMELEN
-typedef char _Xatimeparams[TIMELEN];
-typedef char _Xctimeparams[TIMELEN];
-# else
-typedef char _Xatimeparams[26];
-typedef char _Xctimeparams[26];
-# endif
-typedef struct tm _Xgtimeparams;
-typedef struct tm _Xltimeparams;
-# define _XAsctime(t,p)		asctime_r((t),(p))
-# define _XCtime(t,p)		ctime_r((t),(p))
-# define _XGmtime(t,p)		gmtime_r((t),&(p))
-# define _XLocaltime(t,p)	localtime_r((t),&(p))
-#endif /* X_INCLUDE_TIME_H */
-
-#if defined(X_INCLUDE_TIME_H) && !defined(_XOS_INCLUDED_TIME_H)
-# define _XOS_INCLUDED_TIME_H
-#endif
-
-
-/***** <grp.h> wrappers *****/
-
-/*
- * Effective prototypes for <grp.h> wrappers:
- *
- * NOTE: On systems lacking appropriate _r functions Getgrgid() and
- *	Getgrnam() do NOT copy the list of group members!
- *
- * Remember that fgetgrent(), setgrent(), getgrent(), and endgrent()
- * are not included in POSIX.
- *
- * #define X_INCLUDE_GRP_H
- * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
- *
- * typedef ... _Xgetgrparams;
- *
- * struct group *_XGetgrgid(gid_t, _Xgetgrparams);
- * struct group *_XGetgrnam(const char *, _Xgetgrparams);
- */
-
-#if defined(X_INCLUDE_GRP_H) && !defined(_XOS_INCLUDED_GRP_H)
-# include <grp.h>
-# if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_GRPAPI)
-#  define XOS_USE_MTSAFE_GRPAPI 1
-# endif
-#endif
-
-#if !defined(X_INCLUDE_GRP_H) || defined(_XOS_INCLUDED_GRP_H)
-/* Do nothing. */
-
-#elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API)
-/* Use regular, unsafe API. */
-typedef int _Xgetgrparams;	/* dummy */
-#define _XGetgrgid(g,p)	getgrgid((g))
-#define _XGetgrnam(n,p)	getgrnam((n))
-
-#elif !defined(XOS_USE_MTSAFE_GRPAPI) || defined(XNO_MTSAFE_GRPAPI)
-/* Systems with thread support but no _r API.  UnixWare 2.0. */
-typedef struct {
-  struct group grp;
-  char buf[X_LINE_MAX];	/* Should be sysconf(_SC_GETGR_R_SIZE_MAX)? */
-  struct group *pgrp;
-  size_t len;
-} _Xgetgrparams;
-#ifdef SVR4
-/* Copy the gr_passwd field too. */
-# define _Xgrp_copyGroup(p) \
- ( memcpy(&(p).grp, (p).pgrp, sizeof(struct group)), \
-   ((p).grp.gr_name = (p).buf), \
-   ((p).len = strlen((p).pgrp->gr_name)), \
-   strcpy((p).grp.gr_name, (p).pgrp->gr_name), \
-   ((p).grp.gr_passwd = (p).grp.gr_name + (p).len + 1), \
-   ((p).pgrp = &(p).grp), \
-   0 )
-#else
-# define _Xgrp_copyGroup(p) \
- ( memcpy(&(p).grp, (p).pgrp, sizeof(struct group)), \
-   ((p).grp.gr_name = (p).buf), \
-   strcpy((p).grp.gr_name, (p).pgrp->gr_name), \
-   ((p).pgrp = &(p).grp), \
-   0 )
-#endif
-#define _XGetgrgid(g,p) \
- ( (_Xos_processLock), \
-   (((p).pgrp = getgrgid((g))) ? _Xgrp_copyGroup(p) : 0), \
-   (_Xos_processUnlock), \
-   (p).pgrp )
-#define _XGetgrnam(n,p) \
- ( (_Xos_processLock), \
-   (((p).pgrp = getgrnam((n))) ? _Xgrp_copyGroup(p) : 0), \
-   (_Xos_processUnlock), \
-   (p).pgrp )
-
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(__sun)
-/* Non-POSIX API.  Solaris.
- *
- * extern struct group *getgrgid_r(gid_t, struct group *, char *, int);
- * extern struct group *getgrnam_r(const char *, struct group *, char *, int);
- */
-typedef struct {
-  struct group grp;
-  char buf[X_LINE_MAX];	/* Should be sysconf(_SC_GETGR_R_SIZE_MAX)? */
-} _Xgetgrparams;
-#define _XGetgrgid(g,p)	getgrgid_r((g), &(p).grp, (p).buf, sizeof((p).buf))
-#define _XGetgrnam(n,p)	getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf))
-
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-/* Non-POSIX API.
- * extern int getgrgid_r(gid_t, struct group *, char *, int);
- * extern int getgrnam_r(const char *, struct group *, char *, int);
- */
-typedef struct {
-  struct group grp;
-  char buf[X_LINE_MAX];	/* Should be sysconf(_SC_GETGR_R_SIZE_MAX)? */
-} _Xgetgrparams;
-#define _XGetgrgid(g,p)	\
- ((getgrgid_r((g), &(p).grp, (p).buf, sizeof((p).buf)) ? NULL : &(p).grp))
-#define _XGetgrnam(n,p)	\
- ((getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf)) ? NULL : &(p).grp))
-
-#else
-/* POSIX final API.
- *
- * int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **);
- * int getgrnam_r(const char *, struct group *, char *, size_t, struct group **);
- */
-typedef struct {
-  struct group grp;
-  char buf[X_LINE_MAX];	/* Should be sysconf(_SC_GETGR_R_SIZE_MAX)? */
-  struct group *result;
-} _Xgetgrparams;
-
-#define _XGetgrgid(g,p)	\
- ((getgrgid_r((g), &(p).grp, (p).buf, sizeof((p).buf), &(p).result) ? \
-   NULL : (p).result))
-#define _XGetgrnam(n,p)	\
- ((getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf), &(p).result) ? \
-   NULL : (p).result))
-#endif
-
-#if defined(X_INCLUDE_GRP_H) && !defined(_XOS_INCLUDED_GRP_H)
-# define _XOS_INCLUDED_GRP_H
-#endif
-
-
-#ifdef __cplusplus
-}  /* Close scope of 'extern "C"' declaration which encloses file. */
-#endif
diff --git a/openflow/usr/include/X11/Xosdefs.h b/openflow/usr/include/X11/Xosdefs.h
deleted file mode 100644
index 33eaee4..0000000
--- a/openflow/usr/include/X11/Xosdefs.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * O/S-dependent (mis)feature macro definitions
- *
-Copyright 1991, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- */
-
-#ifndef _XOSDEFS_H_
-# define _XOSDEFS_H_
-
-/*
- * X_NOT_POSIX means does not have POSIX header files.  Lack of this
- * symbol does NOT mean that the POSIX environment is the default.
- * You may still have to define _POSIX_SOURCE to get it.
- */
-
-
-# ifdef _SCO_DS
-#  ifndef __SCO__
-#   define __SCO__
-#  endif
-# endif
-
-# ifdef __i386__
-#  ifdef SYSV
-#   if !defined(__SCO__) && \
-	!defined(__UNIXWARE__) && !defined(__sun)
-#    if !defined(_POSIX_SOURCE)
-#     define X_NOT_POSIX
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef __sun
-/* Imake configs define SVR4 on Solaris, but cc & gcc only define __SVR4
- * This check allows non-Imake configured programs to build correctly.
- */
-#  if defined(__SVR4) && !defined(SVR4)
-#   define SVR4 1
-#  endif
-#  ifdef SVR4
-/* define this to whatever it needs to be */
-#   define X_POSIX_C_SOURCE 199300L
-#  endif
-# endif
-
-# ifdef WIN32
-#  ifndef _POSIX_
-#   define X_NOT_POSIX
-#  endif
-# endif
-
-
-# ifdef __APPLE__
-#  define NULL_NOT_ZERO
-
-/* Defining any of these will sanitize the namespace to JUST want is defined by
- * that particular standard.  If that happens, we don't get some expected
- * prototypes, typedefs, etc (like fd_mask).  We can define _DARWIN_C_SOURCE to
- * loosen our belts a tad.
- */
-#  if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE)
-#   ifndef _DARWIN_C_SOURCE
-#    define _DARWIN_C_SOURCE
-#   endif
-#  endif
-
-# endif
-
-# ifdef __GNU__
-#  ifndef PATH_MAX
-#   define PATH_MAX 4096
-#  endif
-#  ifndef MAXPATHLEN
-#   define MAXPATHLEN 4096
-#  endif
-# endif
-
-# if defined(__SCO__) || defined(__UNIXWARE__)
-#  ifndef PATH_MAX
-#   define PATH_MAX	1024
-#  endif
-#  ifndef MAXPATHLEN
-#   define MAXPATHLEN	1024
-#  endif
-# endif
-
-# if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
-	|| defined(__APPLE__) || defined(__DragonFly__)
-#  ifndef CSRG_BASED
-#   define CSRG_BASED
-#  endif
-# endif
-
-#endif /* _XOSDEFS_H_ */
-
diff --git a/openflow/usr/include/X11/Xpoll.h b/openflow/usr/include/X11/Xpoll.h
deleted file mode 100644
index 0940865..0000000
--- a/openflow/usr/include/X11/Xpoll.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-
-Copyright 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-/*
- * Copyright © 2005 Daniel Stone
- * 
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Daniel Stone not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  Daniel Stone makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * DANIEL STONE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * DANIEL STONE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#ifndef _XPOLL_H_
-#define _XPOLL_H_
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-
-#ifndef USE_POLL
-
-#include <X11/Xos.h>
-
-#include <sys/select.h>  /* Get the FD_* macros. */
-
-#include <X11/Xmd.h>
-
-#ifdef CSRG_BASED
-#include <sys/param.h>
-# if BSD < 199103
-typedef long fd_mask;
-# endif
-#endif
-
-#if defined(FD_SETSIZE) && FD_SETSIZE < 512
-# define XFD_SETSIZE	FD_SETSIZE
-#else
-# define XFD_SETSIZE	512
-# ifndef FD_SETSIZE
-#  define FD_SETSIZE	XFD_SETSIZE
-# endif
-#endif
-
-#ifndef NBBY
-#define NBBY	8		/* number of bits in a byte */
-#endif
-
-#ifndef NFDBITS
-#define NFDBITS (sizeof(fd_mask) * NBBY)	/* bits per mask */
-#endif
-
-#ifndef howmany
-#define howmany(x,y)	(((x)+((y)-1))/(y))
-#endif
-
-#if defined(BSD) && BSD < 198911 
-typedef struct fd_set {
-	fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)];
-} fd_set;
-#endif
-
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-
-#define __X_FDS_BITS __fds_bits
-
-#ifndef __FDS_BITS
-# define __FDS_BITS(p)  ((p)->__X_FDS_BITS)
-#endif
-
-#define __XFDS_BITS(p, n) (__FDS_BITS(p))[n]
-
-#ifndef FD_SET
-#define FD_SET(n, p)    (__XFDS_BITS(p, ((n)/NFDBITS)) |= ((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_CLR
-#define FD_CLR(n, p)    (__XFDS_BITS((p), ((n)/NFDBITS)) &= ~((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_ISSET
-#define FD_ISSET(n, p)  ((__XFDS_BITS((p), ((n)/NFDBITS))) & ((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_ZERO
-#define FD_ZERO(p)      bzero((char *)(p), sizeof(*(p)))
-#endif
-
-/*
- * The howmany(FD_SETSIZE, NFDBITS) computes the number of elements in the
- * array. before accessing an element in the array we check it exists.
- * If it does not exist then the compiler discards the code to access it. 
- */
-#define XFD_ANYSET(p) \
-        ((howmany(FD_SETSIZE, NFDBITS) > 0 && (__XFDS_BITS(p, 0))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 1 && (__XFDS_BITS(p, 1))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 2 && (__XFDS_BITS(p, 2))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 3 && (__XFDS_BITS(p, 3))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 4 && (__XFDS_BITS(p, 4))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 8 && (__XFDS_BITS(p, 8))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 9 && (__XFDS_BITS(p, 9))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 10 && (__XFDS_BITS(p, 10))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 11 && (__XFDS_BITS(p, 11))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 12 && (__XFDS_BITS(p, 12))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 13 && (__XFDS_BITS(p, 13))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 14 && (__XFDS_BITS(p, 14))) || \
-        (howmany(FD_SETSIZE, NFDBITS) > 15 && (__XFDS_BITS(p, 15))))
-
-
-#define XFD_COPYSET(src,dst) { \
-        int __i__; \
-		for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
-            __XFDS_BITS((dst), __i__) = __XFDS_BITS((src), __i__); \
-        }
-#define XFD_ANDSET(dst,b1,b2) { \
-        int __i__; \
-        for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
-            __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) & (__XFDS_BITS((b2), __i__))); \
-        }
-#define XFD_ORSET(dst,b1,b2) { \
-        int __i__; \
-        for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
-		__XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) | (__XFDS_BITS((b2), __i__))); \
-        }        
-#define XFD_UNSET(dst,b1) { \
-        int __i__; \
-        for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
-    		__XFDS_BITS((dst), __i__) &= ~(__XFDS_BITS((b1), __i__)); \
-        }
-
-#else /* USE_POLL */
-#include <sys/poll.h>
-#endif /* USE_POLL */
-
-#else /* WIN32 */
-
-#define XFD_SETSIZE	512
-#ifndef FD_SETSIZE
-#define FD_SETSIZE	XFD_SETSIZE
-#endif
-#include <X11/Xwinsock.h>
-
-#define Select(n,r,w,e,t) select(0,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-
-#define XFD_SETCOUNT(p)	(((fd_set FAR *)(p))->fd_count)
-#define XFD_FD(p,i) (((fd_set FAR *)(p))->fd_array[i])
-#define XFD_ANYSET(p)	XFD_SETCOUNT(p)
-
-#define XFD_COPYSET(src,dst) { \
-    u_int __i; \
-    FD_ZERO(dst); \
-    for (__i = 0; __i < XFD_SETCOUNT(src) ; __i++) { \
-        XFD_FD(dst,__i) = XFD_FD(src,__i); \
-    } \
-    XFD_SETCOUNT(dst) = XFD_SETCOUNT(src); \
-}
-
-#define XFD_ANDSET(dst,b1,b2) { \
-    u_int __i; \
-    FD_ZERO(dst); \
-    for (__i = 0; __i < XFD_SETCOUNT(b1) ; __i++) { \
-        if (FD_ISSET(XFD_FD(b1,__i), b2)) \
-	   FD_SET(XFD_FD(b1,__i), dst); \
-    } \
-}
-
-#define XFD_ORSET(dst,b1,b2) { \
-    u_int __i; \
-    if (dst != b1) XFD_COPYSET(b1,dst); \
-    for (__i = 0; __i < XFD_SETCOUNT(b2) ; __i++) { \
-        if (!FD_ISSET(XFD_FD(b2,__i), dst)) \
-	   FD_SET(XFD_FD(b2,__i), dst); \
-    } \
-}
-
-/* this one is really sub-optimal */
-#define XFD_UNSET(dst,b1) { \
-    u_int __i; \
-    for (__i = 0; __i < XFD_SETCOUNT(b1) ; __i++) { \
-	FD_CLR(XFD_FD(b1,__i), dst); \
-    } \
-}
-
-/* we have to pay the price of having an array here, unlike with bitmasks
-   calling twice FD_SET with the same fd is not transparent, so be careful */
-#undef FD_SET
-#define FD_SET(fd,set) do { \
-    if (XFD_SETCOUNT(set) < FD_SETSIZE && !FD_ISSET(fd,set)) \
-        XFD_FD(set,XFD_SETCOUNT(set)++)=(fd); \
-} while(0)
-
-#define getdtablesize() FD_SETSIZE 
-
-#endif /* WIN32 */
-
-#endif /* _XPOLL_H_ */
diff --git a/openflow/usr/include/X11/Xproto.h b/openflow/usr/include/X11/Xproto.h
deleted file mode 100644
index 6cdea89..0000000
--- a/openflow/usr/include/X11/Xproto.h
+++ /dev/null
@@ -1,2157 +0,0 @@
-/* Definitions for the X window system used by server and c bindings */
-
-/*
- * This packet-construction scheme makes the following assumptions:
- *
- * 1. The compiler is able
- * to generate code which addresses one- and two-byte quantities.
- * In the worst case, this would be done with bit-fields.  If bit-fields
- * are used it may be necessary to reorder the request fields in this file,
- * depending on the order in which the machine assigns bit fields to
- * machine words.  There may also be a problem with sign extension,
- * as K+R specify that bitfields are always unsigned.
- *
- * 2. 2- and 4-byte fields in packet structures must be ordered by hand
- * such that they are naturally-aligned, so that no compiler will ever
- * insert padding bytes.
- *
- * 3. All packets are hand-padded to a multiple of 4 bytes, for
- * the same reason.
- */
-
-#ifndef XPROTO_H
-#define XPROTO_H
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#include <X11/Xmd.h>
-#include <X11/Xprotostr.h>
-
-/*
- * Define constants for the sizes of the network packets.  The sz_ prefix is
- * used instead of something more descriptive so that the symbols are no more
- * than 32 characters in length (which causes problems for some compilers).
- */
-#define sz_xSegment 8
-#define sz_xPoint 4
-#define sz_xRectangle 8
-#define sz_xArc 12
-#define sz_xConnClientPrefix 12
-#define sz_xConnSetupPrefix 8
-#define sz_xConnSetup 32
-#define sz_xPixmapFormat 8
-#define sz_xDepth 8
-#define sz_xVisualType 24
-#define sz_xWindowRoot 40
-#define sz_xTimecoord 8
-#define sz_xHostEntry 4
-#define sz_xCharInfo 12
-#define sz_xFontProp 8
-#define sz_xTextElt 2
-#define sz_xColorItem 12
-#define sz_xrgb 8
-#define sz_xGenericReply 32
-#define sz_xGetWindowAttributesReply 44
-#define sz_xGetGeometryReply 32
-#define sz_xQueryTreeReply 32
-#define sz_xInternAtomReply 32
-#define sz_xGetAtomNameReply 32
-#define sz_xGetPropertyReply 32
-#define sz_xListPropertiesReply 32
-#define sz_xGetSelectionOwnerReply 32
-#define sz_xGrabPointerReply 32
-#define sz_xQueryPointerReply 32
-#define sz_xGetMotionEventsReply 32
-#define sz_xTranslateCoordsReply 32
-#define sz_xGetInputFocusReply 32
-#define sz_xQueryKeymapReply 40
-#define sz_xQueryFontReply 60
-#define sz_xQueryTextExtentsReply 32
-#define sz_xListFontsReply 32
-#define sz_xGetFontPathReply 32
-#define sz_xGetImageReply 32
-#define sz_xListInstalledColormapsReply 32
-#define sz_xAllocColorReply 32
-#define sz_xAllocNamedColorReply 32
-#define sz_xAllocColorCellsReply 32
-#define sz_xAllocColorPlanesReply 32
-#define sz_xQueryColorsReply 32
-#define sz_xLookupColorReply 32
-#define sz_xQueryBestSizeReply 32
-#define sz_xQueryExtensionReply 32
-#define sz_xListExtensionsReply 32
-#define sz_xSetMappingReply 32
-#define sz_xGetKeyboardControlReply 52
-#define sz_xGetPointerControlReply 32
-#define sz_xGetScreenSaverReply 32
-#define sz_xListHostsReply 32
-#define sz_xSetModifierMappingReply 32
-#define sz_xError 32
-#define sz_xEvent 32
-#define sz_xKeymapEvent 32
-#define sz_xReq 4
-#define sz_xResourceReq 8
-#define sz_xCreateWindowReq 32
-#define sz_xChangeWindowAttributesReq 12
-#define sz_xChangeSaveSetReq 8
-#define sz_xReparentWindowReq 16
-#define sz_xConfigureWindowReq 12
-#define sz_xCirculateWindowReq 8
-#define sz_xInternAtomReq 8
-#define sz_xChangePropertyReq 24
-#define sz_xDeletePropertyReq 12
-#define sz_xGetPropertyReq 24
-#define sz_xSetSelectionOwnerReq 16
-#define sz_xConvertSelectionReq 24
-#define sz_xSendEventReq 44
-#define sz_xGrabPointerReq 24
-#define sz_xGrabButtonReq 24
-#define sz_xUngrabButtonReq 12
-#define sz_xChangeActivePointerGrabReq 16
-#define sz_xGrabKeyboardReq 16
-#define sz_xGrabKeyReq 16
-#define sz_xUngrabKeyReq 12
-#define sz_xAllowEventsReq 8
-#define sz_xGetMotionEventsReq 16
-#define sz_xTranslateCoordsReq 16
-#define sz_xWarpPointerReq 24
-#define sz_xSetInputFocusReq 12
-#define sz_xOpenFontReq 12
-#define sz_xQueryTextExtentsReq 8
-#define sz_xListFontsReq 8
-#define sz_xSetFontPathReq 8
-#define sz_xCreatePixmapReq 16
-#define sz_xCreateGCReq 16
-#define sz_xChangeGCReq 12
-#define sz_xCopyGCReq 16
-#define sz_xSetDashesReq 12
-#define sz_xSetClipRectanglesReq 12
-#define sz_xCopyAreaReq 28
-#define sz_xCopyPlaneReq 32
-#define sz_xPolyPointReq 12
-#define sz_xPolySegmentReq 12
-#define sz_xFillPolyReq 16
-#define sz_xPutImageReq 24
-#define sz_xGetImageReq 20
-#define sz_xPolyTextReq 16
-#define sz_xImageTextReq 16
-#define sz_xCreateColormapReq 16
-#define sz_xCopyColormapAndFreeReq 12
-#define sz_xAllocColorReq 16
-#define sz_xAllocNamedColorReq 12
-#define sz_xAllocColorCellsReq 12
-#define sz_xAllocColorPlanesReq 16
-#define sz_xFreeColorsReq 12
-#define sz_xStoreColorsReq 8
-#define sz_xStoreNamedColorReq 16
-#define sz_xQueryColorsReq 8
-#define sz_xLookupColorReq 12
-#define sz_xCreateCursorReq 32
-#define sz_xCreateGlyphCursorReq 32
-#define sz_xRecolorCursorReq 20
-#define sz_xQueryBestSizeReq 12
-#define sz_xQueryExtensionReq 8
-#define sz_xChangeKeyboardControlReq 8
-#define sz_xBellReq 4
-#define sz_xChangePointerControlReq 12
-#define sz_xSetScreenSaverReq 12
-#define sz_xChangeHostsReq 8
-#define sz_xListHostsReq 4
-#define sz_xChangeModeReq 4
-#define sz_xRotatePropertiesReq 12
-#define sz_xReply 32
-#define sz_xGrabKeyboardReply 32
-#define sz_xListFontsWithInfoReply 60
-#define sz_xSetPointerMappingReply 32
-#define sz_xGetKeyboardMappingReply 32
-#define sz_xGetPointerMappingReply 32
-#define sz_xGetModifierMappingReply 32
-#define sz_xListFontsWithInfoReq 8
-#define sz_xPolyLineReq 12
-#define sz_xPolyArcReq 12
-#define sz_xPolyRectangleReq 12
-#define sz_xPolyFillRectangleReq 12
-#define sz_xPolyFillArcReq 12
-#define sz_xPolyText8Req 16
-#define sz_xPolyText16Req 16
-#define sz_xImageText8Req 16
-#define sz_xImageText16Req 16
-#define sz_xSetPointerMappingReq 4
-#define sz_xForceScreenSaverReq 4
-#define sz_xSetCloseDownModeReq 4
-#define sz_xClearAreaReq 16
-#define sz_xSetAccessControlReq 4
-#define sz_xGetKeyboardMappingReq 8
-#define sz_xSetModifierMappingReq 4
-#define sz_xPropIconSize 24
-#define sz_xChangeKeyboardMappingReq 8
-
-
-/* For the purpose of the structure definitions in this file,
-we must redefine the following types in terms of Xmd.h's types, which may
-include bit fields.  All of these are #undef'd at the end of this file,
-restoring the definitions in X.h.  */
-
-#define Window CARD32
-#define Drawable CARD32
-#define Font CARD32
-#define Pixmap CARD32
-#define Cursor CARD32
-#define Colormap CARD32
-#define GContext CARD32
-#define Atom CARD32
-#define VisualID CARD32
-#define Time CARD32
-#define KeyCode CARD8
-#define KeySym CARD32
-
-#define X_TCP_PORT 6000     /* add display number */
-
-#define xTrue        1
-#define xFalse       0
-
-
-typedef CARD16 KeyButMask;
-
-/***************** 
-   Connection setup structures.  See Chapter 8: Connection Setup
-   of the X Window System Protocol specification for details.
-*****************/
-
-/* Client initiates handshake with this data, followed by the strings
- * for the auth protocol & data.
- */
-typedef struct {
-    CARD8	byteOrder;
-    BYTE	pad;
-    CARD16	majorVersion B16, minorVersion B16;
-    CARD16	nbytesAuthProto B16;	/* Authorization protocol */
-    CARD16	nbytesAuthString B16;	/* Authorization string */
-    CARD16	pad2 B16;
-} xConnClientPrefix;
-
-/* Server response to xConnClientPrefix.
- *
- * If success == Success, this is followed by xConnSetup and
- * numRoots xWindowRoot structs.
- *
- * If success == Failure, this is followed by a reason string.
- *
- * The protocol also defines a case of success == Authenticate, but
- * that doesn't seem to have ever been implemented by the X Consortium.
- */
-typedef struct {
-    CARD8          success;
-    BYTE           lengthReason; /*num bytes in string following if failure */
-    CARD16         majorVersion B16, 
-                   minorVersion B16;
-    CARD16         length B16;  /* 1/4 additional bytes in setup info */
-} xConnSetupPrefix;
-
-
-typedef struct {
-    CARD32         release B32;
-    CARD32         ridBase B32, 
-                   ridMask B32;
-    CARD32         motionBufferSize B32;
-    CARD16         nbytesVendor B16;  /* number of bytes in vendor string */
-    CARD16         maxRequestSize B16;
-    CARD8          numRoots;          /* number of roots structs to follow */
-    CARD8          numFormats;        /* number of pixmap formats */
-    CARD8          imageByteOrder;        /* LSBFirst, MSBFirst */
-    CARD8          bitmapBitOrder;        /* LeastSignificant, MostSign...*/
-    CARD8          bitmapScanlineUnit,     /* 8, 16, 32 */
-                   bitmapScanlinePad;     /* 8, 16, 32 */
-    KeyCode	   minKeyCode, maxKeyCode;
-    CARD32	   pad2 B32;
-} xConnSetup;
-
-typedef struct {
-    CARD8          depth;
-    CARD8          bitsPerPixel;
-    CARD8          scanLinePad;
-    CARD8          pad1;
-    CARD32	   pad2 B32;
-} xPixmapFormat;
-
-/* window root */
-
-typedef struct {
-    CARD8 	depth;
-    CARD8 	pad1;
-    CARD16	nVisuals B16;  /* number of xVisualType structures following */
-    CARD32	pad2 B32;
-    } xDepth;
-
-typedef struct {
-    VisualID visualID B32;
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8 c_class;
-#else
-    CARD8 class;
-#endif
-    CARD8 bitsPerRGB;
-    CARD16 colormapEntries B16;
-    CARD32 redMask B32, greenMask B32, blueMask B32;
-    CARD32 pad B32;
-    } xVisualType;
-
-typedef struct {
-    Window         windowId B32;
-    Colormap       defaultColormap B32;
-    CARD32         whitePixel B32, blackPixel B32;
-    CARD32         currentInputMask B32;   
-    CARD16         pixWidth B16, pixHeight B16;
-    CARD16         mmWidth B16, mmHeight B16;
-    CARD16         minInstalledMaps B16, maxInstalledMaps B16;
-    VisualID       rootVisualID B32;
-    CARD8          backingStore;
-    BOOL           saveUnders;
-    CARD8          rootDepth;
-    CARD8          nDepths;  /* number of xDepth structures following */
-} xWindowRoot;
-
-
-/*****************************************************************
- * Structure Defns
- *   Structures needed for replies 
- *****************************************************************/
-
-/* Used in GetMotionEvents */
-
-typedef struct {
-    CARD32 time B32;
-    INT16 x B16, y B16;
-} xTimecoord;
-
-typedef struct {
-    CARD8 family;
-    BYTE pad;
-    CARD16 length B16;
-} xHostEntry;
-
-typedef struct {
-    INT16 leftSideBearing B16,
-	  rightSideBearing B16,
-	  characterWidth B16,
-	  ascent B16,
-	  descent B16;
-    CARD16 attributes B16;
-} xCharInfo;
-
-typedef struct {
-    Atom name B32;
-    CARD32 value B32;
-} xFontProp;
-
-/*
- * non-aligned big-endian font ID follows this struct
- */
-typedef struct {           /* followed by string */
-    CARD8 len;	/* number of *characters* in string, or FontChange (255)
-		   for font change, or 0 if just delta given */
-    INT8 delta;
-} xTextElt;
-
-
-typedef struct {        
-    CARD32 pixel B32;
-    CARD16 red B16, green B16, blue B16;
-    CARD8 flags;  /* DoRed, DoGreen, DoBlue booleans */
-    CARD8 pad;
-} xColorItem;
-
-
-typedef struct {
-    CARD16 red B16, green B16, blue B16, pad B16;
-} xrgb;
-
-typedef CARD8 KEYCODE;
-
-
-/*****************
- * XRep:
- *    meant to be 32 byte quantity 
- *****************/
-
-/* GenericReply is the common format of all replies.  The "data" items
-   are specific to each individual reply type. */
-
-typedef struct {	
-    BYTE type;              /* X_Reply */
-    BYTE data1;             /* depends on reply type */
-    CARD16 sequenceNumber B16;  /* of last request received by server */
-    CARD32 length B32;      /* 4 byte quantities beyond size of GenericReply */
-    CARD32 data00 B32;
-    CARD32 data01 B32;
-    CARD32 data02 B32;
-    CARD32 data03 B32;
-    CARD32 data04 B32;
-    CARD32 data05 B32;
-    } xGenericReply;
-
-/* Individual reply formats. */
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    CARD8 backingStore;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;	/* NOT 0; this is an extra-large reply */
-    VisualID visualID B32;
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD16 c_class B16;
-#else
-    CARD16 class B16;
-#endif
-    CARD8 bitGravity;
-    CARD8 winGravity;
-    CARD32 backingBitPlanes B32;
-    CARD32 backingPixel B32;
-    BOOL saveUnder;
-    BOOL mapInstalled;
-    CARD8 mapState;
-    BOOL override;
-    Colormap colormap B32;
-    CARD32 allEventMasks B32;
-    CARD32 yourEventMask B32;
-    CARD16 doNotPropagateMask B16;
-    CARD16 pad B16;
-    } xGetWindowAttributesReply;
-
-typedef struct {
-    BYTE type;   /* X_Reply */
-    CARD8 depth;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    Window root B32;
-    INT16 x B16, y B16;
-    CARD16 width B16, height B16;
-    CARD16 borderWidth B16;
-    CARD16 pad1 B16;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    } xGetGeometryReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    Window root B32, parent B32;
-    CARD16 nChildren B16;
-    CARD16 pad2 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    } xQueryTreeReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32; /* 0 */
-    Atom atom B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    } xInternAtomReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* of additional bytes */
-    CARD16 nameLength B16;  /* # of characters in name */
-    CARD16 pad2 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xGetAtomNameReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    CARD8 format;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32; /* of additional bytes */
-    Atom propertyType B32;
-    CARD32 bytesAfter B32;
-    CARD32 nItems B32; /* # of 8, 16, or 32-bit entities in reply */
-    CARD32 pad1 B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    } xGetPropertyReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD16 nProperties B16;
-    CARD16 pad2 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xListPropertiesReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    Window owner B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    } xGetSelectionOwnerReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE status;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    CARD32 pad1 B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    } xGrabPointerReply;
-
-typedef xGrabPointerReply xGrabKeyboardReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BOOL sameScreen;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    Window root B32, child B32;
-    INT16 rootX B16, rootY B16, winX B16, winY B16;
-    CARD16 mask B16;
-    CARD16 pad1 B16;
-    CARD32 pad B32;
-    } xQueryPointerReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD32 nEvents B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    } xGetMotionEventsReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BOOL sameScreen;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32; /* 0 */
-    Window child B32;
-    INT16 dstX B16, dstY B16;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    } xTranslateCoordsReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    CARD8 revertTo;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    Window focus B32;
-    CARD32 pad1 B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    } xGetInputFocusReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 2, NOT 0; this is an extra-large reply */
-    BYTE map[32];
-    } xQueryKeymapReply;
-
-/* Warning: this MUST match (up to component renaming) xListFontsWithInfoReply */
-typedef struct _xQueryFontReply {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* definitely > 0, even if "nCharInfos" is 0 */
-    xCharInfo minBounds; 
-    CARD32 walign1 B32;
-    xCharInfo maxBounds; 
-    CARD32 walign2 B32;
-    CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
-    CARD16 defaultChar B16;
-    CARD16 nFontProps B16;  /* followed by this many xFontProp structures */
-    CARD8 drawDirection;
-    CARD8 minByte1, maxByte1;
-    BOOL allCharsExist;
-    INT16 fontAscent B16, fontDescent B16;
-    CARD32 nCharInfos B32; /* followed by this many xCharInfo structures */
-} xQueryFontReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    CARD8 drawDirection;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    INT16 fontAscent B16, fontDescent B16;
-    INT16 overallAscent B16, overallDescent B16;
-    INT32 overallWidth B32, overallLeft B32, overallRight B32;
-    CARD32 pad B32;
-    } xQueryTextExtentsReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD16 nFonts B16;
-    CARD16 pad2 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xListFontsReply;
-
-/* Warning: this MUST match (up to component renaming) xQueryFontReply */
-typedef struct {
-    BYTE type;  /* X_Reply */
-    CARD8 nameLength;  /* 0 indicates end-of-reply-sequence */
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* definitely > 0, even if "nameLength" is 0 */
-    xCharInfo minBounds; 
-    CARD32 walign1 B32;
-    xCharInfo maxBounds; 
-    CARD32 walign2 B32;
-    CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
-    CARD16 defaultChar B16;
-    CARD16 nFontProps B16;  /* followed by this many xFontProp structures */
-    CARD8 drawDirection;
-    CARD8 minByte1, maxByte1;
-    BOOL allCharsExist;
-    INT16 fontAscent B16, fontDescent B16;
-    CARD32 nReplies B32;   /* hint as to how many more replies might be coming */
-} xListFontsWithInfoReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD16 nPaths B16;
-    CARD16 pad2 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xGetFontPathReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    CARD8 depth;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    VisualID visual B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xGetImageReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD16 nColormaps B16;
-    CARD16 pad2 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xListInstalledColormapsReply;
-
-typedef struct {
-    BYTE type; /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;   /* 0 */
-    CARD16 red B16, green B16, blue B16;
-    CARD16 pad2 B16;
-    CARD32 pixel B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    } xAllocColorReply;
-
-typedef struct {
-    BYTE type; /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    CARD32 pixel B32;
-    CARD16 exactRed B16, exactGreen B16, exactBlue B16;
-    CARD16 screenRed B16, screenGreen B16, screenBlue B16;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    } xAllocNamedColorReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD16 nPixels B16, nMasks B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xAllocColorCellsReply;
-
-typedef struct {
-    BYTE type; /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD16 nPixels B16;
-    CARD16 pad2 B16;
-    CARD32 redMask B32, greenMask B32, blueMask B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    } xAllocColorPlanesReply;
-
-typedef struct {
-    BYTE type; /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD16 nColors B16;
-    CARD16 pad2 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xQueryColorsReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    CARD16 exactRed B16, exactGreen B16, exactBlue B16;
-    CARD16 screenRed B16, screenGreen B16, screenBlue B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    } xLookupColorReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    CARD16 width B16, height B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xQueryBestSizeReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32; /* 0 */
-    BOOL  present;
-    CARD8 major_opcode;
-    CARD8 first_event;
-    CARD8 first_error;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xQueryExtensionReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    CARD8 nExtensions;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xListExtensionsReply;
-
-
-typedef struct {
-    BYTE   type;  /* X_Reply */
-    CARD8  success;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xSetMappingReply;
-typedef xSetMappingReply xSetPointerMappingReply;
-typedef xSetMappingReply xSetModifierMappingReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    CARD8 nElts;  /* how many elements does the map have */
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xGetPointerMappingReply;
-
-typedef struct {
-    BYTE type;
-    CARD8 keySymsPerKeyCode;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-} xGetKeyboardMappingReply;    
-
-typedef struct {
-    BYTE type;
-    CARD8 numKeyPerModifier;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD32 pad1 B32;
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-} xGetModifierMappingReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BOOL globalAutoRepeat;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 5 */
-    CARD32 ledMask B32;
-    CARD8 keyClickPercent, bellPercent;
-    CARD16 bellPitch B16, bellDuration B16;
-    CARD16 pad B16;
-    BYTE map[32];  /* bit masks start here */
-    } xGetKeyboardControlReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    CARD16 accelNumerator B16, accelDenominator B16;
-    CARD16 threshold B16;
-    CARD16 pad2 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    } xGetPointerControlReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BYTE pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;  /* 0 */
-    CARD16 timeout B16, interval B16;
-    BOOL preferBlanking;
-    BOOL allowExposures;
-    CARD16 pad2 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    } xGetScreenSaverReply;
-
-typedef struct {
-    BYTE type;  /* X_Reply */
-    BOOL enabled;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD16 nHosts B16;
-    CARD16 pad1 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    } xListHostsReply;
-
-
-
-
-/*****************************************************************
- * Xerror
- *    All errors  are 32 bytes 
- *****************************************************************/
-
-typedef struct {
-    BYTE type;                  /* X_Error */
-    BYTE errorCode;
-    CARD16 sequenceNumber B16;       /* the nth request from this client */
-    CARD32 resourceID B32;
-    CARD16 minorCode B16;
-    CARD8 majorCode;
-    BYTE pad1;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-} xError;
-
-/*****************************************************************
- * xEvent
- *    All events are 32 bytes
- *****************************************************************/
-
-typedef struct _xEvent {
-    union {
-	struct {
-	    BYTE type;
-	    BYTE detail;
-	    CARD16 sequenceNumber B16;
-	    } u;
-	struct {
-            CARD32 pad00 B32;
-	    Time time B32;
-	    Window root B32, event B32, child B32;
-	    INT16 rootX B16, rootY B16, eventX B16, eventY B16;
-	    KeyButMask state B16;
-	    BOOL sameScreen;		
-	    BYTE pad1;
-	} keyButtonPointer;
-	struct {
-            CARD32 pad00 B32;
-            Time time B32;
-	    Window root B32, event B32, child B32;
-	    INT16 rootX B16, rootY B16, eventX B16, eventY B16;
-	    KeyButMask state B16;
-	    BYTE mode; 			/* really XMode */
-	    BYTE flags;		/* sameScreen and focus booleans, packed together */
-#define ELFlagFocus        (1<<0)
-#define ELFlagSameScreen   (1<<1)
-	} enterLeave;
-	struct {
-            CARD32 pad00 B32;
-	    Window window B32;
-	    BYTE mode; 			/* really XMode */
-	    BYTE pad1, pad2, pad3;
-	} focus;
-	struct {
-            CARD32 pad00 B32;
-	    Window window B32;
-	    CARD16 x B16, y B16, width B16, height B16;
-	    CARD16 count B16;
-	    CARD16 pad2 B16;
-	} expose;
-	struct {
-            CARD32 pad00 B32;
-	    Drawable drawable B32;
-	    CARD16 x B16, y B16, width B16, height B16;
-	    CARD16 minorEvent B16;
-	    CARD16 count B16;
-	    BYTE majorEvent;
-	    BYTE pad1, pad2, pad3;
-	} graphicsExposure;
-	struct {
-            CARD32 pad00 B32;
-	    Drawable drawable B32;
-	    CARD16 minorEvent B16;
-	    BYTE majorEvent;
-	    BYTE bpad;
-	} noExposure;
-	struct {
-            CARD32 pad00 B32;
-	    Window window B32;
-	    CARD8 state;
-	    BYTE pad1, pad2, pad3;
-	} visibility;
-	struct {
-            CARD32 pad00 B32;
-	    Window parent B32, window B32;
-	    INT16 x B16, y B16;
-	    CARD16 width B16, height B16, borderWidth B16;
-	    BOOL override;
-	    BYTE bpad;
-        } createNotify;
-/*
- * The event fields in the structures for DestroyNotify, UnmapNotify,
- * MapNotify, ReparentNotify, ConfigureNotify, CirculateNotify, GravityNotify,
- * must be at the same offset because server internal code is depending upon
- * this to patch up the events before they are delivered.
- * Also note that MapRequest, ConfigureRequest and CirculateRequest have
- * the same offset for the event window.
- */
-	struct {
-            CARD32 pad00 B32;
-	    Window event B32, window B32;
-	} destroyNotify;
-	struct {
-            CARD32 pad00 B32;
-	    Window event B32, window B32;
-	    BOOL fromConfigure;
-	    BYTE pad1, pad2, pad3;
-        } unmapNotify;
-	struct {
-            CARD32 pad00 B32;
-	    Window event B32, window B32;
-	    BOOL override;
-	    BYTE pad1, pad2, pad3;
-        } mapNotify;
-	struct {
-            CARD32 pad00 B32;
-	    Window parent B32, window B32;
-        } mapRequest;
-	struct {
-            CARD32 pad00 B32;
-	    Window event B32, window B32, parent B32;
-	    INT16 x B16, y B16;
-	    BOOL override;
-	    BYTE pad1, pad2, pad3;
-	} reparent;
-	struct {
-            CARD32 pad00 B32;
-	    Window event B32, window B32, aboveSibling B32;
-	    INT16 x B16, y B16;
-	    CARD16 width B16, height B16, borderWidth B16;
-	    BOOL override;		
-	    BYTE bpad;
-	} configureNotify;
-	struct {
-            CARD32 pad00 B32;
-	    Window parent B32, window B32, sibling B32;
-	    INT16 x B16, y B16;
-	    CARD16 width B16, height B16, borderWidth B16;
-	    CARD16 valueMask B16;
-	    CARD32 pad1 B32;
-	} configureRequest;
-	struct {
-            CARD32 pad00 B32;
-	    Window event B32, window B32;
-	    INT16 x B16, y B16;
-	    CARD32 pad1 B32, pad2 B32, pad3 B32, pad4 B32;
-	} gravity;
-	struct {
-            CARD32 pad00 B32;
-	    Window window B32;
-	    CARD16 width B16, height B16;
-	} resizeRequest;
-	struct {
-/* The event field in the circulate record is really the parent when this
-   is used as a CirculateRequest instead of a CirculateNotify */
-            CARD32 pad00 B32;
-	    Window event B32, window B32, parent B32;
-	    BYTE place;			/* Top or Bottom */
-	    BYTE pad1, pad2, pad3;
-	} circulate;
-	struct {
-            CARD32 pad00 B32;
-	    Window window B32;
-	    Atom atom B32;
-	    Time time B32;
-	    BYTE state;			/* NewValue or Deleted */
-	    BYTE pad1;
-	    CARD16 pad2 B16;
-	} property;
-	struct {
-            CARD32 pad00 B32;
-            Time time B32;     
-	    Window window B32;
-	    Atom atom B32;
-	} selectionClear;
-	struct {
-            CARD32 pad00 B32;
-            Time time B32;    
-	    Window owner B32, requestor B32;
-	    Atom selection B32, target B32, property B32;
-	} selectionRequest;
-	struct {
-            CARD32 pad00 B32;
-            Time time B32;   
-	    Window requestor B32;
-	    Atom selection B32, target B32, property B32;
-	} selectionNotify;
-	struct {
-            CARD32 pad00 B32;
-	    Window window B32;
-	    Colormap colormap B32;
-#if defined(__cplusplus) || defined(c_plusplus)
-	    BOOL c_new;
-#else
-	    BOOL new;
-#endif
-	    BYTE state;			/* Installed or UnInstalled */
-	    BYTE pad1, pad2;
-	} colormap;
-	struct {
-	    CARD32 pad00 B32;
-	    CARD8 request;
-	    KeyCode firstKeyCode;
-	    CARD8 count;
-	    BYTE pad1;
-	} mappingNotify;
-	struct {
-            CARD32 pad00 B32;
-	    Window window B32;
-	    union {
-		struct {
-		    Atom type B32;
-		    INT32 longs0 B32;
-		    INT32 longs1 B32;
-		    INT32 longs2 B32;
-		    INT32 longs3 B32;
-		    INT32 longs4 B32;
-		} l;
-		struct {
-		    Atom type B32;
-		    INT16 shorts0 B16;
-		    INT16 shorts1 B16;
-		    INT16 shorts2 B16;
-		    INT16 shorts3 B16;
-		    INT16 shorts4 B16;
-		    INT16 shorts5 B16;
-		    INT16 shorts6 B16;
-		    INT16 shorts7 B16;
-		    INT16 shorts8 B16;
-		    INT16 shorts9 B16;
-		} s;
-		struct {
-		    Atom type B32;
-		    INT8 bytes[20];
-		} b;
-	    } u; 
-	} clientMessage;
-    } u;
-} xEvent;
-
-/*********************************************************
- *
- * Generic event
- * 
- * Those events are not part of the core protocol spec and can be used by
- * various extensions.
- * type is always GenericEvent
- * extension is the minor opcode of the extension the event belongs to.
- * evtype is the actual event type, unique __per extension__. 
- *
- * GenericEvents can be longer than 32 bytes, with the length field
- * specifying the number of 4 byte blocks after the first 32 bytes. 
- *
- *
- */
-typedef struct 
-{
-    BYTE    type;
-    CARD8   extension;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD16  evtype B16;
-    CARD16  pad2 B16;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-    CARD32  pad6 B32;
-    CARD32  pad7 B32;
-} xGenericEvent;
-
-
-
-/* KeymapNotify events are not included in the above union because they
-   are different from all other events: they do not have a "detail"
-   or "sequenceNumber", so there is room for a 248-bit key mask. */
-
-typedef struct {
-    BYTE type;
-    BYTE map[31];
-    } xKeymapEvent;
-
-#define XEventSize (sizeof(xEvent))
-
-/* XReply is the union of all the replies above whose "fixed part"
-fits in 32 bytes.  It does NOT include GetWindowAttributesReply,
-QueryFontReply, QueryKeymapReply, or GetKeyboardControlReply 
-ListFontsWithInfoReply */
-
-typedef union {
-    xGenericReply generic;
-    xGetGeometryReply geom;
-    xQueryTreeReply tree;
-    xInternAtomReply atom;
-    xGetAtomNameReply atomName;
-    xGetPropertyReply property;
-    xListPropertiesReply listProperties;
-    xGetSelectionOwnerReply selection;
-    xGrabPointerReply grabPointer;
-    xGrabKeyboardReply grabKeyboard;
-    xQueryPointerReply pointer;
-    xGetMotionEventsReply motionEvents;
-    xTranslateCoordsReply coords;
-    xGetInputFocusReply inputFocus;
-    xQueryTextExtentsReply textExtents;
-    xListFontsReply fonts;
-    xGetFontPathReply fontPath;
-    xGetImageReply image;
-    xListInstalledColormapsReply colormaps;
-    xAllocColorReply allocColor;
-    xAllocNamedColorReply allocNamedColor;
-    xAllocColorCellsReply colorCells;
-    xAllocColorPlanesReply colorPlanes;
-    xQueryColorsReply colors;
-    xLookupColorReply lookupColor;
-    xQueryBestSizeReply bestSize;
-    xQueryExtensionReply extension;
-    xListExtensionsReply extensions;
-    xSetModifierMappingReply setModifierMapping;
-    xGetModifierMappingReply getModifierMapping;
-    xSetPointerMappingReply setPointerMapping;
-    xGetKeyboardMappingReply getKeyboardMapping;
-    xGetPointerMappingReply getPointerMapping;
-    xGetPointerControlReply pointerControl;
-    xGetScreenSaverReply screenSaver;
-    xListHostsReply hosts;
-    xError error;
-    xEvent event;
-} xReply;
-
-
-
-/*****************************************************************
- * REQUESTS
- *****************************************************************/
-
-
-/* Request structure */
-
-typedef struct _xReq {
-	CARD8 reqType;
-	CARD8 data;            /* meaning depends on request type */
-	CARD16 length B16;         /* length in 4 bytes quantities 
-				  of whole request, including this header */
-} xReq;
-
-/*****************************************************************
- *  structures that follow request. 
- *****************************************************************/
-
-/* ResourceReq is used for any request which has a resource ID 
-   (or Atom or Time) as its one and only argument.  */
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    CARD32 id B32;  /* a Window, Drawable, Font, GContext, Pixmap, etc. */
-    } xResourceReq;
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 depth;
-    CARD16 length B16;
-    Window wid B32, parent B32;
-    INT16 x B16, y B16;
-    CARD16 width B16, height B16, borderWidth B16;  
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD16 c_class B16;
-#else
-    CARD16 class B16;
-#endif
-    VisualID visual B32;
-    CARD32 mask B32;
-} xCreateWindowReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Window window B32;
-    CARD32 valueMask B32; 
-} xChangeWindowAttributesReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE mode;
-    CARD16 length B16;
-    Window window B32;
-} xChangeSaveSetReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Window window B32, parent B32;
-    INT16 x B16, y B16;
-} xReparentWindowReq;
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 pad;
-    CARD16 length B16;
-    Window window B32;
-    CARD16 mask B16;
-    CARD16 pad2 B16;
-} xConfigureWindowReq;
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 direction;
-    CARD16 length B16;
-    Window window B32;
-} xCirculateWindowReq;
-
-typedef struct {    /* followed by padded string */
-    CARD8 reqType;
-    BOOL onlyIfExists;
-    CARD16 length B16;
-    CARD16 nbytes  B16;    /* number of bytes in string */
-    CARD16 pad B16;
-} xInternAtomReq;
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 mode;
-    CARD16 length B16;
-    Window window B32;
-    Atom property B32, type B32;
-    CARD8 format;
-    BYTE pad[3];
-    CARD32 nUnits B32;     /* length of stuff following, depends on format */
-} xChangePropertyReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Window window B32;
-    Atom property B32;
-} xDeletePropertyReq;
-
-typedef struct {
-    CARD8 reqType;
-#if defined(__cplusplus) || defined(c_plusplus)
-    BOOL c_delete;
-#else
-    BOOL delete;
-#endif
-    CARD16 length B16;
-    Window window B32;
-    Atom property B32, type B32;
-    CARD32 longOffset B32;
-    CARD32 longLength B32;
-} xGetPropertyReq;
- 
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Window window B32;
-    Atom selection B32;
-    Time time B32;
-} xSetSelectionOwnerReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Window requestor B32;
-    Atom selection B32, target B32, property B32;
-    Time time B32;
-    } xConvertSelectionReq;
-
-typedef struct {
-    CARD8 reqType;
-    BOOL propagate;
-    CARD16 length B16;
-    Window destination B32;
-    CARD32 eventMask B32;
-    xEvent event;
-} xSendEventReq;
-
-typedef struct {
-    CARD8 reqType;
-    BOOL ownerEvents;
-    CARD16 length B16;
-    Window grabWindow B32;
-    CARD16 eventMask B16;
-    BYTE pointerMode, keyboardMode;
-    Window confineTo B32;
-    Cursor cursor B32;
-    Time time B32;
-} xGrabPointerReq;
-
-typedef struct {
-    CARD8 reqType;
-    BOOL ownerEvents;
-    CARD16 length B16;
-    Window grabWindow B32;
-    CARD16 eventMask B16;
-    BYTE pointerMode, keyboardMode;
-    Window confineTo B32;
-    Cursor cursor B32;
-    CARD8 button;
-    BYTE pad;
-    CARD16 modifiers B16;
-} xGrabButtonReq;
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 button;
-    CARD16 length B16;
-    Window grabWindow B32;
-    CARD16 modifiers B16;
-    CARD16 pad B16;
-} xUngrabButtonReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Cursor cursor B32;
-    Time time B32;
-    CARD16 eventMask B16;
-    CARD16 pad2 B16;
-} xChangeActivePointerGrabReq;
-
-typedef struct {
-    CARD8 reqType;
-    BOOL ownerEvents;
-    CARD16 length B16;
-    Window grabWindow B32;
-    Time time B32;
-    BYTE pointerMode, keyboardMode;  
-    CARD16 pad B16;
-} xGrabKeyboardReq;
-
-typedef struct {
-    CARD8 reqType;
-    BOOL ownerEvents;
-    CARD16 length B16;
-    Window grabWindow B32;
-    CARD16 modifiers B16;
-    CARD8 key;
-    BYTE pointerMode, keyboardMode;  
-    BYTE pad1, pad2, pad3;
-} xGrabKeyReq;
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 key;
-    CARD16 length B16;
-    Window grabWindow B32;
-    CARD16 modifiers B16;
-    CARD16 pad B16;
-} xUngrabKeyReq;
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 mode;
-    CARD16 length B16;
-    Time time B32;
-} xAllowEventsReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Window window B32;
-    Time start B32, stop B32;
-} xGetMotionEventsReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Window srcWid B32, dstWid B32;
-    INT16 srcX B16, srcY B16;
-} xTranslateCoordsReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Window srcWid B32, dstWid B32;
-    INT16 srcX B16, srcY B16;
-    CARD16 srcWidth B16, srcHeight B16;
-    INT16 dstX B16, dstY B16;
-} xWarpPointerReq;
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 revertTo;
-    CARD16 length B16;
-    Window focus B32;
-    Time time B32;
-} xSetInputFocusReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Font fid B32;
-    CARD16 nbytes B16;
-    BYTE pad1, pad2;	/* string follows on word boundary */
-} xOpenFontReq;
-
-typedef struct {
-    CARD8 reqType;
-    BOOL oddLength;
-    CARD16 length B16;
-    Font fid B32;
-    } xQueryTextExtentsReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    CARD16 maxNames B16;
-    CARD16 nbytes B16;  /* followed immediately by string bytes */
-} xListFontsReq;
-
-typedef xListFontsReq xListFontsWithInfoReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    CARD16 nFonts B16;
-    BYTE pad1, pad2;	/* LISTofSTRING8 follows on word boundary */
-} xSetFontPathReq;
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 depth;
-    CARD16 length B16;
-    Pixmap pid B32;
-    Drawable drawable B32;
-    CARD16 width B16, height B16;
-} xCreatePixmapReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    GContext gc B32;
-    Drawable drawable B32;
-    CARD32 mask B32;
-} xCreateGCReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    GContext gc B32;
-    CARD32 mask B32;
-} xChangeGCReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    GContext srcGC B32, dstGC B32;
-    CARD32 mask B32;
-} xCopyGCReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    GContext gc B32;
-    CARD16 dashOffset B16;
-    CARD16 nDashes B16;        /* length LISTofCARD8 of values following */
-} xSetDashesReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE ordering;
-    CARD16 length B16;
-    GContext gc B32;
-    INT16 xOrigin B16, yOrigin B16;
-} xSetClipRectanglesReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BOOL exposures;
-    CARD16 length B16;
-    Window window B32;
-    INT16 x B16, y B16;
-    CARD16 width B16, height B16;
-} xClearAreaReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Drawable srcDrawable B32, dstDrawable B32;
-    GContext gc B32;
-    INT16 srcX B16, srcY B16, dstX B16, dstY B16;
-    CARD16 width B16, height B16;
-} xCopyAreaReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Drawable srcDrawable B32, dstDrawable B32;
-    GContext gc B32;
-    INT16 srcX B16, srcY B16, dstX B16, dstY B16;
-    CARD16 width B16, height B16;
-    CARD32 bitPlane B32;
-} xCopyPlaneReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE coordMode;
-    CARD16 length B16;
-    Drawable drawable B32;
-    GContext gc B32;
-} xPolyPointReq;    
-
-typedef xPolyPointReq xPolyLineReq;  /* same request structure */
-
-/* The following used for PolySegment, PolyRectangle, PolyArc, PolyFillRectangle, PolyFillArc */
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Drawable drawable B32;
-    GContext gc B32;
-} xPolySegmentReq;    
-
-typedef xPolySegmentReq xPolyArcReq;
-typedef xPolySegmentReq xPolyRectangleReq;
-typedef xPolySegmentReq xPolyFillRectangleReq;
-typedef xPolySegmentReq xPolyFillArcReq;
-
-typedef struct _FillPolyReq {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Drawable drawable B32;
-    GContext gc B32;
-    BYTE shape;
-    BYTE coordMode;
-    CARD16 pad1 B16;
-} xFillPolyReq;    
-
-
-typedef struct _PutImageReq {
-    CARD8 reqType;
-    CARD8 format;
-    CARD16 length B16;
-    Drawable drawable B32;
-    GContext gc B32;
-    CARD16 width B16, height B16;
-    INT16 dstX B16, dstY B16;
-    CARD8 leftPad;
-    CARD8 depth;
-    CARD16 pad B16;
-} xPutImageReq;    
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 format;
-    CARD16 length B16;
-    Drawable drawable B32;
-    INT16 x B16, y B16;
-    CARD16 width B16, height B16;
-    CARD32 planeMask B32;
-} xGetImageReq;    
-
-/* the following used by PolyText8 and PolyText16 */
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 pad;
-    CARD16 length B16;
-    Drawable drawable B32;
-    GContext gc B32;
-    INT16 x B16, y B16;		/* items (xTextElt) start after struct */
-} xPolyTextReq;    
-
-typedef xPolyTextReq xPolyText8Req;
-typedef xPolyTextReq xPolyText16Req;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE nChars;
-    CARD16 length B16;
-    Drawable drawable B32;
-    GContext gc B32;
-    INT16 x B16, y B16;
-} xImageTextReq;    
-
-typedef xImageTextReq xImageText8Req;
-typedef xImageTextReq xImageText16Req;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE alloc;
-    CARD16 length B16;
-    Colormap mid B32;
-    Window window B32;
-    VisualID visual B32;
-} xCreateColormapReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Colormap mid B32;
-    Colormap srcCmap B32;
-} xCopyColormapAndFreeReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Colormap cmap B32;
-    CARD16 red B16, green B16, blue B16;
-    CARD16 pad2 B16;
-} xAllocColorReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Colormap cmap B32;
-    CARD16 nbytes B16;  /* followed by structure */
-    BYTE pad1, pad2;
-} xAllocNamedColorReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BOOL contiguous;
-    CARD16 length B16;
-    Colormap cmap B32;
-    CARD16 colors B16, planes B16;
-} xAllocColorCellsReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BOOL contiguous;
-    CARD16 length B16;
-    Colormap cmap B32;
-    CARD16 colors B16, red B16, green B16, blue B16;
-} xAllocColorPlanesReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Colormap cmap B32;
-    CARD32 planeMask B32;
-} xFreeColorsReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Colormap cmap B32;
-} xStoreColorsReq;    
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 flags;   /* DoRed, DoGreen, DoBlue, as in xColorItem */
-    CARD16 length B16;
-    Colormap cmap B32;
-    CARD32 pixel B32;
-    CARD16 nbytes B16;  /* number of name string bytes following structure */
-    BYTE pad1, pad2;
-    } xStoreNamedColorReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Colormap cmap B32;
-} xQueryColorsReq;    
-
-typedef struct {    /* followed  by string of length len */
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Colormap cmap B32;
-    CARD16 nbytes B16;  /* number of string bytes following structure*/
-    BYTE pad1, pad2;
-} xLookupColorReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Cursor cid B32;
-    Pixmap source B32, mask B32;
-    CARD16 foreRed B16, foreGreen B16, foreBlue B16;
-    CARD16 backRed B16, backGreen B16, backBlue B16;
-    CARD16 x B16, y B16;
-} xCreateCursorReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Cursor cid B32;
-    Font source B32, mask B32;
-    CARD16 sourceChar B16, maskChar B16;
-    CARD16 foreRed B16, foreGreen B16, foreBlue B16;
-    CARD16 backRed B16, backGreen B16, backBlue B16;
-} xCreateGlyphCursorReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Cursor cursor B32;
-    CARD16 foreRed B16, foreGreen B16, foreBlue B16;
-    CARD16 backRed B16, backGreen B16, backBlue B16;
-} xRecolorCursorReq;    
-
-typedef struct {
-    CARD8 reqType;
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8 c_class;
-#else
-    CARD8 class;
-#endif
-    CARD16 length B16;
-    Drawable drawable B32;
-    CARD16 width B16, height B16;
-} xQueryBestSizeReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    CARD16 nbytes B16;  /* number of string bytes following structure */
-    BYTE pad1, pad2;
-} xQueryExtensionReq;
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   numKeyPerModifier;
-    CARD16  length B16;
-} xSetModifierMappingReq;
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 nElts;  /* how many elements in the map */
-    CARD16 length B16;
-} xSetPointerMappingReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    KeyCode firstKeyCode;
-    CARD8 count;
-    CARD16 pad1 B16;
-} xGetKeyboardMappingReq;    
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 keyCodes;
-    CARD16 length B16;
-    KeyCode firstKeyCode;
-    CARD8 keySymsPerKeyCode;
-    CARD16 pad1 B16;
-} xChangeKeyboardMappingReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    CARD32 mask B32;
-} xChangeKeyboardControlReq;    
-
-typedef struct {
-    CARD8 reqType;
-    INT8 percent;  /* -100 to 100 */
-    CARD16 length B16;
-} xBellReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    INT16 accelNum B16, accelDenum B16;
-    INT16 threshold B16;             
-    BOOL doAccel, doThresh;
-} xChangePointerControlReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    INT16 timeout B16, interval B16;
-    BYTE preferBlank, allowExpose;  
-    CARD16 pad2 B16;
-} xSetScreenSaverReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE mode;
-    CARD16 length B16;
-    CARD8 hostFamily;
-    BYTE pad;
-    CARD16 hostLength B16;
-} xChangeHostsReq;    
-
-typedef struct {
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    } xListHostsReq;
-
-typedef struct {
-    CARD8 reqType;
-    BYTE mode;
-    CARD16 length B16;
-    } xChangeModeReq;
-
-typedef xChangeModeReq xSetAccessControlReq;
-typedef xChangeModeReq xSetCloseDownModeReq;
-typedef xChangeModeReq xForceScreenSaverReq;
-
-typedef struct { /* followed by LIST of ATOM */
-    CARD8 reqType;
-    BYTE pad;
-    CARD16 length B16;
-    Window window B32;
-    CARD16 nAtoms B16;
-    INT16 nPositions B16;
-    } xRotatePropertiesReq;
-    
-
-
-/* Reply codes */
-
-#define X_Reply		1		/* Normal reply */
-#define X_Error		0		/* Error */
-
-/* Request codes */
-
-#define X_CreateWindow                  1              
-#define X_ChangeWindowAttributes        2        
-#define X_GetWindowAttributes           3     
-#define X_DestroyWindow                 4
-#define X_DestroySubwindows             5   
-#define X_ChangeSaveSet                 6
-#define X_ReparentWindow                7
-#define X_MapWindow                     8
-#define X_MapSubwindows                 9
-#define X_UnmapWindow                  10
-#define X_UnmapSubwindows              11  
-#define X_ConfigureWindow              12  
-#define X_CirculateWindow              13  
-#define X_GetGeometry                  14
-#define X_QueryTree                    15
-#define X_InternAtom                   16
-#define X_GetAtomName                  17
-#define X_ChangeProperty               18 
-#define X_DeleteProperty               19 
-#define X_GetProperty                  20
-#define X_ListProperties               21 
-#define X_SetSelectionOwner            22    
-#define X_GetSelectionOwner            23    
-#define X_ConvertSelection             24   
-#define X_SendEvent                    25
-#define X_GrabPointer                  26
-#define X_UngrabPointer                27
-#define X_GrabButton                   28
-#define X_UngrabButton                 29
-#define X_ChangeActivePointerGrab      30          
-#define X_GrabKeyboard                 31
-#define X_UngrabKeyboard               32 
-#define X_GrabKey                      33
-#define X_UngrabKey                    34
-#define X_AllowEvents                  35       
-#define X_GrabServer                   36      
-#define X_UngrabServer                 37        
-#define X_QueryPointer                 38        
-#define X_GetMotionEvents              39           
-#define X_TranslateCoords              40                
-#define X_WarpPointer                  41       
-#define X_SetInputFocus                42         
-#define X_GetInputFocus                43         
-#define X_QueryKeymap                  44       
-#define X_OpenFont                     45    
-#define X_CloseFont                    46     
-#define X_QueryFont                    47
-#define X_QueryTextExtents             48     
-#define X_ListFonts                    49  
-#define X_ListFontsWithInfo    	       50 
-#define X_SetFontPath                  51 
-#define X_GetFontPath                  52 
-#define X_CreatePixmap                 53        
-#define X_FreePixmap                   54      
-#define X_CreateGC                     55    
-#define X_ChangeGC                     56    
-#define X_CopyGC                       57  
-#define X_SetDashes                    58     
-#define X_SetClipRectangles            59             
-#define X_FreeGC                       60  
-#define X_ClearArea                    61             
-#define X_CopyArea                     62    
-#define X_CopyPlane                    63     
-#define X_PolyPoint                    64     
-#define X_PolyLine                     65    
-#define X_PolySegment                  66       
-#define X_PolyRectangle                67         
-#define X_PolyArc                      68   
-#define X_FillPoly                     69    
-#define X_PolyFillRectangle            70             
-#define X_PolyFillArc                  71       
-#define X_PutImage                     72    
-#define X_GetImage                     73 
-#define X_PolyText8                    74     
-#define X_PolyText16                   75      
-#define X_ImageText8                   76      
-#define X_ImageText16                  77       
-#define X_CreateColormap               78          
-#define X_FreeColormap                 79        
-#define X_CopyColormapAndFree          80               
-#define X_InstallColormap              81           
-#define X_UninstallColormap            82             
-#define X_ListInstalledColormaps       83                  
-#define X_AllocColor                   84      
-#define X_AllocNamedColor              85           
-#define X_AllocColorCells              86           
-#define X_AllocColorPlanes             87            
-#define X_FreeColors                   88      
-#define X_StoreColors                  89       
-#define X_StoreNamedColor              90           
-#define X_QueryColors                  91       
-#define X_LookupColor                  92       
-#define X_CreateCursor                 93        
-#define X_CreateGlyphCursor            94             
-#define X_FreeCursor                   95      
-#define X_RecolorCursor                96         
-#define X_QueryBestSize                97         
-#define X_QueryExtension               98          
-#define X_ListExtensions               99          
-#define X_ChangeKeyboardMapping        100
-#define X_GetKeyboardMapping           101
-#define X_ChangeKeyboardControl        102                
-#define X_GetKeyboardControl           103             
-#define X_Bell                         104
-#define X_ChangePointerControl         105
-#define X_GetPointerControl            106
-#define X_SetScreenSaver               107          
-#define X_GetScreenSaver               108          
-#define X_ChangeHosts                  109       
-#define X_ListHosts                    110     
-#define X_SetAccessControl             111               
-#define X_SetCloseDownMode             112
-#define X_KillClient                   113 
-#define X_RotateProperties	       114
-#define X_ForceScreenSaver	       115
-#define X_SetPointerMapping            116
-#define X_GetPointerMapping            117
-#define X_SetModifierMapping	       118
-#define X_GetModifierMapping	       119
-#define X_NoOperation                  127
-
-/* restore these definitions back to the typedefs in X.h */
-#undef Window
-#undef Drawable
-#undef Font
-#undef Pixmap
-#undef Cursor
-#undef Colormap
-#undef GContext
-#undef Atom
-#undef VisualID
-#undef Time
-#undef KeyCode
-#undef KeySym
-
-#endif /* XPROTO_H */
diff --git a/openflow/usr/include/X11/Xprotostr.h b/openflow/usr/include/X11/Xprotostr.h
deleted file mode 100644
index a9e854d..0000000
--- a/openflow/usr/include/X11/Xprotostr.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef XPROTOSTRUCTS_H
-#define XPROTOSTRUCTS_H
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-#include <X11/Xmd.h>
-
-/* Used by PolySegment */
-
-typedef struct _xSegment {
-    INT16 x1 B16, y1 B16, x2 B16, y2 B16;
-} xSegment;
-
-/* POINT */
-
-typedef struct _xPoint {
-	INT16		x B16, y B16;
-} xPoint;
-
-typedef struct _xRectangle {
-    INT16 x B16, y B16;
-    CARD16  width B16, height B16;
-} xRectangle;
-
-/*  ARC  */
-
-typedef struct _xArc {
-    INT16 x B16, y B16;
-    CARD16   width B16, height B16;
-    INT16   angle1 B16, angle2 B16;
-} xArc;
-
-#endif /* XPROTOSTRUCTS_H */
diff --git a/openflow/usr/include/X11/Xregion.h b/openflow/usr/include/X11/Xregion.h
deleted file mode 100644
index cf10f86..0000000
--- a/openflow/usr/include/X11/Xregion.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/************************************************************************
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-************************************************************************/
-
-#ifndef _X11_XREGION_H_
-#define _X11_XREGION_H_
-
-typedef struct {
-    short x1, x2, y1, y2;
-} Box, BOX, BoxRec, *BoxPtr;
-
-typedef struct {
-    short x, y, width, height;
-}RECTANGLE, RectangleRec, *RectanglePtr;
-
-#define TRUE 1
-#define FALSE 0
-#define MAXSHORT 32767
-#define MINSHORT -MAXSHORT
-#ifndef MAX
-#define MAX(a,b) (((a) > (b)) ? (a) : (b))
-#endif
-#ifndef MIN
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
-
-/*
- *   clip region
- */
-
-typedef struct _XRegion {
-    long size;
-    long numRects;
-    BOX *rects;
-    BOX extents;
-} REGION;
-
-/* Xutil.h contains the declaration:
- * typedef struct _XRegion *Region;
- */
-
-/*  1 if two BOXs overlap.
- *  0 if two BOXs do not overlap.
- *  Remember, x2 and y2 are not in the region
- */
-#define EXTENTCHECK(r1, r2) \
-	((r1)->x2 > (r2)->x1 && \
-	 (r1)->x1 < (r2)->x2 && \
-	 (r1)->y2 > (r2)->y1 && \
-	 (r1)->y1 < (r2)->y2)
-
-/*
- *  update region extents
- */
-#define EXTENTS(r,idRect){\
-            if((r)->x1 < (idRect)->extents.x1)\
-              (idRect)->extents.x1 = (r)->x1;\
-            if((r)->y1 < (idRect)->extents.y1)\
-              (idRect)->extents.y1 = (r)->y1;\
-            if((r)->x2 > (idRect)->extents.x2)\
-              (idRect)->extents.x2 = (r)->x2;\
-            if((r)->y2 > (idRect)->extents.y2)\
-              (idRect)->extents.y2 = (r)->y2;\
-        }
-
-/*
- *   Check to see if there is enough memory in the present region.
- */
-#define MEMCHECK(reg, rect, firstrect){\
-        if ((reg)->numRects >= ((reg)->size - 1)){\
-          BoxPtr tmpRect = Xrealloc ((firstrect), \
-                                     (2 * (sizeof(BOX)) * ((reg)->size))); \
-          if (tmpRect == NULL) \
-            return(0);\
-          (firstrect) = tmpRect; \
-          (reg)->size *= 2;\
-          (rect) = &(firstrect)[(reg)->numRects];\
-         }\
-       }
-
-/*  this routine checks to see if the previous rectangle is the same
- *  or subsumes the new rectangle to add.
- */
-
-#define CHECK_PREVIOUS(Reg, R, Rx1, Ry1, Rx2, Ry2)\
-               (!(((Reg)->numRects > 0)&&\
-                  ((R-1)->y1 == (Ry1)) &&\
-                  ((R-1)->y2 == (Ry2)) &&\
-                  ((R-1)->x1 <= (Rx1)) &&\
-                  ((R-1)->x2 >= (Rx2))))
-
-/*  add a rectangle to the given Region */
-#define ADDRECT(reg, r, rx1, ry1, rx2, ry2){\
-    if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&\
-        CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
-              (r)->x1 = (rx1);\
-              (r)->y1 = (ry1);\
-              (r)->x2 = (rx2);\
-              (r)->y2 = (ry2);\
-              EXTENTS((r), (reg));\
-              (reg)->numRects++;\
-              (r)++;\
-            }\
-        }
-
-
-
-/*  add a rectangle to the given Region */
-#define ADDRECTNOX(reg, r, rx1, ry1, rx2, ry2){\
-            if ((rx1 < rx2) && (ry1 < ry2) &&\
-                CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
-              (r)->x1 = (rx1);\
-              (r)->y1 = (ry1);\
-              (r)->x2 = (rx2);\
-              (r)->y2 = (ry2);\
-              (reg)->numRects++;\
-              (r)++;\
-            }\
-        }
-
-#define EMPTY_REGION(pReg) pReg->numRects = 0
-
-#define REGION_NOT_EMPTY(pReg) pReg->numRects
-
-#define INBOX(r, x, y) \
-      ( ( ((r).x2 >  x)) && \
-        ( ((r).x1 <= x)) && \
-        ( ((r).y2 >  y)) && \
-        ( ((r).y1 <= y)) )
-
-/*
- * number of points to buffer before sending them off
- * to scanlines() :  Must be an even number
- */
-#define NUMPTSTOBUFFER 200
-
-/*
- * used to allocate buffers for points and link
- * the buffers together
- */
-typedef struct _POINTBLOCK {
-    XPoint pts[NUMPTSTOBUFFER];
-    struct _POINTBLOCK *next;
-} POINTBLOCK;
-
-#endif /* _X11_XREGION_H_ */
diff --git a/openflow/usr/include/X11/Xresource.h b/openflow/usr/include/X11/Xresource.h
deleted file mode 100644
index 6dbb3ce..0000000
--- a/openflow/usr/include/X11/Xresource.h
+++ /dev/null
@@ -1,358 +0,0 @@
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _X11_XRESOURCE_H_
-#define _X11_XRESOURCE_H_
-
-#ifndef _XP_PRINT_SERVER_
-#include <X11/Xlib.h>
-#endif
-
-/****************************************************************
- ****************************************************************
- ***                                                          ***
- ***                                                          ***
- ***          X Resource Manager Intrinsics                   ***
- ***                                                          ***
- ***                                                          ***
- ****************************************************************
- ****************************************************************/
-
-_XFUNCPROTOBEGIN
-
-/****************************************************************
- *
- * Memory Management
- *
- ****************************************************************/
-
-extern char *Xpermalloc(
-    unsigned int	/* size */
-);
-
-/****************************************************************
- *
- * Quark Management
- *
- ****************************************************************/
-
-typedef int       XrmQuark, *XrmQuarkList;
-#define NULLQUARK ((XrmQuark) 0)
-
-typedef char *XrmString;
-#define NULLSTRING ((XrmString) 0)
-
-/* find quark for string, create new quark if none already exists */
-extern XrmQuark XrmStringToQuark(
-    _Xconst char* 	/* string */
-);
-
-extern XrmQuark XrmPermStringToQuark(
-    _Xconst char* 	/* string */
-);
-
-/* find string for quark */
-extern XrmString XrmQuarkToString(
-    XrmQuark 		/* quark */
-);
-
-extern XrmQuark XrmUniqueQuark(
-    void
-);
-
-#define XrmStringsEqual(a1, a2) (strcmp(a1, a2) == 0)
-
-
-/****************************************************************
- *
- * Conversion of Strings to Lists
- *
- ****************************************************************/
-
-typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList;
-
-extern void XrmStringToQuarkList(
-    _Xconst char*	/* string */,
-    XrmQuarkList	/* quarks_return */
-);
-
-extern void XrmStringToBindingQuarkList(
-    _Xconst char*	/* string */,
-    XrmBindingList	/* bindings_return */,
-    XrmQuarkList	/* quarks_return */
-);
-
-/****************************************************************
- *
- * Name and Class lists.
- *
- ****************************************************************/
-
-typedef XrmQuark     XrmName;
-typedef XrmQuarkList XrmNameList;
-#define XrmNameToString(name)		XrmQuarkToString(name)
-#define XrmStringToName(string)		XrmStringToQuark(string)
-#define XrmStringToNameList(str, name)	XrmStringToQuarkList(str, name)
-
-typedef XrmQuark     XrmClass;
-typedef XrmQuarkList XrmClassList;
-#define XrmClassToString(c_class)	XrmQuarkToString(c_class)
-#define XrmStringToClass(c_class)	XrmStringToQuark(c_class)
-#define XrmStringToClassList(str,c_class) XrmStringToQuarkList(str, c_class)
-
-
-
-/****************************************************************
- *
- * Resource Representation Types and Values
- *
- ****************************************************************/
-
-typedef XrmQuark     XrmRepresentation;
-#define XrmStringToRepresentation(string)   XrmStringToQuark(string)
-#define	XrmRepresentationToString(type)   XrmQuarkToString(type)
-
-typedef struct {
-    unsigned int    size;
-    XPointer	    addr;
-} XrmValue, *XrmValuePtr;
-
-
-/****************************************************************
- *
- * Resource Manager Functions
- *
- ****************************************************************/
-
-typedef struct _XrmHashBucketRec *XrmHashBucket;
-typedef XrmHashBucket *XrmHashTable;
-typedef XrmHashTable XrmSearchList[];
-typedef struct _XrmHashBucketRec *XrmDatabase;
-
-
-extern void XrmDestroyDatabase(
-    XrmDatabase		/* database */
-);
-
-extern void XrmQPutResource(
-    XrmDatabase*	/* database */,
-    XrmBindingList	/* bindings */,
-    XrmQuarkList	/* quarks */,
-    XrmRepresentation	/* type */,
-    XrmValue*		/* value */
-);
-
-extern void XrmPutResource(
-    XrmDatabase*	/* database */,
-    _Xconst char*	/* specifier */,
-    _Xconst char*	/* type */,
-    XrmValue*		/* value */
-);
-
-extern void XrmQPutStringResource(
-    XrmDatabase*	/* database */,
-    XrmBindingList      /* bindings */,
-    XrmQuarkList	/* quarks */,
-    _Xconst char*	/* value */
-);
-
-extern void XrmPutStringResource(
-    XrmDatabase*	/* database */,
-    _Xconst char*	/* specifier */,
-    _Xconst char*	/* value */
-);
-
-extern void XrmPutLineResource(
-    XrmDatabase*	/* database */,
-    _Xconst char*	/* line */
-);
-
-extern Bool XrmQGetResource(
-    XrmDatabase		/* database */,
-    XrmNameList		/* quark_name */,
-    XrmClassList	/* quark_class */,
-    XrmRepresentation*	/* quark_type_return */,
-    XrmValue*		/* value_return */
-);
-
-extern Bool XrmGetResource(
-    XrmDatabase		/* database */,
-    _Xconst char*	/* str_name */,
-    _Xconst char*	/* str_class */,
-    char**		/* str_type_return */,
-    XrmValue*		/* value_return */
-);
-
-extern Bool XrmQGetSearchList(
-    XrmDatabase		/* database */,
-    XrmNameList		/* names */,
-    XrmClassList	/* classes */,
-    XrmSearchList	/* list_return */,
-    int			/* list_length */
-);
-
-extern Bool XrmQGetSearchResource(
-    XrmSearchList	/* list */,
-    XrmName		/* name */,
-    XrmClass		/* class */,
-    XrmRepresentation*	/* type_return */,
-    XrmValue*		/* value_return */
-);
-
-/****************************************************************
- *
- * Resource Database Management
- *
- ****************************************************************/
-
-#ifndef _XP_PRINT_SERVER_
-
-extern void XrmSetDatabase(
-    Display*		/* display */,
-    XrmDatabase		/* database */
-);
-
-extern XrmDatabase XrmGetDatabase(
-    Display*		/* display */
-);
-
-#endif /* !_XP_PRINT_SERVER_ */
-
-extern XrmDatabase XrmGetFileDatabase(
-    _Xconst char*	/* filename */
-);
-
-extern Status XrmCombineFileDatabase(
-    _Xconst char* 	/* filename */,
-    XrmDatabase*	/* target */,
-    Bool		/* override */
-);
-
-extern XrmDatabase XrmGetStringDatabase(
-    _Xconst char*	/* data */  /*  null terminated string */
-);
-
-extern void XrmPutFileDatabase(
-    XrmDatabase		/* database */,
-    _Xconst char*	/* filename */
-);
-
-extern void XrmMergeDatabases(
-    XrmDatabase		/* source_db */,
-    XrmDatabase*	/* target_db */
-);
-
-extern void XrmCombineDatabase(
-    XrmDatabase		/* source_db */,
-    XrmDatabase*	/* target_db */,
-    Bool		/* override */
-);
-
-#define XrmEnumAllLevels 0
-#define XrmEnumOneLevel  1
-
-extern Bool XrmEnumerateDatabase(
-    XrmDatabase		/* db */,
-    XrmNameList		/* name_prefix */,
-    XrmClassList	/* class_prefix */,
-    int			/* mode */,
-    Bool (*)(
-	     XrmDatabase*	/* db */,
-	     XrmBindingList	/* bindings */,
-	     XrmQuarkList	/* quarks */,
-	     XrmRepresentation*	/* type */,
-	     XrmValue*		/* value */,
-	     XPointer		/* closure */
-	     )		/* proc */,
-    XPointer		/* closure */
-);
-
-extern const char *XrmLocaleOfDatabase(
-    XrmDatabase 	/* database */
-);
-
-
-/****************************************************************
- *
- * Command line option mapping to resource entries
- *
- ****************************************************************/
-
-typedef enum {
-    XrmoptionNoArg,	/* Value is specified in OptionDescRec.value	    */
-    XrmoptionIsArg,     /* Value is the option string itself		    */
-    XrmoptionStickyArg, /* Value is characters immediately following option */
-    XrmoptionSepArg,    /* Value is next argument in argv		    */
-    XrmoptionResArg,	/* Resource and value in next argument in argv      */
-    XrmoptionSkipArg,   /* Ignore this option and the next argument in argv */
-    XrmoptionSkipLine,  /* Ignore this option and the rest of argv	    */
-    XrmoptionSkipNArgs	/* Ignore this option and the next
-			   OptionDescRes.value arguments in argv */
-} XrmOptionKind;
-
-typedef struct {
-    char	    *option;	    /* Option abbreviation in argv	    */
-    char	    *specifier;     /* Resource specifier		    */
-    XrmOptionKind   argKind;	    /* Which style of option it is	    */
-    XPointer	    value;	    /* Value to provide if XrmoptionNoArg   */
-} XrmOptionDescRec, *XrmOptionDescList;
-
-
-extern void XrmParseCommand(
-    XrmDatabase*	/* database */,
-    XrmOptionDescList	/* table */,
-    int			/* table_count */,
-    _Xconst char*	/* name */,
-    int*		/* argc_in_out */,
-    char**		/* argv_in_out */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _X11_XRESOURCE_H_ */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/Xthreads.h b/openflow/usr/include/X11/Xthreads.h
deleted file mode 100644
index 2027127..0000000
--- a/openflow/usr/include/X11/Xthreads.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- *
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- * *
- */
-
-#ifndef _XTHREADS_H_
-# define _XTHREADS_H_
-
-/* Redefine these to XtMalloc/XtFree or whatever you want before including
- * this header file.
- */
-# ifndef xmalloc
-#  define xmalloc malloc
-# endif
-# ifndef xfree
-#  define xfree free
-# endif
-
-# ifdef CTHREADS
-#  include <cthreads.h>
-typedef cthread_t xthread_t;
-typedef struct condition xcondition_rec;
-typedef struct mutex xmutex_rec;
-#  define xthread_init() cthread_init()
-#  define xthread_self cthread_self
-#  define xthread_fork(func,closure) cthread_fork(func,closure)
-#  define xthread_yield() cthread_yield()
-#  define xthread_exit(v) cthread_exit(v)
-#  define xthread_set_name(t,str) cthread_set_name(t,str)
-#  define xmutex_init(m) mutex_init(m)
-#  define xmutex_clear(m) mutex_clear(m)
-#  define xmutex_lock(m) mutex_lock(m)
-#  define xmutex_unlock(m) mutex_unlock(m)
-#  define xmutex_set_name(m,str) mutex_set_name(m,str)
-#  define xcondition_init(cv) condition_init(cv)
-#  define xcondition_clear(cv) condition_clear(cv)
-#  define xcondition_wait(cv,m) condition_wait(cv,m)
-#  define xcondition_signal(cv) condition_signal(cv)
-#  define xcondition_broadcast(cv) condition_broadcast(cv)
-#  define xcondition_set_name(cv,str) condition_set_name(cv,str)
-# else /* !CTHREADS */
-#  if defined(SVR4)
-#   include <thread.h>
-#   include <synch.h>
-typedef thread_t xthread_t;
-typedef thread_key_t xthread_key_t;
-typedef cond_t xcondition_rec;
-typedef mutex_t xmutex_rec;
-#   if defined(__UNIXWARE__)
-extern xthread_t (*_x11_thr_self)();
-#    define xthread_self  (_x11_thr_self)
-#   else
-#    define xthread_self thr_self
-#   endif
-#   define xthread_fork(func,closure) thr_create(NULL,0,func,closure,THR_NEW_LWP|THR_DETACHED,NULL)
-#   define xthread_yield() thr_yield()
-#   define xthread_exit(v) thr_exit(v)
-#   define xthread_key_create(kp,d) thr_keycreate(kp,d)
-#   ifdef __sun
-#    define xthread_key_delete(k) 0
-#   else
-#    define xthread_key_delete(k) thr_keydelete(k)
-#   endif
-#   define xthread_set_specific(k,v) thr_setspecific(k,v)
-#   define xthread_get_specific(k,vp) thr_getspecific(k,vp)
-#   define xmutex_init(m) mutex_init(m,USYNC_THREAD,0)
-#   define xmutex_clear(m) mutex_destroy(m)
-#   define xmutex_lock(m) mutex_lock(m)
-#   define xmutex_unlock(m) mutex_unlock(m)
-#   define xcondition_init(cv) cond_init(cv,USYNC_THREAD,0)
-#   define xcondition_clear(cv) cond_destroy(cv)
-#   define xcondition_wait(cv,m) cond_wait(cv,m)
-#   define xcondition_signal(cv) cond_signal(cv)
-#   define xcondition_broadcast(cv) cond_broadcast(cv)
-#  else /* !SVR4 */
-#   ifdef WIN32
-#    include <X11/Xwindows.h>
-typedef DWORD xthread_t;
-typedef DWORD xthread_key_t;
-struct _xthread_waiter {
-    HANDLE sem;
-    struct _xthread_waiter *next;
-};
-typedef struct {
-    CRITICAL_SECTION cs;
-    struct _xthread_waiter *waiters;
-} xcondition_rec;
-typedef CRITICAL_SECTION xmutex_rec;
-extern void _Xthread_init(void);
-#    define xthread_init() _Xthread_init()
-#    define xthread_self GetCurrentThreadId
-#    define xthread_fork(func,closure) { \
-    DWORD _tmptid; \
-    CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, (LPVOID)closure, 0, \
-		 &_tmptid); \
-}
-#    define xthread_yield() Sleep(0)
-#    define xthread_exit(v) ExitThread((DWORD)(v))
-#    define xthread_key_create(kp,d) *(kp) = TlsAlloc()
-#    define xthread_key_delete(k) TlsFree(k)
-#    define xthread_set_specific(k,v) TlsSetValue(k,v)
-#    define xthread_get_specific(k,vp) TlsGetValue(k)
-#    define xmutex_init(m) InitializeCriticalSection(m)
-#    define xmutex_clear(m) DeleteCriticalSection(m)
-#    define _XMUTEX_NESTS
-#    define xmutex_lock(m) EnterCriticalSection(m)
-#    define xmutex_unlock(m) LeaveCriticalSection(m)
-#    define xcondition_init(cv) { \
-    InitializeCriticalSection(&(cv)->cs); \
-    (cv)->waiters = NULL; \
-}
-#    define xcondition_clear(cv) DeleteCriticalSection(&(cv)->cs)
-extern struct _xthread_waiter *_Xthread_waiter();
-#    define xcondition_wait(cv,m) { \
-    struct _xthread_waiter *_tmpthr = _Xthread_waiter(); \
-    EnterCriticalSection(&(cv)->cs); \
-    _tmpthr->next = (cv)->waiters; \
-    (cv)->waiters = _tmpthr; \
-    LeaveCriticalSection(&(cv)->cs); \
-    LeaveCriticalSection(m); \
-    WaitForSingleObject(_tmpthr->sem, INFINITE); \
-    EnterCriticalSection(m); \
-}
-#    define xcondition_signal(cv) { \
-    EnterCriticalSection(&(cv)->cs); \
-    if ((cv)->waiters) { \
-        ReleaseSemaphore((cv)->waiters->sem, 1, NULL); \
-	(cv)->waiters = (cv)->waiters->next; \
-    } \
-    LeaveCriticalSection(&(cv)->cs); \
-}
-#    define xcondition_broadcast(cv) { \
-    struct _xthread_waiter *_tmpthr; \
-    EnterCriticalSection(&(cv)->cs); \
-    for (_tmpthr = (cv)->waiters; _tmpthr; _tmpthr = _tmpthr->next) \
-	ReleaseSemaphore(_tmpthr->sem, 1, NULL); \
-    (cv)->waiters = NULL; \
-    LeaveCriticalSection(&(cv)->cs); \
-}
-#   else /* !WIN32 */
-#    ifdef USE_TIS_SUPPORT
-/*
- * TIS support is intended for thread safe libraries.
- * This should not be used for general client programming.
- */
-#     include <tis.h>
-typedef pthread_t xthread_t;
-typedef pthread_key_t xthread_key_t;
-typedef pthread_cond_t xcondition_rec;
-typedef pthread_mutex_t xmutex_rec;
-#     define xthread_self tis_self
-#     define xthread_fork(func,closure) { pthread_t _tmpxthr; \
-        pthread_create(&_tmpxthr,NULL,func,closure); }
-#     define xthread_yield() pthread_yield_np()
-#     define xthread_exit(v) pthread_exit(v)
-#     define xthread_key_create(kp,d) tis_key_create(kp,d)
-#     define xthread_key_delete(k) tis_key_delete(k)
-#     define xthread_set_specific(k,v) tis_setspecific(k,v)
-#     define xthread_get_specific(k,vp) *(vp) = tis_getspecific(k)
-#     define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#     define xmutex_init(m) tis_mutex_init(m)
-#     define xmutex_clear(m) tis_mutex_destroy(m)
-#     define xmutex_lock(m) tis_mutex_lock(m)
-#     define xmutex_unlock(m) tis_mutex_unlock(m)
-#     define xcondition_init(c) tis_cond_init(c)
-#     define xcondition_clear(c) tis_cond_destroy(c)
-#     define xcondition_wait(c,m) tis_cond_wait(c,m)
-#     define xcondition_signal(c) tis_cond_signal(c)
-#     define xcondition_broadcast(c) tis_cond_broadcast(c)
-#    else
-#     ifdef USE_NBSD_THREADLIB
-/*
- * NetBSD threadlib support is intended for thread safe libraries.
- * This should not be used for general client programming.
- */
-#      include <threadlib.h>
-typedef thr_t xthread_t;
-typedef thread_key_t xthread_key_t;
-typedef cond_t xcondition_rec;
-typedef mutex_t xmutex_rec;
-#      define xthread_self thr_self
-#      define xthread_fork(func,closure) { thr_t _tmpxthr; \
-	/* XXX Create it detached?  --thorpej */ \
-	thr_create(&_tmpxthr,NULL,func,closure); }
-#      define xthread_yield() thr_yield()
-#      define xthread_exit(v) thr_exit(v)
-#      define xthread_key_create(kp,d) thr_keycreate(kp,d)
-#      define xthread_key_delete(k) thr_keydelete(k)
-#      define xthread_set_specific(k,v) thr_setspecific(k,v)
-#      define xthread_get_specific(k,vp) *(vp) = thr_getspecific(k)
-#      define XMUTEX_INITIALIZER MUTEX_INITIALIZER
-#      define xmutex_init(m) mutex_init(m, 0)
-#      define xmutex_clear(m) mutex_destroy(m)
-#      define xmutex_lock(m) mutex_lock(m)
-#      define xmutex_unlock(m) mutex_unlock(m)
-#      define xcondition_init(c) cond_init(c, 0, 0)
-#      define xcondition_clear(c) cond_destroy(c)
-#      define xcondition_wait(c,m) cond_wait(c,m)
-#      define xcondition_signal(c) cond_signal(c)
-#      define xcondition_broadcast(c) cond_broadcast(c)
-#     else
-#      include <pthread.h>
-typedef pthread_t xthread_t;
-typedef pthread_key_t xthread_key_t;
-typedef pthread_cond_t xcondition_rec;
-typedef pthread_mutex_t xmutex_rec;
-#      define xthread_self pthread_self
-#      define xthread_yield() pthread_yield()
-#      define xthread_exit(v) pthread_exit(v)
-#      define xthread_set_specific(k,v) pthread_setspecific(k,v)
-#      define xmutex_clear(m) pthread_mutex_destroy(m)
-#      define xmutex_lock(m) pthread_mutex_lock(m)
-#      define xmutex_unlock(m) pthread_mutex_unlock(m)
-#      ifndef XPRE_STANDARD_API
-#       define xthread_key_create(kp,d) pthread_key_create(kp,d)
-#       define xthread_key_delete(k) pthread_key_delete(k)
-#       define xthread_get_specific(k,vp) *(vp) = pthread_getspecific(k)
-#       define xthread_fork(func,closure) { pthread_t _tmpxthr; \
-	pthread_create(&_tmpxthr,NULL,func,closure); }
-#       define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#       define xmutex_init(m) pthread_mutex_init(m, NULL)
-#       define xcondition_init(c) pthread_cond_init(c, NULL)
-#      else /* XPRE_STANDARD_API */
-#       define xthread_key_create(kp,d) pthread_keycreate(kp,d)
-#       define xthread_key_delete(k) 0
-#       define xthread_get_specific(k,vp) pthread_getspecific(k,vp)
-#       define xthread_fork(func,closure) { pthread_t _tmpxthr; \
-	pthread_create(&_tmpxthr,pthread_attr_default,func,closure); }
-#       define xmutex_init(m) pthread_mutex_init(m, pthread_mutexattr_default)
-#       define xcondition_init(c) pthread_cond_init(c, pthread_condattr_default)
-#      endif /* XPRE_STANDARD_API */
-#      define xcondition_clear(c) pthread_cond_destroy(c)
-#      define xcondition_wait(c,m) pthread_cond_wait(c,m)
-#      define xcondition_signal(c) pthread_cond_signal(c)
-#      define xcondition_broadcast(c) pthread_cond_broadcast(c)
-#      if defined(_DECTHREADS_)
-static xthread_t _X_no_thread_id;
-#       define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id)
-#       define xthread_clear_id(id) id = _X_no_thread_id
-#       define xthread_equal(id1,id2) pthread_equal(id1, id2)
-#      endif /* _DECTHREADS_ */
-#      if defined(__linux__)
-#       define xthread_have_id(id) !pthread_equal(id, 0)
-#       define xthread_clear_id(id) id = 0
-#       define xthread_equal(id1,id2) pthread_equal(id1, id2)
-#      endif /* linux */
-#      if defined(_CMA_VENDOR_) && defined(_CMA__IBM) && (_CMA_VENDOR_ == _CMA__IBM)
-#       ifdef DEBUG		/* too much of a hack to enable normally */
-/* see also cma__obj_set_name() */
-#        define xmutex_set_name(m,str) ((char**)(m)->field1)[5] = (str)
-#        define xcondition_set_name(cv,str) ((char**)(cv)->field1)[5] = (str)
-#       endif /* DEBUG */
-#      endif /* _CMA_VENDOR_ == _CMA__IBM */
-#     endif /* USE_NBSD_THREADLIB */
-#    endif /* USE_TIS_SUPPORT */
-#   endif /* WIN32 */
-#  endif /* SVR4 */
-# endif /* CTHREADS */
-typedef xcondition_rec *xcondition_t;
-typedef xmutex_rec *xmutex_t;
-# ifndef xcondition_malloc
-#  define xcondition_malloc() (xcondition_t)xmalloc(sizeof(xcondition_rec))
-# endif
-# ifndef xcondition_free
-#  define xcondition_free(c) xfree((char *)c)
-# endif
-# ifndef xmutex_malloc
-#  define xmutex_malloc() (xmutex_t)xmalloc(sizeof(xmutex_rec))
-# endif
-# ifndef xmutex_free
-#  define xmutex_free(m) xfree((char *)m)
-# endif
-# ifndef xthread_have_id
-#  define xthread_have_id(id) id
-# endif
-# ifndef xthread_clear_id
-#  define xthread_clear_id(id) id = 0
-# endif
-# ifndef xthread_equal
-#  define xthread_equal(id1,id2) ((id1) == (id2))
-# endif
-/* aids understood by some debuggers */
-# ifndef xthread_set_name
-#  define xthread_set_name(t,str)
-# endif
-# ifndef xmutex_set_name
-#  define xmutex_set_name(m,str)
-# endif
-# ifndef xcondition_set_name
-#  define xcondition_set_name(cv,str)
-# endif
-
-#endif /* _XTHREADS_H_ */
diff --git a/openflow/usr/include/X11/Xtos.h b/openflow/usr/include/X11/Xtos.h
deleted file mode 100644
index 64b2da8..0000000
--- a/openflow/usr/include/X11/Xtos.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _Xtos_h
-#define _Xtos_h
-
-#define ALLOCATE_LOCAL_FALLBACK(_size) XtMalloc((unsigned long)(_size))
-#define DEALLOCATE_LOCAL_FALLBACK(_ptr) XtFree((XtPointer)(_ptr))
-#include <X11/Xalloca.h>
-
-
-#if defined (_LP64) || \
-    defined(__alpha) || defined(__alpha__) || \
-    defined(__ia64__) || defined(ia64) || \
-    defined(__sparc64__) || \
-    defined(__s390x__) || \
-    (defined(__hppa__) && defined(__LP64__)) || \
-    defined(__amd64__) || defined(amd64) || \
-    defined(__powerpc64__) || \
-    (defined(sgi) && (_MIPS_SZLONG == 64))
-#define LONG64
-#endif
-
-#endif /* _Xtos_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/openflow/usr/include/X11/Xtrans/Xtrans.c b/openflow/usr/include/X11/Xtrans/Xtrans.c
deleted file mode 100644
index bfba1ad..0000000
--- a/openflow/usr/include/X11/Xtrans/Xtrans.c
+++ /dev/null
@@ -1,1514 +0,0 @@
-/*
-
-Copyright 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
- * Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name NCR not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  NCR makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * NCR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NCR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_SYSTEMD_DAEMON
-#include <systemd/sd-daemon.h>
-#endif
-
-/*
- * The transport table contains a definition for every transport (protocol)
- * family. All operations that can be made on the transport go through this
- * table.
- *
- * Each transport is assigned a unique transport id.
- *
- * New transports can be added by adding an entry in this table.
- * For compatiblity, the transport ids should never be renumbered.
- * Always add to the end of the list.
- */
-
-#define TRANS_TLI_INET_INDEX		1
-#define TRANS_TLI_TCP_INDEX		2
-#define TRANS_TLI_TLI_INDEX		3
-#define TRANS_SOCKET_UNIX_INDEX		4
-#define TRANS_SOCKET_LOCAL_INDEX	5
-#define TRANS_SOCKET_INET_INDEX		6
-#define TRANS_SOCKET_TCP_INDEX		7
-#define TRANS_DNET_INDEX		8
-#define TRANS_LOCAL_LOCAL_INDEX		9
-#define TRANS_LOCAL_PTS_INDEX		10
-#define TRANS_LOCAL_NAMED_INDEX		11
-/* 12 used to be ISC, but that's gone. */
-#define TRANS_LOCAL_SCO_INDEX		13
-#define TRANS_SOCKET_INET6_INDEX	14
-#define TRANS_LOCAL_PIPE_INDEX		15
-
-
-static
-Xtransport_table Xtransports[] = {
-#if defined(TCPCONN)
-    { &TRANS(SocketTCPFuncs),	TRANS_SOCKET_TCP_INDEX },
-#if defined(IPv6) && defined(AF_INET6)
-    { &TRANS(SocketINET6Funcs),	TRANS_SOCKET_INET6_INDEX },
-#endif /* IPv6 */
-    { &TRANS(SocketINETFuncs),	TRANS_SOCKET_INET_INDEX },
-#endif /* TCPCONN */
-#if defined(UNIXCONN)
-#if !defined(LOCALCONN)
-    { &TRANS(SocketLocalFuncs),	TRANS_SOCKET_LOCAL_INDEX },
-#endif /* !LOCALCONN */
-    { &TRANS(SocketUNIXFuncs),	TRANS_SOCKET_UNIX_INDEX },
-#endif /* UNIXCONN */
-#if defined(LOCALCONN)
-    { &TRANS(LocalFuncs),	TRANS_LOCAL_LOCAL_INDEX },
-#ifndef sun
-    { &TRANS(PTSFuncs),		TRANS_LOCAL_PTS_INDEX },
-#endif /* sun */
-#if defined(SVR4) || defined(__SVR4)
-    { &TRANS(NAMEDFuncs),	TRANS_LOCAL_NAMED_INDEX },
-#endif
-#ifdef sun
-    { &TRANS(PIPEFuncs),	TRANS_LOCAL_PIPE_INDEX },
-#endif /* sun */
-#if defined(__SCO__) || defined(__UNIXWARE__)
-    { &TRANS(SCOFuncs),		TRANS_LOCAL_SCO_INDEX },
-#endif /* __SCO__ || __UNIXWARE__ */
-#endif /* LOCALCONN */
-};
-
-#define NUMTRANS	(sizeof(Xtransports)/sizeof(Xtransport_table))
-
-
-#ifdef WIN32
-#define ioctl ioctlsocket
-#endif
-
-
-
-/*
- * These are a few utility function used by the public interface functions.
- */
-
-void
-TRANS(FreeConnInfo) (XtransConnInfo ciptr)
-
-{
-    prmsg (3,"FreeConnInfo(%p)\n", ciptr);
-
-    if (ciptr->addr)
-	free (ciptr->addr);
-
-    if (ciptr->peeraddr)
-	free (ciptr->peeraddr);
-
-    if (ciptr->port)
-	free (ciptr->port);
-
-    free (ciptr);
-}
-
-
-#define PROTOBUFSIZE	20
-
-static Xtransport *
-TRANS(SelectTransport) (const char *protocol)
-
-{
-    char 	protobuf[PROTOBUFSIZE];
-    int		i;
-
-    prmsg (3,"SelectTransport(%s)\n", protocol);
-
-    /*
-     * Force Protocol to be lowercase as a way of doing
-     * a case insensitive match.
-     */
-
-    strncpy (protobuf, protocol, PROTOBUFSIZE - 1);
-    protobuf[PROTOBUFSIZE-1] = '\0';
-
-    for (i = 0; i < PROTOBUFSIZE && protobuf[i] != '\0'; i++)
-	if (isupper ((unsigned char)protobuf[i]))
-	    protobuf[i] = tolower ((unsigned char)protobuf[i]);
-
-    /* Look at all of the configured protocols */
-
-    for (i = 0; i < NUMTRANS; i++)
-    {
-	if (!strcmp (protobuf, Xtransports[i].transport->TransName))
-	    return Xtransports[i].transport;
-    }
-
-    return NULL;
-}
-
-#ifndef TEST_t
-static
-#endif /* TEST_t */
-int
-TRANS(ParseAddress) (const char *address,
-                     char **protocol, char **host, char **port)
-
-{
-    /*
-     * For the font library, the address is a string formatted
-     * as "protocol/host:port[/catalogue]".  Note that the catologue
-     * is optional.  At this time, the catologue info is ignored, but
-     * we have to parse it anyways.
-     *
-     * Other than fontlib, the address is a string formatted
-     * as "protocol/host:port".
-     *
-     * If the protocol part is missing, then assume TCP.
-     * If the protocol part and host part are missing, then assume local.
-     * If a "::" is found then assume DNET.
-     */
-
-    char	*mybuf, *tmpptr;
-    const char	*_protocol;
-    char	*_host, *_port;
-    char	hostnamebuf[256];
-    int		_host_len;
-
-    prmsg (3,"ParseAddress(%s)\n", address);
-
-    /* Copy the string so it can be changed */
-
-    tmpptr = mybuf = strdup (address);
-
-    /* Parse the string to get each component */
-
-    /* Get the protocol part */
-
-    _protocol = mybuf;
-
-
-   if ( ((mybuf = strchr (mybuf,'/')) == NULL) &&
-      ((mybuf = strrchr (tmpptr,':')) == NULL) )
-   {
-	/* address is in a bad format */
-	*protocol = NULL;
-	*host = NULL;
-	*port = NULL;
-	free (tmpptr);
-	return 0;
-    }
-
-    if (*mybuf == ':')
-    {
-	/*
-	 * If there is a hostname, then assume tcp, otherwise
-	 * it must be local.
-	 */
-	if (mybuf == tmpptr)
-	{
-	    /* There is neither a protocol or host specified */
-	    _protocol = "local";
-	}
-	else
-	{
-	    /* There is a hostname specified */
-	    _protocol = "tcp";
-	    mybuf = tmpptr;	/* reset to the begining of the host ptr */
-	}
-    }
-    else
-    {
-	/* *mybuf == '/' */
-
-	*mybuf ++= '\0'; /* put a null at the end of the protocol */
-
-	if (strlen(_protocol) == 0)
-	{
-	    /*
-	     * If there is a hostname, then assume tcp, otherwise
-	     * it must be local.
-	     */
-	    if (*mybuf != ':')
-		_protocol = "tcp";
-	    else
-		_protocol = "local";
-	}
-    }
-
-    /* Get the host part */
-
-    _host = mybuf;
-
-    if ((mybuf = strrchr (mybuf,':')) == NULL)
-    {
-	*protocol = NULL;
-	*host = NULL;
-	*port = NULL;
-	free (tmpptr);
-	return 0;
-    }
-
-    *mybuf ++= '\0';
-
-    _host_len = strlen(_host);
-    if (_host_len == 0)
-    {
-	TRANS(GetHostname) (hostnamebuf, sizeof (hostnamebuf));
-	_host = hostnamebuf;
-    }
-#if defined(IPv6) && defined(AF_INET6)
-    /* hostname in IPv6 [numeric_addr]:0 form? */
-    else if ( (_host_len > 3) &&
-      ((strcmp(_protocol, "tcp") == 0) || (strcmp(_protocol, "inet6") == 0))
-      && (*_host == '[') && (*(_host + _host_len - 1) == ']') ) {
-	struct sockaddr_in6 sin6;
-
-	*(_host + _host_len - 1) = '\0';
-
-	/* Verify address is valid IPv6 numeric form */
-	if (inet_pton(AF_INET6, _host + 1, &sin6) == 1) {
-	    /* It is. Use it as such. */
-	    _host++;
-	    _protocol = "inet6";
-	} else {
-	    /* It's not, restore it just in case some other code can use it. */
-	    *(_host + _host_len - 1) = ']';
-	}
-    }
-#endif
-
-
-    /* Get the port */
-
-    _port = mybuf;
-
-#if defined(FONT_t) || defined(FS_t)
-    /*
-     * Is there an optional catalogue list?
-     */
-
-    if ((mybuf = strchr (mybuf,'/')) != NULL)
-	*mybuf ++= '\0';
-
-    /*
-     * The rest, if any, is the (currently unused) catalogue list.
-     *
-     * _catalogue = mybuf;
-     */
-#endif
-
-#ifdef HAVE_LAUNCHD
-    /* launchd sockets will look like 'local//tmp/launch-XgkNns/:0' */
-    if(address != NULL && strlen(address)>8 && (!strncmp(address,"local//",7))) {
-      _protocol="local";
-      _host="";
-      _port=address+6;
-    }
-#endif
-
-    /*
-     * Now that we have all of the components, allocate new
-     * string space for them.
-     */
-
-    if ((*protocol = strdup (_protocol)) == NULL)
-    {
-	/* Malloc failed */
-	*port = NULL;
-	*host = NULL;
-	*protocol = NULL;
-	free (tmpptr);
-	return 0;
-    }
-
-    if ((*host = strdup (_host)) == NULL)
-    {
-	/* Malloc failed */
-	*port = NULL;
-	*host = NULL;
-	free (*protocol);
-	*protocol = NULL;
-	free (tmpptr);
-	return 0;
-    }
-
-    if ((*port = strdup (_port)) == NULL)
-    {
-	/* Malloc failed */
-	*port = NULL;
-	free (*host);
-	*host = NULL;
-	free (*protocol);
-	*protocol = NULL;
-	free (tmpptr);
-	return 0;
-    }
-
-    free (tmpptr);
-
-    return 1;
-}
-
-
-/*
- * TRANS(Open) does all of the real work opening a connection. The only
- * funny part about this is the type parameter which is used to decide which
- * type of open to perform.
- */
-
-static XtransConnInfo
-TRANS(Open) (int type, const char *address)
-
-{
-    char 		*protocol = NULL, *host = NULL, *port = NULL;
-    XtransConnInfo	ciptr = NULL;
-    Xtransport		*thistrans;
-
-    prmsg (2,"Open(%d,%s)\n", type, address);
-
-#if defined(WIN32) && defined(TCPCONN)
-    if (TRANS(WSAStartup)())
-    {
-	prmsg (1,"Open: WSAStartup failed\n");
-	return NULL;
-    }
-#endif
-
-    /* Parse the Address */
-
-    if (TRANS(ParseAddress) (address, &protocol, &host, &port) == 0)
-    {
-	prmsg (1,"Open: Unable to Parse address %s\n", address);
-	return NULL;
-    }
-
-    /* Determine the transport type */
-
-    if ((thistrans = TRANS(SelectTransport) (protocol)) == NULL)
-    {
-	prmsg (1,"Open: Unable to find transport for %s\n",
-	       protocol);
-
-	free (protocol);
-	free (host);
-	free (port);
-	return NULL;
-    }
-
-    /* Open the transport */
-
-    switch (type)
-    {
-    case XTRANS_OPEN_COTS_CLIENT:
-#ifdef TRANS_CLIENT
-	ciptr = thistrans->OpenCOTSClient(thistrans, protocol, host, port);
-#endif /* TRANS_CLIENT */
-	break;
-    case XTRANS_OPEN_COTS_SERVER:
-#ifdef TRANS_SERVER
-	ciptr = thistrans->OpenCOTSServer(thistrans, protocol, host, port);
-#endif /* TRANS_SERVER */
-	break;
-    case XTRANS_OPEN_CLTS_CLIENT:
-#ifdef TRANS_CLIENT
-	ciptr = thistrans->OpenCLTSClient(thistrans, protocol, host, port);
-#endif /* TRANS_CLIENT */
-	break;
-    case XTRANS_OPEN_CLTS_SERVER:
-#ifdef TRANS_SERVER
-	ciptr = thistrans->OpenCLTSServer(thistrans, protocol, host, port);
-#endif /* TRANS_SERVER */
-	break;
-    default:
-	prmsg (1,"Open: Unknown Open type %d\n", type);
-    }
-
-    if (ciptr == NULL)
-    {
-	if (!(thistrans->flags & TRANS_DISABLED))
-	{
-	    prmsg (1,"Open: transport open failed for %s/%s:%s\n",
-	           protocol, host, port);
-	}
-	free (protocol);
-	free (host);
-	free (port);
-	return NULL;
-    }
-
-    ciptr->transptr = thistrans;
-    ciptr->port = port;			/* We need this for TRANS(Reopen) */
-
-    free (protocol);
-    free (host);
-
-    return ciptr;
-}
-
-
-#ifdef TRANS_REOPEN
-
-/*
- * We might want to create an XtransConnInfo object based on a previously
- * opened connection.  For example, the font server may clone itself and
- * pass file descriptors to the parent.
- */
-
-static XtransConnInfo
-TRANS(Reopen) (int type, int trans_id, int fd, const char *port)
-
-{
-    XtransConnInfo	ciptr = NULL;
-    Xtransport		*thistrans = NULL;
-    char		*save_port;
-    int			i;
-
-    prmsg (2,"Reopen(%d,%d,%s)\n", trans_id, fd, port);
-
-    /* Determine the transport type */
-
-    for (i = 0; i < NUMTRANS; i++)
-	if (Xtransports[i].transport_id == trans_id)
-	{
-	    thistrans = Xtransports[i].transport;
-	    break;
-	}
-
-    if (thistrans == NULL)
-    {
-	prmsg (1,"Reopen: Unable to find transport id %d\n",
-	       trans_id);
-
-	return NULL;
-    }
-
-    if ((save_port = strdup (port)) == NULL)
-    {
-	prmsg (1,"Reopen: Unable to malloc port string\n");
-
-	return NULL;
-    }
-
-    /* Get a new XtransConnInfo object */
-
-    switch (type)
-    {
-    case XTRANS_OPEN_COTS_SERVER:
-	ciptr = thistrans->ReopenCOTSServer(thistrans, fd, port);
-	break;
-    case XTRANS_OPEN_CLTS_SERVER:
-	ciptr = thistrans->ReopenCLTSServer(thistrans, fd, port);
-	break;
-    default:
-	prmsg (1,"Reopen: Bad Open type %d\n", type);
-    }
-
-    if (ciptr == NULL)
-    {
-	prmsg (1,"Reopen: transport open failed\n");
-	free (save_port);
-	return NULL;
-    }
-
-    ciptr->transptr = thistrans;
-    ciptr->port = save_port;
-
-    return ciptr;
-}
-
-#endif /* TRANS_REOPEN */
-
-
-
-/*
- * These are the public interfaces to this Transport interface.
- * These are the only functions that should have knowledge of the transport
- * table.
- */
-
-#ifdef TRANS_CLIENT
-
-XtransConnInfo
-TRANS(OpenCOTSClient) (const char *address)
-
-{
-    prmsg (2,"OpenCOTSClient(%s)\n", address);
-    return TRANS(Open) (XTRANS_OPEN_COTS_CLIENT, address);
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-XtransConnInfo
-TRANS(OpenCOTSServer) (const char *address)
-
-{
-    prmsg (2,"OpenCOTSServer(%s)\n", address);
-    return TRANS(Open) (XTRANS_OPEN_COTS_SERVER, address);
-}
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_CLIENT
-
-XtransConnInfo
-TRANS(OpenCLTSClient) (const char *address)
-
-{
-    prmsg (2,"OpenCLTSClient(%s)\n", address);
-    return TRANS(Open) (XTRANS_OPEN_CLTS_CLIENT, address);
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-XtransConnInfo
-TRANS(OpenCLTSServer) (const char *address)
-
-{
-    prmsg (2,"OpenCLTSServer(%s)\n", address);
-    return TRANS(Open) (XTRANS_OPEN_CLTS_SERVER, address);
-}
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_REOPEN
-
-XtransConnInfo
-TRANS(ReopenCOTSServer) (int trans_id, int fd, const char *port)
-
-{
-    prmsg (2,"ReopenCOTSServer(%d, %d, %s)\n", trans_id, fd, port);
-    return TRANS(Reopen) (XTRANS_OPEN_COTS_SERVER, trans_id, fd, port);
-}
-
-XtransConnInfo
-TRANS(ReopenCLTSServer) (int trans_id, int fd, const char *port)
-
-{
-    prmsg (2,"ReopenCLTSServer(%d, %d, %s)\n", trans_id, fd, port);
-    return TRANS(Reopen) (XTRANS_OPEN_CLTS_SERVER, trans_id, fd, port);
-}
-
-
-int
-TRANS(GetReopenInfo) (XtransConnInfo ciptr,
-		      int *trans_id, int *fd, char **port)
-
-{
-    int i;
-
-    for (i = 0; i < NUMTRANS; i++)
-	if (Xtransports[i].transport == ciptr->transptr)
-	{
-	    *trans_id = Xtransports[i].transport_id;
-	    *fd = ciptr->fd;
-
-	    if ((*port = strdup (ciptr->port)) == NULL)
-		return 0;
-	    else
-		return 1;
-	}
-
-    return 0;
-}
-
-#endif /* TRANS_REOPEN */
-
-
-int
-TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
-
-{
-    int	fd = ciptr->fd;
-    int	ret = 0;
-
-    prmsg (2,"SetOption(%d,%d,%d)\n", fd, option, arg);
-
-    /*
-     * For now, all transport type use the same stuff for setting options.
-     * As long as this is true, we can put the common code here. Once a more
-     * complicated transport such as shared memory or an OSI implementation
-     * that uses the session and application libraries is implemented, this
-     * code may have to move to a transport dependent function.
-     *
-     * ret = ciptr->transptr->SetOption (ciptr, option, arg);
-     */
-
-    switch (option)
-    {
-    case TRANS_NONBLOCKING:
-	switch (arg)
-	{
-	case 0:
-	    /* Set to blocking mode */
-	    break;
-	case 1: /* Set to non-blocking mode */
-
-#if defined(O_NONBLOCK) && !defined(SCO325)
-	    ret = fcntl (fd, F_GETFL, 0);
-	    if (ret != -1)
-		ret = fcntl (fd, F_SETFL, ret | O_NONBLOCK);
-#else
-#ifdef FIOSNBIO
-	{
-	    int arg;
-	    arg = 1;
-	    ret = ioctl (fd, FIOSNBIO, &arg);
-	}
-#else
-#if defined(WIN32)
-	{
-#ifdef WIN32
-	    u_long arg;
-#else
-	    int arg;
-#endif
-	    arg = 1;
-/* IBM TCP/IP understands this option too well: it causes TRANS(Read) to fail
- * eventually with EWOULDBLOCK */
-	    ret = ioctl (fd, FIONBIO, &arg);
-	}
-#else
-	    ret = fcntl (fd, F_GETFL, 0);
-#ifdef FNDELAY
-	    ret = fcntl (fd, F_SETFL, ret | FNDELAY);
-#else
-	    ret = fcntl (fd, F_SETFL, ret | O_NDELAY);
-#endif
-#endif /* AIXV3  || uniosu */
-#endif /* FIOSNBIO */
-#endif /* O_NONBLOCK */
-	    break;
-	default:
-	    /* Unknown option */
-	    break;
-	}
-	break;
-    case TRANS_CLOSEONEXEC:
-#ifdef F_SETFD
-#ifdef FD_CLOEXEC
-	ret = fcntl (fd, F_SETFD, FD_CLOEXEC);
-#else
-	ret = fcntl (fd, F_SETFD, 1);
-#endif /* FD_CLOEXEC */
-#endif /* F_SETFD */
-	break;
-    }
-
-    return ret;
-}
-
-#ifdef TRANS_SERVER
-
-int
-TRANS(CreateListener) (XtransConnInfo ciptr, const char *port, unsigned int flags)
-
-{
-    return ciptr->transptr->CreateListener (ciptr, port, flags);
-}
-
-int
-TRANS(Received) (const char * protocol)
-
-{
-   Xtransport *trans;
-   int i = 0, ret = 0;
-
-   prmsg (5, "Received(%s)\n", protocol);
-
-   if ((trans = TRANS(SelectTransport)(protocol)) == NULL)
-   {
-	prmsg (1,"Received: unable to find transport: %s\n",
-	       protocol);
-
-	return -1;
-   }
-   if (trans->flags & TRANS_ALIAS) {
-       if (trans->nolisten)
-	   while (trans->nolisten[i]) {
-	       ret |= TRANS(Received)(trans->nolisten[i]);
-	       i++;
-       }
-   }
-
-   trans->flags |= TRANS_RECEIVED;
-   return ret;
-}
-
-int
-TRANS(NoListen) (const char * protocol)
-
-{
-   Xtransport *trans;
-   int i = 0, ret = 0;
-
-   if ((trans = TRANS(SelectTransport)(protocol)) == NULL)
-   {
-	prmsg (1,"TransNoListen: unable to find transport: %s\n",
-	       protocol);
-
-	return -1;
-   }
-   if (trans->flags & TRANS_ALIAS) {
-       if (trans->nolisten)
-	   while (trans->nolisten[i]) {
-	       ret |= TRANS(NoListen)(trans->nolisten[i]);
-	       i++;
-       }
-   }
-
-   trans->flags |= TRANS_NOLISTEN;
-   return ret;
-}
-
-int
-TRANS(Listen) (const char * protocol)
-{
-   Xtransport *trans;
-   int i = 0, ret = 0;
-
-   if ((trans = TRANS(SelectTransport)(protocol)) == NULL)
-   {
-	prmsg (1,"TransListen: unable to find transport: %s\n",
-	       protocol);
-
-	return -1;
-   }
-   if (trans->flags & TRANS_ALIAS) {
-       if (trans->nolisten)
-	   while (trans->nolisten[i]) {
-	       ret |= TRANS(Listen)(trans->nolisten[i]);
-	       i++;
-       }
-   }
-
-   trans->flags &= ~TRANS_NOLISTEN;
-   return ret;
-}
-
-int
-TRANS(IsListening) (const char * protocol)
-{
-   Xtransport *trans;
-
-   if ((trans = TRANS(SelectTransport)(protocol)) == NULL)
-   {
-	prmsg (1,"TransIsListening: unable to find transport: %s\n",
-	       protocol);
-
-	return 0;
-   }
-
-   return !(trans->flags & TRANS_NOLISTEN);
-}
-
-int
-TRANS(ResetListener) (XtransConnInfo ciptr)
-
-{
-    if (ciptr->transptr->ResetListener)
-	return ciptr->transptr->ResetListener (ciptr);
-    else
-	return TRANS_RESET_NOOP;
-}
-
-
-XtransConnInfo
-TRANS(Accept) (XtransConnInfo ciptr, int *status)
-
-{
-    XtransConnInfo	newciptr;
-
-    prmsg (2,"Accept(%d)\n", ciptr->fd);
-
-    newciptr = ciptr->transptr->Accept (ciptr, status);
-
-    if (newciptr)
-	newciptr->transptr = ciptr->transptr;
-
-    return newciptr;
-}
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_CLIENT
-
-int
-TRANS(Connect) (XtransConnInfo ciptr, const char *address)
-
-{
-    char	*protocol;
-    char	*host;
-    char	*port;
-    int		ret;
-
-    prmsg (2,"Connect(%d,%s)\n", ciptr->fd, address);
-
-    if (TRANS(ParseAddress) (address, &protocol, &host, &port) == 0)
-    {
-	prmsg (1,"Connect: Unable to Parse address %s\n",
-	       address);
-	return -1;
-    }
-
-#ifdef HAVE_LAUNCHD
-    if (!host) host=strdup("");
-#endif
-
-    if (!port || !*port)
-    {
-	prmsg (1,"Connect: Missing port specification in %s\n",
-	      address);
-	if (protocol) free (protocol);
-	if (host) free (host);
-	return -1;
-    }
-
-    ret = ciptr->transptr->Connect (ciptr, host, port);
-
-    if (protocol) free (protocol);
-    if (host) free (host);
-    if (port) free (port);
-
-    return ret;
-}
-
-#endif /* TRANS_CLIENT */
-
-
-int
-TRANS(BytesReadable) (XtransConnInfo ciptr, BytesReadable_t *pend)
-
-{
-    return ciptr->transptr->BytesReadable (ciptr, pend);
-}
-
-int
-TRANS(Read) (XtransConnInfo ciptr, char *buf, int size)
-
-{
-    return ciptr->transptr->Read (ciptr, buf, size);
-}
-
-int
-TRANS(Write) (XtransConnInfo ciptr, char *buf, int size)
-
-{
-    return ciptr->transptr->Write (ciptr, buf, size);
-}
-
-int
-TRANS(Readv) (XtransConnInfo ciptr, struct iovec *buf, int size)
-
-{
-    return ciptr->transptr->Readv (ciptr, buf, size);
-}
-
-int
-TRANS(Writev) (XtransConnInfo ciptr, struct iovec *buf, int size)
-
-{
-    return ciptr->transptr->Writev (ciptr, buf, size);
-}
-
-#if XTRANS_SEND_FDS
-int
-TRANS(SendFd) (XtransConnInfo ciptr, int fd, int do_close)
-{
-    return ciptr->transptr->SendFd(ciptr, fd, do_close);
-}
-
-int
-TRANS(RecvFd) (XtransConnInfo ciptr)
-{
-    return ciptr->transptr->RecvFd(ciptr);
-}
-#endif
-
-int
-TRANS(Disconnect) (XtransConnInfo ciptr)
-
-{
-    return ciptr->transptr->Disconnect (ciptr);
-}
-
-int
-TRANS(Close) (XtransConnInfo ciptr)
-
-{
-    int ret;
-
-    prmsg (2,"Close(%d)\n", ciptr->fd);
-
-    ret = ciptr->transptr->Close (ciptr);
-
-    TRANS(FreeConnInfo) (ciptr);
-
-    return ret;
-}
-
-int
-TRANS(CloseForCloning) (XtransConnInfo ciptr)
-
-{
-    int ret;
-
-    prmsg (2,"CloseForCloning(%d)\n", ciptr->fd);
-
-    ret = ciptr->transptr->CloseForCloning (ciptr);
-
-    TRANS(FreeConnInfo) (ciptr);
-
-    return ret;
-}
-
-int
-TRANS(IsLocal) (XtransConnInfo ciptr)
-
-{
-    return (ciptr->family == AF_UNIX);
-}
-
-
-int
-TRANS(GetMyAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
-		  Xtransaddr **addrp)
-
-{
-    prmsg (2,"GetMyAddr(%d)\n", ciptr->fd);
-
-    *familyp = ciptr->family;
-    *addrlenp = ciptr->addrlen;
-
-    if ((*addrp = malloc (ciptr->addrlen)) == NULL)
-    {
-	prmsg (1,"GetMyAddr: malloc failed\n");
-	return -1;
-    }
-    memcpy(*addrp, ciptr->addr, ciptr->addrlen);
-
-    return 0;
-}
-
-int
-TRANS(GetPeerAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
-		    Xtransaddr **addrp)
-
-{
-    prmsg (2,"GetPeerAddr(%d)\n", ciptr->fd);
-
-    *familyp = ciptr->family;
-    *addrlenp = ciptr->peeraddrlen;
-
-    if ((*addrp = malloc (ciptr->peeraddrlen)) == NULL)
-    {
-	prmsg (1,"GetPeerAddr: malloc failed\n");
-	return -1;
-    }
-    memcpy(*addrp, ciptr->peeraddr, ciptr->peeraddrlen);
-
-    return 0;
-}
-
-
-int
-TRANS(GetConnectionNumber) (XtransConnInfo ciptr)
-
-{
-    return ciptr->fd;
-}
-
-
-/*
- * These functions are really utility functions, but they require knowledge
- * of the internal data structures, so they have to be part of the Transport
- * Independant API.
- */
-
-#ifdef TRANS_SERVER
-
-static int
-complete_network_count (void)
-
-{
-    int count = 0;
-    int found_local = 0;
-    int i;
-
-    /*
-     * For a complete network, we only need one LOCALCONN transport to work
-     */
-
-    for (i = 0; i < NUMTRANS; i++)
-    {
-	if (Xtransports[i].transport->flags & TRANS_ALIAS
-   	 || Xtransports[i].transport->flags & TRANS_NOLISTEN)
-	    continue;
-
-	if (Xtransports[i].transport->flags & TRANS_LOCAL)
-	    found_local = 1;
-	else
-	    count++;
-    }
-
-    return (count + found_local);
-}
-
-
-static int
-receive_listening_fds(const char* port, XtransConnInfo* temp_ciptrs,
-                      int* count_ret)
-
-{
-#ifdef HAVE_SYSTEMD_DAEMON
-    XtransConnInfo ciptr;
-    int i, systemd_listen_fds;
-
-    systemd_listen_fds = sd_listen_fds(1);
-    if (systemd_listen_fds < 0)
-    {
-        prmsg (1, "receive_listening_fds: sd_listen_fds error: %s\n",
-               strerror(-systemd_listen_fds));
-        return -1;
-    }
-
-    for (i = 0; i < systemd_listen_fds && *count_ret < NUMTRANS; i++)
-    {
-        struct sockaddr_storage a;
-        int ti;
-        const char* tn;
-        socklen_t al;
-
-        al = sizeof(a);
-        if (getsockname(i + SD_LISTEN_FDS_START, (struct sockaddr*)&a, &al) < 0) {
-            prmsg (1, "receive_listening_fds: getsockname error: %s\n",
-                   strerror(errno));
-            return -1;
-        }
-
-        switch (a.ss_family)
-        {
-        case AF_UNIX:
-            ti = TRANS_SOCKET_UNIX_INDEX;
-            if (*((struct sockaddr_un*)&a)->sun_path == '\0' &&
-                al > sizeof(sa_family_t))
-                tn = "local";
-            else
-                tn = "unix";
-            break;
-        case AF_INET:
-            ti = TRANS_SOCKET_INET_INDEX;
-            tn = "inet";
-            break;
-#if defined(IPv6) && defined(AF_INET6)
-        case AF_INET6:
-            ti = TRANS_SOCKET_INET6_INDEX;
-            tn = "inet6";
-            break;
-#endif /* IPv6 */
-        default:
-            prmsg (1, "receive_listening_fds:"
-                   "Got unknown socket address family\n");
-            return -1;
-        }
-
-        ciptr = TRANS(ReopenCOTSServer)(ti, i + SD_LISTEN_FDS_START, port);
-        if (!ciptr)
-        {
-            prmsg (1, "receive_listening_fds:"
-                   "Got NULL while trying to reopen socket received from systemd.\n");
-            return -1;
-        }
-
-        prmsg (5, "receive_listening_fds: received listener for %s, %d\n",
-               tn, ciptr->fd);
-        temp_ciptrs[(*count_ret)++] = ciptr;
-        TRANS(Received)(tn);
-    }
-#endif /* HAVE_SYSTEMD_DAEMON */
-    return 0;
-}
-
-#ifdef XQUARTZ_EXPORTS_LAUNCHD_FD
-extern int xquartz_launchd_fd;
-#endif
-
-int
-TRANS(MakeAllCOTSServerListeners) (const char *port, int *partial,
-                                   int *count_ret, XtransConnInfo **ciptrs_ret)
-
-{
-    char		buffer[256]; /* ??? What size ?? */
-    XtransConnInfo	ciptr, temp_ciptrs[NUMTRANS];
-    int			status, i, j;
-
-#if defined(IPv6) && defined(AF_INET6)
-    int		ipv6_succ = 0;
-#endif
-    prmsg (2,"MakeAllCOTSServerListeners(%s,%p)\n",
-	   port ? port : "NULL", ciptrs_ret);
-
-    *count_ret = 0;
-
-#ifdef XQUARTZ_EXPORTS_LAUNCHD_FD
-    fprintf(stderr, "Launchd socket fd: %d\n", xquartz_launchd_fd);
-    if(xquartz_launchd_fd != -1) {
-        if((ciptr = TRANS(ReopenCOTSServer(TRANS_SOCKET_LOCAL_INDEX,
-                                           xquartz_launchd_fd, getenv("DISPLAY"))))==NULL)
-            fprintf(stderr,"Got NULL while trying to Reopen launchd port\n");
-        else
-            temp_ciptrs[(*count_ret)++] = ciptr;
-    }
-#endif
-
-    if (receive_listening_fds(port, temp_ciptrs, count_ret) < 0)
-	return -1;
-
-    for (i = 0; i < NUMTRANS; i++)
-    {
-	Xtransport *trans = Xtransports[i].transport;
-	unsigned int flags = 0;
-
-	if (trans->flags&TRANS_ALIAS || trans->flags&TRANS_NOLISTEN ||
-	    trans->flags&TRANS_RECEIVED)
-	    continue;
-
-	snprintf(buffer, sizeof(buffer), "%s/:%s",
-		 trans->TransName, port ? port : "");
-
-	prmsg (5,"MakeAllCOTSServerListeners: opening %s\n",
-	       buffer);
-
-	if ((ciptr = TRANS(OpenCOTSServer(buffer))) == NULL)
-	{
-	    if (trans->flags & TRANS_DISABLED)
-		continue;
-
-	    prmsg (1,
-	  "MakeAllCOTSServerListeners: failed to open listener for %s\n",
-		  trans->TransName);
-	    continue;
-	}
-#if defined(IPv6) && defined(AF_INET6)
-		if ((Xtransports[i].transport_id == TRANS_SOCKET_INET_INDEX
-		     && ipv6_succ))
-		    flags |= ADDR_IN_USE_ALLOWED;
-#endif
-
-	if ((status = TRANS(CreateListener (ciptr, port, flags))) < 0)
-	{
-	    if (status == TRANS_ADDR_IN_USE)
-	    {
-		/*
-		 * We failed to bind to the specified address because the
-		 * address is in use.  It must be that a server is already
-		 * running at this address, and this function should fail.
-		 */
-
-		prmsg (1,
-		"MakeAllCOTSServerListeners: server already running\n");
-
-		for (j = 0; j < *count_ret; j++)
-		    TRANS(Close) (temp_ciptrs[j]);
-
-		*count_ret = 0;
-		*ciptrs_ret = NULL;
-		*partial = 0;
-		return -1;
-	    }
-	    else
-	    {
-		prmsg (1,
-	"MakeAllCOTSServerListeners: failed to create listener for %s\n",
-		  trans->TransName);
-
-		continue;
-	    }
-	}
-
-#if defined(IPv6) && defined(AF_INET6)
-	if (Xtransports[i].transport_id == TRANS_SOCKET_INET6_INDEX)
-	    ipv6_succ = 1;
-#endif
-
-	prmsg (5,
-	      "MakeAllCOTSServerListeners: opened listener for %s, %d\n",
-	      trans->TransName, ciptr->fd);
-
-	temp_ciptrs[*count_ret] = ciptr;
-	(*count_ret)++;
-    }
-
-    *partial = (*count_ret < complete_network_count());
-
-    prmsg (5,
-     "MakeAllCOTSServerListeners: partial=%d, actual=%d, complete=%d \n",
-	*partial, *count_ret, complete_network_count());
-
-    if (*count_ret > 0)
-    {
-	if ((*ciptrs_ret = malloc (
-	    *count_ret * sizeof (XtransConnInfo))) == NULL)
-	{
-	    return -1;
-	}
-
-	for (i = 0; i < *count_ret; i++)
-	{
-	    (*ciptrs_ret)[i] = temp_ciptrs[i];
-	}
-    }
-    else
-	*ciptrs_ret = NULL;
-
-    return 0;
-}
-
-int
-TRANS(MakeAllCLTSServerListeners) (const char *port, int *partial,
-                                   int *count_ret, XtransConnInfo **ciptrs_ret)
-
-{
-    char		buffer[256]; /* ??? What size ?? */
-    XtransConnInfo	ciptr, temp_ciptrs[NUMTRANS];
-    int			status, i, j;
-
-    prmsg (2,"MakeAllCLTSServerListeners(%s,%p)\n",
-	port ? port : "NULL", ciptrs_ret);
-
-    *count_ret = 0;
-
-    for (i = 0; i < NUMTRANS; i++)
-    {
-	Xtransport *trans = Xtransports[i].transport;
-
-	if (trans->flags&TRANS_ALIAS || trans->flags&TRANS_NOLISTEN)
-	    continue;
-
-	snprintf(buffer, sizeof(buffer), "%s/:%s",
-		 trans->TransName, port ? port : "");
-
-	prmsg (5,"MakeAllCLTSServerListeners: opening %s\n",
-	    buffer);
-
-	if ((ciptr = TRANS(OpenCLTSServer (buffer))) == NULL)
-	{
-	    prmsg (1,
-	"MakeAllCLTSServerListeners: failed to open listener for %s\n",
-		  trans->TransName);
-	    continue;
-	}
-
-	if ((status = TRANS(CreateListener (ciptr, port, 0))) < 0)
-	{
-	    if (status == TRANS_ADDR_IN_USE)
-	    {
-		/*
-		 * We failed to bind to the specified address because the
-		 * address is in use.  It must be that a server is already
-		 * running at this address, and this function should fail.
-		 */
-
-		prmsg (1,
-		"MakeAllCLTSServerListeners: server already running\n");
-
-		for (j = 0; j < *count_ret; j++)
-		    TRANS(Close) (temp_ciptrs[j]);
-
-		*count_ret = 0;
-		*ciptrs_ret = NULL;
-		*partial = 0;
-		return -1;
-	    }
-	    else
-	    {
-		prmsg (1,
-	"MakeAllCLTSServerListeners: failed to create listener for %s\n",
-		  trans->TransName);
-
-		continue;
-	    }
-	}
-
-	prmsg (5,
-	"MakeAllCLTSServerListeners: opened listener for %s, %d\n",
-	      trans->TransName, ciptr->fd);
-	temp_ciptrs[*count_ret] = ciptr;
-	(*count_ret)++;
-    }
-
-    *partial = (*count_ret < complete_network_count());
-
-    prmsg (5,
-     "MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n",
-	*partial, *count_ret, complete_network_count());
-
-    if (*count_ret > 0)
-    {
-	if ((*ciptrs_ret = malloc (
-	    *count_ret * sizeof (XtransConnInfo))) == NULL)
-	{
-	    return -1;
-	}
-
-	for (i = 0; i < *count_ret; i++)
-	{
-	    (*ciptrs_ret)[i] = temp_ciptrs[i];
-	}
-    }
-    else
-	*ciptrs_ret = NULL;
-
-    return 0;
-}
-
-#endif /* TRANS_SERVER */
-
-
-
-/*
- * These routines are not part of the X Transport Interface, but they
- * may be used by it.
- */
-
-
-#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) || defined(WIN32)
-
-/*
- * emulate readv
- */
-
-static int TRANS(ReadV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt)
-
-{
-    int i, len, total;
-    char *base;
-
-    ESET(0);
-    for (i = 0, total = 0;  i < iovcnt;  i++, iov++) {
-	len = iov->iov_len;
-	base = iov->iov_base;
-	while (len > 0) {
-	    register int nbytes;
-	    nbytes = TRANS(Read) (ciptr, base, len);
-	    if (nbytes < 0 && total == 0)  return -1;
-	    if (nbytes <= 0)  return total;
-	    ESET(0);
-	    len   -= nbytes;
-	    total += nbytes;
-	    base  += nbytes;
-	}
-    }
-    return total;
-}
-
-#endif /* SYSV && __i386__ || WIN32 || __sxg__ */
-
-#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) || defined(WIN32)
-
-/*
- * emulate writev
- */
-
-static int TRANS(WriteV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt)
-
-{
-    int i, len, total;
-    char *base;
-
-    ESET(0);
-    for (i = 0, total = 0;  i < iovcnt;  i++, iov++) {
-	len = iov->iov_len;
-	base = iov->iov_base;
-	while (len > 0) {
-	    register int nbytes;
-	    nbytes = TRANS(Write) (ciptr, base, len);
-	    if (nbytes < 0 && total == 0)  return -1;
-	    if (nbytes <= 0)  return total;
-	    ESET(0);
-	    len   -= nbytes;
-	    total += nbytes;
-	    base  += nbytes;
-	}
-    }
-    return total;
-}
-
-#endif /* SYSV && __i386__ || WIN32 || __sxg__ */
-
-
-#if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SVR4) || defined(__SCO__)
-#ifndef NEED_UTSNAME
-#define NEED_UTSNAME
-#endif
-#include <sys/utsname.h>
-#endif
-
-/*
- * TRANS(GetHostname) - similar to gethostname but allows special processing.
- */
-
-int TRANS(GetHostname) (char *buf, int maxlen)
-
-{
-    int len;
-
-#ifdef NEED_UTSNAME
-    struct utsname name;
-
-    uname (&name);
-    len = strlen (name.nodename);
-    if (len >= maxlen) len = maxlen - 1;
-    strncpy (buf, name.nodename, len);
-    buf[len] = '\0';
-#else
-    buf[0] = '\0';
-    (void) gethostname (buf, maxlen);
-    buf [maxlen - 1] = '\0';
-    len = strlen(buf);
-#endif /* NEED_UTSNAME */
-    return len;
-}
diff --git a/openflow/usr/include/X11/Xtrans/Xtrans.h b/openflow/usr/include/X11/Xtrans/Xtrans.h
deleted file mode 100644
index 026fbd7..0000000
--- a/openflow/usr/include/X11/Xtrans/Xtrans.h
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
-
-Copyright 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
- * Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name NCR not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  NCR makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * NCR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NCR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _XTRANS_H_
-#define _XTRANS_H_
-
-#include <X11/Xfuncproto.h>
-#include <X11/Xos.h>
-
-#ifndef WIN32
-#include <sys/socket.h>
-#endif
-
-#ifdef __clang__
-/* Not all clients make use of all provided statics */
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-/*
- * Set the functions names according to where this code is being compiled.
- */
-
-#ifdef X11_t
-#define TRANS(func) _X11Trans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_X11Trans";
-#endif
-#endif /* X11_t */
-
-#ifdef XSERV_t
-#define TRANS(func) _XSERVTrans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_XSERVTrans";
-#endif
-#define X11_t
-#endif /* XSERV_t */
-
-#ifdef XIM_t
-#define TRANS(func) _XimXTrans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_XimTrans";
-#endif
-#endif /* XIM_t */
-
-#ifdef FS_t
-#define TRANS(func) _FSTrans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_FSTrans";
-#endif
-#endif /* FS_t */
-
-#ifdef FONT_t
-#define TRANS(func) _FontTrans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_FontTrans";
-#endif
-#endif /* FONT_t */
-
-#ifdef ICE_t
-#define TRANS(func) _IceTrans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_IceTrans";
-#endif
-#endif /* ICE_t */
-
-#ifdef TEST_t
-#define TRANS(func) _TESTTrans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_TESTTrans";
-#endif
-#endif /* TEST_t */
-
-#ifdef LBXPROXY_t
-#define TRANS(func) _LBXPROXYTrans##func
-#define X11_t		/* The server defines this - so should the LBX proxy */
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_LBXPROXYTrans";
-#endif
-#endif /* LBXPROXY_t */
-
-#if !defined(TRANS)
-#define TRANS(func) _XTrans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_XTrans";
-#endif
-#endif /* !TRANS */
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-/*
- * Create a single address structure that can be used wherever
- * an address structure is needed. struct sockaddr is not big enough
- * to hold a sockadd_un, so we create this definition to have a single
- * structure that is big enough for all the structures we might need.
- *
- * This structure needs to be independent of the socket/TLI interface used.
- */
-
-#if defined(IPv6) && defined(AF_INET6)
-typedef struct sockaddr_storage Xtransaddr;
-#else
-#define XTRANS_MAX_ADDR_LEN	128	/* large enough to hold sun_path */
-
-typedef	struct {
-    unsigned char	addr[XTRANS_MAX_ADDR_LEN];
-} Xtransaddr;
-#endif
-
-#ifdef LONG64
-typedef int BytesReadable_t;
-#else
-typedef long BytesReadable_t;
-#endif
-
-
-#if defined(WIN32) || defined(USG)
-
-/*
- *      TRANS(Readv) and TRANS(Writev) use struct iovec, normally found
- *      in Berkeley systems in <sys/uio.h>.  See the readv(2) and writev(2)
- *      manual pages for details.
- */
-
-struct iovec {
-    caddr_t iov_base;
-    int iov_len;
-};
-
-#else
-#include <sys/uio.h>
-#endif
-
-typedef struct _XtransConnInfo *XtransConnInfo;
-
-
-/*
- * Transport Option definitions
- */
-
-#define TRANS_NONBLOCKING	1
-#define	TRANS_CLOSEONEXEC	2
-
-
-/*
- * Return values of Connect (0 is success)
- */
-
-#define TRANS_CONNECT_FAILED 	-1
-#define TRANS_TRY_CONNECT_AGAIN -2
-#define TRANS_IN_PROGRESS	-3
-
-
-/*
- * Return values of CreateListener (0 is success)
- */
-
-#define TRANS_CREATE_LISTENER_FAILED 	-1
-#define TRANS_ADDR_IN_USE		-2
-
-
-/*
- * Return values of Accept (0 is success)
- */
-
-#define TRANS_ACCEPT_BAD_MALLOC			-1
-#define TRANS_ACCEPT_FAILED 			-2
-#define TRANS_ACCEPT_MISC_ERROR			-3
-
-
-/*
- * ResetListener return values
- */
-
-#define TRANS_RESET_NOOP	1
-#define TRANS_RESET_NEW_FD	2
-#define TRANS_RESET_FAILURE	3
-
-
-/*
- * Function prototypes for the exposed interface
- */
-
-void TRANS(FreeConnInfo) (
-    XtransConnInfo 	/* ciptr */
-);
-
-#ifdef TRANS_CLIENT
-
-XtransConnInfo TRANS(OpenCOTSClient)(
-    const char *	/* address */
-);
-
-#endif /* TRANS_CLIENT */
-
-#ifdef TRANS_SERVER
-
-XtransConnInfo TRANS(OpenCOTSServer)(
-    const char *	/* address */
-);
-
-#endif /* TRANS_SERVER */
-
-#ifdef TRANS_CLIENT
-
-XtransConnInfo TRANS(OpenCLTSClient)(
-    const char *	/* address */
-);
-
-#endif /* TRANS_CLIENT */
-
-#ifdef TRANS_SERVER
-
-XtransConnInfo TRANS(OpenCLTSServer)(
-    const char *	/* address */
-);
-
-#endif /* TRANS_SERVER */
-
-#ifdef TRANS_REOPEN
-
-XtransConnInfo TRANS(ReopenCOTSServer)(
-    int,		/* trans_id */
-    int,		/* fd */
-    const char *	/* port */
-);
-
-XtransConnInfo TRANS(ReopenCLTSServer)(
-    int,		/* trans_id */
-    int,		/* fd */
-    const char *	/* port */
-);
-
-int TRANS(GetReopenInfo)(
-    XtransConnInfo,	/* ciptr */
-    int *,		/* trans_id */
-    int *,		/* fd */
-    char **		/* port */
-);
-
-#endif /* TRANS_REOPEN */
-
-
-int TRANS(SetOption)(
-    XtransConnInfo,	/* ciptr */
-    int,		/* option */
-    int			/* arg */
-);
-
-#ifdef TRANS_SERVER
-
-int TRANS(CreateListener)(
-    XtransConnInfo,	/* ciptr */
-    const char *,	/* port */
-    unsigned int	/* flags */
-);
-
-int TRANS(Received) (
-    const char*         /* protocol*/
-);
-
-int TRANS(NoListen) (
-    const char*         /* protocol*/
-);
-
-int TRANS(Listen) (
-    const char*         /* protocol*/
-);
-
-int TRANS(IsListening) (
-    const char*         /* protocol*/
-);
-
-int TRANS(ResetListener)(
-    XtransConnInfo	/* ciptr */
-);
-
-XtransConnInfo TRANS(Accept)(
-    XtransConnInfo,	/* ciptr */
-    int *		/* status */
-);
-
-#endif /* TRANS_SERVER */
-
-#ifdef TRANS_CLIENT
-
-int TRANS(Connect)(
-    XtransConnInfo,	/* ciptr */
-    const char *	/* address */
-);
-
-#endif /* TRANS_CLIENT */
-
-int TRANS(BytesReadable)(
-    XtransConnInfo,	/* ciptr */
-    BytesReadable_t *	/* pend */
-);
-
-int TRANS(Read)(
-    XtransConnInfo,	/* ciptr */
-    char *,		/* buf */
-    int			/* size */
-);
-
-int TRANS(Write)(
-    XtransConnInfo,	/* ciptr */
-    char *,		/* buf */
-    int			/* size */
-);
-
-int TRANS(Readv)(
-    XtransConnInfo,	/* ciptr */
-    struct iovec *,	/* buf */
-    int			/* size */
-);
-
-int TRANS(Writev)(
-    XtransConnInfo,	/* ciptr */
-    struct iovec *,	/* buf */
-    int			/* size */
-);
-
-int TRANS(SendFd) (XtransConnInfo ciptr, int fd, int do_close);
-
-int TRANS(RecvFd) (XtransConnInfo ciptr);
-
-int TRANS(Disconnect)(
-    XtransConnInfo	/* ciptr */
-);
-
-int TRANS(Close)(
-    XtransConnInfo	/* ciptr */
-);
-
-int TRANS(CloseForCloning)(
-    XtransConnInfo	/* ciptr */
-);
-
-int TRANS(IsLocal)(
-    XtransConnInfo	/* ciptr */
-);
-
-int TRANS(GetMyAddr)(
-    XtransConnInfo,	/* ciptr */
-    int *,		/* familyp */
-    int *,		/* addrlenp */
-    Xtransaddr **	/* addrp */
-);
-
-int TRANS(GetPeerAddr)(
-    XtransConnInfo,	/* ciptr */
-    int *,		/* familyp */
-    int *,		/* addrlenp */
-    Xtransaddr **	/* addrp */
-);
-
-int TRANS(GetConnectionNumber)(
-    XtransConnInfo	/* ciptr */
-);
-
-#ifdef TRANS_SERVER
-
-int TRANS(MakeAllCOTSServerListeners)(
-    const char *,	/* port */
-    int *,		/* partial */
-    int *,		/* count_ret */
-    XtransConnInfo **	/* ciptrs_ret */
-);
-
-int TRANS(MakeAllCLTSServerListeners)(
-    const char *,	/* port */
-    int *,		/* partial */
-    int *,		/* count_ret */
-    XtransConnInfo **	/* ciptrs_ret */
-);
-
-#endif /* TRANS_SERVER */
-
-
-/*
- * Function Prototypes for Utility Functions.
- */
-
-#ifdef X11_t
-
-int TRANS(ConvertAddress)(
-    int *,		/* familyp */
-    int *,		/* addrlenp */
-    Xtransaddr **	/* addrp */
-);
-
-#endif /* X11_t */
-
-#ifdef ICE_t
-
-char *
-TRANS(GetMyNetworkId)(
-    XtransConnInfo	/* ciptr */
-);
-
-char *
-TRANS(GetPeerNetworkId)(
-    XtransConnInfo	/* ciptr */
-);
-
-#endif /* ICE_t */
-
-int
-TRANS(GetHostname) (
-    char *	/* buf */,
-    int 	/* maxlen */
-);
-
-#if defined(WIN32) && defined(TCPCONN)
-int TRANS(WSAStartup)();
-#endif
-
-#endif /* _XTRANS_H_ */
diff --git a/openflow/usr/include/X11/Xtrans/Xtransint.h b/openflow/usr/include/X11/Xtrans/Xtransint.h
deleted file mode 100644
index 5ff824d..0000000
--- a/openflow/usr/include/X11/Xtrans/Xtransint.h
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
-
-Copyright 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
- * Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name NCR not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  NCR makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * NCR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NCR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _XTRANSINT_H_
-#define _XTRANSINT_H_
-
-/*
- * XTRANSDEBUG will enable the PRMSG() macros used in the X Transport
- * Interface code. Each use of the PRMSG macro has a level associated with
- * it. XTRANSDEBUG is defined to be a level. If the invocation level is =<
- * the value of XTRANSDEBUG, then the message will be printed out to stderr.
- * Recommended levels are:
- *
- *	XTRANSDEBUG=1	Error messages
- *	XTRANSDEBUG=2 API Function Tracing
- *	XTRANSDEBUG=3 All Function Tracing
- *	XTRANSDEBUG=4 printing of intermediate values
- *	XTRANSDEBUG=5 really detailed stuff
-#define XTRANSDEBUG 2
- *
- * Defining XTRANSDEBUGTIMESTAMP will cause printing timestamps with each
- * message.
- */
-
-#if !defined(XTRANSDEBUG) && defined(XTRANS_TRANSPORT_C)
-#  define XTRANSDEBUG 1
-#endif
-
-#ifdef WIN32
-# define _WILLWINSOCK_
-#endif
-
-#include "Xtrans.h"
-
-#ifndef _X_UNUSED  /* Defined in Xfuncproto.h in xproto >= 7.0.22 */
-# define _X_UNUSED  /* */
-#endif
-
-#ifdef XTRANSDEBUG
-# include <stdio.h>
-#endif /* XTRANSDEBUG */
-
-#include <errno.h>
-
-#ifndef WIN32
-#  include <sys/socket.h>
-# include <netinet/in.h>
-# include <arpa/inet.h>
-
-/*
- * Moved the setting of NEED_UTSNAME to this header file from Xtrans.c,
- * to avoid a race condition. JKJ (6/5/97)
- */
-
-# if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SVR4) || defined(__SCO__)
-#  ifndef NEED_UTSNAME
-#   define NEED_UTSNAME
-#  endif
-#  include <sys/utsname.h>
-# endif
-
-#  define ESET(val) errno = val
-# define EGET() errno
-
-#else /* WIN32 */
-
-# include <limits.h>	/* for USHRT_MAX */
-
-# define ESET(val) WSASetLastError(val)
-# define EGET() WSAGetLastError()
-
-#endif /* WIN32 */
-
-#include <stddef.h>
-
-#ifdef X11_t
-#define X_TCP_PORT	6000
-#endif
-
-#if XTRANS_SEND_FDS
-
-struct _XtransConnFd {
-    struct _XtransConnFd   *next;
-    int                    fd;
-    int                    do_close;
-};
-
-#endif
-
-struct _XtransConnInfo {
-    struct _Xtransport     *transptr;
-    int		index;
-    char	*priv;
-    int		flags;
-    int		fd;
-    char	*port;
-    int		family;
-    char	*addr;
-    int		addrlen;
-    char	*peeraddr;
-    int		peeraddrlen;
-    struct _XtransConnFd        *recv_fds;
-    struct _XtransConnFd        *send_fds;
-};
-
-#define XTRANS_OPEN_COTS_CLIENT       1
-#define XTRANS_OPEN_COTS_SERVER       2
-#define XTRANS_OPEN_CLTS_CLIENT       3
-#define XTRANS_OPEN_CLTS_SERVER       4
-
-
-typedef struct _Xtransport {
-    const char	*TransName;
-    int		flags;
-
-#ifdef TRANS_CLIENT
-
-    XtransConnInfo (*OpenCOTSClient)(
-	struct _Xtransport *,	/* transport */
-	const char *,		/* protocol */
-	const char *,		/* host */
-	const char *		/* port */
-    );
-
-#endif /* TRANS_CLIENT */
-
-#ifdef TRANS_SERVER
-    const char **	nolisten;
-    XtransConnInfo (*OpenCOTSServer)(
-	struct _Xtransport *,	/* transport */
-	const char *,		/* protocol */
-	const char *,		/* host */
-	const char *		/* port */
-    );
-
-#endif /* TRANS_SERVER */
-
-#ifdef TRANS_CLIENT
-
-    XtransConnInfo (*OpenCLTSClient)(
-	struct _Xtransport *,	/* transport */
-	const char *,		/* protocol */
-	const char *,		/* host */
-	const char *		/* port */
-    );
-
-#endif /* TRANS_CLIENT */
-
-#ifdef TRANS_SERVER
-
-    XtransConnInfo (*OpenCLTSServer)(
-	struct _Xtransport *,	/* transport */
-	const char *,		/* protocol */
-	const char *,		/* host */
-	const char *		/* port */
-    );
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_REOPEN
-
-    XtransConnInfo (*ReopenCOTSServer)(
-	struct _Xtransport *,	/* transport */
-        int,			/* fd */
-        const char *		/* port */
-    );
-
-    XtransConnInfo (*ReopenCLTSServer)(
-	struct _Xtransport *,	/* transport */
-        int,			/* fd */
-        const char *		/* port */
-    );
-
-#endif /* TRANS_REOPEN */
-
-
-    int	(*SetOption)(
-	XtransConnInfo,		/* connection */
-	int,			/* option */
-	int			/* arg */
-    );
-
-#ifdef TRANS_SERVER
-/* Flags */
-# define ADDR_IN_USE_ALLOWED	1
-
-    int	(*CreateListener)(
-	XtransConnInfo,		/* connection */
-	const char *,		/* port */
-	unsigned int		/* flags */
-    );
-
-    int	(*ResetListener)(
-	XtransConnInfo		/* connection */
-    );
-
-    XtransConnInfo (*Accept)(
-	XtransConnInfo,		/* connection */
-        int *			/* status */
-    );
-
-#endif /* TRANS_SERVER */
-
-#ifdef TRANS_CLIENT
-
-    int	(*Connect)(
-	XtransConnInfo,		/* connection */
-	const char *,		/* host */
-	const char *		/* port */
-    );
-
-#endif /* TRANS_CLIENT */
-
-    int	(*BytesReadable)(
-	XtransConnInfo,		/* connection */
-	BytesReadable_t *	/* pend */
-    );
-
-    int	(*Read)(
-	XtransConnInfo,		/* connection */
-	char *,			/* buf */
-	int			/* size */
-    );
-
-    int	(*Write)(
-	XtransConnInfo,		/* connection */
-	char *,			/* buf */
-	int			/* size */
-    );
-
-    int	(*Readv)(
-	XtransConnInfo,		/* connection */
-	struct iovec *,		/* buf */
-	int			/* size */
-    );
-
-    int	(*Writev)(
-	XtransConnInfo,		/* connection */
-	struct iovec *,		/* buf */
-	int			/* size */
-    );
-
-#if XTRANS_SEND_FDS
-    int (*SendFd)(
-	XtransConnInfo,		/* connection */
-        int,                    /* fd */
-        int                     /* do_close */
-    );
-
-    int (*RecvFd)(
-	XtransConnInfo		/* connection */
-    );
-#endif
-
-    int	(*Disconnect)(
-	XtransConnInfo		/* connection */
-    );
-
-    int	(*Close)(
-	XtransConnInfo		/* connection */
-    );
-
-    int	(*CloseForCloning)(
-	XtransConnInfo		/* connection */
-    );
-
-} Xtransport;
-
-
-typedef struct _Xtransport_table {
-    Xtransport	*transport;
-    int		transport_id;
-} Xtransport_table;
-
-
-/*
- * Flags for the flags member of Xtransport.
- */
-
-#define TRANS_ALIAS	(1<<0)	/* record is an alias, don't create server */
-#define TRANS_LOCAL	(1<<1)	/* local transport */
-#define TRANS_DISABLED	(1<<2)	/* Don't open this one */
-#define TRANS_NOLISTEN  (1<<3)  /* Don't listen on this one */
-#define TRANS_NOUNLINK	(1<<4)	/* Don't unlink transport endpoints */
-#define TRANS_ABSTRACT	(1<<5)	/* Use abstract sockets if available */
-#define TRANS_NOXAUTH	(1<<6)	/* Don't verify authentication (because it's secure some other way at the OS layer) */
-#define TRANS_RECEIVED	(1<<7)  /* The fd for this has already been opened by someone else. */
-
-/* Flags to preserve when setting others */
-#define TRANS_KEEPFLAGS	(TRANS_NOUNLINK|TRANS_ABSTRACT)
-
-#ifdef XTRANS_TRANSPORT_C /* only provide static function prototypes when
-			     building the transport.c file that has them in */
-
-#ifdef __clang__
-/* Not all clients make use of all provided statics */
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-/*
- * readv() and writev() don't exist or don't work correctly on some
- * systems, so they may be emulated.
- */
-
-#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) || defined(WIN32)
-
-#define READV(ciptr, iov, iovcnt)	TRANS(ReadV)(ciptr, iov, iovcnt)
-
-static	int TRANS(ReadV)(
-    XtransConnInfo,	/* ciptr */
-    struct iovec *,	/* iov */
-    int			/* iovcnt */
-);
-
-#else
-
-#define READV(ciptr, iov, iovcnt)	readv(ciptr->fd, iov, iovcnt)
-
-#endif /* CRAY || (SYSV && __i386__) || WIN32 || __sxg__ || */
-
-
-#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) || defined(WIN32)
-
-#define WRITEV(ciptr, iov, iovcnt)	TRANS(WriteV)(ciptr, iov, iovcnt)
-
-static int TRANS(WriteV)(
-    XtransConnInfo,	/* ciptr */
-    struct iovec *,	/* iov */
-    int 		/* iovcnt */
-);
-
-#else
-
-#define WRITEV(ciptr, iov, iovcnt)	writev(ciptr->fd, iov, iovcnt)
-
-#endif /* CRAY || WIN32 || __sxg__ */
-
-
-static int is_numeric (
-    const char *	/* str */
-);
-
-#ifdef TRANS_SERVER
-static int trans_mkdir (
-    const char *,	/* path */
-    int			/* mode */
-);
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-/*
- * Some XTRANSDEBUG stuff
- */
-
-#ifdef XTRANSDEBUG
-#include <stdarg.h>
-
-/*
- * The X server provides ErrorF() & VErrorF(), for other software that uses
- * xtrans, we provide our own simple versions.
- */
-# if defined(XSERV_t) && defined(TRANS_SERVER)
-#  include "os.h"
-# else
-static inline void _X_ATTRIBUTE_PRINTF(1, 0)
-VErrorF(const char *f, va_list args)
-{
-    vfprintf(stderr, f, args);
-    fflush(stderr);
-}
-
-static inline void  _X_ATTRIBUTE_PRINTF(1, 2)
-ErrorF(const char *f, ...)
-{
-    va_list args;
-
-    va_start(args, f);
-    VErrorF(f, args);
-    va_end(args);
-}
-# endif /* xserver */
-#endif /* XTRANSDEBUG */
-
-static inline void  _X_ATTRIBUTE_PRINTF(2, 3)
-prmsg(int lvl, const char *f, ...)
-{
-#ifdef XTRANSDEBUG
-    va_list args;
-
-    va_start(args, f);
-    if (lvl <= XTRANSDEBUG) {
-	int saveerrno = errno;
-
-	ErrorF("%s", __xtransname);
-	VErrorF(f, args);
-
-# ifdef XTRANSDEBUGTIMESTAMP
-	{
-	    struct timeval tp;
-	    gettimeofday(&tp, 0);
-	    ErrorF("timestamp (ms): %d\n",
-		   tp.tv_sec * 1000 + tp.tv_usec / 1000);
-	}
-# endif
-	errno = saveerrno;
-    }
-    va_end(args);
-#endif /* XTRANSDEBUG */
-}
-
-#endif /* XTRANS_TRANSPORT_C */
-
-#endif /* _XTRANSINT_H_ */
diff --git a/openflow/usr/include/X11/Xtrans/Xtranslcl.c b/openflow/usr/include/X11/Xtrans/Xtranslcl.c
deleted file mode 100644
index 3217506..0000000
--- a/openflow/usr/include/X11/Xtrans/Xtranslcl.c
+++ /dev/null
@@ -1,2587 +0,0 @@
-/*
-
-Copyright 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
- * Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name NCR not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  NCR makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * NCR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NCR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- *
- * The connection code/ideas in lib/X and server/os for SVR4/Intel
- * environments was contributed by the following companies/groups:
- *
- *	MetroLink Inc
- *	NCR
- *	Pittsburgh Powercomputing Corporation (PPc)/Quarterdeck Office Systems
- *	SGCS
- *	Unix System Laboratories (USL) / Novell
- *	XFree86
- *
- * The goal is to have common connection code among all SVR4/Intel vendors.
- *
- * ALL THE ABOVE COMPANIES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL THESE COMPANIES * BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
- * OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <errno.h>
-#include <ctype.h>
-#include <sys/signal.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#if defined(SVR4) || defined(__SVR4)
-#include <sys/filio.h>
-#endif
-#ifdef sun
-# include <stropts.h>
-#else
-# include <sys/stropts.h>
-#endif
-#include <sys/wait.h>
-#include <sys/types.h>
-
-/*
- * The local transports should be treated the same as a UNIX domain socket
- * wrt authentication, etc. Because of this, we will use struct sockaddr_un
- * for the address format. This will simplify the code in other places like
- * The X Server.
- */
-
-#include <sys/socket.h>
-#ifndef X_NO_SYS_UN
-#include <sys/un.h>
-#endif
-
-
-/* Types of local connections supported:
- *  - PTS
- *  - named pipes
- *  - SCO
- */
-#if !defined(sun)
-# define LOCAL_TRANS_PTS
-#endif
-#if defined(SVR4) || defined(__SVR4)
-# define LOCAL_TRANS_NAMED
-#endif
-#if defined(__SCO__) || defined(__UNIXWARE__)
-# define LOCAL_TRANS_SCO
-#endif
-
-static int TRANS(LocalClose)(XtransConnInfo ciptr);
-
-/*
- * These functions actually implement the local connection mechanisms.
- */
-
-/* Type Not Supported */
-
-static int
-TRANS(OpenFail)(XtransConnInfo ciptr _X_UNUSED, const char *port _X_UNUSED)
-
-{
-    return -1;
-}
-
-#ifdef TRANS_REOPEN
-
-static int
-TRANS(ReopenFail)(XtransConnInfo ciptr _X_UNUSED, int fd _X_UNUSED,
-                  const char *port _X_UNUSED)
-
-{
-    return 0;
-}
-
-#endif /* TRANS_REOPEN */
-
-#if XTRANS_SEND_FDS
-static int
-TRANS(LocalRecvFdInvalid)(XtransConnInfo ciptr)
-{
-    errno = EINVAL;
-    return -1;
-}
-
-static int
-TRANS(LocalSendFdInvalid)(XtransConnInfo ciptr, int fd, int do_close)
-{
-    errno = EINVAL;
-    return -1;
-}
-#endif
-
-
-static int
-TRANS(FillAddrInfo)(XtransConnInfo ciptr,
-                    const char *sun_path, const char *peer_sun_path)
-
-{
-    struct sockaddr_un	*sunaddr;
-    struct sockaddr_un	*p_sunaddr;
-
-    ciptr->family = AF_UNIX;
-    ciptr->addrlen = sizeof (struct sockaddr_un);
-
-    if ((sunaddr = malloc (ciptr->addrlen)) == NULL)
-    {
-	prmsg(1,"FillAddrInfo: failed to allocate memory for addr\n");
-	return 0;
-    }
-
-    sunaddr->sun_family = AF_UNIX;
-
-    if (strlen(sun_path) > sizeof(sunaddr->sun_path) - 1) {
-	prmsg(1, "FillAddrInfo: path too long\n");
-	free((char *) sunaddr);
-	return 0;
-    }
-    strcpy (sunaddr->sun_path, sun_path);
-#if defined(BSD44SOCKETS)
-    sunaddr->sun_len = strlen (sunaddr->sun_path);
-#endif
-
-    ciptr->addr = (char *) sunaddr;
-
-    ciptr->peeraddrlen = sizeof (struct sockaddr_un);
-
-    if ((p_sunaddr = malloc (ciptr->peeraddrlen)) == NULL)
-    {
-	prmsg(1,
-	   "FillAddrInfo: failed to allocate memory for peer addr\n");
-	free (sunaddr);
-	ciptr->addr = NULL;
-
-	return 0;
-    }
-
-    p_sunaddr->sun_family = AF_UNIX;
-
-    if (strlen(peer_sun_path) > sizeof(p_sunaddr->sun_path) - 1) {
-	prmsg(1, "FillAddrInfo: peer path too long\n");
-	free((char *) p_sunaddr);
-	return 0;
-    }
-    strcpy (p_sunaddr->sun_path, peer_sun_path);
-#if defined(BSD44SOCKETS)
-    p_sunaddr->sun_len = strlen (p_sunaddr->sun_path);
-#endif
-
-    ciptr->peeraddr = (char *) p_sunaddr;
-
-    return 1;
-}
-
-
-
-#ifdef LOCAL_TRANS_PTS
-/* PTS */
-
-#if defined(SYSV) && !defined(__SCO__)
-#define SIGNAL_T int
-#else
-#define SIGNAL_T void
-#endif /* SYSV */
-
-typedef SIGNAL_T (*PFV)();
-
-extern PFV signal();
-
-extern char *ptsname(
-    int
-);
-
-static void _dummy(int sig _X_UNUSED)
-
-{
-}
-#endif /* LOCAL_TRANS_PTS */
-
-#ifndef sun
-#define X_STREAMS_DIR	"/dev/X"
-#define DEV_SPX		"/dev/spx"
-#else
-#ifndef X11_t
-#define X_STREAMS_DIR	"/dev/X"
-#else
-#define X_STREAMS_DIR	"/tmp/.X11-pipe"
-#endif
-#endif
-
-#define DEV_PTMX	"/dev/ptmx"
-
-#if defined(X11_t)
-
-#define PTSNODENAME "/dev/X/server."
-#ifdef sun
-#define NAMEDNODENAME "/tmp/.X11-pipe/X"
-#else
-#define NAMEDNODENAME "/dev/X/Nserver."
-
-#define SCORNODENAME	"/dev/X%1sR"
-#define SCOSNODENAME	"/dev/X%1sS"
-#endif /* !sun */
-#endif
-#if defined(XIM_t)
-#ifdef sun
-#define NAMEDNODENAME "/tmp/.XIM-pipe/XIM"
-#else
-#define PTSNODENAME	"/dev/X/XIM."
-#define NAMEDNODENAME	"/dev/X/NXIM."
-#define SCORNODENAME	"/dev/XIM.%sR"
-#define SCOSNODENAME	"/dev/XIM.%sS"
-#endif
-#endif
-#if defined(FS_t) || defined (FONT_t)
-#ifdef sun
-#define NAMEDNODENAME	"/tmp/.font-pipe/fs"
-#else
-/*
- * USL has already defined something here. We need to check with them
- * and see if their choice is usable here.
- */
-#define PTSNODENAME	"/dev/X/fontserver."
-#define NAMEDNODENAME	"/dev/X/Nfontserver."
-#define SCORNODENAME	"/dev/fontserver.%sR"
-#define SCOSNODENAME	"/dev/fontserver.%sS"
-#endif
-#endif
-#if defined(ICE_t)
-#ifdef sun
-#define NAMEDNODENAME	"/tmp/.ICE-pipe/"
-#else
-#define PTSNODENAME	"/dev/X/ICE."
-#define NAMEDNODENAME	"/dev/X/NICE."
-#define SCORNODENAME	"/dev/ICE.%sR"
-#define SCOSNODENAME	"/dev/ICE.%sS"
-#endif
-#endif
-#if defined(TEST_t)
-#ifdef sun
-#define NAMEDNODENAME	"/tmp/.Test-unix/test"
-#endif
-#define PTSNODENAME	"/dev/X/transtest."
-#define NAMEDNODENAME	"/dev/X/Ntranstest."
-#define SCORNODENAME	"/dev/transtest.%sR"
-#define SCOSNODENAME	"/dev/transtest.%sS"
-#endif
-
-
-
-#ifdef LOCAL_TRANS_PTS
-#ifdef TRANS_CLIENT
-
-static int
-TRANS(PTSOpenClient)(XtransConnInfo ciptr, const char *port)
-
-{
-#ifdef PTSNODENAME
-    int			fd,server,exitval,alarm_time,ret;
-    char		server_path[64];
-    char		*slave, namelen;
-    char		buf[20]; /* MAX_PATH_LEN?? */
-    PFV			savef;
-    pid_t		saved_pid;
-#endif
-
-    prmsg(2,"PTSOpenClient(%s)\n", port);
-
-#if !defined(PTSNODENAME)
-    prmsg(1,"PTSOpenClient: Protocol is not supported by a pts connection\n");
-    return -1;
-#else
-    if (port && *port ) {
-	if( *port == '/' ) { /* A full pathname */
-	    snprintf(server_path, sizeof(server_path), "%s", port);
-	} else {
-	    snprintf(server_path, sizeof(server_path), "%s%s",
-		     PTSNODENAME, port);
-	}
-    } else {
-	snprintf(server_path, sizeof(server_path), "%s%d",
-		 PTSNODENAME, getpid());
-    }
-
-
-    /*
-     * Open the node the on which the server is listening.
-     */
-
-    if ((server = open (server_path, O_RDWR)) < 0) {
-	prmsg(1,"PTSOpenClient: failed to open %s\n", server_path);
-	return -1;
-    }
-
-
-    /*
-     * Open the streams based pipe that will be this connection.
-     */
-
-    if ((fd = open(DEV_PTMX, O_RDWR)) < 0) {
-	prmsg(1,"PTSOpenClient: failed to open %s\n", DEV_PTMX);
-	close(server);
-	return(-1);
-    }
-
-    (void) grantpt(fd);
-    (void) unlockpt(fd);
-
-    slave = ptsname(fd); /* get name */
-
-    if( slave == NULL ) {
-	prmsg(1,"PTSOpenClient: failed to get ptsname()\n");
-	close(fd);
-	close(server);
-	return -1;
-    }
-
-    /*
-     * This is neccesary for the case where a program is setuid to non-root.
-     * grantpt() calls /usr/lib/pt_chmod which is set-uid root. This program will
-     * set the owner of the pt device incorrectly if the uid is not restored
-     * before it is called. The problem is that once it gets restored, it
-     * cannot be changed back to its original condition, hence the fork().
-     */
-
-    if(!(saved_pid=fork())) {
-	uid_t       saved_euid;
-
-	saved_euid = geteuid();
-	/** sets the euid to the actual/real uid **/
-	if (setuid( getuid() ) == -1) {
-		exit(1);
-	}
-	if( chown( slave, saved_euid, -1 ) < 0 ) {
-		exit( 1 );
-		}
-
-	exit( 0 );
-    }
-
-    waitpid(saved_pid, &exitval, 0);
-    if (WIFEXITED(exitval) && WEXITSTATUS(exitval) != 0) {
-	close(fd);
-	close(server);
-	prmsg(1, "PTSOpenClient: cannot set the owner of %s\n",
-	      slave);
-	return(-1);
-    }
-    if (chmod(slave, 0666) < 0) {
-	close(fd);
-	close(server);
-	prmsg(1,"PTSOpenClient: Cannot chmod %s\n", slave);
-	return(-1);
-    }
-
-    /*
-     * write slave name to server
-     */
-
-    namelen = strlen(slave);
-    buf[0] = namelen;
-    (void) sprintf(&buf[1], slave);
-    (void) write(server, buf, namelen+1);
-    (void) close(server);
-
-    /*
-     * wait for server to respond
-     */
-
-    savef = signal(SIGALRM, _dummy);
-    alarm_time = alarm (30); /* CONNECT_TIMEOUT */
-
-    ret = read(fd, buf, 1);
-
-    (void) alarm(alarm_time);
-    (void) signal(SIGALRM, savef);
-
-    if (ret != 1) {
-	prmsg(1,
-	"PTSOpenClient: failed to get acknoledgement from server\n");
-	(void) close(fd);
-	fd = -1;
-    }
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-
-    if (TRANS(FillAddrInfo) (ciptr, slave, server_path) == 0)
-    {
-	prmsg(1,"PTSOpenClient: failed to fill in addr info\n");
-	close(fd);
-	return -1;
-    }
-
-    return(fd);
-
-#endif /* !PTSNODENAME */
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-static int
-TRANS(PTSOpenServer)(XtransConnInfo ciptr, const char *port)
-
-{
-#ifdef PTSNODENAME
-    int fd, server;
-    char server_path[64], *slave;
-    int mode;
-#endif
-
-    prmsg(2,"PTSOpenServer(%s)\n", port);
-
-#if !defined(PTSNODENAME)
-    prmsg(1,"PTSOpenServer: Protocol is not supported by a pts connection\n");
-    return -1;
-#else
-    if (port && *port ) {
-	if( *port == '/' ) { /* A full pathname */
-		(void) sprintf(server_path, "%s", port);
-	    } else {
-		(void) sprintf(server_path, "%s%s", PTSNODENAME, port);
-	    }
-    } else {
-	(void) sprintf(server_path, "%s%d", PTSNODENAME, getpid());
-    }
-
-#ifdef HAS_STICKY_DIR_BIT
-    mode = 01777;
-#else
-    mode = 0777;
-#endif
-    if (trans_mkdir(X_STREAMS_DIR, mode) == -1) {
-	prmsg (1, "PTSOpenServer: mkdir(%s) failed, errno = %d\n",
-	       X_STREAMS_DIR, errno);
-	return(-1);
-    }
-
-#if 0
-    if( (fd=open(server_path, O_RDWR)) >= 0 ) {
-	/*
-	 * This doesn't prevent the server from starting up, and doesn't
-	 * prevent clients from trying to connect to the in-use PTS (which
-	 * is often in use by something other than another server).
-	 */
-	prmsg(1, "PTSOpenServer: A server is already running on port %s\n", port);
-	prmsg(1, "PTSOpenServer: Remove %s if this is incorrect.\n", server_path);
-	close(fd);
-	return(-1);
-    }
-#else
-    /* Just remove the old path (which is what happens with UNIXCONN) */
-#endif
-
-    unlink(server_path);
-
-    if( (fd=open(DEV_PTMX, O_RDWR)) < 0) {
-	prmsg(1, "PTSOpenServer: Unable to open %s\n", DEV_PTMX);
-	return(-1);
-    }
-
-    grantpt(fd);
-    unlockpt(fd);
-
-    if( (slave=ptsname(fd)) == NULL) {
-	prmsg(1, "PTSOpenServer: Unable to get slave device name\n");
-	close(fd);
-	return(-1);
-    }
-
-    if( link(slave,server_path) < 0 ) {
-	prmsg(1, "PTSOpenServer: Unable to link %s to %s\n", slave, server_path);
-	close(fd);
-	return(-1);
-    }
-
-    if( chmod(server_path, 0666) < 0 ) {
-	prmsg(1, "PTSOpenServer: Unable to chmod %s to 0666\n", server_path);
-	close(fd);
-	return(-1);
-    }
-
-    if( (server=open(server_path, O_RDWR)) < 0 ) {
-	prmsg(1, "PTSOpenServer: Unable to open server device %s\n", server_path);
-	close(fd);
-	return(-1);
-    }
-
-    close(server);
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-
-    if (TRANS(FillAddrInfo) (ciptr, server_path, server_path) == 0)
-    {
-	prmsg(1,"PTSOpenServer: failed to fill in addr info\n");
-	close(fd);
-	return -1;
-    }
-
-    return fd;
-
-#endif /* !PTSNODENAME */
-}
-
-static int
-TRANS(PTSAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
-
-{
-    int			newfd;
-    int			in;
-    unsigned char	length;
-    char		buf[256];
-    struct sockaddr_un	*sunaddr;
-
-    prmsg(2,"PTSAccept(%x->%d)\n",ciptr,ciptr->fd);
-
-    if( (in=read(ciptr->fd,&length,1)) <= 0 ){
-	if( !in ) {
-		prmsg(2,
-		"PTSAccept: Incoming connection closed\n");
-		}
-	else {
-		prmsg(1,
-	"PTSAccept: Error reading incoming connection. errno=%d \n",
-								errno);
-		}
-	*status = TRANS_ACCEPT_MISC_ERROR;
-	return -1;
-    }
-
-    if( (in=read(ciptr->fd,buf,length)) <= 0 ){
-	if( !in ) {
-		prmsg(2,
-		"PTSAccept: Incoming connection closed\n");
-		}
-	else {
-		prmsg(1,
-"PTSAccept: Error reading device name for new connection. errno=%d \n",
-								errno);
-		}
-	*status = TRANS_ACCEPT_MISC_ERROR;
-	return -1;
-    }
-
-    buf[length] = '\0';
-
-    if( (newfd=open(buf,O_RDWR)) < 0 ) {
-	prmsg(1, "PTSAccept: Failed to open %s\n",buf);
-	*status = TRANS_ACCEPT_MISC_ERROR;
-	return -1;
-    }
-
-    write(newfd,"1",1);
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-
-    newciptr->addrlen=ciptr->addrlen;
-    if( (newciptr->addr = malloc(newciptr->addrlen)) == NULL ) {
-	prmsg(1,"PTSAccept: failed to allocate memory for peer addr\n");
-	close(newfd);
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-	return -1;
-    }
-
-    memcpy(newciptr->addr,ciptr->addr,newciptr->addrlen);
-
-    newciptr->peeraddrlen=sizeof(struct sockaddr_un);
-    if( (sunaddr = malloc(newciptr->peeraddrlen)) == NULL ) {
-	prmsg(1,"PTSAccept: failed to allocate memory for peer addr\n");
-	free(newciptr->addr);
-	close(newfd);
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-	return -1;
-    }
-
-    sunaddr->sun_family=AF_UNIX;
-    strcpy(sunaddr->sun_path,buf);
-#if defined(BSD44SOCKETS)
-    sunaddr->sun_len=strlen(sunaddr->sun_path);
-#endif
-
-    newciptr->peeraddr=(char *)sunaddr;
-
-    *status = 0;
-
-    return newfd;
-}
-
-#endif /* TRANS_SERVER */
-#endif /* LOCAL_TRANS_PTS */
-
-
-#ifdef LOCAL_TRANS_NAMED
-
-/* NAMED */
-
-#ifdef TRANS_CLIENT
-
-static int
-TRANS(NAMEDOpenClient)(XtransConnInfo ciptr, const char *port)
-
-{
-#ifdef NAMEDNODENAME
-    int			fd;
-    char		server_path[64];
-    struct stat		filestat;
-# ifndef sun
-    extern int		isastream(int);
-# endif
-#endif
-
-    prmsg(2,"NAMEDOpenClient(%s)\n", port);
-
-#if !defined(NAMEDNODENAME)
-    prmsg(1,"NAMEDOpenClient: Protocol is not supported by a NAMED connection\n");
-    return -1;
-#else
-    if ( port && *port ) {
-	if( *port == '/' ) { /* A full pathname */
-		(void) snprintf(server_path, sizeof(server_path), "%s", port);
-	    } else {
-		(void) snprintf(server_path, sizeof(server_path), "%s%s", NAMEDNODENAME, port);
-	    }
-    } else {
-	(void) snprintf(server_path, sizeof(server_path), "%s%ld", NAMEDNODENAME, (long)getpid());
-    }
-
-    if ((fd = open(server_path, O_RDWR)) < 0) {
-	prmsg(1,"NAMEDOpenClient: Cannot open %s for NAMED connection\n", server_path);
-	return -1;
-    }
-
-    if (fstat(fd, &filestat) < 0 ) {
-	prmsg(1,"NAMEDOpenClient: Cannot stat %s for NAMED connection\n", server_path);
-	(void) close(fd);
-	return -1;
-    }
-
-    if ((filestat.st_mode & S_IFMT) != S_IFIFO) {
-	prmsg(1,"NAMEDOpenClient: Device %s is not a FIFO\n", server_path);
-	/* Is this really a failure? */
-	(void) close(fd);
-	return -1;
-    }
-
-
-    if (isastream(fd) <= 0) {
-	prmsg(1,"NAMEDOpenClient: %s is not a streams device\n", server_path);
-	(void) close(fd);
-	return -1;
-    }
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-
-    if (TRANS(FillAddrInfo) (ciptr, server_path, server_path) == 0)
-    {
-	prmsg(1,"NAMEDOpenClient: failed to fill in addr info\n");
-	close(fd);
-	return -1;
-    }
-
-    return(fd);
-
-#endif /* !NAMEDNODENAME */
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-
-#ifdef NAMEDNODENAME
-static int
-TRANS(NAMEDOpenPipe)(const char *server_path)
-{
-    int			fd, pipefd[2];
-    struct stat		sbuf;
-    int			mode;
-
-    prmsg(2,"NAMEDOpenPipe(%s)\n", server_path);
-
-#ifdef HAS_STICKY_DIR_BIT
-    mode = 01777;
-#else
-    mode = 0777;
-#endif
-    if (trans_mkdir(X_STREAMS_DIR, mode) == -1) {
-	prmsg (1, "NAMEDOpenPipe: mkdir(%s) failed, errno = %d\n",
-	       X_STREAMS_DIR, errno);
-	return(-1);
-    }
-
-    if(stat(server_path, &sbuf) != 0) {
-	if (errno == ENOENT) {
-	    if ((fd = creat(server_path, (mode_t)0666)) == -1) {
-		prmsg(1, "NAMEDOpenPipe: Can't open %s\n", server_path);
-		return(-1);
-	    }
-	    close(fd);
-	    if (chmod(server_path, (mode_t)0666) < 0) {
-		prmsg(1, "NAMEDOpenPipe: Can't open %s\n", server_path);
-		return(-1);
-	    }
-	} else {
-	    prmsg(1, "NAMEDOpenPipe: stat on %s failed\n", server_path);
-	    return(-1);
-	}
-    }
-
-    if( pipe(pipefd) != 0) {
-	prmsg(1, "NAMEDOpenPipe: pipe() failed, errno=%d\n",errno);
-	return(-1);
-    }
-
-    if( ioctl(pipefd[0], I_PUSH, "connld") != 0) {
-	prmsg(1, "NAMEDOpenPipe: ioctl(I_PUSH,\"connld\") failed, errno=%d\n",errno);
-	close(pipefd[0]);
-	close(pipefd[1]);
-	return(-1);
-    }
-
-    if( fattach(pipefd[0], server_path) != 0) {
-	prmsg(1, "NAMEDOpenPipe: fattach(%s) failed, errno=%d\n", server_path,errno);
-	close(pipefd[0]);
-	close(pipefd[1]);
-	return(-1);
-    }
-
-    return(pipefd[1]);
-}
-#endif
-
-static int
-TRANS(NAMEDOpenServer)(XtransConnInfo ciptr, const char *port)
-{
-#ifdef NAMEDNODENAME
-    int			fd;
-    char		server_path[64];
-#endif
-
-    prmsg(2,"NAMEDOpenServer(%s)\n", port);
-
-#if !defined(NAMEDNODENAME)
-    prmsg(1,"NAMEDOpenServer: Protocol is not supported by a NAMED connection\n");
-    return -1;
-#else
-    if ( port && *port ) {
-	if( *port == '/' ) { /* A full pathname */
-	    (void) snprintf(server_path, sizeof(server_path), "%s", port);
-	} else {
-	    (void) snprintf(server_path, sizeof(server_path), "%s%s",
-			    NAMEDNODENAME, port);
-	}
-    } else {
-	(void) snprintf(server_path, sizeof(server_path), "%s%ld",
-		       NAMEDNODENAME, (long)getpid());
-    }
-
-    fd = TRANS(NAMEDOpenPipe)(server_path);
-    if (fd < 0) {
-	return -1;
-    }
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-
-    if (TRANS(FillAddrInfo) (ciptr, server_path, server_path) == 0)
-    {
-	prmsg(1,"NAMEDOpenServer: failed to fill in addr info\n");
-	TRANS(LocalClose)(ciptr);
-	return -1;
-    }
-
-    return fd;
-
-#endif /* !NAMEDNODENAME */
-}
-
-static int
-TRANS(NAMEDResetListener) (XtransConnInfo ciptr)
-
-{
-  struct sockaddr_un      *sockname=(struct sockaddr_un *) ciptr->addr;
-  struct stat     statb;
-
-  prmsg(2,"NAMEDResetListener(%p, %d)\n", ciptr, ciptr->fd);
-
-  if (ciptr->fd != -1) {
-    /*
-     * see if the pipe has disappeared
-     */
-
-    if (stat (sockname->sun_path, &statb) == -1 ||
-	(statb.st_mode & S_IFMT) != S_IFIFO) {
-      prmsg(3, "Pipe %s trashed, recreating\n", sockname->sun_path);
-      TRANS(LocalClose)(ciptr);
-      ciptr->fd = TRANS(NAMEDOpenPipe)(sockname->sun_path);
-      if (ciptr->fd >= 0)
-	  return TRANS_RESET_NEW_FD;
-      else
-	  return TRANS_CREATE_LISTENER_FAILED;
-    }
-  }
-  return TRANS_RESET_NOOP;
-}
-
-static int
-TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
-
-{
-    struct strrecvfd str;
-
-    prmsg(2,"NAMEDAccept(%p->%d)\n", ciptr, ciptr->fd);
-
-    if( ioctl(ciptr->fd, I_RECVFD, &str ) < 0 ) {
-	prmsg(1, "NAMEDAccept: ioctl(I_RECVFD) failed, errno=%d\n", errno);
-	*status = TRANS_ACCEPT_MISC_ERROR;
-	return(-1);
-    }
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-    newciptr->family=ciptr->family;
-    newciptr->addrlen=ciptr->addrlen;
-    if( (newciptr->addr = malloc(newciptr->addrlen)) == NULL ) {
-	prmsg(1,
-	      "NAMEDAccept: failed to allocate memory for pipe addr\n");
-	close(str.fd);
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-	return -1;
-    }
-
-    memcpy(newciptr->addr,ciptr->addr,newciptr->addrlen);
-
-    newciptr->peeraddrlen=newciptr->addrlen;
-    if( (newciptr->peeraddr = malloc(newciptr->peeraddrlen)) == NULL ) {
-	prmsg(1,
-	"NAMEDAccept: failed to allocate memory for peer addr\n");
-	free(newciptr->addr);
-	close(str.fd);
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-	return -1;
-    }
-
-    memcpy(newciptr->peeraddr,newciptr->addr,newciptr->peeraddrlen);
-
-    *status = 0;
-
-    return str.fd;
-}
-
-#endif /* TRANS_SERVER */
-
-#endif /* LOCAL_TRANS_NAMED */
-
-
-
-#if defined(LOCAL_TRANS_SCO)
-
-/*
- * connect_spipe is used by the SCO connection type.
- */
-static int
-connect_spipe(int fd1, int fd2)
-{
-    long temp;
-    struct strfdinsert sbuf;
-
-    sbuf.databuf.maxlen = -1;
-    sbuf.databuf.len = -1;
-    sbuf.databuf.buf = NULL;
-    sbuf.ctlbuf.maxlen = sizeof(long);
-    sbuf.ctlbuf.len = sizeof(long);
-    sbuf.ctlbuf.buf = (caddr_t)&temp;
-    sbuf.offset = 0;
-    sbuf.fildes = fd2;
-    sbuf.flags = 0;
-
-    if( ioctl(fd1, I_FDINSERT, &sbuf) < 0 )
-	return(-1);
-
-    return(0);
-}
-
-/*
- * named_spipe is used by the SCO connection type.
- */
-
-static int
-named_spipe(int fd, char *path)
-
-{
-    int oldUmask, ret;
-    struct stat sbuf;
-
-    oldUmask = umask(0);
-
-    (void) fstat(fd, &sbuf);
-    ret = mknod(path, 0020666, sbuf.st_rdev);
-
-    umask(oldUmask);
-
-    if (ret < 0) {
-	ret = -1;
-    } else {
-	ret = fd;
-    }
-
-    return(ret);
-}
-
-#endif /* defined(LOCAL_TRANS_SCO) */
-
-
-
-
-#ifdef LOCAL_TRANS_SCO
-/* SCO */
-
-/*
- * 2002-11-09 (jkj@sco.com)
- *
- * This code has been modified to match what is in the actual SCO X server.
- * This greatly helps inter-operability between X11R6 and X11R5 (the native
- * SCO server). Mainly, it relies on streams nodes existing in /dev, not
- * creating them or unlinking them, which breaks the native X server.
- *
- * However, this is only for the X protocol. For all other protocols, we
- * do in fact create the nodes, as only X11R6 will use them, and this makes
- * it possible to have both types of clients running, otherwise we get all
- * kinds of nasty errors on startup for anything that doesnt use the X
- * protocol (like SM, when KDE starts up).
- */
-
-#ifdef TRANS_CLIENT
-
-static int
-TRANS(SCOOpenClient)(XtransConnInfo ciptr, const char *port)
-{
-#ifdef SCORNODENAME
-    int			fd, server, fl, ret;
-    char		server_path[64];
-    struct strbuf	ctlbuf;
-    unsigned long	alarm_time;
-    void		(*savef)();
-    long		temp;
-    extern int	getmsg(), putmsg();
-#endif
-
-    prmsg(2,"SCOOpenClient(%s)\n", port);
-    if (!port || !port[0])
-	port = "0";
-
-#if !defined(SCORNODENAME)
-    prmsg(2,"SCOOpenClient: Protocol is not supported by a SCO connection\n");
-    return -1;
-#else
-    (void) sprintf(server_path, SCORNODENAME, port);
-
-    if ((server = open(server_path, O_RDWR)) < 0) {
-	prmsg(1,"SCOOpenClient: failed to open %s\n", server_path);
-	return -1;
-    }
-
-    if ((fd = open(DEV_SPX, O_RDWR)) < 0) {
-	prmsg(1,"SCOOpenClient: failed to open %s\n", DEV_SPX);
-	close(server);
-	return -1;
-    }
-
-    (void) write(server, &server, 1);
-    ctlbuf.len = 0;
-    ctlbuf.maxlen = sizeof(long);
-    ctlbuf.buf = (caddr_t)&temp;
-    fl = 0;
-
-    savef = signal(SIGALRM, _dummy);
-    alarm_time = alarm(10);
-
-    ret = getmsg(server, &ctlbuf, 0, &fl);
-
-    (void) alarm(alarm_time);
-    (void) signal(SIGALRM, savef);
-
-    if (ret < 0) {
-	prmsg(1,"SCOOpenClient: error from getmsg\n");
-	close(fd);
-	close(server);
-	return -1;
-    }
-
-    /* The msg we got via getmsg is the result of an
-     * I_FDINSERT, so if we do a putmsg with whatever
-     * we recieved, we're doing another I_FDINSERT ...
-     */
-    (void) putmsg(fd, &ctlbuf, 0, 0);
-    (void) fcntl(fd,F_SETFL,fcntl(fd,F_GETFL,0)|O_NDELAY);
-
-    (void) close(server);
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-
-#if defined(X11_t) && defined(__SCO__)
-    ciptr->flags |= TRANS_NOUNLINK;
-#endif
-    if (TRANS(FillAddrInfo) (ciptr, server_path, server_path) == 0)
-    {
-	prmsg(1,"SCOOpenClient: failed to fill addr info\n");
-	close(fd);
-	return -1;
-    }
-
-    return(fd);
-
-#endif  /* !SCORNODENAME */
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-static int
-TRANS(SCOOpenServer)(XtransConnInfo ciptr, const char *port)
-{
-#ifdef SCORNODENAME
-    char		serverR_path[64];
-    char		serverS_path[64];
-    struct flock	mylock;
-    int			fdr = -1;
-    int			fds = -1;
-#endif
-
-    prmsg(2,"SCOOpenServer(%s)\n", port);
-    if (!port || !port[0])
-	port = "0";
-
-#if !defined(SCORNODENAME)
-    prmsg(1,"SCOOpenServer: Protocol is not supported by a SCO connection\n");
-    return -1;
-#else
-    (void) sprintf(serverR_path, SCORNODENAME, port);
-    (void) sprintf(serverS_path, SCOSNODENAME, port);
-
-#if !defined(X11_t) || !defined(__SCO__)
-    unlink(serverR_path);
-    unlink(serverS_path);
-
-    if ((fds = open(DEV_SPX, O_RDWR)) < 0 ||
-	(fdr = open(DEV_SPX, O_RDWR)) < 0 ) {
-	prmsg(1,"SCOOpenServer: failed to open %s\n", DEV_SPX);
-	if (fds >= 0)
-		close(fds);
-	if (fdr >= 0)
-		close(fdr);
-	return -1;
-    }
-
-    if (named_spipe (fds, serverS_path) == -1) {
-	prmsg(1,"SCOOpenServer: failed to create %s\n", serverS_path);
-	close (fdr);
-	close (fds);
-	return -1;
-    }
-
-    if (named_spipe (fdr, serverR_path) == -1) {
-	prmsg(1,"SCOOpenServer: failed to create %s\n", serverR_path);
-	close (fdr);
-	close (fds);
-	return -1;
-    }
-#else /* X11_t */
-
-    fds = open (serverS_path, O_RDWR | O_NDELAY);
-    if (fds < 0) {
-	prmsg(1,"SCOOpenServer: failed to open %s\n", serverS_path);
-	return -1;
-    }
-
-    /*
-     * Lock the connection device for the duration of the server.
-     * This resolves multiple server starts especially on SMP machines.
-     */
-    mylock.l_type	= F_WRLCK;
-    mylock.l_whence	= 0;
-    mylock.l_start	= 0;
-    mylock.l_len	= 0;
-    if (fcntl (fds, F_SETLK, &mylock) < 0) {
-	prmsg(1,"SCOOpenServer: failed to lock %s\n", serverS_path);
-	close (fds);
-	return -1;
-    }
-
-    fdr = open (serverR_path, O_RDWR | O_NDELAY);
-    if (fdr < 0) {
-	prmsg(1,"SCOOpenServer: failed to open %s\n", serverR_path);
-	close (fds);
-	return -1;
-    }
-#endif /* X11_t */
-
-    if (connect_spipe(fds, fdr)) {
-	prmsg(1,"SCOOpenServer: ioctl(I_FDINSERT) failed on %s\n",
-	      serverS_path);
-	close (fdr);
-	close (fds);
-	return -1;
-    }
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-
-#if defined(X11_t) && defined(__SCO__)
-    ciptr->flags |= TRANS_NOUNLINK;
-#endif
-    if (TRANS(FillAddrInfo) (ciptr, serverS_path, serverR_path) == 0) {
-	prmsg(1,"SCOOpenServer: failed to fill in addr info\n");
-	close(fds);
-	close(fdr);
-	return -1;
-    }
-
-    return(fds);
-
-#endif /* !SCORNODENAME */
-}
-
-static int
-TRANS(SCOAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
-{
-    char		c;
-    int			fd;
-
-    prmsg(2,"SCOAccept(%d)\n", ciptr->fd);
-
-    if (read(ciptr->fd, &c, 1) < 0) {
-	prmsg(1,"SCOAccept: can't read from client\n");
-	*status = TRANS_ACCEPT_MISC_ERROR;
-	return(-1);
-    }
-
-    if( (fd = open(DEV_SPX, O_RDWR)) < 0 ) {
-	prmsg(1,"SCOAccept: can't open \"%s\"\n",DEV_SPX);
-	*status = TRANS_ACCEPT_MISC_ERROR;
-	return(-1);
-    }
-
-    if (connect_spipe (ciptr->fd, fd) < 0) {
-	prmsg(1,"SCOAccept: ioctl(I_FDINSERT) failed\n");
-	close (fd);
-	*status = TRANS_ACCEPT_MISC_ERROR;
-	return -1;
-    }
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-
-    newciptr->addrlen=ciptr->addrlen;
-    if( (newciptr->addr = malloc(newciptr->addrlen)) == NULL ) {
-	prmsg(1,
-	      "SCOAccept: failed to allocate memory for peer addr\n");
-	close(fd);
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-	return -1;
-    }
-
-    memcpy(newciptr->addr,ciptr->addr,newciptr->addrlen);
-#if defined(__SCO__)
-    newciptr->flags |= TRANS_NOUNLINK;
-#endif
-
-    newciptr->peeraddrlen=newciptr->addrlen;
-    if( (newciptr->peeraddr = malloc(newciptr->peeraddrlen)) == NULL ) {
-	prmsg(1,
-	      "SCOAccept: failed to allocate memory for peer addr\n");
-	free(newciptr->addr);
-	close(fd);
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-	return -1;
-    }
-
-    memcpy(newciptr->peeraddr,newciptr->addr,newciptr->peeraddrlen);
-
-    *status = 0;
-
-    return(fd);
-}
-
-#endif /* TRANS_SERVER */
-#endif /* LOCAL_TRANS_SCO */
-
-
-
-#ifdef TRANS_REOPEN
-#ifdef LOCAL_TRANS_PTS
-
-static int
-TRANS(PTSReopenServer)(XtransConnInfo ciptr, int fd, const char *port)
-
-{
-#ifdef PTSNODENAME
-    char server_path[64];
-#endif
-
-    prmsg(2,"PTSReopenServer(%d,%s)\n", fd, port);
-
-#if !defined(PTSNODENAME)
-    prmsg(1,"PTSReopenServer: Protocol is not supported by a pts connection\n");
-    return 0;
-#else
-    if (port && *port ) {
-	if( *port == '/' ) { /* A full pathname */
-	    snprintf(server_path, sizeof(server_path), "%s", port);
-	} else {
-	    snprintf(server_path, sizeof(server_path), "%s%s",
-		     PTSNODENAME, port);
-	}
-    } else {
-	snprintf(server_path, sizeof(server_path), "%s%ld",
-		PTSNODENAME, (long)getpid());
-    }
-
-    if (TRANS(FillAddrInfo) (ciptr, server_path, server_path) == 0)
-    {
-	prmsg(1,"PTSReopenServer: failed to fill in addr info\n");
-	return 0;
-    }
-
-    return 1;
-
-#endif /* !PTSNODENAME */
-}
-
-#endif /* LOCAL_TRANS_PTS */
-
-#ifdef LOCAL_TRANS_NAMED
-
-static int
-TRANS(NAMEDReopenServer)(XtransConnInfo ciptr, int fd _X_UNUSED, const char *port)
-
-{
-#ifdef NAMEDNODENAME
-    char server_path[64];
-#endif
-
-    prmsg(2,"NAMEDReopenServer(%s)\n", port);
-
-#if !defined(NAMEDNODENAME)
-    prmsg(1,"NAMEDReopenServer: Protocol is not supported by a NAMED connection\n");
-    return 0;
-#else
-    if ( port && *port ) {
-	if( *port == '/' ) { /* A full pathname */
-	    snprintf(server_path, sizeof(server_path),"%s", port);
-	} else {
-	    snprintf(server_path, sizeof(server_path), "%s%s",
-		     NAMEDNODENAME, port);
-	}
-    } else {
-	snprintf(server_path, sizeof(server_path), "%s%ld",
-		NAMEDNODENAME, (long)getpid());
-    }
-
-    if (TRANS(FillAddrInfo) (ciptr, server_path, server_path) == 0)
-    {
-	prmsg(1,"NAMEDReopenServer: failed to fill in addr info\n");
-	return 0;
-    }
-
-    return 1;
-
-#endif /* !NAMEDNODENAME */
-}
-
-#endif /* LOCAL_TRANS_NAMED */
-
-
-#ifdef LOCAL_TRANS_SCO
-static int
-TRANS(SCOReopenServer)(XtransConnInfo ciptr, int fd, const char *port)
-
-{
-#ifdef SCORNODENAME
-    char serverR_path[64], serverS_path[64];
-#endif
-
-    prmsg(2,"SCOReopenServer(%s)\n", port);
-    if (!port || !port[0])
-      port = "0";
-
-#if !defined(SCORNODENAME)
-    prmsg(2,"SCOReopenServer: Protocol is not supported by a SCO connection\n");
-    return 0;
-#else
-    (void) sprintf(serverR_path, SCORNODENAME, port);
-    (void) sprintf(serverS_path, SCOSNODENAME, port);
-
-#if defined(X11_t) && defined(__SCO__)
-    ciptr->flags |= TRANS_NOUNLINK;
-#endif
-    if (TRANS(FillAddrInfo) (ciptr, serverS_path, serverR_path) == 0)
-    {
-	prmsg(1, "SCOReopenServer: failed to fill in addr info\n");
-	return 0;
-    }
-
-    return 1;
-
-#endif /* SCORNODENAME */
-}
-
-#endif /* LOCAL_TRANS_SCO */
-
-#endif /* TRANS_REOPEN */
-
-
-
-/*
- * This table contains all of the entry points for the different local
- * connection mechanisms.
- */
-
-typedef struct _LOCALtrans2dev {
-    const char	*transname;
-
-#ifdef TRANS_CLIENT
-
-    int	(*devcotsopenclient)(
-	XtransConnInfo, const char * /*port*/
-);
-
-#endif /* TRANS_CLIENT */
-
-#ifdef TRANS_SERVER
-
-    int	(*devcotsopenserver)(
-	XtransConnInfo, const char * /*port*/
-);
-
-#endif /* TRANS_SERVER */
-
-#ifdef TRANS_CLIENT
-
-    int	(*devcltsopenclient)(
-	XtransConnInfo, const char * /*port*/
-);
-
-#endif /* TRANS_CLIENT */
-
-#ifdef TRANS_SERVER
-
-    int	(*devcltsopenserver)(
-	XtransConnInfo, const char * /*port*/
-);
-
-#endif /* TRANS_SERVER */
-
-#ifdef TRANS_REOPEN
-
-    int	(*devcotsreopenserver)(
-	XtransConnInfo,
-	int, 	/* fd */
-	const char * 	/* port */
-);
-
-    int	(*devcltsreopenserver)(
-	XtransConnInfo,
-	int, 	/* fd */
-	const char *	/* port */
-);
-
-#endif /* TRANS_REOPEN */
-
-#ifdef TRANS_SERVER
-
-    int (*devreset)(
-	XtransConnInfo /* ciptr */
-);
-
-    int	(*devaccept)(
-	XtransConnInfo, XtransConnInfo, int *
-);
-
-#endif /* TRANS_SERVER */
-
-} LOCALtrans2dev;
-
-static LOCALtrans2dev LOCALtrans2devtab[] = {
-#ifdef LOCAL_TRANS_PTS
-{"",
-#ifdef TRANS_CLIENT
-     TRANS(PTSOpenClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(PTSOpenServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-     TRANS(OpenFail),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(OpenFail),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-     TRANS(PTSReopenServer),
-     TRANS(ReopenFail),
-#endif
-#ifdef TRANS_SERVER
-     NULL,		/* ResetListener */
-     TRANS(PTSAccept)
-#endif /* TRANS_SERVER */
-},
-
-{"local",
-#ifdef TRANS_CLIENT
-     TRANS(PTSOpenClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(PTSOpenServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-     TRANS(OpenFail),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(OpenFail),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-     TRANS(PTSReopenServer),
-     TRANS(ReopenFail),
-#endif
-#ifdef TRANS_SERVER
-     NULL,		/* ResetListener */
-     TRANS(PTSAccept)
-#endif /* TRANS_SERVER */
-},
-
-{"pts",
-#ifdef TRANS_CLIENT
-     TRANS(PTSOpenClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(PTSOpenServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-     TRANS(OpenFail),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(OpenFail),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-     TRANS(PTSReopenServer),
-     TRANS(ReopenFail),
-#endif
-#ifdef TRANS_SERVER
-     NULL,		/* ResetListener */
-     TRANS(PTSAccept)
-#endif /* TRANS_SERVER */
-},
-#else /* !LOCAL_TRANS_PTS */
-{"",
-#ifdef TRANS_CLIENT
-     TRANS(NAMEDOpenClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(NAMEDOpenServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-     TRANS(OpenFail),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(OpenFail),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-     TRANS(NAMEDReopenServer),
-     TRANS(ReopenFail),
-#endif
-#ifdef TRANS_SERVER
-     TRANS(NAMEDResetListener),
-     TRANS(NAMEDAccept)
-#endif /* TRANS_SERVER */
-},
-
-{"local",
-#ifdef TRANS_CLIENT
-     TRANS(NAMEDOpenClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(NAMEDOpenServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-     TRANS(OpenFail),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(OpenFail),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-     TRANS(NAMEDReopenServer),
-     TRANS(ReopenFail),
-#endif
-#ifdef TRANS_SERVER
-     TRANS(NAMEDResetListener),
-     TRANS(NAMEDAccept)
-#endif /* TRANS_SERVER */
-},
-#endif /* !LOCAL_TRANS_PTS */
-
-#ifdef LOCAL_TRANS_NAMED
-{"named",
-#ifdef TRANS_CLIENT
-     TRANS(NAMEDOpenClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(NAMEDOpenServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-     TRANS(OpenFail),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(OpenFail),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-     TRANS(NAMEDReopenServer),
-     TRANS(ReopenFail),
-#endif
-#ifdef TRANS_SERVER
-     TRANS(NAMEDResetListener),
-     TRANS(NAMEDAccept)
-#endif /* TRANS_SERVER */
-},
-
-#ifdef sun /* Alias "pipe" to named, since that's what Solaris called it */
-{"pipe",
-#ifdef TRANS_CLIENT
-     TRANS(NAMEDOpenClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(NAMEDOpenServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-     TRANS(OpenFail),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(OpenFail),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-     TRANS(NAMEDReopenServer),
-     TRANS(ReopenFail),
-#endif
-#ifdef TRANS_SERVER
-     TRANS(NAMEDResetListener),
-     TRANS(NAMEDAccept)
-#endif /* TRANS_SERVER */
-},
-#endif /* sun */
-#endif /* LOCAL_TRANS_NAMED */
-
-
-#ifdef LOCAL_TRANS_SCO
-{"sco",
-#ifdef TRANS_CLIENT
-     TRANS(SCOOpenClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(SCOOpenServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-     TRANS(OpenFail),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-     TRANS(OpenFail),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-     TRANS(SCOReopenServer),
-     TRANS(ReopenFail),
-#endif
-#ifdef TRANS_SERVER
-     NULL,		/* ResetListener */
-     TRANS(SCOAccept)
-#endif /* TRANS_SERVER */
-},
-#endif /* LOCAL_TRANS_SCO */
-};
-
-#define NUMTRANSPORTS	(sizeof(LOCALtrans2devtab)/sizeof(LOCALtrans2dev))
-
-static const char	*XLOCAL=NULL;
-static	char	*workingXLOCAL=NULL;
-static	char	*freeXLOCAL=NULL;
-
-#if defined(__SCO__)
-#define DEF_XLOCAL "SCO:UNIX:PTS"
-#elif defined(__UNIXWARE__)
-#define DEF_XLOCAL "UNIX:PTS:NAMED:SCO"
-#elif defined(sun)
-#define DEF_XLOCAL "UNIX:NAMED"
-#else
-#define DEF_XLOCAL "UNIX:PTS:NAMED:SCO"
-#endif
-
-static void
-TRANS(LocalInitTransports)(const char *protocol)
-
-{
-    prmsg(3,"LocalInitTransports(%s)\n", protocol);
-
-    if( strcmp(protocol,"local") && strcmp(protocol,"LOCAL") )
-    {
-	workingXLOCAL = freeXLOCAL = strdup (protocol);
-    }
-    else {
-	XLOCAL=(char *)getenv("XLOCAL");
-	if(XLOCAL==NULL)
-	    XLOCAL=DEF_XLOCAL;
-	workingXLOCAL = freeXLOCAL = strdup (XLOCAL);
-    }
-}
-
-static void
-TRANS(LocalEndTransports)(void)
-
-{
-    prmsg(3,"LocalEndTransports()\n");
-    free(freeXLOCAL);
-}
-
-#define TYPEBUFSIZE	32
-
-#ifdef TRANS_CLIENT
-
-static LOCALtrans2dev *
-TRANS(LocalGetNextTransport)(void)
-
-{
-    int	i,j;
-    char	*typetocheck;
-    char	typebuf[TYPEBUFSIZE];
-    prmsg(3,"LocalGetNextTransport()\n");
-
-    while(1)
-    {
-	if( workingXLOCAL == NULL || *workingXLOCAL == '\0' )
-	    return NULL;
-
-	typetocheck=workingXLOCAL;
-	workingXLOCAL=strchr(workingXLOCAL,':');
-	if(workingXLOCAL && *workingXLOCAL)
-	    *workingXLOCAL++='\0';
-
-	for(i=0;i<NUMTRANSPORTS;i++)
-	{
-	    /*
-	     * This is equivalent to a case insensitive strcmp(),
-	     * but should be more portable.
-	     */
-	    strncpy(typebuf,typetocheck,TYPEBUFSIZE);
-	    for(j=0;j<TYPEBUFSIZE;j++)
-		if (isupper(typebuf[j]))
-		    typebuf[j]=tolower(typebuf[j]);
-
-	    /* Now, see if they match */
-	    if(!strcmp(LOCALtrans2devtab[i].transname,typebuf))
-		return &LOCALtrans2devtab[i];
-	}
-    }
-#if 0
-    /*NOTREACHED*/
-    return NULL;
-#endif
-}
-
-#ifdef NEED_UTSNAME
-#include <sys/utsname.h>
-#endif
-
-/*
- * Make sure 'host' is really local.
- */
-
-static int
-HostReallyLocal (const char *host)
-
-{
-    /*
-     * The 'host' passed to this function may have been generated
-     * by either uname() or gethostname().  We try both if possible.
-     */
-
-#ifdef NEED_UTSNAME
-    struct utsname name;
-#endif
-    char buf[256];
-
-#ifdef NEED_UTSNAME
-    if (uname (&name) >= 0 && strcmp (host, name.nodename) == 0)
-	return (1);
-#endif
-
-    buf[0] = '\0';
-    (void) gethostname (buf, 256);
-    buf[255] = '\0';
-
-    if (strcmp (host, buf) == 0)
-	return (1);
-
-    return (0);
-}
-
-
-static XtransConnInfo
-TRANS(LocalOpenClient)(int type, const char *protocol,
-                       const char *host, const char *port)
-
-{
-    LOCALtrans2dev *transptr;
-    XtransConnInfo ciptr;
-    int index;
-
-    prmsg(3,"LocalOpenClient()\n");
-
-    /*
-     * Make sure 'host' is really local.  If not, we return failure.
-     * The reason we make this check is because a process may advertise
-     * a "local" address for which it can accept connections, but if a
-     * process on a remote machine tries to connect to this address,
-     * we know for sure it will fail.
-     */
-
-    if (strcmp (host, "unix") != 0 && !HostReallyLocal (host))
-    {
-	prmsg (1,
-	   "LocalOpenClient: Cannot connect to non-local host %s\n",
-	       host);
-	return NULL;
-    }
-
-
-#if defined(X11_t)
-    /*
-     * X has a well known port, that is transport dependant. It is easier
-     * to handle it here, than try and come up with a transport independent
-     * representation that can be passed in and resolved the usual way.
-     *
-     * The port that is passed here is really a string containing the idisplay
-     * from ConnectDisplay(). Since that is what we want for the local transports,
-     * we don't have to do anything special.
-     */
-#endif /* X11_t */
-
-    if( (ciptr = calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
-    {
-	prmsg(1,"LocalOpenClient: calloc(1,%lu) failed\n",
-	      sizeof(struct _XtransConnInfo));
-	return NULL;
-    }
-
-    ciptr->fd = -1;
-
-    TRANS(LocalInitTransports)(protocol);
-
-    index = 0;
-    for(transptr=TRANS(LocalGetNextTransport)();
-	transptr!=NULL;transptr=TRANS(LocalGetNextTransport)(), index++)
-    {
-	switch( type )
-	{
-	case XTRANS_OPEN_COTS_CLIENT:
-	    ciptr->fd=transptr->devcotsopenclient(ciptr,port);
-	    break;
-	case XTRANS_OPEN_CLTS_CLIENT:
-	    ciptr->fd=transptr->devcltsopenclient(ciptr,port);
-	    break;
-	case XTRANS_OPEN_COTS_SERVER:
-	case XTRANS_OPEN_CLTS_SERVER:
-	    prmsg(1,
-		  "LocalOpenClient: Should not be opening a server with this function\n");
-	    break;
-	default:
-	    prmsg(1,
-		  "LocalOpenClient: Unknown Open type %d\n",
-		  type);
-	}
-	if( ciptr->fd >= 0 )
-	    break;
-    }
-
-    TRANS(LocalEndTransports)();
-
-    if( ciptr->fd < 0 )
-    {
-	free(ciptr);
-	return NULL;
-    }
-
-    ciptr->priv=(char *)transptr;
-    ciptr->index = index;
-
-    return ciptr;
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-static XtransConnInfo
-TRANS(LocalOpenServer)(int type, const char *protocol,
-                       const char *host _X_UNUSED, const char *port)
-
-{
-    int	i;
-    XtransConnInfo ciptr;
-
-    prmsg(2,"LocalOpenServer(%d,%s,%s)\n", type, protocol, port);
-
-#if defined(X11_t)
-    /*
-     * For X11, the port will be in the format xserverN where N is the
-     * display number. All of the local connections just need to know
-     * the display number because they don't do any name resolution on
-     * the port. This just truncates port to the display portion.
-     */
-#endif /* X11_t */
-
-    if( (ciptr = calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
-    {
-	prmsg(1,"LocalOpenServer: calloc(1,%lu) failed\n",
-	      sizeof(struct _XtransConnInfo));
-	return NULL;
-    }
-
-    for(i=1;i<NUMTRANSPORTS;i++)
-    {
-	if( strcmp(protocol,LOCALtrans2devtab[i].transname) != 0 )
-	    continue;
-	switch( type )
-	{
-	case XTRANS_OPEN_COTS_CLIENT:
-	case XTRANS_OPEN_CLTS_CLIENT:
-	    prmsg(1,
-		  "LocalOpenServer: Should not be opening a client with this function\n");
-	    break;
-	case XTRANS_OPEN_COTS_SERVER:
-	    ciptr->fd=LOCALtrans2devtab[i].devcotsopenserver(ciptr,port);
-	    break;
-	case XTRANS_OPEN_CLTS_SERVER:
-	    ciptr->fd=LOCALtrans2devtab[i].devcltsopenserver(ciptr,port);
-	    break;
-	default:
-	    prmsg(1,"LocalOpenServer: Unknown Open type %d\n",
-		  type );
-	}
-	if( ciptr->fd >= 0 ) {
-	    ciptr->priv=(char *)&LOCALtrans2devtab[i];
-	    ciptr->index=i;
-	    ciptr->flags = 1 | (ciptr->flags & TRANS_KEEPFLAGS);
-	    return ciptr;
-	}
-    }
-
-    free(ciptr);
-    return NULL;
-}
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_REOPEN
-
-static XtransConnInfo
-TRANS(LocalReopenServer)(int type, int index, int fd, const char *port)
-
-{
-    XtransConnInfo ciptr;
-    int stat = 0;
-
-    prmsg(2,"LocalReopenServer(%d,%d,%d)\n", type, index, fd);
-
-    if( (ciptr = calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
-    {
-	prmsg(1,"LocalReopenServer: calloc(1,%lu) failed\n",
-	      sizeof(struct _XtransConnInfo));
-	return NULL;
-    }
-
-    ciptr->fd = fd;
-
-    switch( type )
-    {
-    case XTRANS_OPEN_COTS_SERVER:
-	stat = LOCALtrans2devtab[index].devcotsreopenserver(ciptr,fd,port);
-	break;
-    case XTRANS_OPEN_CLTS_SERVER:
-	stat = LOCALtrans2devtab[index].devcltsreopenserver(ciptr,fd,port);
-	break;
-    default:
-	prmsg(1,"LocalReopenServer: Unknown Open type %d\n",
-	  type );
-    }
-
-    if( stat > 0 ) {
-	ciptr->priv=(char *)&LOCALtrans2devtab[index];
-	ciptr->index=index;
-	ciptr->flags = 1 | (ciptr->flags & TRANS_KEEPFLAGS);
-	return ciptr;
-    }
-
-    free(ciptr);
-    return NULL;
-}
-
-#endif /* TRANS_REOPEN */
-
-
-
-/*
- * This is the Local implementation of the X Transport service layer
- */
-
-#ifdef TRANS_CLIENT
-
-static XtransConnInfo
-TRANS(LocalOpenCOTSClient)(Xtransport *thistrans _X_UNUSED, const char *protocol,
-			   const char *host, const char *port)
-
-{
-    prmsg(2,"LocalOpenCOTSClient(%s,%s,%s)\n",protocol,host,port);
-
-    return TRANS(LocalOpenClient)(XTRANS_OPEN_COTS_CLIENT, protocol, host, port);
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-static XtransConnInfo
-TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, const char *protocol,
-			   const char *host, const char *port)
-
-{
-    char *typetocheck = NULL;
-    int found = 0;
-    char typebuf[TYPEBUFSIZE];
-
-    prmsg(2,"LocalOpenCOTSServer(%s,%s,%s)\n",protocol,host,port);
-
-    /* Check if this local type is in the XLOCAL list */
-    TRANS(LocalInitTransports)("local");
-    typetocheck = workingXLOCAL;
-    while (typetocheck && !found) {
-	int j;
-
-	workingXLOCAL = strchr(workingXLOCAL, ':');
-	if (workingXLOCAL && *workingXLOCAL)
-	    *workingXLOCAL++ = '\0';
-	strncpy(typebuf, typetocheck, TYPEBUFSIZE);
-	for (j = 0; j < TYPEBUFSIZE; j++)
-	    if (isupper(typebuf[j]))
-		typebuf[j] = tolower(typebuf[j]);
-	if (!strcmp(thistrans->TransName, typebuf))
-	    found = 1;
-	typetocheck = workingXLOCAL;
-    }
-    TRANS(LocalEndTransports)();
-
-    if (!found) {
-	prmsg(3,"LocalOpenCOTSServer: disabling %s\n",thistrans->TransName);
-	thistrans->flags |= TRANS_DISABLED;
-	return NULL;
-    }
-
-    return TRANS(LocalOpenServer)(XTRANS_OPEN_COTS_SERVER, protocol, host, port);
-}
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_CLIENT
-
-static XtransConnInfo
-TRANS(LocalOpenCLTSClient)(Xtransport *thistrans _X_UNUSED, const char *protocol,
-			   const char *host, const char *port)
-
-{
-    prmsg(2,"LocalOpenCLTSClient(%s,%s,%s)\n",protocol,host,port);
-
-    return TRANS(LocalOpenClient)(XTRANS_OPEN_CLTS_CLIENT, protocol, host, port);
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-static XtransConnInfo
-TRANS(LocalOpenCLTSServer)(Xtransport *thistrans _X_UNUSED, const char *protocol,
-			   const char *host, const char *port)
-
-{
-    prmsg(2,"LocalOpenCLTSServer(%s,%s,%s)\n",protocol,host,port);
-
-    return TRANS(LocalOpenServer)(XTRANS_OPEN_CLTS_SERVER, protocol, host, port);
-}
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_REOPEN
-
-static XtransConnInfo
-TRANS(LocalReopenCOTSServer)(Xtransport *thistrans, int fd, const char *port)
-
-{
-    int index;
-
-    prmsg(2,"LocalReopenCOTSServer(%d,%s)\n", fd, port);
-
-    for(index=1;index<NUMTRANSPORTS;index++)
-    {
-	if( strcmp(thistrans->TransName,
-	    LOCALtrans2devtab[index].transname) == 0 )
-	    break;
-    }
-
-    if (index >= NUMTRANSPORTS)
-    {
-	return (NULL);
-    }
-
-    return TRANS(LocalReopenServer)(XTRANS_OPEN_COTS_SERVER,
-	index, fd, port);
-}
-
-static XtransConnInfo
-TRANS(LocalReopenCLTSServer)(Xtransport *thistrans, int fd, const char *port)
-
-{
-    int index;
-
-    prmsg(2,"LocalReopenCLTSServer(%d,%s)\n", fd, port);
-
-    for(index=1;index<NUMTRANSPORTS;index++)
-    {
-	if( strcmp(thistrans->TransName,
-	    LOCALtrans2devtab[index].transname) == 0 )
-	    break;
-    }
-
-    if (index >= NUMTRANSPORTS)
-    {
-	return (NULL);
-    }
-
-    return TRANS(LocalReopenServer)(XTRANS_OPEN_CLTS_SERVER,
-	index, fd, port);
-}
-
-#endif /* TRANS_REOPEN */
-
-
-
-static int
-TRANS(LocalSetOption)(XtransConnInfo ciptr, int option, int arg)
-
-{
-    prmsg(2,"LocalSetOption(%d,%d,%d)\n",ciptr->fd,option,arg);
-
-    return -1;
-}
-
-
-#ifdef TRANS_SERVER
-
-static int
-TRANS(LocalCreateListener)(XtransConnInfo ciptr, const char *port,
-                           unsigned int flags _X_UNUSED)
-
-{
-    prmsg(2,"LocalCreateListener(%p->%d,%s)\n",ciptr,ciptr->fd,port);
-
-    return 0;
-}
-
-static int
-TRANS(LocalResetListener)(XtransConnInfo ciptr)
-
-{
-    LOCALtrans2dev	*transptr;
-
-    prmsg(2,"LocalResetListener(%p)\n",ciptr);
-
-    transptr=(LOCALtrans2dev *)ciptr->priv;
-    if (transptr->devreset != NULL) {
-	return transptr->devreset(ciptr);
-    }
-    return TRANS_RESET_NOOP;
-}
-
-
-static XtransConnInfo
-TRANS(LocalAccept)(XtransConnInfo ciptr, int *status)
-
-{
-    XtransConnInfo	newciptr;
-    LOCALtrans2dev	*transptr;
-
-    prmsg(2,"LocalAccept(%p->%d)\n", ciptr, ciptr->fd);
-
-    transptr=(LOCALtrans2dev *)ciptr->priv;
-
-    if( (newciptr = calloc(1,sizeof(struct _XtransConnInfo)))==NULL )
-    {
-	prmsg(1,"LocalAccept: calloc(1,%lu) failed\n",
-	      sizeof(struct _XtransConnInfo));
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-	return NULL;
-    }
-
-    newciptr->fd=transptr->devaccept(ciptr,newciptr,status);
-
-    if( newciptr->fd < 0 )
-    {
-	free(newciptr);
-	return NULL;
-    }
-
-    newciptr->priv=(char *)transptr;
-    newciptr->index = ciptr->index;
-
-    *status = 0;
-
-    return newciptr;
-}
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_CLIENT
-
-static int
-TRANS(LocalConnect)(XtransConnInfo ciptr,
-                    const char *host _X_UNUSED, const char *port)
-
-{
-    prmsg(2,"LocalConnect(%p->%d,%s)\n", ciptr, ciptr->fd, port);
-
-    return 0;
-}
-
-#endif /* TRANS_CLIENT */
-
-
-static int
-TRANS(LocalBytesReadable)(XtransConnInfo ciptr, BytesReadable_t *pend )
-
-{
-    prmsg(2,"LocalBytesReadable(%p->%d,%p)\n", ciptr, ciptr->fd, pend);
-
-#if defined(SCO325)
-    return ioctl(ciptr->fd, I_NREAD, (char *)pend);
-#else
-    return ioctl(ciptr->fd, FIONREAD, (char *)pend);
-#endif
-}
-
-static int
-TRANS(LocalRead)(XtransConnInfo ciptr, char *buf, int size)
-
-{
-    prmsg(2,"LocalRead(%d,%p,%d)\n", ciptr->fd, buf, size );
-
-    return read(ciptr->fd,buf,size);
-}
-
-static int
-TRANS(LocalWrite)(XtransConnInfo ciptr, char *buf, int size)
-
-{
-    prmsg(2,"LocalWrite(%d,%p,%d)\n", ciptr->fd, buf, size );
-
-    return write(ciptr->fd,buf,size);
-}
-
-static int
-TRANS(LocalReadv)(XtransConnInfo ciptr, struct iovec *buf, int size)
-
-{
-    prmsg(2,"LocalReadv(%d,%p,%d)\n", ciptr->fd, buf, size );
-
-    return READV(ciptr,buf,size);
-}
-
-static int
-TRANS(LocalWritev)(XtransConnInfo ciptr, struct iovec *buf, int size)
-
-{
-    prmsg(2,"LocalWritev(%d,%p,%d)\n", ciptr->fd, buf, size );
-
-    return WRITEV(ciptr,buf,size);
-}
-
-static int
-TRANS(LocalDisconnect)(XtransConnInfo ciptr)
-
-{
-    prmsg(2,"LocalDisconnect(%p->%d)\n", ciptr, ciptr->fd);
-
-    return 0;
-}
-
-static int
-TRANS(LocalClose)(XtransConnInfo ciptr)
-
-{
-    struct sockaddr_un      *sockname=(struct sockaddr_un *) ciptr->addr;
-    int	ret;
-
-    prmsg(2,"LocalClose(%p->%d)\n", ciptr, ciptr->fd );
-
-    ret=close(ciptr->fd);
-
-    if(ciptr->flags
-       && sockname
-       && sockname->sun_family == AF_UNIX
-       && sockname->sun_path[0] )
-    {
-	if (!(ciptr->flags & TRANS_NOUNLINK))
-	    unlink(sockname->sun_path);
-    }
-
-    return ret;
-}
-
-static int
-TRANS(LocalCloseForCloning)(XtransConnInfo ciptr)
-
-{
-    int ret;
-
-    prmsg(2,"LocalCloseForCloning(%p->%d)\n", ciptr, ciptr->fd );
-
-    /* Don't unlink path */
-
-    ret=close(ciptr->fd);
-
-    return ret;
-}
-
-
-/*
- * MakeAllCOTSServerListeners() will go through the entire Xtransports[]
- * array defined in Xtrans.c and try to OpenCOTSServer() for each entry.
- * We will add duplicate entries to that table so that the OpenCOTSServer()
- * function will get called once for each type of local transport.
- *
- * The TransName is in lowercase, so it will never match during a normal
- * call to SelectTransport() in Xtrans.c.
- */
-
-#ifdef TRANS_SERVER
-static const char * local_aliases[] = {
-# ifdef LOCAL_TRANS_PTS
-                                  "pts",
-# endif
-				  "named",
-# ifdef sun
-				  "pipe", /* compatibility with Solaris Xlib */
-# endif
-# ifdef LOCAL_TRANS_SCO
-				  "sco",
-# endif
-				  NULL };
-#endif
-
-Xtransport	TRANS(LocalFuncs) = {
-	/* Local Interface */
-	"local",
-	TRANS_ALIAS | TRANS_LOCAL,
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCOTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	local_aliases,
-	TRANS(LocalOpenCOTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(LocalOpenCLTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-	TRANS(LocalReopenCOTSServer),
-	TRANS(LocalReopenCLTSServer),
-#endif
-	TRANS(LocalSetOption),
-#ifdef TRANS_SERVER
-	TRANS(LocalCreateListener),
-	TRANS(LocalResetListener),
-	TRANS(LocalAccept),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalConnect),
-#endif /* TRANS_CLIENT */
-	TRANS(LocalBytesReadable),
-	TRANS(LocalRead),
-	TRANS(LocalWrite),
-	TRANS(LocalReadv),
-	TRANS(LocalWritev),
-#if XTRANS_SEND_FDS
-	TRANS(LocalSendFdInvalid),
-	TRANS(LocalRecvFdInvalid),
-#endif
-	TRANS(LocalDisconnect),
-	TRANS(LocalClose),
-	TRANS(LocalCloseForCloning),
-};
-
-#ifdef LOCAL_TRANS_PTS
-
-Xtransport	TRANS(PTSFuncs) = {
-	/* Local Interface */
-	"pts",
-	TRANS_LOCAL,
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCOTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	NULL,
-	TRANS(LocalOpenCOTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(LocalOpenCLTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-	TRANS(LocalReopenCOTSServer),
-	TRANS(LocalReopenCLTSServer),
-#endif
-	TRANS(LocalSetOption),
-#ifdef TRANS_SERVER
-	TRANS(LocalCreateListener),
-	TRANS(LocalResetListener),
-	TRANS(LocalAccept),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalConnect),
-#endif /* TRANS_CLIENT */
-	TRANS(LocalBytesReadable),
-	TRANS(LocalRead),
-	TRANS(LocalWrite),
-	TRANS(LocalReadv),
-	TRANS(LocalWritev),
-#if XTRANS_SEND_FDS
-	TRANS(LocalSendFdInvalid),
-	TRANS(LocalRecvFdInvalid),
-#endif
-	TRANS(LocalDisconnect),
-	TRANS(LocalClose),
-	TRANS(LocalCloseForCloning),
-};
-
-#endif /* LOCAL_TRANS_PTS */
-
-#ifdef LOCAL_TRANS_NAMED
-
-Xtransport	TRANS(NAMEDFuncs) = {
-	/* Local Interface */
-	"named",
-	TRANS_LOCAL,
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCOTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	NULL,
-	TRANS(LocalOpenCOTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(LocalOpenCLTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-	TRANS(LocalReopenCOTSServer),
-	TRANS(LocalReopenCLTSServer),
-#endif
-	TRANS(LocalSetOption),
-#ifdef TRANS_SERVER
-	TRANS(LocalCreateListener),
-	TRANS(LocalResetListener),
-	TRANS(LocalAccept),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalConnect),
-#endif /* TRANS_CLIENT */
-	TRANS(LocalBytesReadable),
-	TRANS(LocalRead),
-	TRANS(LocalWrite),
-	TRANS(LocalReadv),
-	TRANS(LocalWritev),
-#if XTRANS_SEND_FDS
-	TRANS(LocalSendFdInvalid),
-	TRANS(LocalRecvFdInvalid),
-#endif
-	TRANS(LocalDisconnect),
-	TRANS(LocalClose),
-	TRANS(LocalCloseForCloning),
-};
-
-#ifdef sun
-Xtransport	TRANS(PIPEFuncs) = {
-	/* Local Interface */
-	"pipe",
-	TRANS_ALIAS | TRANS_LOCAL,
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCOTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	NULL,
-	TRANS(LocalOpenCOTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(LocalOpenCLTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-	TRANS(LocalReopenCOTSServer),
-	TRANS(LocalReopenCLTSServer),
-#endif
-	TRANS(LocalSetOption),
-#ifdef TRANS_SERVER
-	TRANS(LocalCreateListener),
-	TRANS(LocalResetListener),
-	TRANS(LocalAccept),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalConnect),
-#endif /* TRANS_CLIENT */
-	TRANS(LocalBytesReadable),
-	TRANS(LocalRead),
-	TRANS(LocalWrite),
-	TRANS(LocalReadv),
-	TRANS(LocalWritev),
-#if XTRANS_SEND_FDS
-	TRANS(LocalSendFdInvalid),
-	TRANS(LocalRecvFdInvalid),
-#endif
-	TRANS(LocalDisconnect),
-	TRANS(LocalClose),
-	TRANS(LocalCloseForCloning),
-};
-#endif /* sun */
-#endif /* LOCAL_TRANS_NAMED */
-
-
-#ifdef LOCAL_TRANS_SCO
-Xtransport	TRANS(SCOFuncs) = {
-	/* Local Interface */
-	"sco",
-	TRANS_LOCAL,
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCOTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	NULL,
-	TRANS(LocalOpenCOTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(LocalOpenCLTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-	TRANS(LocalReopenCOTSServer),
-	TRANS(LocalReopenCLTSServer),
-#endif
-	TRANS(LocalSetOption),
-#ifdef TRANS_SERVER
-	TRANS(LocalCreateListener),
-	TRANS(LocalResetListener),
-	TRANS(LocalAccept),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalConnect),
-#endif /* TRANS_CLIENT */
-	TRANS(LocalBytesReadable),
-	TRANS(LocalRead),
-	TRANS(LocalWrite),
-	TRANS(LocalReadv),
-	TRANS(LocalWritev),
-#if XTRANS_SEND_FDS
-	TRANS(LocalSendFdInvalid),
-	TRANS(LocalRecvFdInvalid),
-#endif
-	TRANS(LocalDisconnect),
-	TRANS(LocalClose),
-	TRANS(LocalCloseForCloning),
-};
-#endif /* LOCAL_TRANS_SCO */
diff --git a/openflow/usr/include/X11/Xtrans/Xtranssock.c b/openflow/usr/include/X11/Xtrans/Xtranssock.c
deleted file mode 100644
index d830e7c..0000000
--- a/openflow/usr/include/X11/Xtrans/Xtranssock.c
+++ /dev/null
@@ -1,2749 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-/*
-
-Copyright 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the copyright holders shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the copyright holders.
-
- * Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name NCR not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  NCR makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * NCR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NCR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <ctype.h>
-#ifdef XTHREADS
-#include <X11/Xthreads.h>
-#endif
-
-#ifndef WIN32
-
-#if defined(TCPCONN) || defined(UNIXCONN)
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-
-#if defined(TCPCONN) || defined(UNIXCONN)
-#define X_INCLUDE_NETDB_H
-#define XOS_USE_NO_LOCKING
-#include <X11/Xos_r.h>
-#endif
-
-#ifdef UNIXCONN
-#ifndef X_NO_SYS_UN
-#include <sys/un.h>
-#endif
-#include <sys/stat.h>
-#endif
-
-
-#ifndef NO_TCP_H
-#if defined(linux) || defined(__GLIBC__)
-#include <sys/param.h>
-#endif /* osf */
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-#include <sys/param.h>
-#include <machine/endian.h>
-#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ || __DragonFly__ */
-#include <netinet/tcp.h>
-#endif /* !NO_TCP_H */
-
-#include <sys/ioctl.h>
-#if defined(SVR4) || defined(__SVR4)
-#include <sys/filio.h>
-#endif
-
-#if (defined(__i386__) && defined(SYSV)) && !defined(SCO325) && !defined(sun)
-#include <net/errno.h>
-#endif
-
-#if defined(__i386__) && defined(SYSV)
-#include <sys/stropts.h>
-#endif
-
-#include <unistd.h>
-
-#else /* !WIN32 */
-
-#include <X11/Xwinsock.h>
-#include <X11/Xwindows.h>
-#include <X11/Xw32defs.h>
-#undef close
-#define close closesocket
-#define ECONNREFUSED WSAECONNREFUSED
-#define EADDRINUSE WSAEADDRINUSE
-#define EPROTOTYPE WSAEPROTOTYPE
-#undef EWOULDBLOCK
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define EINPROGRESS WSAEINPROGRESS
-#undef EINTR
-#define EINTR WSAEINTR
-#define X_INCLUDE_NETDB_H
-#define XOS_USE_MTSAFE_NETDBAPI
-#include <X11/Xos_r.h>
-#endif /* WIN32 */
-
-#if defined(SO_DONTLINGER) && defined(SO_LINGER)
-#undef SO_DONTLINGER
-#endif
-
-/* others don't need this */
-#define SocketInitOnce() /**/
-
-#ifdef linux
-#define HAVE_ABSTRACT_SOCKETS
-#endif
-
-#define MIN_BACKLOG 128
-#ifdef SOMAXCONN
-#if SOMAXCONN > MIN_BACKLOG
-#define BACKLOG SOMAXCONN
-#endif
-#endif
-#ifndef BACKLOG
-#define BACKLOG MIN_BACKLOG
-#endif
-
-/*
- * This is the Socket implementation of the X Transport service layer
- *
- * This file contains the implementation for both the UNIX and INET domains,
- * and can be built for either one, or both.
- *
- */
-
-typedef struct _Sockettrans2dev {
-    const char	*transname;
-    int		family;
-    int		devcotsname;
-    int		devcltsname;
-    int		protocol;
-} Sockettrans2dev;
-
-static Sockettrans2dev Sockettrans2devtab[] = {
-#ifdef TCPCONN
-    {"inet",AF_INET,SOCK_STREAM,SOCK_DGRAM,0},
-#if !defined(IPv6) || !defined(AF_INET6)
-    {"tcp",AF_INET,SOCK_STREAM,SOCK_DGRAM,0},
-#else /* IPv6 */
-    {"tcp",AF_INET6,SOCK_STREAM,SOCK_DGRAM,0},
-    {"tcp",AF_INET,SOCK_STREAM,SOCK_DGRAM,0}, /* fallback */
-    {"inet6",AF_INET6,SOCK_STREAM,SOCK_DGRAM,0},
-#endif
-#endif /* TCPCONN */
-#ifdef UNIXCONN
-    {"unix",AF_UNIX,SOCK_STREAM,SOCK_DGRAM,0},
-#if !defined(LOCALCONN)
-    {"local",AF_UNIX,SOCK_STREAM,SOCK_DGRAM,0},
-#endif /* !LOCALCONN */
-#endif /* UNIXCONN */
-};
-
-#define NUMSOCKETFAMILIES (sizeof(Sockettrans2devtab)/sizeof(Sockettrans2dev))
-
-#ifdef TCPCONN
-static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
-#endif
-
-#ifdef UNIXCONN
-
-
-#if defined(X11_t)
-#define UNIX_PATH "/tmp/.X11-unix/X"
-#define UNIX_DIR "/tmp/.X11-unix"
-#endif /* X11_t */
-#if defined(XIM_t)
-#define UNIX_PATH "/tmp/.XIM-unix/XIM"
-#define UNIX_DIR "/tmp/.XIM-unix"
-#endif /* XIM_t */
-#if defined(FS_t) || defined(FONT_t)
-#define UNIX_PATH "/tmp/.font-unix/fs"
-#define UNIX_DIR "/tmp/.font-unix"
-#endif /* FS_t || FONT_t */
-#if defined(ICE_t)
-#define UNIX_PATH "/tmp/.ICE-unix/"
-#define UNIX_DIR "/tmp/.ICE-unix"
-#endif /* ICE_t */
-#if defined(TEST_t)
-#define UNIX_PATH "/tmp/.Test-unix/test"
-#define UNIX_DIR "/tmp/.Test-unix"
-#endif
-#if defined(LBXPROXY_t)
-#define UNIX_PATH "/tmp/.X11-unix/X"
-#define UNIX_DIR  "/tmp/.X11-unix"
-#endif
-
-
-#endif /* UNIXCONN */
-
-#define PORTBUFSIZE	32
-
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 255
-#endif
-
-#if defined HAVE_SOCKLEN_T || (defined(IPv6) && defined(AF_INET6))
-# define SOCKLEN_T socklen_t
-#elif defined(SVR4) || defined(__SVR4) || defined(__SCO__)
-# define SOCKLEN_T size_t
-#else
-# define SOCKLEN_T int
-#endif
-
-/*
- * These are some utility function used by the real interface function below.
- */
-
-static int
-TRANS(SocketSelectFamily) (int first, const char *family)
-
-{
-    int     i;
-
-    prmsg (3,"SocketSelectFamily(%s)\n", family);
-
-    for (i = first + 1; i < NUMSOCKETFAMILIES;i++)
-    {
-        if (!strcmp (family, Sockettrans2devtab[i].transname))
-	    return i;
-    }
-
-    return (first == -1 ? -2 : -1);
-}
-
-
-/*
- * This function gets the local address of the socket and stores it in the
- * XtransConnInfo structure for the connection.
- */
-
-static int
-TRANS(SocketINETGetAddr) (XtransConnInfo ciptr)
-
-{
-#if defined(IPv6) && defined(AF_INET6)
-    struct sockaddr_storage socknamev6;
-#else
-    struct sockaddr_in socknamev4;
-#endif
-    void *socknamePtr;
-    SOCKLEN_T namelen;
-
-    prmsg (3,"SocketINETGetAddr(%p)\n", ciptr);
-
-#if defined(IPv6) && defined(AF_INET6)
-    namelen = sizeof(socknamev6);
-    socknamePtr = &socknamev6;
-#else
-    namelen = sizeof(socknamev4);
-    socknamePtr = &socknamev4;
-#endif
-
-    bzero(socknamePtr, namelen);
-
-    if (getsockname (ciptr->fd,(struct sockaddr *) socknamePtr,
-		     (void *)&namelen) < 0)
-    {
-#ifdef WIN32
-	errno = WSAGetLastError();
-#endif
-	prmsg (1,"SocketINETGetAddr: getsockname() failed: %d\n",
-	    EGET());
-	return -1;
-    }
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-
-    if ((ciptr->addr = malloc (namelen)) == NULL)
-    {
-        prmsg (1,
-	    "SocketINETGetAddr: Can't allocate space for the addr\n");
-        return -1;
-    }
-
-#if defined(IPv6) && defined(AF_INET6)
-    ciptr->family = ((struct sockaddr *)socknamePtr)->sa_family;
-#else
-    ciptr->family = socknamev4.sin_family;
-#endif
-    ciptr->addrlen = namelen;
-    memcpy (ciptr->addr, socknamePtr, ciptr->addrlen);
-
-    return 0;
-}
-
-
-/*
- * This function gets the remote address of the socket and stores it in the
- * XtransConnInfo structure for the connection.
- */
-
-static int
-TRANS(SocketINETGetPeerAddr) (XtransConnInfo ciptr)
-
-{
-#if defined(IPv6) && defined(AF_INET6)
-    struct sockaddr_storage socknamev6;
-#endif
-    struct sockaddr_in 	socknamev4;
-    void *socknamePtr;
-    SOCKLEN_T namelen;
-
-#if defined(IPv6) && defined(AF_INET6)
-    if (ciptr->family == AF_INET6)
-    {
-	namelen = sizeof(socknamev6);
-	socknamePtr = &socknamev6;
-    }
-    else
-#endif
-    {
-	namelen = sizeof(socknamev4);
-	socknamePtr = &socknamev4;
-    }
-
-    bzero(socknamePtr, namelen);
-
-    prmsg (3,"SocketINETGetPeerAddr(%p)\n", ciptr);
-
-    if (getpeername (ciptr->fd, (struct sockaddr *) socknamePtr,
-		     (void *)&namelen) < 0)
-    {
-#ifdef WIN32
-	errno = WSAGetLastError();
-#endif
-	prmsg (1,"SocketINETGetPeerAddr: getpeername() failed: %d\n",
-	    EGET());
-	return -1;
-    }
-
-    /*
-     * Everything looks good: fill in the XtransConnInfo structure.
-     */
-
-    if ((ciptr->peeraddr = malloc (namelen)) == NULL)
-    {
-        prmsg (1,
-	   "SocketINETGetPeerAddr: Can't allocate space for the addr\n");
-        return -1;
-    }
-
-    ciptr->peeraddrlen = namelen;
-    memcpy (ciptr->peeraddr, socknamePtr, ciptr->peeraddrlen);
-
-    return 0;
-}
-
-
-static XtransConnInfo
-TRANS(SocketOpen) (int i, int type)
-
-{
-    XtransConnInfo	ciptr;
-
-    prmsg (3,"SocketOpen(%d,%d)\n", i, type);
-
-    if ((ciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL)
-    {
-	prmsg (1, "SocketOpen: malloc failed\n");
-	return NULL;
-    }
-
-    if ((ciptr->fd = socket(Sockettrans2devtab[i].family, type,
-	Sockettrans2devtab[i].protocol)) < 0
-#ifndef WIN32
-#if (defined(X11_t) && !defined(USE_POLL)) || defined(FS_t) || defined(FONT_t)
-       || ciptr->fd >= sysconf(_SC_OPEN_MAX)
-#endif
-#endif
-      ) {
-#ifdef WIN32
-	errno = WSAGetLastError();
-#endif
-	prmsg (2, "SocketOpen: socket() failed for %s\n",
-	    Sockettrans2devtab[i].transname);
-
-	free (ciptr);
-	return NULL;
-    }
-
-#ifdef TCP_NODELAY
-    if (Sockettrans2devtab[i].family == AF_INET
-#if defined(IPv6) && defined(AF_INET6)
-      || Sockettrans2devtab[i].family == AF_INET6
-#endif
-    )
-    {
-	/*
-	 * turn off TCP coalescence for INET sockets
-	 */
-
-	int tmp = 1;
-	setsockopt (ciptr->fd, IPPROTO_TCP, TCP_NODELAY,
-	    (char *) &tmp, sizeof (int));
-    }
-#endif
-
-    /*
-     * Some systems provide a really small default buffer size for
-     * UNIX sockets.  Bump it up a bit such that large transfers don't
-     * proceed at glacial speed.
-     */
-#ifdef SO_SNDBUF
-    if (Sockettrans2devtab[i].family == AF_UNIX)
-    {
-	SOCKLEN_T len = sizeof (int);
-	int val;
-
-	if (getsockopt (ciptr->fd, SOL_SOCKET, SO_SNDBUF,
-	    (char *) &val, &len) == 0 && val < 64 * 1024)
-	{
-	    val = 64 * 1024;
-	    setsockopt (ciptr->fd, SOL_SOCKET, SO_SNDBUF,
-	        (char *) &val, sizeof (int));
-	}
-    }
-#endif
-
-    return ciptr;
-}
-
-
-#ifdef TRANS_REOPEN
-
-static XtransConnInfo
-TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, const char *port)
-
-{
-    XtransConnInfo	ciptr;
-    int portlen;
-    struct sockaddr *addr;
-    size_t addrlen;
-
-    prmsg (3,"SocketReopen(%d,%d,%s)\n", type, fd, port);
-
-    if (port == NULL) {
-      prmsg (1, "SocketReopen: port was null!\n");
-      return NULL;
-    }
-
-    portlen = strlen(port) + 1; // include space for trailing null
-#ifdef SOCK_MAXADDRLEN
-    if (portlen < 0 || portlen > (SOCK_MAXADDRLEN + 2)) {
-      prmsg (1, "SocketReopen: invalid portlen %d\n", portlen);
-      return NULL;
-    }
-    if (portlen < 14) portlen = 14;
-#else
-    if (portlen < 0 || portlen > 14) {
-      prmsg (1, "SocketReopen: invalid portlen %d\n", portlen);
-      return NULL;
-    }
-#endif /*SOCK_MAXADDRLEN*/
-
-    if ((ciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL)
-    {
-	prmsg (1, "SocketReopen: malloc(ciptr) failed\n");
-	return NULL;
-    }
-
-    ciptr->fd = fd;
-
-    addrlen = portlen + offsetof(struct sockaddr, sa_data);
-    if ((addr = calloc (1, addrlen)) == NULL) {
-	prmsg (1, "SocketReopen: malloc(addr) failed\n");
-	free (ciptr);
-	return NULL;
-    }
-    ciptr->addr = (char *) addr;
-    ciptr->addrlen = addrlen;
-
-    if ((ciptr->peeraddr = calloc (1, addrlen)) == NULL) {
-	prmsg (1, "SocketReopen: malloc(portaddr) failed\n");
-	free (addr);
-	free (ciptr);
-	return NULL;
-    }
-    ciptr->peeraddrlen = addrlen;
-
-    /* Initialize ciptr structure as if it were a normally-opened unix socket */
-    ciptr->flags = TRANS_LOCAL | TRANS_NOUNLINK;
-#ifdef BSD44SOCKETS
-    addr->sa_len = addrlen;
-#endif
-    addr->sa_family = AF_UNIX;
-#ifdef HAS_STRLCPY
-    strlcpy(addr->sa_data, port, portlen);
-#else
-    strncpy(addr->sa_data, port, portlen);
-#endif
-    ciptr->family = AF_UNIX;
-    memcpy(ciptr->peeraddr, ciptr->addr, addrlen);
-    ciptr->port = rindex(addr->sa_data, ':');
-    if (ciptr->port == NULL) {
-	if (is_numeric(addr->sa_data)) {
-	    ciptr->port = addr->sa_data;
-	}
-    } else if (ciptr->port[0] == ':') {
-	ciptr->port++;
-    }
-    /* port should now point to portnum or NULL */
-    return ciptr;
-}
-
-#endif /* TRANS_REOPEN */
-
-
-/*
- * These functions are the interface supplied in the Xtransport structure
- */
-
-#ifdef TRANS_CLIENT
-
-static XtransConnInfo
-TRANS(SocketOpenCOTSClientBase) (const char *transname, const char *protocol,
-			   const char *host, const char *port, int previndex)
-{
-    XtransConnInfo	ciptr;
-    int			i = previndex;
-
-    prmsg (2, "SocketOpenCOTSClient(%s,%s,%s)\n",
-	protocol, host, port);
-
-    SocketInitOnce();
-
-    while ((i = TRANS(SocketSelectFamily) (i, transname)) >= 0) {
-	if ((ciptr = TRANS(SocketOpen) (
-		i, Sockettrans2devtab[i].devcotsname)) != NULL) {
-	    /* Save the index for later use */
-
-	    ciptr->index = i;
-	    break;
-	}
-    }
-    if (i < 0) {
-	if (i == -1)
-	    prmsg (1,"SocketOpenCOTSClient: Unable to open socket for %s\n",
-		   transname);
-	else
-	    prmsg (1,"SocketOpenCOTSClient: Unable to determine socket type for %s\n",
-		   transname);
-	return NULL;
-    }
-
-    return ciptr;
-}
-
-static XtransConnInfo
-TRANS(SocketOpenCOTSClient) (Xtransport *thistrans, const char *protocol,
-			     const char *host, const char *port)
-{
-    return TRANS(SocketOpenCOTSClientBase)(
-			thistrans->TransName, protocol, host, port, -1);
-}
-
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-static XtransConnInfo
-TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol,
-			     const char *host, const char *port)
-
-{
-    XtransConnInfo	ciptr;
-    int	i = -1;
-
-    prmsg (2,"SocketOpenCOTSServer(%s,%s,%s)\n", protocol, host, port);
-
-    SocketInitOnce();
-
-    while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
-	if ((ciptr = TRANS(SocketOpen) (
-		 i, Sockettrans2devtab[i].devcotsname)) != NULL)
-	    break;
-    }
-    if (i < 0) {
-	if (i == -1)
-	    prmsg (1,"SocketOpenCOTSServer: Unable to open socket for %s\n",
-		   thistrans->TransName);
-	else
-	    prmsg (1,"SocketOpenCOTSServer: Unable to determine socket type for %s\n",
-		   thistrans->TransName);
-	return NULL;
-    }
-
-    /*
-     * Using this prevents the bind() check for an existing server listening
-     * on the same port, but it is required for other reasons.
-     */
-#ifdef SO_REUSEADDR
-
-    /*
-     * SO_REUSEADDR only applied to AF_INET && AF_INET6
-     */
-
-    if (Sockettrans2devtab[i].family == AF_INET
-#if defined(IPv6) && defined(AF_INET6)
-      || Sockettrans2devtab[i].family == AF_INET6
-#endif
-    )
-    {
-	int one = 1;
-	setsockopt (ciptr->fd, SOL_SOCKET, SO_REUSEADDR,
-		    (char *) &one, sizeof (int));
-    }
-#endif
-#ifdef IPV6_V6ONLY
-    if (Sockettrans2devtab[i].family == AF_INET6)
-    {
-	int one = 1;
-	setsockopt(ciptr->fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(int));
-    }
-#endif
-    /* Save the index for later use */
-
-    ciptr->index = i;
-
-    return ciptr;
-}
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_CLIENT
-
-static XtransConnInfo
-TRANS(SocketOpenCLTSClient) (Xtransport *thistrans, const char *protocol,
-			     const char *host, const char *port)
-
-{
-    XtransConnInfo	ciptr;
-    int			i = -1;
-
-    prmsg (2,"SocketOpenCLTSClient(%s,%s,%s)\n", protocol, host, port);
-
-    SocketInitOnce();
-
-    while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
-	if ((ciptr = TRANS(SocketOpen) (
-		 i, Sockettrans2devtab[i].devcotsname)) != NULL)
-	    break;
-    }
-    if (i < 0) {
-	if (i == -1)
-	    prmsg (1,"SocketOpenCLTSClient: Unable to open socket for %s\n",
-		   thistrans->TransName);
-	else
-	    prmsg (1,"SocketOpenCLTSClient: Unable to determine socket type for %s\n",
-		   thistrans->TransName);
-	return NULL;
-    }
-
-    /* Save the index for later use */
-
-    ciptr->index = i;
-
-    return ciptr;
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-static XtransConnInfo
-TRANS(SocketOpenCLTSServer) (Xtransport *thistrans, const char *protocol,
-			     const char *host, const char *port)
-
-{
-    XtransConnInfo	ciptr;
-    int	i = -1;
-
-    prmsg (2,"SocketOpenCLTSServer(%s,%s,%s)\n", protocol, host, port);
-
-    SocketInitOnce();
-
-    while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
-	if ((ciptr = TRANS(SocketOpen) (
-		 i, Sockettrans2devtab[i].devcotsname)) != NULL)
-	    break;
-    }
-    if (i < 0) {
-	if (i == -1)
-	    prmsg (1,"SocketOpenCLTSServer: Unable to open socket for %s\n",
-		   thistrans->TransName);
-	else
-	    prmsg (1,"SocketOpenCLTSServer: Unable to determine socket type for %s\n",
-		   thistrans->TransName);
-	return NULL;
-    }
-
-#ifdef IPV6_V6ONLY
-    if (Sockettrans2devtab[i].family == AF_INET6)
-    {
-	int one = 1;
-	setsockopt(ciptr->fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(int));
-    }
-#endif
-    /* Save the index for later use */
-
-    ciptr->index = i;
-
-    return ciptr;
-}
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_REOPEN
-
-static XtransConnInfo
-TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, const char *port)
-
-{
-    XtransConnInfo	ciptr;
-    int			i = -1;
-
-    prmsg (2,
-	"SocketReopenCOTSServer(%d, %s)\n", fd, port);
-
-    SocketInitOnce();
-
-    while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
-	if ((ciptr = TRANS(SocketReopen) (
-		 i, Sockettrans2devtab[i].devcotsname, fd, port)) != NULL)
-	    break;
-    }
-    if (i < 0) {
-	if (i == -1)
-	    prmsg (1,"SocketReopenCOTSServer: Unable to open socket for %s\n",
-		   thistrans->TransName);
-	else
-	    prmsg (1,"SocketReopenCOTSServer: Unable to determine socket type for %s\n",
-		   thistrans->TransName);
-	return NULL;
-    }
-
-    /* Save the index for later use */
-
-    ciptr->index = i;
-
-    return ciptr;
-}
-
-static XtransConnInfo
-TRANS(SocketReopenCLTSServer) (Xtransport *thistrans, int fd, const char *port)
-
-{
-    XtransConnInfo	ciptr;
-    int			i = -1;
-
-    prmsg (2,
-	"SocketReopenCLTSServer(%d, %s)\n", fd, port);
-
-    SocketInitOnce();
-
-    while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
-	if ((ciptr = TRANS(SocketReopen) (
-		 i, Sockettrans2devtab[i].devcotsname, fd, port)) != NULL)
-	    break;
-    }
-    if (i < 0) {
-	if (i == -1)
-	    prmsg (1,"SocketReopenCLTSServer: Unable to open socket for %s\n",
-		   thistrans->TransName);
-	else
-	    prmsg (1,"SocketReopenCLTSServer: Unable to determine socket type for %s\n",
-		   thistrans->TransName);
-	return NULL;
-    }
-
-    /* Save the index for later use */
-
-    ciptr->index = i;
-
-    return ciptr;
-}
-
-#endif /* TRANS_REOPEN */
-
-
-static int
-TRANS(SocketSetOption) (XtransConnInfo ciptr, int option, int arg)
-
-{
-    prmsg (2,"SocketSetOption(%d,%d,%d)\n", ciptr->fd, option, arg);
-
-    return -1;
-}
-
-#ifdef UNIXCONN
-static int
-set_sun_path(const char *port, const char *upath, char *path, int abstract)
-{
-    struct sockaddr_un s;
-    int maxlen = sizeof(s.sun_path) - 1;
-    const char *at = "";
-
-    if (!port || !*port || !path)
-	return -1;
-
-#ifdef HAVE_ABSTRACT_SOCKETS
-    if (port[0] == '@')
-	upath = "";
-    else if (abstract)
-	at = "@";
-#endif
-
-    if (*port == '/') /* a full pathname */
-	upath = "";
-
-    if (strlen(port) + strlen(upath) > maxlen)
-	return -1;
-    snprintf(path, sizeof(s.sun_path), "%s%s%s", at, upath, port);
-    return 0;
-}
-#endif
-
-#ifdef TRANS_SERVER
-
-static int
-TRANS(SocketCreateListener) (XtransConnInfo ciptr,
-			     struct sockaddr *sockname,
-			     int socknamelen, unsigned int flags)
-
-{
-    SOCKLEN_T namelen = socknamelen;
-    int	fd = ciptr->fd;
-    int	retry;
-
-    prmsg (3, "SocketCreateListener(%p,%d)\n", ciptr, fd);
-
-    if (Sockettrans2devtab[ciptr->index].family == AF_INET
-#if defined(IPv6) && defined(AF_INET6)
-      || Sockettrans2devtab[ciptr->index].family == AF_INET6
-#endif
-	)
-	retry = 20;
-    else
-	retry = 0;
-
-    while (bind (fd, (struct sockaddr *) sockname, namelen) < 0)
-    {
-	if (errno == EADDRINUSE) {
-	    if (flags & ADDR_IN_USE_ALLOWED)
-		break;
-	    else
-		return TRANS_ADDR_IN_USE;
-	}
-
-	if (retry-- == 0) {
-	    prmsg (1, "SocketCreateListener: failed to bind listener\n");
-	    close (fd);
-	    return TRANS_CREATE_LISTENER_FAILED;
-	}
-#ifdef SO_REUSEADDR
-	sleep (1);
-#else
-	sleep (10);
-#endif /* SO_REUSEDADDR */
-    }
-
-    if (Sockettrans2devtab[ciptr->index].family == AF_INET
-#if defined(IPv6) && defined(AF_INET6)
-      || Sockettrans2devtab[ciptr->index].family == AF_INET6
-#endif
-	) {
-#ifdef SO_DONTLINGER
-	setsockopt (fd, SOL_SOCKET, SO_DONTLINGER, (char *) NULL, 0);
-#else
-#ifdef SO_LINGER
-    {
-	static int linger[2] = { 0, 0 };
-	setsockopt (fd, SOL_SOCKET, SO_LINGER,
-		(char *) linger, sizeof (linger));
-    }
-#endif
-#endif
-}
-
-    if (listen (fd, BACKLOG) < 0)
-    {
-	prmsg (1, "SocketCreateListener: listen() failed\n");
-	close (fd);
-	return TRANS_CREATE_LISTENER_FAILED;
-    }
-
-    /* Set a flag to indicate that this connection is a listener */
-
-    ciptr->flags = 1 | (ciptr->flags & TRANS_KEEPFLAGS);
-
-    return 0;
-}
-
-#ifdef TCPCONN
-static int
-TRANS(SocketINETCreateListener) (XtransConnInfo ciptr, const char *port,
-                                 unsigned int flags)
-
-{
-#if defined(IPv6) && defined(AF_INET6)
-    struct sockaddr_storage sockname;
-#else
-    struct sockaddr_in	    sockname;
-#endif
-    unsigned short	    sport;
-    SOCKLEN_T	namelen = sizeof(sockname);
-    int		status;
-    long	tmpport;
-#ifdef XTHREADS_NEEDS_BYNAMEPARAMS
-    _Xgetservbynameparams sparams;
-#endif
-    struct servent *servp;
-
-#ifdef X11_t
-    char	portbuf[PORTBUFSIZE];
-#endif
-
-    prmsg (2, "SocketINETCreateListener(%s)\n", port);
-
-#ifdef X11_t
-    /*
-     * X has a well known port, that is transport dependent. It is easier
-     * to handle it here, than try and come up with a transport independent
-     * representation that can be passed in and resolved the usual way.
-     *
-     * The port that is passed here is really a string containing the idisplay
-     * from ConnectDisplay().
-     */
-
-    if (is_numeric (port))
-    {
-	/* fixup the server port address */
-	tmpport = X_TCP_PORT + strtol (port, (char**)NULL, 10);
-	snprintf (portbuf, sizeof(portbuf), "%lu", tmpport);
-	port = portbuf;
-    }
-#endif
-
-    if (port && *port)
-    {
-	/* Check to see if the port string is just a number (handles X11) */
-
-	if (!is_numeric (port))
-	{
-	    if ((servp = _XGetservbyname (port,"tcp",sparams)) == NULL)
-	    {
-		prmsg (1,
-	     "SocketINETCreateListener: Unable to get service for %s\n",
-		      port);
-		return TRANS_CREATE_LISTENER_FAILED;
-	    }
-	    /* we trust getservbyname to return a valid number */
-	    sport = servp->s_port;
-	}
-	else
-	{
-	    tmpport = strtol (port, (char**)NULL, 10);
-	    /*
-	     * check that somehow the port address isn't negative or in
-	     * the range of reserved port addresses. This can happen and
-	     * be very bad if the server is suid-root and the user does
-	     * something (dumb) like `X :60049`.
-	     */
-	    if (tmpport < 1024 || tmpport > USHRT_MAX)
-		return TRANS_CREATE_LISTENER_FAILED;
-
-	    sport = (unsigned short) tmpport;
-	}
-    }
-    else
-	sport = 0;
-
-    bzero(&sockname, sizeof(sockname));
-#if defined(IPv6) && defined(AF_INET6)
-    if (Sockettrans2devtab[ciptr->index].family == AF_INET) {
-	namelen = sizeof (struct sockaddr_in);
-#ifdef BSD44SOCKETS
-	((struct sockaddr_in *)&sockname)->sin_len = namelen;
-#endif
-	((struct sockaddr_in *)&sockname)->sin_family = AF_INET;
-	((struct sockaddr_in *)&sockname)->sin_port = htons(sport);
-	((struct sockaddr_in *)&sockname)->sin_addr.s_addr = htonl(INADDR_ANY);
-    } else {
-	namelen = sizeof (struct sockaddr_in6);
-#ifdef SIN6_LEN
-	((struct sockaddr_in6 *)&sockname)->sin6_len = sizeof(sockname);
-#endif
-	((struct sockaddr_in6 *)&sockname)->sin6_family = AF_INET6;
-	((struct sockaddr_in6 *)&sockname)->sin6_port = htons(sport);
-	((struct sockaddr_in6 *)&sockname)->sin6_addr = in6addr_any;
-    }
-#else
-#ifdef BSD44SOCKETS
-    sockname.sin_len = sizeof (sockname);
-#endif
-    sockname.sin_family = AF_INET;
-    sockname.sin_port = htons (sport);
-    sockname.sin_addr.s_addr = htonl (INADDR_ANY);
-#endif
-
-    if ((status = TRANS(SocketCreateListener) (ciptr,
-	(struct sockaddr *) &sockname, namelen, flags)) < 0)
-    {
-	prmsg (1,
-    "SocketINETCreateListener: ...SocketCreateListener() failed\n");
-	return status;
-    }
-
-    if (TRANS(SocketINETGetAddr) (ciptr) < 0)
-    {
-	prmsg (1,
-       "SocketINETCreateListener: ...SocketINETGetAddr() failed\n");
-	return TRANS_CREATE_LISTENER_FAILED;
-    }
-
-    return 0;
-}
-
-#endif /* TCPCONN */
-
-
-#ifdef UNIXCONN
-
-static int
-TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, const char *port,
-				 unsigned int flags)
-
-{
-    struct sockaddr_un	sockname;
-    int			namelen;
-    int			oldUmask;
-    int			status;
-    unsigned int	mode;
-    char		tmpport[108];
-
-    int			abstract = 0;
-#ifdef HAVE_ABSTRACT_SOCKETS
-    abstract = ciptr->transptr->flags & TRANS_ABSTRACT;
-#endif
-
-    prmsg (2, "SocketUNIXCreateListener(%s)\n",
-	port ? port : "NULL");
-
-    /* Make sure the directory is created */
-
-    oldUmask = umask (0);
-
-#ifdef UNIX_DIR
-#ifdef HAS_STICKY_DIR_BIT
-    mode = 01777;
-#else
-    mode = 0777;
-#endif
-    if (!abstract && trans_mkdir(UNIX_DIR, mode) == -1) {
-	prmsg (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n",
-	       UNIX_DIR, errno);
-	(void) umask (oldUmask);
-	return TRANS_CREATE_LISTENER_FAILED;
-    }
-#endif
-
-    memset(&sockname, 0, sizeof(sockname));
-    sockname.sun_family = AF_UNIX;
-
-    if (!(port && *port)) {
-	snprintf (tmpport, sizeof(tmpport), "%s%ld", UNIX_PATH, (long)getpid());
-	port = tmpport;
-    }
-    if (set_sun_path(port, UNIX_PATH, sockname.sun_path, abstract) != 0) {
-	prmsg (1, "SocketUNIXCreateListener: path too long\n");
-	return TRANS_CREATE_LISTENER_FAILED;
-    }
-
-#if (defined(BSD44SOCKETS) || defined(__UNIXWARE__))
-    sockname.sun_len = strlen(sockname.sun_path);
-#endif
-
-#if defined(BSD44SOCKETS) || defined(SUN_LEN)
-    namelen = SUN_LEN(&sockname);
-#else
-    namelen = strlen(sockname.sun_path) + offsetof(struct sockaddr_un, sun_path);
-#endif
-
-    if (abstract) {
-	sockname.sun_path[0] = '\0';
-	namelen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&sockname.sun_path[1]);
-    }
-    else
-	unlink (sockname.sun_path);
-
-    if ((status = TRANS(SocketCreateListener) (ciptr,
-	(struct sockaddr *) &sockname, namelen, flags)) < 0)
-    {
-	prmsg (1,
-    "SocketUNIXCreateListener: ...SocketCreateListener() failed\n");
-	(void) umask (oldUmask);
-	return status;
-    }
-
-    /*
-     * Now that the listener is esablished, create the addr info for
-     * this connection. getpeername() doesn't work for UNIX Domain Sockets
-     * on some systems (hpux at least), so we will just do it manually, instead
-     * of calling something like TRANS(SocketUNIXGetAddr).
-     */
-
-    namelen = sizeof (sockname); /* this will always make it the same size */
-
-    if ((ciptr->addr = malloc (namelen)) == NULL)
-    {
-        prmsg (1,
-        "SocketUNIXCreateListener: Can't allocate space for the addr\n");
-	(void) umask (oldUmask);
-        return TRANS_CREATE_LISTENER_FAILED;
-    }
-
-    if (abstract)
-	sockname.sun_path[0] = '@';
-
-    ciptr->family = sockname.sun_family;
-    ciptr->addrlen = namelen;
-    memcpy (ciptr->addr, &sockname, ciptr->addrlen);
-
-    (void) umask (oldUmask);
-
-    return 0;
-}
-
-
-static int
-TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
-
-{
-    /*
-     * See if the unix domain socket has disappeared.  If it has, recreate it.
-     */
-
-    struct sockaddr_un 	*unsock = (struct sockaddr_un *) ciptr->addr;
-    struct stat		statb;
-    int 		status = TRANS_RESET_NOOP;
-    unsigned int	mode;
-    int abstract = 0;
-#ifdef HAVE_ABSTRACT_SOCKETS
-    abstract = ciptr->transptr->flags & TRANS_ABSTRACT;
-#endif
-
-    prmsg (3, "SocketUNIXResetListener(%p,%d)\n", ciptr, ciptr->fd);
-
-    if (!abstract && (
-	stat (unsock->sun_path, &statb) == -1 ||
-        ((statb.st_mode & S_IFMT) !=
-#if defined(NCR) || defined(SCO325) || !defined(S_IFSOCK)
-	  		S_IFIFO
-#else
-			S_IFSOCK
-#endif
-				)))
-    {
-	int oldUmask = umask (0);
-
-#ifdef UNIX_DIR
-#ifdef HAS_STICKY_DIR_BIT
-	mode = 01777;
-#else
-	mode = 0777;
-#endif
-        if (trans_mkdir(UNIX_DIR, mode) == -1) {
-            prmsg (1, "SocketUNIXResetListener: mkdir(%s) failed, errno = %d\n",
-	    UNIX_DIR, errno);
-	    (void) umask (oldUmask);
-	    return TRANS_RESET_FAILURE;
-        }
-#endif
-
-	close (ciptr->fd);
-	unlink (unsock->sun_path);
-
-	if ((ciptr->fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
-	{
-	    TRANS(FreeConnInfo) (ciptr);
-	    (void) umask (oldUmask);
-	    return TRANS_RESET_FAILURE;
-	}
-
-	if (bind (ciptr->fd, (struct sockaddr *) unsock, ciptr->addrlen) < 0)
-	{
-	    close (ciptr->fd);
-	    TRANS(FreeConnInfo) (ciptr);
-	    return TRANS_RESET_FAILURE;
-	}
-
-	if (listen (ciptr->fd, BACKLOG) < 0)
-	{
-	    close (ciptr->fd);
-	    TRANS(FreeConnInfo) (ciptr);
-	    (void) umask (oldUmask);
-	    return TRANS_RESET_FAILURE;
-	}
-
-	umask (oldUmask);
-
-	status = TRANS_RESET_NEW_FD;
-    }
-
-    return status;
-}
-
-#endif /* UNIXCONN */
-
-
-#ifdef TCPCONN
-
-static XtransConnInfo
-TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status)
-
-{
-    XtransConnInfo	newciptr;
-    struct sockaddr_in	sockname;
-    SOCKLEN_T		namelen = sizeof(sockname);
-
-    prmsg (2, "SocketINETAccept(%p,%d)\n", ciptr, ciptr->fd);
-
-    if ((newciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL)
-    {
-	prmsg (1, "SocketINETAccept: malloc failed\n");
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-	return NULL;
-    }
-
-    if ((newciptr->fd = accept (ciptr->fd,
-	(struct sockaddr *) &sockname, (void *)&namelen)) < 0)
-    {
-#ifdef WIN32
-	errno = WSAGetLastError();
-#endif
-	prmsg (1, "SocketINETAccept: accept() failed\n");
-	free (newciptr);
-	*status = TRANS_ACCEPT_FAILED;
-	return NULL;
-    }
-
-#ifdef TCP_NODELAY
-    {
-	/*
-	 * turn off TCP coalescence for INET sockets
-	 */
-
-	int tmp = 1;
-	setsockopt (newciptr->fd, IPPROTO_TCP, TCP_NODELAY,
-	    (char *) &tmp, sizeof (int));
-    }
-#endif
-
-    /*
-     * Get this address again because the transport may give a more
-     * specific address now that a connection is established.
-     */
-
-    if (TRANS(SocketINETGetAddr) (newciptr) < 0)
-    {
-	prmsg (1,
-	    "SocketINETAccept: ...SocketINETGetAddr() failed:\n");
-	close (newciptr->fd);
-	free (newciptr);
-	*status = TRANS_ACCEPT_MISC_ERROR;
-        return NULL;
-    }
-
-    if (TRANS(SocketINETGetPeerAddr) (newciptr) < 0)
-    {
-	prmsg (1,
-	  "SocketINETAccept: ...SocketINETGetPeerAddr() failed:\n");
-	close (newciptr->fd);
-	if (newciptr->addr) free (newciptr->addr);
-	free (newciptr);
-	*status = TRANS_ACCEPT_MISC_ERROR;
-        return NULL;
-    }
-
-    *status = 0;
-
-    return newciptr;
-}
-
-#endif /* TCPCONN */
-
-
-#ifdef UNIXCONN
-static XtransConnInfo
-TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
-
-{
-    XtransConnInfo	newciptr;
-    struct sockaddr_un	sockname;
-    SOCKLEN_T 		namelen = sizeof sockname;
-
-    prmsg (2, "SocketUNIXAccept(%p,%d)\n", ciptr, ciptr->fd);
-
-    if ((newciptr = calloc (1, sizeof(struct _XtransConnInfo))) == NULL)
-    {
-	prmsg (1, "SocketUNIXAccept: malloc() failed\n");
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-	return NULL;
-    }
-
-    if ((newciptr->fd = accept (ciptr->fd,
-	(struct sockaddr *) &sockname, (void *)&namelen)) < 0)
-    {
-	prmsg (1, "SocketUNIXAccept: accept() failed\n");
-	free (newciptr);
-	*status = TRANS_ACCEPT_FAILED;
-	return NULL;
-    }
-
-	ciptr->addrlen = namelen;
-    /*
-     * Get the socket name and the peer name from the listener socket,
-     * since this is unix domain.
-     */
-
-    if ((newciptr->addr = malloc (ciptr->addrlen)) == NULL)
-    {
-        prmsg (1,
-        "SocketUNIXAccept: Can't allocate space for the addr\n");
-	close (newciptr->fd);
-	free (newciptr);
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-        return NULL;
-    }
-
-    /*
-     * if the socket is abstract, we already modified the address to have a
-     * @ instead of the initial NUL, so no need to do that again here.
-     */
-
-    newciptr->addrlen = ciptr->addrlen;
-    memcpy (newciptr->addr, ciptr->addr, newciptr->addrlen);
-
-    if ((newciptr->peeraddr = malloc (ciptr->addrlen)) == NULL)
-    {
-        prmsg (1,
-	      "SocketUNIXAccept: Can't allocate space for the addr\n");
-	close (newciptr->fd);
-	if (newciptr->addr) free (newciptr->addr);
-	free (newciptr);
-	*status = TRANS_ACCEPT_BAD_MALLOC;
-        return NULL;
-    }
-
-    newciptr->peeraddrlen = ciptr->addrlen;
-    memcpy (newciptr->peeraddr, ciptr->addr, newciptr->addrlen);
-
-    newciptr->family = AF_UNIX;
-
-    *status = 0;
-
-    return newciptr;
-}
-
-#endif /* UNIXCONN */
-
-#endif /* TRANS_SERVER */
-
-
-#ifdef TRANS_CLIENT
-
-#ifdef TCPCONN
-
-#if defined(IPv6) && defined(AF_INET6)
-struct addrlist {
-    struct addrinfo *	addr;
-    struct addrinfo *	firstaddr;
-    char 		port[PORTBUFSIZE];
-    char 		host[MAXHOSTNAMELEN];
-};
-static struct addrlist  *addrlist = NULL;
-#endif
-
-
-static int
-TRANS(SocketINETConnect) (XtransConnInfo ciptr,
-                          const char *host, const char *port)
-
-{
-    struct sockaddr *	socketaddr = NULL;
-    int			socketaddrlen = 0;
-    int			res;
-#if defined(IPv6) && defined(AF_INET6)
-    struct addrinfo 	hints;
-    char		ntopbuf[INET6_ADDRSTRLEN];
-    int			resetonce = 0;
-#else
-    struct sockaddr_in	sockname;
-    struct hostent	*hostp;
-    struct servent	*servp;
-    unsigned long 	tmpaddr;
-#endif
-#ifdef XTHREADS_NEEDS_BYNAMEPARAMS
-    _Xgethostbynameparams hparams;
-    _Xgetservbynameparams sparams;
-#endif
-#ifdef X11_t
-    char	portbuf[PORTBUFSIZE];
-#endif
-
-    char 		hostnamebuf[256];		/* tmp space */
-
-    prmsg (2,"SocketINETConnect(%d,%s,%s)\n", ciptr->fd, host, port);
-
-    if (!host)
-    {
-	hostnamebuf[0] = '\0';
-	(void) TRANS(GetHostname) (hostnamebuf, sizeof hostnamebuf);
-	host = hostnamebuf;
-    }
-
-#ifdef X11_t
-    /*
-     * X has a well known port, that is transport dependent. It is easier
-     * to handle it here, than try and come up with a transport independent
-     * representation that can be passed in and resolved the usual way.
-     *
-     * The port that is passed here is really a string containing the idisplay
-     * from ConnectDisplay().
-     */
-
-    if (is_numeric (port))
-    {
-	long tmpport = X_TCP_PORT + strtol (port, (char**)NULL, 10);
-	snprintf (portbuf, sizeof(portbuf), "%lu", tmpport);
-	port = portbuf;
-    }
-#endif
-
-#if defined(IPv6) && defined(AF_INET6)
-    {
-	if (addrlist != NULL) {
-	    if (strcmp(host,addrlist->host) || strcmp(port,addrlist->port)) {
-		if (addrlist->firstaddr)
-		    freeaddrinfo(addrlist->firstaddr);
-		addrlist->firstaddr = NULL;
-	    }
-	} else {
-	    addrlist = malloc(sizeof(struct addrlist));
-	    addrlist->firstaddr = NULL;
-	}
-
-	if (addrlist->firstaddr == NULL) {
-	    strncpy(addrlist->port, port, sizeof(addrlist->port));
-	    addrlist->port[sizeof(addrlist->port) - 1] = '\0';
-	    strncpy(addrlist->host, host, sizeof(addrlist->host));
-	    addrlist->host[sizeof(addrlist->host) - 1] = '\0';
-
-	    bzero(&hints,sizeof(hints));
-	    hints.ai_socktype = Sockettrans2devtab[ciptr->index].devcotsname;
-
-	    res = getaddrinfo(host,port,&hints,&addrlist->firstaddr);
-	    if (res != 0) {
-		prmsg (1, "SocketINETConnect() can't get address "
-			"for %s:%s: %s\n", host, port, gai_strerror(res));
-		ESET(EINVAL);
-		return TRANS_CONNECT_FAILED;
-	    }
-	    for (res = 0, addrlist->addr = addrlist->firstaddr;
-		 addrlist->addr ; res++) {
-		addrlist->addr = addrlist->addr->ai_next;
-	    }
-	    prmsg(4,"Got New Address list with %d addresses\n", res);
-	    res = 0;
-	    addrlist->addr = NULL;
-	}
-
-	while (socketaddr == NULL) {
-	    if (addrlist->addr == NULL) {
-		if (resetonce) {
-		    /* Already checked entire list - no usable addresses */
-		    prmsg (1, "SocketINETConnect() no usable address "
-			   "for %s:%s\n", host, port);
-		    return TRANS_CONNECT_FAILED;
-		} else {
-		    /* Go back to beginning of list */
-		    resetonce = 1;
-		    addrlist->addr = addrlist->firstaddr;
-		}
-	    }
-
-	    socketaddr = addrlist->addr->ai_addr;
-	    socketaddrlen = addrlist->addr->ai_addrlen;
-
-	    if (addrlist->addr->ai_family == AF_INET) {
-		struct sockaddr_in *sin = (struct sockaddr_in *) socketaddr;
-
-		prmsg (4,"SocketINETConnect() sockname.sin_addr = %s\n",
-			inet_ntop(addrlist->addr->ai_family,&sin->sin_addr,
-			ntopbuf,sizeof(ntopbuf)));
-
-		prmsg (4,"SocketINETConnect() sockname.sin_port = %d\n",
-			ntohs(sin->sin_port));
-
-		if (Sockettrans2devtab[ciptr->index].family == AF_INET6) {
-		    if (strcmp(Sockettrans2devtab[ciptr->index].transname,
-				"tcp") == 0) {
-			XtransConnInfo newciptr;
-
-			/*
-			 * Our socket is an IPv6 socket, but the address is
-			 * IPv4.  Close it and get an IPv4 socket.  This is
-			 * needed for IPv4 connections to work on platforms
-			 * that don't allow IPv4 over IPv6 sockets.
-			 */
-			TRANS(SocketINETClose)(ciptr);
-			newciptr = TRANS(SocketOpenCOTSClientBase)(
-					"tcp", "tcp", host, port, ciptr->index);
-			if (newciptr)
-			    ciptr->fd = newciptr->fd;
-			if (!newciptr ||
-			    Sockettrans2devtab[newciptr->index].family !=
-				AF_INET) {
-			    socketaddr = NULL;
-			    prmsg (4,"SocketINETConnect() Cannot get IPv4 "
-					" socketfor IPv4 address\n");
-			}
-			if (newciptr)
-			    free(newciptr);
-		    } else {
-			socketaddr = NULL;
-			prmsg (4,"SocketINETConnect Skipping IPv4 address\n");
-		    }
-		}
-	    } else if (addrlist->addr->ai_family == AF_INET6) {
-		struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) socketaddr;
-
-		prmsg (4,"SocketINETConnect() sockname.sin6_addr = %s\n",
-			inet_ntop(addrlist->addr->ai_family,
-				  &sin6->sin6_addr,ntopbuf,sizeof(ntopbuf)));
-		prmsg (4,"SocketINETConnect() sockname.sin6_port = %d\n",
-			ntohs(sin6->sin6_port));
-
-		if (Sockettrans2devtab[ciptr->index].family == AF_INET) {
-		    if (strcmp(Sockettrans2devtab[ciptr->index].transname,
-				"tcp") == 0) {
-			XtransConnInfo newciptr;
-
-			/*
-			 * Close the IPv4 socket and try to open an IPv6 socket.
-			 */
-			TRANS(SocketINETClose)(ciptr);
-			newciptr = TRANS(SocketOpenCOTSClientBase)(
-					"tcp", "tcp", host, port, -1);
-			if (newciptr)
-			    ciptr->fd = newciptr->fd;
-			if (!newciptr ||
-			    Sockettrans2devtab[newciptr->index].family !=
-					AF_INET6) {
-			    socketaddr = NULL;
-			    prmsg (4,"SocketINETConnect() Cannot get IPv6 "
-				   "socket for IPv6 address\n");
-			}
-			if (newciptr)
-			    free(newciptr);
-		    }
-		    else
-		    {
-			socketaddr = NULL;
-			prmsg (4,"SocketINETConnect() Skipping IPv6 address\n");
-		    }
-		}
-	    } else {
-		socketaddr = NULL; /* Unsupported address type */
-	    }
-	    if (socketaddr == NULL) {
-		addrlist->addr = addrlist->addr->ai_next;
-	    }
-	}
-    }
-#else
-    {
-	/*
-	 * Build the socket name.
-	 */
-
-#ifdef BSD44SOCKETS
-	sockname.sin_len = sizeof (struct sockaddr_in);
-#endif
-	sockname.sin_family = AF_INET;
-
-	/*
-	 * fill in sin_addr
-	 */
-
-#ifndef INADDR_NONE
-#define INADDR_NONE ((in_addr_t) 0xffffffff)
-#endif
-
-	/* check for ww.xx.yy.zz host string */
-
-	if (isascii (host[0]) && isdigit (host[0])) {
-	    tmpaddr = inet_addr (host); /* returns network byte order */
-	} else {
-	    tmpaddr = INADDR_NONE;
-	}
-
-	prmsg (4,"SocketINETConnect() inet_addr(%s) = %x\n", host, tmpaddr);
-
-	if (tmpaddr == INADDR_NONE) {
-	    if ((hostp = _XGethostbyname(host,hparams)) == NULL) {
-		prmsg (1,"SocketINETConnect: Can't get address for %s\n",
-			host);
-		ESET(EINVAL);
-		return TRANS_CONNECT_FAILED;
-	    }
-	    if (hostp->h_addrtype != AF_INET) {  /* is IP host? */
-		prmsg (1,"SocketINETConnect: not INET host%s\n", host);
-		ESET(EPROTOTYPE);
-		return TRANS_CONNECT_FAILED;
-	    }
-
-	    memcpy ((char *) &sockname.sin_addr, (char *) hostp->h_addr,
-		    sizeof (sockname.sin_addr));
-
-	} else {
-	    sockname.sin_addr.s_addr = tmpaddr;
-        }
-
-	/*
-	 * fill in sin_port
-	 */
-
-	/* Check for number in the port string */
-
-	if (!is_numeric (port)) {
-	    if ((servp = _XGetservbyname (port,"tcp",sparams)) == NULL) {
-		prmsg (1,"SocketINETConnect: can't get service for %s\n",
-			port);
-		return TRANS_CONNECT_FAILED;
-	    }
-	    sockname.sin_port = htons (servp->s_port);
-	} else {
-	    long tmpport = strtol (port, (char**)NULL, 10);
-	    if (tmpport < 1024 || tmpport > USHRT_MAX)
-		return TRANS_CONNECT_FAILED;
-	    sockname.sin_port = htons (((unsigned short) tmpport));
-	}
-
-	prmsg (4,"SocketINETConnect: sockname.sin_port = %d\n",
-		ntohs(sockname.sin_port));
-	socketaddr = (struct sockaddr *) &sockname;
-	socketaddrlen = sizeof(sockname);
-    }
-#endif
-
-    /*
-     * Turn on socket keepalive so the client process will eventually
-     * be notified with a SIGPIPE signal if the display server fails
-     * to respond to a periodic transmission of messages
-     * on the connected socket.
-     * This is useful to avoid hung application processes when the
-     * processes are not spawned from the xdm session and
-     * the display server terminates abnormally.
-     * (Someone turned off the power switch.)
-     */
-
-    {
-	int tmp = 1;
-	setsockopt (ciptr->fd, SOL_SOCKET, SO_KEEPALIVE,
-		(char *) &tmp, sizeof (int));
-    }
-
-    /*
-     * Do the connect()
-     */
-
-    if (connect (ciptr->fd, socketaddr, socketaddrlen ) < 0)
-    {
-#ifdef WIN32
-	int olderrno = WSAGetLastError();
-#else
-	int olderrno = errno;
-#endif
-
-	/*
-	 * If the error was ECONNREFUSED, the server may be overloaded
-	 * and we should try again.
-	 *
-	 * If the error was EWOULDBLOCK or EINPROGRESS then the socket
-	 * was non-blocking and we should poll using select
-	 *
-	 * If the error was EINTR, the connect was interrupted and we
-	 * should try again.
-	 *
-	 * If multiple addresses are found for a host then we should
-	 * try to connect again with a different address for a larger
-	 * number of errors that made us quit before, since those
-	 * could be caused by trying to use an IPv6 address to contact
-	 * a machine with an IPv4-only server or other reasons that
-	 * only affect one of a set of addresses.
-	 */
-
-	if (olderrno == ECONNREFUSED || olderrno == EINTR
-#if defined(IPv6) && defined(AF_INET6)
-	  || (((addrlist->addr->ai_next != NULL) ||
-	        (addrlist->addr != addrlist->firstaddr)) &&
-               (olderrno == ENETUNREACH || olderrno == EAFNOSUPPORT ||
-		 olderrno == EADDRNOTAVAIL || olderrno == ETIMEDOUT
-#if defined(EHOSTDOWN)
-		   || olderrno == EHOSTDOWN
-#endif
-	       ))
-#endif
-	    )
-	    res = TRANS_TRY_CONNECT_AGAIN;
-	else if (olderrno == EWOULDBLOCK || olderrno == EINPROGRESS)
-	    res = TRANS_IN_PROGRESS;
-	else
-	{
-	    prmsg (2,"SocketINETConnect: Can't connect: errno = %d\n",
-		   olderrno);
-
-	    res = TRANS_CONNECT_FAILED;
-	}
-    } else {
-	res = 0;
-
-
-	/*
-	 * Sync up the address fields of ciptr.
-	 */
-
-	if (TRANS(SocketINETGetAddr) (ciptr) < 0)
-	{
-	    prmsg (1,
-	     "SocketINETConnect: ...SocketINETGetAddr() failed:\n");
-	    res = TRANS_CONNECT_FAILED;
-	}
-
-	else if (TRANS(SocketINETGetPeerAddr) (ciptr) < 0)
-	{
-	    prmsg (1,
-	      "SocketINETConnect: ...SocketINETGetPeerAddr() failed:\n");
-	    res = TRANS_CONNECT_FAILED;
-	}
-    }
-
-#if defined(IPv6) && defined(AF_INET6)
-   if (res != 0) {
-	addrlist->addr = addrlist->addr->ai_next;
-   }
-#endif
-
-    return res;
-}
-
-#endif /* TCPCONN */
-
-
-
-#ifdef UNIXCONN
-
-/*
- * Make sure 'host' is really local.
- */
-
-static int
-UnixHostReallyLocal (const char *host)
-
-{
-    char hostnamebuf[256];
-
-    TRANS(GetHostname) (hostnamebuf, sizeof (hostnamebuf));
-
-    if (strcmp (hostnamebuf, host) == 0)
-    {
-	return (1);
-    } else {
-#if defined(IPv6) && defined(AF_INET6)
-	struct addrinfo *localhostaddr;
-	struct addrinfo *otherhostaddr;
-	struct addrinfo *i, *j;
-	int equiv = 0;
-
-	if (getaddrinfo(hostnamebuf, NULL, NULL, &localhostaddr) != 0)
-	    return 0;
-	if (getaddrinfo(host, NULL, NULL, &otherhostaddr) != 0) {
-	    freeaddrinfo(localhostaddr);
-	    return 0;
-	}
-
-	for (i = localhostaddr; i != NULL && equiv == 0; i = i->ai_next) {
-	    for (j = otherhostaddr; j != NULL && equiv == 0; j = j->ai_next) {
-		if (i->ai_family == j->ai_family) {
-		    if (i->ai_family == AF_INET) {
-			struct sockaddr_in *sinA
-			  = (struct sockaddr_in *) i->ai_addr;
-			struct sockaddr_in *sinB
-			  = (struct sockaddr_in *) j->ai_addr;
-			struct in_addr *A = &sinA->sin_addr;
-			struct in_addr *B = &sinB->sin_addr;
-
-			if (memcmp(A,B,sizeof(struct in_addr)) == 0) {
-			    equiv = 1;
-			}
-		    } else if (i->ai_family == AF_INET6) {
-			struct sockaddr_in6 *sinA
-			  = (struct sockaddr_in6 *) i->ai_addr;
-			struct sockaddr_in6 *sinB
-			  = (struct sockaddr_in6 *) j->ai_addr;
-			struct in6_addr *A = &sinA->sin6_addr;
-			struct in6_addr *B = &sinB->sin6_addr;
-
-			if (memcmp(A,B,sizeof(struct in6_addr)) == 0) {
-			    equiv = 1;
-			}
-		    }
-		}
-	    }
-	}
-
-	freeaddrinfo(localhostaddr);
-	freeaddrinfo(otherhostaddr);
-	return equiv;
-#else
-	/*
-	 * A host may have more than one network address.  If any of the
-	 * network addresses of 'host' (specified to the connect call)
-	 * match any of the network addresses of 'hostname' (determined
-	 * by TRANS(GetHostname)), then the two hostnames are equivalent,
-	 * and we know that 'host' is really a local host.
-	 */
-	char specified_local_addr_list[10][4];
-	int scount, equiv, i, j;
-#ifdef XTHREADS_NEEDS_BYNAMEPARAMS
-	_Xgethostbynameparams hparams;
-#endif
-	struct hostent *hostp;
-
-	if ((hostp = _XGethostbyname (host,hparams)) == NULL)
-	    return (0);
-
-	scount = 0;
-	while (hostp->h_addr_list[scount] && scount <= 8)
-	{
-	    /*
-	     * The 2nd call to gethostname() overrides the data
-	     * from the 1st call, so we must save the address list.
-	     */
-
-	    specified_local_addr_list[scount][0] =
-				hostp->h_addr_list[scount][0];
-	    specified_local_addr_list[scount][1] =
-				hostp->h_addr_list[scount][1];
-	    specified_local_addr_list[scount][2] =
-				hostp->h_addr_list[scount][2];
-	    specified_local_addr_list[scount][3] =
-				hostp->h_addr_list[scount][3];
-	    scount++;
-	}
-	if ((hostp = _XGethostbyname (hostnamebuf,hparams)) == NULL)
-	    return (0);
-
-	equiv = 0;
-	i = 0;
-
-	while (i < scount && !equiv)
-	{
-	    j = 0;
-
-	    while (hostp->h_addr_list[j])
-	    {
-		if ((specified_local_addr_list[i][0] ==
-					hostp->h_addr_list[j][0]) &&
-		    (specified_local_addr_list[i][1] ==
-					hostp->h_addr_list[j][1]) &&
-		    (specified_local_addr_list[i][2] ==
-					hostp->h_addr_list[j][2]) &&
-		    (specified_local_addr_list[i][3] ==
-					hostp->h_addr_list[j][3]))
-		{
-		    /* They're equal, so we're done */
-
-		    equiv = 1;
-		    break;
-		}
-
-		j++;
-	    }
-
-	    i++;
-	}
-	return (equiv);
-#endif
-    }
-}
-
-static int
-TRANS(SocketUNIXConnect) (XtransConnInfo ciptr,
-                          const char *host, const char *port)
-
-{
-    struct sockaddr_un	sockname;
-    SOCKLEN_T		namelen;
-
-
-    int abstract = 0;
-#ifdef HAVE_ABSTRACT_SOCKETS
-    abstract = ciptr->transptr->flags & TRANS_ABSTRACT;
-#endif
-
-    prmsg (2,"SocketUNIXConnect(%d,%s,%s)\n", ciptr->fd, host, port);
-
-    /*
-     * Make sure 'host' is really local.  If not, we return failure.
-     * The reason we make this check is because a process may advertise
-     * a "local" network ID for which it can accept connections, but if
-     * a process on a remote machine tries to connect to this network ID,
-     * we know for sure it will fail.
-     */
-
-    if (host && *host && host[0]!='/' && strcmp (host, "unix") != 0 && !UnixHostReallyLocal (host))
-    {
-	prmsg (1,
-	   "SocketUNIXConnect: Cannot connect to non-local host %s\n",
-	       host);
-	return TRANS_CONNECT_FAILED;
-    }
-
-
-    /*
-     * Check the port.
-     */
-
-    if (!port || !*port)
-    {
-	prmsg (1,"SocketUNIXConnect: Missing port specification\n");
-	return TRANS_CONNECT_FAILED;
-    }
-
-    /*
-     * Build the socket name.
-     */
-
-    sockname.sun_family = AF_UNIX;
-
-    if (set_sun_path(port, UNIX_PATH, sockname.sun_path, abstract) != 0) {
-	prmsg (1, "SocketUNIXConnect: path too long\n");
-	return TRANS_CONNECT_FAILED;
-    }
-
-#if (defined(BSD44SOCKETS) || defined(__UNIXWARE__))
-    sockname.sun_len = strlen (sockname.sun_path);
-#endif
-
-#if defined(BSD44SOCKETS) || defined(SUN_LEN)
-    namelen = SUN_LEN (&sockname);
-#else
-    namelen = strlen (sockname.sun_path) + offsetof(struct sockaddr_un, sun_path);
-#endif
-
-
-
-    /*
-     * Adjust the socket path if using abstract sockets.
-     * Done here because otherwise all the strlen() calls above would fail.
-     */
-
-    if (abstract) {
-	sockname.sun_path[0] = '\0';
-    }
-
-    /*
-     * Do the connect()
-     */
-
-    if (connect (ciptr->fd, (struct sockaddr *) &sockname, namelen) < 0)
-    {
-	int olderrno = errno;
-	int connected = 0;
-
-	if (!connected)
-	{
-	    errno = olderrno;
-
-	    /*
-	     * If the error was ENOENT, the server may be starting up; we used
-	     * to suggest to try again in this case with
-	     * TRANS_TRY_CONNECT_AGAIN, but this introduced problems for
-	     * processes still referencing stale sockets in their environment.
-	     * Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it
-	     * is suggested that higher level stacks handle retries on their
-	     * level when they face a slow starting server.
-	     *
-	     * If the error was EWOULDBLOCK or EINPROGRESS then the socket
-	     * was non-blocking and we should poll using select
-	     *
-	     * If the error was EINTR, the connect was interrupted and we
-	     * should try again.
-	     */
-
-	    if (olderrno == EWOULDBLOCK || olderrno == EINPROGRESS)
-		return TRANS_IN_PROGRESS;
-	    else if (olderrno == EINTR)
-		return TRANS_TRY_CONNECT_AGAIN;
-	    else if (olderrno == ENOENT || olderrno == ECONNREFUSED) {
-		/* If opening as abstract socket failed, try again normally */
-		if (abstract) {
-		    ciptr->transptr->flags &= ~(TRANS_ABSTRACT);
-		    return TRANS_TRY_CONNECT_AGAIN;
-		} else {
-		    return TRANS_CONNECT_FAILED;
-		}
-	    } else {
-		prmsg (2,"SocketUNIXConnect: Can't connect: errno = %d\n",
-		       EGET());
-
-		return TRANS_CONNECT_FAILED;
-	    }
-	}
-    }
-
-    /*
-     * Get the socket name and the peer name from the connect socket,
-     * since this is unix domain.
-     */
-
-    if ((ciptr->addr = malloc(namelen)) == NULL ||
-       (ciptr->peeraddr = malloc(namelen)) == NULL)
-    {
-        prmsg (1,
-	"SocketUNIXCreateListener: Can't allocate space for the addr\n");
-        return TRANS_CONNECT_FAILED;
-    }
-
-    if (abstract)
-	sockname.sun_path[0] = '@';
-
-    ciptr->family = AF_UNIX;
-    ciptr->addrlen = namelen;
-    ciptr->peeraddrlen = namelen;
-    memcpy (ciptr->addr, &sockname, ciptr->addrlen);
-    memcpy (ciptr->peeraddr, &sockname, ciptr->peeraddrlen);
-
-    return 0;
-}
-
-#endif /* UNIXCONN */
-
-#endif /* TRANS_CLIENT */
-
-
-static int
-TRANS(SocketBytesReadable) (XtransConnInfo ciptr, BytesReadable_t *pend)
-
-{
-    prmsg (2,"SocketBytesReadable(%p,%d,%p)\n",
-	ciptr, ciptr->fd, pend);
-#ifdef WIN32
-    {
-	int ret = ioctlsocket ((SOCKET) ciptr->fd, FIONREAD, (u_long *) pend);
-	if (ret == SOCKET_ERROR) errno = WSAGetLastError();
-	return ret;
-    }
-#else
-#if defined(__i386__) && defined(SYSV) && !defined(SCO325)
-    return ioctl (ciptr->fd, I_NREAD, (char *) pend);
-#else
-    return ioctl (ciptr->fd, FIONREAD, (char *) pend);
-#endif /* __i386__ && SYSV || _SEQUENT_ && _SOCKET_VERSION == 1 */
-#endif /* WIN32 */
-}
-
-#if XTRANS_SEND_FDS
-
-static void
-appendFd(struct _XtransConnFd **prev, int fd, int do_close)
-{
-    struct _XtransConnFd *cf, *new;
-
-    new = malloc (sizeof (struct _XtransConnFd));
-    if (!new) {
-        /* XXX mark connection as broken */
-        close(fd);
-        return;
-    }
-    new->next = 0;
-    new->fd = fd;
-    new->do_close = do_close;
-    /* search to end of list */
-    for (; (cf = *prev); prev = &(cf->next));
-    *prev = new;
-}
-
-static int
-removeFd(struct _XtransConnFd **prev)
-{
-    struct _XtransConnFd *cf;
-    int fd;
-
-    if ((cf = *prev)) {
-        *prev = cf->next;
-        fd = cf->fd;
-        free(cf);
-    } else
-        fd = -1;
-    return fd;
-}
-
-static void
-discardFd(struct _XtransConnFd **prev, struct _XtransConnFd *upto, int do_close)
-{
-    struct _XtransConnFd *cf, *next;
-
-    for (cf = *prev; cf != upto; cf = next) {
-        next = cf->next;
-        if (do_close || cf->do_close)
-            close(cf->fd);
-        free(cf);
-    }
-    *prev = upto;
-}
-
-static void
-cleanupFds(XtransConnInfo ciptr)
-{
-    /* Clean up the send list but don't close the fds */
-    discardFd(&ciptr->send_fds, NULL, 0);
-    /* Clean up the recv list and *do* close the fds */
-    discardFd(&ciptr->recv_fds, NULL, 1);
-}
-
-static int
-nFd(struct _XtransConnFd **prev)
-{
-    struct _XtransConnFd *cf;
-    int n = 0;
-
-    for (cf = *prev; cf; cf = cf->next)
-        n++;
-    return n;
-}
-
-static int
-TRANS(SocketRecvFd) (XtransConnInfo ciptr)
-{
-    prmsg (2, "SocketRecvFd(%d)\n", ciptr->fd);
-    return removeFd(&ciptr->recv_fds);
-}
-
-static int
-TRANS(SocketSendFd) (XtransConnInfo ciptr, int fd, int do_close)
-{
-    appendFd(&ciptr->send_fds, fd, do_close);
-    return 0;
-}
-
-static int
-TRANS(SocketRecvFdInvalid)(XtransConnInfo ciptr)
-{
-    errno = EINVAL;
-    return -1;
-}
-
-static int
-TRANS(SocketSendFdInvalid)(XtransConnInfo ciptr, int fd, int do_close)
-{
-    errno = EINVAL;
-    return -1;
-}
-
-#define MAX_FDS		128
-
-union fd_pass {
-	struct cmsghdr	cmsghdr;
-	char		buf[CMSG_SPACE(MAX_FDS * sizeof(int))];
-};
-
-#endif /* XTRANS_SEND_FDS */
-
-static int
-TRANS(SocketRead) (XtransConnInfo ciptr, char *buf, int size)
-
-{
-    prmsg (2,"SocketRead(%d,%p,%d)\n", ciptr->fd, buf, size);
-
-#if defined(WIN32)
-    {
-	int ret = recv ((SOCKET)ciptr->fd, buf, size, 0);
-#ifdef WIN32
-	if (ret == SOCKET_ERROR) errno = WSAGetLastError();
-#endif
-	return ret;
-    }
-#else
-#if XTRANS_SEND_FDS
-    {
-        struct iovec    iov = {
-            .iov_base = buf,
-            .iov_len = size
-        };
-        union fd_pass   cmsgbuf;
-        struct msghdr   msg = {
-            .msg_name = NULL,
-            .msg_namelen = 0,
-            .msg_iov = &iov,
-            .msg_iovlen = 1,
-            .msg_control = cmsgbuf.buf,
-            .msg_controllen = CMSG_LEN(MAX_FDS * sizeof(int))
-        };
-
-        size = recvmsg(ciptr->fd, &msg, 0);
-        if (size >= 0) {
-            struct cmsghdr *hdr;
-
-            for (hdr = CMSG_FIRSTHDR(&msg); hdr; hdr = CMSG_NXTHDR(&msg, hdr)) {
-                if (hdr->cmsg_level == SOL_SOCKET && hdr->cmsg_type == SCM_RIGHTS) {
-                    int nfd = (hdr->cmsg_len - CMSG_LEN(0)) / sizeof (int);
-                    int i;
-                    int *fd = (int *) CMSG_DATA(hdr);
-
-                    for (i = 0; i < nfd; i++)
-                        appendFd(&ciptr->recv_fds, fd[i], 0);
-                }
-            }
-        }
-        return size;
-    }
-#else
-    return read(ciptr->fd, buf, size);
-#endif /* XTRANS_SEND_FDS */
-#endif /* WIN32 */
-}
-
-static int
-TRANS(SocketReadv) (XtransConnInfo ciptr, struct iovec *buf, int size)
-
-{
-    prmsg (2,"SocketReadv(%d,%p,%d)\n", ciptr->fd, buf, size);
-
-#if XTRANS_SEND_FDS
-    {
-        union fd_pass   cmsgbuf;
-        struct msghdr   msg = {
-            .msg_name = NULL,
-            .msg_namelen = 0,
-            .msg_iov = buf,
-            .msg_iovlen = size,
-            .msg_control = cmsgbuf.buf,
-            .msg_controllen = CMSG_LEN(MAX_FDS * sizeof(int))
-        };
-
-        size = recvmsg(ciptr->fd, &msg, 0);
-        if (size >= 0) {
-            struct cmsghdr *hdr;
-
-            for (hdr = CMSG_FIRSTHDR(&msg); hdr; hdr = CMSG_NXTHDR(&msg, hdr)) {
-                if (hdr->cmsg_level == SOL_SOCKET && hdr->cmsg_type == SCM_RIGHTS) {
-                    int nfd = (hdr->cmsg_len - CMSG_LEN(0)) / sizeof (int);
-                    int i;
-                    int *fd = (int *) CMSG_DATA(hdr);
-
-                    for (i = 0; i < nfd; i++)
-                        appendFd(&ciptr->recv_fds, fd[i], 0);
-                }
-            }
-        }
-        return size;
-    }
-#else
-    return READV (ciptr, buf, size);
-#endif
-}
-
-
-static int
-TRANS(SocketWritev) (XtransConnInfo ciptr, struct iovec *buf, int size)
-
-{
-    prmsg (2,"SocketWritev(%d,%p,%d)\n", ciptr->fd, buf, size);
-
-#if XTRANS_SEND_FDS
-    if (ciptr->send_fds)
-    {
-        union fd_pass           cmsgbuf;
-        int                     nfd = nFd(&ciptr->send_fds);
-        struct _XtransConnFd    *cf = ciptr->send_fds;
-        struct msghdr           msg = {
-            .msg_name = NULL,
-            .msg_namelen = 0,
-            .msg_iov = buf,
-            .msg_iovlen = size,
-            .msg_control = cmsgbuf.buf,
-            .msg_controllen = CMSG_LEN(nfd * sizeof(int))
-        };
-        struct cmsghdr          *hdr = CMSG_FIRSTHDR(&msg);
-        int                     i;
-        int                     *fds;
-
-        hdr->cmsg_len = msg.msg_controllen;
-        hdr->cmsg_level = SOL_SOCKET;
-        hdr->cmsg_type = SCM_RIGHTS;
-
-        fds = (int *) CMSG_DATA(hdr);
-        /* Set up fds */
-        for (i = 0; i < nfd; i++) {
-            fds[i] = cf->fd;
-            cf = cf->next;
-        }
-
-        i = sendmsg(ciptr->fd, &msg, 0);
-        if (i > 0)
-            discardFd(&ciptr->send_fds, cf, 0);
-        return i;
-    }
-#endif
-    return WRITEV (ciptr, buf, size);
-}
-
-
-static int
-TRANS(SocketWrite) (XtransConnInfo ciptr, char *buf, int size)
-
-{
-    prmsg (2,"SocketWrite(%d,%p,%d)\n", ciptr->fd, buf, size);
-
-#if defined(WIN32)
-    {
-	int ret = send ((SOCKET)ciptr->fd, buf, size, 0);
-#ifdef WIN32
-	if (ret == SOCKET_ERROR) errno = WSAGetLastError();
-#endif
-	return ret;
-    }
-#else
-#if XTRANS_SEND_FDS
-    if (ciptr->send_fds)
-    {
-        struct iovec            iov;
-
-        iov.iov_base = buf;
-        iov.iov_len = size;
-        return TRANS(SocketWritev)(ciptr, &iov, 1);
-    }
-#endif /* XTRANS_SEND_FDS */
-    return write (ciptr->fd, buf, size);
-#endif /* WIN32 */
-}
-
-static int
-TRANS(SocketDisconnect) (XtransConnInfo ciptr)
-
-{
-    prmsg (2,"SocketDisconnect(%p,%d)\n", ciptr, ciptr->fd);
-
-#ifdef WIN32
-    {
-	int ret = shutdown (ciptr->fd, 2);
-	if (ret == SOCKET_ERROR) errno = WSAGetLastError();
-	return ret;
-    }
-#else
-    return shutdown (ciptr->fd, 2); /* disallow further sends and receives */
-#endif
-}
-
-
-#ifdef TCPCONN
-static int
-TRANS(SocketINETClose) (XtransConnInfo ciptr)
-
-{
-    prmsg (2,"SocketINETClose(%p,%d)\n", ciptr, ciptr->fd);
-
-#ifdef WIN32
-    {
-	int ret = close (ciptr->fd);
-	if (ret == SOCKET_ERROR) errno = WSAGetLastError();
-	return ret;
-    }
-#else
-    return close (ciptr->fd);
-#endif
-}
-
-#endif /* TCPCONN */
-
-
-#ifdef UNIXCONN
-static int
-TRANS(SocketUNIXClose) (XtransConnInfo ciptr)
-{
-    /*
-     * If this is the server side, then once the socket is closed,
-     * it must be unlinked to completely close it
-     */
-
-    struct sockaddr_un	*sockname = (struct sockaddr_un *) ciptr->addr;
-    int ret;
-
-    prmsg (2,"SocketUNIXClose(%p,%d)\n", ciptr, ciptr->fd);
-
-#if XTRANS_SEND_FDS
-    cleanupFds(ciptr);
-#endif
-    ret = close(ciptr->fd);
-
-    if (ciptr->flags
-       && sockname
-       && sockname->sun_family == AF_UNIX
-       && sockname->sun_path[0])
-    {
-	if (!(ciptr->flags & TRANS_NOUNLINK
-	    || ciptr->transptr->flags & TRANS_ABSTRACT))
-		unlink (sockname->sun_path);
-    }
-
-    return ret;
-}
-
-static int
-TRANS(SocketUNIXCloseForCloning) (XtransConnInfo ciptr)
-
-{
-    /*
-     * Don't unlink path.
-     */
-
-    int ret;
-
-    prmsg (2,"SocketUNIXCloseForCloning(%p,%d)\n",
-	ciptr, ciptr->fd);
-
-#if XTRANS_SEND_FDS
-    cleanupFds(ciptr);
-#endif
-    ret = close(ciptr->fd);
-
-    return ret;
-}
-
-#endif /* UNIXCONN */
-
-
-#ifdef TCPCONN
-# ifdef TRANS_SERVER
-static const char* tcp_nolisten[] = {
-	"inet",
-#if defined(IPv6) && defined(AF_INET6)
-	"inet6",
-#endif
-	NULL
-};
-# endif
-
-Xtransport	TRANS(SocketTCPFuncs) = {
-	/* Socket Interface */
-	"tcp",
-        TRANS_ALIAS,
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCOTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	tcp_nolisten,
-	TRANS(SocketOpenCOTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-	TRANS(SocketReopenCOTSServer),
-	TRANS(SocketReopenCLTSServer),
-#endif
-	TRANS(SocketSetOption),
-#ifdef TRANS_SERVER
-	TRANS(SocketINETCreateListener),
-	NULL,		       			/* ResetListener */
-	TRANS(SocketINETAccept),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketINETConnect),
-#endif /* TRANS_CLIENT */
-	TRANS(SocketBytesReadable),
-	TRANS(SocketRead),
-	TRANS(SocketWrite),
-	TRANS(SocketReadv),
-	TRANS(SocketWritev),
-#if XTRANS_SEND_FDS
-        TRANS(SocketSendFdInvalid),
-        TRANS(SocketRecvFdInvalid),
-#endif
-	TRANS(SocketDisconnect),
-	TRANS(SocketINETClose),
-	TRANS(SocketINETClose),
-	};
-
-Xtransport	TRANS(SocketINETFuncs) = {
-	/* Socket Interface */
-	"inet",
-	0,
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCOTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	NULL,
-	TRANS(SocketOpenCOTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-	TRANS(SocketReopenCOTSServer),
-	TRANS(SocketReopenCLTSServer),
-#endif
-	TRANS(SocketSetOption),
-#ifdef TRANS_SERVER
-	TRANS(SocketINETCreateListener),
-	NULL,		       			/* ResetListener */
-	TRANS(SocketINETAccept),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketINETConnect),
-#endif /* TRANS_CLIENT */
-	TRANS(SocketBytesReadable),
-	TRANS(SocketRead),
-	TRANS(SocketWrite),
-	TRANS(SocketReadv),
-	TRANS(SocketWritev),
-#if XTRANS_SEND_FDS
-        TRANS(SocketSendFdInvalid),
-        TRANS(SocketRecvFdInvalid),
-#endif
-	TRANS(SocketDisconnect),
-	TRANS(SocketINETClose),
-	TRANS(SocketINETClose),
-	};
-
-#if defined(IPv6) && defined(AF_INET6)
-Xtransport     TRANS(SocketINET6Funcs) = {
-	/* Socket Interface */
-	"inet6",
-	0,
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCOTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	NULL,
-	TRANS(SocketOpenCOTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-	TRANS(SocketReopenCOTSServer),
-	TRANS(SocketReopenCLTSServer),
-#endif
-	TRANS(SocketSetOption),
-#ifdef TRANS_SERVER
-	TRANS(SocketINETCreateListener),
-	NULL,					/* ResetListener */
-	TRANS(SocketINETAccept),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketINETConnect),
-#endif /* TRANS_CLIENT */
-	TRANS(SocketBytesReadable),
-	TRANS(SocketRead),
-	TRANS(SocketWrite),
-	TRANS(SocketReadv),
-	TRANS(SocketWritev),
-#if XTRANS_SEND_FDS
-        TRANS(SocketSendFdInvalid),
-        TRANS(SocketRecvFdInvalid),
-#endif
-	TRANS(SocketDisconnect),
-	TRANS(SocketINETClose),
-	TRANS(SocketINETClose),
-	};
-#endif /* IPv6 */
-#endif /* TCPCONN */
-
-#ifdef UNIXCONN
-#if !defined(LOCALCONN)
-Xtransport	TRANS(SocketLocalFuncs) = {
-	/* Socket Interface */
-	"local",
-#ifdef HAVE_ABSTRACT_SOCKETS
-	TRANS_ABSTRACT,
-#else
-	0,
-#endif
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCOTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	NULL,
-	TRANS(SocketOpenCOTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-	TRANS(SocketReopenCOTSServer),
-	TRANS(SocketReopenCLTSServer),
-#endif
-	TRANS(SocketSetOption),
-#ifdef TRANS_SERVER
-	TRANS(SocketUNIXCreateListener),
-	TRANS(SocketUNIXResetListener),
-	TRANS(SocketUNIXAccept),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketUNIXConnect),
-#endif /* TRANS_CLIENT */
-	TRANS(SocketBytesReadable),
-	TRANS(SocketRead),
-	TRANS(SocketWrite),
-	TRANS(SocketReadv),
-	TRANS(SocketWritev),
-#if XTRANS_SEND_FDS
-        TRANS(SocketSendFd),
-        TRANS(SocketRecvFd),
-#endif
-	TRANS(SocketDisconnect),
-	TRANS(SocketUNIXClose),
-	TRANS(SocketUNIXCloseForCloning),
-	};
-#endif /* !LOCALCONN */
-# ifdef TRANS_SERVER
-#  if !defined(LOCALCONN)
-static const char* unix_nolisten[] = { "local" , NULL };
-#  endif
-# endif
-
-Xtransport	TRANS(SocketUNIXFuncs) = {
-	/* Socket Interface */
-	"unix",
-#if !defined(LOCALCONN) && !defined(HAVE_ABSTRACT_SOCKETS)
-        TRANS_ALIAS,
-#else
-	0,
-#endif
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCOTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-#if !defined(LOCALCONN)
-	unix_nolisten,
-#else
-	NULL,
-#endif
-	TRANS(SocketOpenCOTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_REOPEN
-	TRANS(SocketReopenCOTSServer),
-	TRANS(SocketReopenCLTSServer),
-#endif
-	TRANS(SocketSetOption),
-#ifdef TRANS_SERVER
-	TRANS(SocketUNIXCreateListener),
-	TRANS(SocketUNIXResetListener),
-	TRANS(SocketUNIXAccept),
-#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketUNIXConnect),
-#endif /* TRANS_CLIENT */
-	TRANS(SocketBytesReadable),
-	TRANS(SocketRead),
-	TRANS(SocketWrite),
-	TRANS(SocketReadv),
-	TRANS(SocketWritev),
-#if XTRANS_SEND_FDS
-        TRANS(SocketSendFd),
-        TRANS(SocketRecvFd),
-#endif
-	TRANS(SocketDisconnect),
-	TRANS(SocketUNIXClose),
-	TRANS(SocketUNIXCloseForCloning),
-	};
-
-#endif /* UNIXCONN */
diff --git a/openflow/usr/include/X11/Xtrans/Xtransutil.c b/openflow/usr/include/X11/Xtrans/Xtransutil.c
deleted file mode 100644
index 63f0fc3..0000000
--- a/openflow/usr/include/X11/Xtrans/Xtransutil.c
+++ /dev/null
@@ -1,637 +0,0 @@
-/*
-
-Copyright 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
- * Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name NCR not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  NCR makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * NCRS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NCR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * These are some utility functions created for convenience or to provide
- * an interface that is similar to an existing interface. These are built
- * only using the Transport Independant API, and have no knowledge of
- * the internal implementation.
- */
-
-#ifdef XTHREADS
-#include <X11/Xthreads.h>
-#endif
-#ifdef WIN32
-#include <X11/Xlibint.h>
-#include <X11/Xwinsock.h>
-#endif
-
-#ifdef X11_t
-
-/*
- * These values come from X.h and Xauth.h, and MUST match them. Some
- * of these values are also defined by the ChangeHost protocol message.
- */
-
-#define FamilyInternet		0	/* IPv4 */
-#define FamilyDECnet		1
-#define FamilyChaos		2
-#define FamilyInternet6		6
-#define FamilyAmoeba		33
-#define FamilyLocalHost		252
-#define FamilyKrb5Principal	253
-#define FamilyNetname		254
-#define FamilyLocal		256
-#define FamilyWild		65535
-
-/*
- * TRANS(ConvertAddress) converts a sockaddr based address to an
- * X authorization based address. Some of this is defined as part of
- * the ChangeHost protocol. The rest is just done in a consistent manner.
- */
-
-int
-TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp)
-
-{
-
-    prmsg(2,"ConvertAddress(%d,%d,%p)\n",*familyp,*addrlenp,*addrp);
-
-    switch( *familyp )
-    {
-#if defined(TCPCONN)
-    case AF_INET:
-    {
-	/*
-	 * Check for the BSD hack localhost address 127.0.0.1.
-	 * In this case, we are really FamilyLocal.
-	 */
-
-	struct sockaddr_in saddr;
-	int len = sizeof(saddr.sin_addr.s_addr);
-	char *cp = (char *) &saddr.sin_addr.s_addr;
-
-	memcpy (&saddr, *addrp, sizeof (struct sockaddr_in));
-
-	if ((len == 4) && (cp[0] == 127) && (cp[1] == 0) &&
-	    (cp[2] == 0) && (cp[3] == 1))
-	{
-	    *familyp=FamilyLocal;
-	}
-	else
-	{
-	    *familyp=FamilyInternet;
-	    *addrlenp=len;
-	    memcpy(*addrp,&saddr.sin_addr,len);
-	}
-	break;
-    }
-
-#if defined(IPv6) && defined(AF_INET6)
-    case AF_INET6:
-    {
-	struct sockaddr_in6 saddr6;
-
-	memcpy (&saddr6, *addrp, sizeof (struct sockaddr_in6));
-
-	if (IN6_IS_ADDR_LOOPBACK(&saddr6.sin6_addr))
-	{
-	    *familyp=FamilyLocal;
-	}
-	else if (IN6_IS_ADDR_V4MAPPED(&(saddr6.sin6_addr))) {
-	    char *cp = (char *) &saddr6.sin6_addr.s6_addr[12];
-
-	    if ((cp[0] == 127) && (cp[1] == 0) &&
-	      (cp[2] == 0) && (cp[3] == 1))
-	    {
-		*familyp=FamilyLocal;
-	    }
-	    else
-	    {
-		*familyp=FamilyInternet;
-		*addrlenp = sizeof (struct in_addr);
-		memcpy(*addrp,cp,*addrlenp);
-	    }
-	}
-	else
-	{
-	    *familyp=FamilyInternet6;
-	    *addrlenp=sizeof(saddr6.sin6_addr);
-	    memcpy(*addrp,&saddr6.sin6_addr,sizeof(saddr6.sin6_addr));
-	}
-	break;
-    }
-#endif /* IPv6 */
-#endif /* defined(TCPCONN) */
-
-
-#if defined(UNIXCONN) || defined(LOCALCONN)
-    case AF_UNIX:
-    {
-	*familyp=FamilyLocal;
-	break;
-    }
-#endif /* defined(UNIXCONN) || defined(LOCALCONN) */
-
-#if (defined(__SCO__) || defined(__UNIXWARE__)) && defined(LOCALCONN)
-    case 0:
-    {
-	*familyp=FamilyLocal;
-	break;
-    }
-#endif
-
-    default:
-	prmsg(1,"ConvertAddress: Unknown family type %d\n",
-	      *familyp);
-	return -1;
-    }
-
-
-    if (*familyp == FamilyLocal)
-    {
-	/*
-	 * In the case of a local connection, we need to get the
-	 * host name for authentication.
-	 */
-
-	char hostnamebuf[256];
-	int len = TRANS(GetHostname) (hostnamebuf, sizeof hostnamebuf);
-
-	if (len > 0) {
-	    if (*addrp && *addrlenp < (len + 1))
-	    {
-		free (*addrp);
-		*addrp = NULL;
-	    }
-	    if (!*addrp)
-		*addrp = malloc (len + 1);
-	    if (*addrp) {
-		strcpy ((char *) *addrp, hostnamebuf);
-		*addrlenp = len;
-	    } else {
-		*addrlenp = 0;
-	    }
-	}
-	else
-	{
-	    if (*addrp)
-		free (*addrp);
-	    *addrp = NULL;
-	    *addrlenp = 0;
-	}
-    }
-
-    return 0;
-}
-
-#endif /* X11_t */
-
-#ifdef ICE_t
-
-/* Needed for _XGethostbyaddr usage in TRANS(GetPeerNetworkId) */
-# if defined(TCPCONN) || defined(UNIXCONN)
-#  define X_INCLUDE_NETDB_H
-#  define XOS_USE_NO_LOCKING
-#  include <X11/Xos_r.h>
-# endif
-
-#include <signal.h>
-
-char *
-TRANS(GetMyNetworkId) (XtransConnInfo ciptr)
-
-{
-    int		family = ciptr->family;
-    char 	*addr = ciptr->addr;
-    char	hostnamebuf[256];
-    char 	*networkId = NULL;
-    const char	*transName = ciptr->transptr->TransName;
-
-    if (gethostname (hostnamebuf, sizeof (hostnamebuf)) < 0)
-    {
-	return (NULL);
-    }
-
-    switch (family)
-    {
-#if defined(UNIXCONN) || defined(LOCALCONN)
-    case AF_UNIX:
-    {
-	struct sockaddr_un *saddr = (struct sockaddr_un *) addr;
-	networkId = malloc (3 + strlen (transName) +
-	    strlen (hostnamebuf) + strlen (saddr->sun_path));
-	sprintf (networkId, "%s/%s:%s", transName,
-	    hostnamebuf, saddr->sun_path);
-	break;
-    }
-#endif /* defined(UNIXCONN) || defined(LOCALCONN) */
-
-#if defined(TCPCONN)
-    case AF_INET:
-#if defined(IPv6) && defined(AF_INET6)
-    case AF_INET6:
-#endif
-    {
-	struct sockaddr_in *saddr = (struct sockaddr_in *) addr;
-#if defined(IPv6) && defined(AF_INET6)
-	struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *) addr;
-#endif
-	int portnum;
-	char portnumbuf[10];
-
-
-#if defined(IPv6) && defined(AF_INET6)
-	if (family == AF_INET6)
-	    portnum = ntohs (saddr6->sin6_port);
-	else
-#endif
-	    portnum = ntohs (saddr->sin_port);
-
-	snprintf (portnumbuf, sizeof(portnumbuf), "%d", portnum);
-	networkId = malloc (3 + strlen (transName) +
-	    strlen (hostnamebuf) + strlen (portnumbuf));
-	sprintf (networkId, "%s/%s:%s", transName, hostnamebuf, portnumbuf);
-	break;
-    }
-#endif /* defined(TCPCONN) */
-
-
-    default:
-	break;
-    }
-
-    return (networkId);
-}
-
-#include <setjmp.h>
-static jmp_buf env;
-
-#ifdef SIGALRM
-static volatile int nameserver_timedout = 0;
-
-static void
-nameserver_lost(int sig _X_UNUSED)
-{
-  nameserver_timedout = 1;
-  longjmp (env, -1);
-  /* NOTREACHED */
-}
-#endif /* SIGALARM */
-
-
-char *
-TRANS(GetPeerNetworkId) (XtransConnInfo ciptr)
-
-{
-    int		family = ciptr->family;
-    char	*peer_addr = ciptr->peeraddr;
-    char	*hostname;
-    char	addrbuf[256];
-    const char	*addr = NULL;
-
-    switch (family)
-    {
-    case AF_UNSPEC:
-#if defined(UNIXCONN) || defined(LOCALCONN)
-    case AF_UNIX:
-    {
-	if (gethostname (addrbuf, sizeof (addrbuf)) == 0)
-	    addr = addrbuf;
-	break;
-    }
-#endif /* defined(UNIXCONN) || defined(LOCALCONN) */
-
-#if defined(TCPCONN)
-    case AF_INET:
-#if defined(IPv6) && defined(AF_INET6)
-    case AF_INET6:
-#endif
-    {
-	struct sockaddr_in *saddr = (struct sockaddr_in *) peer_addr;
-#if defined(IPv6) && defined(AF_INET6)
-	struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *) peer_addr;
-#endif
-	char *address;
-	int addresslen;
-#ifdef XTHREADS_NEEDS_BYNAMEPARAMS
-	_Xgethostbynameparams hparams;
-#endif
-	struct hostent * volatile hostp = NULL;
-
-#if defined(IPv6) && defined(AF_INET6)
-	if (family == AF_INET6)
-	{
-	    address = (char *) &saddr6->sin6_addr;
-	    addresslen = sizeof (saddr6->sin6_addr);
-	}
-	else
-#endif
-	{
-	    address = (char *) &saddr->sin_addr;
-	    addresslen = sizeof (saddr->sin_addr);
-	}
-
-#ifdef SIGALRM
-	/*
-	 * gethostbyaddr can take a LONG time if the host does not exist.
-	 * Assume that if it does not respond in NAMESERVER_TIMEOUT seconds
-	 * that something is wrong and do not make the user wait.
-	 * gethostbyaddr will continue after a signal, so we have to
-	 * jump out of it.
-	 */
-
-	nameserver_timedout = 0;
-	signal (SIGALRM, nameserver_lost);
-	alarm (4);
-	if (setjmp(env) == 0) {
-#endif
-	    hostp = _XGethostbyaddr (address, addresslen, family, hparams);
-#ifdef SIGALRM
-	}
-	alarm (0);
-#endif
-	if (hostp != NULL)
-	  addr = hostp->h_name;
-	else
-#if defined(IPv6) && defined(AF_INET6)
-	  addr = inet_ntop (family, address, addrbuf, sizeof (addrbuf));
-#else
-	  addr = inet_ntoa (saddr->sin_addr);
-#endif
-	break;
-    }
-
-#endif /* defined(TCPCONN) */
-
-
-    default:
-	return (NULL);
-    }
-
-
-    hostname = malloc (strlen (ciptr->transptr->TransName) + strlen (addr) + 2);
-    strcpy (hostname, ciptr->transptr->TransName);
-    strcat (hostname, "/");
-    if (addr)
-	strcat (hostname, addr);
-
-    return (hostname);
-}
-
-#endif /* ICE_t */
-
-
-#if defined(WIN32) && defined(TCPCONN)
-int
-TRANS(WSAStartup) (void)
-{
-    static WSADATA wsadata;
-
-    prmsg (2,"WSAStartup()\n");
-
-    if (!wsadata.wVersion && WSAStartup(MAKEWORD(2,2), &wsadata))
-        return 1;
-    return 0;
-}
-#endif
-
-#include <ctype.h>
-
-static int
-is_numeric (const char *str)
-{
-    int i;
-
-    for (i = 0; i < (int) strlen (str); i++)
-	if (!isdigit (str[i]))
-	    return (0);
-
-    return (1);
-}
-
-#ifdef TRANS_SERVER
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#if !defined(S_IFLNK) && !defined(S_ISLNK)
-#undef lstat
-#define lstat(a,b) stat(a,b)
-#endif
-
-#define FAIL_IF_NOMODE  1
-#define FAIL_IF_NOT_ROOT 2
-#define WARN_NO_ACCESS 4
-
-/*
- * We make the assumption that when the 'sticky' (t) bit is requested
- * it's not save if the directory has non-root ownership or the sticky
- * bit cannot be set and fail.
- */
-static int
-trans_mkdir(const char *path, int mode)
-{
-    struct stat buf;
-
-    if (lstat(path, &buf) != 0) {
-	if (errno != ENOENT) {
-	    prmsg(1, "mkdir: ERROR: (l)stat failed for %s (%d)\n",
-		  path, errno);
-	    return -1;
-	}
-	/* Dir doesn't exist. Try to create it */
-
-#if !defined(WIN32) && !defined(__CYGWIN__)
-	/*
-	 * 'sticky' bit requested: assume application makes
-	 * certain security implications. If effective user ID
-	 * is != 0: fail as we may not be able to meet them.
-	 */
-	if (geteuid() != 0) {
-	    if (mode & 01000) {
-		prmsg(1, "mkdir: ERROR: euid != 0,"
-		      "directory %s will not be created.\n",
-		      path);
-#ifdef FAIL_HARD
-		return -1;
-#endif
-	    } else {
-		prmsg(1, "mkdir: Cannot create %s with root ownership\n",
-		      path);
-	    }
-	}
-#endif
-
-#ifndef WIN32
-	if (mkdir(path, mode) == 0) {
-	    if (chmod(path, mode)) {
-		prmsg(1, "mkdir: ERROR: Mode of %s should be set to %04o\n",
-		      path, mode);
-#ifdef FAIL_HARD
-		return -1;
-#endif
-	    }
-#else
-	if (mkdir(path) == 0) {
-#endif
-	} else {
-	    prmsg(1, "mkdir: ERROR: Cannot create %s\n",
-		  path);
-	    return -1;
-	}
-
-	return 0;
-
-    } else {
-	if (S_ISDIR(buf.st_mode)) {
-	    int updateOwner = 0;
-	    int updateMode = 0;
-	    int updatedOwner = 0;
-	    int updatedMode = 0;
-	    int status = 0;
-	    /* Check if the directory's ownership is OK. */
-	    if (buf.st_uid != 0)
-		updateOwner = 1;
-
-	    /*
-	     * Check if the directory's mode is OK.  An exact match isn't
-	     * required, just a mode that isn't more permissive than the
-	     * one requested.
-	     */
-	    if ((~mode) & 0077 & buf.st_mode)
-		updateMode = 1;
-
-	    /*
-	     * If the directory is not writeable not everybody may
-	     * be able to create sockets. Therefore warn if mode
-	     * cannot be fixed.
-	     */
-	    if ((~buf.st_mode) & 0022 & mode) {
-		updateMode = 1;
-		status |= WARN_NO_ACCESS;
-	    }
-
-	    /*
-	     * If 'sticky' bit is requested fail if owner isn't root
-	     * as we assume the caller makes certain security implications
-	     */
-	    if (mode & 01000) {
-		status |= FAIL_IF_NOT_ROOT;
-		if (!(buf.st_mode & 01000)) {
-		    status |= FAIL_IF_NOMODE;
-		    updateMode = 1;
-		}
-	    }
-
-#ifdef HAS_FCHOWN
-	    /*
-	     * If fchown(2) and fchmod(2) are available, try to correct the
-	     * directory's owner and mode.  Otherwise it isn't safe to attempt
-	     * to do this.
-	     */
-	    if (updateMode || updateOwner) {
-		int fd = -1;
-		struct stat fbuf;
-		if ((fd = open(path, O_RDONLY)) != -1) {
-		    if (fstat(fd, &fbuf) == -1) {
-			prmsg(1, "mkdir: ERROR: fstat failed for %s (%d)\n",
-			      path, errno);
-			close(fd);
-			return -1;
-		    }
-		    /*
-		     * Verify that we've opened the same directory as was
-		     * checked above.
-		     */
-		    if (!S_ISDIR(fbuf.st_mode) ||
-			buf.st_dev != fbuf.st_dev ||
-			buf.st_ino != fbuf.st_ino) {
-			prmsg(1, "mkdir: ERROR: inode for %s changed\n",
-			      path);
-			close(fd);
-			return -1;
-		    }
-		    if (updateOwner && fchown(fd, 0, 0) == 0)
-			updatedOwner = 1;
-		    if (updateMode && fchmod(fd, mode) == 0)
-			updatedMode = 1;
-		    close(fd);
-		}
-	    }
-#endif
-
-	    if (updateOwner && !updatedOwner) {
-#ifdef FAIL_HARD
-		if (status & FAIL_IF_NOT_ROOT) {
-		    prmsg(1, "mkdir: ERROR: Owner of %s must be set to root\n",
-			  path);
-		    return -1;
-		}
-#endif
-#if !defined(__APPLE_CC__) && !defined(__CYGWIN__)
-		prmsg(1, "mkdir: Owner of %s should be set to root\n",
-		      path);
-#endif
-	    }
-
-	    if (updateMode && !updatedMode) {
-#ifdef FAIL_HARD
-		if (status & FAIL_IF_NOMODE) {
-		    prmsg(1, "mkdir: ERROR: Mode of %s must be set to %04o\n",
-			  path, mode);
-		    return -1;
-		}
-#endif
-		prmsg(1, "mkdir: Mode of %s should be set to %04o\n",
-		      path, mode);
-		if (status & WARN_NO_ACCESS) {
-		    prmsg(1, "mkdir: this may cause subsequent errors\n");
-		}
-	    }
-	    return 0;
-	}
-	return -1;
-    }
-
-    /* In all other cases, fail */
-    return -1;
-}
-
-#endif /* TRANS_SERVER */
diff --git a/openflow/usr/include/X11/Xtrans/transport.c b/openflow/usr/include/X11/Xtrans/transport.c
deleted file mode 100644
index b62fc7b..0000000
--- a/openflow/usr/include/X11/Xtrans/transport.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-
-Copyright 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
- * Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name NCR not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  NCR makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * NCR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NCR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdlib.h>
-
-#define XTRANS_TRANSPORT_C  /* used to flag Xtransint.h that it's being used
-			       here, not just #included in another file */
-
-#include "Xtransint.h"
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wformat-nonliteral"
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
-#ifdef LOCALCONN
-#include "Xtranslcl.c"
-#endif
-#if defined(TCPCONN) || defined(UNIXCONN)
-#include "Xtranssock.c"
-#endif
-#include "Xtrans.c"
-#include "Xtransutil.c"
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
diff --git a/openflow/usr/include/X11/Xutil.h b/openflow/usr/include/X11/Xutil.h
deleted file mode 100644
index 62cdf55..0000000
--- a/openflow/usr/include/X11/Xutil.h
+++ /dev/null
@@ -1,838 +0,0 @@
-
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _X11_XUTIL_H_
-#define _X11_XUTIL_H_
-
-/* You must include <X11/Xlib.h> before including this file */
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-
-/* The Xlib structs are full of implicit padding to properly align members.
-   We can't clean that up without breaking ABI, so tell clang not to bother
-   complaining about it. */
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-/*
- * Bitmask returned by XParseGeometry().  Each bit tells if the corresponding
- * value (x, y, width, height) was found in the parsed string.
- */
-#define NoValue		0x0000
-#define XValue  	0x0001
-#define YValue		0x0002
-#define WidthValue  	0x0004
-#define HeightValue  	0x0008
-#define AllValues 	0x000F
-#define XNegative 	0x0010
-#define YNegative 	0x0020
-
-/*
- * new version containing base_width, base_height, and win_gravity fields;
- * used with WM_NORMAL_HINTS.
- */
-typedef struct {
-    	long flags;	/* marks which fields in this structure are defined */
-	int x, y;		/* obsolete for new window mgrs, but clients */
-	int width, height;	/* should set so old wm's don't mess up */
-	int min_width, min_height;
-	int max_width, max_height;
-    	int width_inc, height_inc;
-	struct {
-		int x;	/* numerator */
-		int y;	/* denominator */
-	} min_aspect, max_aspect;
-	int base_width, base_height;		/* added by ICCCM version 1 */
-	int win_gravity;			/* added by ICCCM version 1 */
-} XSizeHints;
-
-/*
- * The next block of definitions are for window manager properties that
- * clients and applications use for communication.
- */
-
-/* flags argument in size hints */
-#define USPosition	(1L << 0) /* user specified x, y */
-#define USSize		(1L << 1) /* user specified width, height */
-
-#define PPosition	(1L << 2) /* program specified position */
-#define PSize		(1L << 3) /* program specified size */
-#define PMinSize	(1L << 4) /* program specified minimum size */
-#define PMaxSize	(1L << 5) /* program specified maximum size */
-#define PResizeInc	(1L << 6) /* program specified resize increments */
-#define PAspect		(1L << 7) /* program specified min and max aspect ratios */
-#define PBaseSize	(1L << 8) /* program specified base for incrementing */
-#define PWinGravity	(1L << 9) /* program specified window gravity */
-
-/* obsolete */
-#define PAllHints (PPosition|PSize|PMinSize|PMaxSize|PResizeInc|PAspect)
-
-
-
-typedef struct {
-	long flags;	/* marks which fields in this structure are defined */
-	Bool input;	/* does this application rely on the window manager to
-			get keyboard input? */
-	int initial_state;	/* see below */
-	Pixmap icon_pixmap;	/* pixmap to be used as icon */
-	Window icon_window; 	/* window to be used as icon */
-	int icon_x, icon_y; 	/* initial position of icon */
-	Pixmap icon_mask;	/* icon mask bitmap */
-	XID window_group;	/* id of related window group */
-	/* this structure may be extended in the future */
-} XWMHints;
-
-/* definition for flags of XWMHints */
-
-#define InputHint 		(1L << 0)
-#define StateHint 		(1L << 1)
-#define IconPixmapHint		(1L << 2)
-#define IconWindowHint		(1L << 3)
-#define IconPositionHint 	(1L << 4)
-#define IconMaskHint		(1L << 5)
-#define WindowGroupHint		(1L << 6)
-#define AllHints (InputHint|StateHint|IconPixmapHint|IconWindowHint| \
-IconPositionHint|IconMaskHint|WindowGroupHint)
-#define XUrgencyHint		(1L << 8)
-
-/* definitions for initial window state */
-#define WithdrawnState 0	/* for windows that are not mapped */
-#define NormalState 1	/* most applications want to start this way */
-#define IconicState 3	/* application wants to start as an icon */
-
-/*
- * Obsolete states no longer defined by ICCCM
- */
-#define DontCareState 0	/* don't know or care */
-#define ZoomState 2	/* application wants to start zoomed */
-#define InactiveState 4	/* application believes it is seldom used; */
-			/* some wm's may put it on inactive menu */
-
-
-/*
- * new structure for manipulating TEXT properties; used with WM_NAME,
- * WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND.
- */
-typedef struct {
-    unsigned char *value;		/* same as Property routines */
-    Atom encoding;			/* prop type */
-    int format;				/* prop data format: 8, 16, or 32 */
-    unsigned long nitems;		/* number of data items in value */
-} XTextProperty;
-
-#define XNoMemory -1
-#define XLocaleNotSupported -2
-#define XConverterNotFound -3
-
-typedef enum {
-    XStringStyle,		/* STRING */
-    XCompoundTextStyle,		/* COMPOUND_TEXT */
-    XTextStyle,			/* text in owner's encoding (current locale)*/
-    XStdICCTextStyle,		/* STRING, else COMPOUND_TEXT */
-    /* The following is an XFree86 extension, introduced in November 2000 */
-    XUTF8StringStyle		/* UTF8_STRING */
-} XICCEncodingStyle;
-
-typedef struct {
-	int min_width, min_height;
-	int max_width, max_height;
-	int width_inc, height_inc;
-} XIconSize;
-
-typedef struct {
-	char *res_name;
-	char *res_class;
-} XClassHint;
-
-#ifdef XUTIL_DEFINE_FUNCTIONS
-extern int XDestroyImage(
-        XImage *ximage);
-extern unsigned long XGetPixel(
-        XImage *ximage,
-        int x, int y);
-extern int XPutPixel(
-        XImage *ximage,
-        int x, int y,
-        unsigned long pixel);
-extern XImage *XSubImage(
-        XImage *ximage,
-        int x, int y,
-        unsigned int width, unsigned int height);
-extern int XAddPixel(
-        XImage *ximage,
-        long value);
-#else
-/*
- * These macros are used to give some sugar to the image routines so that
- * naive people are more comfortable with them.
- */
-#define XDestroyImage(ximage) \
-	((*((ximage)->f.destroy_image))((ximage)))
-#define XGetPixel(ximage, x, y) \
-	((*((ximage)->f.get_pixel))((ximage), (x), (y)))
-#define XPutPixel(ximage, x, y, pixel) \
-	((*((ximage)->f.put_pixel))((ximage), (x), (y), (pixel)))
-#define XSubImage(ximage, x, y, width, height)  \
-	((*((ximage)->f.sub_image))((ximage), (x), (y), (width), (height)))
-#define XAddPixel(ximage, value) \
-	((*((ximage)->f.add_pixel))((ximage), (value)))
-#endif
-
-/*
- * Compose sequence status structure, used in calling XLookupString.
- */
-typedef struct _XComposeStatus {
-    XPointer compose_ptr;	/* state table pointer */
-    int chars_matched;		/* match state */
-} XComposeStatus;
-
-/*
- * Keysym macros, used on Keysyms to test for classes of symbols
- */
-#define IsKeypadKey(keysym) \
-  (((KeySym)(keysym) >= XK_KP_Space) && ((KeySym)(keysym) <= XK_KP_Equal))
-
-#define IsPrivateKeypadKey(keysym) \
-  (((KeySym)(keysym) >= 0x11000000) && ((KeySym)(keysym) <= 0x1100FFFF))
-
-#define IsCursorKey(keysym) \
-  (((KeySym)(keysym) >= XK_Home)     && ((KeySym)(keysym) <  XK_Select))
-
-#define IsPFKey(keysym) \
-  (((KeySym)(keysym) >= XK_KP_F1)     && ((KeySym)(keysym) <= XK_KP_F4))
-
-#define IsFunctionKey(keysym) \
-  (((KeySym)(keysym) >= XK_F1)       && ((KeySym)(keysym) <= XK_F35))
-
-#define IsMiscFunctionKey(keysym) \
-  (((KeySym)(keysym) >= XK_Select)   && ((KeySym)(keysym) <= XK_Break))
-
-#ifdef XK_XKB_KEYS
-#define IsModifierKey(keysym) \
-  ((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \
-   || (((KeySym)(keysym) >= XK_ISO_Lock) && \
-       ((KeySym)(keysym) <= XK_ISO_Level5_Lock)) \
-   || ((KeySym)(keysym) == XK_Mode_switch) \
-   || ((KeySym)(keysym) == XK_Num_Lock))
-#else
-#define IsModifierKey(keysym) \
-  ((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \
-   || ((KeySym)(keysym) == XK_Mode_switch) \
-   || ((KeySym)(keysym) == XK_Num_Lock))
-#endif
-/*
- * opaque reference to Region data type
- */
-typedef struct _XRegion *Region;
-
-/* Return values from XRectInRegion() */
-
-#define RectangleOut 0
-#define RectangleIn  1
-#define RectanglePart 2
-
-
-/*
- * Information used by the visual utility routines to find desired visual
- * type from the many visuals a display may support.
- */
-
-typedef struct {
-  Visual *visual;
-  VisualID visualid;
-  int screen;
-  int depth;
-#if defined(__cplusplus) || defined(c_plusplus)
-  int c_class;					/* C++ */
-#else
-  int class;
-#endif
-  unsigned long red_mask;
-  unsigned long green_mask;
-  unsigned long blue_mask;
-  int colormap_size;
-  int bits_per_rgb;
-} XVisualInfo;
-
-#define VisualNoMask		0x0
-#define VisualIDMask 		0x1
-#define VisualScreenMask	0x2
-#define VisualDepthMask		0x4
-#define VisualClassMask		0x8
-#define VisualRedMaskMask	0x10
-#define VisualGreenMaskMask	0x20
-#define VisualBlueMaskMask	0x40
-#define VisualColormapSizeMask	0x80
-#define VisualBitsPerRGBMask	0x100
-#define VisualAllMask		0x1FF
-
-/*
- * This defines a window manager property that clients may use to
- * share standard color maps of type RGB_COLOR_MAP:
- */
-typedef struct {
-	Colormap colormap;
-	unsigned long red_max;
-	unsigned long red_mult;
-	unsigned long green_max;
-	unsigned long green_mult;
-	unsigned long blue_max;
-	unsigned long blue_mult;
-	unsigned long base_pixel;
-	VisualID visualid;		/* added by ICCCM version 1 */
-	XID killid;			/* added by ICCCM version 1 */
-} XStandardColormap;
-
-#define ReleaseByFreeingColormap ((XID) 1L)  /* for killid field above */
-
-
-/*
- * return codes for XReadBitmapFile and XWriteBitmapFile
- */
-#define BitmapSuccess		0
-#define BitmapOpenFailed 	1
-#define BitmapFileInvalid 	2
-#define BitmapNoMemory		3
-
-/****************************************************************
- *
- * Context Management
- *
- ****************************************************************/
-
-
-/* Associative lookup table return codes */
-
-#define XCSUCCESS 0	/* No error. */
-#define XCNOMEM   1    /* Out of memory */
-#define XCNOENT   2    /* No entry in table */
-
-typedef int XContext;
-
-#define XUniqueContext()       ((XContext) XrmUniqueQuark())
-#define XStringToContext(string)   ((XContext) XrmStringToQuark(string))
-
-_XFUNCPROTOBEGIN
-
-/* The following declarations are alphabetized. */
-
-extern XClassHint *XAllocClassHint (
-    void
-);
-
-extern XIconSize *XAllocIconSize (
-    void
-);
-
-extern XSizeHints *XAllocSizeHints (
-    void
-);
-
-extern XStandardColormap *XAllocStandardColormap (
-    void
-);
-
-extern XWMHints *XAllocWMHints (
-    void
-);
-
-extern int XClipBox(
-    Region		/* r */,
-    XRectangle*		/* rect_return */
-);
-
-extern Region XCreateRegion(
-    void
-);
-
-extern const char *XDefaultString (void);
-
-extern int XDeleteContext(
-    Display*		/* display */,
-    XID			/* rid */,
-    XContext		/* context */
-);
-
-extern int XDestroyRegion(
-    Region		/* r */
-);
-
-extern int XEmptyRegion(
-    Region		/* r */
-);
-
-extern int XEqualRegion(
-    Region		/* r1 */,
-    Region		/* r2 */
-);
-
-extern int XFindContext(
-    Display*		/* display */,
-    XID			/* rid */,
-    XContext		/* context */,
-    XPointer*		/* data_return */
-);
-
-extern Status XGetClassHint(
-    Display*		/* display */,
-    Window		/* w */,
-    XClassHint*		/* class_hints_return */
-);
-
-extern Status XGetIconSizes(
-    Display*		/* display */,
-    Window		/* w */,
-    XIconSize**		/* size_list_return */,
-    int*		/* count_return */
-);
-
-extern Status XGetNormalHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints_return */
-);
-
-extern Status XGetRGBColormaps(
-    Display*		/* display */,
-    Window		/* w */,
-    XStandardColormap** /* stdcmap_return */,
-    int*		/* count_return */,
-    Atom		/* property */
-);
-
-extern Status XGetSizeHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints_return */,
-    Atom		/* property */
-);
-
-extern Status XGetStandardColormap(
-    Display*		/* display */,
-    Window		/* w */,
-    XStandardColormap*	/* colormap_return */,
-    Atom		/* property */
-);
-
-extern Status XGetTextProperty(
-    Display*		/* display */,
-    Window		/* window */,
-    XTextProperty*	/* text_prop_return */,
-    Atom		/* property */
-);
-
-extern XVisualInfo *XGetVisualInfo(
-    Display*		/* display */,
-    long		/* vinfo_mask */,
-    XVisualInfo*	/* vinfo_template */,
-    int*		/* nitems_return */
-);
-
-extern Status XGetWMClientMachine(
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop_return */
-);
-
-extern XWMHints *XGetWMHints(
-    Display*		/* display */,
-    Window		/* w */
-);
-
-extern Status XGetWMIconName(
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop_return */
-);
-
-extern Status XGetWMName(
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop_return */
-);
-
-extern Status XGetWMNormalHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints_return */,
-    long*		/* supplied_return */
-);
-
-extern Status XGetWMSizeHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints_return */,
-    long*		/* supplied_return */,
-    Atom		/* property */
-);
-
-extern Status XGetZoomHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* zhints_return */
-);
-
-extern int XIntersectRegion(
-    Region		/* sra */,
-    Region		/* srb */,
-    Region		/* dr_return */
-);
-
-extern void XConvertCase(
-    KeySym		/* sym */,
-    KeySym*		/* lower */,
-    KeySym*		/* upper */
-);
-
-extern int XLookupString(
-    XKeyEvent*		/* event_struct */,
-    char*		/* buffer_return */,
-    int			/* bytes_buffer */,
-    KeySym*		/* keysym_return */,
-    XComposeStatus*	/* status_in_out */
-);
-
-extern Status XMatchVisualInfo(
-    Display*		/* display */,
-    int			/* screen */,
-    int			/* depth */,
-    int			/* class */,
-    XVisualInfo*	/* vinfo_return */
-);
-
-extern int XOffsetRegion(
-    Region		/* r */,
-    int			/* dx */,
-    int			/* dy */
-);
-
-extern Bool XPointInRegion(
-    Region		/* r */,
-    int			/* x */,
-    int			/* y */
-);
-
-extern Region XPolygonRegion(
-    XPoint*		/* points */,
-    int			/* n */,
-    int			/* fill_rule */
-);
-
-extern int XRectInRegion(
-    Region		/* r */,
-    int			/* x */,
-    int			/* y */,
-    unsigned int	/* width */,
-    unsigned int	/* height */
-);
-
-extern int XSaveContext(
-    Display*		/* display */,
-    XID			/* rid */,
-    XContext		/* context */,
-    _Xconst char*	/* data */
-);
-
-extern int XSetClassHint(
-    Display*		/* display */,
-    Window		/* w */,
-    XClassHint*		/* class_hints */
-);
-
-extern int XSetIconSizes(
-    Display*		/* display */,
-    Window		/* w */,
-    XIconSize*		/* size_list */,
-    int			/* count */
-);
-
-extern int XSetNormalHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints */
-);
-
-extern void XSetRGBColormaps(
-    Display*		/* display */,
-    Window		/* w */,
-    XStandardColormap*	/* stdcmaps */,
-    int			/* count */,
-    Atom		/* property */
-);
-
-extern int XSetSizeHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints */,
-    Atom		/* property */
-);
-
-extern int XSetStandardProperties(
-    Display*		/* display */,
-    Window		/* w */,
-    _Xconst char*	/* window_name */,
-    _Xconst char*	/* icon_name */,
-    Pixmap		/* icon_pixmap */,
-    char**		/* argv */,
-    int			/* argc */,
-    XSizeHints*		/* hints */
-);
-
-extern void XSetTextProperty(
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop */,
-    Atom		/* property */
-);
-
-extern void XSetWMClientMachine(
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop */
-);
-
-extern int XSetWMHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XWMHints*		/* wm_hints */
-);
-
-extern void XSetWMIconName(
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop */
-);
-
-extern void XSetWMName(
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop */
-);
-
-extern void XSetWMNormalHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints */
-);
-
-extern void XSetWMProperties(
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* window_name */,
-    XTextProperty*	/* icon_name */,
-    char**		/* argv */,
-    int			/* argc */,
-    XSizeHints*		/* normal_hints */,
-    XWMHints*		/* wm_hints */,
-    XClassHint*		/* class_hints */
-);
-
-extern void XmbSetWMProperties(
-    Display*		/* display */,
-    Window		/* w */,
-    _Xconst char*	/* window_name */,
-    _Xconst char*	/* icon_name */,
-    char**		/* argv */,
-    int			/* argc */,
-    XSizeHints*		/* normal_hints */,
-    XWMHints*		/* wm_hints */,
-    XClassHint*		/* class_hints */
-);
-
-extern void Xutf8SetWMProperties(
-    Display*		/* display */,
-    Window		/* w */,
-    _Xconst char*	/* window_name */,
-    _Xconst char*	/* icon_name */,
-    char**		/* argv */,
-    int			/* argc */,
-    XSizeHints*		/* normal_hints */,
-    XWMHints*		/* wm_hints */,
-    XClassHint*		/* class_hints */
-);
-
-extern void XSetWMSizeHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* hints */,
-    Atom		/* property */
-);
-
-extern int XSetRegion(
-    Display*		/* display */,
-    GC			/* gc */,
-    Region		/* r */
-);
-
-extern void XSetStandardColormap(
-    Display*		/* display */,
-    Window		/* w */,
-    XStandardColormap*	/* colormap */,
-    Atom		/* property */
-);
-
-extern int XSetZoomHints(
-    Display*		/* display */,
-    Window		/* w */,
-    XSizeHints*		/* zhints */
-);
-
-extern int XShrinkRegion(
-    Region		/* r */,
-    int			/* dx */,
-    int			/* dy */
-);
-
-extern Status XStringListToTextProperty(
-    char**		/* list */,
-    int			/* count */,
-    XTextProperty*	/* text_prop_return */
-);
-
-extern int XSubtractRegion(
-    Region		/* sra */,
-    Region		/* srb */,
-    Region		/* dr_return */
-);
-
-extern int XmbTextListToTextProperty(
-    Display*		display,
-    char**		list,
-    int			count,
-    XICCEncodingStyle	style,
-    XTextProperty*	text_prop_return
-);
-
-extern int XwcTextListToTextProperty(
-    Display*		display,
-    wchar_t**		list,
-    int			count,
-    XICCEncodingStyle	style,
-    XTextProperty*	text_prop_return
-);
-
-extern int Xutf8TextListToTextProperty(
-    Display*		display,
-    char**		list,
-    int			count,
-    XICCEncodingStyle	style,
-    XTextProperty*	text_prop_return
-);
-
-extern void XwcFreeStringList(
-    wchar_t**		list
-);
-
-extern Status XTextPropertyToStringList(
-    XTextProperty*	/* text_prop */,
-    char***		/* list_return */,
-    int*		/* count_return */
-);
-
-extern int XmbTextPropertyToTextList(
-    Display*		display,
-    const XTextProperty* text_prop,
-    char***		list_return,
-    int*		count_return
-);
-
-extern int XwcTextPropertyToTextList(
-    Display*		display,
-    const XTextProperty* text_prop,
-    wchar_t***		list_return,
-    int*		count_return
-);
-
-extern int Xutf8TextPropertyToTextList(
-    Display*		display,
-    const XTextProperty* text_prop,
-    char***		list_return,
-    int*		count_return
-);
-
-extern int XUnionRectWithRegion(
-    XRectangle*		/* rectangle */,
-    Region		/* src_region */,
-    Region		/* dest_region_return */
-);
-
-extern int XUnionRegion(
-    Region		/* sra */,
-    Region		/* srb */,
-    Region		/* dr_return */
-);
-
-extern int XWMGeometry(
-    Display*		/* display */,
-    int			/* screen_number */,
-    _Xconst char*	/* user_geometry */,
-    _Xconst char*	/* default_geometry */,
-    unsigned int	/* border_width */,
-    XSizeHints*		/* hints */,
-    int*		/* x_return */,
-    int*		/* y_return */,
-    int*		/* width_return */,
-    int*		/* height_return */,
-    int*		/* gravity_return */
-);
-
-extern int XXorRegion(
-    Region		/* sra */,
-    Region		/* srb */,
-    Region		/* dr_return */
-);
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _X11_XUTIL_H_ */
diff --git a/openflow/usr/include/X11/Xw32defs.h b/openflow/usr/include/X11/Xw32defs.h
deleted file mode 100644
index b2e4b33..0000000
--- a/openflow/usr/include/X11/Xw32defs.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef _XW32DEFS_H
-# define  _XW32DEFS_H
-
-# ifdef __GNUC__ /* mingw is more close to unix than msvc */
-#  if !defined(__daddr_t_defined) 
-typedef char *caddr_t;
-#  endif
-#  define lstat stat
-
-# else
-typedef char *caddr_t;
-
-#  define access	   _access
-#  define alloca	   _alloca
-#  define chdir	_chdir
-#  define chmod	   _chmod
-#  define close	   _close
-#  define creat	   _creat
-#  define dup	   _dup
-#  define dup2	   _dup2
-#  define environ     _environ
-#  define execl	 _execl
-#  define execle	 _execle
-#  define execlp	 _execlp
-#  define execlpe  _execlpe
-#  define execv	 _execv
-#  define execve	 _execve
-#  define execvp	 _execvp
-#  define execvpe  _execvpe
-#  define fdopen	  _fdopen
-#  define fileno	  _fileno
-#  define fstat	 _fstat
-#  define getcwd	_getcwd
-#  define getpid	 _getpid
-#  define hypot		_hypot
-#  define isascii __isascii
-#  define isatty	   _isatty
-#  define lseek	   _lseek
-#  define mkdir	_mkdir
-#  define mktemp	   _mktemp
-#  define open	   _open
-#  define putenv	    _putenv
-#  define read	   _read
-#  define rmdir	_rmdir
-#  define sleep(x) Sleep((x) * 1000)
-#  define stat	 _stat
-#  define sys_errlist _sys_errlist
-#  define sys_nerr    _sys_nerr
-#  define umask	   _umask
-#  define unlink	   _unlink
-#  define write	   _write
-#  define random   rand
-#  define srandom  srand
-
-#  define O_RDONLY    _O_RDONLY
-#  define O_WRONLY    _O_WRONLY
-#  define O_RDWR	    _O_RDWR
-#  define O_APPEND    _O_APPEND
-#  define O_CREAT     _O_CREAT
-#  define O_TRUNC     _O_TRUNC
-#  define O_EXCL	    _O_EXCL
-#  define O_TEXT	    _O_TEXT
-#  define O_BINARY    _O_BINARY
-#  define O_RAW	    _O_BINARY
-
-#  define S_IFMT	 _S_IFMT
-#  define S_IFDIR  _S_IFDIR
-#  define S_IFCHR  _S_IFCHR
-#  define S_IFREG  _S_IFREG
-#  define S_IREAD  _S_IREAD
-#  define S_IWRITE _S_IWRITE
-#  define S_IEXEC  _S_IEXEC
-
-#  define	F_OK	0
-#  define	X_OK	1
-#  define	W_OK	2
-#  define	R_OK	4
-# endif /* __GNUC__ */
-#endif
diff --git a/openflow/usr/include/X11/Xwindows.h b/openflow/usr/include/X11/Xwindows.h
deleted file mode 100644
index 70e1deb..0000000
--- a/openflow/usr/include/X11/Xwindows.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-
-Copyright 1996, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
-SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL-
-ITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization from
-The Open Group.
-
-*/
-
-/*
- * This header file has the sole purpose of allowing the inclusion of
- * windows.h without getting any name conflicts with X headers code, by
- * renaming or disabling the conflicting definitions from windows.h
- */
-
-/*
- * Mingw.org versions of the Windows API headers actually avoid
- * making the conflicting definitions if XFree86Server is defined, so we
- * need to remember if that was defined and undefine it during including
- * windows.h (so the conflicting definitions get wrapped correctly), and
- * then redefine it afterwards. (This was never the correct thing to
- * do as it's no help at all to X11 clients which also need to use the
- * Win32 API)
- */
-#undef _XFree86Server
-#ifdef XFree86Server
-# define _XFree86Server
-# undef XFree86Server
-#endif
-
-/*
- * There doesn't seem to be a good way to wrap the min/max macros from
- * windows.h, so we simply avoid defining them completely, allowing any
- * pre-existing definition to stand.
- *
- */
-#define NOMINMAX
-
-/*
- * mingw-w64 headers define BOOL as a typedef, protecting against macros
- * mingw.org headers define BOOL in terms of WINBOOL
- * ... so try to come up with something which works with both :-)
- */
-#define _NO_BOOL_TYPEDEF
-#define BOOL WINBOOL
-#define INT32 wINT32
-#ifdef __x86_64__
-#define INT64 wINT64
-#define LONG64 wLONG64
-#endif
-#undef Status
-#define Status wStatus
-#define ATOM wATOM
-#define BYTE wBYTE
-#define FreeResource wFreeResource
-#include <windows.h>
-#undef NOMINMAX
-#undef Status
-#define Status int
-#undef BYTE
-#undef BOOL
-#undef INT32
-#undef INT64
-#undef LONG64
-#undef ATOM
-#undef FreeResource
-#undef CreateWindowA
-
-/*
- * Older version of this header used to name the windows API bool type wBOOL,
- * rather than more standard name WINBOOL
- */
-#define wBOOL WINBOOL
-
-#ifdef RESOURCE_H
-# undef RT_FONT
-# undef RT_CURSOR
-# define RT_FONT         ((RESTYPE)4)
-# define RT_CURSOR       ((RESTYPE)5)
-#endif
-
-#ifndef __CYGWIN__
-#define sleep(x) Sleep((x) * 1000)
-#endif
-
-#if defined(WIN32) && (!defined(PATH_MAX) || PATH_MAX < 1024)
-# undef PATH_MAX
-# define PATH_MAX 1024
-#endif
-
-#ifdef _XFree86Server
-# define XFree86Server
-# undef _XFree86Server
-#endif
-
diff --git a/openflow/usr/include/X11/Xwinsock.h b/openflow/usr/include/X11/Xwinsock.h
deleted file mode 100644
index a81dd7a..0000000
--- a/openflow/usr/include/X11/Xwinsock.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-
-Copyright 1996, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
-SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL-
-ITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization from
-The Open Group.
-
-*/
-
-/*
- * This header file has for sole purpose to allow to include winsock.h
- * without getting any name conflicts with our code.
- * Conflicts come from the fact that including winsock.h actually pulls
- * in the whole Windows API...
- */
-
-#undef _XFree86Server
-#ifdef XFree86Server 
-# define _XFree86Server
-# undef XFree86Server
-#endif
-
-/*
- * mingw-w64 headers define BOOL as a typedef, protecting against macros
- * mingw.org headers define BOOL in terms of WINBOOL
- * ... so try to come up with something which works with both :-)
- */
-#define _NO_BOOL_TYPEDEF
-#define BOOL WINBOOL
-#define INT32 wINT32
-#undef Status
-#define Status wStatus
-#define ATOM wATOM
-#define BYTE wBYTE
-#define FreeResource wFreeResource
-#include <winsock2.h>
-#undef Status
-#define Status int
-#undef BYTE
-#undef BOOL
-#undef INT32
-#undef ATOM
-#undef FreeResource
-#undef CreateWindowA
-#undef RT_FONT
-#undef RT_CURSOR
-
-/*
- * Older version of this header used to name the windows API bool type wBOOL,
- * rather than more standard name WINBOOL
- */
-#define wBOOL WINBOOL
-
-#ifdef _XFree86Server
-# define XFree86Server
-# undef _XFree86Server
-#endif
-
diff --git a/openflow/usr/include/X11/ap_keysym.h b/openflow/usr/include/X11/ap_keysym.h
deleted file mode 100644
index 9a11971..0000000
--- a/openflow/usr/include/X11/ap_keysym.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************
-Copyright 1987 by Apollo Computer Inc., Chelmsford, Massachusetts.
-Copyright 1989 by Hewlett-Packard Company.
-
-                        All Rights Reserved
-
-Permission to use, duplicate, change, and distribute this software and
-its documentation for any purpose and without fee is granted, provided
-that the above copyright notice appear in such copy and that this
-copyright notice appear in all supporting documentation, and that the
-names of Apollo Computer Inc., the Hewlett-Packard Company, or the X
-Consortium not be used in advertising or publicity pertaining to
-distribution of the software without written prior permission.
-
-HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-PURPOSE.  Hewlett-Packard shall not be liable for errors 
-contained herein or direct, indirect, special, incidental or 
-consequential damages in connection with the furnishing, 
-performance, or use of this material.
-
-This software is not subject to any license of the American
-Telephone and Telegraph Company or of the Regents of the
-University of California.
-******************************************************************/
-
-#define apXK_LineDel            0x1000FF00
-#define apXK_CharDel            0x1000FF01
-#define apXK_Copy               0x1000FF02
-#define apXK_Cut                0x1000FF03
-#define apXK_Paste              0x1000FF04
-#define apXK_Move               0x1000FF05
-#define apXK_Grow               0x1000FF06
-#define apXK_Cmd                0x1000FF07
-#define apXK_Shell              0x1000FF08
-#define apXK_LeftBar            0x1000FF09
-#define apXK_RightBar           0x1000FF0A
-#define apXK_LeftBox            0x1000FF0B
-#define apXK_RightBox           0x1000FF0C
-#define apXK_UpBox              0x1000FF0D
-#define apXK_DownBox            0x1000FF0E
-#define apXK_Pop                0x1000FF0F
-#define apXK_Read               0x1000FF10
-#define apXK_Edit               0x1000FF11
-#define apXK_Save               0x1000FF12
-#define apXK_Exit               0x1000FF13
-#define apXK_Repeat             0x1000FF14
-
-#define apXK_KP_parenleft       0x1000FFA8
-#define apXK_KP_parenright      0x1000FFA9
diff --git a/openflow/usr/include/X11/cursorfont.h b/openflow/usr/include/X11/cursorfont.h
deleted file mode 100644
index c69d508..0000000
--- a/openflow/usr/include/X11/cursorfont.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#ifndef _X11_CURSORFONT_H_
-#define _X11_CURSORFONT_H_
-
-#define XC_num_glyphs 154
-#define XC_X_cursor 0
-#define XC_arrow 2
-#define XC_based_arrow_down 4
-#define XC_based_arrow_up 6
-#define XC_boat 8
-#define XC_bogosity 10
-#define XC_bottom_left_corner 12
-#define XC_bottom_right_corner 14
-#define XC_bottom_side 16
-#define XC_bottom_tee 18
-#define XC_box_spiral 20
-#define XC_center_ptr 22
-#define XC_circle 24
-#define XC_clock 26
-#define XC_coffee_mug 28
-#define XC_cross 30
-#define XC_cross_reverse 32
-#define XC_crosshair 34
-#define XC_diamond_cross 36
-#define XC_dot 38
-#define XC_dotbox 40
-#define XC_double_arrow 42
-#define XC_draft_large 44
-#define XC_draft_small 46
-#define XC_draped_box 48
-#define XC_exchange 50
-#define XC_fleur 52
-#define XC_gobbler 54
-#define XC_gumby 56
-#define XC_hand1 58
-#define XC_hand2 60
-#define XC_heart 62
-#define XC_icon 64
-#define XC_iron_cross 66
-#define XC_left_ptr 68
-#define XC_left_side 70
-#define XC_left_tee 72
-#define XC_leftbutton 74
-#define XC_ll_angle 76
-#define XC_lr_angle 78
-#define XC_man 80
-#define XC_middlebutton 82
-#define XC_mouse 84
-#define XC_pencil 86
-#define XC_pirate 88
-#define XC_plus 90
-#define XC_question_arrow 92
-#define XC_right_ptr 94
-#define XC_right_side 96
-#define XC_right_tee 98
-#define XC_rightbutton 100
-#define XC_rtl_logo 102
-#define XC_sailboat 104
-#define XC_sb_down_arrow 106
-#define XC_sb_h_double_arrow 108
-#define XC_sb_left_arrow 110
-#define XC_sb_right_arrow 112
-#define XC_sb_up_arrow 114
-#define XC_sb_v_double_arrow 116
-#define XC_shuttle 118
-#define XC_sizing 120
-#define XC_spider 122
-#define XC_spraycan 124
-#define XC_star 126
-#define XC_target 128
-#define XC_tcross 130
-#define XC_top_left_arrow 132
-#define XC_top_left_corner 134
-#define XC_top_right_corner 136
-#define XC_top_side 138
-#define XC_top_tee 140
-#define XC_trek 142
-#define XC_ul_angle 144
-#define XC_umbrella 146
-#define XC_ur_angle 148
-#define XC_watch 150
-#define XC_xterm 152
-
-#endif /* _X11_CURSORFONT_H_ */
diff --git a/openflow/usr/include/X11/extensions/XI.h b/openflow/usr/include/X11/extensions/XI.h
deleted file mode 100644
index 7b44399..0000000
--- a/openflow/usr/include/X11/extensions/XI.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/************************************************************
-
-Copyright 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
-
-			All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Hewlett-Packard not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-********************************************************/
-
-/* Definitions used by the server, library and client */
-
-#ifndef _XI_H_
-#define _XI_H_
-
-#define sz_xGetExtensionVersionReq             8
-#define sz_xGetExtensionVersionReply           32
-#define sz_xListInputDevicesReq			4
-#define sz_xListInputDevicesReply		32
-#define sz_xOpenDeviceReq			8
-#define sz_xOpenDeviceReply			32
-#define sz_xCloseDeviceReq			8
-#define sz_xSetDeviceModeReq			8
-#define sz_xSetDeviceModeReply			32
-#define sz_xSelectExtensionEventReq		12
-#define sz_xGetSelectedExtensionEventsReq	8
-#define sz_xGetSelectedExtensionEventsReply	32
-#define sz_xChangeDeviceDontPropagateListReq	12
-#define sz_xGetDeviceDontPropagateListReq	8
-#define sz_xGetDeviceDontPropagateListReply	32
-#define sz_xGetDeviceMotionEventsReq		16
-#define sz_xGetDeviceMotionEventsReply		32
-#define sz_xChangeKeyboardDeviceReq		8
-#define sz_xChangeKeyboardDeviceReply		32
-#define sz_xChangePointerDeviceReq		8
-#define sz_xChangePointerDeviceReply		32
-#define sz_xGrabDeviceReq			20
-#define sz_xGrabDeviceReply			32
-#define sz_xUngrabDeviceReq			12
-#define sz_xGrabDeviceKeyReq			20
-#define sz_xGrabDeviceKeyReply			32
-#define sz_xUngrabDeviceKeyReq			16
-#define sz_xGrabDeviceButtonReq			20
-#define sz_xGrabDeviceButtonReply		32
-#define sz_xUngrabDeviceButtonReq		16
-#define sz_xAllowDeviceEventsReq		12
-#define sz_xGetDeviceFocusReq			8
-#define sz_xGetDeviceFocusReply			32
-#define sz_xSetDeviceFocusReq			16
-#define sz_xGetFeedbackControlReq		8
-#define sz_xGetFeedbackControlReply		32
-#define sz_xChangeFeedbackControlReq		12
-#define sz_xGetDeviceKeyMappingReq		8
-#define sz_xGetDeviceKeyMappingReply		32
-#define sz_xChangeDeviceKeyMappingReq		8
-#define sz_xGetDeviceModifierMappingReq		8
-#define sz_xSetDeviceModifierMappingReq		8
-#define sz_xSetDeviceModifierMappingReply	32
-#define sz_xGetDeviceButtonMappingReq		8
-#define sz_xGetDeviceButtonMappingReply		32
-#define sz_xSetDeviceButtonMappingReq		8
-#define sz_xSetDeviceButtonMappingReply		32
-#define sz_xQueryDeviceStateReq			8
-#define sz_xQueryDeviceStateReply		32
-#define sz_xSendExtensionEventReq		16
-#define sz_xDeviceBellReq			8
-#define sz_xSetDeviceValuatorsReq		8
-#define sz_xSetDeviceValuatorsReply		32
-#define sz_xGetDeviceControlReq			8
-#define sz_xGetDeviceControlReply		32
-#define sz_xChangeDeviceControlReq		8
-#define sz_xChangeDeviceControlReply		32
-#define sz_xListDevicePropertiesReq             8
-#define sz_xListDevicePropertiesReply           32
-#define sz_xChangeDevicePropertyReq             20
-#define sz_xDeleteDevicePropertyReq             12
-#define sz_xGetDevicePropertyReq                24
-#define sz_xGetDevicePropertyReply              32
-
-#define INAME		"XInputExtension"
-
-#define XI_KEYBOARD	"KEYBOARD"
-#define XI_MOUSE	"MOUSE"
-#define XI_TABLET	"TABLET"
-#define XI_TOUCHSCREEN	"TOUCHSCREEN"
-#define XI_TOUCHPAD	"TOUCHPAD"
-#define XI_BARCODE	"BARCODE"
-#define XI_BUTTONBOX	"BUTTONBOX"
-#define XI_KNOB_BOX	"KNOB_BOX"
-#define XI_ONE_KNOB	"ONE_KNOB"
-#define XI_NINE_KNOB	"NINE_KNOB"
-#define XI_TRACKBALL	"TRACKBALL"
-#define XI_QUADRATURE	"QUADRATURE"
-#define XI_ID_MODULE	"ID_MODULE"
-#define XI_SPACEBALL	"SPACEBALL"
-#define XI_DATAGLOVE	"DATAGLOVE"
-#define XI_EYETRACKER	"EYETRACKER"
-#define XI_CURSORKEYS	"CURSORKEYS"
-#define XI_FOOTMOUSE	"FOOTMOUSE"
-#define XI_JOYSTICK	"JOYSTICK"
-
-/* Indices into the versions[] array (XExtInt.c). Used as a index to
- * retrieve the minimum version of XI from _XiCheckExtInit */
-#define Dont_Check			0
-#define XInput_Initial_Release		1
-#define XInput_Add_XDeviceBell		2
-#define XInput_Add_XSetDeviceValuators	3
-#define XInput_Add_XChangeDeviceControl	4
-#define XInput_Add_DevicePresenceNotify	5
-#define XInput_Add_DeviceProperties	6
-/* DO NOT ADD TO HERE -> XI2 */
-
-#define XI_Absent		0
-#define XI_Present		1
-
-#define XI_Initial_Release_Major		1
-#define XI_Initial_Release_Minor		0
-
-#define XI_Add_XDeviceBell_Major		1
-#define XI_Add_XDeviceBell_Minor		1
-
-#define XI_Add_XSetDeviceValuators_Major	1
-#define XI_Add_XSetDeviceValuators_Minor	2
-
-#define XI_Add_XChangeDeviceControl_Major	1
-#define XI_Add_XChangeDeviceControl_Minor	3
-
-#define XI_Add_DevicePresenceNotify_Major	1
-#define XI_Add_DevicePresenceNotify_Minor	4
-
-#define XI_Add_DeviceProperties_Major		1
-#define XI_Add_DeviceProperties_Minor		5
-
-#define DEVICE_RESOLUTION	1
-#define DEVICE_ABS_CALIB        2
-#define DEVICE_CORE             3
-#define DEVICE_ENABLE           4
-#define DEVICE_ABS_AREA         5
-
-#define NoSuchExtension		1
-
-#define COUNT			0
-#define CREATE			1
-
-#define NewPointer		0
-#define NewKeyboard		1
-
-#define XPOINTER		0
-#define XKEYBOARD		1
-
-#define UseXKeyboard		0xFF
-
-#define IsXPointer		0
-#define IsXKeyboard		1
-#define IsXExtensionDevice	2
-#define IsXExtensionKeyboard    3
-#define IsXExtensionPointer     4
-
-#define AsyncThisDevice		0
-#define SyncThisDevice		1
-#define ReplayThisDevice	2
-#define AsyncOtherDevices	3
-#define AsyncAll		4
-#define SyncAll			5
-
-#define FollowKeyboard 		3
-#ifndef RevertToFollowKeyboard
-#define RevertToFollowKeyboard 	3
-#endif
-
-#define DvAccelNum              (1L << 0)
-#define DvAccelDenom            (1L << 1)
-#define DvThreshold             (1L << 2)
-
-#define DvKeyClickPercent	(1L<<0)
-#define DvPercent		(1L<<1)
-#define DvPitch			(1L<<2)
-#define DvDuration		(1L<<3)
-#define DvLed			(1L<<4)
-#define DvLedMode		(1L<<5)
-#define DvKey			(1L<<6)
-#define DvAutoRepeatMode	(1L<<7)
-
-#define DvString                (1L << 0)
-
-#define DvInteger               (1L << 0)
-
-#define DeviceMode              (1L << 0)
-#define Relative                0
-#define Absolute                1
-
-#define ProximityState          (1L << 1)
-#define InProximity             (0L << 1)
-#define OutOfProximity          (1L << 1)
-
-#define AddToList               0
-#define DeleteFromList          1
-
-#define KeyClass  		0
-#define ButtonClass  		1
-#define ValuatorClass  		2
-#define FeedbackClass  		3
-#define ProximityClass  	4
-#define FocusClass  		5
-#define OtherClass  		6
-#define AttachClass             7
-
-#define KbdFeedbackClass  	0
-#define PtrFeedbackClass  	1
-#define StringFeedbackClass  	2
-#define IntegerFeedbackClass  	3
-#define LedFeedbackClass  	4
-#define BellFeedbackClass  	5
-
-#define _devicePointerMotionHint 0
-#define _deviceButton1Motion	 1
-#define _deviceButton2Motion	 2
-#define _deviceButton3Motion	 3
-#define _deviceButton4Motion	 4
-#define _deviceButton5Motion	 5
-#define _deviceButtonMotion	 6
-#define _deviceButtonGrab	 7
-#define _deviceOwnerGrabButton	 8
-#define _noExtensionEvent	 9
-
-#define _devicePresence		 0
-
-#define _deviceEnter             0
-#define _deviceLeave             1
-
-/* Device presence notify states */
-#define DeviceAdded              0
-#define DeviceRemoved            1
-#define DeviceEnabled            2
-#define DeviceDisabled           3
-#define DeviceUnrecoverable      4
-#define DeviceControlChanged     5
-
-/* XI Errors */
-#define XI_BadDevice	0
-#define XI_BadEvent	1
-#define XI_BadMode	2
-#define XI_DeviceBusy	3
-#define XI_BadClass	4
-
-/*
- * Make XEventClass be a CARD32 for 64 bit servers.  Don't affect client
- * definition of XEventClass since that would be a library interface change.
- * See the top of X.h for more _XSERVER64 magic.
- *
- * But, don't actually use the CARD32 type.  We can't get it defined here
- * without polluting the namespace.
- */
-#ifdef _XSERVER64
-typedef	unsigned int	XEventClass;
-#else
-typedef	unsigned long	XEventClass;
-#endif
-
-/*******************************************************************
- *
- * Extension version structure.
- *
- */
-
-typedef struct {
-        int   	present;
-        short	major_version;
-        short	minor_version;
-} XExtensionVersion;
-
-#endif /* _XI_H_ */
diff --git a/openflow/usr/include/X11/extensions/XI2.h b/openflow/usr/include/X11/extensions/XI2.h
deleted file mode 100644
index 5a1c66a..0000000
--- a/openflow/usr/include/X11/extensions/XI2.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright © 2009 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef _XI2_H_
-#define _XI2_H_
-
-#define XInput_2_0                              7
-/* DO NOT ADD TO THIS LIST. These are libXi-specific defines.
-   See commit libXi-1.4.2-21-ge8531dd */
-
-#define XI_2_Major                              2
-#define XI_2_Minor                              3
-
-/* Property event flags */
-#define XIPropertyDeleted                       0
-#define XIPropertyCreated                       1
-#define XIPropertyModified                      2
-
-/* Property modes */
-#define XIPropModeReplace                       0
-#define XIPropModePrepend                       1
-#define XIPropModeAppend                        2
-
-/* Special property type used for XIGetProperty */
-#define XIAnyPropertyType                       0L
-
-/* Enter/Leave and Focus In/Out modes */
-#define XINotifyNormal                          0
-#define XINotifyGrab                            1
-#define XINotifyUngrab                          2
-#define XINotifyWhileGrabbed                    3
-#define XINotifyPassiveGrab                     4
-#define XINotifyPassiveUngrab                   5
-
-/* Enter/Leave and focus In/out detail */
-#define XINotifyAncestor                        0
-#define XINotifyVirtual                         1
-#define XINotifyInferior                        2
-#define XINotifyNonlinear                       3
-#define XINotifyNonlinearVirtual                4
-#define XINotifyPointer                         5
-#define XINotifyPointerRoot                     6
-#define XINotifyDetailNone                      7
-
-/* Grab modes */
-#define XIGrabModeSync                          0
-#define XIGrabModeAsync                         1
-#define XIGrabModeTouch                         2
-
-/* Grab reply status codes */
-#define XIGrabSuccess                           0
-#define XIAlreadyGrabbed                        1
-#define XIGrabInvalidTime                       2
-#define XIGrabNotViewable                       3
-#define XIGrabFrozen                            4
-
-/* Grab owner events values */
-#define XIOwnerEvents                           True
-#define XINoOwnerEvents                         False
-
-/* Passive grab types */
-#define XIGrabtypeButton                        0
-#define XIGrabtypeKeycode                       1
-#define XIGrabtypeEnter                         2
-#define XIGrabtypeFocusIn                       3
-#define XIGrabtypeTouchBegin                    4
-
-/* Passive grab modifier */
-#define XIAnyModifier                           (1U << 31)
-#define XIAnyButton                             0
-#define XIAnyKeycode                            0
-
-/* XIAllowEvents event-modes */
-#define XIAsyncDevice                           0
-#define XISyncDevice                            1
-#define XIReplayDevice                          2
-#define XIAsyncPairedDevice                     3
-#define XIAsyncPair                             4
-#define XISyncPair                              5
-#define XIAcceptTouch                           6
-#define XIRejectTouch                           7
-
-/* DeviceChangedEvent change reasons */
-#define XISlaveSwitch                           1
-#define XIDeviceChange                          2
-
-/* Hierarchy flags */
-#define XIMasterAdded                           (1 << 0)
-#define XIMasterRemoved                         (1 << 1)
-#define XISlaveAdded                            (1 << 2)
-#define XISlaveRemoved                          (1 << 3)
-#define XISlaveAttached                         (1 << 4)
-#define XISlaveDetached                         (1 << 5)
-#define XIDeviceEnabled                         (1 << 6)
-#define XIDeviceDisabled                        (1 << 7)
-
-/* ChangeHierarchy constants */
-#define XIAddMaster                             1
-#define XIRemoveMaster                          2
-#define XIAttachSlave                           3
-#define XIDetachSlave                           4
-
-#define XIAttachToMaster                        1
-#define XIFloating                              2
-
-/* Valuator modes */
-#define XIModeRelative                          0
-#define XIModeAbsolute                          1
-
-/* Device types */
-#define XIMasterPointer                         1
-#define XIMasterKeyboard                        2
-#define XISlavePointer                          3
-#define XISlaveKeyboard                         4
-#define XIFloatingSlave                         5
-
-/* Device classes: classes that are not identical to Xi 1.x classes must be
- * numbered starting from 8. */
-#define XIKeyClass                              0
-#define XIButtonClass                           1
-#define XIValuatorClass                         2
-#define XIScrollClass                           3
-#define XITouchClass                            8
-
-/* Scroll class types */
-#define XIScrollTypeVertical                    1
-#define XIScrollTypeHorizontal                  2
-
-/* Scroll class flags */
-#define XIScrollFlagNoEmulation                 (1 << 0)
-#define XIScrollFlagPreferred                   (1 << 1)
-
-/* Device event flags (common) */
-/* Device event flags (key events only) */
-#define XIKeyRepeat                             (1 << 16)
-/* Device event flags (pointer events only) */
-#define XIPointerEmulated                       (1 << 16)
-/* Device event flags (touch events only) */
-#define XITouchPendingEnd                       (1 << 16)
-#define XITouchEmulatingPointer                 (1 << 17)
-
-/* Barrier event flags */
-#define XIBarrierPointerReleased                (1 << 0)
-#define XIBarrierDeviceIsGrabbed                (1 << 1)
-
-
-/* Touch modes */
-#define XIDirectTouch                           1
-#define XIDependentTouch                        2
-
-/* XI2 event mask macros */
-#define XISetMask(ptr, event)   (((unsigned char*)(ptr))[(event)>>3] |=  (1 << ((event) & 7)))
-#define XIClearMask(ptr, event) (((unsigned char*)(ptr))[(event)>>3] &= ~(1 << ((event) & 7)))
-#define XIMaskIsSet(ptr, event) (((unsigned char*)(ptr))[(event)>>3] &   (1 << ((event) & 7)))
-#define XIMaskLen(event)        (((event) >> 3) + 1)
-
-/* Fake device ID's for event selection */
-#define XIAllDevices                            0
-#define XIAllMasterDevices                      1
-
-/* Event types */
-#define XI_DeviceChanged                 1
-#define XI_KeyPress                      2
-#define XI_KeyRelease                    3
-#define XI_ButtonPress                   4
-#define XI_ButtonRelease                 5
-#define XI_Motion                        6
-#define XI_Enter                         7
-#define XI_Leave                         8
-#define XI_FocusIn                       9
-#define XI_FocusOut                      10
-#define XI_HierarchyChanged              11
-#define XI_PropertyEvent                 12
-#define XI_RawKeyPress                   13
-#define XI_RawKeyRelease                 14
-#define XI_RawButtonPress                15
-#define XI_RawButtonRelease              16
-#define XI_RawMotion                     17
-#define XI_TouchBegin                    18 /* XI 2.2 */
-#define XI_TouchUpdate                   19
-#define XI_TouchEnd                      20
-#define XI_TouchOwnership                21
-#define XI_RawTouchBegin                 22
-#define XI_RawTouchUpdate                23
-#define XI_RawTouchEnd                   24
-#define XI_BarrierHit                    25 /* XI 2.3 */
-#define XI_BarrierLeave                  26
-#define XI_LASTEVENT                     XI_BarrierLeave
-/* NOTE: XI2LASTEVENT in xserver/include/inputstr.h must be the same value
- * as XI_LASTEVENT if the server is supposed to handle masks etc. for this
- * type of event. */
-
-/* Event masks.
- * Note: the protocol spec defines a mask to be of (1 << type). Clients are
- * free to create masks by bitshifting instead of using these defines.
- */
-#define XI_DeviceChangedMask             (1 << XI_DeviceChanged)
-#define XI_KeyPressMask                  (1 << XI_KeyPress)
-#define XI_KeyReleaseMask                (1 << XI_KeyRelease)
-#define XI_ButtonPressMask               (1 << XI_ButtonPress)
-#define XI_ButtonReleaseMask             (1 << XI_ButtonRelease)
-#define XI_MotionMask                    (1 << XI_Motion)
-#define XI_EnterMask                     (1 << XI_Enter)
-#define XI_LeaveMask                     (1 << XI_Leave)
-#define XI_FocusInMask                   (1 << XI_FocusIn)
-#define XI_FocusOutMask                  (1 << XI_FocusOut)
-#define XI_HierarchyChangedMask          (1 << XI_HierarchyChanged)
-#define XI_PropertyEventMask             (1 << XI_PropertyEvent)
-#define XI_RawKeyPressMask               (1 << XI_RawKeyPress)
-#define XI_RawKeyReleaseMask             (1 << XI_RawKeyRelease)
-#define XI_RawButtonPressMask            (1 << XI_RawButtonPress)
-#define XI_RawButtonReleaseMask          (1 << XI_RawButtonRelease)
-#define XI_RawMotionMask                 (1 << XI_RawMotion)
-#define XI_TouchBeginMask                (1 << XI_TouchBegin)
-#define XI_TouchEndMask                  (1 << XI_TouchEnd)
-#define XI_TouchOwnershipChangedMask     (1 << XI_TouchOwnership)
-#define XI_TouchUpdateMask               (1 << XI_TouchUpdate)
-#define XI_RawTouchBeginMask             (1 << XI_RawTouchBegin)
-#define XI_RawTouchEndMask               (1 << XI_RawTouchEnd)
-#define XI_RawTouchUpdateMask            (1 << XI_RawTouchUpdate)
-#define XI_BarrierHitMask                (1 << XI_BarrierHit)
-#define XI_BarrierLeaveMask              (1 << XI_BarrierLeave)
-
-#endif /* _XI2_H_ */
diff --git a/openflow/usr/include/X11/extensions/XI2proto.h b/openflow/usr/include/X11/extensions/XI2proto.h
deleted file mode 100644
index 4cdaa0d..0000000
--- a/openflow/usr/include/X11/extensions/XI2proto.h
+++ /dev/null
@@ -1,1091 +0,0 @@
-/*
- * Copyright © 2009 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-
-/* Conventions for this file:
- * Names:
- * structs: always typedef'd, prefixed with xXI, CamelCase
- * struct members: lower_case_with_underscores
- *        Exceptions: reqType, ReqType, repType, RepType, sequenceNumber are
- *        named as such for historical reasons.
- * request opcodes: X_XIRequestName as CamelCase
- * defines: defines used in client applications must go in XI2.h
- *          defines used only in protocol handling: XISOMENAME
- *
- * Data types: unless there is a historical name for a datatype (e.g.
- * Window), use stdint types specifying the size of the datatype.
- * historical data type names must be defined and undefined at the top and
- * end of the file.
- *
- * General:
- * spaces, not tabs.
- * structs specific to a request or reply added before the request
- *      definition. structs used in more than one request, reply or event
- *      appended to the common structs section before the definition of the
- *      first request.
- * members of structs vertically aligned on column 16 if datatypes permit.
- *      otherwise alingned on next available 8n column.
- */
-
-/**
- * Protocol definitions for the XI2 protocol.
- * This file should not be included by clients that merely use XI2, but do not
- * need the wire protocol. Such clients should include XI2.h, or the matching
- * header from the library.
- *
- */
-#ifndef _XI2PROTO_H_
-#define _XI2PROTO_H_
-
-#include <X11/Xproto.h>
-#include <X11/X.h>
-#include <X11/extensions/XI2.h>
-#include <stdint.h>
-
-/* make sure types have right sizes for protocol structures. */
-#define Window  uint32_t
-#define Time    uint32_t
-#define Atom    uint32_t
-#define Cursor  uint32_t
-#define Barrier uint32_t
-
-/**
- * XI2 Request opcodes
- */
-#define X_XIQueryPointer                40
-#define X_XIWarpPointer                 41
-#define X_XIChangeCursor                42
-#define X_XIChangeHierarchy             43
-#define X_XISetClientPointer            44
-#define X_XIGetClientPointer            45
-#define X_XISelectEvents                46
-#define X_XIQueryVersion                47
-#define X_XIQueryDevice                 48
-#define X_XISetFocus                    49
-#define X_XIGetFocus                    50
-#define X_XIGrabDevice                  51
-#define X_XIUngrabDevice                52
-#define X_XIAllowEvents                 53
-#define X_XIPassiveGrabDevice           54
-#define X_XIPassiveUngrabDevice         55
-#define X_XIListProperties              56
-#define X_XIChangeProperty              57
-#define X_XIDeleteProperty              58
-#define X_XIGetProperty                 59
-#define X_XIGetSelectedEvents           60
-#define X_XIBarrierReleasePointer       61
-
-/** Number of XI requests */
-#define XI2REQUESTS (X_XIBarrierReleasePointer - X_XIQueryPointer + 1)
-/** Number of XI2 events */
-#define XI2EVENTS   (XI_LASTEVENT + 1)
-
-/*************************************************************************************
- *                                                                                   *
- *                               COMMON STRUCTS                                      *
- *                                                                                   *
- *************************************************************************************/
-/** Fixed point 16.16 */
-typedef int32_t FP1616;
-
-/** Fixed point 32.32 */
-typedef struct {
-    int32_t     integral;
-    uint32_t    frac;
-} FP3232;
-
-/**
- * Struct to describe a device.
- *
- * For a MasterPointer or a MasterKeyboard, 'attachment' specifies the
- * paired master device.
- * For a SlaveKeyboard or SlavePointer, 'attachment' specifies the master
- * device this device is attached to.
- * For a FloatingSlave, 'attachment' is undefined.
- */
-typedef struct {
-    uint16_t    deviceid;
-    uint16_t    use;            /**< ::XIMasterPointer, ::XIMasterKeyboard,
-                                     ::XISlavePointer, ::XISlaveKeyboard,
-                                     ::XIFloatingSlave */
-    uint16_t    attachment;     /**< Current attachment or pairing.*/
-    uint16_t    num_classes;    /**< Number of classes following this struct. */
-    uint16_t    name_len;       /**< Length of name in bytes. */
-    uint8_t     enabled;        /**< TRUE if device is enabled. */
-    uint8_t     pad;
-} xXIDeviceInfo;
-
-/**
- * Default template for a device class.
- * A device class is equivalent to a device's capabilities. Multiple classes
- * are supported per device.
- */
-typedef struct {
-    uint16_t    type;           /**< One of *class */
-    uint16_t    length;         /**< Length in 4 byte units */
-    uint16_t    sourceid;       /**< source device for this class */
-    uint16_t    pad;
-} xXIAnyInfo;
-
-/**
- * Denotes button capability on a device.
- * Struct is followed by num_buttons * Atom that names the buttons in the
- * device-native setup (i.e. ignoring button mappings).
- */
-typedef struct {
-    uint16_t    type;           /**< Always ButtonClass */
-    uint16_t    length;         /**< Length in 4 byte units */
-    uint16_t    sourceid;       /**< source device for this class */
-    uint16_t    num_buttons;    /**< Number of buttons provided */
-} xXIButtonInfo;
-
-/**
- * Denotes key capability on a device.
- * Struct is followed by num_keys * CARD32 that lists the keycodes available
- * on the device.
- */
-typedef struct {
-    uint16_t    type;           /**< Always KeyClass */
-    uint16_t    length;         /**< Length in 4 byte units */
-    uint16_t    sourceid;       /**< source device for this class */
-    uint16_t    num_keycodes;   /**< Number of keys provided */
-} xXIKeyInfo;
-
-/**
- * Denotes an valuator capability on a device.
- * One XIValuatorInfo describes exactly one valuator (axis) on the device.
- */
-typedef struct {
-    uint16_t    type;           /**< Always ValuatorClass       */
-    uint16_t    length;         /**< Length in 4 byte units */
-    uint16_t    sourceid;       /**< source device for this class */
-    uint16_t    number;         /**< Valuator number            */
-    Atom        label;          /**< Axis label                 */
-    FP3232      min;            /**< Min value                  */
-    FP3232      max;            /**< Max value                  */
-    FP3232      value;          /**< Last published value       */
-    uint32_t    resolution;     /**< Resolutions in units/m     */
-    uint8_t     mode;           /**< ModeRelative or ModeAbsolute */
-    uint8_t     pad1;
-    uint16_t    pad2;
-} xXIValuatorInfo;
-
-/***
- * Denotes a scroll valuator on a device.
- * One XIScrollInfo describes exactly one scroll valuator that must have a
- * XIValuatorInfo struct.
- */
-typedef struct {
-    uint16_t    type;           /**< Always ValuatorClass         */
-    uint16_t    length;         /**< Length in 4 byte units       */
-    uint16_t    sourceid;       /**< source device for this class */
-    uint16_t    number;         /**< Valuator number              */
-    uint16_t    scroll_type;    /**< ::XIScrollTypeVertical, ::XIScrollTypeHorizontal */
-    uint16_t    pad0;
-    uint32_t    flags;          /**< ::XIScrollFlagEmulate, ::XIScrollFlagPreferred   */
-    FP3232      increment;      /**< Increment for one unit of scrolling              */
-} xXIScrollInfo;
-
-/**
- * Denotes multitouch capability on a device.
- */
-typedef struct {
-    uint16_t    type;           /**< Always TouchClass */
-    uint16_t    length;         /**< Length in 4 byte units */
-    uint16_t    sourceid;       /**< source device for this class */
-    uint8_t     mode;           /**< DirectTouch or DependentTouch */
-    uint8_t     num_touches;    /**< Maximum number of touches (0==unlimited) */
-} xXITouchInfo;
-
-/**
- * Used to select for events on a given window.
- * Struct is followed by (mask_len * CARD8), with each bit set representing
- * the event mask for the given type. A mask bit represents an event type if
- * (mask == (1 << type)).
- */
-typedef struct {
-    uint16_t    deviceid;       /**< Device id to select for        */
-    uint16_t    mask_len;       /**< Length of mask in 4 byte units */
-} xXIEventMask;
-
-/**
- * XKB modifier information.
- * The effective modifier is a binary mask of base, latched, and locked
- * modifiers.
- */
-typedef struct
-{
-    uint32_t    base_mods;              /**< Logically pressed modifiers */
-    uint32_t    latched_mods;           /**< Logically latched modifiers */
-    uint32_t    locked_mods;            /**< Logically locked modifiers */
-    uint32_t    effective_mods;         /**< Effective modifiers */
-} xXIModifierInfo;
-
-/**
- * XKB group information.
- * The effective group is the mathematical sum of base, latched, and locked
- * group after group wrapping is taken into account.
- */
-typedef struct
-{
-    uint8_t     base_group;             /**< Logically "pressed" group */
-    uint8_t     latched_group;          /**< Logically latched group */
-    uint8_t     locked_group;           /**< Logically locked group */
-    uint8_t     effective_group;        /**< Effective group */
-} xXIGroupInfo;
-
-
-/*************************************************************************************
- *                                                                                   *
- *                                   REQUESTS                                        *
- *                                                                                   *
- *************************************************************************************/
-
-/**
- * Query the server for the supported X Input extension version.
- */
-
-typedef struct {
-    uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIQueryVersion */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    uint16_t    major_version;
-    uint16_t    minor_version;
-} xXIQueryVersionReq;
-#define sz_xXIQueryVersionReq                     8
-
-typedef struct {
-    uint8_t     repType;                /**< ::X_Reply */
-    uint8_t     RepType;                /**< Always ::X_XIQueryVersion */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    uint16_t    major_version;
-    uint16_t    minor_version;
-    uint32_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-    uint32_t    pad4;
-    uint32_t    pad5;
-} xXIQueryVersionReply;
-#define sz_xXIQueryVersionReply             32
-
-/**
- * Query the server for information about a specific device or all input
- * devices.
- */
-typedef struct {
-    uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIQueryDevice */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    uint16_t    deviceid;
-    uint16_t    pad;
-} xXIQueryDeviceReq;
-#define sz_xXIQueryDeviceReq                    8
-
-typedef struct {
-    uint8_t     repType;                /**< ::X_Reply */
-    uint8_t     RepType;                /**< Always ::X_XIQueryDevice */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    uint16_t    num_devices;
-    uint16_t    pad0;
-    uint32_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-    uint32_t    pad4;
-    uint32_t    pad5;
-} xXIQueryDeviceReply;
-#define sz_xXIQueryDeviceReply                  32
-
-/**
- * Select for events on a given window.
- */
-typedef struct {
-    uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XISelectEvents */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Window      win;
-    uint16_t    num_masks;
-    uint16_t    pad;
-} xXISelectEventsReq;
-#define sz_xXISelectEventsReq                  12
-
-/**
- * Query for selected events on a given window.
- */
-typedef struct {
-    uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIGetSelectedEvents */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Window      win;
-} xXIGetSelectedEventsReq;
-#define sz_xXIGetSelectedEventsReq              8
-
-typedef struct {
-    uint8_t     repType;                /**< Input extension major opcode */
-    uint8_t     RepType;                /**< Always ::X_XIGetSelectedEvents */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    uint16_t    num_masks;              /**< Number of xXIEventMask structs
-                                             trailing the reply */
-    uint16_t    pad0;
-    uint32_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-    uint32_t    pad4;
-    uint32_t    pad5;
-} xXIGetSelectedEventsReply;
-#define sz_xXIGetSelectedEventsReply            32
-
-/**
- * Query the given device's screen/window coordinates.
- */
-
-typedef struct {
-    uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIQueryPointer */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Window      win;
-    uint16_t    deviceid;
-    uint16_t    pad1;
-} xXIQueryPointerReq;
-#define sz_xXIQueryPointerReq                   12
-
-
-typedef struct {
-    uint8_t     repType;                /**< Input extension major opcode */
-    uint8_t     RepType;                /**< Always ::X_XIQueryPointer */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    Window      root;
-    Window      child;
-    FP1616      root_x;
-    FP1616      root_y;
-    FP1616      win_x;
-    FP1616      win_y;
-    uint8_t     same_screen;
-    uint8_t     pad0;
-    uint16_t    buttons_len;
-    xXIModifierInfo mods;
-    xXIGroupInfo group;
-} xXIQueryPointerReply;
-#define sz_xXIQueryPointerReply                 56
-
-/**
- * Warp the given device's pointer to the specified position.
- */
-
-typedef struct {
-    uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIWarpPointer   */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Window      src_win;
-    Window      dst_win;
-    FP1616      src_x;
-    FP1616      src_y;
-    uint16_t    src_width;
-    uint16_t    src_height;
-    FP1616      dst_x;
-    FP1616      dst_y;
-    uint16_t    deviceid;
-    uint16_t    pad1;
-} xXIWarpPointerReq;
-#define sz_xXIWarpPointerReq                    36
-
-/**
- * Change the given device's sprite to the given cursor.
- */
-
-typedef struct {
-    uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIChangeCursor  */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Window      win;
-    Cursor      cursor;
-    uint16_t    deviceid;
-    uint16_t    pad1;
-} xXIChangeCursorReq;
-#define sz_xXIChangeCursorReq                           16
-
-/**
- * Modify the device hierarchy.
- */
-
-typedef struct {
-    uint8_t     reqType;                /**< Input extension major code */
-    uint8_t     ReqType;                /**< Always ::X_XIChangeHierarchy */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    uint8_t     num_changes;
-    uint8_t     pad0;
-    uint16_t    pad1;
-} xXIChangeHierarchyReq;
-#define sz_xXIChangeHierarchyReq                        8
-
-/**
- * Generic header for any hierarchy change.
- */
-typedef struct {
-    uint16_t    type;
-    uint16_t    length;                 /**< Length in 4 byte units */
-} xXIAnyHierarchyChangeInfo;
-
-/**
- * Create a new master device.
- * Name of new master follows struct (4-byte padded)
- */
-typedef struct {
-    uint16_t    type;                   /**< Always ::XIAddMaster */
-    uint16_t    length;                 /**< 2 + (namelen + padding)/4 */
-    uint16_t    name_len;
-    uint8_t     send_core;
-    uint8_t     enable;
-} xXIAddMasterInfo;
-
-/**
- * Delete a master device. Will automatically delete the master device paired
- * with the given master device.
- */
-typedef struct {
-    uint16_t    type;            /**< Always ::XIRemoveMaster */
-    uint16_t    length;          /**< 3 */
-    uint16_t    deviceid;
-    uint8_t     return_mode;     /**< ::XIAttachToMaster, ::XIFloating */
-    uint8_t     pad;
-    uint16_t    return_pointer;  /**< Pointer to attach slave ptr devices to */
-    uint16_t    return_keyboard; /**< keyboard to attach slave keybd devices to*/
-} xXIRemoveMasterInfo;
-
-/**
- * Attach an SD to a new device.
- * NewMaster has to be of same type (pointer->pointer, keyboard->keyboard);
- */
-typedef struct {
-    uint16_t    type;           /**< Always ::XIAttachSlave */
-    uint16_t    length;         /**< 2 */
-    uint16_t    deviceid;
-    uint16_t    new_master;     /**< id of new master device */
-} xXIAttachSlaveInfo;
-
-/**
- * Detach an SD from its current master device.
- */
-typedef struct {
-    uint16_t    type;           /**< Always ::XIDetachSlave */
-    uint16_t    length;         /**< 2 */
-    uint16_t    deviceid;
-    uint16_t    pad;
-} xXIDetachSlaveInfo;
-
-
-/**
- * Set the window/client's ClientPointer.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XISetClientPointer */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Window      win;
-    uint16_t    deviceid;
-    uint16_t    pad1;
-} xXISetClientPointerReq;
-#define sz_xXISetClientPointerReq                 12
-
-/**
- * Query the given window/client's ClientPointer setting.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_GetClientPointer */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Window      win;
-} xXIGetClientPointerReq;
-#define sz_xXIGetClientPointerReq                 8
-
-typedef struct {
-    uint8_t     repType;                /**< Input extension major opcode */
-    uint8_t     RepType;                /**< Always ::X_GetClientPointer */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    BOOL        set;                    /**< client pointer is set? */
-    uint8_t     pad0;
-    uint16_t    deviceid;
-    uint32_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-    uint32_t    pad4;
-    uint32_t    pad5;
-} xXIGetClientPointerReply;
-#define sz_xXIGetClientPointerReply               32
-
-/**
- * Set the input focus to the specified window.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XISetFocus */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Window      focus;
-    Time        time;
-    uint16_t    deviceid;
-    uint16_t    pad0;
-} xXISetFocusReq;
-#define sz_xXISetFocusReq                       16
-
-/**
- * Query the current input focus.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XIGetDeviceFocus */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    uint16_t    deviceid;
-    uint16_t    pad0;
-} xXIGetFocusReq;
-#define sz_xXIGetFocusReq                       8
-
-typedef struct {
-    uint8_t     repType;                /**< Input extension major opcode */
-    uint8_t     RepType;                /**< Always ::X_XIGetFocus */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    Window      focus;
-    uint32_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-    uint32_t    pad4;
-    uint32_t    pad5;
-} xXIGetFocusReply;
-#define sz_xXIGetFocusReply                     32
-
-
-/**
- * Grab the given device.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XIGrabDevice */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Window      grab_window;
-    Time        time;
-    Cursor      cursor;
-    uint16_t    deviceid;
-    uint8_t     grab_mode;
-    uint8_t     paired_device_mode;
-    uint8_t     owner_events;
-    uint8_t     pad;
-    uint16_t    mask_len;
-} xXIGrabDeviceReq;
-#define sz_xXIGrabDeviceReq                     24
-
-/**
- * Return codes from a XIPassiveGrabDevice request.
- */
-typedef struct {
-    uint32_t    modifiers;              /**< Modifier state */
-    uint8_t     status;                 /**< Grab status code */
-    uint8_t     pad0;
-    uint16_t    pad1;
-} xXIGrabModifierInfo;
-
-typedef struct {
-    uint8_t     repType;                /**< Input extension major opcode */
-    uint8_t     RepType;                /**< Always ::X_XIGrabDevice */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    uint8_t     status;
-    uint8_t     pad0;
-    uint16_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-    uint32_t    pad4;
-    uint32_t    pad5;
-    uint32_t    pad6;
-} xXIGrabDeviceReply;
-#define sz_xXIGrabDeviceReply                  32
-
-/**
- * Ungrab the specified device.
- *
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XIUngrabDevice */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Time        time;
-    uint16_t    deviceid;
-    uint16_t    pad;
-} xXIUngrabDeviceReq;
-#define sz_xXIUngrabDeviceReq                   12
-
-
-/**
- * Allow or replay events on the specified grabbed device.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XIAllowEvents */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Time        time;
-    uint16_t    deviceid;
-    uint8_t     mode;
-    uint8_t     pad;
-} xXIAllowEventsReq;
-#define sz_xXIAllowEventsReq                   12
-
-/**
- * Allow or replay events on the specified grabbed device.
- * Since XI 2.2
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XIAllowEvents */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Time        time;
-    uint16_t    deviceid;
-    uint8_t     mode;
-    uint8_t     pad;
-    uint32_t    touchid;                /**< Since XI 2.2 */
-    Window      grab_window;            /**< Since XI 2.2 */
-} xXI2_2AllowEventsReq;
-#define sz_xXI2_2AllowEventsReq                20
-
-
-/**
- * Passively grab the device.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XIPassiveGrabDevice */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Time        time;
-    Window      grab_window;
-    Cursor      cursor;
-    uint32_t    detail;
-    uint16_t    deviceid;
-    uint16_t    num_modifiers;
-    uint16_t    mask_len;
-    uint8_t     grab_type;
-    uint8_t     grab_mode;
-    uint8_t     paired_device_mode;
-    uint8_t     owner_events;
-    uint16_t    pad1;
-} xXIPassiveGrabDeviceReq;
-#define sz_xXIPassiveGrabDeviceReq              32
-
-typedef struct {
-    uint8_t     repType;                /**< Input extension major opcode */
-    uint8_t     RepType;                /**< Always ::X_XIPassiveGrabDevice */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    uint16_t    num_modifiers;
-    uint16_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-    uint32_t    pad4;
-    uint32_t    pad5;
-    uint32_t    pad6;
-} xXIPassiveGrabDeviceReply;
-#define sz_xXIPassiveGrabDeviceReply            32
-
-/**
- * Delete a passive grab for the given device.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XIPassiveUngrabDevice */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    Window      grab_window;
-    uint32_t    detail;
-    uint16_t    deviceid;
-    uint16_t    num_modifiers;
-    uint8_t     grab_type;
-    uint8_t     pad0;
-    uint16_t    pad1;
-} xXIPassiveUngrabDeviceReq;
-#define sz_xXIPassiveUngrabDeviceReq            20
-
-/**
- * List all device properties on the specified device.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XIListProperties */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    uint16_t    deviceid;
-    uint16_t    pad;
-} xXIListPropertiesReq;
-#define sz_xXIListPropertiesReq                 8
-
-typedef struct {
-    uint8_t     repType;                /**< Input extension major opcode */
-    uint8_t     RepType;                /**< Always ::X_XIListProperties */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    uint16_t    num_properties;
-    uint16_t    pad0;
-    uint32_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-    uint32_t    pad4;
-    uint32_t    pad5;
-} xXIListPropertiesReply;
-#define sz_xXIListPropertiesReply               32
-
-/**
- * Change a property on the specified device.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always ::X_XIChangeProperty */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    uint16_t    deviceid;
-    uint8_t     mode;
-    uint8_t     format;
-    Atom        property;
-    Atom        type;
-    uint32_t    num_items;
-} xXIChangePropertyReq;
-#define sz_xXIChangePropertyReq                 20
-
-/**
- * Delete the specified property.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always X_XIDeleteProperty */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    uint16_t    deviceid;
-    uint16_t    pad0;
-    Atom        property;
-} xXIDeletePropertyReq;
-#define sz_xXIDeletePropertyReq                 12
-
-/**
- * Query the specified property's values.
- */
-typedef struct {
-    uint8_t     reqType;
-    uint8_t     ReqType;                /**< Always X_XIGetProperty */
-    uint16_t    length;                 /**< Length in 4 byte units */
-    uint16_t    deviceid;
-#if defined(__cplusplus) || defined(c_plusplus)
-    uint8_t     c_delete;
-#else
-    uint8_t     delete;
-#endif
-    uint8_t     pad0;
-    Atom        property;
-    Atom        type;
-    uint32_t    offset;
-    uint32_t    len;
-} xXIGetPropertyReq;
-#define sz_xXIGetPropertyReq                    24
-
-typedef struct {
-    uint8_t     repType;                /**< Input extension major opcode */
-    uint8_t     RepType;                /**< Always X_XIGetProperty */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    Atom        type;
-    uint32_t    bytes_after;
-    uint32_t    num_items;
-    uint8_t     format;
-    uint8_t     pad0;
-    uint16_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-} xXIGetPropertyReply;
-#define sz_xXIGetPropertyReply               32
-
-typedef struct {
-    uint16_t    deviceid;
-    uint16_t    pad;
-    Barrier     barrier;
-    uint32_t    eventid;
-} xXIBarrierReleasePointerInfo;
-
-typedef struct {
-    uint8_t     reqType;                /**< Input extension major opcode */
-    uint8_t     ReqType;                /**< Always X_XIBarrierReleasePointer */
-    uint16_t    length;
-    uint32_t    num_barriers;
-    /* array of xXIBarrierReleasePointerInfo */
-} xXIBarrierReleasePointerReq;
-#define sz_xXIBarrierReleasePointerReq       8
-
-/*************************************************************************************
- *                                                                                   *
- *                                      EVENTS                                       *
- *                                                                                   *
- *************************************************************************************/
-
-/**
- * Generic XI2 event header. All XI2 events use the same header.
- */
-typedef struct
-{
-    uint8_t     type;
-    uint8_t     extension;              /**< XI extension offset */
-    uint16_t    sequenceNumber;
-    uint32_t    length;
-    uint16_t    evtype;
-    uint16_t    deviceid;
-    Time        time;
-} xXIGenericDeviceEvent;
-
-/**
- * Device hierarchy information.
- */
-typedef struct
-{
-    uint16_t    deviceid;
-    uint16_t    attachment;             /**< ID of master or paired device */
-    uint8_t     use;                    /**< ::XIMasterKeyboard,
-                                             ::XIMasterPointer,
-                                             ::XISlaveKeyboard,
-                                             ::XISlavePointer,
-                                             ::XIFloatingSlave */
-    BOOL        enabled;                /**< TRUE if the device is enabled */
-    uint16_t    pad;
-    uint32_t    flags;                  /**< ::XIMasterAdded, ::XIMasterRemoved,
-                                             ::XISlaveAttached, ::XISlaveDetached,
-                                             ::XISlaveAdded, ::XISlaveRemoved,
-                                             ::XIDeviceEnabled, ::XIDeviceDisabled */
-} xXIHierarchyInfo;
-
-/**
- * The device hierarchy has been modified. This event includes the device
- * hierarchy after the modification has been applied.
- */
-typedef struct
-{
-    uint8_t     type;                   /**< Always GenericEvent */
-    uint8_t     extension;              /**< XI extension offset */
-    uint16_t    sequenceNumber;
-    uint32_t    length;                 /**< Length in 4 byte units */
-    uint16_t    evtype;                 /**< ::XI_Hierarchy */
-    uint16_t    deviceid;
-    Time        time;
-    uint32_t    flags;                  /**< ::XIMasterAdded, ::XIMasterDeleted,
-                                             ::XISlaveAttached, ::XISlaveDetached,
-                                             ::XISlaveAdded, ::XISlaveRemoved,
-                                             ::XIDeviceEnabled, ::XIDeviceDisabled */
-    uint16_t    num_info;
-    uint16_t    pad0;
-    uint32_t    pad1;
-    uint32_t    pad2;
-} xXIHierarchyEvent;
-
-/**
- * A device has changed capabilities.
- */
-typedef struct
-{
-    uint8_t     type;                   /**< Always GenericEvent */
-    uint8_t     extension;              /**< XI extension offset */
-    uint16_t    sequenceNumber;
-    uint32_t    length;                 /**< Length in 4 byte units */
-    uint16_t    evtype;                 /**< XI_DeviceChanged */
-    uint16_t    deviceid;               /**< Device that has changed */
-    Time        time;
-    uint16_t    num_classes;            /**< Number of classes that have changed */
-    uint16_t    sourceid;               /**< Source of the new classes */
-    uint8_t     reason;                 /**< ::XISlaveSwitch, ::XIDeviceChange */
-    uint8_t     pad0;
-    uint16_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-} xXIDeviceChangedEvent;
-
-/**
- * The owner of a touch stream has passed on ownership to another client.
- */
-typedef struct
-{
-    uint8_t     type;               /**< Always GenericEvent */
-    uint8_t     extension;          /**< XI extension offset */
-    uint16_t    sequenceNumber;
-    uint32_t    length;             /**< Length in 4 byte units */
-    uint16_t    evtype;             /**< XI_TouchOwnership */
-    uint16_t    deviceid;           /**< Device that has changed */
-    Time        time;
-    uint32_t    touchid;
-    Window      root;
-    Window      event;
-    Window      child;
-/* └──────── 32 byte boundary ────────┘ */
-    uint16_t    sourceid;
-    uint16_t    pad0;
-    uint32_t    flags;
-    uint32_t    pad1;
-    uint32_t    pad2;
-} xXITouchOwnershipEvent;
-
-/**
- * Default input event for pointer, keyboard or touch input.
- */
-typedef struct
-{
-    uint8_t     type;                   /**< Always GenericEvent */
-    uint8_t     extension;              /**< XI extension offset */
-    uint16_t    sequenceNumber;
-    uint32_t    length;                 /**< Length in 4 byte uints */
-    uint16_t    evtype;
-    uint16_t    deviceid;
-    Time        time;
-    uint32_t    detail;                 /**< Keycode or button */
-    Window      root;
-    Window      event;
-    Window      child;
-/* └──────── 32 byte boundary ────────┘ */
-    FP1616      root_x;                 /**< Always screen coords, 16.16 fixed point */
-    FP1616      root_y;
-    FP1616      event_x;                /**< Always screen coords, 16.16 fixed point */
-    FP1616      event_y;
-    uint16_t    buttons_len;            /**< Len of button flags in 4 b units */
-    uint16_t    valuators_len;          /**< Len of val. flags in 4 b units */
-    uint16_t    sourceid;               /**< The source device */
-    uint16_t    pad0;
-    uint32_t    flags;                  /**< ::XIKeyRepeat */
-    xXIModifierInfo     mods;
-    xXIGroupInfo        group;
-} xXIDeviceEvent;
-
-
-/**
- * Sent when an input event is generated. RawEvents include valuator
- * information in both device-specific data (i.e. unaccelerated) and
- * processed data (i.e. accelerated, if applicable).
- */
-typedef struct
-{
-    uint8_t     type;                   /**< Always GenericEvent */
-    uint8_t     extension;              /**< XI extension offset */
-    uint16_t    sequenceNumber;
-    uint32_t    length;                 /**< Length in 4 byte uints */
-    uint16_t    evtype;                 /**< ::XI_RawEvent */
-    uint16_t    deviceid;
-    Time        time;
-    uint32_t    detail;
-    uint16_t    sourceid;               /**< The source device (XI 2.1) */
-    uint16_t    valuators_len;          /**< Length of trailing valuator
-                                             mask in 4 byte units */
-    uint32_t    flags;                  /**< ::XIKeyRepeat */
-    uint32_t    pad2;
-} xXIRawEvent;
-
-/**
- * Note that the layout of root, event, child, root_x, root_y, event_x,
- * event_y must be identical to the xXIDeviceEvent.
- */
-typedef struct
-{
-    uint8_t     type;                   /**< Always GenericEvent */
-    uint8_t     extension;              /**< XI extension offset */
-    uint16_t    sequenceNumber;
-    uint32_t    length;                 /**< Length in 4 byte uints */
-    uint16_t    evtype;                 /**< ::XI_Enter */
-    uint16_t    deviceid;
-    Time        time;
-    uint16_t    sourceid;
-    uint8_t     mode;
-    uint8_t     detail;
-    Window      root;
-    Window      event;
-    Window      child;
-/* └──────── 32 byte boundary ────────┘ */
-    FP1616      root_x;
-    FP1616      root_y;
-    FP1616      event_x;
-    FP1616      event_y;
-    BOOL        same_screen;
-    BOOL        focus;
-    uint16_t    buttons_len;            /**< Length of trailing button mask
-                                             in 4 byte units */
-    xXIModifierInfo     mods;
-    xXIGroupInfo        group;
-} xXIEnterEvent;
-
-typedef xXIEnterEvent xXILeaveEvent;
-typedef xXIEnterEvent xXIFocusInEvent;
-typedef xXIEnterEvent xXIFocusOutEvent;
-
-/**
- * Sent when a device property is created, modified or deleted. Does not
- * include property data, the client is required to query the data.
- */
-typedef struct
-{
-    uint8_t     type;                   /**< Always GenericEvent */
-    uint8_t     extension;              /**< XI extension offset */
-    uint16_t    sequenceNumber;
-    uint32_t    length;                 /**< Length in 4 byte units */
-    uint16_t    evtype;                 /**< ::XI_PropertyEvent */
-    uint16_t    deviceid;
-    Time        time;
-    Atom        property;
-    uint8_t     what;                   /**< ::XIPropertyDeleted,
-                                             ::XIPropertyCreated,
-                                             ::XIPropertyMotified */
-    uint8_t     pad0;
-    uint16_t    pad1;
-    uint32_t    pad2;
-    uint32_t    pad3;
-} xXIPropertyEvent;
-
-typedef struct
-{
-    uint8_t     type;                   /**< Always GenericEvent */
-    uint8_t     extension;              /**< XI extension offset */
-    uint16_t    sequenceNumber;
-    uint32_t    length;                 /**< Length in 4 byte units */
-    uint16_t    evtype;                 /**< ::XI_BarrierHit or ::XI_BarrierLeave */
-    uint16_t    deviceid;
-    Time        time;
-    uint32_t    eventid;
-    Window      root;
-    Window      event;
-    Barrier     barrier;
-/* └──────── 32 byte boundary ────────┘ */
-    uint32_t    dtime;
-    uint32_t    flags;                  /**< ::XIBarrierPointerReleased
-                                             ::XIBarrierDeviceIsGrabbed */
-    uint16_t    sourceid;
-    int16_t     pad;
-    FP1616      root_x;
-    FP1616      root_y;
-    FP3232      dx;
-    FP3232      dy;
-} xXIBarrierEvent;
-
-typedef xXIBarrierEvent xXIBarrierHitEvent;
-typedef xXIBarrierEvent xXIBarrierPointerReleasedEvent;
-typedef xXIBarrierEvent xXIBarrierLeaveEvent;
-
-#undef Window
-#undef Time
-#undef Atom
-#undef Cursor
-#undef Barrier
-
-#endif /* _XI2PROTO_H_ */
diff --git a/openflow/usr/include/X11/extensions/XIproto.h b/openflow/usr/include/X11/extensions/XIproto.h
deleted file mode 100644
index 82323d8..0000000
--- a/openflow/usr/include/X11/extensions/XIproto.h
+++ /dev/null
@@ -1,1758 +0,0 @@
-/************************************************************
-
-Copyright 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
-
-			All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Hewlett-Packard not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-********************************************************/
-
-#ifndef _XIPROTO_H
-#define _XIPROTO_H
-
-#include <X11/Xproto.h>
-#include <X11/X.h>
-
-/* make sure types have right sizes for protocol structures. */
-#define Window CARD32
-#define Time CARD32
-#define KeyCode CARD8
-#define Mask CARD32
-#define Atom CARD32
-#define Cursor CARD32
-
-/*********************************************************
- *
- * number of events, errors, and extension name.
- *
- */
-
-#define MORE_EVENTS	0x80
-#define DEVICE_BITS	0x7F
-
-#define InputClassBits	0x3F	/* bits in mode field for input classes */
-#define ModeBitsShift	6	/* amount to shift the remaining bits   */
-
-#define numInputClasses 7
-
-#define IEVENTS         17       /* does NOT include generic events */
-#define IERRORS         5
-#define IREQUESTS       39
-
-#define CLIENT_REQ      1
-
-typedef struct  _XExtEventInfo
-    {
-    Mask	mask;
-    BYTE	type;
-    BYTE	word;
-    } XExtEventInfo;
-
-#ifndef _XITYPEDEF_POINTER
-typedef void *Pointer;
-#endif
-
-struct tmask
-    {
-    Mask	mask;
-    void        *dev;
-    };
-
-/*********************************************************
- *
- * Event constants used by library.
- *
- */
-
-#define XI_DeviceValuator		0
-#define XI_DeviceKeyPress		1
-#define XI_DeviceKeyRelease		2
-#define XI_DeviceButtonPress		3
-#define XI_DeviceButtonRelease		4
-#define XI_DeviceMotionNotify		5
-#define XI_DeviceFocusIn		6
-#define XI_DeviceFocusOut		7
-#define XI_ProximityIn			8
-#define XI_ProximityOut			9
-#define XI_DeviceStateNotify		10
-#define XI_DeviceMappingNotify		11
-#define XI_ChangeDeviceNotify		12
-#define XI_DeviceKeystateNotify		13
-#define XI_DeviceButtonstateNotify	14
-#define XI_DevicePresenceNotify		15
-#define XI_DevicePropertyNotify         16
-
-/*********************************************************
- *
- * Protocol request constants
- *
- */
-
-#define X_GetExtensionVersion		1
-#define X_ListInputDevices		2
-#define X_OpenDevice			3
-#define X_CloseDevice			4
-#define X_SetDeviceMode			5
-#define X_SelectExtensionEvent		6
-#define X_GetSelectedExtensionEvents	7
-#define X_ChangeDeviceDontPropagateList 8
-#define X_GetDeviceDontPropagateList	9
-#define X_GetDeviceMotionEvents		10
-#define X_ChangeKeyboardDevice		11
-#define X_ChangePointerDevice		12
-#define X_GrabDevice			13
-#define X_UngrabDevice			14
-#define X_GrabDeviceKey			15
-#define X_UngrabDeviceKey		16
-#define X_GrabDeviceButton		17
-#define X_UngrabDeviceButton		18
-#define X_AllowDeviceEvents		19
-#define X_GetDeviceFocus		20
-#define X_SetDeviceFocus		21
-#define X_GetFeedbackControl		22
-#define X_ChangeFeedbackControl		23
-#define X_GetDeviceKeyMapping		24
-#define X_ChangeDeviceKeyMapping	25
-#define X_GetDeviceModifierMapping	26
-#define X_SetDeviceModifierMapping	27
-#define X_GetDeviceButtonMapping	28
-#define X_SetDeviceButtonMapping	29
-#define X_QueryDeviceState		30
-#define X_SendExtensionEvent		31
-#define X_DeviceBell			32
-#define X_SetDeviceValuators		33
-#define X_GetDeviceControl		34
-#define X_ChangeDeviceControl		35
-/* XI 1.5 */
-#define X_ListDeviceProperties          36
-#define X_ChangeDeviceProperty          37
-#define X_DeleteDeviceProperty          38
-#define X_GetDeviceProperty             39
-
-/*********************************************************
- *
- * Protocol request and reply structures.
- *
- * GetExtensionVersion.
- *
- */
-
-typedef struct {
-    CARD8	reqType;       /* input extension major code   */
-    CARD8	ReqType;       /* always X_GetExtensionVersion */
-    CARD16	length B16;
-    CARD16	nbytes B16;
-    CARD8	pad1, pad2;
-} xGetExtensionVersionReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;	/* always X_GetExtensionVersion */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	major_version B16;
-    CARD16	minor_version B16;
-    BOOL	present;
-    CARD8	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-} xGetExtensionVersionReply;
-
-/*********************************************************
- *
- * ListInputDevices.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;	/* always X_ListInputDevices	*/
-    CARD16	length B16;
-} xListInputDevicesReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;        /* always X_ListInputDevices	*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	ndevices;
-    CARD8	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-} xListInputDevicesReply;
-
-typedef struct _xDeviceInfo *xDeviceInfoPtr;
-
-typedef struct _xAnyClassinfo *xAnyClassPtr;
-
-typedef struct _xAnyClassinfo {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;
-#else
-    CARD8	class;
-#endif
-    CARD8	length;
-    } xAnyClassInfo;
-
-typedef struct _xDeviceInfo {
-    CARD32	type B32;
-    CARD8	id;
-    CARD8	num_classes;
-    CARD8	use;      /* IsXPointer | IsXKeyboard | IsXExtension... */
-    CARD8	attached; /* id of master dev (if IsXExtension..) */
-    } xDeviceInfo;
-
-typedef struct _xKeyInfo *xKeyInfoPtr;
-
-typedef struct _xKeyInfo {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;
-#else
-    CARD8	class;
-#endif
-    CARD8	length;
-    KeyCode	min_keycode;
-    KeyCode	max_keycode;
-    CARD16	num_keys B16;
-    CARD8	pad1,pad2;
-    } xKeyInfo;
-
-typedef struct _xButtonInfo *xButtonInfoPtr;
-
-typedef struct _xButtonInfo {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;
-#else
-    CARD8	class;
-#endif
-    CARD8	length;
-    CARD16	num_buttons B16;
-    } xButtonInfo;
-
-typedef struct _xValuatorInfo *xValuatorInfoPtr;
-
-typedef struct _xValuatorInfo {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;
-#else
-    CARD8	class;
-#endif
-    CARD8	length;
-    CARD8	num_axes;
-    CARD8	mode;
-    CARD32	motion_buffer_size B32;
-    } xValuatorInfo;
-
-typedef struct _xAxisInfo *xAxisInfoPtr;
-
-typedef struct _xAxisInfo {
-    CARD32	resolution B32;
-    CARD32	min_value B32;
-    CARD32	max_value B32;
-    } xAxisInfo;
-
-/*********************************************************
- *
- * OpenDevice.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_OpenDevice		*/
-    CARD16	length B16;
-    CARD8       deviceid;
-    BYTE	pad1, pad2, pad3;
-} xOpenDeviceReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;	/* always X_OpenDevice		*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	num_classes;
-    BYTE	pad1, pad2, pad3;
-    CARD32	pad00 B32;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    } xOpenDeviceReply;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;
-#else
-    CARD8	class;
-#endif
-    CARD8	event_type_base;
-    } xInputClassInfo;
-
-/*********************************************************
- *
- * CloseDevice.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_CloseDevice	*/
-    CARD16	length B16;
-    CARD8       deviceid;
-    BYTE	pad1, pad2, pad3;
-} xCloseDeviceReq;
-
-/*********************************************************
- *
- * SetDeviceMode.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;	/* always X_SetDeviceMode	*/
-    CARD16	length B16;
-    CARD8       deviceid;
-    CARD8       mode;
-    BYTE	pad1, pad2;
-} xSetDeviceModeReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;	/* always X_SetDeviceMode	*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	status;
-    BYTE	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-} xSetDeviceModeReply;
-
-/*********************************************************
- *
- * SelectExtensionEvent.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_SelectExtensionEvent */
-    CARD16	length B16;
-    Window	window B32;
-    CARD16	count B16;
-    CARD16	pad00 B16;
-} xSelectExtensionEventReq;
-
-/*********************************************************
- *
- * GetSelectedExtensionEvent.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* X_GetSelectedExtensionEvents */
-    CARD16	length B16;
-    Window	window B32;
-} xGetSelectedExtensionEventsReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;	/* GetSelectedExtensionEvents	*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	this_client_count B16;
-    CARD16	all_clients_count B16;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-} xGetSelectedExtensionEventsReply;
-
-/*********************************************************
- *
- * ChangeDeviceDontPropagateList.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* X_ChangeDeviceDontPropagateList */
-    CARD16	length B16;
-    Window	window B32;
-    CARD16	count B16;
-    CARD8	mode;
-    BYTE	pad;
-} xChangeDeviceDontPropagateListReq;
-
-/*********************************************************
- *
- * GetDeviceDontPropagateList.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* X_GetDeviceDontPropagateList */
-    CARD16	length B16;
-    Window	window B32;
-} xGetDeviceDontPropagateListReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;        /* GetDeviceDontPropagateList   */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	count B16;
-    CARD16	pad00 B16;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-    } xGetDeviceDontPropagateListReply;
-
-/*********************************************************
- *
- * GetDeviceMotionEvents.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_GetDeviceMotionEvents*/
-    CARD16	length B16;
-    Time	start B32;
-    Time	stop B32;
-    CARD8	deviceid;
-    BYTE	pad1, pad2, pad3;
-} xGetDeviceMotionEventsReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply */
-    CARD8	RepType;        /* always X_GetDeviceMotionEvents  */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	nEvents B32;
-    CARD8	axes;
-    CARD8	mode;
-    BYTE	pad1, pad2;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-} xGetDeviceMotionEventsReply;
-
-/*********************************************************
- *
- * ChangeKeyboardDevice.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* X_ChangeKeyboardDevice	*/
-    CARD16	length B16;
-    CARD8	deviceid;
-    BYTE	pad1, pad2, pad3;
-} xChangeKeyboardDeviceReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;        /* always X_ChangeKeyboardDevice*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;  /* 0 */
-    CARD8	status;
-    BYTE	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-    } xChangeKeyboardDeviceReply;
-
-/*********************************************************
- *
- * ChangePointerDevice.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* X_ChangePointerDevice	*/
-    CARD16	length B16;
-    CARD8	xaxis;
-    CARD8	yaxis;
-    CARD8	deviceid;
-    BYTE	pad1;
-} xChangePointerDeviceReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;        /* always X_ChangePointerDevice */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;  /* 0 */
-    CARD8	status;
-    BYTE	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-    } xChangePointerDeviceReply;
-
-/*********************************************************
- *
- * GrabDevice.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_GrabDevice */
-    CARD16	length B16;
-    Window	grabWindow B32;
-    Time	time B32;
-    CARD16	event_count B16;
-    CARD8	this_device_mode;
-    CARD8	other_devices_mode;
-    BOOL	ownerEvents;
-    CARD8	deviceid;
-    CARD16	pad01 B16;
-} xGrabDeviceReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;        /* always X_GrabDevice	*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;  /* 0 */
-    CARD8	status;
-    BYTE	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-    } xGrabDeviceReply;
-
-/*********************************************************
- *
- * UngrabDevice.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_UnGrabDevice	*/
-    CARD16	length B16;
-    Time	time B32;
-    CARD8	deviceid;
-    BYTE	pad1, pad2, pad3;
-} xUngrabDeviceReq;
-
-/*********************************************************
- *
- * GrabDeviceKey.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_GrabDeviceKey	*/
-    CARD16	length B16;
-    Window	grabWindow B32;
-    CARD16	event_count B16;
-    CARD16	modifiers B16;
-    CARD8	modifier_device;
-    CARD8	grabbed_device;
-    CARD8	key;
-    BYTE	this_device_mode;
-    BYTE	other_devices_mode;
-    BOOL	ownerEvents;
-    BYTE	pad1, pad2;
-} xGrabDeviceKeyReq;
-
-/*********************************************************
- *
- * UngrabDeviceKey.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_UngrabDeviceKey	*/
-    CARD16	length B16;
-    Window	grabWindow B32;
-    CARD16	modifiers B16;
-    CARD8	modifier_device;
-    CARD8	key;
-    CARD8	grabbed_device;
-    BYTE	pad1, pad2, pad3;
-} xUngrabDeviceKeyReq;
-
-/*********************************************************
- *
- * GrabDeviceButton.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_GrabDeviceButton	*/
-    CARD16	length B16;
-    Window	grabWindow B32;
-    CARD8	grabbed_device;
-    CARD8	modifier_device;
-    CARD16	event_count B16;
-    CARD16	modifiers B16;
-    BYTE	this_device_mode;
-    BYTE	other_devices_mode;
-    CARD8	button;
-    BOOL	ownerEvents;
-    BYTE	pad1, pad2;
-} xGrabDeviceButtonReq;
-
-/*********************************************************
- *
- * UngrabDeviceButton.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_UngrabDeviceButton	*/
-    CARD16	length B16;
-    Window	grabWindow B32;
-    CARD16	modifiers B16;
-    CARD8	modifier_device;
-    CARD8	button;
-    CARD8	grabbed_device;
-    BYTE	pad1, pad2, pad3;
-} xUngrabDeviceButtonReq;
-
-/*********************************************************
- *
- * AllowDeviceEvents.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* always X_AllowDeviceEvents	*/
-    CARD16	length B16;
-    Time	time B32;
-    CARD8	mode;
-    CARD8	deviceid;
-    BYTE	pad1, pad2;
-} xAllowDeviceEventsReq;
-
-/*********************************************************
- *
- * GetDeviceFocus.
- *
- */
-
-typedef struct {
-    CARD8	reqType;        /* input extension major code   */
-    CARD8	ReqType;        /* always X_GetDeviceFocus	*/
-    CARD16	length B16;
-    CARD8	deviceid;
-    BYTE	pad1, pad2, pad3;
-} xGetDeviceFocusReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;        /* always X_GetDeviceFocus	*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	focus B32;
-    Time	time B32;
-    CARD8	revertTo;
-    BYTE	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    } xGetDeviceFocusReply;
-
-/*********************************************************
- *
- * SetDeviceFocus.
- *
- */
-
-typedef struct {
-    CARD8	reqType;        /* input extension major code   */
-    CARD8	ReqType;        /* always X_SetDeviceFocus	*/
-    CARD16	length B16;
-    Window	focus B32;
-    Time	time B32;
-    CARD8	revertTo;
-    CARD8	device;
-    CARD16	pad01 B16;
-} xSetDeviceFocusReq;
-
-/*********************************************************
- *
- * GetFeedbackControl.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* X_GetFeedbackControl	*/
-    CARD16	length B16;
-    CARD8	deviceid;
-    BYTE	pad1, pad2, pad3;
-} xGetFeedbackControlReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;        /* always X_GetFeedbackControl	*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	num_feedbacks B16;
-    CARD16	pad01 B16;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-    CARD32	pad06 B32;
-} xGetFeedbackControlReply;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class		*/
-#else
-    CARD8	class;		/* feedback class		*/
-#endif
-    CARD8	id;		/* feedback id		*/
-    CARD16	length B16;	/* feedback length		*/
-} xFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8   c_class;
-#else
-    CARD8   class;
-#endif
-    CARD8   id;
-    CARD16  length B16;
-    CARD16  pitch B16;
-    CARD16  duration B16;
-    CARD32  led_mask B32;
-    CARD32  led_values B32;
-    BOOL    global_auto_repeat;
-    CARD8   click;
-    CARD8   percent;
-    BYTE    pad;
-    BYTE    auto_repeats[32];
-} xKbdFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8   c_class;
-#else
-    CARD8   class;
-#endif
-    CARD8   id;
-    CARD16  length B16;
-    CARD8   pad1,pad2;
-    CARD16  accelNum B16;
-    CARD16  accelDenom B16;
-    CARD16  threshold B16;
-} xPtrFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;
-    CARD16	length B16;	/* feedback length		*/
-    CARD32	resolution B32;
-    INT32	min_value B32;
-    INT32	max_value B32;
-} xIntegerFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;
-    CARD16	length B16;	/* feedback length		*/
-    CARD16	max_symbols B16;
-    CARD16	num_syms_supported B16;
-} xStringFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;
-    CARD16	length B16;	/* feedback length		*/
-    CARD8	percent;
-    BYTE	pad1, pad2, pad3;
-    CARD16	pitch B16;
-    CARD16	duration B16;
-} xBellFeedbackState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;
-    CARD16	length B16;	/* feedback length		*/
-    CARD32	led_mask B32;
-    CARD32	led_values B32;
-} xLedFeedbackState;
-
-/*********************************************************
- *
- * ChangeFeedbackControl.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* X_ChangeFeedbackControl	*/
-    CARD16	length B16;
-    CARD32	mask B32;
-    CARD8	deviceid;
-    CARD8	feedbackid;
-    BYTE	pad1, pad2;
-} xChangeFeedbackControlReq;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;		/* feedback id		*/
-    CARD16	length B16;	/* feedback length		*/
-} xFeedbackCtl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;		/* feedback length		*/
-    CARD16	length B16;	/* feedback length		*/
-    KeyCode	key;
-    CARD8	auto_repeat_mode;
-    INT8	click;
-    INT8	percent;
-    INT16	pitch B16;
-    INT16	duration B16;
-    CARD32	led_mask B32;
-    CARD32	led_values B32;
-} xKbdFeedbackCtl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;		/* feedback id		*/
-    CARD16	length B16;	/* feedback length		*/
-    CARD8	pad1,pad2;
-    INT16	num B16;
-    INT16	denom B16;
-    INT16	thresh B16;
-} xPtrFeedbackCtl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;		/* feedback id		*/
-    CARD16	length B16;	/* feedback length		*/
-    INT32	int_to_display B32;
-} xIntegerFeedbackCtl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;		/* feedback id		*/
-    CARD16	length B16;	/* feedback length		*/
-    CARD8	pad1,pad2;
-    CARD16	num_keysyms B16;
-} xStringFeedbackCtl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;		/* feedback id		*/
-    CARD16	length B16;	/* feedback length		*/
-    INT8	percent;
-    BYTE	pad1, pad2, pad3;
-    INT16	pitch B16;
-    INT16	duration B16;
-} xBellFeedbackCtl;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;	/* feedback class id		*/
-#else
-    CARD8	class;		/* feedback class id		*/
-#endif
-    CARD8	id;		/* feedback id		*/
-    CARD16	length B16;	/* feedback length		*/
-    CARD32	led_mask B32;
-    CARD32	led_values B32;
-} xLedFeedbackCtl;
-
-/*********************************************************
- *
- * GetDeviceKeyMapping.
- *
- */
-
-typedef struct {
-    CARD8	reqType;        /* input extension major code   */
-    CARD8	ReqType;	/* always X_GetDeviceKeyMapping */
-    CARD16	length B16;
-    CARD8	deviceid;
-    KeyCode	firstKeyCode;
-    CARD8	count;
-    BYTE	pad1;
-} xGetDeviceKeyMappingReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;	/* always X_GetDeviceKeyMapping */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	keySymsPerKeyCode;
-    CARD8	pad0;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGetDeviceKeyMappingReply;
-
-/*********************************************************
- *
- * ChangeDeviceKeyMapping.
- *
- */
-
-typedef struct {
-    CARD8	reqType;        /* input extension major code   */
-    CARD8	ReqType;        /* always X_ChangeDeviceKeyMapping */
-    CARD16	length B16;
-    CARD8	deviceid;
-    KeyCode	firstKeyCode;
-    CARD8	keySymsPerKeyCode;
-    CARD8	keyCodes;
-} xChangeDeviceKeyMappingReq;
-
-/*********************************************************
- *
- * GetDeviceModifierMapping.
- *
- */
-
-typedef struct {
-    CARD8	reqType;        /* input extension major code   */
-    CARD8	ReqType;        /* always X_GetDeviceModifierMapping */
-    CARD16	length B16;
-    CARD8	deviceid;
-    BYTE	pad1, pad2, pad3;
-} xGetDeviceModifierMappingReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply */
-    CARD8	RepType;        /* always X_GetDeviceModifierMapping */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	numKeyPerModifier;
-    CARD8	pad0;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGetDeviceModifierMappingReply;
-
-/*********************************************************
- *
- * SetDeviceModifierMapping.
- *
- */
-
-typedef struct {
-    CARD8	reqType;        /* input extension major code   */
-    CARD8	ReqType;        /* always X_SetDeviceModifierMapping */
-    CARD16	length B16;
-    CARD8	deviceid;
-    CARD8	numKeyPerModifier;
-    CARD16	pad1 B16;
-} xSetDeviceModifierMappingReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply */
-    CARD8	RepType;        /* always X_SetDeviceModifierMapping */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	success;
-    CARD8	pad0;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xSetDeviceModifierMappingReply;
-
-/*********************************************************
- *
- * GetDeviceButtonMapping.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* X_GetDeviceButtonMapping     */
-    CARD16	length B16;
-    CARD8	deviceid;
-    BYTE	pad1, pad2, pad3;
-} xGetDeviceButtonMappingReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply */
-    CARD8	RepType;        /* always X_GetDeviceButtonMapping */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	nElts;
-    BYTE	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-} xGetDeviceButtonMappingReply;
-
-/*********************************************************
- *
- * SetDeviceButtonMapping.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;        /* X_SetDeviceButtonMapping     */
-    CARD16	length B16;
-    CARD8	deviceid;
-    CARD8	map_length;
-    BYTE	pad1, pad2;
-} xSetDeviceButtonMappingReq;
-
-typedef struct {
-    CARD8	repType;		/* X_Reply */
-    CARD8	RepType;	/* always X_SetDeviceButtonMapping */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	status;
-    BYTE	pad0;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xSetDeviceButtonMappingReply;
-
-/*********************************************************
- *
- * QueryDeviceState.
- *
- */
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	ReqType;        /* always X_QueryDeviceState */
-    CARD16	length B16;
-    CARD8	deviceid;
-    BYTE	pad1, pad2, pad3;
-} xQueryDeviceStateReq;
-
-typedef struct {
-    CARD8	repType;		/* X_Reply */
-    CARD8	RepType;	/* always X_QueryDeviceState	*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	num_classes;
-    BYTE	pad0;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xQueryDeviceStateReply;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;
-#else
-    CARD8	class;
-#endif
-    CARD8	length;
-    CARD8	num_keys;
-    BYTE	pad1;
-    CARD8	keys[32];
-} xKeyState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;
-#else
-    CARD8	class;
-#endif
-    CARD8	length;
-    CARD8	num_buttons;
-    BYTE	pad1;
-    CARD8	buttons[32];
-} xButtonState;
-
-typedef struct {
-#if defined(__cplusplus) || defined(c_plusplus)
-    CARD8	c_class;
-#else
-    CARD8	class;
-#endif
-    CARD8	length;
-    CARD8	num_valuators;
-    CARD8	mode;
-} xValuatorState;
-
-/*********************************************************
- *
- * SendExtensionEvent.
- * THIS REQUEST MUST BE KEPT A MULTIPLE OF 8 BYTES IN LENGTH!
- * MORE EVENTS MAY FOLLOW AND THEY MUST BE QUAD-ALIGNED!
- *
- */
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	ReqType;        /* always X_SendExtensionEvent */
-    CARD16	length B16;
-    Window	destination B32;
-    CARD8	deviceid;
-    BOOL	propagate;
-    CARD16	count B16;
-    CARD8	num_events;
-    BYTE	pad1,pad2,pad3;
-} xSendExtensionEventReq;
-
-/*********************************************************
- *
- * DeviceBell.
- *
- */
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	ReqType;        /* always X_DeviceBell */
-    CARD16	length B16;
-    CARD8	deviceid;
-    CARD8	feedbackid;
-    CARD8	feedbackclass;
-    INT8	percent;
-} xDeviceBellReq;
-
-/*********************************************************
- *
- * SetDeviceValuators.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;	/* always X_SetDeviceValuators	*/
-    CARD16	length B16;
-    CARD8       deviceid;
-    CARD8       first_valuator;
-    CARD8       num_valuators;
-    BYTE	pad1;
-} xSetDeviceValuatorsReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;	/* always X_SetDeviceValuators	*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	status;
-    BYTE	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-} xSetDeviceValuatorsReply;
-
-/*********************************************************
- *
- * GetDeviceControl.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;	/* always X_GetDeviceControl	*/
-    CARD16	length B16;
-    CARD16      control B16;
-    CARD8       deviceid;
-    BYTE	pad2;
-} xGetDeviceControlReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;	/* always X_GetDeviceControl	*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	status;
-    BYTE	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-} xGetDeviceControlReply;
-
-typedef struct {
-    CARD16	control B16;	/* control type		*/
-    CARD16	length B16;	/* control length		*/
-} xDeviceState;
-
-typedef struct {
-    CARD16	control B16;		/* control type		*/
-    CARD16	length B16;		/* control length		*/
-    CARD32	num_valuators B32;	/* number of valuators		*/
-} xDeviceResolutionState;
-
-typedef struct {
-     CARD16         control B16;
-     CARD16         length B16;
-     INT32          min_x B32;
-     INT32          max_x B32;
-     INT32          min_y B32;
-     INT32          max_y B32;
-     CARD32         flip_x B32;
-     CARD32         flip_y B32;
-     CARD32         rotation B32;
-     CARD32         button_threshold B32;
-} xDeviceAbsCalibState;
-
-typedef struct {
-     CARD16         control B16;
-     CARD16         length B16;
-     CARD32         offset_x B32;
-     CARD32         offset_y B32;
-     CARD32         width B32;
-     CARD32         height B32;
-     CARD32         screen B32;
-     CARD32         following B32;
-} xDeviceAbsAreaState;
-
-typedef struct {
-    CARD16      control B16;            /* control type                 */
-    CARD16      length  B16;            /* control length               */
-    CARD8       status;
-    CARD8       iscore;
-    CARD16      pad1 B16;
-} xDeviceCoreState;
-
-typedef struct {
-    CARD16      control B16;            /* control type                 */
-    CARD16      length  B16;            /* control length               */
-    CARD8       enable;
-    CARD8       pad0;
-    CARD16      pad1 B16;
-} xDeviceEnableState;
-
-/*********************************************************
- *
- * ChangeDeviceControl.
- *
- */
-
-typedef struct {
-    CARD8	reqType;	/* input extension major code	*/
-    CARD8	ReqType;	/* always X_ChangeDeviceControl */
-    CARD16	length B16;
-    CARD16      control B16;
-    CARD8       deviceid;
-    BYTE        pad0;
-} xChangeDeviceControlReq;
-
-typedef struct {
-    CARD8	repType;	/* X_Reply			*/
-    CARD8	RepType;	/* always X_ChangeDeviceControl	*/
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	status;
-    BYTE	pad1, pad2, pad3;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-} xChangeDeviceControlReply;
-
-typedef struct {
-    CARD16	control B16;	/* control type		*/
-    CARD16	length B16;	/* control length		*/
-} xDeviceCtl;
-
-typedef struct {
-    CARD16	control B16;		/* control type		*/
-    CARD16	length B16;		/* control length		*/
-    CARD8	first_valuator;		/* first valuator to change     */
-    CARD8	num_valuators;		/* number of valuators to change*/
-    CARD8	pad1,pad2;
-} xDeviceResolutionCtl;
-
-typedef struct {
-     CARD16         control B16;
-     CARD16         length B16;
-     INT32          min_x;
-     INT32          max_x;
-     INT32          min_y;
-     INT32          max_y;
-     CARD32         flip_x;
-     CARD32         flip_y;
-     CARD32         rotation;
-     CARD32         button_threshold;
-} xDeviceAbsCalibCtl;
-
-typedef struct {
-     CARD16         control B16;
-     CARD16         length B16;
-     CARD32         offset_x;
-     CARD32         offset_y;
-     INT32          width;
-     INT32          height;
-     INT32          screen;
-     CARD32         following;
-} xDeviceAbsAreaCtl;
-
-typedef struct {
-    CARD16          control B16;
-    CARD16          length  B16;
-    CARD8           status;
-    CARD8           pad0;
-    CARD16          pad1 B16;
-} xDeviceCoreCtl;
-
-typedef struct {
-    CARD16          control B16;
-    CARD16          length  B16;
-    CARD8           enable;
-    CARD8           pad0;
-    CARD16          pad1 B16;
-} xDeviceEnableCtl;
-
-/* XI 1.5 */
-
-/*********************************************************
- *
- * ListDeviceProperties.
- *
- */
-
-typedef struct {
-    CARD8       reqType;        /* input extension major opcode */
-    CARD8       ReqType;        /* always X_ListDeviceProperties */
-    CARD16      length B16;
-    CARD8       deviceid;
-    CARD8       pad0;
-    CARD16      pad1 B16;
-} xListDevicePropertiesReq;
-
-typedef struct {
-    CARD8       repType;        /* X_Reply                       */
-    CARD8       RepType;        /* always X_ListDeviceProperties */
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD16      nAtoms B16;
-    CARD16      pad1 B16;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
-} xListDevicePropertiesReply;
-
-/*********************************************************
- *
- * ChangeDeviceProperty.
- *
- */
-
-typedef struct {
-    CARD8       reqType;        /* input extension major opcode */
-    CARD8       ReqType;        /* always X_ChangeDeviceProperty */
-    CARD16      length B16;
-    Atom        property B32;
-    Atom        type B32;
-    CARD8       deviceid;
-    CARD8       format;
-    CARD8       mode;
-    CARD8       pad;
-    CARD32      nUnits B32;
-} xChangeDevicePropertyReq;
-
-/*********************************************************
- *
- * DeleteDeviceProperty.
- *
- */
-
-typedef struct {
-    CARD8       reqType;        /* input extension major opcode */
-    CARD8       ReqType;        /* always X_DeleteDeviceProperty */
-    CARD16      length B16;
-    Atom        property B32;
-    CARD8       deviceid;
-    CARD8       pad0;
-    CARD16      pad1 B16;
-} xDeleteDevicePropertyReq;
-
-/*********************************************************
- *
- * GetDeviceProperty.
- *
- */
-
-typedef struct {
-    CARD8       reqType;        /* input extension major opcode */
-    CARD8       ReqType;        /* always X_GetDeviceProperty */
-    CARD16      length B16;
-    Atom        property B32;
-    Atom        type B32;
-    CARD32      longOffset B32;
-    CARD32      longLength B32;
-    CARD8       deviceid;
-#if defined(__cplusplus) || defined(c_plusplus)
-    BOOL        c_delete;
-#else
-    BOOL        delete;
-#endif
-    CARD16      pad;
-} xGetDevicePropertyReq;
-
-typedef struct {
-    CARD8       repType;        /* X_Reply                        */
-    CARD8       RepType;        /* always X_GetDeviceProperty   */
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    Atom        propertyType B32;
-    CARD32      bytesAfter B32;
-    CARD32      nItems B32;
-    CARD8       format;
-    CARD8       deviceid;
-    CARD16      pad1 B16;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-} xGetDevicePropertyReply;
-
-
-/**********************************************************
- *
- * Input extension events.
- *
- * DeviceValuator
- *
- */
-
-typedef struct
-    {
-    BYTE	type;
-    CARD8       deviceid;
-    CARD16	sequenceNumber B16;
-    KeyButMask  device_state B16;
-    CARD8	num_valuators;
-    CARD8       first_valuator;
-    INT32	valuator0 B32;
-    INT32	valuator1 B32;
-    INT32	valuator2 B32;
-    INT32	valuator3 B32;
-    INT32	valuator4 B32;
-    INT32	valuator5 B32;
-    }  deviceValuator;
-
-/**********************************************************
- *
- * DeviceKeyButtonPointer.
- *
- * Used for: DeviceKeyPress, DeviceKeyRelease,
- *	     DeviceButtonPress, DeviceButtonRelease,
- *	     ProximityIn, ProximityOut
- *	     DeviceMotionNotify,
- *
- */
-
-typedef struct
-    {
-    BYTE	type;
-    BYTE        detail;
-    CARD16	sequenceNumber B16;
-    Time        time B32;
-    Window      root B32;
-    Window      event B32;
-    Window      child B32;
-    INT16       root_x B16;
-    INT16       root_y B16;
-    INT16       event_x B16;
-    INT16       event_y B16;
-    KeyButMask  state B16;
-    BOOL        same_screen;
-    CARD8       deviceid;
-    }  deviceKeyButtonPointer;
-
-/**********************************************************
- *
- * DeviceFocus.
- *
- */
-
-typedef struct
-    {
-    BYTE	type;
-    BYTE        detail;
-    CARD16	sequenceNumber B16;
-    Time        time B32;
-    Window      window B32;
-    BYTE	mode;
-    CARD8       deviceid;
-    BYTE	pad1, pad2;
-    CARD32	pad00 B32;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    }  deviceFocus;
-
-/**********************************************************
- *
- * DeviceStateNotify.
- *
- * Note that the two high-order bits in the classes_reported
- * field are the proximity state (InProximity or OutOfProximity),
- * and the device mode (Absolute or Relative), respectively.
- *
- */
-
-typedef struct
-    {
-    BYTE	type;
-    BYTE        deviceid;
-    CARD16	sequenceNumber B16;
-    Time        time B32;
-    CARD8	num_keys;
-    CARD8	num_buttons;
-    CARD8	num_valuators;
-    CARD8       classes_reported;
-    CARD8       buttons[4];
-    CARD8       keys[4];
-    INT32	valuator0 B32;
-    INT32	valuator1 B32;
-    INT32	valuator2 B32;
-    }  deviceStateNotify;
-
-/**********************************************************
- *
- * DeviceKeyStateNotify.
- *
- */
-
-typedef struct
-    {
-    BYTE	type;
-    BYTE        deviceid;
-    CARD16	sequenceNumber B16;
-    CARD8       keys[28];
-    }  deviceKeyStateNotify;
-
-/**********************************************************
- *
- * DeviceButtonStateNotify.
- *
- */
-
-typedef struct
-    {
-    BYTE	type;
-    BYTE        deviceid;
-    CARD16	sequenceNumber B16;
-    CARD8       buttons[28];
-    }  deviceButtonStateNotify;
-
-/**********************************************************
- *
- * DeviceMappingNotify.
- * Fields must be kept in sync with core mappingnotify event.
- *
- */
-
-typedef struct
-    {
-    BYTE	type;
-    BYTE        deviceid;
-    CARD16	sequenceNumber B16;
-    CARD8       request;
-    KeyCode     firstKeyCode;
-    CARD8       count;
-    BYTE        pad1;
-    Time        time B32;
-    CARD32	pad00 B32;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    }  deviceMappingNotify;
-
-/**********************************************************
- *
- * ChangeDeviceNotify.
- *
- */
-
-typedef struct
-    {
-    BYTE	type;
-    BYTE        deviceid;
-    CARD16	sequenceNumber B16;
-    Time        time B32;
-    CARD8       request;
-    BYTE        pad1, pad2, pad3;
-    CARD32	pad00 B32;
-    CARD32	pad01 B32;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    }  changeDeviceNotify;
-
-/**********************************************************
- *
- * devicePresenceNotify.
- *
- */
-
-typedef struct
-    {
-    BYTE	type;
-    BYTE        pad00;
-    CARD16	sequenceNumber B16;
-    Time        time B32;
-    BYTE        devchange; /* Device{Added|Removed|Enabled|Disabled|ControlChanged} */
-    BYTE        deviceid;
-    CARD16      control B16;
-    CARD32	pad02 B32;
-    CARD32	pad03 B32;
-    CARD32	pad04 B32;
-    CARD32	pad05 B32;
-    CARD32	pad06 B32;
-    }  devicePresenceNotify;
-
-
-/*********************************************************
- * DevicePropertyNotifyEvent
- *
- * Sent whenever a device's property changes.
- *
- */
-
-typedef struct
-    {
-    BYTE        type;
-    BYTE        state;               /* NewValue or Deleted */
-    CARD16      sequenceNumber B16;
-    CARD32      time B32;
-    Atom        atom B32;            /* affected property */
-    CARD32      pad0 B32;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD16      pad5 B16;
-    CARD8       pad4;
-    CARD8       deviceid;            /* id of device */
-    } devicePropertyNotify;
-
-#undef Window
-#undef Time
-#undef KeyCode
-#undef Mask
-#undef Atom
-#undef Cursor
-
-#endif
diff --git a/openflow/usr/include/X11/extensions/XKB.h b/openflow/usr/include/X11/extensions/XKB.h
deleted file mode 100644
index ee4f740..0000000
--- a/openflow/usr/include/X11/extensions/XKB.h
+++ /dev/null
@@ -1,786 +0,0 @@
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#ifndef _XKB_H_
-#define	_XKB_H_
-
-    /*
-     * XKB request codes, used in:
-     *  -  xkbReqType field of all requests
-     *  -  requestMinor field of some events
-     */
-#define	X_kbUseExtension		 0
-#define	X_kbSelectEvents	 	 1
-#define	X_kbBell			 3
-#define	X_kbGetState			 4
-#define	X_kbLatchLockState		 5
-#define	X_kbGetControls			 6
-#define	X_kbSetControls			 7
-#define	X_kbGetMap			 8
-#define	X_kbSetMap			 9
-#define	X_kbGetCompatMap		10
-#define	X_kbSetCompatMap		11
-#define	X_kbGetIndicatorState		12
-#define	X_kbGetIndicatorMap		13
-#define	X_kbSetIndicatorMap		14
-#define	X_kbGetNamedIndicator		15
-#define	X_kbSetNamedIndicator		16
-#define	X_kbGetNames			17
-#define	X_kbSetNames			18
-#define	X_kbGetGeometry			19
-#define	X_kbSetGeometry			20
-#define	X_kbPerClientFlags		21
-#define	X_kbListComponents		22
-#define	X_kbGetKbdByName		23
-#define	X_kbGetDeviceInfo		24
-#define	X_kbSetDeviceInfo		25
-#define	X_kbSetDebuggingFlags		101
-
-    /*
-     * In the X sense, XKB reports only one event.
-     * The type field of all XKB events is XkbEventCode
-     */
-#define	XkbEventCode			0
-#define	XkbNumberEvents			(XkbEventCode+1)
-
-    /*
-     * XKB has a minor event code so it can use one X event code for 
-     * multiple purposes.  
-     *  - reported in the xkbType field of all XKB events.
-     *  - XkbSelectEventDetails: Indicates the event for which event details 
-     *    are being changed
-     */
-#define	XkbNewKeyboardNotify		0
-#define XkbMapNotify			1
-#define	XkbStateNotify			2
-#define XkbControlsNotify		3
-#define	XkbIndicatorStateNotify		4
-#define	XkbIndicatorMapNotify		5
-#define	XkbNamesNotify			6
-#define XkbCompatMapNotify		7
-#define	XkbBellNotify			8
-#define	XkbActionMessage		9
-#define	XkbAccessXNotify		10
-#define	XkbExtensionDeviceNotify	11
-
-    /*
-     * Event Mask:
-     *  - XkbSelectEvents:  Specifies event interest.
-     */
-#define	XkbNewKeyboardNotifyMask	(1L << 0)
-#define XkbMapNotifyMask		(1L << 1)
-#define	XkbStateNotifyMask		(1L << 2)
-#define XkbControlsNotifyMask		(1L << 3)
-#define	XkbIndicatorStateNotifyMask	(1L << 4)
-#define	XkbIndicatorMapNotifyMask	(1L << 5)
-#define	XkbNamesNotifyMask		(1L << 6)
-#define XkbCompatMapNotifyMask		(1L << 7)
-#define	XkbBellNotifyMask		(1L << 8)
-#define	XkbActionMessageMask		(1L << 9)
-#define	XkbAccessXNotifyMask		(1L << 10)
-#define	XkbExtensionDeviceNotifyMask	(1L << 11)
-#define	XkbAllEventsMask		(0xFFF)
-
-    /*
-     * NewKeyboardNotify event details:
-     */
-#define	XkbNKN_KeycodesMask		(1L << 0)
-#define	XkbNKN_GeometryMask		(1L << 1)
-#define	XkbNKN_DeviceIDMask		(1L << 2)
-#define	XkbAllNewKeyboardEventsMask	(0x7)
-
-    /*
-     * AccessXNotify event types:
-     *  - The 'what' field of AccessXNotify events reports the
-     *    reason that the event was generated.
-     */
-#define	XkbAXN_SKPress			0
-#define	XkbAXN_SKAccept			1
-#define	XkbAXN_SKReject			2
-#define	XkbAXN_SKRelease		3
-#define	XkbAXN_BKAccept			4
-#define	XkbAXN_BKReject			5
-#define	XkbAXN_AXKWarning		6
-
-    /*
-     * AccessXNotify details:
-     * - Used as an event detail mask to limit the conditions under which
-     *   AccessXNotify events are reported
-     */
-#define	XkbAXN_SKPressMask		(1L << 0)
-#define	XkbAXN_SKAcceptMask		(1L << 1)
-#define	XkbAXN_SKRejectMask		(1L << 2)
-#define	XkbAXN_SKReleaseMask		(1L << 3)
-#define	XkbAXN_BKAcceptMask		(1L << 4)
-#define	XkbAXN_BKRejectMask		(1L << 5)
-#define	XkbAXN_AXKWarningMask		(1L << 6)
-#define	XkbAllAccessXEventsMask		(0x7f)
-
-    /*
-     * Miscellaneous event details:
-     * - event detail masks for assorted events that don't reall
-     *   have any details.
-     */
-#define	XkbAllStateEventsMask		XkbAllStateComponentsMask
-#define	XkbAllMapEventsMask		XkbAllMapComponentsMask
-#define	XkbAllControlEventsMask		XkbAllControlsMask
-#define	XkbAllIndicatorEventsMask	XkbAllIndicatorsMask
-#define	XkbAllNameEventsMask		XkbAllNamesMask
-#define	XkbAllCompatMapEventsMask	XkbAllCompatMask
-#define	XkbAllBellEventsMask		(1L << 0)
-#define	XkbAllActionMessagesMask	(1L << 0)
-
-    /*
-     * XKB reports one error:  BadKeyboard
-     * A further reason for the error is encoded into to most significant
-     * byte of the resourceID for the error:
-     *    XkbErr_BadDevice - the device in question was not found
-     *    XkbErr_BadClass  - the device was found but it doesn't belong to 
-     *                       the appropriate class.
-     *    XkbErr_BadId     - the device was found and belongs to the right
-     *                       class, but not feedback with a matching id was
-     *                       found.
-     * The low byte of the resourceID for this error contains the device
-     * id, class specifier or feedback id that failed.
-     */
-#define	XkbKeyboard			0
-#define	XkbNumberErrors			1
-
-#define	XkbErr_BadDevice	0xff
-#define	XkbErr_BadClass		0xfe
-#define	XkbErr_BadId		0xfd
-
-    /*
-     * Keyboard Components Mask:
-     * - Specifies the components that follow a GetKeyboardByNameReply
-     */
-#define	XkbClientMapMask		(1L << 0)
-#define	XkbServerMapMask		(1L << 1)
-#define	XkbCompatMapMask		(1L << 2)
-#define	XkbIndicatorMapMask		(1L << 3)
-#define	XkbNamesMask			(1L << 4)
-#define	XkbGeometryMask			(1L << 5)
-#define	XkbControlsMask			(1L << 6)
-#define	XkbAllComponentsMask		(0x7f)
-
-    /*
-     * State detail mask:
-     *  - The 'changed' field of StateNotify events reports which of
-     *    the keyboard state components have changed.
-     *  - Used as an event detail mask to limit the conditions under
-     *    which StateNotify events are reported.
-     */
-#define	XkbModifierStateMask		(1L << 0)
-#define	XkbModifierBaseMask		(1L << 1)
-#define	XkbModifierLatchMask		(1L << 2)
-#define	XkbModifierLockMask		(1L << 3)
-#define	XkbGroupStateMask		(1L << 4)
-#define	XkbGroupBaseMask		(1L << 5)
-#define	XkbGroupLatchMask		(1L << 6)
-#define XkbGroupLockMask		(1L << 7)
-#define	XkbCompatStateMask		(1L << 8)
-#define	XkbGrabModsMask			(1L << 9)
-#define	XkbCompatGrabModsMask		(1L << 10)
-#define	XkbLookupModsMask		(1L << 11)
-#define	XkbCompatLookupModsMask		(1L << 12)
-#define	XkbPointerButtonMask		(1L << 13)
-#define	XkbAllStateComponentsMask	(0x3fff)
-
-    /*
-     * Controls detail masks:
-     *  The controls specified in XkbAllControlsMask:
-     *  - The 'changed' field of ControlsNotify events reports which of 
-     *    the keyboard controls have changed.
-     *  - The 'changeControls' field of the SetControls request specifies
-     *    the controls for which values are to be changed.
-     *  - Used as an event detail mask to limit the conditions under 
-     *    which ControlsNotify events are reported.
-     *
-     *  The controls specified in the XkbAllBooleanCtrlsMask:
-     *  - The 'enabledControls' field of ControlsNotify events reports the
-     *    current status of the boolean controls.
-     *  - The 'enabledControlsChanges' field of ControlsNotify events reports
-     *    any boolean controls that have been turned on or off.
-     *  - The 'affectEnabledControls' and 'enabledControls' fields of the
-     *    kbSetControls request change the set of enabled controls.
-     *  - The 'accessXTimeoutMask' and 'accessXTimeoutValues' fields of
-     *    an XkbControlsRec specify the controls to be changed if the keyboard
-     *    times out and the values to which they should be changed.
-     *  - The 'autoCtrls' and 'autoCtrlsValues' fields of the PerClientFlags 
-     *    request specifies the specify the controls to be reset when the
-     *    client exits and the values to which they should be reset.
-     *  - The 'ctrls' field of an indicator map specifies the controls
-     *    that drive the indicator.
-     *  - Specifies the boolean controls affected by the SetControls and
-     *    LockControls key actions.
-     */
-#define	XkbRepeatKeysMask	 (1L << 0)
-#define	XkbSlowKeysMask		 (1L << 1)
-#define	XkbBounceKeysMask	 (1L << 2)
-#define	XkbStickyKeysMask	 (1L << 3)
-#define	XkbMouseKeysMask	 (1L << 4)
-#define	XkbMouseKeysAccelMask	 (1L << 5)
-#define	XkbAccessXKeysMask	 (1L << 6)
-#define	XkbAccessXTimeoutMask	 (1L << 7)
-#define	XkbAccessXFeedbackMask	 (1L << 8)
-#define	XkbAudibleBellMask	 (1L << 9)
-#define	XkbOverlay1Mask		 (1L << 10)
-#define	XkbOverlay2Mask		 (1L << 11)
-#define	XkbIgnoreGroupLockMask	 (1L << 12)
-#define	XkbGroupsWrapMask	 (1L << 27)
-#define	XkbInternalModsMask	 (1L << 28)
-#define	XkbIgnoreLockModsMask	 (1L << 29)
-#define	XkbPerKeyRepeatMask	 (1L << 30)
-#define	XkbControlsEnabledMask	 (1L << 31)
-
-#define	XkbAccessXOptionsMask    (XkbStickyKeysMask|XkbAccessXFeedbackMask)
-
-#define	XkbAllBooleanCtrlsMask	 (0x00001FFF)
-#define	XkbAllControlsMask	 (0xF8001FFF)
-#define	XkbAllControlEventsMask	 XkbAllControlsMask
-
-    /*
-     * AccessX Options Mask
-     *  - The 'accessXOptions' field of an XkbControlsRec specifies the
-     *    AccessX options that are currently in effect.
-     *  - The 'accessXTimeoutOptionsMask' and 'accessXTimeoutOptionsValues'
-     *    fields of an XkbControlsRec specify the Access X options to be 
-     *    changed if the keyboard times out and the values to which they 
-     *    should be changed.
-     */
-#define	XkbAX_SKPressFBMask	(1L << 0)
-#define	XkbAX_SKAcceptFBMask	(1L << 1)
-#define	XkbAX_FeatureFBMask	(1L << 2)
-#define	XkbAX_SlowWarnFBMask	(1L << 3)
-#define	XkbAX_IndicatorFBMask	(1L << 4)
-#define	XkbAX_StickyKeysFBMask	(1L << 5)
-#define	XkbAX_TwoKeysMask	(1L << 6)
-#define	XkbAX_LatchToLockMask	(1L << 7)
-#define	XkbAX_SKReleaseFBMask	(1L << 8)
-#define	XkbAX_SKRejectFBMask	(1L << 9)
-#define	XkbAX_BKRejectFBMask	(1L << 10)
-#define	XkbAX_DumbBellFBMask	(1L << 11)
-#define	XkbAX_FBOptionsMask	(0xF3F)
-#define	XkbAX_SKOptionsMask	(0x0C0)
-#define	XkbAX_AllOptionsMask	(0xFFF)
-
-    /*
-     * XkbUseCoreKbd is used to specify the core keyboard without having
-     * 			to look up its X input extension identifier.
-     * XkbUseCorePtr is used to specify the core pointer without having
-     *			to look up its X input extension identifier.
-     * XkbDfltXIClass is used to specify "don't care" any place that the
-     *			XKB protocol is looking for an X Input Extension 
-     *			device class.
-     * XkbDfltXIId is used to specify "don't care" any place that the
-     *			XKB protocol is looking for an X Input Extension
-     *			feedback identifier.
-     * XkbAllXIClasses is used to get information about all device indicators,
-     *			whether they're part of the indicator feedback class
-     *			or the keyboard feedback class.
-     * XkbAllXIIds is used to get information about all device indicator
-     *			feedbacks without having to list them.
-     * XkbXINone is used to indicate that no class or id has been specified.
-     * XkbLegalXILedClass(c)  True if 'c' specifies a legal class with LEDs
-     * XkbLegalXIBellClass(c) True if 'c' specifies a legal class with bells
-     * XkbExplicitXIDevice(d) True if 'd' explicitly specifies a device
-     * XkbExplicitXIClass(c)  True if 'c' explicitly specifies a device class
-     * XkbExplicitXIId(c)     True if 'i' explicitly specifies a device id
-     * XkbSingleXIClass(c)    True if 'c' specifies exactly one device class, 
-     *                        including the default.
-     * XkbSingleXIId(i)       True if 'i' specifies exactly one device 
-     *	                      identifier, including the default.
-     */
-#define	XkbUseCoreKbd		0x0100
-#define	XkbUseCorePtr		0x0200
-#define	XkbDfltXIClass		0x0300
-#define	XkbDfltXIId		0x0400
-#define	XkbAllXIClasses		0x0500
-#define	XkbAllXIIds		0x0600
-#define	XkbXINone		0xff00
-
-#define	XkbLegalXILedClass(c)	(((c)==KbdFeedbackClass)||\
-					((c)==LedFeedbackClass)||\
-					((c)==XkbDfltXIClass)||\
-					((c)==XkbAllXIClasses))
-#define	XkbLegalXIBellClass(c)	(((c)==KbdFeedbackClass)||\
-					((c)==BellFeedbackClass)||\
-					((c)==XkbDfltXIClass)||\
-					((c)==XkbAllXIClasses))
-#define	XkbExplicitXIDevice(c)	(((c)&(~0xff))==0)
-#define	XkbExplicitXIClass(c)	(((c)&(~0xff))==0)
-#define	XkbExplicitXIId(c)	(((c)&(~0xff))==0)
-#define	XkbSingleXIClass(c)	((((c)&(~0xff))==0)||((c)==XkbDfltXIClass))
-#define	XkbSingleXIId(c)	((((c)&(~0xff))==0)||((c)==XkbDfltXIId))
-
-#define	XkbNoModifier		0xff
-#define	XkbNoShiftLevel		0xff
-#define	XkbNoShape		0xff
-#define	XkbNoIndicator		0xff
-
-#define	XkbNoModifierMask	0
-#define	XkbAllModifiersMask	0xff
-#define	XkbAllVirtualModsMask	0xffff
-
-#define	XkbNumKbdGroups		4
-#define	XkbMaxKbdGroup		(XkbNumKbdGroups-1)
-
-#define	XkbMaxMouseKeysBtn	4
-
-    /*
-     * Group Index and Mask:
-     *  - Indices into the kt_index array of a key type.
-     *  - Mask specifies types to be changed for XkbChangeTypesOfKey
-     */
-#define	XkbGroup1Index		0
-#define	XkbGroup2Index		1
-#define	XkbGroup3Index		2
-#define	XkbGroup4Index		3
-#define	XkbAnyGroup		254
-#define	XkbAllGroups		255
-
-#define	XkbGroup1Mask		(1<<0)
-#define	XkbGroup2Mask		(1<<1)
-#define	XkbGroup3Mask		(1<<2)
-#define	XkbGroup4Mask		(1<<3)
-#define	XkbAnyGroupMask		(1<<7)
-#define	XkbAllGroupsMask	(0xf)
-
-    /*
-     * BuildCoreState: Given a keyboard group and a modifier state,
-     *                 construct the value to be reported an event.
-     * GroupForCoreState:  Given the state reported in an event,
-     *                 determine the keyboard group.
-     * IsLegalGroup:   Returns TRUE if 'g' is a valid group index.
-     */
-#define	XkbBuildCoreState(m,g)	((((g)&0x3)<<13)|((m)&0xff))
-#define XkbGroupForCoreState(s)	(((s)>>13)&0x3)
-#define	XkbIsLegalGroup(g)	(((g)>=0)&&((g)<XkbNumKbdGroups))
-
-    /*
-     * GroupsWrap values:
-     *  - The 'groupsWrap' field of an XkbControlsRec specifies the
-     *    treatment of out of range groups.
-     *  - Bits 6 and 7 of the group info field of a key symbol map
-     *    specify the interpretation of out of range groups for the
-     *    corresponding key.
-     */
-#define	XkbWrapIntoRange	(0x00)
-#define	XkbClampIntoRange	(0x40)
-#define	XkbRedirectIntoRange	(0x80)
-
-    /*
-     * Action flags:  Reported in the 'flags' field of most key actions.
-     * Interpretation depends on the type of the action; not all actions
-     * accept all flags.
-     *
-     * Option			Used for Actions
-     * ------			----------------
-     * ClearLocks		SetMods, LatchMods, SetGroup, LatchGroup
-     * LatchToLock		SetMods, LatchMods, SetGroup, LatchGroup
-     * LockNoLock		LockMods, ISOLock, LockPtrBtn, LockDeviceBtn
-     * LockNoUnlock		LockMods, ISOLock, LockPtrBtn, LockDeviceBtn
-     * UseModMapMods		SetMods, LatchMods, LockMods, ISOLock
-     * GroupAbsolute		SetGroup, LatchGroup, LockGroup, ISOLock
-     * UseDfltButton		PtrBtn, LockPtrBtn
-     * NoAcceleration		MovePtr
-     * MoveAbsoluteX		MovePtr
-     * MoveAbsoluteY		MovePtr
-     * ISODfltIsGroup		ISOLock
-     * ISONoAffectMods		ISOLock
-     * ISONoAffectGroup		ISOLock
-     * ISONoAffectPtr		ISOLock
-     * ISONoAffectCtrls		ISOLock
-     * MessageOnPress		ActionMessage
-     * MessageOnRelease		ActionMessage
-     * MessageGenKeyEvent	ActionMessage
-     * AffectDfltBtn		SetPtrDflt
-     * DfltBtnAbsolute		SetPtrDflt
-     * SwitchApplication	SwitchScreen
-     * SwitchAbsolute		SwitchScreen
-     */
-
-#define	XkbSA_ClearLocks	(1L << 0)
-#define	XkbSA_LatchToLock	(1L << 1)
-
-#define	XkbSA_LockNoLock	(1L << 0)
-#define	XkbSA_LockNoUnlock	(1L << 1)
-
-#define	XkbSA_UseModMapMods	(1L << 2)
-
-#define	XkbSA_GroupAbsolute	(1L << 2)
-#define	XkbSA_UseDfltButton	0
-
-#define	XkbSA_NoAcceleration	(1L << 0)
-#define	XkbSA_MoveAbsoluteX	(1L << 1)
-#define	XkbSA_MoveAbsoluteY	(1L << 2)
-
-#define	XkbSA_ISODfltIsGroup 	 (1L << 7)
-#define	XkbSA_ISONoAffectMods	 (1L << 6)
-#define	XkbSA_ISONoAffectGroup	 (1L << 5)
-#define	XkbSA_ISONoAffectPtr	 (1L << 4)
-#define	XkbSA_ISONoAffectCtrls	 (1L << 3)
-#define	XkbSA_ISOAffectMask	 (0x78)
-
-#define	XkbSA_MessageOnPress	 (1L << 0)
-#define	XkbSA_MessageOnRelease	 (1L << 1)
-#define	XkbSA_MessageGenKeyEvent (1L << 2)
-
-#define	XkbSA_AffectDfltBtn	1
-#define	XkbSA_DfltBtnAbsolute	(1L << 2)
-
-#define	XkbSA_SwitchApplication	(1L << 0)
-#define	XkbSA_SwitchAbsolute	(1L << 2)
-
-    /*
-     * The following values apply to the SA_DeviceValuator 
-     * action only.  Valuator operations specify the action 
-     * to be taken.   Values specified in the action are 
-     * multiplied by 2^scale before they are applied.
-     */
-#define	XkbSA_IgnoreVal		(0x00)
-#define	XkbSA_SetValMin		(0x10)
-#define	XkbSA_SetValCenter	(0x20)
-#define	XkbSA_SetValMax		(0x30)
-#define	XkbSA_SetValRelative	(0x40)
-#define	XkbSA_SetValAbsolute	(0x50)
-#define	XkbSA_ValOpMask		(0x70)
-#define	XkbSA_ValScaleMask	(0x07)
-#define	XkbSA_ValOp(a)		((a)&XkbSA_ValOpMask)
-#define	XkbSA_ValScale(a)	((a)&XkbSA_ValScaleMask)
-
-    /*
-     * Action types: specifies the type of a key action.  Reported in the
-     * type field of all key actions.
-     */
-#define	XkbSA_NoAction		0x00
-#define	XkbSA_SetMods		0x01
-#define	XkbSA_LatchMods		0x02
-#define	XkbSA_LockMods		0x03
-#define	XkbSA_SetGroup		0x04
-#define	XkbSA_LatchGroup	0x05
-#define	XkbSA_LockGroup		0x06
-#define	XkbSA_MovePtr		0x07
-#define	XkbSA_PtrBtn		0x08
-#define	XkbSA_LockPtrBtn	0x09
-#define	XkbSA_SetPtrDflt	0x0a
-#define	XkbSA_ISOLock		0x0b
-#define	XkbSA_Terminate		0x0c
-#define	XkbSA_SwitchScreen	0x0d
-#define	XkbSA_SetControls	0x0e
-#define	XkbSA_LockControls	0x0f
-#define	XkbSA_ActionMessage	0x10
-#define	XkbSA_RedirectKey	0x11
-#define	XkbSA_DeviceBtn		0x12
-#define	XkbSA_LockDeviceBtn	0x13
-#define	XkbSA_DeviceValuator	0x14
-#define	XkbSA_LastAction	XkbSA_DeviceValuator
-#define	XkbSA_NumActions	(XkbSA_LastAction+1)
-
-#define	XkbSA_XFree86Private	0x86
-
-    /*
-     * Specifies the key actions that clear latched groups or modifiers.
-     */
-#define	XkbSA_BreakLatch \
-	((1<<XkbSA_NoAction)|(1<<XkbSA_PtrBtn)|(1<<XkbSA_LockPtrBtn)|\
-	(1<<XkbSA_Terminate)|(1<<XkbSA_SwitchScreen)|(1<<XkbSA_SetControls)|\
-	(1<<XkbSA_LockControls)|(1<<XkbSA_ActionMessage)|\
-	(1<<XkbSA_RedirectKey)|(1<<XkbSA_DeviceBtn)|(1<<XkbSA_LockDeviceBtn))
-	 
-    /*
-     * Macros to classify key actions
-     */
-#define	XkbIsModAction(a)	(((a)->type>=Xkb_SASetMods)&&((a)->type<=XkbSA_LockMods))
-#define	XkbIsGroupAction(a)	(((a)->type>=XkbSA_SetGroup)&&((a)->type<=XkbSA_LockGroup))
-#define	XkbIsPtrAction(a)	(((a)->type>=XkbSA_MovePtr)&&((a)->type<=XkbSA_SetPtrDflt))
-
-
-    /*
-     * Key Behavior Qualifier:
-     *    KB_Permanent indicates that the behavior describes an unalterable
-     *    characteristic of the keyboard, not an XKB software-simulation of
-     *    the listed behavior.
-     * Key Behavior Types:  
-     *    Specifies the behavior of the underlying key.
-     */
-#define	XkbKB_Permanent		0x80
-#define	XkbKB_OpMask		0x7f
-
-#define	XkbKB_Default		0x00
-#define	XkbKB_Lock		0x01
-#define	XkbKB_RadioGroup	0x02
-#define	XkbKB_Overlay1		0x03
-#define	XkbKB_Overlay2		0x04
-
-#define	XkbKB_RGAllowNone	0x80
-
-    /*
-     * Various macros which describe the range of legal keycodes.
-     */
-#define	XkbMinLegalKeyCode	8
-#define	XkbMaxLegalKeyCode	255
-#define	XkbMaxKeyCount		(XkbMaxLegalKeyCode-XkbMinLegalKeyCode+1)
-#define	XkbPerKeyBitArraySize	((XkbMaxLegalKeyCode+1)/8)
-/* Seems kinda silly to check that an unsigned char is <= 255... */
-#define	XkbIsLegalKeycode(k)	((k)>=XkbMinLegalKeyCode)
-
-    /*
-     * Assorted constants and limits.
-     */
-#define	XkbNumModifiers		8
-#define	XkbNumVirtualMods	16
-#define	XkbNumIndicators	32
-#define	XkbAllIndicatorsMask	(0xffffffff)
-#define	XkbMaxRadioGroups	32
-#define	XkbAllRadioGroupsMask	(0xffffffff)
-#define	XkbMaxShiftLevel	63
-#define	XkbMaxSymsPerKey	(XkbMaxShiftLevel*XkbNumKbdGroups)
-#define	XkbRGMaxMembers		12
-#define	XkbActionMessageLength	6
-#define	XkbKeyNameLength	4
-#define	XkbMaxRedirectCount	8
-
-#define	XkbGeomPtsPerMM		10
-#define	XkbGeomMaxColors	32
-#define	XkbGeomMaxLabelColors	3
-#define	XkbGeomMaxPriority	255
-
-    /*
-     * Key Type index and mask for the four standard key types.
-     */
-#define	XkbOneLevelIndex	0
-#define	XkbTwoLevelIndex	1
-#define	XkbAlphabeticIndex	2
-#define	XkbKeypadIndex		3
-#define	XkbLastRequiredType	XkbKeypadIndex
-#define	XkbNumRequiredTypes	(XkbLastRequiredType+1)
-#define	XkbMaxKeyTypes		255
-
-#define	XkbOneLevelMask		(1<<0)
-#define	XkbTwoLevelMask		(1<<1)
-#define	XkbAlphabeticMask	(1<<2)
-#define	XkbKeypadMask		(1<<3)
-#define	XkbAllRequiredTypes	(0xf)
-
-#define	XkbShiftLevel(n)	((n)-1)
-#define	XkbShiftLevelMask(n)	(1<<((n)-1))
-
-    /*
-     * Extension name and version information
-     */
-#define	XkbName "XKEYBOARD"
-#define	XkbMajorVersion	1
-#define	XkbMinorVersion	0
-
-    /*
-     * Explicit map components:
-     *  - Used in the 'explicit' field of an XkbServerMap.  Specifies
-     *    the keyboard components that should _not_ be updated automatically
-     *    in response to core protocol keyboard mapping requests.
-     */
-#define	XkbExplicitKeyTypesMask	  (0x0f)
-#define	XkbExplicitKeyType1Mask	  (1<<0)
-#define	XkbExplicitKeyType2Mask	  (1<<1)
-#define	XkbExplicitKeyType3Mask	  (1<<2)
-#define	XkbExplicitKeyType4Mask	  (1<<3)
-#define	XkbExplicitInterpretMask  (1<<4)
-#define	XkbExplicitAutoRepeatMask (1<<5)
-#define	XkbExplicitBehaviorMask	  (1<<6)
-#define	XkbExplicitVModMapMask	  (1<<7)
-#define	XkbAllExplicitMask	  (0xff)
-
-    /*
-     * Map components masks:
-     * Those in AllMapComponentsMask:
-     *  - Specifies the individual fields to be loaded or changed for the
-     *    GetMap and SetMap requests.
-     * Those in ClientInfoMask:
-     *  - Specifies the components to be allocated by XkbAllocClientMap.
-     * Those in ServerInfoMask:
-     *  - Specifies the components to be allocated by XkbAllocServerMap.
-     */
-#define	XkbKeyTypesMask		(1<<0)
-#define	XkbKeySymsMask		(1<<1)
-#define	XkbModifierMapMask	(1<<2)
-#define	XkbExplicitComponentsMask (1<<3)
-#define XkbKeyActionsMask	(1<<4)
-#define	XkbKeyBehaviorsMask	(1<<5)
-#define	XkbVirtualModsMask	(1<<6)
-#define	XkbVirtualModMapMask	(1<<7)
-
-#define	XkbAllClientInfoMask	(XkbKeyTypesMask|XkbKeySymsMask|XkbModifierMapMask)
-#define	XkbAllServerInfoMask	(XkbExplicitComponentsMask|XkbKeyActionsMask|XkbKeyBehaviorsMask|XkbVirtualModsMask|XkbVirtualModMapMask)
-#define	XkbAllMapComponentsMask	(XkbAllClientInfoMask|XkbAllServerInfoMask)
-
-    /*
-     * Symbol interpretations flags:
-     *  - Used in the flags field of a symbol interpretation
-     */
-#define	XkbSI_AutoRepeat	(1<<0)
-#define	XkbSI_LockingKey	(1<<1)
-
-    /*
-     * Symbol interpretations match specification:
-     *  - Used in the match field of a symbol interpretation to specify 
-     *    the conditions under which an interpretation is used.
-     */
-#define	XkbSI_LevelOneOnly	(0x80)
-#define	XkbSI_OpMask		(0x7f)
-#define	XkbSI_NoneOf		(0)
-#define	XkbSI_AnyOfOrNone	(1)
-#define	XkbSI_AnyOf		(2)
-#define	XkbSI_AllOf		(3)
-#define	XkbSI_Exactly		(4)
-
-    /*
-     * Indicator map flags:
-     *  - Used in the flags field of an indicator map to indicate the
-     *    conditions under which and indicator can be changed and the
-     *    effects of changing the indicator.
-     */
-#define	XkbIM_NoExplicit	(1L << 7)
-#define	XkbIM_NoAutomatic	(1L << 6)
-#define	XkbIM_LEDDrivesKB	(1L << 5)
-
-    /*
-     * Indicator map component specifications:
-     *  - Used by the 'which_groups' and 'which_mods' fields of an indicator
-     *    map to specify which keyboard components should be used to drive
-     *    the indicator.
-     */
-#define	XkbIM_UseBase		(1L << 0)
-#define	XkbIM_UseLatched	(1L << 1)
-#define	XkbIM_UseLocked		(1L << 2)
-#define	XkbIM_UseEffective	(1L << 3)
-#define	XkbIM_UseCompat		(1L << 4)
-
-#define	XkbIM_UseNone	  0
-#define	XkbIM_UseAnyGroup (XkbIM_UseBase|XkbIM_UseLatched|XkbIM_UseLocked\
-                           |XkbIM_UseEffective)
-#define	XkbIM_UseAnyMods  (XkbIM_UseAnyGroup|XkbIM_UseCompat)
-
-    /*
-     * Compatibility Map Compontents:
-     *  - Specifies the components to be allocated in XkbAllocCompatMap.
-     */
-#define	XkbSymInterpMask	(1<<0)
-#define	XkbGroupCompatMask	(1<<1)
-#define	XkbAllCompatMask	(0x3)
-
-    /*
-     * Names component mask:
-     *  - Specifies the names to be loaded or changed for the GetNames and
-     *    SetNames requests.
-     *  - Specifies the names that have changed in a NamesNotify event.
-     *  - Specifies the names components to be allocated by XkbAllocNames.
-     */
-#define	XkbKeycodesNameMask	(1<<0)
-#define	XkbGeometryNameMask	(1<<1)
-#define	XkbSymbolsNameMask	(1<<2)
-#define	XkbPhysSymbolsNameMask	(1<<3)
-#define	XkbTypesNameMask	(1<<4)
-#define	XkbCompatNameMask 	(1<<5)
-#define	XkbKeyTypeNamesMask	(1<<6)
-#define	XkbKTLevelNamesMask	(1<<7)
-#define	XkbIndicatorNamesMask	(1<<8)
-#define	XkbKeyNamesMask		(1<<9)
-#define	XkbKeyAliasesMask	(1<<10)
-#define	XkbVirtualModNamesMask	(1<<11)
-#define	XkbGroupNamesMask	(1<<12)
-#define	XkbRGNamesMask		(1<<13)
-#define	XkbComponentNamesMask	(0x3f)
-#define	XkbAllNamesMask		(0x3fff)
-
-    /*
-     * GetByName components:
-     *  - Specifies desired or necessary components to GetKbdByName request.
-     *  - Reports the components that were found in a GetKbdByNameReply
-     */
-#define	XkbGBN_TypesMask		(1L << 0)
-#define	XkbGBN_CompatMapMask		(1L << 1)
-#define	XkbGBN_ClientSymbolsMask	(1L << 2)
-#define	XkbGBN_ServerSymbolsMask	(1L << 3)
-#define	XkbGBN_SymbolsMask (XkbGBN_ClientSymbolsMask|XkbGBN_ServerSymbolsMask)
-#define	XkbGBN_IndicatorMapMask		(1L << 4)
-#define	XkbGBN_KeyNamesMask		(1L << 5)
-#define	XkbGBN_GeometryMask		(1L << 6)
-#define	XkbGBN_OtherNamesMask		(1L << 7)
-#define	XkbGBN_AllComponentsMask	(0xff)
-
-     /*
-      * ListComponents flags
-      */
-#define	XkbLC_Hidden			(1L <<  0)
-#define	XkbLC_Default			(1L <<  1)
-#define	XkbLC_Partial			(1L <<  2)
-
-#define	XkbLC_AlphanumericKeys		(1L <<  8)
-#define	XkbLC_ModifierKeys		(1L <<  9)
-#define	XkbLC_KeypadKeys		(1L << 10)
-#define	XkbLC_FunctionKeys		(1L << 11)
-#define	XkbLC_AlternateGroup		(1L << 12)
-
-    /*
-     * X Input Extension Interactions
-     * - Specifies the possible interactions between XKB and the X input
-     *   extension
-     * - Used to request (XkbGetDeviceInfo) or change (XKbSetDeviceInfo)
-     *   XKB information about an extension device.
-     * - Reports the list of supported optional features in the reply to
-     *   XkbGetDeviceInfo or in an XkbExtensionDeviceNotify event.
-     * XkbXI_UnsupportedFeature is reported in XkbExtensionDeviceNotify
-     * events to indicate an attempt to use an unsupported feature.
-     */
-#define	XkbXI_KeyboardsMask		(1L << 0)
-#define	XkbXI_ButtonActionsMask		(1L << 1)
-#define	XkbXI_IndicatorNamesMask	(1L << 2)
-#define	XkbXI_IndicatorMapsMask		(1L << 3)
-#define	XkbXI_IndicatorStateMask	(1L << 4)
-#define	XkbXI_UnsupportedFeatureMask	(1L << 15)
-#define	XkbXI_AllFeaturesMask		(0x001f)
-#define	XkbXI_AllDeviceFeaturesMask	(0x001e)
-
-#define	XkbXI_IndicatorsMask		(0x001c)
-#define	XkbAllExtensionDeviceEventsMask (0x801f)
-
-    /*
-     * Per-Client Flags:
-     *  - Specifies flags to be changed by the PerClientFlags request.
-     */
-#define	XkbPCF_DetectableAutoRepeatMask	(1L << 0)
-#define	XkbPCF_GrabsUseXKBStateMask	(1L << 1)
-#define	XkbPCF_AutoResetControlsMask	(1L << 2)
-#define	XkbPCF_LookupStateWhenGrabbed	(1L << 3)
-#define	XkbPCF_SendEventUsesXKBState	(1L << 4)
-#define	XkbPCF_AllFlagsMask		(0x1F)
-
-    /*
-     * Debugging flags and controls
-     */
-#define	XkbDF_DisableLocks	(1<<0)
-
-#endif /* _XKB_H_ */
diff --git a/openflow/usr/include/X11/extensions/XKBgeom.h b/openflow/usr/include/X11/extensions/XKBgeom.h
deleted file mode 100644
index cef78fa..0000000
--- a/openflow/usr/include/X11/extensions/XKBgeom.h
+++ /dev/null
@@ -1,662 +0,0 @@
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#ifndef _XKBGEOM_H_
-#define	_XKBGEOM_H_
-
-#include <X11/extensions/XKBstr.h>
-
-#ifdef XKB_IN_SERVER
-#define XkbAddGeomKeyAlias 		SrvXkbAddGeomKeyAlias
-#define XkbAddGeomColor 		SrvXkbAddGeomColor
-#define XkbAddGeomDoodad		SrvXkbAddGeomDoodad
-#define XkbAddGeomKey			SrvXkbAddGeomKey
-#define XkbAddGeomOutline		SrvXkbAddGeomOutline
-#define XkbAddGeomOverlay		SrvXkbAddGeomOverlay
-#define XkbAddGeomOverlayRow		SrvXkbAddGeomOverlayRow
-#define	XkbAddGeomOverlayKey		SrvXkbAddGeomOverlayKey
-#define XkbAddGeomProperty		SrvXkbAddGeomProperty
-#define XkbAddGeomRow			SrvXkbAddGeomRow
-#define XkbAddGeomSection		SrvXkbAddGeomSection
-#define XkbAddGeomShape			SrvXkbAddGeomShape
-#define XkbAllocGeomKeyAliases		SrvXkbAllocGeomKeyAliases
-#define XkbAllocGeomColors		SrvXkbAllocGeomColors
-#define XkbAllocGeomDoodads		SrvXkbAllocGeomDoodads
-#define XkbAllocGeomKeys		SrvXkbAllocGeomKeys
-#define XkbAllocGeomOutlines		SrvXkbAllocGeomOutlines
-#define XkbAllocGeomPoints		SrvXkbAllocGeomPoints
-#define XkbAllocGeomProps		SrvXkbAllocGeomProps
-#define XkbAllocGeomRows		SrvXkbAllocGeomRows
-#define XkbAllocGeomSectionDoodads	SrvXkbAllocGeomSectionDoodads
-#define XkbAllocGeomSections		SrvXkbAllocGeomSections
-#define	XkbAllocGeomOverlays		SrvXkbAllocGeomOverlays
-#define	XkbAllocGeomOverlayRows		SrvXkbAllocGeomOverlayRows
-#define	XkbAllocGeomOverlayKeys		SrvXkbAllocGeomOverlayKeys
-#define XkbAllocGeomShapes		SrvXkbAllocGeomShapes
-#define XkbAllocGeometry		SrvXkbAllocGeometry
-#define XkbFreeGeomKeyAliases		SrvXkbFreeGeomKeyAliases
-#define XkbFreeGeomColors		SrvXkbFreeGeomColors
-#define XkbFreeGeomDoodads		SrvXkbFreeGeomDoodads
-#define XkbFreeGeomProperties		SrvXkbFreeGeomProperties
-#define	XkbFreeGeomOverlayKeys		SrvXkbFreeGeomOverlayKeys
-#define	XkbFreeGeomOverlayRows		SrvXkbFreeGeomOverlayRows
-#define	XkbFreeGeomOverlays		SrvXkbFreeGeomOverlays
-#define	XkbFreeGeomKeys			SrvXkbFreeGeomKeys
-#define	XkbFreeGeomRows			SrvXkbFreeGeomRows
-#define XkbFreeGeomSections		SrvXkbFreeGeomSections
-#define	XkbFreeGeomPoints		SrvXkbFreeGeomPoints
-#define	XkbFreeGeomOutlines		SrvXkbFreeGeomOutlines
-#define XkbFreeGeomShapes		SrvXkbFreeGeomShapes
-#define XkbFreeGeometry			SrvXkbFreeGeometry
-#endif
-
-typedef	struct _XkbProperty {
-	char	*name;
-	char	*value;
-} XkbPropertyRec,*XkbPropertyPtr;
-
-typedef struct _XkbColor {
-	unsigned int 	pixel;
-	char *		spec;
-} XkbColorRec,*XkbColorPtr;
-
-typedef	struct _XkbPoint {
-	short	x;
-	short	y;
-} XkbPointRec, *XkbPointPtr;
-
-typedef struct	_XkbBounds {
-	short	x1,y1;
-	short	x2,y2;
-} XkbBoundsRec, *XkbBoundsPtr;
-#define	XkbBoundsWidth(b)	(((b)->x2)-((b)->x1))
-#define	XkbBoundsHeight(b)	(((b)->y2)-((b)->y1))
-
-/*
- * In the following structs, this pattern is used for dynamically sized arrays:
- * foo is an array for which sz_foo entries are allocated & num_foo are used
- */
-
-typedef struct _XkbOutline {
-	unsigned short	num_points;
-	unsigned short	sz_points;
-	unsigned short	corner_radius;
-	XkbPointPtr	points;
-} XkbOutlineRec, *XkbOutlinePtr;
-
-typedef struct _XkbShape {
-	Atom	 	 name;
-	unsigned short	 num_outlines;
-	unsigned short	 sz_outlines;
-	XkbOutlinePtr	 outlines;
-	XkbOutlinePtr	 approx;
-	XkbOutlinePtr	 primary;
-	XkbBoundsRec	 bounds;
-} XkbShapeRec, *XkbShapePtr;
-#define	XkbOutlineIndex(s,o)	((int)((o)-&(s)->outlines[0]))
-
-typedef struct _XkbShapeDoodad {
-	Atom		 name;
-	unsigned char	 type;
-	unsigned char	 priority;
-	short		 top;
-	short		 left;
-	short	 	 angle;
-	unsigned short	 color_ndx;
-	unsigned short	 shape_ndx;
-} XkbShapeDoodadRec, *XkbShapeDoodadPtr;
-#define	XkbShapeDoodadColor(g,d)	(&(g)->colors[(d)->color_ndx])
-#define	XkbShapeDoodadShape(g,d)	(&(g)->shapes[(d)->shape_ndx])
-#define	XkbSetShapeDoodadColor(g,d,c)	((d)->color_ndx= (c)-&(g)->colors[0])
-#define	XkbSetShapeDoodadShape(g,d,s)	((d)->shape_ndx= (s)-&(g)->shapes[0])
-
-typedef struct _XkbTextDoodad {
-	Atom		 name;
-	unsigned char	 type;
-	unsigned char	 priority;
-	short	 	 top;
-	short	 	 left;
-	short	 	 angle;
-	short	 	 width;
-	short		 height;
-	unsigned short	 color_ndx;
-	char *		 text;
-	char *		 font;
-} XkbTextDoodadRec, *XkbTextDoodadPtr;
-#define	XkbTextDoodadColor(g,d)	(&(g)->colors[(d)->color_ndx])
-#define	XkbSetTextDoodadColor(g,d,c)	((d)->color_ndx= (c)-&(g)->colors[0])
-
-typedef struct _XkbIndicatorDoodad {
-	Atom		 name;
-	unsigned char	 type;
-	unsigned char	 priority;
-	short	 	 top;
-	short	 	 left;
-	short		 angle;
-	unsigned short	 shape_ndx;
-	unsigned short	 on_color_ndx;
-	unsigned short	 off_color_ndx;
-} XkbIndicatorDoodadRec, *XkbIndicatorDoodadPtr;
-#define	XkbIndicatorDoodadShape(g,d)	(&(g)->shapes[(d)->shape_ndx])
-#define	XkbIndicatorDoodadOnColor(g,d)	(&(g)->colors[(d)->on_color_ndx])
-#define	XkbIndicatorDoodadOffColor(g,d)	(&(g)->colors[(d)->off_color_ndx])
-#define	XkbSetIndicatorDoodadOnColor(g,d,c) \
-				((d)->on_color_ndx= (c)-&(g)->colors[0])
-#define	XkbSetIndicatorDoodadOffColor(g,d,c) \
-				((d)->off_color_ndx= (c)-&(g)->colors[0])
-#define	XkbSetIndicatorDoodadShape(g,d,s) \
-				((d)->shape_ndx= (s)-&(g)->shapes[0])
-
-typedef struct _XkbLogoDoodad {
-	Atom		 name;
-	unsigned char	 type;
-	unsigned char	 priority;
-	short		 top;
-	short		 left;
-	short	 	 angle;
-	unsigned short	 color_ndx;
-	unsigned short	 shape_ndx;
-	char *		 logo_name;
-} XkbLogoDoodadRec, *XkbLogoDoodadPtr;
-#define	XkbLogoDoodadColor(g,d)		(&(g)->colors[(d)->color_ndx])
-#define	XkbLogoDoodadShape(g,d)		(&(g)->shapes[(d)->shape_ndx])
-#define	XkbSetLogoDoodadColor(g,d,c)	((d)->color_ndx= (c)-&(g)->colors[0])
-#define	XkbSetLogoDoodadShape(g,d,s)	((d)->shape_ndx= (s)-&(g)->shapes[0])
-
-typedef struct _XkbAnyDoodad {
-	Atom		 name;
-	unsigned char	 type;
-	unsigned char	 priority;
-	short	 	 top;
-	short	 	 left;
-	short		 angle;
-} XkbAnyDoodadRec, *XkbAnyDoodadPtr;
-
-typedef union _XkbDoodad {
-	XkbAnyDoodadRec		any;
-	XkbShapeDoodadRec	shape;
-	XkbTextDoodadRec	text;
-	XkbIndicatorDoodadRec	indicator;
-	XkbLogoDoodadRec	logo;
-} XkbDoodadRec, *XkbDoodadPtr;
-
-#define	XkbUnknownDoodad	0
-#define	XkbOutlineDoodad	1
-#define	XkbSolidDoodad		2
-#define	XkbTextDoodad		3
-#define	XkbIndicatorDoodad	4
-#define	XkbLogoDoodad		5
-
-typedef struct _XkbKey {
-	XkbKeyNameRec	 name;
-	short		 gap;
-	unsigned char	 shape_ndx;
-	unsigned char	 color_ndx;
-} XkbKeyRec, *XkbKeyPtr;
-#define	XkbKeyShape(g,k)	(&(g)->shapes[(k)->shape_ndx])
-#define	XkbKeyColor(g,k)	(&(g)->colors[(k)->color_ndx])
-#define	XkbSetKeyShape(g,k,s)	((k)->shape_ndx= (s)-&(g)->shapes[0])
-#define	XkbSetKeyColor(g,k,c)	((k)->color_ndx= (c)-&(g)->colors[0])
-
-typedef struct _XkbRow {
-	short	 	top;
-	short	 	left;
-	unsigned short	num_keys;
-	unsigned short	sz_keys;
-	int		vertical;
-	XkbKeyPtr	keys;
-	XkbBoundsRec	bounds;
-} XkbRowRec, *XkbRowPtr;
-
-typedef struct _XkbSection {
-	Atom		 name;
-	unsigned char	 priority;
-	short	 	 top;
-	short	 	 left;
-	unsigned short	 width;
-	unsigned short	 height;
-	short	 	 angle;
-	unsigned short	 num_rows;
-	unsigned short	 num_doodads;
-	unsigned short	 num_overlays;
-	unsigned short	 sz_rows;
-	unsigned short	 sz_doodads;
-	unsigned short	 sz_overlays;
-	XkbRowPtr	 rows;
-	XkbDoodadPtr	 doodads;
-	XkbBoundsRec	 bounds;
-	struct _XkbOverlay *overlays;
-} XkbSectionRec, *XkbSectionPtr;
-
-typedef	struct _XkbOverlayKey {
-	XkbKeyNameRec	over;
-	XkbKeyNameRec	under;
-} XkbOverlayKeyRec,*XkbOverlayKeyPtr;
-
-typedef struct _XkbOverlayRow {
-	unsigned short		row_under;
-	unsigned short		num_keys;
-	unsigned short		sz_keys;
-	XkbOverlayKeyPtr	keys;
-} XkbOverlayRowRec,*XkbOverlayRowPtr;
-
-typedef struct _XkbOverlay {
-	Atom			name;
-	XkbSectionPtr		section_under;
-	unsigned short		num_rows;
-	unsigned short		sz_rows;
-	XkbOverlayRowPtr	rows;
-	XkbBoundsPtr		bounds;
-} XkbOverlayRec,*XkbOverlayPtr;
-
-typedef struct _XkbGeometry {
-	Atom		 name;
-	unsigned short	 width_mm;
-	unsigned short	 height_mm;
-	char *		 label_font;
-	XkbColorPtr	 label_color;
-	XkbColorPtr	 base_color;
-	unsigned short	 sz_properties;
-	unsigned short	 sz_colors;
-	unsigned short	 sz_shapes;
-	unsigned short   sz_sections;
-	unsigned short	 sz_doodads;
-	unsigned short	 sz_key_aliases;
-	unsigned short	 num_properties;
-	unsigned short	 num_colors;
-	unsigned short	 num_shapes;
-	unsigned short	 num_sections;
-	unsigned short	 num_doodads;
-	unsigned short	 num_key_aliases;
-	XkbPropertyPtr	 properties;
-	XkbColorPtr	 colors;
-	XkbShapePtr	 shapes;
-	XkbSectionPtr	 sections;
-	XkbDoodadPtr	 doodads;
-	XkbKeyAliasPtr	 key_aliases;
-} XkbGeometryRec;
-#define	XkbGeomColorIndex(g,c)	((int)((c)-&(g)->colors[0]))
-
-#define	XkbGeomPropertiesMask	(1<<0)
-#define	XkbGeomColorsMask	(1<<1)
-#define	XkbGeomShapesMask	(1<<2)
-#define	XkbGeomSectionsMask	(1<<3)
-#define	XkbGeomDoodadsMask	(1<<4)
-#define	XkbGeomKeyAliasesMask	(1<<5)
-#define	XkbGeomAllMask		(0x3f)
-
-typedef struct _XkbGeometrySizes {
-	unsigned int	which;
-	unsigned short	num_properties;
-	unsigned short	num_colors;
-	unsigned short	num_shapes;
-	unsigned short	num_sections;
-	unsigned short	num_doodads;
-	unsigned short	num_key_aliases;
-} XkbGeometrySizesRec,*XkbGeometrySizesPtr;
-
-_XFUNCPROTOBEGIN
-
-extern	XkbPropertyPtr
-XkbAddGeomProperty(
-    XkbGeometryPtr	/* geom */,
-    char *		/* name */,
-    char *		/* value */
-);
-
-extern	XkbKeyAliasPtr
-XkbAddGeomKeyAlias(
-    XkbGeometryPtr	/* geom */,
-    char *		/* alias */,
-    char *		/* real */
-);
-
-extern	XkbColorPtr
-XkbAddGeomColor(
-    XkbGeometryPtr	/* geom */,
-    char *		/* spec */,
-    unsigned int	/* pixel */
-);
-
-extern	XkbOutlinePtr
-XkbAddGeomOutline(
-    XkbShapePtr		/* shape */,
-    int			/* sz_points */
-);
-
-extern XkbShapePtr
-XkbAddGeomShape(
-    XkbGeometryPtr	/* geom */,
-    Atom		/* name */,
-    int			/* sz_outlines */
-);
-
-extern XkbKeyPtr
-XkbAddGeomKey(
-    XkbRowPtr		/* row */
-);
-
-extern XkbRowPtr
-XkbAddGeomRow(
-    XkbSectionPtr	/* section */,
-    int			/* sz_keys */
-);
-
-extern XkbSectionPtr
-XkbAddGeomSection(
-    XkbGeometryPtr	/* geom */,
-    Atom		/* name */,
-    int			/* sz_rows */,
-    int			/* sz_doodads */,
-    int			/* sz_overlays */
-);
-
-extern XkbOverlayPtr
-XkbAddGeomOverlay(
-    XkbSectionPtr	/* section */,
-    Atom		/* name */,
-    int			/* sz_rows */
-);
-
-extern XkbOverlayRowPtr
-XkbAddGeomOverlayRow(
-    XkbOverlayPtr	/* overlay */,
-    int			/* row_under */,
-    int			/* sz_keys */
-);
-
-extern XkbOverlayKeyPtr
-XkbAddGeomOverlayKey(
-    XkbOverlayPtr	/* overlay */,
-    XkbOverlayRowPtr	/* row */,
-    char *		/* over */,
-    char *		/* under */
-);
-
-extern XkbDoodadPtr
-XkbAddGeomDoodad(
-    XkbGeometryPtr	/* geom */,
-    XkbSectionPtr	/* section */,
-    Atom		/* name */
-);
-
-
-extern void
-XkbFreeGeomKeyAliases(
-    XkbGeometryPtr	/* geom */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeomColors(
-    XkbGeometryPtr	/* geom */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeomDoodads(
-    XkbDoodadPtr	/* doodads */,
-    int			/* nDoodads */,
-    Bool		/* freeAll */
-);
-
-
-extern void
-XkbFreeGeomProperties(
-    XkbGeometryPtr	/* geom */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeomOverlayKeys(
-    XkbOverlayRowPtr	/* row */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeomOverlayRows(
-    XkbOverlayPtr	/* overlay */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeomOverlays(
-    XkbSectionPtr	/* section */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeomKeys(
-    XkbRowPtr		/* row */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeomRows(
-    XkbSectionPtr	/* section */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeomSections(
-    XkbGeometryPtr	/* geom */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-
-extern void
-XkbFreeGeomPoints(
-    XkbOutlinePtr	/* outline */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeomOutlines(
-    XkbShapePtr		/* shape */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeomShapes(
-    XkbGeometryPtr	/* geom */,
-    int			/* first */,
-    int			/* count */,
-    Bool		/* freeAll */
-);
-
-extern void
-XkbFreeGeometry(
-    XkbGeometryPtr	/* geom */,
-    unsigned int	/* which */,
-    Bool		/* freeMap */
-);
-
-extern Status
-XkbAllocGeomProps(
-    XkbGeometryPtr	/* geom */,
-    int			/* nProps */
-);
-
-extern Status
-XkbAllocGeomKeyAliases(
-    XkbGeometryPtr	/* geom */,
-    int			/* nAliases */
-);
-
-extern Status
-XkbAllocGeomColors(
-    XkbGeometryPtr	/* geom */,
-    int			/* nColors */
-);
-
-extern Status
-XkbAllocGeomShapes(
-    XkbGeometryPtr	/* geom */,
-    int			/* nShapes */
-);
-
-extern Status
-XkbAllocGeomSections(
-    XkbGeometryPtr	/* geom */,
-    int			/* nSections */
-);
-
-extern Status
-XkbAllocGeomOverlays(
-    XkbSectionPtr	/* section */,
-    int			/* num_needed */
-);
-
-extern Status
-XkbAllocGeomOverlayRows(
-    XkbOverlayPtr	/* overlay */,
-    int			/* num_needed */
-);
-
-extern Status
-XkbAllocGeomOverlayKeys(
-    XkbOverlayRowPtr	/* row */,
-    int			/* num_needed */
-);
-
-extern Status
-XkbAllocGeomDoodads(
-    XkbGeometryPtr	/* geom */,
-    int			/* nDoodads */
-);
-
-extern Status
-XkbAllocGeomSectionDoodads(
-    XkbSectionPtr	/* section */,
-    int			/* nDoodads */
-);
-
-extern Status
-XkbAllocGeomOutlines(
-    XkbShapePtr		/* shape */,
-    int			/* nOL */
-);
-
-extern Status
-XkbAllocGeomRows(
-    XkbSectionPtr	/* section */,
-    int			/* nRows */
-);
-
-extern Status
-XkbAllocGeomPoints(
-    XkbOutlinePtr	/* ol */,
-    int			/* nPts */
-);
-
-extern Status
-XkbAllocGeomKeys(
-    XkbRowPtr		/* row */,
-    int			/* nKeys */
-);
-
-extern	Status
-XkbAllocGeometry(
-	XkbDescPtr		/* xkb */,
-	XkbGeometrySizesPtr	/* sizes */
-);
-
-extern	Status
-XkbSetGeometry(
-	Display *		/* dpy */,
-	unsigned		/* deviceSpec */,
-	XkbGeometryPtr		/* geom */
-);
-
-extern	Bool
-XkbComputeShapeTop(
-	XkbShapePtr		/* shape */,
-	XkbBoundsPtr		/* bounds */
-);
-
-extern	Bool
-XkbComputeShapeBounds(
-	XkbShapePtr		/* shape */
-);
-
-extern	Bool
-XkbComputeRowBounds(
-	XkbGeometryPtr		/* geom */,
-	XkbSectionPtr		/* section */,
-	XkbRowPtr		/* row */
-);
-
-extern	Bool
-XkbComputeSectionBounds(
-	XkbGeometryPtr		/* geom */,
-	XkbSectionPtr		/* section */
-);
-
-extern	char *
-XkbFindOverlayForKey(
-	XkbGeometryPtr		/* geom */,
-	XkbSectionPtr		/* wanted */,
-	char *			/* under */
-);
-
-extern	Status
-XkbGetGeometry(
-    Display *			/* dpy */,
-    XkbDescPtr			/* xkb */
-);
-
-extern	Status
-XkbGetNamedGeometry(
-    Display *			/* dpy */,
-    XkbDescPtr			/* xkb */,
-    Atom			/* name */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XKBSTR_H_ */
diff --git a/openflow/usr/include/X11/extensions/XKBproto.h b/openflow/usr/include/X11/extensions/XKBproto.h
deleted file mode 100644
index b867659..0000000
--- a/openflow/usr/include/X11/extensions/XKBproto.h
+++ /dev/null
@@ -1,1281 +0,0 @@
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#ifndef _XKBPROTO_H_
-#define	_XKBPROTO_H_
-
-#include <X11/Xmd.h>
-#include <X11/extensions/XKB.h>
-
-#define Window CARD32
-#define Atom CARD32
-#define Time CARD32
-#define KeyCode CARD8
-#define KeySym CARD32
-
-#define	XkbPaddedSize(n)	((((unsigned int)(n)+3) >> 2) << 2)
-
-typedef struct _xkbUseExtension {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBUseExtension */
-    CARD16	length B16;
-    CARD16	wantedMajor B16;
-    CARD16	wantedMinor B16;
-} xkbUseExtensionReq;
-#define	sz_xkbUseExtensionReq	8
-
-typedef struct _xkbUseExtensionReply {
-    BYTE	type;		/* X_Reply */
-    BOOL	supported;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	serverMajor B16;
-    CARD16	serverMinor B16;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xkbUseExtensionReply;
-#define	sz_xkbUseExtensionReply	32
-
-typedef	struct _xkbSelectEvents {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* X_KBSelectEvents */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	affectWhich B16;
-    CARD16	clear B16;
-    CARD16	selectAll B16;
-    CARD16	affectMap B16;
-    CARD16	map B16;
-} xkbSelectEventsReq;
-#define	sz_xkbSelectEventsReq	16
-
-typedef struct _xkbBell {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* X_KBBell */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	bellClass B16;
-    CARD16	bellID B16;
-    INT8	percent;
-    BOOL	forceSound;
-    BOOL	eventOnly;
-    CARD8	pad1;
-    INT16	pitch B16;
-    INT16	duration B16;
-    CARD16	pad2 B16;
-    Atom	name B32;
-    Window	window B32;
-} xkbBellReq;
-#define	sz_xkbBellReq		28
-
-typedef struct _xkbGetState {
-	CARD8		reqType;
-	CARD8		xkbReqType;	/* always X_KBGetState */
-	CARD16		length B16;
-	CARD16		deviceSpec B16;
-	CARD16		pad B16;
-} xkbGetStateReq;
-#define	sz_xkbGetStateReq	8
-
-typedef	struct _xkbGetStateReply {
-    BYTE	type;
-    BYTE	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	mods;
-    CARD8	baseMods;
-    CARD8	latchedMods;
-    CARD8	lockedMods;
-    CARD8	group;
-    CARD8	lockedGroup;
-    INT16	baseGroup B16;
-    INT16	latchedGroup B16;
-    CARD8	compatState;
-    CARD8	grabMods;
-    CARD8	compatGrabMods;
-    CARD8	lookupMods;
-    CARD8	compatLookupMods;
-    CARD8	pad1;
-    CARD16	ptrBtnState B16;
-    CARD16	pad2 B16;
-    CARD32	pad3 B32;
-} xkbGetStateReply;
-#define	sz_xkbGetStateReply	32
-
-typedef struct _xkbLatchLockState {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBLatchLockState */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD8	affectModLocks;
-    CARD8	modLocks;
-    BOOL	lockGroup;
-    CARD8	groupLock;
-    CARD8	affectModLatches;
-    CARD8	modLatches;
-    CARD8	pad;
-    BOOL	latchGroup;
-    INT16	groupLatch B16;
-} xkbLatchLockStateReq;
-#define	sz_xkbLatchLockStateReq		16
-
-typedef struct _xkbGetControls {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBGetControls */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	pad B16;
-} xkbGetControlsReq;
-#define	sz_xkbGetControlsReq	8
-
-typedef struct _xkbGetControlsReply {
-    BYTE	type;		/* X_Reply */
-    CARD8	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	mkDfltBtn;
-    CARD8	numGroups;
-    CARD8	groupsWrap;
-    CARD8	internalMods;
-    CARD8	ignoreLockMods;
-    CARD8	internalRealMods;
-    CARD8	ignoreLockRealMods;
-    CARD8	pad1;
-    CARD16	internalVMods B16;
-    CARD16	ignoreLockVMods B16;
-    CARD16	repeatDelay B16;
-    CARD16	repeatInterval B16;
-    CARD16	slowKeysDelay B16;
-    CARD16	debounceDelay B16;
-    CARD16	mkDelay B16;
-    CARD16	mkInterval B16;
-    CARD16	mkTimeToMax B16;
-    CARD16	mkMaxSpeed B16;
-    INT16	mkCurve B16;
-    CARD16	axOptions B16;
-    CARD16	axTimeout B16;
-    CARD16	axtOptsMask B16;
-    CARD16	axtOptsValues B16;
-    CARD16	pad2 B16;
-    CARD32	axtCtrlsMask B32;
-    CARD32	axtCtrlsValues B32;
-    CARD32	enabledCtrls B32;
-    BYTE	perKeyRepeat[XkbPerKeyBitArraySize];
-} xkbGetControlsReply;
-#define	sz_xkbGetControlsReply	92
-
-typedef struct _xkbSetControls {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBSetControls */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD8	affectInternalMods;
-    CARD8	internalMods;
-    CARD8	affectIgnoreLockMods;
-    CARD8	ignoreLockMods;
-    CARD16	affectInternalVMods B16;
-    CARD16	internalVMods B16;
-    CARD16	affectIgnoreLockVMods B16;
-    CARD16	ignoreLockVMods B16;
-    CARD8	mkDfltBtn;
-    CARD8	groupsWrap;
-    CARD16	axOptions B16;
-    CARD16	pad1 B16;
-    CARD32	affectEnabledCtrls B32;
-    CARD32	enabledCtrls B32;
-    CARD32	changeCtrls B32;
-    CARD16	repeatDelay B16;
-    CARD16	repeatInterval B16;
-    CARD16	slowKeysDelay B16;
-    CARD16	debounceDelay B16;
-    CARD16	mkDelay B16;
-    CARD16	mkInterval B16;
-    CARD16	mkTimeToMax B16;
-    CARD16	mkMaxSpeed B16;
-    INT16	mkCurve B16;
-    CARD16	axTimeout B16;
-    CARD32	axtCtrlsMask B32;
-    CARD32	axtCtrlsValues B32;
-    CARD16	axtOptsMask B16;
-    CARD16	axtOptsValues B16;
-    BYTE	perKeyRepeat[XkbPerKeyBitArraySize];
-} xkbSetControlsReq;
-#define	sz_xkbSetControlsReq	100
-
-typedef	struct _xkbKTMapEntryWireDesc {
-    BOOL	active;
-    CARD8	mask;
-    CARD8	level;
-    CARD8	realMods;
-    CARD16	virtualMods B16;
-    CARD16	pad B16;
-} xkbKTMapEntryWireDesc;
-#define sz_xkbKTMapEntryWireDesc	8
-
-typedef struct _xkbKTSetMapEntryWireDesc {
-    CARD8	level;
-    CARD8	realMods;
-    CARD16	virtualMods B16;
-} xkbKTSetMapEntryWireDesc;
-#define	sz_xkbKTSetMapEntryWireDesc	4
-
-typedef struct _xkbModsWireDesc {
-    CARD8	mask;		/* GetMap only */
-    CARD8	realMods;
-    CARD16	virtualMods B16;
-} xkbModsWireDesc;
-#define	sz_xkbModsWireDesc	4
-
-typedef struct _xkbKeyTypeWireDesc {
-    CARD8	mask;
-    CARD8	realMods;
-    CARD16	virtualMods B16;
-    CARD8	numLevels;
-    CARD8	nMapEntries;
-    BOOL	preserve;
-    CARD8	pad;
-} xkbKeyTypeWireDesc;
-#define	sz_xkbKeyTypeWireDesc	8
-
-typedef struct _xkbSymMapWireDesc {
-    CARD8	ktIndex[XkbNumKbdGroups];
-    CARD8	groupInfo;
-    CARD8	width;
-    CARD16	nSyms B16;
-} xkbSymMapWireDesc;
-#define	sz_xkbSymMapWireDesc	8
-
-typedef struct _xkbVModMapWireDesc {
-    KeyCode	key;
-    CARD8	pad;
-    CARD16	vmods B16;
-} xkbVModMapWireDesc;
-#define	sz_xkbVModMapWireDesc	4
-
-typedef struct _xkbBehaviorWireDesc {
-	CARD8	key;
-	CARD8	type;
-	CARD8	data;
-	CARD8	pad;
-} xkbBehaviorWireDesc;
-#define	sz_xkbBehaviorWireDesc	4
-
-typedef	struct _xkbActionWireDesc {
-    CARD8	type;
-    CARD8	data[7];
-} xkbActionWireDesc;
-#define	sz_xkbActionWireDesc	8
-
-typedef struct _xkbGetMap {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBGetMap */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	full B16;
-    CARD16	partial B16;
-    CARD8	firstType;
-    CARD8	nTypes;
-    KeyCode	firstKeySym;
-    CARD8	nKeySyms;
-    KeyCode	firstKeyAct;
-    CARD8	nKeyActs;
-    KeyCode	firstKeyBehavior;
-    CARD8	nKeyBehaviors;
-    CARD16	virtualMods B16;
-    KeyCode	firstKeyExplicit;
-    CARD8	nKeyExplicit;
-    KeyCode	firstModMapKey;
-    CARD8	nModMapKeys;
-    KeyCode	firstVModMapKey;
-    CARD8	nVModMapKeys;
-    CARD16	pad1 B16;
-} xkbGetMapReq;
-#define	sz_xkbGetMapReq	28
-
-typedef struct _xkbGetMapReply {
-    CARD8	type;		/* always X_Reply */
-    CARD8	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	pad1 B16;
-    KeyCode	minKeyCode;
-    KeyCode	maxKeyCode;
-    CARD16	present B16;
-    CARD8	firstType;
-    CARD8	nTypes;
-    CARD8	totalTypes;
-    KeyCode	firstKeySym;
-    CARD16	totalSyms B16;
-    CARD8	nKeySyms;
-    KeyCode	firstKeyAct;
-    CARD16	totalActs B16;
-    CARD8	nKeyActs;
-    KeyCode	firstKeyBehavior;
-    CARD8	nKeyBehaviors;
-    CARD8	totalKeyBehaviors;
-    KeyCode	firstKeyExplicit;
-    CARD8	nKeyExplicit;
-    CARD8	totalKeyExplicit;
-    KeyCode	firstModMapKey;
-    CARD8	nModMapKeys;
-    CARD8	totalModMapKeys;
-    KeyCode	firstVModMapKey;
-    CARD8	nVModMapKeys;
-    CARD8	totalVModMapKeys;
-    CARD8	pad2;
-    CARD16	virtualMods B16;
-} xkbGetMapReply;
-#define	sz_xkbGetMapReply		40
-
-#define	XkbSetMapResizeTypes		(1L<<0)
-#define	XkbSetMapRecomputeActions	(1L<<1)
-#define	XkbSetMapAllFlags		(0x3)
-
-typedef struct _xkbSetMap {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBSetMap */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	present B16;
-    CARD16	flags B16;
-    KeyCode	minKeyCode;
-    KeyCode	maxKeyCode;
-    CARD8	firstType;
-    CARD8	nTypes;
-    KeyCode	firstKeySym;
-    CARD8	nKeySyms;
-    CARD16	totalSyms B16;
-    KeyCode	firstKeyAct;
-    CARD8	nKeyActs;
-    CARD16	totalActs B16;
-    KeyCode	firstKeyBehavior;
-    CARD8	nKeyBehaviors;
-    CARD8	totalKeyBehaviors;
-    KeyCode	firstKeyExplicit;
-    CARD8	nKeyExplicit;
-    CARD8	totalKeyExplicit;
-    KeyCode	firstModMapKey;
-    CARD8	nModMapKeys;
-    CARD8	totalModMapKeys;
-    KeyCode	firstVModMapKey;
-    CARD8	nVModMapKeys;
-    CARD8	totalVModMapKeys;
-    CARD16	virtualMods B16;
-} xkbSetMapReq;
-#define	sz_xkbSetMapReq	36
-
-typedef struct _xkbSymInterpretWireDesc {
-    CARD32		sym B32;
-    CARD8		mods;
-    CARD8		match;
-    CARD8		virtualMod;
-    CARD8		flags;
-    xkbActionWireDesc	act;
-} xkbSymInterpretWireDesc;
-#define	sz_xkbSymInterpretWireDesc	16
-
-typedef struct _xkbGetCompatMap {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBGetCompatMap */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD8	groups;
-    BOOL	getAllSI;
-    CARD16	firstSI B16;
-    CARD16	nSI B16;
-} xkbGetCompatMapReq;
-#define	sz_xkbGetCompatMapReq	12
-
-typedef struct _xkbGetCompatMapReply {
-    CARD8	type;		/* always X_Reply */
-    CARD8	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	groups;
-    CARD8	pad1;
-    CARD16	firstSI B16;
-    CARD16	nSI B16;
-    CARD16	nTotalSI B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xkbGetCompatMapReply;
-#define	sz_xkbGetCompatMapReply		32
-
-typedef struct _xkbSetCompatMap {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBSetCompatMap */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD8	pad1;
-    BOOL	recomputeActions;
-    BOOL	truncateSI;
-    CARD8	groups;
-    CARD16	firstSI B16;
-    CARD16	nSI B16;
-    CARD16	pad2 B16;
-} xkbSetCompatMapReq;
-#define	sz_xkbSetCompatMapReq	16
-
-typedef struct _xkbGetIndicatorState {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBGetIndicatorState */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	pad1 B16;
-} xkbGetIndicatorStateReq;
-#define	sz_xkbGetIndicatorStateReq	8
-
-typedef struct _xkbGetIndicatorStateReply {
-    CARD8	type;		/* always X_Reply */
-    CARD8	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	state B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xkbGetIndicatorStateReply;
-#define	sz_xkbGetIndicatorStateReply	32
-
-typedef struct _xkbGetIndicatorMap {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBGetIndicatorMap */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	pad B16;
-    CARD32	which B32;
-} xkbGetIndicatorMapReq;
-#define	sz_xkbGetIndicatorMapReq	12
-
-typedef struct _xkbGetIndicatorMapReply {
-    CARD8	type;		/* always X_Reply */
-    CARD8	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	which B32;
-    CARD32	realIndicators B32;
-    CARD8	nIndicators;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xkbGetIndicatorMapReply;
-#define	sz_xkbGetIndicatorMapReply	32
-
-typedef struct _xkbIndicatorMapWireDesc {
-    CARD8	flags;
-    CARD8	whichGroups;
-    CARD8	groups;
-    CARD8	whichMods;
-    CARD8	mods;
-    CARD8	realMods;
-    CARD16	virtualMods B16;
-    CARD32	ctrls B32;
-} xkbIndicatorMapWireDesc;
-#define	sz_xkbIndicatorMapWireDesc	12
-
-typedef struct _xkbSetIndicatorMap {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBSetIndicatorMap */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	pad1 B16;
-    CARD32	which B32;
-} xkbSetIndicatorMapReq;
-#define	sz_xkbSetIndicatorMapReq	12
-
-typedef struct _xkbGetNamedIndicator {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* X_KBGetNamedIndicator */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	ledClass B16;
-    CARD16	ledID B16;
-    CARD16	pad1 B16;
-    Atom	indicator B32;
-} xkbGetNamedIndicatorReq;
-#define	sz_xkbGetNamedIndicatorReq		16
-
-typedef	struct _xkbGetNamedIndicatorReply {
-    BYTE	type;
-    BYTE	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    Atom	indicator B32;
-    BOOL	found;
-    BOOL	on;
-    BOOL	realIndicator;
-    CARD8	ndx;
-    CARD8	flags;
-    CARD8	whichGroups;
-    CARD8	groups;
-    CARD8	whichMods;
-    CARD8	mods;
-    CARD8	realMods;
-    CARD16	virtualMods B16;
-    CARD32	ctrls B32;
-    BOOL	supported;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-} xkbGetNamedIndicatorReply;
-#define	sz_xkbGetNamedIndicatorReply	32
-
-typedef struct _xkbSetNamedIndicator {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* X_KBSetNamedIndicator */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	ledClass B16;
-    CARD16	ledID B16;
-    CARD16	pad1 B16;
-    Atom	indicator B32;
-    BOOL	setState;
-    BOOL	on;
-    BOOL	setMap;
-    BOOL	createMap;
-    CARD8	pad2;
-    CARD8	flags;
-    CARD8	whichGroups;
-    CARD8	groups;
-    CARD8	whichMods;
-    CARD8	realMods;
-    CARD16	virtualMods B16;
-    CARD32	ctrls B32;
-} xkbSetNamedIndicatorReq;
-#define	sz_xkbSetNamedIndicatorReq	32
-
-typedef struct _xkbGetNames {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBGetNames */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	pad B16;
-    CARD32	which B32;
-} xkbGetNamesReq;
-#define	sz_xkbGetNamesReq		12
-
-typedef	struct _xkbGetNamesReply {
-    BYTE	type;
-    BYTE	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	which B32;
-    KeyCode	minKeyCode;
-    KeyCode	maxKeyCode;
-    CARD8	nTypes;
-    CARD8	groupNames;
-    CARD16	virtualMods B16;
-    KeyCode	firstKey;
-    CARD8	nKeys;
-    CARD32	indicators B32;
-    CARD8	nRadioGroups;
-    CARD8	nKeyAliases;
-    CARD16	nKTLevels B16;
-    CARD32	pad3 B32;
-} xkbGetNamesReply;
-#define	sz_xkbGetNamesReply	32
-
-typedef struct _xkbSetNames {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBSetNames */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	virtualMods B16;
-    CARD32	which B32;
-    CARD8	firstType;
-    CARD8	nTypes;
-    CARD8	firstKTLevel;
-    CARD8	nKTLevels;
-    CARD32	indicators B32;
-    CARD8	groupNames;
-    CARD8	nRadioGroups;
-    KeyCode	firstKey;
-    CARD8	nKeys;
-    CARD8	nKeyAliases;
-    CARD8	pad1;
-    CARD16	totalKTLevelNames B16;
-} xkbSetNamesReq;
-#define	sz_xkbSetNamesReq	28
-
-typedef struct _xkbPointWireDesc {
-    INT16	x B16;
-    INT16	y B16;
-} xkbPointWireDesc;
-#define	sz_xkbPointWireDesc	4
-
-typedef struct _xkbOutlineWireDesc {
-    CARD8	nPoints;
-    CARD8	cornerRadius;
-    CARD16	pad B16;
-} xkbOutlineWireDesc;
-#define	sz_xkbOutlineWireDesc	4
-
-typedef struct _xkbShapeWireDesc {
-    Atom	name B32;
-    CARD8	nOutlines;
-    CARD8	primaryNdx;
-    CARD8	approxNdx;
-    CARD8	pad;
-} xkbShapeWireDesc;
-#define	sz_xkbShapeWireDesc	8
-
-typedef struct _xkbSectionWireDesc {
-    Atom	name B32;
-    INT16	top B16;
-    INT16	left B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    INT16	angle B16;
-    CARD8	priority;
-    CARD8	nRows;
-    CARD8	nDoodads;
-    CARD8	nOverlays;
-    CARD16	pad B16;
-} xkbSectionWireDesc;
-#define	sz_xkbSectionWireDesc	20
-
-typedef struct _xkbRowWireDesc {
-    INT16	top B16;
-    INT16	left B16;
-    CARD8	nKeys;
-    BOOL	vertical;
-    CARD16	pad B16;
-} xkbRowWireDesc;
-#define	sz_xkbRowWireDesc	8
-
-typedef struct _xkbKeyWireDesc {
-    CARD8	name[XkbKeyNameLength];
-    INT16	gap B16;
-    CARD8	shapeNdx;
-    CARD8	colorNdx;
-} xkbKeyWireDesc;
-#define	sz_xkbKeyWireDesc	8
-
-typedef struct _xkbOverlayWireDesc {
-    Atom	name B32;
-    CARD8	nRows;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-} xkbOverlayWireDesc;
-#define	sz_xkbOverlayWireDesc	8
-
-typedef struct _xkbOverlayRowWireDesc {
-   CARD8	rowUnder;
-   CARD8	nKeys;
-   CARD16	pad1 B16;
-} xkbOverlayRowWireDesc;
-#define	sz_xkbOverlayRowWireDesc	4
-
-typedef struct _xkbOverlayKeyWireDesc {
-   CARD8	over[XkbKeyNameLength];
-   CARD8	under[XkbKeyNameLength];
-} xkbOverlayKeyWireDesc;
-#define	sz_xkbOverlayKeyWireDesc	8
-
-typedef struct _xkbShapeDoodadWireDesc {
-    Atom	name B32;
-    CARD8	type;
-    CARD8	priority;
-    INT16	top B16;
-    INT16	left B16;
-    INT16	angle B16;
-    CARD8	colorNdx;
-    CARD8	shapeNdx;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-} xkbShapeDoodadWireDesc;
-#define	sz_xkbShapeDoodadWireDesc	20
-
-typedef struct _xkbTextDoodadWireDesc {
-    Atom	name B32;
-    CARD8	type;
-    CARD8	priority;
-    INT16	top B16;
-    INT16	left B16;
-    INT16	angle B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD8	colorNdx;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-} xkbTextDoodadWireDesc;
-#define	sz_xkbTextDoodadWireDesc	20
-
-typedef struct _xkbIndicatorDoodadWireDesc {
-    Atom	name B32;
-    CARD8	type;
-    CARD8	priority;
-    INT16	top B16;
-    INT16	left B16;
-    INT16	angle B16;
-    CARD8	shapeNdx;
-    CARD8	onColorNdx;
-    CARD8	offColorNdx;
-    CARD8	pad1;
-    CARD32	pad2 B32;
-} xkbIndicatorDoodadWireDesc;
-#define	sz_xkbIndicatorDoodadWireDesc	20
-
-typedef struct _xkbLogoDoodadWireDesc {
-    Atom	name B32;
-    CARD8	type;
-    CARD8	priority;
-    INT16	top B16;
-    INT16	left B16;
-    INT16	angle B16;
-    CARD8	colorNdx;
-    CARD8	shapeNdx;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-} xkbLogoDoodadWireDesc;
-#define	sz_xkbLogoDoodadWireDesc	20
-
-typedef struct _xkbAnyDoodadWireDesc {
-    Atom	name B32;
-    CARD8	type;
-    CARD8	priority;
-    INT16	top B16;
-    INT16	left B16;
-    INT16	angle B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xkbAnyDoodadWireDesc;
-#define	sz_xkbAnyDoodadWireDesc	20
-
-typedef union _xkbDoodadWireDesc {
-    xkbAnyDoodadWireDesc	any;
-    xkbShapeDoodadWireDesc	shape;
-    xkbTextDoodadWireDesc	text;
-    xkbIndicatorDoodadWireDesc	indicator;
-    xkbLogoDoodadWireDesc	logo;
-} xkbDoodadWireDesc;
-#define	sz_xkbDoodadWireDesc	20
-
-typedef struct _xkbGetGeometry {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBGetGeometry */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	pad B16;
-    Atom	name B32;
-} xkbGetGeometryReq;
-#define	sz_xkbGetGeometryReq	12
-
-typedef struct _xkbGetGeometryReply {
-    CARD8	type;		/* always X_Reply */
-    CARD8	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    Atom	name B32;
-    BOOL	found;
-    CARD8	pad;
-    CARD16	widthMM B16;
-    CARD16	heightMM B16;
-    CARD16	nProperties B16;
-    CARD16	nColors B16;
-    CARD16	nShapes B16;
-    CARD16	nSections B16;
-    CARD16	nDoodads B16;
-    CARD16	nKeyAliases B16;
-    CARD8	baseColorNdx;
-    CARD8	labelColorNdx;
-} xkbGetGeometryReply;
-#define	sz_xkbGetGeometryReply	32
-
-typedef struct _xkbSetGeometry {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBSetGeometry */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD8	nShapes;
-    CARD8	nSections;
-    Atom	name B32;
-    CARD16	widthMM B16;
-    CARD16	heightMM B16;
-    CARD16	nProperties B16;
-    CARD16	nColors B16;
-    CARD16	nDoodads B16;
-    CARD16	nKeyAliases B16;
-    CARD8	baseColorNdx;
-    CARD8	labelColorNdx;
-    CARD16	pad B16;
-} xkbSetGeometryReq;
-#define	sz_xkbSetGeometryReq	28
-
-typedef struct _xkbPerClientFlags {
-    CARD8	reqType;
-    CARD8	xkbReqType;/* always X_KBPerClientFlags */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	pad1 B16;
-    CARD32	change B32;
-    CARD32	value B32;
-    CARD32	ctrlsToChange B32;
-    CARD32	autoCtrls B32;
-    CARD32	autoCtrlValues B32;
-} xkbPerClientFlagsReq;
-#define	sz_xkbPerClientFlagsReq	28
-
-typedef struct _xkbPerClientFlagsReply {
-    CARD8	type;		/* always X_Reply */
-    CARD8	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	supported B32;
-    CARD32	value B32;
-    CARD32	autoCtrls B32;
-    CARD32	autoCtrlValues B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-} xkbPerClientFlagsReply;
-#define	sz_xkbPerClientFlagsReply	32
-
-typedef struct _xkbListComponents {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBListComponents */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	maxNames B16;
-} xkbListComponentsReq;
-#define	sz_xkbListComponentsReq	8
-
-typedef struct _xkbListComponentsReply {
-    CARD8	type;		/* always X_Reply */
-    CARD8	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	nKeymaps B16;
-    CARD16	nKeycodes B16;
-    CARD16	nTypes B16;
-    CARD16	nCompatMaps B16;
-    CARD16	nSymbols B16;
-    CARD16	nGeometries B16;
-    CARD16	extra B16;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xkbListComponentsReply;
-#define	sz_xkbListComponentsReply	32
-
-typedef struct _xkbGetKbdByName {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBGetKbdByName */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	need B16;	/* combination of XkbGBN_* */
-    CARD16	want B16;	/* combination of XkbGBN_* */
-    BOOL	load;
-    CARD8	pad;
-} xkbGetKbdByNameReq;
-#define	sz_xkbGetKbdByNameReq	12
-
-typedef struct _xkbGetKbdByNameReply {
-    CARD8	type;		/* always X_Reply */
-    CARD8	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    KeyCode	minKeyCode;
-    KeyCode	maxKeyCode;
-    BOOL	loaded;
-    BOOL	newKeyboard;
-    CARD16	found B16;	/* combination of XkbGBN_* */
-    CARD16	reported B16;	/* combination of XkbAllComponents */
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xkbGetKbdByNameReply;
-#define	sz_xkbGetKbdByNameReply	32
-
-typedef	struct _xkbDeviceLedsWireDesc {
-    CARD16	ledClass B16;
-    CARD16	ledID B16;
-    CARD32	namesPresent B32;
-    CARD32	mapsPresent B32;
-    CARD32	physIndicators B32;
-    CARD32	state B32;
-} xkbDeviceLedsWireDesc;
-#define sz_xkbDeviceLedsWireDesc	20
-
-typedef struct _xkbGetDeviceInfo {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBGetDeviceInfo */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD16	wanted B16;
-    BOOL	allBtns;
-    CARD8	firstBtn;
-    CARD8	nBtns;
-    CARD8	pad;
-    CARD16	ledClass B16;
-    CARD16	ledID B16;
-} xkbGetDeviceInfoReq;
-#define	sz_xkbGetDeviceInfoReq	16
-
-typedef struct _xkbGetDeviceInfoReply {
-    CARD8	type;		/* always X_Reply */
-    CARD8	deviceID;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	present B16;
-    CARD16	supported B16;
-    CARD16	unsupported B16;
-    CARD16	nDeviceLedFBs B16;
-    CARD8	firstBtnWanted;
-    CARD8	nBtnsWanted;
-    CARD8	firstBtnRtrn;
-    CARD8	nBtnsRtrn;
-    CARD8	totalBtns;
-    BOOL	hasOwnState;
-    CARD16	dfltKbdFB B16;
-    CARD16	dfltLedFB B16;
-    CARD16	pad B16;
-    Atom	devType B32;
-} xkbGetDeviceInfoReply;
-#define	sz_xkbGetDeviceInfoReply	32
-
-typedef struct _xkbSetDeviceInfo {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBSetDeviceInfo */
-    CARD16	length B16;
-    CARD16	deviceSpec B16;
-    CARD8	firstBtn;
-    CARD8	nBtns;
-    CARD16	change B16;
-    CARD16	nDeviceLedFBs B16;
-} xkbSetDeviceInfoReq;
-#define	sz_xkbSetDeviceInfoReq	12
-
-typedef struct _xkbSetDebuggingFlags {
-    CARD8	reqType;
-    CARD8	xkbReqType;	/* always X_KBSetDebuggingFlags */
-    CARD16	length B16;
-    CARD16	msgLength B16;
-    CARD16	pad B16;
-    CARD32	affectFlags B32;
-    CARD32	flags B32;
-    CARD32	affectCtrls B32;
-    CARD32	ctrls B32;
-} xkbSetDebuggingFlagsReq;
-#define	sz_xkbSetDebuggingFlagsReq	24
-
-typedef struct _xkbSetDebuggingFlagsReply {
-    BYTE	type;		/* X_Reply */
-    CARD8	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	currentFlags B32;
-    CARD32	currentCtrls B32;
-    CARD32	supportedFlags B32;
-    CARD32	supportedCtrls B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-} xkbSetDebuggingFlagsReply;
-#define	sz_xkbSetDebuggingFlagsReply	32
-
-	/*
-	 * X KEYBOARD EXTENSION EVENT STRUCTURES
-	 */
-
-typedef struct _xkbAnyEvent {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
-} xkbAnyEvent;
-#define	sz_xkbAnyEvent 32
-
-typedef	struct _xkbNewKeyboardNotify {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    CARD8	oldDeviceID;
-    KeyCode	minKeyCode;
-    KeyCode	maxKeyCode;
-    KeyCode	oldMinKeyCode;
-    KeyCode	oldMaxKeyCode;
-    CARD8	requestMajor;
-    CARD8	requestMinor;
-    CARD16	changed B16;
-    CARD8	detail;
-    CARD8	pad1;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xkbNewKeyboardNotify;
-#define	sz_xkbNewKeyboardNotify	32
-
-typedef	struct _xkbMapNotify {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    CARD8	ptrBtnActions;
-    CARD16	changed B16;
-    KeyCode	minKeyCode;
-    KeyCode	maxKeyCode;
-    CARD8	firstType;
-    CARD8	nTypes;
-    KeyCode	firstKeySym;
-    CARD8	nKeySyms;
-    KeyCode	firstKeyAct;
-    CARD8	nKeyActs;
-    KeyCode	firstKeyBehavior;
-    CARD8	nKeyBehaviors;
-    KeyCode	firstKeyExplicit;
-    CARD8	nKeyExplicit;
-    KeyCode	firstModMapKey;
-    CARD8	nModMapKeys;
-    KeyCode	firstVModMapKey;
-    CARD8	nVModMapKeys;
-    CARD16	virtualMods B16;
-    CARD16	pad1 B16;
-} xkbMapNotify;
-#define	sz_xkbMapNotify	32
-
-typedef	struct _xkbStateNotify {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    CARD8	mods;
-    CARD8	baseMods;
-    CARD8	latchedMods;
-    CARD8	lockedMods;
-    CARD8	group;
-    INT16	baseGroup B16;
-    INT16	latchedGroup B16;
-    CARD8	lockedGroup;
-    CARD8	compatState;
-    CARD8	grabMods;
-    CARD8	compatGrabMods;
-    CARD8	lookupMods;
-    CARD8	compatLookupMods;
-    CARD16	ptrBtnState B16;
-    CARD16	changed B16;
-    KeyCode	keycode;
-    CARD8	eventType;
-    CARD8	requestMajor;
-    CARD8	requestMinor;
-} xkbStateNotify;
-#define	sz_xkbStateNotify	32
-
-typedef struct _xkbControlsNotify {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    CARD8	numGroups;
-    CARD16	pad1 B16;
-    CARD32	changedControls B32;
-    CARD32	enabledControls B32;
-    CARD32	enabledControlChanges B32;
-    KeyCode	keycode;
-    CARD8	eventType;
-    CARD8	requestMajor;
-    CARD8	requestMinor;
-    CARD32	pad2 B32;
-} xkbControlsNotify;
-#define	sz_xkbControlsNotify	32
-
-typedef struct _xkbIndicatorNotify {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    CARD32	state B32;
-    CARD32	changed B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xkbIndicatorNotify;
-#define	sz_xkbIndicatorNotify	32
-
-typedef struct _xkbNamesNotify {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    CARD8	pad1;
-    CARD16	changed B16;
-    CARD8	firstType;
-    CARD8	nTypes;
-    CARD8	firstLevelName;
-    CARD8	nLevelNames;
-    CARD8	pad2;
-    CARD8	nRadioGroups;
-    CARD8	nAliases;
-    CARD8	changedGroupNames;
-    CARD16	changedVirtualMods B16;
-    CARD8	firstKey;
-    CARD8	nKeys;
-    CARD32	changedIndicators B32;
-    CARD32	pad3 B32;
-} xkbNamesNotify;
-#define	sz_xkbNamesNotify	32
-
-typedef struct _xkbCompatMapNotify {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    CARD8	changedGroups;
-    CARD16	firstSI B16;
-    CARD16	nSI B16;
-    CARD16	nTotalSI B16;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xkbCompatMapNotify;
-#define sz_xkbCompatMapNotify	32
-
-typedef struct _xkbBellNotify {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    CARD8	bellClass;
-    CARD8	bellID;
-    CARD8	percent;
-    CARD16	pitch B16;
-    CARD16	duration B16;
-    Atom	name B32;
-    Window	window B32;
-    BOOL	eventOnly;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    CARD32	pad3 B32;
-} xkbBellNotify;
-#define	sz_xkbBellNotify	32
-
-typedef struct _xkbActionMessage {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    KeyCode	keycode;
-    BOOL	press;
-    BOOL	keyEventFollows;
-    CARD8	mods;
-    CARD8	group;
-    CARD8	message[8];
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xkbActionMessage;
-#define	sz_xkbActionMessage		32
-
-typedef struct _xkbAccessXNotify {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    KeyCode	keycode;
-    CARD16	detail B16;
-    CARD16	slowKeysDelay B16;
-    CARD16	debounceDelay B16;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xkbAccessXNotify;
-#define	sz_xkbAccessXNotify	32
-
-typedef struct _xkbExtensionDeviceNotify {
-    BYTE	type;
-    BYTE	xkbType;
-    CARD16	sequenceNumber B16;
-    Time	time B32;
-    CARD8	deviceID;
-    CARD8	pad1;
-    CARD16	reason B16;
-    CARD16	ledClass B16;
-    CARD16	ledID B16;
-    CARD32	ledsDefined B32;
-    CARD32	ledState B32;
-    CARD8	firstBtn;
-    CARD8	nBtns;
-    CARD16	supported B16;
-    CARD16	unsupported B16;
-    CARD16	pad3 B16;
-} xkbExtensionDeviceNotify;
-#define	sz_xkbExtensionDeviceNotify		32
-
-typedef struct _xkbEvent {
-    union {
-	xkbAnyEvent		any;
-	xkbNewKeyboardNotify	new_kbd;
-	xkbMapNotify		map;
-	xkbStateNotify		state;
-	xkbControlsNotify	ctrls;
-	xkbIndicatorNotify	indicators;
-	xkbNamesNotify		names;
-	xkbCompatMapNotify	compat;
-	xkbBellNotify		bell;
-	xkbActionMessage	message;
-	xkbAccessXNotify	accessx;
-	xkbExtensionDeviceNotify device;
-    } u;
-} xkbEvent;
-#define sz_xkbEvent	32
-
-#undef Window
-#undef Atom
-#undef Time
-#undef KeyCode
-#undef KeySym
-
-#endif /* _XKBPROTO_H_ */
diff --git a/openflow/usr/include/X11/extensions/XKBsrv.h b/openflow/usr/include/X11/extensions/XKBsrv.h
deleted file mode 100644
index be7e978..0000000
--- a/openflow/usr/include/X11/extensions/XKBsrv.h
+++ /dev/null
@@ -1,1184 +0,0 @@
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#ifndef _XKBSRV_H_
-#define	_XKBSRV_H_
-
-#ifdef XKB_IN_SERVER
-#define XkbAllocClientMap		SrvXkbAllocClientMap
-#define XkbAllocServerMap		SrvXkbAllocServerMap
-#define XkbChangeTypesOfKey		SrvXkbChangeTypesOfKey
-#define	XkbAddKeyType			SrvXkbAddKeyType
-#define XkbCopyKeyType			SrvXkbCopyKeyType
-#define XkbCopyKeyTypes			SrvXkbCopyKeyTypes
-#define XkbFreeClientMap		SrvXkbFreeClientMap
-#define XkbFreeServerMap		SrvXkbFreeServerMap
-#define XkbInitCanonicalKeyTypes	SrvXkbInitCanonicalKeyTypes
-#define	XkbKeyTypesForCoreSymbols	SrvXkbKeyTypesForCoreSymbols
-#define	XkbApplyCompatMapToKey		SrvXkbApplyCompatMapToKey
-#define	XkbUpdateMapFromCore		SrvXkbUpdateMapFromCore
-#define XkbResizeKeyActions		SrvXkbResizeKeyActions
-#define XkbResizeKeySyms		SrvXkbResizeKeySyms
-#define XkbResizeKeyType		SrvXkbResizeKeyType
-#define XkbAllocCompatMap		SrvXkbAllocCompatMap
-#define XkbAllocControls		SrvXkbAllocControls
-#define XkbAllocIndicatorMaps		SrvXkbAllocIndicatorMaps
-#define XkbAllocKeyboard		SrvXkbAllocKeyboard
-#define XkbAllocNames			SrvXkbAllocNames
-#define XkbFreeCompatMap		SrvXkbFreeCompatMap
-#define XkbFreeControls			SrvXkbFreeControls
-#define XkbFreeIndicatorMaps		SrvXkbFreeIndicatorMaps
-#define XkbFreeKeyboard			SrvXkbFreeKeyboard
-#define XkbFreeNames			SrvXkbFreeNames
-#define	XkbAddDeviceLedInfo		SrvXkbAddDeviceLedInfo
-#define	XkbAllocDeviceInfo		SrvXkbAllocDeviceInfo
-#define	XkbFreeDeviceInfo		SrvXkbFreeDeviceInfo
-#define	XkbResizeDeviceButtonActions	SrvXkbResizeDeviceButtonActions
-#define XkbLatchModifiers		SrvXkbLatchModifiers
-#define XkbLatchGroup			SrvXkbLatchGroup
-#define XkbVirtualModsToReal		SrvXkbVirtualModsToReal
-#define	XkbChangeKeycodeRange		SrvXkbChangeKeycodeRange
-#define	XkbApplyVirtualModChanges	SrvXkbApplyVirtualModChanges
-#define	XkbUpdateActionVirtualMods	SrvXkbUpdateActionVirtualMods
-#define XkbUpdateKeyTypeVirtualMods	SrvXkbUpdateKeyTypeVirtualMods
-#endif
-
-#include <X11/extensions/XKBstr.h>
-#include <X11/extensions/XKBproto.h>
-#include "inputstr.h"
-
-typedef struct _XkbInterest {
-	DeviceIntPtr		dev;
-	ClientPtr		client;
-	XID			resource;
-	struct _XkbInterest *	next;
-	CARD16			extDevNotifyMask;
-	CARD16			stateNotifyMask;
-	CARD16			namesNotifyMask;
-	CARD32 			ctrlsNotifyMask;
-	CARD8			compatNotifyMask;
-	BOOL			bellNotifyMask;
-	BOOL			actionMessageMask;
-	CARD16			accessXNotifyMask;
-	CARD32			iStateNotifyMask;
-	CARD32			iMapNotifyMask;
-	CARD16			altSymsNotifyMask;
-	CARD32			autoCtrls;
-	CARD32			autoCtrlValues;
-} XkbInterestRec,*XkbInterestPtr;
-
-typedef struct _XkbRadioGroup {
-	CARD8		flags;
-	CARD8		nMembers;
-	CARD8		dfltDown;
-	CARD8		currentDown;
-	CARD8		members[XkbRGMaxMembers];
-} XkbRadioGroupRec, *XkbRadioGroupPtr;
-
-typedef struct	_XkbEventCause {
-	CARD8		kc;
-	CARD8		event;
-	CARD8		mjr;
-	CARD8		mnr;
-	ClientPtr	client;
-} XkbEventCauseRec,*XkbEventCausePtr;
-#define	XkbSetCauseKey(c,k,e)	{ (c)->kc= (k),(c)->event= (e),\
-				  (c)->mjr= (c)->mnr= 0; \
-				  (c)->client= NULL; }
-#define	XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\
-				  (c)->mjr= (j),(c)->mnr= (n);\
-				  (c)->client= (cl); }
-#define	XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq(c,e,0,cl)
-#define	XkbSetCauseXkbReq(c,e,cl)  XkbSetCauseReq(c,XkbReqCode,e,cl)
-#define	XkbSetCauseUnknown(c)	   XkbSetCauseKey(c,0,0)
-
-#define	_OFF_TIMER		0
-#define	_KRG_WARN_TIMER		1
-#define	_KRG_TIMER		2
-#define	_SK_TIMEOUT_TIMER	3
-#define	_ALL_TIMEOUT_TIMER	4
-
-#define	_BEEP_NONE		0
-#define	_BEEP_FEATURE_ON	1
-#define	_BEEP_FEATURE_OFF	2
-#define	_BEEP_FEATURE_CHANGE	3
-#define	_BEEP_SLOW_WARN		4
-#define	_BEEP_SLOW_PRESS	5
-#define	_BEEP_SLOW_ACCEPT	6
-#define	_BEEP_SLOW_REJECT	7
-#define	_BEEP_SLOW_RELEASE	8
-#define	_BEEP_STICKY_LATCH	9
-#define	_BEEP_STICKY_LOCK	10
-#define	_BEEP_STICKY_UNLOCK	11
-#define	_BEEP_LED_ON		12
-#define	_BEEP_LED_OFF		13
-#define	_BEEP_LED_CHANGE	14
-#define	_BEEP_BOUNCE_REJECT	15
-
-typedef struct _XkbSrvInfo {
-	XkbStateRec	 prev_state;
-	XkbStateRec	 state;
-	XkbDescPtr	 desc;
-
-	DeviceIntPtr	 device;
-	KbdCtrlProcPtr	 kbdProc;
-
-	XkbRadioGroupPtr radioGroups;
-	CARD8		 nRadioGroups;
-	CARD8		 clearMods;
-	CARD8		 setMods;
-	INT16		 groupChange;
-
-	CARD16		 dfltPtrDelta;
-
-	double		 mouseKeysCurve;
-	double		 mouseKeysCurveFactor;
-	INT16		 mouseKeysDX;
-	INT16		 mouseKeysDY;
-	CARD8		 mouseKeysFlags;
-	Bool		 mouseKeysAccel;
-	CARD8		 mouseKeysCounter;
-
-	CARD8		 lockedPtrButtons;
-	CARD8		 shiftKeyCount;
-	KeyCode		 mouseKey;
-	KeyCode		 inactiveKey;
-	KeyCode		 slowKey;
-	KeyCode		 repeatKey;
-	CARD8		 krgTimerActive;
-	CARD8		 beepType;
-	CARD8		 beepCount;
-
-	CARD32		 flags;
-	CARD32		 lastPtrEventTime;
-	CARD32		 lastShiftEventTime;
-	OsTimerPtr	 beepTimer;
-	OsTimerPtr	 mouseKeyTimer;
-	OsTimerPtr	 slowKeysTimer;
-	OsTimerPtr	 bounceKeysTimer;
-	OsTimerPtr	 repeatKeyTimer;
-	OsTimerPtr	 krgTimer;
-} XkbSrvInfoRec, *XkbSrvInfoPtr;
-
-#define	XkbSLI_IsDefault	(1L<<0)
-#define	XkbSLI_HasOwnState	(1L<<1)
-
-typedef struct	_XkbSrvLedInfo {
-	CARD16			flags;
-	CARD16			class;
-	CARD16			id;
-	union {
-	    KbdFeedbackPtr	kf;
-	    LedFeedbackPtr	lf;
-	} 			fb;
-
-	CARD32			physIndicators;
-	CARD32			autoState;
-	CARD32			explicitState;
-	CARD32			effectiveState;
-
-	CARD32			mapsPresent;
-	CARD32			namesPresent;
-	XkbIndicatorMapPtr	maps;
-	Atom *			names;
-
-	CARD32			usesBase;
-	CARD32			usesLatched;
-	CARD32			usesLocked;
-	CARD32			usesEffective;
-	CARD32			usesCompat;
-	CARD32			usesControls;
-
-	CARD32			usedComponents;
-} XkbSrvLedInfoRec, *XkbSrvLedInfoPtr;
-
-/*
- * Settings for xkbClientFlags field (used by DIX)
- * These flags _must_ not overlap with XkbPCF_*
- */
-#define	_XkbClientInitialized		(1<<15)
-
-#define	_XkbWantsDetectableAutoRepeat(c)\
-	((c)->xkbClientFlags&XkbPCF_DetectableAutoRepeatMask)
-
-/*
- * Settings for flags field
- */
-#define	_XkbStateNotifyInProgress	(1<<0)
-
-typedef struct
-{
-    ProcessInputProc processInputProc;
-    ProcessInputProc realInputProc;
-    DeviceUnwrapProc unwrapProc;
-} xkbDeviceInfoRec, *xkbDeviceInfoPtr;
-
-#define WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
-	device->public.processInputProc = proc; \
-	oldprocs->processInputProc = \
-	oldprocs->realInputProc = device->public.realInputProc; \
-	device->public.realInputProc = proc; \
-	oldprocs->unwrapProc = device->unwrapProc; \
-	device->unwrapProc = unwrapproc;
-
-#define COND_WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
-	if (device->public.processInputProc == device->public.realInputProc)\
-	    device->public.processInputProc = proc; \
-	oldprocs->processInputProc = \
-	oldprocs->realInputProc = device->public.realInputProc; \
-	device->public.realInputProc = proc; \
-	oldprocs->unwrapProc = device->unwrapProc; \
-	device->unwrapProc = unwrapproc;
-
-#define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs) \
-	device->public.processInputProc = oldprocs->processInputProc; \
-	device->public.realInputProc = oldprocs->realInputProc; \
-	device->unwrapProc = oldprocs->unwrapProc;
-
-#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr) (dev)->devPrivates[xkbDevicePrivateIndex].ptr)
-
-/***====================================================================***/
-
-
-/***====================================================================***/
-
-#define XkbAX_KRGMask	 (XkbSlowKeysMask|XkbBounceKeysMask)
-#define	XkbAllFilteredEventsMask \
-	(XkbAccessXKeysMask|XkbRepeatKeysMask|XkbMouseKeysAccelMask|XkbAX_KRGMask)
-
-/***====================================================================***/
-
-extern int	XkbReqCode;
-extern int	XkbEventBase;
-extern int	XkbKeyboardErrorCode;
-extern int	XkbDisableLockActions;
-extern char *	XkbBaseDirectory;
-extern char *	XkbBinDirectory;
-extern char *	XkbInitialMap;
-extern int	_XkbClientMajor;
-extern int	_XkbClientMinor;
-extern unsigned	int XkbXIUnsupported;
-
-extern char *	XkbModelUsed,*XkbLayoutUsed,*XkbVariantUsed,*XkbOptionsUsed;
-extern Bool	noXkbExtension;
-extern Bool	XkbWantRulesProp;
-
-extern pointer	XkbLastRepeatEvent;
-
-extern CARD32	xkbDebugFlags;
-extern CARD32	xkbDebugCtrls;
-
-#define	_XkbAlloc(s)		xalloc((s))
-#define	_XkbCalloc(n,s)		Xcalloc((n)*(s))
-#define	_XkbRealloc(o,s)	Xrealloc((o),(s))
-#define	_XkbTypedAlloc(t)	((t *)xalloc(sizeof(t)))
-#define	_XkbTypedCalloc(n,t)	((t *)Xcalloc((n)*sizeof(t)))
-#define	_XkbTypedRealloc(o,n,t) \
-	((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
-#define	_XkbClearElems(a,f,l,t)	bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
-#define	_XkbFree(p)		Xfree(p)
-
-#define	_XkbLibError(c,l,d) \
-	{ _XkbErrCode= (c); _XkbErrLocation= (l); _XkbErrData= (d); }
-#define	_XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
-#define	_XkbErrCode3(a,b,c)	_XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))
-#define	_XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))
-
-extern	int	DeviceKeyPress,DeviceKeyRelease;
-extern	int	DeviceButtonPress,DeviceButtonRelease;
-
-#ifdef XINPUT
-#define	_XkbIsPressEvent(t)	(((t)==KeyPress)||((t)==DeviceKeyPress))
-#define	_XkbIsReleaseEvent(t)	(((t)==KeyRelease)||((t)==DeviceKeyRelease))
-#else
-#define	_XkbIsPressEvent(t)	((t)==KeyPress)
-#define	_XkbIsReleaseEvent(t)	((t)==KeyRelease)
-#endif
-
-#define	_XkbCoreKeycodeInRange(c,k)	(((k)>=(c)->curKeySyms.minKeyCode)&&\
-					 ((k)<=(c)->curKeySyms.maxKeyCode))
-#define	_XkbCoreNumKeys(c)	((c)->curKeySyms.maxKeyCode-\
-				 (c)->curKeySyms.minKeyCode+1)
-
-#define	XConvertCase(s,l,u)	XkbConvertCase(s,l,u)
-#undef	IsKeypadKey
-#define	IsKeypadKey(s)		XkbKSIsKeypad(s)
-
-typedef int Status;
-typedef pointer XPointer;
-typedef struct _XDisplay Display;
-
-#ifndef True
-#define	True	1
-#define	False	0
-#endif
-
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define	PATH_MAX MAXPATHLEN
-#else
-#define	PATH_MAX 1024
-#endif
-#endif
-
-_XFUNCPROTOBEGIN
-
-extern void XkbUseMsg(
-    void
-);
-
-extern int XkbProcessArguments(
-    int				/* argc */,
-    char **			/* argv */,
-    int				/* i */
-);
-
-extern	void	XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc);
-
-extern	void	XkbFreeCompatMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* which */,
-    Bool			/* freeMap */
-);
-
-extern	void XkbFreeNames(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeMap */
-);
-
-extern DeviceIntPtr _XkbLookupAnyDevice(
-    int			/* id */,
-    int *		/* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupKeyboard(
-    int			/* id */,
-    int *		/* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupBellDevice(
-    int			/* id */,
-    int *		/* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupLedDevice(
-    int			/* id */,
-    int *		/* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupButtonDevice(
-    int			/* id */,
-    int *		/* why_rtrn */
-);
-
-extern	XkbDescPtr XkbAllocKeyboard(
-	void
-);
-
-extern	Status XkbAllocClientMap(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	unsigned int		/* nTypes */
-);
-
-extern	Status XkbAllocServerMap(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	unsigned int		/* nNewActions */
-);
-
-extern	void	XkbFreeClientMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* what */,
-    Bool			/* freeMap */
-);
-
-extern	void	XkbFreeServerMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* what */,
-    Bool			/* freeMap */
-);
-
-extern	Status XkbAllocIndicatorMaps(
-	XkbDescPtr		/* xkb */
-);
-
-extern	Status	XkbAllocCompatMap(
-    XkbDescPtr			/* xkb */,
-    unsigned int		/* which */,
-    unsigned int		/* nInterpret */
-);
-
-extern	Status XkbAllocNames(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	int			/* nTotalRG */,
-	int			/* nTotalAliases */
-);
-
-extern	Status	XkbAllocControls(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which*/
-);
-
-extern	Status	XkbCopyKeyType(
-    XkbKeyTypePtr		/* from */,
-    XkbKeyTypePtr		/* into */
-);
-
-extern	Status	XkbCopyKeyTypes(
-    XkbKeyTypePtr		/* from */,
-    XkbKeyTypePtr		/* into */,
-    int				/* num_types */
-);
-
-extern	Status	XkbResizeKeyType(
-    XkbDescPtr		/* xkb */,
-    int			/* type_ndx */,
-    int			/* map_count */,
-    Bool		/* want_preserve */,
-    int			/* new_num_lvls */
-);
-
-extern	void	XkbFreeKeyboard(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeDesc */
-);
-
-extern  void XkbSetActionKeyMods(
-	XkbDescPtr		/* xkb */,
-	XkbAction *		/* act */,
-	unsigned int 		/* mods */
-);
-
-extern Bool XkbCheckActionVMods(
-	XkbDescPtr		/* xkb */,
-	XkbAction *		/* act */,
-	unsigned int 		/* changed */
-);
-
-extern Bool XkbApplyVModChanges(
-    XkbSrvInfoPtr	/* xkbi */,
-    unsigned int	/* changed */,
-    XkbChangesPtr	/* pChanges */,
-    unsigned int *	/* needChecksRtrn */,
-    XkbEventCausePtr	/* cause */
-);
-
-extern void XkbApplyVModChangesToAllDevices(
-    DeviceIntPtr	/* dev */,
-    XkbDescPtr 		/* xkb */,
-    unsigned int 	/* changed */,
-    XkbEventCausePtr	/* cause */
-);
-
-extern	unsigned int XkbMaskForVMask(
-    XkbDescPtr		/* xkb */,
-    unsigned int	/* vmask */
-);
-
-extern Bool XkbVirtualModsToReal(
-	XkbDescPtr	/* xkb */,
-	unsigned int	/* virtua_mask */,
-	unsigned int *	/* mask_rtrn */
-);
-
-extern	unsigned int	XkbAdjustGroup(
-    int			/* group */,
-    XkbControlsPtr	/* ctrls */
-);
-
-extern KeySym *XkbResizeKeySyms(
-    XkbDescPtr		/* xkb */,
-    int 		/* key */,
-    int 		/* needed */
-);
-
-extern XkbAction *XkbResizeKeyActions(
-    XkbDescPtr		/* xkb */,
-    int 		/* key */,
-    int 		/* needed */
-);
-
-extern void XkbUpdateKeyTypesFromCore(
-    DeviceIntPtr	/* pXDev */,
-    KeyCode 		/* first */,
-    CARD8 		/* num */,
-    XkbChangesPtr	/* pChanges */
-);
-
-extern	void XkbUpdateDescActions(	
-    XkbDescPtr		/* xkb */,
-    KeyCode		/* first */,
-    CARD8		/* num */,
-    XkbChangesPtr	/* changes */
-);
-
-extern void XkbUpdateActions(
-    DeviceIntPtr	/* pXDev */,
-    KeyCode 		/* first */,
-    CARD8 		/* num */,
-    XkbChangesPtr  	/* pChanges */,
-    unsigned int *	/* needChecksRtrn */,
-    XkbEventCausePtr	/* cause */
-);
-
-extern void XkbUpdateCoreDescription(
-    DeviceIntPtr	/* keybd */,
-    Bool		/* resize */
-);
-
-extern void XkbApplyMappingChange(
-    DeviceIntPtr	/* pXDev */,
-    CARD8 		/* request */,
-    KeyCode 		/* firstKey */,
-    CARD8 		/* num */,
-    ClientPtr		/* client */
-);
-
-extern void XkbSetIndicators(
-    DeviceIntPtr		/* pXDev */,
-    CARD32			/* affect */,
-    CARD32			/* values */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern void XkbUpdateIndicators(
-    DeviceIntPtr		/* keybd */,
-    CARD32		 	/* changed */,
-    Bool			/* check_edevs */,
-    XkbChangesPtr		/* pChanges */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern XkbSrvLedInfoPtr XkbAllocSrvLedInfo(
-    DeviceIntPtr		/* dev */,
-    KbdFeedbackPtr		/* kf */,
-    LedFeedbackPtr		/* lf */,
-    unsigned int		/* needed_parts */
-);
-
-extern XkbSrvLedInfoPtr XkbFindSrvLedInfo(
-    DeviceIntPtr		/* dev */,
-    unsigned int		/* class */,
-    unsigned int		/* id */,
-    unsigned int		/* needed_parts */
-);
-
-extern void XkbApplyLedNameChanges(
-    DeviceIntPtr		/* dev */,
-    XkbSrvLedInfoPtr		/* sli */,
-    unsigned int		/* changed_names */,
-    xkbExtensionDeviceNotify *	/* ed */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern void XkbApplyLedMapChanges(
-    DeviceIntPtr		/* dev */,
-    XkbSrvLedInfoPtr		/* sli */,
-    unsigned int		/* changed_maps */,
-    xkbExtensionDeviceNotify *	/* ed */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern void XkbApplyLedStateChanges(
-    DeviceIntPtr		/* dev */,
-    XkbSrvLedInfoPtr		/* sli */,
-    unsigned int		/* changed_leds */,
-    xkbExtensionDeviceNotify *	/* ed */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern void XkbUpdateLedAutoState(
-    DeviceIntPtr		/* dev */,
-    XkbSrvLedInfoPtr		/* sli */,
-    unsigned int		/* maps_to_check */,
-    xkbExtensionDeviceNotify *	/* ed */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern void XkbFlushLedEvents(	
-    DeviceIntPtr		/* dev */,
-    DeviceIntPtr		/* kbd */,
-    XkbSrvLedInfoPtr		/* sli */,
-    xkbExtensionDeviceNotify *	/* ed */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern void XkbUpdateAllDeviceIndicators(
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern unsigned int XkbIndicatorsToUpdate(
-    DeviceIntPtr		/* dev */,
-    unsigned long		/* state_changes */,
-    Bool			/* enabled_ctrl_changes */
-);
-
-extern void XkbComputeDerivedState(
-    XkbSrvInfoPtr		/* xkbi */
-);
-
-extern void XkbCheckSecondaryEffects(
-    XkbSrvInfoPtr		/* xkbi */,
-    unsigned int		/* which */,
-    XkbChangesPtr		/* changes */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern void XkbCheckIndicatorMaps(
-    DeviceIntPtr		/* dev */,
-    XkbSrvLedInfoPtr		/* sli */,
-    unsigned int		/* which */
-);
-
-extern unsigned int XkbStateChangedFlags(
-    XkbStatePtr			/* old */,
-    XkbStatePtr			/* new */
-);
-
-extern	void XkbSendStateNotify(
-       DeviceIntPtr	/* kbd */,
-       xkbStateNotify *	/* pSN */
-);
-
-extern	void XkbSendMapNotify(
-       DeviceIntPtr	/* kbd */,
-       xkbMapNotify *	/* ev */
-);
-
-extern	int  XkbComputeControlsNotify(
-	DeviceIntPtr		/* kbd */,
-	XkbControlsPtr		/* old */,
-	XkbControlsPtr		/* new */,
-	xkbControlsNotify *	/* pCN */,
-	Bool			/* forceCtrlProc */
-);
-
-extern	void XkbSendControlsNotify(
-       DeviceIntPtr		/* kbd */,
-       xkbControlsNotify *	/* ev */
-);
-
-extern	void XkbSendCompatMapNotify(
-	DeviceIntPtr		/* kbd */,
-	xkbCompatMapNotify *	/* ev */
-);
-
-extern	void XkbSendIndicatorNotify(
-       DeviceIntPtr		/* kbd */,
-       int			/* xkbType */,
-       xkbIndicatorNotify *	/* ev */
-);
-
-extern	void XkbHandleBell(
-       BOOL		/* force */,
-       BOOL		/* eventOnly */,
-       DeviceIntPtr	/* kbd */,
-       CARD8		/* percent */,
-       pointer 		/* ctrl */,
-       CARD8		/* class */,
-       Atom		/* name */,
-       WindowPtr	/* pWin */,
-       ClientPtr	/* pClient */
-);
-
-extern	void XkbSendAccessXNotify(
-       DeviceIntPtr		/* kbd */,
-       xkbAccessXNotify *	/* pEv */
-);
-
-extern	void XkbSendNamesNotify(
-       DeviceIntPtr	/* kbd */,
-       xkbNamesNotify *	/* ev */
-);
-
-extern	void XkbSendCompatNotify(
-       DeviceIntPtr		/* kbd */,
-       xkbCompatMapNotify *	/* ev */
-);
-
-extern	void XkbSendActionMessage(
-       DeviceIntPtr		/* kbd */,
-       xkbActionMessage *	/* ev */
-);
-
-extern	void XkbSendExtensionDeviceNotify(
-       DeviceIntPtr			/* kbd */,
-       ClientPtr			/* client */,
-       xkbExtensionDeviceNotify *	/* ev */
-);
-
-extern void XkbSendNotification(
-    DeviceIntPtr		/* kbd */,
-    XkbChangesPtr		/* pChanges */,
-    XkbEventCausePtr		/* cause */
-);
-
-extern void XkbProcessKeyboardEvent(
-    struct _xEvent * 		/* xE */,
-    DeviceIntPtr		/* keybd */,
-    int 			/* count */
-);
-
-extern void XkbProcessOtherEvent(
-    struct _xEvent * 		/* xE */,
-    DeviceIntPtr		/* keybd */,
-    int 			/* count */
-);
-
-extern void XkbHandleActions(
-    DeviceIntPtr		/* dev */,
-    DeviceIntPtr		/* kbd */,
-    struct _xEvent * 		/* xE */,
-    int 			/* count */
-);
-
-extern Bool XkbEnableDisableControls(
-    XkbSrvInfoPtr	/* xkbi */,
-    unsigned long	/* change */,
-    unsigned long	/* newValues */,
-    XkbChangesPtr	/* changes */,
-    XkbEventCausePtr	/* cause */
-);
-
-extern void AccessXInit(
-    DeviceIntPtr        /* dev */
-);
-
-extern Bool AccessXFilterPressEvent(
-    register struct _xEvent *	/* xE */,
-    register DeviceIntPtr	/* keybd */,
-    int				/* count */
-);
-
-extern Bool AccessXFilterReleaseEvent(
-    register struct _xEvent *	/* xE */,
-    register DeviceIntPtr	/* keybd */,
-    int				/* count */
-);
-
-extern void AccessXCancelRepeatKey(
-    XkbSrvInfoPtr	/* xkbi */,
-    KeyCode		/* key */
-);
-
-extern void AccessXComputeCurveFactor(
-    XkbSrvInfoPtr	/* xkbi */,
-    XkbControlsPtr	/* ctrls */
-);
-
-extern	XkbDeviceLedInfoPtr	XkbAddDeviceLedInfo(
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* ledClass */,
-	unsigned int		/* ledId */
-);
-
-extern	XkbDeviceInfoPtr	XkbAllocDeviceInfo(
-	unsigned int		/* deviceSpec */,
-	unsigned int		/* nButtons */,
-	unsigned int		/* szLeds */
-);
-
-extern	void XkbFreeDeviceInfo(
-	XkbDeviceInfoPtr	/* devi */,
-	unsigned int		/* which */,
-	Bool			/* freeDevI */
-);
-
-extern Status XkbResizeDeviceButtonActions(
-	XkbDeviceInfoPtr        /* devi */,
-	unsigned int            /* newTotal */
-);
-
-extern	XkbInterestPtr XkbFindClientResource(
-       DevicePtr	/* inDev */,
-       ClientPtr	/* client */
-);
-
-extern	XkbInterestPtr XkbAddClientResource(
-       DevicePtr	/* inDev */,
-       ClientPtr	/* client */,
-       XID		/* id */
-);
-
-extern	int XkbRemoveClient(
-       DevicePtr	/* inDev */,
-       ClientPtr	/* client */
-);
-
-extern	int XkbRemoveResourceClient(
-       DevicePtr	/* inDev */,
-       XID		/* id */
-);
-
-extern int XkbDDXInitDevice(
-    DeviceIntPtr        /* dev */
-);
-
-extern	int XkbDDXAccessXBeep(
-    DeviceIntPtr        /* dev */,
-    unsigned int	/* what */,
-    unsigned int	/* which */
-);
-
-extern	void XkbDDXKeyClick(
-    DeviceIntPtr	/* dev */,
-    int			/* keycode */,
-    int			/* synthetic */
-);
-
-extern 	int XkbDDXUsesSoftRepeat(
-    DeviceIntPtr	/* dev */
-);
-
-extern	void XkbDDXKeybdCtrlProc(
-	DeviceIntPtr	/* dev */,
-	KeybdCtrl *	/* ctrl */
-);
-
-extern void XkbDDXChangeControls(
-	DeviceIntPtr	/* dev */,
-	XkbControlsPtr 	/* old */,
-	XkbControlsPtr 	/* new */
-);
-
-extern void XkbDDXUpdateIndicators(
-	DeviceIntPtr	/* keybd */,
-	CARD32		/* newState */
-);
-
-extern void XkbDDXUpdateDeviceIndicators(
-	DeviceIntPtr		/* dev */,
-	XkbSrvLedInfoPtr	/* sli */,
-	CARD32			/* newState */
-);
-
-extern void XkbDDXFakePointerButton(
-	int 		/* event */,
-	int		/* button */
-);
-
-extern void XkbDDXFakePointerMotion(
- 	unsigned int	/* flags */,
-	int		/* x */,
-	int		/* y */
-);
-
-extern void XkbDDXFakeDeviceButton(
-	DeviceIntPtr	/* dev */,
-	Bool		/* press */,
-	int		/* button */
-);
-
-extern int XkbDDXTerminateServer(
-	DeviceIntPtr	/* dev */,
-	KeyCode		/* key */,
-	XkbAction *	/* act */
-);
-
-extern int XkbDDXSwitchScreen(
-	DeviceIntPtr	/* dev */,
-	KeyCode		/* key */,
-	XkbAction *	/* act */
-);
-
-extern int XkbDDXPrivate(
-	DeviceIntPtr	/* dev */,
-	KeyCode		/* key */,
-	XkbAction *	/* act */
-);
-
-extern void XkbDisableComputedAutoRepeats(
-	DeviceIntPtr 	/* pXDev */,
-	unsigned int	/* key */
-);
-
-extern void XkbSetRepeatKeys(
-	DeviceIntPtr 	/* pXDev */,
-	int		/* key */,
-	int	 	/* onoff */
-);
-
-extern	int XkbLatchModifiers(
-	DeviceIntPtr 	/* pXDev */,
-	CARD8 		/* mask */,
-	CARD8 		/* latches */
-);
-
-extern	int XkbLatchGroup(
-	DeviceIntPtr  	/* pXDev */,
-	int	  	/* group */
-);
-
-extern	void XkbClearAllLatchesAndLocks(
-	DeviceIntPtr		/* dev */,
-	XkbSrvInfoPtr		/* xkbi */,
-	Bool			/* genEv */,
-	XkbEventCausePtr	/* cause */
-);
-
-extern	void	XkbSetRulesDflts(
-	char *			/* rulesFile */,
-	char *			/* model */,
-	char *			/* layout */,
-	char *			/* variant */,
-	char *			/* options */
-);
-
-extern	void	XkbInitDevice(
-	DeviceIntPtr 	/* pXDev */
-);
-
-extern	Bool	XkbInitKeyboardDeviceStruct(
-	DeviceIntPtr 		/* pXDev */,
-	XkbComponentNamesPtr	/* pNames */,
-	KeySymsPtr		/* pSyms */,
-	CARD8 			/* pMods */[],
-	BellProcPtr		/* bellProc */,
-	KbdCtrlProcPtr		/* ctrlProc */
-);
-
-extern	int SProcXkbDispatch(
-	ClientPtr		/* client */
-);
-
-extern XkbGeometryPtr XkbLookupNamedGeometry(
-	DeviceIntPtr		/* dev */,
-	Atom			/* name */,
-	Bool *			/* shouldFree */
-);
-
-extern char *	_XkbDupString(
-	char *			/* str */
-);
-
-extern void	XkbConvertCase(
-	KeySym 			/* sym */,
-	KeySym *		/* lower */,
-	KeySym *		/* upper */
-);
-
-extern	Status	 XkbChangeKeycodeRange(	
-	XkbDescPtr		/* xkb */,
-	int 			/* minKC */,
-	int 			/* maxKC */,
-	XkbChangesPtr		/* changes */
-);
-
-extern int XkbFinishDeviceInit(
-	DeviceIntPtr		/* pXDev */
-);
-
-extern void XkbFreeSrvLedInfo(
-	XkbSrvLedInfoPtr	/* sli */
-);
-
-extern void XkbFreeInfo(
-	XkbSrvInfoPtr		/* xkbi */
-);
-
-extern Status XkbChangeTypesOfKey(
-	XkbDescPtr		/* xkb */,
-	int			/* key */,
-	int			/* nGroups */,
-	unsigned int		/* groups */,
-	int *			/* newTypesIn */,
-	XkbMapChangesPtr	/* changes */
-);
-
-extern XkbKeyTypePtr XkbAddKeyType(
-	XkbDescPtr		/* xkb */,
-	Atom			/* name */,
-	int			/* map_count */,
-	Bool			/* want_preserve */,
-	int			/* num_lvls */
-);
-
-extern Status XkbInitCanonicalKeyTypes(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	int			/* keypadVMod */
-);
-
-extern int XkbKeyTypesForCoreSymbols(
-	XkbDescPtr		/* xkb */,
-	int			/* map_width */,
-	KeySym *		/* core_syms */,
-	unsigned int		/* protected */,
-	int *			/* types_inout */,
-	KeySym *		/* xkb_syms_rtrn */
-);
-
-extern Bool XkbApplyCompatMapToKey(
-	XkbDescPtr		/* xkb */,
-	KeyCode			/* key */,
-	XkbChangesPtr		/* changes */
-);
-
-extern Bool XkbUpdateMapFromCore(
-	XkbDescPtr		/* xkb */,
-	KeyCode			/* first_key */,
-	int			/* num_keys */,
-	int			/* map_width */,
-	KeySym *		/* core_keysyms */,
-	XkbChangesPtr		/* changes */
-);
-
-extern void XkbFreeControls(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeMap */
-);
-
-extern void XkbFreeIndicatorMaps(
-	XkbDescPtr		/* xkb */
-);
-
-extern Bool XkbApplyVirtualModChanges(
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* changed */,
-	XkbChangesPtr		/* changes */
-);
-
-extern Bool XkbUpdateActionVirtualMods(
-	XkbDescPtr		/* xkb */,
-	XkbAction *		/* act */,
-	unsigned int		/* changed */
-);
-
-extern void XkbUpdateKeyTypeVirtualMods(
-	XkbDescPtr		/* xkb */,
-	XkbKeyTypePtr		/* type */,
-	unsigned int		/* changed */,
-	XkbChangesPtr		/* changes */
-);
-
-extern void XkbSendNewKeyboardNotify(
-	DeviceIntPtr		/* kbd */,
-	xkbNewKeyboardNotify *	/* pNKN */
-);
-
-#ifdef XKBSRV_NEED_FILE_FUNCS
-
-#include <X11/extensions/XKMformat.h>
-#include <X11/extensions/XKBfile.h>
-#include <X11/extensions/XKBrules.h>
-
-#define	_XkbListKeymaps		0
-#define	_XkbListKeycodes	1
-#define	_XkbListTypes		2
-#define	_XkbListCompat		3
-#define	_XkbListSymbols		4
-#define	_XkbListGeometry	5
-#define	_XkbListNumComponents	6
-
-typedef struct _XkbSrvListInfo {
-	int		szPool;
-	int		nPool;
-	char *		pool;
-
-	int		maxRtrn;
-	int		nTotal;
-
-	char *		pattern[_XkbListNumComponents];
-	int		nFound[_XkbListNumComponents];
-} XkbSrvListInfoRec,*XkbSrvListInfoPtr;
-
-char *
-XkbGetRulesDflts(
-	XkbRF_VarDefsPtr	/* defs */
-);
-
-extern void	XkbSetRulesUsed(
-	XkbRF_VarDefsPtr	/* defs */
-);
-
-
-extern	Status	XkbDDXList(
-	DeviceIntPtr		/* dev */,
-	XkbSrvListInfoPtr	/* listing */,
-	ClientPtr		/* client */
-);
-
-extern	unsigned int XkbDDXLoadKeymapByNames(
-	DeviceIntPtr		/* keybd */,
-	XkbComponentNamesPtr	/* names */,
-	unsigned int		/* want */,
-	unsigned int		/* need */,
-	XkbFileInfoPtr		/* finfoRtrn */,
-	char *			/* keymapNameRtrn */,
-	int 			/* keymapNameRtrnLen */
-);
-
-extern	Bool XkbDDXNamesFromRules(
-	DeviceIntPtr		/* keybd */,
-	char *			/* rules */,
-	XkbRF_VarDefsPtr	/* defs */,
-	XkbComponentNamesPtr	/* names */
-);
-
-extern	FILE *XkbDDXOpenConfigFile(
-	char *	/* mapName */,
-	char *	/* fileNameRtrn */,
-	int	/* fileNameRtrnLen */
-);
-
-extern	Bool XkbDDXApplyConfig(
-	XPointer	/* cfg_in */,
-	XkbSrvInfoPtr	/* xkbi */
-);
-
-extern XPointer XkbDDXPreloadConfig(
-	char **			/* rulesFileRtrn */,
-	XkbRF_VarDefsPtr	/* defs */,
-	XkbComponentNamesPtr	/* names */,
-	DeviceIntPtr		/* dev */
-);
-
-extern	int _XkbStrCaseCmp(
-	char *			/* str1 */,
-	char *			/* str2 */
-);
-
-#endif /* XKBSRV_NEED_FILE_FUNCS */
-
-
-_XFUNCPROTOEND
-
-#define	XkbAtomGetString(d,s)	NameForAtom(s)
-
-#endif /* _XKBSRV_H_ */
-
-
diff --git a/openflow/usr/include/X11/extensions/XKBstr.h b/openflow/usr/include/X11/extensions/XKBstr.h
deleted file mode 100644
index 893a04b..0000000
--- a/openflow/usr/include/X11/extensions/XKBstr.h
+++ /dev/null
@@ -1,642 +0,0 @@
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#ifndef _XKBSTR_H_
-#define	_XKBSTR_H_
-
-#include <X11/extensions/XKB.h>
-
-#define	XkbCharToInt(v)		((v)&0x80?(int)((v)|(~0xff)):(int)((v)&0x7f))
-#define	XkbIntTo2Chars(i,h,l)	(((h)=((i>>8)&0xff)),((l)=((i)&0xff)))
-#define	Xkb2CharsToInt(h,l)	((short)(((h)<<8)|(l)))
-
-/*
- * The Xkb structs are full of implicit padding to properly align members.
- * We can't clean that up without breaking ABI, so tell clang not to bother
- * complaining about it.
- */
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-	/*
-	 * Common data structures and access macros
-	 */
-
-typedef struct _XkbStateRec {
-	unsigned char	group;
-	unsigned char   locked_group;
-	unsigned short	base_group;
-	unsigned short	latched_group;
-	unsigned char	mods;
-	unsigned char	base_mods;
-	unsigned char	latched_mods;
-	unsigned char	locked_mods;
-	unsigned char	compat_state;
-	unsigned char	grab_mods;
-	unsigned char	compat_grab_mods;
-	unsigned char	lookup_mods;
-	unsigned char	compat_lookup_mods;
-	unsigned short	ptr_buttons;
-} XkbStateRec,*XkbStatePtr;
-#define	XkbModLocks(s)	 ((s)->locked_mods)
-#define	XkbStateMods(s)	 ((s)->base_mods|(s)->latched_mods|XkbModLocks(s))
-#define	XkbGroupLock(s)	 ((s)->locked_group)
-#define	XkbStateGroup(s) ((s)->base_group+(s)->latched_group+XkbGroupLock(s))
-#define	XkbStateFieldFromRec(s)	XkbBuildCoreState((s)->lookup_mods,(s)->group)
-#define	XkbGrabStateFromRec(s)	XkbBuildCoreState((s)->grab_mods,(s)->group)
-
-typedef struct _XkbMods {
-	unsigned char	mask;	/* effective mods */
-	unsigned char	real_mods;
-	unsigned short	vmods;
-} XkbModsRec,*XkbModsPtr;
-
-typedef struct _XkbKTMapEntry {
-	Bool		active;
-	unsigned char	level;
-	XkbModsRec	mods;
-} XkbKTMapEntryRec,*XkbKTMapEntryPtr;
-
-typedef struct _XkbKeyType {
-	XkbModsRec		mods;
-	unsigned char	  	num_levels;
-	unsigned char	  	map_count;
-	/* map is an array of map_count XkbKTMapEntryRec structs */
-	XkbKTMapEntryPtr  	map;
-	/* preserve is an array of map_count XkbModsRec structs */
-	XkbModsPtr  		preserve;
-	Atom		  	name;
-	/* level_names is an array of num_levels Atoms */
-	Atom *			level_names;
-} XkbKeyTypeRec, *XkbKeyTypePtr;
-
-#define	XkbNumGroups(g)			((g)&0x0f)
-#define	XkbOutOfRangeGroupInfo(g)	((g)&0xf0)
-#define	XkbOutOfRangeGroupAction(g)	((g)&0xc0)
-#define	XkbOutOfRangeGroupNumber(g)	(((g)&0x30)>>4)
-#define	XkbSetGroupInfo(g,w,n)	(((w)&0xc0)|(((n)&3)<<4)|((g)&0x0f))
-#define	XkbSetNumGroups(g,n)	(((g)&0xf0)|((n)&0x0f))
-
-	/*
-	 * Structures and access macros used primarily by the server
-	 */
-
-typedef struct _XkbBehavior {
-	unsigned char	type;
-	unsigned char	data;
-} XkbBehavior;
-
-#define	XkbAnyActionDataSize 7
-typedef	struct _XkbAnyAction {
-	unsigned char	type;
-	unsigned char	data[XkbAnyActionDataSize];
-} XkbAnyAction;
-
-typedef struct _XkbModAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	mask;
-	unsigned char	real_mods;
-	unsigned char	vmods1;
-	unsigned char	vmods2;
-} XkbModAction;
-#define	XkbModActionVMods(a)      \
-	((short)(((a)->vmods1<<8)|((a)->vmods2)))
-#define	XkbSetModActionVMods(a,v) \
-	(((a)->vmods1=(((v)>>8)&0xff)),(a)->vmods2=((v)&0xff))
-
-typedef struct _XkbGroupAction {
-	unsigned char	type;
-	unsigned char	flags;
-	char		group_XXX;
-} XkbGroupAction;
-#define	XkbSAGroup(a)		(XkbCharToInt((a)->group_XXX))
-#define	XkbSASetGroup(a,g)	((a)->group_XXX=(g))
-
-typedef struct _XkbISOAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	mask;
-	unsigned char	real_mods;
-	char		group_XXX;
-	unsigned char	affect;
-	unsigned char	vmods1;
-	unsigned char	vmods2;
-} XkbISOAction;
-
-typedef struct _XkbPtrAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	high_XXX;
-	unsigned char	low_XXX;
-	unsigned char	high_YYY;
-	unsigned char	low_YYY;
-} XkbPtrAction;
-#define	XkbPtrActionX(a)      (Xkb2CharsToInt((a)->high_XXX,(a)->low_XXX))
-#define	XkbPtrActionY(a)      (Xkb2CharsToInt((a)->high_YYY,(a)->low_YYY))
-#define	XkbSetPtrActionX(a,x) (XkbIntTo2Chars(x,(a)->high_XXX,(a)->low_XXX))
-#define	XkbSetPtrActionY(a,y) (XkbIntTo2Chars(y,(a)->high_YYY,(a)->low_YYY))
-
-typedef struct _XkbPtrBtnAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	count;
-	unsigned char	button;
-} XkbPtrBtnAction;
-
-typedef struct _XkbPtrDfltAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	affect;
-	char		valueXXX;
-} XkbPtrDfltAction;
-#define	XkbSAPtrDfltValue(a)		(XkbCharToInt((a)->valueXXX))
-#define	XkbSASetPtrDfltValue(a,c)	((a)->valueXXX= ((c)&0xff))
-
-typedef struct _XkbSwitchScreenAction {
-	unsigned char	type;
-	unsigned char	flags;
-	char		screenXXX;
-} XkbSwitchScreenAction;
-#define	XkbSAScreen(a)			(XkbCharToInt((a)->screenXXX))
-#define	XkbSASetScreen(a,s)		((a)->screenXXX= ((s)&0xff))
-
-typedef struct _XkbCtrlsAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	ctrls3;
-	unsigned char	ctrls2;
-	unsigned char	ctrls1;
-	unsigned char	ctrls0;
-} XkbCtrlsAction;
-#define	XkbActionSetCtrls(a,c)	(((a)->ctrls3=(((c)>>24)&0xff)),\
-					((a)->ctrls2=(((c)>>16)&0xff)),\
-					((a)->ctrls1=(((c)>>8)&0xff)),\
-					((a)->ctrls0=((c)&0xff)))
-#define	XkbActionCtrls(a) ((((unsigned int)(a)->ctrls3)<<24)|\
-			   (((unsigned int)(a)->ctrls2)<<16)|\
-			   (((unsigned int)(a)->ctrls1)<<8)|\
-			   ((unsigned int)((a)->ctrls0)))
-
-typedef struct _XkbMessageAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	message[6];
-} XkbMessageAction;
-
-typedef struct	_XkbRedirectKeyAction {
-	unsigned char	type;
-	unsigned char	new_key;
-	unsigned char	mods_mask;
-	unsigned char	mods;
-	unsigned char	vmods_mask0;
-	unsigned char	vmods_mask1;
-	unsigned char	vmods0;
-	unsigned char	vmods1;
-} XkbRedirectKeyAction;
-
-#define	XkbSARedirectVMods(a)		((((unsigned int)(a)->vmods1)<<8)|\
-					((unsigned int)(a)->vmods0))
-#define	XkbSARedirectSetVMods(a,m)	(((a)->vmods1=(((m)>>8)&0xff)),\
-					 ((a)->vmods0=((m)&0xff)))
-#define	XkbSARedirectVModsMask(a)	((((unsigned int)(a)->vmods_mask1)<<8)|\
-					((unsigned int)(a)->vmods_mask0))
-#define	XkbSARedirectSetVModsMask(a,m)	(((a)->vmods_mask1=(((m)>>8)&0xff)),\
-					 ((a)->vmods_mask0=((m)&0xff)))
-
-typedef struct _XkbDeviceBtnAction {
-	unsigned char	type;
-	unsigned char	flags;
-	unsigned char	count;
-	unsigned char	button;
-	unsigned char	device;
-} XkbDeviceBtnAction;
-
-typedef struct _XkbDeviceValuatorAction {
-	unsigned char	type;
-	unsigned char	device;
-	unsigned char	v1_what;
-	unsigned char	v1_ndx;
-	unsigned char	v1_value;
-	unsigned char	v2_what;
-	unsigned char	v2_ndx;
-	unsigned char	v2_value;
-} XkbDeviceValuatorAction;
-
-typedef	union _XkbAction {
-	XkbAnyAction		any;
-	XkbModAction		mods;
-	XkbGroupAction		group;
-	XkbISOAction		iso;
-	XkbPtrAction		ptr;
-	XkbPtrBtnAction		btn;
-	XkbPtrDfltAction	dflt;
-	XkbSwitchScreenAction	screen;
-	XkbCtrlsAction		ctrls;
-	XkbMessageAction	msg;
-	XkbRedirectKeyAction	redirect;
-	XkbDeviceBtnAction	devbtn;
-	XkbDeviceValuatorAction	devval;
-	unsigned char 		type;
-} XkbAction;
-
-typedef	struct _XkbControls {
-	unsigned char	mk_dflt_btn;
-	unsigned char	num_groups;
-	unsigned char	groups_wrap;
-	XkbModsRec	internal;
-	XkbModsRec	ignore_lock;
-	unsigned int	enabled_ctrls;
-	unsigned short	repeat_delay;
-	unsigned short	repeat_interval;
-	unsigned short	slow_keys_delay;
-	unsigned short	debounce_delay;
-	unsigned short	mk_delay;
-	unsigned short	mk_interval;
-	unsigned short	mk_time_to_max;
-	unsigned short	mk_max_speed;
-		 short	mk_curve;
-	unsigned short	ax_options;
-	unsigned short	ax_timeout;
-	unsigned short	axt_opts_mask;
-	unsigned short	axt_opts_values;
-	unsigned int	axt_ctrls_mask;
-	unsigned int	axt_ctrls_values;
-	unsigned char	per_key_repeat[XkbPerKeyBitArraySize];
-} XkbControlsRec, *XkbControlsPtr;
-
-#define	XkbAX_AnyFeedback(c)	((c)->enabled_ctrls&XkbAccessXFeedbackMask)
-#define	XkbAX_NeedOption(c,w)	((c)->ax_options&(w))
-#define	XkbAX_NeedFeedback(c,w)	(XkbAX_AnyFeedback(c)&&XkbAX_NeedOption(c,w))
-
-typedef struct _XkbServerMapRec {
-	/* acts is an array of XkbActions structs, with size_acts entries
-	   allocated, and num_acts entries used. */
-	unsigned short		 num_acts;
-	unsigned short		 size_acts;
-	XkbAction		*acts;
-
-	/* behaviors, key_acts, explicit, & vmodmap are all arrays with
-	   (xkb->max_key_code + 1) entries allocated for each. */
-	XkbBehavior		*behaviors;
-	unsigned short		*key_acts;
-#if defined(__cplusplus) || defined(c_plusplus)
-	/* explicit is a C++ reserved word */
-	unsigned char		*c_explicit;
-#else
-	unsigned char		*explicit;
-#endif
-	unsigned char		 vmods[XkbNumVirtualMods];
-	unsigned short		*vmodmap;
-} XkbServerMapRec, *XkbServerMapPtr;
-
-#define	XkbSMKeyActionsPtr(m,k) (&(m)->acts[(m)->key_acts[k]])
-
-	/*
-	 * Structures and access macros used primarily by clients
-	 */
-
-typedef	struct _XkbSymMapRec {
-	unsigned char	 kt_index[XkbNumKbdGroups];
-	unsigned char	 group_info;
-	unsigned char	 width;
-	unsigned short	 offset;
-} XkbSymMapRec, *XkbSymMapPtr;
-
-typedef struct _XkbClientMapRec {
-	/* types is an array of XkbKeyTypeRec structs, with size_types entries
-	   allocated, and num_types entries used. */
-	unsigned char		 size_types;
-	unsigned char		 num_types;
-	XkbKeyTypePtr		 types;
-
-	/* syms is an array of size_syms KeySyms, in which num_syms are used */
-	unsigned short		 size_syms;
-	unsigned short		 num_syms;
-	KeySym			*syms;
-	/* key_sym_map is an array of (max_key_code + 1) XkbSymMapRec structs */
-	XkbSymMapPtr		 key_sym_map;
-
-	/* modmap is an array of (max_key_code + 1) unsigned chars */
-	unsigned char		*modmap;
-} XkbClientMapRec, *XkbClientMapPtr;
-
-#define	XkbCMKeyGroupInfo(m,k)  ((m)->key_sym_map[k].group_info)
-#define	XkbCMKeyNumGroups(m,k)	 (XkbNumGroups((m)->key_sym_map[k].group_info))
-#define	XkbCMKeyGroupWidth(m,k,g) (XkbCMKeyType(m,k,g)->num_levels)
-#define	XkbCMKeyGroupsWidth(m,k) ((m)->key_sym_map[k].width)
-#define	XkbCMKeyTypeIndex(m,k,g) ((m)->key_sym_map[k].kt_index[g&0x3])
-#define	XkbCMKeyType(m,k,g)	 (&(m)->types[XkbCMKeyTypeIndex(m,k,g)])
-#define	XkbCMKeyNumSyms(m,k) (XkbCMKeyGroupsWidth(m,k)*XkbCMKeyNumGroups(m,k))
-#define	XkbCMKeySymsOffset(m,k)	((m)->key_sym_map[k].offset)
-#define	XkbCMKeySymsPtr(m,k)	(&(m)->syms[XkbCMKeySymsOffset(m,k)])
-
-	/*
-	 * Compatibility structures and access macros
-	 */
-
-typedef struct _XkbSymInterpretRec {
-	KeySym		sym;
-	unsigned char	flags;
-	unsigned char	match;
-	unsigned char	mods;
-	unsigned char	virtual_mod;
-	XkbAnyAction	act;
-} XkbSymInterpretRec,*XkbSymInterpretPtr;
-
-typedef struct _XkbCompatMapRec {
-	/* sym_interpret is an array of XkbSymInterpretRec structs,
-	   in which size_si are allocated & num_si are used. */
-	XkbSymInterpretPtr	 sym_interpret;
-	XkbModsRec		 groups[XkbNumKbdGroups];
-	unsigned short		 num_si;
-	unsigned short		 size_si;
-} XkbCompatMapRec, *XkbCompatMapPtr;
-
-typedef struct _XkbIndicatorMapRec {
-	unsigned char	flags;
-	unsigned char	which_groups;
-	unsigned char	groups;
-	unsigned char	which_mods;
-	XkbModsRec	mods;
-	unsigned int	ctrls;
-} XkbIndicatorMapRec, *XkbIndicatorMapPtr;
-
-#define	XkbIM_IsAuto(i)	((((i)->flags&XkbIM_NoAutomatic)==0)&&\
-			    (((i)->which_groups&&(i)->groups)||\
-			     ((i)->which_mods&&(i)->mods.mask)||\
-			     ((i)->ctrls)))
-#define	XkbIM_InUse(i)	(((i)->flags)||((i)->which_groups)||\
-					((i)->which_mods)||((i)->ctrls))
-	
-
-typedef struct _XkbIndicatorRec {
-	unsigned long	  	phys_indicators;
-	XkbIndicatorMapRec	maps[XkbNumIndicators];
-} XkbIndicatorRec,*XkbIndicatorPtr;
-
-typedef	struct _XkbKeyNameRec {
-	char	name[XkbKeyNameLength];
-} XkbKeyNameRec,*XkbKeyNamePtr;
-
-typedef struct _XkbKeyAliasRec {
-	char	real[XkbKeyNameLength];
-	char	alias[XkbKeyNameLength];
-} XkbKeyAliasRec,*XkbKeyAliasPtr;
-
-	/*
-	 * Names for everything 
-	 */
-typedef struct _XkbNamesRec {
-	Atom		  keycodes;
-	Atom		  geometry;
-	Atom		  symbols;
-	Atom              types;
-	Atom		  compat;
-	Atom		  vmods[XkbNumVirtualMods];
-	Atom		  indicators[XkbNumIndicators];
-	Atom		  groups[XkbNumKbdGroups];
-	/* keys is an array of (xkb->max_key_code + 1) XkbKeyNameRec entries */
-	XkbKeyNamePtr	  keys;
-	/* key_aliases is an array of num_key_aliases XkbKeyAliasRec entries */
-	XkbKeyAliasPtr	  key_aliases;
-	/* radio_groups is an array of num_rg Atoms */
-	Atom		 *radio_groups;
-	Atom		  phys_symbols;
-
-	/* num_keys seems to be unused in libX11 */
-	unsigned char	  num_keys;
-	unsigned char	  num_key_aliases;
-	unsigned short	  num_rg;
-} XkbNamesRec,*XkbNamesPtr;
-
-typedef	struct _XkbGeometry	*XkbGeometryPtr;
-	/*
-	 * Tie it all together into one big keyboard description
-	 */
-typedef	struct _XkbDesc {
-	struct _XDisplay *	dpy;
-	unsigned short	 	flags;
-	unsigned short		device_spec;
-	KeyCode			min_key_code;
-	KeyCode			max_key_code;
-
-	XkbControlsPtr		ctrls;
-	XkbServerMapPtr		server;
-	XkbClientMapPtr		map;
-	XkbIndicatorPtr		indicators;
-	XkbNamesPtr		names;
-	XkbCompatMapPtr		compat;
-	XkbGeometryPtr		geom;
-} XkbDescRec, *XkbDescPtr;
-#define	XkbKeyKeyTypeIndex(d,k,g)	(XkbCMKeyTypeIndex((d)->map,k,g))
-#define	XkbKeyKeyType(d,k,g)		(XkbCMKeyType((d)->map,k,g))
-#define	XkbKeyGroupWidth(d,k,g)		(XkbCMKeyGroupWidth((d)->map,k,g))
-#define	XkbKeyGroupsWidth(d,k)		(XkbCMKeyGroupsWidth((d)->map,k))
-#define	XkbKeyGroupInfo(d,k)		(XkbCMKeyGroupInfo((d)->map,(k)))
-#define	XkbKeyNumGroups(d,k)		(XkbCMKeyNumGroups((d)->map,(k)))
-#define	XkbKeyNumSyms(d,k)		(XkbCMKeyNumSyms((d)->map,(k)))
-#define	XkbKeySymsPtr(d,k)		(XkbCMKeySymsPtr((d)->map,(k)))
-#define	XkbKeySym(d,k,n)		(XkbKeySymsPtr(d,k)[n])
-#define	XkbKeySymEntry(d,k,sl,g) \
-	(XkbKeySym(d,k,((XkbKeyGroupsWidth(d,k)*(g))+(sl))))
-#define	XkbKeyAction(d,k,n) \
-	(XkbKeyHasActions(d,k)?&XkbKeyActionsPtr(d,k)[n]:NULL)
-#define	XkbKeyActionEntry(d,k,sl,g) \
-	(XkbKeyHasActions(d,k)?\
-		XkbKeyAction(d,k,((XkbKeyGroupsWidth(d,k)*(g))+(sl))):NULL)
-
-#define	XkbKeyHasActions(d,k)	((d)->server->key_acts[k]!=0)
-#define	XkbKeyNumActions(d,k)	(XkbKeyHasActions(d,k)?XkbKeyNumSyms(d,k):1)
-#define	XkbKeyActionsPtr(d,k)	(XkbSMKeyActionsPtr((d)->server,k))
-#define	XkbKeycodeInRange(d,k)	(((k)>=(d)->min_key_code)&&\
-				 ((k)<=(d)->max_key_code))
-#define	XkbNumKeys(d)		((d)->max_key_code-(d)->min_key_code+1)
-
-
-	/*
-	 * The following structures can be used to track changes
-	 * to a keyboard device
-	 */
-typedef struct _XkbMapChanges {
-	unsigned short		 changed;
-	KeyCode			 min_key_code;
-	KeyCode			 max_key_code;
-	unsigned char		 first_type;
-	unsigned char		 num_types;
-	KeyCode			 first_key_sym;
-	unsigned char		 num_key_syms;
-	KeyCode			 first_key_act;
-	unsigned char		 num_key_acts;
-	KeyCode			 first_key_behavior;
-	unsigned char		 num_key_behaviors;
-	KeyCode 		 first_key_explicit;
-	unsigned char		 num_key_explicit;
-	KeyCode			 first_modmap_key;
-	unsigned char		 num_modmap_keys;
-	KeyCode			 first_vmodmap_key;
-	unsigned char		 num_vmodmap_keys;
-	unsigned char		 pad;
-	unsigned short		 vmods;
-} XkbMapChangesRec,*XkbMapChangesPtr;
-
-typedef struct _XkbControlsChanges {
-	unsigned int 		 changed_ctrls;
-	unsigned int		 enabled_ctrls_changes;
-	Bool			 num_groups_changed;
-} XkbControlsChangesRec,*XkbControlsChangesPtr;
-
-typedef struct _XkbIndicatorChanges {
-	unsigned int		 state_changes;
-	unsigned int		 map_changes;
-} XkbIndicatorChangesRec,*XkbIndicatorChangesPtr;
-
-typedef struct _XkbNameChanges {
-	unsigned int 		changed;
-	unsigned char		first_type;
-	unsigned char		num_types;
-	unsigned char		first_lvl;
-	unsigned char		num_lvls;
-	unsigned char		num_aliases;
-	unsigned char		num_rg;
-	unsigned char		first_key;
-	unsigned char		num_keys;
-	unsigned short		changed_vmods;
-	unsigned long		changed_indicators;
-	unsigned char		changed_groups;
-} XkbNameChangesRec,*XkbNameChangesPtr;
-
-typedef struct _XkbCompatChanges {
-	unsigned char		changed_groups;
-	unsigned short		first_si;
-	unsigned short		num_si;
-} XkbCompatChangesRec,*XkbCompatChangesPtr;
-
-typedef struct _XkbChanges {
-	unsigned short		 device_spec;
-	unsigned short		 state_changes;
-	XkbMapChangesRec	 map;
-	XkbControlsChangesRec	 ctrls;
-	XkbIndicatorChangesRec	 indicators;
-	XkbNameChangesRec	 names;
-	XkbCompatChangesRec	 compat;
-} XkbChangesRec, *XkbChangesPtr;
-
-	/*
-	 * These data structures are used to construct a keymap from 
-	 * a set of components or to list components in the server
-	 * database.
-	 */
-typedef struct _XkbComponentNames {
-	char *			 keymap;
-	char *			 keycodes;
-	char *			 types;
-	char *			 compat;
-	char *			 symbols;
-	char *			 geometry;
-} XkbComponentNamesRec, *XkbComponentNamesPtr;
-
-typedef struct _XkbComponentName {
-	unsigned short		flags;
-	char *			name;
-} XkbComponentNameRec,*XkbComponentNamePtr;
-
-typedef struct _XkbComponentList {
-	int			num_keymaps;
-	int			num_keycodes;
-	int			num_types;
-	int			num_compat;
-	int			num_symbols;
-	int			num_geometry;
-	XkbComponentNamePtr	keymaps;
-	XkbComponentNamePtr 	keycodes;
-	XkbComponentNamePtr	types;
-	XkbComponentNamePtr	compat;
-	XkbComponentNamePtr	symbols;
-	XkbComponentNamePtr	geometry;
-} XkbComponentListRec, *XkbComponentListPtr;
-
-	/*
-	 * The following data structures describe and track changes to a 
-	 * non-keyboard extension device 
-	 */
-typedef struct _XkbDeviceLedInfo {
-	unsigned short			led_class;
-	unsigned short			led_id;
-	unsigned int			phys_indicators;
-	unsigned int			maps_present;
-	unsigned int			names_present;
-	unsigned int			state;
-	Atom 				names[XkbNumIndicators];
-	XkbIndicatorMapRec		maps[XkbNumIndicators];
-} XkbDeviceLedInfoRec,*XkbDeviceLedInfoPtr;
-
-typedef struct _XkbDeviceInfo {
-	char *			name;
-	Atom			type;
-	unsigned short		device_spec;
-	Bool			has_own_state;
-	unsigned short		supported;
-	unsigned short		unsupported;
-
-	/* btn_acts is an array of num_btn XkbAction entries */
-	unsigned short		num_btns;
-	XkbAction *		btn_acts;
-
-	unsigned short		sz_leds;
-	unsigned short		num_leds;
-	unsigned short		dflt_kbd_fb;
-	unsigned short		dflt_led_fb;
-	/* leds is an array of XkbDeviceLedInfoRec in which
-	   sz_leds entries are allocated and num_leds entries are used */
-	XkbDeviceLedInfoPtr	leds;
-} XkbDeviceInfoRec,*XkbDeviceInfoPtr;
-
-#define	XkbXI_DevHasBtnActs(d)	(((d)->num_btns>0)&&((d)->btn_acts!=NULL))
-#define	XkbXI_LegalDevBtn(d,b)	(XkbXI_DevHasBtnActs(d)&&((b)<(d)->num_btns))
-#define	XkbXI_DevHasLeds(d)	(((d)->num_leds>0)&&((d)->leds!=NULL))
-
-typedef struct _XkbDeviceLedChanges {
-	unsigned short		led_class;
-	unsigned short		led_id;
-	unsigned int		defined; /* names or maps changed */
-	struct _XkbDeviceLedChanges *next;
-} XkbDeviceLedChangesRec,*XkbDeviceLedChangesPtr;
-
-typedef struct _XkbDeviceChanges {
-	unsigned int		changed;
-	unsigned short		first_btn;
-	unsigned short		num_btns;
-	XkbDeviceLedChangesRec 	leds;
-} XkbDeviceChangesRec,*XkbDeviceChangesPtr;
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#endif /* _XKBSTR_H_ */
diff --git a/openflow/usr/include/X11/keysym.h b/openflow/usr/include/X11/keysym.h
deleted file mode 100644
index 4f58488..0000000
--- a/openflow/usr/include/X11/keysym.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/* default keysyms */
-#define XK_MISCELLANY
-#define XK_XKB_KEYS
-#define XK_LATIN1
-#define XK_LATIN2
-#define XK_LATIN3
-#define XK_LATIN4
-#define XK_LATIN8
-#define XK_LATIN9
-#define XK_CAUCASUS
-#define XK_GREEK
-#define XK_KATAKANA
-#define XK_ARABIC
-#define XK_CYRILLIC
-#define XK_HEBREW
-#define XK_THAI
-#define XK_KOREAN
-#define XK_ARMENIAN
-#define XK_GEORGIAN
-#define XK_VIETNAMESE
-#define XK_CURRENCY
-#define XK_MATHEMATICAL
-#define XK_BRAILLE
-#define XK_SINHALA
-
-#include <X11/keysymdef.h>
-
diff --git a/openflow/usr/include/X11/keysymdef.h b/openflow/usr/include/X11/keysymdef.h
deleted file mode 100644
index 147ecf5..0000000
--- a/openflow/usr/include/X11/keysymdef.h
+++ /dev/null
@@ -1,2497 +0,0 @@
-/***********************************************************
-Copyright 1987, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * The "X11 Window System Protocol" standard defines in Appendix A the
- * keysym codes. These 29-bit integer values identify characters or
- * functions associated with each key (e.g., via the visible
- * engraving) of a keyboard layout. This file assigns mnemonic macro
- * names for these keysyms.
- *
- * This file is also compiled (by src/util/makekeys.c in libX11) into
- * hash tables that can be accessed with X11 library functions such as
- * XStringToKeysym() and XKeysymToString().
- *
- * Where a keysym corresponds one-to-one to an ISO 10646 / Unicode
- * character, this is noted in a comment that provides both the U+xxxx
- * Unicode position, as well as the official Unicode name of the
- * character.
- *
- * Where the correspondence is either not one-to-one or semantically
- * unclear, the Unicode position and name are enclosed in
- * parentheses. Such legacy keysyms should be considered deprecated
- * and are not recommended for use in future keyboard mappings.
- *
- * For any future extension of the keysyms with characters already
- * found in ISO 10646 / Unicode, the following algorithm shall be
- * used. The new keysym code position will simply be the character's
- * Unicode number plus 0x01000000. The keysym values in the range
- * 0x01000100 to 0x0110ffff are reserved to represent Unicode
- * characters in the range U+0100 to U+10FFFF.
- * 
- * While most newer Unicode-based X11 clients do already accept
- * Unicode-mapped keysyms in the range 0x01000100 to 0x0110ffff, it
- * will remain necessary for clients -- in the interest of
- * compatibility with existing servers -- to also understand the
- * existing legacy keysym values in the range 0x0100 to 0x20ff.
- *
- * Where several mnemonic names are defined for the same keysym in this
- * file, all but the first one listed should be considered deprecated.
- *
- * Mnemonic names for keysyms are defined in this file with lines
- * that match one of these Perl regular expressions:
- *
- *    /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\* U+([0-9A-F]{4,6}) (.*) \*\/\s*$/
- *    /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\*\(U+([0-9A-F]{4,6}) (.*)\)\*\/\s*$/
- *    /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*(\/\*\s*(.*)\s*\*\/)?\s*$/
- *
- * Before adding new keysyms, please do consider the following: In
- * addition to the keysym names defined in this file, the
- * XStringToKeysym() and XKeysymToString() functions will also handle
- * any keysym string of the form "U0020" to "U007E" and "U00A0" to
- * "U10FFFF" for all possible Unicode characters. In other words,
- * every possible Unicode character has already a keysym string
- * defined algorithmically, even if it is not listed here. Therefore,
- * defining an additional keysym macro is only necessary where a
- * non-hexadecimal mnemonic name is needed, or where the new keysym
- * does not represent any existing Unicode character.
- *
- * When adding new keysyms to this file, do not forget to also update the
- * following as needed:
- *
- *   - the mappings in src/KeyBind.c in the repo
- *     git://anongit.freedesktop.org/xorg/lib/libX11.git
- *
- *   - the protocol specification in specs/keysyms.xml
- *     in the repo git://anongit.freedesktop.org/xorg/proto/x11proto.git
- *
- */
-
-#define XK_VoidSymbol                  0xffffff  /* Void symbol */
-
-#ifdef XK_MISCELLANY
-/*
- * TTY function keys, cleverly chosen to map to ASCII, for convenience of
- * programming, but could have been arbitrary (at the cost of lookup
- * tables in client code).
- */
-
-#define XK_BackSpace                     0xff08  /* Back space, back char */
-#define XK_Tab                           0xff09
-#define XK_Linefeed                      0xff0a  /* Linefeed, LF */
-#define XK_Clear                         0xff0b
-#define XK_Return                        0xff0d  /* Return, enter */
-#define XK_Pause                         0xff13  /* Pause, hold */
-#define XK_Scroll_Lock                   0xff14
-#define XK_Sys_Req                       0xff15
-#define XK_Escape                        0xff1b
-#define XK_Delete                        0xffff  /* Delete, rubout */
-
-
-
-/* International & multi-key character composition */
-
-#define XK_Multi_key                     0xff20  /* Multi-key character compose */
-#define XK_Codeinput                     0xff37
-#define XK_SingleCandidate               0xff3c
-#define XK_MultipleCandidate             0xff3d
-#define XK_PreviousCandidate             0xff3e
-
-/* Japanese keyboard support */
-
-#define XK_Kanji                         0xff21  /* Kanji, Kanji convert */
-#define XK_Muhenkan                      0xff22  /* Cancel Conversion */
-#define XK_Henkan_Mode                   0xff23  /* Start/Stop Conversion */
-#define XK_Henkan                        0xff23  /* Alias for Henkan_Mode */
-#define XK_Romaji                        0xff24  /* to Romaji */
-#define XK_Hiragana                      0xff25  /* to Hiragana */
-#define XK_Katakana                      0xff26  /* to Katakana */
-#define XK_Hiragana_Katakana             0xff27  /* Hiragana/Katakana toggle */
-#define XK_Zenkaku                       0xff28  /* to Zenkaku */
-#define XK_Hankaku                       0xff29  /* to Hankaku */
-#define XK_Zenkaku_Hankaku               0xff2a  /* Zenkaku/Hankaku toggle */
-#define XK_Touroku                       0xff2b  /* Add to Dictionary */
-#define XK_Massyo                        0xff2c  /* Delete from Dictionary */
-#define XK_Kana_Lock                     0xff2d  /* Kana Lock */
-#define XK_Kana_Shift                    0xff2e  /* Kana Shift */
-#define XK_Eisu_Shift                    0xff2f  /* Alphanumeric Shift */
-#define XK_Eisu_toggle                   0xff30  /* Alphanumeric toggle */
-#define XK_Kanji_Bangou                  0xff37  /* Codeinput */
-#define XK_Zen_Koho                      0xff3d  /* Multiple/All Candidate(s) */
-#define XK_Mae_Koho                      0xff3e  /* Previous Candidate */
-
-/* 0xff31 thru 0xff3f are under XK_KOREAN */
-
-/* Cursor control & motion */
-
-#define XK_Home                          0xff50
-#define XK_Left                          0xff51  /* Move left, left arrow */
-#define XK_Up                            0xff52  /* Move up, up arrow */
-#define XK_Right                         0xff53  /* Move right, right arrow */
-#define XK_Down                          0xff54  /* Move down, down arrow */
-#define XK_Prior                         0xff55  /* Prior, previous */
-#define XK_Page_Up                       0xff55
-#define XK_Next                          0xff56  /* Next */
-#define XK_Page_Down                     0xff56
-#define XK_End                           0xff57  /* EOL */
-#define XK_Begin                         0xff58  /* BOL */
-
-
-/* Misc functions */
-
-#define XK_Select                        0xff60  /* Select, mark */
-#define XK_Print                         0xff61
-#define XK_Execute                       0xff62  /* Execute, run, do */
-#define XK_Insert                        0xff63  /* Insert, insert here */
-#define XK_Undo                          0xff65
-#define XK_Redo                          0xff66  /* Redo, again */
-#define XK_Menu                          0xff67
-#define XK_Find                          0xff68  /* Find, search */
-#define XK_Cancel                        0xff69  /* Cancel, stop, abort, exit */
-#define XK_Help                          0xff6a  /* Help */
-#define XK_Break                         0xff6b
-#define XK_Mode_switch                   0xff7e  /* Character set switch */
-#define XK_script_switch                 0xff7e  /* Alias for mode_switch */
-#define XK_Num_Lock                      0xff7f
-
-/* Keypad functions, keypad numbers cleverly chosen to map to ASCII */
-
-#define XK_KP_Space                      0xff80  /* Space */
-#define XK_KP_Tab                        0xff89
-#define XK_KP_Enter                      0xff8d  /* Enter */
-#define XK_KP_F1                         0xff91  /* PF1, KP_A, ... */
-#define XK_KP_F2                         0xff92
-#define XK_KP_F3                         0xff93
-#define XK_KP_F4                         0xff94
-#define XK_KP_Home                       0xff95
-#define XK_KP_Left                       0xff96
-#define XK_KP_Up                         0xff97
-#define XK_KP_Right                      0xff98
-#define XK_KP_Down                       0xff99
-#define XK_KP_Prior                      0xff9a
-#define XK_KP_Page_Up                    0xff9a
-#define XK_KP_Next                       0xff9b
-#define XK_KP_Page_Down                  0xff9b
-#define XK_KP_End                        0xff9c
-#define XK_KP_Begin                      0xff9d
-#define XK_KP_Insert                     0xff9e
-#define XK_KP_Delete                     0xff9f
-#define XK_KP_Equal                      0xffbd  /* Equals */
-#define XK_KP_Multiply                   0xffaa
-#define XK_KP_Add                        0xffab
-#define XK_KP_Separator                  0xffac  /* Separator, often comma */
-#define XK_KP_Subtract                   0xffad
-#define XK_KP_Decimal                    0xffae
-#define XK_KP_Divide                     0xffaf
-
-#define XK_KP_0                          0xffb0
-#define XK_KP_1                          0xffb1
-#define XK_KP_2                          0xffb2
-#define XK_KP_3                          0xffb3
-#define XK_KP_4                          0xffb4
-#define XK_KP_5                          0xffb5
-#define XK_KP_6                          0xffb6
-#define XK_KP_7                          0xffb7
-#define XK_KP_8                          0xffb8
-#define XK_KP_9                          0xffb9
-
-
-
-/*
- * Auxiliary functions; note the duplicate definitions for left and right
- * function keys;  Sun keyboards and a few other manufacturers have such
- * function key groups on the left and/or right sides of the keyboard.
- * We've not found a keyboard with more than 35 function keys total.
- */
-
-#define XK_F1                            0xffbe
-#define XK_F2                            0xffbf
-#define XK_F3                            0xffc0
-#define XK_F4                            0xffc1
-#define XK_F5                            0xffc2
-#define XK_F6                            0xffc3
-#define XK_F7                            0xffc4
-#define XK_F8                            0xffc5
-#define XK_F9                            0xffc6
-#define XK_F10                           0xffc7
-#define XK_F11                           0xffc8
-#define XK_L1                            0xffc8
-#define XK_F12                           0xffc9
-#define XK_L2                            0xffc9
-#define XK_F13                           0xffca
-#define XK_L3                            0xffca
-#define XK_F14                           0xffcb
-#define XK_L4                            0xffcb
-#define XK_F15                           0xffcc
-#define XK_L5                            0xffcc
-#define XK_F16                           0xffcd
-#define XK_L6                            0xffcd
-#define XK_F17                           0xffce
-#define XK_L7                            0xffce
-#define XK_F18                           0xffcf
-#define XK_L8                            0xffcf
-#define XK_F19                           0xffd0
-#define XK_L9                            0xffd0
-#define XK_F20                           0xffd1
-#define XK_L10                           0xffd1
-#define XK_F21                           0xffd2
-#define XK_R1                            0xffd2
-#define XK_F22                           0xffd3
-#define XK_R2                            0xffd3
-#define XK_F23                           0xffd4
-#define XK_R3                            0xffd4
-#define XK_F24                           0xffd5
-#define XK_R4                            0xffd5
-#define XK_F25                           0xffd6
-#define XK_R5                            0xffd6
-#define XK_F26                           0xffd7
-#define XK_R6                            0xffd7
-#define XK_F27                           0xffd8
-#define XK_R7                            0xffd8
-#define XK_F28                           0xffd9
-#define XK_R8                            0xffd9
-#define XK_F29                           0xffda
-#define XK_R9                            0xffda
-#define XK_F30                           0xffdb
-#define XK_R10                           0xffdb
-#define XK_F31                           0xffdc
-#define XK_R11                           0xffdc
-#define XK_F32                           0xffdd
-#define XK_R12                           0xffdd
-#define XK_F33                           0xffde
-#define XK_R13                           0xffde
-#define XK_F34                           0xffdf
-#define XK_R14                           0xffdf
-#define XK_F35                           0xffe0
-#define XK_R15                           0xffe0
-
-/* Modifiers */
-
-#define XK_Shift_L                       0xffe1  /* Left shift */
-#define XK_Shift_R                       0xffe2  /* Right shift */
-#define XK_Control_L                     0xffe3  /* Left control */
-#define XK_Control_R                     0xffe4  /* Right control */
-#define XK_Caps_Lock                     0xffe5  /* Caps lock */
-#define XK_Shift_Lock                    0xffe6  /* Shift lock */
-
-#define XK_Meta_L                        0xffe7  /* Left meta */
-#define XK_Meta_R                        0xffe8  /* Right meta */
-#define XK_Alt_L                         0xffe9  /* Left alt */
-#define XK_Alt_R                         0xffea  /* Right alt */
-#define XK_Super_L                       0xffeb  /* Left super */
-#define XK_Super_R                       0xffec  /* Right super */
-#define XK_Hyper_L                       0xffed  /* Left hyper */
-#define XK_Hyper_R                       0xffee  /* Right hyper */
-#endif /* XK_MISCELLANY */
-
-/*
- * Keyboard (XKB) Extension function and modifier keys
- * (from Appendix C of "The X Keyboard Extension: Protocol Specification")
- * Byte 3 = 0xfe
- */
-
-#ifdef XK_XKB_KEYS
-#define XK_ISO_Lock                      0xfe01
-#define XK_ISO_Level2_Latch              0xfe02
-#define XK_ISO_Level3_Shift              0xfe03
-#define XK_ISO_Level3_Latch              0xfe04
-#define XK_ISO_Level3_Lock               0xfe05
-#define XK_ISO_Level5_Shift              0xfe11
-#define XK_ISO_Level5_Latch              0xfe12
-#define XK_ISO_Level5_Lock               0xfe13
-#define XK_ISO_Group_Shift               0xff7e  /* Alias for mode_switch */
-#define XK_ISO_Group_Latch               0xfe06
-#define XK_ISO_Group_Lock                0xfe07
-#define XK_ISO_Next_Group                0xfe08
-#define XK_ISO_Next_Group_Lock           0xfe09
-#define XK_ISO_Prev_Group                0xfe0a
-#define XK_ISO_Prev_Group_Lock           0xfe0b
-#define XK_ISO_First_Group               0xfe0c
-#define XK_ISO_First_Group_Lock          0xfe0d
-#define XK_ISO_Last_Group                0xfe0e
-#define XK_ISO_Last_Group_Lock           0xfe0f
-
-#define XK_ISO_Left_Tab                  0xfe20
-#define XK_ISO_Move_Line_Up              0xfe21
-#define XK_ISO_Move_Line_Down            0xfe22
-#define XK_ISO_Partial_Line_Up           0xfe23
-#define XK_ISO_Partial_Line_Down         0xfe24
-#define XK_ISO_Partial_Space_Left        0xfe25
-#define XK_ISO_Partial_Space_Right       0xfe26
-#define XK_ISO_Set_Margin_Left           0xfe27
-#define XK_ISO_Set_Margin_Right          0xfe28
-#define XK_ISO_Release_Margin_Left       0xfe29
-#define XK_ISO_Release_Margin_Right      0xfe2a
-#define XK_ISO_Release_Both_Margins      0xfe2b
-#define XK_ISO_Fast_Cursor_Left          0xfe2c
-#define XK_ISO_Fast_Cursor_Right         0xfe2d
-#define XK_ISO_Fast_Cursor_Up            0xfe2e
-#define XK_ISO_Fast_Cursor_Down          0xfe2f
-#define XK_ISO_Continuous_Underline      0xfe30
-#define XK_ISO_Discontinuous_Underline   0xfe31
-#define XK_ISO_Emphasize                 0xfe32
-#define XK_ISO_Center_Object             0xfe33
-#define XK_ISO_Enter                     0xfe34
-
-#define XK_dead_grave                    0xfe50
-#define XK_dead_acute                    0xfe51
-#define XK_dead_circumflex               0xfe52
-#define XK_dead_tilde                    0xfe53
-#define XK_dead_perispomeni              0xfe53  /* alias for dead_tilde */
-#define XK_dead_macron                   0xfe54
-#define XK_dead_breve                    0xfe55
-#define XK_dead_abovedot                 0xfe56
-#define XK_dead_diaeresis                0xfe57
-#define XK_dead_abovering                0xfe58
-#define XK_dead_doubleacute              0xfe59
-#define XK_dead_caron                    0xfe5a
-#define XK_dead_cedilla                  0xfe5b
-#define XK_dead_ogonek                   0xfe5c
-#define XK_dead_iota                     0xfe5d
-#define XK_dead_voiced_sound             0xfe5e
-#define XK_dead_semivoiced_sound         0xfe5f
-#define XK_dead_belowdot                 0xfe60
-#define XK_dead_hook                     0xfe61
-#define XK_dead_horn                     0xfe62
-#define XK_dead_stroke                   0xfe63
-#define XK_dead_abovecomma               0xfe64
-#define XK_dead_psili                    0xfe64  /* alias for dead_abovecomma */
-#define XK_dead_abovereversedcomma       0xfe65
-#define XK_dead_dasia                    0xfe65  /* alias for dead_abovereversedcomma */
-#define XK_dead_doublegrave              0xfe66
-#define XK_dead_belowring                0xfe67
-#define XK_dead_belowmacron              0xfe68
-#define XK_dead_belowcircumflex          0xfe69
-#define XK_dead_belowtilde               0xfe6a
-#define XK_dead_belowbreve               0xfe6b
-#define XK_dead_belowdiaeresis           0xfe6c
-#define XK_dead_invertedbreve            0xfe6d
-#define XK_dead_belowcomma               0xfe6e
-#define XK_dead_currency                 0xfe6f
-
-/* extra dead elements for German T3 layout */
-#define XK_dead_lowline                  0xfe90
-#define XK_dead_aboveverticalline        0xfe91
-#define XK_dead_belowverticalline        0xfe92
-#define XK_dead_longsolidusoverlay       0xfe93
-
-/* dead vowels for universal syllable entry */
-#define XK_dead_a                        0xfe80
-#define XK_dead_A                        0xfe81
-#define XK_dead_e                        0xfe82
-#define XK_dead_E                        0xfe83
-#define XK_dead_i                        0xfe84
-#define XK_dead_I                        0xfe85
-#define XK_dead_o                        0xfe86
-#define XK_dead_O                        0xfe87
-#define XK_dead_u                        0xfe88
-#define XK_dead_U                        0xfe89
-#define XK_dead_small_schwa              0xfe8a
-#define XK_dead_capital_schwa            0xfe8b
-
-#define XK_dead_greek                    0xfe8c
-
-#define XK_First_Virtual_Screen          0xfed0
-#define XK_Prev_Virtual_Screen           0xfed1
-#define XK_Next_Virtual_Screen           0xfed2
-#define XK_Last_Virtual_Screen           0xfed4
-#define XK_Terminate_Server              0xfed5
-
-#define XK_AccessX_Enable                0xfe70
-#define XK_AccessX_Feedback_Enable       0xfe71
-#define XK_RepeatKeys_Enable             0xfe72
-#define XK_SlowKeys_Enable               0xfe73
-#define XK_BounceKeys_Enable             0xfe74
-#define XK_StickyKeys_Enable             0xfe75
-#define XK_MouseKeys_Enable              0xfe76
-#define XK_MouseKeys_Accel_Enable        0xfe77
-#define XK_Overlay1_Enable               0xfe78
-#define XK_Overlay2_Enable               0xfe79
-#define XK_AudibleBell_Enable            0xfe7a
-
-#define XK_Pointer_Left                  0xfee0
-#define XK_Pointer_Right                 0xfee1
-#define XK_Pointer_Up                    0xfee2
-#define XK_Pointer_Down                  0xfee3
-#define XK_Pointer_UpLeft                0xfee4
-#define XK_Pointer_UpRight               0xfee5
-#define XK_Pointer_DownLeft              0xfee6
-#define XK_Pointer_DownRight             0xfee7
-#define XK_Pointer_Button_Dflt           0xfee8
-#define XK_Pointer_Button1               0xfee9
-#define XK_Pointer_Button2               0xfeea
-#define XK_Pointer_Button3               0xfeeb
-#define XK_Pointer_Button4               0xfeec
-#define XK_Pointer_Button5               0xfeed
-#define XK_Pointer_DblClick_Dflt         0xfeee
-#define XK_Pointer_DblClick1             0xfeef
-#define XK_Pointer_DblClick2             0xfef0
-#define XK_Pointer_DblClick3             0xfef1
-#define XK_Pointer_DblClick4             0xfef2
-#define XK_Pointer_DblClick5             0xfef3
-#define XK_Pointer_Drag_Dflt             0xfef4
-#define XK_Pointer_Drag1                 0xfef5
-#define XK_Pointer_Drag2                 0xfef6
-#define XK_Pointer_Drag3                 0xfef7
-#define XK_Pointer_Drag4                 0xfef8
-#define XK_Pointer_Drag5                 0xfefd
-
-#define XK_Pointer_EnableKeys            0xfef9
-#define XK_Pointer_Accelerate            0xfefa
-#define XK_Pointer_DfltBtnNext           0xfefb
-#define XK_Pointer_DfltBtnPrev           0xfefc
-
-/* Single-Stroke Multiple-Character N-Graph Keysyms For The X Input Method */
-
-#define XK_ch                            0xfea0
-#define XK_Ch                            0xfea1
-#define XK_CH                            0xfea2
-#define XK_c_h                           0xfea3
-#define XK_C_h                           0xfea4
-#define XK_C_H                           0xfea5
-
-#endif /* XK_XKB_KEYS */
-
-/*
- * 3270 Terminal Keys
- * Byte 3 = 0xfd
- */
-
-#ifdef XK_3270
-#define XK_3270_Duplicate                0xfd01
-#define XK_3270_FieldMark                0xfd02
-#define XK_3270_Right2                   0xfd03
-#define XK_3270_Left2                    0xfd04
-#define XK_3270_BackTab                  0xfd05
-#define XK_3270_EraseEOF                 0xfd06
-#define XK_3270_EraseInput               0xfd07
-#define XK_3270_Reset                    0xfd08
-#define XK_3270_Quit                     0xfd09
-#define XK_3270_PA1                      0xfd0a
-#define XK_3270_PA2                      0xfd0b
-#define XK_3270_PA3                      0xfd0c
-#define XK_3270_Test                     0xfd0d
-#define XK_3270_Attn                     0xfd0e
-#define XK_3270_CursorBlink              0xfd0f
-#define XK_3270_AltCursor                0xfd10
-#define XK_3270_KeyClick                 0xfd11
-#define XK_3270_Jump                     0xfd12
-#define XK_3270_Ident                    0xfd13
-#define XK_3270_Rule                     0xfd14
-#define XK_3270_Copy                     0xfd15
-#define XK_3270_Play                     0xfd16
-#define XK_3270_Setup                    0xfd17
-#define XK_3270_Record                   0xfd18
-#define XK_3270_ChangeScreen             0xfd19
-#define XK_3270_DeleteWord               0xfd1a
-#define XK_3270_ExSelect                 0xfd1b
-#define XK_3270_CursorSelect             0xfd1c
-#define XK_3270_PrintScreen              0xfd1d
-#define XK_3270_Enter                    0xfd1e
-#endif /* XK_3270 */
-
-/*
- * Latin 1
- * (ISO/IEC 8859-1 = Unicode U+0020..U+00FF)
- * Byte 3 = 0
- */
-#ifdef XK_LATIN1
-#define XK_space                         0x0020  /* U+0020 SPACE */
-#define XK_exclam                        0x0021  /* U+0021 EXCLAMATION MARK */
-#define XK_quotedbl                      0x0022  /* U+0022 QUOTATION MARK */
-#define XK_numbersign                    0x0023  /* U+0023 NUMBER SIGN */
-#define XK_dollar                        0x0024  /* U+0024 DOLLAR SIGN */
-#define XK_percent                       0x0025  /* U+0025 PERCENT SIGN */
-#define XK_ampersand                     0x0026  /* U+0026 AMPERSAND */
-#define XK_apostrophe                    0x0027  /* U+0027 APOSTROPHE */
-#define XK_quoteright                    0x0027  /* deprecated */
-#define XK_parenleft                     0x0028  /* U+0028 LEFT PARENTHESIS */
-#define XK_parenright                    0x0029  /* U+0029 RIGHT PARENTHESIS */
-#define XK_asterisk                      0x002a  /* U+002A ASTERISK */
-#define XK_plus                          0x002b  /* U+002B PLUS SIGN */
-#define XK_comma                         0x002c  /* U+002C COMMA */
-#define XK_minus                         0x002d  /* U+002D HYPHEN-MINUS */
-#define XK_period                        0x002e  /* U+002E FULL STOP */
-#define XK_slash                         0x002f  /* U+002F SOLIDUS */
-#define XK_0                             0x0030  /* U+0030 DIGIT ZERO */
-#define XK_1                             0x0031  /* U+0031 DIGIT ONE */
-#define XK_2                             0x0032  /* U+0032 DIGIT TWO */
-#define XK_3                             0x0033  /* U+0033 DIGIT THREE */
-#define XK_4                             0x0034  /* U+0034 DIGIT FOUR */
-#define XK_5                             0x0035  /* U+0035 DIGIT FIVE */
-#define XK_6                             0x0036  /* U+0036 DIGIT SIX */
-#define XK_7                             0x0037  /* U+0037 DIGIT SEVEN */
-#define XK_8                             0x0038  /* U+0038 DIGIT EIGHT */
-#define XK_9                             0x0039  /* U+0039 DIGIT NINE */
-#define XK_colon                         0x003a  /* U+003A COLON */
-#define XK_semicolon                     0x003b  /* U+003B SEMICOLON */
-#define XK_less                          0x003c  /* U+003C LESS-THAN SIGN */
-#define XK_equal                         0x003d  /* U+003D EQUALS SIGN */
-#define XK_greater                       0x003e  /* U+003E GREATER-THAN SIGN */
-#define XK_question                      0x003f  /* U+003F QUESTION MARK */
-#define XK_at                            0x0040  /* U+0040 COMMERCIAL AT */
-#define XK_A                             0x0041  /* U+0041 LATIN CAPITAL LETTER A */
-#define XK_B                             0x0042  /* U+0042 LATIN CAPITAL LETTER B */
-#define XK_C                             0x0043  /* U+0043 LATIN CAPITAL LETTER C */
-#define XK_D                             0x0044  /* U+0044 LATIN CAPITAL LETTER D */
-#define XK_E                             0x0045  /* U+0045 LATIN CAPITAL LETTER E */
-#define XK_F                             0x0046  /* U+0046 LATIN CAPITAL LETTER F */
-#define XK_G                             0x0047  /* U+0047 LATIN CAPITAL LETTER G */
-#define XK_H                             0x0048  /* U+0048 LATIN CAPITAL LETTER H */
-#define XK_I                             0x0049  /* U+0049 LATIN CAPITAL LETTER I */
-#define XK_J                             0x004a  /* U+004A LATIN CAPITAL LETTER J */
-#define XK_K                             0x004b  /* U+004B LATIN CAPITAL LETTER K */
-#define XK_L                             0x004c  /* U+004C LATIN CAPITAL LETTER L */
-#define XK_M                             0x004d  /* U+004D LATIN CAPITAL LETTER M */
-#define XK_N                             0x004e  /* U+004E LATIN CAPITAL LETTER N */
-#define XK_O                             0x004f  /* U+004F LATIN CAPITAL LETTER O */
-#define XK_P                             0x0050  /* U+0050 LATIN CAPITAL LETTER P */
-#define XK_Q                             0x0051  /* U+0051 LATIN CAPITAL LETTER Q */
-#define XK_R                             0x0052  /* U+0052 LATIN CAPITAL LETTER R */
-#define XK_S                             0x0053  /* U+0053 LATIN CAPITAL LETTER S */
-#define XK_T                             0x0054  /* U+0054 LATIN CAPITAL LETTER T */
-#define XK_U                             0x0055  /* U+0055 LATIN CAPITAL LETTER U */
-#define XK_V                             0x0056  /* U+0056 LATIN CAPITAL LETTER V */
-#define XK_W                             0x0057  /* U+0057 LATIN CAPITAL LETTER W */
-#define XK_X                             0x0058  /* U+0058 LATIN CAPITAL LETTER X */
-#define XK_Y                             0x0059  /* U+0059 LATIN CAPITAL LETTER Y */
-#define XK_Z                             0x005a  /* U+005A LATIN CAPITAL LETTER Z */
-#define XK_bracketleft                   0x005b  /* U+005B LEFT SQUARE BRACKET */
-#define XK_backslash                     0x005c  /* U+005C REVERSE SOLIDUS */
-#define XK_bracketright                  0x005d  /* U+005D RIGHT SQUARE BRACKET */
-#define XK_asciicircum                   0x005e  /* U+005E CIRCUMFLEX ACCENT */
-#define XK_underscore                    0x005f  /* U+005F LOW LINE */
-#define XK_grave                         0x0060  /* U+0060 GRAVE ACCENT */
-#define XK_quoteleft                     0x0060  /* deprecated */
-#define XK_a                             0x0061  /* U+0061 LATIN SMALL LETTER A */
-#define XK_b                             0x0062  /* U+0062 LATIN SMALL LETTER B */
-#define XK_c                             0x0063  /* U+0063 LATIN SMALL LETTER C */
-#define XK_d                             0x0064  /* U+0064 LATIN SMALL LETTER D */
-#define XK_e                             0x0065  /* U+0065 LATIN SMALL LETTER E */
-#define XK_f                             0x0066  /* U+0066 LATIN SMALL LETTER F */
-#define XK_g                             0x0067  /* U+0067 LATIN SMALL LETTER G */
-#define XK_h                             0x0068  /* U+0068 LATIN SMALL LETTER H */
-#define XK_i                             0x0069  /* U+0069 LATIN SMALL LETTER I */
-#define XK_j                             0x006a  /* U+006A LATIN SMALL LETTER J */
-#define XK_k                             0x006b  /* U+006B LATIN SMALL LETTER K */
-#define XK_l                             0x006c  /* U+006C LATIN SMALL LETTER L */
-#define XK_m                             0x006d  /* U+006D LATIN SMALL LETTER M */
-#define XK_n                             0x006e  /* U+006E LATIN SMALL LETTER N */
-#define XK_o                             0x006f  /* U+006F LATIN SMALL LETTER O */
-#define XK_p                             0x0070  /* U+0070 LATIN SMALL LETTER P */
-#define XK_q                             0x0071  /* U+0071 LATIN SMALL LETTER Q */
-#define XK_r                             0x0072  /* U+0072 LATIN SMALL LETTER R */
-#define XK_s                             0x0073  /* U+0073 LATIN SMALL LETTER S */
-#define XK_t                             0x0074  /* U+0074 LATIN SMALL LETTER T */
-#define XK_u                             0x0075  /* U+0075 LATIN SMALL LETTER U */
-#define XK_v                             0x0076  /* U+0076 LATIN SMALL LETTER V */
-#define XK_w                             0x0077  /* U+0077 LATIN SMALL LETTER W */
-#define XK_x                             0x0078  /* U+0078 LATIN SMALL LETTER X */
-#define XK_y                             0x0079  /* U+0079 LATIN SMALL LETTER Y */
-#define XK_z                             0x007a  /* U+007A LATIN SMALL LETTER Z */
-#define XK_braceleft                     0x007b  /* U+007B LEFT CURLY BRACKET */
-#define XK_bar                           0x007c  /* U+007C VERTICAL LINE */
-#define XK_braceright                    0x007d  /* U+007D RIGHT CURLY BRACKET */
-#define XK_asciitilde                    0x007e  /* U+007E TILDE */
-
-#define XK_nobreakspace                  0x00a0  /* U+00A0 NO-BREAK SPACE */
-#define XK_exclamdown                    0x00a1  /* U+00A1 INVERTED EXCLAMATION MARK */
-#define XK_cent                          0x00a2  /* U+00A2 CENT SIGN */
-#define XK_sterling                      0x00a3  /* U+00A3 POUND SIGN */
-#define XK_currency                      0x00a4  /* U+00A4 CURRENCY SIGN */
-#define XK_yen                           0x00a5  /* U+00A5 YEN SIGN */
-#define XK_brokenbar                     0x00a6  /* U+00A6 BROKEN BAR */
-#define XK_section                       0x00a7  /* U+00A7 SECTION SIGN */
-#define XK_diaeresis                     0x00a8  /* U+00A8 DIAERESIS */
-#define XK_copyright                     0x00a9  /* U+00A9 COPYRIGHT SIGN */
-#define XK_ordfeminine                   0x00aa  /* U+00AA FEMININE ORDINAL INDICATOR */
-#define XK_guillemotleft                 0x00ab  /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
-#define XK_notsign                       0x00ac  /* U+00AC NOT SIGN */
-#define XK_hyphen                        0x00ad  /* U+00AD SOFT HYPHEN */
-#define XK_registered                    0x00ae  /* U+00AE REGISTERED SIGN */
-#define XK_macron                        0x00af  /* U+00AF MACRON */
-#define XK_degree                        0x00b0  /* U+00B0 DEGREE SIGN */
-#define XK_plusminus                     0x00b1  /* U+00B1 PLUS-MINUS SIGN */
-#define XK_twosuperior                   0x00b2  /* U+00B2 SUPERSCRIPT TWO */
-#define XK_threesuperior                 0x00b3  /* U+00B3 SUPERSCRIPT THREE */
-#define XK_acute                         0x00b4  /* U+00B4 ACUTE ACCENT */
-#define XK_mu                            0x00b5  /* U+00B5 MICRO SIGN */
-#define XK_paragraph                     0x00b6  /* U+00B6 PILCROW SIGN */
-#define XK_periodcentered                0x00b7  /* U+00B7 MIDDLE DOT */
-#define XK_cedilla                       0x00b8  /* U+00B8 CEDILLA */
-#define XK_onesuperior                   0x00b9  /* U+00B9 SUPERSCRIPT ONE */
-#define XK_masculine                     0x00ba  /* U+00BA MASCULINE ORDINAL INDICATOR */
-#define XK_guillemotright                0x00bb  /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
-#define XK_onequarter                    0x00bc  /* U+00BC VULGAR FRACTION ONE QUARTER */
-#define XK_onehalf                       0x00bd  /* U+00BD VULGAR FRACTION ONE HALF */
-#define XK_threequarters                 0x00be  /* U+00BE VULGAR FRACTION THREE QUARTERS */
-#define XK_questiondown                  0x00bf  /* U+00BF INVERTED QUESTION MARK */
-#define XK_Agrave                        0x00c0  /* U+00C0 LATIN CAPITAL LETTER A WITH GRAVE */
-#define XK_Aacute                        0x00c1  /* U+00C1 LATIN CAPITAL LETTER A WITH ACUTE */
-#define XK_Acircumflex                   0x00c2  /* U+00C2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
-#define XK_Atilde                        0x00c3  /* U+00C3 LATIN CAPITAL LETTER A WITH TILDE */
-#define XK_Adiaeresis                    0x00c4  /* U+00C4 LATIN CAPITAL LETTER A WITH DIAERESIS */
-#define XK_Aring                         0x00c5  /* U+00C5 LATIN CAPITAL LETTER A WITH RING ABOVE */
-#define XK_AE                            0x00c6  /* U+00C6 LATIN CAPITAL LETTER AE */
-#define XK_Ccedilla                      0x00c7  /* U+00C7 LATIN CAPITAL LETTER C WITH CEDILLA */
-#define XK_Egrave                        0x00c8  /* U+00C8 LATIN CAPITAL LETTER E WITH GRAVE */
-#define XK_Eacute                        0x00c9  /* U+00C9 LATIN CAPITAL LETTER E WITH ACUTE */
-#define XK_Ecircumflex                   0x00ca  /* U+00CA LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
-#define XK_Ediaeresis                    0x00cb  /* U+00CB LATIN CAPITAL LETTER E WITH DIAERESIS */
-#define XK_Igrave                        0x00cc  /* U+00CC LATIN CAPITAL LETTER I WITH GRAVE */
-#define XK_Iacute                        0x00cd  /* U+00CD LATIN CAPITAL LETTER I WITH ACUTE */
-#define XK_Icircumflex                   0x00ce  /* U+00CE LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
-#define XK_Idiaeresis                    0x00cf  /* U+00CF LATIN CAPITAL LETTER I WITH DIAERESIS */
-#define XK_ETH                           0x00d0  /* U+00D0 LATIN CAPITAL LETTER ETH */
-#define XK_Eth                           0x00d0  /* deprecated */
-#define XK_Ntilde                        0x00d1  /* U+00D1 LATIN CAPITAL LETTER N WITH TILDE */
-#define XK_Ograve                        0x00d2  /* U+00D2 LATIN CAPITAL LETTER O WITH GRAVE */
-#define XK_Oacute                        0x00d3  /* U+00D3 LATIN CAPITAL LETTER O WITH ACUTE */
-#define XK_Ocircumflex                   0x00d4  /* U+00D4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
-#define XK_Otilde                        0x00d5  /* U+00D5 LATIN CAPITAL LETTER O WITH TILDE */
-#define XK_Odiaeresis                    0x00d6  /* U+00D6 LATIN CAPITAL LETTER O WITH DIAERESIS */
-#define XK_multiply                      0x00d7  /* U+00D7 MULTIPLICATION SIGN */
-#define XK_Oslash                        0x00d8  /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */
-#define XK_Ooblique                      0x00d8  /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */
-#define XK_Ugrave                        0x00d9  /* U+00D9 LATIN CAPITAL LETTER U WITH GRAVE */
-#define XK_Uacute                        0x00da  /* U+00DA LATIN CAPITAL LETTER U WITH ACUTE */
-#define XK_Ucircumflex                   0x00db  /* U+00DB LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
-#define XK_Udiaeresis                    0x00dc  /* U+00DC LATIN CAPITAL LETTER U WITH DIAERESIS */
-#define XK_Yacute                        0x00dd  /* U+00DD LATIN CAPITAL LETTER Y WITH ACUTE */
-#define XK_THORN                         0x00de  /* U+00DE LATIN CAPITAL LETTER THORN */
-#define XK_Thorn                         0x00de  /* deprecated */
-#define XK_ssharp                        0x00df  /* U+00DF LATIN SMALL LETTER SHARP S */
-#define XK_agrave                        0x00e0  /* U+00E0 LATIN SMALL LETTER A WITH GRAVE */
-#define XK_aacute                        0x00e1  /* U+00E1 LATIN SMALL LETTER A WITH ACUTE */
-#define XK_acircumflex                   0x00e2  /* U+00E2 LATIN SMALL LETTER A WITH CIRCUMFLEX */
-#define XK_atilde                        0x00e3  /* U+00E3 LATIN SMALL LETTER A WITH TILDE */
-#define XK_adiaeresis                    0x00e4  /* U+00E4 LATIN SMALL LETTER A WITH DIAERESIS */
-#define XK_aring                         0x00e5  /* U+00E5 LATIN SMALL LETTER A WITH RING ABOVE */
-#define XK_ae                            0x00e6  /* U+00E6 LATIN SMALL LETTER AE */
-#define XK_ccedilla                      0x00e7  /* U+00E7 LATIN SMALL LETTER C WITH CEDILLA */
-#define XK_egrave                        0x00e8  /* U+00E8 LATIN SMALL LETTER E WITH GRAVE */
-#define XK_eacute                        0x00e9  /* U+00E9 LATIN SMALL LETTER E WITH ACUTE */
-#define XK_ecircumflex                   0x00ea  /* U+00EA LATIN SMALL LETTER E WITH CIRCUMFLEX */
-#define XK_ediaeresis                    0x00eb  /* U+00EB LATIN SMALL LETTER E WITH DIAERESIS */
-#define XK_igrave                        0x00ec  /* U+00EC LATIN SMALL LETTER I WITH GRAVE */
-#define XK_iacute                        0x00ed  /* U+00ED LATIN SMALL LETTER I WITH ACUTE */
-#define XK_icircumflex                   0x00ee  /* U+00EE LATIN SMALL LETTER I WITH CIRCUMFLEX */
-#define XK_idiaeresis                    0x00ef  /* U+00EF LATIN SMALL LETTER I WITH DIAERESIS */
-#define XK_eth                           0x00f0  /* U+00F0 LATIN SMALL LETTER ETH */
-#define XK_ntilde                        0x00f1  /* U+00F1 LATIN SMALL LETTER N WITH TILDE */
-#define XK_ograve                        0x00f2  /* U+00F2 LATIN SMALL LETTER O WITH GRAVE */
-#define XK_oacute                        0x00f3  /* U+00F3 LATIN SMALL LETTER O WITH ACUTE */
-#define XK_ocircumflex                   0x00f4  /* U+00F4 LATIN SMALL LETTER O WITH CIRCUMFLEX */
-#define XK_otilde                        0x00f5  /* U+00F5 LATIN SMALL LETTER O WITH TILDE */
-#define XK_odiaeresis                    0x00f6  /* U+00F6 LATIN SMALL LETTER O WITH DIAERESIS */
-#define XK_division                      0x00f7  /* U+00F7 DIVISION SIGN */
-#define XK_oslash                        0x00f8  /* U+00F8 LATIN SMALL LETTER O WITH STROKE */
-#define XK_ooblique                      0x00f8  /* U+00F8 LATIN SMALL LETTER O WITH STROKE */
-#define XK_ugrave                        0x00f9  /* U+00F9 LATIN SMALL LETTER U WITH GRAVE */
-#define XK_uacute                        0x00fa  /* U+00FA LATIN SMALL LETTER U WITH ACUTE */
-#define XK_ucircumflex                   0x00fb  /* U+00FB LATIN SMALL LETTER U WITH CIRCUMFLEX */
-#define XK_udiaeresis                    0x00fc  /* U+00FC LATIN SMALL LETTER U WITH DIAERESIS */
-#define XK_yacute                        0x00fd  /* U+00FD LATIN SMALL LETTER Y WITH ACUTE */
-#define XK_thorn                         0x00fe  /* U+00FE LATIN SMALL LETTER THORN */
-#define XK_ydiaeresis                    0x00ff  /* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */
-#endif /* XK_LATIN1 */
-
-/*
- * Latin 2
- * Byte 3 = 1
- */
-
-#ifdef XK_LATIN2
-#define XK_Aogonek                       0x01a1  /* U+0104 LATIN CAPITAL LETTER A WITH OGONEK */
-#define XK_breve                         0x01a2  /* U+02D8 BREVE */
-#define XK_Lstroke                       0x01a3  /* U+0141 LATIN CAPITAL LETTER L WITH STROKE */
-#define XK_Lcaron                        0x01a5  /* U+013D LATIN CAPITAL LETTER L WITH CARON */
-#define XK_Sacute                        0x01a6  /* U+015A LATIN CAPITAL LETTER S WITH ACUTE */
-#define XK_Scaron                        0x01a9  /* U+0160 LATIN CAPITAL LETTER S WITH CARON */
-#define XK_Scedilla                      0x01aa  /* U+015E LATIN CAPITAL LETTER S WITH CEDILLA */
-#define XK_Tcaron                        0x01ab  /* U+0164 LATIN CAPITAL LETTER T WITH CARON */
-#define XK_Zacute                        0x01ac  /* U+0179 LATIN CAPITAL LETTER Z WITH ACUTE */
-#define XK_Zcaron                        0x01ae  /* U+017D LATIN CAPITAL LETTER Z WITH CARON */
-#define XK_Zabovedot                     0x01af  /* U+017B LATIN CAPITAL LETTER Z WITH DOT ABOVE */
-#define XK_aogonek                       0x01b1  /* U+0105 LATIN SMALL LETTER A WITH OGONEK */
-#define XK_ogonek                        0x01b2  /* U+02DB OGONEK */
-#define XK_lstroke                       0x01b3  /* U+0142 LATIN SMALL LETTER L WITH STROKE */
-#define XK_lcaron                        0x01b5  /* U+013E LATIN SMALL LETTER L WITH CARON */
-#define XK_sacute                        0x01b6  /* U+015B LATIN SMALL LETTER S WITH ACUTE */
-#define XK_caron                         0x01b7  /* U+02C7 CARON */
-#define XK_scaron                        0x01b9  /* U+0161 LATIN SMALL LETTER S WITH CARON */
-#define XK_scedilla                      0x01ba  /* U+015F LATIN SMALL LETTER S WITH CEDILLA */
-#define XK_tcaron                        0x01bb  /* U+0165 LATIN SMALL LETTER T WITH CARON */
-#define XK_zacute                        0x01bc  /* U+017A LATIN SMALL LETTER Z WITH ACUTE */
-#define XK_doubleacute                   0x01bd  /* U+02DD DOUBLE ACUTE ACCENT */
-#define XK_zcaron                        0x01be  /* U+017E LATIN SMALL LETTER Z WITH CARON */
-#define XK_zabovedot                     0x01bf  /* U+017C LATIN SMALL LETTER Z WITH DOT ABOVE */
-#define XK_Racute                        0x01c0  /* U+0154 LATIN CAPITAL LETTER R WITH ACUTE */
-#define XK_Abreve                        0x01c3  /* U+0102 LATIN CAPITAL LETTER A WITH BREVE */
-#define XK_Lacute                        0x01c5  /* U+0139 LATIN CAPITAL LETTER L WITH ACUTE */
-#define XK_Cacute                        0x01c6  /* U+0106 LATIN CAPITAL LETTER C WITH ACUTE */
-#define XK_Ccaron                        0x01c8  /* U+010C LATIN CAPITAL LETTER C WITH CARON */
-#define XK_Eogonek                       0x01ca  /* U+0118 LATIN CAPITAL LETTER E WITH OGONEK */
-#define XK_Ecaron                        0x01cc  /* U+011A LATIN CAPITAL LETTER E WITH CARON */
-#define XK_Dcaron                        0x01cf  /* U+010E LATIN CAPITAL LETTER D WITH CARON */
-#define XK_Dstroke                       0x01d0  /* U+0110 LATIN CAPITAL LETTER D WITH STROKE */
-#define XK_Nacute                        0x01d1  /* U+0143 LATIN CAPITAL LETTER N WITH ACUTE */
-#define XK_Ncaron                        0x01d2  /* U+0147 LATIN CAPITAL LETTER N WITH CARON */
-#define XK_Odoubleacute                  0x01d5  /* U+0150 LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
-#define XK_Rcaron                        0x01d8  /* U+0158 LATIN CAPITAL LETTER R WITH CARON */
-#define XK_Uring                         0x01d9  /* U+016E LATIN CAPITAL LETTER U WITH RING ABOVE */
-#define XK_Udoubleacute                  0x01db  /* U+0170 LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
-#define XK_Tcedilla                      0x01de  /* U+0162 LATIN CAPITAL LETTER T WITH CEDILLA */
-#define XK_racute                        0x01e0  /* U+0155 LATIN SMALL LETTER R WITH ACUTE */
-#define XK_abreve                        0x01e3  /* U+0103 LATIN SMALL LETTER A WITH BREVE */
-#define XK_lacute                        0x01e5  /* U+013A LATIN SMALL LETTER L WITH ACUTE */
-#define XK_cacute                        0x01e6  /* U+0107 LATIN SMALL LETTER C WITH ACUTE */
-#define XK_ccaron                        0x01e8  /* U+010D LATIN SMALL LETTER C WITH CARON */
-#define XK_eogonek                       0x01ea  /* U+0119 LATIN SMALL LETTER E WITH OGONEK */
-#define XK_ecaron                        0x01ec  /* U+011B LATIN SMALL LETTER E WITH CARON */
-#define XK_dcaron                        0x01ef  /* U+010F LATIN SMALL LETTER D WITH CARON */
-#define XK_dstroke                       0x01f0  /* U+0111 LATIN SMALL LETTER D WITH STROKE */
-#define XK_nacute                        0x01f1  /* U+0144 LATIN SMALL LETTER N WITH ACUTE */
-#define XK_ncaron                        0x01f2  /* U+0148 LATIN SMALL LETTER N WITH CARON */
-#define XK_odoubleacute                  0x01f5  /* U+0151 LATIN SMALL LETTER O WITH DOUBLE ACUTE */
-#define XK_rcaron                        0x01f8  /* U+0159 LATIN SMALL LETTER R WITH CARON */
-#define XK_uring                         0x01f9  /* U+016F LATIN SMALL LETTER U WITH RING ABOVE */
-#define XK_udoubleacute                  0x01fb  /* U+0171 LATIN SMALL LETTER U WITH DOUBLE ACUTE */
-#define XK_tcedilla                      0x01fe  /* U+0163 LATIN SMALL LETTER T WITH CEDILLA */
-#define XK_abovedot                      0x01ff  /* U+02D9 DOT ABOVE */
-#endif /* XK_LATIN2 */
-
-/*
- * Latin 3
- * Byte 3 = 2
- */
-
-#ifdef XK_LATIN3
-#define XK_Hstroke                       0x02a1  /* U+0126 LATIN CAPITAL LETTER H WITH STROKE */
-#define XK_Hcircumflex                   0x02a6  /* U+0124 LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
-#define XK_Iabovedot                     0x02a9  /* U+0130 LATIN CAPITAL LETTER I WITH DOT ABOVE */
-#define XK_Gbreve                        0x02ab  /* U+011E LATIN CAPITAL LETTER G WITH BREVE */
-#define XK_Jcircumflex                   0x02ac  /* U+0134 LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
-#define XK_hstroke                       0x02b1  /* U+0127 LATIN SMALL LETTER H WITH STROKE */
-#define XK_hcircumflex                   0x02b6  /* U+0125 LATIN SMALL LETTER H WITH CIRCUMFLEX */
-#define XK_idotless                      0x02b9  /* U+0131 LATIN SMALL LETTER DOTLESS I */
-#define XK_gbreve                        0x02bb  /* U+011F LATIN SMALL LETTER G WITH BREVE */
-#define XK_jcircumflex                   0x02bc  /* U+0135 LATIN SMALL LETTER J WITH CIRCUMFLEX */
-#define XK_Cabovedot                     0x02c5  /* U+010A LATIN CAPITAL LETTER C WITH DOT ABOVE */
-#define XK_Ccircumflex                   0x02c6  /* U+0108 LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
-#define XK_Gabovedot                     0x02d5  /* U+0120 LATIN CAPITAL LETTER G WITH DOT ABOVE */
-#define XK_Gcircumflex                   0x02d8  /* U+011C LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
-#define XK_Ubreve                        0x02dd  /* U+016C LATIN CAPITAL LETTER U WITH BREVE */
-#define XK_Scircumflex                   0x02de  /* U+015C LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
-#define XK_cabovedot                     0x02e5  /* U+010B LATIN SMALL LETTER C WITH DOT ABOVE */
-#define XK_ccircumflex                   0x02e6  /* U+0109 LATIN SMALL LETTER C WITH CIRCUMFLEX */
-#define XK_gabovedot                     0x02f5  /* U+0121 LATIN SMALL LETTER G WITH DOT ABOVE */
-#define XK_gcircumflex                   0x02f8  /* U+011D LATIN SMALL LETTER G WITH CIRCUMFLEX */
-#define XK_ubreve                        0x02fd  /* U+016D LATIN SMALL LETTER U WITH BREVE */
-#define XK_scircumflex                   0x02fe  /* U+015D LATIN SMALL LETTER S WITH CIRCUMFLEX */
-#endif /* XK_LATIN3 */
-
-
-/*
- * Latin 4
- * Byte 3 = 3
- */
-
-#ifdef XK_LATIN4
-#define XK_kra                           0x03a2  /* U+0138 LATIN SMALL LETTER KRA */
-#define XK_kappa                         0x03a2  /* deprecated */
-#define XK_Rcedilla                      0x03a3  /* U+0156 LATIN CAPITAL LETTER R WITH CEDILLA */
-#define XK_Itilde                        0x03a5  /* U+0128 LATIN CAPITAL LETTER I WITH TILDE */
-#define XK_Lcedilla                      0x03a6  /* U+013B LATIN CAPITAL LETTER L WITH CEDILLA */
-#define XK_Emacron                       0x03aa  /* U+0112 LATIN CAPITAL LETTER E WITH MACRON */
-#define XK_Gcedilla                      0x03ab  /* U+0122 LATIN CAPITAL LETTER G WITH CEDILLA */
-#define XK_Tslash                        0x03ac  /* U+0166 LATIN CAPITAL LETTER T WITH STROKE */
-#define XK_rcedilla                      0x03b3  /* U+0157 LATIN SMALL LETTER R WITH CEDILLA */
-#define XK_itilde                        0x03b5  /* U+0129 LATIN SMALL LETTER I WITH TILDE */
-#define XK_lcedilla                      0x03b6  /* U+013C LATIN SMALL LETTER L WITH CEDILLA */
-#define XK_emacron                       0x03ba  /* U+0113 LATIN SMALL LETTER E WITH MACRON */
-#define XK_gcedilla                      0x03bb  /* U+0123 LATIN SMALL LETTER G WITH CEDILLA */
-#define XK_tslash                        0x03bc  /* U+0167 LATIN SMALL LETTER T WITH STROKE */
-#define XK_ENG                           0x03bd  /* U+014A LATIN CAPITAL LETTER ENG */
-#define XK_eng                           0x03bf  /* U+014B LATIN SMALL LETTER ENG */
-#define XK_Amacron                       0x03c0  /* U+0100 LATIN CAPITAL LETTER A WITH MACRON */
-#define XK_Iogonek                       0x03c7  /* U+012E LATIN CAPITAL LETTER I WITH OGONEK */
-#define XK_Eabovedot                     0x03cc  /* U+0116 LATIN CAPITAL LETTER E WITH DOT ABOVE */
-#define XK_Imacron                       0x03cf  /* U+012A LATIN CAPITAL LETTER I WITH MACRON */
-#define XK_Ncedilla                      0x03d1  /* U+0145 LATIN CAPITAL LETTER N WITH CEDILLA */
-#define XK_Omacron                       0x03d2  /* U+014C LATIN CAPITAL LETTER O WITH MACRON */
-#define XK_Kcedilla                      0x03d3  /* U+0136 LATIN CAPITAL LETTER K WITH CEDILLA */
-#define XK_Uogonek                       0x03d9  /* U+0172 LATIN CAPITAL LETTER U WITH OGONEK */
-#define XK_Utilde                        0x03dd  /* U+0168 LATIN CAPITAL LETTER U WITH TILDE */
-#define XK_Umacron                       0x03de  /* U+016A LATIN CAPITAL LETTER U WITH MACRON */
-#define XK_amacron                       0x03e0  /* U+0101 LATIN SMALL LETTER A WITH MACRON */
-#define XK_iogonek                       0x03e7  /* U+012F LATIN SMALL LETTER I WITH OGONEK */
-#define XK_eabovedot                     0x03ec  /* U+0117 LATIN SMALL LETTER E WITH DOT ABOVE */
-#define XK_imacron                       0x03ef  /* U+012B LATIN SMALL LETTER I WITH MACRON */
-#define XK_ncedilla                      0x03f1  /* U+0146 LATIN SMALL LETTER N WITH CEDILLA */
-#define XK_omacron                       0x03f2  /* U+014D LATIN SMALL LETTER O WITH MACRON */
-#define XK_kcedilla                      0x03f3  /* U+0137 LATIN SMALL LETTER K WITH CEDILLA */
-#define XK_uogonek                       0x03f9  /* U+0173 LATIN SMALL LETTER U WITH OGONEK */
-#define XK_utilde                        0x03fd  /* U+0169 LATIN SMALL LETTER U WITH TILDE */
-#define XK_umacron                       0x03fe  /* U+016B LATIN SMALL LETTER U WITH MACRON */
-#endif /* XK_LATIN4 */
-
-/*
- * Latin 8
- */
-#ifdef XK_LATIN8
-#define XK_Wcircumflex                0x1000174  /* U+0174 LATIN CAPITAL LETTER W WITH CIRCUMFLEX */
-#define XK_wcircumflex                0x1000175  /* U+0175 LATIN SMALL LETTER W WITH CIRCUMFLEX */
-#define XK_Ycircumflex                0x1000176  /* U+0176 LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */
-#define XK_ycircumflex                0x1000177  /* U+0177 LATIN SMALL LETTER Y WITH CIRCUMFLEX */
-#define XK_Babovedot                  0x1001e02  /* U+1E02 LATIN CAPITAL LETTER B WITH DOT ABOVE */
-#define XK_babovedot                  0x1001e03  /* U+1E03 LATIN SMALL LETTER B WITH DOT ABOVE */
-#define XK_Dabovedot                  0x1001e0a  /* U+1E0A LATIN CAPITAL LETTER D WITH DOT ABOVE */
-#define XK_dabovedot                  0x1001e0b  /* U+1E0B LATIN SMALL LETTER D WITH DOT ABOVE */
-#define XK_Fabovedot                  0x1001e1e  /* U+1E1E LATIN CAPITAL LETTER F WITH DOT ABOVE */
-#define XK_fabovedot                  0x1001e1f  /* U+1E1F LATIN SMALL LETTER F WITH DOT ABOVE */
-#define XK_Mabovedot                  0x1001e40  /* U+1E40 LATIN CAPITAL LETTER M WITH DOT ABOVE */
-#define XK_mabovedot                  0x1001e41  /* U+1E41 LATIN SMALL LETTER M WITH DOT ABOVE */
-#define XK_Pabovedot                  0x1001e56  /* U+1E56 LATIN CAPITAL LETTER P WITH DOT ABOVE */
-#define XK_pabovedot                  0x1001e57  /* U+1E57 LATIN SMALL LETTER P WITH DOT ABOVE */
-#define XK_Sabovedot                  0x1001e60  /* U+1E60 LATIN CAPITAL LETTER S WITH DOT ABOVE */
-#define XK_sabovedot                  0x1001e61  /* U+1E61 LATIN SMALL LETTER S WITH DOT ABOVE */
-#define XK_Tabovedot                  0x1001e6a  /* U+1E6A LATIN CAPITAL LETTER T WITH DOT ABOVE */
-#define XK_tabovedot                  0x1001e6b  /* U+1E6B LATIN SMALL LETTER T WITH DOT ABOVE */
-#define XK_Wgrave                     0x1001e80  /* U+1E80 LATIN CAPITAL LETTER W WITH GRAVE */
-#define XK_wgrave                     0x1001e81  /* U+1E81 LATIN SMALL LETTER W WITH GRAVE */
-#define XK_Wacute                     0x1001e82  /* U+1E82 LATIN CAPITAL LETTER W WITH ACUTE */
-#define XK_wacute                     0x1001e83  /* U+1E83 LATIN SMALL LETTER W WITH ACUTE */
-#define XK_Wdiaeresis                 0x1001e84  /* U+1E84 LATIN CAPITAL LETTER W WITH DIAERESIS */
-#define XK_wdiaeresis                 0x1001e85  /* U+1E85 LATIN SMALL LETTER W WITH DIAERESIS */
-#define XK_Ygrave                     0x1001ef2  /* U+1EF2 LATIN CAPITAL LETTER Y WITH GRAVE */
-#define XK_ygrave                     0x1001ef3  /* U+1EF3 LATIN SMALL LETTER Y WITH GRAVE */
-#endif /* XK_LATIN8 */
-
-/*
- * Latin 9
- * Byte 3 = 0x13
- */
-
-#ifdef XK_LATIN9
-#define XK_OE                            0x13bc  /* U+0152 LATIN CAPITAL LIGATURE OE */
-#define XK_oe                            0x13bd  /* U+0153 LATIN SMALL LIGATURE OE */
-#define XK_Ydiaeresis                    0x13be  /* U+0178 LATIN CAPITAL LETTER Y WITH DIAERESIS */
-#endif /* XK_LATIN9 */
-
-/*
- * Katakana
- * Byte 3 = 4
- */
-
-#ifdef XK_KATAKANA
-#define XK_overline                      0x047e  /* U+203E OVERLINE */
-#define XK_kana_fullstop                 0x04a1  /* U+3002 IDEOGRAPHIC FULL STOP */
-#define XK_kana_openingbracket           0x04a2  /* U+300C LEFT CORNER BRACKET */
-#define XK_kana_closingbracket           0x04a3  /* U+300D RIGHT CORNER BRACKET */
-#define XK_kana_comma                    0x04a4  /* U+3001 IDEOGRAPHIC COMMA */
-#define XK_kana_conjunctive              0x04a5  /* U+30FB KATAKANA MIDDLE DOT */
-#define XK_kana_middledot                0x04a5  /* deprecated */
-#define XK_kana_WO                       0x04a6  /* U+30F2 KATAKANA LETTER WO */
-#define XK_kana_a                        0x04a7  /* U+30A1 KATAKANA LETTER SMALL A */
-#define XK_kana_i                        0x04a8  /* U+30A3 KATAKANA LETTER SMALL I */
-#define XK_kana_u                        0x04a9  /* U+30A5 KATAKANA LETTER SMALL U */
-#define XK_kana_e                        0x04aa  /* U+30A7 KATAKANA LETTER SMALL E */
-#define XK_kana_o                        0x04ab  /* U+30A9 KATAKANA LETTER SMALL O */
-#define XK_kana_ya                       0x04ac  /* U+30E3 KATAKANA LETTER SMALL YA */
-#define XK_kana_yu                       0x04ad  /* U+30E5 KATAKANA LETTER SMALL YU */
-#define XK_kana_yo                       0x04ae  /* U+30E7 KATAKANA LETTER SMALL YO */
-#define XK_kana_tsu                      0x04af  /* U+30C3 KATAKANA LETTER SMALL TU */
-#define XK_kana_tu                       0x04af  /* deprecated */
-#define XK_prolongedsound                0x04b0  /* U+30FC KATAKANA-HIRAGANA PROLONGED SOUND MARK */
-#define XK_kana_A                        0x04b1  /* U+30A2 KATAKANA LETTER A */
-#define XK_kana_I                        0x04b2  /* U+30A4 KATAKANA LETTER I */
-#define XK_kana_U                        0x04b3  /* U+30A6 KATAKANA LETTER U */
-#define XK_kana_E                        0x04b4  /* U+30A8 KATAKANA LETTER E */
-#define XK_kana_O                        0x04b5  /* U+30AA KATAKANA LETTER O */
-#define XK_kana_KA                       0x04b6  /* U+30AB KATAKANA LETTER KA */
-#define XK_kana_KI                       0x04b7  /* U+30AD KATAKANA LETTER KI */
-#define XK_kana_KU                       0x04b8  /* U+30AF KATAKANA LETTER KU */
-#define XK_kana_KE                       0x04b9  /* U+30B1 KATAKANA LETTER KE */
-#define XK_kana_KO                       0x04ba  /* U+30B3 KATAKANA LETTER KO */
-#define XK_kana_SA                       0x04bb  /* U+30B5 KATAKANA LETTER SA */
-#define XK_kana_SHI                      0x04bc  /* U+30B7 KATAKANA LETTER SI */
-#define XK_kana_SU                       0x04bd  /* U+30B9 KATAKANA LETTER SU */
-#define XK_kana_SE                       0x04be  /* U+30BB KATAKANA LETTER SE */
-#define XK_kana_SO                       0x04bf  /* U+30BD KATAKANA LETTER SO */
-#define XK_kana_TA                       0x04c0  /* U+30BF KATAKANA LETTER TA */
-#define XK_kana_CHI                      0x04c1  /* U+30C1 KATAKANA LETTER TI */
-#define XK_kana_TI                       0x04c1  /* deprecated */
-#define XK_kana_TSU                      0x04c2  /* U+30C4 KATAKANA LETTER TU */
-#define XK_kana_TU                       0x04c2  /* deprecated */
-#define XK_kana_TE                       0x04c3  /* U+30C6 KATAKANA LETTER TE */
-#define XK_kana_TO                       0x04c4  /* U+30C8 KATAKANA LETTER TO */
-#define XK_kana_NA                       0x04c5  /* U+30CA KATAKANA LETTER NA */
-#define XK_kana_NI                       0x04c6  /* U+30CB KATAKANA LETTER NI */
-#define XK_kana_NU                       0x04c7  /* U+30CC KATAKANA LETTER NU */
-#define XK_kana_NE                       0x04c8  /* U+30CD KATAKANA LETTER NE */
-#define XK_kana_NO                       0x04c9  /* U+30CE KATAKANA LETTER NO */
-#define XK_kana_HA                       0x04ca  /* U+30CF KATAKANA LETTER HA */
-#define XK_kana_HI                       0x04cb  /* U+30D2 KATAKANA LETTER HI */
-#define XK_kana_FU                       0x04cc  /* U+30D5 KATAKANA LETTER HU */
-#define XK_kana_HU                       0x04cc  /* deprecated */
-#define XK_kana_HE                       0x04cd  /* U+30D8 KATAKANA LETTER HE */
-#define XK_kana_HO                       0x04ce  /* U+30DB KATAKANA LETTER HO */
-#define XK_kana_MA                       0x04cf  /* U+30DE KATAKANA LETTER MA */
-#define XK_kana_MI                       0x04d0  /* U+30DF KATAKANA LETTER MI */
-#define XK_kana_MU                       0x04d1  /* U+30E0 KATAKANA LETTER MU */
-#define XK_kana_ME                       0x04d2  /* U+30E1 KATAKANA LETTER ME */
-#define XK_kana_MO                       0x04d3  /* U+30E2 KATAKANA LETTER MO */
-#define XK_kana_YA                       0x04d4  /* U+30E4 KATAKANA LETTER YA */
-#define XK_kana_YU                       0x04d5  /* U+30E6 KATAKANA LETTER YU */
-#define XK_kana_YO                       0x04d6  /* U+30E8 KATAKANA LETTER YO */
-#define XK_kana_RA                       0x04d7  /* U+30E9 KATAKANA LETTER RA */
-#define XK_kana_RI                       0x04d8  /* U+30EA KATAKANA LETTER RI */
-#define XK_kana_RU                       0x04d9  /* U+30EB KATAKANA LETTER RU */
-#define XK_kana_RE                       0x04da  /* U+30EC KATAKANA LETTER RE */
-#define XK_kana_RO                       0x04db  /* U+30ED KATAKANA LETTER RO */
-#define XK_kana_WA                       0x04dc  /* U+30EF KATAKANA LETTER WA */
-#define XK_kana_N                        0x04dd  /* U+30F3 KATAKANA LETTER N */
-#define XK_voicedsound                   0x04de  /* U+309B KATAKANA-HIRAGANA VOICED SOUND MARK */
-#define XK_semivoicedsound               0x04df  /* U+309C KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */
-#define XK_kana_switch                   0xff7e  /* Alias for mode_switch */
-#endif /* XK_KATAKANA */
-
-/*
- * Arabic
- * Byte 3 = 5
- */
-
-#ifdef XK_ARABIC
-#define XK_Farsi_0                    0x10006f0  /* U+06F0 EXTENDED ARABIC-INDIC DIGIT ZERO */
-#define XK_Farsi_1                    0x10006f1  /* U+06F1 EXTENDED ARABIC-INDIC DIGIT ONE */
-#define XK_Farsi_2                    0x10006f2  /* U+06F2 EXTENDED ARABIC-INDIC DIGIT TWO */
-#define XK_Farsi_3                    0x10006f3  /* U+06F3 EXTENDED ARABIC-INDIC DIGIT THREE */
-#define XK_Farsi_4                    0x10006f4  /* U+06F4 EXTENDED ARABIC-INDIC DIGIT FOUR */
-#define XK_Farsi_5                    0x10006f5  /* U+06F5 EXTENDED ARABIC-INDIC DIGIT FIVE */
-#define XK_Farsi_6                    0x10006f6  /* U+06F6 EXTENDED ARABIC-INDIC DIGIT SIX */
-#define XK_Farsi_7                    0x10006f7  /* U+06F7 EXTENDED ARABIC-INDIC DIGIT SEVEN */
-#define XK_Farsi_8                    0x10006f8  /* U+06F8 EXTENDED ARABIC-INDIC DIGIT EIGHT */
-#define XK_Farsi_9                    0x10006f9  /* U+06F9 EXTENDED ARABIC-INDIC DIGIT NINE */
-#define XK_Arabic_percent             0x100066a  /* U+066A ARABIC PERCENT SIGN */
-#define XK_Arabic_superscript_alef    0x1000670  /* U+0670 ARABIC LETTER SUPERSCRIPT ALEF */
-#define XK_Arabic_tteh                0x1000679  /* U+0679 ARABIC LETTER TTEH */
-#define XK_Arabic_peh                 0x100067e  /* U+067E ARABIC LETTER PEH */
-#define XK_Arabic_tcheh               0x1000686  /* U+0686 ARABIC LETTER TCHEH */
-#define XK_Arabic_ddal                0x1000688  /* U+0688 ARABIC LETTER DDAL */
-#define XK_Arabic_rreh                0x1000691  /* U+0691 ARABIC LETTER RREH */
-#define XK_Arabic_comma                  0x05ac  /* U+060C ARABIC COMMA */
-#define XK_Arabic_fullstop            0x10006d4  /* U+06D4 ARABIC FULL STOP */
-#define XK_Arabic_0                   0x1000660  /* U+0660 ARABIC-INDIC DIGIT ZERO */
-#define XK_Arabic_1                   0x1000661  /* U+0661 ARABIC-INDIC DIGIT ONE */
-#define XK_Arabic_2                   0x1000662  /* U+0662 ARABIC-INDIC DIGIT TWO */
-#define XK_Arabic_3                   0x1000663  /* U+0663 ARABIC-INDIC DIGIT THREE */
-#define XK_Arabic_4                   0x1000664  /* U+0664 ARABIC-INDIC DIGIT FOUR */
-#define XK_Arabic_5                   0x1000665  /* U+0665 ARABIC-INDIC DIGIT FIVE */
-#define XK_Arabic_6                   0x1000666  /* U+0666 ARABIC-INDIC DIGIT SIX */
-#define XK_Arabic_7                   0x1000667  /* U+0667 ARABIC-INDIC DIGIT SEVEN */
-#define XK_Arabic_8                   0x1000668  /* U+0668 ARABIC-INDIC DIGIT EIGHT */
-#define XK_Arabic_9                   0x1000669  /* U+0669 ARABIC-INDIC DIGIT NINE */
-#define XK_Arabic_semicolon              0x05bb  /* U+061B ARABIC SEMICOLON */
-#define XK_Arabic_question_mark          0x05bf  /* U+061F ARABIC QUESTION MARK */
-#define XK_Arabic_hamza                  0x05c1  /* U+0621 ARABIC LETTER HAMZA */
-#define XK_Arabic_maddaonalef            0x05c2  /* U+0622 ARABIC LETTER ALEF WITH MADDA ABOVE */
-#define XK_Arabic_hamzaonalef            0x05c3  /* U+0623 ARABIC LETTER ALEF WITH HAMZA ABOVE */
-#define XK_Arabic_hamzaonwaw             0x05c4  /* U+0624 ARABIC LETTER WAW WITH HAMZA ABOVE */
-#define XK_Arabic_hamzaunderalef         0x05c5  /* U+0625 ARABIC LETTER ALEF WITH HAMZA BELOW */
-#define XK_Arabic_hamzaonyeh             0x05c6  /* U+0626 ARABIC LETTER YEH WITH HAMZA ABOVE */
-#define XK_Arabic_alef                   0x05c7  /* U+0627 ARABIC LETTER ALEF */
-#define XK_Arabic_beh                    0x05c8  /* U+0628 ARABIC LETTER BEH */
-#define XK_Arabic_tehmarbuta             0x05c9  /* U+0629 ARABIC LETTER TEH MARBUTA */
-#define XK_Arabic_teh                    0x05ca  /* U+062A ARABIC LETTER TEH */
-#define XK_Arabic_theh                   0x05cb  /* U+062B ARABIC LETTER THEH */
-#define XK_Arabic_jeem                   0x05cc  /* U+062C ARABIC LETTER JEEM */
-#define XK_Arabic_hah                    0x05cd  /* U+062D ARABIC LETTER HAH */
-#define XK_Arabic_khah                   0x05ce  /* U+062E ARABIC LETTER KHAH */
-#define XK_Arabic_dal                    0x05cf  /* U+062F ARABIC LETTER DAL */
-#define XK_Arabic_thal                   0x05d0  /* U+0630 ARABIC LETTER THAL */
-#define XK_Arabic_ra                     0x05d1  /* U+0631 ARABIC LETTER REH */
-#define XK_Arabic_zain                   0x05d2  /* U+0632 ARABIC LETTER ZAIN */
-#define XK_Arabic_seen                   0x05d3  /* U+0633 ARABIC LETTER SEEN */
-#define XK_Arabic_sheen                  0x05d4  /* U+0634 ARABIC LETTER SHEEN */
-#define XK_Arabic_sad                    0x05d5  /* U+0635 ARABIC LETTER SAD */
-#define XK_Arabic_dad                    0x05d6  /* U+0636 ARABIC LETTER DAD */
-#define XK_Arabic_tah                    0x05d7  /* U+0637 ARABIC LETTER TAH */
-#define XK_Arabic_zah                    0x05d8  /* U+0638 ARABIC LETTER ZAH */
-#define XK_Arabic_ain                    0x05d9  /* U+0639 ARABIC LETTER AIN */
-#define XK_Arabic_ghain                  0x05da  /* U+063A ARABIC LETTER GHAIN */
-#define XK_Arabic_tatweel                0x05e0  /* U+0640 ARABIC TATWEEL */
-#define XK_Arabic_feh                    0x05e1  /* U+0641 ARABIC LETTER FEH */
-#define XK_Arabic_qaf                    0x05e2  /* U+0642 ARABIC LETTER QAF */
-#define XK_Arabic_kaf                    0x05e3  /* U+0643 ARABIC LETTER KAF */
-#define XK_Arabic_lam                    0x05e4  /* U+0644 ARABIC LETTER LAM */
-#define XK_Arabic_meem                   0x05e5  /* U+0645 ARABIC LETTER MEEM */
-#define XK_Arabic_noon                   0x05e6  /* U+0646 ARABIC LETTER NOON */
-#define XK_Arabic_ha                     0x05e7  /* U+0647 ARABIC LETTER HEH */
-#define XK_Arabic_heh                    0x05e7  /* deprecated */
-#define XK_Arabic_waw                    0x05e8  /* U+0648 ARABIC LETTER WAW */
-#define XK_Arabic_alefmaksura            0x05e9  /* U+0649 ARABIC LETTER ALEF MAKSURA */
-#define XK_Arabic_yeh                    0x05ea  /* U+064A ARABIC LETTER YEH */
-#define XK_Arabic_fathatan               0x05eb  /* U+064B ARABIC FATHATAN */
-#define XK_Arabic_dammatan               0x05ec  /* U+064C ARABIC DAMMATAN */
-#define XK_Arabic_kasratan               0x05ed  /* U+064D ARABIC KASRATAN */
-#define XK_Arabic_fatha                  0x05ee  /* U+064E ARABIC FATHA */
-#define XK_Arabic_damma                  0x05ef  /* U+064F ARABIC DAMMA */
-#define XK_Arabic_kasra                  0x05f0  /* U+0650 ARABIC KASRA */
-#define XK_Arabic_shadda                 0x05f1  /* U+0651 ARABIC SHADDA */
-#define XK_Arabic_sukun                  0x05f2  /* U+0652 ARABIC SUKUN */
-#define XK_Arabic_madda_above         0x1000653  /* U+0653 ARABIC MADDAH ABOVE */
-#define XK_Arabic_hamza_above         0x1000654  /* U+0654 ARABIC HAMZA ABOVE */
-#define XK_Arabic_hamza_below         0x1000655  /* U+0655 ARABIC HAMZA BELOW */
-#define XK_Arabic_jeh                 0x1000698  /* U+0698 ARABIC LETTER JEH */
-#define XK_Arabic_veh                 0x10006a4  /* U+06A4 ARABIC LETTER VEH */
-#define XK_Arabic_keheh               0x10006a9  /* U+06A9 ARABIC LETTER KEHEH */
-#define XK_Arabic_gaf                 0x10006af  /* U+06AF ARABIC LETTER GAF */
-#define XK_Arabic_noon_ghunna         0x10006ba  /* U+06BA ARABIC LETTER NOON GHUNNA */
-#define XK_Arabic_heh_doachashmee     0x10006be  /* U+06BE ARABIC LETTER HEH DOACHASHMEE */
-#define XK_Farsi_yeh                  0x10006cc  /* U+06CC ARABIC LETTER FARSI YEH */
-#define XK_Arabic_farsi_yeh           0x10006cc  /* U+06CC ARABIC LETTER FARSI YEH */
-#define XK_Arabic_yeh_baree           0x10006d2  /* U+06D2 ARABIC LETTER YEH BARREE */
-#define XK_Arabic_heh_goal            0x10006c1  /* U+06C1 ARABIC LETTER HEH GOAL */
-#define XK_Arabic_switch                 0xff7e  /* Alias for mode_switch */
-#endif /* XK_ARABIC */
-
-/*
- * Cyrillic
- * Byte 3 = 6
- */
-#ifdef XK_CYRILLIC
-#define XK_Cyrillic_GHE_bar           0x1000492  /* U+0492 CYRILLIC CAPITAL LETTER GHE WITH STROKE */
-#define XK_Cyrillic_ghe_bar           0x1000493  /* U+0493 CYRILLIC SMALL LETTER GHE WITH STROKE */
-#define XK_Cyrillic_ZHE_descender     0x1000496  /* U+0496 CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER */
-#define XK_Cyrillic_zhe_descender     0x1000497  /* U+0497 CYRILLIC SMALL LETTER ZHE WITH DESCENDER */
-#define XK_Cyrillic_KA_descender      0x100049a  /* U+049A CYRILLIC CAPITAL LETTER KA WITH DESCENDER */
-#define XK_Cyrillic_ka_descender      0x100049b  /* U+049B CYRILLIC SMALL LETTER KA WITH DESCENDER */
-#define XK_Cyrillic_KA_vertstroke     0x100049c  /* U+049C CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE */
-#define XK_Cyrillic_ka_vertstroke     0x100049d  /* U+049D CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE */
-#define XK_Cyrillic_EN_descender      0x10004a2  /* U+04A2 CYRILLIC CAPITAL LETTER EN WITH DESCENDER */
-#define XK_Cyrillic_en_descender      0x10004a3  /* U+04A3 CYRILLIC SMALL LETTER EN WITH DESCENDER */
-#define XK_Cyrillic_U_straight        0x10004ae  /* U+04AE CYRILLIC CAPITAL LETTER STRAIGHT U */
-#define XK_Cyrillic_u_straight        0x10004af  /* U+04AF CYRILLIC SMALL LETTER STRAIGHT U */
-#define XK_Cyrillic_U_straight_bar    0x10004b0  /* U+04B0 CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE */
-#define XK_Cyrillic_u_straight_bar    0x10004b1  /* U+04B1 CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE */
-#define XK_Cyrillic_HA_descender      0x10004b2  /* U+04B2 CYRILLIC CAPITAL LETTER HA WITH DESCENDER */
-#define XK_Cyrillic_ha_descender      0x10004b3  /* U+04B3 CYRILLIC SMALL LETTER HA WITH DESCENDER */
-#define XK_Cyrillic_CHE_descender     0x10004b6  /* U+04B6 CYRILLIC CAPITAL LETTER CHE WITH DESCENDER */
-#define XK_Cyrillic_che_descender     0x10004b7  /* U+04B7 CYRILLIC SMALL LETTER CHE WITH DESCENDER */
-#define XK_Cyrillic_CHE_vertstroke    0x10004b8  /* U+04B8 CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE */
-#define XK_Cyrillic_che_vertstroke    0x10004b9  /* U+04B9 CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE */
-#define XK_Cyrillic_SHHA              0x10004ba  /* U+04BA CYRILLIC CAPITAL LETTER SHHA */
-#define XK_Cyrillic_shha              0x10004bb  /* U+04BB CYRILLIC SMALL LETTER SHHA */
-
-#define XK_Cyrillic_SCHWA             0x10004d8  /* U+04D8 CYRILLIC CAPITAL LETTER SCHWA */
-#define XK_Cyrillic_schwa             0x10004d9  /* U+04D9 CYRILLIC SMALL LETTER SCHWA */
-#define XK_Cyrillic_I_macron          0x10004e2  /* U+04E2 CYRILLIC CAPITAL LETTER I WITH MACRON */
-#define XK_Cyrillic_i_macron          0x10004e3  /* U+04E3 CYRILLIC SMALL LETTER I WITH MACRON */
-#define XK_Cyrillic_O_bar             0x10004e8  /* U+04E8 CYRILLIC CAPITAL LETTER BARRED O */
-#define XK_Cyrillic_o_bar             0x10004e9  /* U+04E9 CYRILLIC SMALL LETTER BARRED O */
-#define XK_Cyrillic_U_macron          0x10004ee  /* U+04EE CYRILLIC CAPITAL LETTER U WITH MACRON */
-#define XK_Cyrillic_u_macron          0x10004ef  /* U+04EF CYRILLIC SMALL LETTER U WITH MACRON */
-
-#define XK_Serbian_dje                   0x06a1  /* U+0452 CYRILLIC SMALL LETTER DJE */
-#define XK_Macedonia_gje                 0x06a2  /* U+0453 CYRILLIC SMALL LETTER GJE */
-#define XK_Cyrillic_io                   0x06a3  /* U+0451 CYRILLIC SMALL LETTER IO */
-#define XK_Ukrainian_ie                  0x06a4  /* U+0454 CYRILLIC SMALL LETTER UKRAINIAN IE */
-#define XK_Ukranian_je                   0x06a4  /* deprecated */
-#define XK_Macedonia_dse                 0x06a5  /* U+0455 CYRILLIC SMALL LETTER DZE */
-#define XK_Ukrainian_i                   0x06a6  /* U+0456 CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
-#define XK_Ukranian_i                    0x06a6  /* deprecated */
-#define XK_Ukrainian_yi                  0x06a7  /* U+0457 CYRILLIC SMALL LETTER YI */
-#define XK_Ukranian_yi                   0x06a7  /* deprecated */
-#define XK_Cyrillic_je                   0x06a8  /* U+0458 CYRILLIC SMALL LETTER JE */
-#define XK_Serbian_je                    0x06a8  /* deprecated */
-#define XK_Cyrillic_lje                  0x06a9  /* U+0459 CYRILLIC SMALL LETTER LJE */
-#define XK_Serbian_lje                   0x06a9  /* deprecated */
-#define XK_Cyrillic_nje                  0x06aa  /* U+045A CYRILLIC SMALL LETTER NJE */
-#define XK_Serbian_nje                   0x06aa  /* deprecated */
-#define XK_Serbian_tshe                  0x06ab  /* U+045B CYRILLIC SMALL LETTER TSHE */
-#define XK_Macedonia_kje                 0x06ac  /* U+045C CYRILLIC SMALL LETTER KJE */
-#define XK_Ukrainian_ghe_with_upturn     0x06ad  /* U+0491 CYRILLIC SMALL LETTER GHE WITH UPTURN */
-#define XK_Byelorussian_shortu           0x06ae  /* U+045E CYRILLIC SMALL LETTER SHORT U */
-#define XK_Cyrillic_dzhe                 0x06af  /* U+045F CYRILLIC SMALL LETTER DZHE */
-#define XK_Serbian_dze                   0x06af  /* deprecated */
-#define XK_numerosign                    0x06b0  /* U+2116 NUMERO SIGN */
-#define XK_Serbian_DJE                   0x06b1  /* U+0402 CYRILLIC CAPITAL LETTER DJE */
-#define XK_Macedonia_GJE                 0x06b2  /* U+0403 CYRILLIC CAPITAL LETTER GJE */
-#define XK_Cyrillic_IO                   0x06b3  /* U+0401 CYRILLIC CAPITAL LETTER IO */
-#define XK_Ukrainian_IE                  0x06b4  /* U+0404 CYRILLIC CAPITAL LETTER UKRAINIAN IE */
-#define XK_Ukranian_JE                   0x06b4  /* deprecated */
-#define XK_Macedonia_DSE                 0x06b5  /* U+0405 CYRILLIC CAPITAL LETTER DZE */
-#define XK_Ukrainian_I                   0x06b6  /* U+0406 CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
-#define XK_Ukranian_I                    0x06b6  /* deprecated */
-#define XK_Ukrainian_YI                  0x06b7  /* U+0407 CYRILLIC CAPITAL LETTER YI */
-#define XK_Ukranian_YI                   0x06b7  /* deprecated */
-#define XK_Cyrillic_JE                   0x06b8  /* U+0408 CYRILLIC CAPITAL LETTER JE */
-#define XK_Serbian_JE                    0x06b8  /* deprecated */
-#define XK_Cyrillic_LJE                  0x06b9  /* U+0409 CYRILLIC CAPITAL LETTER LJE */
-#define XK_Serbian_LJE                   0x06b9  /* deprecated */
-#define XK_Cyrillic_NJE                  0x06ba  /* U+040A CYRILLIC CAPITAL LETTER NJE */
-#define XK_Serbian_NJE                   0x06ba  /* deprecated */
-#define XK_Serbian_TSHE                  0x06bb  /* U+040B CYRILLIC CAPITAL LETTER TSHE */
-#define XK_Macedonia_KJE                 0x06bc  /* U+040C CYRILLIC CAPITAL LETTER KJE */
-#define XK_Ukrainian_GHE_WITH_UPTURN     0x06bd  /* U+0490 CYRILLIC CAPITAL LETTER GHE WITH UPTURN */
-#define XK_Byelorussian_SHORTU           0x06be  /* U+040E CYRILLIC CAPITAL LETTER SHORT U */
-#define XK_Cyrillic_DZHE                 0x06bf  /* U+040F CYRILLIC CAPITAL LETTER DZHE */
-#define XK_Serbian_DZE                   0x06bf  /* deprecated */
-#define XK_Cyrillic_yu                   0x06c0  /* U+044E CYRILLIC SMALL LETTER YU */
-#define XK_Cyrillic_a                    0x06c1  /* U+0430 CYRILLIC SMALL LETTER A */
-#define XK_Cyrillic_be                   0x06c2  /* U+0431 CYRILLIC SMALL LETTER BE */
-#define XK_Cyrillic_tse                  0x06c3  /* U+0446 CYRILLIC SMALL LETTER TSE */
-#define XK_Cyrillic_de                   0x06c4  /* U+0434 CYRILLIC SMALL LETTER DE */
-#define XK_Cyrillic_ie                   0x06c5  /* U+0435 CYRILLIC SMALL LETTER IE */
-#define XK_Cyrillic_ef                   0x06c6  /* U+0444 CYRILLIC SMALL LETTER EF */
-#define XK_Cyrillic_ghe                  0x06c7  /* U+0433 CYRILLIC SMALL LETTER GHE */
-#define XK_Cyrillic_ha                   0x06c8  /* U+0445 CYRILLIC SMALL LETTER HA */
-#define XK_Cyrillic_i                    0x06c9  /* U+0438 CYRILLIC SMALL LETTER I */
-#define XK_Cyrillic_shorti               0x06ca  /* U+0439 CYRILLIC SMALL LETTER SHORT I */
-#define XK_Cyrillic_ka                   0x06cb  /* U+043A CYRILLIC SMALL LETTER KA */
-#define XK_Cyrillic_el                   0x06cc  /* U+043B CYRILLIC SMALL LETTER EL */
-#define XK_Cyrillic_em                   0x06cd  /* U+043C CYRILLIC SMALL LETTER EM */
-#define XK_Cyrillic_en                   0x06ce  /* U+043D CYRILLIC SMALL LETTER EN */
-#define XK_Cyrillic_o                    0x06cf  /* U+043E CYRILLIC SMALL LETTER O */
-#define XK_Cyrillic_pe                   0x06d0  /* U+043F CYRILLIC SMALL LETTER PE */
-#define XK_Cyrillic_ya                   0x06d1  /* U+044F CYRILLIC SMALL LETTER YA */
-#define XK_Cyrillic_er                   0x06d2  /* U+0440 CYRILLIC SMALL LETTER ER */
-#define XK_Cyrillic_es                   0x06d3  /* U+0441 CYRILLIC SMALL LETTER ES */
-#define XK_Cyrillic_te                   0x06d4  /* U+0442 CYRILLIC SMALL LETTER TE */
-#define XK_Cyrillic_u                    0x06d5  /* U+0443 CYRILLIC SMALL LETTER U */
-#define XK_Cyrillic_zhe                  0x06d6  /* U+0436 CYRILLIC SMALL LETTER ZHE */
-#define XK_Cyrillic_ve                   0x06d7  /* U+0432 CYRILLIC SMALL LETTER VE */
-#define XK_Cyrillic_softsign             0x06d8  /* U+044C CYRILLIC SMALL LETTER SOFT SIGN */
-#define XK_Cyrillic_yeru                 0x06d9  /* U+044B CYRILLIC SMALL LETTER YERU */
-#define XK_Cyrillic_ze                   0x06da  /* U+0437 CYRILLIC SMALL LETTER ZE */
-#define XK_Cyrillic_sha                  0x06db  /* U+0448 CYRILLIC SMALL LETTER SHA */
-#define XK_Cyrillic_e                    0x06dc  /* U+044D CYRILLIC SMALL LETTER E */
-#define XK_Cyrillic_shcha                0x06dd  /* U+0449 CYRILLIC SMALL LETTER SHCHA */
-#define XK_Cyrillic_che                  0x06de  /* U+0447 CYRILLIC SMALL LETTER CHE */
-#define XK_Cyrillic_hardsign             0x06df  /* U+044A CYRILLIC SMALL LETTER HARD SIGN */
-#define XK_Cyrillic_YU                   0x06e0  /* U+042E CYRILLIC CAPITAL LETTER YU */
-#define XK_Cyrillic_A                    0x06e1  /* U+0410 CYRILLIC CAPITAL LETTER A */
-#define XK_Cyrillic_BE                   0x06e2  /* U+0411 CYRILLIC CAPITAL LETTER BE */
-#define XK_Cyrillic_TSE                  0x06e3  /* U+0426 CYRILLIC CAPITAL LETTER TSE */
-#define XK_Cyrillic_DE                   0x06e4  /* U+0414 CYRILLIC CAPITAL LETTER DE */
-#define XK_Cyrillic_IE                   0x06e5  /* U+0415 CYRILLIC CAPITAL LETTER IE */
-#define XK_Cyrillic_EF                   0x06e6  /* U+0424 CYRILLIC CAPITAL LETTER EF */
-#define XK_Cyrillic_GHE                  0x06e7  /* U+0413 CYRILLIC CAPITAL LETTER GHE */
-#define XK_Cyrillic_HA                   0x06e8  /* U+0425 CYRILLIC CAPITAL LETTER HA */
-#define XK_Cyrillic_I                    0x06e9  /* U+0418 CYRILLIC CAPITAL LETTER I */
-#define XK_Cyrillic_SHORTI               0x06ea  /* U+0419 CYRILLIC CAPITAL LETTER SHORT I */
-#define XK_Cyrillic_KA                   0x06eb  /* U+041A CYRILLIC CAPITAL LETTER KA */
-#define XK_Cyrillic_EL                   0x06ec  /* U+041B CYRILLIC CAPITAL LETTER EL */
-#define XK_Cyrillic_EM                   0x06ed  /* U+041C CYRILLIC CAPITAL LETTER EM */
-#define XK_Cyrillic_EN                   0x06ee  /* U+041D CYRILLIC CAPITAL LETTER EN */
-#define XK_Cyrillic_O                    0x06ef  /* U+041E CYRILLIC CAPITAL LETTER O */
-#define XK_Cyrillic_PE                   0x06f0  /* U+041F CYRILLIC CAPITAL LETTER PE */
-#define XK_Cyrillic_YA                   0x06f1  /* U+042F CYRILLIC CAPITAL LETTER YA */
-#define XK_Cyrillic_ER                   0x06f2  /* U+0420 CYRILLIC CAPITAL LETTER ER */
-#define XK_Cyrillic_ES                   0x06f3  /* U+0421 CYRILLIC CAPITAL LETTER ES */
-#define XK_Cyrillic_TE                   0x06f4  /* U+0422 CYRILLIC CAPITAL LETTER TE */
-#define XK_Cyrillic_U                    0x06f5  /* U+0423 CYRILLIC CAPITAL LETTER U */
-#define XK_Cyrillic_ZHE                  0x06f6  /* U+0416 CYRILLIC CAPITAL LETTER ZHE */
-#define XK_Cyrillic_VE                   0x06f7  /* U+0412 CYRILLIC CAPITAL LETTER VE */
-#define XK_Cyrillic_SOFTSIGN             0x06f8  /* U+042C CYRILLIC CAPITAL LETTER SOFT SIGN */
-#define XK_Cyrillic_YERU                 0x06f9  /* U+042B CYRILLIC CAPITAL LETTER YERU */
-#define XK_Cyrillic_ZE                   0x06fa  /* U+0417 CYRILLIC CAPITAL LETTER ZE */
-#define XK_Cyrillic_SHA                  0x06fb  /* U+0428 CYRILLIC CAPITAL LETTER SHA */
-#define XK_Cyrillic_E                    0x06fc  /* U+042D CYRILLIC CAPITAL LETTER E */
-#define XK_Cyrillic_SHCHA                0x06fd  /* U+0429 CYRILLIC CAPITAL LETTER SHCHA */
-#define XK_Cyrillic_CHE                  0x06fe  /* U+0427 CYRILLIC CAPITAL LETTER CHE */
-#define XK_Cyrillic_HARDSIGN             0x06ff  /* U+042A CYRILLIC CAPITAL LETTER HARD SIGN */
-#endif /* XK_CYRILLIC */
-
-/*
- * Greek
- * (based on an early draft of, and not quite identical to, ISO/IEC 8859-7)
- * Byte 3 = 7
- */
-
-#ifdef XK_GREEK
-#define XK_Greek_ALPHAaccent             0x07a1  /* U+0386 GREEK CAPITAL LETTER ALPHA WITH TONOS */
-#define XK_Greek_EPSILONaccent           0x07a2  /* U+0388 GREEK CAPITAL LETTER EPSILON WITH TONOS */
-#define XK_Greek_ETAaccent               0x07a3  /* U+0389 GREEK CAPITAL LETTER ETA WITH TONOS */
-#define XK_Greek_IOTAaccent              0x07a4  /* U+038A GREEK CAPITAL LETTER IOTA WITH TONOS */
-#define XK_Greek_IOTAdieresis            0x07a5  /* U+03AA GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
-#define XK_Greek_IOTAdiaeresis           0x07a5  /* old typo */
-#define XK_Greek_OMICRONaccent           0x07a7  /* U+038C GREEK CAPITAL LETTER OMICRON WITH TONOS */
-#define XK_Greek_UPSILONaccent           0x07a8  /* U+038E GREEK CAPITAL LETTER UPSILON WITH TONOS */
-#define XK_Greek_UPSILONdieresis         0x07a9  /* U+03AB GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
-#define XK_Greek_OMEGAaccent             0x07ab  /* U+038F GREEK CAPITAL LETTER OMEGA WITH TONOS */
-#define XK_Greek_accentdieresis          0x07ae  /* U+0385 GREEK DIALYTIKA TONOS */
-#define XK_Greek_horizbar                0x07af  /* U+2015 HORIZONTAL BAR */
-#define XK_Greek_alphaaccent             0x07b1  /* U+03AC GREEK SMALL LETTER ALPHA WITH TONOS */
-#define XK_Greek_epsilonaccent           0x07b2  /* U+03AD GREEK SMALL LETTER EPSILON WITH TONOS */
-#define XK_Greek_etaaccent               0x07b3  /* U+03AE GREEK SMALL LETTER ETA WITH TONOS */
-#define XK_Greek_iotaaccent              0x07b4  /* U+03AF GREEK SMALL LETTER IOTA WITH TONOS */
-#define XK_Greek_iotadieresis            0x07b5  /* U+03CA GREEK SMALL LETTER IOTA WITH DIALYTIKA */
-#define XK_Greek_iotaaccentdieresis      0x07b6  /* U+0390 GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
-#define XK_Greek_omicronaccent           0x07b7  /* U+03CC GREEK SMALL LETTER OMICRON WITH TONOS */
-#define XK_Greek_upsilonaccent           0x07b8  /* U+03CD GREEK SMALL LETTER UPSILON WITH TONOS */
-#define XK_Greek_upsilondieresis         0x07b9  /* U+03CB GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
-#define XK_Greek_upsilonaccentdieresis   0x07ba  /* U+03B0 GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
-#define XK_Greek_omegaaccent             0x07bb  /* U+03CE GREEK SMALL LETTER OMEGA WITH TONOS */
-#define XK_Greek_ALPHA                   0x07c1  /* U+0391 GREEK CAPITAL LETTER ALPHA */
-#define XK_Greek_BETA                    0x07c2  /* U+0392 GREEK CAPITAL LETTER BETA */
-#define XK_Greek_GAMMA                   0x07c3  /* U+0393 GREEK CAPITAL LETTER GAMMA */
-#define XK_Greek_DELTA                   0x07c4  /* U+0394 GREEK CAPITAL LETTER DELTA */
-#define XK_Greek_EPSILON                 0x07c5  /* U+0395 GREEK CAPITAL LETTER EPSILON */
-#define XK_Greek_ZETA                    0x07c6  /* U+0396 GREEK CAPITAL LETTER ZETA */
-#define XK_Greek_ETA                     0x07c7  /* U+0397 GREEK CAPITAL LETTER ETA */
-#define XK_Greek_THETA                   0x07c8  /* U+0398 GREEK CAPITAL LETTER THETA */
-#define XK_Greek_IOTA                    0x07c9  /* U+0399 GREEK CAPITAL LETTER IOTA */
-#define XK_Greek_KAPPA                   0x07ca  /* U+039A GREEK CAPITAL LETTER KAPPA */
-#define XK_Greek_LAMDA                   0x07cb  /* U+039B GREEK CAPITAL LETTER LAMDA */
-#define XK_Greek_LAMBDA                  0x07cb  /* U+039B GREEK CAPITAL LETTER LAMDA */
-#define XK_Greek_MU                      0x07cc  /* U+039C GREEK CAPITAL LETTER MU */
-#define XK_Greek_NU                      0x07cd  /* U+039D GREEK CAPITAL LETTER NU */
-#define XK_Greek_XI                      0x07ce  /* U+039E GREEK CAPITAL LETTER XI */
-#define XK_Greek_OMICRON                 0x07cf  /* U+039F GREEK CAPITAL LETTER OMICRON */
-#define XK_Greek_PI                      0x07d0  /* U+03A0 GREEK CAPITAL LETTER PI */
-#define XK_Greek_RHO                     0x07d1  /* U+03A1 GREEK CAPITAL LETTER RHO */
-#define XK_Greek_SIGMA                   0x07d2  /* U+03A3 GREEK CAPITAL LETTER SIGMA */
-#define XK_Greek_TAU                     0x07d4  /* U+03A4 GREEK CAPITAL LETTER TAU */
-#define XK_Greek_UPSILON                 0x07d5  /* U+03A5 GREEK CAPITAL LETTER UPSILON */
-#define XK_Greek_PHI                     0x07d6  /* U+03A6 GREEK CAPITAL LETTER PHI */
-#define XK_Greek_CHI                     0x07d7  /* U+03A7 GREEK CAPITAL LETTER CHI */
-#define XK_Greek_PSI                     0x07d8  /* U+03A8 GREEK CAPITAL LETTER PSI */
-#define XK_Greek_OMEGA                   0x07d9  /* U+03A9 GREEK CAPITAL LETTER OMEGA */
-#define XK_Greek_alpha                   0x07e1  /* U+03B1 GREEK SMALL LETTER ALPHA */
-#define XK_Greek_beta                    0x07e2  /* U+03B2 GREEK SMALL LETTER BETA */
-#define XK_Greek_gamma                   0x07e3  /* U+03B3 GREEK SMALL LETTER GAMMA */
-#define XK_Greek_delta                   0x07e4  /* U+03B4 GREEK SMALL LETTER DELTA */
-#define XK_Greek_epsilon                 0x07e5  /* U+03B5 GREEK SMALL LETTER EPSILON */
-#define XK_Greek_zeta                    0x07e6  /* U+03B6 GREEK SMALL LETTER ZETA */
-#define XK_Greek_eta                     0x07e7  /* U+03B7 GREEK SMALL LETTER ETA */
-#define XK_Greek_theta                   0x07e8  /* U+03B8 GREEK SMALL LETTER THETA */
-#define XK_Greek_iota                    0x07e9  /* U+03B9 GREEK SMALL LETTER IOTA */
-#define XK_Greek_kappa                   0x07ea  /* U+03BA GREEK SMALL LETTER KAPPA */
-#define XK_Greek_lamda                   0x07eb  /* U+03BB GREEK SMALL LETTER LAMDA */
-#define XK_Greek_lambda                  0x07eb  /* U+03BB GREEK SMALL LETTER LAMDA */
-#define XK_Greek_mu                      0x07ec  /* U+03BC GREEK SMALL LETTER MU */
-#define XK_Greek_nu                      0x07ed  /* U+03BD GREEK SMALL LETTER NU */
-#define XK_Greek_xi                      0x07ee  /* U+03BE GREEK SMALL LETTER XI */
-#define XK_Greek_omicron                 0x07ef  /* U+03BF GREEK SMALL LETTER OMICRON */
-#define XK_Greek_pi                      0x07f0  /* U+03C0 GREEK SMALL LETTER PI */
-#define XK_Greek_rho                     0x07f1  /* U+03C1 GREEK SMALL LETTER RHO */
-#define XK_Greek_sigma                   0x07f2  /* U+03C3 GREEK SMALL LETTER SIGMA */
-#define XK_Greek_finalsmallsigma         0x07f3  /* U+03C2 GREEK SMALL LETTER FINAL SIGMA */
-#define XK_Greek_tau                     0x07f4  /* U+03C4 GREEK SMALL LETTER TAU */
-#define XK_Greek_upsilon                 0x07f5  /* U+03C5 GREEK SMALL LETTER UPSILON */
-#define XK_Greek_phi                     0x07f6  /* U+03C6 GREEK SMALL LETTER PHI */
-#define XK_Greek_chi                     0x07f7  /* U+03C7 GREEK SMALL LETTER CHI */
-#define XK_Greek_psi                     0x07f8  /* U+03C8 GREEK SMALL LETTER PSI */
-#define XK_Greek_omega                   0x07f9  /* U+03C9 GREEK SMALL LETTER OMEGA */
-#define XK_Greek_switch                  0xff7e  /* Alias for mode_switch */
-#endif /* XK_GREEK */
-
-/*
- * Technical
- * (from the DEC VT330/VT420 Technical Character Set, http://vt100.net/charsets/technical.html)
- * Byte 3 = 8
- */
-
-#ifdef XK_TECHNICAL
-#define XK_leftradical                   0x08a1  /* U+23B7 RADICAL SYMBOL BOTTOM */
-#define XK_topleftradical                0x08a2  /*(U+250C BOX DRAWINGS LIGHT DOWN AND RIGHT)*/
-#define XK_horizconnector                0x08a3  /*(U+2500 BOX DRAWINGS LIGHT HORIZONTAL)*/
-#define XK_topintegral                   0x08a4  /* U+2320 TOP HALF INTEGRAL */
-#define XK_botintegral                   0x08a5  /* U+2321 BOTTOM HALF INTEGRAL */
-#define XK_vertconnector                 0x08a6  /*(U+2502 BOX DRAWINGS LIGHT VERTICAL)*/
-#define XK_topleftsqbracket              0x08a7  /* U+23A1 LEFT SQUARE BRACKET UPPER CORNER */
-#define XK_botleftsqbracket              0x08a8  /* U+23A3 LEFT SQUARE BRACKET LOWER CORNER */
-#define XK_toprightsqbracket             0x08a9  /* U+23A4 RIGHT SQUARE BRACKET UPPER CORNER */
-#define XK_botrightsqbracket             0x08aa  /* U+23A6 RIGHT SQUARE BRACKET LOWER CORNER */
-#define XK_topleftparens                 0x08ab  /* U+239B LEFT PARENTHESIS UPPER HOOK */
-#define XK_botleftparens                 0x08ac  /* U+239D LEFT PARENTHESIS LOWER HOOK */
-#define XK_toprightparens                0x08ad  /* U+239E RIGHT PARENTHESIS UPPER HOOK */
-#define XK_botrightparens                0x08ae  /* U+23A0 RIGHT PARENTHESIS LOWER HOOK */
-#define XK_leftmiddlecurlybrace          0x08af  /* U+23A8 LEFT CURLY BRACKET MIDDLE PIECE */
-#define XK_rightmiddlecurlybrace         0x08b0  /* U+23AC RIGHT CURLY BRACKET MIDDLE PIECE */
-#define XK_topleftsummation              0x08b1
-#define XK_botleftsummation              0x08b2
-#define XK_topvertsummationconnector     0x08b3
-#define XK_botvertsummationconnector     0x08b4
-#define XK_toprightsummation             0x08b5
-#define XK_botrightsummation             0x08b6
-#define XK_rightmiddlesummation          0x08b7
-#define XK_lessthanequal                 0x08bc  /* U+2264 LESS-THAN OR EQUAL TO */
-#define XK_notequal                      0x08bd  /* U+2260 NOT EQUAL TO */
-#define XK_greaterthanequal              0x08be  /* U+2265 GREATER-THAN OR EQUAL TO */
-#define XK_integral                      0x08bf  /* U+222B INTEGRAL */
-#define XK_therefore                     0x08c0  /* U+2234 THEREFORE */
-#define XK_variation                     0x08c1  /* U+221D PROPORTIONAL TO */
-#define XK_infinity                      0x08c2  /* U+221E INFINITY */
-#define XK_nabla                         0x08c5  /* U+2207 NABLA */
-#define XK_approximate                   0x08c8  /* U+223C TILDE OPERATOR */
-#define XK_similarequal                  0x08c9  /* U+2243 ASYMPTOTICALLY EQUAL TO */
-#define XK_ifonlyif                      0x08cd  /* U+21D4 LEFT RIGHT DOUBLE ARROW */
-#define XK_implies                       0x08ce  /* U+21D2 RIGHTWARDS DOUBLE ARROW */
-#define XK_identical                     0x08cf  /* U+2261 IDENTICAL TO */
-#define XK_radical                       0x08d6  /* U+221A SQUARE ROOT */
-#define XK_includedin                    0x08da  /* U+2282 SUBSET OF */
-#define XK_includes                      0x08db  /* U+2283 SUPERSET OF */
-#define XK_intersection                  0x08dc  /* U+2229 INTERSECTION */
-#define XK_union                         0x08dd  /* U+222A UNION */
-#define XK_logicaland                    0x08de  /* U+2227 LOGICAL AND */
-#define XK_logicalor                     0x08df  /* U+2228 LOGICAL OR */
-#define XK_partialderivative             0x08ef  /* U+2202 PARTIAL DIFFERENTIAL */
-#define XK_function                      0x08f6  /* U+0192 LATIN SMALL LETTER F WITH HOOK */
-#define XK_leftarrow                     0x08fb  /* U+2190 LEFTWARDS ARROW */
-#define XK_uparrow                       0x08fc  /* U+2191 UPWARDS ARROW */
-#define XK_rightarrow                    0x08fd  /* U+2192 RIGHTWARDS ARROW */
-#define XK_downarrow                     0x08fe  /* U+2193 DOWNWARDS ARROW */
-#endif /* XK_TECHNICAL */
-
-/*
- * Special
- * (from the DEC VT100 Special Graphics Character Set)
- * Byte 3 = 9
- */
-
-#ifdef XK_SPECIAL
-#define XK_blank                         0x09df
-#define XK_soliddiamond                  0x09e0  /* U+25C6 BLACK DIAMOND */
-#define XK_checkerboard                  0x09e1  /* U+2592 MEDIUM SHADE */
-#define XK_ht                            0x09e2  /* U+2409 SYMBOL FOR HORIZONTAL TABULATION */
-#define XK_ff                            0x09e3  /* U+240C SYMBOL FOR FORM FEED */
-#define XK_cr                            0x09e4  /* U+240D SYMBOL FOR CARRIAGE RETURN */
-#define XK_lf                            0x09e5  /* U+240A SYMBOL FOR LINE FEED */
-#define XK_nl                            0x09e8  /* U+2424 SYMBOL FOR NEWLINE */
-#define XK_vt                            0x09e9  /* U+240B SYMBOL FOR VERTICAL TABULATION */
-#define XK_lowrightcorner                0x09ea  /* U+2518 BOX DRAWINGS LIGHT UP AND LEFT */
-#define XK_uprightcorner                 0x09eb  /* U+2510 BOX DRAWINGS LIGHT DOWN AND LEFT */
-#define XK_upleftcorner                  0x09ec  /* U+250C BOX DRAWINGS LIGHT DOWN AND RIGHT */
-#define XK_lowleftcorner                 0x09ed  /* U+2514 BOX DRAWINGS LIGHT UP AND RIGHT */
-#define XK_crossinglines                 0x09ee  /* U+253C BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
-#define XK_horizlinescan1                0x09ef  /* U+23BA HORIZONTAL SCAN LINE-1 */
-#define XK_horizlinescan3                0x09f0  /* U+23BB HORIZONTAL SCAN LINE-3 */
-#define XK_horizlinescan5                0x09f1  /* U+2500 BOX DRAWINGS LIGHT HORIZONTAL */
-#define XK_horizlinescan7                0x09f2  /* U+23BC HORIZONTAL SCAN LINE-7 */
-#define XK_horizlinescan9                0x09f3  /* U+23BD HORIZONTAL SCAN LINE-9 */
-#define XK_leftt                         0x09f4  /* U+251C BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
-#define XK_rightt                        0x09f5  /* U+2524 BOX DRAWINGS LIGHT VERTICAL AND LEFT */
-#define XK_bott                          0x09f6  /* U+2534 BOX DRAWINGS LIGHT UP AND HORIZONTAL */
-#define XK_topt                          0x09f7  /* U+252C BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
-#define XK_vertbar                       0x09f8  /* U+2502 BOX DRAWINGS LIGHT VERTICAL */
-#endif /* XK_SPECIAL */
-
-/*
- * Publishing
- * (these are probably from a long forgotten DEC Publishing
- * font that once shipped with DECwrite)
- * Byte 3 = 0x0a
- */
-
-#ifdef XK_PUBLISHING
-#define XK_emspace                       0x0aa1  /* U+2003 EM SPACE */
-#define XK_enspace                       0x0aa2  /* U+2002 EN SPACE */
-#define XK_em3space                      0x0aa3  /* U+2004 THREE-PER-EM SPACE */
-#define XK_em4space                      0x0aa4  /* U+2005 FOUR-PER-EM SPACE */
-#define XK_digitspace                    0x0aa5  /* U+2007 FIGURE SPACE */
-#define XK_punctspace                    0x0aa6  /* U+2008 PUNCTUATION SPACE */
-#define XK_thinspace                     0x0aa7  /* U+2009 THIN SPACE */
-#define XK_hairspace                     0x0aa8  /* U+200A HAIR SPACE */
-#define XK_emdash                        0x0aa9  /* U+2014 EM DASH */
-#define XK_endash                        0x0aaa  /* U+2013 EN DASH */
-#define XK_signifblank                   0x0aac  /*(U+2423 OPEN BOX)*/
-#define XK_ellipsis                      0x0aae  /* U+2026 HORIZONTAL ELLIPSIS */
-#define XK_doubbaselinedot               0x0aaf  /* U+2025 TWO DOT LEADER */
-#define XK_onethird                      0x0ab0  /* U+2153 VULGAR FRACTION ONE THIRD */
-#define XK_twothirds                     0x0ab1  /* U+2154 VULGAR FRACTION TWO THIRDS */
-#define XK_onefifth                      0x0ab2  /* U+2155 VULGAR FRACTION ONE FIFTH */
-#define XK_twofifths                     0x0ab3  /* U+2156 VULGAR FRACTION TWO FIFTHS */
-#define XK_threefifths                   0x0ab4  /* U+2157 VULGAR FRACTION THREE FIFTHS */
-#define XK_fourfifths                    0x0ab5  /* U+2158 VULGAR FRACTION FOUR FIFTHS */
-#define XK_onesixth                      0x0ab6  /* U+2159 VULGAR FRACTION ONE SIXTH */
-#define XK_fivesixths                    0x0ab7  /* U+215A VULGAR FRACTION FIVE SIXTHS */
-#define XK_careof                        0x0ab8  /* U+2105 CARE OF */
-#define XK_figdash                       0x0abb  /* U+2012 FIGURE DASH */
-#define XK_leftanglebracket              0x0abc  /*(U+27E8 MATHEMATICAL LEFT ANGLE BRACKET)*/
-#define XK_decimalpoint                  0x0abd  /*(U+002E FULL STOP)*/
-#define XK_rightanglebracket             0x0abe  /*(U+27E9 MATHEMATICAL RIGHT ANGLE BRACKET)*/
-#define XK_marker                        0x0abf
-#define XK_oneeighth                     0x0ac3  /* U+215B VULGAR FRACTION ONE EIGHTH */
-#define XK_threeeighths                  0x0ac4  /* U+215C VULGAR FRACTION THREE EIGHTHS */
-#define XK_fiveeighths                   0x0ac5  /* U+215D VULGAR FRACTION FIVE EIGHTHS */
-#define XK_seveneighths                  0x0ac6  /* U+215E VULGAR FRACTION SEVEN EIGHTHS */
-#define XK_trademark                     0x0ac9  /* U+2122 TRADE MARK SIGN */
-#define XK_signaturemark                 0x0aca  /*(U+2613 SALTIRE)*/
-#define XK_trademarkincircle             0x0acb
-#define XK_leftopentriangle              0x0acc  /*(U+25C1 WHITE LEFT-POINTING TRIANGLE)*/
-#define XK_rightopentriangle             0x0acd  /*(U+25B7 WHITE RIGHT-POINTING TRIANGLE)*/
-#define XK_emopencircle                  0x0ace  /*(U+25CB WHITE CIRCLE)*/
-#define XK_emopenrectangle               0x0acf  /*(U+25AF WHITE VERTICAL RECTANGLE)*/
-#define XK_leftsinglequotemark           0x0ad0  /* U+2018 LEFT SINGLE QUOTATION MARK */
-#define XK_rightsinglequotemark          0x0ad1  /* U+2019 RIGHT SINGLE QUOTATION MARK */
-#define XK_leftdoublequotemark           0x0ad2  /* U+201C LEFT DOUBLE QUOTATION MARK */
-#define XK_rightdoublequotemark          0x0ad3  /* U+201D RIGHT DOUBLE QUOTATION MARK */
-#define XK_prescription                  0x0ad4  /* U+211E PRESCRIPTION TAKE */
-#define XK_permille                      0x0ad5  /* U+2030 PER MILLE SIGN */
-#define XK_minutes                       0x0ad6  /* U+2032 PRIME */
-#define XK_seconds                       0x0ad7  /* U+2033 DOUBLE PRIME */
-#define XK_latincross                    0x0ad9  /* U+271D LATIN CROSS */
-#define XK_hexagram                      0x0ada
-#define XK_filledrectbullet              0x0adb  /*(U+25AC BLACK RECTANGLE)*/
-#define XK_filledlefttribullet           0x0adc  /*(U+25C0 BLACK LEFT-POINTING TRIANGLE)*/
-#define XK_filledrighttribullet          0x0add  /*(U+25B6 BLACK RIGHT-POINTING TRIANGLE)*/
-#define XK_emfilledcircle                0x0ade  /*(U+25CF BLACK CIRCLE)*/
-#define XK_emfilledrect                  0x0adf  /*(U+25AE BLACK VERTICAL RECTANGLE)*/
-#define XK_enopencircbullet              0x0ae0  /*(U+25E6 WHITE BULLET)*/
-#define XK_enopensquarebullet            0x0ae1  /*(U+25AB WHITE SMALL SQUARE)*/
-#define XK_openrectbullet                0x0ae2  /*(U+25AD WHITE RECTANGLE)*/
-#define XK_opentribulletup               0x0ae3  /*(U+25B3 WHITE UP-POINTING TRIANGLE)*/
-#define XK_opentribulletdown             0x0ae4  /*(U+25BD WHITE DOWN-POINTING TRIANGLE)*/
-#define XK_openstar                      0x0ae5  /*(U+2606 WHITE STAR)*/
-#define XK_enfilledcircbullet            0x0ae6  /*(U+2022 BULLET)*/
-#define XK_enfilledsqbullet              0x0ae7  /*(U+25AA BLACK SMALL SQUARE)*/
-#define XK_filledtribulletup             0x0ae8  /*(U+25B2 BLACK UP-POINTING TRIANGLE)*/
-#define XK_filledtribulletdown           0x0ae9  /*(U+25BC BLACK DOWN-POINTING TRIANGLE)*/
-#define XK_leftpointer                   0x0aea  /*(U+261C WHITE LEFT POINTING INDEX)*/
-#define XK_rightpointer                  0x0aeb  /*(U+261E WHITE RIGHT POINTING INDEX)*/
-#define XK_club                          0x0aec  /* U+2663 BLACK CLUB SUIT */
-#define XK_diamond                       0x0aed  /* U+2666 BLACK DIAMOND SUIT */
-#define XK_heart                         0x0aee  /* U+2665 BLACK HEART SUIT */
-#define XK_maltesecross                  0x0af0  /* U+2720 MALTESE CROSS */
-#define XK_dagger                        0x0af1  /* U+2020 DAGGER */
-#define XK_doubledagger                  0x0af2  /* U+2021 DOUBLE DAGGER */
-#define XK_checkmark                     0x0af3  /* U+2713 CHECK MARK */
-#define XK_ballotcross                   0x0af4  /* U+2717 BALLOT X */
-#define XK_musicalsharp                  0x0af5  /* U+266F MUSIC SHARP SIGN */
-#define XK_musicalflat                   0x0af6  /* U+266D MUSIC FLAT SIGN */
-#define XK_malesymbol                    0x0af7  /* U+2642 MALE SIGN */
-#define XK_femalesymbol                  0x0af8  /* U+2640 FEMALE SIGN */
-#define XK_telephone                     0x0af9  /* U+260E BLACK TELEPHONE */
-#define XK_telephonerecorder             0x0afa  /* U+2315 TELEPHONE RECORDER */
-#define XK_phonographcopyright           0x0afb  /* U+2117 SOUND RECORDING COPYRIGHT */
-#define XK_caret                         0x0afc  /* U+2038 CARET */
-#define XK_singlelowquotemark            0x0afd  /* U+201A SINGLE LOW-9 QUOTATION MARK */
-#define XK_doublelowquotemark            0x0afe  /* U+201E DOUBLE LOW-9 QUOTATION MARK */
-#define XK_cursor                        0x0aff
-#endif /* XK_PUBLISHING */
-
-/*
- * APL
- * Byte 3 = 0x0b
- */
-
-#ifdef XK_APL
-#define XK_leftcaret                     0x0ba3  /*(U+003C LESS-THAN SIGN)*/
-#define XK_rightcaret                    0x0ba6  /*(U+003E GREATER-THAN SIGN)*/
-#define XK_downcaret                     0x0ba8  /*(U+2228 LOGICAL OR)*/
-#define XK_upcaret                       0x0ba9  /*(U+2227 LOGICAL AND)*/
-#define XK_overbar                       0x0bc0  /*(U+00AF MACRON)*/
-#define XK_downtack                      0x0bc2  /* U+22A4 DOWN TACK */
-#define XK_upshoe                        0x0bc3  /*(U+2229 INTERSECTION)*/
-#define XK_downstile                     0x0bc4  /* U+230A LEFT FLOOR */
-#define XK_underbar                      0x0bc6  /*(U+005F LOW LINE)*/
-#define XK_jot                           0x0bca  /* U+2218 RING OPERATOR */
-#define XK_quad                          0x0bcc  /* U+2395 APL FUNCTIONAL SYMBOL QUAD */
-#define XK_uptack                        0x0bce  /* U+22A5 UP TACK */
-#define XK_circle                        0x0bcf  /* U+25CB WHITE CIRCLE */
-#define XK_upstile                       0x0bd3  /* U+2308 LEFT CEILING */
-#define XK_downshoe                      0x0bd6  /*(U+222A UNION)*/
-#define XK_rightshoe                     0x0bd8  /*(U+2283 SUPERSET OF)*/
-#define XK_leftshoe                      0x0bda  /*(U+2282 SUBSET OF)*/
-#define XK_lefttack                      0x0bdc  /* U+22A3 LEFT TACK */
-#define XK_righttack                     0x0bfc  /* U+22A2 RIGHT TACK */
-#endif /* XK_APL */
-
-/*
- * Hebrew
- * Byte 3 = 0x0c
- */
-
-#ifdef XK_HEBREW
-#define XK_hebrew_doublelowline          0x0cdf  /* U+2017 DOUBLE LOW LINE */
-#define XK_hebrew_aleph                  0x0ce0  /* U+05D0 HEBREW LETTER ALEF */
-#define XK_hebrew_bet                    0x0ce1  /* U+05D1 HEBREW LETTER BET */
-#define XK_hebrew_beth                   0x0ce1  /* deprecated */
-#define XK_hebrew_gimel                  0x0ce2  /* U+05D2 HEBREW LETTER GIMEL */
-#define XK_hebrew_gimmel                 0x0ce2  /* deprecated */
-#define XK_hebrew_dalet                  0x0ce3  /* U+05D3 HEBREW LETTER DALET */
-#define XK_hebrew_daleth                 0x0ce3  /* deprecated */
-#define XK_hebrew_he                     0x0ce4  /* U+05D4 HEBREW LETTER HE */
-#define XK_hebrew_waw                    0x0ce5  /* U+05D5 HEBREW LETTER VAV */
-#define XK_hebrew_zain                   0x0ce6  /* U+05D6 HEBREW LETTER ZAYIN */
-#define XK_hebrew_zayin                  0x0ce6  /* deprecated */
-#define XK_hebrew_chet                   0x0ce7  /* U+05D7 HEBREW LETTER HET */
-#define XK_hebrew_het                    0x0ce7  /* deprecated */
-#define XK_hebrew_tet                    0x0ce8  /* U+05D8 HEBREW LETTER TET */
-#define XK_hebrew_teth                   0x0ce8  /* deprecated */
-#define XK_hebrew_yod                    0x0ce9  /* U+05D9 HEBREW LETTER YOD */
-#define XK_hebrew_finalkaph              0x0cea  /* U+05DA HEBREW LETTER FINAL KAF */
-#define XK_hebrew_kaph                   0x0ceb  /* U+05DB HEBREW LETTER KAF */
-#define XK_hebrew_lamed                  0x0cec  /* U+05DC HEBREW LETTER LAMED */
-#define XK_hebrew_finalmem               0x0ced  /* U+05DD HEBREW LETTER FINAL MEM */
-#define XK_hebrew_mem                    0x0cee  /* U+05DE HEBREW LETTER MEM */
-#define XK_hebrew_finalnun               0x0cef  /* U+05DF HEBREW LETTER FINAL NUN */
-#define XK_hebrew_nun                    0x0cf0  /* U+05E0 HEBREW LETTER NUN */
-#define XK_hebrew_samech                 0x0cf1  /* U+05E1 HEBREW LETTER SAMEKH */
-#define XK_hebrew_samekh                 0x0cf1  /* deprecated */
-#define XK_hebrew_ayin                   0x0cf2  /* U+05E2 HEBREW LETTER AYIN */
-#define XK_hebrew_finalpe                0x0cf3  /* U+05E3 HEBREW LETTER FINAL PE */
-#define XK_hebrew_pe                     0x0cf4  /* U+05E4 HEBREW LETTER PE */
-#define XK_hebrew_finalzade              0x0cf5  /* U+05E5 HEBREW LETTER FINAL TSADI */
-#define XK_hebrew_finalzadi              0x0cf5  /* deprecated */
-#define XK_hebrew_zade                   0x0cf6  /* U+05E6 HEBREW LETTER TSADI */
-#define XK_hebrew_zadi                   0x0cf6  /* deprecated */
-#define XK_hebrew_qoph                   0x0cf7  /* U+05E7 HEBREW LETTER QOF */
-#define XK_hebrew_kuf                    0x0cf7  /* deprecated */
-#define XK_hebrew_resh                   0x0cf8  /* U+05E8 HEBREW LETTER RESH */
-#define XK_hebrew_shin                   0x0cf9  /* U+05E9 HEBREW LETTER SHIN */
-#define XK_hebrew_taw                    0x0cfa  /* U+05EA HEBREW LETTER TAV */
-#define XK_hebrew_taf                    0x0cfa  /* deprecated */
-#define XK_Hebrew_switch                 0xff7e  /* Alias for mode_switch */
-#endif /* XK_HEBREW */
-
-/*
- * Thai
- * Byte 3 = 0x0d
- */
-
-#ifdef XK_THAI
-#define XK_Thai_kokai                    0x0da1  /* U+0E01 THAI CHARACTER KO KAI */
-#define XK_Thai_khokhai                  0x0da2  /* U+0E02 THAI CHARACTER KHO KHAI */
-#define XK_Thai_khokhuat                 0x0da3  /* U+0E03 THAI CHARACTER KHO KHUAT */
-#define XK_Thai_khokhwai                 0x0da4  /* U+0E04 THAI CHARACTER KHO KHWAI */
-#define XK_Thai_khokhon                  0x0da5  /* U+0E05 THAI CHARACTER KHO KHON */
-#define XK_Thai_khorakhang               0x0da6  /* U+0E06 THAI CHARACTER KHO RAKHANG */
-#define XK_Thai_ngongu                   0x0da7  /* U+0E07 THAI CHARACTER NGO NGU */
-#define XK_Thai_chochan                  0x0da8  /* U+0E08 THAI CHARACTER CHO CHAN */
-#define XK_Thai_choching                 0x0da9  /* U+0E09 THAI CHARACTER CHO CHING */
-#define XK_Thai_chochang                 0x0daa  /* U+0E0A THAI CHARACTER CHO CHANG */
-#define XK_Thai_soso                     0x0dab  /* U+0E0B THAI CHARACTER SO SO */
-#define XK_Thai_chochoe                  0x0dac  /* U+0E0C THAI CHARACTER CHO CHOE */
-#define XK_Thai_yoying                   0x0dad  /* U+0E0D THAI CHARACTER YO YING */
-#define XK_Thai_dochada                  0x0dae  /* U+0E0E THAI CHARACTER DO CHADA */
-#define XK_Thai_topatak                  0x0daf  /* U+0E0F THAI CHARACTER TO PATAK */
-#define XK_Thai_thothan                  0x0db0  /* U+0E10 THAI CHARACTER THO THAN */
-#define XK_Thai_thonangmontho            0x0db1  /* U+0E11 THAI CHARACTER THO NANGMONTHO */
-#define XK_Thai_thophuthao               0x0db2  /* U+0E12 THAI CHARACTER THO PHUTHAO */
-#define XK_Thai_nonen                    0x0db3  /* U+0E13 THAI CHARACTER NO NEN */
-#define XK_Thai_dodek                    0x0db4  /* U+0E14 THAI CHARACTER DO DEK */
-#define XK_Thai_totao                    0x0db5  /* U+0E15 THAI CHARACTER TO TAO */
-#define XK_Thai_thothung                 0x0db6  /* U+0E16 THAI CHARACTER THO THUNG */
-#define XK_Thai_thothahan                0x0db7  /* U+0E17 THAI CHARACTER THO THAHAN */
-#define XK_Thai_thothong                 0x0db8  /* U+0E18 THAI CHARACTER THO THONG */
-#define XK_Thai_nonu                     0x0db9  /* U+0E19 THAI CHARACTER NO NU */
-#define XK_Thai_bobaimai                 0x0dba  /* U+0E1A THAI CHARACTER BO BAIMAI */
-#define XK_Thai_popla                    0x0dbb  /* U+0E1B THAI CHARACTER PO PLA */
-#define XK_Thai_phophung                 0x0dbc  /* U+0E1C THAI CHARACTER PHO PHUNG */
-#define XK_Thai_fofa                     0x0dbd  /* U+0E1D THAI CHARACTER FO FA */
-#define XK_Thai_phophan                  0x0dbe  /* U+0E1E THAI CHARACTER PHO PHAN */
-#define XK_Thai_fofan                    0x0dbf  /* U+0E1F THAI CHARACTER FO FAN */
-#define XK_Thai_phosamphao               0x0dc0  /* U+0E20 THAI CHARACTER PHO SAMPHAO */
-#define XK_Thai_moma                     0x0dc1  /* U+0E21 THAI CHARACTER MO MA */
-#define XK_Thai_yoyak                    0x0dc2  /* U+0E22 THAI CHARACTER YO YAK */
-#define XK_Thai_rorua                    0x0dc3  /* U+0E23 THAI CHARACTER RO RUA */
-#define XK_Thai_ru                       0x0dc4  /* U+0E24 THAI CHARACTER RU */
-#define XK_Thai_loling                   0x0dc5  /* U+0E25 THAI CHARACTER LO LING */
-#define XK_Thai_lu                       0x0dc6  /* U+0E26 THAI CHARACTER LU */
-#define XK_Thai_wowaen                   0x0dc7  /* U+0E27 THAI CHARACTER WO WAEN */
-#define XK_Thai_sosala                   0x0dc8  /* U+0E28 THAI CHARACTER SO SALA */
-#define XK_Thai_sorusi                   0x0dc9  /* U+0E29 THAI CHARACTER SO RUSI */
-#define XK_Thai_sosua                    0x0dca  /* U+0E2A THAI CHARACTER SO SUA */
-#define XK_Thai_hohip                    0x0dcb  /* U+0E2B THAI CHARACTER HO HIP */
-#define XK_Thai_lochula                  0x0dcc  /* U+0E2C THAI CHARACTER LO CHULA */
-#define XK_Thai_oang                     0x0dcd  /* U+0E2D THAI CHARACTER O ANG */
-#define XK_Thai_honokhuk                 0x0dce  /* U+0E2E THAI CHARACTER HO NOKHUK */
-#define XK_Thai_paiyannoi                0x0dcf  /* U+0E2F THAI CHARACTER PAIYANNOI */
-#define XK_Thai_saraa                    0x0dd0  /* U+0E30 THAI CHARACTER SARA A */
-#define XK_Thai_maihanakat               0x0dd1  /* U+0E31 THAI CHARACTER MAI HAN-AKAT */
-#define XK_Thai_saraaa                   0x0dd2  /* U+0E32 THAI CHARACTER SARA AA */
-#define XK_Thai_saraam                   0x0dd3  /* U+0E33 THAI CHARACTER SARA AM */
-#define XK_Thai_sarai                    0x0dd4  /* U+0E34 THAI CHARACTER SARA I */
-#define XK_Thai_saraii                   0x0dd5  /* U+0E35 THAI CHARACTER SARA II */
-#define XK_Thai_saraue                   0x0dd6  /* U+0E36 THAI CHARACTER SARA UE */
-#define XK_Thai_sarauee                  0x0dd7  /* U+0E37 THAI CHARACTER SARA UEE */
-#define XK_Thai_sarau                    0x0dd8  /* U+0E38 THAI CHARACTER SARA U */
-#define XK_Thai_sarauu                   0x0dd9  /* U+0E39 THAI CHARACTER SARA UU */
-#define XK_Thai_phinthu                  0x0dda  /* U+0E3A THAI CHARACTER PHINTHU */
-#define XK_Thai_maihanakat_maitho        0x0dde
-#define XK_Thai_baht                     0x0ddf  /* U+0E3F THAI CURRENCY SYMBOL BAHT */
-#define XK_Thai_sarae                    0x0de0  /* U+0E40 THAI CHARACTER SARA E */
-#define XK_Thai_saraae                   0x0de1  /* U+0E41 THAI CHARACTER SARA AE */
-#define XK_Thai_sarao                    0x0de2  /* U+0E42 THAI CHARACTER SARA O */
-#define XK_Thai_saraaimaimuan            0x0de3  /* U+0E43 THAI CHARACTER SARA AI MAIMUAN */
-#define XK_Thai_saraaimaimalai           0x0de4  /* U+0E44 THAI CHARACTER SARA AI MAIMALAI */
-#define XK_Thai_lakkhangyao              0x0de5  /* U+0E45 THAI CHARACTER LAKKHANGYAO */
-#define XK_Thai_maiyamok                 0x0de6  /* U+0E46 THAI CHARACTER MAIYAMOK */
-#define XK_Thai_maitaikhu                0x0de7  /* U+0E47 THAI CHARACTER MAITAIKHU */
-#define XK_Thai_maiek                    0x0de8  /* U+0E48 THAI CHARACTER MAI EK */
-#define XK_Thai_maitho                   0x0de9  /* U+0E49 THAI CHARACTER MAI THO */
-#define XK_Thai_maitri                   0x0dea  /* U+0E4A THAI CHARACTER MAI TRI */
-#define XK_Thai_maichattawa              0x0deb  /* U+0E4B THAI CHARACTER MAI CHATTAWA */
-#define XK_Thai_thanthakhat              0x0dec  /* U+0E4C THAI CHARACTER THANTHAKHAT */
-#define XK_Thai_nikhahit                 0x0ded  /* U+0E4D THAI CHARACTER NIKHAHIT */
-#define XK_Thai_leksun                   0x0df0  /* U+0E50 THAI DIGIT ZERO */
-#define XK_Thai_leknung                  0x0df1  /* U+0E51 THAI DIGIT ONE */
-#define XK_Thai_leksong                  0x0df2  /* U+0E52 THAI DIGIT TWO */
-#define XK_Thai_leksam                   0x0df3  /* U+0E53 THAI DIGIT THREE */
-#define XK_Thai_leksi                    0x0df4  /* U+0E54 THAI DIGIT FOUR */
-#define XK_Thai_lekha                    0x0df5  /* U+0E55 THAI DIGIT FIVE */
-#define XK_Thai_lekhok                   0x0df6  /* U+0E56 THAI DIGIT SIX */
-#define XK_Thai_lekchet                  0x0df7  /* U+0E57 THAI DIGIT SEVEN */
-#define XK_Thai_lekpaet                  0x0df8  /* U+0E58 THAI DIGIT EIGHT */
-#define XK_Thai_lekkao                   0x0df9  /* U+0E59 THAI DIGIT NINE */
-#endif /* XK_THAI */
-
-/*
- * Korean
- * Byte 3 = 0x0e
- */
-
-#ifdef XK_KOREAN
-
-#define XK_Hangul                        0xff31  /* Hangul start/stop(toggle) */
-#define XK_Hangul_Start                  0xff32  /* Hangul start */
-#define XK_Hangul_End                    0xff33  /* Hangul end, English start */
-#define XK_Hangul_Hanja                  0xff34  /* Start Hangul->Hanja Conversion */
-#define XK_Hangul_Jamo                   0xff35  /* Hangul Jamo mode */
-#define XK_Hangul_Romaja                 0xff36  /* Hangul Romaja mode */
-#define XK_Hangul_Codeinput              0xff37  /* Hangul code input mode */
-#define XK_Hangul_Jeonja                 0xff38  /* Jeonja mode */
-#define XK_Hangul_Banja                  0xff39  /* Banja mode */
-#define XK_Hangul_PreHanja               0xff3a  /* Pre Hanja conversion */
-#define XK_Hangul_PostHanja              0xff3b  /* Post Hanja conversion */
-#define XK_Hangul_SingleCandidate        0xff3c  /* Single candidate */
-#define XK_Hangul_MultipleCandidate      0xff3d  /* Multiple candidate */
-#define XK_Hangul_PreviousCandidate      0xff3e  /* Previous candidate */
-#define XK_Hangul_Special                0xff3f  /* Special symbols */
-#define XK_Hangul_switch                 0xff7e  /* Alias for mode_switch */
-
-/* Hangul Consonant Characters */
-#define XK_Hangul_Kiyeog                 0x0ea1
-#define XK_Hangul_SsangKiyeog            0x0ea2
-#define XK_Hangul_KiyeogSios             0x0ea3
-#define XK_Hangul_Nieun                  0x0ea4
-#define XK_Hangul_NieunJieuj             0x0ea5
-#define XK_Hangul_NieunHieuh             0x0ea6
-#define XK_Hangul_Dikeud                 0x0ea7
-#define XK_Hangul_SsangDikeud            0x0ea8
-#define XK_Hangul_Rieul                  0x0ea9
-#define XK_Hangul_RieulKiyeog            0x0eaa
-#define XK_Hangul_RieulMieum             0x0eab
-#define XK_Hangul_RieulPieub             0x0eac
-#define XK_Hangul_RieulSios              0x0ead
-#define XK_Hangul_RieulTieut             0x0eae
-#define XK_Hangul_RieulPhieuf            0x0eaf
-#define XK_Hangul_RieulHieuh             0x0eb0
-#define XK_Hangul_Mieum                  0x0eb1
-#define XK_Hangul_Pieub                  0x0eb2
-#define XK_Hangul_SsangPieub             0x0eb3
-#define XK_Hangul_PieubSios              0x0eb4
-#define XK_Hangul_Sios                   0x0eb5
-#define XK_Hangul_SsangSios              0x0eb6
-#define XK_Hangul_Ieung                  0x0eb7
-#define XK_Hangul_Jieuj                  0x0eb8
-#define XK_Hangul_SsangJieuj             0x0eb9
-#define XK_Hangul_Cieuc                  0x0eba
-#define XK_Hangul_Khieuq                 0x0ebb
-#define XK_Hangul_Tieut                  0x0ebc
-#define XK_Hangul_Phieuf                 0x0ebd
-#define XK_Hangul_Hieuh                  0x0ebe
-
-/* Hangul Vowel Characters */
-#define XK_Hangul_A                      0x0ebf
-#define XK_Hangul_AE                     0x0ec0
-#define XK_Hangul_YA                     0x0ec1
-#define XK_Hangul_YAE                    0x0ec2
-#define XK_Hangul_EO                     0x0ec3
-#define XK_Hangul_E                      0x0ec4
-#define XK_Hangul_YEO                    0x0ec5
-#define XK_Hangul_YE                     0x0ec6
-#define XK_Hangul_O                      0x0ec7
-#define XK_Hangul_WA                     0x0ec8
-#define XK_Hangul_WAE                    0x0ec9
-#define XK_Hangul_OE                     0x0eca
-#define XK_Hangul_YO                     0x0ecb
-#define XK_Hangul_U                      0x0ecc
-#define XK_Hangul_WEO                    0x0ecd
-#define XK_Hangul_WE                     0x0ece
-#define XK_Hangul_WI                     0x0ecf
-#define XK_Hangul_YU                     0x0ed0
-#define XK_Hangul_EU                     0x0ed1
-#define XK_Hangul_YI                     0x0ed2
-#define XK_Hangul_I                      0x0ed3
-
-/* Hangul syllable-final (JongSeong) Characters */
-#define XK_Hangul_J_Kiyeog               0x0ed4
-#define XK_Hangul_J_SsangKiyeog          0x0ed5
-#define XK_Hangul_J_KiyeogSios           0x0ed6
-#define XK_Hangul_J_Nieun                0x0ed7
-#define XK_Hangul_J_NieunJieuj           0x0ed8
-#define XK_Hangul_J_NieunHieuh           0x0ed9
-#define XK_Hangul_J_Dikeud               0x0eda
-#define XK_Hangul_J_Rieul                0x0edb
-#define XK_Hangul_J_RieulKiyeog          0x0edc
-#define XK_Hangul_J_RieulMieum           0x0edd
-#define XK_Hangul_J_RieulPieub           0x0ede
-#define XK_Hangul_J_RieulSios            0x0edf
-#define XK_Hangul_J_RieulTieut           0x0ee0
-#define XK_Hangul_J_RieulPhieuf          0x0ee1
-#define XK_Hangul_J_RieulHieuh           0x0ee2
-#define XK_Hangul_J_Mieum                0x0ee3
-#define XK_Hangul_J_Pieub                0x0ee4
-#define XK_Hangul_J_PieubSios            0x0ee5
-#define XK_Hangul_J_Sios                 0x0ee6
-#define XK_Hangul_J_SsangSios            0x0ee7
-#define XK_Hangul_J_Ieung                0x0ee8
-#define XK_Hangul_J_Jieuj                0x0ee9
-#define XK_Hangul_J_Cieuc                0x0eea
-#define XK_Hangul_J_Khieuq               0x0eeb
-#define XK_Hangul_J_Tieut                0x0eec
-#define XK_Hangul_J_Phieuf               0x0eed
-#define XK_Hangul_J_Hieuh                0x0eee
-
-/* Ancient Hangul Consonant Characters */
-#define XK_Hangul_RieulYeorinHieuh       0x0eef
-#define XK_Hangul_SunkyeongeumMieum      0x0ef0
-#define XK_Hangul_SunkyeongeumPieub      0x0ef1
-#define XK_Hangul_PanSios                0x0ef2
-#define XK_Hangul_KkogjiDalrinIeung      0x0ef3
-#define XK_Hangul_SunkyeongeumPhieuf     0x0ef4
-#define XK_Hangul_YeorinHieuh            0x0ef5
-
-/* Ancient Hangul Vowel Characters */
-#define XK_Hangul_AraeA                  0x0ef6
-#define XK_Hangul_AraeAE                 0x0ef7
-
-/* Ancient Hangul syllable-final (JongSeong) Characters */
-#define XK_Hangul_J_PanSios              0x0ef8
-#define XK_Hangul_J_KkogjiDalrinIeung    0x0ef9
-#define XK_Hangul_J_YeorinHieuh          0x0efa
-
-/* Korean currency symbol */
-#define XK_Korean_Won                    0x0eff  /*(U+20A9 WON SIGN)*/
-
-#endif /* XK_KOREAN */
-
-/*
- * Armenian
- */
-
-#ifdef XK_ARMENIAN
-#define XK_Armenian_ligature_ew       0x1000587  /* U+0587 ARMENIAN SMALL LIGATURE ECH YIWN */
-#define XK_Armenian_full_stop         0x1000589  /* U+0589 ARMENIAN FULL STOP */
-#define XK_Armenian_verjaket          0x1000589  /* U+0589 ARMENIAN FULL STOP */
-#define XK_Armenian_separation_mark   0x100055d  /* U+055D ARMENIAN COMMA */
-#define XK_Armenian_but               0x100055d  /* U+055D ARMENIAN COMMA */
-#define XK_Armenian_hyphen            0x100058a  /* U+058A ARMENIAN HYPHEN */
-#define XK_Armenian_yentamna          0x100058a  /* U+058A ARMENIAN HYPHEN */
-#define XK_Armenian_exclam            0x100055c  /* U+055C ARMENIAN EXCLAMATION MARK */
-#define XK_Armenian_amanak            0x100055c  /* U+055C ARMENIAN EXCLAMATION MARK */
-#define XK_Armenian_accent            0x100055b  /* U+055B ARMENIAN EMPHASIS MARK */
-#define XK_Armenian_shesht            0x100055b  /* U+055B ARMENIAN EMPHASIS MARK */
-#define XK_Armenian_question          0x100055e  /* U+055E ARMENIAN QUESTION MARK */
-#define XK_Armenian_paruyk            0x100055e  /* U+055E ARMENIAN QUESTION MARK */
-#define XK_Armenian_AYB               0x1000531  /* U+0531 ARMENIAN CAPITAL LETTER AYB */
-#define XK_Armenian_ayb               0x1000561  /* U+0561 ARMENIAN SMALL LETTER AYB */
-#define XK_Armenian_BEN               0x1000532  /* U+0532 ARMENIAN CAPITAL LETTER BEN */
-#define XK_Armenian_ben               0x1000562  /* U+0562 ARMENIAN SMALL LETTER BEN */
-#define XK_Armenian_GIM               0x1000533  /* U+0533 ARMENIAN CAPITAL LETTER GIM */
-#define XK_Armenian_gim               0x1000563  /* U+0563 ARMENIAN SMALL LETTER GIM */
-#define XK_Armenian_DA                0x1000534  /* U+0534 ARMENIAN CAPITAL LETTER DA */
-#define XK_Armenian_da                0x1000564  /* U+0564 ARMENIAN SMALL LETTER DA */
-#define XK_Armenian_YECH              0x1000535  /* U+0535 ARMENIAN CAPITAL LETTER ECH */
-#define XK_Armenian_yech              0x1000565  /* U+0565 ARMENIAN SMALL LETTER ECH */
-#define XK_Armenian_ZA                0x1000536  /* U+0536 ARMENIAN CAPITAL LETTER ZA */
-#define XK_Armenian_za                0x1000566  /* U+0566 ARMENIAN SMALL LETTER ZA */
-#define XK_Armenian_E                 0x1000537  /* U+0537 ARMENIAN CAPITAL LETTER EH */
-#define XK_Armenian_e                 0x1000567  /* U+0567 ARMENIAN SMALL LETTER EH */
-#define XK_Armenian_AT                0x1000538  /* U+0538 ARMENIAN CAPITAL LETTER ET */
-#define XK_Armenian_at                0x1000568  /* U+0568 ARMENIAN SMALL LETTER ET */
-#define XK_Armenian_TO                0x1000539  /* U+0539 ARMENIAN CAPITAL LETTER TO */
-#define XK_Armenian_to                0x1000569  /* U+0569 ARMENIAN SMALL LETTER TO */
-#define XK_Armenian_ZHE               0x100053a  /* U+053A ARMENIAN CAPITAL LETTER ZHE */
-#define XK_Armenian_zhe               0x100056a  /* U+056A ARMENIAN SMALL LETTER ZHE */
-#define XK_Armenian_INI               0x100053b  /* U+053B ARMENIAN CAPITAL LETTER INI */
-#define XK_Armenian_ini               0x100056b  /* U+056B ARMENIAN SMALL LETTER INI */
-#define XK_Armenian_LYUN              0x100053c  /* U+053C ARMENIAN CAPITAL LETTER LIWN */
-#define XK_Armenian_lyun              0x100056c  /* U+056C ARMENIAN SMALL LETTER LIWN */
-#define XK_Armenian_KHE               0x100053d  /* U+053D ARMENIAN CAPITAL LETTER XEH */
-#define XK_Armenian_khe               0x100056d  /* U+056D ARMENIAN SMALL LETTER XEH */
-#define XK_Armenian_TSA               0x100053e  /* U+053E ARMENIAN CAPITAL LETTER CA */
-#define XK_Armenian_tsa               0x100056e  /* U+056E ARMENIAN SMALL LETTER CA */
-#define XK_Armenian_KEN               0x100053f  /* U+053F ARMENIAN CAPITAL LETTER KEN */
-#define XK_Armenian_ken               0x100056f  /* U+056F ARMENIAN SMALL LETTER KEN */
-#define XK_Armenian_HO                0x1000540  /* U+0540 ARMENIAN CAPITAL LETTER HO */
-#define XK_Armenian_ho                0x1000570  /* U+0570 ARMENIAN SMALL LETTER HO */
-#define XK_Armenian_DZA               0x1000541  /* U+0541 ARMENIAN CAPITAL LETTER JA */
-#define XK_Armenian_dza               0x1000571  /* U+0571 ARMENIAN SMALL LETTER JA */
-#define XK_Armenian_GHAT              0x1000542  /* U+0542 ARMENIAN CAPITAL LETTER GHAD */
-#define XK_Armenian_ghat              0x1000572  /* U+0572 ARMENIAN SMALL LETTER GHAD */
-#define XK_Armenian_TCHE              0x1000543  /* U+0543 ARMENIAN CAPITAL LETTER CHEH */
-#define XK_Armenian_tche              0x1000573  /* U+0573 ARMENIAN SMALL LETTER CHEH */
-#define XK_Armenian_MEN               0x1000544  /* U+0544 ARMENIAN CAPITAL LETTER MEN */
-#define XK_Armenian_men               0x1000574  /* U+0574 ARMENIAN SMALL LETTER MEN */
-#define XK_Armenian_HI                0x1000545  /* U+0545 ARMENIAN CAPITAL LETTER YI */
-#define XK_Armenian_hi                0x1000575  /* U+0575 ARMENIAN SMALL LETTER YI */
-#define XK_Armenian_NU                0x1000546  /* U+0546 ARMENIAN CAPITAL LETTER NOW */
-#define XK_Armenian_nu                0x1000576  /* U+0576 ARMENIAN SMALL LETTER NOW */
-#define XK_Armenian_SHA               0x1000547  /* U+0547 ARMENIAN CAPITAL LETTER SHA */
-#define XK_Armenian_sha               0x1000577  /* U+0577 ARMENIAN SMALL LETTER SHA */
-#define XK_Armenian_VO                0x1000548  /* U+0548 ARMENIAN CAPITAL LETTER VO */
-#define XK_Armenian_vo                0x1000578  /* U+0578 ARMENIAN SMALL LETTER VO */
-#define XK_Armenian_CHA               0x1000549  /* U+0549 ARMENIAN CAPITAL LETTER CHA */
-#define XK_Armenian_cha               0x1000579  /* U+0579 ARMENIAN SMALL LETTER CHA */
-#define XK_Armenian_PE                0x100054a  /* U+054A ARMENIAN CAPITAL LETTER PEH */
-#define XK_Armenian_pe                0x100057a  /* U+057A ARMENIAN SMALL LETTER PEH */
-#define XK_Armenian_JE                0x100054b  /* U+054B ARMENIAN CAPITAL LETTER JHEH */
-#define XK_Armenian_je                0x100057b  /* U+057B ARMENIAN SMALL LETTER JHEH */
-#define XK_Armenian_RA                0x100054c  /* U+054C ARMENIAN CAPITAL LETTER RA */
-#define XK_Armenian_ra                0x100057c  /* U+057C ARMENIAN SMALL LETTER RA */
-#define XK_Armenian_SE                0x100054d  /* U+054D ARMENIAN CAPITAL LETTER SEH */
-#define XK_Armenian_se                0x100057d  /* U+057D ARMENIAN SMALL LETTER SEH */
-#define XK_Armenian_VEV               0x100054e  /* U+054E ARMENIAN CAPITAL LETTER VEW */
-#define XK_Armenian_vev               0x100057e  /* U+057E ARMENIAN SMALL LETTER VEW */
-#define XK_Armenian_TYUN              0x100054f  /* U+054F ARMENIAN CAPITAL LETTER TIWN */
-#define XK_Armenian_tyun              0x100057f  /* U+057F ARMENIAN SMALL LETTER TIWN */
-#define XK_Armenian_RE                0x1000550  /* U+0550 ARMENIAN CAPITAL LETTER REH */
-#define XK_Armenian_re                0x1000580  /* U+0580 ARMENIAN SMALL LETTER REH */
-#define XK_Armenian_TSO               0x1000551  /* U+0551 ARMENIAN CAPITAL LETTER CO */
-#define XK_Armenian_tso               0x1000581  /* U+0581 ARMENIAN SMALL LETTER CO */
-#define XK_Armenian_VYUN              0x1000552  /* U+0552 ARMENIAN CAPITAL LETTER YIWN */
-#define XK_Armenian_vyun              0x1000582  /* U+0582 ARMENIAN SMALL LETTER YIWN */
-#define XK_Armenian_PYUR              0x1000553  /* U+0553 ARMENIAN CAPITAL LETTER PIWR */
-#define XK_Armenian_pyur              0x1000583  /* U+0583 ARMENIAN SMALL LETTER PIWR */
-#define XK_Armenian_KE                0x1000554  /* U+0554 ARMENIAN CAPITAL LETTER KEH */
-#define XK_Armenian_ke                0x1000584  /* U+0584 ARMENIAN SMALL LETTER KEH */
-#define XK_Armenian_O                 0x1000555  /* U+0555 ARMENIAN CAPITAL LETTER OH */
-#define XK_Armenian_o                 0x1000585  /* U+0585 ARMENIAN SMALL LETTER OH */
-#define XK_Armenian_FE                0x1000556  /* U+0556 ARMENIAN CAPITAL LETTER FEH */
-#define XK_Armenian_fe                0x1000586  /* U+0586 ARMENIAN SMALL LETTER FEH */
-#define XK_Armenian_apostrophe        0x100055a  /* U+055A ARMENIAN APOSTROPHE */
-#endif /* XK_ARMENIAN */
-
-/*
- * Georgian
- */
-
-#ifdef XK_GEORGIAN
-#define XK_Georgian_an                0x10010d0  /* U+10D0 GEORGIAN LETTER AN */
-#define XK_Georgian_ban               0x10010d1  /* U+10D1 GEORGIAN LETTER BAN */
-#define XK_Georgian_gan               0x10010d2  /* U+10D2 GEORGIAN LETTER GAN */
-#define XK_Georgian_don               0x10010d3  /* U+10D3 GEORGIAN LETTER DON */
-#define XK_Georgian_en                0x10010d4  /* U+10D4 GEORGIAN LETTER EN */
-#define XK_Georgian_vin               0x10010d5  /* U+10D5 GEORGIAN LETTER VIN */
-#define XK_Georgian_zen               0x10010d6  /* U+10D6 GEORGIAN LETTER ZEN */
-#define XK_Georgian_tan               0x10010d7  /* U+10D7 GEORGIAN LETTER TAN */
-#define XK_Georgian_in                0x10010d8  /* U+10D8 GEORGIAN LETTER IN */
-#define XK_Georgian_kan               0x10010d9  /* U+10D9 GEORGIAN LETTER KAN */
-#define XK_Georgian_las               0x10010da  /* U+10DA GEORGIAN LETTER LAS */
-#define XK_Georgian_man               0x10010db  /* U+10DB GEORGIAN LETTER MAN */
-#define XK_Georgian_nar               0x10010dc  /* U+10DC GEORGIAN LETTER NAR */
-#define XK_Georgian_on                0x10010dd  /* U+10DD GEORGIAN LETTER ON */
-#define XK_Georgian_par               0x10010de  /* U+10DE GEORGIAN LETTER PAR */
-#define XK_Georgian_zhar              0x10010df  /* U+10DF GEORGIAN LETTER ZHAR */
-#define XK_Georgian_rae               0x10010e0  /* U+10E0 GEORGIAN LETTER RAE */
-#define XK_Georgian_san               0x10010e1  /* U+10E1 GEORGIAN LETTER SAN */
-#define XK_Georgian_tar               0x10010e2  /* U+10E2 GEORGIAN LETTER TAR */
-#define XK_Georgian_un                0x10010e3  /* U+10E3 GEORGIAN LETTER UN */
-#define XK_Georgian_phar              0x10010e4  /* U+10E4 GEORGIAN LETTER PHAR */
-#define XK_Georgian_khar              0x10010e5  /* U+10E5 GEORGIAN LETTER KHAR */
-#define XK_Georgian_ghan              0x10010e6  /* U+10E6 GEORGIAN LETTER GHAN */
-#define XK_Georgian_qar               0x10010e7  /* U+10E7 GEORGIAN LETTER QAR */
-#define XK_Georgian_shin              0x10010e8  /* U+10E8 GEORGIAN LETTER SHIN */
-#define XK_Georgian_chin              0x10010e9  /* U+10E9 GEORGIAN LETTER CHIN */
-#define XK_Georgian_can               0x10010ea  /* U+10EA GEORGIAN LETTER CAN */
-#define XK_Georgian_jil               0x10010eb  /* U+10EB GEORGIAN LETTER JIL */
-#define XK_Georgian_cil               0x10010ec  /* U+10EC GEORGIAN LETTER CIL */
-#define XK_Georgian_char              0x10010ed  /* U+10ED GEORGIAN LETTER CHAR */
-#define XK_Georgian_xan               0x10010ee  /* U+10EE GEORGIAN LETTER XAN */
-#define XK_Georgian_jhan              0x10010ef  /* U+10EF GEORGIAN LETTER JHAN */
-#define XK_Georgian_hae               0x10010f0  /* U+10F0 GEORGIAN LETTER HAE */
-#define XK_Georgian_he                0x10010f1  /* U+10F1 GEORGIAN LETTER HE */
-#define XK_Georgian_hie               0x10010f2  /* U+10F2 GEORGIAN LETTER HIE */
-#define XK_Georgian_we                0x10010f3  /* U+10F3 GEORGIAN LETTER WE */
-#define XK_Georgian_har               0x10010f4  /* U+10F4 GEORGIAN LETTER HAR */
-#define XK_Georgian_hoe               0x10010f5  /* U+10F5 GEORGIAN LETTER HOE */
-#define XK_Georgian_fi                0x10010f6  /* U+10F6 GEORGIAN LETTER FI */
-#endif /* XK_GEORGIAN */
-
-/*
- * Azeri (and other Turkic or Caucasian languages)
- */
-
-#ifdef XK_CAUCASUS
-/* latin */
-#define XK_Xabovedot                  0x1001e8a  /* U+1E8A LATIN CAPITAL LETTER X WITH DOT ABOVE */
-#define XK_Ibreve                     0x100012c  /* U+012C LATIN CAPITAL LETTER I WITH BREVE */
-#define XK_Zstroke                    0x10001b5  /* U+01B5 LATIN CAPITAL LETTER Z WITH STROKE */
-#define XK_Gcaron                     0x10001e6  /* U+01E6 LATIN CAPITAL LETTER G WITH CARON */
-#define XK_Ocaron                     0x10001d1  /* U+01D2 LATIN CAPITAL LETTER O WITH CARON */
-#define XK_Obarred                    0x100019f  /* U+019F LATIN CAPITAL LETTER O WITH MIDDLE TILDE */
-#define XK_xabovedot                  0x1001e8b  /* U+1E8B LATIN SMALL LETTER X WITH DOT ABOVE */
-#define XK_ibreve                     0x100012d  /* U+012D LATIN SMALL LETTER I WITH BREVE */
-#define XK_zstroke                    0x10001b6  /* U+01B6 LATIN SMALL LETTER Z WITH STROKE */
-#define XK_gcaron                     0x10001e7  /* U+01E7 LATIN SMALL LETTER G WITH CARON */
-#define XK_ocaron                     0x10001d2  /* U+01D2 LATIN SMALL LETTER O WITH CARON */
-#define XK_obarred                    0x1000275  /* U+0275 LATIN SMALL LETTER BARRED O */
-#define XK_SCHWA                      0x100018f  /* U+018F LATIN CAPITAL LETTER SCHWA */
-#define XK_schwa                      0x1000259  /* U+0259 LATIN SMALL LETTER SCHWA */
-#define XK_EZH                        0x10001b7  /* U+01B7 LATIN CAPITAL LETTER EZH */
-#define XK_ezh                        0x1000292  /* U+0292 LATIN SMALL LETTER EZH */
-/* those are not really Caucasus */
-/* For Inupiak */
-#define XK_Lbelowdot                  0x1001e36  /* U+1E36 LATIN CAPITAL LETTER L WITH DOT BELOW */
-#define XK_lbelowdot                  0x1001e37  /* U+1E37 LATIN SMALL LETTER L WITH DOT BELOW */
-#endif /* XK_CAUCASUS */
-
-/*
- * Vietnamese
- */
- 
-#ifdef XK_VIETNAMESE
-#define XK_Abelowdot                  0x1001ea0  /* U+1EA0 LATIN CAPITAL LETTER A WITH DOT BELOW */
-#define XK_abelowdot                  0x1001ea1  /* U+1EA1 LATIN SMALL LETTER A WITH DOT BELOW */
-#define XK_Ahook                      0x1001ea2  /* U+1EA2 LATIN CAPITAL LETTER A WITH HOOK ABOVE */
-#define XK_ahook                      0x1001ea3  /* U+1EA3 LATIN SMALL LETTER A WITH HOOK ABOVE */
-#define XK_Acircumflexacute           0x1001ea4  /* U+1EA4 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */
-#define XK_acircumflexacute           0x1001ea5  /* U+1EA5 LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE */
-#define XK_Acircumflexgrave           0x1001ea6  /* U+1EA6 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */
-#define XK_acircumflexgrave           0x1001ea7  /* U+1EA7 LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE */
-#define XK_Acircumflexhook            0x1001ea8  /* U+1EA8 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XK_acircumflexhook            0x1001ea9  /* U+1EA9 LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XK_Acircumflextilde           0x1001eaa  /* U+1EAA LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE */
-#define XK_acircumflextilde           0x1001eab  /* U+1EAB LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE */
-#define XK_Acircumflexbelowdot        0x1001eac  /* U+1EAC LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
-#define XK_acircumflexbelowdot        0x1001ead  /* U+1EAD LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
-#define XK_Abreveacute                0x1001eae  /* U+1EAE LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */
-#define XK_abreveacute                0x1001eaf  /* U+1EAF LATIN SMALL LETTER A WITH BREVE AND ACUTE */
-#define XK_Abrevegrave                0x1001eb0  /* U+1EB0 LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */
-#define XK_abrevegrave                0x1001eb1  /* U+1EB1 LATIN SMALL LETTER A WITH BREVE AND GRAVE */
-#define XK_Abrevehook                 0x1001eb2  /* U+1EB2 LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE */
-#define XK_abrevehook                 0x1001eb3  /* U+1EB3 LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE */
-#define XK_Abrevetilde                0x1001eb4  /* U+1EB4 LATIN CAPITAL LETTER A WITH BREVE AND TILDE */
-#define XK_abrevetilde                0x1001eb5  /* U+1EB5 LATIN SMALL LETTER A WITH BREVE AND TILDE */
-#define XK_Abrevebelowdot             0x1001eb6  /* U+1EB6 LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */
-#define XK_abrevebelowdot             0x1001eb7  /* U+1EB7 LATIN SMALL LETTER A WITH BREVE AND DOT BELOW */
-#define XK_Ebelowdot                  0x1001eb8  /* U+1EB8 LATIN CAPITAL LETTER E WITH DOT BELOW */
-#define XK_ebelowdot                  0x1001eb9  /* U+1EB9 LATIN SMALL LETTER E WITH DOT BELOW */
-#define XK_Ehook                      0x1001eba  /* U+1EBA LATIN CAPITAL LETTER E WITH HOOK ABOVE */
-#define XK_ehook                      0x1001ebb  /* U+1EBB LATIN SMALL LETTER E WITH HOOK ABOVE */
-#define XK_Etilde                     0x1001ebc  /* U+1EBC LATIN CAPITAL LETTER E WITH TILDE */
-#define XK_etilde                     0x1001ebd  /* U+1EBD LATIN SMALL LETTER E WITH TILDE */
-#define XK_Ecircumflexacute           0x1001ebe  /* U+1EBE LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
-#define XK_ecircumflexacute           0x1001ebf  /* U+1EBF LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE */
-#define XK_Ecircumflexgrave           0x1001ec0  /* U+1EC0 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */
-#define XK_ecircumflexgrave           0x1001ec1  /* U+1EC1 LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE */
-#define XK_Ecircumflexhook            0x1001ec2  /* U+1EC2 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XK_ecircumflexhook            0x1001ec3  /* U+1EC3 LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XK_Ecircumflextilde           0x1001ec4  /* U+1EC4 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */
-#define XK_ecircumflextilde           0x1001ec5  /* U+1EC5 LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE */
-#define XK_Ecircumflexbelowdot        0x1001ec6  /* U+1EC6 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
-#define XK_ecircumflexbelowdot        0x1001ec7  /* U+1EC7 LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
-#define XK_Ihook                      0x1001ec8  /* U+1EC8 LATIN CAPITAL LETTER I WITH HOOK ABOVE */
-#define XK_ihook                      0x1001ec9  /* U+1EC9 LATIN SMALL LETTER I WITH HOOK ABOVE */
-#define XK_Ibelowdot                  0x1001eca  /* U+1ECA LATIN CAPITAL LETTER I WITH DOT BELOW */
-#define XK_ibelowdot                  0x1001ecb  /* U+1ECB LATIN SMALL LETTER I WITH DOT BELOW */
-#define XK_Obelowdot                  0x1001ecc  /* U+1ECC LATIN CAPITAL LETTER O WITH DOT BELOW */
-#define XK_obelowdot                  0x1001ecd  /* U+1ECD LATIN SMALL LETTER O WITH DOT BELOW */
-#define XK_Ohook                      0x1001ece  /* U+1ECE LATIN CAPITAL LETTER O WITH HOOK ABOVE */
-#define XK_ohook                      0x1001ecf  /* U+1ECF LATIN SMALL LETTER O WITH HOOK ABOVE */
-#define XK_Ocircumflexacute           0x1001ed0  /* U+1ED0 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */
-#define XK_ocircumflexacute           0x1001ed1  /* U+1ED1 LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE */
-#define XK_Ocircumflexgrave           0x1001ed2  /* U+1ED2 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */
-#define XK_ocircumflexgrave           0x1001ed3  /* U+1ED3 LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE */
-#define XK_Ocircumflexhook            0x1001ed4  /* U+1ED4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XK_ocircumflexhook            0x1001ed5  /* U+1ED5 LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
-#define XK_Ocircumflextilde           0x1001ed6  /* U+1ED6 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */
-#define XK_ocircumflextilde           0x1001ed7  /* U+1ED7 LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE */
-#define XK_Ocircumflexbelowdot        0x1001ed8  /* U+1ED8 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
-#define XK_ocircumflexbelowdot        0x1001ed9  /* U+1ED9 LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
-#define XK_Ohornacute                 0x1001eda  /* U+1EDA LATIN CAPITAL LETTER O WITH HORN AND ACUTE */
-#define XK_ohornacute                 0x1001edb  /* U+1EDB LATIN SMALL LETTER O WITH HORN AND ACUTE */
-#define XK_Ohorngrave                 0x1001edc  /* U+1EDC LATIN CAPITAL LETTER O WITH HORN AND GRAVE */
-#define XK_ohorngrave                 0x1001edd  /* U+1EDD LATIN SMALL LETTER O WITH HORN AND GRAVE */
-#define XK_Ohornhook                  0x1001ede  /* U+1EDE LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE */
-#define XK_ohornhook                  0x1001edf  /* U+1EDF LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */
-#define XK_Ohorntilde                 0x1001ee0  /* U+1EE0 LATIN CAPITAL LETTER O WITH HORN AND TILDE */
-#define XK_ohorntilde                 0x1001ee1  /* U+1EE1 LATIN SMALL LETTER O WITH HORN AND TILDE */
-#define XK_Ohornbelowdot              0x1001ee2  /* U+1EE2 LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW */
-#define XK_ohornbelowdot              0x1001ee3  /* U+1EE3 LATIN SMALL LETTER O WITH HORN AND DOT BELOW */
-#define XK_Ubelowdot                  0x1001ee4  /* U+1EE4 LATIN CAPITAL LETTER U WITH DOT BELOW */
-#define XK_ubelowdot                  0x1001ee5  /* U+1EE5 LATIN SMALL LETTER U WITH DOT BELOW */
-#define XK_Uhook                      0x1001ee6  /* U+1EE6 LATIN CAPITAL LETTER U WITH HOOK ABOVE */
-#define XK_uhook                      0x1001ee7  /* U+1EE7 LATIN SMALL LETTER U WITH HOOK ABOVE */
-#define XK_Uhornacute                 0x1001ee8  /* U+1EE8 LATIN CAPITAL LETTER U WITH HORN AND ACUTE */
-#define XK_uhornacute                 0x1001ee9  /* U+1EE9 LATIN SMALL LETTER U WITH HORN AND ACUTE */
-#define XK_Uhorngrave                 0x1001eea  /* U+1EEA LATIN CAPITAL LETTER U WITH HORN AND GRAVE */
-#define XK_uhorngrave                 0x1001eeb  /* U+1EEB LATIN SMALL LETTER U WITH HORN AND GRAVE */
-#define XK_Uhornhook                  0x1001eec  /* U+1EEC LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE */
-#define XK_uhornhook                  0x1001eed  /* U+1EED LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE */
-#define XK_Uhorntilde                 0x1001eee  /* U+1EEE LATIN CAPITAL LETTER U WITH HORN AND TILDE */
-#define XK_uhorntilde                 0x1001eef  /* U+1EEF LATIN SMALL LETTER U WITH HORN AND TILDE */
-#define XK_Uhornbelowdot              0x1001ef0  /* U+1EF0 LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW */
-#define XK_uhornbelowdot              0x1001ef1  /* U+1EF1 LATIN SMALL LETTER U WITH HORN AND DOT BELOW */
-#define XK_Ybelowdot                  0x1001ef4  /* U+1EF4 LATIN CAPITAL LETTER Y WITH DOT BELOW */
-#define XK_ybelowdot                  0x1001ef5  /* U+1EF5 LATIN SMALL LETTER Y WITH DOT BELOW */
-#define XK_Yhook                      0x1001ef6  /* U+1EF6 LATIN CAPITAL LETTER Y WITH HOOK ABOVE */
-#define XK_yhook                      0x1001ef7  /* U+1EF7 LATIN SMALL LETTER Y WITH HOOK ABOVE */
-#define XK_Ytilde                     0x1001ef8  /* U+1EF8 LATIN CAPITAL LETTER Y WITH TILDE */
-#define XK_ytilde                     0x1001ef9  /* U+1EF9 LATIN SMALL LETTER Y WITH TILDE */
-#define XK_Ohorn                      0x10001a0  /* U+01A0 LATIN CAPITAL LETTER O WITH HORN */
-#define XK_ohorn                      0x10001a1  /* U+01A1 LATIN SMALL LETTER O WITH HORN */
-#define XK_Uhorn                      0x10001af  /* U+01AF LATIN CAPITAL LETTER U WITH HORN */
-#define XK_uhorn                      0x10001b0  /* U+01B0 LATIN SMALL LETTER U WITH HORN */
-
-#endif /* XK_VIETNAMESE */
-
-#ifdef XK_CURRENCY
-#define XK_EcuSign                    0x10020a0  /* U+20A0 EURO-CURRENCY SIGN */
-#define XK_ColonSign                  0x10020a1  /* U+20A1 COLON SIGN */
-#define XK_CruzeiroSign               0x10020a2  /* U+20A2 CRUZEIRO SIGN */
-#define XK_FFrancSign                 0x10020a3  /* U+20A3 FRENCH FRANC SIGN */
-#define XK_LiraSign                   0x10020a4  /* U+20A4 LIRA SIGN */
-#define XK_MillSign                   0x10020a5  /* U+20A5 MILL SIGN */
-#define XK_NairaSign                  0x10020a6  /* U+20A6 NAIRA SIGN */
-#define XK_PesetaSign                 0x10020a7  /* U+20A7 PESETA SIGN */
-#define XK_RupeeSign                  0x10020a8  /* U+20A8 RUPEE SIGN */
-#define XK_WonSign                    0x10020a9  /* U+20A9 WON SIGN */
-#define XK_NewSheqelSign              0x10020aa  /* U+20AA NEW SHEQEL SIGN */
-#define XK_DongSign                   0x10020ab  /* U+20AB DONG SIGN */
-#define XK_EuroSign                      0x20ac  /* U+20AC EURO SIGN */
-#endif /* XK_CURRENCY */
-
-#ifdef XK_MATHEMATICAL
-/* one, two and three are defined above. */
-#define XK_zerosuperior               0x1002070  /* U+2070 SUPERSCRIPT ZERO */
-#define XK_foursuperior               0x1002074  /* U+2074 SUPERSCRIPT FOUR */
-#define XK_fivesuperior               0x1002075  /* U+2075 SUPERSCRIPT FIVE */
-#define XK_sixsuperior                0x1002076  /* U+2076 SUPERSCRIPT SIX */
-#define XK_sevensuperior              0x1002077  /* U+2077 SUPERSCRIPT SEVEN */
-#define XK_eightsuperior              0x1002078  /* U+2078 SUPERSCRIPT EIGHT */
-#define XK_ninesuperior               0x1002079  /* U+2079 SUPERSCRIPT NINE */
-#define XK_zerosubscript              0x1002080  /* U+2080 SUBSCRIPT ZERO */
-#define XK_onesubscript               0x1002081  /* U+2081 SUBSCRIPT ONE */
-#define XK_twosubscript               0x1002082  /* U+2082 SUBSCRIPT TWO */
-#define XK_threesubscript             0x1002083  /* U+2083 SUBSCRIPT THREE */
-#define XK_foursubscript              0x1002084  /* U+2084 SUBSCRIPT FOUR */
-#define XK_fivesubscript              0x1002085  /* U+2085 SUBSCRIPT FIVE */
-#define XK_sixsubscript               0x1002086  /* U+2086 SUBSCRIPT SIX */
-#define XK_sevensubscript             0x1002087  /* U+2087 SUBSCRIPT SEVEN */
-#define XK_eightsubscript             0x1002088  /* U+2088 SUBSCRIPT EIGHT */
-#define XK_ninesubscript              0x1002089  /* U+2089 SUBSCRIPT NINE */
-#define XK_partdifferential           0x1002202  /* U+2202 PARTIAL DIFFERENTIAL */
-#define XK_emptyset                   0x1002205  /* U+2205 NULL SET */
-#define XK_elementof                  0x1002208  /* U+2208 ELEMENT OF */
-#define XK_notelementof               0x1002209  /* U+2209 NOT AN ELEMENT OF */
-#define XK_containsas                 0x100220B  /* U+220B CONTAINS AS MEMBER */
-#define XK_squareroot                 0x100221A  /* U+221A SQUARE ROOT */
-#define XK_cuberoot                   0x100221B  /* U+221B CUBE ROOT */
-#define XK_fourthroot                 0x100221C  /* U+221C FOURTH ROOT */
-#define XK_dintegral                  0x100222C  /* U+222C DOUBLE INTEGRAL */
-#define XK_tintegral                  0x100222D  /* U+222D TRIPLE INTEGRAL */
-#define XK_because                    0x1002235  /* U+2235 BECAUSE */
-#define XK_approxeq                   0x1002248  /* U+2245 ALMOST EQUAL TO */
-#define XK_notapproxeq                0x1002247  /* U+2247 NOT ALMOST EQUAL TO */
-#define XK_notidentical               0x1002262  /* U+2262 NOT IDENTICAL TO */
-#define XK_stricteq                   0x1002263  /* U+2263 STRICTLY EQUIVALENT TO */          
-#endif /* XK_MATHEMATICAL */
-
-#ifdef XK_BRAILLE
-#define XK_braille_dot_1                 0xfff1
-#define XK_braille_dot_2                 0xfff2
-#define XK_braille_dot_3                 0xfff3
-#define XK_braille_dot_4                 0xfff4
-#define XK_braille_dot_5                 0xfff5
-#define XK_braille_dot_6                 0xfff6
-#define XK_braille_dot_7                 0xfff7
-#define XK_braille_dot_8                 0xfff8
-#define XK_braille_dot_9                 0xfff9
-#define XK_braille_dot_10                0xfffa
-#define XK_braille_blank              0x1002800  /* U+2800 BRAILLE PATTERN BLANK */
-#define XK_braille_dots_1             0x1002801  /* U+2801 BRAILLE PATTERN DOTS-1 */
-#define XK_braille_dots_2             0x1002802  /* U+2802 BRAILLE PATTERN DOTS-2 */
-#define XK_braille_dots_12            0x1002803  /* U+2803 BRAILLE PATTERN DOTS-12 */
-#define XK_braille_dots_3             0x1002804  /* U+2804 BRAILLE PATTERN DOTS-3 */
-#define XK_braille_dots_13            0x1002805  /* U+2805 BRAILLE PATTERN DOTS-13 */
-#define XK_braille_dots_23            0x1002806  /* U+2806 BRAILLE PATTERN DOTS-23 */
-#define XK_braille_dots_123           0x1002807  /* U+2807 BRAILLE PATTERN DOTS-123 */
-#define XK_braille_dots_4             0x1002808  /* U+2808 BRAILLE PATTERN DOTS-4 */
-#define XK_braille_dots_14            0x1002809  /* U+2809 BRAILLE PATTERN DOTS-14 */
-#define XK_braille_dots_24            0x100280a  /* U+280a BRAILLE PATTERN DOTS-24 */
-#define XK_braille_dots_124           0x100280b  /* U+280b BRAILLE PATTERN DOTS-124 */
-#define XK_braille_dots_34            0x100280c  /* U+280c BRAILLE PATTERN DOTS-34 */
-#define XK_braille_dots_134           0x100280d  /* U+280d BRAILLE PATTERN DOTS-134 */
-#define XK_braille_dots_234           0x100280e  /* U+280e BRAILLE PATTERN DOTS-234 */
-#define XK_braille_dots_1234          0x100280f  /* U+280f BRAILLE PATTERN DOTS-1234 */
-#define XK_braille_dots_5             0x1002810  /* U+2810 BRAILLE PATTERN DOTS-5 */
-#define XK_braille_dots_15            0x1002811  /* U+2811 BRAILLE PATTERN DOTS-15 */
-#define XK_braille_dots_25            0x1002812  /* U+2812 BRAILLE PATTERN DOTS-25 */
-#define XK_braille_dots_125           0x1002813  /* U+2813 BRAILLE PATTERN DOTS-125 */
-#define XK_braille_dots_35            0x1002814  /* U+2814 BRAILLE PATTERN DOTS-35 */
-#define XK_braille_dots_135           0x1002815  /* U+2815 BRAILLE PATTERN DOTS-135 */
-#define XK_braille_dots_235           0x1002816  /* U+2816 BRAILLE PATTERN DOTS-235 */
-#define XK_braille_dots_1235          0x1002817  /* U+2817 BRAILLE PATTERN DOTS-1235 */
-#define XK_braille_dots_45            0x1002818  /* U+2818 BRAILLE PATTERN DOTS-45 */
-#define XK_braille_dots_145           0x1002819  /* U+2819 BRAILLE PATTERN DOTS-145 */
-#define XK_braille_dots_245           0x100281a  /* U+281a BRAILLE PATTERN DOTS-245 */
-#define XK_braille_dots_1245          0x100281b  /* U+281b BRAILLE PATTERN DOTS-1245 */
-#define XK_braille_dots_345           0x100281c  /* U+281c BRAILLE PATTERN DOTS-345 */
-#define XK_braille_dots_1345          0x100281d  /* U+281d BRAILLE PATTERN DOTS-1345 */
-#define XK_braille_dots_2345          0x100281e  /* U+281e BRAILLE PATTERN DOTS-2345 */
-#define XK_braille_dots_12345         0x100281f  /* U+281f BRAILLE PATTERN DOTS-12345 */
-#define XK_braille_dots_6             0x1002820  /* U+2820 BRAILLE PATTERN DOTS-6 */
-#define XK_braille_dots_16            0x1002821  /* U+2821 BRAILLE PATTERN DOTS-16 */
-#define XK_braille_dots_26            0x1002822  /* U+2822 BRAILLE PATTERN DOTS-26 */
-#define XK_braille_dots_126           0x1002823  /* U+2823 BRAILLE PATTERN DOTS-126 */
-#define XK_braille_dots_36            0x1002824  /* U+2824 BRAILLE PATTERN DOTS-36 */
-#define XK_braille_dots_136           0x1002825  /* U+2825 BRAILLE PATTERN DOTS-136 */
-#define XK_braille_dots_236           0x1002826  /* U+2826 BRAILLE PATTERN DOTS-236 */
-#define XK_braille_dots_1236          0x1002827  /* U+2827 BRAILLE PATTERN DOTS-1236 */
-#define XK_braille_dots_46            0x1002828  /* U+2828 BRAILLE PATTERN DOTS-46 */
-#define XK_braille_dots_146           0x1002829  /* U+2829 BRAILLE PATTERN DOTS-146 */
-#define XK_braille_dots_246           0x100282a  /* U+282a BRAILLE PATTERN DOTS-246 */
-#define XK_braille_dots_1246          0x100282b  /* U+282b BRAILLE PATTERN DOTS-1246 */
-#define XK_braille_dots_346           0x100282c  /* U+282c BRAILLE PATTERN DOTS-346 */
-#define XK_braille_dots_1346          0x100282d  /* U+282d BRAILLE PATTERN DOTS-1346 */
-#define XK_braille_dots_2346          0x100282e  /* U+282e BRAILLE PATTERN DOTS-2346 */
-#define XK_braille_dots_12346         0x100282f  /* U+282f BRAILLE PATTERN DOTS-12346 */
-#define XK_braille_dots_56            0x1002830  /* U+2830 BRAILLE PATTERN DOTS-56 */
-#define XK_braille_dots_156           0x1002831  /* U+2831 BRAILLE PATTERN DOTS-156 */
-#define XK_braille_dots_256           0x1002832  /* U+2832 BRAILLE PATTERN DOTS-256 */
-#define XK_braille_dots_1256          0x1002833  /* U+2833 BRAILLE PATTERN DOTS-1256 */
-#define XK_braille_dots_356           0x1002834  /* U+2834 BRAILLE PATTERN DOTS-356 */
-#define XK_braille_dots_1356          0x1002835  /* U+2835 BRAILLE PATTERN DOTS-1356 */
-#define XK_braille_dots_2356          0x1002836  /* U+2836 BRAILLE PATTERN DOTS-2356 */
-#define XK_braille_dots_12356         0x1002837  /* U+2837 BRAILLE PATTERN DOTS-12356 */
-#define XK_braille_dots_456           0x1002838  /* U+2838 BRAILLE PATTERN DOTS-456 */
-#define XK_braille_dots_1456          0x1002839  /* U+2839 BRAILLE PATTERN DOTS-1456 */
-#define XK_braille_dots_2456          0x100283a  /* U+283a BRAILLE PATTERN DOTS-2456 */
-#define XK_braille_dots_12456         0x100283b  /* U+283b BRAILLE PATTERN DOTS-12456 */
-#define XK_braille_dots_3456          0x100283c  /* U+283c BRAILLE PATTERN DOTS-3456 */
-#define XK_braille_dots_13456         0x100283d  /* U+283d BRAILLE PATTERN DOTS-13456 */
-#define XK_braille_dots_23456         0x100283e  /* U+283e BRAILLE PATTERN DOTS-23456 */
-#define XK_braille_dots_123456        0x100283f  /* U+283f BRAILLE PATTERN DOTS-123456 */
-#define XK_braille_dots_7             0x1002840  /* U+2840 BRAILLE PATTERN DOTS-7 */
-#define XK_braille_dots_17            0x1002841  /* U+2841 BRAILLE PATTERN DOTS-17 */
-#define XK_braille_dots_27            0x1002842  /* U+2842 BRAILLE PATTERN DOTS-27 */
-#define XK_braille_dots_127           0x1002843  /* U+2843 BRAILLE PATTERN DOTS-127 */
-#define XK_braille_dots_37            0x1002844  /* U+2844 BRAILLE PATTERN DOTS-37 */
-#define XK_braille_dots_137           0x1002845  /* U+2845 BRAILLE PATTERN DOTS-137 */
-#define XK_braille_dots_237           0x1002846  /* U+2846 BRAILLE PATTERN DOTS-237 */
-#define XK_braille_dots_1237          0x1002847  /* U+2847 BRAILLE PATTERN DOTS-1237 */
-#define XK_braille_dots_47            0x1002848  /* U+2848 BRAILLE PATTERN DOTS-47 */
-#define XK_braille_dots_147           0x1002849  /* U+2849 BRAILLE PATTERN DOTS-147 */
-#define XK_braille_dots_247           0x100284a  /* U+284a BRAILLE PATTERN DOTS-247 */
-#define XK_braille_dots_1247          0x100284b  /* U+284b BRAILLE PATTERN DOTS-1247 */
-#define XK_braille_dots_347           0x100284c  /* U+284c BRAILLE PATTERN DOTS-347 */
-#define XK_braille_dots_1347          0x100284d  /* U+284d BRAILLE PATTERN DOTS-1347 */
-#define XK_braille_dots_2347          0x100284e  /* U+284e BRAILLE PATTERN DOTS-2347 */
-#define XK_braille_dots_12347         0x100284f  /* U+284f BRAILLE PATTERN DOTS-12347 */
-#define XK_braille_dots_57            0x1002850  /* U+2850 BRAILLE PATTERN DOTS-57 */
-#define XK_braille_dots_157           0x1002851  /* U+2851 BRAILLE PATTERN DOTS-157 */
-#define XK_braille_dots_257           0x1002852  /* U+2852 BRAILLE PATTERN DOTS-257 */
-#define XK_braille_dots_1257          0x1002853  /* U+2853 BRAILLE PATTERN DOTS-1257 */
-#define XK_braille_dots_357           0x1002854  /* U+2854 BRAILLE PATTERN DOTS-357 */
-#define XK_braille_dots_1357          0x1002855  /* U+2855 BRAILLE PATTERN DOTS-1357 */
-#define XK_braille_dots_2357          0x1002856  /* U+2856 BRAILLE PATTERN DOTS-2357 */
-#define XK_braille_dots_12357         0x1002857  /* U+2857 BRAILLE PATTERN DOTS-12357 */
-#define XK_braille_dots_457           0x1002858  /* U+2858 BRAILLE PATTERN DOTS-457 */
-#define XK_braille_dots_1457          0x1002859  /* U+2859 BRAILLE PATTERN DOTS-1457 */
-#define XK_braille_dots_2457          0x100285a  /* U+285a BRAILLE PATTERN DOTS-2457 */
-#define XK_braille_dots_12457         0x100285b  /* U+285b BRAILLE PATTERN DOTS-12457 */
-#define XK_braille_dots_3457          0x100285c  /* U+285c BRAILLE PATTERN DOTS-3457 */
-#define XK_braille_dots_13457         0x100285d  /* U+285d BRAILLE PATTERN DOTS-13457 */
-#define XK_braille_dots_23457         0x100285e  /* U+285e BRAILLE PATTERN DOTS-23457 */
-#define XK_braille_dots_123457        0x100285f  /* U+285f BRAILLE PATTERN DOTS-123457 */
-#define XK_braille_dots_67            0x1002860  /* U+2860 BRAILLE PATTERN DOTS-67 */
-#define XK_braille_dots_167           0x1002861  /* U+2861 BRAILLE PATTERN DOTS-167 */
-#define XK_braille_dots_267           0x1002862  /* U+2862 BRAILLE PATTERN DOTS-267 */
-#define XK_braille_dots_1267          0x1002863  /* U+2863 BRAILLE PATTERN DOTS-1267 */
-#define XK_braille_dots_367           0x1002864  /* U+2864 BRAILLE PATTERN DOTS-367 */
-#define XK_braille_dots_1367          0x1002865  /* U+2865 BRAILLE PATTERN DOTS-1367 */
-#define XK_braille_dots_2367          0x1002866  /* U+2866 BRAILLE PATTERN DOTS-2367 */
-#define XK_braille_dots_12367         0x1002867  /* U+2867 BRAILLE PATTERN DOTS-12367 */
-#define XK_braille_dots_467           0x1002868  /* U+2868 BRAILLE PATTERN DOTS-467 */
-#define XK_braille_dots_1467          0x1002869  /* U+2869 BRAILLE PATTERN DOTS-1467 */
-#define XK_braille_dots_2467          0x100286a  /* U+286a BRAILLE PATTERN DOTS-2467 */
-#define XK_braille_dots_12467         0x100286b  /* U+286b BRAILLE PATTERN DOTS-12467 */
-#define XK_braille_dots_3467          0x100286c  /* U+286c BRAILLE PATTERN DOTS-3467 */
-#define XK_braille_dots_13467         0x100286d  /* U+286d BRAILLE PATTERN DOTS-13467 */
-#define XK_braille_dots_23467         0x100286e  /* U+286e BRAILLE PATTERN DOTS-23467 */
-#define XK_braille_dots_123467        0x100286f  /* U+286f BRAILLE PATTERN DOTS-123467 */
-#define XK_braille_dots_567           0x1002870  /* U+2870 BRAILLE PATTERN DOTS-567 */
-#define XK_braille_dots_1567          0x1002871  /* U+2871 BRAILLE PATTERN DOTS-1567 */
-#define XK_braille_dots_2567          0x1002872  /* U+2872 BRAILLE PATTERN DOTS-2567 */
-#define XK_braille_dots_12567         0x1002873  /* U+2873 BRAILLE PATTERN DOTS-12567 */
-#define XK_braille_dots_3567          0x1002874  /* U+2874 BRAILLE PATTERN DOTS-3567 */
-#define XK_braille_dots_13567         0x1002875  /* U+2875 BRAILLE PATTERN DOTS-13567 */
-#define XK_braille_dots_23567         0x1002876  /* U+2876 BRAILLE PATTERN DOTS-23567 */
-#define XK_braille_dots_123567        0x1002877  /* U+2877 BRAILLE PATTERN DOTS-123567 */
-#define XK_braille_dots_4567          0x1002878  /* U+2878 BRAILLE PATTERN DOTS-4567 */
-#define XK_braille_dots_14567         0x1002879  /* U+2879 BRAILLE PATTERN DOTS-14567 */
-#define XK_braille_dots_24567         0x100287a  /* U+287a BRAILLE PATTERN DOTS-24567 */
-#define XK_braille_dots_124567        0x100287b  /* U+287b BRAILLE PATTERN DOTS-124567 */
-#define XK_braille_dots_34567         0x100287c  /* U+287c BRAILLE PATTERN DOTS-34567 */
-#define XK_braille_dots_134567        0x100287d  /* U+287d BRAILLE PATTERN DOTS-134567 */
-#define XK_braille_dots_234567        0x100287e  /* U+287e BRAILLE PATTERN DOTS-234567 */
-#define XK_braille_dots_1234567       0x100287f  /* U+287f BRAILLE PATTERN DOTS-1234567 */
-#define XK_braille_dots_8             0x1002880  /* U+2880 BRAILLE PATTERN DOTS-8 */
-#define XK_braille_dots_18            0x1002881  /* U+2881 BRAILLE PATTERN DOTS-18 */
-#define XK_braille_dots_28            0x1002882  /* U+2882 BRAILLE PATTERN DOTS-28 */
-#define XK_braille_dots_128           0x1002883  /* U+2883 BRAILLE PATTERN DOTS-128 */
-#define XK_braille_dots_38            0x1002884  /* U+2884 BRAILLE PATTERN DOTS-38 */
-#define XK_braille_dots_138           0x1002885  /* U+2885 BRAILLE PATTERN DOTS-138 */
-#define XK_braille_dots_238           0x1002886  /* U+2886 BRAILLE PATTERN DOTS-238 */
-#define XK_braille_dots_1238          0x1002887  /* U+2887 BRAILLE PATTERN DOTS-1238 */
-#define XK_braille_dots_48            0x1002888  /* U+2888 BRAILLE PATTERN DOTS-48 */
-#define XK_braille_dots_148           0x1002889  /* U+2889 BRAILLE PATTERN DOTS-148 */
-#define XK_braille_dots_248           0x100288a  /* U+288a BRAILLE PATTERN DOTS-248 */
-#define XK_braille_dots_1248          0x100288b  /* U+288b BRAILLE PATTERN DOTS-1248 */
-#define XK_braille_dots_348           0x100288c  /* U+288c BRAILLE PATTERN DOTS-348 */
-#define XK_braille_dots_1348          0x100288d  /* U+288d BRAILLE PATTERN DOTS-1348 */
-#define XK_braille_dots_2348          0x100288e  /* U+288e BRAILLE PATTERN DOTS-2348 */
-#define XK_braille_dots_12348         0x100288f  /* U+288f BRAILLE PATTERN DOTS-12348 */
-#define XK_braille_dots_58            0x1002890  /* U+2890 BRAILLE PATTERN DOTS-58 */
-#define XK_braille_dots_158           0x1002891  /* U+2891 BRAILLE PATTERN DOTS-158 */
-#define XK_braille_dots_258           0x1002892  /* U+2892 BRAILLE PATTERN DOTS-258 */
-#define XK_braille_dots_1258          0x1002893  /* U+2893 BRAILLE PATTERN DOTS-1258 */
-#define XK_braille_dots_358           0x1002894  /* U+2894 BRAILLE PATTERN DOTS-358 */
-#define XK_braille_dots_1358          0x1002895  /* U+2895 BRAILLE PATTERN DOTS-1358 */
-#define XK_braille_dots_2358          0x1002896  /* U+2896 BRAILLE PATTERN DOTS-2358 */
-#define XK_braille_dots_12358         0x1002897  /* U+2897 BRAILLE PATTERN DOTS-12358 */
-#define XK_braille_dots_458           0x1002898  /* U+2898 BRAILLE PATTERN DOTS-458 */
-#define XK_braille_dots_1458          0x1002899  /* U+2899 BRAILLE PATTERN DOTS-1458 */
-#define XK_braille_dots_2458          0x100289a  /* U+289a BRAILLE PATTERN DOTS-2458 */
-#define XK_braille_dots_12458         0x100289b  /* U+289b BRAILLE PATTERN DOTS-12458 */
-#define XK_braille_dots_3458          0x100289c  /* U+289c BRAILLE PATTERN DOTS-3458 */
-#define XK_braille_dots_13458         0x100289d  /* U+289d BRAILLE PATTERN DOTS-13458 */
-#define XK_braille_dots_23458         0x100289e  /* U+289e BRAILLE PATTERN DOTS-23458 */
-#define XK_braille_dots_123458        0x100289f  /* U+289f BRAILLE PATTERN DOTS-123458 */
-#define XK_braille_dots_68            0x10028a0  /* U+28a0 BRAILLE PATTERN DOTS-68 */
-#define XK_braille_dots_168           0x10028a1  /* U+28a1 BRAILLE PATTERN DOTS-168 */
-#define XK_braille_dots_268           0x10028a2  /* U+28a2 BRAILLE PATTERN DOTS-268 */
-#define XK_braille_dots_1268          0x10028a3  /* U+28a3 BRAILLE PATTERN DOTS-1268 */
-#define XK_braille_dots_368           0x10028a4  /* U+28a4 BRAILLE PATTERN DOTS-368 */
-#define XK_braille_dots_1368          0x10028a5  /* U+28a5 BRAILLE PATTERN DOTS-1368 */
-#define XK_braille_dots_2368          0x10028a6  /* U+28a6 BRAILLE PATTERN DOTS-2368 */
-#define XK_braille_dots_12368         0x10028a7  /* U+28a7 BRAILLE PATTERN DOTS-12368 */
-#define XK_braille_dots_468           0x10028a8  /* U+28a8 BRAILLE PATTERN DOTS-468 */
-#define XK_braille_dots_1468          0x10028a9  /* U+28a9 BRAILLE PATTERN DOTS-1468 */
-#define XK_braille_dots_2468          0x10028aa  /* U+28aa BRAILLE PATTERN DOTS-2468 */
-#define XK_braille_dots_12468         0x10028ab  /* U+28ab BRAILLE PATTERN DOTS-12468 */
-#define XK_braille_dots_3468          0x10028ac  /* U+28ac BRAILLE PATTERN DOTS-3468 */
-#define XK_braille_dots_13468         0x10028ad  /* U+28ad BRAILLE PATTERN DOTS-13468 */
-#define XK_braille_dots_23468         0x10028ae  /* U+28ae BRAILLE PATTERN DOTS-23468 */
-#define XK_braille_dots_123468        0x10028af  /* U+28af BRAILLE PATTERN DOTS-123468 */
-#define XK_braille_dots_568           0x10028b0  /* U+28b0 BRAILLE PATTERN DOTS-568 */
-#define XK_braille_dots_1568          0x10028b1  /* U+28b1 BRAILLE PATTERN DOTS-1568 */
-#define XK_braille_dots_2568          0x10028b2  /* U+28b2 BRAILLE PATTERN DOTS-2568 */
-#define XK_braille_dots_12568         0x10028b3  /* U+28b3 BRAILLE PATTERN DOTS-12568 */
-#define XK_braille_dots_3568          0x10028b4  /* U+28b4 BRAILLE PATTERN DOTS-3568 */
-#define XK_braille_dots_13568         0x10028b5  /* U+28b5 BRAILLE PATTERN DOTS-13568 */
-#define XK_braille_dots_23568         0x10028b6  /* U+28b6 BRAILLE PATTERN DOTS-23568 */
-#define XK_braille_dots_123568        0x10028b7  /* U+28b7 BRAILLE PATTERN DOTS-123568 */
-#define XK_braille_dots_4568          0x10028b8  /* U+28b8 BRAILLE PATTERN DOTS-4568 */
-#define XK_braille_dots_14568         0x10028b9  /* U+28b9 BRAILLE PATTERN DOTS-14568 */
-#define XK_braille_dots_24568         0x10028ba  /* U+28ba BRAILLE PATTERN DOTS-24568 */
-#define XK_braille_dots_124568        0x10028bb  /* U+28bb BRAILLE PATTERN DOTS-124568 */
-#define XK_braille_dots_34568         0x10028bc  /* U+28bc BRAILLE PATTERN DOTS-34568 */
-#define XK_braille_dots_134568        0x10028bd  /* U+28bd BRAILLE PATTERN DOTS-134568 */
-#define XK_braille_dots_234568        0x10028be  /* U+28be BRAILLE PATTERN DOTS-234568 */
-#define XK_braille_dots_1234568       0x10028bf  /* U+28bf BRAILLE PATTERN DOTS-1234568 */
-#define XK_braille_dots_78            0x10028c0  /* U+28c0 BRAILLE PATTERN DOTS-78 */
-#define XK_braille_dots_178           0x10028c1  /* U+28c1 BRAILLE PATTERN DOTS-178 */
-#define XK_braille_dots_278           0x10028c2  /* U+28c2 BRAILLE PATTERN DOTS-278 */
-#define XK_braille_dots_1278          0x10028c3  /* U+28c3 BRAILLE PATTERN DOTS-1278 */
-#define XK_braille_dots_378           0x10028c4  /* U+28c4 BRAILLE PATTERN DOTS-378 */
-#define XK_braille_dots_1378          0x10028c5  /* U+28c5 BRAILLE PATTERN DOTS-1378 */
-#define XK_braille_dots_2378          0x10028c6  /* U+28c6 BRAILLE PATTERN DOTS-2378 */
-#define XK_braille_dots_12378         0x10028c7  /* U+28c7 BRAILLE PATTERN DOTS-12378 */
-#define XK_braille_dots_478           0x10028c8  /* U+28c8 BRAILLE PATTERN DOTS-478 */
-#define XK_braille_dots_1478          0x10028c9  /* U+28c9 BRAILLE PATTERN DOTS-1478 */
-#define XK_braille_dots_2478          0x10028ca  /* U+28ca BRAILLE PATTERN DOTS-2478 */
-#define XK_braille_dots_12478         0x10028cb  /* U+28cb BRAILLE PATTERN DOTS-12478 */
-#define XK_braille_dots_3478          0x10028cc  /* U+28cc BRAILLE PATTERN DOTS-3478 */
-#define XK_braille_dots_13478         0x10028cd  /* U+28cd BRAILLE PATTERN DOTS-13478 */
-#define XK_braille_dots_23478         0x10028ce  /* U+28ce BRAILLE PATTERN DOTS-23478 */
-#define XK_braille_dots_123478        0x10028cf  /* U+28cf BRAILLE PATTERN DOTS-123478 */
-#define XK_braille_dots_578           0x10028d0  /* U+28d0 BRAILLE PATTERN DOTS-578 */
-#define XK_braille_dots_1578          0x10028d1  /* U+28d1 BRAILLE PATTERN DOTS-1578 */
-#define XK_braille_dots_2578          0x10028d2  /* U+28d2 BRAILLE PATTERN DOTS-2578 */
-#define XK_braille_dots_12578         0x10028d3  /* U+28d3 BRAILLE PATTERN DOTS-12578 */
-#define XK_braille_dots_3578          0x10028d4  /* U+28d4 BRAILLE PATTERN DOTS-3578 */
-#define XK_braille_dots_13578         0x10028d5  /* U+28d5 BRAILLE PATTERN DOTS-13578 */
-#define XK_braille_dots_23578         0x10028d6  /* U+28d6 BRAILLE PATTERN DOTS-23578 */
-#define XK_braille_dots_123578        0x10028d7  /* U+28d7 BRAILLE PATTERN DOTS-123578 */
-#define XK_braille_dots_4578          0x10028d8  /* U+28d8 BRAILLE PATTERN DOTS-4578 */
-#define XK_braille_dots_14578         0x10028d9  /* U+28d9 BRAILLE PATTERN DOTS-14578 */
-#define XK_braille_dots_24578         0x10028da  /* U+28da BRAILLE PATTERN DOTS-24578 */
-#define XK_braille_dots_124578        0x10028db  /* U+28db BRAILLE PATTERN DOTS-124578 */
-#define XK_braille_dots_34578         0x10028dc  /* U+28dc BRAILLE PATTERN DOTS-34578 */
-#define XK_braille_dots_134578        0x10028dd  /* U+28dd BRAILLE PATTERN DOTS-134578 */
-#define XK_braille_dots_234578        0x10028de  /* U+28de BRAILLE PATTERN DOTS-234578 */
-#define XK_braille_dots_1234578       0x10028df  /* U+28df BRAILLE PATTERN DOTS-1234578 */
-#define XK_braille_dots_678           0x10028e0  /* U+28e0 BRAILLE PATTERN DOTS-678 */
-#define XK_braille_dots_1678          0x10028e1  /* U+28e1 BRAILLE PATTERN DOTS-1678 */
-#define XK_braille_dots_2678          0x10028e2  /* U+28e2 BRAILLE PATTERN DOTS-2678 */
-#define XK_braille_dots_12678         0x10028e3  /* U+28e3 BRAILLE PATTERN DOTS-12678 */
-#define XK_braille_dots_3678          0x10028e4  /* U+28e4 BRAILLE PATTERN DOTS-3678 */
-#define XK_braille_dots_13678         0x10028e5  /* U+28e5 BRAILLE PATTERN DOTS-13678 */
-#define XK_braille_dots_23678         0x10028e6  /* U+28e6 BRAILLE PATTERN DOTS-23678 */
-#define XK_braille_dots_123678        0x10028e7  /* U+28e7 BRAILLE PATTERN DOTS-123678 */
-#define XK_braille_dots_4678          0x10028e8  /* U+28e8 BRAILLE PATTERN DOTS-4678 */
-#define XK_braille_dots_14678         0x10028e9  /* U+28e9 BRAILLE PATTERN DOTS-14678 */
-#define XK_braille_dots_24678         0x10028ea  /* U+28ea BRAILLE PATTERN DOTS-24678 */
-#define XK_braille_dots_124678        0x10028eb  /* U+28eb BRAILLE PATTERN DOTS-124678 */
-#define XK_braille_dots_34678         0x10028ec  /* U+28ec BRAILLE PATTERN DOTS-34678 */
-#define XK_braille_dots_134678        0x10028ed  /* U+28ed BRAILLE PATTERN DOTS-134678 */
-#define XK_braille_dots_234678        0x10028ee  /* U+28ee BRAILLE PATTERN DOTS-234678 */
-#define XK_braille_dots_1234678       0x10028ef  /* U+28ef BRAILLE PATTERN DOTS-1234678 */
-#define XK_braille_dots_5678          0x10028f0  /* U+28f0 BRAILLE PATTERN DOTS-5678 */
-#define XK_braille_dots_15678         0x10028f1  /* U+28f1 BRAILLE PATTERN DOTS-15678 */
-#define XK_braille_dots_25678         0x10028f2  /* U+28f2 BRAILLE PATTERN DOTS-25678 */
-#define XK_braille_dots_125678        0x10028f3  /* U+28f3 BRAILLE PATTERN DOTS-125678 */
-#define XK_braille_dots_35678         0x10028f4  /* U+28f4 BRAILLE PATTERN DOTS-35678 */
-#define XK_braille_dots_135678        0x10028f5  /* U+28f5 BRAILLE PATTERN DOTS-135678 */
-#define XK_braille_dots_235678        0x10028f6  /* U+28f6 BRAILLE PATTERN DOTS-235678 */
-#define XK_braille_dots_1235678       0x10028f7  /* U+28f7 BRAILLE PATTERN DOTS-1235678 */
-#define XK_braille_dots_45678         0x10028f8  /* U+28f8 BRAILLE PATTERN DOTS-45678 */
-#define XK_braille_dots_145678        0x10028f9  /* U+28f9 BRAILLE PATTERN DOTS-145678 */
-#define XK_braille_dots_245678        0x10028fa  /* U+28fa BRAILLE PATTERN DOTS-245678 */
-#define XK_braille_dots_1245678       0x10028fb  /* U+28fb BRAILLE PATTERN DOTS-1245678 */
-#define XK_braille_dots_345678        0x10028fc  /* U+28fc BRAILLE PATTERN DOTS-345678 */
-#define XK_braille_dots_1345678       0x10028fd  /* U+28fd BRAILLE PATTERN DOTS-1345678 */
-#define XK_braille_dots_2345678       0x10028fe  /* U+28fe BRAILLE PATTERN DOTS-2345678 */
-#define XK_braille_dots_12345678      0x10028ff  /* U+28ff BRAILLE PATTERN DOTS-12345678 */
-#endif /* XK_BRAILLE */
-
-/*
- * Sinhala (http://unicode.org/charts/PDF/U0D80.pdf)
- * http://www.nongnu.org/sinhala/doc/transliteration/sinhala-transliteration_6.html
- */
-
-#ifdef XK_SINHALA
-#define XK_Sinh_ng            0x1000d82  /* U+0D82 SINHALA ANUSVARAYA */
-#define XK_Sinh_h2            0x1000d83  /* U+0D83 SINHALA VISARGAYA */
-#define XK_Sinh_a             0x1000d85  /* U+0D85 SINHALA AYANNA */
-#define XK_Sinh_aa            0x1000d86  /* U+0D86 SINHALA AAYANNA */
-#define XK_Sinh_ae            0x1000d87  /* U+0D87 SINHALA AEYANNA */
-#define XK_Sinh_aee           0x1000d88  /* U+0D88 SINHALA AEEYANNA */
-#define XK_Sinh_i             0x1000d89  /* U+0D89 SINHALA IYANNA */
-#define XK_Sinh_ii            0x1000d8a  /* U+0D8A SINHALA IIYANNA */
-#define XK_Sinh_u             0x1000d8b  /* U+0D8B SINHALA UYANNA */
-#define XK_Sinh_uu            0x1000d8c  /* U+0D8C SINHALA UUYANNA */
-#define XK_Sinh_ri            0x1000d8d  /* U+0D8D SINHALA IRUYANNA */
-#define XK_Sinh_rii           0x1000d8e  /* U+0D8E SINHALA IRUUYANNA */
-#define XK_Sinh_lu            0x1000d8f  /* U+0D8F SINHALA ILUYANNA */
-#define XK_Sinh_luu           0x1000d90  /* U+0D90 SINHALA ILUUYANNA */
-#define XK_Sinh_e             0x1000d91  /* U+0D91 SINHALA EYANNA */
-#define XK_Sinh_ee            0x1000d92  /* U+0D92 SINHALA EEYANNA */
-#define XK_Sinh_ai            0x1000d93  /* U+0D93 SINHALA AIYANNA */
-#define XK_Sinh_o             0x1000d94  /* U+0D94 SINHALA OYANNA */
-#define XK_Sinh_oo            0x1000d95  /* U+0D95 SINHALA OOYANNA */
-#define XK_Sinh_au            0x1000d96  /* U+0D96 SINHALA AUYANNA */
-#define XK_Sinh_ka            0x1000d9a  /* U+0D9A SINHALA KAYANNA */
-#define XK_Sinh_kha           0x1000d9b  /* U+0D9B SINHALA MAHA. KAYANNA */
-#define XK_Sinh_ga            0x1000d9c  /* U+0D9C SINHALA GAYANNA */
-#define XK_Sinh_gha           0x1000d9d  /* U+0D9D SINHALA MAHA. GAYANNA */
-#define XK_Sinh_ng2           0x1000d9e  /* U+0D9E SINHALA KANTAJA NAASIKYAYA */
-#define XK_Sinh_nga           0x1000d9f  /* U+0D9F SINHALA SANYAKA GAYANNA */
-#define XK_Sinh_ca            0x1000da0  /* U+0DA0 SINHALA CAYANNA */
-#define XK_Sinh_cha           0x1000da1  /* U+0DA1 SINHALA MAHA. CAYANNA */
-#define XK_Sinh_ja            0x1000da2  /* U+0DA2 SINHALA JAYANNA */
-#define XK_Sinh_jha           0x1000da3  /* U+0DA3 SINHALA MAHA. JAYANNA */
-#define XK_Sinh_nya           0x1000da4  /* U+0DA4 SINHALA TAALUJA NAASIKYAYA */
-#define XK_Sinh_jnya          0x1000da5  /* U+0DA5 SINHALA TAALUJA SANYOOGA NAASIKYAYA */
-#define XK_Sinh_nja           0x1000da6  /* U+0DA6 SINHALA SANYAKA JAYANNA */
-#define XK_Sinh_tta           0x1000da7  /* U+0DA7 SINHALA TTAYANNA */
-#define XK_Sinh_ttha          0x1000da8  /* U+0DA8 SINHALA MAHA. TTAYANNA */
-#define XK_Sinh_dda           0x1000da9  /* U+0DA9 SINHALA DDAYANNA */
-#define XK_Sinh_ddha          0x1000daa  /* U+0DAA SINHALA MAHA. DDAYANNA */
-#define XK_Sinh_nna           0x1000dab  /* U+0DAB SINHALA MUURDHAJA NAYANNA */
-#define XK_Sinh_ndda          0x1000dac  /* U+0DAC SINHALA SANYAKA DDAYANNA */
-#define XK_Sinh_tha           0x1000dad  /* U+0DAD SINHALA TAYANNA */
-#define XK_Sinh_thha          0x1000dae  /* U+0DAE SINHALA MAHA. TAYANNA */
-#define XK_Sinh_dha           0x1000daf  /* U+0DAF SINHALA DAYANNA */
-#define XK_Sinh_dhha          0x1000db0  /* U+0DB0 SINHALA MAHA. DAYANNA */
-#define XK_Sinh_na            0x1000db1  /* U+0DB1 SINHALA DANTAJA NAYANNA */
-#define XK_Sinh_ndha          0x1000db3  /* U+0DB3 SINHALA SANYAKA DAYANNA */
-#define XK_Sinh_pa            0x1000db4  /* U+0DB4 SINHALA PAYANNA */
-#define XK_Sinh_pha           0x1000db5  /* U+0DB5 SINHALA MAHA. PAYANNA */
-#define XK_Sinh_ba            0x1000db6  /* U+0DB6 SINHALA BAYANNA */
-#define XK_Sinh_bha           0x1000db7  /* U+0DB7 SINHALA MAHA. BAYANNA */
-#define XK_Sinh_ma            0x1000db8  /* U+0DB8 SINHALA MAYANNA */
-#define XK_Sinh_mba           0x1000db9  /* U+0DB9 SINHALA AMBA BAYANNA */
-#define XK_Sinh_ya            0x1000dba  /* U+0DBA SINHALA YAYANNA */
-#define XK_Sinh_ra            0x1000dbb  /* U+0DBB SINHALA RAYANNA */
-#define XK_Sinh_la            0x1000dbd  /* U+0DBD SINHALA DANTAJA LAYANNA */
-#define XK_Sinh_va            0x1000dc0  /* U+0DC0 SINHALA VAYANNA */
-#define XK_Sinh_sha           0x1000dc1  /* U+0DC1 SINHALA TAALUJA SAYANNA */
-#define XK_Sinh_ssha          0x1000dc2  /* U+0DC2 SINHALA MUURDHAJA SAYANNA */
-#define XK_Sinh_sa            0x1000dc3  /* U+0DC3 SINHALA DANTAJA SAYANNA */
-#define XK_Sinh_ha            0x1000dc4  /* U+0DC4 SINHALA HAYANNA */
-#define XK_Sinh_lla           0x1000dc5  /* U+0DC5 SINHALA MUURDHAJA LAYANNA */
-#define XK_Sinh_fa            0x1000dc6  /* U+0DC6 SINHALA FAYANNA */
-#define XK_Sinh_al            0x1000dca  /* U+0DCA SINHALA AL-LAKUNA */
-#define XK_Sinh_aa2           0x1000dcf  /* U+0DCF SINHALA AELA-PILLA */
-#define XK_Sinh_ae2           0x1000dd0  /* U+0DD0 SINHALA AEDA-PILLA */
-#define XK_Sinh_aee2          0x1000dd1  /* U+0DD1 SINHALA DIGA AEDA-PILLA */
-#define XK_Sinh_i2            0x1000dd2  /* U+0DD2 SINHALA IS-PILLA */
-#define XK_Sinh_ii2           0x1000dd3  /* U+0DD3 SINHALA DIGA IS-PILLA */
-#define XK_Sinh_u2            0x1000dd4  /* U+0DD4 SINHALA PAA-PILLA */
-#define XK_Sinh_uu2           0x1000dd6  /* U+0DD6 SINHALA DIGA PAA-PILLA */
-#define XK_Sinh_ru2           0x1000dd8  /* U+0DD8 SINHALA GAETTA-PILLA */
-#define XK_Sinh_e2            0x1000dd9  /* U+0DD9 SINHALA KOMBUVA */
-#define XK_Sinh_ee2           0x1000dda  /* U+0DDA SINHALA DIGA KOMBUVA */
-#define XK_Sinh_ai2           0x1000ddb  /* U+0DDB SINHALA KOMBU DEKA */
-#define XK_Sinh_o2            0x1000ddc  /* U+0DDC SINHALA KOMBUVA HAA AELA-PILLA*/
-#define XK_Sinh_oo2           0x1000ddd  /* U+0DDD SINHALA KOMBUVA HAA DIGA AELA-PILLA*/
-#define XK_Sinh_au2           0x1000dde  /* U+0DDE SINHALA KOMBUVA HAA GAYANUKITTA */
-#define XK_Sinh_lu2           0x1000ddf  /* U+0DDF SINHALA GAYANUKITTA */
-#define XK_Sinh_ruu2          0x1000df2  /* U+0DF2 SINHALA DIGA GAETTA-PILLA */
-#define XK_Sinh_luu2          0x1000df3  /* U+0DF3 SINHALA DIGA GAYANUKITTA */
-#define XK_Sinh_kunddaliya    0x1000df4  /* U+0DF4 SINHALA KUNDDALIYA */
-#endif /* XK_SINHALA */
diff --git a/openflow/usr/include/_G_config.h b/openflow/usr/include/_G_config.h
deleted file mode 100644
index abec245..0000000
--- a/openflow/usr/include/_G_config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This file is needed by libio to define various configuration parameters.
-   These are always the same in the GNU C library.  */
-
-#ifndef _G_config_h
-#define _G_config_h 1
-
-/* Define types for libio in terms of the standard internal type names.  */
-
-#include <bits/types.h>
-#define __need_size_t
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-# define __need_wchar_t
-#endif
-#define __need_NULL
-#include <stddef.h>
-#define __need_mbstate_t
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-# define __need_wint_t
-#endif
-#include <wchar.h>
-typedef struct
-{
-  __off_t __pos;
-  __mbstate_t __state;
-} _G_fpos_t;
-typedef struct
-{
-  __off64_t __pos;
-  __mbstate_t __state;
-} _G_fpos64_t;
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-# include <gconv.h>
-typedef union
-{
-  struct __gconv_info __cd;
-  struct
-  {
-    struct __gconv_info __cd;
-    struct __gconv_step_data __data;
-  } __combined;
-} _G_iconv_t;
-#endif
-
-
-/* These library features are always available in the GNU C library.  */
-#define _G_va_list __gnuc_va_list
-
-#define _G_HAVE_MMAP 1
-#define _G_HAVE_MREMAP 1
-
-#define _G_IO_IO_FILE_VERSION 0x20001
-
-/* This is defined by <bits/stat.h> if `st_blksize' exists.  */
-#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)
-
-#define _G_BUFSIZ 8192
-
-#endif	/* _G_config.h */
diff --git a/openflow/usr/include/aio.h b/openflow/usr/include/aio.h
deleted file mode 100644
index 8cb6a5e..0000000
--- a/openflow/usr/include/aio.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * ISO/IEC 9945-1:1996 6.7: Asynchronous Input and Output
- */
-
-#ifndef _AIO_H
-#define _AIO_H	1
-
-#include <features.h>
-#include <sys/types.h>
-#define __need_sigevent_t
-#include <bits/siginfo.h>
-#define __need_timespec
-#include <time.h>
-
-__BEGIN_DECLS
-
-/* Asynchronous I/O control block.  */
-struct aiocb
-{
-  int aio_fildes;		/* File desriptor.  */
-  int aio_lio_opcode;		/* Operation to be performed.  */
-  int aio_reqprio;		/* Request priority offset.  */
-  volatile void *aio_buf;	/* Location of buffer.  */
-  size_t aio_nbytes;		/* Length of transfer.  */
-  struct sigevent aio_sigevent;	/* Signal number and value.  */
-
-  /* Internal members.  */
-  struct aiocb *__next_prio;
-  int __abs_prio;
-  int __policy;
-  int __error_code;
-  __ssize_t __return_value;
-
-#ifndef __USE_FILE_OFFSET64
-  __off_t aio_offset;		/* File offset.  */
-  char __pad[sizeof (__off64_t) - sizeof (__off_t)];
-#else
-  __off64_t aio_offset;		/* File offset.  */
-#endif
-  char __glibc_reserved[32];
-};
-
-/* The same for the 64bit offsets.  Please note that the members aio_fildes
-   to __return_value have to be the same in aiocb and aiocb64.  */
-#ifdef __USE_LARGEFILE64
-struct aiocb64
-{
-  int aio_fildes;		/* File desriptor.  */
-  int aio_lio_opcode;		/* Operation to be performed.  */
-  int aio_reqprio;		/* Request priority offset.  */
-  volatile void *aio_buf;	/* Location of buffer.  */
-  size_t aio_nbytes;		/* Length of transfer.  */
-  struct sigevent aio_sigevent;	/* Signal number and value.  */
-
-  /* Internal members.  */
-  struct aiocb *__next_prio;
-  int __abs_prio;
-  int __policy;
-  int __error_code;
-  __ssize_t __return_value;
-
-  __off64_t aio_offset;		/* File offset.  */
-  char __glibc_reserved[32];
-};
-#endif
-
-
-#ifdef __USE_GNU
-/* To customize the implementation one can use the following struct.
-   This implementation follows the one in Irix.  */
-struct aioinit
-  {
-    int aio_threads;		/* Maximal number of threads.  */
-    int aio_num;		/* Number of expected simultanious requests. */
-    int aio_locks;		/* Not used.  */
-    int aio_usedba;		/* Not used.  */
-    int aio_debug;		/* Not used.  */
-    int aio_numusers;		/* Not used.  */
-    int aio_idle_time;		/* Number of seconds before idle thread
-				   terminates.  */
-    int aio_reserved;
-  };
-#endif
-
-
-/* Return values of cancelation function.  */
-enum
-{
-  AIO_CANCELED,
-#define AIO_CANCELED AIO_CANCELED
-  AIO_NOTCANCELED,
-#define AIO_NOTCANCELED AIO_NOTCANCELED
-  AIO_ALLDONE
-#define AIO_ALLDONE AIO_ALLDONE
-};
-
-
-/* Operation codes for `aio_lio_opcode'.  */
-enum
-{
-  LIO_READ,
-#define LIO_READ LIO_READ
-  LIO_WRITE,
-#define LIO_WRITE LIO_WRITE
-  LIO_NOP
-#define LIO_NOP LIO_NOP
-};
-
-
-/* Synchronization options for `lio_listio' function.  */
-enum
-{
-  LIO_WAIT,
-#define LIO_WAIT LIO_WAIT
-  LIO_NOWAIT
-#define LIO_NOWAIT LIO_NOWAIT
-};
-
-
-/* Allow user to specify optimization.  */
-#ifdef __USE_GNU
-extern void aio_init (const struct aioinit *__init) __THROW __nonnull ((1));
-#endif
-
-
-#ifndef __USE_FILE_OFFSET64
-/* Enqueue read request for given number of bytes and the given priority.  */
-extern int aio_read (struct aiocb *__aiocbp) __THROW __nonnull ((1));
-/* Enqueue write request for given number of bytes and the given priority.  */
-extern int aio_write (struct aiocb *__aiocbp) __THROW __nonnull ((1));
-
-/* Initiate list of I/O requests.  */
-extern int lio_listio (int __mode,
-		       struct aiocb *const __list[__restrict_arr],
-		       int __nent, struct sigevent *__restrict __sig)
-  __THROW __nonnull ((2));
-
-/* Retrieve error status associated with AIOCBP.  */
-extern int aio_error (const struct aiocb *__aiocbp) __THROW __nonnull ((1));
-/* Return status associated with AIOCBP.  */
-extern __ssize_t aio_return (struct aiocb *__aiocbp) __THROW __nonnull ((1));
-
-/* Try to cancel asynchronous I/O requests outstanding against file
-   descriptor FILDES.  */
-extern int aio_cancel (int __fildes, struct aiocb *__aiocbp) __THROW;
-
-/* Suspend calling thread until at least one of the asynchronous I/O
-   operations referenced by LIST has completed.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int aio_suspend (const struct aiocb *const __list[], int __nent,
-			const struct timespec *__restrict __timeout)
-  __nonnull ((1));
-
-/* Force all operations associated with file desriptor described by
-   `aio_fildes' member of AIOCBP.  */
-extern int aio_fsync (int __operation, struct aiocb *__aiocbp)
-  __THROW __nonnull ((2));
-#else
-# ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (aio_read, (struct aiocb *__aiocbp), aio_read64)
-  __nonnull ((1));
-extern int __REDIRECT_NTH (aio_write, (struct aiocb *__aiocbp), aio_write64)
-  __nonnull ((1));
-
-extern int __REDIRECT_NTH (lio_listio,
-			   (int __mode,
-			    struct aiocb *const __list[__restrict_arr],
-			    int __nent, struct sigevent *__restrict __sig),
-			   lio_listio64) __nonnull ((2));
-
-extern int __REDIRECT_NTH (aio_error, (const struct aiocb *__aiocbp),
-			   aio_error64) __nonnull ((1));
-extern __ssize_t __REDIRECT_NTH (aio_return, (struct aiocb *__aiocbp),
-				 aio_return64) __nonnull ((1));
-
-extern int __REDIRECT_NTH (aio_cancel,
-			   (int __fildes, struct aiocb *__aiocbp),
-			   aio_cancel64);
-
-extern int __REDIRECT_NTH (aio_suspend,
-			   (const struct aiocb *const __list[], int __nent,
-			    const struct timespec *__restrict __timeout),
-			   aio_suspend64) __nonnull ((1));
-
-extern int __REDIRECT_NTH (aio_fsync,
-			   (int __operation, struct aiocb *__aiocbp),
-			   aio_fsync64) __nonnull ((2));
-
-# else
-#  define aio_read aio_read64
-#  define aio_write aio_write64
-#  define lio_listio lio_listio64
-#  define aio_error aio_error64
-#  define aio_return aio_return64
-#  define aio_cancel aio_cancel64
-#  define aio_suspend aio_suspend64
-#  define aio_fsync aio_fsync64
-# endif
-#endif
-
-#ifdef __USE_LARGEFILE64
-extern int aio_read64 (struct aiocb64 *__aiocbp) __THROW __nonnull ((1));
-extern int aio_write64 (struct aiocb64 *__aiocbp) __THROW __nonnull ((1));
-
-extern int lio_listio64 (int __mode,
-			 struct aiocb64 *const __list[__restrict_arr],
-			 int __nent, struct sigevent *__restrict __sig)
-  __THROW __nonnull ((2));
-
-extern int aio_error64 (const struct aiocb64 *__aiocbp)
-  __THROW __nonnull ((1));
-extern __ssize_t aio_return64 (struct aiocb64 *__aiocbp)
-  __THROW __nonnull ((1));
-
-extern int aio_cancel64 (int __fildes, struct aiocb64 *__aiocbp) __THROW;
-
-extern int aio_suspend64 (const struct aiocb64 *const __list[], int __nent,
-			  const struct timespec *__restrict __timeout)
-  __THROW __nonnull ((1));
-
-extern int aio_fsync64 (int __operation, struct aiocb64 *__aiocbp)
-  __THROW __nonnull ((2));
-#endif
-
-__END_DECLS
-
-#endif /* aio.h */
diff --git a/openflow/usr/include/aliases.h b/openflow/usr/include/aliases.h
deleted file mode 100644
index 44760d3..0000000
--- a/openflow/usr/include/aliases.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ALIASES_H
-#define _ALIASES_H	1
-
-#include <features.h>
-
-#include <sys/types.h>
-
-
-__BEGIN_DECLS
-
-/* Structure to represent one entry of the alias data base.  */
-struct aliasent
-  {
-    char *alias_name;
-    size_t alias_members_len;
-    char **alias_members;
-    int alias_local;
-  };
-
-
-/* Open alias data base files.  */
-extern void setaliasent (void) __THROW;
-
-/* Close alias data base files.  */
-extern void endaliasent (void) __THROW;
-
-/* Get the next entry from the alias data base.  */
-extern struct aliasent *getaliasent (void) __THROW;
-
-/* Get the next entry from the alias data base and put it in RESULT_BUF.  */
-extern int getaliasent_r (struct aliasent *__restrict __result_buf,
-			  char *__restrict __buffer, size_t __buflen,
-			  struct aliasent **__restrict __result) __THROW;
-
-/* Get alias entry corresponding to NAME.  */
-extern struct aliasent *getaliasbyname (const char *__name) __THROW;
-
-/* Get alias entry corresponding to NAME and put it in RESULT_BUF.  */
-extern int getaliasbyname_r (const char *__restrict __name,
-			     struct aliasent *__restrict __result_buf,
-			     char *__restrict __buffer, size_t __buflen,
-			     struct aliasent **__restrict __result) __THROW;
-
-__END_DECLS
-
-#endif /* aliases.h */
diff --git a/openflow/usr/include/alloca.h b/openflow/usr/include/alloca.h
deleted file mode 100644
index 974d11a..0000000
--- a/openflow/usr/include/alloca.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_ALLOCA_H
-#define	_ALLOCA_H	1
-
-#include <features.h>
-
-#define	__need_size_t
-#include <stddef.h>
-
-__BEGIN_DECLS
-
-/* Remove any previous definitions.  */
-#undef	alloca
-
-/* Allocate a block that will be freed when the calling function exits.  */
-extern void *alloca (size_t __size) __THROW;
-
-#ifdef	__GNUC__
-# define alloca(size)	__builtin_alloca (size)
-#endif /* GCC.  */
-
-__END_DECLS
-
-#endif /* alloca.h */
diff --git a/openflow/usr/include/ar.h b/openflow/usr/include/ar.h
deleted file mode 100644
index caa0223..0000000
--- a/openflow/usr/include/ar.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Header describing `ar' archive file format.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _AR_H
-#define _AR_H 1
-
-#include <sys/cdefs.h>
-
-/* Archive files start with the ARMAG identifying string.  Then follows a
-   `struct ar_hdr', and as many bytes of member file data as its `ar_size'
-   member indicates, for each member file.  */
-
-#define ARMAG	"!<arch>\n"	/* String that begins an archive file.  */
-#define SARMAG	8		/* Size of that string.  */
-
-#define ARFMAG	"`\n"		/* String in ar_fmag at end of each header.  */
-
-__BEGIN_DECLS
-
-struct ar_hdr
-  {
-    char ar_name[16];		/* Member file name, sometimes / terminated. */
-    char ar_date[12];		/* File date, decimal seconds since Epoch.  */
-    char ar_uid[6], ar_gid[6];	/* User and group IDs, in ASCII decimal.  */
-    char ar_mode[8];		/* File mode, in ASCII octal.  */
-    char ar_size[10];		/* File size, in ASCII decimal.  */
-    char ar_fmag[2];		/* Always contains ARFMAG.  */
-  };
-
-__END_DECLS
-
-#endif /* ar.h */
diff --git a/openflow/usr/include/argp.h b/openflow/usr/include/argp.h
deleted file mode 100644
index 7cb5a69..0000000
--- a/openflow/usr/include/argp.h
+++ /dev/null
@@ -1,559 +0,0 @@
-/* Hierarchial argument parsing, layered over getopt.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ARGP_H
-#define _ARGP_H
-
-#include <stdio.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <limits.h>
-
-#define __need_error_t
-#include <errno.h>
-
-#ifndef __error_t_defined
-typedef int error_t;
-# define __error_t_defined
-#endif
-
-__BEGIN_DECLS
-
-/* A description of a particular option.  A pointer to an array of
-   these is passed in the OPTIONS field of an argp structure.  Each option
-   entry can correspond to one long option and/or one short option; more
-   names for the same option can be added by following an entry in an option
-   array with options having the OPTION_ALIAS flag set.  */
-struct argp_option
-{
-  /* The long option name.  For more than one name for the same option, you
-     can use following options with the OPTION_ALIAS flag set.  */
-  const char *name;
-
-  /* What key is returned for this option.  If > 0 and printable, then it's
-     also accepted as a short option.  */
-  int key;
-
-  /* If non-NULL, this is the name of the argument associated with this
-     option, which is required unless the OPTION_ARG_OPTIONAL flag is set. */
-  const char *arg;
-
-  /* OPTION_ flags.  */
-  int flags;
-
-  /* The doc string for this option.  If both NAME and KEY are 0, This string
-     will be printed outdented from the normal option column, making it
-     useful as a group header (it will be the first thing printed in its
-     group); in this usage, it's conventional to end the string with a `:'.  */
-  const char *doc;
-
-  /* The group this option is in.  In a long help message, options are sorted
-     alphabetically within each group, and the groups presented in the order
-     0, 1, 2, ..., n, -m, ..., -2, -1.  Every entry in an options array with
-     if this field 0 will inherit the group number of the previous entry, or
-     zero if it's the first one, unless its a group header (NAME and KEY both
-     0), in which case, the previous entry + 1 is the default.  Automagic
-     options such as --help are put into group -1.  */
-  int group;
-};
-
-/* The argument associated with this option is optional.  */
-#define OPTION_ARG_OPTIONAL	0x1
-
-/* This option isn't displayed in any help messages.  */
-#define OPTION_HIDDEN	       	0x2
-
-/* This option is an alias for the closest previous non-alias option.  This
-   means that it will be displayed in the same help entry, and will inherit
-   fields other than NAME and KEY from the aliased option.  */
-#define OPTION_ALIAS		0x4
-
-/* This option isn't actually an option (and so should be ignored by the
-   actual option parser), but rather an arbitrary piece of documentation that
-   should be displayed in much the same manner as the options.  If this flag
-   is set, then the option NAME field is displayed unmodified (e.g., no `--'
-   prefix is added) at the left-margin (where a *short* option would normally
-   be displayed), and the documentation string in the normal place.  For
-   purposes of sorting, any leading whitespace and punctuation is ignored,
-   except that if the first non-whitespace character is not `-', this entry
-   is displayed after all options (and OPTION_DOC entries with a leading `-')
-   in the same group.  */
-#define OPTION_DOC		0x8
-
-/* This option shouldn't be included in `long' usage messages (but is still
-   included in help messages).  This is mainly intended for options that are
-   completely documented in an argp's ARGS_DOC field, in which case including
-   the option in the generic usage list would be redundant.  For instance,
-   if ARGS_DOC is "FOO BAR\n-x BLAH", and the `-x' option's purpose is to
-   distinguish these two cases, -x should probably be marked
-   OPTION_NO_USAGE.  */
-#define OPTION_NO_USAGE		0x10
-
-struct argp;			/* fwd declare this type */
-struct argp_state;		/* " */
-struct argp_child;		/* " */
-
-/* The type of a pointer to an argp parsing function.  */
-typedef error_t (*argp_parser_t) (int __key, char *__arg,
-				  struct argp_state *__state);
-
-/* What to return for unrecognized keys.  For special ARGP_KEY_ keys, such
-   returns will simply be ignored.  For user keys, this error will be turned
-   into EINVAL (if the call to argp_parse is such that errors are propagated
-   back to the user instead of exiting); returning EINVAL itself would result
-   in an immediate stop to parsing in *all* cases.  */
-#define ARGP_ERR_UNKNOWN	E2BIG /* Hurd should never need E2BIG.  XXX */
-
-/* Special values for the KEY argument to an argument parsing function.
-   ARGP_ERR_UNKNOWN should be returned if they aren't understood.
-
-   The sequence of keys to a parsing function is either (where each
-   uppercased word should be prefixed by `ARGP_KEY_' and opt is a user key):
-
-       INIT opt... NO_ARGS END SUCCESS  -- No non-option arguments at all
-   or  INIT (opt | ARG)... END SUCCESS  -- All non-option args parsed
-   or  INIT (opt | ARG)... SUCCESS      -- Some non-option arg unrecognized
-
-   The third case is where every parser returned ARGP_KEY_UNKNOWN for an
-   argument, in which case parsing stops at that argument (returning the
-   unparsed arguments to the caller of argp_parse if requested, or stopping
-   with an error message if not).
-
-   If an error occurs (either detected by argp, or because the parsing
-   function returned an error value), then the parser is called with
-   ARGP_KEY_ERROR, and no further calls are made.  */
-
-/* This is not an option at all, but rather a command line argument.  If a
-   parser receiving this key returns success, the fact is recorded, and the
-   ARGP_KEY_NO_ARGS case won't be used.  HOWEVER, if while processing the
-   argument, a parser function decrements the NEXT field of the state it's
-   passed, the option won't be considered processed; this is to allow you to
-   actually modify the argument (perhaps into an option), and have it
-   processed again.  */
-#define ARGP_KEY_ARG		0
-/* There are remaining arguments not parsed by any parser, which may be found
-   starting at (STATE->argv + STATE->next).  If success is returned, but
-   STATE->next left untouched, it's assumed that all arguments were consume,
-   otherwise, the parser should adjust STATE->next to reflect any arguments
-   consumed.  */
-#define ARGP_KEY_ARGS		0x1000006
-/* There are no more command line arguments at all.  */
-#define ARGP_KEY_END		0x1000001
-/* Because it's common to want to do some special processing if there aren't
-   any non-option args, user parsers are called with this key if they didn't
-   successfully process any non-option arguments.  Called just before
-   ARGP_KEY_END (where more general validity checks on previously parsed
-   arguments can take place).  */
-#define ARGP_KEY_NO_ARGS	0x1000002
-/* Passed in before any parsing is done.  Afterwards, the values of each
-   element of the CHILD_INPUT field, if any, in the state structure is
-   copied to each child's state to be the initial value of the INPUT field.  */
-#define ARGP_KEY_INIT		0x1000003
-/* Use after all other keys, including SUCCESS & END.  */
-#define ARGP_KEY_FINI		0x1000007
-/* Passed in when parsing has successfully been completed (even if there are
-   still arguments remaining).  */
-#define ARGP_KEY_SUCCESS	0x1000004
-/* Passed in if an error occurs.  */
-#define ARGP_KEY_ERROR		0x1000005
-
-/* An argp structure contains a set of options declarations, a function to
-   deal with parsing one, documentation string, a possible vector of child
-   argp's, and perhaps a function to filter help output.  When actually
-   parsing options, getopt is called with the union of all the argp
-   structures chained together through their CHILD pointers, with conflicts
-   being resolved in favor of the first occurrence in the chain.  */
-struct argp
-{
-  /* An array of argp_option structures, terminated by an entry with both
-     NAME and KEY having a value of 0.  */
-  const struct argp_option *options;
-
-  /* What to do with an option from this structure.  KEY is the key
-     associated with the option, and ARG is any associated argument (NULL if
-     none was supplied).  If KEY isn't understood, ARGP_ERR_UNKNOWN should be
-     returned.  If a non-zero, non-ARGP_ERR_UNKNOWN value is returned, then
-     parsing is stopped immediately, and that value is returned from
-     argp_parse().  For special (non-user-supplied) values of KEY, see the
-     ARGP_KEY_ definitions below.  */
-  argp_parser_t parser;
-
-  /* A string describing what other arguments are wanted by this program.  It
-     is only used by argp_usage to print the `Usage:' message.  If it
-     contains newlines, the strings separated by them are considered
-     alternative usage patterns, and printed on separate lines (lines after
-     the first are prefix by `  or: ' instead of `Usage:').  */
-  const char *args_doc;
-
-  /* If non-NULL, a string containing extra text to be printed before and
-     after the options in a long help message (separated by a vertical tab
-     `\v' character).  */
-  const char *doc;
-
-  /* A vector of argp_children structures, terminated by a member with a 0
-     argp field, pointing to child argps should be parsed with this one.  Any
-     conflicts are resolved in favor of this argp, or early argps in the
-     CHILDREN list.  This field is useful if you use libraries that supply
-     their own argp structure, which you want to use in conjunction with your
-     own.  */
-  const struct argp_child *children;
-
-  /* If non-zero, this should be a function to filter the output of help
-     messages.  KEY is either a key from an option, in which case TEXT is
-     that option's help text, or a special key from the ARGP_KEY_HELP_
-     defines, below, describing which other help text TEXT is.  The function
-     should return either TEXT, if it should be used as-is, a replacement
-     string, which should be malloced, and will be freed by argp, or NULL,
-     meaning `print nothing'.  The value for TEXT is *after* any translation
-     has been done, so if any of the replacement text also needs translation,
-     that should be done by the filter function.  INPUT is either the input
-     supplied to argp_parse, or NULL, if argp_help was called directly.  */
-  char *(*help_filter) (int __key, const char *__text, void *__input);
-
-  /* If non-zero the strings used in the argp library are translated using
-     the domain described by this string.  Otherwise the currently installed
-     default domain is used.  */
-  const char *argp_domain;
-};
-
-/* Possible KEY arguments to a help filter function.  */
-#define ARGP_KEY_HELP_PRE_DOC	0x2000001 /* Help text preceeding options. */
-#define ARGP_KEY_HELP_POST_DOC	0x2000002 /* Help text following options. */
-#define ARGP_KEY_HELP_HEADER	0x2000003 /* Option header string. */
-#define ARGP_KEY_HELP_EXTRA	0x2000004 /* After all other documentation;
-					     TEXT is NULL for this key.  */
-/* Explanatory note emitted when duplicate option arguments have been
-   suppressed.  */
-#define ARGP_KEY_HELP_DUP_ARGS_NOTE 0x2000005
-#define ARGP_KEY_HELP_ARGS_DOC	0x2000006 /* Argument doc string.  */
-
-/* When an argp has a non-zero CHILDREN field, it should point to a vector of
-   argp_child structures, each of which describes a subsidiary argp.  */
-struct argp_child
-{
-  /* The child parser.  */
-  const struct argp *argp;
-
-  /* Flags for this child.  */
-  int flags;
-
-  /* If non-zero, an optional header to be printed in help output before the
-     child options.  As a side-effect, a non-zero value forces the child
-     options to be grouped together; to achieve this effect without actually
-     printing a header string, use a value of "".  */
-  const char *header;
-
-  /* Where to group the child options relative to the other (`consolidated')
-     options in the parent argp; the values are the same as the GROUP field
-     in argp_option structs, but all child-groupings follow parent options at
-     a particular group level.  If both this field and HEADER are zero, then
-     they aren't grouped at all, but rather merged with the parent options
-     (merging the child's grouping levels with the parents).  */
-  int group;
-};
-
-/* Parsing state.  This is provided to parsing functions called by argp,
-   which may examine and, as noted, modify fields.  */
-struct argp_state
-{
-  /* The top level ARGP being parsed.  */
-  const struct argp *root_argp;
-
-  /* The argument vector being parsed.  May be modified.  */
-  int argc;
-  char **argv;
-
-  /* The index in ARGV of the next arg that to be parsed.  May be modified. */
-  int next;
-
-  /* The flags supplied to argp_parse.  May be modified.  */
-  unsigned flags;
-
-  /* While calling a parsing function with a key of ARGP_KEY_ARG, this is the
-     number of the current arg, starting at zero, and incremented after each
-     such call returns.  At all other times, this is the number of such
-     arguments that have been processed.  */
-  unsigned arg_num;
-
-  /* If non-zero, the index in ARGV of the first argument following a special
-     `--' argument (which prevents anything following being interpreted as an
-     option).  Only set once argument parsing has proceeded past this point. */
-  int quoted;
-
-  /* An arbitrary pointer passed in from the user.  */
-  void *input;
-  /* Values to pass to child parsers.  This vector will be the same length as
-     the number of children for the current parser.  */
-  void **child_inputs;
-
-  /* For the parser's use.  Initialized to 0.  */
-  void *hook;
-
-  /* The name used when printing messages.  This is initialized to ARGV[0],
-     or PROGRAM_INVOCATION_NAME if that is unavailable.  */
-  char *name;
-
-  /* Streams used when argp prints something.  */
-  FILE *err_stream;		/* For errors; initialized to stderr. */
-  FILE *out_stream;		/* For information; initialized to stdout. */
-
-  void *pstate;			/* Private, for use by argp.  */
-};
-
-/* Flags for argp_parse (note that the defaults are those that are
-   convenient for program command line parsing): */
-
-/* Don't ignore the first element of ARGV.  Normally (and always unless
-   ARGP_NO_ERRS is set) the first element of the argument vector is
-   skipped for option parsing purposes, as it corresponds to the program name
-   in a command line.  */
-#define ARGP_PARSE_ARGV0  0x01
-
-/* Don't print error messages for unknown options to stderr; unless this flag
-   is set, ARGP_PARSE_ARGV0 is ignored, as ARGV[0] is used as the program
-   name in the error messages.  This flag implies ARGP_NO_EXIT (on the
-   assumption that silent exiting upon errors is bad behaviour).  */
-#define ARGP_NO_ERRS	0x02
-
-/* Don't parse any non-option args.  Normally non-option args are parsed by
-   calling the parse functions with a key of ARGP_KEY_ARG, and the actual arg
-   as the value.  Since it's impossible to know which parse function wants to
-   handle it, each one is called in turn, until one returns 0 or an error
-   other than ARGP_ERR_UNKNOWN; if an argument is handled by no one, the
-   argp_parse returns prematurely (but with a return value of 0).  If all
-   args have been parsed without error, all parsing functions are called one
-   last time with a key of ARGP_KEY_END.  This flag needn't normally be set,
-   as the normal behavior is to stop parsing as soon as some argument can't
-   be handled.  */
-#define ARGP_NO_ARGS	0x04
-
-/* Parse options and arguments in the same order they occur on the command
-   line -- normally they're rearranged so that all options come first. */
-#define ARGP_IN_ORDER	0x08
-
-/* Don't provide the standard long option --help, which causes usage and
-      option help information to be output to stdout, and exit (0) called. */
-#define ARGP_NO_HELP	0x10
-
-/* Don't exit on errors (they may still result in error messages).  */
-#define ARGP_NO_EXIT	0x20
-
-/* Use the gnu getopt `long-only' rules for parsing arguments.  */
-#define ARGP_LONG_ONLY	0x40
-
-/* Turns off any message-printing/exiting options.  */
-#define ARGP_SILENT    (ARGP_NO_EXIT | ARGP_NO_ERRS | ARGP_NO_HELP)
-
-/* Parse the options strings in ARGC & ARGV according to the options in ARGP.
-   FLAGS is one of the ARGP_ flags above.  If ARG_INDEX is non-NULL, the
-   index in ARGV of the first unparsed option is returned in it.  If an
-   unknown option is present, ARGP_ERR_UNKNOWN is returned; if some parser
-   routine returned a non-zero value, it is returned; otherwise 0 is
-   returned.  This function may also call exit unless the ARGP_NO_HELP flag
-   is set.  INPUT is a pointer to a value to be passed in to the parser.  */
-extern error_t argp_parse (const struct argp *__restrict __argp,
-			   int __argc, char **__restrict __argv,
-			   unsigned __flags, int *__restrict __arg_index,
-			   void *__restrict __input);
-extern error_t __argp_parse (const struct argp *__restrict __argp,
-			     int __argc, char **__restrict __argv,
-			     unsigned __flags, int *__restrict __arg_index,
-			     void *__restrict __input);
-
-/* Global variables.  */
-
-/* If defined or set by the user program to a non-zero value, then a default
-   option --version is added (unless the ARGP_NO_HELP flag is used), which
-   will print this string followed by a newline and exit (unless the
-   ARGP_NO_EXIT flag is used).  Overridden by ARGP_PROGRAM_VERSION_HOOK.  */
-extern const char *argp_program_version;
-
-/* If defined or set by the user program to a non-zero value, then a default
-   option --version is added (unless the ARGP_NO_HELP flag is used), which
-   calls this function with a stream to print the version to and a pointer to
-   the current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
-   used).  This variable takes precedent over ARGP_PROGRAM_VERSION.  */
-extern void (*argp_program_version_hook) (FILE *__restrict __stream,
-					  struct argp_state *__restrict
-					  __state);
-
-/* If defined or set by the user program, it should point to string that is
-   the bug-reporting address for the program.  It will be printed by
-   argp_help if the ARGP_HELP_BUG_ADDR flag is set (as it is by various
-   standard help messages), embedded in a sentence that says something like
-   `Report bugs to ADDR.'.  */
-extern const char *argp_program_bug_address;
-
-/* The exit status that argp will use when exiting due to a parsing error.
-   If not defined or set by the user program, this defaults to EX_USAGE from
-   <sysexits.h>.  */
-extern error_t argp_err_exit_status;
-
-/* Flags for argp_help.  */
-#define ARGP_HELP_USAGE		0x01 /* a Usage: message. */
-#define ARGP_HELP_SHORT_USAGE	0x02 /*  " but don't actually print options. */
-#define ARGP_HELP_SEE		0x04 /* a `Try ... for more help' message. */
-#define ARGP_HELP_LONG		0x08 /* a long help message. */
-#define ARGP_HELP_PRE_DOC	0x10 /* doc string preceding long help.  */
-#define ARGP_HELP_POST_DOC	0x20 /* doc string following long help.  */
-#define ARGP_HELP_DOC		(ARGP_HELP_PRE_DOC | ARGP_HELP_POST_DOC)
-#define ARGP_HELP_BUG_ADDR	0x40 /* bug report address */
-#define ARGP_HELP_LONG_ONLY	0x80 /* modify output appropriately to
-					reflect ARGP_LONG_ONLY mode.  */
-
-/* These ARGP_HELP flags are only understood by argp_state_help.  */
-#define ARGP_HELP_EXIT_ERR	0x100 /* Call exit(1) instead of returning.  */
-#define ARGP_HELP_EXIT_OK	0x200 /* Call exit(0) instead of returning.  */
-
-/* The standard thing to do after a program command line parsing error, if an
-   error message has already been printed.  */
-#define ARGP_HELP_STD_ERR \
-  (ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR)
-/* The standard thing to do after a program command line parsing error, if no
-   more specific error message has been printed.  */
-#define ARGP_HELP_STD_USAGE \
-  (ARGP_HELP_SHORT_USAGE | ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR)
-/* The standard thing to do in response to a --help option.  */
-#define ARGP_HELP_STD_HELP \
-  (ARGP_HELP_SHORT_USAGE | ARGP_HELP_LONG | ARGP_HELP_EXIT_OK \
-   | ARGP_HELP_DOC | ARGP_HELP_BUG_ADDR)
-
-/* Output a usage message for ARGP to STREAM.  FLAGS are from the set
-   ARGP_HELP_*.  */
-extern void argp_help (const struct argp *__restrict __argp,
-		       FILE *__restrict __stream,
-		       unsigned __flags, char *__restrict __name);
-extern void __argp_help (const struct argp *__restrict __argp,
-			 FILE *__restrict __stream, unsigned __flags,
-			 char *__name);
-
-/* The following routines are intended to be called from within an argp
-   parsing routine (thus taking an argp_state structure as the first
-   argument).  They may or may not print an error message and exit, depending
-   on the flags in STATE -- in any case, the caller should be prepared for
-   them *not* to exit, and should return an appropiate error after calling
-   them.  [argp_usage & argp_error should probably be called argp_state_...,
-   but they're used often enough that they should be short]  */
-
-/* Output, if appropriate, a usage message for STATE to STREAM.  FLAGS are
-   from the set ARGP_HELP_*.  */
-extern void argp_state_help (const struct argp_state *__restrict __state,
-			     FILE *__restrict __stream,
-			     unsigned int __flags);
-extern void __argp_state_help (const struct argp_state *__restrict __state,
-			       FILE *__restrict __stream,
-			       unsigned int __flags);
-
-/* Possibly output the standard usage message for ARGP to stderr and exit.  */
-extern void argp_usage (const struct argp_state *__state);
-extern void __argp_usage (const struct argp_state *__state);
-
-/* If appropriate, print the printf string FMT and following args, preceded
-   by the program name and `:', to stderr, and followed by a `Try ... --help'
-   message, then exit (1).  */
-extern void argp_error (const struct argp_state *__restrict __state,
-			const char *__restrict __fmt, ...)
-     __attribute__ ((__format__ (__printf__, 2, 3)));
-extern void __argp_error (const struct argp_state *__restrict __state,
-			  const char *__restrict __fmt, ...)
-     __attribute__ ((__format__ (__printf__, 2, 3)));
-
-/* Similar to the standard gnu error-reporting function error(), but will
-   respect the ARGP_NO_EXIT and ARGP_NO_ERRS flags in STATE, and will print
-   to STATE->err_stream.  This is useful for argument parsing code that is
-   shared between program startup (when exiting is desired) and runtime
-   option parsing (when typically an error code is returned instead).  The
-   difference between this function and argp_error is that the latter is for
-   *parsing errors*, and the former is for other problems that occur during
-   parsing but don't reflect a (syntactic) problem with the input.  */
-extern void argp_failure (const struct argp_state *__restrict __state,
-			  int __status, int __errnum,
-			  const char *__restrict __fmt, ...)
-     __attribute__ ((__format__ (__printf__, 4, 5)));
-extern void __argp_failure (const struct argp_state *__restrict __state,
-			    int __status, int __errnum,
-			    const char *__restrict __fmt, ...)
-     __attribute__ ((__format__ (__printf__, 4, 5)));
-
-/* Returns true if the option OPT is a valid short option.  */
-extern int _option_is_short (const struct argp_option *__opt) __THROW;
-extern int __option_is_short (const struct argp_option *__opt) __THROW;
-
-/* Returns true if the option OPT is in fact the last (unused) entry in an
-   options array.  */
-extern int _option_is_end (const struct argp_option *__opt) __THROW;
-extern int __option_is_end (const struct argp_option *__opt) __THROW;
-
-/* Return the input field for ARGP in the parser corresponding to STATE; used
-   by the help routines.  */
-extern void *_argp_input (const struct argp *__restrict __argp,
-			  const struct argp_state *__restrict __state)
-     __THROW;
-extern void *__argp_input (const struct argp *__restrict __argp,
-			   const struct argp_state *__restrict __state)
-     __THROW;
-
-#ifdef __USE_EXTERN_INLINES
-
-# if !_LIBC
-#  define __argp_usage argp_usage
-#  define __argp_state_help argp_state_help
-#  define __option_is_short _option_is_short
-#  define __option_is_end _option_is_end
-# endif
-
-# ifndef ARGP_EI
-#  define ARGP_EI __extern_inline
-# endif
-
-ARGP_EI void
-__argp_usage (const struct argp_state *__state)
-{
-  __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
-}
-
-ARGP_EI int
-__NTH (__option_is_short (const struct argp_option *__opt))
-{
-  if (__opt->flags & OPTION_DOC)
-    return 0;
-  else
-    {
-      int __key = __opt->key;
-      return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
-    }
-}
-
-ARGP_EI int
-__NTH (__option_is_end (const struct argp_option *__opt))
-{
-  return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
-}
-
-# if !_LIBC
-#  undef __argp_usage
-#  undef __argp_state_help
-#  undef __option_is_short
-#  undef __option_is_end
-# endif
-#endif /* Use extern inlines.  */
-
-__END_DECLS
-
-#endif /* argp.h */
diff --git a/openflow/usr/include/argz.h b/openflow/usr/include/argz.h
deleted file mode 100644
index c1bc5f7..0000000
--- a/openflow/usr/include/argz.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Routines for dealing with '\0' separated arg vectors.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ARGZ_H
-#define _ARGZ_H	1
-
-#include <features.h>
-
-#define __need_error_t
-#include <errno.h>
-#include <string.h>		/* Need size_t, and strchr is called below.  */
-
-#ifndef __error_t_defined
-typedef int error_t;
-#endif
-
-
-__BEGIN_DECLS
-
-/* Make a '\0' separated arg vector from a unix argv vector, returning it in
-   ARGZ, and the total length in LEN.  If a memory allocation error occurs,
-   ENOMEM is returned, otherwise 0.  The result can be destroyed using free. */
-extern error_t __argz_create (char *const __argv[], char **__restrict __argz,
-			      size_t *__restrict __len) __THROW;
-extern error_t argz_create (char *const __argv[], char **__restrict __argz,
-			    size_t *__restrict __len) __THROW;
-
-/* Make a '\0' separated arg vector from a SEP separated list in
-   STRING, returning it in ARGZ, and the total length in LEN.  If a
-   memory allocation error occurs, ENOMEM is returned, otherwise 0.
-   The result can be destroyed using free.  */
-extern error_t __argz_create_sep (const char *__restrict __string,
-				  int __sep, char **__restrict __argz,
-				  size_t *__restrict __len) __THROW;
-extern error_t argz_create_sep (const char *__restrict __string,
-				int __sep, char **__restrict __argz,
-				size_t *__restrict __len) __THROW;
-
-/* Returns the number of strings in ARGZ.  */
-extern size_t __argz_count (const char *__argz, size_t __len)
-     __THROW __attribute_pure__;
-extern size_t argz_count (const char *__argz, size_t __len)
-     __THROW __attribute_pure__;
-
-/* Puts pointers to each string in ARGZ into ARGV, which must be large enough
-   to hold them all.  */
-extern void __argz_extract (const char *__restrict __argz, size_t __len,
-			    char **__restrict __argv) __THROW;
-extern void argz_extract (const char *__restrict __argz, size_t __len,
-			  char **__restrict __argv) __THROW;
-
-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
-   except the last into the character SEP.  */
-extern void __argz_stringify (char *__argz, size_t __len, int __sep) __THROW;
-extern void argz_stringify (char *__argz, size_t __len, int __sep) __THROW;
-
-/* Append BUF, of length BUF_LEN to the argz vector in ARGZ & ARGZ_LEN.  */
-extern error_t __argz_append (char **__restrict __argz,
-			      size_t *__restrict __argz_len,
-			      const char *__restrict __buf, size_t __buf_len)
-     __THROW;
-extern error_t argz_append (char **__restrict __argz,
-			    size_t *__restrict __argz_len,
-			    const char *__restrict __buf, size_t __buf_len)
-     __THROW;
-
-/* Append STR to the argz vector in ARGZ & ARGZ_LEN.  */
-extern error_t __argz_add (char **__restrict __argz,
-			   size_t *__restrict __argz_len,
-			   const char *__restrict __str) __THROW;
-extern error_t argz_add (char **__restrict __argz,
-			 size_t *__restrict __argz_len,
-			 const char *__restrict __str) __THROW;
-
-/* Append SEP separated list in STRING to the argz vector in ARGZ &
-   ARGZ_LEN.  */
-extern error_t __argz_add_sep (char **__restrict __argz,
-			       size_t *__restrict __argz_len,
-			       const char *__restrict __string, int __delim)
-     __THROW;
-extern error_t argz_add_sep (char **__restrict __argz,
-			     size_t *__restrict __argz_len,
-			     const char *__restrict __string, int __delim)
-     __THROW;
-
-/* Delete ENTRY from ARGZ & ARGZ_LEN, if it appears there.  */
-extern void __argz_delete (char **__restrict __argz,
-			   size_t *__restrict __argz_len,
-			   char *__restrict __entry) __THROW;
-extern void argz_delete (char **__restrict __argz,
-			 size_t *__restrict __argz_len,
-			 char *__restrict __entry) __THROW;
-
-/* Insert ENTRY into ARGZ & ARGZ_LEN before BEFORE, which should be an
-   existing entry in ARGZ; if BEFORE is NULL, ENTRY is appended to the end.
-   Since ARGZ's first entry is the same as ARGZ, argz_insert (ARGZ, ARGZ_LEN,
-   ARGZ, ENTRY) will insert ENTRY at the beginning of ARGZ.  If BEFORE is not
-   in ARGZ, EINVAL is returned, else if memory can't be allocated for the new
-   ARGZ, ENOMEM is returned, else 0.  */
-extern error_t __argz_insert (char **__restrict __argz,
-			      size_t *__restrict __argz_len,
-			      char *__restrict __before,
-			      const char *__restrict __entry) __THROW;
-extern error_t argz_insert (char **__restrict __argz,
-			    size_t *__restrict __argz_len,
-			    char *__restrict __before,
-			    const char *__restrict __entry) __THROW;
-
-/* Replace any occurrences of the string STR in ARGZ with WITH, reallocating
-   ARGZ as necessary.  If REPLACE_COUNT is non-zero, *REPLACE_COUNT will be
-   incremented by number of replacements performed.  */
-extern error_t __argz_replace (char **__restrict __argz,
-			       size_t *__restrict __argz_len,
-			       const char *__restrict __str,
-			       const char *__restrict __with,
-			       unsigned int *__restrict __replace_count);
-extern error_t argz_replace (char **__restrict __argz,
-			     size_t *__restrict __argz_len,
-			     const char *__restrict __str,
-			     const char *__restrict __with,
-			     unsigned int *__restrict __replace_count);
-
-/* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there
-   are no more.  If entry is NULL, then the first entry is returned.  This
-   behavior allows two convenient iteration styles:
-
-    char *entry = 0;
-    while ((entry = argz_next (argz, argz_len, entry)))
-      ...;
-
-   or
-
-    char *entry;
-    for (entry = argz; entry; entry = argz_next (argz, argz_len, entry))
-      ...;
-*/
-extern char *__argz_next (const char *__restrict __argz, size_t __argz_len,
-			  const char *__restrict __entry) __THROW;
-extern char *argz_next (const char *__restrict __argz, size_t __argz_len,
-			const char *__restrict __entry) __THROW;
-
-#ifdef __USE_EXTERN_INLINES
-__extern_inline char *
-__NTH (__argz_next (const char *__argz, size_t __argz_len,
-		    const char *__entry))
-{
-  if (__entry)
-    {
-      if (__entry < __argz + __argz_len)
-	__entry = strchr (__entry, '\0') + 1;
-
-      return __entry >= __argz + __argz_len ? (char *) NULL : (char *) __entry;
-    }
-  else
-    return __argz_len > 0 ? (char *) __argz : 0;
-}
-__extern_inline char *
-__NTH (argz_next (const char *__argz, size_t __argz_len,
-		  const char *__entry))
-{
-  return __argz_next (__argz, __argz_len, __entry);
-}
-#endif /* Use extern inlines.  */
-
-__END_DECLS
-
-#endif /* argz.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/a.out.h b/openflow/usr/include/arm-linux-gnueabihf/a.out.h
deleted file mode 100644
index e3f4bdd..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/a.out.h
+++ /dev/null
@@ -1,138 +0,0 @@
-#ifndef __A_OUT_GNU_H__
-#define __A_OUT_GNU_H__
-
-#include <bits/a.out.h>
-
-#define __GNU_EXEC_MACROS__
-
-struct exec
-{
-  unsigned long a_info;	/* Use macros N_MAGIC, etc for access.  */
-  unsigned int a_text;	/* Length of text, in bytes.  */
-  unsigned int a_data;	/* Length of data, in bytes.  */
-  unsigned int a_bss;	/* Length of uninitialized data area for file, in bytes.  */
-  unsigned int a_syms;	/* Length of symbol table data in file, in bytes.  */
-  unsigned int a_entry;	/* Start address.  */
-  unsigned int a_trsize;/* Length of relocation info for text, in bytes.  */
-  unsigned int a_drsize;/* Length of relocation info for data, in bytes.  */
-};
-
-enum machine_type
-{
-  M_OLDSUN2 = 0,
-  M_68010 = 1,
-  M_68020 = 2,
-  M_SPARC = 3,
-  M_386 = 100,
-  M_MIPS1 = 151,
-  M_MIPS2 = 152
-};
-
-#define N_MAGIC(exec)	((exec).a_info & 0xffff)
-#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff))
-#define N_FLAGS(exec)	(((exec).a_info >> 24) & 0xff)
-#define N_SET_INFO(exec, magic, type, flags) \
-  ((exec).a_info = ((magic) & 0xffff)					\
-   | (((int)(type) & 0xff) << 16)					\
-   | (((flags) & 0xff) << 24))
-#define N_SET_MAGIC(exec, magic) \
-  ((exec).a_info = ((exec).a_info & 0xffff0000) | ((magic) & 0xffff))
-#define N_SET_MACHTYPE(exec, machtype) \
-  ((exec).a_info =							\
-   ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16))
-#define N_SET_FLAGS(exec, flags) \
-  ((exec).a_info =							\
-   ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24))
-
-/* Code indicating object file or impure executable.  */
-#define OMAGIC 0407
-/* Code indicating pure executable.  */
-#define NMAGIC 0410
-/* Code indicating demand-paged executable.  */
-#define ZMAGIC 0413
-/* This indicates a demand-paged executable with the header in the text.
-   The first page is unmapped to help trap NULL pointer references.  */
-#define QMAGIC 0314
-/* Code indicating core file.  */
-#define CMAGIC 0421
-
-#define N_TRSIZE(a)	((a).a_trsize)
-#define N_DRSIZE(a)	((a).a_drsize)
-#define N_SYMSIZE(a)	((a).a_syms)
-#define N_BADMAG(x) \
-  (N_MAGIC(x) != OMAGIC	&& N_MAGIC(x) != NMAGIC				\
-   && N_MAGIC(x) != ZMAGIC && N_MAGIC(x) != QMAGIC)
-#define _N_HDROFF(x)	(1024 - sizeof (struct exec))
-#define N_TXTOFF(x) \
-  (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) :	\
-   (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
-#define N_DATOFF(x)	(N_TXTOFF(x) + (x).a_text)
-#define N_TRELOFF(x)	(N_DATOFF(x) + (x).a_data)
-#define N_DRELOFF(x)	(N_TRELOFF(x) + N_TRSIZE(x))
-#define N_SYMOFF(x)	(N_DRELOFF(x) + N_DRSIZE(x))
-#define N_STROFF(x)	(N_SYMOFF(x) + N_SYMSIZE(x))
-
-/* Address of text segment in memory after it is loaded.  */
-#define N_TXTADDR(x)	(N_MAGIC(x) == QMAGIC ? 4096 : 0)
-
-/* Address of data segment in memory after it is loaded.  */
-#define SEGMENT_SIZE	1024
-
-#define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1))
-#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text)
-
-#define N_DATADDR(x) \
-  (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x))				\
-   : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x))))
-#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data)
-
-#if !defined (N_NLIST_DECLARED)
-struct nlist
-{
-  union
-    {
-      char *n_name;
-      struct nlist *n_next;
-      long n_strx;
-    } n_un;
-  unsigned char n_type;
-  char n_other;
-  short n_desc;
-  unsigned long n_value;
-};
-#endif /* no N_NLIST_DECLARED.  */
-
-#define N_UNDF	0
-#define N_ABS	2
-#define N_TEXT	4
-#define N_DATA	6
-#define N_BSS	8
-#define N_FN	15
-#define N_EXT	1
-#define N_TYPE	036
-#define N_STAB	0340
-#define N_INDR	0xa
-#define	N_SETA	0x14	/* Absolute set element symbol.  */
-#define	N_SETT	0x16	/* Text set element symbol.  */
-#define	N_SETD	0x18	/* Data set element symbol.  */
-#define	N_SETB	0x1A	/* Bss set element symbol.  */
-#define N_SETV	0x1C	/* Pointer to set vector in data area.  */
-
-#if !defined (N_RELOCATION_INFO_DECLARED)
-/* This structure describes a single relocation to be performed.
-   The text-relocation section of the file is a vector of these structures,
-   all of which apply to the text section.
-   Likewise, the data-relocation section applies to the data section.  */
-
-struct relocation_info
-{
-  int r_address;
-  unsigned int r_symbolnum:24;
-  unsigned int r_pcrel:1;
-  unsigned int r_length:2;
-  unsigned int r_extern:1;
-  unsigned int r_pad:4;
-};
-#endif /* no N_RELOCATION_INFO_DECLARED.  */
-
-#endif /* __A_OUT_GNU_H__ */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/auxvec.h b/openflow/usr/include/arm-linux-gnueabihf/asm/auxvec.h
deleted file mode 100644
index cb02a76..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/auxvec.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_AUXVEC_H
-#define __ASM_AUXVEC_H
-
-/* VDSO location */
-#define AT_SYSINFO_EHDR	33
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/bitsperlong.h b/openflow/usr/include/arm-linux-gnueabihf/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/byteorder.h b/openflow/usr/include/arm-linux-gnueabihf/asm/byteorder.h
deleted file mode 100644
index 7737974..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/byteorder.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  arch/arm/include/asm/byteorder.h
- *
- * ARM Endian-ness.  In little endian mode, the data bus is connected such
- * that byte accesses appear as:
- *  0 = d0...d7, 1 = d8...d15, 2 = d16...d23, 3 = d24...d31
- * and word accesses (data or instruction) appear as:
- *  d0...d31
- *
- * When in big endian mode, byte accesses appear as:
- *  0 = d24...d31, 1 = d16...d23, 2 = d8...d15, 3 = d0...d7
- * and word accesses (data or instruction) appear as:
- *  d0...d31
- */
-#ifndef __ASM_ARM_BYTEORDER_H
-#define __ASM_ARM_BYTEORDER_H
-
-#ifdef __ARMEB__
-#include <linux/byteorder/big_endian.h>
-#else
-#include <linux/byteorder/little_endian.h>
-#endif
-
-#endif
-
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/errno.h b/openflow/usr/include/arm-linux-gnueabihf/asm/errno.h
deleted file mode 100644
index 4c82b50..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/errno.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/fcntl.h b/openflow/usr/include/arm-linux-gnueabihf/asm/fcntl.h
deleted file mode 100644
index a80b660..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/fcntl.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _ARM_FCNTL_H
-#define _ARM_FCNTL_H
-
-#define O_DIRECTORY	 040000	/* must be a directory */
-#define O_NOFOLLOW	0100000	/* don't follow links */
-#define O_DIRECT	0200000	/* direct disk access hint - currently ignored */
-#define O_LARGEFILE	0400000
-
-#include <asm-generic/fcntl.h>
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/hwcap.h b/openflow/usr/include/arm-linux-gnueabihf/asm/hwcap.h
deleted file mode 100644
index 7bf3c6e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/hwcap.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef __ASMARM_HWCAP_H
-#define __ASMARM_HWCAP_H
-
-/*
- * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
- */
-#define HWCAP_SWP	(1 << 0)
-#define HWCAP_HALF	(1 << 1)
-#define HWCAP_THUMB	(1 << 2)
-#define HWCAP_26BIT	(1 << 3)	/* Play it safe */
-#define HWCAP_FAST_MULT	(1 << 4)
-#define HWCAP_FPA	(1 << 5)
-#define HWCAP_VFP	(1 << 6)
-#define HWCAP_EDSP	(1 << 7)
-#define HWCAP_JAVA	(1 << 8)
-#define HWCAP_IWMMXT	(1 << 9)
-#define HWCAP_CRUNCH	(1 << 10)
-#define HWCAP_THUMBEE	(1 << 11)
-#define HWCAP_NEON	(1 << 12)
-#define HWCAP_VFPv3	(1 << 13)
-#define HWCAP_VFPv3D16	(1 << 14)	/* also set for VFPv4-D16 */
-#define HWCAP_TLS	(1 << 15)
-#define HWCAP_VFPv4	(1 << 16)
-#define HWCAP_IDIVA	(1 << 17)
-#define HWCAP_IDIVT	(1 << 18)
-#define HWCAP_VFPD32	(1 << 19)	/* set if VFP has 32 regs (not 16) */
-#define HWCAP_IDIV	(HWCAP_IDIVA | HWCAP_IDIVT)
-#define HWCAP_LPAE	(1 << 20)
-#define HWCAP_EVTSTRM	(1 << 21)
-
-/*
- * HWCAP2 flags - for elf_hwcap2 (in kernel) and AT_HWCAP2
- */
-#define HWCAP2_AES	(1 << 0)
-#define HWCAP2_PMULL	(1 << 1)
-#define HWCAP2_SHA1	(1 << 2)
-#define HWCAP2_SHA2	(1 << 3)
-#define HWCAP2_CRC32	(1 << 4)
-
-#endif /* __ASMARM_HWCAP_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/ioctl.h b/openflow/usr/include/arm-linux-gnueabihf/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/ioctls.h b/openflow/usr/include/arm-linux-gnueabihf/asm/ioctls.h
deleted file mode 100644
index 9c96298..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/ioctls.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ASM_ARM_IOCTLS_H
-#define __ASM_ARM_IOCTLS_H
-
-#define FIOQSIZE	0x545E
-
-#include <asm-generic/ioctls.h>
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/ipcbuf.h b/openflow/usr/include/arm-linux-gnueabihf/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/kvm.h b/openflow/usr/include/arm-linux-gnueabihf/asm/kvm.h
deleted file mode 100644
index c98e4dc..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/kvm.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (C) 2012 - Virtual Open Systems and Columbia University
- * Author: Christoffer Dall <c.dall@virtualopensystems.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#ifndef __ARM_KVM_H__
-#define __ARM_KVM_H__
-
-#include <linux/types.h>
-#include <linux/psci.h>
-#include <asm/ptrace.h>
-
-#define __KVM_HAVE_GUEST_DEBUG
-#define __KVM_HAVE_IRQ_LINE
-#define __KVM_HAVE_READONLY_MEM
-
-#define KVM_REG_SIZE(id)						\
-	(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))
-
-/* Valid for svc_regs, abt_regs, und_regs, irq_regs in struct kvm_regs */
-#define KVM_ARM_SVC_sp		svc_regs[0]
-#define KVM_ARM_SVC_lr		svc_regs[1]
-#define KVM_ARM_SVC_spsr	svc_regs[2]
-#define KVM_ARM_ABT_sp		abt_regs[0]
-#define KVM_ARM_ABT_lr		abt_regs[1]
-#define KVM_ARM_ABT_spsr	abt_regs[2]
-#define KVM_ARM_UND_sp		und_regs[0]
-#define KVM_ARM_UND_lr		und_regs[1]
-#define KVM_ARM_UND_spsr	und_regs[2]
-#define KVM_ARM_IRQ_sp		irq_regs[0]
-#define KVM_ARM_IRQ_lr		irq_regs[1]
-#define KVM_ARM_IRQ_spsr	irq_regs[2]
-
-/* Valid only for fiq_regs in struct kvm_regs */
-#define KVM_ARM_FIQ_r8		fiq_regs[0]
-#define KVM_ARM_FIQ_r9		fiq_regs[1]
-#define KVM_ARM_FIQ_r10		fiq_regs[2]
-#define KVM_ARM_FIQ_fp		fiq_regs[3]
-#define KVM_ARM_FIQ_ip		fiq_regs[4]
-#define KVM_ARM_FIQ_sp		fiq_regs[5]
-#define KVM_ARM_FIQ_lr		fiq_regs[6]
-#define KVM_ARM_FIQ_spsr	fiq_regs[7]
-
-struct kvm_regs {
-	struct pt_regs usr_regs;	/* R0_usr - R14_usr, PC, CPSR */
-	unsigned long svc_regs[3];	/* SP_svc, LR_svc, SPSR_svc */
-	unsigned long abt_regs[3];	/* SP_abt, LR_abt, SPSR_abt */
-	unsigned long und_regs[3];	/* SP_und, LR_und, SPSR_und */
-	unsigned long irq_regs[3];	/* SP_irq, LR_irq, SPSR_irq */
-	unsigned long fiq_regs[8];	/* R8_fiq - R14_fiq, SPSR_fiq */
-};
-
-/* Supported Processor Types */
-#define KVM_ARM_TARGET_CORTEX_A15	0
-#define KVM_ARM_TARGET_CORTEX_A7	1
-#define KVM_ARM_NUM_TARGETS		2
-
-/* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */
-#define KVM_ARM_DEVICE_TYPE_SHIFT	0
-#define KVM_ARM_DEVICE_TYPE_MASK	(0xffff << KVM_ARM_DEVICE_TYPE_SHIFT)
-#define KVM_ARM_DEVICE_ID_SHIFT		16
-#define KVM_ARM_DEVICE_ID_MASK		(0xffff << KVM_ARM_DEVICE_ID_SHIFT)
-
-/* Supported device IDs */
-#define KVM_ARM_DEVICE_VGIC_V2		0
-
-/* Supported VGIC address types  */
-#define KVM_VGIC_V2_ADDR_TYPE_DIST	0
-#define KVM_VGIC_V2_ADDR_TYPE_CPU	1
-
-#define KVM_VGIC_V2_DIST_SIZE		0x1000
-#define KVM_VGIC_V2_CPU_SIZE		0x2000
-
-#define KVM_ARM_VCPU_POWER_OFF		0 /* CPU is started in OFF state */
-#define KVM_ARM_VCPU_PSCI_0_2		1 /* CPU uses PSCI v0.2 */
-
-struct kvm_vcpu_init {
-	__u32 target;
-	__u32 features[7];
-};
-
-struct kvm_sregs {
-};
-
-struct kvm_fpu {
-};
-
-struct kvm_guest_debug_arch {
-};
-
-struct kvm_debug_exit_arch {
-};
-
-struct kvm_sync_regs {
-};
-
-struct kvm_arch_memory_slot {
-};
-
-/* If you need to interpret the index values, here is the key: */
-#define KVM_REG_ARM_COPROC_MASK		0x000000000FFF0000
-#define KVM_REG_ARM_COPROC_SHIFT	16
-#define KVM_REG_ARM_32_OPC2_MASK	0x0000000000000007
-#define KVM_REG_ARM_32_OPC2_SHIFT	0
-#define KVM_REG_ARM_OPC1_MASK		0x0000000000000078
-#define KVM_REG_ARM_OPC1_SHIFT		3
-#define KVM_REG_ARM_CRM_MASK		0x0000000000000780
-#define KVM_REG_ARM_CRM_SHIFT		7
-#define KVM_REG_ARM_32_CRN_MASK		0x0000000000007800
-#define KVM_REG_ARM_32_CRN_SHIFT	11
-
-#define ARM_CP15_REG_SHIFT_MASK(x,n) \
-	(((x) << KVM_REG_ARM_ ## n ## _SHIFT) & KVM_REG_ARM_ ## n ## _MASK)
-
-#define __ARM_CP15_REG(op1,crn,crm,op2) \
-	(KVM_REG_ARM | (15 << KVM_REG_ARM_COPROC_SHIFT) | \
-	ARM_CP15_REG_SHIFT_MASK(op1, OPC1) | \
-	ARM_CP15_REG_SHIFT_MASK(crn, 32_CRN) | \
-	ARM_CP15_REG_SHIFT_MASK(crm, CRM) | \
-	ARM_CP15_REG_SHIFT_MASK(op2, 32_OPC2))
-
-#define ARM_CP15_REG32(...) (__ARM_CP15_REG(__VA_ARGS__) | KVM_REG_SIZE_U32)
-
-#define __ARM_CP15_REG64(op1,crm) \
-	(__ARM_CP15_REG(op1, 0, crm, 0) | KVM_REG_SIZE_U64)
-#define ARM_CP15_REG64(...) __ARM_CP15_REG64(__VA_ARGS__)
-
-#define KVM_REG_ARM_TIMER_CTL		ARM_CP15_REG32(0, 14, 3, 1)
-#define KVM_REG_ARM_TIMER_CNT		ARM_CP15_REG64(1, 14) 
-#define KVM_REG_ARM_TIMER_CVAL		ARM_CP15_REG64(3, 14) 
-
-/* Normal registers are mapped as coprocessor 16. */
-#define KVM_REG_ARM_CORE		(0x0010 << KVM_REG_ARM_COPROC_SHIFT)
-#define KVM_REG_ARM_CORE_REG(name)	(offsetof(struct kvm_regs, name) / 4)
-
-/* Some registers need more space to represent values. */
-#define KVM_REG_ARM_DEMUX		(0x0011 << KVM_REG_ARM_COPROC_SHIFT)
-#define KVM_REG_ARM_DEMUX_ID_MASK	0x000000000000FF00
-#define KVM_REG_ARM_DEMUX_ID_SHIFT	8
-#define KVM_REG_ARM_DEMUX_ID_CCSIDR	(0x00 << KVM_REG_ARM_DEMUX_ID_SHIFT)
-#define KVM_REG_ARM_DEMUX_VAL_MASK	0x00000000000000FF
-#define KVM_REG_ARM_DEMUX_VAL_SHIFT	0
-
-/* VFP registers: we could overload CP10 like ARM does, but that's ugly. */
-#define KVM_REG_ARM_VFP			(0x0012 << KVM_REG_ARM_COPROC_SHIFT)
-#define KVM_REG_ARM_VFP_MASK		0x000000000000FFFF
-#define KVM_REG_ARM_VFP_BASE_REG	0x0
-#define KVM_REG_ARM_VFP_FPSID		0x1000
-#define KVM_REG_ARM_VFP_FPSCR		0x1001
-#define KVM_REG_ARM_VFP_MVFR1		0x1006
-#define KVM_REG_ARM_VFP_MVFR0		0x1007
-#define KVM_REG_ARM_VFP_FPEXC		0x1008
-#define KVM_REG_ARM_VFP_FPINST		0x1009
-#define KVM_REG_ARM_VFP_FPINST2		0x100A
-
-/* Device Control API: ARM VGIC */
-#define KVM_DEV_ARM_VGIC_GRP_ADDR	0
-#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS	1
-#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS	2
-#define   KVM_DEV_ARM_VGIC_CPUID_SHIFT	32
-#define   KVM_DEV_ARM_VGIC_CPUID_MASK	(0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT)
-#define   KVM_DEV_ARM_VGIC_OFFSET_SHIFT	0
-#define   KVM_DEV_ARM_VGIC_OFFSET_MASK	(0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)
-#define KVM_DEV_ARM_VGIC_GRP_NR_IRQS	3
-#define KVM_DEV_ARM_VGIC_GRP_CTRL       4
-#define   KVM_DEV_ARM_VGIC_CTRL_INIT    0
-
-/* KVM_IRQ_LINE irq field index values */
-#define KVM_ARM_IRQ_TYPE_SHIFT		24
-#define KVM_ARM_IRQ_TYPE_MASK		0xff
-#define KVM_ARM_IRQ_VCPU_SHIFT		16
-#define KVM_ARM_IRQ_VCPU_MASK		0xff
-#define KVM_ARM_IRQ_NUM_SHIFT		0
-#define KVM_ARM_IRQ_NUM_MASK		0xffff
-
-/* irq_type field */
-#define KVM_ARM_IRQ_TYPE_CPU		0
-#define KVM_ARM_IRQ_TYPE_SPI		1
-#define KVM_ARM_IRQ_TYPE_PPI		2
-
-/* out-of-kernel GIC cpu interrupt injection irq_number field */
-#define KVM_ARM_IRQ_CPU_IRQ		0
-#define KVM_ARM_IRQ_CPU_FIQ		1
-
-/*
- * This used to hold the highest supported SPI, but it is now obsolete
- * and only here to provide source code level compatibility with older
- * userland. The highest SPI number can be set via KVM_DEV_ARM_VGIC_GRP_NR_IRQS.
- */
-#define KVM_ARM_IRQ_GIC_MAX		127
-
-/* One single KVM irqchip, ie. the VGIC */
-#define KVM_NR_IRQCHIPS          1
-
-/* PSCI interface */
-#define KVM_PSCI_FN_BASE		0x95c1ba5e
-#define KVM_PSCI_FN(n)			(KVM_PSCI_FN_BASE + (n))
-
-#define KVM_PSCI_FN_CPU_SUSPEND		KVM_PSCI_FN(0)
-#define KVM_PSCI_FN_CPU_OFF		KVM_PSCI_FN(1)
-#define KVM_PSCI_FN_CPU_ON		KVM_PSCI_FN(2)
-#define KVM_PSCI_FN_MIGRATE		KVM_PSCI_FN(3)
-
-#define KVM_PSCI_RET_SUCCESS		PSCI_RET_SUCCESS
-#define KVM_PSCI_RET_NI			PSCI_RET_NOT_SUPPORTED
-#define KVM_PSCI_RET_INVAL		PSCI_RET_INVALID_PARAMS
-#define KVM_PSCI_RET_DENIED		PSCI_RET_DENIED
-
-#endif /* __ARM_KVM_H__ */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/kvm_para.h b/openflow/usr/include/arm-linux-gnueabihf/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/mman.h b/openflow/usr/include/arm-linux-gnueabihf/asm/mman.h
deleted file mode 100644
index 41f99c5..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/mman.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <asm-generic/mman.h>
-
-#define arch_mmap_check(addr, len, flags) \
-	(((flags) & MAP_FIXED && (addr) < FIRST_USER_ADDRESS) ? -EINVAL : 0)
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/msgbuf.h b/openflow/usr/include/arm-linux-gnueabihf/asm/msgbuf.h
deleted file mode 100644
index 809134c..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/msgbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/msgbuf.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/param.h b/openflow/usr/include/arm-linux-gnueabihf/asm/param.h
deleted file mode 100644
index 965d454..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/param.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/param.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/perf_regs.h b/openflow/usr/include/arm-linux-gnueabihf/asm/perf_regs.h
deleted file mode 100644
index ce59448..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/perf_regs.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _ASM_ARM_PERF_REGS_H
-#define _ASM_ARM_PERF_REGS_H
-
-enum perf_event_arm_regs {
-	PERF_REG_ARM_R0,
-	PERF_REG_ARM_R1,
-	PERF_REG_ARM_R2,
-	PERF_REG_ARM_R3,
-	PERF_REG_ARM_R4,
-	PERF_REG_ARM_R5,
-	PERF_REG_ARM_R6,
-	PERF_REG_ARM_R7,
-	PERF_REG_ARM_R8,
-	PERF_REG_ARM_R9,
-	PERF_REG_ARM_R10,
-	PERF_REG_ARM_FP,
-	PERF_REG_ARM_IP,
-	PERF_REG_ARM_SP,
-	PERF_REG_ARM_LR,
-	PERF_REG_ARM_PC,
-	PERF_REG_ARM_MAX,
-};
-#endif /* _ASM_ARM_PERF_REGS_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/poll.h b/openflow/usr/include/arm-linux-gnueabihf/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/posix_types.h b/openflow/usr/include/arm-linux-gnueabihf/asm/posix_types.h
deleted file mode 100644
index d2de9cb..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/posix_types.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  arch/arm/include/asm/posix_types.h
- *
- *  Copyright (C) 1996-1998 Russell King.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- *  Changelog:
- *   27-06-1996	RMK	Created
- */
-#ifndef __ARCH_ARM_POSIX_TYPES_H
-#define __ARCH_ARM_POSIX_TYPES_H
-
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned short		__kernel_mode_t;
-#define __kernel_mode_t __kernel_mode_t
-
-typedef unsigned short		__kernel_ipc_pid_t;
-#define __kernel_ipc_pid_t __kernel_ipc_pid_t
-
-typedef unsigned short		__kernel_uid_t;
-typedef unsigned short		__kernel_gid_t;
-#define __kernel_uid_t __kernel_uid_t
-
-typedef unsigned short		__kernel_old_dev_t;
-#define __kernel_old_dev_t __kernel_old_dev_t
-
-#include <asm-generic/posix_types.h>
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/ptrace.h b/openflow/usr/include/arm-linux-gnueabihf/asm/ptrace.h
deleted file mode 100644
index 950ab55..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/ptrace.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *  arch/arm/include/asm/ptrace.h
- *
- *  Copyright (C) 1996-2003 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_ARM_PTRACE_H
-#define __ASM_ARM_PTRACE_H
-
-#include <asm/hwcap.h>
-
-#define PTRACE_GETREGS		12
-#define PTRACE_SETREGS		13
-#define PTRACE_GETFPREGS	14
-#define PTRACE_SETFPREGS	15
-/* PTRACE_ATTACH is 16 */
-/* PTRACE_DETACH is 17 */
-#define PTRACE_GETWMMXREGS	18
-#define PTRACE_SETWMMXREGS	19
-/* 20 is unused */
-#define PTRACE_OLDSETOPTIONS	21
-#define PTRACE_GET_THREAD_AREA	22
-#define PTRACE_SET_SYSCALL	23
-/* PTRACE_SYSCALL is 24 */
-#define PTRACE_GETCRUNCHREGS	25
-#define PTRACE_SETCRUNCHREGS	26
-#define PTRACE_GETVFPREGS	27
-#define PTRACE_SETVFPREGS	28
-#define PTRACE_GETHBPREGS	29
-#define PTRACE_SETHBPREGS	30
-
-/*
- * PSR bits
- * Note on V7M there is no mode contained in the PSR
- */
-#define USR26_MODE	0x00000000
-#define FIQ26_MODE	0x00000001
-#define IRQ26_MODE	0x00000002
-#define SVC26_MODE	0x00000003
-#define USR_MODE	0x00000010
-#define SVC_MODE	0x00000013
-#define FIQ_MODE	0x00000011
-#define IRQ_MODE	0x00000012
-#define ABT_MODE	0x00000017
-#define HYP_MODE	0x0000001a
-#define UND_MODE	0x0000001b
-#define SYSTEM_MODE	0x0000001f
-#define MODE32_BIT	0x00000010
-#define MODE_MASK	0x0000001f
-
-#define V4_PSR_T_BIT	0x00000020	/* >= V4T, but not V7M */
-#define V7M_PSR_T_BIT	0x01000000
-/* for compatibility */
-#define PSR_T_BIT	V4_PSR_T_BIT
-
-#define PSR_F_BIT	0x00000040	/* >= V4, but not V7M */
-#define PSR_I_BIT	0x00000080	/* >= V4, but not V7M */
-#define PSR_A_BIT	0x00000100	/* >= V6, but not V7M */
-#define PSR_E_BIT	0x00000200	/* >= V6, but not V7M */
-#define PSR_J_BIT	0x01000000	/* >= V5J, but not V7M */
-#define PSR_Q_BIT	0x08000000	/* >= V5E, including V7M */
-#define PSR_V_BIT	0x10000000
-#define PSR_C_BIT	0x20000000
-#define PSR_Z_BIT	0x40000000
-#define PSR_N_BIT	0x80000000
-
-/*
- * Groups of PSR bits
- */
-#define PSR_f		0xff000000	/* Flags		*/
-#define PSR_s		0x00ff0000	/* Status		*/
-#define PSR_x		0x0000ff00	/* Extension		*/
-#define PSR_c		0x000000ff	/* Control		*/
-
-/*
- * ARMv7 groups of PSR bits
- */
-#define APSR_MASK	0xf80f0000	/* N, Z, C, V, Q and GE flags */
-#define PSR_ISET_MASK	0x01000010	/* ISA state (J, T) mask */
-#define PSR_IT_MASK	0x0600fc00	/* If-Then execution state mask */
-#define PSR_ENDIAN_MASK	0x00000200	/* Endianness state mask */
-
-/*
- * Default endianness state
- */
-#ifdef CONFIG_CPU_ENDIAN_BE8
-#define PSR_ENDSTATE	PSR_E_BIT
-#else
-#define PSR_ENDSTATE	0
-#endif
-
-/* 
- * These are 'magic' values for PTRACE_PEEKUSR that return info about where a
- * process is located in memory.
- */
-#define PT_TEXT_ADDR		0x10000
-#define PT_DATA_ADDR		0x10004
-#define PT_TEXT_END_ADDR	0x10008
-
-#ifndef __ASSEMBLY__
-
-/*
- * This struct defines the way the registers are stored on the
- * stack during a system call.  Note that sizeof(struct pt_regs)
- * has to be a multiple of 8.
- */
-struct pt_regs {
-	long uregs[18];
-};
-
-#define ARM_cpsr	uregs[16]
-#define ARM_pc		uregs[15]
-#define ARM_lr		uregs[14]
-#define ARM_sp		uregs[13]
-#define ARM_ip		uregs[12]
-#define ARM_fp		uregs[11]
-#define ARM_r10		uregs[10]
-#define ARM_r9		uregs[9]
-#define ARM_r8		uregs[8]
-#define ARM_r7		uregs[7]
-#define ARM_r6		uregs[6]
-#define ARM_r5		uregs[5]
-#define ARM_r4		uregs[4]
-#define ARM_r3		uregs[3]
-#define ARM_r2		uregs[2]
-#define ARM_r1		uregs[1]
-#define ARM_r0		uregs[0]
-#define ARM_ORIG_r0	uregs[17]
-
-/*
- * The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS
- * and core dumps.
- */
-#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
-
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ASM_ARM_PTRACE_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/resource.h b/openflow/usr/include/arm-linux-gnueabihf/asm/resource.h
deleted file mode 100644
index 04bc4db..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/resource.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/resource.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/sembuf.h b/openflow/usr/include/arm-linux-gnueabihf/asm/sembuf.h
deleted file mode 100644
index 7673b83..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/sembuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/sembuf.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/setup.h b/openflow/usr/include/arm-linux-gnueabihf/asm/setup.h
deleted file mode 100644
index 734ff39..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/setup.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- *  linux/include/asm/setup.h
- *
- *  Copyright (C) 1997-1999 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- *  Structure passed to kernel to tell it about the
- *  hardware it's running on.  See Documentation/arm/Setup
- *  for more info.
- */
-#ifndef __ASMARM_SETUP_H
-#define __ASMARM_SETUP_H
-
-#include <linux/types.h>
-
-#define COMMAND_LINE_SIZE 1024
-
-/* The list ends with an ATAG_NONE node. */
-#define ATAG_NONE	0x00000000
-
-struct tag_header {
-	__u32 size;
-	__u32 tag;
-};
-
-/* The list must start with an ATAG_CORE node */
-#define ATAG_CORE	0x54410001
-
-struct tag_core {
-	__u32 flags;		/* bit 0 = read-only */
-	__u32 pagesize;
-	__u32 rootdev;
-};
-
-/* it is allowed to have multiple ATAG_MEM nodes */
-#define ATAG_MEM	0x54410002
-
-struct tag_mem32 {
-	__u32	size;
-	__u32	start;	/* physical start address */
-};
-
-/* VGA text type displays */
-#define ATAG_VIDEOTEXT	0x54410003
-
-struct tag_videotext {
-	__u8		x;
-	__u8		y;
-	__u16		video_page;
-	__u8		video_mode;
-	__u8		video_cols;
-	__u16		video_ega_bx;
-	__u8		video_lines;
-	__u8		video_isvga;
-	__u16		video_points;
-};
-
-/* describes how the ramdisk will be used in kernel */
-#define ATAG_RAMDISK	0x54410004
-
-struct tag_ramdisk {
-	__u32 flags;	/* bit 0 = load, bit 1 = prompt */
-	__u32 size;	/* decompressed ramdisk size in _kilo_ bytes */
-	__u32 start;	/* starting block of floppy-based RAM disk image */
-};
-
-/* describes where the compressed ramdisk image lives (virtual address) */
-/*
- * this one accidentally used virtual addresses - as such,
- * it's deprecated.
- */
-#define ATAG_INITRD	0x54410005
-
-/* describes where the compressed ramdisk image lives (physical address) */
-#define ATAG_INITRD2	0x54420005
-
-struct tag_initrd {
-	__u32 start;	/* physical start address */
-	__u32 size;	/* size of compressed ramdisk image in bytes */
-};
-
-/* board serial number. "64 bits should be enough for everybody" */
-#define ATAG_SERIAL	0x54410006
-
-struct tag_serialnr {
-	__u32 low;
-	__u32 high;
-};
-
-/* board revision */
-#define ATAG_REVISION	0x54410007
-
-struct tag_revision {
-	__u32 rev;
-};
-
-/* initial values for vesafb-type framebuffers. see struct screen_info
- * in include/linux/tty.h
- */
-#define ATAG_VIDEOLFB	0x54410008
-
-struct tag_videolfb {
-	__u16		lfb_width;
-	__u16		lfb_height;
-	__u16		lfb_depth;
-	__u16		lfb_linelength;
-	__u32		lfb_base;
-	__u32		lfb_size;
-	__u8		red_size;
-	__u8		red_pos;
-	__u8		green_size;
-	__u8		green_pos;
-	__u8		blue_size;
-	__u8		blue_pos;
-	__u8		rsvd_size;
-	__u8		rsvd_pos;
-};
-
-/* command line: \0 terminated string */
-#define ATAG_CMDLINE	0x54410009
-
-struct tag_cmdline {
-	char	cmdline[1];	/* this is the minimum size */
-};
-
-/* acorn RiscPC specific information */
-#define ATAG_ACORN	0x41000101
-
-struct tag_acorn {
-	__u32 memc_control_reg;
-	__u32 vram_pages;
-	__u8 sounddefault;
-	__u8 adfsdrives;
-};
-
-/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
-#define ATAG_MEMCLK	0x41000402
-
-struct tag_memclk {
-	__u32 fmemclk;
-};
-
-struct tag {
-	struct tag_header hdr;
-	union {
-		struct tag_core		core;
-		struct tag_mem32	mem;
-		struct tag_videotext	videotext;
-		struct tag_ramdisk	ramdisk;
-		struct tag_initrd	initrd;
-		struct tag_serialnr	serialnr;
-		struct tag_revision	revision;
-		struct tag_videolfb	videolfb;
-		struct tag_cmdline	cmdline;
-
-		/*
-		 * Acorn specific
-		 */
-		struct tag_acorn	acorn;
-
-		/*
-		 * DC21285 specific
-		 */
-		struct tag_memclk	memclk;
-	} u;
-};
-
-struct tagtable {
-	__u32 tag;
-	int (*parse)(const struct tag *);
-};
-
-#define tag_member_present(tag,member)				\
-	((unsigned long)(&((struct tag *)0L)->member + 1)	\
-		<= (tag)->hdr.size * 4)
-
-#define tag_next(t)	((struct tag *)((__u32 *)(t) + (t)->hdr.size))
-#define tag_size(type)	((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
-
-#define for_each_tag(t,base)		\
-	for (t = base; t->hdr.size; t = tag_next(t))
-
-
-#endif /* __ASMARM_SETUP_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/shmbuf.h b/openflow/usr/include/arm-linux-gnueabihf/asm/shmbuf.h
deleted file mode 100644
index 83c05fc..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/shmbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/shmbuf.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/sigcontext.h b/openflow/usr/include/arm-linux-gnueabihf/asm/sigcontext.h
deleted file mode 100644
index fc0b80b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/sigcontext.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _ASMARM_SIGCONTEXT_H
-#define _ASMARM_SIGCONTEXT_H
-
-/*
- * Signal context structure - contains all info to do with the state
- * before the signal handler was invoked.  Note: only add new entries
- * to the end of the structure.
- */
-struct sigcontext {
-	unsigned long trap_no;
-	unsigned long error_code;
-	unsigned long oldmask;
-	unsigned long arm_r0;
-	unsigned long arm_r1;
-	unsigned long arm_r2;
-	unsigned long arm_r3;
-	unsigned long arm_r4;
-	unsigned long arm_r5;
-	unsigned long arm_r6;
-	unsigned long arm_r7;
-	unsigned long arm_r8;
-	unsigned long arm_r9;
-	unsigned long arm_r10;
-	unsigned long arm_fp;
-	unsigned long arm_ip;
-	unsigned long arm_sp;
-	unsigned long arm_lr;
-	unsigned long arm_pc;
-	unsigned long arm_cpsr;
-	unsigned long fault_address;
-};
-
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/siginfo.h b/openflow/usr/include/arm-linux-gnueabihf/asm/siginfo.h
deleted file mode 100644
index 0815d29..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/siginfo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/siginfo.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/signal.h b/openflow/usr/include/arm-linux-gnueabihf/asm/signal.h
deleted file mode 100644
index 93a5c18..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/signal.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#ifndef _ASMARM_SIGNAL_H
-#define _ASMARM_SIGNAL_H
-
-#include <linux/types.h>
-
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-#define NSIG		32
-typedef unsigned long sigset_t;
-
-
-#define SIGHUP		 1
-#define SIGINT		 2
-#define SIGQUIT		 3
-#define SIGILL		 4
-#define SIGTRAP		 5
-#define SIGABRT		 6
-#define SIGIOT		 6
-#define SIGBUS		 7
-#define SIGFPE		 8
-#define SIGKILL		 9
-#define SIGUSR1		10
-#define SIGSEGV		11
-#define SIGUSR2		12
-#define SIGPIPE		13
-#define SIGALRM		14
-#define SIGTERM		15
-#define SIGSTKFLT	16
-#define SIGCHLD		17
-#define SIGCONT		18
-#define SIGSTOP		19
-#define SIGTSTP		20
-#define SIGTTIN		21
-#define SIGTTOU		22
-#define SIGURG		23
-#define SIGXCPU		24
-#define SIGXFSZ		25
-#define SIGVTALRM	26
-#define SIGPROF		27
-#define SIGWINCH	28
-#define SIGIO		29
-#define SIGPOLL		SIGIO
-/*
-#define SIGLOST		29
-*/
-#define SIGPWR		30
-#define SIGSYS		31
-#define	SIGUNUSED	31
-
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN	32
-#define SIGRTMAX	_NSIG
-
-#define SIGSWI		32
-
-/*
- * SA_FLAGS values:
- *
- * SA_NOCLDSTOP		flag to turn off SIGCHLD when children stop.
- * SA_NOCLDWAIT		flag on SIGCHLD to inhibit zombies.
- * SA_SIGINFO		deliver the signal with SIGINFO structs
- * SA_THIRTYTWO		delivers the signal in 32-bit mode, even if the task 
- *			is running in 26-bit.
- * SA_ONSTACK		allows alternate signal stacks (see sigaltstack(2)).
- * SA_RESTART		flag to get restarting signals (which were the default long ago)
- * SA_NODEFER		prevents the current signal from being masked in the handler.
- * SA_RESETHAND		clears the handler when the signal is delivered.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP	0x00000001
-#define SA_NOCLDWAIT	0x00000002
-#define SA_SIGINFO	0x00000004
-#define SA_THIRTYTWO	0x02000000
-#define SA_RESTORER	0x04000000
-#define SA_ONSTACK	0x08000000
-#define SA_RESTART	0x10000000
-#define SA_NODEFER	0x40000000
-#define SA_RESETHAND	0x80000000
-
-#define SA_NOMASK	SA_NODEFER
-#define SA_ONESHOT	SA_RESETHAND
-
-#define MINSIGSTKSZ	2048
-#define SIGSTKSZ	8192
-
-#include <asm-generic/signal-defs.h>
-
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-struct sigaction {
-	union {
-	  __sighandler_t _sa_handler;
-	  void (*_sa_sigaction)(int, struct siginfo *, void *);
-	} _u;
-	sigset_t sa_mask;
-	unsigned long sa_flags;
-	void (*sa_restorer)(void);
-};
-
-#define sa_handler	_u._sa_handler
-#define sa_sigaction	_u._sa_sigaction
-
-
-typedef struct sigaltstack {
-	void *ss_sp;
-	int ss_flags;
-	size_t ss_size;
-} stack_t;
-
-
-#endif /* _ASMARM_SIGNAL_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/socket.h b/openflow/usr/include/arm-linux-gnueabihf/asm/socket.h
deleted file mode 100644
index 6b71384..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/socket.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/socket.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/sockios.h b/openflow/usr/include/arm-linux-gnueabihf/asm/sockios.h
deleted file mode 100644
index def6d47..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/sockios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/sockios.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/stat.h b/openflow/usr/include/arm-linux-gnueabihf/asm/stat.h
deleted file mode 100644
index 42c0c13..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/stat.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef _ASMARM_STAT_H
-#define _ASMARM_STAT_H
-
-struct __old_kernel_stat {
-	unsigned short st_dev;
-	unsigned short st_ino;
-	unsigned short st_mode;
-	unsigned short st_nlink;
-	unsigned short st_uid;
-	unsigned short st_gid;
-	unsigned short st_rdev;
-	unsigned long  st_size;
-	unsigned long  st_atime;
-	unsigned long  st_mtime;
-	unsigned long  st_ctime;
-};
-
-#define STAT_HAVE_NSEC 
-
-struct stat {
-#if defined(__ARMEB__)
-	unsigned short st_dev;
-	unsigned short __pad1;
-#else
-	unsigned long  st_dev;
-#endif
-	unsigned long  st_ino;
-	unsigned short st_mode;
-	unsigned short st_nlink;
-	unsigned short st_uid;
-	unsigned short st_gid;
-#if defined(__ARMEB__)
-	unsigned short st_rdev;
-	unsigned short __pad2;
-#else
-	unsigned long  st_rdev;
-#endif
-	unsigned long  st_size;
-	unsigned long  st_blksize;
-	unsigned long  st_blocks;
-	unsigned long  st_atime;
-	unsigned long  st_atime_nsec;
-	unsigned long  st_mtime;
-	unsigned long  st_mtime_nsec;
-	unsigned long  st_ctime;
-	unsigned long  st_ctime_nsec;
-	unsigned long  __unused4;
-	unsigned long  __unused5;
-};
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- * Note: The kernel zero's the padded region because glibc might read them
- * in the hope that the kernel has stretched to using larger sizes.
- */
-struct stat64 {
-	unsigned long long	st_dev;
-	unsigned char   __pad0[4];
-
-#define STAT64_HAS_BROKEN_ST_INO	1
-	unsigned long	__st_ino;
-	unsigned int	st_mode;
-	unsigned int	st_nlink;
-
-	unsigned long	st_uid;
-	unsigned long	st_gid;
-
-	unsigned long long	st_rdev;
-	unsigned char   __pad3[4];
-
-	long long	st_size;
-	unsigned long	st_blksize;
-	unsigned long long st_blocks;	/* Number 512-byte blocks allocated. */
-
-	unsigned long	st_atime;
-	unsigned long	st_atime_nsec;
-
-	unsigned long	st_mtime;
-	unsigned long	st_mtime_nsec;
-
-	unsigned long	st_ctime;
-	unsigned long	st_ctime_nsec;
-
-	unsigned long long	st_ino;
-};
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/statfs.h b/openflow/usr/include/arm-linux-gnueabihf/asm/statfs.h
deleted file mode 100644
index 079447c..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/statfs.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASMARM_STATFS_H
-#define _ASMARM_STATFS_H
-
-/*
- * With EABI there is 4 bytes of padding added to this structure.
- * Let's pack it so the padding goes away to simplify dual ABI support.
- * Note that user space does NOT have to pack this structure.
- */
-#define ARCH_PACK_STATFS64 __attribute__((packed,aligned(4)))
-
-#include <asm-generic/statfs.h>
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/swab.h b/openflow/usr/include/arm-linux-gnueabihf/asm/swab.h
deleted file mode 100644
index 5f621bf..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/swab.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  arch/arm/include/asm/byteorder.h
- *
- * ARM Endian-ness.  In little endian mode, the data bus is connected such
- * that byte accesses appear as:
- *  0 = d0...d7, 1 = d8...d15, 2 = d16...d23, 3 = d24...d31
- * and word accesses (data or instruction) appear as:
- *  d0...d31
- *
- * When in big endian mode, byte accesses appear as:
- *  0 = d24...d31, 1 = d16...d23, 2 = d8...d15, 3 = d0...d7
- * and word accesses (data or instruction) appear as:
- *  d0...d31
- */
-#ifndef __ASM_ARM_SWAB_H
-#define __ASM_ARM_SWAB_H
-
-
-#include <linux/types.h>
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __SWAB_64_THRU_32__
-#endif
-
-
-static __inline__  __u32 __arch_swab32(__u32 x)
-{
-	__u32 t;
-
-#ifndef __thumb__
-	if (!__builtin_constant_p(x)) {
-		/*
-		 * The compiler needs a bit of a hint here to always do the
-		 * right thing and not screw it up to different degrees
-		 * depending on the gcc version.
-		 */
-		__asm__ ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
-	} else
-#endif
-		t = x ^ ((x << 16) | (x >> 16)); /* eor r1,r0,r0,ror #16 */
-
-	x = (x << 24) | (x >> 8);		/* mov r0,r0,ror #8      */
-	t &= ~0x00FF0000;			/* bic r1,r1,#0x00FF0000 */
-	x ^= (t >> 8);				/* eor r0,r0,r1,lsr #8   */
-
-	return x;
-}
-#define __arch_swab32 __arch_swab32
-
-
-#endif /* __ASM_ARM_SWAB_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/termbits.h b/openflow/usr/include/arm-linux-gnueabihf/asm/termbits.h
deleted file mode 100644
index 3935b10..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/termbits.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/termbits.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/termios.h b/openflow/usr/include/arm-linux-gnueabihf/asm/termios.h
deleted file mode 100644
index 280d78a..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/termios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/termios.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/types.h b/openflow/usr/include/arm-linux-gnueabihf/asm/types.h
deleted file mode 100644
index a53cdb8..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/types.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _ASM_TYPES_H
-#define _ASM_TYPES_H
-
-#include <asm-generic/int-ll64.h>
-
-/*
- * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as
- * unambiguous on ARM as you would expect. For the types below, there is a
- * difference on ARM between GCC built for bare metal ARM, GCC built for glibc
- * and the kernel itself, which results in build errors if you try to build with
- * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h'
- * in order to use NEON intrinsics)
- *
- * As the typedefs for these types in 'stdint.h' are based on builtin defines
- * supplied by GCC, we can tweak these to align with the kernel's idea of those
- * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same
- * source file (provided that -ffreestanding is used).
- *
- *                    int32_t         uint32_t               uintptr_t
- * bare metal GCC     long            unsigned long          unsigned int
- * glibc GCC          int             unsigned int           unsigned int
- * kernel             int             unsigned int           unsigned long
- */
-
-#ifdef __INT32_TYPE__
-#undef __INT32_TYPE__
-#define __INT32_TYPE__		int
-#endif
-
-#ifdef __UINT32_TYPE__
-#undef __UINT32_TYPE__
-#define __UINT32_TYPE__	unsigned int
-#endif
-
-#ifdef __UINTPTR_TYPE__
-#undef __UINTPTR_TYPE__
-#define __UINTPTR_TYPE__	unsigned long
-#endif
-
-#endif /* _ASM_TYPES_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/asm/unistd.h b/openflow/usr/include/arm-linux-gnueabihf/asm/unistd.h
deleted file mode 100644
index a72f1a5..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/asm/unistd.h
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- *  arch/arm/include/asm/unistd.h
- *
- *  Copyright (C) 2001-2005 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Please forward _all_ changes to this file to rmk@arm.linux.org.uk,
- * no matter what the change is.  Thanks!
- */
-#ifndef __ASM_ARM_UNISTD_H
-#define __ASM_ARM_UNISTD_H
-
-#define __NR_OABI_SYSCALL_BASE	0x900000
-
-#if defined(__thumb__) || defined(__ARM_EABI__)
-#define __NR_SYSCALL_BASE	0
-#else
-#define __NR_SYSCALL_BASE	__NR_OABI_SYSCALL_BASE
-#endif
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_restart_syscall		(__NR_SYSCALL_BASE+  0)
-#define __NR_exit			(__NR_SYSCALL_BASE+  1)
-#define __NR_fork			(__NR_SYSCALL_BASE+  2)
-#define __NR_read			(__NR_SYSCALL_BASE+  3)
-#define __NR_write			(__NR_SYSCALL_BASE+  4)
-#define __NR_open			(__NR_SYSCALL_BASE+  5)
-#define __NR_close			(__NR_SYSCALL_BASE+  6)
-					/* 7 was sys_waitpid */
-#define __NR_creat			(__NR_SYSCALL_BASE+  8)
-#define __NR_link			(__NR_SYSCALL_BASE+  9)
-#define __NR_unlink			(__NR_SYSCALL_BASE+ 10)
-#define __NR_execve			(__NR_SYSCALL_BASE+ 11)
-#define __NR_chdir			(__NR_SYSCALL_BASE+ 12)
-#define __NR_time			(__NR_SYSCALL_BASE+ 13)
-#define __NR_mknod			(__NR_SYSCALL_BASE+ 14)
-#define __NR_chmod			(__NR_SYSCALL_BASE+ 15)
-#define __NR_lchown			(__NR_SYSCALL_BASE+ 16)
-					/* 17 was sys_break */
-					/* 18 was sys_stat */
-#define __NR_lseek			(__NR_SYSCALL_BASE+ 19)
-#define __NR_getpid			(__NR_SYSCALL_BASE+ 20)
-#define __NR_mount			(__NR_SYSCALL_BASE+ 21)
-#define __NR_umount			(__NR_SYSCALL_BASE+ 22)
-#define __NR_setuid			(__NR_SYSCALL_BASE+ 23)
-#define __NR_getuid			(__NR_SYSCALL_BASE+ 24)
-#define __NR_stime			(__NR_SYSCALL_BASE+ 25)
-#define __NR_ptrace			(__NR_SYSCALL_BASE+ 26)
-#define __NR_alarm			(__NR_SYSCALL_BASE+ 27)
-					/* 28 was sys_fstat */
-#define __NR_pause			(__NR_SYSCALL_BASE+ 29)
-#define __NR_utime			(__NR_SYSCALL_BASE+ 30)
-					/* 31 was sys_stty */
-					/* 32 was sys_gtty */
-#define __NR_access			(__NR_SYSCALL_BASE+ 33)
-#define __NR_nice			(__NR_SYSCALL_BASE+ 34)
-					/* 35 was sys_ftime */
-#define __NR_sync			(__NR_SYSCALL_BASE+ 36)
-#define __NR_kill			(__NR_SYSCALL_BASE+ 37)
-#define __NR_rename			(__NR_SYSCALL_BASE+ 38)
-#define __NR_mkdir			(__NR_SYSCALL_BASE+ 39)
-#define __NR_rmdir			(__NR_SYSCALL_BASE+ 40)
-#define __NR_dup			(__NR_SYSCALL_BASE+ 41)
-#define __NR_pipe			(__NR_SYSCALL_BASE+ 42)
-#define __NR_times			(__NR_SYSCALL_BASE+ 43)
-					/* 44 was sys_prof */
-#define __NR_brk			(__NR_SYSCALL_BASE+ 45)
-#define __NR_setgid			(__NR_SYSCALL_BASE+ 46)
-#define __NR_getgid			(__NR_SYSCALL_BASE+ 47)
-					/* 48 was sys_signal */
-#define __NR_geteuid			(__NR_SYSCALL_BASE+ 49)
-#define __NR_getegid			(__NR_SYSCALL_BASE+ 50)
-#define __NR_acct			(__NR_SYSCALL_BASE+ 51)
-#define __NR_umount2			(__NR_SYSCALL_BASE+ 52)
-					/* 53 was sys_lock */
-#define __NR_ioctl			(__NR_SYSCALL_BASE+ 54)
-#define __NR_fcntl			(__NR_SYSCALL_BASE+ 55)
-					/* 56 was sys_mpx */
-#define __NR_setpgid			(__NR_SYSCALL_BASE+ 57)
-					/* 58 was sys_ulimit */
-					/* 59 was sys_olduname */
-#define __NR_umask			(__NR_SYSCALL_BASE+ 60)
-#define __NR_chroot			(__NR_SYSCALL_BASE+ 61)
-#define __NR_ustat			(__NR_SYSCALL_BASE+ 62)
-#define __NR_dup2			(__NR_SYSCALL_BASE+ 63)
-#define __NR_getppid			(__NR_SYSCALL_BASE+ 64)
-#define __NR_getpgrp			(__NR_SYSCALL_BASE+ 65)
-#define __NR_setsid			(__NR_SYSCALL_BASE+ 66)
-#define __NR_sigaction			(__NR_SYSCALL_BASE+ 67)
-					/* 68 was sys_sgetmask */
-					/* 69 was sys_ssetmask */
-#define __NR_setreuid			(__NR_SYSCALL_BASE+ 70)
-#define __NR_setregid			(__NR_SYSCALL_BASE+ 71)
-#define __NR_sigsuspend			(__NR_SYSCALL_BASE+ 72)
-#define __NR_sigpending			(__NR_SYSCALL_BASE+ 73)
-#define __NR_sethostname		(__NR_SYSCALL_BASE+ 74)
-#define __NR_setrlimit			(__NR_SYSCALL_BASE+ 75)
-#define __NR_getrlimit			(__NR_SYSCALL_BASE+ 76)	/* Back compat 2GB limited rlimit */
-#define __NR_getrusage			(__NR_SYSCALL_BASE+ 77)
-#define __NR_gettimeofday		(__NR_SYSCALL_BASE+ 78)
-#define __NR_settimeofday		(__NR_SYSCALL_BASE+ 79)
-#define __NR_getgroups			(__NR_SYSCALL_BASE+ 80)
-#define __NR_setgroups			(__NR_SYSCALL_BASE+ 81)
-#define __NR_select			(__NR_SYSCALL_BASE+ 82)
-#define __NR_symlink			(__NR_SYSCALL_BASE+ 83)
-					/* 84 was sys_lstat */
-#define __NR_readlink			(__NR_SYSCALL_BASE+ 85)
-#define __NR_uselib			(__NR_SYSCALL_BASE+ 86)
-#define __NR_swapon			(__NR_SYSCALL_BASE+ 87)
-#define __NR_reboot			(__NR_SYSCALL_BASE+ 88)
-#define __NR_readdir			(__NR_SYSCALL_BASE+ 89)
-#define __NR_mmap			(__NR_SYSCALL_BASE+ 90)
-#define __NR_munmap			(__NR_SYSCALL_BASE+ 91)
-#define __NR_truncate			(__NR_SYSCALL_BASE+ 92)
-#define __NR_ftruncate			(__NR_SYSCALL_BASE+ 93)
-#define __NR_fchmod			(__NR_SYSCALL_BASE+ 94)
-#define __NR_fchown			(__NR_SYSCALL_BASE+ 95)
-#define __NR_getpriority		(__NR_SYSCALL_BASE+ 96)
-#define __NR_setpriority		(__NR_SYSCALL_BASE+ 97)
-					/* 98 was sys_profil */
-#define __NR_statfs			(__NR_SYSCALL_BASE+ 99)
-#define __NR_fstatfs			(__NR_SYSCALL_BASE+100)
-					/* 101 was sys_ioperm */
-#define __NR_socketcall			(__NR_SYSCALL_BASE+102)
-#define __NR_syslog			(__NR_SYSCALL_BASE+103)
-#define __NR_setitimer			(__NR_SYSCALL_BASE+104)
-#define __NR_getitimer			(__NR_SYSCALL_BASE+105)
-#define __NR_stat			(__NR_SYSCALL_BASE+106)
-#define __NR_lstat			(__NR_SYSCALL_BASE+107)
-#define __NR_fstat			(__NR_SYSCALL_BASE+108)
-					/* 109 was sys_uname */
-					/* 110 was sys_iopl */
-#define __NR_vhangup			(__NR_SYSCALL_BASE+111)
-					/* 112 was sys_idle */
-#define __NR_syscall			(__NR_SYSCALL_BASE+113) /* syscall to call a syscall! */
-#define __NR_wait4			(__NR_SYSCALL_BASE+114)
-#define __NR_swapoff			(__NR_SYSCALL_BASE+115)
-#define __NR_sysinfo			(__NR_SYSCALL_BASE+116)
-#define __NR_ipc			(__NR_SYSCALL_BASE+117)
-#define __NR_fsync			(__NR_SYSCALL_BASE+118)
-#define __NR_sigreturn			(__NR_SYSCALL_BASE+119)
-#define __NR_clone			(__NR_SYSCALL_BASE+120)
-#define __NR_setdomainname		(__NR_SYSCALL_BASE+121)
-#define __NR_uname			(__NR_SYSCALL_BASE+122)
-					/* 123 was sys_modify_ldt */
-#define __NR_adjtimex			(__NR_SYSCALL_BASE+124)
-#define __NR_mprotect			(__NR_SYSCALL_BASE+125)
-#define __NR_sigprocmask		(__NR_SYSCALL_BASE+126)
-					/* 127 was sys_create_module */
-#define __NR_init_module		(__NR_SYSCALL_BASE+128)
-#define __NR_delete_module		(__NR_SYSCALL_BASE+129)
-					/* 130 was sys_get_kernel_syms */
-#define __NR_quotactl			(__NR_SYSCALL_BASE+131)
-#define __NR_getpgid			(__NR_SYSCALL_BASE+132)
-#define __NR_fchdir			(__NR_SYSCALL_BASE+133)
-#define __NR_bdflush			(__NR_SYSCALL_BASE+134)
-#define __NR_sysfs			(__NR_SYSCALL_BASE+135)
-#define __NR_personality		(__NR_SYSCALL_BASE+136)
-					/* 137 was sys_afs_syscall */
-#define __NR_setfsuid			(__NR_SYSCALL_BASE+138)
-#define __NR_setfsgid			(__NR_SYSCALL_BASE+139)
-#define __NR__llseek			(__NR_SYSCALL_BASE+140)
-#define __NR_getdents			(__NR_SYSCALL_BASE+141)
-#define __NR__newselect			(__NR_SYSCALL_BASE+142)
-#define __NR_flock			(__NR_SYSCALL_BASE+143)
-#define __NR_msync			(__NR_SYSCALL_BASE+144)
-#define __NR_readv			(__NR_SYSCALL_BASE+145)
-#define __NR_writev			(__NR_SYSCALL_BASE+146)
-#define __NR_getsid			(__NR_SYSCALL_BASE+147)
-#define __NR_fdatasync			(__NR_SYSCALL_BASE+148)
-#define __NR__sysctl			(__NR_SYSCALL_BASE+149)
-#define __NR_mlock			(__NR_SYSCALL_BASE+150)
-#define __NR_munlock			(__NR_SYSCALL_BASE+151)
-#define __NR_mlockall			(__NR_SYSCALL_BASE+152)
-#define __NR_munlockall			(__NR_SYSCALL_BASE+153)
-#define __NR_sched_setparam		(__NR_SYSCALL_BASE+154)
-#define __NR_sched_getparam		(__NR_SYSCALL_BASE+155)
-#define __NR_sched_setscheduler		(__NR_SYSCALL_BASE+156)
-#define __NR_sched_getscheduler		(__NR_SYSCALL_BASE+157)
-#define __NR_sched_yield		(__NR_SYSCALL_BASE+158)
-#define __NR_sched_get_priority_max	(__NR_SYSCALL_BASE+159)
-#define __NR_sched_get_priority_min	(__NR_SYSCALL_BASE+160)
-#define __NR_sched_rr_get_interval	(__NR_SYSCALL_BASE+161)
-#define __NR_nanosleep			(__NR_SYSCALL_BASE+162)
-#define __NR_mremap			(__NR_SYSCALL_BASE+163)
-#define __NR_setresuid			(__NR_SYSCALL_BASE+164)
-#define __NR_getresuid			(__NR_SYSCALL_BASE+165)
-					/* 166 was sys_vm86 */
-					/* 167 was sys_query_module */
-#define __NR_poll			(__NR_SYSCALL_BASE+168)
-#define __NR_nfsservctl			(__NR_SYSCALL_BASE+169)
-#define __NR_setresgid			(__NR_SYSCALL_BASE+170)
-#define __NR_getresgid			(__NR_SYSCALL_BASE+171)
-#define __NR_prctl			(__NR_SYSCALL_BASE+172)
-#define __NR_rt_sigreturn		(__NR_SYSCALL_BASE+173)
-#define __NR_rt_sigaction		(__NR_SYSCALL_BASE+174)
-#define __NR_rt_sigprocmask		(__NR_SYSCALL_BASE+175)
-#define __NR_rt_sigpending		(__NR_SYSCALL_BASE+176)
-#define __NR_rt_sigtimedwait		(__NR_SYSCALL_BASE+177)
-#define __NR_rt_sigqueueinfo		(__NR_SYSCALL_BASE+178)
-#define __NR_rt_sigsuspend		(__NR_SYSCALL_BASE+179)
-#define __NR_pread64			(__NR_SYSCALL_BASE+180)
-#define __NR_pwrite64			(__NR_SYSCALL_BASE+181)
-#define __NR_chown			(__NR_SYSCALL_BASE+182)
-#define __NR_getcwd			(__NR_SYSCALL_BASE+183)
-#define __NR_capget			(__NR_SYSCALL_BASE+184)
-#define __NR_capset			(__NR_SYSCALL_BASE+185)
-#define __NR_sigaltstack		(__NR_SYSCALL_BASE+186)
-#define __NR_sendfile			(__NR_SYSCALL_BASE+187)
-					/* 188 reserved */
-					/* 189 reserved */
-#define __NR_vfork			(__NR_SYSCALL_BASE+190)
-#define __NR_ugetrlimit			(__NR_SYSCALL_BASE+191)	/* SuS compliant getrlimit */
-#define __NR_mmap2			(__NR_SYSCALL_BASE+192)
-#define __NR_truncate64			(__NR_SYSCALL_BASE+193)
-#define __NR_ftruncate64		(__NR_SYSCALL_BASE+194)
-#define __NR_stat64			(__NR_SYSCALL_BASE+195)
-#define __NR_lstat64			(__NR_SYSCALL_BASE+196)
-#define __NR_fstat64			(__NR_SYSCALL_BASE+197)
-#define __NR_lchown32			(__NR_SYSCALL_BASE+198)
-#define __NR_getuid32			(__NR_SYSCALL_BASE+199)
-#define __NR_getgid32			(__NR_SYSCALL_BASE+200)
-#define __NR_geteuid32			(__NR_SYSCALL_BASE+201)
-#define __NR_getegid32			(__NR_SYSCALL_BASE+202)
-#define __NR_setreuid32			(__NR_SYSCALL_BASE+203)
-#define __NR_setregid32			(__NR_SYSCALL_BASE+204)
-#define __NR_getgroups32		(__NR_SYSCALL_BASE+205)
-#define __NR_setgroups32		(__NR_SYSCALL_BASE+206)
-#define __NR_fchown32			(__NR_SYSCALL_BASE+207)
-#define __NR_setresuid32		(__NR_SYSCALL_BASE+208)
-#define __NR_getresuid32		(__NR_SYSCALL_BASE+209)
-#define __NR_setresgid32		(__NR_SYSCALL_BASE+210)
-#define __NR_getresgid32		(__NR_SYSCALL_BASE+211)
-#define __NR_chown32			(__NR_SYSCALL_BASE+212)
-#define __NR_setuid32			(__NR_SYSCALL_BASE+213)
-#define __NR_setgid32			(__NR_SYSCALL_BASE+214)
-#define __NR_setfsuid32			(__NR_SYSCALL_BASE+215)
-#define __NR_setfsgid32			(__NR_SYSCALL_BASE+216)
-#define __NR_getdents64			(__NR_SYSCALL_BASE+217)
-#define __NR_pivot_root			(__NR_SYSCALL_BASE+218)
-#define __NR_mincore			(__NR_SYSCALL_BASE+219)
-#define __NR_madvise			(__NR_SYSCALL_BASE+220)
-#define __NR_fcntl64			(__NR_SYSCALL_BASE+221)
-					/* 222 for tux */
-					/* 223 is unused */
-#define __NR_gettid			(__NR_SYSCALL_BASE+224)
-#define __NR_readahead			(__NR_SYSCALL_BASE+225)
-#define __NR_setxattr			(__NR_SYSCALL_BASE+226)
-#define __NR_lsetxattr			(__NR_SYSCALL_BASE+227)
-#define __NR_fsetxattr			(__NR_SYSCALL_BASE+228)
-#define __NR_getxattr			(__NR_SYSCALL_BASE+229)
-#define __NR_lgetxattr			(__NR_SYSCALL_BASE+230)
-#define __NR_fgetxattr			(__NR_SYSCALL_BASE+231)
-#define __NR_listxattr			(__NR_SYSCALL_BASE+232)
-#define __NR_llistxattr			(__NR_SYSCALL_BASE+233)
-#define __NR_flistxattr			(__NR_SYSCALL_BASE+234)
-#define __NR_removexattr		(__NR_SYSCALL_BASE+235)
-#define __NR_lremovexattr		(__NR_SYSCALL_BASE+236)
-#define __NR_fremovexattr		(__NR_SYSCALL_BASE+237)
-#define __NR_tkill			(__NR_SYSCALL_BASE+238)
-#define __NR_sendfile64			(__NR_SYSCALL_BASE+239)
-#define __NR_futex			(__NR_SYSCALL_BASE+240)
-#define __NR_sched_setaffinity		(__NR_SYSCALL_BASE+241)
-#define __NR_sched_getaffinity		(__NR_SYSCALL_BASE+242)
-#define __NR_io_setup			(__NR_SYSCALL_BASE+243)
-#define __NR_io_destroy			(__NR_SYSCALL_BASE+244)
-#define __NR_io_getevents		(__NR_SYSCALL_BASE+245)
-#define __NR_io_submit			(__NR_SYSCALL_BASE+246)
-#define __NR_io_cancel			(__NR_SYSCALL_BASE+247)
-#define __NR_exit_group			(__NR_SYSCALL_BASE+248)
-#define __NR_lookup_dcookie		(__NR_SYSCALL_BASE+249)
-#define __NR_epoll_create		(__NR_SYSCALL_BASE+250)
-#define __NR_epoll_ctl			(__NR_SYSCALL_BASE+251)
-#define __NR_epoll_wait			(__NR_SYSCALL_BASE+252)
-#define __NR_remap_file_pages		(__NR_SYSCALL_BASE+253)
-					/* 254 for set_thread_area */
-					/* 255 for get_thread_area */
-#define __NR_set_tid_address		(__NR_SYSCALL_BASE+256)
-#define __NR_timer_create		(__NR_SYSCALL_BASE+257)
-#define __NR_timer_settime		(__NR_SYSCALL_BASE+258)
-#define __NR_timer_gettime		(__NR_SYSCALL_BASE+259)
-#define __NR_timer_getoverrun		(__NR_SYSCALL_BASE+260)
-#define __NR_timer_delete		(__NR_SYSCALL_BASE+261)
-#define __NR_clock_settime		(__NR_SYSCALL_BASE+262)
-#define __NR_clock_gettime		(__NR_SYSCALL_BASE+263)
-#define __NR_clock_getres		(__NR_SYSCALL_BASE+264)
-#define __NR_clock_nanosleep		(__NR_SYSCALL_BASE+265)
-#define __NR_statfs64			(__NR_SYSCALL_BASE+266)
-#define __NR_fstatfs64			(__NR_SYSCALL_BASE+267)
-#define __NR_tgkill			(__NR_SYSCALL_BASE+268)
-#define __NR_utimes			(__NR_SYSCALL_BASE+269)
-#define __NR_arm_fadvise64_64		(__NR_SYSCALL_BASE+270)
-#define __NR_pciconfig_iobase		(__NR_SYSCALL_BASE+271)
-#define __NR_pciconfig_read		(__NR_SYSCALL_BASE+272)
-#define __NR_pciconfig_write		(__NR_SYSCALL_BASE+273)
-#define __NR_mq_open			(__NR_SYSCALL_BASE+274)
-#define __NR_mq_unlink			(__NR_SYSCALL_BASE+275)
-#define __NR_mq_timedsend		(__NR_SYSCALL_BASE+276)
-#define __NR_mq_timedreceive		(__NR_SYSCALL_BASE+277)
-#define __NR_mq_notify			(__NR_SYSCALL_BASE+278)
-#define __NR_mq_getsetattr		(__NR_SYSCALL_BASE+279)
-#define __NR_waitid			(__NR_SYSCALL_BASE+280)
-#define __NR_socket			(__NR_SYSCALL_BASE+281)
-#define __NR_bind			(__NR_SYSCALL_BASE+282)
-#define __NR_connect			(__NR_SYSCALL_BASE+283)
-#define __NR_listen			(__NR_SYSCALL_BASE+284)
-#define __NR_accept			(__NR_SYSCALL_BASE+285)
-#define __NR_getsockname		(__NR_SYSCALL_BASE+286)
-#define __NR_getpeername		(__NR_SYSCALL_BASE+287)
-#define __NR_socketpair			(__NR_SYSCALL_BASE+288)
-#define __NR_send			(__NR_SYSCALL_BASE+289)
-#define __NR_sendto			(__NR_SYSCALL_BASE+290)
-#define __NR_recv			(__NR_SYSCALL_BASE+291)
-#define __NR_recvfrom			(__NR_SYSCALL_BASE+292)
-#define __NR_shutdown			(__NR_SYSCALL_BASE+293)
-#define __NR_setsockopt			(__NR_SYSCALL_BASE+294)
-#define __NR_getsockopt			(__NR_SYSCALL_BASE+295)
-#define __NR_sendmsg			(__NR_SYSCALL_BASE+296)
-#define __NR_recvmsg			(__NR_SYSCALL_BASE+297)
-#define __NR_semop			(__NR_SYSCALL_BASE+298)
-#define __NR_semget			(__NR_SYSCALL_BASE+299)
-#define __NR_semctl			(__NR_SYSCALL_BASE+300)
-#define __NR_msgsnd			(__NR_SYSCALL_BASE+301)
-#define __NR_msgrcv			(__NR_SYSCALL_BASE+302)
-#define __NR_msgget			(__NR_SYSCALL_BASE+303)
-#define __NR_msgctl			(__NR_SYSCALL_BASE+304)
-#define __NR_shmat			(__NR_SYSCALL_BASE+305)
-#define __NR_shmdt			(__NR_SYSCALL_BASE+306)
-#define __NR_shmget			(__NR_SYSCALL_BASE+307)
-#define __NR_shmctl			(__NR_SYSCALL_BASE+308)
-#define __NR_add_key			(__NR_SYSCALL_BASE+309)
-#define __NR_request_key		(__NR_SYSCALL_BASE+310)
-#define __NR_keyctl			(__NR_SYSCALL_BASE+311)
-#define __NR_semtimedop			(__NR_SYSCALL_BASE+312)
-#define __NR_vserver			(__NR_SYSCALL_BASE+313)
-#define __NR_ioprio_set			(__NR_SYSCALL_BASE+314)
-#define __NR_ioprio_get			(__NR_SYSCALL_BASE+315)
-#define __NR_inotify_init		(__NR_SYSCALL_BASE+316)
-#define __NR_inotify_add_watch		(__NR_SYSCALL_BASE+317)
-#define __NR_inotify_rm_watch		(__NR_SYSCALL_BASE+318)
-#define __NR_mbind			(__NR_SYSCALL_BASE+319)
-#define __NR_get_mempolicy		(__NR_SYSCALL_BASE+320)
-#define __NR_set_mempolicy		(__NR_SYSCALL_BASE+321)
-#define __NR_openat			(__NR_SYSCALL_BASE+322)
-#define __NR_mkdirat			(__NR_SYSCALL_BASE+323)
-#define __NR_mknodat			(__NR_SYSCALL_BASE+324)
-#define __NR_fchownat			(__NR_SYSCALL_BASE+325)
-#define __NR_futimesat			(__NR_SYSCALL_BASE+326)
-#define __NR_fstatat64			(__NR_SYSCALL_BASE+327)
-#define __NR_unlinkat			(__NR_SYSCALL_BASE+328)
-#define __NR_renameat			(__NR_SYSCALL_BASE+329)
-#define __NR_linkat			(__NR_SYSCALL_BASE+330)
-#define __NR_symlinkat			(__NR_SYSCALL_BASE+331)
-#define __NR_readlinkat			(__NR_SYSCALL_BASE+332)
-#define __NR_fchmodat			(__NR_SYSCALL_BASE+333)
-#define __NR_faccessat			(__NR_SYSCALL_BASE+334)
-#define __NR_pselect6			(__NR_SYSCALL_BASE+335)
-#define __NR_ppoll			(__NR_SYSCALL_BASE+336)
-#define __NR_unshare			(__NR_SYSCALL_BASE+337)
-#define __NR_set_robust_list		(__NR_SYSCALL_BASE+338)
-#define __NR_get_robust_list		(__NR_SYSCALL_BASE+339)
-#define __NR_splice			(__NR_SYSCALL_BASE+340)
-#define __NR_arm_sync_file_range	(__NR_SYSCALL_BASE+341)
-#define __NR_sync_file_range2		__NR_arm_sync_file_range
-#define __NR_tee			(__NR_SYSCALL_BASE+342)
-#define __NR_vmsplice			(__NR_SYSCALL_BASE+343)
-#define __NR_move_pages			(__NR_SYSCALL_BASE+344)
-#define __NR_getcpu			(__NR_SYSCALL_BASE+345)
-#define __NR_epoll_pwait		(__NR_SYSCALL_BASE+346)
-#define __NR_kexec_load			(__NR_SYSCALL_BASE+347)
-#define __NR_utimensat			(__NR_SYSCALL_BASE+348)
-#define __NR_signalfd			(__NR_SYSCALL_BASE+349)
-#define __NR_timerfd_create		(__NR_SYSCALL_BASE+350)
-#define __NR_eventfd			(__NR_SYSCALL_BASE+351)
-#define __NR_fallocate			(__NR_SYSCALL_BASE+352)
-#define __NR_timerfd_settime		(__NR_SYSCALL_BASE+353)
-#define __NR_timerfd_gettime		(__NR_SYSCALL_BASE+354)
-#define __NR_signalfd4			(__NR_SYSCALL_BASE+355)
-#define __NR_eventfd2			(__NR_SYSCALL_BASE+356)
-#define __NR_epoll_create1		(__NR_SYSCALL_BASE+357)
-#define __NR_dup3			(__NR_SYSCALL_BASE+358)
-#define __NR_pipe2			(__NR_SYSCALL_BASE+359)
-#define __NR_inotify_init1		(__NR_SYSCALL_BASE+360)
-#define __NR_preadv			(__NR_SYSCALL_BASE+361)
-#define __NR_pwritev			(__NR_SYSCALL_BASE+362)
-#define __NR_rt_tgsigqueueinfo		(__NR_SYSCALL_BASE+363)
-#define __NR_perf_event_open		(__NR_SYSCALL_BASE+364)
-#define __NR_recvmmsg			(__NR_SYSCALL_BASE+365)
-#define __NR_accept4			(__NR_SYSCALL_BASE+366)
-#define __NR_fanotify_init		(__NR_SYSCALL_BASE+367)
-#define __NR_fanotify_mark		(__NR_SYSCALL_BASE+368)
-#define __NR_prlimit64			(__NR_SYSCALL_BASE+369)
-#define __NR_name_to_handle_at		(__NR_SYSCALL_BASE+370)
-#define __NR_open_by_handle_at		(__NR_SYSCALL_BASE+371)
-#define __NR_clock_adjtime		(__NR_SYSCALL_BASE+372)
-#define __NR_syncfs			(__NR_SYSCALL_BASE+373)
-#define __NR_sendmmsg			(__NR_SYSCALL_BASE+374)
-#define __NR_setns			(__NR_SYSCALL_BASE+375)
-#define __NR_process_vm_readv		(__NR_SYSCALL_BASE+376)
-#define __NR_process_vm_writev		(__NR_SYSCALL_BASE+377)
-#define __NR_kcmp			(__NR_SYSCALL_BASE+378)
-#define __NR_finit_module		(__NR_SYSCALL_BASE+379)
-#define __NR_sched_setattr		(__NR_SYSCALL_BASE+380)
-#define __NR_sched_getattr		(__NR_SYSCALL_BASE+381)
-#define __NR_renameat2			(__NR_SYSCALL_BASE+382)
-#define __NR_seccomp			(__NR_SYSCALL_BASE+383)
-#define __NR_getrandom			(__NR_SYSCALL_BASE+384)
-#define __NR_memfd_create		(__NR_SYSCALL_BASE+385)
-#define __NR_bpf			(__NR_SYSCALL_BASE+386)
-#define __NR_execveat			(__NR_SYSCALL_BASE+387)
-#define __NR_userfaultfd		(__NR_SYSCALL_BASE+388)
-#define __NR_membarrier			(__NR_SYSCALL_BASE+389)
-#define __NR_mlock2			(__NR_SYSCALL_BASE+390)
-
-/*
- * The following SWIs are ARM private.
- */
-#define __ARM_NR_BASE			(__NR_SYSCALL_BASE+0x0f0000)
-#define __ARM_NR_breakpoint		(__ARM_NR_BASE+1)
-#define __ARM_NR_cacheflush		(__ARM_NR_BASE+2)
-#define __ARM_NR_usr26			(__ARM_NR_BASE+3)
-#define __ARM_NR_usr32			(__ARM_NR_BASE+4)
-#define __ARM_NR_set_tls		(__ARM_NR_BASE+5)
-
-/*
- * The following syscalls are obsolete and no longer available for EABI.
- */
-#if defined(__ARM_EABI__)
-#undef __NR_time
-#undef __NR_umount
-#undef __NR_stime
-#undef __NR_alarm
-#undef __NR_utime
-#undef __NR_getrlimit
-#undef __NR_select
-#undef __NR_readdir
-#undef __NR_mmap
-#undef __NR_socketcall
-#undef __NR_syscall
-#undef __NR_ipc
-#endif
-
-#endif /* __ASM_ARM_UNISTD_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/a.out.h b/openflow/usr/include/arm-linux-gnueabihf/bits/a.out.h
deleted file mode 100644
index 0e7fb03..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/a.out.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __A_OUT_GNU_H__
-# error "Never use <bits/a.out.h> directly; include <a.out.h> instead."
-#endif
-
-/* Signal to users of this header that this architecture really doesn't
-   support a.out binary format.  */
-#define __NO_A_OUT_SUPPORT 1
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/auxv.h b/openflow/usr/include/arm-linux-gnueabihf/bits/auxv.h
deleted file mode 100644
index 76701c3..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/auxv.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (C) 1995-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Legal values for a_type (entry type).  */
-
-#define AT_NULL		0		/* End of vector */
-#define AT_IGNORE	1		/* Entry should be ignored */
-#define AT_EXECFD	2		/* File descriptor of program */
-#define AT_PHDR		3		/* Program headers for program */
-#define AT_PHENT	4		/* Size of program header entry */
-#define AT_PHNUM	5		/* Number of program headers */
-#define AT_PAGESZ	6		/* System page size */
-#define AT_BASE		7		/* Base address of interpreter */
-#define AT_FLAGS	8		/* Flags */
-#define AT_ENTRY	9		/* Entry point of program */
-#define AT_NOTELF	10		/* Program is not ELF */
-#define AT_UID		11		/* Real uid */
-#define AT_EUID		12		/* Effective uid */
-#define AT_GID		13		/* Real gid */
-#define AT_EGID		14		/* Effective gid */
-#define AT_CLKTCK	17		/* Frequency of times() */
-
-/* Some more special a_type values describing the hardware.  */
-#define AT_PLATFORM	15		/* String identifying platform.  */
-#define AT_HWCAP	16		/* Machine-dependent hints about
-					   processor capabilities.  */
-
-/* This entry gives some information about the FPU initialization
-   performed by the kernel.  */
-#define AT_FPUCW	18		/* Used FPU control word.  */
-
-/* Cache block sizes.  */
-#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
-#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
-#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
-
-/* A special ignored value for PPC, used by the kernel to control the
-   interpretation of the AUXV. Must be > 16.  */
-#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
-
-#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
-
-#define AT_BASE_PLATFORM 24		/* String identifying real platforms.*/
-
-#define AT_RANDOM	25		/* Address of 16 random bytes.  */
-
-#define AT_HWCAP2	26		/* More machine-dependent hints about
-					   processor capabilities.  */
-
-#define AT_EXECFN	31		/* Filename of executable.  */
-
-/* Pointer to the global system page used for system calls and other
-   nice things.  */
-#define AT_SYSINFO	32
-#define AT_SYSINFO_EHDR	33
-
-/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
-   log2 of line size; mask those to get cache size.  */
-#define AT_L1I_CACHESHAPE	34
-#define AT_L1D_CACHESHAPE	35
-#define AT_L2_CACHESHAPE	36
-#define AT_L3_CACHESHAPE	37
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/byteswap-16.h b/openflow/usr/include/arm-linux-gnueabihf/bits/byteswap-16.h
deleted file mode 100644
index 8063aa8..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/byteswap-16.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Macros to swap the order of bytes in 16-bit integer values.
-   Copyright (C) 2012-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _BITS_BYTESWAP_H
-# error "Never use <bits/byteswap-16.h> directly; include <byteswap.h> instead."
-#endif
-
-#ifdef __GNUC__
-# define __bswap_16(x) \
-    (__extension__							      \
-     ({ unsigned short int __bsx = (unsigned short int) (x);		      \
-       __bswap_constant_16 (__bsx); }))
-#else
-static __inline unsigned short int
-__bswap_16 (unsigned short int __bsx)
-{
-  return __bswap_constant_16 (__bsx);
-}
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/byteswap.h b/openflow/usr/include/arm-linux-gnueabihf/bits/byteswap.h
deleted file mode 100644
index 0effea6..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/byteswap.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Macros to swap the order of bytes in integer values.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _BYTESWAP_H && !defined _NETINET_IN_H && !defined _ENDIAN_H
-# error "Never use <bits/byteswap.h> directly; include <byteswap.h> instead."
-#endif
-
-#ifndef _BITS_BYTESWAP_H
-#define _BITS_BYTESWAP_H 1
-
-#include <features.h>
-#include <bits/types.h>
-
-/* Swap bytes in 16 bit value.  */
-#define __bswap_constant_16(x) \
-	((unsigned short int)((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)))
-
-/* Get __bswap_16.  */
-#include <bits/byteswap-16.h>
-
-/* Swap bytes in 32 bit value.  */
-#define __bswap_constant_32(x) \
-     ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >>  8) |	      \
-      (((x) & 0x0000ff00u) <<  8) | (((x) & 0x000000ffu) << 24))
-
-#ifdef __GNUC__
-# if __GNUC_PREREQ (4, 3)
-static __inline unsigned int
-__bswap_32 (unsigned int __bsx)
-{
-  return __builtin_bswap32 (__bsx);
-}
-# else
-#  define __bswap_32(x) \
-  (__extension__							      \
-   ({ unsigned int __bsx = (x); __bswap_constant_32 (__bsx); }))
-# endif
-#else
-static __inline unsigned int
-__bswap_32 (unsigned int __bsx)
-{
-  return __bswap_constant_32 (__bsx);
-}
-#endif
-
-/* Swap bytes in 64 bit value.  */
-#if __GNUC_PREREQ (2, 0)
-# define __bswap_constant_64(x) \
-     (__extension__ ((((x) & 0xff00000000000000ull) >> 56)		      \
-		     | (((x) & 0x00ff000000000000ull) >> 40)		      \
-		     | (((x) & 0x0000ff0000000000ull) >> 24)		      \
-		     | (((x) & 0x000000ff00000000ull) >> 8)		      \
-		     | (((x) & 0x00000000ff000000ull) << 8)		      \
-		     | (((x) & 0x0000000000ff0000ull) << 24)		      \
-		     | (((x) & 0x000000000000ff00ull) << 40)		      \
-		     | (((x) & 0x00000000000000ffull) << 56)))
-
-# if __GNUC_PREREQ (4, 3)
-static __inline __uint64_t
-__bswap_64 (__uint64_t __bsx)
-{
-  return __builtin_bswap64 (__bsx);
-}
-# else
-#  define __bswap_64(x) \
-     (__extension__							      \
-      ({ union { __extension__ __uint64_t __ll;				      \
-		 unsigned int __l[2]; } __w, __r;			      \
-	 if (__builtin_constant_p (x))					      \
-	   __r.__ll = __bswap_constant_64 (x);				      \
-	 else								      \
-	   {								      \
-	     __w.__ll = (x);						      \
-	     __r.__l[0] = __bswap_32 (__w.__l[1]);			      \
-	     __r.__l[1] = __bswap_32 (__w.__l[0]);			      \
-	   }								      \
-	 __r.__ll; }))
-# endif
-#else
-# define __bswap_constant_64(x) \
-     ((((x) & 0xff00000000000000ull) >> 56)				      \
-      | (((x) & 0x00ff000000000000ull) >> 40)				      \
-      | (((x) & 0x0000ff0000000000ull) >> 24)				      \
-      | (((x) & 0x000000ff00000000ull) >> 8)				      \
-      | (((x) & 0x00000000ff000000ull) << 8)				      \
-      | (((x) & 0x0000000000ff0000ull) << 24)				      \
-      | (((x) & 0x000000000000ff00ull) << 40)				      \
-      | (((x) & 0x00000000000000ffull) << 56))
-
-static __inline __uint64_t
-__bswap_64 (__uint64_t __bsx)
-{
-  return __bswap_constant_64 (__bsx);
-}
-#endif
-
-#endif /* _BITS_BYTESWAP_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/cmathcalls.h b/openflow/usr/include/arm-linux-gnueabihf/bits/cmathcalls.h
deleted file mode 100644
index e02707e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/cmathcalls.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Prototype declarations for complex math functions;
-   helper file for <complex.h>.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* NOTE: Because of the special way this file is used by <complex.h>, this
-   file must NOT be protected from multiple inclusion as header files
-   usually are.
-
-   This file provides prototype declarations for the math functions.
-   Most functions are declared using the macro:
-
-   __MATHCALL (NAME, (ARGS...));
-
-   This means there is a function `NAME' returning `double' and a function
-   `NAMEf' returning `float'.  Each place `_Mdouble_' appears in the
-   prototype, that is actually `double' in the prototype for `NAME' and
-   `float' in the prototype for `NAMEf'.  Reentrant variant functions are
-   called `NAME_r' and `NAMEf_r'.
-
-   Functions returning other types like `int' are declared using the macro:
-
-   __MATHDECL (TYPE, NAME, (ARGS...));
-
-   This is just like __MATHCALL but for a function returning `TYPE'
-   instead of `_Mdouble_'.  In all of these cases, there is still
-   both a `NAME' and a `NAMEf' that takes `float' arguments.  */
-
-#ifndef _COMPLEX_H
-#error "Never use <bits/cmathcalls.h> directly; include <complex.h> instead."
-#endif
-
-#define _Mdouble_complex_ _Mdouble_ _Complex
-
-
-/* Trigonometric functions.  */
-
-/* Arc cosine of Z.  */
-__MATHCALL (cacos, (_Mdouble_complex_ __z));
-/* Arc sine of Z.  */
-__MATHCALL (casin, (_Mdouble_complex_ __z));
-/* Arc tangent of Z.  */
-__MATHCALL (catan, (_Mdouble_complex_ __z));
-
-/* Cosine of Z.  */
-__MATHCALL (ccos, (_Mdouble_complex_ __z));
-/* Sine of Z.  */
-__MATHCALL (csin, (_Mdouble_complex_ __z));
-/* Tangent of Z.  */
-__MATHCALL (ctan, (_Mdouble_complex_ __z));
-
-
-/* Hyperbolic functions.  */
-
-/* Hyperbolic arc cosine of Z.  */
-__MATHCALL (cacosh, (_Mdouble_complex_ __z));
-/* Hyperbolic arc sine of Z.  */
-__MATHCALL (casinh, (_Mdouble_complex_ __z));
-/* Hyperbolic arc tangent of Z.  */
-__MATHCALL (catanh, (_Mdouble_complex_ __z));
-
-/* Hyperbolic cosine of Z.  */
-__MATHCALL (ccosh, (_Mdouble_complex_ __z));
-/* Hyperbolic sine of Z.  */
-__MATHCALL (csinh, (_Mdouble_complex_ __z));
-/* Hyperbolic tangent of Z.  */
-__MATHCALL (ctanh, (_Mdouble_complex_ __z));
-
-
-/* Exponential and logarithmic functions.  */
-
-/* Exponential function of Z.  */
-__MATHCALL (cexp, (_Mdouble_complex_ __z));
-
-/* Natural logarithm of Z.  */
-__MATHCALL (clog, (_Mdouble_complex_ __z));
-
-#ifdef __USE_GNU
-/* The base 10 logarithm is not defined by the standard but to implement
-   the standard C++ library it is handy.  */
-__MATHCALL (clog10, (_Mdouble_complex_ __z));
-#endif
-
-/* Power functions.  */
-
-/* Return X to the Y power.  */
-__MATHCALL (cpow, (_Mdouble_complex_ __x, _Mdouble_complex_ __y));
-
-/* Return the square root of Z.  */
-__MATHCALL (csqrt, (_Mdouble_complex_ __z));
-
-
-/* Absolute value, conjugates, and projection.  */
-
-/* Absolute value of Z.  */
-__MATHDECL (_Mdouble_,cabs, (_Mdouble_complex_ __z));
-
-/* Argument value of Z.  */
-__MATHDECL (_Mdouble_,carg, (_Mdouble_complex_ __z));
-
-/* Complex conjugate of Z.  */
-__MATHCALL (conj, (_Mdouble_complex_ __z));
-
-/* Projection of Z onto the Riemann sphere.  */
-__MATHCALL (cproj, (_Mdouble_complex_ __z));
-
-
-/* Decomposing complex values.  */
-
-/* Imaginary part of Z.  */
-__MATHDECL (_Mdouble_,cimag, (_Mdouble_complex_ __z));
-
-/* Real part of Z.  */
-__MATHDECL (_Mdouble_,creal, (_Mdouble_complex_ __z));
-
-
-/* Now some optimized versions.  GCC has handy notations for these
-   functions.  Recent GCC handles these as builtin functions so does
-   not need inlines.  */
-#if defined __GNUC__ && !__GNUC_PREREQ (2, 97) && defined __OPTIMIZE__ \
-    && defined __extern_inline
-
-/* Imaginary part of Z.  */
-__extern_inline _Mdouble_
-__MATH_PRECNAME(cimag) (_Mdouble_complex_ __z) __THROW
-{
-  return __imag__ __z;
-}
-
-/* Real part of Z.  */
-__extern_inline _Mdouble_
-__MATH_PRECNAME(creal) (_Mdouble_complex_ __z) __THROW
-{
-  return __real__ __z;
-}
-
-/* Complex conjugate of Z.  */
-__extern_inline _Mdouble_complex_
-__MATH_PRECNAME(conj) (_Mdouble_complex_ __z) __THROW
-{
-  return __extension__ ~__z;
-}
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/confname.h b/openflow/usr/include/arm-linux-gnueabihf/bits/confname.h
deleted file mode 100644
index b635933..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/confname.h
+++ /dev/null
@@ -1,675 +0,0 @@
-/* `sysconf', `pathconf', and `confstr' NAME values.  Generic version.
-   Copyright (C) 1993-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _UNISTD_H
-# error "Never use <bits/confname.h> directly; include <unistd.h> instead."
-#endif
-
-/* Values for the NAME argument to `pathconf' and `fpathconf'.  */
-enum
-  {
-    _PC_LINK_MAX,
-#define	_PC_LINK_MAX			_PC_LINK_MAX
-    _PC_MAX_CANON,
-#define	_PC_MAX_CANON			_PC_MAX_CANON
-    _PC_MAX_INPUT,
-#define	_PC_MAX_INPUT			_PC_MAX_INPUT
-    _PC_NAME_MAX,
-#define	_PC_NAME_MAX			_PC_NAME_MAX
-    _PC_PATH_MAX,
-#define	_PC_PATH_MAX			_PC_PATH_MAX
-    _PC_PIPE_BUF,
-#define	_PC_PIPE_BUF			_PC_PIPE_BUF
-    _PC_CHOWN_RESTRICTED,
-#define	_PC_CHOWN_RESTRICTED		_PC_CHOWN_RESTRICTED
-    _PC_NO_TRUNC,
-#define	_PC_NO_TRUNC			_PC_NO_TRUNC
-    _PC_VDISABLE,
-#define _PC_VDISABLE			_PC_VDISABLE
-    _PC_SYNC_IO,
-#define	_PC_SYNC_IO			_PC_SYNC_IO
-    _PC_ASYNC_IO,
-#define	_PC_ASYNC_IO			_PC_ASYNC_IO
-    _PC_PRIO_IO,
-#define	_PC_PRIO_IO			_PC_PRIO_IO
-    _PC_SOCK_MAXBUF,
-#define	_PC_SOCK_MAXBUF			_PC_SOCK_MAXBUF
-    _PC_FILESIZEBITS,
-#define _PC_FILESIZEBITS		_PC_FILESIZEBITS
-    _PC_REC_INCR_XFER_SIZE,
-#define _PC_REC_INCR_XFER_SIZE		_PC_REC_INCR_XFER_SIZE
-    _PC_REC_MAX_XFER_SIZE,
-#define _PC_REC_MAX_XFER_SIZE		_PC_REC_MAX_XFER_SIZE
-    _PC_REC_MIN_XFER_SIZE,
-#define _PC_REC_MIN_XFER_SIZE		_PC_REC_MIN_XFER_SIZE
-    _PC_REC_XFER_ALIGN,
-#define _PC_REC_XFER_ALIGN		_PC_REC_XFER_ALIGN
-    _PC_ALLOC_SIZE_MIN,
-#define _PC_ALLOC_SIZE_MIN		_PC_ALLOC_SIZE_MIN
-    _PC_SYMLINK_MAX,
-#define _PC_SYMLINK_MAX			_PC_SYMLINK_MAX
-    _PC_2_SYMLINKS
-#define _PC_2_SYMLINKS			_PC_2_SYMLINKS
-  };
-
-/* Values for the argument to `sysconf'.  */
-enum
-  {
-    _SC_ARG_MAX,
-#define	_SC_ARG_MAX			_SC_ARG_MAX
-    _SC_CHILD_MAX,
-#define	_SC_CHILD_MAX			_SC_CHILD_MAX
-    _SC_CLK_TCK,
-#define	_SC_CLK_TCK			_SC_CLK_TCK
-    _SC_NGROUPS_MAX,
-#define	_SC_NGROUPS_MAX			_SC_NGROUPS_MAX
-    _SC_OPEN_MAX,
-#define	_SC_OPEN_MAX			_SC_OPEN_MAX
-    _SC_STREAM_MAX,
-#define	_SC_STREAM_MAX			_SC_STREAM_MAX
-    _SC_TZNAME_MAX,
-#define	_SC_TZNAME_MAX			_SC_TZNAME_MAX
-    _SC_JOB_CONTROL,
-#define	_SC_JOB_CONTROL			_SC_JOB_CONTROL
-    _SC_SAVED_IDS,
-#define	_SC_SAVED_IDS			_SC_SAVED_IDS
-    _SC_REALTIME_SIGNALS,
-#define	_SC_REALTIME_SIGNALS		_SC_REALTIME_SIGNALS
-    _SC_PRIORITY_SCHEDULING,
-#define	_SC_PRIORITY_SCHEDULING		_SC_PRIORITY_SCHEDULING
-    _SC_TIMERS,
-#define	_SC_TIMERS			_SC_TIMERS
-    _SC_ASYNCHRONOUS_IO,
-#define	_SC_ASYNCHRONOUS_IO		_SC_ASYNCHRONOUS_IO
-    _SC_PRIORITIZED_IO,
-#define	_SC_PRIORITIZED_IO		_SC_PRIORITIZED_IO
-    _SC_SYNCHRONIZED_IO,
-#define	_SC_SYNCHRONIZED_IO		_SC_SYNCHRONIZED_IO
-    _SC_FSYNC,
-#define	_SC_FSYNC			_SC_FSYNC
-    _SC_MAPPED_FILES,
-#define	_SC_MAPPED_FILES		_SC_MAPPED_FILES
-    _SC_MEMLOCK,
-#define	_SC_MEMLOCK			_SC_MEMLOCK
-    _SC_MEMLOCK_RANGE,
-#define	_SC_MEMLOCK_RANGE		_SC_MEMLOCK_RANGE
-    _SC_MEMORY_PROTECTION,
-#define	_SC_MEMORY_PROTECTION		_SC_MEMORY_PROTECTION
-    _SC_MESSAGE_PASSING,
-#define	_SC_MESSAGE_PASSING		_SC_MESSAGE_PASSING
-    _SC_SEMAPHORES,
-#define	_SC_SEMAPHORES			_SC_SEMAPHORES
-    _SC_SHARED_MEMORY_OBJECTS,
-#define	_SC_SHARED_MEMORY_OBJECTS	_SC_SHARED_MEMORY_OBJECTS
-    _SC_AIO_LISTIO_MAX,
-#define	_SC_AIO_LISTIO_MAX		_SC_AIO_LISTIO_MAX
-    _SC_AIO_MAX,
-#define	_SC_AIO_MAX			_SC_AIO_MAX
-    _SC_AIO_PRIO_DELTA_MAX,
-#define	_SC_AIO_PRIO_DELTA_MAX		_SC_AIO_PRIO_DELTA_MAX
-    _SC_DELAYTIMER_MAX,
-#define	_SC_DELAYTIMER_MAX		_SC_DELAYTIMER_MAX
-    _SC_MQ_OPEN_MAX,
-#define	_SC_MQ_OPEN_MAX			_SC_MQ_OPEN_MAX
-    _SC_MQ_PRIO_MAX,
-#define	_SC_MQ_PRIO_MAX			_SC_MQ_PRIO_MAX
-    _SC_VERSION,
-#define	_SC_VERSION			_SC_VERSION
-    _SC_PAGESIZE,
-#define	_SC_PAGESIZE			_SC_PAGESIZE
-#define	_SC_PAGE_SIZE			_SC_PAGESIZE
-    _SC_RTSIG_MAX,
-#define	_SC_RTSIG_MAX			_SC_RTSIG_MAX
-    _SC_SEM_NSEMS_MAX,
-#define	_SC_SEM_NSEMS_MAX		_SC_SEM_NSEMS_MAX
-    _SC_SEM_VALUE_MAX,
-#define	_SC_SEM_VALUE_MAX		_SC_SEM_VALUE_MAX
-    _SC_SIGQUEUE_MAX,
-#define	_SC_SIGQUEUE_MAX		_SC_SIGQUEUE_MAX
-    _SC_TIMER_MAX,
-#define	_SC_TIMER_MAX			_SC_TIMER_MAX
-
-    /* Values for the argument to `sysconf'
-       corresponding to _POSIX2_* symbols.  */
-    _SC_BC_BASE_MAX,
-#define	_SC_BC_BASE_MAX			_SC_BC_BASE_MAX
-    _SC_BC_DIM_MAX,
-#define	_SC_BC_DIM_MAX			_SC_BC_DIM_MAX
-    _SC_BC_SCALE_MAX,
-#define	_SC_BC_SCALE_MAX		_SC_BC_SCALE_MAX
-    _SC_BC_STRING_MAX,
-#define	_SC_BC_STRING_MAX		_SC_BC_STRING_MAX
-    _SC_COLL_WEIGHTS_MAX,
-#define	_SC_COLL_WEIGHTS_MAX		_SC_COLL_WEIGHTS_MAX
-    _SC_EQUIV_CLASS_MAX,
-#define	_SC_EQUIV_CLASS_MAX		_SC_EQUIV_CLASS_MAX
-    _SC_EXPR_NEST_MAX,
-#define	_SC_EXPR_NEST_MAX		_SC_EXPR_NEST_MAX
-    _SC_LINE_MAX,
-#define	_SC_LINE_MAX			_SC_LINE_MAX
-    _SC_RE_DUP_MAX,
-#define	_SC_RE_DUP_MAX			_SC_RE_DUP_MAX
-    _SC_CHARCLASS_NAME_MAX,
-#define	_SC_CHARCLASS_NAME_MAX		_SC_CHARCLASS_NAME_MAX
-
-    _SC_2_VERSION,
-#define	_SC_2_VERSION			_SC_2_VERSION
-    _SC_2_C_BIND,
-#define	_SC_2_C_BIND			_SC_2_C_BIND
-    _SC_2_C_DEV,
-#define	_SC_2_C_DEV			_SC_2_C_DEV
-    _SC_2_FORT_DEV,
-#define	_SC_2_FORT_DEV			_SC_2_FORT_DEV
-    _SC_2_FORT_RUN,
-#define	_SC_2_FORT_RUN			_SC_2_FORT_RUN
-    _SC_2_SW_DEV,
-#define	_SC_2_SW_DEV			_SC_2_SW_DEV
-    _SC_2_LOCALEDEF,
-#define	_SC_2_LOCALEDEF			_SC_2_LOCALEDEF
-
-    _SC_PII,
-#define	_SC_PII				_SC_PII
-    _SC_PII_XTI,
-#define	_SC_PII_XTI			_SC_PII_XTI
-    _SC_PII_SOCKET,
-#define	_SC_PII_SOCKET			_SC_PII_SOCKET
-    _SC_PII_INTERNET,
-#define	_SC_PII_INTERNET		_SC_PII_INTERNET
-    _SC_PII_OSI,
-#define	_SC_PII_OSI			_SC_PII_OSI
-    _SC_POLL,
-#define	_SC_POLL			_SC_POLL
-    _SC_SELECT,
-#define	_SC_SELECT			_SC_SELECT
-    _SC_UIO_MAXIOV,
-#define	_SC_UIO_MAXIOV			_SC_UIO_MAXIOV
-    _SC_IOV_MAX = _SC_UIO_MAXIOV,
-#define _SC_IOV_MAX			_SC_IOV_MAX
-    _SC_PII_INTERNET_STREAM,
-#define	_SC_PII_INTERNET_STREAM		_SC_PII_INTERNET_STREAM
-    _SC_PII_INTERNET_DGRAM,
-#define	_SC_PII_INTERNET_DGRAM		_SC_PII_INTERNET_DGRAM
-    _SC_PII_OSI_COTS,
-#define	_SC_PII_OSI_COTS		_SC_PII_OSI_COTS
-    _SC_PII_OSI_CLTS,
-#define	_SC_PII_OSI_CLTS		_SC_PII_OSI_CLTS
-    _SC_PII_OSI_M,
-#define	_SC_PII_OSI_M			_SC_PII_OSI_M
-    _SC_T_IOV_MAX,
-#define	_SC_T_IOV_MAX			_SC_T_IOV_MAX
-
-    /* Values according to POSIX 1003.1c (POSIX threads).  */
-    _SC_THREADS,
-#define	_SC_THREADS			_SC_THREADS
-    _SC_THREAD_SAFE_FUNCTIONS,
-#define _SC_THREAD_SAFE_FUNCTIONS	_SC_THREAD_SAFE_FUNCTIONS
-    _SC_GETGR_R_SIZE_MAX,
-#define	_SC_GETGR_R_SIZE_MAX		_SC_GETGR_R_SIZE_MAX
-    _SC_GETPW_R_SIZE_MAX,
-#define	_SC_GETPW_R_SIZE_MAX		_SC_GETPW_R_SIZE_MAX
-    _SC_LOGIN_NAME_MAX,
-#define	_SC_LOGIN_NAME_MAX		_SC_LOGIN_NAME_MAX
-    _SC_TTY_NAME_MAX,
-#define	_SC_TTY_NAME_MAX		_SC_TTY_NAME_MAX
-    _SC_THREAD_DESTRUCTOR_ITERATIONS,
-#define	_SC_THREAD_DESTRUCTOR_ITERATIONS _SC_THREAD_DESTRUCTOR_ITERATIONS
-    _SC_THREAD_KEYS_MAX,
-#define	_SC_THREAD_KEYS_MAX		_SC_THREAD_KEYS_MAX
-    _SC_THREAD_STACK_MIN,
-#define	_SC_THREAD_STACK_MIN		_SC_THREAD_STACK_MIN
-    _SC_THREAD_THREADS_MAX,
-#define	_SC_THREAD_THREADS_MAX		_SC_THREAD_THREADS_MAX
-    _SC_THREAD_ATTR_STACKADDR,
-#define	_SC_THREAD_ATTR_STACKADDR	_SC_THREAD_ATTR_STACKADDR
-    _SC_THREAD_ATTR_STACKSIZE,
-#define	_SC_THREAD_ATTR_STACKSIZE	_SC_THREAD_ATTR_STACKSIZE
-    _SC_THREAD_PRIORITY_SCHEDULING,
-#define	_SC_THREAD_PRIORITY_SCHEDULING	_SC_THREAD_PRIORITY_SCHEDULING
-    _SC_THREAD_PRIO_INHERIT,
-#define	_SC_THREAD_PRIO_INHERIT		_SC_THREAD_PRIO_INHERIT
-    _SC_THREAD_PRIO_PROTECT,
-#define	_SC_THREAD_PRIO_PROTECT		_SC_THREAD_PRIO_PROTECT
-    _SC_THREAD_PROCESS_SHARED,
-#define	_SC_THREAD_PROCESS_SHARED	_SC_THREAD_PROCESS_SHARED
-
-    _SC_NPROCESSORS_CONF,
-#define _SC_NPROCESSORS_CONF		_SC_NPROCESSORS_CONF
-    _SC_NPROCESSORS_ONLN,
-#define _SC_NPROCESSORS_ONLN		_SC_NPROCESSORS_ONLN
-    _SC_PHYS_PAGES,
-#define _SC_PHYS_PAGES			_SC_PHYS_PAGES
-    _SC_AVPHYS_PAGES,
-#define _SC_AVPHYS_PAGES		_SC_AVPHYS_PAGES
-    _SC_ATEXIT_MAX,
-#define _SC_ATEXIT_MAX			_SC_ATEXIT_MAX
-    _SC_PASS_MAX,
-#define _SC_PASS_MAX			_SC_PASS_MAX
-
-    _SC_XOPEN_VERSION,
-#define _SC_XOPEN_VERSION		_SC_XOPEN_VERSION
-    _SC_XOPEN_XCU_VERSION,
-#define _SC_XOPEN_XCU_VERSION		_SC_XOPEN_XCU_VERSION
-    _SC_XOPEN_UNIX,
-#define _SC_XOPEN_UNIX			_SC_XOPEN_UNIX
-    _SC_XOPEN_CRYPT,
-#define _SC_XOPEN_CRYPT			_SC_XOPEN_CRYPT
-    _SC_XOPEN_ENH_I18N,
-#define _SC_XOPEN_ENH_I18N		_SC_XOPEN_ENH_I18N
-    _SC_XOPEN_SHM,
-#define _SC_XOPEN_SHM			_SC_XOPEN_SHM
-
-    _SC_2_CHAR_TERM,
-#define _SC_2_CHAR_TERM			_SC_2_CHAR_TERM
-    _SC_2_C_VERSION,
-#define _SC_2_C_VERSION			_SC_2_C_VERSION
-    _SC_2_UPE,
-#define _SC_2_UPE			_SC_2_UPE
-
-    _SC_XOPEN_XPG2,
-#define _SC_XOPEN_XPG2			_SC_XOPEN_XPG2
-    _SC_XOPEN_XPG3,
-#define _SC_XOPEN_XPG3			_SC_XOPEN_XPG3
-    _SC_XOPEN_XPG4,
-#define _SC_XOPEN_XPG4			_SC_XOPEN_XPG4
-
-    _SC_CHAR_BIT,
-#define	_SC_CHAR_BIT			_SC_CHAR_BIT
-    _SC_CHAR_MAX,
-#define	_SC_CHAR_MAX			_SC_CHAR_MAX
-    _SC_CHAR_MIN,
-#define	_SC_CHAR_MIN			_SC_CHAR_MIN
-    _SC_INT_MAX,
-#define	_SC_INT_MAX			_SC_INT_MAX
-    _SC_INT_MIN,
-#define	_SC_INT_MIN			_SC_INT_MIN
-    _SC_LONG_BIT,
-#define	_SC_LONG_BIT			_SC_LONG_BIT
-    _SC_WORD_BIT,
-#define	_SC_WORD_BIT			_SC_WORD_BIT
-    _SC_MB_LEN_MAX,
-#define	_SC_MB_LEN_MAX			_SC_MB_LEN_MAX
-    _SC_NZERO,
-#define	_SC_NZERO			_SC_NZERO
-    _SC_SSIZE_MAX,
-#define	_SC_SSIZE_MAX			_SC_SSIZE_MAX
-    _SC_SCHAR_MAX,
-#define	_SC_SCHAR_MAX			_SC_SCHAR_MAX
-    _SC_SCHAR_MIN,
-#define	_SC_SCHAR_MIN			_SC_SCHAR_MIN
-    _SC_SHRT_MAX,
-#define	_SC_SHRT_MAX			_SC_SHRT_MAX
-    _SC_SHRT_MIN,
-#define	_SC_SHRT_MIN			_SC_SHRT_MIN
-    _SC_UCHAR_MAX,
-#define	_SC_UCHAR_MAX			_SC_UCHAR_MAX
-    _SC_UINT_MAX,
-#define	_SC_UINT_MAX			_SC_UINT_MAX
-    _SC_ULONG_MAX,
-#define	_SC_ULONG_MAX			_SC_ULONG_MAX
-    _SC_USHRT_MAX,
-#define	_SC_USHRT_MAX			_SC_USHRT_MAX
-
-    _SC_NL_ARGMAX,
-#define	_SC_NL_ARGMAX			_SC_NL_ARGMAX
-    _SC_NL_LANGMAX,
-#define	_SC_NL_LANGMAX			_SC_NL_LANGMAX
-    _SC_NL_MSGMAX,
-#define	_SC_NL_MSGMAX			_SC_NL_MSGMAX
-    _SC_NL_NMAX,
-#define	_SC_NL_NMAX			_SC_NL_NMAX
-    _SC_NL_SETMAX,
-#define	_SC_NL_SETMAX			_SC_NL_SETMAX
-    _SC_NL_TEXTMAX,
-#define	_SC_NL_TEXTMAX			_SC_NL_TEXTMAX
-
-    _SC_XBS5_ILP32_OFF32,
-#define _SC_XBS5_ILP32_OFF32		_SC_XBS5_ILP32_OFF32
-    _SC_XBS5_ILP32_OFFBIG,
-#define _SC_XBS5_ILP32_OFFBIG		_SC_XBS5_ILP32_OFFBIG
-    _SC_XBS5_LP64_OFF64,
-#define _SC_XBS5_LP64_OFF64		_SC_XBS5_LP64_OFF64
-    _SC_XBS5_LPBIG_OFFBIG,
-#define _SC_XBS5_LPBIG_OFFBIG		_SC_XBS5_LPBIG_OFFBIG
-
-    _SC_XOPEN_LEGACY,
-#define _SC_XOPEN_LEGACY		_SC_XOPEN_LEGACY
-    _SC_XOPEN_REALTIME,
-#define _SC_XOPEN_REALTIME		_SC_XOPEN_REALTIME
-    _SC_XOPEN_REALTIME_THREADS,
-#define _SC_XOPEN_REALTIME_THREADS	_SC_XOPEN_REALTIME_THREADS
-
-    _SC_ADVISORY_INFO,
-#define _SC_ADVISORY_INFO		_SC_ADVISORY_INFO
-    _SC_BARRIERS,
-#define _SC_BARRIERS			_SC_BARRIERS
-    _SC_BASE,
-#define _SC_BASE			_SC_BASE
-    _SC_C_LANG_SUPPORT,
-#define _SC_C_LANG_SUPPORT		_SC_C_LANG_SUPPORT
-    _SC_C_LANG_SUPPORT_R,
-#define _SC_C_LANG_SUPPORT_R		_SC_C_LANG_SUPPORT_R
-    _SC_CLOCK_SELECTION,
-#define _SC_CLOCK_SELECTION		_SC_CLOCK_SELECTION
-    _SC_CPUTIME,
-#define _SC_CPUTIME			_SC_CPUTIME
-    _SC_THREAD_CPUTIME,
-#define _SC_THREAD_CPUTIME		_SC_THREAD_CPUTIME
-    _SC_DEVICE_IO,
-#define _SC_DEVICE_IO			_SC_DEVICE_IO
-    _SC_DEVICE_SPECIFIC,
-#define _SC_DEVICE_SPECIFIC		_SC_DEVICE_SPECIFIC
-    _SC_DEVICE_SPECIFIC_R,
-#define _SC_DEVICE_SPECIFIC_R		_SC_DEVICE_SPECIFIC_R
-    _SC_FD_MGMT,
-#define _SC_FD_MGMT			_SC_FD_MGMT
-    _SC_FIFO,
-#define _SC_FIFO			_SC_FIFO
-    _SC_PIPE,
-#define _SC_PIPE			_SC_PIPE
-    _SC_FILE_ATTRIBUTES,
-#define _SC_FILE_ATTRIBUTES		_SC_FILE_ATTRIBUTES
-    _SC_FILE_LOCKING,
-#define _SC_FILE_LOCKING		_SC_FILE_LOCKING
-    _SC_FILE_SYSTEM,
-#define _SC_FILE_SYSTEM			_SC_FILE_SYSTEM
-    _SC_MONOTONIC_CLOCK,
-#define _SC_MONOTONIC_CLOCK		_SC_MONOTONIC_CLOCK
-    _SC_MULTI_PROCESS,
-#define _SC_MULTI_PROCESS		_SC_MULTI_PROCESS
-    _SC_SINGLE_PROCESS,
-#define _SC_SINGLE_PROCESS		_SC_SINGLE_PROCESS
-    _SC_NETWORKING,
-#define _SC_NETWORKING			_SC_NETWORKING
-    _SC_READER_WRITER_LOCKS,
-#define _SC_READER_WRITER_LOCKS		_SC_READER_WRITER_LOCKS
-    _SC_SPIN_LOCKS,
-#define _SC_SPIN_LOCKS			_SC_SPIN_LOCKS
-    _SC_REGEXP,
-#define _SC_REGEXP			_SC_REGEXP
-    _SC_REGEX_VERSION,
-#define _SC_REGEX_VERSION		_SC_REGEX_VERSION
-    _SC_SHELL,
-#define _SC_SHELL			_SC_SHELL
-    _SC_SIGNALS,
-#define _SC_SIGNALS			_SC_SIGNALS
-    _SC_SPAWN,
-#define _SC_SPAWN			_SC_SPAWN
-    _SC_SPORADIC_SERVER,
-#define _SC_SPORADIC_SERVER		_SC_SPORADIC_SERVER
-    _SC_THREAD_SPORADIC_SERVER,
-#define _SC_THREAD_SPORADIC_SERVER	_SC_THREAD_SPORADIC_SERVER
-    _SC_SYSTEM_DATABASE,
-#define _SC_SYSTEM_DATABASE		_SC_SYSTEM_DATABASE
-    _SC_SYSTEM_DATABASE_R,
-#define _SC_SYSTEM_DATABASE_R		_SC_SYSTEM_DATABASE_R
-    _SC_TIMEOUTS,
-#define _SC_TIMEOUTS			_SC_TIMEOUTS
-    _SC_TYPED_MEMORY_OBJECTS,
-#define _SC_TYPED_MEMORY_OBJECTS	_SC_TYPED_MEMORY_OBJECTS
-    _SC_USER_GROUPS,
-#define _SC_USER_GROUPS			_SC_USER_GROUPS
-    _SC_USER_GROUPS_R,
-#define _SC_USER_GROUPS_R		_SC_USER_GROUPS_R
-    _SC_2_PBS,
-#define _SC_2_PBS			_SC_2_PBS
-    _SC_2_PBS_ACCOUNTING,
-#define _SC_2_PBS_ACCOUNTING		_SC_2_PBS_ACCOUNTING
-    _SC_2_PBS_LOCATE,
-#define _SC_2_PBS_LOCATE		_SC_2_PBS_LOCATE
-    _SC_2_PBS_MESSAGE,
-#define _SC_2_PBS_MESSAGE		_SC_2_PBS_MESSAGE
-    _SC_2_PBS_TRACK,
-#define _SC_2_PBS_TRACK			_SC_2_PBS_TRACK
-    _SC_SYMLOOP_MAX,
-#define _SC_SYMLOOP_MAX			_SC_SYMLOOP_MAX
-    _SC_STREAMS,
-#define _SC_STREAMS			_SC_STREAMS
-    _SC_2_PBS_CHECKPOINT,
-#define _SC_2_PBS_CHECKPOINT		_SC_2_PBS_CHECKPOINT
-
-    _SC_V6_ILP32_OFF32,
-#define _SC_V6_ILP32_OFF32		_SC_V6_ILP32_OFF32
-    _SC_V6_ILP32_OFFBIG,
-#define _SC_V6_ILP32_OFFBIG		_SC_V6_ILP32_OFFBIG
-    _SC_V6_LP64_OFF64,
-#define _SC_V6_LP64_OFF64		_SC_V6_LP64_OFF64
-    _SC_V6_LPBIG_OFFBIG,
-#define _SC_V6_LPBIG_OFFBIG		_SC_V6_LPBIG_OFFBIG
-
-    _SC_HOST_NAME_MAX,
-#define _SC_HOST_NAME_MAX		_SC_HOST_NAME_MAX
-    _SC_TRACE,
-#define _SC_TRACE			_SC_TRACE
-    _SC_TRACE_EVENT_FILTER,
-#define _SC_TRACE_EVENT_FILTER		_SC_TRACE_EVENT_FILTER
-    _SC_TRACE_INHERIT,
-#define _SC_TRACE_INHERIT		_SC_TRACE_INHERIT
-    _SC_TRACE_LOG,
-#define _SC_TRACE_LOG			_SC_TRACE_LOG
-
-    _SC_LEVEL1_ICACHE_SIZE,
-#define _SC_LEVEL1_ICACHE_SIZE		_SC_LEVEL1_ICACHE_SIZE
-    _SC_LEVEL1_ICACHE_ASSOC,
-#define _SC_LEVEL1_ICACHE_ASSOC		_SC_LEVEL1_ICACHE_ASSOC
-    _SC_LEVEL1_ICACHE_LINESIZE,
-#define _SC_LEVEL1_ICACHE_LINESIZE	_SC_LEVEL1_ICACHE_LINESIZE
-    _SC_LEVEL1_DCACHE_SIZE,
-#define _SC_LEVEL1_DCACHE_SIZE		_SC_LEVEL1_DCACHE_SIZE
-    _SC_LEVEL1_DCACHE_ASSOC,
-#define _SC_LEVEL1_DCACHE_ASSOC		_SC_LEVEL1_DCACHE_ASSOC
-    _SC_LEVEL1_DCACHE_LINESIZE,
-#define _SC_LEVEL1_DCACHE_LINESIZE	_SC_LEVEL1_DCACHE_LINESIZE
-    _SC_LEVEL2_CACHE_SIZE,
-#define _SC_LEVEL2_CACHE_SIZE		_SC_LEVEL2_CACHE_SIZE
-    _SC_LEVEL2_CACHE_ASSOC,
-#define _SC_LEVEL2_CACHE_ASSOC		_SC_LEVEL2_CACHE_ASSOC
-    _SC_LEVEL2_CACHE_LINESIZE,
-#define _SC_LEVEL2_CACHE_LINESIZE	_SC_LEVEL2_CACHE_LINESIZE
-    _SC_LEVEL3_CACHE_SIZE,
-#define _SC_LEVEL3_CACHE_SIZE		_SC_LEVEL3_CACHE_SIZE
-    _SC_LEVEL3_CACHE_ASSOC,
-#define _SC_LEVEL3_CACHE_ASSOC		_SC_LEVEL3_CACHE_ASSOC
-    _SC_LEVEL3_CACHE_LINESIZE,
-#define _SC_LEVEL3_CACHE_LINESIZE	_SC_LEVEL3_CACHE_LINESIZE
-    _SC_LEVEL4_CACHE_SIZE,
-#define _SC_LEVEL4_CACHE_SIZE		_SC_LEVEL4_CACHE_SIZE
-    _SC_LEVEL4_CACHE_ASSOC,
-#define _SC_LEVEL4_CACHE_ASSOC		_SC_LEVEL4_CACHE_ASSOC
-    _SC_LEVEL4_CACHE_LINESIZE,
-#define _SC_LEVEL4_CACHE_LINESIZE	_SC_LEVEL4_CACHE_LINESIZE
-    /* Leave room here, maybe we need a few more cache levels some day.  */
-
-    _SC_IPV6 = _SC_LEVEL1_ICACHE_SIZE + 50,
-#define _SC_IPV6			_SC_IPV6
-    _SC_RAW_SOCKETS,
-#define _SC_RAW_SOCKETS			_SC_RAW_SOCKETS
-
-    _SC_V7_ILP32_OFF32,
-#define _SC_V7_ILP32_OFF32		_SC_V7_ILP32_OFF32
-    _SC_V7_ILP32_OFFBIG,
-#define _SC_V7_ILP32_OFFBIG		_SC_V7_ILP32_OFFBIG
-    _SC_V7_LP64_OFF64,
-#define _SC_V7_LP64_OFF64		_SC_V7_LP64_OFF64
-    _SC_V7_LPBIG_OFFBIG,
-#define _SC_V7_LPBIG_OFFBIG		_SC_V7_LPBIG_OFFBIG
-
-    _SC_SS_REPL_MAX,
-#define _SC_SS_REPL_MAX			_SC_SS_REPL_MAX
-
-    _SC_TRACE_EVENT_NAME_MAX,
-#define _SC_TRACE_EVENT_NAME_MAX	_SC_TRACE_EVENT_NAME_MAX
-    _SC_TRACE_NAME_MAX,
-#define _SC_TRACE_NAME_MAX		_SC_TRACE_NAME_MAX
-    _SC_TRACE_SYS_MAX,
-#define _SC_TRACE_SYS_MAX		_SC_TRACE_SYS_MAX
-    _SC_TRACE_USER_EVENT_MAX,
-#define _SC_TRACE_USER_EVENT_MAX	_SC_TRACE_USER_EVENT_MAX
-
-    _SC_XOPEN_STREAMS,
-#define _SC_XOPEN_STREAMS		_SC_XOPEN_STREAMS
-
-    _SC_THREAD_ROBUST_PRIO_INHERIT,
-#define _SC_THREAD_ROBUST_PRIO_INHERIT	_SC_THREAD_ROBUST_PRIO_INHERIT
-    _SC_THREAD_ROBUST_PRIO_PROTECT
-#define _SC_THREAD_ROBUST_PRIO_PROTECT	_SC_THREAD_ROBUST_PRIO_PROTECT
-  };
-
-/* Values for the NAME argument to `confstr'.  */
-enum
-  {
-    _CS_PATH,			/* The default search path.  */
-#define _CS_PATH		_CS_PATH
-
-    _CS_V6_WIDTH_RESTRICTED_ENVS,
-#define _CS_V6_WIDTH_RESTRICTED_ENVS	_CS_V6_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS	_CS_V6_WIDTH_RESTRICTED_ENVS
-
-    _CS_GNU_LIBC_VERSION,
-#define _CS_GNU_LIBC_VERSION	_CS_GNU_LIBC_VERSION
-    _CS_GNU_LIBPTHREAD_VERSION,
-#define _CS_GNU_LIBPTHREAD_VERSION	_CS_GNU_LIBPTHREAD_VERSION
-
-    _CS_V5_WIDTH_RESTRICTED_ENVS,
-#define _CS_V5_WIDTH_RESTRICTED_ENVS	_CS_V5_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V5_WIDTH_RESTRICTED_ENVS	_CS_V5_WIDTH_RESTRICTED_ENVS
-
-    _CS_V7_WIDTH_RESTRICTED_ENVS,
-#define _CS_V7_WIDTH_RESTRICTED_ENVS	_CS_V7_WIDTH_RESTRICTED_ENVS
-#define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS	_CS_V7_WIDTH_RESTRICTED_ENVS
-
-    _CS_LFS_CFLAGS = 1000,
-#define _CS_LFS_CFLAGS	_CS_LFS_CFLAGS
-    _CS_LFS_LDFLAGS,
-#define _CS_LFS_LDFLAGS	_CS_LFS_LDFLAGS
-    _CS_LFS_LIBS,
-#define _CS_LFS_LIBS		_CS_LFS_LIBS
-    _CS_LFS_LINTFLAGS,
-#define _CS_LFS_LINTFLAGS	_CS_LFS_LINTFLAGS
-    _CS_LFS64_CFLAGS,
-#define _CS_LFS64_CFLAGS	_CS_LFS64_CFLAGS
-    _CS_LFS64_LDFLAGS,
-#define _CS_LFS64_LDFLAGS	_CS_LFS64_LDFLAGS
-    _CS_LFS64_LIBS,
-#define _CS_LFS64_LIBS	_CS_LFS64_LIBS
-    _CS_LFS64_LINTFLAGS,
-#define _CS_LFS64_LINTFLAGS	_CS_LFS64_LINTFLAGS
-
-    _CS_XBS5_ILP32_OFF32_CFLAGS = 1100,
-#define _CS_XBS5_ILP32_OFF32_CFLAGS _CS_XBS5_ILP32_OFF32_CFLAGS
-    _CS_XBS5_ILP32_OFF32_LDFLAGS,
-#define _CS_XBS5_ILP32_OFF32_LDFLAGS _CS_XBS5_ILP32_OFF32_LDFLAGS
-    _CS_XBS5_ILP32_OFF32_LIBS,
-#define _CS_XBS5_ILP32_OFF32_LIBS _CS_XBS5_ILP32_OFF32_LIBS
-    _CS_XBS5_ILP32_OFF32_LINTFLAGS,
-#define _CS_XBS5_ILP32_OFF32_LINTFLAGS _CS_XBS5_ILP32_OFF32_LINTFLAGS
-    _CS_XBS5_ILP32_OFFBIG_CFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_CFLAGS _CS_XBS5_ILP32_OFFBIG_CFLAGS
-    _CS_XBS5_ILP32_OFFBIG_LDFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_LDFLAGS _CS_XBS5_ILP32_OFFBIG_LDFLAGS
-    _CS_XBS5_ILP32_OFFBIG_LIBS,
-#define _CS_XBS5_ILP32_OFFBIG_LIBS _CS_XBS5_ILP32_OFFBIG_LIBS
-    _CS_XBS5_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_XBS5_ILP32_OFFBIG_LINTFLAGS _CS_XBS5_ILP32_OFFBIG_LINTFLAGS
-    _CS_XBS5_LP64_OFF64_CFLAGS,
-#define _CS_XBS5_LP64_OFF64_CFLAGS _CS_XBS5_LP64_OFF64_CFLAGS
-    _CS_XBS5_LP64_OFF64_LDFLAGS,
-#define _CS_XBS5_LP64_OFF64_LDFLAGS _CS_XBS5_LP64_OFF64_LDFLAGS
-    _CS_XBS5_LP64_OFF64_LIBS,
-#define _CS_XBS5_LP64_OFF64_LIBS _CS_XBS5_LP64_OFF64_LIBS
-    _CS_XBS5_LP64_OFF64_LINTFLAGS,
-#define _CS_XBS5_LP64_OFF64_LINTFLAGS _CS_XBS5_LP64_OFF64_LINTFLAGS
-    _CS_XBS5_LPBIG_OFFBIG_CFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_CFLAGS _CS_XBS5_LPBIG_OFFBIG_CFLAGS
-    _CS_XBS5_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_LDFLAGS _CS_XBS5_LPBIG_OFFBIG_LDFLAGS
-    _CS_XBS5_LPBIG_OFFBIG_LIBS,
-#define _CS_XBS5_LPBIG_OFFBIG_LIBS _CS_XBS5_LPBIG_OFFBIG_LIBS
-    _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS
-
-    _CS_POSIX_V6_ILP32_OFF32_CFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS _CS_POSIX_V6_ILP32_OFF32_CFLAGS
-    _CS_POSIX_V6_ILP32_OFF32_LDFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS _CS_POSIX_V6_ILP32_OFF32_LDFLAGS
-    _CS_POSIX_V6_ILP32_OFF32_LIBS,
-#define _CS_POSIX_V6_ILP32_OFF32_LIBS _CS_POSIX_V6_ILP32_OFF32_LIBS
-    _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS,
-#define _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS
-    _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS
-    _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS
-    _CS_POSIX_V6_ILP32_OFFBIG_LIBS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS _CS_POSIX_V6_ILP32_OFFBIG_LIBS
-    _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS
-    _CS_POSIX_V6_LP64_OFF64_CFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_CFLAGS _CS_POSIX_V6_LP64_OFF64_CFLAGS
-    _CS_POSIX_V6_LP64_OFF64_LDFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS _CS_POSIX_V6_LP64_OFF64_LDFLAGS
-    _CS_POSIX_V6_LP64_OFF64_LIBS,
-#define _CS_POSIX_V6_LP64_OFF64_LIBS _CS_POSIX_V6_LP64_OFF64_LIBS
-    _CS_POSIX_V6_LP64_OFF64_LINTFLAGS,
-#define _CS_POSIX_V6_LP64_OFF64_LINTFLAGS _CS_POSIX_V6_LP64_OFF64_LINTFLAGS
-    _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS
-    _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS
-    _CS_POSIX_V6_LPBIG_OFFBIG_LIBS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS _CS_POSIX_V6_LPBIG_OFFBIG_LIBS
-    _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
-
-    _CS_POSIX_V7_ILP32_OFF32_CFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_CFLAGS _CS_POSIX_V7_ILP32_OFF32_CFLAGS
-    _CS_POSIX_V7_ILP32_OFF32_LDFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_LDFLAGS _CS_POSIX_V7_ILP32_OFF32_LDFLAGS
-    _CS_POSIX_V7_ILP32_OFF32_LIBS,
-#define _CS_POSIX_V7_ILP32_OFF32_LIBS _CS_POSIX_V7_ILP32_OFF32_LIBS
-    _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS,
-#define _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS
-    _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS
-    _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS
-    _CS_POSIX_V7_ILP32_OFFBIG_LIBS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LIBS _CS_POSIX_V7_ILP32_OFFBIG_LIBS
-    _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS
-    _CS_POSIX_V7_LP64_OFF64_CFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_CFLAGS _CS_POSIX_V7_LP64_OFF64_CFLAGS
-    _CS_POSIX_V7_LP64_OFF64_LDFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_LDFLAGS _CS_POSIX_V7_LP64_OFF64_LDFLAGS
-    _CS_POSIX_V7_LP64_OFF64_LIBS,
-#define _CS_POSIX_V7_LP64_OFF64_LIBS _CS_POSIX_V7_LP64_OFF64_LIBS
-    _CS_POSIX_V7_LP64_OFF64_LINTFLAGS,
-#define _CS_POSIX_V7_LP64_OFF64_LINTFLAGS _CS_POSIX_V7_LP64_OFF64_LINTFLAGS
-    _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS
-    _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS
-    _CS_POSIX_V7_LPBIG_OFFBIG_LIBS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS _CS_POSIX_V7_LPBIG_OFFBIG_LIBS
-    _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS,
-#define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS
-
-    _CS_V6_ENV,
-#define _CS_V6_ENV			_CS_V6_ENV
-    _CS_V7_ENV
-#define _CS_V7_ENV			_CS_V7_ENV
-  };
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/dirent.h b/openflow/usr/include/arm-linux-gnueabihf/bits/dirent.h
deleted file mode 100644
index 31b1961..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/dirent.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _DIRENT_H
-# error "Never use <bits/dirent.h> directly; include <dirent.h> instead."
-#endif
-
-struct dirent
-  {
-#ifndef __USE_FILE_OFFSET64
-    __ino_t d_ino;
-    __off_t d_off;
-#else
-    __ino64_t d_ino;
-    __off64_t d_off;
-#endif
-    unsigned short int d_reclen;
-    unsigned char d_type;
-    char d_name[256];		/* We must not include limits.h! */
-  };
-
-#ifdef __USE_LARGEFILE64
-struct dirent64
-  {
-    __ino64_t d_ino;
-    __off64_t d_off;
-    unsigned short int d_reclen;
-    unsigned char d_type;
-    char d_name[256];		/* We must not include limits.h! */
-  };
-#endif
-
-#define d_fileno	d_ino	/* Backwards compatibility.  */
-
-#undef  _DIRENT_HAVE_D_NAMLEN
-#define _DIRENT_HAVE_D_RECLEN
-#define _DIRENT_HAVE_D_OFF
-#define _DIRENT_HAVE_D_TYPE
-
-#if defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T
-/* Inform libc code that these two types are effectively identical.  */
-# define _DIRENT_MATCHES_DIRENT64	1
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/dlfcn.h b/openflow/usr/include/arm-linux-gnueabihf/bits/dlfcn.h
deleted file mode 100644
index f4f98a1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/dlfcn.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* System dependent definitions for run-time dynamic loading.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _DLFCN_H
-# error "Never use <bits/dlfcn.h> directly; include <dlfcn.h> instead."
-#endif
-
-/* The MODE argument to `dlopen' contains one of the following: */
-#define RTLD_LAZY	0x00001	/* Lazy function call binding.  */
-#define RTLD_NOW	0x00002	/* Immediate function call binding.  */
-#define	RTLD_BINDING_MASK   0x3	/* Mask of binding time value.  */
-#define RTLD_NOLOAD	0x00004	/* Do not load the object.  */
-#define RTLD_DEEPBIND	0x00008	/* Use deep binding.  */
-
-/* If the following bit is set in the MODE argument to `dlopen',
-   the symbols of the loaded object and its dependencies are made
-   visible as if the object were linked directly into the program.  */
-#define RTLD_GLOBAL	0x00100
-
-/* Unix98 demands the following flag which is the inverse to RTLD_GLOBAL.
-   The implementation does this by default and so we can define the
-   value to zero.  */
-#define RTLD_LOCAL	0
-
-/* Do not delete object when closed.  */
-#define RTLD_NODELETE	0x01000
-
-#ifdef __USE_GNU
-/* To support profiling of shared objects it is a good idea to call
-   the function found using `dlsym' using the following macro since
-   these calls do not use the PLT.  But this would mean the dynamic
-   loader has no chance to find out when the function is called.  The
-   macro applies the necessary magic so that profiling is possible.
-   Rewrite
-	foo = (*fctp) (arg1, arg2);
-   into
-        foo = DL_CALL_FCT (fctp, (arg1, arg2));
-*/
-# define DL_CALL_FCT(fctp, args) \
-  (_dl_mcount_wrapper_check ((void *) (fctp)), (*(fctp)) args)
-
-__BEGIN_DECLS
-
-/* This function calls the profiling functions.  */
-extern void _dl_mcount_wrapper_check (void *__selfpc) __THROW;
-
-__END_DECLS
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/elfclass.h b/openflow/usr/include/arm-linux-gnueabihf/bits/elfclass.h
deleted file mode 100644
index 180227d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/elfclass.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This file specifies the native word size of the machine, which indicates
-   the ELF file class used for executables and shared objects on this
-   machine.  */
-
-#ifndef _LINK_H
-# error "Never use <bits/elfclass.h> directly; include <link.h> instead."
-#endif
-
-#include <bits/wordsize.h>
-
-#define __ELF_NATIVE_CLASS __WORDSIZE
-
-/* The entries in the .hash table always have a size of 32 bits.  */
-typedef uint32_t Elf_Symndx;
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/endian.h b/openflow/usr/include/arm-linux-gnueabihf/bits/endian.h
deleted file mode 100644
index f49f6ab..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/endian.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ENDIAN_H
-# error "Never use <bits/endian.h> directly; include <endian.h> instead."
-#endif
-
-/* ARM can be either big or little endian.  */
-#ifdef __ARMEB__
-#define __BYTE_ORDER __BIG_ENDIAN
-#else
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/environments.h b/openflow/usr/include/arm-linux-gnueabihf/bits/environments.h
deleted file mode 100644
index 39d0702..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/environments.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright (C) 1999-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _UNISTD_H
-# error "Never include this file directly.  Use <unistd.h> instead"
-#endif
-
-#include <bits/wordsize.h>
-
-/* This header should define the following symbols under the described
-   situations.  A value `1' means that the model is always supported,
-   `-1' means it is never supported.  Undefined means it cannot be
-   statically decided.
-
-   _POSIX_V7_ILP32_OFF32   32bit int, long, pointers, and off_t type
-   _POSIX_V7_ILP32_OFFBIG  32bit int, long, and pointers and larger off_t type
-
-   _POSIX_V7_LP64_OFF32	   64bit long and pointers and 32bit off_t type
-   _POSIX_V7_LPBIG_OFFBIG  64bit long and pointers and large off_t type
-
-   The macros _POSIX_V6_ILP32_OFF32, _POSIX_V6_ILP32_OFFBIG,
-   _POSIX_V6_LP64_OFF32, _POSIX_V6_LPBIG_OFFBIG, _XBS5_ILP32_OFF32,
-   _XBS5_ILP32_OFFBIG, _XBS5_LP64_OFF32, and _XBS5_LPBIG_OFFBIG were
-   used in previous versions of the Unix standard and are available
-   only for compatibility.
-*/
-
-#if __WORDSIZE == 64
-
-/* We can never provide environments with 32-bit wide pointers.  */
-# define _POSIX_V7_ILP32_OFF32	-1
-# define _POSIX_V7_ILP32_OFFBIG	-1
-# define _POSIX_V6_ILP32_OFF32	-1
-# define _POSIX_V6_ILP32_OFFBIG	-1
-# define _XBS5_ILP32_OFF32	-1
-# define _XBS5_ILP32_OFFBIG	-1
-/* We also have no use (for now) for an environment with bigger pointers
-   and offsets.  */
-# define _POSIX_V7_LPBIG_OFFBIG	-1
-# define _POSIX_V6_LPBIG_OFFBIG	-1
-# define _XBS5_LPBIG_OFFBIG	-1
-
-/* By default we have 64-bit wide `long int', pointers and `off_t'.  */
-# define _POSIX_V7_LP64_OFF64	1
-# define _POSIX_V6_LP64_OFF64	1
-# define _XBS5_LP64_OFF64	1
-
-#else /* __WORDSIZE == 32 */
-
-/* By default we have 32-bit wide `int', `long int', pointers and `off_t'
-   and all platforms support LFS.  */
-# define _POSIX_V7_ILP32_OFF32	1
-# define _POSIX_V7_ILP32_OFFBIG	1
-# define _POSIX_V6_ILP32_OFF32	1
-# define _POSIX_V6_ILP32_OFFBIG	1
-# define _XBS5_ILP32_OFF32	1
-# define _XBS5_ILP32_OFFBIG	1
-
-/* We optionally provide an environment with the above size but an 64-bit
-   side `off_t'.  Therefore we don't define _POSIX_V7_ILP32_OFFBIG.  */
-
-/* We can never provide environments with 64-bit wide pointers.  */
-# define _POSIX_V7_LP64_OFF64	-1
-# define _POSIX_V7_LPBIG_OFFBIG	-1
-# define _POSIX_V6_LP64_OFF64	-1
-# define _POSIX_V6_LPBIG_OFFBIG	-1
-# define _XBS5_LP64_OFF64	-1
-# define _XBS5_LPBIG_OFFBIG	-1
-
-/* CFLAGS.  */
-#define __ILP32_OFFBIG_CFLAGS   "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-#endif /* __WORDSIZE == 32 */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/epoll.h b/openflow/usr/include/arm-linux-gnueabihf/bits/epoll.h
deleted file mode 100644
index 9e8c220..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/epoll.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_EPOLL_H
-# error "Never use <bits/epoll.h> directly; include <sys/epoll.h> instead."
-#endif
-
-/* Flags to be passed to epoll_create1.  */
-enum
-  {
-    EPOLL_CLOEXEC = 02000000
-#define EPOLL_CLOEXEC EPOLL_CLOEXEC
-  };
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/errno.h b/openflow/usr/include/arm-linux-gnueabihf/bits/errno.h
deleted file mode 100644
index 6b5a71e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/errno.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Error constants.  Linux specific version.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifdef _ERRNO_H
-
-# undef EDOM
-# undef EILSEQ
-# undef ERANGE
-# include <linux/errno.h>
-
-/* Linux has no ENOTSUP error code.  */
-# define ENOTSUP EOPNOTSUPP
-
-/* Older Linux versions also had no ECANCELED error code.  */
-# ifndef ECANCELED
-#  define ECANCELED	125
-# endif
-
-/* Support for error codes to support robust mutexes was added later, too.  */
-# ifndef EOWNERDEAD
-#  define EOWNERDEAD		130
-#  define ENOTRECOVERABLE	131
-# endif
-
-# ifndef ERFKILL
-#  define ERFKILL		132
-# endif
-
-# ifndef EHWPOISON
-#  define EHWPOISON		133
-# endif
-
-# ifndef __ASSEMBLER__
-/* Function to get address of global `errno' variable.  */
-extern int *__errno_location (void) __THROW __attribute__ ((__const__));
-
-#  if !defined _LIBC || defined _LIBC_REENTRANT
-/* When using threads, errno is a per-thread value.  */
-#   define errno (*__errno_location ())
-#  endif
-# endif /* !__ASSEMBLER__ */
-#endif /* _ERRNO_H */
-
-#if !defined _ERRNO_H && defined __need_Emath
-/* This is ugly but the kernel header is not clean enough.  We must
-   define only the values EDOM, EILSEQ and ERANGE in case __need_Emath is
-   defined.  */
-# define EDOM	33	/* Math argument out of domain of function.  */
-# define EILSEQ	84	/* Illegal byte sequence.  */
-# define ERANGE	34	/* Math result not representable.  */
-#endif /* !_ERRNO_H && __need_Emath */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/error.h b/openflow/usr/include/arm-linux-gnueabihf/bits/error.h
deleted file mode 100644
index 8408289..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/error.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Specializations for error functions.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_ERROR_H
-# error "Never include <bits/error.h> directly; use <error.h> instead."
-#endif
-
-
-extern void __REDIRECT (__error_alias, (int __status, int __errnum,
-					const char *__format, ...),
-			error)
-  __attribute__ ((__format__ (__printf__, 3, 4)));
-extern void __REDIRECT (__error_noreturn, (int __status, int __errnum,
-					   const char *__format, ...),
-			error)
-  __attribute__ ((__noreturn__, __format__ (__printf__, 3, 4)));
-
-
-/* If we know the function will never return make sure the compiler
-   realizes that, too.  */
-__extern_always_inline void
-error (int __status, int __errnum, const char *__format, ...)
-{
-  if (__builtin_constant_p (__status) && __status != 0)
-    __error_noreturn (__status, __errnum, __format, __va_arg_pack ());
-  else
-    __error_alias (__status, __errnum, __format, __va_arg_pack ());
-}
-
-
-extern void __REDIRECT (__error_at_line_alias, (int __status, int __errnum,
-						const char *__fname,
-						unsigned int __line,
-						const char *__format, ...),
-			error_at_line)
-  __attribute__ ((__format__ (__printf__, 5, 6)));
-extern void __REDIRECT (__error_at_line_noreturn, (int __status, int __errnum,
-						   const char *__fname,
-						   unsigned int __line,
-						   const char *__format,
-						   ...),
-			error_at_line)
-  __attribute__ ((__noreturn__, __format__ (__printf__, 5, 6)));
-
-
-/* If we know the function will never return make sure the compiler
-   realizes that, too.  */
-__extern_always_inline void
-error_at_line (int __status, int __errnum, const char *__fname,
-	       unsigned int __line, const char *__format, ...)
-{
-  if (__builtin_constant_p (__status) && __status != 0)
-    __error_at_line_noreturn (__status, __errnum, __fname, __line, __format,
-			      __va_arg_pack ());
-  else
-    __error_at_line_alias (__status, __errnum, __fname, __line,
-			   __format, __va_arg_pack ());
-}
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/eventfd.h b/openflow/usr/include/arm-linux-gnueabihf/bits/eventfd.h
deleted file mode 100644
index 63c4944..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/eventfd.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 2007-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_EVENTFD_H
-# error "Never use <bits/eventfd.h> directly; include <sys/eventfd.h> instead."
-#endif
-
-/* Flags for eventfd.  */
-enum
-  {
-    EFD_SEMAPHORE = 00000001,
-#define EFD_SEMAPHORE EFD_SEMAPHORE
-    EFD_CLOEXEC = 02000000,
-#define EFD_CLOEXEC EFD_CLOEXEC
-    EFD_NONBLOCK = 00004000
-#define EFD_NONBLOCK EFD_NONBLOCK
-  };
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/fcntl-linux.h b/openflow/usr/include/arm-linux-gnueabihf/bits/fcntl-linux.h
deleted file mode 100644
index 1e1ff17..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/fcntl-linux.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/* O_*, F_*, FD_* bit values for Linux.
-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_FCNTL_H
-# error "Never use <bits/fcntl-linux.h> directly; include <fcntl.h> instead."
-#endif
-
-/* This file contains shared definitions between Linux architectures
-   and is included by <bits/fcntl.h> to declare them.  The various
-   #ifndef cases allow the architecture specific file to define those
-   values with different values.
-
-   A minimal <bits/fcntl.h> contains just:
-
-   struct flock {...}
-   #ifdef __USE_LARGEFILE64
-   struct flock64 {...}
-   #endif
-   #include <bits/fcntl-linux.h>
-*/
-
-#ifdef __USE_GNU
-# include <bits/uio.h>
-#endif
-
-/* open/fcntl.  */
-#define O_ACCMODE	   0003
-#define O_RDONLY	     00
-#define O_WRONLY	     01
-#define O_RDWR		     02
-#ifndef O_CREAT
-# define O_CREAT	   0100	/* Not fcntl.  */
-#endif
-#ifndef O_EXCL
-# define O_EXCL		   0200	/* Not fcntl.  */
-#endif
-#ifndef O_NOCTTY
-# define O_NOCTTY	   0400	/* Not fcntl.  */
-#endif
-#ifndef O_TRUNC
-# define O_TRUNC	  01000	/* Not fcntl.  */
-#endif
-#ifndef O_APPEND
-# define O_APPEND	  02000
-#endif
-#ifndef O_NONBLOCK
-# define O_NONBLOCK	  04000
-#endif
-#ifndef O_NDELAY
-# define O_NDELAY	O_NONBLOCK
-#endif
-#ifndef O_SYNC
-# define O_SYNC	       04010000
-#endif
-#define O_FSYNC		O_SYNC
-#ifndef O_ASYNC
-# define O_ASYNC	 020000
-#endif
-#ifndef __O_LARGEFILE
-# define __O_LARGEFILE	0100000
-#endif
-
-#ifndef __O_DIRECTORY
-# define __O_DIRECTORY  0200000
-#endif
-#ifndef __O_NOFOLLOW
-# define __O_NOFOLLOW	0400000
-#endif
-#ifndef __O_CLOEXEC
-# define __O_CLOEXEC   02000000
-#endif
-#ifndef __O_DIRECT
-# define __O_DIRECT	 040000
-#endif
-#ifndef __O_NOATIME
-# define __O_NOATIME   01000000
-#endif
-#ifndef __O_PATH
-# define __O_PATH     010000000
-#endif
-#ifndef __O_DSYNC
-# define __O_DSYNC	 010000
-#endif
-#ifndef __O_TMPFILE
-# define __O_TMPFILE   (020000000 | __O_DIRECTORY)
-#endif
-
-#ifndef F_GETLK
-# ifndef __USE_FILE_OFFSET64
-#  define F_GETLK	5	/* Get record locking info.  */
-#  define F_SETLK	6	/* Set record locking info (non-blocking).  */
-#  define F_SETLKW	7	/* Set record locking info (blocking).	*/
-# else
-#  define F_GETLK	F_GETLK64  /* Get record locking info.	*/
-#  define F_SETLK	F_SETLK64  /* Set record locking info (non-blocking).*/
-#  define F_SETLKW	F_SETLKW64 /* Set record locking info (blocking).  */
-# endif
-#endif
-#ifndef F_GETLK64
-# define F_GETLK64	12	/* Get record locking info.  */
-# define F_SETLK64	13	/* Set record locking info (non-blocking).  */
-# define F_SETLKW64	14	/* Set record locking info (blocking).	*/
-#endif
-
-/* open file description locks.
-
-   Usually record locks held by a process are released on *any* close and are
-   not inherited across a fork.
-
-   These cmd values will set locks that conflict with process-associated record
-   locks, but are "owned" by the opened file description, not the process.
-   This means that they are inherited across fork or clone with CLONE_FILES
-   like BSD (flock) locks, and they are only released automatically when the
-   last reference to the the file description against which they were acquired
-   is put. */
-#ifdef __USE_GNU
-# define F_OFD_GETLK	36
-# define F_OFD_SETLK	37
-# define F_OFD_SETLKW	38
-#endif
-
-#ifdef __USE_LARGEFILE64
-# define O_LARGEFILE __O_LARGEFILE
-#endif
-
-#ifdef __USE_XOPEN2K8
-# define O_DIRECTORY	__O_DIRECTORY	/* Must be a directory.	 */
-# define O_NOFOLLOW	__O_NOFOLLOW	/* Do not follow links.	 */
-# define O_CLOEXEC	__O_CLOEXEC	/* Set close_on_exec.  */
-#endif
-
-#ifdef __USE_GNU
-# define O_DIRECT	__O_DIRECT	/* Direct disk access.	*/
-# define O_NOATIME	__O_NOATIME	/* Do not set atime.  */
-# define O_PATH		__O_PATH	/* Resolve pathname but do not open file.  */
-# define O_TMPFILE	__O_TMPFILE	/* Atomically create nameless file.  */
-#endif
-
-/* For now, Linux has no separate synchronicitiy options for read
-   operations.  We define O_RSYNC therefore as the same as O_SYNC
-   since this is a superset.  */
-#if defined __USE_POSIX199309 || defined __USE_UNIX98
-# define O_DSYNC	__O_DSYNC	/* Synchronize data.  */
-# if defined __O_RSYNC
-#  define O_RSYNC	__O_RSYNC	/* Synchronize read operations.	 */
-# else
-#  define O_RSYNC	O_SYNC		/* Synchronize read operations.	 */
-# endif
-#endif
-
-/* Values for the second argument to `fcntl'.  */
-#define F_DUPFD		0	/* Duplicate file descriptor.  */
-#define F_GETFD		1	/* Get file descriptor flags.  */
-#define F_SETFD		2	/* Set file descriptor flags.  */
-#define F_GETFL		3	/* Get file status flags.  */
-#define F_SETFL		4	/* Set file status flags.  */
-
-#ifndef __F_SETOWN
-# define __F_SETOWN	8
-# define __F_GETOWN	9
-#endif
-
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
-# define F_SETOWN	__F_SETOWN /* Get owner (process receiving SIGIO).  */
-# define F_GETOWN	__F_GETOWN /* Set owner (process receiving SIGIO).  */
-#endif
-
-#ifndef __F_SETSIG
-# define __F_SETSIG	10	/* Set number of signal to be sent.  */
-# define __F_GETSIG	11	/* Get number of signal to be sent.  */
-#endif
-#ifndef __F_SETOWN_EX
-# define __F_SETOWN_EX	15	/* Get owner (thread receiving SIGIO).  */
-# define __F_GETOWN_EX	16	/* Set owner (thread receiving SIGIO).  */
-#endif
-
-#ifdef __USE_GNU
-# define F_SETSIG	__F_SETSIG	/* Set number of signal to be sent.  */
-# define F_GETSIG	__F_GETSIG	/* Get number of signal to be sent.  */
-# define F_SETOWN_EX	__F_SETOWN_EX	/* Get owner (thread receiving SIGIO).  */
-# define F_GETOWN_EX	__F_GETOWN_EX	/* Set owner (thread receiving SIGIO).  */
-#endif
-
-#ifdef __USE_GNU
-# define F_SETLEASE	1024	/* Set a lease.	 */
-# define F_GETLEASE	1025	/* Enquire what lease is active.  */
-# define F_NOTIFY	1026	/* Request notifications on a directory.  */
-# define F_SETPIPE_SZ	1031	/* Set pipe page size array.  */
-# define F_GETPIPE_SZ	1032	/* Set pipe page size array.  */
-#endif
-#ifdef __USE_XOPEN2K8
-# define F_DUPFD_CLOEXEC 1030	/* Duplicate file descriptor with
-				   close-on-exit set.  */
-#endif
-
-/* For F_[GET|SET]FD.  */
-#define FD_CLOEXEC	1	/* Actually anything with low bit set goes */
-
-#ifndef F_RDLCK
-/* For posix fcntl() and `l_type' field of a `struct flock' for lockf().  */
-# define F_RDLCK		0	/* Read lock.  */
-# define F_WRLCK		1	/* Write lock.	*/
-# define F_UNLCK		2	/* Remove lock.	 */
-#endif
-
-
-/* For old implementation of BSD flock.  */
-#ifndef F_EXLCK
-# define F_EXLCK		4	/* or 3 */
-# define F_SHLCK		8	/* or 4 */
-#endif
-
-#ifdef __USE_MISC
-/* Operations for BSD flock, also used by the kernel implementation.  */
-# define LOCK_SH	1	/* Shared lock.  */
-# define LOCK_EX	2	/* Exclusive lock.  */
-# define LOCK_NB	4	/* Or'd with one of the above to prevent
-				   blocking.  */
-# define LOCK_UN	8	/* Remove lock.  */
-#endif
-
-#ifdef __USE_GNU
-# define LOCK_MAND	32	/* This is a mandatory flock:	*/
-# define LOCK_READ	64	/* ... which allows concurrent read operations.	 */
-# define LOCK_WRITE	128	/* ... which allows concurrent write operations.  */
-# define LOCK_RW	192	/* ... Which allows concurrent read & write operations.	 */
-#endif
-
-#ifdef __USE_GNU
-/* Types of directory notifications that may be requested with F_NOTIFY.  */
-# define DN_ACCESS	0x00000001	/* File accessed.  */
-# define DN_MODIFY	0x00000002	/* File modified.  */
-# define DN_CREATE	0x00000004	/* File created.  */
-# define DN_DELETE	0x00000008	/* File removed.  */
-# define DN_RENAME	0x00000010	/* File renamed.  */
-# define DN_ATTRIB	0x00000020	/* File changed attributes.  */
-# define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
-#endif
-
-
-#ifdef __USE_GNU
-/* Owner types.  */
-enum __pid_type
-  {
-    F_OWNER_TID = 0,		/* Kernel thread.  */
-    F_OWNER_PID,		/* Process.  */
-    F_OWNER_PGRP,		/* Process group.  */
-    F_OWNER_GID = F_OWNER_PGRP	/* Alternative, obsolete name.  */
-  };
-
-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
-struct f_owner_ex
-  {
-    enum __pid_type type;	/* Owner type of ID.  */
-    __pid_t pid;		/* ID of owner.  */
-  };
-#endif
-
-/* Define some more compatibility macros to be backward compatible with
-   BSD systems which did not managed to hide these kernel macros.  */
-#ifdef	__USE_MISC
-# define FAPPEND	O_APPEND
-# define FFSYNC		O_FSYNC
-# define FASYNC		O_ASYNC
-# define FNONBLOCK	O_NONBLOCK
-# define FNDELAY	O_NDELAY
-#endif /* Use misc.  */
-
-#ifndef __POSIX_FADV_DONTNEED
-#  define __POSIX_FADV_DONTNEED	4
-#  define __POSIX_FADV_NOREUSE	5
-#endif
-/* Advise to `posix_fadvise'.  */
-#ifdef __USE_XOPEN2K
-# define POSIX_FADV_NORMAL	0 /* No further special treatment.  */
-# define POSIX_FADV_RANDOM	1 /* Expect random page references.  */
-# define POSIX_FADV_SEQUENTIAL	2 /* Expect sequential page references.	 */
-# define POSIX_FADV_WILLNEED	3 /* Will need these pages.  */
-# define POSIX_FADV_DONTNEED	__POSIX_FADV_DONTNEED /* Don't need these pages.  */
-# define POSIX_FADV_NOREUSE	__POSIX_FADV_NOREUSE /* Data will be accessed once.  */
-#endif
-
-
-#ifdef __USE_GNU
-/* Flags for SYNC_FILE_RANGE.  */
-# define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
-					     in the range before performing the
-					     write.  */
-# define SYNC_FILE_RANGE_WRITE		2 /* Initiate writeout of all those
-					     dirty pages in the range which are
-					     not presently under writeback.  */
-# define SYNC_FILE_RANGE_WAIT_AFTER	4 /* Wait upon writeout of all pages in
-					     the range after performing the
-					     write.  */
-
-/* Flags for SPLICE and VMSPLICE.  */
-# define SPLICE_F_MOVE		1	/* Move pages instead of copying.  */
-# define SPLICE_F_NONBLOCK	2	/* Don't block on the pipe splicing
-					   (but we may still block on the fd
-					   we splice from/to).  */
-# define SPLICE_F_MORE		4	/* Expect more data.  */
-# define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
-
-
-/* Flags for fallocate.  */
-# define FALLOC_FL_KEEP_SIZE		1 /* Don't extend size of file
-					     even if offset + len is
-					     greater than file size.  */
-# define FALLOC_FL_PUNCH_HOLE		2 /* Create a hole in the file.  */
-# define FALLOC_FL_COLLAPSE_RANGE	8 /* Remove a range of a file
-					     without leaving a
-					     hole.  */
-# define FALLOC_FL_ZERO_RANGE		16 /* Convert a range of a
-					      file to zeros.  */
-
-
-/* File handle structure.  */
-struct file_handle
-{
-  unsigned int handle_bytes;
-  int handle_type;
-  /* File identifier.  */
-  unsigned char f_handle[0];
-};
-
-/* Maximum handle size (for now).  */
-# define MAX_HANDLE_SZ	128
-#endif
-
-/* Values for `*at' functions.  */
-#ifdef __USE_ATFILE
-# define AT_FDCWD		-100	/* Special value used to indicate
-					   the *at functions should use the
-					   current working directory. */
-# define AT_SYMLINK_NOFOLLOW	0x100	/* Do not follow symbolic links.  */
-# define AT_REMOVEDIR		0x200	/* Remove directory instead of
-					   unlinking file.  */
-# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
-# ifdef __USE_GNU
-#  define AT_NO_AUTOMOUNT	0x800	/* Suppress terminal automount
-					   traversal.  */
-#  define AT_EMPTY_PATH		0x1000	/* Allow empty relative pathname.  */
-# endif
-# define AT_EACCESS		0x200	/* Test access permitted for
-					   effective IDs, not real IDs.  */
-#endif
-
-__BEGIN_DECLS
-
-#ifdef __USE_GNU
-
-/* Provide kernel hint to read ahead.  */
-extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
-    __THROW;
-
-
-/* Selective file content synch'ing.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int sync_file_range (int __fd, __off64_t __offset, __off64_t __count,
-			    unsigned int __flags);
-
-
-/* Splice address range into a pipe.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern ssize_t vmsplice (int __fdout, const struct iovec *__iov,
-			 size_t __count, unsigned int __flags);
-
-/* Splice two files together.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern ssize_t splice (int __fdin, __off64_t *__offin, int __fdout,
-		       __off64_t *__offout, size_t __len,
-		       unsigned int __flags);
-
-/* In-kernel implementation of tee for pipe buffers.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern ssize_t tee (int __fdin, int __fdout, size_t __len,
-		    unsigned int __flags);
-
-/* Reserve storage for the data of the file associated with FD.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-# ifndef __USE_FILE_OFFSET64
-extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
-				   __off64_t __len),
-		       fallocate64);
-#  else
-#   define fallocate fallocate64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int fallocate64 (int __fd, int __mode, __off64_t __offset,
-			__off64_t __len);
-# endif
-
-
-/* Map file name to file handle.  */
-extern int name_to_handle_at (int __dfd, const char *__name,
-			      struct file_handle *__handle, int *__mnt_id,
-			      int __flags) __THROW;
-
-/* Open file using the file handle.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int open_by_handle_at (int __mountdirfd, struct file_handle *__handle,
-			      int __flags);
-
-#endif	/* use GNU */
-
-__END_DECLS
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/fcntl.h b/openflow/usr/include/arm-linux-gnueabihf/bits/fcntl.h
deleted file mode 100644
index 4fbe30d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/fcntl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* O_*, F_*, FD_* bit values for Linux.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_FCNTL_H
-# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
-#endif
-
-#define __O_DIRECTORY	 040000	/* Must be a directory.	 */
-#define __O_NOFOLLOW	0100000	/* Do not follow links.	 */
-#define __O_DIRECT	0200000	/* Direct disk access.	*/
-#define __O_LARGEFILE	0400000
-
-struct flock
-  {
-    short int l_type;	/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.	*/
-    short int l_whence;	/* Where `l_start' is relative to (like `lseek').  */
-#ifndef __USE_FILE_OFFSET64
-    __off_t l_start;	/* Offset where the lock begins.  */
-    __off_t l_len;	/* Size of the locked area; zero means until EOF.  */
-#else
-    __off64_t l_start;	/* Offset where the lock begins.  */
-    __off64_t l_len;	/* Size of the locked area; zero means until EOF.  */
-#endif
-    __pid_t l_pid;	/* Process holding the lock.  */
-  };
-
-#ifdef __USE_LARGEFILE64
-struct flock64
-  {
-    short int l_type;	/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.	*/
-    short int l_whence;	/* Where `l_start' is relative to (like `lseek').  */
-    __off64_t l_start;	/* Offset where the lock begins.  */
-    __off64_t l_len;	/* Size of the locked area; zero means until EOF.  */
-    __pid_t l_pid;	/* Process holding the lock.  */
-  };
-#endif
-
-/* Include generic Linux declarations.  */
-#include <bits/fcntl-linux.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/fcntl2.h b/openflow/usr/include/arm-linux-gnueabihf/bits/fcntl2.h
deleted file mode 100644
index c3f267e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/fcntl2.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Checking macros for fcntl functions.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_FCNTL_H
-# error "Never include <bits/fcntl2.h> directly; use <fcntl.h> instead."
-#endif
-
-/* Check that calls to open and openat with O_CREAT or O_TMPFILE set have an
-   appropriate third/fourth parameter.  */
-#ifndef __USE_FILE_OFFSET64
-extern int __open_2 (const char *__path, int __oflag) __nonnull ((1));
-extern int __REDIRECT (__open_alias, (const char *__path, int __oflag, ...),
-		       open) __nonnull ((1));
-#else
-extern int __REDIRECT (__open_2, (const char *__path, int __oflag),
-		       __open64_2) __nonnull ((1));
-extern int __REDIRECT (__open_alias, (const char *__path, int __oflag, ...),
-		       open64) __nonnull ((1));
-#endif
-__errordecl (__open_too_many_args,
-	     "open can be called either with 2 or 3 arguments, not more");
-__errordecl (__open_missing_mode,
-	     "open with O_CREAT or O_TMPFILE in second argument needs 3 arguments");
-
-__fortify_function int
-open (const char *__path, int __oflag, ...)
-{
-  if (__va_arg_pack_len () > 1)
-    __open_too_many_args ();
-
-  if (__builtin_constant_p (__oflag))
-    {
-      if (__OPEN_NEEDS_MODE (__oflag) && __va_arg_pack_len () < 1)
-	{
-	  __open_missing_mode ();
-	  return __open_2 (__path, __oflag);
-	}
-      return __open_alias (__path, __oflag, __va_arg_pack ());
-    }
-
-  if (__va_arg_pack_len () < 1)
-    return __open_2 (__path, __oflag);
-
-  return __open_alias (__path, __oflag, __va_arg_pack ());
-}
-
-
-#ifdef __USE_LARGEFILE64
-extern int __open64_2 (const char *__path, int __oflag) __nonnull ((1));
-extern int __REDIRECT (__open64_alias, (const char *__path, int __oflag,
-					...), open64) __nonnull ((1));
-__errordecl (__open64_too_many_args,
-	     "open64 can be called either with 2 or 3 arguments, not more");
-__errordecl (__open64_missing_mode,
-	     "open64 with O_CREAT or O_TMPFILE in second argument needs 3 arguments");
-
-__fortify_function int
-open64 (const char *__path, int __oflag, ...)
-{
-  if (__va_arg_pack_len () > 1)
-    __open64_too_many_args ();
-
-  if (__builtin_constant_p (__oflag))
-    {
-      if (__OPEN_NEEDS_MODE (__oflag) && __va_arg_pack_len () < 1)
-	{
-	  __open64_missing_mode ();
-	  return __open64_2 (__path, __oflag);
-	}
-      return __open64_alias (__path, __oflag, __va_arg_pack ());
-    }
-
-  if (__va_arg_pack_len () < 1)
-    return __open64_2 (__path, __oflag);
-
-  return __open64_alias (__path, __oflag, __va_arg_pack ());
-}
-#endif
-
-
-#ifdef __USE_ATFILE
-# ifndef __USE_FILE_OFFSET64
-extern int __openat_2 (int __fd, const char *__path, int __oflag)
-     __nonnull ((2));
-extern int __REDIRECT (__openat_alias, (int __fd, const char *__path,
-					int __oflag, ...), openat)
-     __nonnull ((2));
-# else
-extern int __REDIRECT (__openat_2, (int __fd, const char *__path,
-				    int __oflag), __openat64_2)
-     __nonnull ((2));
-extern int __REDIRECT (__openat_alias, (int __fd, const char *__path,
-					int __oflag, ...), openat64)
-     __nonnull ((2));
-# endif
-__errordecl (__openat_too_many_args,
-	     "openat can be called either with 3 or 4 arguments, not more");
-__errordecl (__openat_missing_mode,
-	     "openat with O_CREAT or O_TMPFILE in third argument needs 4 arguments");
-
-__fortify_function int
-openat (int __fd, const char *__path, int __oflag, ...)
-{
-  if (__va_arg_pack_len () > 1)
-    __openat_too_many_args ();
-
-  if (__builtin_constant_p (__oflag))
-    {
-      if (__OPEN_NEEDS_MODE (__oflag) && __va_arg_pack_len () < 1)
-	{
-	  __openat_missing_mode ();
-	  return __openat_2 (__fd, __path, __oflag);
-	}
-      return __openat_alias (__fd, __path, __oflag, __va_arg_pack ());
-    }
-
-  if (__va_arg_pack_len () < 1)
-    return __openat_2 (__fd, __path, __oflag);
-
-  return __openat_alias (__fd, __path, __oflag, __va_arg_pack ());
-}
-
-
-# ifdef __USE_LARGEFILE64
-extern int __openat64_2 (int __fd, const char *__path, int __oflag)
-     __nonnull ((2));
-extern int __REDIRECT (__openat64_alias, (int __fd, const char *__path,
-					  int __oflag, ...), openat64)
-     __nonnull ((2));
-__errordecl (__openat64_too_many_args,
-	     "openat64 can be called either with 3 or 4 arguments, not more");
-__errordecl (__openat64_missing_mode,
-	     "openat64 with O_CREAT or O_TMPFILE in third argument needs 4 arguments");
-
-__fortify_function int
-openat64 (int __fd, const char *__path, int __oflag, ...)
-{
-  if (__va_arg_pack_len () > 1)
-    __openat64_too_many_args ();
-
-  if (__builtin_constant_p (__oflag))
-    {
-      if (__OPEN_NEEDS_MODE (__oflag) && __va_arg_pack_len () < 1)
-	{
-	  __openat64_missing_mode ();
-	  return __openat64_2 (__fd, __path, __oflag);
-	}
-      return __openat64_alias (__fd, __path, __oflag, __va_arg_pack ());
-    }
-
-  if (__va_arg_pack_len () < 1)
-    return __openat64_2 (__fd, __path, __oflag);
-
-  return __openat64_alias (__fd, __path, __oflag, __va_arg_pack ());
-}
-# endif
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/fenv.h b/openflow/usr/include/arm-linux-gnueabihf/bits/fenv.h
deleted file mode 100644
index 8e89fc1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/fenv.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright (C) 2004-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _FENV_H
-# error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
-#endif
-
-/* Define bits representing exceptions in the FPU status word.  */
-enum
-  {
-    FE_INVALID =
-#define FE_INVALID	1
-      FE_INVALID,
-    FE_DIVBYZERO =
-#define FE_DIVBYZERO	2
-      FE_DIVBYZERO,
-    FE_OVERFLOW =
-#define FE_OVERFLOW	4
-      FE_OVERFLOW,
-    FE_UNDERFLOW =
-#define FE_UNDERFLOW	8
-      FE_UNDERFLOW,
-    FE_INEXACT =
-#define FE_INEXACT	16
-      FE_INEXACT,
-  };
-
-/* Amount to shift by to convert an exception to a mask bit.  */
-#define FE_EXCEPT_SHIFT	8
-
-/* All supported exceptions.  */
-#define FE_ALL_EXCEPT	\
-	(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT)
-
-/* VFP supports all of the four defined rounding modes.  */
-enum
-  {
-    FE_TONEAREST =
-#define FE_TONEAREST	0
-      FE_TONEAREST,
-    FE_UPWARD =
-#define FE_UPWARD	0x400000
-      FE_UPWARD,
-    FE_DOWNWARD =
-#define FE_DOWNWARD	0x800000
-      FE_DOWNWARD,
-    FE_TOWARDZERO =
-#define FE_TOWARDZERO	0xc00000
-      FE_TOWARDZERO
-  };
-
-/* Type representing exception flags. */
-typedef unsigned int fexcept_t;
-
-/* Type representing floating-point environment.  */
-typedef struct
-  {
-    unsigned int __cw;
-  }
-fenv_t;
-
-/* If the default argument is used we use this value.  */
-#define FE_DFL_ENV	((const fenv_t *) -1l)
-
-#ifdef __USE_GNU
-/* Floating-point environment where none of the exceptions are masked.  */
-# define FE_NOMASK_ENV  ((const fenv_t *) -2)
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/fenvinline.h b/openflow/usr/include/arm-linux-gnueabihf/bits/fenvinline.h
deleted file mode 100644
index 42f77b5..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/fenvinline.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* This file provides inline versions of floating-pint environment
-   handling functions.  If there were any.  */
-
-#ifndef __NO_MATH_INLINES
-
-/* Here is where the code would go.  */
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/huge_val.h b/openflow/usr/include/arm-linux-gnueabihf/bits/huge_val.h
deleted file mode 100644
index 42d416f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/huge_val.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* `HUGE_VAL' constant for IEEE 754 machines (where it is infinity).
-   Used by <stdlib.h> and <math.h> functions for overflow.
-   Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
-#endif
-
-/* IEEE positive infinity (-HUGE_VAL is negative infinity).  */
-
-#if __GNUC_PREREQ(3,3)
-# define HUGE_VAL	(__builtin_huge_val())
-#elif __GNUC_PREREQ(2,96)
-# define HUGE_VAL	(__extension__ 0x1.0p2047)
-#elif defined __GNUC__
-
-# define HUGE_VAL \
-  (__extension__							      \
-   ((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; })   \
-    { __l: 0x7ff0000000000000ULL }).__d)
-
-#else /* not GCC */
-
-# include <endian.h>
-
-typedef union { unsigned char __c[8]; double __d; } __huge_val_t;
-
-# if __BYTE_ORDER == __BIG_ENDIAN
-#  define __HUGE_VAL_bytes	{ 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }
-# endif
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define __HUGE_VAL_bytes	{ 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }
-# endif
-
-static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
-# define HUGE_VAL	(__huge_val.__d)
-
-#endif	/* GCC.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/huge_valf.h b/openflow/usr/include/arm-linux-gnueabihf/bits/huge_valf.h
deleted file mode 100644
index 9d418ba..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/huge_valf.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* `HUGE_VALF' constant for IEEE 754 machines (where it is infinity).
-   Used by <stdlib.h> and <math.h> functions for overflow.
-   Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_valf.h> directly; include <math.h> instead."
-#endif
-
-/* IEEE positive infinity (-HUGE_VAL is negative infinity).  */
-
-#if __GNUC_PREREQ(3,3)
-# define HUGE_VALF	(__builtin_huge_valf())
-#elif __GNUC_PREREQ(2,96)
-# define HUGE_VALF	(__extension__ 0x1.0p255f)
-#elif defined __GNUC__
-
-#   define HUGE_VALF \
-  (__extension__							      \
-   ((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; })    \
-    { __l: 0x7f800000UL }).__d)
-
-#else /* not GCC */
-
-typedef union { unsigned char __c[4]; float __f; } __huge_valf_t;
-
-# if __BYTE_ORDER == __BIG_ENDIAN
-#  define __HUGE_VALF_bytes	{ 0x7f, 0x80, 0, 0 }
-# endif
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define __HUGE_VALF_bytes	{ 0, 0, 0x80, 0x7f }
-# endif
-
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-# define HUGE_VALF	(__huge_valf.__f)
-
-#endif	/* GCC.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/huge_vall.h b/openflow/usr/include/arm-linux-gnueabihf/bits/huge_vall.h
deleted file mode 100644
index 1886adf..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/huge_vall.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Default `HUGE_VALL' constant.
-   Used by <stdlib.h> and <math.h> functions for overflow.
-   Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_vall.h> directly; include <math.h> instead."
-#endif
-
-#if __GNUC_PREREQ(3,3)
-# define HUGE_VALL	(__builtin_huge_vall())
-#else
-# define HUGE_VALL	((long double) HUGE_VAL)
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/hwcap.h b/openflow/usr/include/arm-linux-gnueabihf/bits/hwcap.h
deleted file mode 100644
index 4e10115..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/hwcap.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Defines for bits in AT_HWCAP.  ARM Linux version.
-   Copyright (C) 2012-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined (_SYS_AUXV_H) && !defined (_LINUX_ARM_SYSDEP_H)
-# error "Never include <bits/hwcap.h> directly; use <sys/auxv.h> instead."
-#endif
-
-/* The following must match the kernel's <asm/hwcap.h>.  */
-#define HWCAP_ARM_SWP		1
-#define HWCAP_ARM_HALF		2
-#define HWCAP_ARM_THUMB		4
-#define HWCAP_ARM_26BIT		8
-#define HWCAP_ARM_FAST_MULT	16
-#define HWCAP_ARM_FPA		32
-#define HWCAP_ARM_VFP		64
-#define HWCAP_ARM_EDSP		128
-#define HWCAP_ARM_JAVA		256
-#define HWCAP_ARM_IWMMXT	512
-#define HWCAP_ARM_CRUNCH	1024
-#define HWCAP_ARM_THUMBEE	2048
-#define HWCAP_ARM_NEON		4096
-#define HWCAP_ARM_VFPv3		8192
-#define HWCAP_ARM_VFPv3D16	16384
-#define HWCAP_ARM_TLS		32768
-#define HWCAP_ARM_VFPv4		65536
-#define HWCAP_ARM_IDIVA		131072
-#define HWCAP_ARM_IDIVT		262144
-#define HWCAP_ARM_VFPD32	524288
-#define HWCAP_ARM_LPAE		1048576
-#define HWCAP_ARM_EVTSTRM	2097152
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/in.h b/openflow/usr/include/arm-linux-gnueabihf/bits/in.h
deleted file mode 100644
index 3b01f12..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/in.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Linux version.  */
-
-#ifndef _NETINET_IN_H
-# error "Never use <bits/in.h> directly; include <netinet/in.h> instead."
-#endif
-
-/* If the application has already included linux/in6.h from a linux-based
-   kernel then we will not define the IPv6 IPPROTO_* defines, in6_addr (nor the
-   defines), sockaddr_in6, or ipv6_mreq. Same for in6_ptkinfo or ip6_mtuinfo
-   in linux/ipv6.h. The ABI used by the linux-kernel and glibc match exactly.
-   Neither the linux kernel nor glibc should break this ABI without coordination.  */
-#if defined _UAPI_LINUX_IN6_H || defined _UAPI_IPV6_H
-/* This is not quite the same API since the kernel always defines s6_addr16 and
-   s6_addr32. This is not a violation of POSIX since POSIX says "at least the
-   following member" and that holds true.  */
-# define __USE_KERNEL_IPV6_DEFS
-#endif
-
-/* Options for use with `getsockopt' and `setsockopt' at the IP level.
-   The first word in the comment at the right is the data type used;
-   "bool" means a boolean value stored in an `int'.  */
-#define        IP_OPTIONS      4       /* ip_opts; IP per-packet options.  */
-#define        IP_HDRINCL      3       /* int; Header is included with data.  */
-#define        IP_TOS          1       /* int; IP type of service and precedence.  */
-#define        IP_TTL          2       /* int; IP time to live.  */
-#define        IP_RECVOPTS     6       /* bool; Receive all IP options w/datagram.  */
-/* For BSD compatibility.  */
-#define        IP_RECVRETOPTS  IP_RETOPTS       /* bool; Receive IP options for response.  */
-#define        IP_RETOPTS      7       /* ip_opts; Set/get IP per-packet options.  */
-#define IP_MULTICAST_IF 32	/* in_addr; set/get IP multicast i/f */
-#define IP_MULTICAST_TTL 33	/* u_char; set/get IP multicast ttl */
-#define IP_MULTICAST_LOOP 34	/* i_char; set/get IP multicast loopback */
-#define IP_ADD_MEMBERSHIP 35	/* ip_mreq; add an IP group membership */
-#define IP_DROP_MEMBERSHIP 36	/* ip_mreq; drop an IP group membership */
-#define IP_UNBLOCK_SOURCE 37	/* ip_mreq_source: unblock data from source */
-#define IP_BLOCK_SOURCE 38	/* ip_mreq_source: block data from source */
-#define IP_ADD_SOURCE_MEMBERSHIP 39 /* ip_mreq_source: join source group */
-#define IP_DROP_SOURCE_MEMBERSHIP 40 /* ip_mreq_source: leave source group */
-#define IP_MSFILTER 41
-#ifdef __USE_MISC
-# define MCAST_JOIN_GROUP 42	/* group_req: join any-source group */
-# define MCAST_BLOCK_SOURCE 43	/* group_source_req: block from given group */
-# define MCAST_UNBLOCK_SOURCE 44 /* group_source_req: unblock from given group*/
-# define MCAST_LEAVE_GROUP 45	/* group_req: leave any-source group */
-# define MCAST_JOIN_SOURCE_GROUP 46 /* group_source_req: join source-spec gr */
-# define MCAST_LEAVE_SOURCE_GROUP 47 /* group_source_req: leave source-spec gr*/
-# define MCAST_MSFILTER 48
-# define IP_MULTICAST_ALL 49
-# define IP_UNICAST_IF 50
-
-# define MCAST_EXCLUDE   0
-# define MCAST_INCLUDE   1
-#endif
-
-#define IP_ROUTER_ALERT	5	/* bool */
-#define IP_PKTINFO	8	/* bool */
-#define IP_PKTOPTIONS	9
-#define IP_PMTUDISC	10	/* obsolete name? */
-#define IP_MTU_DISCOVER	10	/* int; see below */
-#define IP_RECVERR	11	/* bool */
-#define IP_RECVTTL	12	/* bool */
-#define IP_RECVTOS	13	/* bool */
-#define IP_MTU		14	/* int */
-#define IP_FREEBIND	15
-#define IP_IPSEC_POLICY 16
-#define IP_XFRM_POLICY	17
-#define IP_PASSSEC	18
-#define IP_TRANSPARENT	19
-#define IP_MULTICAST_ALL 49	/* bool */
-
-/* TProxy original addresses */
-#define IP_ORIGDSTADDR       20
-#define IP_RECVORIGDSTADDR   IP_ORIGDSTADDR
-
-#define IP_MINTTL       21
-#define IP_NODEFRAG     22
-#define IP_CHECKSUM     23
-#define IP_BIND_ADDRESS_NO_PORT 24
-
-/* IP_MTU_DISCOVER arguments.  */
-#define IP_PMTUDISC_DONT   0	/* Never send DF frames.  */
-#define IP_PMTUDISC_WANT   1	/* Use per route hints.  */
-#define IP_PMTUDISC_DO     2	/* Always DF.  */
-#define IP_PMTUDISC_PROBE  3	/* Ignore dst pmtu.  */
-/* Always use interface mtu (ignores dst pmtu) but don't set DF flag.
-   Also incoming ICMP frag_needed notifications will be ignored on
-   this socket to prevent accepting spoofed ones.  */
-#define IP_PMTUDISC_INTERFACE           4
-/* Like IP_PMTUDISC_INTERFACE but allow packets to be fragmented.  */
-#define IP_PMTUDISC_OMIT		5
-
-#define IP_MULTICAST_IF			32
-#define IP_MULTICAST_TTL 		33
-#define IP_MULTICAST_LOOP 		34
-#define IP_ADD_MEMBERSHIP		35
-#define IP_DROP_MEMBERSHIP		36
-#define IP_UNBLOCK_SOURCE		37
-#define IP_BLOCK_SOURCE			38
-#define IP_ADD_SOURCE_MEMBERSHIP	39
-#define IP_DROP_SOURCE_MEMBERSHIP	40
-#define IP_MSFILTER			41
-#define IP_MULTICAST_ALL		49
-#define IP_UNICAST_IF			50
-
-/* To select the IP level.  */
-#define SOL_IP	0
-
-#define IP_DEFAULT_MULTICAST_TTL        1
-#define IP_DEFAULT_MULTICAST_LOOP       1
-#define IP_MAX_MEMBERSHIPS              20
-
-#ifdef __USE_MISC
-/* Structure used to describe IP options for IP_OPTIONS and IP_RETOPTS.
-   The `ip_dst' field is used for the first-hop gateway when using a
-   source route (this gets put into the header proper).  */
-struct ip_opts
-  {
-    struct in_addr ip_dst;	/* First hop; zero without source route.  */
-    char ip_opts[40];		/* Actually variable in size.  */
-  };
-
-/* Like `struct ip_mreq' but including interface specification by index.  */
-struct ip_mreqn
-  {
-    struct in_addr imr_multiaddr;	/* IP multicast address of group */
-    struct in_addr imr_address;		/* local IP address of interface */
-    int	imr_ifindex;			/* Interface index */
-  };
-
-/* Structure used for IP_PKTINFO.  */
-struct in_pktinfo
-  {
-    int ipi_ifindex;			/* Interface index  */
-    struct in_addr ipi_spec_dst;	/* Routing destination address  */
-    struct in_addr ipi_addr;		/* Header destination address  */
-  };
-#endif
-
-/* Options for use with `getsockopt' and `setsockopt' at the IPv6 level.
-   The first word in the comment at the right is the data type used;
-   "bool" means a boolean value stored in an `int'.  */
-#define IPV6_ADDRFORM		1
-#define IPV6_2292PKTINFO	2
-#define IPV6_2292HOPOPTS	3
-#define IPV6_2292DSTOPTS	4
-#define IPV6_2292RTHDR		5
-#define IPV6_2292PKTOPTIONS	6
-#define IPV6_CHECKSUM		7
-#define IPV6_2292HOPLIMIT	8
-
-#define SCM_SRCRT		IPV6_RXSRCRT
-
-#define IPV6_NEXTHOP		9
-#define IPV6_AUTHHDR		10
-#define IPV6_UNICAST_HOPS	16
-#define IPV6_MULTICAST_IF	17
-#define IPV6_MULTICAST_HOPS	18
-#define IPV6_MULTICAST_LOOP	19
-#define IPV6_JOIN_GROUP		20
-#define IPV6_LEAVE_GROUP	21
-#define IPV6_ROUTER_ALERT	22
-#define IPV6_MTU_DISCOVER	23
-#define IPV6_MTU		24
-#define IPV6_RECVERR		25
-#define IPV6_V6ONLY		26
-#define IPV6_JOIN_ANYCAST	27
-#define IPV6_LEAVE_ANYCAST	28
-#define IPV6_IPSEC_POLICY	34
-#define IPV6_XFRM_POLICY	35
-
-/* Advanced API (RFC3542) (1).  */
-#define IPV6_RECVPKTINFO	49
-#define IPV6_PKTINFO		50
-#define IPV6_RECVHOPLIMIT	51
-#define IPV6_HOPLIMIT		52
-#define IPV6_RECVHOPOPTS	53
-#define IPV6_HOPOPTS		54
-#define IPV6_RTHDRDSTOPTS	55
-#define IPV6_RECVRTHDR		56
-#define IPV6_RTHDR		57
-#define IPV6_RECVDSTOPTS	58
-#define IPV6_DSTOPTS		59
-#define IPV6_RECVPATHMTU	60
-#define IPV6_PATHMTU		61
-#define IPV6_DONTFRAG		62
-
-/* Advanced API (RFC3542) (2).  */
-#define IPV6_RECVTCLASS		66
-#define IPV6_TCLASS		67
-
-/* Obsolete synonyms for the above.  */
-#define IPV6_ADD_MEMBERSHIP	IPV6_JOIN_GROUP
-#define IPV6_DROP_MEMBERSHIP	IPV6_LEAVE_GROUP
-#define IPV6_RXHOPOPTS		IPV6_HOPOPTS
-#define IPV6_RXDSTOPTS		IPV6_DSTOPTS
-
-/* IPV6_MTU_DISCOVER values.  */
-#define IPV6_PMTUDISC_DONT	0	/* Never send DF frames.  */
-#define IPV6_PMTUDISC_WANT	1	/* Use per route hints.  */
-#define IPV6_PMTUDISC_DO	2	/* Always DF.  */
-#define IPV6_PMTUDISC_PROBE	3	/* Ignore dst pmtu.  */
-#define IPV6_PMTUDISC_INTERFACE	4	/* See IP_PMTUDISC_INTERFACE.  */
-#define IPV6_PMTUDISC_OMIT	5	/* See IP_PMTUDISC_OMIT.  */
-
-/* Socket level values for IPv6.  */
-#define SOL_IPV6        41
-#define SOL_ICMPV6      58
-
-/* Routing header options for IPv6.  */
-#define IPV6_RTHDR_LOOSE	0	/* Hop doesn't need to be neighbour. */
-#define IPV6_RTHDR_STRICT	1	/* Hop must be a neighbour.  */
-
-#define IPV6_RTHDR_TYPE_0	0	/* IPv6 Routing header type 0.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/inf.h b/openflow/usr/include/arm-linux-gnueabihf/bits/inf.h
deleted file mode 100644
index 179bf48..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/inf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* `INFINITY' constant for IEEE 754 machines.
-   Copyright (C) 2004-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_H
-# error "Never use <bits/inf.h> directly; include <math.h> instead."
-#endif
-
-/* IEEE positive infinity.  */
-
-#if __GNUC_PREREQ(3,3)
-# define INFINITY	(__builtin_inff())
-#else
-# define INFINITY	HUGE_VALF
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/initspin.h b/openflow/usr/include/arm-linux-gnueabihf/bits/initspin.h
deleted file mode 100644
index 936f178..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/initspin.h
+++ /dev/null
@@ -1 +0,0 @@
-/* No thread support. */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/inotify.h b/openflow/usr/include/arm-linux-gnueabihf/bits/inotify.h
deleted file mode 100644
index dc9f627..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/inotify.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2005-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_INOTIFY_H
-# error "Never use <bits/inotify.h> directly; include <sys/inotify.h> instead."
-#endif
-
-/* Flags for the parameter of inotify_init1.  */
-enum
-  {
-    IN_CLOEXEC = 02000000,
-#define IN_CLOEXEC IN_CLOEXEC
-    IN_NONBLOCK = 00004000
-#define IN_NONBLOCK IN_NONBLOCK
-  };
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/ioctl-types.h b/openflow/usr/include/arm-linux-gnueabihf/bits/ioctl-types.h
deleted file mode 100644
index b3bfdb1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/ioctl-types.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Structure types for pre-termios terminal ioctls.  Linux version.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_IOCTL_H
-# error "Never use <bits/ioctl-types.h> directly; include <sys/ioctl.h> instead."
-#endif
-
-/* Get definition of constants for use with `ioctl'.  */
-#include <asm/ioctls.h>
-
-
-struct winsize
-  {
-    unsigned short int ws_row;
-    unsigned short int ws_col;
-    unsigned short int ws_xpixel;
-    unsigned short int ws_ypixel;
-  };
-
-#define NCC 8
-struct termio
-  {
-    unsigned short int c_iflag;		/* input mode flags */
-    unsigned short int c_oflag;		/* output mode flags */
-    unsigned short int c_cflag;		/* control mode flags */
-    unsigned short int c_lflag;		/* local mode flags */
-    unsigned char c_line;		/* line discipline */
-    unsigned char c_cc[NCC];		/* control characters */
-};
-
-/* modem lines */
-#define TIOCM_LE	0x001
-#define TIOCM_DTR	0x002
-#define TIOCM_RTS	0x004
-#define TIOCM_ST	0x008
-#define TIOCM_SR	0x010
-#define TIOCM_CTS	0x020
-#define TIOCM_CAR	0x040
-#define TIOCM_RNG	0x080
-#define TIOCM_DSR	0x100
-#define TIOCM_CD	TIOCM_CAR
-#define TIOCM_RI	TIOCM_RNG
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-/* line disciplines */
-#define N_TTY		0
-#define N_SLIP		1
-#define N_MOUSE		2
-#define N_PPP		3
-#define N_STRIP		4
-#define N_AX25		5
-#define N_X25		6	/* X.25 async  */
-#define N_6PACK		7
-#define N_MASC		8	/* Mobitex module  */
-#define N_R3964		9	/* Simatic R3964 module  */
-#define N_PROFIBUS_FDL	10	/* Profibus  */
-#define N_IRDA		11	/* Linux IR  */
-#define N_SMSBLOCK	12	/* SMS block mode  */
-#define N_HDLC		13	/* synchronous HDLC  */
-#define N_SYNC_PPP	14	/* synchronous PPP  */
-#define	N_HCI		15	/* Bluetooth HCI UART  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/ioctls.h b/openflow/usr/include/arm-linux-gnueabihf/bits/ioctls.h
deleted file mode 100644
index cbfedca..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/ioctls.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_IOCTL_H
-# error "Never use <bits/ioctls.h> directly; include <sys/ioctl.h> instead."
-#endif
-
-/* Use the definitions from the kernel header files.  */
-#include <asm/ioctls.h>
-
-/* Routing table calls.  */
-#define SIOCADDRT	0x890B		/* add routing table entry	*/
-#define SIOCDELRT	0x890C		/* delete routing table entry	*/
-#define SIOCRTMSG	0x890D		/* call to routing system	*/
-
-/* Socket configuration controls. */
-#define SIOCGIFNAME	0x8910		/* get iface name		*/
-#define SIOCSIFLINK	0x8911		/* set iface channel		*/
-#define SIOCGIFCONF	0x8912		/* get iface list		*/
-#define SIOCGIFFLAGS	0x8913		/* get flags			*/
-#define SIOCSIFFLAGS	0x8914		/* set flags			*/
-#define SIOCGIFADDR	0x8915		/* get PA address		*/
-#define SIOCSIFADDR	0x8916		/* set PA address		*/
-#define SIOCGIFDSTADDR	0x8917		/* get remote PA address	*/
-#define SIOCSIFDSTADDR	0x8918		/* set remote PA address	*/
-#define SIOCGIFBRDADDR	0x8919		/* get broadcast PA address	*/
-#define SIOCSIFBRDADDR	0x891a		/* set broadcast PA address	*/
-#define SIOCGIFNETMASK	0x891b		/* get network PA mask		*/
-#define SIOCSIFNETMASK	0x891c		/* set network PA mask		*/
-#define SIOCGIFMETRIC	0x891d		/* get metric			*/
-#define SIOCSIFMETRIC	0x891e		/* set metric			*/
-#define SIOCGIFMEM	0x891f		/* get memory address (BSD)	*/
-#define SIOCSIFMEM	0x8920		/* set memory address (BSD)	*/
-#define SIOCGIFMTU	0x8921		/* get MTU size			*/
-#define SIOCSIFMTU	0x8922		/* set MTU size			*/
-#define SIOCSIFNAME	0x8923		/* set interface name		*/
-#define	SIOCSIFHWADDR	0x8924		/* set hardware address 	*/
-#define SIOCGIFENCAP	0x8925		/* get/set encapsulations       */
-#define SIOCSIFENCAP	0x8926
-#define SIOCGIFHWADDR	0x8927		/* Get hardware address		*/
-#define SIOCGIFSLAVE	0x8929		/* Driver slaving support	*/
-#define SIOCSIFSLAVE	0x8930
-#define SIOCADDMULTI	0x8931		/* Multicast address lists	*/
-#define SIOCDELMULTI	0x8932
-#define SIOCGIFINDEX	0x8933		/* name -> if_index mapping	*/
-#define SIOGIFINDEX	SIOCGIFINDEX	/* misprint compatibility :-)	*/
-#define SIOCSIFPFLAGS	0x8934		/* set/get extended flags set	*/
-#define SIOCGIFPFLAGS	0x8935
-#define SIOCDIFADDR	0x8936		/* delete PA address		*/
-#define	SIOCSIFHWBROADCAST	0x8937	/* set hardware broadcast addr	*/
-#define SIOCGIFCOUNT	0x8938		/* get number of devices */
-
-#define SIOCGIFBR	0x8940		/* Bridging support		*/
-#define SIOCSIFBR	0x8941		/* Set bridging options 	*/
-
-#define SIOCGIFTXQLEN	0x8942		/* Get the tx queue length	*/
-#define SIOCSIFTXQLEN	0x8943		/* Set the tx queue length 	*/
-
-
-/* ARP cache control calls. */
-		    /*  0x8950 - 0x8952  * obsolete calls, don't re-use */
-#define SIOCDARP	0x8953		/* delete ARP table entry	*/
-#define SIOCGARP	0x8954		/* get ARP table entry		*/
-#define SIOCSARP	0x8955		/* set ARP table entry		*/
-
-/* RARP cache control calls. */
-#define SIOCDRARP	0x8960		/* delete RARP table entry	*/
-#define SIOCGRARP	0x8961		/* get RARP table entry		*/
-#define SIOCSRARP	0x8962		/* set RARP table entry		*/
-
-/* Driver configuration calls */
-
-#define SIOCGIFMAP	0x8970		/* Get device parameters	*/
-#define SIOCSIFMAP	0x8971		/* Set device parameters	*/
-
-/* DLCI configuration calls */
-
-#define SIOCADDDLCI	0x8980		/* Create new DLCI device	*/
-#define SIOCDELDLCI	0x8981		/* Delete DLCI device		*/
-
-/* Device private ioctl calls.  */
-
-/* These 16 ioctls are available to devices via the do_ioctl() device
-   vector.  Each device should include this file and redefine these
-   names as their own. Because these are device dependent it is a good
-   idea _NOT_ to issue them to random objects and hope.  */
-
-#define SIOCDEVPRIVATE 		0x89F0	/* to 89FF */
-
-/*
- *	These 16 ioctl calls are protocol private
- */
-
-#define SIOCPROTOPRIVATE 0x89E0 /* to 89EF */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/ipc.h b/openflow/usr/include/arm-linux-gnueabihf/bits/ipc.h
deleted file mode 100644
index f7e4d81..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/ipc.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_IPC_H
-# error "Never use <bits/ipc.h> directly; include <sys/ipc.h> instead."
-#endif
-
-#include <bits/types.h>
-
-/* Mode bits for `msgget', `semget', and `shmget'.  */
-#define IPC_CREAT	01000		/* Create key if key does not exist. */
-#define IPC_EXCL	02000		/* Fail if key exists.  */
-#define IPC_NOWAIT	04000		/* Return error on wait.  */
-
-/* Control commands for `msgctl', `semctl', and `shmctl'.  */
-#define IPC_RMID	0		/* Remove identifier.  */
-#define IPC_SET		1		/* Set `ipc_perm' options.  */
-#define IPC_STAT	2		/* Get `ipc_perm' options.  */
-#ifdef __USE_GNU
-# define IPC_INFO	3		/* See ipcs.  */
-#endif
-
-/* Special key values.  */
-#define IPC_PRIVATE	((__key_t) 0)	/* Private key.  */
-
-
-/* Data structure used to pass permission information to IPC operations.  */
-struct ipc_perm
-  {
-    __key_t __key;			/* Key.  */
-    __uid_t uid;			/* Owner's user ID.  */
-    __gid_t gid;			/* Owner's group ID.  */
-    __uid_t cuid;			/* Creator's user ID.  */
-    __gid_t cgid;			/* Creator's group ID.  */
-    unsigned short int mode;		/* Read/write permission.  */
-    unsigned short int __pad1;
-    unsigned short int __seq;		/* Sequence number.  */
-    unsigned short int __pad2;
-    __syscall_ulong_t __glibc_reserved1;
-    __syscall_ulong_t __glibc_reserved2;
-  };
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/ipctypes.h b/openflow/usr/include/arm-linux-gnueabihf/bits/ipctypes.h
deleted file mode 100644
index bf791ce..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/ipctypes.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* bits/ipctypes.h -- Define some types used by SysV IPC/MSG/SHM.  Generic.
-   Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * Never include <bits/ipctypes.h> directly.
- */
-
-#ifndef _BITS_IPCTYPES_H
-#define _BITS_IPCTYPES_H	1
-
-#include <bits/types.h>
-
-/* Used in `struct shmid_ds'.  */
-# if __WORDSIZE == 32
-typedef unsigned short int __ipc_pid_t;
-# else
-typedef int __ipc_pid_t;
-# endif
-
-
-#endif /* bits/ipctypes.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/libio-ldbl.h b/openflow/usr/include/arm-linux-gnueabihf/bits/libio-ldbl.h
deleted file mode 100644
index 15c5af9..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/libio-ldbl.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -mlong-double-64 compatibility mode for libio functions.
-   Copyright (C) 2006-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _IO_STDIO_H
-# error "Never include <bits/libio-ldbl.h> directly; use <libio.h> instead."
-#endif
-
-__LDBL_REDIR_DECL (_IO_vfscanf)
-__LDBL_REDIR_DECL (_IO_vfprintf)
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/libm-simd-decl-stubs.h b/openflow/usr/include/arm-linux-gnueabihf/bits/libm-simd-decl-stubs.h
deleted file mode 100644
index 541cb3f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/libm-simd-decl-stubs.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Empty definitions required for __MATHCALL_VEC unfolding in mathcalls.h.
-   Copyright (C) 2014-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_H
-# error "Never include <bits/libm-simd-decl-stubs.h> directly;\
- include <math.h> instead."
-#endif
-
-/* Needed definitions could be generated with:
-   for func in $(grep __MATHCALL_VEC math/bits/mathcalls.h |\
-		 sed -r "s|__MATHCALL_VEC.?\(||; s|,.*||"); do
-     echo "#define __DECL_SIMD_${func}";
-     echo "#define __DECL_SIMD_${func}f";
-     echo "#define __DECL_SIMD_${func}l";
-   done
- */
-
-#ifndef _BITS_LIBM_SIMD_DECL_STUBS_H
-#define _BITS_LIBM_SIMD_DECL_STUBS_H 1
-
-#define __DECL_SIMD_cos
-#define __DECL_SIMD_cosf
-#define __DECL_SIMD_cosl
-
-#define __DECL_SIMD_sin
-#define __DECL_SIMD_sinf
-#define __DECL_SIMD_sinl
-
-#define __DECL_SIMD_sincos
-#define __DECL_SIMD_sincosf
-#define __DECL_SIMD_sincosl
-
-#define __DECL_SIMD_log
-#define __DECL_SIMD_logf
-#define __DECL_SIMD_logl
-
-#define __DECL_SIMD_exp
-#define __DECL_SIMD_expf
-#define __DECL_SIMD_expl
-
-#define __DECL_SIMD_pow
-#define __DECL_SIMD_powf
-#define __DECL_SIMD_powl
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/link.h b/openflow/usr/include/arm-linux-gnueabihf/bits/link.h
deleted file mode 100644
index 6446dec..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/link.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 2005-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_LINK_H
-# error "Never include <bits/link.h> directly; use <link.h> instead."
-#endif
-
-
-/* Registers for entry into PLT on ARM.  */
-typedef struct La_arm_regs
-{
-  uint32_t lr_reg[4];
-  uint32_t lr_sp;
-  uint32_t lr_lr;
-  /* Coprocessor registers used for argument passing.  The data
-     stored here depends on the coprocessors available in the
-     system which are used for function calls in the current ABI.
-     VFP uses eight 64-bit registers, and iWMMXt uses ten.  */
-  uint32_t lr_coproc[42];
-} La_arm_regs;
-
-/* Return values for calls from PLT on ARM.  */
-typedef struct La_arm_retval
-{
-  /* Up to four integer registers can be used for a return value in
-     some ABIs (APCS complex long double).  */
-  uint32_t lrv_reg[4];
-
-  /* Any coprocessor registers which might be used to return values
-     in the current ABI.  */
-  uint32_t lrv_coproc[12];
-} La_arm_retval;
-
-
-__BEGIN_DECLS
-
-extern Elf32_Addr la_arm_gnu_pltenter (Elf32_Sym *__sym, unsigned int __ndx,
-				       uintptr_t *__refcook,
-				       uintptr_t *__defcook,
-				       La_arm_regs *__regs,
-				       unsigned int *__flags,
-				       const char *__symname,
-				       long int *__framesizep);
-extern unsigned int la_arm_gnu_pltexit (Elf32_Sym *__sym, unsigned int __ndx,
-					uintptr_t *__refcook,
-					uintptr_t *__defcook,
-					const La_arm_regs *__inregs,
-					La_arm_retval *__outregs,
-					const char *__symname);
-
-__END_DECLS
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/local_lim.h b/openflow/usr/include/arm-linux-gnueabihf/bits/local_lim.h
deleted file mode 100644
index 3f353f7..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/local_lim.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Minimum guaranteed maximum values for system limits.  Linux version.
-   Copyright (C) 1993-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-/* The kernel header pollutes the namespace with the NR_OPEN symbol
-   and defines LINK_MAX although filesystems have different maxima.  A
-   similar thing is true for OPEN_MAX: the limit can be changed at
-   runtime and therefore the macro must not be defined.  Remove this
-   after including the header if necessary.  */
-#ifndef NR_OPEN
-# define __undef_NR_OPEN
-#endif
-#ifndef LINK_MAX
-# define __undef_LINK_MAX
-#endif
-#ifndef OPEN_MAX
-# define __undef_OPEN_MAX
-#endif
-#ifndef ARG_MAX
-# define __undef_ARG_MAX
-#endif
-
-/* The kernel sources contain a file with all the needed information.  */
-#include <linux/limits.h>
-
-/* Have to remove NR_OPEN?  */
-#ifdef __undef_NR_OPEN
-# undef NR_OPEN
-# undef __undef_NR_OPEN
-#endif
-/* Have to remove LINK_MAX?  */
-#ifdef __undef_LINK_MAX
-# undef LINK_MAX
-# undef __undef_LINK_MAX
-#endif
-/* Have to remove OPEN_MAX?  */
-#ifdef __undef_OPEN_MAX
-# undef OPEN_MAX
-# undef __undef_OPEN_MAX
-#endif
-/* Have to remove ARG_MAX?  */
-#ifdef __undef_ARG_MAX
-# undef ARG_MAX
-# undef __undef_ARG_MAX
-#endif
-
-/* The number of data keys per process.  */
-#define _POSIX_THREAD_KEYS_MAX	128
-/* This is the value this implementation supports.  */
-#define PTHREAD_KEYS_MAX	1024
-
-/* Controlling the iterations of destructors for thread-specific data.  */
-#define _POSIX_THREAD_DESTRUCTOR_ITERATIONS	4
-/* Number of iterations this implementation does.  */
-#define PTHREAD_DESTRUCTOR_ITERATIONS	_POSIX_THREAD_DESTRUCTOR_ITERATIONS
-
-/* The number of threads per process.  */
-#define _POSIX_THREAD_THREADS_MAX	64
-/* We have no predefined limit on the number of threads.  */
-#undef PTHREAD_THREADS_MAX
-
-/* Maximum amount by which a process can descrease its asynchronous I/O
-   priority level.  */
-#define AIO_PRIO_DELTA_MAX	20
-
-/* Minimum size for a thread.  We are free to choose a reasonable value.  */
-#define PTHREAD_STACK_MIN	16384
-
-/* Maximum number of timer expiration overruns.  */
-#define DELAYTIMER_MAX	2147483647
-
-/* Maximum tty name length.  */
-#define TTY_NAME_MAX		32
-
-/* Maximum login name length.  This is arbitrary.  */
-#define LOGIN_NAME_MAX		256
-
-/* Maximum host name length.  */
-#define HOST_NAME_MAX		64
-
-/* Maximum message queue priority level.  */
-#define MQ_PRIO_MAX		32768
-
-/* Maximum value the semaphore can have.  */
-#define SEM_VALUE_MAX   (2147483647)
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/locale.h b/openflow/usr/include/arm-linux-gnueabihf/bits/locale.h
deleted file mode 100644
index d5fb290..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/locale.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Definition of locale category symbol values.
-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _LOCALE_H && !defined _LANGINFO_H
-# error "Never use <bits/locale.h> directly; include <locale.h> instead."
-#endif
-
-#ifndef _BITS_LOCALE_H
-#define _BITS_LOCALE_H	1
-
-#define __LC_CTYPE		 0
-#define __LC_NUMERIC		 1
-#define __LC_TIME		 2
-#define __LC_COLLATE		 3
-#define __LC_MONETARY		 4
-#define __LC_MESSAGES		 5
-#define __LC_ALL		 6
-#define __LC_PAPER		 7
-#define __LC_NAME		 8
-#define __LC_ADDRESS		 9
-#define __LC_TELEPHONE		10
-#define __LC_MEASUREMENT	11
-#define __LC_IDENTIFICATION	12
-
-#endif	/* bits/locale.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/math-finite.h b/openflow/usr/include/arm-linux-gnueabihf/bits/math-finite.h
deleted file mode 100644
index adaad0e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/math-finite.h
+++ /dev/null
@@ -1,506 +0,0 @@
-/* Entry points to finite-math-only compiler runs.
-   Copyright (C) 2011-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_H
-# error "Never use <bits/math-finite.h> directly; include <math.h> instead."
-#endif
-
-/* acos.  */
-extern double __REDIRECT_NTH (acos, (double), __acos_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (acosf, (float), __acosf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (acosl, (long double), __acos_finite);
-#  else
-extern long double __REDIRECT_NTH (acosl, (long double), __acosl_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
-/* acosh.  */
-extern double __REDIRECT_NTH (acosh, (double), __acosh_finite);
-#endif
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (acoshf, (float), __acoshf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (acoshl, (long double), __acosh_finite);
-#  else
-extern long double __REDIRECT_NTH (acoshl, (long double), __acoshl_finite);
-#  endif
-# endif
-#endif
-
-/* asin.  */
-extern double __REDIRECT_NTH (asin, (double), __asin_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (asinf, (float), __asinf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (asinl, (long double), __asin_finite);
-#  else
-extern long double __REDIRECT_NTH (asinl, (long double), __asinl_finite);
-#  endif
-# endif
-#endif
-
-/* atan2.  */
-extern double __REDIRECT_NTH (atan2, (double, double), __atan2_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (atan2f, (float, float), __atan2f_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (atan2l, (long double, long double),
-				   __atan2_finite);
-#  else
-extern long double __REDIRECT_NTH (atan2l, (long double, long double),
-				   __atan2l_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
-/* atanh.  */
-extern double __REDIRECT_NTH (atanh, (double), __atanh_finite);
-#endif
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (atanhf, (float), __atanhf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (atanhl, (long double), __atanh_finite);
-#  else
-extern long double __REDIRECT_NTH (atanhl, (long double), __atanhl_finite);
-#  endif
-# endif
-#endif
-
-/* cosh.  */
-extern double __REDIRECT_NTH (cosh, (double), __cosh_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (coshf, (float), __coshf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (coshl, (long double), __cosh_finite);
-#  else
-extern long double __REDIRECT_NTH (coshl, (long double), __coshl_finite);
-#  endif
-# endif
-#endif
-
-/* exp.  */
-extern double __REDIRECT_NTH (exp, (double), __exp_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (expf, (float), __expf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (expl, (long double), __exp_finite);
-#  else
-extern long double __REDIRECT_NTH (expl, (long double), __expl_finite);
-#  endif
-# endif
-#endif
-
-#ifdef __USE_GNU
-/* exp10.  */
-extern double __REDIRECT_NTH (exp10, (double), __exp10_finite);
-extern float __REDIRECT_NTH (exp10f, (float), __exp10f_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (exp10l, (long double), __exp10_finite);
-#  else
-extern long double __REDIRECT_NTH (exp10l, (long double), __exp10l_finite);
-#  endif
-# endif
-
-/* pow10.  */
-extern double __REDIRECT_NTH (pow10, (double), __exp10_finite);
-extern float __REDIRECT_NTH (pow10f, (float), __exp10f_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (pow10l, (long double), __exp10_finite);
-#  else
-extern long double __REDIRECT_NTH (pow10l, (long double), __exp10l_finite);
-#  endif
-# endif
-#endif
-
-#ifdef __USE_ISOC99
-/* exp2.  */
-extern double __REDIRECT_NTH (exp2, (double), __exp2_finite);
-extern float __REDIRECT_NTH (exp2f, (float), __exp2f_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (exp2l, (long double), __exp2_finite);
-#  else
-extern long double __REDIRECT_NTH (exp2l, (long double), __exp2l_finite);
-#  endif
-# endif
-#endif
-
-/* fmod.  */
-extern double __REDIRECT_NTH (fmod, (double, double), __fmod_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (fmodf, (float, float), __fmodf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (fmodl, (long double, long double),
-				   __fmod_finite);
-#  else
-extern long double __REDIRECT_NTH (fmodl, (long double, long double),
-				   __fmodl_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_XOPEN || defined __USE_ISOC99
-/* hypot.  */
-extern double __REDIRECT_NTH (hypot, (double, double), __hypot_finite);
-#endif
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (hypotf, (float, float), __hypotf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (hypotl, (long double, long double),
-				   __hypot_finite);
-#  else
-extern long double __REDIRECT_NTH (hypotl, (long double, long double),
-				   __hypotl_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* j0.  */
-extern double __REDIRECT_NTH (j0, (double), __j0_finite);
-#endif
-#if defined __USE_MISC && defined __USE_ISOC99
-extern float __REDIRECT_NTH (j0f, (float), __j0f_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (j0l, (long double), __j0_finite);
-#  else
-extern long double __REDIRECT_NTH (j0l, (long double), __j0l_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* y0.  */
-extern double __REDIRECT_NTH (y0, (double), __y0_finite);
-#endif
-#if defined __USE_MISC && defined __USE_ISOC99
-extern float __REDIRECT_NTH (y0f, (float), __y0f_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (y0l, (long double), __y0_finite);
-#  else
-extern long double __REDIRECT_NTH (y0l, (long double), __y0l_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* j1.  */
-extern double __REDIRECT_NTH (j1, (double), __j1_finite);
-#endif
-#if defined __USE_MISC && defined __USE_ISOC99
-extern float __REDIRECT_NTH (j1f, (float), __j1f_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (j1l, (long double), __j1_finite);
-#  else
-extern long double __REDIRECT_NTH (j1l, (long double), __j1l_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* y1.  */
-extern double __REDIRECT_NTH (y1, (double), __y1_finite);
-#endif
-#if defined __USE_MISC && defined __USE_ISOC99
-extern float __REDIRECT_NTH (y1f, (float), __y1f_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (y1l, (long double), __y1_finite);
-#  else
-extern long double __REDIRECT_NTH (y1l, (long double), __y1l_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* jn.  */
-extern double __REDIRECT_NTH (jn, (int, double), __jn_finite);
-#endif
-#if defined __USE_MISC && defined __USE_ISOC99
-extern float __REDIRECT_NTH (jnf, (int, float), __jnf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (jnl, (int, long double), __jn_finite);
-#  else
-extern long double __REDIRECT_NTH (jnl, (int, long double), __jnl_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* yn.  */
-extern double __REDIRECT_NTH (yn, (int, double), __yn_finite);
-#endif
-#if defined __USE_MISC && defined __USE_ISOC99
-extern float __REDIRECT_NTH (ynf, (int, float), __ynf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (ynl, (int, long double), __yn_finite);
-#  else
-extern long double __REDIRECT_NTH (ynl, (int, long double), __ynl_finite);
-#  endif
-# endif
-#endif
-
-#ifdef __USE_MISC
-/* lgamma_r.  */
-extern double __REDIRECT_NTH (lgamma_r, (double, int *), __lgamma_r_finite);
-# ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (lgammaf_r, (float, int *), __lgammaf_r_finite);
-#  ifdef __MATH_DECLARE_LDOUBLE
-#   ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (lgammal_r, (long double, int *),
-				   __lgamma_r_finite);
-#   else
-extern long double __REDIRECT_NTH (lgammal_r, (long double, int *),
-				   __lgammal_r_finite);
-#   endif
-#  endif
-# endif
-#endif
-
-extern double __lgamma_r_finite (double, int *);
-extern float __lgammaf_r_finite (float, int *);
-#ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (__lgammal_r_finite, (long double, int *),
-				   __lgamma_r_finite);
-#else
-extern long double __lgammal_r_finite (long double, int *);
-#endif
-
-#if ((defined __USE_XOPEN || defined __USE_ISOC99) \
-     && defined __extern_always_inline)
-/* lgamma.  */
-__extern_always_inline double __NTH (lgamma (double __d))
-{
-# if defined __USE_MISC || defined __USE_XOPEN
-  return __lgamma_r_finite (__d, &signgam);
-# else
-  int __local_signgam = 0;
-  return __lgamma_r_finite (__d, &__local_signgam);
-# endif
-}
-#endif
-#if defined __USE_ISOC99 && defined __extern_always_inline
-__extern_always_inline float __NTH (lgammaf (float __d))
-{
-# if defined __USE_MISC || defined __USE_XOPEN
-  return __lgammaf_r_finite (__d, &signgam);
-# else
-  int __local_signgam = 0;
-  return __lgammaf_r_finite (__d, &__local_signgam);
-# endif
-}
-# ifdef __MATH_DECLARE_LDOUBLE
-__extern_always_inline long double __NTH (lgammal (long double __d))
-{
-# if defined __USE_MISC || defined __USE_XOPEN
-  return __lgammal_r_finite (__d, &signgam);
-# else
-  int __local_signgam = 0;
-  return __lgammal_r_finite (__d, &__local_signgam);
-# endif
-}
-# endif
-#endif
-
-#if ((defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)) \
-     && defined __extern_always_inline)
-/* gamma.  */
-__extern_always_inline double __NTH (gamma (double __d))
-{
-  return __lgamma_r_finite (__d, &signgam);
-}
-# ifdef __USE_ISOC99
-__extern_always_inline float __NTH (gammaf (float __d))
-{
-  return __lgammaf_r_finite (__d, &signgam);
-}
-#  ifdef __MATH_DECLARE_LDOUBLE
-__extern_always_inline long double __NTH (gammal (long double __d))
-{
-  return __lgammal_r_finite (__d, &signgam);
-}
-#  endif
-# endif
-#endif
-
-/* log.  */
-extern double __REDIRECT_NTH (log, (double), __log_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (logf, (float), __logf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (logl, (long double), __log_finite);
-#  else
-extern long double __REDIRECT_NTH (logl, (long double), __logl_finite);
-#  endif
-# endif
-#endif
-
-/* log10.  */
-extern double __REDIRECT_NTH (log10, (double), __log10_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (log10f, (float), __log10f_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (log10l, (long double), __log10_finite);
-#  else
-extern long double __REDIRECT_NTH (log10l, (long double), __log10l_finite);
-#  endif
-# endif
-#endif
-
-#ifdef __USE_ISOC99
-/* log2.  */
-extern double __REDIRECT_NTH (log2, (double), __log2_finite);
-extern float __REDIRECT_NTH (log2f, (float), __log2f_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (log2l, (long double), __log2_finite);
-#  else
-extern long double __REDIRECT_NTH (log2l, (long double), __log2l_finite);
-#  endif
-# endif
-#endif
-
-/* pow.  */
-extern double __REDIRECT_NTH (pow, (double, double), __pow_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (powf, (float, float), __powf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (powl, (long double, long double),
-				   __pow_finite);
-#  else
-extern long double __REDIRECT_NTH (powl, (long double, long double),
-				   __powl_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
-/* remainder.  */
-extern double __REDIRECT_NTH (remainder, (double, double), __remainder_finite);
-#endif
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (remainderf, (float, float), __remainderf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (remainderl, (long double, long double),
-				   __remainder_finite);
-#  else
-extern long double __REDIRECT_NTH (remainderl, (long double, long double),
-				   __remainderl_finite);
-#  endif
-# endif
-#endif
-
-#if (defined __USE_MISC							\
-     || (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8))
-/* scalb.  */
-extern double __REDIRECT_NTH (scalb, (double, double), __scalb_finite);
-#endif
-#if defined __USE_MISC && defined __USE_ISOC99
-extern float __REDIRECT_NTH (scalbf, (float, float), __scalbf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (scalbl, (long double, long double),
-				   __scalb_finite);
-#  else
-extern long double __REDIRECT_NTH (scalbl, (long double, long double),
-				   __scalbl_finite);
-#  endif
-# endif
-#endif
-
-/* sinh.  */
-extern double __REDIRECT_NTH (sinh, (double), __sinh_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (sinhf, (float), __sinhf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (sinhl, (long double), __sinh_finite);
-#  else
-extern long double __REDIRECT_NTH (sinhl, (long double), __sinhl_finite);
-#  endif
-# endif
-#endif
-
-/* sqrt.  */
-extern double __REDIRECT_NTH (sqrt, (double), __sqrt_finite);
-#ifdef __USE_ISOC99
-extern float __REDIRECT_NTH (sqrtf, (float), __sqrtf_finite);
-# ifdef __MATH_DECLARE_LDOUBLE
-#  ifdef __NO_LONG_DOUBLE_MATH
-extern long double __REDIRECT_NTH (sqrtl, (long double), __sqrt_finite);
-#  else
-extern long double __REDIRECT_NTH (sqrtl, (long double), __sqrtl_finite);
-#  endif
-# endif
-#endif
-
-#if defined __USE_ISOC99 && defined __extern_always_inline
-/* tgamma.  */
-extern double __gamma_r_finite (double, int *);
-__extern_always_inline double __NTH (tgamma (double __d))
-{
-  int __local_signgam = 0;
-  double __res = __gamma_r_finite (__d, &__local_signgam);
-  return __local_signgam < 0 ? -__res : __res;
-}
-extern float __gammaf_r_finite (float, int *);
-__extern_always_inline float __NTH (tgammaf (float __d))
-{
-  int __local_signgam = 0;
-  float __res = __gammaf_r_finite (__d, &__local_signgam);
-  return __local_signgam < 0 ? -__res : __res;
-}
-# ifdef __MATH_DECLARE_LDOUBLE
-extern long double __gammal_r_finite (long double, int *);
-__extern_always_inline long double __NTH (tgammal (long double __d))
-{
-  int __local_signgam = 0;
-#  ifdef __NO_LONG_DOUBLE_MATH
-  long double __res = __gamma_r_finite (__d, &__local_signgam);
-#  else
-  long double __res = __gammal_r_finite (__d, &__local_signgam);
-#  endif
-  return __local_signgam < 0 ? -__res : __res;
-}
-# endif
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/math-vector.h b/openflow/usr/include/arm-linux-gnueabihf/bits/math-vector.h
deleted file mode 100644
index 975724a..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/math-vector.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Platform-specific SIMD declarations of math functions.
-   Copyright (C) 2014-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License  published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_H
-# error "Never include <bits/math-vector.h> directly;\
- include <math.h> instead."
-#endif
-
-/* Get default empty definitions required for __MATHCALL_VEC unfolding.
-   Plaform-specific analogue of this header should redefine them with specific
-   SIMD declarations.  */
-#include <bits/libm-simd-decl-stubs.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/mathcalls.h b/openflow/usr/include/arm-linux-gnueabihf/bits/mathcalls.h
deleted file mode 100644
index 9a7b3f0..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/mathcalls.h
+++ /dev/null
@@ -1,384 +0,0 @@
-/* Prototype declarations for math functions; helper file for <math.h>.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* NOTE: Because of the special way this file is used by <math.h>, this
-   file must NOT be protected from multiple inclusion as header files
-   usually are.
-
-   This file provides prototype declarations for the math functions.
-   Most functions are declared using the macro:
-
-   __MATHCALL (NAME,[_r], (ARGS...));
-
-   This means there is a function `NAME' returning `double' and a function
-   `NAMEf' returning `float'.  Each place `_Mdouble_' appears in the
-   prototype, that is actually `double' in the prototype for `NAME' and
-   `float' in the prototype for `NAMEf'.  Reentrant variant functions are
-   called `NAME_r' and `NAMEf_r'.
-
-   Functions returning other types like `int' are declared using the macro:
-
-   __MATHDECL (TYPE, NAME,[_r], (ARGS...));
-
-   This is just like __MATHCALL but for a function returning `TYPE'
-   instead of `_Mdouble_'.  In all of these cases, there is still
-   both a `NAME' and a `NAMEf' that takes `float' arguments.
-
-   Note that there must be no whitespace before the argument passed for
-   NAME, to make token pasting work with -traditional.  */
-
-#ifndef _MATH_H
-# error "Never include <bits/mathcalls.h> directly; include <math.h> instead."
-#endif
-
-
-/* Trigonometric functions.  */
-
-_Mdouble_BEGIN_NAMESPACE
-/* Arc cosine of X.  */
-__MATHCALL (acos,, (_Mdouble_ __x));
-/* Arc sine of X.  */
-__MATHCALL (asin,, (_Mdouble_ __x));
-/* Arc tangent of X.  */
-__MATHCALL (atan,, (_Mdouble_ __x));
-/* Arc tangent of Y/X.  */
-__MATHCALL (atan2,, (_Mdouble_ __y, _Mdouble_ __x));
-
-/* Cosine of X.  */
-__MATHCALL_VEC (cos,, (_Mdouble_ __x));
-/* Sine of X.  */
-__MATHCALL_VEC (sin,, (_Mdouble_ __x));
-/* Tangent of X.  */
-__MATHCALL (tan,, (_Mdouble_ __x));
-
-/* Hyperbolic functions.  */
-
-/* Hyperbolic cosine of X.  */
-__MATHCALL (cosh,, (_Mdouble_ __x));
-/* Hyperbolic sine of X.  */
-__MATHCALL (sinh,, (_Mdouble_ __x));
-/* Hyperbolic tangent of X.  */
-__MATHCALL (tanh,, (_Mdouble_ __x));
-_Mdouble_END_NAMESPACE
-
-#ifdef __USE_GNU
-/* Cosine and sine of X.  */
-__MATHDECL_VEC (void,sincos,,
-		(_Mdouble_ __x, _Mdouble_ *__sinx, _Mdouble_ *__cosx));
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Hyperbolic arc cosine of X.  */
-__MATHCALL (acosh,, (_Mdouble_ __x));
-/* Hyperbolic arc sine of X.  */
-__MATHCALL (asinh,, (_Mdouble_ __x));
-/* Hyperbolic arc tangent of X.  */
-__MATHCALL (atanh,, (_Mdouble_ __x));
-__END_NAMESPACE_C99
-#endif
-
-/* Exponential and logarithmic functions.  */
-
-_Mdouble_BEGIN_NAMESPACE
-/* Exponential function of X.  */
-__MATHCALL_VEC (exp,, (_Mdouble_ __x));
-
-/* Break VALUE into a normalized fraction and an integral power of 2.  */
-__MATHCALL (frexp,, (_Mdouble_ __x, int *__exponent));
-
-/* X times (two to the EXP power).  */
-__MATHCALL (ldexp,, (_Mdouble_ __x, int __exponent));
-
-/* Natural logarithm of X.  */
-__MATHCALL_VEC (log,, (_Mdouble_ __x));
-
-/* Base-ten logarithm of X.  */
-__MATHCALL (log10,, (_Mdouble_ __x));
-
-/* Break VALUE into integral and fractional parts.  */
-__MATHCALL (modf,, (_Mdouble_ __x, _Mdouble_ *__iptr)) __nonnull ((2));
-_Mdouble_END_NAMESPACE
-
-#ifdef __USE_GNU
-/* A function missing in all standards: compute exponent to base ten.  */
-__MATHCALL (exp10,, (_Mdouble_ __x));
-/* Another name occasionally used.  */
-__MATHCALL (pow10,, (_Mdouble_ __x));
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Return exp(X) - 1.  */
-__MATHCALL (expm1,, (_Mdouble_ __x));
-
-/* Return log(1 + X).  */
-__MATHCALL (log1p,, (_Mdouble_ __x));
-
-/* Return the base 2 signed integral exponent of X.  */
-__MATHCALL (logb,, (_Mdouble_ __x));
-__END_NAMESPACE_C99
-#endif
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Compute base-2 exponential of X.  */
-__MATHCALL (exp2,, (_Mdouble_ __x));
-
-/* Compute base-2 logarithm of X.  */
-__MATHCALL (log2,, (_Mdouble_ __x));
-__END_NAMESPACE_C99
-#endif
-
-
-/* Power functions.  */
-
-_Mdouble_BEGIN_NAMESPACE
-/* Return X to the Y power.  */
-__MATHCALL_VEC (pow,, (_Mdouble_ __x, _Mdouble_ __y));
-
-/* Return the square root of X.  */
-__MATHCALL (sqrt,, (_Mdouble_ __x));
-_Mdouble_END_NAMESPACE
-
-#if defined __USE_XOPEN || defined __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Return `sqrt(X*X + Y*Y)'.  */
-__MATHCALL (hypot,, (_Mdouble_ __x, _Mdouble_ __y));
-__END_NAMESPACE_C99
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Return the cube root of X.  */
-__MATHCALL (cbrt,, (_Mdouble_ __x));
-__END_NAMESPACE_C99
-#endif
-
-
-/* Nearest integer, absolute value, and remainder functions.  */
-
-_Mdouble_BEGIN_NAMESPACE
-/* Smallest integral value not less than X.  */
-__MATHCALLX (ceil,, (_Mdouble_ __x), (__const__));
-
-/* Absolute value of X.  */
-__MATHCALLX (fabs,, (_Mdouble_ __x), (__const__));
-
-/* Largest integer not greater than X.  */
-__MATHCALLX (floor,, (_Mdouble_ __x), (__const__));
-
-/* Floating-point modulo remainder of X/Y.  */
-__MATHCALL (fmod,, (_Mdouble_ __x, _Mdouble_ __y));
-
-
-/* Return 0 if VALUE is finite or NaN, +1 if it
-   is +Infinity, -1 if it is -Infinity.  */
-__MATHDECL_1 (int,__isinf,, (_Mdouble_ __value)) __attribute__ ((__const__));
-
-/* Return nonzero if VALUE is finite and not NaN.  */
-__MATHDECL_1 (int,__finite,, (_Mdouble_ __value)) __attribute__ ((__const__));
-_Mdouble_END_NAMESPACE
-
-#ifdef __USE_MISC
-# if (!defined __cplusplus \
-      || __cplusplus < 201103L /* isinf conflicts with C++11.  */ \
-      || __MATH_DECLARING_DOUBLE == 0) /* isinff or isinfl don't.  */
-/* Return 0 if VALUE is finite or NaN, +1 if it
-   is +Infinity, -1 if it is -Infinity.  */
-__MATHDECL_1 (int,isinf,, (_Mdouble_ __value)) __attribute__ ((__const__));
-# endif
-
-/* Return nonzero if VALUE is finite and not NaN.  */
-__MATHDECL_1 (int,finite,, (_Mdouble_ __value)) __attribute__ ((__const__));
-
-/* Return the remainder of X/Y.  */
-__MATHCALL (drem,, (_Mdouble_ __x, _Mdouble_ __y));
-
-
-/* Return the fractional part of X after dividing out `ilogb (X)'.  */
-__MATHCALL (significand,, (_Mdouble_ __x));
-#endif /* Use misc.  */
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Return X with its signed changed to Y's.  */
-__MATHCALLX (copysign,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
-__END_NAMESPACE_C99
-#endif
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Return representation of qNaN for double type.  */
-__MATHCALLX (nan,, (const char *__tagb), (__const__));
-__END_NAMESPACE_C99
-#endif
-
-
-/* Return nonzero if VALUE is not a number.  */
-__MATHDECL_1 (int,__isnan,, (_Mdouble_ __value)) __attribute__ ((__const__));
-
-#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
-# if (!defined __cplusplus \
-      || __cplusplus < 201103L /* isnan conflicts with C++11.  */ \
-      || __MATH_DECLARING_DOUBLE == 0) /* isnanf or isnanl don't.  */
-/* Return nonzero if VALUE is not a number.  */
-__MATHDECL_1 (int,isnan,, (_Mdouble_ __value)) __attribute__ ((__const__));
-# endif
-#endif
-
-#if defined __USE_MISC || (defined __USE_XOPEN && __MATH_DECLARING_DOUBLE)
-/* Bessel functions.  */
-__MATHCALL (j0,, (_Mdouble_));
-__MATHCALL (j1,, (_Mdouble_));
-__MATHCALL (jn,, (int, _Mdouble_));
-__MATHCALL (y0,, (_Mdouble_));
-__MATHCALL (y1,, (_Mdouble_));
-__MATHCALL (yn,, (int, _Mdouble_));
-#endif
-
-
-#if defined __USE_XOPEN || defined __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Error and gamma functions.  */
-__MATHCALL (erf,, (_Mdouble_));
-__MATHCALL (erfc,, (_Mdouble_));
-__MATHCALL (lgamma,, (_Mdouble_));
-__END_NAMESPACE_C99
-#endif
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* True gamma function.  */
-__MATHCALL (tgamma,, (_Mdouble_));
-__END_NAMESPACE_C99
-#endif
-
-#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
-/* Obsolete alias for `lgamma'.  */
-__MATHCALL (gamma,, (_Mdouble_));
-#endif
-
-#ifdef __USE_MISC
-/* Reentrant version of lgamma.  This function uses the global variable
-   `signgam'.  The reentrant version instead takes a pointer and stores
-   the value through it.  */
-__MATHCALL (lgamma,_r, (_Mdouble_, int *__signgamp));
-#endif
-
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Return the integer nearest X in the direction of the
-   prevailing rounding mode.  */
-__MATHCALL (rint,, (_Mdouble_ __x));
-
-/* Return X + epsilon if X < Y, X - epsilon if X > Y.  */
-__MATHCALLX (nextafter,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
-# if defined __USE_ISOC99 && !defined __LDBL_COMPAT
-__MATHCALLX (nexttoward,, (_Mdouble_ __x, long double __y), (__const__));
-# endif
-
-/* Return the remainder of integer divison X / Y with infinite precision.  */
-__MATHCALL (remainder,, (_Mdouble_ __x, _Mdouble_ __y));
-
-# ifdef __USE_ISOC99
-/* Return X times (2 to the Nth power).  */
-__MATHCALL (scalbn,, (_Mdouble_ __x, int __n));
-# endif
-
-/* Return the binary exponent of X, which must be nonzero.  */
-__MATHDECL (int,ilogb,, (_Mdouble_ __x));
-#endif
-
-#ifdef __USE_ISOC99
-/* Return X times (2 to the Nth power).  */
-__MATHCALL (scalbln,, (_Mdouble_ __x, long int __n));
-
-/* Round X to integral value in floating-point format using current
-   rounding direction, but do not raise inexact exception.  */
-__MATHCALL (nearbyint,, (_Mdouble_ __x));
-
-/* Round X to nearest integral value, rounding halfway cases away from
-   zero.  */
-__MATHCALLX (round,, (_Mdouble_ __x), (__const__));
-
-/* Round X to the integral value in floating-point format nearest but
-   not larger in magnitude.  */
-__MATHCALLX (trunc,, (_Mdouble_ __x), (__const__));
-
-/* Compute remainder of X and Y and put in *QUO a value with sign of x/y
-   and magnitude congruent `mod 2^n' to the magnitude of the integral
-   quotient x/y, with n >= 3.  */
-__MATHCALL (remquo,, (_Mdouble_ __x, _Mdouble_ __y, int *__quo));
-
-
-/* Conversion functions.  */
-
-/* Round X to nearest integral value according to current rounding
-   direction.  */
-__MATHDECL (long int,lrint,, (_Mdouble_ __x));
-__extension__
-__MATHDECL (long long int,llrint,, (_Mdouble_ __x));
-
-/* Round X to nearest integral value, rounding halfway cases away from
-   zero.  */
-__MATHDECL (long int,lround,, (_Mdouble_ __x));
-__extension__
-__MATHDECL (long long int,llround,, (_Mdouble_ __x));
-
-
-/* Return positive difference between X and Y.  */
-__MATHCALL (fdim,, (_Mdouble_ __x, _Mdouble_ __y));
-
-/* Return maximum numeric value from X and Y.  */
-__MATHCALLX (fmax,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
-
-/* Return minimum numeric value from X and Y.  */
-__MATHCALLX (fmin,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
-
-
-/* Classify given number.  */
-__MATHDECL_1 (int, __fpclassify,, (_Mdouble_ __value))
-     __attribute__ ((__const__));
-
-/* Test for negative number.  */
-__MATHDECL_1 (int, __signbit,, (_Mdouble_ __value))
-     __attribute__ ((__const__));
-
-
-/* Multiply-add function computed as a ternary operation.  */
-__MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
-#endif /* Use ISO C99.  */
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
-__END_NAMESPACE_C99
-#endif
-
-#ifdef __USE_GNU
-/* Test for signaling NaN.  */
-__MATHDECL_1 (int, __issignaling,, (_Mdouble_ __value))
-     __attribute__ ((__const__));
-#endif
-
-#if defined __USE_MISC || (defined __USE_XOPEN_EXTENDED \
-			   && __MATH_DECLARING_DOUBLE	\
-			   && !defined __USE_XOPEN2K8)
-/* Return X times (2 to the Nth power).  */
-__MATHCALL (scalb,, (_Mdouble_ __x, _Mdouble_ __n));
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/mathdef.h b/openflow/usr/include/arm-linux-gnueabihf/bits/mathdef.h
deleted file mode 100644
index ae0bcb7..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/mathdef.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (C) 1999-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _MATH_H && !defined _COMPLEX_H
-# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
-#endif
-
-#if defined  __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF
-# define _MATH_H_MATHDEF	1
-
-/* GCC does not promote `float' values to `double'.  */
-typedef float float_t;		/* `float' expressions are evaluated as
-				   `float'.  */
-typedef double double_t;	/* `double' expressions are evaluated as
-				   `double'.  */
-
-/* The values returned by `ilogb' for 0 and NaN respectively.  */
-# define FP_ILOGB0	(-2147483647)
-# define FP_ILOGBNAN	(2147483647)
-
-/* The GCC 4.6 compiler will define __FP_FAST_FMA{,F,L} if the fma{,f,l}
-   builtins are supported.  */
-# ifdef __FP_FAST_FMA
-#  define FP_FAST_FMA 1
-# endif
-
-# ifdef __FP_FAST_FMAF
-#  define FP_FAST_FMAF 1
-# endif
-
-# ifdef __FP_FAST_FMAL
-#  define FP_FAST_FMAL 1
-# endif
-
-#endif	/* ISO C99 */
-
-#ifndef __NO_LONG_DOUBLE_MATH
-/* Signal that we do not really have a `long double'.  This disables the
-   declaration of all the `long double' function variants.  */
-# define __NO_LONG_DOUBLE_MATH	1
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/mathinline.h b/openflow/usr/include/arm-linux-gnueabihf/bits/mathinline.h
deleted file mode 100644
index 02ec21b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/mathinline.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* This file should provide inline versions of math functions.
-
-   Surround GCC-specific parts with #ifdef __GNUC__, and use `__extern_inline'.
-
-   This file should define __MATH_INLINES if functions are actually defined as
-   inlines.  */
-
-#if !defined __NO_MATH_INLINES && defined __OPTIMIZE__
-
-/* Here goes the real code.  */
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/mman-linux.h b/openflow/usr/include/arm-linux-gnueabihf/bits/mman-linux.h
deleted file mode 100644
index dbb994b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/mman-linux.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Definitions for POSIX memory map interface.  Linux generic version.
-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_MMAN_H
-# error "Never use <bits/mman-linux.h> directly; include <sys/mman.h> instead."
-#endif
-
-/* The following definitions basically come from the kernel headers.
-   But the kernel header is not namespace clean.
-
-   This file is also used by some non-Linux configurations of the
-   GNU C Library, for other systems that use these same bit values.  */
-
-
-/* Protections are chosen from these bits, OR'd together.  The
-   implementation does not necessarily support PROT_EXEC or PROT_WRITE
-   without PROT_READ.  The only guarantees are that no writing will be
-   allowed without PROT_WRITE and no access will be allowed for PROT_NONE. */
-
-#define PROT_READ	0x1		/* Page can be read.  */
-#define PROT_WRITE	0x2		/* Page can be written.  */
-#define PROT_EXEC	0x4		/* Page can be executed.  */
-#define PROT_NONE	0x0		/* Page can not be accessed.  */
-#define PROT_GROWSDOWN	0x01000000	/* Extend change to start of
-					   growsdown vma (mprotect only).  */
-#define PROT_GROWSUP	0x02000000	/* Extend change to start of
-					   growsup vma (mprotect only).  */
-
-/* Sharing types (must choose one and only one of these).  */
-#define MAP_SHARED	0x01		/* Share changes.  */
-#define MAP_PRIVATE	0x02		/* Changes are private.  */
-#ifdef __USE_MISC
-# define MAP_TYPE	0x0f		/* Mask for type of mapping.  */
-#endif
-
-/* Other flags.  */
-#define MAP_FIXED	0x10		/* Interpret addr exactly.  */
-#ifdef __USE_MISC
-# define MAP_FILE	0
-# ifdef __MAP_ANONYMOUS
-#  define MAP_ANONYMOUS	__MAP_ANONYMOUS	/* Don't use a file.  */
-# else
-#  define MAP_ANONYMOUS	0x20		/* Don't use a file.  */
-# endif
-# define MAP_ANON	MAP_ANONYMOUS
-/* When MAP_HUGETLB is set bits [26:31] encode the log2 of the huge page size.  */
-# define MAP_HUGE_SHIFT	26
-# define MAP_HUGE_MASK	0x3f
-#endif
-
-/* Flags to `msync'.  */
-#define MS_ASYNC	1		/* Sync memory asynchronously.  */
-#define MS_SYNC		4		/* Synchronous memory sync.  */
-#define MS_INVALIDATE	2		/* Invalidate the caches.  */
-
-/* Flags for `mremap'.  */
-#ifdef __USE_GNU
-# define MREMAP_MAYMOVE	1
-# define MREMAP_FIXED	2
-#endif
-
-/* Advice to `madvise'.  */
-#ifdef __USE_MISC
-# define MADV_NORMAL	  0	/* No further special treatment.  */
-# define MADV_RANDOM	  1	/* Expect random page references.  */
-# define MADV_SEQUENTIAL  2	/* Expect sequential page references.  */
-# define MADV_WILLNEED	  3	/* Will need these pages.  */
-# define MADV_DONTNEED	  4	/* Don't need these pages.  */
-# define MADV_REMOVE	  9	/* Remove these pages and resources.  */
-# define MADV_DONTFORK	  10	/* Do not inherit across fork.  */
-# define MADV_DOFORK	  11	/* Do inherit across fork.  */
-# define MADV_MERGEABLE	  12	/* KSM may merge identical pages.  */
-# define MADV_UNMERGEABLE 13	/* KSM may not merge identical pages.  */
-# define MADV_HUGEPAGE	  14	/* Worth backing with hugepages.  */
-# define MADV_NOHUGEPAGE  15	/* Not worth backing with hugepages.  */
-# define MADV_DONTDUMP	  16    /* Explicity exclude from the core dump,
-                                   overrides the coredump filter bits.  */
-# define MADV_DODUMP	  17	/* Clear the MADV_DONTDUMP flag.  */
-# define MADV_HWPOISON	  100	/* Poison a page for testing.  */
-#endif
-
-/* The POSIX people had to invent similar names for the same things.  */
-#ifdef __USE_XOPEN2K
-# define POSIX_MADV_NORMAL	0 /* No further special treatment.  */
-# define POSIX_MADV_RANDOM	1 /* Expect random page references.  */
-# define POSIX_MADV_SEQUENTIAL	2 /* Expect sequential page references.  */
-# define POSIX_MADV_WILLNEED	3 /* Will need these pages.  */
-# define POSIX_MADV_DONTNEED	4 /* Don't need these pages.  */
-#endif
-
-/* Flags for `mlockall'.  */
-#ifndef MCL_CURRENT
-# define MCL_CURRENT	1		/* Lock all currently mapped pages.  */
-# define MCL_FUTURE	2		/* Lock all additions to address
-					   space.  */
-# define MCL_ONFAULT	4		/* Lock all pages that are
-					   faulted in.  */
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/mman.h b/openflow/usr/include/arm-linux-gnueabihf/bits/mman.h
deleted file mode 100644
index 8062651..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/mman.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Definitions for POSIX memory map interface.  Linux/ARM version.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_MMAN_H
-# error "Never use <bits/mman.h> directly; include <sys/mman.h> instead."
-#endif
-
-/* The following definitions basically come from the kernel headers.
-   But the kernel header is not namespace clean.  */
-
-/* These are Linux-specific.  */
-#ifdef __USE_MISC
-# define MAP_GROWSDOWN	0x00100		/* Stack-like segment.  */
-# define MAP_DENYWRITE	0x00800		/* ETXTBSY */
-# define MAP_EXECUTABLE	0x01000		/* Mark it as an executable.  */
-# define MAP_LOCKED	0x02000		/* Lock the mapping.  */
-# define MAP_NORESERVE	0x04000		/* Don't check for reservations.  */
-# define MAP_POPULATE	0x08000		/* Populate (prefault) pagetables.  */
-# define MAP_NONBLOCK	0x10000		/* Do not block on IO.  */
-# define MAP_STACK	0x20000		/* Allocation is for a stack.  */
-# define MAP_HUGETLB	0x40000		/* Create huge page mapping.  */
-#endif
-
-/* Include generic Linux declarations.  */
-#include <bits/mman-linux.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/monetary-ldbl.h b/openflow/usr/include/arm-linux-gnueabihf/bits/monetary-ldbl.h
deleted file mode 100644
index 3718d10..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/monetary-ldbl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -mlong-double-64 compatibility mode for monetary functions.
-   Copyright (C) 2006-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MONETARY_H
-# error "Never include <bits/monetary-ldbl.h> directly; use <monetary.h> instead."
-#endif
-
-__LDBL_REDIR_DECL (strfmon)
-
-#ifdef __USE_GNU
-__LDBL_REDIR_DECL (strfmon_l)
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/mqueue.h b/openflow/usr/include/arm-linux-gnueabihf/bits/mqueue.h
deleted file mode 100644
index abe7b64..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/mqueue.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2004-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MQUEUE_H
-# error "Never use <bits/mqueue.h> directly; include <mqueue.h> instead."
-#endif
-
-#include <bits/types.h>
-
-typedef int mqd_t;
-
-struct mq_attr
-{
-  __syscall_slong_t mq_flags;	/* Message queue flags.  */
-  __syscall_slong_t mq_maxmsg;	/* Maximum number of messages.  */
-  __syscall_slong_t mq_msgsize;	/* Maximum message size.  */
-  __syscall_slong_t mq_curmsgs;	/* Number of messages currently queued.  */
-  __syscall_slong_t __pad[4];
-};
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/mqueue2.h b/openflow/usr/include/arm-linux-gnueabihf/bits/mqueue2.h
deleted file mode 100644
index 712c8e2..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/mqueue2.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Checking macros for mq functions.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_FCNTL_H
-# error "Never include <bits/mqueue2.h> directly; use <mqueue.h> instead."
-#endif
-
-/* Check that calls to mq_open with O_CREAT set have an appropriate third and fourth
-   parameter.  */
-extern mqd_t mq_open (const char *__name, int __oflag, ...)
-     __THROW __nonnull ((1));
-extern mqd_t __mq_open_2 (const char *__name, int __oflag)
-     __THROW __nonnull ((1));
-extern mqd_t __REDIRECT_NTH (__mq_open_alias, (const char *__name,
-					       int __oflag, ...), mq_open)
-     __nonnull ((1));
-__errordecl (__mq_open_wrong_number_of_args,
-	     "mq_open can be called either with 2 or 4 arguments");
-__errordecl (__mq_open_missing_mode_and_attr,
-	     "mq_open with O_CREAT in second argument needs 4 arguments");
-
-__fortify_function mqd_t
-__NTH (mq_open (const char *__name, int __oflag, ...))
-{
-  if (__va_arg_pack_len () != 0 && __va_arg_pack_len () != 2)
-    __mq_open_wrong_number_of_args ();
-
-  if (__builtin_constant_p (__oflag))
-    {
-      if ((__oflag & O_CREAT) != 0 && __va_arg_pack_len () == 0)
-	{
-	  __mq_open_missing_mode_and_attr ();
-	  return __mq_open_2 (__name, __oflag);
-	}
-      return __mq_open_alias (__name, __oflag, __va_arg_pack ());
-    }
-
-  if (__va_arg_pack_len () == 0)
-    return __mq_open_2 (__name, __oflag);
-
-  return __mq_open_alias (__name, __oflag, __va_arg_pack ());
-}
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/msq.h b/openflow/usr/include/arm-linux-gnueabihf/bits/msq.h
deleted file mode 100644
index 6fe4e59..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/msq.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_MSG_H
-# error "Never use <bits/msq.h> directly; include <sys/msg.h> instead."
-#endif
-
-#include <bits/types.h>
-
-/* Define options for message queue functions.  */
-#define MSG_NOERROR	010000	/* no error if message is too big */
-#ifdef __USE_GNU
-# define MSG_EXCEPT	020000	/* recv any msg except of specified type */
-# define MSG_COPY	040000	/* copy (not remove) all queue messages */
-#endif
-
-/* Types used in the structure definition.  */
-typedef unsigned long int msgqnum_t;
-typedef unsigned long int msglen_t;
-
-
-/* Structure of record for one message inside the kernel.
-   The type `struct msg' is opaque.  */
-struct msqid_ds
-{
-  struct ipc_perm msg_perm;	/* structure describing operation permission */
-  __time_t msg_stime;		/* time of last msgsnd command */
-  unsigned long int __glibc_reserved1;
-  __time_t msg_rtime;		/* time of last msgrcv command */
-  unsigned long int __glibc_reserved2;
-  __time_t msg_ctime;		/* time of last change */
-  unsigned long int __glibc_reserved3;
-  unsigned long int __msg_cbytes; /* current number of bytes on queue */
-  msgqnum_t msg_qnum;		/* number of messages currently on queue */
-  msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
-  __pid_t msg_lspid;		/* pid of last msgsnd() */
-  __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __glibc_reserved4;
-  unsigned long int __glibc_reserved5;
-};
-
-#ifdef __USE_MISC
-
-# define msg_cbytes	__msg_cbytes
-
-/* ipcs ctl commands */
-# define MSG_STAT 11
-# define MSG_INFO 12
-
-/* buffer for msgctl calls IPC_INFO, MSG_INFO */
-struct msginfo
-  {
-    int msgpool;
-    int msgmap;
-    int msgmax;
-    int msgmnb;
-    int msgmni;
-    int msgssz;
-    int msgtql;
-    unsigned short int msgseg;
-  };
-
-#endif /* __USE_MISC */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/nan.h b/openflow/usr/include/arm-linux-gnueabihf/bits/nan.h
deleted file mode 100644
index b832724..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/nan.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* `NAN' constant for IEEE 754 machines.
-   Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_H
-# error "Never use <bits/nan.h> directly; include <math.h> instead."
-#endif
-
-
-/* IEEE Not A Number.  */
-
-#if __GNUC_PREREQ(3,3)
-
-# define NAN	(__builtin_nanf (""))
-
-#elif defined __GNUC__
-
-# define NAN \
-  (__extension__							      \
-   ((union { unsigned __l __attribute__ ((__mode__ (__SI__))); float __d; })  \
-    { __l: 0x7fc00000UL }).__d)
-
-#else
-
-# include <endian.h>
-
-# if __BYTE_ORDER == __BIG_ENDIAN
-#  define __qnan_bytes		{ 0x7f, 0xc0, 0, 0 }
-# endif
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define __qnan_bytes		{ 0, 0, 0xc0, 0x7f }
-# endif
-
-static union { unsigned char __c[4]; float __d; } __qnan_union
-  __attribute__ ((__unused__)) = { __qnan_bytes };
-# define NAN	(__qnan_union.__d)
-
-#endif	/* GCC.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/netdb.h b/openflow/usr/include/arm-linux-gnueabihf/bits/netdb.h
deleted file mode 100644
index 3cd0db3..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/netdb.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETDB_H
-# error "Never include <bits/netdb.h> directly; use <netdb.h> instead."
-#endif
-
-
-/* Description of data base entry for a single network.  NOTE: here a
-   poor assumption is made.  The network number is expected to fit
-   into an unsigned long int variable.  */
-struct netent
-{
-  char *n_name;			/* Official name of network.  */
-  char **n_aliases;		/* Alias list.  */
-  int n_addrtype;		/* Net address type.  */
-  uint32_t n_net;		/* Network number.  */
-};
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/param.h b/openflow/usr/include/arm-linux-gnueabihf/bits/param.h
deleted file mode 100644
index 45675d1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/param.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Old-style Unix parameters and limits.  Linux version.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_PARAM_H
-# error "Never use <bits/param.h> directly; include <sys/param.h> instead."
-#endif
-
-#ifndef ARG_MAX
-# define __undef_ARG_MAX
-#endif
-
-#include <linux/limits.h>
-#include <linux/param.h>
-
-/* The kernel headers define ARG_MAX.  The value is wrong, though.  */
-#ifdef __undef_ARG_MAX
-# undef ARG_MAX
-# undef __undef_ARG_MAX
-#endif
-
-#define	MAXSYMLINKS	20
-
-/* The following are not really correct but it is a value we used for a
-   long time and which seems to be usable.  People should not use NOFILE
-   and NCARGS anyway.  */
-#define NOFILE		256
-#define	NCARGS		131072
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/poll.h b/openflow/usr/include/arm-linux-gnueabihf/bits/poll.h
deleted file mode 100644
index a582118..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/poll.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_POLL_H
-# error "Never use <bits/poll.h> directly; include <sys/poll.h> instead."
-#endif
-
-/* Event types that can be polled for.  These bits may be set in `events'
-   to indicate the interesting event types; they will appear in `revents'
-   to indicate the status of the file descriptor.  */
-#define POLLIN		0x001		/* There is data to read.  */
-#define POLLPRI		0x002		/* There is urgent data to read.  */
-#define POLLOUT		0x004		/* Writing now will not block.  */
-
-#if defined __USE_XOPEN || defined __USE_XOPEN2K8
-/* These values are defined in XPG4.2.  */
-# define POLLRDNORM	0x040		/* Normal data may be read.  */
-# define POLLRDBAND	0x080		/* Priority data may be read.  */
-# define POLLWRNORM	0x100		/* Writing now will not block.  */
-# define POLLWRBAND	0x200		/* Priority data may be written.  */
-#endif
-
-#ifdef __USE_GNU
-/* These are extensions for Linux.  */
-# define POLLMSG	0x400
-# define POLLREMOVE	0x1000
-# define POLLRDHUP	0x2000
-#endif
-
-/* Event types always implicitly polled for.  These bits need not be set in
-   `events', but they will appear in `revents' to indicate the status of
-   the file descriptor.  */
-#define POLLERR		0x008		/* Error condition.  */
-#define POLLHUP		0x010		/* Hung up.  */
-#define POLLNVAL	0x020		/* Invalid polling request.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/poll2.h b/openflow/usr/include/arm-linux-gnueabihf/bits/poll2.h
deleted file mode 100644
index 137bfaf..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/poll2.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Checking macros for poll functions.
-   Copyright (C) 2012-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_POLL_H
-# error "Never include <bits/poll2.h> directly; use <sys/poll.h> instead."
-#endif
-
-
-__BEGIN_DECLS
-
-extern int __REDIRECT (__poll_alias, (struct pollfd *__fds, nfds_t __nfds,
-				      int __timeout), poll);
-extern int __poll_chk (struct pollfd *__fds, nfds_t __nfds, int __timeout,
-		       __SIZE_TYPE__ __fdslen);
-extern int __REDIRECT (__poll_chk_warn, (struct pollfd *__fds, nfds_t __nfds,
-					 int __timeout, __SIZE_TYPE__ __fdslen),
-		       __poll_chk)
-  __warnattr ("poll called with fds buffer too small file nfds entries");
-
-__fortify_function int
-poll (struct pollfd *__fds, nfds_t __nfds, int __timeout)
-{
-  if (__bos (__fds) != (__SIZE_TYPE__) -1)
-    {
-      if (! __builtin_constant_p (__nfds))
-	return __poll_chk (__fds, __nfds, __timeout, __bos (__fds));
-      else if (__bos (__fds) / sizeof (*__fds) < __nfds)
-	return __poll_chk_warn (__fds, __nfds, __timeout, __bos (__fds));
-    }
-
-  return __poll_alias (__fds, __nfds, __timeout);
-}
-
-
-#ifdef __USE_GNU
-extern int __REDIRECT (__ppoll_alias, (struct pollfd *__fds, nfds_t __nfds,
-				       const struct timespec *__timeout,
-				       const __sigset_t *__ss), ppoll);
-extern int __ppoll_chk (struct pollfd *__fds, nfds_t __nfds,
-			const struct timespec *__timeout,
-			const __sigset_t *__ss, __SIZE_TYPE__ __fdslen);
-extern int __REDIRECT (__ppoll_chk_warn, (struct pollfd *__fds, nfds_t __nfds,
-					  const struct timespec *__timeout,
-					  const __sigset_t *__ss,
-					  __SIZE_TYPE__ __fdslen),
-		       __ppoll_chk)
-  __warnattr ("ppoll called with fds buffer too small file nfds entries");
-
-__fortify_function int
-ppoll (struct pollfd *__fds, nfds_t __nfds, const struct timespec *__timeout,
-       const __sigset_t *__ss)
-{
-  if (__bos (__fds) != (__SIZE_TYPE__) -1)
-    {
-      if (! __builtin_constant_p (__nfds))
-	return __ppoll_chk (__fds, __nfds, __timeout, __ss, __bos (__fds));
-      else if (__bos (__fds) / sizeof (*__fds) < __nfds)
-	return __ppoll_chk_warn (__fds, __nfds, __timeout, __ss,
-				 __bos (__fds));
-    }
-
-  return __ppoll_alias (__fds, __nfds, __timeout, __ss);
-}
-#endif
-
-__END_DECLS
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/posix1_lim.h b/openflow/usr/include/arm-linux-gnueabihf/bits/posix1_lim.h
deleted file mode 100644
index b0a37bd..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/posix1_lim.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 2.9.2 Minimum Values	Added to <limits.h>
- *
- *	Never include this file directly; use <limits.h> instead.
- */
-
-#ifndef	_BITS_POSIX1_LIM_H
-#define	_BITS_POSIX1_LIM_H	1
-
-
-/* These are the standard-mandated minimum values.  */
-
-/* Minimum number of operations in one list I/O call.  */
-#define _POSIX_AIO_LISTIO_MAX	2
-
-/* Minimal number of outstanding asynchronous I/O operations.  */
-#define _POSIX_AIO_MAX		1
-
-/* Maximum length of arguments to `execve', including environment.  */
-#define	_POSIX_ARG_MAX		4096
-
-/* Maximum simultaneous processes per real user ID.  */
-#ifdef __USE_XOPEN2K
-# define _POSIX_CHILD_MAX	25
-#else
-# define _POSIX_CHILD_MAX	6
-#endif
-
-/* Minimal number of timer expiration overruns.  */
-#define _POSIX_DELAYTIMER_MAX	32
-
-/* Maximum length of a host name (not including the terminating null)
-   as returned from the GETHOSTNAME function.  */
-#define _POSIX_HOST_NAME_MAX	255
-
-/* Maximum link count of a file.  */
-#define	_POSIX_LINK_MAX		8
-
-/* Maximum length of login name.  */
-#define	_POSIX_LOGIN_NAME_MAX	9
-
-/* Number of bytes in a terminal canonical input queue.  */
-#define	_POSIX_MAX_CANON	255
-
-/* Number of bytes for which space will be
-   available in a terminal input queue.  */
-#define	_POSIX_MAX_INPUT	255
-
-/* Maximum number of message queues open for a process.  */
-#define _POSIX_MQ_OPEN_MAX	8
-
-/* Maximum number of supported message priorities.  */
-#define _POSIX_MQ_PRIO_MAX	32
-
-/* Number of bytes in a filename.  */
-#define	_POSIX_NAME_MAX		14
-
-/* Number of simultaneous supplementary group IDs per process.  */
-#ifdef __USE_XOPEN2K
-# define _POSIX_NGROUPS_MAX	8
-#else
-# define _POSIX_NGROUPS_MAX	0
-#endif
-
-/* Number of files one process can have open at once.  */
-#ifdef __USE_XOPEN2K
-# define _POSIX_OPEN_MAX	20
-#else
-# define _POSIX_OPEN_MAX	16
-#endif
-
-#if !defined __USE_XOPEN2K || defined __USE_GNU
-/* Number of descriptors that a process may examine with `pselect' or
-   `select'.  */
-# define _POSIX_FD_SETSIZE	_POSIX_OPEN_MAX
-#endif
-
-/* Number of bytes in a pathname.  */
-#define	_POSIX_PATH_MAX		256
-
-/* Number of bytes than can be written atomically to a pipe.  */
-#define	_POSIX_PIPE_BUF		512
-
-/* The number of repeated occurrences of a BRE permitted by the
-   REGEXEC and REGCOMP functions when using the interval notation.  */
-#define _POSIX_RE_DUP_MAX	255
-
-/* Minimal number of realtime signals reserved for the application.  */
-#define _POSIX_RTSIG_MAX	8
-
-/* Number of semaphores a process can have.  */
-#define _POSIX_SEM_NSEMS_MAX	256
-
-/* Maximal value of a semaphore.  */
-#define _POSIX_SEM_VALUE_MAX	32767
-
-/* Number of pending realtime signals.  */
-#define _POSIX_SIGQUEUE_MAX	32
-
-/* Largest value of a `ssize_t'.  */
-#define	_POSIX_SSIZE_MAX	32767
-
-/* Number of streams a process can have open at once.  */
-#define	_POSIX_STREAM_MAX	8
-
-/* The number of bytes in a symbolic link.  */
-#define _POSIX_SYMLINK_MAX	255
-
-/* The number of symbolic links that can be traversed in the
-   resolution of a pathname in the absence of a loop.  */
-#define _POSIX_SYMLOOP_MAX	8
-
-/* Number of timer for a process.  */
-#define _POSIX_TIMER_MAX	32
-
-/* Maximum number of characters in a tty name.  */
-#define	_POSIX_TTY_NAME_MAX	9
-
-/* Maximum length of a timezone name (element of `tzname').  */
-#ifdef __USE_XOPEN2K
-# define _POSIX_TZNAME_MAX	6
-#else
-# define _POSIX_TZNAME_MAX	3
-#endif
-
-#if !defined __USE_XOPEN2K || defined __USE_GNU
-/* Maximum number of connections that can be queued on a socket.  */
-# define _POSIX_QLIMIT		1
-
-/* Maximum number of bytes that can be buffered on a socket for send
-   or receive.  */
-# define _POSIX_HIWAT		_POSIX_PIPE_BUF
-
-/* Maximum number of elements in an `iovec' array.  */
-# define _POSIX_UIO_MAXIOV	16
-#endif
-
-/* Maximum clock resolution in nanoseconds.  */
-#define _POSIX_CLOCKRES_MIN	20000000
-
-
-/* Get the implementation-specific values for the above.  */
-#include <bits/local_lim.h>
-
-
-#ifndef	SSIZE_MAX
-# define SSIZE_MAX	LONG_MAX
-#endif
-
-
-/* This value is a guaranteed minimum maximum.
-   The current maximum can be got from `sysconf'.  */
-
-#ifndef	NGROUPS_MAX
-# define NGROUPS_MAX	8
-#endif
-
-#endif	/* bits/posix1_lim.h  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/posix2_lim.h b/openflow/usr/include/arm-linux-gnueabihf/bits/posix2_lim.h
deleted file mode 100644
index 819af36..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/posix2_lim.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * Never include this file directly; include <limits.h> instead.
- */
-
-#ifndef	_BITS_POSIX2_LIM_H
-#define	_BITS_POSIX2_LIM_H	1
-
-
-/* The maximum `ibase' and `obase' values allowed by the `bc' utility.  */
-#define	_POSIX2_BC_BASE_MAX		99
-
-/* The maximum number of elements allowed in an array by the `bc' utility.  */
-#define	_POSIX2_BC_DIM_MAX		2048
-
-/* The maximum `scale' value allowed by the `bc' utility.  */
-#define	_POSIX2_BC_SCALE_MAX		99
-
-/* The maximum length of a string constant accepted by the `bc' utility.  */
-#define	_POSIX2_BC_STRING_MAX		1000
-
-/* The maximum number of weights that can be assigned to an entry of
-   the LC_COLLATE `order' keyword in the locale definition file.  */
-#define	_POSIX2_COLL_WEIGHTS_MAX	2
-
-/* The maximum number of expressions that can be nested
-   within parentheses by the `expr' utility.  */
-#define	_POSIX2_EXPR_NEST_MAX		32
-
-/* The maximum length, in bytes, of an input line.  */
-#define	_POSIX2_LINE_MAX		2048
-
-/* The maximum number of repeated occurrences of a regular expression
-   permitted when using the interval notation `\{M,N\}'.  */
-#define	_POSIX2_RE_DUP_MAX		255
-
-/* The maximum number of bytes in a character class name.  We have no
-   fixed limit, 2048 is a high number.  */
-#define	_POSIX2_CHARCLASS_NAME_MAX	14
-
-
-/* These values are implementation-specific,
-   and may vary within the implementation.
-   Their precise values can be obtained from sysconf.  */
-
-#ifndef	BC_BASE_MAX
-#define	BC_BASE_MAX		_POSIX2_BC_BASE_MAX
-#endif
-#ifndef	BC_DIM_MAX
-#define	BC_DIM_MAX		_POSIX2_BC_DIM_MAX
-#endif
-#ifndef	BC_SCALE_MAX
-#define	BC_SCALE_MAX		_POSIX2_BC_SCALE_MAX
-#endif
-#ifndef	BC_STRING_MAX
-#define	BC_STRING_MAX		_POSIX2_BC_STRING_MAX
-#endif
-#ifndef	COLL_WEIGHTS_MAX
-#define	COLL_WEIGHTS_MAX	255
-#endif
-#ifndef	EXPR_NEST_MAX
-#define	EXPR_NEST_MAX		_POSIX2_EXPR_NEST_MAX
-#endif
-#ifndef	LINE_MAX
-#define	LINE_MAX		_POSIX2_LINE_MAX
-#endif
-#ifndef	CHARCLASS_NAME_MAX
-#define	CHARCLASS_NAME_MAX	2048
-#endif
-
-/* This value is defined like this in regex.h.  */
-#define	RE_DUP_MAX (0x7fff)
-
-#endif	/* bits/posix2_lim.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/posix_opt.h b/openflow/usr/include/arm-linux-gnueabihf/bits/posix_opt.h
deleted file mode 100644
index 5fb31b1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/posix_opt.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Define POSIX options for Linux.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_BITS_POSIX_OPT_H
-#define	_BITS_POSIX_OPT_H	1
-
-/* Job control is supported.  */
-#define	_POSIX_JOB_CONTROL	1
-
-/* Processes have a saved set-user-ID and a saved set-group-ID.  */
-#define	_POSIX_SAVED_IDS	1
-
-/* Priority scheduling is supported.  */
-#define	_POSIX_PRIORITY_SCHEDULING	200809L
-
-/* Synchronizing file data is supported.  */
-#define	_POSIX_SYNCHRONIZED_IO	200809L
-
-/* The fsync function is present.  */
-#define	_POSIX_FSYNC	200809L
-
-/* Mapping of files to memory is supported.  */
-#define	_POSIX_MAPPED_FILES	200809L
-
-/* Locking of all memory is supported.  */
-#define	_POSIX_MEMLOCK	200809L
-
-/* Locking of ranges of memory is supported.  */
-#define	_POSIX_MEMLOCK_RANGE	200809L
-
-/* Setting of memory protections is supported.  */
-#define	_POSIX_MEMORY_PROTECTION	200809L
-
-/* Some filesystems allow all users to change file ownership.  */
-#define	_POSIX_CHOWN_RESTRICTED	0
-
-/* `c_cc' member of 'struct termios' structure can be disabled by
-   using the value _POSIX_VDISABLE.  */
-#define	_POSIX_VDISABLE	'\0'
-
-/* Filenames are not silently truncated.  */
-#define	_POSIX_NO_TRUNC	1
-
-/* X/Open realtime support is available.  */
-#define _XOPEN_REALTIME	1
-
-/* X/Open thread realtime support is available.  */
-#define _XOPEN_REALTIME_THREADS	1
-
-/* XPG4.2 shared memory is supported.  */
-#define	_XOPEN_SHM	1
-
-/* Tell we have POSIX threads.  */
-#define _POSIX_THREADS	200809L
-
-/* We have the reentrant functions described in POSIX.  */
-#define _POSIX_REENTRANT_FUNCTIONS      1
-#define _POSIX_THREAD_SAFE_FUNCTIONS	200809L
-
-/* We provide priority scheduling for threads.  */
-#define _POSIX_THREAD_PRIORITY_SCHEDULING	200809L
-
-/* We support user-defined stack sizes.  */
-#define _POSIX_THREAD_ATTR_STACKSIZE	200809L
-
-/* We support user-defined stacks.  */
-#define _POSIX_THREAD_ATTR_STACKADDR	200809L
-
-/* We support priority inheritence.  */
-#define _POSIX_THREAD_PRIO_INHERIT	200809L
-
-/* We support priority protection, though only for non-robust
-   mutexes.  */
-#define _POSIX_THREAD_PRIO_PROTECT	200809L
-
-#ifdef __USE_XOPEN2K8
-/* We support priority inheritence for robust mutexes.  */
-# define _POSIX_THREAD_ROBUST_PRIO_INHERIT	200809L
-
-/* We do not support priority protection for robust mutexes.  */
-# define _POSIX_THREAD_ROBUST_PRIO_PROTECT	-1
-#endif
-
-/* We support POSIX.1b semaphores.  */
-#define _POSIX_SEMAPHORES	200809L
-
-/* Real-time signals are supported.  */
-#define _POSIX_REALTIME_SIGNALS	200809L
-
-/* We support asynchronous I/O.  */
-#define _POSIX_ASYNCHRONOUS_IO	200809L
-#define _POSIX_ASYNC_IO		1
-/* Alternative name for Unix98.  */
-#define _LFS_ASYNCHRONOUS_IO	1
-/* Support for prioritization is also available.  */
-#define _POSIX_PRIORITIZED_IO	200809L
-
-/* The LFS support in asynchronous I/O is also available.  */
-#define _LFS64_ASYNCHRONOUS_IO	1
-
-/* The rest of the LFS is also available.  */
-#define _LFS_LARGEFILE		1
-#define _LFS64_LARGEFILE	1
-#define _LFS64_STDIO		1
-
-/* POSIX shared memory objects are implemented.  */
-#define _POSIX_SHARED_MEMORY_OBJECTS	200809L
-
-/* CPU-time clocks support needs to be checked at runtime.  */
-#define _POSIX_CPUTIME	0
-
-/* Clock support in threads must be also checked at runtime.  */
-#define _POSIX_THREAD_CPUTIME	0
-
-/* GNU libc provides regular expression handling.  */
-#define _POSIX_REGEXP	1
-
-/* Reader/Writer locks are available.  */
-#define _POSIX_READER_WRITER_LOCKS	200809L
-
-/* We have a POSIX shell.  */
-#define _POSIX_SHELL	1
-
-/* We support the Timeouts option.  */
-#define _POSIX_TIMEOUTS	200809L
-
-/* We support spinlocks.  */
-#define _POSIX_SPIN_LOCKS	200809L
-
-/* The `spawn' function family is supported.  */
-#define _POSIX_SPAWN	200809L
-
-/* We have POSIX timers.  */
-#define _POSIX_TIMERS	200809L
-
-/* The barrier functions are available.  */
-#define _POSIX_BARRIERS	200809L
-
-/* POSIX message queues are available.  */
-#define	_POSIX_MESSAGE_PASSING	200809L
-
-/* Thread process-shared synchronization is supported.  */
-#define _POSIX_THREAD_PROCESS_SHARED	200809L
-
-/* The monotonic clock might be available.  */
-#define _POSIX_MONOTONIC_CLOCK	0
-
-/* The clock selection interfaces are available.  */
-#define _POSIX_CLOCK_SELECTION	200809L
-
-/* Advisory information interfaces are available.  */
-#define _POSIX_ADVISORY_INFO	200809L
-
-/* IPv6 support is available.  */
-#define _POSIX_IPV6	200809L
-
-/* Raw socket support is available.  */
-#define _POSIX_RAW_SOCKETS	200809L
-
-/* We have at least one terminal.  */
-#define _POSIX2_CHAR_TERM	200809L
-
-/* Neither process nor thread sporadic server interfaces is available.  */
-#define _POSIX_SPORADIC_SERVER	-1
-#define _POSIX_THREAD_SPORADIC_SERVER	-1
-
-/* trace.h is not available.  */
-#define _POSIX_TRACE	-1
-#define _POSIX_TRACE_EVENT_FILTER	-1
-#define _POSIX_TRACE_INHERIT	-1
-#define _POSIX_TRACE_LOG	-1
-
-/* Typed memory objects are not available.  */
-#define _POSIX_TYPED_MEMORY_OBJECTS	-1
-
-#endif /* bits/posix_opt.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/printf-ldbl.h b/openflow/usr/include/arm-linux-gnueabihf/bits/printf-ldbl.h
deleted file mode 100644
index aaa0921..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/printf-ldbl.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -mlong-double-64 compatibility mode for <printf.h> functions.
-   Copyright (C) 2006-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _PRINTF_H
-# error "Never include <bits/printf-ldbl.h> directly; use <printf.h> instead."
-#endif
-
-__LDBL_REDIR_DECL (printf_size)
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/pthreadtypes.h b/openflow/usr/include/arm-linux-gnueabihf/bits/pthreadtypes.h
deleted file mode 100644
index afb5392..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/pthreadtypes.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _BITS_PTHREADTYPES_H
-#define _BITS_PTHREADTYPES_H	1
-
-#include <endian.h>
-
-#define __SIZEOF_PTHREAD_ATTR_T 36
-#define __SIZEOF_PTHREAD_MUTEX_T 24
-#define __SIZEOF_PTHREAD_MUTEXATTR_T 4
-#define __SIZEOF_PTHREAD_COND_T 48
-#define __SIZEOF_PTHREAD_COND_COMPAT_T 12
-#define __SIZEOF_PTHREAD_CONDATTR_T 4
-#define __SIZEOF_PTHREAD_RWLOCK_T 32
-#define __SIZEOF_PTHREAD_RWLOCKATTR_T 8
-#define __SIZEOF_PTHREAD_BARRIER_T 20
-#define __SIZEOF_PTHREAD_BARRIERATTR_T 4
-
-
-/* Thread identifiers.  The structure of the attribute type is not
-   exposed on purpose.  */
-typedef unsigned long int pthread_t;
-
-
-union pthread_attr_t
-{
-  char __size[__SIZEOF_PTHREAD_ATTR_T];
-  long int __align;
-};
-#ifndef __have_pthread_attr_t
-typedef union pthread_attr_t pthread_attr_t;
-# define __have_pthread_attr_t	1
-#endif
-
-
-typedef struct __pthread_internal_slist
-{
-  struct __pthread_internal_slist *__next;
-} __pthread_slist_t;
-
-
-/* Data structures for mutex handling.  The structure of the attribute
-   type is not exposed on purpose.  */
-typedef union
-{
-  struct __pthread_mutex_s
-  {
-    int __lock;
-    unsigned int __count;
-    int __owner;
-    /* KIND must stay at this position in the structure to maintain
-       binary compatibility.  */
-    int __kind;
-    unsigned int __nusers;
-    __extension__ union
-    {
-      int __spins;
-      __pthread_slist_t __list;
-    };
-  } __data;
-  char __size[__SIZEOF_PTHREAD_MUTEX_T];
-  long int __align;
-} pthread_mutex_t;
-
-/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER.  */
-#define __PTHREAD_SPINS 0
-
-typedef union
-{
-  char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
-  long int __align;
-} pthread_mutexattr_t;
-
-
-/* Data structure for conditional variable handling.  The structure of
-   the attribute type is not exposed on purpose.  */
-typedef union
-{
-  struct
-  {
-    int __lock;
-    unsigned int __futex;
-    __extension__ unsigned long long int __total_seq;
-    __extension__ unsigned long long int __wakeup_seq;
-    __extension__ unsigned long long int __woken_seq;
-    void *__mutex;
-    unsigned int __nwaiters;
-    unsigned int __broadcast_seq;
-  } __data;
-  char __size[__SIZEOF_PTHREAD_COND_T];
-  __extension__ long long int __align;
-} pthread_cond_t;
-
-typedef union
-{
-  char __size[__SIZEOF_PTHREAD_CONDATTR_T];
-  long int __align;
-} pthread_condattr_t;
-
-
-/* Keys for thread-specific data */
-typedef unsigned int pthread_key_t;
-
-
-/* Once-only execution */
-typedef int pthread_once_t;
-
-
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-/* Data structure for read-write lock variable handling.  The
-   structure of the attribute type is not exposed on purpose.  */
-typedef union
-{
-  struct
-  {
-    int __lock;
-    unsigned int __nr_readers;
-    unsigned int __readers_wakeup;
-    unsigned int __writer_wakeup;
-    unsigned int __nr_readers_queued;
-    unsigned int __nr_writers_queued;
-#if __BYTE_ORDER == __BIG_ENDIAN
-    unsigned char __pad1;
-    unsigned char __pad2;
-    unsigned char __shared;
-    /* FLAGS must stay at this position in the structure to maintain
-       binary compatibility.  */
-    unsigned char __flags;
-#else
-    /* FLAGS must stay at this position in the structure to maintain
-       binary compatibility.  */
-    unsigned char __flags;
-    unsigned char __shared;
-    unsigned char __pad1;
-    unsigned char __pad2;
-#endif
-    int __writer;
-  } __data;
-  char __size[__SIZEOF_PTHREAD_RWLOCK_T];
-  long int __align;
-} pthread_rwlock_t;
-
-#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
-
-typedef union
-{
-  char __size[__SIZEOF_PTHREAD_RWLOCKATTR_T];
-  long int __align;
-} pthread_rwlockattr_t;
-#endif
-
-
-#ifdef __USE_XOPEN2K
-/* POSIX spinlock data type.  */
-typedef volatile int pthread_spinlock_t;
-
-
-/* POSIX barriers data type.  The structure of the type is
-   deliberately not exposed.  */
-typedef union
-{
-  char __size[__SIZEOF_PTHREAD_BARRIER_T];
-  long int __align;
-} pthread_barrier_t;
-
-typedef union
-{
-  char __size[__SIZEOF_PTHREAD_BARRIERATTR_T];
-  int __align;
-} pthread_barrierattr_t;
-#endif
-
-
-#endif	/* bits/pthreadtypes.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/resource.h b/openflow/usr/include/arm-linux-gnueabihf/bits/resource.h
deleted file mode 100644
index 8af0e0e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/resource.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/* Bit values & structures for resource limits.  Linux version.
-   Copyright (C) 1994-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_RESOURCE_H
-# error "Never use <bits/resource.h> directly; include <sys/resource.h> instead."
-#endif
-
-#include <bits/types.h>
-
-/* Transmute defines to enumerations.  The macro re-definitions are
-   necessary because some programs want to test for operating system
-   features with #ifdef RUSAGE_SELF.  In ISO C the reflexive
-   definition is a no-op.  */
-
-/* Kinds of resource limit.  */
-enum __rlimit_resource
-{
-  /* Per-process CPU limit, in seconds.  */
-  RLIMIT_CPU = 0,
-#define RLIMIT_CPU RLIMIT_CPU
-
-  /* Largest file that can be created, in bytes.  */
-  RLIMIT_FSIZE = 1,
-#define	RLIMIT_FSIZE RLIMIT_FSIZE
-
-  /* Maximum size of data segment, in bytes.  */
-  RLIMIT_DATA = 2,
-#define	RLIMIT_DATA RLIMIT_DATA
-
-  /* Maximum size of stack segment, in bytes.  */
-  RLIMIT_STACK = 3,
-#define	RLIMIT_STACK RLIMIT_STACK
-
-  /* Largest core file that can be created, in bytes.  */
-  RLIMIT_CORE = 4,
-#define	RLIMIT_CORE RLIMIT_CORE
-
-  /* Largest resident set size, in bytes.
-     This affects swapping; processes that are exceeding their
-     resident set size will be more likely to have physical memory
-     taken from them.  */
-  __RLIMIT_RSS = 5,
-#define	RLIMIT_RSS __RLIMIT_RSS
-
-  /* Number of open files.  */
-  RLIMIT_NOFILE = 7,
-  __RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same.  */
-#define RLIMIT_NOFILE RLIMIT_NOFILE
-#define RLIMIT_OFILE __RLIMIT_OFILE
-
-  /* Address space limit.  */
-  RLIMIT_AS = 9,
-#define RLIMIT_AS RLIMIT_AS
-
-  /* Number of processes.  */
-  __RLIMIT_NPROC = 6,
-#define RLIMIT_NPROC __RLIMIT_NPROC
-
-  /* Locked-in-memory address space.  */
-  __RLIMIT_MEMLOCK = 8,
-#define RLIMIT_MEMLOCK __RLIMIT_MEMLOCK
-
-  /* Maximum number of file locks.  */
-  __RLIMIT_LOCKS = 10,
-#define RLIMIT_LOCKS __RLIMIT_LOCKS
-
-  /* Maximum number of pending signals.  */
-  __RLIMIT_SIGPENDING = 11,
-#define RLIMIT_SIGPENDING __RLIMIT_SIGPENDING
-
-  /* Maximum bytes in POSIX message queues.  */
-  __RLIMIT_MSGQUEUE = 12,
-#define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE
-
-  /* Maximum nice priority allowed to raise to.
-     Nice levels 19 .. -20 correspond to 0 .. 39
-     values of this resource limit.  */
-  __RLIMIT_NICE = 13,
-#define RLIMIT_NICE __RLIMIT_NICE
-
-  /* Maximum realtime priority allowed for non-priviledged
-     processes.  */
-  __RLIMIT_RTPRIO = 14,
-#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-
-  /* Maximum CPU time in µs that a process scheduled under a real-time
-     scheduling policy may consume without making a blocking system
-     call before being forcibly descheduled.  */
-  __RLIMIT_RTTIME = 15,
-#define RLIMIT_RTTIME __RLIMIT_RTTIME
-
-  __RLIMIT_NLIMITS = 16,
-  __RLIM_NLIMITS = __RLIMIT_NLIMITS
-#define RLIMIT_NLIMITS __RLIMIT_NLIMITS
-#define RLIM_NLIMITS __RLIM_NLIMITS
-};
-
-/* Value to indicate that there is no limit.  */
-#ifndef __USE_FILE_OFFSET64
-# define RLIM_INFINITY ((__rlim_t) -1)
-#else
-# define RLIM_INFINITY 0xffffffffffffffffuLL
-#endif
-
-#ifdef __USE_LARGEFILE64
-# define RLIM64_INFINITY 0xffffffffffffffffuLL
-#endif
-
-/* We can represent all limits.  */
-#define RLIM_SAVED_MAX	RLIM_INFINITY
-#define RLIM_SAVED_CUR	RLIM_INFINITY
-
-
-/* Type for resource quantity measurement.  */
-#ifndef __USE_FILE_OFFSET64
-typedef __rlim_t rlim_t;
-#else
-typedef __rlim64_t rlim_t;
-#endif
-#ifdef __USE_LARGEFILE64
-typedef __rlim64_t rlim64_t;
-#endif
-
-struct rlimit
-  {
-    /* The current (soft) limit.  */
-    rlim_t rlim_cur;
-    /* The hard limit.  */
-    rlim_t rlim_max;
-  };
-
-#ifdef __USE_LARGEFILE64
-struct rlimit64
-  {
-    /* The current (soft) limit.  */
-    rlim64_t rlim_cur;
-    /* The hard limit.  */
-    rlim64_t rlim_max;
- };
-#endif
-
-/* Whose usage statistics do you want?  */
-enum __rusage_who
-{
-  /* The calling process.  */
-  RUSAGE_SELF = 0,
-#define RUSAGE_SELF RUSAGE_SELF
-
-  /* All of its terminated child processes.  */
-  RUSAGE_CHILDREN = -1
-#define RUSAGE_CHILDREN RUSAGE_CHILDREN
-
-#ifdef __USE_GNU
-  ,
-  /* The calling thread.  */
-  RUSAGE_THREAD = 1
-# define RUSAGE_THREAD RUSAGE_THREAD
-  /* Name for the same functionality on Solaris.  */
-# define RUSAGE_LWP RUSAGE_THREAD
-#endif
-};
-
-#define __need_timeval
-#include <bits/time.h>		/* For `struct timeval'.  */
-
-/* Structure which says how much of each resource has been used.  */
-
-/* The purpose of all the unions is to have the kernel-compatible layout
-   while keeping the API type as 'long int', and among machines where
-   __syscall_slong_t is not 'long int', this only does the right thing
-   for little-endian ones, like x32.  */
-struct rusage
-  {
-    /* Total amount of user time used.  */
-    struct timeval ru_utime;
-    /* Total amount of system time used.  */
-    struct timeval ru_stime;
-    /* Maximum resident set size (in kilobytes).  */
-    __extension__ union
-      {
-	long int ru_maxrss;
-	__syscall_slong_t __ru_maxrss_word;
-      };
-    /* Amount of sharing of text segment memory
-       with other processes (kilobyte-seconds).  */
-    /* Maximum resident set size (in kilobytes).  */
-    __extension__ union
-      {
-	long int ru_ixrss;
-	__syscall_slong_t __ru_ixrss_word;
-      };
-    /* Amount of data segment memory used (kilobyte-seconds).  */
-    __extension__ union
-      {
-	long int ru_idrss;
-	__syscall_slong_t __ru_idrss_word;
-      };
-    /* Amount of stack memory used (kilobyte-seconds).  */
-    __extension__ union
-      {
-	long int ru_isrss;
-	 __syscall_slong_t __ru_isrss_word;
-      };
-    /* Number of soft page faults (i.e. those serviced by reclaiming
-       a page from the list of pages awaiting reallocation.  */
-    __extension__ union
-      {
-	long int ru_minflt;
-	__syscall_slong_t __ru_minflt_word;
-      };
-    /* Number of hard page faults (i.e. those that required I/O).  */
-    __extension__ union
-      {
-	long int ru_majflt;
-	__syscall_slong_t __ru_majflt_word;
-      };
-    /* Number of times a process was swapped out of physical memory.  */
-    __extension__ union
-      {
-	long int ru_nswap;
-	__syscall_slong_t __ru_nswap_word;
-      };
-    /* Number of input operations via the file system.  Note: This
-       and `ru_oublock' do not include operations with the cache.  */
-    __extension__ union
-      {
-	long int ru_inblock;
-	__syscall_slong_t __ru_inblock_word;
-      };
-    /* Number of output operations via the file system.  */
-    __extension__ union
-      {
-	long int ru_oublock;
-	__syscall_slong_t __ru_oublock_word;
-      };
-    /* Number of IPC messages sent.  */
-    __extension__ union
-      {
-	long int ru_msgsnd;
-	__syscall_slong_t __ru_msgsnd_word;
-      };
-    /* Number of IPC messages received.  */
-    __extension__ union
-      {
-	long int ru_msgrcv;
-	__syscall_slong_t __ru_msgrcv_word;
-      };
-    /* Number of signals delivered.  */
-    __extension__ union
-      {
-	long int ru_nsignals;
-	__syscall_slong_t __ru_nsignals_word;
-      };
-    /* Number of voluntary context switches, i.e. because the process
-       gave up the process before it had to (usually to wait for some
-       resource to be available).  */
-    __extension__ union
-      {
-	long int ru_nvcsw;
-	__syscall_slong_t __ru_nvcsw_word;
-      };
-    /* Number of involuntary context switches, i.e. a higher priority process
-       became runnable or the current process used up its time slice.  */
-    __extension__ union
-      {
-	long int ru_nivcsw;
-	__syscall_slong_t __ru_nivcsw_word;
-      };
-  };
-
-/* Priority limits.  */
-#define PRIO_MIN	-20	/* Minimum priority a process can have.  */
-#define PRIO_MAX	20	/* Maximum priority a process can have.  */
-
-/* The type of the WHICH argument to `getpriority' and `setpriority',
-   indicating what flavor of entity the WHO argument specifies.  */
-enum __priority_which
-{
-  PRIO_PROCESS = 0,		/* WHO is a process ID.  */
-#define PRIO_PROCESS PRIO_PROCESS
-  PRIO_PGRP = 1,		/* WHO is a process group ID.  */
-#define PRIO_PGRP PRIO_PGRP
-  PRIO_USER = 2			/* WHO is a user ID.  */
-#define PRIO_USER PRIO_USER
-};
-
-
-__BEGIN_DECLS
-
-#ifdef __USE_GNU
-/* Modify and return resource limits of a process atomically.  */
-# ifndef __USE_FILE_OFFSET64
-extern int prlimit (__pid_t __pid, enum __rlimit_resource __resource,
-		    const struct rlimit *__new_limit,
-		    struct rlimit *__old_limit) __THROW;
-# else
-#  ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (prlimit, (__pid_t __pid,
-				     enum __rlimit_resource __resource,
-				     const struct rlimit *__new_limit,
-				     struct rlimit *__old_limit), prlimit64);
-#  else
-#   define prlimit prlimit64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int prlimit64 (__pid_t __pid, enum __rlimit_resource __resource,
-		      const struct rlimit64 *__new_limit,
-		      struct rlimit64 *__old_limit) __THROW;
-# endif
-#endif
-
-__END_DECLS
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/sched.h b/openflow/usr/include/arm-linux-gnueabihf/bits/sched.h
deleted file mode 100644
index 4f5305a..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/sched.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Definitions of constants and data structure for POSIX 1003.1b-1993
-   scheduling interface.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __need_schedparam
-
-#ifndef _SCHED_H
-# error "Never include <bits/sched.h> directly; use <sched.h> instead."
-#endif
-
-
-/* Scheduling algorithms.  */
-#define SCHED_OTHER		0
-#define SCHED_FIFO		1
-#define SCHED_RR		2
-#ifdef __USE_GNU
-# define SCHED_BATCH		3
-# define SCHED_IDLE		5
-
-# define SCHED_RESET_ON_FORK	0x40000000
-#endif
-
-#ifdef __USE_GNU
-/* Cloning flags.  */
-# define CSIGNAL       0x000000ff /* Signal mask to be sent at exit.  */
-# define CLONE_VM      0x00000100 /* Set if VM shared between processes.  */
-# define CLONE_FS      0x00000200 /* Set if fs info shared between processes.  */
-# define CLONE_FILES   0x00000400 /* Set if open files shared between processes.  */
-# define CLONE_SIGHAND 0x00000800 /* Set if signal handlers shared.  */
-# define CLONE_PTRACE  0x00002000 /* Set if tracing continues on the child.  */
-# define CLONE_VFORK   0x00004000 /* Set if the parent wants the child to
-				     wake it up on mm_release.  */
-# define CLONE_PARENT  0x00008000 /* Set if we want to have the same
-				     parent as the cloner.  */
-# define CLONE_THREAD  0x00010000 /* Set to add to same thread group.  */
-# define CLONE_NEWNS   0x00020000 /* Set to create new namespace.  */
-# define CLONE_SYSVSEM 0x00040000 /* Set to shared SVID SEM_UNDO semantics.  */
-# define CLONE_SETTLS  0x00080000 /* Set TLS info.  */
-# define CLONE_PARENT_SETTID 0x00100000 /* Store TID in userlevel buffer
-					   before MM copy.  */
-# define CLONE_CHILD_CLEARTID 0x00200000 /* Register exit futex and memory
-					    location to clear.  */
-# define CLONE_DETACHED 0x00400000 /* Create clone detached.  */
-# define CLONE_UNTRACED 0x00800000 /* Set if the tracing process can't
-				      force CLONE_PTRACE on this clone.  */
-# define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in
-					  the child.  */
-# define CLONE_NEWUTS	0x04000000	/* New utsname group.  */
-# define CLONE_NEWIPC	0x08000000	/* New ipcs.  */
-# define CLONE_NEWUSER	0x10000000	/* New user namespace.  */
-# define CLONE_NEWPID	0x20000000	/* New pid namespace.  */
-# define CLONE_NEWNET	0x40000000	/* New network namespace.  */
-# define CLONE_IO	0x80000000	/* Clone I/O context.  */
-#endif
-
-/* The official definition.  */
-struct sched_param
-  {
-    int __sched_priority;
-  };
-
-__BEGIN_DECLS
-
-#ifdef __USE_GNU
-/* Clone current process.  */
-extern int clone (int (*__fn) (void *__arg), void *__child_stack,
-		  int __flags, void *__arg, ...) __THROW;
-
-/* Unshare the specified resources.  */
-extern int unshare (int __flags) __THROW;
-
-/* Get index of currently used CPU.  */
-extern int sched_getcpu (void) __THROW;
-
-/* Switch process to namespace of type NSTYPE indicated by FD.  */
-extern int setns (int __fd, int __nstype) __THROW;
-#endif
-
-
-__END_DECLS
-
-#endif	/* need schedparam */
-
-#if !defined __defined_schedparam \
-    && (defined __need_schedparam || defined _SCHED_H)
-# define __defined_schedparam	1
-/* Data structure to describe a process' schedulability.  */
-struct __sched_param
-  {
-    int __sched_priority;
-  };
-# undef __need_schedparam
-#endif
-
-
-#if defined _SCHED_H && !defined __cpu_set_t_defined
-# define __cpu_set_t_defined
-/* Size definition for CPU sets.  */
-# define __CPU_SETSIZE	1024
-# define __NCPUBITS	(8 * sizeof (__cpu_mask))
-
-/* Type for array elements in 'cpu_set_t'.  */
-typedef __CPU_MASK_TYPE __cpu_mask;
-
-/* Basic access functions.  */
-# define __CPUELT(cpu)	((cpu) / __NCPUBITS)
-# define __CPUMASK(cpu)	((__cpu_mask) 1 << ((cpu) % __NCPUBITS))
-
-/* Data structure to describe CPU mask.  */
-typedef struct
-{
-  __cpu_mask __bits[__CPU_SETSIZE / __NCPUBITS];
-} cpu_set_t;
-
-/* Access functions for CPU masks.  */
-# if __GNUC_PREREQ (2, 91)
-#  define __CPU_ZERO_S(setsize, cpusetp) \
-  do __builtin_memset (cpusetp, '\0', setsize); while (0)
-# else
-#  define __CPU_ZERO_S(setsize, cpusetp) \
-  do {									      \
-    size_t __i;								      \
-    size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
-    __cpu_mask *__bits = (cpusetp)->__bits;				      \
-    for (__i = 0; __i < __imax; ++__i)					      \
-      __bits[__i] = 0;							      \
-  } while (0)
-# endif
-# define __CPU_SET_S(cpu, setsize, cpusetp) \
-  (__extension__							      \
-   ({ size_t __cpu = (cpu);						      \
-      __cpu / 8 < (setsize)						      \
-      ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]		      \
-	 |= __CPUMASK (__cpu))						      \
-      : 0; }))
-# define __CPU_CLR_S(cpu, setsize, cpusetp) \
-  (__extension__							      \
-   ({ size_t __cpu = (cpu);						      \
-      __cpu / 8 < (setsize)						      \
-      ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]		      \
-	 &= ~__CPUMASK (__cpu))						      \
-      : 0; }))
-# define __CPU_ISSET_S(cpu, setsize, cpusetp) \
-  (__extension__							      \
-   ({ size_t __cpu = (cpu);						      \
-      __cpu / 8 < (setsize)						      \
-      ? ((((const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]	      \
-	  & __CPUMASK (__cpu))) != 0					      \
-      : 0; }))
-
-# define __CPU_COUNT_S(setsize, cpusetp) \
-  __sched_cpucount (setsize, cpusetp)
-
-# if __GNUC_PREREQ (2, 91)
-#  define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-  (__builtin_memcmp (cpusetp1, cpusetp2, setsize) == 0)
-# else
-#  define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-  (__extension__							      \
-   ({ const __cpu_mask *__arr1 = (cpusetp1)->__bits;			      \
-      const __cpu_mask *__arr2 = (cpusetp2)->__bits;			      \
-      size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
-      size_t __i;							      \
-      for (__i = 0; __i < __imax; ++__i)				      \
-	if (__arr1[__i] != __arr2[__i])					      \
-	  break;							      \
-      __i == __imax; }))
-# endif
-
-# define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
-  (__extension__							      \
-   ({ cpu_set_t *__dest = (destset);					      \
-      const __cpu_mask *__arr1 = (srcset1)->__bits;			      \
-      const __cpu_mask *__arr2 = (srcset2)->__bits;			      \
-      size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
-      size_t __i;							      \
-      for (__i = 0; __i < __imax; ++__i)				      \
-	((__cpu_mask *) __dest->__bits)[__i] = __arr1[__i] op __arr2[__i];    \
-      __dest; }))
-
-# define __CPU_ALLOC_SIZE(count) \
-  ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask))
-# define __CPU_ALLOC(count) __sched_cpualloc (count)
-# define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
-
-__BEGIN_DECLS
-
-extern int __sched_cpucount (size_t __setsize, const cpu_set_t *__setp)
-  __THROW;
-extern cpu_set_t *__sched_cpualloc (size_t __count) __THROW __wur;
-extern void __sched_cpufree (cpu_set_t *__set) __THROW;
-
-__END_DECLS
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/select.h b/openflow/usr/include/arm-linux-gnueabihf/bits/select.h
deleted file mode 100644
index 6a93c3d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/select.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SELECT_H
-# error "Never use <bits/select.h> directly; include <sys/select.h> instead."
-#endif
-
-
-/* We don't use `memset' because this would require a prototype and
-   the array isn't too big.  */
-#define __FD_ZERO(s) \
-  do {									      \
-    unsigned int __i;							      \
-    fd_set *__arr = (s);						      \
-    for (__i = 0; __i < sizeof (fd_set) / sizeof (__fd_mask); ++__i)	      \
-      __FDS_BITS (__arr)[__i] = 0;					      \
-  } while (0)
-#define __FD_SET(d, s) \
-  ((void) (__FDS_BITS (s)[__FD_ELT(d)] |= __FD_MASK(d)))
-#define __FD_CLR(d, s) \
-  ((void) (__FDS_BITS (s)[__FD_ELT(d)] &= ~__FD_MASK(d)))
-#define __FD_ISSET(d, s) \
-  ((__FDS_BITS (s)[__FD_ELT (d)] & __FD_MASK (d)) != 0)
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/select2.h b/openflow/usr/include/arm-linux-gnueabihf/bits/select2.h
deleted file mode 100644
index 56f2205..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/select2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Checking macros for select functions.
-   Copyright (C) 2011-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SELECT_H
-# error "Never include <bits/select2.h> directly; use <sys/select.h> instead."
-#endif
-
-/* Helper functions to issue warnings and errors when needed.  */
-extern long int __fdelt_chk (long int __d);
-extern long int __fdelt_warn (long int __d)
-  __warnattr ("bit outside of fd_set selected");
-#undef __FD_ELT
-#define	__FD_ELT(d) \
-  __extension__								    \
-  ({ long int __d = (d);						    \
-     (__builtin_constant_p (__d)					    \
-      ? (0 <= __d && __d < __FD_SETSIZE					    \
-	 ? (__d / __NFDBITS)						    \
-	 : __fdelt_warn (__d))						    \
-      : __fdelt_chk (__d)); })
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/sem.h b/openflow/usr/include/arm-linux-gnueabihf/bits/sem.h
deleted file mode 100644
index f7efb3f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/sem.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SEM_H
-# error "Never include <bits/sem.h> directly; use <sys/sem.h> instead."
-#endif
-
-#include <sys/types.h>
-
-/* Flags for `semop'.  */
-#define SEM_UNDO	0x1000		/* undo the operation on exit */
-
-/* Commands for `semctl'.  */
-#define GETPID		11		/* get sempid */
-#define GETVAL		12		/* get semval */
-#define GETALL		13		/* get all semval's */
-#define GETNCNT		14		/* get semncnt */
-#define GETZCNT		15		/* get semzcnt */
-#define SETVAL		16		/* set semval */
-#define SETALL		17		/* set all semval's */
-
-
-/* Data structure describing a set of semaphores.  */
-struct semid_ds
-{
-  struct ipc_perm sem_perm;		/* operation permission struct */
-  __time_t sem_otime;			/* last semop() time */
-  unsigned long int __glibc_reserved1;
-  __time_t sem_ctime;			/* last time changed by semctl() */
-  unsigned long int __glibc_reserved2;
-  unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __glibc_reserved3;
-  unsigned long int __glibc_reserved4;
-};
-
-/* The user should define a union like the following to use it for arguments
-   for `semctl'.
-
-   union semun
-   {
-     int val;				<= value for SETVAL
-     struct semid_ds *buf;		<= buffer for IPC_STAT & IPC_SET
-     unsigned short int *array;		<= array for GETALL & SETALL
-     struct seminfo *__buf;		<= buffer for IPC_INFO
-   };
-
-   Previous versions of this file used to define this union but this is
-   incorrect.  One can test the macro _SEM_SEMUN_UNDEFINED to see whether
-   one must define the union or not.  */
-#define _SEM_SEMUN_UNDEFINED	1
-
-#ifdef __USE_MISC
-
-/* ipcs ctl cmds */
-# define SEM_STAT 18
-# define SEM_INFO 19
-
-struct  seminfo
-{
-  int semmap;
-  int semmni;
-  int semmns;
-  int semmnu;
-  int semmsl;
-  int semopm;
-  int semume;
-  int semusz;
-  int semvmx;
-  int semaem;
-};
-
-#endif /* __USE_MISC */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/semaphore.h b/openflow/usr/include/arm-linux-gnueabihf/bits/semaphore.h
deleted file mode 100644
index f9498c8..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/semaphore.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SEMAPHORE_H
-# error "Never use <bits/semaphore.h> directly; include <semaphore.h> instead."
-#endif
-
-
-#define __SIZEOF_SEM_T	16
-
-
-/* Value returned if `sem_open' failed.  */
-#define SEM_FAILED      ((sem_t *) 0)
-
-
-typedef union
-{
-  char __size[__SIZEOF_SEM_T];
-  long int __align;
-} sem_t;
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/setjmp.h b/openflow/usr/include/arm-linux-gnueabihf/bits/setjmp.h
deleted file mode 100644
index ba0ea92..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/setjmp.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 2004-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Define the machine-dependent type `jmp_buf'.  ARM EABI version.  */
-
-#ifndef _BITS_SETJMP_H
-#define _BITS_SETJMP_H 1
-
-#if !defined _SETJMP_H && !defined _PTHREAD_H
-# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
-#endif
-
-#ifndef __ASSEMBLER__
-/* The exact set of registers saved may depend on the particular core
-   in use, as some coprocessor registers may need to be saved.  The C
-   Library ABI requires that the buffer be 8-byte aligned, and
-   recommends that the buffer contain 64 words.  The first 26 words
-   are occupied by sp, lr, v1-v6, sl, fp, and d8-d15.  */
-typedef int __jmp_buf[64] __attribute__((__aligned__ (8)));
-#endif
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/setjmp2.h b/openflow/usr/include/arm-linux-gnueabihf/bits/setjmp2.h
deleted file mode 100644
index dbf3454..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/setjmp2.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Checking macros for setjmp functions.
-   Copyright (C) 2009-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SETJMP_H
-# error "Never include <bits/setjmp2.h> directly; use <setjmp.h> instead."
-#endif
-
-/* Variant of the longjmp functions which perform some sanity checking.  */
-#ifdef __REDIRECT_NTH
-extern void __REDIRECT_NTHNL (longjmp,
-			      (struct __jmp_buf_tag __env[1], int __val),
-			      __longjmp_chk) __attribute__ ((__noreturn__));
-extern void __REDIRECT_NTHNL (_longjmp,
-			      (struct __jmp_buf_tag __env[1], int __val),
-			      __longjmp_chk) __attribute__ ((__noreturn__));
-extern void __REDIRECT_NTHNL (siglongjmp,
-			      (struct __jmp_buf_tag __env[1], int __val),
-			      __longjmp_chk) __attribute__ ((__noreturn__));
-#else
-extern void __longjmp_chk (struct __jmp_buf_tag __env[1], int __val),
-     __THROWNL __attribute__ ((__noreturn__));
-# define longjmp __longjmp_chk
-# define _longjmp __longjmp_chk
-# define siglongjmp __longjmp_chk
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/shm.h b/openflow/usr/include/arm-linux-gnueabihf/bits/shm.h
deleted file mode 100644
index 48b05cf..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/shm.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SHM_H
-# error "Never include <bits/shm.h> directly; use <sys/shm.h> instead."
-#endif
-
-#include <bits/types.h>
-
-/* Permission flag for shmget.  */
-#define SHM_R		0400		/* or S_IRUGO from <linux/stat.h> */
-#define SHM_W		0200		/* or S_IWUGO from <linux/stat.h> */
-
-/* Flags for `shmat'.  */
-#define SHM_RDONLY	010000		/* attach read-only else read-write */
-#define SHM_RND		020000		/* round attach address to SHMLBA */
-#define SHM_REMAP	040000		/* take-over region on attach */
-#define SHM_EXEC	0100000		/* execution access */
-
-/* Commands for `shmctl'.  */
-#define SHM_LOCK	11		/* lock segment (root only) */
-#define SHM_UNLOCK	12		/* unlock segment (root only) */
-
-__BEGIN_DECLS
-
-/* Segment low boundary address multiple.  */
-#define SHMLBA		(__getpagesize () << 2)
-extern int __getpagesize (void) __THROW __attribute__ ((__const__));
-
-
-/* Type to count number of attaches.  */
-typedef unsigned long int shmatt_t;
-
-/* Data structure describing a shared memory segment.  */
-struct shmid_ds
-  {
-    struct ipc_perm shm_perm;		/* operation permission struct */
-    size_t shm_segsz;			/* size of segment in bytes */
-    __time_t shm_atime;			/* time of last shmat() */
-    unsigned long int __glibc_reserved1;
-    __time_t shm_dtime;			/* time of last shmdt() */
-    unsigned long int __glibc_reserved2;
-    __time_t shm_ctime;			/* time of last change by shmctl() */
-    unsigned long int __glibc_reserved3;
-    __pid_t shm_cpid;			/* pid of creator */
-    __pid_t shm_lpid;			/* pid of last shmop */
-    shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __glibc_reserved4;
-    unsigned long int __glibc_reserved5;
-  };
-
-#ifdef __USE_MISC
-
-/* ipcs ctl commands */
-# define SHM_STAT 	13
-# define SHM_INFO 	14
-
-/* shm_mode upper byte flags */
-# define SHM_DEST	01000	/* segment will be destroyed on last detach */
-# define SHM_LOCKED	02000   /* segment will not be swapped */
-# define SHM_HUGETLB	04000	/* segment is mapped via hugetlb */
-# define SHM_NORESERVE	010000	/* don't check for reservations */
-
-struct	shminfo
-  {
-    unsigned long int shmmax;
-    unsigned long int shmmin;
-    unsigned long int shmmni;
-    unsigned long int shmseg;
-    unsigned long int shmall;
-    unsigned long int __glibc_reserved1;
-    unsigned long int __glibc_reserved2;
-    unsigned long int __glibc_reserved3;
-    unsigned long int __glibc_reserved4;
-  };
-
-struct shm_info
-  {
-    int used_ids;
-    unsigned long int shm_tot;	/* total allocated shm */
-    unsigned long int shm_rss;	/* total resident shm */
-    unsigned long int shm_swp;	/* total swapped shm */
-    unsigned long int swap_attempts;
-    unsigned long int swap_successes;
-  };
-
-#endif /* __USE_MISC */
-
-__END_DECLS
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/sigaction.h b/openflow/usr/include/arm-linux-gnueabihf/bits/sigaction.h
deleted file mode 100644
index 8c995fe..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/sigaction.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* The proper definitions for Linux's sigaction.
-   Copyright (C) 1993-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SIGNAL_H
-# error "Never include <bits/sigaction.h> directly; use <signal.h> instead."
-#endif
-
-/* Structure describing the action to be taken when a signal arrives.  */
-struct sigaction
-  {
-    /* Signal handler.  */
-#ifdef __USE_POSIX199309
-    union
-      {
-	/* Used if SA_SIGINFO is not set.  */
-	__sighandler_t sa_handler;
-	/* Used if SA_SIGINFO is set.  */
-	void (*sa_sigaction) (int, siginfo_t *, void *);
-      }
-    __sigaction_handler;
-# define sa_handler	__sigaction_handler.sa_handler
-# define sa_sigaction	__sigaction_handler.sa_sigaction
-#else
-    __sighandler_t sa_handler;
-#endif
-
-    /* Additional set of signals to be blocked.  */
-    __sigset_t sa_mask;
-
-    /* Special flags.  */
-    int sa_flags;
-
-    /* Restore handler.  */
-    void (*sa_restorer) (void);
-  };
-
-/* Bits in `sa_flags'.  */
-#define	SA_NOCLDSTOP  1		 /* Don't send SIGCHLD when children stop.  */
-#define SA_NOCLDWAIT  2		 /* Don't create zombie on child death.  */
-#define SA_SIGINFO    4		 /* Invoke signal-catching function with
-				    three arguments instead of one.  */
-#if defined __USE_UNIX98 || defined __USE_MISC
-# define SA_ONSTACK   0x08000000 /* Use signal stack by using `sa_restorer'. */
-#endif
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
-# define SA_RESTART   0x10000000 /* Restart syscall on signal return.  */
-# define SA_NODEFER   0x40000000 /* Don't automatically block the signal when
-				    its handler is being executed.  */
-# define SA_RESETHAND 0x80000000 /* Reset to SIG_DFL on entry to handler.  */
-#endif
-#ifdef __USE_MISC
-# define SA_INTERRUPT 0x20000000 /* Historical no-op.  */
-
-/* Some aliases for the SA_ constants.  */
-# define SA_NOMASK    SA_NODEFER
-# define SA_ONESHOT   SA_RESETHAND
-# define SA_STACK     SA_ONSTACK
-#endif
-
-/* Values for the HOW argument to `sigprocmask'.  */
-#define	SIG_BLOCK     0		 /* Block signals.  */
-#define	SIG_UNBLOCK   1		 /* Unblock signals.  */
-#define	SIG_SETMASK   2		 /* Set the set of blocked signals.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/sigcontext.h b/openflow/usr/include/arm-linux-gnueabihf/bits/sigcontext.h
deleted file mode 100644
index 46cacb7..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/sigcontext.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _SIGNAL_H && !defined _SYS_UCONTEXT_H
-# error "Never use <bits/sigcontext.h> directly; include <signal.h> instead."
-#endif
-
-#ifndef sigcontext_struct
-/* Kernel headers before 2.1.1 define a struct sigcontext_struct, but
-   we need sigcontext.  */
-# define sigcontext_struct sigcontext
-
-# include <asm/sigcontext.h>
-
-/* The Linux kernel headers redefine NULL wrongly, so cleanup afterwards.  */
-# define __need_NULL
-# include <stddef.h>
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/siginfo.h b/openflow/usr/include/arm-linux-gnueabihf/bits/siginfo.h
deleted file mode 100644
index b8f130b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/siginfo.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/* siginfo_t, sigevent and constants.  Linux version.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _SIGNAL_H && !defined __need_siginfo_t \
-    && !defined __need_sigevent_t
-# error "Never include this file directly.  Use <signal.h> instead"
-#endif
-
-#include <bits/wordsize.h>
-
-#if (!defined __have_sigval_t \
-     && (defined _SIGNAL_H || defined __need_siginfo_t \
-	 || defined __need_sigevent_t))
-# define __have_sigval_t	1
-
-/* Type for data associated with a signal.  */
-typedef union sigval
-  {
-    int sival_int;
-    void *sival_ptr;
-  } sigval_t;
-#endif
-
-#if (!defined __have_siginfo_t \
-     && (defined _SIGNAL_H || defined __need_siginfo_t))
-# define __have_siginfo_t	1
-
-# define __SI_MAX_SIZE     128
-# if __WORDSIZE == 64
-#  define __SI_PAD_SIZE     ((__SI_MAX_SIZE / sizeof (int)) - 4)
-# else
-#  define __SI_PAD_SIZE     ((__SI_MAX_SIZE / sizeof (int)) - 3)
-# endif
-
-typedef struct
-  {
-    int si_signo;		/* Signal number.  */
-    int si_errno;		/* If non-zero, an errno value associated with
-				   this signal, as defined in <errno.h>.  */
-    int si_code;		/* Signal code.  */
-
-    union
-      {
-	int _pad[__SI_PAD_SIZE];
-
-	 /* kill().  */
-	struct
-	  {
-	    __pid_t si_pid;	/* Sending process ID.  */
-	    __uid_t si_uid;	/* Real user ID of sending process.  */
-	  } _kill;
-
-	/* POSIX.1b timers.  */
-	struct
-	  {
-	    int si_tid;		/* Timer ID.  */
-	    int si_overrun;	/* Overrun count.  */
-	    sigval_t si_sigval;	/* Signal value.  */
-	  } _timer;
-
-	/* POSIX.1b signals.  */
-	struct
-	  {
-	    __pid_t si_pid;	/* Sending process ID.  */
-	    __uid_t si_uid;	/* Real user ID of sending process.  */
-	    sigval_t si_sigval;	/* Signal value.  */
-	  } _rt;
-
-	/* SIGCHLD.  */
-	struct
-	  {
-	    __pid_t si_pid;	/* Which child.  */
-	    __uid_t si_uid;	/* Real user ID of sending process.  */
-	    int si_status;	/* Exit value or signal.  */
-	    __clock_t si_utime;
-	    __clock_t si_stime;
-	  } _sigchld;
-
-	/* SIGILL, SIGFPE, SIGSEGV, SIGBUS.  */
-	struct
-	  {
-	    void *si_addr;	/* Faulting insn/memory ref.  */
-	    short int si_addr_lsb;	/* Valid LSB of the reported address.  */
-	  } _sigfault;
-
-	/* SIGPOLL.  */
-	struct
-	  {
-	    long int si_band;	/* Band event for SIGPOLL.  */
-	    int si_fd;
-	  } _sigpoll;
-
-	/* SIGSYS.  */
-	struct
-	  {
-	    void *_call_addr;	/* Calling user insn.  */
-	    int _syscall;	/* Triggering system call number.  */
-	    unsigned int _arch; /* AUDIT_ARCH_* of syscall.  */
-	  } _sigsys;
-      } _sifields;
-  } siginfo_t;
-
-
-/* X/Open requires some more fields with fixed names.  */
-# define si_pid		_sifields._kill.si_pid
-# define si_uid		_sifields._kill.si_uid
-# define si_timerid	_sifields._timer.si_tid
-# define si_overrun	_sifields._timer.si_overrun
-# define si_status	_sifields._sigchld.si_status
-# define si_utime	_sifields._sigchld.si_utime
-# define si_stime	_sifields._sigchld.si_stime
-# define si_value	_sifields._rt.si_sigval
-# define si_int		_sifields._rt.si_sigval.sival_int
-# define si_ptr		_sifields._rt.si_sigval.sival_ptr
-# define si_addr	_sifields._sigfault.si_addr
-# define si_addr_lsb	_sifields._sigfault.si_addr_lsb
-# define si_band	_sifields._sigpoll.si_band
-# define si_fd		_sifields._sigpoll.si_fd
-# define si_call_addr 	_sifields._sigsys._call_addr
-# define si_syscall	_sifields._sigsys._syscall
-# define si_arch	_sifields._sigsys._arch
-
-
-/* Values for `si_code'.  Positive values are reserved for kernel-generated
-   signals.  */
-enum
-{
-  SI_ASYNCNL = -60,		/* Sent by asynch name lookup completion.  */
-# define SI_ASYNCNL	SI_ASYNCNL
-  SI_TKILL = -6,		/* Sent by tkill.  */
-# define SI_TKILL	SI_TKILL
-  SI_SIGIO,			/* Sent by queued SIGIO. */
-# define SI_SIGIO	SI_SIGIO
-  SI_ASYNCIO,			/* Sent by AIO completion.  */
-# define SI_ASYNCIO	SI_ASYNCIO
-  SI_MESGQ,			/* Sent by real time mesq state change.  */
-# define SI_MESGQ	SI_MESGQ
-  SI_TIMER,			/* Sent by timer expiration.  */
-# define SI_TIMER	SI_TIMER
-  SI_QUEUE,			/* Sent by sigqueue.  */
-# define SI_QUEUE	SI_QUEUE
-  SI_USER,			/* Sent by kill, sigsend.  */
-# define SI_USER	SI_USER
-  SI_KERNEL = 0x80		/* Send by kernel.  */
-#define SI_KERNEL	SI_KERNEL
-};
-
-
-# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-/* `si_code' values for SIGILL signal.  */
-enum
-{
-  ILL_ILLOPC = 1,		/* Illegal opcode.  */
-#  define ILL_ILLOPC	ILL_ILLOPC
-  ILL_ILLOPN,			/* Illegal operand.  */
-#  define ILL_ILLOPN	ILL_ILLOPN
-  ILL_ILLADR,			/* Illegal addressing mode.  */
-#  define ILL_ILLADR	ILL_ILLADR
-  ILL_ILLTRP,			/* Illegal trap. */
-#  define ILL_ILLTRP	ILL_ILLTRP
-  ILL_PRVOPC,			/* Privileged opcode.  */
-#  define ILL_PRVOPC	ILL_PRVOPC
-  ILL_PRVREG,			/* Privileged register.  */
-#  define ILL_PRVREG	ILL_PRVREG
-  ILL_COPROC,			/* Coprocessor error.  */
-#  define ILL_COPROC	ILL_COPROC
-  ILL_BADSTK			/* Internal stack error.  */
-#  define ILL_BADSTK	ILL_BADSTK
-};
-
-/* `si_code' values for SIGFPE signal.  */
-enum
-{
-  FPE_INTDIV = 1,		/* Integer divide by zero.  */
-#  define FPE_INTDIV	FPE_INTDIV
-  FPE_INTOVF,			/* Integer overflow.  */
-#  define FPE_INTOVF	FPE_INTOVF
-  FPE_FLTDIV,			/* Floating point divide by zero.  */
-#  define FPE_FLTDIV	FPE_FLTDIV
-  FPE_FLTOVF,			/* Floating point overflow.  */
-#  define FPE_FLTOVF	FPE_FLTOVF
-  FPE_FLTUND,			/* Floating point underflow.  */
-#  define FPE_FLTUND	FPE_FLTUND
-  FPE_FLTRES,			/* Floating point inexact result.  */
-#  define FPE_FLTRES	FPE_FLTRES
-  FPE_FLTINV,			/* Floating point invalid operation.  */
-#  define FPE_FLTINV	FPE_FLTINV
-  FPE_FLTSUB			/* Subscript out of range.  */
-#  define FPE_FLTSUB	FPE_FLTSUB
-};
-
-/* `si_code' values for SIGSEGV signal.  */
-enum
-{
-  SEGV_MAPERR = 1,		/* Address not mapped to object.  */
-#  define SEGV_MAPERR	SEGV_MAPERR
-  SEGV_ACCERR			/* Invalid permissions for mapped object.  */
-#  define SEGV_ACCERR	SEGV_ACCERR
-};
-
-/* `si_code' values for SIGBUS signal.  */
-enum
-{
-  BUS_ADRALN = 1,		/* Invalid address alignment.  */
-#  define BUS_ADRALN	BUS_ADRALN
-  BUS_ADRERR,			/* Non-existant physical address.  */
-#  define BUS_ADRERR	BUS_ADRERR
-  BUS_OBJERR,			/* Object specific hardware error.  */
-#  define BUS_OBJERR	BUS_OBJERR
-  BUS_MCEERR_AR,		/* Hardware memory error: action required.  */
-#  define BUS_MCEERR_AR	BUS_MCEERR_AR
-  BUS_MCEERR_AO			/* Hardware memory error: action optional.  */
-#  define BUS_MCEERR_AO	BUS_MCEERR_AO
-};
-# endif
-
-# ifdef __USE_XOPEN_EXTENDED
-/* `si_code' values for SIGTRAP signal.  */
-enum
-{
-  TRAP_BRKPT = 1,		/* Process breakpoint.  */
-#  define TRAP_BRKPT	TRAP_BRKPT
-  TRAP_TRACE			/* Process trace trap.  */
-#  define TRAP_TRACE	TRAP_TRACE
-};
-# endif
-
-# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-/* `si_code' values for SIGCHLD signal.  */
-enum
-{
-  CLD_EXITED = 1,		/* Child has exited.  */
-#  define CLD_EXITED	CLD_EXITED
-  CLD_KILLED,			/* Child was killed.  */
-#  define CLD_KILLED	CLD_KILLED
-  CLD_DUMPED,			/* Child terminated abnormally.  */
-#  define CLD_DUMPED	CLD_DUMPED
-  CLD_TRAPPED,			/* Traced child has trapped.  */
-#  define CLD_TRAPPED	CLD_TRAPPED
-  CLD_STOPPED,			/* Child has stopped.  */
-#  define CLD_STOPPED	CLD_STOPPED
-  CLD_CONTINUED			/* Stopped child has continued.  */
-#  define CLD_CONTINUED	CLD_CONTINUED
-};
-
-/* `si_code' values for SIGPOLL signal.  */
-enum
-{
-  POLL_IN = 1,			/* Data input available.  */
-#  define POLL_IN	POLL_IN
-  POLL_OUT,			/* Output buffers available.  */
-#  define POLL_OUT	POLL_OUT
-  POLL_MSG,			/* Input message available.   */
-#  define POLL_MSG	POLL_MSG
-  POLL_ERR,			/* I/O error.  */
-#  define POLL_ERR	POLL_ERR
-  POLL_PRI,			/* High priority input available.  */
-#  define POLL_PRI	POLL_PRI
-  POLL_HUP			/* Device disconnected.  */
-#  define POLL_HUP	POLL_HUP
-};
-# endif
-
-# undef __need_siginfo_t
-#endif	/* !have siginfo_t && (have _SIGNAL_H || need siginfo_t).  */
-
-
-#if (defined _SIGNAL_H || defined __need_sigevent_t) \
-    && !defined __have_sigevent_t
-# define __have_sigevent_t	1
-
-/* Structure to transport application-defined values with signals.  */
-# define __SIGEV_MAX_SIZE	64
-# if __WORDSIZE == 64
-#  define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 4)
-# else
-#  define __SIGEV_PAD_SIZE	((__SIGEV_MAX_SIZE / sizeof (int)) - 3)
-# endif
-
-/* Forward declaration.  */
-# ifndef __have_pthread_attr_t
-typedef union pthread_attr_t pthread_attr_t;
-#  define __have_pthread_attr_t	1
-# endif
-
-typedef struct sigevent
-  {
-    sigval_t sigev_value;
-    int sigev_signo;
-    int sigev_notify;
-
-    union
-      {
-	int _pad[__SIGEV_PAD_SIZE];
-
-	/* When SIGEV_SIGNAL and SIGEV_THREAD_ID set, LWP ID of the
-	   thread to receive the signal.  */
-	__pid_t _tid;
-
-	struct
-	  {
-	    void (*_function) (sigval_t);	/* Function to start.  */
-	    pthread_attr_t *_attribute;		/* Thread attributes.  */
-	  } _sigev_thread;
-      } _sigev_un;
-  } sigevent_t;
-
-/* POSIX names to access some of the members.  */
-# define sigev_notify_function   _sigev_un._sigev_thread._function
-# define sigev_notify_attributes _sigev_un._sigev_thread._attribute
-
-/* `sigev_notify' values.  */
-enum
-{
-  SIGEV_SIGNAL = 0,		/* Notify via signal.  */
-# define SIGEV_SIGNAL	SIGEV_SIGNAL
-  SIGEV_NONE,			/* Other notification: meaningless.  */
-# define SIGEV_NONE	SIGEV_NONE
-  SIGEV_THREAD,			/* Deliver via thread creation.  */
-# define SIGEV_THREAD	SIGEV_THREAD
-
-  SIGEV_THREAD_ID = 4		/* Send signal to specific thread.  */
-#define SIGEV_THREAD_ID	SIGEV_THREAD_ID
-};
-
-#endif	/* have _SIGNAL_H.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/signalfd.h b/openflow/usr/include/arm-linux-gnueabihf/bits/signalfd.h
deleted file mode 100644
index bac90e5..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/signalfd.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2007-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_SIGNALFD_H
-# error "Never use <bits/signalfd.h> directly; include <sys/signalfd.h> instead."
-#endif
-
-/* Flags for signalfd.  */
-enum
-  {
-    SFD_CLOEXEC = 02000000,
-#define SFD_CLOEXEC SFD_CLOEXEC
-    SFD_NONBLOCK = 00004000
-#define SFD_NONBLOCK SFD_NONBLOCK
-  };
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/signum.h b/openflow/usr/include/arm-linux-gnueabihf/bits/signum.h
deleted file mode 100644
index 0e4eea1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/signum.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Signal number definitions.  Linux version.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifdef	_SIGNAL_H
-
-/* Fake signal functions.  */
-#define SIG_ERR	((__sighandler_t) -1)		/* Error return.  */
-#define SIG_DFL	((__sighandler_t) 0)		/* Default action.  */
-#define SIG_IGN	((__sighandler_t) 1)		/* Ignore signal.  */
-
-#ifdef __USE_UNIX98
-# define SIG_HOLD	((__sighandler_t) 2)	/* Add signal to hold mask.  */
-#endif
-
-
-/* Signals.  */
-#define	SIGHUP		1	/* Hangup (POSIX).  */
-#define	SIGINT		2	/* Interrupt (ANSI).  */
-#define	SIGQUIT		3	/* Quit (POSIX).  */
-#define	SIGILL		4	/* Illegal instruction (ANSI).  */
-#define	SIGTRAP		5	/* Trace trap (POSIX).  */
-#define	SIGABRT		6	/* Abort (ANSI).  */
-#define	SIGIOT		6	/* IOT trap (4.2 BSD).  */
-#define	SIGBUS		7	/* BUS error (4.2 BSD).  */
-#define	SIGFPE		8	/* Floating-point exception (ANSI).  */
-#define	SIGKILL		9	/* Kill, unblockable (POSIX).  */
-#define	SIGUSR1		10	/* User-defined signal 1 (POSIX).  */
-#define	SIGSEGV		11	/* Segmentation violation (ANSI).  */
-#define	SIGUSR2		12	/* User-defined signal 2 (POSIX).  */
-#define	SIGPIPE		13	/* Broken pipe (POSIX).  */
-#define	SIGALRM		14	/* Alarm clock (POSIX).  */
-#define	SIGTERM		15	/* Termination (ANSI).  */
-#define	SIGSTKFLT	16	/* Stack fault.  */
-#define	SIGCLD		SIGCHLD	/* Same as SIGCHLD (System V).  */
-#define	SIGCHLD		17	/* Child status has changed (POSIX).  */
-#define	SIGCONT		18	/* Continue (POSIX).  */
-#define	SIGSTOP		19	/* Stop, unblockable (POSIX).  */
-#define	SIGTSTP		20	/* Keyboard stop (POSIX).  */
-#define	SIGTTIN		21	/* Background read from tty (POSIX).  */
-#define	SIGTTOU		22	/* Background write to tty (POSIX).  */
-#define	SIGURG		23	/* Urgent condition on socket (4.2 BSD).  */
-#define	SIGXCPU		24	/* CPU limit exceeded (4.2 BSD).  */
-#define	SIGXFSZ		25	/* File size limit exceeded (4.2 BSD).  */
-#define	SIGVTALRM	26	/* Virtual alarm clock (4.2 BSD).  */
-#define	SIGPROF		27	/* Profiling alarm clock (4.2 BSD).  */
-#define	SIGWINCH	28	/* Window size change (4.3 BSD, Sun).  */
-#define	SIGPOLL		SIGIO	/* Pollable event occurred (System V).  */
-#define	SIGIO		29	/* I/O now possible (4.2 BSD).  */
-#define	SIGPWR		30	/* Power failure restart (System V).  */
-#define SIGSYS		31	/* Bad system call.  */
-#define SIGUNUSED	31
-
-#define	_NSIG		65	/* Biggest signal number + 1
-				   (including real-time signals).  */
-
-#define SIGRTMIN        (__libc_current_sigrtmin ())
-#define SIGRTMAX        (__libc_current_sigrtmax ())
-
-/* These are the hard limits of the kernel.  These values should not be
-   used directly at user level.  */
-#define __SIGRTMIN	32
-#define __SIGRTMAX	(_NSIG - 1)
-
-#endif	/* <signal.h> included.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/sigset.h b/openflow/usr/include/arm-linux-gnueabihf/bits/sigset.h
deleted file mode 100644
index 72de7b5..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/sigset.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* __sig_atomic_t, __sigset_t, and related definitions.  Linux version.
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SIGSET_H_types
-# define _SIGSET_H_types	1
-
-typedef int __sig_atomic_t;
-
-/* A `sigset_t' has a bit for each signal.  */
-
-# define _SIGSET_NWORDS	(1024 / (8 * sizeof (unsigned long int)))
-typedef struct
-  {
-    unsigned long int __val[_SIGSET_NWORDS];
-  } __sigset_t;
-
-#endif
-
-
-/* We only want to define these functions if <signal.h> was actually
-   included; otherwise we were included just to define the types.  Since we
-   are namespace-clean, it wouldn't hurt to define extra macros.  But
-   trouble can be caused by functions being defined (e.g., any global
-   register vars declared later will cause compilation errors).  */
-
-#if !defined _SIGSET_H_fns && defined _SIGNAL_H
-# define _SIGSET_H_fns 1
-
-# ifndef _EXTERN_INLINE
-#  define _EXTERN_INLINE __extern_inline
-# endif
-
-/* Return a mask that includes the bit for SIG only.  */
-# define __sigmask(sig) \
-  (((unsigned long int) 1) << (((sig) - 1) % (8 * sizeof (unsigned long int))))
-
-/* Return the word index for SIG.  */
-# define __sigword(sig)	(((sig) - 1) / (8 * sizeof (unsigned long int)))
-
-# if defined __GNUC__ && __GNUC__ >= 2
-#  define __sigemptyset(set) \
-  (__extension__ ({ int __cnt = _SIGSET_NWORDS;				      \
-		    sigset_t *__set = (set);				      \
-		    while (--__cnt >= 0) __set->__val[__cnt] = 0;	      \
-		    0; }))
-#  define __sigfillset(set) \
-  (__extension__ ({ int __cnt = _SIGSET_NWORDS;				      \
-		    sigset_t *__set = (set);				      \
-		    while (--__cnt >= 0) __set->__val[__cnt] = ~0UL;	      \
-		    0; }))
-
-#  ifdef __USE_GNU
-/* The POSIX does not specify for handling the whole signal set in one
-   command.  This is often wanted and so we define three more functions
-   here.  */
-#   define __sigisemptyset(set) \
-  (__extension__ ({ int __cnt = _SIGSET_NWORDS;				      \
-		    const sigset_t *__set = (set);			      \
-		    int __ret = __set->__val[--__cnt];			      \
-		    while (!__ret && --__cnt >= 0)			      \
-			__ret = __set->__val[__cnt];			      \
-		    __ret == 0; }))
-#   define __sigandset(dest, left, right) \
-  (__extension__ ({ int __cnt = _SIGSET_NWORDS;				      \
-		    sigset_t *__dest = (dest);				      \
-		    const sigset_t *__left = (left);			      \
-		    const sigset_t *__right = (right);			      \
-		    while (--__cnt >= 0)				      \
-		      __dest->__val[__cnt] = (__left->__val[__cnt]	      \
-					      & __right->__val[__cnt]);	      \
-		    0; }))
-#   define __sigorset(dest, left, right) \
-  (__extension__ ({ int __cnt = _SIGSET_NWORDS;				      \
-		    sigset_t *__dest = (dest);				      \
-		    const sigset_t *__left = (left);			      \
-		    const sigset_t *__right = (right);			      \
-		    while (--__cnt >= 0)				      \
-		      __dest->__val[__cnt] = (__left->__val[__cnt]	      \
-					      | __right->__val[__cnt]);	      \
-		    0; }))
-#  endif
-# endif
-
-/* These functions needn't check for a bogus signal number -- error
-   checking is done in the non __ versions.  */
-
-extern int __sigismember (const __sigset_t *, int);
-extern int __sigaddset (__sigset_t *, int);
-extern int __sigdelset (__sigset_t *, int);
-
-# ifdef __USE_EXTERN_INLINES
-#  define __SIGSETFN(NAME, BODY, CONST)					      \
-  _EXTERN_INLINE int							      \
-  NAME (CONST __sigset_t *__set, int __sig)				      \
-  {									      \
-    unsigned long int __mask = __sigmask (__sig);			      \
-    unsigned long int __word = __sigword (__sig);			      \
-    return BODY;							      \
-  }
-
-__SIGSETFN (__sigismember, (__set->__val[__word] & __mask) ? 1 : 0, const)
-__SIGSETFN (__sigaddset, ((__set->__val[__word] |= __mask), 0), )
-__SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), )
-
-#  undef __SIGSETFN
-# endif
-
-
-#endif /* ! _SIGSET_H_fns.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/sigstack.h b/openflow/usr/include/arm-linux-gnueabihf/bits/sigstack.h
deleted file mode 100644
index 115a98e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/sigstack.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* sigstack, sigaltstack definitions.
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SIGNAL_H
-# error "Never include this file directly.  Use <signal.h> instead"
-#endif
-
-
-/* Structure describing a signal stack (obsolete).  */
-struct sigstack
-  {
-    void *ss_sp;		/* Signal stack pointer.  */
-    int ss_onstack;		/* Nonzero if executing on this stack.  */
-  };
-
-
-/* Possible values for `ss_flags.'.  */
-enum
-{
-  SS_ONSTACK = 1,
-#define SS_ONSTACK	SS_ONSTACK
-  SS_DISABLE
-#define SS_DISABLE	SS_DISABLE
-};
-
-/* Minimum stack size for a signal handler.  */
-#define MINSIGSTKSZ	2048
-
-/* System default stack size.  */
-#define SIGSTKSZ	8192
-
-
-/* Alternate, preferred interface.  */
-typedef struct sigaltstack
-  {
-    void *ss_sp;
-    int ss_flags;
-    size_t ss_size;
-  } stack_t;
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/sigthread.h b/openflow/usr/include/arm-linux-gnueabihf/bits/sigthread.h
deleted file mode 100644
index 32ef1a9..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/sigthread.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Signal handling function for threaded programs.
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _BITS_SIGTHREAD_H
-#define _BITS_SIGTHREAD_H	1
-
-#if !defined _SIGNAL_H && !defined _PTHREAD_H
-# error "Never include this file directly.  Use <pthread.h> instead"
-#endif
-
-/* Functions for handling signals. */
-
-/* Modify the signal mask for the calling thread.  The arguments have
-   the same meaning as for sigprocmask(2). */
-extern int pthread_sigmask (int __how,
-			    const __sigset_t *__restrict __newmask,
-			    __sigset_t *__restrict __oldmask)__THROW;
-
-/* Send signal SIGNO to the given thread. */
-extern int pthread_kill (pthread_t __threadid, int __signo) __THROW;
-
-#ifdef __USE_GNU
-/* Queue signal and data to a thread.  */
-extern int pthread_sigqueue (pthread_t __threadid, int __signo,
-			     const union sigval __value) __THROW;
-#endif
-
-#endif	/* bits/sigthread.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/sockaddr.h b/openflow/usr/include/arm-linux-gnueabihf/bits/sockaddr.h
deleted file mode 100644
index 0af58c9..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/sockaddr.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Definition of struct sockaddr_* common members and sizes, generic version.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * Never include this file directly; use <sys/socket.h> instead.
- */
-
-#ifndef _BITS_SOCKADDR_H
-#define _BITS_SOCKADDR_H	1
-
-
-/* POSIX.1g specifies this type name for the `sa_family' member.  */
-typedef unsigned short int sa_family_t;
-
-/* This macro is used to declare the initial common members
-   of the data types used for socket addresses, `struct sockaddr',
-   `struct sockaddr_in', `struct sockaddr_un', etc.  */
-
-#define	__SOCKADDR_COMMON(sa_prefix) \
-  sa_family_t sa_prefix##family
-
-#define __SOCKADDR_COMMON_SIZE	(sizeof (unsigned short int))
-
-/* Size of struct sockaddr_storage.  */
-#define _SS_SIZE 128
-
-#endif	/* bits/sockaddr.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/socket.h b/openflow/usr/include/arm-linux-gnueabihf/bits/socket.h
deleted file mode 100644
index 50bfbc3..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/socket.h
+++ /dev/null
@@ -1,389 +0,0 @@
-/* System-specific socket constants and types.  Linux version.
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __BITS_SOCKET_H
-#define __BITS_SOCKET_H
-
-#ifndef _SYS_SOCKET_H
-# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
-#endif
-
-#define __need_size_t
-#include <stddef.h>
-
-#include <sys/types.h>
-
-/* Type for length arguments in socket calls.  */
-#ifndef __socklen_t_defined
-typedef __socklen_t socklen_t;
-# define __socklen_t_defined
-#endif
-
-/* Get the architecture-dependent definition of enum __socket_type.  */
-#include <bits/socket_type.h>
-
-/* Protocol families.  */
-#define PF_UNSPEC	0	/* Unspecified.  */
-#define PF_LOCAL	1	/* Local to host (pipes and file-domain).  */
-#define PF_UNIX		PF_LOCAL /* POSIX name for PF_LOCAL.  */
-#define PF_FILE		PF_LOCAL /* Another non-standard name for PF_LOCAL.  */
-#define PF_INET		2	/* IP protocol family.  */
-#define PF_AX25		3	/* Amateur Radio AX.25.  */
-#define PF_IPX		4	/* Novell Internet Protocol.  */
-#define PF_APPLETALK	5	/* Appletalk DDP.  */
-#define PF_NETROM	6	/* Amateur radio NetROM.  */
-#define PF_BRIDGE	7	/* Multiprotocol bridge.  */
-#define PF_ATMPVC	8	/* ATM PVCs.  */
-#define PF_X25		9	/* Reserved for X.25 project.  */
-#define PF_INET6	10	/* IP version 6.  */
-#define PF_ROSE		11	/* Amateur Radio X.25 PLP.  */
-#define PF_DECnet	12	/* Reserved for DECnet project.  */
-#define PF_NETBEUI	13	/* Reserved for 802.2LLC project.  */
-#define PF_SECURITY	14	/* Security callback pseudo AF.  */
-#define PF_KEY		15	/* PF_KEY key management API.  */
-#define PF_NETLINK	16
-#define PF_ROUTE	PF_NETLINK /* Alias to emulate 4.4BSD.  */
-#define PF_PACKET	17	/* Packet family.  */
-#define PF_ASH		18	/* Ash.  */
-#define PF_ECONET	19	/* Acorn Econet.  */
-#define PF_ATMSVC	20	/* ATM SVCs.  */
-#define PF_RDS		21	/* RDS sockets.  */
-#define PF_SNA		22	/* Linux SNA Project */
-#define PF_IRDA		23	/* IRDA sockets.  */
-#define PF_PPPOX	24	/* PPPoX sockets.  */
-#define PF_WANPIPE	25	/* Wanpipe API sockets.  */
-#define PF_LLC		26	/* Linux LLC.  */
-#define PF_IB		27	/* Native InfiniBand address.  */
-#define PF_MPLS		28	/* MPLS.  */
-#define PF_CAN		29	/* Controller Area Network.  */
-#define PF_TIPC		30	/* TIPC sockets.  */
-#define PF_BLUETOOTH	31	/* Bluetooth sockets.  */
-#define PF_IUCV		32	/* IUCV sockets.  */
-#define PF_RXRPC	33	/* RxRPC sockets.  */
-#define PF_ISDN		34	/* mISDN sockets.  */
-#define PF_PHONET	35	/* Phonet sockets.  */
-#define PF_IEEE802154	36	/* IEEE 802.15.4 sockets.  */
-#define PF_CAIF		37	/* CAIF sockets.  */
-#define PF_ALG		38	/* Algorithm sockets.  */
-#define PF_NFC		39	/* NFC sockets.  */
-#define PF_VSOCK	40	/* vSockets.  */
-#define PF_MAX		41	/* For now..  */
-
-/* Address families.  */
-#define AF_UNSPEC	PF_UNSPEC
-#define AF_LOCAL	PF_LOCAL
-#define AF_UNIX		PF_UNIX
-#define AF_FILE		PF_FILE
-#define AF_INET		PF_INET
-#define AF_AX25		PF_AX25
-#define AF_IPX		PF_IPX
-#define AF_APPLETALK	PF_APPLETALK
-#define AF_NETROM	PF_NETROM
-#define AF_BRIDGE	PF_BRIDGE
-#define AF_ATMPVC	PF_ATMPVC
-#define AF_X25		PF_X25
-#define AF_INET6	PF_INET6
-#define AF_ROSE		PF_ROSE
-#define AF_DECnet	PF_DECnet
-#define AF_NETBEUI	PF_NETBEUI
-#define AF_SECURITY	PF_SECURITY
-#define AF_KEY		PF_KEY
-#define AF_NETLINK	PF_NETLINK
-#define AF_ROUTE	PF_ROUTE
-#define AF_PACKET	PF_PACKET
-#define AF_ASH		PF_ASH
-#define AF_ECONET	PF_ECONET
-#define AF_ATMSVC	PF_ATMSVC
-#define AF_RDS		PF_RDS
-#define AF_SNA		PF_SNA
-#define AF_IRDA		PF_IRDA
-#define AF_PPPOX	PF_PPPOX
-#define AF_WANPIPE	PF_WANPIPE
-#define AF_LLC		PF_LLC
-#define AF_IB		PF_IB
-#define AF_MPLS		PF_MPLS
-#define AF_CAN		PF_CAN
-#define AF_TIPC		PF_TIPC
-#define AF_BLUETOOTH	PF_BLUETOOTH
-#define AF_IUCV		PF_IUCV
-#define AF_RXRPC	PF_RXRPC
-#define AF_ISDN		PF_ISDN
-#define AF_PHONET	PF_PHONET
-#define AF_IEEE802154	PF_IEEE802154
-#define AF_CAIF		PF_CAIF
-#define AF_ALG		PF_ALG
-#define AF_NFC		PF_NFC
-#define AF_VSOCK	PF_VSOCK
-#define AF_MAX		PF_MAX
-
-/* Socket level values.  Others are defined in the appropriate headers.
-
-   XXX These definitions also should go into the appropriate headers as
-   far as they are available.  */
-#define SOL_RAW		255
-#define SOL_DECNET      261
-#define SOL_X25         262
-#define SOL_PACKET	263
-#define SOL_ATM		264	/* ATM layer (cell level).  */
-#define SOL_AAL		265	/* ATM Adaption Layer (packet level).  */
-#define SOL_IRDA	266
-
-/* Maximum queue length specifiable by listen.  */
-#define SOMAXCONN	128
-
-/* Get the definition of the macro to define the common sockaddr members.  */
-#include <bits/sockaddr.h>
-
-/* Structure describing a generic socket address.  */
-struct sockaddr
-  {
-    __SOCKADDR_COMMON (sa_);	/* Common data: address family and length.  */
-    char sa_data[14];		/* Address data.  */
-  };
-
-
-/* Structure large enough to hold any socket address (with the historical
-   exception of AF_UNIX).  */
-#define __ss_aligntype	unsigned long int
-#define _SS_PADSIZE \
-  (_SS_SIZE - __SOCKADDR_COMMON_SIZE - sizeof (__ss_aligntype))
-
-struct sockaddr_storage
-  {
-    __SOCKADDR_COMMON (ss_);	/* Address family, etc.  */
-    char __ss_padding[_SS_PADSIZE];
-    __ss_aligntype __ss_align;	/* Force desired alignment.  */
-  };
-
-
-/* Bits in the FLAGS argument to `send', `recv', et al.  */
-enum
-  {
-    MSG_OOB		= 0x01,	/* Process out-of-band data.  */
-#define MSG_OOB		MSG_OOB
-    MSG_PEEK		= 0x02,	/* Peek at incoming messages.  */
-#define MSG_PEEK	MSG_PEEK
-    MSG_DONTROUTE	= 0x04,	/* Don't use local routing.  */
-#define MSG_DONTROUTE	MSG_DONTROUTE
-#ifdef __USE_GNU
-    /* DECnet uses a different name.  */
-    MSG_TRYHARD		= MSG_DONTROUTE,
-# define MSG_TRYHARD	MSG_DONTROUTE
-#endif
-    MSG_CTRUNC		= 0x08,	/* Control data lost before delivery.  */
-#define MSG_CTRUNC	MSG_CTRUNC
-    MSG_PROXY		= 0x10,	/* Supply or ask second address.  */
-#define MSG_PROXY	MSG_PROXY
-    MSG_TRUNC		= 0x20,
-#define MSG_TRUNC	MSG_TRUNC
-    MSG_DONTWAIT	= 0x40, /* Nonblocking IO.  */
-#define MSG_DONTWAIT	MSG_DONTWAIT
-    MSG_EOR		= 0x80, /* End of record.  */
-#define MSG_EOR		MSG_EOR
-    MSG_WAITALL		= 0x100, /* Wait for a full request.  */
-#define MSG_WAITALL	MSG_WAITALL
-    MSG_FIN		= 0x200,
-#define MSG_FIN		MSG_FIN
-    MSG_SYN		= 0x400,
-#define MSG_SYN		MSG_SYN
-    MSG_CONFIRM		= 0x800, /* Confirm path validity.  */
-#define MSG_CONFIRM	MSG_CONFIRM
-    MSG_RST		= 0x1000,
-#define MSG_RST		MSG_RST
-    MSG_ERRQUEUE	= 0x2000, /* Fetch message from error queue.  */
-#define MSG_ERRQUEUE	MSG_ERRQUEUE
-    MSG_NOSIGNAL	= 0x4000, /* Do not generate SIGPIPE.  */
-#define MSG_NOSIGNAL	MSG_NOSIGNAL
-    MSG_MORE		= 0x8000,  /* Sender will send more.  */
-#define MSG_MORE	MSG_MORE
-    MSG_WAITFORONE	= 0x10000, /* Wait for at least one packet to return.*/
-#define MSG_WAITFORONE	MSG_WAITFORONE
-    MSG_FASTOPEN	= 0x20000000, /* Send data in TCP SYN.  */
-#define MSG_FASTOPEN	MSG_FASTOPEN
-
-    MSG_CMSG_CLOEXEC	= 0x40000000	/* Set close_on_exit for file
-					   descriptor received through
-					   SCM_RIGHTS.  */
-#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
-  };
-
-
-/* Structure describing messages sent by
-   `sendmsg' and received by `recvmsg'.  */
-struct msghdr
-  {
-    void *msg_name;		/* Address to send to/receive from.  */
-    socklen_t msg_namelen;	/* Length of address data.  */
-
-    struct iovec *msg_iov;	/* Vector of data to send/receive into.  */
-    size_t msg_iovlen;		/* Number of elements in the vector.  */
-
-    void *msg_control;		/* Ancillary data (eg BSD filedesc passing). */
-    size_t msg_controllen;	/* Ancillary data buffer length.
-				   !! The type should be socklen_t but the
-				   definition of the kernel is incompatible
-				   with this.  */
-
-    int msg_flags;		/* Flags on received message.  */
-  };
-
-/* Structure used for storage of ancillary data object information.  */
-struct cmsghdr
-  {
-    size_t cmsg_len;		/* Length of data in cmsg_data plus length
-				   of cmsghdr structure.
-				   !! The type should be socklen_t but the
-				   definition of the kernel is incompatible
-				   with this.  */
-    int cmsg_level;		/* Originating protocol.  */
-    int cmsg_type;		/* Protocol specific type.  */
-#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
-    __extension__ unsigned char __cmsg_data __flexarr; /* Ancillary data.  */
-#endif
-  };
-
-/* Ancillary data object manipulation macros.  */
-#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
-# define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
-#else
-# define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1))
-#endif
-#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
-#define CMSG_FIRSTHDR(mhdr) \
-  ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr)		      \
-   ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0)
-#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
-			 & (size_t) ~(sizeof (size_t) - 1))
-#define CMSG_SPACE(len) (CMSG_ALIGN (len) \
-			 + CMSG_ALIGN (sizeof (struct cmsghdr)))
-#define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
-
-extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
-				      struct cmsghdr *__cmsg) __THROW;
-#ifdef __USE_EXTERN_INLINES
-# ifndef _EXTERN_INLINE
-#  define _EXTERN_INLINE __extern_inline
-# endif
-_EXTERN_INLINE struct cmsghdr *
-__NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
-{
-  if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
-    /* The kernel header does this so there may be a reason.  */
-    return (struct cmsghdr *) 0;
-
-  __cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
-			       + CMSG_ALIGN (__cmsg->cmsg_len));
-  if ((unsigned char *) (__cmsg + 1) > ((unsigned char *) __mhdr->msg_control
-					+ __mhdr->msg_controllen)
-      || ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
-	  > ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
-    /* No more entries.  */
-    return (struct cmsghdr *) 0;
-  return __cmsg;
-}
-#endif	/* Use `extern inline'.  */
-
-/* Socket level message types.  This must match the definitions in
-   <linux/socket.h>.  */
-enum
-  {
-    SCM_RIGHTS = 0x01		/* Transfer file descriptors.  */
-#define SCM_RIGHTS SCM_RIGHTS
-#ifdef __USE_GNU
-    , SCM_CREDENTIALS = 0x02	/* Credentials passing.  */
-# define SCM_CREDENTIALS SCM_CREDENTIALS
-#endif
-  };
-
-#ifdef __USE_GNU
-/* User visible structure for SCM_CREDENTIALS message */
-struct ucred
-{
-  pid_t pid;			/* PID of sending process.  */
-  uid_t uid;			/* UID of sending process.  */
-  gid_t gid;			/* GID of sending process.  */
-};
-#endif
-
-/* Ugly workaround for unclean kernel headers.  */
-#ifndef __USE_MISC
-# ifndef FIOGETOWN
-#  define __SYS_SOCKET_H_undef_FIOGETOWN
-# endif
-# ifndef FIOSETOWN
-#  define __SYS_SOCKET_H_undef_FIOSETOWN
-# endif
-# ifndef SIOCATMARK
-#  define __SYS_SOCKET_H_undef_SIOCATMARK
-# endif
-# ifndef SIOCGPGRP
-#  define __SYS_SOCKET_H_undef_SIOCGPGRP
-# endif
-# ifndef SIOCGSTAMP
-#  define __SYS_SOCKET_H_undef_SIOCGSTAMP
-# endif
-# ifndef SIOCGSTAMPNS
-#  define __SYS_SOCKET_H_undef_SIOCGSTAMPNS
-# endif
-# ifndef SIOCSPGRP
-#  define __SYS_SOCKET_H_undef_SIOCSPGRP
-# endif
-#endif
-
-/* Get socket manipulation related informations from kernel headers.  */
-#include <asm/socket.h>
-
-#ifndef __USE_MISC
-# ifdef __SYS_SOCKET_H_undef_FIOGETOWN
-#  undef __SYS_SOCKET_H_undef_FIOGETOWN
-#  undef FIOGETOWN
-# endif
-# ifdef __SYS_SOCKET_H_undef_FIOSETOWN
-#  undef __SYS_SOCKET_H_undef_FIOSETOWN
-#  undef FIOSETOWN
-# endif
-# ifdef __SYS_SOCKET_H_undef_SIOCATMARK
-#  undef __SYS_SOCKET_H_undef_SIOCATMARK
-#  undef SIOCATMARK
-# endif
-# ifdef __SYS_SOCKET_H_undef_SIOCGPGRP
-#  undef __SYS_SOCKET_H_undef_SIOCGPGRP
-#  undef SIOCGPGRP
-# endif
-# ifdef __SYS_SOCKET_H_undef_SIOCGSTAMP
-#  undef __SYS_SOCKET_H_undef_SIOCGSTAMP
-#  undef SIOCGSTAMP
-# endif
-# ifdef __SYS_SOCKET_H_undef_SIOCGSTAMPNS
-#  undef __SYS_SOCKET_H_undef_SIOCGSTAMPNS
-#  undef SIOCGSTAMPNS
-# endif
-# ifdef __SYS_SOCKET_H_undef_SIOCSPGRP
-#  undef __SYS_SOCKET_H_undef_SIOCSPGRP
-#  undef SIOCSPGRP
-# endif
-#endif
-
-/* Structure used to manipulate the SO_LINGER option.  */
-struct linger
-  {
-    int l_onoff;		/* Nonzero to linger on close.  */
-    int l_linger;		/* Time to linger.  */
-  };
-
-#endif	/* bits/socket.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/socket2.h b/openflow/usr/include/arm-linux-gnueabihf/bits/socket2.h
deleted file mode 100644
index f499518..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/socket2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Checking macros for socket functions.
-   Copyright (C) 2005-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SOCKET_H
-# error "Never include <bits/socket2.h> directly; use <sys/socket.h> instead."
-#endif
-
-extern ssize_t __recv_chk (int __fd, void *__buf, size_t __n, size_t __buflen,
-			   int __flags);
-extern ssize_t __REDIRECT (__recv_alias, (int __fd, void *__buf, size_t __n,
-					  int __flags), recv);
-extern ssize_t __REDIRECT (__recv_chk_warn,
-			   (int __fd, void *__buf, size_t __n, size_t __buflen,
-			    int __flags), __recv_chk)
-     __warnattr ("recv called with bigger length than size of destination "
-		 "buffer");
-
-__fortify_function ssize_t
-recv (int __fd, void *__buf, size_t __n, int __flags)
-{
-  if (__bos0 (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n))
-	return __recv_chk (__fd, __buf, __n, __bos0 (__buf), __flags);
-
-      if (__n > __bos0 (__buf))
-	return __recv_chk_warn (__fd, __buf, __n, __bos0 (__buf), __flags);
-    }
-  return __recv_alias (__fd, __buf, __n, __flags);
-}
-
-extern ssize_t __recvfrom_chk (int __fd, void *__restrict __buf, size_t __n,
-			       size_t __buflen, int __flags,
-			       __SOCKADDR_ARG __addr,
-			       socklen_t *__restrict __addr_len);
-extern ssize_t __REDIRECT (__recvfrom_alias,
-			   (int __fd, void *__restrict __buf, size_t __n,
-			    int __flags, __SOCKADDR_ARG __addr,
-			    socklen_t *__restrict __addr_len), recvfrom);
-extern ssize_t __REDIRECT (__recvfrom_chk_warn,
-			   (int __fd, void *__restrict __buf, size_t __n,
-			    size_t __buflen, int __flags,
-			    __SOCKADDR_ARG __addr,
-			    socklen_t *__restrict __addr_len), __recvfrom_chk)
-     __warnattr ("recvfrom called with bigger length than size of "
-		 "destination buffer");
-
-__fortify_function ssize_t
-recvfrom (int __fd, void *__restrict __buf, size_t __n, int __flags,
-	  __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len)
-{
-  if (__bos0 (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n))
-	return __recvfrom_chk (__fd, __buf, __n, __bos0 (__buf), __flags,
-			       __addr, __addr_len);
-      if (__n > __bos0 (__buf))
-	return __recvfrom_chk_warn (__fd, __buf, __n, __bos0 (__buf), __flags,
-				    __addr, __addr_len);
-    }
-  return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len);
-}
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/socket_type.h b/openflow/usr/include/arm-linux-gnueabihf/bits/socket_type.h
deleted file mode 100644
index 8501efb..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/socket_type.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Define enum __socket_type for generic Linux.
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SOCKET_H
-# error "Never include <bits/socket_type.h> directly; use <sys/socket.h> instead."
-#endif
-
-/* Types of sockets.  */
-enum __socket_type
-{
-  SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
-				   byte streams.  */
-#define SOCK_STREAM SOCK_STREAM
-  SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
-				   of fixed maximum length.  */
-#define SOCK_DGRAM SOCK_DGRAM
-  SOCK_RAW = 3,			/* Raw protocol interface.  */
-#define SOCK_RAW SOCK_RAW
-  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
-#define SOCK_RDM SOCK_RDM
-  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
-				   datagrams of fixed maximum length.  */
-#define SOCK_SEQPACKET SOCK_SEQPACKET
-  SOCK_DCCP = 6,		/* Datagram Congestion Control Protocol.  */
-#define SOCK_DCCP SOCK_DCCP
-  SOCK_PACKET = 10,		/* Linux specific way of getting packets
-				   at the dev level.  For writing rarp and
-				   other similar things on the user level. */
-#define SOCK_PACKET SOCK_PACKET
-
-  /* Flags to be ORed into the type parameter of socket and socketpair and
-     used for the flags parameter of paccept.  */
-
-  SOCK_CLOEXEC = 02000000,	/* Atomically set close-on-exec flag for the
-				   new descriptor(s).  */
-#define SOCK_CLOEXEC SOCK_CLOEXEC
-  SOCK_NONBLOCK = 00004000	/* Atomically mark descriptor(s) as
-				   non-blocking.  */
-#define SOCK_NONBLOCK SOCK_NONBLOCK
-};
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stab.def b/openflow/usr/include/arm-linux-gnueabihf/bits/stab.def
deleted file mode 100644
index 2af2ddf..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stab.def
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Table of DBX symbol codes for the GNU system.
-   Copyright (C) 1988, 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* This contains contribution from Cygnus Support.  */
-
-/* Global variable.  Only the name is significant.
-   To find the address, look in the corresponding external symbol.  */
-__define_stab (N_GSYM, 0x20, "GSYM")
-
-/* Function name for BSD Fortran.  Only the name is significant.
-   To find the address, look in the corresponding external symbol.  */
-__define_stab (N_FNAME, 0x22, "FNAME")
-
-/* Function name or text-segment variable for C.  Value is its address.
-   Desc is supposedly starting line number, but GCC doesn't set it
-   and DBX seems not to miss it.  */
-__define_stab (N_FUN, 0x24, "FUN")
-
-/* Data-segment variable with internal linkage.  Value is its address.
-   "Static Sym".  */
-__define_stab (N_STSYM, 0x26, "STSYM")
-
-/* BSS-segment variable with internal linkage.  Value is its address.  */
-__define_stab (N_LCSYM, 0x28, "LCSYM")
-
-/* Name of main routine.  Only the name is significant.
-   This is not used in C.  */
-__define_stab (N_MAIN, 0x2a, "MAIN")
-
-/* Global symbol in Pascal.
-   Supposedly the value is its line number; I'm skeptical.  */
-__define_stab (N_PC, 0x30, "PC")
-
-/* Number of symbols:  0, files,,funcs,lines according to Ultrix V4.0. */
-__define_stab (N_NSYMS, 0x32, "NSYMS")
-
-/* "No DST map for sym: name, ,0,type,ignored"  according to Ultrix V4.0. */
-__define_stab (N_NOMAP, 0x34, "NOMAP")
-
-/* New stab from Solaris.  I don't know what it means, but it
-   don't seem to contain useful information.  */
-__define_stab (N_OBJ, 0x38, "OBJ")
-
-/* New stab from Solaris.  I don't know what it means, but it
-   don't seem to contain useful information.  Possibly related to the
-   optimization flags used in this module.  */
-__define_stab (N_OPT, 0x3c, "OPT")
-
-/* Register variable.  Value is number of register.  */
-__define_stab (N_RSYM, 0x40, "RSYM")
-
-/* Modula-2 compilation unit.  Can someone say what info it contains?  */
-__define_stab (N_M2C, 0x42, "M2C")
-
-/* Line number in text segment.  Desc is the line number;
-   value is corresponding address.  */
-__define_stab (N_SLINE, 0x44, "SLINE")
-
-/* Similar, for data segment.  */
-__define_stab (N_DSLINE, 0x46, "DSLINE")
-
-/* Similar, for bss segment.  */
-__define_stab (N_BSLINE, 0x48, "BSLINE")
-
-/* Sun's source-code browser stabs.  ?? Don't know what the fields are.
-   Supposedly the field is "path to associated .cb file".  THIS VALUE
-   OVERLAPS WITH N_BSLINE!  */
-__define_stab (N_BROWS, 0x48, "BROWS")
-
-/* GNU Modula-2 definition module dependency.  Value is the modification time
-   of the definition file.  Other is non-zero if it is imported with the
-   GNU M2 keyword %INITIALIZE.  Perhaps N_M2C can be used if there
-   are enough empty fields? */
-__define_stab(N_DEFD, 0x4a, "DEFD")
-
-/* THE FOLLOWING TWO STAB VALUES CONFLICT.  Happily, one is for Modula-2
-   and one is for C++.   Still,... */
-/* GNU C++ exception variable.  Name is variable name.  */
-__define_stab (N_EHDECL, 0x50, "EHDECL")
-/* Modula2 info "for imc":  name,,0,0,0  according to Ultrix V4.0.  */
-__define_stab (N_MOD2, 0x50, "MOD2")
-
-/* GNU C++ `catch' clause.  Value is its address.  Desc is nonzero if
-   this entry is immediately followed by a CAUGHT stab saying what exception
-   was caught.  Multiple CAUGHT stabs means that multiple exceptions
-   can be caught here.  If Desc is 0, it means all exceptions are caught
-   here.  */
-__define_stab (N_CATCH, 0x54, "CATCH")
-
-/* Structure or union element.  Value is offset in the structure.  */
-__define_stab (N_SSYM, 0x60, "SSYM")
-
-/* Name of main source file.
-   Value is starting text address of the compilation.  */
-__define_stab (N_SO, 0x64, "SO")
-
-/* Automatic variable in the stack.  Value is offset from frame pointer.
-   Also used for type descriptions.  */
-__define_stab (N_LSYM, 0x80, "LSYM")
-
-/* Beginning of an include file.  Only Sun uses this.
-   In an object file, only the name is significant.
-   The Sun linker puts data into some of the other fields.  */
-__define_stab (N_BINCL, 0x82, "BINCL")
-
-/* Name of sub-source file (#include file).
-   Value is starting text address of the compilation.  */
-__define_stab (N_SOL, 0x84, "SOL")
-
-/* Parameter variable.  Value is offset from argument pointer.
-   (On most machines the argument pointer is the same as the frame pointer.  */
-__define_stab (N_PSYM, 0xa0, "PSYM")
-
-/* End of an include file.  No name.
-   This and N_BINCL act as brackets around the file's output.
-   In an object file, there is no significant data in this entry.
-   The Sun linker puts data into some of the fields.  */
-__define_stab (N_EINCL, 0xa2, "EINCL")
-
-/* Alternate entry point.  Value is its address.  */
-__define_stab (N_ENTRY, 0xa4, "ENTRY")
-
-/* Beginning of lexical block.
-   The desc is the nesting level in lexical blocks.
-   The value is the address of the start of the text for the block.
-   The variables declared inside the block *precede* the N_LBRAC symbol.  */
-__define_stab (N_LBRAC, 0xc0, "LBRAC")
-
-/* Place holder for deleted include file.  Replaces a N_BINCL and everything
-   up to the corresponding N_EINCL.  The Sun linker generates these when
-   it finds multiple identical copies of the symbols from an include file.
-   This appears only in output from the Sun linker.  */
-__define_stab (N_EXCL, 0xc2, "EXCL")
-
-/* Modula-2 scope information.  Can someone say what info it contains?  */
-__define_stab (N_SCOPE, 0xc4, "SCOPE")
-
-/* End of a lexical block.  Desc matches the N_LBRAC's desc.
-   The value is the address of the end of the text for the block.  */
-__define_stab (N_RBRAC, 0xe0, "RBRAC")
-
-/* Begin named common block.  Only the name is significant.  */
-__define_stab (N_BCOMM, 0xe2, "BCOMM")
-
-/* End named common block.  Only the name is significant
-   (and it should match the N_BCOMM).  */
-__define_stab (N_ECOMM, 0xe4, "ECOMM")
-
-/* End common (local name): value is address.
-   I'm not sure how this is used.  */
-__define_stab (N_ECOML, 0xe8, "ECOML")
-
-/* These STAB's are used on Gould systems for Non-Base register symbols
-   or something like that.  FIXME.  I have assigned the values at random
-   since I don't have a Gould here.  Fixups from Gould folk welcome... */
-__define_stab (N_NBTEXT, 0xF0, "NBTEXT")
-__define_stab (N_NBDATA, 0xF2, "NBDATA")
-__define_stab (N_NBBSS,  0xF4, "NBBSS")
-__define_stab (N_NBSTS,  0xF6, "NBSTS")
-__define_stab (N_NBLCS,  0xF8, "NBLCS")
-
-/* Second symbol entry containing a length-value for the preceding entry.
-   The value is the length.  */
-__define_stab (N_LENG, 0xfe, "LENG")
-
-/* The above information, in matrix format.
-
-			STAB MATRIX
-	_________________________________________________
-	| 00 - 1F are not dbx stab symbols		|
-	| In most cases, the low bit is the EXTernal bit|
-
-	| 00 UNDEF  | 02 ABS	| 04 TEXT   | 06 DATA	|
-	| 01  |EXT  | 03  |EXT	| 05  |EXT  | 07  |EXT	|
-
-	| 08 BSS    | 0A INDR	| 0C FN_SEQ | 0E   	|
-	| 09  |EXT  | 0B 	| 0D	    | 0F	|
-
-	| 10 	    | 12 COMM	| 14 SETA   | 16 SETT	|
-	| 11	    | 13	| 15 	    | 17	|
-
-	| 18 SETD   | 1A SETB	| 1C SETV   | 1E WARNING|
-	| 19	    | 1B	| 1D 	    | 1F FN	|
-
-	|_______________________________________________|
-	| Debug entries with bit 01 set are unused.	|
-	| 20 GSYM   | 22 FNAME	| 24 FUN    | 26 STSYM	|
-	| 28 LCSYM  | 2A MAIN	| 2C	    | 2E	|
-	| 30 PC	    | 32 NSYMS	| 34 NOMAP  | 36	|
-	| 38 OBJ    | 3A	| 3C OPT    | 3E	|
-	| 40 RSYM   | 42 M2C	| 44 SLINE  | 46 DSLINE |
-	| 48 BSLINE*| 4A DEFD	| 4C        | 4E	|
-	| 50 EHDECL*| 52	| 54 CATCH  | 56        |
-	| 58        | 5A        | 5C        | 5E	|
-	| 60 SSYM   | 62	| 64 SO	    | 66 	|
-	| 68 	    | 6A	| 6C	    | 6E	|
-	| 70	    | 72	| 74	    | 76	|
-	| 78	    | 7A	| 7C	    | 7E	|
-	| 80 LSYM   | 82 BINCL	| 84 SOL    | 86	|
-	| 88	    | 8A	| 8C	    | 8E	|
-	| 90	    | 92	| 94	    | 96	|
-	| 98	    | 9A	| 9C	    | 9E	|
-	| A0 PSYM   | A2 EINCL	| A4 ENTRY  | A6	|
-	| A8	    | AA	| AC	    | AE	|
-	| B0	    | B2	| B4	    | B6	|
-	| B8	    | BA	| BC	    | BE	|
-	| C0 LBRAC  | C2 EXCL	| C4 SCOPE  | C6	|
-	| C8	    | CA	| CC	    | CE	|
-	| D0	    | D2	| D4	    | D6	|
-	| D8	    | DA	| DC	    | DE	|
-	| E0 RBRAC  | E2 BCOMM	| E4 ECOMM  | E6	|
-	| E8 ECOML  | EA	| EC	    | EE	|
-	| F0	    | F2	| F4	    | F6	|
-	| F8	    | FA	| FC	    | FE LENG	|
-	+-----------------------------------------------+
- * 50 EHDECL is also MOD2.
- * 48 BSLINE is also BROWS.
- */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stat.h b/openflow/usr/include/arm-linux-gnueabihf/bits/stat.h
deleted file mode 100644
index 30d92f3..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stat.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _SYS_STAT_H && !defined _FCNTL_H
-# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
-#endif
-
-#ifndef _BITS_STAT_H
-#define _BITS_STAT_H	1
-
-/* Versions of the `struct stat' data structure.  */
-#define _STAT_VER_LINUX_OLD	1
-#define _STAT_VER_KERNEL	1
-#define _STAT_VER_SVR4		2
-#define _STAT_VER_LINUX		3
-#define _STAT_VER		_STAT_VER_LINUX	/* The one defined below.  */
-
-/* Versions of the `xmknod' interface.  */
-#define _MKNOD_VER_LINUX	1
-#define _MKNOD_VER_SVR4		2
-#define _MKNOD_VER		_MKNOD_VER_LINUX /* The bits defined below.  */
-
-
-struct stat
-  {
-    __dev_t st_dev;			/* Device.  */
-    unsigned short int __pad1;
-#ifndef __USE_FILE_OFFSET64
-    __ino_t st_ino;			/* File serial number.	*/
-#else
-    __ino_t __st_ino;			/* 32bit file serial number.	*/
-#endif
-    __mode_t st_mode;			/* File mode.  */
-    __nlink_t st_nlink;			/* Link count.  */
-    __uid_t st_uid;			/* User ID of the file's owner.	*/
-    __gid_t st_gid;			/* Group ID of the file's group.*/
-    __dev_t st_rdev;			/* Device number, if device.  */
-    unsigned short int __pad2;
-#ifndef __USE_FILE_OFFSET64
-    __off_t st_size;			/* Size of file, in bytes.  */
-#else
-    __off64_t st_size;			/* Size of file, in bytes.  */
-#endif
-    __blksize_t st_blksize;		/* Optimal block size for I/O.  */
-
-#ifndef __USE_FILE_OFFSET64
-    __blkcnt_t st_blocks;		/* Number 512-byte blocks allocated. */
-#else
-    __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
-#endif
-#ifdef __USE_XOPEN2K8
-    /* Nanosecond resolution timestamps are stored in a format
-       equivalent to 'struct timespec'.  This is the type used
-       whenever possible but the Unix namespace rules do not allow the
-       identifier 'timespec' to appear in the <sys/stat.h> header.
-       Therefore we have to handle the use of this header in strictly
-       standard-compliant sources special.  */
-    struct timespec st_atim;		/* Time of last access.  */
-    struct timespec st_mtim;		/* Time of last modification.  */
-    struct timespec st_ctim;		/* Time of last status change.  */
-# define st_atime st_atim.tv_sec	/* Backward compatibility.  */
-# define st_mtime st_mtim.tv_sec
-# define st_ctime st_ctim.tv_sec
-#else
-    __time_t st_atime;			/* Time of last access.  */
-    unsigned long int st_atimensec;	/* Nscecs of last access.  */
-    __time_t st_mtime;			/* Time of last modification.  */
-    unsigned long int st_mtimensec;	/* Nsecs of last modification.  */
-    __time_t st_ctime;			/* Time of last status change.  */
-    unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
-#endif
-#ifndef __USE_FILE_OFFSET64
-    unsigned long int __glibc_reserved4;
-    unsigned long int __glibc_reserved5;
-#else
-    __ino64_t st_ino;			/* File serial number.	*/
-#endif
-  };
-
-#ifdef __USE_LARGEFILE64
-struct stat64
-  {
-    __dev_t st_dev;			/* Device.  */
-    unsigned int __pad1;
-
-    __ino_t __st_ino;			/* 32bit file serial number.	*/
-    __mode_t st_mode;			/* File mode.  */
-    __nlink_t st_nlink;			/* Link count.  */
-    __uid_t st_uid;			/* User ID of the file's owner.	*/
-    __gid_t st_gid;			/* Group ID of the file's group.*/
-    __dev_t st_rdev;			/* Device number, if device.  */
-    unsigned int __pad2;
-    __off64_t st_size;			/* Size of file, in bytes.  */
-    __blksize_t st_blksize;		/* Optimal block size for I/O.  */
-
-    __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
-# ifdef __USE_XOPEN2K8
-    /* Nanosecond resolution timestamps are stored in a format
-       equivalent to 'struct timespec'.  This is the type used
-       whenever possible but the Unix namespace rules do not allow the
-       identifier 'timespec' to appear in the <sys/stat.h> header.
-       Therefore we have to handle the use of this header in strictly
-       standard-compliant sources special.  */
-    struct timespec st_atim;		/* Time of last access.  */
-    struct timespec st_mtim;		/* Time of last modification.  */
-    struct timespec st_ctim;		/* Time of last status change.  */
-# else
-    __time_t st_atime;			/* Time of last access.  */
-    unsigned long int st_atimensec;	/* Nscecs of last access.  */
-    __time_t st_mtime;			/* Time of last modification.  */
-    unsigned long int st_mtimensec;	/* Nsecs of last modification.  */
-    __time_t st_ctime;			/* Time of last status change.  */
-    unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
-# endif
-    __ino64_t st_ino;			/* File serial number.		*/
-  };
-#endif
-
-/* Tell code we have these members.  */
-#define	_STATBUF_ST_BLKSIZE
-#define _STATBUF_ST_RDEV
-/* Nanosecond resolution time values are supported.  */
-#define _STATBUF_ST_NSEC
-
-/* Encoding of the file mode.  */
-
-#define	__S_IFMT	0170000	/* These bits determine file type.  */
-
-/* File types.  */
-#define	__S_IFDIR	0040000	/* Directory.  */
-#define	__S_IFCHR	0020000	/* Character device.  */
-#define	__S_IFBLK	0060000	/* Block device.  */
-#define	__S_IFREG	0100000	/* Regular file.  */
-#define	__S_IFIFO	0010000	/* FIFO.  */
-#define	__S_IFLNK	0120000	/* Symbolic link.  */
-#define	__S_IFSOCK	0140000	/* Socket.  */
-
-/* POSIX.1b objects.  Note that these macros always evaluate to zero.  But
-   they do it by enforcing the correct use of the macros.  */
-#define __S_TYPEISMQ(buf)  ((buf)->st_mode - (buf)->st_mode)
-#define __S_TYPEISSEM(buf) ((buf)->st_mode - (buf)->st_mode)
-#define __S_TYPEISSHM(buf) ((buf)->st_mode - (buf)->st_mode)
-
-/* Protection bits.  */
-
-#define	__S_ISUID	04000	/* Set user ID on execution.  */
-#define	__S_ISGID	02000	/* Set group ID on execution.  */
-#define	__S_ISVTX	01000	/* Save swapped text after use (sticky).  */
-#define	__S_IREAD	0400	/* Read by owner.  */
-#define	__S_IWRITE	0200	/* Write by owner.  */
-#define	__S_IEXEC	0100	/* Execute by owner.  */
-
-#ifdef __USE_ATFILE
-# define UTIME_NOW	((1l << 30) - 1l)
-# define UTIME_OMIT	((1l << 30) - 2l)
-#endif
-
-#endif	/* bits/stat.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/statfs.h b/openflow/usr/include/arm-linux-gnueabihf/bits/statfs.h
deleted file mode 100644
index 28b5952..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/statfs.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_STATFS_H
-# error "Never include <bits/statfs.h> directly; use <sys/statfs.h> instead."
-#endif
-
-#include <bits/types.h>
-
-struct statfs
-  {
-    __fsword_t f_type;
-    __fsword_t f_bsize;
-#ifndef __USE_FILE_OFFSET64
-    __fsblkcnt_t f_blocks;
-    __fsblkcnt_t f_bfree;
-    __fsblkcnt_t f_bavail;
-    __fsfilcnt_t f_files;
-    __fsfilcnt_t f_ffree;
-#else
-    __fsblkcnt64_t f_blocks;
-    __fsblkcnt64_t f_bfree;
-    __fsblkcnt64_t f_bavail;
-    __fsfilcnt64_t f_files;
-    __fsfilcnt64_t f_ffree;
-#endif
-    __fsid_t f_fsid;
-    __fsword_t f_namelen;
-    __fsword_t f_frsize;
-    __fsword_t f_flags;
-    __fsword_t f_spare[4];
-  };
-
-#ifdef __USE_LARGEFILE64
-struct statfs64
-  {
-    __fsword_t f_type;
-    __fsword_t f_bsize;
-    __fsblkcnt64_t f_blocks;
-    __fsblkcnt64_t f_bfree;
-    __fsblkcnt64_t f_bavail;
-    __fsfilcnt64_t f_files;
-    __fsfilcnt64_t f_ffree;
-    __fsid_t f_fsid;
-    __fsword_t f_namelen;
-    __fsword_t f_frsize;
-    __fsword_t f_flags;
-    __fsword_t f_spare[4];
-  };
-#endif
-
-/* Tell code we have these members.  */
-#define _STATFS_F_NAMELEN
-#define _STATFS_F_FRSIZE
-#define _STATFS_F_FLAGS
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/statvfs.h b/openflow/usr/include/arm-linux-gnueabihf/bits/statvfs.h
deleted file mode 100644
index 9244401..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/statvfs.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_STATVFS_H
-# error "Never include <bits/statvfs.h> directly; use <sys/statvfs.h> instead."
-#endif
-
-#include <bits/types.h>  /* For __fsblkcnt_t and __fsfilcnt_t.  */
-
-#if (__WORDSIZE == 32 \
-     && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE == 32))
-#define _STATVFSBUF_F_UNUSED
-#endif
-
-struct statvfs
-  {
-    unsigned long int f_bsize;
-    unsigned long int f_frsize;
-#ifndef __USE_FILE_OFFSET64
-    __fsblkcnt_t f_blocks;
-    __fsblkcnt_t f_bfree;
-    __fsblkcnt_t f_bavail;
-    __fsfilcnt_t f_files;
-    __fsfilcnt_t f_ffree;
-    __fsfilcnt_t f_favail;
-#else
-    __fsblkcnt64_t f_blocks;
-    __fsblkcnt64_t f_bfree;
-    __fsblkcnt64_t f_bavail;
-    __fsfilcnt64_t f_files;
-    __fsfilcnt64_t f_ffree;
-    __fsfilcnt64_t f_favail;
-#endif
-    unsigned long int f_fsid;
-#ifdef _STATVFSBUF_F_UNUSED
-    int __f_unused;
-#endif
-    unsigned long int f_flag;
-    unsigned long int f_namemax;
-    int __f_spare[6];
-  };
-
-#ifdef __USE_LARGEFILE64
-struct statvfs64
-  {
-    unsigned long int f_bsize;
-    unsigned long int f_frsize;
-    __fsblkcnt64_t f_blocks;
-    __fsblkcnt64_t f_bfree;
-    __fsblkcnt64_t f_bavail;
-    __fsfilcnt64_t f_files;
-    __fsfilcnt64_t f_ffree;
-    __fsfilcnt64_t f_favail;
-    unsigned long int f_fsid;
-#ifdef _STATVFSBUF_F_UNUSED
-    int __f_unused;
-#endif
-    unsigned long int f_flag;
-    unsigned long int f_namemax;
-    int __f_spare[6];
-  };
-#endif
-
-/* Definitions for the flag in `f_flag'.  These definitions should be
-   kept in sync with the definitions in <sys/mount.h>.  */
-enum
-{
-  ST_RDONLY = 1,		/* Mount read-only.  */
-#define ST_RDONLY	ST_RDONLY
-  ST_NOSUID = 2			/* Ignore suid and sgid bits.  */
-#define ST_NOSUID	ST_NOSUID
-#ifdef __USE_GNU
-  ,
-  ST_NODEV = 4,			/* Disallow access to device special files.  */
-# define ST_NODEV	ST_NODEV
-  ST_NOEXEC = 8,		/* Disallow program execution.  */
-# define ST_NOEXEC	ST_NOEXEC
-  ST_SYNCHRONOUS = 16,		/* Writes are synced at once.  */
-# define ST_SYNCHRONOUS	ST_SYNCHRONOUS
-  ST_MANDLOCK = 64,		/* Allow mandatory locks on an FS.  */
-# define ST_MANDLOCK	ST_MANDLOCK
-  ST_WRITE = 128,		/* Write on file/directory/symlink.  */
-# define ST_WRITE	ST_WRITE
-  ST_APPEND = 256,		/* Append-only file.  */
-# define ST_APPEND	ST_APPEND
-  ST_IMMUTABLE = 512,		/* Immutable file.  */
-# define ST_IMMUTABLE	ST_IMMUTABLE
-  ST_NOATIME = 1024,		/* Do not update access times.  */
-# define ST_NOATIME	ST_NOATIME
-  ST_NODIRATIME = 2048,		/* Do not update directory access times.  */
-# define ST_NODIRATIME	ST_NODIRATIME
-  ST_RELATIME = 4096		/* Update atime relative to mtime/ctime.  */
-# define ST_RELATIME	ST_RELATIME
-#endif	/* Use GNU.  */
-};
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stdio-ldbl.h b/openflow/usr/include/arm-linux-gnueabihf/bits/stdio-ldbl.h
deleted file mode 100644
index d19415f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stdio-ldbl.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -mlong-double-64 compatibility mode for stdio functions.
-   Copyright (C) 2006-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STDIO_H
-# error "Never include <bits/stdio-ldbl.h> directly; use <stdio.h> instead."
-#endif
-
-__BEGIN_NAMESPACE_STD
-__LDBL_REDIR_DECL (fprintf)
-__LDBL_REDIR_DECL (printf)
-__LDBL_REDIR_DECL (sprintf)
-__LDBL_REDIR_DECL (vfprintf)
-__LDBL_REDIR_DECL (vprintf)
-__LDBL_REDIR_DECL (vsprintf)
-#if defined __USE_ISOC99 && !defined __USE_GNU \
-    && !defined __REDIRECT \
-    && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
-__LDBL_REDIR1_DECL (fscanf, __nldbl___isoc99_fscanf)
-__LDBL_REDIR1_DECL (scanf, __nldbl___isoc99_scanf)
-__LDBL_REDIR1_DECL (sscanf, __nldbl___isoc99_sscanf)
-#else
-__LDBL_REDIR_DECL (fscanf)
-__LDBL_REDIR_DECL (scanf)
-__LDBL_REDIR_DECL (sscanf)
-#endif
-__END_NAMESPACE_STD
-
-#if defined __USE_ISOC99 || defined __USE_UNIX98
-__BEGIN_NAMESPACE_C99
-__LDBL_REDIR_DECL (snprintf)
-__LDBL_REDIR_DECL (vsnprintf)
-__END_NAMESPACE_C99
-#endif
-
-#ifdef	__USE_ISOC99
-__BEGIN_NAMESPACE_C99
-# if !defined __USE_GNU && !defined __REDIRECT \
-     && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
-__LDBL_REDIR1_DECL (vfscanf, __nldbl___isoc99_vfscanf)
-__LDBL_REDIR1_DECL (vscanf, __nldbl___isoc99_vscanf)
-__LDBL_REDIR1_DECL (vsscanf, __nldbl___isoc99_vsscanf)
-# else
-__LDBL_REDIR_DECL (vfscanf)
-__LDBL_REDIR_DECL (vsscanf)
-__LDBL_REDIR_DECL (vscanf)
-# endif
-__END_NAMESPACE_C99
-#endif
-
-#ifdef __USE_XOPEN2K8
-__LDBL_REDIR_DECL (vdprintf)
-__LDBL_REDIR_DECL (dprintf)
-#endif
-
-#ifdef __USE_GNU
-__LDBL_REDIR_DECL (vasprintf)
-__LDBL_REDIR_DECL (__asprintf)
-__LDBL_REDIR_DECL (asprintf)
-__LDBL_REDIR_DECL (obstack_printf)
-__LDBL_REDIR_DECL (obstack_vprintf)
-#endif
-
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-__LDBL_REDIR_DECL (__sprintf_chk)
-__LDBL_REDIR_DECL (__vsprintf_chk)
-# if defined __USE_ISOC99 || defined __USE_UNIX98
-__LDBL_REDIR_DECL (__snprintf_chk)
-__LDBL_REDIR_DECL (__vsnprintf_chk)
-# endif
-# if __USE_FORTIFY_LEVEL > 1
-__LDBL_REDIR_DECL (__fprintf_chk)
-__LDBL_REDIR_DECL (__printf_chk)
-__LDBL_REDIR_DECL (__vfprintf_chk)
-__LDBL_REDIR_DECL (__vprintf_chk)
-#  ifdef __USE_XOPEN2K8
-__LDBL_REDIR_DECL (__dprintf_chk)
-__LDBL_REDIR_DECL (__vdprintf_chk)
-#  endif
-#  ifdef __USE_GNU
-__LDBL_REDIR_DECL (__asprintf_chk)
-__LDBL_REDIR_DECL (__vasprintf_chk)
-__LDBL_REDIR_DECL (__obstack_printf_chk)
-__LDBL_REDIR_DECL (__obstack_vprintf_chk)
-#  endif
-# endif
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stdio.h b/openflow/usr/include/arm-linux-gnueabihf/bits/stdio.h
deleted file mode 100644
index df57e7c..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stdio.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Optimizing macros and inline functions for stdio functions.
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STDIO_H
-# error "Never include <bits/stdio.h> directly; use <stdio.h> instead."
-#endif
-
-#ifndef __extern_inline
-# define __STDIO_INLINE inline
-#else
-# define __STDIO_INLINE __extern_inline
-#endif
-
-
-#ifdef __USE_EXTERN_INLINES
-/* For -D_FORTIFY_SOURCE{,=2} bits/stdio2.h will define a different
-   inline.  */
-# if !(__USE_FORTIFY_LEVEL > 0 && defined __fortify_function)
-/* Write formatted output to stdout from argument list ARG.  */
-__STDIO_INLINE int
-vprintf (const char *__restrict __fmt, _G_va_list __arg)
-{
-  return vfprintf (stdout, __fmt, __arg);
-}
-# endif
-
-/* Read a character from stdin.  */
-__STDIO_INLINE int
-getchar (void)
-{
-  return _IO_getc (stdin);
-}
-
-
-# ifdef __USE_MISC
-/* Faster version when locking is not necessary.  */
-__STDIO_INLINE int
-fgetc_unlocked (FILE *__fp)
-{
-  return _IO_getc_unlocked (__fp);
-}
-# endif /* misc */
-
-
-# ifdef __USE_POSIX
-/* This is defined in POSIX.1:1996.  */
-__STDIO_INLINE int
-getc_unlocked (FILE *__fp)
-{
-  return _IO_getc_unlocked (__fp);
-}
-
-/* This is defined in POSIX.1:1996.  */
-__STDIO_INLINE int
-getchar_unlocked (void)
-{
-  return _IO_getc_unlocked (stdin);
-}
-# endif	/* POSIX */
-
-
-/* Write a character to stdout.  */
-__STDIO_INLINE int
-putchar (int __c)
-{
-  return _IO_putc (__c, stdout);
-}
-
-
-# ifdef __USE_MISC
-/* Faster version when locking is not necessary.  */
-__STDIO_INLINE int
-fputc_unlocked (int __c, FILE *__stream)
-{
-  return _IO_putc_unlocked (__c, __stream);
-}
-# endif /* misc */
-
-
-# ifdef __USE_POSIX
-/* This is defined in POSIX.1:1996.  */
-__STDIO_INLINE int
-putc_unlocked (int __c, FILE *__stream)
-{
-  return _IO_putc_unlocked (__c, __stream);
-}
-
-/* This is defined in POSIX.1:1996.  */
-__STDIO_INLINE int
-putchar_unlocked (int __c)
-{
-  return _IO_putc_unlocked (__c, stdout);
-}
-# endif	/* POSIX */
-
-
-# ifdef	__USE_GNU
-/* Like `getdelim', but reads up to a newline.  */
-__STDIO_INLINE _IO_ssize_t
-getline (char **__lineptr, size_t *__n, FILE *__stream)
-{
-  return __getdelim (__lineptr, __n, '\n', __stream);
-}
-# endif /* GNU */
-
-
-# ifdef __USE_MISC
-/* Faster versions when locking is not required.  */
-__STDIO_INLINE int
-__NTH (feof_unlocked (FILE *__stream))
-{
-  return _IO_feof_unlocked (__stream);
-}
-
-/* Faster versions when locking is not required.  */
-__STDIO_INLINE int
-__NTH (ferror_unlocked (FILE *__stream))
-{
-  return _IO_ferror_unlocked (__stream);
-}
-# endif /* misc */
-
-#endif /* Use extern inlines.  */
-
-
-#if defined __USE_MISC && defined __GNUC__ && defined __OPTIMIZE__ \
-    && !defined __cplusplus
-/* Perform some simple optimizations.  */
-# define fread_unlocked(ptr, size, n, stream) \
-  (__extension__ ((__builtin_constant_p (size) && __builtin_constant_p (n)    \
-		   && (size_t) (size) * (size_t) (n) <= 8		      \
-		   && (size_t) (size) != 0)				      \
-		  ? ({ char *__ptr = (char *) (ptr);			      \
-		       FILE *__stream = (stream);			      \
-		       size_t __cnt;					      \
-		       for (__cnt = (size_t) (size) * (size_t) (n);	      \
-			    __cnt > 0; --__cnt)				      \
-			 {						      \
-			   int __c = _IO_getc_unlocked (__stream);	      \
-			   if (__c == EOF)				      \
-			     break;					      \
-			   *__ptr++ = __c;				      \
-			 }						      \
-		       ((size_t) (size) * (size_t) (n) - __cnt)		      \
-			/ (size_t) (size); })				      \
-		  : (((__builtin_constant_p (size) && (size_t) (size) == 0)   \
-		      || (__builtin_constant_p (n) && (size_t) (n) == 0))     \
-			/* Evaluate all parameters once.  */		      \
-		     ? ((void) (ptr), (void) (stream), (void) (size),	      \
-			(void) (n), (size_t) 0)				      \
-		     : fread_unlocked (ptr, size, n, stream))))
-
-# define fwrite_unlocked(ptr, size, n, stream) \
-  (__extension__ ((__builtin_constant_p (size) && __builtin_constant_p (n)    \
-		   && (size_t) (size) * (size_t) (n) <= 8		      \
-		   && (size_t) (size) != 0)				      \
-		  ? ({ const char *__ptr = (const char *) (ptr);	      \
-		       FILE *__stream = (stream);			      \
-		       size_t __cnt;					      \
-		       for (__cnt = (size_t) (size) * (size_t) (n);	      \
-			    __cnt > 0; --__cnt)				      \
-			 if (_IO_putc_unlocked (*__ptr++, __stream) == EOF)   \
-			   break;					      \
-		       ((size_t) (size) * (size_t) (n) - __cnt)		      \
-			/ (size_t) (size); })				      \
-		  : (((__builtin_constant_p (size) && (size_t) (size) == 0)   \
-		      || (__builtin_constant_p (n) && (size_t) (n) == 0))     \
-			/* Evaluate all parameters once.  */		      \
-		     ? ((void) (ptr), (void) (stream), (void) (size),	      \
-			(void) (n), (size_t) 0)				      \
-		     : fwrite_unlocked (ptr, size, n, stream))))
-#endif
-
-/* Define helper macro.  */
-#undef __STDIO_INLINE
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stdio2.h b/openflow/usr/include/arm-linux-gnueabihf/bits/stdio2.h
deleted file mode 100644
index fa3be79..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stdio2.h
+++ /dev/null
@@ -1,382 +0,0 @@
-/* Checking macros for stdio functions.
-   Copyright (C) 2004-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STDIO_H
-# error "Never include <bits/stdio2.h> directly; use <stdio.h> instead."
-#endif
-
-extern int __sprintf_chk (char *__restrict __s, int __flag, size_t __slen,
-			  const char *__restrict __format, ...) __THROW;
-extern int __vsprintf_chk (char *__restrict __s, int __flag, size_t __slen,
-			   const char *__restrict __format,
-			   _G_va_list __ap) __THROW;
-
-#ifdef __va_arg_pack
-__fortify_function int
-__NTH (sprintf (char *__restrict __s, const char *__restrict __fmt, ...))
-{
-  return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
-				  __bos (__s), __fmt, __va_arg_pack ());
-}
-#elif !defined __cplusplus
-# define sprintf(str, ...) \
-  __builtin___sprintf_chk (str, __USE_FORTIFY_LEVEL - 1, __bos (str), \
-			   __VA_ARGS__)
-#endif
-
-__fortify_function int
-__NTH (vsprintf (char *__restrict __s, const char *__restrict __fmt,
-		 _G_va_list __ap))
-{
-  return __builtin___vsprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
-				   __bos (__s), __fmt, __ap);
-}
-
-#if defined __USE_ISOC99 || defined __USE_UNIX98
-
-extern int __snprintf_chk (char *__restrict __s, size_t __n, int __flag,
-			   size_t __slen, const char *__restrict __format,
-			   ...) __THROW;
-extern int __vsnprintf_chk (char *__restrict __s, size_t __n, int __flag,
-			    size_t __slen, const char *__restrict __format,
-			    _G_va_list __ap) __THROW;
-
-# ifdef __va_arg_pack
-__fortify_function int
-__NTH (snprintf (char *__restrict __s, size_t __n,
-		 const char *__restrict __fmt, ...))
-{
-  return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
-				   __bos (__s), __fmt, __va_arg_pack ());
-}
-# elif !defined __cplusplus
-#  define snprintf(str, len, ...) \
-  __builtin___snprintf_chk (str, len, __USE_FORTIFY_LEVEL - 1, __bos (str), \
-			    __VA_ARGS__)
-# endif
-
-__fortify_function int
-__NTH (vsnprintf (char *__restrict __s, size_t __n,
-		  const char *__restrict __fmt, _G_va_list __ap))
-{
-  return __builtin___vsnprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
-				    __bos (__s), __fmt, __ap);
-}
-
-#endif
-
-#if __USE_FORTIFY_LEVEL > 1
-
-extern int __fprintf_chk (FILE *__restrict __stream, int __flag,
-			  const char *__restrict __format, ...);
-extern int __printf_chk (int __flag, const char *__restrict __format, ...);
-extern int __vfprintf_chk (FILE *__restrict __stream, int __flag,
-			   const char *__restrict __format, _G_va_list __ap);
-extern int __vprintf_chk (int __flag, const char *__restrict __format,
-			  _G_va_list __ap);
-
-# ifdef __va_arg_pack
-__fortify_function int
-fprintf (FILE *__restrict __stream, const char *__restrict __fmt, ...)
-{
-  return __fprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, __fmt,
-			__va_arg_pack ());
-}
-
-__fortify_function int
-printf (const char *__restrict __fmt, ...)
-{
-  return __printf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
-}
-# elif !defined __cplusplus
-#  define printf(...) \
-  __printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-#  define fprintf(stream, ...) \
-  __fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-# endif
-
-__fortify_function int
-vprintf (const char *__restrict __fmt, _G_va_list __ap)
-{
-#ifdef __USE_EXTERN_INLINES
-  return __vfprintf_chk (stdout, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
-#else
-  return __vprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __ap);
-#endif
-}
-
-__fortify_function int
-vfprintf (FILE *__restrict __stream,
-	  const char *__restrict __fmt, _G_va_list __ap)
-{
-  return __vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
-}
-
-# ifdef __USE_XOPEN2K8
-extern int __dprintf_chk (int __fd, int __flag, const char *__restrict __fmt,
-			  ...) __attribute__ ((__format__ (__printf__, 3, 4)));
-extern int __vdprintf_chk (int __fd, int __flag,
-			   const char *__restrict __fmt, _G_va_list __arg)
-     __attribute__ ((__format__ (__printf__, 3, 0)));
-
-#  ifdef __va_arg_pack
-__fortify_function int
-dprintf (int __fd, const char *__restrict __fmt, ...)
-{
-  return __dprintf_chk (__fd, __USE_FORTIFY_LEVEL - 1, __fmt,
-			__va_arg_pack ());
-}
-#  elif !defined __cplusplus
-#   define dprintf(fd, ...) \
-  __dprintf_chk (fd, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-#  endif
-
-__fortify_function int
-vdprintf (int __fd, const char *__restrict __fmt, _G_va_list __ap)
-{
-  return __vdprintf_chk (__fd, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
-}
-# endif
-
-# ifdef __USE_GNU
-
-extern int __asprintf_chk (char **__restrict __ptr, int __flag,
-			   const char *__restrict __fmt, ...)
-     __THROW __attribute__ ((__format__ (__printf__, 3, 4))) __wur;
-extern int __vasprintf_chk (char **__restrict __ptr, int __flag,
-			    const char *__restrict __fmt, _G_va_list __arg)
-     __THROW __attribute__ ((__format__ (__printf__, 3, 0))) __wur;
-extern int __obstack_printf_chk (struct obstack *__restrict __obstack,
-				 int __flag, const char *__restrict __format,
-				 ...)
-     __THROW __attribute__ ((__format__ (__printf__, 3, 4)));
-extern int __obstack_vprintf_chk (struct obstack *__restrict __obstack,
-				  int __flag,
-				  const char *__restrict __format,
-				  _G_va_list __args)
-     __THROW __attribute__ ((__format__ (__printf__, 3, 0)));
-
-#  ifdef __va_arg_pack
-__fortify_function int
-__NTH (asprintf (char **__restrict __ptr, const char *__restrict __fmt, ...))
-{
-  return __asprintf_chk (__ptr, __USE_FORTIFY_LEVEL - 1, __fmt,
-			 __va_arg_pack ());
-}
-
-__fortify_function int
-__NTH (__asprintf (char **__restrict __ptr, const char *__restrict __fmt,
-		   ...))
-{
-  return __asprintf_chk (__ptr, __USE_FORTIFY_LEVEL - 1, __fmt,
-			 __va_arg_pack ());
-}
-
-__fortify_function int
-__NTH (obstack_printf (struct obstack *__restrict __obstack,
-		       const char *__restrict __fmt, ...))
-{
-  return __obstack_printf_chk (__obstack, __USE_FORTIFY_LEVEL - 1, __fmt,
-			       __va_arg_pack ());
-}
-#  elif !defined __cplusplus
-#   define asprintf(ptr, ...) \
-  __asprintf_chk (ptr, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-#   define __asprintf(ptr, ...) \
-  __asprintf_chk (ptr, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-#   define obstack_printf(obstack, ...) \
-  __obstack_printf_chk (obstack, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-#  endif
-
-__fortify_function int
-__NTH (vasprintf (char **__restrict __ptr, const char *__restrict __fmt,
-		  _G_va_list __ap))
-{
-  return __vasprintf_chk (__ptr, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
-}
-
-__fortify_function int
-__NTH (obstack_vprintf (struct obstack *__restrict __obstack,
-			const char *__restrict __fmt, _G_va_list __ap))
-{
-  return __obstack_vprintf_chk (__obstack, __USE_FORTIFY_LEVEL - 1, __fmt,
-				__ap);
-}
-
-# endif
-
-#endif
-
-#if !defined __USE_ISOC11 \
-    || (defined __cplusplus && __cplusplus <= 201103L && !defined __USE_GNU)
-extern char *__gets_chk (char *__str, size_t) __wur;
-extern char *__REDIRECT (__gets_warn, (char *__str), gets)
-     __wur __warnattr ("please use fgets or getline instead, gets can't "
-		       "specify buffer size");
-
-__fortify_function __wur char *
-gets (char *__str)
-{
-  if (__bos (__str) != (size_t) -1)
-    return __gets_chk (__str, __bos (__str));
-  return __gets_warn (__str);
-}
-#endif
-
-extern char *__fgets_chk (char *__restrict __s, size_t __size, int __n,
-			  FILE *__restrict __stream) __wur;
-extern char *__REDIRECT (__fgets_alias,
-			 (char *__restrict __s, int __n,
-			  FILE *__restrict __stream), fgets) __wur;
-extern char *__REDIRECT (__fgets_chk_warn,
-			 (char *__restrict __s, size_t __size, int __n,
-			  FILE *__restrict __stream), __fgets_chk)
-     __wur __warnattr ("fgets called with bigger size than length "
-		       "of destination buffer");
-
-__fortify_function __wur char *
-fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
-{
-  if (__bos (__s) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n) || __n <= 0)
-	return __fgets_chk (__s, __bos (__s), __n, __stream);
-
-      if ((size_t) __n > __bos (__s))
-	return __fgets_chk_warn (__s, __bos (__s), __n, __stream);
-    }
-  return __fgets_alias (__s, __n, __stream);
-}
-
-extern size_t __fread_chk (void *__restrict __ptr, size_t __ptrlen,
-			   size_t __size, size_t __n,
-			   FILE *__restrict __stream) __wur;
-extern size_t __REDIRECT (__fread_alias,
-			  (void *__restrict __ptr, size_t __size,
-			   size_t __n, FILE *__restrict __stream),
-			  fread) __wur;
-extern size_t __REDIRECT (__fread_chk_warn,
-			  (void *__restrict __ptr, size_t __ptrlen,
-			   size_t __size, size_t __n,
-			   FILE *__restrict __stream),
-			  __fread_chk)
-     __wur __warnattr ("fread called with bigger size * nmemb than length "
-		       "of destination buffer");
-
-__fortify_function __wur size_t
-fread (void *__restrict __ptr, size_t __size, size_t __n,
-       FILE *__restrict __stream)
-{
-  if (__bos0 (__ptr) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__size)
-	  || !__builtin_constant_p (__n)
-	  || (__size | __n) >= (((size_t) 1) << (8 * sizeof (size_t) / 2)))
-	return __fread_chk (__ptr, __bos0 (__ptr), __size, __n, __stream);
-
-      if (__size * __n > __bos0 (__ptr))
-	return __fread_chk_warn (__ptr, __bos0 (__ptr), __size, __n, __stream);
-    }
-  return __fread_alias (__ptr, __size, __n, __stream);
-}
-
-#ifdef __USE_GNU
-extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size,
-				   int __n, FILE *__restrict __stream) __wur;
-extern char *__REDIRECT (__fgets_unlocked_alias,
-			 (char *__restrict __s, int __n,
-			  FILE *__restrict __stream), fgets_unlocked) __wur;
-extern char *__REDIRECT (__fgets_unlocked_chk_warn,
-			 (char *__restrict __s, size_t __size, int __n,
-			  FILE *__restrict __stream), __fgets_unlocked_chk)
-     __wur __warnattr ("fgets_unlocked called with bigger size than length "
-		       "of destination buffer");
-
-__fortify_function __wur char *
-fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream)
-{
-  if (__bos (__s) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n) || __n <= 0)
-	return __fgets_unlocked_chk (__s, __bos (__s), __n, __stream);
-
-      if ((size_t) __n > __bos (__s))
-	return __fgets_unlocked_chk_warn (__s, __bos (__s), __n, __stream);
-    }
-  return __fgets_unlocked_alias (__s, __n, __stream);
-}
-#endif
-
-#ifdef __USE_MISC
-# undef fread_unlocked
-extern size_t __fread_unlocked_chk (void *__restrict __ptr, size_t __ptrlen,
-				    size_t __size, size_t __n,
-				    FILE *__restrict __stream) __wur;
-extern size_t __REDIRECT (__fread_unlocked_alias,
-			  (void *__restrict __ptr, size_t __size,
-			   size_t __n, FILE *__restrict __stream),
-			  fread_unlocked) __wur;
-extern size_t __REDIRECT (__fread_unlocked_chk_warn,
-			  (void *__restrict __ptr, size_t __ptrlen,
-			   size_t __size, size_t __n,
-			   FILE *__restrict __stream),
-			  __fread_unlocked_chk)
-     __wur __warnattr ("fread_unlocked called with bigger size * nmemb than "
-		       "length of destination buffer");
-
-__fortify_function __wur size_t
-fread_unlocked (void *__restrict __ptr, size_t __size, size_t __n,
-		FILE *__restrict __stream)
-{
-  if (__bos0 (__ptr) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__size)
-	  || !__builtin_constant_p (__n)
-	  || (__size | __n) >= (((size_t) 1) << (8 * sizeof (size_t) / 2)))
-	return __fread_unlocked_chk (__ptr, __bos0 (__ptr), __size, __n,
-				     __stream);
-
-      if (__size * __n > __bos0 (__ptr))
-	return __fread_unlocked_chk_warn (__ptr, __bos0 (__ptr), __size, __n,
-					  __stream);
-    }
-
-# ifdef __USE_EXTERN_INLINES
-  if (__builtin_constant_p (__size)
-      && __builtin_constant_p (__n)
-      && (__size | __n) < (((size_t) 1) << (8 * sizeof (size_t) / 2))
-      && __size * __n <= 8)
-    {
-      size_t __cnt = __size * __n;
-      char *__cptr = (char *) __ptr;
-      if (__cnt == 0)
-	return 0;
-
-      for (; __cnt > 0; --__cnt)
-	{
-	  int __c = _IO_getc_unlocked (__stream);
-	  if (__c == EOF)
-	    break;
-	  *__cptr++ = __c;
-	}
-      return (__cptr - (char *) __ptr) / __size;
-    }
-# endif
-  return __fread_unlocked_alias (__ptr, __size, __n, __stream);
-}
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stdio_lim.h b/openflow/usr/include/arm-linux-gnueabihf/bits/stdio_lim.h
deleted file mode 100644
index 247d8c6..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stdio_lim.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 1994-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _STDIO_H && !defined __need_FOPEN_MAX && !defined __need_IOV_MAX
-# error "Never include <bits/stdio_lim.h> directly; use <stdio.h> instead."
-#endif
-
-#ifdef _STDIO_H
-# define L_tmpnam 20
-# define TMP_MAX 238328
-# define FILENAME_MAX 4096
-
-# ifdef __USE_POSIX
-#  define L_ctermid 9
-#  if !defined __USE_XOPEN2K || defined __USE_GNU
-#   define L_cuserid 9
-#  endif
-# endif
-#endif
-
-#if defined __need_FOPEN_MAX || defined _STDIO_H
-# undef  FOPEN_MAX
-# define FOPEN_MAX 16
-#endif
-
-#if defined __need_IOV_MAX && !defined IOV_MAX
-# define IOV_MAX 1024
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib-bsearch.h b/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib-bsearch.h
deleted file mode 100644
index bbc8f98..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib-bsearch.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Perform binary search - inline version.
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-__extern_inline void *
-bsearch (const void *__key, const void *__base, size_t __nmemb, size_t __size,
-	 __compar_fn_t __compar)
-{
-  size_t __l, __u, __idx;
-  const void *__p;
-  int __comparison;
-
-  __l = 0;
-  __u = __nmemb;
-  while (__l < __u)
-    {
-      __idx = (__l + __u) / 2;
-      __p = (void *) (((const char *) __base) + (__idx * __size));
-      __comparison = (*__compar) (__key, __p);
-      if (__comparison < 0)
-	__u = __idx;
-      else if (__comparison > 0)
-	__l = __idx + 1;
-      else
-	return (void *) __p;
-    }
-
-  return NULL;
-}
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib-float.h b/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib-float.h
deleted file mode 100644
index c3bbd04..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib-float.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Floating-point inline functions for stdlib.h.
-   Copyright (C) 2012-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STDLIB_H
-# error "Never use <bits/stdlib-float.h> directly; include <stdlib.h> instead."
-#endif
-
-#ifdef __USE_EXTERN_INLINES
-__BEGIN_NAMESPACE_STD
-__extern_inline double
-__NTH (atof (const char *__nptr))
-{
-  return strtod (__nptr, (char **) NULL);
-}
-__END_NAMESPACE_STD
-#endif /* Optimizing and Inlining.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib-ldbl.h b/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib-ldbl.h
deleted file mode 100644
index acff499..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib-ldbl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -mlong-double-64 compatibility mode for <stdlib.h> functions.
-   Copyright (C) 2006-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STDLIB_H
-# error "Never include <bits/stdlib-ldbl.h> directly; use <stdlib.h> instead."
-#endif
-
-#ifdef	__USE_ISOC99
-__BEGIN_NAMESPACE_C99
-__LDBL_REDIR1_DECL (strtold, strtod)
-__END_NAMESPACE_C99
-#endif
-
-#ifdef __USE_GNU
-__LDBL_REDIR1_DECL (strtold_l, strtod_l)
-#endif
-
-#ifdef __USE_MISC
-__LDBL_REDIR1_DECL (qecvt, ecvt)
-__LDBL_REDIR1_DECL (qfcvt, fcvt)
-__LDBL_REDIR1_DECL (qgcvt, gcvt)
-__LDBL_REDIR1_DECL (qecvt_r, ecvt_r)
-__LDBL_REDIR1_DECL (qfcvt_r, fcvt_r)
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib.h b/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib.h
deleted file mode 100644
index 20fe986..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stdlib.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Checking macros for stdlib functions.
-   Copyright (C) 2005-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STDLIB_H
-# error "Never include <bits/stdlib.h> directly; use <stdlib.h> instead."
-#endif
-
-extern char *__realpath_chk (const char *__restrict __name,
-			     char *__restrict __resolved,
-			     size_t __resolvedlen) __THROW __wur;
-extern char *__REDIRECT_NTH (__realpath_alias,
-			     (const char *__restrict __name,
-			      char *__restrict __resolved), realpath) __wur;
-extern char *__REDIRECT_NTH (__realpath_chk_warn,
-			     (const char *__restrict __name,
-			      char *__restrict __resolved,
-			      size_t __resolvedlen), __realpath_chk) __wur
-     __warnattr ("second argument of realpath must be either NULL or at "
-		 "least PATH_MAX bytes long buffer");
-
-__fortify_function __wur char *
-__NTH (realpath (const char *__restrict __name, char *__restrict __resolved))
-{
-  if (__bos (__resolved) != (size_t) -1)
-    {
-#if defined _LIBC_LIMITS_H_ && defined PATH_MAX
-      if (__bos (__resolved) < PATH_MAX)
-	return __realpath_chk_warn (__name, __resolved, __bos (__resolved));
-#endif
-      return __realpath_chk (__name, __resolved, __bos (__resolved));
-    }
-
-  return __realpath_alias (__name, __resolved);
-}
-
-
-extern int __ptsname_r_chk (int __fd, char *__buf, size_t __buflen,
-			    size_t __nreal) __THROW __nonnull ((2));
-extern int __REDIRECT_NTH (__ptsname_r_alias, (int __fd, char *__buf,
-					       size_t __buflen), ptsname_r)
-     __nonnull ((2));
-extern int __REDIRECT_NTH (__ptsname_r_chk_warn,
-			   (int __fd, char *__buf, size_t __buflen,
-			    size_t __nreal), __ptsname_r_chk)
-     __nonnull ((2)) __warnattr ("ptsname_r called with buflen bigger than "
-				 "size of buf");
-
-__fortify_function int
-__NTH (ptsname_r (int __fd, char *__buf, size_t __buflen))
-{
-  if (__bos (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__buflen))
-	return __ptsname_r_chk (__fd, __buf, __buflen, __bos (__buf));
-      if (__buflen > __bos (__buf))
-	return __ptsname_r_chk_warn (__fd, __buf, __buflen, __bos (__buf));
-    }
-  return __ptsname_r_alias (__fd, __buf, __buflen);
-}
-
-
-extern int __wctomb_chk (char *__s, wchar_t __wchar, size_t __buflen)
-  __THROW __wur;
-extern int __REDIRECT_NTH (__wctomb_alias, (char *__s, wchar_t __wchar),
-			   wctomb) __wur;
-
-__fortify_function __wur int
-__NTH (wctomb (char *__s, wchar_t __wchar))
-{
-  /* We would have to include <limits.h> to get a definition of MB_LEN_MAX.
-     But this would only disturb the namespace.  So we define our own
-     version here.  */
-#define __STDLIB_MB_LEN_MAX	16
-#if defined MB_LEN_MAX && MB_LEN_MAX != __STDLIB_MB_LEN_MAX
-# error "Assumed value of MB_LEN_MAX wrong"
-#endif
-  if (__bos (__s) != (size_t) -1 && __STDLIB_MB_LEN_MAX > __bos (__s))
-    return __wctomb_chk (__s, __wchar, __bos (__s));
-  return __wctomb_alias (__s, __wchar);
-}
-
-
-extern size_t __mbstowcs_chk (wchar_t *__restrict __dst,
-			      const char *__restrict __src,
-			      size_t __len, size_t __dstlen) __THROW;
-extern size_t __REDIRECT_NTH (__mbstowcs_alias,
-			      (wchar_t *__restrict __dst,
-			       const char *__restrict __src,
-			       size_t __len), mbstowcs);
-extern size_t __REDIRECT_NTH (__mbstowcs_chk_warn,
-			      (wchar_t *__restrict __dst,
-			       const char *__restrict __src,
-			       size_t __len, size_t __dstlen), __mbstowcs_chk)
-     __warnattr ("mbstowcs called with dst buffer smaller than len "
-		 "* sizeof (wchar_t)");
-
-__fortify_function size_t
-__NTH (mbstowcs (wchar_t *__restrict __dst, const char *__restrict __src,
-		 size_t __len))
-{
-  if (__bos (__dst) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__len))
-	return __mbstowcs_chk (__dst, __src, __len,
-			       __bos (__dst) / sizeof (wchar_t));
-
-      if (__len > __bos (__dst) / sizeof (wchar_t))
-	return __mbstowcs_chk_warn (__dst, __src, __len,
-				     __bos (__dst) / sizeof (wchar_t));
-    }
-  return __mbstowcs_alias (__dst, __src, __len);
-}
-
-
-extern size_t __wcstombs_chk (char *__restrict __dst,
-			      const wchar_t *__restrict __src,
-			      size_t __len, size_t __dstlen) __THROW;
-extern size_t __REDIRECT_NTH (__wcstombs_alias,
-			      (char *__restrict __dst,
-			       const wchar_t *__restrict __src,
-			       size_t __len), wcstombs);
-extern size_t __REDIRECT_NTH (__wcstombs_chk_warn,
-			      (char *__restrict __dst,
-			       const wchar_t *__restrict __src,
-			       size_t __len, size_t __dstlen), __wcstombs_chk)
-     __warnattr ("wcstombs called with dst buffer smaller than len");
-
-__fortify_function size_t
-__NTH (wcstombs (char *__restrict __dst, const wchar_t *__restrict __src,
-		 size_t __len))
-{
-  if (__bos (__dst) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__len))
-	return __wcstombs_chk (__dst, __src, __len, __bos (__dst));
-      if (__len > __bos (__dst))
-	return __wcstombs_chk_warn (__dst, __src, __len, __bos (__dst));
-    }
-  return __wcstombs_alias (__dst, __src, __len);
-}
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/string.h b/openflow/usr/include/arm-linux-gnueabihf/bits/string.h
deleted file mode 100644
index 89c627c..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/string.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This file should provide inline versions of string functions.
-
-   Surround GCC-specific parts with #ifdef __GNUC__, and use `__extern_inline'.
-
-   This file should define __STRING_INLINES if functions are actually defined
-   as inlines.  */
-
-#ifndef _BITS_STRING_H
-#define _BITS_STRING_H	1
-
-/* Define whether to use the unaligned string inline ABI.
-   The string inline functions are an external ABI, thus cannot be changed
-   after the first release of a new target (unlike _STRING_ARCH_unaligned
-   which may be changed from release to release).  Targets must support
-   unaligned accesses in hardware if either define is set to true.  */
-#define _STRING_INLINE_unaligned   0
-
-#endif /* bits/string.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/string2.h b/openflow/usr/include/arm-linux-gnueabihf/bits/string2.h
deleted file mode 100644
index 0dc51e5..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/string2.h
+++ /dev/null
@@ -1,1329 +0,0 @@
-/* Machine-independant string function optimizations.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STRING_H
-# error "Never use <bits/string2.h> directly; include <string.h> instead."
-#endif
-
-#ifndef __NO_STRING_INLINES
-
-/* Unlike the definitions in the header <bits/string.h> the
-   definitions contained here are not optimized down to assembler
-   level.  Those optimizations are not always a good idea since this
-   means the code size increases a lot.  Instead the definitions here
-   optimize some functions in a way which do not dramatically
-   increase the code size and which do not use assembler.  The main
-   trick is to use GCC's `__builtin_constant_p' function.
-
-   Every function XXX which has a defined version in
-   <bits/string.h> must be accompanied by a symbol _HAVE_STRING_ARCH_XXX
-   to make sure we don't get redefinitions.
-
-   We must use here macros instead of inline functions since the
-   trick won't work with the latter.  */
-
-#ifndef __STRING_INLINE
-# ifdef __cplusplus
-#  define __STRING_INLINE inline
-# else
-#  define __STRING_INLINE __extern_inline
-# endif
-#endif
-
-#if _STRING_INLINE_unaligned
-/* If we can do unaligned memory accesses we must know the endianess.  */
-# include <endian.h>
-# include <bits/types.h>
-
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define __STRING2_SMALL_GET16(src, idx) \
-     (((const unsigned char *) (const char *) (src))[idx + 1] << 8	      \
-      | ((const unsigned char *) (const char *) (src))[idx])
-#  define __STRING2_SMALL_GET32(src, idx) \
-     (((((const unsigned char *) (const char *) (src))[idx + 3] << 8	      \
-	| ((const unsigned char *) (const char *) (src))[idx + 2]) << 8	      \
-       | ((const unsigned char *) (const char *) (src))[idx + 1]) << 8	      \
-      | ((const unsigned char *) (const char *) (src))[idx])
-# else
-#  define __STRING2_SMALL_GET16(src, idx) \
-     (((const unsigned char *) (const char *) (src))[idx] << 8		      \
-      | ((const unsigned char *) (const char *) (src))[idx + 1])
-#  define __STRING2_SMALL_GET32(src, idx) \
-     (((((const unsigned char *) (const char *) (src))[idx] << 8	      \
-	| ((const unsigned char *) (const char *) (src))[idx + 1]) << 8	      \
-       | ((const unsigned char *) (const char *) (src))[idx + 2]) << 8	      \
-      | ((const unsigned char *) (const char *) (src))[idx + 3])
-# endif
-#else
-/* These are a few types we need for the optimizations if we cannot
-   use unaligned memory accesses.  */
-# define __STRING2_COPY_TYPE(N) \
-  typedef struct { unsigned char __arr[N]; }				      \
-    __attribute__ ((__packed__)) __STRING2_COPY_ARR##N
-__STRING2_COPY_TYPE (2);
-__STRING2_COPY_TYPE (3);
-__STRING2_COPY_TYPE (4);
-__STRING2_COPY_TYPE (5);
-__STRING2_COPY_TYPE (6);
-__STRING2_COPY_TYPE (7);
-__STRING2_COPY_TYPE (8);
-# undef __STRING2_COPY_TYPE
-#endif
-
-/* Dereferencing a pointer arg to run sizeof on it fails for the void
-   pointer case, so we use this instead.
-   Note that __x is evaluated twice. */
-#define __string2_1bptr_p(__x) \
-  ((size_t)(const void *)((__x) + 1) - (size_t)(const void *)(__x) == 1)
-
-/* Set N bytes of S to C.  */
-#if !defined _HAVE_STRING_ARCH_memset
-# if !__GNUC_PREREQ (3, 0)
-#  if _STRING_INLINE_unaligned
-#   define memset(s, c, n) \
-  (__extension__ (__builtin_constant_p (n) && (n) <= 16			      \
-		  ? ((n) == 1						      \
-		     ? __memset_1 (s, c)				      \
-		     : __memset_gc (s, c, n))				      \
-		  : (__builtin_constant_p (c) && (c) == '\0'		      \
-		     ? ({ void *__s = (s); __bzero (__s, n); __s; })	      \
-		     : memset (s, c, n))))
-
-#   define __memset_1(s, c) ({ void *__s = (s);				      \
-			    *((__uint8_t *) __s) = (__uint8_t) c; __s; })
-
-#   define __memset_gc(s, c, n) \
-  ({ void *__s = (s);							      \
-     union {								      \
-       unsigned int __ui;						      \
-       unsigned short int __usi;					      \
-       unsigned char __uc;						      \
-     } *__u = __s;							      \
-     __uint8_t __c = (__uint8_t) (c);					      \
-									      \
-     /* This `switch' statement will be removed at compile-time.  */	      \
-     switch ((unsigned int) (n))					      \
-       {								      \
-       case 15:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 11:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 7:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 3:								      \
-	 __u->__usi = (unsigned short int) __c * 0x0101;		      \
-	 __u = __extension__ ((void *) __u + 2);			      \
-	 __u->__uc = (unsigned char) __c;				      \
-	 break;								      \
-									      \
-       case 14:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 10:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 6:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 2:								      \
-	 __u->__usi = (unsigned short int) __c * 0x0101;		      \
-	 break;								      \
-									      \
-       case 13:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 9:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 5:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 1:								      \
-	 __u->__uc = (unsigned char) __c;				      \
-	 break;								      \
-									      \
-       case 16:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 12:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 8:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-	 __u = __extension__ ((void *) __u + 4);			      \
-       case 4:								      \
-	 __u->__ui = __c * 0x01010101;					      \
-       case 0:								      \
-	 break;								      \
-       }								      \
-									      \
-     __s; })
-#  else
-#   define memset(s, c, n) \
-  (__extension__ (__builtin_constant_p (c) && (c) == '\0'		      \
-		  ? ({ void *__s = (s); __bzero (__s, n); __s; })	      \
-		  : memset (s, c, n)))
-#  endif
-# endif
-
-/* GCC < 3.0 optimizes memset(s, 0, n) but not bzero(s, n).
-   The optimization is broken before EGCS 1.1.
-   GCC 3.0+ has __builtin_bzero as well, but at least till GCC 3.4
-   if it decides to call the library function, it calls memset
-   and not bzero.  */
-# if __GNUC_PREREQ (2, 91)
-#  define __bzero(s, n) __builtin_memset (s, '\0', n)
-# endif
-
-#endif
-
-
-/* Copy N bytes from SRC to DEST, returning pointer to byte following the
-   last copied.  */
-#ifdef __USE_GNU
-# if !defined _HAVE_STRING_ARCH_mempcpy || defined _FORCE_INLINES
-#  ifndef _HAVE_STRING_ARCH_mempcpy
-#   if __GNUC_PREREQ (3, 4)
-#    define __mempcpy(dest, src, n) __builtin_mempcpy (dest, src, n)
-#   elif __GNUC_PREREQ (3, 0)
-#    define __mempcpy(dest, src, n) \
-  (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n)      \
-		  && __string2_1bptr_p (src) && n <= 8			      \
-		  ? __builtin_memcpy (dest, src, n) + (n)		      \
-		  : __mempcpy (dest, src, n)))
-#   else
-#    define __mempcpy(dest, src, n) \
-  (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n)      \
-		  && __string2_1bptr_p (src) && n <= 8			      \
-		  ? __mempcpy_small (dest, __mempcpy_args (src), n)	      \
-		  : __mempcpy (dest, src, n)))
-#   endif
-/* In glibc we use this function frequently but for namespace reasons
-   we have to use the name `__mempcpy'.  */
-#   define mempcpy(dest, src, n) __mempcpy (dest, src, n)
-#  endif
-
-#  if !__GNUC_PREREQ (3, 0) || defined _FORCE_INLINES
-#   if _STRING_INLINE_unaligned
-#    ifndef _FORCE_INLINES
-#     define __mempcpy_args(src) \
-     ((const char *) (src))[0], ((const char *) (src))[2],		      \
-     ((const char *) (src))[4], ((const char *) (src))[6],		      \
-     __extension__ __STRING2_SMALL_GET16 (src, 0),			      \
-     __extension__ __STRING2_SMALL_GET16 (src, 4),			      \
-     __extension__ __STRING2_SMALL_GET32 (src, 0),			      \
-     __extension__ __STRING2_SMALL_GET32 (src, 4)
-#    endif
-__STRING_INLINE void *__mempcpy_small (void *, char, char, char, char,
-				       __uint16_t, __uint16_t, __uint32_t,
-				       __uint32_t, size_t);
-__STRING_INLINE void *
-__mempcpy_small (void *__dest1,
-		 char __src0_1, char __src2_1, char __src4_1, char __src6_1,
-		 __uint16_t __src0_2, __uint16_t __src4_2,
-		 __uint32_t __src0_4, __uint32_t __src4_4,
-		 size_t __srclen)
-{
-  union {
-    __uint32_t __ui;
-    __uint16_t __usi;
-    unsigned char __uc;
-    unsigned char __c;
-  } *__u = __dest1;
-  switch ((unsigned int) __srclen)
-    {
-    case 1:
-      __u->__c = __src0_1;
-      __u = __extension__ ((void *) __u + 1);
-      break;
-    case 2:
-      __u->__usi = __src0_2;
-      __u = __extension__ ((void *) __u + 2);
-      break;
-    case 3:
-      __u->__usi = __src0_2;
-      __u = __extension__ ((void *) __u + 2);
-      __u->__c = __src2_1;
-      __u = __extension__ ((void *) __u + 1);
-      break;
-    case 4:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      break;
-    case 5:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__c = __src4_1;
-      __u = __extension__ ((void *) __u + 1);
-      break;
-    case 6:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__usi = __src4_2;
-      __u = __extension__ ((void *) __u + 2);
-      break;
-    case 7:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__usi = __src4_2;
-      __u = __extension__ ((void *) __u + 2);
-      __u->__c = __src6_1;
-      __u = __extension__ ((void *) __u + 1);
-      break;
-    case 8:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__ui = __src4_4;
-      __u = __extension__ ((void *) __u + 4);
-      break;
-    }
-  return (void *) __u;
-}
-#   else
-#    ifndef _FORCE_INLINES
-#     define __mempcpy_args(src) \
-     ((const char *) (src))[0],						      \
-     __extension__ ((__STRING2_COPY_ARR2)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1] } }),	      \
-     __extension__ ((__STRING2_COPY_ARR3)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2] } }),				      \
-     __extension__ ((__STRING2_COPY_ARR4)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3] } }),	      \
-     __extension__ ((__STRING2_COPY_ARR5)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  ((const char *) (src))[4] } }),				      \
-     __extension__ ((__STRING2_COPY_ARR6)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  ((const char *) (src))[4], ((const char *) (src))[5] } }),	      \
-     __extension__ ((__STRING2_COPY_ARR7)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  ((const char *) (src))[4], ((const char *) (src))[5],		      \
-	  ((const char *) (src))[6] } }),				      \
-     __extension__ ((__STRING2_COPY_ARR8)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  ((const char *) (src))[4], ((const char *) (src))[5],		      \
-	  ((const char *) (src))[6], ((const char *) (src))[7] } })
-#    endif
-__STRING_INLINE void *__mempcpy_small (void *, char, __STRING2_COPY_ARR2,
-				       __STRING2_COPY_ARR3,
-				       __STRING2_COPY_ARR4,
-				       __STRING2_COPY_ARR5,
-				       __STRING2_COPY_ARR6,
-				       __STRING2_COPY_ARR7,
-				       __STRING2_COPY_ARR8, size_t);
-__STRING_INLINE void *
-__mempcpy_small (void *__dest, char __src1,
-		 __STRING2_COPY_ARR2 __src2, __STRING2_COPY_ARR3 __src3,
-		 __STRING2_COPY_ARR4 __src4, __STRING2_COPY_ARR5 __src5,
-		 __STRING2_COPY_ARR6 __src6, __STRING2_COPY_ARR7 __src7,
-		 __STRING2_COPY_ARR8 __src8, size_t __srclen)
-{
-  union {
-    char __c;
-    __STRING2_COPY_ARR2 __sca2;
-    __STRING2_COPY_ARR3 __sca3;
-    __STRING2_COPY_ARR4 __sca4;
-    __STRING2_COPY_ARR5 __sca5;
-    __STRING2_COPY_ARR6 __sca6;
-    __STRING2_COPY_ARR7 __sca7;
-    __STRING2_COPY_ARR8 __sca8;
-  } *__u = __dest;
-  switch ((unsigned int) __srclen)
-    {
-    case 1:
-      __u->__c = __src1;
-      break;
-    case 2:
-      __extension__ __u->__sca2 = __src2;
-      break;
-    case 3:
-      __extension__ __u->__sca3 = __src3;
-      break;
-    case 4:
-      __extension__ __u->__sca4 = __src4;
-      break;
-    case 5:
-      __extension__ __u->__sca5 = __src5;
-      break;
-    case 6:
-      __extension__ __u->__sca6 = __src6;
-      break;
-    case 7:
-      __extension__ __u->__sca7 = __src7;
-      break;
-    case 8:
-      __extension__ __u->__sca8 = __src8;
-      break;
-    }
-  return __extension__ ((void *) __u + __srclen);
-}
-#   endif
-#  endif
-# endif
-#endif
-
-
-/* Return pointer to C in S.  */
-#ifndef _HAVE_STRING_ARCH_strchr
-extern void *__rawmemchr (const void *__s, int __c);
-# if __GNUC_PREREQ (3, 2)
-#  define strchr(s, c) \
-  (__extension__ (__builtin_constant_p (c) && !__builtin_constant_p (s)	      \
-		  && (c) == '\0'					      \
-		  ? (char *) __rawmemchr (s, c)				      \
-		  : __builtin_strchr (s, c)))
-# else
-#  define strchr(s, c) \
-  (__extension__ (__builtin_constant_p (c) && (c) == '\0'		      \
-		  ? (char *) __rawmemchr (s, c)				      \
-		  : strchr (s, c)))
-# endif
-#endif
-
-
-/* Copy SRC to DEST.  */
-#if (!defined _HAVE_STRING_ARCH_strcpy && !__GNUC_PREREQ (3, 0)) \
-    || defined _FORCE_INLINES
-# if !defined _HAVE_STRING_ARCH_strcpy && !__GNUC_PREREQ (3, 0)
-#  define strcpy(dest, src) \
-  (__extension__ (__builtin_constant_p (src)				      \
-		  ? (__string2_1bptr_p (src) && strlen (src) + 1 <= 8	      \
-		     ? __strcpy_small (dest, __strcpy_args (src),	      \
-				       strlen (src) + 1)		      \
-		     : (char *) memcpy (dest, src, strlen (src) + 1))	      \
-		  : strcpy (dest, src)))
-# endif
-
-# if _STRING_INLINE_unaligned
-#  ifndef _FORCE_INLINES
-#   define __strcpy_args(src) \
-     __extension__ __STRING2_SMALL_GET16 (src, 0),			      \
-     __extension__ __STRING2_SMALL_GET16 (src, 4),			      \
-     __extension__ __STRING2_SMALL_GET32 (src, 0),			      \
-     __extension__ __STRING2_SMALL_GET32 (src, 4)
-#  endif
-__STRING_INLINE char *__strcpy_small (char *, __uint16_t, __uint16_t,
-				      __uint32_t, __uint32_t, size_t);
-__STRING_INLINE char *
-__strcpy_small (char *__dest,
-		__uint16_t __src0_2, __uint16_t __src4_2,
-		__uint32_t __src0_4, __uint32_t __src4_4,
-		size_t __srclen)
-{
-  union {
-    __uint32_t __ui;
-    __uint16_t __usi;
-    unsigned char __uc;
-  } *__u = (void *) __dest;
-  switch ((unsigned int) __srclen)
-    {
-    case 1:
-      __u->__uc = '\0';
-      break;
-    case 2:
-      __u->__usi = __src0_2;
-      break;
-    case 3:
-      __u->__usi = __src0_2;
-      __u = __extension__ ((void *) __u + 2);
-      __u->__uc = '\0';
-      break;
-    case 4:
-      __u->__ui = __src0_4;
-      break;
-    case 5:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__uc = '\0';
-      break;
-    case 6:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__usi = __src4_2;
-      break;
-    case 7:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__usi = __src4_2;
-      __u = __extension__ ((void *) __u + 2);
-      __u->__uc = '\0';
-      break;
-    case 8:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__ui = __src4_4;
-      break;
-    }
-  return __dest;
-}
-# else
-#  ifndef _FORCE_INLINES
-#   define __strcpy_args(src) \
-     __extension__ ((__STRING2_COPY_ARR2)				      \
-      { { ((const char *) (src))[0], '\0' } }),				      \
-     __extension__ ((__STRING2_COPY_ARR3)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  '\0' } }),							      \
-     __extension__ ((__STRING2_COPY_ARR4)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], '\0' } }),				      \
-     __extension__ ((__STRING2_COPY_ARR5)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  '\0' } }),							      \
-     __extension__ ((__STRING2_COPY_ARR6)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  ((const char *) (src))[4], '\0' } }),				      \
-     __extension__ ((__STRING2_COPY_ARR7)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  ((const char *) (src))[4], ((const char *) (src))[5],		      \
-	  '\0' } }),							      \
-     __extension__ ((__STRING2_COPY_ARR8)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  ((const char *) (src))[4], ((const char *) (src))[5],		      \
-	  ((const char *) (src))[6], '\0' } })
-#  endif
-__STRING_INLINE char *__strcpy_small (char *, __STRING2_COPY_ARR2,
-				      __STRING2_COPY_ARR3,
-				      __STRING2_COPY_ARR4,
-				      __STRING2_COPY_ARR5,
-				      __STRING2_COPY_ARR6,
-				      __STRING2_COPY_ARR7,
-				      __STRING2_COPY_ARR8, size_t);
-__STRING_INLINE char *
-__strcpy_small (char *__dest,
-		__STRING2_COPY_ARR2 __src2, __STRING2_COPY_ARR3 __src3,
-		__STRING2_COPY_ARR4 __src4, __STRING2_COPY_ARR5 __src5,
-		__STRING2_COPY_ARR6 __src6, __STRING2_COPY_ARR7 __src7,
-		__STRING2_COPY_ARR8 __src8, size_t __srclen)
-{
-  union {
-    char __c;
-    __STRING2_COPY_ARR2 __sca2;
-    __STRING2_COPY_ARR3 __sca3;
-    __STRING2_COPY_ARR4 __sca4;
-    __STRING2_COPY_ARR5 __sca5;
-    __STRING2_COPY_ARR6 __sca6;
-    __STRING2_COPY_ARR7 __sca7;
-    __STRING2_COPY_ARR8 __sca8;
-  } *__u = (void *) __dest;
-  switch ((unsigned int) __srclen)
-    {
-    case 1:
-      __u->__c = '\0';
-      break;
-    case 2:
-      __extension__ __u->__sca2 = __src2;
-      break;
-    case 3:
-      __extension__ __u->__sca3 = __src3;
-      break;
-    case 4:
-      __extension__ __u->__sca4 = __src4;
-      break;
-    case 5:
-      __extension__ __u->__sca5 = __src5;
-      break;
-    case 6:
-      __extension__ __u->__sca6 = __src6;
-      break;
-    case 7:
-      __extension__ __u->__sca7 = __src7;
-      break;
-    case 8:
-      __extension__ __u->__sca8 = __src8;
-      break;
-  }
-  return __dest;
-}
-# endif
-#endif
-
-
-/* Copy SRC to DEST, returning pointer to final NUL byte.  */
-#ifdef __USE_GNU
-# if !defined _HAVE_STRING_ARCH_stpcpy || defined _FORCE_INLINES
-#  ifndef _HAVE_STRING_ARCH_stpcpy
-#   if __GNUC_PREREQ (3, 4)
-#    define __stpcpy(dest, src) __builtin_stpcpy (dest, src)
-#   elif __GNUC_PREREQ (3, 0)
-#    define __stpcpy(dest, src) \
-  (__extension__ (__builtin_constant_p (src)				      \
-		  ? (__string2_1bptr_p (src) && strlen (src) + 1 <= 8	      \
-		     ? __builtin_strcpy (dest, src) + strlen (src)	      \
-		     : ((char *) (__mempcpy) (dest, src, strlen (src) + 1)    \
-			- 1))						      \
-		  : __stpcpy (dest, src)))
-#   else
-#    define __stpcpy(dest, src) \
-  (__extension__ (__builtin_constant_p (src)				      \
-		  ? (__string2_1bptr_p (src) && strlen (src) + 1 <= 8	      \
-		     ? __stpcpy_small (dest, __stpcpy_args (src),	      \
-				       strlen (src) + 1)		      \
-		     : ((char *) (__mempcpy) (dest, src, strlen (src) + 1)    \
-			- 1))						      \
-		  : __stpcpy (dest, src)))
-#   endif
-/* In glibc we use this function frequently but for namespace reasons
-   we have to use the name `__stpcpy'.  */
-#   define stpcpy(dest, src) __stpcpy (dest, src)
-#  endif
-
-#  if !__GNUC_PREREQ (3, 0) || defined _FORCE_INLINES
-#   if _STRING_INLINE_unaligned
-#    ifndef _FORCE_INLINES
-#     define __stpcpy_args(src) \
-     __extension__ __STRING2_SMALL_GET16 (src, 0),			      \
-     __extension__ __STRING2_SMALL_GET16 (src, 4),			      \
-     __extension__ __STRING2_SMALL_GET32 (src, 0),			      \
-     __extension__ __STRING2_SMALL_GET32 (src, 4)
-#    endif
-__STRING_INLINE char *__stpcpy_small (char *, __uint16_t, __uint16_t,
-				      __uint32_t, __uint32_t, size_t);
-__STRING_INLINE char *
-__stpcpy_small (char *__dest,
-		__uint16_t __src0_2, __uint16_t __src4_2,
-		__uint32_t __src0_4, __uint32_t __src4_4,
-		size_t __srclen)
-{
-  union {
-    unsigned int __ui;
-    unsigned short int __usi;
-    unsigned char __uc;
-    char __c;
-  } *__u = (void *) __dest;
-  switch ((unsigned int) __srclen)
-    {
-    case 1:
-      __u->__uc = '\0';
-      break;
-    case 2:
-      __u->__usi = __src0_2;
-      __u = __extension__ ((void *) __u + 1);
-      break;
-    case 3:
-      __u->__usi = __src0_2;
-      __u = __extension__ ((void *) __u + 2);
-      __u->__uc = '\0';
-      break;
-    case 4:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 3);
-      break;
-    case 5:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__uc = '\0';
-      break;
-    case 6:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__usi = __src4_2;
-      __u = __extension__ ((void *) __u + 1);
-      break;
-    case 7:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__usi = __src4_2;
-      __u = __extension__ ((void *) __u + 2);
-      __u->__uc = '\0';
-      break;
-    case 8:
-      __u->__ui = __src0_4;
-      __u = __extension__ ((void *) __u + 4);
-      __u->__ui = __src4_4;
-      __u = __extension__ ((void *) __u + 3);
-      break;
-    }
-  return &__u->__c;
-}
-#   else
-#    ifndef _FORCE_INLINES
-#     define __stpcpy_args(src) \
-     __extension__ ((__STRING2_COPY_ARR2)				      \
-      { { ((const char *) (src))[0], '\0' } }),				      \
-     __extension__ ((__STRING2_COPY_ARR3)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  '\0' } }),							      \
-     __extension__ ((__STRING2_COPY_ARR4)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], '\0' } }),				      \
-     __extension__ ((__STRING2_COPY_ARR5)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  '\0' } }),							      \
-     __extension__ ((__STRING2_COPY_ARR6)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  ((const char *) (src))[4], '\0' } }),				      \
-     __extension__ ((__STRING2_COPY_ARR7)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  ((const char *) (src))[4], ((const char *) (src))[5],		      \
-	  '\0' } }),							      \
-     __extension__ ((__STRING2_COPY_ARR8)				      \
-      { { ((const char *) (src))[0], ((const char *) (src))[1],		      \
-	  ((const char *) (src))[2], ((const char *) (src))[3],		      \
-	  ((const char *) (src))[4], ((const char *) (src))[5],		      \
-	  ((const char *) (src))[6], '\0' } })
-#    endif
-__STRING_INLINE char *__stpcpy_small (char *, __STRING2_COPY_ARR2,
-				      __STRING2_COPY_ARR3,
-				      __STRING2_COPY_ARR4,
-				      __STRING2_COPY_ARR5,
-				      __STRING2_COPY_ARR6,
-				      __STRING2_COPY_ARR7,
-				      __STRING2_COPY_ARR8, size_t);
-__STRING_INLINE char *
-__stpcpy_small (char *__dest,
-		__STRING2_COPY_ARR2 __src2, __STRING2_COPY_ARR3 __src3,
-		__STRING2_COPY_ARR4 __src4, __STRING2_COPY_ARR5 __src5,
-		__STRING2_COPY_ARR6 __src6, __STRING2_COPY_ARR7 __src7,
-		__STRING2_COPY_ARR8 __src8, size_t __srclen)
-{
-  union {
-    char __c;
-    __STRING2_COPY_ARR2 __sca2;
-    __STRING2_COPY_ARR3 __sca3;
-    __STRING2_COPY_ARR4 __sca4;
-    __STRING2_COPY_ARR5 __sca5;
-    __STRING2_COPY_ARR6 __sca6;
-    __STRING2_COPY_ARR7 __sca7;
-    __STRING2_COPY_ARR8 __sca8;
-  } *__u = (void *) __dest;
-  switch ((unsigned int) __srclen)
-    {
-    case 1:
-      __u->__c = '\0';
-      break;
-    case 2:
-      __extension__ __u->__sca2 = __src2;
-      break;
-    case 3:
-      __extension__ __u->__sca3 = __src3;
-      break;
-    case 4:
-      __extension__ __u->__sca4 = __src4;
-      break;
-    case 5:
-      __extension__ __u->__sca5 = __src5;
-      break;
-    case 6:
-      __extension__ __u->__sca6 = __src6;
-      break;
-    case 7:
-      __extension__ __u->__sca7 = __src7;
-      break;
-    case 8:
-      __extension__ __u->__sca8 = __src8;
-      break;
-  }
-  return __dest + __srclen - 1;
-}
-#   endif
-#  endif
-# endif
-#endif
-
-
-/* Copy no more than N characters of SRC to DEST.  */
-#ifndef _HAVE_STRING_ARCH_strncpy
-# if __GNUC_PREREQ (3, 2)
-#  define strncpy(dest, src, n) __builtin_strncpy (dest, src, n)
-# else
-#  define strncpy(dest, src, n) \
-  (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n)      \
-		  ? (strlen (src) + 1 >= ((size_t) (n))			      \
-		     ? (char *) memcpy (dest, src, n)			      \
-		     : strncpy (dest, src, n))				      \
-		  : strncpy (dest, src, n)))
-# endif
-#endif
-
-
-/* Append no more than N characters from SRC onto DEST.  */
-#ifndef _HAVE_STRING_ARCH_strncat
-# ifdef _USE_STRING_ARCH_strchr
-#  define strncat(dest, src, n) \
-  (__extension__ ({ char *__dest = (dest);				      \
-		    __builtin_constant_p (src) && __builtin_constant_p (n)    \
-		    ? (strlen (src) < ((size_t) (n))			      \
-		       ? strcat (__dest, src)				      \
-		       : (*((char *) __mempcpy (strchr (__dest, '\0'),	      \
-						src, n)) = '\0', __dest))     \
-		    : strncat (dest, src, n); }))
-# elif __GNUC_PREREQ (3, 2)
-#  define strncat(dest, src, n) __builtin_strncat (dest, src, n)
-# else
-#  define strncat(dest, src, n) \
-  (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n)      \
-		  ? (strlen (src) < ((size_t) (n))			      \
-		     ? strcat (dest, src)				      \
-		     : strncat (dest, src, n))				      \
-		  : strncat (dest, src, n)))
-# endif
-#endif
-
-
-/* Compare characters of S1 and S2.  */
-#ifndef _HAVE_STRING_ARCH_strcmp
-# if __GNUC_PREREQ (3, 2)
-#  define strcmp(s1, s2) \
-  __extension__								      \
-  ({ size_t __s1_len, __s2_len;						      \
-     (__builtin_constant_p (s1) && __builtin_constant_p (s2)		      \
-      && (__s1_len = __builtin_strlen (s1), __s2_len = __builtin_strlen (s2), \
-	  (!__string2_1bptr_p (s1) || __s1_len >= 4)			      \
-	  && (!__string2_1bptr_p (s2) || __s2_len >= 4))		      \
-      ? __builtin_strcmp (s1, s2)					      \
-      : (__builtin_constant_p (s1) && __string2_1bptr_p (s1)		      \
-	 && (__s1_len = __builtin_strlen (s1), __s1_len < 4)		      \
-	 ? (__builtin_constant_p (s2) && __string2_1bptr_p (s2)		      \
-	    ? __builtin_strcmp (s1, s2)					      \
-	    : __strcmp_cg (s1, s2, __s1_len))				      \
-	 : (__builtin_constant_p (s2) && __string2_1bptr_p (s2)		      \
-	    && (__s2_len = __builtin_strlen (s2), __s2_len < 4)		      \
-	    ? (__builtin_constant_p (s1) && __string2_1bptr_p (s1)	      \
-	       ? __builtin_strcmp (s1, s2)				      \
-	       : __strcmp_gc (s1, s2, __s2_len))			      \
-	    : __builtin_strcmp (s1, s2)))); })
-# else
-#  define strcmp(s1, s2) \
-  __extension__								      \
-  ({ size_t __s1_len, __s2_len;						      \
-     (__builtin_constant_p (s1) && __builtin_constant_p (s2)		      \
-      && (__s1_len = strlen (s1), __s2_len = strlen (s2),		      \
-	  (!__string2_1bptr_p (s1) || __s1_len >= 4)			      \
-	  && (!__string2_1bptr_p (s2) || __s2_len >= 4))		      \
-      ? memcmp ((const char *) (s1), (const char *) (s2),		      \
-		(__s1_len < __s2_len ? __s1_len : __s2_len) + 1)	      \
-      : (__builtin_constant_p (s1) && __string2_1bptr_p (s1)		      \
-	 && (__s1_len = strlen (s1), __s1_len < 4)			      \
-	 ? (__builtin_constant_p (s2) && __string2_1bptr_p (s2)		      \
-	    ? __strcmp_cc (s1, s2, __s1_len)				      \
-	    : __strcmp_cg (s1, s2, __s1_len))				      \
-	 : (__builtin_constant_p (s2) && __string2_1bptr_p (s2)		      \
-	    && (__s2_len = strlen (s2), __s2_len < 4)			      \
-	    ? (__builtin_constant_p (s1) && __string2_1bptr_p (s1)	      \
-	       ? __strcmp_cc (s1, s2, __s2_len)				      \
-	       : __strcmp_gc (s1, s2, __s2_len))			      \
-	    : strcmp (s1, s2)))); })
-# endif
-
-# define __strcmp_cc(s1, s2, l) \
-  (__extension__ ({ int __result =					      \
-		      (((const unsigned char *) (const char *) (s1))[0]	      \
-		       - ((const unsigned char *) (const char *)(s2))[0]);    \
-		    if (l > 0 && __result == 0)				      \
-		      {							      \
-			__result = (((const unsigned char *)		      \
-				     (const char *) (s1))[1]		      \
-				    - ((const unsigned char *)		      \
-				       (const char *) (s2))[1]);	      \
-			if (l > 1 && __result == 0)			      \
-			  {						      \
-			    __result =					      \
-			      (((const unsigned char *)			      \
-				(const char *) (s1))[2]			      \
-			       - ((const unsigned char *)		      \
-				  (const char *) (s2))[2]);		      \
-			    if (l > 2 && __result == 0)			      \
-			      __result =				      \
-				(((const unsigned char *)		      \
-				  (const char *) (s1))[3]		      \
-				 - ((const unsigned char *)		      \
-				    (const char *) (s2))[3]);		      \
-			  }						      \
-		      }							      \
-		    __result; }))
-
-# define __strcmp_cg(s1, s2, l1) \
-  (__extension__ ({ const unsigned char *__s2 =				      \
-		      (const unsigned char *) (const char *) (s2);	      \
-		    int __result =					      \
-		      (((const unsigned char *) (const char *) (s1))[0]	      \
-		       - __s2[0]);					      \
-		    if (l1 > 0 && __result == 0)			      \
-		      {							      \
-			__result = (((const unsigned char *)		      \
-				     (const char *) (s1))[1] - __s2[1]);      \
-			if (l1 > 1 && __result == 0)			      \
-			  {						      \
-			    __result = (((const unsigned char *)	      \
-					 (const char *) (s1))[2] - __s2[2]);  \
-			    if (l1 > 2 && __result == 0)		      \
-			      __result = (((const unsigned char *)	      \
-					  (const char *)  (s1))[3]	      \
-					  - __s2[3]);			      \
-			  }						      \
-		      }							      \
-		    __result; }))
-
-# define __strcmp_gc(s1, s2, l2) (- __strcmp_cg (s2, s1, l2))
-#endif
-
-
-/* Compare N characters of S1 and S2.  */
-#ifndef _HAVE_STRING_ARCH_strncmp
-# define strncmp(s1, s2, n)						      \
-  (__extension__ (__builtin_constant_p (n)				      \
-		  && ((__builtin_constant_p (s1)			      \
-		       && strlen (s1) < ((size_t) (n)))			      \
-		      || (__builtin_constant_p (s2)			      \
-			  && strlen (s2) < ((size_t) (n))))		      \
-		  ? strcmp (s1, s2) : strncmp (s1, s2, n)))
-#endif
-
-
-/* Return the length of the initial segment of S which
-   consists entirely of characters not in REJECT.  */
-#if !defined _HAVE_STRING_ARCH_strcspn || defined _FORCE_INLINES
-# ifndef _HAVE_STRING_ARCH_strcspn
-#  if __GNUC_PREREQ (3, 2)
-#   define strcspn(s, reject) \
-  __extension__								      \
-  ({ char __r0, __r1, __r2;						      \
-     (__builtin_constant_p (reject) && __string2_1bptr_p (reject)	      \
-      ? ((__builtin_constant_p (s) && __string2_1bptr_p (s))		      \
-	 ? __builtin_strcspn (s, reject)				      \
-	 : ((__r0 = ((const char *) (reject))[0], __r0 == '\0')		      \
-	    ? strlen (s)						      \
-	    : ((__r1 = ((const char *) (reject))[1], __r1 == '\0')	      \
-	       ? __strcspn_c1 (s, __r0)					      \
-	       : ((__r2 = ((const char *) (reject))[2], __r2 == '\0')	      \
-		  ? __strcspn_c2 (s, __r0, __r1)			      \
-		  : (((const char *) (reject))[3] == '\0'		      \
-		     ? __strcspn_c3 (s, __r0, __r1, __r2)		      \
-		     : __builtin_strcspn (s, reject))))))		      \
-      : __builtin_strcspn (s, reject)); })
-#  else
-#   define strcspn(s, reject) \
-  __extension__								      \
-  ({ char __r0, __r1, __r2;						      \
-     (__builtin_constant_p (reject) && __string2_1bptr_p (reject)	      \
-      ? ((__r0 = ((const char *) (reject))[0], __r0 == '\0')		      \
-	 ? strlen (s)							      \
-	 : ((__r1 = ((const char *) (reject))[1], __r1 == '\0')		      \
-	    ? __strcspn_c1 (s, __r0)					      \
-	    : ((__r2 = ((const char *) (reject))[2], __r2 == '\0')	      \
-	       ? __strcspn_c2 (s, __r0, __r1)				      \
-	       : (((const char *) (reject))[3] == '\0'			      \
-		  ? __strcspn_c3 (s, __r0, __r1, __r2)			      \
-		  : strcspn (s, reject)))))				      \
-      : strcspn (s, reject)); })
-#  endif
-# endif
-
-__STRING_INLINE size_t __strcspn_c1 (const char *__s, int __reject);
-__STRING_INLINE size_t
-__strcspn_c1 (const char *__s, int __reject)
-{
-  size_t __result = 0;
-  while (__s[__result] != '\0' && __s[__result] != __reject)
-    ++__result;
-  return __result;
-}
-
-__STRING_INLINE size_t __strcspn_c2 (const char *__s, int __reject1,
-				     int __reject2);
-__STRING_INLINE size_t
-__strcspn_c2 (const char *__s, int __reject1, int __reject2)
-{
-  size_t __result = 0;
-  while (__s[__result] != '\0' && __s[__result] != __reject1
-	 && __s[__result] != __reject2)
-    ++__result;
-  return __result;
-}
-
-__STRING_INLINE size_t __strcspn_c3 (const char *__s, int __reject1,
-				     int __reject2, int __reject3);
-__STRING_INLINE size_t
-__strcspn_c3 (const char *__s, int __reject1, int __reject2,
-	      int __reject3)
-{
-  size_t __result = 0;
-  while (__s[__result] != '\0' && __s[__result] != __reject1
-	 && __s[__result] != __reject2 && __s[__result] != __reject3)
-    ++__result;
-  return __result;
-}
-#endif
-
-
-/* Return the length of the initial segment of S which
-   consists entirely of characters in ACCEPT.  */
-#if !defined _HAVE_STRING_ARCH_strspn || defined _FORCE_INLINES
-# ifndef _HAVE_STRING_ARCH_strspn
-#  if __GNUC_PREREQ (3, 2)
-#   define strspn(s, accept) \
-  __extension__								      \
-  ({ char __a0, __a1, __a2;						      \
-     (__builtin_constant_p (accept) && __string2_1bptr_p (accept)	      \
-      ? ((__builtin_constant_p (s) && __string2_1bptr_p (s))		      \
-	 ? __builtin_strspn (s, accept)					      \
-	 : ((__a0 = ((const char *) (accept))[0], __a0 == '\0')		      \
-	    ? ((void) (s), (size_t) 0)					      \
-	    : ((__a1 = ((const char *) (accept))[1], __a1 == '\0')	      \
-	       ? __strspn_c1 (s, __a0)					      \
-	       : ((__a2 = ((const char *) (accept))[2], __a2 == '\0')	      \
-		  ? __strspn_c2 (s, __a0, __a1)				      \
-		  : (((const char *) (accept))[3] == '\0'		      \
-		     ? __strspn_c3 (s, __a0, __a1, __a2)		      \
-		     : __builtin_strspn (s, accept))))))		      \
-      : __builtin_strspn (s, accept)); })
-#  else
-#   define strspn(s, accept) \
-  __extension__								      \
-  ({ char __a0, __a1, __a2;						      \
-     (__builtin_constant_p (accept) && __string2_1bptr_p (accept)	      \
-      ? ((__a0 = ((const char *) (accept))[0], __a0 == '\0')		      \
-	 ? ((void) (s), (size_t) 0)					      \
-	 : ((__a1 = ((const char *) (accept))[1], __a1 == '\0')		      \
-	    ? __strspn_c1 (s, __a0)					      \
-	    : ((__a2 = ((const char *) (accept))[2], __a2 == '\0')	      \
-	       ? __strspn_c2 (s, __a0, __a1)				      \
-	       : (((const char *) (accept))[3] == '\0'			      \
-		  ? __strspn_c3 (s, __a0, __a1, __a2)			      \
-		  : strspn (s, accept)))))				      \
-      : strspn (s, accept)); })
-#  endif
-# endif
-
-__STRING_INLINE size_t __strspn_c1 (const char *__s, int __accept);
-__STRING_INLINE size_t
-__strspn_c1 (const char *__s, int __accept)
-{
-  size_t __result = 0;
-  /* Please note that __accept never can be '\0'.  */
-  while (__s[__result] == __accept)
-    ++__result;
-  return __result;
-}
-
-__STRING_INLINE size_t __strspn_c2 (const char *__s, int __accept1,
-				    int __accept2);
-__STRING_INLINE size_t
-__strspn_c2 (const char *__s, int __accept1, int __accept2)
-{
-  size_t __result = 0;
-  /* Please note that __accept1 and __accept2 never can be '\0'.  */
-  while (__s[__result] == __accept1 || __s[__result] == __accept2)
-    ++__result;
-  return __result;
-}
-
-__STRING_INLINE size_t __strspn_c3 (const char *__s, int __accept1,
-				    int __accept2, int __accept3);
-__STRING_INLINE size_t
-__strspn_c3 (const char *__s, int __accept1, int __accept2, int __accept3)
-{
-  size_t __result = 0;
-  /* Please note that __accept1 to __accept3 never can be '\0'.  */
-  while (__s[__result] == __accept1 || __s[__result] == __accept2
-	 || __s[__result] == __accept3)
-    ++__result;
-  return __result;
-}
-#endif
-
-
-/* Find the first occurrence in S of any character in ACCEPT.  */
-#if !defined _HAVE_STRING_ARCH_strpbrk || defined _FORCE_INLINES
-# ifndef _HAVE_STRING_ARCH_strpbrk
-#  if __GNUC_PREREQ (3, 2)
-#   define strpbrk(s, accept) \
-  __extension__								      \
-  ({ char __a0, __a1, __a2;						      \
-     (__builtin_constant_p (accept) && __string2_1bptr_p (accept)	      \
-      ? ((__builtin_constant_p (s) && __string2_1bptr_p (s))		      \
-	 ? __builtin_strpbrk (s, accept)				      \
-	 : ((__a0 = ((const char  *) (accept))[0], __a0 == '\0')	      \
-	    ? ((void) (s), (char *) NULL)				      \
-	    : ((__a1 = ((const char *) (accept))[1], __a1 == '\0')	      \
-	       ? __builtin_strchr (s, __a0)				      \
-	       : ((__a2 = ((const char *) (accept))[2], __a2 == '\0')	      \
-		  ? __strpbrk_c2 (s, __a0, __a1)			      \
-		  : (((const char *) (accept))[3] == '\0'		      \
-		     ? __strpbrk_c3 (s, __a0, __a1, __a2)		      \
-		     : __builtin_strpbrk (s, accept))))))		      \
-      : __builtin_strpbrk (s, accept)); })
-#  else
-#   define strpbrk(s, accept) \
-  __extension__								      \
-  ({ char __a0, __a1, __a2;						      \
-     (__builtin_constant_p (accept) && __string2_1bptr_p (accept)	      \
-      ? ((__a0 = ((const char  *) (accept))[0], __a0 == '\0')		      \
-	 ? ((void) (s), (char *) NULL)					      \
-	 : ((__a1 = ((const char *) (accept))[1], __a1 == '\0')		      \
-	    ? strchr (s, __a0)						      \
-	    : ((__a2 = ((const char *) (accept))[2], __a2 == '\0')	      \
-	       ? __strpbrk_c2 (s, __a0, __a1)				      \
-	       : (((const char *) (accept))[3] == '\0'			      \
-		  ? __strpbrk_c3 (s, __a0, __a1, __a2)			      \
-		  : strpbrk (s, accept)))))				      \
-      : strpbrk (s, accept)); })
-#  endif
-# endif
-
-__STRING_INLINE char *__strpbrk_c2 (const char *__s, int __accept1,
-				    int __accept2);
-__STRING_INLINE char *
-__strpbrk_c2 (const char *__s, int __accept1, int __accept2)
-{
-  /* Please note that __accept1 and __accept2 never can be '\0'.  */
-  while (*__s != '\0' && *__s != __accept1 && *__s != __accept2)
-    ++__s;
-  return *__s == '\0' ? NULL : (char *) (size_t) __s;
-}
-
-__STRING_INLINE char *__strpbrk_c3 (const char *__s, int __accept1,
-				    int __accept2, int __accept3);
-__STRING_INLINE char *
-__strpbrk_c3 (const char *__s, int __accept1, int __accept2, int __accept3)
-{
-  /* Please note that __accept1 to __accept3 never can be '\0'.  */
-  while (*__s != '\0' && *__s != __accept1 && *__s != __accept2
-	 && *__s != __accept3)
-    ++__s;
-  return *__s == '\0' ? NULL : (char *) (size_t) __s;
-}
-#endif
-
-
-/* Find the first occurrence of NEEDLE in HAYSTACK.  Newer gcc versions
-   do this itself.  */
-#if !defined _HAVE_STRING_ARCH_strstr && !__GNUC_PREREQ (2, 97)
-# define strstr(haystack, needle) \
-  (__extension__ (__builtin_constant_p (needle) && __string2_1bptr_p (needle) \
-		  ? (((const char *) (needle))[0] == '\0'		      \
-		     ? (char *) (size_t) (haystack)			      \
-		     : (((const char *) (needle))[1] == '\0'		      \
-			? strchr (haystack,				      \
-				  ((const char *) (needle))[0]) 	      \
-			: strstr (haystack, needle)))			      \
-		  : strstr (haystack, needle)))
-#endif
-
-
-#if !defined _HAVE_STRING_ARCH_strtok_r || defined _FORCE_INLINES
-# ifndef _HAVE_STRING_ARCH_strtok_r
-#  define __strtok_r(s, sep, nextp) \
-  (__extension__ (__builtin_constant_p (sep) && __string2_1bptr_p (sep)	      \
-		  && ((const char *) (sep))[0] != '\0'			      \
-		  && ((const char *) (sep))[1] == '\0'			      \
-		  ? __strtok_r_1c (s, ((const char *) (sep))[0], nextp)       \
-		  : __strtok_r (s, sep, nextp)))
-# endif
-
-__STRING_INLINE char *__strtok_r_1c (char *__s, char __sep, char **__nextp);
-__STRING_INLINE char *
-__strtok_r_1c (char *__s, char __sep, char **__nextp)
-{
-  char *__result;
-  if (__s == NULL)
-    __s = *__nextp;
-  while (*__s == __sep)
-    ++__s;
-  __result = NULL;
-  if (*__s != '\0')
-    {
-      __result = __s++;
-      while (*__s != '\0')
-	if (*__s++ == __sep)
-	  {
-	    __s[-1] = '\0';
-	    break;
-	  }
-    }
-  *__nextp = __s;
-  return __result;
-}
-# ifdef __USE_POSIX
-#  define strtok_r(s, sep, nextp) __strtok_r (s, sep, nextp)
-# endif
-#endif
-
-
-#if !defined _HAVE_STRING_ARCH_strsep || defined _FORCE_INLINES
-# ifndef _HAVE_STRING_ARCH_strsep
-
-extern char *__strsep_g (char **__stringp, const char *__delim);
-#  define __strsep(s, reject) \
-  __extension__								      \
-  ({ char __r0, __r1, __r2;						      \
-     (__builtin_constant_p (reject) && __string2_1bptr_p (reject)	      \
-      && (__r0 = ((const char *) (reject))[0],				      \
-	  ((const char *) (reject))[0] != '\0')				      \
-      ? ((__r1 = ((const char *) (reject))[1],				      \
-	 ((const char *) (reject))[1] == '\0')				      \
-	 ? __strsep_1c (s, __r0)					      \
-	 : ((__r2 = ((const char *) (reject))[2], __r2 == '\0')		      \
-	    ? __strsep_2c (s, __r0, __r1)				      \
-	    : (((const char *) (reject))[3] == '\0'			      \
-	       ? __strsep_3c (s, __r0, __r1, __r2)			      \
-	       : __strsep_g (s, reject))))				      \
-      : __strsep_g (s, reject)); })
-# endif
-
-__STRING_INLINE char *__strsep_1c (char **__s, char __reject);
-__STRING_INLINE char *
-__strsep_1c (char **__s, char __reject)
-{
-  char *__retval = *__s;
-  if (__retval != NULL && (*__s = strchr (__retval, __reject)) != NULL)
-    *(*__s)++ = '\0';
-  return __retval;
-}
-
-__STRING_INLINE char *__strsep_2c (char **__s, char __reject1, char __reject2);
-__STRING_INLINE char *
-__strsep_2c (char **__s, char __reject1, char __reject2)
-{
-  char *__retval = *__s;
-  if (__retval != NULL)
-    {
-      char *__cp = __retval;
-      while (1)
-	{
-	  if (*__cp == '\0')
-	    {
-	      __cp = NULL;
-	  break;
-	    }
-	  if (*__cp == __reject1 || *__cp == __reject2)
-	    {
-	      *__cp++ = '\0';
-	      break;
-	    }
-	  ++__cp;
-	}
-      *__s = __cp;
-    }
-  return __retval;
-}
-
-__STRING_INLINE char *__strsep_3c (char **__s, char __reject1, char __reject2,
-				   char __reject3);
-__STRING_INLINE char *
-__strsep_3c (char **__s, char __reject1, char __reject2, char __reject3)
-{
-  char *__retval = *__s;
-  if (__retval != NULL)
-    {
-      char *__cp = __retval;
-      while (1)
-	{
-	  if (*__cp == '\0')
-	    {
-	      __cp = NULL;
-	  break;
-	    }
-	  if (*__cp == __reject1 || *__cp == __reject2 || *__cp == __reject3)
-	    {
-	      *__cp++ = '\0';
-	      break;
-	    }
-	  ++__cp;
-	}
-      *__s = __cp;
-    }
-  return __retval;
-}
-# ifdef __USE_MISC
-#  define strsep(s, reject) __strsep (s, reject)
-# endif
-#endif
-
-/* We need the memory allocation functions for inline strdup().
-   Referring to stdlib.h (even minimally) is not allowed
-   in any of the tight standards compliant modes.  */
-#ifdef __USE_MISC
-
-# if !defined _HAVE_STRING_ARCH_strdup || !defined _HAVE_STRING_ARCH_strndup
-#  define __need_malloc_and_calloc
-#  include <stdlib.h>
-# endif
-
-# ifndef _HAVE_STRING_ARCH_strdup
-
-extern char *__strdup (const char *__string) __THROW __attribute_malloc__;
-#  define __strdup(s) \
-  (__extension__ (__builtin_constant_p (s) && __string2_1bptr_p (s)	      \
-		  ? (((const char *) (s))[0] == '\0'			      \
-		     ? (char *) calloc ((size_t) 1, (size_t) 1)		      \
-		     : ({ size_t __len = strlen (s) + 1;		      \
-			  char *__retval = (char *) malloc (__len);	      \
-			  if (__retval != NULL)				      \
-			    __retval = (char *) memcpy (__retval, s, __len);  \
-			  __retval; }))					      \
-		  : __strdup (s)))
-
-#  if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-#   define strdup(s) __strdup (s)
-#  endif
-# endif
-
-# ifndef _HAVE_STRING_ARCH_strndup
-
-extern char *__strndup (const char *__string, size_t __n)
-     __THROW __attribute_malloc__;
-#  define __strndup(s, n) \
-  (__extension__ (__builtin_constant_p (s) && __string2_1bptr_p (s)	      \
-		  ? (((const char *) (s))[0] == '\0'			      \
-		     ? (char *) calloc ((size_t) 1, (size_t) 1)		      \
-		     : ({ size_t __len = strlen (s) + 1;		      \
-			  size_t __n = (n);				      \
-			  char *__retval;				      \
-			  if (__n < __len)				      \
-			    __len = __n + 1;				      \
-			  __retval = (char *) malloc (__len);		      \
-			  if (__retval != NULL)				      \
-			    {						      \
-			      __retval[__len - 1] = '\0';		      \
-			      __retval = (char *) memcpy (__retval, s,	      \
-							  __len - 1);	      \
-			    }						      \
-			  __retval; }))					      \
-		  : __strndup (s, n)))
-
-#  ifdef __USE_XOPEN2K8
-#   define strndup(s, n) __strndup (s, n)
-#  endif
-# endif
-
-#endif /* Use misc. or use GNU.  */
-
-#ifndef _FORCE_INLINES
-# undef __STRING_INLINE
-#endif
-
-#endif /* No string inlines.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/string3.h b/openflow/usr/include/arm-linux-gnueabihf/bits/string3.h
deleted file mode 100644
index dd8db68..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/string3.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Copyright (C) 2004-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STRING_H
-# error "Never use <bits/string3.h> directly; include <string.h> instead."
-#endif
-
-#if !__GNUC_PREREQ (5,0)
-__warndecl (__warn_memset_zero_len,
-	    "memset used with constant zero length parameter; this could be due to transposed parameters");
-#endif
-
-#ifndef __cplusplus
-/* XXX This is temporarily.  We should not redefine any of the symbols
-   and instead integrate the error checking into the original
-   definitions.  */
-# undef memcpy
-# undef memmove
-# undef memset
-# undef strcat
-# undef strcpy
-# undef strncat
-# undef strncpy
-# ifdef __USE_GNU
-#  undef mempcpy
-#  undef stpcpy
-# endif
-# ifdef __USE_MISC
-#  undef bcopy
-#  undef bzero
-# endif
-#endif
-
-
-__fortify_function void *
-__NTH (memcpy (void *__restrict __dest, const void *__restrict __src,
-	       size_t __len))
-{
-  return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
-}
-
-__fortify_function void *
-__NTH (memmove (void *__dest, const void *__src, size_t __len))
-{
-  return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
-}
-
-#ifdef __USE_GNU
-__fortify_function void *
-__NTH (mempcpy (void *__restrict __dest, const void *__restrict __src,
-		size_t __len))
-{
-  return __builtin___mempcpy_chk (__dest, __src, __len, __bos0 (__dest));
-}
-#endif
-
-
-/* The first two tests here help to catch a somewhat common problem
-   where the second and third parameter are transposed.  This is
-   especially problematic if the intended fill value is zero.  In this
-   case no work is done at all.  We detect these problems by referring
-   non-existing functions.  */
-__fortify_function void *
-__NTH (memset (void *__dest, int __ch, size_t __len))
-{
-  /* GCC-5.0 and newer implements these checks in the compiler, so we don't
-     need them here.  */
-#if !__GNUC_PREREQ (5,0)
-  if (__builtin_constant_p (__len) && __len == 0
-      && (!__builtin_constant_p (__ch) || __ch != 0))
-    {
-      __warn_memset_zero_len ();
-      return __dest;
-    }
-#endif
-  return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest));
-}
-
-#ifdef __USE_MISC
-__fortify_function void
-__NTH (bcopy (const void *__src, void *__dest, size_t __len))
-{
-  (void) __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
-}
-
-__fortify_function void
-__NTH (bzero (void *__dest, size_t __len))
-{
-  (void) __builtin___memset_chk (__dest, '\0', __len, __bos0 (__dest));
-}
-#endif
-
-__fortify_function char *
-__NTH (strcpy (char *__restrict __dest, const char *__restrict __src))
-{
-  return __builtin___strcpy_chk (__dest, __src, __bos (__dest));
-}
-
-#ifdef __USE_GNU
-__fortify_function char *
-__NTH (stpcpy (char *__restrict __dest, const char *__restrict __src))
-{
-  return __builtin___stpcpy_chk (__dest, __src, __bos (__dest));
-}
-#endif
-
-
-__fortify_function char *
-__NTH (strncpy (char *__restrict __dest, const char *__restrict __src,
-		size_t __len))
-{
-  return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
-}
-
-// XXX We have no corresponding builtin yet.
-extern char *__stpncpy_chk (char *__dest, const char *__src, size_t __n,
-			    size_t __destlen) __THROW;
-extern char *__REDIRECT_NTH (__stpncpy_alias, (char *__dest, const char *__src,
-					       size_t __n), stpncpy);
-
-__fortify_function char *
-__NTH (stpncpy (char *__dest, const char *__src, size_t __n))
-{
-  if (__bos (__dest) != (size_t) -1
-      && (!__builtin_constant_p (__n) || __n > __bos (__dest)))
-    return __stpncpy_chk (__dest, __src, __n, __bos (__dest));
-  return __stpncpy_alias (__dest, __src, __n);
-}
-
-
-__fortify_function char *
-__NTH (strcat (char *__restrict __dest, const char *__restrict __src))
-{
-  return __builtin___strcat_chk (__dest, __src, __bos (__dest));
-}
-
-
-__fortify_function char *
-__NTH (strncat (char *__restrict __dest, const char *__restrict __src,
-		size_t __len))
-{
-  return __builtin___strncat_chk (__dest, __src, __len, __bos (__dest));
-}
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/stropts.h b/openflow/usr/include/arm-linux-gnueabihf/bits/stropts.h
deleted file mode 100644
index d419e52..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/stropts.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STROPTS_H
-# error "Never include <bits/stropts.h> directly; use <stropts.h> instead."
-#endif
-
-#ifndef _BITS_STROPTS_H
-#define _BITS_STROPTS_H	1
-
-#include <bits/types.h>
-
-/* Macros used as `request' argument to `ioctl'.  */
-#define __SID		('S' << 8)
-
-#define I_NREAD	    (__SID | 1)	/* Counts the number of data bytes in the data
-				   block in the first message.  */
-#define I_PUSH	    (__SID | 2)	/* Push STREAMS module onto top of the current
-				   STREAM, just below the STREAM head.  */
-#define I_POP	    (__SID | 3)	/* Remove STREAMS module from just below the
-				   STREAM head.  */
-#define I_LOOK	    (__SID | 4)	/* Retrieve the name of the module just below
-				   the STREAM head and place it in a character
-				   string.  */
-#define I_FLUSH	    (__SID | 5)	/* Flush all input and/or output.  */
-#define I_SRDOPT    (__SID | 6)	/* Sets the read mode.  */
-#define I_GRDOPT    (__SID | 7)	/* Returns the current read mode setting.  */
-#define I_STR	    (__SID | 8)	/* Construct an internal STREAMS `ioctl'
-				   message and send that message downstream. */
-#define I_SETSIG    (__SID | 9)	/* Inform the STREAM head that the process
-				   wants the SIGPOLL signal issued.  */
-#define I_GETSIG    (__SID |10) /* Return the events for which the calling
-				   process is currently registered to be sent
-				   a SIGPOLL signal.  */
-#define I_FIND	    (__SID |11) /* Compares the names of all modules currently
-				   present in the STREAM to the name pointed to
-				   by `arg'.  */
-#define I_LINK	    (__SID |12) /* Connect two STREAMs.  */
-#define I_UNLINK    (__SID |13) /* Disconnects the two STREAMs.  */
-#define I_PEEK	    (__SID |15) /* Allows a process to retrieve the information
-				   in the first message on the STREAM head read
-				   queue without taking the message off the
-				   queue.  */
-#define I_FDINSERT  (__SID |16) /* Create a message from the specified
-				   buffer(s), adds information about another
-				   STREAM, and send the message downstream.  */
-#define I_SENDFD    (__SID |17) /* Requests the STREAM associated with `fildes'
-				   to send a message, containing a file
-				   pointer, to the STREAM head at the other end
-				   of a STREAMS pipe.  */
-#define I_RECVFD    (__SID |14) /* Non-EFT definition.  */
-#define I_SWROPT    (__SID |19) /* Set the write mode.  */
-#define I_GWROPT    (__SID |20) /* Return the current write mode setting.  */
-#define I_LIST	    (__SID |21) /* List all the module names on the STREAM, up
-				   to and including the topmost driver name. */
-#define I_PLINK	    (__SID |22) /* Connect two STREAMs with a persistent
-				   link.  */
-#define I_PUNLINK   (__SID |23) /* Disconnect the two STREAMs that were
-				   connected with a persistent link.  */
-#define I_FLUSHBAND (__SID |28) /* Flush only band specified.  */
-#define I_CKBAND    (__SID |29) /* Check if the message of a given priority
-				   band exists on the STREAM head read
-				   queue.  */
-#define I_GETBAND   (__SID |30) /* Return the priority band of the first
-				   message on the STREAM head read queue.  */
-#define I_ATMARK    (__SID |31) /* See if the current message on the STREAM
-				   head read queue is "marked" by some module
-				   downstream.  */
-#define I_SETCLTIME (__SID |32) /* Set the time the STREAM head will delay when
-				   a STREAM is closing and there is data on
-				   the write queues.  */
-#define I_GETCLTIME (__SID |33) /* Get current value for closing timeout.  */
-#define I_CANPUT    (__SID |34) /* Check if a certain band is writable.  */
-
-
-/* Used in `I_LOOK' request.  */
-#define FMNAMESZ	8	/* compatibility w/UnixWare/Solaris.  */
-
-/* Flush options.  */
-#define FLUSHR		0x01	/* Flush read queues.  */
-#define FLUSHW		0x02	/* Flush write queues.  */
-#define FLUSHRW		0x03	/* Flush read and write queues.  */
-#ifdef __USE_GNU
-# define FLUSHBAND	0x04	/* Flush only specified band.  */
-#endif
-
-/* Possible arguments for `I_SETSIG'.  */
-#define S_INPUT		0x0001	/* A message, other than a high-priority
-				   message, has arrived.  */
-#define S_HIPRI		0x0002	/* A high-priority message is present.  */
-#define S_OUTPUT	0x0004	/* The write queue for normal data is no longer
-				   full.  */
-#define S_MSG		0x0008	/* A STREAMS signal message that contains the
-				   SIGPOLL signal reaches the front of the
-				   STREAM head read queue.  */
-#define S_ERROR		0x0010	/* Notification of an error condition.  */
-#define S_HANGUP	0x0020	/* Notification of a hangup.  */
-#define S_RDNORM	0x0040	/* A normal message has arrived.  */
-#define S_WRNORM	S_OUTPUT
-#define S_RDBAND	0x0080	/* A message with a non-zero priority has
-				   arrived.  */
-#define S_WRBAND	0x0100	/* The write queue for a non-zero priority
-				   band is no longer full.  */
-#define S_BANDURG	0x0200	/* When used in conjunction with S_RDBAND,
-				   SIGURG is generated instead of SIGPOLL when
-				   a priority message reaches the front of the
-				   STREAM head read queue.  */
-
-/* Option for `I_PEEK'.  */
-#define RS_HIPRI	0x01	/* Only look for high-priority messages.  */
-
-/* Options for `I_SRDOPT'.  */
-#define RNORM		0x0000	/* Byte-STREAM mode, the default.  */
-#define RMSGD		0x0001	/* Message-discard mode.   */
-#define RMSGN		0x0002	/* Message-nondiscard mode.   */
-#define RPROTDAT	0x0004	/* Deliver the control part of a message as
-				   data.  */
-#define RPROTDIS	0x0008	/* Discard the control part of a message,
-				   delivering any data part.  */
-#define RPROTNORM	0x0010	/* Fail `read' with EBADMSG if a message
-				   containing a control part is at the front
-				   of the STREAM head read queue.  */
-#ifdef __USE_GNU
-# define RPROTMASK	0x001C	/* The RPROT bits */
-#endif
-
-/* Possible mode for `I_SWROPT'.  */
-#define SNDZERO		0x001	/* Send a zero-length message downstream when a
-				   `write' of 0 bytes occurs.  */
-#ifdef __USE_GNU
-# define SNDPIPE	0x002	/* Send SIGPIPE on write and putmsg if
-				   sd_werror is set.  */
-#endif
-
-/* Arguments for `I_ATMARK'.  */
-#define ANYMARK		0x01	/* Check if the message is marked.  */
-#define LASTMARK	0x02	/* Check if the message is the last one marked
-				   on the queue.  */
-
-/* Argument for `I_UNLINK'.  */
-#ifdef __USE_GNU
-# define MUXID_ALL	(-1)	/* Unlink all STREAMs linked to the STREAM
-				   associated with `fildes'.  */
-#endif
-
-
-/* Macros for `getmsg', `getpmsg', `putmsg' and `putpmsg'.  */
-#define MSG_HIPRI	0x01	/* Send/receive high priority message.  */
-#define MSG_ANY		0x02	/* Receive any message.  */
-#define MSG_BAND	0x04	/* Receive message from specified band.  */
-
-/* Values returned by getmsg and getpmsg */
-#define MORECTL		1	/* More control information is left in
-				   message.  */
-#define MOREDATA	2	/* More data is left in message.  */
-
-
-/* Structure used for the I_FLUSHBAND ioctl on streams.  */
-struct bandinfo
-  {
-    unsigned char bi_pri;
-    int bi_flag;
-  };
-
-struct strbuf
-  {
-    int maxlen;		/* Maximum buffer length.  */
-    int len;		/* Length of data.  */
-    char *buf;		/* Pointer to buffer.  */
-  };
-
-struct strpeek
-  {
-    struct strbuf ctlbuf;
-    struct strbuf databuf;
-    t_uscalar_t flags;			/* UnixWare/Solaris compatibility.  */
-  };
-
-struct strfdinsert
-  {
-    struct strbuf ctlbuf;
-    struct strbuf databuf;
-    t_uscalar_t flags;			/* UnixWare/Solaris compatibility.  */
-    int fildes;
-    int offset;
-  };
-
-struct strioctl
-  {
-    int ic_cmd;
-    int ic_timout;
-    int ic_len;
-    char *ic_dp;
-  };
-
-struct strrecvfd
-  {
-    int fd;
-    uid_t uid;
-    gid_t gid;
-    char __fill[8];			/* UnixWare/Solaris compatibility */
-  };
-
-
-struct str_mlist
-  {
-    char l_name[FMNAMESZ + 1];
-  };
-
-struct str_list
-  {
-    int sl_nmods;
-    struct str_mlist *sl_modlist;
-  };
-
-#endif /* bits/stropts.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/sys_errlist.h b/openflow/usr/include/arm-linux-gnueabihf/bits/sys_errlist.h
deleted file mode 100644
index c6385f1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/sys_errlist.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Declare sys_errlist and sys_nerr, or don't.  Compatibility (do) version.
-   Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STDIO_H
-# error "Never include <bits/sys_errlist.h> directly; use <stdio.h> instead."
-#endif
-
-/* sys_errlist and sys_nerr are deprecated.  Use strerror instead.  */
-
-#ifdef  __USE_MISC
-extern int sys_nerr;
-extern const char *const sys_errlist[];
-#endif
-#ifdef  __USE_GNU
-extern int _sys_nerr;
-extern const char *const _sys_errlist[];
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/syscall.h b/openflow/usr/include/arm-linux-gnueabihf/bits/syscall.h
deleted file mode 100644
index 6900f47..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/syscall.h
+++ /dev/null
@@ -1,709 +0,0 @@
-/* Generated at libc build time from kernel syscall list.  */
-
-#ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
-#endif
-
-
-#if !defined __ARM_PCS_VFP
-#define SYS_OABI_SYSCALL_BASE __NR_OABI_SYSCALL_BASE
-#define SYS_SYSCALL_BASE __NR_SYSCALL_BASE
-#define SYS__llseek __NR__llseek
-#define SYS__newselect __NR__newselect
-#define SYS__sysctl __NR__sysctl
-#define SYS_accept __NR_accept
-#define SYS_accept4 __NR_accept4
-#define SYS_access __NR_access
-#define SYS_acct __NR_acct
-#define SYS_add_key __NR_add_key
-#define SYS_adjtimex __NR_adjtimex
-#define SYS_arm_fadvise64_64 __NR_arm_fadvise64_64
-#define SYS_arm_sync_file_range __NR_arm_sync_file_range
-#define SYS_bdflush __NR_bdflush
-#define SYS_bind __NR_bind
-#define SYS_bpf __NR_bpf
-#define SYS_brk __NR_brk
-#define SYS_capget __NR_capget
-#define SYS_capset __NR_capset
-#define SYS_chdir __NR_chdir
-#define SYS_chmod __NR_chmod
-#define SYS_chown __NR_chown
-#define SYS_chown32 __NR_chown32
-#define SYS_chroot __NR_chroot
-#define SYS_clock_adjtime __NR_clock_adjtime
-#define SYS_clock_getres __NR_clock_getres
-#define SYS_clock_gettime __NR_clock_gettime
-#define SYS_clock_nanosleep __NR_clock_nanosleep
-#define SYS_clock_settime __NR_clock_settime
-#define SYS_clone __NR_clone
-#define SYS_close __NR_close
-#define SYS_connect __NR_connect
-#define SYS_creat __NR_creat
-#define SYS_delete_module __NR_delete_module
-#define SYS_dup __NR_dup
-#define SYS_dup2 __NR_dup2
-#define SYS_dup3 __NR_dup3
-#define SYS_epoll_create __NR_epoll_create
-#define SYS_epoll_create1 __NR_epoll_create1
-#define SYS_epoll_ctl __NR_epoll_ctl
-#define SYS_epoll_pwait __NR_epoll_pwait
-#define SYS_epoll_wait __NR_epoll_wait
-#define SYS_eventfd __NR_eventfd
-#define SYS_eventfd2 __NR_eventfd2
-#define SYS_execve __NR_execve
-#define SYS_execveat __NR_execveat
-#define SYS_exit __NR_exit
-#define SYS_exit_group __NR_exit_group
-#define SYS_faccessat __NR_faccessat
-#define SYS_fallocate __NR_fallocate
-#define SYS_fanotify_init __NR_fanotify_init
-#define SYS_fanotify_mark __NR_fanotify_mark
-#define SYS_fchdir __NR_fchdir
-#define SYS_fchmod __NR_fchmod
-#define SYS_fchmodat __NR_fchmodat
-#define SYS_fchown __NR_fchown
-#define SYS_fchown32 __NR_fchown32
-#define SYS_fchownat __NR_fchownat
-#define SYS_fcntl __NR_fcntl
-#define SYS_fcntl64 __NR_fcntl64
-#define SYS_fdatasync __NR_fdatasync
-#define SYS_fgetxattr __NR_fgetxattr
-#define SYS_finit_module __NR_finit_module
-#define SYS_flistxattr __NR_flistxattr
-#define SYS_flock __NR_flock
-#define SYS_fork __NR_fork
-#define SYS_fremovexattr __NR_fremovexattr
-#define SYS_fsetxattr __NR_fsetxattr
-#define SYS_fstat __NR_fstat
-#define SYS_fstat64 __NR_fstat64
-#define SYS_fstatat64 __NR_fstatat64
-#define SYS_fstatfs __NR_fstatfs
-#define SYS_fstatfs64 __NR_fstatfs64
-#define SYS_fsync __NR_fsync
-#define SYS_ftruncate __NR_ftruncate
-#define SYS_ftruncate64 __NR_ftruncate64
-#define SYS_futex __NR_futex
-#define SYS_futimesat __NR_futimesat
-#define SYS_get_mempolicy __NR_get_mempolicy
-#define SYS_get_robust_list __NR_get_robust_list
-#define SYS_getcpu __NR_getcpu
-#define SYS_getcwd __NR_getcwd
-#define SYS_getdents __NR_getdents
-#define SYS_getdents64 __NR_getdents64
-#define SYS_getegid __NR_getegid
-#define SYS_getegid32 __NR_getegid32
-#define SYS_geteuid __NR_geteuid
-#define SYS_geteuid32 __NR_geteuid32
-#define SYS_getgid __NR_getgid
-#define SYS_getgid32 __NR_getgid32
-#define SYS_getgroups __NR_getgroups
-#define SYS_getgroups32 __NR_getgroups32
-#define SYS_getitimer __NR_getitimer
-#define SYS_getpeername __NR_getpeername
-#define SYS_getpgid __NR_getpgid
-#define SYS_getpgrp __NR_getpgrp
-#define SYS_getpid __NR_getpid
-#define SYS_getppid __NR_getppid
-#define SYS_getpriority __NR_getpriority
-#define SYS_getrandom __NR_getrandom
-#define SYS_getresgid __NR_getresgid
-#define SYS_getresgid32 __NR_getresgid32
-#define SYS_getresuid __NR_getresuid
-#define SYS_getresuid32 __NR_getresuid32
-#define SYS_getrusage __NR_getrusage
-#define SYS_getsid __NR_getsid
-#define SYS_getsockname __NR_getsockname
-#define SYS_getsockopt __NR_getsockopt
-#define SYS_gettid __NR_gettid
-#define SYS_gettimeofday __NR_gettimeofday
-#define SYS_getuid __NR_getuid
-#define SYS_getuid32 __NR_getuid32
-#define SYS_getxattr __NR_getxattr
-#define SYS_init_module __NR_init_module
-#define SYS_inotify_add_watch __NR_inotify_add_watch
-#define SYS_inotify_init __NR_inotify_init
-#define SYS_inotify_init1 __NR_inotify_init1
-#define SYS_inotify_rm_watch __NR_inotify_rm_watch
-#define SYS_io_cancel __NR_io_cancel
-#define SYS_io_destroy __NR_io_destroy
-#define SYS_io_getevents __NR_io_getevents
-#define SYS_io_setup __NR_io_setup
-#define SYS_io_submit __NR_io_submit
-#define SYS_ioctl __NR_ioctl
-#define SYS_ioprio_get __NR_ioprio_get
-#define SYS_ioprio_set __NR_ioprio_set
-#define SYS_kcmp __NR_kcmp
-#define SYS_kexec_load __NR_kexec_load
-#define SYS_keyctl __NR_keyctl
-#define SYS_kill __NR_kill
-#define SYS_lchown __NR_lchown
-#define SYS_lchown32 __NR_lchown32
-#define SYS_lgetxattr __NR_lgetxattr
-#define SYS_link __NR_link
-#define SYS_linkat __NR_linkat
-#define SYS_listen __NR_listen
-#define SYS_listxattr __NR_listxattr
-#define SYS_llistxattr __NR_llistxattr
-#define SYS_lookup_dcookie __NR_lookup_dcookie
-#define SYS_lremovexattr __NR_lremovexattr
-#define SYS_lseek __NR_lseek
-#define SYS_lsetxattr __NR_lsetxattr
-#define SYS_lstat __NR_lstat
-#define SYS_lstat64 __NR_lstat64
-#define SYS_madvise __NR_madvise
-#define SYS_mbind __NR_mbind
-#define SYS_membarrier __NR_membarrier
-#define SYS_memfd_create __NR_memfd_create
-#define SYS_mincore __NR_mincore
-#define SYS_mkdir __NR_mkdir
-#define SYS_mkdirat __NR_mkdirat
-#define SYS_mknod __NR_mknod
-#define SYS_mknodat __NR_mknodat
-#define SYS_mlock __NR_mlock
-#define SYS_mlock2 __NR_mlock2
-#define SYS_mlockall __NR_mlockall
-#define SYS_mmap2 __NR_mmap2
-#define SYS_mount __NR_mount
-#define SYS_move_pages __NR_move_pages
-#define SYS_mprotect __NR_mprotect
-#define SYS_mq_getsetattr __NR_mq_getsetattr
-#define SYS_mq_notify __NR_mq_notify
-#define SYS_mq_open __NR_mq_open
-#define SYS_mq_timedreceive __NR_mq_timedreceive
-#define SYS_mq_timedsend __NR_mq_timedsend
-#define SYS_mq_unlink __NR_mq_unlink
-#define SYS_mremap __NR_mremap
-#define SYS_msgctl __NR_msgctl
-#define SYS_msgget __NR_msgget
-#define SYS_msgrcv __NR_msgrcv
-#define SYS_msgsnd __NR_msgsnd
-#define SYS_msync __NR_msync
-#define SYS_munlock __NR_munlock
-#define SYS_munlockall __NR_munlockall
-#define SYS_munmap __NR_munmap
-#define SYS_name_to_handle_at __NR_name_to_handle_at
-#define SYS_nanosleep __NR_nanosleep
-#define SYS_nfsservctl __NR_nfsservctl
-#define SYS_nice __NR_nice
-#define SYS_open __NR_open
-#define SYS_open_by_handle_at __NR_open_by_handle_at
-#define SYS_openat __NR_openat
-#define SYS_pause __NR_pause
-#define SYS_pciconfig_iobase __NR_pciconfig_iobase
-#define SYS_pciconfig_read __NR_pciconfig_read
-#define SYS_pciconfig_write __NR_pciconfig_write
-#define SYS_perf_event_open __NR_perf_event_open
-#define SYS_personality __NR_personality
-#define SYS_pipe __NR_pipe
-#define SYS_pipe2 __NR_pipe2
-#define SYS_pivot_root __NR_pivot_root
-#define SYS_poll __NR_poll
-#define SYS_ppoll __NR_ppoll
-#define SYS_prctl __NR_prctl
-#define SYS_pread64 __NR_pread64
-#define SYS_preadv __NR_preadv
-#define SYS_prlimit64 __NR_prlimit64
-#define SYS_process_vm_readv __NR_process_vm_readv
-#define SYS_process_vm_writev __NR_process_vm_writev
-#define SYS_pselect6 __NR_pselect6
-#define SYS_ptrace __NR_ptrace
-#define SYS_pwrite64 __NR_pwrite64
-#define SYS_pwritev __NR_pwritev
-#define SYS_quotactl __NR_quotactl
-#define SYS_read __NR_read
-#define SYS_readahead __NR_readahead
-#define SYS_readlink __NR_readlink
-#define SYS_readlinkat __NR_readlinkat
-#define SYS_readv __NR_readv
-#define SYS_reboot __NR_reboot
-#define SYS_recv __NR_recv
-#define SYS_recvfrom __NR_recvfrom
-#define SYS_recvmmsg __NR_recvmmsg
-#define SYS_recvmsg __NR_recvmsg
-#define SYS_remap_file_pages __NR_remap_file_pages
-#define SYS_removexattr __NR_removexattr
-#define SYS_rename __NR_rename
-#define SYS_renameat __NR_renameat
-#define SYS_renameat2 __NR_renameat2
-#define SYS_request_key __NR_request_key
-#define SYS_restart_syscall __NR_restart_syscall
-#define SYS_rmdir __NR_rmdir
-#define SYS_rt_sigaction __NR_rt_sigaction
-#define SYS_rt_sigpending __NR_rt_sigpending
-#define SYS_rt_sigprocmask __NR_rt_sigprocmask
-#define SYS_rt_sigqueueinfo __NR_rt_sigqueueinfo
-#define SYS_rt_sigreturn __NR_rt_sigreturn
-#define SYS_rt_sigsuspend __NR_rt_sigsuspend
-#define SYS_rt_sigtimedwait __NR_rt_sigtimedwait
-#define SYS_rt_tgsigqueueinfo __NR_rt_tgsigqueueinfo
-#define SYS_sched_get_priority_max __NR_sched_get_priority_max
-#define SYS_sched_get_priority_min __NR_sched_get_priority_min
-#define SYS_sched_getaffinity __NR_sched_getaffinity
-#define SYS_sched_getattr __NR_sched_getattr
-#define SYS_sched_getparam __NR_sched_getparam
-#define SYS_sched_getscheduler __NR_sched_getscheduler
-#define SYS_sched_rr_get_interval __NR_sched_rr_get_interval
-#define SYS_sched_setaffinity __NR_sched_setaffinity
-#define SYS_sched_setattr __NR_sched_setattr
-#define SYS_sched_setparam __NR_sched_setparam
-#define SYS_sched_setscheduler __NR_sched_setscheduler
-#define SYS_sched_yield __NR_sched_yield
-#define SYS_seccomp __NR_seccomp
-#define SYS_semctl __NR_semctl
-#define SYS_semget __NR_semget
-#define SYS_semop __NR_semop
-#define SYS_semtimedop __NR_semtimedop
-#define SYS_send __NR_send
-#define SYS_sendfile __NR_sendfile
-#define SYS_sendfile64 __NR_sendfile64
-#define SYS_sendmmsg __NR_sendmmsg
-#define SYS_sendmsg __NR_sendmsg
-#define SYS_sendto __NR_sendto
-#define SYS_set_mempolicy __NR_set_mempolicy
-#define SYS_set_robust_list __NR_set_robust_list
-#define SYS_set_tid_address __NR_set_tid_address
-#define SYS_setdomainname __NR_setdomainname
-#define SYS_setfsgid __NR_setfsgid
-#define SYS_setfsgid32 __NR_setfsgid32
-#define SYS_setfsuid __NR_setfsuid
-#define SYS_setfsuid32 __NR_setfsuid32
-#define SYS_setgid __NR_setgid
-#define SYS_setgid32 __NR_setgid32
-#define SYS_setgroups __NR_setgroups
-#define SYS_setgroups32 __NR_setgroups32
-#define SYS_sethostname __NR_sethostname
-#define SYS_setitimer __NR_setitimer
-#define SYS_setns __NR_setns
-#define SYS_setpgid __NR_setpgid
-#define SYS_setpriority __NR_setpriority
-#define SYS_setregid __NR_setregid
-#define SYS_setregid32 __NR_setregid32
-#define SYS_setresgid __NR_setresgid
-#define SYS_setresgid32 __NR_setresgid32
-#define SYS_setresuid __NR_setresuid
-#define SYS_setresuid32 __NR_setresuid32
-#define SYS_setreuid __NR_setreuid
-#define SYS_setreuid32 __NR_setreuid32
-#define SYS_setrlimit __NR_setrlimit
-#define SYS_setsid __NR_setsid
-#define SYS_setsockopt __NR_setsockopt
-#define SYS_settimeofday __NR_settimeofday
-#define SYS_setuid __NR_setuid
-#define SYS_setuid32 __NR_setuid32
-#define SYS_setxattr __NR_setxattr
-#define SYS_shmat __NR_shmat
-#define SYS_shmctl __NR_shmctl
-#define SYS_shmdt __NR_shmdt
-#define SYS_shmget __NR_shmget
-#define SYS_shutdown __NR_shutdown
-#define SYS_sigaction __NR_sigaction
-#define SYS_sigaltstack __NR_sigaltstack
-#define SYS_signalfd __NR_signalfd
-#define SYS_signalfd4 __NR_signalfd4
-#define SYS_sigpending __NR_sigpending
-#define SYS_sigprocmask __NR_sigprocmask
-#define SYS_sigreturn __NR_sigreturn
-#define SYS_sigsuspend __NR_sigsuspend
-#define SYS_socket __NR_socket
-#define SYS_socketpair __NR_socketpair
-#define SYS_splice __NR_splice
-#define SYS_stat __NR_stat
-#define SYS_stat64 __NR_stat64
-#define SYS_statfs __NR_statfs
-#define SYS_statfs64 __NR_statfs64
-#define SYS_swapoff __NR_swapoff
-#define SYS_swapon __NR_swapon
-#define SYS_symlink __NR_symlink
-#define SYS_symlinkat __NR_symlinkat
-#define SYS_sync __NR_sync
-#define SYS_sync_file_range2 __NR_sync_file_range2
-#define SYS_syncfs __NR_syncfs
-#define SYS_sysfs __NR_sysfs
-#define SYS_sysinfo __NR_sysinfo
-#define SYS_syslog __NR_syslog
-#define SYS_tee __NR_tee
-#define SYS_tgkill __NR_tgkill
-#define SYS_timer_create __NR_timer_create
-#define SYS_timer_delete __NR_timer_delete
-#define SYS_timer_getoverrun __NR_timer_getoverrun
-#define SYS_timer_gettime __NR_timer_gettime
-#define SYS_timer_settime __NR_timer_settime
-#define SYS_timerfd_create __NR_timerfd_create
-#define SYS_timerfd_gettime __NR_timerfd_gettime
-#define SYS_timerfd_settime __NR_timerfd_settime
-#define SYS_times __NR_times
-#define SYS_tkill __NR_tkill
-#define SYS_truncate __NR_truncate
-#define SYS_truncate64 __NR_truncate64
-#define SYS_ugetrlimit __NR_ugetrlimit
-#define SYS_umask __NR_umask
-#define SYS_umount2 __NR_umount2
-#define SYS_uname __NR_uname
-#define SYS_unlink __NR_unlink
-#define SYS_unlinkat __NR_unlinkat
-#define SYS_unshare __NR_unshare
-#define SYS_uselib __NR_uselib
-#define SYS_userfaultfd __NR_userfaultfd
-#define SYS_ustat __NR_ustat
-#define SYS_utimensat __NR_utimensat
-#define SYS_utimes __NR_utimes
-#define SYS_vfork __NR_vfork
-#define SYS_vhangup __NR_vhangup
-#define SYS_vmsplice __NR_vmsplice
-#define SYS_vserver __NR_vserver
-#define SYS_wait4 __NR_wait4
-#define SYS_waitid __NR_waitid
-#define SYS_write __NR_write
-#define SYS_writev __NR_writev
-#endif
-#if defined __ARM_PCS_VFP
-#define SYS_OABI_SYSCALL_BASE __NR_OABI_SYSCALL_BASE
-#define SYS_SYSCALL_BASE __NR_SYSCALL_BASE
-#define SYS__llseek __NR__llseek
-#define SYS__newselect __NR__newselect
-#define SYS__sysctl __NR__sysctl
-#define SYS_accept __NR_accept
-#define SYS_accept4 __NR_accept4
-#define SYS_access __NR_access
-#define SYS_acct __NR_acct
-#define SYS_add_key __NR_add_key
-#define SYS_adjtimex __NR_adjtimex
-#define SYS_arm_fadvise64_64 __NR_arm_fadvise64_64
-#define SYS_arm_sync_file_range __NR_arm_sync_file_range
-#define SYS_bdflush __NR_bdflush
-#define SYS_bind __NR_bind
-#define SYS_bpf __NR_bpf
-#define SYS_brk __NR_brk
-#define SYS_capget __NR_capget
-#define SYS_capset __NR_capset
-#define SYS_chdir __NR_chdir
-#define SYS_chmod __NR_chmod
-#define SYS_chown __NR_chown
-#define SYS_chown32 __NR_chown32
-#define SYS_chroot __NR_chroot
-#define SYS_clock_adjtime __NR_clock_adjtime
-#define SYS_clock_getres __NR_clock_getres
-#define SYS_clock_gettime __NR_clock_gettime
-#define SYS_clock_nanosleep __NR_clock_nanosleep
-#define SYS_clock_settime __NR_clock_settime
-#define SYS_clone __NR_clone
-#define SYS_close __NR_close
-#define SYS_connect __NR_connect
-#define SYS_creat __NR_creat
-#define SYS_delete_module __NR_delete_module
-#define SYS_dup __NR_dup
-#define SYS_dup2 __NR_dup2
-#define SYS_dup3 __NR_dup3
-#define SYS_epoll_create __NR_epoll_create
-#define SYS_epoll_create1 __NR_epoll_create1
-#define SYS_epoll_ctl __NR_epoll_ctl
-#define SYS_epoll_pwait __NR_epoll_pwait
-#define SYS_epoll_wait __NR_epoll_wait
-#define SYS_eventfd __NR_eventfd
-#define SYS_eventfd2 __NR_eventfd2
-#define SYS_execve __NR_execve
-#define SYS_execveat __NR_execveat
-#define SYS_exit __NR_exit
-#define SYS_exit_group __NR_exit_group
-#define SYS_faccessat __NR_faccessat
-#define SYS_fallocate __NR_fallocate
-#define SYS_fanotify_init __NR_fanotify_init
-#define SYS_fanotify_mark __NR_fanotify_mark
-#define SYS_fchdir __NR_fchdir
-#define SYS_fchmod __NR_fchmod
-#define SYS_fchmodat __NR_fchmodat
-#define SYS_fchown __NR_fchown
-#define SYS_fchown32 __NR_fchown32
-#define SYS_fchownat __NR_fchownat
-#define SYS_fcntl __NR_fcntl
-#define SYS_fcntl64 __NR_fcntl64
-#define SYS_fdatasync __NR_fdatasync
-#define SYS_fgetxattr __NR_fgetxattr
-#define SYS_finit_module __NR_finit_module
-#define SYS_flistxattr __NR_flistxattr
-#define SYS_flock __NR_flock
-#define SYS_fork __NR_fork
-#define SYS_fremovexattr __NR_fremovexattr
-#define SYS_fsetxattr __NR_fsetxattr
-#define SYS_fstat __NR_fstat
-#define SYS_fstat64 __NR_fstat64
-#define SYS_fstatat64 __NR_fstatat64
-#define SYS_fstatfs __NR_fstatfs
-#define SYS_fstatfs64 __NR_fstatfs64
-#define SYS_fsync __NR_fsync
-#define SYS_ftruncate __NR_ftruncate
-#define SYS_ftruncate64 __NR_ftruncate64
-#define SYS_futex __NR_futex
-#define SYS_futimesat __NR_futimesat
-#define SYS_get_mempolicy __NR_get_mempolicy
-#define SYS_get_robust_list __NR_get_robust_list
-#define SYS_getcpu __NR_getcpu
-#define SYS_getcwd __NR_getcwd
-#define SYS_getdents __NR_getdents
-#define SYS_getdents64 __NR_getdents64
-#define SYS_getegid __NR_getegid
-#define SYS_getegid32 __NR_getegid32
-#define SYS_geteuid __NR_geteuid
-#define SYS_geteuid32 __NR_geteuid32
-#define SYS_getgid __NR_getgid
-#define SYS_getgid32 __NR_getgid32
-#define SYS_getgroups __NR_getgroups
-#define SYS_getgroups32 __NR_getgroups32
-#define SYS_getitimer __NR_getitimer
-#define SYS_getpeername __NR_getpeername
-#define SYS_getpgid __NR_getpgid
-#define SYS_getpgrp __NR_getpgrp
-#define SYS_getpid __NR_getpid
-#define SYS_getppid __NR_getppid
-#define SYS_getpriority __NR_getpriority
-#define SYS_getrandom __NR_getrandom
-#define SYS_getresgid __NR_getresgid
-#define SYS_getresgid32 __NR_getresgid32
-#define SYS_getresuid __NR_getresuid
-#define SYS_getresuid32 __NR_getresuid32
-#define SYS_getrusage __NR_getrusage
-#define SYS_getsid __NR_getsid
-#define SYS_getsockname __NR_getsockname
-#define SYS_getsockopt __NR_getsockopt
-#define SYS_gettid __NR_gettid
-#define SYS_gettimeofday __NR_gettimeofday
-#define SYS_getuid __NR_getuid
-#define SYS_getuid32 __NR_getuid32
-#define SYS_getxattr __NR_getxattr
-#define SYS_init_module __NR_init_module
-#define SYS_inotify_add_watch __NR_inotify_add_watch
-#define SYS_inotify_init __NR_inotify_init
-#define SYS_inotify_init1 __NR_inotify_init1
-#define SYS_inotify_rm_watch __NR_inotify_rm_watch
-#define SYS_io_cancel __NR_io_cancel
-#define SYS_io_destroy __NR_io_destroy
-#define SYS_io_getevents __NR_io_getevents
-#define SYS_io_setup __NR_io_setup
-#define SYS_io_submit __NR_io_submit
-#define SYS_ioctl __NR_ioctl
-#define SYS_ioprio_get __NR_ioprio_get
-#define SYS_ioprio_set __NR_ioprio_set
-#define SYS_kcmp __NR_kcmp
-#define SYS_kexec_load __NR_kexec_load
-#define SYS_keyctl __NR_keyctl
-#define SYS_kill __NR_kill
-#define SYS_lchown __NR_lchown
-#define SYS_lchown32 __NR_lchown32
-#define SYS_lgetxattr __NR_lgetxattr
-#define SYS_link __NR_link
-#define SYS_linkat __NR_linkat
-#define SYS_listen __NR_listen
-#define SYS_listxattr __NR_listxattr
-#define SYS_llistxattr __NR_llistxattr
-#define SYS_lookup_dcookie __NR_lookup_dcookie
-#define SYS_lremovexattr __NR_lremovexattr
-#define SYS_lseek __NR_lseek
-#define SYS_lsetxattr __NR_lsetxattr
-#define SYS_lstat __NR_lstat
-#define SYS_lstat64 __NR_lstat64
-#define SYS_madvise __NR_madvise
-#define SYS_mbind __NR_mbind
-#define SYS_membarrier __NR_membarrier
-#define SYS_memfd_create __NR_memfd_create
-#define SYS_mincore __NR_mincore
-#define SYS_mkdir __NR_mkdir
-#define SYS_mkdirat __NR_mkdirat
-#define SYS_mknod __NR_mknod
-#define SYS_mknodat __NR_mknodat
-#define SYS_mlock __NR_mlock
-#define SYS_mlock2 __NR_mlock2
-#define SYS_mlockall __NR_mlockall
-#define SYS_mmap2 __NR_mmap2
-#define SYS_mount __NR_mount
-#define SYS_move_pages __NR_move_pages
-#define SYS_mprotect __NR_mprotect
-#define SYS_mq_getsetattr __NR_mq_getsetattr
-#define SYS_mq_notify __NR_mq_notify
-#define SYS_mq_open __NR_mq_open
-#define SYS_mq_timedreceive __NR_mq_timedreceive
-#define SYS_mq_timedsend __NR_mq_timedsend
-#define SYS_mq_unlink __NR_mq_unlink
-#define SYS_mremap __NR_mremap
-#define SYS_msgctl __NR_msgctl
-#define SYS_msgget __NR_msgget
-#define SYS_msgrcv __NR_msgrcv
-#define SYS_msgsnd __NR_msgsnd
-#define SYS_msync __NR_msync
-#define SYS_munlock __NR_munlock
-#define SYS_munlockall __NR_munlockall
-#define SYS_munmap __NR_munmap
-#define SYS_name_to_handle_at __NR_name_to_handle_at
-#define SYS_nanosleep __NR_nanosleep
-#define SYS_nfsservctl __NR_nfsservctl
-#define SYS_nice __NR_nice
-#define SYS_open __NR_open
-#define SYS_open_by_handle_at __NR_open_by_handle_at
-#define SYS_openat __NR_openat
-#define SYS_pause __NR_pause
-#define SYS_pciconfig_iobase __NR_pciconfig_iobase
-#define SYS_pciconfig_read __NR_pciconfig_read
-#define SYS_pciconfig_write __NR_pciconfig_write
-#define SYS_perf_event_open __NR_perf_event_open
-#define SYS_personality __NR_personality
-#define SYS_pipe __NR_pipe
-#define SYS_pipe2 __NR_pipe2
-#define SYS_pivot_root __NR_pivot_root
-#define SYS_poll __NR_poll
-#define SYS_ppoll __NR_ppoll
-#define SYS_prctl __NR_prctl
-#define SYS_pread64 __NR_pread64
-#define SYS_preadv __NR_preadv
-#define SYS_prlimit64 __NR_prlimit64
-#define SYS_process_vm_readv __NR_process_vm_readv
-#define SYS_process_vm_writev __NR_process_vm_writev
-#define SYS_pselect6 __NR_pselect6
-#define SYS_ptrace __NR_ptrace
-#define SYS_pwrite64 __NR_pwrite64
-#define SYS_pwritev __NR_pwritev
-#define SYS_quotactl __NR_quotactl
-#define SYS_read __NR_read
-#define SYS_readahead __NR_readahead
-#define SYS_readlink __NR_readlink
-#define SYS_readlinkat __NR_readlinkat
-#define SYS_readv __NR_readv
-#define SYS_reboot __NR_reboot
-#define SYS_recv __NR_recv
-#define SYS_recvfrom __NR_recvfrom
-#define SYS_recvmmsg __NR_recvmmsg
-#define SYS_recvmsg __NR_recvmsg
-#define SYS_remap_file_pages __NR_remap_file_pages
-#define SYS_removexattr __NR_removexattr
-#define SYS_rename __NR_rename
-#define SYS_renameat __NR_renameat
-#define SYS_renameat2 __NR_renameat2
-#define SYS_request_key __NR_request_key
-#define SYS_restart_syscall __NR_restart_syscall
-#define SYS_rmdir __NR_rmdir
-#define SYS_rt_sigaction __NR_rt_sigaction
-#define SYS_rt_sigpending __NR_rt_sigpending
-#define SYS_rt_sigprocmask __NR_rt_sigprocmask
-#define SYS_rt_sigqueueinfo __NR_rt_sigqueueinfo
-#define SYS_rt_sigreturn __NR_rt_sigreturn
-#define SYS_rt_sigsuspend __NR_rt_sigsuspend
-#define SYS_rt_sigtimedwait __NR_rt_sigtimedwait
-#define SYS_rt_tgsigqueueinfo __NR_rt_tgsigqueueinfo
-#define SYS_sched_get_priority_max __NR_sched_get_priority_max
-#define SYS_sched_get_priority_min __NR_sched_get_priority_min
-#define SYS_sched_getaffinity __NR_sched_getaffinity
-#define SYS_sched_getattr __NR_sched_getattr
-#define SYS_sched_getparam __NR_sched_getparam
-#define SYS_sched_getscheduler __NR_sched_getscheduler
-#define SYS_sched_rr_get_interval __NR_sched_rr_get_interval
-#define SYS_sched_setaffinity __NR_sched_setaffinity
-#define SYS_sched_setattr __NR_sched_setattr
-#define SYS_sched_setparam __NR_sched_setparam
-#define SYS_sched_setscheduler __NR_sched_setscheduler
-#define SYS_sched_yield __NR_sched_yield
-#define SYS_seccomp __NR_seccomp
-#define SYS_semctl __NR_semctl
-#define SYS_semget __NR_semget
-#define SYS_semop __NR_semop
-#define SYS_semtimedop __NR_semtimedop
-#define SYS_send __NR_send
-#define SYS_sendfile __NR_sendfile
-#define SYS_sendfile64 __NR_sendfile64
-#define SYS_sendmmsg __NR_sendmmsg
-#define SYS_sendmsg __NR_sendmsg
-#define SYS_sendto __NR_sendto
-#define SYS_set_mempolicy __NR_set_mempolicy
-#define SYS_set_robust_list __NR_set_robust_list
-#define SYS_set_tid_address __NR_set_tid_address
-#define SYS_setdomainname __NR_setdomainname
-#define SYS_setfsgid __NR_setfsgid
-#define SYS_setfsgid32 __NR_setfsgid32
-#define SYS_setfsuid __NR_setfsuid
-#define SYS_setfsuid32 __NR_setfsuid32
-#define SYS_setgid __NR_setgid
-#define SYS_setgid32 __NR_setgid32
-#define SYS_setgroups __NR_setgroups
-#define SYS_setgroups32 __NR_setgroups32
-#define SYS_sethostname __NR_sethostname
-#define SYS_setitimer __NR_setitimer
-#define SYS_setns __NR_setns
-#define SYS_setpgid __NR_setpgid
-#define SYS_setpriority __NR_setpriority
-#define SYS_setregid __NR_setregid
-#define SYS_setregid32 __NR_setregid32
-#define SYS_setresgid __NR_setresgid
-#define SYS_setresgid32 __NR_setresgid32
-#define SYS_setresuid __NR_setresuid
-#define SYS_setresuid32 __NR_setresuid32
-#define SYS_setreuid __NR_setreuid
-#define SYS_setreuid32 __NR_setreuid32
-#define SYS_setrlimit __NR_setrlimit
-#define SYS_setsid __NR_setsid
-#define SYS_setsockopt __NR_setsockopt
-#define SYS_settimeofday __NR_settimeofday
-#define SYS_setuid __NR_setuid
-#define SYS_setuid32 __NR_setuid32
-#define SYS_setxattr __NR_setxattr
-#define SYS_shmat __NR_shmat
-#define SYS_shmctl __NR_shmctl
-#define SYS_shmdt __NR_shmdt
-#define SYS_shmget __NR_shmget
-#define SYS_shutdown __NR_shutdown
-#define SYS_sigaction __NR_sigaction
-#define SYS_sigaltstack __NR_sigaltstack
-#define SYS_signalfd __NR_signalfd
-#define SYS_signalfd4 __NR_signalfd4
-#define SYS_sigpending __NR_sigpending
-#define SYS_sigprocmask __NR_sigprocmask
-#define SYS_sigreturn __NR_sigreturn
-#define SYS_sigsuspend __NR_sigsuspend
-#define SYS_socket __NR_socket
-#define SYS_socketpair __NR_socketpair
-#define SYS_splice __NR_splice
-#define SYS_stat __NR_stat
-#define SYS_stat64 __NR_stat64
-#define SYS_statfs __NR_statfs
-#define SYS_statfs64 __NR_statfs64
-#define SYS_swapoff __NR_swapoff
-#define SYS_swapon __NR_swapon
-#define SYS_symlink __NR_symlink
-#define SYS_symlinkat __NR_symlinkat
-#define SYS_sync __NR_sync
-#define SYS_sync_file_range2 __NR_sync_file_range2
-#define SYS_syncfs __NR_syncfs
-#define SYS_sysfs __NR_sysfs
-#define SYS_sysinfo __NR_sysinfo
-#define SYS_syslog __NR_syslog
-#define SYS_tee __NR_tee
-#define SYS_tgkill __NR_tgkill
-#define SYS_timer_create __NR_timer_create
-#define SYS_timer_delete __NR_timer_delete
-#define SYS_timer_getoverrun __NR_timer_getoverrun
-#define SYS_timer_gettime __NR_timer_gettime
-#define SYS_timer_settime __NR_timer_settime
-#define SYS_timerfd_create __NR_timerfd_create
-#define SYS_timerfd_gettime __NR_timerfd_gettime
-#define SYS_timerfd_settime __NR_timerfd_settime
-#define SYS_times __NR_times
-#define SYS_tkill __NR_tkill
-#define SYS_truncate __NR_truncate
-#define SYS_truncate64 __NR_truncate64
-#define SYS_ugetrlimit __NR_ugetrlimit
-#define SYS_umask __NR_umask
-#define SYS_umount2 __NR_umount2
-#define SYS_uname __NR_uname
-#define SYS_unlink __NR_unlink
-#define SYS_unlinkat __NR_unlinkat
-#define SYS_unshare __NR_unshare
-#define SYS_uselib __NR_uselib
-#define SYS_userfaultfd __NR_userfaultfd
-#define SYS_ustat __NR_ustat
-#define SYS_utimensat __NR_utimensat
-#define SYS_utimes __NR_utimes
-#define SYS_vfork __NR_vfork
-#define SYS_vhangup __NR_vhangup
-#define SYS_vmsplice __NR_vmsplice
-#define SYS_vserver __NR_vserver
-#define SYS_wait4 __NR_wait4
-#define SYS_waitid __NR_waitid
-#define SYS_write __NR_write
-#define SYS_writev __NR_writev
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/sysctl.h b/openflow/usr/include/arm-linux-gnueabihf/bits/sysctl.h
deleted file mode 100644
index 81447b2..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/sysctl.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Empty file.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/syslog-ldbl.h b/openflow/usr/include/arm-linux-gnueabihf/bits/syslog-ldbl.h
deleted file mode 100644
index 7c1c03d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/syslog-ldbl.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -mlong-double-64 compatibility mode for syslog functions.
-   Copyright (C) 2006-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SYSLOG_H
-# error "Never include <bits/syslog-ldbl.h> directly; use <sys/syslog.h> instead."
-#endif
-
-__LDBL_REDIR_DECL (syslog)
-
-#ifdef __USE_MISC
-__LDBL_REDIR_DECL (vsyslog)
-#endif
-
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-__LDBL_REDIR_DECL (__syslog_chk)
-
-# ifdef __USE_MISC
-__LDBL_REDIR_DECL (__vsyslog_chk)
-# endif
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/syslog-path.h b/openflow/usr/include/arm-linux-gnueabihf/bits/syslog-path.h
deleted file mode 100644
index 6aab5e0..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/syslog-path.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* <bits/syslog-path.h> -- _PATH_LOG definition
-   Copyright (C) 2006-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SYSLOG_H
-# error "Never include this file directly.  Use <sys/syslog.h> instead"
-#endif
-
-#ifndef _BITS_SYSLOG_PATH_H
-#define _BITS_SYSLOG_PATH_H 1
-
-#define	_PATH_LOG	"/dev/log"
-
-#endif /* bits/syslog-path.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/syslog.h b/openflow/usr/include/arm-linux-gnueabihf/bits/syslog.h
deleted file mode 100644
index 31dae38..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/syslog.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Checking macros for syslog functions.
-   Copyright (C) 2005-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SYSLOG_H
-# error "Never include <bits/syslog.h> directly; use <sys/syslog.h> instead."
-#endif
-
-
-extern void __syslog_chk (int __pri, int __flag, const char *__fmt, ...)
-     __attribute__ ((__format__ (__printf__, 3, 4)));
-
-#ifdef __va_arg_pack
-__fortify_function void
-syslog (int __pri, const char *__fmt, ...)
-{
-  __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
-}
-#elif !defined __cplusplus
-# define syslog(pri, ...) \
-  __syslog_chk (pri, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-#endif
-
-
-#ifdef __USE_MISC
-extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt,
-			   __gnuc_va_list __ap)
-     __attribute__ ((__format__ (__printf__, 3, 0)));
-
-__fortify_function void
-vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap)
-{
-  __vsyslog_chk (__pri,  __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
-}
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/termios.h b/openflow/usr/include/arm-linux-gnueabihf/bits/termios.h
deleted file mode 100644
index bbf093d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/termios.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* termios type and macro definitions.  Linux version.
-   Copyright (C) 1993-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _TERMIOS_H
-# error "Never include <bits/termios.h> directly; use <termios.h> instead."
-#endif
-
-typedef unsigned char	cc_t;
-typedef unsigned int	speed_t;
-typedef unsigned int	tcflag_t;
-
-#define NCCS 32
-struct termios
-  {
-    tcflag_t c_iflag;		/* input mode flags */
-    tcflag_t c_oflag;		/* output mode flags */
-    tcflag_t c_cflag;		/* control mode flags */
-    tcflag_t c_lflag;		/* local mode flags */
-    cc_t c_line;			/* line discipline */
-    cc_t c_cc[NCCS];		/* control characters */
-    speed_t c_ispeed;		/* input speed */
-    speed_t c_ospeed;		/* output speed */
-#define _HAVE_STRUCT_TERMIOS_C_ISPEED 1
-#define _HAVE_STRUCT_TERMIOS_C_OSPEED 1
-  };
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-/* c_iflag bits */
-#define IGNBRK	0000001
-#define BRKINT	0000002
-#define IGNPAR	0000004
-#define PARMRK	0000010
-#define INPCK	0000020
-#define ISTRIP	0000040
-#define INLCR	0000100
-#define IGNCR	0000200
-#define ICRNL	0000400
-#define IUCLC	0001000
-#define IXON	0002000
-#define IXANY	0004000
-#define IXOFF	0010000
-#define IMAXBEL	0020000
-#define IUTF8	0040000
-
-/* c_oflag bits */
-#define OPOST	0000001
-#define OLCUC	0000002
-#define ONLCR	0000004
-#define OCRNL	0000010
-#define ONOCR	0000020
-#define ONLRET	0000040
-#define OFILL	0000100
-#define OFDEL	0000200
-#if defined __USE_MISC || defined __USE_XOPEN
-# define NLDLY	0000400
-# define   NL0	0000000
-# define   NL1	0000400
-# define CRDLY	0003000
-# define   CR0	0000000
-# define   CR1	0001000
-# define   CR2	0002000
-# define   CR3	0003000
-# define TABDLY	0014000
-# define   TAB0	0000000
-# define   TAB1	0004000
-# define   TAB2	0010000
-# define   TAB3	0014000
-# define BSDLY	0020000
-# define   BS0	0000000
-# define   BS1	0020000
-# define FFDLY	0100000
-# define   FF0	0000000
-# define   FF1	0100000
-#endif
-
-#define VTDLY	0040000
-#define   VT0	0000000
-#define   VT1	0040000
-
-#ifdef __USE_MISC
-# define XTABS	0014000
-#endif
-
-/* c_cflag bit meaning */
-#ifdef __USE_MISC
-# define CBAUD	0010017
-#endif
-#define  B0	0000000		/* hang up */
-#define  B50	0000001
-#define  B75	0000002
-#define  B110	0000003
-#define  B134	0000004
-#define  B150	0000005
-#define  B200	0000006
-#define  B300	0000007
-#define  B600	0000010
-#define  B1200	0000011
-#define  B1800	0000012
-#define  B2400	0000013
-#define  B4800	0000014
-#define  B9600	0000015
-#define  B19200	0000016
-#define  B38400	0000017
-#ifdef __USE_MISC
-# define EXTA B19200
-# define EXTB B38400
-#endif
-#define CSIZE	0000060
-#define   CS5	0000000
-#define   CS6	0000020
-#define   CS7	0000040
-#define   CS8	0000060
-#define CSTOPB	0000100
-#define CREAD	0000200
-#define PARENB	0000400
-#define PARODD	0001000
-#define HUPCL	0002000
-#define CLOCAL	0004000
-#ifdef __USE_MISC
-# define CBAUDEX 0010000
-#endif
-#define  B57600   0010001
-#define  B115200  0010002
-#define  B230400  0010003
-#define  B460800  0010004
-#define  B500000  0010005
-#define  B576000  0010006
-#define  B921600  0010007
-#define  B1000000 0010010
-#define  B1152000 0010011
-#define  B1500000 0010012
-#define  B2000000 0010013
-#define  B2500000 0010014
-#define  B3000000 0010015
-#define  B3500000 0010016
-#define  B4000000 0010017
-#define __MAX_BAUD B4000000
-#ifdef __USE_MISC
-# define CIBAUD	  002003600000		/* input baud rate (not used) */
-# define CMSPAR   010000000000		/* mark or space (stick) parity */
-# define CRTSCTS  020000000000		/* flow control */
-#endif
-
-/* c_lflag bits */
-#define ISIG	0000001
-#define ICANON	0000002
-#if defined __USE_MISC || defined __USE_XOPEN
-# define XCASE	0000004
-#endif
-#define ECHO	0000010
-#define ECHOE	0000020
-#define ECHOK	0000040
-#define ECHONL	0000100
-#define NOFLSH	0000200
-#define TOSTOP	0000400
-#ifdef __USE_MISC
-# define ECHOCTL 0001000
-# define ECHOPRT 0002000
-# define ECHOKE	 0004000
-# define FLUSHO	 0010000
-# define PENDIN	 0040000
-#endif
-#define IEXTEN	0100000
-#ifdef __USE_MISC
-# define EXTPROC 0200000
-#endif
-
-/* tcflow() and TCXONC use these */
-#define	TCOOFF		0
-#define	TCOON		1
-#define	TCIOFF		2
-#define	TCION		3
-
-/* tcflush() and TCFLSH use these */
-#define	TCIFLUSH	0
-#define	TCOFLUSH	1
-#define	TCIOFLUSH	2
-
-/* tcsetattr uses these */
-#define	TCSANOW		0
-#define	TCSADRAIN	1
-#define	TCSAFLUSH	2
-
-
-#define _IOT_termios /* Hurd ioctl type field.  */ \
-  _IOT (_IOTS (cflag_t), 4, _IOTS (cc_t), NCCS, _IOTS (speed_t), 2)
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/time.h b/openflow/usr/include/arm-linux-gnueabihf/bits/time.h
deleted file mode 100644
index 87eb51f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/time.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* System-dependent timing definitions.  Linux version.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * Never include this file directly; use <time.h> instead.
- */
-
-#if defined __need_timeval || defined __USE_GNU
-# ifndef _STRUCT_TIMEVAL
-#  define _STRUCT_TIMEVAL	1
-#  include <bits/types.h>
-
-/* A time value that is accurate to the nearest
-   microsecond but also has a range of years.  */
-struct timeval
-  {
-    __time_t tv_sec;		/* Seconds.  */
-    __suseconds_t tv_usec;	/* Microseconds.  */
-  };
-# endif	/* struct timeval */
-#endif
-
-#ifndef __need_timeval
-# ifndef _BITS_TIME_H
-#  define _BITS_TIME_H	1
-
-/* ISO/IEC 9899:1999 7.23.1: Components of time
-   The macro `CLOCKS_PER_SEC' is an expression with type `clock_t' that is
-   the number per second of the value returned by the `clock' function.  */
-/* CAE XSH, Issue 4, Version 2: <time.h>
-   The value of CLOCKS_PER_SEC is required to be 1 million on all
-   XSI-conformant systems. */
-#  define CLOCKS_PER_SEC  ((clock_t) 1000000)
-
-#  if (!defined __STRICT_ANSI__ || defined __USE_POSIX) \
-   && !defined __USE_XOPEN2K
-/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
-   presents the real value for clock ticks per second for the system.  */
-#   include <bits/types.h>
-extern long int __sysconf (int);
-#   define CLK_TCK ((__clock_t) __sysconf (2))	/* 2 is _SC_CLK_TCK */
-#  endif
-
-#  ifdef __USE_POSIX199309
-/* Identifier for system-wide realtime clock.  */
-#   define CLOCK_REALTIME		0
-/* Monotonic system-wide clock.  */
-#   define CLOCK_MONOTONIC		1
-/* High-resolution timer from the CPU.  */
-#   define CLOCK_PROCESS_CPUTIME_ID	2
-/* Thread-specific CPU-time clock.  */
-#   define CLOCK_THREAD_CPUTIME_ID	3
-/* Monotonic system-wide clock, not adjusted for frequency scaling.  */
-#   define CLOCK_MONOTONIC_RAW		4
-/* Identifier for system-wide realtime clock, updated only on ticks.  */
-#   define CLOCK_REALTIME_COARSE	5
-/* Monotonic system-wide clock, updated only on ticks.  */
-#   define CLOCK_MONOTONIC_COARSE	6
-/* Monotonic system-wide clock that includes time spent in suspension.  */
-#   define CLOCK_BOOTTIME		7
-/* Like CLOCK_REALTIME but also wakes suspended system.  */
-#   define CLOCK_REALTIME_ALARM		8
-/* Like CLOCK_BOOTTIME but also wakes suspended system.  */
-#   define CLOCK_BOOTTIME_ALARM		9
-/* Like CLOCK_REALTIME but in International Atomic Time.  */
-#   define CLOCK_TAI			11
-
-/* Flag to indicate time is absolute.  */
-#   define TIMER_ABSTIME		1
-#  endif
-
-#  ifdef __USE_GNU
-#   include <bits/timex.h>
-
-__BEGIN_DECLS
-
-/* Tune a POSIX clock.  */
-extern int clock_adjtime (__clockid_t __clock_id, struct timex *__utx) __THROW;
-
-__END_DECLS
-#  endif /* use GNU */
-
-# endif	/* bits/time.h */
-#endif
-
-#undef __need_timeval
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/timerfd.h b/openflow/usr/include/arm-linux-gnueabihf/bits/timerfd.h
deleted file mode 100644
index 0ba607e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/timerfd.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2008-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_TIMERFD_H
-# error "Never use <bits/timerfd.h> directly; include <sys/timerfd.h> instead."
-#endif
-
-/* Bits to be set in the FLAGS parameter of `timerfd_create'.  */
-enum
-  {
-    TFD_CLOEXEC = 02000000,
-#define TFD_CLOEXEC TFD_CLOEXEC
-    TFD_NONBLOCK = 00004000
-#define TFD_NONBLOCK TFD_NONBLOCK
-  };
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/timex.h b/openflow/usr/include/arm-linux-gnueabihf/bits/timex.h
deleted file mode 100644
index 5eb7ccb..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/timex.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_BITS_TIMEX_H
-#define	_BITS_TIMEX_H	1
-
-#include <bits/types.h>
-
-/* These definitions from linux/timex.h as of 3.18.  */
-
-struct timex
-{
-  unsigned int modes;		/* mode selector */
-  __syscall_slong_t offset;	/* time offset (usec) */
-  __syscall_slong_t freq;	/* frequency offset (scaled ppm) */
-  __syscall_slong_t maxerror;	/* maximum error (usec) */
-  __syscall_slong_t esterror;	/* estimated error (usec) */
-  int status;			/* clock command/status */
-  __syscall_slong_t constant;	/* pll time constant */
-  __syscall_slong_t precision;	/* clock precision (usec) (ro) */
-  __syscall_slong_t tolerance;	/* clock frequency tolerance (ppm) (ro) */
-  struct timeval time;		/* (read only, except for ADJ_SETOFFSET) */
-  __syscall_slong_t tick;	/* (modified) usecs between clock ticks */
-  __syscall_slong_t ppsfreq;	/* pps frequency (scaled ppm) (ro) */
-  __syscall_slong_t jitter;	/* pps jitter (us) (ro) */
-  int shift;			/* interval duration (s) (shift) (ro) */
-  __syscall_slong_t stabil;	/* pps stability (scaled ppm) (ro) */
-  __syscall_slong_t jitcnt;	/* jitter limit exceeded (ro) */
-  __syscall_slong_t calcnt;	/* calibration intervals (ro) */
-  __syscall_slong_t errcnt;	/* calibration errors (ro) */
-  __syscall_slong_t stbcnt;	/* stability limit exceeded (ro) */
-
-  int tai;			/* TAI offset (ro) */
-
-  /* ??? */
-  int  :32; int  :32; int  :32; int  :32;
-  int  :32; int  :32; int  :32; int  :32;
-  int  :32; int  :32; int  :32;
-};
-
-/* Mode codes (timex.mode) */
-#define ADJ_OFFSET		0x0001	/* time offset */
-#define ADJ_FREQUENCY		0x0002	/* frequency offset */
-#define ADJ_MAXERROR		0x0004	/* maximum time error */
-#define ADJ_ESTERROR		0x0008	/* estimated time error */
-#define ADJ_STATUS		0x0010	/* clock status */
-#define ADJ_TIMECONST		0x0020	/* pll time constant */
-#define ADJ_TAI			0x0080	/* set TAI offset */
-#define ADJ_SETOFFSET		0x0100	/* add 'time' to current time */
-#define ADJ_MICRO		0x1000	/* select microsecond resolution */
-#define ADJ_NANO		0x2000	/* select nanosecond resolution */
-#define ADJ_TICK		0x4000	/* tick value */
-#define ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
-#define ADJ_OFFSET_SS_READ	0xa001	/* read-only adjtime */
-
-/* xntp 3.4 compatibility names */
-#define MOD_OFFSET	ADJ_OFFSET
-#define MOD_FREQUENCY	ADJ_FREQUENCY
-#define MOD_MAXERROR	ADJ_MAXERROR
-#define MOD_ESTERROR	ADJ_ESTERROR
-#define MOD_STATUS	ADJ_STATUS
-#define MOD_TIMECONST	ADJ_TIMECONST
-#define MOD_CLKB	ADJ_TICK
-#define MOD_CLKA	ADJ_OFFSET_SINGLESHOT /* 0x8000 in original */
-#define MOD_TAI		ADJ_TAI
-#define MOD_MICRO	ADJ_MICRO
-#define MOD_NANO	ADJ_NANO
-
-
-/* Status codes (timex.status) */
-#define STA_PLL		0x0001	/* enable PLL updates (rw) */
-#define STA_PPSFREQ	0x0002	/* enable PPS freq discipline (rw) */
-#define STA_PPSTIME	0x0004	/* enable PPS time discipline (rw) */
-#define STA_FLL		0x0008	/* select frequency-lock mode (rw) */
-
-#define STA_INS		0x0010	/* insert leap (rw) */
-#define STA_DEL		0x0020	/* delete leap (rw) */
-#define STA_UNSYNC	0x0040	/* clock unsynchronized (rw) */
-#define STA_FREQHOLD	0x0080	/* hold frequency (rw) */
-
-#define STA_PPSSIGNAL	0x0100	/* PPS signal present (ro) */
-#define STA_PPSJITTER	0x0200	/* PPS signal jitter exceeded (ro) */
-#define STA_PPSWANDER	0x0400	/* PPS signal wander exceeded (ro) */
-#define STA_PPSERROR	0x0800	/* PPS signal calibration error (ro) */
-
-#define STA_CLOCKERR	0x1000	/* clock hardware fault (ro) */
-#define STA_NANO	0x2000	/* resolution (0 = us, 1 = ns) (ro) */
-#define STA_MODE	0x4000	/* mode (0 = PLL, 1 = FLL) (ro) */
-#define STA_CLK		0x8000	/* clock source (0 = A, 1 = B) (ro) */
-
-/* Read-only bits */
-#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
-    STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK)
-
-#endif /* bits/timex.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/types.h b/openflow/usr/include/arm-linux-gnueabihf/bits/types.h
deleted file mode 100644
index 01753bd..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/types.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* bits/types.h -- definitions of __*_t types underlying *_t types.
-   Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * Never include this file directly; use <sys/types.h> instead.
- */
-
-#ifndef	_BITS_TYPES_H
-#define	_BITS_TYPES_H	1
-
-#include <features.h>
-#include <bits/wordsize.h>
-
-/* Convenience types.  */
-typedef unsigned char __u_char;
-typedef unsigned short int __u_short;
-typedef unsigned int __u_int;
-typedef unsigned long int __u_long;
-
-/* Fixed-size types, underlying types depend on word size and compiler.  */
-typedef signed char __int8_t;
-typedef unsigned char __uint8_t;
-typedef signed short int __int16_t;
-typedef unsigned short int __uint16_t;
-typedef signed int __int32_t;
-typedef unsigned int __uint32_t;
-#if __WORDSIZE == 64
-typedef signed long int __int64_t;
-typedef unsigned long int __uint64_t;
-#else
-__extension__ typedef signed long long int __int64_t;
-__extension__ typedef unsigned long long int __uint64_t;
-#endif
-
-/* quad_t is also 64 bits.  */
-#if __WORDSIZE == 64
-typedef long int __quad_t;
-typedef unsigned long int __u_quad_t;
-#else
-__extension__ typedef long long int __quad_t;
-__extension__ typedef unsigned long long int __u_quad_t;
-#endif
-
-
-/* The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
-   macros for each of the OS types we define below.  The definitions
-   of those macros must use the following macros for underlying types.
-   We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
-   variants of each of the following integer types on this machine.
-
-	16		-- "natural" 16-bit type (always short)
-	32		-- "natural" 32-bit type (always int)
-	64		-- "natural" 64-bit type (long or long long)
-	LONG32		-- 32-bit type, traditionally long
-	QUAD		-- 64-bit type, always long long
-	WORD		-- natural type of __WORDSIZE bits (int or long)
-	LONGWORD	-- type of __WORDSIZE bits, traditionally long
-
-   We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
-   conventional uses of `long' or `long long' type modifiers match the
-   types we define, even when a less-adorned type would be the same size.
-   This matters for (somewhat) portably writing printf/scanf formats for
-   these types, where using the appropriate l or ll format modifiers can
-   make the typedefs and the formats match up across all GNU platforms.  If
-   we used `long' when it's 64 bits where `long long' is expected, then the
-   compiler would warn about the formats not matching the argument types,
-   and the programmer changing them to shut up the compiler would break the
-   program's portability.
-
-   Here we assume what is presently the case in all the GCC configurations
-   we support: long long is always 64 bits, long is always word/address size,
-   and int is always 32 bits.  */
-
-#define	__S16_TYPE		short int
-#define __U16_TYPE		unsigned short int
-#define	__S32_TYPE		int
-#define __U32_TYPE		unsigned int
-#define __SLONGWORD_TYPE	long int
-#define __ULONGWORD_TYPE	unsigned long int
-#if __WORDSIZE == 32
-# define __SQUAD_TYPE		__quad_t
-# define __UQUAD_TYPE		__u_quad_t
-# define __SWORD_TYPE		int
-# define __UWORD_TYPE		unsigned int
-# define __SLONG32_TYPE		long int
-# define __ULONG32_TYPE		unsigned long int
-# define __S64_TYPE		__quad_t
-# define __U64_TYPE		__u_quad_t
-/* We want __extension__ before typedef's that use nonstandard base types
-   such as `long long' in C89 mode.  */
-# define __STD_TYPE		__extension__ typedef
-#elif __WORDSIZE == 64
-# define __SQUAD_TYPE		long int
-# define __UQUAD_TYPE		unsigned long int
-# define __SWORD_TYPE		long int
-# define __UWORD_TYPE		unsigned long int
-# define __SLONG32_TYPE		int
-# define __ULONG32_TYPE		unsigned int
-# define __S64_TYPE		long int
-# define __U64_TYPE		unsigned long int
-/* No need to mark the typedef with __extension__.   */
-# define __STD_TYPE		typedef
-#else
-# error
-#endif
-#include <bits/typesizes.h>	/* Defines __*_T_TYPE macros.  */
-
-
-__STD_TYPE __DEV_T_TYPE __dev_t;	/* Type of device numbers.  */
-__STD_TYPE __UID_T_TYPE __uid_t;	/* Type of user identifications.  */
-__STD_TYPE __GID_T_TYPE __gid_t;	/* Type of group identifications.  */
-__STD_TYPE __INO_T_TYPE __ino_t;	/* Type of file serial numbers.  */
-__STD_TYPE __INO64_T_TYPE __ino64_t;	/* Type of file serial numbers (LFS).*/
-__STD_TYPE __MODE_T_TYPE __mode_t;	/* Type of file attribute bitmasks.  */
-__STD_TYPE __NLINK_T_TYPE __nlink_t;	/* Type of file link counts.  */
-__STD_TYPE __OFF_T_TYPE __off_t;	/* Type of file sizes and offsets.  */
-__STD_TYPE __OFF64_T_TYPE __off64_t;	/* Type of file sizes and offsets (LFS).  */
-__STD_TYPE __PID_T_TYPE __pid_t;	/* Type of process identifications.  */
-__STD_TYPE __FSID_T_TYPE __fsid_t;	/* Type of file system IDs.  */
-__STD_TYPE __CLOCK_T_TYPE __clock_t;	/* Type of CPU usage counts.  */
-__STD_TYPE __RLIM_T_TYPE __rlim_t;	/* Type for resource measurement.  */
-__STD_TYPE __RLIM64_T_TYPE __rlim64_t;	/* Type for resource measurement (LFS).  */
-__STD_TYPE __ID_T_TYPE __id_t;		/* General type for IDs.  */
-__STD_TYPE __TIME_T_TYPE __time_t;	/* Seconds since the Epoch.  */
-__STD_TYPE __USECONDS_T_TYPE __useconds_t; /* Count of microseconds.  */
-__STD_TYPE __SUSECONDS_T_TYPE __suseconds_t; /* Signed count of microseconds.  */
-
-__STD_TYPE __DADDR_T_TYPE __daddr_t;	/* The type of a disk address.  */
-__STD_TYPE __KEY_T_TYPE __key_t;	/* Type of an IPC key.  */
-
-/* Clock ID used in clock and timer functions.  */
-__STD_TYPE __CLOCKID_T_TYPE __clockid_t;
-
-/* Timer ID returned by `timer_create'.  */
-__STD_TYPE __TIMER_T_TYPE __timer_t;
-
-/* Type to represent block size.  */
-__STD_TYPE __BLKSIZE_T_TYPE __blksize_t;
-
-/* Types from the Large File Support interface.  */
-
-/* Type to count number of disk blocks.  */
-__STD_TYPE __BLKCNT_T_TYPE __blkcnt_t;
-__STD_TYPE __BLKCNT64_T_TYPE __blkcnt64_t;
-
-/* Type to count file system blocks.  */
-__STD_TYPE __FSBLKCNT_T_TYPE __fsblkcnt_t;
-__STD_TYPE __FSBLKCNT64_T_TYPE __fsblkcnt64_t;
-
-/* Type to count file system nodes.  */
-__STD_TYPE __FSFILCNT_T_TYPE __fsfilcnt_t;
-__STD_TYPE __FSFILCNT64_T_TYPE __fsfilcnt64_t;
-
-/* Type of miscellaneous file system fields.  */
-__STD_TYPE __FSWORD_T_TYPE __fsword_t;
-
-__STD_TYPE __SSIZE_T_TYPE __ssize_t; /* Type of a byte count, or error.  */
-
-/* Signed long type used in system calls.  */
-__STD_TYPE __SYSCALL_SLONG_TYPE __syscall_slong_t;
-/* Unsigned long type used in system calls.  */
-__STD_TYPE __SYSCALL_ULONG_TYPE __syscall_ulong_t;
-
-/* These few don't really vary by system, they always correspond
-   to one of the other defined types.  */
-typedef __off64_t __loff_t;	/* Type of file sizes and offsets (LFS).  */
-typedef __quad_t *__qaddr_t;
-typedef char *__caddr_t;
-
-/* Duplicates info from stdint.h but this is used in unistd.h.  */
-__STD_TYPE __SWORD_TYPE __intptr_t;
-
-/* Duplicate info from sys/socket.h.  */
-__STD_TYPE __U32_TYPE __socklen_t;
-
-
-#undef __STD_TYPE
-
-#endif /* bits/types.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/typesizes.h b/openflow/usr/include/arm-linux-gnueabihf/bits/typesizes.h
deleted file mode 100644
index 53047b8..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/typesizes.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* bits/typesizes.h -- underlying types for *_t.  Generic version.
-   Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _BITS_TYPES_H
-# error "Never include <bits/typesizes.h> directly; use <sys/types.h> instead."
-#endif
-
-#ifndef	_BITS_TYPESIZES_H
-#define	_BITS_TYPESIZES_H	1
-
-/* See <bits/types.h> for the meaning of these macros.  This file exists so
-   that <bits/types.h> need not vary across different GNU platforms.  */
-
-#define __DEV_T_TYPE		__UQUAD_TYPE
-#define __UID_T_TYPE		__U32_TYPE
-#define __GID_T_TYPE		__U32_TYPE
-#define __INO_T_TYPE		__ULONGWORD_TYPE
-#define __INO64_T_TYPE		__UQUAD_TYPE
-#define __MODE_T_TYPE		__U32_TYPE
-#define __NLINK_T_TYPE		__UWORD_TYPE
-#define __OFF_T_TYPE		__SLONGWORD_TYPE
-#define __OFF64_T_TYPE		__SQUAD_TYPE
-#define __PID_T_TYPE		__S32_TYPE
-#define __RLIM_T_TYPE		__ULONGWORD_TYPE
-#define __RLIM64_T_TYPE		__UQUAD_TYPE
-#define	__BLKCNT_T_TYPE		__SLONGWORD_TYPE
-#define	__BLKCNT64_T_TYPE	__SQUAD_TYPE
-#define	__FSBLKCNT_T_TYPE	__ULONGWORD_TYPE
-#define	__FSBLKCNT64_T_TYPE	__UQUAD_TYPE
-#define	__FSFILCNT_T_TYPE	__ULONGWORD_TYPE
-#define	__FSFILCNT64_T_TYPE	__UQUAD_TYPE
-#define	__FSWORD_T_TYPE		__SWORD_TYPE
-#define	__ID_T_TYPE		__U32_TYPE
-#define __CLOCK_T_TYPE		__SLONGWORD_TYPE
-#define __TIME_T_TYPE		__SLONGWORD_TYPE
-#define __USECONDS_T_TYPE	__U32_TYPE
-#define __SUSECONDS_T_TYPE	__SLONGWORD_TYPE
-#define __DADDR_T_TYPE		__S32_TYPE
-#define __KEY_T_TYPE		__S32_TYPE
-#define __CLOCKID_T_TYPE	__S32_TYPE
-#define __TIMER_T_TYPE		void *
-#define __BLKSIZE_T_TYPE	__SLONGWORD_TYPE
-#define __FSID_T_TYPE		struct { int __val[2]; }
-#define __SSIZE_T_TYPE		__SWORD_TYPE
-#define __SYSCALL_SLONG_TYPE	__SLONGWORD_TYPE
-#define __SYSCALL_ULONG_TYPE	__ULONGWORD_TYPE
-#define __CPU_MASK_TYPE 	__ULONGWORD_TYPE
-
-#ifdef __LP64__
-/* Tell the libc code that off_t and off64_t are actually the same type
-   for all ABI purposes, even if possibly expressed as different base types
-   for C type-checking purposes.  */
-# define __OFF_T_MATCHES_OFF64_T	1
-
-/* Same for ino_t and ino64_t.  */
-# define __INO_T_MATCHES_INO64_T	1
-#endif
-
-/* Number of descriptors that can fit in an `fd_set'.  */
-#define	__FD_SETSIZE		1024
-
-
-#endif /* bits/typesizes.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/uio.h b/openflow/usr/include/arm-linux-gnueabihf/bits/uio.h
deleted file mode 100644
index 7684b3e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/uio.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _SYS_UIO_H && !defined _FCNTL_H
-# error "Never include <bits/uio.h> directly; use <sys/uio.h> instead."
-#endif
-
-#ifndef _BITS_UIO_H
-#define _BITS_UIO_H	1
-
-#include <sys/types.h>
-
-
-/* We should normally use the Linux kernel header file to define this
-   type and macros but this calls for trouble because of the header
-   includes other kernel headers.  */
-
-/* Size of object which can be written atomically.
-
-   This macro has different values in different kernel versions.  The
-   latest versions of the kernel use 1024 and this is good choice.  Since
-   the C library implementation of readv/writev is able to emulate the
-   functionality even if the currently running kernel does not support
-   this large value the readv/writev call will not fail because of this.  */
-#define UIO_MAXIOV	1024
-
-
-/* Structure for scatter/gather I/O.  */
-struct iovec
-  {
-    void *iov_base;	/* Pointer to data.  */
-    size_t iov_len;	/* Length of data.  */
-  };
-
-#endif
-
-
-#ifdef __USE_GNU
-# if defined _SYS_UIO_H && !defined _BITS_UIO_H_FOR_SYS_UIO_H
-#  define _BITS_UIO_H_FOR_SYS_UIO_H 1
-
-__BEGIN_DECLS
-
-/* Read from another process' address space.  */
-extern ssize_t process_vm_readv (pid_t __pid, const struct iovec *__lvec,
-				 unsigned long int __liovcnt,
-				 const struct iovec *__rvec,
-				 unsigned long int __riovcnt,
-				 unsigned long int __flags)
-  __THROW;
-
-/* Write to another process' address space.  */
-extern ssize_t process_vm_writev (pid_t __pid, const struct iovec *__lvec,
-				  unsigned long int __liovcnt,
-				  const struct iovec *__rvec,
-				  unsigned long int __riovcnt,
-				  unsigned long int __flags)
-  __THROW;
-
-__END_DECLS
-
-# endif
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/unistd.h b/openflow/usr/include/arm-linux-gnueabihf/bits/unistd.h
deleted file mode 100644
index 0105f04..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/unistd.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/* Checking macros for unistd functions.
-   Copyright (C) 2005-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _UNISTD_H
-# error "Never include <bits/unistd.h> directly; use <unistd.h> instead."
-#endif
-
-extern ssize_t __read_chk (int __fd, void *__buf, size_t __nbytes,
-			   size_t __buflen) __wur;
-extern ssize_t __REDIRECT (__read_alias, (int __fd, void *__buf,
-					  size_t __nbytes), read) __wur;
-extern ssize_t __REDIRECT (__read_chk_warn,
-			   (int __fd, void *__buf, size_t __nbytes,
-			    size_t __buflen), __read_chk)
-     __wur __warnattr ("read called with bigger length than size of "
-		       "the destination buffer");
-
-__fortify_function __wur ssize_t
-read (int __fd, void *__buf, size_t __nbytes)
-{
-  if (__bos0 (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__nbytes))
-	return __read_chk (__fd, __buf, __nbytes, __bos0 (__buf));
-
-      if (__nbytes > __bos0 (__buf))
-	return __read_chk_warn (__fd, __buf, __nbytes, __bos0 (__buf));
-    }
-  return __read_alias (__fd, __buf, __nbytes);
-}
-
-#ifdef __USE_UNIX98
-extern ssize_t __pread_chk (int __fd, void *__buf, size_t __nbytes,
-			    __off_t __offset, size_t __bufsize) __wur;
-extern ssize_t __pread64_chk (int __fd, void *__buf, size_t __nbytes,
-			      __off64_t __offset, size_t __bufsize) __wur;
-extern ssize_t __REDIRECT (__pread_alias,
-			   (int __fd, void *__buf, size_t __nbytes,
-			    __off_t __offset), pread) __wur;
-extern ssize_t __REDIRECT (__pread64_alias,
-			   (int __fd, void *__buf, size_t __nbytes,
-			    __off64_t __offset), pread64) __wur;
-extern ssize_t __REDIRECT (__pread_chk_warn,
-			   (int __fd, void *__buf, size_t __nbytes,
-			    __off_t __offset, size_t __bufsize), __pread_chk)
-     __wur __warnattr ("pread called with bigger length than size of "
-		       "the destination buffer");
-extern ssize_t __REDIRECT (__pread64_chk_warn,
-			   (int __fd, void *__buf, size_t __nbytes,
-			    __off64_t __offset, size_t __bufsize),
-			    __pread64_chk)
-     __wur __warnattr ("pread64 called with bigger length than size of "
-		       "the destination buffer");
-
-# ifndef __USE_FILE_OFFSET64
-__fortify_function __wur ssize_t
-pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset)
-{
-  if (__bos0 (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__nbytes))
-	return __pread_chk (__fd, __buf, __nbytes, __offset, __bos0 (__buf));
-
-      if ( __nbytes > __bos0 (__buf))
-	return __pread_chk_warn (__fd, __buf, __nbytes, __offset,
-				 __bos0 (__buf));
-    }
-  return __pread_alias (__fd, __buf, __nbytes, __offset);
-}
-# else
-__fortify_function __wur ssize_t
-pread (int __fd, void *__buf, size_t __nbytes, __off64_t __offset)
-{
-  if (__bos0 (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__nbytes))
-	return __pread64_chk (__fd, __buf, __nbytes, __offset, __bos0 (__buf));
-
-      if ( __nbytes > __bos0 (__buf))
-	return __pread64_chk_warn (__fd, __buf, __nbytes, __offset,
-				   __bos0 (__buf));
-    }
-
-  return __pread64_alias (__fd, __buf, __nbytes, __offset);
-}
-# endif
-
-# ifdef __USE_LARGEFILE64
-__fortify_function __wur ssize_t
-pread64 (int __fd, void *__buf, size_t __nbytes, __off64_t __offset)
-{
-  if (__bos0 (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__nbytes))
-	return __pread64_chk (__fd, __buf, __nbytes, __offset, __bos0 (__buf));
-
-      if ( __nbytes > __bos0 (__buf))
-	return __pread64_chk_warn (__fd, __buf, __nbytes, __offset,
-				   __bos0 (__buf));
-    }
-
-  return __pread64_alias (__fd, __buf, __nbytes, __offset);
-}
-# endif
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
-extern ssize_t __readlink_chk (const char *__restrict __path,
-			       char *__restrict __buf, size_t __len,
-			       size_t __buflen)
-     __THROW __nonnull ((1, 2)) __wur;
-extern ssize_t __REDIRECT_NTH (__readlink_alias,
-			       (const char *__restrict __path,
-				char *__restrict __buf, size_t __len), readlink)
-     __nonnull ((1, 2)) __wur;
-extern ssize_t __REDIRECT_NTH (__readlink_chk_warn,
-			       (const char *__restrict __path,
-				char *__restrict __buf, size_t __len,
-				size_t __buflen), __readlink_chk)
-     __nonnull ((1, 2)) __wur __warnattr ("readlink called with bigger length "
-					  "than size of destination buffer");
-
-__fortify_function __nonnull ((1, 2)) __wur ssize_t
-__NTH (readlink (const char *__restrict __path, char *__restrict __buf,
-		 size_t __len))
-{
-  if (__bos (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__len))
-	return __readlink_chk (__path, __buf, __len, __bos (__buf));
-
-      if ( __len > __bos (__buf))
-	return __readlink_chk_warn (__path, __buf, __len, __bos (__buf));
-    }
-  return __readlink_alias (__path, __buf, __len);
-}
-#endif
-
-#ifdef __USE_ATFILE
-extern ssize_t __readlinkat_chk (int __fd, const char *__restrict __path,
-				 char *__restrict __buf, size_t __len,
-				 size_t __buflen)
-     __THROW __nonnull ((2, 3)) __wur;
-extern ssize_t __REDIRECT_NTH (__readlinkat_alias,
-			       (int __fd, const char *__restrict __path,
-				char *__restrict __buf, size_t __len),
-			       readlinkat)
-     __nonnull ((2, 3)) __wur;
-extern ssize_t __REDIRECT_NTH (__readlinkat_chk_warn,
-			       (int __fd, const char *__restrict __path,
-				char *__restrict __buf, size_t __len,
-				size_t __buflen), __readlinkat_chk)
-     __nonnull ((2, 3)) __wur __warnattr ("readlinkat called with bigger "
-					  "length than size of destination "
-					  "buffer");
-
-__fortify_function __nonnull ((2, 3)) __wur ssize_t
-__NTH (readlinkat (int __fd, const char *__restrict __path,
-		   char *__restrict __buf, size_t __len))
-{
-  if (__bos (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__len))
-	return __readlinkat_chk (__fd, __path, __buf, __len, __bos (__buf));
-
-      if (__len > __bos (__buf))
-	return __readlinkat_chk_warn (__fd, __path, __buf, __len,
-				      __bos (__buf));
-    }
-  return __readlinkat_alias (__fd, __path, __buf, __len);
-}
-#endif
-
-extern char *__getcwd_chk (char *__buf, size_t __size, size_t __buflen)
-     __THROW __wur;
-extern char *__REDIRECT_NTH (__getcwd_alias,
-			     (char *__buf, size_t __size), getcwd) __wur;
-extern char *__REDIRECT_NTH (__getcwd_chk_warn,
-			     (char *__buf, size_t __size, size_t __buflen),
-			     __getcwd_chk)
-     __wur __warnattr ("getcwd caller with bigger length than size of "
-		       "destination buffer");
-
-__fortify_function __wur char *
-__NTH (getcwd (char *__buf, size_t __size))
-{
-  if (__bos (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__size))
-	return __getcwd_chk (__buf, __size, __bos (__buf));
-
-      if (__size > __bos (__buf))
-	return __getcwd_chk_warn (__buf, __size, __bos (__buf));
-    }
-  return __getcwd_alias (__buf, __size);
-}
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-extern char *__getwd_chk (char *__buf, size_t buflen)
-     __THROW __nonnull ((1)) __wur;
-extern char *__REDIRECT_NTH (__getwd_warn, (char *__buf), getwd)
-     __nonnull ((1)) __wur __warnattr ("please use getcwd instead, as getwd "
-				       "doesn't specify buffer size");
-
-__fortify_function __nonnull ((1)) __attribute_deprecated__ __wur char *
-__NTH (getwd (char *__buf))
-{
-  if (__bos (__buf) != (size_t) -1)
-    return __getwd_chk (__buf, __bos (__buf));
-  return __getwd_warn (__buf);
-}
-#endif
-
-extern size_t __confstr_chk (int __name, char *__buf, size_t __len,
-			     size_t __buflen) __THROW;
-extern size_t __REDIRECT_NTH (__confstr_alias, (int __name, char *__buf,
-						size_t __len), confstr);
-extern size_t __REDIRECT_NTH (__confstr_chk_warn,
-			      (int __name, char *__buf, size_t __len,
-			       size_t __buflen), __confstr_chk)
-     __warnattr ("confstr called with bigger length than size of destination "
-		 "buffer");
-
-__fortify_function size_t
-__NTH (confstr (int __name, char *__buf, size_t __len))
-{
-  if (__bos (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__len))
-	return __confstr_chk (__name, __buf, __len, __bos (__buf));
-
-      if (__bos (__buf) < __len)
-	return __confstr_chk_warn (__name, __buf, __len, __bos (__buf));
-    }
-  return __confstr_alias (__name, __buf, __len);
-}
-
-
-extern int __getgroups_chk (int __size, __gid_t __list[], size_t __listlen)
-     __THROW __wur;
-extern int __REDIRECT_NTH (__getgroups_alias, (int __size, __gid_t __list[]),
-			   getgroups) __wur;
-extern int __REDIRECT_NTH (__getgroups_chk_warn,
-			   (int __size, __gid_t __list[], size_t __listlen),
-			   __getgroups_chk)
-     __wur __warnattr ("getgroups called with bigger group count than what "
-		       "can fit into destination buffer");
-
-__fortify_function int
-__NTH (getgroups (int __size, __gid_t __list[]))
-{
-  if (__bos (__list) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__size) || __size < 0)
-	return __getgroups_chk (__size, __list, __bos (__list));
-
-      if (__size * sizeof (__gid_t) > __bos (__list))
-	return __getgroups_chk_warn (__size, __list, __bos (__list));
-    }
-  return __getgroups_alias (__size, __list);
-}
-
-
-extern int __ttyname_r_chk (int __fd, char *__buf, size_t __buflen,
-			    size_t __nreal) __THROW __nonnull ((2));
-extern int __REDIRECT_NTH (__ttyname_r_alias, (int __fd, char *__buf,
-					       size_t __buflen), ttyname_r)
-     __nonnull ((2));
-extern int __REDIRECT_NTH (__ttyname_r_chk_warn,
-			   (int __fd, char *__buf, size_t __buflen,
-			    size_t __nreal), __ttyname_r_chk)
-     __nonnull ((2)) __warnattr ("ttyname_r called with bigger buflen than "
-				 "size of destination buffer");
-
-__fortify_function int
-__NTH (ttyname_r (int __fd, char *__buf, size_t __buflen))
-{
-  if (__bos (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__buflen))
-	return __ttyname_r_chk (__fd, __buf, __buflen, __bos (__buf));
-
-      if (__buflen > __bos (__buf))
-	return __ttyname_r_chk_warn (__fd, __buf, __buflen, __bos (__buf));
-    }
-  return __ttyname_r_alias (__fd, __buf, __buflen);
-}
-
-
-#if defined __USE_REENTRANT || defined __USE_POSIX199506
-extern int __getlogin_r_chk (char *__buf, size_t __buflen, size_t __nreal)
-     __nonnull ((1));
-extern int __REDIRECT (__getlogin_r_alias, (char *__buf, size_t __buflen),
-		       getlogin_r) __nonnull ((1));
-extern int __REDIRECT (__getlogin_r_chk_warn,
-		       (char *__buf, size_t __buflen, size_t __nreal),
-		       __getlogin_r_chk)
-     __nonnull ((1)) __warnattr ("getlogin_r called with bigger buflen than "
-				 "size of destination buffer");
-
-__fortify_function int
-getlogin_r (char *__buf, size_t __buflen)
-{
-  if (__bos (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__buflen))
-	return __getlogin_r_chk (__buf, __buflen, __bos (__buf));
-
-      if (__buflen > __bos (__buf))
-	return __getlogin_r_chk_warn (__buf, __buflen, __bos (__buf));
-    }
-  return __getlogin_r_alias (__buf, __buflen);
-}
-#endif
-
-
-#if defined __USE_MISC || defined __USE_UNIX98
-extern int __gethostname_chk (char *__buf, size_t __buflen, size_t __nreal)
-     __THROW __nonnull ((1));
-extern int __REDIRECT_NTH (__gethostname_alias, (char *__buf, size_t __buflen),
-			   gethostname) __nonnull ((1));
-extern int __REDIRECT_NTH (__gethostname_chk_warn,
-			   (char *__buf, size_t __buflen, size_t __nreal),
-			   __gethostname_chk)
-     __nonnull ((1)) __warnattr ("gethostname called with bigger buflen than "
-				 "size of destination buffer");
-
-__fortify_function int
-__NTH (gethostname (char *__buf, size_t __buflen))
-{
-  if (__bos (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__buflen))
-	return __gethostname_chk (__buf, __buflen, __bos (__buf));
-
-      if (__buflen > __bos (__buf))
-	return __gethostname_chk_warn (__buf, __buflen, __bos (__buf));
-    }
-  return __gethostname_alias (__buf, __buflen);
-}
-#endif
-
-
-#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_UNIX98)
-extern int __getdomainname_chk (char *__buf, size_t __buflen, size_t __nreal)
-     __THROW __nonnull ((1)) __wur;
-extern int __REDIRECT_NTH (__getdomainname_alias, (char *__buf,
-						   size_t __buflen),
-			   getdomainname) __nonnull ((1)) __wur;
-extern int __REDIRECT_NTH (__getdomainname_chk_warn,
-			   (char *__buf, size_t __buflen, size_t __nreal),
-			   __getdomainname_chk)
-     __nonnull ((1)) __wur __warnattr ("getdomainname called with bigger "
-				       "buflen than size of destination "
-				       "buffer");
-
-__fortify_function int
-__NTH (getdomainname (char *__buf, size_t __buflen))
-{
-  if (__bos (__buf) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__buflen))
-	return __getdomainname_chk (__buf, __buflen, __bos (__buf));
-
-      if (__buflen > __bos (__buf))
-	return __getdomainname_chk_warn (__buf, __buflen, __bos (__buf));
-    }
-  return __getdomainname_alias (__buf, __buflen);
-}
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/ustat.h b/openflow/usr/include/arm-linux-gnueabihf/bits/ustat.h
deleted file mode 100644
index 0da6240..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/ustat.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_USTAT_H
-# error "Never include <bits/ustat.h> directly; use <sys/ustat.h> instead."
-#endif
-
-#include <sys/types.h>
-
-struct ustat
-  {
-    __daddr_t f_tfree;		/* Number of free blocks.  */
-    __ino_t f_tinode;		/* Number of free inodes.  */
-    char f_fname[6];
-    char f_fpack[6];
-  };
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/utmp.h b/openflow/usr/include/arm-linux-gnueabihf/bits/utmp.h
deleted file mode 100644
index 2a1ffcb..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/utmp.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* The `struct utmp' type, describing entries in the utmp file.  GNU version.
-   Copyright (C) 1993-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _UTMP_H
-# error "Never include <bits/utmp.h> directly; use <utmp.h> instead."
-#endif
-
-#include <paths.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <bits/wordsize.h>
-
-
-#define UT_LINESIZE	32
-#define UT_NAMESIZE	32
-#define UT_HOSTSIZE	256
-
-
-/* The structure describing an entry in the database of
-   previous logins.  */
-struct lastlog
-  {
-#ifdef __WORDSIZE_TIME64_COMPAT32
-    int32_t ll_time;
-#else
-    __time_t ll_time;
-#endif
-    char ll_line[UT_LINESIZE];
-    char ll_host[UT_HOSTSIZE];
-  };
-
-
-/* The structure describing the status of a terminated process.  This
-   type is used in `struct utmp' below.  */
-struct exit_status
-  {
-    short int e_termination;	/* Process termination status.  */
-    short int e_exit;		/* Process exit status.  */
-  };
-
-
-/* The structure describing an entry in the user accounting database.  */
-struct utmp
-{
-  short int ut_type;		/* Type of login.  */
-  pid_t ut_pid;			/* Process ID of login process.  */
-  char ut_line[UT_LINESIZE];	/* Devicename.  */
-  char ut_id[4];		/* Inittab ID.  */
-  char ut_user[UT_NAMESIZE];	/* Username.  */
-  char ut_host[UT_HOSTSIZE];	/* Hostname for remote login.  */
-  struct exit_status ut_exit;	/* Exit status of a process marked
-				   as DEAD_PROCESS.  */
-/* The ut_session and ut_tv fields must be the same size when compiled
-   32- and 64-bit.  This allows data files and shared memory to be
-   shared between 32- and 64-bit applications.  */
-#ifdef __WORDSIZE_TIME64_COMPAT32
-  int32_t ut_session;		/* Session ID, used for windowing.  */
-  struct
-  {
-    int32_t tv_sec;		/* Seconds.  */
-    int32_t tv_usec;		/* Microseconds.  */
-  } ut_tv;			/* Time entry was made.  */
-#else
-  long int ut_session;		/* Session ID, used for windowing.  */
-  struct timeval ut_tv;		/* Time entry was made.  */
-#endif
-
-  int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __glibc_reserved[20];		/* Reserved for future use.  */
-};
-
-/* Backwards compatibility hacks.  */
-#define ut_name		ut_user
-#ifndef _NO_UT_TIME
-/* We have a problem here: `ut_time' is also used otherwise.  Define
-   _NO_UT_TIME if the compiler complains.  */
-# define ut_time	ut_tv.tv_sec
-#endif
-#define ut_xtime	ut_tv.tv_sec
-#define ut_addr		ut_addr_v6[0]
-
-
-/* Values for the `ut_type' field of a `struct utmp'.  */
-#define EMPTY		0	/* No valid user accounting information.  */
-
-#define RUN_LVL		1	/* The system's runlevel.  */
-#define BOOT_TIME	2	/* Time of system boot.  */
-#define NEW_TIME	3	/* Time after system clock changed.  */
-#define OLD_TIME	4	/* Time when system clock changed.  */
-
-#define INIT_PROCESS	5	/* Process spawned by the init process.  */
-#define LOGIN_PROCESS	6	/* Session leader of a logged in user.  */
-#define USER_PROCESS	7	/* Normal process.  */
-#define DEAD_PROCESS	8	/* Terminated process.  */
-
-#define ACCOUNTING	9
-
-/* Old Linux name for the EMPTY type.  */
-#define UT_UNKNOWN	EMPTY
-
-
-/* Tell the user that we have a modern system with UT_HOST, UT_PID,
-   UT_TYPE, UT_ID and UT_TV fields.  */
-#define _HAVE_UT_TYPE	1
-#define _HAVE_UT_PID	1
-#define _HAVE_UT_ID	1
-#define _HAVE_UT_TV	1
-#define _HAVE_UT_HOST	1
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/utmpx.h b/openflow/usr/include/arm-linux-gnueabihf/bits/utmpx.h
deleted file mode 100644
index b41548b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/utmpx.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Structures and definitions for the user accounting database.  GNU version.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _UTMPX_H
-# error "Never include <bits/utmpx.h> directly; use <utmpx.h> instead."
-#endif
-
-#include <bits/types.h>
-#include <sys/time.h>
-#include <bits/wordsize.h>
-
-
-#ifdef __USE_GNU
-# include <paths.h>
-# define _PATH_UTMPX	_PATH_UTMP
-# define _PATH_WTMPX	_PATH_WTMP
-#endif
-
-
-#define __UT_LINESIZE	32
-#define __UT_NAMESIZE	32
-#define __UT_HOSTSIZE	256
-
-
-/* The structure describing the status of a terminated process.  This
-   type is used in `struct utmpx' below.  */
-struct __exit_status
-  {
-#ifdef __USE_GNU
-    short int e_termination;	/* Process termination status.  */
-    short int e_exit;		/* Process exit status.  */
-#else
-    short int __e_termination;	/* Process termination status.  */
-    short int __e_exit;		/* Process exit status.  */
-#endif
-  };
-
-
-/* The structure describing an entry in the user accounting database.  */
-struct utmpx
-{
-  short int ut_type;		/* Type of login.  */
-  __pid_t ut_pid;		/* Process ID of login process.  */
-  char ut_line[__UT_LINESIZE];	/* Devicename.  */
-  char ut_id[4];		/* Inittab ID. */
-  char ut_user[__UT_NAMESIZE];	/* Username.  */
-  char ut_host[__UT_HOSTSIZE];	/* Hostname for remote login.  */
-  struct __exit_status ut_exit;	/* Exit status of a process marked
-				   as DEAD_PROCESS.  */
-
-/* The fields ut_session and ut_tv must be the same size when compiled
-   32- and 64-bit.  This allows files and shared memory to be shared
-   between 32- and 64-bit applications.  */
-#ifdef __WORDSIZE_TIME64_COMPAT32
-  __int32_t ut_session;		/* Session ID, used for windowing.  */
-  struct
-  {
-    __int32_t tv_sec;		/* Seconds.  */
-    __int32_t tv_usec;		/* Microseconds.  */
-  } ut_tv;			/* Time entry was made.  */
-#else
-  long int ut_session;		/* Session ID, used for windowing.  */
-  struct timeval ut_tv;		/* Time entry was made.  */
-#endif
-  __int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __glibc_reserved[20];		/* Reserved for future use.  */
-};
-
-
-/* Values for the `ut_type' field of a `struct utmpx'.  */
-#define EMPTY		0	/* No valid user accounting information.  */
-
-#ifdef __USE_GNU
-# define RUN_LVL	1	/* The system's runlevel.  */
-#endif
-#define BOOT_TIME	2	/* Time of system boot.  */
-#define NEW_TIME	3	/* Time after system clock changed.  */
-#define OLD_TIME	4	/* Time when system clock changed.  */
-
-#define INIT_PROCESS	5	/* Process spawned by the init process.  */
-#define LOGIN_PROCESS	6	/* Session leader of a logged in user.  */
-#define USER_PROCESS	7	/* Normal process.  */
-#define DEAD_PROCESS	8	/* Terminated process.  */
-
-#ifdef __USE_GNU
-# define ACCOUNTING	9	/* System accounting.  */
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/utsname.h b/openflow/usr/include/arm-linux-gnueabihf/bits/utsname.h
deleted file mode 100644
index 070795e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/utsname.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_UTSNAME_H
-# error "Never include <bits/utsname.h> directly; use <sys/utsname.h> instead."
-#endif
-
-/* Length of the entries in `struct utsname' is 65.  */
-#define _UTSNAME_LENGTH 65
-
-/* Linux provides as additional information in the `struct utsname'
-   the name of the current domain.  Define _UTSNAME_DOMAIN_LENGTH
-   to a value != 0 to activate this entry.  */
-#define _UTSNAME_DOMAIN_LENGTH _UTSNAME_LENGTH
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/waitflags.h b/openflow/usr/include/arm-linux-gnueabihf/bits/waitflags.h
deleted file mode 100644
index 6f505e4..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/waitflags.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Definitions of flag bits for `waitpid' et al.
-   Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _SYS_WAIT_H && !defined _STDLIB_H
-# error "Never include <bits/waitflags.h> directly; use <sys/wait.h> instead."
-#endif
-
-
-/* Bits in the third argument to `waitpid'.  */
-#define	WNOHANG		1	/* Don't block waiting.  */
-#define	WUNTRACED	2	/* Report status of stopped children.  */
-
-/* Bits in the fourth argument to `waitid'.  */
-#define WSTOPPED	2	/* Report stopped child (same as WUNTRACED). */
-#define WEXITED		4	/* Report dead child.  */
-#define WCONTINUED	8	/* Report continued child.  */
-#define WNOWAIT		0x01000000 /* Don't reap, just poll status.  */
-
-#define __WNOTHREAD     0x20000000 /* Don't wait on children of other threads
-				      in this group */
-#define __WALL		0x40000000 /* Wait for any child.  */
-#define __WCLONE	0x80000000 /* Wait for cloned process.  */
-
-/* The following values are used by the `waitid' function.  */
-#if defined __USE_XOPEN || defined __USE_XOPEN2K8
-# ifndef __ENUM_IDTYPE_T
-# define __ENUM_IDTYPE_T 1
-
-/* The Linux kernel defines these bare, rather than an enum,
-   which causes a conflict if the include order is reversed. */
-# undef P_ALL
-# undef P_PID
-# undef P_PGID
-
-typedef enum
-{
-  P_ALL,		/* Wait for any child.  */
-  P_PID,		/* Wait for specified process.  */
-  P_PGID		/* Wait for members of process group.  */
-} idtype_t;
-# endif
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/waitstatus.h b/openflow/usr/include/arm-linux-gnueabihf/bits/waitstatus.h
deleted file mode 100644
index 38c33bc..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/waitstatus.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Definitions of status bits for `wait' et al.
-   Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if !defined _SYS_WAIT_H && !defined _STDLIB_H
-# error "Never include <bits/waitstatus.h> directly; use <sys/wait.h> instead."
-#endif
-
-
-/* Everything extant so far uses these same bits.  */
-
-
-/* If WIFEXITED(STATUS), the low-order 8 bits of the status.  */
-#define	__WEXITSTATUS(status)	(((status) & 0xff00) >> 8)
-
-/* If WIFSIGNALED(STATUS), the terminating signal.  */
-#define	__WTERMSIG(status)	((status) & 0x7f)
-
-/* If WIFSTOPPED(STATUS), the signal that stopped the child.  */
-#define	__WSTOPSIG(status)	__WEXITSTATUS(status)
-
-/* Nonzero if STATUS indicates normal termination.  */
-#define	__WIFEXITED(status)	(__WTERMSIG(status) == 0)
-
-/* Nonzero if STATUS indicates termination by a signal.  */
-#define __WIFSIGNALED(status) \
-  (((signed char) (((status) & 0x7f) + 1) >> 1) > 0)
-
-/* Nonzero if STATUS indicates the child is stopped.  */
-#define	__WIFSTOPPED(status)	(((status) & 0xff) == 0x7f)
-
-/* Nonzero if STATUS indicates the child continued after a stop.  We only
-   define this if <bits/waitflags.h> provides the WCONTINUED flag bit.  */
-#ifdef WCONTINUED
-# define __WIFCONTINUED(status)	((status) == __W_CONTINUED)
-#endif
-
-/* Nonzero if STATUS indicates the child dumped core.  */
-#define	__WCOREDUMP(status)	((status) & __WCOREFLAG)
-
-/* Macros for constructing status values.  */
-#define	__W_EXITCODE(ret, sig)	((ret) << 8 | (sig))
-#define	__W_STOPCODE(sig)	((sig) << 8 | 0x7f)
-#define __W_CONTINUED		0xffff
-#define	__WCOREFLAG		0x80
-
-
-#ifdef	__USE_MISC
-
-# include <endian.h>
-
-union wait
-  {
-    int w_status;
-    struct
-      {
-# if	__BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned int __w_termsig:7; /* Terminating signal.  */
-	unsigned int __w_coredump:1; /* Set if dumped core.  */
-	unsigned int __w_retcode:8; /* Return code if exited normally.  */
-	unsigned int:16;
-# endif				/* Little endian.  */
-# if	__BYTE_ORDER == __BIG_ENDIAN
-	unsigned int:16;
-	unsigned int __w_retcode:8;
-	unsigned int __w_coredump:1;
-	unsigned int __w_termsig:7;
-# endif				/* Big endian.  */
-      } __wait_terminated;
-    struct
-      {
-# if	__BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned int __w_stopval:8; /* W_STOPPED if stopped.  */
-	unsigned int __w_stopsig:8; /* Stopping signal.  */
-	unsigned int:16;
-# endif				/* Little endian.  */
-# if	__BYTE_ORDER == __BIG_ENDIAN
-	unsigned int:16;
-	unsigned int __w_stopsig:8; /* Stopping signal.  */
-	unsigned int __w_stopval:8; /* W_STOPPED if stopped.  */
-# endif				/* Big endian.  */
-      } __wait_stopped;
-  };
-
-# define w_termsig	__wait_terminated.__w_termsig
-# define w_coredump	__wait_terminated.__w_coredump
-# define w_retcode	__wait_terminated.__w_retcode
-# define w_stopsig	__wait_stopped.__w_stopsig
-# define w_stopval	__wait_stopped.__w_stopval
-
-#endif	/* Use misc.  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/wchar-ldbl.h b/openflow/usr/include/arm-linux-gnueabihf/bits/wchar-ldbl.h
deleted file mode 100644
index d6c28c5..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/wchar-ldbl.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -mlong-double-64 compatibility mode for <wchar.h> functions.
-   Copyright (C) 2006-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _WCHAR_H
-# error "Never include <bits/wchar-ldbl.h> directly; use <wchar.h> instead."
-#endif
-
-#if defined __USE_ISOC95 || defined __USE_UNIX98
-__BEGIN_NAMESPACE_C99
-__LDBL_REDIR_DECL (fwprintf);
-__LDBL_REDIR_DECL (wprintf);
-__LDBL_REDIR_DECL (swprintf);
-__LDBL_REDIR_DECL (vfwprintf);
-__LDBL_REDIR_DECL (vwprintf);
-__LDBL_REDIR_DECL (vswprintf);
-# if defined __USE_ISOC99 && !defined __USE_GNU \
-     && !defined __REDIRECT \
-     && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
-__LDBL_REDIR1_DECL (fwscanf, __nldbl___isoc99_fwscanf)
-__LDBL_REDIR1_DECL (wscanf, __nldbl___isoc99_wscanf)
-__LDBL_REDIR1_DECL (swscanf, __nldbl___isoc99_swscanf)
-# else
-__LDBL_REDIR_DECL (fwscanf);
-__LDBL_REDIR_DECL (wscanf);
-__LDBL_REDIR_DECL (swscanf);
-# endif
-__END_NAMESPACE_C99
-#endif
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-__LDBL_REDIR1_DECL (wcstold, wcstod);
-# if !defined __USE_GNU && !defined __REDIRECT \
-     && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
-__LDBL_REDIR1_DECL (vfwscanf, __nldbl___isoc99_vfwscanf)
-__LDBL_REDIR1_DECL (vwscanf, __nldbl___isoc99_vwscanf)
-__LDBL_REDIR1_DECL (vswscanf, __nldbl___isoc99_vswscanf)
-# else
-__LDBL_REDIR_DECL (vfwscanf);
-__LDBL_REDIR_DECL (vwscanf);
-__LDBL_REDIR_DECL (vswscanf);
-# endif
-__END_NAMESPACE_C99
-#endif
-
-#ifdef __USE_GNU
-__LDBL_REDIR1_DECL (wcstold_l, wcstod_l);
-#endif
-
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-__LDBL_REDIR_DECL (__swprintf_chk)
-__LDBL_REDIR_DECL (__vswprintf_chk)
-# if __USE_FORTIFY_LEVEL > 1
-__LDBL_REDIR_DECL (__fwprintf_chk)
-__LDBL_REDIR_DECL (__wprintf_chk)
-__LDBL_REDIR_DECL (__vfwprintf_chk)
-__LDBL_REDIR_DECL (__vwprintf_chk)
-# endif
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/wchar.h b/openflow/usr/include/arm-linux-gnueabihf/bits/wchar.h
deleted file mode 100644
index 54f00d5..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/wchar.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* wchar_t type related definitions.
-   Copyright (C) 2000-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _BITS_WCHAR_H
-#define _BITS_WCHAR_H	1
-
-/* The fallback definitions, for when __WCHAR_MAX__ or __WCHAR_MIN__
-   are not defined, give the right value and type as long as both int
-   and wchar_t are 32-bit types.  Adding L'\0' to a constant value
-   ensures that the type is correct; it is necessary to use (L'\0' +
-   0) rather than just L'\0' so that the type in C++ is the promoted
-   version of wchar_t rather than the distinct wchar_t type itself.
-   Because wchar_t in preprocessor #if expressions is treated as
-   intmax_t or uintmax_t, the expression (L'\0' - 1) would have the
-   wrong value for WCHAR_MAX in such expressions and so cannot be used
-   to define __WCHAR_MAX in the unsigned case.  */
-
-#ifdef __WCHAR_MAX__
-# define __WCHAR_MAX	__WCHAR_MAX__
-#elif L'\0' - 1 > 0
-# define __WCHAR_MAX	(0xffffffffu + L'\0')
-#else
-# define __WCHAR_MAX	(0x7fffffff + L'\0')
-#endif
-
-#ifdef __WCHAR_MIN__
-# define __WCHAR_MIN	__WCHAR_MIN__
-#elif L'\0' - 1 > 0
-# define __WCHAR_MIN	(L'\0' + 0)
-#else
-# define __WCHAR_MIN	(-__WCHAR_MAX - 1)
-#endif
-
-#endif	/* bits/wchar.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/wchar2.h b/openflow/usr/include/arm-linux-gnueabihf/bits/wchar2.h
deleted file mode 100644
index ccf8dc9..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/wchar2.h
+++ /dev/null
@@ -1,593 +0,0 @@
-/* Checking macros for wchar functions.
-   Copyright (C) 2005-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _WCHAR_H
-# error "Never include <bits/wchar2.h> directly; use <wchar.h> instead."
-#endif
-
-
-extern wchar_t *__wmemcpy_chk (wchar_t *__restrict __s1,
-			       const wchar_t *__restrict __s2, size_t __n,
-			       size_t __ns1) __THROW;
-extern wchar_t *__REDIRECT_NTH (__wmemcpy_alias,
-				(wchar_t *__restrict __s1,
-				 const wchar_t *__restrict __s2, size_t __n),
-				wmemcpy);
-extern wchar_t *__REDIRECT_NTH (__wmemcpy_chk_warn,
-				(wchar_t *__restrict __s1,
-				 const wchar_t *__restrict __s2, size_t __n,
-				 size_t __ns1), __wmemcpy_chk)
-     __warnattr ("wmemcpy called with length bigger than size of destination "
-		 "buffer");
-
-__fortify_function wchar_t *
-__NTH (wmemcpy (wchar_t *__restrict __s1, const wchar_t *__restrict __s2,
-		size_t __n))
-{
-  if (__bos0 (__s1) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n))
-	return __wmemcpy_chk (__s1, __s2, __n,
-			      __bos0 (__s1) / sizeof (wchar_t));
-
-      if (__n > __bos0 (__s1) / sizeof (wchar_t))
-	return __wmemcpy_chk_warn (__s1, __s2, __n,
-				   __bos0 (__s1) / sizeof (wchar_t));
-    }
-  return __wmemcpy_alias (__s1, __s2, __n);
-}
-
-
-extern wchar_t *__wmemmove_chk (wchar_t *__s1, const wchar_t *__s2,
-				size_t __n, size_t __ns1) __THROW;
-extern wchar_t *__REDIRECT_NTH (__wmemmove_alias, (wchar_t *__s1,
-						   const wchar_t *__s2,
-						   size_t __n), wmemmove);
-extern wchar_t *__REDIRECT_NTH (__wmemmove_chk_warn,
-				(wchar_t *__s1, const wchar_t *__s2,
-				 size_t __n, size_t __ns1), __wmemmove_chk)
-     __warnattr ("wmemmove called with length bigger than size of destination "
-		 "buffer");
-
-__fortify_function wchar_t *
-__NTH (wmemmove (wchar_t *__s1, const wchar_t *__s2, size_t __n))
-{
-  if (__bos0 (__s1) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n))
-	return __wmemmove_chk (__s1, __s2, __n,
-			       __bos0 (__s1) / sizeof (wchar_t));
-
-      if (__n > __bos0 (__s1) / sizeof (wchar_t))
-	return __wmemmove_chk_warn (__s1, __s2, __n,
-				    __bos0 (__s1) / sizeof (wchar_t));
-    }
-  return __wmemmove_alias (__s1, __s2, __n);
-}
-
-
-#ifdef __USE_GNU
-extern wchar_t *__wmempcpy_chk (wchar_t *__restrict __s1,
-				const wchar_t *__restrict __s2, size_t __n,
-				size_t __ns1) __THROW;
-extern wchar_t *__REDIRECT_NTH (__wmempcpy_alias,
-				(wchar_t *__restrict __s1,
-				 const wchar_t *__restrict __s2,
-				 size_t __n), wmempcpy);
-extern wchar_t *__REDIRECT_NTH (__wmempcpy_chk_warn,
-				(wchar_t *__restrict __s1,
-				 const wchar_t *__restrict __s2, size_t __n,
-				 size_t __ns1), __wmempcpy_chk)
-     __warnattr ("wmempcpy called with length bigger than size of destination "
-		 "buffer");
-
-__fortify_function wchar_t *
-__NTH (wmempcpy (wchar_t *__restrict __s1, const wchar_t *__restrict __s2,
-		 size_t __n))
-{
-  if (__bos0 (__s1) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n))
-	return __wmempcpy_chk (__s1, __s2, __n,
-			       __bos0 (__s1) / sizeof (wchar_t));
-
-      if (__n > __bos0 (__s1) / sizeof (wchar_t))
-	return __wmempcpy_chk_warn (__s1, __s2, __n,
-				    __bos0 (__s1) / sizeof (wchar_t));
-    }
-  return __wmempcpy_alias (__s1, __s2, __n);
-}
-#endif
-
-
-extern wchar_t *__wmemset_chk (wchar_t *__s, wchar_t __c, size_t __n,
-			       size_t __ns) __THROW;
-extern wchar_t *__REDIRECT_NTH (__wmemset_alias, (wchar_t *__s, wchar_t __c,
-						  size_t __n), wmemset);
-extern wchar_t *__REDIRECT_NTH (__wmemset_chk_warn,
-				(wchar_t *__s, wchar_t __c, size_t __n,
-				 size_t __ns), __wmemset_chk)
-     __warnattr ("wmemset called with length bigger than size of destination "
-		 "buffer");
-
-__fortify_function wchar_t *
-__NTH (wmemset (wchar_t *__s, wchar_t __c, size_t __n))
-{
-  if (__bos0 (__s) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n))
-	return __wmemset_chk (__s, __c, __n, __bos0 (__s) / sizeof (wchar_t));
-
-      if (__n > __bos0 (__s) / sizeof (wchar_t))
-	return __wmemset_chk_warn (__s, __c, __n,
-				   __bos0 (__s) / sizeof (wchar_t));
-    }
-  return __wmemset_alias (__s, __c, __n);
-}
-
-
-extern wchar_t *__wcscpy_chk (wchar_t *__restrict __dest,
-			      const wchar_t *__restrict __src,
-			      size_t __n) __THROW;
-extern wchar_t *__REDIRECT_NTH (__wcscpy_alias,
-				(wchar_t *__restrict __dest,
-				 const wchar_t *__restrict __src), wcscpy);
-
-__fortify_function wchar_t *
-__NTH (wcscpy (wchar_t *__restrict __dest, const wchar_t *__restrict __src))
-{
-  if (__bos (__dest) != (size_t) -1)
-    return __wcscpy_chk (__dest, __src, __bos (__dest) / sizeof (wchar_t));
-  return __wcscpy_alias (__dest, __src);
-}
-
-
-extern wchar_t *__wcpcpy_chk (wchar_t *__restrict __dest,
-			      const wchar_t *__restrict __src,
-			      size_t __destlen) __THROW;
-extern wchar_t *__REDIRECT_NTH (__wcpcpy_alias,
-				(wchar_t *__restrict __dest,
-				 const wchar_t *__restrict __src), wcpcpy);
-
-__fortify_function wchar_t *
-__NTH (wcpcpy (wchar_t *__restrict __dest, const wchar_t *__restrict __src))
-{
-  if (__bos (__dest) != (size_t) -1)
-    return __wcpcpy_chk (__dest, __src, __bos (__dest) / sizeof (wchar_t));
-  return __wcpcpy_alias (__dest, __src);
-}
-
-
-extern wchar_t *__wcsncpy_chk (wchar_t *__restrict __dest,
-			       const wchar_t *__restrict __src, size_t __n,
-			       size_t __destlen) __THROW;
-extern wchar_t *__REDIRECT_NTH (__wcsncpy_alias,
-				(wchar_t *__restrict __dest,
-				 const wchar_t *__restrict __src,
-				 size_t __n), wcsncpy);
-extern wchar_t *__REDIRECT_NTH (__wcsncpy_chk_warn,
-				(wchar_t *__restrict __dest,
-				 const wchar_t *__restrict __src,
-				 size_t __n, size_t __destlen), __wcsncpy_chk)
-     __warnattr ("wcsncpy called with length bigger than size of destination "
-		 "buffer");
-
-__fortify_function wchar_t *
-__NTH (wcsncpy (wchar_t *__restrict __dest, const wchar_t *__restrict __src,
-		size_t __n))
-{
-  if (__bos (__dest) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n))
-	return __wcsncpy_chk (__dest, __src, __n,
-			      __bos (__dest) / sizeof (wchar_t));
-      if (__n > __bos (__dest) / sizeof (wchar_t))
-	return __wcsncpy_chk_warn (__dest, __src, __n,
-				   __bos (__dest) / sizeof (wchar_t));
-    }
-  return __wcsncpy_alias (__dest, __src, __n);
-}
-
-
-extern wchar_t *__wcpncpy_chk (wchar_t *__restrict __dest,
-			       const wchar_t *__restrict __src, size_t __n,
-			       size_t __destlen) __THROW;
-extern wchar_t *__REDIRECT_NTH (__wcpncpy_alias,
-				(wchar_t *__restrict __dest,
-				 const wchar_t *__restrict __src,
-				 size_t __n), wcpncpy);
-extern wchar_t *__REDIRECT_NTH (__wcpncpy_chk_warn,
-				(wchar_t *__restrict __dest,
-				 const wchar_t *__restrict __src,
-				 size_t __n, size_t __destlen), __wcpncpy_chk)
-     __warnattr ("wcpncpy called with length bigger than size of destination "
-		 "buffer");
-
-__fortify_function wchar_t *
-__NTH (wcpncpy (wchar_t *__restrict __dest, const wchar_t *__restrict __src,
-		size_t __n))
-{
-  if (__bos (__dest) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n))
-	return __wcpncpy_chk (__dest, __src, __n,
-			      __bos (__dest) / sizeof (wchar_t));
-      if (__n > __bos (__dest) / sizeof (wchar_t))
-	return __wcpncpy_chk_warn (__dest, __src, __n,
-				   __bos (__dest) / sizeof (wchar_t));
-    }
-  return __wcpncpy_alias (__dest, __src, __n);
-}
-
-
-extern wchar_t *__wcscat_chk (wchar_t *__restrict __dest,
-			      const wchar_t *__restrict __src,
-			      size_t __destlen) __THROW;
-extern wchar_t *__REDIRECT_NTH (__wcscat_alias,
-				(wchar_t *__restrict __dest,
-				 const wchar_t *__restrict __src), wcscat);
-
-__fortify_function wchar_t *
-__NTH (wcscat (wchar_t *__restrict __dest, const wchar_t *__restrict __src))
-{
-  if (__bos (__dest) != (size_t) -1)
-    return __wcscat_chk (__dest, __src, __bos (__dest) / sizeof (wchar_t));
-  return __wcscat_alias (__dest, __src);
-}
-
-
-extern wchar_t *__wcsncat_chk (wchar_t *__restrict __dest,
-			       const wchar_t *__restrict __src,
-			       size_t __n, size_t __destlen) __THROW;
-extern wchar_t *__REDIRECT_NTH (__wcsncat_alias,
-				(wchar_t *__restrict __dest,
-				 const wchar_t *__restrict __src,
-				 size_t __n), wcsncat);
-
-__fortify_function wchar_t *
-__NTH (wcsncat (wchar_t *__restrict __dest, const wchar_t *__restrict __src,
-		size_t __n))
-{
-  if (__bos (__dest) != (size_t) -1)
-    return __wcsncat_chk (__dest, __src, __n,
-			  __bos (__dest) / sizeof (wchar_t));
-  return __wcsncat_alias (__dest, __src, __n);
-}
-
-
-extern int __swprintf_chk (wchar_t *__restrict __s, size_t __n,
-			   int __flag, size_t __s_len,
-			   const wchar_t *__restrict __format, ...)
-     __THROW /* __attribute__ ((__format__ (__wprintf__, 5, 6))) */;
-
-extern int __REDIRECT_NTH_LDBL (__swprintf_alias,
-				(wchar_t *__restrict __s, size_t __n,
-				 const wchar_t *__restrict __fmt, ...),
-				swprintf);
-
-#ifdef __va_arg_pack
-__fortify_function int
-__NTH (swprintf (wchar_t *__restrict __s, size_t __n,
-		 const wchar_t *__restrict __fmt, ...))
-{
-  if (__bos (__s) != (size_t) -1 || __USE_FORTIFY_LEVEL > 1)
-    return __swprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
-			   __bos (__s) / sizeof (wchar_t),
-			   __fmt, __va_arg_pack ());
-  return __swprintf_alias (__s, __n, __fmt, __va_arg_pack ());
-}
-#elif !defined __cplusplus
-/* XXX We might want to have support in gcc for swprintf.  */
-# define swprintf(s, n, ...) \
-  (__bos (s) != (size_t) -1 || __USE_FORTIFY_LEVEL > 1			      \
-   ? __swprintf_chk (s, n, __USE_FORTIFY_LEVEL - 1,			      \
-		     __bos (s) / sizeof (wchar_t), __VA_ARGS__)		      \
-   : swprintf (s, n, __VA_ARGS__))
-#endif
-
-extern int __vswprintf_chk (wchar_t *__restrict __s, size_t __n,
-			    int __flag, size_t __s_len,
-			    const wchar_t *__restrict __format,
-			    __gnuc_va_list __arg)
-     __THROW /* __attribute__ ((__format__ (__wprintf__, 5, 0))) */;
-
-extern int __REDIRECT_NTH_LDBL (__vswprintf_alias,
-				(wchar_t *__restrict __s, size_t __n,
-				 const wchar_t *__restrict __fmt,
-				 __gnuc_va_list __ap), vswprintf);
-
-__fortify_function int
-__NTH (vswprintf (wchar_t *__restrict __s, size_t __n,
-		  const wchar_t *__restrict __fmt, __gnuc_va_list __ap))
-{
-  if (__bos (__s) != (size_t) -1 || __USE_FORTIFY_LEVEL > 1)
-    return __vswprintf_chk (__s, __n,  __USE_FORTIFY_LEVEL - 1,
-			    __bos (__s) / sizeof (wchar_t), __fmt, __ap);
-  return __vswprintf_alias (__s, __n, __fmt, __ap);
-}
-
-
-#if __USE_FORTIFY_LEVEL > 1
-
-extern int __fwprintf_chk (__FILE *__restrict __stream, int __flag,
-			   const wchar_t *__restrict __format, ...);
-extern int __wprintf_chk (int __flag, const wchar_t *__restrict __format,
-			  ...);
-extern int __vfwprintf_chk (__FILE *__restrict __stream, int __flag,
-			    const wchar_t *__restrict __format,
-			    __gnuc_va_list __ap);
-extern int __vwprintf_chk (int __flag, const wchar_t *__restrict __format,
-			   __gnuc_va_list __ap);
-
-# ifdef __va_arg_pack
-__fortify_function int
-wprintf (const wchar_t *__restrict __fmt, ...)
-{
-  return __wprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
-}
-
-__fortify_function int
-fwprintf (__FILE *__restrict __stream, const wchar_t *__restrict __fmt, ...)
-{
-  return __fwprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, __fmt,
-			 __va_arg_pack ());
-}
-# elif !defined __cplusplus
-#  define wprintf(...) \
-  __wprintf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-#  define fwprintf(stream, ...) \
-  __fwprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-# endif
-
-__fortify_function int
-vwprintf (const wchar_t *__restrict __fmt, __gnuc_va_list __ap)
-{
-  return __vwprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __ap);
-}
-
-__fortify_function int
-vfwprintf (__FILE *__restrict __stream,
-	   const wchar_t *__restrict __fmt, __gnuc_va_list __ap)
-{
-  return __vfwprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
-}
-
-#endif
-
-extern wchar_t *__fgetws_chk (wchar_t *__restrict __s, size_t __size, int __n,
-			      __FILE *__restrict __stream) __wur;
-extern wchar_t *__REDIRECT (__fgetws_alias,
-			    (wchar_t *__restrict __s, int __n,
-			     __FILE *__restrict __stream), fgetws) __wur;
-extern wchar_t *__REDIRECT (__fgetws_chk_warn,
-			    (wchar_t *__restrict __s, size_t __size, int __n,
-			     __FILE *__restrict __stream), __fgetws_chk)
-     __wur __warnattr ("fgetws called with bigger size than length "
-		       "of destination buffer");
-
-__fortify_function __wur wchar_t *
-fgetws (wchar_t *__restrict __s, int __n, __FILE *__restrict __stream)
-{
-  if (__bos (__s) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n) || __n <= 0)
-	return __fgetws_chk (__s, __bos (__s) / sizeof (wchar_t),
-			     __n, __stream);
-
-      if ((size_t) __n > __bos (__s) / sizeof (wchar_t))
-	return __fgetws_chk_warn (__s, __bos (__s) / sizeof (wchar_t),
-				  __n, __stream);
-    }
-  return __fgetws_alias (__s, __n, __stream);
-}
-
-#ifdef __USE_GNU
-extern wchar_t *__fgetws_unlocked_chk (wchar_t *__restrict __s, size_t __size,
-				       int __n, __FILE *__restrict __stream)
-  __wur;
-extern wchar_t *__REDIRECT (__fgetws_unlocked_alias,
-			    (wchar_t *__restrict __s, int __n,
-			     __FILE *__restrict __stream), fgetws_unlocked)
-  __wur;
-extern wchar_t *__REDIRECT (__fgetws_unlocked_chk_warn,
-			    (wchar_t *__restrict __s, size_t __size, int __n,
-			     __FILE *__restrict __stream),
-			    __fgetws_unlocked_chk)
-     __wur __warnattr ("fgetws_unlocked called with bigger size than length "
-		       "of destination buffer");
-
-__fortify_function __wur wchar_t *
-fgetws_unlocked (wchar_t *__restrict __s, int __n, __FILE *__restrict __stream)
-{
-  if (__bos (__s) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__n) || __n <= 0)
-	return __fgetws_unlocked_chk (__s, __bos (__s) / sizeof (wchar_t),
-				      __n, __stream);
-
-      if ((size_t) __n > __bos (__s) / sizeof (wchar_t))
-	return __fgetws_unlocked_chk_warn (__s, __bos (__s) / sizeof (wchar_t),
-					   __n, __stream);
-    }
-  return __fgetws_unlocked_alias (__s, __n, __stream);
-}
-#endif
-
-
-extern size_t __wcrtomb_chk (char *__restrict __s, wchar_t __wchar,
-			     mbstate_t *__restrict __p,
-			     size_t __buflen) __THROW __wur;
-extern size_t __REDIRECT_NTH (__wcrtomb_alias,
-			      (char *__restrict __s, wchar_t __wchar,
-			       mbstate_t *__restrict __ps), wcrtomb) __wur;
-
-__fortify_function __wur size_t
-__NTH (wcrtomb (char *__restrict __s, wchar_t __wchar,
-		mbstate_t *__restrict __ps))
-{
-  /* We would have to include <limits.h> to get a definition of MB_LEN_MAX.
-     But this would only disturb the namespace.  So we define our own
-     version here.  */
-#define __WCHAR_MB_LEN_MAX	16
-#if defined MB_LEN_MAX && MB_LEN_MAX != __WCHAR_MB_LEN_MAX
-# error "Assumed value of MB_LEN_MAX wrong"
-#endif
-  if (__bos (__s) != (size_t) -1 && __WCHAR_MB_LEN_MAX > __bos (__s))
-    return __wcrtomb_chk (__s, __wchar, __ps, __bos (__s));
-  return __wcrtomb_alias (__s, __wchar, __ps);
-}
-
-
-extern size_t __mbsrtowcs_chk (wchar_t *__restrict __dst,
-			       const char **__restrict __src,
-			       size_t __len, mbstate_t *__restrict __ps,
-			       size_t __dstlen) __THROW;
-extern size_t __REDIRECT_NTH (__mbsrtowcs_alias,
-			      (wchar_t *__restrict __dst,
-			       const char **__restrict __src,
-			       size_t __len, mbstate_t *__restrict __ps),
-			      mbsrtowcs);
-extern size_t __REDIRECT_NTH (__mbsrtowcs_chk_warn,
-			      (wchar_t *__restrict __dst,
-			       const char **__restrict __src,
-			       size_t __len, mbstate_t *__restrict __ps,
-			       size_t __dstlen), __mbsrtowcs_chk)
-     __warnattr ("mbsrtowcs called with dst buffer smaller than len "
-		 "* sizeof (wchar_t)");
-
-__fortify_function size_t
-__NTH (mbsrtowcs (wchar_t *__restrict __dst, const char **__restrict __src,
-		  size_t __len, mbstate_t *__restrict __ps))
-{
-  if (__bos (__dst) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__len))
-	return __mbsrtowcs_chk (__dst, __src, __len, __ps,
-				__bos (__dst) / sizeof (wchar_t));
-
-      if (__len > __bos (__dst) / sizeof (wchar_t))
-	return __mbsrtowcs_chk_warn (__dst, __src, __len, __ps,
-				     __bos (__dst) / sizeof (wchar_t));
-    }
-  return __mbsrtowcs_alias (__dst, __src, __len, __ps);
-}
-
-
-extern size_t __wcsrtombs_chk (char *__restrict __dst,
-			       const wchar_t **__restrict __src,
-			       size_t __len, mbstate_t *__restrict __ps,
-			       size_t __dstlen) __THROW;
-extern size_t __REDIRECT_NTH (__wcsrtombs_alias,
-			      (char *__restrict __dst,
-			       const wchar_t **__restrict __src,
-			       size_t __len, mbstate_t *__restrict __ps),
-			      wcsrtombs);
-extern size_t __REDIRECT_NTH (__wcsrtombs_chk_warn,
-			      (char *__restrict __dst,
-			       const wchar_t **__restrict __src,
-			       size_t __len, mbstate_t *__restrict __ps,
-			       size_t __dstlen), __wcsrtombs_chk)
-    __warnattr ("wcsrtombs called with dst buffer smaller than len");
-
-__fortify_function size_t
-__NTH (wcsrtombs (char *__restrict __dst, const wchar_t **__restrict __src,
-		  size_t __len, mbstate_t *__restrict __ps))
-{
-  if (__bos (__dst) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__len))
-	return __wcsrtombs_chk (__dst, __src, __len, __ps, __bos (__dst));
-
-      if (__len > __bos (__dst))
-	return __wcsrtombs_chk_warn (__dst, __src, __len, __ps, __bos (__dst));
-    }
-  return __wcsrtombs_alias (__dst, __src, __len, __ps);
-}
-
-
-#ifdef __USE_GNU
-extern size_t __mbsnrtowcs_chk (wchar_t *__restrict __dst,
-				const char **__restrict __src, size_t __nmc,
-				size_t __len, mbstate_t *__restrict __ps,
-				size_t __dstlen) __THROW;
-extern size_t __REDIRECT_NTH (__mbsnrtowcs_alias,
-			      (wchar_t *__restrict __dst,
-			       const char **__restrict __src, size_t __nmc,
-			       size_t __len, mbstate_t *__restrict __ps),
-			      mbsnrtowcs);
-extern size_t __REDIRECT_NTH (__mbsnrtowcs_chk_warn,
-			      (wchar_t *__restrict __dst,
-			       const char **__restrict __src, size_t __nmc,
-			       size_t __len, mbstate_t *__restrict __ps,
-			       size_t __dstlen), __mbsnrtowcs_chk)
-     __warnattr ("mbsnrtowcs called with dst buffer smaller than len "
-		 "* sizeof (wchar_t)");
-
-__fortify_function size_t
-__NTH (mbsnrtowcs (wchar_t *__restrict __dst, const char **__restrict __src,
-		   size_t __nmc, size_t __len, mbstate_t *__restrict __ps))
-{
-  if (__bos (__dst) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__len))
-	return __mbsnrtowcs_chk (__dst, __src, __nmc, __len, __ps,
-				 __bos (__dst) / sizeof (wchar_t));
-
-      if (__len > __bos (__dst) / sizeof (wchar_t))
-	return __mbsnrtowcs_chk_warn (__dst, __src, __nmc, __len, __ps,
-				      __bos (__dst) / sizeof (wchar_t));
-    }
-  return __mbsnrtowcs_alias (__dst, __src, __nmc, __len, __ps);
-}
-
-
-extern size_t __wcsnrtombs_chk (char *__restrict __dst,
-				const wchar_t **__restrict __src,
-				size_t __nwc, size_t __len,
-				mbstate_t *__restrict __ps, size_t __dstlen)
-     __THROW;
-extern size_t __REDIRECT_NTH (__wcsnrtombs_alias,
-			      (char *__restrict __dst,
-			       const wchar_t **__restrict __src,
-			       size_t __nwc, size_t __len,
-			       mbstate_t *__restrict __ps), wcsnrtombs);
-extern size_t __REDIRECT_NTH (__wcsnrtombs_chk_warn,
-			      (char *__restrict __dst,
-			       const wchar_t **__restrict __src,
-			       size_t __nwc, size_t __len,
-			       mbstate_t *__restrict __ps,
-			       size_t __dstlen), __wcsnrtombs_chk)
-     __warnattr ("wcsnrtombs called with dst buffer smaller than len");
-
-__fortify_function size_t
-__NTH (wcsnrtombs (char *__restrict __dst, const wchar_t **__restrict __src,
-		   size_t __nwc, size_t __len, mbstate_t *__restrict __ps))
-{
-  if (__bos (__dst) != (size_t) -1)
-    {
-      if (!__builtin_constant_p (__len))
-	return __wcsnrtombs_chk (__dst, __src, __nwc, __len, __ps,
-				 __bos (__dst));
-
-      if (__len > __bos (__dst))
-	return __wcsnrtombs_chk_warn (__dst, __src, __nwc, __len, __ps,
-				      __bos (__dst));
-    }
-  return __wcsnrtombs_alias (__dst, __src, __nwc, __len, __ps);
-}
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/wordsize.h b/openflow/usr/include/arm-linux-gnueabihf/bits/wordsize.h
deleted file mode 100644
index 2aa16bc..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/wordsize.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (C) 1999-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#define __WORDSIZE	32
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/xopen_lim.h b/openflow/usr/include/arm-linux-gnueabihf/bits/xopen_lim.h
deleted file mode 100644
index 26b4fba..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/xopen_lim.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * Never include this file directly; use <limits.h> instead.
- */
-
-/* Additional definitions from X/Open Portability Guide, Issue 4, Version 2
-   System Interfaces and Headers, 4.16 <limits.h>
-
-   Please note only the values which are not greater than the minimum
-   stated in the standard document are listed.  The `sysconf' functions
-   should be used to obtain the actual value.  */
-
-#ifndef _XOPEN_LIM_H
-#define _XOPEN_LIM_H	1
-
-#define __need_IOV_MAX
-#include <bits/stdio_lim.h>
-
-/* We do not provide fixed values for
-
-   ARG_MAX	Maximum length of argument to the `exec' function
-		including environment data.
-
-   ATEXIT_MAX	Maximum number of functions that may be registered
-		with `atexit'.
-
-   CHILD_MAX	Maximum number of simultaneous processes per real
-		user ID.
-
-   OPEN_MAX	Maximum number of files that one process can have open
-		at anyone time.
-
-   PAGESIZE
-   PAGE_SIZE	Size of bytes of a page.
-
-   PASS_MAX	Maximum number of significant bytes in a password.
-
-   We only provide a fixed limit for
-
-   IOV_MAX	Maximum number of `iovec' structures that one process has
-		available for use with `readv' or writev'.
-
-   if this is indeed fixed by the underlying system.
-*/
-
-
-/* Maximum number of `iovec' structures that one process has available
-   for use with `readv' or writev'.  */
-#define	_XOPEN_IOV_MAX	_POSIX_UIO_MAXIOV
-
-
-/* Maximum value of `digit' in calls to the `printf' and `scanf'
-   functions.  We have no limit, so return a reasonable value.  */
-#define NL_ARGMAX	_POSIX_ARG_MAX
-
-/* Maximum number of bytes in a `LANG' name.  We have no limit.  */
-#define NL_LANGMAX	_POSIX2_LINE_MAX
-
-/* Maximum message number.  We have no limit.  */
-#define NL_MSGMAX	INT_MAX
-
-/* Maximum number of bytes in N-to-1 collation mapping.  We have no
-   limit.  */
-#define NL_NMAX		INT_MAX
-
-/* Maximum set number.  We have no limit.  */
-#define NL_SETMAX	INT_MAX
-
-/* Maximum number of bytes in a message.  We have no limit.  */
-#define NL_TEXTMAX	INT_MAX
-
-/* Default process priority.  */
-#define NZERO		20
-
-
-/* Number of bits in a word of type `int'.  */
-#ifdef INT_MAX
-# if INT_MAX == 32767
-#  define WORD_BIT	16
-# else
-#  if INT_MAX == 2147483647
-#   define WORD_BIT	32
-#  else
-/* Safe assumption.  */
-#   define WORD_BIT	64
-#  endif
-# endif
-#elif defined __INT_MAX__
-# if __INT_MAX__ == 32767
-#  define WORD_BIT	16
-# else
-#  if __INT_MAX__ == 2147483647
-#   define WORD_BIT	32
-#  else
-/* Safe assumption.  */
-#   define WORD_BIT	64
-#  endif
-# endif
-#else
-# define WORD_BIT	32
-#endif
-
-/* Number of bits in a word of type `long int'.  */
-#ifdef LONG_MAX
-# if LONG_MAX == 2147483647
-#  define LONG_BIT	32
-# else
-/* Safe assumption.  */
-#  define LONG_BIT	64
-# endif
-#elif defined __LONG_MAX__
-# if __LONG_MAX__ == 2147483647
-#  define LONG_BIT	32
-# else
-/* Safe assumption.  */
-#  define LONG_BIT	64
-# endif
-#else
-# include <bits/wordsize.h>
-# if __WORDSIZE == 64
-#  define LONG_BIT	64
-# else
-#  define LONG_BIT	32
-# endif
-#endif
-
-#endif /* bits/xopen_lim.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/bits/xtitypes.h b/openflow/usr/include/arm-linux-gnueabihf/bits/xtitypes.h
deleted file mode 100644
index d794cf4..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/bits/xtitypes.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* bits/xtitypes.h -- Define some types used by <bits/stropts.h>.  Generic.
-   Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STROPTS_H
-# error "Never include <bits/xtitypes.h> directly; use <stropts.h> instead."
-#endif
-
-#ifndef _BITS_XTITYPES_H
-#define _BITS_XTITYPES_H	1
-
-#include <bits/types.h>
-
-/* This type is used by some structs in <bits/stropts.h>.  */
-typedef __SLONGWORD_TYPE __t_scalar_t;
-typedef __ULONGWORD_TYPE __t_uscalar_t;
-
-
-#endif /* bits/xtitypes.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5.3.1 b/openflow/usr/include/arm-linux-gnueabihf/c++/5.3.1
deleted file mode 120000
index 7813681..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5.3.1
+++ /dev/null
@@ -1 +0,0 @@
-5
\ No newline at end of file
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/atomic_word.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/atomic_word.h
deleted file mode 100644
index 19038bb..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/atomic_word.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Low-level type for atomic operations -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file atomic_word.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_ATOMIC_WORD_H
-#define _GLIBCXX_ATOMIC_WORD_H	1
-
-typedef int _Atomic_word;
-
-// Define these two macros using the appropriate memory barrier for the target.
-// The commented out versions below are the defaults.
-// See ia64/atomic_word.h for an alternative approach.
-
-// This one prevents loads from being hoisted across the barrier;
-// in other words, this is a Load-Load acquire barrier.
-// This is necessary iff TARGET_RELAXED_ORDERING is defined in tm.h.  
-// #define _GLIBCXX_READ_MEM_BARRIER __asm __volatile ("":::"memory")
-
-// This one prevents stores from being sunk across the barrier; in other
-// words, a Store-Store release barrier.
-// #define _GLIBCXX_WRITE_MEM_BARRIER __asm __volatile ("":::"memory")
-
-#endif 
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/basic_file.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/basic_file.h
deleted file mode 100644
index bdd15c1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/basic_file.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// Wrapper of C-language FILE struct -*- C++ -*-
-
-// Copyright (C) 2000-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-//
-// ISO C++ 14882: 27.8  File-based streams
-//
-
-/** @file bits/basic_file.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ios}
- */
-
-#ifndef _GLIBCXX_BASIC_FILE_STDIO_H
-#define _GLIBCXX_BASIC_FILE_STDIO_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/c++io.h>  // for __c_lock and __c_file
-#include <bits/move.h>   // for swap
-#include <ios>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Generic declaration.
-  template<typename _CharT>
-    class __basic_file; 
-
-  // Specialization.
-  template<>
-    class __basic_file<char>
-    {
-      // Underlying data source/sink.
-      __c_file* 	_M_cfile;
-
-      // True iff we opened _M_cfile, and thus must close it ourselves.
-      bool 		_M_cfile_created;
-
-    public:
-      __basic_file(__c_lock* __lock = 0) throw ();
-
-#if __cplusplus >= 201103L
-      __basic_file(__basic_file&& __rv, __c_lock* __lock = 0) noexcept
-      : _M_cfile(__rv._M_cfile), _M_cfile_created(__rv._M_cfile_created)
-      {
-	__rv._M_cfile = nullptr;
-	__rv._M_cfile_created = false;
-      }
-
-      __basic_file& operator=(const __basic_file&) = delete;
-      __basic_file& operator=(__basic_file&&) = delete;
-
-      void
-      swap(__basic_file& __f) noexcept
-      {
-	std::swap(_M_cfile, __f._M_cfile);
-	std::swap(_M_cfile_created, __f._M_cfile_created);
-      }
-#endif
-
-      __basic_file* 
-      open(const char* __name, ios_base::openmode __mode, int __prot = 0664);
-
-      __basic_file*
-      sys_open(__c_file* __file, ios_base::openmode);
-
-      __basic_file*
-      sys_open(int __fd, ios_base::openmode __mode) throw ();
-
-      __basic_file* 
-      close(); 
-
-      _GLIBCXX_PURE bool 
-      is_open() const throw ();
-
-      _GLIBCXX_PURE int 
-      fd() throw ();
-
-      _GLIBCXX_PURE __c_file*
-      file() throw ();
-
-      ~__basic_file();
-
-      streamsize 
-      xsputn(const char* __s, streamsize __n);
-
-      streamsize 
-      xsputn_2(const char* __s1, streamsize __n1,
-	       const char* __s2, streamsize __n2);
-
-      streamsize 
-      xsgetn(char* __s, streamsize __n);
-
-      streamoff
-      seekoff(streamoff __off, ios_base::seekdir __way) throw ();
-
-      int 
-      sync();
-
-      streamsize
-      showmanyc();
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif	
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++allocator.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++allocator.h
deleted file mode 100644
index 4dcd1d4..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++allocator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Base to std::allocator -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/c++allocator.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _GLIBCXX_CXX_ALLOCATOR_H
-#define _GLIBCXX_CXX_ALLOCATOR_H 1
-
-#include <ext/new_allocator.h>
-
-#if __cplusplus >= 201103L
-namespace std
-{
-  /**
-   *  @brief  An alias to the base class for std::allocator.
-   *  @ingroup allocators
-   *
-   *  Used to set the std::allocator base class to
-   *  __gnu_cxx::new_allocator.
-   *
-   *  @tparam  _Tp  Type of allocated object.
-    */
-  template<typename _Tp>
-    using __allocator_base = __gnu_cxx::new_allocator<_Tp>;
-}
-#else
-// Define new_allocator as the base class to std::allocator.
-# define __allocator_base  __gnu_cxx::new_allocator
-#endif
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++config.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++config.h
deleted file mode 100644
index 85f6c8a..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++config.h
+++ /dev/null
@@ -1,1768 +0,0 @@
-// Predefined symbols and macros -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/c++config.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iosfwd}
- */
-
-#ifndef _GLIBCXX_CXX_CONFIG_H
-#define _GLIBCXX_CXX_CONFIG_H 1
-
-// The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20160413
-
-// Macros for various attributes.
-//   _GLIBCXX_PURE
-//   _GLIBCXX_CONST
-//   _GLIBCXX_NORETURN
-//   _GLIBCXX_NOTHROW
-//   _GLIBCXX_VISIBILITY
-#ifndef _GLIBCXX_PURE
-# define _GLIBCXX_PURE __attribute__ ((__pure__))
-#endif
-
-#ifndef _GLIBCXX_CONST
-# define _GLIBCXX_CONST __attribute__ ((__const__))
-#endif
-
-#ifndef _GLIBCXX_NORETURN
-# define _GLIBCXX_NORETURN __attribute__ ((__noreturn__))
-#endif
-
-// See below for C++
-#ifndef _GLIBCXX_NOTHROW
-# ifndef __cplusplus
-#  define _GLIBCXX_NOTHROW __attribute__((__nothrow__))
-# endif
-#endif
-
-// Macros for visibility attributes.
-//   _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY
-//   _GLIBCXX_VISIBILITY
-# define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY 1
-
-#if _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY
-# define _GLIBCXX_VISIBILITY(V) __attribute__ ((__visibility__ (#V)))
-#else
-// If this is not supplied by the OS-specific or CPU-specific
-// headers included below, it will be defined to an empty default.
-# define _GLIBCXX_VISIBILITY(V) _GLIBCXX_PSEUDO_VISIBILITY(V)
-#endif
-
-// Macros for deprecated attributes.
-//   _GLIBCXX_USE_DEPRECATED
-//   _GLIBCXX_DEPRECATED
-#ifndef _GLIBCXX_USE_DEPRECATED
-# define _GLIBCXX_USE_DEPRECATED 1
-#endif
-
-#if defined(__DEPRECATED) && (__cplusplus >= 201103L)
-# define _GLIBCXX_DEPRECATED __attribute__ ((__deprecated__))
-#else
-# define _GLIBCXX_DEPRECATED
-#endif
-
-// Macros for ABI tag attributes.
-#ifndef _GLIBCXX_ABI_TAG_CXX11
-# define _GLIBCXX_ABI_TAG_CXX11 __attribute ((__abi_tag__ ("cxx11")))
-#endif
-
-
-#if __cplusplus
-
-// Macro for constexpr, to support in mixed 03/0x mode.
-#ifndef _GLIBCXX_CONSTEXPR
-# if __cplusplus >= 201103L
-#  define _GLIBCXX_CONSTEXPR constexpr
-#  define _GLIBCXX_USE_CONSTEXPR constexpr
-# else
-#  define _GLIBCXX_CONSTEXPR
-#  define _GLIBCXX_USE_CONSTEXPR const
-# endif
-#endif
-
-#ifndef _GLIBCXX14_CONSTEXPR
-# if __cplusplus >= 201402L
-#  define _GLIBCXX14_CONSTEXPR constexpr
-# else
-#  define _GLIBCXX14_CONSTEXPR
-# endif
-#endif
-
-// Macro for noexcept, to support in mixed 03/0x mode.
-#ifndef _GLIBCXX_NOEXCEPT
-# if __cplusplus >= 201103L
-#  define _GLIBCXX_NOEXCEPT noexcept
-#  define _GLIBCXX_USE_NOEXCEPT noexcept
-#  define _GLIBCXX_THROW(_EXC)
-# else
-#  define _GLIBCXX_NOEXCEPT
-#  define _GLIBCXX_USE_NOEXCEPT throw()
-#  define _GLIBCXX_THROW(_EXC) throw(_EXC)
-# endif
-#endif
-
-#ifndef _GLIBCXX_NOTHROW
-# define _GLIBCXX_NOTHROW _GLIBCXX_USE_NOEXCEPT
-#endif
-
-#ifndef _GLIBCXX_THROW_OR_ABORT
-# if __cpp_exceptions
-#  define _GLIBCXX_THROW_OR_ABORT(_EXC) (throw (_EXC))
-# else
-#  define _GLIBCXX_THROW_OR_ABORT(_EXC) (__builtin_abort())
-# endif
-#endif
-
-// Macro for extern template, ie controling template linkage via use
-// of extern keyword on template declaration. As documented in the g++
-// manual, it inhibits all implicit instantiations and is used
-// throughout the library to avoid multiple weak definitions for
-// required types that are already explicitly instantiated in the
-// library binary. This substantially reduces the binary size of
-// resulting executables.
-// Special case: _GLIBCXX_EXTERN_TEMPLATE == -1 disallows extern
-// templates only in basic_string, thus activating its debug-mode
-// checks even at -O0.
-# define _GLIBCXX_EXTERN_TEMPLATE 1
-
-/*
-  Outline of libstdc++ namespaces.
-
-  namespace std
-  {
-    namespace __debug { }
-    namespace __parallel { }
-    namespace __profile { }
-    namespace __cxx1998 { }
-
-    namespace __detail { }
-
-    namespace rel_ops { }
-
-    namespace tr1
-    {
-      namespace placeholders { }
-      namespace regex_constants { }
-      namespace __detail { }
-    }
-
-    namespace tr2 { }
-    
-    namespace decimal { }
-
-    namespace chrono { }
-    namespace placeholders { }
-    namespace regex_constants { }
-    namespace this_thread { }
-
-    namespace experimental { }
-  }
-
-  namespace abi { }
-
-  namespace __gnu_cxx
-  {
-    namespace __detail { }
-  }
-
-  For full details see:
-  http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/namespaces.html
-*/
-namespace std
-{
-  typedef __SIZE_TYPE__ 	size_t;
-  typedef __PTRDIFF_TYPE__	ptrdiff_t;
-
-#if __cplusplus >= 201103L
-  typedef decltype(nullptr)	nullptr_t;
-#endif
-}
-
-# define _GLIBCXX_USE_DUAL_ABI 1
-
-#if ! _GLIBCXX_USE_DUAL_ABI
-// Ignore any pre-defined value of _GLIBCXX_USE_CXX11_ABI
-# undef _GLIBCXX_USE_CXX11_ABI
-#endif
-
-#ifndef _GLIBCXX_USE_CXX11_ABI
-# define _GLIBCXX_USE_CXX11_ABI 1
-#endif
-
-#if _GLIBCXX_USE_CXX11_ABI
-namespace std
-{
-  inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { }
-}
-namespace __gnu_cxx
-{
-  inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { }
-}
-# define _GLIBCXX_NAMESPACE_CXX11 __cxx11::
-# define _GLIBCXX_BEGIN_NAMESPACE_CXX11 namespace __cxx11 {
-# define _GLIBCXX_END_NAMESPACE_CXX11 }
-# define _GLIBCXX_DEFAULT_ABI_TAG _GLIBCXX_ABI_TAG_CXX11
-#else
-# define _GLIBCXX_NAMESPACE_CXX11
-# define _GLIBCXX_BEGIN_NAMESPACE_CXX11
-# define _GLIBCXX_END_NAMESPACE_CXX11
-# define _GLIBCXX_DEFAULT_ABI_TAG
-#endif
-
-
-// Defined if inline namespaces are used for versioning.
-# define _GLIBCXX_INLINE_VERSION 0 
-
-// Inline namespace for symbol versioning.
-#if _GLIBCXX_INLINE_VERSION
-
-namespace std
-{
-  inline namespace __7 { }
-
-  namespace rel_ops { inline namespace __7 { } }
-
-  namespace tr1
-  {
-    inline namespace __7 { }
-    namespace placeholders { inline namespace __7 { } }
-    namespace regex_constants { inline namespace __7 { } }
-    namespace __detail { inline namespace __7 { } }
-  }
-
-  namespace tr2
-  { inline namespace __7 { } }
-
-  namespace decimal { inline namespace __7 { } }
-
-  namespace chrono { inline namespace __7 { } }
-  namespace placeholders { inline namespace __7 { } }
-  namespace regex_constants { inline namespace __7 { } }
-  namespace this_thread { inline namespace __7 { } }
-
-  namespace experimental { inline namespace __7 { } }
-
-  namespace __detail { inline namespace __7 { } }
-}
-
-namespace __gnu_cxx
-{
-  inline namespace __7 { }
-  namespace __detail { inline namespace __7 { } }
-}
-# define _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __7 {
-# define _GLIBCXX_END_NAMESPACE_VERSION }
-#else
-# define _GLIBCXX_BEGIN_NAMESPACE_VERSION
-# define _GLIBCXX_END_NAMESPACE_VERSION
-#endif
-
-
-// Inline namespaces for special modes: debug, parallel, profile.
-#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL) \
-    || defined(_GLIBCXX_PROFILE)
-namespace std
-{
-  // Non-inline namespace for components replaced by alternates in active mode.
-  namespace __cxx1998
-  {
-# if _GLIBCXX_INLINE_VERSION
-  inline namespace __7 { }
-# endif
-
-# if _GLIBCXX_USE_CXX11_ABI
-  inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { }
-# endif
-  }
-
-  // Inline namespace for debug mode.
-# ifdef _GLIBCXX_DEBUG
-  inline namespace __debug { }
-# endif
-
-  // Inline namespaces for parallel mode.
-# ifdef _GLIBCXX_PARALLEL
-  inline namespace __parallel { }
-# endif
-
-  // Inline namespaces for profile mode
-# ifdef _GLIBCXX_PROFILE
-  inline namespace __profile { }
-# endif
-}
-
-// Check for invalid usage and unsupported mixed-mode use.
-# if defined(_GLIBCXX_DEBUG) && defined(_GLIBCXX_PARALLEL)
-#  error illegal use of multiple inlined namespaces
-# endif
-# if defined(_GLIBCXX_PROFILE) && defined(_GLIBCXX_DEBUG)
-#  error illegal use of multiple inlined namespaces
-# endif
-# if defined(_GLIBCXX_PROFILE) && defined(_GLIBCXX_PARALLEL)
-#  error illegal use of multiple inlined namespaces
-# endif
-
-// Check for invalid use due to lack for weak symbols.
-# if __NO_INLINE__ && !__GXX_WEAK__
-#  warning currently using inlined namespace mode which may fail \
-   without inlining due to lack of weak symbols
-# endif
-#endif
-
-// Macros for namespace scope. Either namespace std:: or the name
-// of some nested namespace within it corresponding to the active mode.
-// _GLIBCXX_STD_A
-// _GLIBCXX_STD_C
-//
-// Macros for opening/closing conditional namespaces.
-// _GLIBCXX_BEGIN_NAMESPACE_ALGO
-// _GLIBCXX_END_NAMESPACE_ALGO
-// _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-// _GLIBCXX_END_NAMESPACE_CONTAINER
-#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PROFILE)
-# define _GLIBCXX_STD_C __cxx1998
-# define _GLIBCXX_BEGIN_NAMESPACE_CONTAINER \
-	 namespace _GLIBCXX_STD_C { _GLIBCXX_BEGIN_NAMESPACE_VERSION
-# define _GLIBCXX_END_NAMESPACE_CONTAINER \
-	 _GLIBCXX_END_NAMESPACE_VERSION }
-# undef _GLIBCXX_EXTERN_TEMPLATE
-# define _GLIBCXX_EXTERN_TEMPLATE -1
-#endif
-
-#ifdef _GLIBCXX_PARALLEL
-# define _GLIBCXX_STD_A __cxx1998
-# define _GLIBCXX_BEGIN_NAMESPACE_ALGO \
-	 namespace _GLIBCXX_STD_A { _GLIBCXX_BEGIN_NAMESPACE_VERSION
-# define _GLIBCXX_END_NAMESPACE_ALGO \
-	 _GLIBCXX_END_NAMESPACE_VERSION }
-#endif
-
-#ifndef _GLIBCXX_STD_A
-# define _GLIBCXX_STD_A std
-#endif
-
-#ifndef _GLIBCXX_STD_C
-# define _GLIBCXX_STD_C std
-#endif
-
-#ifndef _GLIBCXX_BEGIN_NAMESPACE_ALGO
-# define _GLIBCXX_BEGIN_NAMESPACE_ALGO
-#endif
-
-#ifndef _GLIBCXX_END_NAMESPACE_ALGO
-# define _GLIBCXX_END_NAMESPACE_ALGO
-#endif
-
-#ifndef _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-# define _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-#endif
-
-#ifndef _GLIBCXX_END_NAMESPACE_CONTAINER
-# define _GLIBCXX_END_NAMESPACE_CONTAINER
-#endif
-
-// GLIBCXX_ABI Deprecated
-// Define if compatibility should be provided for -mlong-double-64.
-#undef _GLIBCXX_LONG_DOUBLE_COMPAT
-
-// Inline namespace for long double 128 mode.
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
-namespace std
-{
-  inline namespace __gnu_cxx_ldbl128 { }
-}
-# define _GLIBCXX_NAMESPACE_LDBL __gnu_cxx_ldbl128::
-# define _GLIBCXX_BEGIN_NAMESPACE_LDBL namespace __gnu_cxx_ldbl128 {
-# define _GLIBCXX_END_NAMESPACE_LDBL }
-#else
-# define _GLIBCXX_NAMESPACE_LDBL
-# define _GLIBCXX_BEGIN_NAMESPACE_LDBL
-# define _GLIBCXX_END_NAMESPACE_LDBL
-#endif
-#if _GLIBCXX_USE_CXX11_ABI
-# define _GLIBCXX_NAMESPACE_LDBL_OR_CXX11 _GLIBCXX_NAMESPACE_CXX11
-# define _GLIBCXX_BEGIN_NAMESPACE_LDBL_OR_CXX11 _GLIBCXX_BEGIN_NAMESPACE_CXX11
-# define _GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11 _GLIBCXX_END_NAMESPACE_CXX11
-#else
-# define _GLIBCXX_NAMESPACE_LDBL_OR_CXX11 _GLIBCXX_NAMESPACE_LDBL
-# define _GLIBCXX_BEGIN_NAMESPACE_LDBL_OR_CXX11 _GLIBCXX_BEGIN_NAMESPACE_LDBL
-# define _GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11 _GLIBCXX_END_NAMESPACE_LDBL
-#endif
-
-// Assert.
-#if !defined(_GLIBCXX_DEBUG) && !defined(_GLIBCXX_PARALLEL)
-# define __glibcxx_assert(_Condition)
-#else
-namespace std
-{
-  // Avoid the use of assert, because we're trying to keep the <cassert>
-  // include out of the mix.
-  inline void
-  __replacement_assert(const char* __file, int __line,
-		       const char* __function, const char* __condition)
-  {
-    __builtin_printf("%s:%d: %s: Assertion '%s' failed.\n", __file, __line,
-		     __function, __condition);
-    __builtin_abort();
-  }
-}
-#define __glibcxx_assert(_Condition)				   	 \
-  do 									 \
-  {							      		 \
-    if (! (_Condition))                                                  \
-      std::__replacement_assert(__FILE__, __LINE__, __PRETTY_FUNCTION__, \
-				#_Condition);				 \
-  } while (false)
-#endif
-
-// Macros for race detectors.
-// _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(A) and
-// _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(A) should be used to explain
-// atomic (lock-free) synchronization to race detectors:
-// the race detector will infer a happens-before arc from the former to the
-// latter when they share the same argument pointer.
-//
-// The most frequent use case for these macros (and the only case in the
-// current implementation of the library) is atomic reference counting:
-//   void _M_remove_reference()
-//   {
-//     _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&this->_M_refcount);
-//     if (__gnu_cxx::__exchange_and_add_dispatch(&this->_M_refcount, -1) <= 0)
-//       {
-//         _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&this->_M_refcount);
-//         _M_destroy(__a);
-//       }
-//   }
-// The annotations in this example tell the race detector that all memory
-// accesses occurred when the refcount was positive do not race with
-// memory accesses which occurred after the refcount became zero.
-#ifndef _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE
-# define  _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(A)
-#endif
-#ifndef _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER
-# define  _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(A)
-#endif
-
-// Macros for C linkage: define extern "C" linkage only when using C++.
-# define _GLIBCXX_BEGIN_EXTERN_C extern "C" {
-# define _GLIBCXX_END_EXTERN_C }
-
-#else // !__cplusplus
-# define _GLIBCXX_BEGIN_EXTERN_C
-# define _GLIBCXX_END_EXTERN_C
-#endif
-
-
-// First includes.
-
-// Pick up any OS-specific definitions.
-#include <bits/os_defines.h>
-
-// Pick up any CPU-specific definitions.
-#include <bits/cpu_defines.h>
-
-// If platform uses neither visibility nor psuedo-visibility,
-// specify empty default for namespace annotation macros.
-#ifndef _GLIBCXX_PSEUDO_VISIBILITY
-# define _GLIBCXX_PSEUDO_VISIBILITY(V)
-#endif
-
-// Certain function definitions that are meant to be overridable from
-// user code are decorated with this macro.  For some targets, this
-// macro causes these definitions to be weak.
-#ifndef _GLIBCXX_WEAK_DEFINITION
-# define _GLIBCXX_WEAK_DEFINITION
-#endif
-
-
-// The remainder of the prewritten config is automatic; all the
-// user hooks are listed above.
-
-// Create a boolean flag to be used to determine if --fast-math is set.
-#ifdef __FAST_MATH__
-# define _GLIBCXX_FAST_MATH 1
-#else
-# define _GLIBCXX_FAST_MATH 0
-#endif
-
-// This marks string literals in header files to be extracted for eventual
-// translation.  It is primarily used for messages in thrown exceptions; see
-// src/functexcept.cc.  We use __N because the more traditional _N is used
-// for something else under certain OSes (see BADNAMES).
-#define __N(msgid)     (msgid)
-
-// For example, <windows.h> is known to #define min and max as macros...
-#undef min
-#undef max
-
-// End of prewritten config; the settings discovered at configure time follow.
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the `acosf' function. */
-#define _GLIBCXX_HAVE_ACOSF 1
-
-/* Define to 1 if you have the `acosl' function. */
-#define _GLIBCXX_HAVE_ACOSL 1
-
-/* Define to 1 if you have the `asinf' function. */
-#define _GLIBCXX_HAVE_ASINF 1
-
-/* Define to 1 if you have the `asinl' function. */
-#define _GLIBCXX_HAVE_ASINL 1
-
-/* Define to 1 if the target assembler supports .symver directive. */
-#define _GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE 1
-
-/* Define to 1 if you have the `atan2f' function. */
-#define _GLIBCXX_HAVE_ATAN2F 1
-
-/* Define to 1 if you have the `atan2l' function. */
-#define _GLIBCXX_HAVE_ATAN2L 1
-
-/* Define to 1 if you have the `atanf' function. */
-#define _GLIBCXX_HAVE_ATANF 1
-
-/* Define to 1 if you have the `atanl' function. */
-#define _GLIBCXX_HAVE_ATANL 1
-
-/* Define to 1 if you have the `at_quick_exit' function. */
-#define _GLIBCXX_HAVE_AT_QUICK_EXIT 1
-
-/* Define to 1 if the target assembler supports thread-local storage. */
-/* #undef _GLIBCXX_HAVE_CC_TLS */
-
-/* Define to 1 if you have the `ceilf' function. */
-#define _GLIBCXX_HAVE_CEILF 1
-
-/* Define to 1 if you have the `ceill' function. */
-#define _GLIBCXX_HAVE_CEILL 1
-
-/* Define to 1 if you have the <complex.h> header file. */
-#define _GLIBCXX_HAVE_COMPLEX_H 1
-
-/* Define to 1 if you have the `cosf' function. */
-#define _GLIBCXX_HAVE_COSF 1
-
-/* Define to 1 if you have the `coshf' function. */
-#define _GLIBCXX_HAVE_COSHF 1
-
-/* Define to 1 if you have the `coshl' function. */
-#define _GLIBCXX_HAVE_COSHL 1
-
-/* Define to 1 if you have the `cosl' function. */
-#define _GLIBCXX_HAVE_COSL 1
-
-/* Define to 1 if you have the <dirent.h> header file. */
-#define _GLIBCXX_HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define _GLIBCXX_HAVE_DLFCN_H 1
-
-/* Define if EBADMSG exists. */
-#define _GLIBCXX_HAVE_EBADMSG 1
-
-/* Define if ECANCELED exists. */
-#define _GLIBCXX_HAVE_ECANCELED 1
-
-/* Define if ECHILD exists. */
-#define _GLIBCXX_HAVE_ECHILD 1
-
-/* Define if EIDRM exists. */
-#define _GLIBCXX_HAVE_EIDRM 1
-
-/* Define to 1 if you have the <endian.h> header file. */
-#define _GLIBCXX_HAVE_ENDIAN_H 1
-
-/* Define if ENODATA exists. */
-#define _GLIBCXX_HAVE_ENODATA 1
-
-/* Define if ENOLINK exists. */
-#define _GLIBCXX_HAVE_ENOLINK 1
-
-/* Define if ENOSPC exists. */
-#define _GLIBCXX_HAVE_ENOSPC 1
-
-/* Define if ENOSR exists. */
-#define _GLIBCXX_HAVE_ENOSR 1
-
-/* Define if ENOSTR exists. */
-#define _GLIBCXX_HAVE_ENOSTR 1
-
-/* Define if ENOTRECOVERABLE exists. */
-#define _GLIBCXX_HAVE_ENOTRECOVERABLE 1
-
-/* Define if ENOTSUP exists. */
-#define _GLIBCXX_HAVE_ENOTSUP 1
-
-/* Define if EOVERFLOW exists. */
-#define _GLIBCXX_HAVE_EOVERFLOW 1
-
-/* Define if EOWNERDEAD exists. */
-#define _GLIBCXX_HAVE_EOWNERDEAD 1
-
-/* Define if EPERM exists. */
-#define _GLIBCXX_HAVE_EPERM 1
-
-/* Define if EPROTO exists. */
-#define _GLIBCXX_HAVE_EPROTO 1
-
-/* Define if ETIME exists. */
-#define _GLIBCXX_HAVE_ETIME 1
-
-/* Define if ETIMEDOUT exists. */
-#define _GLIBCXX_HAVE_ETIMEDOUT 1
-
-/* Define if ETXTBSY exists. */
-#define _GLIBCXX_HAVE_ETXTBSY 1
-
-/* Define if EWOULDBLOCK exists. */
-#define _GLIBCXX_HAVE_EWOULDBLOCK 1
-
-/* Define to 1 if you have the <execinfo.h> header file. */
-#define _GLIBCXX_HAVE_EXECINFO_H 1
-
-/* Define to 1 if you have the `expf' function. */
-#define _GLIBCXX_HAVE_EXPF 1
-
-/* Define to 1 if you have the `expl' function. */
-#define _GLIBCXX_HAVE_EXPL 1
-
-/* Define to 1 if you have the `fabsf' function. */
-#define _GLIBCXX_HAVE_FABSF 1
-
-/* Define to 1 if you have the `fabsl' function. */
-#define _GLIBCXX_HAVE_FABSL 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define _GLIBCXX_HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the <fenv.h> header file. */
-#define _GLIBCXX_HAVE_FENV_H 1
-
-/* Define to 1 if you have the `finite' function. */
-#define _GLIBCXX_HAVE_FINITE 1
-
-/* Define to 1 if you have the `finitef' function. */
-#define _GLIBCXX_HAVE_FINITEF 1
-
-/* Define to 1 if you have the `finitel' function. */
-#define _GLIBCXX_HAVE_FINITEL 1
-
-/* Define to 1 if you have the <float.h> header file. */
-#define _GLIBCXX_HAVE_FLOAT_H 1
-
-/* Define to 1 if you have the `floorf' function. */
-#define _GLIBCXX_HAVE_FLOORF 1
-
-/* Define to 1 if you have the `floorl' function. */
-#define _GLIBCXX_HAVE_FLOORL 1
-
-/* Define to 1 if you have the `fmodf' function. */
-#define _GLIBCXX_HAVE_FMODF 1
-
-/* Define to 1 if you have the `fmodl' function. */
-#define _GLIBCXX_HAVE_FMODL 1
-
-/* Define to 1 if you have the `fpclass' function. */
-/* #undef _GLIBCXX_HAVE_FPCLASS */
-
-/* Define to 1 if you have the <fp.h> header file. */
-/* #undef _GLIBCXX_HAVE_FP_H */
-
-/* Define to 1 if you have the `frexpf' function. */
-#define _GLIBCXX_HAVE_FREXPF 1
-
-/* Define to 1 if you have the `frexpl' function. */
-#define _GLIBCXX_HAVE_FREXPL 1
-
-/* Define if _Unwind_GetIPInfo is available. */
-#define _GLIBCXX_HAVE_GETIPINFO 1
-
-/* Define if gets is available in <stdio.h>. */
-#define _GLIBCXX_HAVE_GETS 1
-
-/* Define to 1 if you have the `hypot' function. */
-#define _GLIBCXX_HAVE_HYPOT 1
-
-/* Define to 1 if you have the `hypotf' function. */
-#define _GLIBCXX_HAVE_HYPOTF 1
-
-/* Define to 1 if you have the `hypotl' function. */
-#define _GLIBCXX_HAVE_HYPOTL 1
-
-/* Define if you have the iconv() function. */
-#define _GLIBCXX_HAVE_ICONV 1
-
-/* Define to 1 if you have the <ieeefp.h> header file. */
-/* #undef _GLIBCXX_HAVE_IEEEFP_H */
-
-/* Define if int64_t is available in <stdint.h>. */
-#define _GLIBCXX_HAVE_INT64_T 1
-
-/* Define if int64_t is a long. */
-/* #undef _GLIBCXX_HAVE_INT64_T_LONG */
-
-/* Define if int64_t is a long long. */
-#define _GLIBCXX_HAVE_INT64_T_LONG_LONG 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define _GLIBCXX_HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `isinf' function. */
-/* #undef _GLIBCXX_HAVE_ISINF */
-
-/* Define to 1 if you have the `isinff' function. */
-#define _GLIBCXX_HAVE_ISINFF 1
-
-/* Define to 1 if you have the `isinfl' function. */
-#define _GLIBCXX_HAVE_ISINFL 1
-
-/* Define to 1 if you have the `isnan' function. */
-/* #undef _GLIBCXX_HAVE_ISNAN */
-
-/* Define to 1 if you have the `isnanf' function. */
-#define _GLIBCXX_HAVE_ISNANF 1
-
-/* Define to 1 if you have the `isnanl' function. */
-#define _GLIBCXX_HAVE_ISNANL 1
-
-/* Defined if iswblank exists. */
-#define _GLIBCXX_HAVE_ISWBLANK 1
-
-/* Define if LC_MESSAGES is available in <locale.h>. */
-#define _GLIBCXX_HAVE_LC_MESSAGES 1
-
-/* Define to 1 if you have the `ldexpf' function. */
-#define _GLIBCXX_HAVE_LDEXPF 1
-
-/* Define to 1 if you have the `ldexpl' function. */
-#define _GLIBCXX_HAVE_LDEXPL 1
-
-/* Define to 1 if you have the <libintl.h> header file. */
-#define _GLIBCXX_HAVE_LIBINTL_H 1
-
-/* Only used in build directory testsuite_hooks.h. */
-#define _GLIBCXX_HAVE_LIMIT_AS 1
-
-/* Only used in build directory testsuite_hooks.h. */
-#define _GLIBCXX_HAVE_LIMIT_DATA 1
-
-/* Only used in build directory testsuite_hooks.h. */
-#define _GLIBCXX_HAVE_LIMIT_FSIZE 1
-
-/* Only used in build directory testsuite_hooks.h. */
-#define _GLIBCXX_HAVE_LIMIT_RSS 1
-
-/* Only used in build directory testsuite_hooks.h. */
-#define _GLIBCXX_HAVE_LIMIT_VMEM 0
-
-/* Define if futex syscall is available. */
-#define _GLIBCXX_HAVE_LINUX_FUTEX 1
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define _GLIBCXX_HAVE_LOCALE_H 1
-
-/* Define to 1 if you have the `log10f' function. */
-#define _GLIBCXX_HAVE_LOG10F 1
-
-/* Define to 1 if you have the `log10l' function. */
-#define _GLIBCXX_HAVE_LOG10L 1
-
-/* Define to 1 if you have the `logf' function. */
-#define _GLIBCXX_HAVE_LOGF 1
-
-/* Define to 1 if you have the `logl' function. */
-#define _GLIBCXX_HAVE_LOGL 1
-
-/* Define to 1 if you have the <machine/endian.h> header file. */
-/* #undef _GLIBCXX_HAVE_MACHINE_ENDIAN_H */
-
-/* Define to 1 if you have the <machine/param.h> header file. */
-/* #undef _GLIBCXX_HAVE_MACHINE_PARAM_H */
-
-/* Define if mbstate_t exists in wchar.h. */
-#define _GLIBCXX_HAVE_MBSTATE_T 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define _GLIBCXX_HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `modf' function. */
-#define _GLIBCXX_HAVE_MODF 1
-
-/* Define to 1 if you have the `modff' function. */
-#define _GLIBCXX_HAVE_MODFF 1
-
-/* Define to 1 if you have the `modfl' function. */
-#define _GLIBCXX_HAVE_MODFL 1
-
-/* Define to 1 if you have the <nan.h> header file. */
-/* #undef _GLIBCXX_HAVE_NAN_H */
-
-/* Define if poll is available in <poll.h>. */
-#define _GLIBCXX_HAVE_POLL 1
-
-/* Define to 1 if you have the `powf' function. */
-#define _GLIBCXX_HAVE_POWF 1
-
-/* Define to 1 if you have the `powl' function. */
-#define _GLIBCXX_HAVE_POWL 1
-
-/* Define to 1 if you have the `qfpclass' function. */
-/* #undef _GLIBCXX_HAVE_QFPCLASS */
-
-/* Define to 1 if you have the `quick_exit' function. */
-#define _GLIBCXX_HAVE_QUICK_EXIT 1
-
-/* Define to 1 if you have the `setenv' function. */
-#define _GLIBCXX_HAVE_SETENV 1
-
-/* Define to 1 if you have the `sincos' function. */
-#define _GLIBCXX_HAVE_SINCOS 1
-
-/* Define to 1 if you have the `sincosf' function. */
-#define _GLIBCXX_HAVE_SINCOSF 1
-
-/* Define to 1 if you have the `sincosl' function. */
-#define _GLIBCXX_HAVE_SINCOSL 1
-
-/* Define to 1 if you have the `sinf' function. */
-#define _GLIBCXX_HAVE_SINF 1
-
-/* Define to 1 if you have the `sinhf' function. */
-#define _GLIBCXX_HAVE_SINHF 1
-
-/* Define to 1 if you have the `sinhl' function. */
-#define _GLIBCXX_HAVE_SINHL 1
-
-/* Define to 1 if you have the `sinl' function. */
-#define _GLIBCXX_HAVE_SINL 1
-
-/* Defined if sleep exists. */
-/* #undef _GLIBCXX_HAVE_SLEEP */
-
-/* Define to 1 if you have the `sqrtf' function. */
-#define _GLIBCXX_HAVE_SQRTF 1
-
-/* Define to 1 if you have the `sqrtl' function. */
-#define _GLIBCXX_HAVE_SQRTL 1
-
-/* Define to 1 if you have the <stdalign.h> header file. */
-#define _GLIBCXX_HAVE_STDALIGN_H 1
-
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define _GLIBCXX_HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define _GLIBCXX_HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define _GLIBCXX_HAVE_STDLIB_H 1
-
-/* Define if strerror_l is available in <string.h>. */
-#define _GLIBCXX_HAVE_STRERROR_L 1
-
-/* Define if strerror_r is available in <string.h>. */
-#define _GLIBCXX_HAVE_STRERROR_R 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define _GLIBCXX_HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define _GLIBCXX_HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strtof' function. */
-#define _GLIBCXX_HAVE_STRTOF 1
-
-/* Define to 1 if you have the `strtold' function. */
-#define _GLIBCXX_HAVE_STRTOLD 1
-
-/* Define to 1 if `d_type' is a member of `struct dirent'. */
-#define _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE 1
-
-/* Define if strxfrm_l is available in <string.h>. */
-#define _GLIBCXX_HAVE_STRXFRM_L 1
-
-/* Define to 1 if the target runtime linker supports binding the same symbol
-   to different versions. */
-#define _GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT 1
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef _GLIBCXX_HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define _GLIBCXX_HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/ipc.h> header file. */
-#define _GLIBCXX_HAVE_SYS_IPC_H 1
-
-/* Define to 1 if you have the <sys/isa_defs.h> header file. */
-/* #undef _GLIBCXX_HAVE_SYS_ISA_DEFS_H */
-
-/* Define to 1 if you have the <sys/machine.h> header file. */
-/* #undef _GLIBCXX_HAVE_SYS_MACHINE_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define _GLIBCXX_HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#define _GLIBCXX_HAVE_SYS_RESOURCE_H 1
-
-/* Define to 1 if you have a suitable <sys/sdt.h> header file */
-#define _GLIBCXX_HAVE_SYS_SDT_H 1
-
-/* Define to 1 if you have the <sys/sem.h> header file. */
-#define _GLIBCXX_HAVE_SYS_SEM_H 1
-
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-#define _GLIBCXX_HAVE_SYS_STATVFS_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define _GLIBCXX_HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/sysinfo.h> header file. */
-#define _GLIBCXX_HAVE_SYS_SYSINFO_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define _GLIBCXX_HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define _GLIBCXX_HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define _GLIBCXX_HAVE_SYS_UIO_H 1
-
-/* Define if S_IFREG is available in <sys/stat.h>. */
-/* #undef _GLIBCXX_HAVE_S_IFREG */
-
-/* Define if S_IFREG is available in <sys/stat.h>. */
-#define _GLIBCXX_HAVE_S_ISREG 1
-
-/* Define to 1 if you have the `tanf' function. */
-#define _GLIBCXX_HAVE_TANF 1
-
-/* Define to 1 if you have the `tanhf' function. */
-#define _GLIBCXX_HAVE_TANHF 1
-
-/* Define to 1 if you have the `tanhl' function. */
-#define _GLIBCXX_HAVE_TANHL 1
-
-/* Define to 1 if you have the `tanl' function. */
-#define _GLIBCXX_HAVE_TANL 1
-
-/* Define to 1 if you have the <tgmath.h> header file. */
-#define _GLIBCXX_HAVE_TGMATH_H 1
-
-/* Define to 1 if the target supports thread-local storage. */
-#define _GLIBCXX_HAVE_TLS 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define _GLIBCXX_HAVE_UNISTD_H 1
-
-/* Defined if usleep exists. */
-/* #undef _GLIBCXX_HAVE_USLEEP */
-
-/* Define to 1 if you have the <utime.h> header file. */
-#define _GLIBCXX_HAVE_UTIME_H 1
-
-/* Defined if vfwscanf exists. */
-#define _GLIBCXX_HAVE_VFWSCANF 1
-
-/* Defined if vswscanf exists. */
-#define _GLIBCXX_HAVE_VSWSCANF 1
-
-/* Defined if vwscanf exists. */
-#define _GLIBCXX_HAVE_VWSCANF 1
-
-/* Define to 1 if you have the <wchar.h> header file. */
-#define _GLIBCXX_HAVE_WCHAR_H 1
-
-/* Defined if wcstof exists. */
-#define _GLIBCXX_HAVE_WCSTOF 1
-
-/* Define to 1 if you have the <wctype.h> header file. */
-#define _GLIBCXX_HAVE_WCTYPE_H 1
-
-/* Defined if Sleep exists. */
-/* #undef _GLIBCXX_HAVE_WIN32_SLEEP */
-
-/* Define if writev is available in <sys/uio.h>. */
-#define _GLIBCXX_HAVE_WRITEV 1
-
-/* Define to 1 if you have the `_acosf' function. */
-/* #undef _GLIBCXX_HAVE__ACOSF */
-
-/* Define to 1 if you have the `_acosl' function. */
-/* #undef _GLIBCXX_HAVE__ACOSL */
-
-/* Define to 1 if you have the `_asinf' function. */
-/* #undef _GLIBCXX_HAVE__ASINF */
-
-/* Define to 1 if you have the `_asinl' function. */
-/* #undef _GLIBCXX_HAVE__ASINL */
-
-/* Define to 1 if you have the `_atan2f' function. */
-/* #undef _GLIBCXX_HAVE__ATAN2F */
-
-/* Define to 1 if you have the `_atan2l' function. */
-/* #undef _GLIBCXX_HAVE__ATAN2L */
-
-/* Define to 1 if you have the `_atanf' function. */
-/* #undef _GLIBCXX_HAVE__ATANF */
-
-/* Define to 1 if you have the `_atanl' function. */
-/* #undef _GLIBCXX_HAVE__ATANL */
-
-/* Define to 1 if you have the `_ceilf' function. */
-/* #undef _GLIBCXX_HAVE__CEILF */
-
-/* Define to 1 if you have the `_ceill' function. */
-/* #undef _GLIBCXX_HAVE__CEILL */
-
-/* Define to 1 if you have the `_cosf' function. */
-/* #undef _GLIBCXX_HAVE__COSF */
-
-/* Define to 1 if you have the `_coshf' function. */
-/* #undef _GLIBCXX_HAVE__COSHF */
-
-/* Define to 1 if you have the `_coshl' function. */
-/* #undef _GLIBCXX_HAVE__COSHL */
-
-/* Define to 1 if you have the `_cosl' function. */
-/* #undef _GLIBCXX_HAVE__COSL */
-
-/* Define to 1 if you have the `_expf' function. */
-/* #undef _GLIBCXX_HAVE__EXPF */
-
-/* Define to 1 if you have the `_expl' function. */
-/* #undef _GLIBCXX_HAVE__EXPL */
-
-/* Define to 1 if you have the `_fabsf' function. */
-/* #undef _GLIBCXX_HAVE__FABSF */
-
-/* Define to 1 if you have the `_fabsl' function. */
-/* #undef _GLIBCXX_HAVE__FABSL */
-
-/* Define to 1 if you have the `_finite' function. */
-/* #undef _GLIBCXX_HAVE__FINITE */
-
-/* Define to 1 if you have the `_finitef' function. */
-/* #undef _GLIBCXX_HAVE__FINITEF */
-
-/* Define to 1 if you have the `_finitel' function. */
-/* #undef _GLIBCXX_HAVE__FINITEL */
-
-/* Define to 1 if you have the `_floorf' function. */
-/* #undef _GLIBCXX_HAVE__FLOORF */
-
-/* Define to 1 if you have the `_floorl' function. */
-/* #undef _GLIBCXX_HAVE__FLOORL */
-
-/* Define to 1 if you have the `_fmodf' function. */
-/* #undef _GLIBCXX_HAVE__FMODF */
-
-/* Define to 1 if you have the `_fmodl' function. */
-/* #undef _GLIBCXX_HAVE__FMODL */
-
-/* Define to 1 if you have the `_fpclass' function. */
-/* #undef _GLIBCXX_HAVE__FPCLASS */
-
-/* Define to 1 if you have the `_frexpf' function. */
-/* #undef _GLIBCXX_HAVE__FREXPF */
-
-/* Define to 1 if you have the `_frexpl' function. */
-/* #undef _GLIBCXX_HAVE__FREXPL */
-
-/* Define to 1 if you have the `_hypot' function. */
-/* #undef _GLIBCXX_HAVE__HYPOT */
-
-/* Define to 1 if you have the `_hypotf' function. */
-/* #undef _GLIBCXX_HAVE__HYPOTF */
-
-/* Define to 1 if you have the `_hypotl' function. */
-/* #undef _GLIBCXX_HAVE__HYPOTL */
-
-/* Define to 1 if you have the `_isinf' function. */
-/* #undef _GLIBCXX_HAVE__ISINF */
-
-/* Define to 1 if you have the `_isinff' function. */
-/* #undef _GLIBCXX_HAVE__ISINFF */
-
-/* Define to 1 if you have the `_isinfl' function. */
-/* #undef _GLIBCXX_HAVE__ISINFL */
-
-/* Define to 1 if you have the `_isnan' function. */
-/* #undef _GLIBCXX_HAVE__ISNAN */
-
-/* Define to 1 if you have the `_isnanf' function. */
-/* #undef _GLIBCXX_HAVE__ISNANF */
-
-/* Define to 1 if you have the `_isnanl' function. */
-/* #undef _GLIBCXX_HAVE__ISNANL */
-
-/* Define to 1 if you have the `_ldexpf' function. */
-/* #undef _GLIBCXX_HAVE__LDEXPF */
-
-/* Define to 1 if you have the `_ldexpl' function. */
-/* #undef _GLIBCXX_HAVE__LDEXPL */
-
-/* Define to 1 if you have the `_log10f' function. */
-/* #undef _GLIBCXX_HAVE__LOG10F */
-
-/* Define to 1 if you have the `_log10l' function. */
-/* #undef _GLIBCXX_HAVE__LOG10L */
-
-/* Define to 1 if you have the `_logf' function. */
-/* #undef _GLIBCXX_HAVE__LOGF */
-
-/* Define to 1 if you have the `_logl' function. */
-/* #undef _GLIBCXX_HAVE__LOGL */
-
-/* Define to 1 if you have the `_modf' function. */
-/* #undef _GLIBCXX_HAVE__MODF */
-
-/* Define to 1 if you have the `_modff' function. */
-/* #undef _GLIBCXX_HAVE__MODFF */
-
-/* Define to 1 if you have the `_modfl' function. */
-/* #undef _GLIBCXX_HAVE__MODFL */
-
-/* Define to 1 if you have the `_powf' function. */
-/* #undef _GLIBCXX_HAVE__POWF */
-
-/* Define to 1 if you have the `_powl' function. */
-/* #undef _GLIBCXX_HAVE__POWL */
-
-/* Define to 1 if you have the `_qfpclass' function. */
-/* #undef _GLIBCXX_HAVE__QFPCLASS */
-
-/* Define to 1 if you have the `_sincos' function. */
-/* #undef _GLIBCXX_HAVE__SINCOS */
-
-/* Define to 1 if you have the `_sincosf' function. */
-/* #undef _GLIBCXX_HAVE__SINCOSF */
-
-/* Define to 1 if you have the `_sincosl' function. */
-/* #undef _GLIBCXX_HAVE__SINCOSL */
-
-/* Define to 1 if you have the `_sinf' function. */
-/* #undef _GLIBCXX_HAVE__SINF */
-
-/* Define to 1 if you have the `_sinhf' function. */
-/* #undef _GLIBCXX_HAVE__SINHF */
-
-/* Define to 1 if you have the `_sinhl' function. */
-/* #undef _GLIBCXX_HAVE__SINHL */
-
-/* Define to 1 if you have the `_sinl' function. */
-/* #undef _GLIBCXX_HAVE__SINL */
-
-/* Define to 1 if you have the `_sqrtf' function. */
-/* #undef _GLIBCXX_HAVE__SQRTF */
-
-/* Define to 1 if you have the `_sqrtl' function. */
-/* #undef _GLIBCXX_HAVE__SQRTL */
-
-/* Define to 1 if you have the `_tanf' function. */
-/* #undef _GLIBCXX_HAVE__TANF */
-
-/* Define to 1 if you have the `_tanhf' function. */
-/* #undef _GLIBCXX_HAVE__TANHF */
-
-/* Define to 1 if you have the `_tanhl' function. */
-/* #undef _GLIBCXX_HAVE__TANHL */
-
-/* Define to 1 if you have the `_tanl' function. */
-/* #undef _GLIBCXX_HAVE__TANL */
-
-/* Define to 1 if you have the `__cxa_thread_atexit_impl' function. */
-#define _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL 1
-
-/* Define as const if the declaration of iconv() needs const. */
-#define _GLIBCXX_ICONV_CONST 
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-/* #undef _GLIBCXX_PACKAGE */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define _GLIBCXX_PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define _GLIBCXX_PACKAGE_NAME "package-unused"
-
-/* Define to the full name and version of this package. */
-#define _GLIBCXX_PACKAGE_STRING "package-unused version-unused"
-
-/* Define to the one symbol short name of this package. */
-#define _GLIBCXX_PACKAGE_TARNAME "libstdc++"
-
-/* Define to the home page for this package. */
-#define _GLIBCXX_PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define _GLIBCXX_PACKAGE__GLIBCXX_VERSION "version-unused"
-
-/* The size of `char', as computed by sizeof. */
-/* #undef SIZEOF_CHAR */
-
-/* The size of `int', as computed by sizeof. */
-/* #undef SIZEOF_INT */
-
-/* The size of `long', as computed by sizeof. */
-/* #undef SIZEOF_LONG */
-
-/* The size of `short', as computed by sizeof. */
-/* #undef SIZEOF_SHORT */
-
-/* The size of `void *', as computed by sizeof. */
-/* #undef SIZEOF_VOID_P */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-/* #undef _GLIBCXX_VERSION */
-
-/* Define if the compiler supports C++11 atomics. */
-#define _GLIBCXX_ATOMIC_BUILTINS 1
-
-/* Define to use concept checking code from the boost libraries. */
-/* #undef _GLIBCXX_CONCEPT_CHECKS */
-
-/* Define to 1 if a fully dynamic basic_string is wanted, 0 to disable,
-   undefined for platform defaults */
-#define _GLIBCXX_FULLY_DYNAMIC_STRING 0
-
-/* Define if gthreads library is available. */
-#define _GLIBCXX_HAS_GTHREADS 1
-
-/* Define to 1 if a full hosted library is built, or 0 if freestanding. */
-#define _GLIBCXX_HOSTED 1
-
-/* Define if compatibility should be provided for -mlong-double-64. */
-
-/* Define if ptrdiff_t is int. */
-#define _GLIBCXX_PTRDIFF_T_IS_INT 1
-
-/* Define if using setrlimit to set resource limits during "make check" */
-#define _GLIBCXX_RES_LIMITS 1
-
-/* Define if size_t is unsigned int. */
-#define _GLIBCXX_SIZE_T_IS_UINT 1
-
-/* Define if the compiler is configured for setjmp/longjmp exceptions. */
-/* #undef _GLIBCXX_SJLJ_EXCEPTIONS */
-
-/* Define to the value of the EOF integer constant. */
-#define _GLIBCXX_STDIO_EOF -1
-
-/* Define to the value of the SEEK_CUR integer constant. */
-#define _GLIBCXX_STDIO_SEEK_CUR 1
-
-/* Define to the value of the SEEK_END integer constant. */
-#define _GLIBCXX_STDIO_SEEK_END 2
-
-/* Define to use symbol versioning in the shared library. */
-#define _GLIBCXX_SYMVER 1
-
-/* Define to use darwin versioning in the shared library. */
-/* #undef _GLIBCXX_SYMVER_DARWIN */
-
-/* Define to use GNU versioning in the shared library. */
-#define _GLIBCXX_SYMVER_GNU 1
-
-/* Define to use GNU namespace versioning in the shared library. */
-/* #undef _GLIBCXX_SYMVER_GNU_NAMESPACE */
-
-/* Define to use Sun versioning in the shared library. */
-/* #undef _GLIBCXX_SYMVER_SUN */
-
-/* Define if C99 functions or macros from <wchar.h>, <math.h>, <complex.h>,
-   <stdio.h>, and <stdlib.h> can be used or exposed. */
-#define _GLIBCXX_USE_C99 1
-
-/* Define if C99 functions in <complex.h> should be used in <complex>. Using
-   compiler builtins for these functions requires corresponding C99 library
-   functions to be present. */
-#define _GLIBCXX_USE_C99_COMPLEX 1
-
-/* Define if C99 functions in <complex.h> should be used in <tr1/complex>.
-   Using compiler builtins for these functions requires corresponding C99
-   library functions to be present. */
-#define _GLIBCXX_USE_C99_COMPLEX_TR1 1
-
-/* Define if C99 functions in <ctype.h> should be imported in <tr1/cctype> in
-   namespace std::tr1. */
-#define _GLIBCXX_USE_C99_CTYPE_TR1 1
-
-/* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
-   namespace std::tr1. */
-#define _GLIBCXX_USE_C99_FENV_TR1 1
-
-/* Define if C99 functions in <inttypes.h> should be imported in
-   <tr1/cinttypes> in namespace std::tr1. */
-#define _GLIBCXX_USE_C99_INTTYPES_TR1 1
-
-/* Define if wchar_t C99 functions in <inttypes.h> should be imported in
-   <tr1/cinttypes> in namespace std::tr1. */
-#define _GLIBCXX_USE_C99_INTTYPES_WCHAR_T_TR1 1
-
-/* Define if C99 functions or macros in <math.h> should be imported in <cmath>
-   in namespace std. */
-#define _GLIBCXX_USE_C99_MATH 1
-
-/* Define if C99 functions or macros in <math.h> should be imported in
-   <tr1/cmath> in namespace std::tr1. */
-#define _GLIBCXX_USE_C99_MATH_TR1 1
-
-/* Define if C99 types in <stdint.h> should be imported in <tr1/cstdint> in
-   namespace std::tr1. */
-#define _GLIBCXX_USE_C99_STDINT_TR1 1
-
-/* Defined if clock_gettime syscall has monotonic and realtime clock support.
-   */
-/* #undef _GLIBCXX_USE_CLOCK_GETTIME_SYSCALL */
-
-/* Defined if clock_gettime has monotonic clock support. */
-#define _GLIBCXX_USE_CLOCK_MONOTONIC 1
-
-/* Defined if clock_gettime has realtime clock support. */
-#define _GLIBCXX_USE_CLOCK_REALTIME 1
-
-/* Define if ISO/IEC TR 24733 decimal floating point types are supported on
-   this host. */
-/* #undef _GLIBCXX_USE_DECIMAL_FLOAT */
-
-/* Define if fchmod is available in <sys/stat.h>. */
-#define _GLIBCXX_USE_FCHMOD 1
-
-/* Define if fchmodat is available in <sys/stat.h>. */
-#define _GLIBCXX_USE_FCHMODAT 1
-
-/* Define if __float128 is supported on this host. */
-/* #undef _GLIBCXX_USE_FLOAT128 */
-
-/* Defined if gettimeofday is available. */
-#define _GLIBCXX_USE_GETTIMEOFDAY 1
-
-/* Define if get_nprocs is available in <sys/sysinfo.h>. */
-#define _GLIBCXX_USE_GET_NPROCS 1
-
-/* Define if __int128 is supported on this host. */
-/* #undef _GLIBCXX_USE_INT128 */
-
-/* Define if LFS support is available. */
-#define _GLIBCXX_USE_LFS 1
-
-/* Define if code specialized for long long should be used. */
-#define _GLIBCXX_USE_LONG_LONG 1
-
-/* Defined if nanosleep is available. */
-#define _GLIBCXX_USE_NANOSLEEP 1
-
-/* Define if NLS translations are to be used. */
-#define _GLIBCXX_USE_NLS 1
-
-/* Define if pthreads_num_processors_np is available in <pthread.h>. */
-/* #undef _GLIBCXX_USE_PTHREADS_NUM_PROCESSORS_NP */
-
-/* Define if POSIX read/write locks are available in <gthr.h>. */
-#define _GLIBCXX_USE_PTHREAD_RWLOCK_T 1
-
-/* Define if /dev/random and /dev/urandom are available for the random_device
-   of TR1 (Chapter 5.1). */
-#define _GLIBCXX_USE_RANDOM_TR1 1
-
-/* Define if usable realpath is available in <stdlib.h>. */
-#define _GLIBCXX_USE_REALPATH 1
-
-/* Defined if sched_yield is available. */
-#define _GLIBCXX_USE_SCHED_YIELD 1
-
-/* Define if _SC_NPROCESSORS_ONLN is available in <unistd.h>. */
-#define _GLIBCXX_USE_SC_NPROCESSORS_ONLN 1
-
-/* Define if _SC_NPROC_ONLN is available in <unistd.h>. */
-/* #undef _GLIBCXX_USE_SC_NPROC_ONLN */
-
-/* Define if sendfile is available in <sys/stat.h>. */
-/* #undef _GLIBCXX_USE_SENDFILE */
-
-/* Define if struct stat has timespec members. */
-#define _GLIBCXX_USE_ST_MTIM 1
-
-/* Define if sysctl(), CTL_HW and HW_NCPU are available in <sys/sysctl.h>. */
-/* #undef _GLIBCXX_USE_SYSCTL_HW_NCPU */
-
-/* Define if obsolescent tmpnam is available in <stdio.h>. */
-#define _GLIBCXX_USE_TMPNAM 1
-
-/* Define if utimensat and UTIME_OMIT are available in <sys/stat.h> and
-   AT_FDCWD in <fcntl.h>. */
-#define _GLIBCXX_USE_UTIMENSAT 1
-
-/* Define if code specialized for wchar_t should be used. */
-#define _GLIBCXX_USE_WCHAR_T 1
-
-/* Define to 1 if a verbose library is built, or 0 otherwise. */
-#define _GLIBCXX_VERBOSE 1
-
-/* Defined if as can handle rdrand. */
-/* #undef _GLIBCXX_X86_RDRAND */
-
-/* Define to 1 if mutex_timedlock is available. */
-#define _GTHREAD_USE_MUTEX_TIMEDLOCK 1
-
-/* Define if all C++11 overloads are available in <math.h>.  */
-#if __cplusplus >= 201103L
-/* #undef __CORRECT_ISO_CPP11_MATH_H_PROTO */
-#endif
-
-#if defined (_GLIBCXX_HAVE__ACOSF) && ! defined (_GLIBCXX_HAVE_ACOSF)
-# define _GLIBCXX_HAVE_ACOSF 1
-# define acosf _acosf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ACOSL) && ! defined (_GLIBCXX_HAVE_ACOSL)
-# define _GLIBCXX_HAVE_ACOSL 1
-# define acosl _acosl
-#endif
-
-#if defined (_GLIBCXX_HAVE__ASINF) && ! defined (_GLIBCXX_HAVE_ASINF)
-# define _GLIBCXX_HAVE_ASINF 1
-# define asinf _asinf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ASINL) && ! defined (_GLIBCXX_HAVE_ASINL)
-# define _GLIBCXX_HAVE_ASINL 1
-# define asinl _asinl
-#endif
-
-#if defined (_GLIBCXX_HAVE__ATAN2F) && ! defined (_GLIBCXX_HAVE_ATAN2F)
-# define _GLIBCXX_HAVE_ATAN2F 1
-# define atan2f _atan2f
-#endif
-
-#if defined (_GLIBCXX_HAVE__ATAN2L) && ! defined (_GLIBCXX_HAVE_ATAN2L)
-# define _GLIBCXX_HAVE_ATAN2L 1
-# define atan2l _atan2l
-#endif
-
-#if defined (_GLIBCXX_HAVE__ATANF) && ! defined (_GLIBCXX_HAVE_ATANF)
-# define _GLIBCXX_HAVE_ATANF 1
-# define atanf _atanf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ATANL) && ! defined (_GLIBCXX_HAVE_ATANL)
-# define _GLIBCXX_HAVE_ATANL 1
-# define atanl _atanl
-#endif
-
-#if defined (_GLIBCXX_HAVE__CEILF) && ! defined (_GLIBCXX_HAVE_CEILF)
-# define _GLIBCXX_HAVE_CEILF 1
-# define ceilf _ceilf
-#endif
-
-#if defined (_GLIBCXX_HAVE__CEILL) && ! defined (_GLIBCXX_HAVE_CEILL)
-# define _GLIBCXX_HAVE_CEILL 1
-# define ceill _ceill
-#endif
-
-#if defined (_GLIBCXX_HAVE__COSF) && ! defined (_GLIBCXX_HAVE_COSF)
-# define _GLIBCXX_HAVE_COSF 1
-# define cosf _cosf
-#endif
-
-#if defined (_GLIBCXX_HAVE__COSHF) && ! defined (_GLIBCXX_HAVE_COSHF)
-# define _GLIBCXX_HAVE_COSHF 1
-# define coshf _coshf
-#endif
-
-#if defined (_GLIBCXX_HAVE__COSHL) && ! defined (_GLIBCXX_HAVE_COSHL)
-# define _GLIBCXX_HAVE_COSHL 1
-# define coshl _coshl
-#endif
-
-#if defined (_GLIBCXX_HAVE__COSL) && ! defined (_GLIBCXX_HAVE_COSL)
-# define _GLIBCXX_HAVE_COSL 1
-# define cosl _cosl
-#endif
-
-#if defined (_GLIBCXX_HAVE__EXPF) && ! defined (_GLIBCXX_HAVE_EXPF)
-# define _GLIBCXX_HAVE_EXPF 1
-# define expf _expf
-#endif
-
-#if defined (_GLIBCXX_HAVE__EXPL) && ! defined (_GLIBCXX_HAVE_EXPL)
-# define _GLIBCXX_HAVE_EXPL 1
-# define expl _expl
-#endif
-
-#if defined (_GLIBCXX_HAVE__FABSF) && ! defined (_GLIBCXX_HAVE_FABSF)
-# define _GLIBCXX_HAVE_FABSF 1
-# define fabsf _fabsf
-#endif
-
-#if defined (_GLIBCXX_HAVE__FABSL) && ! defined (_GLIBCXX_HAVE_FABSL)
-# define _GLIBCXX_HAVE_FABSL 1
-# define fabsl _fabsl
-#endif
-
-#if defined (_GLIBCXX_HAVE__FINITE) && ! defined (_GLIBCXX_HAVE_FINITE)
-# define _GLIBCXX_HAVE_FINITE 1
-# define finite _finite
-#endif
-
-#if defined (_GLIBCXX_HAVE__FINITEF) && ! defined (_GLIBCXX_HAVE_FINITEF)
-# define _GLIBCXX_HAVE_FINITEF 1
-# define finitef _finitef
-#endif
-
-#if defined (_GLIBCXX_HAVE__FINITEL) && ! defined (_GLIBCXX_HAVE_FINITEL)
-# define _GLIBCXX_HAVE_FINITEL 1
-# define finitel _finitel
-#endif
-
-#if defined (_GLIBCXX_HAVE__FLOORF) && ! defined (_GLIBCXX_HAVE_FLOORF)
-# define _GLIBCXX_HAVE_FLOORF 1
-# define floorf _floorf
-#endif
-
-#if defined (_GLIBCXX_HAVE__FLOORL) && ! defined (_GLIBCXX_HAVE_FLOORL)
-# define _GLIBCXX_HAVE_FLOORL 1
-# define floorl _floorl
-#endif
-
-#if defined (_GLIBCXX_HAVE__FMODF) && ! defined (_GLIBCXX_HAVE_FMODF)
-# define _GLIBCXX_HAVE_FMODF 1
-# define fmodf _fmodf
-#endif
-
-#if defined (_GLIBCXX_HAVE__FMODL) && ! defined (_GLIBCXX_HAVE_FMODL)
-# define _GLIBCXX_HAVE_FMODL 1
-# define fmodl _fmodl
-#endif
-
-#if defined (_GLIBCXX_HAVE__FPCLASS) && ! defined (_GLIBCXX_HAVE_FPCLASS)
-# define _GLIBCXX_HAVE_FPCLASS 1
-# define fpclass _fpclass
-#endif
-
-#if defined (_GLIBCXX_HAVE__FREXPF) && ! defined (_GLIBCXX_HAVE_FREXPF)
-# define _GLIBCXX_HAVE_FREXPF 1
-# define frexpf _frexpf
-#endif
-
-#if defined (_GLIBCXX_HAVE__FREXPL) && ! defined (_GLIBCXX_HAVE_FREXPL)
-# define _GLIBCXX_HAVE_FREXPL 1
-# define frexpl _frexpl
-#endif
-
-#if defined (_GLIBCXX_HAVE__HYPOT) && ! defined (_GLIBCXX_HAVE_HYPOT)
-# define _GLIBCXX_HAVE_HYPOT 1
-# define hypot _hypot
-#endif
-
-#if defined (_GLIBCXX_HAVE__HYPOTF) && ! defined (_GLIBCXX_HAVE_HYPOTF)
-# define _GLIBCXX_HAVE_HYPOTF 1
-# define hypotf _hypotf
-#endif
-
-#if defined (_GLIBCXX_HAVE__HYPOTL) && ! defined (_GLIBCXX_HAVE_HYPOTL)
-# define _GLIBCXX_HAVE_HYPOTL 1
-# define hypotl _hypotl
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISINF) && ! defined (_GLIBCXX_HAVE_ISINF)
-# define _GLIBCXX_HAVE_ISINF 1
-# define isinf _isinf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISINFF) && ! defined (_GLIBCXX_HAVE_ISINFF)
-# define _GLIBCXX_HAVE_ISINFF 1
-# define isinff _isinff
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISINFL) && ! defined (_GLIBCXX_HAVE_ISINFL)
-# define _GLIBCXX_HAVE_ISINFL 1
-# define isinfl _isinfl
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISNAN) && ! defined (_GLIBCXX_HAVE_ISNAN)
-# define _GLIBCXX_HAVE_ISNAN 1
-# define isnan _isnan
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISNANF) && ! defined (_GLIBCXX_HAVE_ISNANF)
-# define _GLIBCXX_HAVE_ISNANF 1
-# define isnanf _isnanf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISNANL) && ! defined (_GLIBCXX_HAVE_ISNANL)
-# define _GLIBCXX_HAVE_ISNANL 1
-# define isnanl _isnanl
-#endif
-
-#if defined (_GLIBCXX_HAVE__LDEXPF) && ! defined (_GLIBCXX_HAVE_LDEXPF)
-# define _GLIBCXX_HAVE_LDEXPF 1
-# define ldexpf _ldexpf
-#endif
-
-#if defined (_GLIBCXX_HAVE__LDEXPL) && ! defined (_GLIBCXX_HAVE_LDEXPL)
-# define _GLIBCXX_HAVE_LDEXPL 1
-# define ldexpl _ldexpl
-#endif
-
-#if defined (_GLIBCXX_HAVE__LOG10F) && ! defined (_GLIBCXX_HAVE_LOG10F)
-# define _GLIBCXX_HAVE_LOG10F 1
-# define log10f _log10f
-#endif
-
-#if defined (_GLIBCXX_HAVE__LOG10L) && ! defined (_GLIBCXX_HAVE_LOG10L)
-# define _GLIBCXX_HAVE_LOG10L 1
-# define log10l _log10l
-#endif
-
-#if defined (_GLIBCXX_HAVE__LOGF) && ! defined (_GLIBCXX_HAVE_LOGF)
-# define _GLIBCXX_HAVE_LOGF 1
-# define logf _logf
-#endif
-
-#if defined (_GLIBCXX_HAVE__LOGL) && ! defined (_GLIBCXX_HAVE_LOGL)
-# define _GLIBCXX_HAVE_LOGL 1
-# define logl _logl
-#endif
-
-#if defined (_GLIBCXX_HAVE__MODF) && ! defined (_GLIBCXX_HAVE_MODF)
-# define _GLIBCXX_HAVE_MODF 1
-# define modf _modf
-#endif
-
-#if defined (_GLIBCXX_HAVE__MODFF) && ! defined (_GLIBCXX_HAVE_MODFF)
-# define _GLIBCXX_HAVE_MODFF 1
-# define modff _modff
-#endif
-
-#if defined (_GLIBCXX_HAVE__MODFL) && ! defined (_GLIBCXX_HAVE_MODFL)
-# define _GLIBCXX_HAVE_MODFL 1
-# define modfl _modfl
-#endif
-
-#if defined (_GLIBCXX_HAVE__POWF) && ! defined (_GLIBCXX_HAVE_POWF)
-# define _GLIBCXX_HAVE_POWF 1
-# define powf _powf
-#endif
-
-#if defined (_GLIBCXX_HAVE__POWL) && ! defined (_GLIBCXX_HAVE_POWL)
-# define _GLIBCXX_HAVE_POWL 1
-# define powl _powl
-#endif
-
-#if defined (_GLIBCXX_HAVE__QFPCLASS) && ! defined (_GLIBCXX_HAVE_QFPCLASS)
-# define _GLIBCXX_HAVE_QFPCLASS 1
-# define qfpclass _qfpclass
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINCOS) && ! defined (_GLIBCXX_HAVE_SINCOS)
-# define _GLIBCXX_HAVE_SINCOS 1
-# define sincos _sincos
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINCOSF) && ! defined (_GLIBCXX_HAVE_SINCOSF)
-# define _GLIBCXX_HAVE_SINCOSF 1
-# define sincosf _sincosf
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINCOSL) && ! defined (_GLIBCXX_HAVE_SINCOSL)
-# define _GLIBCXX_HAVE_SINCOSL 1
-# define sincosl _sincosl
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINF) && ! defined (_GLIBCXX_HAVE_SINF)
-# define _GLIBCXX_HAVE_SINF 1
-# define sinf _sinf
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINHF) && ! defined (_GLIBCXX_HAVE_SINHF)
-# define _GLIBCXX_HAVE_SINHF 1
-# define sinhf _sinhf
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINHL) && ! defined (_GLIBCXX_HAVE_SINHL)
-# define _GLIBCXX_HAVE_SINHL 1
-# define sinhl _sinhl
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINL) && ! defined (_GLIBCXX_HAVE_SINL)
-# define _GLIBCXX_HAVE_SINL 1
-# define sinl _sinl
-#endif
-
-#if defined (_GLIBCXX_HAVE__SQRTF) && ! defined (_GLIBCXX_HAVE_SQRTF)
-# define _GLIBCXX_HAVE_SQRTF 1
-# define sqrtf _sqrtf
-#endif
-
-#if defined (_GLIBCXX_HAVE__SQRTL) && ! defined (_GLIBCXX_HAVE_SQRTL)
-# define _GLIBCXX_HAVE_SQRTL 1
-# define sqrtl _sqrtl
-#endif
-
-#if defined (_GLIBCXX_HAVE__STRTOF) && ! defined (_GLIBCXX_HAVE_STRTOF)
-# define _GLIBCXX_HAVE_STRTOF 1
-# define strtof _strtof
-#endif
-
-#if defined (_GLIBCXX_HAVE__STRTOLD) && ! defined (_GLIBCXX_HAVE_STRTOLD)
-# define _GLIBCXX_HAVE_STRTOLD 1
-# define strtold _strtold
-#endif
-
-#if defined (_GLIBCXX_HAVE__TANF) && ! defined (_GLIBCXX_HAVE_TANF)
-# define _GLIBCXX_HAVE_TANF 1
-# define tanf _tanf
-#endif
-
-#if defined (_GLIBCXX_HAVE__TANHF) && ! defined (_GLIBCXX_HAVE_TANHF)
-# define _GLIBCXX_HAVE_TANHF 1
-# define tanhf _tanhf
-#endif
-
-#if defined (_GLIBCXX_HAVE__TANHL) && ! defined (_GLIBCXX_HAVE_TANHL)
-# define _GLIBCXX_HAVE_TANHL 1
-# define tanhl _tanhl
-#endif
-
-#if defined (_GLIBCXX_HAVE__TANL) && ! defined (_GLIBCXX_HAVE_TANL)
-# define _GLIBCXX_HAVE_TANL 1
-# define tanl _tanl
-#endif
-
-#endif // _GLIBCXX_CXX_CONFIG_H
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++io.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++io.h
deleted file mode 100644
index 8a4b453..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++io.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Underlying io library details -*- C++ -*-
-
-// Copyright (C) 2000-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/c++io.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ios}
- */
-
-// c_io_stdio.h - Defines for using "C" stdio.h
-
-#ifndef _GLIBCXX_CXX_IO_H
-#define _GLIBCXX_CXX_IO_H 1
-
-#include <cstdio>
-#include <bits/gthr.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  typedef __gthread_mutex_t __c_lock;
-
-  // for basic_file.h
-  typedef FILE __c_file;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++locale.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++locale.h
deleted file mode 100644
index a1dc3d2..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/c++locale.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Wrapper for underlying C-language localization -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/c++locale.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.8  Standard locale categories.
-//
-
-// Written by Benjamin Kosnik <bkoz@redhat.com>
-
-#ifndef _GLIBCXX_CXX_LOCALE_H
-#define _GLIBCXX_CXX_LOCALE_H 1
-
-#pragma GCC system_header
-
-#include <clocale>
-
-#define _GLIBCXX_C_LOCALE_GNU 1
-
-#define _GLIBCXX_NUM_CATEGORIES 6
-
-#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  extern "C" __typeof(uselocale) __uselocale;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  typedef __locale_t		__c_locale;
-
-  // Convert numeric value of type double and long double to string and
-  // return length of string.  If vsnprintf is available use it, otherwise
-  // fall back to the unsafe vsprintf which, in general, can be dangerous
-  // and should be avoided.
-  inline int
-  __convert_from_v(const __c_locale& __cloc __attribute__ ((__unused__)),
-		   char* __out,
-		   const int __size __attribute__ ((__unused__)),
-		   const char* __fmt, ...)
-  {
-#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
-    __c_locale __old = __gnu_cxx::__uselocale(__cloc);
-#else
-    char* __old = std::setlocale(LC_NUMERIC, 0);
-    char* __sav = 0;
-    if (__builtin_strcmp(__old, "C"))
-      {
-	const size_t __len = __builtin_strlen(__old) + 1;
-	__sav = new char[__len];
-	__builtin_memcpy(__sav, __old, __len);
-	std::setlocale(LC_NUMERIC, "C");
-      }
-#endif
-
-    __builtin_va_list __args;
-    __builtin_va_start(__args, __fmt);
-
-#ifdef _GLIBCXX_USE_C99
-    const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
-#else
-    const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-#endif
-
-    __builtin_va_end(__args);
-
-#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
-    __gnu_cxx::__uselocale(__old);
-#else
-    if (__sav)
-      {
-	std::setlocale(LC_NUMERIC, __sav);
-	delete [] __sav;
-      }
-#endif
-    return __ret;
-  }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/cpu_defines.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/cpu_defines.h
deleted file mode 100644
index a7f5f9a..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/cpu_defines.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Specific definitions for generic platforms  -*- C++ -*-
-
-// Copyright (C) 2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/cpu_defines.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iosfwd}
- */
-
-#ifndef _GLIBCXX_CPU_DEFINES
-#define _GLIBCXX_CPU_DEFINES 1
-
-// Integer divide instructions don't trap on ARM.
-#ifdef __ARM_ARCH_EXT_IDIV__
-#define __glibcxx_integral_traps false
-#else
-#define __glibcxx_integral_traps true
-#endif
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/ctype_base.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/ctype_base.h
deleted file mode 100644
index fd52b73..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/ctype_base.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/ctype_base.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-// Information as gleaned from /usr/include/ctype.h
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /// @brief  Base class for ctype.
-  struct ctype_base
-  {
-    // Non-standard typedefs.
-    typedef const int* 		__to_type;
-
-    // NB: Offsets into ctype<char>::_M_table force a particular size
-    // on the mask type. Because of this, we don't use an enum.
-    typedef unsigned short 	mask;
-    static const mask upper    	= _ISupper;
-    static const mask lower 	= _ISlower;
-    static const mask alpha 	= _ISalpha;
-    static const mask digit 	= _ISdigit;
-    static const mask xdigit 	= _ISxdigit;
-    static const mask space 	= _ISspace;
-    static const mask print 	= _ISprint;
-    static const mask graph 	= _ISalpha | _ISdigit | _ISpunct;
-    static const mask cntrl 	= _IScntrl;
-    static const mask punct 	= _ISpunct;
-    static const mask alnum 	= _ISalpha | _ISdigit;
-#if __cplusplus >= 201103L
-    static const mask blank	= _ISblank;
-#endif
-  };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/ctype_inline.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/ctype_inline.h
deleted file mode 100644
index 5e20f21..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/ctype_inline.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 2000-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/ctype_inline.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
-// functions go in ctype.cc
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  bool
-  ctype<char>::
-  is(mask __m, char __c) const
-  { return _M_table[static_cast<unsigned char>(__c)] & __m; }
-
-  const char*
-  ctype<char>::
-  is(const char* __low, const char* __high, mask* __vec) const
-  {
-    while (__low < __high)
-      *__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
-    return __high;
-  }
-
-  const char*
-  ctype<char>::
-  scan_is(mask __m, const char* __low, const char* __high) const
-  {
-    while (__low < __high
-	   && !(_M_table[static_cast<unsigned char>(*__low)] & __m))
-      ++__low;
-    return __low;
-  }
-
-  const char*
-  ctype<char>::
-  scan_not(mask __m, const char* __low, const char* __high) const
-  {
-    while (__low < __high
-	   && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
-      ++__low;
-    return __low;
-  }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/cxxabi_tweaks.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/cxxabi_tweaks.h
deleted file mode 100644
index 05fa83d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/cxxabi_tweaks.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Control various target specific ABI tweaks.  ARM version.
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/cxxabi_tweaks.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{cxxabi.h}
- */
-
-#ifndef _CXXABI_TWEAKS_H
-#define _CXXABI_TWEAKS_H 1
-
-#ifdef __cplusplus
-namespace __cxxabiv1
-{
-  extern "C" 
-  {
-#endif
-
-#ifdef __ARM_EABI__
-  // The ARM EABI uses the least significant bit of a 32-bit
-  // guard variable.  */
-#define _GLIBCXX_GUARD_TEST(x) ((*(x) & 1) != 0)
-#define _GLIBCXX_GUARD_SET(x) *(x) = 1
-#define _GLIBCXX_GUARD_BIT 1
-#define _GLIBCXX_GUARD_PENDING_BIT __guard_test_bit (1, 1)
-#define _GLIBCXX_GUARD_WAITING_BIT __guard_test_bit (2, 1)
-  typedef int __guard;
-
-  // We also want the element size in array cookies.
-#define _GLIBCXX_ELTSIZE_IN_COOKIE 1
-  
-  // __cxa_vec_ctor should return a pointer to the array.
-  typedef void * __cxa_vec_ctor_return_type;
-#define _GLIBCXX_CXA_VEC_CTOR_RETURN(x) return x
-  // Constructors and destructors return the "this" pointer.
-  typedef void * __cxa_cdtor_return_type;
-
-#else // __ARM_EABI__
-
-  // The generic ABI uses the first byte of a 64-bit guard variable.
-#define _GLIBCXX_GUARD_TEST(x) (*(char *) (x) != 0)
-#define _GLIBCXX_GUARD_SET(x) *(char *) (x) = 1
-#define _GLIBCXX_GUARD_BIT __guard_test_bit (0, 1)
-#define _GLIBCXX_GUARD_PENDING_BIT __guard_test_bit (1, 1)
-#define _GLIBCXX_GUARD_WAITING_BIT __guard_test_bit (2, 1)
-  __extension__ typedef int __guard __attribute__((mode (__DI__)));
-
-  // __cxa_vec_ctor has void return type.
-  typedef void __cxa_vec_ctor_return_type;
-#define _GLIBCXX_CXA_VEC_CTOR_RETURN(x) return
-  // Constructors and destructors do not return a value.
-  typedef void __cxa_cdtor_return_type;
-
-#endif //!__ARM_EABI__
-
-#ifdef __cplusplus
-  }
-} // namespace __cxxabiv1
-#endif
-
-#endif 
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/error_constants.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/error_constants.h
deleted file mode 100644
index 74492cf..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/error_constants.h
+++ /dev/null
@@ -1,178 +0,0 @@
-// Specific definitions for generic platforms  -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/error_constants.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{system_error}
- */
-
-#ifndef _GLIBCXX_ERROR_CONSTANTS
-#define _GLIBCXX_ERROR_CONSTANTS 1
-
-#include <bits/c++config.h>
-#include <cerrno>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  enum class errc
-    {
-      address_family_not_supported = 		EAFNOSUPPORT,
-      address_in_use = 				EADDRINUSE,
-      address_not_available = 			EADDRNOTAVAIL,
-      already_connected = 			EISCONN,
-      argument_list_too_long = 			E2BIG,
-      argument_out_of_domain = 			EDOM,
-      bad_address = 				EFAULT,
-      bad_file_descriptor = 			EBADF,
-
-#ifdef _GLIBCXX_HAVE_EBADMSG
-      bad_message = 				EBADMSG,
-#endif
-
-      broken_pipe = 				EPIPE,
-      connection_aborted = 			ECONNABORTED,
-      connection_already_in_progress = 		EALREADY,
-      connection_refused = 			ECONNREFUSED,
-      connection_reset = 			ECONNRESET,
-      cross_device_link = 			EXDEV,
-      destination_address_required = 		EDESTADDRREQ,
-      device_or_resource_busy = 		EBUSY,
-      directory_not_empty = 			ENOTEMPTY,
-      executable_format_error = 		ENOEXEC,
-      file_exists = 	       			EEXIST,
-      file_too_large = 				EFBIG,
-      filename_too_long = 			ENAMETOOLONG,
-      function_not_supported = 			ENOSYS,
-      host_unreachable = 			EHOSTUNREACH,
-
-#ifdef _GLIBCXX_HAVE_EIDRM
-      identifier_removed = 			EIDRM,
-#endif
-
-      illegal_byte_sequence = 			EILSEQ,
-      inappropriate_io_control_operation = 	ENOTTY,
-      interrupted = 				EINTR,
-      invalid_argument = 			EINVAL,
-      invalid_seek = 				ESPIPE,
-      io_error = 				EIO,
-      is_a_directory = 				EISDIR,
-      message_size = 				EMSGSIZE,
-      network_down = 				ENETDOWN,
-      network_reset = 				ENETRESET,
-      network_unreachable = 			ENETUNREACH,
-      no_buffer_space = 			ENOBUFS,
-      no_child_process = 			ECHILD,
-
-#ifdef _GLIBCXX_HAVE_ENOLINK
-      no_link = 				ENOLINK,
-#endif
-
-      no_lock_available = 			ENOLCK,
-
-#ifdef _GLIBCXX_HAVE_ENODATA
-      no_message_available = 			ENODATA, 
-#endif
-
-      no_message = 				ENOMSG, 
-      no_protocol_option = 			ENOPROTOOPT,
-      no_space_on_device = 			ENOSPC,
-
-#ifdef _GLIBCXX_HAVE_ENOSR
-      no_stream_resources = 			ENOSR,
-#endif
-
-      no_such_device_or_address = 		ENXIO,
-      no_such_device = 				ENODEV,
-      no_such_file_or_directory = 		ENOENT,
-      no_such_process = 			ESRCH,
-      not_a_directory = 			ENOTDIR,
-      not_a_socket = 				ENOTSOCK,
-
-#ifdef _GLIBCXX_HAVE_ENOSTR
-      not_a_stream = 				ENOSTR,
-#endif
-
-      not_connected = 				ENOTCONN,
-      not_enough_memory = 			ENOMEM,
-
-#ifdef _GLIBCXX_HAVE_ENOTSUP
-      not_supported = 				ENOTSUP,
-#endif
-
-#ifdef _GLIBCXX_HAVE_ECANCELED
-      operation_canceled = 			ECANCELED,
-#endif
-
-      operation_in_progress = 			EINPROGRESS,
-      operation_not_permitted = 		EPERM,
-      operation_not_supported = 		EOPNOTSUPP,
-      operation_would_block = 			EWOULDBLOCK,
-
-#ifdef _GLIBCXX_HAVE_EOWNERDEAD
-      owner_dead = 				EOWNERDEAD,
-#endif
-
-      permission_denied = 			EACCES,
-
-#ifdef _GLIBCXX_HAVE_EPROTO
-      protocol_error = 				EPROTO,
-#endif
-
-      protocol_not_supported = 			EPROTONOSUPPORT,
-      read_only_file_system = 			EROFS,
-      resource_deadlock_would_occur = 		EDEADLK,
-      resource_unavailable_try_again = 		EAGAIN,
-      result_out_of_range = 			ERANGE,
-
-#ifdef _GLIBCXX_HAVE_ENOTRECOVERABLE
-      state_not_recoverable = 			ENOTRECOVERABLE,
-#endif
-
-#ifdef _GLIBCXX_HAVE_ETIME
-      stream_timeout = 				ETIME,
-#endif
-
-#ifdef _GLIBCXX_HAVE_ETXTBSY
-      text_file_busy = 				ETXTBSY,
-#endif
-
-      timed_out = 				ETIMEDOUT,
-      too_many_files_open_in_system = 		ENFILE,
-      too_many_files_open = 			EMFILE,
-      too_many_links = 				EMLINK,
-      too_many_symbolic_link_levels = 		ELOOP,
-
-#ifdef _GLIBCXX_HAVE_EOVERFLOW
-      value_too_large = 			EOVERFLOW,
-#endif
-
-      wrong_protocol_type = 			EPROTOTYPE
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/extc++.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/extc++.h
deleted file mode 100644
index de3775b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/extc++.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// C++ includes used for precompiling extensions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file extc++.h
- *  This is an implementation file for a precompiled header.
- */
-
-#if __cplusplus < 201103L
-#include <bits/stdtr1c++.h>
-#endif
-
-#include <ext/algorithm>
-#include <ext/array_allocator.h>
-#include <ext/atomicity.h>
-#include <ext/bitmap_allocator.h>
-#include <ext/cast.h>
-#include <ext/concurrence.h>
-#include <ext/debug_allocator.h>
-#include <ext/extptr_allocator.h>
-#include <ext/functional>
-#include <ext/iterator>
-#include <ext/malloc_allocator.h>
-#include <ext/memory>
-#include <ext/mt_allocator.h>
-#include <ext/new_allocator.h>
-#include <ext/numeric>
-#include <ext/pod_char_traits.h>
-#include <ext/pointer.h>
-#include <ext/pool_allocator.h>
-#include <ext/rb_tree>
-#include <ext/rope>
-#include <ext/slist>
-#include <ext/stdio_filebuf.h>
-#include <ext/stdio_sync_filebuf.h>
-#include <ext/throw_allocator.h>
-#include <ext/typelist.h>
-#include <ext/type_traits.h>
-#include <ext/vstring.h>
-#include <ext/pb_ds/assoc_container.hpp>
-#include <ext/pb_ds/priority_queue.hpp>
-#include <ext/pb_ds/exception.hpp>
-#include <ext/pb_ds/hash_policy.hpp>
-#include <ext/pb_ds/list_update_policy.hpp>
-#include <ext/pb_ds/tree_policy.hpp>
-#include <ext/pb_ds/trie_policy.hpp>
-
-#ifdef _GLIBCXX_HAVE_ICONV
- #include <ext/codecvt_specializations.h>
- #include <ext/enc_filebuf.h>
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr-default.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr-default.h
deleted file mode 100644
index 839915a..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr-default.h
+++ /dev/null
@@ -1,889 +0,0 @@
-/* Threads compatibility routines for libgcc2 and libobjc.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 3, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-Under Section 7 of GPL version 3, you are granted additional
-permissions described in the GCC Runtime Library Exception, version
-3.1, as published by the Free Software Foundation.
-
-You should have received a copy of the GNU General Public License and
-a copy of the GCC Runtime Library Exception along with this program;
-see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-<http://www.gnu.org/licenses/>.  */
-
-#ifndef _GLIBCXX_GCC_GTHR_POSIX_H
-#define _GLIBCXX_GCC_GTHR_POSIX_H
-
-/* POSIX threads specific definitions.
-   Easy, since the interface is just one-to-one mapping.  */
-
-#define __GTHREADS 1
-#define __GTHREADS_CXX0X 1
-
-#include <pthread.h>
-
-#if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
-     || !defined(_GTHREAD_USE_MUTEX_TIMEDLOCK))
-# include <unistd.h>
-# if defined(_POSIX_TIMEOUTS) && _POSIX_TIMEOUTS >= 0
-#  define _GTHREAD_USE_MUTEX_TIMEDLOCK 1
-# else
-#  define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
-# endif
-#endif
-
-typedef pthread_t __gthread_t;
-typedef pthread_key_t __gthread_key_t;
-typedef pthread_once_t __gthread_once_t;
-typedef pthread_mutex_t __gthread_mutex_t;
-typedef pthread_mutex_t __gthread_recursive_mutex_t;
-typedef pthread_cond_t __gthread_cond_t;
-typedef struct timespec __gthread_time_t;
-
-/* POSIX like conditional variables are supported.  Please look at comments
-   in gthr.h for details. */
-#define __GTHREAD_HAS_COND	1
-
-#define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
-#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
-#define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
-#define __GTHREAD_RECURSIVE_MUTEX_INIT PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-#elif defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
-#define __GTHREAD_RECURSIVE_MUTEX_INIT PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#else
-#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
-#endif
-#define __GTHREAD_COND_INIT PTHREAD_COND_INITIALIZER
-#define __GTHREAD_TIME_INIT {0,0}
-
-#ifdef _GTHREAD_USE_MUTEX_INIT_FUNC
-# undef __GTHREAD_MUTEX_INIT
-#endif
-#ifdef _GTHREAD_USE_RECURSIVE_MUTEX_INIT_FUNC
-# undef __GTHREAD_RECURSIVE_MUTEX_INIT
-# undef __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION
-# define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
-#endif
-#ifdef _GTHREAD_USE_COND_INIT_FUNC
-# undef __GTHREAD_COND_INIT
-# define __GTHREAD_COND_INIT_FUNCTION __gthread_cond_init_function
-#endif
-
-#if __GXX_WEAK__ && _GLIBCXX_GTHREAD_USE_WEAK
-# ifndef __gthrw_pragma
-#  define __gthrw_pragma(pragma)
-# endif
-# define __gthrw2(name,name2,type) \
-  static __typeof(type) name __attribute__ ((__weakref__(#name2))); \
-  __gthrw_pragma(weak type)
-# define __gthrw_(name) __gthrw_ ## name
-#else
-# define __gthrw2(name,name2,type)
-# define __gthrw_(name) name
-#endif
-
-/* Typically, __gthrw_foo is a weak reference to symbol foo.  */
-#define __gthrw(name) __gthrw2(__gthrw_ ## name,name,name)
-
-__gthrw(pthread_once)
-__gthrw(pthread_getspecific)
-__gthrw(pthread_setspecific)
-
-__gthrw(pthread_create)
-__gthrw(pthread_join)
-__gthrw(pthread_equal)
-__gthrw(pthread_self)
-__gthrw(pthread_detach)
-#ifndef __BIONIC__
-__gthrw(pthread_cancel)
-#endif
-__gthrw(sched_yield)
-
-__gthrw(pthread_mutex_lock)
-__gthrw(pthread_mutex_trylock)
-#if _GTHREAD_USE_MUTEX_TIMEDLOCK
-__gthrw(pthread_mutex_timedlock)
-#endif
-__gthrw(pthread_mutex_unlock)
-__gthrw(pthread_mutex_init)
-__gthrw(pthread_mutex_destroy)
-
-__gthrw(pthread_cond_init)
-__gthrw(pthread_cond_broadcast)
-__gthrw(pthread_cond_signal)
-__gthrw(pthread_cond_wait)
-__gthrw(pthread_cond_timedwait)
-__gthrw(pthread_cond_destroy)
-
-__gthrw(pthread_key_create)
-__gthrw(pthread_key_delete)
-__gthrw(pthread_mutexattr_init)
-__gthrw(pthread_mutexattr_settype)
-__gthrw(pthread_mutexattr_destroy)
-
-
-#if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
-/* Objective-C.  */
-__gthrw(pthread_exit)
-#ifdef _POSIX_PRIORITY_SCHEDULING
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-__gthrw(sched_get_priority_max)
-__gthrw(sched_get_priority_min)
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#endif /* _POSIX_PRIORITY_SCHEDULING */
-__gthrw(pthread_attr_destroy)
-__gthrw(pthread_attr_init)
-__gthrw(pthread_attr_setdetachstate)
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-__gthrw(pthread_getschedparam)
-__gthrw(pthread_setschedparam)
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#endif /* _LIBOBJC || _LIBOBJC_WEAK */
-
-#if __GXX_WEAK__ && _GLIBCXX_GTHREAD_USE_WEAK
-
-/* On Solaris 2.6 up to 9, the libc exposes a POSIX threads interface even if
-   -pthreads is not specified.  The functions are dummies and most return an
-   error value.  However pthread_once returns 0 without invoking the routine
-   it is passed so we cannot pretend that the interface is active if -pthreads
-   is not specified.  On Solaris 2.5.1, the interface is not exposed at all so
-   we need to play the usual game with weak symbols.  On Solaris 10 and up, a
-   working interface is always exposed.  On FreeBSD 6 and later, libc also
-   exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up
-   to 9 does.  FreeBSD >= 700014 even provides a pthread_cancel stub in libc,
-   which means the alternate __gthread_active_p below cannot be used there.  */
-
-#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__))
-
-static volatile int __gthread_active = -1;
-
-static void
-__gthread_trigger (void)
-{
-  __gthread_active = 1;
-}
-
-static inline int
-__gthread_active_p (void)
-{
-  static pthread_mutex_t __gthread_active_mutex = PTHREAD_MUTEX_INITIALIZER;
-  static pthread_once_t __gthread_active_once = PTHREAD_ONCE_INIT;
-
-  /* Avoid reading __gthread_active twice on the main code path.  */
-  int __gthread_active_latest_value = __gthread_active;
-
-  /* This test is not protected to avoid taking a lock on the main code
-     path so every update of __gthread_active in a threaded program must
-     be atomic with regard to the result of the test.  */
-  if (__builtin_expect (__gthread_active_latest_value < 0, 0))
-    {
-      if (__gthrw_(pthread_once))
-	{
-	  /* If this really is a threaded program, then we must ensure that
-	     __gthread_active has been set to 1 before exiting this block.  */
-	  __gthrw_(pthread_mutex_lock) (&__gthread_active_mutex);
-	  __gthrw_(pthread_once) (&__gthread_active_once, __gthread_trigger);
-	  __gthrw_(pthread_mutex_unlock) (&__gthread_active_mutex);
-	}
-
-      /* Make sure we'll never enter this block again.  */
-      if (__gthread_active < 0)
-	__gthread_active = 0;
-
-      __gthread_active_latest_value = __gthread_active;
-    }
-
-  return __gthread_active_latest_value != 0;
-}
-
-#else /* neither FreeBSD nor Solaris */
-
-/* For a program to be multi-threaded the only thing that it certainly must
-   be using is pthread_create.  However, there may be other libraries that
-   intercept pthread_create with their own definitions to wrap pthreads
-   functionality for some purpose.  In those cases, pthread_create being
-   defined might not necessarily mean that libpthread is actually linked
-   in.
-
-   For the GNU C library, we can use a known internal name.  This is always
-   available in the ABI, but no other library would define it.  That is
-   ideal, since any public pthread function might be intercepted just as
-   pthread_create might be.  __pthread_key_create is an "internal"
-   implementation symbol, but it is part of the public exported ABI.  Also,
-   it's among the symbols that the static libpthread.a always links in
-   whenever pthread_create is used, so there is no danger of a false
-   negative result in any statically-linked, multi-threaded program.
-
-   For others, we choose pthread_cancel as a function that seems unlikely
-   to be redefined by an interceptor library.  The bionic (Android) C
-   library does not provide pthread_cancel, so we do use pthread_create
-   there (and interceptor libraries lose).  */
-
-#ifdef __GLIBC__
-__gthrw2(__gthrw_(__pthread_key_create),
-	 __pthread_key_create,
-	 pthread_key_create)
-# define GTHR_ACTIVE_PROXY	__gthrw_(__pthread_key_create)
-#elif defined (__BIONIC__)
-# define GTHR_ACTIVE_PROXY	__gthrw_(pthread_create)
-#else
-# define GTHR_ACTIVE_PROXY	__gthrw_(pthread_cancel)
-#endif
-
-static inline int
-__gthread_active_p (void)
-{
-  static void *const __gthread_active_ptr
-    = __extension__ (void *) &GTHR_ACTIVE_PROXY;
-  return __gthread_active_ptr != 0;
-}
-
-#endif /* FreeBSD or Solaris */
-
-#else /* not __GXX_WEAK__ */
-
-/* Similar to Solaris, HP-UX 11 for PA-RISC provides stubs for pthread
-   calls in shared flavors of the HP-UX C library.  Most of the stubs
-   have no functionality.  The details are described in the "libc cumulative
-   patch" for each subversion of HP-UX 11.  There are two special interfaces
-   provided for checking whether an application is linked to a shared pthread
-   library or not.  However, these interfaces aren't available in early
-   libpthread libraries.  We also need a test that works for archive
-   libraries.  We can't use pthread_once as some libc versions call the
-   init function.  We also can't use pthread_create or pthread_attr_init
-   as these create a thread and thereby prevent changing the default stack
-   size.  The function pthread_default_stacksize_np is available in both
-   the archive and shared versions of libpthread.   It can be used to
-   determine the default pthread stack size.  There is a stub in some
-   shared libc versions which returns a zero size if pthreads are not
-   active.  We provide an equivalent stub to handle cases where libc
-   doesn't provide one.  */
-
-#if defined(__hppa__) && defined(__hpux__)
-
-static volatile int __gthread_active = -1;
-
-static inline int
-__gthread_active_p (void)
-{
-  /* Avoid reading __gthread_active twice on the main code path.  */
-  int __gthread_active_latest_value = __gthread_active;
-  size_t __s;
-
-  if (__builtin_expect (__gthread_active_latest_value < 0, 0))
-    {
-      pthread_default_stacksize_np (0, &__s);
-      __gthread_active = __s ? 1 : 0;
-      __gthread_active_latest_value = __gthread_active;
-    }
-
-  return __gthread_active_latest_value != 0;
-}
-
-#else /* not hppa-hpux */
-
-static inline int
-__gthread_active_p (void)
-{
-  return 1;
-}
-
-#endif /* hppa-hpux */
-
-#endif /* __GXX_WEAK__ */
-
-#ifdef _LIBOBJC
-
-/* This is the config.h file in libobjc/ */
-#include <config.h>
-
-#ifdef HAVE_SCHED_H
-# include <sched.h>
-#endif
-
-/* Key structure for maintaining thread specific storage */
-static pthread_key_t _objc_thread_storage;
-static pthread_attr_t _objc_thread_attribs;
-
-/* Thread local storage for a single thread */
-static void *thread_local_storage = NULL;
-
-/* Backend initialization functions */
-
-/* Initialize the threads subsystem.  */
-static inline int
-__gthread_objc_init_thread_system (void)
-{
-  if (__gthread_active_p ())
-    {
-      /* Initialize the thread storage key.  */
-      if (__gthrw_(pthread_key_create) (&_objc_thread_storage, NULL) == 0)
-	{
-	  /* The normal default detach state for threads is
-	   * PTHREAD_CREATE_JOINABLE which causes threads to not die
-	   * when you think they should.  */
-	  if (__gthrw_(pthread_attr_init) (&_objc_thread_attribs) == 0
-	      && __gthrw_(pthread_attr_setdetachstate) (&_objc_thread_attribs,
-					      PTHREAD_CREATE_DETACHED) == 0)
-	    return 0;
-	}
-    }
-
-  return -1;
-}
-
-/* Close the threads subsystem.  */
-static inline int
-__gthread_objc_close_thread_system (void)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(pthread_key_delete) (_objc_thread_storage) == 0
-      && __gthrw_(pthread_attr_destroy) (&_objc_thread_attribs) == 0)
-    return 0;
-
-  return -1;
-}
-
-/* Backend thread functions */
-
-/* Create a new thread of execution.  */
-static inline objc_thread_t
-__gthread_objc_thread_detach (void (*func)(void *), void *arg)
-{
-  objc_thread_t thread_id;
-  pthread_t new_thread_handle;
-
-  if (!__gthread_active_p ())
-    return NULL;
-
-  if (!(__gthrw_(pthread_create) (&new_thread_handle, &_objc_thread_attribs,
-				  (void *) func, arg)))
-    thread_id = (objc_thread_t) new_thread_handle;
-  else
-    thread_id = NULL;
-
-  return thread_id;
-}
-
-/* Set the current thread's priority.  */
-static inline int
-__gthread_objc_thread_set_priority (int priority)
-{
-  if (!__gthread_active_p ())
-    return -1;
-  else
-    {
-#ifdef _POSIX_PRIORITY_SCHEDULING
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-      pthread_t thread_id = __gthrw_(pthread_self) ();
-      int policy;
-      struct sched_param params;
-      int priority_min, priority_max;
-
-      if (__gthrw_(pthread_getschedparam) (thread_id, &policy, &params) == 0)
-	{
-	  if ((priority_max = __gthrw_(sched_get_priority_max) (policy)) == -1)
-	    return -1;
-
-	  if ((priority_min = __gthrw_(sched_get_priority_min) (policy)) == -1)
-	    return -1;
-
-	  if (priority > priority_max)
-	    priority = priority_max;
-	  else if (priority < priority_min)
-	    priority = priority_min;
-	  params.sched_priority = priority;
-
-	  /*
-	   * The solaris 7 and several other man pages incorrectly state that
-	   * this should be a pointer to policy but pthread.h is universally
-	   * at odds with this.
-	   */
-	  if (__gthrw_(pthread_setschedparam) (thread_id, policy, &params) == 0)
-	    return 0;
-	}
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#endif /* _POSIX_PRIORITY_SCHEDULING */
-      return -1;
-    }
-}
-
-/* Return the current thread's priority.  */
-static inline int
-__gthread_objc_thread_get_priority (void)
-{
-#ifdef _POSIX_PRIORITY_SCHEDULING
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-  if (__gthread_active_p ())
-    {
-      int policy;
-      struct sched_param params;
-
-      if (__gthrw_(pthread_getschedparam) (__gthrw_(pthread_self) (), &policy, &params) == 0)
-	return params.sched_priority;
-      else
-	return -1;
-    }
-  else
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#endif /* _POSIX_PRIORITY_SCHEDULING */
-    return OBJC_THREAD_INTERACTIVE_PRIORITY;
-}
-
-/* Yield our process time to another thread.  */
-static inline void
-__gthread_objc_thread_yield (void)
-{
-  if (__gthread_active_p ())
-    __gthrw_(sched_yield) ();
-}
-
-/* Terminate the current thread.  */
-static inline int
-__gthread_objc_thread_exit (void)
-{
-  if (__gthread_active_p ())
-    /* exit the thread */
-    __gthrw_(pthread_exit) (&__objc_thread_exit_status);
-
-  /* Failed if we reached here */
-  return -1;
-}
-
-/* Returns an integer value which uniquely describes a thread.  */
-static inline objc_thread_t
-__gthread_objc_thread_id (void)
-{
-  if (__gthread_active_p ())
-    return (objc_thread_t) __gthrw_(pthread_self) ();
-  else
-    return (objc_thread_t) 1;
-}
-
-/* Sets the thread's local storage pointer.  */
-static inline int
-__gthread_objc_thread_set_data (void *value)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_setspecific) (_objc_thread_storage, value);
-  else
-    {
-      thread_local_storage = value;
-      return 0;
-    }
-}
-
-/* Returns the thread's local storage pointer.  */
-static inline void *
-__gthread_objc_thread_get_data (void)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_getspecific) (_objc_thread_storage);
-  else
-    return thread_local_storage;
-}
-
-/* Backend mutex functions */
-
-/* Allocate a mutex.  */
-static inline int
-__gthread_objc_mutex_allocate (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    {
-      mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
-
-      if (__gthrw_(pthread_mutex_init) ((pthread_mutex_t *) mutex->backend, NULL))
-	{
-	  objc_free (mutex->backend);
-	  mutex->backend = NULL;
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-/* Deallocate a mutex.  */
-static inline int
-__gthread_objc_mutex_deallocate (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    {
-      int count;
-
-      /*
-       * Posix Threads specifically require that the thread be unlocked
-       * for __gthrw_(pthread_mutex_destroy) to work.
-       */
-
-      do
-	{
-	  count = __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend);
-	  if (count < 0)
-	    return -1;
-	}
-      while (count);
-
-      if (__gthrw_(pthread_mutex_destroy) ((pthread_mutex_t *) mutex->backend))
-	return -1;
-
-      objc_free (mutex->backend);
-      mutex->backend = NULL;
-    }
-  return 0;
-}
-
-/* Grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_lock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(pthread_mutex_lock) ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Try to grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_trylock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(pthread_mutex_trylock) ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Unlock the mutex */
-static inline int
-__gthread_objc_mutex_unlock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Backend condition mutex functions */
-
-/* Allocate a condition.  */
-static inline int
-__gthread_objc_condition_allocate (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    {
-      condition->backend = objc_malloc (sizeof (pthread_cond_t));
-
-      if (__gthrw_(pthread_cond_init) ((pthread_cond_t *) condition->backend, NULL))
-	{
-	  objc_free (condition->backend);
-	  condition->backend = NULL;
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-/* Deallocate a condition.  */
-static inline int
-__gthread_objc_condition_deallocate (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    {
-      if (__gthrw_(pthread_cond_destroy) ((pthread_cond_t *) condition->backend))
-	return -1;
-
-      objc_free (condition->backend);
-      condition->backend = NULL;
-    }
-  return 0;
-}
-
-/* Wait on the condition */
-static inline int
-__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_cond_wait) ((pthread_cond_t *) condition->backend,
-			      (pthread_mutex_t *) mutex->backend);
-  else
-    return 0;
-}
-
-/* Wake up all threads waiting on this condition.  */
-static inline int
-__gthread_objc_condition_broadcast (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_cond_broadcast) ((pthread_cond_t *) condition->backend);
-  else
-    return 0;
-}
-
-/* Wake up one thread waiting on this condition.  */
-static inline int
-__gthread_objc_condition_signal (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_cond_signal) ((pthread_cond_t *) condition->backend);
-  else
-    return 0;
-}
-
-#else /* _LIBOBJC */
-
-static inline int
-__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
-		  void *__args)
-{
-  return __gthrw_(pthread_create) (__threadid, NULL, __func, __args);
-}
-
-static inline int
-__gthread_join (__gthread_t __threadid, void **__value_ptr)
-{
-  return __gthrw_(pthread_join) (__threadid, __value_ptr);
-}
-
-static inline int
-__gthread_detach (__gthread_t __threadid)
-{
-  return __gthrw_(pthread_detach) (__threadid);
-}
-
-static inline int
-__gthread_equal (__gthread_t __t1, __gthread_t __t2)
-{
-  return __gthrw_(pthread_equal) (__t1, __t2);
-}
-
-static inline __gthread_t
-__gthread_self (void)
-{
-  return __gthrw_(pthread_self) ();
-}
-
-static inline int
-__gthread_yield (void)
-{
-  return __gthrw_(sched_yield) ();
-}
-
-static inline int
-__gthread_once (__gthread_once_t *__once, void (*__func) (void))
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_once) (__once, __func);
-  else
-    return -1;
-}
-
-static inline int
-__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
-{
-  return __gthrw_(pthread_key_create) (__key, __dtor);
-}
-
-static inline int
-__gthread_key_delete (__gthread_key_t __key)
-{
-  return __gthrw_(pthread_key_delete) (__key);
-}
-
-static inline void *
-__gthread_getspecific (__gthread_key_t __key)
-{
-  return __gthrw_(pthread_getspecific) (__key);
-}
-
-static inline int
-__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
-{
-  return __gthrw_(pthread_setspecific) (__key, __ptr);
-}
-
-static inline void
-__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    __gthrw_(pthread_mutex_init) (__mutex, NULL);
-}
-
-static inline int
-__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_destroy) (__mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_lock (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_lock) (__mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_trylock) (__mutex);
-  else
-    return 0;
-}
-
-#if _GTHREAD_USE_MUTEX_TIMEDLOCK
-static inline int
-__gthread_mutex_timedlock (__gthread_mutex_t *__mutex,
-			   const __gthread_time_t *__abs_timeout)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_timedlock) (__mutex, __abs_timeout);
-  else
-    return 0;
-}
-#endif
-
-static inline int
-__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_unlock) (__mutex);
-  else
-    return 0;
-}
-
-#if !defined( PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) \
-  || defined(_GTHREAD_USE_RECURSIVE_MUTEX_INIT_FUNC)
-static inline int
-__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    {
-      pthread_mutexattr_t __attr;
-      int __r;
-
-      __r = __gthrw_(pthread_mutexattr_init) (&__attr);
-      if (!__r)
-	__r = __gthrw_(pthread_mutexattr_settype) (&__attr,
-						   PTHREAD_MUTEX_RECURSIVE);
-      if (!__r)
-	__r = __gthrw_(pthread_mutex_init) (__mutex, &__attr);
-      if (!__r)
-	__r = __gthrw_(pthread_mutexattr_destroy) (&__attr);
-      return __r;
-    }
-  return 0;
-}
-#endif
-
-static inline int
-__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_lock (__mutex);
-}
-
-static inline int
-__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_trylock (__mutex);
-}
-
-#if _GTHREAD_USE_MUTEX_TIMEDLOCK
-static inline int
-__gthread_recursive_mutex_timedlock (__gthread_recursive_mutex_t *__mutex,
-				     const __gthread_time_t *__abs_timeout)
-{
-  return __gthread_mutex_timedlock (__mutex, __abs_timeout);
-}
-#endif
-
-static inline int
-__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_unlock (__mutex);
-}
-
-static inline int
-__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_destroy (__mutex);
-}
-
-#ifdef _GTHREAD_USE_COND_INIT_FUNC
-static inline void
-__gthread_cond_init_function (__gthread_cond_t *__cond)
-{
-  if (__gthread_active_p ())
-    __gthrw_(pthread_cond_init) (__cond, NULL);
-}
-#endif
-
-static inline int
-__gthread_cond_broadcast (__gthread_cond_t *__cond)
-{
-  return __gthrw_(pthread_cond_broadcast) (__cond);
-}
-
-static inline int
-__gthread_cond_signal (__gthread_cond_t *__cond)
-{
-  return __gthrw_(pthread_cond_signal) (__cond);
-}
-
-static inline int
-__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
-{
-  return __gthrw_(pthread_cond_wait) (__cond, __mutex);
-}
-
-static inline int
-__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
-			  const __gthread_time_t *__abs_timeout)
-{
-  return __gthrw_(pthread_cond_timedwait) (__cond, __mutex, __abs_timeout);
-}
-
-static inline int
-__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
-			       __gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_cond_wait (__cond, __mutex);
-}
-
-static inline int
-__gthread_cond_destroy (__gthread_cond_t* __cond)
-{
-  return __gthrw_(pthread_cond_destroy) (__cond);
-}
-
-#endif /* _LIBOBJC */
-
-#endif /* ! _GLIBCXX_GCC_GTHR_POSIX_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr-posix.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr-posix.h
deleted file mode 100644
index 839915a..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr-posix.h
+++ /dev/null
@@ -1,889 +0,0 @@
-/* Threads compatibility routines for libgcc2 and libobjc.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 3, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-Under Section 7 of GPL version 3, you are granted additional
-permissions described in the GCC Runtime Library Exception, version
-3.1, as published by the Free Software Foundation.
-
-You should have received a copy of the GNU General Public License and
-a copy of the GCC Runtime Library Exception along with this program;
-see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-<http://www.gnu.org/licenses/>.  */
-
-#ifndef _GLIBCXX_GCC_GTHR_POSIX_H
-#define _GLIBCXX_GCC_GTHR_POSIX_H
-
-/* POSIX threads specific definitions.
-   Easy, since the interface is just one-to-one mapping.  */
-
-#define __GTHREADS 1
-#define __GTHREADS_CXX0X 1
-
-#include <pthread.h>
-
-#if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
-     || !defined(_GTHREAD_USE_MUTEX_TIMEDLOCK))
-# include <unistd.h>
-# if defined(_POSIX_TIMEOUTS) && _POSIX_TIMEOUTS >= 0
-#  define _GTHREAD_USE_MUTEX_TIMEDLOCK 1
-# else
-#  define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
-# endif
-#endif
-
-typedef pthread_t __gthread_t;
-typedef pthread_key_t __gthread_key_t;
-typedef pthread_once_t __gthread_once_t;
-typedef pthread_mutex_t __gthread_mutex_t;
-typedef pthread_mutex_t __gthread_recursive_mutex_t;
-typedef pthread_cond_t __gthread_cond_t;
-typedef struct timespec __gthread_time_t;
-
-/* POSIX like conditional variables are supported.  Please look at comments
-   in gthr.h for details. */
-#define __GTHREAD_HAS_COND	1
-
-#define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
-#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
-#define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
-#define __GTHREAD_RECURSIVE_MUTEX_INIT PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-#elif defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
-#define __GTHREAD_RECURSIVE_MUTEX_INIT PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#else
-#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
-#endif
-#define __GTHREAD_COND_INIT PTHREAD_COND_INITIALIZER
-#define __GTHREAD_TIME_INIT {0,0}
-
-#ifdef _GTHREAD_USE_MUTEX_INIT_FUNC
-# undef __GTHREAD_MUTEX_INIT
-#endif
-#ifdef _GTHREAD_USE_RECURSIVE_MUTEX_INIT_FUNC
-# undef __GTHREAD_RECURSIVE_MUTEX_INIT
-# undef __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION
-# define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
-#endif
-#ifdef _GTHREAD_USE_COND_INIT_FUNC
-# undef __GTHREAD_COND_INIT
-# define __GTHREAD_COND_INIT_FUNCTION __gthread_cond_init_function
-#endif
-
-#if __GXX_WEAK__ && _GLIBCXX_GTHREAD_USE_WEAK
-# ifndef __gthrw_pragma
-#  define __gthrw_pragma(pragma)
-# endif
-# define __gthrw2(name,name2,type) \
-  static __typeof(type) name __attribute__ ((__weakref__(#name2))); \
-  __gthrw_pragma(weak type)
-# define __gthrw_(name) __gthrw_ ## name
-#else
-# define __gthrw2(name,name2,type)
-# define __gthrw_(name) name
-#endif
-
-/* Typically, __gthrw_foo is a weak reference to symbol foo.  */
-#define __gthrw(name) __gthrw2(__gthrw_ ## name,name,name)
-
-__gthrw(pthread_once)
-__gthrw(pthread_getspecific)
-__gthrw(pthread_setspecific)
-
-__gthrw(pthread_create)
-__gthrw(pthread_join)
-__gthrw(pthread_equal)
-__gthrw(pthread_self)
-__gthrw(pthread_detach)
-#ifndef __BIONIC__
-__gthrw(pthread_cancel)
-#endif
-__gthrw(sched_yield)
-
-__gthrw(pthread_mutex_lock)
-__gthrw(pthread_mutex_trylock)
-#if _GTHREAD_USE_MUTEX_TIMEDLOCK
-__gthrw(pthread_mutex_timedlock)
-#endif
-__gthrw(pthread_mutex_unlock)
-__gthrw(pthread_mutex_init)
-__gthrw(pthread_mutex_destroy)
-
-__gthrw(pthread_cond_init)
-__gthrw(pthread_cond_broadcast)
-__gthrw(pthread_cond_signal)
-__gthrw(pthread_cond_wait)
-__gthrw(pthread_cond_timedwait)
-__gthrw(pthread_cond_destroy)
-
-__gthrw(pthread_key_create)
-__gthrw(pthread_key_delete)
-__gthrw(pthread_mutexattr_init)
-__gthrw(pthread_mutexattr_settype)
-__gthrw(pthread_mutexattr_destroy)
-
-
-#if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
-/* Objective-C.  */
-__gthrw(pthread_exit)
-#ifdef _POSIX_PRIORITY_SCHEDULING
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-__gthrw(sched_get_priority_max)
-__gthrw(sched_get_priority_min)
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#endif /* _POSIX_PRIORITY_SCHEDULING */
-__gthrw(pthread_attr_destroy)
-__gthrw(pthread_attr_init)
-__gthrw(pthread_attr_setdetachstate)
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-__gthrw(pthread_getschedparam)
-__gthrw(pthread_setschedparam)
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#endif /* _LIBOBJC || _LIBOBJC_WEAK */
-
-#if __GXX_WEAK__ && _GLIBCXX_GTHREAD_USE_WEAK
-
-/* On Solaris 2.6 up to 9, the libc exposes a POSIX threads interface even if
-   -pthreads is not specified.  The functions are dummies and most return an
-   error value.  However pthread_once returns 0 without invoking the routine
-   it is passed so we cannot pretend that the interface is active if -pthreads
-   is not specified.  On Solaris 2.5.1, the interface is not exposed at all so
-   we need to play the usual game with weak symbols.  On Solaris 10 and up, a
-   working interface is always exposed.  On FreeBSD 6 and later, libc also
-   exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up
-   to 9 does.  FreeBSD >= 700014 even provides a pthread_cancel stub in libc,
-   which means the alternate __gthread_active_p below cannot be used there.  */
-
-#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__))
-
-static volatile int __gthread_active = -1;
-
-static void
-__gthread_trigger (void)
-{
-  __gthread_active = 1;
-}
-
-static inline int
-__gthread_active_p (void)
-{
-  static pthread_mutex_t __gthread_active_mutex = PTHREAD_MUTEX_INITIALIZER;
-  static pthread_once_t __gthread_active_once = PTHREAD_ONCE_INIT;
-
-  /* Avoid reading __gthread_active twice on the main code path.  */
-  int __gthread_active_latest_value = __gthread_active;
-
-  /* This test is not protected to avoid taking a lock on the main code
-     path so every update of __gthread_active in a threaded program must
-     be atomic with regard to the result of the test.  */
-  if (__builtin_expect (__gthread_active_latest_value < 0, 0))
-    {
-      if (__gthrw_(pthread_once))
-	{
-	  /* If this really is a threaded program, then we must ensure that
-	     __gthread_active has been set to 1 before exiting this block.  */
-	  __gthrw_(pthread_mutex_lock) (&__gthread_active_mutex);
-	  __gthrw_(pthread_once) (&__gthread_active_once, __gthread_trigger);
-	  __gthrw_(pthread_mutex_unlock) (&__gthread_active_mutex);
-	}
-
-      /* Make sure we'll never enter this block again.  */
-      if (__gthread_active < 0)
-	__gthread_active = 0;
-
-      __gthread_active_latest_value = __gthread_active;
-    }
-
-  return __gthread_active_latest_value != 0;
-}
-
-#else /* neither FreeBSD nor Solaris */
-
-/* For a program to be multi-threaded the only thing that it certainly must
-   be using is pthread_create.  However, there may be other libraries that
-   intercept pthread_create with their own definitions to wrap pthreads
-   functionality for some purpose.  In those cases, pthread_create being
-   defined might not necessarily mean that libpthread is actually linked
-   in.
-
-   For the GNU C library, we can use a known internal name.  This is always
-   available in the ABI, but no other library would define it.  That is
-   ideal, since any public pthread function might be intercepted just as
-   pthread_create might be.  __pthread_key_create is an "internal"
-   implementation symbol, but it is part of the public exported ABI.  Also,
-   it's among the symbols that the static libpthread.a always links in
-   whenever pthread_create is used, so there is no danger of a false
-   negative result in any statically-linked, multi-threaded program.
-
-   For others, we choose pthread_cancel as a function that seems unlikely
-   to be redefined by an interceptor library.  The bionic (Android) C
-   library does not provide pthread_cancel, so we do use pthread_create
-   there (and interceptor libraries lose).  */
-
-#ifdef __GLIBC__
-__gthrw2(__gthrw_(__pthread_key_create),
-	 __pthread_key_create,
-	 pthread_key_create)
-# define GTHR_ACTIVE_PROXY	__gthrw_(__pthread_key_create)
-#elif defined (__BIONIC__)
-# define GTHR_ACTIVE_PROXY	__gthrw_(pthread_create)
-#else
-# define GTHR_ACTIVE_PROXY	__gthrw_(pthread_cancel)
-#endif
-
-static inline int
-__gthread_active_p (void)
-{
-  static void *const __gthread_active_ptr
-    = __extension__ (void *) &GTHR_ACTIVE_PROXY;
-  return __gthread_active_ptr != 0;
-}
-
-#endif /* FreeBSD or Solaris */
-
-#else /* not __GXX_WEAK__ */
-
-/* Similar to Solaris, HP-UX 11 for PA-RISC provides stubs for pthread
-   calls in shared flavors of the HP-UX C library.  Most of the stubs
-   have no functionality.  The details are described in the "libc cumulative
-   patch" for each subversion of HP-UX 11.  There are two special interfaces
-   provided for checking whether an application is linked to a shared pthread
-   library or not.  However, these interfaces aren't available in early
-   libpthread libraries.  We also need a test that works for archive
-   libraries.  We can't use pthread_once as some libc versions call the
-   init function.  We also can't use pthread_create or pthread_attr_init
-   as these create a thread and thereby prevent changing the default stack
-   size.  The function pthread_default_stacksize_np is available in both
-   the archive and shared versions of libpthread.   It can be used to
-   determine the default pthread stack size.  There is a stub in some
-   shared libc versions which returns a zero size if pthreads are not
-   active.  We provide an equivalent stub to handle cases where libc
-   doesn't provide one.  */
-
-#if defined(__hppa__) && defined(__hpux__)
-
-static volatile int __gthread_active = -1;
-
-static inline int
-__gthread_active_p (void)
-{
-  /* Avoid reading __gthread_active twice on the main code path.  */
-  int __gthread_active_latest_value = __gthread_active;
-  size_t __s;
-
-  if (__builtin_expect (__gthread_active_latest_value < 0, 0))
-    {
-      pthread_default_stacksize_np (0, &__s);
-      __gthread_active = __s ? 1 : 0;
-      __gthread_active_latest_value = __gthread_active;
-    }
-
-  return __gthread_active_latest_value != 0;
-}
-
-#else /* not hppa-hpux */
-
-static inline int
-__gthread_active_p (void)
-{
-  return 1;
-}
-
-#endif /* hppa-hpux */
-
-#endif /* __GXX_WEAK__ */
-
-#ifdef _LIBOBJC
-
-/* This is the config.h file in libobjc/ */
-#include <config.h>
-
-#ifdef HAVE_SCHED_H
-# include <sched.h>
-#endif
-
-/* Key structure for maintaining thread specific storage */
-static pthread_key_t _objc_thread_storage;
-static pthread_attr_t _objc_thread_attribs;
-
-/* Thread local storage for a single thread */
-static void *thread_local_storage = NULL;
-
-/* Backend initialization functions */
-
-/* Initialize the threads subsystem.  */
-static inline int
-__gthread_objc_init_thread_system (void)
-{
-  if (__gthread_active_p ())
-    {
-      /* Initialize the thread storage key.  */
-      if (__gthrw_(pthread_key_create) (&_objc_thread_storage, NULL) == 0)
-	{
-	  /* The normal default detach state for threads is
-	   * PTHREAD_CREATE_JOINABLE which causes threads to not die
-	   * when you think they should.  */
-	  if (__gthrw_(pthread_attr_init) (&_objc_thread_attribs) == 0
-	      && __gthrw_(pthread_attr_setdetachstate) (&_objc_thread_attribs,
-					      PTHREAD_CREATE_DETACHED) == 0)
-	    return 0;
-	}
-    }
-
-  return -1;
-}
-
-/* Close the threads subsystem.  */
-static inline int
-__gthread_objc_close_thread_system (void)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(pthread_key_delete) (_objc_thread_storage) == 0
-      && __gthrw_(pthread_attr_destroy) (&_objc_thread_attribs) == 0)
-    return 0;
-
-  return -1;
-}
-
-/* Backend thread functions */
-
-/* Create a new thread of execution.  */
-static inline objc_thread_t
-__gthread_objc_thread_detach (void (*func)(void *), void *arg)
-{
-  objc_thread_t thread_id;
-  pthread_t new_thread_handle;
-
-  if (!__gthread_active_p ())
-    return NULL;
-
-  if (!(__gthrw_(pthread_create) (&new_thread_handle, &_objc_thread_attribs,
-				  (void *) func, arg)))
-    thread_id = (objc_thread_t) new_thread_handle;
-  else
-    thread_id = NULL;
-
-  return thread_id;
-}
-
-/* Set the current thread's priority.  */
-static inline int
-__gthread_objc_thread_set_priority (int priority)
-{
-  if (!__gthread_active_p ())
-    return -1;
-  else
-    {
-#ifdef _POSIX_PRIORITY_SCHEDULING
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-      pthread_t thread_id = __gthrw_(pthread_self) ();
-      int policy;
-      struct sched_param params;
-      int priority_min, priority_max;
-
-      if (__gthrw_(pthread_getschedparam) (thread_id, &policy, &params) == 0)
-	{
-	  if ((priority_max = __gthrw_(sched_get_priority_max) (policy)) == -1)
-	    return -1;
-
-	  if ((priority_min = __gthrw_(sched_get_priority_min) (policy)) == -1)
-	    return -1;
-
-	  if (priority > priority_max)
-	    priority = priority_max;
-	  else if (priority < priority_min)
-	    priority = priority_min;
-	  params.sched_priority = priority;
-
-	  /*
-	   * The solaris 7 and several other man pages incorrectly state that
-	   * this should be a pointer to policy but pthread.h is universally
-	   * at odds with this.
-	   */
-	  if (__gthrw_(pthread_setschedparam) (thread_id, policy, &params) == 0)
-	    return 0;
-	}
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#endif /* _POSIX_PRIORITY_SCHEDULING */
-      return -1;
-    }
-}
-
-/* Return the current thread's priority.  */
-static inline int
-__gthread_objc_thread_get_priority (void)
-{
-#ifdef _POSIX_PRIORITY_SCHEDULING
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-  if (__gthread_active_p ())
-    {
-      int policy;
-      struct sched_param params;
-
-      if (__gthrw_(pthread_getschedparam) (__gthrw_(pthread_self) (), &policy, &params) == 0)
-	return params.sched_priority;
-      else
-	return -1;
-    }
-  else
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#endif /* _POSIX_PRIORITY_SCHEDULING */
-    return OBJC_THREAD_INTERACTIVE_PRIORITY;
-}
-
-/* Yield our process time to another thread.  */
-static inline void
-__gthread_objc_thread_yield (void)
-{
-  if (__gthread_active_p ())
-    __gthrw_(sched_yield) ();
-}
-
-/* Terminate the current thread.  */
-static inline int
-__gthread_objc_thread_exit (void)
-{
-  if (__gthread_active_p ())
-    /* exit the thread */
-    __gthrw_(pthread_exit) (&__objc_thread_exit_status);
-
-  /* Failed if we reached here */
-  return -1;
-}
-
-/* Returns an integer value which uniquely describes a thread.  */
-static inline objc_thread_t
-__gthread_objc_thread_id (void)
-{
-  if (__gthread_active_p ())
-    return (objc_thread_t) __gthrw_(pthread_self) ();
-  else
-    return (objc_thread_t) 1;
-}
-
-/* Sets the thread's local storage pointer.  */
-static inline int
-__gthread_objc_thread_set_data (void *value)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_setspecific) (_objc_thread_storage, value);
-  else
-    {
-      thread_local_storage = value;
-      return 0;
-    }
-}
-
-/* Returns the thread's local storage pointer.  */
-static inline void *
-__gthread_objc_thread_get_data (void)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_getspecific) (_objc_thread_storage);
-  else
-    return thread_local_storage;
-}
-
-/* Backend mutex functions */
-
-/* Allocate a mutex.  */
-static inline int
-__gthread_objc_mutex_allocate (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    {
-      mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
-
-      if (__gthrw_(pthread_mutex_init) ((pthread_mutex_t *) mutex->backend, NULL))
-	{
-	  objc_free (mutex->backend);
-	  mutex->backend = NULL;
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-/* Deallocate a mutex.  */
-static inline int
-__gthread_objc_mutex_deallocate (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    {
-      int count;
-
-      /*
-       * Posix Threads specifically require that the thread be unlocked
-       * for __gthrw_(pthread_mutex_destroy) to work.
-       */
-
-      do
-	{
-	  count = __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend);
-	  if (count < 0)
-	    return -1;
-	}
-      while (count);
-
-      if (__gthrw_(pthread_mutex_destroy) ((pthread_mutex_t *) mutex->backend))
-	return -1;
-
-      objc_free (mutex->backend);
-      mutex->backend = NULL;
-    }
-  return 0;
-}
-
-/* Grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_lock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(pthread_mutex_lock) ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Try to grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_trylock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(pthread_mutex_trylock) ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Unlock the mutex */
-static inline int
-__gthread_objc_mutex_unlock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Backend condition mutex functions */
-
-/* Allocate a condition.  */
-static inline int
-__gthread_objc_condition_allocate (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    {
-      condition->backend = objc_malloc (sizeof (pthread_cond_t));
-
-      if (__gthrw_(pthread_cond_init) ((pthread_cond_t *) condition->backend, NULL))
-	{
-	  objc_free (condition->backend);
-	  condition->backend = NULL;
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-/* Deallocate a condition.  */
-static inline int
-__gthread_objc_condition_deallocate (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    {
-      if (__gthrw_(pthread_cond_destroy) ((pthread_cond_t *) condition->backend))
-	return -1;
-
-      objc_free (condition->backend);
-      condition->backend = NULL;
-    }
-  return 0;
-}
-
-/* Wait on the condition */
-static inline int
-__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_cond_wait) ((pthread_cond_t *) condition->backend,
-			      (pthread_mutex_t *) mutex->backend);
-  else
-    return 0;
-}
-
-/* Wake up all threads waiting on this condition.  */
-static inline int
-__gthread_objc_condition_broadcast (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_cond_broadcast) ((pthread_cond_t *) condition->backend);
-  else
-    return 0;
-}
-
-/* Wake up one thread waiting on this condition.  */
-static inline int
-__gthread_objc_condition_signal (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_cond_signal) ((pthread_cond_t *) condition->backend);
-  else
-    return 0;
-}
-
-#else /* _LIBOBJC */
-
-static inline int
-__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
-		  void *__args)
-{
-  return __gthrw_(pthread_create) (__threadid, NULL, __func, __args);
-}
-
-static inline int
-__gthread_join (__gthread_t __threadid, void **__value_ptr)
-{
-  return __gthrw_(pthread_join) (__threadid, __value_ptr);
-}
-
-static inline int
-__gthread_detach (__gthread_t __threadid)
-{
-  return __gthrw_(pthread_detach) (__threadid);
-}
-
-static inline int
-__gthread_equal (__gthread_t __t1, __gthread_t __t2)
-{
-  return __gthrw_(pthread_equal) (__t1, __t2);
-}
-
-static inline __gthread_t
-__gthread_self (void)
-{
-  return __gthrw_(pthread_self) ();
-}
-
-static inline int
-__gthread_yield (void)
-{
-  return __gthrw_(sched_yield) ();
-}
-
-static inline int
-__gthread_once (__gthread_once_t *__once, void (*__func) (void))
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_once) (__once, __func);
-  else
-    return -1;
-}
-
-static inline int
-__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
-{
-  return __gthrw_(pthread_key_create) (__key, __dtor);
-}
-
-static inline int
-__gthread_key_delete (__gthread_key_t __key)
-{
-  return __gthrw_(pthread_key_delete) (__key);
-}
-
-static inline void *
-__gthread_getspecific (__gthread_key_t __key)
-{
-  return __gthrw_(pthread_getspecific) (__key);
-}
-
-static inline int
-__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
-{
-  return __gthrw_(pthread_setspecific) (__key, __ptr);
-}
-
-static inline void
-__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    __gthrw_(pthread_mutex_init) (__mutex, NULL);
-}
-
-static inline int
-__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_destroy) (__mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_lock (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_lock) (__mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_trylock) (__mutex);
-  else
-    return 0;
-}
-
-#if _GTHREAD_USE_MUTEX_TIMEDLOCK
-static inline int
-__gthread_mutex_timedlock (__gthread_mutex_t *__mutex,
-			   const __gthread_time_t *__abs_timeout)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_timedlock) (__mutex, __abs_timeout);
-  else
-    return 0;
-}
-#endif
-
-static inline int
-__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_unlock) (__mutex);
-  else
-    return 0;
-}
-
-#if !defined( PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) \
-  || defined(_GTHREAD_USE_RECURSIVE_MUTEX_INIT_FUNC)
-static inline int
-__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    {
-      pthread_mutexattr_t __attr;
-      int __r;
-
-      __r = __gthrw_(pthread_mutexattr_init) (&__attr);
-      if (!__r)
-	__r = __gthrw_(pthread_mutexattr_settype) (&__attr,
-						   PTHREAD_MUTEX_RECURSIVE);
-      if (!__r)
-	__r = __gthrw_(pthread_mutex_init) (__mutex, &__attr);
-      if (!__r)
-	__r = __gthrw_(pthread_mutexattr_destroy) (&__attr);
-      return __r;
-    }
-  return 0;
-}
-#endif
-
-static inline int
-__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_lock (__mutex);
-}
-
-static inline int
-__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_trylock (__mutex);
-}
-
-#if _GTHREAD_USE_MUTEX_TIMEDLOCK
-static inline int
-__gthread_recursive_mutex_timedlock (__gthread_recursive_mutex_t *__mutex,
-				     const __gthread_time_t *__abs_timeout)
-{
-  return __gthread_mutex_timedlock (__mutex, __abs_timeout);
-}
-#endif
-
-static inline int
-__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_unlock (__mutex);
-}
-
-static inline int
-__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_destroy (__mutex);
-}
-
-#ifdef _GTHREAD_USE_COND_INIT_FUNC
-static inline void
-__gthread_cond_init_function (__gthread_cond_t *__cond)
-{
-  if (__gthread_active_p ())
-    __gthrw_(pthread_cond_init) (__cond, NULL);
-}
-#endif
-
-static inline int
-__gthread_cond_broadcast (__gthread_cond_t *__cond)
-{
-  return __gthrw_(pthread_cond_broadcast) (__cond);
-}
-
-static inline int
-__gthread_cond_signal (__gthread_cond_t *__cond)
-{
-  return __gthrw_(pthread_cond_signal) (__cond);
-}
-
-static inline int
-__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
-{
-  return __gthrw_(pthread_cond_wait) (__cond, __mutex);
-}
-
-static inline int
-__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
-			  const __gthread_time_t *__abs_timeout)
-{
-  return __gthrw_(pthread_cond_timedwait) (__cond, __mutex, __abs_timeout);
-}
-
-static inline int
-__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
-			       __gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_cond_wait (__cond, __mutex);
-}
-
-static inline int
-__gthread_cond_destroy (__gthread_cond_t* __cond)
-{
-  return __gthrw_(pthread_cond_destroy) (__cond);
-}
-
-#endif /* _LIBOBJC */
-
-#endif /* ! _GLIBCXX_GCC_GTHR_POSIX_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr-single.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr-single.h
deleted file mode 100644
index 5961537..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr-single.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/* Threads compatibility routines for libgcc2 and libobjc.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 3, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-Under Section 7 of GPL version 3, you are granted additional
-permissions described in the GCC Runtime Library Exception, version
-3.1, as published by the Free Software Foundation.
-
-You should have received a copy of the GNU General Public License and
-a copy of the GCC Runtime Library Exception along with this program;
-see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-<http://www.gnu.org/licenses/>.  */
-
-#ifndef _GLIBCXX_GCC_GTHR_SINGLE_H
-#define _GLIBCXX_GCC_GTHR_SINGLE_H
-
-/* Just provide compatibility for mutex handling.  */
-
-typedef int __gthread_key_t;
-typedef int __gthread_once_t;
-typedef int __gthread_mutex_t;
-typedef int __gthread_recursive_mutex_t;
-
-#define __GTHREAD_ONCE_INIT 0
-#define __GTHREAD_MUTEX_INIT 0
-#define __GTHREAD_MUTEX_INIT_FUNCTION(mx)
-#define __GTHREAD_RECURSIVE_MUTEX_INIT 0
-
-#define _GLIBCXX_UNUSED __attribute__((__unused__))
-
-#ifdef _LIBOBJC
-
-/* Thread local storage for a single thread */
-static void *thread_local_storage = NULL;
-
-/* Backend initialization functions */
-
-/* Initialize the threads subsystem.  */
-static inline int
-__gthread_objc_init_thread_system (void)
-{
-  /* No thread support available */
-  return -1;
-}
-
-/* Close the threads subsystem.  */
-static inline int
-__gthread_objc_close_thread_system (void)
-{
-  /* No thread support available */
-  return -1;
-}
-
-/* Backend thread functions */
-
-/* Create a new thread of execution.  */
-static inline objc_thread_t
-__gthread_objc_thread_detach (void (* func)(void *), void * arg _GLIBCXX_UNUSED)
-{
-  /* No thread support available */
-  return NULL;
-}
-
-/* Set the current thread's priority.  */
-static inline int
-__gthread_objc_thread_set_priority (int priority _GLIBCXX_UNUSED)
-{
-  /* No thread support available */
-  return -1;
-}
-
-/* Return the current thread's priority.  */
-static inline int
-__gthread_objc_thread_get_priority (void)
-{
-  return OBJC_THREAD_INTERACTIVE_PRIORITY;
-}
-
-/* Yield our process time to another thread.  */
-static inline void
-__gthread_objc_thread_yield (void)
-{
-  return;
-}
-
-/* Terminate the current thread.  */
-static inline int
-__gthread_objc_thread_exit (void)
-{
-  /* No thread support available */
-  /* Should we really exit the program */
-  /* exit (&__objc_thread_exit_status); */
-  return -1;
-}
-
-/* Returns an integer value which uniquely describes a thread.  */
-static inline objc_thread_t
-__gthread_objc_thread_id (void)
-{
-  /* No thread support, use 1.  */
-  return (objc_thread_t) 1;
-}
-
-/* Sets the thread's local storage pointer.  */
-static inline int
-__gthread_objc_thread_set_data (void *value)
-{
-  thread_local_storage = value;
-  return 0;
-}
-
-/* Returns the thread's local storage pointer.  */
-static inline void *
-__gthread_objc_thread_get_data (void)
-{
-  return thread_local_storage;
-}
-
-/* Backend mutex functions */
-
-/* Allocate a mutex.  */
-static inline int
-__gthread_objc_mutex_allocate (objc_mutex_t mutex _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-/* Deallocate a mutex.  */
-static inline int
-__gthread_objc_mutex_deallocate (objc_mutex_t mutex _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-/* Grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_lock (objc_mutex_t mutex _GLIBCXX_UNUSED)
-{
-  /* There can only be one thread, so we always get the lock */
-  return 0;
-}
-
-/* Try to grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_trylock (objc_mutex_t mutex _GLIBCXX_UNUSED)
-{
-  /* There can only be one thread, so we always get the lock */
-  return 0;
-}
-
-/* Unlock the mutex */
-static inline int
-__gthread_objc_mutex_unlock (objc_mutex_t mutex _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-/* Backend condition mutex functions */
-
-/* Allocate a condition.  */
-static inline int
-__gthread_objc_condition_allocate (objc_condition_t condition _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-/* Deallocate a condition.  */
-static inline int
-__gthread_objc_condition_deallocate (objc_condition_t condition _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-/* Wait on the condition */
-static inline int
-__gthread_objc_condition_wait (objc_condition_t condition _GLIBCXX_UNUSED,
-			       objc_mutex_t mutex _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-/* Wake up all threads waiting on this condition.  */
-static inline int
-__gthread_objc_condition_broadcast (objc_condition_t condition _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-/* Wake up one thread waiting on this condition.  */
-static inline int
-__gthread_objc_condition_signal (objc_condition_t condition _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-#else /* _LIBOBJC */
-
-static inline int
-__gthread_active_p (void)
-{
-  return 0;
-}
-
-static inline int
-__gthread_once (__gthread_once_t *__once _GLIBCXX_UNUSED, void (*__func) (void) _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-static inline int _GLIBCXX_UNUSED
-__gthread_key_create (__gthread_key_t *__key _GLIBCXX_UNUSED, void (*__func) (void *) _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-static int _GLIBCXX_UNUSED
-__gthread_key_delete (__gthread_key_t __key _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-static inline void *
-__gthread_getspecific (__gthread_key_t __key _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-static inline int
-__gthread_setspecific (__gthread_key_t __key _GLIBCXX_UNUSED, const void *__v _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-static inline int
-__gthread_mutex_destroy (__gthread_mutex_t *__mutex _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-static inline int
-__gthread_mutex_lock (__gthread_mutex_t *__mutex _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-static inline int
-__gthread_mutex_trylock (__gthread_mutex_t *__mutex _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-static inline int
-__gthread_mutex_unlock (__gthread_mutex_t *__mutex _GLIBCXX_UNUSED)
-{
-  return 0;
-}
-
-static inline int
-__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_lock (__mutex);
-}
-
-static inline int
-__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_trylock (__mutex);
-}
-
-static inline int
-__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_unlock (__mutex);
-}
-
-static inline int
-__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
-{
-  return __gthread_mutex_destroy (__mutex);
-}
-
-#endif /* _LIBOBJC */
-
-#undef _GLIBCXX_UNUSED
-
-#endif /* ! _GLIBCXX_GCC_GTHR_SINGLE_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr.h
deleted file mode 100644
index 0732e04..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/gthr.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Threads compatibility routines for libgcc2.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 3, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-Under Section 7 of GPL version 3, you are granted additional
-permissions described in the GCC Runtime Library Exception, version
-3.1, as published by the Free Software Foundation.
-
-You should have received a copy of the GNU General Public License and
-a copy of the GCC Runtime Library Exception along with this program;
-see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-<http://www.gnu.org/licenses/>.  */
-
-#ifndef _GLIBCXX_GCC_GTHR_H
-#define _GLIBCXX_GCC_GTHR_H
-
-#ifndef _GLIBCXX_HIDE_EXPORTS
-#pragma GCC visibility push(default)
-#endif
-
-/* If this file is compiled with threads support, it must
-       #define __GTHREADS 1
-   to indicate that threads support is present.  Also it has define
-   function
-     int __gthread_active_p ()
-   that returns 1 if thread system is active, 0 if not.
-
-   The threads interface must define the following types:
-     __gthread_key_t
-     __gthread_once_t
-     __gthread_mutex_t
-     __gthread_recursive_mutex_t
-
-   The threads interface must define the following macros:
-
-     __GTHREAD_ONCE_INIT
-     		to initialize __gthread_once_t
-     __GTHREAD_MUTEX_INIT
-     		to initialize __gthread_mutex_t to get a fast
-		non-recursive mutex.
-     __GTHREAD_MUTEX_INIT_FUNCTION
-		to initialize __gthread_mutex_t to get a fast
-		non-recursive mutex.
-		Define this to a function which looks like this:
-		  void __GTHREAD_MUTEX_INIT_FUNCTION (__gthread_mutex_t *)
-     		Some systems can't initialize a mutex without a
-		function call.  Don't define __GTHREAD_MUTEX_INIT in this case.
-     __GTHREAD_RECURSIVE_MUTEX_INIT
-     __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION
-     		as above, but for a recursive mutex.
-
-   The threads interface must define the following static functions:
-
-     int __gthread_once (__gthread_once_t *once, void (*func) ())
-
-     int __gthread_key_create (__gthread_key_t *keyp, void (*dtor) (void *))
-     int __gthread_key_delete (__gthread_key_t key)
-
-     void *__gthread_getspecific (__gthread_key_t key)
-     int __gthread_setspecific (__gthread_key_t key, const void *ptr)
-
-     int __gthread_mutex_destroy (__gthread_mutex_t *mutex);
-     int __gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *mutex);
-
-     int __gthread_mutex_lock (__gthread_mutex_t *mutex);
-     int __gthread_mutex_trylock (__gthread_mutex_t *mutex);
-     int __gthread_mutex_unlock (__gthread_mutex_t *mutex);
-
-     int __gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex);
-     int __gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex);
-     int __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex);
-
-   The following are supported in POSIX threads only. They are required to
-   fix a deadlock in static initialization inside libsupc++. The header file
-   gthr-posix.h defines a symbol __GTHREAD_HAS_COND to signify that these extra
-   features are supported.
-
-   Types:
-     __gthread_cond_t
-
-   Macros:
-     __GTHREAD_COND_INIT
-     __GTHREAD_COND_INIT_FUNCTION
-
-   Interface:
-     int __gthread_cond_broadcast (__gthread_cond_t *cond);
-     int __gthread_cond_wait (__gthread_cond_t *cond, __gthread_mutex_t *mutex);
-     int __gthread_cond_wait_recursive (__gthread_cond_t *cond,
-					__gthread_recursive_mutex_t *mutex);
-
-   All functions returning int should return zero on success or the error
-   number.  If the operation is not supported, -1 is returned.
-
-   If the following are also defined, you should
-     #define __GTHREADS_CXX0X 1
-   to enable the c++0x thread library.
-
-   Types:
-     __gthread_t
-     __gthread_time_t
-
-   Interface:
-     int __gthread_create (__gthread_t *thread, void *(*func) (void*),
-                           void *args);
-     int __gthread_join (__gthread_t thread, void **value_ptr);
-     int __gthread_detach (__gthread_t thread);
-     int __gthread_equal (__gthread_t t1, __gthread_t t2);
-     __gthread_t __gthread_self (void);
-     int __gthread_yield (void);
-
-     int __gthread_mutex_timedlock (__gthread_mutex_t *m,
-                                    const __gthread_time_t *abs_timeout);
-     int __gthread_recursive_mutex_timedlock (__gthread_recursive_mutex_t *m,
-                                          const __gthread_time_t *abs_time);
-
-     int __gthread_cond_signal (__gthread_cond_t *cond);
-     int __gthread_cond_timedwait (__gthread_cond_t *cond,
-                                   __gthread_mutex_t *mutex,
-                                   const __gthread_time_t *abs_timeout);
-
-*/
-
-#if __GXX_WEAK__
-/* The pe-coff weak support isn't fully compatible to ELF's weak.
-   For static libraries it might would work, but as we need to deal
-   with shared versions too, we disable it for mingw-targets.  */
-#ifdef __MINGW32__
-#undef _GLIBCXX_GTHREAD_USE_WEAK
-#define _GLIBCXX_GTHREAD_USE_WEAK 0
-#endif
-
-#ifndef _GLIBCXX_GTHREAD_USE_WEAK
-#define _GLIBCXX_GTHREAD_USE_WEAK 1
-#endif
-#endif
-#include <bits/gthr-default.h>
-
-#ifndef _GLIBCXX_HIDE_EXPORTS
-#pragma GCC visibility pop
-#endif
-
-#endif /* ! _GLIBCXX_GCC_GTHR_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/messages_members.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/messages_members.h
deleted file mode 100644
index a4964de..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/messages_members.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// std::messages implementation details, GNU version -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/messages_members.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.2.7.1.2  messages functions
-//
-
-// Written by Benjamin Kosnik <bkoz@redhat.com>
-
-#include <libintl.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Non-virtual member functions.
-  template<typename _CharT>
-    messages<_CharT>::messages(size_t __refs)
-    : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
-      _M_name_messages(_S_get_c_name())
-    { }
-
-  template<typename _CharT>
-    messages<_CharT>::messages(__c_locale __cloc, const char* __s,
-			       size_t __refs)
-    : facet(__refs), _M_c_locale_messages(0), _M_name_messages(0)
-    {
-      if (__builtin_strcmp(__s, _S_get_c_name()) != 0)
-	{
-	  const size_t __len = __builtin_strlen(__s) + 1;
-	  char* __tmp = new char[__len];
-	  __builtin_memcpy(__tmp, __s, __len);
-	  _M_name_messages = __tmp;
-	}
-      else
-	_M_name_messages = _S_get_c_name();
-
-      // Last to avoid leaking memory if new throws.
-      _M_c_locale_messages = _S_clone_c_locale(__cloc);
-    }
-
-  template<typename _CharT>
-    typename messages<_CharT>::catalog
-    messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
-			   const char* __dir) const
-    {
-      bindtextdomain(__s.c_str(), __dir);
-      return this->do_open(__s, __loc);
-    }
-
-  // Virtual member functions.
-  template<typename _CharT>
-    messages<_CharT>::~messages()
-    {
-      if (_M_name_messages != _S_get_c_name())
-	delete [] _M_name_messages;
-      _S_destroy_c_locale(_M_c_locale_messages);
-    }
-
-  template<typename _CharT>
-    typename messages<_CharT>::catalog
-    messages<_CharT>::do_open(const basic_string<char>& __s,
-			      const locale&) const
-    {
-      // No error checking is done, assume the catalog exists and can
-      // be used.
-      textdomain(__s.c_str());
-      return 0;
-    }
-
-  template<typename _CharT>
-    void
-    messages<_CharT>::do_close(catalog) const
-    { }
-
-  // messages_byname
-  template<typename _CharT>
-    messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-    : messages<_CharT>(__refs)
-    {
-      if (this->_M_name_messages != locale::facet::_S_get_c_name())
-	{
-	  delete [] this->_M_name_messages;
-	  if (__builtin_strcmp(__s, locale::facet::_S_get_c_name()) != 0)
-	    {
-	      const size_t __len = __builtin_strlen(__s) + 1;
-	      char* __tmp = new char[__len];
-	      __builtin_memcpy(__tmp, __s, __len);
-	      this->_M_name_messages = __tmp;
-	    }
-	  else
-	    this->_M_name_messages = locale::facet::_S_get_c_name();
-	}
-
-      if (__builtin_strcmp(__s, "C") != 0
-	  && __builtin_strcmp(__s, "POSIX") != 0)
-	{
-	  this->_S_destroy_c_locale(this->_M_c_locale_messages);
-	  this->_S_create_c_locale(this->_M_c_locale_messages, __s);
-	}
-    }
-
-   //Specializations.
-  template<>
-    typename messages<char>::catalog
-    messages<char>::do_open(const basic_string<char>&,
-			    const locale&) const;
-
-  template<>
-    void
-    messages<char>::do_close(catalog) const;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    typename messages<wchar_t>::catalog
-    messages<wchar_t>::do_open(const basic_string<char>&,
-			       const locale&) const;
-
-  template<>
-    void
-    messages<wchar_t>::do_close(catalog) const;
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/opt_random.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/opt_random.h
deleted file mode 100644
index 3bf2203..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/opt_random.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Optimizations for random number handling, generic version -*- C++ -*-
-
-// Copyright (C) 2012-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/opt_random.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{random}
- */
-
-#ifndef _BITS_OPT_RANDOM_H
-#define _BITS_OPT_RANDOM_H 1
-
-#pragma GCC system_header
-
-
-
-
-#endif // _BITS_OPT_RANDOM_H
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/os_defines.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/os_defines.h
deleted file mode 100644
index 9ac193f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/os_defines.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Specific definitions for GNU/Linux  -*- C++ -*-
-
-// Copyright (C) 2000-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/os_defines.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iosfwd}
- */
-
-#ifndef _GLIBCXX_OS_DEFINES
-#define _GLIBCXX_OS_DEFINES 1
-
-// System-specific #define, typedefs, corrections, etc, go here.  This
-// file will come before all others.
-
-// This keeps isanum, et al from being propagated as macros.
-#define __NO_CTYPE 1
-
-#include <features.h>
-
-// Provide a declaration for the possibly deprecated gets function, as
-// glibc 2.15 and later does not declare gets for ISO C11 when
-// __GNU_SOURCE is defined.
-#if __GLIBC_PREREQ(2,15) && defined(_GNU_SOURCE)
-# undef _GLIBCXX_HAVE_GETS
-#endif
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/stdc++.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/stdc++.h
deleted file mode 100644
index 8449ec0..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/stdc++.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// C++ includes used for precompiling -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file stdc++.h
- *  This is an implementation file for a precompiled header.
- */
-
-// 17.4.1.2 Headers
-
-// C
-#ifndef _GLIBCXX_NO_ASSERT
-#include <cassert>
-#endif
-#include <cctype>
-#include <cerrno>
-#include <cfloat>
-#include <ciso646>
-#include <climits>
-#include <clocale>
-#include <cmath>
-#include <csetjmp>
-#include <csignal>
-#include <cstdarg>
-#include <cstddef>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ctime>
-
-#if __cplusplus >= 201103L
-#include <ccomplex>
-#include <cfenv>
-#include <cinttypes>
-#include <cstdalign>
-#include <cstdbool>
-#include <cstdint>
-#include <ctgmath>
-#include <cwchar>
-#include <cwctype>
-#endif
-
-// C++
-#include <algorithm>
-#include <bitset>
-#include <complex>
-#include <deque>
-#include <exception>
-#include <fstream>
-#include <functional>
-#include <iomanip>
-#include <ios>
-#include <iosfwd>
-#include <iostream>
-#include <istream>
-#include <iterator>
-#include <limits>
-#include <list>
-#include <locale>
-#include <map>
-#include <memory>
-#include <new>
-#include <numeric>
-#include <ostream>
-#include <queue>
-#include <set>
-#include <sstream>
-#include <stack>
-#include <stdexcept>
-#include <streambuf>
-#include <string>
-#include <typeinfo>
-#include <utility>
-#include <valarray>
-#include <vector>
-
-#if __cplusplus >= 201103L
-#include <array>
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <forward_list>
-#include <future>
-#include <initializer_list>
-#include <mutex>
-#include <random>
-#include <ratio>
-#include <regex>
-#include <scoped_allocator>
-#include <system_error>
-#include <thread>
-#include <tuple>
-#include <typeindex>
-#include <type_traits>
-#include <unordered_map>
-#include <unordered_set>
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/stdtr1c++.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/stdtr1c++.h
deleted file mode 100644
index 542059c..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/stdtr1c++.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// C++ includes used for precompiling TR1 -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file stdtr1c++.h
- *  This is an implementation file for a precompiled header.
- */
-
-#include <bits/stdc++.h>
-
-#include <tr1/array>
-#include <tr1/cctype>
-#include <tr1/cfenv>
-#include <tr1/cfloat>
-#include <tr1/cinttypes>
-#include <tr1/climits>
-#include <tr1/cmath>
-#include <tr1/complex>
-#include <tr1/cstdarg>
-#include <tr1/cstdbool>
-#include <tr1/cstdint>
-#include <tr1/cstdio>
-#include <tr1/cstdlib>
-#include <tr1/ctgmath>
-#include <tr1/ctime>
-#include <tr1/cwchar>
-#include <tr1/cwctype>
-#include <tr1/functional>
-#include <tr1/random>
-#include <tr1/tuple>
-#include <tr1/unordered_map>
-#include <tr1/unordered_set>
-#include <tr1/utility>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/time_members.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/time_members.h
deleted file mode 100644
index e05db3b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/bits/time_members.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/time_members.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-//
-
-// Written by Benjamin Kosnik <bkoz@redhat.com>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT>
-    __timepunct<_CharT>::__timepunct(size_t __refs) 
-    : facet(__refs), _M_data(0), _M_c_locale_timepunct(0), 
-      _M_name_timepunct(_S_get_c_name())
-    { _M_initialize_timepunct(); }
-
-  template<typename _CharT>
-    __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) 
-    : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(0), 
-      _M_name_timepunct(_S_get_c_name())
-    { _M_initialize_timepunct(); }
-
-  template<typename _CharT>
-    __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
-				     size_t __refs) 
-    : facet(__refs), _M_data(0), _M_c_locale_timepunct(0), 
-      _M_name_timepunct(0)
-    {
-      if (__builtin_strcmp(__s, _S_get_c_name()) != 0)
-	{
-	  const size_t __len = __builtin_strlen(__s) + 1;
-	  char* __tmp = new char[__len];
-	  __builtin_memcpy(__tmp, __s, __len);
-	  _M_name_timepunct = __tmp;
-	}
-      else
-	_M_name_timepunct = _S_get_c_name();
-
-      __try
-	{ _M_initialize_timepunct(__cloc); }
-      __catch(...)
-	{
-	  if (_M_name_timepunct != _S_get_c_name())
-	    delete [] _M_name_timepunct;
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _CharT>
-    __timepunct<_CharT>::~__timepunct()
-    { 
-      if (_M_name_timepunct != _S_get_c_name())
-	delete [] _M_name_timepunct;
-      delete _M_data; 
-      _S_destroy_c_locale(_M_c_locale_timepunct); 
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
diff --git a/openflow/usr/include/arm-linux-gnueabihf/c++/5/ext/opt_random.h b/openflow/usr/include/arm-linux-gnueabihf/c++/5/ext/opt_random.h
deleted file mode 100644
index f23a1e1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/c++/5/ext/opt_random.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Optimizations for random number extensions, generic version -*- C++ -*-
-
-// Copyright (C) 2012-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/opt_random.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ext/random}
- */
-
-#ifndef _EXT_OPT_RANDOM_H
-#define _EXT_OPT_RANDOM_H 1
-
-#pragma GCC system_header
-
-
-
-
-#endif // _EXT_OPT_RANDOM_H
diff --git a/openflow/usr/include/arm-linux-gnueabihf/expat_config.h b/openflow/usr/include/arm-linux-gnueabihf/expat_config.h
deleted file mode 100644
index 70fe044..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/expat_config.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* expat_config.h.  Generated from expat_config.h.in by configure.  */
-/* expat_config.h.in.  Generated from configure.in by autoheader.  */
-
-/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
-#define BYTEORDER 1234
-
-/* Define to 1 if you have the `bcopy' function. */
-#define HAVE_BCOPY 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "expat-bugs@libexpat.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "expat"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.1.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "expat"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.1.0"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* whether byteorder is bigendian */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to specify how much context to retain around the current parse
-   point. */
-#define XML_CONTEXT_BYTES 1024
-
-/* Define to make parameter entity parsing functionality available. */
-#define XML_DTD 1
-
-/* Define to make XML Namespaces functionality available. */
-#define XML_NS 1
-
-/* Define to __FUNCTION__ or "" if `__func__' does not conform to ANSI C. */
-/* #undef __func__ */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `long int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/ffi.h b/openflow/usr/include/arm-linux-gnueabihf/ffi.h
deleted file mode 100644
index b11d96b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/ffi.h
+++ /dev/null
@@ -1,487 +0,0 @@
-/* -----------------------------------------------------------------*-C-*-
-   libffi 3.2.1 - Copyright (c) 2011, 2014 Anthony Green
-                    - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation
-   files (the ``Software''), to deal in the Software without
-   restriction, including without limitation the rights to use, copy,
-   modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   ----------------------------------------------------------------------- */
-
-/* -------------------------------------------------------------------
-   The basic API is described in the README file.
-
-   The raw API is designed to bypass some of the argument packing
-   and unpacking on architectures for which it can be avoided.
-
-   The closure API allows interpreted functions to be packaged up
-   inside a C function pointer, so that they can be called as C functions,
-   with no understanding on the client side that they are interpreted.
-   It can also be used in other cases in which it is necessary to package
-   up a user specified parameter and a function pointer as a single
-   function pointer.
-
-   The closure API must be implemented in order to get its functionality,
-   e.g. for use by gij.  Routines are provided to emulate the raw API
-   if the underlying platform doesn't allow faster implementation.
-
-   More details on the raw and cloure API can be found in:
-
-   http://gcc.gnu.org/ml/java/1999-q3/msg00138.html
-
-   and
-
-   http://gcc.gnu.org/ml/java/1999-q3/msg00174.html
-   -------------------------------------------------------------------- */
-
-#ifndef LIBFFI_H
-#define LIBFFI_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Specify which architecture libffi is configured for. */
-#ifndef ARM
-#define ARM
-#endif
-
-/* ---- System configuration information --------------------------------- */
-
-#include <ffitarget.h>
-
-#ifndef LIBFFI_ASM
-
-#if defined(_MSC_VER) && !defined(__clang__)
-#define __attribute__(X)
-#endif
-
-#include <stddef.h>
-#include <limits.h>
-
-/* LONG_LONG_MAX is not always defined (not if STRICT_ANSI, for example).
-   But we can find it either under the correct ANSI name, or under GNU
-   C's internal name.  */
-
-#define FFI_64_BIT_MAX 9223372036854775807
-
-#ifdef LONG_LONG_MAX
-# define FFI_LONG_LONG_MAX LONG_LONG_MAX
-#else
-# ifdef LLONG_MAX
-#  define FFI_LONG_LONG_MAX LLONG_MAX
-#  ifdef _AIX52 /* or newer has C99 LLONG_MAX */
-#   undef FFI_64_BIT_MAX
-#   define FFI_64_BIT_MAX 9223372036854775807LL
-#  endif /* _AIX52 or newer */
-# else
-#  ifdef __GNUC__
-#   define FFI_LONG_LONG_MAX __LONG_LONG_MAX__
-#  endif
-#  ifdef _AIX /* AIX 5.1 and earlier have LONGLONG_MAX */
-#   ifndef __PPC64__
-#    if defined (__IBMC__) || defined (__IBMCPP__)
-#     define FFI_LONG_LONG_MAX LONGLONG_MAX
-#    endif
-#   endif /* __PPC64__ */
-#   undef  FFI_64_BIT_MAX
-#   define FFI_64_BIT_MAX 9223372036854775807LL
-#  endif
-# endif
-#endif
-
-/* The closure code assumes that this works on pointers, i.e. a size_t	*/
-/* can hold a pointer.							*/
-
-typedef struct _ffi_type
-{
-  size_t size;
-  unsigned short alignment;
-  unsigned short type;
-  struct _ffi_type **elements;
-} ffi_type;
-
-#ifndef LIBFFI_HIDE_BASIC_TYPES
-#if SCHAR_MAX == 127
-# define ffi_type_uchar                ffi_type_uint8
-# define ffi_type_schar                ffi_type_sint8
-#else
- #error "char size not supported"
-#endif
-
-#if SHRT_MAX == 32767
-# define ffi_type_ushort       ffi_type_uint16
-# define ffi_type_sshort       ffi_type_sint16
-#elif SHRT_MAX == 2147483647
-# define ffi_type_ushort       ffi_type_uint32
-# define ffi_type_sshort       ffi_type_sint32
-#else
- #error "short size not supported"
-#endif
-
-#if INT_MAX == 32767
-# define ffi_type_uint         ffi_type_uint16
-# define ffi_type_sint         ffi_type_sint16
-#elif INT_MAX == 2147483647
-# define ffi_type_uint         ffi_type_uint32
-# define ffi_type_sint         ffi_type_sint32
-#elif INT_MAX == 9223372036854775807
-# define ffi_type_uint         ffi_type_uint64
-# define ffi_type_sint         ffi_type_sint64
-#else
- #error "int size not supported"
-#endif
-
-#if LONG_MAX == 2147483647
-# if FFI_LONG_LONG_MAX != FFI_64_BIT_MAX
- #error "no 64-bit data type supported"
-# endif
-#elif LONG_MAX != FFI_64_BIT_MAX
- #error "long size not supported"
-#endif
-
-#if LONG_MAX == 2147483647
-# define ffi_type_ulong        ffi_type_uint32
-# define ffi_type_slong        ffi_type_sint32
-#elif LONG_MAX == FFI_64_BIT_MAX
-# define ffi_type_ulong        ffi_type_uint64
-# define ffi_type_slong        ffi_type_sint64
-#else
- #error "long size not supported"
-#endif
-
-/* Need minimal decorations for DLLs to works on Windows. */
-/* GCC has autoimport and autoexport.  Rely on Libtool to */
-/* help MSVC export from a DLL, but always declare data   */
-/* to be imported for MSVC clients.  This costs an extra  */
-/* indirection for MSVC clients using the static version  */
-/* of the library, but don't worry about that.  Besides,  */
-/* as a workaround, they can define FFI_BUILDING if they  */
-/* *know* they are going to link with the static library. */
-#if defined _MSC_VER && !defined FFI_BUILDING
-#define FFI_EXTERN extern __declspec(dllimport)
-#else
-#define FFI_EXTERN extern
-#endif
-
-/* These are defined in types.c */
-FFI_EXTERN ffi_type ffi_type_void;
-FFI_EXTERN ffi_type ffi_type_uint8;
-FFI_EXTERN ffi_type ffi_type_sint8;
-FFI_EXTERN ffi_type ffi_type_uint16;
-FFI_EXTERN ffi_type ffi_type_sint16;
-FFI_EXTERN ffi_type ffi_type_uint32;
-FFI_EXTERN ffi_type ffi_type_sint32;
-FFI_EXTERN ffi_type ffi_type_uint64;
-FFI_EXTERN ffi_type ffi_type_sint64;
-FFI_EXTERN ffi_type ffi_type_float;
-FFI_EXTERN ffi_type ffi_type_double;
-FFI_EXTERN ffi_type ffi_type_pointer;
-
-#if 0
-FFI_EXTERN ffi_type ffi_type_longdouble;
-#else
-#define ffi_type_longdouble ffi_type_double
-#endif
-
-#ifdef FFI_TARGET_HAS_COMPLEX_TYPE
-FFI_EXTERN ffi_type ffi_type_complex_float;
-FFI_EXTERN ffi_type ffi_type_complex_double;
-#if 0
-FFI_EXTERN ffi_type ffi_type_complex_longdouble;
-#else
-#define ffi_type_complex_longdouble ffi_type_complex_double
-#endif
-#endif
-#endif /* LIBFFI_HIDE_BASIC_TYPES */
-
-typedef enum {
-  FFI_OK = 0,
-  FFI_BAD_TYPEDEF,
-  FFI_BAD_ABI
-} ffi_status;
-
-typedef unsigned FFI_TYPE;
-
-typedef struct {
-  ffi_abi abi;
-  unsigned nargs;
-  ffi_type **arg_types;
-  ffi_type *rtype;
-  unsigned bytes;
-  unsigned flags;
-#ifdef FFI_EXTRA_CIF_FIELDS
-  FFI_EXTRA_CIF_FIELDS;
-#endif
-} ffi_cif;
-
-#if 0
-/* Used to adjust size/alignment of ffi types.  */
-void ffi_prep_types (ffi_abi abi);
-#endif
-
-/* Used internally, but overridden by some architectures */
-ffi_status ffi_prep_cif_core(ffi_cif *cif,
-			     ffi_abi abi,
-			     unsigned int isvariadic,
-			     unsigned int nfixedargs,
-			     unsigned int ntotalargs,
-			     ffi_type *rtype,
-			     ffi_type **atypes);
-
-/* ---- Definitions for the raw API -------------------------------------- */
-
-#ifndef FFI_SIZEOF_ARG
-# if LONG_MAX == 2147483647
-#  define FFI_SIZEOF_ARG        4
-# elif LONG_MAX == FFI_64_BIT_MAX
-#  define FFI_SIZEOF_ARG        8
-# endif
-#endif
-
-#ifndef FFI_SIZEOF_JAVA_RAW
-#  define FFI_SIZEOF_JAVA_RAW FFI_SIZEOF_ARG
-#endif
-
-typedef union {
-  ffi_sarg  sint;
-  ffi_arg   uint;
-  float	    flt;
-  char      data[FFI_SIZEOF_ARG];
-  void*     ptr;
-} ffi_raw;
-
-#if FFI_SIZEOF_JAVA_RAW == 4 && FFI_SIZEOF_ARG == 8
-/* This is a special case for mips64/n32 ABI (and perhaps others) where
-   sizeof(void *) is 4 and FFI_SIZEOF_ARG is 8.  */
-typedef union {
-  signed int	sint;
-  unsigned int	uint;
-  float		flt;
-  char		data[FFI_SIZEOF_JAVA_RAW];
-  void*		ptr;
-} ffi_java_raw;
-#else
-typedef ffi_raw ffi_java_raw;
-#endif
-
-
-void ffi_raw_call (ffi_cif *cif,
-		   void (*fn)(void),
-		   void *rvalue,
-		   ffi_raw *avalue);
-
-void ffi_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw);
-void ffi_raw_to_ptrarray (ffi_cif *cif, ffi_raw *raw, void **args);
-size_t ffi_raw_size (ffi_cif *cif);
-
-/* This is analogous to the raw API, except it uses Java parameter	*/
-/* packing, even on 64-bit machines.  I.e. on 64-bit machines		*/
-/* longs and doubles are followed by an empty 64-bit word.		*/
-
-void ffi_java_raw_call (ffi_cif *cif,
-			void (*fn)(void),
-			void *rvalue,
-			ffi_java_raw *avalue);
-
-void ffi_java_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_java_raw *raw);
-void ffi_java_raw_to_ptrarray (ffi_cif *cif, ffi_java_raw *raw, void **args);
-size_t ffi_java_raw_size (ffi_cif *cif);
-
-/* ---- Definitions for closures ----------------------------------------- */
-
-#if FFI_CLOSURES
-
-#ifdef _MSC_VER
-__declspec(align(8))
-#endif
-typedef struct {
-#if 0
-  void *trampoline_table;
-  void *trampoline_table_entry;
-#else
-  char tramp[FFI_TRAMPOLINE_SIZE];
-#endif
-  ffi_cif   *cif;
-  void     (*fun)(ffi_cif*,void*,void**,void*);
-  void      *user_data;
-#ifdef __GNUC__
-} ffi_closure __attribute__((aligned (8)));
-#else
-} ffi_closure;
-# ifdef __sgi
-#  pragma pack 0
-# endif
-#endif
-
-void *ffi_closure_alloc (size_t size, void **code);
-void ffi_closure_free (void *);
-
-ffi_status
-ffi_prep_closure (ffi_closure*,
-		  ffi_cif *,
-		  void (*fun)(ffi_cif*,void*,void**,void*),
-		  void *user_data);
-
-ffi_status
-ffi_prep_closure_loc (ffi_closure*,
-		      ffi_cif *,
-		      void (*fun)(ffi_cif*,void*,void**,void*),
-		      void *user_data,
-		      void*codeloc);
-
-#ifdef __sgi
-# pragma pack 8
-#endif
-typedef struct {
-#if 0
-  void *trampoline_table;
-  void *trampoline_table_entry;
-#else
-  char tramp[FFI_TRAMPOLINE_SIZE];
-#endif
-  ffi_cif   *cif;
-
-#if !FFI_NATIVE_RAW_API
-
-  /* if this is enabled, then a raw closure has the same layout 
-     as a regular closure.  We use this to install an intermediate 
-     handler to do the transaltion, void** -> ffi_raw*. */
-
-  void     (*translate_args)(ffi_cif*,void*,void**,void*);
-  void      *this_closure;
-
-#endif
-
-  void     (*fun)(ffi_cif*,void*,ffi_raw*,void*);
-  void      *user_data;
-
-} ffi_raw_closure;
-
-typedef struct {
-#if 0
-  void *trampoline_table;
-  void *trampoline_table_entry;
-#else
-  char tramp[FFI_TRAMPOLINE_SIZE];
-#endif
-
-  ffi_cif   *cif;
-
-#if !FFI_NATIVE_RAW_API
-
-  /* if this is enabled, then a raw closure has the same layout 
-     as a regular closure.  We use this to install an intermediate 
-     handler to do the transaltion, void** -> ffi_raw*. */
-
-  void     (*translate_args)(ffi_cif*,void*,void**,void*);
-  void      *this_closure;
-
-#endif
-
-  void     (*fun)(ffi_cif*,void*,ffi_java_raw*,void*);
-  void      *user_data;
-
-} ffi_java_raw_closure;
-
-ffi_status
-ffi_prep_raw_closure (ffi_raw_closure*,
-		      ffi_cif *cif,
-		      void (*fun)(ffi_cif*,void*,ffi_raw*,void*),
-		      void *user_data);
-
-ffi_status
-ffi_prep_raw_closure_loc (ffi_raw_closure*,
-			  ffi_cif *cif,
-			  void (*fun)(ffi_cif*,void*,ffi_raw*,void*),
-			  void *user_data,
-			  void *codeloc);
-
-ffi_status
-ffi_prep_java_raw_closure (ffi_java_raw_closure*,
-		           ffi_cif *cif,
-		           void (*fun)(ffi_cif*,void*,ffi_java_raw*,void*),
-		           void *user_data);
-
-ffi_status
-ffi_prep_java_raw_closure_loc (ffi_java_raw_closure*,
-			       ffi_cif *cif,
-			       void (*fun)(ffi_cif*,void*,ffi_java_raw*,void*),
-			       void *user_data,
-			       void *codeloc);
-
-#endif /* FFI_CLOSURES */
-
-/* ---- Public interface definition -------------------------------------- */
-
-ffi_status ffi_prep_cif(ffi_cif *cif,
-			ffi_abi abi,
-			unsigned int nargs,
-			ffi_type *rtype,
-			ffi_type **atypes);
-
-ffi_status ffi_prep_cif_var(ffi_cif *cif,
-			    ffi_abi abi,
-			    unsigned int nfixedargs,
-			    unsigned int ntotalargs,
-			    ffi_type *rtype,
-			    ffi_type **atypes);
-
-void ffi_call(ffi_cif *cif,
-	      void (*fn)(void),
-	      void *rvalue,
-	      void **avalue);
-
-/* Useful for eliminating compiler warnings */
-#define FFI_FN(f) ((void (*)(void))f)
-
-/* ---- Definitions shared with assembly code ---------------------------- */
-
-#endif
-
-/* If these change, update src/mips/ffitarget.h. */
-#define FFI_TYPE_VOID       0    
-#define FFI_TYPE_INT        1
-#define FFI_TYPE_FLOAT      2    
-#define FFI_TYPE_DOUBLE     3
-#if 0
-#define FFI_TYPE_LONGDOUBLE 4
-#else
-#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
-#endif
-#define FFI_TYPE_UINT8      5   
-#define FFI_TYPE_SINT8      6
-#define FFI_TYPE_UINT16     7 
-#define FFI_TYPE_SINT16     8
-#define FFI_TYPE_UINT32     9
-#define FFI_TYPE_SINT32     10
-#define FFI_TYPE_UINT64     11
-#define FFI_TYPE_SINT64     12
-#define FFI_TYPE_STRUCT     13
-#define FFI_TYPE_POINTER    14
-#define FFI_TYPE_COMPLEX    15
-
-/* This should always refer to the last type code (for sanity checks) */
-#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/ffitarget.h b/openflow/usr/include/arm-linux-gnueabihf/ffitarget.h
deleted file mode 100644
index 26d494d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/ffitarget.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -----------------------------------------------------------------*-C-*-
-   ffitarget.h - Copyright (c) 2012  Anthony Green
-                 Copyright (c) 2010  CodeSourcery
-                 Copyright (c) 1996-2003  Red Hat, Inc.
-
-   Target configuration macros for ARM.
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   ``Software''), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject to
-   the following conditions:
-
-   The above copyright notice and this permission notice shall be included
-   in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   ----------------------------------------------------------------------- */
-
-#ifndef LIBFFI_TARGET_H
-#define LIBFFI_TARGET_H
-
-#ifndef LIBFFI_H
-#error "Please do not include ffitarget.h directly into your source.  Use ffi.h instead."
-#endif
-
-#ifndef LIBFFI_ASM
-typedef unsigned long          ffi_arg;
-typedef signed long            ffi_sarg;
-
-typedef enum ffi_abi {
-  FFI_FIRST_ABI = 0,
-  FFI_SYSV,
-  FFI_VFP,
-  FFI_LAST_ABI,
-#ifdef __ARM_PCS_VFP
-  FFI_DEFAULT_ABI = FFI_VFP,
-#else
-  FFI_DEFAULT_ABI = FFI_SYSV,
-#endif
-} ffi_abi;
-#endif
-
-#define FFI_EXTRA_CIF_FIELDS			\
-  int vfp_used;					\
-  short vfp_reg_free, vfp_nargs;		\
-  signed char vfp_args[16]			\
-
-/* Internally used. */
-#define FFI_TYPE_STRUCT_VFP_FLOAT  (FFI_TYPE_LAST + 1)
-#define FFI_TYPE_STRUCT_VFP_DOUBLE (FFI_TYPE_LAST + 2)
-
-#define FFI_TARGET_SPECIFIC_VARIADIC
-
-/* ---- Definitions for closures ----------------------------------------- */
-
-#define FFI_CLOSURES 1
-#define FFI_TRAMPOLINE_SIZE 20
-#define FFI_NATIVE_RAW_API 0
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/fpu_control.h b/openflow/usr/include/arm-linux-gnueabihf/fpu_control.h
deleted file mode 100644
index 0fe532a..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/fpu_control.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* FPU control word definitions.  ARM VFP version.
-   Copyright (C) 2004-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _FPU_CONTROL_H
-#define _FPU_CONTROL_H
-
-#if !(defined(_LIBC) && !defined(_LIBC_TEST)) && defined(__SOFTFP__)
-
-#define _FPU_RESERVED 0xffffffff
-#define _FPU_DEFAULT  0x00000000
-typedef unsigned int fpu_control_t;
-#define _FPU_GETCW(cw) (cw) = 0
-#define _FPU_SETCW(cw) (void) (cw)
-extern fpu_control_t __fpu_control;
-
-#else
-
-/* masking of interrupts */
-#define _FPU_MASK_IM	0x00000100	/* invalid operation */
-#define _FPU_MASK_ZM	0x00000200	/* divide by zero */
-#define _FPU_MASK_OM	0x00000400	/* overflow */
-#define _FPU_MASK_UM	0x00000800	/* underflow */
-#define _FPU_MASK_PM	0x00001000	/* inexact */
-
-#define _FPU_MASK_NZCV	0xf0000000	/* NZCV flags */
-#define _FPU_MASK_RM	0x00c00000	/* rounding mode */
-#define _FPU_MASK_EXCEPT 0x00001f1f	/* all exception flags */
-
-/* Some bits in the FPSCR are not yet defined.  They must be preserved when
-   modifying the contents.  */
-#define _FPU_RESERVED	0x00086060
-#define _FPU_DEFAULT    0x00000000
-
-/* Default + exceptions enabled.  */
-#define _FPU_IEEE	(_FPU_DEFAULT | 0x00001f00)
-
-/* Type of the control word.  */
-typedef unsigned int fpu_control_t;
-
-/* Macros for accessing the hardware control word.  */
-/* This is fmrx %0, fpscr.  */
-#define _FPU_GETCW(cw) \
-  __asm__ __volatile__ ("mrc p10, 7, %0, cr1, cr0, 0" : "=r" (cw))
-/* This is fmxr fpscr, %0.  */
-#define _FPU_SETCW(cw) \
-  __asm__ __volatile__ ("mcr p10, 7, %0, cr1, cr0, 0" : : "r" (cw))
-
-/* Default control word set at startup.  */
-extern fpu_control_t __fpu_control;
-
-#endif /* __SOFTFP__ */
-
-#endif /* _FPU_CONTROL_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/gnu/lib-names-hard.h b/openflow/usr/include/arm-linux-gnueabihf/gnu/lib-names-hard.h
deleted file mode 100644
index f85a891..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/gnu/lib-names-hard.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* This file is automatically generated.  */
-#ifndef __GNU_LIB_NAMES_H
-# error "Never use <gnu/lib-names-hard.h> directly; include <gnu/lib-names.h> instead."
-#endif
-
-#define LD_LINUX_ARMHF_SO               "ld-linux-armhf.so.3"
-#define LD_SO                           "ld-linux-armhf.so.3"
-#define LIBANL_SO                       "libanl.so.1"
-#define LIBBROKENLOCALE_SO              "libBrokenLocale.so.1"
-#define LIBCIDN_SO                      "libcidn.so.1"
-#define LIBCRYPT_SO                     "libcrypt.so.1"
-#define LIBC_SO                         "libc.so.6"
-#define LIBDL_SO                        "libdl.so.2"
-#define LIBGCC_S_SO                     "libgcc_s.so.1"
-#define LIBMVEC_SO                      "libmvec.so.1"
-#define LIBM_SO                         "libm.so.6"
-#define LIBNSL_SO                       "libnsl.so.1"
-#define LIBNSS_COMPAT_SO                "libnss_compat.so.2"
-#define LIBNSS_DB_SO                    "libnss_db.so.2"
-#define LIBNSS_DNS_SO                   "libnss_dns.so.2"
-#define LIBNSS_FILES_SO                 "libnss_files.so.2"
-#define LIBNSS_HESIOD_SO                "libnss_hesiod.so.2"
-#define LIBNSS_LDAP_SO                  "libnss_ldap.so.2"
-#define LIBNSS_NISPLUS_SO               "libnss_nisplus.so.2"
-#define LIBNSS_NIS_SO                   "libnss_nis.so.2"
-#define LIBNSS_TEST1_SO                 "libnss_test1.so.2"
-#define LIBPTHREAD_SO                   "libpthread.so.0"
-#define LIBRESOLV_SO                    "libresolv.so.2"
-#define LIBRT_SO                        "librt.so.1"
-#define LIBTHREAD_DB_SO                 "libthread_db.so.1"
-#define LIBUTIL_SO                      "libutil.so.1"
diff --git a/openflow/usr/include/arm-linux-gnueabihf/gnu/lib-names.h b/openflow/usr/include/arm-linux-gnueabihf/gnu/lib-names.h
deleted file mode 100644
index f7b28af..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/gnu/lib-names.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This file is automatically generated.
-   It defines macros to allow user program to find the shared
-   library files which come as part of GNU libc.  */
-#ifndef __GNU_LIB_NAMES_H
-#define __GNU_LIB_NAMES_H	1
-
-#if !defined __ARM_PCS_VFP
-# include <gnu/lib-names-soft.h>
-#endif
-#if defined __ARM_PCS_VFP
-# include <gnu/lib-names-hard.h>
-#endif
-
-#endif	/* gnu/lib-names.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/gnu/libc-version.h b/openflow/usr/include/arm-linux-gnueabihf/gnu/libc-version.h
deleted file mode 100644
index 780612e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/gnu/libc-version.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Interface to GNU libc specific functions for version information.
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GNU_LIBC_VERSION_H
-#define	_GNU_LIBC_VERSION_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* Return string describing release status of currently running GNU libc.  */
-extern const char *gnu_get_libc_release (void) __THROW;
-
-/* Return string describing version of currently running GNU libc.  */
-extern const char *gnu_get_libc_version (void) __THROW;
-
-__END_DECLS
-
-#endif	/* gnu/libc-version.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/gnu/stubs-hard.h b/openflow/usr/include/arm-linux-gnueabihf/gnu/stubs-hard.h
deleted file mode 100644
index 6b82e5e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/gnu/stubs-hard.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This file is automatically generated.
-   It defines a symbol `__stub_FUNCTION' for each function
-   in the C library which is a stub, meaning it will fail
-   every time called, usually setting errno to ENOSYS.  */
-
-#ifdef _LIBC
-# error Applications may not define the macro _LIBC
-#endif
-
-#define __stub___compat_create_module
-#define __stub___compat_get_kernel_syms
-#define __stub___compat_query_module
-#define __stub_chflags
-#define __stub_fattach
-#define __stub_fchflags
-#define __stub_fdetach
-#define __stub_getmsg
-#define __stub_getpmsg
-#define __stub_gtty
-#define __stub_lchmod
-#define __stub_putmsg
-#define __stub_putpmsg
-#define __stub_revoke
-#define __stub_setlogin
-#define __stub_sigreturn
-#define __stub_sstk
-#define __stub_stty
diff --git a/openflow/usr/include/arm-linux-gnueabihf/gnu/stubs.h b/openflow/usr/include/arm-linux-gnueabihf/gnu/stubs.h
deleted file mode 100644
index 33fc077..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/gnu/stubs.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* This file is automatically generated.
-   This file selects the right generated file of `__stub_FUNCTION' macros
-   based on the architecture being compiled for.  */
-
-
-#if !defined __ARM_PCS_VFP
-# include <gnu/stubs-soft.h>
-#endif
-#if defined __ARM_PCS_VFP
-# include <gnu/stubs-hard.h>
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/ieee754.h b/openflow/usr/include/arm-linux-gnueabihf/ieee754.h
deleted file mode 100644
index e7a5e93..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/ieee754.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _IEEE754_H
-
-#define _IEEE754_H 1
-#include <features.h>
-
-#include <endian.h>
-
-__BEGIN_DECLS
-
-union ieee754_float
-  {
-    float f;
-
-    /* This is the IEEE 754 single-precision format.  */
-    struct
-      {
-#if	__BYTE_ORDER == __BIG_ENDIAN
-	unsigned int negative:1;
-	unsigned int exponent:8;
-	unsigned int mantissa:23;
-#endif				/* Big endian.  */
-#if	__BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned int mantissa:23;
-	unsigned int exponent:8;
-	unsigned int negative:1;
-#endif				/* Little endian.  */
-      } ieee;
-
-    /* This format makes it easier to see if a NaN is a signalling NaN.  */
-    struct
-      {
-#if	__BYTE_ORDER == __BIG_ENDIAN
-	unsigned int negative:1;
-	unsigned int exponent:8;
-	unsigned int quiet_nan:1;
-	unsigned int mantissa:22;
-#endif				/* Big endian.  */
-#if	__BYTE_ORDER == __LITTLE_ENDIAN
-	unsigned int mantissa:22;
-	unsigned int quiet_nan:1;
-	unsigned int exponent:8;
-	unsigned int negative:1;
-#endif				/* Little endian.  */
-      } ieee_nan;
-  };
-
-#define IEEE754_FLOAT_BIAS	0x7f /* Added to exponent.  */
-
-
-union ieee754_double
-  {
-    double d;
-
-    /* This is the IEEE 754 double-precision format.  */
-    struct
-      {
-#if	__BYTE_ORDER == __BIG_ENDIAN
-	unsigned int negative:1;
-	unsigned int exponent:11;
-	/* Together these comprise the mantissa.  */
-	unsigned int mantissa0:20;
-	unsigned int mantissa1:32;
-#endif				/* Big endian.  */
-#if	__BYTE_ORDER == __LITTLE_ENDIAN
-# if	__FLOAT_WORD_ORDER == __BIG_ENDIAN
-	unsigned int mantissa0:20;
-	unsigned int exponent:11;
-	unsigned int negative:1;
-	unsigned int mantissa1:32;
-# else
-	/* Together these comprise the mantissa.  */
-	unsigned int mantissa1:32;
-	unsigned int mantissa0:20;
-	unsigned int exponent:11;
-	unsigned int negative:1;
-# endif
-#endif				/* Little endian.  */
-      } ieee;
-
-    /* This format makes it easier to see if a NaN is a signalling NaN.  */
-    struct
-      {
-#if	__BYTE_ORDER == __BIG_ENDIAN
-	unsigned int negative:1;
-	unsigned int exponent:11;
-	unsigned int quiet_nan:1;
-	/* Together these comprise the mantissa.  */
-	unsigned int mantissa0:19;
-	unsigned int mantissa1:32;
-#else
-# if	__FLOAT_WORD_ORDER == __BIG_ENDIAN
-	unsigned int mantissa0:19;
-	unsigned int quiet_nan:1;
-	unsigned int exponent:11;
-	unsigned int negative:1;
-	unsigned int mantissa1:32;
-# else
-	/* Together these comprise the mantissa.  */
-	unsigned int mantissa1:32;
-	unsigned int mantissa0:19;
-	unsigned int quiet_nan:1;
-	unsigned int exponent:11;
-	unsigned int negative:1;
-# endif
-#endif
-      } ieee_nan;
-  };
-
-#define IEEE754_DOUBLE_BIAS	0x3ff /* Added to exponent.  */
-
-
-union ieee854_long_double
-  {
-    long double d;
-
-    /* This is the IEEE 854 double-extended-precision format.  */
-    struct
-      {
-#if	__BYTE_ORDER == __BIG_ENDIAN
-	unsigned int negative:1;
-	unsigned int exponent:15;
-	unsigned int empty:16;
-	unsigned int mantissa0:32;
-	unsigned int mantissa1:32;
-#endif
-#if	__BYTE_ORDER == __LITTLE_ENDIAN
-# if	__FLOAT_WORD_ORDER == __BIG_ENDIAN
-	unsigned int exponent:15;
-	unsigned int negative:1;
-	unsigned int empty:16;
-	unsigned int mantissa0:32;
-	unsigned int mantissa1:32;
-# else
-	unsigned int mantissa1:32;
-	unsigned int mantissa0:32;
-	unsigned int exponent:15;
-	unsigned int negative:1;
-	unsigned int empty:16;
-# endif
-#endif
-      } ieee;
-
-    /* This is for NaNs in the IEEE 854 double-extended-precision format.  */
-    struct
-      {
-#if	__BYTE_ORDER == __BIG_ENDIAN
-	unsigned int negative:1;
-	unsigned int exponent:15;
-	unsigned int empty:16;
-	unsigned int one:1;
-	unsigned int quiet_nan:1;
-	unsigned int mantissa0:30;
-	unsigned int mantissa1:32;
-#endif
-#if	__BYTE_ORDER == __LITTLE_ENDIAN
-# if	__FLOAT_WORD_ORDER == __BIG_ENDIAN
-	unsigned int exponent:15;
-	unsigned int negative:1;
-	unsigned int empty:16;
-	unsigned int mantissa0:30;
-	unsigned int quiet_nan:1;
-	unsigned int one:1;
-	unsigned int mantissa1:32;
-# else
-	unsigned int mantissa1:32;
-	unsigned int mantissa0:30;
-	unsigned int quiet_nan:1;
-	unsigned int one:1;
-	unsigned int exponent:15;
-	unsigned int negative:1;
-	unsigned int empty:16;
-# endif
-#endif
-      } ieee_nan;
-  };
-
-#define IEEE854_LONG_DOUBLE_BIAS 0x3fff
-
-__END_DECLS
-
-#endif /* ieee754.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/openssl/opensslconf.h b/openflow/usr/include/arm-linux-gnueabihf/openssl/opensslconf.h
deleted file mode 100644
index d90ef36..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/openssl/opensslconf.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-/* OpenSSL was configured with the following options: */
-#ifndef OPENSSL_DOING_MAKEDEPEND
-
-
-#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-# define OPENSSL_NO_EC_NISTP_64_GCC_128
-#endif
-#ifndef OPENSSL_NO_GMP
-# define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_IDEA
-# define OPENSSL_NO_IDEA
-#endif
-#ifndef OPENSSL_NO_JPAKE
-# define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
-# define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_LIBUNBOUND
-# define OPENSSL_NO_LIBUNBOUND
-#endif
-#ifndef OPENSSL_NO_MD2
-# define OPENSSL_NO_MD2
-#endif
-#ifndef OPENSSL_NO_MDC2
-# define OPENSSL_NO_MDC2
-#endif
-#ifndef OPENSSL_NO_RC5
-# define OPENSSL_NO_RC5
-#endif
-#ifndef OPENSSL_NO_RFC3779
-# define OPENSSL_NO_RFC3779
-#endif
-#ifndef OPENSSL_NO_SCTP
-# define OPENSSL_NO_SCTP
-#endif
-#ifndef OPENSSL_NO_SSL_TRACE
-# define OPENSSL_NO_SSL_TRACE
-#endif
-#ifndef OPENSSL_NO_SSL2
-# define OPENSSL_NO_SSL2
-#endif
-#ifndef OPENSSL_NO_SSL3
-# define OPENSSL_NO_SSL3
-#endif
-#ifndef OPENSSL_NO_STORE
-# define OPENSSL_NO_STORE
-#endif
-#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-# define OPENSSL_NO_WEAK_SSL_CIPHERS
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
-
-#ifndef OPENSSL_THREADS
-# define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-# define OPENSSL_NO_STATIC_ENGINE
-#endif
-
-/* The OPENSSL_NO_* macros are also defined as NO_* if the application
-   asks for it.  This is a transient feature that is provided for those
-   who haven't had the time to do the appropriate changes in their
-   applications.  */
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
-#  define NO_EC_NISTP_64_GCC_128
-# endif
-# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
-#  define NO_GMP
-# endif
-# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
-#  define NO_IDEA
-# endif
-# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
-#  define NO_JPAKE
-# endif
-# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
-#  define NO_KRB5
-# endif
-# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
-#  define NO_LIBUNBOUND
-# endif
-# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
-#  define NO_MD2
-# endif
-# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
-#  define NO_MDC2
-# endif
-# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
-#  define NO_RC5
-# endif
-# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
-#  define NO_RFC3779
-# endif
-# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
-#  define NO_SCTP
-# endif
-# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
-#  define NO_SSL_TRACE
-# endif
-# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
-#  define NO_SSL2
-# endif
-# if defined(OPENSSL_NO_SSL3) && !defined(NO_SSL3)
-#  define NO_SSL3
-# endif
-# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
-#  define NO_STORE
-# endif
-# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
-#  define NO_WEAK_SSL_CIPHERS
-# endif
-#endif
-
-#define OPENSSL_CPUID_OBJ
-
-/* crypto/opensslconf.h.in */
-
-/* Generate 80386 code? */
-#undef I386_ONLY
-
-#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/arm-linux-gnueabihf/openssl-1.0.0/engines"
-#define OPENSSLDIR "/usr/lib/ssl"
-#endif
-#endif
-
-#undef OPENSSL_UNISTD
-#define OPENSSL_UNISTD <unistd.h>
-
-#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT unsigned int
-#endif
-
-#if defined(HEADER_MD2_H) && !defined(MD2_INT)
-#define MD2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC2_H) && !defined(RC2_INT)
-/* I need to put in a mod for the alpha - eay */
-#define RC2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-/*
- * I don't know what does "most" mean, but declaring "int" is a must on:
- * - Intel P6 because partial register stalls are very expensive;
- * - elder Alpha because it lacks byte load/store instructions;
- */
-#define RC4_INT unsigned char
-#endif
-#if !defined(RC4_CHUNK)
-/*
- * This enables code handling data aligned at natural CPU word
- * boundary. See crypto/rc4/rc4_enc.c for further details.
- */
-#define RC4_CHUNK unsigned long
-#endif
-#endif
-
-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * %20 speed up (longs are 8 bytes, int's are 4). */
-#ifndef DES_LONG
-#define DES_LONG unsigned int
-#endif
-#endif
-
-#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-#define CONFIG_HEADER_BN_H
-#define BN_LLONG
-
-/* Should we define BN_DIV2W here? */
-
-/* Only one for the following should be defined */
-#undef SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
-#define THIRTY_TWO_BIT
-#endif
-
-#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-#define CONFIG_HEADER_RC4_LOCL_H
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
-#undef RC4_INDEX
-#endif
-
-#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-#define CONFIG_HEADER_BF_LOCL_H
-#define BF_PTR
-#endif /* HEADER_BF_LOCL_H */
-
-#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
-#ifndef DES_DEFAULT_OPTIONS
-/* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
-#ifndef DES_PTR
-#undef DES_PTR
-#endif
-
-/* This helps C compiler generate the correct code for multiple functional
- * units.  It reduces register dependancies at the expense of 2 more
- * registers */
-#ifndef DES_RISC1
-#undef DES_RISC1
-#endif
-
-#ifndef DES_RISC2
-#undef DES_RISC2
-#endif
-
-#if defined(DES_RISC1) && defined(DES_RISC2)
-#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-#endif
-
-/* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * Very mucy CPU dependant */
-#ifndef DES_UNROLL
-#define DES_UNROLL
-#endif
-
-/* These default values were supplied by
- * Peter Gutman <pgut001@cs.auckland.ac.nz>
- * They are only used if nothing else has been defined */
-#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
-/* Special defines which change the way the code is built depending on the
-   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
-   even newer MIPS CPU's, but at the moment one size fits all for
-   optimization options.  Older Sparc's work better with only UNROLL, but
-   there's no way to tell at compile time what it is you're running on */
- 
-#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#elif defined( __ultrix )	/* Older MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined( __osf1__ )	/* Alpha */
-#  define DES_PTR
-#  define DES_RISC2
-#elif defined ( _AIX )		/* RS6000 */
-  /* Unknown */
-#elif defined( __hpux )		/* HP-PA */
-  /* Unknown */
-#elif defined( __aux )		/* 68K */
-  /* Unknown */
-#elif defined( __dgux )		/* 88K (but P6 in latest boxes) */
-#  define DES_UNROLL
-#elif defined( __sgi )		/* Newer MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined(i386) || defined(__i386__)	/* x86 boxes, should be gcc */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#endif /* Systems-specific speed defines */
-#endif
-
-#endif /* DES_DEFAULT_OPTIONS */
-#endif /* HEADER_DES_LOCL_H */
-#ifdef  __cplusplus
-}
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/acct.h b/openflow/usr/include/arm-linux-gnueabihf/sys/acct.h
deleted file mode 100644
index ea0e7fd..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/acct.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_ACCT_H
-#define _SYS_ACCT_H	1
-
-#include <features.h>
-
-#include <endian.h>
-#define	__need_time_t
-#include <time.h>
-#include <sys/types.h>
-
-__BEGIN_DECLS
-
-#define ACCT_COMM 16
-
-/*
-  comp_t is a 16-bit "floating" point number with a 3-bit base 8
-  exponent and a 13-bit fraction. See linux/kernel/acct.c for the
-  specific encoding system used.
-*/
-
-typedef u_int16_t comp_t;
-
-struct acct
-{
-  char ac_flag;			/* Flags.  */
-  u_int16_t ac_uid;		/* Real user ID.  */
-  u_int16_t ac_gid;		/* Real group ID.  */
-  u_int16_t ac_tty;		/* Controlling terminal.  */
-  u_int32_t ac_btime;		/* Beginning time.  */
-  comp_t ac_utime;		/* User time.  */
-  comp_t ac_stime;		/* System time.  */
-  comp_t ac_etime;		/* Elapsed time.  */
-  comp_t ac_mem;		/* Average memory usage.  */
-  comp_t ac_io;			/* Chars transferred.  */
-  comp_t ac_rw;			/* Blocks read or written.  */
-  comp_t ac_minflt;		/* Minor pagefaults.  */
-  comp_t ac_majflt;		/* Major pagefaults.  */
-  comp_t ac_swaps;		/* Number of swaps.  */
-  u_int32_t ac_exitcode;	/* Process exitcode.  */
-  char ac_comm[ACCT_COMM+1];	/* Command name.  */
-  char ac_pad[10];		/* Padding bytes.  */
-};
-
-
-struct acct_v3
-{
-  char ac_flag;			/* Flags */
-  char ac_version;		/* Always set to ACCT_VERSION */
-  u_int16_t ac_tty;		/* Control Terminal */
-  u_int32_t ac_exitcode;	/* Exitcode */
-  u_int32_t ac_uid;		/* Real User ID */
-  u_int32_t ac_gid;		/* Real Group ID */
-  u_int32_t ac_pid;		/* Process ID */
-  u_int32_t ac_ppid;		/* Parent Process ID */
-  u_int32_t ac_btime;		/* Process Creation Time */
-  float ac_etime;		/* Elapsed Time */
-  comp_t ac_utime;		/* User Time */
-  comp_t ac_stime;		/* System Time */
-  comp_t ac_mem;		/* Average Memory Usage */
-  comp_t ac_io;			/* Chars Transferred */
-  comp_t ac_rw;			/* Blocks Read or Written */
-  comp_t ac_minflt;		/* Minor Pagefaults */
-  comp_t ac_majflt;		/* Major Pagefaults */
-  comp_t ac_swaps;		/* Number of Swaps */
-  char ac_comm[ACCT_COMM];	/* Command Name */
-};
-
-
-enum
-  {
-    AFORK = 0x01,		/* Has executed fork, but no exec.  */
-    ASU = 0x02,			/* Used super-user privileges.  */
-    ACORE = 0x08,		/* Dumped core.  */
-    AXSIG = 0x10		/* Killed by a signal.  */
-  };
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-# define ACCT_BYTEORDER 0x80	/* Accounting file is big endian.  */
-#else
-# define ACCT_BYTEORDER 0x00	/* Accounting file is little endian.  */
-#endif
-
-#define AHZ     100
-
-
-/* Switch process accounting on and off.  */
-extern int acct (const char *__filename) __THROW;
-
-__END_DECLS
-
-#endif	/* sys/acct.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/auxv.h b/openflow/usr/include/arm-linux-gnueabihf/sys/auxv.h
deleted file mode 100644
index 1b141bb..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/auxv.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Access to the auxiliary vector.
-   Copyright (C) 2012-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_AUXV_H
-#define _SYS_AUXV_H 1
-
-#include <elf.h>
-#include <bits/auxv.h>
-#include <sys/cdefs.h>
-#include <bits/hwcap.h>
-
-__BEGIN_DECLS
-
-/* Return the value associated with an Elf*_auxv_t type from the auxv list
-   passed to the program on startup.  If TYPE was not present in the auxv
-   list, returns zero and sets errno to ENOENT.  */
-extern unsigned long int getauxval (unsigned long int __type)
-  __THROW;
-
-__END_DECLS
-
-#endif /* sys/auxv.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/bitypes.h b/openflow/usr/include/arm-linux-gnueabihf/sys/bitypes.h
deleted file mode 100644
index 3a9860f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/bitypes.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* The GNU <sys/types.h> defines all the necessary types.  */
-
-#include <sys/types.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/cdefs.h b/openflow/usr/include/arm-linux-gnueabihf/sys/cdefs.h
deleted file mode 100644
index 7fd4154..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/cdefs.h
+++ /dev/null
@@ -1,444 +0,0 @@
-/* Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_CDEFS_H
-#define	_SYS_CDEFS_H	1
-
-/* We are almost always included from features.h. */
-#ifndef _FEATURES_H
-# include <features.h>
-#endif
-
-/* The GNU libc does not support any K&R compilers or the traditional mode
-   of ISO C compilers anymore.  Check for some of the combinations not
-   anymore supported.  */
-#if defined __GNUC__ && !defined __STDC__
-# error "You need a ISO C conforming compiler to use the glibc headers"
-#endif
-
-/* Some user header file might have defined this before.  */
-#undef	__P
-#undef	__PMT
-
-#ifdef __GNUC__
-
-/* All functions, except those with callbacks or those that
-   synchronize memory, are leaf functions.  */
-# if __GNUC_PREREQ (4, 6) && !defined _LIBC
-#  define __LEAF , __leaf__
-#  define __LEAF_ATTR __attribute__ ((__leaf__))
-# else
-#  define __LEAF
-#  define __LEAF_ATTR
-# endif
-
-/* GCC can always grok prototypes.  For C++ programs we add throw()
-   to help it optimize the function calls.  But this works only with
-   gcc 2.8.x and egcs.  For gcc 3.2 and up we even mark C functions
-   as non-throwing using a function attribute since programs can use
-   the -fexceptions options for C code as well.  */
-# if !defined __cplusplus && __GNUC_PREREQ (3, 3)
-#  define __THROW	__attribute__ ((__nothrow__ __LEAF))
-#  define __THROWNL	__attribute__ ((__nothrow__))
-#  define __NTH(fct)	__attribute__ ((__nothrow__ __LEAF)) fct
-# else
-#  if defined __cplusplus && __GNUC_PREREQ (2,8)
-#   define __THROW	throw ()
-#   define __THROWNL	throw ()
-#   define __NTH(fct)	__LEAF_ATTR fct throw ()
-#  else
-#   define __THROW
-#   define __THROWNL
-#   define __NTH(fct)	fct
-#  endif
-# endif
-
-#else	/* Not GCC.  */
-
-# define __inline		/* No inline functions.  */
-
-# define __THROW
-# define __THROWNL
-# define __NTH(fct)	fct
-
-#endif	/* GCC.  */
-
-/* These two macros are not used in glibc anymore.  They are kept here
-   only because some other projects expect the macros to be defined.  */
-#define __P(args)	args
-#define __PMT(args)	args
-
-/* For these things, GCC behaves the ANSI way normally,
-   and the non-ANSI way under -traditional.  */
-
-#define __CONCAT(x,y)	x ## y
-#define __STRING(x)	#x
-
-/* This is not a typedef so `const __ptr_t' does the right thing.  */
-#define __ptr_t void *
-#define __long_double_t  long double
-
-
-/* C++ needs to know that types and declarations are C, not C++.  */
-#ifdef	__cplusplus
-# define __BEGIN_DECLS	extern "C" {
-# define __END_DECLS	}
-#else
-# define __BEGIN_DECLS
-# define __END_DECLS
-#endif
-
-
-/* The standard library needs the functions from the ISO C90 standard
-   in the std namespace.  At the same time we want to be safe for
-   future changes and we include the ISO C99 code in the non-standard
-   namespace __c99.  The C++ wrapper header take case of adding the
-   definitions to the global namespace.  */
-#if defined __cplusplus && defined _GLIBCPP_USE_NAMESPACES
-# define __BEGIN_NAMESPACE_STD	namespace std {
-# define __END_NAMESPACE_STD	}
-# define __USING_NAMESPACE_STD(name) using std::name;
-# define __BEGIN_NAMESPACE_C99	namespace __c99 {
-# define __END_NAMESPACE_C99	}
-# define __USING_NAMESPACE_C99(name) using __c99::name;
-#else
-/* For compatibility we do not add the declarations into any
-   namespace.  They will end up in the global namespace which is what
-   old code expects.  */
-# define __BEGIN_NAMESPACE_STD
-# define __END_NAMESPACE_STD
-# define __USING_NAMESPACE_STD(name)
-# define __BEGIN_NAMESPACE_C99
-# define __END_NAMESPACE_C99
-# define __USING_NAMESPACE_C99(name)
-#endif
-
-
-/* Fortify support.  */
-#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
-#define __bos0(ptr) __builtin_object_size (ptr, 0)
-
-#if __GNUC_PREREQ (4,3)
-# define __warndecl(name, msg) \
-  extern void name (void) __attribute__((__warning__ (msg)))
-# define __warnattr(msg) __attribute__((__warning__ (msg)))
-# define __errordecl(name, msg) \
-  extern void name (void) __attribute__((__error__ (msg)))
-#else
-# define __warndecl(name, msg) extern void name (void)
-# define __warnattr(msg)
-# define __errordecl(name, msg) extern void name (void)
-#endif
-
-/* Support for flexible arrays.  */
-#if __GNUC_PREREQ (2,97)
-/* GCC 2.97 supports C99 flexible array members.  */
-# define __flexarr	[]
-#else
-# ifdef __GNUC__
-#  define __flexarr	[0]
-# else
-#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#   define __flexarr	[]
-#  else
-/* Some other non-C99 compiler.  Approximate with [1].  */
-#   define __flexarr	[1]
-#  endif
-# endif
-#endif
-
-
-/* __asm__ ("xyz") is used throughout the headers to rename functions
-   at the assembly language level.  This is wrapped by the __REDIRECT
-   macro, in order to support compilers that can do this some other
-   way.  When compilers don't support asm-names at all, we have to do
-   preprocessor tricks instead (which don't have exactly the right
-   semantics, but it's the best we can do).
-
-   Example:
-   int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid); */
-
-#if defined __GNUC__ && __GNUC__ >= 2
-
-# define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias))
-# ifdef __cplusplus
-#  define __REDIRECT_NTH(name, proto, alias) \
-     name proto __THROW __asm__ (__ASMNAME (#alias))
-#  define __REDIRECT_NTHNL(name, proto, alias) \
-     name proto __THROWNL __asm__ (__ASMNAME (#alias))
-# else
-#  define __REDIRECT_NTH(name, proto, alias) \
-     name proto __asm__ (__ASMNAME (#alias)) __THROW
-#  define __REDIRECT_NTHNL(name, proto, alias) \
-     name proto __asm__ (__ASMNAME (#alias)) __THROWNL
-# endif
-# define __ASMNAME(cname)  __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
-# define __ASMNAME2(prefix, cname) __STRING (prefix) cname
-
-/*
-#elif __SOME_OTHER_COMPILER__
-
-# define __REDIRECT(name, proto, alias) name proto; \
-	_Pragma("let " #name " = " #alias)
-*/
-#endif
-
-/* GCC has various useful declarations that can be made with the
-   `__attribute__' syntax.  All of the ways we use this do fine if
-   they are omitted for compilers that don't understand it. */
-#if !defined __GNUC__ || __GNUC__ < 2
-# define __attribute__(xyz)	/* Ignore */
-#endif
-
-/* At some point during the gcc 2.96 development the `malloc' attribute
-   for functions was introduced.  We don't want to use it unconditionally
-   (although this would be possible) since it generates warnings.  */
-#if __GNUC_PREREQ (2,96)
-# define __attribute_malloc__ __attribute__ ((__malloc__))
-#else
-# define __attribute_malloc__ /* Ignore */
-#endif
-
-/* Tell the compiler which arguments to an allocation function
-   indicate the size of the allocation.  */
-#if __GNUC_PREREQ (4, 3)
-# define __attribute_alloc_size__(params) \
-  __attribute__ ((__alloc_size__ params))
-#else
-# define __attribute_alloc_size__(params) /* Ignore.  */
-#endif
-
-/* At some point during the gcc 2.96 development the `pure' attribute
-   for functions was introduced.  We don't want to use it unconditionally
-   (although this would be possible) since it generates warnings.  */
-#if __GNUC_PREREQ (2,96)
-# define __attribute_pure__ __attribute__ ((__pure__))
-#else
-# define __attribute_pure__ /* Ignore */
-#endif
-
-/* This declaration tells the compiler that the value is constant.  */
-#if __GNUC_PREREQ (2,5)
-# define __attribute_const__ __attribute__ ((__const__))
-#else
-# define __attribute_const__ /* Ignore */
-#endif
-
-/* At some point during the gcc 3.1 development the `used' attribute
-   for functions was introduced.  We don't want to use it unconditionally
-   (although this would be possible) since it generates warnings.  */
-#if __GNUC_PREREQ (3,1)
-# define __attribute_used__ __attribute__ ((__used__))
-# define __attribute_noinline__ __attribute__ ((__noinline__))
-#else
-# define __attribute_used__ __attribute__ ((__unused__))
-# define __attribute_noinline__ /* Ignore */
-#endif
-
-/* gcc allows marking deprecated functions.  */
-#if __GNUC_PREREQ (3,2)
-# define __attribute_deprecated__ __attribute__ ((__deprecated__))
-#else
-# define __attribute_deprecated__ /* Ignore */
-#endif
-
-/* At some point during the gcc 2.8 development the `format_arg' attribute
-   for functions was introduced.  We don't want to use it unconditionally
-   (although this would be possible) since it generates warnings.
-   If several `format_arg' attributes are given for the same function, in
-   gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
-   all designated arguments are considered.  */
-#if __GNUC_PREREQ (2,8)
-# define __attribute_format_arg__(x) __attribute__ ((__format_arg__ (x)))
-#else
-# define __attribute_format_arg__(x) /* Ignore */
-#endif
-
-/* At some point during the gcc 2.97 development the `strfmon' format
-   attribute for functions was introduced.  We don't want to use it
-   unconditionally (although this would be possible) since it
-   generates warnings.  */
-#if __GNUC_PREREQ (2,97)
-# define __attribute_format_strfmon__(a,b) \
-  __attribute__ ((__format__ (__strfmon__, a, b)))
-#else
-# define __attribute_format_strfmon__(a,b) /* Ignore */
-#endif
-
-/* The nonull function attribute allows to mark pointer parameters which
-   must not be NULL.  */
-#if __GNUC_PREREQ (3,3)
-# define __nonnull(params) __attribute__ ((__nonnull__ params))
-#else
-# define __nonnull(params)
-#endif
-
-/* If fortification mode, we warn about unused results of certain
-   function calls which can lead to problems.  */
-#if __GNUC_PREREQ (3,4)
-# define __attribute_warn_unused_result__ \
-   __attribute__ ((__warn_unused_result__))
-# if __USE_FORTIFY_LEVEL > 0
-#  define __wur __attribute_warn_unused_result__
-# endif
-#else
-# define __attribute_warn_unused_result__ /* empty */
-#endif
-#ifndef __wur
-# define __wur /* Ignore */
-#endif
-
-/* Forces a function to be always inlined.  */
-#if __GNUC_PREREQ (3,2)
-# define __always_inline __inline __attribute__ ((__always_inline__))
-#else
-# define __always_inline __inline
-#endif
-
-/* Associate error messages with the source location of the call site rather
-   than with the source location inside the function.  */
-#if __GNUC_PREREQ (4,3)
-# define __attribute_artificial__ __attribute__ ((__artificial__))
-#else
-# define __attribute_artificial__ /* Ignore */
-#endif
-
-/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
-   inline semantics, unless -fgnu89-inline is used.  Using __GNUC_STDC_INLINE__
-   or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
-   older than 4.3 may define these macros and still not guarantee GNU inlining
-   semantics.
-
-   clang++ identifies itself as gcc-4.2, but has support for GNU inlining
-   semantics, that can be checked fot by using the __GNUC_STDC_INLINE_ and
-   __GNUC_GNU_INLINE__ macro definitions.  */
-#if (!defined __cplusplus || __GNUC_PREREQ (4,3) \
-     || (defined __clang__ && (defined __GNUC_STDC_INLINE__ \
-			       || defined __GNUC_GNU_INLINE__)))
-# if defined __GNUC_STDC_INLINE__ || defined __cplusplus
-#  define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
-#  define __extern_always_inline \
-  extern __always_inline __attribute__ ((__gnu_inline__))
-# else
-#  define __extern_inline extern __inline
-#  define __extern_always_inline extern __always_inline
-# endif
-#endif
-
-#ifdef __extern_always_inline
-# define __fortify_function __extern_always_inline __attribute_artificial__
-#endif
-
-/* GCC 4.3 and above allow passing all anonymous arguments of an
-   __extern_always_inline function to some other vararg function.  */
-#if __GNUC_PREREQ (4,3)
-# define __va_arg_pack() __builtin_va_arg_pack ()
-# define __va_arg_pack_len() __builtin_va_arg_pack_len ()
-#endif
-
-/* It is possible to compile containing GCC extensions even if GCC is
-   run in pedantic mode if the uses are carefully marked using the
-   `__extension__' keyword.  But this is not generally available before
-   version 2.8.  */
-#if !__GNUC_PREREQ (2,8)
-# define __extension__		/* Ignore */
-#endif
-
-/* __restrict is known in EGCS 1.2 and above. */
-#if !__GNUC_PREREQ (2,92)
-# define __restrict	/* Ignore */
-#endif
-
-/* ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
-     array_name[restrict]
-   GCC 3.1 supports this.  */
-#if __GNUC_PREREQ (3,1) && !defined __GNUG__
-# define __restrict_arr	__restrict
-#else
-# ifdef __GNUC__
-#  define __restrict_arr	/* Not supported in old GCC.  */
-# else
-#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#   define __restrict_arr	restrict
-#  else
-/* Some other non-C99 compiler.  */
-#   define __restrict_arr	/* Not supported.  */
-#  endif
-# endif
-#endif
-
-#if __GNUC__ >= 3
-# define __glibc_unlikely(cond)	__builtin_expect ((cond), 0)
-# define __glibc_likely(cond)	__builtin_expect ((cond), 1)
-#else
-# define __glibc_unlikely(cond)	(cond)
-# define __glibc_likely(cond)	(cond)
-#endif
-
-#if (!defined _Noreturn \
-     && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \
-     &&  !__GNUC_PREREQ (4,7))
-# if __GNUC_PREREQ (2,8)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# else
-#  define _Noreturn
-# endif
-#endif
-
-#if (!defined _Static_assert && !defined __cplusplus \
-     && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \
-     && (!__GNUC_PREREQ (4, 6) || defined __STRICT_ANSI__))
-# define _Static_assert(expr, diagnostic) \
-    extern int (*__Static_assert_function (void)) \
-      [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })]
-#endif
-
-#include <bits/wordsize.h>
-
-#if defined __LONG_DOUBLE_MATH_OPTIONAL && defined __NO_LONG_DOUBLE_MATH
-# define __LDBL_COMPAT 1
-# ifdef __REDIRECT
-#  define __LDBL_REDIR1(name, proto, alias) __REDIRECT (name, proto, alias)
-#  define __LDBL_REDIR(name, proto) \
-  __LDBL_REDIR1 (name, proto, __nldbl_##name)
-#  define __LDBL_REDIR1_NTH(name, proto, alias) __REDIRECT_NTH (name, proto, alias)
-#  define __LDBL_REDIR_NTH(name, proto) \
-  __LDBL_REDIR1_NTH (name, proto, __nldbl_##name)
-#  define __LDBL_REDIR1_DECL(name, alias) \
-  extern __typeof (name) name __asm (__ASMNAME (#alias));
-#  define __LDBL_REDIR_DECL(name) \
-  extern __typeof (name) name __asm (__ASMNAME ("__nldbl_" #name));
-#  define __REDIRECT_LDBL(name, proto, alias) \
-  __LDBL_REDIR1 (name, proto, __nldbl_##alias)
-#  define __REDIRECT_NTH_LDBL(name, proto, alias) \
-  __LDBL_REDIR1_NTH (name, proto, __nldbl_##alias)
-# endif
-#endif
-#if !defined __LDBL_COMPAT || !defined __REDIRECT
-# define __LDBL_REDIR1(name, proto, alias) name proto
-# define __LDBL_REDIR(name, proto) name proto
-# define __LDBL_REDIR1_NTH(name, proto, alias) name proto __THROW
-# define __LDBL_REDIR_NTH(name, proto) name proto __THROW
-# define __LDBL_REDIR_DECL(name)
-# ifdef __REDIRECT
-#  define __REDIRECT_LDBL(name, proto, alias) __REDIRECT (name, proto, alias)
-#  define __REDIRECT_NTH_LDBL(name, proto, alias) \
-  __REDIRECT_NTH (name, proto, alias)
-# endif
-#endif
-
-#endif	 /* sys/cdefs.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/dir.h b/openflow/usr/include/arm-linux-gnueabihf/sys/dir.h
deleted file mode 100644
index 73b04bf..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/dir.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_DIR_H
-#define	_SYS_DIR_H	1
-
-#include <features.h>
-
-#include <dirent.h>
-
-#define	direct	dirent
-
-#endif	/* sys/dir.h  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/elf.h b/openflow/usr/include/arm-linux-gnueabihf/sys/elf.h
deleted file mode 100644
index 430bd1c..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/elf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_ELF_H
-#define _SYS_ELF_H	1
-
-#warning "This header is obsolete; use <sys/procfs.h> instead."
-
-#include <sys/procfs.h>
-
-#endif	/* sys/elf.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/epoll.h b/openflow/usr/include/arm-linux-gnueabihf/sys/epoll.h
deleted file mode 100644
index 72ec211..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/epoll.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_EPOLL_H
-#define	_SYS_EPOLL_H	1
-
-#include <stdint.h>
-#include <sys/types.h>
-
-/* Get __sigset_t.  */
-#include <bits/sigset.h>
-
-#ifndef __sigset_t_defined
-# define __sigset_t_defined
-typedef __sigset_t sigset_t;
-#endif
-
-/* Get the platform-dependent flags.  */
-#include <bits/epoll.h>
-
-#ifndef __EPOLL_PACKED
-# define __EPOLL_PACKED
-#endif
-
-
-enum EPOLL_EVENTS
-  {
-    EPOLLIN = 0x001,
-#define EPOLLIN EPOLLIN
-    EPOLLPRI = 0x002,
-#define EPOLLPRI EPOLLPRI
-    EPOLLOUT = 0x004,
-#define EPOLLOUT EPOLLOUT
-    EPOLLRDNORM = 0x040,
-#define EPOLLRDNORM EPOLLRDNORM
-    EPOLLRDBAND = 0x080,
-#define EPOLLRDBAND EPOLLRDBAND
-    EPOLLWRNORM = 0x100,
-#define EPOLLWRNORM EPOLLWRNORM
-    EPOLLWRBAND = 0x200,
-#define EPOLLWRBAND EPOLLWRBAND
-    EPOLLMSG = 0x400,
-#define EPOLLMSG EPOLLMSG
-    EPOLLERR = 0x008,
-#define EPOLLERR EPOLLERR
-    EPOLLHUP = 0x010,
-#define EPOLLHUP EPOLLHUP
-    EPOLLRDHUP = 0x2000,
-#define EPOLLRDHUP EPOLLRDHUP
-    EPOLLWAKEUP = 1u << 29,
-#define EPOLLWAKEUP EPOLLWAKEUP
-    EPOLLONESHOT = 1u << 30,
-#define EPOLLONESHOT EPOLLONESHOT
-    EPOLLET = 1u << 31
-#define EPOLLET EPOLLET
-  };
-
-
-/* Valid opcodes ( "op" parameter ) to issue to epoll_ctl().  */
-#define EPOLL_CTL_ADD 1	/* Add a file descriptor to the interface.  */
-#define EPOLL_CTL_DEL 2	/* Remove a file descriptor from the interface.  */
-#define EPOLL_CTL_MOD 3	/* Change file descriptor epoll_event structure.  */
-
-
-typedef union epoll_data
-{
-  void *ptr;
-  int fd;
-  uint32_t u32;
-  uint64_t u64;
-} epoll_data_t;
-
-struct epoll_event
-{
-  uint32_t events;	/* Epoll events */
-  epoll_data_t data;	/* User data variable */
-} __EPOLL_PACKED;
-
-
-__BEGIN_DECLS
-
-/* Creates an epoll instance.  Returns an fd for the new instance.
-   The "size" parameter is a hint specifying the number of file
-   descriptors to be associated with the new instance.  The fd
-   returned by epoll_create() should be closed with close().  */
-extern int epoll_create (int __size) __THROW;
-
-/* Same as epoll_create but with an FLAGS parameter.  The unused SIZE
-   parameter has been dropped.  */
-extern int epoll_create1 (int __flags) __THROW;
-
-
-/* Manipulate an epoll instance "epfd". Returns 0 in case of success,
-   -1 in case of error ( the "errno" variable will contain the
-   specific error code ) The "op" parameter is one of the EPOLL_CTL_*
-   constants defined above. The "fd" parameter is the target of the
-   operation. The "event" parameter describes which events the caller
-   is interested in and any associated user data.  */
-extern int epoll_ctl (int __epfd, int __op, int __fd,
-		      struct epoll_event *__event) __THROW;
-
-
-/* Wait for events on an epoll instance "epfd". Returns the number of
-   triggered events returned in "events" buffer. Or -1 in case of
-   error with the "errno" variable set to the specific error code. The
-   "events" parameter is a buffer that will contain triggered
-   events. The "maxevents" is the maximum number of events to be
-   returned ( usually size of "events" ). The "timeout" parameter
-   specifies the maximum wait time in milliseconds (-1 == infinite).
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int epoll_wait (int __epfd, struct epoll_event *__events,
-		       int __maxevents, int __timeout);
-
-
-/* Same as epoll_wait, but the thread's signal mask is temporarily
-   and atomically replaced with the one provided as parameter.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int epoll_pwait (int __epfd, struct epoll_event *__events,
-			int __maxevents, int __timeout,
-			const __sigset_t *__ss);
-
-__END_DECLS
-
-#endif /* sys/epoll.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/errno.h b/openflow/usr/include/arm-linux-gnueabihf/sys/errno.h
deleted file mode 100644
index 339f4fc..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <errno.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/eventfd.h b/openflow/usr/include/arm-linux-gnueabihf/sys/eventfd.h
deleted file mode 100644
index 8f8a518..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/eventfd.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (C) 2007-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_EVENTFD_H
-#define	_SYS_EVENTFD_H	1
-
-#include <stdint.h>
-
-/* Get the platform-dependent flags.  */
-#include <bits/eventfd.h>
-
-/* Type for event counter.  */
-typedef uint64_t eventfd_t;
-
-
-__BEGIN_DECLS
-
-/* Return file descriptor for generic event channel.  Set initial
-   value to COUNT.  */
-extern int eventfd (unsigned int __count, int __flags) __THROW;
-
-/* Read event counter and possibly wait for events.  */
-extern int eventfd_read (int __fd, eventfd_t *__value);
-
-/* Increment event counter.  */
-extern int eventfd_write (int __fd, eventfd_t __value);
-
-__END_DECLS
-
-#endif /* sys/eventfd.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/fanotify.h b/openflow/usr/include/arm-linux-gnueabihf/sys/fanotify.h
deleted file mode 100644
index d79ef5e..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/fanotify.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 2010-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_FANOTIFY_H
-#define	_SYS_FANOTIFY_H	1
-
-#include <stdint.h>
-#include <linux/fanotify.h>
-
-
-__BEGIN_DECLS
-
-/* Create and initialize fanotify group.  */
-extern int fanotify_init (unsigned int __flags, unsigned int __event_f_flags)
-  __THROW;
-
-/* Add, remove, or modify an fanotify mark on a filesystem object.  */
-extern int fanotify_mark (int __fanotify_fd, unsigned int __flags,
-			  uint64_t __mask, int __dfd, const char *__pathname)
-     __THROW;
-
-__END_DECLS
-
-#endif /* sys/fanotify.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/fcntl.h b/openflow/usr/include/arm-linux-gnueabihf/sys/fcntl.h
deleted file mode 100644
index cd30455..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <fcntl.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/file.h b/openflow/usr/include/arm-linux-gnueabihf/sys/file.h
deleted file mode 100644
index cd2a641..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/file.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_FILE_H
-#define	_SYS_FILE_H	1
-
-#include <features.h>
-
-#ifndef	_FCNTL_H
-# include <fcntl.h>
-#endif
-
-__BEGIN_DECLS
-
-
-/* Alternate names for values for the WHENCE argument to `lseek'.
-   These are the same as SEEK_SET, SEEK_CUR, and SEEK_END, respectively.  */
-#ifndef L_SET
-# define L_SET	0	/* Seek from beginning of file.  */
-# define L_INCR	1	/* Seek from current position.  */
-# define L_XTND	2	/* Seek from end of file.  */
-#endif
-
-
-/* Operations for the `flock' call.  */
-#define	LOCK_SH	1	/* Shared lock.  */
-#define	LOCK_EX	2 	/* Exclusive lock.  */
-#define	LOCK_UN	8	/* Unlock.  */
-#define	__LOCK_ATOMIC	16	/* Atomic update.  */
-
-/* Can be OR'd in to one of the above.  */
-#define	LOCK_NB	4	/* Don't block when locking.  */
-
-
-/* Apply or remove an advisory lock, according to OPERATION,
-   on the file FD refers to.  */
-extern int flock (int __fd, int __operation) __THROW;
-
-
-__END_DECLS
-
-#endif /* sys/file.h  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/fsuid.h b/openflow/usr/include/arm-linux-gnueabihf/sys/fsuid.h
deleted file mode 100644
index ac7f286..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/fsuid.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_FSUID_H
-#define _SYS_FSUID_H	1
-
-#include <features.h>
-#include <sys/types.h>
-
-__BEGIN_DECLS
-
-/* Change uid used for file access control to UID, without affecting
-   other privileges (such as who can send signals at the process).  */
-extern int setfsuid (__uid_t __uid) __THROW;
-
-/* Ditto for group id. */
-extern int setfsgid (__gid_t __gid) __THROW;
-
-__END_DECLS
-
-#endif /* fsuid.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/gmon.h b/openflow/usr/include/arm-linux-gnueabihf/sys/gmon.h
deleted file mode 100644
index 5b430ab..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/gmon.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- */
-
-#ifndef	_SYS_GMON_H
-#define	_SYS_GMON_H	1
-
-#include <features.h>
-
-#include <sys/types.h>
-
-/*
- * See gmon_out.h for gmon.out format.
- */
-
-/* structure emitted by "gcc -a".  This must match struct bb in
-   gcc/libgcc2.c.  It is OK for gcc to declare a longer structure as
-   long as the members below are present.  */
-struct __bb
-{
-  long			zero_word;
-  const char		*filename;
-  long			*counts;
-  long			ncounts;
-  struct __bb		*next;
-  const unsigned long	*addresses;
-};
-
-extern struct __bb *__bb_head;
-
-/*
- * histogram counters are unsigned shorts (according to the kernel).
- */
-#define	HISTCOUNTER	unsigned short
-
-/*
- * fraction of text space to allocate for histogram counters here, 1/2
- */
-#define	HISTFRACTION	2
-
-/*
- * Fraction of text space to allocate for from hash buckets.
- * The value of HASHFRACTION is based on the minimum number of bytes
- * of separation between two subroutine call points in the object code.
- * Given MIN_SUBR_SEPARATION bytes of separation the value of
- * HASHFRACTION is calculated as:
- *
- *	HASHFRACTION = MIN_SUBR_SEPARATION / (2 * sizeof(short) - 1);
- *
- * For example, on the VAX, the shortest two call sequence is:
- *
- *	calls	$0,(r0)
- *	calls	$0,(r0)
- *
- * which is separated by only three bytes, thus HASHFRACTION is
- * calculated as:
- *
- *	HASHFRACTION = 3 / (2 * 2 - 1) = 1
- *
- * Note that the division above rounds down, thus if MIN_SUBR_FRACTION
- * is less than three, this algorithm will not work!
- *
- * In practice, however, call instructions are rarely at a minimal
- * distance.  Hence, we will define HASHFRACTION to be 2 across all
- * architectures.  This saves a reasonable amount of space for
- * profiling data structures without (in practice) sacrificing
- * any granularity.
- */
-#define	HASHFRACTION	2
-
-/*
- * Percent of text space to allocate for tostructs.
- * This is a heuristic; we will fail with a warning when profiling programs
- * with a very large number of very small functions, but that's
- * normally OK.
- * 2 is probably still a good value for normal programs.
- * Profiling a test case with 64000 small functions will work if
- * you raise this value to 3 and link statically (which bloats the
- * text size, thus raising the number of arcs expected by the heuristic).
- */
-#define ARCDENSITY	3
-
-/*
- * Always allocate at least this many tostructs.  This
- * hides the inadequacy of the ARCDENSITY heuristic, at least
- * for small programs.
- */
-#define MINARCS		50
-
-/*
- * The type used to represent indices into gmonparam.tos[].
- */
-#define	ARCINDEX	u_long
-
-/*
- * Maximum number of arcs we want to allow.
- * Used to be max representable value of ARCINDEX minus 2, but now
- * that ARCINDEX is a long, that's too large; we don't really want
- * to allow a 48 gigabyte table.
- * The old value of 1<<16 wasn't high enough in practice for large C++
- * programs; will 1<<20 be adequate for long?  FIXME
- */
-#define MAXARCS		(1 << 20)
-
-struct tostruct {
-	u_long		selfpc;
-	long		count;
-	ARCINDEX	link;
-};
-
-/*
- * a raw arc, with pointers to the calling site and
- * the called site and a count.
- */
-struct rawarc {
-	u_long	raw_frompc;
-	u_long	raw_selfpc;
-	long	raw_count;
-};
-
-/*
- * general rounding functions.
- */
-#define ROUNDDOWN(x,y)	(((x)/(y))*(y))
-#define ROUNDUP(x,y)	((((x)+(y)-1)/(y))*(y))
-
-/*
- * The profiling data structures are housed in this structure.
- */
-struct gmonparam {
-	long int	state;
-	u_short		*kcount;
-	u_long		kcountsize;
-	ARCINDEX	*froms;
-	u_long		fromssize;
-	struct tostruct	*tos;
-	u_long		tossize;
-	long		tolimit;
-	u_long		lowpc;
-	u_long		highpc;
-	u_long		textsize;
-	u_long		hashfraction;
-	long		log_hashfraction;
-};
-
-/*
- * Possible states of profiling.
- */
-#define	GMON_PROF_ON	0
-#define	GMON_PROF_BUSY	1
-#define	GMON_PROF_ERROR	2
-#define	GMON_PROF_OFF	3
-
-/*
- * Sysctl definitions for extracting profiling information from the kernel.
- */
-#define	GPROF_STATE	0	/* int: profiling enabling variable */
-#define	GPROF_COUNT	1	/* struct: profile tick count buffer */
-#define	GPROF_FROMS	2	/* struct: from location hash bucket */
-#define	GPROF_TOS	3	/* struct: destination/count structure */
-#define	GPROF_GMONPARAM	4	/* struct: profiling parameters (see above) */
-
-__BEGIN_DECLS
-
-/* Set up data structures and start profiling.  */
-extern void __monstartup (u_long __lowpc, u_long __highpc) __THROW;
-extern void monstartup (u_long __lowpc, u_long __highpc) __THROW;
-
-/* Clean up profiling and write out gmon.out.  */
-extern void _mcleanup (void) __THROW;
-
-__END_DECLS
-
-#endif /* sys/gmon.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/gmon_out.h b/openflow/usr/include/arm-linux-gnueabihf/sys/gmon_out.h
deleted file mode 100644
index b948799..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/gmon_out.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by David Mosberger <davidm@cs.arizona.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* This file specifies the format of gmon.out files.  It should have
-   as few external dependencies as possible as it is going to be included
-   in many different programs.  That is, minimize the number of #include's.
-
-   A gmon.out file consists of a header (defined by gmon_hdr) followed by
-   a sequence of records.  Each record starts with a one-byte tag
-   identifying the type of records, followed by records specific data. */
-
-#ifndef _SYS_GMON_OUT_H
-#define _SYS_GMON_OUT_H	1
-
-#include <features.h>
-
-#define	GMON_MAGIC	"gmon"	/* magic cookie */
-#define GMON_VERSION	1	/* version number */
-
-/* For profiling shared object we need a new format.  */
-#define GMON_SHOBJ_VERSION	0x1ffff
-
-__BEGIN_DECLS
-
-/*
- * Raw header as it appears on file (without padding).  This header
- * always comes first in gmon.out and is then followed by a series
- * records defined below.
- */
-struct gmon_hdr
-  {
-    char cookie[4];
-    char version[4];
-    char spare[3 * 4];
-  };
-
-/* types of records in this file: */
-typedef enum
-  {
-    GMON_TAG_TIME_HIST = 0,
-    GMON_TAG_CG_ARC = 1,
-    GMON_TAG_BB_COUNT = 2
-  } GMON_Record_Tag;
-
-struct gmon_hist_hdr
-  {
-    char low_pc[sizeof (char *)];	/* base pc address of sample buffer */
-    char high_pc[sizeof (char *)];	/* max pc address of sampled buffer */
-    char hist_size[4];			/* size of sample buffer */
-    char prof_rate[4];			/* profiling clock rate */
-    char dimen[15];			/* phys. dim., usually "seconds" */
-    char dimen_abbrev;			/* usually 's' for "seconds" */
-  };
-
-struct gmon_cg_arc_record
-  {
-    char from_pc[sizeof (char *)];	/* address within caller's body */
-    char self_pc[sizeof (char *)];	/* address within callee's body */
-    char count[4];			/* number of arc traversals */
-  };
-
-__END_DECLS
-
-#endif /* sys/gmon_out.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/inotify.h b/openflow/usr/include/arm-linux-gnueabihf/sys/inotify.h
deleted file mode 100644
index e42dba0..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/inotify.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright (C) 2005-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_INOTIFY_H
-#define	_SYS_INOTIFY_H	1
-
-#include <stdint.h>
-
-/* Get the platform-dependent flags.  */
-#include <bits/inotify.h>
-
-
-/* Structure describing an inotify event.  */
-struct inotify_event
-{
-  int wd;		/* Watch descriptor.  */
-  uint32_t mask;	/* Watch mask.  */
-  uint32_t cookie;	/* Cookie to synchronize two events.  */
-  uint32_t len;		/* Length (including NULs) of name.  */
-  char name __flexarr;	/* Name.  */
-};
-
-
-/* Supported events suitable for MASK parameter of INOTIFY_ADD_WATCH.  */
-#define IN_ACCESS	 0x00000001	/* File was accessed.  */
-#define IN_MODIFY	 0x00000002	/* File was modified.  */
-#define IN_ATTRIB	 0x00000004	/* Metadata changed.  */
-#define IN_CLOSE_WRITE	 0x00000008	/* Writtable file was closed.  */
-#define IN_CLOSE_NOWRITE 0x00000010	/* Unwrittable file closed.  */
-#define IN_CLOSE	 (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* Close.  */
-#define IN_OPEN		 0x00000020	/* File was opened.  */
-#define IN_MOVED_FROM	 0x00000040	/* File was moved from X.  */
-#define IN_MOVED_TO      0x00000080	/* File was moved to Y.  */
-#define IN_MOVE		 (IN_MOVED_FROM | IN_MOVED_TO) /* Moves.  */
-#define IN_CREATE	 0x00000100	/* Subfile was created.  */
-#define IN_DELETE	 0x00000200	/* Subfile was deleted.  */
-#define IN_DELETE_SELF	 0x00000400	/* Self was deleted.  */
-#define IN_MOVE_SELF	 0x00000800	/* Self was moved.  */
-
-/* Events sent by the kernel.  */
-#define IN_UNMOUNT	 0x00002000	/* Backing fs was unmounted.  */
-#define IN_Q_OVERFLOW	 0x00004000	/* Event queued overflowed.  */
-#define IN_IGNORED	 0x00008000	/* File was ignored.  */
-
-/* Helper events.  */
-#define IN_CLOSE	 (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE)	/* Close.  */
-#define IN_MOVE		 (IN_MOVED_FROM | IN_MOVED_TO)		/* Moves.  */
-
-/* Special flags.  */
-#define IN_ONLYDIR	 0x01000000	/* Only watch the path if it is a
-					   directory.  */
-#define IN_DONT_FOLLOW	 0x02000000	/* Do not follow a sym link.  */
-#define IN_EXCL_UNLINK	 0x04000000	/* Exclude events on unlinked
-					   objects.  */
-#define IN_MASK_ADD	 0x20000000	/* Add to the mask of an already
-					   existing watch.  */
-#define IN_ISDIR	 0x40000000	/* Event occurred against dir.  */
-#define IN_ONESHOT	 0x80000000	/* Only send event once.  */
-
-/* All events which a program can wait on.  */
-#define IN_ALL_EVENTS	 (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE  \
-			  | IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM	      \
-			  | IN_MOVED_TO | IN_CREATE | IN_DELETE		      \
-			  | IN_DELETE_SELF | IN_MOVE_SELF)
-
-
-__BEGIN_DECLS
-
-/* Create and initialize inotify instance.  */
-extern int inotify_init (void) __THROW;
-
-/* Create and initialize inotify instance.  */
-extern int inotify_init1 (int __flags) __THROW;
-
-/* Add watch of object NAME to inotify instance FD.  Notify about
-   events specified by MASK.  */
-extern int inotify_add_watch (int __fd, const char *__name, uint32_t __mask)
-  __THROW;
-
-/* Remove the watch specified by WD from the inotify instance FD.  */
-extern int inotify_rm_watch (int __fd, int __wd) __THROW;
-
-__END_DECLS
-
-#endif /* sys/inotify.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/io.h b/openflow/usr/include/arm-linux-gnueabihf/sys/io.h
deleted file mode 100644
index 9b585b9..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/io.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_IO_H
-
-#define	_SYS_IO_H	1
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* If TURN_ON is TRUE, request for permission to do direct i/o on the
-   port numbers in the range [FROM,FROM+NUM-1].  Otherwise, turn I/O
-   permission off for that range.  This call requires root privileges.  */
-extern int ioperm (unsigned long int __from, unsigned long int __num,
-		   int __turn_on) __THROW;
-
-/* Set the I/O privilege level to LEVEL.  If LEVEL is nonzero,
-   permission to access any I/O port is granted.  This call requires
-   root privileges. */
-extern int iopl (int __level) __THROW;
-
-/* The functions that actually perform reads and writes.  */
-extern unsigned char inb (unsigned long int __port) __THROW;
-extern unsigned short int inw (unsigned long int __port) __THROW;
-extern unsigned long int inl (unsigned long int __port) __THROW;
-
-extern void outb (unsigned char __value, unsigned long int __port) __THROW;
-extern void outw (unsigned short __value, unsigned long int __port) __THROW;
-extern void outl (unsigned long __value, unsigned long int __port) __THROW;
-
-__END_DECLS
-
-#endif /* _SYS_IO_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/ioctl.h b/openflow/usr/include/arm-linux-gnueabihf/sys/ioctl.h
deleted file mode 100644
index 4bc5a1a..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/ioctl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_IOCTL_H
-#define	_SYS_IOCTL_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* Get the list of `ioctl' requests and related constants.  */
-#include <bits/ioctls.h>
-
-/* Define some types used by `ioctl' requests.  */
-#include <bits/ioctl-types.h>
-
-/* On a Unix system, the system <sys/ioctl.h> probably defines some of
-   the symbols we define in <sys/ttydefaults.h> (usually with the same
-   values).  The code to generate <bits/ioctls.h> has omitted these
-   symbols to avoid the conflict, but a Unix program expects <sys/ioctl.h>
-   to define them, so we must include <sys/ttydefaults.h> here.  */
-#include <sys/ttydefaults.h>
-
-/* Perform the I/O control operation specified by REQUEST on FD.
-   One argument may follow; its presence and type depend on REQUEST.
-   Return value depends on REQUEST.  Usually -1 indicates error.  */
-extern int ioctl (int __fd, unsigned long int __request, ...) __THROW;
-
-__END_DECLS
-
-#endif /* sys/ioctl.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/ipc.h b/openflow/usr/include/arm-linux-gnueabihf/sys/ipc.h
deleted file mode 100644
index 70bd7a6..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/ipc.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_IPC_H
-#define _SYS_IPC_H	1
-
-#include <features.h>
-
-#if !defined __USE_MISC && !defined __USE_XOPEN && __GNUC__ >= 2
-# warning "Files using this header must be compiled with _GNU_SOURCE or _XOPEN_SOURCE"
-#endif
-
-/* Get system dependent definition of `struct ipc_perm' and more.  */
-#include <bits/ipctypes.h>
-#include <bits/ipc.h>
-
-#ifndef __uid_t_defined
-typedef __uid_t uid_t;
-# define __uid_t_defined
-#endif
-
-#ifndef __gid_t_defined
-typedef __gid_t gid_t;
-# define __gid_t_defined
-#endif
-
-#ifndef __mode_t_defined
-typedef __mode_t mode_t;
-# define __mode_t_defined
-#endif
-
-#ifndef __key_t_defined
-typedef __key_t key_t;
-# define __key_t_defined
-#endif
-
-__BEGIN_DECLS
-
-/* Generates key for System V style IPC.  */
-extern key_t ftok (const char *__pathname, int __proj_id) __THROW;
-
-__END_DECLS
-
-#endif /* sys/ipc.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/kd.h b/openflow/usr/include/arm-linux-gnueabihf/sys/kd.h
deleted file mode 100644
index bb20603..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/kd.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_KD_H
-#define _SYS_KD_H	1
-
-/* Make sure the <linux/types.h> header is not loaded.  */
-#ifndef _LINUX_TYPES_H
-# define _LINUX_TYPES_H		1
-# define __undef_LINUX_TYPES_H
-#endif
-
-#include <linux/kd.h>
-
-#ifdef __undef_LINUX_TYPES_H
-# undef _LINUX_TYPES_H
-# undef __undef_LINUX_TYPES_H
-#endif
-
-#endif	/* sys/kd.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/klog.h b/openflow/usr/include/arm-linux-gnueabihf/sys/klog.h
deleted file mode 100644
index 21c3950..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/klog.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_KLOG_H
-
-#define	_SYS_KLOG_H	1
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* Control the kernel's logging facility.  This corresponds exactly to
-   the kernel's syslog system call, but that name is easily confused
-   with the user-level syslog facility, which is something completely
-   different.  */
-extern int klogctl (int __type, char *__bufp, int __len) __THROW;
-
-__END_DECLS
-
-#endif /* _SYS_KLOG_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/mman.h b/openflow/usr/include/arm-linux-gnueabihf/sys/mman.h
deleted file mode 100644
index a7879ea..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/mman.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Definitions for BSD-style memory management.
-   Copyright (C) 1994-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_MMAN_H
-#define	_SYS_MMAN_H	1
-
-#include <features.h>
-#include <bits/types.h>
-#define __need_size_t
-#include <stddef.h>
-
-#ifndef __off_t_defined
-# ifndef __USE_FILE_OFFSET64
-typedef __off_t off_t;
-# else
-typedef __off64_t off_t;
-# endif
-# define __off_t_defined
-#endif
-
-#ifndef __mode_t_defined
-typedef __mode_t mode_t;
-# define __mode_t_defined
-#endif
-
-#include <bits/mman.h>
-
-/* Return value of `mmap' in case of an error.  */
-#define MAP_FAILED	((void *) -1)
-
-__BEGIN_DECLS
-/* Map addresses starting near ADDR and extending for LEN bytes.  from
-   OFFSET into the file FD describes according to PROT and FLAGS.  If ADDR
-   is nonzero, it is the desired mapping address.  If the MAP_FIXED bit is
-   set in FLAGS, the mapping will be at ADDR exactly (which must be
-   page-aligned); otherwise the system chooses a convenient nearby address.
-   The return value is the actual mapping address chosen or MAP_FAILED
-   for errors (in which case `errno' is set).  A successful `mmap' call
-   deallocates any previous mapping for the affected region.  */
-
-#ifndef __USE_FILE_OFFSET64
-extern void *mmap (void *__addr, size_t __len, int __prot,
-		   int __flags, int __fd, __off_t __offset) __THROW;
-#else
-# ifdef __REDIRECT_NTH
-extern void * __REDIRECT_NTH (mmap,
-			      (void *__addr, size_t __len, int __prot,
-			       int __flags, int __fd, __off64_t __offset),
-			      mmap64);
-# else
-#  define mmap mmap64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern void *mmap64 (void *__addr, size_t __len, int __prot,
-		     int __flags, int __fd, __off64_t __offset) __THROW;
-#endif
-
-/* Deallocate any mapping for the region starting at ADDR and extending LEN
-   bytes.  Returns 0 if successful, -1 for errors (and sets errno).  */
-extern int munmap (void *__addr, size_t __len) __THROW;
-
-/* Change the memory protection of the region starting at ADDR and
-   extending LEN bytes to PROT.  Returns 0 if successful, -1 for errors
-   (and sets errno).  */
-extern int mprotect (void *__addr, size_t __len, int __prot) __THROW;
-
-/* Synchronize the region starting at ADDR and extending LEN bytes with the
-   file it maps.  Filesystem operations on a file being mapped are
-   unpredictable before this is done.  Flags are from the MS_* set.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int msync (void *__addr, size_t __len, int __flags);
-
-#ifdef __USE_MISC
-/* Advise the system about particular usage patterns the program follows
-   for the region starting at ADDR and extending LEN bytes.  */
-extern int madvise (void *__addr, size_t __len, int __advice) __THROW;
-#endif
-#ifdef __USE_XOPEN2K
-/* This is the POSIX name for this function.  */
-extern int posix_madvise (void *__addr, size_t __len, int __advice) __THROW;
-#endif
-
-/* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to
-   be memory resident.  */
-extern int mlock (const void *__addr, size_t __len) __THROW;
-
-/* Unlock whole pages previously mapped by the range [ADDR,ADDR+LEN).  */
-extern int munlock (const void *__addr, size_t __len) __THROW;
-
-/* Cause all currently mapped pages of the process to be memory resident
-   until unlocked by a call to the `munlockall', until the process exits,
-   or until the process calls `execve'.  */
-extern int mlockall (int __flags) __THROW;
-
-/* All currently mapped pages of the process' address space become
-   unlocked.  */
-extern int munlockall (void) __THROW;
-
-#ifdef __USE_MISC
-/* mincore returns the memory residency status of the pages in the
-   current process's address space specified by [start, start + len).
-   The status is returned in a vector of bytes.  The least significant
-   bit of each byte is 1 if the referenced page is in memory, otherwise
-   it is zero.  */
-extern int mincore (void *__start, size_t __len, unsigned char *__vec)
-     __THROW;
-#endif
-
-#ifdef __USE_GNU
-/* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length
-   NEW_LEN.  If MREMAP_MAYMOVE is set in FLAGS the returned address
-   may differ from ADDR.  If MREMAP_FIXED is set in FLAGS the function
-   takes another parameter which is a fixed address at which the block
-   resides after a successful call.  */
-extern void *mremap (void *__addr, size_t __old_len, size_t __new_len,
-		     int __flags, ...) __THROW;
-
-/* Remap arbitrary pages of a shared backing store within an existing
-   VMA.  */
-extern int remap_file_pages (void *__start, size_t __size, int __prot,
-			     size_t __pgoff, int __flags) __THROW;
-#endif
-
-
-/* Open shared memory segment.  */
-extern int shm_open (const char *__name, int __oflag, mode_t __mode);
-
-/* Remove shared memory segment.  */
-extern int shm_unlink (const char *__name);
-
-__END_DECLS
-
-#endif	/* sys/mman.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/mount.h b/openflow/usr/include/arm-linux-gnueabihf/sys/mount.h
deleted file mode 100644
index 3b667ed..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/mount.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Header file for mounting/unmount Linux filesystems.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* This is taken from /usr/include/linux/fs.h.  */
-
-#ifndef _SYS_MOUNT_H
-#define _SYS_MOUNT_H	1
-
-#include <features.h>
-#include <sys/ioctl.h>
-
-#define BLOCK_SIZE	1024
-#define BLOCK_SIZE_BITS	10
-
-
-/* These are the fs-independent mount-flags: up to 16 flags are
-   supported  */
-enum
-{
-  MS_RDONLY = 1,		/* Mount read-only.  */
-#define MS_RDONLY	MS_RDONLY
-  MS_NOSUID = 2,		/* Ignore suid and sgid bits.  */
-#define MS_NOSUID	MS_NOSUID
-  MS_NODEV = 4,			/* Disallow access to device special files.  */
-#define MS_NODEV	MS_NODEV
-  MS_NOEXEC = 8,		/* Disallow program execution.  */
-#define MS_NOEXEC	MS_NOEXEC
-  MS_SYNCHRONOUS = 16,		/* Writes are synced at once.  */
-#define MS_SYNCHRONOUS	MS_SYNCHRONOUS
-  MS_REMOUNT = 32,		/* Alter flags of a mounted FS.  */
-#define MS_REMOUNT	MS_REMOUNT
-  MS_MANDLOCK = 64,		/* Allow mandatory locks on an FS.  */
-#define MS_MANDLOCK	MS_MANDLOCK
-  MS_DIRSYNC = 128,		/* Directory modifications are synchronous.  */
-#define MS_DIRSYNC	MS_DIRSYNC
-  MS_NOATIME = 1024,		/* Do not update access times.  */
-#define MS_NOATIME	MS_NOATIME
-  MS_NODIRATIME = 2048,		/* Do not update directory access times.  */
-#define MS_NODIRATIME	MS_NODIRATIME
-  MS_BIND = 4096,		/* Bind directory at different place.  */
-#define MS_BIND		MS_BIND
-  MS_MOVE = 8192,
-#define MS_MOVE		MS_MOVE
-  MS_REC = 16384,
-#define MS_REC		MS_REC
-  MS_SILENT = 32768,
-#define MS_SILENT	MS_SILENT
-  MS_POSIXACL = 1 << 16,	/* VFS does not apply the umask.  */
-#define MS_POSIXACL	MS_POSIXACL
-  MS_UNBINDABLE = 1 << 17,	/* Change to unbindable.  */
-#define MS_UNBINDABLE	MS_UNBINDABLE
-  MS_PRIVATE = 1 << 18,		/* Change to private.  */
-#define MS_PRIVATE	MS_PRIVATE
-  MS_SLAVE = 1 << 19,		/* Change to slave.  */
-#define MS_SLAVE	MS_SLAVE
-  MS_SHARED = 1 << 20,		/* Change to shared.  */
-#define MS_SHARED	MS_SHARED
-  MS_RELATIME = 1 << 21,	/* Update atime relative to mtime/ctime.  */
-#define MS_RELATIME	MS_RELATIME
-  MS_KERNMOUNT = 1 << 22,	/* This is a kern_mount call.  */
-#define MS_KERNMOUNT	MS_KERNMOUNT
-  MS_I_VERSION =  1 << 23,	/* Update inode I_version field.  */
-#define MS_I_VERSION	MS_I_VERSION
-  MS_STRICTATIME = 1 << 24,	/* Always perform atime updates.  */
-#define MS_STRICTATIME	MS_STRICTATIME
-  MS_LAZYTIME = 1 << 25,	/* Update the on-disk [acm]times lazily.  */
-#define MS_LAZYTIME	MS_LAZYTIME
-  MS_ACTIVE = 1 << 30,
-#define MS_ACTIVE	MS_ACTIVE
-  MS_NOUSER = 1 << 31
-#define MS_NOUSER	MS_NOUSER
-};
-
-/* Flags that can be altered by MS_REMOUNT  */
-#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION \
-		     |MS_LAZYTIME)
-
-
-/* Magic mount flag number. Has to be or-ed to the flag values.  */
-
-#define MS_MGC_VAL 0xc0ed0000	/* Magic flag number to indicate "new" flags */
-#define MS_MGC_MSK 0xffff0000	/* Magic flag number mask */
-
-
-/* The read-only stuff doesn't really belong here, but any other place
-   is probably as bad and I don't want to create yet another include
-   file.  */
-
-#define BLKROSET   _IO(0x12, 93) /* Set device read-only (0 = read-write).  */
-#define BLKROGET   _IO(0x12, 94) /* Get read-only status (0 = read_write).  */
-#define BLKRRPART  _IO(0x12, 95) /* Re-read partition table.  */
-#define BLKGETSIZE _IO(0x12, 96) /* Return device size.  */
-#define BLKFLSBUF  _IO(0x12, 97) /* Flush buffer cache.  */
-#define BLKRASET   _IO(0x12, 98) /* Set read ahead for block device.  */
-#define BLKRAGET   _IO(0x12, 99) /* Get current read ahead setting.  */
-#define BLKFRASET  _IO(0x12,100) /* Set filesystem read-ahead.  */
-#define BLKFRAGET  _IO(0x12,101) /* Get filesystem read-ahead.  */
-#define BLKSECTSET _IO(0x12,102) /* Set max sectors per request.  */
-#define BLKSECTGET _IO(0x12,103) /* Get max sectors per request.  */
-#define BLKSSZGET  _IO(0x12,104) /* Get block device sector size.  */
-#define BLKBSZGET  _IOR(0x12,112,size_t)
-#define BLKBSZSET  _IOW(0x12,113,size_t)
-#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size.  */
-
-
-/* Possible value for FLAGS parameter of `umount2'.  */
-enum
-{
-  MNT_FORCE = 1,		/* Force unmounting.  */
-#define MNT_FORCE MNT_FORCE
-  MNT_DETACH = 2,		/* Just detach from the tree.  */
-#define MNT_DETACH MNT_DETACH
-  MNT_EXPIRE = 4,		/* Mark for expiry.  */
-#define MNT_EXPIRE MNT_EXPIRE
-  UMOUNT_NOFOLLOW = 8		/* Don't follow symlink on umount.  */
-#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
-};
-
-
-__BEGIN_DECLS
-
-/* Mount a filesystem.  */
-extern int mount (const char *__special_file, const char *__dir,
-		  const char *__fstype, unsigned long int __rwflag,
-		  const void *__data) __THROW;
-
-/* Unmount a filesystem.  */
-extern int umount (const char *__special_file) __THROW;
-
-/* Unmount a filesystem.  Force unmounting if FLAGS is set to MNT_FORCE.  */
-extern int umount2 (const char *__special_file, int __flags) __THROW;
-
-__END_DECLS
-
-#endif /* _SYS_MOUNT_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/msg.h b/openflow/usr/include/arm-linux-gnueabihf/sys/msg.h
deleted file mode 100644
index 4dc559f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/msg.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_MSG_H
-#define _SYS_MSG_H
-
-#include <features.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-/* Get common definition of System V style IPC.  */
-#include <sys/ipc.h>
-
-/* Get system dependent definition of `struct msqid_ds' and more.  */
-#include <bits/msq.h>
-
-/* Define types required by the standard.  */
-#define	__need_time_t
-#include <time.h>
-
-#ifndef __pid_t_defined
-typedef __pid_t pid_t;
-# define __pid_t_defined
-#endif
-
-#ifndef __ssize_t_defined
-typedef __ssize_t ssize_t;
-# define __ssize_t_defined
-#endif
-
-/* The following System V style IPC functions implement a message queue
-   system.  The definition is found in XPG2.  */
-
-#ifdef __USE_GNU
-/* Template for struct to be used as argument for `msgsnd' and `msgrcv'.  */
-struct msgbuf
-  {
-    __syscall_slong_t mtype;	/* type of received/sent message */
-    char mtext[1];		/* text of the message */
-  };
-#endif
-
-
-__BEGIN_DECLS
-
-/* Message queue control operation.  */
-extern int msgctl (int __msqid, int __cmd, struct msqid_ds *__buf) __THROW;
-
-/* Get messages queue.  */
-extern int msgget (key_t __key, int __msgflg) __THROW;
-
-/* Receive message from message queue.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t msgrcv (int __msqid, void *__msgp, size_t __msgsz,
-		       long int __msgtyp, int __msgflg);
-
-/* Send message to message queue.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int msgsnd (int __msqid, const void *__msgp, size_t __msgsz,
-		   int __msgflg);
-
-__END_DECLS
-
-#endif /* sys/msg.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/mtio.h b/openflow/usr/include/arm-linux-gnueabihf/sys/mtio.h
deleted file mode 100644
index 3d175ae..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/mtio.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/* Structures and definitions for magnetic tape I/O control commands.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Written by H. Bergman <hennus@cybercomm.nl>.  */
-
-#ifndef _SYS_MTIO_H
-#define _SYS_MTIO_H	1
-
-/* Get necessary definitions from system and kernel headers.  */
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-
-/* Structure for MTIOCTOP - magnetic tape operation command.  */
-struct mtop
-  {
-    short int mt_op;		/* Operations defined below.  */
-    int mt_count;		/* How many of them.  */
-  };
-#define _IOT_mtop /* Hurd ioctl type field.  */ \
-  _IOT (_IOTS (short), 1, _IOTS (int), 1, 0, 0)
-
-/* Magnetic Tape operations [Not all operations supported by all drivers].  */
-#define MTRESET 0	/* +reset drive in case of problems.  */
-#define MTFSF	1	/* Forward space over FileMark,
-			 * position at first record of next file.  */
-#define MTBSF	2	/* Backward space FileMark (position before FM).  */
-#define MTFSR	3	/* Forward space record.  */
-#define MTBSR	4	/* Backward space record.  */
-#define MTWEOF	5	/* Write an end-of-file record (mark).  */
-#define MTREW	6	/* Rewind.  */
-#define MTOFFL	7	/* Rewind and put the drive offline (eject?).  */
-#define MTNOP	8	/* No op, set status only (read with MTIOCGET).  */
-#define MTRETEN 9	/* Retension tape.  */
-#define MTBSFM	10	/* +backward space FileMark, position at FM.  */
-#define MTFSFM  11	/* +forward space FileMark, position at FM.  */
-#define MTEOM	12	/* Goto end of recorded media (for appending files).
-			   MTEOM positions after the last FM, ready for
-			   appending another file.  */
-#define MTERASE 13	/* Erase tape -- be careful!  */
-
-#define MTRAS1  14	/* Run self test 1 (nondestructive).  */
-#define MTRAS2	15	/* Run self test 2 (destructive).  */
-#define MTRAS3  16	/* Reserved for self test 3.  */
-
-#define MTSETBLK 20	/* Set block length (SCSI).  */
-#define MTSETDENSITY 21	/* Set tape density (SCSI).  */
-#define MTSEEK	22	/* Seek to block (Tandberg, etc.).  */
-#define MTTELL	23	/* Tell block (Tandberg, etc.).  */
-#define MTSETDRVBUFFER 24 /* Set the drive buffering according to SCSI-2.
-			     Ordinary buffered operation with code 1.  */
-#define MTFSS	25	/* Space forward over setmarks.  */
-#define MTBSS	26	/* Space backward over setmarks.  */
-#define MTWSM	27	/* Write setmarks.  */
-
-#define MTLOCK  28	/* Lock the drive door.  */
-#define MTUNLOCK 29	/* Unlock the drive door.  */
-#define MTLOAD  30	/* Execute the SCSI load command.  */
-#define MTUNLOAD 31	/* Execute the SCSI unload command.  */
-#define MTCOMPRESSION 32/* Control compression with SCSI mode page 15.  */
-#define MTSETPART 33	/* Change the active tape partition.  */
-#define MTMKPART  34	/* Format the tape with one or two partitions.  */
-
-/* structure for MTIOCGET - mag tape get status command */
-
-struct mtget
-  {
-    long int mt_type;		/* Type of magtape device.  */
-    long int mt_resid;		/* Residual count: (not sure)
-				   number of bytes ignored, or
-				   number of files not skipped, or
-				   number of records not skipped.  */
-    /* The following registers are device dependent.  */
-    long int mt_dsreg;		/* Status register.  */
-    long int mt_gstat;		/* Generic (device independent) status.  */
-    long int mt_erreg;		/* Error register.  */
-    /* The next two fields are not always used.  */
-    __daddr_t mt_fileno;	/* Number of current file on tape.  */
-    __daddr_t mt_blkno;		/* Current block number.  */
-  };
-#define _IOT_mtget /* Hurd ioctl type field.  */ \
-  _IOT (_IOTS (long), 7, 0, 0, 0, 0)
-
-
-/* Constants for mt_type. Not all of these are supported, and
-   these are not all of the ones that are supported.  */
-#define MT_ISUNKNOWN		0x01
-#define MT_ISQIC02		0x02	/* Generic QIC-02 tape streamer.  */
-#define MT_ISWT5150		0x03	/* Wangtek 5150EQ, QIC-150, QIC-02.  */
-#define MT_ISARCHIVE_5945L2	0x04	/* Archive 5945L-2, QIC-24, QIC-02?. */
-#define MT_ISCMSJ500		0x05	/* CMS Jumbo 500 (QIC-02?).  */
-#define MT_ISTDC3610		0x06	/* Tandberg 6310, QIC-24.  */
-#define MT_ISARCHIVE_VP60I	0x07	/* Archive VP60i, QIC-02.  */
-#define MT_ISARCHIVE_2150L	0x08	/* Archive Viper 2150L.  */
-#define MT_ISARCHIVE_2060L	0x09	/* Archive Viper 2060L.  */
-#define MT_ISARCHIVESC499	0x0A	/* Archive SC-499 QIC-36 controller. */
-#define MT_ISQIC02_ALL_FEATURES	0x0F	/* Generic QIC-02 with all features. */
-#define MT_ISWT5099EEN24	0x11	/* Wangtek 5099-een24, 60MB, QIC-24. */
-#define MT_ISTEAC_MT2ST		0x12	/* Teac MT-2ST 155mb drive,
-					   Teac DC-1 card (Wangtek type).  */
-#define MT_ISEVEREX_FT40A	0x32	/* Everex FT40A (QIC-40).  */
-#define MT_ISDDS1		0x51	/* DDS device without partitions.  */
-#define MT_ISDDS2		0x52	/* DDS device with partitions.  */
-#define MT_ISSCSI1		0x71	/* Generic ANSI SCSI-1 tape unit.  */
-#define MT_ISSCSI2		0x72	/* Generic ANSI SCSI-2 tape unit.  */
-
-/* QIC-40/80/3010/3020 ftape supported drives.
-   20bit vendor ID + 0x800000 (see vendors.h in ftape distribution).  */
-#define MT_ISFTAPE_UNKNOWN	0x800000 /* obsolete */
-#define MT_ISFTAPE_FLAG		0x800000
-
-struct mt_tape_info
-  {
-    long int t_type;		/* Device type id (mt_type).  */
-    char *t_name;		/* Descriptive name.  */
-  };
-
-#define MT_TAPE_INFO \
-  {									      \
-	{MT_ISUNKNOWN,		"Unknown type of tape device"},		      \
-	{MT_ISQIC02,		"Generic QIC-02 tape streamer"},	      \
-	{MT_ISWT5150,		"Wangtek 5150, QIC-150"},		      \
-	{MT_ISARCHIVE_5945L2,	"Archive 5945L-2"},			      \
-	{MT_ISCMSJ500,		"CMS Jumbo 500"},			      \
-	{MT_ISTDC3610,		"Tandberg TDC 3610, QIC-24"},		      \
-	{MT_ISARCHIVE_VP60I,	"Archive VP60i, QIC-02"},		      \
-	{MT_ISARCHIVE_2150L,	"Archive Viper 2150L"},			      \
-	{MT_ISARCHIVE_2060L,	"Archive Viper 2060L"},			      \
-	{MT_ISARCHIVESC499,	"Archive SC-499 QIC-36 controller"},	      \
-	{MT_ISQIC02_ALL_FEATURES, "Generic QIC-02 tape, all features"},	      \
-	{MT_ISWT5099EEN24,	"Wangtek 5099-een24, 60MB"},		      \
-	{MT_ISTEAC_MT2ST,	"Teac MT-2ST 155mb data cassette drive"},     \
-	{MT_ISEVEREX_FT40A,	"Everex FT40A, QIC-40"},		      \
-	{MT_ISSCSI1,		"Generic SCSI-1 tape"},			      \
-	{MT_ISSCSI2,		"Generic SCSI-2 tape"},			      \
-	{0, NULL}							      \
-  }
-
-
-/* Structure for MTIOCPOS - mag tape get position command.  */
-
-struct mtpos
-  {
-    long int mt_blkno;	/* Current block number.  */
-  };
-#define _IOT_mtpos /* Hurd ioctl type field.  */ \
-  _IOT_SIMPLE (long)
-
-
-/* Structure for MTIOCGETCONFIG/MTIOCSETCONFIG primarily intended
-   as an interim solution for QIC-02 until DDI is fully implemented.  */
-struct mtconfiginfo
-  {
-    long int mt_type;		/* Drive type.  */
-    long int ifc_type;		/* Interface card type.  */
-    unsigned short int irqnr;	/* IRQ number to use.  */
-    unsigned short int dmanr;	/* DMA channel to use.  */
-    unsigned short int port;	/* IO port base address.  */
-
-    unsigned long int debug;	/* Debugging flags.  */
-
-    unsigned have_dens:1;
-    unsigned have_bsf:1;
-    unsigned have_fsr:1;
-    unsigned have_bsr:1;
-    unsigned have_eod:1;
-    unsigned have_seek:1;
-    unsigned have_tell:1;
-    unsigned have_ras1:1;
-    unsigned have_ras2:1;
-    unsigned have_ras3:1;
-    unsigned have_qfa:1;
-
-    unsigned pad1:5;
-    char reserved[10];
-  };
-#define _IOT_mtconfiginfo /* Hurd ioctl type field.  */ \
-  _IOT (_IOTS (long), 2, _IOTS (short), 3, _IOTS (long), 1) /* XXX wrong */
-
-
-/* Magnetic tape I/O control commands.  */
-#define	MTIOCTOP	_IOW('m', 1, struct mtop)	/* Do a mag tape op. */
-#define	MTIOCGET	_IOR('m', 2, struct mtget)	/* Get tape status.  */
-#define	MTIOCPOS	_IOR('m', 3, struct mtpos)	/* Get tape position.*/
-
-/* The next two are used by the QIC-02 driver for runtime reconfiguration.
-   See tpqic02.h for struct mtconfiginfo.  */
-#define	MTIOCGETCONFIG	_IOR('m', 4, struct mtconfiginfo) /* Get tape config.*/
-#define	MTIOCSETCONFIG	_IOW('m', 5, struct mtconfiginfo) /* Set tape config.*/
-
-/* Generic Mag Tape (device independent) status macros for examining
-   mt_gstat -- HP-UX compatible.
-   There is room for more generic status bits here, but I don't
-   know which of them are reserved. At least three or so should
-   be added to make this really useful.  */
-#define GMT_EOF(x)              ((x) & 0x80000000)
-#define GMT_BOT(x)              ((x) & 0x40000000)
-#define GMT_EOT(x)              ((x) & 0x20000000)
-#define GMT_SM(x)               ((x) & 0x10000000)  /* DDS setmark */
-#define GMT_EOD(x)              ((x) & 0x08000000)  /* DDS EOD */
-#define GMT_WR_PROT(x)          ((x) & 0x04000000)
-/* #define GMT_ ? 		((x) & 0x02000000) */
-#define GMT_ONLINE(x)           ((x) & 0x01000000)
-#define GMT_D_6250(x)           ((x) & 0x00800000)
-#define GMT_D_1600(x)           ((x) & 0x00400000)
-#define GMT_D_800(x)            ((x) & 0x00200000)
-/* #define GMT_ ? 		((x) & 0x00100000) */
-/* #define GMT_ ? 		((x) & 0x00080000) */
-#define GMT_DR_OPEN(x)          ((x) & 0x00040000)  /* Door open (no tape).  */
-/* #define GMT_ ? 		((x) & 0x00020000) */
-#define GMT_IM_REP_EN(x)        ((x) & 0x00010000)  /* Immediate report mode.*/
-/* 16 generic status bits unused.  */
-
-
-/* SCSI-tape specific definitions.  Bitfield shifts in the status  */
-#define MT_ST_BLKSIZE_SHIFT	0
-#define MT_ST_BLKSIZE_MASK	0xffffff
-#define MT_ST_DENSITY_SHIFT	24
-#define MT_ST_DENSITY_MASK	0xff000000
-
-#define MT_ST_SOFTERR_SHIFT	0
-#define MT_ST_SOFTERR_MASK	0xffff
-
-/* Bitfields for the MTSETDRVBUFFER ioctl.  */
-#define MT_ST_OPTIONS		0xf0000000
-#define MT_ST_BOOLEANS		0x10000000
-#define MT_ST_SETBOOLEANS	0x30000000
-#define MT_ST_CLEARBOOLEANS	0x40000000
-#define MT_ST_WRITE_THRESHOLD	0x20000000
-#define MT_ST_DEF_BLKSIZE	0x50000000
-#define MT_ST_DEF_OPTIONS	0x60000000
-
-#define MT_ST_BUFFER_WRITES	0x1
-#define MT_ST_ASYNC_WRITES	0x2
-#define MT_ST_READ_AHEAD	0x4
-#define MT_ST_DEBUGGING		0x8
-#define MT_ST_TWO_FM		0x10
-#define MT_ST_FAST_MTEOM	0x20
-#define MT_ST_AUTO_LOCK		0x40
-#define MT_ST_DEF_WRITES	0x80
-#define MT_ST_CAN_BSR		0x100
-#define MT_ST_NO_BLKLIMS	0x200
-#define MT_ST_CAN_PARTITIONS    0x400
-#define MT_ST_SCSI2LOGICAL      0x800
-
-/* The mode parameters to be controlled. Parameter chosen with bits 20-28.  */
-#define MT_ST_CLEAR_DEFAULT	0xfffff
-#define MT_ST_DEF_DENSITY	(MT_ST_DEF_OPTIONS | 0x100000)
-#define MT_ST_DEF_COMPRESSION	(MT_ST_DEF_OPTIONS | 0x200000)
-#define MT_ST_DEF_DRVBUFFER	(MT_ST_DEF_OPTIONS | 0x300000)
-
-/* The offset for the arguments for the special HP changer load command.  */
-#define MT_ST_HPLOADER_OFFSET 10000
-
-
-/* Specify default tape device.  */
-#ifndef DEFTAPE
-# define DEFTAPE	"/dev/tape"
-#endif
-
-#endif /* mtio.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/param.h b/openflow/usr/include/arm-linux-gnueabihf/sys/param.h
deleted file mode 100644
index 7e0e331..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/param.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Compatibility header for old-style Unix parameters and limits.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_PARAM_H
-#define _SYS_PARAM_H    1
-
-#define __need_NULL
-#include <stddef.h>
-
-#include <sys/types.h>
-#include <limits.h>
-#include <endian.h>                     /* Define BYTE_ORDER et al.  */
-#include <signal.h>                     /* Define NSIG.  */
-
-/* This file defines some things in system-specific ways.  */
-#include <bits/param.h>
-
-
-/* BSD names for some <limits.h> values.  */
-
-#define NBBY		CHAR_BIT
-
-#if !defined NGROUPS && defined NGROUPS_MAX
-# define NGROUPS	NGROUPS_MAX
-#endif
-#if !defined MAXSYMLINKS && defined SYMLOOP_MAX
-# define MAXSYMLINKS	SYMLOOP_MAX
-#endif
-#if !defined CANBSIZ && defined MAX_CANON
-# define CANBSIZ	MAX_CANON
-#endif
-#if !defined MAXPATHLEN && defined PATH_MAX
-# define MAXPATHLEN	PATH_MAX
-#endif
-#if !defined NOFILE && defined OPEN_MAX
-# define NOFILE		OPEN_MAX
-#endif
-#if !defined MAXHOSTNAMELEN && defined HOST_NAME_MAX
-# define MAXHOSTNAMELEN	HOST_NAME_MAX
-#endif
-#ifndef NCARGS
-# ifdef ARG_MAX
-#  define NCARGS	ARG_MAX
-# else
-/* ARG_MAX is unlimited, but we define NCARGS for BSD programs that want to
-   compare against some fixed limit.  */
-# define NCARGS		INT_MAX
-# endif
-#endif
-
-
-/* Magical constants.  */
-#ifndef NOGROUP
-# define NOGROUP	65535     /* Marker for empty group set member.  */
-#endif
-#ifndef NODEV
-# define NODEV		((dev_t) -1)    /* Non-existent device.  */
-#endif
-
-
-/* Unit of `st_blocks'.  */
-#ifndef DEV_BSIZE
-# define DEV_BSIZE	512
-#endif
-
-
-/* Bit map related macros.  */
-#define setbit(a,i)     ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define clrbit(a,i)     ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define isset(a,i)      ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-
-/* Macros for counting and rounding.  */
-#ifndef howmany
-# define howmany(x, y)  (((x) + ((y) - 1)) / (y))
-#endif
-#ifdef __GNUC__
-# define roundup(x, y)  (__builtin_constant_p (y) && powerof2 (y)             \
-                         ? (((x) + (y) - 1) & ~((y) - 1))                     \
-                         : ((((x) + ((y) - 1)) / (y)) * (y)))
-#else
-# define roundup(x, y)  ((((x) + ((y) - 1)) / (y)) * (y))
-#endif
-#define powerof2(x)     ((((x) - 1) & (x)) == 0)
-
-/* Macros for min/max.  */
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#define MAX(a,b) (((a)>(b))?(a):(b))
-
-
-#endif  /* sys/param.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/pci.h b/openflow/usr/include/arm-linux-gnueabihf/sys/pci.h
deleted file mode 100644
index 331f2e1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/pci.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_PCI_H
-#define _SYS_PCI_H	1
-
-/* We use the constants from the kernel.  */
-#include <linux/pci.h>
-
-#endif /* sys/pci.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/personality.h b/openflow/usr/include/arm-linux-gnueabihf/sys/personality.h
deleted file mode 100644
index ad2258f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/personality.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Taken verbatim from Linux 2.6 (include/linux/personality.h).  */
-
-#ifndef _SYS_PERSONALITY_H
-#define _SYS_PERSONALITY_H 1
-
-#include <features.h>
-
-/* Flags for bug emulation.
-   These occupy the top three bytes.  */
-enum
-  {
-    UNAME26 = 0x0020000,
-    ADDR_NO_RANDOMIZE = 0x0040000,
-    FDPIC_FUNCPTRS = 0x0080000,
-    MMAP_PAGE_ZERO = 0x0100000,
-    ADDR_COMPAT_LAYOUT = 0x0200000,
-    READ_IMPLIES_EXEC = 0x0400000,
-    ADDR_LIMIT_32BIT = 0x0800000,
-    SHORT_INODE = 0x1000000,
-    WHOLE_SECONDS = 0x2000000,
-    STICKY_TIMEOUTS = 0x4000000,
-    ADDR_LIMIT_3GB = 	0x8000000
-  };
-
-/* Personality types.
-
-   These go in the low byte.  Avoid using the top bit, it will
-   conflict with error returns.  */
-enum
-  {
-    PER_LINUX = 0x0000,
-    PER_LINUX_32BIT = 0x0000 | ADDR_LIMIT_32BIT,
-    PER_LINUX_FDPIC = 0x0000 | FDPIC_FUNCPTRS,
-    PER_SVR4 = 0x0001 | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
-    PER_SVR3 = 0x0002 | STICKY_TIMEOUTS | SHORT_INODE,
-    PER_SCOSVR3 = 0x0003 | STICKY_TIMEOUTS | WHOLE_SECONDS | SHORT_INODE,
-    PER_OSR5 = 0x0003 | STICKY_TIMEOUTS | WHOLE_SECONDS,
-    PER_WYSEV386 = 0x0004 | STICKY_TIMEOUTS | SHORT_INODE,
-    PER_ISCR4 = 0x0005 | STICKY_TIMEOUTS,
-    PER_BSD = 0x0006,
-    PER_SUNOS = 0x0006 | STICKY_TIMEOUTS,
-    PER_XENIX = 0x0007 | STICKY_TIMEOUTS | SHORT_INODE,
-    PER_LINUX32 = 0x0008,
-    PER_LINUX32_3GB = 0x0008 | ADDR_LIMIT_3GB,
-    PER_IRIX32 = 0x0009 | STICKY_TIMEOUTS,	/* IRIX5 32-bit */
-    PER_IRIXN32 = 0x000a | STICKY_TIMEOUTS,	/* IRIX6 new 32-bit */
-    PER_IRIX64 = 0x000b | STICKY_TIMEOUTS,	/* IRIX6 64-bit */
-    PER_RISCOS = 0x000c,
-    PER_SOLARIS = 0x000d | STICKY_TIMEOUTS,
-    PER_UW7 = 0x000e | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
-    PER_OSF4 = 0x000f,
-    PER_HPUX = 0x0010,
-    PER_MASK = 0x00ff,
-  };
-
-__BEGIN_DECLS
-
-/* Set different ABIs (personalities).  */
-extern int personality (unsigned long int __persona) __THROW;
-
-__END_DECLS
-
-#endif /* sys/personality.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/poll.h b/openflow/usr/include/arm-linux-gnueabihf/sys/poll.h
deleted file mode 100644
index e751860..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/poll.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Compatibility definitions for System V `poll' interface.
-   Copyright (C) 1994-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_POLL_H
-#define	_SYS_POLL_H	1
-
-#include <features.h>
-
-/* Get the platform dependent bits of `poll'.  */
-#include <bits/poll.h>
-#ifdef __USE_GNU
-/* Get the __sigset_t definition.  */
-# include <bits/sigset.h>
-/* Get the timespec definition.  */
-# define __need_timespec
-# include <time.h>
-#endif
-
-
-/* Type used for the number of file descriptors.  */
-typedef unsigned long int nfds_t;
-
-/* Data structure describing a polling request.  */
-struct pollfd
-  {
-    int fd;			/* File descriptor to poll.  */
-    short int events;		/* Types of events poller cares about.  */
-    short int revents;		/* Types of events that actually occurred.  */
-  };
-
-
-__BEGIN_DECLS
-
-/* Poll the file descriptors described by the NFDS structures starting at
-   FDS.  If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
-   an event to occur; if TIMEOUT is -1, block until an event occurs.
-   Returns the number of file descriptors with events, zero if timed out,
-   or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout);
-
-#ifdef __USE_GNU
-/* Like poll, but before waiting the threads signal mask is replaced
-   with that specified in the fourth parameter.  For better usability,
-   the timeout value is specified using a TIMESPEC object.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int ppoll (struct pollfd *__fds, nfds_t __nfds,
-		  const struct timespec *__timeout,
-		  const __sigset_t *__ss);
-#endif
-
-__END_DECLS
-
-
-/* Define some inlines helping to catch common problems.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-# include <bits/poll2.h>
-#endif
-
-#endif	/* sys/poll.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/prctl.h b/openflow/usr/include/arm-linux-gnueabihf/sys/prctl.h
deleted file mode 100644
index 83049d5..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/prctl.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_PRCTL_H
-#define _SYS_PRCTL_H	1
-
-#include <features.h>
-#include <linux/prctl.h>  /*  The magic values come from here  */
-
-__BEGIN_DECLS
-
-/* Control process execution.  */
-extern int prctl (int __option, ...) __THROW;
-
-__END_DECLS
-
-#endif  /* sys/prctl.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/procfs.h b/openflow/usr/include/arm-linux-gnueabihf/sys/procfs.h
deleted file mode 100644
index 73da7f1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/procfs.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_PROCFS_H
-#define _SYS_PROCFS_H	1
-
-/* This is somewhat modelled after the file of the same name on SVR4
-   systems.  It provides a definition of the core file format for ELF
-   used on Linux.  It doesn't have anything to do with the /proc file
-   system, even though Linux has one.
-
-   Anyway, the whole purpose of this file is for GDB and GDB only.
-   Don't read too much into it.  Don't use it for anything other than
-   GDB unless you know what you are doing.  */
-
-#include <features.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/user.h>
-
-__BEGIN_DECLS
-
-/* Type for a general-purpose register.  */
-typedef unsigned long elf_greg_t;
-
-/* And the whole bunch of them.  We could have used `struct
-   user_regs' directly in the typedef, but tradition says that
-   the register set is an array, which does have some peculiar
-   semantics, so leave it that way.  */
-#define ELF_NGREG (sizeof (struct user_regs) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-/* Register set for the floating-point registers.  */
-typedef struct user_fpregs elf_fpregset_t;
-
-/* Signal info.  */
-struct elf_siginfo
-  {
-    int si_signo;			/* Signal number.  */
-    int si_code;			/* Extra code.  */
-    int si_errno;			/* Errno.  */
-  };
-
-/* Definitions to generate Intel SVR4-like core files.  These mostly
-   have the same names as the SVR4 types with "elf_" tacked on the
-   front to prevent clashes with Linux definitions, and the typedef
-   forms have been avoided.  This is mostly like the SVR4 structure,
-   but more Linuxy, with things that Linux does not support and which
-   GDB doesn't really use excluded.  */
-
-struct elf_prstatus
-  {
-    struct elf_siginfo pr_info;		/* Info associated with signal.  */
-    short int pr_cursig;		/* Current signal.  */
-    unsigned long int pr_sigpend;	/* Set of pending signals.  */
-    unsigned long int pr_sighold;	/* Set of held signals.  */
-    __pid_t pr_pid;
-    __pid_t pr_ppid;
-    __pid_t pr_pgrp;
-    __pid_t pr_sid;
-    struct timeval pr_utime;		/* User time.  */
-    struct timeval pr_stime;		/* System time.  */
-    struct timeval pr_cutime;		/* Cumulative user time.  */
-    struct timeval pr_cstime;		/* Cumulative system time.  */
-    elf_gregset_t pr_reg;		/* GP registers.  */
-    int pr_fpvalid;			/* True if math copro being used.  */
-  };
-
-
-#define ELF_PRARGSZ     (80)    /* Number of chars for args.  */
-
-struct elf_prpsinfo
-  {
-    char pr_state;			/* Numeric process state.  */
-    char pr_sname;			/* Char for pr_state.  */
-    char pr_zomb;			/* Zombie.  */
-    char pr_nice;			/* Nice val.  */
-    unsigned long int pr_flag;		/* Flags.  */
-    unsigned short int pr_uid;
-    unsigned short int pr_gid;
-    int pr_pid, pr_ppid, pr_pgrp, pr_sid;
-    /* Lots missing */
-    char pr_fname[16];			/* Filename of executable.  */
-    char pr_psargs[ELF_PRARGSZ];	/* Initial part of arg list.  */
-  };
-
-/* The rest of this file provides the types for emulation of the
-   Solaris <proc_service.h> interfaces that should be implemented by
-   users of libthread_db.  */
-
-/* Addresses.  */
-typedef void *psaddr_t;
-
-/* Register sets.  Linux has different names.  */
-typedef elf_gregset_t prgregset_t;
-typedef elf_fpregset_t prfpregset_t;
-
-/* We don't have any differences between processes and threads,
-   therefore have only one PID type.  */
-typedef __pid_t lwpid_t;
-
-/* Process status and info.  In the end we do provide typedefs for them.  */
-typedef struct elf_prstatus prstatus_t;
-typedef struct elf_prpsinfo prpsinfo_t;
-
-__END_DECLS
-
-#endif	/* sys/procfs.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/profil.h b/openflow/usr/include/arm-linux-gnueabihf/sys/profil.h
deleted file mode 100644
index 5790fe0..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/profil.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (C) 2001-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _PROFIL_H
-#define _PROFIL_H	1
-
-#include <features.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-
-/* This interface is intended to follow the sprofil() system calls as
-   described by the sprofil(2) man page of Irix v6.5, except that:
-
-	- there is no a priori limit on number of text sections
-	- pr_scale is declared as unsigned long (instead of "unsigned int")
-	- pr_size is declared as size_t (instead of "unsigned int")
-	- pr_off is declared as void * (instead of "__psunsigned_t")
-	- the overflow bin (pr_base==0, pr_scale==2) can appear anywhere
-	  in the profp array
-	- PROF_FAST has no effect  */
-
-struct prof
-  {
-    void *pr_base;		/* buffer base */
-    size_t pr_size;		/* buffer size */
-    size_t pr_off;		/* pc offset */
-    unsigned long int pr_scale;	/* pc scaling (fixed-point number) */
-  };
-
-enum
-  {
-    PROF_USHORT	= 0,		/* use 16-bit counters (default) */
-    PROF_UINT	= 1 << 0,	/* use 32-bit counters */
-    PROF_FAST   = 1 << 1	/* profile faster than usual */
-  };
-
-
-__BEGIN_DECLS
-
-extern int sprofil (struct prof *__profp, int __profcnt,
-		    struct timeval *__tvp, unsigned int __flags) __THROW;
-
-__END_DECLS
-
-#endif /* profil.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/ptrace.h b/openflow/usr/include/arm-linux-gnueabihf/sys/ptrace.h
deleted file mode 100644
index ee88271..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/ptrace.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* `ptrace' debugger support interface.  Linux version.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_PTRACE_H
-#define _SYS_PTRACE_H	1
-
-#include <features.h>
-#include <bits/types.h>
-
-__BEGIN_DECLS
-
-/* Type of the REQUEST argument to `ptrace.'  */
-enum __ptrace_request
-{
-  /* Indicate that the process making this request should be traced.
-     All signals received by this process can be intercepted by its
-     parent, and its parent can use the other `ptrace' requests.  */
-  PTRACE_TRACEME = 0,
-#define PT_TRACE_ME PTRACE_TRACEME
-
-  /* Return the word in the process's text space at address ADDR.  */
-  PTRACE_PEEKTEXT = 1,
-#define PT_READ_I PTRACE_PEEKTEXT
-
-  /* Return the word in the process's data space at address ADDR.  */
-  PTRACE_PEEKDATA = 2,
-#define PT_READ_D PTRACE_PEEKDATA
-
-  /* Return the word in the process's user area at offset ADDR.  */
-  PTRACE_PEEKUSER = 3,
-#define PT_READ_U PTRACE_PEEKUSER
-
-  /* Write the word DATA into the process's text space at address ADDR.  */
-  PTRACE_POKETEXT = 4,
-#define PT_WRITE_I PTRACE_POKETEXT
-
-  /* Write the word DATA into the process's data space at address ADDR.  */
-  PTRACE_POKEDATA = 5,
-#define PT_WRITE_D PTRACE_POKEDATA
-
-  /* Write the word DATA into the process's user area at offset ADDR.  */
-  PTRACE_POKEUSER = 6,
-#define PT_WRITE_U PTRACE_POKEUSER
-
-  /* Continue the process.  */
-  PTRACE_CONT = 7,
-#define PT_CONTINUE PTRACE_CONT
-
-  /* Kill the process.  */
-  PTRACE_KILL = 8,
-#define PT_KILL PTRACE_KILL
-
-  /* Single step the process.
-     This is not supported on all machines.  */
-  PTRACE_SINGLESTEP = 9,
-#define PT_STEP PTRACE_SINGLESTEP
-
-  /* Get all general purpose registers used by a processes.
-     This is not supported on all machines.  */
-   PTRACE_GETREGS = 12,
-#define PT_GETREGS PTRACE_GETREGS
-
-  /* Set all general purpose registers used by a processes.
-     This is not supported on all machines.  */
-   PTRACE_SETREGS = 13,
-#define PT_SETREGS PTRACE_SETREGS
-
-  /* Get all floating point registers used by a processes.
-     This is not supported on all machines.  */
-   PTRACE_GETFPREGS = 14,
-#define PT_GETFPREGS PTRACE_GETFPREGS
-
-  /* Set all floating point registers used by a processes.
-     This is not supported on all machines.  */
-   PTRACE_SETFPREGS = 15,
-#define PT_SETFPREGS PTRACE_SETFPREGS
-
-  /* Attach to a process that is already running. */
-  PTRACE_ATTACH = 16,
-#define PT_ATTACH PTRACE_ATTACH
-
-  /* Detach from a process attached to with PTRACE_ATTACH.  */
-  PTRACE_DETACH = 17,
-#define PT_DETACH PTRACE_DETACH
-
-  /* Get all extended floating point registers used by a processes.
-     This is not supported on all machines.  */
-   PTRACE_GETFPXREGS = 18,
-#define PT_GETFPXREGS PTRACE_GETFPXREGS
-
-  /* Set all extended floating point registers used by a processes.
-     This is not supported on all machines.  */
-   PTRACE_SETFPXREGS = 19,
-#define PT_SETFPXREGS PTRACE_SETFPXREGS
-
-  /* Continue and stop at the next (return from) syscall.  */
-  PTRACE_SYSCALL = 24,
-#define PT_SYSCALL PTRACE_SYSCALL
-
-  /* Set ptrace filter options.  */
-  PTRACE_SETOPTIONS = 0x4200,
-#define PT_SETOPTIONS PTRACE_SETOPTIONS
-
-  /* Get last ptrace message.  */
-  PTRACE_GETEVENTMSG = 0x4201,
-#define PT_GETEVENTMSG PTRACE_GETEVENTMSG
-
-  /* Get siginfo for process.  */
-  PTRACE_GETSIGINFO = 0x4202,
-#define PT_GETSIGINFO PTRACE_GETSIGINFO
-
-  /* Set new siginfo for process.  */
-  PTRACE_SETSIGINFO = 0x4203,
-#define PT_SETSIGINFO PTRACE_SETSIGINFO
-
-  /* Get register content.  */
-  PTRACE_GETREGSET = 0x4204,
-#define PTRACE_GETREGSET PTRACE_GETREGSET
-
-  /* Set register content.  */
-  PTRACE_SETREGSET = 0x4205,
-#define PTRACE_SETREGSET PTRACE_SETREGSET
-
-  /* Like PTRACE_ATTACH, but do not force tracee to trap and do not affect
-     signal or group stop state.  */
-  PTRACE_SEIZE = 0x4206,
-#define PTRACE_SEIZE PTRACE_SEIZE
-
-  /* Trap seized tracee.  */
-  PTRACE_INTERRUPT = 0x4207,
-#define PTRACE_INTERRUPT PTRACE_INTERRUPT
-
-  /* Wait for next group event.  */
-  PTRACE_LISTEN = 0x4208,
-#define PTRACE_LISTEN PTRACE_LISTEN
-
-  PTRACE_PEEKSIGINFO = 0x4209,
-#define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
-
-  PTRACE_GETSIGMASK = 0x420a,
-#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
-
-  PTRACE_SETSIGMASK = 0x420b,
-#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
-
-  PTRACE_SECCOMP_GET_FILTER = 0x420c
-#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
-};
-
-
-/* Flag for PTRACE_LISTEN.  */
-enum __ptrace_flags
-{
-  PTRACE_SEIZE_DEVEL = 0x80000000
-};
-
-/* Options set using PTRACE_SETOPTIONS.  */
-enum __ptrace_setoptions
-{
-  PTRACE_O_TRACESYSGOOD	= 0x00000001,
-  PTRACE_O_TRACEFORK	= 0x00000002,
-  PTRACE_O_TRACEVFORK   = 0x00000004,
-  PTRACE_O_TRACECLONE	= 0x00000008,
-  PTRACE_O_TRACEEXEC	= 0x00000010,
-  PTRACE_O_TRACEVFORKDONE = 0x00000020,
-  PTRACE_O_TRACEEXIT	= 0x00000040,
-  PTRACE_O_TRACESECCOMP = 0x00000080,
-  PTRACE_O_EXITKILL	= 0x00100000,
-  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
-  PTRACE_O_MASK		= 0x003000ff
-};
-
-/* Wait extended result codes for the above trace options.  */
-enum __ptrace_eventcodes
-{
-  PTRACE_EVENT_FORK	= 1,
-  PTRACE_EVENT_VFORK	= 2,
-  PTRACE_EVENT_CLONE	= 3,
-  PTRACE_EVENT_EXEC	= 4,
-  PTRACE_EVENT_VFORK_DONE = 5,
-  PTRACE_EVENT_EXIT	= 6,
-  PTRACE_EVENT_SECCOMP  = 7
-};
-
-/* Arguments for PTRACE_PEEKSIGINFO.  */
-struct __ptrace_peeksiginfo_args
-{
-  __uint64_t off;	/* From which siginfo to start.  */
-  __uint32_t flags;	/* Flags for peeksiginfo.  */
-  __int32_t nr;		/* How many siginfos to take.  */
-};
-
-enum __ptrace_peeksiginfo_flags
-{
-  /* Read signals from a shared (process wide) queue.  */
-  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
-};
-
-/* Perform process tracing functions.  REQUEST is one of the values
-   above, and determines the action to be taken.
-   For all requests except PTRACE_TRACEME, PID specifies the process to be
-   traced.
-
-   PID and the other arguments described above for the various requests should
-   appear (those that are used for the particular request) as:
-     pid_t PID, void *ADDR, int DATA, void *ADDR2
-   after REQUEST.  */
-extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
-
-__END_DECLS
-
-#endif /* _SYS_PTRACE_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/queue.h b/openflow/usr/include/arm-linux-gnueabihf/sys/queue.h
deleted file mode 100644
index daf4553..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/queue.h
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- */
-
-#ifndef	_SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-/*
- * This file defines five types of data structures: singly-linked lists,
- * lists, simple queues, tail queues, and circular queues.
- *
- * A singly-linked list is headed by a single forward pointer. The
- * elements are singly linked for minimum space and pointer manipulation
- * overhead at the expense of O(n) removal for arbitrary elements. New
- * elements can be added to the list after an existing element or at the
- * head of the list.  Elements being removed from the head of the list
- * should use the explicit macro for this purpose for optimum
- * efficiency. A singly-linked list may only be traversed in the forward
- * direction.  Singly-linked lists are ideal for applications with large
- * datasets and few or no removals or for implementing a LIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A simple queue is headed by a pair of pointers, one the head of the
- * list and the other to the tail of the list. The elements are singly
- * linked to save space, so elements can only be removed from the
- * head of the list. New elements can be added to the list after
- * an existing element, at the head of the list, or at the end of the
- * list. A simple queue may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may be traversed in either direction.
- *
- * A circle queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or after
- * an existing element, at the head of the list, or at the end of the list.
- * A circle queue may be traversed in either direction, but has a more
- * complex end of list detection.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- */
-
-/*
- * List definitions.
- */
-#define	LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define	LIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-#define	LIST_INIT(head) do {						\
-	(head)->lh_first = NULL;					\
-} while (/*CONSTCOND*/0)
-
-#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
-	if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)	\
-		(listelm)->field.le_next->field.le_prev =		\
-		    &(elm)->field.le_next;				\
-	(listelm)->field.le_next = (elm);				\
-	(elm)->field.le_prev = &(listelm)->field.le_next;		\
-} while (/*CONSTCOND*/0)
-
-#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	(elm)->field.le_next = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &(elm)->field.le_next;		\
-} while (/*CONSTCOND*/0)
-
-#define	LIST_INSERT_HEAD(head, elm, field) do {				\
-	if (((elm)->field.le_next = (head)->lh_first) != NULL)		\
-		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
-	(head)->lh_first = (elm);					\
-	(elm)->field.le_prev = &(head)->lh_first;			\
-} while (/*CONSTCOND*/0)
-
-#define	LIST_REMOVE(elm, field) do {					\
-	if ((elm)->field.le_next != NULL)				\
-		(elm)->field.le_next->field.le_prev = 			\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = (elm)->field.le_next;			\
-} while (/*CONSTCOND*/0)
-
-#define	LIST_FOREACH(var, head, field)					\
-	for ((var) = ((head)->lh_first);				\
-		(var);							\
-		(var) = ((var)->field.le_next))
-
-/*
- * List access methods.
- */
-#define	LIST_EMPTY(head)		((head)->lh_first == NULL)
-#define	LIST_FIRST(head)		((head)->lh_first)
-#define	LIST_NEXT(elm, field)		((elm)->field.le_next)
-
-
-/*
- * Singly-linked List definitions.
- */
-#define	SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
-
-#define	SLIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
-
-/*
- * Singly-linked List functions.
- */
-#define	SLIST_INIT(head) do {						\
-	(head)->slh_first = NULL;					\
-} while (/*CONSTCOND*/0)
-
-#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
-	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
-	(slistelm)->field.sle_next = (elm);				\
-} while (/*CONSTCOND*/0)
-
-#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
-	(elm)->field.sle_next = (head)->slh_first;			\
-	(head)->slh_first = (elm);					\
-} while (/*CONSTCOND*/0)
-
-#define	SLIST_REMOVE_HEAD(head, field) do {				\
-	(head)->slh_first = (head)->slh_first->field.sle_next;		\
-} while (/*CONSTCOND*/0)
-
-#define	SLIST_REMOVE(head, elm, type, field) do {			\
-	if ((head)->slh_first == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = (head)->slh_first;		\
-		while(curelm->field.sle_next != (elm))			\
-			curelm = curelm->field.sle_next;		\
-		curelm->field.sle_next =				\
-		    curelm->field.sle_next->field.sle_next;		\
-	}								\
-} while (/*CONSTCOND*/0)
-
-#define	SLIST_FOREACH(var, head, field)					\
-	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
-
-/*
- * Singly-linked List access methods.
- */
-#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
-#define	SLIST_FIRST(head)	((head)->slh_first)
-#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
-
-
-/*
- * Singly-linked Tail queue declarations.
- */
-#define	STAILQ_HEAD(name, type)					\
-struct name {								\
-	struct type *stqh_first;	/* first element */			\
-	struct type **stqh_last;	/* addr of last next element */		\
-}
-
-#define	STAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).stqh_first }
-
-#define	STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define	STAILQ_INIT(head) do {						\
-	(head)->stqh_first = NULL;					\
-	(head)->stqh_last = &(head)->stqh_first;				\
-} while (/*CONSTCOND*/0)
-
-#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if (((elm)->field.stqe_next = (head)->stqh_first) == NULL)	\
-		(head)->stqh_last = &(elm)->field.stqe_next;		\
-	(head)->stqh_first = (elm);					\
-} while (/*CONSTCOND*/0)
-
-#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.stqe_next = NULL;					\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &(elm)->field.stqe_next;			\
-} while (/*CONSTCOND*/0)
-
-#define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
-		(head)->stqh_last = &(elm)->field.stqe_next;		\
-	(listelm)->field.stqe_next = (elm);				\
-} while (/*CONSTCOND*/0)
-
-#define	STAILQ_REMOVE_HEAD(head, field) do {				\
-	if (((head)->stqh_first = (head)->stqh_first->field.stqe_next) == NULL) \
-		(head)->stqh_last = &(head)->stqh_first;			\
-} while (/*CONSTCOND*/0)
-
-#define	STAILQ_REMOVE(head, elm, type, field) do {			\
-	if ((head)->stqh_first == (elm)) {				\
-		STAILQ_REMOVE_HEAD((head), field);			\
-	} else {							\
-		struct type *curelm = (head)->stqh_first;		\
-		while (curelm->field.stqe_next != (elm))			\
-			curelm = curelm->field.stqe_next;		\
-		if ((curelm->field.stqe_next =				\
-			curelm->field.stqe_next->field.stqe_next) == NULL) \
-			    (head)->stqh_last = &(curelm)->field.stqe_next; \
-	}								\
-} while (/*CONSTCOND*/0)
-
-#define	STAILQ_FOREACH(var, head, field)				\
-	for ((var) = ((head)->stqh_first);				\
-		(var);							\
-		(var) = ((var)->field.stqe_next))
-
-#define	STAILQ_CONCAT(head1, head2) do {				\
-	if (!STAILQ_EMPTY((head2))) {					\
-		*(head1)->stqh_last = (head2)->stqh_first;		\
-		(head1)->stqh_last = (head2)->stqh_last;		\
-		STAILQ_INIT((head2));					\
-	}								\
-} while (/*CONSTCOND*/0)
-
-/*
- * Singly-linked Tail queue access methods.
- */
-#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
-#define	STAILQ_FIRST(head)	((head)->stqh_first)
-#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
-
-
-/*
- * Simple queue definitions.
- */
-#define	SIMPLEQ_HEAD(name, type)					\
-struct name {								\
-	struct type *sqh_first;	/* first element */			\
-	struct type **sqh_last;	/* addr of last next element */		\
-}
-
-#define	SIMPLEQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).sqh_first }
-
-#define	SIMPLEQ_ENTRY(type)						\
-struct {								\
-	struct type *sqe_next;	/* next element */			\
-}
-
-/*
- * Simple queue functions.
- */
-#define	SIMPLEQ_INIT(head) do {						\
-	(head)->sqh_first = NULL;					\
-	(head)->sqh_last = &(head)->sqh_first;				\
-} while (/*CONSTCOND*/0)
-
-#define	SIMPLEQ_INSERT_HEAD(head, elm, field) do {			\
-	if (((elm)->field.sqe_next = (head)->sqh_first) == NULL)	\
-		(head)->sqh_last = &(elm)->field.sqe_next;		\
-	(head)->sqh_first = (elm);					\
-} while (/*CONSTCOND*/0)
-
-#define	SIMPLEQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.sqe_next = NULL;					\
-	*(head)->sqh_last = (elm);					\
-	(head)->sqh_last = &(elm)->field.sqe_next;			\
-} while (/*CONSTCOND*/0)
-
-#define	SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
-		(head)->sqh_last = &(elm)->field.sqe_next;		\
-	(listelm)->field.sqe_next = (elm);				\
-} while (/*CONSTCOND*/0)
-
-#define	SIMPLEQ_REMOVE_HEAD(head, field) do {				\
-	if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
-		(head)->sqh_last = &(head)->sqh_first;			\
-} while (/*CONSTCOND*/0)
-
-#define	SIMPLEQ_REMOVE(head, elm, type, field) do {			\
-	if ((head)->sqh_first == (elm)) {				\
-		SIMPLEQ_REMOVE_HEAD((head), field);			\
-	} else {							\
-		struct type *curelm = (head)->sqh_first;		\
-		while (curelm->field.sqe_next != (elm))			\
-			curelm = curelm->field.sqe_next;		\
-		if ((curelm->field.sqe_next =				\
-			curelm->field.sqe_next->field.sqe_next) == NULL) \
-			    (head)->sqh_last = &(curelm)->field.sqe_next; \
-	}								\
-} while (/*CONSTCOND*/0)
-
-#define	SIMPLEQ_FOREACH(var, head, field)				\
-	for ((var) = ((head)->sqh_first);				\
-		(var);							\
-		(var) = ((var)->field.sqe_next))
-
-/*
- * Simple queue access methods.
- */
-#define	SIMPLEQ_EMPTY(head)		((head)->sqh_first == NULL)
-#define	SIMPLEQ_FIRST(head)		((head)->sqh_first)
-#define	SIMPLEQ_NEXT(elm, field)	((elm)->field.sqe_next)
-
-
-/*
- * Tail queue definitions.
- */
-#define	_TAILQ_HEAD(name, type, qual)					\
-struct name {								\
-	qual type *tqh_first;		/* first element */		\
-	qual type *qual *tqh_last;	/* addr of last next element */	\
-}
-#define TAILQ_HEAD(name, type)	_TAILQ_HEAD(name, struct type,)
-
-#define	TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
-
-#define	_TAILQ_ENTRY(type, qual)					\
-struct {								\
-	qual type *tqe_next;		/* next element */		\
-	qual type *qual *tqe_prev;	/* address of previous next element */\
-}
-#define TAILQ_ENTRY(type)	_TAILQ_ENTRY(struct type,)
-
-/*
- * Tail queue functions.
- */
-#define	TAILQ_INIT(head) do {						\
-	(head)->tqh_first = NULL;					\
-	(head)->tqh_last = &(head)->tqh_first;				\
-} while (/*CONSTCOND*/0)
-
-#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
-		(head)->tqh_first->field.tqe_prev =			\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(head)->tqh_first = (elm);					\
-	(elm)->field.tqe_prev = &(head)->tqh_first;			\
-} while (/*CONSTCOND*/0)
-
-#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.tqe_next = NULL;					\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &(elm)->field.tqe_next;			\
-} while (/*CONSTCOND*/0)
-
-#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-		(elm)->field.tqe_next->field.tqe_prev = 		\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(listelm)->field.tqe_next = (elm);				\
-	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
-} while (/*CONSTCOND*/0)
-
-#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	(elm)->field.tqe_next = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
-} while (/*CONSTCOND*/0)
-
-#define	TAILQ_REMOVE(head, elm, field) do {				\
-	if (((elm)->field.tqe_next) != NULL)				\
-		(elm)->field.tqe_next->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
-} while (/*CONSTCOND*/0)
-
-#define	TAILQ_FOREACH(var, head, field)					\
-	for ((var) = ((head)->tqh_first);				\
-		(var);							\
-		(var) = ((var)->field.tqe_next))
-
-#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
-		(var);							\
-		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
-
-#define	TAILQ_CONCAT(head1, head2, field) do {				\
-	if (!TAILQ_EMPTY(head2)) {					\
-		*(head1)->tqh_last = (head2)->tqh_first;		\
-		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
-		(head1)->tqh_last = (head2)->tqh_last;			\
-		TAILQ_INIT((head2));					\
-	}								\
-} while (/*CONSTCOND*/0)
-
-/*
- * Tail queue access methods.
- */
-#define	TAILQ_EMPTY(head)		((head)->tqh_first == NULL)
-#define	TAILQ_FIRST(head)		((head)->tqh_first)
-#define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
-
-#define	TAILQ_LAST(head, headname) \
-	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-#define	TAILQ_PREV(elm, headname, field) \
-	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-
-
-/*
- * Circular queue definitions.
- */
-#define	CIRCLEQ_HEAD(name, type)					\
-struct name {								\
-	struct type *cqh_first;		/* first element */		\
-	struct type *cqh_last;		/* last element */		\
-}
-
-#define	CIRCLEQ_HEAD_INITIALIZER(head)					\
-	{ (void *)&head, (void *)&head }
-
-#define	CIRCLEQ_ENTRY(type)						\
-struct {								\
-	struct type *cqe_next;		/* next element */		\
-	struct type *cqe_prev;		/* previous element */		\
-}
-
-/*
- * Circular queue functions.
- */
-#define	CIRCLEQ_INIT(head) do {						\
-	(head)->cqh_first = (void *)(head);				\
-	(head)->cqh_last = (void *)(head);				\
-} while (/*CONSTCOND*/0)
-
-#define	CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
-	(elm)->field.cqe_prev = (listelm);				\
-	if ((listelm)->field.cqe_next == (void *)(head))		\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
-	(listelm)->field.cqe_next = (elm);				\
-} while (/*CONSTCOND*/0)
-
-#define	CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {		\
-	(elm)->field.cqe_next = (listelm);				\
-	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
-	if ((listelm)->field.cqe_prev == (void *)(head))		\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
-	(listelm)->field.cqe_prev = (elm);				\
-} while (/*CONSTCOND*/0)
-
-#define	CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
-	(elm)->field.cqe_next = (head)->cqh_first;			\
-	(elm)->field.cqe_prev = (void *)(head);				\
-	if ((head)->cqh_last == (void *)(head))				\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(head)->cqh_first->field.cqe_prev = (elm);		\
-	(head)->cqh_first = (elm);					\
-} while (/*CONSTCOND*/0)
-
-#define	CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.cqe_next = (void *)(head);				\
-	(elm)->field.cqe_prev = (head)->cqh_last;			\
-	if ((head)->cqh_first == (void *)(head))			\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(head)->cqh_last->field.cqe_next = (elm);		\
-	(head)->cqh_last = (elm);					\
-} while (/*CONSTCOND*/0)
-
-#define	CIRCLEQ_REMOVE(head, elm, field) do {				\
-	if ((elm)->field.cqe_next == (void *)(head))			\
-		(head)->cqh_last = (elm)->field.cqe_prev;		\
-	else								\
-		(elm)->field.cqe_next->field.cqe_prev =			\
-		    (elm)->field.cqe_prev;				\
-	if ((elm)->field.cqe_prev == (void *)(head))			\
-		(head)->cqh_first = (elm)->field.cqe_next;		\
-	else								\
-		(elm)->field.cqe_prev->field.cqe_next =			\
-		    (elm)->field.cqe_next;				\
-} while (/*CONSTCOND*/0)
-
-#define	CIRCLEQ_FOREACH(var, head, field)				\
-	for ((var) = ((head)->cqh_first);				\
-		(var) != (const void *)(head);				\
-		(var) = ((var)->field.cqe_next))
-
-#define	CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
-	for ((var) = ((head)->cqh_last);				\
-		(var) != (const void *)(head);				\
-		(var) = ((var)->field.cqe_prev))
-
-/*
- * Circular queue access methods.
- */
-#define	CIRCLEQ_EMPTY(head)		((head)->cqh_first == (void *)(head))
-#define	CIRCLEQ_FIRST(head)		((head)->cqh_first)
-#define	CIRCLEQ_LAST(head)		((head)->cqh_last)
-#define	CIRCLEQ_NEXT(elm, field)	((elm)->field.cqe_next)
-#define	CIRCLEQ_PREV(elm, field)	((elm)->field.cqe_prev)
-
-#define CIRCLEQ_LOOP_NEXT(head, elm, field)				\
-	(((elm)->field.cqe_next == (void *)(head))			\
-	    ? ((head)->cqh_first)					\
-	    : (elm->field.cqe_next))
-#define CIRCLEQ_LOOP_PREV(head, elm, field)				\
-	(((elm)->field.cqe_prev == (void *)(head))			\
-	    ? ((head)->cqh_last)					\
-	    : (elm->field.cqe_prev))
-
-#endif	/* sys/queue.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/quota.h b/openflow/usr/include/arm-linux-gnueabihf/sys/quota.h
deleted file mode 100644
index 5aa0ec0..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/quota.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/* This just represents the non-kernel parts of <linux/quota.h>.
- *
- * here's the corresponding copyright:
- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Robert Elz at The University of Melbourne.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _SYS_QUOTA_H
-#define _SYS_QUOTA_H 1
-
-#include <features.h>
-#include <sys/types.h>
-
-/*
- * Select between different incompatible quota versions.
- * Default to the version used by Linux kernel version 2.4.22
- * or later.  */
-#ifndef _LINUX_QUOTA_VERSION
-# define _LINUX_QUOTA_VERSION 2
-#endif
-
-/*
- * Convert diskblocks to blocks and the other way around.
- * currently only to fool the BSD source. :-)
- */
-#define dbtob(num) ((num) << 10)
-#define btodb(num) ((num) >> 10)
-
-/*
- * Convert count of filesystem blocks to diskquota blocks, meant
- * for filesystems where i_blksize != BLOCK_SIZE
- */
-#define fs_to_dq_blocks(num, blksize) (((num) * (blksize)) / BLOCK_SIZE)
-
-/*
- * Definitions for disk quotas imposed on the average user
- * (big brother finally hits Linux).
- *
- * The following constants define the amount of time given a user
- * before the soft limits are treated as hard limits (usually resulting
- * in an allocation failure). The timer is started when the user crosses
- * their soft limit, it is reset when they go below their soft limit.
- */
-#define MAX_IQ_TIME  604800	/* (7*24*60*60) 1 week */
-#define MAX_DQ_TIME  604800	/* (7*24*60*60) 1 week */
-
-#define MAXQUOTAS 2
-#define USRQUOTA  0		/* element used for user quotas */
-#define GRPQUOTA  1		/* element used for group quotas */
-
-/*
- * Definitions for the default names of the quotas files.
- */
-#define INITQFNAMES { \
-   "user",      /* USRQUOTA */ \
-   "group",   /* GRPQUOTA */ \
-   "undefined", \
-};
-
-#define QUOTAFILENAME "quota"
-#define QUOTAGROUP "staff"
-
-#define NR_DQHASH 43          /* Just an arbitrary number any suggestions ? */
-#define NR_DQUOTS 256         /* Number of quotas active at one time */
-
-/*
- * Command definitions for the 'quotactl' system call.
- * The commands are broken into a main command defined below
- * and a subcommand that is used to convey the type of
- * quota that is being manipulated (see above).
- */
-#define SUBCMDMASK  0x00ff
-#define SUBCMDSHIFT 8
-#define QCMD(cmd, type)  (((cmd) << SUBCMDSHIFT) | ((type) & SUBCMDMASK))
-
-#if _LINUX_QUOTA_VERSION < 2
-# define Q_QUOTAON  0x0100	/* enable quotas */
-# define Q_QUOTAOFF 0x0200	/* disable quotas */
-# define Q_GETQUOTA 0x0300	/* get limits and usage */
-# define Q_SETQUOTA 0x0400	/* set limits and usage */
-# define Q_SETUSE   0x0500	/* set usage */
-# define Q_SYNC     0x0600	/* sync disk copy of a filesystems quotas */
-# define Q_SETQLIM  0x0700	/* set limits */
-# define Q_GETSTATS 0x0800	/* get collected stats */
-# define Q_RSQUASH  0x1000	/* set root_squash option */
-#else
-# define Q_SYNC     0x800001	/* sync disk copy of a filesystems quotas */
-# define Q_QUOTAON  0x800002	/* turn quotas on */
-# define Q_QUOTAOFF 0x800003	/* turn quotas off */
-# define Q_GETFMT   0x800004	/* get quota format used on given filesystem */
-# define Q_GETINFO  0x800005	/* get information about quota files */
-# define Q_SETINFO  0x800006	/* set information about quota files */
-# define Q_GETQUOTA 0x800007	/* get user quota structure */
-# define Q_SETQUOTA 0x800008	/* set user quota structure */
-#endif
-
-/*
- * The following structure defines the format of the disk quota file
- * (as it appears on disk) - the file is an array of these structures
- * indexed by user or group number.
- */
-#if _LINUX_QUOTA_VERSION < 2
-struct dqblk
-  {
-    u_int32_t dqb_bhardlimit;	/* absolute limit on disk blks alloc */
-    u_int32_t dqb_bsoftlimit;	/* preferred limit on disk blks */
-    u_int32_t dqb_curblocks;	/* current block count */
-    u_int32_t dqb_ihardlimit;	/* maximum # allocated inodes */
-    u_int32_t dqb_isoftlimit;	/* preferred inode limit */
-    u_int32_t dqb_curinodes;	/* current # allocated inodes */
-    time_t dqb_btime;		/* time limit for excessive disk use */
-    time_t dqb_itime;		/* time limit for excessive files */
-  };
-#else
-
-/* Flags that indicate which fields in dqblk structure are valid.  */
-#define QIF_BLIMITS	1
-#define QIF_SPACE	2
-#define QIF_ILIMITS	4
-#define QIF_INODES	8
-#define QIF_BTIME	16
-#define QIF_ITIME	32
-#define QIF_LIMITS	(QIF_BLIMITS | QIF_ILIMITS)
-#define QIF_USAGE	(QIF_SPACE | QIF_INODES)
-#define QIF_TIMES	(QIF_BTIME | QIF_ITIME)
-#define QIF_ALL		(QIF_LIMITS | QIF_USAGE | QIF_TIMES)
-
-struct dqblk
-  {
-    u_int64_t dqb_bhardlimit;	/* absolute limit on disk quota blocks alloc */
-    u_int64_t dqb_bsoftlimit;	/* preferred limit on disk quota blocks */
-    u_int64_t dqb_curspace;	/* current quota block count */
-    u_int64_t dqb_ihardlimit;	/* maximum # allocated inodes */
-    u_int64_t dqb_isoftlimit;	/* preferred inode limit */
-    u_int64_t dqb_curinodes;	/* current # allocated inodes */
-    u_int64_t dqb_btime;	/* time limit for excessive disk use */
-    u_int64_t dqb_itime;	/* time limit for excessive files */
-    u_int32_t dqb_valid;	/* bitmask of QIF_* constants */
-  };
-#endif
-
-/*
- * Shorthand notation.
- */
-#define	dq_bhardlimit	dq_dqb.dqb_bhardlimit
-#define	dq_bsoftlimit	dq_dqb.dqb_bsoftlimit
-#if _LINUX_QUOTA_VERSION < 2
-# define dq_curblocks	dq_dqb.dqb_curblocks
-#else
-# define dq_curspace	dq_dqb.dqb_curspace
-# define dq_valid	dq_dqb.dqb_valid
-#endif
-#define	dq_ihardlimit	dq_dqb.dqb_ihardlimit
-#define	dq_isoftlimit	dq_dqb.dqb_isoftlimit
-#define	dq_curinodes	dq_dqb.dqb_curinodes
-#define	dq_btime	dq_dqb.dqb_btime
-#define	dq_itime	dq_dqb.dqb_itime
-
-#define dqoff(UID)      ((loff_t)((UID) * sizeof (struct dqblk)))
-
-#if _LINUX_QUOTA_VERSION < 2
-struct dqstats
-  {
-    u_int32_t lookups;
-    u_int32_t drops;
-    u_int32_t reads;
-    u_int32_t writes;
-    u_int32_t cache_hits;
-    u_int32_t pages_allocated;
-    u_int32_t allocated_dquots;
-    u_int32_t free_dquots;
-    u_int32_t syncs;
-  };
-#else
-
-/* Flags that indicate which fields in dqinfo structure are valid.  */
-# define IIF_BGRACE	1
-# define IIF_IGRACE	2
-# define IIF_FLAGS	4
-# define IIF_ALL	(IIF_BGRACE | IIF_IGRACE | IIF_FLAGS)
-
-struct dqinfo
-  {
-    u_int64_t dqi_bgrace;
-    u_int64_t dqi_igrace;
-    u_int32_t dqi_flags;
-    u_int32_t dqi_valid;
-  };
-#endif
-
-__BEGIN_DECLS
-
-extern int quotactl (int __cmd, const char *__special, int __id,
-		     caddr_t __addr) __THROW;
-
-__END_DECLS
-
-#endif /* sys/quota.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/raw.h b/openflow/usr/include/arm-linux-gnueabihf/sys/raw.h
deleted file mode 100644
index bd7266d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/raw.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 1999-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_RAW_H
-#define _SYS_RAW_H	1
-
-#include <stdint.h>
-#include <sys/ioctl.h>
-
-/* The major device number for raw devices.  */
-#define RAW_MAJOR	162
-
-/* `ioctl' commands for raw devices.  */
-#define RAW_SETBIND     _IO(0xac, 0)
-#define RAW_GETBIND     _IO(0xac, 1)
-
-struct raw_config_request
-{
-  int raw_minor;
-  uint64_t block_major;
-  uint64_t block_minor;
-};
-
-#endif /* sys/raw.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/reboot.h b/openflow/usr/include/arm-linux-gnueabihf/sys/reboot.h
deleted file mode 100644
index df1076f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/reboot.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* This file should define RB_* macros to be used as flag
-   bits in the argument to the `reboot' system call.  */
-
-#ifndef _SYS_REBOOT_H
-#define _SYS_REBOOT_H	1
-
-#include <features.h>
-
-/* Perform a hard reset now.  */
-#define RB_AUTOBOOT	0x01234567
-
-/* Halt the system.  */
-#define RB_HALT_SYSTEM	0xcdef0123
-
-/* Enable reboot using Ctrl-Alt-Delete keystroke.  */
-#define RB_ENABLE_CAD	0x89abcdef
-
-/* Disable reboot using Ctrl-Alt-Delete keystroke.  */
-#define RB_DISABLE_CAD	0
-
-/* Stop system and switch power off if possible.  */
-#define RB_POWER_OFF	0x4321fedc
-
-/* Suspend system using software suspend.  */
-#define RB_SW_SUSPEND	0xd000fce2
-
-/* Reboot system into new kernel.  */
-#define RB_KEXEC	0x45584543
-
-__BEGIN_DECLS
-
-/* Reboot or halt the system.  */
-extern int reboot (int __howto) __THROW;
-
-__END_DECLS
-
-#endif	/* _SYS_REBOOT_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/resource.h b/openflow/usr/include/arm-linux-gnueabihf/sys/resource.h
deleted file mode 100644
index dfef7ac..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/resource.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_RESOURCE_H
-#define	_SYS_RESOURCE_H	1
-
-#include <features.h>
-
-/* Get the system-dependent definitions of structures and bit values.  */
-#include <bits/resource.h>
-
-#ifndef __id_t_defined
-typedef __id_t id_t;
-# define __id_t_defined
-#endif
-
-__BEGIN_DECLS
-
-/* The X/Open standard defines that all the functions below must use
-   `int' as the type for the first argument.  When we are compiling with
-   GNU extensions we change this slightly to provide better error
-   checking.  */
-#if defined __USE_GNU && !defined __cplusplus
-typedef enum __rlimit_resource __rlimit_resource_t;
-typedef enum __rusage_who __rusage_who_t;
-typedef enum __priority_which __priority_which_t;
-#else
-typedef int __rlimit_resource_t;
-typedef int __rusage_who_t;
-typedef int __priority_which_t;
-#endif
-
-/* Put the soft and hard limits for RESOURCE in *RLIMITS.
-   Returns 0 if successful, -1 if not (and sets errno).  */
-#ifndef __USE_FILE_OFFSET64
-extern int getrlimit (__rlimit_resource_t __resource,
-		      struct rlimit *__rlimits) __THROW;
-#else
-# ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (getrlimit, (__rlimit_resource_t __resource,
-				       struct rlimit *__rlimits), getrlimit64);
-# else
-#  define getrlimit getrlimit64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int getrlimit64 (__rlimit_resource_t __resource,
-			struct rlimit64 *__rlimits) __THROW;
-#endif
-
-/* Set the soft and hard limits for RESOURCE to *RLIMITS.
-   Only the super-user can increase hard limits.
-   Return 0 if successful, -1 if not (and sets errno).  */
-#ifndef __USE_FILE_OFFSET64
-extern int setrlimit (__rlimit_resource_t __resource,
-		      const struct rlimit *__rlimits) __THROW;
-#else
-# ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (setrlimit, (__rlimit_resource_t __resource,
-				       const struct rlimit *__rlimits),
-			   setrlimit64);
-# else
-#  define setrlimit setrlimit64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int setrlimit64 (__rlimit_resource_t __resource,
-			const struct rlimit64 *__rlimits) __THROW;
-#endif
-
-/* Return resource usage information on process indicated by WHO
-   and put it in *USAGE.  Returns 0 for success, -1 for failure.  */
-extern int getrusage (__rusage_who_t __who, struct rusage *__usage) __THROW;
-
-/* Return the highest priority of any process specified by WHICH and WHO
-   (see above); if WHO is zero, the current process, process group, or user
-   (as specified by WHO) is used.  A lower priority number means higher
-   priority.  Priorities range from PRIO_MIN to PRIO_MAX (above).  */
-extern int getpriority (__priority_which_t __which, id_t __who) __THROW;
-
-/* Set the priority of all processes specified by WHICH and WHO (see above)
-   to PRIO.  Returns 0 on success, -1 on errors.  */
-extern int setpriority (__priority_which_t __which, id_t __who, int __prio)
-     __THROW;
-
-__END_DECLS
-
-#endif	/* sys/resource.h  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/select.h b/openflow/usr/include/arm-linux-gnueabihf/sys/select.h
deleted file mode 100644
index b852dac..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/select.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* `fd_set' type and related macros, and `select'/`pselect' declarations.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*	POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h>  */
-
-#ifndef _SYS_SELECT_H
-#define _SYS_SELECT_H	1
-
-#include <features.h>
-
-/* Get definition of needed basic types.  */
-#include <bits/types.h>
-
-/* Get __FD_* definitions.  */
-#include <bits/select.h>
-
-/* Get __sigset_t.  */
-#include <bits/sigset.h>
-
-#ifndef __sigset_t_defined
-# define __sigset_t_defined
-typedef __sigset_t sigset_t;
-#endif
-
-/* Get definition of timer specification structures.  */
-#define __need_time_t
-#define __need_timespec
-#include <time.h>
-#define __need_timeval
-#include <bits/time.h>
-
-#ifndef __suseconds_t_defined
-typedef __suseconds_t suseconds_t;
-# define __suseconds_t_defined
-#endif
-
-
-/* The fd_set member is required to be an array of longs.  */
-typedef long int __fd_mask;
-
-/* Some versions of <linux/posix_types.h> define this macros.  */
-#undef	__NFDBITS
-/* It's easier to assume 8-bit bytes than to get CHAR_BIT.  */
-#define __NFDBITS	(8 * (int) sizeof (__fd_mask))
-#define	__FD_ELT(d)	((d) / __NFDBITS)
-#define	__FD_MASK(d)	((__fd_mask) (1UL << ((d) % __NFDBITS)))
-
-/* fd_set for select and pselect.  */
-typedef struct
-  {
-    /* XPG4.2 requires this member name.  Otherwise avoid the name
-       from the global namespace.  */
-#ifdef __USE_XOPEN
-    __fd_mask fds_bits[__FD_SETSIZE / __NFDBITS];
-# define __FDS_BITS(set) ((set)->fds_bits)
-#else
-    __fd_mask __fds_bits[__FD_SETSIZE / __NFDBITS];
-# define __FDS_BITS(set) ((set)->__fds_bits)
-#endif
-  } fd_set;
-
-/* Maximum number of file descriptors in `fd_set'.  */
-#define	FD_SETSIZE		__FD_SETSIZE
-
-#ifdef __USE_MISC
-/* Sometimes the fd_set member is assumed to have this type.  */
-typedef __fd_mask fd_mask;
-
-/* Number of bits per word of `fd_set' (some code assumes this is 32).  */
-# define NFDBITS		__NFDBITS
-#endif
-
-
-/* Access macros for `fd_set'.  */
-#define	FD_SET(fd, fdsetp)	__FD_SET (fd, fdsetp)
-#define	FD_CLR(fd, fdsetp)	__FD_CLR (fd, fdsetp)
-#define	FD_ISSET(fd, fdsetp)	__FD_ISSET (fd, fdsetp)
-#define	FD_ZERO(fdsetp)		__FD_ZERO (fdsetp)
-
-
-__BEGIN_DECLS
-
-/* Check the first NFDS descriptors each in READFDS (if not NULL) for read
-   readiness, in WRITEFDS (if not NULL) for write readiness, and in EXCEPTFDS
-   (if not NULL) for exceptional conditions.  If TIMEOUT is not NULL, time out
-   after waiting the interval specified therein.  Returns the number of ready
-   descriptors, or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int select (int __nfds, fd_set *__restrict __readfds,
-		   fd_set *__restrict __writefds,
-		   fd_set *__restrict __exceptfds,
-		   struct timeval *__restrict __timeout);
-
-#ifdef __USE_XOPEN2K
-/* Same as above only that the TIMEOUT value is given with higher
-   resolution and a sigmask which is been set temporarily.  This version
-   should be used.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int pselect (int __nfds, fd_set *__restrict __readfds,
-		    fd_set *__restrict __writefds,
-		    fd_set *__restrict __exceptfds,
-		    const struct timespec *__restrict __timeout,
-		    const __sigset_t *__restrict __sigmask);
-#endif
-
-
-/* Define some inlines helping to catch common problems.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __GNUC__
-# include <bits/select2.h>
-#endif
-
-__END_DECLS
-
-#endif /* sys/select.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/sem.h b/openflow/usr/include/arm-linux-gnueabihf/sys/sem.h
deleted file mode 100644
index 1b32092..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/sem.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SEM_H
-#define _SYS_SEM_H	1
-
-#include <features.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-/* Get common definition of System V style IPC.  */
-#include <sys/ipc.h>
-
-/* Get system dependent definition of `struct semid_ds' and more.  */
-#include <bits/sem.h>
-
-#ifdef __USE_GNU
-# define __need_timespec
-# include <time.h>
-#endif
-
-/* The following System V style IPC functions implement a semaphore
-   handling.  The definition is found in XPG2.  */
-
-/* Structure used for argument to `semop' to describe operations.  */
-struct sembuf
-{
-  unsigned short int sem_num;	/* semaphore number */
-  short int sem_op;		/* semaphore operation */
-  short int sem_flg;		/* operation flag */
-};
-
-
-__BEGIN_DECLS
-
-/* Semaphore control operation.  */
-extern int semctl (int __semid, int __semnum, int __cmd, ...) __THROW;
-
-/* Get semaphore.  */
-extern int semget (key_t __key, int __nsems, int __semflg) __THROW;
-
-/* Operate on semaphore.  */
-extern int semop (int __semid, struct sembuf *__sops, size_t __nsops) __THROW;
-
-#ifdef __USE_GNU
-/* Operate on semaphore with timeout.  */
-extern int semtimedop (int __semid, struct sembuf *__sops, size_t __nsops,
-		       const struct timespec *__timeout) __THROW;
-#endif
-
-__END_DECLS
-
-#endif /* sys/sem.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/sendfile.h b/openflow/usr/include/arm-linux-gnueabihf/sys/sendfile.h
deleted file mode 100644
index d4c14ba..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/sendfile.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* sendfile -- copy data directly from one file descriptor to another
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SENDFILE_H
-#define _SYS_SENDFILE_H	1
-
-#include <features.h>
-#include <sys/types.h>
-
-__BEGIN_DECLS
-
-/* Send up to COUNT bytes from file associated with IN_FD starting at
-   *OFFSET to descriptor OUT_FD.  Set *OFFSET to the IN_FD's file position
-   following the read bytes.  If OFFSET is a null pointer, use the normal
-   file position instead.  Return the number of written bytes, or -1 in
-   case of error.  */
-#ifndef __USE_FILE_OFFSET64
-extern ssize_t sendfile (int __out_fd, int __in_fd, off_t *__offset,
-			 size_t __count) __THROW;
-#else
-# ifdef __REDIRECT_NTH
-extern ssize_t __REDIRECT_NTH (sendfile,
-			       (int __out_fd, int __in_fd, __off64_t *__offset,
-				size_t __count), sendfile64);
-# else
-#  define sendfile sendfile64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern ssize_t sendfile64 (int __out_fd, int __in_fd, __off64_t *__offset,
-			   size_t __count) __THROW;
-#endif
-
-__END_DECLS
-
-#endif	/* sys/sendfile.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/shm.h b/openflow/usr/include/arm-linux-gnueabihf/sys/shm.h
deleted file mode 100644
index df263dc..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/shm.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SHM_H
-#define _SYS_SHM_H	1
-
-#include <features.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-/* Get common definition of System V style IPC.  */
-#include <sys/ipc.h>
-
-/* Get system dependent definition of `struct shmid_ds' and more.  */
-#include <bits/shm.h>
-
-/* Define types required by the standard.  */
-#define __need_time_t
-#include <time.h>
-
-#ifdef __USE_XOPEN
-# ifndef __pid_t_defined
-typedef __pid_t pid_t;
-#  define __pid_t_defined
-# endif
-#endif	/* X/Open */
-
-
-__BEGIN_DECLS
-
-/* The following System V style IPC functions implement a shared memory
-   facility.  The definition is found in XPG4.2.  */
-
-/* Shared memory control operation.  */
-extern int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf) __THROW;
-
-/* Get shared memory segment.  */
-extern int shmget (key_t __key, size_t __size, int __shmflg) __THROW;
-
-/* Attach shared memory segment.  */
-extern void *shmat (int __shmid, const void *__shmaddr, int __shmflg)
-     __THROW;
-
-/* Detach shared memory segment.  */
-extern int shmdt (const void *__shmaddr) __THROW;
-
-__END_DECLS
-
-#endif /* sys/shm.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/signal.h b/openflow/usr/include/arm-linux-gnueabihf/sys/signal.h
deleted file mode 100644
index 2e602da..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/signal.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <signal.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/signalfd.h b/openflow/usr/include/arm-linux-gnueabihf/sys/signalfd.h
deleted file mode 100644
index 6f75bc0..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/signalfd.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (C) 2007-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_SIGNALFD_H
-#define	_SYS_SIGNALFD_H	1
-
-#define __need_sigset_t
-#include <signal.h>
-#include <stdint.h>
-
-/* Get the platform-dependent flags.  */
-#include <bits/signalfd.h>
-
-struct signalfd_siginfo
-{
-  uint32_t ssi_signo;
-  int32_t ssi_errno;
-  int32_t ssi_code;
-  uint32_t ssi_pid;
-  uint32_t ssi_uid;
-  int32_t ssi_fd;
-  uint32_t ssi_tid;
-  uint32_t ssi_band;
-  uint32_t ssi_overrun;
-  uint32_t ssi_trapno;
-  int32_t ssi_status;
-  int32_t ssi_int;
-  uint64_t ssi_ptr;
-  uint64_t ssi_utime;
-  uint64_t ssi_stime;
-  uint64_t ssi_addr;
-  uint8_t __pad[48];
-};
-
-__BEGIN_DECLS
-
-/* Request notification for delivery of signals in MASK to be
-   performed using descriptor FD.*/
-extern int signalfd (int __fd, const sigset_t *__mask, int __flags)
-  __THROW __nonnull ((2));
-
-__END_DECLS
-
-#endif /* sys/signalfd.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/socket.h b/openflow/usr/include/arm-linux-gnueabihf/sys/socket.h
deleted file mode 100644
index c9f0f50..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/socket.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* Declarations of socket constants, types, and functions.
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_SOCKET_H
-#define	_SYS_SOCKET_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#include <sys/uio.h>
-#define	__need_size_t
-#include <stddef.h>
-#ifdef __USE_GNU
-/* Get the __sigset_t definition.  */
-# include <bits/sigset.h>
-#endif
-
-
-/* This operating system-specific header file defines the SOCK_*, PF_*,
-   AF_*, MSG_*, SOL_*, and SO_* constants, and the `struct sockaddr',
-   `struct msghdr', and `struct linger' types.  */
-#include <bits/socket.h>
-
-#ifdef __USE_MISC
-/* This is the 4.3 BSD `struct sockaddr' format, which is used as wire
-   format in the grotty old 4.3 `talk' protocol.  */
-struct osockaddr
-  {
-    unsigned short int sa_family;
-    unsigned char sa_data[14];
-  };
-#endif
-
-/* The following constants should be used for the second parameter of
-   `shutdown'.  */
-enum
-{
-  SHUT_RD = 0,		/* No more receptions.  */
-#define SHUT_RD		SHUT_RD
-  SHUT_WR,		/* No more transmissions.  */
-#define SHUT_WR		SHUT_WR
-  SHUT_RDWR		/* No more receptions or transmissions.  */
-#define SHUT_RDWR	SHUT_RDWR
-};
-
-/* This is the type we use for generic socket address arguments.
-
-   With GCC 2.7 and later, the funky union causes redeclarations or
-   uses with any of the listed types to be allowed without complaint.
-   G++ 2.7 does not support transparent unions so there we want the
-   old-style declaration, too.  */
-#if defined __cplusplus || !__GNUC_PREREQ (2, 7) || !defined __USE_GNU
-# define __SOCKADDR_ARG		struct sockaddr *__restrict
-# define __CONST_SOCKADDR_ARG	const struct sockaddr *
-#else
-/* Add more `struct sockaddr_AF' types here as necessary.
-   These are all the ones I found on NetBSD and Linux.  */
-# define __SOCKADDR_ALLTYPES \
-  __SOCKADDR_ONETYPE (sockaddr) \
-  __SOCKADDR_ONETYPE (sockaddr_at) \
-  __SOCKADDR_ONETYPE (sockaddr_ax25) \
-  __SOCKADDR_ONETYPE (sockaddr_dl) \
-  __SOCKADDR_ONETYPE (sockaddr_eon) \
-  __SOCKADDR_ONETYPE (sockaddr_in) \
-  __SOCKADDR_ONETYPE (sockaddr_in6) \
-  __SOCKADDR_ONETYPE (sockaddr_inarp) \
-  __SOCKADDR_ONETYPE (sockaddr_ipx) \
-  __SOCKADDR_ONETYPE (sockaddr_iso) \
-  __SOCKADDR_ONETYPE (sockaddr_ns) \
-  __SOCKADDR_ONETYPE (sockaddr_un) \
-  __SOCKADDR_ONETYPE (sockaddr_x25)
-
-# define __SOCKADDR_ONETYPE(type) struct type *__restrict __##type##__;
-typedef union { __SOCKADDR_ALLTYPES
-	      } __SOCKADDR_ARG __attribute__ ((__transparent_union__));
-# undef __SOCKADDR_ONETYPE
-# define __SOCKADDR_ONETYPE(type) const struct type *__restrict __##type##__;
-typedef union { __SOCKADDR_ALLTYPES
-	      } __CONST_SOCKADDR_ARG __attribute__ ((__transparent_union__));
-# undef __SOCKADDR_ONETYPE
-#endif
-
-#ifdef __USE_GNU
-/* For `recvmmsg' and `sendmmsg'.  */
-struct mmsghdr
-  {
-    struct msghdr msg_hdr;	/* Actual message header.  */
-    unsigned int msg_len;	/* Number of received or sent bytes for the
-				   entry.  */
-  };
-#endif
-
-
-/* Create a new socket of type TYPE in domain DOMAIN, using
-   protocol PROTOCOL.  If PROTOCOL is zero, one is chosen automatically.
-   Returns a file descriptor for the new socket, or -1 for errors.  */
-extern int socket (int __domain, int __type, int __protocol) __THROW;
-
-/* Create two new sockets, of type TYPE in domain DOMAIN and using
-   protocol PROTOCOL, which are connected to each other, and put file
-   descriptors for them in FDS[0] and FDS[1].  If PROTOCOL is zero,
-   one will be chosen automatically.  Returns 0 on success, -1 for errors.  */
-extern int socketpair (int __domain, int __type, int __protocol,
-		       int __fds[2]) __THROW;
-
-/* Give the socket FD the local address ADDR (which is LEN bytes long).  */
-extern int bind (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len)
-     __THROW;
-
-/* Put the local address of FD into *ADDR and its length in *LEN.  */
-extern int getsockname (int __fd, __SOCKADDR_ARG __addr,
-			socklen_t *__restrict __len) __THROW;
-
-/* Open a connection on socket FD to peer at ADDR (which LEN bytes long).
-   For connectionless socket types, just set the default address to send to
-   and the only address from which to accept transmissions.
-   Return 0 on success, -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len);
-
-/* Put the address of the peer connected to socket FD into *ADDR
-   (which is *LEN bytes long), and its actual length into *LEN.  */
-extern int getpeername (int __fd, __SOCKADDR_ARG __addr,
-			socklen_t *__restrict __len) __THROW;
-
-
-/* Send N bytes of BUF to socket FD.  Returns the number sent or -1.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t send (int __fd, const void *__buf, size_t __n, int __flags);
-
-/* Read N bytes into BUF from socket FD.
-   Returns the number read or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t recv (int __fd, void *__buf, size_t __n, int __flags);
-
-/* Send N bytes of BUF on socket FD to peer at address ADDR (which is
-   ADDR_LEN bytes long).  Returns the number sent, or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t sendto (int __fd, const void *__buf, size_t __n,
-		       int __flags, __CONST_SOCKADDR_ARG __addr,
-		       socklen_t __addr_len);
-
-/* Read N bytes into BUF through socket FD.
-   If ADDR is not NULL, fill in *ADDR_LEN bytes of it with tha address of
-   the sender, and store the actual size of the address in *ADDR_LEN.
-   Returns the number of bytes read or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n,
-			 int __flags, __SOCKADDR_ARG __addr,
-			 socklen_t *__restrict __addr_len);
-
-
-/* Send a message described MESSAGE on socket FD.
-   Returns the number of bytes sent, or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t sendmsg (int __fd, const struct msghdr *__message,
-			int __flags);
-
-#ifdef __USE_GNU
-/* Send a VLEN messages as described by VMESSAGES to socket FD.
-   Returns the number of datagrams successfully written or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int sendmmsg (int __fd, struct mmsghdr *__vmessages,
-		     unsigned int __vlen, int __flags);
-#endif
-
-/* Receive a message as described by MESSAGE from socket FD.
-   Returns the number of bytes read or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t recvmsg (int __fd, struct msghdr *__message, int __flags);
-
-#ifdef __USE_GNU
-/* Receive up to VLEN messages as described by VMESSAGES from socket FD.
-   Returns the number of messages received or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int recvmmsg (int __fd, struct mmsghdr *__vmessages,
-		     unsigned int __vlen, int __flags,
-		     struct timespec *__tmo);
-#endif
-
-
-/* Put the current value for socket FD's option OPTNAME at protocol level LEVEL
-   into OPTVAL (which is *OPTLEN bytes long), and set *OPTLEN to the value's
-   actual length.  Returns 0 on success, -1 for errors.  */
-extern int getsockopt (int __fd, int __level, int __optname,
-		       void *__restrict __optval,
-		       socklen_t *__restrict __optlen) __THROW;
-
-/* Set socket FD's option OPTNAME at protocol level LEVEL
-   to *OPTVAL (which is OPTLEN bytes long).
-   Returns 0 on success, -1 for errors.  */
-extern int setsockopt (int __fd, int __level, int __optname,
-		       const void *__optval, socklen_t __optlen) __THROW;
-
-
-/* Prepare to accept connections on socket FD.
-   N connection requests will be queued before further requests are refused.
-   Returns 0 on success, -1 for errors.  */
-extern int listen (int __fd, int __n) __THROW;
-
-/* Await a connection on socket FD.
-   When a connection arrives, open a new socket to communicate with it,
-   set *ADDR (which is *ADDR_LEN bytes long) to the address of the connecting
-   peer and *ADDR_LEN to the address's actual length, and return the
-   new socket's descriptor, or -1 for errors.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int accept (int __fd, __SOCKADDR_ARG __addr,
-		   socklen_t *__restrict __addr_len);
-
-#ifdef __USE_GNU
-/* Similar to 'accept' but takes an additional parameter to specify flags.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int accept4 (int __fd, __SOCKADDR_ARG __addr,
-		    socklen_t *__restrict __addr_len, int __flags);
-#endif
-
-/* Shut down all or part of the connection open on socket FD.
-   HOW determines what to shut down:
-     SHUT_RD   = No more receptions;
-     SHUT_WR   = No more transmissions;
-     SHUT_RDWR = No more receptions or transmissions.
-   Returns 0 on success, -1 for errors.  */
-extern int shutdown (int __fd, int __how) __THROW;
-
-
-#ifdef __USE_XOPEN2K
-/* Determine wheter socket is at a out-of-band mark.  */
-extern int sockatmark (int __fd) __THROW;
-#endif
-
-
-#ifdef __USE_MISC
-/* FDTYPE is S_IFSOCK or another S_IF* macro defined in <sys/stat.h>;
-   returns 1 if FD is open on an object of the indicated type, 0 if not,
-   or -1 for errors (setting errno).  */
-extern int isfdtype (int __fd, int __fdtype) __THROW;
-#endif
-
-
-/* Define some macros helping to catch buffer overflows.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-# include <bits/socket2.h>
-#endif
-
-__END_DECLS
-
-#endif /* sys/socket.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/socketvar.h b/openflow/usr/include/arm-linux-gnueabihf/sys/socketvar.h
deleted file mode 100644
index b177158..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/socketvar.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This header is used on many systems but for GNU we have everything
-   already defined in the standard header.  */
-#include <sys/socket.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/soundcard.h b/openflow/usr/include/arm-linux-gnueabihf/sys/soundcard.h
deleted file mode 100644
index fade986..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/soundcard.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linux/soundcard.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/stat.h b/openflow/usr/include/arm-linux-gnueabihf/sys/stat.h
deleted file mode 100644
index bf63882..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/stat.h
+++ /dev/null
@@ -1,536 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 5.6 File Characteristics	<sys/stat.h>
- */
-
-#ifndef	_SYS_STAT_H
-#define	_SYS_STAT_H	1
-
-#include <features.h>
-
-#include <bits/types.h>		/* For __mode_t and __dev_t.  */
-
-#if defined __USE_XOPEN || defined __USE_XOPEN2K || defined __USE_ATFILE
-# if defined __USE_XOPEN || defined __USE_XOPEN2K
-#  define __need_time_t
-# endif
-# ifdef __USE_ATFILE
-#  define __need_timespec
-# endif
-# include <time.h>		/* For time_t resp. timespec.  */
-#endif
-
-#if defined __USE_XOPEN || defined __USE_XOPEN2K
-/* The Single Unix specification says that some more types are
-   available here.  */
-# ifndef __dev_t_defined
-typedef __dev_t dev_t;
-#  define __dev_t_defined
-# endif
-
-# ifndef __gid_t_defined
-typedef __gid_t gid_t;
-#  define __gid_t_defined
-# endif
-
-# ifndef __ino_t_defined
-#  ifndef __USE_FILE_OFFSET64
-typedef __ino_t ino_t;
-#  else
-typedef __ino64_t ino_t;
-#  endif
-#  define __ino_t_defined
-# endif
-
-# ifndef __mode_t_defined
-typedef __mode_t mode_t;
-#  define __mode_t_defined
-# endif
-
-# ifndef __nlink_t_defined
-typedef __nlink_t nlink_t;
-#  define __nlink_t_defined
-# endif
-
-# ifndef __off_t_defined
-#  ifndef __USE_FILE_OFFSET64
-typedef __off_t off_t;
-#  else
-typedef __off64_t off_t;
-#  endif
-#  define __off_t_defined
-# endif
-
-# ifndef __uid_t_defined
-typedef __uid_t uid_t;
-#  define __uid_t_defined
-# endif
-#endif	/* X/Open */
-
-#ifdef __USE_UNIX98
-# ifndef __blkcnt_t_defined
-#  ifndef __USE_FILE_OFFSET64
-typedef __blkcnt_t blkcnt_t;
-#  else
-typedef __blkcnt64_t blkcnt_t;
-#  endif
-#  define __blkcnt_t_defined
-# endif
-
-# ifndef __blksize_t_defined
-typedef __blksize_t blksize_t;
-#  define __blksize_t_defined
-# endif
-#endif	/* Unix98 */
-
-__BEGIN_DECLS
-
-#include <bits/stat.h>
-
-#if defined __USE_MISC || defined __USE_XOPEN
-# define S_IFMT		__S_IFMT
-# define S_IFDIR	__S_IFDIR
-# define S_IFCHR	__S_IFCHR
-# define S_IFBLK	__S_IFBLK
-# define S_IFREG	__S_IFREG
-# ifdef __S_IFIFO
-#  define S_IFIFO	__S_IFIFO
-# endif
-# ifdef __S_IFLNK
-#  define S_IFLNK	__S_IFLNK
-# endif
-# if (defined __USE_MISC || defined __USE_UNIX98) \
-     && defined __S_IFSOCK
-#  define S_IFSOCK	__S_IFSOCK
-# endif
-#endif
-
-/* Test macros for file types.	*/
-
-#define	__S_ISTYPE(mode, mask)	(((mode) & __S_IFMT) == (mask))
-
-#define	S_ISDIR(mode)	 __S_ISTYPE((mode), __S_IFDIR)
-#define	S_ISCHR(mode)	 __S_ISTYPE((mode), __S_IFCHR)
-#define	S_ISBLK(mode)	 __S_ISTYPE((mode), __S_IFBLK)
-#define	S_ISREG(mode)	 __S_ISTYPE((mode), __S_IFREG)
-#ifdef __S_IFIFO
-# define S_ISFIFO(mode)	 __S_ISTYPE((mode), __S_IFIFO)
-#endif
-#ifdef __S_IFLNK
-# define S_ISLNK(mode)	 __S_ISTYPE((mode), __S_IFLNK)
-#endif
-
-#if defined __USE_MISC && !defined __S_IFLNK
-# define S_ISLNK(mode)  0
-#endif
-
-#if (defined __USE_UNIX98 || defined __USE_XOPEN2K) \
-    && defined __S_IFSOCK
-# define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK)
-#elif defined __USE_XOPEN2K
-# define S_ISSOCK(mode) 0
-#endif
-
-/* These are from POSIX.1b.  If the objects are not implemented using separate
-   distinct file types, the macros always will evaluate to zero.  Unlike the
-   other S_* macros the following three take a pointer to a `struct stat'
-   object as the argument.  */
-#ifdef	__USE_POSIX199309
-# define S_TYPEISMQ(buf) __S_TYPEISMQ(buf)
-# define S_TYPEISSEM(buf) __S_TYPEISSEM(buf)
-# define S_TYPEISSHM(buf) __S_TYPEISSHM(buf)
-#endif
-
-
-/* Protection bits.  */
-
-#define	S_ISUID __S_ISUID	/* Set user ID on execution.  */
-#define	S_ISGID	__S_ISGID	/* Set group ID on execution.  */
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* Save swapped text after use (sticky bit).  This is pretty well obsolete.  */
-# define S_ISVTX	__S_ISVTX
-#endif
-
-#define	S_IRUSR	__S_IREAD	/* Read by owner.  */
-#define	S_IWUSR	__S_IWRITE	/* Write by owner.  */
-#define	S_IXUSR	__S_IEXEC	/* Execute by owner.  */
-/* Read, write, and execute by owner.  */
-#define	S_IRWXU	(__S_IREAD|__S_IWRITE|__S_IEXEC)
-
-#ifdef __USE_MISC
-# define S_IREAD	S_IRUSR
-# define S_IWRITE	S_IWUSR
-# define S_IEXEC	S_IXUSR
-#endif
-
-#define	S_IRGRP	(S_IRUSR >> 3)	/* Read by group.  */
-#define	S_IWGRP	(S_IWUSR >> 3)	/* Write by group.  */
-#define	S_IXGRP	(S_IXUSR >> 3)	/* Execute by group.  */
-/* Read, write, and execute by group.  */
-#define	S_IRWXG	(S_IRWXU >> 3)
-
-#define	S_IROTH	(S_IRGRP >> 3)	/* Read by others.  */
-#define	S_IWOTH	(S_IWGRP >> 3)	/* Write by others.  */
-#define	S_IXOTH	(S_IXGRP >> 3)	/* Execute by others.  */
-/* Read, write, and execute by others.  */
-#define	S_IRWXO	(S_IRWXG >> 3)
-
-
-#ifdef	__USE_MISC
-/* Macros for common mode bit masks.  */
-# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
-# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
-# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/
-
-# define S_BLKSIZE	512	/* Block size for `st_blocks'.  */
-#endif
-
-
-#ifndef __USE_FILE_OFFSET64
-/* Get file attributes for FILE and put them in BUF.  */
-extern int stat (const char *__restrict __file,
-		 struct stat *__restrict __buf) __THROW __nonnull ((1, 2));
-
-/* Get file attributes for the file, device, pipe, or socket
-   that file descriptor FD is open on and put them in BUF.  */
-extern int fstat (int __fd, struct stat *__buf) __THROW __nonnull ((2));
-#else
-# ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (stat, (const char *__restrict __file,
-				  struct stat *__restrict __buf), stat64)
-     __nonnull ((1, 2));
-extern int __REDIRECT_NTH (fstat, (int __fd, struct stat *__buf), fstat64)
-     __nonnull ((2));
-# else
-#  define stat stat64
-#  define fstat fstat64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int stat64 (const char *__restrict __file,
-		   struct stat64 *__restrict __buf) __THROW __nonnull ((1, 2));
-extern int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2));
-#endif
-
-#ifdef __USE_ATFILE
-/* Similar to stat, get the attributes for FILE and put them in BUF.
-   Relative path names are interpreted relative to FD unless FD is
-   AT_FDCWD.  */
-# ifndef __USE_FILE_OFFSET64
-extern int fstatat (int __fd, const char *__restrict __file,
-		    struct stat *__restrict __buf, int __flag)
-     __THROW __nonnull ((2, 3));
-# else
-#  ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (fstatat, (int __fd, const char *__restrict __file,
-				     struct stat *__restrict __buf,
-				     int __flag),
-			   fstatat64) __nonnull ((2, 3));
-#  else
-#   define fstatat fstatat64
-#  endif
-# endif
-
-# ifdef __USE_LARGEFILE64
-extern int fstatat64 (int __fd, const char *__restrict __file,
-		      struct stat64 *__restrict __buf, int __flag)
-     __THROW __nonnull ((2, 3));
-# endif
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
-# ifndef __USE_FILE_OFFSET64
-/* Get file attributes about FILE and put them in BUF.
-   If FILE is a symbolic link, do not follow it.  */
-extern int lstat (const char *__restrict __file,
-		  struct stat *__restrict __buf) __THROW __nonnull ((1, 2));
-# else
-#  ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (lstat,
-			   (const char *__restrict __file,
-			    struct stat *__restrict __buf), lstat64)
-     __nonnull ((1, 2));
-#  else
-#   define lstat lstat64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int lstat64 (const char *__restrict __file,
-		    struct stat64 *__restrict __buf)
-     __THROW __nonnull ((1, 2));
-# endif
-#endif
-
-/* Set file access permissions for FILE to MODE.
-   If FILE is a symbolic link, this affects its target instead.  */
-extern int chmod (const char *__file, __mode_t __mode)
-     __THROW __nonnull ((1));
-
-#ifdef __USE_MISC
-/* Set file access permissions for FILE to MODE.
-   If FILE is a symbolic link, this affects the link itself
-   rather than its target.  */
-extern int lchmod (const char *__file, __mode_t __mode)
-     __THROW __nonnull ((1));
-#endif
-
-/* Set file access permissions of the file FD is open on to MODE.  */
-#ifdef __USE_POSIX
-extern int fchmod (int __fd, __mode_t __mode) __THROW;
-#endif
-
-#ifdef __USE_ATFILE
-/* Set file access permissions of FILE relative to
-   the directory FD is open on.  */
-extern int fchmodat (int __fd, const char *__file, __mode_t __mode,
-		     int __flag)
-     __THROW __nonnull ((2)) __wur;
-#endif /* Use ATFILE.  */
-
-
-
-/* Set the file creation mask of the current process to MASK,
-   and return the old creation mask.  */
-extern __mode_t umask (__mode_t __mask) __THROW;
-
-#ifdef	__USE_GNU
-/* Get the current `umask' value without changing it.
-   This function is only available under the GNU Hurd.  */
-extern __mode_t getumask (void) __THROW;
-#endif
-
-/* Create a new directory named PATH, with permission bits MODE.  */
-extern int mkdir (const char *__path, __mode_t __mode)
-     __THROW __nonnull ((1));
-
-#ifdef __USE_ATFILE
-/* Like mkdir, create a new directory with permission bits MODE.  But
-   interpret relative PATH names relative to the directory associated
-   with FD.  */
-extern int mkdirat (int __fd, const char *__path, __mode_t __mode)
-     __THROW __nonnull ((2));
-#endif
-
-/* Create a device file named PATH, with permission and special bits MODE
-   and device number DEV (which can be constructed from major and minor
-   device numbers with the `makedev' macro above).  */
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-extern int mknod (const char *__path, __mode_t __mode, __dev_t __dev)
-     __THROW __nonnull ((1));
-
-# ifdef __USE_ATFILE
-/* Like mknod, create a new device file with permission bits MODE and
-   device number DEV.  But interpret relative PATH names relative to
-   the directory associated with FD.  */
-extern int mknodat (int __fd, const char *__path, __mode_t __mode,
-		    __dev_t __dev) __THROW __nonnull ((2));
-# endif
-#endif
-
-
-/* Create a new FIFO named PATH, with permission bits MODE.  */
-extern int mkfifo (const char *__path, __mode_t __mode)
-     __THROW __nonnull ((1));
-
-#ifdef __USE_ATFILE
-/* Like mkfifo, create a new FIFO with permission bits MODE.  But
-   interpret relative PATH names relative to the directory associated
-   with FD.  */
-extern int mkfifoat (int __fd, const char *__path, __mode_t __mode)
-     __THROW __nonnull ((2));
-#endif
-
-#ifdef __USE_ATFILE
-/* Set file access and modification times relative to directory file
-   descriptor.  */
-extern int utimensat (int __fd, const char *__path,
-		      const struct timespec __times[2],
-		      int __flags)
-     __THROW __nonnull ((2));
-#endif
-
-#ifdef __USE_XOPEN2K8
-/* Set file access and modification times of the file associated with FD.  */
-extern int futimens (int __fd, const struct timespec __times[2]) __THROW;
-#endif
-
-/* To allow the `struct stat' structure and the file type `mode_t'
-   bits to vary without changing shared library major version number,
-   the `stat' family of functions and `mknod' are in fact inline
-   wrappers around calls to `xstat', `fxstat', `lxstat', and `xmknod',
-   which all take a leading version-number argument designating the
-   data structure and bits used.  <bits/stat.h> defines _STAT_VER with
-   the version number corresponding to `struct stat' as defined in
-   that file; and _MKNOD_VER with the version number corresponding to
-   the S_IF* macros defined therein.  It is arranged that when not
-   inlined these function are always statically linked; that way a
-   dynamically-linked executable always encodes the version number
-   corresponding to the data structures it uses, so the `x' functions
-   in the shared library can adapt without needing to recompile all
-   callers.  */
-
-#ifndef _STAT_VER
-# define _STAT_VER	0
-#endif
-#ifndef _MKNOD_VER
-# define _MKNOD_VER	0
-#endif
-
-/* Wrappers for stat and mknod system calls.  */
-#ifndef __USE_FILE_OFFSET64
-extern int __fxstat (int __ver, int __fildes, struct stat *__stat_buf)
-     __THROW __nonnull ((3));
-extern int __xstat (int __ver, const char *__filename,
-		    struct stat *__stat_buf) __THROW __nonnull ((2, 3));
-extern int __lxstat (int __ver, const char *__filename,
-		     struct stat *__stat_buf) __THROW __nonnull ((2, 3));
-extern int __fxstatat (int __ver, int __fildes, const char *__filename,
-		       struct stat *__stat_buf, int __flag)
-     __THROW __nonnull ((3, 4));
-#else
-# ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (__fxstat, (int __ver, int __fildes,
-				      struct stat *__stat_buf), __fxstat64)
-     __nonnull ((3));
-extern int __REDIRECT_NTH (__xstat, (int __ver, const char *__filename,
-				     struct stat *__stat_buf), __xstat64)
-     __nonnull ((2, 3));
-extern int __REDIRECT_NTH (__lxstat, (int __ver, const char *__filename,
-				      struct stat *__stat_buf), __lxstat64)
-     __nonnull ((2, 3));
-extern int __REDIRECT_NTH (__fxstatat, (int __ver, int __fildes,
-					const char *__filename,
-					struct stat *__stat_buf, int __flag),
-			   __fxstatat64) __nonnull ((3, 4));
-
-# else
-#  define __fxstat __fxstat64
-#  define __xstat __xstat64
-#  define __lxstat __lxstat64
-# endif
-#endif
-
-#ifdef __USE_LARGEFILE64
-extern int __fxstat64 (int __ver, int __fildes, struct stat64 *__stat_buf)
-     __THROW __nonnull ((3));
-extern int __xstat64 (int __ver, const char *__filename,
-		      struct stat64 *__stat_buf) __THROW __nonnull ((2, 3));
-extern int __lxstat64 (int __ver, const char *__filename,
-		       struct stat64 *__stat_buf) __THROW __nonnull ((2, 3));
-extern int __fxstatat64 (int __ver, int __fildes, const char *__filename,
-			 struct stat64 *__stat_buf, int __flag)
-     __THROW __nonnull ((3, 4));
-#endif
-extern int __xmknod (int __ver, const char *__path, __mode_t __mode,
-		     __dev_t *__dev) __THROW __nonnull ((2, 4));
-
-extern int __xmknodat (int __ver, int __fd, const char *__path,
-		       __mode_t __mode, __dev_t *__dev)
-     __THROW __nonnull ((3, 5));
-
-#ifdef __USE_EXTERN_INLINES
-/* Inlined versions of the real stat and mknod functions.  */
-
-__extern_inline int
-__NTH (stat (const char *__path, struct stat *__statbuf))
-{
-  return __xstat (_STAT_VER, __path, __statbuf);
-}
-
-# if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-__extern_inline int
-__NTH (lstat (const char *__path, struct stat *__statbuf))
-{
-  return __lxstat (_STAT_VER, __path, __statbuf);
-}
-# endif
-
-__extern_inline int
-__NTH (fstat (int __fd, struct stat *__statbuf))
-{
-  return __fxstat (_STAT_VER, __fd, __statbuf);
-}
-
-# ifdef __USE_ATFILE
-__extern_inline int
-__NTH (fstatat (int __fd, const char *__filename, struct stat *__statbuf,
-		int __flag))
-{
-  return __fxstatat (_STAT_VER, __fd, __filename, __statbuf, __flag);
-}
-# endif
-
-# ifdef __USE_MISC
-__extern_inline int
-__NTH (mknod (const char *__path, __mode_t __mode, __dev_t __dev))
-{
-  return __xmknod (_MKNOD_VER, __path, __mode, &__dev);
-}
-# endif
-
-# ifdef __USE_ATFILE
-__extern_inline int
-__NTH (mknodat (int __fd, const char *__path, __mode_t __mode,
-		__dev_t __dev))
-{
-  return __xmknodat (_MKNOD_VER, __fd, __path, __mode, &__dev);
-}
-# endif
-
-# if defined __USE_LARGEFILE64 \
-  && (! defined __USE_FILE_OFFSET64 \
-      || (defined __REDIRECT_NTH && defined __OPTIMIZE__))
-__extern_inline int
-__NTH (stat64 (const char *__path, struct stat64 *__statbuf))
-{
-  return __xstat64 (_STAT_VER, __path, __statbuf);
-}
-
-#  if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-__extern_inline int
-__NTH (lstat64 (const char *__path, struct stat64 *__statbuf))
-{
-  return __lxstat64 (_STAT_VER, __path, __statbuf);
-}
-#  endif
-
-__extern_inline int
-__NTH (fstat64 (int __fd, struct stat64 *__statbuf))
-{
-  return __fxstat64 (_STAT_VER, __fd, __statbuf);
-}
-
-#  ifdef __USE_ATFILE
-__extern_inline int
-__NTH (fstatat64 (int __fd, const char *__filename, struct stat64 *__statbuf,
-		  int __flag))
-{
-  return __fxstatat64 (_STAT_VER, __fd, __filename, __statbuf, __flag);
-}
-#  endif
-
-# endif
-
-#endif
-
-__END_DECLS
-
-
-#endif /* sys/stat.h  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/statfs.h b/openflow/usr/include/arm-linux-gnueabihf/sys/statfs.h
deleted file mode 100644
index 69a228d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/statfs.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Definitions for getting information about a filesystem.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_STATFS_H
-#define	_SYS_STATFS_H	1
-
-#include <features.h>
-
-/* Get the system-specific definition of `struct statfs'.  */
-#include <bits/statfs.h>
-
-__BEGIN_DECLS
-
-/* Return information about the filesystem on which FILE resides.  */
-#ifndef __USE_FILE_OFFSET64
-extern int statfs (const char *__file, struct statfs *__buf)
-     __THROW __nonnull ((1, 2));
-#else
-# ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (statfs,
-			   (const char *__file, struct statfs *__buf),
-			   statfs64) __nonnull ((1, 2));
-# else
-#  define statfs statfs64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int statfs64 (const char *__file, struct statfs64 *__buf)
-     __THROW __nonnull ((1, 2));
-#endif
-
-/* Return information about the filesystem containing the file FILDES
-   refers to.  */
-#ifndef __USE_FILE_OFFSET64
-extern int fstatfs (int __fildes, struct statfs *__buf)
-     __THROW __nonnull ((2));
-#else
-# ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (fstatfs, (int __fildes, struct statfs *__buf),
-			   fstatfs64) __nonnull ((2));
-# else
-#  define fstatfs fstatfs64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int fstatfs64 (int __fildes, struct statfs64 *__buf)
-     __THROW __nonnull ((2));
-#endif
-
-__END_DECLS
-
-#endif	/* sys/statfs.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/statvfs.h b/openflow/usr/include/arm-linux-gnueabihf/sys/statvfs.h
deleted file mode 100644
index 5d96652..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/statvfs.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Definitions for getting information about a filesystem.
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_STATVFS_H
-#define	_SYS_STATVFS_H	1
-
-#include <features.h>
-
-/* Get the system-specific definition of `struct statfs'.  */
-#include <bits/statvfs.h>
-
-#ifndef __USE_FILE_OFFSET64
-# ifndef __fsblkcnt_t_defined
-typedef __fsblkcnt_t fsblkcnt_t; /* Type to count file system blocks.  */
-#  define __fsblkcnt_t_defined
-# endif
-# ifndef __fsfilcnt_t_defined
-typedef __fsfilcnt_t fsfilcnt_t; /* Type to count file system inodes.  */
-#  define __fsfilcnt_t_defined
-# endif
-#else
-# ifndef __fsblkcnt_t_defined
-typedef __fsblkcnt64_t fsblkcnt_t; /* Type to count file system blocks.  */
-#  define __fsblkcnt_t_defined
-# endif
-# ifndef __fsfilcnt_t_defined
-typedef __fsfilcnt64_t fsfilcnt_t; /* Type to count file system inodes.  */
-#  define __fsfilcnt_t_defined
-# endif
-#endif
-
-__BEGIN_DECLS
-
-/* Return information about the filesystem on which FILE resides.  */
-#ifndef __USE_FILE_OFFSET64
-extern int statvfs (const char *__restrict __file,
-		    struct statvfs *__restrict __buf)
-     __THROW __nonnull ((1, 2));
-#else
-# ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (statvfs,
-			   (const char *__restrict __file,
-			    struct statvfs *__restrict __buf), statvfs64)
-     __nonnull ((1, 2));
-# else
-#  define statvfs statvfs64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int statvfs64 (const char *__restrict __file,
-		      struct statvfs64 *__restrict __buf)
-     __THROW __nonnull ((1, 2));
-#endif
-
-/* Return information about the filesystem containing the file FILDES
-   refers to.  */
-#ifndef __USE_FILE_OFFSET64
-extern int fstatvfs (int __fildes, struct statvfs *__buf)
-     __THROW __nonnull ((2));
-#else
-# ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (fstatvfs, (int __fildes, struct statvfs *__buf),
-			   fstatvfs64) __nonnull ((2));
-# else
-#  define fstatvfs fstatvfs64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int fstatvfs64 (int __fildes, struct statvfs64 *__buf)
-     __THROW __nonnull ((2));
-#endif
-
-__END_DECLS
-
-#endif	/* sys/statvfs.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/stropts.h b/openflow/usr/include/arm-linux-gnueabihf/sys/stropts.h
deleted file mode 100644
index 5b5bc02..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/stropts.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <stropts.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/swap.h b/openflow/usr/include/arm-linux-gnueabihf/sys/swap.h
deleted file mode 100644
index 469907b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/swap.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Calls to enable and disable swapping on specified locations.  Linux version.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SWAP_H
-
-#define _SYS_SWAP_H	1
-#include <features.h>
-
-/* The swap priority is encoded as:
-   (prio << SWAP_FLAG_PRIO_SHIFT) & SWAP_FLAG_PRIO_MASK
-*/
-#define	SWAP_FLAG_PREFER	0x8000	/* Set if swap priority is specified. */
-#define	SWAP_FLAG_PRIO_MASK	0x7fff
-#define	SWAP_FLAG_PRIO_SHIFT	0
-#define SWAP_FLAG_DISCARD	0x10000	/* Discard swap cluster after use.  */
-
-__BEGIN_DECLS
-
-/* Make the block special device PATH available to the system for swapping.
-   This call is restricted to the super-user.  */
-extern int swapon (const char *__path, int __flags) __THROW;
-
-/* Stop using block special device PATH for swapping.  */
-extern int swapoff (const char *__path) __THROW;
-
-__END_DECLS
-
-#endif /* _SYS_SWAP_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/syscall.h b/openflow/usr/include/arm-linux-gnueabihf/sys/syscall.h
deleted file mode 100644
index d925a1d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/syscall.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYSCALL_H
-#define _SYSCALL_H	1
-
-/* This file should list the numbers of the system calls the system knows.
-   But instead of duplicating this we use the information available
-   from the kernel sources.  */
-#include <asm/unistd.h>
-
-#ifndef _LIBC
-/* The Linux kernel header file defines macros `__NR_<name>', but some
-   programs expect the traditional form `SYS_<name>'.  So in building libc
-   we scan the kernel's list and produce <bits/syscall.h> with macros for
-   all the `SYS_' names.  */
-# include <bits/syscall.h>
-#endif
-
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/sysctl.h b/openflow/usr/include/arm-linux-gnueabihf/sys/sysctl.h
deleted file mode 100644
index 687d1a2..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/sysctl.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_SYSCTL_H
-#define	_SYS_SYSCTL_H	1
-
-#include <features.h>
-#define __need_size_t
-#include <stddef.h>
-/* Prevent more kernel headers than necessary to be included.  */
-#ifndef _LINUX_KERNEL_H
-# define _LINUX_KERNEL_H	1
-# define __undef_LINUX_KERNEL_H
-#endif
-#ifndef _LINUX_TYPES_H
-# define _LINUX_TYPES_H		1
-# define __undef_LINUX_TYPES_H
-#endif
-#ifndef _LINUX_LIST_H
-# define _LINUX_LIST_H		1
-# define __undef_LINUX_LIST_H
-#endif
-#ifndef __LINUX_COMPILER_H
-# define __LINUX_COMPILER_H	1
-# define __user
-# define __undef__LINUX_COMPILER_H
-#endif
-
-#include <linux/sysctl.h>
-
-#ifdef __undef_LINUX_KERNEL_H
-# undef _LINUX_KERNEL_H
-# undef __undef_LINUX_KERNEL_H
-#endif
-#ifdef __undef_LINUX_TYPES_H
-# undef _LINUX_TYPES_H
-# undef __undef_LINUX_TYPES_H
-#endif
-#ifdef __undef_LINUX_LIST_H
-# undef _LINUX_LIST_H
-# undef __undef_LINUX_LIST_H
-#endif
-#ifdef __undef__LINUX_COMPILER_H
-# undef __LINUX_COMPILER_H
-# undef __user
-# undef __undef__LINUX_COMPILER_H
-#endif
-
-#include <bits/sysctl.h>
-
-__BEGIN_DECLS
-
-/* Read or write system parameters.  */
-extern int sysctl (int *__name, int __nlen, void *__oldval,
-		   size_t *__oldlenp, void *__newval, size_t __newlen) __THROW;
-
-__END_DECLS
-
-#endif	/* _SYS_SYSCTL_H */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/sysinfo.h b/openflow/usr/include/arm-linux-gnueabihf/sys/sysinfo.h
deleted file mode 100644
index 4fc5186..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/sysinfo.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SYSINFO_H
-#define _SYS_SYSINFO_H	1
-
-#include <features.h>
-
-/* Get sysinfo structure from kernel header.  */
-#include <linux/kernel.h>
-
-__BEGIN_DECLS
-
-/* Returns information on overall system statistics.  */
-extern int sysinfo (struct sysinfo *__info) __THROW;
-
-
-/* Return number of configured processors.  */
-extern int get_nprocs_conf (void) __THROW;
-
-/* Return number of available processors.  */
-extern int get_nprocs (void) __THROW;
-
-
-/* Return number of physical pages of memory in the system.  */
-extern long int get_phys_pages (void) __THROW;
-
-/* Return number of available physical pages of memory in the system.  */
-extern long int get_avphys_pages (void) __THROW;
-
-__END_DECLS
-
-#endif	/* sys/sysinfo.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/syslog.h b/openflow/usr/include/arm-linux-gnueabihf/sys/syslog.h
deleted file mode 100644
index ee01478..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/syslog.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _SYS_SYSLOG_H
-#define _SYS_SYSLOG_H 1
-
-#include <features.h>
-#define __need___va_list
-#include <stdarg.h>
-
-/* This file defines _PATH_LOG.  */
-#include <bits/syslog-path.h>
-
-/*
- * priorities/facilities are encoded into a single 32-bit quantity, where the
- * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
- * (0-big number).  Both the priorities and the facilities map roughly
- * one-to-one to strings in the syslogd(8) source code.  This mapping is
- * included in this file.
- *
- * priorities (these are ordered)
- */
-#define	LOG_EMERG	0	/* system is unusable */
-#define	LOG_ALERT	1	/* action must be taken immediately */
-#define	LOG_CRIT	2	/* critical conditions */
-#define	LOG_ERR		3	/* error conditions */
-#define	LOG_WARNING	4	/* warning conditions */
-#define	LOG_NOTICE	5	/* normal but significant condition */
-#define	LOG_INFO	6	/* informational */
-#define	LOG_DEBUG	7	/* debug-level messages */
-
-#define	LOG_PRIMASK	0x07	/* mask to extract priority part (internal) */
-				/* extract priority */
-#define	LOG_PRI(p)	((p) & LOG_PRIMASK)
-#define	LOG_MAKEPRI(fac, pri)	((fac) | (pri))
-
-#ifdef SYSLOG_NAMES
-#define	INTERNAL_NOPRI	0x10	/* the "no priority" priority */
-				/* mark "facility" */
-#define	INTERNAL_MARK	LOG_MAKEPRI(LOG_NFACILITIES << 3, 0)
-typedef struct _code {
-	char	*c_name;
-	int	c_val;
-} CODE;
-
-CODE prioritynames[] =
-  {
-    { "alert", LOG_ALERT },
-    { "crit", LOG_CRIT },
-    { "debug", LOG_DEBUG },
-    { "emerg", LOG_EMERG },
-    { "err", LOG_ERR },
-    { "error", LOG_ERR },		/* DEPRECATED */
-    { "info", LOG_INFO },
-    { "none", INTERNAL_NOPRI },		/* INTERNAL */
-    { "notice", LOG_NOTICE },
-    { "panic", LOG_EMERG },		/* DEPRECATED */
-    { "warn", LOG_WARNING },		/* DEPRECATED */
-    { "warning", LOG_WARNING },
-    { NULL, -1 }
-  };
-#endif
-
-/* facility codes */
-#define	LOG_KERN	(0<<3)	/* kernel messages */
-#define	LOG_USER	(1<<3)	/* random user-level messages */
-#define	LOG_MAIL	(2<<3)	/* mail system */
-#define	LOG_DAEMON	(3<<3)	/* system daemons */
-#define	LOG_AUTH	(4<<3)	/* security/authorization messages */
-#define	LOG_SYSLOG	(5<<3)	/* messages generated internally by syslogd */
-#define	LOG_LPR		(6<<3)	/* line printer subsystem */
-#define	LOG_NEWS	(7<<3)	/* network news subsystem */
-#define	LOG_UUCP	(8<<3)	/* UUCP subsystem */
-#define	LOG_CRON	(9<<3)	/* clock daemon */
-#define	LOG_AUTHPRIV	(10<<3)	/* security/authorization messages (private) */
-#define	LOG_FTP		(11<<3)	/* ftp daemon */
-
-	/* other codes through 15 reserved for system use */
-#define	LOG_LOCAL0	(16<<3)	/* reserved for local use */
-#define	LOG_LOCAL1	(17<<3)	/* reserved for local use */
-#define	LOG_LOCAL2	(18<<3)	/* reserved for local use */
-#define	LOG_LOCAL3	(19<<3)	/* reserved for local use */
-#define	LOG_LOCAL4	(20<<3)	/* reserved for local use */
-#define	LOG_LOCAL5	(21<<3)	/* reserved for local use */
-#define	LOG_LOCAL6	(22<<3)	/* reserved for local use */
-#define	LOG_LOCAL7	(23<<3)	/* reserved for local use */
-
-#define	LOG_NFACILITIES	24	/* current number of facilities */
-#define	LOG_FACMASK	0x03f8	/* mask to extract facility part */
-				/* facility of pri */
-#define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
-
-#ifdef SYSLOG_NAMES
-CODE facilitynames[] =
-  {
-    { "auth", LOG_AUTH },
-    { "authpriv", LOG_AUTHPRIV },
-    { "cron", LOG_CRON },
-    { "daemon", LOG_DAEMON },
-    { "ftp", LOG_FTP },
-    { "kern", LOG_KERN },
-    { "lpr", LOG_LPR },
-    { "mail", LOG_MAIL },
-    { "mark", INTERNAL_MARK },		/* INTERNAL */
-    { "news", LOG_NEWS },
-    { "security", LOG_AUTH },		/* DEPRECATED */
-    { "syslog", LOG_SYSLOG },
-    { "user", LOG_USER },
-    { "uucp", LOG_UUCP },
-    { "local0", LOG_LOCAL0 },
-    { "local1", LOG_LOCAL1 },
-    { "local2", LOG_LOCAL2 },
-    { "local3", LOG_LOCAL3 },
-    { "local4", LOG_LOCAL4 },
-    { "local5", LOG_LOCAL5 },
-    { "local6", LOG_LOCAL6 },
-    { "local7", LOG_LOCAL7 },
-    { NULL, -1 }
-  };
-#endif
-
-/*
- * arguments to setlogmask.
- */
-#define	LOG_MASK(pri)	(1 << (pri))		/* mask for one priority */
-#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)	/* all priorities through pri */
-
-/*
- * Option flags for openlog.
- *
- * LOG_ODELAY no longer does anything.
- * LOG_NDELAY is the inverse of what it used to be.
- */
-#define	LOG_PID		0x01	/* log the pid with each message */
-#define	LOG_CONS	0x02	/* log on the console if errors in sending */
-#define	LOG_ODELAY	0x04	/* delay open until first syslog() (default) */
-#define	LOG_NDELAY	0x08	/* don't delay open */
-#define	LOG_NOWAIT	0x10	/* don't wait for console forks: DEPRECATED */
-#define	LOG_PERROR	0x20	/* log to stderr as well */
-
-__BEGIN_DECLS
-
-/* Close descriptor used to write to system logger.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void closelog (void);
-
-/* Open connection to system logger.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void openlog (const char *__ident, int __option, int __facility);
-
-/* Set the log mask level.  */
-extern int setlogmask (int __mask) __THROW;
-
-/* Generate a log message using FMT string and option arguments.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void syslog (int __pri, const char *__fmt, ...)
-     __attribute__ ((__format__ (__printf__, 2, 3)));
-
-#ifdef __USE_MISC
-/* Generate a log message using FMT and using arguments pointed to by AP.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern void vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap)
-     __attribute__ ((__format__ (__printf__, 2, 0)));
-#endif
-
-
-/* Define some macros helping to catch buffer overflows.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-# include <bits/syslog.h>
-#endif
-#ifdef __LDBL_COMPAT
-# include <bits/syslog-ldbl.h>
-#endif
-
-__END_DECLS
-
-#endif /* sys/syslog.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/sysmacros.h b/openflow/usr/include/arm-linux-gnueabihf/sys/sysmacros.h
deleted file mode 100644
index 4c4a697..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/sysmacros.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Definitions of macros to access `dev_t' values.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_SYSMACROS_H
-#define _SYS_SYSMACROS_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-__extension__
-extern unsigned int gnu_dev_major (unsigned long long int __dev)
-     __THROW __attribute_const__;
-__extension__
-extern unsigned int gnu_dev_minor (unsigned long long int __dev)
-     __THROW __attribute_const__;
-__extension__
-extern unsigned long long int gnu_dev_makedev (unsigned int __major,
-					       unsigned int __minor)
-     __THROW __attribute_const__;
-
-#ifdef __USE_EXTERN_INLINES
-__extension__ __extern_inline __attribute_const__ unsigned int
-__NTH (gnu_dev_major (unsigned long long int __dev))
-{
-  return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff);
-}
-
-__extension__ __extern_inline __attribute_const__ unsigned int
-__NTH (gnu_dev_minor (unsigned long long int __dev))
-{
-  return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff);
-}
-
-__extension__ __extern_inline __attribute_const__ unsigned long long int
-__NTH (gnu_dev_makedev (unsigned int __major, unsigned int __minor))
-{
-  return ((__minor & 0xff) | ((__major & 0xfff) << 8)
-	  | (((unsigned long long int) (__minor & ~0xff)) << 12)
-	  | (((unsigned long long int) (__major & ~0xfff)) << 32));
-}
-#endif
-__END_DECLS
-
-/* Access the functions with their traditional names.  */
-#define major(dev) gnu_dev_major (dev)
-#define minor(dev) gnu_dev_minor (dev)
-#define makedev(maj, min) gnu_dev_makedev (maj, min)
-
-#endif /* sys/sysmacros.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/termios.h b/openflow/usr/include/arm-linux-gnueabihf/sys/termios.h
deleted file mode 100644
index 3e18805..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/termios.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SYS_TERMIOS_H
-#define _SYS_TERMIOS_H
-#include <termios.h>
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/time.h b/openflow/usr/include/arm-linux-gnueabihf/sys/time.h
deleted file mode 100644
index 545de6f..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/time.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_TIME_H
-#define _SYS_TIME_H	1
-
-#include <features.h>
-
-#include <bits/types.h>
-#define __need_time_t
-#include <time.h>
-#define __need_timeval
-#include <bits/time.h>
-
-#include <sys/select.h>
-
-#ifndef __suseconds_t_defined
-typedef __suseconds_t suseconds_t;
-# define __suseconds_t_defined
-#endif
-
-
-__BEGIN_DECLS
-
-#ifdef __USE_GNU
-/* Macros for converting between `struct timeval' and `struct timespec'.  */
-# define TIMEVAL_TO_TIMESPEC(tv, ts) {                                   \
-	(ts)->tv_sec = (tv)->tv_sec;                                    \
-	(ts)->tv_nsec = (tv)->tv_usec * 1000;                           \
-}
-# define TIMESPEC_TO_TIMEVAL(tv, ts) {                                   \
-	(tv)->tv_sec = (ts)->tv_sec;                                    \
-	(tv)->tv_usec = (ts)->tv_nsec / 1000;                           \
-}
-#endif
-
-
-#ifdef __USE_MISC
-/* Structure crudely representing a timezone.
-   This is obsolete and should never be used.  */
-struct timezone
-  {
-    int tz_minuteswest;		/* Minutes west of GMT.  */
-    int tz_dsttime;		/* Nonzero if DST is ever in effect.  */
-  };
-
-typedef struct timezone *__restrict __timezone_ptr_t;
-#else
-typedef void *__restrict __timezone_ptr_t;
-#endif
-
-/* Get the current time of day and timezone information,
-   putting it into *TV and *TZ.  If TZ is NULL, *TZ is not filled.
-   Returns 0 on success, -1 on errors.
-   NOTE: This form of timezone information is obsolete.
-   Use the functions and variables declared in <time.h> instead.  */
-extern int gettimeofday (struct timeval *__restrict __tv,
-			 __timezone_ptr_t __tz) __THROW __nonnull ((1));
-
-#ifdef __USE_MISC
-/* Set the current time of day and timezone information.
-   This call is restricted to the super-user.  */
-extern int settimeofday (const struct timeval *__tv,
-			 const struct timezone *__tz)
-     __THROW;
-
-/* Adjust the current time of day by the amount in DELTA.
-   If OLDDELTA is not NULL, it is filled in with the amount
-   of time adjustment remaining to be done from the last `adjtime' call.
-   This call is restricted to the super-user.  */
-extern int adjtime (const struct timeval *__delta,
-		    struct timeval *__olddelta) __THROW;
-#endif
-
-
-/* Values for the first argument to `getitimer' and `setitimer'.  */
-enum __itimer_which
-  {
-    /* Timers run in real time.  */
-    ITIMER_REAL = 0,
-#define ITIMER_REAL ITIMER_REAL
-    /* Timers run only when the process is executing.  */
-    ITIMER_VIRTUAL = 1,
-#define ITIMER_VIRTUAL ITIMER_VIRTUAL
-    /* Timers run when the process is executing and when
-       the system is executing on behalf of the process.  */
-    ITIMER_PROF = 2
-#define ITIMER_PROF ITIMER_PROF
-  };
-
-/* Type of the second argument to `getitimer' and
-   the second and third arguments `setitimer'.  */
-struct itimerval
-  {
-    /* Value to put into `it_value' when the timer expires.  */
-    struct timeval it_interval;
-    /* Time to the next timer expiration.  */
-    struct timeval it_value;
-  };
-
-#if defined __USE_GNU && !defined __cplusplus
-/* Use the nicer parameter type only in GNU mode and not for C++ since the
-   strict C++ rules prevent the automatic promotion.  */
-typedef enum __itimer_which __itimer_which_t;
-#else
-typedef int __itimer_which_t;
-#endif
-
-/* Set *VALUE to the current setting of timer WHICH.
-   Return 0 on success, -1 on errors.  */
-extern int getitimer (__itimer_which_t __which,
-		      struct itimerval *__value) __THROW;
-
-/* Set the timer WHICH to *NEW.  If OLD is not NULL,
-   set *OLD to the old value of timer WHICH.
-   Returns 0 on success, -1 on errors.  */
-extern int setitimer (__itimer_which_t __which,
-		      const struct itimerval *__restrict __new,
-		      struct itimerval *__restrict __old) __THROW;
-
-/* Change the access time of FILE to TVP[0] and the modification time of
-   FILE to TVP[1].  If TVP is a null pointer, use the current time instead.
-   Returns 0 on success, -1 on errors.  */
-extern int utimes (const char *__file, const struct timeval __tvp[2])
-     __THROW __nonnull ((1));
-
-#ifdef __USE_MISC
-/* Same as `utimes', but does not follow symbolic links.  */
-extern int lutimes (const char *__file, const struct timeval __tvp[2])
-     __THROW __nonnull ((1));
-
-/* Same as `utimes', but takes an open file descriptor instead of a name.  */
-extern int futimes (int __fd, const struct timeval __tvp[2]) __THROW;
-#endif
-
-#ifdef __USE_GNU
-/* Change the access time of FILE relative to FD to TVP[0] and the
-   modification time of FILE to TVP[1].  If TVP is a null pointer, use
-   the current time instead.  Returns 0 on success, -1 on errors.  */
-extern int futimesat (int __fd, const char *__file,
-		      const struct timeval __tvp[2]) __THROW;
-#endif
-
-
-#ifdef __USE_MISC
-/* Convenience macros for operations on timevals.
-   NOTE: `timercmp' does not work for >= or <=.  */
-# define timerisset(tvp)	((tvp)->tv_sec || (tvp)->tv_usec)
-# define timerclear(tvp)	((tvp)->tv_sec = (tvp)->tv_usec = 0)
-# define timercmp(a, b, CMP) 						      \
-  (((a)->tv_sec == (b)->tv_sec) ? 					      \
-   ((a)->tv_usec CMP (b)->tv_usec) : 					      \
-   ((a)->tv_sec CMP (b)->tv_sec))
-# define timeradd(a, b, result)						      \
-  do {									      \
-    (result)->tv_sec = (a)->tv_sec + (b)->tv_sec;			      \
-    (result)->tv_usec = (a)->tv_usec + (b)->tv_usec;			      \
-    if ((result)->tv_usec >= 1000000)					      \
-      {									      \
-	++(result)->tv_sec;						      \
-	(result)->tv_usec -= 1000000;					      \
-      }									      \
-  } while (0)
-# define timersub(a, b, result)						      \
-  do {									      \
-    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			      \
-    (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;			      \
-    if ((result)->tv_usec < 0) {					      \
-      --(result)->tv_sec;						      \
-      (result)->tv_usec += 1000000;					      \
-    }									      \
-  } while (0)
-#endif	/* Misc.  */
-
-__END_DECLS
-
-#endif /* sys/time.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/timeb.h b/openflow/usr/include/arm-linux-gnueabihf/sys/timeb.h
deleted file mode 100644
index 41d71bf..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/timeb.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (C) 1994-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_TIMEB_H
-#define _SYS_TIMEB_H	1
-
-#include <features.h>
-
-#define __need_time_t
-#include <time.h>
-
-
-__BEGIN_DECLS
-
-/* Structure returned by the `ftime' function.  */
-
-struct timeb
-  {
-    time_t time;		/* Seconds since epoch, as from `time'.  */
-    unsigned short int millitm;	/* Additional milliseconds.  */
-    short int timezone;		/* Minutes west of GMT.  */
-    short int dstflag;		/* Nonzero if Daylight Savings Time used.  */
-  };
-
-/* Fill in TIMEBUF with information about the current time.  */
-
-extern int ftime (struct timeb *__timebuf);
-
-__END_DECLS
-
-#endif	/* sys/timeb.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/timerfd.h b/openflow/usr/include/arm-linux-gnueabihf/sys/timerfd.h
deleted file mode 100644
index 3286997..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/timerfd.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 2008-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_TIMERFD_H
-#define	_SYS_TIMERFD_H	1
-
-#include <time.h>
-
-/* Get the platform-dependent flags.  */
-#include <bits/timerfd.h>
-
-
-/* Bits to be set in the FLAGS parameter of `timerfd_settime'.  */
-enum
-  {
-    TFD_TIMER_ABSTIME = 1 << 0
-#define TFD_TIMER_ABSTIME TFD_TIMER_ABSTIME
-  };
-
-
-__BEGIN_DECLS
-
-/* Return file descriptor for new interval timer source.  */
-extern int timerfd_create (clockid_t __clock_id, int __flags) __THROW;
-
-/* Set next expiration time of interval timer source UFD to UTMR.  If
-   FLAGS has the TFD_TIMER_ABSTIME flag set the timeout value is
-   absolute.  Optionally return the old expiration time in OTMR.  */
-extern int timerfd_settime (int __ufd, int __flags,
-			    const struct itimerspec *__utmr,
-			    struct itimerspec *__otmr) __THROW;
-
-/* Return the next expiration time of UFD.  */
-extern int timerfd_gettime (int __ufd, struct itimerspec *__otmr) __THROW;
-
-__END_DECLS
-
-#endif /* sys/timerfd.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/times.h b/openflow/usr/include/arm-linux-gnueabihf/sys/times.h
deleted file mode 100644
index a877d14..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/times.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 4.5.2 Process Times	<sys/times.h>
- */
-
-#ifndef	_SYS_TIMES_H
-#define	_SYS_TIMES_H	1
-
-#include <features.h>
-
-#define	__need_clock_t
-#include <time.h>
-
-
-__BEGIN_DECLS
-
-/* Structure describing CPU time used by a process and its children.  */
-struct tms
-  {
-    clock_t tms_utime;		/* User CPU time.  */
-    clock_t tms_stime;		/* System CPU time.  */
-
-    clock_t tms_cutime;		/* User CPU time of dead children.  */
-    clock_t tms_cstime;		/* System CPU time of dead children.  */
-  };
-
-
-/* Store the CPU time used by this process and all its
-   dead children (and their dead children) in BUFFER.
-   Return the elapsed real time, or (clock_t) -1 for errors.
-   All times are in CLK_TCKths of a second.  */
-extern clock_t times (struct tms *__buffer) __THROW;
-
-__END_DECLS
-
-#endif /* sys/times.h	*/
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/timex.h b/openflow/usr/include/arm-linux-gnueabihf/sys/timex.h
deleted file mode 100644
index 75e86dd..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/timex.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_TIMEX_H
-#define	_SYS_TIMEX_H	1
-
-#include <features.h>
-#include <sys/time.h>
-
-/* These definitions from linux/timex.h as of 2.6.30.  */
-
-#include <bits/timex.h>
-
-#define NTP_API	4	/* NTP API version */
-
-struct ntptimeval
-{
-  struct timeval time;	/* current time (ro) */
-  long int maxerror;	/* maximum error (us) (ro) */
-  long int esterror;	/* estimated error (us) (ro) */
-  long int tai;		/* TAI offset (ro) */
-
-  long int __glibc_reserved1;
-  long int __glibc_reserved2;
-  long int __glibc_reserved3;
-  long int __glibc_reserved4;
-};
-
-/* Clock states (time_state) */
-#define TIME_OK		0	/* clock synchronized, no leap second */
-#define TIME_INS	1	/* insert leap second */
-#define TIME_DEL	2	/* delete leap second */
-#define TIME_OOP	3	/* leap second in progress */
-#define TIME_WAIT	4	/* leap second has occurred */
-#define TIME_ERROR	5	/* clock not synchronized */
-#define TIME_BAD	TIME_ERROR /* bw compat */
-
-/* Maximum time constant of the PLL.  */
-#define MAXTC		6
-
-__BEGIN_DECLS
-
-extern int __adjtimex (struct timex *__ntx) __THROW;
-extern int adjtimex (struct timex *__ntx) __THROW;
-
-#ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv),
-			   ntp_gettimex);
-#else
-extern int ntp_gettimex (struct ntptimeval *__ntv) __THROW;
-# define ntp_gettime ntp_gettimex
-#endif
-extern int ntp_adjtime (struct timex *__tntx) __THROW;
-
-__END_DECLS
-
-#endif /* sys/timex.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/ttychars.h b/openflow/usr/include/arm-linux-gnueabihf/sys/ttychars.h
deleted file mode 100644
index 7043f60..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/ttychars.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ttychars.h	8.2 (Berkeley) 1/4/94
- */
-
-/*
- * 4.3 COMPATIBILITY FILE
- *
- * User visible structures and constants related to terminal handling.
- */
-#ifndef _SYS_TTYCHARS_H
-#define	_SYS_TTYCHARS_H 1
-
-struct ttychars {
-	char	tc_erase;	/* erase last character */
-	char	tc_kill;	/* erase entire line */
-	char	tc_intrc;	/* interrupt */
-	char	tc_quitc;	/* quit */
-	char	tc_startc;	/* start output */
-	char	tc_stopc;	/* stop output */
-	char	tc_eofc;	/* end-of-file */
-	char	tc_brkc;	/* input delimiter (like nl) */
-	char	tc_suspc;	/* stop process signal */
-	char	tc_dsuspc;	/* delayed stop process signal */
-	char	tc_rprntc;	/* reprint line */
-	char	tc_flushc;	/* flush output (toggles) */
-	char	tc_werasc;	/* word erase */
-	char	tc_lnextc;	/* literal next character */
-};
-
-#ifdef __USE_OLD_TTY
-#include <sys/ttydefaults.h>	/* to pick up character defaults */
-#endif
-
-#endif /* sys/ttychars.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/ttydefaults.h b/openflow/usr/include/arm-linux-gnueabihf/sys/ttydefaults.h
deleted file mode 100644
index 9be168b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/ttydefaults.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- */
-
-/*
- * System wide defaults for terminal state.  Linux version.
- */
-#ifndef _SYS_TTYDEFAULTS_H_
-#define	_SYS_TTYDEFAULTS_H_
-
-/*
- * Defaults on "first" open.
- */
-#define	TTYDEF_IFLAG	(BRKINT | ISTRIP | ICRNL | IMAXBEL | IXON | IXANY)
-#define TTYDEF_OFLAG	(OPOST | ONLCR | XTABS)
-#define TTYDEF_LFLAG	(ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
-#define TTYDEF_CFLAG	(CREAD | CS7 | PARENB | HUPCL)
-#define TTYDEF_SPEED	(B9600)
-
-/*
- * Control Character Defaults
- */
-#define CTRL(x)	(x&037)
-#define	CEOF		CTRL('d')
-#ifdef _POSIX_VDISABLE
-# define CEOL		_POSIX_VDISABLE
-#else
-# define CEOL		'\0'		/* XXX avoid _POSIX_VDISABLE */
-#endif
-#define	CERASE		0177
-#define	CINTR		CTRL('c')
-#ifdef _POSIX_VDISABLE
-# define CSTATUS	_POSIX_VDISABLE
-#else
-# define CSTATUS	'\0'		/* XXX avoid _POSIX_VDISABLE */
-#endif
-#define	CKILL		CTRL('u')
-#define	CMIN		1
-#define	CQUIT		034		/* FS, ^\ */
-#define	CSUSP		CTRL('z')
-#define	CTIME		0
-#define	CDSUSP		CTRL('y')
-#define	CSTART		CTRL('q')
-#define	CSTOP		CTRL('s')
-#define	CLNEXT		CTRL('v')
-#define	CDISCARD 	CTRL('o')
-#define	CWERASE 	CTRL('w')
-#define	CREPRINT 	CTRL('r')
-#define	CEOT		CEOF
-/* compat */
-#define	CBRK		CEOL
-#define CRPRNT		CREPRINT
-#define	CFLUSH		CDISCARD
-
-/* PROTECTED INCLUSION ENDS HERE */
-#endif /* !_SYS_TTYDEFAULTS_H_ */
-
-/*
- * #define TTYDEFCHARS to include an array of default control characters.
- */
-#ifdef TTYDEFCHARS
-cc_t	ttydefchars[NCCS] = {
-	CEOF,	CEOL,	CEOL,	CERASE, CWERASE, CKILL, CREPRINT,
-	_POSIX_VDISABLE, CINTR,	CQUIT,	CSUSP,	CDSUSP,	CSTART,	CSTOP,	CLNEXT,
-	CDISCARD, CMIN,	CTIME,  CSTATUS, _POSIX_VDISABLE
-};
-#undef TTYDEFCHARS
-#endif
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/types.h b/openflow/usr/include/arm-linux-gnueabihf/sys/types.h
deleted file mode 100644
index a728567..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/types.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
- */
-
-#ifndef	_SYS_TYPES_H
-#define	_SYS_TYPES_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#include <bits/types.h>
-
-#ifdef	__USE_MISC
-# ifndef __u_char_defined
-typedef __u_char u_char;
-typedef __u_short u_short;
-typedef __u_int u_int;
-typedef __u_long u_long;
-typedef __quad_t quad_t;
-typedef __u_quad_t u_quad_t;
-typedef __fsid_t fsid_t;
-#  define __u_char_defined
-# endif
-#endif
-
-typedef __loff_t loff_t;
-
-#ifndef __ino_t_defined
-# ifndef __USE_FILE_OFFSET64
-typedef __ino_t ino_t;
-# else
-typedef __ino64_t ino_t;
-# endif
-# define __ino_t_defined
-#endif
-#if defined __USE_LARGEFILE64 && !defined __ino64_t_defined
-typedef __ino64_t ino64_t;
-# define __ino64_t_defined
-#endif
-
-#ifndef __dev_t_defined
-typedef __dev_t dev_t;
-# define __dev_t_defined
-#endif
-
-#ifndef __gid_t_defined
-typedef __gid_t gid_t;
-# define __gid_t_defined
-#endif
-
-#ifndef __mode_t_defined
-typedef __mode_t mode_t;
-# define __mode_t_defined
-#endif
-
-#ifndef __nlink_t_defined
-typedef __nlink_t nlink_t;
-# define __nlink_t_defined
-#endif
-
-#ifndef __uid_t_defined
-typedef __uid_t uid_t;
-# define __uid_t_defined
-#endif
-
-#ifndef __off_t_defined
-# ifndef __USE_FILE_OFFSET64
-typedef __off_t off_t;
-# else
-typedef __off64_t off_t;
-# endif
-# define __off_t_defined
-#endif
-#if defined __USE_LARGEFILE64 && !defined __off64_t_defined
-typedef __off64_t off64_t;
-# define __off64_t_defined
-#endif
-
-#ifndef __pid_t_defined
-typedef __pid_t pid_t;
-# define __pid_t_defined
-#endif
-
-#if (defined __USE_XOPEN || defined __USE_XOPEN2K8) \
-    && !defined __id_t_defined
-typedef __id_t id_t;
-# define __id_t_defined
-#endif
-
-#ifndef __ssize_t_defined
-typedef __ssize_t ssize_t;
-# define __ssize_t_defined
-#endif
-
-#ifdef	__USE_MISC
-# ifndef __daddr_t_defined
-typedef __daddr_t daddr_t;
-typedef __caddr_t caddr_t;
-#  define __daddr_t_defined
-# endif
-#endif
-
-#if (defined __USE_MISC || defined __USE_XOPEN) && !defined __key_t_defined
-typedef __key_t key_t;
-# define __key_t_defined
-#endif
-
-#if defined __USE_XOPEN || defined __USE_XOPEN2K8
-# define __need_clock_t
-#endif
-#define	__need_time_t
-#define __need_timer_t
-#define __need_clockid_t
-#include <time.h>
-
-#ifdef __USE_XOPEN
-# ifndef __useconds_t_defined
-typedef __useconds_t useconds_t;
-#  define __useconds_t_defined
-# endif
-# ifndef __suseconds_t_defined
-typedef __suseconds_t suseconds_t;
-#  define __suseconds_t_defined
-# endif
-#endif
-
-#define	__need_size_t
-#include <stddef.h>
-
-#ifdef __USE_MISC
-/* Old compatibility names for C types.  */
-typedef unsigned long int ulong;
-typedef unsigned short int ushort;
-typedef unsigned int uint;
-#endif
-
-/* These size-specific names are used by some of the inet code.  */
-
-#if !__GNUC_PREREQ (2, 7)
-
-/* These types are defined by the ISO C99 header <inttypes.h>. */
-# ifndef __int8_t_defined
-#  define __int8_t_defined
-typedef	char int8_t;
-typedef	short int int16_t;
-typedef	int int32_t;
-#  if __WORDSIZE == 64
-typedef long int int64_t;
-#  else
-__extension__ typedef long long int int64_t;
-#  endif
-# endif
-
-/* But these were defined by ISO C without the first `_'.  */
-typedef	unsigned char u_int8_t;
-typedef	unsigned short int u_int16_t;
-typedef	unsigned int u_int32_t;
-# if __WORDSIZE == 64
-typedef unsigned long int u_int64_t;
-# else
-__extension__ typedef unsigned long long int u_int64_t;
-# endif
-
-typedef int register_t;
-
-#else
-
-/* For GCC 2.7 and later, we can use specific type-size attributes.  */
-# define __intN_t(N, MODE) \
-  typedef int int##N##_t __attribute__ ((__mode__ (MODE)))
-# define __u_intN_t(N, MODE) \
-  typedef unsigned int u_int##N##_t __attribute__ ((__mode__ (MODE)))
-
-# ifndef __int8_t_defined
-#  define __int8_t_defined
-__intN_t (8, __QI__);
-__intN_t (16, __HI__);
-__intN_t (32, __SI__);
-__intN_t (64, __DI__);
-# endif
-
-__u_intN_t (8, __QI__);
-__u_intN_t (16, __HI__);
-__u_intN_t (32, __SI__);
-__u_intN_t (64, __DI__);
-
-typedef int register_t __attribute__ ((__mode__ (__word__)));
-
-
-/* Some code from BIND tests this macro to see if the types above are
-   defined.  */
-#endif
-#define __BIT_TYPES_DEFINED__	1
-
-
-#ifdef	__USE_MISC
-/* In BSD <sys/types.h> is expected to define BYTE_ORDER.  */
-# include <endian.h>
-
-/* It also defines `fd_set' and the FD_* macros for `select'.  */
-# include <sys/select.h>
-
-/* BSD defines these symbols, so we follow.  */
-# include <sys/sysmacros.h>
-#endif /* Use misc.  */
-
-
-#if (defined __USE_UNIX98 || defined __USE_XOPEN2K8) \
-    && !defined __blksize_t_defined
-typedef __blksize_t blksize_t;
-# define __blksize_t_defined
-#endif
-
-/* Types from the Large File Support interface.  */
-#ifndef __USE_FILE_OFFSET64
-# ifndef __blkcnt_t_defined
-typedef __blkcnt_t blkcnt_t;	 /* Type to count number of disk blocks.  */
-#  define __blkcnt_t_defined
-# endif
-# ifndef __fsblkcnt_t_defined
-typedef __fsblkcnt_t fsblkcnt_t; /* Type to count file system blocks.  */
-#  define __fsblkcnt_t_defined
-# endif
-# ifndef __fsfilcnt_t_defined
-typedef __fsfilcnt_t fsfilcnt_t; /* Type to count file system inodes.  */
-#  define __fsfilcnt_t_defined
-# endif
-#else
-# ifndef __blkcnt_t_defined
-typedef __blkcnt64_t blkcnt_t;	   /* Type to count number of disk blocks.  */
-#  define __blkcnt_t_defined
-# endif
-# ifndef __fsblkcnt_t_defined
-typedef __fsblkcnt64_t fsblkcnt_t; /* Type to count file system blocks.  */
-#  define __fsblkcnt_t_defined
-# endif
-# ifndef __fsfilcnt_t_defined
-typedef __fsfilcnt64_t fsfilcnt_t; /* Type to count file system inodes.  */
-#  define __fsfilcnt_t_defined
-# endif
-#endif
-
-#ifdef __USE_LARGEFILE64
-typedef __blkcnt64_t blkcnt64_t;     /* Type to count number of disk blocks. */
-typedef __fsblkcnt64_t fsblkcnt64_t; /* Type to count file system blocks.  */
-typedef __fsfilcnt64_t fsfilcnt64_t; /* Type to count file system inodes.  */
-#endif
-
-
-/* Now add the thread types.  */
-#if defined __USE_POSIX199506 || defined __USE_UNIX98
-# include <bits/pthreadtypes.h>
-#endif
-
-__END_DECLS
-
-#endif /* sys/types.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/ucontext.h b/openflow/usr/include/arm-linux-gnueabihf/sys/ucontext.h
deleted file mode 100644
index f32eadc..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/ucontext.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* System V/ARM ABI compliant context switching support.  */
-
-#ifndef _SYS_UCONTEXT_H
-#define _SYS_UCONTEXT_H	1
-
-#include <features.h>
-#include <signal.h>
-
-/* We need the signal context definitions even if they are not used
-   included in <signal.h>.  */
-#include <bits/sigcontext.h>
-
-typedef int greg_t;
-
-/* Number of general registers.  */
-#define NGREG	18
-
-/* Container for all general registers.  */
-typedef greg_t gregset_t[NGREG];
-
-/* Number of each register is the `gregset_t' array.  */
-enum
-{
-  REG_R0 = 0,
-#define REG_R0	REG_R0
-  REG_R1 = 1,
-#define REG_R1	REG_R1
-  REG_R2 = 2,
-#define REG_R2	REG_R2
-  REG_R3 = 3,
-#define REG_R3	REG_R3
-  REG_R4 = 4,
-#define REG_R4	REG_R4
-  REG_R5 = 5,
-#define REG_R5	REG_R5
-  REG_R6 = 6,
-#define REG_R6	REG_R6
-  REG_R7 = 7,
-#define REG_R7	REG_R7
-  REG_R8 = 8,
-#define REG_R8	REG_R8
-  REG_R9 = 9,
-#define REG_R9	REG_R9
-  REG_R10 = 10,
-#define REG_R10	REG_R10
-  REG_R11 = 11,
-#define REG_R11	REG_R11
-  REG_R12 = 12,
-#define REG_R12	REG_R12
-  REG_R13 = 13,
-#define REG_R13	REG_R13
-  REG_R14 = 14,
-#define REG_R14	REG_R14
-  REG_R15 = 15
-#define REG_R15	REG_R15
-};
-
-struct _libc_fpstate
-{
-  struct
-  {
-    unsigned int sign1:1;
-    unsigned int unused:15;
-    unsigned int sign2:1;
-    unsigned int exponent:14;
-    unsigned int j:1;
-    unsigned int mantissa1:31;
-    unsigned int mantissa0:32;
-  } fpregs[8];
-  unsigned int fpsr:32;
-  unsigned int fpcr:32;
-  unsigned char ftype[8];
-  unsigned int init_flag;
-};
-/* Structure to describe FPU registers.  */
-typedef struct _libc_fpstate fpregset_t;
-
-/* Context to describe whole processor state.  This only describes
-   the core registers; coprocessor registers get saved elsewhere
-   (e.g. in uc_regspace, or somewhere unspecified on the stack
-   during non-RT signal handlers).  */
-typedef struct sigcontext mcontext_t;
-
-/* Userlevel context.  */
-typedef struct ucontext
-  {
-    unsigned long uc_flags;
-    struct ucontext *uc_link;
-    stack_t uc_stack;
-    mcontext_t uc_mcontext;
-    __sigset_t uc_sigmask;
-    unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
-  } ucontext_t;
-
-#endif /* sys/ucontext.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/uio.h b/openflow/usr/include/arm-linux-gnueabihf/sys/uio.h
deleted file mode 100644
index 2c98077..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/uio.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_UIO_H
-#define _SYS_UIO_H	1
-
-#include <features.h>
-
-#include <sys/types.h>
-
-__BEGIN_DECLS
-
-/* This file defines `struct iovec'.  */
-#include <bits/uio.h>
-
-
-/* Read data from file descriptor FD, and put the result in the
-   buffers described by IOVEC, which is a vector of COUNT 'struct iovec's.
-   The buffers are filled in the order specified.
-   Operates just like 'read' (see <unistd.h>) except that data are
-   put in IOVEC instead of a contiguous buffer.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t readv (int __fd, const struct iovec *__iovec, int __count)
-  __wur;
-
-/* Write data pointed by the buffers described by IOVEC, which
-   is a vector of COUNT 'struct iovec's, to file descriptor FD.
-   The data is written in the order specified.
-   Operates just like 'write' (see <unistd.h>) except that the data
-   are taken from IOVEC instead of a contiguous buffer.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t writev (int __fd, const struct iovec *__iovec, int __count)
-  __wur;
-
-
-#ifdef __USE_MISC
-# ifndef __USE_FILE_OFFSET64
-/* Read data from file descriptor FD at the given position OFFSET
-   without change the file pointer, and put the result in the buffers
-   described by IOVEC, which is a vector of COUNT 'struct iovec's.
-   The buffers are filled in the order specified.  Operates just like
-   'pread' (see <unistd.h>) except that data are put in IOVEC instead
-   of a contiguous buffer.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t preadv (int __fd, const struct iovec *__iovec, int __count,
-		       __off_t __offset) __wur;
-
-/* Write data pointed by the buffers described by IOVEC, which is a
-   vector of COUNT 'struct iovec's, to file descriptor FD at the given
-   position OFFSET without change the file pointer.  The data is
-   written in the order specified.  Operates just like 'pwrite' (see
-   <unistd.h>) except that the data are taken from IOVEC instead of a
-   contiguous buffer.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t pwritev (int __fd, const struct iovec *__iovec, int __count,
-			__off_t __offset) __wur;
-# else
-#  ifdef __REDIRECT
-extern ssize_t __REDIRECT (preadv, (int __fd, const struct iovec *__iovec,
-				    int __count, __off64_t __offset),
-			   preadv64) __wur;
-extern ssize_t __REDIRECT (pwritev, (int __fd, const struct iovec *__iovec,
-				     int __count, __off64_t __offset),
-			   pwritev64) __wur;
-#  else
-#   define preadv preadv64
-#   define pwritev pwritev64
-#  endif
-# endif
-
-# ifdef __USE_LARGEFILE64
-/* Read data from file descriptor FD at the given position OFFSET
-   without change the file pointer, and put the result in the buffers
-   described by IOVEC, which is a vector of COUNT 'struct iovec's.
-   The buffers are filled in the order specified.  Operates just like
-   'pread' (see <unistd.h>) except that data are put in IOVEC instead
-   of a contiguous buffer.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t preadv64 (int __fd, const struct iovec *__iovec, int __count,
-			 __off64_t __offset) __wur;
-
-/* Write data pointed by the buffers described by IOVEC, which is a
-   vector of COUNT 'struct iovec's, to file descriptor FD at the given
-   position OFFSET without change the file pointer.  The data is
-   written in the order specified.  Operates just like 'pwrite' (see
-   <unistd.h>) except that the data are taken from IOVEC instead of a
-   contiguous buffer.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t pwritev64 (int __fd, const struct iovec *__iovec, int __count,
-			  __off64_t __offset) __wur;
-# endif
-#endif	/* Use misc.  */
-
-__END_DECLS
-
-#endif /* sys/uio.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/ultrasound.h b/openflow/usr/include/arm-linux-gnueabihf/sys/ultrasound.h
deleted file mode 100644
index a65c385..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/ultrasound.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linux/ultrasound.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/un.h b/openflow/usr/include/arm-linux-gnueabihf/sys/un.h
deleted file mode 100644
index 7a1a67b..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/un.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SYS_UN_H
-#define	_SYS_UN_H	1
-
-#include <sys/cdefs.h>
-
-/* Get the definition of the macro to define the common sockaddr members.  */
-#include <bits/sockaddr.h>
-
-__BEGIN_DECLS
-
-/* Structure describing the address of an AF_LOCAL (aka AF_UNIX) socket.  */
-struct sockaddr_un
-  {
-    __SOCKADDR_COMMON (sun_);
-    char sun_path[108];		/* Path name.  */
-  };
-
-
-#ifdef __USE_MISC
-# include <string.h>		/* For prototype of `strlen'.  */
-
-/* Evaluate to actual length of the `sockaddr_un' structure.  */
-# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path)	      \
-		      + strlen ((ptr)->sun_path))
-#endif
-
-__END_DECLS
-
-#endif	/* sys/un.h  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/unistd.h b/openflow/usr/include/arm-linux-gnueabihf/sys/unistd.h
deleted file mode 100644
index 1e823fb..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/unistd.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <unistd.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/user.h b/openflow/usr/include/arm-linux-gnueabihf/sys/user.h
deleted file mode 100644
index 8c28608..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/user.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_USER_H
-#define _SYS_USER_H	1
-
-/* The whole purpose of this file is for GDB and GDB only.  Don't read
-   too much into it.  Don't use it for anything other than GDB unless
-   you know what you are doing.  */
-
-struct user_fpregs
-{
-  struct fp_reg
-  {
-    unsigned int sign1:1;
-    unsigned int unused:15;
-    unsigned int sign2:1;
-    unsigned int exponent:14;
-    unsigned int j:1;
-    unsigned int mantissa1:31;
-    unsigned int mantissa0:32;
-  } fpregs[8];
-  unsigned int fpsr:32;
-  unsigned int fpcr:32;
-  unsigned char ftype[8];
-  unsigned int init_flag;
-};
-
-struct user_regs
-{
-  unsigned long int uregs[18];
-};
-
-struct user
-{
-  struct user_regs regs;	/* General registers */
-  int u_fpvalid;		/* True if math co-processor being used. */
-
-  unsigned long int u_tsize;	/* Text segment size (pages). */
-  unsigned long int u_dsize;	/* Data segment size (pages). */
-  unsigned long int u_ssize;	/* Stack segment size (pages). */
-
-  unsigned long start_code;	/* Starting virtual address of text. */
-  unsigned long start_stack;	/* Starting virtual address of stack. */
-
-  long int signal;     		/* Signal that caused the core dump. */
-  int reserved;			/* No longer used */
-  struct user_regs *u_ar0;	/* help gdb to find the general registers. */
-
-  unsigned long magic;		/* uniquely identify a core file */
-  char u_comm[32];		/* User command that was responsible */
-  int u_debugreg[8];
-  struct user_fpregs u_fp;	/* Floating point registers */
-  struct user_fpregs *u_fp0;	/* help gdb to find the FP registers. */
-};
-
-#endif  /* sys/user.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/ustat.h b/openflow/usr/include/arm-linux-gnueabihf/sys/ustat.h
deleted file mode 100644
index b58a1de..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/ustat.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Header describing obsolete `ustat' interface.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * This interface is obsolete.  Use <sys/statfs.h> instead.
- */
-
-#ifndef _SYS_USTAT_H
-#define	_SYS_USTAT_H	1
-
-#include <features.h>
-
-#include <sys/types.h>
-#include <bits/ustat.h>
-
-__BEGIN_DECLS
-
-extern int ustat (__dev_t __dev, struct ustat *__ubuf) __THROW;
-
-__END_DECLS
-
-#endif /* sys/ustat.h */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/utsname.h b/openflow/usr/include/arm-linux-gnueabihf/sys/utsname.h
deleted file mode 100644
index 05682a1..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/utsname.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 4.4 System Identification	<sys/utsname.h>
- */
-
-#ifndef	_SYS_UTSNAME_H
-#define	_SYS_UTSNAME_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#include <bits/utsname.h>
-
-#ifndef _UTSNAME_SYSNAME_LENGTH
-# define _UTSNAME_SYSNAME_LENGTH _UTSNAME_LENGTH
-#endif
-#ifndef _UTSNAME_NODENAME_LENGTH
-# define _UTSNAME_NODENAME_LENGTH _UTSNAME_LENGTH
-#endif
-#ifndef _UTSNAME_RELEASE_LENGTH
-# define _UTSNAME_RELEASE_LENGTH _UTSNAME_LENGTH
-#endif
-#ifndef _UTSNAME_VERSION_LENGTH
-# define _UTSNAME_VERSION_LENGTH _UTSNAME_LENGTH
-#endif
-#ifndef _UTSNAME_MACHINE_LENGTH
-# define _UTSNAME_MACHINE_LENGTH _UTSNAME_LENGTH
-#endif
-
-/* Structure describing the system and machine.  */
-struct utsname
-  {
-    /* Name of the implementation of the operating system.  */
-    char sysname[_UTSNAME_SYSNAME_LENGTH];
-
-    /* Name of this node on the network.  */
-    char nodename[_UTSNAME_NODENAME_LENGTH];
-
-    /* Current release level of this implementation.  */
-    char release[_UTSNAME_RELEASE_LENGTH];
-    /* Current version level of this release.  */
-    char version[_UTSNAME_VERSION_LENGTH];
-
-    /* Name of the hardware type the system is running on.  */
-    char machine[_UTSNAME_MACHINE_LENGTH];
-
-#if _UTSNAME_DOMAIN_LENGTH - 0
-    /* Name of the domain of this node on the network.  */
-# ifdef __USE_GNU
-    char domainname[_UTSNAME_DOMAIN_LENGTH];
-# else
-    char __domainname[_UTSNAME_DOMAIN_LENGTH];
-# endif
-#endif
-  };
-
-#ifdef __USE_MISC
-/* Note that SVID assumes all members have the same size.  */
-# define SYS_NMLN  _UTSNAME_LENGTH
-#endif
-
-
-/* Put information about the system in NAME.  */
-extern int uname (struct utsname *__name) __THROW;
-
-
-__END_DECLS
-
-#endif /* sys/utsname.h  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/vfs.h b/openflow/usr/include/arm-linux-gnueabihf/sys/vfs.h
deleted file mode 100644
index fa22d31..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/vfs.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Other systems declare `struct statfs' et al in <sys/vfs.h>,
-   so we have this file to be compatible with programs expecting it.  */
-
-#include <sys/statfs.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/vlimit.h b/openflow/usr/include/arm-linux-gnueabihf/sys/vlimit.h
deleted file mode 100644
index d21b42d..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/vlimit.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_VLIMIT_H
-#define _SYS_VLIMIT_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* This interface is obsolete, and is superseded by <sys/resource.h>.  */
-
-/* Kinds of resource limit.  */
-enum __vlimit_resource
-{
-  /* Setting this non-zero makes it impossible to raise limits.
-     Only the super-use can set it to zero.
-
-     This is not implemented in recent versions of BSD, nor by
-     the GNU C library.  */
-  LIM_NORAISE,
-
-  /* CPU time available for each process (seconds).  */
-  LIM_CPU,
-
-  /* Largest file which can be created (bytes).  */
-  LIM_FSIZE,
-
-  /* Maximum size of the data segment (bytes).  */
-  LIM_DATA,
-
-  /* Maximum size of the stack segment (bytes).  */
-  LIM_STACK,
-
-  /* Largest core file that will be created (bytes).  */
-  LIM_CORE,
-
-  /* Resident set size (bytes).  */
-  LIM_MAXRSS
-};
-
-/* This means no limit.  */
-#define INFINITY 0x7fffffff
-
-
-/* Set the soft limit for RESOURCE to be VALUE.
-   Returns 0 for success, -1 for failure.  */
-extern int vlimit (enum __vlimit_resource __resource, int __value) __THROW;
-
-
-__END_DECLS
-
-#endif /* sys/vlimit.h  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/vt.h b/openflow/usr/include/arm-linux-gnueabihf/sys/vt.h
deleted file mode 100644
index 834abfb..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/vt.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linux/vt.h>
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/vtimes.h b/openflow/usr/include/arm-linux-gnueabihf/sys/vtimes.h
deleted file mode 100644
index c6af2ba..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/vtimes.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_VTIMES_H
-#define _SYS_VTIMES_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* This interface is obsolete; use `getrusage' instead.  */
-
-/* Granularity of the `vm_utime' and `vm_stime' fields of a `struct vtimes'.
-   (This is the frequency of the machine's power supply, in Hz.)  */
-#define	VTIMES_UNITS_PER_SECOND	60
-
-struct vtimes
-{
-  /* User time used in units of 1/VTIMES_UNITS_PER_SECOND seconds.  */
-  int vm_utime;
-  /* System time used in units of 1/VTIMES_UNITS_PER_SECOND seconds.  */
-  int vm_stime;
-
-  /* Amount of data and stack memory used (kilobyte-seconds).  */
-  unsigned int vm_idsrss;
-  /* Amount of text memory used (kilobyte-seconds).  */
-  unsigned int vm_ixrss;
-  /* Maximum resident set size (text, data, and stack) (kilobytes).  */
-  int vm_maxrss;
-
-  /* Number of hard page faults (i.e. those that required I/O).  */
-  int vm_majflt;
-  /* Number of soft page faults (i.e. those serviced by reclaiming
-     a page from the list of pages awaiting reallocation.  */
-  int vm_minflt;
-
-  /* Number of times a process was swapped out of physical memory.  */
-  int vm_nswap;
-
-  /* Number of input operations via the file system.  Note: This
-     and `ru_oublock' do not include operations with the cache.  */
-  int vm_inblk;
-  /* Number of output operations via the file system.  */
-  int vm_oublk;
-};
-
-/* If CURRENT is not NULL, write statistics for the current process into
-   *CURRENT.  If CHILD is not NULL, write statistics for all terminated child
-   processes into *CHILD.  Returns 0 for success, -1 for failure.  */
-extern int vtimes (struct vtimes * __current, struct vtimes * __child) __THROW;
-
-__END_DECLS
-
-#endif /* sys/vtimes.h  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/wait.h b/openflow/usr/include/arm-linux-gnueabihf/sys/wait.h
deleted file mode 100644
index b983332..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/wait.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 3.2.1 Wait for Process Termination	<sys/wait.h>
- */
-
-#ifndef	_SYS_WAIT_H
-#define	_SYS_WAIT_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#include <signal.h>
-
-/* These macros could also be defined in <stdlib.h>.  */
-#if !defined _STDLIB_H || (!defined __USE_XOPEN && !defined __USE_XOPEN2K8)
-/* This will define the `W*' macros for the flag
-   bits to `waitpid', `wait3', and `wait4'.  */
-# include <bits/waitflags.h>
-
-# ifdef	__USE_MISC
-
-/* Lots of hair to allow traditional BSD use of `union wait'
-   as well as POSIX.1 use of `int' for the status word.  */
-
-#  if defined __GNUC__ && !defined __cplusplus
-#   define __WAIT_INT(status) \
-  (__extension__ (((union { __typeof(status) __in; int __i; }) \
-		   { .__in = (status) }).__i))
-#  else
-#   define __WAIT_INT(status)	(*(const int *) &(status))
-#  endif
-
-/* This is the type of the argument to `wait'.  The funky union
-   causes redeclarations with either `int *' or `union wait *' to be
-   allowed without complaint.  __WAIT_STATUS_DEFN is the type used in
-   the actual function definitions.  */
-
-#  if !defined __GNUC__ || __GNUC__ < 2 || defined __cplusplus
-#   define __WAIT_STATUS	void *
-#   define __WAIT_STATUS_DEFN	void *
-#  else
-/* This works in GCC 2.6.1 and later.  */
-typedef union
-  {
-    union wait *__uptr;
-    int *__iptr;
-  } __WAIT_STATUS __attribute__ ((__transparent_union__));
-#   define __WAIT_STATUS_DEFN	int *
-#  endif
-
-# else /* Don't use misc.  */
-
-#  define __WAIT_INT(status)	(status)
-#  define __WAIT_STATUS		int *
-#  define __WAIT_STATUS_DEFN	int *
-
-# endif /* Use misc.  */
-
-/* This will define all the `__W*' macros.  */
-# include <bits/waitstatus.h>
-
-# define WEXITSTATUS(status)	__WEXITSTATUS (__WAIT_INT (status))
-# define WTERMSIG(status)	__WTERMSIG (__WAIT_INT (status))
-# define WSTOPSIG(status)	__WSTOPSIG (__WAIT_INT (status))
-# define WIFEXITED(status)	__WIFEXITED (__WAIT_INT (status))
-# define WIFSIGNALED(status)	__WIFSIGNALED (__WAIT_INT (status))
-# define WIFSTOPPED(status)	__WIFSTOPPED (__WAIT_INT (status))
-# ifdef __WIFCONTINUED
-#  define WIFCONTINUED(status)	__WIFCONTINUED (__WAIT_INT (status))
-# endif
-#endif	/* <stdlib.h> not included.  */
-
-#ifdef	__USE_MISC
-# define WCOREFLAG		__WCOREFLAG
-# define WCOREDUMP(status)	__WCOREDUMP (__WAIT_INT (status))
-# define W_EXITCODE(ret, sig)	__W_EXITCODE (ret, sig)
-# define W_STOPCODE(sig)	__W_STOPCODE (sig)
-#endif
-
-/* Wait for a child to die.  When one does, put its status in *STAT_LOC
-   and return its process ID.  For errors, return (pid_t) -1.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern __pid_t wait (__WAIT_STATUS __stat_loc);
-
-#ifdef	__USE_MISC
-/* Special values for the PID argument to `waitpid' and `wait4'.  */
-# define WAIT_ANY	(-1)	/* Any process.  */
-# define WAIT_MYPGRP	0	/* Any process in my process group.  */
-#endif
-
-/* Wait for a child matching PID to die.
-   If PID is greater than 0, match any process whose process ID is PID.
-   If PID is (pid_t) -1, match any process.
-   If PID is (pid_t) 0, match any process with the
-   same process group as the current process.
-   If PID is less than -1, match any process whose
-   process group is the absolute value of PID.
-   If the WNOHANG bit is set in OPTIONS, and that child
-   is not already dead, return (pid_t) 0.  If successful,
-   return PID and store the dead child's status in STAT_LOC.
-   Return (pid_t) -1 for errors.  If the WUNTRACED bit is
-   set in OPTIONS, return status for stopped children; otherwise don't.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern __pid_t waitpid (__pid_t __pid, int *__stat_loc, int __options);
-
-#if defined __USE_XOPEN || defined __USE_XOPEN2K8
-# ifndef __id_t_defined
-#  include <bits/types.h>
-typedef __id_t id_t;
-#  define __id_t_defined
-# endif
-
-# define __need_siginfo_t
-# include <bits/siginfo.h>
-
-/* Wait for a childing matching IDTYPE and ID to change the status and
-   place appropriate information in *INFOP.
-   If IDTYPE is P_PID, match any process whose process ID is ID.
-   If IDTYPE is P_PGID, match any process whose process group is ID.
-   If IDTYPE is P_ALL, match any process.
-   If the WNOHANG bit is set in OPTIONS, and that child
-   is not already dead, clear *INFOP and return 0.  If successful, store
-   exit code and status in *INFOP.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int waitid (idtype_t __idtype, __id_t __id, siginfo_t *__infop,
-		   int __options);
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-/* This being here makes the prototypes valid whether or not
-   we have already included <sys/resource.h> to define `struct rusage'.  */
-struct rusage;
-
-/* Wait for a child to exit.  When one does, put its status in *STAT_LOC and
-   return its process ID.  For errors return (pid_t) -1.  If USAGE is not
-   nil, store information about the child's resource usage there.  If the
-   WUNTRACED bit is set in OPTIONS, return status for stopped children;
-   otherwise don't.  */
-extern __pid_t wait3 (__WAIT_STATUS __stat_loc, int __options,
-		      struct rusage * __usage) __THROWNL;
-#endif
-
-#ifdef __USE_MISC
-/* PID is like waitpid.  Other args are like wait3.  */
-extern __pid_t wait4 (__pid_t __pid, __WAIT_STATUS __stat_loc, int __options,
-		      struct rusage *__usage) __THROWNL;
-#endif /* Use misc.  */
-
-
-__END_DECLS
-
-#endif /* sys/wait.h  */
diff --git a/openflow/usr/include/arm-linux-gnueabihf/sys/xattr.h b/openflow/usr/include/arm-linux-gnueabihf/sys/xattr.h
deleted file mode 100644
index 0bdce57..0000000
--- a/openflow/usr/include/arm-linux-gnueabihf/sys/xattr.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SYS_XATTR_H
-#define _SYS_XATTR_H	1
-
-#include <features.h>
-#include <sys/types.h>
-
-
-__BEGIN_DECLS
-
-/* The following constants should be used for the fifth parameter of
-   `*setxattr'.  */
-#ifndef __USE_KERNEL_XATTR_DEFS
-enum
-{
-  XATTR_CREATE = 1,	/* set value, fail if attr already exists.  */
-#define XATTR_CREATE	XATTR_CREATE
-  XATTR_REPLACE = 2	/* set value, fail if attr does not exist.  */
-#define XATTR_REPLACE	XATTR_REPLACE
-};
-#endif
-
-/* Set the attribute NAME of the file pointed to by PATH to VALUE (which
-   is SIZE bytes long).  Return 0 on success, -1 for errors.  */
-extern int setxattr (const char *__path, const char *__name,
-		     const void *__value, size_t __size, int __flags)
-	__THROW;
-
-/* Set the attribute NAME of the file pointed to by PATH to VALUE (which is
-   SIZE bytes long), not following symlinks for the last pathname component.
-   Return 0 on success, -1 for errors.  */
-extern int lsetxattr (const char *__path, const char *__name,
-		      const void *__value, size_t __size, int __flags)
-	__THROW;
-
-/* Set the attribute NAME of the file descriptor FD to VALUE (which is SIZE
-   bytes long).  Return 0 on success, -1 for errors.  */
-extern int fsetxattr (int __fd, const char *__name, const void *__value,
-		      size_t __size, int __flags) __THROW;
-
-/* Get the attribute NAME of the file pointed to by PATH to VALUE (which is
-   SIZE bytes long).  Return 0 on success, -1 for errors.  */
-extern ssize_t getxattr (const char *__path, const char *__name,
-			 void *__value, size_t __size) __THROW;
-
-/* Get the attribute NAME of the file pointed to by PATH to VALUE (which is
-   SIZE bytes long), not following symlinks for the last pathname component.
-   Return 0 on success, -1 for errors.  */
-extern ssize_t lgetxattr (const char *__path, const char *__name,
-			  void *__value, size_t __size) __THROW;
-
-/* Get the attribute NAME of the file descriptor FD to VALUE (which is SIZE
-   bytes long).  Return 0 on success, -1 for errors.  */
-extern ssize_t fgetxattr (int __fd, const char *__name, void *__value,
-			  size_t __size) __THROW;
-
-/* List attributes of the file pointed to by PATH into the user-supplied
-   buffer LIST (which is SIZE bytes big).  Return 0 on success, -1 for
-   errors.  */
-extern ssize_t listxattr (const char *__path, char *__list, size_t __size)
-	__THROW;
-
-/* List attributes of the file pointed to by PATH into the user-supplied
-   buffer LIST (which is SIZE bytes big), not following symlinks for the
-   last pathname component.  Return 0 on success, -1 for errors.  */
-extern ssize_t llistxattr (const char *__path, char *__list, size_t __size)
-	__THROW;
-
-/* List attributes of the file descriptor FD into the user-supplied buffer
-   LIST (which is SIZE bytes big).  Return 0 on success, -1 for errors.  */
-extern ssize_t flistxattr (int __fd, char *__list, size_t __size)
-	__THROW;
-
-/* Remove the attribute NAME from the file pointed to by PATH.  Return 0
-   on success, -1 for errors.  */
-extern int removexattr (const char *__path, const char *__name) __THROW;
-
-/* Remove the attribute NAME from the file pointed to by PATH, not
-   following symlinks for the last pathname component.  Return 0 on
-   success, -1 for errors.  */
-extern int lremovexattr (const char *__path, const char *__name) __THROW;
-
-/* Remove the attribute NAME from the file descriptor FD.  Return 0 on
-   success, -1 for errors.  */
-extern int fremovexattr (int __fd, const char *__name) __THROW;
-
-__END_DECLS
-
-#endif	/* sys/xattr.h  */
diff --git a/openflow/usr/include/arpa/ftp.h b/openflow/usr/include/arpa/ftp.h
deleted file mode 100644
index e5b340d..0000000
--- a/openflow/usr/include/arpa/ftp.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ftp.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _ARPA_FTP_H
-#define	_ARPA_FTP_H 1
-
-/* Definitions for FTP; see RFC-765. */
-
-/*
- * Reply codes.
- */
-#define PRELIM		1	/* positive preliminary */
-#define COMPLETE	2	/* positive completion */
-#define CONTINUE	3	/* positive intermediate */
-#define TRANSIENT	4	/* transient negative completion */
-#define ERROR		5	/* permanent negative completion */
-
-/*
- * Type codes
- */
-#define	TYPE_A		1	/* ASCII */
-#define	TYPE_E		2	/* EBCDIC */
-#define	TYPE_I		3	/* image */
-#define	TYPE_L		4	/* local byte size */
-
-#ifdef FTP_NAMES
-char *typenames[] =  {"0", "ASCII", "EBCDIC", "Image", "Local" };
-#endif
-
-/*
- * Form codes
- */
-#define	FORM_N		1	/* non-print */
-#define	FORM_T		2	/* telnet format effectors */
-#define	FORM_C		3	/* carriage control (ASA) */
-#ifdef FTP_NAMES
-char *formnames[] =  {"0", "Nonprint", "Telnet", "Carriage-control" };
-#endif
-
-/*
- * Structure codes
- */
-#define	STRU_F		1	/* file (no record structure) */
-#define	STRU_R		2	/* record structure */
-#define	STRU_P		3	/* page structure */
-#ifdef FTP_NAMES
-char *strunames[] =  {"0", "File", "Record", "Page" };
-#endif
-
-/*
- * Mode types
- */
-#define	MODE_S		1	/* stream */
-#define	MODE_B		2	/* block */
-#define	MODE_C		3	/* compressed */
-#ifdef FTP_NAMES
-char *modenames[] =  {"0", "Stream", "Block", "Compressed" };
-#endif
-
-/*
- * Record Tokens
- */
-#define	REC_ESC		'\377'	/* Record-mode Escape */
-#define	REC_EOR		'\001'	/* Record-mode End-of-Record */
-#define REC_EOF		'\002'	/* Record-mode End-of-File */
-
-/*
- * Block Header
- */
-#define	BLK_EOR		0x80	/* Block is End-of-Record */
-#define	BLK_EOF		0x40	/* Block is End-of-File */
-#define BLK_ERRORS	0x20	/* Block is suspected of containing errors */
-#define	BLK_RESTART	0x10	/* Block is Restart Marker */
-
-#define	BLK_BYTECOUNT	2	/* Bytes in this block */
-
-#endif /* arpa/ftp.h */
diff --git a/openflow/usr/include/arpa/inet.h b/openflow/usr/include/arpa/inet.h
deleted file mode 100644
index 94d3330..0000000
--- a/openflow/usr/include/arpa/inet.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ARPA_INET_H
-#define	_ARPA_INET_H	1
-
-#include <features.h>
-#include <netinet/in.h>		/* To define `struct in_addr'.  */
-
-/* Type for length arguments in socket calls.  */
-#ifndef __socklen_t_defined
-typedef __socklen_t socklen_t;
-# define __socklen_t_defined
-#endif
-
-__BEGIN_DECLS
-
-/* Convert Internet host address from numbers-and-dots notation in CP
-   into binary data in network byte order.  */
-extern in_addr_t inet_addr (const char *__cp) __THROW;
-
-/* Return the local host address part of the Internet address in IN.  */
-extern in_addr_t inet_lnaof (struct in_addr __in) __THROW;
-
-/* Make Internet host address in network byte order by combining the
-   network number NET with the local address HOST.  */
-extern struct in_addr inet_makeaddr (in_addr_t __net, in_addr_t __host)
-     __THROW;
-
-/* Return network number part of the Internet address IN.  */
-extern in_addr_t inet_netof (struct in_addr __in) __THROW;
-
-/* Extract the network number in network byte order from the address
-   in numbers-and-dots natation starting at CP.  */
-extern in_addr_t inet_network (const char *__cp) __THROW;
-
-/* Convert Internet number in IN to ASCII representation.  The return value
-   is a pointer to an internal array containing the string.  */
-extern char *inet_ntoa (struct in_addr __in) __THROW;
-
-/* Convert from presentation format of an Internet number in buffer
-   starting at CP to the binary network format and store result for
-   interface type AF in buffer starting at BUF.  */
-extern int inet_pton (int __af, const char *__restrict __cp,
-		      void *__restrict __buf) __THROW;
-
-/* Convert a Internet address in binary network format for interface
-   type AF in buffer starting at CP to presentation form and place
-   result in buffer of length LEN astarting at BUF.  */
-extern const char *inet_ntop (int __af, const void *__restrict __cp,
-			      char *__restrict __buf, socklen_t __len)
-     __THROW;
-
-
-/* The following functions are not part of XNS 5.2.  */
-#ifdef __USE_MISC
-/* Convert Internet host address from numbers-and-dots notation in CP
-   into binary data and store the result in the structure INP.  */
-extern int inet_aton (const char *__cp, struct in_addr *__inp) __THROW;
-
-/* Format a network number NET into presentation format and place result
-   in buffer starting at BUF with length of LEN bytes.  */
-extern char *inet_neta (in_addr_t __net, char *__buf, size_t __len) __THROW;
-
-/* Convert network number for interface type AF in buffer starting at
-   CP to presentation format.  The result will specifiy BITS bits of
-   the number.  */
-extern char *inet_net_ntop (int __af, const void *__cp, int __bits,
-			    char *__buf, size_t __len) __THROW;
-
-/* Convert network number for interface type AF from presentation in
-   buffer starting at CP to network format and store result int
-   buffer starting at BUF of size LEN.  */
-extern int inet_net_pton (int __af, const char *__cp,
-			  void *__buf, size_t __len) __THROW;
-
-/* Convert ASCII representation in hexadecimal form of the Internet
-   address to binary form and place result in buffer of length LEN
-   starting at BUF.  */
-extern unsigned int inet_nsap_addr (const char *__cp,
-				    unsigned char *__buf, int __len) __THROW;
-
-/* Convert internet address in binary form in LEN bytes starting at CP
-   a presentation form and place result in BUF.  */
-extern char *inet_nsap_ntoa (int __len, const unsigned char *__cp,
-			     char *__buf) __THROW;
-#endif
-
-__END_DECLS
-
-#endif /* arpa/inet.h */
diff --git a/openflow/usr/include/arpa/nameser.h b/openflow/usr/include/arpa/nameser.h
deleted file mode 100644
index fb8513b..0000000
--- a/openflow/usr/include/arpa/nameser.h
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	$BINDId: nameser.h,v 8.37 2000/03/30 21:16:49 vixie Exp $
- */
-
-#ifndef _ARPA_NAMESER_H_
-#define _ARPA_NAMESER_H_
-
-/*! \file */
-
-#define BIND_4_COMPAT
-
-#include <sys/param.h>
-#if (!defined(BSD)) || (BSD < 199306)
-# include <sys/bitypes.h>
-#else
-# include <sys/types.h>
-#endif
-#include <sys/cdefs.h>
-
-/*%
- * Revision information.  This is the release date in YYYYMMDD format.
- * It can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__NAMESER > 19931104)".  Do not
- * compare for equality; rather, use it to determine whether your libbind.a
- * contains a new enough lib/nameser/ to support the feature you need.
- */
-
-#define __NAMESER	19991006	/*%< New interface version stamp. */
-/*
- * Define constants based on RFC 883, RFC 1034, RFC 1035
- */
-#define NS_PACKETSZ	512	/*%< default UDP packet size */
-#define NS_MAXDNAME	1025	/*%< maximum domain name */
-#define NS_MAXMSG	65535	/*%< maximum message size */
-#define NS_MAXCDNAME	255	/*%< maximum compressed domain name */
-#define NS_MAXLABEL	63	/*%< maximum length of domain label */
-#define NS_HFIXEDSZ	12	/*%< #/bytes of fixed data in header */
-#define NS_QFIXEDSZ	4	/*%< #/bytes of fixed data in query */
-#define NS_RRFIXEDSZ	10	/*%< #/bytes of fixed data in r record */
-#define NS_INT32SZ	4	/*%< #/bytes of data in a u_int32_t */
-#define NS_INT16SZ	2	/*%< #/bytes of data in a u_int16_t */
-#define NS_INT8SZ	1	/*%< #/bytes of data in a u_int8_t */
-#define NS_INADDRSZ	4	/*%< IPv4 T_A */
-#define NS_IN6ADDRSZ	16	/*%< IPv6 T_AAAA */
-#define NS_CMPRSFLGS	0xc0	/*%< Flag bits indicating name compression. */
-#define NS_DEFAULTPORT	53	/*%< For both TCP and UDP. */
-/*
- * These can be expanded with synonyms, just keep ns_parse.c:ns_parserecord()
- * in synch with it.
- */
-typedef enum __ns_sect {
-	ns_s_qd = 0,		/*%< Query: Question. */
-	ns_s_zn = 0,		/*%< Update: Zone. */
-	ns_s_an = 1,		/*%< Query: Answer. */
-	ns_s_pr = 1,		/*%< Update: Prerequisites. */
-	ns_s_ns = 2,		/*%< Query: Name servers. */
-	ns_s_ud = 2,		/*%< Update: Update. */
-	ns_s_ar = 3,		/*%< Query|Update: Additional records. */
-	ns_s_max = 4
-} ns_sect;
-
-/*%
- * This is a message handle.  It is caller allocated and has no dynamic data.
- * This structure is intended to be opaque to all but ns_parse.c, thus the
- * leading _'s on the member names.  Use the accessor functions, not the _'s.
- */
-typedef struct __ns_msg {
-	const u_char	*_msg, *_eom;
-	u_int16_t	_id, _flags, _counts[ns_s_max];
-	const u_char	*_sections[ns_s_max];
-	ns_sect		_sect;
-	int		_rrnum;
-	const u_char	*_msg_ptr;
-} ns_msg;
-
-/* Private data structure - do not use from outside library. */
-struct _ns_flagdata {  int mask, shift;  };
-extern const struct _ns_flagdata _ns_flagdata[];
-
-/* Accessor macros - this is part of the public interface. */
-
-#define ns_msg_id(handle) ((handle)._id + 0)
-#define ns_msg_base(handle) ((handle)._msg + 0)
-#define ns_msg_end(handle) ((handle)._eom + 0)
-#define ns_msg_size(handle) ((handle)._eom - (handle)._msg)
-#define ns_msg_count(handle, section) ((handle)._counts[section] + 0)
-
-/*%
- * This is a parsed record.  It is caller allocated and has no dynamic data.
- */
-typedef	struct __ns_rr {
-	char		name[NS_MAXDNAME];
-	u_int16_t	type;
-	u_int16_t	rr_class;
-	u_int32_t	ttl;
-	u_int16_t	rdlength;
-	const u_char *	rdata;
-} ns_rr;
-
-/* Accessor macros - this is part of the public interface. */
-#define ns_rr_name(rr)	(((rr).name[0] != '\0') ? (rr).name : ".")
-#define ns_rr_type(rr)	((ns_type)((rr).type + 0))
-#define ns_rr_class(rr)	((ns_class)((rr).rr_class + 0))
-#define ns_rr_ttl(rr)	((rr).ttl + 0)
-#define ns_rr_rdlen(rr)	((rr).rdlength + 0)
-#define ns_rr_rdata(rr)	((rr).rdata + 0)
-
-/*%
- * These don't have to be in the same order as in the packet flags word,
- * and they can even overlap in some cases, but they will need to be kept
- * in synch with ns_parse.c:ns_flagdata[].
- */
-typedef enum __ns_flag {
-	ns_f_qr,		/*%< Question/Response. */
-	ns_f_opcode,		/*%< Operation code. */
-	ns_f_aa,		/*%< Authoritative Answer. */
-	ns_f_tc,		/*%< Truncation occurred. */
-	ns_f_rd,		/*%< Recursion Desired. */
-	ns_f_ra,		/*%< Recursion Available. */
-	ns_f_z,			/*%< MBZ. */
-	ns_f_ad,		/*%< Authentic Data (DNSSEC). */
-	ns_f_cd,		/*%< Checking Disabled (DNSSEC). */
-	ns_f_rcode,		/*%< Response code. */
-	ns_f_max
-} ns_flag;
-
-/*%
- * Currently defined opcodes.
- */
-typedef enum __ns_opcode {
-	ns_o_query = 0,		/*%< Standard query. */
-	ns_o_iquery = 1,	/*%< Inverse query (deprecated/unsupported). */
-	ns_o_status = 2,	/*%< Name server status query (unsupported). */
-				/* Opcode 3 is undefined/reserved. */
-	ns_o_notify = 4,	/*%< Zone change notification. */
-	ns_o_update = 5,	/*%< Zone update message. */
-	ns_o_max = 6
-} ns_opcode;
-
-/*%
- * Currently defined response codes.
- */
-typedef	enum __ns_rcode {
-	ns_r_noerror = 0,	/*%< No error occurred. */
-	ns_r_formerr = 1,	/*%< Format error. */
-	ns_r_servfail = 2,	/*%< Server failure. */
-	ns_r_nxdomain = 3,	/*%< Name error. */
-	ns_r_notimpl = 4,	/*%< Unimplemented. */
-	ns_r_refused = 5,	/*%< Operation refused. */
-	/* these are for BIND_UPDATE */
-	ns_r_yxdomain = 6,	/*%< Name exists */
-	ns_r_yxrrset = 7,	/*%< RRset exists */
-	ns_r_nxrrset = 8,	/*%< RRset does not exist */
-	ns_r_notauth = 9,	/*%< Not authoritative for zone */
-	ns_r_notzone = 10,	/*%< Zone of record different from zone section */
-	ns_r_max = 11,
-	/* The following are EDNS extended rcodes */
-	ns_r_badvers = 16,
-	/* The following are TSIG errors */
-	ns_r_badsig = 16,
-	ns_r_badkey = 17,
-	ns_r_badtime = 18
-} ns_rcode;
-
-/* BIND_UPDATE */
-typedef enum __ns_update_operation {
-	ns_uop_delete = 0,
-	ns_uop_add = 1,
-	ns_uop_max = 2
-} ns_update_operation;
-
-/*%
- * This structure is used for TSIG authenticated messages
- */
-struct ns_tsig_key {
-        char name[NS_MAXDNAME], alg[NS_MAXDNAME];
-        unsigned char *data;
-        int len;
-};
-typedef struct ns_tsig_key ns_tsig_key;
-
-/*%
- * This structure is used for TSIG authenticated TCP messages
- */
-struct ns_tcp_tsig_state {
-	int counter;
-	struct dst_key *key;
-	void *ctx;
-	unsigned char sig[NS_PACKETSZ];
-	int siglen;
-};
-typedef struct ns_tcp_tsig_state ns_tcp_tsig_state;
-
-#define NS_TSIG_FUDGE 300
-#define NS_TSIG_TCP_COUNT 100
-#define NS_TSIG_ALG_HMAC_MD5 "HMAC-MD5.SIG-ALG.REG.INT"
-
-#define NS_TSIG_ERROR_NO_TSIG -10
-#define NS_TSIG_ERROR_NO_SPACE -11
-#define NS_TSIG_ERROR_FORMERR -12
-
-/*%
- * Currently defined type values for resources and queries.
- */
-typedef enum __ns_type {
-	ns_t_invalid = 0,	/*%< Cookie. */
-	ns_t_a = 1,		/*%< Host address. */
-	ns_t_ns = 2,		/*%< Authoritative server. */
-	ns_t_md = 3,		/*%< Mail destination. */
-	ns_t_mf = 4,		/*%< Mail forwarder. */
-	ns_t_cname = 5,		/*%< Canonical name. */
-	ns_t_soa = 6,		/*%< Start of authority zone. */
-	ns_t_mb = 7,		/*%< Mailbox domain name. */
-	ns_t_mg = 8,		/*%< Mail group member. */
-	ns_t_mr = 9,		/*%< Mail rename name. */
-	ns_t_null = 10,		/*%< Null resource record. */
-	ns_t_wks = 11,		/*%< Well known service. */
-	ns_t_ptr = 12,		/*%< Domain name pointer. */
-	ns_t_hinfo = 13,	/*%< Host information. */
-	ns_t_minfo = 14,	/*%< Mailbox information. */
-	ns_t_mx = 15,		/*%< Mail routing information. */
-	ns_t_txt = 16,		/*%< Text strings. */
-	ns_t_rp = 17,		/*%< Responsible person. */
-	ns_t_afsdb = 18,	/*%< AFS cell database. */
-	ns_t_x25 = 19,		/*%< X_25 calling address. */
-	ns_t_isdn = 20,		/*%< ISDN calling address. */
-	ns_t_rt = 21,		/*%< Router. */
-	ns_t_nsap = 22,		/*%< NSAP address. */
-	ns_t_nsap_ptr = 23,	/*%< Reverse NSAP lookup (deprecated). */
-	ns_t_sig = 24,		/*%< Security signature. */
-	ns_t_key = 25,		/*%< Security key. */
-	ns_t_px = 26,		/*%< X.400 mail mapping. */
-	ns_t_gpos = 27,		/*%< Geographical position (withdrawn). */
-	ns_t_aaaa = 28,		/*%< Ip6 Address. */
-	ns_t_loc = 29,		/*%< Location Information. */
-	ns_t_nxt = 30,		/*%< Next domain (security). */
-	ns_t_eid = 31,		/*%< Endpoint identifier. */
-	ns_t_nimloc = 32,	/*%< Nimrod Locator. */
-	ns_t_srv = 33,		/*%< Server Selection. */
-	ns_t_atma = 34,		/*%< ATM Address */
-	ns_t_naptr = 35,	/*%< Naming Authority PoinTeR */
-	ns_t_kx = 36,		/*%< Key Exchange */
-	ns_t_cert = 37,		/*%< Certification record */
-	ns_t_a6 = 38,		/*%< IPv6 address (deprecated, use ns_t_aaaa) */
-	ns_t_dname = 39,	/*%< Non-terminal DNAME (for IPv6) */
-	ns_t_sink = 40,		/*%< Kitchen sink (experimentatl) */
-	ns_t_opt = 41,		/*%< EDNS0 option (meta-RR) */
-	ns_t_apl = 42,		/*%< Address prefix list (RFC3123) */
-	ns_t_tkey = 249,	/*%< Transaction key */
-	ns_t_tsig = 250,	/*%< Transaction signature. */
-	ns_t_ixfr = 251,	/*%< Incremental zone transfer. */
-	ns_t_axfr = 252,	/*%< Transfer zone of authority. */
-	ns_t_mailb = 253,	/*%< Transfer mailbox records. */
-	ns_t_maila = 254,	/*%< Transfer mail agent records. */
-	ns_t_any = 255,		/*%< Wildcard match. */
-	ns_t_zxfr = 256,	/*%< BIND-specific, nonstandard. */
-	ns_t_max = 65536
-} ns_type;
-
-/* Exclusively a QTYPE? (not also an RTYPE) */
-#define	ns_t_qt_p(t) (ns_t_xfr_p(t) || (t) == ns_t_any || \
-		      (t) == ns_t_mailb || (t) == ns_t_maila)
-/* Some kind of meta-RR? (not a QTYPE, but also not an RTYPE) */
-#define	ns_t_mrr_p(t) ((t) == ns_t_tsig || (t) == ns_t_opt)
-/* Exclusively an RTYPE? (not also a QTYPE or a meta-RR) */
-#define ns_t_rr_p(t) (!ns_t_qt_p(t) && !ns_t_mrr_p(t))
-#define ns_t_udp_p(t) ((t) != ns_t_axfr && (t) != ns_t_zxfr)
-#define ns_t_xfr_p(t) ((t) == ns_t_axfr || (t) == ns_t_ixfr || \
-		       (t) == ns_t_zxfr)
-
-/*%
- * Values for class field
- */
-typedef enum __ns_class {
-	ns_c_invalid = 0,	/*%< Cookie. */
-	ns_c_in = 1,		/*%< Internet. */
-	ns_c_2 = 2,		/*%< unallocated/unsupported. */
-	ns_c_chaos = 3,		/*%< MIT Chaos-net. */
-	ns_c_hs = 4,		/*%< MIT Hesiod. */
-	/* Query class values which do not appear in resource records */
-	ns_c_none = 254,	/*%< for prereq. sections in update requests */
-	ns_c_any = 255,		/*%< Wildcard match. */
-	ns_c_max = 65536
-} ns_class;
-
-/* DNSSEC constants. */
-
-typedef enum __ns_key_types {
-	ns_kt_rsa = 1,		/*%< key type RSA/MD5 */
-	ns_kt_dh  = 2,		/*%< Diffie Hellman */
-	ns_kt_dsa = 3,		/*%< Digital Signature Standard (MANDATORY) */
-	ns_kt_private = 254	/*%< Private key type starts with OID */
-} ns_key_types;
-
-typedef enum __ns_cert_types {
-	cert_t_pkix = 1,	/*%< PKIX (X.509v3) */
-	cert_t_spki = 2,	/*%< SPKI */
-	cert_t_pgp  = 3,	/*%< PGP */
-	cert_t_url  = 253,	/*%< URL private type */
-	cert_t_oid  = 254	/*%< OID private type */
-} ns_cert_types;
-
-/* Flags field of the KEY RR rdata. */
-#define	NS_KEY_TYPEMASK		0xC000	/*%< Mask for "type" bits */
-#define	NS_KEY_TYPE_AUTH_CONF	0x0000	/*%< Key usable for both */
-#define	NS_KEY_TYPE_CONF_ONLY	0x8000	/*%< Key usable for confidentiality */
-#define	NS_KEY_TYPE_AUTH_ONLY	0x4000	/*%< Key usable for authentication */
-#define	NS_KEY_TYPE_NO_KEY	0xC000	/*%< No key usable for either; no key */
-/* The type bits can also be interpreted independently, as single bits: */
-#define	NS_KEY_NO_AUTH		0x8000	/*%< Key unusable for authentication */
-#define	NS_KEY_NO_CONF		0x4000	/*%< Key unusable for confidentiality */
-#define	NS_KEY_RESERVED2	0x2000	/* Security is *mandatory* if bit=0 */
-#define	NS_KEY_EXTENDED_FLAGS	0x1000	/*%< reserved - must be zero */
-#define	NS_KEY_RESERVED4	0x0800  /*%< reserved - must be zero */
-#define	NS_KEY_RESERVED5	0x0400  /*%< reserved - must be zero */
-#define	NS_KEY_NAME_TYPE	0x0300	/*%< these bits determine the type */
-#define	NS_KEY_NAME_USER	0x0000	/*%< key is assoc. with user */
-#define	NS_KEY_NAME_ENTITY	0x0200	/*%< key is assoc. with entity eg host */
-#define	NS_KEY_NAME_ZONE	0x0100	/*%< key is zone key */
-#define	NS_KEY_NAME_RESERVED	0x0300	/*%< reserved meaning */
-#define	NS_KEY_RESERVED8	0x0080  /*%< reserved - must be zero */
-#define	NS_KEY_RESERVED9	0x0040  /*%< reserved - must be zero */
-#define	NS_KEY_RESERVED10	0x0020  /*%< reserved - must be zero */
-#define	NS_KEY_RESERVED11	0x0010  /*%< reserved - must be zero */
-#define	NS_KEY_SIGNATORYMASK	0x000F	/*%< key can sign RR's of same name */
-#define	NS_KEY_RESERVED_BITMASK ( NS_KEY_RESERVED2 | \
-				  NS_KEY_RESERVED4 | \
-				  NS_KEY_RESERVED5 | \
-				  NS_KEY_RESERVED8 | \
-				  NS_KEY_RESERVED9 | \
-				  NS_KEY_RESERVED10 | \
-				  NS_KEY_RESERVED11 )
-#define NS_KEY_RESERVED_BITMASK2 0xFFFF /*%< no bits defined here */
-/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
-#define	NS_ALG_MD5RSA		1	/*%< MD5 with RSA */
-#define	NS_ALG_DH               2	/*%< Diffie Hellman KEY */
-#define	NS_ALG_DSA              3	/*%< DSA KEY */
-#define	NS_ALG_DSS              NS_ALG_DSA
-#define	NS_ALG_EXPIRE_ONLY	253	/*%< No alg, no security */
-#define	NS_ALG_PRIVATE_OID	254	/*%< Key begins with OID giving alg */
-/* Protocol values  */
-/* value 0 is reserved */
-#define NS_KEY_PROT_TLS         1
-#define NS_KEY_PROT_EMAIL       2
-#define NS_KEY_PROT_DNSSEC      3
-#define NS_KEY_PROT_IPSEC       4
-#define NS_KEY_PROT_ANY		255
-
-/* Signatures */
-#define	NS_MD5RSA_MIN_BITS	 512	/*%< Size of a mod or exp in bits */
-#define	NS_MD5RSA_MAX_BITS	4096
-	/* Total of binary mod and exp */
-#define	NS_MD5RSA_MAX_BYTES	((NS_MD5RSA_MAX_BITS+7/8)*2+3)
-	/* Max length of text sig block */
-#define	NS_MD5RSA_MAX_BASE64	(((NS_MD5RSA_MAX_BYTES+2)/3)*4)
-#define NS_MD5RSA_MIN_SIZE	((NS_MD5RSA_MIN_BITS+7)/8)
-#define NS_MD5RSA_MAX_SIZE	((NS_MD5RSA_MAX_BITS+7)/8)
-
-#define NS_DSA_SIG_SIZE         41
-#define NS_DSA_MIN_SIZE         213
-#define NS_DSA_MAX_BYTES        405
-
-/* Offsets into SIG record rdata to find various values */
-#define	NS_SIG_TYPE	0	/*%< Type flags */
-#define	NS_SIG_ALG	2	/*%< Algorithm */
-#define	NS_SIG_LABELS	3	/*%< How many labels in name */
-#define	NS_SIG_OTTL	4	/*%< Original TTL */
-#define	NS_SIG_EXPIR	8	/*%< Expiration time */
-#define	NS_SIG_SIGNED	12	/*%< Signature time */
-#define	NS_SIG_FOOT	16	/*%< Key footprint */
-#define	NS_SIG_SIGNER	18	/*%< Domain name of who signed it */
-/* How RR types are represented as bit-flags in NXT records */
-#define	NS_NXT_BITS 8
-#define	NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
-#define NS_NXT_MAX 127
-
-/*%
- * EDNS0 extended flags and option codes, host order.
- */
-#define NS_OPT_DNSSEC_OK        0x8000U
-#define NS_OPT_NSID		3
-
-/*%
- * Inline versions of get/put short/long.  Pointer is advanced.
- */
-#define NS_GET16(s, cp) do { \
-	const u_char *t_cp = (const u_char *)(cp); \
-	(s) = ((u_int16_t)t_cp[0] << 8) \
-	    | ((u_int16_t)t_cp[1]) \
-	    ; \
-	(cp) += NS_INT16SZ; \
-} while (0)
-
-#define NS_GET32(l, cp) do { \
-	const u_char *t_cp = (const u_char *)(cp); \
-	(l) = ((u_int32_t)t_cp[0] << 24) \
-	    | ((u_int32_t)t_cp[1] << 16) \
-	    | ((u_int32_t)t_cp[2] << 8) \
-	    | ((u_int32_t)t_cp[3]) \
-	    ; \
-	(cp) += NS_INT32SZ; \
-} while (0)
-
-#define NS_PUT16(s, cp) do { \
-	u_int16_t t_s = (u_int16_t)(s); \
-	u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_s >> 8; \
-	*t_cp   = t_s; \
-	(cp) += NS_INT16SZ; \
-} while (0)
-
-#define NS_PUT32(l, cp) do { \
-	u_int32_t t_l = (u_int32_t)(l); \
-	u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_l >> 24; \
-	*t_cp++ = t_l >> 16; \
-	*t_cp++ = t_l >> 8; \
-	*t_cp   = t_l; \
-	(cp) += NS_INT32SZ; \
-} while (0)
-
-__BEGIN_DECLS
-int		ns_msg_getflag (ns_msg, int) __THROW;
-u_int		ns_get16 (const u_char *) __THROW;
-u_long		ns_get32 (const u_char *) __THROW;
-void		ns_put16 (u_int, u_char *) __THROW;
-void		ns_put32 (u_long, u_char *) __THROW;
-int		ns_initparse (const u_char *, int, ns_msg *) __THROW;
-int		ns_skiprr (const u_char *, const u_char *, ns_sect, int)
-     __THROW;
-int		ns_parserr (ns_msg *, ns_sect, int, ns_rr *) __THROW;
-int		ns_sprintrr (const ns_msg *, const ns_rr *,
-			     const char *, const char *, char *, size_t)
-     __THROW;
-int		ns_sprintrrf (const u_char *, size_t, const char *,
-			      ns_class, ns_type, u_long, const u_char *,
-			      size_t, const char *, const char *,
-			      char *, size_t) __THROW;
-int		ns_format_ttl (u_long, char *, size_t) __THROW;
-int		ns_parse_ttl (const char *, u_long *) __THROW;
-u_int32_t	ns_datetosecs (const char *, int *) __THROW;
-int		ns_name_ntol (const u_char *, u_char *, size_t) __THROW;
-int		ns_name_ntop (const u_char *, char *, size_t) __THROW;
-int		ns_name_pton (const char *, u_char *, size_t) __THROW;
-int		ns_name_unpack (const u_char *, const u_char *,
-				const u_char *, u_char *, size_t) __THROW;
-int		ns_name_pack (const u_char *, u_char *, int,
-			      const u_char **, const u_char **) __THROW;
-int		ns_name_uncompress (const u_char *, const u_char *,
-				    const u_char *, char *, size_t) __THROW;
-int		ns_name_compress (const char *, u_char *, size_t,
-				  const u_char **, const u_char **) __THROW;
-int		ns_name_skip (const u_char **, const u_char *) __THROW;
-void		ns_name_rollback (const u_char *, const u_char **,
-				  const u_char **) __THROW;
-int		ns_sign (u_char *, int *, int, int, void *,
-			 const u_char *, int, u_char *, int *, time_t) __THROW;
-int		ns_sign2 (u_char *, int *, int, int, void *,
-			  const u_char *, int, u_char *, int *, time_t,
-			  u_char **, u_char **) __THROW;
-int		ns_sign_tcp (u_char *, int *, int, int,
-			     ns_tcp_tsig_state *, int) __THROW;
-int		ns_sign_tcp2 (u_char *, int *, int, int,
-			      ns_tcp_tsig_state *, int,
-			      u_char **, u_char **) __THROW;
-int		ns_sign_tcp_init (void *, const u_char *, int,
-				  ns_tcp_tsig_state *) __THROW;
-u_char		*ns_find_tsig (u_char *, u_char *) __THROW;
-int		ns_verify (u_char *, int *, void *, const u_char *, int,
-			   u_char *, int *, time_t *, int) __THROW;
-int		ns_verify_tcp (u_char *, int *, ns_tcp_tsig_state *, int)
-     __THROW;
-int		ns_verify_tcp_init (void *, const u_char *, int,
-				    ns_tcp_tsig_state *) __THROW;
-int		ns_samedomain (const char *, const char *) __THROW;
-int		ns_subdomain (const char *, const char *) __THROW;
-int		ns_makecanon (const char *, char *, size_t) __THROW;
-int		ns_samename (const char *, const char *) __THROW;
-__END_DECLS
-
-#ifdef BIND_4_COMPAT
-#include <arpa/nameser_compat.h>
-#endif
-
-#endif /* !_ARPA_NAMESER_H_ */
-/*! \file */
diff --git a/openflow/usr/include/arpa/nameser_compat.h b/openflow/usr/include/arpa/nameser_compat.h
deleted file mode 100644
index d59c9e4..0000000
--- a/openflow/usr/include/arpa/nameser_compat.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Copyright (c) 1983, 1989
- *    The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*%
- *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	$BINDId: nameser_compat.h,v 8.11 1999/01/02 08:00:58 vixie Exp $
- */
-
-#ifndef _ARPA_NAMESER_COMPAT_
-#define	_ARPA_NAMESER_COMPAT_
-
-#define	__BIND		19950621	/*%< (DEAD) interface version stamp. */
-
-#include <endian.h>
-
-/*%
- * Structure for query header.  The order of the fields is machine- and
- * compiler-dependent, depending on the byte/bit order and the layout
- * of bit fields.  We use bit fields only in int variables, as this
- * is all ANSI requires.  This requires a somewhat confusing rearrangement.
- */
-
-typedef struct {
-	unsigned	id :16;		/*%< query identification number */
-#if BYTE_ORDER == BIG_ENDIAN
-			/* fields in third byte */
-	unsigned	qr: 1;		/*%< response flag */
-	unsigned	opcode: 4;	/*%< purpose of message */
-	unsigned	aa: 1;		/*%< authoritive answer */
-	unsigned	tc: 1;		/*%< truncated message */
-	unsigned	rd: 1;		/*%< recursion desired */
-			/* fields in fourth byte */
-	unsigned	ra: 1;		/*%< recursion available */
-	unsigned	unused :1;	/*%< unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ad: 1;		/*%< authentic data from named */
-	unsigned	cd: 1;		/*%< checking disabled by resolver */
-	unsigned	rcode :4;	/*%< response code */
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
-			/* fields in third byte */
-	unsigned	rd :1;		/*%< recursion desired */
-	unsigned	tc :1;		/*%< truncated message */
-	unsigned	aa :1;		/*%< authoritive answer */
-	unsigned	opcode :4;	/*%< purpose of message */
-	unsigned	qr :1;		/*%< response flag */
-			/* fields in fourth byte */
-	unsigned	rcode :4;	/*%< response code */
-	unsigned	cd: 1;		/*%< checking disabled by resolver */
-	unsigned	ad: 1;		/*%< authentic data from named */
-	unsigned	unused :1;	/*%< unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ra :1;		/*%< recursion available */
-#endif
-			/* remaining bytes */
-	unsigned	qdcount :16;	/*%< number of question entries */
-	unsigned	ancount :16;	/*%< number of answer entries */
-	unsigned	nscount :16;	/*%< number of authority entries */
-	unsigned	arcount :16;	/*%< number of resource entries */
-} HEADER;
-
-#define PACKETSZ	NS_PACKETSZ
-#define MAXDNAME	NS_MAXDNAME
-#define MAXCDNAME	NS_MAXCDNAME
-#define MAXLABEL	NS_MAXLABEL
-#define	HFIXEDSZ	NS_HFIXEDSZ
-#define QFIXEDSZ	NS_QFIXEDSZ
-#define RRFIXEDSZ	NS_RRFIXEDSZ
-#define	INT32SZ		NS_INT32SZ
-#define	INT16SZ		NS_INT16SZ
-#define INT8SZ		NS_INT8SZ
-#define	INADDRSZ	NS_INADDRSZ
-#define	IN6ADDRSZ	NS_IN6ADDRSZ
-#define	INDIR_MASK	NS_CMPRSFLGS
-#define NAMESERVER_PORT	NS_DEFAULTPORT
-
-#define S_ZONE		ns_s_zn
-#define S_PREREQ	ns_s_pr
-#define S_UPDATE	ns_s_ud
-#define S_ADDT		ns_s_ar
-
-#define QUERY		ns_o_query
-#define IQUERY		ns_o_iquery
-#define STATUS		ns_o_status
-#define	NS_NOTIFY_OP	ns_o_notify
-#define	NS_UPDATE_OP	ns_o_update
-
-#define NOERROR		ns_r_noerror
-#define FORMERR		ns_r_formerr
-#define SERVFAIL	ns_r_servfail
-#define NXDOMAIN	ns_r_nxdomain
-#define NOTIMP		ns_r_notimpl
-#define REFUSED		ns_r_refused
-#define YXDOMAIN	ns_r_yxdomain
-#define YXRRSET		ns_r_yxrrset
-#define NXRRSET		ns_r_nxrrset
-#define NOTAUTH		ns_r_notauth
-#define NOTZONE		ns_r_notzone
-/*#define BADSIG		ns_r_badsig*/
-/*#define BADKEY		ns_r_badkey*/
-/*#define BADTIME		ns_r_badtime*/
-
-
-#define DELETE		ns_uop_delete
-#define ADD		ns_uop_add
-
-#define T_A		ns_t_a
-#define T_NS		ns_t_ns
-#define T_MD		ns_t_md
-#define T_MF		ns_t_mf
-#define T_CNAME		ns_t_cname
-#define T_SOA		ns_t_soa
-#define T_MB		ns_t_mb
-#define T_MG		ns_t_mg
-#define T_MR		ns_t_mr
-#define T_NULL		ns_t_null
-#define T_WKS		ns_t_wks
-#define T_PTR		ns_t_ptr
-#define T_HINFO		ns_t_hinfo
-#define T_MINFO		ns_t_minfo
-#define T_MX		ns_t_mx
-#define T_TXT		ns_t_txt
-#define	T_RP		ns_t_rp
-#define T_AFSDB		ns_t_afsdb
-#define T_X25		ns_t_x25
-#define T_ISDN		ns_t_isdn
-#define T_RT		ns_t_rt
-#define T_NSAP		ns_t_nsap
-#define T_NSAP_PTR	ns_t_nsap_ptr
-#define	T_SIG		ns_t_sig
-#define	T_KEY		ns_t_key
-#define	T_PX		ns_t_px
-#define	T_GPOS		ns_t_gpos
-#define	T_AAAA		ns_t_aaaa
-#define	T_LOC		ns_t_loc
-#define	T_NXT		ns_t_nxt
-#define	T_EID		ns_t_eid
-#define	T_NIMLOC	ns_t_nimloc
-#define	T_SRV		ns_t_srv
-#define T_ATMA		ns_t_atma
-#define T_NAPTR		ns_t_naptr
-#define T_A6		ns_t_a6
-#define T_DNAME		ns_t_dname
-#define	T_TSIG		ns_t_tsig
-#define	T_IXFR		ns_t_ixfr
-#define T_AXFR		ns_t_axfr
-#define T_MAILB		ns_t_mailb
-#define T_MAILA		ns_t_maila
-#define T_ANY		ns_t_any
-
-#define C_IN		ns_c_in
-#define C_CHAOS		ns_c_chaos
-#define C_HS		ns_c_hs
-/* BIND_UPDATE */
-#define C_NONE		ns_c_none
-#define C_ANY		ns_c_any
-
-#define	GETSHORT		NS_GET16
-#define	GETLONG			NS_GET32
-#define	PUTSHORT		NS_PUT16
-#define	PUTLONG			NS_PUT32
-
-#endif /* _ARPA_NAMESER_COMPAT_ */
-/*! \file */
diff --git a/openflow/usr/include/arpa/telnet.h b/openflow/usr/include/arpa/telnet.h
deleted file mode 100644
index 3774c89..0000000
--- a/openflow/usr/include/arpa/telnet.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- */
-
-#ifndef _ARPA_TELNET_H
-#define	_ARPA_TELNET_H 1
-
-/*
- * Definitions for the TELNET protocol.
- */
-#define	IAC	255		/* interpret as command: */
-#define	DONT	254		/* you are not to use option */
-#define	DO	253		/* please, you use option */
-#define	WONT	252		/* I won't use option */
-#define	WILL	251		/* I will use option */
-#define	SB	250		/* interpret as subnegotiation */
-#define	GA	249		/* you may reverse the line */
-#define	EL	248		/* erase the current line */
-#define	EC	247		/* erase the current character */
-#define	AYT	246		/* are you there */
-#define	AO	245		/* abort output--but let prog finish */
-#define	IP	244		/* interrupt process--permanently */
-#define	BREAK	243		/* break */
-#define	DM	242		/* data mark--for connect. cleaning */
-#define	NOP	241		/* nop */
-#define	SE	240		/* end sub negotiation */
-#define EOR     239             /* end of record (transparent mode) */
-#define	ABORT	238		/* Abort process */
-#define	SUSP	237		/* Suspend process */
-#define	xEOF	236		/* End of file: EOF is already used... */
-
-#define SYNCH	242		/* for telfunc calls */
-
-#ifdef TELCMDS
-char *telcmds[] = {
-	"EOF", "SUSP", "ABORT", "EOR",
-	"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
-	"EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC", 0,
-};
-#else
-extern char *telcmds[];
-#endif
-
-#define	TELCMD_FIRST	xEOF
-#define	TELCMD_LAST	IAC
-#define	TELCMD_OK(x)	((unsigned int)(x) <= TELCMD_LAST && \
-			 (unsigned int)(x) >= TELCMD_FIRST)
-#define	TELCMD(x)	telcmds[(x)-TELCMD_FIRST]
-
-/* telnet options */
-#define TELOPT_BINARY	0	/* 8-bit data path */
-#define TELOPT_ECHO	1	/* echo */
-#define	TELOPT_RCP	2	/* prepare to reconnect */
-#define	TELOPT_SGA	3	/* suppress go ahead */
-#define	TELOPT_NAMS	4	/* approximate message size */
-#define	TELOPT_STATUS	5	/* give status */
-#define	TELOPT_TM	6	/* timing mark */
-#define	TELOPT_RCTE	7	/* remote controlled transmission and echo */
-#define TELOPT_NAOL 	8	/* negotiate about output line width */
-#define TELOPT_NAOP 	9	/* negotiate about output page size */
-#define TELOPT_NAOCRD	10	/* negotiate about CR disposition */
-#define TELOPT_NAOHTS	11	/* negotiate about horizontal tabstops */
-#define TELOPT_NAOHTD	12	/* negotiate about horizontal tab disposition */
-#define TELOPT_NAOFFD	13	/* negotiate about formfeed disposition */
-#define TELOPT_NAOVTS	14	/* negotiate about vertical tab stops */
-#define TELOPT_NAOVTD	15	/* negotiate about vertical tab disposition */
-#define TELOPT_NAOLFD	16	/* negotiate about output LF disposition */
-#define TELOPT_XASCII	17	/* extended ascii character set */
-#define	TELOPT_LOGOUT	18	/* force logout */
-#define	TELOPT_BM	19	/* byte macro */
-#define	TELOPT_DET	20	/* data entry terminal */
-#define	TELOPT_SUPDUP	21	/* supdup protocol */
-#define	TELOPT_SUPDUPOUTPUT 22	/* supdup output */
-#define	TELOPT_SNDLOC	23	/* send location */
-#define	TELOPT_TTYPE	24	/* terminal type */
-#define	TELOPT_EOR	25	/* end or record */
-#define	TELOPT_TUID	26	/* TACACS user identification */
-#define	TELOPT_OUTMRK	27	/* output marking */
-#define	TELOPT_TTYLOC	28	/* terminal location number */
-#define	TELOPT_3270REGIME 29	/* 3270 regime */
-#define	TELOPT_X3PAD	30	/* X.3 PAD */
-#define	TELOPT_NAWS	31	/* window size */
-#define	TELOPT_TSPEED	32	/* terminal speed */
-#define	TELOPT_LFLOW	33	/* remote flow control */
-#define TELOPT_LINEMODE	34	/* Linemode option */
-#define TELOPT_XDISPLOC	35	/* X Display Location */
-#define TELOPT_OLD_ENVIRON 36	/* Old - Environment variables */
-#define	TELOPT_AUTHENTICATION 37/* Authenticate */
-#define	TELOPT_ENCRYPT	38	/* Encryption option */
-#define TELOPT_NEW_ENVIRON 39	/* New - Environment variables */
-#define	TELOPT_EXOPL	255	/* extended-options-list */
-
-
-#define	NTELOPTS	(1+TELOPT_NEW_ENVIRON)
-#ifdef TELOPTS
-char *telopts[NTELOPTS+1] = {
-	"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
-	"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
-	"NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
-	"NAOVTD", "NAOLFD", "EXTEND ASCII", "LOGOUT", "BYTE MACRO",
-	"DATA ENTRY TERMINAL", "SUPDUP", "SUPDUP OUTPUT",
-	"SEND LOCATION", "TERMINAL TYPE", "END OF RECORD",
-	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
-	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
-	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
-	"ENCRYPT", "NEW-ENVIRON",
-	0,
-};
-#define	TELOPT_FIRST	TELOPT_BINARY
-#define	TELOPT_LAST	TELOPT_NEW_ENVIRON
-#define	TELOPT_OK(x)	((unsigned int)(x) <= TELOPT_LAST)
-#define	TELOPT(x)	telopts[(x)-TELOPT_FIRST]
-#endif
-
-/* sub-option qualifiers */
-#define	TELQUAL_IS	0	/* option is... */
-#define	TELQUAL_SEND	1	/* send option */
-#define	TELQUAL_INFO	2	/* ENVIRON: informational version of IS */
-#define	TELQUAL_REPLY	2	/* AUTHENTICATION: client version of IS */
-#define	TELQUAL_NAME	3	/* AUTHENTICATION: client version of IS */
-
-#define	LFLOW_OFF		0	/* Disable remote flow control */
-#define	LFLOW_ON		1	/* Enable remote flow control */
-#define	LFLOW_RESTART_ANY	2	/* Restart output on any char */
-#define	LFLOW_RESTART_XON	3	/* Restart output only on XON */
-
-/*
- * LINEMODE suboptions
- */
-
-#define	LM_MODE		1
-#define	LM_FORWARDMASK	2
-#define	LM_SLC		3
-
-#define	MODE_EDIT	0x01
-#define	MODE_TRAPSIG	0x02
-#define	MODE_ACK	0x04
-#define MODE_SOFT_TAB	0x08
-#define MODE_LIT_ECHO	0x10
-
-#define	MODE_MASK	0x1f
-
-/* Not part of protocol, but needed to simplify things... */
-#define MODE_FLOW		0x0100
-#define MODE_ECHO		0x0200
-#define MODE_INBIN		0x0400
-#define MODE_OUTBIN		0x0800
-#define MODE_FORCE		0x1000
-
-#define	SLC_SYNCH	1
-#define	SLC_BRK		2
-#define	SLC_IP		3
-#define	SLC_AO		4
-#define	SLC_AYT		5
-#define	SLC_EOR		6
-#define	SLC_ABORT	7
-#define	SLC_EOF		8
-#define	SLC_SUSP	9
-#define	SLC_EC		10
-#define	SLC_EL		11
-#define	SLC_EW		12
-#define	SLC_RP		13
-#define	SLC_LNEXT	14
-#define	SLC_XON		15
-#define	SLC_XOFF	16
-#define	SLC_FORW1	17
-#define	SLC_FORW2	18
-
-#define	NSLC		18
-
-/*
- * For backwards compatibility, we define SLC_NAMES to be the
- * list of names if SLC_NAMES is not defined.
- */
-#define	SLC_NAMELIST	"0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR", \
-			"ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP", \
-			"LNEXT", "XON", "XOFF", "FORW1", "FORW2", 0,
-#ifdef	SLC_NAMES
-char *slc_names[] = {
-	SLC_NAMELIST
-};
-#else
-extern char *slc_names[];
-#define	SLC_NAMES SLC_NAMELIST
-#endif
-
-#define	SLC_NAME_OK(x)	((unsigned int)(x) <= NSLC)
-#define SLC_NAME(x)	slc_names[x]
-
-#define	SLC_NOSUPPORT	0
-#define	SLC_CANTCHANGE	1
-#define	SLC_VARIABLE	2
-#define	SLC_DEFAULT	3
-#define	SLC_LEVELBITS	0x03
-
-#define	SLC_FUNC	0
-#define	SLC_FLAGS	1
-#define	SLC_VALUE	2
-
-#define	SLC_ACK		0x80
-#define	SLC_FLUSHIN	0x40
-#define	SLC_FLUSHOUT	0x20
-
-#define	OLD_ENV_VAR	1
-#define	OLD_ENV_VALUE	0
-#define	NEW_ENV_VAR	0
-#define	NEW_ENV_VALUE	1
-#define	ENV_ESC		2
-#define ENV_USERVAR	3
-
-/*
- * AUTHENTICATION suboptions
- */
-
-/*
- * Who is authenticating who ...
- */
-#define	AUTH_WHO_CLIENT		0	/* Client authenticating server */
-#define	AUTH_WHO_SERVER		1	/* Server authenticating client */
-#define	AUTH_WHO_MASK		1
-
-/*
- * amount of authentication done
- */
-#define	AUTH_HOW_ONE_WAY	0
-#define	AUTH_HOW_MUTUAL		2
-#define	AUTH_HOW_MASK		2
-
-#define	AUTHTYPE_NULL		0
-#define	AUTHTYPE_KERBEROS_V4	1
-#define	AUTHTYPE_KERBEROS_V5	2
-#define	AUTHTYPE_SPX		3
-#define	AUTHTYPE_MINK		4
-#define	AUTHTYPE_CNT		5
-
-#define	AUTHTYPE_TEST		99
-
-#ifdef	AUTH_NAMES
-char *authtype_names[] = {
-	"NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK", 0,
-};
-#else
-extern char *authtype_names[];
-#endif
-
-#define	AUTHTYPE_NAME_OK(x)	((unsigned int)(x) < AUTHTYPE_CNT)
-#define	AUTHTYPE_NAME(x)	authtype_names[x]
-
-/*
- * ENCRYPTion suboptions
- */
-#define	ENCRYPT_IS		0	/* I pick encryption type ... */
-#define	ENCRYPT_SUPPORT		1	/* I support encryption types ... */
-#define	ENCRYPT_REPLY		2	/* Initial setup response */
-#define	ENCRYPT_START		3	/* Am starting to send encrypted */
-#define	ENCRYPT_END		4	/* Am ending encrypted */
-#define	ENCRYPT_REQSTART	5	/* Request you start encrypting */
-#define	ENCRYPT_REQEND		6	/* Request you send encrypting */
-#define	ENCRYPT_ENC_KEYID	7
-#define	ENCRYPT_DEC_KEYID	8
-#define	ENCRYPT_CNT		9
-
-#define	ENCTYPE_ANY		0
-#define	ENCTYPE_DES_CFB64	1
-#define	ENCTYPE_DES_OFB64	2
-#define	ENCTYPE_CNT		3
-
-#ifdef	ENCRYPT_NAMES
-char *encrypt_names[] = {
-	"IS", "SUPPORT", "REPLY", "START", "END",
-	"REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
-	0,
-};
-char *enctype_names[] = {
-	"ANY", "DES_CFB64",  "DES_OFB64",  0,
-};
-#else
-extern char *encrypt_names[];
-extern char *enctype_names[];
-#endif
-
-
-#define	ENCRYPT_NAME_OK(x)	((unsigned int)(x) < ENCRYPT_CNT)
-#define	ENCRYPT_NAME(x)		encrypt_names[x]
-
-#define	ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
-#define	ENCTYPE_NAME(x)		enctype_names[x]
-
-#endif /* arpa/telnet.h */
diff --git a/openflow/usr/include/arpa/tftp.h b/openflow/usr/include/arpa/tftp.h
deleted file mode 100644
index 86e0b6e..0000000
--- a/openflow/usr/include/arpa/tftp.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tftp.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _ARPA_TFTP_H
-#define	_ARPA_TFTP_H 1
-
-/*
- * Trivial File Transfer Protocol (IEN-133)
- */
-#define	SEGSIZE		512		/* data segment size */
-
-/*
- * Packet types.
- */
-#define	RRQ	01				/* read request */
-#define	WRQ	02				/* write request */
-#define	DATA	03				/* data packet */
-#define	ACK	04				/* acknowledgement */
-#define	ERROR	05				/* error code */
-
-struct	tftphdr {
-	short	th_opcode;			/* packet type */
-	union {
-		char	tu_padding[3];		/* sizeof() compat */
-		struct {
-			union {
-				unsigned short	tu_block;	/* block # */
-				short	tu_code;		/* error code */
-			} __attribute__ ((__packed__)) th_u3;
-			char tu_data[0];	/* data or error string */
-		} __attribute__ ((__packed__)) th_u2;
-		char	tu_stuff[0];		/* request packet stuff */
-	} __attribute__ ((__packed__)) th_u1;
-} __attribute__ ((__packed__));
-
-#define	th_block	th_u1.th_u2.th_u3.tu_block
-#define	th_code		th_u1.th_u2.th_u3.tu_code
-#define	th_stuff	th_u1.tu_stuff
-#define	th_data		th_u1.th_u2.tu_data
-#define	th_msg		th_u1.th_u2.tu_data
-
-/*
- * Error codes.
- */
-#define	EUNDEF		0		/* not defined */
-#define	ENOTFOUND	1		/* file not found */
-#define	EACCESS		2		/* access violation */
-#define	ENOSPACE	3		/* disk full or allocation exceeded */
-#define	EBADOP		4		/* illegal TFTP operation */
-#define	EBADID		5		/* unknown transfer ID */
-#define	EEXISTS		6		/* file already exists */
-#define	ENOUSER		7		/* no such user */
-
-#endif /* arpa/tftp.h */
diff --git a/openflow/usr/include/asm-generic/auxvec.h b/openflow/usr/include/asm-generic/auxvec.h
deleted file mode 100644
index b99573b..0000000
--- a/openflow/usr/include/asm-generic/auxvec.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ASM_GENERIC_AUXVEC_H
-#define __ASM_GENERIC_AUXVEC_H
-/*
- * Not all architectures need their own auxvec.h, the most
- * common definitions are already in linux/auxvec.h.
- */
-
-#endif /* __ASM_GENERIC_AUXVEC_H */
diff --git a/openflow/usr/include/asm-generic/bitsperlong.h b/openflow/usr/include/asm-generic/bitsperlong.h
deleted file mode 100644
index f832c3c..0000000
--- a/openflow/usr/include/asm-generic/bitsperlong.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ASM_GENERIC_BITS_PER_LONG
-#define __ASM_GENERIC_BITS_PER_LONG
-
-/*
- * There seems to be no way of detecting this automatically from user
- * space, so 64 bit architectures should override this in their
- * bitsperlong.h. In particular, an architecture that supports
- * both 32 and 64 bit user space must not rely on CONFIG_64BIT
- * to decide it, but rather check a compiler provided macro.
- */
-#ifndef __BITS_PER_LONG
-#define __BITS_PER_LONG 32
-#endif
-
-#endif /* __ASM_GENERIC_BITS_PER_LONG */
diff --git a/openflow/usr/include/asm-generic/errno-base.h b/openflow/usr/include/asm-generic/errno-base.h
deleted file mode 100644
index 6511597..0000000
--- a/openflow/usr/include/asm-generic/errno-base.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _ASM_GENERIC_ERRNO_BASE_H
-#define _ASM_GENERIC_ERRNO_BASE_H
-
-#define	EPERM		 1	/* Operation not permitted */
-#define	ENOENT		 2	/* No such file or directory */
-#define	ESRCH		 3	/* No such process */
-#define	EINTR		 4	/* Interrupted system call */
-#define	EIO		 5	/* I/O error */
-#define	ENXIO		 6	/* No such device or address */
-#define	E2BIG		 7	/* Argument list too long */
-#define	ENOEXEC		 8	/* Exec format error */
-#define	EBADF		 9	/* Bad file number */
-#define	ECHILD		10	/* No child processes */
-#define	EAGAIN		11	/* Try again */
-#define	ENOMEM		12	/* Out of memory */
-#define	EACCES		13	/* Permission denied */
-#define	EFAULT		14	/* Bad address */
-#define	ENOTBLK		15	/* Block device required */
-#define	EBUSY		16	/* Device or resource busy */
-#define	EEXIST		17	/* File exists */
-#define	EXDEV		18	/* Cross-device link */
-#define	ENODEV		19	/* No such device */
-#define	ENOTDIR		20	/* Not a directory */
-#define	EISDIR		21	/* Is a directory */
-#define	EINVAL		22	/* Invalid argument */
-#define	ENFILE		23	/* File table overflow */
-#define	EMFILE		24	/* Too many open files */
-#define	ENOTTY		25	/* Not a typewriter */
-#define	ETXTBSY		26	/* Text file busy */
-#define	EFBIG		27	/* File too large */
-#define	ENOSPC		28	/* No space left on device */
-#define	ESPIPE		29	/* Illegal seek */
-#define	EROFS		30	/* Read-only file system */
-#define	EMLINK		31	/* Too many links */
-#define	EPIPE		32	/* Broken pipe */
-#define	EDOM		33	/* Math argument out of domain of func */
-#define	ERANGE		34	/* Math result not representable */
-
-#endif
diff --git a/openflow/usr/include/asm-generic/errno.h b/openflow/usr/include/asm-generic/errno.h
deleted file mode 100644
index 88e0914..0000000
--- a/openflow/usr/include/asm-generic/errno.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#ifndef _ASM_GENERIC_ERRNO_H
-#define _ASM_GENERIC_ERRNO_H
-
-#include <asm-generic/errno-base.h>
-
-#define	EDEADLK		35	/* Resource deadlock would occur */
-#define	ENAMETOOLONG	36	/* File name too long */
-#define	ENOLCK		37	/* No record locks available */
-
-/*
- * This error code is special: arch syscall entry code will return
- * -ENOSYS if users try to call a syscall that doesn't exist.  To keep
- * failures of syscalls that really do exist distinguishable from
- * failures due to attempts to use a nonexistent syscall, syscall
- * implementations should refrain from returning -ENOSYS.
- */
-#define	ENOSYS		38	/* Invalid system call number */
-
-#define	ENOTEMPTY	39	/* Directory not empty */
-#define	ELOOP		40	/* Too many symbolic links encountered */
-#define	EWOULDBLOCK	EAGAIN	/* Operation would block */
-#define	ENOMSG		42	/* No message of desired type */
-#define	EIDRM		43	/* Identifier removed */
-#define	ECHRNG		44	/* Channel number out of range */
-#define	EL2NSYNC	45	/* Level 2 not synchronized */
-#define	EL3HLT		46	/* Level 3 halted */
-#define	EL3RST		47	/* Level 3 reset */
-#define	ELNRNG		48	/* Link number out of range */
-#define	EUNATCH		49	/* Protocol driver not attached */
-#define	ENOCSI		50	/* No CSI structure available */
-#define	EL2HLT		51	/* Level 2 halted */
-#define	EBADE		52	/* Invalid exchange */
-#define	EBADR		53	/* Invalid request descriptor */
-#define	EXFULL		54	/* Exchange full */
-#define	ENOANO		55	/* No anode */
-#define	EBADRQC		56	/* Invalid request code */
-#define	EBADSLT		57	/* Invalid slot */
-
-#define	EDEADLOCK	EDEADLK
-
-#define	EBFONT		59	/* Bad font file format */
-#define	ENOSTR		60	/* Device not a stream */
-#define	ENODATA		61	/* No data available */
-#define	ETIME		62	/* Timer expired */
-#define	ENOSR		63	/* Out of streams resources */
-#define	ENONET		64	/* Machine is not on the network */
-#define	ENOPKG		65	/* Package not installed */
-#define	EREMOTE		66	/* Object is remote */
-#define	ENOLINK		67	/* Link has been severed */
-#define	EADV		68	/* Advertise error */
-#define	ESRMNT		69	/* Srmount error */
-#define	ECOMM		70	/* Communication error on send */
-#define	EPROTO		71	/* Protocol error */
-#define	EMULTIHOP	72	/* Multihop attempted */
-#define	EDOTDOT		73	/* RFS specific error */
-#define	EBADMSG		74	/* Not a data message */
-#define	EOVERFLOW	75	/* Value too large for defined data type */
-#define	ENOTUNIQ	76	/* Name not unique on network */
-#define	EBADFD		77	/* File descriptor in bad state */
-#define	EREMCHG		78	/* Remote address changed */
-#define	ELIBACC		79	/* Can not access a needed shared library */
-#define	ELIBBAD		80	/* Accessing a corrupted shared library */
-#define	ELIBSCN		81	/* .lib section in a.out corrupted */
-#define	ELIBMAX		82	/* Attempting to link in too many shared libraries */
-#define	ELIBEXEC	83	/* Cannot exec a shared library directly */
-#define	EILSEQ		84	/* Illegal byte sequence */
-#define	ERESTART	85	/* Interrupted system call should be restarted */
-#define	ESTRPIPE	86	/* Streams pipe error */
-#define	EUSERS		87	/* Too many users */
-#define	ENOTSOCK	88	/* Socket operation on non-socket */
-#define	EDESTADDRREQ	89	/* Destination address required */
-#define	EMSGSIZE	90	/* Message too long */
-#define	EPROTOTYPE	91	/* Protocol wrong type for socket */
-#define	ENOPROTOOPT	92	/* Protocol not available */
-#define	EPROTONOSUPPORT	93	/* Protocol not supported */
-#define	ESOCKTNOSUPPORT	94	/* Socket type not supported */
-#define	EOPNOTSUPP	95	/* Operation not supported on transport endpoint */
-#define	EPFNOSUPPORT	96	/* Protocol family not supported */
-#define	EAFNOSUPPORT	97	/* Address family not supported by protocol */
-#define	EADDRINUSE	98	/* Address already in use */
-#define	EADDRNOTAVAIL	99	/* Cannot assign requested address */
-#define	ENETDOWN	100	/* Network is down */
-#define	ENETUNREACH	101	/* Network is unreachable */
-#define	ENETRESET	102	/* Network dropped connection because of reset */
-#define	ECONNABORTED	103	/* Software caused connection abort */
-#define	ECONNRESET	104	/* Connection reset by peer */
-#define	ENOBUFS		105	/* No buffer space available */
-#define	EISCONN		106	/* Transport endpoint is already connected */
-#define	ENOTCONN	107	/* Transport endpoint is not connected */
-#define	ESHUTDOWN	108	/* Cannot send after transport endpoint shutdown */
-#define	ETOOMANYREFS	109	/* Too many references: cannot splice */
-#define	ETIMEDOUT	110	/* Connection timed out */
-#define	ECONNREFUSED	111	/* Connection refused */
-#define	EHOSTDOWN	112	/* Host is down */
-#define	EHOSTUNREACH	113	/* No route to host */
-#define	EALREADY	114	/* Operation already in progress */
-#define	EINPROGRESS	115	/* Operation now in progress */
-#define	ESTALE		116	/* Stale file handle */
-#define	EUCLEAN		117	/* Structure needs cleaning */
-#define	ENOTNAM		118	/* Not a XENIX named type file */
-#define	ENAVAIL		119	/* No XENIX semaphores available */
-#define	EISNAM		120	/* Is a named type file */
-#define	EREMOTEIO	121	/* Remote I/O error */
-#define	EDQUOT		122	/* Quota exceeded */
-
-#define	ENOMEDIUM	123	/* No medium found */
-#define	EMEDIUMTYPE	124	/* Wrong medium type */
-#define	ECANCELED	125	/* Operation Canceled */
-#define	ENOKEY		126	/* Required key not available */
-#define	EKEYEXPIRED	127	/* Key has expired */
-#define	EKEYREVOKED	128	/* Key has been revoked */
-#define	EKEYREJECTED	129	/* Key was rejected by service */
-
-/* for robust mutexes */
-#define	EOWNERDEAD	130	/* Owner died */
-#define	ENOTRECOVERABLE	131	/* State not recoverable */
-
-#define ERFKILL		132	/* Operation not possible due to RF-kill */
-
-#define EHWPOISON	133	/* Memory page has hardware error */
-
-#endif
diff --git a/openflow/usr/include/asm-generic/fcntl.h b/openflow/usr/include/asm-generic/fcntl.h
deleted file mode 100644
index e063eff..0000000
--- a/openflow/usr/include/asm-generic/fcntl.h
+++ /dev/null
@@ -1,220 +0,0 @@
-#ifndef _ASM_GENERIC_FCNTL_H
-#define _ASM_GENERIC_FCNTL_H
-
-#include <linux/types.h>
-
-/*
- * FMODE_EXEC is 0x20
- * FMODE_NONOTIFY is 0x4000000
- * These cannot be used by userspace O_* until internal and external open
- * flags are split.
- * -Eric Paris
- */
-
-/*
- * When introducing new O_* bits, please check its uniqueness in fcntl_init().
- */
-
-#define O_ACCMODE	00000003
-#define O_RDONLY	00000000
-#define O_WRONLY	00000001
-#define O_RDWR		00000002
-#ifndef O_CREAT
-#define O_CREAT		00000100	/* not fcntl */
-#endif
-#ifndef O_EXCL
-#define O_EXCL		00000200	/* not fcntl */
-#endif
-#ifndef O_NOCTTY
-#define O_NOCTTY	00000400	/* not fcntl */
-#endif
-#ifndef O_TRUNC
-#define O_TRUNC		00001000	/* not fcntl */
-#endif
-#ifndef O_APPEND
-#define O_APPEND	00002000
-#endif
-#ifndef O_NONBLOCK
-#define O_NONBLOCK	00004000
-#endif
-#ifndef O_DSYNC
-#define O_DSYNC		00010000	/* used to be O_SYNC, see below */
-#endif
-#ifndef FASYNC
-#define FASYNC		00020000	/* fcntl, for BSD compatibility */
-#endif
-#ifndef O_DIRECT
-#define O_DIRECT	00040000	/* direct disk access hint */
-#endif
-#ifndef O_LARGEFILE
-#define O_LARGEFILE	00100000
-#endif
-#ifndef O_DIRECTORY
-#define O_DIRECTORY	00200000	/* must be a directory */
-#endif
-#ifndef O_NOFOLLOW
-#define O_NOFOLLOW	00400000	/* don't follow links */
-#endif
-#ifndef O_NOATIME
-#define O_NOATIME	01000000
-#endif
-#ifndef O_CLOEXEC
-#define O_CLOEXEC	02000000	/* set close_on_exec */
-#endif
-
-/*
- * Before Linux 2.6.33 only O_DSYNC semantics were implemented, but using
- * the O_SYNC flag.  We continue to use the existing numerical value
- * for O_DSYNC semantics now, but using the correct symbolic name for it.
- * This new value is used to request true Posix O_SYNC semantics.  It is
- * defined in this strange way to make sure applications compiled against
- * new headers get at least O_DSYNC semantics on older kernels.
- *
- * This has the nice side-effect that we can simply test for O_DSYNC
- * wherever we do not care if O_DSYNC or O_SYNC is used.
- *
- * Note: __O_SYNC must never be used directly.
- */
-#ifndef O_SYNC
-#define __O_SYNC	04000000
-#define O_SYNC		(__O_SYNC|O_DSYNC)
-#endif
-
-#ifndef O_PATH
-#define O_PATH		010000000
-#endif
-
-#ifndef __O_TMPFILE
-#define __O_TMPFILE	020000000
-#endif
-
-/* a horrid kludge trying to make sure that this will fail on old kernels */
-#define O_TMPFILE (__O_TMPFILE | O_DIRECTORY)
-#define O_TMPFILE_MASK (__O_TMPFILE | O_DIRECTORY | O_CREAT)      
-
-#ifndef O_NDELAY
-#define O_NDELAY	O_NONBLOCK
-#endif
-
-#define F_DUPFD		0	/* dup */
-#define F_GETFD		1	/* get close_on_exec */
-#define F_SETFD		2	/* set/clear close_on_exec */
-#define F_GETFL		3	/* get file->f_flags */
-#define F_SETFL		4	/* set file->f_flags */
-#ifndef F_GETLK
-#define F_GETLK		5
-#define F_SETLK		6
-#define F_SETLKW	7
-#endif
-#ifndef F_SETOWN
-#define F_SETOWN	8	/* for sockets. */
-#define F_GETOWN	9	/* for sockets. */
-#endif
-#ifndef F_SETSIG
-#define F_SETSIG	10	/* for sockets. */
-#define F_GETSIG	11	/* for sockets. */
-#endif
-
-#ifndef CONFIG_64BIT
-#ifndef F_GETLK64
-#define F_GETLK64	12	/*  using 'struct flock64' */
-#define F_SETLK64	13
-#define F_SETLKW64	14
-#endif
-#endif
-
-#ifndef F_SETOWN_EX
-#define F_SETOWN_EX	15
-#define F_GETOWN_EX	16
-#endif
-
-#ifndef F_GETOWNER_UIDS
-#define F_GETOWNER_UIDS	17
-#endif
-
-/*
- * Open File Description Locks
- *
- * Usually record locks held by a process are released on *any* close and are
- * not inherited across a fork().
- *
- * These cmd values will set locks that conflict with process-associated
- * record  locks, but are "owned" by the open file description, not the
- * process. This means that they are inherited across fork() like BSD (flock)
- * locks, and they are only released automatically when the last reference to
- * the the open file against which they were acquired is put.
- */
-#define F_OFD_GETLK	36
-#define F_OFD_SETLK	37
-#define F_OFD_SETLKW	38
-
-#define F_OWNER_TID	0
-#define F_OWNER_PID	1
-#define F_OWNER_PGRP	2
-
-struct f_owner_ex {
-	int	type;
-	__kernel_pid_t	pid;
-};
-
-/* for F_[GET|SET]FL */
-#define FD_CLOEXEC	1	/* actually anything with low bit set goes */
-
-/* for posix fcntl() and lockf() */
-#ifndef F_RDLCK
-#define F_RDLCK		0
-#define F_WRLCK		1
-#define F_UNLCK		2
-#endif
-
-/* for old implementation of bsd flock () */
-#ifndef F_EXLCK
-#define F_EXLCK		4	/* or 3 */
-#define F_SHLCK		8	/* or 4 */
-#endif
-
-/* operations for bsd flock(), also used by the kernel implementation */
-#define LOCK_SH		1	/* shared lock */
-#define LOCK_EX		2	/* exclusive lock */
-#define LOCK_NB		4	/* or'd with one of the above to prevent
-				   blocking */
-#define LOCK_UN		8	/* remove lock */
-
-#define LOCK_MAND	32	/* This is a mandatory flock ... */
-#define LOCK_READ	64	/* which allows concurrent read operations */
-#define LOCK_WRITE	128	/* which allows concurrent write operations */
-#define LOCK_RW		192	/* which allows concurrent read & write ops */
-
-#define F_LINUX_SPECIFIC_BASE	1024
-
-#ifndef HAVE_ARCH_STRUCT_FLOCK
-#ifndef __ARCH_FLOCK_PAD
-#define __ARCH_FLOCK_PAD
-#endif
-
-struct flock {
-	short	l_type;
-	short	l_whence;
-	__kernel_off_t	l_start;
-	__kernel_off_t	l_len;
-	__kernel_pid_t	l_pid;
-	__ARCH_FLOCK_PAD
-};
-#endif
-
-#ifndef HAVE_ARCH_STRUCT_FLOCK64
-#ifndef __ARCH_FLOCK64_PAD
-#define __ARCH_FLOCK64_PAD
-#endif
-
-struct flock64 {
-	short  l_type;
-	short  l_whence;
-	__kernel_loff_t l_start;
-	__kernel_loff_t l_len;
-	__kernel_pid_t  l_pid;
-	__ARCH_FLOCK64_PAD
-};
-#endif
-
-#endif /* _ASM_GENERIC_FCNTL_H */
diff --git a/openflow/usr/include/asm-generic/int-l64.h b/openflow/usr/include/asm-generic/int-l64.h
deleted file mode 100644
index e271ae2..0000000
--- a/openflow/usr/include/asm-generic/int-l64.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * asm-generic/int-l64.h
- *
- * Integer declarations for architectures which use "long"
- * for 64-bit types.
- */
-
-#ifndef _ASM_GENERIC_INT_L64_H
-#define _ASM_GENERIC_INT_L64_H
-
-#include <asm/bitsperlong.h>
-
-#ifndef __ASSEMBLY__
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-typedef __signed__ long __s64;
-typedef unsigned long __u64;
-
-#endif /* __ASSEMBLY__ */
-
-
-#endif /* _ASM_GENERIC_INT_L64_H */
diff --git a/openflow/usr/include/asm-generic/int-ll64.h b/openflow/usr/include/asm-generic/int-ll64.h
deleted file mode 100644
index 0ede047..0000000
--- a/openflow/usr/include/asm-generic/int-ll64.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * asm-generic/int-ll64.h
- *
- * Integer declarations for architectures which use "long long"
- * for 64-bit types.
- */
-
-#ifndef _ASM_GENERIC_INT_LL64_H
-#define _ASM_GENERIC_INT_LL64_H
-
-#include <asm/bitsperlong.h>
-
-#ifndef __ASSEMBLY__
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-#ifdef __GNUC__
-__extension__ typedef __signed__ long long __s64;
-__extension__ typedef unsigned long long __u64;
-#else
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
-#endif
-
-#endif /* __ASSEMBLY__ */
-
-
-#endif /* _ASM_GENERIC_INT_LL64_H */
diff --git a/openflow/usr/include/asm-generic/ioctl.h b/openflow/usr/include/asm-generic/ioctl.h
deleted file mode 100644
index 0da2c7d..0000000
--- a/openflow/usr/include/asm-generic/ioctl.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef _ASM_GENERIC_IOCTL_H
-#define _ASM_GENERIC_IOCTL_H
-
-/* ioctl command encoding: 32 bits total, command in lower 16 bits,
- * size of the parameter structure in the lower 14 bits of the
- * upper 16 bits.
- * Encoding the size of the parameter structure in the ioctl request
- * is useful for catching programs compiled with old versions
- * and to avoid overwriting user space outside the user buffer area.
- * The highest 2 bits are reserved for indicating the ``access mode''.
- * NOTE: This limits the max parameter size to 16kB -1 !
- */
-
-/*
- * The following is for compatibility across the various Linux
- * platforms.  The generic ioctl numbering scheme doesn't really enforce
- * a type field.  De facto, however, the top 8 bits of the lower 16
- * bits are indeed used as a type field, so we might just as well make
- * this explicit here.  Please be sure to use the decoding macros
- * below from now on.
- */
-#define _IOC_NRBITS	8
-#define _IOC_TYPEBITS	8
-
-/*
- * Let any architecture override either of the following before
- * including this file.
- */
-
-#ifndef _IOC_SIZEBITS
-# define _IOC_SIZEBITS	14
-#endif
-
-#ifndef _IOC_DIRBITS
-# define _IOC_DIRBITS	2
-#endif
-
-#define _IOC_NRMASK	((1 << _IOC_NRBITS)-1)
-#define _IOC_TYPEMASK	((1 << _IOC_TYPEBITS)-1)
-#define _IOC_SIZEMASK	((1 << _IOC_SIZEBITS)-1)
-#define _IOC_DIRMASK	((1 << _IOC_DIRBITS)-1)
-
-#define _IOC_NRSHIFT	0
-#define _IOC_TYPESHIFT	(_IOC_NRSHIFT+_IOC_NRBITS)
-#define _IOC_SIZESHIFT	(_IOC_TYPESHIFT+_IOC_TYPEBITS)
-#define _IOC_DIRSHIFT	(_IOC_SIZESHIFT+_IOC_SIZEBITS)
-
-/*
- * Direction bits, which any architecture can choose to override
- * before including this file.
- */
-
-#ifndef _IOC_NONE
-# define _IOC_NONE	0U
-#endif
-
-#ifndef _IOC_WRITE
-# define _IOC_WRITE	1U
-#endif
-
-#ifndef _IOC_READ
-# define _IOC_READ	2U
-#endif
-
-#define _IOC(dir,type,nr,size) \
-	(((dir)  << _IOC_DIRSHIFT) | \
-	 ((type) << _IOC_TYPESHIFT) | \
-	 ((nr)   << _IOC_NRSHIFT) | \
-	 ((size) << _IOC_SIZESHIFT))
-
-#define _IOC_TYPECHECK(t) (sizeof(t))
-
-/* used to create numbers */
-#define _IO(type,nr)		_IOC(_IOC_NONE,(type),(nr),0)
-#define _IOR(type,nr,size)	_IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOW(type,nr,size)	_IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOWR(type,nr,size)	_IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOR_BAD(type,nr,size)	_IOC(_IOC_READ,(type),(nr),sizeof(size))
-#define _IOW_BAD(type,nr,size)	_IOC(_IOC_WRITE,(type),(nr),sizeof(size))
-#define _IOWR_BAD(type,nr,size)	_IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
-
-/* used to decode ioctl numbers.. */
-#define _IOC_DIR(nr)		(((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)
-#define _IOC_TYPE(nr)		(((nr) >> _IOC_TYPESHIFT) & _IOC_TYPEMASK)
-#define _IOC_NR(nr)		(((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK)
-#define _IOC_SIZE(nr)		(((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK)
-
-/* ...and for the drivers/sound files... */
-
-#define IOC_IN		(_IOC_WRITE << _IOC_DIRSHIFT)
-#define IOC_OUT		(_IOC_READ << _IOC_DIRSHIFT)
-#define IOC_INOUT	((_IOC_WRITE|_IOC_READ) << _IOC_DIRSHIFT)
-#define IOCSIZE_MASK	(_IOC_SIZEMASK << _IOC_SIZESHIFT)
-#define IOCSIZE_SHIFT	(_IOC_SIZESHIFT)
-
-#endif /* _ASM_GENERIC_IOCTL_H */
diff --git a/openflow/usr/include/asm-generic/ioctls.h b/openflow/usr/include/asm-generic/ioctls.h
deleted file mode 100644
index 467cdba..0000000
--- a/openflow/usr/include/asm-generic/ioctls.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef __ASM_GENERIC_IOCTLS_H
-#define __ASM_GENERIC_IOCTLS_H
-
-#include <linux/ioctl.h>
-
-/*
- * These are the most common definitions for tty ioctl numbers.
- * Most of them do not use the recommended _IOC(), but there is
- * probably some source code out there hardcoding the number,
- * so we might as well use them for all new platforms.
- *
- * The architectures that use different values here typically
- * try to be compatible with some Unix variants for the same
- * architecture.
- */
-
-/* 0x54 is just a magic number to make these relatively unique ('T') */
-
-#define TCGETS		0x5401
-#define TCSETS		0x5402
-#define TCSETSW		0x5403
-#define TCSETSF		0x5404
-#define TCGETA		0x5405
-#define TCSETA		0x5406
-#define TCSETAW		0x5407
-#define TCSETAF		0x5408
-#define TCSBRK		0x5409
-#define TCXONC		0x540A
-#define TCFLSH		0x540B
-#define TIOCEXCL	0x540C
-#define TIOCNXCL	0x540D
-#define TIOCSCTTY	0x540E
-#define TIOCGPGRP	0x540F
-#define TIOCSPGRP	0x5410
-#define TIOCOUTQ	0x5411
-#define TIOCSTI		0x5412
-#define TIOCGWINSZ	0x5413
-#define TIOCSWINSZ	0x5414
-#define TIOCMGET	0x5415
-#define TIOCMBIS	0x5416
-#define TIOCMBIC	0x5417
-#define TIOCMSET	0x5418
-#define TIOCGSOFTCAR	0x5419
-#define TIOCSSOFTCAR	0x541A
-#define FIONREAD	0x541B
-#define TIOCINQ		FIONREAD
-#define TIOCLINUX	0x541C
-#define TIOCCONS	0x541D
-#define TIOCGSERIAL	0x541E
-#define TIOCSSERIAL	0x541F
-#define TIOCPKT		0x5420
-#define FIONBIO		0x5421
-#define TIOCNOTTY	0x5422
-#define TIOCSETD	0x5423
-#define TIOCGETD	0x5424
-#define TCSBRKP		0x5425	/* Needed for POSIX tcsendbreak() */
-#define TIOCSBRK	0x5427  /* BSD compatibility */
-#define TIOCCBRK	0x5428  /* BSD compatibility */
-#define TIOCGSID	0x5429  /* Return the session ID of FD */
-#define TCGETS2		_IOR('T', 0x2A, struct termios2)
-#define TCSETS2		_IOW('T', 0x2B, struct termios2)
-#define TCSETSW2	_IOW('T', 0x2C, struct termios2)
-#define TCSETSF2	_IOW('T', 0x2D, struct termios2)
-#define TIOCGRS485	0x542E
-#ifndef TIOCSRS485
-#define TIOCSRS485	0x542F
-#endif
-#define TIOCGPTN	_IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK	_IOW('T', 0x31, int)  /* Lock/unlock Pty */
-#define TIOCGDEV	_IOR('T', 0x32, unsigned int) /* Get primary device node of /dev/console */
-#define TCGETX		0x5432 /* SYS5 TCGETX compatibility */
-#define TCSETX		0x5433
-#define TCSETXF		0x5434
-#define TCSETXW		0x5435
-#define TIOCSIG		_IOW('T', 0x36, int)  /* pty: generate signal */
-#define TIOCVHANGUP	0x5437
-#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */
-#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */
-#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */
-
-#define FIONCLEX	0x5450
-#define FIOCLEX		0x5451
-#define FIOASYNC	0x5452
-#define TIOCSERCONFIG	0x5453
-#define TIOCSERGWILD	0x5454
-#define TIOCSERSWILD	0x5455
-#define TIOCGLCKTRMIOS	0x5456
-#define TIOCSLCKTRMIOS	0x5457
-#define TIOCSERGSTRUCT	0x5458 /* For debugging only */
-#define TIOCSERGETLSR   0x5459 /* Get line status register */
-#define TIOCSERGETMULTI 0x545A /* Get multiport config  */
-#define TIOCSERSETMULTI 0x545B /* Set multiport config */
-
-#define TIOCMIWAIT	0x545C	/* wait for a change on serial input line(s) */
-#define TIOCGICOUNT	0x545D	/* read serial port __inline__ interrupt counts */
-
-/*
- * Some arches already define FIOQSIZE due to a historical
- * conflict with a Hayes modem-specific ioctl value.
- */
-#ifndef FIOQSIZE
-# define FIOQSIZE	0x5460
-#endif
-
-/* Used for packet mode */
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-#define TIOCPKT_IOCTL		64
-
-#define TIOCSER_TEMT	0x01	/* Transmitter physically empty */
-
-#endif /* __ASM_GENERIC_IOCTLS_H */
diff --git a/openflow/usr/include/asm-generic/ipcbuf.h b/openflow/usr/include/asm-generic/ipcbuf.h
deleted file mode 100644
index 3dbcc1e..0000000
--- a/openflow/usr/include/asm-generic/ipcbuf.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __ASM_GENERIC_IPCBUF_H
-#define __ASM_GENERIC_IPCBUF_H
-
-/*
- * The generic ipc64_perm structure:
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * ipc64_perm was originally meant to be architecture specific, but
- * everyone just ended up making identical copies without specific
- * optimizations, so we may just as well all use the same one.
- *
- * Pad space is left for:
- * - 32-bit mode_t on architectures that only had 16 bit
- * - 32-bit seq
- * - 2 miscellaneous 32-bit values
- */
-
-struct ipc64_perm {
-	__kernel_key_t		key;
-	__kernel_uid32_t	uid;
-	__kernel_gid32_t	gid;
-	__kernel_uid32_t	cuid;
-	__kernel_gid32_t	cgid;
-	__kernel_mode_t		mode;
-				/* pad if mode_t is u16: */
-	unsigned char		__pad1[4 - sizeof(__kernel_mode_t)];
-	unsigned short		seq;
-	unsigned short		__pad2;
-	__kernel_ulong_t	__unused1;
-	__kernel_ulong_t	__unused2;
-};
-
-#endif /* __ASM_GENERIC_IPCBUF_H */
diff --git a/openflow/usr/include/asm-generic/kvm_para.h b/openflow/usr/include/asm-generic/kvm_para.h
deleted file mode 100644
index 486f0af..0000000
--- a/openflow/usr/include/asm-generic/kvm_para.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There isn't anything here, but the file must not be empty or patch
- * will delete it.
- */
diff --git a/openflow/usr/include/asm-generic/mman-common.h b/openflow/usr/include/asm-generic/mman-common.h
deleted file mode 100644
index a74dd84..0000000
--- a/openflow/usr/include/asm-generic/mman-common.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef __ASM_GENERIC_MMAN_COMMON_H
-#define __ASM_GENERIC_MMAN_COMMON_H
-
-/*
- Author: Michael S. Tsirkin <mst@mellanox.co.il>, Mellanox Technologies Ltd.
- Based on: asm-xxx/mman.h
-*/
-
-#define PROT_READ	0x1		/* page can be read */
-#define PROT_WRITE	0x2		/* page can be written */
-#define PROT_EXEC	0x4		/* page can be executed */
-#define PROT_SEM	0x8		/* page may be used for atomic ops */
-#define PROT_NONE	0x0		/* page can not be accessed */
-#define PROT_GROWSDOWN	0x01000000	/* mprotect flag: extend change to start of growsdown vma */
-#define PROT_GROWSUP	0x02000000	/* mprotect flag: extend change to end of growsup vma */
-
-#define MAP_SHARED	0x01		/* Share changes */
-#define MAP_PRIVATE	0x02		/* Changes are private */
-#define MAP_TYPE	0x0f		/* Mask for type of mapping */
-#define MAP_FIXED	0x10		/* Interpret addr exactly */
-#define MAP_ANONYMOUS	0x20		/* don't use a file */
-#ifdef CONFIG_MMAP_ALLOW_UNINITIALIZED
-# define MAP_UNINITIALIZED 0x4000000	/* For anonymous mmap, memory could be uninitialized */
-#else
-# define MAP_UNINITIALIZED 0x0		/* Don't support this flag */
-#endif
-
-/*
- * Flags for mlock
- */
-#define MLOCK_ONFAULT	0x01		/* Lock pages in range after they are faulted in, do not prefault */
-
-#define MS_ASYNC	1		/* sync memory asynchronously */
-#define MS_INVALIDATE	2		/* invalidate the caches */
-#define MS_SYNC		4		/* synchronous memory sync */
-
-#define MADV_NORMAL	0		/* no further special treatment */
-#define MADV_RANDOM	1		/* expect random page references */
-#define MADV_SEQUENTIAL	2		/* expect sequential page references */
-#define MADV_WILLNEED	3		/* will need these pages */
-#define MADV_DONTNEED	4		/* don't need these pages */
-
-/* common parameters: try to keep these consistent across architectures */
-#define MADV_REMOVE	9		/* remove these pages & resources */
-#define MADV_DONTFORK	10		/* don't inherit across fork */
-#define MADV_DOFORK	11		/* do inherit across fork */
-#define MADV_HWPOISON	100		/* poison a page for testing */
-#define MADV_SOFT_OFFLINE 101		/* soft offline page for testing */
-
-#define MADV_MERGEABLE   12		/* KSM may merge identical pages */
-#define MADV_UNMERGEABLE 13		/* KSM may not merge identical pages */
-
-#define MADV_HUGEPAGE	14		/* Worth backing with hugepages */
-#define MADV_NOHUGEPAGE	15		/* Not worth backing with hugepages */
-
-#define MADV_DONTDUMP   16		/* Explicity exclude from the core dump,
-					   overrides the coredump filter bits */
-#define MADV_DODUMP	17		/* Clear the MADV_DONTDUMP flag */
-
-/* compatibility flags */
-#define MAP_FILE	0
-
-/*
- * When MAP_HUGETLB is set bits [26:31] encode the log2 of the huge page size.
- * This gives us 6 bits, which is enough until someone invents 128 bit address
- * spaces.
- *
- * Assume these are all power of twos.
- * When 0 use the default page size.
- */
-#define MAP_HUGE_SHIFT	26
-#define MAP_HUGE_MASK	0x3f
-
-#endif /* __ASM_GENERIC_MMAN_COMMON_H */
diff --git a/openflow/usr/include/asm-generic/mman.h b/openflow/usr/include/asm-generic/mman.h
deleted file mode 100644
index 7162cd4..0000000
--- a/openflow/usr/include/asm-generic/mman.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __ASM_GENERIC_MMAN_H
-#define __ASM_GENERIC_MMAN_H
-
-#include <asm-generic/mman-common.h>
-
-#define MAP_GROWSDOWN	0x0100		/* stack-like segment */
-#define MAP_DENYWRITE	0x0800		/* ETXTBSY */
-#define MAP_EXECUTABLE	0x1000		/* mark it as an executable */
-#define MAP_LOCKED	0x2000		/* pages are locked */
-#define MAP_NORESERVE	0x4000		/* don't check for reservations */
-#define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */
-#define MAP_NONBLOCK	0x10000		/* do not block on IO */
-#define MAP_STACK	0x20000		/* give out an address that is best suited for process/thread stacks */
-#define MAP_HUGETLB	0x40000		/* create a huge page mapping */
-
-/* Bits [26:31] are reserved, see mman-common.h for MAP_HUGETLB usage */
-
-#define MCL_CURRENT	1		/* lock all current mappings */
-#define MCL_FUTURE	2		/* lock all future mappings */
-#define MCL_ONFAULT	4		/* lock all pages that are faulted in */
-
-#endif /* __ASM_GENERIC_MMAN_H */
diff --git a/openflow/usr/include/asm-generic/msgbuf.h b/openflow/usr/include/asm-generic/msgbuf.h
deleted file mode 100644
index f55ecc4..0000000
--- a/openflow/usr/include/asm-generic/msgbuf.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __ASM_GENERIC_MSGBUF_H
-#define __ASM_GENERIC_MSGBUF_H
-
-#include <asm/bitsperlong.h>
-/*
- * generic msqid64_ds structure.
- *
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * msqid64_ds was originally meant to be architecture specific, but
- * everyone just ended up making identical copies without specific
- * optimizations, so we may just as well all use the same one.
- *
- * 64 bit architectures typically define a 64 bit __kernel_time_t,
- * so they do not need the first three padding words.
- * On big-endian systems, the padding is in the wrong place.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
-	struct ipc64_perm msg_perm;
-	__kernel_time_t msg_stime;	/* last msgsnd time */
-#if __BITS_PER_LONG != 64
-	unsigned long	__unused1;
-#endif
-	__kernel_time_t msg_rtime;	/* last msgrcv time */
-#if __BITS_PER_LONG != 64
-	unsigned long	__unused2;
-#endif
-	__kernel_time_t msg_ctime;	/* last change time */
-#if __BITS_PER_LONG != 64
-	unsigned long	__unused3;
-#endif
-	__kernel_ulong_t msg_cbytes;	/* current number of bytes on queue */
-	__kernel_ulong_t msg_qnum;	/* number of messages in queue */
-	__kernel_ulong_t msg_qbytes;	/* max number of bytes on queue */
-	__kernel_pid_t msg_lspid;	/* pid of last msgsnd */
-	__kernel_pid_t msg_lrpid;	/* last receive pid */
-	__kernel_ulong_t __unused4;
-	__kernel_ulong_t __unused5;
-};
-
-#endif /* __ASM_GENERIC_MSGBUF_H */
diff --git a/openflow/usr/include/asm-generic/param.h b/openflow/usr/include/asm-generic/param.h
deleted file mode 100644
index bd69ff3..0000000
--- a/openflow/usr/include/asm-generic/param.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __ASM_GENERIC_PARAM_H
-#define __ASM_GENERIC_PARAM_H
-
-#ifndef HZ
-#define HZ 100
-#endif
-
-#ifndef EXEC_PAGESIZE
-#define EXEC_PAGESIZE	4096
-#endif
-
-#ifndef NOGROUP
-#define NOGROUP		(-1)
-#endif
-
-#define MAXHOSTNAMELEN	64	/* max length of hostname */
-
-
-#endif /* __ASM_GENERIC_PARAM_H */
diff --git a/openflow/usr/include/asm-generic/poll.h b/openflow/usr/include/asm-generic/poll.h
deleted file mode 100644
index a969498..0000000
--- a/openflow/usr/include/asm-generic/poll.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef __ASM_GENERIC_POLL_H
-#define __ASM_GENERIC_POLL_H
-
-/* These are specified by iBCS2 */
-#define POLLIN		0x0001
-#define POLLPRI		0x0002
-#define POLLOUT		0x0004
-#define POLLERR		0x0008
-#define POLLHUP		0x0010
-#define POLLNVAL	0x0020
-
-/* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM	0x0040
-#define POLLRDBAND	0x0080
-#ifndef POLLWRNORM
-#define POLLWRNORM	0x0100
-#endif
-#ifndef POLLWRBAND
-#define POLLWRBAND	0x0200
-#endif
-#ifndef POLLMSG
-#define POLLMSG		0x0400
-#endif
-#ifndef POLLREMOVE
-#define POLLREMOVE	0x1000
-#endif
-#ifndef POLLRDHUP
-#define POLLRDHUP       0x2000
-#endif
-
-#define POLLFREE	0x4000	/* currently only for epoll */
-
-#define POLL_BUSY_LOOP	0x8000
-
-struct pollfd {
-	int fd;
-	short events;
-	short revents;
-};
-
-#endif	/* __ASM_GENERIC_POLL_H */
diff --git a/openflow/usr/include/asm-generic/posix_types.h b/openflow/usr/include/asm-generic/posix_types.h
deleted file mode 100644
index fe74fcc..0000000
--- a/openflow/usr/include/asm-generic/posix_types.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef __ASM_GENERIC_POSIX_TYPES_H
-#define __ASM_GENERIC_POSIX_TYPES_H
-
-#include <asm/bitsperlong.h>
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.
- *
- * First the types that are often defined in different ways across
- * architectures, so that you can override them.
- */
-
-#ifndef __kernel_long_t
-typedef long		__kernel_long_t;
-typedef unsigned long	__kernel_ulong_t;
-#endif
-
-#ifndef __kernel_ino_t
-typedef __kernel_ulong_t __kernel_ino_t;
-#endif
-
-#ifndef __kernel_mode_t
-typedef unsigned int	__kernel_mode_t;
-#endif
-
-#ifndef __kernel_pid_t
-typedef int		__kernel_pid_t;
-#endif
-
-#ifndef __kernel_ipc_pid_t
-typedef int		__kernel_ipc_pid_t;
-#endif
-
-#ifndef __kernel_uid_t
-typedef unsigned int	__kernel_uid_t;
-typedef unsigned int	__kernel_gid_t;
-#endif
-
-#ifndef __kernel_suseconds_t
-typedef __kernel_long_t		__kernel_suseconds_t;
-#endif
-
-#ifndef __kernel_daddr_t
-typedef int		__kernel_daddr_t;
-#endif
-
-#ifndef __kernel_uid32_t
-typedef unsigned int	__kernel_uid32_t;
-typedef unsigned int	__kernel_gid32_t;
-#endif
-
-#ifndef __kernel_old_uid_t
-typedef __kernel_uid_t	__kernel_old_uid_t;
-typedef __kernel_gid_t	__kernel_old_gid_t;
-#endif
-
-#ifndef __kernel_old_dev_t
-typedef unsigned int	__kernel_old_dev_t;
-#endif
-
-/*
- * Most 32 bit architectures use "unsigned int" size_t,
- * and all 64 bit architectures use "unsigned long" size_t.
- */
-#ifndef __kernel_size_t
-#if __BITS_PER_LONG != 64
-typedef unsigned int	__kernel_size_t;
-typedef int		__kernel_ssize_t;
-typedef int		__kernel_ptrdiff_t;
-#else
-typedef __kernel_ulong_t __kernel_size_t;
-typedef __kernel_long_t	__kernel_ssize_t;
-typedef __kernel_long_t	__kernel_ptrdiff_t;
-#endif
-#endif
-
-#ifndef __kernel_fsid_t
-typedef struct {
-	int	val[2];
-} __kernel_fsid_t;
-#endif
-
-/*
- * anything below here should be completely generic
- */
-typedef __kernel_long_t	__kernel_off_t;
-typedef long long	__kernel_loff_t;
-typedef __kernel_long_t	__kernel_time_t;
-typedef __kernel_long_t	__kernel_clock_t;
-typedef int		__kernel_timer_t;
-typedef int		__kernel_clockid_t;
-typedef char *		__kernel_caddr_t;
-typedef unsigned short	__kernel_uid16_t;
-typedef unsigned short	__kernel_gid16_t;
-
-#endif /* __ASM_GENERIC_POSIX_TYPES_H */
diff --git a/openflow/usr/include/asm-generic/resource.h b/openflow/usr/include/asm-generic/resource.h
deleted file mode 100644
index 498fd28..0000000
--- a/openflow/usr/include/asm-generic/resource.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef _ASM_GENERIC_RESOURCE_H
-#define _ASM_GENERIC_RESOURCE_H
-
-/*
- * Resource limit IDs
- *
- * ( Compatibility detail: there are architectures that have
- *   a different rlimit ID order in the 5-9 range and want
- *   to keep that order for binary compatibility. The reasons
- *   are historic and all new rlimits are identical across all
- *   arches. If an arch has such special order for some rlimits
- *   then it defines them prior including asm-generic/resource.h. )
- */
-
-#define RLIMIT_CPU		0	/* CPU time in sec */
-#define RLIMIT_FSIZE		1	/* Maximum filesize */
-#define RLIMIT_DATA		2	/* max data size */
-#define RLIMIT_STACK		3	/* max stack size */
-#define RLIMIT_CORE		4	/* max core file size */
-
-#ifndef RLIMIT_RSS
-# define RLIMIT_RSS		5	/* max resident set size */
-#endif
-
-#ifndef RLIMIT_NPROC
-# define RLIMIT_NPROC		6	/* max number of processes */
-#endif
-
-#ifndef RLIMIT_NOFILE
-# define RLIMIT_NOFILE		7	/* max number of open files */
-#endif
-
-#ifndef RLIMIT_MEMLOCK
-# define RLIMIT_MEMLOCK		8	/* max locked-in-memory address space */
-#endif
-
-#ifndef RLIMIT_AS
-# define RLIMIT_AS		9	/* address space limit */
-#endif
-
-#define RLIMIT_LOCKS		10	/* maximum file locks held */
-#define RLIMIT_SIGPENDING	11	/* max number of pending signals */
-#define RLIMIT_MSGQUEUE		12	/* maximum bytes in POSIX mqueues */
-#define RLIMIT_NICE		13	/* max nice prio allowed to raise to
-					   0-39 for nice level 19 .. -20 */
-#define RLIMIT_RTPRIO		14	/* maximum realtime priority */
-#define RLIMIT_RTTIME		15	/* timeout for RT tasks in us */
-#define RLIM_NLIMITS		16
-
-/*
- * SuS says limits have to be unsigned.
- * Which makes a ton more sense anyway.
- *
- * Some architectures override this (for compatibility reasons):
- */
-#ifndef RLIM_INFINITY
-# define RLIM_INFINITY		(~0UL)
-#endif
-
-
-#endif /* _ASM_GENERIC_RESOURCE_H */
diff --git a/openflow/usr/include/asm-generic/sembuf.h b/openflow/usr/include/asm-generic/sembuf.h
deleted file mode 100644
index 4cb2c13..0000000
--- a/openflow/usr/include/asm-generic/sembuf.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef __ASM_GENERIC_SEMBUF_H
-#define __ASM_GENERIC_SEMBUF_H
-
-#include <asm/bitsperlong.h>
-
-/*
- * The semid64_ds structure for x86 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * semid64_ds was originally meant to be architecture specific, but
- * everyone just ended up making identical copies without specific
- * optimizations, so we may just as well all use the same one.
- *
- * 64 bit architectures typically define a 64 bit __kernel_time_t,
- * so they do not need the first two padding words.
- * On big-endian systems, the padding is in the wrong place.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-struct semid64_ds {
-	struct ipc64_perm sem_perm;	/* permissions .. see ipc.h */
-	__kernel_time_t	sem_otime;	/* last semop time */
-#if __BITS_PER_LONG != 64
-	unsigned long	__unused1;
-#endif
-	__kernel_time_t	sem_ctime;	/* last change time */
-#if __BITS_PER_LONG != 64
-	unsigned long	__unused2;
-#endif
-	unsigned long	sem_nsems;	/* no. of semaphores in array */
-	unsigned long	__unused3;
-	unsigned long	__unused4;
-};
-
-#endif /* __ASM_GENERIC_SEMBUF_H */
diff --git a/openflow/usr/include/asm-generic/setup.h b/openflow/usr/include/asm-generic/setup.h
deleted file mode 100644
index 6fc26a5..0000000
--- a/openflow/usr/include/asm-generic/setup.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_GENERIC_SETUP_H
-#define __ASM_GENERIC_SETUP_H
-
-#define COMMAND_LINE_SIZE	512
-
-#endif	/* __ASM_GENERIC_SETUP_H */
diff --git a/openflow/usr/include/asm-generic/shmbuf.h b/openflow/usr/include/asm-generic/shmbuf.h
deleted file mode 100644
index 7e9fb2f..0000000
--- a/openflow/usr/include/asm-generic/shmbuf.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __ASM_GENERIC_SHMBUF_H
-#define __ASM_GENERIC_SHMBUF_H
-
-#include <asm/bitsperlong.h>
-
-/*
- * The shmid64_ds structure for x86 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * shmid64_ds was originally meant to be architecture specific, but
- * everyone just ended up making identical copies without specific
- * optimizations, so we may just as well all use the same one.
- *
- * 64 bit architectures typically define a 64 bit __kernel_time_t,
- * so they do not need the first two padding words.
- * On big-endian systems, the padding is in the wrong place.
- *
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
-	struct ipc64_perm	shm_perm;	/* operation perms */
-	size_t			shm_segsz;	/* size of segment (bytes) */
-	__kernel_time_t		shm_atime;	/* last attach time */
-#if __BITS_PER_LONG != 64
-	unsigned long		__unused1;
-#endif
-	__kernel_time_t		shm_dtime;	/* last detach time */
-#if __BITS_PER_LONG != 64
-	unsigned long		__unused2;
-#endif
-	__kernel_time_t		shm_ctime;	/* last change time */
-#if __BITS_PER_LONG != 64
-	unsigned long		__unused3;
-#endif
-	__kernel_pid_t		shm_cpid;	/* pid of creator */
-	__kernel_pid_t		shm_lpid;	/* pid of last operator */
-	__kernel_ulong_t	shm_nattch;	/* no. of current attaches */
-	__kernel_ulong_t	__unused4;
-	__kernel_ulong_t	__unused5;
-};
-
-struct shminfo64 {
-	__kernel_ulong_t	shmmax;
-	__kernel_ulong_t	shmmin;
-	__kernel_ulong_t	shmmni;
-	__kernel_ulong_t	shmseg;
-	__kernel_ulong_t	shmall;
-	__kernel_ulong_t	__unused1;
-	__kernel_ulong_t	__unused2;
-	__kernel_ulong_t	__unused3;
-	__kernel_ulong_t	__unused4;
-};
-
-#endif /* __ASM_GENERIC_SHMBUF_H */
diff --git a/openflow/usr/include/asm-generic/shmparam.h b/openflow/usr/include/asm-generic/shmparam.h
deleted file mode 100644
index 51a3852..0000000
--- a/openflow/usr/include/asm-generic/shmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_GENERIC_SHMPARAM_H
-#define __ASM_GENERIC_SHMPARAM_H
-
-#define SHMLBA PAGE_SIZE	 /* attach addr a multiple of this */
-
-#endif /* _ASM_GENERIC_SHMPARAM_H */
diff --git a/openflow/usr/include/asm-generic/siginfo.h b/openflow/usr/include/asm-generic/siginfo.h
deleted file mode 100644
index ac972ad..0000000
--- a/openflow/usr/include/asm-generic/siginfo.h
+++ /dev/null
@@ -1,303 +0,0 @@
-#ifndef _ASM_GENERIC_SIGINFO_H
-#define _ASM_GENERIC_SIGINFO_H
-
-
-#include <linux/types.h>
-
-typedef union sigval {
-	int sival_int;
-	void *sival_ptr;
-} sigval_t;
-
-/*
- * This is the size (including padding) of the part of the
- * struct siginfo that is before the union.
- */
-#ifndef __ARCH_SI_PREAMBLE_SIZE
-#define __ARCH_SI_PREAMBLE_SIZE	(3 * sizeof(int))
-#endif
-
-#define SI_MAX_SIZE	128
-#ifndef SI_PAD_SIZE
-#define SI_PAD_SIZE	((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int))
-#endif
-
-#ifndef __ARCH_SI_UID_T
-#define __ARCH_SI_UID_T	__kernel_uid32_t
-#endif
-
-/*
- * The default "si_band" type is "long", as specified by POSIX.
- * However, some architectures want to override this to "int"
- * for historical compatibility reasons, so we allow that.
- */
-#ifndef __ARCH_SI_BAND_T
-#define __ARCH_SI_BAND_T long
-#endif
-
-#ifndef __ARCH_SI_CLOCK_T
-#define __ARCH_SI_CLOCK_T __kernel_clock_t
-#endif
-
-#ifndef __ARCH_SI_ATTRIBUTES
-#define __ARCH_SI_ATTRIBUTES
-#endif
-
-#ifndef HAVE_ARCH_SIGINFO_T
-
-typedef struct siginfo {
-	int si_signo;
-	int si_errno;
-	int si_code;
-
-	union {
-		int _pad[SI_PAD_SIZE];
-
-		/* kill() */
-		struct {
-			__kernel_pid_t _pid;	/* sender's pid */
-			__ARCH_SI_UID_T _uid;	/* sender's uid */
-		} _kill;
-
-		/* POSIX.1b timers */
-		struct {
-			__kernel_timer_t _tid;	/* timer id */
-			int _overrun;		/* overrun count */
-			char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
-			sigval_t _sigval;	/* same as below */
-			int _sys_private;       /* not to be passed to user */
-		} _timer;
-
-		/* POSIX.1b signals */
-		struct {
-			__kernel_pid_t _pid;	/* sender's pid */
-			__ARCH_SI_UID_T _uid;	/* sender's uid */
-			sigval_t _sigval;
-		} _rt;
-
-		/* SIGCHLD */
-		struct {
-			__kernel_pid_t _pid;	/* which child */
-			__ARCH_SI_UID_T _uid;	/* sender's uid */
-			int _status;		/* exit code */
-			__ARCH_SI_CLOCK_T _utime;
-			__ARCH_SI_CLOCK_T _stime;
-		} _sigchld;
-
-		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-		struct {
-			void *_addr; /* faulting insn/memory ref. */
-#ifdef __ARCH_SI_TRAPNO
-			int _trapno;	/* TRAP # which caused the signal */
-#endif
-			short _addr_lsb; /* LSB of the reported address */
-			struct {
-				void *_lower;
-				void *_upper;
-			} _addr_bnd;
-		} _sigfault;
-
-		/* SIGPOLL */
-		struct {
-			__ARCH_SI_BAND_T _band;	/* POLL_IN, POLL_OUT, POLL_MSG */
-			int _fd;
-		} _sigpoll;
-
-		/* SIGSYS */
-		struct {
-			void *_call_addr; /* calling user insn */
-			int _syscall;	/* triggering system call number */
-			unsigned int _arch;	/* AUDIT_ARCH_* of syscall */
-		} _sigsys;
-	} _sifields;
-} __ARCH_SI_ATTRIBUTES siginfo_t;
-
-/* If the arch shares siginfo, then it has SIGSYS. */
-#define __ARCH_SIGSYS
-#endif
-
-/*
- * How these fields are to be accessed.
- */
-#define si_pid		_sifields._kill._pid
-#define si_uid		_sifields._kill._uid
-#define si_tid		_sifields._timer._tid
-#define si_overrun	_sifields._timer._overrun
-#define si_sys_private  _sifields._timer._sys_private
-#define si_status	_sifields._sigchld._status
-#define si_utime	_sifields._sigchld._utime
-#define si_stime	_sifields._sigchld._stime
-#define si_value	_sifields._rt._sigval
-#define si_int		_sifields._rt._sigval.sival_int
-#define si_ptr		_sifields._rt._sigval.sival_ptr
-#define si_addr		_sifields._sigfault._addr
-#ifdef __ARCH_SI_TRAPNO
-#define si_trapno	_sifields._sigfault._trapno
-#endif
-#define si_addr_lsb	_sifields._sigfault._addr_lsb
-#define si_lower	_sifields._sigfault._addr_bnd._lower
-#define si_upper	_sifields._sigfault._addr_bnd._upper
-#define si_band		_sifields._sigpoll._band
-#define si_fd		_sifields._sigpoll._fd
-#ifdef __ARCH_SIGSYS
-#define si_call_addr	_sifields._sigsys._call_addr
-#define si_syscall	_sifields._sigsys._syscall
-#define si_arch		_sifields._sigsys._arch
-#endif
-
-#define __SI_KILL	0
-#define __SI_TIMER	0
-#define __SI_POLL	0
-#define __SI_FAULT	0
-#define __SI_CHLD	0
-#define __SI_RT		0
-#define __SI_MESGQ	0
-#define __SI_SYS	0
-#define __SI_CODE(T,N)	(N)
-
-/*
- * si_code values
- * Digital reserves positive values for kernel-generated signals.
- */
-#define SI_USER		0		/* sent by kill, sigsend, raise */
-#define SI_KERNEL	0x80		/* sent by the kernel from somewhere */
-#define SI_QUEUE	-1		/* sent by sigqueue */
-#define SI_TIMER __SI_CODE(__SI_TIMER,-2) /* sent by timer expiration */
-#define SI_MESGQ __SI_CODE(__SI_MESGQ,-3) /* sent by real time mesq state change */
-#define SI_ASYNCIO	-4		/* sent by AIO completion */
-#define SI_SIGIO	-5		/* sent by queued SIGIO */
-#define SI_TKILL	-6		/* sent by tkill system call */
-#define SI_DETHREAD	-7		/* sent by execve() killing subsidiary threads */
-
-#define SI_FROMUSER(siptr)	((siptr)->si_code <= 0)
-#define SI_FROMKERNEL(siptr)	((siptr)->si_code > 0)
-
-/*
- * SIGILL si_codes
- */
-#define ILL_ILLOPC	(__SI_FAULT|1)	/* illegal opcode */
-#define ILL_ILLOPN	(__SI_FAULT|2)	/* illegal operand */
-#define ILL_ILLADR	(__SI_FAULT|3)	/* illegal addressing mode */
-#define ILL_ILLTRP	(__SI_FAULT|4)	/* illegal trap */
-#define ILL_PRVOPC	(__SI_FAULT|5)	/* privileged opcode */
-#define ILL_PRVREG	(__SI_FAULT|6)	/* privileged register */
-#define ILL_COPROC	(__SI_FAULT|7)	/* coprocessor error */
-#define ILL_BADSTK	(__SI_FAULT|8)	/* internal stack error */
-#define NSIGILL		8
-
-/*
- * SIGFPE si_codes
- */
-#define FPE_INTDIV	(__SI_FAULT|1)	/* integer divide by zero */
-#define FPE_INTOVF	(__SI_FAULT|2)	/* integer overflow */
-#define FPE_FLTDIV	(__SI_FAULT|3)	/* floating point divide by zero */
-#define FPE_FLTOVF	(__SI_FAULT|4)	/* floating point overflow */
-#define FPE_FLTUND	(__SI_FAULT|5)	/* floating point underflow */
-#define FPE_FLTRES	(__SI_FAULT|6)	/* floating point inexact result */
-#define FPE_FLTINV	(__SI_FAULT|7)	/* floating point invalid operation */
-#define FPE_FLTSUB	(__SI_FAULT|8)	/* subscript out of range */
-#define NSIGFPE		8
-
-/*
- * SIGSEGV si_codes
- */
-#define SEGV_MAPERR	(__SI_FAULT|1)	/* address not mapped to object */
-#define SEGV_ACCERR	(__SI_FAULT|2)	/* invalid permissions for mapped object */
-#define SEGV_BNDERR	(__SI_FAULT|3)  /* failed address bound checks */
-#define NSIGSEGV	3
-
-/*
- * SIGBUS si_codes
- */
-#define BUS_ADRALN	(__SI_FAULT|1)	/* invalid address alignment */
-#define BUS_ADRERR	(__SI_FAULT|2)	/* non-existent physical address */
-#define BUS_OBJERR	(__SI_FAULT|3)	/* object specific hardware error */
-/* hardware memory error consumed on a machine check: action required */
-#define BUS_MCEERR_AR	(__SI_FAULT|4)
-/* hardware memory error detected in process but not consumed: action optional*/
-#define BUS_MCEERR_AO	(__SI_FAULT|5)
-#define NSIGBUS		5
-
-/*
- * SIGTRAP si_codes
- */
-#define TRAP_BRKPT	(__SI_FAULT|1)	/* process breakpoint */
-#define TRAP_TRACE	(__SI_FAULT|2)	/* process trace trap */
-#define TRAP_BRANCH     (__SI_FAULT|3)  /* process taken branch trap */
-#define TRAP_HWBKPT     (__SI_FAULT|4)  /* hardware breakpoint/watchpoint */
-#define NSIGTRAP	4
-
-/*
- * SIGCHLD si_codes
- */
-#define CLD_EXITED	(__SI_CHLD|1)	/* child has exited */
-#define CLD_KILLED	(__SI_CHLD|2)	/* child was killed */
-#define CLD_DUMPED	(__SI_CHLD|3)	/* child terminated abnormally */
-#define CLD_TRAPPED	(__SI_CHLD|4)	/* traced child has trapped */
-#define CLD_STOPPED	(__SI_CHLD|5)	/* child has stopped */
-#define CLD_CONTINUED	(__SI_CHLD|6)	/* stopped child has continued */
-#define NSIGCHLD	6
-
-/*
- * SIGPOLL si_codes
- */
-#define POLL_IN		(__SI_POLL|1)	/* data input available */
-#define POLL_OUT	(__SI_POLL|2)	/* output buffers available */
-#define POLL_MSG	(__SI_POLL|3)	/* input message available */
-#define POLL_ERR	(__SI_POLL|4)	/* i/o error */
-#define POLL_PRI	(__SI_POLL|5)	/* high priority input available */
-#define POLL_HUP	(__SI_POLL|6)	/* device disconnected */
-#define NSIGPOLL	6
-
-/*
- * SIGSYS si_codes
- */
-#define SYS_SECCOMP		(__SI_SYS|1)	/* seccomp triggered */
-#define NSIGSYS	1
-
-/*
- * sigevent definitions
- * 
- * It seems likely that SIGEV_THREAD will have to be handled from 
- * userspace, libpthread transmuting it to SIGEV_SIGNAL, which the
- * thread manager then catches and does the appropriate nonsense.
- * However, everything is written out here so as to not get lost.
- */
-#define SIGEV_SIGNAL	0	/* notify via signal */
-#define SIGEV_NONE	1	/* other notification: meaningless */
-#define SIGEV_THREAD	2	/* deliver via thread creation */
-#define SIGEV_THREAD_ID 4	/* deliver to thread */
-
-/*
- * This works because the alignment is ok on all current architectures
- * but we leave open this being overridden in the future
- */
-#ifndef __ARCH_SIGEV_PREAMBLE_SIZE
-#define __ARCH_SIGEV_PREAMBLE_SIZE	(sizeof(int) * 2 + sizeof(sigval_t))
-#endif
-
-#define SIGEV_MAX_SIZE	64
-#define SIGEV_PAD_SIZE	((SIGEV_MAX_SIZE - __ARCH_SIGEV_PREAMBLE_SIZE) \
-		/ sizeof(int))
-
-typedef struct sigevent {
-	sigval_t sigev_value;
-	int sigev_signo;
-	int sigev_notify;
-	union {
-		int _pad[SIGEV_PAD_SIZE];
-		 int _tid;
-
-		struct {
-			void (*_function)(sigval_t);
-			void *_attribute;	/* really pthread_attr_t */
-		} _sigev_thread;
-	} _sigev_un;
-} sigevent_t;
-
-#define sigev_notify_function	_sigev_un._sigev_thread._function
-#define sigev_notify_attributes	_sigev_un._sigev_thread._attribute
-#define sigev_notify_thread_id	 _sigev_un._tid
-
-
-#endif /* _ASM_GENERIC_SIGINFO_H */
diff --git a/openflow/usr/include/asm-generic/signal-defs.h b/openflow/usr/include/asm-generic/signal-defs.h
deleted file mode 100644
index 04cfb6d..0000000
--- a/openflow/usr/include/asm-generic/signal-defs.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __ASM_GENERIC_SIGNAL_DEFS_H
-#define __ASM_GENERIC_SIGNAL_DEFS_H
-
-
-
-#ifndef SIG_BLOCK
-#define SIG_BLOCK          0	/* for blocking signals */
-#endif
-#ifndef SIG_UNBLOCK
-#define SIG_UNBLOCK        1	/* for unblocking signals */
-#endif
-#ifndef SIG_SETMASK
-#define SIG_SETMASK        2	/* for setting the signal mask */
-#endif
-
-#ifndef __ASSEMBLY__
-typedef void __signalfn_t(int);
-typedef __signalfn_t *__sighandler_t;
-
-typedef void __restorefn_t(void);
-typedef __restorefn_t *__sigrestore_t;
-
-#define SIG_DFL	((__sighandler_t)0)	/* default signal handling */
-#define SIG_IGN	((__sighandler_t)1)	/* ignore signal */
-#define SIG_ERR	((__sighandler_t)-1)	/* error return from signal */
-#endif
-
-#endif /* __ASM_GENERIC_SIGNAL_DEFS_H */
diff --git a/openflow/usr/include/asm-generic/signal.h b/openflow/usr/include/asm-generic/signal.h
deleted file mode 100644
index 08c462c..0000000
--- a/openflow/usr/include/asm-generic/signal.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef __ASM_GENERIC_SIGNAL_H
-#define __ASM_GENERIC_SIGNAL_H
-
-#include <linux/types.h>
-
-#define _NSIG		64
-#define _NSIG_BPW	__BITS_PER_LONG
-#define _NSIG_WORDS	(_NSIG / _NSIG_BPW)
-
-#define SIGHUP		 1
-#define SIGINT		 2
-#define SIGQUIT		 3
-#define SIGILL		 4
-#define SIGTRAP		 5
-#define SIGABRT		 6
-#define SIGIOT		 6
-#define SIGBUS		 7
-#define SIGFPE		 8
-#define SIGKILL		 9
-#define SIGUSR1		10
-#define SIGSEGV		11
-#define SIGUSR2		12
-#define SIGPIPE		13
-#define SIGALRM		14
-#define SIGTERM		15
-#define SIGSTKFLT	16
-#define SIGCHLD		17
-#define SIGCONT		18
-#define SIGSTOP		19
-#define SIGTSTP		20
-#define SIGTTIN		21
-#define SIGTTOU		22
-#define SIGURG		23
-#define SIGXCPU		24
-#define SIGXFSZ		25
-#define SIGVTALRM	26
-#define SIGPROF		27
-#define SIGWINCH	28
-#define SIGIO		29
-#define SIGPOLL		SIGIO
-/*
-#define SIGLOST		29
-*/
-#define SIGPWR		30
-#define SIGSYS		31
-#define	SIGUNUSED	31
-
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN	32
-#ifndef SIGRTMAX
-#define SIGRTMAX	_NSIG
-#endif
-
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP	0x00000001
-#define SA_NOCLDWAIT	0x00000002
-#define SA_SIGINFO	0x00000004
-#define SA_ONSTACK	0x08000000
-#define SA_RESTART	0x10000000
-#define SA_NODEFER	0x40000000
-#define SA_RESETHAND	0x80000000
-
-#define SA_NOMASK	SA_NODEFER
-#define SA_ONESHOT	SA_RESETHAND
-
-/*
- * New architectures should not define the obsolete
- *	SA_RESTORER	0x04000000
- */
-
-#if !defined MINSIGSTKSZ || !defined SIGSTKSZ
-#define MINSIGSTKSZ	2048
-#define SIGSTKSZ	8192
-#endif
-
-#ifndef __ASSEMBLY__
-typedef struct {
-	unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-/* not actually used, but required for linux/syscalls.h */
-typedef unsigned long old_sigset_t;
-
-#include <asm-generic/signal-defs.h>
-
-#ifdef SA_RESTORER
-#define __ARCH_HAS_SA_RESTORER
-#endif
-
-struct sigaction {
-	__sighandler_t sa_handler;
-	unsigned long sa_flags;
-#ifdef SA_RESTORER
-	__sigrestore_t sa_restorer;
-#endif
-	sigset_t sa_mask;		/* mask last for extensibility */
-};
-
-typedef struct sigaltstack {
-	void *ss_sp;
-	int ss_flags;
-	size_t ss_size;
-} stack_t;
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ASM_GENERIC_SIGNAL_H */
diff --git a/openflow/usr/include/asm-generic/socket.h b/openflow/usr/include/asm-generic/socket.h
deleted file mode 100644
index 5c15c2a..0000000
--- a/openflow/usr/include/asm-generic/socket.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef __ASM_GENERIC_SOCKET_H
-#define __ASM_GENERIC_SOCKET_H
-
-#include <asm/sockios.h>
-
-/* For setsockopt(2) */
-#define SOL_SOCKET	1
-
-#define SO_DEBUG	1
-#define SO_REUSEADDR	2
-#define SO_TYPE		3
-#define SO_ERROR	4
-#define SO_DONTROUTE	5
-#define SO_BROADCAST	6
-#define SO_SNDBUF	7
-#define SO_RCVBUF	8
-#define SO_SNDBUFFORCE	32
-#define SO_RCVBUFFORCE	33
-#define SO_KEEPALIVE	9
-#define SO_OOBINLINE	10
-#define SO_NO_CHECK	11
-#define SO_PRIORITY	12
-#define SO_LINGER	13
-#define SO_BSDCOMPAT	14
-#define SO_REUSEPORT	15
-#ifndef SO_PASSCRED /* powerpc only differs in these */
-#define SO_PASSCRED	16
-#define SO_PEERCRED	17
-#define SO_RCVLOWAT	18
-#define SO_SNDLOWAT	19
-#define SO_RCVTIMEO	20
-#define SO_SNDTIMEO	21
-#endif
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION		22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT	23
-#define SO_SECURITY_ENCRYPTION_NETWORK		24
-
-#define SO_BINDTODEVICE	25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER	26
-#define SO_DETACH_FILTER	27
-#define SO_GET_FILTER		SO_ATTACH_FILTER
-
-#define SO_PEERNAME		28
-#define SO_TIMESTAMP		29
-#define SCM_TIMESTAMP		SO_TIMESTAMP
-
-#define SO_ACCEPTCONN		30
-
-#define SO_PEERSEC		31
-#define SO_PASSSEC		34
-#define SO_TIMESTAMPNS		35
-#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS
-
-#define SO_MARK			36
-
-#define SO_TIMESTAMPING		37
-#define SCM_TIMESTAMPING	SO_TIMESTAMPING
-
-#define SO_PROTOCOL		38
-#define SO_DOMAIN		39
-
-#define SO_RXQ_OVFL             40
-
-#define SO_WIFI_STATUS		41
-#define SCM_WIFI_STATUS	SO_WIFI_STATUS
-#define SO_PEEK_OFF		42
-
-/* Instruct lower device to use last 4-bytes of skb data as FCS */
-#define SO_NOFCS		43
-
-#define SO_LOCK_FILTER		44
-
-#define SO_SELECT_ERR_QUEUE	45
-
-#define SO_BUSY_POLL		46
-
-#define SO_MAX_PACING_RATE	47
-
-#define SO_BPF_EXTENSIONS	48
-
-#define SO_INCOMING_CPU		49
-
-#define SO_ATTACH_BPF		50
-#define SO_DETACH_BPF		SO_DETACH_FILTER
-
-#endif /* __ASM_GENERIC_SOCKET_H */
diff --git a/openflow/usr/include/asm-generic/sockios.h b/openflow/usr/include/asm-generic/sockios.h
deleted file mode 100644
index 9a61a36..0000000
--- a/openflow/usr/include/asm-generic/sockios.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __ASM_GENERIC_SOCKIOS_H
-#define __ASM_GENERIC_SOCKIOS_H
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN	0x8901
-#define SIOCSPGRP	0x8902
-#define FIOGETOWN	0x8903
-#define SIOCGPGRP	0x8904
-#define SIOCATMARK	0x8905
-#define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */
-#define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */
-
-#endif /* __ASM_GENERIC_SOCKIOS_H */
diff --git a/openflow/usr/include/asm-generic/stat.h b/openflow/usr/include/asm-generic/stat.h
deleted file mode 100644
index bd8cad2..0000000
--- a/openflow/usr/include/asm-generic/stat.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef __ASM_GENERIC_STAT_H
-#define __ASM_GENERIC_STAT_H
-
-/*
- * Everybody gets this wrong and has to stick with it for all
- * eternity. Hopefully, this version gets used by new architectures
- * so they don't fall into the same traps.
- *
- * stat64 is copied from powerpc64, with explicit padding added.
- * stat is the same structure layout on 64-bit, without the 'long long'
- * types.
- *
- * By convention, 64 bit architectures use the stat interface, while
- * 32 bit architectures use the stat64 interface. Note that we don't
- * provide an __old_kernel_stat here, which new architecture should
- * not have to start with.
- */
-
-#include <asm/bitsperlong.h>
-
-#define STAT_HAVE_NSEC 1
-
-struct stat {
-	unsigned long	st_dev;		/* Device.  */
-	unsigned long	st_ino;		/* File serial number.  */
-	unsigned int	st_mode;	/* File mode.  */
-	unsigned int	st_nlink;	/* Link count.  */
-	unsigned int	st_uid;		/* User ID of the file's owner.  */
-	unsigned int	st_gid;		/* Group ID of the file's group. */
-	unsigned long	st_rdev;	/* Device number, if device.  */
-	unsigned long	__pad1;
-	long		st_size;	/* Size of file, in bytes.  */
-	int		st_blksize;	/* Optimal block size for I/O.  */
-	int		__pad2;
-	long		st_blocks;	/* Number 512-byte blocks allocated. */
-	long		st_atime;	/* Time of last access.  */
-	unsigned long	st_atime_nsec;
-	long		st_mtime;	/* Time of last modification.  */
-	unsigned long	st_mtime_nsec;
-	long		st_ctime;	/* Time of last status change.  */
-	unsigned long	st_ctime_nsec;
-	unsigned int	__unused4;
-	unsigned int	__unused5;
-};
-
-/* This matches struct stat64 in glibc2.1. Only used for 32 bit. */
-#if __BITS_PER_LONG != 64 || defined(__ARCH_WANT_STAT64)
-struct stat64 {
-	unsigned long long st_dev;	/* Device.  */
-	unsigned long long st_ino;	/* File serial number.  */
-	unsigned int	st_mode;	/* File mode.  */
-	unsigned int	st_nlink;	/* Link count.  */
-	unsigned int	st_uid;		/* User ID of the file's owner.  */
-	unsigned int	st_gid;		/* Group ID of the file's group. */
-	unsigned long long st_rdev;	/* Device number, if device.  */
-	unsigned long long __pad1;
-	long long	st_size;	/* Size of file, in bytes.  */
-	int		st_blksize;	/* Optimal block size for I/O.  */
-	int		__pad2;
-	long long	st_blocks;	/* Number 512-byte blocks allocated. */
-	int		st_atime;	/* Time of last access.  */
-	unsigned int	st_atime_nsec;
-	int		st_mtime;	/* Time of last modification.  */
-	unsigned int	st_mtime_nsec;
-	int		st_ctime;	/* Time of last status change.  */
-	unsigned int	st_ctime_nsec;
-	unsigned int	__unused4;
-	unsigned int	__unused5;
-};
-#endif
-
-#endif /* __ASM_GENERIC_STAT_H */
diff --git a/openflow/usr/include/asm-generic/statfs.h b/openflow/usr/include/asm-generic/statfs.h
deleted file mode 100644
index 6877912..0000000
--- a/openflow/usr/include/asm-generic/statfs.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef _GENERIC_STATFS_H
-#define _GENERIC_STATFS_H
-
-#include <linux/types.h>
-
-
-/*
- * Most 64-bit platforms use 'long', while most 32-bit platforms use '__u32'.
- * Yes, they differ in signedness as well as size.
- * Special cases can override it for themselves -- except for S390x, which
- * is just a little too special for us. And MIPS, which I'm not touching
- * with a 10' pole.
- */
-#ifndef __statfs_word
-#if __BITS_PER_LONG == 64
-#define __statfs_word __kernel_long_t
-#else
-#define __statfs_word __u32
-#endif
-#endif
-
-struct statfs {
-	__statfs_word f_type;
-	__statfs_word f_bsize;
-	__statfs_word f_blocks;
-	__statfs_word f_bfree;
-	__statfs_word f_bavail;
-	__statfs_word f_files;
-	__statfs_word f_ffree;
-	__kernel_fsid_t f_fsid;
-	__statfs_word f_namelen;
-	__statfs_word f_frsize;
-	__statfs_word f_flags;
-	__statfs_word f_spare[4];
-};
-
-/*
- * ARM needs to avoid the 32-bit padding at the end, for consistency
- * between EABI and OABI 
- */
-#ifndef ARCH_PACK_STATFS64
-#define ARCH_PACK_STATFS64
-#endif
-
-struct statfs64 {
-	__statfs_word f_type;
-	__statfs_word f_bsize;
-	__u64 f_blocks;
-	__u64 f_bfree;
-	__u64 f_bavail;
-	__u64 f_files;
-	__u64 f_ffree;
-	__kernel_fsid_t f_fsid;
-	__statfs_word f_namelen;
-	__statfs_word f_frsize;
-	__statfs_word f_flags;
-	__statfs_word f_spare[4];
-} ARCH_PACK_STATFS64;
-
-/* 
- * IA64 and x86_64 need to avoid the 32-bit padding at the end,
- * to be compatible with the i386 ABI
- */
-#ifndef ARCH_PACK_COMPAT_STATFS64
-#define ARCH_PACK_COMPAT_STATFS64
-#endif
-
-struct compat_statfs64 {
-	__u32 f_type;
-	__u32 f_bsize;
-	__u64 f_blocks;
-	__u64 f_bfree;
-	__u64 f_bavail;
-	__u64 f_files;
-	__u64 f_ffree;
-	__kernel_fsid_t f_fsid;
-	__u32 f_namelen;
-	__u32 f_frsize;
-	__u32 f_flags;
-	__u32 f_spare[4];
-} ARCH_PACK_COMPAT_STATFS64;
-
-#endif /* _GENERIC_STATFS_H */
diff --git a/openflow/usr/include/asm-generic/swab.h b/openflow/usr/include/asm-generic/swab.h
deleted file mode 100644
index a8e9029..0000000
--- a/openflow/usr/include/asm-generic/swab.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _ASM_GENERIC_SWAB_H
-#define _ASM_GENERIC_SWAB_H
-
-#include <asm/bitsperlong.h>
-
-/*
- * 32 bit architectures typically (but not always) want to
- * set __SWAB_64_THRU_32__. In user space, this is only
- * valid if the compiler supports 64 bit data types.
- */
-
-#if __BITS_PER_LONG == 32
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#define __SWAB_64_THRU_32__
-#endif
-#endif
-
-#endif /* _ASM_GENERIC_SWAB_H */
diff --git a/openflow/usr/include/asm-generic/termbits.h b/openflow/usr/include/asm-generic/termbits.h
deleted file mode 100644
index 232b478..0000000
--- a/openflow/usr/include/asm-generic/termbits.h
+++ /dev/null
@@ -1,199 +0,0 @@
-#ifndef __ASM_GENERIC_TERMBITS_H
-#define __ASM_GENERIC_TERMBITS_H
-
-#include <linux/posix_types.h>
-
-typedef unsigned char	cc_t;
-typedef unsigned int	speed_t;
-typedef unsigned int	tcflag_t;
-
-#define NCCS 19
-struct termios {
-	tcflag_t c_iflag;		/* input mode flags */
-	tcflag_t c_oflag;		/* output mode flags */
-	tcflag_t c_cflag;		/* control mode flags */
-	tcflag_t c_lflag;		/* local mode flags */
-	cc_t c_line;			/* line discipline */
-	cc_t c_cc[NCCS];		/* control characters */
-};
-
-struct termios2 {
-	tcflag_t c_iflag;		/* input mode flags */
-	tcflag_t c_oflag;		/* output mode flags */
-	tcflag_t c_cflag;		/* control mode flags */
-	tcflag_t c_lflag;		/* local mode flags */
-	cc_t c_line;			/* line discipline */
-	cc_t c_cc[NCCS];		/* control characters */
-	speed_t c_ispeed;		/* input speed */
-	speed_t c_ospeed;		/* output speed */
-};
-
-struct ktermios {
-	tcflag_t c_iflag;		/* input mode flags */
-	tcflag_t c_oflag;		/* output mode flags */
-	tcflag_t c_cflag;		/* control mode flags */
-	tcflag_t c_lflag;		/* local mode flags */
-	cc_t c_line;			/* line discipline */
-	cc_t c_cc[NCCS];		/* control characters */
-	speed_t c_ispeed;		/* input speed */
-	speed_t c_ospeed;		/* output speed */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-/* c_iflag bits */
-#define IGNBRK	0000001
-#define BRKINT	0000002
-#define IGNPAR	0000004
-#define PARMRK	0000010
-#define INPCK	0000020
-#define ISTRIP	0000040
-#define INLCR	0000100
-#define IGNCR	0000200
-#define ICRNL	0000400
-#define IUCLC	0001000
-#define IXON	0002000
-#define IXANY	0004000
-#define IXOFF	0010000
-#define IMAXBEL	0020000
-#define IUTF8	0040000
-
-/* c_oflag bits */
-#define OPOST	0000001
-#define OLCUC	0000002
-#define ONLCR	0000004
-#define OCRNL	0000010
-#define ONOCR	0000020
-#define ONLRET	0000040
-#define OFILL	0000100
-#define OFDEL	0000200
-#define NLDLY	0000400
-#define   NL0	0000000
-#define   NL1	0000400
-#define CRDLY	0003000
-#define   CR0	0000000
-#define   CR1	0001000
-#define   CR2	0002000
-#define   CR3	0003000
-#define TABDLY	0014000
-#define   TAB0	0000000
-#define   TAB1	0004000
-#define   TAB2	0010000
-#define   TAB3	0014000
-#define   XTABS	0014000
-#define BSDLY	0020000
-#define   BS0	0000000
-#define   BS1	0020000
-#define VTDLY	0040000
-#define   VT0	0000000
-#define   VT1	0040000
-#define FFDLY	0100000
-#define   FF0	0000000
-#define   FF1	0100000
-
-/* c_cflag bit meaning */
-#define CBAUD	0010017
-#define  B0	0000000		/* hang up */
-#define  B50	0000001
-#define  B75	0000002
-#define  B110	0000003
-#define  B134	0000004
-#define  B150	0000005
-#define  B200	0000006
-#define  B300	0000007
-#define  B600	0000010
-#define  B1200	0000011
-#define  B1800	0000012
-#define  B2400	0000013
-#define  B4800	0000014
-#define  B9600	0000015
-#define  B19200	0000016
-#define  B38400	0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE	0000060
-#define   CS5	0000000
-#define   CS6	0000020
-#define   CS7	0000040
-#define   CS8	0000060
-#define CSTOPB	0000100
-#define CREAD	0000200
-#define PARENB	0000400
-#define PARODD	0001000
-#define HUPCL	0002000
-#define CLOCAL	0004000
-#define CBAUDEX 0010000
-#define    BOTHER 0010000
-#define    B57600 0010001
-#define   B115200 0010002
-#define   B230400 0010003
-#define   B460800 0010004
-#define   B500000 0010005
-#define   B576000 0010006
-#define   B921600 0010007
-#define  B1000000 0010010
-#define  B1152000 0010011
-#define  B1500000 0010012
-#define  B2000000 0010013
-#define  B2500000 0010014
-#define  B3000000 0010015
-#define  B3500000 0010016
-#define  B4000000 0010017
-#define CIBAUD	  002003600000	/* input baud rate */
-#define CMSPAR	  010000000000	/* mark or space (stick) parity */
-#define CRTSCTS	  020000000000	/* flow control */
-
-#define IBSHIFT	  16		/* Shift from CBAUD to CIBAUD */
-
-/* c_lflag bits */
-#define ISIG	0000001
-#define ICANON	0000002
-#define XCASE	0000004
-#define ECHO	0000010
-#define ECHOE	0000020
-#define ECHOK	0000040
-#define ECHONL	0000100
-#define NOFLSH	0000200
-#define TOSTOP	0000400
-#define ECHOCTL	0001000
-#define ECHOPRT	0002000
-#define ECHOKE	0004000
-#define FLUSHO	0010000
-#define PENDIN	0040000
-#define IEXTEN	0100000
-#define EXTPROC	0200000
-
-/* tcflow() and TCXONC use these */
-#define	TCOOFF		0
-#define	TCOON		1
-#define	TCIOFF		2
-#define	TCION		3
-
-/* tcflush() and TCFLSH use these */
-#define	TCIFLUSH	0
-#define	TCOFLUSH	1
-#define	TCIOFLUSH	2
-
-/* tcsetattr uses these */
-#define	TCSANOW		0
-#define	TCSADRAIN	1
-#define	TCSAFLUSH	2
-
-#endif /* __ASM_GENERIC_TERMBITS_H */
diff --git a/openflow/usr/include/asm-generic/termios.h b/openflow/usr/include/asm-generic/termios.h
deleted file mode 100644
index 1c1166a..0000000
--- a/openflow/usr/include/asm-generic/termios.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef _ASM_GENERIC_TERMIOS_H
-#define _ASM_GENERIC_TERMIOS_H
-/*
- * Most architectures have straight copies of the x86 code, with
- * varying levels of bug fixes on top. Usually it's a good idea
- * to use this generic version instead, but be careful to avoid
- * ABI changes.
- * New architectures should not provide their own version.
- */
-
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-
-struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
-};
-
-#define NCC 8
-struct termio {
-	unsigned short c_iflag;		/* input mode flags */
-	unsigned short c_oflag;		/* output mode flags */
-	unsigned short c_cflag;		/* control mode flags */
-	unsigned short c_lflag;		/* local mode flags */
-	unsigned char c_line;		/* line discipline */
-	unsigned char c_cc[NCC];	/* control characters */
-};
-
-/* modem lines */
-#define TIOCM_LE	0x001
-#define TIOCM_DTR	0x002
-#define TIOCM_RTS	0x004
-#define TIOCM_ST	0x008
-#define TIOCM_SR	0x010
-#define TIOCM_CTS	0x020
-#define TIOCM_CAR	0x040
-#define TIOCM_RNG	0x080
-#define TIOCM_DSR	0x100
-#define TIOCM_CD	TIOCM_CAR
-#define TIOCM_RI	TIOCM_RNG
-#define TIOCM_OUT1	0x2000
-#define TIOCM_OUT2	0x4000
-#define TIOCM_LOOP	0x8000
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-
-#endif /* _ASM_GENERIC_TERMIOS_H */
diff --git a/openflow/usr/include/asm-generic/types.h b/openflow/usr/include/asm-generic/types.h
deleted file mode 100644
index a387792..0000000
--- a/openflow/usr/include/asm-generic/types.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ASM_GENERIC_TYPES_H
-#define _ASM_GENERIC_TYPES_H
-/*
- * int-ll64 is used everywhere now.
- */
-#include <asm-generic/int-ll64.h>
-
-#endif /* _ASM_GENERIC_TYPES_H */
diff --git a/openflow/usr/include/asm-generic/ucontext.h b/openflow/usr/include/asm-generic/ucontext.h
deleted file mode 100644
index ad77343..0000000
--- a/openflow/usr/include/asm-generic/ucontext.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ASM_GENERIC_UCONTEXT_H
-#define __ASM_GENERIC_UCONTEXT_H
-
-struct ucontext {
-	unsigned long	  uc_flags;
-	struct ucontext  *uc_link;
-	stack_t		  uc_stack;
-	struct sigcontext uc_mcontext;
-	sigset_t	  uc_sigmask;	/* mask last for extensibility */
-};
-
-#endif /* __ASM_GENERIC_UCONTEXT_H */
diff --git a/openflow/usr/include/asm-generic/unistd.h b/openflow/usr/include/asm-generic/unistd.h
deleted file mode 100644
index 1324b02..0000000
--- a/openflow/usr/include/asm-generic/unistd.h
+++ /dev/null
@@ -1,927 +0,0 @@
-#include <asm/bitsperlong.h>
-
-/*
- * This file contains the system call numbers, based on the
- * layout of the x86-64 architecture, which embeds the
- * pointer to the syscall in the table.
- *
- * As a basic principle, no duplication of functionality
- * should be added, e.g. we don't use lseek when llseek
- * is present. New architectures should use this file
- * and implement the less feature-full calls in user space.
- */
-
-#ifndef __SYSCALL
-#define __SYSCALL(x, y)
-#endif
-
-#if __BITS_PER_LONG == 32 || defined(__SYSCALL_COMPAT)
-#define __SC_3264(_nr, _32, _64) __SYSCALL(_nr, _32)
-#else
-#define __SC_3264(_nr, _32, _64) __SYSCALL(_nr, _64)
-#endif
-
-#ifdef __SYSCALL_COMPAT
-#define __SC_COMP(_nr, _sys, _comp) __SYSCALL(_nr, _comp)
-#define __SC_COMP_3264(_nr, _32, _64, _comp) __SYSCALL(_nr, _comp)
-#else
-#define __SC_COMP(_nr, _sys, _comp) __SYSCALL(_nr, _sys)
-#define __SC_COMP_3264(_nr, _32, _64, _comp) __SC_3264(_nr, _32, _64)
-#endif
-
-#define __NR_io_setup 0
-__SC_COMP(__NR_io_setup, sys_io_setup, compat_sys_io_setup)
-#define __NR_io_destroy 1
-__SYSCALL(__NR_io_destroy, sys_io_destroy)
-#define __NR_io_submit 2
-__SC_COMP(__NR_io_submit, sys_io_submit, compat_sys_io_submit)
-#define __NR_io_cancel 3
-__SYSCALL(__NR_io_cancel, sys_io_cancel)
-#define __NR_io_getevents 4
-__SC_COMP(__NR_io_getevents, sys_io_getevents, compat_sys_io_getevents)
-
-/* fs/xattr.c */
-#define __NR_setxattr 5
-__SYSCALL(__NR_setxattr, sys_setxattr)
-#define __NR_lsetxattr 6
-__SYSCALL(__NR_lsetxattr, sys_lsetxattr)
-#define __NR_fsetxattr 7
-__SYSCALL(__NR_fsetxattr, sys_fsetxattr)
-#define __NR_getxattr 8
-__SYSCALL(__NR_getxattr, sys_getxattr)
-#define __NR_lgetxattr 9
-__SYSCALL(__NR_lgetxattr, sys_lgetxattr)
-#define __NR_fgetxattr 10
-__SYSCALL(__NR_fgetxattr, sys_fgetxattr)
-#define __NR_listxattr 11
-__SYSCALL(__NR_listxattr, sys_listxattr)
-#define __NR_llistxattr 12
-__SYSCALL(__NR_llistxattr, sys_llistxattr)
-#define __NR_flistxattr 13
-__SYSCALL(__NR_flistxattr, sys_flistxattr)
-#define __NR_removexattr 14
-__SYSCALL(__NR_removexattr, sys_removexattr)
-#define __NR_lremovexattr 15
-__SYSCALL(__NR_lremovexattr, sys_lremovexattr)
-#define __NR_fremovexattr 16
-__SYSCALL(__NR_fremovexattr, sys_fremovexattr)
-
-/* fs/dcache.c */
-#define __NR_getcwd 17
-__SYSCALL(__NR_getcwd, sys_getcwd)
-
-/* fs/cookies.c */
-#define __NR_lookup_dcookie 18
-__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie)
-
-/* fs/eventfd.c */
-#define __NR_eventfd2 19
-__SYSCALL(__NR_eventfd2, sys_eventfd2)
-
-/* fs/eventpoll.c */
-#define __NR_epoll_create1 20
-__SYSCALL(__NR_epoll_create1, sys_epoll_create1)
-#define __NR_epoll_ctl 21
-__SYSCALL(__NR_epoll_ctl, sys_epoll_ctl)
-#define __NR_epoll_pwait 22
-__SC_COMP(__NR_epoll_pwait, sys_epoll_pwait, compat_sys_epoll_pwait)
-
-/* fs/fcntl.c */
-#define __NR_dup 23
-__SYSCALL(__NR_dup, sys_dup)
-#define __NR_dup3 24
-__SYSCALL(__NR_dup3, sys_dup3)
-#define __NR3264_fcntl 25
-__SC_COMP_3264(__NR3264_fcntl, sys_fcntl64, sys_fcntl, compat_sys_fcntl64)
-
-/* fs/inotify_user.c */
-#define __NR_inotify_init1 26
-__SYSCALL(__NR_inotify_init1, sys_inotify_init1)
-#define __NR_inotify_add_watch 27
-__SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch)
-#define __NR_inotify_rm_watch 28
-__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)
-
-/* fs/ioctl.c */
-#define __NR_ioctl 29
-__SC_COMP(__NR_ioctl, sys_ioctl, compat_sys_ioctl)
-
-/* fs/ioprio.c */
-#define __NR_ioprio_set 30
-__SYSCALL(__NR_ioprio_set, sys_ioprio_set)
-#define __NR_ioprio_get 31
-__SYSCALL(__NR_ioprio_get, sys_ioprio_get)
-
-/* fs/locks.c */
-#define __NR_flock 32
-__SYSCALL(__NR_flock, sys_flock)
-
-/* fs/namei.c */
-#define __NR_mknodat 33
-__SYSCALL(__NR_mknodat, sys_mknodat)
-#define __NR_mkdirat 34
-__SYSCALL(__NR_mkdirat, sys_mkdirat)
-#define __NR_unlinkat 35
-__SYSCALL(__NR_unlinkat, sys_unlinkat)
-#define __NR_symlinkat 36
-__SYSCALL(__NR_symlinkat, sys_symlinkat)
-#define __NR_linkat 37
-__SYSCALL(__NR_linkat, sys_linkat)
-#define __NR_renameat 38
-__SYSCALL(__NR_renameat, sys_renameat)
-
-/* fs/namespace.c */
-#define __NR_umount2 39
-__SYSCALL(__NR_umount2, sys_umount)
-#define __NR_mount 40
-__SC_COMP(__NR_mount, sys_mount, compat_sys_mount)
-#define __NR_pivot_root 41
-__SYSCALL(__NR_pivot_root, sys_pivot_root)
-
-/* fs/nfsctl.c */
-#define __NR_nfsservctl 42
-__SYSCALL(__NR_nfsservctl, sys_ni_syscall)
-
-/* fs/open.c */
-#define __NR3264_statfs 43
-__SC_COMP_3264(__NR3264_statfs, sys_statfs64, sys_statfs, \
-	       compat_sys_statfs64)
-#define __NR3264_fstatfs 44
-__SC_COMP_3264(__NR3264_fstatfs, sys_fstatfs64, sys_fstatfs, \
-	       compat_sys_fstatfs64)
-#define __NR3264_truncate 45
-__SC_COMP_3264(__NR3264_truncate, sys_truncate64, sys_truncate, \
-	       compat_sys_truncate64)
-#define __NR3264_ftruncate 46
-__SC_COMP_3264(__NR3264_ftruncate, sys_ftruncate64, sys_ftruncate, \
-	       compat_sys_ftruncate64)
-
-#define __NR_fallocate 47
-__SC_COMP(__NR_fallocate, sys_fallocate, compat_sys_fallocate)
-#define __NR_faccessat 48
-__SYSCALL(__NR_faccessat, sys_faccessat)
-#define __NR_chdir 49
-__SYSCALL(__NR_chdir, sys_chdir)
-#define __NR_fchdir 50
-__SYSCALL(__NR_fchdir, sys_fchdir)
-#define __NR_chroot 51
-__SYSCALL(__NR_chroot, sys_chroot)
-#define __NR_fchmod 52
-__SYSCALL(__NR_fchmod, sys_fchmod)
-#define __NR_fchmodat 53
-__SYSCALL(__NR_fchmodat, sys_fchmodat)
-#define __NR_fchownat 54
-__SYSCALL(__NR_fchownat, sys_fchownat)
-#define __NR_fchown 55
-__SYSCALL(__NR_fchown, sys_fchown)
-#define __NR_openat 56
-__SC_COMP(__NR_openat, sys_openat, compat_sys_openat)
-#define __NR_close 57
-__SYSCALL(__NR_close, sys_close)
-#define __NR_vhangup 58
-__SYSCALL(__NR_vhangup, sys_vhangup)
-
-/* fs/pipe.c */
-#define __NR_pipe2 59
-__SYSCALL(__NR_pipe2, sys_pipe2)
-
-/* fs/quota.c */
-#define __NR_quotactl 60
-__SYSCALL(__NR_quotactl, sys_quotactl)
-
-/* fs/readdir.c */
-#define __NR_getdents64 61
-#define __ARCH_WANT_COMPAT_SYS_GETDENTS64
-__SC_COMP(__NR_getdents64, sys_getdents64, compat_sys_getdents64)
-
-/* fs/read_write.c */
-#define __NR3264_lseek 62
-__SC_3264(__NR3264_lseek, sys_llseek, sys_lseek)
-#define __NR_read 63
-__SYSCALL(__NR_read, sys_read)
-#define __NR_write 64
-__SYSCALL(__NR_write, sys_write)
-#define __NR_readv 65
-__SC_COMP(__NR_readv, sys_readv, compat_sys_readv)
-#define __NR_writev 66
-__SC_COMP(__NR_writev, sys_writev, compat_sys_writev)
-#define __NR_pread64 67
-__SC_COMP(__NR_pread64, sys_pread64, compat_sys_pread64)
-#define __NR_pwrite64 68
-__SC_COMP(__NR_pwrite64, sys_pwrite64, compat_sys_pwrite64)
-#define __NR_preadv 69
-__SC_COMP(__NR_preadv, sys_preadv, compat_sys_preadv)
-#define __NR_pwritev 70
-__SC_COMP(__NR_pwritev, sys_pwritev, compat_sys_pwritev)
-
-/* fs/sendfile.c */
-#define __NR3264_sendfile 71
-__SYSCALL(__NR3264_sendfile, sys_sendfile64)
-
-/* fs/select.c */
-#define __NR_pselect6 72
-__SC_COMP(__NR_pselect6, sys_pselect6, compat_sys_pselect6)
-#define __NR_ppoll 73
-__SC_COMP(__NR_ppoll, sys_ppoll, compat_sys_ppoll)
-
-/* fs/signalfd.c */
-#define __NR_signalfd4 74
-__SC_COMP(__NR_signalfd4, sys_signalfd4, compat_sys_signalfd4)
-
-/* fs/splice.c */
-#define __NR_vmsplice 75
-__SC_COMP(__NR_vmsplice, sys_vmsplice, compat_sys_vmsplice)
-#define __NR_splice 76
-__SYSCALL(__NR_splice, sys_splice)
-#define __NR_tee 77
-__SYSCALL(__NR_tee, sys_tee)
-
-/* fs/stat.c */
-#define __NR_readlinkat 78
-__SYSCALL(__NR_readlinkat, sys_readlinkat)
-#define __NR3264_fstatat 79
-__SC_3264(__NR3264_fstatat, sys_fstatat64, sys_newfstatat)
-#define __NR3264_fstat 80
-__SC_3264(__NR3264_fstat, sys_fstat64, sys_newfstat)
-
-/* fs/sync.c */
-#define __NR_sync 81
-__SYSCALL(__NR_sync, sys_sync)
-#define __NR_fsync 82
-__SYSCALL(__NR_fsync, sys_fsync)
-#define __NR_fdatasync 83
-__SYSCALL(__NR_fdatasync, sys_fdatasync)
-#ifdef __ARCH_WANT_SYNC_FILE_RANGE2
-#define __NR_sync_file_range2 84
-__SC_COMP(__NR_sync_file_range2, sys_sync_file_range2, \
-	  compat_sys_sync_file_range2)
-#else
-#define __NR_sync_file_range 84
-__SC_COMP(__NR_sync_file_range, sys_sync_file_range, \
-	  compat_sys_sync_file_range)
-#endif
-
-/* fs/timerfd.c */
-#define __NR_timerfd_create 85
-__SYSCALL(__NR_timerfd_create, sys_timerfd_create)
-#define __NR_timerfd_settime 86
-__SC_COMP(__NR_timerfd_settime, sys_timerfd_settime, \
-	  compat_sys_timerfd_settime)
-#define __NR_timerfd_gettime 87
-__SC_COMP(__NR_timerfd_gettime, sys_timerfd_gettime, \
-	  compat_sys_timerfd_gettime)
-
-/* fs/utimes.c */
-#define __NR_utimensat 88
-__SC_COMP(__NR_utimensat, sys_utimensat, compat_sys_utimensat)
-
-/* kernel/acct.c */
-#define __NR_acct 89
-__SYSCALL(__NR_acct, sys_acct)
-
-/* kernel/capability.c */
-#define __NR_capget 90
-__SYSCALL(__NR_capget, sys_capget)
-#define __NR_capset 91
-__SYSCALL(__NR_capset, sys_capset)
-
-/* kernel/exec_domain.c */
-#define __NR_personality 92
-__SYSCALL(__NR_personality, sys_personality)
-
-/* kernel/exit.c */
-#define __NR_exit 93
-__SYSCALL(__NR_exit, sys_exit)
-#define __NR_exit_group 94
-__SYSCALL(__NR_exit_group, sys_exit_group)
-#define __NR_waitid 95
-__SC_COMP(__NR_waitid, sys_waitid, compat_sys_waitid)
-
-/* kernel/fork.c */
-#define __NR_set_tid_address 96
-__SYSCALL(__NR_set_tid_address, sys_set_tid_address)
-#define __NR_unshare 97
-__SYSCALL(__NR_unshare, sys_unshare)
-
-/* kernel/futex.c */
-#define __NR_futex 98
-__SC_COMP(__NR_futex, sys_futex, compat_sys_futex)
-#define __NR_set_robust_list 99
-__SC_COMP(__NR_set_robust_list, sys_set_robust_list, \
-	  compat_sys_set_robust_list)
-#define __NR_get_robust_list 100
-__SC_COMP(__NR_get_robust_list, sys_get_robust_list, \
-	  compat_sys_get_robust_list)
-
-/* kernel/hrtimer.c */
-#define __NR_nanosleep 101
-__SC_COMP(__NR_nanosleep, sys_nanosleep, compat_sys_nanosleep)
-
-/* kernel/itimer.c */
-#define __NR_getitimer 102
-__SC_COMP(__NR_getitimer, sys_getitimer, compat_sys_getitimer)
-#define __NR_setitimer 103
-__SC_COMP(__NR_setitimer, sys_setitimer, compat_sys_setitimer)
-
-/* kernel/kexec.c */
-#define __NR_kexec_load 104
-__SC_COMP(__NR_kexec_load, sys_kexec_load, compat_sys_kexec_load)
-
-/* kernel/module.c */
-#define __NR_init_module 105
-__SYSCALL(__NR_init_module, sys_init_module)
-#define __NR_delete_module 106
-__SYSCALL(__NR_delete_module, sys_delete_module)
-
-/* kernel/posix-timers.c */
-#define __NR_timer_create 107
-__SC_COMP(__NR_timer_create, sys_timer_create, compat_sys_timer_create)
-#define __NR_timer_gettime 108
-__SC_COMP(__NR_timer_gettime, sys_timer_gettime, compat_sys_timer_gettime)
-#define __NR_timer_getoverrun 109
-__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
-#define __NR_timer_settime 110
-__SC_COMP(__NR_timer_settime, sys_timer_settime, compat_sys_timer_settime)
-#define __NR_timer_delete 111
-__SYSCALL(__NR_timer_delete, sys_timer_delete)
-#define __NR_clock_settime 112
-__SC_COMP(__NR_clock_settime, sys_clock_settime, compat_sys_clock_settime)
-#define __NR_clock_gettime 113
-__SC_COMP(__NR_clock_gettime, sys_clock_gettime, compat_sys_clock_gettime)
-#define __NR_clock_getres 114
-__SC_COMP(__NR_clock_getres, sys_clock_getres, compat_sys_clock_getres)
-#define __NR_clock_nanosleep 115
-__SC_COMP(__NR_clock_nanosleep, sys_clock_nanosleep, \
-	  compat_sys_clock_nanosleep)
-
-/* kernel/printk.c */
-#define __NR_syslog 116
-__SYSCALL(__NR_syslog, sys_syslog)
-
-/* kernel/ptrace.c */
-#define __NR_ptrace 117
-__SYSCALL(__NR_ptrace, sys_ptrace)
-
-/* kernel/sched/core.c */
-#define __NR_sched_setparam 118
-__SYSCALL(__NR_sched_setparam, sys_sched_setparam)
-#define __NR_sched_setscheduler 119
-__SYSCALL(__NR_sched_setscheduler, sys_sched_setscheduler)
-#define __NR_sched_getscheduler 120
-__SYSCALL(__NR_sched_getscheduler, sys_sched_getscheduler)
-#define __NR_sched_getparam 121
-__SYSCALL(__NR_sched_getparam, sys_sched_getparam)
-#define __NR_sched_setaffinity 122
-__SC_COMP(__NR_sched_setaffinity, sys_sched_setaffinity, \
-	  compat_sys_sched_setaffinity)
-#define __NR_sched_getaffinity 123
-__SC_COMP(__NR_sched_getaffinity, sys_sched_getaffinity, \
-	  compat_sys_sched_getaffinity)
-#define __NR_sched_yield 124
-__SYSCALL(__NR_sched_yield, sys_sched_yield)
-#define __NR_sched_get_priority_max 125
-__SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
-#define __NR_sched_get_priority_min 126
-__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
-#define __NR_sched_rr_get_interval 127
-__SC_COMP(__NR_sched_rr_get_interval, sys_sched_rr_get_interval, \
-	  compat_sys_sched_rr_get_interval)
-
-/* kernel/signal.c */
-#define __NR_restart_syscall 128
-__SYSCALL(__NR_restart_syscall, sys_restart_syscall)
-#define __NR_kill 129
-__SYSCALL(__NR_kill, sys_kill)
-#define __NR_tkill 130
-__SYSCALL(__NR_tkill, sys_tkill)
-#define __NR_tgkill 131
-__SYSCALL(__NR_tgkill, sys_tgkill)
-#define __NR_sigaltstack 132
-__SC_COMP(__NR_sigaltstack, sys_sigaltstack, compat_sys_sigaltstack)
-#define __NR_rt_sigsuspend 133
-__SC_COMP(__NR_rt_sigsuspend, sys_rt_sigsuspend, compat_sys_rt_sigsuspend)
-#define __NR_rt_sigaction 134
-__SC_COMP(__NR_rt_sigaction, sys_rt_sigaction, compat_sys_rt_sigaction)
-#define __NR_rt_sigprocmask 135
-__SC_COMP(__NR_rt_sigprocmask, sys_rt_sigprocmask, compat_sys_rt_sigprocmask)
-#define __NR_rt_sigpending 136
-__SC_COMP(__NR_rt_sigpending, sys_rt_sigpending, compat_sys_rt_sigpending)
-#define __NR_rt_sigtimedwait 137
-__SC_COMP(__NR_rt_sigtimedwait, sys_rt_sigtimedwait, \
-	  compat_sys_rt_sigtimedwait)
-#define __NR_rt_sigqueueinfo 138
-__SC_COMP(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo, \
-	  compat_sys_rt_sigqueueinfo)
-#define __NR_rt_sigreturn 139
-__SC_COMP(__NR_rt_sigreturn, sys_rt_sigreturn, compat_sys_rt_sigreturn)
-
-/* kernel/sys.c */
-#define __NR_setpriority 140
-__SYSCALL(__NR_setpriority, sys_setpriority)
-#define __NR_getpriority 141
-__SYSCALL(__NR_getpriority, sys_getpriority)
-#define __NR_reboot 142
-__SYSCALL(__NR_reboot, sys_reboot)
-#define __NR_setregid 143
-__SYSCALL(__NR_setregid, sys_setregid)
-#define __NR_setgid 144
-__SYSCALL(__NR_setgid, sys_setgid)
-#define __NR_setreuid 145
-__SYSCALL(__NR_setreuid, sys_setreuid)
-#define __NR_setuid 146
-__SYSCALL(__NR_setuid, sys_setuid)
-#define __NR_setresuid 147
-__SYSCALL(__NR_setresuid, sys_setresuid)
-#define __NR_getresuid 148
-__SYSCALL(__NR_getresuid, sys_getresuid)
-#define __NR_setresgid 149
-__SYSCALL(__NR_setresgid, sys_setresgid)
-#define __NR_getresgid 150
-__SYSCALL(__NR_getresgid, sys_getresgid)
-#define __NR_setfsuid 151
-__SYSCALL(__NR_setfsuid, sys_setfsuid)
-#define __NR_setfsgid 152
-__SYSCALL(__NR_setfsgid, sys_setfsgid)
-#define __NR_times 153
-__SC_COMP(__NR_times, sys_times, compat_sys_times)
-#define __NR_setpgid 154
-__SYSCALL(__NR_setpgid, sys_setpgid)
-#define __NR_getpgid 155
-__SYSCALL(__NR_getpgid, sys_getpgid)
-#define __NR_getsid 156
-__SYSCALL(__NR_getsid, sys_getsid)
-#define __NR_setsid 157
-__SYSCALL(__NR_setsid, sys_setsid)
-#define __NR_getgroups 158
-__SYSCALL(__NR_getgroups, sys_getgroups)
-#define __NR_setgroups 159
-__SYSCALL(__NR_setgroups, sys_setgroups)
-#define __NR_uname 160
-__SYSCALL(__NR_uname, sys_newuname)
-#define __NR_sethostname 161
-__SYSCALL(__NR_sethostname, sys_sethostname)
-#define __NR_setdomainname 162
-__SYSCALL(__NR_setdomainname, sys_setdomainname)
-#define __NR_getrlimit 163
-__SC_COMP(__NR_getrlimit, sys_getrlimit, compat_sys_getrlimit)
-#define __NR_setrlimit 164
-__SC_COMP(__NR_setrlimit, sys_setrlimit, compat_sys_setrlimit)
-#define __NR_getrusage 165
-__SC_COMP(__NR_getrusage, sys_getrusage, compat_sys_getrusage)
-#define __NR_umask 166
-__SYSCALL(__NR_umask, sys_umask)
-#define __NR_prctl 167
-__SYSCALL(__NR_prctl, sys_prctl)
-#define __NR_getcpu 168
-__SYSCALL(__NR_getcpu, sys_getcpu)
-
-/* kernel/time.c */
-#define __NR_gettimeofday 169
-__SC_COMP(__NR_gettimeofday, sys_gettimeofday, compat_sys_gettimeofday)
-#define __NR_settimeofday 170
-__SC_COMP(__NR_settimeofday, sys_settimeofday, compat_sys_settimeofday)
-#define __NR_adjtimex 171
-__SC_COMP(__NR_adjtimex, sys_adjtimex, compat_sys_adjtimex)
-
-/* kernel/timer.c */
-#define __NR_getpid 172
-__SYSCALL(__NR_getpid, sys_getpid)
-#define __NR_getppid 173
-__SYSCALL(__NR_getppid, sys_getppid)
-#define __NR_getuid 174
-__SYSCALL(__NR_getuid, sys_getuid)
-#define __NR_geteuid 175
-__SYSCALL(__NR_geteuid, sys_geteuid)
-#define __NR_getgid 176
-__SYSCALL(__NR_getgid, sys_getgid)
-#define __NR_getegid 177
-__SYSCALL(__NR_getegid, sys_getegid)
-#define __NR_gettid 178
-__SYSCALL(__NR_gettid, sys_gettid)
-#define __NR_sysinfo 179
-__SC_COMP(__NR_sysinfo, sys_sysinfo, compat_sys_sysinfo)
-
-/* ipc/mqueue.c */
-#define __NR_mq_open 180
-__SC_COMP(__NR_mq_open, sys_mq_open, compat_sys_mq_open)
-#define __NR_mq_unlink 181
-__SYSCALL(__NR_mq_unlink, sys_mq_unlink)
-#define __NR_mq_timedsend 182
-__SC_COMP(__NR_mq_timedsend, sys_mq_timedsend, compat_sys_mq_timedsend)
-#define __NR_mq_timedreceive 183
-__SC_COMP(__NR_mq_timedreceive, sys_mq_timedreceive, \
-	  compat_sys_mq_timedreceive)
-#define __NR_mq_notify 184
-__SC_COMP(__NR_mq_notify, sys_mq_notify, compat_sys_mq_notify)
-#define __NR_mq_getsetattr 185
-__SC_COMP(__NR_mq_getsetattr, sys_mq_getsetattr, compat_sys_mq_getsetattr)
-
-/* ipc/msg.c */
-#define __NR_msgget 186
-__SYSCALL(__NR_msgget, sys_msgget)
-#define __NR_msgctl 187
-__SC_COMP(__NR_msgctl, sys_msgctl, compat_sys_msgctl)
-#define __NR_msgrcv 188
-__SC_COMP(__NR_msgrcv, sys_msgrcv, compat_sys_msgrcv)
-#define __NR_msgsnd 189
-__SC_COMP(__NR_msgsnd, sys_msgsnd, compat_sys_msgsnd)
-
-/* ipc/sem.c */
-#define __NR_semget 190
-__SYSCALL(__NR_semget, sys_semget)
-#define __NR_semctl 191
-__SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl)
-#define __NR_semtimedop 192
-__SC_COMP(__NR_semtimedop, sys_semtimedop, compat_sys_semtimedop)
-#define __NR_semop 193
-__SYSCALL(__NR_semop, sys_semop)
-
-/* ipc/shm.c */
-#define __NR_shmget 194
-__SYSCALL(__NR_shmget, sys_shmget)
-#define __NR_shmctl 195
-__SC_COMP(__NR_shmctl, sys_shmctl, compat_sys_shmctl)
-#define __NR_shmat 196
-__SC_COMP(__NR_shmat, sys_shmat, compat_sys_shmat)
-#define __NR_shmdt 197
-__SYSCALL(__NR_shmdt, sys_shmdt)
-
-/* net/socket.c */
-#define __NR_socket 198
-__SYSCALL(__NR_socket, sys_socket)
-#define __NR_socketpair 199
-__SYSCALL(__NR_socketpair, sys_socketpair)
-#define __NR_bind 200
-__SYSCALL(__NR_bind, sys_bind)
-#define __NR_listen 201
-__SYSCALL(__NR_listen, sys_listen)
-#define __NR_accept 202
-__SYSCALL(__NR_accept, sys_accept)
-#define __NR_connect 203
-__SYSCALL(__NR_connect, sys_connect)
-#define __NR_getsockname 204
-__SYSCALL(__NR_getsockname, sys_getsockname)
-#define __NR_getpeername 205
-__SYSCALL(__NR_getpeername, sys_getpeername)
-#define __NR_sendto 206
-__SYSCALL(__NR_sendto, sys_sendto)
-#define __NR_recvfrom 207
-__SC_COMP(__NR_recvfrom, sys_recvfrom, compat_sys_recvfrom)
-#define __NR_setsockopt 208
-__SC_COMP(__NR_setsockopt, sys_setsockopt, compat_sys_setsockopt)
-#define __NR_getsockopt 209
-__SC_COMP(__NR_getsockopt, sys_getsockopt, compat_sys_getsockopt)
-#define __NR_shutdown 210
-__SYSCALL(__NR_shutdown, sys_shutdown)
-#define __NR_sendmsg 211
-__SC_COMP(__NR_sendmsg, sys_sendmsg, compat_sys_sendmsg)
-#define __NR_recvmsg 212
-__SC_COMP(__NR_recvmsg, sys_recvmsg, compat_sys_recvmsg)
-
-/* mm/filemap.c */
-#define __NR_readahead 213
-__SC_COMP(__NR_readahead, sys_readahead, compat_sys_readahead)
-
-/* mm/nommu.c, also with MMU */
-#define __NR_brk 214
-__SYSCALL(__NR_brk, sys_brk)
-#define __NR_munmap 215
-__SYSCALL(__NR_munmap, sys_munmap)
-#define __NR_mremap 216
-__SYSCALL(__NR_mremap, sys_mremap)
-
-/* security/keys/keyctl.c */
-#define __NR_add_key 217
-__SYSCALL(__NR_add_key, sys_add_key)
-#define __NR_request_key 218
-__SYSCALL(__NR_request_key, sys_request_key)
-#define __NR_keyctl 219
-__SC_COMP(__NR_keyctl, sys_keyctl, compat_sys_keyctl)
-
-/* arch/example/kernel/sys_example.c */
-#define __NR_clone 220
-__SYSCALL(__NR_clone, sys_clone)
-#define __NR_execve 221
-__SC_COMP(__NR_execve, sys_execve, compat_sys_execve)
-
-#define __NR3264_mmap 222
-__SC_3264(__NR3264_mmap, sys_mmap2, sys_mmap)
-/* mm/fadvise.c */
-#define __NR3264_fadvise64 223
-__SC_COMP(__NR3264_fadvise64, sys_fadvise64_64, compat_sys_fadvise64_64)
-
-/* mm/, CONFIG_MMU only */
-#ifndef __ARCH_NOMMU
-#define __NR_swapon 224
-__SYSCALL(__NR_swapon, sys_swapon)
-#define __NR_swapoff 225
-__SYSCALL(__NR_swapoff, sys_swapoff)
-#define __NR_mprotect 226
-__SYSCALL(__NR_mprotect, sys_mprotect)
-#define __NR_msync 227
-__SYSCALL(__NR_msync, sys_msync)
-#define __NR_mlock 228
-__SYSCALL(__NR_mlock, sys_mlock)
-#define __NR_munlock 229
-__SYSCALL(__NR_munlock, sys_munlock)
-#define __NR_mlockall 230
-__SYSCALL(__NR_mlockall, sys_mlockall)
-#define __NR_munlockall 231
-__SYSCALL(__NR_munlockall, sys_munlockall)
-#define __NR_mincore 232
-__SYSCALL(__NR_mincore, sys_mincore)
-#define __NR_madvise 233
-__SYSCALL(__NR_madvise, sys_madvise)
-#define __NR_remap_file_pages 234
-__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)
-#define __NR_mbind 235
-__SC_COMP(__NR_mbind, sys_mbind, compat_sys_mbind)
-#define __NR_get_mempolicy 236
-__SC_COMP(__NR_get_mempolicy, sys_get_mempolicy, compat_sys_get_mempolicy)
-#define __NR_set_mempolicy 237
-__SC_COMP(__NR_set_mempolicy, sys_set_mempolicy, compat_sys_set_mempolicy)
-#define __NR_migrate_pages 238
-__SC_COMP(__NR_migrate_pages, sys_migrate_pages, compat_sys_migrate_pages)
-#define __NR_move_pages 239
-__SC_COMP(__NR_move_pages, sys_move_pages, compat_sys_move_pages)
-#endif
-
-#define __NR_rt_tgsigqueueinfo 240
-__SC_COMP(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo, \
-	  compat_sys_rt_tgsigqueueinfo)
-#define __NR_perf_event_open 241
-__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
-#define __NR_accept4 242
-__SYSCALL(__NR_accept4, sys_accept4)
-#define __NR_recvmmsg 243
-__SC_COMP(__NR_recvmmsg, sys_recvmmsg, compat_sys_recvmmsg)
-
-/*
- * Architectures may provide up to 16 syscalls of their own
- * starting with this value.
- */
-#define __NR_arch_specific_syscall 244
-
-#define __NR_wait4 260
-__SC_COMP(__NR_wait4, sys_wait4, compat_sys_wait4)
-#define __NR_prlimit64 261
-__SYSCALL(__NR_prlimit64, sys_prlimit64)
-#define __NR_fanotify_init 262
-__SYSCALL(__NR_fanotify_init, sys_fanotify_init)
-#define __NR_fanotify_mark 263
-__SYSCALL(__NR_fanotify_mark, sys_fanotify_mark)
-#define __NR_name_to_handle_at         264
-__SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
-#define __NR_open_by_handle_at         265
-__SC_COMP(__NR_open_by_handle_at, sys_open_by_handle_at, \
-	  compat_sys_open_by_handle_at)
-#define __NR_clock_adjtime 266
-__SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime)
-#define __NR_syncfs 267
-__SYSCALL(__NR_syncfs, sys_syncfs)
-#define __NR_setns 268
-__SYSCALL(__NR_setns, sys_setns)
-#define __NR_sendmmsg 269
-__SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg)
-#define __NR_process_vm_readv 270
-__SC_COMP(__NR_process_vm_readv, sys_process_vm_readv, \
-          compat_sys_process_vm_readv)
-#define __NR_process_vm_writev 271
-__SC_COMP(__NR_process_vm_writev, sys_process_vm_writev, \
-          compat_sys_process_vm_writev)
-#define __NR_kcmp 272
-__SYSCALL(__NR_kcmp, sys_kcmp)
-#define __NR_finit_module 273
-__SYSCALL(__NR_finit_module, sys_finit_module)
-#define __NR_sched_setattr 274
-__SYSCALL(__NR_sched_setattr, sys_sched_setattr)
-#define __NR_sched_getattr 275
-__SYSCALL(__NR_sched_getattr, sys_sched_getattr)
-#define __NR_renameat2 276
-__SYSCALL(__NR_renameat2, sys_renameat2)
-#define __NR_seccomp 277
-__SYSCALL(__NR_seccomp, sys_seccomp)
-#define __NR_getrandom 278
-__SYSCALL(__NR_getrandom, sys_getrandom)
-#define __NR_memfd_create 279
-__SYSCALL(__NR_memfd_create, sys_memfd_create)
-#define __NR_bpf 280
-__SYSCALL(__NR_bpf, sys_bpf)
-#define __NR_execveat 281
-__SC_COMP(__NR_execveat, sys_execveat, compat_sys_execveat)
-#define __NR_userfaultfd 282
-__SYSCALL(__NR_userfaultfd, sys_userfaultfd)
-#define __NR_membarrier 283
-__SYSCALL(__NR_membarrier, sys_membarrier)
-#define __NR_mlock2 284
-__SYSCALL(__NR_mlock2, sys_mlock2)
-
-#undef __NR_syscalls
-#define __NR_syscalls 285
-
-/*
- * All syscalls below here should go away really,
- * these are provided for both review and as a porting
- * help for the C library version.
- *
- * Last chance: are any of these important enough to
- * enable by default?
- */
-#ifdef __ARCH_WANT_SYSCALL_NO_AT
-#define __NR_open 1024
-__SYSCALL(__NR_open, sys_open)
-#define __NR_link 1025
-__SYSCALL(__NR_link, sys_link)
-#define __NR_unlink 1026
-__SYSCALL(__NR_unlink, sys_unlink)
-#define __NR_mknod 1027
-__SYSCALL(__NR_mknod, sys_mknod)
-#define __NR_chmod 1028
-__SYSCALL(__NR_chmod, sys_chmod)
-#define __NR_chown 1029
-__SYSCALL(__NR_chown, sys_chown)
-#define __NR_mkdir 1030
-__SYSCALL(__NR_mkdir, sys_mkdir)
-#define __NR_rmdir 1031
-__SYSCALL(__NR_rmdir, sys_rmdir)
-#define __NR_lchown 1032
-__SYSCALL(__NR_lchown, sys_lchown)
-#define __NR_access 1033
-__SYSCALL(__NR_access, sys_access)
-#define __NR_rename 1034
-__SYSCALL(__NR_rename, sys_rename)
-#define __NR_readlink 1035
-__SYSCALL(__NR_readlink, sys_readlink)
-#define __NR_symlink 1036
-__SYSCALL(__NR_symlink, sys_symlink)
-#define __NR_utimes 1037
-__SYSCALL(__NR_utimes, sys_utimes)
-#define __NR3264_stat 1038
-__SC_3264(__NR3264_stat, sys_stat64, sys_newstat)
-#define __NR3264_lstat 1039
-__SC_3264(__NR3264_lstat, sys_lstat64, sys_newlstat)
-
-#undef __NR_syscalls
-#define __NR_syscalls (__NR3264_lstat+1)
-#endif /* __ARCH_WANT_SYSCALL_NO_AT */
-
-#ifdef __ARCH_WANT_SYSCALL_NO_FLAGS
-#define __NR_pipe 1040
-__SYSCALL(__NR_pipe, sys_pipe)
-#define __NR_dup2 1041
-__SYSCALL(__NR_dup2, sys_dup2)
-#define __NR_epoll_create 1042
-__SYSCALL(__NR_epoll_create, sys_epoll_create)
-#define __NR_inotify_init 1043
-__SYSCALL(__NR_inotify_init, sys_inotify_init)
-#define __NR_eventfd 1044
-__SYSCALL(__NR_eventfd, sys_eventfd)
-#define __NR_signalfd 1045
-__SYSCALL(__NR_signalfd, sys_signalfd)
-
-#undef __NR_syscalls
-#define __NR_syscalls (__NR_signalfd+1)
-#endif /* __ARCH_WANT_SYSCALL_NO_FLAGS */
-
-#if (__BITS_PER_LONG == 32 || defined(__SYSCALL_COMPAT)) && \
-     defined(__ARCH_WANT_SYSCALL_OFF_T)
-#define __NR_sendfile 1046
-__SYSCALL(__NR_sendfile, sys_sendfile)
-#define __NR_ftruncate 1047
-__SYSCALL(__NR_ftruncate, sys_ftruncate)
-#define __NR_truncate 1048
-__SYSCALL(__NR_truncate, sys_truncate)
-#define __NR_stat 1049
-__SYSCALL(__NR_stat, sys_newstat)
-#define __NR_lstat 1050
-__SYSCALL(__NR_lstat, sys_newlstat)
-#define __NR_fstat 1051
-__SYSCALL(__NR_fstat, sys_newfstat)
-#define __NR_fcntl 1052
-__SYSCALL(__NR_fcntl, sys_fcntl)
-#define __NR_fadvise64 1053
-#define __ARCH_WANT_SYS_FADVISE64
-__SYSCALL(__NR_fadvise64, sys_fadvise64)
-#define __NR_newfstatat 1054
-#define __ARCH_WANT_SYS_NEWFSTATAT
-__SYSCALL(__NR_newfstatat, sys_newfstatat)
-#define __NR_fstatfs 1055
-__SYSCALL(__NR_fstatfs, sys_fstatfs)
-#define __NR_statfs 1056
-__SYSCALL(__NR_statfs, sys_statfs)
-#define __NR_lseek 1057
-__SYSCALL(__NR_lseek, sys_lseek)
-#define __NR_mmap 1058
-__SYSCALL(__NR_mmap, sys_mmap)
-
-#undef __NR_syscalls
-#define __NR_syscalls (__NR_mmap+1)
-#endif /* 32 bit off_t syscalls */
-
-#ifdef __ARCH_WANT_SYSCALL_DEPRECATED
-#define __NR_alarm 1059
-#define __ARCH_WANT_SYS_ALARM
-__SYSCALL(__NR_alarm, sys_alarm)
-#define __NR_getpgrp 1060
-#define __ARCH_WANT_SYS_GETPGRP
-__SYSCALL(__NR_getpgrp, sys_getpgrp)
-#define __NR_pause 1061
-#define __ARCH_WANT_SYS_PAUSE
-__SYSCALL(__NR_pause, sys_pause)
-#define __NR_time 1062
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_COMPAT_SYS_TIME
-__SYSCALL(__NR_time, sys_time)
-#define __NR_utime 1063
-#define __ARCH_WANT_SYS_UTIME
-__SYSCALL(__NR_utime, sys_utime)
-
-#define __NR_creat 1064
-__SYSCALL(__NR_creat, sys_creat)
-#define __NR_getdents 1065
-#define __ARCH_WANT_SYS_GETDENTS
-__SYSCALL(__NR_getdents, sys_getdents)
-#define __NR_futimesat 1066
-__SYSCALL(__NR_futimesat, sys_futimesat)
-#define __NR_select 1067
-#define __ARCH_WANT_SYS_SELECT
-__SYSCALL(__NR_select, sys_select)
-#define __NR_poll 1068
-__SYSCALL(__NR_poll, sys_poll)
-#define __NR_epoll_wait 1069
-__SYSCALL(__NR_epoll_wait, sys_epoll_wait)
-#define __NR_ustat 1070
-__SYSCALL(__NR_ustat, sys_ustat)
-#define __NR_vfork 1071
-__SYSCALL(__NR_vfork, sys_vfork)
-#define __NR_oldwait4 1072
-__SYSCALL(__NR_oldwait4, sys_wait4)
-#define __NR_recv 1073
-__SYSCALL(__NR_recv, sys_recv)
-#define __NR_send 1074
-__SYSCALL(__NR_send, sys_send)
-#define __NR_bdflush 1075
-__SYSCALL(__NR_bdflush, sys_bdflush)
-#define __NR_umount 1076
-__SYSCALL(__NR_umount, sys_oldumount)
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __NR_uselib 1077
-__SYSCALL(__NR_uselib, sys_uselib)
-#define __NR__sysctl 1078
-__SYSCALL(__NR__sysctl, sys_sysctl)
-
-#define __NR_fork 1079
-#ifdef CONFIG_MMU
-__SYSCALL(__NR_fork, sys_fork)
-#else
-__SYSCALL(__NR_fork, sys_ni_syscall)
-#endif /* CONFIG_MMU */
-
-#undef __NR_syscalls
-#define __NR_syscalls (__NR_fork+1)
-
-#endif /* __ARCH_WANT_SYSCALL_DEPRECATED */
-
-/*
- * 32 bit systems traditionally used different
- * syscalls for off_t and loff_t arguments, while
- * 64 bit systems only need the off_t version.
- * For new 32 bit platforms, there is no need to
- * implement the old 32 bit off_t syscalls, so
- * they take different names.
- * Here we map the numbers so that both versions
- * use the same syscall table layout.
- */
-#if __BITS_PER_LONG == 64 && !defined(__SYSCALL_COMPAT)
-#define __NR_fcntl __NR3264_fcntl
-#define __NR_statfs __NR3264_statfs
-#define __NR_fstatfs __NR3264_fstatfs
-#define __NR_truncate __NR3264_truncate
-#define __NR_ftruncate __NR3264_ftruncate
-#define __NR_lseek __NR3264_lseek
-#define __NR_sendfile __NR3264_sendfile
-#define __NR_newfstatat __NR3264_fstatat
-#define __NR_fstat __NR3264_fstat
-#define __NR_mmap __NR3264_mmap
-#define __NR_fadvise64 __NR3264_fadvise64
-#ifdef __NR3264_stat
-#define __NR_stat __NR3264_stat
-#define __NR_lstat __NR3264_lstat
-#endif
-#else
-#define __NR_fcntl64 __NR3264_fcntl
-#define __NR_statfs64 __NR3264_statfs
-#define __NR_fstatfs64 __NR3264_fstatfs
-#define __NR_truncate64 __NR3264_truncate
-#define __NR_ftruncate64 __NR3264_ftruncate
-#define __NR_llseek __NR3264_lseek
-#define __NR_sendfile64 __NR3264_sendfile
-#define __NR_fstatat64 __NR3264_fstatat
-#define __NR_fstat64 __NR3264_fstat
-#define __NR_mmap2 __NR3264_mmap
-#define __NR_fadvise64_64 __NR3264_fadvise64
-#ifdef __NR3264_stat
-#define __NR_stat64 __NR3264_stat
-#define __NR_lstat64 __NR3264_lstat
-#endif
-#endif
diff --git a/openflow/usr/include/assert.h b/openflow/usr/include/assert.h
deleted file mode 100644
index aa6c503..0000000
--- a/openflow/usr/include/assert.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.2 Diagnostics	<assert.h>
- */
-
-#ifdef	_ASSERT_H
-
-# undef	_ASSERT_H
-# undef	assert
-# undef __ASSERT_VOID_CAST
-
-# ifdef	__USE_GNU
-#  undef assert_perror
-# endif
-
-#endif /* assert.h	*/
-
-#define	_ASSERT_H	1
-#include <features.h>
-
-#if defined __cplusplus && __GNUC_PREREQ (2,95)
-# define __ASSERT_VOID_CAST static_cast<void>
-#else
-# define __ASSERT_VOID_CAST (void)
-#endif
-
-/* void assert (int expression);
-
-   If NDEBUG is defined, do nothing.
-   If not, and EXPRESSION is zero, print an error message and abort.  */
-
-#ifdef	NDEBUG
-
-# define assert(expr)		(__ASSERT_VOID_CAST (0))
-
-/* void assert_perror (int errnum);
-
-   If NDEBUG is defined, do nothing.  If not, and ERRNUM is not zero, print an
-   error message with the error text for ERRNUM and abort.
-   (This is a GNU extension.) */
-
-# ifdef	__USE_GNU
-#  define assert_perror(errnum)	(__ASSERT_VOID_CAST (0))
-# endif
-
-#else /* Not NDEBUG.  */
-
-#ifndef _ASSERT_H_DECLS
-#define _ASSERT_H_DECLS
-__BEGIN_DECLS
-
-/* This prints an "Assertion failed" message and aborts.  */
-extern void __assert_fail (const char *__assertion, const char *__file,
-			   unsigned int __line, const char *__function)
-     __THROW __attribute__ ((__noreturn__));
-
-/* Likewise, but prints the error text for ERRNUM.  */
-extern void __assert_perror_fail (int __errnum, const char *__file,
-				  unsigned int __line, const char *__function)
-     __THROW __attribute__ ((__noreturn__));
-
-
-/* The following is not at all used here but needed for standard
-   compliance.  */
-extern void __assert (const char *__assertion, const char *__file, int __line)
-     __THROW __attribute__ ((__noreturn__));
-
-
-__END_DECLS
-#endif /* Not _ASSERT_H_DECLS */
-
-# define assert(expr)							\
-  ((expr)								\
-   ? __ASSERT_VOID_CAST (0)						\
-   : __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION))
-
-# ifdef	__USE_GNU
-#  define assert_perror(errnum)						\
-  (!(errnum)								\
-   ? __ASSERT_VOID_CAST (0)						\
-   : __assert_perror_fail ((errnum), __FILE__, __LINE__, __ASSERT_FUNCTION))
-# endif
-
-/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
-   which contains the name of the function currently being defined.
-   This is broken in G++ before version 2.6.
-   C9x has a similar variable called __func__, but prefer the GCC one since
-   it demangles C++ function names.  */
-# if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
-#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
-# else
-#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#   define __ASSERT_FUNCTION	__func__
-#  else
-#   define __ASSERT_FUNCTION	((const char *) 0)
-#  endif
-# endif
-
-#endif /* NDEBUG.  */
-
-
-#if defined __USE_ISOC11 && !defined __cplusplus
-# undef static_assert
-# define static_assert _Static_assert
-#endif
diff --git a/openflow/usr/include/autosprintf.h b/openflow/usr/include/autosprintf.h
deleted file mode 100644
index 22e7443..0000000
--- a/openflow/usr/include/autosprintf.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Class autosprintf - formatted output to an ostream.
-   Copyright (C) 2002, 2012-2015 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _AUTOSPRINTF_H
-#define _AUTOSPRINTF_H
-
-/* This feature is available in gcc versions 2.5 and later.  */
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
-# define _AUTOSPRINTF_ATTRIBUTE_FORMAT() /* empty */
-#else
-/* The __-protected variants of 'format' and 'printf' attributes
-   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define _AUTOSPRINTF_ATTRIBUTE_FORMAT() \
-  __attribute__ ((__format__ (__printf__, 2, 3)))
-# else
-#  define _AUTOSPRINTF_ATTRIBUTE_FORMAT() \
-  __attribute__ ((format (printf, 2, 3)))
-# endif
-#endif
-
-#include <string>
-#include <iostream>
-
-namespace gnu
-{
-  /* A temporary object, usually allocated on the stack, representing
-     the result of an asprintf() call.  */
-  class autosprintf
-  {
-  public:
-    /* Constructor: takes a format string and the printf arguments.  */
-    autosprintf (const char *format, ...)
-                _AUTOSPRINTF_ATTRIBUTE_FORMAT();
-    /* Copy constructor.  */
-    autosprintf (const autosprintf& src);
-    autosprintf& operator = (autosprintf copy);
-    /* Destructor: frees the temporarily allocated string.  */
-    ~autosprintf ();
-    /* Conversion to string.  */
-    operator char * () const;
-    operator std::string () const;
-    /* Output to an ostream.  */
-    friend inline std::ostream& operator<< (std::ostream& stream, const autosprintf& tmp)
-    {
-      stream << (tmp.str ? tmp.str : "(error in autosprintf)");
-      return stream;
-    }
-  private:
-    char *str;
-  };
-}
-
-#endif /* _AUTOSPRINTF_H */
diff --git a/openflow/usr/include/byteswap.h b/openflow/usr/include/byteswap.h
deleted file mode 100644
index d98618c..0000000
--- a/openflow/usr/include/byteswap.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _BYTESWAP_H
-#define _BYTESWAP_H	1
-
-#include <features.h>
-
-/* Get the machine specific, optimized definitions.  */
-#include <bits/byteswap.h>
-
-
-/* The following definitions must all be macros since otherwise some
-   of the possible optimizations are not possible.  */
-
-/* Return a value with all bytes in the 16 bit argument swapped.  */
-#define bswap_16(x) __bswap_16 (x)
-
-/* Return a value with all bytes in the 32 bit argument swapped.  */
-#define bswap_32(x) __bswap_32 (x)
-
-/* Return a value with all bytes in the 64 bit argument swapped.  */
-#define bswap_64(x) __bswap_64 (x)
-
-#endif /* byteswap.h */
diff --git a/openflow/usr/include/c++/5.3.1 b/openflow/usr/include/c++/5.3.1
deleted file mode 120000
index 7813681..0000000
--- a/openflow/usr/include/c++/5.3.1
+++ /dev/null
@@ -1 +0,0 @@
-5
\ No newline at end of file
diff --git a/openflow/usr/include/c++/5/algorithm b/openflow/usr/include/c++/5/algorithm
deleted file mode 100644
index 699666c..0000000
--- a/openflow/usr/include/c++/5/algorithm
+++ /dev/null
@@ -1,68 +0,0 @@
-// <algorithm> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/algorithm
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_ALGORITHM
-#define _GLIBCXX_ALGORITHM 1
-
-#pragma GCC system_header
-
-#include <utility> // UK-300.
-#include <bits/stl_algobase.h>
-#include <bits/stl_algo.h>
-
-#ifdef _GLIBCXX_PARALLEL
-# include <parallel/algorithm>
-#endif
-
-#endif /* _GLIBCXX_ALGORITHM */
diff --git a/openflow/usr/include/c++/5/array b/openflow/usr/include/c++/5/array
deleted file mode 100644
index 24be44f..0000000
--- a/openflow/usr/include/c++/5/array
+++ /dev/null
@@ -1,347 +0,0 @@
-// <array> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/array
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_ARRAY
-#define _GLIBCXX_ARRAY 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <stdexcept>
-#include <bits/stl_algobase.h>
-#include <bits/range_access.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  template<typename _Tp, std::size_t _Nm>
-    struct __array_traits
-    {
-      typedef _Tp _Type[_Nm];
-
-      static constexpr _Tp&
-      _S_ref(const _Type& __t, std::size_t __n) noexcept
-      { return const_cast<_Tp&>(__t[__n]); }
-
-      static constexpr _Tp*
-      _S_ptr(const _Type& __t) noexcept
-      { return const_cast<_Tp*>(__t); }
-    };
-
- template<typename _Tp>
-   struct __array_traits<_Tp, 0>
-   {
-     struct _Type { };
-
-     static constexpr _Tp&
-     _S_ref(const _Type&, std::size_t) noexcept
-     { return *static_cast<_Tp*>(nullptr); }
-
-     static constexpr _Tp*
-     _S_ptr(const _Type&) noexcept
-     { return nullptr; }
-   };
-
-  /**
-   *  @brief A standard container for storing a fixed size sequence of elements.
-   *
-   *  @ingroup sequences
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>.
-   *
-   *  Sets support random access iterators.
-   *
-   *  @tparam  Tp  Type of element. Required to be a complete type.
-   *  @tparam  N  Number of elements.
-  */
-  template<typename _Tp, std::size_t _Nm>
-    struct array
-    {
-      typedef _Tp 	    			      value_type;
-      typedef value_type*			      pointer;
-      typedef const value_type*                       const_pointer;
-      typedef value_type&                   	      reference;
-      typedef const value_type&             	      const_reference;
-      typedef value_type*          		      iterator;
-      typedef const value_type*			      const_iterator;
-      typedef std::size_t                    	      size_type;
-      typedef std::ptrdiff_t                   	      difference_type;
-      typedef std::reverse_iterator<iterator>	      reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>   const_reverse_iterator;
-
-      // Support for zero-sized arrays mandatory.
-      typedef _GLIBCXX_STD_C::__array_traits<_Tp, _Nm> _AT_Type;
-      typename _AT_Type::_Type                         _M_elems;
-
-      // No explicit construct/copy/destroy for aggregate type.
-
-      // DR 776.
-      void
-      fill(const value_type& __u)
-      { std::fill_n(begin(), size(), __u); }
-
-      void
-      swap(array& __other)
-      noexcept(noexcept(swap(std::declval<_Tp&>(), std::declval<_Tp&>())))
-      { std::swap_ranges(begin(), end(), __other.begin()); }
-
-      // Iterators.
-      iterator
-      begin() noexcept
-      { return iterator(data()); }
-
-      const_iterator
-      begin() const noexcept
-      { return const_iterator(data()); }
-
-      iterator
-      end() noexcept
-      { return iterator(data() + _Nm); }
-
-      const_iterator
-      end() const noexcept
-      { return const_iterator(data() + _Nm); }
-
-      reverse_iterator 
-      rbegin() noexcept
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator 
-      rbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator 
-      rend() noexcept
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator 
-      rend() const noexcept
-      { return const_reverse_iterator(begin()); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(data()); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(data() + _Nm); }
-
-      const_reverse_iterator 
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator 
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-
-      // Capacity.
-      constexpr size_type 
-      size() const noexcept { return _Nm; }
-
-      constexpr size_type 
-      max_size() const noexcept { return _Nm; }
-
-      constexpr bool 
-      empty() const noexcept { return size() == 0; }
-
-      // Element access.
-      reference
-      operator[](size_type __n) noexcept
-      { return _AT_Type::_S_ref(_M_elems, __n); }
-
-      constexpr const_reference
-      operator[](size_type __n) const noexcept
-      { return _AT_Type::_S_ref(_M_elems, __n); }
-
-      reference
-      at(size_type __n)
-      {
-	if (__n >= _Nm)
-	  std::__throw_out_of_range_fmt(__N("array::at: __n (which is %zu) "
-					    ">= _Nm (which is %zu)"),
-					__n, _Nm);
-	return _AT_Type::_S_ref(_M_elems, __n);
-      }
-
-      constexpr const_reference
-      at(size_type __n) const
-      {
-	// Result of conditional expression must be an lvalue so use
-	// boolean ? lvalue : (throw-expr, lvalue)
-	return __n < _Nm ? _AT_Type::_S_ref(_M_elems, __n)
-	  : (std::__throw_out_of_range_fmt(__N("array::at: __n (which is %zu) "
-					       ">= _Nm (which is %zu)"),
-					   __n, _Nm),
-	     _AT_Type::_S_ref(_M_elems, 0));
-      }
-
-      reference 
-      front() noexcept
-      { return *begin(); }
-
-      constexpr const_reference 
-      front() const noexcept
-      { return _AT_Type::_S_ref(_M_elems, 0); }
-
-      reference 
-      back() noexcept
-      { return _Nm ? *(end() - 1) : *end(); }
-
-      constexpr const_reference 
-      back() const noexcept
-      { 
-	return _Nm ? _AT_Type::_S_ref(_M_elems, _Nm - 1) 
- 	           : _AT_Type::_S_ref(_M_elems, 0);
-      }
-
-      pointer
-      data() noexcept
-      { return _AT_Type::_S_ptr(_M_elems); }
-
-      const_pointer
-      data() const noexcept
-      { return _AT_Type::_S_ptr(_M_elems); }
-    };
-
-  // Array comparisons.
-  template<typename _Tp, std::size_t _Nm>
-    inline bool 
-    operator==(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return std::equal(__one.begin(), __one.end(), __two.begin()); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator!=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one == __two); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator<(const array<_Tp, _Nm>& __a, const array<_Tp, _Nm>& __b)
-    { 
-      return std::lexicographical_compare(__a.begin(), __a.end(),
-					  __b.begin(), __b.end()); 
-    }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator>(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return __two < __one; }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator<=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one > __two); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator>=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one < __two); }
-
-  // Specialized algorithms.
-  template<typename _Tp, std::size_t _Nm>
-    inline void
-    swap(array<_Tp, _Nm>& __one, array<_Tp, _Nm>& __two)
-    noexcept(noexcept(__one.swap(__two)))
-    { __one.swap(__two); }
-
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    constexpr _Tp&
-    get(array<_Tp, _Nm>& __arr) noexcept
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      return _GLIBCXX_STD_C::__array_traits<_Tp, _Nm>::
-	_S_ref(__arr._M_elems, _Int);
-    }
-
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    constexpr _Tp&&
-    get(array<_Tp, _Nm>&& __arr) noexcept
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      return std::move(_GLIBCXX_STD_C::get<_Int>(__arr));
-    }
-
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    constexpr const _Tp&
-    get(const array<_Tp, _Nm>& __arr) noexcept
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      return _GLIBCXX_STD_C::__array_traits<_Tp, _Nm>::
-	_S_ref(__arr._M_elems, _Int);
-    }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Tuple interface to class template array.
-
-  /// tuple_size
-  template<typename _Tp> 
-    class tuple_size;
-
-  /// Partial specialization for std::array
-  template<typename _Tp, std::size_t _Nm>
-    struct tuple_size<_GLIBCXX_STD_C::array<_Tp, _Nm>>
-    : public integral_constant<std::size_t, _Nm> { };
-
-  /// tuple_element
-  template<std::size_t _Int, typename _Tp>
-    class tuple_element;
-
-  /// Partial specialization for std::array
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    struct tuple_element<_Int, _GLIBCXX_STD_C::array<_Tp, _Nm>>
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      typedef _Tp type;
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/array>
-#endif
-
-#ifdef _GLIBCXX_PROFILE
-# include <profile/array>
-#endif
-
-#endif // C++11
-
-#endif // _GLIBCXX_ARRAY
diff --git a/openflow/usr/include/c++/5/atomic b/openflow/usr/include/c++/5/atomic
deleted file mode 100644
index cdd1f0b..0000000
--- a/openflow/usr/include/c++/5/atomic
+++ /dev/null
@@ -1,1252 +0,0 @@
-// -*- C++ -*- header.
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/atomic
- *  This is a Standard C++ Library header.
- */
-
-// Based on "C++ Atomic Types and Operations" by Hans Boehm and Lawrence Crowl.
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2427.html
-
-#ifndef _GLIBCXX_ATOMIC
-#define _GLIBCXX_ATOMIC 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <bits/atomic_base.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup atomics
-   * @{
-   */
-
-  template<typename _Tp>
-    struct atomic;
-
-  /// atomic<bool>
-  // NB: No operators or fetch-operations for this type.
-  template<>
-  struct atomic<bool>
-  {
-  private:
-    __atomic_base<bool>	_M_base;
-
-  public:
-    atomic() noexcept = default;
-    ~atomic() noexcept = default;
-    atomic(const atomic&) = delete;
-    atomic& operator=(const atomic&) = delete;
-    atomic& operator=(const atomic&) volatile = delete;
-
-    constexpr atomic(bool __i) noexcept : _M_base(__i) { }
-
-    bool
-    operator=(bool __i) noexcept
-    { return _M_base.operator=(__i); }
-
-    bool
-    operator=(bool __i) volatile noexcept
-    { return _M_base.operator=(__i); }
-
-    operator bool() const noexcept
-    { return _M_base.load(); }
-
-    operator bool() const volatile noexcept
-    { return _M_base.load(); }
-
-    bool
-    is_lock_free() const noexcept { return _M_base.is_lock_free(); }
-
-    bool
-    is_lock_free() const volatile noexcept { return _M_base.is_lock_free(); }
-
-    void
-    store(bool __i, memory_order __m = memory_order_seq_cst) noexcept
-    { _M_base.store(__i, __m); }
-
-    void
-    store(bool __i, memory_order __m = memory_order_seq_cst) volatile noexcept
-    { _M_base.store(__i, __m); }
-
-    bool
-    load(memory_order __m = memory_order_seq_cst) const noexcept
-    { return _M_base.load(__m); }
-
-    bool
-    load(memory_order __m = memory_order_seq_cst) const volatile noexcept
-    { return _M_base.load(__m); }
-
-    bool
-    exchange(bool __i, memory_order __m = memory_order_seq_cst) noexcept
-    { return _M_base.exchange(__i, __m); }
-
-    bool
-    exchange(bool __i,
-	     memory_order __m = memory_order_seq_cst) volatile noexcept
-    { return _M_base.exchange(__i, __m); }
-
-    bool
-    compare_exchange_weak(bool& __i1, bool __i2, memory_order __m1,
-			  memory_order __m2) noexcept
-    { return _M_base.compare_exchange_weak(__i1, __i2, __m1, __m2); }
-
-    bool
-    compare_exchange_weak(bool& __i1, bool __i2, memory_order __m1,
-			  memory_order __m2) volatile noexcept
-    { return _M_base.compare_exchange_weak(__i1, __i2, __m1, __m2); }
-
-    bool
-    compare_exchange_weak(bool& __i1, bool __i2,
-			  memory_order __m = memory_order_seq_cst) noexcept
-    { return _M_base.compare_exchange_weak(__i1, __i2, __m); }
-
-    bool
-    compare_exchange_weak(bool& __i1, bool __i2,
-		     memory_order __m = memory_order_seq_cst) volatile noexcept
-    { return _M_base.compare_exchange_weak(__i1, __i2, __m); }
-
-    bool
-    compare_exchange_strong(bool& __i1, bool __i2, memory_order __m1,
-			    memory_order __m2) noexcept
-    { return _M_base.compare_exchange_strong(__i1, __i2, __m1, __m2); }
-
-    bool
-    compare_exchange_strong(bool& __i1, bool __i2, memory_order __m1,
-			    memory_order __m2) volatile noexcept
-    { return _M_base.compare_exchange_strong(__i1, __i2, __m1, __m2); }
-
-    bool
-    compare_exchange_strong(bool& __i1, bool __i2,
-			    memory_order __m = memory_order_seq_cst) noexcept
-    { return _M_base.compare_exchange_strong(__i1, __i2, __m); }
-
-    bool
-    compare_exchange_strong(bool& __i1, bool __i2,
-		    memory_order __m = memory_order_seq_cst) volatile noexcept
-    { return _M_base.compare_exchange_strong(__i1, __i2, __m); }
-  };
-
-
-  /**
-   *  @brief Generic atomic type, primary class template.
-   *
-   *  @tparam _Tp  Type to be made atomic, must be trivally copyable.
-   */
-  template<typename _Tp>
-    struct atomic
-    {
-    private:
-      // Align 1/2/4/8/16-byte types to at least their size.
-      static constexpr int _S_min_alignment
-	= (sizeof(_Tp) & (sizeof(_Tp) - 1)) || sizeof(_Tp) > 16
-	? 0 : sizeof(_Tp);
-
-      static constexpr int _S_alignment
-        = _S_min_alignment > alignof(_Tp) ? _S_min_alignment : alignof(_Tp);
-
-      alignas(_S_alignment) _Tp _M_i;
-
-      static_assert(__is_trivially_copyable(_Tp),
-		    "std::atomic requires a trivially copyable type");
-
-      static_assert(sizeof(_Tp) > 0,
-		    "Incomplete or zero-sized types are not supported");
-
-    public:
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(_Tp __i) noexcept : _M_i(__i) { }
-
-      operator _Tp() const noexcept
-      { return load(); }
-
-      operator _Tp() const volatile noexcept
-      { return load(); }
-
-      _Tp
-      operator=(_Tp __i) noexcept 
-      { store(__i); return __i; }
-
-      _Tp
-      operator=(_Tp __i) volatile noexcept 
-      { store(__i); return __i; }
-
-      bool
-      is_lock_free() const noexcept
-      {
-	// Produce a fake, minimally aligned pointer.
-	return __atomic_is_lock_free(sizeof(_M_i),
-	    reinterpret_cast<void *>(-__alignof(_M_i)));
-      }
-
-      bool
-      is_lock_free() const volatile noexcept
-      {
-	// Produce a fake, minimally aligned pointer.
-	return __atomic_is_lock_free(sizeof(_M_i),
-	    reinterpret_cast<void *>(-__alignof(_M_i)));
-      }
-
-      void
-      store(_Tp __i, memory_order __m = memory_order_seq_cst) noexcept
-      { __atomic_store(&_M_i, &__i, __m); }
-
-      void
-      store(_Tp __i, memory_order __m = memory_order_seq_cst) volatile noexcept
-      { __atomic_store(&_M_i, &__i, __m); }
-
-      _Tp
-      load(memory_order __m = memory_order_seq_cst) const noexcept
-      { 
-        _Tp tmp;
-	__atomic_load(&_M_i, &tmp, __m);
-	return tmp;
-      }
-
-      _Tp
-      load(memory_order __m = memory_order_seq_cst) const volatile noexcept
-      { 
-        _Tp tmp;
-	__atomic_load(&_M_i, &tmp, __m);
-	return tmp;
-      }
-
-      _Tp
-      exchange(_Tp __i, memory_order __m = memory_order_seq_cst) noexcept
-      { 
-        _Tp tmp;
-	__atomic_exchange(&_M_i, &__i, &tmp, __m);
-	return tmp;
-      }
-
-      _Tp
-      exchange(_Tp __i, 
-	       memory_order __m = memory_order_seq_cst) volatile noexcept
-      { 
-        _Tp tmp;
-	__atomic_exchange(&_M_i, &__i, &tmp, __m);
-	return tmp;
-      }
-
-      bool
-      compare_exchange_weak(_Tp& __e, _Tp __i, memory_order __s, 
-			    memory_order __f) noexcept
-      {
-	return __atomic_compare_exchange(&_M_i, &__e, &__i, true, __s, __f);
-      }
-
-      bool
-      compare_exchange_weak(_Tp& __e, _Tp __i, memory_order __s, 
-			    memory_order __f) volatile noexcept
-      {
-	return __atomic_compare_exchange(&_M_i, &__e, &__i, true, __s, __f);
-      }
-
-      bool
-      compare_exchange_weak(_Tp& __e, _Tp __i,
-			    memory_order __m = memory_order_seq_cst) noexcept
-      { return compare_exchange_weak(__e, __i, __m,
-                                     __cmpexch_failure_order(__m)); }
-
-      bool
-      compare_exchange_weak(_Tp& __e, _Tp __i,
-		     memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return compare_exchange_weak(__e, __i, __m,
-                                     __cmpexch_failure_order(__m)); }
-
-      bool
-      compare_exchange_strong(_Tp& __e, _Tp __i, memory_order __s, 
-			      memory_order __f) noexcept
-      {
-	return __atomic_compare_exchange(&_M_i, &__e, &__i, false, __s, __f);
-      }
-
-      bool
-      compare_exchange_strong(_Tp& __e, _Tp __i, memory_order __s, 
-			      memory_order __f) volatile noexcept
-      {
-	return __atomic_compare_exchange(&_M_i, &__e, &__i, false, __s, __f);
-      }
-
-      bool
-      compare_exchange_strong(_Tp& __e, _Tp __i,
-			       memory_order __m = memory_order_seq_cst) noexcept
-      { return compare_exchange_strong(__e, __i, __m,
-                                       __cmpexch_failure_order(__m)); }
-
-      bool
-      compare_exchange_strong(_Tp& __e, _Tp __i,
-		     memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return compare_exchange_strong(__e, __i, __m,
-                                       __cmpexch_failure_order(__m)); }
-    };
-
-
-  /// Partial specialization for pointer types.
-  template<typename _Tp>
-    struct atomic<_Tp*>
-    {
-      typedef _Tp* 			__pointer_type;
-      typedef __atomic_base<_Tp*>	__base_type;
-      __base_type			_M_b;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__pointer_type __p) noexcept : _M_b(__p) { }
-
-      operator __pointer_type() const noexcept
-      { return __pointer_type(_M_b); }
-
-      operator __pointer_type() const volatile noexcept
-      { return __pointer_type(_M_b); }
-
-      __pointer_type
-      operator=(__pointer_type __p) noexcept
-      { return _M_b.operator=(__p); }
-
-      __pointer_type
-      operator=(__pointer_type __p) volatile noexcept
-      { return _M_b.operator=(__p); }
-
-      __pointer_type
-      operator++(int) noexcept
-      { return _M_b++; }
-
-      __pointer_type
-      operator++(int) volatile noexcept
-      { return _M_b++; }
-
-      __pointer_type
-      operator--(int) noexcept
-      { return _M_b--; }
-
-      __pointer_type
-      operator--(int) volatile noexcept
-      { return _M_b--; }
-
-      __pointer_type
-      operator++() noexcept
-      { return ++_M_b; }
-
-      __pointer_type
-      operator++() volatile noexcept
-      { return ++_M_b; }
-
-      __pointer_type
-      operator--() noexcept
-      { return --_M_b; }
-
-      __pointer_type
-      operator--() volatile noexcept
-      { return --_M_b; }
-
-      __pointer_type
-      operator+=(ptrdiff_t __d) noexcept
-      { return _M_b.operator+=(__d); }
-
-      __pointer_type
-      operator+=(ptrdiff_t __d) volatile noexcept
-      { return _M_b.operator+=(__d); }
-
-      __pointer_type
-      operator-=(ptrdiff_t __d) noexcept
-      { return _M_b.operator-=(__d); }
-
-      __pointer_type
-      operator-=(ptrdiff_t __d) volatile noexcept
-      { return _M_b.operator-=(__d); }
-
-      bool
-      is_lock_free() const noexcept
-      { return _M_b.is_lock_free(); }
-
-      bool
-      is_lock_free() const volatile noexcept
-      { return _M_b.is_lock_free(); }
-
-      void
-      store(__pointer_type __p,
-	    memory_order __m = memory_order_seq_cst) noexcept
-      { return _M_b.store(__p, __m); }
-
-      void
-      store(__pointer_type __p,
-	    memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return _M_b.store(__p, __m); }
-
-      __pointer_type
-      load(memory_order __m = memory_order_seq_cst) const noexcept
-      { return _M_b.load(__m); }
-
-      __pointer_type
-      load(memory_order __m = memory_order_seq_cst) const volatile noexcept
-      { return _M_b.load(__m); }
-
-      __pointer_type
-      exchange(__pointer_type __p,
-	       memory_order __m = memory_order_seq_cst) noexcept
-      { return _M_b.exchange(__p, __m); }
-
-      __pointer_type
-      exchange(__pointer_type __p,
-	       memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return _M_b.exchange(__p, __m); }
-
-      bool
-      compare_exchange_weak(__pointer_type& __p1, __pointer_type __p2,
-			    memory_order __m1, memory_order __m2) noexcept
-      { return _M_b.compare_exchange_strong(__p1, __p2, __m1, __m2); }
-
-      bool
-      compare_exchange_weak(__pointer_type& __p1, __pointer_type __p2,
-			    memory_order __m1,
-			    memory_order __m2) volatile noexcept
-      { return _M_b.compare_exchange_strong(__p1, __p2, __m1, __m2); }
-
-      bool
-      compare_exchange_weak(__pointer_type& __p1, __pointer_type __p2,
-			    memory_order __m = memory_order_seq_cst) noexcept
-      {
-	return compare_exchange_weak(__p1, __p2, __m,
-				     __cmpexch_failure_order(__m));
-      }
-
-      bool
-      compare_exchange_weak(__pointer_type& __p1, __pointer_type __p2,
-		    memory_order __m = memory_order_seq_cst) volatile noexcept
-      {
-	return compare_exchange_weak(__p1, __p2, __m,
-				     __cmpexch_failure_order(__m));
-      }
-
-      bool
-      compare_exchange_strong(__pointer_type& __p1, __pointer_type __p2,
-			      memory_order __m1, memory_order __m2) noexcept
-      { return _M_b.compare_exchange_strong(__p1, __p2, __m1, __m2); }
-
-      bool
-      compare_exchange_strong(__pointer_type& __p1, __pointer_type __p2,
-			      memory_order __m1,
-			      memory_order __m2) volatile noexcept
-      { return _M_b.compare_exchange_strong(__p1, __p2, __m1, __m2); }
-
-      bool
-      compare_exchange_strong(__pointer_type& __p1, __pointer_type __p2,
-			      memory_order __m = memory_order_seq_cst) noexcept
-      {
-	return _M_b.compare_exchange_strong(__p1, __p2, __m,
-					    __cmpexch_failure_order(__m));
-      }
-
-      bool
-      compare_exchange_strong(__pointer_type& __p1, __pointer_type __p2,
-		    memory_order __m = memory_order_seq_cst) volatile noexcept
-      {
-	return _M_b.compare_exchange_strong(__p1, __p2, __m,
-					    __cmpexch_failure_order(__m));
-      }
-
-      __pointer_type
-      fetch_add(ptrdiff_t __d,
-		memory_order __m = memory_order_seq_cst) noexcept
-      { return _M_b.fetch_add(__d, __m); }
-
-      __pointer_type
-      fetch_add(ptrdiff_t __d,
-		memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return _M_b.fetch_add(__d, __m); }
-
-      __pointer_type
-      fetch_sub(ptrdiff_t __d,
-		memory_order __m = memory_order_seq_cst) noexcept
-      { return _M_b.fetch_sub(__d, __m); }
-
-      __pointer_type
-      fetch_sub(ptrdiff_t __d,
-		memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return _M_b.fetch_sub(__d, __m); }
-    };
-
-
-  /// Explicit specialization for char.
-  template<>
-    struct atomic<char> : __atomic_base<char>
-    {
-      typedef char 			__integral_type;
-      typedef __atomic_base<char> 	__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for signed char.
-  template<>
-    struct atomic<signed char> : __atomic_base<signed char>
-    {
-      typedef signed char 		__integral_type;
-      typedef __atomic_base<signed char> 	__base_type;
-
-      atomic() noexcept= default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for unsigned char.
-  template<>
-    struct atomic<unsigned char> : __atomic_base<unsigned char>
-    {
-      typedef unsigned char 		__integral_type;
-      typedef __atomic_base<unsigned char> 	__base_type;
-
-      atomic() noexcept= default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for short.
-  template<>
-    struct atomic<short> : __atomic_base<short>
-    {
-      typedef short 			__integral_type;
-      typedef __atomic_base<short> 		__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for unsigned short.
-  template<>
-    struct atomic<unsigned short> : __atomic_base<unsigned short>
-    {
-      typedef unsigned short 	      	__integral_type;
-      typedef __atomic_base<unsigned short> 		__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for int.
-  template<>
-    struct atomic<int> : __atomic_base<int>
-    {
-      typedef int 			__integral_type;
-      typedef __atomic_base<int> 		__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for unsigned int.
-  template<>
-    struct atomic<unsigned int> : __atomic_base<unsigned int>
-    {
-      typedef unsigned int		__integral_type;
-      typedef __atomic_base<unsigned int> 	__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for long.
-  template<>
-    struct atomic<long> : __atomic_base<long>
-    {
-      typedef long 			__integral_type;
-      typedef __atomic_base<long> 	__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for unsigned long.
-  template<>
-    struct atomic<unsigned long> : __atomic_base<unsigned long>
-    {
-      typedef unsigned long 		__integral_type;
-      typedef __atomic_base<unsigned long> 	__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for long long.
-  template<>
-    struct atomic<long long> : __atomic_base<long long>
-    {
-      typedef long long 		__integral_type;
-      typedef __atomic_base<long long> 		__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for unsigned long long.
-  template<>
-    struct atomic<unsigned long long> : __atomic_base<unsigned long long>
-    {
-      typedef unsigned long long       	__integral_type;
-      typedef __atomic_base<unsigned long long> 	__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for wchar_t.
-  template<>
-    struct atomic<wchar_t> : __atomic_base<wchar_t>
-    {
-      typedef wchar_t 			__integral_type;
-      typedef __atomic_base<wchar_t> 	__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for char16_t.
-  template<>
-    struct atomic<char16_t> : __atomic_base<char16_t>
-    {
-      typedef char16_t 			__integral_type;
-      typedef __atomic_base<char16_t> 	__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-  /// Explicit specialization for char32_t.
-  template<>
-    struct atomic<char32_t> : __atomic_base<char32_t>
-    {
-      typedef char32_t 			__integral_type;
-      typedef __atomic_base<char32_t> 	__base_type;
-
-      atomic() noexcept = default;
-      ~atomic() noexcept = default;
-      atomic(const atomic&) = delete;
-      atomic& operator=(const atomic&) = delete;
-      atomic& operator=(const atomic&) volatile = delete;
-
-      constexpr atomic(__integral_type __i) noexcept : __base_type(__i) { }
-
-      using __base_type::operator __integral_type;
-      using __base_type::operator=;
-    };
-
-
-  /// atomic_bool
-  typedef atomic<bool>			atomic_bool;
-
-  /// atomic_char
-  typedef atomic<char>			atomic_char;
-
-  /// atomic_schar
-  typedef atomic<signed char>		atomic_schar;
-
-  /// atomic_uchar
-  typedef atomic<unsigned char>		atomic_uchar;
-
-  /// atomic_short
-  typedef atomic<short>			atomic_short;
-
-  /// atomic_ushort
-  typedef atomic<unsigned short>	atomic_ushort;
-
-  /// atomic_int
-  typedef atomic<int>			atomic_int;
-
-  /// atomic_uint
-  typedef atomic<unsigned int>		atomic_uint;
-
-  /// atomic_long
-  typedef atomic<long>			atomic_long;
-
-  /// atomic_ulong
-  typedef atomic<unsigned long>		atomic_ulong;
-
-  /// atomic_llong
-  typedef atomic<long long>		atomic_llong;
-
-  /// atomic_ullong
-  typedef atomic<unsigned long long>	atomic_ullong;
-
-  /// atomic_wchar_t
-  typedef atomic<wchar_t>		atomic_wchar_t;
-
-  /// atomic_char16_t
-  typedef atomic<char16_t>		atomic_char16_t;
-
-  /// atomic_char32_t
-  typedef atomic<char32_t>		atomic_char32_t;
-
-
-  /// atomic_int_least8_t
-  typedef atomic<int_least8_t>		atomic_int_least8_t;
-
-  /// atomic_uint_least8_t
-  typedef atomic<uint_least8_t>		atomic_uint_least8_t;
-
-  /// atomic_int_least16_t
-  typedef atomic<int_least16_t>		atomic_int_least16_t;
-
-  /// atomic_uint_least16_t
-  typedef atomic<uint_least16_t>	atomic_uint_least16_t;
-
-  /// atomic_int_least32_t
-  typedef atomic<int_least32_t>		atomic_int_least32_t;
-
-  /// atomic_uint_least32_t
-  typedef atomic<uint_least32_t>	atomic_uint_least32_t;
-
-  /// atomic_int_least64_t
-  typedef atomic<int_least64_t>		atomic_int_least64_t;
-
-  /// atomic_uint_least64_t
-  typedef atomic<uint_least64_t>	atomic_uint_least64_t;
-
-
-  /// atomic_int_fast8_t
-  typedef atomic<int_fast8_t>		atomic_int_fast8_t;
-
-  /// atomic_uint_fast8_t
-  typedef atomic<uint_fast8_t>		atomic_uint_fast8_t;
-
-  /// atomic_int_fast16_t
-  typedef atomic<int_fast16_t>		atomic_int_fast16_t;
-
-  /// atomic_uint_fast16_t
-  typedef atomic<uint_fast16_t>		atomic_uint_fast16_t;
-
-  /// atomic_int_fast32_t
-  typedef atomic<int_fast32_t>		atomic_int_fast32_t;
-
-  /// atomic_uint_fast32_t
-  typedef atomic<uint_fast32_t>		atomic_uint_fast32_t;
-
-  /// atomic_int_fast64_t
-  typedef atomic<int_fast64_t>		atomic_int_fast64_t;
-
-  /// atomic_uint_fast64_t
-  typedef atomic<uint_fast64_t>		atomic_uint_fast64_t;
-
-
-  /// atomic_intptr_t
-  typedef atomic<intptr_t>		atomic_intptr_t;
-
-  /// atomic_uintptr_t
-  typedef atomic<uintptr_t>		atomic_uintptr_t;
-
-  /// atomic_size_t
-  typedef atomic<size_t>		atomic_size_t;
-
-  /// atomic_intmax_t
-  typedef atomic<intmax_t>		atomic_intmax_t;
-
-  /// atomic_uintmax_t
-  typedef atomic<uintmax_t>		atomic_uintmax_t;
-
-  /// atomic_ptrdiff_t
-  typedef atomic<ptrdiff_t>		atomic_ptrdiff_t;
-
-
-  // Function definitions, atomic_flag operations.
-  inline bool
-  atomic_flag_test_and_set_explicit(atomic_flag* __a,
-				    memory_order __m) noexcept
-  { return __a->test_and_set(__m); }
-
-  inline bool
-  atomic_flag_test_and_set_explicit(volatile atomic_flag* __a,
-				    memory_order __m) noexcept
-  { return __a->test_and_set(__m); }
-
-  inline void
-  atomic_flag_clear_explicit(atomic_flag* __a, memory_order __m) noexcept
-  { __a->clear(__m); }
-
-  inline void
-  atomic_flag_clear_explicit(volatile atomic_flag* __a,
-			     memory_order __m) noexcept
-  { __a->clear(__m); }
-
-  inline bool
-  atomic_flag_test_and_set(atomic_flag* __a) noexcept
-  { return atomic_flag_test_and_set_explicit(__a, memory_order_seq_cst); }
-
-  inline bool
-  atomic_flag_test_and_set(volatile atomic_flag* __a) noexcept
-  { return atomic_flag_test_and_set_explicit(__a, memory_order_seq_cst); }
-
-  inline void
-  atomic_flag_clear(atomic_flag* __a) noexcept
-  { atomic_flag_clear_explicit(__a, memory_order_seq_cst); }
-
-  inline void
-  atomic_flag_clear(volatile atomic_flag* __a) noexcept
-  { atomic_flag_clear_explicit(__a, memory_order_seq_cst); }
-
-
-  // Function templates generally applicable to atomic types.
-  template<typename _ITp>
-    inline bool
-    atomic_is_lock_free(const atomic<_ITp>* __a) noexcept
-    { return __a->is_lock_free(); }
-
-  template<typename _ITp>
-    inline bool
-    atomic_is_lock_free(const volatile atomic<_ITp>* __a) noexcept
-    { return __a->is_lock_free(); }
-
-  template<typename _ITp>
-    inline void
-    atomic_init(atomic<_ITp>* __a, _ITp __i) noexcept
-    { __a->store(__i, memory_order_relaxed); }
-
-  template<typename _ITp>
-    inline void
-    atomic_init(volatile atomic<_ITp>* __a, _ITp __i) noexcept
-    { __a->store(__i, memory_order_relaxed); }
-
-  template<typename _ITp>
-    inline void
-    atomic_store_explicit(atomic<_ITp>* __a, _ITp __i,
-			  memory_order __m) noexcept
-    { __a->store(__i, __m); }
-
-  template<typename _ITp>
-    inline void
-    atomic_store_explicit(volatile atomic<_ITp>* __a, _ITp __i,
-			  memory_order __m) noexcept
-    { __a->store(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_load_explicit(const atomic<_ITp>* __a, memory_order __m) noexcept
-    { return __a->load(__m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_load_explicit(const volatile atomic<_ITp>* __a,
-			 memory_order __m) noexcept
-    { return __a->load(__m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_exchange_explicit(atomic<_ITp>* __a, _ITp __i,
-			     memory_order __m) noexcept
-    { return __a->exchange(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_exchange_explicit(volatile atomic<_ITp>* __a, _ITp __i,
-			     memory_order __m) noexcept
-    { return __a->exchange(__i, __m); }
-
-  template<typename _ITp>
-    inline bool
-    atomic_compare_exchange_weak_explicit(atomic<_ITp>* __a,
-					  _ITp* __i1, _ITp __i2,
-					  memory_order __m1,
-					  memory_order __m2) noexcept
-    { return __a->compare_exchange_weak(*__i1, __i2, __m1, __m2); }
-
-  template<typename _ITp>
-    inline bool
-    atomic_compare_exchange_weak_explicit(volatile atomic<_ITp>* __a,
-					  _ITp* __i1, _ITp __i2,
-					  memory_order __m1,
-					  memory_order __m2) noexcept
-    { return __a->compare_exchange_weak(*__i1, __i2, __m1, __m2); }
-
-  template<typename _ITp>
-    inline bool
-    atomic_compare_exchange_strong_explicit(atomic<_ITp>* __a,
-					    _ITp* __i1, _ITp __i2,
-					    memory_order __m1,
-					    memory_order __m2) noexcept
-    { return __a->compare_exchange_strong(*__i1, __i2, __m1, __m2); }
-
-  template<typename _ITp>
-    inline bool
-    atomic_compare_exchange_strong_explicit(volatile atomic<_ITp>* __a,
-					    _ITp* __i1, _ITp __i2,
-					    memory_order __m1,
-					    memory_order __m2) noexcept
-    { return __a->compare_exchange_strong(*__i1, __i2, __m1, __m2); }
-
-
-  template<typename _ITp>
-    inline void
-    atomic_store(atomic<_ITp>* __a, _ITp __i) noexcept
-    { atomic_store_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline void
-    atomic_store(volatile atomic<_ITp>* __a, _ITp __i) noexcept
-    { atomic_store_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_load(const atomic<_ITp>* __a) noexcept
-    { return atomic_load_explicit(__a, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_load(const volatile atomic<_ITp>* __a) noexcept
-    { return atomic_load_explicit(__a, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_exchange(atomic<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_exchange_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_exchange(volatile atomic<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_exchange_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline bool
-    atomic_compare_exchange_weak(atomic<_ITp>* __a,
-				 _ITp* __i1, _ITp __i2) noexcept
-    {
-      return atomic_compare_exchange_weak_explicit(__a, __i1, __i2,
-						   memory_order_seq_cst,
-						   memory_order_seq_cst);
-    }
-
-  template<typename _ITp>
-    inline bool
-    atomic_compare_exchange_weak(volatile atomic<_ITp>* __a,
-				 _ITp* __i1, _ITp __i2) noexcept
-    {
-      return atomic_compare_exchange_weak_explicit(__a, __i1, __i2,
-						   memory_order_seq_cst,
-						   memory_order_seq_cst);
-    }
-
-  template<typename _ITp>
-    inline bool
-    atomic_compare_exchange_strong(atomic<_ITp>* __a,
-				   _ITp* __i1, _ITp __i2) noexcept
-    {
-      return atomic_compare_exchange_strong_explicit(__a, __i1, __i2,
-						     memory_order_seq_cst,
-						     memory_order_seq_cst);
-    }
-
-  template<typename _ITp>
-    inline bool
-    atomic_compare_exchange_strong(volatile atomic<_ITp>* __a,
-				   _ITp* __i1, _ITp __i2) noexcept
-    {
-      return atomic_compare_exchange_strong_explicit(__a, __i1, __i2,
-						     memory_order_seq_cst,
-						     memory_order_seq_cst);
-    }
-
-  // Function templates for atomic_integral operations only, using
-  // __atomic_base. Template argument should be constricted to
-  // intergral types as specified in the standard, excluding address
-  // types.
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_add_explicit(__atomic_base<_ITp>* __a, _ITp __i,
-			      memory_order __m) noexcept
-    { return __a->fetch_add(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_add_explicit(volatile __atomic_base<_ITp>* __a, _ITp __i,
-			      memory_order __m) noexcept
-    { return __a->fetch_add(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_sub_explicit(__atomic_base<_ITp>* __a, _ITp __i,
-			      memory_order __m) noexcept
-    { return __a->fetch_sub(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_sub_explicit(volatile __atomic_base<_ITp>* __a, _ITp __i,
-			      memory_order __m) noexcept
-    { return __a->fetch_sub(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_and_explicit(__atomic_base<_ITp>* __a, _ITp __i,
-			      memory_order __m) noexcept
-    { return __a->fetch_and(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_and_explicit(volatile __atomic_base<_ITp>* __a, _ITp __i,
-			      memory_order __m) noexcept
-    { return __a->fetch_and(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_or_explicit(__atomic_base<_ITp>* __a, _ITp __i,
-			     memory_order __m) noexcept
-    { return __a->fetch_or(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_or_explicit(volatile __atomic_base<_ITp>* __a, _ITp __i,
-			     memory_order __m) noexcept
-    { return __a->fetch_or(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_xor_explicit(__atomic_base<_ITp>* __a, _ITp __i,
-			      memory_order __m) noexcept
-    { return __a->fetch_xor(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_xor_explicit(volatile __atomic_base<_ITp>* __a, _ITp __i,
-			      memory_order __m) noexcept
-    { return __a->fetch_xor(__i, __m); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_add(__atomic_base<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_fetch_add_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_add(volatile __atomic_base<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_fetch_add_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_sub(__atomic_base<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_fetch_sub_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_sub(volatile __atomic_base<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_fetch_sub_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_and(__atomic_base<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_fetch_and_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_and(volatile __atomic_base<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_fetch_and_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_or(__atomic_base<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_fetch_or_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_or(volatile __atomic_base<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_fetch_or_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_xor(__atomic_base<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_fetch_xor_explicit(__a, __i, memory_order_seq_cst); }
-
-  template<typename _ITp>
-    inline _ITp
-    atomic_fetch_xor(volatile __atomic_base<_ITp>* __a, _ITp __i) noexcept
-    { return atomic_fetch_xor_explicit(__a, __i, memory_order_seq_cst); }
-
-
-  // Partial specializations for pointers.
-  template<typename _ITp>
-    inline _ITp*
-    atomic_fetch_add_explicit(atomic<_ITp*>* __a, ptrdiff_t __d,
-			      memory_order __m) noexcept
-    { return __a->fetch_add(__d, __m); }
-
-  template<typename _ITp>
-    inline _ITp*
-    atomic_fetch_add_explicit(volatile atomic<_ITp*>* __a, ptrdiff_t __d,
-			      memory_order __m) noexcept
-    { return __a->fetch_add(__d, __m); }
-
-  template<typename _ITp>
-    inline _ITp*
-    atomic_fetch_add(volatile atomic<_ITp*>* __a, ptrdiff_t __d) noexcept
-    { return __a->fetch_add(__d); }
-
-  template<typename _ITp>
-    inline _ITp*
-    atomic_fetch_add(atomic<_ITp*>* __a, ptrdiff_t __d) noexcept
-    { return __a->fetch_add(__d); }
-
-  template<typename _ITp>
-    inline _ITp*
-    atomic_fetch_sub_explicit(volatile atomic<_ITp*>* __a,
-			      ptrdiff_t __d, memory_order __m) noexcept
-    { return __a->fetch_sub(__d, __m); }
-
-  template<typename _ITp>
-    inline _ITp*
-    atomic_fetch_sub_explicit(atomic<_ITp*>* __a, ptrdiff_t __d,
-			      memory_order __m) noexcept
-    { return __a->fetch_sub(__d, __m); }
-
-  template<typename _ITp>
-    inline _ITp*
-    atomic_fetch_sub(volatile atomic<_ITp*>* __a, ptrdiff_t __d) noexcept
-    { return __a->fetch_sub(__d); }
-
-  template<typename _ITp>
-    inline _ITp*
-    atomic_fetch_sub(atomic<_ITp*>* __a, ptrdiff_t __d) noexcept
-    { return __a->fetch_sub(__d); }
-  // @} group atomics
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // C++11
-
-#endif // _GLIBCXX_ATOMIC
diff --git a/openflow/usr/include/c++/5/backward/auto_ptr.h b/openflow/usr/include/c++/5/backward/auto_ptr.h
deleted file mode 100644
index a6aa2eb..0000000
--- a/openflow/usr/include/c++/5/backward/auto_ptr.h
+++ /dev/null
@@ -1,329 +0,0 @@
-// auto_ptr implementation -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file backward/auto_ptr.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _BACKWARD_AUTO_PTR_H
-#define _BACKWARD_AUTO_PTR_H 1
-
-#include <bits/c++config.h>
-#include <debug/debug.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  A wrapper class to provide auto_ptr with reference semantics.
-   *  For example, an auto_ptr can be assigned (or constructed from)
-   *  the result of a function which returns an auto_ptr by value.
-   *
-   *  All the auto_ptr_ref stuff should happen behind the scenes.
-   */
-  template<typename _Tp1>
-    struct auto_ptr_ref
-    {
-      _Tp1* _M_ptr;
-      
-      explicit
-      auto_ptr_ref(_Tp1* __p): _M_ptr(__p) { }
-    } _GLIBCXX_DEPRECATED;
-
-
-  /**
-   *  @brief  A simple smart pointer providing strict ownership semantics.
-   *
-   *  The Standard says:
-   *  <pre>
-   *  An @c auto_ptr owns the object it holds a pointer to.  Copying
-   *  an @c auto_ptr copies the pointer and transfers ownership to the
-   *  destination.  If more than one @c auto_ptr owns the same object
-   *  at the same time the behavior of the program is undefined.
-   *
-   *  The uses of @c auto_ptr include providing temporary
-   *  exception-safety for dynamically allocated memory, passing
-   *  ownership of dynamically allocated memory to a function, and
-   *  returning dynamically allocated memory from a function.  @c
-   *  auto_ptr does not meet the CopyConstructible and Assignable
-   *  requirements for Standard Library <a
-   *  href="tables.html#65">container</a> elements and thus
-   *  instantiating a Standard Library container with an @c auto_ptr
-   *  results in undefined behavior.
-   *  </pre>
-   *  Quoted from [20.4.5]/3.
-   *
-   *  Good examples of what can and cannot be done with auto_ptr can
-   *  be found in the libstdc++ testsuite.
-   *
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-   *  127.  auto_ptr<> conversion issues
-   *  These resolutions have all been incorporated.
-   */
-  template<typename _Tp>
-    class auto_ptr
-    {
-    private:
-      _Tp* _M_ptr;
-      
-    public:
-      /// The pointed-to type.
-      typedef _Tp element_type;
-      
-      /**
-       *  @brief  An %auto_ptr is usually constructed from a raw pointer.
-       *  @param  __p  A pointer (defaults to NULL).
-       *
-       *  This object now @e owns the object pointed to by @a __p.
-       */
-      explicit
-      auto_ptr(element_type* __p = 0) throw() : _M_ptr(__p) { }
-
-      /**
-       *  @brief  An %auto_ptr can be constructed from another %auto_ptr.
-       *  @param  __a  Another %auto_ptr of the same type.
-       *
-       *  This object now @e owns the object previously owned by @a __a,
-       *  which has given up ownership.
-       */
-      auto_ptr(auto_ptr& __a) throw() : _M_ptr(__a.release()) { }
-
-      /**
-       *  @brief  An %auto_ptr can be constructed from another %auto_ptr.
-       *  @param  __a  Another %auto_ptr of a different but related type.
-       *
-       *  A pointer-to-Tp1 must be convertible to a
-       *  pointer-to-Tp/element_type.
-       *
-       *  This object now @e owns the object previously owned by @a __a,
-       *  which has given up ownership.
-       */
-      template<typename _Tp1>
-        auto_ptr(auto_ptr<_Tp1>& __a) throw() : _M_ptr(__a.release()) { }
-
-      /**
-       *  @brief  %auto_ptr assignment operator.
-       *  @param  __a  Another %auto_ptr of the same type.
-       *
-       *  This object now @e owns the object previously owned by @a __a,
-       *  which has given up ownership.  The object that this one @e
-       *  used to own and track has been deleted.
-       */
-      auto_ptr&
-      operator=(auto_ptr& __a) throw()
-      {
-	reset(__a.release());
-	return *this;
-      }
-
-      /**
-       *  @brief  %auto_ptr assignment operator.
-       *  @param  __a  Another %auto_ptr of a different but related type.
-       *
-       *  A pointer-to-Tp1 must be convertible to a pointer-to-Tp/element_type.
-       *
-       *  This object now @e owns the object previously owned by @a __a,
-       *  which has given up ownership.  The object that this one @e
-       *  used to own and track has been deleted.
-       */
-      template<typename _Tp1>
-        auto_ptr&
-        operator=(auto_ptr<_Tp1>& __a) throw()
-        {
-	  reset(__a.release());
-	  return *this;
-	}
-
-      /**
-       *  When the %auto_ptr goes out of scope, the object it owns is
-       *  deleted.  If it no longer owns anything (i.e., @c get() is
-       *  @c NULL), then this has no effect.
-       *
-       *  The C++ standard says there is supposed to be an empty throw
-       *  specification here, but omitting it is standard conforming.  Its
-       *  presence can be detected only if _Tp::~_Tp() throws, but this is
-       *  prohibited.  [17.4.3.6]/2
-       */
-      ~auto_ptr() { delete _M_ptr; }
-      
-      /**
-       *  @brief  Smart pointer dereferencing.
-       *
-       *  If this %auto_ptr no longer owns anything, then this
-       *  operation will crash.  (For a smart pointer, <em>no longer owns
-       *  anything</em> is the same as being a null pointer, and you know
-       *  what happens when you dereference one of those...)
-       */
-      element_type&
-      operator*() const throw() 
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_ptr != 0);
-	return *_M_ptr; 
-      }
-      
-      /**
-       *  @brief  Smart pointer dereferencing.
-       *
-       *  This returns the pointer itself, which the language then will
-       *  automatically cause to be dereferenced.
-       */
-      element_type*
-      operator->() const throw() 
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_ptr != 0);
-	return _M_ptr; 
-      }
-      
-      /**
-       *  @brief  Bypassing the smart pointer.
-       *  @return  The raw pointer being managed.
-       *
-       *  You can get a copy of the pointer that this object owns, for
-       *  situations such as passing to a function which only accepts
-       *  a raw pointer.
-       *
-       *  @note  This %auto_ptr still owns the memory.
-       */
-      element_type*
-      get() const throw() { return _M_ptr; }
-      
-      /**
-       *  @brief  Bypassing the smart pointer.
-       *  @return  The raw pointer being managed.
-       *
-       *  You can get a copy of the pointer that this object owns, for
-       *  situations such as passing to a function which only accepts
-       *  a raw pointer.
-       *
-       *  @note  This %auto_ptr no longer owns the memory.  When this object
-       *  goes out of scope, nothing will happen.
-       */
-      element_type*
-      release() throw()
-      {
-	element_type* __tmp = _M_ptr;
-	_M_ptr = 0;
-	return __tmp;
-      }
-      
-      /**
-       *  @brief  Forcibly deletes the managed object.
-       *  @param  __p  A pointer (defaults to NULL).
-       *
-       *  This object now @e owns the object pointed to by @a __p.  The
-       *  previous object has been deleted.
-       */
-      void
-      reset(element_type* __p = 0) throw()
-      {
-	if (__p != _M_ptr)
-	  {
-	    delete _M_ptr;
-	    _M_ptr = __p;
-	  }
-      }
-      
-      /** 
-       *  @brief  Automatic conversions
-       *
-       *  These operations convert an %auto_ptr into and from an auto_ptr_ref
-       *  automatically as needed.  This allows constructs such as
-       *  @code
-       *    auto_ptr<Derived>  func_returning_auto_ptr(.....);
-       *    ...
-       *    auto_ptr<Base> ptr = func_returning_auto_ptr(.....);
-       *  @endcode
-       */
-      auto_ptr(auto_ptr_ref<element_type> __ref) throw()
-      : _M_ptr(__ref._M_ptr) { }
-      
-      auto_ptr&
-      operator=(auto_ptr_ref<element_type> __ref) throw()
-      {
-	if (__ref._M_ptr != this->get())
-	  {
-	    delete _M_ptr;
-	    _M_ptr = __ref._M_ptr;
-	  }
-	return *this;
-      }
-      
-      template<typename _Tp1>
-        operator auto_ptr_ref<_Tp1>() throw()
-        { return auto_ptr_ref<_Tp1>(this->release()); }
-
-      template<typename _Tp1>
-        operator auto_ptr<_Tp1>() throw()
-        { return auto_ptr<_Tp1>(this->release()); }
-    } _GLIBCXX_DEPRECATED;
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 541. shared_ptr template assignment and void
-  template<>
-    class auto_ptr<void>
-    {
-    public:
-      typedef void element_type;
-    } _GLIBCXX_DEPRECATED;
-
-#if __cplusplus >= 201103L
-  template<_Lock_policy _Lp>
-  template<typename _Tp>
-    inline
-    __shared_count<_Lp>::__shared_count(std::auto_ptr<_Tp>&& __r)
-    : _M_pi(new _Sp_counted_ptr<_Tp*, _Lp>(__r.get()))
-    { __r.release(); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-  template<typename _Tp1>
-    inline
-    __shared_ptr<_Tp, _Lp>::__shared_ptr(std::auto_ptr<_Tp1>&& __r)
-    : _M_ptr(__r.get()), _M_refcount()
-    {
-      __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-      static_assert( sizeof(_Tp1) > 0, "incomplete type" );
-      _Tp1* __tmp = __r.get();
-      _M_refcount = __shared_count<_Lp>(std::move(__r));
-      __enable_shared_from_this_helper(_M_refcount, __tmp, __tmp);
-    }
-
-  template<typename _Tp>
-  template<typename _Tp1>
-    inline
-    shared_ptr<_Tp>::shared_ptr(std::auto_ptr<_Tp1>&& __r)
-    : __shared_ptr<_Tp>(std::move(__r)) { }
-
-  template<typename _Tp, typename _Dp>
-  template<typename _Up, typename>
-    inline
-    unique_ptr<_Tp, _Dp>::unique_ptr(auto_ptr<_Up>&& __u) noexcept
-    : _M_t(__u.release(), deleter_type()) { }
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _BACKWARD_AUTO_PTR_H */
diff --git a/openflow/usr/include/c++/5/backward/backward_warning.h b/openflow/usr/include/c++/5/backward/backward_warning.h
deleted file mode 100644
index 0b264eb..0000000
--- a/openflow/usr/include/c++/5/backward/backward_warning.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file backward/backward_warning.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iosfwd}
- */
-
-#ifndef _BACKWARD_BACKWARD_WARNING_H
-#define _BACKWARD_BACKWARD_WARNING_H 1
-
-#ifdef __DEPRECATED
-#warning \
-  This file includes at least one deprecated or antiquated header which \
-  may be removed without further notice at a future date. Please use a \
-  non-deprecated interface with equivalent functionality instead. For a \
-  listing of replacement headers and interfaces, consult the file \
-  backward_warning.h. To disable this warning use -Wno-deprecated.
-
-/*
-  A list of valid replacements is as follows:
-
-  Use:					Instead of:
-  <sstream>, basic_stringbuf	   	<strstream>, strstreambuf
-  <sstream>, basic_istringstream	<strstream>, istrstream
-  <sstream>, basic_ostringstream	<strstream>, ostrstream
-  <sstream>, basic_stringstream		<strstream>, strstream
-  <unordered_set>, unordered_set     	<ext/hash_set>, hash_set
-  <unordered_set>, unordered_multiset	<ext/hash_set>, hash_multiset
-  <unordered_map>, unordered_map	<ext/hash_map>, hash_map
-  <unordered_map>, unordered_multimap	<ext/hash_map>, hash_multimap
-  <functional>, bind			<functional>, binder1st
-  <functional>, bind			<functional>, binder2nd
-  <functional>, bind			<functional>, bind1st
-  <functional>, bind			<functional>, bind2nd
-  <memory>, unique_ptr       		<memory>, auto_ptr
-*/
-
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/backward/binders.h b/openflow/usr/include/c++/5/backward/binders.h
deleted file mode 100644
index f3e0616..0000000
--- a/openflow/usr/include/c++/5/backward/binders.h
+++ /dev/null
@@ -1,182 +0,0 @@
-// Functor implementations -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file backward/binders.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{functional}
- */
-
-#ifndef _BACKWARD_BINDERS_H
-#define _BACKWARD_BINDERS_H 1
-
-// Suppress deprecated warning for this file.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // 20.3.6 binders
-  /** @defgroup binders Binder Classes
-   * @ingroup functors
-   *
-   *  Binders turn functions/functors with two arguments into functors
-   *  with a single argument, storing an argument to be applied later.
-   *  For example, a variable @c B of type @c binder1st is constructed
-   *  from a functor @c f and an argument @c x. Later, B's @c
-   *  operator() is called with a single argument @c y. The return
-   *  value is the value of @c f(x,y). @c B can be @a called with
-   *  various arguments (y1, y2, ...) and will in turn call @c
-   *  f(x,y1), @c f(x,y2), ...
-   *
-   *  The function @c bind1st is provided to save some typing. It takes the
-   *  function and an argument as parameters, and returns an instance of
-   *  @c binder1st.
-   *
-   *  The type @c binder2nd and its creator function @c bind2nd do the same
-   *  thing, but the stored argument is passed as the second parameter instead
-   *  of the first, e.g., @c bind2nd(std::minus<float>(),1.3) will create a
-   *  functor whose @c operator() accepts a floating-point number, subtracts
-   *  1.3 from it, and returns the result. (If @c bind1st had been used,
-   *  the functor would perform <em>1.3 - x</em> instead.
-   *
-   *  Creator-wrapper functions like @c bind1st are intended to be used in
-   *  calling algorithms. Their return values will be temporary objects.
-   *  (The goal is to not require you to type names like
-   *  @c std::binder1st<std::plus<int>> for declaring a variable to hold the
-   *  return value from @c bind1st(std::plus<int>(),5).
-   *
-   *  These become more useful when combined with the composition functions.
-   *
-   *  These functions are deprecated in C++11 and can be replaced by
-   *  @c std::bind (or @c std::tr1::bind) which is more powerful and flexible,
-   *  supporting functions with any number of arguments.  Uses of @c bind1st
-   *  can be replaced by @c std::bind(f, x, std::placeholders::_1) and
-   *  @c bind2nd by @c std::bind(f, std::placeholders::_1, x).
-   *  @{
-   */
-  /// One of the @link binders binder functors@endlink.
-  template<typename _Operation>
-    class binder1st
-    : public unary_function<typename _Operation::second_argument_type,
-			    typename _Operation::result_type>
-    {
-    protected:
-      _Operation op;
-      typename _Operation::first_argument_type value;
-
-    public:
-      binder1st(const _Operation& __x,
-		const typename _Operation::first_argument_type& __y)
-      : op(__x), value(__y) { }
-
-      typename _Operation::result_type
-      operator()(const typename _Operation::second_argument_type& __x) const
-      { return op(value, __x); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 109.  Missing binders for non-const sequence elements
-      typename _Operation::result_type
-      operator()(typename _Operation::second_argument_type& __x) const
-      { return op(value, __x); }
-    } _GLIBCXX_DEPRECATED;
-
-  /// One of the @link binders binder functors@endlink.
-  template<typename _Operation, typename _Tp>
-    inline binder1st<_Operation>
-    bind1st(const _Operation& __fn, const _Tp& __x)
-    {
-      typedef typename _Operation::first_argument_type _Arg1_type;
-      return binder1st<_Operation>(__fn, _Arg1_type(__x));
-    }
-
-  /// One of the @link binders binder functors@endlink.
-  template<typename _Operation>
-    class binder2nd
-    : public unary_function<typename _Operation::first_argument_type,
-			    typename _Operation::result_type>
-    {
-    protected:
-      _Operation op;
-      typename _Operation::second_argument_type value;
-
-    public:
-      binder2nd(const _Operation& __x,
-		const typename _Operation::second_argument_type& __y)
-      : op(__x), value(__y) { }
-
-      typename _Operation::result_type
-      operator()(const typename _Operation::first_argument_type& __x) const
-      { return op(__x, value); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 109.  Missing binders for non-const sequence elements
-      typename _Operation::result_type
-      operator()(typename _Operation::first_argument_type& __x) const
-      { return op(__x, value); }
-    } _GLIBCXX_DEPRECATED;
-
-  /// One of the @link binders binder functors@endlink.
-  template<typename _Operation, typename _Tp>
-    inline binder2nd<_Operation>
-    bind2nd(const _Operation& __fn, const _Tp& __x)
-    {
-      typedef typename _Operation::second_argument_type _Arg2_type;
-      return binder2nd<_Operation>(__fn, _Arg2_type(__x));
-    } 
-  /** @}  */
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#pragma GCC diagnostic pop
-
-#endif /* _BACKWARD_BINDERS_H */
diff --git a/openflow/usr/include/c++/5/backward/hash_fun.h b/openflow/usr/include/c++/5/backward/hash_fun.h
deleted file mode 100644
index 9955112..0000000
--- a/openflow/usr/include/c++/5/backward/hash_fun.h
+++ /dev/null
@@ -1,170 +0,0 @@
-// 'struct hash' from SGI -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file backward/hash_fun.h
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).
- */
-
-#ifndef _BACKWARD_HASH_FUN_H
-#define _BACKWARD_HASH_FUN_H 1
-
-#include <bits/c++config.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::size_t;
-
-  template<class _Key>
-    struct hash { };
-
-  inline size_t
-  __stl_hash_string(const char* __s)
-  {
-    unsigned long __h = 0;
-    for ( ; *__s; ++__s)
-      __h = 5 * __h + *__s;
-    return size_t(__h);
-  }
-
-  template<>
-    struct hash<char*>
-    {
-      size_t
-      operator()(const char* __s) const
-      { return __stl_hash_string(__s); }
-    };
-
-  template<>
-    struct hash<const char*>
-    {
-      size_t
-      operator()(const char* __s) const
-      { return __stl_hash_string(__s); }
-    };
-
-  template<>
-    struct hash<char>
-    { 
-      size_t
-      operator()(char __x) const
-      { return __x; }
-    };
-
-  template<>
-    struct hash<unsigned char>
-    { 
-      size_t
-      operator()(unsigned char __x) const
-      { return __x; }
-    };
-
-  template<>
-    struct hash<signed char>
-    {
-      size_t
-      operator()(unsigned char __x) const
-      { return __x; }
-    };
-
-  template<>
-    struct hash<short>
-    {
-      size_t
-      operator()(short __x) const
-      { return __x; }
-    };
-
-  template<>
-    struct hash<unsigned short>
-    {
-      size_t
-      operator()(unsigned short __x) const
-      { return __x; }
-    };
-
-  template<>
-    struct hash<int>
-    { 
-      size_t 
-      operator()(int __x) const 
-      { return __x; }
-    };
-
-  template<>
-    struct hash<unsigned int>
-    { 
-      size_t
-      operator()(unsigned int __x) const
-      { return __x; }
-    };
-
-  template<>
-    struct hash<long>
-    {
-      size_t
-      operator()(long __x) const
-      { return __x; }
-    };
-
-  template<>
-    struct hash<unsigned long>
-    {
-      size_t
-      operator()(unsigned long __x) const
-      { return __x; }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/backward/hash_map b/openflow/usr/include/c++/5/backward/hash_map
deleted file mode 100644
index a9dc9cf..0000000
--- a/openflow/usr/include/c++/5/backward/hash_map
+++ /dev/null
@@ -1,599 +0,0 @@
-// Hashing map implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file backward/hash_map
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).
- */
-
-#ifndef _BACKWARD_HASH_MAP
-#define _BACKWARD_HASH_MAP 1
-
-#ifndef _GLIBCXX_PERMIT_BACKWARD_HASH
-#include "backward_warning.h"
-#endif
-
-#include <bits/c++config.h>
-#include <backward/hashtable.h>
-#include <bits/concept_check.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::equal_to;
-  using std::allocator;
-  using std::pair;
-  using std::_Select1st;
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template<class _Key, class _Tp, class _HashFn = hash<_Key>,
-	   class _EqualKey = equal_to<_Key>, class _Alloc = allocator<_Tp> >
-    class hash_map
-    {
-    private:
-      typedef hashtable<pair<const _Key, _Tp>,_Key, _HashFn,
-			_Select1st<pair<const _Key, _Tp> >,
-			_EqualKey, _Alloc> _Ht;
-
-      _Ht _M_ht;
-
-    public:
-      typedef typename _Ht::key_type key_type;
-      typedef _Tp data_type;
-      typedef _Tp mapped_type;
-      typedef typename _Ht::value_type value_type;
-      typedef typename _Ht::hasher hasher;
-      typedef typename _Ht::key_equal key_equal;
-      
-      typedef typename _Ht::size_type size_type;
-      typedef typename _Ht::difference_type difference_type;
-      typedef typename _Ht::pointer pointer;
-      typedef typename _Ht::const_pointer const_pointer;
-      typedef typename _Ht::reference reference;
-      typedef typename _Ht::const_reference const_reference;
-      
-      typedef typename _Ht::iterator iterator;
-      typedef typename _Ht::const_iterator const_iterator;
-      
-      typedef typename _Ht::allocator_type allocator_type;
-      
-      hasher
-      hash_funct() const
-      { return _M_ht.hash_funct(); }
-
-      key_equal
-      key_eq() const
-      { return _M_ht.key_eq(); }
-
-      allocator_type
-      get_allocator() const
-      { return _M_ht.get_allocator(); }
-
-      hash_map()
-      : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-  
-      explicit
-      hash_map(size_type __n)
-      : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-
-      hash_map(size_type __n, const hasher& __hf)
-      : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-
-      hash_map(size_type __n, const hasher& __hf, const key_equal& __eql,
-	       const allocator_type& __a = allocator_type())
-      : _M_ht(__n, __hf, __eql, __a) {}
-
-      template<class _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l)
-	: _M_ht(100, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l, size_type __n)
-	: _M_ht(__n, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf)
-	: _M_ht(__n, __hf, key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf, const key_equal& __eql,
-		 const allocator_type& __a = allocator_type())
-	: _M_ht(__n, __hf, __eql, __a)
-        { _M_ht.insert_unique(__f, __l); }
-
-      size_type
-      size() const
-      { return _M_ht.size(); }
-      
-      size_type
-      max_size() const
-      { return _M_ht.max_size(); }
-      
-      bool
-      empty() const
-      { return _M_ht.empty(); }
-  
-      void
-      swap(hash_map& __hs)
-      { _M_ht.swap(__hs._M_ht); }
-
-      template<class _K1, class _T1, class _HF, class _EqK, class _Al>
-        friend bool
-        operator== (const hash_map<_K1, _T1, _HF, _EqK, _Al>&,
-		    const hash_map<_K1, _T1, _HF, _EqK, _Al>&);
-
-      iterator
-      begin()
-      { return _M_ht.begin(); }
-
-      iterator
-      end()
-      { return _M_ht.end(); }
-
-      const_iterator
-      begin() const
-      { return _M_ht.begin(); }
-
-      const_iterator
-      end() const
-      { return _M_ht.end(); }
-
-      pair<iterator, bool>
-      insert(const value_type& __obj)
-      { return _M_ht.insert_unique(__obj); }
-
-      template<class _InputIterator>
-        void
-        insert(_InputIterator __f, _InputIterator __l)
-        { _M_ht.insert_unique(__f, __l); }
-
-      pair<iterator, bool>
-      insert_noresize(const value_type& __obj)
-      { return _M_ht.insert_unique_noresize(__obj); }
-
-      iterator
-      find(const key_type& __key)
-      { return _M_ht.find(__key); }
-
-      const_iterator
-      find(const key_type& __key) const
-      { return _M_ht.find(__key); }
-
-      _Tp&
-      operator[](const key_type& __key)
-      { return _M_ht.find_or_insert(value_type(__key, _Tp())).second; }
-
-      size_type
-      count(const key_type& __key) const
-      { return _M_ht.count(__key); }
-
-      pair<iterator, iterator>
-      equal_range(const key_type& __key)
-      { return _M_ht.equal_range(__key); }
-
-      pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const
-      { return _M_ht.equal_range(__key); }
-
-      size_type
-      erase(const key_type& __key)
-      {return _M_ht.erase(__key); }
-
-      void
-      erase(iterator __it)
-      { _M_ht.erase(__it); }
-
-      void
-      erase(iterator __f, iterator __l)
-      { _M_ht.erase(__f, __l); }
-
-      void
-      clear()
-      { _M_ht.clear(); }
-
-      void
-      resize(size_type __hint)
-      { _M_ht.resize(__hint); }
-
-      size_type
-      bucket_count() const
-      { return _M_ht.bucket_count(); }
-
-      size_type
-      max_bucket_count() const
-      { return _M_ht.max_bucket_count(); }
-
-      size_type
-      elems_in_bucket(size_type __n) const
-      { return _M_ht.elems_in_bucket(__n); }
-    };
-
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-    inline bool
-    operator==(const hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-	       const hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-    { return __hm1._M_ht == __hm2._M_ht; }
-
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-    inline bool
-    operator!=(const hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-	       const hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-    { return !(__hm1 == __hm2); }
-
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-    inline void
-    swap(hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-	 hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-    { __hm1.swap(__hm2); }
-
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template<class _Key, class _Tp,
-	   class _HashFn = hash<_Key>,
-	   class _EqualKey = equal_to<_Key>,
-	   class _Alloc = allocator<_Tp> >
-    class hash_multimap
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Key, _SGIAssignableConcept)
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires3(_HashFn, size_t, _Key, _UnaryFunctionConcept)
-      __glibcxx_class_requires3(_EqualKey, _Key, _Key, _BinaryPredicateConcept)
-	
-    private:
-      typedef hashtable<pair<const _Key, _Tp>, _Key, _HashFn,
-			_Select1st<pair<const _Key, _Tp> >, _EqualKey, _Alloc>
-          _Ht;
-
-      _Ht _M_ht;
-
-    public:
-      typedef typename _Ht::key_type key_type;
-      typedef _Tp data_type;
-      typedef _Tp mapped_type;
-      typedef typename _Ht::value_type value_type;
-      typedef typename _Ht::hasher hasher;
-      typedef typename _Ht::key_equal key_equal;
-      
-      typedef typename _Ht::size_type size_type;
-      typedef typename _Ht::difference_type difference_type;
-      typedef typename _Ht::pointer pointer;
-      typedef typename _Ht::const_pointer const_pointer;
-      typedef typename _Ht::reference reference;
-      typedef typename _Ht::const_reference const_reference;
-      
-      typedef typename _Ht::iterator iterator;
-      typedef typename _Ht::const_iterator const_iterator;
-      
-      typedef typename _Ht::allocator_type allocator_type;
-      
-      hasher
-      hash_funct() const
-      { return _M_ht.hash_funct(); }
-
-      key_equal
-      key_eq() const
-      { return _M_ht.key_eq(); }
-
-      allocator_type
-      get_allocator() const
-      { return _M_ht.get_allocator(); }
-
-      hash_multimap()
-      : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-
-      explicit
-      hash_multimap(size_type __n)
-      : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-
-      hash_multimap(size_type __n, const hasher& __hf)
-      : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-
-      hash_multimap(size_type __n, const hasher& __hf, const key_equal& __eql,
-		    const allocator_type& __a = allocator_type())
-      : _M_ht(__n, __hf, __eql, __a) {}
-
-      template<class _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l)
-	: _M_ht(100, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n)
-	: _M_ht(__n, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
-		      const hasher& __hf)
-	: _M_ht(__n, __hf, key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
-		      const hasher& __hf, const key_equal& __eql,
-		      const allocator_type& __a = allocator_type())
-	: _M_ht(__n, __hf, __eql, __a)
-        { _M_ht.insert_equal(__f, __l); }
-
-      size_type
-      size() const
-      { return _M_ht.size(); }
-
-      size_type
-      max_size() const
-      { return _M_ht.max_size(); }
-
-      bool
-      empty() const
-      { return _M_ht.empty(); }
-
-      void
-      swap(hash_multimap& __hs)
-      { _M_ht.swap(__hs._M_ht); }
-
-      template<class _K1, class _T1, class _HF, class _EqK, class _Al>
-        friend bool
-        operator==(const hash_multimap<_K1, _T1, _HF, _EqK, _Al>&,
-		   const hash_multimap<_K1, _T1, _HF, _EqK, _Al>&);
-
-      iterator
-      begin()
-      { return _M_ht.begin(); }
-
-      iterator
-      end()
-      { return _M_ht.end(); }
-
-      const_iterator
-      begin() const
-      { return _M_ht.begin(); }
-
-      const_iterator
-      end() const
-      { return _M_ht.end(); }
-
-      iterator
-      insert(const value_type& __obj)
-      { return _M_ht.insert_equal(__obj); }
-
-      template<class _InputIterator>
-        void
-        insert(_InputIterator __f, _InputIterator __l)
-        { _M_ht.insert_equal(__f,__l); }
-
-      iterator
-      insert_noresize(const value_type& __obj)
-      { return _M_ht.insert_equal_noresize(__obj); }
-
-      iterator
-      find(const key_type& __key)
-      { return _M_ht.find(__key); }
-
-      const_iterator
-      find(const key_type& __key) const
-      { return _M_ht.find(__key); }
-
-      size_type
-      count(const key_type& __key) const
-      { return _M_ht.count(__key); }
-
-      pair<iterator, iterator>
-      equal_range(const key_type& __key)
-      { return _M_ht.equal_range(__key); }
-
-      pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const
-      { return _M_ht.equal_range(__key); }
-
-      size_type
-      erase(const key_type& __key)
-      { return _M_ht.erase(__key); }
-
-      void
-      erase(iterator __it)
-      { _M_ht.erase(__it); }
-
-      void
-      erase(iterator __f, iterator __l)
-      { _M_ht.erase(__f, __l); }
-
-      void
-      clear()
-      { _M_ht.clear(); }
-
-      void
-      resize(size_type __hint)
-      { _M_ht.resize(__hint); }
-
-      size_type
-      bucket_count() const
-      { return _M_ht.bucket_count(); }
-
-      size_type
-      max_bucket_count() const
-      { return _M_ht.max_bucket_count(); }
-      
-      size_type
-      elems_in_bucket(size_type __n) const
-      { return _M_ht.elems_in_bucket(__n); }
-    };
-
-  template<class _Key, class _Tp, class _HF, class _EqKey, class _Alloc>
-    inline bool
-    operator==(const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm1,
-	       const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm2)
-    { return __hm1._M_ht == __hm2._M_ht; }
-
-  template<class _Key, class _Tp, class _HF, class _EqKey, class _Alloc>
-    inline bool
-    operator!=(const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm1,
-	       const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm2)
-    { return !(__hm1 == __hm2); }
-
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-    inline void
-    swap(hash_multimap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-	 hash_multimap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-    { __hm1.swap(__hm2); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Specialization of insert_iterator so that it will work for hash_map
-  // and hash_multimap.
-  template<class _Key, class _Tp, class _HashFn,  class _EqKey, class _Alloc>
-    class insert_iterator<__gnu_cxx::hash_map<_Key, _Tp, _HashFn, 
-					      _EqKey, _Alloc> >
-    {
-    protected:
-      typedef __gnu_cxx::hash_map<_Key, _Tp, _HashFn, _EqKey, _Alloc>
-        _Container;
-      _Container* container;
-
-    public:
-      typedef _Container          container_type;
-      typedef output_iterator_tag iterator_category;
-      typedef void                value_type;
-      typedef void                difference_type;
-      typedef void                pointer;
-      typedef void                reference;
-      
-      insert_iterator(_Container& __x)
-      : container(&__x) {}
-
-      insert_iterator(_Container& __x, typename _Container::iterator)
-      : container(&__x) {}
-
-      insert_iterator<_Container>&
-      operator=(const typename _Container::value_type& __value)
-      {
-	container->insert(__value);
-	return *this;
-      }
-
-      insert_iterator<_Container>&
-      operator*()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++() { return *this; }
-
-      insert_iterator<_Container>&
-      operator++(int)
-      { return *this; }
-    };
-
-  template<class _Key, class _Tp, class _HashFn,  class _EqKey, class _Alloc>
-    class insert_iterator<__gnu_cxx::hash_multimap<_Key, _Tp, _HashFn,
-						   _EqKey, _Alloc> >
-    {
-    protected:
-      typedef __gnu_cxx::hash_multimap<_Key, _Tp, _HashFn, _EqKey, _Alloc>
-        _Container;
-      _Container* container;
-      typename _Container::iterator iter;
-
-    public:
-      typedef _Container          container_type;
-      typedef output_iterator_tag iterator_category;
-      typedef void                value_type;
-      typedef void                difference_type;
-      typedef void                pointer;
-      typedef void                reference;
-
-      insert_iterator(_Container& __x)
-      : container(&__x) {}
-
-      insert_iterator(_Container& __x, typename _Container::iterator)
-      : container(&__x) {}
-
-      insert_iterator<_Container>&
-      operator=(const typename _Container::value_type& __value)
-      {
-	container->insert(__value);
-	return *this;
-      }
-
-      insert_iterator<_Container>&
-      operator*()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++(int)
-      { return *this; }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/backward/hash_set b/openflow/usr/include/c++/5/backward/hash_set
deleted file mode 100644
index 3c9ec70..0000000
--- a/openflow/usr/include/c++/5/backward/hash_set
+++ /dev/null
@@ -1,567 +0,0 @@
-// Hashing set implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file backward/hash_set
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).
- */
-
-#ifndef _BACKWARD_HASH_SET
-#define _BACKWARD_HASH_SET 1
-
-#ifndef _GLIBCXX_PERMIT_BACKWARD_HASH
-#include "backward_warning.h"
-#endif
-
-#include <bits/c++config.h>
-#include <backward/hashtable.h>
-#include <bits/concept_check.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::equal_to;
-  using std::allocator;
-  using std::pair;
-  using std::_Identity;
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template<class _Value, class _HashFcn  = hash<_Value>,
-	   class _EqualKey = equal_to<_Value>,
-	   class _Alloc = allocator<_Value> >
-    class hash_set
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Value, _SGIAssignableConcept)
-      __glibcxx_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept)
-      __glibcxx_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept)
-
-    private:
-      typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>,
-			_EqualKey, _Alloc> _Ht;
-      _Ht _M_ht;
-
-    public:
-      typedef typename _Ht::key_type key_type;
-      typedef typename _Ht::value_type value_type;
-      typedef typename _Ht::hasher hasher;
-      typedef typename _Ht::key_equal key_equal;
-      
-      typedef typename _Ht::size_type size_type;
-      typedef typename _Ht::difference_type difference_type;
-      typedef typename _Alloc::pointer pointer;
-      typedef typename _Alloc::const_pointer const_pointer;
-      typedef typename _Alloc::reference reference;
-      typedef typename _Alloc::const_reference const_reference;
-      
-      typedef typename _Ht::const_iterator iterator;
-      typedef typename _Ht::const_iterator const_iterator;
-      
-      typedef typename _Ht::allocator_type allocator_type;
-      
-      hasher
-      hash_funct() const
-      { return _M_ht.hash_funct(); }
-
-      key_equal
-      key_eq() const
-      { return _M_ht.key_eq(); }
-
-      allocator_type
-      get_allocator() const
-      { return _M_ht.get_allocator(); }
-
-      hash_set()
-      : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-
-      explicit
-      hash_set(size_type __n)
-      : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-
-      hash_set(size_type __n, const hasher& __hf)
-      : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-
-      hash_set(size_type __n, const hasher& __hf, const key_equal& __eql,
-	       const allocator_type& __a = allocator_type())
-      : _M_ht(__n, __hf, __eql, __a) {}
-
-      template<class _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l)
-	: _M_ht(100, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l, size_type __n)
-	: _M_ht(__n, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf)
-	: _M_ht(__n, __hf, key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf, const key_equal& __eql,
-		 const allocator_type& __a = allocator_type())
-	: _M_ht(__n, __hf, __eql, __a)
-        { _M_ht.insert_unique(__f, __l); }
-
-      size_type
-      size() const
-      { return _M_ht.size(); }
-
-      size_type
-      max_size() const
-      { return _M_ht.max_size(); }
-      
-      bool
-      empty() const
-      { return _M_ht.empty(); }
-      
-      void
-      swap(hash_set& __hs)
-      { _M_ht.swap(__hs._M_ht); }
-
-      template<class _Val, class _HF, class _EqK, class _Al>
-        friend bool
-        operator==(const hash_set<_Val, _HF, _EqK, _Al>&,
-		   const hash_set<_Val, _HF, _EqK, _Al>&);
-
-      iterator
-      begin() const
-      { return _M_ht.begin(); }
-      
-      iterator
-      end() const
-      { return _M_ht.end(); }
-
-      pair<iterator, bool>
-      insert(const value_type& __obj)
-      {
-	pair<typename _Ht::iterator, bool> __p = _M_ht.insert_unique(__obj);
-	return pair<iterator,bool>(__p.first, __p.second);
-      }
-
-      template<class _InputIterator>
-        void
-        insert(_InputIterator __f, _InputIterator __l)
-        { _M_ht.insert_unique(__f, __l); }
-
-      pair<iterator, bool>
-      insert_noresize(const value_type& __obj)
-      {
-	pair<typename _Ht::iterator, bool> __p
-	  = _M_ht.insert_unique_noresize(__obj);
-	return pair<iterator, bool>(__p.first, __p.second);
-      }
-
-      iterator
-      find(const key_type& __key) const
-      { return _M_ht.find(__key); }
-
-      size_type
-      count(const key_type& __key) const
-      { return _M_ht.count(__key); }
-
-      pair<iterator, iterator>
-      equal_range(const key_type& __key) const
-      { return _M_ht.equal_range(__key); }
-
-      size_type
-      erase(const key_type& __key)
-      {return _M_ht.erase(__key); }
-      
-      void
-      erase(iterator __it)
-      { _M_ht.erase(__it); }
-      
-      void
-      erase(iterator __f, iterator __l)
-      { _M_ht.erase(__f, __l); }
-      
-      void
-      clear()
-      { _M_ht.clear(); }
-
-      void
-      resize(size_type __hint)
-      { _M_ht.resize(__hint); }
-      
-      size_type
-      bucket_count() const
-      { return _M_ht.bucket_count(); }
-      
-      size_type
-      max_bucket_count() const
-      { return _M_ht.max_bucket_count(); }
-      
-      size_type
-      elems_in_bucket(size_type __n) const
-      { return _M_ht.elems_in_bucket(__n); }
-    };
-
-  template<class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-    inline bool
-    operator==(const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	       const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { return __hs1._M_ht == __hs2._M_ht; }
-
-  template<class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-    inline bool
-    operator!=(const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	       const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { return !(__hs1 == __hs2); }
-
-  template<class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-    inline void
-    swap(hash_set<_Val, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	 hash_set<_Val, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { __hs1.swap(__hs2); }
-
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template<class _Value,
-	   class _HashFcn = hash<_Value>,
-	   class _EqualKey = equal_to<_Value>,
-	   class _Alloc = allocator<_Value> >
-    class hash_multiset
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Value, _SGIAssignableConcept)
-      __glibcxx_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept)
-      __glibcxx_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept)
-
-    private:
-      typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>,
-			_EqualKey, _Alloc> _Ht;
-      _Ht _M_ht;
-
-    public:
-      typedef typename _Ht::key_type key_type;
-      typedef typename _Ht::value_type value_type;
-      typedef typename _Ht::hasher hasher;
-      typedef typename _Ht::key_equal key_equal;
-      
-      typedef typename _Ht::size_type size_type;
-      typedef typename _Ht::difference_type difference_type;
-      typedef typename _Alloc::pointer pointer;
-      typedef typename _Alloc::const_pointer const_pointer;
-      typedef typename _Alloc::reference reference;
-      typedef typename _Alloc::const_reference const_reference;
-
-      typedef typename _Ht::const_iterator iterator;
-      typedef typename _Ht::const_iterator const_iterator;
-      
-      typedef typename _Ht::allocator_type allocator_type;
-      
-      hasher
-      hash_funct() const
-      { return _M_ht.hash_funct(); }
-      
-      key_equal
-      key_eq() const
-      { return _M_ht.key_eq(); }
-      
-      allocator_type
-      get_allocator() const
-      { return _M_ht.get_allocator(); }
-
-      hash_multiset()
-      : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-
-      explicit
-      hash_multiset(size_type __n)
-      : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-
-      hash_multiset(size_type __n, const hasher& __hf)
-      : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-      
-      hash_multiset(size_type __n, const hasher& __hf, const key_equal& __eql,
-		    const allocator_type& __a = allocator_type())
-      : _M_ht(__n, __hf, __eql, __a) {}
-
-      template<class _InputIterator>
-        hash_multiset(_InputIterator __f, _InputIterator __l)
-	: _M_ht(100, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n)
-	: _M_ht(__n, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
-		      const hasher& __hf)
-	: _M_ht(__n, __hf, key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
-		      const hasher& __hf, const key_equal& __eql,
-		      const allocator_type& __a = allocator_type())
-	: _M_ht(__n, __hf, __eql, __a)
-        { _M_ht.insert_equal(__f, __l); }
-
-      size_type
-      size() const
-      { return _M_ht.size(); }
-
-      size_type
-      max_size() const
-      { return _M_ht.max_size(); }
-
-      bool
-      empty() const
-      { return _M_ht.empty(); }
-
-      void
-      swap(hash_multiset& hs)
-      { _M_ht.swap(hs._M_ht); }
-
-      template<class _Val, class _HF, class _EqK, class _Al>
-        friend bool
-        operator==(const hash_multiset<_Val, _HF, _EqK, _Al>&,
-		   const hash_multiset<_Val, _HF, _EqK, _Al>&);
-
-      iterator
-      begin() const
-      { return _M_ht.begin(); }
-      
-      iterator
-      end() const
-      { return _M_ht.end(); }
-
-      iterator
-      insert(const value_type& __obj)
-      { return _M_ht.insert_equal(__obj); }
-  
-      template<class _InputIterator>
-        void
-        insert(_InputIterator __f, _InputIterator __l)
-        { _M_ht.insert_equal(__f,__l); }
-  
-      iterator
-      insert_noresize(const value_type& __obj)
-      { return _M_ht.insert_equal_noresize(__obj); }
-
-      iterator
-      find(const key_type& __key) const
-      { return _M_ht.find(__key); }
-
-      size_type
-      count(const key_type& __key) const
-      { return _M_ht.count(__key); }
-
-      pair<iterator, iterator>
-      equal_range(const key_type& __key) const
-      { return _M_ht.equal_range(__key); }
-
-      size_type
-      erase(const key_type& __key)
-      { return _M_ht.erase(__key); }
-  
-      void
-      erase(iterator __it)
-      { _M_ht.erase(__it); }
-  
-      void
-      erase(iterator __f, iterator __l)
-      { _M_ht.erase(__f, __l); }
-  
-      void
-      clear()
-      { _M_ht.clear(); }
-
-      void
-      resize(size_type __hint)
-      { _M_ht.resize(__hint); }
-  
-      size_type
-      bucket_count() const
-      { return _M_ht.bucket_count(); }
-
-      size_type
-      max_bucket_count() const
-      { return _M_ht.max_bucket_count(); }
-
-      size_type
-      elems_in_bucket(size_type __n) const
-      { return _M_ht.elems_in_bucket(__n); }
-    };
-
-  template<class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-    inline bool
-    operator==(const hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	       const hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { return __hs1._M_ht == __hs2._M_ht; }
-
-  template<class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-    inline bool
-    operator!=(const hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	       const hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { return !(__hs1 == __hs2); }
-
-  template<class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-    inline void
-    swap(hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	 hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { __hs1.swap(__hs2); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Specialization of insert_iterator so that it will work for hash_set
-  // and hash_multiset.
-  template<class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-    class insert_iterator<__gnu_cxx::hash_set<_Value, _HashFcn,
-					      _EqualKey, _Alloc> >
-    {
-    protected:
-      typedef __gnu_cxx::hash_set<_Value, _HashFcn, _EqualKey, _Alloc>
-        _Container;
-      _Container* container;
-
-    public:
-      typedef _Container          container_type;
-      typedef output_iterator_tag iterator_category;
-      typedef void                value_type;
-      typedef void                difference_type;
-      typedef void                pointer;
-      typedef void                reference;
-
-      insert_iterator(_Container& __x)
-      : container(&__x) {}
-      
-      insert_iterator(_Container& __x, typename _Container::iterator)
-      : container(&__x) {}
-
-      insert_iterator<_Container>&
-      operator=(const typename _Container::value_type& __value)
-      {
-	container->insert(__value);
-	return *this;
-      }
-
-      insert_iterator<_Container>&
-      operator*()
-      { return *this; }
-      
-      insert_iterator<_Container>&
-      operator++()
-      { return *this; }
-      
-      insert_iterator<_Container>&
-      operator++(int)
-      { return *this; }
-    };
-
-  template<class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-    class insert_iterator<__gnu_cxx::hash_multiset<_Value, _HashFcn,
-						   _EqualKey, _Alloc> >
-    {
-    protected:
-      typedef __gnu_cxx::hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>
-        _Container;
-      _Container* container;
-      typename _Container::iterator iter;
-
-    public:
-      typedef _Container          container_type;
-      typedef output_iterator_tag iterator_category;
-      typedef void                value_type;
-      typedef void                difference_type;
-      typedef void                pointer;
-      typedef void                reference;
-      
-      insert_iterator(_Container& __x)
-      : container(&__x) {}
-      
-      insert_iterator(_Container& __x, typename _Container::iterator)
-      : container(&__x) {}
-
-      insert_iterator<_Container>&
-      operator=(const typename _Container::value_type& __value)
-      {
-	container->insert(__value);
-	return *this;
-      }
-
-      insert_iterator<_Container>&
-      operator*()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++(int) { return *this; }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/backward/hashtable.h b/openflow/usr/include/c++/5/backward/hashtable.h
deleted file mode 100644
index 3f2bb9e..0000000
--- a/openflow/usr/include/c++/5/backward/hashtable.h
+++ /dev/null
@@ -1,1167 +0,0 @@
-// Hashtable implementation used by containers -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file backward/hashtable.h
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).
- */
-
-#ifndef _BACKWARD_HASHTABLE_H
-#define _BACKWARD_HASHTABLE_H 1
-
-// Hashtable class, used to implement the hashed associative containers
-// hash_set, hash_map, hash_multiset, and hash_multimap.
-
-#include <vector>
-#include <iterator>
-#include <algorithm>
-#include <bits/stl_function.h>
-#include <backward/hash_fun.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::size_t;
-  using std::ptrdiff_t;
-  using std::forward_iterator_tag;
-  using std::input_iterator_tag;
-  using std::_Construct;
-  using std::_Destroy;
-  using std::distance;
-  using std::vector;
-  using std::pair;
-  using std::__iterator_category;
-
-  template<class _Val>
-    struct _Hashtable_node
-    {
-      _Hashtable_node* _M_next;
-      _Val _M_val;
-    };
-
-  template<class _Val, class _Key, class _HashFcn, class _ExtractKey, 
-	   class _EqualKey, class _Alloc = std::allocator<_Val> >
-    class hashtable;
-
-  template<class _Val, class _Key, class _HashFcn,
-	   class _ExtractKey, class _EqualKey, class _Alloc>
-    struct _Hashtable_iterator;
-
-  template<class _Val, class _Key, class _HashFcn,
-	   class _ExtractKey, class _EqualKey, class _Alloc>
-    struct _Hashtable_const_iterator;
-
-  template<class _Val, class _Key, class _HashFcn,
-	   class _ExtractKey, class _EqualKey, class _Alloc>
-    struct _Hashtable_iterator
-    {
-      typedef hashtable<_Val, _Key, _HashFcn, _ExtractKey, _EqualKey, _Alloc>
-        _Hashtable;
-      typedef _Hashtable_iterator<_Val, _Key, _HashFcn,
-				  _ExtractKey, _EqualKey, _Alloc>
-        iterator;
-      typedef _Hashtable_const_iterator<_Val, _Key, _HashFcn,
-					_ExtractKey, _EqualKey, _Alloc>
-        const_iterator;
-      typedef _Hashtable_node<_Val> _Node;
-      typedef forward_iterator_tag iterator_category;
-      typedef _Val value_type;
-      typedef ptrdiff_t difference_type;
-      typedef size_t size_type;
-      typedef _Val& reference;
-      typedef _Val* pointer;
-      
-      _Node* _M_cur;
-      _Hashtable* _M_ht;
-
-      _Hashtable_iterator(_Node* __n, _Hashtable* __tab)
-      : _M_cur(__n), _M_ht(__tab) { }
-
-      _Hashtable_iterator() { }
-
-      reference
-      operator*() const
-      { return _M_cur->_M_val; }
-
-      pointer
-      operator->() const
-      { return &(operator*()); }
-
-      iterator&
-      operator++();
-
-      iterator
-      operator++(int);
-
-      bool
-      operator==(const iterator& __it) const
-      { return _M_cur == __it._M_cur; }
-
-      bool
-      operator!=(const iterator& __it) const
-      { return _M_cur != __it._M_cur; }
-    };
-
-  template<class _Val, class _Key, class _HashFcn,
-	   class _ExtractKey, class _EqualKey, class _Alloc>
-    struct _Hashtable_const_iterator
-    {
-      typedef hashtable<_Val, _Key, _HashFcn, _ExtractKey, _EqualKey, _Alloc>
-        _Hashtable;
-      typedef _Hashtable_iterator<_Val,_Key,_HashFcn,
-				  _ExtractKey,_EqualKey,_Alloc>
-        iterator;
-      typedef _Hashtable_const_iterator<_Val, _Key, _HashFcn,
-					_ExtractKey, _EqualKey, _Alloc>
-        const_iterator;
-      typedef _Hashtable_node<_Val> _Node;
-
-      typedef forward_iterator_tag iterator_category;
-      typedef _Val value_type;
-      typedef ptrdiff_t difference_type;
-      typedef size_t size_type;
-      typedef const _Val& reference;
-      typedef const _Val* pointer;
-      
-      const _Node* _M_cur;
-      const _Hashtable* _M_ht;
-
-      _Hashtable_const_iterator(const _Node* __n, const _Hashtable* __tab)
-      : _M_cur(__n), _M_ht(__tab) { }
-
-      _Hashtable_const_iterator() { }
-
-      _Hashtable_const_iterator(const iterator& __it)
-      : _M_cur(__it._M_cur), _M_ht(__it._M_ht) { }
-
-      reference
-      operator*() const
-      { return _M_cur->_M_val; }
-
-      pointer
-      operator->() const
-      { return &(operator*()); }
-
-      const_iterator&
-      operator++();
-
-      const_iterator
-      operator++(int);
-
-      bool
-      operator==(const const_iterator& __it) const
-      { return _M_cur == __it._M_cur; }
-
-      bool
-      operator!=(const const_iterator& __it) const
-      { return _M_cur != __it._M_cur; }
-    };
-
-  // Note: assumes long is at least 32 bits.
-  enum { _S_num_primes = 29 };
-
-  template<typename _PrimeType>
-    struct _Hashtable_prime_list
-    {
-      static const _PrimeType  __stl_prime_list[_S_num_primes];
-
-      static const _PrimeType*
-      _S_get_prime_list();
-    };
-
-  template<typename _PrimeType> const _PrimeType
-  _Hashtable_prime_list<_PrimeType>::__stl_prime_list[_S_num_primes] =
-    {
-      5ul,          53ul,         97ul,         193ul,       389ul,
-      769ul,        1543ul,       3079ul,       6151ul,      12289ul,
-      24593ul,      49157ul,      98317ul,      196613ul,    393241ul,
-      786433ul,     1572869ul,    3145739ul,    6291469ul,   12582917ul,
-      25165843ul,   50331653ul,   100663319ul,  201326611ul, 402653189ul,
-      805306457ul,  1610612741ul, 3221225473ul, 4294967291ul
-    };
-
- template<class _PrimeType> inline const _PrimeType*
- _Hashtable_prime_list<_PrimeType>::_S_get_prime_list()
- {
-   return __stl_prime_list;
- }
-
-  inline unsigned long
-  __stl_next_prime(unsigned long __n)
-  {
-    const unsigned long* __first = _Hashtable_prime_list<unsigned long>::_S_get_prime_list();
-    const unsigned long* __last = __first + (int)_S_num_primes;
-    const unsigned long* pos = std::lower_bound(__first, __last, __n);
-    return pos == __last ? *(__last - 1) : *pos;
-  }
-
-  // Forward declaration of operator==.  
-  template<class _Val, class _Key, class _HF, class _Ex,
-	   class _Eq, class _All>
-    class hashtable;
-
-  template<class _Val, class _Key, class _HF, class _Ex,
-	   class _Eq, class _All>
-    bool
-    operator==(const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht1,
-	       const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht2);
-
-  // Hashtables handle allocators a bit differently than other
-  // containers do.  If we're using standard-conforming allocators, then
-  // a hashtable unconditionally has a member variable to hold its
-  // allocator, even if it so happens that all instances of the
-  // allocator type are identical.  This is because, for hashtables,
-  // this extra storage is negligible.  Additionally, a base class
-  // wouldn't serve any other purposes; it wouldn't, for example,
-  // simplify the exception-handling code.  
-  template<class _Val, class _Key, class _HashFcn,
-	   class _ExtractKey, class _EqualKey, class _Alloc>
-    class hashtable
-    {
-    public:
-      typedef _Key key_type;
-      typedef _Val value_type;
-      typedef _HashFcn hasher;
-      typedef _EqualKey key_equal;
-
-      typedef size_t            size_type;
-      typedef ptrdiff_t         difference_type;
-      typedef value_type*       pointer;
-      typedef const value_type* const_pointer;
-      typedef value_type&       reference;
-      typedef const value_type& const_reference;
-
-      hasher
-      hash_funct() const
-      { return _M_hash; }
-
-      key_equal
-      key_eq() const
-      { return _M_equals; }
-
-    private:
-      typedef _Hashtable_node<_Val> _Node;
-
-    public:
-      typedef typename _Alloc::template rebind<value_type>::other allocator_type;
-      allocator_type
-      get_allocator() const
-      { return _M_node_allocator; }
-
-    private:
-      typedef typename _Alloc::template rebind<_Node>::other _Node_Alloc;
-      typedef typename _Alloc::template rebind<_Node*>::other _Nodeptr_Alloc;
-      typedef vector<_Node*, _Nodeptr_Alloc> _Vector_type;
-
-      _Node_Alloc _M_node_allocator;
-
-      _Node*
-      _M_get_node()
-      { return _M_node_allocator.allocate(1); }
-
-      void
-      _M_put_node(_Node* __p)
-      { _M_node_allocator.deallocate(__p, 1); }
-
-    private:
-      hasher                _M_hash;
-      key_equal             _M_equals;
-      _ExtractKey           _M_get_key;
-      _Vector_type          _M_buckets;
-      size_type             _M_num_elements;
-      
-    public:
-      typedef _Hashtable_iterator<_Val, _Key, _HashFcn, _ExtractKey,
-				  _EqualKey, _Alloc>
-        iterator;
-      typedef _Hashtable_const_iterator<_Val, _Key, _HashFcn, _ExtractKey,
-					_EqualKey, _Alloc>
-        const_iterator;
-
-      friend struct
-      _Hashtable_iterator<_Val, _Key, _HashFcn, _ExtractKey, _EqualKey, _Alloc>;
-
-      friend struct
-      _Hashtable_const_iterator<_Val, _Key, _HashFcn, _ExtractKey,
-				_EqualKey, _Alloc>;
-
-    public:
-      hashtable(size_type __n, const _HashFcn& __hf,
-		const _EqualKey& __eql, const _ExtractKey& __ext,
-		const allocator_type& __a = allocator_type())
-      : _M_node_allocator(__a), _M_hash(__hf), _M_equals(__eql),
-	_M_get_key(__ext), _M_buckets(__a), _M_num_elements(0)
-      { _M_initialize_buckets(__n); }
-
-      hashtable(size_type __n, const _HashFcn& __hf,
-		const _EqualKey& __eql,
-		const allocator_type& __a = allocator_type())
-      : _M_node_allocator(__a), _M_hash(__hf), _M_equals(__eql),
-	_M_get_key(_ExtractKey()), _M_buckets(__a), _M_num_elements(0)
-      { _M_initialize_buckets(__n); }
-
-      hashtable(const hashtable& __ht)
-      : _M_node_allocator(__ht.get_allocator()), _M_hash(__ht._M_hash),
-      _M_equals(__ht._M_equals), _M_get_key(__ht._M_get_key),
-      _M_buckets(__ht.get_allocator()), _M_num_elements(0)
-      { _M_copy_from(__ht); }
-
-      hashtable&
-      operator= (const hashtable& __ht)
-      {
-	if (&__ht != this)
-	  {
-	    clear();
-	    _M_hash = __ht._M_hash;
-	    _M_equals = __ht._M_equals;
-	    _M_get_key = __ht._M_get_key;
-	    _M_copy_from(__ht);
-	  }
-	return *this;
-      }
-
-      ~hashtable()
-      { clear(); }
-
-      size_type
-      size() const
-      { return _M_num_elements; }
-
-      size_type
-      max_size() const
-      { return size_type(-1); }
-
-      bool
-      empty() const
-      { return size() == 0; }
-
-      void
-      swap(hashtable& __ht)
-      {
-	std::swap(_M_hash, __ht._M_hash);
-	std::swap(_M_equals, __ht._M_equals);
-	std::swap(_M_get_key, __ht._M_get_key);
-	_M_buckets.swap(__ht._M_buckets);
-	std::swap(_M_num_elements, __ht._M_num_elements);
-      }
-
-      iterator
-      begin()
-      {
-	for (size_type __n = 0; __n < _M_buckets.size(); ++__n)
-	  if (_M_buckets[__n])
-	    return iterator(_M_buckets[__n], this);
-	return end();
-      }
-
-      iterator
-      end()
-      { return iterator(0, this); }
-
-      const_iterator
-      begin() const
-      {
-	for (size_type __n = 0; __n < _M_buckets.size(); ++__n)
-	  if (_M_buckets[__n])
-	    return const_iterator(_M_buckets[__n], this);
-	return end();
-      }
-
-      const_iterator
-      end() const
-      { return const_iterator(0, this); }
-
-      template<class _Vl, class _Ky, class _HF, class _Ex, class _Eq,
-		class _Al>
-        friend bool
-        operator==(const hashtable<_Vl, _Ky, _HF, _Ex, _Eq, _Al>&,
-		   const hashtable<_Vl, _Ky, _HF, _Ex, _Eq, _Al>&);
-
-    public:
-      size_type
-      bucket_count() const
-      { return _M_buckets.size(); }
-
-      size_type
-      max_bucket_count() const
-      { return _Hashtable_prime_list<unsigned long>::
-               _S_get_prime_list()[(int)_S_num_primes - 1];
-      }
-
-      size_type
-      elems_in_bucket(size_type __bucket) const
-      {
-	size_type __result = 0;
-	for (_Node* __n = _M_buckets[__bucket]; __n; __n = __n->_M_next)
-	  __result += 1;
-	return __result;
-      }
-
-      pair<iterator, bool>
-      insert_unique(const value_type& __obj)
-      {
-	resize(_M_num_elements + 1);
-	return insert_unique_noresize(__obj);
-      }
-
-      iterator
-      insert_equal(const value_type& __obj)
-      {
-	resize(_M_num_elements + 1);
-	return insert_equal_noresize(__obj);
-      }
-
-      pair<iterator, bool>
-      insert_unique_noresize(const value_type& __obj);
-
-      iterator
-      insert_equal_noresize(const value_type& __obj);
-
-      template<class _InputIterator>
-        void
-        insert_unique(_InputIterator __f, _InputIterator __l)
-        { insert_unique(__f, __l, __iterator_category(__f)); }
-
-      template<class _InputIterator>
-        void
-        insert_equal(_InputIterator __f, _InputIterator __l)
-        { insert_equal(__f, __l, __iterator_category(__f)); }
-
-      template<class _InputIterator>
-        void
-        insert_unique(_InputIterator __f, _InputIterator __l,
-		      input_iterator_tag)
-        {
-	  for ( ; __f != __l; ++__f)
-	    insert_unique(*__f);
-	}
-
-      template<class _InputIterator>
-        void
-        insert_equal(_InputIterator __f, _InputIterator __l,
-		     input_iterator_tag)
-        {
-	  for ( ; __f != __l; ++__f)
-	    insert_equal(*__f);
-	}
-
-      template<class _ForwardIterator>
-        void
-        insert_unique(_ForwardIterator __f, _ForwardIterator __l,
-		      forward_iterator_tag)
-        {
-	  size_type __n = distance(__f, __l);
-	  resize(_M_num_elements + __n);
-	  for ( ; __n > 0; --__n, ++__f)
-	    insert_unique_noresize(*__f);
-	}
-
-      template<class _ForwardIterator>
-        void
-        insert_equal(_ForwardIterator __f, _ForwardIterator __l,
-		     forward_iterator_tag)
-        {
-	  size_type __n = distance(__f, __l);
-	  resize(_M_num_elements + __n);
-	  for ( ; __n > 0; --__n, ++__f)
-	    insert_equal_noresize(*__f);
-	}
-
-      reference
-      find_or_insert(const value_type& __obj);
-
-      iterator
-      find(const key_type& __key)
-      {
-	size_type __n = _M_bkt_num_key(__key);
-	_Node* __first;
-	for (__first = _M_buckets[__n];
-	     __first && !_M_equals(_M_get_key(__first->_M_val), __key);
-	     __first = __first->_M_next)
-	  { }
-	return iterator(__first, this);
-      }
-
-      const_iterator
-      find(const key_type& __key) const
-      {
-	size_type __n = _M_bkt_num_key(__key);
-	const _Node* __first;
-	for (__first = _M_buckets[__n];
-	     __first && !_M_equals(_M_get_key(__first->_M_val), __key);
-	     __first = __first->_M_next)
-	  { }
-	return const_iterator(__first, this);
-      }
-
-      size_type
-      count(const key_type& __key) const
-      {
-	const size_type __n = _M_bkt_num_key(__key);
-	size_type __result = 0;
-	
-	for (const _Node* __cur = _M_buckets[__n]; __cur;
-	     __cur = __cur->_M_next)
-	  if (_M_equals(_M_get_key(__cur->_M_val), __key))
-	    ++__result;
-	return __result;
-      }
-
-      pair<iterator, iterator>
-      equal_range(const key_type& __key);
-
-      pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const;
-
-      size_type
-      erase(const key_type& __key);
-      
-      void
-      erase(const iterator& __it);
-
-      void
-      erase(iterator __first, iterator __last);
-
-      void
-      erase(const const_iterator& __it);
-
-      void
-      erase(const_iterator __first, const_iterator __last);
-
-      void
-      resize(size_type __num_elements_hint);
-
-      void
-      clear();
-
-    private:
-      size_type
-      _M_next_size(size_type __n) const
-      { return __stl_next_prime(__n); }
-
-      void
-      _M_initialize_buckets(size_type __n)
-      {
-	const size_type __n_buckets = _M_next_size(__n);
-	_M_buckets.reserve(__n_buckets);
-	_M_buckets.insert(_M_buckets.end(), __n_buckets, (_Node*) 0);
-	_M_num_elements = 0;
-      }
-
-      size_type
-      _M_bkt_num_key(const key_type& __key) const
-      { return _M_bkt_num_key(__key, _M_buckets.size()); }
-
-      size_type
-      _M_bkt_num(const value_type& __obj) const
-      { return _M_bkt_num_key(_M_get_key(__obj)); }
-
-      size_type
-      _M_bkt_num_key(const key_type& __key, size_t __n) const
-      { return _M_hash(__key) % __n; }
-
-      size_type
-      _M_bkt_num(const value_type& __obj, size_t __n) const
-      { return _M_bkt_num_key(_M_get_key(__obj), __n); }
-
-      _Node*
-      _M_new_node(const value_type& __obj)
-      {
-	_Node* __n = _M_get_node();
-	__n->_M_next = 0;
-	__try
-	  {
-	    this->get_allocator().construct(&__n->_M_val, __obj);
-	    return __n;
-	  }
-	__catch(...)
-	  {
-	    _M_put_node(__n);
-	    __throw_exception_again;
-	  }
-      }
-
-      void
-      _M_delete_node(_Node* __n)
-      {
-	this->get_allocator().destroy(&__n->_M_val);
-	_M_put_node(__n);
-      }
-      
-      void
-      _M_erase_bucket(const size_type __n, _Node* __first, _Node* __last);
-
-      void
-      _M_erase_bucket(const size_type __n, _Node* __last);
-
-      void
-      _M_copy_from(const hashtable& __ht);
-    };
-
-  template<class _Val, class _Key, class _HF, class _ExK, class _EqK,
-	    class _All>
-    _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>&
-    _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
-    operator++()
-    {
-      const _Node* __old = _M_cur;
-      _M_cur = _M_cur->_M_next;
-      if (!_M_cur)
-	{
-	  size_type __bucket = _M_ht->_M_bkt_num(__old->_M_val);
-	  while (!_M_cur && ++__bucket < _M_ht->_M_buckets.size())
-	    _M_cur = _M_ht->_M_buckets[__bucket];
-	}
-      return *this;
-    }
-
-  template<class _Val, class _Key, class _HF, class _ExK, class _EqK,
-	    class _All>
-    inline _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>
-    _Hashtable_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
-    operator++(int)
-    {
-      iterator __tmp = *this;
-      ++*this;
-      return __tmp;
-    }
-
-  template<class _Val, class _Key, class _HF, class _ExK, class _EqK,
-	    class _All>
-    _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>&
-    _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
-    operator++()
-    {
-      const _Node* __old = _M_cur;
-      _M_cur = _M_cur->_M_next;
-      if (!_M_cur)
-	{
-	  size_type __bucket = _M_ht->_M_bkt_num(__old->_M_val);
-	  while (!_M_cur && ++__bucket < _M_ht->_M_buckets.size())
-	    _M_cur = _M_ht->_M_buckets[__bucket];
-	}
-      return *this;
-    }
-
-  template<class _Val, class _Key, class _HF, class _ExK, class _EqK,
-	    class _All>
-    inline _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>
-    _Hashtable_const_iterator<_Val, _Key, _HF, _ExK, _EqK, _All>::
-    operator++(int)
-    {
-      const_iterator __tmp = *this;
-      ++*this;
-      return __tmp;
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    bool
-    operator==(const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht1,
-	       const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht2)
-    {
-      typedef typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::_Node _Node;
-
-      if (__ht1._M_buckets.size() != __ht2._M_buckets.size())
-	return false;
-
-      for (size_t __n = 0; __n < __ht1._M_buckets.size(); ++__n)
-	{
-	  _Node* __cur1 = __ht1._M_buckets[__n];
-	  _Node* __cur2 = __ht2._M_buckets[__n];
-	  // Check same length of lists
-	  for (; __cur1 && __cur2;
-	       __cur1 = __cur1->_M_next, __cur2 = __cur2->_M_next)
-	    { } 
-	  if (__cur1 || __cur2)
-	    return false;
-	  // Now check one's elements are in the other
-	  for (__cur1 = __ht1._M_buckets[__n] ; __cur1;
-	       __cur1 = __cur1->_M_next)
-	    {
-	      bool _found__cur1 = false;
-	      for (__cur2 = __ht2._M_buckets[__n];
-		   __cur2; __cur2 = __cur2->_M_next)
-		{
-		  if (__cur1->_M_val == __cur2->_M_val)
-		    {
-		      _found__cur1 = true;
-		      break;
-		    }
-		}
-	      if (!_found__cur1)
-		return false;
-	    }
-	}
-      return true;
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    inline bool
-    operator!=(const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht1,
-	       const hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>& __ht2)
-    { return !(__ht1 == __ht2); }
-
-  template<class _Val, class _Key, class _HF, class _Extract, class _EqKey,
-	    class _All>
-    inline void
-    swap(hashtable<_Val, _Key, _HF, _Extract, _EqKey, _All>& __ht1,
-	 hashtable<_Val, _Key, _HF, _Extract, _EqKey, _All>& __ht2)
-    { __ht1.swap(__ht2); }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    pair<typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator, bool>
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    insert_unique_noresize(const value_type& __obj)
-    {
-      const size_type __n = _M_bkt_num(__obj);
-      _Node* __first = _M_buckets[__n];
-      
-      for (_Node* __cur = __first; __cur; __cur = __cur->_M_next)
-	if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj)))
-	  return pair<iterator, bool>(iterator(__cur, this), false);
-      
-      _Node* __tmp = _M_new_node(__obj);
-      __tmp->_M_next = __first;
-      _M_buckets[__n] = __tmp;
-      ++_M_num_elements;
-      return pair<iterator, bool>(iterator(__tmp, this), true);
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    insert_equal_noresize(const value_type& __obj)
-    {
-      const size_type __n = _M_bkt_num(__obj);
-      _Node* __first = _M_buckets[__n];
-      
-      for (_Node* __cur = __first; __cur; __cur = __cur->_M_next)
-	if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj)))
-	  {
-	    _Node* __tmp = _M_new_node(__obj);
-	    __tmp->_M_next = __cur->_M_next;
-	    __cur->_M_next = __tmp;
-	    ++_M_num_elements;
-	    return iterator(__tmp, this);
-	  }
-
-      _Node* __tmp = _M_new_node(__obj);
-      __tmp->_M_next = __first;
-      _M_buckets[__n] = __tmp;
-      ++_M_num_elements;
-      return iterator(__tmp, this);
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::reference
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    find_or_insert(const value_type& __obj)
-    {
-      resize(_M_num_elements + 1);
-
-      size_type __n = _M_bkt_num(__obj);
-      _Node* __first = _M_buckets[__n];
-      
-      for (_Node* __cur = __first; __cur; __cur = __cur->_M_next)
-	if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj)))
-	  return __cur->_M_val;
-      
-      _Node* __tmp = _M_new_node(__obj);
-      __tmp->_M_next = __first;
-      _M_buckets[__n] = __tmp;
-      ++_M_num_elements;
-      return __tmp->_M_val;
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    pair<typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator,
-	 typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::iterator>
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    equal_range(const key_type& __key)
-    {
-      typedef pair<iterator, iterator> _Pii;
-      const size_type __n = _M_bkt_num_key(__key);
-
-      for (_Node* __first = _M_buckets[__n]; __first;
-	   __first = __first->_M_next)
-	if (_M_equals(_M_get_key(__first->_M_val), __key))
-	  {
-	    for (_Node* __cur = __first->_M_next; __cur;
-		 __cur = __cur->_M_next)
-	      if (!_M_equals(_M_get_key(__cur->_M_val), __key))
-		return _Pii(iterator(__first, this), iterator(__cur, this));
-	    for (size_type __m = __n + 1; __m < _M_buckets.size(); ++__m)
-	      if (_M_buckets[__m])
-		return _Pii(iterator(__first, this),
-			    iterator(_M_buckets[__m], this));
-	    return _Pii(iterator(__first, this), end());
-	  }
-      return _Pii(end(), end());
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    pair<typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::const_iterator,
-	 typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::const_iterator>
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    equal_range(const key_type& __key) const
-    {
-      typedef pair<const_iterator, const_iterator> _Pii;
-      const size_type __n = _M_bkt_num_key(__key);
-
-      for (const _Node* __first = _M_buckets[__n]; __first;
-	   __first = __first->_M_next)
-	{
-	  if (_M_equals(_M_get_key(__first->_M_val), __key))
-	    {
-	      for (const _Node* __cur = __first->_M_next; __cur;
-		   __cur = __cur->_M_next)
-		if (!_M_equals(_M_get_key(__cur->_M_val), __key))
-		  return _Pii(const_iterator(__first, this),
-			      const_iterator(__cur, this));
-	      for (size_type __m = __n + 1; __m < _M_buckets.size(); ++__m)
-		if (_M_buckets[__m])
-		  return _Pii(const_iterator(__first, this),
-			      const_iterator(_M_buckets[__m], this));
-	      return _Pii(const_iterator(__first, this), end());
-	    }
-	}
-      return _Pii(end(), end());
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    typename hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::size_type
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    erase(const key_type& __key)
-    {
-      const size_type __n = _M_bkt_num_key(__key);
-      _Node* __first = _M_buckets[__n];
-      _Node* __saved_slot = 0;
-      size_type __erased = 0;
-
-      if (__first)
-	{
-	  _Node* __cur = __first;
-	  _Node* __next = __cur->_M_next;
-	  while (__next)
-	    {
-	      if (_M_equals(_M_get_key(__next->_M_val), __key))
-		{
-		  if (&_M_get_key(__next->_M_val) != &__key)
-		    {
-		      __cur->_M_next = __next->_M_next;
-		      _M_delete_node(__next);
-		      __next = __cur->_M_next;
-		      ++__erased;
-		      --_M_num_elements;
-		    }
-		  else
-		    {
-		      __saved_slot = __cur;
-		      __cur = __next;
-		      __next = __cur->_M_next;
-		    }
-		}
-	      else
-		{
-		  __cur = __next;
-		  __next = __cur->_M_next;
-		}
-	    }
-	  bool __delete_first = _M_equals(_M_get_key(__first->_M_val), __key);
-	  if (__saved_slot)
-	    {
-	      __next = __saved_slot->_M_next;
-	      __saved_slot->_M_next = __next->_M_next;
-	      _M_delete_node(__next);
-	      ++__erased;
-	      --_M_num_elements;
-	    }
-	  if (__delete_first)
-	    {
-	      _M_buckets[__n] = __first->_M_next;
-	      _M_delete_node(__first);
-	      ++__erased;
-	      --_M_num_elements;
-	    }
-	}
-      return __erased;
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    void hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    erase(const iterator& __it)
-    {
-      _Node* __p = __it._M_cur;
-      if (__p)
-	{
-	  const size_type __n = _M_bkt_num(__p->_M_val);
-	  _Node* __cur = _M_buckets[__n];
-	  
-	  if (__cur == __p)
-	    {
-	      _M_buckets[__n] = __cur->_M_next;
-	      _M_delete_node(__cur);
-	      --_M_num_elements;
-	    }
-	  else
-	    {
-	      _Node* __next = __cur->_M_next;
-	      while (__next)
-		{
-		  if (__next == __p)
-		    {
-		      __cur->_M_next = __next->_M_next;
-		      _M_delete_node(__next);
-		      --_M_num_elements;
-		      break;
-		    }
-		  else
-		    {
-		      __cur = __next;
-		      __next = __cur->_M_next;
-		    }
-		}
-	    }
-	}
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    void
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    erase(iterator __first, iterator __last)
-    {
-      size_type __f_bucket = __first._M_cur ? _M_bkt_num(__first._M_cur->_M_val)
-	                                    : _M_buckets.size();
-
-      size_type __l_bucket = __last._M_cur ? _M_bkt_num(__last._M_cur->_M_val)
-	                                   : _M_buckets.size();
-
-      if (__first._M_cur == __last._M_cur)
-	return;
-      else if (__f_bucket == __l_bucket)
-	_M_erase_bucket(__f_bucket, __first._M_cur, __last._M_cur);
-      else
-	{
-	  _M_erase_bucket(__f_bucket, __first._M_cur, 0);
-	  for (size_type __n = __f_bucket + 1; __n < __l_bucket; ++__n)
-	    _M_erase_bucket(__n, 0);
-	  if (__l_bucket != _M_buckets.size())
-	    _M_erase_bucket(__l_bucket, __last._M_cur);
-	}
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    inline void
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    erase(const_iterator __first, const_iterator __last)
-    {
-      erase(iterator(const_cast<_Node*>(__first._M_cur),
-		     const_cast<hashtable*>(__first._M_ht)),
-	    iterator(const_cast<_Node*>(__last._M_cur),
-		     const_cast<hashtable*>(__last._M_ht)));
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    inline void
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    erase(const const_iterator& __it)
-    { erase(iterator(const_cast<_Node*>(__it._M_cur),
-		     const_cast<hashtable*>(__it._M_ht))); }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    void
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    resize(size_type __num_elements_hint)
-    {
-      const size_type __old_n = _M_buckets.size();
-      if (__num_elements_hint > __old_n)
-	{
-	  const size_type __n = _M_next_size(__num_elements_hint);
-	  if (__n > __old_n)
-	    {
-	      _Vector_type __tmp(__n, (_Node*)(0), _M_buckets.get_allocator());
-	      __try
-		{
-		  for (size_type __bucket = 0; __bucket < __old_n; ++__bucket)
-		    {
-		      _Node* __first = _M_buckets[__bucket];
-		      while (__first)
-			{
-			  size_type __new_bucket = _M_bkt_num(__first->_M_val,
-							      __n);
-			  _M_buckets[__bucket] = __first->_M_next;
-			  __first->_M_next = __tmp[__new_bucket];
-			  __tmp[__new_bucket] = __first;
-			  __first = _M_buckets[__bucket];
-			}
-		    }
-		  _M_buckets.swap(__tmp);
-		}
-	      __catch(...)
-		{
-		  for (size_type __bucket = 0; __bucket < __tmp.size();
-		       ++__bucket)
-		    {
-		      while (__tmp[__bucket])
-			{
-			  _Node* __next = __tmp[__bucket]->_M_next;
-			  _M_delete_node(__tmp[__bucket]);
-			  __tmp[__bucket] = __next;
-			}
-		    }
-		  __throw_exception_again;
-		}
-	    }
-	}
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    void
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    _M_erase_bucket(const size_type __n, _Node* __first, _Node* __last)
-    {
-      _Node* __cur = _M_buckets[__n];
-      if (__cur == __first)
-	_M_erase_bucket(__n, __last);
-      else
-	{
-	  _Node* __next;
-	  for (__next = __cur->_M_next;
-	       __next != __first;
-	       __cur = __next, __next = __cur->_M_next)
-	    ;
-	  while (__next != __last)
-	    {
-	      __cur->_M_next = __next->_M_next;
-	      _M_delete_node(__next);
-	      __next = __cur->_M_next;
-	      --_M_num_elements;
-	    }
-	}
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    void
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    _M_erase_bucket(const size_type __n, _Node* __last)
-    {
-      _Node* __cur = _M_buckets[__n];
-      while (__cur != __last)
-	{
-	  _Node* __next = __cur->_M_next;
-	  _M_delete_node(__cur);
-	  __cur = __next;
-	  _M_buckets[__n] = __cur;
-	  --_M_num_elements;
-	}
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    void
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    clear()
-    {
-      if (_M_num_elements == 0)
-	return;
-
-      for (size_type __i = 0; __i < _M_buckets.size(); ++__i)
-	{
-	  _Node* __cur = _M_buckets[__i];
-	  while (__cur != 0)
-	    {
-	      _Node* __next = __cur->_M_next;
-	      _M_delete_node(__cur);
-	      __cur = __next;
-	    }
-	  _M_buckets[__i] = 0;
-	}
-      _M_num_elements = 0;
-    }
-
-  template<class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-    void
-    hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
-    _M_copy_from(const hashtable& __ht)
-    {
-      _M_buckets.clear();
-      _M_buckets.reserve(__ht._M_buckets.size());
-      _M_buckets.insert(_M_buckets.end(), __ht._M_buckets.size(), (_Node*) 0);
-      __try
-	{
-	  for (size_type __i = 0; __i < __ht._M_buckets.size(); ++__i) {
-	    const _Node* __cur = __ht._M_buckets[__i];
-	    if (__cur)
-	      {
-		_Node* __local_copy = _M_new_node(__cur->_M_val);
-		_M_buckets[__i] = __local_copy;
-		
-		for (_Node* __next = __cur->_M_next;
-		     __next;
-		     __cur = __next, __next = __cur->_M_next)
-		  {
-		    __local_copy->_M_next = _M_new_node(__next->_M_val);
-		    __local_copy = __local_copy->_M_next;
-		  }
-	      }
-	  }
-	  _M_num_elements = __ht._M_num_elements;
-	}
-      __catch(...)
-	{
-	  clear();
-	  __throw_exception_again;
-	}
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/backward/strstream b/openflow/usr/include/c++/5/backward/strstream
deleted file mode 100644
index 10e2dfe..0000000
--- a/openflow/usr/include/c++/5/backward/strstream
+++ /dev/null
@@ -1,183 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-// WARNING: The classes defined in this header are DEPRECATED.  This
-// header is defined in section D.7.1 of the C++ standard, and it
-// MAY BE REMOVED in a future standard revision.  One should use the
-// header <sstream> instead.
-
-/** @file strstream
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _BACKWARD_STRSTREAM
-#define _BACKWARD_STRSTREAM
-
-#include "backward_warning.h"
-#include <iosfwd>
-#include <ios>
-#include <istream>
-#include <ostream>
-#include <string>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Class strstreambuf, a streambuf class that manages an array of char.
-  // Note that this class is not a template.
-  class strstreambuf : public basic_streambuf<char, char_traits<char> >
-  {
-  public:
-    // Types.
-    typedef char_traits<char>              _Traits;
-    typedef basic_streambuf<char, _Traits> _Base;
-
-  public:
-    // Constructor, destructor
-    explicit strstreambuf(streamsize __initial_capacity = 0);
-    strstreambuf(void* (*__alloc)(size_t), void (*__free)(void*));
-
-    strstreambuf(char* __get, streamsize __n, char* __put = 0) throw ();
-    strstreambuf(signed char* __get, streamsize __n, signed char* __put = 0) throw ();
-    strstreambuf(unsigned char* __get, streamsize __n, unsigned char* __put=0) throw ();
-
-    strstreambuf(const char* __get, streamsize __n) throw ();
-    strstreambuf(const signed char* __get, streamsize __n) throw ();
-    strstreambuf(const unsigned char* __get, streamsize __n) throw ();
-
-    virtual ~strstreambuf();
-
-  public:
-    void freeze(bool = true) throw ();
-    char* str() throw ();
-    _GLIBCXX_PURE int pcount() const throw ();
-
-  protected:
-    virtual int_type overflow(int_type __c  = _Traits::eof());
-    virtual int_type pbackfail(int_type __c = _Traits::eof());
-    virtual int_type underflow();
-    virtual _Base* setbuf(char* __buf, streamsize __n);
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __dir,
-			     ios_base::openmode __mode
-			     = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __pos, ios_base::openmode __mode
-			     = ios_base::in | ios_base::out);
-
-  private:
-    strstreambuf&
-    operator=(const strstreambuf&);
-
-    strstreambuf(const strstreambuf&);
-
-    // Dynamic allocation, possibly using _M_alloc_fun and _M_free_fun.
-    char* _M_alloc(size_t);
-    void  _M_free(char*);
-
-    // Helper function used in constructors.
-    void _M_setup(char* __get, char* __put, streamsize __n) throw ();
-
-  private:
-    // Data members.
-    void* (*_M_alloc_fun)(size_t);
-    void  (*_M_free_fun)(void*);
-
-    bool _M_dynamic  : 1;
-    bool _M_frozen   : 1;
-    bool _M_constant : 1;
-  };
-
-  // Class istrstream, an istream that manages a strstreambuf.
-  class istrstream : public basic_istream<char>
-  {
-  public:
-    explicit istrstream(char*);
-    explicit istrstream(const char*);
-    istrstream(char* , streamsize);
-    istrstream(const char*, streamsize);
-    virtual ~istrstream();
-
-    _GLIBCXX_CONST strstreambuf* rdbuf() const throw ();
-    char* str() throw ();
-
-  private:
-    strstreambuf _M_buf;
-  };
-
-  // Class ostrstream
-  class ostrstream : public basic_ostream<char>
-  {
-  public:
-    ostrstream();
-    ostrstream(char*, int, ios_base::openmode = ios_base::out);
-    virtual ~ostrstream();
-
-    _GLIBCXX_CONST strstreambuf* rdbuf() const throw ();
-    void freeze(bool = true) throw();
-    char* str() throw ();
-    _GLIBCXX_PURE int pcount() const throw ();
-
-  private:
-    strstreambuf _M_buf;
-  };
-
-  // Class strstream
-  class strstream : public basic_iostream<char>
-  {
-  public:
-    typedef char                        char_type;
-    typedef char_traits<char>::int_type int_type;
-    typedef char_traits<char>::pos_type pos_type;
-    typedef char_traits<char>::off_type off_type;
-
-    strstream();
-    strstream(char*, int, ios_base::openmode = ios_base::in | ios_base::out);
-    virtual ~strstream();
-
-    _GLIBCXX_CONST strstreambuf* rdbuf() const throw ();
-    void freeze(bool = true) throw ();
-    _GLIBCXX_PURE int pcount() const throw ();
-    char* str() throw ();
-
-  private:
-    strstreambuf _M_buf;
-  };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/algorithmfwd.h b/openflow/usr/include/c++/5/bits/algorithmfwd.h
deleted file mode 100644
index 1dfc4ad..0000000
--- a/openflow/usr/include/c++/5/bits/algorithmfwd.h
+++ /dev/null
@@ -1,847 +0,0 @@
-// <algorithm> Forward declarations  -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/algorithmfwd.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{algorithm}
- */
-
-#ifndef _GLIBCXX_ALGORITHMFWD_H
-#define _GLIBCXX_ALGORITHMFWD_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stl_pair.h>
-#include <bits/stl_iterator_base_types.h>
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /*
-    adjacent_find
-    all_of (C++0x)
-    any_of (C++0x)
-    binary_search
-    copy
-    copy_backward
-    copy_if (C++0x)
-    copy_n (C++0x)
-    count
-    count_if
-    equal
-    equal_range
-    fill
-    fill_n
-    find
-    find_end
-    find_first_of
-    find_if
-    find_if_not (C++0x)
-    for_each
-    generate
-    generate_n
-    includes
-    inplace_merge
-    is_heap (C++0x)
-    is_heap_until (C++0x)
-    is_partitioned (C++0x)
-    is_sorted (C++0x)
-    is_sorted_until (C++0x)
-    iter_swap
-    lexicographical_compare
-    lower_bound
-    make_heap
-    max
-    max_element
-    merge
-    min
-    min_element
-    minmax (C++0x)
-    minmax_element (C++0x)
-    mismatch
-    next_permutation
-    none_of (C++0x)
-    nth_element
-    partial_sort
-    partial_sort_copy
-    partition
-    partition_copy (C++0x)
-    partition_point (C++0x)
-    pop_heap
-    prev_permutation
-    push_heap
-    random_shuffle
-    remove
-    remove_copy
-    remove_copy_if
-    remove_if
-    replace
-    replace_copy
-    replace_copy_if
-    replace_if
-    reverse
-    reverse_copy
-    rotate
-    rotate_copy
-    search
-    search_n
-    set_difference
-    set_intersection
-    set_symmetric_difference
-    set_union
-    shuffle (C++0x)
-    sort
-    sort_heap
-    stable_partition
-    stable_sort
-    swap
-    swap_ranges
-    transform
-    unique
-    unique_copy
-    upper_bound
-  */
-
-  /**
-   * @defgroup algorithms Algorithms
-   *
-   * Components for performing algorithmic operations. Includes
-   * non-modifying sequence, modifying (mutating) sequence, sorting,
-   * searching, merge, partition, heap, set, minima, maxima, and
-   * permutation operations.
-   */
-
-  /**
-   * @defgroup mutating_algorithms Mutating
-   * @ingroup algorithms
-   */
-
-  /**
-   * @defgroup non_mutating_algorithms Non-Mutating
-   * @ingroup algorithms
-   */
-
-  /**
-   * @defgroup sorting_algorithms Sorting
-   * @ingroup algorithms
-   */
-
-  /**
-   * @defgroup set_algorithms Set Operation
-   * @ingroup sorting_algorithms
-   *
-   * These algorithms are common set operations performed on sequences
-   * that are already sorted. The number of comparisons will be
-   * linear.
-   */
-
-  /**
-   * @defgroup binary_search_algorithms Binary Search
-   * @ingroup sorting_algorithms
-   *
-   * These algorithms are variations of a classic binary search, and
-   * all assume that the sequence being searched is already sorted.
-   * 
-   * The number of comparisons will be logarithmic (and as few as
-   * possible).  The number of steps through the sequence will be
-   * logarithmic for random-access iterators (e.g., pointers), and
-   * linear otherwise.
-   * 
-   * The LWG has passed Defect Report 270, which notes: <em>The
-   * proposed resolution reinterprets binary search. Instead of
-   * thinking about searching for a value in a sorted range, we view
-   * that as an important special case of a more general algorithm:
-   * searching for the partition point in a partitioned range.  We
-   * also add a guarantee that the old wording did not: we ensure that
-   * the upper bound is no earlier than the lower bound, that the pair
-   * returned by equal_range is a valid range, and that the first part
-   * of that pair is the lower bound.</em>
-   *
-   * The actual effect of the first sentence is that a comparison
-   * functor passed by the user doesn't necessarily need to induce a
-   * strict weak ordering relation.  Rather, it partitions the range.
-   */
-
-  // adjacent_find
-
-#if __cplusplus >= 201103L
-  template<typename _IIter, typename _Predicate>
-    bool
-    all_of(_IIter, _IIter, _Predicate);
-
-  template<typename _IIter, typename _Predicate>
-    bool
-    any_of(_IIter, _IIter, _Predicate);
-#endif
-
-  template<typename _FIter, typename _Tp>
-    bool 
-    binary_search(_FIter, _FIter, const _Tp&);
-
-  template<typename _FIter, typename _Tp, typename _Compare>
-    bool 
-    binary_search(_FIter, _FIter, const _Tp&, _Compare);
-
-  template<typename _IIter, typename _OIter>
-    _OIter 
-    copy(_IIter, _IIter, _OIter);
-
-  template<typename _BIter1, typename _BIter2>
-    _BIter2
-    copy_backward(_BIter1, _BIter1, _BIter2);
-
-#if __cplusplus >= 201103L
-  template<typename _IIter, typename _OIter, typename _Predicate>
-    _OIter
-    copy_if(_IIter, _IIter, _OIter, _Predicate);
-
-  template<typename _IIter, typename _Size, typename _OIter>
-    _OIter
-    copy_n(_IIter, _Size, _OIter);
-#endif
-
-  // count
-  // count_if
-
-  template<typename _FIter, typename _Tp>
-    pair<_FIter, _FIter>
-    equal_range(_FIter, _FIter, const _Tp&);
-
-  template<typename _FIter, typename _Tp, typename _Compare>
-    pair<_FIter, _FIter>
-    equal_range(_FIter, _FIter, const _Tp&, _Compare);
-
-  template<typename _FIter, typename _Tp>
-    void 
-    fill(_FIter, _FIter, const _Tp&);
-
-  template<typename _OIter, typename _Size, typename _Tp>
-    _OIter
-    fill_n(_OIter, _Size, const _Tp&);
-
-  // find
-
-  template<typename _FIter1, typename _FIter2>
-    _FIter1
-    find_end(_FIter1, _FIter1, _FIter2, _FIter2);
-
-  template<typename _FIter1, typename _FIter2, typename _BinaryPredicate>
-    _FIter1
-    find_end(_FIter1, _FIter1, _FIter2, _FIter2, _BinaryPredicate);
-
-  // find_first_of
-  // find_if
-
-#if __cplusplus >= 201103L
-  template<typename _IIter, typename _Predicate>
-    _IIter
-    find_if_not(_IIter, _IIter, _Predicate);
-#endif
-
-  // for_each
-  // generate
-  // generate_n
-
-  template<typename _IIter1, typename _IIter2>
-    bool 
-    includes(_IIter1, _IIter1, _IIter2, _IIter2);
-
-  template<typename _IIter1, typename _IIter2, typename _Compare>
-    bool 
-    includes(_IIter1, _IIter1, _IIter2, _IIter2, _Compare);
-
-  template<typename _BIter>
-    void 
-    inplace_merge(_BIter, _BIter, _BIter);
-
-  template<typename _BIter, typename _Compare>
-    void 
-    inplace_merge(_BIter, _BIter, _BIter, _Compare);
-
-#if __cplusplus >= 201103L
-  template<typename _RAIter>
-    bool 
-    is_heap(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    bool 
-    is_heap(_RAIter, _RAIter, _Compare);
-
-  template<typename _RAIter>
-    _RAIter 
-    is_heap_until(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    _RAIter 
-    is_heap_until(_RAIter, _RAIter, _Compare);
-
-  template<typename _IIter, typename _Predicate>
-    bool
-    is_partitioned(_IIter, _IIter, _Predicate);
-
-  template<typename _FIter1, typename _FIter2>
-    bool
-    is_permutation(_FIter1, _FIter1, _FIter2);
-
-  template<typename _FIter1, typename _FIter2,
-	   typename _BinaryPredicate>
-    bool
-    is_permutation(_FIter1, _FIter1, _FIter2, _BinaryPredicate);
-
-  template<typename _FIter>
-    bool 
-    is_sorted(_FIter, _FIter);
-
-  template<typename _FIter, typename _Compare>
-    bool 
-    is_sorted(_FIter, _FIter, _Compare);
-
-  template<typename _FIter>
-    _FIter 
-    is_sorted_until(_FIter, _FIter);
-
-  template<typename _FIter, typename _Compare>
-    _FIter 
-    is_sorted_until(_FIter, _FIter, _Compare);
-#endif
-
-  template<typename _FIter1, typename _FIter2>
-    void 
-    iter_swap(_FIter1, _FIter2);
-
-  template<typename _FIter, typename _Tp>
-    _FIter 
-    lower_bound(_FIter, _FIter, const _Tp&);
-
-  template<typename _FIter, typename _Tp, typename _Compare>
-    _FIter 
-    lower_bound(_FIter, _FIter, const _Tp&, _Compare);
-
-  template<typename _RAIter>
-    void 
-    make_heap(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void 
-    make_heap(_RAIter, _RAIter, _Compare);
-
-  template<typename _Tp> 
-    _GLIBCXX14_CONSTEXPR
-    const _Tp& 
-    max(const _Tp&, const _Tp&);
-
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    const _Tp& 
-    max(const _Tp&, const _Tp&, _Compare);
-
-  // max_element
-  // merge
-
-  template<typename _Tp> 
-    _GLIBCXX14_CONSTEXPR
-    const _Tp& 
-    min(const _Tp&, const _Tp&);
-
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    const _Tp& 
-    min(const _Tp&, const _Tp&, _Compare);
-
-  // min_element
-
-#if __cplusplus >= 201103L
-  template<typename _Tp>
-    _GLIBCXX14_CONSTEXPR
-    pair<const _Tp&, const _Tp&> 
-    minmax(const _Tp&, const _Tp&);
-
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    pair<const _Tp&, const _Tp&>
-    minmax(const _Tp&, const _Tp&, _Compare);
-
-  template<typename _FIter>
-    _GLIBCXX14_CONSTEXPR
-    pair<_FIter, _FIter>
-    minmax_element(_FIter, _FIter);
-
-  template<typename _FIter, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    pair<_FIter, _FIter>
-    minmax_element(_FIter, _FIter, _Compare);
-
-  template<typename _Tp>
-    _GLIBCXX14_CONSTEXPR
-    _Tp
-    min(initializer_list<_Tp>);
-
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    _Tp
-    min(initializer_list<_Tp>, _Compare);
-
-  template<typename _Tp>
-    _GLIBCXX14_CONSTEXPR
-    _Tp
-    max(initializer_list<_Tp>);
-
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    _Tp
-    max(initializer_list<_Tp>, _Compare);
-
-  template<typename _Tp>
-    _GLIBCXX14_CONSTEXPR
-    pair<_Tp, _Tp>
-    minmax(initializer_list<_Tp>);
-
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    pair<_Tp, _Tp>
-    minmax(initializer_list<_Tp>, _Compare);
-#endif
-
-  // mismatch
-
-  template<typename _BIter>
-    bool 
-    next_permutation(_BIter, _BIter);
-
-  template<typename _BIter, typename _Compare>
-    bool 
-    next_permutation(_BIter, _BIter, _Compare);
-
-#if __cplusplus >= 201103L
-  template<typename _IIter, typename _Predicate>
-    bool
-    none_of(_IIter, _IIter, _Predicate);
-#endif
-
-  // nth_element
-  // partial_sort
-
-  template<typename _IIter, typename _RAIter>
-    _RAIter
-    partial_sort_copy(_IIter, _IIter, _RAIter, _RAIter);
-
-  template<typename _IIter, typename _RAIter, typename _Compare>
-    _RAIter
-    partial_sort_copy(_IIter, _IIter, _RAIter, _RAIter, _Compare);
-
-  // partition
-
-#if __cplusplus >= 201103L
-  template<typename _IIter, typename _OIter1,
-	   typename _OIter2, typename _Predicate>
-    pair<_OIter1, _OIter2>
-    partition_copy(_IIter, _IIter, _OIter1, _OIter2, _Predicate);
-
-  template<typename _FIter, typename _Predicate>
-    _FIter
-    partition_point(_FIter, _FIter, _Predicate);
-#endif
-
-  template<typename _RAIter>
-    void 
-    pop_heap(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void 
-    pop_heap(_RAIter, _RAIter, _Compare);
-
-  template<typename _BIter>
-    bool 
-    prev_permutation(_BIter, _BIter);
-
-  template<typename _BIter, typename _Compare>
-    bool 
-    prev_permutation(_BIter, _BIter, _Compare);
-
-  template<typename _RAIter>
-    void 
-    push_heap(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void 
-    push_heap(_RAIter, _RAIter, _Compare);
-
-  // random_shuffle
-
-  template<typename _FIter, typename _Tp>
-    _FIter 
-    remove(_FIter, _FIter, const _Tp&);
-
-  template<typename _FIter, typename _Predicate>
-    _FIter 
-    remove_if(_FIter, _FIter, _Predicate);
-
-  template<typename _IIter, typename _OIter, typename _Tp>
-    _OIter 
-    remove_copy(_IIter, _IIter, _OIter, const _Tp&);
-
-  template<typename _IIter, typename _OIter, typename _Predicate>
-    _OIter 
-    remove_copy_if(_IIter, _IIter, _OIter, _Predicate);
-
-  // replace
-
-  template<typename _IIter, typename _OIter, typename _Tp>
-    _OIter 
-    replace_copy(_IIter, _IIter, _OIter, const _Tp&, const _Tp&);
-
-  template<typename _Iter, typename _OIter, typename _Predicate, typename _Tp>
-    _OIter 
-    replace_copy_if(_Iter, _Iter, _OIter, _Predicate, const _Tp&);
-
-  // replace_if
-
-  template<typename _BIter>
-    void 
-    reverse(_BIter, _BIter);
-
-  template<typename _BIter, typename _OIter>
-    _OIter 
-    reverse_copy(_BIter, _BIter, _OIter);
-
-  inline namespace _V2
-  {
-    template<typename _FIter>
-      _FIter
-      rotate(_FIter, _FIter, _FIter);
-  }
-
-  template<typename _FIter, typename _OIter>
-    _OIter 
-    rotate_copy(_FIter, _FIter, _FIter, _OIter);
-
-  // search
-  // search_n
-  // set_difference
-  // set_intersection
-  // set_symmetric_difference
-  // set_union
-
-#if (__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
-  template<typename _RAIter, typename _UGenerator>
-    void
-    shuffle(_RAIter, _RAIter, _UGenerator&&);
-#endif
-
-  template<typename _RAIter>
-    void 
-    sort_heap(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void 
-    sort_heap(_RAIter, _RAIter, _Compare);
-
-  template<typename _BIter, typename _Predicate>
-    _BIter 
-    stable_partition(_BIter, _BIter, _Predicate);
-
-  template<typename _Tp> 
-    void 
-    swap(_Tp&, _Tp&)
-#if __cplusplus >= 201103L
-    noexcept(__and_<is_nothrow_move_constructible<_Tp>,
-	            is_nothrow_move_assignable<_Tp>>::value)
-#endif
-    ;
-
-  template<typename _Tp, size_t _Nm>
-    void
-    swap(_Tp (&__a)[_Nm], _Tp (&__b)[_Nm])
-#if __cplusplus >= 201103L
-    noexcept(noexcept(swap(*__a, *__b)))
-#endif
-    ;
-
-  template<typename _FIter1, typename _FIter2>
-    _FIter2 
-    swap_ranges(_FIter1, _FIter1, _FIter2);
-
-  // transform
-
-  template<typename _FIter>
-    _FIter 
-    unique(_FIter, _FIter);
-
-  template<typename _FIter, typename _BinaryPredicate>
-    _FIter 
-    unique(_FIter, _FIter, _BinaryPredicate);
-
-  // unique_copy
-
-  template<typename _FIter, typename _Tp>
-    _FIter 
-    upper_bound(_FIter, _FIter, const _Tp&);
-
-  template<typename _FIter, typename _Tp, typename _Compare>
-    _FIter 
-    upper_bound(_FIter, _FIter, const _Tp&, _Compare);
-
-_GLIBCXX_END_NAMESPACE_VERSION
-
-_GLIBCXX_BEGIN_NAMESPACE_ALGO
-
-  template<typename _FIter>
-    _FIter 
-    adjacent_find(_FIter, _FIter);
-
-  template<typename _FIter, typename _BinaryPredicate>
-    _FIter 
-    adjacent_find(_FIter, _FIter, _BinaryPredicate);
-
-  template<typename _IIter, typename _Tp>
-    typename iterator_traits<_IIter>::difference_type
-    count(_IIter, _IIter, const _Tp&);
-
-  template<typename _IIter, typename _Predicate>
-    typename iterator_traits<_IIter>::difference_type
-    count_if(_IIter, _IIter, _Predicate);
-
-  template<typename _IIter1, typename _IIter2>
-    bool 
-    equal(_IIter1, _IIter1, _IIter2);
-
-  template<typename _IIter1, typename _IIter2, typename _BinaryPredicate>
-    bool 
-    equal(_IIter1, _IIter1, _IIter2, _BinaryPredicate);
-
-  template<typename _IIter, typename _Tp>
-    _IIter 
-    find(_IIter, _IIter, const _Tp&);
-
-  template<typename _FIter1, typename _FIter2>
-    _FIter1
-    find_first_of(_FIter1, _FIter1, _FIter2, _FIter2);
-
-  template<typename _FIter1, typename _FIter2, typename _BinaryPredicate>
-    _FIter1
-    find_first_of(_FIter1, _FIter1, _FIter2, _FIter2, _BinaryPredicate);
-
-  template<typename _IIter, typename _Predicate>
-    _IIter
-    find_if(_IIter, _IIter, _Predicate);
-
-  template<typename _IIter, typename _Funct>
-    _Funct 
-    for_each(_IIter, _IIter, _Funct);
-
-  template<typename _FIter, typename _Generator>
-    void 
-    generate(_FIter, _FIter, _Generator);
-
-  template<typename _OIter, typename _Size, typename _Generator>
-    _OIter
-    generate_n(_OIter, _Size, _Generator);
-
-  template<typename _IIter1, typename _IIter2>
-    bool 
-    lexicographical_compare(_IIter1, _IIter1, _IIter2, _IIter2);
-
-  template<typename _IIter1, typename _IIter2, typename _Compare>
-    bool 
-    lexicographical_compare(_IIter1, _IIter1, _IIter2, _IIter2, _Compare);
-
-  template<typename _FIter>
-    _GLIBCXX14_CONSTEXPR
-    _FIter 
-    max_element(_FIter, _FIter);
-
-  template<typename _FIter, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    _FIter 
-    max_element(_FIter, _FIter, _Compare);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter 
-    merge(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter, 
-	   typename _Compare>
-    _OIter 
-    merge(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare);
-
-  template<typename _FIter>
-    _GLIBCXX14_CONSTEXPR
-    _FIter 
-    min_element(_FIter, _FIter);
-
-  template<typename _FIter, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    _FIter 
-    min_element(_FIter, _FIter, _Compare);
-
-  template<typename _IIter1, typename _IIter2>
-    pair<_IIter1, _IIter2>
-    mismatch(_IIter1, _IIter1, _IIter2);
-
-  template<typename _IIter1, typename _IIter2, typename _BinaryPredicate>
-    pair<_IIter1, _IIter2>
-    mismatch(_IIter1, _IIter1, _IIter2, _BinaryPredicate);
-
-  template<typename _RAIter>
-    void 
-    nth_element(_RAIter, _RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void 
-    nth_element(_RAIter, _RAIter, _RAIter, _Compare);
-
-  template<typename _RAIter>
-    void 
-    partial_sort(_RAIter, _RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void 
-    partial_sort(_RAIter, _RAIter, _RAIter, _Compare);
-
-  template<typename _BIter, typename _Predicate>
-    _BIter 
-    partition(_BIter, _BIter, _Predicate);
-
-  template<typename _RAIter>
-    void 
-    random_shuffle(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Generator>
-    void 
-    random_shuffle(_RAIter, _RAIter,
-#if __cplusplus >= 201103L
-		   _Generator&&);
-#else
-		   _Generator&);
-#endif
-
-  template<typename _FIter, typename _Tp>
-    void 
-    replace(_FIter, _FIter, const _Tp&, const _Tp&);
-
-  template<typename _FIter, typename _Predicate, typename _Tp>
-    void 
-    replace_if(_FIter, _FIter, _Predicate, const _Tp&);
-
-  template<typename _FIter1, typename _FIter2>
-    _FIter1 
-    search(_FIter1, _FIter1, _FIter2, _FIter2);
-
-  template<typename _FIter1, typename _FIter2, typename _BinaryPredicate>
-    _FIter1 
-    search(_FIter1, _FIter1, _FIter2, _FIter2, _BinaryPredicate);
-
-  template<typename _FIter, typename _Size, typename _Tp>
-    _FIter 
-    search_n(_FIter, _FIter, _Size, const _Tp&);
-
-  template<typename _FIter, typename _Size, typename _Tp, 
-	   typename _BinaryPredicate>
-    _FIter 
-    search_n(_FIter, _FIter, _Size, const _Tp&, _BinaryPredicate);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter 
-    set_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter, 
-	   typename _Compare>
-    _OIter 
-    set_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter 
-    set_intersection(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Compare>
-    _OIter 
-    set_intersection(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter
-    set_symmetric_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter, 
-	   typename _Compare>
-    _OIter
-    set_symmetric_difference(_IIter1, _IIter1, _IIter2, _IIter2, 
-			     _OIter, _Compare);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter 
-    set_union(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Compare>
-    _OIter 
-    set_union(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare);
-
-  template<typename _RAIter>
-    void 
-    sort(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void 
-    sort(_RAIter, _RAIter, _Compare);
-
-  template<typename _RAIter>
-    void 
-    stable_sort(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void 
-    stable_sort(_RAIter, _RAIter, _Compare);
-
-  template<typename _IIter, typename _OIter, typename _UnaryOperation>
-    _OIter 
-    transform(_IIter, _IIter, _OIter, _UnaryOperation);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter, 
-	   typename _BinaryOperation>
-    _OIter 
-    transform(_IIter1, _IIter1, _IIter2, _OIter, _BinaryOperation);
-
-  template<typename _IIter, typename _OIter>
-    _OIter 
-    unique_copy(_IIter, _IIter, _OIter);
-
-  template<typename _IIter, typename _OIter, typename _BinaryPredicate>
-    _OIter 
-    unique_copy(_IIter, _IIter, _OIter, _BinaryPredicate);
-
-_GLIBCXX_END_NAMESPACE_ALGO
-} // namespace std
-
-#ifdef _GLIBCXX_PARALLEL
-# include <parallel/algorithmfwd.h>
-#endif
-
-#endif
-
diff --git a/openflow/usr/include/c++/5/bits/alloc_traits.h b/openflow/usr/include/c++/5/bits/alloc_traits.h
deleted file mode 100644
index 615e071..0000000
--- a/openflow/usr/include/c++/5/bits/alloc_traits.h
+++ /dev/null
@@ -1,660 +0,0 @@
-// Allocator traits -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/alloc_traits.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _ALLOC_TRAITS_H
-#define _ALLOC_TRAITS_H 1
-
-#if __cplusplus >= 201103L
-
-#include <bits/memoryfwd.h>
-#include <bits/ptr_traits.h>
-#include <ext/numeric_traits.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Alloc, typename _Tp>
-    class __alloctr_rebind_helper
-    {
-      template<typename _Alloc2, typename _Tp2>
-	static constexpr true_type
-	_S_chk(typename _Alloc2::template rebind<_Tp2>::other*);
-
-      template<typename, typename>
-	static constexpr false_type
-	_S_chk(...);
-
-    public:
-      using __type = decltype(_S_chk<_Alloc, _Tp>(nullptr));
-    };
-
-  template<typename _Alloc, typename _Tp,
-	   bool = __alloctr_rebind_helper<_Alloc, _Tp>::__type::value>
-    struct __alloctr_rebind;
-
-  template<typename _Alloc, typename _Tp>
-    struct __alloctr_rebind<_Alloc, _Tp, true>
-    {
-      typedef typename _Alloc::template rebind<_Tp>::other __type;
-    };
-
-  template<template<typename, typename...> class _Alloc, typename _Tp,
-	   typename _Up, typename... _Args>
-    struct __alloctr_rebind<_Alloc<_Up, _Args...>, _Tp, false>
-    {
-      typedef _Alloc<_Tp, _Args...> __type;
-    };
-
-  template<typename _Alloc, typename _Tp>
-    using __alloc_rebind = typename __alloctr_rebind<_Alloc, _Tp>::__type;
-
-  /**
-   * @brief  Uniform interface to all allocator types.
-   * @ingroup allocators
-  */
-  template<typename _Alloc>
-    struct allocator_traits
-    {
-      /// The allocator type
-      typedef _Alloc allocator_type;
-      /// The allocated type
-      typedef typename _Alloc::value_type value_type;
-
-#define _GLIBCXX_ALLOC_TR_NESTED_TYPE(_NTYPE, _ALT) \
-  private: \
-  template<typename _Tp> \
-    static typename _Tp::_NTYPE _S_##_NTYPE##_helper(_Tp*); \
-  static _ALT _S_##_NTYPE##_helper(...); \
-    typedef decltype(_S_##_NTYPE##_helper((_Alloc*)0)) __##_NTYPE; \
-  public:
-
-_GLIBCXX_ALLOC_TR_NESTED_TYPE(pointer, value_type*)
-
-      /**
-       * @brief   The allocator's pointer type.
-       *
-       * @c Alloc::pointer if that type exists, otherwise @c value_type*
-      */
-      typedef __pointer pointer;
-
-_GLIBCXX_ALLOC_TR_NESTED_TYPE(const_pointer,
-  typename pointer_traits<pointer>::template rebind<const value_type>)
-
-      /**
-       * @brief   The allocator's const pointer type.
-       *
-       * @c Alloc::const_pointer if that type exists, otherwise
-       * <tt> pointer_traits<pointer>::rebind<const value_type> </tt>
-      */
-      typedef __const_pointer const_pointer;
-
-_GLIBCXX_ALLOC_TR_NESTED_TYPE(void_pointer,
-  typename pointer_traits<pointer>::template rebind<void>)
-
-      /**
-       * @brief   The allocator's void pointer type.
-       *
-       * @c Alloc::void_pointer if that type exists, otherwise
-       * <tt> pointer_traits<pointer>::rebind<void> </tt>
-      */
-      typedef __void_pointer void_pointer;
-
-_GLIBCXX_ALLOC_TR_NESTED_TYPE(const_void_pointer,
-  typename pointer_traits<pointer>::template rebind<const void>)
-
-      /**
-       * @brief   The allocator's const void pointer type.
-       *
-       * @c Alloc::const_void_pointer if that type exists, otherwise
-       * <tt> pointer_traits<pointer>::rebind<const void> </tt>
-      */
-      typedef __const_void_pointer const_void_pointer;
-
-_GLIBCXX_ALLOC_TR_NESTED_TYPE(difference_type,
-			      typename pointer_traits<pointer>::difference_type)
-
-      /**
-       * @brief   The allocator's difference type
-       *
-       * @c Alloc::difference_type if that type exists, otherwise
-       * <tt> pointer_traits<pointer>::difference_type </tt>
-      */
-      typedef __difference_type difference_type;
-
-_GLIBCXX_ALLOC_TR_NESTED_TYPE(size_type,
-			      typename make_unsigned<difference_type>::type)
-
-      /**
-       * @brief   The allocator's size type
-       *
-       * @c Alloc::size_type if that type exists, otherwise
-       * <tt> make_unsigned<difference_type>::type </tt>
-      */
-      typedef __size_type size_type;
-
-_GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_copy_assignment,
-			      false_type)
-
-      /**
-       * @brief   How the allocator is propagated on copy assignment
-       *
-       * @c Alloc::propagate_on_container_copy_assignment if that type exists,
-       * otherwise @c false_type
-      */
-      typedef __propagate_on_container_copy_assignment
-	propagate_on_container_copy_assignment;
-
-_GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_move_assignment,
-			      false_type)
-
-      /**
-       * @brief   How the allocator is propagated on move assignment
-       *
-       * @c Alloc::propagate_on_container_move_assignment if that type exists,
-       * otherwise @c false_type
-      */
-      typedef __propagate_on_container_move_assignment
-	propagate_on_container_move_assignment;
-
-_GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap,
-			      false_type)
-
-      /**
-       * @brief   How the allocator is propagated on swap
-       *
-       * @c Alloc::propagate_on_container_swap if that type exists,
-       * otherwise @c false_type
-      */
-      typedef __propagate_on_container_swap propagate_on_container_swap;
-
-#undef _GLIBCXX_ALLOC_TR_NESTED_TYPE
-
-      template<typename _Tp>
-	using rebind_alloc = typename __alloctr_rebind<_Alloc, _Tp>::__type;
-      template<typename _Tp>
-	using rebind_traits = allocator_traits<rebind_alloc<_Tp>>;
-
-    private:
-      template<typename _Alloc2>
-	struct __allocate_helper
-	{
-	  template<typename _Alloc3,
-	    typename = decltype(std::declval<_Alloc3*>()->allocate(
-		  std::declval<size_type>(),
-		  std::declval<const_void_pointer>()))>
-	    static true_type __test(int);
-
-	  template<typename>
-	    static false_type __test(...);
-
-	  using type = decltype(__test<_Alloc>(0));
-	};
-
-      template<typename _Alloc2>
-	using __has_allocate = typename __allocate_helper<_Alloc2>::type;
-
-      template<typename _Alloc2,
-	       typename = _Require<__has_allocate<_Alloc2>>>
-	static pointer
-	_S_allocate(_Alloc2& __a, size_type __n, const_void_pointer __hint)
-	{ return __a.allocate(__n, __hint); }
-
-      template<typename _Alloc2, typename _UnusedHint,
-	       typename = _Require<__not_<__has_allocate<_Alloc2>>>>
-	static pointer
-	_S_allocate(_Alloc2& __a, size_type __n, _UnusedHint)
-	{ return __a.allocate(__n); }
-
-      template<typename _Tp, typename... _Args>
-	struct __construct_helper
-	{
-	  template<typename _Alloc2,
-	    typename = decltype(std::declval<_Alloc2*>()->construct(
-		  std::declval<_Tp*>(), std::declval<_Args>()...))>
-	    static true_type __test(int);
-
-	  template<typename>
-	    static false_type __test(...);
-
-	  using type = decltype(__test<_Alloc>(0));
-	};
-
-      template<typename _Tp, typename... _Args>
-	using __has_construct
-	  = typename __construct_helper<_Tp, _Args...>::type;
-
-      template<typename _Tp, typename... _Args>
-	static _Require<__has_construct<_Tp, _Args...>>
-	_S_construct(_Alloc& __a, _Tp* __p, _Args&&... __args)
-	{ __a.construct(__p, std::forward<_Args>(__args)...); }
-
-      template<typename _Tp, typename... _Args>
-	static
-	_Require<__and_<__not_<__has_construct<_Tp, _Args...>>,
-			       is_constructible<_Tp, _Args...>>>
-	_S_construct(_Alloc&, _Tp* __p, _Args&&... __args)
-	{ ::new((void*)__p) _Tp(std::forward<_Args>(__args)...); }
-
-      template<typename _Tp>
-	struct __destroy_helper
-	{
-	  template<typename _Alloc2,
-	    typename = decltype(std::declval<_Alloc2*>()->destroy(
-		  std::declval<_Tp*>()))>
-	    static true_type __test(int);
-
-	  template<typename>
-	    static false_type __test(...);
-
-	  using type = decltype(__test<_Alloc>(0));
-	};
-
-      template<typename _Tp>
-	using __has_destroy = typename __destroy_helper<_Tp>::type;
-
-      template<typename _Tp>
-	static _Require<__has_destroy<_Tp>>
-	_S_destroy(_Alloc& __a, _Tp* __p)
-	{ __a.destroy(__p); }
-
-      template<typename _Tp>
-	static _Require<__not_<__has_destroy<_Tp>>>
-	_S_destroy(_Alloc&, _Tp* __p)
-	{ __p->~_Tp(); }
-
-      template<typename _Alloc2>
-	struct __maxsize_helper
-	{
-	  template<typename _Alloc3,
-	    typename = decltype(std::declval<_Alloc3*>()->max_size())>
-	    static true_type __test(int);
-
-	  template<typename>
-	    static false_type __test(...);
-
-	  using type = decltype(__test<_Alloc2>(0));
-	};
-
-      template<typename _Alloc2>
-	using __has_max_size = typename __maxsize_helper<_Alloc2>::type;
-
-      template<typename _Alloc2,
-	       typename = _Require<__has_max_size<_Alloc2>>>
-	static size_type
-	_S_max_size(_Alloc2& __a, int)
-	{ return __a.max_size(); }
-
-      template<typename _Alloc2,
-	       typename = _Require<__not_<__has_max_size<_Alloc2>>>>
-	static size_type
-	_S_max_size(_Alloc2&, ...)
-	{ return __gnu_cxx::__numeric_traits<size_type>::__max; }
-
-      template<typename _Alloc2>
-	struct __select_helper
-	{
-	  template<typename _Alloc3, typename
-	    = decltype(std::declval<_Alloc3*>()
-		->select_on_container_copy_construction())>
-	    static true_type __test(int);
-
-	  template<typename>
-	    static false_type __test(...);
-
-	  using type = decltype(__test<_Alloc2>(0));
-	};
-
-      template<typename _Alloc2>
-	using __has_soccc = typename __select_helper<_Alloc2>::type;
-
-      template<typename _Alloc2,
-	       typename = _Require<__has_soccc<_Alloc2>>>
-	static _Alloc2
-	_S_select(_Alloc2& __a, int)
-	{ return __a.select_on_container_copy_construction(); }
-
-      template<typename _Alloc2,
-	       typename = _Require<__not_<__has_soccc<_Alloc2>>>>
-	static _Alloc2
-	_S_select(_Alloc2& __a, ...)
-	{ return __a; }
-
-    public:
-
-      /**
-       *  @brief  Allocate memory.
-       *  @param  __a  An allocator.
-       *  @param  __n  The number of objects to allocate space for.
-       *
-       *  Calls @c a.allocate(n)
-      */
-      static pointer
-      allocate(_Alloc& __a, size_type __n)
-      { return __a.allocate(__n); }
-
-      /**
-       *  @brief  Allocate memory.
-       *  @param  __a  An allocator.
-       *  @param  __n  The number of objects to allocate space for.
-       *  @param  __hint Aid to locality.
-       *  @return Memory of suitable size and alignment for @a n objects
-       *          of type @c value_type
-       *
-       *  Returns <tt> a.allocate(n, hint) </tt> if that expression is
-       *  well-formed, otherwise returns @c a.allocate(n)
-      */
-      static pointer
-      allocate(_Alloc& __a, size_type __n, const_void_pointer __hint)
-      { return _S_allocate(__a, __n, __hint); }
-
-      /**
-       *  @brief  Deallocate memory.
-       *  @param  __a  An allocator.
-       *  @param  __p  Pointer to the memory to deallocate.
-       *  @param  __n  The number of objects space was allocated for.
-       *
-       *  Calls <tt> a.deallocate(p, n) </tt>
-      */
-      static void deallocate(_Alloc& __a, pointer __p, size_type __n)
-      { __a.deallocate(__p, __n); }
-
-      /**
-       *  @brief  Construct an object of type @a _Tp
-       *  @param  __a  An allocator.
-       *  @param  __p  Pointer to memory of suitable size and alignment for Tp
-       *  @param  __args Constructor arguments.
-       *
-       *  Calls <tt> __a.construct(__p, std::forward<Args>(__args)...) </tt>
-       *  if that expression is well-formed, otherwise uses placement-new
-       *  to construct an object of type @a _Tp at location @a __p from the
-       *  arguments @a __args...
-      */
-      template<typename _Tp, typename... _Args>
-	static auto construct(_Alloc& __a, _Tp* __p, _Args&&... __args)
-	-> decltype(_S_construct(__a, __p, std::forward<_Args>(__args)...))
-	{ _S_construct(__a, __p, std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief  Destroy an object of type @a _Tp
-       *  @param  __a  An allocator.
-       *  @param  __p  Pointer to the object to destroy
-       *
-       *  Calls @c __a.destroy(__p) if that expression is well-formed,
-       *  otherwise calls @c __p->~_Tp()
-      */
-      template<typename _Tp>
-	static void destroy(_Alloc& __a, _Tp* __p)
-	{ _S_destroy(__a, __p); }
-
-      /**
-       *  @brief  The maximum supported allocation size
-       *  @param  __a  An allocator.
-       *  @return @c __a.max_size() or @c numeric_limits<size_type>::max()
-       *
-       *  Returns @c __a.max_size() if that expression is well-formed,
-       *  otherwise returns @c numeric_limits<size_type>::max()
-      */
-      static size_type max_size(const _Alloc& __a) noexcept
-      { return _S_max_size(__a, 0); }
-
-      /**
-       *  @brief  Obtain an allocator to use when copying a container.
-       *  @param  __rhs  An allocator.
-       *  @return @c __rhs.select_on_container_copy_construction() or @a __rhs
-       *
-       *  Returns @c __rhs.select_on_container_copy_construction() if that
-       *  expression is well-formed, otherwise returns @a __rhs
-      */
-      static _Alloc
-      select_on_container_copy_construction(const _Alloc& __rhs)
-      { return _S_select(__rhs, 0); }
-    };
-
-  /// Partial specialization for std::allocator.
-  template<typename _Tp>
-    struct allocator_traits<allocator<_Tp>>
-    {
-      /// The allocator type
-      using allocator_type = allocator<_Tp>;
-      /// The allocated type
-      using value_type = _Tp;
-
-      /// The allocator's pointer type.
-      using pointer = _Tp*;
-
-      /// The allocator's const pointer type.
-      using const_pointer = const _Tp*;
-
-      /// The allocator's void pointer type.
-      using void_pointer = void*;
-
-      /// The allocator's const void pointer type.
-      using const_void_pointer = const void*;
-
-      /// The allocator's difference type
-      using difference_type = std::ptrdiff_t;
-
-      /// The allocator's size type
-      using size_type = std::size_t;
-
-      /// How the allocator is propagated on copy assignment
-      using propagate_on_container_copy_assignment = false_type;
-
-      /// How the allocator is propagated on move assignment
-      using propagate_on_container_move_assignment = true_type;
-
-      /// How the allocator is propagated on swap
-      using propagate_on_container_swap = false_type;
-
-      template<typename _Up>
-	using rebind_alloc = allocator<_Up>;
-
-      template<typename _Up>
-	using rebind_traits = allocator_traits<allocator<_Up>>;
-
-      /**
-       *  @brief  Allocate memory.
-       *  @param  __a  An allocator.
-       *  @param  __n  The number of objects to allocate space for.
-       *
-       *  Calls @c a.allocate(n)
-      */
-      static pointer
-      allocate(allocator_type& __a, size_type __n)
-      { return __a.allocate(__n); }
-
-      /**
-       *  @brief  Allocate memory.
-       *  @param  __a  An allocator.
-       *  @param  __n  The number of objects to allocate space for.
-       *  @param  __hint Aid to locality.
-       *  @return Memory of suitable size and alignment for @a n objects
-       *          of type @c value_type
-       *
-       *  Returns <tt> a.allocate(n, hint) </tt>
-      */
-      static pointer
-      allocate(allocator_type& __a, size_type __n, const_void_pointer __hint)
-      { return __a.allocate(__n, __hint); }
-
-      /**
-       *  @brief  Deallocate memory.
-       *  @param  __a  An allocator.
-       *  @param  __p  Pointer to the memory to deallocate.
-       *  @param  __n  The number of objects space was allocated for.
-       *
-       *  Calls <tt> a.deallocate(p, n) </tt>
-      */
-      static void
-      deallocate(allocator_type& __a, pointer __p, size_type __n)
-      { __a.deallocate(__p, __n); }
-
-      /**
-       *  @brief  Construct an object of type @a _Up
-       *  @param  __a  An allocator.
-       *  @param  __p  Pointer to memory of suitable size and alignment for Tp
-       *  @param  __args Constructor arguments.
-       *
-       *  Calls <tt> __a.construct(__p, std::forward<Args>(__args)...) </tt>
-      */
-      template<typename _Up, typename... _Args>
-	static void
-	construct(allocator_type& __a, _Up* __p, _Args&&... __args)
-	{ __a.construct(__p, std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief  Destroy an object of type @a _Up
-       *  @param  __a  An allocator.
-       *  @param  __p  Pointer to the object to destroy
-       *
-       *  Calls @c __a.destroy(__p).
-      */
-      template<typename _Up>
-	static void
-	destroy(allocator_type& __a, _Up* __p)
-	{ __a.destroy(__p); }
-
-      /**
-       *  @brief  The maximum supported allocation size
-       *  @param  __a  An allocator.
-       *  @return @c __a.max_size()
-      */
-      static size_type
-      max_size(const allocator_type& __a) noexcept
-      { return __a.max_size(); }
-
-      /**
-       *  @brief  Obtain an allocator to use when copying a container.
-       *  @param  __rhs  An allocator.
-       *  @return @c __rhs
-      */
-      static allocator_type
-      select_on_container_copy_construction(const allocator_type& __rhs)
-      { return __rhs; }
-    };
-
-
-  template<typename _Alloc>
-    inline void
-    __do_alloc_on_copy(_Alloc& __one, const _Alloc& __two, true_type)
-    { __one = __two; }
-
-  template<typename _Alloc>
-    inline void
-    __do_alloc_on_copy(_Alloc&, const _Alloc&, false_type)
-    { }
-
-  template<typename _Alloc>
-    inline void __alloc_on_copy(_Alloc& __one, const _Alloc& __two)
-    {
-      typedef allocator_traits<_Alloc> __traits;
-      typedef typename __traits::propagate_on_container_copy_assignment __pocca;
-      __do_alloc_on_copy(__one, __two, __pocca());
-    }
-
-  template<typename _Alloc>
-    inline _Alloc __alloc_on_copy(const _Alloc& __a)
-    {
-      typedef allocator_traits<_Alloc> __traits;
-      return __traits::select_on_container_copy_construction(__a);
-    }
-
-  template<typename _Alloc>
-    inline void __do_alloc_on_move(_Alloc& __one, _Alloc& __two, true_type)
-    { __one = std::move(__two); }
-
-  template<typename _Alloc>
-    inline void __do_alloc_on_move(_Alloc&, _Alloc&, false_type)
-    { }
-
-  template<typename _Alloc>
-    inline void __alloc_on_move(_Alloc& __one, _Alloc& __two)
-    {
-      typedef allocator_traits<_Alloc> __traits;
-      typedef typename __traits::propagate_on_container_move_assignment __pocma;
-      __do_alloc_on_move(__one, __two, __pocma());
-    }
-
-  template<typename _Alloc>
-    inline void __do_alloc_on_swap(_Alloc& __one, _Alloc& __two, true_type)
-    {
-      using std::swap;
-      swap(__one, __two);
-    }
-
-  template<typename _Alloc>
-    inline void __do_alloc_on_swap(_Alloc&, _Alloc&, false_type)
-    { }
-
-  template<typename _Alloc>
-    inline void __alloc_on_swap(_Alloc& __one, _Alloc& __two)
-    {
-      typedef allocator_traits<_Alloc> __traits;
-      typedef typename __traits::propagate_on_container_swap __pocs;
-      __do_alloc_on_swap(__one, __two, __pocs());
-    }
-
-  template<typename _Alloc>
-    class __is_copy_insertable_impl
-    {
-      typedef allocator_traits<_Alloc> _Traits;
-
-      template<typename _Up, typename
-	       = decltype(_Traits::construct(std::declval<_Alloc&>(),
-					     std::declval<_Up*>(),
-					     std::declval<const _Up&>()))>
-	static true_type
-	_M_select(int);
-
-      template<typename _Up>
-	static false_type
-	_M_select(...);
-
-    public:
-      typedef decltype(_M_select<typename _Alloc::value_type>(0)) type;
-    };
-
-  // true if _Alloc::value_type is CopyInsertable into containers using _Alloc
-  template<typename _Alloc>
-    struct __is_copy_insertable
-    : __is_copy_insertable_impl<_Alloc>::type
-    { };
-
-  // std::allocator<_Tp> just requires CopyConstructible
-  template<typename _Tp>
-    struct __is_copy_insertable<allocator<_Tp>>
-    : is_copy_constructible<_Tp>
-    { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
-#endif
diff --git a/openflow/usr/include/c++/5/bits/allocated_ptr.h b/openflow/usr/include/c++/5/bits/allocated_ptr.h
deleted file mode 100644
index 63088c2..0000000
--- a/openflow/usr/include/c++/5/bits/allocated_ptr.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Guarded Allocation -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/allocated_ptr.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _ALLOCATED_PTR_H
-#define _ALLOCATED_PTR_H 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0xwarning.h>
-#else
-# include <type_traits>
-# include <bits/ptr_traits.h>
-# include <bits/alloc_traits.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /// Non-standard RAII type for managing pointers obtained from allocators.
-  template<typename _Alloc>
-    struct __allocated_ptr
-    {
-      using pointer = typename allocator_traits<_Alloc>::pointer;
-      using value_type = typename allocator_traits<_Alloc>::value_type;
-
-      /// Take ownership of __ptr
-      __allocated_ptr(_Alloc& __a, pointer __ptr) noexcept
-      : _M_alloc(&__a), _M_ptr(__ptr)
-      { }
-
-      /// Convert __ptr to allocator's pointer type and take ownership of it
-      template<typename _Ptr,
-	       typename _Req = _Require<is_same<_Ptr, value_type*>>>
-      __allocated_ptr(_Alloc& __a, _Ptr __ptr)
-      : _M_alloc(&__a), _M_ptr(pointer_traits<pointer>::pointer_to(*__ptr))
-      { }
-
-      /// Transfer ownership of the owned pointer
-      __allocated_ptr(__allocated_ptr&& __gd) noexcept
-      : _M_alloc(__gd._M_alloc), _M_ptr(__gd._M_ptr)
-      { __gd._M_ptr = nullptr; }
-
-      /// Deallocate the owned pointer
-      ~__allocated_ptr()
-      {
-	if (_M_ptr != nullptr)
-	  std::allocator_traits<_Alloc>::deallocate(*_M_alloc, _M_ptr, 1);
-      }
-
-      /// Release ownership of the owned pointer
-      __allocated_ptr&
-      operator=(std::nullptr_t) noexcept
-      {
-	_M_ptr = nullptr;
-	return *this;
-      }
-
-      /// Get the address that the owned pointer refers to.
-      value_type* get() { return _S_raw_ptr(_M_ptr); }
-
-    private:
-      value_type* _S_raw_ptr(value_type* __ptr) { return __ptr; }
-
-      template<typename _Ptr>
-	auto _S_raw_ptr(_Ptr __ptr) -> decltype(_S_raw_ptr(__ptr.operator->()))
-	{ return _S_raw_ptr(__ptr.operator->()); }
-
-      _Alloc* _M_alloc;
-      pointer _M_ptr;
-    };
-
-  /// Allocate space for a single object using __a
-  template<typename _Alloc>
-    __allocated_ptr<_Alloc>
-    __allocate_guarded(_Alloc& __a)
-    {
-      return { __a, std::allocator_traits<_Alloc>::allocate(__a, 1) };
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
-#endif
diff --git a/openflow/usr/include/c++/5/bits/allocator.h b/openflow/usr/include/c++/5/bits/allocator.h
deleted file mode 100644
index 6057315..0000000
--- a/openflow/usr/include/c++/5/bits/allocator.h
+++ /dev/null
@@ -1,229 +0,0 @@
-// Allocators -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996-1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/allocator.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _ALLOCATOR_H
-#define _ALLOCATOR_H 1
-
-#include <bits/c++allocator.h> // Define the base class to std::allocator.
-#include <bits/memoryfwd.h>
-#if __cplusplus >= 201103L
-#include <type_traits>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @addtogroup allocators
-   *  @{
-   */
-
-  /// allocator<void> specialization.
-  template<>
-    class allocator<void>
-    {
-    public:
-      typedef size_t      size_type;
-      typedef ptrdiff_t   difference_type;
-      typedef void*       pointer;
-      typedef const void* const_pointer;
-      typedef void        value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef allocator<_Tp1> other; };
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2103. std::allocator propagate_on_container_move_assignment
-      typedef true_type propagate_on_container_move_assignment;
-#endif
-    };
-
-  /**
-   * @brief  The @a standard allocator, as per [20.4].
-   *
-   *  See https://gcc.gnu.org/onlinedocs/libstdc++/manual/memory.html#std.util.memory.allocator
-   *  for further details.
-   *
-   *  @tparam  _Tp  Type of allocated object.
-   */
-  template<typename _Tp>
-    class allocator: public __allocator_base<_Tp>
-    {
-   public:
-      typedef size_t     size_type;
-      typedef ptrdiff_t  difference_type;
-      typedef _Tp*       pointer;
-      typedef const _Tp* const_pointer;
-      typedef _Tp&       reference;
-      typedef const _Tp& const_reference;
-      typedef _Tp        value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef allocator<_Tp1> other; };
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2103. std::allocator propagate_on_container_move_assignment
-      typedef true_type propagate_on_container_move_assignment;
-#endif
-
-      allocator() throw() { }
-
-      allocator(const allocator& __a) throw()
-      : __allocator_base<_Tp>(__a) { }
-
-      template<typename _Tp1>
-        allocator(const allocator<_Tp1>&) throw() { }
-
-      ~allocator() throw() { }
-
-      // Inherit everything else.
-    };
-
-  template<typename _T1, typename _T2>
-    inline bool
-    operator==(const allocator<_T1>&, const allocator<_T2>&)
-    _GLIBCXX_USE_NOEXCEPT
-    { return true; }
-
-  template<typename _Tp>
-    inline bool
-    operator==(const allocator<_Tp>&, const allocator<_Tp>&)
-    _GLIBCXX_USE_NOEXCEPT
-    { return true; }
-
-  template<typename _T1, typename _T2>
-    inline bool
-    operator!=(const allocator<_T1>&, const allocator<_T2>&)
-    _GLIBCXX_USE_NOEXCEPT
-    { return false; }
-
-  template<typename _Tp>
-    inline bool
-    operator!=(const allocator<_Tp>&, const allocator<_Tp>&)
-    _GLIBCXX_USE_NOEXCEPT
-    { return false; }
-
-  /// @} group allocator
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class allocator<char>;
-  extern template class allocator<wchar_t>;
-#endif
-
-  // Undefine.
-#undef __allocator_base
-
-  // To implement Option 3 of DR 431.
-  template<typename _Alloc, bool = __is_empty(_Alloc)>
-    struct __alloc_swap
-    { static void _S_do_it(_Alloc&, _Alloc&) _GLIBCXX_NOEXCEPT { } };
-
-  template<typename _Alloc>
-    struct __alloc_swap<_Alloc, false>
-    {
-      static void
-      _S_do_it(_Alloc& __one, _Alloc& __two) _GLIBCXX_NOEXCEPT
-      {
-	// Precondition: swappable allocators.
-	if (__one != __two)
-	  swap(__one, __two);
-      }
-    };
-
-  // Optimize for stateless allocators.
-  template<typename _Alloc, bool = __is_empty(_Alloc)>
-    struct __alloc_neq
-    {
-      static bool
-      _S_do_it(const _Alloc&, const _Alloc&)
-      { return false; }
-    };
-
-  template<typename _Alloc>
-    struct __alloc_neq<_Alloc, false>
-    {
-      static bool
-      _S_do_it(const _Alloc& __one, const _Alloc& __two)
-      { return __one != __two; }
-    };
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, bool
-    = __or_<is_copy_constructible<typename _Tp::value_type>,
-            is_nothrow_move_constructible<typename _Tp::value_type>>::value>
-    struct __shrink_to_fit_aux
-    { static bool _S_do_it(_Tp&) noexcept { return false; } };
-
-  template<typename _Tp>
-    struct __shrink_to_fit_aux<_Tp, true>
-    {
-      static bool
-      _S_do_it(_Tp& __c) noexcept
-      {
-#if __cpp_exceptions
-	try
-	  {
-	    _Tp(__make_move_if_noexcept_iterator(__c.begin()),
-		__make_move_if_noexcept_iterator(__c.end()),
-		__c.get_allocator()).swap(__c);
-	    return true;
-	  }
-	catch(...)
-	  { return false; }
-#else
-	return false;
-#endif
-      }
-    };
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/atomic_base.h b/openflow/usr/include/c++/5/bits/atomic_base.h
deleted file mode 100644
index 75a7ca7..0000000
--- a/openflow/usr/include/c++/5/bits/atomic_base.h
+++ /dev/null
@@ -1,796 +0,0 @@
-// -*- C++ -*- header.
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/atomic_base.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{atomic}
- */
-
-#ifndef _GLIBCXX_ATOMIC_BASE_H
-#define _GLIBCXX_ATOMIC_BASE_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <stdint.h>
-#include <bits/atomic_lockfree_defines.h>
-
-#ifndef _GLIBCXX_ALWAYS_INLINE
-#define _GLIBCXX_ALWAYS_INLINE inline __attribute__((__always_inline__))
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup atomics Atomics
-   *
-   * Components for performing atomic operations.
-   * @{
-   */
-
-  /// Enumeration for memory_order
-  typedef enum memory_order
-    {
-      memory_order_relaxed,
-      memory_order_consume,
-      memory_order_acquire,
-      memory_order_release,
-      memory_order_acq_rel,
-      memory_order_seq_cst
-    } memory_order;
-
-  enum __memory_order_modifier
-    {
-      __memory_order_mask          = 0x0ffff,
-      __memory_order_modifier_mask = 0xffff0000,
-      __memory_order_hle_acquire   = 0x10000,
-      __memory_order_hle_release   = 0x20000
-    };
-
-  constexpr memory_order
-  operator|(memory_order __m, __memory_order_modifier __mod)
-  {
-    return memory_order(__m | int(__mod));
-  }
-
-  constexpr memory_order
-  operator&(memory_order __m, __memory_order_modifier __mod)
-  {
-    return memory_order(__m & int(__mod));
-  }
-
-  // Drop release ordering as per [atomics.types.operations.req]/21
-  constexpr memory_order
-  __cmpexch_failure_order2(memory_order __m) noexcept
-  {
-    return __m == memory_order_acq_rel ? memory_order_acquire
-      : __m == memory_order_release ? memory_order_relaxed : __m;
-  }
-
-  constexpr memory_order
-  __cmpexch_failure_order(memory_order __m) noexcept
-  {
-    return memory_order(__cmpexch_failure_order2(__m & __memory_order_mask)
-      | (__m & __memory_order_modifier_mask));
-  }
-
-  _GLIBCXX_ALWAYS_INLINE void
-  atomic_thread_fence(memory_order __m) noexcept
-  { __atomic_thread_fence(__m); }
-
-  _GLIBCXX_ALWAYS_INLINE void
-  atomic_signal_fence(memory_order __m) noexcept
-  { __atomic_signal_fence(__m); }
-
-  /// kill_dependency
-  template<typename _Tp>
-    inline _Tp
-    kill_dependency(_Tp __y) noexcept
-    {
-      _Tp __ret(__y);
-      return __ret;
-    }
-
-
-  // Base types for atomics.
-  template<typename _IntTp>
-    struct __atomic_base;
-
-
-#define ATOMIC_VAR_INIT(_VI) { _VI }
-
-  template<typename _Tp>
-    struct atomic;
-
-  template<typename _Tp>
-    struct atomic<_Tp*>;
-
-    /* The target's "set" value for test-and-set may not be exactly 1.  */
-#if __GCC_ATOMIC_TEST_AND_SET_TRUEVAL == 1
-    typedef bool __atomic_flag_data_type;
-#else
-    typedef unsigned char __atomic_flag_data_type;
-#endif
-
-  /**
-   *  @brief Base type for atomic_flag.
-   *
-   *  Base type is POD with data, allowing atomic_flag to derive from
-   *  it and meet the standard layout type requirement. In addition to
-   *  compatibility with a C interface, this allows different
-   *  implementations of atomic_flag to use the same atomic operation
-   *  functions, via a standard conversion to the __atomic_flag_base
-   *  argument.
-  */
-  _GLIBCXX_BEGIN_EXTERN_C
-
-  struct __atomic_flag_base
-  {
-    __atomic_flag_data_type _M_i;
-  };
-
-  _GLIBCXX_END_EXTERN_C
-
-#define ATOMIC_FLAG_INIT { 0 }
-
-  /// atomic_flag
-  struct atomic_flag : public __atomic_flag_base
-  {
-    atomic_flag() noexcept = default;
-    ~atomic_flag() noexcept = default;
-    atomic_flag(const atomic_flag&) = delete;
-    atomic_flag& operator=(const atomic_flag&) = delete;
-    atomic_flag& operator=(const atomic_flag&) volatile = delete;
-
-    // Conversion to ATOMIC_FLAG_INIT.
-    constexpr atomic_flag(bool __i) noexcept
-      : __atomic_flag_base{ _S_init(__i) }
-    { }
-
-    _GLIBCXX_ALWAYS_INLINE bool
-    test_and_set(memory_order __m = memory_order_seq_cst) noexcept
-    {
-      return __atomic_test_and_set (&_M_i, __m);
-    }
-
-    _GLIBCXX_ALWAYS_INLINE bool
-    test_and_set(memory_order __m = memory_order_seq_cst) volatile noexcept
-    {
-      return __atomic_test_and_set (&_M_i, __m);
-    }
-
-    _GLIBCXX_ALWAYS_INLINE void
-    clear(memory_order __m = memory_order_seq_cst) noexcept
-    {
-      memory_order __b = __m & __memory_order_mask;
-      __glibcxx_assert(__b != memory_order_consume);
-      __glibcxx_assert(__b != memory_order_acquire);
-      __glibcxx_assert(__b != memory_order_acq_rel);
-
-      __atomic_clear (&_M_i, __m);
-    }
-
-    _GLIBCXX_ALWAYS_INLINE void
-    clear(memory_order __m = memory_order_seq_cst) volatile noexcept
-    {
-      memory_order __b = __m & __memory_order_mask;
-      __glibcxx_assert(__b != memory_order_consume);
-      __glibcxx_assert(__b != memory_order_acquire);
-      __glibcxx_assert(__b != memory_order_acq_rel);
-
-      __atomic_clear (&_M_i, __m);
-    }
-
-  private:
-    static constexpr __atomic_flag_data_type
-    _S_init(bool __i)
-    { return __i ? __GCC_ATOMIC_TEST_AND_SET_TRUEVAL : 0; }
-  };
-
-
-  /// Base class for atomic integrals.
-  //
-  // For each of the integral types, define atomic_[integral type] struct
-  //
-  // atomic_bool     bool
-  // atomic_char     char
-  // atomic_schar    signed char
-  // atomic_uchar    unsigned char
-  // atomic_short    short
-  // atomic_ushort   unsigned short
-  // atomic_int      int
-  // atomic_uint     unsigned int
-  // atomic_long     long
-  // atomic_ulong    unsigned long
-  // atomic_llong    long long
-  // atomic_ullong   unsigned long long
-  // atomic_char16_t char16_t
-  // atomic_char32_t char32_t
-  // atomic_wchar_t  wchar_t
-  //
-  // NB: Assuming _ITp is an integral scalar type that is 1, 2, 4, or
-  // 8 bytes, since that is what GCC built-in functions for atomic
-  // memory access expect.
-  template<typename _ITp>
-    struct __atomic_base
-    {
-    private:
-      typedef _ITp 	__int_type;
-
-      static constexpr int _S_alignment =
-	sizeof(_ITp) > alignof(_ITp) ? sizeof(_ITp) : alignof(_ITp);
-
-      alignas(_S_alignment) __int_type _M_i;
-
-    public:
-      __atomic_base() noexcept = default;
-      ~__atomic_base() noexcept = default;
-      __atomic_base(const __atomic_base&) = delete;
-      __atomic_base& operator=(const __atomic_base&) = delete;
-      __atomic_base& operator=(const __atomic_base&) volatile = delete;
-
-      // Requires __int_type convertible to _M_i.
-      constexpr __atomic_base(__int_type __i) noexcept : _M_i (__i) { }
-
-      operator __int_type() const noexcept
-      { return load(); }
-
-      operator __int_type() const volatile noexcept
-      { return load(); }
-
-      __int_type
-      operator=(__int_type __i) noexcept
-      {
-	store(__i);
-	return __i;
-      }
-
-      __int_type
-      operator=(__int_type __i) volatile noexcept
-      {
-	store(__i);
-	return __i;
-      }
-
-      __int_type
-      operator++(int) noexcept
-      { return fetch_add(1); }
-
-      __int_type
-      operator++(int) volatile noexcept
-      { return fetch_add(1); }
-
-      __int_type
-      operator--(int) noexcept
-      { return fetch_sub(1); }
-
-      __int_type
-      operator--(int) volatile noexcept
-      { return fetch_sub(1); }
-
-      __int_type
-      operator++() noexcept
-      { return __atomic_add_fetch(&_M_i, 1, memory_order_seq_cst); }
-
-      __int_type
-      operator++() volatile noexcept
-      { return __atomic_add_fetch(&_M_i, 1, memory_order_seq_cst); }
-
-      __int_type
-      operator--() noexcept
-      { return __atomic_sub_fetch(&_M_i, 1, memory_order_seq_cst); }
-
-      __int_type
-      operator--() volatile noexcept
-      { return __atomic_sub_fetch(&_M_i, 1, memory_order_seq_cst); }
-
-      __int_type
-      operator+=(__int_type __i) noexcept
-      { return __atomic_add_fetch(&_M_i, __i, memory_order_seq_cst); }
-
-      __int_type
-      operator+=(__int_type __i) volatile noexcept
-      { return __atomic_add_fetch(&_M_i, __i, memory_order_seq_cst); }
-
-      __int_type
-      operator-=(__int_type __i) noexcept
-      { return __atomic_sub_fetch(&_M_i, __i, memory_order_seq_cst); }
-
-      __int_type
-      operator-=(__int_type __i) volatile noexcept
-      { return __atomic_sub_fetch(&_M_i, __i, memory_order_seq_cst); }
-
-      __int_type
-      operator&=(__int_type __i) noexcept
-      { return __atomic_and_fetch(&_M_i, __i, memory_order_seq_cst); }
-
-      __int_type
-      operator&=(__int_type __i) volatile noexcept
-      { return __atomic_and_fetch(&_M_i, __i, memory_order_seq_cst); }
-
-      __int_type
-      operator|=(__int_type __i) noexcept
-      { return __atomic_or_fetch(&_M_i, __i, memory_order_seq_cst); }
-
-      __int_type
-      operator|=(__int_type __i) volatile noexcept
-      { return __atomic_or_fetch(&_M_i, __i, memory_order_seq_cst); }
-
-      __int_type
-      operator^=(__int_type __i) noexcept
-      { return __atomic_xor_fetch(&_M_i, __i, memory_order_seq_cst); }
-
-      __int_type
-      operator^=(__int_type __i) volatile noexcept
-      { return __atomic_xor_fetch(&_M_i, __i, memory_order_seq_cst); }
-
-      bool
-      is_lock_free() const noexcept
-      {
-	// Use a fake, minimally aligned pointer.
-	return __atomic_is_lock_free(sizeof(_M_i),
-	    reinterpret_cast<void *>(-__alignof(_M_i)));
-      }
-
-      bool
-      is_lock_free() const volatile noexcept
-      {
-	// Use a fake, minimally aligned pointer.
-	return __atomic_is_lock_free(sizeof(_M_i),
-	    reinterpret_cast<void *>(-__alignof(_M_i)));
-      }
-
-      _GLIBCXX_ALWAYS_INLINE void
-      store(__int_type __i, memory_order __m = memory_order_seq_cst) noexcept
-      {
-        memory_order __b = __m & __memory_order_mask;
-	__glibcxx_assert(__b != memory_order_acquire);
-	__glibcxx_assert(__b != memory_order_acq_rel);
-	__glibcxx_assert(__b != memory_order_consume);
-
-	__atomic_store_n(&_M_i, __i, __m);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE void
-      store(__int_type __i,
-	    memory_order __m = memory_order_seq_cst) volatile noexcept
-      {
-        memory_order __b = __m & __memory_order_mask;
-	__glibcxx_assert(__b != memory_order_acquire);
-	__glibcxx_assert(__b != memory_order_acq_rel);
-	__glibcxx_assert(__b != memory_order_consume);
-
-	__atomic_store_n(&_M_i, __i, __m);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      load(memory_order __m = memory_order_seq_cst) const noexcept
-      {
-       memory_order __b = __m & __memory_order_mask;
-	__glibcxx_assert(__b != memory_order_release);
-	__glibcxx_assert(__b != memory_order_acq_rel);
-
-	return __atomic_load_n(&_M_i, __m);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      load(memory_order __m = memory_order_seq_cst) const volatile noexcept
-      {
-        memory_order __b = __m & __memory_order_mask;
-	__glibcxx_assert(__b != memory_order_release);
-	__glibcxx_assert(__b != memory_order_acq_rel);
-
-	return __atomic_load_n(&_M_i, __m);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      exchange(__int_type __i,
-	       memory_order __m = memory_order_seq_cst) noexcept
-      {
-	return __atomic_exchange_n(&_M_i, __i, __m);
-      }
-
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      exchange(__int_type __i,
-	       memory_order __m = memory_order_seq_cst) volatile noexcept
-      {
-	return __atomic_exchange_n(&_M_i, __i, __m);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE bool
-      compare_exchange_weak(__int_type& __i1, __int_type __i2,
-			    memory_order __m1, memory_order __m2) noexcept
-      {
-       memory_order __b2 = __m2 & __memory_order_mask;
-       memory_order __b1 = __m1 & __memory_order_mask;
-	__glibcxx_assert(__b2 != memory_order_release);
-	__glibcxx_assert(__b2 != memory_order_acq_rel);
-	__glibcxx_assert(__b2 <= __b1);
-
-	return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 1, __m1, __m2);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE bool
-      compare_exchange_weak(__int_type& __i1, __int_type __i2,
-			    memory_order __m1,
-			    memory_order __m2) volatile noexcept
-      {
-       memory_order __b2 = __m2 & __memory_order_mask;
-       memory_order __b1 = __m1 & __memory_order_mask;
-	__glibcxx_assert(__b2 != memory_order_release);
-	__glibcxx_assert(__b2 != memory_order_acq_rel);
-	__glibcxx_assert(__b2 <= __b1);
-
-	return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 1, __m1, __m2);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE bool
-      compare_exchange_weak(__int_type& __i1, __int_type __i2,
-			    memory_order __m = memory_order_seq_cst) noexcept
-      {
-	return compare_exchange_weak(__i1, __i2, __m,
-				     __cmpexch_failure_order(__m));
-      }
-
-      _GLIBCXX_ALWAYS_INLINE bool
-      compare_exchange_weak(__int_type& __i1, __int_type __i2,
-		   memory_order __m = memory_order_seq_cst) volatile noexcept
-      {
-	return compare_exchange_weak(__i1, __i2, __m,
-				     __cmpexch_failure_order(__m));
-      }
-
-      _GLIBCXX_ALWAYS_INLINE bool
-      compare_exchange_strong(__int_type& __i1, __int_type __i2,
-			      memory_order __m1, memory_order __m2) noexcept
-      {
-        memory_order __b2 = __m2 & __memory_order_mask;
-        memory_order __b1 = __m1 & __memory_order_mask;
-	__glibcxx_assert(__b2 != memory_order_release);
-	__glibcxx_assert(__b2 != memory_order_acq_rel);
-	__glibcxx_assert(__b2 <= __b1);
-
-	return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE bool
-      compare_exchange_strong(__int_type& __i1, __int_type __i2,
-			      memory_order __m1,
-			      memory_order __m2) volatile noexcept
-      {
-        memory_order __b2 = __m2 & __memory_order_mask;
-        memory_order __b1 = __m1 & __memory_order_mask;
-
-	__glibcxx_assert(__b2 != memory_order_release);
-	__glibcxx_assert(__b2 != memory_order_acq_rel);
-	__glibcxx_assert(__b2 <= __b1);
-
-	return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE bool
-      compare_exchange_strong(__int_type& __i1, __int_type __i2,
-			      memory_order __m = memory_order_seq_cst) noexcept
-      {
-	return compare_exchange_strong(__i1, __i2, __m,
-				       __cmpexch_failure_order(__m));
-      }
-
-      _GLIBCXX_ALWAYS_INLINE bool
-      compare_exchange_strong(__int_type& __i1, __int_type __i2,
-		 memory_order __m = memory_order_seq_cst) volatile noexcept
-      {
-	return compare_exchange_strong(__i1, __i2, __m,
-				       __cmpexch_failure_order(__m));
-      }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      fetch_add(__int_type __i,
-		memory_order __m = memory_order_seq_cst) noexcept
-      { return __atomic_fetch_add(&_M_i, __i, __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      fetch_add(__int_type __i,
-		memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return __atomic_fetch_add(&_M_i, __i, __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      fetch_sub(__int_type __i,
-		memory_order __m = memory_order_seq_cst) noexcept
-      { return __atomic_fetch_sub(&_M_i, __i, __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      fetch_sub(__int_type __i,
-		memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return __atomic_fetch_sub(&_M_i, __i, __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      fetch_and(__int_type __i,
-		memory_order __m = memory_order_seq_cst) noexcept
-      { return __atomic_fetch_and(&_M_i, __i, __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      fetch_and(__int_type __i,
-		memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return __atomic_fetch_and(&_M_i, __i, __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      fetch_or(__int_type __i,
-	       memory_order __m = memory_order_seq_cst) noexcept
-      { return __atomic_fetch_or(&_M_i, __i, __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      fetch_or(__int_type __i,
-	       memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return __atomic_fetch_or(&_M_i, __i, __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      fetch_xor(__int_type __i,
-		memory_order __m = memory_order_seq_cst) noexcept
-      { return __atomic_fetch_xor(&_M_i, __i, __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __int_type
-      fetch_xor(__int_type __i,
-		memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return __atomic_fetch_xor(&_M_i, __i, __m); }
-    };
-
-
-  /// Partial specialization for pointer types.
-  template<typename _PTp>
-    struct __atomic_base<_PTp*>
-    {
-    private:
-      typedef _PTp* 	__pointer_type;
-
-      __pointer_type 	_M_p;
-
-      // Factored out to facilitate explicit specialization.
-      constexpr ptrdiff_t
-      _M_type_size(ptrdiff_t __d) const { return __d * sizeof(_PTp); }
-
-      constexpr ptrdiff_t
-      _M_type_size(ptrdiff_t __d) const volatile { return __d * sizeof(_PTp); }
-
-    public:
-      __atomic_base() noexcept = default;
-      ~__atomic_base() noexcept = default;
-      __atomic_base(const __atomic_base&) = delete;
-      __atomic_base& operator=(const __atomic_base&) = delete;
-      __atomic_base& operator=(const __atomic_base&) volatile = delete;
-
-      // Requires __pointer_type convertible to _M_p.
-      constexpr __atomic_base(__pointer_type __p) noexcept : _M_p (__p) { }
-
-      operator __pointer_type() const noexcept
-      { return load(); }
-
-      operator __pointer_type() const volatile noexcept
-      { return load(); }
-
-      __pointer_type
-      operator=(__pointer_type __p) noexcept
-      {
-	store(__p);
-	return __p;
-      }
-
-      __pointer_type
-      operator=(__pointer_type __p) volatile noexcept
-      {
-	store(__p);
-	return __p;
-      }
-
-      __pointer_type
-      operator++(int) noexcept
-      { return fetch_add(1); }
-
-      __pointer_type
-      operator++(int) volatile noexcept
-      { return fetch_add(1); }
-
-      __pointer_type
-      operator--(int) noexcept
-      { return fetch_sub(1); }
-
-      __pointer_type
-      operator--(int) volatile noexcept
-      { return fetch_sub(1); }
-
-      __pointer_type
-      operator++() noexcept
-      { return __atomic_add_fetch(&_M_p, _M_type_size(1),
-				  memory_order_seq_cst); }
-
-      __pointer_type
-      operator++() volatile noexcept
-      { return __atomic_add_fetch(&_M_p, _M_type_size(1),
-				  memory_order_seq_cst); }
-
-      __pointer_type
-      operator--() noexcept
-      { return __atomic_sub_fetch(&_M_p, _M_type_size(1),
-				  memory_order_seq_cst); }
-
-      __pointer_type
-      operator--() volatile noexcept
-      { return __atomic_sub_fetch(&_M_p, _M_type_size(1),
-				  memory_order_seq_cst); }
-
-      __pointer_type
-      operator+=(ptrdiff_t __d) noexcept
-      { return __atomic_add_fetch(&_M_p, _M_type_size(__d),
-				  memory_order_seq_cst); }
-
-      __pointer_type
-      operator+=(ptrdiff_t __d) volatile noexcept
-      { return __atomic_add_fetch(&_M_p, _M_type_size(__d),
-				  memory_order_seq_cst); }
-
-      __pointer_type
-      operator-=(ptrdiff_t __d) noexcept
-      { return __atomic_sub_fetch(&_M_p, _M_type_size(__d),
-				  memory_order_seq_cst); }
-
-      __pointer_type
-      operator-=(ptrdiff_t __d) volatile noexcept
-      { return __atomic_sub_fetch(&_M_p, _M_type_size(__d),
-				  memory_order_seq_cst); }
-
-      bool
-      is_lock_free() const noexcept
-      {
-	// Produce a fake, minimally aligned pointer.
-	return __atomic_is_lock_free(sizeof(_M_p),
-	    reinterpret_cast<void *>(-__alignof(_M_p)));
-      }
-
-      bool
-      is_lock_free() const volatile noexcept
-      {
-	// Produce a fake, minimally aligned pointer.
-	return __atomic_is_lock_free(sizeof(_M_p),
-	    reinterpret_cast<void *>(-__alignof(_M_p)));
-      }
-
-      _GLIBCXX_ALWAYS_INLINE void
-      store(__pointer_type __p,
-	    memory_order __m = memory_order_seq_cst) noexcept
-      {
-        memory_order __b = __m & __memory_order_mask;
-
-	__glibcxx_assert(__b != memory_order_acquire);
-	__glibcxx_assert(__b != memory_order_acq_rel);
-	__glibcxx_assert(__b != memory_order_consume);
-
-	__atomic_store_n(&_M_p, __p, __m);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE void
-      store(__pointer_type __p,
-	    memory_order __m = memory_order_seq_cst) volatile noexcept
-      {
-        memory_order __b = __m & __memory_order_mask;
-	__glibcxx_assert(__b != memory_order_acquire);
-	__glibcxx_assert(__b != memory_order_acq_rel);
-	__glibcxx_assert(__b != memory_order_consume);
-
-	__atomic_store_n(&_M_p, __p, __m);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE __pointer_type
-      load(memory_order __m = memory_order_seq_cst) const noexcept
-      {
-        memory_order __b = __m & __memory_order_mask;
-	__glibcxx_assert(__b != memory_order_release);
-	__glibcxx_assert(__b != memory_order_acq_rel);
-
-	return __atomic_load_n(&_M_p, __m);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE __pointer_type
-      load(memory_order __m = memory_order_seq_cst) const volatile noexcept
-      {
-        memory_order __b = __m & __memory_order_mask;
-	__glibcxx_assert(__b != memory_order_release);
-	__glibcxx_assert(__b != memory_order_acq_rel);
-
-	return __atomic_load_n(&_M_p, __m);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE __pointer_type
-      exchange(__pointer_type __p,
-	       memory_order __m = memory_order_seq_cst) noexcept
-      {
-	return __atomic_exchange_n(&_M_p, __p, __m);
-      }
-
-
-      _GLIBCXX_ALWAYS_INLINE __pointer_type
-      exchange(__pointer_type __p,
-	       memory_order __m = memory_order_seq_cst) volatile noexcept
-      {
-	return __atomic_exchange_n(&_M_p, __p, __m);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE bool
-      compare_exchange_strong(__pointer_type& __p1, __pointer_type __p2,
-			      memory_order __m1,
-			      memory_order __m2) noexcept
-      {
-        memory_order __b2 = __m2 & __memory_order_mask;
-        memory_order __b1 = __m1 & __memory_order_mask;
-	__glibcxx_assert(__b2 != memory_order_release);
-	__glibcxx_assert(__b2 != memory_order_acq_rel);
-	__glibcxx_assert(__b2 <= __b1);
-
-	return __atomic_compare_exchange_n(&_M_p, &__p1, __p2, 0, __m1, __m2);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE bool
-      compare_exchange_strong(__pointer_type& __p1, __pointer_type __p2,
-			      memory_order __m1,
-			      memory_order __m2) volatile noexcept
-      {
-        memory_order __b2 = __m2 & __memory_order_mask;
-        memory_order __b1 = __m1 & __memory_order_mask;
-
-	__glibcxx_assert(__b2 != memory_order_release);
-	__glibcxx_assert(__b2 != memory_order_acq_rel);
-	__glibcxx_assert(__b2 <= __b1);
-
-	return __atomic_compare_exchange_n(&_M_p, &__p1, __p2, 0, __m1, __m2);
-      }
-
-      _GLIBCXX_ALWAYS_INLINE __pointer_type
-      fetch_add(ptrdiff_t __d,
-		memory_order __m = memory_order_seq_cst) noexcept
-      { return __atomic_fetch_add(&_M_p, _M_type_size(__d), __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __pointer_type
-      fetch_add(ptrdiff_t __d,
-		memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return __atomic_fetch_add(&_M_p, _M_type_size(__d), __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __pointer_type
-      fetch_sub(ptrdiff_t __d,
-		memory_order __m = memory_order_seq_cst) noexcept
-      { return __atomic_fetch_sub(&_M_p, _M_type_size(__d), __m); }
-
-      _GLIBCXX_ALWAYS_INLINE __pointer_type
-      fetch_sub(ptrdiff_t __d,
-		memory_order __m = memory_order_seq_cst) volatile noexcept
-      { return __atomic_fetch_sub(&_M_p, _M_type_size(__d), __m); }
-    };
-
-  // @} group atomics
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/atomic_futex.h b/openflow/usr/include/c++/5/bits/atomic_futex.h
deleted file mode 100644
index 90317f2..0000000
--- a/openflow/usr/include/c++/5/bits/atomic_futex.h
+++ /dev/null
@@ -1,290 +0,0 @@
-// -*- C++ -*- header.
-
-// Copyright (C) 2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/atomic_futex.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly.
- */
-
-#ifndef _GLIBCXX_ATOMIC_FUTEX_H
-#define _GLIBCXX_ATOMIC_FUTEX_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <atomic>
-#include <chrono>
-#if ! (defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1)
-#include <mutex>
-#include <condition_variable>
-#endif
-
-#ifndef _GLIBCXX_ALWAYS_INLINE
-#define _GLIBCXX_ALWAYS_INLINE inline __attribute__((__always_inline__))
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
-#if defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1
-  struct __atomic_futex_unsigned_base
-  {
-    // Returns false iff a timeout occurred.
-    bool
-    _M_futex_wait_until(unsigned *__addr, unsigned __val, bool __has_timeout,
-	chrono::seconds __s, chrono::nanoseconds __ns);
-
-    // This can be executed after the object has been destroyed.
-    static void _M_futex_notify_all(unsigned* __addr);
-  };
-
-  template <unsigned _Waiter_bit = 0x80000000>
-  class __atomic_futex_unsigned : __atomic_futex_unsigned_base
-  {
-    typedef chrono::system_clock __clock_t;
-
-    // This must be lock-free and at offset 0.
-    atomic<unsigned> _M_data;
-
-  public:
-    explicit
-    __atomic_futex_unsigned(unsigned __data) : _M_data(__data)
-    { }
-
-    _GLIBCXX_ALWAYS_INLINE unsigned
-    _M_load(memory_order __mo)
-    {
-      return _M_data.load(__mo) & ~_Waiter_bit;
-    }
-
-  private:
-    // If a timeout occurs, returns a current value after the timeout;
-    // otherwise, returns the operand's value if equal is true or a different
-    // value if equal is false.
-    // The assumed value is the caller's assumption about the current value
-    // when making the call.
-    unsigned
-    _M_load_and_test_until(unsigned __assumed, unsigned __operand,
-	bool __equal, memory_order __mo, bool __has_timeout,
-	chrono::seconds __s, chrono::nanoseconds __ns)
-    {
-      for (;;)
-	{
-	  // Don't bother checking the value again because we expect the caller
-	  // to have done it recently.
-	  // memory_order_relaxed is sufficient because we can rely on just the
-	  // modification order (store_notify uses an atomic RMW operation too),
-	  // and the futex syscalls synchronize between themselves.
-	  _M_data.fetch_or(_Waiter_bit, memory_order_relaxed);
-	  bool __ret = _M_futex_wait_until((unsigned*)(void*)&_M_data,
-					   __assumed | _Waiter_bit,
-					   __has_timeout, __s, __ns);
-	  // Fetch the current value after waiting (clears _Waiter_bit).
-	  __assumed = _M_load(__mo);
-	  if (!__ret || ((__operand == __assumed) == __equal))
-	    return __assumed;
-	  // TODO adapt wait time
-	}
-    }
-
-    // Returns the operand's value if equal is true or a different value if
-    // equal is false.
-    // The assumed value is the caller's assumption about the current value
-    // when making the call.
-    unsigned
-    _M_load_and_test(unsigned __assumed, unsigned __operand,
-	bool __equal, memory_order __mo)
-    {
-      return _M_load_and_test_until(__assumed, __operand, __equal, __mo,
-				    false, {}, {});
-    }
-
-    // If a timeout occurs, returns a current value after the timeout;
-    // otherwise, returns the operand's value if equal is true or a different
-    // value if equal is false.
-    // The assumed value is the caller's assumption about the current value
-    // when making the call.
-    template<typename _Dur>
-    unsigned
-    _M_load_and_test_until_impl(unsigned __assumed, unsigned __operand,
-	bool __equal, memory_order __mo,
-	const chrono::time_point<__clock_t, _Dur>& __atime)
-    {
-      auto __s = chrono::time_point_cast<chrono::seconds>(__atime);
-      auto __ns = chrono::duration_cast<chrono::nanoseconds>(__atime - __s);
-      // XXX correct?
-      return _M_load_and_test_until(__assumed, __operand, __equal, __mo,
-	  true, __s.time_since_epoch(), __ns);
-    }
-
-  public:
-
-    _GLIBCXX_ALWAYS_INLINE unsigned
-    _M_load_when_not_equal(unsigned __val, memory_order __mo)
-    {
-      unsigned __i = _M_load(__mo);
-      if ((__i & ~_Waiter_bit) != __val)
-	return (__i & ~_Waiter_bit);
-      // TODO Spin-wait first.
-      return _M_load_and_test(__i, __val, false, __mo);
-    }
-
-    _GLIBCXX_ALWAYS_INLINE void
-    _M_load_when_equal(unsigned __val, memory_order __mo)
-    {
-      unsigned __i = _M_load(__mo);
-      if ((__i & ~_Waiter_bit) == __val)
-	return;
-      // TODO Spin-wait first.
-      _M_load_and_test(__i, __val, true, __mo);
-    }
-
-    // Returns false iff a timeout occurred.
-    template<typename _Rep, typename _Period>
-      _GLIBCXX_ALWAYS_INLINE bool
-      _M_load_when_equal_for(unsigned __val, memory_order __mo,
-	  const chrono::duration<_Rep, _Period>& __rtime)
-      {
-	return _M_load_when_equal_until(__val, __mo,
-					__clock_t::now() + __rtime);
-      }
-
-    // Returns false iff a timeout occurred.
-    template<typename _Clock, typename _Duration>
-      _GLIBCXX_ALWAYS_INLINE bool
-      _M_load_when_equal_until(unsigned __val, memory_order __mo,
-	  const chrono::time_point<_Clock, _Duration>& __atime)
-      {
-	// DR 887 - Sync unknown clock to known clock.
-	const typename _Clock::time_point __c_entry = _Clock::now();
-	const __clock_t::time_point __s_entry = __clock_t::now();
-	const auto __delta = __atime - __c_entry;
-	const auto __s_atime = __s_entry + __delta;
-	return _M_load_when_equal_until(__val, __mo, __s_atime);
-      }
-
-    // Returns false iff a timeout occurred.
-    template<typename _Duration>
-    _GLIBCXX_ALWAYS_INLINE bool
-    _M_load_when_equal_until(unsigned __val, memory_order __mo,
-	const chrono::time_point<__clock_t, _Duration>& __atime)
-    {
-      unsigned __i = _M_load(__mo);
-      if ((__i & ~_Waiter_bit) == __val)
-	return true;
-      // TODO Spin-wait first.  Ignore effect on timeout.
-      __i = _M_load_and_test_until_impl(__i, __val, true, __mo, __atime);
-      return (__i & ~_Waiter_bit) == __val;
-    }
-
-    _GLIBCXX_ALWAYS_INLINE void
-    _M_store_notify_all(unsigned __val, memory_order __mo)
-    {
-      unsigned* __futex = (unsigned *)(void *)&_M_data;
-      if (_M_data.exchange(__val, __mo) & _Waiter_bit)
-	_M_futex_notify_all(__futex);
-    }
-  };
-
-#else // ! (_GLIBCXX_HAVE_LINUX_FUTEX && ATOMIC_INT_LOCK_FREE > 1)
-
-  // If futexes are not available, use a mutex and a condvar to wait.
-  // Because we access the data only within critical sections, all accesses
-  // are sequentially consistent; thus, we satisfy any provided memory_order.
-  template <unsigned _Waiter_bit = 0x80000000>
-  class __atomic_futex_unsigned
-  {
-    typedef chrono::system_clock __clock_t;
-
-    unsigned _M_data;
-    mutex _M_mutex;
-    condition_variable _M_condvar;
-
-  public:
-    explicit
-    __atomic_futex_unsigned(unsigned __data) : _M_data(__data)
-    { }
-
-    _GLIBCXX_ALWAYS_INLINE unsigned
-    _M_load(memory_order __mo)
-    {
-      unique_lock<mutex> __lock(_M_mutex);
-      return _M_data;
-    }
-
-    _GLIBCXX_ALWAYS_INLINE unsigned
-    _M_load_when_not_equal(unsigned __val, memory_order __mo)
-    {
-      unique_lock<mutex> __lock(_M_mutex);
-      while (_M_data == __val)
-	_M_condvar.wait(__lock);
-      return _M_data;
-    }
-
-    _GLIBCXX_ALWAYS_INLINE void
-    _M_load_when_equal(unsigned __val, memory_order __mo)
-    {
-      unique_lock<mutex> __lock(_M_mutex);
-      while (_M_data != __val)
-	_M_condvar.wait(__lock);
-    }
-
-    template<typename _Rep, typename _Period>
-      _GLIBCXX_ALWAYS_INLINE bool
-      _M_load_when_equal_for(unsigned __val, memory_order __mo,
-	  const chrono::duration<_Rep, _Period>& __rtime)
-      {
-	unique_lock<mutex> __lock(_M_mutex);
-	return _M_condvar.wait_for(__lock, __rtime,
-				   [&] { return _M_data == __val;});
-      }
-
-    template<typename _Clock, typename _Duration>
-      _GLIBCXX_ALWAYS_INLINE bool
-      _M_load_when_equal_until(unsigned __val, memory_order __mo,
-	  const chrono::time_point<_Clock, _Duration>& __atime)
-      {
-	unique_lock<mutex> __lock(_M_mutex);
-	return _M_condvar.wait_until(__lock, __atime,
-				     [&] { return _M_data == __val;});
-      }
-
-    _GLIBCXX_ALWAYS_INLINE void
-    _M_store_notify_all(unsigned __val, memory_order __mo)
-    {
-      unique_lock<mutex> __lock(_M_mutex);
-      _M_data = __val;
-      _M_condvar.notify_all();
-    }
-  };
-
-#endif // _GLIBCXX_HAVE_LINUX_FUTEX && ATOMIC_INT_LOCK_FREE > 1
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/atomic_lockfree_defines.h b/openflow/usr/include/c++/5/bits/atomic_lockfree_defines.h
deleted file mode 100644
index fa84d06..0000000
--- a/openflow/usr/include/c++/5/bits/atomic_lockfree_defines.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*- header.
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/atomic_lockfree_defines.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{atomic}
- */
-
-#ifndef _GLIBCXX_ATOMIC_LOCK_FREE_H
-#define _GLIBCXX_ATOMIC_LOCK_FREE_H 1
-
-#pragma GCC system_header
-
-/**
- * @addtogroup atomics
- * @{
- */
-
-/**
- * Lock-free property.
- *
- * 0 indicates that the types are never lock-free.
- * 1 indicates that the types are sometimes lock-free.
- * 2 indicates that the types are always lock-free.
- */
-
-#if __cplusplus >= 201103L
-#define ATOMIC_BOOL_LOCK_FREE		__GCC_ATOMIC_BOOL_LOCK_FREE
-#define ATOMIC_CHAR_LOCK_FREE		__GCC_ATOMIC_CHAR_LOCK_FREE
-#define ATOMIC_WCHAR_T_LOCK_FREE	__GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#define ATOMIC_CHAR16_T_LOCK_FREE	__GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#define ATOMIC_CHAR32_T_LOCK_FREE	__GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#define ATOMIC_SHORT_LOCK_FREE		__GCC_ATOMIC_SHORT_LOCK_FREE
-#define ATOMIC_INT_LOCK_FREE		__GCC_ATOMIC_INT_LOCK_FREE
-#define ATOMIC_LONG_LOCK_FREE		__GCC_ATOMIC_LONG_LOCK_FREE
-#define ATOMIC_LLONG_LOCK_FREE		__GCC_ATOMIC_LLONG_LOCK_FREE
-#define ATOMIC_POINTER_LOCK_FREE	__GCC_ATOMIC_POINTER_LOCK_FREE
-#endif
-
-// @} group atomics
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/basic_ios.h b/openflow/usr/include/c++/5/bits/basic_ios.h
deleted file mode 100644
index 8bea176..0000000
--- a/openflow/usr/include/c++/5/bits/basic_ios.h
+++ /dev/null
@@ -1,518 +0,0 @@
-// Iostreams base classes -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/basic_ios.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ios}
- */
-
-#ifndef _BASIC_IOS_H
-#define _BASIC_IOS_H 1
-
-#pragma GCC system_header
-
-#include <bits/localefwd.h>
-#include <bits/locale_classes.h>
-#include <bits/locale_facets.h>
-#include <bits/streambuf_iterator.h>
-#include <bits/move.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Facet>
-    inline const _Facet&
-    __check_facet(const _Facet* __f)
-    {
-      if (!__f)
-	__throw_bad_cast();
-      return *__f;
-    }
-
-  /**
-   *  @brief Template class basic_ios, virtual base class for all
-   *  stream classes. 
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *
-   *  Most of the member functions called dispatched on stream objects
-   *  (e.g., @c std::cout.foo(bar);) are consolidated in this class.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_ios : public ios_base
-    {
-    public:
-      //@{
-      /**
-       *  These are standard types.  They permit a standardized way of
-       *  referring to names of (or names dependent on) the template
-       *  parameters, which are specific to the implementation.
-      */
-      typedef _CharT                                 char_type;
-      typedef typename _Traits::int_type             int_type;
-      typedef typename _Traits::pos_type             pos_type;
-      typedef typename _Traits::off_type             off_type;
-      typedef _Traits                                traits_type;
-      //@}
-
-      //@{
-      /**
-       *  These are non-standard types.
-      */
-      typedef ctype<_CharT>                          __ctype_type;
-      typedef num_put<_CharT, ostreambuf_iterator<_CharT, _Traits> >
-						     __num_put_type;
-      typedef num_get<_CharT, istreambuf_iterator<_CharT, _Traits> >
-						     __num_get_type;
-      //@}
-
-      // Data members:
-    protected:
-      basic_ostream<_CharT, _Traits>*                _M_tie;
-      mutable char_type                              _M_fill;
-      mutable bool                                   _M_fill_init;
-      basic_streambuf<_CharT, _Traits>*              _M_streambuf;
-
-      // Cached use_facet<ctype>, which is based on the current locale info.
-      const __ctype_type*                            _M_ctype;
-      // For ostream.
-      const __num_put_type*                          _M_num_put;
-      // For istream.
-      const __num_get_type*                          _M_num_get;
-
-    public:
-      //@{
-      /**
-       *  @brief  The quick-and-easy status check.
-       *
-       *  This allows you to write constructs such as
-       *  <code>if (!a_stream) ...</code> and <code>while (a_stream) ...</code>
-      */
-#if __cplusplus >= 201103L
-      explicit operator bool() const
-      { return !this->fail(); }
-#else
-      operator void*() const
-      { return this->fail() ? 0 : const_cast<basic_ios*>(this); }
-#endif
-
-      bool
-      operator!() const
-      { return this->fail(); }
-      //@}
-
-      /**
-       *  @brief  Returns the error state of the stream buffer.
-       *  @return  A bit pattern (well, isn't everything?)
-       *
-       *  See std::ios_base::iostate for the possible bit values.  Most
-       *  users will call one of the interpreting wrappers, e.g., good().
-      */
-      iostate
-      rdstate() const
-      { return _M_streambuf_state; }
-
-      /**
-       *  @brief  [Re]sets the error state.
-       *  @param  __state  The new state flag(s) to set.
-       *
-       *  See std::ios_base::iostate for the possible bit values.  Most
-       *  users will not need to pass an argument.
-      */
-      void
-      clear(iostate __state = goodbit);
-
-      /**
-       *  @brief  Sets additional flags in the error state.
-       *  @param  __state  The additional state flag(s) to set.
-       *
-       *  See std::ios_base::iostate for the possible bit values.
-      */
-      void
-      setstate(iostate __state)
-      { this->clear(this->rdstate() | __state); }
-
-      // Flip the internal state on for the proper state bits, then re
-      // throws the propagated exception if bit also set in
-      // exceptions().
-      void
-      _M_setstate(iostate __state)
-      {
-	// 27.6.1.2.1 Common requirements.
-	// Turn this on without causing an ios::failure to be thrown.
-	_M_streambuf_state |= __state;
-	if (this->exceptions() & __state)
-	  __throw_exception_again;
-      }
-
-      /**
-       *  @brief  Fast error checking.
-       *  @return  True if no error flags are set.
-       *
-       *  A wrapper around rdstate.
-      */
-      bool
-      good() const
-      { return this->rdstate() == 0; }
-
-      /**
-       *  @brief  Fast error checking.
-       *  @return  True if the eofbit is set.
-       *
-       *  Note that other iostate flags may also be set.
-      */
-      bool
-      eof() const
-      { return (this->rdstate() & eofbit) != 0; }
-
-      /**
-       *  @brief  Fast error checking.
-       *  @return  True if either the badbit or the failbit is set.
-       *
-       *  Checking the badbit in fail() is historical practice.
-       *  Note that other iostate flags may also be set.
-      */
-      bool
-      fail() const
-      { return (this->rdstate() & (badbit | failbit)) != 0; }
-
-      /**
-       *  @brief  Fast error checking.
-       *  @return  True if the badbit is set.
-       *
-       *  Note that other iostate flags may also be set.
-      */
-      bool
-      bad() const
-      { return (this->rdstate() & badbit) != 0; }
-
-      /**
-       *  @brief  Throwing exceptions on errors.
-       *  @return  The current exceptions mask.
-       *
-       *  This changes nothing in the stream.  See the one-argument version
-       *  of exceptions(iostate) for the meaning of the return value.
-      */
-      iostate
-      exceptions() const
-      { return _M_exception; }
-
-      /**
-       *  @brief  Throwing exceptions on errors.
-       *  @param  __except  The new exceptions mask.
-       *
-       *  By default, error flags are set silently.  You can set an
-       *  exceptions mask for each stream; if a bit in the mask becomes set
-       *  in the error flags, then an exception of type
-       *  std::ios_base::failure is thrown.
-       *
-       *  If the error flag is already set when the exceptions mask is
-       *  added, the exception is immediately thrown.  Try running the
-       *  following under GCC 3.1 or later:
-       *  @code
-       *  #include <iostream>
-       *  #include <fstream>
-       *  #include <exception>
-       *
-       *  int main()
-       *  {
-       *      std::set_terminate (__gnu_cxx::__verbose_terminate_handler);
-       *
-       *      std::ifstream f ("/etc/motd");
-       *
-       *      std::cerr << "Setting badbit\n";
-       *      f.setstate (std::ios_base::badbit);
-       *
-       *      std::cerr << "Setting exception mask\n";
-       *      f.exceptions (std::ios_base::badbit);
-       *  }
-       *  @endcode
-      */
-      void
-      exceptions(iostate __except)
-      {
-        _M_exception = __except;
-        this->clear(_M_streambuf_state);
-      }
-
-      // Constructor/destructor:
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  The parameter is passed by derived streams.
-      */
-      explicit
-      basic_ios(basic_streambuf<_CharT, _Traits>* __sb)
-      : ios_base(), _M_tie(0), _M_fill(), _M_fill_init(false), _M_streambuf(0),
-	_M_ctype(0), _M_num_put(0), _M_num_get(0)
-      { this->init(__sb); }
-
-      /**
-       *  @brief  Empty.
-       *
-       *  The destructor does nothing.  More specifically, it does not
-       *  destroy the streambuf held by rdbuf().
-      */
-      virtual
-      ~basic_ios() { }
-
-      // Members:
-      /**
-       *  @brief  Fetches the current @e tied stream.
-       *  @return  A pointer to the tied stream, or NULL if the stream is
-       *           not tied.
-       *
-       *  A stream may be @e tied (or synchronized) to a second output
-       *  stream.  When this stream performs any I/O, the tied stream is
-       *  first flushed.  For example, @c std::cin is tied to @c std::cout.
-      */
-      basic_ostream<_CharT, _Traits>*
-      tie() const
-      { return _M_tie; }
-
-      /**
-       *  @brief  Ties this stream to an output stream.
-       *  @param  __tiestr  The output stream.
-       *  @return  The previously tied output stream, or NULL if the stream
-       *           was not tied.
-       *
-       *  This sets up a new tie; see tie() for more.
-      */
-      basic_ostream<_CharT, _Traits>*
-      tie(basic_ostream<_CharT, _Traits>* __tiestr)
-      {
-        basic_ostream<_CharT, _Traits>* __old = _M_tie;
-        _M_tie = __tiestr;
-        return __old;
-      }
-
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current stream buffer.
-       *
-       *  This does not change the state of the stream.
-      */
-      basic_streambuf<_CharT, _Traits>*
-      rdbuf() const
-      { return _M_streambuf; }
-
-      /**
-       *  @brief  Changing the underlying buffer.
-       *  @param  __sb  The new stream buffer.
-       *  @return  The previous stream buffer.
-       *
-       *  Associates a new buffer with the current stream, and clears the
-       *  error state.
-       *
-       *  Due to historical accidents which the LWG refuses to correct, the
-       *  I/O library suffers from a design error:  this function is hidden
-       *  in derived classes by overrides of the zero-argument @c rdbuf(),
-       *  which is non-virtual for hysterical raisins.  As a result, you
-       *  must use explicit qualifications to access this function via any
-       *  derived class.  For example:
-       *
-       *  @code
-       *  std::fstream     foo;         // or some other derived type
-       *  std::streambuf*  p = .....;
-       *
-       *  foo.ios::rdbuf(p);            // ios == basic_ios<char>
-       *  @endcode
-      */
-      basic_streambuf<_CharT, _Traits>*
-      rdbuf(basic_streambuf<_CharT, _Traits>* __sb);
-
-      /**
-       *  @brief  Copies fields of __rhs into this.
-       *  @param  __rhs  The source values for the copies.
-       *  @return  Reference to this object.
-       *
-       *  All fields of __rhs are copied into this object except that rdbuf()
-       *  and rdstate() remain unchanged.  All values in the pword and iword
-       *  arrays are copied.  Before copying, each callback is invoked with
-       *  erase_event.  After copying, each (new) callback is invoked with
-       *  copyfmt_event.  The final step is to copy exceptions().
-      */
-      basic_ios&
-      copyfmt(const basic_ios& __rhs);
-
-      /**
-       *  @brief  Retrieves the @a empty character.
-       *  @return  The current fill character.
-       *
-       *  It defaults to a space (' ') in the current locale.
-      */
-      char_type
-      fill() const
-      {
-	if (!_M_fill_init)
-	  {
-	    _M_fill = this->widen(' ');
-	    _M_fill_init = true;
-	  }
-	return _M_fill;
-      }
-
-      /**
-       *  @brief  Sets a new @a empty character.
-       *  @param  __ch  The new character.
-       *  @return  The previous fill character.
-       *
-       *  The fill character is used to fill out space when P+ characters
-       *  have been requested (e.g., via setw), Q characters are actually
-       *  used, and Q<P.  It defaults to a space (' ') in the current locale.
-      */
-      char_type
-      fill(char_type __ch)
-      {
-	char_type __old = this->fill();
-	_M_fill = __ch;
-	return __old;
-      }
-
-      // Locales:
-      /**
-       *  @brief  Moves to a new locale.
-       *  @param  __loc  The new locale.
-       *  @return  The previous locale.
-       *
-       *  Calls @c ios_base::imbue(loc), and if a stream buffer is associated
-       *  with this stream, calls that buffer's @c pubimbue(loc).
-       *
-       *  Additional l10n notes are at
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/localization.html
-      */
-      locale
-      imbue(const locale& __loc);
-
-      /**
-       *  @brief  Squeezes characters.
-       *  @param  __c  The character to narrow.
-       *  @param  __dfault  The character to narrow.
-       *  @return  The narrowed character.
-       *
-       *  Maps a character of @c char_type to a character of @c char,
-       *  if possible.
-       *
-       *  Returns the result of
-       *  @code
-       *    std::use_facet<ctype<char_type> >(getloc()).narrow(c,dfault)
-       *  @endcode
-       *
-       *  Additional l10n notes are at
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/localization.html
-      */
-      char
-      narrow(char_type __c, char __dfault) const
-      { return __check_facet(_M_ctype).narrow(__c, __dfault); }
-
-      /**
-       *  @brief  Widens characters.
-       *  @param  __c  The character to widen.
-       *  @return  The widened character.
-       *
-       *  Maps a character of @c char to a character of @c char_type.
-       *
-       *  Returns the result of
-       *  @code
-       *    std::use_facet<ctype<char_type> >(getloc()).widen(c)
-       *  @endcode
-       *
-       *  Additional l10n notes are at
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/localization.html
-      */
-      char_type
-      widen(char __c) const
-      { return __check_facet(_M_ctype).widen(__c); }
-
-    protected:
-      // 27.4.5.1  basic_ios constructors
-      /**
-       *  @brief  Empty.
-       *
-       *  The default constructor does nothing and is not normally
-       *  accessible to users.
-      */
-      basic_ios()
-      : ios_base(), _M_tie(0), _M_fill(char_type()), _M_fill_init(false), 
-	_M_streambuf(0), _M_ctype(0), _M_num_put(0), _M_num_get(0)
-      { }
-
-      /**
-       *  @brief  All setup is performed here.
-       *
-       *  This is called from the public constructor.  It is not virtual and
-       *  cannot be redefined.
-      */
-      void
-      init(basic_streambuf<_CharT, _Traits>* __sb);
-
-#if __cplusplus >= 201103L
-      basic_ios(const basic_ios&) = delete;
-      basic_ios& operator=(const basic_ios&) = delete;
-
-      void
-      move(basic_ios& __rhs)
-      {
-	ios_base::_M_move(__rhs);
-	_M_cache_locale(_M_ios_locale);
-	this->tie(__rhs.tie(nullptr));
-	_M_fill = __rhs._M_fill;
-	_M_fill_init = __rhs._M_fill_init;
-	_M_streambuf = nullptr;
-      }
-
-      void
-      move(basic_ios&& __rhs)
-      { this->move(__rhs); }
-
-      void
-      swap(basic_ios& __rhs) noexcept
-      {
-	ios_base::_M_swap(__rhs);
-	_M_cache_locale(_M_ios_locale);
-	__rhs._M_cache_locale(__rhs._M_ios_locale);
-	std::swap(_M_tie, __rhs._M_tie);
-	std::swap(_M_fill, __rhs._M_fill);
-	std::swap(_M_fill_init, __rhs._M_fill_init);
-      }
-
-      void
-      set_rdbuf(basic_streambuf<_CharT, _Traits>* __sb)
-      { _M_streambuf = __sb; }
-#endif
-
-      void
-      _M_cache_locale(const locale& __loc);
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#include <bits/basic_ios.tcc>
-
-#endif /* _BASIC_IOS_H */
diff --git a/openflow/usr/include/c++/5/bits/basic_ios.tcc b/openflow/usr/include/c++/5/bits/basic_ios.tcc
deleted file mode 100644
index be6b13b..0000000
--- a/openflow/usr/include/c++/5/bits/basic_ios.tcc
+++ /dev/null
@@ -1,188 +0,0 @@
-// basic_ios member functions -*- C++ -*-
-
-// Copyright (C) 1999-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/basic_ios.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ios}
- */
-
-#ifndef _BASIC_IOS_TCC
-#define _BASIC_IOS_TCC 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_ios<_CharT, _Traits>::clear(iostate __state)
-    {
-      if (this->rdbuf())
-	_M_streambuf_state = __state;
-      else
-	  _M_streambuf_state = __state | badbit;
-      if (this->exceptions() & this->rdstate())
-	__throw_ios_failure(__N("basic_ios::clear"));
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_streambuf<_CharT, _Traits>*
-    basic_ios<_CharT, _Traits>::rdbuf(basic_streambuf<_CharT, _Traits>* __sb)
-    {
-      basic_streambuf<_CharT, _Traits>* __old = _M_streambuf;
-      _M_streambuf = __sb;
-      this->clear();
-      return __old;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ios<_CharT, _Traits>&
-    basic_ios<_CharT, _Traits>::copyfmt(const basic_ios& __rhs)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 292. effects of a.copyfmt (a)
-      if (this != &__rhs)
-	{
-	  // Per 27.1.1, do not call imbue, yet must trash all caches
-	  // associated with imbue()
-
-	  // Alloc any new word array first, so if it fails we have "rollback".
-	  _Words* __words = (__rhs._M_word_size <= _S_local_word_size) ?
-	                     _M_local_word : new _Words[__rhs._M_word_size];
-
-	  // Bump refs before doing callbacks, for safety.
-	  _Callback_list* __cb = __rhs._M_callbacks;
-	  if (__cb)
-	    __cb->_M_add_reference();
-	  _M_call_callbacks(erase_event);
-	  if (_M_word != _M_local_word)
-	    {
-	      delete [] _M_word;
-	      _M_word = 0;
-	    }
-	  _M_dispose_callbacks();
-
-	  // NB: Don't want any added during above.
-	  _M_callbacks = __cb;
-	  for (int __i = 0; __i < __rhs._M_word_size; ++__i)
-	    __words[__i] = __rhs._M_word[__i];
-	  _M_word = __words;
-	  _M_word_size = __rhs._M_word_size;
-
-	  this->flags(__rhs.flags());
-	  this->width(__rhs.width());
-	  this->precision(__rhs.precision());
-	  this->tie(__rhs.tie());
-	  this->fill(__rhs.fill());
-	  _M_ios_locale = __rhs.getloc();
-	  _M_cache_locale(_M_ios_locale);
-
-	  _M_call_callbacks(copyfmt_event);
-
-	  // The next is required to be the last assignment.
-	  this->exceptions(__rhs.exceptions());
-	}
-      return *this;
-    }
-
-  // Locales:
-  template<typename _CharT, typename _Traits>
-    locale
-    basic_ios<_CharT, _Traits>::imbue(const locale& __loc)
-    {
-      locale __old(this->getloc());
-      ios_base::imbue(__loc);
-      _M_cache_locale(__loc);
-      if (this->rdbuf() != 0)
-	this->rdbuf()->pubimbue(__loc);
-      return __old;
-    }
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_ios<_CharT, _Traits>::init(basic_streambuf<_CharT, _Traits>* __sb)
-    {
-      // NB: This may be called more than once on the same object.
-      ios_base::_M_init();
-
-      // Cache locale data and specific facets used by iostreams.
-      _M_cache_locale(_M_ios_locale);
-
-      // NB: The 27.4.4.1 Postconditions Table specifies requirements
-      // after basic_ios::init() has been called. As part of this,
-      // fill() must return widen(' ') any time after init() has been
-      // called, which needs an imbued ctype facet of char_type to
-      // return without throwing an exception. Unfortunately,
-      // ctype<char_type> is not necessarily a required facet, so
-      // streams with char_type != [char, wchar_t] will not have it by
-      // default. Because of this, the correct value for _M_fill is
-      // constructed on the first call of fill(). That way,
-      // unformatted input and output with non-required basic_ios
-      // instantiations is possible even without imbuing the expected
-      // ctype<char_type> facet.
-      _M_fill = _CharT();
-      _M_fill_init = false;
-
-      _M_tie = 0;
-      _M_exception = goodbit;
-      _M_streambuf = __sb;
-      _M_streambuf_state = __sb ? goodbit : badbit;
-    }
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_ios<_CharT, _Traits>::_M_cache_locale(const locale& __loc)
-    {
-      if (__builtin_expect(has_facet<__ctype_type>(__loc), true))
-	_M_ctype = &use_facet<__ctype_type>(__loc);
-      else
-	_M_ctype = 0;
-
-      if (__builtin_expect(has_facet<__num_put_type>(__loc), true))
-	_M_num_put = &use_facet<__num_put_type>(__loc);
-      else
-	_M_num_put = 0;
-
-      if (__builtin_expect(has_facet<__num_get_type>(__loc), true))
-	_M_num_get = &use_facet<__num_get_type>(__loc);
-      else
-	_M_num_get = 0;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_ios<char>;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_ios<wchar_t>;
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/basic_string.h b/openflow/usr/include/c++/5/bits/basic_string.h
deleted file mode 100644
index 9ef5be9..0000000
--- a/openflow/usr/include/c++/5/bits/basic_string.h
+++ /dev/null
@@ -1,5587 +0,0 @@
-// Components for manipulating sequences of characters -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/basic_string.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{string}
- */
-
-//
-// ISO C++ 14882: 21 Strings library
-//
-
-#ifndef _BASIC_STRING_H
-#define _BASIC_STRING_H 1
-
-#pragma GCC system_header
-
-#include <ext/atomicity.h>
-#include <ext/alloc_traits.h>
-#include <debug/debug.h>
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if _GLIBCXX_USE_CXX11_ABI
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-  /**
-   *  @class basic_string basic_string.h <string>
-   *  @brief  Managing sequences of characters and character-like objects.
-   *
-   *  @ingroup strings
-   *  @ingroup sequences
-   *
-   *  @tparam _CharT  Type of character
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_CharT>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>.  Of the
-   *  <a href="tables.html#68">optional sequence requirements</a>, only
-   *  @c push_back, @c at, and @c %array access are supported.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    class basic_string
-    {
-      typedef typename __gnu_cxx::__alloc_traits<_Alloc>::template
-	rebind<_CharT>::other _Char_alloc_type;
-      typedef __gnu_cxx::__alloc_traits<_Char_alloc_type> _Alloc_traits;
-
-      // Types:
-    public:
-      typedef _Traits					traits_type;
-      typedef typename _Traits::char_type		value_type;
-      typedef _Char_alloc_type				allocator_type;
-      typedef typename _Alloc_traits::size_type		size_type;
-      typedef typename _Alloc_traits::difference_type	difference_type;
-      typedef typename _Alloc_traits::reference		reference;
-      typedef typename _Alloc_traits::const_reference	const_reference;
-      typedef typename _Alloc_traits::pointer		pointer;
-      typedef typename _Alloc_traits::const_pointer	const_pointer;
-      typedef __gnu_cxx::__normal_iterator<pointer, basic_string>  iterator;
-      typedef __gnu_cxx::__normal_iterator<const_pointer, basic_string>
-							const_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-
-      ///  Value returned by various member functions when they fail.
-      static const size_type	npos = static_cast<size_type>(-1);
-
-    private:
-      // type used for positions in insert, erase etc.
-#if __cplusplus < 201103L
-      typedef iterator __const_iterator;
-#else
-      typedef const_iterator __const_iterator;
-#endif
-
-      // Use empty-base optimization: http://www.cantrip.org/emptyopt.html
-      struct _Alloc_hider : allocator_type // TODO check __is_final
-      {
-	_Alloc_hider(pointer __dat, const _Alloc& __a = _Alloc())
-	: allocator_type(__a), _M_p(__dat) { }
-
-	pointer _M_p; // The actual data.
-      };
-
-      _Alloc_hider	_M_dataplus;
-      size_type		_M_string_length;
-
-      enum { _S_local_capacity = 15 / sizeof(_CharT) };
-
-      union
-      {
-	_CharT           _M_local_buf[_S_local_capacity + 1];
-	size_type        _M_allocated_capacity;
-      };
-
-      void
-      _M_data(pointer __p)
-      { _M_dataplus._M_p = __p; }
-
-      void
-      _M_length(size_type __length)
-      { _M_string_length = __length; }
-
-      pointer
-      _M_data() const
-      { return _M_dataplus._M_p; }
-
-      pointer
-      _M_local_data()
-      {
-#if __cplusplus >= 201103L
-	return std::pointer_traits<pointer>::pointer_to(*_M_local_buf);
-#else
-	return pointer(_M_local_buf);
-#endif
-      }
-
-      const_pointer
-      _M_local_data() const
-      {
-#if __cplusplus >= 201103L
-	return std::pointer_traits<const_pointer>::pointer_to(*_M_local_buf);
-#else
-	return const_pointer(_M_local_buf);
-#endif
-      }
-
-      void
-      _M_capacity(size_type __capacity)
-      { _M_allocated_capacity = __capacity; }
-
-      void
-      _M_set_length(size_type __n)
-      {
-	_M_length(__n);
-	traits_type::assign(_M_data()[__n], _CharT());
-      }
-
-      bool
-      _M_is_local() const
-      { return _M_data() == _M_local_data(); }
-
-      // Create & Destroy
-      pointer
-      _M_create(size_type&, size_type);
-
-      void
-      _M_dispose()
-      {
-	if (!_M_is_local())
-	  _M_destroy(_M_allocated_capacity);
-      }
-
-      void
-      _M_destroy(size_type __size) throw()
-      { _Alloc_traits::deallocate(_M_get_allocator(), _M_data(), __size + 1); }
-
-      // _M_construct_aux is used to implement the 21.3.1 para 15 which
-      // requires special behaviour if _InIterator is an integral type
-      template<typename _InIterator>
-        void
-        _M_construct_aux(_InIterator __beg, _InIterator __end,
-			 std::__false_type)
-	{
-          typedef typename iterator_traits<_InIterator>::iterator_category _Tag;
-          _M_construct(__beg, __end, _Tag());
-	}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-        void
-        _M_construct_aux(_Integer __beg, _Integer __end, std::__true_type)
-	{ _M_construct_aux_2(static_cast<size_type>(__beg), __end); }
-
-      void
-      _M_construct_aux_2(size_type __req, _CharT __c)
-      { _M_construct(__req, __c); }
-
-      template<typename _InIterator>
-        void
-        _M_construct(_InIterator __beg, _InIterator __end)
-	{
-	  typedef typename std::__is_integer<_InIterator>::__type _Integral;
-	  _M_construct_aux(__beg, __end, _Integral());
-        }
-
-      // For Input Iterators, used in istreambuf_iterators, etc.
-      template<typename _InIterator>
-        void
-        _M_construct(_InIterator __beg, _InIterator __end,
-		     std::input_iterator_tag);
-
-      // For forward_iterators up to random_access_iterators, used for
-      // string::iterator, _CharT*, etc.
-      template<typename _FwdIterator>
-        void
-        _M_construct(_FwdIterator __beg, _FwdIterator __end,
-		     std::forward_iterator_tag);
-
-      void
-      _M_construct(size_type __req, _CharT __c);
-
-      allocator_type&
-      _M_get_allocator()
-      { return _M_dataplus; }
-
-      const allocator_type&
-      _M_get_allocator() const
-      { return _M_dataplus; }
-
-    private:
-
-#ifdef _GLIBCXX_DISAMBIGUATE_REPLACE_INST
-      // The explicit instantiations in misc-inst.cc require this due to
-      // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64063
-      template<typename _Tp, bool _Requires =
-	       !__are_same<_Tp, _CharT*>::__value
-	       && !__are_same<_Tp, const _CharT*>::__value
-	       && !__are_same<_Tp, iterator>::__value
-	       && !__are_same<_Tp, const_iterator>::__value>
-	struct __enable_if_not_native_iterator
-	{ typedef basic_string& __type; };
-      template<typename _Tp>
-	struct __enable_if_not_native_iterator<_Tp, false> { };
-#endif
-
-      size_type
-      _M_check(size_type __pos, const char* __s) const
-      {
-	if (__pos > this->size())
-	  __throw_out_of_range_fmt(__N("%s: __pos (which is %zu) > "
-				       "this->size() (which is %zu)"),
-				   __s, __pos, this->size());
-	return __pos;
-      }
-
-      void
-      _M_check_length(size_type __n1, size_type __n2, const char* __s) const
-      {
-	if (this->max_size() - (this->size() - __n1) < __n2)
-	  __throw_length_error(__N(__s));
-      }
-
-
-      // NB: _M_limit doesn't check for a bad __pos value.
-      size_type
-      _M_limit(size_type __pos, size_type __off) const _GLIBCXX_NOEXCEPT
-      {
-	const bool __testoff =  __off < this->size() - __pos;
-	return __testoff ? __off : this->size() - __pos;
-      }
-
-      // True if _Rep and source do not overlap.
-      bool
-      _M_disjunct(const _CharT* __s) const _GLIBCXX_NOEXCEPT
-      {
-	return (less<const _CharT*>()(__s, _M_data())
-		|| less<const _CharT*>()(_M_data() + this->size(), __s));
-      }
-
-      // When __n = 1 way faster than the general multichar
-      // traits_type::copy/move/assign.
-      static void
-      _S_copy(_CharT* __d, const _CharT* __s, size_type __n)
-      {
-	if (__n == 1)
-	  traits_type::assign(*__d, *__s);
-	else
-	  traits_type::copy(__d, __s, __n);
-      }
-
-      static void
-      _S_move(_CharT* __d, const _CharT* __s, size_type __n)
-      {
-	if (__n == 1)
-	  traits_type::assign(*__d, *__s);
-	else
-	  traits_type::move(__d, __s, __n);
-      }
-
-      static void
-      _S_assign(_CharT* __d, size_type __n, _CharT __c)
-      {
-	if (__n == 1)
-	  traits_type::assign(*__d, __c);
-	else
-	  traits_type::assign(__d, __n, __c);
-      }
-
-      // _S_copy_chars is a separate template to permit specialization
-      // to optimize for the common case of pointers as iterators.
-      template<class _Iterator>
-        static void
-        _S_copy_chars(_CharT* __p, _Iterator __k1, _Iterator __k2)
-        {
-	  for (; __k1 != __k2; ++__k1, ++__p)
-	    traits_type::assign(*__p, *__k1); // These types are off.
-	}
-
-      static void
-      _S_copy_chars(_CharT* __p, iterator __k1, iterator __k2) _GLIBCXX_NOEXCEPT
-      { _S_copy_chars(__p, __k1.base(), __k2.base()); }
-
-      static void
-      _S_copy_chars(_CharT* __p, const_iterator __k1, const_iterator __k2)
-      _GLIBCXX_NOEXCEPT
-      { _S_copy_chars(__p, __k1.base(), __k2.base()); }
-
-      static void
-      _S_copy_chars(_CharT* __p, _CharT* __k1, _CharT* __k2) _GLIBCXX_NOEXCEPT
-      { _S_copy(__p, __k1, __k2 - __k1); }
-
-      static void
-      _S_copy_chars(_CharT* __p, const _CharT* __k1, const _CharT* __k2)
-      _GLIBCXX_NOEXCEPT
-      { _S_copy(__p, __k1, __k2 - __k1); }
-
-      static int
-      _S_compare(size_type __n1, size_type __n2) _GLIBCXX_NOEXCEPT
-      {
-	const difference_type __d = difference_type(__n1 - __n2);
-
-	if (__d > __gnu_cxx::__numeric_traits<int>::__max)
-	  return __gnu_cxx::__numeric_traits<int>::__max;
-	else if (__d < __gnu_cxx::__numeric_traits<int>::__min)
-	  return __gnu_cxx::__numeric_traits<int>::__min;
-	else
-	  return int(__d);
-      }
-
-      void
-      _M_assign(const basic_string& __rcs);
-
-      void
-      _M_mutate(size_type __pos, size_type __len1, const _CharT* __s,
-		size_type __len2);
-
-      void
-      _M_erase(size_type __pos, size_type __n);
-
-    public:
-      // Construct/copy/destroy:
-      // NB: We overload ctors in some cases instead of using default
-      // arguments, per 17.4.4.4 para. 2 item 2.
-
-      /**
-       *  @brief  Default constructor creates an empty string.
-       */
-      basic_string()
-#if __cplusplus >= 201103L
-      noexcept(is_nothrow_default_constructible<_Alloc>::value)
-#endif
-      : _M_dataplus(_M_local_data())
-      { _M_set_length(0); }
-
-      /**
-       *  @brief  Construct an empty string using allocator @a a.
-       */
-      explicit
-      basic_string(const _Alloc& __a)
-      : _M_dataplus(_M_local_data(), __a)
-      { _M_set_length(0); }
-
-      /**
-       *  @brief  Construct string with copy of value of @a __str.
-       *  @param  __str  Source string.
-       */
-      basic_string(const basic_string& __str)
-      : _M_dataplus(_M_local_data(), __str._M_get_allocator()) // TODO A traits
-      { _M_construct(__str._M_data(), __str._M_data() + __str.length()); }
-
-      /**
-       *  @brief  Construct string as copy of a substring.
-       *  @param  __str  Source string.
-       *  @param  __pos  Index of first character to copy from.
-       *  @param  __n  Number of characters to copy (default remainder).
-       */
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2402. [this constructor] shouldn't use Allocator()
-      basic_string(const basic_string& __str, size_type __pos,
-		   size_type __n = npos)
-      : _M_dataplus(_M_local_data())
-      {
-	const _CharT* __start = __str._M_data()
-	  + __str._M_check(__pos, "basic_string::basic_string");
-	_M_construct(__start, __start + __str._M_limit(__pos, __n));
-      }
-
-      /**
-       *  @brief  Construct string as copy of a substring.
-       *  @param  __str  Source string.
-       *  @param  __pos  Index of first character to copy from.
-       *  @param  __n  Number of characters to copy (default remainder).
-       *  @param  __a  Allocator to use.
-       */
-      basic_string(const basic_string& __str, size_type __pos,
-		   size_type __n, const _Alloc& __a)
-      : _M_dataplus(_M_local_data(), __a)
-      {
-	const _CharT* __start
-	  = __str._M_data() + __str._M_check(__pos, "string::string");
-	_M_construct(__start, __start + __str._M_limit(__pos, __n));
-      }
-
-      /**
-       *  @brief  Construct string initialized by a character %array.
-       *  @param  __s  Source character %array.
-       *  @param  __n  Number of characters to copy.
-       *  @param  __a  Allocator to use (default is default allocator).
-       *
-       *  NB: @a __s must have at least @a __n characters, &apos;\\0&apos;
-       *  has no special meaning.
-       */
-      basic_string(const _CharT* __s, size_type __n,
-		   const _Alloc& __a = _Alloc())
-      : _M_dataplus(_M_local_data(), __a)
-      { _M_construct(__s, __s + __n); }
-
-      /**
-       *  @brief  Construct string as copy of a C string.
-       *  @param  __s  Source C string.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-      basic_string(const _CharT* __s, const _Alloc& __a = _Alloc())
-      : _M_dataplus(_M_local_data(), __a)
-      { _M_construct(__s, __s ? __s + traits_type::length(__s) : __s+npos); }
-
-      /**
-       *  @brief  Construct string as multiple characters.
-       *  @param  __n  Number of characters.
-       *  @param  __c  Character to use.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-      basic_string(size_type __n, _CharT __c, const _Alloc& __a = _Alloc())
-      : _M_dataplus(_M_local_data(), __a)
-      { _M_construct(__n, __c); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Move construct string.
-       *  @param  __str  Source string.
-       *
-       *  The newly-created string contains the exact contents of @a __str.
-       *  @a __str is a valid, but unspecified string.
-       **/
-      basic_string(basic_string&& __str) noexcept
-      : _M_dataplus(_M_local_data(), std::move(__str._M_get_allocator()))
-      {
-	if (__str._M_is_local())
-	  {
-	    traits_type::copy(_M_local_buf, __str._M_local_buf,
-			      _S_local_capacity + 1);
-	  }
-	else
-	  {
-	    _M_data(__str._M_data());
-	    _M_capacity(__str._M_allocated_capacity);
-	  }
-
-	// Must use _M_length() here not _M_set_length() because
-	// basic_stringbuf relies on writing into unallocated capacity so
-	// we mess up the contents if we put a '\0' in the string.
-	_M_length(__str.length());
-	__str._M_data(__str._M_local_data());
-	__str._M_set_length(0);
-      }
-
-      /**
-       *  @brief  Construct string from an initializer %list.
-       *  @param  __l  std::initializer_list of characters.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-      basic_string(initializer_list<_CharT> __l, const _Alloc& __a = _Alloc())
-      : _M_dataplus(_M_local_data(), __a)
-      { _M_construct(__l.begin(), __l.end()); }
-
-      basic_string(const basic_string& __str, const _Alloc& __a)
-      : _M_dataplus(_M_local_data(), __a)
-      { _M_construct(__str.begin(), __str.end()); }
-
-      basic_string(basic_string&& __str, const _Alloc& __a)
-      : _M_dataplus(_M_local_data(), __a)
-      {
-	if (__str.get_allocator() == __a)
-	  *this = std::move(__str);
-	else
-	  _M_construct(__str.begin(), __str.end());
-      }
-
-#endif // C++11
-
-      /**
-       *  @brief  Construct string as copy of a range.
-       *  @param  __beg  Start of range.
-       *  @param  __end  End of range.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<typename _InputIterator>
-#endif
-        basic_string(_InputIterator __beg, _InputIterator __end,
-		     const _Alloc& __a = _Alloc())
-	: _M_dataplus(_M_local_data(), __a)
-	{ _M_construct(__beg, __end); }
-
-      /**
-       *  @brief  Destroy the string instance.
-       */
-      ~basic_string()
-      { _M_dispose(); }
-
-      /**
-       *  @brief  Assign the value of @a str to this string.
-       *  @param  __str  Source string.
-       */
-      basic_string&
-      operator=(const basic_string& __str)
-      { return this->assign(__str); }
-
-      /**
-       *  @brief  Copy contents of @a s into this string.
-       *  @param  __s  Source null-terminated string.
-       */
-      basic_string&
-      operator=(const _CharT* __s)
-      { return this->assign(__s); }
-
-      /**
-       *  @brief  Set value to string of length 1.
-       *  @param  __c  Source character.
-       *
-       *  Assigning to a character makes this string length 1 and
-       *  (*this)[0] == @a c.
-       */
-      basic_string&
-      operator=(_CharT __c)
-      {
-	this->assign(1, __c);
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Move assign the value of @a str to this string.
-       *  @param  __str  Source string.
-       *
-       *  The contents of @a str are moved into this string (without copying).
-       *  @a str is a valid, but unspecified string.
-       **/
-      // PR 58265, this should be noexcept.
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2063. Contradictory requirements for string move assignment
-      basic_string&
-      operator=(basic_string&& __str)
-      {
-	this->swap(__str);
-	return *this;
-      }
-
-      /**
-       *  @brief  Set value to string constructed from initializer %list.
-       *  @param  __l  std::initializer_list.
-       */
-      basic_string&
-      operator=(initializer_list<_CharT> __l)
-      {
-	this->assign(__l.begin(), __l.size());
-	return *this;
-      }
-#endif // C++11
-
-      // Iterators:
-      /**
-       *  Returns a read/write iterator that points to the first character in
-       *  the %string.
-       */
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_M_data()); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  character in the %string.
-       */
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_M_data()); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  character in the %string.
-       */
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_M_data() + this->size()); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the
-       *  last character in the %string.
-       */
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_M_data() + this->size()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last
-       *  character in the %string.  Iteration is done in reverse element
-       *  order.
-       */
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last character in the %string.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one before the
-       *  first character in the %string.  Iteration is done in reverse
-       *  element order.
-       */
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(this->begin()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first character in the %string.  Iteration
-       *  is done in reverse element order.
-       */
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(this->begin()); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  character in the %string.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(this->_M_data()); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the
-       *  last character in the %string.
-       */
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(this->_M_data() + this->size()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last character in the %string.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first character in the %string.  Iteration
-       *  is done in reverse element order.
-       */
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(this->begin()); }
-#endif
-
-    public:
-      // Capacity:
-      ///  Returns the number of characters in the string, not including any
-      ///  null-termination.
-      size_type
-      size() const _GLIBCXX_NOEXCEPT
-      { return _M_string_length; }
-
-      ///  Returns the number of characters in the string, not including any
-      ///  null-termination.
-      size_type
-      length() const _GLIBCXX_NOEXCEPT
-      { return _M_string_length; }
-
-      ///  Returns the size() of the largest possible %string.
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return (_Alloc_traits::max_size(_M_get_allocator()) - 1) / 2; }
-
-      /**
-       *  @brief  Resizes the %string to the specified number of characters.
-       *  @param  __n  Number of characters the %string should contain.
-       *  @param  __c  Character to fill any new elements.
-       *
-       *  This function will %resize the %string to the specified
-       *  number of characters.  If the number is smaller than the
-       *  %string's current size the %string is truncated, otherwise
-       *  the %string is extended and new elements are %set to @a __c.
-       */
-      void
-      resize(size_type __n, _CharT __c);
-
-      /**
-       *  @brief  Resizes the %string to the specified number of characters.
-       *  @param  __n  Number of characters the %string should contain.
-       *
-       *  This function will resize the %string to the specified length.  If
-       *  the new size is smaller than the %string's current size the %string
-       *  is truncated, otherwise the %string is extended and new characters
-       *  are default-constructed.  For basic types such as char, this means
-       *  setting them to 0.
-       */
-      void
-      resize(size_type __n)
-      { this->resize(__n, _CharT()); }
-
-#if __cplusplus >= 201103L
-      ///  A non-binding request to reduce capacity() to size().
-      void
-      shrink_to_fit() noexcept
-      {
-#if __cpp_exceptions
-	if (capacity() > size())
-	  {
-	    try
-	      { reserve(0); }
-	    catch(...)
-	      { }
-	  }
-#endif
-      }
-#endif
-
-      /**
-       *  Returns the total number of characters that the %string can hold
-       *  before needing to allocate more memory.
-       */
-      size_type
-      capacity() const _GLIBCXX_NOEXCEPT
-      {
-	return _M_is_local() ? size_type(_S_local_capacity)
-	                     : _M_allocated_capacity;
-      }
-
-      /**
-       *  @brief  Attempt to preallocate enough memory for specified number of
-       *          characters.
-       *  @param  __res_arg  Number of characters required.
-       *  @throw  std::length_error  If @a __res_arg exceeds @c max_size().
-       *
-       *  This function attempts to reserve enough memory for the
-       *  %string to hold the specified number of characters.  If the
-       *  number requested is more than max_size(), length_error is
-       *  thrown.
-       *
-       *  The advantage of this function is that if optimal code is a
-       *  necessity and the user can determine the string length that will be
-       *  required, the user can reserve the memory in %advance, and thus
-       *  prevent a possible reallocation of memory and copying of %string
-       *  data.
-       */
-      void
-      reserve(size_type __res_arg = 0);
-
-      /**
-       *  Erases the string, making it empty.
-       */
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      { _M_set_length(0); }
-
-      /**
-       *  Returns true if the %string is empty.  Equivalent to 
-       *  <code>*this == ""</code>.
-       */
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return this->size() == 0; }
-
-      // Element access:
-      /**
-       *  @brief  Subscript access to the data contained in the %string.
-       *  @param  __pos  The index of the character to access.
-       *  @return  Read-only (constant) reference to the character.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      const_reference
-      operator[] (size_type __pos) const _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_ASSERT(__pos <= size());
-	return _M_data()[__pos];
-      }
-
-      /**
-       *  @brief  Subscript access to the data contained in the %string.
-       *  @param  __pos  The index of the character to access.
-       *  @return  Read/write reference to the character.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      reference
-      operator[](size_type __pos)
-      {
-        // Allow pos == size() both in C++98 mode, as v3 extension,
-	// and in C++11 mode.
-	_GLIBCXX_DEBUG_ASSERT(__pos <= size());
-        // In pedantic mode be strict in C++98 mode.
-	_GLIBCXX_DEBUG_PEDASSERT(__cplusplus >= 201103L || __pos < size());
-	return _M_data()[__pos];
-      }
-
-      /**
-       *  @brief  Provides access to the data contained in the %string.
-       *  @param __n The index of the character to access.
-       *  @return  Read-only (const) reference to the character.
-       *  @throw  std::out_of_range  If @a n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter is
-       *  first checked that it is in the range of the string.  The function
-       *  throws out_of_range if the check fails.
-       */
-      const_reference
-      at(size_type __n) const
-      {
-	if (__n >= this->size())
-	  __throw_out_of_range_fmt(__N("basic_string::at: __n "
-				       "(which is %zu) >= this->size() "
-				       "(which is %zu)"),
-				   __n, this->size());
-	return _M_data()[__n];
-      }
-
-      /**
-       *  @brief  Provides access to the data contained in the %string.
-       *  @param __n The index of the character to access.
-       *  @return  Read/write reference to the character.
-       *  @throw  std::out_of_range  If @a n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter is
-       *  first checked that it is in the range of the string.  The function
-       *  throws out_of_range if the check fails.
-       */
-      reference
-      at(size_type __n)
-      {
-	if (__n >= size())
-	  __throw_out_of_range_fmt(__N("basic_string::at: __n "
-				       "(which is %zu) >= this->size() "
-				       "(which is %zu)"),
-				   __n, this->size());
-	return _M_data()[__n];
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %string.
-       */
-      reference
-      front() noexcept
-      { return operator[](0); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %string.
-       */
-      const_reference
-      front() const noexcept
-      { return operator[](0); }
-
-      /**
-       *  Returns a read/write reference to the data at the last
-       *  element of the %string.
-       */
-      reference
-      back() noexcept
-      { return operator[](this->size() - 1); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the
-       *  last element of the %string.
-       */
-      const_reference
-      back() const noexcept
-      { return operator[](this->size() - 1); }
-#endif
-
-      // Modifiers:
-      /**
-       *  @brief  Append a string to this string.
-       *  @param __str  The string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(const basic_string& __str)
-      { return this->append(__str); }
-
-      /**
-       *  @brief  Append a C string.
-       *  @param __s  The C string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(const _CharT* __s)
-      { return this->append(__s); }
-
-      /**
-       *  @brief  Append a character.
-       *  @param __c  The character to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(_CharT __c)
-      {
-	this->push_back(__c);
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Append an initializer_list of characters.
-       *  @param __l  The initializer_list of characters to be appended.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(initializer_list<_CharT> __l)
-      { return this->append(__l.begin(), __l.size()); }
-#endif // C++11
-
-      /**
-       *  @brief  Append a string to this string.
-       *  @param __str  The string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(const basic_string& __str)
-      { return _M_append(__str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Append a substring.
-       *  @param __str  The string to append.
-       *  @param __pos  Index of the first character of str to append.
-       *  @param __n  The number of characters to append.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range if @a __pos is not a valid index.
-       *
-       *  This function appends @a __n characters from @a __str
-       *  starting at @a __pos to this string.  If @a __n is is larger
-       *  than the number of available characters in @a __str, the
-       *  remainder of @a __str is appended.
-       */
-      basic_string&
-      append(const basic_string& __str, size_type __pos, size_type __n)
-      { return _M_append(__str._M_data()
-			 + __str._M_check(__pos, "basic_string::append"),
-			 __str._M_limit(__pos, __n)); }
-
-      /**
-       *  @brief  Append a C substring.
-       *  @param __s  The C string to append.
-       *  @param __n  The number of characters to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(const _CharT* __s, size_type __n)
-      {
-	__glibcxx_requires_string_len(__s, __n);
-	_M_check_length(size_type(0), __n, "basic_string::append");
-	return _M_append(__s, __n);
-      }
-
-      /**
-       *  @brief  Append a C string.
-       *  @param __s  The C string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	const size_type __n = traits_type::length(__s);
-	_M_check_length(size_type(0), __n, "basic_string::append");
-	return _M_append(__s, __n);
-      }
-
-      /**
-       *  @brief  Append multiple characters.
-       *  @param __n  The number of characters to append.
-       *  @param __c  The character to use.
-       *  @return  Reference to this string.
-       *
-       *  Appends __n copies of __c to this string.
-       */
-      basic_string&
-      append(size_type __n, _CharT __c)
-      { return _M_replace_aux(this->size(), size_type(0), __n, __c); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Append an initializer_list of characters.
-       *  @param __l  The initializer_list of characters to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(initializer_list<_CharT> __l)
-      { return this->append(__l.begin(), __l.size()); }
-#endif // C++11
-
-      /**
-       *  @brief  Append a range of characters.
-       *  @param __first  Iterator referencing the first character to append.
-       *  @param __last  Iterator marking the end of the range.
-       *  @return  Reference to this string.
-       *
-       *  Appends characters in the range [__first,__last) to this string.
-       */
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-        basic_string&
-        append(_InputIterator __first, _InputIterator __last)
-        { return this->replace(end(), end(), __first, __last); }
-
-      /**
-       *  @brief  Append a single character.
-       *  @param __c  Character to append.
-       */
-      void
-      push_back(_CharT __c)
-      {
-	const size_type __size = this->size();
-	if (__size + 1 > this->capacity())
-	  this->_M_mutate(__size, size_type(0), 0, size_type(1));
-	traits_type::assign(this->_M_data()[__size], __c);
-	this->_M_set_length(__size + 1);
-      }
-
-      /**
-       *  @brief  Set value to contents of another string.
-       *  @param  __str  Source string to use.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      assign(const basic_string& __str)
-      {
-	this->_M_assign(__str);
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Set value to contents of another string.
-       *  @param  __str  Source string to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets this string to the exact contents of @a __str.
-       *  @a __str is a valid, but unspecified string.
-       */
-      basic_string&
-      assign(basic_string&& __str)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 2063. Contradictory requirements for string move assignment
-	return *this = std::move(__str);
-      }
-#endif // C++11
-
-      /**
-       *  @brief  Set value to a substring of a string.
-       *  @param __str  The string to use.
-       *  @param __pos  Index of the first character of str.
-       *  @param __n  Number of characters to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range if @a pos is not a valid index.
-       *
-       *  This function sets this string to the substring of @a __str
-       *  consisting of @a __n characters at @a __pos.  If @a __n is
-       *  is larger than the number of available characters in @a
-       *  __str, the remainder of @a __str is used.
-       */
-      basic_string&
-      assign(const basic_string& __str, size_type __pos, size_type __n)
-      { return _M_replace(size_type(0), this->size(), __str._M_data()
-			  + __str._M_check(__pos, "basic_string::assign"),
-			  __str._M_limit(__pos, __n)); }
-
-      /**
-       *  @brief  Set value to a C substring.
-       *  @param __s  The C string to use.
-       *  @param __n  Number of characters to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to the first @a __n
-       *  characters of @a __s.  If @a __n is is larger than the number of
-       *  available characters in @a __s, the remainder of @a __s is used.
-       */
-      basic_string&
-      assign(const _CharT* __s, size_type __n)
-      {
-	__glibcxx_requires_string_len(__s, __n);
-	return _M_replace(size_type(0), this->size(), __s, __n);
-      }
-
-      /**
-       *  @brief  Set value to contents of a C string.
-       *  @param __s  The C string to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to the value of @a __s.
-       *  The data is copied, so there is no dependence on @a __s once the
-       *  function returns.
-       */
-      basic_string&
-      assign(const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return _M_replace(size_type(0), this->size(), __s,
-			  traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Set value to multiple characters.
-       *  @param __n  Length of the resulting string.
-       *  @param __c  The character to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to @a __n copies of
-       *  character @a __c.
-       */
-      basic_string&
-      assign(size_type __n, _CharT __c)
-      { return _M_replace_aux(size_type(0), this->size(), __n, __c); }
-
-      /**
-       *  @brief  Set value to a range of characters.
-       *  @param __first  Iterator referencing the first character to append.
-       *  @param __last  Iterator marking the end of the range.
-       *  @return  Reference to this string.
-       *
-       *  Sets value of string to characters in the range [__first,__last).
-      */
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-        basic_string&
-        assign(_InputIterator __first, _InputIterator __last)
-        { return this->replace(begin(), end(), __first, __last); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Set value to an initializer_list of characters.
-       *  @param __l  The initializer_list of characters to assign.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      assign(initializer_list<_CharT> __l)
-      { return this->assign(__l.begin(), __l.size()); }
-#endif // C++11
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert multiple characters.
-       *  @param __p  Const_iterator referencing location in string to
-       *              insert at.
-       *  @param __n  Number of characters to insert
-       *  @param __c  The character to insert.
-       *  @return  Iterator referencing the first inserted char.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts @a __n copies of character @a __c starting at the
-       *  position referenced by iterator @a __p.  If adding
-       *  characters causes the length to exceed max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      iterator
-      insert(const_iterator __p, size_type __n, _CharT __c)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__p >= begin() && __p <= end());
-	const size_type __pos = __p - begin();
-	this->replace(__p, __p, __n, __c);
-	return iterator(this->_M_data() + __pos);
-      }
-#else
-      /**
-       *  @brief  Insert multiple characters.
-       *  @param __p  Iterator referencing location in string to insert at.
-       *  @param __n  Number of characters to insert
-       *  @param __c  The character to insert.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts @a __n copies of character @a __c starting at the
-       *  position referenced by iterator @a __p.  If adding
-       *  characters causes the length to exceed max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      void
-      insert(iterator __p, size_type __n, _CharT __c)
-      {	this->replace(__p, __p, __n, __c);  }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert a range of characters.
-       *  @param __p  Const_iterator referencing location in string to
-       *              insert at.
-       *  @param __beg  Start of range.
-       *  @param __end  End of range.
-       *  @return  Iterator referencing the first inserted char.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts characters in range [beg,end).  If adding characters
-       *  causes the length to exceed max_size(), length_error is
-       *  thrown.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	iterator
-        insert(const_iterator __p, _InputIterator __beg, _InputIterator __end)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(__p >= begin() && __p <= end());
-	  const size_type __pos = __p - begin();
-	  this->replace(__p, __p, __beg, __end);
-	  return iterator(this->_M_data() + __pos);
-	}
-#else
-      /**
-       *  @brief  Insert a range of characters.
-       *  @param __p  Iterator referencing location in string to insert at.
-       *  @param __beg  Start of range.
-       *  @param __end  End of range.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts characters in range [__beg,__end).  If adding
-       *  characters causes the length to exceed max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      template<class _InputIterator>
-        void
-        insert(iterator __p, _InputIterator __beg, _InputIterator __end)
-        { this->replace(__p, __p, __beg, __end); }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert an initializer_list of characters.
-       *  @param __p  Iterator referencing location in string to insert at.
-       *  @param __l  The initializer_list of characters to insert.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       */
-      void
-      insert(iterator __p, initializer_list<_CharT> __l)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__p >= begin() && __p <= end());
-	this->insert(__p - begin(), __l.begin(), __l.size());
-      }
-#endif // C++11
-
-      /**
-       *  @brief  Insert value of a string.
-       *  @param __pos1  Iterator referencing location in string to insert at.
-       *  @param __str  The string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts value of @a __str starting at @a __pos1.  If adding
-       *  characters causes the length to exceed max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      basic_string&
-      insert(size_type __pos1, const basic_string& __str)
-      { return this->replace(__pos1, size_type(0),
-			     __str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Insert a substring.
-       *  @param __pos1  Iterator referencing location in string to insert at.
-       *  @param __str  The string to insert.
-       *  @param __pos2  Start of characters in str to insert.
-       *  @param __n  Number of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a pos1 > size() or
-       *  @a __pos2 > @a str.size().
-       *
-       *  Starting at @a pos1, insert @a __n character of @a __str
-       *  beginning with @a __pos2.  If adding characters causes the
-       *  length to exceed max_size(), length_error is thrown.  If @a
-       *  __pos1 is beyond the end of this string or @a __pos2 is
-       *  beyond the end of @a __str, out_of_range is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      insert(size_type __pos1, const basic_string& __str,
-	     size_type __pos2, size_type __n)
-      { return this->replace(__pos1, size_type(0), __str._M_data()
-			     + __str._M_check(__pos2, "basic_string::insert"),
-			     __str._M_limit(__pos2, __n)); }
-
-      /**
-       *  @brief  Insert a C substring.
-       *  @param __pos  Iterator referencing location in string to insert at.
-       *  @param __s  The C string to insert.
-       *  @param __n  The number of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a __pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts the first @a __n characters of @a __s starting at @a
-       *  __pos.  If adding characters causes the length to exceed
-       *  max_size(), length_error is thrown.  If @a __pos is beyond
-       *  end(), out_of_range is thrown.  The value of the string
-       *  doesn't change if an error is thrown.
-      */
-      basic_string&
-      insert(size_type __pos, const _CharT* __s, size_type __n)
-      { return this->replace(__pos, size_type(0), __s, __n); }
-
-      /**
-       *  @brief  Insert a C string.
-       *  @param __pos  Iterator referencing location in string to insert at.
-       *  @param __s  The C string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts the first @a n characters of @a __s starting at @a __pos.  If
-       *  adding characters causes the length to exceed max_size(),
-       *  length_error is thrown.  If @a __pos is beyond end(), out_of_range is
-       *  thrown.  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      basic_string&
-      insert(size_type __pos, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->replace(__pos, size_type(0), __s,
-			     traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Insert multiple characters.
-       *  @param __pos  Index in string to insert at.
-       *  @param __n  Number of characters to insert
-       *  @param __c  The character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a __pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts @a __n copies of character @a __c starting at index
-       *  @a __pos.  If adding characters causes the length to exceed
-       *  max_size(), length_error is thrown.  If @a __pos > length(),
-       *  out_of_range is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      basic_string&
-      insert(size_type __pos, size_type __n, _CharT __c)
-      { return _M_replace_aux(_M_check(__pos, "basic_string::insert"),
-			      size_type(0), __n, __c); }
-
-      /**
-       *  @brief  Insert one character.
-       *  @param __p  Iterator referencing position in string to insert at.
-       *  @param __c  The character to insert.
-       *  @return  Iterator referencing newly inserted char.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts character @a __c at position referenced by @a __p.
-       *  If adding character causes the length to exceed max_size(),
-       *  length_error is thrown.  If @a __p is beyond end of string,
-       *  out_of_range is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      iterator
-      insert(__const_iterator __p, _CharT __c)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__p >= begin() && __p <= end());
-	const size_type __pos = __p - begin();
-	_M_replace_aux(__pos, size_type(0), size_type(1), __c);
-	return iterator(_M_data() + __pos);
-      }
-
-      /**
-       *  @brief  Remove characters.
-       *  @param __pos  Index of first character to remove (default 0).
-       *  @param __n  Number of characters to remove (default remainder).
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *
-       *  Removes @a __n characters from this string starting at @a
-       *  __pos.  The length of the string is reduced by @a __n.  If
-       *  there are < @a __n characters to remove, the remainder of
-       *  the string is truncated.  If @a __p is beyond end of string,
-       *  out_of_range is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      basic_string&
-      erase(size_type __pos = 0, size_type __n = npos)
-      {
-	this->_M_erase(_M_check(__pos, "basic_string::erase"),
-		       _M_limit(__pos, __n));
-	return *this;
-      }
-
-      /**
-       *  @brief  Remove one character.
-       *  @param __position  Iterator referencing the character to remove.
-       *  @return  iterator referencing same location after removal.
-       *
-       *  Removes the character at @a __position from this string. The value
-       *  of the string doesn't change if an error is thrown.
-      */
-      iterator
-      erase(__const_iterator __position)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__position >= begin()
-				 && __position < end());
-	const size_type __pos = __position - begin();
-	this->_M_erase(__pos, size_type(1));
-	return iterator(_M_data() + __pos);
-      }
-
-      /**
-       *  @brief  Remove a range of characters.
-       *  @param __first  Iterator referencing the first character to remove.
-       *  @param __last  Iterator referencing the end of the range.
-       *  @return  Iterator referencing location of first after removal.
-       *
-       *  Removes the characters in the range [first,last) from this string.
-       *  The value of the string doesn't change if an error is thrown.
-      */
-      iterator
-      erase(__const_iterator __first, __const_iterator __last)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__first >= begin() && __first <= __last
-				 && __last <= end());
-        const size_type __pos = __first - begin();
-	this->_M_erase(__pos, __last - __first);
-	return iterator(this->_M_data() + __pos);
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Remove the last character.
-       *
-       *  The string must be non-empty.
-       */
-      void
-      pop_back() noexcept
-      { _M_erase(size()-1, 1); }
-#endif // C++11
-
-      /**
-       *  @brief  Replace characters with value from another string.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n  Number of characters to be replaced.
-       *  @param __str  String to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__pos,__pos+__n) from
-       *  this string.  In place, the value of @a __str is inserted.
-       *  If @a __pos is beyond end of string, out_of_range is thrown.
-       *  If the length of the result exceeds max_size(), length_error
-       *  is thrown.  The value of the string doesn't change if an
-       *  error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n, const basic_string& __str)
-      { return this->replace(__pos, __n, __str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Replace characters with value from another string.
-       *  @param __pos1  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __str  String to insert.
-       *  @param __pos2  Index of first character of str to use.
-       *  @param __n2  Number of characters from str to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a __pos1 > size() or @a __pos2 >
-       *  __str.size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__pos1,__pos1 + n) from this
-       *  string.  In place, the value of @a __str is inserted.  If @a __pos is
-       *  beyond end of string, out_of_range is thrown.  If the length of the
-       *  result exceeds max_size(), length_error is thrown.  The value of the
-       *  string doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos1, size_type __n1, const basic_string& __str,
-	      size_type __pos2, size_type __n2)
-      { return this->replace(__pos1, __n1, __str._M_data()
-			     + __str._M_check(__pos2, "basic_string::replace"),
-			     __str._M_limit(__pos2, __n2)); }
-
-      /**
-       *  @brief  Replace characters with value of a C substring.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __s  C string to insert.
-       *  @param __n2  Number of characters from @a s to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos1 > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__pos,__pos + __n1)
-       *  from this string.  In place, the first @a __n2 characters of
-       *  @a __s are inserted, or all of @a __s if @a __n2 is too large.  If
-       *  @a __pos is beyond end of string, out_of_range is thrown.  If
-       *  the length of result exceeds max_size(), length_error is
-       *  thrown.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n1, const _CharT* __s,
-	      size_type __n2)
-      {
-	__glibcxx_requires_string_len(__s, __n2);
-	return _M_replace(_M_check(__pos, "basic_string::replace"),
-			  _M_limit(__pos, __n1), __s, __n2);
-      }
-
-      /**
-       *  @brief  Replace characters with value of a C string.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __s  C string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__pos,__pos + __n1)
-       *  from this string.  In place, the characters of @a __s are
-       *  inserted.  If @a __pos is beyond end of string, out_of_range
-       *  is thrown.  If the length of result exceeds max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n1, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->replace(__pos, __n1, __s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Replace characters with multiple characters.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __n2  Number of characters to insert.
-       *  @param __c  Character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a __pos > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos,pos + n1) from this
-       *  string.  In place, @a __n2 copies of @a __c are inserted.
-       *  If @a __pos is beyond end of string, out_of_range is thrown.
-       *  If the length of result exceeds max_size(), length_error is
-       *  thrown.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n1, size_type __n2, _CharT __c)
-      { return _M_replace_aux(_M_check(__pos, "basic_string::replace"),
-			      _M_limit(__pos, __n1), __n2, __c); }
-
-      /**
-       *  @brief  Replace range of characters with string.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __str  String value to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  the value of @a __str is inserted.  If the length of result
-       *  exceeds max_size(), length_error is thrown.  The value of
-       *  the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(__const_iterator __i1, __const_iterator __i2,
-	      const basic_string& __str)
-      { return this->replace(__i1, __i2, __str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Replace range of characters with C substring.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __s  C string value to insert.
-       *  @param __n  Number of characters from s to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  the first @a __n characters of @a __s are inserted.  If the
-       *  length of result exceeds max_size(), length_error is thrown.
-       *  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      basic_string&
-      replace(__const_iterator __i1, __const_iterator __i2,
-	      const _CharT* __s, size_type __n)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(begin() <= __i1 && __i1 <= __i2
-				 && __i2 <= end());
-	return this->replace(__i1 - begin(), __i2 - __i1, __s, __n);
-      }
-
-      /**
-       *  @brief  Replace range of characters with C string.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __s  C string value to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  the characters of @a __s are inserted.  If the length of
-       *  result exceeds max_size(), length_error is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(__const_iterator __i1, __const_iterator __i2, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->replace(__i1, __i2, __s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Replace range of characters with multiple characters
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __n  Number of characters to insert.
-       *  @param __c  Character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  @a __n copies of @a __c are inserted.  If the length of
-       *  result exceeds max_size(), length_error is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(__const_iterator __i1, __const_iterator __i2, size_type __n,
-	      _CharT __c)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(begin() <= __i1 && __i1 <= __i2
-				 && __i2 <= end());
-	return _M_replace_aux(__i1 - begin(), __i2 - __i1, __n, __c);
-      }
-
-      /**
-       *  @brief  Replace range of characters with range.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __k1  Iterator referencing start of range to insert.
-       *  @param __k2  Iterator referencing end of range to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  characters in the range [__k1,__k2) are inserted.  If the
-       *  length of result exceeds max_size(), length_error is thrown.
-       *  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        basic_string&
-        replace(const_iterator __i1, const_iterator __i2,
-		_InputIterator __k1, _InputIterator __k2)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(begin() <= __i1 && __i1 <= __i2
-				   && __i2 <= end());
-	  __glibcxx_requires_valid_range(__k1, __k2);
-	  return this->_M_replace_dispatch(__i1, __i2, __k1, __k2,
-					   std::__false_type());
-	}
-#else
-      template<class _InputIterator>
-#ifdef _GLIBCXX_DISAMBIGUATE_REPLACE_INST
-        typename __enable_if_not_native_iterator<_InputIterator>::__type
-#else
-        basic_string&
-#endif
-        replace(iterator __i1, iterator __i2,
-		_InputIterator __k1, _InputIterator __k2)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(begin() <= __i1 && __i1 <= __i2
-				   && __i2 <= end());
-	  __glibcxx_requires_valid_range(__k1, __k2);
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  return _M_replace_dispatch(__i1, __i2, __k1, __k2, _Integral());
-	}
-#endif
-
-      // Specializations for the common case of pointer and iterator:
-      // useful to avoid the overhead of temporary buffering in _M_replace.
-      basic_string&
-      replace(__const_iterator __i1, __const_iterator __i2,
-	      _CharT* __k1, _CharT* __k2)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(begin() <= __i1 && __i1 <= __i2
-				 && __i2 <= end());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - begin(), __i2 - __i1,
-			     __k1, __k2 - __k1);
-      }
-
-      basic_string&
-      replace(__const_iterator __i1, __const_iterator __i2,
-	      const _CharT* __k1, const _CharT* __k2)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(begin() <= __i1 && __i1 <= __i2
-				 && __i2 <= end());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - begin(), __i2 - __i1,
-			     __k1, __k2 - __k1);
-      }
-
-      basic_string&
-      replace(__const_iterator __i1, __const_iterator __i2,
-	      iterator __k1, iterator __k2)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(begin() <= __i1 && __i1 <= __i2
-				 && __i2 <= end());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - begin(), __i2 - __i1,
-			     __k1.base(), __k2 - __k1);
-      }
-
-      basic_string&
-      replace(__const_iterator __i1, __const_iterator __i2,
-	      const_iterator __k1, const_iterator __k2)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(begin() <= __i1 && __i1 <= __i2
-				 && __i2 <= end());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - begin(), __i2 - __i1,
-			     __k1.base(), __k2 - __k1);
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Replace range of characters with initializer_list.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __l  The initializer_list of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  characters in the range [__k1,__k2) are inserted.  If the
-       *  length of result exceeds max_size(), length_error is thrown.
-       *  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      basic_string& replace(const_iterator __i1, const_iterator __i2,
-			    initializer_list<_CharT> __l)
-      { return this->replace(__i1, __i2, __l.begin(), __l.end()); }
-#endif // C++11
-
-    private:
-      template<class _Integer>
-	basic_string&
-	_M_replace_dispatch(const_iterator __i1, const_iterator __i2,
-			    _Integer __n, _Integer __val, __true_type)
-        { return _M_replace_aux(__i1 - begin(), __i2 - __i1, __n, __val); }
-
-      template<class _InputIterator>
-	basic_string&
-	_M_replace_dispatch(const_iterator __i1, const_iterator __i2,
-			    _InputIterator __k1, _InputIterator __k2,
-			    __false_type);
-
-      basic_string&
-      _M_replace_aux(size_type __pos1, size_type __n1, size_type __n2,
-		     _CharT __c);
-
-      basic_string&
-      _M_replace(size_type __pos, size_type __len1, const _CharT* __s,
-		 const size_type __len2);
-
-      basic_string&
-      _M_append(const _CharT* __s, size_type __n);
-
-    public:
-
-      /**
-       *  @brief  Copy substring into C string.
-       *  @param __s  C string to copy value into.
-       *  @param __n  Number of characters to copy.
-       *  @param __pos  Index of first character to copy.
-       *  @return  Number of characters actually copied
-       *  @throw  std::out_of_range  If __pos > size().
-       *
-       *  Copies up to @a __n characters starting at @a __pos into the
-       *  C string @a __s.  If @a __pos is %greater than size(),
-       *  out_of_range is thrown.
-      */
-      size_type
-      copy(_CharT* __s, size_type __n, size_type __pos = 0) const;
-
-      /**
-       *  @brief  Swap contents with another string.
-       *  @param __s  String to swap with.
-       *
-       *  Exchanges the contents of this string with that of @a __s in constant
-       *  time.
-      */
-      void
-      swap(basic_string& __s) _GLIBCXX_NOEXCEPT;
-
-      // String operations:
-      /**
-       *  @brief  Return const pointer to null-terminated contents.
-       *
-       *  This is a handle to internal data.  Do not modify or dire things may
-       *  happen.
-      */
-      const _CharT*
-      c_str() const _GLIBCXX_NOEXCEPT
-      { return _M_data(); }
-
-      /**
-       *  @brief  Return const pointer to contents.
-       *
-       *  This is a handle to internal data.  Do not modify or dire things may
-       *  happen.
-      */
-      const _CharT*
-      data() const _GLIBCXX_NOEXCEPT
-      { return _M_data(); }
-
-      /**
-       *  @brief  Return copy of allocator used to construct this string.
-      */
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return _M_get_allocator(); }
-
-      /**
-       *  @brief  Find position of a C substring.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to search from.
-       *  @param __n  Number of characters from @a s to search for.
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for the first @a
-       *  __n characters in @a __s within this string.  If found,
-       *  returns the index where it begins.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find position of a string.
-       *  @param __str  String to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for value of @a __str within
-       *  this string.  If found, returns the index where it begins.  If not
-       *  found, returns npos.
-      */
-      size_type
-      find(const basic_string& __str, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a C string.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for the value of @a
-       *  __s within this string.  If found, returns the index where
-       *  it begins.  If not found, returns npos.
-      */
-      size_type
-      find(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for @a __c within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Find last position of a string.
-       *  @param __str  String to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of start of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for value of @a
-       *  __str within this string.  If found, returns the index where
-       *  it begins.  If not found, returns npos.
-      */
-      size_type
-      rfind(const basic_string& __str, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT
-      { return this->rfind(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a C substring.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to search back from.
-       *  @param __n  Number of characters from s to search for.
-       *  @return  Index of start of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for the first @a
-       *  __n characters in @a __s within this string.  If found,
-       *  returns the index where it begins.  If not found, returns
-       *  npos.
-      */
-      size_type
-      rfind(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find last position of a C string.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to start search at (default end).
-       *  @return  Index of start of  last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for the value of
-       *  @a __s within this string.  If found, returns the index
-       *  where it begins.  If not found, returns npos.
-      */
-      size_type
-      rfind(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->rfind(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for @a __c within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      rfind(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Find position of a character of string.
-       *  @param __str  String containing characters to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for one of the
-       *  characters of @a __str within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_first_of(const basic_string& __str, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_first_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a character of C substring.
-       *  @param __s  String containing characters to locate.
-       *  @param __pos  Index of character to search from.
-       *  @param __n  Number of characters from s to search for.
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for one of the
-       *  first @a __n characters of @a __s within this string.  If
-       *  found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      find_first_of(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find position of a character of C string.
-       *  @param __s  String containing characters to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for one of the
-       *  characters of @a __s within this string.  If found, returns
-       *  the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_of(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_first_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for the character
-       *  @a __c within this string.  If found, returns the index
-       *  where it was found.  If not found, returns npos.
-       *
-       *  Note: equivalent to find(__c, __pos).
-      */
-      size_type
-      find_first_of(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT
-      { return this->find(__c, __pos); }
-
-      /**
-       *  @brief  Find last position of a character of string.
-       *  @param __str  String containing characters to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for one of the
-       *  characters of @a __str within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_last_of(const basic_string& __str, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_last_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a character of C substring.
-       *  @param __s  C string containing characters to locate.
-       *  @param __pos  Index of character to search back from.
-       *  @param __n  Number of characters from s to search for.
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for one of the
-       *  first @a __n characters of @a __s within this string.  If
-       *  found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      find_last_of(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find last position of a character of C string.
-       *  @param __s  C string containing characters to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for one of the
-       *  characters of @a __s within this string.  If found, returns
-       *  the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_last_of(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_last_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for @a __c within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-       *
-       *  Note: equivalent to rfind(__c, __pos).
-      */
-      size_type
-      find_last_of(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT
-      { return this->rfind(__c, __pos); }
-
-      /**
-       *  @brief  Find position of a character not in string.
-       *  @param __str  String containing characters to avoid.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character not contained
-       *  in @a __str within this string.  If found, returns the index where it
-       *  was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const basic_string& __str, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_first_not_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a character not in C substring.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search from.
-       *  @param __n  Number of characters from __s to consider.
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character not
-       *  contained in the first @a __n characters of @a __s within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const _CharT* __s, size_type __pos,
-			size_type __n) const;
-
-      /**
-       *  @brief  Find position of a character not in C string.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character not
-       *  contained in @a __s within this string.  If found, returns
-       *  the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_first_not_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a different character.
-       *  @param __c  Character to avoid.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character
-       *  other than @a __c within this string.  If found, returns the
-       *  index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(_CharT __c, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Find last position of a character not in string.
-       *  @param __str  String containing characters to avoid.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character
-       *  not contained in @a __str within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_last_not_of(const basic_string& __str, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_last_not_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a character not in C substring.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search back from.
-       *  @param __n  Number of characters from s to consider.
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character not
-       *  contained in the first @a __n characters of @a __s within this string.
-       *  If found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      find_last_not_of(const _CharT* __s, size_type __pos,
-		       size_type __n) const;
-      /**
-       *  @brief  Find last position of a character not in C string.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character
-       *  not contained in @a __s within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_last_not_of(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_last_not_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a different character.
-       *  @param __c  Character to avoid.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character other than
-       *  @a __c within this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_last_not_of(_CharT __c, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Get a substring.
-       *  @param __pos  Index of first character (default 0).
-       *  @param __n  Number of characters in substring (default remainder).
-       *  @return  The new string.
-       *  @throw  std::out_of_range  If __pos > size().
-       *
-       *  Construct and return a new string using the @a __n
-       *  characters starting at @a __pos.  If the string is too
-       *  short, use the remainder of the characters.  If @a __pos is
-       *  beyond the end of the string, out_of_range is thrown.
-      */
-      basic_string
-      substr(size_type __pos = 0, size_type __n = npos) const
-      { return basic_string(*this,
-			    _M_check(__pos, "basic_string::substr"), __n); }
-
-      /**
-       *  @brief  Compare to a string.
-       *  @param __str  String to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Returns an integer < 0 if this string is ordered before @a
-       *  __str, 0 if their values are equivalent, or > 0 if this
-       *  string is ordered after @a __str.  Determines the effective
-       *  length rlen of the strings to compare as the smallest of
-       *  size() and str.size().  The function then compares the two
-       *  strings by calling traits::compare(data(), str.data(),rlen).
-       *  If the result of the comparison is nonzero returns it,
-       *  otherwise the shorter one is ordered first.
-      */
-      int
-      compare(const basic_string& __str) const
-      {
-	const size_type __size = this->size();
-	const size_type __osize = __str.size();
-	const size_type __len = std::min(__size, __osize);
-
-	int __r = traits_type::compare(_M_data(), __str.data(), __len);
-	if (!__r)
-	  __r = _S_compare(__size, __osize);
-	return __r;
-      }
-
-      /**
-       *  @brief  Compare substring to a string.
-       *  @param __pos  Index of first character of substring.
-       *  @param __n  Number of characters in substring.
-       *  @param __str  String to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n characters
-       *  starting at @a __pos.  Returns an integer < 0 if the
-       *  substring is ordered before @a __str, 0 if their values are
-       *  equivalent, or > 0 if the substring is ordered after @a
-       *  __str.  Determines the effective length rlen of the strings
-       *  to compare as the smallest of the length of the substring
-       *  and @a __str.size().  The function then compares the two
-       *  strings by calling
-       *  traits::compare(substring.data(),str.data(),rlen).  If the
-       *  result of the comparison is nonzero returns it, otherwise
-       *  the shorter one is ordered first.
-      */
-      int
-      compare(size_type __pos, size_type __n, const basic_string& __str) const;
-
-      /**
-       *  @brief  Compare substring to a substring.
-       *  @param __pos1  Index of first character of substring.
-       *  @param __n1  Number of characters in substring.
-       *  @param __str  String to compare against.
-       *  @param __pos2  Index of first character of substring of str.
-       *  @param __n2  Number of characters in substring of str.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n1
-       *  characters starting at @a __pos1.  Form the substring of @a
-       *  __str from the @a __n2 characters starting at @a __pos2.
-       *  Returns an integer < 0 if this substring is ordered before
-       *  the substring of @a __str, 0 if their values are equivalent,
-       *  or > 0 if this substring is ordered after the substring of
-       *  @a __str.  Determines the effective length rlen of the
-       *  strings to compare as the smallest of the lengths of the
-       *  substrings.  The function then compares the two strings by
-       *  calling
-       *  traits::compare(substring.data(),str.substr(pos2,n2).data(),rlen).
-       *  If the result of the comparison is nonzero returns it,
-       *  otherwise the shorter one is ordered first.
-      */
-      int
-      compare(size_type __pos1, size_type __n1, const basic_string& __str,
-	      size_type __pos2, size_type __n2) const;
-
-      /**
-       *  @brief  Compare to a C string.
-       *  @param __s  C string to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Returns an integer < 0 if this string is ordered before @a __s, 0 if
-       *  their values are equivalent, or > 0 if this string is ordered after
-       *  @a __s.  Determines the effective length rlen of the strings to
-       *  compare as the smallest of size() and the length of a string
-       *  constructed from @a __s.  The function then compares the two strings
-       *  by calling traits::compare(data(),s,rlen).  If the result of the
-       *  comparison is nonzero returns it, otherwise the shorter one is
-       *  ordered first.
-      */
-      int
-      compare(const _CharT* __s) const;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 5 String::compare specification questionable
-      /**
-       *  @brief  Compare substring to a C string.
-       *  @param __pos  Index of first character of substring.
-       *  @param __n1  Number of characters in substring.
-       *  @param __s  C string to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n1
-       *  characters starting at @a pos.  Returns an integer < 0 if
-       *  the substring is ordered before @a __s, 0 if their values
-       *  are equivalent, or > 0 if the substring is ordered after @a
-       *  __s.  Determines the effective length rlen of the strings to
-       *  compare as the smallest of the length of the substring and
-       *  the length of a string constructed from @a __s.  The
-       *  function then compares the two string by calling
-       *  traits::compare(substring.data(),__s,rlen).  If the result of
-       *  the comparison is nonzero returns it, otherwise the shorter
-       *  one is ordered first.
-      */
-      int
-      compare(size_type __pos, size_type __n1, const _CharT* __s) const;
-
-      /**
-       *  @brief  Compare substring against a character %array.
-       *  @param __pos  Index of first character of substring.
-       *  @param __n1  Number of characters in substring.
-       *  @param __s  character %array to compare against.
-       *  @param __n2  Number of characters of s.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n1
-       *  characters starting at @a __pos.  Form a string from the
-       *  first @a __n2 characters of @a __s.  Returns an integer < 0
-       *  if this substring is ordered before the string from @a __s,
-       *  0 if their values are equivalent, or > 0 if this substring
-       *  is ordered after the string from @a __s.  Determines the
-       *  effective length rlen of the strings to compare as the
-       *  smallest of the length of the substring and @a __n2.  The
-       *  function then compares the two strings by calling
-       *  traits::compare(substring.data(),s,rlen).  If the result of
-       *  the comparison is nonzero returns it, otherwise the shorter
-       *  one is ordered first.
-       *
-       *  NB: s must have at least n2 characters, &apos;\\0&apos; has
-       *  no special meaning.
-      */
-      int
-      compare(size_type __pos, size_type __n1, const _CharT* __s,
-	      size_type __n2) const;
-  };
-_GLIBCXX_END_NAMESPACE_CXX11
-#else  // !_GLIBCXX_USE_CXX11_ABI
-  // Reference-counted COW string implentation
-
-  /**
-   *  @class basic_string basic_string.h <string>
-   *  @brief  Managing sequences of characters and character-like objects.
-   *
-   *  @ingroup strings
-   *  @ingroup sequences
-   *
-   *  @tparam _CharT  Type of character
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_CharT>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>.  Of the
-   *  <a href="tables.html#68">optional sequence requirements</a>, only
-   *  @c push_back, @c at, and @c %array access are supported.
-   *
-   *  @doctodo
-   *
-   *
-   *  Documentation?  What's that?
-   *  Nathan Myers <ncm@cantrip.org>.
-   *
-   *  A string looks like this:
-   *
-   *  @code
-   *                                        [_Rep]
-   *                                        _M_length
-   *   [basic_string<char_type>]            _M_capacity
-   *   _M_dataplus                          _M_refcount
-   *   _M_p ---------------->               unnamed array of char_type
-   *  @endcode
-   *
-   *  Where the _M_p points to the first character in the string, and
-   *  you cast it to a pointer-to-_Rep and subtract 1 to get a
-   *  pointer to the header.
-   *
-   *  This approach has the enormous advantage that a string object
-   *  requires only one allocation.  All the ugliness is confined
-   *  within a single %pair of inline functions, which each compile to
-   *  a single @a add instruction: _Rep::_M_data(), and
-   *  string::_M_rep(); and the allocation function which gets a
-   *  block of raw bytes and with room enough and constructs a _Rep
-   *  object at the front.
-   *
-   *  The reason you want _M_data pointing to the character %array and
-   *  not the _Rep is so that the debugger can see the string
-   *  contents. (Probably we should add a non-inline member to get
-   *  the _Rep for the debugger to use, so users can check the actual
-   *  string length.)
-   *
-   *  Note that the _Rep object is a POD so that you can have a
-   *  static <em>empty string</em> _Rep object already @a constructed before
-   *  static constructors have run.  The reference-count encoding is
-   *  chosen so that a 0 indicates one reference, so you never try to
-   *  destroy the empty-string _Rep object.
-   *
-   *  All but the last paragraph is considered pretty conventional
-   *  for a C++ string implementation.
-  */
-  // 21.3  Template class basic_string
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    class basic_string
-    {
-      typedef typename _Alloc::template rebind<_CharT>::other _CharT_alloc_type;
-
-      // Types:
-    public:
-      typedef _Traits					    traits_type;
-      typedef typename _Traits::char_type		    value_type;
-      typedef _Alloc					    allocator_type;
-      typedef typename _CharT_alloc_type::size_type	    size_type;
-      typedef typename _CharT_alloc_type::difference_type   difference_type;
-      typedef typename _CharT_alloc_type::reference	    reference;
-      typedef typename _CharT_alloc_type::const_reference   const_reference;
-      typedef typename _CharT_alloc_type::pointer	    pointer;
-      typedef typename _CharT_alloc_type::const_pointer	    const_pointer;
-      typedef __gnu_cxx::__normal_iterator<pointer, basic_string>  iterator;
-      typedef __gnu_cxx::__normal_iterator<const_pointer, basic_string>
-                                                            const_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-      typedef std::reverse_iterator<iterator>		    reverse_iterator;
-
-    private:
-      // _Rep: string representation
-      //   Invariants:
-      //   1. String really contains _M_length + 1 characters: due to 21.3.4
-      //      must be kept null-terminated.
-      //   2. _M_capacity >= _M_length
-      //      Allocated memory is always (_M_capacity + 1) * sizeof(_CharT).
-      //   3. _M_refcount has three states:
-      //      -1: leaked, one reference, no ref-copies allowed, non-const.
-      //       0: one reference, non-const.
-      //     n>0: n + 1 references, operations require a lock, const.
-      //   4. All fields==0 is an empty string, given the extra storage
-      //      beyond-the-end for a null terminator; thus, the shared
-      //      empty string representation needs no constructor.
-
-      struct _Rep_base
-      {
-	size_type		_M_length;
-	size_type		_M_capacity;
-	_Atomic_word		_M_refcount;
-      };
-
-      struct _Rep : _Rep_base
-      {
-	// Types:
-	typedef typename _Alloc::template rebind<char>::other _Raw_bytes_alloc;
-
-	// (Public) Data members:
-
-	// The maximum number of individual char_type elements of an
-	// individual string is determined by _S_max_size. This is the
-	// value that will be returned by max_size().  (Whereas npos
-	// is the maximum number of bytes the allocator can allocate.)
-	// If one was to divvy up the theoretical largest size string,
-	// with a terminating character and m _CharT elements, it'd
-	// look like this:
-	// npos = sizeof(_Rep) + (m * sizeof(_CharT)) + sizeof(_CharT)
-	// Solving for m:
-	// m = ((npos - sizeof(_Rep))/sizeof(CharT)) - 1
-	// In addition, this implementation quarters this amount.
-	static const size_type	_S_max_size;
-	static const _CharT	_S_terminal;
-
-	// The following storage is init'd to 0 by the linker, resulting
-        // (carefully) in an empty string with one reference.
-        static size_type _S_empty_rep_storage[];
-
-        static _Rep&
-        _S_empty_rep() _GLIBCXX_NOEXCEPT
-        { 
-	  // NB: Mild hack to avoid strict-aliasing warnings.  Note that
-	  // _S_empty_rep_storage is never modified and the punning should
-	  // be reasonably safe in this case.
-	  void* __p = reinterpret_cast<void*>(&_S_empty_rep_storage);
-	  return *reinterpret_cast<_Rep*>(__p);
-	}
-
-        bool
-	_M_is_leaked() const _GLIBCXX_NOEXCEPT
-        { return this->_M_refcount < 0; }
-
-        bool
-	_M_is_shared() const _GLIBCXX_NOEXCEPT
-        { return this->_M_refcount > 0; }
-
-        void
-	_M_set_leaked() _GLIBCXX_NOEXCEPT
-        { this->_M_refcount = -1; }
-
-        void
-	_M_set_sharable() _GLIBCXX_NOEXCEPT
-        { this->_M_refcount = 0; }
-
-	void
-	_M_set_length_and_sharable(size_type __n) _GLIBCXX_NOEXCEPT
-	{
-#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0
-	  if (__builtin_expect(this != &_S_empty_rep(), false))
-#endif
-	    {
-	      this->_M_set_sharable();  // One reference.
-	      this->_M_length = __n;
-	      traits_type::assign(this->_M_refdata()[__n], _S_terminal);
-	      // grrr. (per 21.3.4)
-	      // You cannot leave those LWG people alone for a second.
-	    }
-	}
-
-	_CharT*
-	_M_refdata() throw()
-	{ return reinterpret_cast<_CharT*>(this + 1); }
-
-	_CharT*
-	_M_grab(const _Alloc& __alloc1, const _Alloc& __alloc2)
-	{
-	  return (!_M_is_leaked() && __alloc1 == __alloc2)
-	          ? _M_refcopy() : _M_clone(__alloc1);
-	}
-
-	// Create & Destroy
-	static _Rep*
-	_S_create(size_type, size_type, const _Alloc&);
-
-	void
-	_M_dispose(const _Alloc& __a) _GLIBCXX_NOEXCEPT
-	{
-#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0
-	  if (__builtin_expect(this != &_S_empty_rep(), false))
-#endif
-	    {
-	      // Be race-detector-friendly.  For more info see bits/c++config.
-	      _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&this->_M_refcount);
-	      if (__gnu_cxx::__exchange_and_add_dispatch(&this->_M_refcount,
-							 -1) <= 0)
-		{
-		  _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&this->_M_refcount);
-		  _M_destroy(__a);
-		}
-	    }
-	}  // XXX MT
-
-	void
-	_M_destroy(const _Alloc&) throw();
-
-	_CharT*
-	_M_refcopy() throw()
-	{
-#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0
-	  if (__builtin_expect(this != &_S_empty_rep(), false))
-#endif
-            __gnu_cxx::__atomic_add_dispatch(&this->_M_refcount, 1);
-	  return _M_refdata();
-	}  // XXX MT
-
-	_CharT*
-	_M_clone(const _Alloc&, size_type __res = 0);
-      };
-
-      // Use empty-base optimization: http://www.cantrip.org/emptyopt.html
-      struct _Alloc_hider : _Alloc
-      {
-	_Alloc_hider(_CharT* __dat, const _Alloc& __a) _GLIBCXX_NOEXCEPT
-	: _Alloc(__a), _M_p(__dat) { }
-
-	_CharT* _M_p; // The actual data.
-      };
-
-    public:
-      // Data Members (public):
-      // NB: This is an unsigned type, and thus represents the maximum
-      // size that the allocator can hold.
-      ///  Value returned by various member functions when they fail.
-      static const size_type	npos = static_cast<size_type>(-1);
-
-    private:
-      // Data Members (private):
-      mutable _Alloc_hider	_M_dataplus;
-
-      _CharT*
-      _M_data() const _GLIBCXX_NOEXCEPT
-      { return  _M_dataplus._M_p; }
-
-      _CharT*
-      _M_data(_CharT* __p) _GLIBCXX_NOEXCEPT
-      { return (_M_dataplus._M_p = __p); }
-
-      _Rep*
-      _M_rep() const _GLIBCXX_NOEXCEPT
-      { return &((reinterpret_cast<_Rep*> (_M_data()))[-1]); }
-
-      // For the internal use we have functions similar to `begin'/`end'
-      // but they do not call _M_leak.
-      iterator
-      _M_ibegin() const _GLIBCXX_NOEXCEPT
-      { return iterator(_M_data()); }
-
-      iterator
-      _M_iend() const _GLIBCXX_NOEXCEPT
-      { return iterator(_M_data() + this->size()); }
-
-      void
-      _M_leak()    // for use in begin() & non-const op[]
-      {
-	if (!_M_rep()->_M_is_leaked())
-	  _M_leak_hard();
-      }
-
-      size_type
-      _M_check(size_type __pos, const char* __s) const
-      {
-	if (__pos > this->size())
-	  __throw_out_of_range_fmt(__N("%s: __pos (which is %zu) > "
-				       "this->size() (which is %zu)"),
-				   __s, __pos, this->size());
-	return __pos;
-      }
-
-      void
-      _M_check_length(size_type __n1, size_type __n2, const char* __s) const
-      {
-	if (this->max_size() - (this->size() - __n1) < __n2)
-	  __throw_length_error(__N(__s));
-      }
-
-      // NB: _M_limit doesn't check for a bad __pos value.
-      size_type
-      _M_limit(size_type __pos, size_type __off) const _GLIBCXX_NOEXCEPT
-      {
-	const bool __testoff =  __off < this->size() - __pos;
-	return __testoff ? __off : this->size() - __pos;
-      }
-
-      // True if _Rep and source do not overlap.
-      bool
-      _M_disjunct(const _CharT* __s) const _GLIBCXX_NOEXCEPT
-      {
-	return (less<const _CharT*>()(__s, _M_data())
-		|| less<const _CharT*>()(_M_data() + this->size(), __s));
-      }
-
-      // When __n = 1 way faster than the general multichar
-      // traits_type::copy/move/assign.
-      static void
-      _M_copy(_CharT* __d, const _CharT* __s, size_type __n) _GLIBCXX_NOEXCEPT
-      {
-	if (__n == 1)
-	  traits_type::assign(*__d, *__s);
-	else
-	  traits_type::copy(__d, __s, __n);
-      }
-
-      static void
-      _M_move(_CharT* __d, const _CharT* __s, size_type __n) _GLIBCXX_NOEXCEPT
-      {
-	if (__n == 1)
-	  traits_type::assign(*__d, *__s);
-	else
-	  traits_type::move(__d, __s, __n);	  
-      }
-
-      static void
-      _M_assign(_CharT* __d, size_type __n, _CharT __c) _GLIBCXX_NOEXCEPT
-      {
-	if (__n == 1)
-	  traits_type::assign(*__d, __c);
-	else
-	  traits_type::assign(__d, __n, __c);	  
-      }
-
-      // _S_copy_chars is a separate template to permit specialization
-      // to optimize for the common case of pointers as iterators.
-      template<class _Iterator>
-        static void
-        _S_copy_chars(_CharT* __p, _Iterator __k1, _Iterator __k2)
-        {
-	  for (; __k1 != __k2; ++__k1, ++__p)
-	    traits_type::assign(*__p, *__k1); // These types are off.
-	}
-
-      static void
-      _S_copy_chars(_CharT* __p, iterator __k1, iterator __k2) _GLIBCXX_NOEXCEPT
-      { _S_copy_chars(__p, __k1.base(), __k2.base()); }
-
-      static void
-      _S_copy_chars(_CharT* __p, const_iterator __k1, const_iterator __k2)
-      _GLIBCXX_NOEXCEPT
-      { _S_copy_chars(__p, __k1.base(), __k2.base()); }
-
-      static void
-      _S_copy_chars(_CharT* __p, _CharT* __k1, _CharT* __k2) _GLIBCXX_NOEXCEPT
-      { _M_copy(__p, __k1, __k2 - __k1); }
-
-      static void
-      _S_copy_chars(_CharT* __p, const _CharT* __k1, const _CharT* __k2)
-      _GLIBCXX_NOEXCEPT
-      { _M_copy(__p, __k1, __k2 - __k1); }
-
-      static int
-      _S_compare(size_type __n1, size_type __n2) _GLIBCXX_NOEXCEPT
-      {
-	const difference_type __d = difference_type(__n1 - __n2);
-
-	if (__d > __gnu_cxx::__numeric_traits<int>::__max)
-	  return __gnu_cxx::__numeric_traits<int>::__max;
-	else if (__d < __gnu_cxx::__numeric_traits<int>::__min)
-	  return __gnu_cxx::__numeric_traits<int>::__min;
-	else
-	  return int(__d);
-      }
-
-      void
-      _M_mutate(size_type __pos, size_type __len1, size_type __len2);
-
-      void
-      _M_leak_hard();
-
-      static _Rep&
-      _S_empty_rep() _GLIBCXX_NOEXCEPT
-      { return _Rep::_S_empty_rep(); }
-
-    public:
-      // Construct/copy/destroy:
-      // NB: We overload ctors in some cases instead of using default
-      // arguments, per 17.4.4.4 para. 2 item 2.
-
-      /**
-       *  @brief  Default constructor creates an empty string.
-       */
-      basic_string()
-#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0
-      : _M_dataplus(_S_empty_rep()._M_refdata(), _Alloc()) { }
-#else
-      : _M_dataplus(_S_construct(size_type(), _CharT(), _Alloc()), _Alloc()){ }
-#endif
-
-      /**
-       *  @brief  Construct an empty string using allocator @a a.
-       */
-      explicit
-      basic_string(const _Alloc& __a);
-
-      // NB: per LWG issue 42, semantics different from IS:
-      /**
-       *  @brief  Construct string with copy of value of @a str.
-       *  @param  __str  Source string.
-       */
-      basic_string(const basic_string& __str);
-      /**
-       *  @brief  Construct string as copy of a substring.
-       *  @param  __str  Source string.
-       *  @param  __pos  Index of first character to copy from.
-       *  @param  __n  Number of characters to copy (default remainder).
-       */
-      basic_string(const basic_string& __str, size_type __pos,
-		   size_type __n = npos);
-      /**
-       *  @brief  Construct string as copy of a substring.
-       *  @param  __str  Source string.
-       *  @param  __pos  Index of first character to copy from.
-       *  @param  __n  Number of characters to copy.
-       *  @param  __a  Allocator to use.
-       */
-      basic_string(const basic_string& __str, size_type __pos,
-		   size_type __n, const _Alloc& __a);
-
-      /**
-       *  @brief  Construct string initialized by a character %array.
-       *  @param  __s  Source character %array.
-       *  @param  __n  Number of characters to copy.
-       *  @param  __a  Allocator to use (default is default allocator).
-       *
-       *  NB: @a __s must have at least @a __n characters, &apos;\\0&apos;
-       *  has no special meaning.
-       */
-      basic_string(const _CharT* __s, size_type __n,
-		   const _Alloc& __a = _Alloc());
-      /**
-       *  @brief  Construct string as copy of a C string.
-       *  @param  __s  Source C string.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-      basic_string(const _CharT* __s, const _Alloc& __a = _Alloc());
-      /**
-       *  @brief  Construct string as multiple characters.
-       *  @param  __n  Number of characters.
-       *  @param  __c  Character to use.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-      basic_string(size_type __n, _CharT __c, const _Alloc& __a = _Alloc());
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Move construct string.
-       *  @param  __str  Source string.
-       *
-       *  The newly-created string contains the exact contents of @a __str.
-       *  @a __str is a valid, but unspecified string.
-       **/
-      basic_string(basic_string&& __str)
-#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0
-      noexcept // FIXME C++11: should always be noexcept.
-#endif
-      : _M_dataplus(__str._M_dataplus)
-      {
-#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0
-	__str._M_data(_S_empty_rep()._M_refdata());
-#else
-	__str._M_data(_S_construct(size_type(), _CharT(), get_allocator()));
-#endif
-      }
-
-      /**
-       *  @brief  Construct string from an initializer %list.
-       *  @param  __l  std::initializer_list of characters.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-      basic_string(initializer_list<_CharT> __l, const _Alloc& __a = _Alloc());
-#endif // C++11
-
-      /**
-       *  @brief  Construct string as copy of a range.
-       *  @param  __beg  Start of range.
-       *  @param  __end  End of range.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-      template<class _InputIterator>
-        basic_string(_InputIterator __beg, _InputIterator __end,
-		     const _Alloc& __a = _Alloc());
-
-      /**
-       *  @brief  Destroy the string instance.
-       */
-      ~basic_string() _GLIBCXX_NOEXCEPT
-      { _M_rep()->_M_dispose(this->get_allocator()); }
-
-      /**
-       *  @brief  Assign the value of @a str to this string.
-       *  @param  __str  Source string.
-       */
-      basic_string&
-      operator=(const basic_string& __str) 
-      { return this->assign(__str); }
-
-      /**
-       *  @brief  Copy contents of @a s into this string.
-       *  @param  __s  Source null-terminated string.
-       */
-      basic_string&
-      operator=(const _CharT* __s) 
-      { return this->assign(__s); }
-
-      /**
-       *  @brief  Set value to string of length 1.
-       *  @param  __c  Source character.
-       *
-       *  Assigning to a character makes this string length 1 and
-       *  (*this)[0] == @a c.
-       */
-      basic_string&
-      operator=(_CharT __c) 
-      { 
-	this->assign(1, __c); 
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Move assign the value of @a str to this string.
-       *  @param  __str  Source string.
-       *
-       *  The contents of @a str are moved into this string (without copying).
-       *  @a str is a valid, but unspecified string.
-       **/
-      // PR 58265, this should be noexcept.
-      basic_string&
-      operator=(basic_string&& __str)
-      {
-	// NB: DR 1204.
-	this->swap(__str);
-	return *this;
-      }
-
-      /**
-       *  @brief  Set value to string constructed from initializer %list.
-       *  @param  __l  std::initializer_list.
-       */
-      basic_string&
-      operator=(initializer_list<_CharT> __l)
-      {
-	this->assign(__l.begin(), __l.size());
-	return *this;
-      }
-#endif // C++11
-
-      // Iterators:
-      /**
-       *  Returns a read/write iterator that points to the first character in
-       *  the %string.  Unshares the string.
-       */
-      iterator
-      begin() // FIXME C++11: should be noexcept.
-      {
-	_M_leak();
-	return iterator(_M_data());
-      }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  character in the %string.
-       */
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_M_data()); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  character in the %string.  Unshares the string.
-       */
-      iterator
-      end() // FIXME C++11: should be noexcept.
-      {
-	_M_leak();
-	return iterator(_M_data() + this->size());
-      }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the
-       *  last character in the %string.
-       */
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_M_data() + this->size()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last
-       *  character in the %string.  Iteration is done in reverse element
-       *  order.  Unshares the string.
-       */
-      reverse_iterator
-      rbegin() // FIXME C++11: should be noexcept.
-      { return reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last character in the %string.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one before the
-       *  first character in the %string.  Iteration is done in reverse
-       *  element order.  Unshares the string.
-       */
-      reverse_iterator
-      rend() // FIXME C++11: should be noexcept.
-      { return reverse_iterator(this->begin()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first character in the %string.  Iteration
-       *  is done in reverse element order.
-       */
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(this->begin()); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  character in the %string.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(this->_M_data()); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the
-       *  last character in the %string.
-       */
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(this->_M_data() + this->size()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last character in the %string.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first character in the %string.  Iteration
-       *  is done in reverse element order.
-       */
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(this->begin()); }
-#endif
-
-    public:
-      // Capacity:
-      ///  Returns the number of characters in the string, not including any
-      ///  null-termination.
-      size_type
-      size() const _GLIBCXX_NOEXCEPT
-      { return _M_rep()->_M_length; }
-
-      ///  Returns the number of characters in the string, not including any
-      ///  null-termination.
-      size_type
-      length() const _GLIBCXX_NOEXCEPT
-      { return _M_rep()->_M_length; }
-
-      ///  Returns the size() of the largest possible %string.
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return _Rep::_S_max_size; }
-
-      /**
-       *  @brief  Resizes the %string to the specified number of characters.
-       *  @param  __n  Number of characters the %string should contain.
-       *  @param  __c  Character to fill any new elements.
-       *
-       *  This function will %resize the %string to the specified
-       *  number of characters.  If the number is smaller than the
-       *  %string's current size the %string is truncated, otherwise
-       *  the %string is extended and new elements are %set to @a __c.
-       */
-      void
-      resize(size_type __n, _CharT __c);
-
-      /**
-       *  @brief  Resizes the %string to the specified number of characters.
-       *  @param  __n  Number of characters the %string should contain.
-       *
-       *  This function will resize the %string to the specified length.  If
-       *  the new size is smaller than the %string's current size the %string
-       *  is truncated, otherwise the %string is extended and new characters
-       *  are default-constructed.  For basic types such as char, this means
-       *  setting them to 0.
-       */
-      void
-      resize(size_type __n)
-      { this->resize(__n, _CharT()); }
-
-#if __cplusplus >= 201103L
-      ///  A non-binding request to reduce capacity() to size().
-      void
-      shrink_to_fit() _GLIBCXX_NOEXCEPT
-      {
-#if __cpp_exceptions
-	if (capacity() > size())
-	  {
-	    try
-	      { reserve(0); }
-	    catch(...)
-	      { }
-	  }
-#endif
-      }
-#endif
-
-      /**
-       *  Returns the total number of characters that the %string can hold
-       *  before needing to allocate more memory.
-       */
-      size_type
-      capacity() const _GLIBCXX_NOEXCEPT
-      { return _M_rep()->_M_capacity; }
-
-      /**
-       *  @brief  Attempt to preallocate enough memory for specified number of
-       *          characters.
-       *  @param  __res_arg  Number of characters required.
-       *  @throw  std::length_error  If @a __res_arg exceeds @c max_size().
-       *
-       *  This function attempts to reserve enough memory for the
-       *  %string to hold the specified number of characters.  If the
-       *  number requested is more than max_size(), length_error is
-       *  thrown.
-       *
-       *  The advantage of this function is that if optimal code is a
-       *  necessity and the user can determine the string length that will be
-       *  required, the user can reserve the memory in %advance, and thus
-       *  prevent a possible reallocation of memory and copying of %string
-       *  data.
-       */
-      void
-      reserve(size_type __res_arg = 0);
-
-      /**
-       *  Erases the string, making it empty.
-       */
-      // PR 56166: this should not throw.
-      void
-      clear()
-      { _M_mutate(0, this->size(), 0); }
-
-      /**
-       *  Returns true if the %string is empty.  Equivalent to 
-       *  <code>*this == ""</code>.
-       */
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return this->size() == 0; }
-
-      // Element access:
-      /**
-       *  @brief  Subscript access to the data contained in the %string.
-       *  @param  __pos  The index of the character to access.
-       *  @return  Read-only (constant) reference to the character.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      const_reference
-      operator[] (size_type __pos) const _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_ASSERT(__pos <= size());
-	return _M_data()[__pos];
-      }
-
-      /**
-       *  @brief  Subscript access to the data contained in the %string.
-       *  @param  __pos  The index of the character to access.
-       *  @return  Read/write reference to the character.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)  Unshares the string.
-       */
-      reference
-      operator[](size_type __pos)
-      {
-        // Allow pos == size() both in C++98 mode, as v3 extension,
-	// and in C++11 mode.
-	_GLIBCXX_DEBUG_ASSERT(__pos <= size());
-        // In pedantic mode be strict in C++98 mode.
-	_GLIBCXX_DEBUG_PEDASSERT(__cplusplus >= 201103L || __pos < size());
-	_M_leak();
-	return _M_data()[__pos];
-      }
-
-      /**
-       *  @brief  Provides access to the data contained in the %string.
-       *  @param __n The index of the character to access.
-       *  @return  Read-only (const) reference to the character.
-       *  @throw  std::out_of_range  If @a n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter is
-       *  first checked that it is in the range of the string.  The function
-       *  throws out_of_range if the check fails.
-       */
-      const_reference
-      at(size_type __n) const
-      {
-	if (__n >= this->size())
-	  __throw_out_of_range_fmt(__N("basic_string::at: __n "
-				       "(which is %zu) >= this->size() "
-				       "(which is %zu)"),
-				   __n, this->size());
-	return _M_data()[__n];
-      }
-
-      /**
-       *  @brief  Provides access to the data contained in the %string.
-       *  @param __n The index of the character to access.
-       *  @return  Read/write reference to the character.
-       *  @throw  std::out_of_range  If @a n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter is
-       *  first checked that it is in the range of the string.  The function
-       *  throws out_of_range if the check fails.  Success results in
-       *  unsharing the string.
-       */
-      reference
-      at(size_type __n)
-      {
-	if (__n >= size())
-	  __throw_out_of_range_fmt(__N("basic_string::at: __n "
-				       "(which is %zu) >= this->size() "
-				       "(which is %zu)"),
-				   __n, this->size());
-	_M_leak();
-	return _M_data()[__n];
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %string.
-       */
-      reference
-      front()
-      { return operator[](0); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %string.
-       */
-      const_reference
-      front() const _GLIBCXX_NOEXCEPT
-      { return operator[](0); }
-
-      /**
-       *  Returns a read/write reference to the data at the last
-       *  element of the %string.
-       */
-      reference
-      back()
-      { return operator[](this->size() - 1); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the
-       *  last element of the %string.
-       */
-      const_reference
-      back() const _GLIBCXX_NOEXCEPT
-      { return operator[](this->size() - 1); }
-#endif
-
-      // Modifiers:
-      /**
-       *  @brief  Append a string to this string.
-       *  @param __str  The string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(const basic_string& __str)
-      { return this->append(__str); }
-
-      /**
-       *  @brief  Append a C string.
-       *  @param __s  The C string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(const _CharT* __s)
-      { return this->append(__s); }
-
-      /**
-       *  @brief  Append a character.
-       *  @param __c  The character to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(_CharT __c)
-      { 
-	this->push_back(__c);
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Append an initializer_list of characters.
-       *  @param __l  The initializer_list of characters to be appended.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(initializer_list<_CharT> __l)
-      { return this->append(__l.begin(), __l.size()); }
-#endif // C++11
-
-      /**
-       *  @brief  Append a string to this string.
-       *  @param __str  The string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(const basic_string& __str);
-
-      /**
-       *  @brief  Append a substring.
-       *  @param __str  The string to append.
-       *  @param __pos  Index of the first character of str to append.
-       *  @param __n  The number of characters to append.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range if @a __pos is not a valid index.
-       *
-       *  This function appends @a __n characters from @a __str
-       *  starting at @a __pos to this string.  If @a __n is is larger
-       *  than the number of available characters in @a __str, the
-       *  remainder of @a __str is appended.
-       */
-      basic_string&
-      append(const basic_string& __str, size_type __pos, size_type __n);
-
-      /**
-       *  @brief  Append a C substring.
-       *  @param __s  The C string to append.
-       *  @param __n  The number of characters to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(const _CharT* __s, size_type __n);
-
-      /**
-       *  @brief  Append a C string.
-       *  @param __s  The C string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->append(__s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Append multiple characters.
-       *  @param __n  The number of characters to append.
-       *  @param __c  The character to use.
-       *  @return  Reference to this string.
-       *
-       *  Appends __n copies of __c to this string.
-       */
-      basic_string&
-      append(size_type __n, _CharT __c);
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Append an initializer_list of characters.
-       *  @param __l  The initializer_list of characters to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(initializer_list<_CharT> __l)
-      { return this->append(__l.begin(), __l.size()); }
-#endif // C++11
-
-      /**
-       *  @brief  Append a range of characters.
-       *  @param __first  Iterator referencing the first character to append.
-       *  @param __last  Iterator marking the end of the range.
-       *  @return  Reference to this string.
-       *
-       *  Appends characters in the range [__first,__last) to this string.
-       */
-      template<class _InputIterator>
-        basic_string&
-        append(_InputIterator __first, _InputIterator __last)
-        { return this->replace(_M_iend(), _M_iend(), __first, __last); }
-
-      /**
-       *  @brief  Append a single character.
-       *  @param __c  Character to append.
-       */
-      void
-      push_back(_CharT __c)
-      { 
-	const size_type __len = 1 + this->size();
-	if (__len > this->capacity() || _M_rep()->_M_is_shared())
-	  this->reserve(__len);
-	traits_type::assign(_M_data()[this->size()], __c);
-	_M_rep()->_M_set_length_and_sharable(__len);
-      }
-
-      /**
-       *  @brief  Set value to contents of another string.
-       *  @param  __str  Source string to use.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      assign(const basic_string& __str);
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Set value to contents of another string.
-       *  @param  __str  Source string to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets this string to the exact contents of @a __str.
-       *  @a __str is a valid, but unspecified string.
-       */
-      // PR 58265, this should be noexcept.
-      basic_string&
-      assign(basic_string&& __str)
-      {
-	this->swap(__str);
-	return *this;
-      }
-#endif // C++11
-
-      /**
-       *  @brief  Set value to a substring of a string.
-       *  @param __str  The string to use.
-       *  @param __pos  Index of the first character of str.
-       *  @param __n  Number of characters to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range if @a pos is not a valid index.
-       *
-       *  This function sets this string to the substring of @a __str
-       *  consisting of @a __n characters at @a __pos.  If @a __n is
-       *  is larger than the number of available characters in @a
-       *  __str, the remainder of @a __str is used.
-       */
-      basic_string&
-      assign(const basic_string& __str, size_type __pos, size_type __n)
-      { return this->assign(__str._M_data()
-			    + __str._M_check(__pos, "basic_string::assign"),
-			    __str._M_limit(__pos, __n)); }
-
-      /**
-       *  @brief  Set value to a C substring.
-       *  @param __s  The C string to use.
-       *  @param __n  Number of characters to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to the first @a __n
-       *  characters of @a __s.  If @a __n is is larger than the number of
-       *  available characters in @a __s, the remainder of @a __s is used.
-       */
-      basic_string&
-      assign(const _CharT* __s, size_type __n);
-
-      /**
-       *  @brief  Set value to contents of a C string.
-       *  @param __s  The C string to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to the value of @a __s.
-       *  The data is copied, so there is no dependence on @a __s once the
-       *  function returns.
-       */
-      basic_string&
-      assign(const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->assign(__s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Set value to multiple characters.
-       *  @param __n  Length of the resulting string.
-       *  @param __c  The character to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to @a __n copies of
-       *  character @a __c.
-       */
-      basic_string&
-      assign(size_type __n, _CharT __c)
-      { return _M_replace_aux(size_type(0), this->size(), __n, __c); }
-
-      /**
-       *  @brief  Set value to a range of characters.
-       *  @param __first  Iterator referencing the first character to append.
-       *  @param __last  Iterator marking the end of the range.
-       *  @return  Reference to this string.
-       *
-       *  Sets value of string to characters in the range [__first,__last).
-      */
-      template<class _InputIterator>
-        basic_string&
-        assign(_InputIterator __first, _InputIterator __last)
-        { return this->replace(_M_ibegin(), _M_iend(), __first, __last); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Set value to an initializer_list of characters.
-       *  @param __l  The initializer_list of characters to assign.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      assign(initializer_list<_CharT> __l)
-      { return this->assign(__l.begin(), __l.size()); }
-#endif // C++11
-
-      /**
-       *  @brief  Insert multiple characters.
-       *  @param __p  Iterator referencing location in string to insert at.
-       *  @param __n  Number of characters to insert
-       *  @param __c  The character to insert.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts @a __n copies of character @a __c starting at the
-       *  position referenced by iterator @a __p.  If adding
-       *  characters causes the length to exceed max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      void
-      insert(iterator __p, size_type __n, _CharT __c)
-      {	this->replace(__p, __p, __n, __c);  }
-
-      /**
-       *  @brief  Insert a range of characters.
-       *  @param __p  Iterator referencing location in string to insert at.
-       *  @param __beg  Start of range.
-       *  @param __end  End of range.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts characters in range [__beg,__end).  If adding
-       *  characters causes the length to exceed max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      template<class _InputIterator>
-        void
-        insert(iterator __p, _InputIterator __beg, _InputIterator __end)
-        { this->replace(__p, __p, __beg, __end); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert an initializer_list of characters.
-       *  @param __p  Iterator referencing location in string to insert at.
-       *  @param __l  The initializer_list of characters to insert.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       */
-      void
-      insert(iterator __p, initializer_list<_CharT> __l)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
-	this->insert(__p - _M_ibegin(), __l.begin(), __l.size());
-      }
-#endif // C++11
-
-      /**
-       *  @brief  Insert value of a string.
-       *  @param __pos1  Iterator referencing location in string to insert at.
-       *  @param __str  The string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts value of @a __str starting at @a __pos1.  If adding
-       *  characters causes the length to exceed max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      basic_string&
-      insert(size_type __pos1, const basic_string& __str)
-      { return this->insert(__pos1, __str, size_type(0), __str.size()); }
-
-      /**
-       *  @brief  Insert a substring.
-       *  @param __pos1  Iterator referencing location in string to insert at.
-       *  @param __str  The string to insert.
-       *  @param __pos2  Start of characters in str to insert.
-       *  @param __n  Number of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a pos1 > size() or
-       *  @a __pos2 > @a str.size().
-       *
-       *  Starting at @a pos1, insert @a __n character of @a __str
-       *  beginning with @a __pos2.  If adding characters causes the
-       *  length to exceed max_size(), length_error is thrown.  If @a
-       *  __pos1 is beyond the end of this string or @a __pos2 is
-       *  beyond the end of @a __str, out_of_range is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      insert(size_type __pos1, const basic_string& __str,
-	     size_type __pos2, size_type __n)
-      { return this->insert(__pos1, __str._M_data()
-			    + __str._M_check(__pos2, "basic_string::insert"),
-			    __str._M_limit(__pos2, __n)); }
-
-      /**
-       *  @brief  Insert a C substring.
-       *  @param __pos  Iterator referencing location in string to insert at.
-       *  @param __s  The C string to insert.
-       *  @param __n  The number of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a __pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts the first @a __n characters of @a __s starting at @a
-       *  __pos.  If adding characters causes the length to exceed
-       *  max_size(), length_error is thrown.  If @a __pos is beyond
-       *  end(), out_of_range is thrown.  The value of the string
-       *  doesn't change if an error is thrown.
-      */
-      basic_string&
-      insert(size_type __pos, const _CharT* __s, size_type __n);
-
-      /**
-       *  @brief  Insert a C string.
-       *  @param __pos  Iterator referencing location in string to insert at.
-       *  @param __s  The C string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts the first @a n characters of @a __s starting at @a __pos.  If
-       *  adding characters causes the length to exceed max_size(),
-       *  length_error is thrown.  If @a __pos is beyond end(), out_of_range is
-       *  thrown.  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      basic_string&
-      insert(size_type __pos, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->insert(__pos, __s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Insert multiple characters.
-       *  @param __pos  Index in string to insert at.
-       *  @param __n  Number of characters to insert
-       *  @param __c  The character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a __pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts @a __n copies of character @a __c starting at index
-       *  @a __pos.  If adding characters causes the length to exceed
-       *  max_size(), length_error is thrown.  If @a __pos > length(),
-       *  out_of_range is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      basic_string&
-      insert(size_type __pos, size_type __n, _CharT __c)
-      { return _M_replace_aux(_M_check(__pos, "basic_string::insert"),
-			      size_type(0), __n, __c); }
-
-      /**
-       *  @brief  Insert one character.
-       *  @param __p  Iterator referencing position in string to insert at.
-       *  @param __c  The character to insert.
-       *  @return  Iterator referencing newly inserted char.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts character @a __c at position referenced by @a __p.
-       *  If adding character causes the length to exceed max_size(),
-       *  length_error is thrown.  If @a __p is beyond end of string,
-       *  out_of_range is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      iterator
-      insert(iterator __p, _CharT __c)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
-	const size_type __pos = __p - _M_ibegin();
-	_M_replace_aux(__pos, size_type(0), size_type(1), __c);
-	_M_rep()->_M_set_leaked();
-	return iterator(_M_data() + __pos);
-      }
-
-      /**
-       *  @brief  Remove characters.
-       *  @param __pos  Index of first character to remove (default 0).
-       *  @param __n  Number of characters to remove (default remainder).
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *
-       *  Removes @a __n characters from this string starting at @a
-       *  __pos.  The length of the string is reduced by @a __n.  If
-       *  there are < @a __n characters to remove, the remainder of
-       *  the string is truncated.  If @a __p is beyond end of string,
-       *  out_of_range is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      basic_string&
-      erase(size_type __pos = 0, size_type __n = npos)
-      { 
-	_M_mutate(_M_check(__pos, "basic_string::erase"),
-		  _M_limit(__pos, __n), size_type(0));
-	return *this;
-      }
-
-      /**
-       *  @brief  Remove one character.
-       *  @param __position  Iterator referencing the character to remove.
-       *  @return  iterator referencing same location after removal.
-       *
-       *  Removes the character at @a __position from this string. The value
-       *  of the string doesn't change if an error is thrown.
-      */
-      iterator
-      erase(iterator __position)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__position >= _M_ibegin()
-				 && __position < _M_iend());
-	const size_type __pos = __position - _M_ibegin();
-	_M_mutate(__pos, size_type(1), size_type(0));
-	_M_rep()->_M_set_leaked();
-	return iterator(_M_data() + __pos);
-      }
-
-      /**
-       *  @brief  Remove a range of characters.
-       *  @param __first  Iterator referencing the first character to remove.
-       *  @param __last  Iterator referencing the end of the range.
-       *  @return  Iterator referencing location of first after removal.
-       *
-       *  Removes the characters in the range [first,last) from this string.
-       *  The value of the string doesn't change if an error is thrown.
-      */
-      iterator
-      erase(iterator __first, iterator __last);
- 
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Remove the last character.
-       *
-       *  The string must be non-empty.
-       */
-      void
-      pop_back() // FIXME C++11: should be noexcept.
-      { erase(size()-1, 1); }
-#endif // C++11
-
-      /**
-       *  @brief  Replace characters with value from another string.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n  Number of characters to be replaced.
-       *  @param __str  String to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__pos,__pos+__n) from
-       *  this string.  In place, the value of @a __str is inserted.
-       *  If @a __pos is beyond end of string, out_of_range is thrown.
-       *  If the length of the result exceeds max_size(), length_error
-       *  is thrown.  The value of the string doesn't change if an
-       *  error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n, const basic_string& __str)
-      { return this->replace(__pos, __n, __str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Replace characters with value from another string.
-       *  @param __pos1  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __str  String to insert.
-       *  @param __pos2  Index of first character of str to use.
-       *  @param __n2  Number of characters from str to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a __pos1 > size() or @a __pos2 >
-       *  __str.size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__pos1,__pos1 + n) from this
-       *  string.  In place, the value of @a __str is inserted.  If @a __pos is
-       *  beyond end of string, out_of_range is thrown.  If the length of the
-       *  result exceeds max_size(), length_error is thrown.  The value of the
-       *  string doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos1, size_type __n1, const basic_string& __str,
-	      size_type __pos2, size_type __n2)
-      { return this->replace(__pos1, __n1, __str._M_data()
-			     + __str._M_check(__pos2, "basic_string::replace"),
-			     __str._M_limit(__pos2, __n2)); }
-
-      /**
-       *  @brief  Replace characters with value of a C substring.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __s  C string to insert.
-       *  @param __n2  Number of characters from @a s to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos1 > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__pos,__pos + __n1)
-       *  from this string.  In place, the first @a __n2 characters of
-       *  @a __s are inserted, or all of @a __s if @a __n2 is too large.  If
-       *  @a __pos is beyond end of string, out_of_range is thrown.  If
-       *  the length of result exceeds max_size(), length_error is
-       *  thrown.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n1, const _CharT* __s,
-	      size_type __n2);
-
-      /**
-       *  @brief  Replace characters with value of a C string.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __s  C string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__pos,__pos + __n1)
-       *  from this string.  In place, the characters of @a __s are
-       *  inserted.  If @a __pos is beyond end of string, out_of_range
-       *  is thrown.  If the length of result exceeds max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n1, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->replace(__pos, __n1, __s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Replace characters with multiple characters.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __n2  Number of characters to insert.
-       *  @param __c  Character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a __pos > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos,pos + n1) from this
-       *  string.  In place, @a __n2 copies of @a __c are inserted.
-       *  If @a __pos is beyond end of string, out_of_range is thrown.
-       *  If the length of result exceeds max_size(), length_error is
-       *  thrown.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n1, size_type __n2, _CharT __c)
-      { return _M_replace_aux(_M_check(__pos, "basic_string::replace"),
-			      _M_limit(__pos, __n1), __n2, __c); }
-
-      /**
-       *  @brief  Replace range of characters with string.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __str  String value to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  the value of @a __str is inserted.  If the length of result
-       *  exceeds max_size(), length_error is thrown.  The value of
-       *  the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(iterator __i1, iterator __i2, const basic_string& __str)
-      { return this->replace(__i1, __i2, __str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Replace range of characters with C substring.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __s  C string value to insert.
-       *  @param __n  Number of characters from s to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  the first @a __n characters of @a __s are inserted.  If the
-       *  length of result exceeds max_size(), length_error is thrown.
-       *  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      basic_string&
-      replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1, __s, __n);
-      }
-
-      /**
-       *  @brief  Replace range of characters with C string.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __s  C string value to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  the characters of @a __s are inserted.  If the length of
-       *  result exceeds max_size(), length_error is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(iterator __i1, iterator __i2, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->replace(__i1, __i2, __s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Replace range of characters with multiple characters
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __n  Number of characters to insert.
-       *  @param __c  Character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  @a __n copies of @a __c are inserted.  If the length of
-       *  result exceeds max_size(), length_error is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(iterator __i1, iterator __i2, size_type __n, _CharT __c)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __c);
-      }
-
-      /**
-       *  @brief  Replace range of characters with range.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __k1  Iterator referencing start of range to insert.
-       *  @param __k2  Iterator referencing end of range to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  characters in the range [__k1,__k2) are inserted.  If the
-       *  length of result exceeds max_size(), length_error is thrown.
-       *  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      template<class _InputIterator>
-        basic_string&
-        replace(iterator __i1, iterator __i2,
-		_InputIterator __k1, _InputIterator __k2)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				   && __i2 <= _M_iend());
-	  __glibcxx_requires_valid_range(__k1, __k2);
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  return _M_replace_dispatch(__i1, __i2, __k1, __k2, _Integral());
-	}
-
-      // Specializations for the common case of pointer and iterator:
-      // useful to avoid the overhead of temporary buffering in _M_replace.
-      basic_string&
-      replace(iterator __i1, iterator __i2, _CharT* __k1, _CharT* __k2)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			     __k1, __k2 - __k1);
-      }
-
-      basic_string&
-      replace(iterator __i1, iterator __i2,
-	      const _CharT* __k1, const _CharT* __k2)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			     __k1, __k2 - __k1);
-      }
-
-      basic_string&
-      replace(iterator __i1, iterator __i2, iterator __k1, iterator __k2)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			     __k1.base(), __k2 - __k1);
-      }
-
-      basic_string&
-      replace(iterator __i1, iterator __i2,
-	      const_iterator __k1, const_iterator __k2)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			     __k1.base(), __k2 - __k1);
-      }
-      
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Replace range of characters with initializer_list.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __l  The initializer_list of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [__i1,__i2).  In place,
-       *  characters in the range [__k1,__k2) are inserted.  If the
-       *  length of result exceeds max_size(), length_error is thrown.
-       *  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      basic_string& replace(iterator __i1, iterator __i2,
-			    initializer_list<_CharT> __l)
-      { return this->replace(__i1, __i2, __l.begin(), __l.end()); }
-#endif // C++11
-
-    private:
-      template<class _Integer>
-	basic_string&
-	_M_replace_dispatch(iterator __i1, iterator __i2, _Integer __n,
-			    _Integer __val, __true_type)
-        { return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __val); }
-
-      template<class _InputIterator>
-	basic_string&
-	_M_replace_dispatch(iterator __i1, iterator __i2, _InputIterator __k1,
-			    _InputIterator __k2, __false_type);
-
-      basic_string&
-      _M_replace_aux(size_type __pos1, size_type __n1, size_type __n2,
-		     _CharT __c);
-
-      basic_string&
-      _M_replace_safe(size_type __pos1, size_type __n1, const _CharT* __s,
-		      size_type __n2);
-
-      // _S_construct_aux is used to implement the 21.3.1 para 15 which
-      // requires special behaviour if _InIter is an integral type
-      template<class _InIterator>
-        static _CharT*
-        _S_construct_aux(_InIterator __beg, _InIterator __end,
-			 const _Alloc& __a, __false_type)
-	{
-          typedef typename iterator_traits<_InIterator>::iterator_category _Tag;
-          return _S_construct(__beg, __end, __a, _Tag());
-	}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<class _Integer>
-        static _CharT*
-        _S_construct_aux(_Integer __beg, _Integer __end,
-			 const _Alloc& __a, __true_type)
-        { return _S_construct_aux_2(static_cast<size_type>(__beg),
-				    __end, __a); }
-
-      static _CharT*
-      _S_construct_aux_2(size_type __req, _CharT __c, const _Alloc& __a)
-      { return _S_construct(__req, __c, __a); }
-
-      template<class _InIterator>
-        static _CharT*
-        _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a)
-	{
-	  typedef typename std::__is_integer<_InIterator>::__type _Integral;
-	  return _S_construct_aux(__beg, __end, __a, _Integral());
-        }
-
-      // For Input Iterators, used in istreambuf_iterators, etc.
-      template<class _InIterator>
-        static _CharT*
-         _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
-		      input_iterator_tag);
-
-      // For forward_iterators up to random_access_iterators, used for
-      // string::iterator, _CharT*, etc.
-      template<class _FwdIterator>
-        static _CharT*
-        _S_construct(_FwdIterator __beg, _FwdIterator __end, const _Alloc& __a,
-		     forward_iterator_tag);
-
-      static _CharT*
-      _S_construct(size_type __req, _CharT __c, const _Alloc& __a);
-
-    public:
-
-      /**
-       *  @brief  Copy substring into C string.
-       *  @param __s  C string to copy value into.
-       *  @param __n  Number of characters to copy.
-       *  @param __pos  Index of first character to copy.
-       *  @return  Number of characters actually copied
-       *  @throw  std::out_of_range  If __pos > size().
-       *
-       *  Copies up to @a __n characters starting at @a __pos into the
-       *  C string @a __s.  If @a __pos is %greater than size(),
-       *  out_of_range is thrown.
-      */
-      size_type
-      copy(_CharT* __s, size_type __n, size_type __pos = 0) const;
-
-      /**
-       *  @brief  Swap contents with another string.
-       *  @param __s  String to swap with.
-       *
-       *  Exchanges the contents of this string with that of @a __s in constant
-       *  time.
-      */
-      // PR 58265, this should be noexcept.
-      void
-      swap(basic_string& __s);
-
-      // String operations:
-      /**
-       *  @brief  Return const pointer to null-terminated contents.
-       *
-       *  This is a handle to internal data.  Do not modify or dire things may
-       *  happen.
-      */
-      const _CharT*
-      c_str() const _GLIBCXX_NOEXCEPT
-      { return _M_data(); }
-
-      /**
-       *  @brief  Return const pointer to contents.
-       *
-       *  This is a handle to internal data.  Do not modify or dire things may
-       *  happen.
-      */
-      const _CharT*
-      data() const _GLIBCXX_NOEXCEPT
-      { return _M_data(); }
-
-      /**
-       *  @brief  Return copy of allocator used to construct this string.
-      */
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return _M_dataplus; }
-
-      /**
-       *  @brief  Find position of a C substring.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to search from.
-       *  @param __n  Number of characters from @a s to search for.
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for the first @a
-       *  __n characters in @a __s within this string.  If found,
-       *  returns the index where it begins.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find position of a string.
-       *  @param __str  String to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for value of @a __str within
-       *  this string.  If found, returns the index where it begins.  If not
-       *  found, returns npos.
-      */
-      size_type
-      find(const basic_string& __str, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a C string.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for the value of @a
-       *  __s within this string.  If found, returns the index where
-       *  it begins.  If not found, returns npos.
-      */
-      size_type
-      find(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for @a __c within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Find last position of a string.
-       *  @param __str  String to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of start of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for value of @a
-       *  __str within this string.  If found, returns the index where
-       *  it begins.  If not found, returns npos.
-      */
-      size_type
-      rfind(const basic_string& __str, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT
-      { return this->rfind(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a C substring.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to search back from.
-       *  @param __n  Number of characters from s to search for.
-       *  @return  Index of start of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for the first @a
-       *  __n characters in @a __s within this string.  If found,
-       *  returns the index where it begins.  If not found, returns
-       *  npos.
-      */
-      size_type
-      rfind(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find last position of a C string.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to start search at (default end).
-       *  @return  Index of start of  last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for the value of
-       *  @a __s within this string.  If found, returns the index
-       *  where it begins.  If not found, returns npos.
-      */
-      size_type
-      rfind(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->rfind(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for @a __c within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      rfind(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Find position of a character of string.
-       *  @param __str  String containing characters to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for one of the
-       *  characters of @a __str within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_first_of(const basic_string& __str, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_first_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a character of C substring.
-       *  @param __s  String containing characters to locate.
-       *  @param __pos  Index of character to search from.
-       *  @param __n  Number of characters from s to search for.
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for one of the
-       *  first @a __n characters of @a __s within this string.  If
-       *  found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      find_first_of(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find position of a character of C string.
-       *  @param __s  String containing characters to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for one of the
-       *  characters of @a __s within this string.  If found, returns
-       *  the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_of(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_first_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for the character
-       *  @a __c within this string.  If found, returns the index
-       *  where it was found.  If not found, returns npos.
-       *
-       *  Note: equivalent to find(__c, __pos).
-      */
-      size_type
-      find_first_of(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT
-      { return this->find(__c, __pos); }
-
-      /**
-       *  @brief  Find last position of a character of string.
-       *  @param __str  String containing characters to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for one of the
-       *  characters of @a __str within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_last_of(const basic_string& __str, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_last_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a character of C substring.
-       *  @param __s  C string containing characters to locate.
-       *  @param __pos  Index of character to search back from.
-       *  @param __n  Number of characters from s to search for.
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for one of the
-       *  first @a __n characters of @a __s within this string.  If
-       *  found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      find_last_of(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find last position of a character of C string.
-       *  @param __s  C string containing characters to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for one of the
-       *  characters of @a __s within this string.  If found, returns
-       *  the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_last_of(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_last_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for @a __c within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-       *
-       *  Note: equivalent to rfind(__c, __pos).
-      */
-      size_type
-      find_last_of(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT
-      { return this->rfind(__c, __pos); }
-
-      /**
-       *  @brief  Find position of a character not in string.
-       *  @param __str  String containing characters to avoid.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character not contained
-       *  in @a __str within this string.  If found, returns the index where it
-       *  was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const basic_string& __str, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_first_not_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a character not in C substring.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search from.
-       *  @param __n  Number of characters from __s to consider.
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character not
-       *  contained in the first @a __n characters of @a __s within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const _CharT* __s, size_type __pos,
-			size_type __n) const;
-
-      /**
-       *  @brief  Find position of a character not in C string.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character not
-       *  contained in @a __s within this string.  If found, returns
-       *  the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_first_not_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a different character.
-       *  @param __c  Character to avoid.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character
-       *  other than @a __c within this string.  If found, returns the
-       *  index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(_CharT __c, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Find last position of a character not in string.
-       *  @param __str  String containing characters to avoid.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character
-       *  not contained in @a __str within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_last_not_of(const basic_string& __str, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_last_not_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a character not in C substring.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search back from.
-       *  @param __n  Number of characters from s to consider.
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character not
-       *  contained in the first @a __n characters of @a __s within this string.
-       *  If found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      find_last_not_of(const _CharT* __s, size_type __pos,
-		       size_type __n) const;
-      /**
-       *  @brief  Find last position of a character not in C string.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character
-       *  not contained in @a __s within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_last_not_of(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_last_not_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a different character.
-       *  @param __c  Character to avoid.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character other than
-       *  @a __c within this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_last_not_of(_CharT __c, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Get a substring.
-       *  @param __pos  Index of first character (default 0).
-       *  @param __n  Number of characters in substring (default remainder).
-       *  @return  The new string.
-       *  @throw  std::out_of_range  If __pos > size().
-       *
-       *  Construct and return a new string using the @a __n
-       *  characters starting at @a __pos.  If the string is too
-       *  short, use the remainder of the characters.  If @a __pos is
-       *  beyond the end of the string, out_of_range is thrown.
-      */
-      basic_string
-      substr(size_type __pos = 0, size_type __n = npos) const
-      { return basic_string(*this,
-			    _M_check(__pos, "basic_string::substr"), __n); }
-
-      /**
-       *  @brief  Compare to a string.
-       *  @param __str  String to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Returns an integer < 0 if this string is ordered before @a
-       *  __str, 0 if their values are equivalent, or > 0 if this
-       *  string is ordered after @a __str.  Determines the effective
-       *  length rlen of the strings to compare as the smallest of
-       *  size() and str.size().  The function then compares the two
-       *  strings by calling traits::compare(data(), str.data(),rlen).
-       *  If the result of the comparison is nonzero returns it,
-       *  otherwise the shorter one is ordered first.
-      */
-      int
-      compare(const basic_string& __str) const
-      {
-	const size_type __size = this->size();
-	const size_type __osize = __str.size();
-	const size_type __len = std::min(__size, __osize);
-
-	int __r = traits_type::compare(_M_data(), __str.data(), __len);
-	if (!__r)
-	  __r = _S_compare(__size, __osize);
-	return __r;
-      }
-
-      /**
-       *  @brief  Compare substring to a string.
-       *  @param __pos  Index of first character of substring.
-       *  @param __n  Number of characters in substring.
-       *  @param __str  String to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n characters
-       *  starting at @a __pos.  Returns an integer < 0 if the
-       *  substring is ordered before @a __str, 0 if their values are
-       *  equivalent, or > 0 if the substring is ordered after @a
-       *  __str.  Determines the effective length rlen of the strings
-       *  to compare as the smallest of the length of the substring
-       *  and @a __str.size().  The function then compares the two
-       *  strings by calling
-       *  traits::compare(substring.data(),str.data(),rlen).  If the
-       *  result of the comparison is nonzero returns it, otherwise
-       *  the shorter one is ordered first.
-      */
-      int
-      compare(size_type __pos, size_type __n, const basic_string& __str) const;
-
-      /**
-       *  @brief  Compare substring to a substring.
-       *  @param __pos1  Index of first character of substring.
-       *  @param __n1  Number of characters in substring.
-       *  @param __str  String to compare against.
-       *  @param __pos2  Index of first character of substring of str.
-       *  @param __n2  Number of characters in substring of str.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n1
-       *  characters starting at @a __pos1.  Form the substring of @a
-       *  __str from the @a __n2 characters starting at @a __pos2.
-       *  Returns an integer < 0 if this substring is ordered before
-       *  the substring of @a __str, 0 if their values are equivalent,
-       *  or > 0 if this substring is ordered after the substring of
-       *  @a __str.  Determines the effective length rlen of the
-       *  strings to compare as the smallest of the lengths of the
-       *  substrings.  The function then compares the two strings by
-       *  calling
-       *  traits::compare(substring.data(),str.substr(pos2,n2).data(),rlen).
-       *  If the result of the comparison is nonzero returns it,
-       *  otherwise the shorter one is ordered first.
-      */
-      int
-      compare(size_type __pos1, size_type __n1, const basic_string& __str,
-	      size_type __pos2, size_type __n2) const;
-
-      /**
-       *  @brief  Compare to a C string.
-       *  @param __s  C string to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Returns an integer < 0 if this string is ordered before @a __s, 0 if
-       *  their values are equivalent, or > 0 if this string is ordered after
-       *  @a __s.  Determines the effective length rlen of the strings to
-       *  compare as the smallest of size() and the length of a string
-       *  constructed from @a __s.  The function then compares the two strings
-       *  by calling traits::compare(data(),s,rlen).  If the result of the
-       *  comparison is nonzero returns it, otherwise the shorter one is
-       *  ordered first.
-      */
-      int
-      compare(const _CharT* __s) const;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 5 String::compare specification questionable
-      /**
-       *  @brief  Compare substring to a C string.
-       *  @param __pos  Index of first character of substring.
-       *  @param __n1  Number of characters in substring.
-       *  @param __s  C string to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n1
-       *  characters starting at @a pos.  Returns an integer < 0 if
-       *  the substring is ordered before @a __s, 0 if their values
-       *  are equivalent, or > 0 if the substring is ordered after @a
-       *  __s.  Determines the effective length rlen of the strings to
-       *  compare as the smallest of the length of the substring and
-       *  the length of a string constructed from @a __s.  The
-       *  function then compares the two string by calling
-       *  traits::compare(substring.data(),__s,rlen).  If the result of
-       *  the comparison is nonzero returns it, otherwise the shorter
-       *  one is ordered first.
-      */
-      int
-      compare(size_type __pos, size_type __n1, const _CharT* __s) const;
-
-      /**
-       *  @brief  Compare substring against a character %array.
-       *  @param __pos  Index of first character of substring.
-       *  @param __n1  Number of characters in substring.
-       *  @param __s  character %array to compare against.
-       *  @param __n2  Number of characters of s.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n1
-       *  characters starting at @a __pos.  Form a string from the
-       *  first @a __n2 characters of @a __s.  Returns an integer < 0
-       *  if this substring is ordered before the string from @a __s,
-       *  0 if their values are equivalent, or > 0 if this substring
-       *  is ordered after the string from @a __s.  Determines the
-       *  effective length rlen of the strings to compare as the
-       *  smallest of the length of the substring and @a __n2.  The
-       *  function then compares the two strings by calling
-       *  traits::compare(substring.data(),s,rlen).  If the result of
-       *  the comparison is nonzero returns it, otherwise the shorter
-       *  one is ordered first.
-       *
-       *  NB: s must have at least n2 characters, &apos;\\0&apos; has
-       *  no special meaning.
-      */
-      int
-      compare(size_type __pos, size_type __n1, const _CharT* __s,
-	      size_type __n2) const;
-  };
-#endif  // !_GLIBCXX_USE_CXX11_ABI
-
-  // operator+
-  /**
-   *  @brief  Concatenate two strings.
-   *  @param __lhs  First string.
-   *  @param __rhs  Last string.
-   *  @return  New string with value of @a __lhs followed by @a __rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>
-    operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    {
-      basic_string<_CharT, _Traits, _Alloc> __str(__lhs);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  /**
-   *  @brief  Concatenate C string and string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Last string.
-   *  @return  New string with value of @a __lhs followed by @a __rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT,_Traits,_Alloc>
-    operator+(const _CharT* __lhs,
-	      const basic_string<_CharT,_Traits,_Alloc>& __rhs);
-
-  /**
-   *  @brief  Concatenate character and string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Last string.
-   *  @return  New string with @a __lhs followed by @a __rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT,_Traits,_Alloc>
-    operator+(_CharT __lhs, const basic_string<_CharT,_Traits,_Alloc>& __rhs);
-
-  /**
-   *  @brief  Concatenate string and C string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Last string.
-   *  @return  New string with @a __lhs followed by @a __rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const _CharT* __rhs)
-    {
-      basic_string<_CharT, _Traits, _Alloc> __str(__lhs);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  /**
-   *  @brief  Concatenate string and character.
-   *  @param __lhs  First string.
-   *  @param __rhs  Last string.
-   *  @return  New string with @a __lhs followed by @a __rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs, _CharT __rhs)
-    {
-      typedef basic_string<_CharT, _Traits, _Alloc>	__string_type;
-      typedef typename __string_type::size_type		__size_type;
-      __string_type __str(__lhs);
-      __str.append(__size_type(1), __rhs);
-      return __str;
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(basic_string<_CharT, _Traits, _Alloc>&& __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return std::move(__lhs.append(__rhs)); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      basic_string<_CharT, _Traits, _Alloc>&& __rhs)
-    { return std::move(__rhs.insert(0, __lhs)); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(basic_string<_CharT, _Traits, _Alloc>&& __lhs,
-	      basic_string<_CharT, _Traits, _Alloc>&& __rhs)
-    {
-      const auto __size = __lhs.size() + __rhs.size();
-      const bool __cond = (__size > __lhs.capacity()
-			   && __size <= __rhs.capacity());
-      return __cond ? std::move(__rhs.insert(0, __lhs))
-	            : std::move(__lhs.append(__rhs));
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(const _CharT* __lhs,
-	      basic_string<_CharT, _Traits, _Alloc>&& __rhs)
-    { return std::move(__rhs.insert(0, __lhs)); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(_CharT __lhs,
-	      basic_string<_CharT, _Traits, _Alloc>&& __rhs)
-    { return std::move(__rhs.insert(0, 1, __lhs)); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(basic_string<_CharT, _Traits, _Alloc>&& __lhs,
-	      const _CharT* __rhs)
-    { return std::move(__lhs.append(__rhs)); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(basic_string<_CharT, _Traits, _Alloc>&& __lhs,
-	      _CharT __rhs)
-    { return std::move(__lhs.append(1, __rhs)); }
-#endif
-
-  // operator ==
-  /**
-   *  @brief  Test equivalence of two strings.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs.compare(@a __rhs) == 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator==(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __lhs.compare(__rhs) == 0; }
-
-  template<typename _CharT>
-    inline
-    typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value, bool>::__type
-    operator==(const basic_string<_CharT>& __lhs,
-	       const basic_string<_CharT>& __rhs)
-    { return (__lhs.size() == __rhs.size()
-	      && !std::char_traits<_CharT>::compare(__lhs.data(), __rhs.data(),
-						    __lhs.size())); }
-
-  /**
-   *  @brief  Test equivalence of C string and string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __rhs.compare(@a __lhs) == 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator==(const _CharT* __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) == 0; }
-
-  /**
-   *  @brief  Test equivalence of string and C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs.compare(@a __rhs) == 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator==(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const _CharT* __rhs)
-    { return __lhs.compare(__rhs) == 0; }
-
-  // operator !=
-  /**
-   *  @brief  Test difference of two strings.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs.compare(@a __rhs) != 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator!=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   *  @brief  Test difference of C string and string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __rhs.compare(@a __lhs) != 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator!=(const _CharT* __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   *  @brief  Test difference of string and C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs.compare(@a __rhs) != 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator!=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const _CharT* __rhs)
-    { return !(__lhs == __rhs); }
-
-  // operator <
-  /**
-   *  @brief  Test if string precedes string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs precedes @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __lhs.compare(__rhs) < 0; }
-
-  /**
-   *  @brief  Test if string precedes C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs precedes @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const _CharT* __rhs)
-    { return __lhs.compare(__rhs) < 0; }
-
-  /**
-   *  @brief  Test if C string precedes string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __lhs precedes @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<(const _CharT* __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) > 0; }
-
-  // operator >
-  /**
-   *  @brief  Test if string follows string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs follows @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __lhs.compare(__rhs) > 0; }
-
-  /**
-   *  @brief  Test if string follows C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs follows @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const _CharT* __rhs)
-    { return __lhs.compare(__rhs) > 0; }
-
-  /**
-   *  @brief  Test if C string follows string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __lhs follows @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>(const _CharT* __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) < 0; }
-
-  // operator <=
-  /**
-   *  @brief  Test if string doesn't follow string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs doesn't follow @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __lhs.compare(__rhs) <= 0; }
-
-  /**
-   *  @brief  Test if string doesn't follow C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs doesn't follow @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const _CharT* __rhs)
-    { return __lhs.compare(__rhs) <= 0; }
-
-  /**
-   *  @brief  Test if C string doesn't follow string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __lhs doesn't follow @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<=(const _CharT* __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) >= 0; }
-
-  // operator >=
-  /**
-   *  @brief  Test if string doesn't precede string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs doesn't precede @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __lhs.compare(__rhs) >= 0; }
-
-  /**
-   *  @brief  Test if string doesn't precede C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs doesn't precede @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const _CharT* __rhs)
-    { return __lhs.compare(__rhs) >= 0; }
-
-  /**
-   *  @brief  Test if C string doesn't precede string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __lhs doesn't precede @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>=(const _CharT* __lhs,
-	     const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) <= 0; }
-
-  /**
-   *  @brief  Swap contents of two strings.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *
-   *  Exchanges the contents of @a __lhs and @a __rhs in constant time.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline void
-    swap(basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	 basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-
-
-  /**
-   *  @brief  Read stream into a string.
-   *  @param __is  Input stream.
-   *  @param __str  Buffer to store into.
-   *  @return  Reference to the input stream.
-   *
-   *  Stores characters from @a __is into @a __str until whitespace is
-   *  found, the end of the stream is encountered, or str.max_size()
-   *  is reached.  If is.width() is non-zero, that is the limit on the
-   *  number of characters stored into @a __str.  Any previous
-   *  contents of @a __str are erased.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-	       basic_string<_CharT, _Traits, _Alloc>& __str);
-
-  template<>
-    basic_istream<char>&
-    operator>>(basic_istream<char>& __is, basic_string<char>& __str);
-
-  /**
-   *  @brief  Write string to a stream.
-   *  @param __os  Output stream.
-   *  @param __str  String to write out.
-   *  @return  Reference to the output stream.
-   *
-   *  Output characters of @a __str into os following the same rules as for
-   *  writing a C string.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-	       const basic_string<_CharT, _Traits, _Alloc>& __str)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 586. string inserter not a formatted function
-      return __ostream_insert(__os, __str.data(), __str.size());
-    }
-
-  /**
-   *  @brief  Read a line from stream into a string.
-   *  @param __is  Input stream.
-   *  @param __str  Buffer to store into.
-   *  @param __delim  Character marking end of line.
-   *  @return  Reference to the input stream.
-   *
-   *  Stores characters from @a __is into @a __str until @a __delim is
-   *  found, the end of the stream is encountered, or str.max_size()
-   *  is reached.  Any previous contents of @a __str are erased.  If
-   *  @a __delim is encountered, it is extracted but not stored into
-   *  @a __str.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT, _Traits>&
-    getline(basic_istream<_CharT, _Traits>& __is,
-	    basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim);
-
-  /**
-   *  @brief  Read a line from stream into a string.
-   *  @param __is  Input stream.
-   *  @param __str  Buffer to store into.
-   *  @return  Reference to the input stream.
-   *
-   *  Stores characters from is into @a __str until &apos;\n&apos; is
-   *  found, the end of the stream is encountered, or str.max_size()
-   *  is reached.  Any previous contents of @a __str are erased.  If
-   *  end of line is encountered, it is extracted but not stored into
-   *  @a __str.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_istream<_CharT, _Traits>&
-    getline(basic_istream<_CharT, _Traits>& __is,
-	    basic_string<_CharT, _Traits, _Alloc>& __str)
-    { return std::getline(__is, __str, __is.widen('\n')); }
-
-#if __cplusplus >= 201103L
-  /// Read a line from an rvalue stream into a string.
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_istream<_CharT, _Traits>&
-    getline(basic_istream<_CharT, _Traits>&& __is,
-	    basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim)
-    { return std::getline(__is, __str, __delim); }
-
-  /// Read a line from an rvalue stream into a string.
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_istream<_CharT, _Traits>&
-    getline(basic_istream<_CharT, _Traits>&& __is,
-	    basic_string<_CharT, _Traits, _Alloc>& __str)
-    { return std::getline(__is, __str); }
-#endif
-
-  template<>
-    basic_istream<char>&
-    getline(basic_istream<char>& __in, basic_string<char>& __str,
-	    char __delim);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    basic_istream<wchar_t>&
-    getline(basic_istream<wchar_t>& __in, basic_string<wchar_t>& __str,
-	    wchar_t __delim);
-#endif  
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99)
-
-#include <ext/string_conversions.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  // 21.4 Numeric Conversions [string.conversions].
-  inline int
-  stoi(const string& __str, size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa<long, int>(&std::strtol, "stoi", __str.c_str(),
-					__idx, __base); }
-
-  inline long
-  stol(const string& __str, size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::strtol, "stol", __str.c_str(),
-			     __idx, __base); }
-
-  inline unsigned long
-  stoul(const string& __str, size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::strtoul, "stoul", __str.c_str(),
-			     __idx, __base); }
-
-  inline long long
-  stoll(const string& __str, size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::strtoll, "stoll", __str.c_str(),
-			     __idx, __base); }
-
-  inline unsigned long long
-  stoull(const string& __str, size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::strtoull, "stoull", __str.c_str(),
-			     __idx, __base); }
-
-  // NB: strtof vs strtod.
-  inline float
-  stof(const string& __str, size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::strtof, "stof", __str.c_str(), __idx); }
-
-  inline double
-  stod(const string& __str, size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::strtod, "stod", __str.c_str(), __idx); }
-
-  inline long double
-  stold(const string& __str, size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::strtold, "stold", __str.c_str(), __idx); }
-
-  // NB: (v)snprintf vs sprintf.
-
-  // DR 1261.
-  inline string
-  to_string(int __val)
-  { return __gnu_cxx::__to_xstring<string>(&std::vsnprintf, 4 * sizeof(int),
-					   "%d", __val); }
-
-  inline string
-  to_string(unsigned __val)
-  { return __gnu_cxx::__to_xstring<string>(&std::vsnprintf,
-					   4 * sizeof(unsigned),
-					   "%u", __val); }
-
-  inline string
-  to_string(long __val)
-  { return __gnu_cxx::__to_xstring<string>(&std::vsnprintf, 4 * sizeof(long),
-					   "%ld", __val); }
-
-  inline string
-  to_string(unsigned long __val)
-  { return __gnu_cxx::__to_xstring<string>(&std::vsnprintf,
-					   4 * sizeof(unsigned long),
-					   "%lu", __val); }
-
-  inline string
-  to_string(long long __val)
-  { return __gnu_cxx::__to_xstring<string>(&std::vsnprintf,
-					   4 * sizeof(long long),
-					   "%lld", __val); }
-
-  inline string
-  to_string(unsigned long long __val)
-  { return __gnu_cxx::__to_xstring<string>(&std::vsnprintf,
-					   4 * sizeof(unsigned long long),
-					   "%llu", __val); }
-
-  inline string
-  to_string(float __val)
-  {
-    const int __n = 
-      __gnu_cxx::__numeric_traits<float>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<string>(&std::vsnprintf, __n,
-					   "%f", __val);
-  }
-
-  inline string
-  to_string(double __val)
-  {
-    const int __n = 
-      __gnu_cxx::__numeric_traits<double>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<string>(&std::vsnprintf, __n,
-					   "%f", __val);
-  }
-
-  inline string
-  to_string(long double __val)
-  {
-    const int __n = 
-      __gnu_cxx::__numeric_traits<long double>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<string>(&std::vsnprintf, __n,
-					   "%Lf", __val);
-  }
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  inline int 
-  stoi(const wstring& __str, size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa<long, int>(&std::wcstol, "stoi", __str.c_str(),
-					__idx, __base); }
-
-  inline long 
-  stol(const wstring& __str, size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::wcstol, "stol", __str.c_str(),
-			     __idx, __base); }
-
-  inline unsigned long
-  stoul(const wstring& __str, size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::wcstoul, "stoul", __str.c_str(),
-			     __idx, __base); }
-
-  inline long long
-  stoll(const wstring& __str, size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::wcstoll, "stoll", __str.c_str(),
-			     __idx, __base); }
-
-  inline unsigned long long
-  stoull(const wstring& __str, size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::wcstoull, "stoull", __str.c_str(),
-			     __idx, __base); }
-
-  // NB: wcstof vs wcstod.
-  inline float
-  stof(const wstring& __str, size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::wcstof, "stof", __str.c_str(), __idx); }
-
-  inline double
-  stod(const wstring& __str, size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::wcstod, "stod", __str.c_str(), __idx); }
-
-  inline long double
-  stold(const wstring& __str, size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::wcstold, "stold", __str.c_str(), __idx); }
-
-#ifndef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
-  // DR 1261.
-  inline wstring
-  to_wstring(int __val)
-  { return __gnu_cxx::__to_xstring<wstring>(&std::vswprintf, 4 * sizeof(int),
-					    L"%d", __val); }
-
-  inline wstring
-  to_wstring(unsigned __val)
-  { return __gnu_cxx::__to_xstring<wstring>(&std::vswprintf,
-					    4 * sizeof(unsigned),
-					    L"%u", __val); }
-
-  inline wstring
-  to_wstring(long __val)
-  { return __gnu_cxx::__to_xstring<wstring>(&std::vswprintf, 4 * sizeof(long),
-					    L"%ld", __val); }
-
-  inline wstring
-  to_wstring(unsigned long __val)
-  { return __gnu_cxx::__to_xstring<wstring>(&std::vswprintf,
-					    4 * sizeof(unsigned long),
-					    L"%lu", __val); }
-
-  inline wstring
-  to_wstring(long long __val)
-  { return __gnu_cxx::__to_xstring<wstring>(&std::vswprintf,
-					    4 * sizeof(long long),
-					    L"%lld", __val); }
-
-  inline wstring
-  to_wstring(unsigned long long __val)
-  { return __gnu_cxx::__to_xstring<wstring>(&std::vswprintf,
-					    4 * sizeof(unsigned long long),
-					    L"%llu", __val); }
-
-  inline wstring
-  to_wstring(float __val)
-  {
-    const int __n =
-      __gnu_cxx::__numeric_traits<float>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<wstring>(&std::vswprintf, __n,
-					    L"%f", __val);
-  }
-
-  inline wstring
-  to_wstring(double __val)
-  {
-    const int __n =
-      __gnu_cxx::__numeric_traits<double>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<wstring>(&std::vswprintf, __n,
-					    L"%f", __val);
-  }
-
-  inline wstring
-  to_wstring(long double __val)
-  {
-    const int __n =
-      __gnu_cxx::__numeric_traits<long double>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<wstring>(&std::vswprintf, __n,
-					    L"%Lf", __val);
-  }
-#endif // _GLIBCXX_HAVE_BROKEN_VSWPRINTF
-#endif
-
-_GLIBCXX_END_NAMESPACE_CXX11
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* C++11 && _GLIBCXX_USE_C99 ... */
-
-#if __cplusplus >= 201103L
-
-#include <bits/functional_hash.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // DR 1182.
-
-#ifndef _GLIBCXX_COMPATIBILITY_CXX0X
-  /// std::hash specialization for string.
-  template<>
-    struct hash<string>
-    : public __hash_base<size_t, string>
-    {
-      size_t
-      operator()(const string& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(), __s.length()); }
-    };
-
-  template<>
-    struct __is_fast_hash<hash<string>> : std::false_type
-    { };
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /// std::hash specialization for wstring.
-  template<>
-    struct hash<wstring>
-    : public __hash_base<size_t, wstring>
-    {
-      size_t
-      operator()(const wstring& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(),
-                                     __s.length() * sizeof(wchar_t)); }
-    };
-
-  template<>
-    struct __is_fast_hash<hash<wstring>> : std::false_type
-    { };
-#endif
-#endif /* _GLIBCXX_COMPATIBILITY_CXX0X */
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-  /// std::hash specialization for u16string.
-  template<>
-    struct hash<u16string>
-    : public __hash_base<size_t, u16string>
-    {
-      size_t
-      operator()(const u16string& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(),
-                                     __s.length() * sizeof(char16_t)); }
-    };
-
-  template<>
-    struct __is_fast_hash<hash<u16string>> : std::false_type
-    { };
-
-  /// std::hash specialization for u32string.
-  template<>
-    struct hash<u32string>
-    : public __hash_base<size_t, u32string>
-    {
-      size_t
-      operator()(const u32string& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(),
-                                     __s.length() * sizeof(char32_t)); }
-    };
-
-  template<>
-    struct __is_fast_hash<hash<u32string>> : std::false_type
-    { };
-#endif
-
-#if __cplusplus > 201103L
-
-#define __cpp_lib_string_udls 201304
-
-  inline namespace literals
-  {
-  inline namespace string_literals
-  {
-
-    _GLIBCXX_DEFAULT_ABI_TAG
-    inline basic_string<char>
-    operator""s(const char* __str, size_t __len)
-    { return basic_string<char>{__str, __len}; }
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-    _GLIBCXX_DEFAULT_ABI_TAG
-    inline basic_string<wchar_t>
-    operator""s(const wchar_t* __str, size_t __len)
-    { return basic_string<wchar_t>{__str, __len}; }
-#endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-    _GLIBCXX_DEFAULT_ABI_TAG
-    inline basic_string<char16_t>
-    operator""s(const char16_t* __str, size_t __len)
-    { return basic_string<char16_t>{__str, __len}; }
-
-    _GLIBCXX_DEFAULT_ABI_TAG
-    inline basic_string<char32_t>
-    operator""s(const char32_t* __str, size_t __len)
-    { return basic_string<char32_t>{__str, __len}; }
-#endif
-
-  } // inline namespace string_literals
-  } // inline namespace literals
-
-#endif // __cplusplus > 201103L
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif // C++11
-
-#endif /* _BASIC_STRING_H */
diff --git a/openflow/usr/include/c++/5/bits/basic_string.tcc b/openflow/usr/include/c++/5/bits/basic_string.tcc
deleted file mode 100644
index b9da93b..0000000
--- a/openflow/usr/include/c++/5/bits/basic_string.tcc
+++ /dev/null
@@ -1,1611 +0,0 @@
-// Components for manipulating sequences of characters -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/basic_string.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{string}
- */
-
-//
-// ISO C++ 14882: 21  Strings library
-//
-
-// Written by Jason Merrill based upon the specification by Takanori Adachi
-// in ANSI X3J16/94-0013R2.  Rewritten by Nathan Myers to ISO-14882.
-// Non-reference-counted implementation written by Paolo Carlini and
-// updated by Jonathan Wakely for ISO-14882-2011.
-
-#ifndef _BASIC_STRING_TCC
-#define _BASIC_STRING_TCC 1
-
-#pragma GCC system_header
-
-#include <bits/cxxabi_forced.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if _GLIBCXX_USE_CXX11_ABI
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    const typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::npos;
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    swap(basic_string& __s) _GLIBCXX_NOEXCEPT
-    {
-      if (this == &__s)
-	return;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 431. Swapping containers with unequal allocators.
-      // TODO propagation traits
-      std::__alloc_swap<allocator_type>::_S_do_it(_M_get_allocator(),
-						  __s._M_get_allocator());
-
-      if (_M_is_local())
-	if (__s._M_is_local())
-	  {
-	    if (length() && __s.length())
-	      {
-		_CharT __tmp_data[_S_local_capacity + 1];
-		traits_type::copy(__tmp_data, __s._M_local_buf,
-				  _S_local_capacity + 1);
-		traits_type::copy(__s._M_local_buf, _M_local_buf,
-				  _S_local_capacity + 1);
-		traits_type::copy(_M_local_buf, __tmp_data,
-				  _S_local_capacity + 1);
-	      }
-	    else if (__s.length())
-	      {
-		traits_type::copy(_M_local_buf, __s._M_local_buf,
-				  _S_local_capacity + 1);
-		_M_length(__s.length());
-		__s._M_set_length(0);
-		return;
-	      }
-	    else if (length())
-	      {
-		traits_type::copy(__s._M_local_buf, _M_local_buf,
-				  _S_local_capacity + 1);
-		__s._M_length(length());
-		_M_set_length(0);
-		return;
-	      }
-	  }
-	else
-	  {
-	    const size_type __tmp_capacity = __s._M_allocated_capacity;
-	    traits_type::copy(__s._M_local_buf, _M_local_buf,
-			      _S_local_capacity + 1);
-	    _M_data(__s._M_data());
-	    __s._M_data(__s._M_local_buf);
-	    _M_capacity(__tmp_capacity);
-	  }
-      else
-	{
-	  const size_type __tmp_capacity = _M_allocated_capacity;
-	  if (__s._M_is_local())
-	    {
-	      traits_type::copy(_M_local_buf, __s._M_local_buf,
-				_S_local_capacity + 1);
-	      __s._M_data(_M_data());
-	      _M_data(_M_local_buf);
-	    }
-	  else
-	    {
-	      pointer __tmp_ptr = _M_data();
-	      _M_data(__s._M_data());
-	      __s._M_data(__tmp_ptr);
-	      _M_capacity(__s._M_allocated_capacity);
-	    }
-	  __s._M_capacity(__tmp_capacity);
-	}
-
-      const size_type __tmp_length = length();
-      _M_length(__s.length());
-      __s._M_length(__tmp_length);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::pointer
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_create(size_type& __capacity, size_type __old_capacity)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 83.  String::npos vs. string::max_size()
-      if (__capacity > max_size())
-	std::__throw_length_error(__N("basic_string::_M_create"));
-
-      // The below implements an exponential growth policy, necessary to
-      // meet amortized linear time requirements of the library: see
-      // http://gcc.gnu.org/ml/libstdc++/2001-07/msg00085.html.
-      if (__capacity > __old_capacity && __capacity < 2 * __old_capacity)
-	{
-	  __capacity = 2 * __old_capacity;
-	  // Never allocate a string bigger than max_size.
-	  if (__capacity > max_size())
-	    __capacity = max_size();
-	}
-
-      // NB: Need an array of char_type[__capacity], plus a terminating
-      // null char_type() element.
-      return _Alloc_traits::allocate(_M_get_allocator(), __capacity + 1);
-    }
-
-  // NB: This is the special case for Input Iterators, used in
-  // istreambuf_iterators, etc.
-  // Input Iterators have a cost structure very different from
-  // pointers, calling for a different coding style.
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InIterator>
-      void
-      basic_string<_CharT, _Traits, _Alloc>::
-      _M_construct(_InIterator __beg, _InIterator __end,
-		   std::input_iterator_tag)
-      {
-	size_type __len = 0;
-	size_type __capacity = size_type(_S_local_capacity);
-
-	while (__beg != __end && __len < __capacity)
-	  {
-	    _M_data()[__len++] = *__beg;
-	    ++__beg;
-	  }
-
-	__try
-	  {
-	    while (__beg != __end)
-	      {
-		if (__len == __capacity)
-		  {
-		    // Allocate more space.
-		    __capacity = __len + 1;
-		    pointer __another = _M_create(__capacity, __len);
-		    this->_S_copy(__another, _M_data(), __len);
-		    _M_dispose();
-		    _M_data(__another);
-		    _M_capacity(__capacity);
-		  }
-		_M_data()[__len++] = *__beg;
-		++__beg;
-	      }
-	  }
-	__catch(...)
-	  {
-	    _M_dispose();
-	    __throw_exception_again;
-	  }
-
-	_M_set_length(__len);
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InIterator>
-      void
-      basic_string<_CharT, _Traits, _Alloc>::
-      _M_construct(_InIterator __beg, _InIterator __end,
-		   std::forward_iterator_tag)
-      {
-	// NB: Not required, but considered best practice.
-	if (__gnu_cxx::__is_null_pointer(__beg) && __beg != __end)
-	  std::__throw_logic_error(__N("basic_string::"
-				       "_M_construct null not valid"));
-
-	size_type __dnew = static_cast<size_type>(std::distance(__beg, __end));
-
-	if (__dnew > size_type(_S_local_capacity))
-	  {
-	    _M_data(_M_create(__dnew, size_type(0)));
-	    _M_capacity(__dnew);
-	  }
-
-	// Check for out_of_range and length_error exceptions.
-	__try
-	  { this->_S_copy_chars(_M_data(), __beg, __end); }
-	__catch(...)
-	  {
-	    _M_dispose();
-	    __throw_exception_again;
-	  }
-
-	_M_set_length(__dnew);
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_construct(size_type __n, _CharT __c)
-    {
-      if (__n > size_type(_S_local_capacity))
-	{
-	  _M_data(_M_create(__n, size_type(0)));
-	  _M_capacity(__n);
-	}
-
-      if (__n)
-	this->_S_assign(_M_data(), __n, __c);
-
-      _M_set_length(__n);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_assign(const basic_string& __str)
-    {
-      if (this != &__str)
-	{
-	  const size_type __rsize = __str.length();
-	  const size_type __capacity = capacity();
-
-	  if (__rsize > __capacity)
-	    {
-	      size_type __new_capacity = __rsize;
-	      pointer __tmp = _M_create(__new_capacity, __capacity);
-	      _M_dispose();
-	      _M_data(__tmp);
-	      _M_capacity(__new_capacity);
-	    }
-
-	  if (__rsize)
-	    this->_S_copy(_M_data(), __str._M_data(), __rsize);
-
-	  _M_set_length(__rsize);
-	}
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    reserve(size_type __res)
-    {
-      // Make sure we don't shrink below the current size.
-      if (__res < length())
-	__res = length();
-
-      const size_type __capacity = capacity();
-      if (__res != __capacity)
-	{
-	  if (__res > __capacity
-	      || __res > size_type(_S_local_capacity))
-	    {
-	      pointer __tmp = _M_create(__res, __capacity);
-	      this->_S_copy(__tmp, _M_data(), length() + 1);
-	      _M_dispose();
-	      _M_data(__tmp);
-	      _M_capacity(__res);
-	    }
-	  else if (!_M_is_local())
-	    {
-	      this->_S_copy(_M_local_data(), _M_data(), length() + 1);
-	      _M_destroy(__capacity);
-	      _M_data(_M_local_data());
-	    }
-	}
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_mutate(size_type __pos, size_type __len1, const _CharT* __s,
-	      size_type __len2)
-    {
-      const size_type __how_much = length() - __pos - __len1;
-
-      size_type __new_capacity = length() + __len2 - __len1;
-      pointer __r = _M_create(__new_capacity, capacity());
-
-      if (__pos)
-	this->_S_copy(__r, _M_data(), __pos);
-      if (__s && __len2)
-	this->_S_copy(__r + __pos, __s, __len2);
-      if (__how_much)
-	this->_S_copy(__r + __pos + __len2,
-		      _M_data() + __pos + __len1, __how_much);
-
-      _M_dispose();
-      _M_data(__r);
-      _M_capacity(__new_capacity);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_erase(size_type __pos, size_type __n)
-    {
-      const size_type __how_much = length() - __pos - __n;
-
-      if (__how_much && __n)
-	this->_S_move(_M_data() + __pos, _M_data() + __pos + __n, __how_much);
-
-      _M_set_length(length() - __n);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    resize(size_type __n, _CharT __c)
-    {
-      const size_type __size = this->size();
-      if (__size < __n)
-	this->append(__n - __size, __c);
-      else if (__n < __size)
-	this->_M_erase(__n, __size - __n);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_append(const _CharT* __s, size_type __n)
-    {
-      const size_type __len = __n + this->size();
-
-      if (__len <= this->capacity())
-	{
-	  if (__n)
-	    this->_S_copy(this->_M_data() + this->size(), __s, __n);
-	}
-      else
-	this->_M_mutate(this->size(), size_type(0), __s, __n);
-
-      this->_M_set_length(__len);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InputIterator>
-      basic_string<_CharT, _Traits, _Alloc>&
-      basic_string<_CharT, _Traits, _Alloc>::
-      _M_replace_dispatch(const_iterator __i1, const_iterator __i2,
-			  _InputIterator __k1, _InputIterator __k2,
-			  std::__false_type)
-      {
-	const basic_string __s(__k1, __k2);
-	const size_type __n1 = __i2 - __i1;
-	return _M_replace(__i1 - begin(), __n1, __s._M_data(),
-			  __s.size());
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_replace_aux(size_type __pos1, size_type __n1, size_type __n2,
-		   _CharT __c)
-    {
-      _M_check_length(__n1, __n2, "basic_string::_M_replace_aux");
-
-      const size_type __old_size = this->size();
-      const size_type __new_size = __old_size + __n2 - __n1;
-
-      if (__new_size <= this->capacity())
-	{
-	  _CharT* __p = this->_M_data() + __pos1;
-
-	  const size_type __how_much = __old_size - __pos1 - __n1;
-	  if (__how_much && __n1 != __n2)
-	    this->_S_move(__p + __n2, __p + __n1, __how_much);
-	}
-      else
-	this->_M_mutate(__pos1, __n1, 0, __n2);
-
-      if (__n2)
-	this->_S_assign(this->_M_data() + __pos1, __n2, __c);
-
-      this->_M_set_length(__new_size);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_replace(size_type __pos, size_type __len1, const _CharT* __s,
-	       const size_type __len2)
-    {
-      _M_check_length(__len1, __len2, "basic_string::_M_replace");
-
-      const size_type __old_size = this->size();
-      const size_type __new_size = __old_size + __len2 - __len1;
-
-      if (__new_size <= this->capacity())
-	{
-	  _CharT* __p = this->_M_data() + __pos;
-
-	  const size_type __how_much = __old_size - __pos - __len1;
-	  if (_M_disjunct(__s))
-	    {
-	      if (__how_much && __len1 != __len2)
-		this->_S_move(__p + __len2, __p + __len1, __how_much);
-	      if (__len2)
-		this->_S_copy(__p, __s, __len2);
-	    }
-	  else
-	    {
-	      // Work in-place.
-	      if (__len2 && __len2 <= __len1)
-		this->_S_move(__p, __s, __len2);
-	      if (__how_much && __len1 != __len2)
-		this->_S_move(__p + __len2, __p + __len1, __how_much);
-	      if (__len2 > __len1)
-		{
-		  if (__s + __len2 <= __p + __len1)
-		    this->_S_move(__p, __s, __len2);
-		  else if (__s >= __p + __len1)
-		    this->_S_copy(__p, __s + __len2 - __len1, __len2);
-		  else
-		    {
-		      const size_type __nleft = (__p + __len1) - __s;
-		      this->_S_move(__p, __s, __nleft);
-		      this->_S_copy(__p + __nleft, __p + __len2,
-				    __len2 - __nleft);
-		    }
-		}
-	    }
-	}
-      else
-	this->_M_mutate(__pos, __len1, __s, __len2);
-
-      this->_M_set_length(__new_size);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    copy(_CharT* __s, size_type __n, size_type __pos) const
-    {
-      _M_check(__pos, "basic_string::copy");
-      __n = _M_limit(__pos, __n);
-      __glibcxx_requires_string_len(__s, __n);
-      if (__n)
-	_S_copy(__s, _M_data() + __pos, __n);
-      // 21.3.5.7 par 3: do not append null.  (good.)
-      return __n;
-    }
-
-#else  // !_GLIBCXX_USE_CXX11_ABI
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    const typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    _Rep::_S_max_size = (((npos - sizeof(_Rep_base))/sizeof(_CharT)) - 1) / 4;
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    const _CharT
-    basic_string<_CharT, _Traits, _Alloc>::
-    _Rep::_S_terminal = _CharT();
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    const typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::npos;
-
-  // Linker sets _S_empty_rep_storage to all 0s (one reference, empty string)
-  // at static init time (before static ctors are run).
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::_Rep::_S_empty_rep_storage[
-    (sizeof(_Rep_base) + sizeof(_CharT) + sizeof(size_type) - 1) /
-      sizeof(size_type)];
-
-  // NB: This is the special case for Input Iterators, used in
-  // istreambuf_iterators, etc.
-  // Input Iterators have a cost structure very different from
-  // pointers, calling for a different coding style.
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InIterator>
-      _CharT*
-      basic_string<_CharT, _Traits, _Alloc>::
-      _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
-		   input_iterator_tag)
-      {
-#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0
-	if (__beg == __end && __a == _Alloc())
-	  return _S_empty_rep()._M_refdata();
-#endif
-	// Avoid reallocation for common case.
-	_CharT __buf[128];
-	size_type __len = 0;
-	while (__beg != __end && __len < sizeof(__buf) / sizeof(_CharT))
-	  {
-	    __buf[__len++] = *__beg;
-	    ++__beg;
-	  }
-	_Rep* __r = _Rep::_S_create(__len, size_type(0), __a);
-	_M_copy(__r->_M_refdata(), __buf, __len);
-	__try
-	  {
-	    while (__beg != __end)
-	      {
-		if (__len == __r->_M_capacity)
-		  {
-		    // Allocate more space.
-		    _Rep* __another = _Rep::_S_create(__len + 1, __len, __a);
-		    _M_copy(__another->_M_refdata(), __r->_M_refdata(), __len);
-		    __r->_M_destroy(__a);
-		    __r = __another;
-		  }
-		__r->_M_refdata()[__len++] = *__beg;
-		++__beg;
-	      }
-	  }
-	__catch(...)
-	  {
-	    __r->_M_destroy(__a);
-	    __throw_exception_again;
-	  }
-	__r->_M_set_length_and_sharable(__len);
-	return __r->_M_refdata();
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template <typename _InIterator>
-      _CharT*
-      basic_string<_CharT, _Traits, _Alloc>::
-      _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
-		   forward_iterator_tag)
-      {
-#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0
-	if (__beg == __end && __a == _Alloc())
-	  return _S_empty_rep()._M_refdata();
-#endif
-	// NB: Not required, but considered best practice.
-	if (__gnu_cxx::__is_null_pointer(__beg) && __beg != __end)
-	  __throw_logic_error(__N("basic_string::_S_construct null not valid"));
-
-	const size_type __dnew = static_cast<size_type>(std::distance(__beg,
-								      __end));
-	// Check for out_of_range and length_error exceptions.
-	_Rep* __r = _Rep::_S_create(__dnew, size_type(0), __a);
-	__try
-	  { _S_copy_chars(__r->_M_refdata(), __beg, __end); }
-	__catch(...)
-	  {
-	    __r->_M_destroy(__a);
-	    __throw_exception_again;
-	  }
-	__r->_M_set_length_and_sharable(__dnew);
-	return __r->_M_refdata();
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    _CharT*
-    basic_string<_CharT, _Traits, _Alloc>::
-    _S_construct(size_type __n, _CharT __c, const _Alloc& __a)
-    {
-#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0
-      if (__n == 0 && __a == _Alloc())
-	return _S_empty_rep()._M_refdata();
-#endif
-      // Check for out_of_range and length_error exceptions.
-      _Rep* __r = _Rep::_S_create(__n, size_type(0), __a);
-      if (__n)
-	_M_assign(__r->_M_refdata(), __n, __c);
-
-      __r->_M_set_length_and_sharable(__n);
-      return __r->_M_refdata();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const basic_string& __str)
-    : _M_dataplus(__str._M_rep()->_M_grab(_Alloc(__str.get_allocator()),
-					  __str.get_allocator()),
-		  __str.get_allocator())
-    { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const _Alloc& __a)
-    : _M_dataplus(_S_construct(size_type(), _CharT(), __a), __a)
-    { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const basic_string& __str, size_type __pos, size_type __n)
-    : _M_dataplus(_S_construct(__str._M_data()
-			       + __str._M_check(__pos,
-						"basic_string::basic_string"),
-			       __str._M_data() + __str._M_limit(__pos, __n)
-			       + __pos, _Alloc()), _Alloc())
-    { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const basic_string& __str, size_type __pos,
-		 size_type __n, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__str._M_data()
-			       + __str._M_check(__pos,
-						"basic_string::basic_string"),
-			       __str._M_data() + __str._M_limit(__pos, __n)
-			       + __pos, __a), __a)
-    { }
-
-  // TBD: DPG annotate
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const _CharT* __s, size_type __n, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__s, __s + __n, __a), __a)
-    { }
-
-  // TBD: DPG annotate
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const _CharT* __s, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__s, __s ? __s + traits_type::length(__s) :
-			       __s + npos, __a), __a)
-    { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(size_type __n, _CharT __c, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__n, __c, __a), __a)
-    { }
-
-  // TBD: DPG annotate
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InputIterator>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(_InputIterator __beg, _InputIterator __end, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__beg, __end, __a), __a)
-    { }
-
-#if __cplusplus >= 201103L
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(initializer_list<_CharT> __l, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__l.begin(), __l.end(), __a), __a)
-    { }
-#endif
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    assign(const basic_string& __str)
-    {
-      if (_M_rep() != __str._M_rep())
-	{
-	  // XXX MT
-	  const allocator_type __a = this->get_allocator();
-	  _CharT* __tmp = __str._M_rep()->_M_grab(__a, __str.get_allocator());
-	  _M_rep()->_M_dispose(__a);
-	  _M_data(__tmp);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    assign(const _CharT* __s, size_type __n)
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      _M_check_length(this->size(), __n, "basic_string::assign");
-      if (_M_disjunct(__s) || _M_rep()->_M_is_shared())
-	return _M_replace_safe(size_type(0), this->size(), __s, __n);
-      else
-	{
-	  // Work in-place.
-	  const size_type __pos = __s - _M_data();
-	  if (__pos >= __n)
-	    _M_copy(_M_data(), __s, __n);
-	  else if (__pos)
-	    _M_move(_M_data(), __s, __n);
-	  _M_rep()->_M_set_length_and_sharable(__n);
-	  return *this;
-	}
-     }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    append(size_type __n, _CharT __c)
-    {
-      if (__n)
-	{
-	  _M_check_length(size_type(0), __n, "basic_string::append");	  
-	  const size_type __len = __n + this->size();
-	  if (__len > this->capacity() || _M_rep()->_M_is_shared())
-	    this->reserve(__len);
-	  _M_assign(_M_data() + this->size(), __n, __c);
-	  _M_rep()->_M_set_length_and_sharable(__len);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    append(const _CharT* __s, size_type __n)
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      if (__n)
-	{
-	  _M_check_length(size_type(0), __n, "basic_string::append");
-	  const size_type __len = __n + this->size();
-	  if (__len > this->capacity() || _M_rep()->_M_is_shared())
-	    {
-	      if (_M_disjunct(__s))
-		this->reserve(__len);
-	      else
-		{
-		  const size_type __off = __s - _M_data();
-		  this->reserve(__len);
-		  __s = _M_data() + __off;
-		}
-	    }
-	  _M_copy(_M_data() + this->size(), __s, __n);
-	  _M_rep()->_M_set_length_and_sharable(__len);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    append(const basic_string& __str)
-    {
-      const size_type __size = __str.size();
-      if (__size)
-	{
-	  const size_type __len = __size + this->size();
-	  if (__len > this->capacity() || _M_rep()->_M_is_shared())
-	    this->reserve(__len);
-	  _M_copy(_M_data() + this->size(), __str._M_data(), __size);
-	  _M_rep()->_M_set_length_and_sharable(__len);
-	}
-      return *this;
-    }    
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    append(const basic_string& __str, size_type __pos, size_type __n)
-    {
-      __str._M_check(__pos, "basic_string::append");
-      __n = __str._M_limit(__pos, __n);
-      if (__n)
-	{
-	  const size_type __len = __n + this->size();
-	  if (__len > this->capacity() || _M_rep()->_M_is_shared())
-	    this->reserve(__len);
-	  _M_copy(_M_data() + this->size(), __str._M_data() + __pos, __n);
-	  _M_rep()->_M_set_length_and_sharable(__len);	  
-	}
-      return *this;
-    }
-
-   template<typename _CharT, typename _Traits, typename _Alloc>
-     basic_string<_CharT, _Traits, _Alloc>&
-     basic_string<_CharT, _Traits, _Alloc>::
-     insert(size_type __pos, const _CharT* __s, size_type __n)
-     {
-       __glibcxx_requires_string_len(__s, __n);
-       _M_check(__pos, "basic_string::insert");
-       _M_check_length(size_type(0), __n, "basic_string::insert");
-       if (_M_disjunct(__s) || _M_rep()->_M_is_shared())
-         return _M_replace_safe(__pos, size_type(0), __s, __n);
-       else
-         {
-           // Work in-place.
-           const size_type __off = __s - _M_data();
-           _M_mutate(__pos, 0, __n);
-           __s = _M_data() + __off;
-           _CharT* __p = _M_data() + __pos;
-           if (__s  + __n <= __p)
-             _M_copy(__p, __s, __n);
-           else if (__s >= __p)
-             _M_copy(__p, __s + __n, __n);
-           else
-             {
-	       const size_type __nleft = __p - __s;
-               _M_copy(__p, __s, __nleft);
-               _M_copy(__p + __nleft, __p + __n, __n - __nleft);
-             }
-           return *this;
-         }
-     }
-
-   template<typename _CharT, typename _Traits, typename _Alloc>
-     typename basic_string<_CharT, _Traits, _Alloc>::iterator
-     basic_string<_CharT, _Traits, _Alloc>::
-     erase(iterator __first, iterator __last)
-     {
-       _GLIBCXX_DEBUG_PEDASSERT(__first >= _M_ibegin() && __first <= __last
-				&& __last <= _M_iend());
-
-       // NB: This isn't just an optimization (bail out early when
-       // there is nothing to do, really), it's also a correctness
-       // issue vs MT, see libstdc++/40518.
-       const size_type __size = __last - __first;
-       if (__size)
-	 {
-	   const size_type __pos = __first - _M_ibegin();
-	   _M_mutate(__pos, __size, size_type(0));
-	   _M_rep()->_M_set_leaked();
-	   return iterator(_M_data() + __pos);
-	 }
-       else
-	 return __first;
-     }
-
-   template<typename _CharT, typename _Traits, typename _Alloc>
-     basic_string<_CharT, _Traits, _Alloc>&
-     basic_string<_CharT, _Traits, _Alloc>::
-     replace(size_type __pos, size_type __n1, const _CharT* __s,
-	     size_type __n2)
-     {
-       __glibcxx_requires_string_len(__s, __n2);
-       _M_check(__pos, "basic_string::replace");
-       __n1 = _M_limit(__pos, __n1);
-       _M_check_length(__n1, __n2, "basic_string::replace");
-       bool __left;
-       if (_M_disjunct(__s) || _M_rep()->_M_is_shared())
-         return _M_replace_safe(__pos, __n1, __s, __n2);
-       else if ((__left = __s + __n2 <= _M_data() + __pos)
-		|| _M_data() + __pos + __n1 <= __s)
-	 {
-	   // Work in-place: non-overlapping case.
-	   size_type __off = __s - _M_data();
-	   __left ? __off : (__off += __n2 - __n1);
-	   _M_mutate(__pos, __n1, __n2);
-	   _M_copy(_M_data() + __pos, _M_data() + __off, __n2);
-	   return *this;
-	 }
-       else
-	 {
-	   // Todo: overlapping case.
-	   const basic_string __tmp(__s, __n2);
-	   return _M_replace_safe(__pos, __n1, __tmp._M_data(), __n2);
-	 }
-     }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::_Rep::
-    _M_destroy(const _Alloc& __a) throw ()
-    {
-      const size_type __size = sizeof(_Rep_base) +
-	                       (this->_M_capacity + 1) * sizeof(_CharT);
-      _Raw_bytes_alloc(__a).deallocate(reinterpret_cast<char*>(this), __size);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_leak_hard()
-    {
-#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0
-      if (_M_rep() == &_S_empty_rep())
-	return;
-#endif
-      if (_M_rep()->_M_is_shared())
-	_M_mutate(0, 0, 0);
-      _M_rep()->_M_set_leaked();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_mutate(size_type __pos, size_type __len1, size_type __len2)
-    {
-      const size_type __old_size = this->size();
-      const size_type __new_size = __old_size + __len2 - __len1;
-      const size_type __how_much = __old_size - __pos - __len1;
-
-      if (__new_size > this->capacity() || _M_rep()->_M_is_shared())
-	{
-	  // Must reallocate.
-	  const allocator_type __a = get_allocator();
-	  _Rep* __r = _Rep::_S_create(__new_size, this->capacity(), __a);
-
-	  if (__pos)
-	    _M_copy(__r->_M_refdata(), _M_data(), __pos);
-	  if (__how_much)
-	    _M_copy(__r->_M_refdata() + __pos + __len2,
-		    _M_data() + __pos + __len1, __how_much);
-
-	  _M_rep()->_M_dispose(__a);
-	  _M_data(__r->_M_refdata());
-	}
-      else if (__how_much && __len1 != __len2)
-	{
-	  // Work in-place.
-	  _M_move(_M_data() + __pos + __len2,
-		  _M_data() + __pos + __len1, __how_much);
-	}
-      _M_rep()->_M_set_length_and_sharable(__new_size);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    reserve(size_type __res)
-    {
-      if (__res != this->capacity() || _M_rep()->_M_is_shared())
-        {
-	  // Make sure we don't shrink below the current size
-	  if (__res < this->size())
-	    __res = this->size();
-	  const allocator_type __a = get_allocator();
-	  _CharT* __tmp = _M_rep()->_M_clone(__a, __res - this->size());
-	  _M_rep()->_M_dispose(__a);
-	  _M_data(__tmp);
-        }
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    swap(basic_string& __s)
-    {
-      if (_M_rep()->_M_is_leaked())
-	_M_rep()->_M_set_sharable();
-      if (__s._M_rep()->_M_is_leaked())
-	__s._M_rep()->_M_set_sharable();
-      if (this->get_allocator() == __s.get_allocator())
-	{
-	  _CharT* __tmp = _M_data();
-	  _M_data(__s._M_data());
-	  __s._M_data(__tmp);
-	}
-      // The code below can usually be optimized away.
-      else
-	{
-	  const basic_string __tmp1(_M_ibegin(), _M_iend(),
-				    __s.get_allocator());
-	  const basic_string __tmp2(__s._M_ibegin(), __s._M_iend(),
-				    this->get_allocator());
-	  *this = __tmp2;
-	  __s = __tmp1;
-	}
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::_Rep*
-    basic_string<_CharT, _Traits, _Alloc>::_Rep::
-    _S_create(size_type __capacity, size_type __old_capacity,
-	      const _Alloc& __alloc)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 83.  String::npos vs. string::max_size()
-      if (__capacity > _S_max_size)
-	__throw_length_error(__N("basic_string::_S_create"));
-
-      // The standard places no restriction on allocating more memory
-      // than is strictly needed within this layer at the moment or as
-      // requested by an explicit application call to reserve().
-
-      // Many malloc implementations perform quite poorly when an
-      // application attempts to allocate memory in a stepwise fashion
-      // growing each allocation size by only 1 char.  Additionally,
-      // it makes little sense to allocate less linear memory than the
-      // natural blocking size of the malloc implementation.
-      // Unfortunately, we would need a somewhat low-level calculation
-      // with tuned parameters to get this perfect for any particular
-      // malloc implementation.  Fortunately, generalizations about
-      // common features seen among implementations seems to suffice.
-
-      // __pagesize need not match the actual VM page size for good
-      // results in practice, thus we pick a common value on the low
-      // side.  __malloc_header_size is an estimate of the amount of
-      // overhead per memory allocation (in practice seen N * sizeof
-      // (void*) where N is 0, 2 or 4).  According to folklore,
-      // picking this value on the high side is better than
-      // low-balling it (especially when this algorithm is used with
-      // malloc implementations that allocate memory blocks rounded up
-      // to a size which is a power of 2).
-      const size_type __pagesize = 4096;
-      const size_type __malloc_header_size = 4 * sizeof(void*);
-
-      // The below implements an exponential growth policy, necessary to
-      // meet amortized linear time requirements of the library: see
-      // http://gcc.gnu.org/ml/libstdc++/2001-07/msg00085.html.
-      // It's active for allocations requiring an amount of memory above
-      // system pagesize. This is consistent with the requirements of the
-      // standard: http://gcc.gnu.org/ml/libstdc++/2001-07/msg00130.html
-      if (__capacity > __old_capacity && __capacity < 2 * __old_capacity)
-	__capacity = 2 * __old_capacity;
-
-      // NB: Need an array of char_type[__capacity], plus a terminating
-      // null char_type() element, plus enough for the _Rep data structure.
-      // Whew. Seemingly so needy, yet so elemental.
-      size_type __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep);
-
-      const size_type __adj_size = __size + __malloc_header_size;
-      if (__adj_size > __pagesize && __capacity > __old_capacity)
-	{
-	  const size_type __extra = __pagesize - __adj_size % __pagesize;
-	  __capacity += __extra / sizeof(_CharT);
-	  // Never allocate a string bigger than _S_max_size.
-	  if (__capacity > _S_max_size)
-	    __capacity = _S_max_size;
-	  __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep);
-	}
-
-      // NB: Might throw, but no worries about a leak, mate: _Rep()
-      // does not throw.
-      void* __place = _Raw_bytes_alloc(__alloc).allocate(__size);
-      _Rep *__p = new (__place) _Rep;
-      __p->_M_capacity = __capacity;
-      // ABI compatibility - 3.4.x set in _S_create both
-      // _M_refcount and _M_length.  All callers of _S_create
-      // in basic_string.tcc then set just _M_length.
-      // In 4.0.x and later both _M_refcount and _M_length
-      // are initialized in the callers, unfortunately we can
-      // have 3.4.x compiled code with _S_create callers inlined
-      // calling 4.0.x+ _S_create.
-      __p->_M_set_sharable();
-      return __p;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    _CharT*
-    basic_string<_CharT, _Traits, _Alloc>::_Rep::
-    _M_clone(const _Alloc& __alloc, size_type __res)
-    {
-      // Requested capacity of the clone.
-      const size_type __requested_cap = this->_M_length + __res;
-      _Rep* __r = _Rep::_S_create(__requested_cap, this->_M_capacity,
-				  __alloc);
-      if (this->_M_length)
-	_M_copy(__r->_M_refdata(), _M_refdata(), this->_M_length);
-
-      __r->_M_set_length_and_sharable(this->_M_length);
-      return __r->_M_refdata();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    resize(size_type __n, _CharT __c)
-    {
-      const size_type __size = this->size();
-      _M_check_length(__size, __n, "basic_string::resize");
-      if (__size < __n)
-	this->append(__n - __size, __c);
-      else if (__n < __size)
-	this->erase(__n);
-      // else nothing (in particular, avoid calling _M_mutate() unnecessarily.)
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InputIterator>
-      basic_string<_CharT, _Traits, _Alloc>&
-      basic_string<_CharT, _Traits, _Alloc>::
-      _M_replace_dispatch(iterator __i1, iterator __i2, _InputIterator __k1,
-			  _InputIterator __k2, __false_type)
-      {
-	const basic_string __s(__k1, __k2);
-	const size_type __n1 = __i2 - __i1;
-	_M_check_length(__n1, __s.size(), "basic_string::_M_replace_dispatch");
-	return _M_replace_safe(__i1 - _M_ibegin(), __n1, __s._M_data(),
-			       __s.size());
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_replace_aux(size_type __pos1, size_type __n1, size_type __n2,
-		   _CharT __c)
-    {
-      _M_check_length(__n1, __n2, "basic_string::_M_replace_aux");
-      _M_mutate(__pos1, __n1, __n2);
-      if (__n2)
-	_M_assign(_M_data() + __pos1, __n2, __c);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_replace_safe(size_type __pos1, size_type __n1, const _CharT* __s,
-		    size_type __n2)
-    {
-      _M_mutate(__pos1, __n1, __n2);
-      if (__n2)
-	_M_copy(_M_data() + __pos1, __s, __n2);
-      return *this;
-    }
-
-    template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    copy(_CharT* __s, size_type __n, size_type __pos) const
-    {
-      _M_check(__pos, "basic_string::copy");
-      __n = _M_limit(__pos, __n);
-      __glibcxx_requires_string_len(__s, __n);
-      if (__n)
-	_M_copy(__s, _M_data() + __pos, __n);
-      // 21.3.5.7 par 3: do not append null.  (good.)
-      return __n;
-    }
-#endif  // !_GLIBCXX_USE_CXX11_ABI
-   
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>
-    operator+(const _CharT* __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    {
-      __glibcxx_requires_string(__lhs);
-      typedef basic_string<_CharT, _Traits, _Alloc> __string_type;
-      typedef typename __string_type::size_type	  __size_type;
-      const __size_type __len = _Traits::length(__lhs);
-      __string_type __str;
-      __str.reserve(__len + __rhs.size());
-      __str.append(__lhs, __len);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>
-    operator+(_CharT __lhs, const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    {
-      typedef basic_string<_CharT, _Traits, _Alloc> __string_type;
-      typedef typename __string_type::size_type	  __size_type;
-      __string_type __str;
-      const __size_type __len = __rhs.size();
-      __str.reserve(__len + 1);
-      __str.append(__size_type(1), __lhs);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      const size_type __size = this->size();
-      const _CharT* __data = _M_data();
-
-      if (__n == 0)
-	return __pos <= __size ? __pos : npos;
-
-      if (__n <= __size)
-	{
-	  for (; __pos <= __size - __n; ++__pos)
-	    if (traits_type::eq(__data[__pos], __s[0])
-		&& traits_type::compare(__data + __pos + 1,
-					__s + 1, __n - 1) == 0)
-	      return __pos;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find(_CharT __c, size_type __pos) const _GLIBCXX_NOEXCEPT
-    {
-      size_type __ret = npos;
-      const size_type __size = this->size();
-      if (__pos < __size)
-	{
-	  const _CharT* __data = _M_data();
-	  const size_type __n = __size - __pos;
-	  const _CharT* __p = traits_type::find(__data + __pos, __n, __c);
-	  if (__p)
-	    __ret = __p - __data;
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    rfind(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      const size_type __size = this->size();
-      if (__n <= __size)
-	{
-	  __pos = std::min(size_type(__size - __n), __pos);
-	  const _CharT* __data = _M_data();
-	  do
-	    {
-	      if (traits_type::compare(__data + __pos, __s, __n) == 0)
-		return __pos;
-	    }
-	  while (__pos-- > 0);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    rfind(_CharT __c, size_type __pos) const _GLIBCXX_NOEXCEPT
-    {
-      size_type __size = this->size();
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  for (++__size; __size-- > 0; )
-	    if (traits_type::eq(_M_data()[__size], __c))
-	      return __size;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_first_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      for (; __n && __pos < this->size(); ++__pos)
-	{
-	  const _CharT* __p = traits_type::find(__s, __n, _M_data()[__pos]);
-	  if (__p)
-	    return __pos;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_last_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      size_type __size = this->size();
-      if (__size && __n)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (traits_type::find(__s, __n, _M_data()[__size]))
-		return __size;
-	    }
-	  while (__size-- != 0);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_first_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      for (; __pos < this->size(); ++__pos)
-	if (!traits_type::find(__s, __n, _M_data()[__pos]))
-	  return __pos;
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_first_not_of(_CharT __c, size_type __pos) const _GLIBCXX_NOEXCEPT
-    {
-      for (; __pos < this->size(); ++__pos)
-	if (!traits_type::eq(_M_data()[__pos], __c))
-	  return __pos;
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_last_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      size_type __size = this->size();
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (!traits_type::find(__s, __n, _M_data()[__size]))
-		return __size;
-	    }
-	  while (__size--);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_last_not_of(_CharT __c, size_type __pos) const _GLIBCXX_NOEXCEPT
-    {
-      size_type __size = this->size();
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (!traits_type::eq(_M_data()[__size], __c))
-		return __size;
-	    }
-	  while (__size--);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    int
-    basic_string<_CharT, _Traits, _Alloc>::
-    compare(size_type __pos, size_type __n, const basic_string& __str) const
-    {
-      _M_check(__pos, "basic_string::compare");
-      __n = _M_limit(__pos, __n);
-      const size_type __osize = __str.size();
-      const size_type __len = std::min(__n, __osize);
-      int __r = traits_type::compare(_M_data() + __pos, __str.data(), __len);
-      if (!__r)
-	__r = _S_compare(__n, __osize);
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    int
-    basic_string<_CharT, _Traits, _Alloc>::
-    compare(size_type __pos1, size_type __n1, const basic_string& __str,
-	    size_type __pos2, size_type __n2) const
-    {
-      _M_check(__pos1, "basic_string::compare");
-      __str._M_check(__pos2, "basic_string::compare");
-      __n1 = _M_limit(__pos1, __n1);
-      __n2 = __str._M_limit(__pos2, __n2);
-      const size_type __len = std::min(__n1, __n2);
-      int __r = traits_type::compare(_M_data() + __pos1,
-				     __str.data() + __pos2, __len);
-      if (!__r)
-	__r = _S_compare(__n1, __n2);
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    int
-    basic_string<_CharT, _Traits, _Alloc>::
-    compare(const _CharT* __s) const
-    {
-      __glibcxx_requires_string(__s);
-      const size_type __size = this->size();
-      const size_type __osize = traits_type::length(__s);
-      const size_type __len = std::min(__size, __osize);
-      int __r = traits_type::compare(_M_data(), __s, __len);
-      if (!__r)
-	__r = _S_compare(__size, __osize);
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    int
-    basic_string <_CharT, _Traits, _Alloc>::
-    compare(size_type __pos, size_type __n1, const _CharT* __s) const
-    {
-      __glibcxx_requires_string(__s);
-      _M_check(__pos, "basic_string::compare");
-      __n1 = _M_limit(__pos, __n1);
-      const size_type __osize = traits_type::length(__s);
-      const size_type __len = std::min(__n1, __osize);
-      int __r = traits_type::compare(_M_data() + __pos, __s, __len);
-      if (!__r)
-	__r = _S_compare(__n1, __osize);
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    int
-    basic_string <_CharT, _Traits, _Alloc>::
-    compare(size_type __pos, size_type __n1, const _CharT* __s,
-	    size_type __n2) const
-    {
-      __glibcxx_requires_string_len(__s, __n2);
-      _M_check(__pos, "basic_string::compare");
-      __n1 = _M_limit(__pos, __n1);
-      const size_type __len = std::min(__n1, __n2);
-      int __r = traits_type::compare(_M_data() + __pos, __s, __len);
-      if (!__r)
-	__r = _S_compare(__n1, __n2);
-      return __r;
-    }
-
-  // 21.3.7.9 basic_string::getline and operators
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in,
-	       basic_string<_CharT, _Traits, _Alloc>& __str)
-    {
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef basic_string<_CharT, _Traits, _Alloc>	__string_type;
-      typedef typename __istream_type::ios_base         __ios_base;
-      typedef typename __istream_type::int_type		__int_type;
-      typedef typename __string_type::size_type		__size_type;
-      typedef ctype<_CharT>				__ctype_type;
-      typedef typename __ctype_type::ctype_base         __ctype_base;
-
-      __size_type __extracted = 0;
-      typename __ios_base::iostate __err = __ios_base::goodbit;
-      typename __istream_type::sentry __cerb(__in, false);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      // Avoid reallocation for common case.
-	      __str.erase();
-	      _CharT __buf[128];
-	      __size_type __len = 0;	      
-	      const streamsize __w = __in.width();
-	      const __size_type __n = __w > 0 ? static_cast<__size_type>(__w)
-		                              : __str.max_size();
-	      const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
-	      const __int_type __eof = _Traits::eof();
-	      __int_type __c = __in.rdbuf()->sgetc();
-
-	      while (__extracted < __n
-		     && !_Traits::eq_int_type(__c, __eof)
-		     && !__ct.is(__ctype_base::space,
-				 _Traits::to_char_type(__c)))
-		{
-		  if (__len == sizeof(__buf) / sizeof(_CharT))
-		    {
-		      __str.append(__buf, sizeof(__buf) / sizeof(_CharT));
-		      __len = 0;
-		    }
-		  __buf[__len++] = _Traits::to_char_type(__c);
-		  ++__extracted;
-		  __c = __in.rdbuf()->snextc();
-		}
-	      __str.append(__buf, __len);
-
-	      if (_Traits::eq_int_type(__c, __eof))
-		__err |= __ios_base::eofbit;
-	      __in.width(0);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __in._M_setstate(__ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 91. Description of operator>> and getline() for string<>
-	      // might cause endless loop
-	      __in._M_setstate(__ios_base::badbit);
-	    }
-	}
-      // 211.  operator>>(istream&, string&) doesn't set failbit
-      if (!__extracted)
-	__err |= __ios_base::failbit;
-      if (__err)
-	__in.setstate(__err);
-      return __in;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT, _Traits>&
-    getline(basic_istream<_CharT, _Traits>& __in,
-	    basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim)
-    {
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef basic_string<_CharT, _Traits, _Alloc>	__string_type;
-      typedef typename __istream_type::ios_base         __ios_base;
-      typedef typename __istream_type::int_type		__int_type;
-      typedef typename __string_type::size_type		__size_type;
-
-      __size_type __extracted = 0;
-      const __size_type __n = __str.max_size();
-      typename __ios_base::iostate __err = __ios_base::goodbit;
-      typename __istream_type::sentry __cerb(__in, true);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      __str.erase();
-	      const __int_type __idelim = _Traits::to_int_type(__delim);
-	      const __int_type __eof = _Traits::eof();
-	      __int_type __c = __in.rdbuf()->sgetc();
-
-	      while (__extracted < __n
-		     && !_Traits::eq_int_type(__c, __eof)
-		     && !_Traits::eq_int_type(__c, __idelim))
-		{
-		  __str += _Traits::to_char_type(__c);
-		  ++__extracted;
-		  __c = __in.rdbuf()->snextc();
-		}
-
-	      if (_Traits::eq_int_type(__c, __eof))
-		__err |= __ios_base::eofbit;
-	      else if (_Traits::eq_int_type(__c, __idelim))
-		{
-		  ++__extracted;		  
-		  __in.rdbuf()->sbumpc();
-		}
-	      else
-		__err |= __ios_base::failbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __in._M_setstate(__ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 91. Description of operator>> and getline() for string<>
-	      // might cause endless loop
-	      __in._M_setstate(__ios_base::badbit);
-	    }
-	}
-      if (!__extracted)
-	__err |= __ios_base::failbit;
-      if (__err)
-	__in.setstate(__err);
-      return __in;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE > 0
-  extern template class basic_string<char>;
-  extern template
-    basic_istream<char>&
-    operator>>(basic_istream<char>&, string&);
-  extern template
-    basic_ostream<char>&
-    operator<<(basic_ostream<char>&, const string&);
-  extern template
-    basic_istream<char>&
-    getline(basic_istream<char>&, string&, char);
-  extern template
-    basic_istream<char>&
-    getline(basic_istream<char>&, string&);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_string<wchar_t>;
-  extern template
-    basic_istream<wchar_t>&
-    operator>>(basic_istream<wchar_t>&, wstring&);
-  extern template
-    basic_ostream<wchar_t>&
-    operator<<(basic_ostream<wchar_t>&, const wstring&);
-  extern template
-    basic_istream<wchar_t>&
-    getline(basic_istream<wchar_t>&, wstring&, wchar_t);
-  extern template
-    basic_istream<wchar_t>&
-    getline(basic_istream<wchar_t>&, wstring&);
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/boost_concept_check.h b/openflow/usr/include/c++/5/bits/boost_concept_check.h
deleted file mode 100644
index 89e3ec7..0000000
--- a/openflow/usr/include/c++/5/bits/boost_concept_check.h
+++ /dev/null
@@ -1,790 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// (C) Copyright Jeremy Siek 2000. Permission to copy, use, modify,
-// sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-//
-
-/** @file bits/boost_concept_check.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iterator}
- */
-
-// GCC Note:  based on version 1.12.0 of the Boost library.
-
-#ifndef _BOOST_CONCEPT_CHECK_H
-#define _BOOST_CONCEPT_CHECK_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stl_iterator_base_types.h>    // for traits and tags
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#define _IsUnused __attribute__ ((__unused__))
-
-// When the C-C code is in use, we would like this function to do as little
-// as possible at runtime, use as few resources as possible, and hopefully
-// be elided out of existence... hmmm.
-template <class _Concept>
-inline void __function_requires()
-{
-  void (_Concept::*__x)() _IsUnused = &_Concept::__constraints;
-}
-
-// No definition: if this is referenced, there's a problem with
-// the instantiating type not being one of the required integer types.
-// Unfortunately, this results in a link-time error, not a compile-time error.
-void __error_type_must_be_an_integer_type();
-void __error_type_must_be_an_unsigned_integer_type();
-void __error_type_must_be_a_signed_integer_type();
-
-// ??? Should the "concept_checking*" structs begin with more than _ ?
-#define _GLIBCXX_CLASS_REQUIRES(_type_var, _ns, _concept) \
-  typedef void (_ns::_concept <_type_var>::* _func##_type_var##_concept)(); \
-  template <_func##_type_var##_concept _Tp1> \
-  struct _concept_checking##_type_var##_concept { }; \
-  typedef _concept_checking##_type_var##_concept< \
-    &_ns::_concept <_type_var>::__constraints> \
-    _concept_checking_typedef##_type_var##_concept
-
-#define _GLIBCXX_CLASS_REQUIRES2(_type_var1, _type_var2, _ns, _concept) \
-  typedef void (_ns::_concept <_type_var1,_type_var2>::* _func##_type_var1##_type_var2##_concept)(); \
-  template <_func##_type_var1##_type_var2##_concept _Tp1> \
-  struct _concept_checking##_type_var1##_type_var2##_concept { }; \
-  typedef _concept_checking##_type_var1##_type_var2##_concept< \
-    &_ns::_concept <_type_var1,_type_var2>::__constraints> \
-    _concept_checking_typedef##_type_var1##_type_var2##_concept
-
-#define _GLIBCXX_CLASS_REQUIRES3(_type_var1, _type_var2, _type_var3, _ns, _concept) \
-  typedef void (_ns::_concept <_type_var1,_type_var2,_type_var3>::* _func##_type_var1##_type_var2##_type_var3##_concept)(); \
-  template <_func##_type_var1##_type_var2##_type_var3##_concept _Tp1> \
-  struct _concept_checking##_type_var1##_type_var2##_type_var3##_concept { }; \
-  typedef _concept_checking##_type_var1##_type_var2##_type_var3##_concept< \
-    &_ns::_concept <_type_var1,_type_var2,_type_var3>::__constraints>  \
-  _concept_checking_typedef##_type_var1##_type_var2##_type_var3##_concept
-
-#define _GLIBCXX_CLASS_REQUIRES4(_type_var1, _type_var2, _type_var3, _type_var4, _ns, _concept) \
-  typedef void (_ns::_concept <_type_var1,_type_var2,_type_var3,_type_var4>::* _func##_type_var1##_type_var2##_type_var3##_type_var4##_concept)(); \
-  template <_func##_type_var1##_type_var2##_type_var3##_type_var4##_concept _Tp1> \
-  struct _concept_checking##_type_var1##_type_var2##_type_var3##_type_var4##_concept { }; \
-  typedef _concept_checking##_type_var1##_type_var2##_type_var3##_type_var4##_concept< \
-  &_ns::_concept <_type_var1,_type_var2,_type_var3,_type_var4>::__constraints> \
-    _concept_checking_typedef##_type_var1##_type_var2##_type_var3##_type_var4##_concept
-
-
-template <class _Tp1, class _Tp2>
-struct _Aux_require_same { };
-
-template <class _Tp>
-struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
-
-  template <class _Tp1, class _Tp2>
-  struct _SameTypeConcept
-  {
-    void __constraints() {
-      typedef typename _Aux_require_same<_Tp1, _Tp2>::_Type _Required;
-    }
-  };
-
-  template <class _Tp>
-  struct _IntegerConcept {
-    void __constraints() {
-      __error_type_must_be_an_integer_type();
-    }
-  };
-  template <> struct _IntegerConcept<short> { void __constraints() {} };
-  template <> struct _IntegerConcept<unsigned short> { void __constraints(){} };
-  template <> struct _IntegerConcept<int> { void __constraints() {} };
-  template <> struct _IntegerConcept<unsigned int> { void __constraints() {} };
-  template <> struct _IntegerConcept<long> { void __constraints() {} };
-  template <> struct _IntegerConcept<unsigned long> { void __constraints() {} };
-  template <> struct _IntegerConcept<long long> { void __constraints() {} };
-  template <> struct _IntegerConcept<unsigned long long>
-                                                { void __constraints() {} };
-
-  template <class _Tp>
-  struct _SignedIntegerConcept {
-    void __constraints() {
-      __error_type_must_be_a_signed_integer_type();
-    }
-  };
-  template <> struct _SignedIntegerConcept<short> { void __constraints() {} };
-  template <> struct _SignedIntegerConcept<int> { void __constraints() {} };
-  template <> struct _SignedIntegerConcept<long> { void __constraints() {} };
-  template <> struct _SignedIntegerConcept<long long> { void __constraints(){}};
-
-  template <class _Tp>
-  struct _UnsignedIntegerConcept {
-    void __constraints() {
-      __error_type_must_be_an_unsigned_integer_type();
-    }
-  };
-  template <> struct _UnsignedIntegerConcept<unsigned short>
-    { void __constraints() {} };
-  template <> struct _UnsignedIntegerConcept<unsigned int>
-    { void __constraints() {} };
-  template <> struct _UnsignedIntegerConcept<unsigned long>
-    { void __constraints() {} };
-  template <> struct _UnsignedIntegerConcept<unsigned long long>
-    { void __constraints() {} };
-
-  //===========================================================================
-  // Basic Concepts
-
-  template <class _Tp>
-  struct _DefaultConstructibleConcept
-  {
-    void __constraints() {
-      _Tp __a _IsUnused;                // require default constructor
-    }
-  };
-
-  template <class _Tp>
-  struct _AssignableConcept
-  {
-    void __constraints() {
-      __a = __a;                        // require assignment operator
-      __const_constraints(__a);
-    }
-    void __const_constraints(const _Tp& __b) {
-      __a = __b;                   // const required for argument to assignment
-    }
-    _Tp __a;
-    // possibly should be "Tp* a;" and then dereference "a" in constraint
-    // functions?  present way would require a default ctor, i think...
-  };
-
-  template <class _Tp>
-  struct _CopyConstructibleConcept
-  {
-    void __constraints() {
-      _Tp __a(__b);                     // require copy constructor
-      _Tp* __ptr _IsUnused = &__a;      // require address of operator
-      __const_constraints(__a);
-    }
-    void __const_constraints(const _Tp& __a) {
-      _Tp __c _IsUnused(__a);           // require const copy constructor
-      const _Tp* __ptr _IsUnused = &__a; // require const address of operator
-    }
-    _Tp __b;
-  };
-
-  // The SGI STL version of Assignable requires copy constructor and operator=
-  template <class _Tp>
-  struct _SGIAssignableConcept
-  {
-    void __constraints() {
-      _Tp __b _IsUnused(__a);
-      __a = __a;                        // require assignment operator
-      __const_constraints(__a);
-    }
-    void __const_constraints(const _Tp& __b) {
-      _Tp __c _IsUnused(__b);
-      __a = __b;              // const required for argument to assignment
-    }
-    _Tp __a;
-  };
-
-  template <class _From, class _To>
-  struct _ConvertibleConcept
-  {
-    void __constraints() {
-      _To __y _IsUnused = __x;
-    }
-    _From __x;
-  };
-
-  // The C++ standard requirements for many concepts talk about return
-  // types that must be "convertible to bool".  The problem with this
-  // requirement is that it leaves the door open for evil proxies that
-  // define things like operator|| with strange return types.  Two
-  // possible solutions are:
-  // 1) require the return type to be exactly bool
-  // 2) stay with convertible to bool, and also
-  //    specify stuff about all the logical operators.
-  // For now we just test for convertible to bool.
-  template <class _Tp>
-  void __aux_require_boolean_expr(const _Tp& __t) {
-    bool __x _IsUnused = __t;
-  }
-
-// FIXME
-  template <class _Tp>
-  struct _EqualityComparableConcept
-  {
-    void __constraints() {
-      __aux_require_boolean_expr(__a == __b);
-    }
-    _Tp __a, __b;
-  };
-
-  template <class _Tp>
-  struct _LessThanComparableConcept
-  {
-    void __constraints() {
-      __aux_require_boolean_expr(__a < __b);
-    }
-    _Tp __a, __b;
-  };
-
-  // This is equivalent to SGI STL's LessThanComparable.
-  template <class _Tp>
-  struct _ComparableConcept
-  {
-    void __constraints() {
-      __aux_require_boolean_expr(__a < __b);
-      __aux_require_boolean_expr(__a > __b);
-      __aux_require_boolean_expr(__a <= __b);
-      __aux_require_boolean_expr(__a >= __b);
-    }
-    _Tp __a, __b;
-  };
-
-#define _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(_OP,_NAME) \
-  template <class _First, class _Second> \
-  struct _NAME { \
-    void __constraints() { (void)__constraints_(); } \
-    bool __constraints_() {  \
-      return  __a _OP __b; \
-    } \
-    _First __a; \
-    _Second __b; \
-  }
-
-#define _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(_OP,_NAME) \
-  template <class _Ret, class _First, class _Second> \
-  struct _NAME { \
-    void __constraints() { (void)__constraints_(); } \
-    _Ret __constraints_() {  \
-      return __a _OP __b; \
-    } \
-    _First __a; \
-    _Second __b; \
-  }
-
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(==, _EqualOpConcept);
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(!=, _NotEqualOpConcept);
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<, _LessThanOpConcept);
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<=, _LessEqualOpConcept);
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>, _GreaterThanOpConcept);
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>=, _GreaterEqualOpConcept);
-
-  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(+, _PlusOpConcept);
-  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(*, _TimesOpConcept);
-  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(/, _DivideOpConcept);
-  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(-, _SubtractOpConcept);
-  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(%, _ModOpConcept);
-
-#undef _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT
-#undef _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT
-
-  //===========================================================================
-  // Function Object Concepts
-
-  template <class _Func, class _Return>
-  struct _GeneratorConcept
-  {
-    void __constraints() {
-      const _Return& __r _IsUnused = __f();// require operator() member function
-    }
-    _Func __f;
-  };
-
-
-  template <class _Func>
-  struct _GeneratorConcept<_Func,void>
-  {
-    void __constraints() {
-      __f();                            // require operator() member function
-    }
-    _Func __f;
-  };
-
-  template <class _Func, class _Return, class _Arg>
-  struct _UnaryFunctionConcept
-  {
-    void __constraints() {
-      __r = __f(__arg);                  // require operator()
-    }
-    _Func __f;
-    _Arg __arg;
-    _Return __r;
-  };
-
-  template <class _Func, class _Arg>
-  struct _UnaryFunctionConcept<_Func, void, _Arg> {
-    void __constraints() {
-      __f(__arg);                       // require operator()
-    }
-    _Func __f;
-    _Arg __arg;
-  };
-
-  template <class _Func, class _Return, class _First, class _Second>
-  struct _BinaryFunctionConcept
-  {
-    void __constraints() {
-      __r = __f(__first, __second);     // require operator()
-    }
-    _Func __f;
-    _First __first;
-    _Second __second;
-    _Return __r;
-  };
-
-  template <class _Func, class _First, class _Second>
-  struct _BinaryFunctionConcept<_Func, void, _First, _Second>
-  {
-    void __constraints() {
-      __f(__first, __second);           // require operator()
-    }
-    _Func __f;
-    _First __first;
-    _Second __second;
-  };
-
-  template <class _Func, class _Arg>
-  struct _UnaryPredicateConcept
-  {
-    void __constraints() {
-      __aux_require_boolean_expr(__f(__arg)); // require op() returning bool
-    }
-    _Func __f;
-    _Arg __arg;
-  };
-
-  template <class _Func, class _First, class _Second>
-  struct _BinaryPredicateConcept
-  {
-    void __constraints() {
-      __aux_require_boolean_expr(__f(__a, __b)); // require op() returning bool
-    }
-    _Func __f;
-    _First __a;
-    _Second __b;
-  };
-
-  // use this when functor is used inside a container class like std::set
-  template <class _Func, class _First, class _Second>
-  struct _Const_BinaryPredicateConcept {
-    void __constraints() {
-      __const_constraints(__f);
-    }
-    void __const_constraints(const _Func& __fun) {
-      __function_requires<_BinaryPredicateConcept<_Func, _First, _Second> >();
-      // operator() must be a const member function
-      __aux_require_boolean_expr(__fun(__a, __b));
-    }
-    _Func __f;
-    _First __a;
-    _Second __b;
-  };
-
-  //===========================================================================
-  // Iterator Concepts
-
-  template <class _Tp>
-  struct _TrivialIteratorConcept
-  {
-    void __constraints() {
-//    __function_requires< _DefaultConstructibleConcept<_Tp> >();
-      __function_requires< _AssignableConcept<_Tp> >();
-      __function_requires< _EqualityComparableConcept<_Tp> >();
-//      typedef typename std::iterator_traits<_Tp>::value_type _V;
-      (void)*__i;                       // require dereference operator
-    }
-    _Tp __i;
-  };
-
-  template <class _Tp>
-  struct _Mutable_TrivialIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _TrivialIteratorConcept<_Tp> >();
-      *__i = *__j;                      // require dereference and assignment
-    }
-    _Tp __i, __j;
-  };
-
-  template <class _Tp>
-  struct _InputIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _TrivialIteratorConcept<_Tp> >();
-      // require iterator_traits typedef's
-      typedef typename std::iterator_traits<_Tp>::difference_type _Diff;
-//      __function_requires< _SignedIntegerConcept<_Diff> >();
-      typedef typename std::iterator_traits<_Tp>::reference _Ref;
-      typedef typename std::iterator_traits<_Tp>::pointer _Pt;
-      typedef typename std::iterator_traits<_Tp>::iterator_category _Cat;
-      __function_requires< _ConvertibleConcept<
-        typename std::iterator_traits<_Tp>::iterator_category,
-        std::input_iterator_tag> >();
-      ++__i;                            // require preincrement operator
-      __i++;                            // require postincrement operator
-    }
-    _Tp __i;
-  };
-
-  template <class _Tp, class _ValueT>
-  struct _OutputIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _AssignableConcept<_Tp> >();
-      ++__i;                            // require preincrement operator
-      __i++;                            // require postincrement operator
-      *__i++ = __t;                     // require postincrement and assignment
-    }
-    _Tp __i;
-    _ValueT __t;
-  };
-
-  template <class _Tp>
-  struct _ForwardIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _InputIteratorConcept<_Tp> >();
-      __function_requires< _DefaultConstructibleConcept<_Tp> >();
-      __function_requires< _ConvertibleConcept<
-        typename std::iterator_traits<_Tp>::iterator_category,
-        std::forward_iterator_tag> >();
-      typedef typename std::iterator_traits<_Tp>::reference _Ref;
-      _Ref __r _IsUnused = *__i;
-    }
-    _Tp __i;
-  };
-
-  template <class _Tp>
-  struct _Mutable_ForwardIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _ForwardIteratorConcept<_Tp> >();
-      *__i++ = *__i;                    // require postincrement and assignment
-    }
-    _Tp __i;
-  };
-
-  template <class _Tp>
-  struct _BidirectionalIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _ForwardIteratorConcept<_Tp> >();
-      __function_requires< _ConvertibleConcept<
-        typename std::iterator_traits<_Tp>::iterator_category,
-        std::bidirectional_iterator_tag> >();
-      --__i;                            // require predecrement operator
-      __i--;                            // require postdecrement operator
-    }
-    _Tp __i;
-  };
-
-  template <class _Tp>
-  struct _Mutable_BidirectionalIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _BidirectionalIteratorConcept<_Tp> >();
-      __function_requires< _Mutable_ForwardIteratorConcept<_Tp> >();
-      *__i-- = *__i;                    // require postdecrement and assignment
-    }
-    _Tp __i;
-  };
-
-
-  template <class _Tp>
-  struct _RandomAccessIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _BidirectionalIteratorConcept<_Tp> >();
-      __function_requires< _ComparableConcept<_Tp> >();
-      __function_requires< _ConvertibleConcept<
-        typename std::iterator_traits<_Tp>::iterator_category,
-        std::random_access_iterator_tag> >();
-      // ??? We don't use _Ref, are we just checking for "referenceability"?
-      typedef typename std::iterator_traits<_Tp>::reference _Ref;
-
-      __i += __n;                       // require assignment addition operator
-      __i = __i + __n; __i = __n + __i; // require addition with difference type
-      __i -= __n;                       // require assignment subtraction op
-      __i = __i - __n;                  // require subtraction with
-                                        //            difference type
-      __n = __i - __j;                  // require difference operator
-      (void)__i[__n];                   // require element access operator
-    }
-    _Tp __a, __b;
-    _Tp __i, __j;
-    typename std::iterator_traits<_Tp>::difference_type __n;
-  };
-
-  template <class _Tp>
-  struct _Mutable_RandomAccessIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _RandomAccessIteratorConcept<_Tp> >();
-      __function_requires< _Mutable_BidirectionalIteratorConcept<_Tp> >();
-      __i[__n] = *__i;                  // require element access and assignment
-    }
-    _Tp __i;
-    typename std::iterator_traits<_Tp>::difference_type __n;
-  };
-
-  //===========================================================================
-  // Container Concepts
-
-  template <class _Container>
-  struct _ContainerConcept
-  {
-    typedef typename _Container::value_type _Value_type;
-    typedef typename _Container::difference_type _Difference_type;
-    typedef typename _Container::size_type _Size_type;
-    typedef typename _Container::const_reference _Const_reference;
-    typedef typename _Container::const_pointer _Const_pointer;
-    typedef typename _Container::const_iterator _Const_iterator;
-
-    void __constraints() {
-      __function_requires< _InputIteratorConcept<_Const_iterator> >();
-      __function_requires< _AssignableConcept<_Container> >();
-      const _Container __c;
-      __i = __c.begin();
-      __i = __c.end();
-      __n = __c.size();
-      __n = __c.max_size();
-      __b = __c.empty();
-    }
-    bool __b;
-    _Const_iterator __i;
-    _Size_type __n;
-  };
-
-  template <class _Container>
-  struct _Mutable_ContainerConcept
-  {
-    typedef typename _Container::value_type _Value_type;
-    typedef typename _Container::reference _Reference;
-    typedef typename _Container::iterator _Iterator;
-    typedef typename _Container::pointer _Pointer;
-
-    void __constraints() {
-      __function_requires< _ContainerConcept<_Container> >();
-      __function_requires< _AssignableConcept<_Value_type> >();
-      __function_requires< _InputIteratorConcept<_Iterator> >();
-
-      __i = __c.begin();
-      __i = __c.end();
-      __c.swap(__c2);
-    }
-    _Iterator __i;
-    _Container __c, __c2;
-  };
-
-  template <class _ForwardContainer>
-  struct _ForwardContainerConcept
-  {
-    void __constraints() {
-      __function_requires< _ContainerConcept<_ForwardContainer> >();
-      typedef typename _ForwardContainer::const_iterator _Const_iterator;
-      __function_requires< _ForwardIteratorConcept<_Const_iterator> >();
-    }
-  };
-
-  template <class _ForwardContainer>
-  struct _Mutable_ForwardContainerConcept
-  {
-    void __constraints() {
-      __function_requires< _ForwardContainerConcept<_ForwardContainer> >();
-      __function_requires< _Mutable_ContainerConcept<_ForwardContainer> >();
-      typedef typename _ForwardContainer::iterator _Iterator;
-      __function_requires< _Mutable_ForwardIteratorConcept<_Iterator> >();
-    }
-  };
-
-  template <class _ReversibleContainer>
-  struct _ReversibleContainerConcept
-  {
-    typedef typename _ReversibleContainer::const_iterator _Const_iterator;
-    typedef typename _ReversibleContainer::const_reverse_iterator
-      _Const_reverse_iterator;
-
-    void __constraints() {
-      __function_requires< _ForwardContainerConcept<_ReversibleContainer> >();
-      __function_requires< _BidirectionalIteratorConcept<_Const_iterator> >();
-      __function_requires<
-        _BidirectionalIteratorConcept<_Const_reverse_iterator> >();
-
-      const _ReversibleContainer __c;
-      _Const_reverse_iterator __i = __c.rbegin();
-      __i = __c.rend();
-    }
-  };
-
-  template <class _ReversibleContainer>
-  struct _Mutable_ReversibleContainerConcept
-  {
-    typedef typename _ReversibleContainer::iterator _Iterator;
-    typedef typename _ReversibleContainer::reverse_iterator _Reverse_iterator;
-
-    void __constraints() {
-      __function_requires<_ReversibleContainerConcept<_ReversibleContainer> >();
-      __function_requires<
-        _Mutable_ForwardContainerConcept<_ReversibleContainer> >();
-      __function_requires<_Mutable_BidirectionalIteratorConcept<_Iterator> >();
-      __function_requires<
-        _Mutable_BidirectionalIteratorConcept<_Reverse_iterator> >();
-
-      _Reverse_iterator __i = __c.rbegin();
-      __i = __c.rend();
-    }
-    _ReversibleContainer __c;
-  };
-
-  template <class _RandomAccessContainer>
-  struct _RandomAccessContainerConcept
-  {
-    typedef typename _RandomAccessContainer::size_type _Size_type;
-    typedef typename _RandomAccessContainer::const_reference _Const_reference;
-    typedef typename _RandomAccessContainer::const_iterator _Const_iterator;
-    typedef typename _RandomAccessContainer::const_reverse_iterator
-      _Const_reverse_iterator;
-
-    void __constraints() {
-      __function_requires<
-        _ReversibleContainerConcept<_RandomAccessContainer> >();
-      __function_requires< _RandomAccessIteratorConcept<_Const_iterator> >();
-      __function_requires<
-        _RandomAccessIteratorConcept<_Const_reverse_iterator> >();
-
-      const _RandomAccessContainer __c;
-      _Const_reference __r _IsUnused = __c[__n];
-    }
-    _Size_type __n;
-  };
-
-  template <class _RandomAccessContainer>
-  struct _Mutable_RandomAccessContainerConcept
-  {
-    typedef typename _RandomAccessContainer::size_type _Size_type;
-    typedef typename _RandomAccessContainer::reference _Reference;
-    typedef typename _RandomAccessContainer::iterator _Iterator;
-    typedef typename _RandomAccessContainer::reverse_iterator _Reverse_iterator;
-
-    void __constraints() {
-      __function_requires<
-        _RandomAccessContainerConcept<_RandomAccessContainer> >();
-      __function_requires<
-        _Mutable_ReversibleContainerConcept<_RandomAccessContainer> >();
-      __function_requires< _Mutable_RandomAccessIteratorConcept<_Iterator> >();
-      __function_requires<
-        _Mutable_RandomAccessIteratorConcept<_Reverse_iterator> >();
-
-      _Reference __r _IsUnused = __c[__i];
-    }
-    _Size_type __i;
-    _RandomAccessContainer __c;
-  };
-
-  // A Sequence is inherently mutable
-  template <class _Sequence>
-  struct _SequenceConcept
-  {
-    typedef typename _Sequence::reference _Reference;
-    typedef typename _Sequence::const_reference _Const_reference;
-
-    void __constraints() {
-      // Matt Austern's book puts DefaultConstructible here, the C++
-      // standard places it in Container
-      //    function_requires< DefaultConstructible<Sequence> >();
-      __function_requires< _Mutable_ForwardContainerConcept<_Sequence> >();
-      __function_requires< _DefaultConstructibleConcept<_Sequence> >();
-
-      _Sequence
-	__c _IsUnused(__n, __t),
-        __c2 _IsUnused(__first, __last);
-
-      __c.insert(__p, __t);
-      __c.insert(__p, __n, __t);
-      __c.insert(__p, __first, __last);
-
-      __c.erase(__p);
-      __c.erase(__p, __q);
-
-      _Reference __r _IsUnused = __c.front();
-
-      __const_constraints(__c);
-    }
-    void __const_constraints(const _Sequence& __c) {
-      _Const_reference __r _IsUnused = __c.front();
-    }
-    typename _Sequence::value_type __t;
-    typename _Sequence::size_type __n;
-    typename _Sequence::value_type *__first, *__last;
-    typename _Sequence::iterator __p, __q;
-  };
-
-  template <class _FrontInsertionSequence>
-  struct _FrontInsertionSequenceConcept
-  {
-    void __constraints() {
-      __function_requires< _SequenceConcept<_FrontInsertionSequence> >();
-
-      __c.push_front(__t);
-      __c.pop_front();
-    }
-    _FrontInsertionSequence __c;
-    typename _FrontInsertionSequence::value_type __t;
-  };
-
-  template <class _BackInsertionSequence>
-  struct _BackInsertionSequenceConcept
-  {
-    typedef typename _BackInsertionSequence::reference _Reference;
-    typedef typename _BackInsertionSequence::const_reference _Const_reference;
-
-    void __constraints() {
-      __function_requires< _SequenceConcept<_BackInsertionSequence> >();
-
-      __c.push_back(__t);
-      __c.pop_back();
-      _Reference __r _IsUnused = __c.back();
-    }
-    void __const_constraints(const _BackInsertionSequence& __c) {
-      _Const_reference __r _IsUnused = __c.back();
-    };
-    _BackInsertionSequence __c;
-    typename _BackInsertionSequence::value_type __t;
-  };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#undef _IsUnused
-
-#endif // _GLIBCXX_BOOST_CONCEPT_CHECK
-
-
diff --git a/openflow/usr/include/c++/5/bits/c++0x_warning.h b/openflow/usr/include/c++/5/bits/c++0x_warning.h
deleted file mode 100644
index dabc2c4..0000000
--- a/openflow/usr/include/c++/5/bits/c++0x_warning.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/c++0x_warning.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iosfwd}
- */
-
-#ifndef _CXX0X_WARNING_H
-#define _CXX0X_WARNING_H 1
-
-#if __cplusplus < 201103L
-#error This file requires compiler and library support \
-for the ISO C++ 2011 standard. This support must be enabled \
-with the -std=c++11 or -std=gnu++11 compiler options.
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/c++14_warning.h b/openflow/usr/include/c++/5/bits/c++14_warning.h
deleted file mode 100644
index 295794f..0000000
--- a/openflow/usr/include/c++/5/bits/c++14_warning.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/c++14_warning.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iosfwd}
- */
-
-#ifndef _CXX14_WARNING_H
-#define _CXX14_WARNING_H 1
-
-#if __cplusplus <= 201103L
-#error This file requires compiler and library support for the forthcoming \
-ISO C++ 2014 standard. This support is currently experimental, and must be \
-enabled with the -std=c++1y or -std=gnu++1y compiler options.
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/char_traits.h b/openflow/usr/include/c++/5/bits/char_traits.h
deleted file mode 100644
index 0d0063b..0000000
--- a/openflow/usr/include/c++/5/bits/char_traits.h
+++ /dev/null
@@ -1,625 +0,0 @@
-// Character Traits for use by standard string and iostream -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/char_traits.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{string}
- */
-
-//
-// ISO C++ 14882: 21  Strings library
-//
-
-#ifndef _CHAR_TRAITS_H
-#define _CHAR_TRAITS_H 1
-
-#pragma GCC system_header
-
-#include <bits/stl_algobase.h>  // std::copy, std::fill_n
-#include <bits/postypes.h>      // For streampos
-#include <cwchar>               // For WEOF, wmemmove, wmemset, etc.
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief  Mapping from character type to associated types.
-   *
-   *  @note This is an implementation class for the generic version
-   *  of char_traits.  It defines int_type, off_type, pos_type, and
-   *  state_type.  By default these are unsigned long, streamoff,
-   *  streampos, and mbstate_t.  Users who need a different set of
-   *  types, but who don't need to change the definitions of any function
-   *  defined in char_traits, can specialize __gnu_cxx::_Char_types
-   *  while leaving __gnu_cxx::char_traits alone. */
-  template<typename _CharT>
-    struct _Char_types
-    {
-      typedef unsigned long   int_type;
-      typedef std::streampos  pos_type;
-      typedef std::streamoff  off_type;
-      typedef std::mbstate_t  state_type;
-    };
-
-
-  /**
-   *  @brief  Base class used to implement std::char_traits.
-   *
-   *  @note For any given actual character type, this definition is
-   *  probably wrong.  (Most of the member functions are likely to be
-   *  right, but the int_type and state_type typedefs, and the eof()
-   *  member function, are likely to be wrong.)  The reason this class
-   *  exists is so users can specialize it.  Classes in namespace std
-   *  may not be specialized for fundamental types, but classes in
-   *  namespace __gnu_cxx may be.
-   *
-   *  See https://gcc.gnu.org/onlinedocs/libstdc++/manual/strings.html#strings.string.character_types
-   *  for advice on how to make use of this class for @a unusual character
-   *  types. Also, check out include/ext/pod_char_traits.h.  
-   */
-  template<typename _CharT>
-    struct char_traits
-    {
-      typedef _CharT                                    char_type;
-      typedef typename _Char_types<_CharT>::int_type    int_type;
-      typedef typename _Char_types<_CharT>::pos_type    pos_type;
-      typedef typename _Char_types<_CharT>::off_type    off_type;
-      typedef typename _Char_types<_CharT>::state_type  state_type;
-
-      static void
-      assign(char_type& __c1, const char_type& __c2)
-      { __c1 = __c2; }
-
-      static _GLIBCXX_CONSTEXPR bool
-      eq(const char_type& __c1, const char_type& __c2)
-      { return __c1 == __c2; }
-
-      static _GLIBCXX_CONSTEXPR bool
-      lt(const char_type& __c1, const char_type& __c2)
-      { return __c1 < __c2; }
-
-      static int
-      compare(const char_type* __s1, const char_type* __s2, std::size_t __n);
-
-      static std::size_t
-      length(const char_type* __s);
-
-      static const char_type*
-      find(const char_type* __s, std::size_t __n, const char_type& __a);
-
-      static char_type*
-      move(char_type* __s1, const char_type* __s2, std::size_t __n);
-
-      static char_type*
-      copy(char_type* __s1, const char_type* __s2, std::size_t __n);
-
-      static char_type*
-      assign(char_type* __s, std::size_t __n, char_type __a);
-
-      static _GLIBCXX_CONSTEXPR char_type
-      to_char_type(const int_type& __c)
-      { return static_cast<char_type>(__c); }
-
-      static _GLIBCXX_CONSTEXPR int_type
-      to_int_type(const char_type& __c)
-      { return static_cast<int_type>(__c); }
-
-      static _GLIBCXX_CONSTEXPR bool
-      eq_int_type(const int_type& __c1, const int_type& __c2)
-      { return __c1 == __c2; }
-
-      static _GLIBCXX_CONSTEXPR int_type
-      eof()
-      { return static_cast<int_type>(_GLIBCXX_STDIO_EOF); }
-
-      static _GLIBCXX_CONSTEXPR int_type
-      not_eof(const int_type& __c)
-      { return !eq_int_type(__c, eof()) ? __c : to_int_type(char_type()); }
-    };
-
-  template<typename _CharT>
-    int
-    char_traits<_CharT>::
-    compare(const char_type* __s1, const char_type* __s2, std::size_t __n)
-    {
-      for (std::size_t __i = 0; __i < __n; ++__i)
-	if (lt(__s1[__i], __s2[__i]))
-	  return -1;
-	else if (lt(__s2[__i], __s1[__i]))
-	  return 1;
-      return 0;
-    }
-
-  template<typename _CharT>
-    std::size_t
-    char_traits<_CharT>::
-    length(const char_type* __p)
-    {
-      std::size_t __i = 0;
-      while (!eq(__p[__i], char_type()))
-        ++__i;
-      return __i;
-    }
-
-  template<typename _CharT>
-    const typename char_traits<_CharT>::char_type*
-    char_traits<_CharT>::
-    find(const char_type* __s, std::size_t __n, const char_type& __a)
-    {
-      for (std::size_t __i = 0; __i < __n; ++__i)
-        if (eq(__s[__i], __a))
-          return __s + __i;
-      return 0;
-    }
-
-  template<typename _CharT>
-    typename char_traits<_CharT>::char_type*
-    char_traits<_CharT>::
-    move(char_type* __s1, const char_type* __s2, std::size_t __n)
-    {
-      return static_cast<_CharT*>(__builtin_memmove(__s1, __s2,
-						    __n * sizeof(char_type)));
-    }
-
-  template<typename _CharT>
-    typename char_traits<_CharT>::char_type*
-    char_traits<_CharT>::
-    copy(char_type* __s1, const char_type* __s2, std::size_t __n)
-    {
-      // NB: Inline std::copy so no recursive dependencies.
-      std::copy(__s2, __s2 + __n, __s1);
-      return __s1;
-    }
-
-  template<typename _CharT>
-    typename char_traits<_CharT>::char_type*
-    char_traits<_CharT>::
-    assign(char_type* __s, std::size_t __n, char_type __a)
-    {
-      // NB: Inline std::fill_n so no recursive dependencies.
-      std::fill_n(__s, __n, __a);
-      return __s;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // 21.1
-  /**
-   *  @brief  Basis for explicit traits specializations.
-   *
-   *  @note  For any given actual character type, this definition is
-   *  probably wrong.  Since this is just a thin wrapper around
-   *  __gnu_cxx::char_traits, it is possible to achieve a more
-   *  appropriate definition by specializing __gnu_cxx::char_traits.
-   *
-   *  See https://gcc.gnu.org/onlinedocs/libstdc++/manual/strings.html#strings.string.character_types
-   *  for advice on how to make use of this class for @a unusual character
-   *  types. Also, check out include/ext/pod_char_traits.h.
-  */
-  template<class _CharT>
-    struct char_traits : public __gnu_cxx::char_traits<_CharT>
-    { };
-
-
-  /// 21.1.3.1  char_traits specializations
-  template<>
-    struct char_traits<char>
-    {
-      typedef char              char_type;
-      typedef int               int_type;
-      typedef streampos         pos_type;
-      typedef streamoff         off_type;
-      typedef mbstate_t         state_type;
-
-      static void
-      assign(char_type& __c1, const char_type& __c2) _GLIBCXX_NOEXCEPT
-      { __c1 = __c2; }
-
-      static _GLIBCXX_CONSTEXPR bool
-      eq(const char_type& __c1, const char_type& __c2) _GLIBCXX_NOEXCEPT
-      { return __c1 == __c2; }
-
-      static _GLIBCXX_CONSTEXPR bool
-      lt(const char_type& __c1, const char_type& __c2) _GLIBCXX_NOEXCEPT
-      {
-	// LWG 467.
-	return (static_cast<unsigned char>(__c1)
-		< static_cast<unsigned char>(__c2));
-      }
-
-      static int
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	if (__n == 0)
-	  return 0;
-	return __builtin_memcmp(__s1, __s2, __n);
-      }
-
-      static size_t
-      length(const char_type* __s)
-      { return __builtin_strlen(__s); }
-
-      static const char_type*
-      find(const char_type* __s, size_t __n, const char_type& __a)
-      {
-	if (__n == 0)
-	  return 0;
-	return static_cast<const char_type*>(__builtin_memchr(__s, __a, __n));
-      }
-
-      static char_type*
-      move(char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	if (__n == 0)
-	  return __s1;
-	return static_cast<char_type*>(__builtin_memmove(__s1, __s2, __n));
-      }
-
-      static char_type*
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	if (__n == 0)
-	  return __s1;
-	return static_cast<char_type*>(__builtin_memcpy(__s1, __s2, __n));
-      }
-
-      static char_type*
-      assign(char_type* __s, size_t __n, char_type __a)
-      {
-	if (__n == 0)
-	  return __s;
-	return static_cast<char_type*>(__builtin_memset(__s, __a, __n));
-      }
-
-      static _GLIBCXX_CONSTEXPR char_type
-      to_char_type(const int_type& __c) _GLIBCXX_NOEXCEPT
-      { return static_cast<char_type>(__c); }
-
-      // To keep both the byte 0xff and the eof symbol 0xffffffff
-      // from ending up as 0xffffffff.
-      static _GLIBCXX_CONSTEXPR int_type
-      to_int_type(const char_type& __c) _GLIBCXX_NOEXCEPT
-      { return static_cast<int_type>(static_cast<unsigned char>(__c)); }
-
-      static _GLIBCXX_CONSTEXPR bool
-      eq_int_type(const int_type& __c1, const int_type& __c2) _GLIBCXX_NOEXCEPT
-      { return __c1 == __c2; }
-
-      static _GLIBCXX_CONSTEXPR int_type
-      eof() _GLIBCXX_NOEXCEPT
-      { return static_cast<int_type>(_GLIBCXX_STDIO_EOF); }
-
-      static _GLIBCXX_CONSTEXPR int_type
-      not_eof(const int_type& __c) _GLIBCXX_NOEXCEPT
-      { return (__c == eof()) ? 0 : __c; }
-  };
-
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /// 21.1.3.2  char_traits specializations
-  template<>
-    struct char_traits<wchar_t>
-    {
-      typedef wchar_t           char_type;
-      typedef wint_t            int_type;
-      typedef streamoff         off_type;
-      typedef wstreampos        pos_type;
-      typedef mbstate_t         state_type;
-
-      static void
-      assign(char_type& __c1, const char_type& __c2) _GLIBCXX_NOEXCEPT
-      { __c1 = __c2; }
-
-      static _GLIBCXX_CONSTEXPR bool
-      eq(const char_type& __c1, const char_type& __c2) _GLIBCXX_NOEXCEPT
-      { return __c1 == __c2; }
-
-      static _GLIBCXX_CONSTEXPR bool
-      lt(const char_type& __c1, const char_type& __c2) _GLIBCXX_NOEXCEPT
-      { return __c1 < __c2; }
-
-      static int
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	if (__n == 0)
-	  return 0;
-	return wmemcmp(__s1, __s2, __n);
-      }
-
-      static size_t
-      length(const char_type* __s)
-      { return wcslen(__s); }
-
-      static const char_type*
-      find(const char_type* __s, size_t __n, const char_type& __a)
-      {
-	if (__n == 0)
-	  return 0;
-	return wmemchr(__s, __a, __n);
-      }
-
-      static char_type*
-      move(char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	if (__n == 0)
-	  return __s1;
-	return wmemmove(__s1, __s2, __n);
-      }
-
-      static char_type*
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	if (__n == 0)
-	  return __s1;
-	return wmemcpy(__s1, __s2, __n);
-      }
-
-      static char_type*
-      assign(char_type* __s, size_t __n, char_type __a)
-      {
-	if (__n == 0)
-	  return __s;
-	return wmemset(__s, __a, __n);
-      }
-
-      static _GLIBCXX_CONSTEXPR char_type
-      to_char_type(const int_type& __c) _GLIBCXX_NOEXCEPT
-      { return char_type(__c); }
-
-      static _GLIBCXX_CONSTEXPR int_type
-      to_int_type(const char_type& __c) _GLIBCXX_NOEXCEPT
-      { return int_type(__c); }
-
-      static _GLIBCXX_CONSTEXPR bool
-      eq_int_type(const int_type& __c1, const int_type& __c2) _GLIBCXX_NOEXCEPT
-      { return __c1 == __c2; }
-
-      static _GLIBCXX_CONSTEXPR int_type
-      eof() _GLIBCXX_NOEXCEPT
-      { return static_cast<int_type>(WEOF); }
-
-      static _GLIBCXX_CONSTEXPR int_type
-      not_eof(const int_type& __c) _GLIBCXX_NOEXCEPT
-      { return eq_int_type(__c, eof()) ? 0 : __c; }
-  };
-#endif //_GLIBCXX_USE_WCHAR_T
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if ((__cplusplus >= 201103L) \
-     && defined(_GLIBCXX_USE_C99_STDINT_TR1))
-
-#include <cstdint>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<>
-    struct char_traits<char16_t>
-    {
-      typedef char16_t          char_type;
-      typedef uint_least16_t    int_type;
-      typedef streamoff         off_type;
-      typedef u16streampos      pos_type;
-      typedef mbstate_t         state_type;
-
-      static void
-      assign(char_type& __c1, const char_type& __c2) noexcept
-      { __c1 = __c2; }
-
-      static constexpr bool
-      eq(const char_type& __c1, const char_type& __c2) noexcept
-      { return __c1 == __c2; }
-
-      static constexpr bool
-      lt(const char_type& __c1, const char_type& __c2) noexcept
-      { return __c1 < __c2; }
-
-      static int
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	for (size_t __i = 0; __i < __n; ++__i)
-	  if (lt(__s1[__i], __s2[__i]))
-	    return -1;
-	  else if (lt(__s2[__i], __s1[__i]))
-	    return 1;
-	return 0;
-      }
-
-      static size_t
-      length(const char_type* __s)
-      {
-	size_t __i = 0;
-	while (!eq(__s[__i], char_type()))
-	  ++__i;
-	return __i;
-      }
-
-      static const char_type*
-      find(const char_type* __s, size_t __n, const char_type& __a)
-      {
-	for (size_t __i = 0; __i < __n; ++__i)
-	  if (eq(__s[__i], __a))
-	    return __s + __i;
-	return 0;
-      }
-
-      static char_type*
-      move(char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	if (__n == 0)
-	  return __s1;
-	return (static_cast<char_type*>
-		(__builtin_memmove(__s1, __s2, __n * sizeof(char_type))));
-      }
-
-      static char_type*
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	if (__n == 0)
-	  return __s1;
-	return (static_cast<char_type*>
-		(__builtin_memcpy(__s1, __s2, __n * sizeof(char_type))));
-      }
-
-      static char_type*
-      assign(char_type* __s, size_t __n, char_type __a)
-      {
-	for (size_t __i = 0; __i < __n; ++__i)
-	  assign(__s[__i], __a);
-	return __s;
-      }
-
-      static constexpr char_type
-      to_char_type(const int_type& __c) noexcept
-      { return char_type(__c); }
-
-      static constexpr int_type
-      to_int_type(const char_type& __c) noexcept
-      { return int_type(__c); }
-
-      static constexpr bool
-      eq_int_type(const int_type& __c1, const int_type& __c2) noexcept
-      { return __c1 == __c2; }
-
-      static constexpr int_type
-      eof() noexcept
-      { return static_cast<int_type>(-1); }
-
-      static constexpr int_type
-      not_eof(const int_type& __c) noexcept
-      { return eq_int_type(__c, eof()) ? 0 : __c; }
-    };
-
-  template<>
-    struct char_traits<char32_t>
-    {
-      typedef char32_t          char_type;
-      typedef uint_least32_t    int_type;
-      typedef streamoff         off_type;
-      typedef u32streampos      pos_type;
-      typedef mbstate_t         state_type;
-
-      static void
-      assign(char_type& __c1, const char_type& __c2) noexcept
-      { __c1 = __c2; }
-
-      static constexpr bool
-      eq(const char_type& __c1, const char_type& __c2) noexcept
-      { return __c1 == __c2; }
-
-      static constexpr bool
-      lt(const char_type& __c1, const char_type& __c2) noexcept
-      { return __c1 < __c2; }
-
-      static int
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	for (size_t __i = 0; __i < __n; ++__i)
-	  if (lt(__s1[__i], __s2[__i]))
-	    return -1;
-	  else if (lt(__s2[__i], __s1[__i]))
-	    return 1;
-	return 0;
-      }
-
-      static size_t
-      length(const char_type* __s)
-      {
-	size_t __i = 0;
-	while (!eq(__s[__i], char_type()))
-	  ++__i;
-	return __i;
-      }
-
-      static const char_type*
-      find(const char_type* __s, size_t __n, const char_type& __a)
-      {
-	for (size_t __i = 0; __i < __n; ++__i)
-	  if (eq(__s[__i], __a))
-	    return __s + __i;
-	return 0;
-      }
-
-      static char_type*
-      move(char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	if (__n == 0)
-	  return __s1;
-	return (static_cast<char_type*>
-		(__builtin_memmove(__s1, __s2, __n * sizeof(char_type))));
-      }
-
-      static char_type*
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      { 
-	if (__n == 0)
-	  return __s1;
-	return (static_cast<char_type*>
-		(__builtin_memcpy(__s1, __s2, __n * sizeof(char_type))));
-      }
-
-      static char_type*
-      assign(char_type* __s, size_t __n, char_type __a)
-      {
-	for (size_t __i = 0; __i < __n; ++__i)
-	  assign(__s[__i], __a);
-	return __s;
-      }
-
-      static constexpr char_type
-      to_char_type(const int_type& __c) noexcept
-      { return char_type(__c); }
-
-      static constexpr int_type
-      to_int_type(const char_type& __c) noexcept
-      { return int_type(__c); }
-
-      static constexpr bool
-      eq_int_type(const int_type& __c1, const int_type& __c2) noexcept
-      { return __c1 == __c2; }
-
-      static constexpr int_type
-      eof() noexcept
-      { return static_cast<int_type>(-1); }
-
-      static constexpr int_type
-      not_eof(const int_type& __c) noexcept
-      { return eq_int_type(__c, eof()) ? 0 : __c; }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif 
-
-#endif // _CHAR_TRAITS_H
diff --git a/openflow/usr/include/c++/5/bits/codecvt.h b/openflow/usr/include/c++/5/bits/codecvt.h
deleted file mode 100644
index c76215f..0000000
--- a/openflow/usr/include/c++/5/bits/codecvt.h
+++ /dev/null
@@ -1,681 +0,0 @@
-// Locale support (codecvt) -*- C++ -*-
-
-// Copyright (C) 2000-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/codecvt.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.2.1.5 Template class codecvt
-//
-
-// Written by Benjamin Kosnik <bkoz@redhat.com>
-
-#ifndef _CODECVT_H
-#define _CODECVT_H 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /// Empty base class for codecvt facet [22.2.1.5].
-  class codecvt_base
-  {
-  public:
-    enum result
-    {
-      ok,
-      partial,
-      error,
-      noconv
-    };
-  };
-
-  /**
-   *  @brief  Common base for codecvt functions.
-   *
-   *  This template class provides implementations of the public functions
-   *  that forward to the protected virtual functions.
-   *
-   *  This template also provides abstract stubs for the protected virtual
-   *  functions.
-  */
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    class __codecvt_abstract_base
-    : public locale::facet, public codecvt_base
-    {
-    public:
-      // Types:
-      typedef codecvt_base::result	result;
-      typedef _InternT			intern_type;
-      typedef _ExternT			extern_type;
-      typedef _StateT			state_type;
-
-      // 22.2.1.5.1 codecvt members
-      /**
-       *  @brief  Convert from internal to external character set.
-       *
-       *  Converts input string of intern_type to output string of
-       *  extern_type.  This is analogous to wcsrtombs.  It does this by
-       *  calling codecvt::do_out.
-       *
-       *  The source and destination character sets are determined by the
-       *  facet's locale, internal and external types.
-       *
-       *  The characters in [from,from_end) are converted and written to
-       *  [to,to_end).  from_next and to_next are set to point to the
-       *  character following the last successfully converted character,
-       *  respectively.  If the result needed no conversion, from_next and
-       *  to_next are not affected.
-       *
-       *  The @a state argument should be initialized if the input is at the
-       *  beginning and carried from a previous call if continuing
-       *  conversion.  There are no guarantees about how @a state is used.
-       *
-       *  The result returned is a member of codecvt_base::result.  If
-       *  all the input is converted, returns codecvt_base::ok.  If no
-       *  conversion is necessary, returns codecvt_base::noconv.  If
-       *  the input ends early or there is insufficient space in the
-       *  output, returns codecvt_base::partial.  Otherwise the
-       *  conversion failed and codecvt_base::error is returned.
-       *
-       *  @param  __state  Persistent conversion state data.
-       *  @param  __from  Start of input.
-       *  @param  __from_end  End of input.
-       *  @param  __from_next  Returns start of unconverted data.
-       *  @param  __to  Start of output buffer.
-       *  @param  __to_end  End of output buffer.
-       *  @param  __to_next  Returns start of unused output area.
-       *  @return  codecvt_base::result.
-      */
-      result
-      out(state_type& __state, const intern_type* __from,
-	  const intern_type* __from_end, const intern_type*& __from_next,
-	  extern_type* __to, extern_type* __to_end,
-	  extern_type*& __to_next) const
-      {
-	return this->do_out(__state, __from, __from_end, __from_next,
-			    __to, __to_end, __to_next);
-      }
-
-      /**
-       *  @brief  Reset conversion state.
-       *
-       *  Writes characters to output that would restore @a state to initial
-       *  conditions.  The idea is that if a partial conversion occurs, then
-       *  the converting the characters written by this function would leave
-       *  the state in initial conditions, rather than partial conversion
-       *  state.  It does this by calling codecvt::do_unshift().
-       *
-       *  For example, if 4 external characters always converted to 1 internal
-       *  character, and input to in() had 6 external characters with state
-       *  saved, this function would write two characters to the output and
-       *  set the state to initialized conditions.
-       *
-       *  The source and destination character sets are determined by the
-       *  facet's locale, internal and external types.
-       *
-       *  The result returned is a member of codecvt_base::result.  If the
-       *  state could be reset and data written, returns codecvt_base::ok.  If
-       *  no conversion is necessary, returns codecvt_base::noconv.  If the
-       *  output has insufficient space, returns codecvt_base::partial.
-       *  Otherwise the reset failed and codecvt_base::error is returned.
-       *
-       *  @param  __state  Persistent conversion state data.
-       *  @param  __to  Start of output buffer.
-       *  @param  __to_end  End of output buffer.
-       *  @param  __to_next  Returns start of unused output area.
-       *  @return  codecvt_base::result.
-      */
-      result
-      unshift(state_type& __state, extern_type* __to, extern_type* __to_end,
-	      extern_type*& __to_next) const
-      { return this->do_unshift(__state, __to,__to_end,__to_next); }
-
-      /**
-       *  @brief  Convert from external to internal character set.
-       *
-       *  Converts input string of extern_type to output string of
-       *  intern_type.  This is analogous to mbsrtowcs.  It does this by
-       *  calling codecvt::do_in.
-       *
-       *  The source and destination character sets are determined by the
-       *  facet's locale, internal and external types.
-       *
-       *  The characters in [from,from_end) are converted and written to
-       *  [to,to_end).  from_next and to_next are set to point to the
-       *  character following the last successfully converted character,
-       *  respectively.  If the result needed no conversion, from_next and
-       *  to_next are not affected.
-       *
-       *  The @a state argument should be initialized if the input is at the
-       *  beginning and carried from a previous call if continuing
-       *  conversion.  There are no guarantees about how @a state is used.
-       *
-       *  The result returned is a member of codecvt_base::result.  If
-       *  all the input is converted, returns codecvt_base::ok.  If no
-       *  conversion is necessary, returns codecvt_base::noconv.  If
-       *  the input ends early or there is insufficient space in the
-       *  output, returns codecvt_base::partial.  Otherwise the
-       *  conversion failed and codecvt_base::error is returned.
-       *
-       *  @param  __state  Persistent conversion state data.
-       *  @param  __from  Start of input.
-       *  @param  __from_end  End of input.
-       *  @param  __from_next  Returns start of unconverted data.
-       *  @param  __to  Start of output buffer.
-       *  @param  __to_end  End of output buffer.
-       *  @param  __to_next  Returns start of unused output area.
-       *  @return  codecvt_base::result.
-      */
-      result
-      in(state_type& __state, const extern_type* __from,
-	 const extern_type* __from_end, const extern_type*& __from_next,
-	 intern_type* __to, intern_type* __to_end,
-	 intern_type*& __to_next) const
-      {
-	return this->do_in(__state, __from, __from_end, __from_next,
-			   __to, __to_end, __to_next);
-      }
-
-      int
-      encoding() const throw()
-      { return this->do_encoding(); }
-
-      bool
-      always_noconv() const throw()
-      { return this->do_always_noconv(); }
-
-      int
-      length(state_type& __state, const extern_type* __from,
-	     const extern_type* __end, size_t __max) const
-      { return this->do_length(__state, __from, __end, __max); }
-
-      int
-      max_length() const throw()
-      { return this->do_max_length(); }
-
-    protected:
-      explicit
-      __codecvt_abstract_base(size_t __refs = 0) : locale::facet(__refs) { }
-
-      virtual
-      ~__codecvt_abstract_base() { }
-
-      /**
-       *  @brief  Convert from internal to external character set.
-       *
-       *  Converts input string of intern_type to output string of
-       *  extern_type.  This function is a hook for derived classes to change
-       *  the value returned.  @see out for more information.
-      */
-      virtual result
-      do_out(state_type& __state, const intern_type* __from,
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const = 0;
-
-      virtual result
-      do_unshift(state_type& __state, extern_type* __to,
-		 extern_type* __to_end, extern_type*& __to_next) const = 0;
-
-      virtual result
-      do_in(state_type& __state, const extern_type* __from,
-	    const extern_type* __from_end, const extern_type*& __from_next,
-	    intern_type* __to, intern_type* __to_end,
-	    intern_type*& __to_next) const = 0;
-
-      virtual int
-      do_encoding() const throw() = 0;
-
-      virtual bool
-      do_always_noconv() const throw() = 0;
-
-      virtual int
-      do_length(state_type&, const extern_type* __from,
-		const extern_type* __end, size_t __max) const = 0;
-
-      virtual int
-      do_max_length() const throw() = 0;
-    };
-
-  /**
-   *  @brief  Primary class template codecvt.
-   *  @ingroup locales
-   *
-   *  NB: Generic, mostly useless implementation.
-   *
-  */
-   template<typename _InternT, typename _ExternT, typename _StateT>
-    class codecvt
-    : public __codecvt_abstract_base<_InternT, _ExternT, _StateT>
-    {
-    public:
-      // Types:
-      typedef codecvt_base::result	result;
-      typedef _InternT			intern_type;
-      typedef _ExternT			extern_type;
-      typedef _StateT			state_type;
-
-    protected:
-      __c_locale			_M_c_locale_codecvt;
-
-    public:
-      static locale::id			id;
-
-      explicit
-      codecvt(size_t __refs = 0)
-      : __codecvt_abstract_base<_InternT, _ExternT, _StateT> (__refs),
-	_M_c_locale_codecvt(0)
-      { }
-
-      explicit
-      codecvt(__c_locale __cloc, size_t __refs = 0);
-
-    protected:
-      virtual
-      ~codecvt() { }
-
-      virtual result
-      do_out(state_type& __state, const intern_type* __from,
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const;
-
-      virtual result
-      do_unshift(state_type& __state, extern_type* __to,
-		 extern_type* __to_end, extern_type*& __to_next) const;
-
-      virtual result
-      do_in(state_type& __state, const extern_type* __from,
-	    const extern_type* __from_end, const extern_type*& __from_next,
-	    intern_type* __to, intern_type* __to_end,
-	    intern_type*& __to_next) const;
-
-      virtual int
-      do_encoding() const throw();
-
-      virtual bool
-      do_always_noconv() const throw();
-
-      virtual int
-      do_length(state_type&, const extern_type* __from,
-		const extern_type* __end, size_t __max) const;
-
-      virtual int
-      do_max_length() const throw();
-    };
-
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    locale::id codecvt<_InternT, _ExternT, _StateT>::id;
-
-  /// class codecvt<char, char, mbstate_t> specialization.
-  template<>
-    class codecvt<char, char, mbstate_t>
-    : public __codecvt_abstract_base<char, char, mbstate_t>
-    {
-      friend class messages<char>;
-
-    public:
-      // Types:
-      typedef char			intern_type;
-      typedef char			extern_type;
-      typedef mbstate_t			state_type;
-
-    protected:
-      __c_locale			_M_c_locale_codecvt;
-
-    public:
-      static locale::id id;
-
-      explicit
-      codecvt(size_t __refs = 0);
-
-      explicit
-      codecvt(__c_locale __cloc, size_t __refs = 0);
-
-    protected:
-      virtual
-      ~codecvt();
-
-      virtual result
-      do_out(state_type& __state, const intern_type* __from,
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const;
-
-      virtual result
-      do_unshift(state_type& __state, extern_type* __to,
-		 extern_type* __to_end, extern_type*& __to_next) const;
-
-      virtual result
-      do_in(state_type& __state, const extern_type* __from,
-	    const extern_type* __from_end, const extern_type*& __from_next,
-	    intern_type* __to, intern_type* __to_end,
-	    intern_type*& __to_next) const;
-
-      virtual int
-      do_encoding() const throw();
-
-      virtual bool
-      do_always_noconv() const throw();
-
-      virtual int
-      do_length(state_type&, const extern_type* __from,
-		const extern_type* __end, size_t __max) const;
-
-      virtual int
-      do_max_length() const throw();
-  };
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /** @brief  Class codecvt<wchar_t, char, mbstate_t> specialization.
-   *
-   *  Converts between narrow and wide characters in the native character set
-   */
-  template<>
-    class codecvt<wchar_t, char, mbstate_t>
-    : public __codecvt_abstract_base<wchar_t, char, mbstate_t>
-    {
-      friend class messages<wchar_t>;
-
-    public:
-      // Types:
-      typedef wchar_t			intern_type;
-      typedef char			extern_type;
-      typedef mbstate_t			state_type;
-
-    protected:
-      __c_locale			_M_c_locale_codecvt;
-
-    public:
-      static locale::id			id;
-
-      explicit
-      codecvt(size_t __refs = 0);
-
-      explicit
-      codecvt(__c_locale __cloc, size_t __refs = 0);
-
-    protected:
-      virtual
-      ~codecvt();
-
-      virtual result
-      do_out(state_type& __state, const intern_type* __from,
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const;
-
-      virtual result
-      do_unshift(state_type& __state,
-		 extern_type* __to, extern_type* __to_end,
-		 extern_type*& __to_next) const;
-
-      virtual result
-      do_in(state_type& __state,
-	     const extern_type* __from, const extern_type* __from_end,
-	     const extern_type*& __from_next,
-	     intern_type* __to, intern_type* __to_end,
-	     intern_type*& __to_next) const;
-
-      virtual
-      int do_encoding() const throw();
-
-      virtual
-      bool do_always_noconv() const throw();
-
-      virtual
-      int do_length(state_type&, const extern_type* __from,
-		    const extern_type* __end, size_t __max) const;
-
-      virtual int
-      do_max_length() const throw();
-    };
-#endif //_GLIBCXX_USE_WCHAR_T
-
-#if __cplusplus >= 201103L
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-  /** @brief  Class codecvt<char16_t, char, mbstate_t> specialization.
-   *
-   *  Converts between UTF-16 and UTF-8.
-   */
-  template<>
-    class codecvt<char16_t, char, mbstate_t>
-    : public __codecvt_abstract_base<char16_t, char, mbstate_t>
-    {
-    public:
-      // Types:
-      typedef char16_t			intern_type;
-      typedef char			extern_type;
-      typedef mbstate_t			state_type;
-
-    public:
-      static locale::id			id;
-
-      explicit
-      codecvt(size_t __refs = 0)
-      : __codecvt_abstract_base<char16_t, char, mbstate_t>(__refs) { }
-
-    protected:
-      virtual
-      ~codecvt();
-
-      virtual result
-      do_out(state_type& __state, const intern_type* __from,
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const;
-
-      virtual result
-      do_unshift(state_type& __state,
-		 extern_type* __to, extern_type* __to_end,
-		 extern_type*& __to_next) const;
-
-      virtual result
-      do_in(state_type& __state,
-	     const extern_type* __from, const extern_type* __from_end,
-	     const extern_type*& __from_next,
-	     intern_type* __to, intern_type* __to_end,
-	     intern_type*& __to_next) const;
-
-      virtual
-      int do_encoding() const throw();
-
-      virtual
-      bool do_always_noconv() const throw();
-
-      virtual
-      int do_length(state_type&, const extern_type* __from,
-		    const extern_type* __end, size_t __max) const;
-
-      virtual int
-      do_max_length() const throw();
-    };
-
-  /** @brief  Class codecvt<char32_t, char, mbstate_t> specialization.
-   *
-   *  Converts between UTF-32 and UTF-8.
-   */
-  template<>
-    class codecvt<char32_t, char, mbstate_t>
-    : public __codecvt_abstract_base<char32_t, char, mbstate_t>
-    {
-    public:
-      // Types:
-      typedef char32_t			intern_type;
-      typedef char			extern_type;
-      typedef mbstate_t			state_type;
-
-    public:
-      static locale::id			id;
-
-      explicit
-      codecvt(size_t __refs = 0)
-      : __codecvt_abstract_base<char32_t, char, mbstate_t>(__refs) { }
-
-    protected:
-      virtual
-      ~codecvt();
-
-      virtual result
-      do_out(state_type& __state, const intern_type* __from,
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const;
-
-      virtual result
-      do_unshift(state_type& __state,
-		 extern_type* __to, extern_type* __to_end,
-		 extern_type*& __to_next) const;
-
-      virtual result
-      do_in(state_type& __state,
-	     const extern_type* __from, const extern_type* __from_end,
-	     const extern_type*& __from_next,
-	     intern_type* __to, intern_type* __to_end,
-	     intern_type*& __to_next) const;
-
-      virtual
-      int do_encoding() const throw();
-
-      virtual
-      bool do_always_noconv() const throw();
-
-      virtual
-      int do_length(state_type&, const extern_type* __from,
-		    const extern_type* __end, size_t __max) const;
-
-      virtual int
-      do_max_length() const throw();
-    };
-
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
-#endif // C++11
-
-  /// class codecvt_byname [22.2.1.6].
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    class codecvt_byname : public codecvt<_InternT, _ExternT, _StateT>
-    {
-    public:
-      explicit
-      codecvt_byname(const char* __s, size_t __refs = 0)
-      : codecvt<_InternT, _ExternT, _StateT>(__refs)
-      {
-	if (__builtin_strcmp(__s, "C") != 0
-	    && __builtin_strcmp(__s, "POSIX") != 0)
-	  {
-	    this->_S_destroy_c_locale(this->_M_c_locale_codecvt);
-	    this->_S_create_c_locale(this->_M_c_locale_codecvt, __s);
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      explicit
-      codecvt_byname(const string& __s, size_t __refs = 0)
-      : codecvt_byname(__s.c_str(), __refs) { }
-#endif
-
-    protected:
-      virtual
-      ~codecvt_byname() { }
-    };
-
-#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99_STDINT_TR1)
-  template<>
-    class codecvt_byname<char16_t, char, mbstate_t>
-    : public codecvt<char16_t, char, mbstate_t>
-    {
-    public:
-      explicit
-      codecvt_byname(const char* __s, size_t __refs = 0)
-      : codecvt<char16_t, char, mbstate_t>(__refs) { }
-
-      explicit
-      codecvt_byname(const string& __s, size_t __refs = 0)
-      : codecvt_byname(__s.c_str(), __refs) { }
-
-    protected:
-      virtual
-      ~codecvt_byname() { }
-    };
-
-  template<>
-    class codecvt_byname<char32_t, char, mbstate_t>
-    : public codecvt<char32_t, char, mbstate_t>
-    {
-    public:
-      explicit
-      codecvt_byname(const char* __s, size_t __refs = 0)
-      : codecvt<char32_t, char, mbstate_t>(__refs) { }
-
-      explicit
-      codecvt_byname(const string& __s, size_t __refs = 0)
-      : codecvt_byname(__s.c_str(), __refs) { }
-
-    protected:
-      virtual
-      ~codecvt_byname() { }
-    };
-#endif
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class codecvt_byname<char, char, mbstate_t>;
-
-  extern template
-    const codecvt<char, char, mbstate_t>&
-    use_facet<codecvt<char, char, mbstate_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<codecvt<char, char, mbstate_t> >(const locale&);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class codecvt_byname<wchar_t, char, mbstate_t>;
-
-  extern template
-    const codecvt<wchar_t, char, mbstate_t>&
-    use_facet<codecvt<wchar_t, char, mbstate_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<codecvt<wchar_t, char, mbstate_t> >(const locale&);
-#endif
-
-#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99_STDINT_TR1)
-  extern template class codecvt_byname<char16_t, char, mbstate_t>;
-  extern template class codecvt_byname<char32_t, char, mbstate_t>;
-#endif
-
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif // _CODECVT_H
diff --git a/openflow/usr/include/c++/5/bits/concept_check.h b/openflow/usr/include/c++/5/bits/concept_check.h
deleted file mode 100644
index e1a5c9c..0000000
--- a/openflow/usr/include/c++/5/bits/concept_check.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Concept-checking control -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/concept_check.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iterator}
- */
-
-#ifndef _CONCEPT_CHECK_H
-#define _CONCEPT_CHECK_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-// All places in libstdc++-v3 where these are used, or /might/ be used, or
-// don't need to be used, or perhaps /should/ be used, are commented with
-// "concept requirements" (and maybe some more text).  So grep like crazy
-// if you're looking for additional places to use these.
-
-// Concept-checking code is off by default unless users turn it on via
-// configure options or editing c++config.h.
-
-#ifndef _GLIBCXX_CONCEPT_CHECKS
-
-#define __glibcxx_function_requires(...)
-#define __glibcxx_class_requires(_a,_b)
-#define __glibcxx_class_requires2(_a,_b,_c)
-#define __glibcxx_class_requires3(_a,_b,_c,_d)
-#define __glibcxx_class_requires4(_a,_b,_c,_d,_e)
-
-#else // the checks are on
-
-#include <bits/boost_concept_check.h>
-
-// Note that the obvious and elegant approach of
-//
-//#define glibcxx_function_requires(C) debug::function_requires< debug::C >()
-//
-// won't work due to concept templates with more than one parameter, e.g.,
-// BinaryPredicateConcept.  The preprocessor tries to split things up on
-// the commas in the template argument list.  We can't use an inner pair of
-// parenthesis to hide the commas, because "debug::(Temp<Foo,Bar>)" isn't
-// a valid instantiation pattern.  Thus, we steal a feature from C99.
-
-#define __glibcxx_function_requires(...)                                 \
-            __gnu_cxx::__function_requires< __gnu_cxx::__VA_ARGS__ >();
-#define __glibcxx_class_requires(_a,_C)                                  \
-            _GLIBCXX_CLASS_REQUIRES(_a, __gnu_cxx, _C);
-#define __glibcxx_class_requires2(_a,_b,_C)                              \
-            _GLIBCXX_CLASS_REQUIRES2(_a, _b, __gnu_cxx, _C);
-#define __glibcxx_class_requires3(_a,_b,_c,_C)                           \
-            _GLIBCXX_CLASS_REQUIRES3(_a, _b, _c, __gnu_cxx, _C);
-#define __glibcxx_class_requires4(_a,_b,_c,_d,_C)                        \
-            _GLIBCXX_CLASS_REQUIRES4(_a, _b, _c, _d, __gnu_cxx, _C);
-
-#endif // enable/disable
-
-#endif // _GLIBCXX_CONCEPT_CHECK
diff --git a/openflow/usr/include/c++/5/bits/cpp_type_traits.h b/openflow/usr/include/c++/5/bits/cpp_type_traits.h
deleted file mode 100644
index 8c6bb7f..0000000
--- a/openflow/usr/include/c++/5/bits/cpp_type_traits.h
+++ /dev/null
@@ -1,446 +0,0 @@
-// The  -*- C++ -*- type traits classes for internal use in libstdc++
-
-// Copyright (C) 2000-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/cpp_type_traits.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ext/type_traits}
- */
-
-// Written by Gabriel Dos Reis <dosreis@cmla.ens-cachan.fr>
-
-#ifndef _CPP_TYPE_TRAITS_H
-#define _CPP_TYPE_TRAITS_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-//
-// This file provides some compile-time information about various types.
-// These representations were designed, on purpose, to be constant-expressions
-// and not types as found in <bits/type_traits.h>.  In particular, they
-// can be used in control structures and the optimizer hopefully will do
-// the obvious thing.
-//
-// Why integral expressions, and not functions nor types?
-// Firstly, these compile-time entities are used as template-arguments
-// so function return values won't work:  We need compile-time entities.
-// We're left with types and constant  integral expressions.
-// Secondly, from the point of view of ease of use, type-based compile-time
-// information is -not- *that* convenient.  On has to write lots of
-// overloaded functions and to hope that the compiler will select the right
-// one. As a net effect, the overall structure isn't very clear at first
-// glance.
-// Thirdly, partial ordering and overload resolution (of function templates)
-// is highly costly in terms of compiler-resource.  It is a Good Thing to
-// keep these resource consumption as least as possible.
-//
-// See valarray_array.h for a case use.
-//
-// -- Gaby (dosreis@cmla.ens-cachan.fr) 2000-03-06.
-//
-// Update 2005: types are also provided and <bits/type_traits.h> has been
-// removed.
-//
-
-// Forward declaration hack, should really include this from somewhere.
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Iterator, typename _Container>
-    class __normal_iterator;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  struct __true_type { };
-  struct __false_type { };
-
-  template<bool>
-    struct __truth_type
-    { typedef __false_type __type; };
-
-  template<>
-    struct __truth_type<true>
-    { typedef __true_type __type; };
-
-  // N.B. The conversions to bool are needed due to the issue
-  // explained in c++/19404.
-  template<class _Sp, class _Tp>
-    struct __traitor
-    {
-      enum { __value = bool(_Sp::__value) || bool(_Tp::__value) };
-      typedef typename __truth_type<__value>::__type __type;
-    };
-
-  // Compare for equality of types.
-  template<typename, typename>
-    struct __are_same
-    {
-      enum { __value = 0 };
-      typedef __false_type __type;
-    };
-
-  template<typename _Tp>
-    struct __are_same<_Tp, _Tp>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  // Holds if the template-argument is a void type.
-  template<typename _Tp>
-    struct __is_void
-    {
-      enum { __value = 0 };
-      typedef __false_type __type;
-    };
-
-  template<>
-    struct __is_void<void>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  //
-  // Integer types
-  //
-  template<typename _Tp>
-    struct __is_integer
-    {
-      enum { __value = 0 };
-      typedef __false_type __type;
-    };
-
-  // Thirteen specializations (yes there are eleven standard integer
-  // types; <em>long long</em> and <em>unsigned long long</em> are
-  // supported as extensions).  Up to four target-specific __int<N>
-  // types are supported as well.
-  template<>
-    struct __is_integer<bool>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<char>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<signed char>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<unsigned char>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-# ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    struct __is_integer<wchar_t>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-# endif
-
-#if __cplusplus >= 201103L
-  template<>
-    struct __is_integer<char16_t>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<char32_t>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-#endif
-
-  template<>
-    struct __is_integer<short>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<unsigned short>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<int>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<unsigned int>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<long>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<unsigned long>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<long long>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_integer<unsigned long long>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-#define __INT_N(TYPE) 			\
-  template<>				\
-    struct __is_integer<TYPE>		\
-    {					\
-      enum { __value = 1 };		\
-      typedef __true_type __type;	\
-    };					\
-  template<>				\
-    struct __is_integer<unsigned TYPE>	\
-    {					\
-      enum { __value = 1 };		\
-      typedef __true_type __type;	\
-    };
-
-#ifdef __GLIBCXX_TYPE_INT_N_0
-__INT_N(__GLIBCXX_TYPE_INT_N_0)
-#endif
-#ifdef __GLIBCXX_TYPE_INT_N_1
-__INT_N(__GLIBCXX_TYPE_INT_N_1)
-#endif
-#ifdef __GLIBCXX_TYPE_INT_N_2
-__INT_N(__GLIBCXX_TYPE_INT_N_2)
-#endif
-#ifdef __GLIBCXX_TYPE_INT_N_3
-__INT_N(__GLIBCXX_TYPE_INT_N_3)
-#endif
-
-#undef __INT_N
-
-  //
-  // Floating point types
-  //
-  template<typename _Tp>
-    struct __is_floating
-    {
-      enum { __value = 0 };
-      typedef __false_type __type;
-    };
-
-  // three specializations (float, double and 'long double')
-  template<>
-    struct __is_floating<float>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_floating<double>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_floating<long double>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  //
-  // Pointer types
-  //
-  template<typename _Tp>
-    struct __is_pointer
-    {
-      enum { __value = 0 };
-      typedef __false_type __type;
-    };
-
-  template<typename _Tp>
-    struct __is_pointer<_Tp*>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  //
-  // Normal iterator type
-  //
-  template<typename _Tp>
-    struct __is_normal_iterator
-    {
-      enum { __value = 0 };
-      typedef __false_type __type;
-    };
-
-  template<typename _Iterator, typename _Container>
-    struct __is_normal_iterator< __gnu_cxx::__normal_iterator<_Iterator,
-							      _Container> >
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  //
-  // An arithmetic type is an integer type or a floating point type
-  //
-  template<typename _Tp>
-    struct __is_arithmetic
-    : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
-    { };
-
-  //
-  // A scalar type is an arithmetic type or a pointer type
-  // 
-  template<typename _Tp>
-    struct __is_scalar
-    : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
-    { };
-
-  //
-  // For use in std::copy and std::find overloads for streambuf iterators.
-  //
-  template<typename _Tp>
-    struct __is_char
-    {
-      enum { __value = 0 };
-      typedef __false_type __type;
-    };
-
-  template<>
-    struct __is_char<char>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    struct __is_char<wchar_t>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-#endif
-
-  template<typename _Tp>
-    struct __is_byte
-    {
-      enum { __value = 0 };
-      typedef __false_type __type;
-    };
-
-  template<>
-    struct __is_byte<char>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_byte<signed char>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  template<>
-    struct __is_byte<unsigned char>
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-
-  //
-  // Move iterator type
-  //
-  template<typename _Tp>
-    struct __is_move_iterator
-    {
-      enum { __value = 0 };
-      typedef __false_type __type;
-    };
-
-#if __cplusplus >= 201103L
-  template<typename _Iterator>
-    class move_iterator;
-
-  template<typename _Iterator>
-    struct __is_move_iterator< move_iterator<_Iterator> >
-    {
-      enum { __value = 1 };
-      typedef __true_type __type;
-    };
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif //_CPP_TYPE_TRAITS_H
diff --git a/openflow/usr/include/c++/5/bits/cxxabi_forced.h b/openflow/usr/include/c++/5/bits/cxxabi_forced.h
deleted file mode 100644
index e5ae028..0000000
--- a/openflow/usr/include/c++/5/bits/cxxabi_forced.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// cxxabi.h subset for cancellation -*- C++ -*-
-  
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3, or (at your option)
-// any later version.
-// 
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/cxxabi_forced.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{cxxabi.h}
- */
-
-#ifndef _CXXABI_FORCED_H
-#define _CXXABI_FORCED_H 1
-
-#pragma GCC system_header
-
-#pragma GCC visibility push(default)
-
-#ifdef __cplusplus
-namespace __cxxabiv1
-{  
-  /** 
-   *  @brief Thrown as part of forced unwinding.
-   *  @ingroup exceptions
-   *
-   *  A magic placeholder class that can be caught by reference to
-   *  recognize forced unwinding.
-   */
-  class __forced_unwind
-  {
-    virtual ~__forced_unwind() throw();
-
-    // Prevent catch by value.
-    virtual void __pure_dummy() = 0; 
-  };
-}
-#endif // __cplusplus
-
-#pragma GCC visibility pop
-
-#endif // __CXXABI_FORCED_H 
diff --git a/openflow/usr/include/c++/5/bits/deque.tcc b/openflow/usr/include/c++/5/bits/deque.tcc
deleted file mode 100644
index f7c2c79..0000000
--- a/openflow/usr/include/c++/5/bits/deque.tcc
+++ /dev/null
@@ -1,1096 +0,0 @@
-// Deque implementation (out of line) -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/deque.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{deque}
- */
-
-#ifndef _DEQUE_TCC
-#define _DEQUE_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-#if __cplusplus >= 201103L
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp, _Alloc>::
-    _M_default_initialize()
-    {
-      _Map_pointer __cur;
-      __try
-        {
-          for (__cur = this->_M_impl._M_start._M_node;
-	       __cur < this->_M_impl._M_finish._M_node;
-	       ++__cur)
-            std::__uninitialized_default_a(*__cur, *__cur + _S_buffer_size(),
-					   _M_get_Tp_allocator());
-          std::__uninitialized_default_a(this->_M_impl._M_finish._M_first,
-					 this->_M_impl._M_finish._M_cur,
-					 _M_get_Tp_allocator());
-        }
-      __catch(...)
-        {
-          std::_Destroy(this->_M_impl._M_start, iterator(*__cur, __cur),
-			_M_get_Tp_allocator());
-          __throw_exception_again;
-        }
-    }
-#endif
-
-  template <typename _Tp, typename _Alloc>
-    deque<_Tp, _Alloc>&
-    deque<_Tp, _Alloc>::
-    operator=(const deque& __x)
-    {
-      if (&__x != this)
-	{
-#if __cplusplus >= 201103L
-	  if (_Alloc_traits::_S_propagate_on_copy_assign())
-	    {
-	      if (!_Alloc_traits::_S_always_equal()
-	          && _M_get_Tp_allocator() != __x._M_get_Tp_allocator())
-	        {
-		  // Replacement allocator cannot free existing storage,
-		  // so deallocate everything and take copy of __x's data.
-		  _M_replace_map(__x, __x.get_allocator());
-		  std::__alloc_on_copy(_M_get_Tp_allocator(),
-				       __x._M_get_Tp_allocator());
-		  return *this;
-		}
-	      std::__alloc_on_copy(_M_get_Tp_allocator(),
-				   __x._M_get_Tp_allocator());
-	    }
-#endif
-	  const size_type __len = size();
-	  if (__len >= __x.size())
-	    _M_erase_at_end(std::copy(__x.begin(), __x.end(),
-				      this->_M_impl._M_start));
-	  else
-	    {
-	      const_iterator __mid = __x.begin() + difference_type(__len);
-	      std::copy(__x.begin(), __mid, this->_M_impl._M_start);
-	      insert(this->_M_impl._M_finish, __mid, __x.end());
-	    }
-	}
-      return *this;
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Alloc>
-    template<typename... _Args>
-      void
-      deque<_Tp, _Alloc>::
-      emplace_front(_Args&&... __args)
-      {
-	if (this->_M_impl._M_start._M_cur != this->_M_impl._M_start._M_first)
-	  {
-	    _Alloc_traits::construct(this->_M_impl,
-	                             this->_M_impl._M_start._M_cur - 1,
-			             std::forward<_Args>(__args)...);
-	    --this->_M_impl._M_start._M_cur;
-	  }
-	else
-	  _M_push_front_aux(std::forward<_Args>(__args)...);
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename... _Args>
-      void
-      deque<_Tp, _Alloc>::
-      emplace_back(_Args&&... __args)
-      {
-	if (this->_M_impl._M_finish._M_cur
-	    != this->_M_impl._M_finish._M_last - 1)
-	  {
-	    _Alloc_traits::construct(this->_M_impl,
-	                             this->_M_impl._M_finish._M_cur,
-			             std::forward<_Args>(__args)...);
-	    ++this->_M_impl._M_finish._M_cur;
-	  }
-	else
-	  _M_push_back_aux(std::forward<_Args>(__args)...);
-      }
-#endif
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Alloc>
-    template<typename... _Args>
-      typename deque<_Tp, _Alloc>::iterator
-      deque<_Tp, _Alloc>::
-      emplace(const_iterator __position, _Args&&... __args)
-      {
-	if (__position._M_cur == this->_M_impl._M_start._M_cur)
-	  {
-	    emplace_front(std::forward<_Args>(__args)...);
-	    return this->_M_impl._M_start;
-	  }
-	else if (__position._M_cur == this->_M_impl._M_finish._M_cur)
-	  {
-	    emplace_back(std::forward<_Args>(__args)...);
-	    iterator __tmp = this->_M_impl._M_finish;
-	    --__tmp;
-	    return __tmp;
-	  }
-	else
-	  return _M_insert_aux(__position._M_const_cast(),
-			       std::forward<_Args>(__args)...);
-      }
-#endif
-
-  template <typename _Tp, typename _Alloc>
-    typename deque<_Tp, _Alloc>::iterator
-    deque<_Tp, _Alloc>::
-#if __cplusplus >= 201103L
-    insert(const_iterator __position, const value_type& __x)
-#else
-    insert(iterator __position, const value_type& __x)
-#endif
-    {
-      if (__position._M_cur == this->_M_impl._M_start._M_cur)
-	{
-	  push_front(__x);
-	  return this->_M_impl._M_start;
-	}
-      else if (__position._M_cur == this->_M_impl._M_finish._M_cur)
-	{
-	  push_back(__x);
-	  iterator __tmp = this->_M_impl._M_finish;
-	  --__tmp;
-	  return __tmp;
-	}
-      else
-	return _M_insert_aux(__position._M_const_cast(), __x);
-   }
-
-  template <typename _Tp, typename _Alloc>
-    typename deque<_Tp, _Alloc>::iterator
-    deque<_Tp, _Alloc>::
-    _M_erase(iterator __position)
-    {
-      iterator __next = __position;
-      ++__next;
-      const difference_type __index = __position - begin();
-      if (static_cast<size_type>(__index) < (size() >> 1))
-	{
-	  if (__position != begin())
-	    _GLIBCXX_MOVE_BACKWARD3(begin(), __position, __next);
-	  pop_front();
-	}
-      else
-	{
-	  if (__next != end())
-	    _GLIBCXX_MOVE3(__next, end(), __position);
-	  pop_back();
-	}
-      return begin() + __index;
-    }
-
-  template <typename _Tp, typename _Alloc>
-    typename deque<_Tp, _Alloc>::iterator
-    deque<_Tp, _Alloc>::
-    _M_erase(iterator __first, iterator __last)
-    {
-      if (__first == __last)
-	return __first;
-      else if (__first == begin() && __last == end())
-	{
-	  clear();
-	  return end();
-	}
-      else
-	{
-	  const difference_type __n = __last - __first;
-	  const difference_type __elems_before = __first - begin();
-	  if (static_cast<size_type>(__elems_before) <= (size() - __n) / 2)
-	    {
-	      if (__first != begin())
-		_GLIBCXX_MOVE_BACKWARD3(begin(), __first, __last);
-	      _M_erase_at_begin(begin() + __n);
-	    }
-	  else
-	    {
-	      if (__last != end())
-		_GLIBCXX_MOVE3(__last, end(), __first);
-	      _M_erase_at_end(end() - __n);
-	    }
-	  return begin() + __elems_before;
-	}
-    }
-
-  template <typename _Tp, class _Alloc>
-    template <typename _InputIterator>
-      void
-      deque<_Tp, _Alloc>::
-      _M_assign_aux(_InputIterator __first, _InputIterator __last,
-		    std::input_iterator_tag)
-      {
-        iterator __cur = begin();
-        for (; __first != __last && __cur != end(); ++__cur, ++__first)
-          *__cur = *__first;
-        if (__first == __last)
-          _M_erase_at_end(__cur);
-        else
-          insert(end(), __first, __last);
-      }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp, _Alloc>::
-    _M_fill_insert(iterator __pos, size_type __n, const value_type& __x)
-    {
-      if (__pos._M_cur == this->_M_impl._M_start._M_cur)
-	{
-	  iterator __new_start = _M_reserve_elements_at_front(__n);
-	  __try
-	    {
-	      std::__uninitialized_fill_a(__new_start, this->_M_impl._M_start,
-					  __x, _M_get_Tp_allocator());
-	      this->_M_impl._M_start = __new_start;
-	    }
-	  __catch(...)
-	    {
-	      _M_destroy_nodes(__new_start._M_node,
-			       this->_M_impl._M_start._M_node);
-	      __throw_exception_again;
-	    }
-	}
-      else if (__pos._M_cur == this->_M_impl._M_finish._M_cur)
-	{
-	  iterator __new_finish = _M_reserve_elements_at_back(__n);
-	  __try
-	    {
-	      std::__uninitialized_fill_a(this->_M_impl._M_finish,
-					  __new_finish, __x,
-					  _M_get_Tp_allocator());
-	      this->_M_impl._M_finish = __new_finish;
-	    }
-	  __catch(...)
-	    {
-	      _M_destroy_nodes(this->_M_impl._M_finish._M_node + 1,
-			       __new_finish._M_node + 1);
-	      __throw_exception_again;
-	    }
-	}
-      else
-        _M_insert_aux(__pos, __n, __x);
-    }
-
-#if __cplusplus >= 201103L
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp, _Alloc>::
-    _M_default_append(size_type __n)
-    {
-      if (__n)
-	{
-	  iterator __new_finish = _M_reserve_elements_at_back(__n);
-	  __try
-	    {
-	      std::__uninitialized_default_a(this->_M_impl._M_finish,
-					     __new_finish,
-					     _M_get_Tp_allocator());
-	      this->_M_impl._M_finish = __new_finish;
-	    }
-	  __catch(...)
-	    {
-	      _M_destroy_nodes(this->_M_impl._M_finish._M_node + 1,
-			       __new_finish._M_node + 1);
-	      __throw_exception_again;
-	    }
-	}
-    }
-
-  template <typename _Tp, typename _Alloc>
-    bool
-    deque<_Tp, _Alloc>::
-    _M_shrink_to_fit()
-    {
-      const difference_type __front_capacity
-	= (this->_M_impl._M_start._M_cur - this->_M_impl._M_start._M_first);
-      if (__front_capacity == 0)
-	return false;
-
-      const difference_type __back_capacity
-	= (this->_M_impl._M_finish._M_last - this->_M_impl._M_finish._M_cur);
-      if (__front_capacity + __back_capacity < _S_buffer_size())
-	return false;
-
-      return std::__shrink_to_fit_aux<deque>::_S_do_it(*this);
-    }
-#endif
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp, _Alloc>::
-    _M_fill_initialize(const value_type& __value)
-    {
-      _Map_pointer __cur;
-      __try
-        {
-          for (__cur = this->_M_impl._M_start._M_node;
-	       __cur < this->_M_impl._M_finish._M_node;
-	       ++__cur)
-            std::__uninitialized_fill_a(*__cur, *__cur + _S_buffer_size(),
-					__value, _M_get_Tp_allocator());
-          std::__uninitialized_fill_a(this->_M_impl._M_finish._M_first,
-				      this->_M_impl._M_finish._M_cur,
-				      __value, _M_get_Tp_allocator());
-        }
-      __catch(...)
-        {
-          std::_Destroy(this->_M_impl._M_start, iterator(*__cur, __cur),
-			_M_get_Tp_allocator());
-          __throw_exception_again;
-        }
-    }
-
-  template <typename _Tp, typename _Alloc>
-    template <typename _InputIterator>
-      void
-      deque<_Tp, _Alloc>::
-      _M_range_initialize(_InputIterator __first, _InputIterator __last,
-                          std::input_iterator_tag)
-      {
-        this->_M_initialize_map(0);
-        __try
-          {
-            for (; __first != __last; ++__first)
-#if __cplusplus >= 201103L
-	      emplace_back(*__first);
-#else
-              push_back(*__first);
-#endif
-          }
-        __catch(...)
-          {
-            clear();
-            __throw_exception_again;
-          }
-      }
-
-  template <typename _Tp, typename _Alloc>
-    template <typename _ForwardIterator>
-      void
-      deque<_Tp, _Alloc>::
-      _M_range_initialize(_ForwardIterator __first, _ForwardIterator __last,
-                          std::forward_iterator_tag)
-      {
-        const size_type __n = std::distance(__first, __last);
-        this->_M_initialize_map(__n);
-
-        _Map_pointer __cur_node;
-        __try
-          {
-            for (__cur_node = this->_M_impl._M_start._M_node;
-                 __cur_node < this->_M_impl._M_finish._M_node;
-                 ++__cur_node)
-	      {
-		_ForwardIterator __mid = __first;
-		std::advance(__mid, _S_buffer_size());
-		std::__uninitialized_copy_a(__first, __mid, *__cur_node,
-					    _M_get_Tp_allocator());
-		__first = __mid;
-	      }
-            std::__uninitialized_copy_a(__first, __last,
-					this->_M_impl._M_finish._M_first,
-					_M_get_Tp_allocator());
-          }
-        __catch(...)
-          {
-            std::_Destroy(this->_M_impl._M_start,
-			  iterator(*__cur_node, __cur_node),
-			  _M_get_Tp_allocator());
-            __throw_exception_again;
-          }
-      }
-
-  // Called only if _M_impl._M_finish._M_cur == _M_impl._M_finish._M_last - 1.
-  template<typename _Tp, typename _Alloc>
-#if __cplusplus >= 201103L
-    template<typename... _Args>
-      void
-      deque<_Tp, _Alloc>::
-      _M_push_back_aux(_Args&&... __args)
-#else
-      void
-      deque<_Tp, _Alloc>::
-      _M_push_back_aux(const value_type& __t)
-#endif
-      {
-	_M_reserve_map_at_back();
-	*(this->_M_impl._M_finish._M_node + 1) = this->_M_allocate_node();
-	__try
-	  {
-#if __cplusplus >= 201103L
-	    _Alloc_traits::construct(this->_M_impl,
-	                             this->_M_impl._M_finish._M_cur,
-			             std::forward<_Args>(__args)...);
-#else
-	    this->_M_impl.construct(this->_M_impl._M_finish._M_cur, __t);
-#endif
-	    this->_M_impl._M_finish._M_set_node(this->_M_impl._M_finish._M_node
-						+ 1);
-	    this->_M_impl._M_finish._M_cur = this->_M_impl._M_finish._M_first;
-	  }
-	__catch(...)
-	  {
-	    _M_deallocate_node(*(this->_M_impl._M_finish._M_node + 1));
-	    __throw_exception_again;
-	  }
-      }
-
-  // Called only if _M_impl._M_start._M_cur == _M_impl._M_start._M_first.
-  template<typename _Tp, typename _Alloc>
-#if __cplusplus >= 201103L
-    template<typename... _Args>
-      void
-      deque<_Tp, _Alloc>::
-      _M_push_front_aux(_Args&&... __args)
-#else
-      void
-      deque<_Tp, _Alloc>::
-      _M_push_front_aux(const value_type& __t)
-#endif
-      {
-	_M_reserve_map_at_front();
-	*(this->_M_impl._M_start._M_node - 1) = this->_M_allocate_node();
-	__try
-	  {
-	    this->_M_impl._M_start._M_set_node(this->_M_impl._M_start._M_node
-					       - 1);
-	    this->_M_impl._M_start._M_cur = this->_M_impl._M_start._M_last - 1;
-#if __cplusplus >= 201103L
-	    _Alloc_traits::construct(this->_M_impl,
-	                             this->_M_impl._M_start._M_cur,
-			             std::forward<_Args>(__args)...);
-#else
-	    this->_M_impl.construct(this->_M_impl._M_start._M_cur, __t);
-#endif
-	  }
-	__catch(...)
-	  {
-	    ++this->_M_impl._M_start;
-	    _M_deallocate_node(*(this->_M_impl._M_start._M_node - 1));
-	    __throw_exception_again;
-	  }
-      }
-
-  // Called only if _M_impl._M_finish._M_cur == _M_impl._M_finish._M_first.
-  template <typename _Tp, typename _Alloc>
-    void deque<_Tp, _Alloc>::
-    _M_pop_back_aux()
-    {
-      _M_deallocate_node(this->_M_impl._M_finish._M_first);
-      this->_M_impl._M_finish._M_set_node(this->_M_impl._M_finish._M_node - 1);
-      this->_M_impl._M_finish._M_cur = this->_M_impl._M_finish._M_last - 1;
-      _Alloc_traits::destroy(_M_get_Tp_allocator(),
-			     this->_M_impl._M_finish._M_cur);
-    }
-
-  // Called only if _M_impl._M_start._M_cur == _M_impl._M_start._M_last - 1.
-  // Note that if the deque has at least one element (a precondition for this
-  // member function), and if
-  //   _M_impl._M_start._M_cur == _M_impl._M_start._M_last,
-  // then the deque must have at least two nodes.
-  template <typename _Tp, typename _Alloc>
-    void deque<_Tp, _Alloc>::
-    _M_pop_front_aux()
-    {
-      _Alloc_traits::destroy(_M_get_Tp_allocator(),
-			     this->_M_impl._M_start._M_cur);
-      _M_deallocate_node(this->_M_impl._M_start._M_first);
-      this->_M_impl._M_start._M_set_node(this->_M_impl._M_start._M_node + 1);
-      this->_M_impl._M_start._M_cur = this->_M_impl._M_start._M_first;
-    }
-
-  template <typename _Tp, typename _Alloc>
-    template <typename _InputIterator>
-      void
-      deque<_Tp, _Alloc>::
-      _M_range_insert_aux(iterator __pos,
-                          _InputIterator __first, _InputIterator __last,
-                          std::input_iterator_tag)
-      { std::copy(__first, __last, std::inserter(*this, __pos)); }
-
-  template <typename _Tp, typename _Alloc>
-    template <typename _ForwardIterator>
-      void
-      deque<_Tp, _Alloc>::
-      _M_range_insert_aux(iterator __pos,
-                          _ForwardIterator __first, _ForwardIterator __last,
-                          std::forward_iterator_tag)
-      {
-        const size_type __n = std::distance(__first, __last);
-        if (__pos._M_cur == this->_M_impl._M_start._M_cur)
-	  {
-	    iterator __new_start = _M_reserve_elements_at_front(__n);
-	    __try
-	      {
-		std::__uninitialized_copy_a(__first, __last, __new_start,
-					    _M_get_Tp_allocator());
-		this->_M_impl._M_start = __new_start;
-	      }
-	    __catch(...)
-	      {
-		_M_destroy_nodes(__new_start._M_node,
-				 this->_M_impl._M_start._M_node);
-		__throw_exception_again;
-	      }
-	  }
-        else if (__pos._M_cur == this->_M_impl._M_finish._M_cur)
-	  {
-	    iterator __new_finish = _M_reserve_elements_at_back(__n);
-	    __try
-	      {
-		std::__uninitialized_copy_a(__first, __last,
-					    this->_M_impl._M_finish,
-					    _M_get_Tp_allocator());
-		this->_M_impl._M_finish = __new_finish;
-	      }
-	    __catch(...)
-	      {
-		_M_destroy_nodes(this->_M_impl._M_finish._M_node + 1,
-				 __new_finish._M_node + 1);
-		__throw_exception_again;
-	      }
-	  }
-        else
-          _M_insert_aux(__pos, __first, __last, __n);
-      }
-
-  template<typename _Tp, typename _Alloc>
-#if __cplusplus >= 201103L
-    template<typename... _Args>
-      typename deque<_Tp, _Alloc>::iterator
-      deque<_Tp, _Alloc>::
-      _M_insert_aux(iterator __pos, _Args&&... __args)
-      {
-	value_type __x_copy(std::forward<_Args>(__args)...); // XXX copy
-#else
-    typename deque<_Tp, _Alloc>::iterator
-      deque<_Tp, _Alloc>::
-      _M_insert_aux(iterator __pos, const value_type& __x)
-      {
-	value_type __x_copy = __x; // XXX copy
-#endif
-	difference_type __index = __pos - this->_M_impl._M_start;
-	if (static_cast<size_type>(__index) < size() / 2)
-	  {
-	    push_front(_GLIBCXX_MOVE(front()));
-	    iterator __front1 = this->_M_impl._M_start;
-	    ++__front1;
-	    iterator __front2 = __front1;
-	    ++__front2;
-	    __pos = this->_M_impl._M_start + __index;
-	    iterator __pos1 = __pos;
-	    ++__pos1;
-	    _GLIBCXX_MOVE3(__front2, __pos1, __front1);
-	  }
-	else
-	  {
-	    push_back(_GLIBCXX_MOVE(back()));
-	    iterator __back1 = this->_M_impl._M_finish;
-	    --__back1;
-	    iterator __back2 = __back1;
-	    --__back2;
-	    __pos = this->_M_impl._M_start + __index;
-	    _GLIBCXX_MOVE_BACKWARD3(__pos, __back2, __back1);
-	  }
-	*__pos = _GLIBCXX_MOVE(__x_copy);
-	return __pos;
-      }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp, _Alloc>::
-    _M_insert_aux(iterator __pos, size_type __n, const value_type& __x)
-    {
-      const difference_type __elems_before = __pos - this->_M_impl._M_start;
-      const size_type __length = this->size();
-      value_type __x_copy = __x;
-      if (__elems_before < difference_type(__length / 2))
-	{
-	  iterator __new_start = _M_reserve_elements_at_front(__n);
-	  iterator __old_start = this->_M_impl._M_start;
-	  __pos = this->_M_impl._M_start + __elems_before;
-	  __try
-	    {
-	      if (__elems_before >= difference_type(__n))
-		{
-		  iterator __start_n = (this->_M_impl._M_start
-					+ difference_type(__n));
-		  std::__uninitialized_move_a(this->_M_impl._M_start,
-					      __start_n, __new_start,
-					      _M_get_Tp_allocator());
-		  this->_M_impl._M_start = __new_start;
-		  _GLIBCXX_MOVE3(__start_n, __pos, __old_start);
-		  std::fill(__pos - difference_type(__n), __pos, __x_copy);
-		}
-	      else
-		{
-		  std::__uninitialized_move_fill(this->_M_impl._M_start,
-						 __pos, __new_start,
-						 this->_M_impl._M_start,
-						 __x_copy,
-						 _M_get_Tp_allocator());
-		  this->_M_impl._M_start = __new_start;
-		  std::fill(__old_start, __pos, __x_copy);
-		}
-	    }
-	  __catch(...)
-	    {
-	      _M_destroy_nodes(__new_start._M_node,
-			       this->_M_impl._M_start._M_node);
-	      __throw_exception_again;
-	    }
-	}
-      else
-	{
-	  iterator __new_finish = _M_reserve_elements_at_back(__n);
-	  iterator __old_finish = this->_M_impl._M_finish;
-	  const difference_type __elems_after =
-	    difference_type(__length) - __elems_before;
-	  __pos = this->_M_impl._M_finish - __elems_after;
-	  __try
-	    {
-	      if (__elems_after > difference_type(__n))
-		{
-		  iterator __finish_n = (this->_M_impl._M_finish
-					 - difference_type(__n));
-		  std::__uninitialized_move_a(__finish_n,
-					      this->_M_impl._M_finish,
-					      this->_M_impl._M_finish,
-					      _M_get_Tp_allocator());
-		  this->_M_impl._M_finish = __new_finish;
-		  _GLIBCXX_MOVE_BACKWARD3(__pos, __finish_n, __old_finish);
-		  std::fill(__pos, __pos + difference_type(__n), __x_copy);
-		}
-	      else
-		{
-		  std::__uninitialized_fill_move(this->_M_impl._M_finish,
-						 __pos + difference_type(__n),
-						 __x_copy, __pos,
-						 this->_M_impl._M_finish,
-						 _M_get_Tp_allocator());
-		  this->_M_impl._M_finish = __new_finish;
-		  std::fill(__pos, __old_finish, __x_copy);
-		}
-	    }
-	  __catch(...)
-	    {
-	      _M_destroy_nodes(this->_M_impl._M_finish._M_node + 1,
-			       __new_finish._M_node + 1);
-	      __throw_exception_again;
-	    }
-	}
-    }
-
-  template <typename _Tp, typename _Alloc>
-    template <typename _ForwardIterator>
-      void
-      deque<_Tp, _Alloc>::
-      _M_insert_aux(iterator __pos,
-                    _ForwardIterator __first, _ForwardIterator __last,
-                    size_type __n)
-      {
-        const difference_type __elemsbefore = __pos - this->_M_impl._M_start;
-        const size_type __length = size();
-        if (static_cast<size_type>(__elemsbefore) < __length / 2)
-	  {
-	    iterator __new_start = _M_reserve_elements_at_front(__n);
-	    iterator __old_start = this->_M_impl._M_start;
-	    __pos = this->_M_impl._M_start + __elemsbefore;
-	    __try
-	      {
-		if (__elemsbefore >= difference_type(__n))
-		  {
-		    iterator __start_n = (this->_M_impl._M_start
-					  + difference_type(__n));
-		    std::__uninitialized_move_a(this->_M_impl._M_start,
-						__start_n, __new_start,
-						_M_get_Tp_allocator());
-		    this->_M_impl._M_start = __new_start;
-		    _GLIBCXX_MOVE3(__start_n, __pos, __old_start);
-		    std::copy(__first, __last, __pos - difference_type(__n));
-		  }
-		else
-		  {
-		    _ForwardIterator __mid = __first;
-		    std::advance(__mid, difference_type(__n) - __elemsbefore);
-		    std::__uninitialized_move_copy(this->_M_impl._M_start,
-						   __pos, __first, __mid,
-						   __new_start,
-						   _M_get_Tp_allocator());
-		    this->_M_impl._M_start = __new_start;
-		    std::copy(__mid, __last, __old_start);
-		  }
-	      }
-	    __catch(...)
-	      {
-		_M_destroy_nodes(__new_start._M_node,
-				 this->_M_impl._M_start._M_node);
-		__throw_exception_again;
-	      }
-	  }
-        else
-        {
-          iterator __new_finish = _M_reserve_elements_at_back(__n);
-          iterator __old_finish = this->_M_impl._M_finish;
-          const difference_type __elemsafter =
-            difference_type(__length) - __elemsbefore;
-          __pos = this->_M_impl._M_finish - __elemsafter;
-          __try
-            {
-              if (__elemsafter > difference_type(__n))
-		{
-		  iterator __finish_n = (this->_M_impl._M_finish
-					 - difference_type(__n));
-		  std::__uninitialized_move_a(__finish_n,
-					      this->_M_impl._M_finish,
-					      this->_M_impl._M_finish,
-					      _M_get_Tp_allocator());
-		  this->_M_impl._M_finish = __new_finish;
-		  _GLIBCXX_MOVE_BACKWARD3(__pos, __finish_n, __old_finish);
-		  std::copy(__first, __last, __pos);
-		}
-              else
-		{
-		  _ForwardIterator __mid = __first;
-		  std::advance(__mid, __elemsafter);
-		  std::__uninitialized_copy_move(__mid, __last, __pos,
-						 this->_M_impl._M_finish,
-						 this->_M_impl._M_finish,
-						 _M_get_Tp_allocator());
-		  this->_M_impl._M_finish = __new_finish;
-		  std::copy(__first, __mid, __pos);
-		}
-            }
-          __catch(...)
-            {
-              _M_destroy_nodes(this->_M_impl._M_finish._M_node + 1,
-			       __new_finish._M_node + 1);
-              __throw_exception_again;
-            }
-        }
-      }
-
-   template<typename _Tp, typename _Alloc>
-     void
-     deque<_Tp, _Alloc>::
-     _M_destroy_data_aux(iterator __first, iterator __last)
-     {
-       for (_Map_pointer __node = __first._M_node + 1;
-	    __node < __last._M_node; ++__node)
-	 std::_Destroy(*__node, *__node + _S_buffer_size(),
-		       _M_get_Tp_allocator());
-
-       if (__first._M_node != __last._M_node)
-	 {
-	   std::_Destroy(__first._M_cur, __first._M_last,
-			 _M_get_Tp_allocator());
-	   std::_Destroy(__last._M_first, __last._M_cur,
-			 _M_get_Tp_allocator());
-	 }
-       else
-	 std::_Destroy(__first._M_cur, __last._M_cur,
-		       _M_get_Tp_allocator());
-     }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp, _Alloc>::
-    _M_new_elements_at_front(size_type __new_elems)
-    {
-      if (this->max_size() - this->size() < __new_elems)
-	__throw_length_error(__N("deque::_M_new_elements_at_front"));
-
-      const size_type __new_nodes = ((__new_elems + _S_buffer_size() - 1)
-				     / _S_buffer_size());
-      _M_reserve_map_at_front(__new_nodes);
-      size_type __i;
-      __try
-        {
-          for (__i = 1; __i <= __new_nodes; ++__i)
-            *(this->_M_impl._M_start._M_node - __i) = this->_M_allocate_node();
-        }
-      __catch(...)
-        {
-          for (size_type __j = 1; __j < __i; ++__j)
-            _M_deallocate_node(*(this->_M_impl._M_start._M_node - __j));
-          __throw_exception_again;
-        }
-    }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp, _Alloc>::
-    _M_new_elements_at_back(size_type __new_elems)
-    {
-      if (this->max_size() - this->size() < __new_elems)
-	__throw_length_error(__N("deque::_M_new_elements_at_back"));
-
-      const size_type __new_nodes = ((__new_elems + _S_buffer_size() - 1)
-				     / _S_buffer_size());
-      _M_reserve_map_at_back(__new_nodes);
-      size_type __i;
-      __try
-        {
-          for (__i = 1; __i <= __new_nodes; ++__i)
-            *(this->_M_impl._M_finish._M_node + __i) = this->_M_allocate_node();
-        }
-      __catch(...)
-        {
-          for (size_type __j = 1; __j < __i; ++__j)
-            _M_deallocate_node(*(this->_M_impl._M_finish._M_node + __j));
-          __throw_exception_again;
-        }
-    }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp, _Alloc>::
-    _M_reallocate_map(size_type __nodes_to_add, bool __add_at_front)
-    {
-      const size_type __old_num_nodes
-	= this->_M_impl._M_finish._M_node - this->_M_impl._M_start._M_node + 1;
-      const size_type __new_num_nodes = __old_num_nodes + __nodes_to_add;
-
-      _Map_pointer __new_nstart;
-      if (this->_M_impl._M_map_size > 2 * __new_num_nodes)
-	{
-	  __new_nstart = this->_M_impl._M_map + (this->_M_impl._M_map_size
-					 - __new_num_nodes) / 2
-	                 + (__add_at_front ? __nodes_to_add : 0);
-	  if (__new_nstart < this->_M_impl._M_start._M_node)
-	    std::copy(this->_M_impl._M_start._M_node,
-		      this->_M_impl._M_finish._M_node + 1,
-		      __new_nstart);
-	  else
-	    std::copy_backward(this->_M_impl._M_start._M_node,
-			       this->_M_impl._M_finish._M_node + 1,
-			       __new_nstart + __old_num_nodes);
-	}
-      else
-	{
-	  size_type __new_map_size = this->_M_impl._M_map_size
-	                             + std::max(this->_M_impl._M_map_size,
-						__nodes_to_add) + 2;
-
-	  _Map_pointer __new_map = this->_M_allocate_map(__new_map_size);
-	  __new_nstart = __new_map + (__new_map_size - __new_num_nodes) / 2
-	                 + (__add_at_front ? __nodes_to_add : 0);
-	  std::copy(this->_M_impl._M_start._M_node,
-		    this->_M_impl._M_finish._M_node + 1,
-		    __new_nstart);
-	  _M_deallocate_map(this->_M_impl._M_map, this->_M_impl._M_map_size);
-
-	  this->_M_impl._M_map = __new_map;
-	  this->_M_impl._M_map_size = __new_map_size;
-	}
-
-      this->_M_impl._M_start._M_set_node(__new_nstart);
-      this->_M_impl._M_finish._M_set_node(__new_nstart + __old_num_nodes - 1);
-    }
-
-  // Overload for deque::iterators, exploiting the "segmented-iterator
-  // optimization".
-  template<typename _Tp>
-    void
-    fill(const _Deque_iterator<_Tp, _Tp&, _Tp*>& __first,
-	 const _Deque_iterator<_Tp, _Tp&, _Tp*>& __last, const _Tp& __value)
-    {
-      typedef typename _Deque_iterator<_Tp, _Tp&, _Tp*>::_Self _Self;
-
-      for (typename _Self::_Map_pointer __node = __first._M_node + 1;
-           __node < __last._M_node; ++__node)
-	std::fill(*__node, *__node + _Self::_S_buffer_size(), __value);
-
-      if (__first._M_node != __last._M_node)
-	{
-	  std::fill(__first._M_cur, __first._M_last, __value);
-	  std::fill(__last._M_first, __last._M_cur, __value);
-	}
-      else
-	std::fill(__first._M_cur, __last._M_cur, __value);
-    }
-
-  template<typename _Tp>
-    _Deque_iterator<_Tp, _Tp&, _Tp*>
-    copy(_Deque_iterator<_Tp, const _Tp&, const _Tp*> __first,
-	 _Deque_iterator<_Tp, const _Tp&, const _Tp*> __last,
-	 _Deque_iterator<_Tp, _Tp&, _Tp*> __result)
-    {
-      typedef typename _Deque_iterator<_Tp, _Tp&, _Tp*>::_Self _Self;
-      typedef typename _Self::difference_type difference_type;
-
-      difference_type __len = __last - __first;
-      while (__len > 0)
-	{
-	  const difference_type __clen
-	    = std::min(__len, std::min(__first._M_last - __first._M_cur,
-				       __result._M_last - __result._M_cur));
-	  std::copy(__first._M_cur, __first._M_cur + __clen, __result._M_cur);
-	  __first += __clen;
-	  __result += __clen;
-	  __len -= __clen;
-	}
-      return __result;
-    }
-
-  template<typename _Tp>
-    _Deque_iterator<_Tp, _Tp&, _Tp*>
-    copy_backward(_Deque_iterator<_Tp, const _Tp&, const _Tp*> __first,
-		  _Deque_iterator<_Tp, const _Tp&, const _Tp*> __last,
-		  _Deque_iterator<_Tp, _Tp&, _Tp*> __result)
-    {
-      typedef typename _Deque_iterator<_Tp, _Tp&, _Tp*>::_Self _Self;
-      typedef typename _Self::difference_type difference_type;
-
-      difference_type __len = __last - __first;
-      while (__len > 0)
-	{
-	  difference_type __llen = __last._M_cur - __last._M_first;
-	  _Tp* __lend = __last._M_cur;
-
-	  difference_type __rlen = __result._M_cur - __result._M_first;
-	  _Tp* __rend = __result._M_cur;
-
-	  if (!__llen)
-	    {
-	      __llen = _Self::_S_buffer_size();
-	      __lend = *(__last._M_node - 1) + __llen;
-	    }
-	  if (!__rlen)
-	    {
-	      __rlen = _Self::_S_buffer_size();
-	      __rend = *(__result._M_node - 1) + __rlen;
-	    }
-
-	  const difference_type __clen = std::min(__len,
-						  std::min(__llen, __rlen));
-	  std::copy_backward(__lend - __clen, __lend, __rend);
-	  __last -= __clen;
-	  __result -= __clen;
-	  __len -= __clen;
-	}
-      return __result;
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp>
-    _Deque_iterator<_Tp, _Tp&, _Tp*>
-    move(_Deque_iterator<_Tp, const _Tp&, const _Tp*> __first,
-	 _Deque_iterator<_Tp, const _Tp&, const _Tp*> __last,
-	 _Deque_iterator<_Tp, _Tp&, _Tp*> __result)
-    {
-      typedef typename _Deque_iterator<_Tp, _Tp&, _Tp*>::_Self _Self;
-      typedef typename _Self::difference_type difference_type;
-
-      difference_type __len = __last - __first;
-      while (__len > 0)
-	{
-	  const difference_type __clen
-	    = std::min(__len, std::min(__first._M_last - __first._M_cur,
-				       __result._M_last - __result._M_cur));
-	  std::move(__first._M_cur, __first._M_cur + __clen, __result._M_cur);
-	  __first += __clen;
-	  __result += __clen;
-	  __len -= __clen;
-	}
-      return __result;
-    }
-
-  template<typename _Tp>
-    _Deque_iterator<_Tp, _Tp&, _Tp*>
-    move_backward(_Deque_iterator<_Tp, const _Tp&, const _Tp*> __first,
-		  _Deque_iterator<_Tp, const _Tp&, const _Tp*> __last,
-		  _Deque_iterator<_Tp, _Tp&, _Tp*> __result)
-    {
-      typedef typename _Deque_iterator<_Tp, _Tp&, _Tp*>::_Self _Self;
-      typedef typename _Self::difference_type difference_type;
-
-      difference_type __len = __last - __first;
-      while (__len > 0)
-	{
-	  difference_type __llen = __last._M_cur - __last._M_first;
-	  _Tp* __lend = __last._M_cur;
-
-	  difference_type __rlen = __result._M_cur - __result._M_first;
-	  _Tp* __rend = __result._M_cur;
-
-	  if (!__llen)
-	    {
-	      __llen = _Self::_S_buffer_size();
-	      __lend = *(__last._M_node - 1) + __llen;
-	    }
-	  if (!__rlen)
-	    {
-	      __rlen = _Self::_S_buffer_size();
-	      __rend = *(__result._M_node - 1) + __rlen;
-	    }
-
-	  const difference_type __clen = std::min(__len,
-						  std::min(__llen, __rlen));
-	  std::move_backward(__lend - __clen, __lend, __rend);
-	  __last -= __clen;
-	  __result -= __clen;
-	  __len -= __clen;
-	}
-      return __result;
-    }
-#endif
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/enable_special_members.h b/openflow/usr/include/c++/5/bits/enable_special_members.h
deleted file mode 100644
index 1a1264e..0000000
--- a/openflow/usr/include/c++/5/bits/enable_special_members.h
+++ /dev/null
@@ -1,278 +0,0 @@
-// <bits/enable_special_members.h> -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/enable_special_members.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly.
- */
-
-#ifndef _ENABLE_SPECIAL_MEMBERS_H
-#define _ENABLE_SPECIAL_MEMBERS_H 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-/**
-  * @brief A mixin helper to conditionally enable or disable the default
-  * constructor.
-  * @sa _Enable_special_members
-  */
-template<bool _Switch, typename _Tag = void>
-  struct _Enable_default_constructor { };
-
-
-/**
-  * @brief A mixin helper to conditionally enable or disable the default
-  * destructor.
-  * @sa _Enable_special_members
-  */
-template<bool _Switch, typename _Tag = void>
-  struct _Enable_destructor { };
-
-/**
-  * @brief A mixin helper to conditionally enable or disable the copy/move
-  * special members.
-  * @sa _Enable_special_members
-  */
-template<bool _Copy, bool _CopyAssignment,
-         bool _Move, bool _MoveAssignment,
-         typename _Tag = void>
-  struct _Enable_copy_move { };
-
-/**
-  * @brief A mixin helper to conditionally enable or disable the special
-  * members.
-  *
-  * The @c _Tag type parameter is to make mixin bases unique and thus avoid
-  * ambiguities.
-  */
-template<bool _Default, bool _Destructor,
-         bool _Copy, bool _CopyAssignment,
-         bool _Move, bool _MoveAssignment,
-         typename _Tag = void>
-  struct _Enable_special_members
-  : private _Enable_default_constructor<_Default, _Tag>,
-    private _Enable_destructor<_Destructor, _Tag>,
-    private _Enable_copy_move<_Copy, _CopyAssignment,
-                              _Move, _MoveAssignment,
-                              _Tag>
-  { };
-
-// Boilerplate follows.
-
-template<typename _Tag>
-  struct _Enable_default_constructor<false, _Tag>
-  { constexpr _Enable_default_constructor() noexcept = delete; };
-
-template<typename _Tag>
-  struct _Enable_destructor<false, _Tag>
-  { ~_Enable_destructor() noexcept = delete; };
-
-template<typename _Tag>
-  struct _Enable_copy_move<false, true, true, true, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = delete;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = default;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<true, false, true, true, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = default;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = default;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<false, false, true, true, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = delete;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = default;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<true, true, false, true, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = default;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = default;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<false, true, false, true, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = delete;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = default;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<true, false, false, true, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = default;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = default;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<false, false, false, true, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = delete;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = default;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<true, true, true, false, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = default;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = delete;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<false, true, true, false, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = delete;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = delete;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<true, false, true, false, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = default;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = delete;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<false, false, true, false, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = delete;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = delete;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<true, true, false, false, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = default;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = delete;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<false, true, false, false, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = delete;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = default;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = delete;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<true, false, false, false, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = default;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = delete;
-  };
-
-template<typename _Tag>
-  struct _Enable_copy_move<false, false, false, false, _Tag>
-  {
-    constexpr _Enable_copy_move() noexcept                          = default;
-    constexpr _Enable_copy_move(_Enable_copy_move const&) noexcept  = delete;
-    constexpr _Enable_copy_move(_Enable_copy_move&&) noexcept       = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move const&) noexcept                    = delete;
-    _Enable_copy_move&
-    operator=(_Enable_copy_move&&) noexcept                         = delete;
-  };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif // _ENABLE_SPECIAL_MEMBERS_H
diff --git a/openflow/usr/include/c++/5/bits/exception_defines.h b/openflow/usr/include/c++/5/bits/exception_defines.h
deleted file mode 100644
index 8b2137f..0000000
--- a/openflow/usr/include/c++/5/bits/exception_defines.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -fno-exceptions Support -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/exception_defines.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{exception}
- */
-
-#ifndef _EXCEPTION_DEFINES_H
-#define _EXCEPTION_DEFINES_H 1
-
-#if ! __cpp_exceptions
-// Iff -fno-exceptions, transform error handling code to work without it.
-# define __try      if (true)
-# define __catch(X) if (false)
-# define __throw_exception_again
-#else
-// Else proceed normally.
-# define __try      try
-# define __catch(X) catch(X)
-# define __throw_exception_again throw
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/exception_ptr.h b/openflow/usr/include/c++/5/bits/exception_ptr.h
deleted file mode 100644
index 8fbad1c..0000000
--- a/openflow/usr/include/c++/5/bits/exception_ptr.h
+++ /dev/null
@@ -1,205 +0,0 @@
-// Exception Handling support header (exception_ptr class) for -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3, or (at your option)
-// any later version.
-// 
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/exception_ptr.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{exception}
- */
-
-#ifndef _EXCEPTION_PTR_H
-#define _EXCEPTION_PTR_H
-
-#pragma GCC visibility push(default)
-
-#include <bits/c++config.h>
-#include <bits/exception_defines.h>
-
-#if ATOMIC_INT_LOCK_FREE < 2
-#  error This platform does not support exception propagation.
-#endif
-
-extern "C++" {
-
-namespace std 
-{
-  class type_info;
-
-  /**
-   * @addtogroup exceptions
-   * @{
-   */
-  namespace __exception_ptr
-  {
-    class exception_ptr;
-  }
-
-  using __exception_ptr::exception_ptr;
-
-  /** Obtain an exception_ptr to the currently handled exception. If there
-   *  is none, or the currently handled exception is foreign, return the null
-   *  value.
-   */
-  exception_ptr current_exception() _GLIBCXX_USE_NOEXCEPT;
-
-  /// Throw the object pointed to by the exception_ptr.
-  void rethrow_exception(exception_ptr) __attribute__ ((__noreturn__));
-
-  namespace __exception_ptr
-  {
-    /**
-     *  @brief An opaque pointer to an arbitrary exception.
-     *  @ingroup exceptions
-     */
-    class exception_ptr
-    {
-      void* _M_exception_object;
-
-      explicit exception_ptr(void* __e) _GLIBCXX_USE_NOEXCEPT;
-
-      void _M_addref() _GLIBCXX_USE_NOEXCEPT;
-      void _M_release() _GLIBCXX_USE_NOEXCEPT;
-
-      void *_M_get() const _GLIBCXX_NOEXCEPT __attribute__ ((__pure__));
-
-      friend exception_ptr std::current_exception() _GLIBCXX_USE_NOEXCEPT;
-      friend void std::rethrow_exception(exception_ptr);
-
-    public:
-      exception_ptr() _GLIBCXX_USE_NOEXCEPT;
-
-      exception_ptr(const exception_ptr&) _GLIBCXX_USE_NOEXCEPT;
-
-#if __cplusplus >= 201103L
-      exception_ptr(nullptr_t) noexcept
-      : _M_exception_object(0)
-      { }
-
-      exception_ptr(exception_ptr&& __o) noexcept
-      : _M_exception_object(__o._M_exception_object)
-      { __o._M_exception_object = 0; }
-#endif
-
-#if (__cplusplus < 201103L) || defined (_GLIBCXX_EH_PTR_COMPAT)
-      typedef void (exception_ptr::*__safe_bool)();
-
-      // For construction from nullptr or 0.
-      exception_ptr(__safe_bool) _GLIBCXX_USE_NOEXCEPT;
-#endif
-
-      exception_ptr& 
-      operator=(const exception_ptr&) _GLIBCXX_USE_NOEXCEPT;
-
-#if __cplusplus >= 201103L
-      exception_ptr& 
-      operator=(exception_ptr&& __o) noexcept
-      {
-        exception_ptr(static_cast<exception_ptr&&>(__o)).swap(*this);
-        return *this;
-      }
-#endif
-
-      ~exception_ptr() _GLIBCXX_USE_NOEXCEPT;
-
-      void 
-      swap(exception_ptr&) _GLIBCXX_USE_NOEXCEPT;
-
-#ifdef _GLIBCXX_EH_PTR_COMPAT
-      // Retained for compatibility with CXXABI_1.3.
-      void _M_safe_bool_dummy() _GLIBCXX_USE_NOEXCEPT
-	__attribute__ ((__const__));
-      bool operator!() const _GLIBCXX_USE_NOEXCEPT
-	__attribute__ ((__pure__));
-      operator __safe_bool() const _GLIBCXX_USE_NOEXCEPT;
-#endif
-
-#if __cplusplus >= 201103L
-      explicit operator bool() const
-      { return _M_exception_object; }
-#endif
-
-      friend bool 
-      operator==(const exception_ptr&, const exception_ptr&)
-	_GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__));
-
-      const class std::type_info*
-      __cxa_exception_type() const _GLIBCXX_USE_NOEXCEPT
-	__attribute__ ((__pure__));
-    };
-
-    bool 
-    operator==(const exception_ptr&, const exception_ptr&)
-      _GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__));
-
-    bool 
-    operator!=(const exception_ptr&, const exception_ptr&)
-      _GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__));
-
-    inline void
-    swap(exception_ptr& __lhs, exception_ptr& __rhs)
-    { __lhs.swap(__rhs); }
-
-  } // namespace __exception_ptr
-
-
-  /// Obtain an exception_ptr pointing to a copy of the supplied object.
-  template<typename _Ex>
-    exception_ptr 
-    make_exception_ptr(_Ex __ex) _GLIBCXX_USE_NOEXCEPT
-    {
-#if __cpp_exceptions
-      try
-	{
-	  throw __ex;
-	}
-      catch(...)
-	{
-	  return current_exception();
-	}
-#else
-      return exception_ptr();
-#endif
-    }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 1130. copy_exception name misleading
-  /// Obtain an exception_ptr pointing to a copy of the supplied object.
-  /// This function is deprecated, use std::make_exception_ptr instead.
-  template<typename _Ex>
-    exception_ptr
-    copy_exception(_Ex __ex) _GLIBCXX_USE_NOEXCEPT _GLIBCXX_DEPRECATED;
-
-  template<typename _Ex>
-    exception_ptr
-    copy_exception(_Ex __ex) _GLIBCXX_USE_NOEXCEPT
-    { return std::make_exception_ptr<_Ex>(__ex); }
-
-  // @} group exceptions
-} // namespace std
-
-} // extern "C++"
-
-#pragma GCC visibility pop
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/forward_list.h b/openflow/usr/include/c++/5/bits/forward_list.h
deleted file mode 100644
index 0cdd75b..0000000
--- a/openflow/usr/include/c++/5/bits/forward_list.h
+++ /dev/null
@@ -1,1406 +0,0 @@
-// <forward_list.h> -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/forward_list.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{forward_list}
- */
-
-#ifndef _FORWARD_LIST_H
-#define _FORWARD_LIST_H 1
-
-#pragma GCC system_header
-
-#include <initializer_list>
-#include <bits/stl_iterator_base_types.h>
-#include <bits/stl_iterator.h>
-#include <bits/stl_algobase.h>
-#include <bits/stl_function.h>
-#include <bits/allocator.h>
-#include <ext/alloc_traits.h>
-#include <ext/aligned_buffer.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /**
-   *  @brief  A helper basic node class for %forward_list.
-   *          This is just a linked list with nothing inside it.
-   *          There are purely list shuffling utility methods here.
-   */
-  struct _Fwd_list_node_base
-  {
-    _Fwd_list_node_base() = default;
-
-    _Fwd_list_node_base* _M_next = nullptr;
-
-    _Fwd_list_node_base*
-    _M_transfer_after(_Fwd_list_node_base* __begin,
-		      _Fwd_list_node_base* __end) noexcept
-    {
-      _Fwd_list_node_base* __keep = __begin->_M_next;
-      if (__end)
-	{
-	  __begin->_M_next = __end->_M_next;
-	  __end->_M_next = _M_next;
-	}
-      else
-	__begin->_M_next = 0;
-      _M_next = __keep;
-      return __end;
-    }
-
-    void
-    _M_reverse_after() noexcept
-    {
-      _Fwd_list_node_base* __tail = _M_next;
-      if (!__tail)
-	return;
-      while (_Fwd_list_node_base* __temp = __tail->_M_next)
-	{
-	  _Fwd_list_node_base* __keep = _M_next;
-	  _M_next = __temp;
-	  __tail->_M_next = __temp->_M_next;
-	  _M_next->_M_next = __keep;
-	}
-    }
-  };
-
-  /**
-   *  @brief  A helper node class for %forward_list.
-   *          This is just a linked list with uninitialized storage for a
-   *          data value in each node.
-   *          There is a sorting utility method.
-   */
-  template<typename _Tp>
-    struct _Fwd_list_node
-    : public _Fwd_list_node_base
-    {
-      _Fwd_list_node() = default;
-
-      __gnu_cxx::__aligned_buffer<_Tp> _M_storage;
-
-      _Tp*
-      _M_valptr() noexcept
-      { return _M_storage._M_ptr(); }
-
-      const _Tp*
-      _M_valptr() const noexcept
-      { return _M_storage._M_ptr(); }
-    };
-
-  /**
-   *   @brief A forward_list::iterator.
-   * 
-   *   All the functions are op overloads.
-   */
-  template<typename _Tp>
-    struct _Fwd_list_iterator
-    {
-      typedef _Fwd_list_iterator<_Tp>            _Self;
-      typedef _Fwd_list_node<_Tp>                _Node;
-
-      typedef _Tp                                value_type;
-      typedef _Tp*                               pointer;
-      typedef _Tp&                               reference;
-      typedef ptrdiff_t                          difference_type;
-      typedef std::forward_iterator_tag          iterator_category;
-
-      _Fwd_list_iterator() noexcept
-      : _M_node() { }
-
-      explicit
-      _Fwd_list_iterator(_Fwd_list_node_base* __n) noexcept
-      : _M_node(__n) { }
-
-      reference
-      operator*() const noexcept
-      { return *static_cast<_Node*>(this->_M_node)->_M_valptr(); }
-
-      pointer
-      operator->() const noexcept
-      { return static_cast<_Node*>(this->_M_node)->_M_valptr(); }
-
-      _Self&
-      operator++() noexcept
-      {
-        _M_node = _M_node->_M_next;
-        return *this;
-      }
-
-      _Self
-      operator++(int) noexcept
-      {
-        _Self __tmp(*this);
-        _M_node = _M_node->_M_next;
-        return __tmp;
-      }
-
-      bool
-      operator==(const _Self& __x) const noexcept
-      { return _M_node == __x._M_node; }
-
-      bool
-      operator!=(const _Self& __x) const noexcept
-      { return _M_node != __x._M_node; }
-
-      _Self
-      _M_next() const noexcept
-      {
-        if (_M_node)
-          return _Fwd_list_iterator(_M_node->_M_next);
-        else
-          return _Fwd_list_iterator(0);
-      }
-
-      _Fwd_list_node_base* _M_node;
-    };
-
-  /**
-   *   @brief A forward_list::const_iterator.
-   * 
-   *   All the functions are op overloads.
-   */
-  template<typename _Tp>
-    struct _Fwd_list_const_iterator
-    {
-      typedef _Fwd_list_const_iterator<_Tp>      _Self;
-      typedef const _Fwd_list_node<_Tp>          _Node;
-      typedef _Fwd_list_iterator<_Tp>            iterator;
-
-      typedef _Tp                                value_type;
-      typedef const _Tp*                         pointer;
-      typedef const _Tp&                         reference;
-      typedef ptrdiff_t                          difference_type;
-      typedef std::forward_iterator_tag          iterator_category;
-
-      _Fwd_list_const_iterator() noexcept
-      : _M_node() { }
-
-      explicit
-      _Fwd_list_const_iterator(const _Fwd_list_node_base* __n)  noexcept
-      : _M_node(__n) { }
-
-      _Fwd_list_const_iterator(const iterator& __iter) noexcept
-      : _M_node(__iter._M_node) { }
-
-      reference
-      operator*() const noexcept
-      { return *static_cast<_Node*>(this->_M_node)->_M_valptr(); }
-
-      pointer
-      operator->() const noexcept
-      { return static_cast<_Node*>(this->_M_node)->_M_valptr(); }
-
-      _Self&
-      operator++() noexcept
-      {
-        _M_node = _M_node->_M_next;
-        return *this;
-      }
-
-      _Self
-      operator++(int) noexcept
-      {
-        _Self __tmp(*this);
-        _M_node = _M_node->_M_next;
-        return __tmp;
-      }
-
-      bool
-      operator==(const _Self& __x) const noexcept
-      { return _M_node == __x._M_node; }
-
-      bool
-      operator!=(const _Self& __x) const noexcept
-      { return _M_node != __x._M_node; }
-
-      _Self
-      _M_next() const noexcept
-      {
-        if (this->_M_node)
-          return _Fwd_list_const_iterator(_M_node->_M_next);
-        else
-          return _Fwd_list_const_iterator(0);
-      }
-
-      const _Fwd_list_node_base* _M_node;
-    };
-
-  /**
-   *  @brief  Forward list iterator equality comparison.
-   */
-  template<typename _Tp>
-    inline bool
-    operator==(const _Fwd_list_iterator<_Tp>& __x,
-               const _Fwd_list_const_iterator<_Tp>& __y) noexcept
-    { return __x._M_node == __y._M_node; }
-
-  /**
-   *  @brief  Forward list iterator inequality comparison.
-   */
-  template<typename _Tp>
-    inline bool
-    operator!=(const _Fwd_list_iterator<_Tp>& __x,
-               const _Fwd_list_const_iterator<_Tp>& __y) noexcept
-    { return __x._M_node != __y._M_node; }
-
-  /**
-   *  @brief  Base class for %forward_list.
-   */
-  template<typename _Tp, typename _Alloc>
-    struct _Fwd_list_base
-    {
-    protected:
-      typedef __alloc_rebind<_Alloc, _Tp> 		  _Tp_alloc_type;
-      typedef __alloc_rebind<_Alloc, _Fwd_list_node<_Tp>> _Node_alloc_type;
-      typedef __gnu_cxx::__alloc_traits<_Node_alloc_type> _Node_alloc_traits;
-
-      struct _Fwd_list_impl 
-      : public _Node_alloc_type
-      {
-        _Fwd_list_node_base _M_head;
-
-        _Fwd_list_impl()
-        : _Node_alloc_type(), _M_head()
-        { }
-
-        _Fwd_list_impl(const _Node_alloc_type& __a)
-        : _Node_alloc_type(__a), _M_head()
-        { }
-
-        _Fwd_list_impl(_Node_alloc_type&& __a)
-	: _Node_alloc_type(std::move(__a)), _M_head()
-        { }
-      };
-
-      _Fwd_list_impl _M_impl;
-
-    public:
-      typedef _Fwd_list_iterator<_Tp>                 iterator;
-      typedef _Fwd_list_const_iterator<_Tp>           const_iterator;
-      typedef _Fwd_list_node<_Tp>                     _Node;
-
-      _Node_alloc_type&
-      _M_get_Node_allocator() noexcept
-      { return *static_cast<_Node_alloc_type*>(&this->_M_impl); }
-
-      const _Node_alloc_type&
-      _M_get_Node_allocator() const noexcept
-      { return *static_cast<const _Node_alloc_type*>(&this->_M_impl); }
-
-      _Fwd_list_base()
-      : _M_impl() { }
-
-      _Fwd_list_base(const _Node_alloc_type& __a)
-      : _M_impl(__a) { }
-
-      _Fwd_list_base(_Fwd_list_base&& __lst, const _Node_alloc_type& __a);
-
-      _Fwd_list_base(_Fwd_list_base&& __lst)
-      : _M_impl(std::move(__lst._M_get_Node_allocator()))
-      {
-	this->_M_impl._M_head._M_next = __lst._M_impl._M_head._M_next;
-	__lst._M_impl._M_head._M_next = 0;
-      }
-
-      ~_Fwd_list_base()
-      { _M_erase_after(&_M_impl._M_head, 0); }
-
-    protected:
-
-      _Node*
-      _M_get_node()
-      {
-	auto __ptr = _Node_alloc_traits::allocate(_M_get_Node_allocator(), 1);
-	return std::__addressof(*__ptr);
-      }
-
-      template<typename... _Args>
-        _Node*
-        _M_create_node(_Args&&... __args)
-        {
-          _Node* __node = this->_M_get_node();
-          __try
-            {
-	      _Tp_alloc_type __a(_M_get_Node_allocator());
-	      typedef allocator_traits<_Tp_alloc_type> _Alloc_traits;
-	      ::new ((void*)__node) _Node;
-	      _Alloc_traits::construct(__a, __node->_M_valptr(),
-				       std::forward<_Args>(__args)...);
-            }
-          __catch(...)
-            {
-              this->_M_put_node(__node);
-              __throw_exception_again;
-            }
-          return __node;
-        }
-
-      template<typename... _Args>
-        _Fwd_list_node_base*
-        _M_insert_after(const_iterator __pos, _Args&&... __args);
-
-      void
-      _M_put_node(_Node* __p)
-      {
-	typedef typename _Node_alloc_traits::pointer _Ptr;
-	auto __ptr = std::pointer_traits<_Ptr>::pointer_to(*__p);
-	_Node_alloc_traits::deallocate(_M_get_Node_allocator(), __ptr, 1);
-      }
-
-      _Fwd_list_node_base*
-      _M_erase_after(_Fwd_list_node_base* __pos);
-
-      _Fwd_list_node_base*
-      _M_erase_after(_Fwd_list_node_base* __pos, 
-                     _Fwd_list_node_base* __last);
-    };
-
-  /**
-   *  @brief A standard container with linear time access to elements,
-   *  and fixed time insertion/deletion at any point in the sequence.
-   *
-   *  @ingroup sequences
-   *
-   *  @tparam _Tp  Type of element.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_Tp>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#67">sequence</a>, including the
-   *  <a href="tables.html#68">optional sequence requirements</a> with the
-   *  %exception of @c at and @c operator[].
-   *
-   *  This is a @e singly @e linked %list.  Traversal up the
-   *  %list requires linear time, but adding and removing elements (or
-   *  @e nodes) is done in constant time, regardless of where the
-   *  change takes place.  Unlike std::vector and std::deque,
-   *  random-access iterators are not provided, so subscripting ( @c
-   *  [] ) access is not allowed.  For algorithms which only need
-   *  sequential access, this lack makes no difference.
-   *
-   *  Also unlike the other standard containers, std::forward_list provides
-   *  specialized algorithms %unique to linked lists, such as
-   *  splicing, sorting, and in-place reversal.
-   */
-  template<typename _Tp, typename _Alloc = allocator<_Tp> >
-    class forward_list : private _Fwd_list_base<_Tp, _Alloc>
-    {
-    private:
-      typedef _Fwd_list_base<_Tp, _Alloc>                  _Base;
-      typedef _Fwd_list_node<_Tp>                          _Node;
-      typedef _Fwd_list_node_base                          _Node_base;
-      typedef typename _Base::_Tp_alloc_type               _Tp_alloc_type;
-      typedef typename _Base::_Node_alloc_type             _Node_alloc_type;
-      typedef typename _Base::_Node_alloc_traits           _Node_alloc_traits;
-      typedef __gnu_cxx::__alloc_traits<_Tp_alloc_type>    _Alloc_traits;
-
-    public:
-      // types:
-      typedef _Tp                                          value_type;
-      typedef typename _Alloc_traits::pointer              pointer;
-      typedef typename _Alloc_traits::const_pointer        const_pointer;
-      typedef value_type&				   reference;
-      typedef const value_type&				   const_reference;
- 
-      typedef _Fwd_list_iterator<_Tp>                      iterator;
-      typedef _Fwd_list_const_iterator<_Tp>                const_iterator;
-      typedef std::size_t                                  size_type;
-      typedef std::ptrdiff_t                               difference_type;
-      typedef _Alloc                                       allocator_type;
-
-      // 23.3.4.2 construct/copy/destroy:
-
-      /**
-       *  @brief  Creates a %forward_list with no elements.
-       *  @param  __al  An allocator object.
-       */
-      explicit
-      forward_list(const _Alloc& __al = _Alloc())
-      : _Base(_Node_alloc_type(__al))
-      { }
-
-      /**
-       *  @brief  Copy constructor with allocator argument.
-       *  @param  __list  Input list to copy.
-       *  @param  __al    An allocator object.
-       */
-      forward_list(const forward_list& __list, const _Alloc& __al)
-      : _Base(_Node_alloc_type(__al))
-      { _M_range_initialize(__list.begin(), __list.end()); }
-
-      /**
-       *  @brief  Move constructor with allocator argument.
-       *  @param  __list  Input list to move.
-       *  @param  __al    An allocator object.
-       */
-      forward_list(forward_list&& __list, const _Alloc& __al)
-      noexcept(_Node_alloc_traits::_S_always_equal())
-      : _Base(std::move(__list), _Node_alloc_type(__al))
-      { }
-
-      /**
-       *  @brief  Creates a %forward_list with default constructed elements.
-       *  @param  __n   The number of elements to initially create.
-       *  @param  __al  An allocator object.
-       *
-       *  This constructor creates the %forward_list with @a __n default
-       *  constructed elements.
-       */
-      explicit
-      forward_list(size_type __n, const _Alloc& __al = _Alloc())
-      : _Base(_Node_alloc_type(__al))
-      { _M_default_initialize(__n); }
-
-      /**
-       *  @brief  Creates a %forward_list with copies of an exemplar element.
-       *  @param  __n      The number of elements to initially create.
-       *  @param  __value  An element to copy.
-       *  @param  __al     An allocator object.
-       *
-       *  This constructor fills the %forward_list with @a __n copies of
-       *  @a __value.
-       */
-      forward_list(size_type __n, const _Tp& __value,
-                   const _Alloc& __al = _Alloc())
-      : _Base(_Node_alloc_type(__al))
-      { _M_fill_initialize(__n, __value); }
-
-      /**
-       *  @brief  Builds a %forward_list from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *  @param  __al     An allocator object.
-       *
-       *  Create a %forward_list consisting of copies of the elements from
-       *  [@a __first,@a __last).  This is linear in N (where N is
-       *  distance(@a __first,@a __last)).
-       */
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        forward_list(_InputIterator __first, _InputIterator __last,
-                     const _Alloc& __al = _Alloc())
-	: _Base(_Node_alloc_type(__al))
-        { _M_range_initialize(__first, __last); }
-
-      /**
-       *  @brief  The %forward_list copy constructor.
-       *  @param  __list  A %forward_list of identical element and allocator
-       *                  types.
-       */
-      forward_list(const forward_list& __list)
-      : _Base(_Node_alloc_traits::_S_select_on_copy(
-                __list._M_get_Node_allocator()))
-      { _M_range_initialize(__list.begin(), __list.end()); }
-
-      /**
-       *  @brief  The %forward_list move constructor.
-       *  @param  __list  A %forward_list of identical element and allocator
-       *                  types.
-       *
-       *  The newly-created %forward_list contains the exact contents of @a
-       *  __list. The contents of @a __list are a valid, but unspecified
-       *  %forward_list.
-       */
-      forward_list(forward_list&& __list) noexcept
-      : _Base(std::move(__list)) { }
-
-      /**
-       *  @brief  Builds a %forward_list from an initializer_list
-       *  @param  __il  An initializer_list of value_type.
-       *  @param  __al  An allocator object.
-       *
-       *  Create a %forward_list consisting of copies of the elements
-       *  in the initializer_list @a __il.  This is linear in __il.size().
-       */
-      forward_list(std::initializer_list<_Tp> __il,
-                   const _Alloc& __al = _Alloc())
-      : _Base(_Node_alloc_type(__al))
-      { _M_range_initialize(__il.begin(), __il.end()); }
-
-      /**
-       *  @brief  The forward_list dtor.
-       */
-      ~forward_list() noexcept
-      { }
-
-      /**
-       *  @brief  The %forward_list assignment operator.
-       *  @param  __list  A %forward_list of identical element and allocator
-       *                types.
-       *
-       *  All the elements of @a __list are copied, but unlike the copy
-       *  constructor, the allocator object is not copied.
-       */
-      forward_list&
-      operator=(const forward_list& __list);
-
-      /**
-       *  @brief  The %forward_list move assignment operator.
-       *  @param  __list  A %forward_list of identical element and allocator
-       *                types.
-       *
-       *  The contents of @a __list are moved into this %forward_list
-       *  (without copying, if the allocators permit it).
-       *  @a __list is a valid, but unspecified %forward_list
-       */
-      forward_list&
-      operator=(forward_list&& __list)
-      noexcept(_Node_alloc_traits::_S_nothrow_move())
-      {
-        constexpr bool __move_storage =
-          _Node_alloc_traits::_S_propagate_on_move_assign()
-          || _Node_alloc_traits::_S_always_equal();
-        _M_move_assign(std::move(__list),
-                       integral_constant<bool, __move_storage>());
-	return *this;
-      }
-
-      /**
-       *  @brief  The %forward_list initializer list assignment operator.
-       *  @param  __il  An initializer_list of value_type.
-       *
-       *  Replace the contents of the %forward_list with copies of the
-       *  elements in the initializer_list @a __il.  This is linear in
-       *  __il.size().
-       */
-      forward_list&
-      operator=(std::initializer_list<_Tp> __il)
-      {
-        assign(__il);
-        return *this;
-      }
-
-      /**
-       *  @brief  Assigns a range to a %forward_list.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *
-       *  This function fills a %forward_list with copies of the elements
-       *  in the range [@a __first,@a __last).
-       *
-       *  Note that the assignment completely changes the %forward_list and
-       *  that the number of elements of the resulting %forward_list is the
-       *  same as the number of elements assigned.  Old data is lost.
-       */
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  typedef is_assignable<_Tp, decltype(*__first)> __assignable;
-	  _M_assign(__first, __last, __assignable());
-	}
-
-      /**
-       *  @brief  Assigns a given value to a %forward_list.
-       *  @param  __n  Number of elements to be assigned.
-       *  @param  __val  Value to be assigned.
-       *
-       *  This function fills a %forward_list with @a __n copies of the
-       *  given value.  Note that the assignment completely changes the
-       *  %forward_list, and that the resulting %forward_list has __n
-       *  elements.  Old data is lost.
-       */
-      void
-      assign(size_type __n, const _Tp& __val)
-      { _M_assign_n(__n, __val, is_copy_assignable<_Tp>()); }
-
-      /**
-       *  @brief  Assigns an initializer_list to a %forward_list.
-       *  @param  __il  An initializer_list of value_type.
-       *
-       *  Replace the contents of the %forward_list with copies of the
-       *  elements in the initializer_list @a __il.  This is linear in
-       *  il.size().
-       */
-      void
-      assign(std::initializer_list<_Tp> __il)
-      { assign(__il.begin(), __il.end()); }
-
-      /// Get a copy of the memory allocation object.
-      allocator_type
-      get_allocator() const noexcept
-      { return allocator_type(this->_M_get_Node_allocator()); }
-
-      // 23.3.4.3 iterators:
-
-      /**
-       *  Returns a read/write iterator that points before the first element
-       *  in the %forward_list.  Iteration is done in ordinary element order.
-       */
-      iterator
-      before_begin() noexcept
-      { return iterator(&this->_M_impl._M_head); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points before the
-       *  first element in the %forward_list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      before_begin() const noexcept
-      { return const_iterator(&this->_M_impl._M_head); }
-
-      /**
-       *  Returns a read/write iterator that points to the first element
-       *  in the %forward_list.  Iteration is done in ordinary element order.
-       */
-      iterator
-      begin() noexcept
-      { return iterator(this->_M_impl._M_head._M_next); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %forward_list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      begin() const noexcept
-      { return const_iterator(this->_M_impl._M_head._M_next); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  element in the %forward_list.  Iteration is done in ordinary
-       *  element order.
-       */
-      iterator
-      end() noexcept
-      { return iterator(0); }
-
-      /**
-       *  Returns a read-only iterator that points one past the last
-       *  element in the %forward_list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      end() const noexcept
-      { return const_iterator(0); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the
-       *  first element in the %forward_list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(this->_M_impl._M_head._M_next); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points before the
-       *  first element in the %forward_list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      cbefore_begin() const noexcept
-      { return const_iterator(&this->_M_impl._M_head); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past
-       *  the last element in the %forward_list.  Iteration is done in
-       *  ordinary element order.
-       */
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(0); }
-
-      /**
-       *  Returns true if the %forward_list is empty.  (Thus begin() would
-       *  equal end().)
-       */
-      bool
-      empty() const noexcept
-      { return this->_M_impl._M_head._M_next == 0; }
-
-      /**
-       *  Returns the largest possible number of elements of %forward_list.
-       */
-      size_type
-      max_size() const noexcept
-      { return _Node_alloc_traits::max_size(this->_M_get_Node_allocator()); }
-
-      // 23.3.4.4 element access:
-
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %forward_list.
-       */
-      reference
-      front()
-      {
-        _Node* __front = static_cast<_Node*>(this->_M_impl._M_head._M_next);
-        return *__front->_M_valptr();
-      }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %forward_list.
-       */
-      const_reference
-      front() const
-      {
-        _Node* __front = static_cast<_Node*>(this->_M_impl._M_head._M_next);
-        return *__front->_M_valptr();
-      }
-
-      // 23.3.4.5 modifiers:
-
-      /**
-       *  @brief  Constructs object in %forward_list at the front of the
-       *          list.
-       *  @param  __args  Arguments.
-       *
-       *  This function will insert an object of type Tp constructed
-       *  with Tp(std::forward<Args>(args)...) at the front of the list
-       *  Due to the nature of a %forward_list this operation can
-       *  be done in constant time, and does not invalidate iterators
-       *  and references.
-       */
-      template<typename... _Args>
-        void
-        emplace_front(_Args&&... __args)
-        { this->_M_insert_after(cbefore_begin(),
-                                std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief  Add data to the front of the %forward_list.
-       *  @param  __val  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an
-       *  element at the front of the %forward_list and assigns the given
-       *  data to it.  Due to the nature of a %forward_list this operation
-       *  can be done in constant time, and does not invalidate iterators
-       *  and references.
-       */
-      void
-      push_front(const _Tp& __val)
-      { this->_M_insert_after(cbefore_begin(), __val); }
-
-      /**
-       *
-       */
-      void
-      push_front(_Tp&& __val)
-      { this->_M_insert_after(cbefore_begin(), std::move(__val)); }
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical stack operation.  It shrinks the %forward_list
-       *  by one.  Due to the nature of a %forward_list this operation can
-       *  be done in constant time, and only invalidates iterators/references
-       *  to the element being removed.
-       *
-       *  Note that no data is returned, and if the first element's data
-       *  is needed, it should be retrieved before pop_front() is
-       *  called.
-       */
-      void
-      pop_front()
-      { this->_M_erase_after(&this->_M_impl._M_head); }
-
-      /**
-       *  @brief  Constructs object in %forward_list after the specified
-       *          iterator.
-       *  @param  __pos  A const_iterator into the %forward_list.
-       *  @param  __args  Arguments.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert an object of type T constructed
-       *  with T(std::forward<Args>(args)...) after the specified
-       *  location.  Due to the nature of a %forward_list this operation can
-       *  be done in constant time, and does not invalidate iterators
-       *  and references.
-       */
-      template<typename... _Args>
-        iterator
-        emplace_after(const_iterator __pos, _Args&&... __args)
-        { return iterator(this->_M_insert_after(__pos,
-                                          std::forward<_Args>(__args)...)); }
-
-      /**
-       *  @brief  Inserts given value into %forward_list after specified
-       *          iterator.
-       *  @param  __pos  An iterator into the %forward_list.
-       *  @param  __val  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given value after
-       *  the specified location.  Due to the nature of a %forward_list this
-       *  operation can be done in constant time, and does not
-       *  invalidate iterators and references.
-       */
-      iterator
-      insert_after(const_iterator __pos, const _Tp& __val)
-      { return iterator(this->_M_insert_after(__pos, __val)); }
-
-      /**
-       *
-       */
-      iterator
-      insert_after(const_iterator __pos, _Tp&& __val)
-      { return iterator(this->_M_insert_after(__pos, std::move(__val))); }
-
-      /**
-       *  @brief  Inserts a number of copies of given data into the
-       *          %forward_list.
-       *  @param  __pos  An iterator into the %forward_list.
-       *  @param  __n  Number of elements to be inserted.
-       *  @param  __val  Data to be inserted.
-       *  @return  An iterator pointing to the last inserted copy of
-       *           @a val or @a pos if @a n == 0.
-       *
-       *  This function will insert a specified number of copies of the
-       *  given data after the location specified by @a pos.
-       *
-       *  This operation is linear in the number of elements inserted and
-       *  does not invalidate iterators and references.
-       */
-      iterator
-      insert_after(const_iterator __pos, size_type __n, const _Tp& __val);
-
-      /**
-       *  @brief  Inserts a range into the %forward_list.
-       *  @param  __pos  An iterator into the %forward_list.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *  @return  An iterator pointing to the last inserted element or
-       *           @a __pos if @a __first == @a __last.
-       *
-       *  This function will insert copies of the data in the range
-       *  [@a __first,@a __last) into the %forward_list after the
-       *  location specified by @a __pos.
-       *
-       *  This operation is linear in the number of elements inserted and
-       *  does not invalidate iterators and references.
-       */
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        iterator
-        insert_after(const_iterator __pos,
-                     _InputIterator __first, _InputIterator __last);
-
-      /**
-       *  @brief  Inserts the contents of an initializer_list into
-       *          %forward_list after the specified iterator.
-       *  @param  __pos  An iterator into the %forward_list.
-       *  @param  __il  An initializer_list of value_type.
-       *  @return  An iterator pointing to the last inserted element
-       *           or @a __pos if @a __il is empty.
-       *
-       *  This function will insert copies of the data in the
-       *  initializer_list @a __il into the %forward_list before the location
-       *  specified by @a __pos.
-       *
-       *  This operation is linear in the number of elements inserted and
-       *  does not invalidate iterators and references.
-       */
-      iterator
-      insert_after(const_iterator __pos, std::initializer_list<_Tp> __il)
-      { return insert_after(__pos, __il.begin(), __il.end()); }
-
-      /**
-       *  @brief  Removes the element pointed to by the iterator following
-       *          @c pos.
-       *  @param  __pos  Iterator pointing before element to be erased.
-       *  @return  An iterator pointing to the element following the one
-       *           that was erased, or end() if no such element exists.
-       *
-       *  This function will erase the element at the given position and
-       *  thus shorten the %forward_list by one.
-       *
-       *  Due to the nature of a %forward_list this operation can be done
-       *  in constant time, and only invalidates iterators/references to
-       *  the element being removed.  The user is also cautioned that
-       *  this function only erases the element, and that if the element
-       *  is itself a pointer, the pointed-to memory is not touched in
-       *  any way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-      erase_after(const_iterator __pos)
-      { return iterator(this->_M_erase_after(const_cast<_Node_base*>
-					     (__pos._M_node))); }
-
-      /**
-       *  @brief  Remove a range of elements.
-       *  @param  __pos  Iterator pointing before the first element to be
-       *                 erased.
-       *  @param  __last  Iterator pointing to one past the last element to be
-       *                  erased.
-       *  @return  @ __last.
-       *
-       *  This function will erase the elements in the range
-       *  @a (__pos,__last) and shorten the %forward_list accordingly.
-       *
-       *  This operation is linear time in the size of the range and only
-       *  invalidates iterators/references to the element being removed.
-       *  The user is also cautioned that this function only erases the
-       *  elements, and that if the elements themselves are pointers, the
-       *  pointed-to memory is not touched in any way.  Managing the pointer
-       *  is the user's responsibility.
-       */
-      iterator
-      erase_after(const_iterator __pos, const_iterator __last)
-      { return iterator(this->_M_erase_after(const_cast<_Node_base*>
-					     (__pos._M_node),
-					     const_cast<_Node_base*>
-					     (__last._M_node))); }
-
-      /**
-       *  @brief  Swaps data with another %forward_list.
-       *  @param  __list  A %forward_list of the same element and allocator
-       *                  types.
-       *
-       *  This exchanges the elements between two lists in constant
-       *  time.  Note that the global std::swap() function is
-       *  specialized such that std::swap(l1,l2) will feed to this
-       *  function.
-       */
-      void
-      swap(forward_list& __list)
-      noexcept(_Node_alloc_traits::_S_nothrow_swap())
-      {
-        std::swap(this->_M_impl._M_head._M_next,
-		  __list._M_impl._M_head._M_next);
-	_Node_alloc_traits::_S_on_swap(this->_M_get_Node_allocator(),
-                                       __list._M_get_Node_allocator());
-      }
-
-      /**
-       *  @brief Resizes the %forward_list to the specified number of
-       *         elements.
-       *  @param __sz Number of elements the %forward_list should contain.
-       *
-       *  This function will %resize the %forward_list to the specified
-       *  number of elements.  If the number is smaller than the
-       *  %forward_list's current number of elements the %forward_list
-       *  is truncated, otherwise the %forward_list is extended and the
-       *  new elements are default constructed.
-       */
-      void
-      resize(size_type __sz);
-
-      /**
-       *  @brief Resizes the %forward_list to the specified number of
-       *         elements.
-       *  @param __sz Number of elements the %forward_list should contain.
-       *  @param __val Data with which new elements should be populated.
-       *
-       *  This function will %resize the %forward_list to the specified
-       *  number of elements.  If the number is smaller than the
-       *  %forward_list's current number of elements the %forward_list
-       *  is truncated, otherwise the %forward_list is extended and new
-       *  elements are populated with given data.
-       */
-      void
-      resize(size_type __sz, const value_type& __val);
-
-      /**
-       *  @brief  Erases all the elements.
-       *
-       *  Note that this function only erases
-       *  the elements, and that if the elements themselves are
-       *  pointers, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibility.
-       */
-      void
-      clear() noexcept
-      { this->_M_erase_after(&this->_M_impl._M_head, 0); }
-
-      // 23.3.4.6 forward_list operations:
-
-      /**
-       *  @brief  Insert contents of another %forward_list.
-       *  @param  __pos  Iterator referencing the element to insert after.
-       *  @param  __list  Source list.
-       *
-       *  The elements of @a list are inserted in constant time after
-       *  the element referenced by @a pos.  @a list becomes an empty
-       *  list.
-       *
-       *  Requires this != @a x.
-       */
-      void
-      splice_after(const_iterator __pos, forward_list&& __list)
-      {
-	if (!__list.empty())
-	  _M_splice_after(__pos, __list.before_begin(), __list.end());
-      }
-
-      void
-      splice_after(const_iterator __pos, forward_list& __list)
-      { splice_after(__pos, std::move(__list)); }
-
-      /**
-       *  @brief  Insert element from another %forward_list.
-       *  @param  __pos  Iterator referencing the element to insert after.
-       *  @param  __list  Source list.
-       *  @param  __i   Iterator referencing the element before the element
-       *                to move.
-       *
-       *  Removes the element in list @a list referenced by @a i and
-       *  inserts it into the current list after @a pos.
-       */
-      void
-      splice_after(const_iterator __pos, forward_list&& __list,
-                   const_iterator __i);
-
-      void
-      splice_after(const_iterator __pos, forward_list& __list,
-                   const_iterator __i)
-      { splice_after(__pos, std::move(__list), __i); }
-
-      /**
-       *  @brief  Insert range from another %forward_list.
-       *  @param  __pos  Iterator referencing the element to insert after.
-       *  @param  __list  Source list.
-       *  @param  __before  Iterator referencing before the start of range
-       *                    in list.
-       *  @param  __last  Iterator referencing the end of range in list.
-       *
-       *  Removes elements in the range (__before,__last) and inserts them
-       *  after @a __pos in constant time.
-       *
-       *  Undefined if @a __pos is in (__before,__last).
-       *  @{
-       */
-      void
-      splice_after(const_iterator __pos, forward_list&&,
-                   const_iterator __before, const_iterator __last)
-      { _M_splice_after(__pos, __before, __last); }
-
-      void
-      splice_after(const_iterator __pos, forward_list&,
-                   const_iterator __before, const_iterator __last)
-      { _M_splice_after(__pos, __before, __last); }
-      // @}
-
-      /**
-       *  @brief  Remove all elements equal to value.
-       *  @param  __val  The value to remove.
-       *
-       *  Removes every element in the list equal to @a __val.
-       *  Remaining elements stay in list order.  Note that this
-       *  function only erases the elements, and that if the elements
-       *  themselves are pointers, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      void
-      remove(const _Tp& __val);
-
-      /**
-       *  @brief  Remove all elements satisfying a predicate.
-       *  @param  __pred  Unary predicate function or object.
-       *
-       *  Removes every element in the list for which the predicate
-       *  returns true.  Remaining elements stay in list order.  Note
-       *  that this function only erases the elements, and that if the
-       *  elements themselves are pointers, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      template<typename _Pred>
-        void
-        remove_if(_Pred __pred);
-
-      /**
-       *  @brief  Remove consecutive duplicate elements.
-       *
-       *  For each consecutive set of elements with the same value,
-       *  remove all but the first one.  Remaining elements stay in
-       *  list order.  Note that this function only erases the
-       *  elements, and that if the elements themselves are pointers,
-       *  the pointed-to memory is not touched in any way.  Managing
-       *  the pointer is the user's responsibility.
-       */
-      void
-      unique()
-      { unique(std::equal_to<_Tp>()); }
-
-      /**
-       *  @brief  Remove consecutive elements satisfying a predicate.
-       *  @param  __binary_pred  Binary predicate function or object.
-       *
-       *  For each consecutive set of elements [first,last) that
-       *  satisfy predicate(first,i) where i is an iterator in
-       *  [first,last), remove all but the first one.  Remaining
-       *  elements stay in list order.  Note that this function only
-       *  erases the elements, and that if the elements themselves are
-       *  pointers, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibility.
-       */
-      template<typename _BinPred>
-        void
-        unique(_BinPred __binary_pred);
-
-      /**
-       *  @brief  Merge sorted lists.
-       *  @param  __list  Sorted list to merge.
-       *
-       *  Assumes that both @a list and this list are sorted according to
-       *  operator<().  Merges elements of @a __list into this list in
-       *  sorted order, leaving @a __list empty when complete.  Elements in
-       *  this list precede elements in @a __list that are equal.
-       */
-      void
-      merge(forward_list&& __list)
-      { merge(std::move(__list), std::less<_Tp>()); }
-
-      void
-      merge(forward_list& __list)
-      { merge(std::move(__list)); }
-
-      /**
-       *  @brief  Merge sorted lists according to comparison function.
-       *  @param  __list  Sorted list to merge.
-       *  @param  __comp Comparison function defining sort order.
-       *
-       *  Assumes that both @a __list and this list are sorted according to
-       *  comp.  Merges elements of @a __list into this list
-       *  in sorted order, leaving @a __list empty when complete.  Elements
-       *  in this list precede elements in @a __list that are equivalent
-       *  according to comp().
-       */
-      template<typename _Comp>
-        void
-        merge(forward_list&& __list, _Comp __comp);
-
-      template<typename _Comp>
-        void
-        merge(forward_list& __list, _Comp __comp)
-        { merge(std::move(__list), __comp); }
-
-      /**
-       *  @brief  Sort the elements of the list.
-       *
-       *  Sorts the elements of this list in NlogN time.  Equivalent
-       *  elements remain in list order.
-       */
-      void
-      sort()
-      { sort(std::less<_Tp>()); }
-
-      /**
-       *  @brief  Sort the forward_list using a comparison function.
-       *
-       *  Sorts the elements of this list in NlogN time.  Equivalent
-       *  elements remain in list order.
-       */
-      template<typename _Comp>
-        void
-        sort(_Comp __comp);
-
-      /**
-       *  @brief  Reverse the elements in list.
-       *
-       *  Reverse the order of elements in the list in linear time.
-       */
-      void
-      reverse() noexcept
-      { this->_M_impl._M_head._M_reverse_after(); }
-
-    private:
-      // Called by the range constructor to implement [23.3.4.2]/9
-      template<typename _InputIterator>
-        void
-        _M_range_initialize(_InputIterator __first, _InputIterator __last);
-
-      // Called by forward_list(n,v,a), and the range constructor when it
-      // turns out to be the same thing.
-      void
-      _M_fill_initialize(size_type __n, const value_type& __value);
-
-      // Called by splice_after and insert_after.
-      iterator
-      _M_splice_after(const_iterator __pos, const_iterator __before,
-		      const_iterator __last);
-
-      // Called by forward_list(n).
-      void
-      _M_default_initialize(size_type __n);
-
-      // Called by resize(sz).
-      void
-      _M_default_insert_after(const_iterator __pos, size_type __n);
-
-      // Called by operator=(forward_list&&)
-      void
-      _M_move_assign(forward_list&& __list, std::true_type) noexcept
-      {
-        clear();
-        std::swap(this->_M_impl._M_head._M_next,
-                  __list._M_impl._M_head._M_next);
-        std::__alloc_on_move(this->_M_get_Node_allocator(),
-                             __list._M_get_Node_allocator());
-      }
-
-      // Called by operator=(forward_list&&)
-      void
-      _M_move_assign(forward_list&& __list, std::false_type)
-      {
-        if (__list._M_get_Node_allocator() == this->_M_get_Node_allocator())
-          _M_move_assign(std::move(__list), std::true_type());
-        else
-	  // The rvalue's allocator cannot be moved, or is not equal,
-	  // so we need to individually move each element.
-	  this->assign(std::__make_move_if_noexcept_iterator(__list.begin()),
-		       std::__make_move_if_noexcept_iterator(__list.end()));
-      }
-
-      // Called by assign(_InputIterator, _InputIterator) if _Tp is
-      // CopyAssignable.
-      template<typename _InputIterator>
-	void
-        _M_assign(_InputIterator __first, _InputIterator __last, true_type)
-	{
-	  auto __prev = before_begin();
-	  auto __curr = begin();
-	  auto __end = end();
-	  while (__curr != __end && __first != __last)
-	    {
-	      *__curr = *__first;
-	      ++__prev;
-	      ++__curr;
-	      ++__first;
-	    }
-	  if (__first != __last)
-	    insert_after(__prev, __first, __last);
-	  else if (__curr != __end)
-	    erase_after(__prev, __end);
-        }
-
-      // Called by assign(_InputIterator, _InputIterator) if _Tp is not
-      // CopyAssignable.
-      template<typename _InputIterator>
-	void
-        _M_assign(_InputIterator __first, _InputIterator __last, false_type)
-	{
-	  clear();
-	  insert_after(cbefore_begin(), __first, __last);
-	}
-
-      // Called by assign(size_type, const _Tp&) if Tp is CopyAssignable
-      void
-      _M_assign_n(size_type __n, const _Tp& __val, true_type)
-      {
-	auto __prev = before_begin();
-	auto __curr = begin();
-	auto __end = end();
-	while (__curr != __end && __n > 0)
-	  {
-	    *__curr = __val;
-	    ++__prev;
-	    ++__curr;
-	    --__n;
-	  }
-	if (__n > 0)
-	  insert_after(__prev, __n, __val);
-	else if (__curr != __end)
-	  erase_after(__prev, __end);
-      }
-
-      // Called by assign(size_type, const _Tp&) if Tp is non-CopyAssignable
-      void
-      _M_assign_n(size_type __n, const _Tp& __val, false_type)
-      {
-	clear();
-	insert_after(cbefore_begin(), __n, __val);
-      }
-    };
-
-  /**
-   *  @brief  Forward list equality comparison.
-   *  @param  __lx  A %forward_list
-   *  @param  __ly  A %forward_list of the same type as @a __lx.
-   *  @return  True iff the elements of the forward lists are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the number of 
-   *  elements of the forward lists.  Deques are considered equivalent
-   *  if corresponding elements compare equal.
-   */
-  template<typename _Tp, typename _Alloc>
-    bool
-    operator==(const forward_list<_Tp, _Alloc>& __lx,
-               const forward_list<_Tp, _Alloc>& __ly);
-
-  /**
-   *  @brief  Forward list ordering relation.
-   *  @param  __lx  A %forward_list.
-   *  @param  __ly  A %forward_list of the same type as @a __lx.
-   *  @return  True iff @a __lx is lexicographically less than @a __ly.
-   *
-   *  This is a total ordering relation.  It is linear in the number of 
-   *  elements of the forward lists.  The elements must be comparable
-   *  with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-   */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const forward_list<_Tp, _Alloc>& __lx,
-              const forward_list<_Tp, _Alloc>& __ly)
-    { return std::lexicographical_compare(__lx.cbegin(), __lx.cend(),
-					  __ly.cbegin(), __ly.cend()); }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const forward_list<_Tp, _Alloc>& __lx,
-               const forward_list<_Tp, _Alloc>& __ly)
-    { return !(__lx == __ly); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const forward_list<_Tp, _Alloc>& __lx,
-              const forward_list<_Tp, _Alloc>& __ly)
-    { return (__ly < __lx); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const forward_list<_Tp, _Alloc>& __lx,
-               const forward_list<_Tp, _Alloc>& __ly)
-    { return !(__lx < __ly); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const forward_list<_Tp, _Alloc>& __lx,
-               const forward_list<_Tp, _Alloc>& __ly)
-    { return !(__ly < __lx); }
-
-  /// See std::forward_list::swap().
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(forward_list<_Tp, _Alloc>& __lx,
-	 forward_list<_Tp, _Alloc>& __ly)
-    { __lx.swap(__ly); }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif // _FORWARD_LIST_H
diff --git a/openflow/usr/include/c++/5/bits/forward_list.tcc b/openflow/usr/include/c++/5/bits/forward_list.tcc
deleted file mode 100644
index 00a26ed..0000000
--- a/openflow/usr/include/c++/5/bits/forward_list.tcc
+++ /dev/null
@@ -1,511 +0,0 @@
-// <forward_list.tcc> -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/forward_list.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{forward_list}
- */
-
-#ifndef _FORWARD_LIST_TCC
-#define _FORWARD_LIST_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  template<typename _Tp, typename _Alloc>
-    _Fwd_list_base<_Tp, _Alloc>::
-    _Fwd_list_base(_Fwd_list_base&& __lst, const _Node_alloc_type& __a)
-    : _M_impl(__a)
-    {
-      if (__lst._M_get_Node_allocator() == __a)
-	{
-	  this->_M_impl._M_head._M_next = __lst._M_impl._M_head._M_next;
-	  __lst._M_impl._M_head._M_next = 0;
-	}
-      else
-        {
-          this->_M_impl._M_head._M_next = 0;
-          _Fwd_list_node_base* __to = &this->_M_impl._M_head;
-          _Node* __curr = static_cast<_Node*>(__lst._M_impl._M_head._M_next);
-
-          while (__curr)
-            {
-              __to->_M_next =
-                _M_create_node(std::move_if_noexcept(*__curr->_M_valptr()));
-              __to = __to->_M_next;
-              __curr = static_cast<_Node*>(__curr->_M_next);
-            }
-        }
-    }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename... _Args>
-      _Fwd_list_node_base*
-      _Fwd_list_base<_Tp, _Alloc>::
-      _M_insert_after(const_iterator __pos, _Args&&... __args)
-      {
-        _Fwd_list_node_base* __to
-	  = const_cast<_Fwd_list_node_base*>(__pos._M_node);
-	_Node* __thing = _M_create_node(std::forward<_Args>(__args)...);
-        __thing->_M_next = __to->_M_next;
-        __to->_M_next = __thing;
-        return __to->_M_next;
-      }
-
-  template<typename _Tp, typename _Alloc>
-    _Fwd_list_node_base*
-    _Fwd_list_base<_Tp, _Alloc>::
-    _M_erase_after(_Fwd_list_node_base* __pos)
-    {
-      _Node* __curr = static_cast<_Node*>(__pos->_M_next);
-      __pos->_M_next = __curr->_M_next;
-      _Tp_alloc_type __a(_M_get_Node_allocator());
-      allocator_traits<_Tp_alloc_type>::destroy(__a, __curr->_M_valptr());
-      __curr->~_Node();
-      _M_put_node(__curr);
-      return __pos->_M_next;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    _Fwd_list_node_base*
-    _Fwd_list_base<_Tp, _Alloc>::
-    _M_erase_after(_Fwd_list_node_base* __pos, 
-                   _Fwd_list_node_base* __last)
-    {
-      _Node* __curr = static_cast<_Node*>(__pos->_M_next);
-      while (__curr != __last)
-        {
-          _Node* __temp = __curr;
-          __curr = static_cast<_Node*>(__curr->_M_next);
-	  _Tp_alloc_type __a(_M_get_Node_allocator());
-	  allocator_traits<_Tp_alloc_type>::destroy(__a, __temp->_M_valptr());
-	  __temp->~_Node();
-          _M_put_node(__temp);
-        }
-      __pos->_M_next = __last;
-      return __last;
-    }
-
-  // Called by the range constructor to implement [23.3.4.2]/9
-  template<typename _Tp, typename _Alloc>
-    template<typename _InputIterator>
-      void
-      forward_list<_Tp, _Alloc>::
-      _M_range_initialize(_InputIterator __first, _InputIterator __last)
-      {
-        _Node_base* __to = &this->_M_impl._M_head;
-        for (; __first != __last; ++__first)
-          {
-            __to->_M_next = this->_M_create_node(*__first);
-            __to = __to->_M_next;
-          }
-      }
-
-  // Called by forward_list(n,v,a).
-  template<typename _Tp, typename _Alloc>
-    void
-    forward_list<_Tp, _Alloc>::
-    _M_fill_initialize(size_type __n, const value_type& __value)
-    {
-      _Node_base* __to = &this->_M_impl._M_head;
-      for (; __n; --__n)
-        {
-          __to->_M_next = this->_M_create_node(__value);
-          __to = __to->_M_next;
-        }
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    forward_list<_Tp, _Alloc>::
-    _M_default_initialize(size_type __n)
-    {
-      _Node_base* __to = &this->_M_impl._M_head;
-      for (; __n; --__n)
-        {
-          __to->_M_next = this->_M_create_node();
-          __to = __to->_M_next;
-        }
-    }
-
-  template<typename _Tp, typename _Alloc>
-    forward_list<_Tp, _Alloc>&
-    forward_list<_Tp, _Alloc>::
-    operator=(const forward_list& __list)
-    {
-      if (&__list != this)
-        {
-	  if (_Node_alloc_traits::_S_propagate_on_copy_assign())
-	    {
-              auto& __this_alloc = this->_M_get_Node_allocator();
-              auto& __that_alloc = __list._M_get_Node_allocator();
-              if (!_Node_alloc_traits::_S_always_equal()
-	          && __this_alloc != __that_alloc)
-	        {
-		  // replacement allocator cannot free existing storage
-		  clear();
-		}
-	      std::__alloc_on_copy(__this_alloc, __that_alloc);
-            }
-	  assign(__list.cbegin(), __list.cend());
-        }
-      return *this;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    forward_list<_Tp, _Alloc>::
-    _M_default_insert_after(const_iterator __pos, size_type __n)
-    {
-      const_iterator __saved_pos = __pos;
-      __try
-	{
-	  for (; __n; --__n)
-	    __pos = emplace_after(__pos);
-	}
-      __catch(...)
-	{
-	  erase_after(__saved_pos, ++__pos);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    forward_list<_Tp, _Alloc>::
-    resize(size_type __sz)
-    {
-      iterator __k = before_begin();
-
-      size_type __len = 0;
-      while (__k._M_next() != end() && __len < __sz)
-        {
-          ++__k;
-          ++__len;
-        }
-      if (__len == __sz)
-        erase_after(__k, end());
-      else
-	_M_default_insert_after(__k, __sz - __len);
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    forward_list<_Tp, _Alloc>::
-    resize(size_type __sz, const value_type& __val)
-    {
-      iterator __k = before_begin();
-
-      size_type __len = 0;
-      while (__k._M_next() != end() && __len < __sz)
-        {
-          ++__k;
-          ++__len;
-        }
-      if (__len == __sz)
-        erase_after(__k, end());
-      else
-        insert_after(__k, __sz - __len, __val);
-    }
-
-  template<typename _Tp, typename _Alloc>
-    typename forward_list<_Tp, _Alloc>::iterator
-    forward_list<_Tp, _Alloc>::
-    _M_splice_after(const_iterator __pos,
-		    const_iterator __before, const_iterator __last)
-    {
-      _Node_base* __tmp = const_cast<_Node_base*>(__pos._M_node);
-      _Node_base* __b = const_cast<_Node_base*>(__before._M_node);
-      _Node_base* __end = __b;
-
-      while (__end && __end->_M_next != __last._M_node)
-	__end = __end->_M_next;
-
-      if (__b != __end)
-	return iterator(__tmp->_M_transfer_after(__b, __end));      
-      else
-	return iterator(__tmp);
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    forward_list<_Tp, _Alloc>::
-    splice_after(const_iterator __pos, forward_list&&,
-		 const_iterator __i)
-    {
-      const_iterator __j = __i;
-      ++__j;
-
-      if (__pos == __i || __pos == __j)
-	return;
-
-      _Node_base* __tmp = const_cast<_Node_base*>(__pos._M_node);
-      __tmp->_M_transfer_after(const_cast<_Node_base*>(__i._M_node),
-			       const_cast<_Node_base*>(__j._M_node));
-    }
-
-  template<typename _Tp, typename _Alloc>
-    typename forward_list<_Tp, _Alloc>::iterator
-    forward_list<_Tp, _Alloc>::
-    insert_after(const_iterator __pos, size_type __n, const _Tp& __val)
-    {
-      if (__n)
-	{
-	  forward_list __tmp(__n, __val, get_allocator());
-	  return _M_splice_after(__pos, __tmp.before_begin(), __tmp.end());
-	}
-      else
-	return iterator(const_cast<_Node_base*>(__pos._M_node));
-    }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename _InputIterator, typename>
-      typename forward_list<_Tp, _Alloc>::iterator
-      forward_list<_Tp, _Alloc>::
-      insert_after(const_iterator __pos,
-		   _InputIterator __first, _InputIterator __last)
-      {
-	forward_list __tmp(__first, __last, get_allocator());
-	if (!__tmp.empty())
-	  return _M_splice_after(__pos, __tmp.before_begin(), __tmp.end());
-	else
-	  return iterator(const_cast<_Node_base*>(__pos._M_node));
-      }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    forward_list<_Tp, _Alloc>::
-    remove(const _Tp& __val)
-    {
-      _Node* __curr = static_cast<_Node*>(&this->_M_impl._M_head);
-      _Node* __extra = 0;
-
-      while (_Node* __tmp = static_cast<_Node*>(__curr->_M_next))
-        {
-          if (*__tmp->_M_valptr() == __val)
-	    {
-	      if (__tmp->_M_valptr() != std::__addressof(__val))
-		{
-		  this->_M_erase_after(__curr);
-		  continue;
-		}
-	      else
-		__extra = __curr;
-	    }
-	  __curr = static_cast<_Node*>(__curr->_M_next);
-        }
-
-      if (__extra)
-	this->_M_erase_after(__extra);
-    }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename _Pred>
-      void
-      forward_list<_Tp, _Alloc>::
-      remove_if(_Pred __pred)
-      {
-	_Node* __curr = static_cast<_Node*>(&this->_M_impl._M_head);
-        while (_Node* __tmp = static_cast<_Node*>(__curr->_M_next))
-          {
-            if (__pred(*__tmp->_M_valptr()))
-              this->_M_erase_after(__curr);
-            else
-              __curr = static_cast<_Node*>(__curr->_M_next);
-          }
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename _BinPred>
-      void
-      forward_list<_Tp, _Alloc>::
-      unique(_BinPred __binary_pred)
-      {
-        iterator __first = begin();
-        iterator __last = end();
-        if (__first == __last)
-          return;
-        iterator __next = __first;
-        while (++__next != __last)
-        {
-          if (__binary_pred(*__first, *__next))
-            erase_after(__first);
-          else
-            __first = __next;
-          __next = __first;
-        }
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename _Comp>
-      void
-      forward_list<_Tp, _Alloc>::
-      merge(forward_list&& __list, _Comp __comp)
-      {
-        _Node_base* __node = &this->_M_impl._M_head;
-        while (__node->_M_next && __list._M_impl._M_head._M_next)
-          {
-            if (__comp(*static_cast<_Node*>
-                       (__list._M_impl._M_head._M_next)->_M_valptr(),
-                       *static_cast<_Node*>
-                       (__node->_M_next)->_M_valptr()))
-              __node->_M_transfer_after(&__list._M_impl._M_head,
-                                        __list._M_impl._M_head._M_next);
-            __node = __node->_M_next;
-          }
-        if (__list._M_impl._M_head._M_next)
-          {
-            __node->_M_next = __list._M_impl._M_head._M_next;
-            __list._M_impl._M_head._M_next = 0;
-          }
-      }
-
-  template<typename _Tp, typename _Alloc>
-    bool
-    operator==(const forward_list<_Tp, _Alloc>& __lx,
-               const forward_list<_Tp, _Alloc>& __ly)
-    {
-      //  We don't have size() so we need to walk through both lists
-      //  making sure both iterators are valid.
-      auto __ix = __lx.cbegin();
-      auto __iy = __ly.cbegin();
-      while (__ix != __lx.cend() && __iy != __ly.cend())
-        {
-          if (*__ix != *__iy)
-            return false;
-          ++__ix;
-          ++__iy;
-        }
-      if (__ix == __lx.cend() && __iy == __ly.cend())
-        return true;
-      else
-        return false;
-    }
-
-  template<typename _Tp, class _Alloc>
-    template<typename _Comp>
-      void
-      forward_list<_Tp, _Alloc>::
-      sort(_Comp __comp)
-      {
-        // If `next' is 0, return immediately.
-        _Node* __list = static_cast<_Node*>(this->_M_impl._M_head._M_next);
-        if (!__list)
-          return;
-
-        unsigned long __insize = 1;
-
-        while (1)
-          {
-            _Node* __p = __list;
-            __list = 0;
-            _Node* __tail = 0;
-
-            // Count number of merges we do in this pass.
-            unsigned long __nmerges = 0;
-
-            while (__p)
-              {
-                ++__nmerges;
-                // There exists a merge to be done.
-                // Step `insize' places along from p.
-                _Node* __q = __p;
-                unsigned long __psize = 0;
-                for (unsigned long __i = 0; __i < __insize; ++__i)
-                  {
-                    ++__psize;
-                    __q = static_cast<_Node*>(__q->_M_next);
-                    if (!__q)
-                      break;
-                  }
-
-                // If q hasn't fallen off end, we have two lists to merge.
-                unsigned long __qsize = __insize;
-
-                // Now we have two lists; merge them.
-                while (__psize > 0 || (__qsize > 0 && __q))
-                  {
-                    // Decide whether next node of merge comes from p or q.
-                    _Node* __e;
-                    if (__psize == 0)
-                      {
-                        // p is empty; e must come from q.
-                        __e = __q;
-                        __q = static_cast<_Node*>(__q->_M_next);
-                        --__qsize;
-                      }
-                    else if (__qsize == 0 || !__q)
-                      {
-                        // q is empty; e must come from p.
-                        __e = __p;
-                        __p = static_cast<_Node*>(__p->_M_next);
-                        --__psize;
-                      }
-                    else if (__comp(*__p->_M_valptr(), *__q->_M_valptr()))
-                      {
-                        // First node of p is lower; e must come from p.
-                        __e = __p;
-                        __p = static_cast<_Node*>(__p->_M_next);
-                        --__psize;
-                      }
-                    else
-                      {
-                        // First node of q is lower; e must come from q.
-                        __e = __q;
-                        __q = static_cast<_Node*>(__q->_M_next);
-                        --__qsize;
-                      }
-
-                    // Add the next node to the merged list.
-                    if (__tail)
-                      __tail->_M_next = __e;
-                    else
-                      __list = __e;
-                    __tail = __e;
-                  }
-
-                // Now p has stepped `insize' places along, and q has too.
-                __p = __q;
-              }
-            __tail->_M_next = 0;
-
-            // If we have done only one merge, we're finished.
-            // Allow for nmerges == 0, the empty list case.
-            if (__nmerges <= 1)
-              {
-                this->_M_impl._M_head._M_next = __list;
-                return;
-              }
-
-            // Otherwise repeat, merging lists twice the size.
-            __insize *= 2;
-          }
-      }
- 
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif /* _FORWARD_LIST_TCC */
-
diff --git a/openflow/usr/include/c++/5/bits/fstream.tcc b/openflow/usr/include/c++/5/bits/fstream.tcc
deleted file mode 100644
index d5fc8bb..0000000
--- a/openflow/usr/include/c++/5/bits/fstream.tcc
+++ /dev/null
@@ -1,1069 +0,0 @@
-// File based streams -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/fstream.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{fstream}
- */
-
-//
-// ISO C++ 14882: 27.8  File-based streams
-//
-
-#ifndef _FSTREAM_TCC
-#define _FSTREAM_TCC 1
-
-#pragma GCC system_header
-
-#include <bits/cxxabi_forced.h>
-#include <bits/move.h>   // for swap
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_filebuf<_CharT, _Traits>::
-    _M_allocate_internal_buffer()
-    {
-      // Allocate internal buffer only if one doesn't already exist
-      // (either allocated or provided by the user via setbuf).
-      if (!_M_buf_allocated && !_M_buf)
-	{
-	  _M_buf = new char_type[_M_buf_size];
-	  _M_buf_allocated = true;
-	}
-    }
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_filebuf<_CharT, _Traits>::
-    _M_destroy_internal_buffer() throw()
-    {
-      if (_M_buf_allocated)
-	{
-	  delete [] _M_buf;
-	  _M_buf = 0;
-	  _M_buf_allocated = false;
-	}
-      delete [] _M_ext_buf;
-      _M_ext_buf = 0;
-      _M_ext_buf_size = 0;
-      _M_ext_next = 0;
-      _M_ext_end = 0;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_filebuf<_CharT, _Traits>::
-    basic_filebuf() : __streambuf_type(), _M_lock(), _M_file(&_M_lock),
-    _M_mode(ios_base::openmode(0)), _M_state_beg(), _M_state_cur(),
-    _M_state_last(), _M_buf(0), _M_buf_size(BUFSIZ),
-    _M_buf_allocated(false), _M_reading(false), _M_writing(false), _M_pback(), 
-    _M_pback_cur_save(0), _M_pback_end_save(0), _M_pback_init(false),
-    _M_codecvt(0), _M_ext_buf(0), _M_ext_buf_size(0), _M_ext_next(0),
-    _M_ext_end(0)
-    {
-      if (has_facet<__codecvt_type>(this->_M_buf_locale))
-	_M_codecvt = &use_facet<__codecvt_type>(this->_M_buf_locale);
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _CharT, typename _Traits>
-    basic_filebuf<_CharT, _Traits>::
-    basic_filebuf(basic_filebuf&& __rhs)
-    : __streambuf_type(__rhs),
-    _M_lock(), _M_file(std::move(__rhs._M_file), &_M_lock),
-    _M_mode(std::__exchange(__rhs._M_mode, ios_base::openmode(0))),
-    _M_state_beg(std::move(__rhs._M_state_beg)),
-    _M_state_cur(std::move(__rhs._M_state_cur)),
-    _M_state_last(std::move(__rhs._M_state_last)),
-    _M_buf(std::__exchange(__rhs._M_buf, nullptr)),
-    _M_buf_size(std::__exchange(__rhs._M_buf_size, 1)),
-    _M_buf_allocated(std::__exchange(__rhs._M_buf_allocated, false)),
-    _M_reading(std::__exchange(__rhs._M_reading, false)),
-    _M_writing(std::__exchange(__rhs._M_writing, false)),
-    _M_pback(__rhs._M_pback),
-    _M_pback_cur_save(std::__exchange(__rhs._M_pback_cur_save, nullptr)),
-    _M_pback_end_save(std::__exchange(__rhs._M_pback_end_save, nullptr)),
-    _M_pback_init(std::__exchange(__rhs._M_pback_init, false)),
-    _M_codecvt(__rhs._M_codecvt),
-    _M_ext_buf(std::__exchange(__rhs._M_ext_buf, nullptr)),
-    _M_ext_buf_size(std::__exchange(__rhs._M_ext_buf_size, 0)),
-    _M_ext_next(std::__exchange(__rhs._M_ext_next, nullptr)),
-    _M_ext_end(std::__exchange(__rhs._M_ext_end, nullptr))
-    {
-      __rhs._M_set_buffer(-1);
-      __rhs._M_state_last = __rhs._M_state_cur = __rhs._M_state_beg;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_filebuf<_CharT, _Traits>&
-    basic_filebuf<_CharT, _Traits>::
-    operator=(basic_filebuf&& __rhs)
-    {
-      this->close();
-      __streambuf_type::operator=(__rhs);
-      _M_file.swap(__rhs._M_file);
-      _M_mode = std::__exchange(__rhs._M_mode, ios_base::openmode(0));
-      _M_state_beg = std::move(__rhs._M_state_beg);
-      _M_state_cur = std::move(__rhs._M_state_cur);
-      _M_state_last = std::move(__rhs._M_state_last);
-      _M_buf = std::__exchange(__rhs._M_buf, nullptr);
-      _M_buf_size = std::__exchange(__rhs._M_buf_size, 1);
-      _M_buf_allocated = std::__exchange(__rhs._M_buf_allocated, false);
-      _M_ext_buf = std::__exchange(__rhs._M_ext_buf, nullptr);
-      _M_ext_buf_size = std::__exchange(__rhs._M_ext_buf_size, 0);
-      _M_ext_next = std::__exchange(__rhs._M_ext_next, nullptr);
-      _M_ext_end = std::__exchange(__rhs._M_ext_end, nullptr);
-      _M_reading = std::__exchange(__rhs._M_reading, false);
-      _M_writing = std::__exchange(__rhs._M_writing, false);
-      _M_pback_cur_save = std::__exchange(__rhs._M_pback_cur_save, nullptr);
-      _M_pback_end_save = std::__exchange(__rhs._M_pback_end_save, nullptr);
-      _M_pback_init = std::__exchange(__rhs._M_pback_init, false);
-      __rhs._M_set_buffer(-1);
-      __rhs._M_state_last = __rhs._M_state_cur = __rhs._M_state_beg;
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_filebuf<_CharT, _Traits>::
-    swap(basic_filebuf& __rhs)
-    {
-      __streambuf_type::swap(__rhs);
-      _M_file.swap(__rhs._M_file);
-      std::swap(_M_mode, __rhs._M_mode);
-      std::swap(_M_state_beg, __rhs._M_state_beg);
-      std::swap(_M_state_cur, __rhs._M_state_cur);
-      std::swap(_M_state_last, __rhs._M_state_last);
-      std::swap(_M_buf, __rhs._M_buf);
-      std::swap(_M_buf_size, __rhs._M_buf_size);
-      std::swap(_M_buf_allocated, __rhs._M_buf_allocated);
-      std::swap(_M_ext_buf, __rhs._M_ext_buf);
-      std::swap(_M_ext_buf_size, __rhs._M_ext_buf_size);
-      std::swap(_M_ext_next, __rhs._M_ext_next);
-      std::swap(_M_ext_end, __rhs._M_ext_end);
-      std::swap(_M_reading, __rhs._M_reading);
-      std::swap(_M_writing, __rhs._M_writing);
-      std::swap(_M_pback_cur_save, __rhs._M_pback_cur_save);
-      std::swap(_M_pback_end_save, __rhs._M_pback_end_save);
-      std::swap(_M_pback_init, __rhs._M_pback_init);
-    }
-#endif
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::__filebuf_type*
-    basic_filebuf<_CharT, _Traits>::
-    open(const char* __s, ios_base::openmode __mode)
-    {
-      __filebuf_type *__ret = 0;
-      if (!this->is_open())
-	{
-	  _M_file.open(__s, __mode);
-	  if (this->is_open())
-	    {
-	      _M_allocate_internal_buffer();
-	      _M_mode = __mode;
-
-	      // Setup initial buffer to 'uncommitted' mode.
-	      _M_reading = false;
-	      _M_writing = false;
-	      _M_set_buffer(-1);
-
-	      // Reset to initial state.
-	      _M_state_last = _M_state_cur = _M_state_beg;
-
-	      // 27.8.1.3,4
-	      if ((__mode & ios_base::ate)
-		  && this->seekoff(0, ios_base::end, __mode)
-		  == pos_type(off_type(-1)))
-		this->close();
-	      else
-		__ret = this;
-	    }
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::__filebuf_type*
-    basic_filebuf<_CharT, _Traits>::
-    close()
-    {
-      if (!this->is_open())
-	return 0;
-
-      bool __testfail = false;
-      {
-	// NB: Do this here so that re-opened filebufs will be cool...
-	struct __close_sentry
-	{
-	  basic_filebuf *__fb;
-	  __close_sentry (basic_filebuf *__fbi): __fb(__fbi) { }
-	  ~__close_sentry ()
-	  {
-	    __fb->_M_mode = ios_base::openmode(0);
-	    __fb->_M_pback_init = false;
-	    __fb->_M_destroy_internal_buffer();
-	    __fb->_M_reading = false;
-	    __fb->_M_writing = false;
-	    __fb->_M_set_buffer(-1);
-	    __fb->_M_state_last = __fb->_M_state_cur = __fb->_M_state_beg;
-	  }
-	} __cs (this);
-
-	__try
-	  {
-	    if (!_M_terminate_output())
-	      __testfail = true;
-	  }
-	__catch(__cxxabiv1::__forced_unwind&)
-	  {
-	    _M_file.close();
-	    __throw_exception_again;
-	  }
-	__catch(...)
-	  { __testfail = true; }
-      }
-
-      if (!_M_file.close())
-	__testfail = true;
-
-      if (__testfail)
-	return 0;
-      else
-	return this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    streamsize
-    basic_filebuf<_CharT, _Traits>::
-    showmanyc()
-    {
-      streamsize __ret = -1;
-      const bool __testin = _M_mode & ios_base::in;
-      if (__testin && this->is_open())
-	{
-	  // For a stateful encoding (-1) the pending sequence might be just
-	  // shift and unshift prefixes with no actual character.
-	  __ret = this->egptr() - this->gptr();
-
-#if _GLIBCXX_HAVE_DOS_BASED_FILESYSTEM
-	  // About this workaround, see libstdc++/20806.
-	  const bool __testbinary = _M_mode & ios_base::binary;
-	  if (__check_facet(_M_codecvt).encoding() >= 0
-	      && __testbinary)
-#else
-	  if (__check_facet(_M_codecvt).encoding() >= 0)
-#endif
-	    __ret += _M_file.showmanyc() / _M_codecvt->max_length();
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::int_type
-    basic_filebuf<_CharT, _Traits>::
-    underflow()
-    {
-      int_type __ret = traits_type::eof();
-      const bool __testin = _M_mode & ios_base::in;
-      if (__testin)
-	{
-	  if (_M_writing)
-	    {
-	      if (overflow() == traits_type::eof())
-		return __ret;
-	      _M_set_buffer(-1);
-	      _M_writing = false;
-	    }
-	  // Check for pback madness, and if so switch back to the
-	  // normal buffers and jet outta here before expensive
-	  // fileops happen...
-	  _M_destroy_pback();
-
-	  if (this->gptr() < this->egptr())
-	    return traits_type::to_int_type(*this->gptr());
-
-	  // Get and convert input sequence.
-	  const size_t __buflen = _M_buf_size > 1 ? _M_buf_size - 1 : 1;
-
-	  // Will be set to true if ::read() returns 0 indicating EOF.
-	  bool __got_eof = false;
-	  // Number of internal characters produced.
-	  streamsize __ilen = 0;
-	  codecvt_base::result __r = codecvt_base::ok;
-	  if (__check_facet(_M_codecvt).always_noconv())
-	    {
-	      __ilen = _M_file.xsgetn(reinterpret_cast<char*>(this->eback()),
-				      __buflen);
-	      if (__ilen == 0)
-		__got_eof = true;
-	    }
-	  else
-	    {
-              // Worst-case number of external bytes.
-	      // XXX Not done encoding() == -1.
-	      const int __enc = _M_codecvt->encoding();
-	      streamsize __blen; // Minimum buffer size.
-	      streamsize __rlen; // Number of chars to read.
-	      if (__enc > 0)
-		__blen = __rlen = __buflen * __enc;
-	      else
-		{
-		  __blen = __buflen + _M_codecvt->max_length() - 1;
-		  __rlen = __buflen;
-		}
-	      const streamsize __remainder = _M_ext_end - _M_ext_next;
-	      __rlen = __rlen > __remainder ? __rlen - __remainder : 0;
-
-	      // An imbue in 'read' mode implies first converting the external
-	      // chars already present.
-	      if (_M_reading && this->egptr() == this->eback() && __remainder)
-		__rlen = 0;
-
-	      // Allocate buffer if necessary and move unconverted
-	      // bytes to front.
-	      if (_M_ext_buf_size < __blen)
-		{
-		  char* __buf = new char[__blen];
-		  if (__remainder)
-		    __builtin_memcpy(__buf, _M_ext_next, __remainder);
-
-		  delete [] _M_ext_buf;
-		  _M_ext_buf = __buf;
-		  _M_ext_buf_size = __blen;
-		}
-	      else if (__remainder)
-		__builtin_memmove(_M_ext_buf, _M_ext_next, __remainder);
-
-	      _M_ext_next = _M_ext_buf;
-	      _M_ext_end = _M_ext_buf + __remainder;
-	      _M_state_last = _M_state_cur;
-
-	      do
-		{
-		  if (__rlen > 0)
-		    {
-		      // Sanity check!
-		      // This may fail if the return value of
-		      // codecvt::max_length() is bogus.
-		      if (_M_ext_end - _M_ext_buf + __rlen > _M_ext_buf_size)
-			{
-			  __throw_ios_failure(__N("basic_filebuf::underflow "
-					      "codecvt::max_length() "
-					      "is not valid"));
-			}
-		      streamsize __elen = _M_file.xsgetn(_M_ext_end, __rlen);
-		      if (__elen == 0)
-			__got_eof = true;
-		      else if (__elen == -1)
-			break;
-		      _M_ext_end += __elen;
-		    }
-
-		  char_type* __iend = this->eback();
-		  if (_M_ext_next < _M_ext_end)
-		    __r = _M_codecvt->in(_M_state_cur, _M_ext_next,
-					 _M_ext_end, _M_ext_next,
-					 this->eback(),
-					 this->eback() + __buflen, __iend);
-		  if (__r == codecvt_base::noconv)
-		    {
-		      size_t __avail = _M_ext_end - _M_ext_buf;
-		      __ilen = std::min(__avail, __buflen);
-		      traits_type::copy(this->eback(),
-					reinterpret_cast<char_type*>
-					(_M_ext_buf), __ilen);
-		      _M_ext_next = _M_ext_buf + __ilen;
-		    }
-		  else
-		    __ilen = __iend - this->eback();
-
-		  // _M_codecvt->in may return error while __ilen > 0: this is
-		  // ok, and actually occurs in case of mixed encodings (e.g.,
-		  // XML files).
-		  if (__r == codecvt_base::error)
-		    break;
-
-		  __rlen = 1;
-		}
-	      while (__ilen == 0 && !__got_eof);
-	    }
-
-	  if (__ilen > 0)
-	    {
-	      _M_set_buffer(__ilen);
-	      _M_reading = true;
-	      __ret = traits_type::to_int_type(*this->gptr());
-	    }
-	  else if (__got_eof)
-	    {
-	      // If the actual end of file is reached, set 'uncommitted'
-	      // mode, thus allowing an immediate write without an
-	      // intervening seek.
-	      _M_set_buffer(-1);
-	      _M_reading = false;
-	      // However, reaching it while looping on partial means that
-	      // the file has got an incomplete character.
-	      if (__r == codecvt_base::partial)
-		__throw_ios_failure(__N("basic_filebuf::underflow "
-				    "incomplete character in file"));
-	    }
-	  else if (__r == codecvt_base::error)
-	    __throw_ios_failure(__N("basic_filebuf::underflow "
-				"invalid byte sequence in file"));
-	  else
-	    __throw_ios_failure(__N("basic_filebuf::underflow "
-				"error reading the file"));
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::int_type
-    basic_filebuf<_CharT, _Traits>::
-    pbackfail(int_type __i)
-    {
-      int_type __ret = traits_type::eof();
-      const bool __testin = _M_mode & ios_base::in;
-      if (__testin)
-	{
-	  if (_M_writing)
-	    {
-	      if (overflow() == traits_type::eof())
-		return __ret;
-	      _M_set_buffer(-1);
-	      _M_writing = false;
-	    }
-	  // Remember whether the pback buffer is active, otherwise below
-	  // we may try to store in it a second char (libstdc++/9761).
-	  const bool __testpb = _M_pback_init;
-	  const bool __testeof = traits_type::eq_int_type(__i, __ret);
-	  int_type __tmp;
-	  if (this->eback() < this->gptr())
-	    {
-	      this->gbump(-1);
-	      __tmp = traits_type::to_int_type(*this->gptr());
-	    }
-	  else if (this->seekoff(-1, ios_base::cur) != pos_type(off_type(-1)))
-	    {
-	      __tmp = this->underflow();
-	      if (traits_type::eq_int_type(__tmp, __ret))
-		return __ret;
-	    }
-	  else
-	    {
-	      // At the beginning of the buffer, need to make a
-	      // putback position available.  But the seek may fail
-	      // (f.i., at the beginning of a file, see
-	      // libstdc++/9439) and in that case we return
-	      // traits_type::eof().
-	      return __ret;
-	    }
-
-	  // Try to put back __i into input sequence in one of three ways.
-	  // Order these tests done in is unspecified by the standard.
-	  if (!__testeof && traits_type::eq_int_type(__i, __tmp))
-	    __ret = __i;
-	  else if (__testeof)
-	    __ret = traits_type::not_eof(__i);
-	  else if (!__testpb)
-	    {
-	      _M_create_pback();
-	      _M_reading = true;
-	      *this->gptr() = traits_type::to_char_type(__i);
-	      __ret = __i;
-	    }
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::int_type
-    basic_filebuf<_CharT, _Traits>::
-    overflow(int_type __c)
-    {
-      int_type __ret = traits_type::eof();
-      const bool __testeof = traits_type::eq_int_type(__c, __ret);
-      const bool __testout = (_M_mode & ios_base::out
-			      || _M_mode & ios_base::app);
-      if (__testout)
-	{
-          if (_M_reading)
-            {
-              _M_destroy_pback();
-              const int __gptr_off = _M_get_ext_pos(_M_state_last);
-              if (_M_seek(__gptr_off, ios_base::cur, _M_state_last)
-                  == pos_type(off_type(-1)))
-                return __ret;
-            }
-	  if (this->pbase() < this->pptr())
-	    {
-	      // If appropriate, append the overflow char.
-	      if (!__testeof)
-		{
-		  *this->pptr() = traits_type::to_char_type(__c);
-		  this->pbump(1);
-		}
-
-	      // Convert pending sequence to external representation,
-	      // and output.
-	      if (_M_convert_to_external(this->pbase(),
-					 this->pptr() - this->pbase()))
-		{
-		  _M_set_buffer(0);
-		  __ret = traits_type::not_eof(__c);
-		}
-	    }
-	  else if (_M_buf_size > 1)
-	    {
-	      // Overflow in 'uncommitted' mode: set _M_writing, set
-	      // the buffer to the initial 'write' mode, and put __c
-	      // into the buffer.
-	      _M_set_buffer(0);
-	      _M_writing = true;
-	      if (!__testeof)
-		{
-		  *this->pptr() = traits_type::to_char_type(__c);
-		  this->pbump(1);
-		}
-	      __ret = traits_type::not_eof(__c);
-	    }
-	  else
-	    {
-	      // Unbuffered.
-	      char_type __conv = traits_type::to_char_type(__c);
-	      if (__testeof || _M_convert_to_external(&__conv, 1))
-		{
-		  _M_writing = true;
-		  __ret = traits_type::not_eof(__c);
-		}
-	    }
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    bool
-    basic_filebuf<_CharT, _Traits>::
-    _M_convert_to_external(_CharT* __ibuf, streamsize __ilen)
-    {
-      // Sizes of external and pending output.
-      streamsize __elen;
-      streamsize __plen;
-      if (__check_facet(_M_codecvt).always_noconv())
-	{
-	  __elen = _M_file.xsputn(reinterpret_cast<char*>(__ibuf), __ilen);
-	  __plen = __ilen;
-	}
-      else
-	{
-	  // Worst-case number of external bytes needed.
-	  // XXX Not done encoding() == -1.
-	  streamsize __blen = __ilen * _M_codecvt->max_length();
-	  char* __buf = static_cast<char*>(__builtin_alloca(__blen));
-
-	  char* __bend;
-	  const char_type* __iend;
-	  codecvt_base::result __r;
-	  __r = _M_codecvt->out(_M_state_cur, __ibuf, __ibuf + __ilen,
-				__iend, __buf, __buf + __blen, __bend);
-
-	  if (__r == codecvt_base::ok || __r == codecvt_base::partial)
-	    __blen = __bend - __buf;
-	  else if (__r == codecvt_base::noconv)
-	    {
-	      // Same as the always_noconv case above.
-	      __buf = reinterpret_cast<char*>(__ibuf);
-	      __blen = __ilen;
-	    }
-	  else
-	    __throw_ios_failure(__N("basic_filebuf::_M_convert_to_external "
-				    "conversion error"));
-  
-	  __elen = _M_file.xsputn(__buf, __blen);
-	  __plen = __blen;
-
-	  // Try once more for partial conversions.
-	  if (__r == codecvt_base::partial && __elen == __plen)
-	    {
-	      const char_type* __iresume = __iend;
-	      streamsize __rlen = this->pptr() - __iend;
-	      __r = _M_codecvt->out(_M_state_cur, __iresume,
-				    __iresume + __rlen, __iend, __buf,
-				    __buf + __blen, __bend);
-	      if (__r != codecvt_base::error)
-		{
-		  __rlen = __bend - __buf;
-		  __elen = _M_file.xsputn(__buf, __rlen);
-		  __plen = __rlen;
-		}
-	      else
-		__throw_ios_failure(__N("basic_filebuf::_M_convert_to_external "
-					"conversion error"));
-	    }
-	}
-      return __elen == __plen;
-    }
-
-  template<typename _CharT, typename _Traits>
-    streamsize
-    basic_filebuf<_CharT, _Traits>::
-    xsgetn(_CharT* __s, streamsize __n)
-    {
-      // Clear out pback buffer before going on to the real deal...
-      streamsize __ret = 0;
-      if (_M_pback_init)
-	{
-	  if (__n > 0 && this->gptr() == this->eback())
-	    {
-	      *__s++ = *this->gptr(); // emulate non-underflowing sbumpc
-	      this->gbump(1);
-	      __ret = 1;
-	      --__n;
-	    }
-	  _M_destroy_pback();
-	}
-      else if (_M_writing)
-	{
- 	  if (overflow() == traits_type::eof())
- 	    return __ret;
- 	  _M_set_buffer(-1);
- 	  _M_writing = false;
- 	}
- 
-      // Optimization in the always_noconv() case, to be generalized in the
-      // future: when __n > __buflen we read directly instead of using the
-      // buffer repeatedly.
-      const bool __testin = _M_mode & ios_base::in;
-      const streamsize __buflen = _M_buf_size > 1 ? _M_buf_size - 1 : 1;
- 
-      if (__n > __buflen && __check_facet(_M_codecvt).always_noconv()
- 	   && __testin)
- 	 {
- 	   // First, copy the chars already present in the buffer.
- 	   const streamsize __avail = this->egptr() - this->gptr();
- 	   if (__avail != 0)
- 	     {
-	       traits_type::copy(__s, this->gptr(), __avail);
- 	       __s += __avail;
-	       this->setg(this->eback(), this->gptr() + __avail,
-			  this->egptr());
-	       __ret += __avail;
-	       __n -= __avail;
- 	     }
- 
- 	   // Need to loop in case of short reads (relatively common
- 	   // with pipes).
- 	   streamsize __len;
- 	   for (;;)
- 	     {
- 	       __len = _M_file.xsgetn(reinterpret_cast<char*>(__s),
- 				      __n);
- 	       if (__len == -1)
- 		 __throw_ios_failure(__N("basic_filebuf::xsgetn "
- 					 "error reading the file"));
- 	       if (__len == 0)
- 		 break;
- 
- 	       __n -= __len;
- 	       __ret += __len;
- 	       if (__n == 0)
- 		 break;
- 
- 	       __s += __len;
- 	     }
- 
- 	   if (__n == 0)
- 	     {
- 	       _M_set_buffer(0);
- 	       _M_reading = true;
- 	     }
- 	   else if (__len == 0)
- 	     {
- 	       // If end of file is reached, set 'uncommitted'
- 	       // mode, thus allowing an immediate write without
- 	       // an intervening seek.
- 	       _M_set_buffer(-1);
- 	       _M_reading = false;
- 	     }
- 	 }
-      else
- 	 __ret += __streambuf_type::xsgetn(__s, __n);
- 
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    streamsize
-    basic_filebuf<_CharT, _Traits>::
-    xsputn(const _CharT* __s, streamsize __n)
-    {
-      streamsize __ret = 0;
-      // Optimization in the always_noconv() case, to be generalized in the
-      // future: when __n is sufficiently large we write directly instead of
-      // using the buffer.
-      const bool __testout = (_M_mode & ios_base::out
-			      || _M_mode & ios_base::app);
-      if (__check_facet(_M_codecvt).always_noconv()
- 	   && __testout && !_M_reading)
-	{
-	  // Measurement would reveal the best choice.
-	  const streamsize __chunk = 1ul << 10;
-	  streamsize __bufavail = this->epptr() - this->pptr();
-
-	  // Don't mistake 'uncommitted' mode buffered with unbuffered.
-	  if (!_M_writing && _M_buf_size > 1)
-	    __bufavail = _M_buf_size - 1;
-
-	  const streamsize __limit = std::min(__chunk, __bufavail);
-	  if (__n >= __limit)
-	    {
-	      const streamsize __buffill = this->pptr() - this->pbase();
-	      const char* __buf = reinterpret_cast<const char*>(this->pbase());
-	      __ret = _M_file.xsputn_2(__buf, __buffill,
-				       reinterpret_cast<const char*>(__s),
-				       __n);
-	      if (__ret == __buffill + __n)
-		{
-		  _M_set_buffer(0);
-		  _M_writing = true;
-		}
-	      if (__ret > __buffill)
-		__ret -= __buffill;
-	      else
-		__ret = 0;
-	    }
-	  else
-	    __ret = __streambuf_type::xsputn(__s, __n);
-	}
-       else
-	 __ret = __streambuf_type::xsputn(__s, __n);
-       return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::__streambuf_type*
-    basic_filebuf<_CharT, _Traits>::
-    setbuf(char_type* __s, streamsize __n)
-    {
-      if (!this->is_open())
-	{
-	  if (__s == 0 && __n == 0)
-	    _M_buf_size = 1;
-	  else if (__s && __n > 0)
-	    {
-	      // This is implementation-defined behavior, and assumes that
-	      // an external char_type array of length __n exists and has
-	      // been pre-allocated. If this is not the case, things will
-	      // quickly blow up. When __n > 1, __n - 1 positions will be
-	      // used for the get area, __n - 1 for the put area and 1
-	      // position to host the overflow char of a full put area.
-	      // When __n == 1, 1 position will be used for the get area
-	      // and 0 for the put area, as in the unbuffered case above.
-	      _M_buf = __s;
-	      _M_buf_size = __n;
-	    }
-	}
-      return this;
-    }
-
-
-  // According to 27.8.1.4 p11 - 13, seekoff should ignore the last
-  // argument (of type openmode).
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::pos_type
-    basic_filebuf<_CharT, _Traits>::
-    seekoff(off_type __off, ios_base::seekdir __way, ios_base::openmode)
-    {
-      int __width = 0;
-      if (_M_codecvt)
-	__width = _M_codecvt->encoding();
-      if (__width < 0)
-	__width = 0;
-
-      pos_type __ret = pos_type(off_type(-1));
-      const bool __testfail = __off != 0 && __width <= 0;
-      if (this->is_open() && !__testfail)
-	{
-	  // tellg and tellp queries do not affect any state, unless
-	  // ! always_noconv and the put sequence is not empty.
-	  // In that case, determining the position requires converting the
-	  // put sequence. That doesn't use ext_buf, so requires a flush.
-	  bool __no_movement = __way == ios_base::cur && __off == 0
-	    && (!_M_writing || _M_codecvt->always_noconv());
-
-	  // Ditch any pback buffers to avoid confusion.
-	  if (!__no_movement)
-	    _M_destroy_pback();
-
-	  // Correct state at destination. Note that this is the correct
-	  // state for the current position during output, because
-	  // codecvt::unshift() returns the state to the initial state.
-	  // This is also the correct state at the end of the file because
-	  // an unshift sequence should have been written at the end.
-	  __state_type __state = _M_state_beg;
-	  off_type __computed_off = __off * __width;
-	  if (_M_reading && __way == ios_base::cur)
-	    {
-	      __state = _M_state_last;
-	      __computed_off += _M_get_ext_pos(__state);
-	    }
-	  if (!__no_movement)
-	    __ret = _M_seek(__computed_off, __way, __state);
-	  else
-	    {
-	      if (_M_writing)
-		__computed_off = this->pptr() - this->pbase();
-	      
- 	      off_type __file_off = _M_file.seekoff(0, ios_base::cur);
- 	      if (__file_off != off_type(-1))
-		{
-		  __ret = __file_off + __computed_off;
-		  __ret.state(__state);
-		}
-	    }
-	}
-      return __ret;
-    }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 171. Strange seekpos() semantics due to joint position
-  // According to the resolution of DR 171, seekpos should ignore the last
-  // argument (of type openmode).
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::pos_type
-    basic_filebuf<_CharT, _Traits>::
-    seekpos(pos_type __pos, ios_base::openmode)
-    {
-      pos_type __ret =  pos_type(off_type(-1));
-      if (this->is_open())
-	{
-	  // Ditch any pback buffers to avoid confusion.
-	  _M_destroy_pback();
-	  __ret = _M_seek(off_type(__pos), ios_base::beg, __pos.state());
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::pos_type
-    basic_filebuf<_CharT, _Traits>::
-    _M_seek(off_type __off, ios_base::seekdir __way, __state_type __state)
-    {
-      pos_type __ret = pos_type(off_type(-1));
-      if (_M_terminate_output())
-	{
-	  off_type __file_off = _M_file.seekoff(__off, __way);
-	  if (__file_off != off_type(-1))
-	    {
-	      _M_reading = false;
-	      _M_writing = false;
-	      _M_ext_next = _M_ext_end = _M_ext_buf;
-	      _M_set_buffer(-1);
-	      _M_state_cur = __state;
-	      __ret = __file_off;
-	      __ret.state(_M_state_cur);
-	    }
-	}
-      return __ret;
-    }
-
-  // Returns the distance from the end of the ext buffer to the point
-  // corresponding to gptr(). This is a negative value. Updates __state
-  // from eback() correspondence to gptr().
-  template<typename _CharT, typename _Traits>
-    int basic_filebuf<_CharT, _Traits>::
-    _M_get_ext_pos(__state_type& __state)
-    {
-      if (_M_codecvt->always_noconv())
-        return this->gptr() - this->egptr();
-      else
-        {
-          // Calculate offset from _M_ext_buf that corresponds to
-          // gptr(). Precondition: __state == _M_state_last, which
-          // corresponds to eback().
-          const int __gptr_off =
-            _M_codecvt->length(__state, _M_ext_buf, _M_ext_next,
-                               this->gptr() - this->eback());
-          return _M_ext_buf + __gptr_off - _M_ext_end;
-        }
-    }
-    
-  template<typename _CharT, typename _Traits>
-    bool
-    basic_filebuf<_CharT, _Traits>::
-    _M_terminate_output()
-    {
-      // Part one: update the output sequence.
-      bool __testvalid = true;
-      if (this->pbase() < this->pptr())
-	{
-	  const int_type __tmp = this->overflow();
-	  if (traits_type::eq_int_type(__tmp, traits_type::eof()))
-	    __testvalid = false;
-	}
-
-      // Part two: output unshift sequence.
-      if (_M_writing && !__check_facet(_M_codecvt).always_noconv()
-	  && __testvalid)
-	{
-	  // Note: this value is arbitrary, since there is no way to
-	  // get the length of the unshift sequence from codecvt,
-	  // without calling unshift.
-	  const size_t __blen = 128;
-	  char __buf[__blen];
-	  codecvt_base::result __r;
-	  streamsize __ilen = 0;
-
-	  do
-	    {
-	      char* __next;
-	      __r = _M_codecvt->unshift(_M_state_cur, __buf,
-					__buf + __blen, __next);
-	      if (__r == codecvt_base::error)
-		__testvalid = false;
-	      else if (__r == codecvt_base::ok ||
-		       __r == codecvt_base::partial)
-		{
-		  __ilen = __next - __buf;
-		  if (__ilen > 0)
-		    {
-		      const streamsize __elen = _M_file.xsputn(__buf, __ilen);
-		      if (__elen != __ilen)
-			__testvalid = false;
-		    }
-		}
-	    }
-	  while (__r == codecvt_base::partial && __ilen > 0 && __testvalid);
-
-	  if (__testvalid)
-	    {
-	      // This second call to overflow() is required by the standard,
-	      // but it's not clear why it's needed, since the output buffer
-	      // should be empty by this point (it should have been emptied
-	      // in the first call to overflow()).
-	      const int_type __tmp = this->overflow();
-	      if (traits_type::eq_int_type(__tmp, traits_type::eof()))
-		__testvalid = false;
-	    }
-	}
-      return __testvalid;
-    }
-
-  template<typename _CharT, typename _Traits>
-    int
-    basic_filebuf<_CharT, _Traits>::
-    sync()
-    {
-      // Make sure that the internal buffer resyncs its idea of
-      // the file position with the external file.
-      int __ret = 0;
-      if (this->pbase() < this->pptr())
-	{
-	  const int_type __tmp = this->overflow();
-	  if (traits_type::eq_int_type(__tmp, traits_type::eof()))
-	    __ret = -1;
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_filebuf<_CharT, _Traits>::
-    imbue(const locale& __loc)
-    {
-      bool __testvalid = true;
-
-      const __codecvt_type* _M_codecvt_tmp = 0;
-      if (__builtin_expect(has_facet<__codecvt_type>(__loc), true))
-	_M_codecvt_tmp = &use_facet<__codecvt_type>(__loc);
-
-      if (this->is_open())
-	{
-	  // encoding() == -1 is ok only at the beginning.
-	  if ((_M_reading || _M_writing)
-	      && __check_facet(_M_codecvt).encoding() == -1)
-	    __testvalid = false;
-	  else
-	    {
-	      if (_M_reading)
-		{
-		  if (__check_facet(_M_codecvt).always_noconv())
-		    {
-		      if (_M_codecvt_tmp
-			  && !__check_facet(_M_codecvt_tmp).always_noconv())
-			__testvalid = this->seekoff(0, ios_base::cur, _M_mode)
-			              != pos_type(off_type(-1));
-		    }
-		  else
-		    {
-		      // External position corresponding to gptr().
-		      _M_ext_next = _M_ext_buf
-			+ _M_codecvt->length(_M_state_last, _M_ext_buf,
-					     _M_ext_next,
-					     this->gptr() - this->eback());
-		      const streamsize __remainder = _M_ext_end - _M_ext_next;
-		      if (__remainder)
-			__builtin_memmove(_M_ext_buf, _M_ext_next, __remainder);
-
-		      _M_ext_next = _M_ext_buf;
-		      _M_ext_end = _M_ext_buf + __remainder;
-		      _M_set_buffer(-1);
-		      _M_state_last = _M_state_cur = _M_state_beg;
-		    }
-		}
-	      else if (_M_writing && (__testvalid = _M_terminate_output()))
-		_M_set_buffer(-1);
-	    }
-	}
-
-      if (__testvalid)
-	_M_codecvt = _M_codecvt_tmp;
-      else
-	_M_codecvt = 0;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_filebuf<char>;
-  extern template class basic_ifstream<char>;
-  extern template class basic_ofstream<char>;
-  extern template class basic_fstream<char>;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_filebuf<wchar_t>;
-  extern template class basic_ifstream<wchar_t>;
-  extern template class basic_ofstream<wchar_t>;
-  extern template class basic_fstream<wchar_t>;
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/functexcept.h b/openflow/usr/include/c++/5/bits/functexcept.h
deleted file mode 100644
index 355275d..0000000
--- a/openflow/usr/include/c++/5/bits/functexcept.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Function-Based Exception Support -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/functexcept.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{exception}
- *
- *  This header provides support for -fno-exceptions.
- */
-
-//
-// ISO C++ 14882: 19.1  Exception classes
-//
-
-#ifndef _FUNCTEXCEPT_H
-#define _FUNCTEXCEPT_H 1
-
-#include <bits/c++config.h>
-#include <bits/exception_defines.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Helper for exception objects in <except>
-  void
-  __throw_bad_exception(void) __attribute__((__noreturn__));
-
-  // Helper for exception objects in <new>
-  void
-  __throw_bad_alloc(void) __attribute__((__noreturn__));
-
-  // Helper for exception objects in <typeinfo>
-  void
-  __throw_bad_cast(void) __attribute__((__noreturn__));
-
-  void
-  __throw_bad_typeid(void) __attribute__((__noreturn__));
-
-  // Helpers for exception objects in <stdexcept>
-  void
-  __throw_logic_error(const char*) __attribute__((__noreturn__));
-
-  void
-  __throw_domain_error(const char*) __attribute__((__noreturn__));
-
-  void
-  __throw_invalid_argument(const char*) __attribute__((__noreturn__));
-
-  void
-  __throw_length_error(const char*) __attribute__((__noreturn__));
-
-  void
-  __throw_out_of_range(const char*) __attribute__((__noreturn__));
-
-  void
-  __throw_out_of_range_fmt(const char*, ...) __attribute__((__noreturn__))
-    __attribute__((__format__(__gnu_printf__, 1, 2)));
-
-  void
-  __throw_runtime_error(const char*) __attribute__((__noreturn__));
-
-  void
-  __throw_range_error(const char*) __attribute__((__noreturn__));
-
-  void
-  __throw_overflow_error(const char*) __attribute__((__noreturn__));
-
-  void
-  __throw_underflow_error(const char*) __attribute__((__noreturn__));
-
-  // Helpers for exception objects in <ios>
-  void
-  __throw_ios_failure(const char*) __attribute__((__noreturn__));
-
-  void
-  __throw_system_error(int) __attribute__((__noreturn__));
-
-  void
-  __throw_future_error(int) __attribute__((__noreturn__));
-
-  // Helpers for exception objects in <functional>
-  void
-  __throw_bad_function_call() __attribute__((__noreturn__));
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/functional_hash.h b/openflow/usr/include/c++/5/bits/functional_hash.h
deleted file mode 100644
index d94843f..0000000
--- a/openflow/usr/include/c++/5/bits/functional_hash.h
+++ /dev/null
@@ -1,212 +0,0 @@
-// functional_hash.h header -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/functional_hash.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{functional}
- */
-
-#ifndef _FUNCTIONAL_HASH_H
-#define _FUNCTIONAL_HASH_H 1
-
-#pragma GCC system_header
-
-#include <bits/hash_bytes.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /** @defgroup hashes Hashes
-   *  @ingroup functors
-   *
-   *   Hashing functors taking a variable type and returning a @c std::size_t.
-   *
-   *  @{
-   */
-
-  template<typename _Result, typename _Arg>
-    struct __hash_base
-    {
-      typedef _Result     result_type;
-      typedef _Arg      argument_type;
-    };
-
-  /// Primary class template hash.
-  template<typename _Tp>
-    struct hash;
-
-  /// Partial specializations for pointer types.
-  template<typename _Tp>
-    struct hash<_Tp*> : public __hash_base<size_t, _Tp*>
-    {
-      size_t
-      operator()(_Tp* __p) const noexcept
-      { return reinterpret_cast<size_t>(__p); }
-    };
-
-  // Explicit specializations for integer types.
-#define _Cxx_hashtable_define_trivial_hash(_Tp) 	\
-  template<>						\
-    struct hash<_Tp> : public __hash_base<size_t, _Tp>  \
-    {                                                   \
-      size_t                                            \
-      operator()(_Tp __val) const noexcept              \
-      { return static_cast<size_t>(__val); }            \
-    };
-
-  /// Explicit specialization for bool.
-  _Cxx_hashtable_define_trivial_hash(bool)
-
-  /// Explicit specialization for char.
-  _Cxx_hashtable_define_trivial_hash(char)
-
-  /// Explicit specialization for signed char.
-  _Cxx_hashtable_define_trivial_hash(signed char)
-
-  /// Explicit specialization for unsigned char.
-  _Cxx_hashtable_define_trivial_hash(unsigned char)
-
-  /// Explicit specialization for wchar_t.
-  _Cxx_hashtable_define_trivial_hash(wchar_t)
-
-  /// Explicit specialization for char16_t.
-  _Cxx_hashtable_define_trivial_hash(char16_t)
-
-  /// Explicit specialization for char32_t.
-  _Cxx_hashtable_define_trivial_hash(char32_t)
-
-  /// Explicit specialization for short.
-  _Cxx_hashtable_define_trivial_hash(short)
-
-  /// Explicit specialization for int.
-  _Cxx_hashtable_define_trivial_hash(int)
-
-  /// Explicit specialization for long.
-  _Cxx_hashtable_define_trivial_hash(long)
-
-  /// Explicit specialization for long long.
-  _Cxx_hashtable_define_trivial_hash(long long)
-
-  /// Explicit specialization for unsigned short.
-  _Cxx_hashtable_define_trivial_hash(unsigned short)
-
-  /// Explicit specialization for unsigned int.
-  _Cxx_hashtable_define_trivial_hash(unsigned int)
-
-  /// Explicit specialization for unsigned long.
-  _Cxx_hashtable_define_trivial_hash(unsigned long)
-
-  /// Explicit specialization for unsigned long long.
-  _Cxx_hashtable_define_trivial_hash(unsigned long long)
-
-#undef _Cxx_hashtable_define_trivial_hash
-
-  struct _Hash_impl
-  {
-    static size_t
-    hash(const void* __ptr, size_t __clength,
-	 size_t __seed = static_cast<size_t>(0xc70f6907UL))
-    { return _Hash_bytes(__ptr, __clength, __seed); }
-
-    template<typename _Tp>
-      static size_t
-      hash(const _Tp& __val)
-      { return hash(&__val, sizeof(__val)); }
-
-    template<typename _Tp>
-      static size_t
-      __hash_combine(const _Tp& __val, size_t __hash)
-      { return hash(&__val, sizeof(__val), __hash); }
-  };
-
-  struct _Fnv_hash_impl
-  {
-    static size_t
-    hash(const void* __ptr, size_t __clength,
-	 size_t __seed = static_cast<size_t>(2166136261UL))
-    { return _Fnv_hash_bytes(__ptr, __clength, __seed); }
-
-    template<typename _Tp>
-      static size_t
-      hash(const _Tp& __val)
-      { return hash(&__val, sizeof(__val)); }
-
-    template<typename _Tp>
-      static size_t
-      __hash_combine(const _Tp& __val, size_t __hash)
-      { return hash(&__val, sizeof(__val), __hash); }
-  };
-
-  /// Specialization for float.
-  template<>
-    struct hash<float> : public __hash_base<size_t, float>
-    {
-      size_t
-      operator()(float __val) const noexcept
-      {
-	// 0 and -0 both hash to zero.
-	return __val != 0.0f ? std::_Hash_impl::hash(__val) : 0;
-      }
-    };
-
-  /// Specialization for double.
-  template<>
-    struct hash<double> : public __hash_base<size_t, double>
-    {
-      size_t
-      operator()(double __val) const noexcept
-      {
-	// 0 and -0 both hash to zero.
-	return __val != 0.0 ? std::_Hash_impl::hash(__val) : 0;
-      }
-    };
-
-  /// Specialization for long double.
-  template<>
-    struct hash<long double>
-    : public __hash_base<size_t, long double>
-    {
-      _GLIBCXX_PURE size_t
-      operator()(long double __val) const noexcept;
-    };
-
-  // @} group hashes
-
-  // Hint about performance of hash functor. If not fast the hash based
-  // containers will cache the hash code.
-  // Default behavior is to consider that hasher are fast unless specified
-  // otherwise.
-  template<typename _Hash>
-    struct __is_fast_hash : public std::true_type
-    { };
-
-  template<>
-    struct __is_fast_hash<hash<long double>> : public std::false_type
-    { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // _FUNCTIONAL_HASH_H
diff --git a/openflow/usr/include/c++/5/bits/gslice.h b/openflow/usr/include/c++/5/bits/gslice.h
deleted file mode 100644
index 93e96eb..0000000
--- a/openflow/usr/include/c++/5/bits/gslice.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// The template and inlines for the -*- C++ -*- gslice class.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/gslice.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{valarray}
- */
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-#ifndef _GSLICE_H
-#define _GSLICE_H 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup numeric_arrays
-   * @{
-   */
-
-  /**
-   *  @brief  Class defining multi-dimensional subset of an array.
-   *
-   *  The slice class represents a multi-dimensional subset of an array,
-   *  specified by three parameter sets: start offset, size array, and stride
-   *  array.  The start offset is the index of the first element of the array
-   *  that is part of the subset.  The size and stride array describe each
-   *  dimension of the slice.  Size is the number of elements in that
-   *  dimension, and stride is the distance in the array between successive
-   *  elements in that dimension.  Each dimension's size and stride is taken
-   *  to begin at an array element described by the previous dimension.  The
-   *  size array and stride array must be the same size.
-   *
-   *  For example, if you have offset==3, stride[0]==11, size[1]==3,
-   *  stride[1]==3, then slice[0,0]==array[3], slice[0,1]==array[6],
-   *  slice[0,2]==array[9], slice[1,0]==array[14], slice[1,1]==array[17],
-   *  slice[1,2]==array[20].
-   */
-  class gslice
-  {
-  public:
-    ///  Construct an empty slice.
-    gslice();
-
-    /**
-     *  @brief  Construct a slice.
-     *
-     *  Constructs a slice with as many dimensions as the length of the @a l
-     *  and @a s arrays.
-     *
-     *  @param  __o  Offset in array of first element.
-     *  @param  __l  Array of dimension lengths.
-     *  @param  __s  Array of dimension strides between array elements.
-     */
-    gslice(size_t __o, const valarray<size_t>& __l, 
-	   const valarray<size_t>& __s);
-
-    // XXX: the IS says the copy-ctor and copy-assignment operators are
-    //      synthesized by the compiler but they are just unsuitable
-    //      for a ref-counted semantic
-    ///  Copy constructor.
-    gslice(const gslice&);
-
-    ///  Destructor.
-    ~gslice();
-
-    // XXX: See the note above.
-    ///  Assignment operator.
-    gslice& operator=(const gslice&);
-
-    ///  Return array offset of first slice element.
-    size_t           start() const;
-
-    ///  Return array of sizes of slice dimensions.
-    valarray<size_t> size() const;
-    
-    ///  Return array of array strides for each dimension.
-    valarray<size_t> stride() const;
-
-  private:
-    struct _Indexer
-    {
-      size_t _M_count;
-      size_t _M_start;
-      valarray<size_t> _M_size;
-      valarray<size_t> _M_stride;
-      valarray<size_t> _M_index; // Linear array of referenced indices
-
-      _Indexer()
-      : _M_count(1), _M_start(0), _M_size(), _M_stride(), _M_index() {}
-
-      _Indexer(size_t, const valarray<size_t>&,
-	       const valarray<size_t>&);
-
-      void
-      _M_increment_use()
-      { ++_M_count; }
-      
-      size_t
-      _M_decrement_use()
-      { return --_M_count; }
-    };
-
-    _Indexer* _M_index;
-
-    template<typename _Tp> friend class valarray;
-  };
-
-  inline size_t
-  gslice::start() const
-  { return _M_index ? _M_index->_M_start : 0; }
-
-  inline valarray<size_t>
-  gslice::size() const
-  { return _M_index ? _M_index->_M_size : valarray<size_t>(); }
-
-  inline valarray<size_t>
-  gslice::stride() const
-  { return _M_index ? _M_index->_M_stride : valarray<size_t>(); }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 543. valarray slice default constructor
-  inline
-  gslice::gslice()
-  : _M_index(new gslice::_Indexer()) {}
-
-  inline
-  gslice::gslice(size_t __o, const valarray<size_t>& __l,
-		 const valarray<size_t>& __s)
-  : _M_index(new gslice::_Indexer(__o, __l, __s)) {}
-
-  inline
-  gslice::gslice(const gslice& __g)
-  : _M_index(__g._M_index)
-  { if (_M_index) _M_index->_M_increment_use(); }
-
-  inline
-  gslice::~gslice()
-  {
-    if (_M_index && _M_index->_M_decrement_use() == 0)
-      delete _M_index;
-  }
-
-  inline gslice&
-  gslice::operator=(const gslice& __g)
-  {
-    if (__g._M_index)
-      __g._M_index->_M_increment_use();
-    if (_M_index && _M_index->_M_decrement_use() == 0)
-      delete _M_index;
-    _M_index = __g._M_index;
-    return *this;
-  }
-
-  // @} group numeric_arrays
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _GSLICE_H */
diff --git a/openflow/usr/include/c++/5/bits/gslice_array.h b/openflow/usr/include/c++/5/bits/gslice_array.h
deleted file mode 100644
index e5df385..0000000
--- a/openflow/usr/include/c++/5/bits/gslice_array.h
+++ /dev/null
@@ -1,218 +0,0 @@
-// The template and inlines for the -*- C++ -*- gslice_array class.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/gslice_array.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{valarray}
- */
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-#ifndef _GSLICE_ARRAY_H
-#define _GSLICE_ARRAY_H 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup numeric_arrays
-   * @{
-   */
-
-  /**
-   *  @brief  Reference to multi-dimensional subset of an array.
-   *
-   *  A gslice_array is a reference to the actual elements of an array
-   *  specified by a gslice.  The way to get a gslice_array is to call
-   *  operator[](gslice) on a valarray.  The returned gslice_array then
-   *  permits carrying operations out on the referenced subset of elements in
-   *  the original valarray.  For example, operator+=(valarray) will add
-   *  values to the subset of elements in the underlying valarray this
-   *  gslice_array refers to.
-   *
-   *  @param  Tp  Element type.
-   */
-  template<typename _Tp>
-    class gslice_array
-    {
-    public:
-      typedef _Tp value_type;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 253. valarray helper functions are almost entirely useless
-
-      ///  Copy constructor.  Both slices refer to the same underlying array.
-      gslice_array(const gslice_array&);
-
-      ///  Assignment operator.  Assigns slice elements to corresponding
-      ///  elements of @a a.
-      gslice_array& operator=(const gslice_array&);
-
-      ///  Assign slice elements to corresponding elements of @a v.
-      void operator=(const valarray<_Tp>&) const;
-      ///  Multiply slice elements by corresponding elements of @a v.
-      void operator*=(const valarray<_Tp>&) const;
-      ///  Divide slice elements by corresponding elements of @a v.
-      void operator/=(const valarray<_Tp>&) const;
-      ///  Modulo slice elements by corresponding elements of @a v.
-      void operator%=(const valarray<_Tp>&) const;
-      ///  Add corresponding elements of @a v to slice elements.
-      void operator+=(const valarray<_Tp>&) const;
-      ///  Subtract corresponding elements of @a v from slice elements.
-      void operator-=(const valarray<_Tp>&) const;
-      ///  Logical xor slice elements with corresponding elements of @a v.
-      void operator^=(const valarray<_Tp>&) const;
-      ///  Logical and slice elements with corresponding elements of @a v.
-      void operator&=(const valarray<_Tp>&) const;
-      ///  Logical or slice elements with corresponding elements of @a v.
-      void operator|=(const valarray<_Tp>&) const;
-      ///  Left shift slice elements by corresponding elements of @a v.
-      void operator<<=(const valarray<_Tp>&) const;
-      ///  Right shift slice elements by corresponding elements of @a v.
-      void operator>>=(const valarray<_Tp>&) const;
-      ///  Assign all slice elements to @a t.
-      void operator=(const _Tp&) const;
-
-      template<class _Dom>
-        void operator=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-        void operator*=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-        void operator/=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-        void operator%=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-        void operator+=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-        void operator-=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-        void operator^=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-        void operator&=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-        void operator|=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-        void operator<<=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-        void operator>>=(const _Expr<_Dom, _Tp>&) const;
-
-    private:
-      _Array<_Tp>    _M_array;
-      const valarray<size_t>& _M_index;
-
-      friend class valarray<_Tp>;
-
-      gslice_array(_Array<_Tp>, const valarray<size_t>&);
-
-      // not implemented
-      gslice_array();
-    };
-
-  template<typename _Tp>
-    inline
-    gslice_array<_Tp>::gslice_array(_Array<_Tp> __a,
-				    const valarray<size_t>& __i)
-    : _M_array(__a), _M_index(__i) {}
-
-  template<typename _Tp>
-    inline
-    gslice_array<_Tp>::gslice_array(const gslice_array<_Tp>& __a)
-    : _M_array(__a._M_array), _M_index(__a._M_index) {}
-
-  template<typename _Tp>
-    inline gslice_array<_Tp>&
-    gslice_array<_Tp>::operator=(const gslice_array<_Tp>& __a)
-    {
-      std::__valarray_copy(_Array<_Tp>(__a._M_array),
-			   _Array<size_t>(__a._M_index), _M_index.size(),
-			   _M_array, _Array<size_t>(_M_index));
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline void
-    gslice_array<_Tp>::operator=(const _Tp& __t) const
-    {
-      std::__valarray_fill(_M_array, _Array<size_t>(_M_index),
-			   _M_index.size(), __t);
-    }
-
-  template<typename _Tp>
-    inline void
-    gslice_array<_Tp>::operator=(const valarray<_Tp>& __v) const
-    {
-      std::__valarray_copy(_Array<_Tp>(__v), __v.size(),
-			   _M_array, _Array<size_t>(_M_index));
-    }
-
-  template<typename _Tp>
-    template<class _Dom>
-      inline void
-      gslice_array<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e) const
-      {
-	std::__valarray_copy (__e, _M_index.size(), _M_array,
-			      _Array<size_t>(_M_index));
-      }
-
-#undef _DEFINE_VALARRAY_OPERATOR
-#define _DEFINE_VALARRAY_OPERATOR(_Op, _Name)				\
-  template<typename _Tp>						\
-    inline void								\
-    gslice_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const	\
-    {									\
-      _Array_augmented_##_Name(_M_array, _Array<size_t>(_M_index),	\
-			       _Array<_Tp>(__v), __v.size());		\
-    }									\
-									\
-  template<typename _Tp>                                                \
-    template<class _Dom>				                \
-      inline void							\
-      gslice_array<_Tp>::operator _Op##= (const _Expr<_Dom, _Tp>& __e) const\
-      {									\
-	_Array_augmented_##_Name(_M_array, _Array<size_t>(_M_index), __e,\
-				 _M_index.size());			\
-      }
-
-_DEFINE_VALARRAY_OPERATOR(*, __multiplies)
-_DEFINE_VALARRAY_OPERATOR(/, __divides)
-_DEFINE_VALARRAY_OPERATOR(%, __modulus)
-_DEFINE_VALARRAY_OPERATOR(+, __plus)
-_DEFINE_VALARRAY_OPERATOR(-, __minus)
-_DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
-_DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
-_DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
-_DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
-_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_OPERATOR
-
-  // @} group numeric_arrays
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _GSLICE_ARRAY_H */
diff --git a/openflow/usr/include/c++/5/bits/hash_bytes.h b/openflow/usr/include/c++/5/bits/hash_bytes.h
deleted file mode 100644
index 91214c0..0000000
--- a/openflow/usr/include/c++/5/bits/hash_bytes.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Declarations for hash functions. -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/hash_bytes.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{functional}
- */
-
-#ifndef _HASH_BYTES_H
-#define _HASH_BYTES_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-namespace std
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Hash function implementation for the nontrivial specialization.
-  // All of them are based on a primitive that hashes a pointer to a
-  // byte array. The actual hash algorithm is not guaranteed to stay
-  // the same from release to release -- it may be updated or tuned to
-  // improve hash quality or speed.
-  size_t
-  _Hash_bytes(const void* __ptr, size_t __len, size_t __seed);
-
-  // A similar hash primitive, using the FNV hash algorithm. This
-  // algorithm is guaranteed to stay the same from release to release.
-  // (although it might not produce the same values on different
-  // machines.)
-  size_t
-  _Fnv_hash_bytes(const void* __ptr, size_t __len, size_t __seed);
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/hashtable.h b/openflow/usr/include/c++/5/bits/hashtable.h
deleted file mode 100644
index f5f298e..0000000
--- a/openflow/usr/include/c++/5/bits/hashtable.h
+++ /dev/null
@@ -1,2097 +0,0 @@
-// hashtable.h header -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/hashtable.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{unordered_map, unordered_set}
- */
-
-#ifndef _HASHTABLE_H
-#define _HASHTABLE_H 1
-
-#pragma GCC system_header
-
-#include <bits/hashtable_policy.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Tp, typename _Hash>
-    using __cache_default
-      =  __not_<__and_<// Do not cache for fast hasher.
-		       __is_fast_hash<_Hash>,
-		       // Mandatory to have erase not throwing.
-		       __detail::__is_noexcept_hash<_Tp, _Hash>>>;
-
-  /**
-   *  Primary class template _Hashtable.
-   *
-   *  @ingroup hashtable-detail
-   *
-   *  @tparam _Value  CopyConstructible type.
-   *
-   *  @tparam _Key    CopyConstructible type.
-   *
-   *  @tparam _Alloc  An allocator type
-   *  ([lib.allocator.requirements]) whose _Alloc::value_type is
-   *  _Value.  As a conforming extension, we allow for
-   *  _Alloc::value_type != _Value.
-   *
-   *  @tparam _ExtractKey  Function object that takes an object of type
-   *  _Value and returns a value of type _Key.
-   *
-   *  @tparam _Equal  Function object that takes two objects of type k
-   *  and returns a bool-like value that is true if the two objects
-   *  are considered equal.
-   *
-   *  @tparam _H1  The hash function. A unary function object with
-   *  argument type _Key and result type size_t. Return values should
-   *  be distributed over the entire range [0, numeric_limits<size_t>:::max()].
-   *
-   *  @tparam _H2  The range-hashing function (in the terminology of
-   *  Tavori and Dreizin).  A binary function object whose argument
-   *  types and result type are all size_t.  Given arguments r and N,
-   *  the return value is in the range [0, N).
-   *
-   *  @tparam _Hash  The ranged hash function (Tavori and Dreizin). A
-   *  binary function whose argument types are _Key and size_t and
-   *  whose result type is size_t.  Given arguments k and N, the
-   *  return value is in the range [0, N).  Default: hash(k, N) =
-   *  h2(h1(k), N).  If _Hash is anything other than the default, _H1
-   *  and _H2 are ignored.
-   *
-   *  @tparam _RehashPolicy  Policy class with three members, all of
-   *  which govern the bucket count. _M_next_bkt(n) returns a bucket
-   *  count no smaller than n.  _M_bkt_for_elements(n) returns a
-   *  bucket count appropriate for an element count of n.
-   *  _M_need_rehash(n_bkt, n_elt, n_ins) determines whether, if the
-   *  current bucket count is n_bkt and the current element count is
-   *  n_elt, we need to increase the bucket count.  If so, returns
-   *  make_pair(true, n), where n is the new bucket count.  If not,
-   *  returns make_pair(false, <anything>)
-   *
-   *  @tparam _Traits  Compile-time class with three boolean
-   *  std::integral_constant members:  __cache_hash_code, __constant_iterators,
-   *   __unique_keys.
-   *
-   *  Each _Hashtable data structure has:
-   *
-   *  - _Bucket[]       _M_buckets
-   *  - _Hash_node_base _M_before_begin
-   *  - size_type       _M_bucket_count
-   *  - size_type       _M_element_count
-   *
-   *  with _Bucket being _Hash_node* and _Hash_node containing:
-   *
-   *  - _Hash_node*   _M_next
-   *  - Tp            _M_value
-   *  - size_t        _M_hash_code if cache_hash_code is true
-   *
-   *  In terms of Standard containers the hashtable is like the aggregation of:
-   *
-   *  - std::forward_list<_Node> containing the elements
-   *  - std::vector<std::forward_list<_Node>::iterator> representing the buckets
-   *
-   *  The non-empty buckets contain the node before the first node in the
-   *  bucket. This design makes it possible to implement something like a
-   *  std::forward_list::insert_after on container insertion and
-   *  std::forward_list::erase_after on container erase
-   *  calls. _M_before_begin is equivalent to
-   *  std::forward_list::before_begin. Empty buckets contain
-   *  nullptr.  Note that one of the non-empty buckets contains
-   *  &_M_before_begin which is not a dereferenceable node so the
-   *  node pointer in a bucket shall never be dereferenced, only its
-   *  next node can be.
-   *
-   *  Walking through a bucket's nodes requires a check on the hash code to
-   *  see if each node is still in the bucket. Such a design assumes a
-   *  quite efficient hash functor and is one of the reasons it is
-   *  highly advisable to set __cache_hash_code to true.
-   *
-   *  The container iterators are simply built from nodes. This way
-   *  incrementing the iterator is perfectly efficient independent of
-   *  how many empty buckets there are in the container.
-   *
-   *  On insert we compute the element's hash code and use it to find the
-   *  bucket index. If the element must be inserted in an empty bucket
-   *  we add it at the beginning of the singly linked list and make the
-   *  bucket point to _M_before_begin. The bucket that used to point to
-   *  _M_before_begin, if any, is updated to point to its new before
-   *  begin node.
-   *
-   *  On erase, the simple iterator design requires using the hash
-   *  functor to get the index of the bucket to update. For this
-   *  reason, when __cache_hash_code is set to false the hash functor must
-   *  not throw and this is enforced by a static assertion.
-   *
-   *  Functionality is implemented by decomposition into base classes,
-   *  where the derived _Hashtable class is used in _Map_base,
-   *  _Insert, _Rehash_base, and _Equality base classes to access the
-   *  "this" pointer. _Hashtable_base is used in the base classes as a
-   *  non-recursive, fully-completed-type so that detailed nested type
-   *  information, such as iterator type and node type, can be
-   *  used. This is similar to the "Curiously Recurring Template
-   *  Pattern" (CRTP) technique, but uses a reconstructed, not
-   *  explicitly passed, template pattern.
-   *
-   *  Base class templates are: 
-   *    - __detail::_Hashtable_base
-   *    - __detail::_Map_base
-   *    - __detail::_Insert
-   *    - __detail::_Rehash_base
-   *    - __detail::_Equality
-   */
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    class _Hashtable
-    : public __detail::_Hashtable_base<_Key, _Value, _ExtractKey, _Equal,
-				       _H1, _H2, _Hash, _Traits>,
-      public __detail::_Map_base<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-				 _H1, _H2, _Hash, _RehashPolicy, _Traits>,
-      public __detail::_Insert<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-			       _H1, _H2, _Hash, _RehashPolicy, _Traits>,
-      public __detail::_Rehash_base<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-				    _H1, _H2, _Hash, _RehashPolicy, _Traits>,
-      public __detail::_Equality<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-				 _H1, _H2, _Hash, _RehashPolicy, _Traits>,
-      private __detail::_Hashtable_alloc<
-	typename __alloctr_rebind<_Alloc,
-	  __detail::_Hash_node<_Value,
-			       _Traits::__hash_cached::value> >::__type>
-    {
-      using __traits_type = _Traits;
-      using __hash_cached = typename __traits_type::__hash_cached;
-      using __node_type = __detail::_Hash_node<_Value, __hash_cached::value>;
-      using __node_alloc_type =
-	typename __alloctr_rebind<_Alloc, __node_type>::__type;
-
-      using __hashtable_alloc = __detail::_Hashtable_alloc<__node_alloc_type>;
-
-      using __value_alloc_traits =
-	typename __hashtable_alloc::__value_alloc_traits;
-      using __node_alloc_traits =
-	typename __hashtable_alloc::__node_alloc_traits;
-      using __node_base = typename __hashtable_alloc::__node_base;
-      using __bucket_type = typename __hashtable_alloc::__bucket_type;
-
-    public:
-      typedef _Key						key_type;
-      typedef _Value						value_type;
-      typedef _Alloc						allocator_type;
-      typedef _Equal						key_equal;
-
-      // mapped_type, if present, comes from _Map_base.
-      // hasher, if present, comes from _Hash_code_base/_Hashtable_base.
-      typedef typename __value_alloc_traits::pointer		pointer;
-      typedef typename __value_alloc_traits::const_pointer	const_pointer;
-      typedef value_type&					reference;
-      typedef const value_type&					const_reference;
-
-    private:
-      using __rehash_type = _RehashPolicy;
-      using __rehash_state = typename __rehash_type::_State;
-
-      using __constant_iterators = typename __traits_type::__constant_iterators;
-      using __unique_keys = typename __traits_type::__unique_keys;
-
-      using __key_extract = typename std::conditional<
-					     __constant_iterators::value,
-				       	     __detail::_Identity,
-					     __detail::_Select1st>::type;
-
-      using __hashtable_base = __detail::
-			       _Hashtable_base<_Key, _Value, _ExtractKey,
-					      _Equal, _H1, _H2, _Hash, _Traits>;
-
-      using __hash_code_base =  typename __hashtable_base::__hash_code_base;
-      using __hash_code =  typename __hashtable_base::__hash_code;
-      using __ireturn_type = typename __hashtable_base::__ireturn_type;
-
-      using __map_base = __detail::_Map_base<_Key, _Value, _Alloc, _ExtractKey,
-					     _Equal, _H1, _H2, _Hash,
-					     _RehashPolicy, _Traits>;
-
-      using __rehash_base = __detail::_Rehash_base<_Key, _Value, _Alloc,
-						   _ExtractKey, _Equal,
-						   _H1, _H2, _Hash,
-						   _RehashPolicy, _Traits>;
-
-      using __eq_base = __detail::_Equality<_Key, _Value, _Alloc, _ExtractKey,
-					    _Equal, _H1, _H2, _Hash,
-					    _RehashPolicy, _Traits>;
-
-      using __reuse_or_alloc_node_type =
-	__detail::_ReuseOrAllocNode<__node_alloc_type>;
-
-      // Metaprogramming for picking apart hash caching.
-      template<typename _Cond>
-	using __if_hash_cached = __or_<__not_<__hash_cached>, _Cond>;
-
-      template<typename _Cond>
-	using __if_hash_not_cached = __or_<__hash_cached, _Cond>;
-
-      // Compile-time diagnostics.
-
-      // _Hash_code_base has everything protected, so use this derived type to
-      // access it.
-      struct __hash_code_base_access : __hash_code_base
-      { using __hash_code_base::_M_bucket_index; };
-
-      // Getting a bucket index from a node shall not throw because it is used
-      // in methods (erase, swap...) that shall not throw.
-      static_assert(noexcept(declval<const __hash_code_base_access&>()
-			     ._M_bucket_index((const __node_type*)nullptr,
-					      (std::size_t)0)),
-		    "Cache the hash code or qualify your functors involved"
-		    " in hash code and bucket index computation with noexcept");
-
-      // Following two static assertions are necessary to guarantee
-      // that local_iterator will be default constructible.
-
-      // When hash codes are cached local iterator inherits from H2 functor
-      // which must then be default constructible.
-      static_assert(__if_hash_cached<is_default_constructible<_H2>>::value,
-		    "Functor used to map hash code to bucket index"
-		    " must be default constructible");
-
-      template<typename _Keya, typename _Valuea, typename _Alloca,
-	       typename _ExtractKeya, typename _Equala,
-	       typename _H1a, typename _H2a, typename _Hasha,
-	       typename _RehashPolicya, typename _Traitsa,
-	       bool _Unique_keysa>
-	friend struct __detail::_Map_base;
-
-      template<typename _Keya, typename _Valuea, typename _Alloca,
-	       typename _ExtractKeya, typename _Equala,
-	       typename _H1a, typename _H2a, typename _Hasha,
-	       typename _RehashPolicya, typename _Traitsa>
-	friend struct __detail::_Insert_base;
-
-      template<typename _Keya, typename _Valuea, typename _Alloca,
-	       typename _ExtractKeya, typename _Equala,
-	       typename _H1a, typename _H2a, typename _Hasha,
-	       typename _RehashPolicya, typename _Traitsa,
-	       bool _Constant_iteratorsa, bool _Unique_keysa>
-	friend struct __detail::_Insert;
-
-    public:
-      using size_type = typename __hashtable_base::size_type;
-      using difference_type = typename __hashtable_base::difference_type;
-
-      using iterator = typename __hashtable_base::iterator;
-      using const_iterator = typename __hashtable_base::const_iterator;
-
-      using local_iterator = typename __hashtable_base::local_iterator;
-      using const_local_iterator = typename __hashtable_base::
-				   const_local_iterator;
-
-    private:
-      __bucket_type*		_M_buckets		= &_M_single_bucket;
-      size_type			_M_bucket_count		= 1;
-      __node_base		_M_before_begin;
-      size_type			_M_element_count	= 0;
-      _RehashPolicy		_M_rehash_policy;
-
-      // A single bucket used when only need for 1 bucket. Especially
-      // interesting in move semantic to leave hashtable with only 1 buckets
-      // which is not allocated so that we can have those operations noexcept
-      // qualified.
-      // Note that we can't leave hashtable with 0 bucket without adding
-      // numerous checks in the code to avoid 0 modulus.
-      __bucket_type		_M_single_bucket	= nullptr;
-
-      bool
-      _M_uses_single_bucket(__bucket_type* __bkts) const
-      { return __builtin_expect(__bkts == &_M_single_bucket, false); }
-
-      bool
-      _M_uses_single_bucket() const
-      { return _M_uses_single_bucket(_M_buckets); }
-
-      __hashtable_alloc&
-      _M_base_alloc() { return *this; }
-
-      __bucket_type*
-      _M_allocate_buckets(size_type __n)
-      {
-	if (__builtin_expect(__n == 1, false))
-	  {
-	    _M_single_bucket = nullptr;
-	    return &_M_single_bucket;
-	  }
-
-	return __hashtable_alloc::_M_allocate_buckets(__n);
-      }
-
-      void
-      _M_deallocate_buckets(__bucket_type* __bkts, size_type __n)
-      {
-	if (_M_uses_single_bucket(__bkts))
-	  return;
-
-	__hashtable_alloc::_M_deallocate_buckets(__bkts, __n);
-      }
-
-      void
-      _M_deallocate_buckets()
-      { _M_deallocate_buckets(_M_buckets, _M_bucket_count); }
-
-      // Gets bucket begin, deals with the fact that non-empty buckets contain
-      // their before begin node.
-      __node_type*
-      _M_bucket_begin(size_type __bkt) const;
-
-      __node_type*
-      _M_begin() const
-      { return static_cast<__node_type*>(_M_before_begin._M_nxt); }
-
-      template<typename _NodeGenerator>
-	void
-	_M_assign(const _Hashtable&, const _NodeGenerator&);
-
-      void
-      _M_move_assign(_Hashtable&&, std::true_type);
-
-      void
-      _M_move_assign(_Hashtable&&, std::false_type);
-
-      void
-      _M_reset() noexcept;
-
-      _Hashtable(const _H1& __h1, const _H2& __h2, const _Hash& __h,
-		 const _Equal& __eq, const _ExtractKey& __exk,
-		 const allocator_type& __a)
-	: __hashtable_base(__exk, __h1, __h2, __h, __eq),
-	  __hashtable_alloc(__node_alloc_type(__a))
-      { }
-
-    public:
-      // Constructor, destructor, assignment, swap
-      _Hashtable() = default;
-      _Hashtable(size_type __bucket_hint,
-		 const _H1&, const _H2&, const _Hash&,
-		 const _Equal&, const _ExtractKey&,
-		 const allocator_type&);
-
-      template<typename _InputIterator>
-	_Hashtable(_InputIterator __first, _InputIterator __last,
-		   size_type __bucket_hint,
-		   const _H1&, const _H2&, const _Hash&,
-		   const _Equal&, const _ExtractKey&,
-		   const allocator_type&);
-
-      _Hashtable(const _Hashtable&);
-
-      _Hashtable(_Hashtable&&) noexcept;
-
-      _Hashtable(const _Hashtable&, const allocator_type&);
-
-      _Hashtable(_Hashtable&&, const allocator_type&);
-
-      // Use delegating constructors.
-      explicit
-      _Hashtable(const allocator_type& __a)
-	: __hashtable_alloc(__node_alloc_type(__a))
-      { }
-
-      explicit
-      _Hashtable(size_type __n,
-		 const _H1& __hf = _H1(),
-		 const key_equal& __eql = key_equal(),
-		 const allocator_type& __a = allocator_type())
-      : _Hashtable(__n, __hf, _H2(), _Hash(), __eql,
-		   __key_extract(), __a)
-      { }
-
-      template<typename _InputIterator>
-	_Hashtable(_InputIterator __f, _InputIterator __l,
-		   size_type __n = 0,
-		   const _H1& __hf = _H1(),
-		   const key_equal& __eql = key_equal(),
-		   const allocator_type& __a = allocator_type())
-	: _Hashtable(__f, __l, __n, __hf, _H2(), _Hash(), __eql,
-		     __key_extract(), __a)
-	{ }
-
-      _Hashtable(initializer_list<value_type> __l,
-		 size_type __n = 0,
-		 const _H1& __hf = _H1(),
-		 const key_equal& __eql = key_equal(),
-		 const allocator_type& __a = allocator_type())
-      : _Hashtable(__l.begin(), __l.end(), __n, __hf, _H2(), _Hash(), __eql,
-		   __key_extract(), __a)
-      { }
-
-      _Hashtable&
-      operator=(const _Hashtable& __ht);
-
-      _Hashtable&
-      operator=(_Hashtable&& __ht)
-      noexcept(__node_alloc_traits::_S_nothrow_move())
-      {
-        constexpr bool __move_storage =
-          __node_alloc_traits::_S_propagate_on_move_assign()
-          || __node_alloc_traits::_S_always_equal();
-        _M_move_assign(std::move(__ht),
-                       integral_constant<bool, __move_storage>());
-	return *this;
-      }
-
-      _Hashtable&
-      operator=(initializer_list<value_type> __l)
-      {
-	__reuse_or_alloc_node_type __roan(_M_begin(), *this);
-	_M_before_begin._M_nxt = nullptr;
-	clear();
-	this->_M_insert_range(__l.begin(), __l.end(), __roan);
-	return *this;
-      }
-
-      ~_Hashtable() noexcept;
-
-      void
-      swap(_Hashtable&)
-      noexcept(__node_alloc_traits::_S_nothrow_swap());
-
-      // Basic container operations
-      iterator
-      begin() noexcept
-      { return iterator(_M_begin()); }
-
-      const_iterator
-      begin() const noexcept
-      { return const_iterator(_M_begin()); }
-
-      iterator
-      end() noexcept
-      { return iterator(nullptr); }
-
-      const_iterator
-      end() const noexcept
-      { return const_iterator(nullptr); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_M_begin()); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(nullptr); }
-
-      size_type
-      size() const noexcept
-      { return _M_element_count; }
-
-      bool
-      empty() const noexcept
-      { return size() == 0; }
-
-      allocator_type
-      get_allocator() const noexcept
-      { return allocator_type(this->_M_node_allocator()); }
-
-      size_type
-      max_size() const noexcept
-      { return __node_alloc_traits::max_size(this->_M_node_allocator()); }
-
-      // Observers
-      key_equal
-      key_eq() const
-      { return this->_M_eq(); }
-
-      // hash_function, if present, comes from _Hash_code_base.
-
-      // Bucket operations
-      size_type
-      bucket_count() const noexcept
-      { return _M_bucket_count; }
-
-      size_type
-      max_bucket_count() const noexcept
-      { return max_size(); }
-
-      size_type
-      bucket_size(size_type __n) const
-      { return std::distance(begin(__n), end(__n)); }
-
-      size_type
-      bucket(const key_type& __k) const
-      { return _M_bucket_index(__k, this->_M_hash_code(__k)); }
-
-      local_iterator
-      begin(size_type __n)
-      {
-	return local_iterator(*this, _M_bucket_begin(__n),
-			      __n, _M_bucket_count);
-      }
-
-      local_iterator
-      end(size_type __n)
-      { return local_iterator(*this, nullptr, __n, _M_bucket_count); }
-
-      const_local_iterator
-      begin(size_type __n) const
-      {
-	return const_local_iterator(*this, _M_bucket_begin(__n),
-				    __n, _M_bucket_count);
-      }
-
-      const_local_iterator
-      end(size_type __n) const
-      { return const_local_iterator(*this, nullptr, __n, _M_bucket_count); }
-
-      // DR 691.
-      const_local_iterator
-      cbegin(size_type __n) const
-      {
-	return const_local_iterator(*this, _M_bucket_begin(__n),
-				    __n, _M_bucket_count);
-      }
-
-      const_local_iterator
-      cend(size_type __n) const
-      { return const_local_iterator(*this, nullptr, __n, _M_bucket_count); }
-
-      float
-      load_factor() const noexcept
-      {
-	return static_cast<float>(size()) / static_cast<float>(bucket_count());
-      }
-
-      // max_load_factor, if present, comes from _Rehash_base.
-
-      // Generalization of max_load_factor.  Extension, not found in
-      // TR1.  Only useful if _RehashPolicy is something other than
-      // the default.
-      const _RehashPolicy&
-      __rehash_policy() const
-      { return _M_rehash_policy; }
-
-      void
-      __rehash_policy(const _RehashPolicy&);
-
-      // Lookup.
-      iterator
-      find(const key_type& __k);
-
-      const_iterator
-      find(const key_type& __k) const;
-
-      size_type
-      count(const key_type& __k) const;
-
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __k);
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __k) const;
-
-    protected:
-      // Bucket index computation helpers.
-      size_type
-      _M_bucket_index(__node_type* __n) const noexcept
-      { return __hash_code_base::_M_bucket_index(__n, _M_bucket_count); }
-
-      size_type
-      _M_bucket_index(const key_type& __k, __hash_code __c) const
-      { return __hash_code_base::_M_bucket_index(__k, __c, _M_bucket_count); }
-
-      // Find and insert helper functions and types
-      // Find the node before the one matching the criteria.
-      __node_base*
-      _M_find_before_node(size_type, const key_type&, __hash_code) const;
-
-      __node_type*
-      _M_find_node(size_type __bkt, const key_type& __key,
-		   __hash_code __c) const
-      {
-	__node_base* __before_n = _M_find_before_node(__bkt, __key, __c);
-	if (__before_n)
-	  return static_cast<__node_type*>(__before_n->_M_nxt);
-	return nullptr;
-      }
-
-      // Insert a node at the beginning of a bucket.
-      void
-      _M_insert_bucket_begin(size_type, __node_type*);
-
-      // Remove the bucket first node
-      void
-      _M_remove_bucket_begin(size_type __bkt, __node_type* __next_n,
-			     size_type __next_bkt);
-
-      // Get the node before __n in the bucket __bkt
-      __node_base*
-      _M_get_previous_node(size_type __bkt, __node_base* __n);
-
-      // Insert node with hash code __code, in bucket bkt if no rehash (assumes
-      // no element with its key already present). Take ownership of the node,
-      // deallocate it on exception.
-      iterator
-      _M_insert_unique_node(size_type __bkt, __hash_code __code,
-			    __node_type* __n);
-
-      // Insert node with hash code __code. Take ownership of the node,
-      // deallocate it on exception.
-      iterator
-      _M_insert_multi_node(__node_type* __hint,
-			   __hash_code __code, __node_type* __n);
-
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	_M_emplace(std::true_type, _Args&&... __args);
-
-      template<typename... _Args>
-	iterator
-	_M_emplace(std::false_type __uk, _Args&&... __args)
-	{ return _M_emplace(cend(), __uk, std::forward<_Args>(__args)...); }
-
-      // Emplace with hint, useless when keys are unique.
-      template<typename... _Args>
-	iterator
-	_M_emplace(const_iterator, std::true_type __uk, _Args&&... __args)
-	{ return _M_emplace(__uk, std::forward<_Args>(__args)...).first; }
-
-      template<typename... _Args>
-	iterator
-	_M_emplace(const_iterator, std::false_type, _Args&&... __args);
-
-      template<typename _Arg, typename _NodeGenerator>
-	std::pair<iterator, bool>
-	_M_insert(_Arg&&, const _NodeGenerator&, std::true_type);
-
-      template<typename _Arg, typename _NodeGenerator>
-	iterator
-	_M_insert(_Arg&& __arg, const _NodeGenerator& __node_gen,
-		  std::false_type __uk)
-	{
-	  return _M_insert(cend(), std::forward<_Arg>(__arg), __node_gen,
-			   __uk);
-	}
-
-      // Insert with hint, not used when keys are unique.
-      template<typename _Arg, typename _NodeGenerator>
-	iterator
-	_M_insert(const_iterator, _Arg&& __arg,
-		  const _NodeGenerator& __node_gen, std::true_type __uk)
-	{
-	  return
-	    _M_insert(std::forward<_Arg>(__arg), __node_gen, __uk).first;
-	}
-
-      // Insert with hint when keys are not unique.
-      template<typename _Arg, typename _NodeGenerator>
-	iterator
-	_M_insert(const_iterator, _Arg&&,
-		  const _NodeGenerator&, std::false_type);
-
-      size_type
-      _M_erase(std::true_type, const key_type&);
-
-      size_type
-      _M_erase(std::false_type, const key_type&);
-
-      iterator
-      _M_erase(size_type __bkt, __node_base* __prev_n, __node_type* __n);
-
-    public:
-      // Emplace
-      template<typename... _Args>
-	__ireturn_type
-	emplace(_Args&&... __args)
-	{ return _M_emplace(__unique_keys(), std::forward<_Args>(__args)...); }
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __hint, _Args&&... __args)
-	{
-	  return _M_emplace(__hint, __unique_keys(),
-			    std::forward<_Args>(__args)...);
-	}
-
-      // Insert member functions via inheritance.
-
-      // Erase
-      iterator
-      erase(const_iterator);
-
-      // LWG 2059.
-      iterator
-      erase(iterator __it)
-      { return erase(const_iterator(__it)); }
-
-      size_type
-      erase(const key_type& __k)
-      { return _M_erase(__unique_keys(), __k); }
-
-      iterator
-      erase(const_iterator, const_iterator);
-
-      void
-      clear() noexcept;
-
-      // Set number of buckets to be appropriate for container of n element.
-      void rehash(size_type __n);
-
-      // DR 1189.
-      // reserve, if present, comes from _Rehash_base.
-
-    private:
-      // Helper rehash method used when keys are unique.
-      void _M_rehash_aux(size_type __n, std::true_type);
-
-      // Helper rehash method used when keys can be non-unique.
-      void _M_rehash_aux(size_type __n, std::false_type);
-
-      // Unconditionally change size of bucket array to n, restore
-      // hash policy state to __state on exception.
-      void _M_rehash(size_type __n, const __rehash_state& __state);
-    };
-
-
-  // Definitions of class template _Hashtable's out-of-line member functions.
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_bucket_begin(size_type __bkt) const
-    -> __node_type*
-    {
-      __node_base* __n = _M_buckets[__bkt];
-      return __n ? static_cast<__node_type*>(__n->_M_nxt) : nullptr;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _Hashtable(size_type __bucket_hint,
-	       const _H1& __h1, const _H2& __h2, const _Hash& __h,
-	       const _Equal& __eq, const _ExtractKey& __exk,
-	       const allocator_type& __a)
-      : _Hashtable(__h1, __h2, __h, __eq, __exk, __a)
-    {
-      auto __bkt = _M_rehash_policy._M_next_bkt(__bucket_hint);
-      if (__bkt > _M_bucket_count)
-	{
-	  _M_buckets = _M_allocate_buckets(__bkt);
-	  _M_bucket_count = __bkt;
-	}
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    template<typename _InputIterator>
-      _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-		 _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-      _Hashtable(_InputIterator __f, _InputIterator __l,
-		 size_type __bucket_hint,
-		 const _H1& __h1, const _H2& __h2, const _Hash& __h,
-		 const _Equal& __eq, const _ExtractKey& __exk,
-		 const allocator_type& __a)
-	: _Hashtable(__h1, __h2, __h, __eq, __exk, __a)
-      {
-	auto __nb_elems = __detail::__distance_fw(__f, __l);
-	auto __bkt_count =
-	  _M_rehash_policy._M_next_bkt(
-	    std::max(_M_rehash_policy._M_bkt_for_elements(__nb_elems),
-		     __bucket_hint));
-
-	if (__bkt_count > _M_bucket_count)
-	  {
-	    _M_buckets = _M_allocate_buckets(__bkt_count);
-	    _M_bucket_count = __bkt_count;
-	  }
-
-	__try
-	  {
-	    for (; __f != __l; ++__f)
-	      this->insert(*__f);
-	  }
-	__catch(...)
-	  {
-	    clear();
-	    _M_deallocate_buckets();
-	    __throw_exception_again;
-	  }
-      }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    operator=(const _Hashtable& __ht)
-    -> _Hashtable&
-    {
-      if (&__ht == this)
-	return *this;
-
-      if (__node_alloc_traits::_S_propagate_on_copy_assign())
-	{
-	  auto& __this_alloc = this->_M_node_allocator();
-	  auto& __that_alloc = __ht._M_node_allocator();
-	  if (!__node_alloc_traits::_S_always_equal()
-	      && __this_alloc != __that_alloc)
-	    {
-	      // Replacement allocator cannot free existing storage.
-	      this->_M_deallocate_nodes(_M_begin());
-	      _M_before_begin._M_nxt = nullptr;
-	      _M_deallocate_buckets();
-	      _M_buckets = nullptr;
-	      std::__alloc_on_copy(__this_alloc, __that_alloc);
-	      __hashtable_base::operator=(__ht);
-	      _M_bucket_count = __ht._M_bucket_count;
-	      _M_element_count = __ht._M_element_count;
-	      _M_rehash_policy = __ht._M_rehash_policy;
-	      __try
-		{
-		  _M_assign(__ht,
-			    [this](const __node_type* __n)
-			    { return this->_M_allocate_node(__n->_M_v()); });
-		}
-	      __catch(...)
-		{
-		  // _M_assign took care of deallocating all memory. Now we
-		  // must make sure this instance remains in a usable state.
-		  _M_reset();
-		  __throw_exception_again;
-		}
-	      return *this;
-	    }
-	  std::__alloc_on_copy(__this_alloc, __that_alloc);
-	}
-
-      // Reuse allocated buckets and nodes.
-      __bucket_type* __former_buckets = nullptr;
-      std::size_t __former_bucket_count = _M_bucket_count;
-      const __rehash_state& __former_state = _M_rehash_policy._M_state();
-
-      if (_M_bucket_count != __ht._M_bucket_count)
-	{
-	  __former_buckets = _M_buckets;
-	  _M_buckets = _M_allocate_buckets(__ht._M_bucket_count);
-	  _M_bucket_count = __ht._M_bucket_count;
-	}
-      else
-	__builtin_memset(_M_buckets, 0,
-			 _M_bucket_count * sizeof(__bucket_type));
-
-      __try
-	{
-	  __hashtable_base::operator=(__ht);
-	  _M_element_count = __ht._M_element_count;
-	  _M_rehash_policy = __ht._M_rehash_policy;
-	  __reuse_or_alloc_node_type __roan(_M_begin(), *this);
-	  _M_before_begin._M_nxt = nullptr;
-	  _M_assign(__ht,
-		    [&__roan](const __node_type* __n)
-		    { return __roan(__n->_M_v()); });
-	  if (__former_buckets)
-	    _M_deallocate_buckets(__former_buckets, __former_bucket_count);
-	}
-      __catch(...)
-	{
-	  if (__former_buckets)
-	    {
-	      // Restore previous buckets.
-	      _M_deallocate_buckets();
-	      _M_rehash_policy._M_reset(__former_state);
-	      _M_buckets = __former_buckets;
-	      _M_bucket_count = __former_bucket_count;
-	    }
-	  __builtin_memset(_M_buckets, 0,
-			   _M_bucket_count * sizeof(__bucket_type));
-	  __throw_exception_again;
-	}
-      return *this;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    template<typename _NodeGenerator>
-      void
-      _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-		 _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-      _M_assign(const _Hashtable& __ht, const _NodeGenerator& __node_gen)
-      {
-	__bucket_type* __buckets = nullptr;
-	if (!_M_buckets)
-	  _M_buckets = __buckets = _M_allocate_buckets(_M_bucket_count);
-
-	__try
-	  {
-	    if (!__ht._M_before_begin._M_nxt)
-	      return;
-
-	    // First deal with the special first node pointed to by
-	    // _M_before_begin.
-	    __node_type* __ht_n = __ht._M_begin();
-	    __node_type* __this_n = __node_gen(__ht_n);
-	    this->_M_copy_code(__this_n, __ht_n);
-	    _M_before_begin._M_nxt = __this_n;
-	    _M_buckets[_M_bucket_index(__this_n)] = &_M_before_begin;
-
-	    // Then deal with other nodes.
-	    __node_base* __prev_n = __this_n;
-	    for (__ht_n = __ht_n->_M_next(); __ht_n; __ht_n = __ht_n->_M_next())
-	      {
-		__this_n = __node_gen(__ht_n);
-		__prev_n->_M_nxt = __this_n;
-		this->_M_copy_code(__this_n, __ht_n);
-		size_type __bkt = _M_bucket_index(__this_n);
-		if (!_M_buckets[__bkt])
-		  _M_buckets[__bkt] = __prev_n;
-		__prev_n = __this_n;
-	      }
-	  }
-	__catch(...)
-	  {
-	    clear();
-	    if (__buckets)
-	      _M_deallocate_buckets();
-	    __throw_exception_again;
-	  }
-      }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_reset() noexcept
-    {
-      _M_rehash_policy._M_reset();
-      _M_bucket_count = 1;
-      _M_single_bucket = nullptr;
-      _M_buckets = &_M_single_bucket;
-      _M_before_begin._M_nxt = nullptr;
-      _M_element_count = 0;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_move_assign(_Hashtable&& __ht, std::true_type)
-    {
-      this->_M_deallocate_nodes(_M_begin());
-      _M_deallocate_buckets();
-      __hashtable_base::operator=(std::move(__ht));
-      _M_rehash_policy = __ht._M_rehash_policy;
-      if (!__ht._M_uses_single_bucket())
-	_M_buckets = __ht._M_buckets;
-      else
-	{
-	  _M_buckets = &_M_single_bucket;
-	  _M_single_bucket = __ht._M_single_bucket;
-	}
-      _M_bucket_count = __ht._M_bucket_count;
-      _M_before_begin._M_nxt = __ht._M_before_begin._M_nxt;
-      _M_element_count = __ht._M_element_count;
-      std::__alloc_on_move(this->_M_node_allocator(), __ht._M_node_allocator());
-
-      // Fix buckets containing the _M_before_begin pointers that can't be
-      // moved.
-      if (_M_begin())
-	_M_buckets[_M_bucket_index(_M_begin())] = &_M_before_begin;
-      __ht._M_reset();
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_move_assign(_Hashtable&& __ht, std::false_type)
-    {
-      if (__ht._M_node_allocator() == this->_M_node_allocator())
-	_M_move_assign(std::move(__ht), std::true_type());
-      else
-	{
-	  // Can't move memory, move elements then.
-	  __bucket_type* __former_buckets = nullptr;
-	  size_type __former_bucket_count = _M_bucket_count;
-	  const __rehash_state& __former_state = _M_rehash_policy._M_state();
-
-	  if (_M_bucket_count != __ht._M_bucket_count)
-	    {
-	      __former_buckets = _M_buckets;
-	      _M_buckets = _M_allocate_buckets(__ht._M_bucket_count);
-	      _M_bucket_count = __ht._M_bucket_count;
-	    }
-	  else
-	    __builtin_memset(_M_buckets, 0,
-			     _M_bucket_count * sizeof(__bucket_type));
-
-	  __try
-	    {
-	      __hashtable_base::operator=(std::move(__ht));
-	      _M_element_count = __ht._M_element_count;
-	      _M_rehash_policy = __ht._M_rehash_policy;
-	      __reuse_or_alloc_node_type __roan(_M_begin(), *this);
-	      _M_before_begin._M_nxt = nullptr;
-	      _M_assign(__ht,
-			[&__roan](__node_type* __n)
-			{ return __roan(std::move_if_noexcept(__n->_M_v())); });
-	      __ht.clear();
-	    }
-	  __catch(...)
-	    {
-	      if (__former_buckets)
-		{
-		  _M_deallocate_buckets();
-		  _M_rehash_policy._M_reset(__former_state);
-		  _M_buckets = __former_buckets;
-		  _M_bucket_count = __former_bucket_count;
-		}
-	      __builtin_memset(_M_buckets, 0,
-			       _M_bucket_count * sizeof(__bucket_type));
-	      __throw_exception_again;
-	    }
-	}
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _Hashtable(const _Hashtable& __ht)
-    : __hashtable_base(__ht),
-      __map_base(__ht),
-      __rehash_base(__ht),
-      __hashtable_alloc(
-	__node_alloc_traits::_S_select_on_copy(__ht._M_node_allocator())),
-      _M_buckets(nullptr),
-      _M_bucket_count(__ht._M_bucket_count),
-      _M_element_count(__ht._M_element_count),
-      _M_rehash_policy(__ht._M_rehash_policy)
-    {
-      _M_assign(__ht,
-		[this](const __node_type* __n)
-		{ return this->_M_allocate_node(__n->_M_v()); });
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _Hashtable(_Hashtable&& __ht) noexcept
-    : __hashtable_base(__ht),
-      __map_base(__ht),
-      __rehash_base(__ht),
-      __hashtable_alloc(std::move(__ht._M_base_alloc())),
-      _M_buckets(__ht._M_buckets),
-      _M_bucket_count(__ht._M_bucket_count),
-      _M_before_begin(__ht._M_before_begin._M_nxt),
-      _M_element_count(__ht._M_element_count),
-      _M_rehash_policy(__ht._M_rehash_policy)
-    {
-      // Update, if necessary, buckets if __ht is using its single bucket.
-      if (__ht._M_uses_single_bucket())
-	{
-	  _M_buckets = &_M_single_bucket;
-	  _M_single_bucket = __ht._M_single_bucket;
-	}
-
-      // Update, if necessary, bucket pointing to before begin that hasn't
-      // moved.
-      if (_M_begin())
-	_M_buckets[_M_bucket_index(_M_begin())] = &_M_before_begin;
-
-      __ht._M_reset();
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _Hashtable(const _Hashtable& __ht, const allocator_type& __a)
-    : __hashtable_base(__ht),
-      __map_base(__ht),
-      __rehash_base(__ht),
-      __hashtable_alloc(__node_alloc_type(__a)),
-      _M_buckets(),
-      _M_bucket_count(__ht._M_bucket_count),
-      _M_element_count(__ht._M_element_count),
-      _M_rehash_policy(__ht._M_rehash_policy)
-    {
-      _M_assign(__ht,
-		[this](const __node_type* __n)
-		{ return this->_M_allocate_node(__n->_M_v()); });
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _Hashtable(_Hashtable&& __ht, const allocator_type& __a)
-    : __hashtable_base(__ht),
-      __map_base(__ht),
-      __rehash_base(__ht),
-      __hashtable_alloc(__node_alloc_type(__a)),
-      _M_buckets(nullptr),
-      _M_bucket_count(__ht._M_bucket_count),
-      _M_element_count(__ht._M_element_count),
-      _M_rehash_policy(__ht._M_rehash_policy)
-    {
-      if (__ht._M_node_allocator() == this->_M_node_allocator())
-	{
-	  if (__ht._M_uses_single_bucket())
-	    {
-	      _M_buckets = &_M_single_bucket;
-	      _M_single_bucket = __ht._M_single_bucket;
-	    }
-	  else
-	    _M_buckets = __ht._M_buckets;
-
-	  _M_before_begin._M_nxt = __ht._M_before_begin._M_nxt;
-	  // Update, if necessary, bucket pointing to before begin that hasn't
-	  // moved.
-	  if (_M_begin())
-	    _M_buckets[_M_bucket_index(_M_begin())] = &_M_before_begin;
-	  __ht._M_reset();
-	}
-      else
-	{
-	  _M_assign(__ht,
-		    [this](__node_type* __n)
-		    {
-		      return this->_M_allocate_node(
-					std::move_if_noexcept(__n->_M_v()));
-		    });
-	  __ht.clear();
-	}
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    ~_Hashtable() noexcept
-    {
-      clear();
-      _M_deallocate_buckets();
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    swap(_Hashtable& __x)
-    noexcept(__node_alloc_traits::_S_nothrow_swap())
-    {
-      // The only base class with member variables is hash_code_base.
-      // We define _Hash_code_base::_M_swap because different
-      // specializations have different members.
-      this->_M_swap(__x);
-
-      std::__alloc_on_swap(this->_M_node_allocator(), __x._M_node_allocator());
-      std::swap(_M_rehash_policy, __x._M_rehash_policy);
-
-      // Deal properly with potentially moved instances.
-      if (this->_M_uses_single_bucket())
-	{
-	  if (!__x._M_uses_single_bucket())
-	    {
-	      _M_buckets = __x._M_buckets;
-	      __x._M_buckets = &__x._M_single_bucket;
-	    }
-	}
-      else if (__x._M_uses_single_bucket())
-	{
-	  __x._M_buckets = _M_buckets;
-	  _M_buckets = &_M_single_bucket;
-	}	
-      else
-	std::swap(_M_buckets, __x._M_buckets);
-
-      std::swap(_M_bucket_count, __x._M_bucket_count);
-      std::swap(_M_before_begin._M_nxt, __x._M_before_begin._M_nxt);
-      std::swap(_M_element_count, __x._M_element_count);
-      std::swap(_M_single_bucket, __x._M_single_bucket);
-
-      // Fix buckets containing the _M_before_begin pointers that can't be
-      // swapped.
-      if (_M_begin())
-	_M_buckets[_M_bucket_index(_M_begin())] = &_M_before_begin;
-
-      if (__x._M_begin())
-	__x._M_buckets[__x._M_bucket_index(__x._M_begin())]
-	  = &__x._M_before_begin;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    __rehash_policy(const _RehashPolicy& __pol)
-    {
-      auto __do_rehash =
-	__pol._M_need_rehash(_M_bucket_count, _M_element_count, 0);
-      if (__do_rehash.first)
-	_M_rehash(__do_rehash.second, _M_rehash_policy._M_state());
-      _M_rehash_policy = __pol;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    find(const key_type& __k)
-    -> iterator
-    {
-      __hash_code __code = this->_M_hash_code(__k);
-      std::size_t __n = _M_bucket_index(__k, __code);
-      __node_type* __p = _M_find_node(__n, __k, __code);
-      return __p ? iterator(__p) : end();
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    find(const key_type& __k) const
-    -> const_iterator
-    {
-      __hash_code __code = this->_M_hash_code(__k);
-      std::size_t __n = _M_bucket_index(__k, __code);
-      __node_type* __p = _M_find_node(__n, __k, __code);
-      return __p ? const_iterator(__p) : end();
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    count(const key_type& __k) const
-    -> size_type
-    {
-      __hash_code __code = this->_M_hash_code(__k);
-      std::size_t __n = _M_bucket_index(__k, __code);
-      __node_type* __p = _M_bucket_begin(__n);
-      if (!__p)
-	return 0;
-
-      std::size_t __result = 0;
-      for (;; __p = __p->_M_next())
-	{
-	  if (this->_M_equals(__k, __code, __p))
-	    ++__result;
-	  else if (__result)
-	    // All equivalent values are next to each other, if we
-	    // found a non-equivalent value after an equivalent one it
-	    // means that we won't find any new equivalent value.
-	    break;
-	  if (!__p->_M_nxt || _M_bucket_index(__p->_M_next()) != __n)
-	    break;
-	}
-      return __result;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    equal_range(const key_type& __k)
-    -> pair<iterator, iterator>
-    {
-      __hash_code __code = this->_M_hash_code(__k);
-      std::size_t __n = _M_bucket_index(__k, __code);
-      __node_type* __p = _M_find_node(__n, __k, __code);
-
-      if (__p)
-	{
-	  __node_type* __p1 = __p->_M_next();
-	  while (__p1 && _M_bucket_index(__p1) == __n
-		 && this->_M_equals(__k, __code, __p1))
-	    __p1 = __p1->_M_next();
-
-	  return std::make_pair(iterator(__p), iterator(__p1));
-	}
-      else
-	return std::make_pair(end(), end());
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    equal_range(const key_type& __k) const
-    -> pair<const_iterator, const_iterator>
-    {
-      __hash_code __code = this->_M_hash_code(__k);
-      std::size_t __n = _M_bucket_index(__k, __code);
-      __node_type* __p = _M_find_node(__n, __k, __code);
-
-      if (__p)
-	{
-	  __node_type* __p1 = __p->_M_next();
-	  while (__p1 && _M_bucket_index(__p1) == __n
-		 && this->_M_equals(__k, __code, __p1))
-	    __p1 = __p1->_M_next();
-
-	  return std::make_pair(const_iterator(__p), const_iterator(__p1));
-	}
-      else
-	return std::make_pair(end(), end());
-    }
-
-  // Find the node whose key compares equal to k in the bucket n.
-  // Return nullptr if no node is found.
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_find_before_node(size_type __n, const key_type& __k,
-			__hash_code __code) const
-    -> __node_base*
-    {
-      __node_base* __prev_p = _M_buckets[__n];
-      if (!__prev_p)
-	return nullptr;
-
-      for (__node_type* __p = static_cast<__node_type*>(__prev_p->_M_nxt);;
-	   __p = __p->_M_next())
-	{
-	  if (this->_M_equals(__k, __code, __p))
-	    return __prev_p;
-
-	  if (!__p->_M_nxt || _M_bucket_index(__p->_M_next()) != __n)
-	    break;
-	  __prev_p = __p;
-	}
-      return nullptr;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_insert_bucket_begin(size_type __bkt, __node_type* __node)
-    {
-      if (_M_buckets[__bkt])
-	{
-	  // Bucket is not empty, we just need to insert the new node
-	  // after the bucket before begin.
-	  __node->_M_nxt = _M_buckets[__bkt]->_M_nxt;
-	  _M_buckets[__bkt]->_M_nxt = __node;
-	}
-      else
-	{
-	  // The bucket is empty, the new node is inserted at the
-	  // beginning of the singly-linked list and the bucket will
-	  // contain _M_before_begin pointer.
-	  __node->_M_nxt = _M_before_begin._M_nxt;
-	  _M_before_begin._M_nxt = __node;
-	  if (__node->_M_nxt)
-	    // We must update former begin bucket that is pointing to
-	    // _M_before_begin.
-	    _M_buckets[_M_bucket_index(__node->_M_next())] = __node;
-	  _M_buckets[__bkt] = &_M_before_begin;
-	}
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_remove_bucket_begin(size_type __bkt, __node_type* __next,
-			   size_type __next_bkt)
-    {
-      if (!__next || __next_bkt != __bkt)
-	{
-	  // Bucket is now empty
-	  // First update next bucket if any
-	  if (__next)
-	    _M_buckets[__next_bkt] = _M_buckets[__bkt];
-
-	  // Second update before begin node if necessary
-	  if (&_M_before_begin == _M_buckets[__bkt])
-	    _M_before_begin._M_nxt = __next;
-	  _M_buckets[__bkt] = nullptr;
-	}
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_get_previous_node(size_type __bkt, __node_base* __n)
-    -> __node_base*
-    {
-      __node_base* __prev_n = _M_buckets[__bkt];
-      while (__prev_n->_M_nxt != __n)
-	__prev_n = __prev_n->_M_nxt;
-      return __prev_n;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    template<typename... _Args>
-      auto
-      _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-		 _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-      _M_emplace(std::true_type, _Args&&... __args)
-      -> pair<iterator, bool>
-      {
-	// First build the node to get access to the hash code
-	__node_type* __node = this->_M_allocate_node(std::forward<_Args>(__args)...);
-	const key_type& __k = this->_M_extract()(__node->_M_v());
-	__hash_code __code;
-	__try
-	  {
-	    __code = this->_M_hash_code(__k);
-	  }
-	__catch(...)
-	  {
-	    this->_M_deallocate_node(__node);
-	    __throw_exception_again;
-	  }
-
-	size_type __bkt = _M_bucket_index(__k, __code);
-	if (__node_type* __p = _M_find_node(__bkt, __k, __code))
-	  {
-	    // There is already an equivalent node, no insertion
-	    this->_M_deallocate_node(__node);
-	    return std::make_pair(iterator(__p), false);
-	  }
-
-	// Insert the node
-	return std::make_pair(_M_insert_unique_node(__bkt, __code, __node),
-			      true);
-      }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    template<typename... _Args>
-      auto
-      _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-		 _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-      _M_emplace(const_iterator __hint, std::false_type, _Args&&... __args)
-      -> iterator
-      {
-	// First build the node to get its hash code.
-	__node_type* __node =
-	  this->_M_allocate_node(std::forward<_Args>(__args)...);
-
-	__hash_code __code;
-	__try
-	  {
-	    __code = this->_M_hash_code(this->_M_extract()(__node->_M_v()));
-	  }
-	__catch(...)
-	  {
-	    this->_M_deallocate_node(__node);
-	    __throw_exception_again;
-	  }
-
-	return _M_insert_multi_node(__hint._M_cur, __code, __node);
-      }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_insert_unique_node(size_type __bkt, __hash_code __code,
-			  __node_type* __node)
-    -> iterator
-    {
-      const __rehash_state& __saved_state = _M_rehash_policy._M_state();
-      std::pair<bool, std::size_t> __do_rehash
-	= _M_rehash_policy._M_need_rehash(_M_bucket_count, _M_element_count, 1);
-
-      __try
-	{
-	  if (__do_rehash.first)
-	    {
-	      _M_rehash(__do_rehash.second, __saved_state);
-	      __bkt = _M_bucket_index(this->_M_extract()(__node->_M_v()), __code);
-	    }
-
-	  this->_M_store_code(__node, __code);
-
-	  // Always insert at the beginning of the bucket.
-	  _M_insert_bucket_begin(__bkt, __node);
-	  ++_M_element_count;
-	  return iterator(__node);
-	}
-      __catch(...)
-	{
-	  this->_M_deallocate_node(__node);
-	  __throw_exception_again;
-	}
-    }
-
-  // Insert node, in bucket bkt if no rehash (assumes no element with its key
-  // already present). Take ownership of the node, deallocate it on exception.
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_insert_multi_node(__node_type* __hint, __hash_code __code,
-			 __node_type* __node)
-    -> iterator
-    {
-      const __rehash_state& __saved_state = _M_rehash_policy._M_state();
-      std::pair<bool, std::size_t> __do_rehash
-	= _M_rehash_policy._M_need_rehash(_M_bucket_count, _M_element_count, 1);
-
-      __try
-	{
-	  if (__do_rehash.first)
-	    _M_rehash(__do_rehash.second, __saved_state);
-
-	  this->_M_store_code(__node, __code);
-	  const key_type& __k = this->_M_extract()(__node->_M_v());
-	  size_type __bkt = _M_bucket_index(__k, __code);
-
-	  // Find the node before an equivalent one or use hint if it exists and
-	  // if it is equivalent.
-	  __node_base* __prev
-	    = __builtin_expect(__hint != nullptr, false)
-	      && this->_M_equals(__k, __code, __hint)
-		? __hint
-		: _M_find_before_node(__bkt, __k, __code);
-	  if (__prev)
-	    {
-	      // Insert after the node before the equivalent one.
-	      __node->_M_nxt = __prev->_M_nxt;
-	      __prev->_M_nxt = __node;
-	      if (__builtin_expect(__prev == __hint, false))
-	      	// hint might be the last bucket node, in this case we need to
-	      	// update next bucket.
-	      	if (__node->_M_nxt
-	      	    && !this->_M_equals(__k, __code, __node->_M_next()))
-	      	  {
-	      	    size_type __next_bkt = _M_bucket_index(__node->_M_next());
-	      	    if (__next_bkt != __bkt)
-	      	      _M_buckets[__next_bkt] = __node;
-	      	  }
-	    }
-	  else
-	    // The inserted node has no equivalent in the
-	    // hashtable. We must insert the new node at the
-	    // beginning of the bucket to preserve equivalent
-	    // elements' relative positions.
-	    _M_insert_bucket_begin(__bkt, __node);
-	  ++_M_element_count;
-	  return iterator(__node);
-	}
-      __catch(...)
-	{
-	  this->_M_deallocate_node(__node);
-	  __throw_exception_again;
-	}
-    }
-
-  // Insert v if no element with its key is already present.
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    template<typename _Arg, typename _NodeGenerator>
-      auto
-      _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-		 _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-      _M_insert(_Arg&& __v, const _NodeGenerator& __node_gen, std::true_type)
-      -> pair<iterator, bool>
-      {
-	const key_type& __k = this->_M_extract()(__v);
-	__hash_code __code = this->_M_hash_code(__k);
-	size_type __bkt = _M_bucket_index(__k, __code);
-
-	__node_type* __n = _M_find_node(__bkt, __k, __code);
-	if (__n)
-	  return std::make_pair(iterator(__n), false);
-
-	__n = __node_gen(std::forward<_Arg>(__v));
-	return std::make_pair(_M_insert_unique_node(__bkt, __code, __n), true);
-      }
-
-  // Insert v unconditionally.
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    template<typename _Arg, typename _NodeGenerator>
-      auto
-      _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-		 _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-      _M_insert(const_iterator __hint, _Arg&& __v,
-		const _NodeGenerator& __node_gen, std::false_type)
-      -> iterator
-      {
-	// First compute the hash code so that we don't do anything if it
-	// throws.
-	__hash_code __code = this->_M_hash_code(this->_M_extract()(__v));
-
-	// Second allocate new node so that we don't rehash if it throws.
-	__node_type* __node = __node_gen(std::forward<_Arg>(__v));
-
-	return _M_insert_multi_node(__hint._M_cur, __code, __node);
-      }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    erase(const_iterator __it)
-    -> iterator
-    {
-      __node_type* __n = __it._M_cur;
-      std::size_t __bkt = _M_bucket_index(__n);
-
-      // Look for previous node to unlink it from the erased one, this
-      // is why we need buckets to contain the before begin to make
-      // this search fast.
-      __node_base* __prev_n = _M_get_previous_node(__bkt, __n);
-      return _M_erase(__bkt, __prev_n, __n);
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_erase(size_type __bkt, __node_base* __prev_n, __node_type* __n)
-    -> iterator
-    {
-      if (__prev_n == _M_buckets[__bkt])
-	_M_remove_bucket_begin(__bkt, __n->_M_next(),
-	   __n->_M_nxt ? _M_bucket_index(__n->_M_next()) : 0);
-      else if (__n->_M_nxt)
-	{
-	  size_type __next_bkt = _M_bucket_index(__n->_M_next());
-	  if (__next_bkt != __bkt)
-	    _M_buckets[__next_bkt] = __prev_n;
-	}
-
-      __prev_n->_M_nxt = __n->_M_nxt;
-      iterator __result(__n->_M_next());
-      this->_M_deallocate_node(__n);
-      --_M_element_count;
-
-      return __result;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_erase(std::true_type, const key_type& __k)
-    -> size_type
-    {
-      __hash_code __code = this->_M_hash_code(__k);
-      std::size_t __bkt = _M_bucket_index(__k, __code);
-
-      // Look for the node before the first matching node.
-      __node_base* __prev_n = _M_find_before_node(__bkt, __k, __code);
-      if (!__prev_n)
-	return 0;
-
-      // We found a matching node, erase it.
-      __node_type* __n = static_cast<__node_type*>(__prev_n->_M_nxt);
-      _M_erase(__bkt, __prev_n, __n);
-      return 1;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_erase(std::false_type, const key_type& __k)
-    -> size_type
-    {
-      __hash_code __code = this->_M_hash_code(__k);
-      std::size_t __bkt = _M_bucket_index(__k, __code);
-
-      // Look for the node before the first matching node.
-      __node_base* __prev_n = _M_find_before_node(__bkt, __k, __code);
-      if (!__prev_n)
-	return 0;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 526. Is it undefined if a function in the standard changes
-      // in parameters?
-      // We use one loop to find all matching nodes and another to deallocate
-      // them so that the key stays valid during the first loop. It might be
-      // invalidated indirectly when destroying nodes.
-      __node_type* __n = static_cast<__node_type*>(__prev_n->_M_nxt);
-      __node_type* __n_last = __n;
-      std::size_t __n_last_bkt = __bkt;
-      do
-	{
-	  __n_last = __n_last->_M_next();
-	  if (!__n_last)
-	    break;
-	  __n_last_bkt = _M_bucket_index(__n_last);
-	}
-      while (__n_last_bkt == __bkt && this->_M_equals(__k, __code, __n_last));
-
-      // Deallocate nodes.
-      size_type __result = 0;
-      do
-	{
-	  __node_type* __p = __n->_M_next();
-	  this->_M_deallocate_node(__n);
-	  __n = __p;
-	  ++__result;
-	  --_M_element_count;
-	}
-      while (__n != __n_last);
-
-      if (__prev_n == _M_buckets[__bkt])
-	_M_remove_bucket_begin(__bkt, __n_last, __n_last_bkt);
-      else if (__n_last && __n_last_bkt != __bkt)
-	_M_buckets[__n_last_bkt] = __prev_n;
-      __prev_n->_M_nxt = __n_last;
-      return __result;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    auto
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    erase(const_iterator __first, const_iterator __last)
-    -> iterator
-    {
-      __node_type* __n = __first._M_cur;
-      __node_type* __last_n = __last._M_cur;
-      if (__n == __last_n)
-	return iterator(__n);
-
-      std::size_t __bkt = _M_bucket_index(__n);
-
-      __node_base* __prev_n = _M_get_previous_node(__bkt, __n);
-      bool __is_bucket_begin = __n == _M_bucket_begin(__bkt);
-      std::size_t __n_bkt = __bkt;
-      for (;;)
-	{
-	  do
-	    {
-	      __node_type* __tmp = __n;
-	      __n = __n->_M_next();
-	      this->_M_deallocate_node(__tmp);
-	      --_M_element_count;
-	      if (!__n)
-		break;
-	      __n_bkt = _M_bucket_index(__n);
-	    }
-	  while (__n != __last_n && __n_bkt == __bkt);
-	  if (__is_bucket_begin)
-	    _M_remove_bucket_begin(__bkt, __n, __n_bkt);
-	  if (__n == __last_n)
-	    break;
-	  __is_bucket_begin = true;
-	  __bkt = __n_bkt;
-	}
-
-      if (__n && (__n_bkt != __bkt || __is_bucket_begin))
-	_M_buckets[__n_bkt] = __prev_n;
-      __prev_n->_M_nxt = __n;
-      return iterator(__n);
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    clear() noexcept
-    {
-      this->_M_deallocate_nodes(_M_begin());
-      __builtin_memset(_M_buckets, 0, _M_bucket_count * sizeof(__bucket_type));
-      _M_element_count = 0;
-      _M_before_begin._M_nxt = nullptr;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    rehash(size_type __n)
-    {
-      const __rehash_state& __saved_state = _M_rehash_policy._M_state();
-      std::size_t __buckets
-	= std::max(_M_rehash_policy._M_bkt_for_elements(_M_element_count + 1),
-		   __n);
-      __buckets = _M_rehash_policy._M_next_bkt(__buckets);
-
-      if (__buckets != _M_bucket_count)
-	_M_rehash(__buckets, __saved_state);
-      else
-	// No rehash, restore previous state to keep a consistent state.
-	_M_rehash_policy._M_reset(__saved_state);
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_rehash(size_type __n, const __rehash_state& __state)
-    {
-      __try
-	{
-	  _M_rehash_aux(__n, __unique_keys());
-	}
-      __catch(...)
-	{
-	  // A failure here means that buckets allocation failed.  We only
-	  // have to restore hash policy previous state.
-	  _M_rehash_policy._M_reset(__state);
-	  __throw_exception_again;
-	}
-    }
-
-  // Rehash when there is no equivalent elements.
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_rehash_aux(size_type __n, std::true_type)
-    {
-      __bucket_type* __new_buckets = _M_allocate_buckets(__n);
-      __node_type* __p = _M_begin();
-      _M_before_begin._M_nxt = nullptr;
-      std::size_t __bbegin_bkt = 0;
-      while (__p)
-	{
-	  __node_type* __next = __p->_M_next();
-	  std::size_t __bkt = __hash_code_base::_M_bucket_index(__p, __n);
-	  if (!__new_buckets[__bkt])
-	    {
-	      __p->_M_nxt = _M_before_begin._M_nxt;
-	      _M_before_begin._M_nxt = __p;
-	      __new_buckets[__bkt] = &_M_before_begin;
-	      if (__p->_M_nxt)
-		__new_buckets[__bbegin_bkt] = __p;
-	      __bbegin_bkt = __bkt;
-	    }
-	  else
-	    {
-	      __p->_M_nxt = __new_buckets[__bkt]->_M_nxt;
-	      __new_buckets[__bkt]->_M_nxt = __p;
-	    }
-	  __p = __next;
-	}
-
-      _M_deallocate_buckets();
-      _M_bucket_count = __n;
-      _M_buckets = __new_buckets;
-    }
-
-  // Rehash when there can be equivalent elements, preserve their relative
-  // order.
-  template<typename _Key, typename _Value,
-	   typename _Alloc, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   typename _Traits>
-    void
-    _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
-    _M_rehash_aux(size_type __n, std::false_type)
-    {
-      __bucket_type* __new_buckets = _M_allocate_buckets(__n);
-
-      __node_type* __p = _M_begin();
-      _M_before_begin._M_nxt = nullptr;
-      std::size_t __bbegin_bkt = 0;
-      std::size_t __prev_bkt = 0;
-      __node_type* __prev_p = nullptr;
-      bool __check_bucket = false;
-
-      while (__p)
-	{
-	  __node_type* __next = __p->_M_next();
-	  std::size_t __bkt = __hash_code_base::_M_bucket_index(__p, __n);
-
-	  if (__prev_p && __prev_bkt == __bkt)
-	    {
-	      // Previous insert was already in this bucket, we insert after
-	      // the previously inserted one to preserve equivalent elements
-	      // relative order.
-	      __p->_M_nxt = __prev_p->_M_nxt;
-	      __prev_p->_M_nxt = __p;
-
-	      // Inserting after a node in a bucket require to check that we
-	      // haven't change the bucket last node, in this case next
-	      // bucket containing its before begin node must be updated. We
-	      // schedule a check as soon as we move out of the sequence of
-	      // equivalent nodes to limit the number of checks.
-	      __check_bucket = true;
-	    }
-	  else
-	    {
-	      if (__check_bucket)
-		{
-		  // Check if we shall update the next bucket because of
-		  // insertions into __prev_bkt bucket.
-		  if (__prev_p->_M_nxt)
-		    {
-		      std::size_t __next_bkt
-			= __hash_code_base::_M_bucket_index(__prev_p->_M_next(),
-							    __n);
-		      if (__next_bkt != __prev_bkt)
-			__new_buckets[__next_bkt] = __prev_p;
-		    }
-		  __check_bucket = false;
-		}
-
-	      if (!__new_buckets[__bkt])
-		{
-		  __p->_M_nxt = _M_before_begin._M_nxt;
-		  _M_before_begin._M_nxt = __p;
-		  __new_buckets[__bkt] = &_M_before_begin;
-		  if (__p->_M_nxt)
-		    __new_buckets[__bbegin_bkt] = __p;
-		  __bbegin_bkt = __bkt;
-		}
-	      else
-		{
-		  __p->_M_nxt = __new_buckets[__bkt]->_M_nxt;
-		  __new_buckets[__bkt]->_M_nxt = __p;
-		}
-	    }
-	  __prev_p = __p;
-	  __prev_bkt = __bkt;
-	  __p = __next;
-	}
-
-      if (__check_bucket && __prev_p->_M_nxt)
-	{
-	  std::size_t __next_bkt
-	    = __hash_code_base::_M_bucket_index(__prev_p->_M_next(), __n);
-	  if (__next_bkt != __prev_bkt)
-	    __new_buckets[__next_bkt] = __prev_p;
-	}
-
-      _M_deallocate_buckets();
-      _M_bucket_count = __n;
-      _M_buckets = __new_buckets;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif // _HASHTABLE_H
diff --git a/openflow/usr/include/c++/5/bits/hashtable_policy.h b/openflow/usr/include/c++/5/bits/hashtable_policy.h
deleted file mode 100644
index 14bcca6..0000000
--- a/openflow/usr/include/c++/5/bits/hashtable_policy.h
+++ /dev/null
@@ -1,2018 +0,0 @@
-// Internal policy header for unordered_set and unordered_map -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/hashtable_policy.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly.
- *  @headername{unordered_map,unordered_set}
- */
-
-#ifndef _HASHTABLE_POLICY_H
-#define _HASHTABLE_POLICY_H 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    class _Hashtable;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @defgroup hashtable-detail Base and Implementation Classes
-   *  @ingroup unordered_associative_containers
-   *  @{
-   */
-  template<typename _Key, typename _Value,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _Traits>
-    struct _Hashtable_base;
-
-  // Helper function: return distance(first, last) for forward
-  // iterators, or 0 for input iterators.
-  template<class _Iterator>
-    inline typename std::iterator_traits<_Iterator>::difference_type
-    __distance_fw(_Iterator __first, _Iterator __last,
-		  std::input_iterator_tag)
-    { return 0; }
-
-  template<class _Iterator>
-    inline typename std::iterator_traits<_Iterator>::difference_type
-    __distance_fw(_Iterator __first, _Iterator __last,
-		  std::forward_iterator_tag)
-    { return std::distance(__first, __last); }
-
-  template<class _Iterator>
-    inline typename std::iterator_traits<_Iterator>::difference_type
-    __distance_fw(_Iterator __first, _Iterator __last)
-    {
-      typedef typename std::iterator_traits<_Iterator>::iterator_category _Tag;
-      return __distance_fw(__first, __last, _Tag());
-    }
-
-  // Helper type used to detect whether the hash functor is noexcept.
-  template <typename _Key, typename _Hash>
-    struct __is_noexcept_hash : std::__bool_constant<
-	noexcept(declval<const _Hash&>()(declval<const _Key&>()))>
-    { };
-
-  struct _Identity
-  {
-    template<typename _Tp>
-      _Tp&&
-      operator()(_Tp&& __x) const
-      { return std::forward<_Tp>(__x); }
-  };
-
-  struct _Select1st
-  {
-    template<typename _Tp>
-      auto
-      operator()(_Tp&& __x) const
-      -> decltype(std::get<0>(std::forward<_Tp>(__x)))
-      { return std::get<0>(std::forward<_Tp>(__x)); }
-  };
-
-  template<typename _NodeAlloc>
-    struct _Hashtable_alloc;
-
-  // Functor recycling a pool of nodes and using allocation once the pool is
-  // empty.
-  template<typename _NodeAlloc>
-    struct _ReuseOrAllocNode
-    {
-    private:
-      using __node_alloc_type = _NodeAlloc;
-      using __hashtable_alloc = _Hashtable_alloc<__node_alloc_type>;
-      using __value_alloc_type = typename __hashtable_alloc::__value_alloc_type;
-      using __value_alloc_traits =
-	typename __hashtable_alloc::__value_alloc_traits;
-      using __node_alloc_traits =
-	typename __hashtable_alloc::__node_alloc_traits;
-      using __node_type = typename __hashtable_alloc::__node_type;
-
-    public:
-      _ReuseOrAllocNode(__node_type* __nodes, __hashtable_alloc& __h)
-	: _M_nodes(__nodes), _M_h(__h) { }
-      _ReuseOrAllocNode(const _ReuseOrAllocNode&) = delete;
-
-      ~_ReuseOrAllocNode()
-      { _M_h._M_deallocate_nodes(_M_nodes); }
-
-      template<typename _Arg>
-	__node_type*
-	operator()(_Arg&& __arg) const
-	{
-	  if (_M_nodes)
-	    {
-	      __node_type* __node = _M_nodes;
-	      _M_nodes = _M_nodes->_M_next();
-	      __node->_M_nxt = nullptr;
-	      __value_alloc_type __a(_M_h._M_node_allocator());
-	      __value_alloc_traits::destroy(__a, __node->_M_valptr());
-	      __try
-		{
-		  __value_alloc_traits::construct(__a, __node->_M_valptr(),
-						  std::forward<_Arg>(__arg));
-		}
-	      __catch(...)
-		{
-		  __node->~__node_type();
-		  __node_alloc_traits::deallocate(_M_h._M_node_allocator(),
-						  __node, 1);
-		  __throw_exception_again;
-		}
-	      return __node;
-	    }
-	  return _M_h._M_allocate_node(std::forward<_Arg>(__arg));
-	}
-
-    private:
-      mutable __node_type* _M_nodes;
-      __hashtable_alloc& _M_h;
-    };
-
-  // Functor similar to the previous one but without any pool of nodes to
-  // recycle.
-  template<typename _NodeAlloc>
-    struct _AllocNode
-    {
-    private:
-      using __hashtable_alloc = _Hashtable_alloc<_NodeAlloc>;
-      using __node_type = typename __hashtable_alloc::__node_type;
-
-    public:
-      _AllocNode(__hashtable_alloc& __h)
-	: _M_h(__h) { }
-
-      template<typename _Arg>
-	__node_type*
-	operator()(_Arg&& __arg) const
-	{ return _M_h._M_allocate_node(std::forward<_Arg>(__arg)); }
-
-    private:
-      __hashtable_alloc& _M_h;
-    };
-
-  // Auxiliary types used for all instantiations of _Hashtable nodes
-  // and iterators.
-
-  /**
-   *  struct _Hashtable_traits
-   *
-   *  Important traits for hash tables.
-   *
-   *  @tparam _Cache_hash_code  Boolean value. True if the value of
-   *  the hash function is stored along with the value. This is a
-   *  time-space tradeoff.  Storing it may improve lookup speed by
-   *  reducing the number of times we need to call the _Equal
-   *  function.
-   *
-   *  @tparam _Constant_iterators  Boolean value. True if iterator and
-   *  const_iterator are both constant iterator types. This is true
-   *  for unordered_set and unordered_multiset, false for
-   *  unordered_map and unordered_multimap.
-   *
-   *  @tparam _Unique_keys  Boolean value. True if the return value
-   *  of _Hashtable::count(k) is always at most one, false if it may
-   *  be an arbitrary number. This is true for unordered_set and
-   *  unordered_map, false for unordered_multiset and
-   *  unordered_multimap.
-   */
-  template<bool _Cache_hash_code, bool _Constant_iterators, bool _Unique_keys>
-    struct _Hashtable_traits
-    {
-      using __hash_cached = __bool_constant<_Cache_hash_code>;
-      using __constant_iterators = __bool_constant<_Constant_iterators>;
-      using __unique_keys = __bool_constant<_Unique_keys>;
-    };
-
-  /**
-   *  struct _Hash_node_base
-   *
-   *  Nodes, used to wrap elements stored in the hash table.  A policy
-   *  template parameter of class template _Hashtable controls whether
-   *  nodes also store a hash code. In some cases (e.g. strings) this
-   *  may be a performance win.
-   */
-  struct _Hash_node_base
-  {
-    _Hash_node_base* _M_nxt;
-
-    _Hash_node_base() noexcept : _M_nxt() { }
-
-    _Hash_node_base(_Hash_node_base* __next) noexcept : _M_nxt(__next) { }
-  };
-
-  /**
-   *  struct _Hash_node_value_base
-   *
-   *  Node type with the value to store.
-   */
-  template<typename _Value>
-    struct _Hash_node_value_base : _Hash_node_base
-    {
-      typedef _Value value_type;
-
-      __gnu_cxx::__aligned_buffer<_Value> _M_storage;
-
-      _Value*
-      _M_valptr() noexcept
-      { return _M_storage._M_ptr(); }
-
-      const _Value*
-      _M_valptr() const noexcept
-      { return _M_storage._M_ptr(); }
-
-      _Value&
-      _M_v() noexcept
-      { return *_M_valptr(); }
-
-      const _Value&
-      _M_v() const noexcept
-      { return *_M_valptr(); }
-    };
-
-  /**
-   *  Primary template struct _Hash_node.
-   */
-  template<typename _Value, bool _Cache_hash_code>
-    struct _Hash_node;
-
-  /**
-   *  Specialization for nodes with caches, struct _Hash_node.
-   *
-   *  Base class is __detail::_Hash_node_value_base.
-   */
-  template<typename _Value>
-    struct _Hash_node<_Value, true> : _Hash_node_value_base<_Value>
-    {
-      std::size_t  _M_hash_code;
-
-      _Hash_node*
-      _M_next() const noexcept
-      { return static_cast<_Hash_node*>(this->_M_nxt); }
-    };
-
-  /**
-   *  Specialization for nodes without caches, struct _Hash_node.
-   *
-   *  Base class is __detail::_Hash_node_value_base.
-   */
-  template<typename _Value>
-    struct _Hash_node<_Value, false> : _Hash_node_value_base<_Value>
-    {
-      _Hash_node*
-      _M_next() const noexcept
-      { return static_cast<_Hash_node*>(this->_M_nxt); }
-    };
-
-  /// Base class for node iterators.
-  template<typename _Value, bool _Cache_hash_code>
-    struct _Node_iterator_base
-    {
-      using __node_type = _Hash_node<_Value, _Cache_hash_code>;
-
-      __node_type*  _M_cur;
-
-      _Node_iterator_base(__node_type* __p) noexcept
-      : _M_cur(__p) { }
-
-      void
-      _M_incr() noexcept
-      { _M_cur = _M_cur->_M_next(); }
-    };
-
-  template<typename _Value, bool _Cache_hash_code>
-    inline bool
-    operator==(const _Node_iterator_base<_Value, _Cache_hash_code>& __x,
-	       const _Node_iterator_base<_Value, _Cache_hash_code >& __y)
-    noexcept
-    { return __x._M_cur == __y._M_cur; }
-
-  template<typename _Value, bool _Cache_hash_code>
-    inline bool
-    operator!=(const _Node_iterator_base<_Value, _Cache_hash_code>& __x,
-	       const _Node_iterator_base<_Value, _Cache_hash_code>& __y)
-    noexcept
-    { return __x._M_cur != __y._M_cur; }
-
-  /// Node iterators, used to iterate through all the hashtable.
-  template<typename _Value, bool __constant_iterators, bool __cache>
-    struct _Node_iterator
-    : public _Node_iterator_base<_Value, __cache>
-    {
-    private:
-      using __base_type = _Node_iterator_base<_Value, __cache>;
-      using __node_type = typename __base_type::__node_type;
-
-    public:
-      typedef _Value					value_type;
-      typedef std::ptrdiff_t				difference_type;
-      typedef std::forward_iterator_tag			iterator_category;
-
-      using pointer = typename std::conditional<__constant_iterators,
-						const _Value*, _Value*>::type;
-
-      using reference = typename std::conditional<__constant_iterators,
-						  const _Value&, _Value&>::type;
-
-      _Node_iterator() noexcept
-      : __base_type(0) { }
-
-      explicit
-      _Node_iterator(__node_type* __p) noexcept
-      : __base_type(__p) { }
-
-      reference
-      operator*() const noexcept
-      { return this->_M_cur->_M_v(); }
-
-      pointer
-      operator->() const noexcept
-      { return this->_M_cur->_M_valptr(); }
-
-      _Node_iterator&
-      operator++() noexcept
-      {
-	this->_M_incr();
-	return *this;
-      }
-
-      _Node_iterator
-      operator++(int) noexcept
-      {
-	_Node_iterator __tmp(*this);
-	this->_M_incr();
-	return __tmp;
-      }
-    };
-
-  /// Node const_iterators, used to iterate through all the hashtable.
-  template<typename _Value, bool __constant_iterators, bool __cache>
-    struct _Node_const_iterator
-    : public _Node_iterator_base<_Value, __cache>
-    {
-    private:
-      using __base_type = _Node_iterator_base<_Value, __cache>;
-      using __node_type = typename __base_type::__node_type;
-
-    public:
-      typedef _Value					value_type;
-      typedef std::ptrdiff_t				difference_type;
-      typedef std::forward_iterator_tag			iterator_category;
-
-      typedef const _Value*				pointer;
-      typedef const _Value&				reference;
-
-      _Node_const_iterator() noexcept
-      : __base_type(0) { }
-
-      explicit
-      _Node_const_iterator(__node_type* __p) noexcept
-      : __base_type(__p) { }
-
-      _Node_const_iterator(const _Node_iterator<_Value, __constant_iterators,
-			   __cache>& __x) noexcept
-      : __base_type(__x._M_cur) { }
-
-      reference
-      operator*() const noexcept
-      { return this->_M_cur->_M_v(); }
-
-      pointer
-      operator->() const noexcept
-      { return this->_M_cur->_M_valptr(); }
-
-      _Node_const_iterator&
-      operator++() noexcept
-      {
-	this->_M_incr();
-	return *this;
-      }
-
-      _Node_const_iterator
-      operator++(int) noexcept
-      {
-	_Node_const_iterator __tmp(*this);
-	this->_M_incr();
-	return __tmp;
-      }
-    };
-
-  // Many of class template _Hashtable's template parameters are policy
-  // classes.  These are defaults for the policies.
-
-  /// Default range hashing function: use division to fold a large number
-  /// into the range [0, N).
-  struct _Mod_range_hashing
-  {
-    typedef std::size_t first_argument_type;
-    typedef std::size_t second_argument_type;
-    typedef std::size_t result_type;
-
-    result_type
-    operator()(first_argument_type __num,
-	       second_argument_type __den) const noexcept
-    { return __num % __den; }
-  };
-
-  /// Default ranged hash function H.  In principle it should be a
-  /// function object composed from objects of type H1 and H2 such that
-  /// h(k, N) = h2(h1(k), N), but that would mean making extra copies of
-  /// h1 and h2.  So instead we'll just use a tag to tell class template
-  /// hashtable to do that composition.
-  struct _Default_ranged_hash { };
-
-  /// Default value for rehash policy.  Bucket size is (usually) the
-  /// smallest prime that keeps the load factor small enough.
-  struct _Prime_rehash_policy
-  {
-    _Prime_rehash_policy(float __z = 1.0) noexcept
-    : _M_max_load_factor(__z), _M_next_resize(0) { }
-
-    float
-    max_load_factor() const noexcept
-    { return _M_max_load_factor; }
-
-    // Return a bucket size no smaller than n.
-    std::size_t
-    _M_next_bkt(std::size_t __n) const;
-
-    // Return a bucket count appropriate for n elements
-    std::size_t
-    _M_bkt_for_elements(std::size_t __n) const
-    { return __builtin_ceil(__n / (long double)_M_max_load_factor); }
-
-    // __n_bkt is current bucket count, __n_elt is current element count,
-    // and __n_ins is number of elements to be inserted.  Do we need to
-    // increase bucket count?  If so, return make_pair(true, n), where n
-    // is the new bucket count.  If not, return make_pair(false, 0).
-    std::pair<bool, std::size_t>
-    _M_need_rehash(std::size_t __n_bkt, std::size_t __n_elt,
-		   std::size_t __n_ins) const;
-
-    typedef std::size_t _State;
-
-    _State
-    _M_state() const
-    { return _M_next_resize; }
-
-    void
-    _M_reset() noexcept
-    { _M_next_resize = 0; }
-
-    void
-    _M_reset(_State __state)
-    { _M_next_resize = __state; }
-
-    enum { _S_n_primes = sizeof(unsigned long) != 8 ? 256 : 256 + 48 };
-
-    static const std::size_t _S_growth_factor = 2;
-
-    float		_M_max_load_factor;
-    mutable std::size_t	_M_next_resize;
-  };
-
-  // Base classes for std::_Hashtable.  We define these base classes
-  // because in some cases we want to do different things depending on
-  // the value of a policy class.  In some cases the policy class
-  // affects which member functions and nested typedefs are defined;
-  // we handle that by specializing base class templates.  Several of
-  // the base class templates need to access other members of class
-  // template _Hashtable, so we use a variant of the "Curiously
-  // Recurring Template Pattern" (CRTP) technique.
-
-  /**
-   *  Primary class template _Map_base.
-   *
-   *  If the hashtable has a value type of the form pair<T1, T2> and a
-   *  key extraction policy (_ExtractKey) that returns the first part
-   *  of the pair, the hashtable gets a mapped_type typedef.  If it
-   *  satisfies those criteria and also has unique keys, then it also
-   *  gets an operator[].
-   */
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits,
-	   bool _Unique_keys = _Traits::__unique_keys::value>
-    struct _Map_base { };
-
-  /// Partial specialization, __unique_keys set to false.
-  template<typename _Key, typename _Pair, typename _Alloc, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    struct _Map_base<_Key, _Pair, _Alloc, _Select1st, _Equal,
-		     _H1, _H2, _Hash, _RehashPolicy, _Traits, false>
-    {
-      using mapped_type = typename std::tuple_element<1, _Pair>::type;
-    };
-
-  /// Partial specialization, __unique_keys set to true.
-  template<typename _Key, typename _Pair, typename _Alloc, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    struct _Map_base<_Key, _Pair, _Alloc, _Select1st, _Equal,
-		     _H1, _H2, _Hash, _RehashPolicy, _Traits, true>
-    {
-    private:
-      using __hashtable_base = __detail::_Hashtable_base<_Key, _Pair,
-							 _Select1st,
-							_Equal, _H1, _H2, _Hash,
-							  _Traits>;
-
-      using __hashtable = _Hashtable<_Key, _Pair, _Alloc,
-				     _Select1st, _Equal,
-				     _H1, _H2, _Hash, _RehashPolicy, _Traits>;
-
-      using __hash_code = typename __hashtable_base::__hash_code;
-      using __node_type = typename __hashtable_base::__node_type;
-
-    public:
-      using key_type = typename __hashtable_base::key_type;
-      using iterator = typename __hashtable_base::iterator;
-      using mapped_type = typename std::tuple_element<1, _Pair>::type;
-
-      mapped_type&
-      operator[](const key_type& __k);
-
-      mapped_type&
-      operator[](key_type&& __k);
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 761. unordered_map needs an at() member function.
-      mapped_type&
-      at(const key_type& __k);
-
-      const mapped_type&
-      at(const key_type& __k) const;
-    };
-
-  template<typename _Key, typename _Pair, typename _Alloc, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    auto
-    _Map_base<_Key, _Pair, _Alloc, _Select1st, _Equal,
-	      _H1, _H2, _Hash, _RehashPolicy, _Traits, true>::
-    operator[](const key_type& __k)
-    -> mapped_type&
-    {
-      __hashtable* __h = static_cast<__hashtable*>(this);
-      __hash_code __code = __h->_M_hash_code(__k);
-      std::size_t __n = __h->_M_bucket_index(__k, __code);
-      __node_type* __p = __h->_M_find_node(__n, __k, __code);
-
-      if (!__p)
-	{
-	  __p = __h->_M_allocate_node(std::piecewise_construct,
-				      std::tuple<const key_type&>(__k),
-				      std::tuple<>());
-	  return __h->_M_insert_unique_node(__n, __code, __p)->second;
-	}
-
-      return __p->_M_v().second;
-    }
-
-  template<typename _Key, typename _Pair, typename _Alloc, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    auto
-    _Map_base<_Key, _Pair, _Alloc, _Select1st, _Equal,
-	      _H1, _H2, _Hash, _RehashPolicy, _Traits, true>::
-    operator[](key_type&& __k)
-    -> mapped_type&
-    {
-      __hashtable* __h = static_cast<__hashtable*>(this);
-      __hash_code __code = __h->_M_hash_code(__k);
-      std::size_t __n = __h->_M_bucket_index(__k, __code);
-      __node_type* __p = __h->_M_find_node(__n, __k, __code);
-
-      if (!__p)
-	{
-	  __p = __h->_M_allocate_node(std::piecewise_construct,
-				      std::forward_as_tuple(std::move(__k)),
-				      std::tuple<>());
-	  return __h->_M_insert_unique_node(__n, __code, __p)->second;
-	}
-
-      return __p->_M_v().second;
-    }
-
-  template<typename _Key, typename _Pair, typename _Alloc, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    auto
-    _Map_base<_Key, _Pair, _Alloc, _Select1st, _Equal,
-	      _H1, _H2, _Hash, _RehashPolicy, _Traits, true>::
-    at(const key_type& __k)
-    -> mapped_type&
-    {
-      __hashtable* __h = static_cast<__hashtable*>(this);
-      __hash_code __code = __h->_M_hash_code(__k);
-      std::size_t __n = __h->_M_bucket_index(__k, __code);
-      __node_type* __p = __h->_M_find_node(__n, __k, __code);
-
-      if (!__p)
-	__throw_out_of_range(__N("_Map_base::at"));
-      return __p->_M_v().second;
-    }
-
-  template<typename _Key, typename _Pair, typename _Alloc, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    auto
-    _Map_base<_Key, _Pair, _Alloc, _Select1st, _Equal,
-	      _H1, _H2, _Hash, _RehashPolicy, _Traits, true>::
-    at(const key_type& __k) const
-    -> const mapped_type&
-    {
-      const __hashtable* __h = static_cast<const __hashtable*>(this);
-      __hash_code __code = __h->_M_hash_code(__k);
-      std::size_t __n = __h->_M_bucket_index(__k, __code);
-      __node_type* __p = __h->_M_find_node(__n, __k, __code);
-
-      if (!__p)
-	__throw_out_of_range(__N("_Map_base::at"));
-      return __p->_M_v().second;
-    }
-
-  /**
-   *  Primary class template _Insert_base.
-   *
-   *  insert member functions appropriate to all _Hashtables.
-   */
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    struct _Insert_base
-    {
-    protected:
-      using __hashtable = _Hashtable<_Key, _Value, _Alloc, _ExtractKey,
-				     _Equal, _H1, _H2, _Hash,
-				     _RehashPolicy, _Traits>;
-
-      using __hashtable_base = _Hashtable_base<_Key, _Value, _ExtractKey,
-					       _Equal, _H1, _H2, _Hash,
-					       _Traits>;
-
-      using value_type = typename __hashtable_base::value_type;
-      using iterator = typename __hashtable_base::iterator;
-      using const_iterator =  typename __hashtable_base::const_iterator;
-      using size_type = typename __hashtable_base::size_type;
-
-      using __unique_keys = typename __hashtable_base::__unique_keys;
-      using __ireturn_type = typename __hashtable_base::__ireturn_type;
-      using __node_type = _Hash_node<_Value, _Traits::__hash_cached::value>;
-      using __node_alloc_type = __alloc_rebind<_Alloc, __node_type>;
-      using __node_gen_type = _AllocNode<__node_alloc_type>;
-
-      __hashtable&
-      _M_conjure_hashtable()
-      { return *(static_cast<__hashtable*>(this)); }
-
-      template<typename _InputIterator, typename _NodeGetter>
-	void
-	_M_insert_range(_InputIterator __first, _InputIterator __last,
-			const _NodeGetter&);
-
-    public:
-      __ireturn_type
-      insert(const value_type& __v)
-      {
-	__hashtable& __h = _M_conjure_hashtable();
-	__node_gen_type __node_gen(__h);
-	return __h._M_insert(__v, __node_gen, __unique_keys());
-      }
-
-      iterator
-      insert(const_iterator __hint, const value_type& __v)
-      {
-	__hashtable& __h = _M_conjure_hashtable();
-	__node_gen_type __node_gen(__h);	
-	return __h._M_insert(__hint, __v, __node_gen, __unique_keys());
-      }
-
-      void
-      insert(initializer_list<value_type> __l)
-      { this->insert(__l.begin(), __l.end()); }
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  __hashtable& __h = _M_conjure_hashtable();
-	  __node_gen_type __node_gen(__h);
-	  return _M_insert_range(__first, __last, __node_gen);
-	}
-    };
-
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    template<typename _InputIterator, typename _NodeGetter>
-      void
-      _Insert_base<_Key, _Value, _Alloc, _ExtractKey, _Equal, _H1, _H2, _Hash,
-		    _RehashPolicy, _Traits>::
-      _M_insert_range(_InputIterator __first, _InputIterator __last,
-		      const _NodeGetter& __node_gen)
-      {
-	using __rehash_type = typename __hashtable::__rehash_type;
-	using __rehash_state = typename __hashtable::__rehash_state;
-	using pair_type = std::pair<bool, std::size_t>;
-
-	size_type __n_elt = __detail::__distance_fw(__first, __last);
-
-	__hashtable& __h = _M_conjure_hashtable();
-	__rehash_type& __rehash = __h._M_rehash_policy;
-	const __rehash_state& __saved_state = __rehash._M_state();
-	pair_type __do_rehash = __rehash._M_need_rehash(__h._M_bucket_count,
-							__h._M_element_count,
-							__n_elt);
-
-	if (__do_rehash.first)
-	  __h._M_rehash(__do_rehash.second, __saved_state);
-
-	for (; __first != __last; ++__first)
-	  __h._M_insert(*__first, __node_gen, __unique_keys());
-      }
-
-  /**
-   *  Primary class template _Insert.
-   *
-   *  Select insert member functions appropriate to _Hashtable policy choices.
-   */
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits,
-	   bool _Constant_iterators = _Traits::__constant_iterators::value,
-	   bool _Unique_keys = _Traits::__unique_keys::value>
-    struct _Insert;
-
-  /// Specialization.
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    struct _Insert<_Key, _Value, _Alloc, _ExtractKey, _Equal, _H1, _H2, _Hash,
-		   _RehashPolicy, _Traits, true, true>
-    : public _Insert_base<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-			   _H1, _H2, _Hash, _RehashPolicy, _Traits>
-    {
-      using __base_type = _Insert_base<_Key, _Value, _Alloc, _ExtractKey,
-					_Equal, _H1, _H2, _Hash,
-					_RehashPolicy, _Traits>;
-      using value_type = typename __base_type::value_type;
-      using iterator = typename __base_type::iterator;
-      using const_iterator =  typename __base_type::const_iterator;
-
-      using __unique_keys = typename __base_type::__unique_keys;
-      using __hashtable = typename __base_type::__hashtable;
-      using __node_gen_type = typename __base_type::__node_gen_type;
-
-      using __base_type::insert;
-
-      std::pair<iterator, bool>
-      insert(value_type&& __v)
-      {
-	__hashtable& __h = this->_M_conjure_hashtable();
-	__node_gen_type __node_gen(__h);
-	return __h._M_insert(std::move(__v), __node_gen, __unique_keys());
-      }
-
-      iterator
-      insert(const_iterator __hint, value_type&& __v)
-      {
-	__hashtable& __h = this->_M_conjure_hashtable();
-	__node_gen_type __node_gen(__h);
-	return __h._M_insert(__hint, std::move(__v), __node_gen,
-			     __unique_keys());
-      }
-    };
-
-  /// Specialization.
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    struct _Insert<_Key, _Value, _Alloc, _ExtractKey, _Equal, _H1, _H2, _Hash,
-		   _RehashPolicy, _Traits, true, false>
-    : public _Insert_base<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-			   _H1, _H2, _Hash, _RehashPolicy, _Traits>
-    {
-      using __base_type = _Insert_base<_Key, _Value, _Alloc, _ExtractKey,
-					_Equal, _H1, _H2, _Hash,
-					_RehashPolicy, _Traits>;
-      using value_type = typename __base_type::value_type;
-      using iterator = typename __base_type::iterator;
-      using const_iterator =  typename __base_type::const_iterator;
-
-      using __unique_keys = typename __base_type::__unique_keys;
-      using __hashtable = typename __base_type::__hashtable;
-      using __node_gen_type = typename __base_type::__node_gen_type;
-
-      using __base_type::insert;
-
-      iterator
-      insert(value_type&& __v)
-      {
-	__hashtable& __h = this->_M_conjure_hashtable();
-	__node_gen_type __node_gen(__h);
-	return __h._M_insert(std::move(__v), __node_gen, __unique_keys());
-      }
-
-      iterator
-      insert(const_iterator __hint, value_type&& __v)
-      {
-	__hashtable& __h = this->_M_conjure_hashtable();
-	__node_gen_type __node_gen(__h);
-	return __h._M_insert(__hint, std::move(__v), __node_gen,
-			     __unique_keys());
-      }
-    };
-
-  /// Specialization.
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits, bool _Unique_keys>
-    struct _Insert<_Key, _Value, _Alloc, _ExtractKey, _Equal, _H1, _H2, _Hash,
-		   _RehashPolicy, _Traits, false, _Unique_keys>
-    : public _Insert_base<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-			   _H1, _H2, _Hash, _RehashPolicy, _Traits>
-    {
-      using __base_type = _Insert_base<_Key, _Value, _Alloc, _ExtractKey,
-				       _Equal, _H1, _H2, _Hash,
-				       _RehashPolicy, _Traits>;
-      using value_type = typename __base_type::value_type;
-      using iterator = typename __base_type::iterator;
-      using const_iterator =  typename __base_type::const_iterator;
-
-      using __unique_keys = typename __base_type::__unique_keys;
-      using __hashtable = typename __base_type::__hashtable;
-      using __ireturn_type = typename __base_type::__ireturn_type;
-
-      using __base_type::insert;
-
-      template<typename _Pair>
-	using __is_cons = std::is_constructible<value_type, _Pair&&>;
-
-      template<typename _Pair>
-	using _IFcons = std::enable_if<__is_cons<_Pair>::value>;
-
-      template<typename _Pair>
-	using _IFconsp = typename _IFcons<_Pair>::type;
-
-      template<typename _Pair, typename = _IFconsp<_Pair>>
-	__ireturn_type
-	insert(_Pair&& __v)
-	{
-	  __hashtable& __h = this->_M_conjure_hashtable();
-	  return __h._M_emplace(__unique_keys(), std::forward<_Pair>(__v));
-	}
-
-      template<typename _Pair, typename = _IFconsp<_Pair>>
-	iterator
-	insert(const_iterator __hint, _Pair&& __v)
-	{
-	  __hashtable& __h = this->_M_conjure_hashtable();
-	  return __h._M_emplace(__hint, __unique_keys(),
-				std::forward<_Pair>(__v));
-	}
-   };
-
-  /**
-   *  Primary class template  _Rehash_base.
-   *
-   *  Give hashtable the max_load_factor functions and reserve iff the
-   *  rehash policy is _Prime_rehash_policy.
-  */
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    struct _Rehash_base;
-
-  /// Specialization.
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _Traits>
-    struct _Rehash_base<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _Prime_rehash_policy, _Traits>
-    {
-      using __hashtable = _Hashtable<_Key, _Value, _Alloc, _ExtractKey,
-				     _Equal, _H1, _H2, _Hash,
-				     _Prime_rehash_policy, _Traits>;
-
-      float
-      max_load_factor() const noexcept
-      {
-	const __hashtable* __this = static_cast<const __hashtable*>(this);
-	return __this->__rehash_policy().max_load_factor();
-      }
-
-      void
-      max_load_factor(float __z)
-      {
-	__hashtable* __this = static_cast<__hashtable*>(this);
-	__this->__rehash_policy(_Prime_rehash_policy(__z));
-      }
-
-      void
-      reserve(std::size_t __n)
-      {
-	__hashtable* __this = static_cast<__hashtable*>(this);
-	__this->rehash(__builtin_ceil(__n / max_load_factor()));
-      }
-    };
-
-  /**
-   *  Primary class template _Hashtable_ebo_helper.
-   *
-   *  Helper class using EBO when it is not forbidden (the type is not
-   *  final) and when it is worth it (the type is empty.)
-   */
-  template<int _Nm, typename _Tp,
-	   bool __use_ebo = !__is_final(_Tp) && __is_empty(_Tp)>
-    struct _Hashtable_ebo_helper;
-
-  /// Specialization using EBO.
-  template<int _Nm, typename _Tp>
-    struct _Hashtable_ebo_helper<_Nm, _Tp, true>
-    : private _Tp
-    {
-      _Hashtable_ebo_helper() = default;
-
-      template<typename _OtherTp>
-	_Hashtable_ebo_helper(_OtherTp&& __tp)
-	  : _Tp(std::forward<_OtherTp>(__tp))
-	{ }
-
-      static const _Tp&
-      _S_cget(const _Hashtable_ebo_helper& __eboh)
-      { return static_cast<const _Tp&>(__eboh); }
-
-      static _Tp&
-      _S_get(_Hashtable_ebo_helper& __eboh)
-      { return static_cast<_Tp&>(__eboh); }
-    };
-
-  /// Specialization not using EBO.
-  template<int _Nm, typename _Tp>
-    struct _Hashtable_ebo_helper<_Nm, _Tp, false>
-    {
-      _Hashtable_ebo_helper() = default;
-
-      template<typename _OtherTp>
-	_Hashtable_ebo_helper(_OtherTp&& __tp)
-	  : _M_tp(std::forward<_OtherTp>(__tp))
-	{ }
-
-      static const _Tp&
-      _S_cget(const _Hashtable_ebo_helper& __eboh)
-      { return __eboh._M_tp; }
-
-      static _Tp&
-      _S_get(_Hashtable_ebo_helper& __eboh)
-      { return __eboh._M_tp; }
-
-    private:
-      _Tp _M_tp;
-    };
-
-  /**
-   *  Primary class template _Local_iterator_base.
-   *
-   *  Base class for local iterators, used to iterate within a bucket
-   *  but not between buckets.
-   */
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash,
-	   bool __cache_hash_code>
-    struct _Local_iterator_base;
-
-  /**
-   *  Primary class template _Hash_code_base.
-   *
-   *  Encapsulates two policy issues that aren't quite orthogonal.
-   *   (1) the difference between using a ranged hash function and using
-   *       the combination of a hash function and a range-hashing function.
-   *       In the former case we don't have such things as hash codes, so
-   *       we have a dummy type as placeholder.
-   *   (2) Whether or not we cache hash codes.  Caching hash codes is
-   *       meaningless if we have a ranged hash function.
-   *
-   *  We also put the key extraction objects here, for convenience.
-   *  Each specialization derives from one or more of the template
-   *  parameters to benefit from Ebo. This is important as this type
-   *  is inherited in some cases by the _Local_iterator_base type used
-   *  to implement local_iterator and const_local_iterator. As with
-   *  any iterator type we prefer to make it as small as possible.
-   *
-   *  Primary template is unused except as a hook for specializations.
-   */
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash,
-	   bool __cache_hash_code>
-    struct _Hash_code_base;
-
-  /// Specialization: ranged hash function, no caching hash codes.  H1
-  /// and H2 are provided but ignored.  We define a dummy hash code type.
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash>
-    struct _Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2, _Hash, false>
-    : private _Hashtable_ebo_helper<0, _ExtractKey>,
-      private _Hashtable_ebo_helper<1, _Hash>
-    {
-    private:
-      using __ebo_extract_key = _Hashtable_ebo_helper<0, _ExtractKey>;
-      using __ebo_hash = _Hashtable_ebo_helper<1, _Hash>;
-
-    protected:
-      typedef void* 					__hash_code;
-      typedef _Hash_node<_Value, false>			__node_type;
-
-      // We need the default constructor for the local iterators and _Hashtable
-      // default constructor.
-      _Hash_code_base() = default;
-
-      _Hash_code_base(const _ExtractKey& __ex, const _H1&, const _H2&,
-		      const _Hash& __h)
-      : __ebo_extract_key(__ex), __ebo_hash(__h) { }
-
-      __hash_code
-      _M_hash_code(const _Key& __key) const
-      { return 0; }
-
-      std::size_t
-      _M_bucket_index(const _Key& __k, __hash_code, std::size_t __n) const
-      { return _M_ranged_hash()(__k, __n); }
-
-      std::size_t
-      _M_bucket_index(const __node_type* __p, std::size_t __n) const
-	noexcept( noexcept(declval<const _Hash&>()(declval<const _Key&>(),
-						   (std::size_t)0)) )
-      { return _M_ranged_hash()(_M_extract()(__p->_M_v()), __n); }
-
-      void
-      _M_store_code(__node_type*, __hash_code) const
-      { }
-
-      void
-      _M_copy_code(__node_type*, const __node_type*) const
-      { }
-
-      void
-      _M_swap(_Hash_code_base& __x)
-      {
-	std::swap(_M_extract(), __x._M_extract());
-	std::swap(_M_ranged_hash(), __x._M_ranged_hash());
-      }
-
-      const _ExtractKey&
-      _M_extract() const { return __ebo_extract_key::_S_cget(*this); }
-
-      _ExtractKey&
-      _M_extract() { return __ebo_extract_key::_S_get(*this); }
-
-      const _Hash&
-      _M_ranged_hash() const { return __ebo_hash::_S_cget(*this); }
-
-      _Hash&
-      _M_ranged_hash() { return __ebo_hash::_S_get(*this); }
-    };
-
-  // No specialization for ranged hash function while caching hash codes.
-  // That combination is meaningless, and trying to do it is an error.
-
-  /// Specialization: ranged hash function, cache hash codes.  This
-  /// combination is meaningless, so we provide only a declaration
-  /// and no definition.
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash>
-    struct _Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2, _Hash, true>;
-
-  /// Specialization: hash function and range-hashing function, no
-  /// caching of hash codes.
-  /// Provides typedef and accessor required by C++ 11.
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2>
-    struct _Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2,
-			   _Default_ranged_hash, false>
-    : private _Hashtable_ebo_helper<0, _ExtractKey>,
-      private _Hashtable_ebo_helper<1, _H1>,
-      private _Hashtable_ebo_helper<2, _H2>
-    {
-    private:
-      using __ebo_extract_key = _Hashtable_ebo_helper<0, _ExtractKey>;
-      using __ebo_h1 = _Hashtable_ebo_helper<1, _H1>;
-      using __ebo_h2 = _Hashtable_ebo_helper<2, _H2>;
-
-      // Gives the local iterator implementation access to _M_bucket_index().
-      friend struct _Local_iterator_base<_Key, _Value, _ExtractKey, _H1, _H2,
-					 _Default_ranged_hash, false>;
-
-    public:
-      typedef _H1 					hasher;
-
-      hasher
-      hash_function() const
-      { return _M_h1(); }
-
-    protected:
-      typedef std::size_t 				__hash_code;
-      typedef _Hash_node<_Value, false>			__node_type;
-
-      // We need the default constructor for the local iterators and _Hashtable
-      // default constructor.
-      _Hash_code_base() = default;
-
-      _Hash_code_base(const _ExtractKey& __ex,
-		      const _H1& __h1, const _H2& __h2,
-		      const _Default_ranged_hash&)
-      : __ebo_extract_key(__ex), __ebo_h1(__h1), __ebo_h2(__h2) { }
-
-      __hash_code
-      _M_hash_code(const _Key& __k) const
-      { return _M_h1()(__k); }
-
-      std::size_t
-      _M_bucket_index(const _Key&, __hash_code __c, std::size_t __n) const
-      { return _M_h2()(__c, __n); }
-
-      std::size_t
-      _M_bucket_index(const __node_type* __p, std::size_t __n) const
-	noexcept( noexcept(declval<const _H1&>()(declval<const _Key&>()))
-		  && noexcept(declval<const _H2&>()((__hash_code)0,
-						    (std::size_t)0)) )
-      { return _M_h2()(_M_h1()(_M_extract()(__p->_M_v())), __n); }
-
-      void
-      _M_store_code(__node_type*, __hash_code) const
-      { }
-
-      void
-      _M_copy_code(__node_type*, const __node_type*) const
-      { }
-
-      void
-      _M_swap(_Hash_code_base& __x)
-      {
-	std::swap(_M_extract(), __x._M_extract());
-	std::swap(_M_h1(), __x._M_h1());
-	std::swap(_M_h2(), __x._M_h2());
-      }
-
-      const _ExtractKey&
-      _M_extract() const { return __ebo_extract_key::_S_cget(*this); }
-
-      _ExtractKey&
-      _M_extract() { return __ebo_extract_key::_S_get(*this); }
-
-      const _H1&
-      _M_h1() const { return __ebo_h1::_S_cget(*this); }
-
-      _H1&
-      _M_h1() { return __ebo_h1::_S_get(*this); }
-
-      const _H2&
-      _M_h2() const { return __ebo_h2::_S_cget(*this); }
-
-      _H2&
-      _M_h2() { return __ebo_h2::_S_get(*this); }
-    };
-
-  /// Specialization: hash function and range-hashing function,
-  /// caching hash codes.  H is provided but ignored.  Provides
-  /// typedef and accessor required by C++ 11.
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2>
-    struct _Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2,
-			   _Default_ranged_hash, true>
-    : private _Hashtable_ebo_helper<0, _ExtractKey>,
-      private _Hashtable_ebo_helper<1, _H1>,
-      private _Hashtable_ebo_helper<2, _H2>
-    {
-    private:
-      // Gives the local iterator implementation access to _M_h2().
-      friend struct _Local_iterator_base<_Key, _Value, _ExtractKey, _H1, _H2,
-					 _Default_ranged_hash, true>;
-
-      using __ebo_extract_key = _Hashtable_ebo_helper<0, _ExtractKey>;
-      using __ebo_h1 = _Hashtable_ebo_helper<1, _H1>;
-      using __ebo_h2 = _Hashtable_ebo_helper<2, _H2>;
-
-    public:
-      typedef _H1 					hasher;
-
-      hasher
-      hash_function() const
-      { return _M_h1(); }
-
-    protected:
-      typedef std::size_t 				__hash_code;
-      typedef _Hash_node<_Value, true>			__node_type;
-
-      // We need the default constructor for _Hashtable default constructor.
-      _Hash_code_base() = default;
-      _Hash_code_base(const _ExtractKey& __ex,
-		      const _H1& __h1, const _H2& __h2,
-		      const _Default_ranged_hash&)
-      : __ebo_extract_key(__ex), __ebo_h1(__h1), __ebo_h2(__h2) { }
-
-      __hash_code
-      _M_hash_code(const _Key& __k) const
-      { return _M_h1()(__k); }
-
-      std::size_t
-      _M_bucket_index(const _Key&, __hash_code __c,
-		      std::size_t __n) const
-      { return _M_h2()(__c, __n); }
-
-      std::size_t
-      _M_bucket_index(const __node_type* __p, std::size_t __n) const
-	noexcept( noexcept(declval<const _H2&>()((__hash_code)0,
-						 (std::size_t)0)) )
-      { return _M_h2()(__p->_M_hash_code, __n); }
-
-      void
-      _M_store_code(__node_type* __n, __hash_code __c) const
-      { __n->_M_hash_code = __c; }
-
-      void
-      _M_copy_code(__node_type* __to, const __node_type* __from) const
-      { __to->_M_hash_code = __from->_M_hash_code; }
-
-      void
-      _M_swap(_Hash_code_base& __x)
-      {
-	std::swap(_M_extract(), __x._M_extract());
-	std::swap(_M_h1(), __x._M_h1());
-	std::swap(_M_h2(), __x._M_h2());
-      }
-
-      const _ExtractKey&
-      _M_extract() const { return __ebo_extract_key::_S_cget(*this); }
-
-      _ExtractKey&
-      _M_extract() { return __ebo_extract_key::_S_get(*this); }
-
-      const _H1&
-      _M_h1() const { return __ebo_h1::_S_cget(*this); }
-
-      _H1&
-      _M_h1() { return __ebo_h1::_S_get(*this); }
-
-      const _H2&
-      _M_h2() const { return __ebo_h2::_S_cget(*this); }
-
-      _H2&
-      _M_h2() { return __ebo_h2::_S_get(*this); }
-    };
-
-  /**
-   *  Primary class template _Equal_helper.
-   *
-   */
-  template <typename _Key, typename _Value, typename _ExtractKey,
-	    typename _Equal, typename _HashCodeType,
-	    bool __cache_hash_code>
-  struct _Equal_helper;
-
-  /// Specialization.
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _Equal, typename _HashCodeType>
-  struct _Equal_helper<_Key, _Value, _ExtractKey, _Equal, _HashCodeType, true>
-  {
-    static bool
-    _S_equals(const _Equal& __eq, const _ExtractKey& __extract,
-	      const _Key& __k, _HashCodeType __c, _Hash_node<_Value, true>* __n)
-    { return __c == __n->_M_hash_code && __eq(__k, __extract(__n->_M_v())); }
-  };
-
-  /// Specialization.
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _Equal, typename _HashCodeType>
-  struct _Equal_helper<_Key, _Value, _ExtractKey, _Equal, _HashCodeType, false>
-  {
-    static bool
-    _S_equals(const _Equal& __eq, const _ExtractKey& __extract,
-	      const _Key& __k, _HashCodeType, _Hash_node<_Value, false>* __n)
-    { return __eq(__k, __extract(__n->_M_v())); }
-  };
-
-
-  /// Partial specialization used when nodes contain a cached hash code.
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash>
-    struct _Local_iterator_base<_Key, _Value, _ExtractKey,
-				_H1, _H2, _Hash, true>
-    : private _Hashtable_ebo_helper<0, _H2>
-    {
-    protected:
-      using __base_type = _Hashtable_ebo_helper<0, _H2>;
-      using __hash_code_base = _Hash_code_base<_Key, _Value, _ExtractKey,
-					       _H1, _H2, _Hash, true>;
-
-      _Local_iterator_base() = default;
-      _Local_iterator_base(const __hash_code_base& __base,
-			   _Hash_node<_Value, true>* __p,
-			   std::size_t __bkt, std::size_t __bkt_count)
-      : __base_type(__base._M_h2()),
-	_M_cur(__p), _M_bucket(__bkt), _M_bucket_count(__bkt_count) { }
-
-      void
-      _M_incr()
-      {
-	_M_cur = _M_cur->_M_next();
-	if (_M_cur)
-	  {
-	    std::size_t __bkt
-	      = __base_type::_S_get(*this)(_M_cur->_M_hash_code,
-					   _M_bucket_count);
-	    if (__bkt != _M_bucket)
-	      _M_cur = nullptr;
-	  }
-      }
-
-      _Hash_node<_Value, true>*  _M_cur;
-      std::size_t _M_bucket;
-      std::size_t _M_bucket_count;
-
-    public:
-      const void*
-      _M_curr() const { return _M_cur; }  // for equality ops
-
-      std::size_t
-      _M_get_bucket() const { return _M_bucket; }  // for debug mode
-    };
-
-  // Uninitialized storage for a _Hash_code_base.
-  // This type is DefaultConstructible and Assignable even if the
-  // _Hash_code_base type isn't, so that _Local_iterator_base<..., false>
-  // can be DefaultConstructible and Assignable.
-  template<typename _Tp, bool _IsEmpty = std::is_empty<_Tp>::value>
-    struct _Hash_code_storage
-    {
-      __gnu_cxx::__aligned_buffer<_Tp> _M_storage;
-
-      _Tp*
-      _M_h() { return _M_storage._M_ptr(); }
-
-      const _Tp*
-      _M_h() const { return _M_storage._M_ptr(); }
-    };
-
-  // Empty partial specialization for empty _Hash_code_base types.
-  template<typename _Tp>
-    struct _Hash_code_storage<_Tp, true>
-    {
-      static_assert( std::is_empty<_Tp>::value, "Type must be empty" );
-
-      // As _Tp is an empty type there will be no bytes written/read through
-      // the cast pointer, so no strict-aliasing violation.
-      _Tp*
-      _M_h() { return reinterpret_cast<_Tp*>(this); }
-
-      const _Tp*
-      _M_h() const { return reinterpret_cast<const _Tp*>(this); }
-    };
-
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash>
-    using __hash_code_for_local_iter
-      = _Hash_code_storage<_Hash_code_base<_Key, _Value, _ExtractKey,
-					   _H1, _H2, _Hash, false>>;
-
-  // Partial specialization used when hash codes are not cached
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash>
-    struct _Local_iterator_base<_Key, _Value, _ExtractKey,
-				_H1, _H2, _Hash, false>
-    : __hash_code_for_local_iter<_Key, _Value, _ExtractKey, _H1, _H2, _Hash>
-    {
-    protected:
-      using __hash_code_base = _Hash_code_base<_Key, _Value, _ExtractKey,
-					       _H1, _H2, _Hash, false>;
-
-      _Local_iterator_base() : _M_bucket_count(-1) { }
-
-      _Local_iterator_base(const __hash_code_base& __base,
-			   _Hash_node<_Value, false>* __p,
-			   std::size_t __bkt, std::size_t __bkt_count)
-      : _M_cur(__p), _M_bucket(__bkt), _M_bucket_count(__bkt_count)
-      { _M_init(__base); }
-
-      ~_Local_iterator_base()
-      {
-	if (_M_bucket_count != -1)
-	  _M_destroy();
-      }
-
-      _Local_iterator_base(const _Local_iterator_base& __iter)
-      : _M_cur(__iter._M_cur), _M_bucket(__iter._M_bucket),
-        _M_bucket_count(__iter._M_bucket_count)
-      {
-	if (_M_bucket_count != -1)
-	  _M_init(*__iter._M_h());
-      }
-
-      _Local_iterator_base&
-      operator=(const _Local_iterator_base& __iter)
-      {
-	if (_M_bucket_count != -1)
-	  _M_destroy();
-	_M_cur = __iter._M_cur;
-	_M_bucket = __iter._M_bucket;
-	_M_bucket_count = __iter._M_bucket_count;
-	if (_M_bucket_count != -1)
-	  _M_init(*__iter._M_h());
-	return *this;
-      }
-
-      void
-      _M_incr()
-      {
-	_M_cur = _M_cur->_M_next();
-	if (_M_cur)
-	  {
-	    std::size_t __bkt = this->_M_h()->_M_bucket_index(_M_cur,
-							      _M_bucket_count);
-	    if (__bkt != _M_bucket)
-	      _M_cur = nullptr;
-	  }
-      }
-
-      _Hash_node<_Value, false>*  _M_cur;
-      std::size_t _M_bucket;
-      std::size_t _M_bucket_count;
-
-      void
-      _M_init(const __hash_code_base& __base)
-      { ::new(this->_M_h()) __hash_code_base(__base); }
-
-      void
-      _M_destroy() { this->_M_h()->~__hash_code_base(); }
-
-    public:
-      const void*
-      _M_curr() const { return _M_cur; }  // for equality ops and debug mode
-
-      std::size_t
-      _M_get_bucket() const { return _M_bucket; }  // for debug mode
-    };
-
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash, bool __cache>
-    inline bool
-    operator==(const _Local_iterator_base<_Key, _Value, _ExtractKey,
-					  _H1, _H2, _Hash, __cache>& __x,
-	       const _Local_iterator_base<_Key, _Value, _ExtractKey,
-					  _H1, _H2, _Hash, __cache>& __y)
-    { return __x._M_curr() == __y._M_curr(); }
-
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash, bool __cache>
-    inline bool
-    operator!=(const _Local_iterator_base<_Key, _Value, _ExtractKey,
-					  _H1, _H2, _Hash, __cache>& __x,
-	       const _Local_iterator_base<_Key, _Value, _ExtractKey,
-					  _H1, _H2, _Hash, __cache>& __y)
-    { return __x._M_curr() != __y._M_curr(); }
-
-  /// local iterators
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash,
-	   bool __constant_iterators, bool __cache>
-    struct _Local_iterator
-    : public _Local_iterator_base<_Key, _Value, _ExtractKey,
-				  _H1, _H2, _Hash, __cache>
-    {
-    private:
-      using __base_type = _Local_iterator_base<_Key, _Value, _ExtractKey,
-					       _H1, _H2, _Hash, __cache>;
-      using __hash_code_base = typename __base_type::__hash_code_base;
-    public:
-      typedef _Value					value_type;
-      typedef typename std::conditional<__constant_iterators,
-					const _Value*, _Value*>::type
-						       pointer;
-      typedef typename std::conditional<__constant_iterators,
-					const _Value&, _Value&>::type
-						       reference;
-      typedef std::ptrdiff_t				difference_type;
-      typedef std::forward_iterator_tag			iterator_category;
-
-      _Local_iterator() = default;
-
-      _Local_iterator(const __hash_code_base& __base,
-		      _Hash_node<_Value, __cache>* __p,
-		      std::size_t __bkt, std::size_t __bkt_count)
-	: __base_type(__base, __p, __bkt, __bkt_count)
-      { }
-
-      reference
-      operator*() const
-      { return this->_M_cur->_M_v(); }
-
-      pointer
-      operator->() const
-      { return this->_M_cur->_M_valptr(); }
-
-      _Local_iterator&
-      operator++()
-      {
-	this->_M_incr();
-	return *this;
-      }
-
-      _Local_iterator
-      operator++(int)
-      {
-	_Local_iterator __tmp(*this);
-	this->_M_incr();
-	return __tmp;
-      }
-    };
-
-  /// local const_iterators
-  template<typename _Key, typename _Value, typename _ExtractKey,
-	   typename _H1, typename _H2, typename _Hash,
-	   bool __constant_iterators, bool __cache>
-    struct _Local_const_iterator
-    : public _Local_iterator_base<_Key, _Value, _ExtractKey,
-				  _H1, _H2, _Hash, __cache>
-    {
-    private:
-      using __base_type = _Local_iterator_base<_Key, _Value, _ExtractKey,
-					       _H1, _H2, _Hash, __cache>;
-      using __hash_code_base = typename __base_type::__hash_code_base;
-
-    public:
-      typedef _Value					value_type;
-      typedef const _Value*				pointer;
-      typedef const _Value&				reference;
-      typedef std::ptrdiff_t				difference_type;
-      typedef std::forward_iterator_tag			iterator_category;
-
-      _Local_const_iterator() = default;
-
-      _Local_const_iterator(const __hash_code_base& __base,
-			    _Hash_node<_Value, __cache>* __p,
-			    std::size_t __bkt, std::size_t __bkt_count)
-	: __base_type(__base, __p, __bkt, __bkt_count)
-      { }
-
-      _Local_const_iterator(const _Local_iterator<_Key, _Value, _ExtractKey,
-						  _H1, _H2, _Hash,
-						  __constant_iterators,
-						  __cache>& __x)
-	: __base_type(__x)
-      { }
-
-      reference
-      operator*() const
-      { return this->_M_cur->_M_v(); }
-
-      pointer
-      operator->() const
-      { return this->_M_cur->_M_valptr(); }
-
-      _Local_const_iterator&
-      operator++()
-      {
-	this->_M_incr();
-	return *this;
-      }
-
-      _Local_const_iterator
-      operator++(int)
-      {
-	_Local_const_iterator __tmp(*this);
-	this->_M_incr();
-	return __tmp;
-      }
-    };
-
-  /**
-   *  Primary class template _Hashtable_base.
-   *
-   *  Helper class adding management of _Equal functor to
-   *  _Hash_code_base type.
-   *
-   *  Base class templates are:
-   *    - __detail::_Hash_code_base
-   *    - __detail::_Hashtable_ebo_helper
-   */
-  template<typename _Key, typename _Value,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _Traits>
-  struct _Hashtable_base
-  : public _Hash_code_base<_Key, _Value, _ExtractKey, _H1, _H2, _Hash,
-			   _Traits::__hash_cached::value>,
-    private _Hashtable_ebo_helper<0, _Equal>
-  {
-  public:
-    typedef _Key					key_type;
-    typedef _Value					value_type;
-    typedef _Equal					key_equal;
-    typedef std::size_t					size_type;
-    typedef std::ptrdiff_t				difference_type;
-
-    using __traits_type = _Traits;
-    using __hash_cached = typename __traits_type::__hash_cached;
-    using __constant_iterators = typename __traits_type::__constant_iterators;
-    using __unique_keys = typename __traits_type::__unique_keys;
-
-    using __hash_code_base = _Hash_code_base<_Key, _Value, _ExtractKey,
-					     _H1, _H2, _Hash,
-					     __hash_cached::value>;
-
-    using __hash_code = typename __hash_code_base::__hash_code;
-    using __node_type = typename __hash_code_base::__node_type;
-
-    using iterator = __detail::_Node_iterator<value_type,
-					      __constant_iterators::value,
-					      __hash_cached::value>;
-
-    using const_iterator = __detail::_Node_const_iterator<value_type,
-						   __constant_iterators::value,
-						   __hash_cached::value>;
-
-    using local_iterator = __detail::_Local_iterator<key_type, value_type,
-						  _ExtractKey, _H1, _H2, _Hash,
-						  __constant_iterators::value,
-						     __hash_cached::value>;
-
-    using const_local_iterator = __detail::_Local_const_iterator<key_type,
-								 value_type,
-					_ExtractKey, _H1, _H2, _Hash,
-					__constant_iterators::value,
-					__hash_cached::value>;
-
-    using __ireturn_type = typename std::conditional<__unique_keys::value,
-						     std::pair<iterator, bool>,
-						     iterator>::type;
-  private:
-    using _EqualEBO = _Hashtable_ebo_helper<0, _Equal>;
-    using _EqualHelper =  _Equal_helper<_Key, _Value, _ExtractKey, _Equal,
-					__hash_code, __hash_cached::value>;
-
-  protected:
-    _Hashtable_base() = default;
-    _Hashtable_base(const _ExtractKey& __ex, const _H1& __h1, const _H2& __h2,
-		    const _Hash& __hash, const _Equal& __eq)
-    : __hash_code_base(__ex, __h1, __h2, __hash), _EqualEBO(__eq)
-    { }
-
-    bool
-    _M_equals(const _Key& __k, __hash_code __c, __node_type* __n) const
-    {
-      return _EqualHelper::_S_equals(_M_eq(), this->_M_extract(),
-				     __k, __c, __n);
-    }
-
-    void
-    _M_swap(_Hashtable_base& __x)
-    {
-      __hash_code_base::_M_swap(__x);
-      std::swap(_M_eq(), __x._M_eq());
-    }
-
-    const _Equal&
-    _M_eq() const { return _EqualEBO::_S_cget(*this); }
-
-    _Equal&
-    _M_eq() { return _EqualEBO::_S_get(*this); }
-  };
-
-  /**
-   *  struct _Equality_base.
-   *
-   *  Common types and functions for class _Equality.
-   */
-  struct _Equality_base
-  {
-  protected:
-    template<typename _Uiterator>
-      static bool
-      _S_is_permutation(_Uiterator, _Uiterator, _Uiterator);
-  };
-
-  // See std::is_permutation in N3068.
-  template<typename _Uiterator>
-    bool
-    _Equality_base::
-    _S_is_permutation(_Uiterator __first1, _Uiterator __last1,
-		      _Uiterator __first2)
-    {
-      for (; __first1 != __last1; ++__first1, ++__first2)
-	if (!(*__first1 == *__first2))
-	  break;
-
-      if (__first1 == __last1)
-	return true;
-
-      _Uiterator __last2 = __first2;
-      std::advance(__last2, std::distance(__first1, __last1));
-
-      for (_Uiterator __it1 = __first1; __it1 != __last1; ++__it1)
-	{
-	  _Uiterator __tmp =  __first1;
-	  while (__tmp != __it1 && !bool(*__tmp == *__it1))
-	    ++__tmp;
-
-	  // We've seen this one before.
-	  if (__tmp != __it1)
-	    continue;
-
-	  std::ptrdiff_t __n2 = 0;
-	  for (__tmp = __first2; __tmp != __last2; ++__tmp)
-	    if (*__tmp == *__it1)
-	      ++__n2;
-
-	  if (!__n2)
-	    return false;
-
-	  std::ptrdiff_t __n1 = 0;
-	  for (__tmp = __it1; __tmp != __last1; ++__tmp)
-	    if (*__tmp == *__it1)
-	      ++__n1;
-
-	  if (__n1 != __n2)
-	    return false;
-	}
-      return true;
-    }
-
-  /**
-   *  Primary class template  _Equality.
-   *
-   *  This is for implementing equality comparison for unordered
-   *  containers, per N3068, by John Lakos and Pablo Halpern.
-   *  Algorithmically, we follow closely the reference implementations
-   *  therein.
-   */
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits,
-	   bool _Unique_keys = _Traits::__unique_keys::value>
-    struct _Equality;
-
-  /// Specialization.
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    struct _Equality<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-		     _H1, _H2, _Hash, _RehashPolicy, _Traits, true>
-    {
-      using __hashtable = _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-				     _H1, _H2, _Hash, _RehashPolicy, _Traits>;
-
-      bool
-      _M_equal(const __hashtable&) const;
-    };
-
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    bool
-    _Equality<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	      _H1, _H2, _Hash, _RehashPolicy, _Traits, true>::
-    _M_equal(const __hashtable& __other) const
-    {
-      const __hashtable* __this = static_cast<const __hashtable*>(this);
-
-      if (__this->size() != __other.size())
-	return false;
-
-      for (auto __itx = __this->begin(); __itx != __this->end(); ++__itx)
-	{
-	  const auto __ity = __other.find(_ExtractKey()(*__itx));
-	  if (__ity == __other.end() || !bool(*__ity == *__itx))
-	    return false;
-	}
-      return true;
-    }
-
-  /// Specialization.
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    struct _Equality<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-		     _H1, _H2, _Hash, _RehashPolicy, _Traits, false>
-    : public _Equality_base
-    {
-      using __hashtable = _Hashtable<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-				     _H1, _H2, _Hash, _RehashPolicy, _Traits>;
-
-      bool
-      _M_equal(const __hashtable&) const;
-    };
-
-  template<typename _Key, typename _Value, typename _Alloc,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy, typename _Traits>
-    bool
-    _Equality<_Key, _Value, _Alloc, _ExtractKey, _Equal,
-	      _H1, _H2, _Hash, _RehashPolicy, _Traits, false>::
-    _M_equal(const __hashtable& __other) const
-    {
-      const __hashtable* __this = static_cast<const __hashtable*>(this);
-
-      if (__this->size() != __other.size())
-	return false;
-
-      for (auto __itx = __this->begin(); __itx != __this->end();)
-	{
-	  const auto __xrange = __this->equal_range(_ExtractKey()(*__itx));
-	  const auto __yrange = __other.equal_range(_ExtractKey()(*__itx));
-
-	  if (std::distance(__xrange.first, __xrange.second)
-	      != std::distance(__yrange.first, __yrange.second))
-	    return false;
-
-	  if (!_S_is_permutation(__xrange.first, __xrange.second,
-				 __yrange.first))
-	    return false;
-
-	  __itx = __xrange.second;
-	}
-      return true;
-    }
-
-  /**
-   * This type deals with all allocation and keeps an allocator instance through
-   * inheritance to benefit from EBO when possible.
-   */
-  template<typename _NodeAlloc>
-    struct _Hashtable_alloc : private _Hashtable_ebo_helper<0, _NodeAlloc>
-    {
-    private:
-      using __ebo_node_alloc = _Hashtable_ebo_helper<0, _NodeAlloc>;
-    public:
-      using __node_type = typename _NodeAlloc::value_type;
-      using __node_alloc_type = _NodeAlloc;
-      // Use __gnu_cxx to benefit from _S_always_equal and al.
-      using __node_alloc_traits = __gnu_cxx::__alloc_traits<__node_alloc_type>;
-
-      using __value_type = typename __node_type::value_type;
-      using __value_alloc_type =
-	__alloc_rebind<__node_alloc_type, __value_type>;
-      using __value_alloc_traits = std::allocator_traits<__value_alloc_type>;
-
-      using __node_base = __detail::_Hash_node_base;
-      using __bucket_type = __node_base*;      
-      using __bucket_alloc_type =
-	__alloc_rebind<__node_alloc_type, __bucket_type>;
-      using __bucket_alloc_traits = std::allocator_traits<__bucket_alloc_type>;
-
-      _Hashtable_alloc() = default;
-      _Hashtable_alloc(const _Hashtable_alloc&) = default;
-      _Hashtable_alloc(_Hashtable_alloc&&) = default;
-
-      template<typename _Alloc>
-	_Hashtable_alloc(_Alloc&& __a)
-	  : __ebo_node_alloc(std::forward<_Alloc>(__a))
-	{ }
-
-      __node_alloc_type&
-      _M_node_allocator()
-      { return __ebo_node_alloc::_S_get(*this); }
-
-      const __node_alloc_type&
-      _M_node_allocator() const
-      { return __ebo_node_alloc::_S_cget(*this); }
-
-      template<typename... _Args>
-	__node_type*
-	_M_allocate_node(_Args&&... __args);
-
-      void
-      _M_deallocate_node(__node_type* __n);
-
-      // Deallocate the linked list of nodes pointed to by __n
-      void
-      _M_deallocate_nodes(__node_type* __n);
-
-      __bucket_type*
-      _M_allocate_buckets(std::size_t __n);
-
-      void
-      _M_deallocate_buckets(__bucket_type*, std::size_t __n);
-    };
-
-  // Definitions of class template _Hashtable_alloc's out-of-line member
-  // functions.
-  template<typename _NodeAlloc>
-    template<typename... _Args>
-      typename _Hashtable_alloc<_NodeAlloc>::__node_type*
-      _Hashtable_alloc<_NodeAlloc>::_M_allocate_node(_Args&&... __args)
-      {
-	auto __nptr = __node_alloc_traits::allocate(_M_node_allocator(), 1);
-	__node_type* __n = std::__addressof(*__nptr);
-	__try
-	  {
-	    __value_alloc_type __a(_M_node_allocator());
-	    ::new ((void*)__n) __node_type;
-	    __value_alloc_traits::construct(__a, __n->_M_valptr(),
-					    std::forward<_Args>(__args)...);
-	    return __n;
-	  }
-	__catch(...)
-	  {
-	    __node_alloc_traits::deallocate(_M_node_allocator(), __nptr, 1);
-	    __throw_exception_again;
-	  }
-      }
-
-  template<typename _NodeAlloc>
-    void
-    _Hashtable_alloc<_NodeAlloc>::_M_deallocate_node(__node_type* __n)
-    {
-      typedef typename __node_alloc_traits::pointer _Ptr;
-      auto __ptr = std::pointer_traits<_Ptr>::pointer_to(*__n);
-      __value_alloc_type __a(_M_node_allocator());
-      __value_alloc_traits::destroy(__a, __n->_M_valptr());
-      __n->~__node_type();
-      __node_alloc_traits::deallocate(_M_node_allocator(), __ptr, 1);
-    }
-
-  template<typename _NodeAlloc>
-    void
-    _Hashtable_alloc<_NodeAlloc>::_M_deallocate_nodes(__node_type* __n)
-    {
-      while (__n)
-	{
-	  __node_type* __tmp = __n;
-	  __n = __n->_M_next();
-	  _M_deallocate_node(__tmp);
-	}
-    }
-
-  template<typename _NodeAlloc>
-    typename _Hashtable_alloc<_NodeAlloc>::__bucket_type*
-    _Hashtable_alloc<_NodeAlloc>::_M_allocate_buckets(std::size_t __n)
-    {
-      __bucket_alloc_type __alloc(_M_node_allocator());
-
-      auto __ptr = __bucket_alloc_traits::allocate(__alloc, __n);
-      __bucket_type* __p = std::__addressof(*__ptr);
-      __builtin_memset(__p, 0, __n * sizeof(__bucket_type));
-      return __p;
-    }
-
-  template<typename _NodeAlloc>
-    void
-    _Hashtable_alloc<_NodeAlloc>::_M_deallocate_buckets(__bucket_type* __bkts,
-							std::size_t __n)
-    {
-      typedef typename __bucket_alloc_traits::pointer _Ptr;
-      auto __ptr = std::pointer_traits<_Ptr>::pointer_to(*__bkts);
-      __bucket_alloc_type __alloc(_M_node_allocator());
-      __bucket_alloc_traits::deallocate(__alloc, __ptr, __n);
-    }
-
- //@} hashtable-detail
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __detail
-} // namespace std
-
-#endif // _HASHTABLE_POLICY_H
diff --git a/openflow/usr/include/c++/5/bits/indirect_array.h b/openflow/usr/include/c++/5/bits/indirect_array.h
deleted file mode 100644
index 7228c68..0000000
--- a/openflow/usr/include/c++/5/bits/indirect_array.h
+++ /dev/null
@@ -1,212 +0,0 @@
-// The template and inlines for the -*- C++ -*- indirect_array class.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/indirect_array.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{valarray}
- */
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-#ifndef _INDIRECT_ARRAY_H
-#define _INDIRECT_ARRAY_H 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup numeric_arrays
-   * @{
-   */
-
-  /**
-   *  @brief  Reference to arbitrary subset of an array.
-   *
-   *  An indirect_array is a reference to the actual elements of an array
-   *  specified by an ordered array of indices.  The way to get an
-   *  indirect_array is to call operator[](valarray<size_t>) on a valarray.
-   *  The returned indirect_array then permits carrying operations out on the
-   *  referenced subset of elements in the original valarray.
-   *
-   *  For example, if an indirect_array is obtained using the array (4,2,0) as
-   *  an argument, and then assigned to an array containing (1,2,3), then the
-   *  underlying array will have array[0]==3, array[2]==2, and array[4]==1.
-   *
-   *  @param  Tp  Element type.
-   */
-  template <class _Tp>
-    class indirect_array
-    {
-    public:
-      typedef _Tp value_type;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 253. valarray helper functions are almost entirely useless
-
-      ///  Copy constructor.  Both slices refer to the same underlying array.
-      indirect_array(const indirect_array&);
-
-      ///  Assignment operator.  Assigns elements to corresponding elements
-      ///  of @a a.
-      indirect_array& operator=(const indirect_array&);
-
-      ///  Assign slice elements to corresponding elements of @a v.
-      void operator=(const valarray<_Tp>&) const;
-      ///  Multiply slice elements by corresponding elements of @a v.
-      void operator*=(const valarray<_Tp>&) const;
-      ///  Divide slice elements by corresponding elements of @a v.
-      void operator/=(const valarray<_Tp>&) const;
-      ///  Modulo slice elements by corresponding elements of @a v.
-      void operator%=(const valarray<_Tp>&) const;
-      ///  Add corresponding elements of @a v to slice elements.
-      void operator+=(const valarray<_Tp>&) const;
-      ///  Subtract corresponding elements of @a v from slice elements.
-      void operator-=(const valarray<_Tp>&) const;
-      ///  Logical xor slice elements with corresponding elements of @a v.
-      void operator^=(const valarray<_Tp>&) const;
-      ///  Logical and slice elements with corresponding elements of @a v.
-      void operator&=(const valarray<_Tp>&) const;
-      ///  Logical or slice elements with corresponding elements of @a v.
-      void operator|=(const valarray<_Tp>&) const;
-      ///  Left shift slice elements by corresponding elements of @a v.
-      void operator<<=(const valarray<_Tp>&) const;
-      ///  Right shift slice elements by corresponding elements of @a v.
-      void operator>>=(const valarray<_Tp>&) const;
-      ///  Assign all slice elements to @a t.
-      void operator= (const _Tp&) const;
-      //    ~indirect_array();
-
-      template<class _Dom>
-      void operator=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator*=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator/=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator%=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator+=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator-=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator^=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator&=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator|=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator<<=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator>>=(const _Expr<_Dom, _Tp>&) const;
-
-    private:
-      ///  Copy constructor.  Both slices refer to the same underlying array.
-      indirect_array(_Array<_Tp>, size_t, _Array<size_t>);
-
-      friend class valarray<_Tp>;
-      friend class gslice_array<_Tp>;
-
-      const size_t	 _M_sz;
-      const _Array<size_t> _M_index;
-      const _Array<_Tp>	 _M_array;
-
-      // not implemented
-      indirect_array();
-    };
-
-  template<typename _Tp>
-    inline
-    indirect_array<_Tp>::indirect_array(const indirect_array<_Tp>& __a)
-    : _M_sz(__a._M_sz), _M_index(__a._M_index), _M_array(__a._M_array) {}
-
-  template<typename _Tp>
-    inline
-    indirect_array<_Tp>::indirect_array(_Array<_Tp> __a, size_t __s,
-					_Array<size_t> __i)
-    : _M_sz(__s), _M_index(__i), _M_array(__a) {}
-
-  template<typename _Tp>
-    inline indirect_array<_Tp>&
-    indirect_array<_Tp>::operator=(const indirect_array<_Tp>& __a)
-    {
-      std::__valarray_copy(__a._M_array, _M_sz, __a._M_index, _M_array,
-			   _M_index);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline void
-    indirect_array<_Tp>::operator=(const _Tp& __t) const
-    { std::__valarray_fill(_M_array, _M_index, _M_sz, __t); }
-
-  template<typename _Tp>
-    inline void
-    indirect_array<_Tp>::operator=(const valarray<_Tp>& __v) const
-    { std::__valarray_copy(_Array<_Tp>(__v), _M_sz, _M_array, _M_index); }
-
-  template<typename _Tp>
-    template<class _Dom>
-      inline void
-      indirect_array<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e) const
-      { std::__valarray_copy(__e, _M_sz, _M_array, _M_index); }
-
-#undef _DEFINE_VALARRAY_OPERATOR
-#define _DEFINE_VALARRAY_OPERATOR(_Op, _Name)				\
-  template<typename _Tp>						\
-    inline void								\
-    indirect_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const\
-    {									\
-      _Array_augmented_##_Name(_M_array, _M_index, _Array<_Tp>(__v), _M_sz); \
-    }									\
-									\
-  template<typename _Tp>                                                \
-    template<class _Dom>				                \
-      inline void							\
-      indirect_array<_Tp>::operator _Op##=(const _Expr<_Dom,_Tp>& __e) const\
-      {									\
-	_Array_augmented_##_Name(_M_array, _M_index, __e, _M_sz);	\
-      }
-
-_DEFINE_VALARRAY_OPERATOR(*, __multiplies)
-_DEFINE_VALARRAY_OPERATOR(/, __divides)
-_DEFINE_VALARRAY_OPERATOR(%, __modulus)
-_DEFINE_VALARRAY_OPERATOR(+, __plus)
-_DEFINE_VALARRAY_OPERATOR(-, __minus)
-_DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
-_DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
-_DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
-_DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
-_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_OPERATOR
-
-  // @} group numeric_arrays
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _INDIRECT_ARRAY_H */
diff --git a/openflow/usr/include/c++/5/bits/ios_base.h b/openflow/usr/include/c++/5/bits/ios_base.h
deleted file mode 100644
index 908ba7c..0000000
--- a/openflow/usr/include/c++/5/bits/ios_base.h
+++ /dev/null
@@ -1,1079 +0,0 @@
-// Iostreams base classes -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/ios_base.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ios}
- */
-
-//
-// ISO C++ 14882: 27.4  Iostreams base classes
-//
-
-#ifndef _IOS_BASE_H
-#define _IOS_BASE_H 1
-
-#pragma GCC system_header
-
-#include <ext/atomicity.h>
-#include <bits/localefwd.h>
-#include <bits/locale_classes.h>
-
-#if __cplusplus < 201103L
-# include <stdexcept>
-#else
-# include <system_error>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // The following definitions of bitmask types are enums, not ints,
-  // as permitted (but not required) in the standard, in order to provide
-  // better type safety in iostream calls.  A side effect is that
-  // expressions involving them are no longer compile-time constants.
-  enum _Ios_Fmtflags 
-    { 
-      _S_boolalpha 	= 1L << 0,
-      _S_dec 		= 1L << 1,
-      _S_fixed 		= 1L << 2,
-      _S_hex 		= 1L << 3,
-      _S_internal 	= 1L << 4,
-      _S_left 		= 1L << 5,
-      _S_oct 		= 1L << 6,
-      _S_right 		= 1L << 7,
-      _S_scientific 	= 1L << 8,
-      _S_showbase 	= 1L << 9,
-      _S_showpoint 	= 1L << 10,
-      _S_showpos 	= 1L << 11,
-      _S_skipws 	= 1L << 12,
-      _S_unitbuf 	= 1L << 13,
-      _S_uppercase 	= 1L << 14,
-      _S_adjustfield 	= _S_left | _S_right | _S_internal,
-      _S_basefield 	= _S_dec | _S_oct | _S_hex,
-      _S_floatfield 	= _S_scientific | _S_fixed,
-      _S_ios_fmtflags_end = 1L << 16,
-      _S_ios_fmtflags_max = __INT_MAX__,
-      _S_ios_fmtflags_min = ~__INT_MAX__
-    };
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Fmtflags
-  operator&(_Ios_Fmtflags __a, _Ios_Fmtflags __b)
-  { return _Ios_Fmtflags(static_cast<int>(__a) & static_cast<int>(__b)); }
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Fmtflags
-  operator|(_Ios_Fmtflags __a, _Ios_Fmtflags __b)
-  { return _Ios_Fmtflags(static_cast<int>(__a) | static_cast<int>(__b)); }
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Fmtflags
-  operator^(_Ios_Fmtflags __a, _Ios_Fmtflags __b)
-  { return _Ios_Fmtflags(static_cast<int>(__a) ^ static_cast<int>(__b)); }
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Fmtflags
-  operator~(_Ios_Fmtflags __a)
-  { return _Ios_Fmtflags(~static_cast<int>(__a)); }
-
-  inline const _Ios_Fmtflags&
-  operator|=(_Ios_Fmtflags& __a, _Ios_Fmtflags __b)
-  { return __a = __a | __b; }
-
-  inline const _Ios_Fmtflags&
-  operator&=(_Ios_Fmtflags& __a, _Ios_Fmtflags __b)
-  { return __a = __a & __b; }
-
-  inline const _Ios_Fmtflags&
-  operator^=(_Ios_Fmtflags& __a, _Ios_Fmtflags __b)
-  { return __a = __a ^ __b; }
-
-
-  enum _Ios_Openmode 
-    { 
-      _S_app 		= 1L << 0,
-      _S_ate 		= 1L << 1,
-      _S_bin 		= 1L << 2,
-      _S_in 		= 1L << 3,
-      _S_out 		= 1L << 4,
-      _S_trunc 		= 1L << 5,
-      _S_ios_openmode_end = 1L << 16,
-      _S_ios_openmode_max = __INT_MAX__,
-      _S_ios_openmode_min = ~__INT_MAX__
-    };
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Openmode
-  operator&(_Ios_Openmode __a, _Ios_Openmode __b)
-  { return _Ios_Openmode(static_cast<int>(__a) & static_cast<int>(__b)); }
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Openmode
-  operator|(_Ios_Openmode __a, _Ios_Openmode __b)
-  { return _Ios_Openmode(static_cast<int>(__a) | static_cast<int>(__b)); }
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Openmode
-  operator^(_Ios_Openmode __a, _Ios_Openmode __b)
-  { return _Ios_Openmode(static_cast<int>(__a) ^ static_cast<int>(__b)); }
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Openmode
-  operator~(_Ios_Openmode __a)
-  { return _Ios_Openmode(~static_cast<int>(__a)); }
-
-  inline const _Ios_Openmode&
-  operator|=(_Ios_Openmode& __a, _Ios_Openmode __b)
-  { return __a = __a | __b; }
-
-  inline const _Ios_Openmode&
-  operator&=(_Ios_Openmode& __a, _Ios_Openmode __b)
-  { return __a = __a & __b; }
-
-  inline const _Ios_Openmode&
-  operator^=(_Ios_Openmode& __a, _Ios_Openmode __b)
-  { return __a = __a ^ __b; }
-
-
-  enum _Ios_Iostate
-    { 
-      _S_goodbit 		= 0,
-      _S_badbit 		= 1L << 0,
-      _S_eofbit 		= 1L << 1,
-      _S_failbit		= 1L << 2,
-      _S_ios_iostate_end = 1L << 16,
-      _S_ios_iostate_max = __INT_MAX__,
-      _S_ios_iostate_min = ~__INT_MAX__
-    };
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Iostate
-  operator&(_Ios_Iostate __a, _Ios_Iostate __b)
-  { return _Ios_Iostate(static_cast<int>(__a) & static_cast<int>(__b)); }
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Iostate
-  operator|(_Ios_Iostate __a, _Ios_Iostate __b)
-  { return _Ios_Iostate(static_cast<int>(__a) | static_cast<int>(__b)); }
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Iostate
-  operator^(_Ios_Iostate __a, _Ios_Iostate __b)
-  { return _Ios_Iostate(static_cast<int>(__a) ^ static_cast<int>(__b)); }
-
-  inline _GLIBCXX_CONSTEXPR _Ios_Iostate
-  operator~(_Ios_Iostate __a)
-  { return _Ios_Iostate(~static_cast<int>(__a)); }
-
-  inline const _Ios_Iostate&
-  operator|=(_Ios_Iostate& __a, _Ios_Iostate __b)
-  { return __a = __a | __b; }
-
-  inline const _Ios_Iostate&
-  operator&=(_Ios_Iostate& __a, _Ios_Iostate __b)
-  { return __a = __a & __b; }
-
-  inline const  _Ios_Iostate&
-  operator^=(_Ios_Iostate& __a, _Ios_Iostate __b)
-  { return __a = __a ^ __b; }
-
-
-  enum _Ios_Seekdir 
-    { 
-      _S_beg = 0,
-      _S_cur = _GLIBCXX_STDIO_SEEK_CUR,
-      _S_end = _GLIBCXX_STDIO_SEEK_END,
-      _S_ios_seekdir_end = 1L << 16 
-    };
-
-#if __cplusplus >= 201103L
-  /// I/O error code
-  enum class io_errc { stream = 1 };
-
-  template <> struct is_error_code_enum<io_errc> : public true_type { };
-
-  const error_category& iostream_category() noexcept;
-
-  inline error_code
-  make_error_code(io_errc e) noexcept
-  { return error_code(static_cast<int>(e), iostream_category()); }
-
-  inline error_condition
-  make_error_condition(io_errc e) noexcept
-  { return error_condition(static_cast<int>(e), iostream_category()); }
-#endif
-
-  // 27.4.2  Class ios_base
-  /**
-   *  @brief  The base of the I/O class hierarchy.
-   *  @ingroup io
-   *
-   *  This class defines everything that can be defined about I/O that does
-   *  not depend on the type of characters being input or output.  Most
-   *  people will only see @c ios_base when they need to specify the full
-   *  name of the various I/O flags (e.g., the openmodes).
-  */
-  class ios_base
-  {
-#if _GLIBCXX_USE_CXX11_ABI
-#if __cplusplus < 201103L
-    // Type that is layout-compatible with std::system_error
-    struct system_error : std::runtime_error
-    {
-      // Type that is layout-compatible with std::error_code
-      struct error_code
-      {
-	error_code() { }
-      private:
-	int		_M_value;
-	const void*	_M_cat;
-      } _M_code;
-    };
-#endif
-#endif
-  public:
-
-    /** 
-     *  @brief These are thrown to indicate problems with io.
-     *  @ingroup exceptions
-     *
-     *  27.4.2.1.1  Class ios_base::failure
-     */
-#if _GLIBCXX_USE_CXX11_ABI
-    class _GLIBCXX_ABI_TAG_CXX11 failure : public system_error
-    {
-    public:
-      explicit
-      failure(const string& __str);
-
-#if __cplusplus >= 201103L
-      explicit
-      failure(const string&, const error_code&);
-
-      explicit
-      failure(const char*, const error_code& = io_errc::stream);
-#endif
-
-      virtual
-      ~failure() throw();
-
-      virtual const char*
-      what() const throw();
-    };
-#else
-    class failure : public exception
-    {
-    public:
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 48.  Use of non-existent exception constructor
-      explicit
-      failure(const string& __str) throw();
-
-      // This declaration is not useless:
-      // http://gcc.gnu.org/onlinedocs/gcc-4.3.2/gcc/Vague-Linkage.html
-      virtual
-      ~failure() throw();
-
-      virtual const char*
-      what() const throw();
-
-    private:
-      string _M_msg;
-    };
-#endif
-
-    // 27.4.2.1.2  Type ios_base::fmtflags
-    /**
-     *  @brief This is a bitmask type.
-     *
-     *  @c @a _Ios_Fmtflags is implementation-defined, but it is valid to
-     *  perform bitwise operations on these values and expect the Right
-     *  Thing to happen.  Defined objects of type fmtflags are:
-     *  - boolalpha
-     *  - dec
-     *  - fixed
-     *  - hex
-     *  - internal
-     *  - left
-     *  - oct
-     *  - right
-     *  - scientific
-     *  - showbase
-     *  - showpoint
-     *  - showpos
-     *  - skipws
-     *  - unitbuf
-     *  - uppercase
-     *  - adjustfield
-     *  - basefield
-     *  - floatfield
-    */
-    typedef _Ios_Fmtflags fmtflags;
-
-    /// Insert/extract @c bool in alphabetic rather than numeric format.
-    static const fmtflags boolalpha =   _S_boolalpha;
-
-    /// Converts integer input or generates integer output in decimal base.
-    static const fmtflags dec =         _S_dec;
-
-    /// Generate floating-point output in fixed-point notation.
-    static const fmtflags fixed =       _S_fixed;
-
-    /// Converts integer input or generates integer output in hexadecimal base.
-    static const fmtflags hex =         _S_hex;
-
-    /// Adds fill characters at a designated internal point in certain
-    /// generated output, or identical to @c right if no such point is
-    /// designated.
-    static const fmtflags internal =    _S_internal;
-
-    /// Adds fill characters on the right (final positions) of certain
-    /// generated output.  (I.e., the thing you print is flush left.)
-    static const fmtflags left =        _S_left;
-
-    /// Converts integer input or generates integer output in octal base.
-    static const fmtflags oct =         _S_oct;
-
-    /// Adds fill characters on the left (initial positions) of certain
-    /// generated output.  (I.e., the thing you print is flush right.)
-    static const fmtflags right =       _S_right;
-
-    /// Generates floating-point output in scientific notation.
-    static const fmtflags scientific =  _S_scientific;
-
-    /// Generates a prefix indicating the numeric base of generated integer
-    /// output.
-    static const fmtflags showbase =    _S_showbase;
-
-    /// Generates a decimal-point character unconditionally in generated
-    /// floating-point output.
-    static const fmtflags showpoint =   _S_showpoint;
-
-    /// Generates a + sign in non-negative generated numeric output.
-    static const fmtflags showpos =     _S_showpos;
-
-    /// Skips leading white space before certain input operations.
-    static const fmtflags skipws =      _S_skipws;
-
-    /// Flushes output after each output operation.
-    static const fmtflags unitbuf =     _S_unitbuf;
-
-    /// Replaces certain lowercase letters with their uppercase equivalents
-    /// in generated output.
-    static const fmtflags uppercase =   _S_uppercase;
-
-    /// A mask of left|right|internal.  Useful for the 2-arg form of @c setf.
-    static const fmtflags adjustfield = _S_adjustfield;
-
-    /// A mask of dec|oct|hex.  Useful for the 2-arg form of @c setf.
-    static const fmtflags basefield =   _S_basefield;
-
-    /// A mask of scientific|fixed.  Useful for the 2-arg form of @c setf.
-    static const fmtflags floatfield =  _S_floatfield;
-
-    // 27.4.2.1.3  Type ios_base::iostate
-    /**
-     *  @brief This is a bitmask type.
-     *
-     *  @c @a _Ios_Iostate is implementation-defined, but it is valid to
-     *  perform bitwise operations on these values and expect the Right
-     *  Thing to happen.  Defined objects of type iostate are:
-     *  - badbit
-     *  - eofbit
-     *  - failbit
-     *  - goodbit
-    */
-    typedef _Ios_Iostate iostate;
-
-    /// Indicates a loss of integrity in an input or output sequence (such
-    /// as an irrecoverable read error from a file).
-    static const iostate badbit =	_S_badbit;
-
-    /// Indicates that an input operation reached the end of an input sequence.
-    static const iostate eofbit =	_S_eofbit;
-
-    /// Indicates that an input operation failed to read the expected
-    /// characters, or that an output operation failed to generate the
-    /// desired characters.
-    static const iostate failbit =	_S_failbit;
-
-    /// Indicates all is well.
-    static const iostate goodbit =	_S_goodbit;
-
-    // 27.4.2.1.4  Type ios_base::openmode
-    /**
-     *  @brief This is a bitmask type.
-     *
-     *  @c @a _Ios_Openmode is implementation-defined, but it is valid to
-     *  perform bitwise operations on these values and expect the Right
-     *  Thing to happen.  Defined objects of type openmode are:
-     *  - app
-     *  - ate
-     *  - binary
-     *  - in
-     *  - out
-     *  - trunc
-    */
-    typedef _Ios_Openmode openmode;
-
-    /// Seek to end before each write.
-    static const openmode app =		_S_app;
-
-    /// Open and seek to end immediately after opening.
-    static const openmode ate =		_S_ate;
-
-    /// Perform input and output in binary mode (as opposed to text mode).
-    /// This is probably not what you think it is; see
-    /// https://gcc.gnu.org/onlinedocs/libstdc++/manual/fstreams.html#std.io.filestreams.binary
-    static const openmode binary =	_S_bin;
-
-    /// Open for input.  Default for @c ifstream and fstream.
-    static const openmode in =		_S_in;
-
-    /// Open for output.  Default for @c ofstream and fstream.
-    static const openmode out =		_S_out;
-
-    /// Open for input.  Default for @c ofstream.
-    static const openmode trunc =	_S_trunc;
-
-    // 27.4.2.1.5  Type ios_base::seekdir
-    /**
-     *  @brief This is an enumerated type.
-     *
-     *  @c @a _Ios_Seekdir is implementation-defined.  Defined values
-     *  of type seekdir are:
-     *  - beg
-     *  - cur, equivalent to @c SEEK_CUR in the C standard library.
-     *  - end, equivalent to @c SEEK_END in the C standard library.
-    */
-    typedef _Ios_Seekdir seekdir;
-
-    /// Request a seek relative to the beginning of the stream.
-    static const seekdir beg =		_S_beg;
-
-    /// Request a seek relative to the current position within the sequence.
-    static const seekdir cur =		_S_cur;
-
-    /// Request a seek relative to the current end of the sequence.
-    static const seekdir end =		_S_end;
-
-    // Annex D.6
-    typedef int io_state;
-    typedef int open_mode;
-    typedef int seek_dir;
-
-    typedef std::streampos streampos;
-    typedef std::streamoff streamoff;
-
-    // Callbacks;
-    /**
-     *  @brief  The set of events that may be passed to an event callback.
-     *
-     *  erase_event is used during ~ios() and copyfmt().  imbue_event is used
-     *  during imbue().  copyfmt_event is used during copyfmt().
-    */
-    enum event
-    {
-      erase_event,
-      imbue_event,
-      copyfmt_event
-    };
-
-    /**
-     *  @brief  The type of an event callback function.
-     *  @param  __e  One of the members of the event enum.
-     *  @param  __b  Reference to the ios_base object.
-     *  @param  __i  The integer provided when the callback was registered.
-     *
-     *  Event callbacks are user defined functions that get called during
-     *  several ios_base and basic_ios functions, specifically imbue(),
-     *  copyfmt(), and ~ios().
-    */
-    typedef void (*event_callback) (event __e, ios_base& __b, int __i);
-
-    /**
-     *  @brief  Add the callback __fn with parameter __index.
-     *  @param  __fn  The function to add.
-     *  @param  __index  The integer to pass to the function when invoked.
-     *
-     *  Registers a function as an event callback with an integer parameter to
-     *  be passed to the function when invoked.  Multiple copies of the
-     *  function are allowed.  If there are multiple callbacks, they are
-     *  invoked in the order they were registered.
-    */
-    void
-    register_callback(event_callback __fn, int __index);
-
-  protected:
-    streamsize		_M_precision;
-    streamsize		_M_width;
-    fmtflags		_M_flags;
-    iostate		_M_exception;
-    iostate		_M_streambuf_state;
-
-    // 27.4.2.6  Members for callbacks
-    // 27.4.2.6  ios_base callbacks
-    struct _Callback_list
-    {
-      // Data Members
-      _Callback_list*		_M_next;
-      ios_base::event_callback	_M_fn;
-      int			_M_index;
-      _Atomic_word		_M_refcount;  // 0 means one reference.
-
-      _Callback_list(ios_base::event_callback __fn, int __index,
-		     _Callback_list* __cb)
-      : _M_next(__cb), _M_fn(__fn), _M_index(__index), _M_refcount(0) { }
-
-      void
-      _M_add_reference() { __gnu_cxx::__atomic_add_dispatch(&_M_refcount, 1); }
-
-      // 0 => OK to delete.
-      int
-      _M_remove_reference() 
-      {
-        // Be race-detector-friendly.  For more info see bits/c++config.
-        _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_refcount);
-        int __res = __gnu_cxx::__exchange_and_add_dispatch(&_M_refcount, -1);
-        if (__res == 0)
-          {
-            _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&_M_refcount);
-          }
-        return __res;
-      }
-    };
-
-     _Callback_list*	_M_callbacks;
-
-    void
-    _M_call_callbacks(event __ev) throw();
-
-    void
-    _M_dispose_callbacks(void) throw();
-
-    // 27.4.2.5  Members for iword/pword storage
-    struct _Words
-    {
-      void*	_M_pword;
-      long	_M_iword;
-      _Words() : _M_pword(0), _M_iword(0) { }
-    };
-
-    // Only for failed iword/pword calls.
-    _Words		_M_word_zero;
-
-    // Guaranteed storage.
-    // The first 5 iword and pword slots are reserved for internal use.
-    enum { _S_local_word_size = 8 };
-    _Words		_M_local_word[_S_local_word_size];
-
-    // Allocated storage.
-    int			_M_word_size;
-    _Words*		_M_word;
-
-    _Words&
-    _M_grow_words(int __index, bool __iword);
-
-    // Members for locale and locale caching.
-    locale		_M_ios_locale;
-
-    void
-    _M_init() throw();
-
-  public:
-
-    // 27.4.2.1.6  Class ios_base::Init
-    // Used to initialize standard streams. In theory, g++ could use
-    // -finit-priority to order this stuff correctly without going
-    // through these machinations.
-    class Init
-    {
-      friend class ios_base;
-    public:
-      Init();
-      ~Init();
-
-    private:
-      static _Atomic_word	_S_refcount;
-      static bool		_S_synced_with_stdio;
-    };
-
-    // [27.4.2.2] fmtflags state functions
-    /**
-     *  @brief  Access to format flags.
-     *  @return  The format control flags for both input and output.
-    */
-    fmtflags
-    flags() const
-    { return _M_flags; }
-
-    /**
-     *  @brief  Setting new format flags all at once.
-     *  @param  __fmtfl  The new flags to set.
-     *  @return  The previous format control flags.
-     *
-     *  This function overwrites all the format flags with @a __fmtfl.
-    */
-    fmtflags
-    flags(fmtflags __fmtfl)
-    {
-      fmtflags __old = _M_flags;
-      _M_flags = __fmtfl;
-      return __old;
-    }
-
-    /**
-     *  @brief  Setting new format flags.
-     *  @param  __fmtfl  Additional flags to set.
-     *  @return  The previous format control flags.
-     *
-     *  This function sets additional flags in format control.  Flags that
-     *  were previously set remain set.
-    */
-    fmtflags
-    setf(fmtflags __fmtfl)
-    {
-      fmtflags __old = _M_flags;
-      _M_flags |= __fmtfl;
-      return __old;
-    }
-
-    /**
-     *  @brief  Setting new format flags.
-     *  @param  __fmtfl  Additional flags to set.
-     *  @param  __mask  The flags mask for @a fmtfl.
-     *  @return  The previous format control flags.
-     *
-     *  This function clears @a mask in the format flags, then sets
-     *  @a fmtfl @c & @a mask.  An example mask is @c ios_base::adjustfield.
-    */
-    fmtflags
-    setf(fmtflags __fmtfl, fmtflags __mask)
-    {
-      fmtflags __old = _M_flags;
-      _M_flags &= ~__mask;
-      _M_flags |= (__fmtfl & __mask);
-      return __old;
-    }
-
-    /**
-     *  @brief  Clearing format flags.
-     *  @param  __mask  The flags to unset.
-     *
-     *  This function clears @a __mask in the format flags.
-    */
-    void
-    unsetf(fmtflags __mask)
-    { _M_flags &= ~__mask; }
-
-    /**
-     *  @brief  Flags access.
-     *  @return  The precision to generate on certain output operations.
-     *
-     *  Be careful if you try to give a definition of @a precision here; see
-     *  DR 189.
-    */
-    streamsize
-    precision() const
-    { return _M_precision; }
-
-    /**
-     *  @brief  Changing flags.
-     *  @param  __prec  The new precision value.
-     *  @return  The previous value of precision().
-    */
-    streamsize
-    precision(streamsize __prec)
-    {
-      streamsize __old = _M_precision;
-      _M_precision = __prec;
-      return __old;
-    }
-
-    /**
-     *  @brief  Flags access.
-     *  @return  The minimum field width to generate on output operations.
-     *
-     *  <em>Minimum field width</em> refers to the number of characters.
-    */
-    streamsize
-    width() const
-    { return _M_width; }
-
-    /**
-     *  @brief  Changing flags.
-     *  @param  __wide  The new width value.
-     *  @return  The previous value of width().
-    */
-    streamsize
-    width(streamsize __wide)
-    {
-      streamsize __old = _M_width;
-      _M_width = __wide;
-      return __old;
-    }
-
-    // [27.4.2.4] ios_base static members
-    /**
-     *  @brief  Interaction with the standard C I/O objects.
-     *  @param  __sync  Whether to synchronize or not.
-     *  @return  True if the standard streams were previously synchronized.
-     *
-     *  The synchronization referred to is @e only that between the standard
-     *  C facilities (e.g., stdout) and the standard C++ objects (e.g.,
-     *  cout).  User-declared streams are unaffected.  See
-     *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/fstreams.html#std.io.filestreams.binary
-    */
-    static bool
-    sync_with_stdio(bool __sync = true);
-
-    // [27.4.2.3] ios_base locale functions
-    /**
-     *  @brief  Setting a new locale.
-     *  @param  __loc  The new locale.
-     *  @return  The previous locale.
-     *
-     *  Sets the new locale for this stream, and then invokes each callback
-     *  with imbue_event.
-    */
-    locale
-    imbue(const locale& __loc) throw();
-
-    /**
-     *  @brief  Locale access
-     *  @return  A copy of the current locale.
-     *
-     *  If @c imbue(loc) has previously been called, then this function
-     *  returns @c loc.  Otherwise, it returns a copy of @c std::locale(),
-     *  the global C++ locale.
-    */
-    locale
-    getloc() const
-    { return _M_ios_locale; }
-
-    /**
-     *  @brief  Locale access
-     *  @return  A reference to the current locale.
-     *
-     *  Like getloc above, but returns a reference instead of
-     *  generating a copy.
-    */
-    const locale&
-    _M_getloc() const
-    { return _M_ios_locale; }
-
-    // [27.4.2.5] ios_base storage functions
-    /**
-     *  @brief  Access to unique indices.
-     *  @return  An integer different from all previous calls.
-     *
-     *  This function returns a unique integer every time it is called.  It
-     *  can be used for any purpose, but is primarily intended to be a unique
-     *  index for the iword and pword functions.  The expectation is that an
-     *  application calls xalloc in order to obtain an index in the iword and
-     *  pword arrays that can be used without fear of conflict.
-     *
-     *  The implementation maintains a static variable that is incremented and
-     *  returned on each invocation.  xalloc is guaranteed to return an index
-     *  that is safe to use in the iword and pword arrays.
-    */
-    static int
-    xalloc() throw();
-
-    /**
-     *  @brief  Access to integer array.
-     *  @param  __ix  Index into the array.
-     *  @return  A reference to an integer associated with the index.
-     *
-     *  The iword function provides access to an array of integers that can be
-     *  used for any purpose.  The array grows as required to hold the
-     *  supplied index.  All integers in the array are initialized to 0.
-     *
-     *  The implementation reserves several indices.  You should use xalloc to
-     *  obtain an index that is safe to use.  Also note that since the array
-     *  can grow dynamically, it is not safe to hold onto the reference.
-    */
-    long&
-    iword(int __ix)
-    {
-      _Words& __word = (__ix < _M_word_size)
-			? _M_word[__ix] : _M_grow_words(__ix, true);
-      return __word._M_iword;
-    }
-
-    /**
-     *  @brief  Access to void pointer array.
-     *  @param  __ix  Index into the array.
-     *  @return  A reference to a void* associated with the index.
-     *
-     *  The pword function provides access to an array of pointers that can be
-     *  used for any purpose.  The array grows as required to hold the
-     *  supplied index.  All pointers in the array are initialized to 0.
-     *
-     *  The implementation reserves several indices.  You should use xalloc to
-     *  obtain an index that is safe to use.  Also note that since the array
-     *  can grow dynamically, it is not safe to hold onto the reference.
-    */
-    void*&
-    pword(int __ix)
-    {
-      _Words& __word = (__ix < _M_word_size)
-			? _M_word[__ix] : _M_grow_words(__ix, false);
-      return __word._M_pword;
-    }
-
-    // Destructor
-    /**
-     *  Invokes each callback with erase_event.  Destroys local storage.
-     *
-     *  Note that the ios_base object for the standard streams never gets
-     *  destroyed.  As a result, any callbacks registered with the standard
-     *  streams will not get invoked with erase_event (unless copyfmt is
-     *  used).
-    */
-    virtual ~ios_base();
-
-  protected:
-    ios_base() throw ();
-
-#if __cplusplus < 201103L
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 50.  Copy constructor and assignment operator of ios_base
-  private:
-    ios_base(const ios_base&);
-
-    ios_base&
-    operator=(const ios_base&);
-#else
-  public:
-    ios_base(const ios_base&) = delete;
-
-    ios_base&
-    operator=(const ios_base&) = delete;
-
-  protected:
-    void
-    _M_move(ios_base&) noexcept;
-
-    void
-    _M_swap(ios_base& __rhs) noexcept;
-#endif
-  };
-
-  // [27.4.5.1] fmtflags manipulators
-  /// Calls base.setf(ios_base::boolalpha).
-  inline ios_base&
-  boolalpha(ios_base& __base)
-  {
-    __base.setf(ios_base::boolalpha);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::boolalpha).
-  inline ios_base&
-  noboolalpha(ios_base& __base)
-  {
-    __base.unsetf(ios_base::boolalpha);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::showbase).
-  inline ios_base&
-  showbase(ios_base& __base)
-  {
-    __base.setf(ios_base::showbase);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::showbase).
-  inline ios_base&
-  noshowbase(ios_base& __base)
-  {
-    __base.unsetf(ios_base::showbase);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::showpoint).
-  inline ios_base&
-  showpoint(ios_base& __base)
-  {
-    __base.setf(ios_base::showpoint);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::showpoint).
-  inline ios_base&
-  noshowpoint(ios_base& __base)
-  {
-    __base.unsetf(ios_base::showpoint);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::showpos).
-  inline ios_base&
-  showpos(ios_base& __base)
-  {
-    __base.setf(ios_base::showpos);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::showpos).
-  inline ios_base&
-  noshowpos(ios_base& __base)
-  {
-    __base.unsetf(ios_base::showpos);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::skipws).
-  inline ios_base&
-  skipws(ios_base& __base)
-  {
-    __base.setf(ios_base::skipws);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::skipws).
-  inline ios_base&
-  noskipws(ios_base& __base)
-  {
-    __base.unsetf(ios_base::skipws);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::uppercase).
-  inline ios_base&
-  uppercase(ios_base& __base)
-  {
-    __base.setf(ios_base::uppercase);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::uppercase).
-  inline ios_base&
-  nouppercase(ios_base& __base)
-  {
-    __base.unsetf(ios_base::uppercase);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::unitbuf).
-  inline ios_base&
-  unitbuf(ios_base& __base)
-  {
-     __base.setf(ios_base::unitbuf);
-     return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::unitbuf).
-  inline ios_base&
-  nounitbuf(ios_base& __base)
-  {
-     __base.unsetf(ios_base::unitbuf);
-     return __base;
-  }
-
-  // [27.4.5.2] adjustfield manipulators
-  /// Calls base.setf(ios_base::internal, ios_base::adjustfield).
-  inline ios_base&
-  internal(ios_base& __base)
-  {
-     __base.setf(ios_base::internal, ios_base::adjustfield);
-     return __base;
-  }
-
-  /// Calls base.setf(ios_base::left, ios_base::adjustfield).
-  inline ios_base&
-  left(ios_base& __base)
-  {
-    __base.setf(ios_base::left, ios_base::adjustfield);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::right, ios_base::adjustfield).
-  inline ios_base&
-  right(ios_base& __base)
-  {
-    __base.setf(ios_base::right, ios_base::adjustfield);
-    return __base;
-  }
-
-  // [27.4.5.3] basefield manipulators
-  /// Calls base.setf(ios_base::dec, ios_base::basefield).
-  inline ios_base&
-  dec(ios_base& __base)
-  {
-    __base.setf(ios_base::dec, ios_base::basefield);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::hex, ios_base::basefield).
-  inline ios_base&
-  hex(ios_base& __base)
-  {
-    __base.setf(ios_base::hex, ios_base::basefield);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::oct, ios_base::basefield).
-  inline ios_base&
-  oct(ios_base& __base)
-  {
-    __base.setf(ios_base::oct, ios_base::basefield);
-    return __base;
-  }
-
-  // [27.4.5.4] floatfield manipulators
-  /// Calls base.setf(ios_base::fixed, ios_base::floatfield).
-  inline ios_base&
-  fixed(ios_base& __base)
-  {
-    __base.setf(ios_base::fixed, ios_base::floatfield);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::scientific, ios_base::floatfield).
-  inline ios_base&
-  scientific(ios_base& __base)
-  {
-    __base.setf(ios_base::scientific, ios_base::floatfield);
-    return __base;
-  }
-
-#if __cplusplus >= 201103L
-  // New C++11 floatfield manipulators
-
-  /// Calls
-  /// base.setf(ios_base::fixed|ios_base::scientific, ios_base::floatfield)
-  inline ios_base&
-  hexfloat(ios_base& __base)
-  {
-    __base.setf(ios_base::fixed | ios_base::scientific, ios_base::floatfield);
-    return __base;
-  }
-
-  /// Calls @c base.unsetf(ios_base::floatfield)
-  inline ios_base&
-  defaultfloat(ios_base& __base)
-  {
-    __base.unsetf(ios_base::floatfield);
-    return __base;
-  }
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _IOS_BASE_H */
diff --git a/openflow/usr/include/c++/5/bits/istream.tcc b/openflow/usr/include/c++/5/bits/istream.tcc
deleted file mode 100644
index e8cbb26..0000000
--- a/openflow/usr/include/c++/5/bits/istream.tcc
+++ /dev/null
@@ -1,1092 +0,0 @@
-// istream classes -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/istream.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{istream}
- */
-
-//
-// ISO C++ 14882: 27.6.1  Input streams
-//
-
-#ifndef _ISTREAM_TCC
-#define _ISTREAM_TCC 1
-
-#pragma GCC system_header
-
-#include <bits/cxxabi_forced.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>::sentry::
-    sentry(basic_istream<_CharT, _Traits>& __in, bool __noskip) : _M_ok(false)
-    {
-      ios_base::iostate __err = ios_base::goodbit;
-      if (__in.good())
-	{
-	  if (__in.tie())
-	    __in.tie()->flush();
-	  if (!__noskip && bool(__in.flags() & ios_base::skipws))
-	    {
-	      const __int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = __in.rdbuf();
-	      __int_type __c = __sb->sgetc();
-
-	      const __ctype_type& __ct = __check_facet(__in._M_ctype);
-	      while (!traits_type::eq_int_type(__c, __eof)
-		     && __ct.is(ctype_base::space, 
-				traits_type::to_char_type(__c)))
-		__c = __sb->snextc();
-
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 195. Should basic_istream::sentry's constructor ever
-	      // set eofbit?
-	      if (traits_type::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-	    }
-	}
-
-      if (__in.good() && __err == ios_base::goodbit)
-	_M_ok = true;
-      else
-	{
-	  __err |= ios_base::failbit;
-	  __in.setstate(__err);
-	}
-    }
-
-  template<typename _CharT, typename _Traits>
-    template<typename _ValueT>
-      basic_istream<_CharT, _Traits>&
-      basic_istream<_CharT, _Traits>::
-      _M_extract(_ValueT& __v)
-      {
-	sentry __cerb(*this, false);
-	if (__cerb)
-	  {
-	    ios_base::iostate __err = ios_base::goodbit;
-	    __try
-	      {
-		const __num_get_type& __ng = __check_facet(this->_M_num_get);
-		__ng.get(*this, 0, *this, __err, __v);
-	      }
-	    __catch(__cxxabiv1::__forced_unwind&)
-	      {
-		this->_M_setstate(ios_base::badbit);
-		__throw_exception_again;
-	      }
-	    __catch(...)
-	      { this->_M_setstate(ios_base::badbit); }
-	    if (__err)
-	      this->setstate(__err);
-	  }
-	return *this;
-      }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(short& __n)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 118. basic_istream uses nonexistent num_get member functions.
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      long __l;
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __l);
-
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 696. istream::operator>>(int&) broken.
-	      if (__l < __gnu_cxx::__numeric_traits<short>::__min)
-		{
-		  __err |= ios_base::failbit;
-		  __n = __gnu_cxx::__numeric_traits<short>::__min;
-		}
-	      else if (__l > __gnu_cxx::__numeric_traits<short>::__max)
-		{
-		  __err |= ios_base::failbit;
-		  __n = __gnu_cxx::__numeric_traits<short>::__max;
-		}
-	      else
-		__n = short(__l);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(int& __n)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 118. basic_istream uses nonexistent num_get member functions.
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      long __l;
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __l);
-
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 696. istream::operator>>(int&) broken.
-	      if (__l < __gnu_cxx::__numeric_traits<int>::__min)
-		{
-		  __err |= ios_base::failbit;
-		  __n = __gnu_cxx::__numeric_traits<int>::__min;
-		}
-	      else if (__l > __gnu_cxx::__numeric_traits<int>::__max)
-		{
-		  __err |= ios_base::failbit;	      
-		  __n = __gnu_cxx::__numeric_traits<int>::__max;
-		}
-	      else
-		__n = int(__l);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(__streambuf_type* __sbout)
-    {
-      ios_base::iostate __err = ios_base::goodbit;
-      sentry __cerb(*this, false);
-      if (__cerb && __sbout)
-	{
-	  __try
-	    {
-	      bool __ineof;
-	      if (!__copy_streambufs_eof(this->rdbuf(), __sbout, __ineof))
-		__err |= ios_base::failbit;
-	      if (__ineof)
-		__err |= ios_base::eofbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::failbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::failbit); }
-	}
-      else if (!__sbout)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_istream<_CharT, _Traits>::int_type
-    basic_istream<_CharT, _Traits>::
-    get(void)
-    {
-      const int_type __eof = traits_type::eof();
-      int_type __c = __eof;
-      _M_gcount = 0;
-      ios_base::iostate __err = ios_base::goodbit;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      __c = this->rdbuf()->sbumpc();
-	      // 27.6.1.1 paragraph 3
-	      if (!traits_type::eq_int_type(__c, __eof))
-		_M_gcount = 1;
-	      else
-		__err |= ios_base::eofbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      if (!_M_gcount)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return __c;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    get(char_type& __c)
-    {
-      _M_gcount = 0;
-      ios_base::iostate __err = ios_base::goodbit;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      const int_type __cb = this->rdbuf()->sbumpc();
-	      // 27.6.1.1 paragraph 3
-	      if (!traits_type::eq_int_type(__cb, traits_type::eof()))
-		{
-		  _M_gcount = 1;
-		  __c = traits_type::to_char_type(__cb);
-		}
-	      else
-		__err |= ios_base::eofbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      if (!_M_gcount)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    get(char_type* __s, streamsize __n, char_type __delim)
-    {
-      _M_gcount = 0;
-      ios_base::iostate __err = ios_base::goodbit;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      const int_type __idelim = traits_type::to_int_type(__delim);
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = this->rdbuf();
-	      int_type __c = __sb->sgetc();
-
-	      while (_M_gcount + 1 < __n
-		     && !traits_type::eq_int_type(__c, __eof)
-		     && !traits_type::eq_int_type(__c, __idelim))
-		{
-		  *__s++ = traits_type::to_char_type(__c);
-		  ++_M_gcount;
-		  __c = __sb->snextc();
-		}
-	      if (traits_type::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 243. get and getline when sentry reports failure.
-      if (__n > 0)
-	*__s = char_type();
-      if (!_M_gcount)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    get(__streambuf_type& __sb, char_type __delim)
-    {
-      _M_gcount = 0;
-      ios_base::iostate __err = ios_base::goodbit;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      const int_type __idelim = traits_type::to_int_type(__delim);
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __this_sb = this->rdbuf();
-	      int_type __c = __this_sb->sgetc();
-	      char_type __c2 = traits_type::to_char_type(__c);
-
-	      while (!traits_type::eq_int_type(__c, __eof)
-		     && !traits_type::eq_int_type(__c, __idelim)
-		     && !traits_type::eq_int_type(__sb.sputc(__c2), __eof))
-		{
-		  ++_M_gcount;
-		  __c = __this_sb->snextc();
-		  __c2 = traits_type::to_char_type(__c);
-		}
-	      if (traits_type::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      if (!_M_gcount)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    getline(char_type* __s, streamsize __n, char_type __delim)
-    {
-      _M_gcount = 0;
-      ios_base::iostate __err = ios_base::goodbit;
-      sentry __cerb(*this, true);
-      if (__cerb)
-        {
-          __try
-            {
-              const int_type __idelim = traits_type::to_int_type(__delim);
-              const int_type __eof = traits_type::eof();
-              __streambuf_type* __sb = this->rdbuf();
-              int_type __c = __sb->sgetc();
-
-              while (_M_gcount + 1 < __n
-                     && !traits_type::eq_int_type(__c, __eof)
-                     && !traits_type::eq_int_type(__c, __idelim))
-                {
-                  *__s++ = traits_type::to_char_type(__c);
-                  __c = __sb->snextc();
-                  ++_M_gcount;
-                }
-              if (traits_type::eq_int_type(__c, __eof))
-                __err |= ios_base::eofbit;
-              else
-                {
-                  if (traits_type::eq_int_type(__c, __idelim))
-                    {
-                      __sb->sbumpc();
-                      ++_M_gcount;
-                    }
-                  else
-                    __err |= ios_base::failbit;
-                }
-            }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-          __catch(...)
-            { this->_M_setstate(ios_base::badbit); }
-        }
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 243. get and getline when sentry reports failure.
-      if (__n > 0)
-	*__s = char_type();
-      if (!_M_gcount)
-        __err |= ios_base::failbit;
-      if (__err)
-        this->setstate(__err);
-      return *this;
-    }
-
-  // We provide three overloads, since the first two are much simpler
-  // than the general case. Also, the latter two can thus adopt the
-  // same "batchy" strategy used by getline above.
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    ignore(void)
-    {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = this->rdbuf();
-
-	      if (traits_type::eq_int_type(__sb->sbumpc(), __eof))
-		__err |= ios_base::eofbit;
-	      else
-		_M_gcount = 1;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    ignore(streamsize __n)
-    {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb && __n > 0)
-        {
-          ios_base::iostate __err = ios_base::goodbit;
-          __try
-            {
-              const int_type __eof = traits_type::eof();
-              __streambuf_type* __sb = this->rdbuf();
-              int_type __c = __sb->sgetc();
-
-	      // N.B. On LFS-enabled platforms streamsize is still 32 bits
-	      // wide: if we want to implement the standard mandated behavior
-	      // for n == max() (see 27.6.1.3/24) we are at risk of signed
-	      // integer overflow: thus these contortions. Also note that,
-	      // by definition, when more than 2G chars are actually ignored,
-	      // _M_gcount (the return value of gcount, that is) cannot be
-	      // really correct, being unavoidably too small.
-	      bool __large_ignore = false;
-	      while (true)
-		{
-		  while (_M_gcount < __n
-			 && !traits_type::eq_int_type(__c, __eof))
-		    {
-		      ++_M_gcount;
-		      __c = __sb->snextc();
-		    }
-		  if (__n == __gnu_cxx::__numeric_traits<streamsize>::__max
-		      && !traits_type::eq_int_type(__c, __eof))
-		    {
-		      _M_gcount =
-			__gnu_cxx::__numeric_traits<streamsize>::__min;
-		      __large_ignore = true;
-		    }
-		  else
-		    break;
-		}
-
-	      if (__large_ignore)
-		_M_gcount = __gnu_cxx::__numeric_traits<streamsize>::__max;
-
-	      if (traits_type::eq_int_type(__c, __eof))
-                __err |= ios_base::eofbit;
-            }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-          __catch(...)
-            { this->_M_setstate(ios_base::badbit); }
-          if (__err)
-            this->setstate(__err);
-        }
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    ignore(streamsize __n, int_type __delim)
-    {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb && __n > 0)
-        {
-          ios_base::iostate __err = ios_base::goodbit;
-          __try
-            {
-              const int_type __eof = traits_type::eof();
-              __streambuf_type* __sb = this->rdbuf();
-              int_type __c = __sb->sgetc();
-
-	      // See comment above.
-	      bool __large_ignore = false;
-	      while (true)
-		{
-		  while (_M_gcount < __n
-			 && !traits_type::eq_int_type(__c, __eof)
-			 && !traits_type::eq_int_type(__c, __delim))
-		    {
-		      ++_M_gcount;
-		      __c = __sb->snextc();
-		    }
-		  if (__n == __gnu_cxx::__numeric_traits<streamsize>::__max
-		      && !traits_type::eq_int_type(__c, __eof)
-		      && !traits_type::eq_int_type(__c, __delim))
-		    {
-		      _M_gcount =
-			__gnu_cxx::__numeric_traits<streamsize>::__min;
-		      __large_ignore = true;
-		    }
-		  else
-		    break;
-		}
-
-	      if (__large_ignore)
-		_M_gcount = __gnu_cxx::__numeric_traits<streamsize>::__max;
-
-              if (traits_type::eq_int_type(__c, __eof))
-                __err |= ios_base::eofbit;
-	      else if (traits_type::eq_int_type(__c, __delim))
-		{
-		  if (_M_gcount
-		      < __gnu_cxx::__numeric_traits<streamsize>::__max)
-		    ++_M_gcount;
-		  __sb->sbumpc();
-		}
-            }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-          __catch(...)
-            { this->_M_setstate(ios_base::badbit); }
-          if (__err)
-            this->setstate(__err);
-        }
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_istream<_CharT, _Traits>::int_type
-    basic_istream<_CharT, _Traits>::
-    peek(void)
-    {
-      int_type __c = traits_type::eof();
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      __c = this->rdbuf()->sgetc();
-	      if (traits_type::eq_int_type(__c, traits_type::eof()))
-		__err |= ios_base::eofbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return __c;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    read(char_type* __s, streamsize __n)
-    {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      _M_gcount = this->rdbuf()->sgetn(__s, __n);
-	      if (_M_gcount != __n)
-		__err |= (ios_base::eofbit | ios_base::failbit);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    streamsize
-    basic_istream<_CharT, _Traits>::
-    readsome(char_type* __s, streamsize __n)
-    {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      // Cannot compare int_type with streamsize generically.
-	      const streamsize __num = this->rdbuf()->in_avail();
-	      if (__num > 0)
-		_M_gcount = this->rdbuf()->sgetn(__s, std::min(__num, __n));
-	      else if (__num == -1)
-		__err |= ios_base::eofbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return _M_gcount;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    putback(char_type __c)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 60. What is a formatted input function?
-      _M_gcount = 0;
-      // Clear eofbit per N3168.
-      this->clear(this->rdstate() & ~ios_base::eofbit);
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = this->rdbuf();
-	      if (!__sb
-		  || traits_type::eq_int_type(__sb->sputbackc(__c), __eof))
-		__err |= ios_base::badbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    unget(void)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 60. What is a formatted input function?
-      _M_gcount = 0;
-      // Clear eofbit per N3168.
-      this->clear(this->rdstate() & ~ios_base::eofbit);
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = this->rdbuf();
-	      if (!__sb
-		  || traits_type::eq_int_type(__sb->sungetc(), __eof))
-		__err |= ios_base::badbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    int
-    basic_istream<_CharT, _Traits>::
-    sync(void)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR60.  Do not change _M_gcount.
-      int __ret = -1;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      __streambuf_type* __sb = this->rdbuf();
-	      if (__sb)
-		{
-		  if (__sb->pubsync() == -1)
-		    __err |= ios_base::badbit;
-		  else
-		    __ret = 0;
-		}
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_istream<_CharT, _Traits>::pos_type
-    basic_istream<_CharT, _Traits>::
-    tellg(void)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR60.  Do not change _M_gcount.
-      pos_type __ret = pos_type(-1);
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      if (!this->fail())
-		__ret = this->rdbuf()->pubseekoff(0, ios_base::cur,
-						  ios_base::in);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    seekg(pos_type __pos)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR60.  Do not change _M_gcount.
-      // Clear eofbit per N3168.
-      this->clear(this->rdstate() & ~ios_base::eofbit);
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      if (!this->fail())
-		{
-		  // 136.  seekp, seekg setting wrong streams?
-		  const pos_type __p = this->rdbuf()->pubseekpos(__pos,
-								 ios_base::in);
-		  
-		  // 129.  Need error indication from seekp() and seekg()
-		  if (__p == pos_type(off_type(-1)))
-		    __err |= ios_base::failbit;
-		}
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    seekg(off_type __off, ios_base::seekdir __dir)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR60.  Do not change _M_gcount.
-      // Clear eofbit per N3168.
-      this->clear(this->rdstate() & ~ios_base::eofbit);
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      if (!this->fail())
-		{
-		  // 136.  seekp, seekg setting wrong streams?
-		  const pos_type __p = this->rdbuf()->pubseekoff(__off, __dir,
-								 ios_base::in);
-	      
-		  // 129.  Need error indication from seekp() and seekg()
-		  if (__p == pos_type(off_type(-1)))
-		    __err |= ios_base::failbit;
-		}
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  // 27.6.1.2.3 Character extraction templates
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c)
-    {
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef typename __istream_type::int_type         __int_type;
-
-      typename __istream_type::sentry __cerb(__in, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      const __int_type __cb = __in.rdbuf()->sbumpc();
-	      if (!_Traits::eq_int_type(__cb, _Traits::eof()))
-		__c = _Traits::to_char_type(__cb);
-	      else
-		__err |= (ios_base::eofbit | ios_base::failbit);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __in._M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { __in._M_setstate(ios_base::badbit); }
-	  if (__err)
-	    __in.setstate(__err);
-	}
-      return __in;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s)
-    {
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef basic_streambuf<_CharT, _Traits>          __streambuf_type;
-      typedef typename _Traits::int_type		int_type;
-      typedef _CharT					char_type;
-      typedef ctype<_CharT>				__ctype_type;
-
-      streamsize __extracted = 0;
-      ios_base::iostate __err = ios_base::goodbit;
-      typename __istream_type::sentry __cerb(__in, false);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      // Figure out how many characters to extract.
-	      streamsize __num = __in.width();
-	      if (__num <= 0)
-		__num = __gnu_cxx::__numeric_traits<streamsize>::__max;
-
-	      const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
-
-	      const int_type __eof = _Traits::eof();
-	      __streambuf_type* __sb = __in.rdbuf();
-	      int_type __c = __sb->sgetc();
-
-	      while (__extracted < __num - 1
-		     && !_Traits::eq_int_type(__c, __eof)
-		     && !__ct.is(ctype_base::space,
-				 _Traits::to_char_type(__c)))
-		{
-		  *__s++ = _Traits::to_char_type(__c);
-		  ++__extracted;
-		  __c = __sb->snextc();
-		}
-	      if (_Traits::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 68.  Extractors for char* should store null at end
-	      *__s = char_type();
-	      __in.width(0);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __in._M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { __in._M_setstate(ios_base::badbit); }
-	}
-      if (!__extracted)
-	__err |= ios_base::failbit;
-      if (__err)
-	__in.setstate(__err);
-      return __in;
-    }
-
-  // 27.6.1.4 Standard basic_istream manipulators
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    ws(basic_istream<_CharT, _Traits>& __in)
-    {
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef basic_streambuf<_CharT, _Traits>          __streambuf_type;
-      typedef typename __istream_type::int_type		__int_type;
-      typedef ctype<_CharT>				__ctype_type;
-
-      const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
-      const __int_type __eof = _Traits::eof();
-      __streambuf_type* __sb = __in.rdbuf();
-      __int_type __c = __sb->sgetc();
-
-      while (!_Traits::eq_int_type(__c, __eof)
-	     && __ct.is(ctype_base::space, _Traits::to_char_type(__c)))
-	__c = __sb->snextc();
-
-       if (_Traits::eq_int_type(__c, __eof))
-	 __in.setstate(ios_base::eofbit);
-      return __in;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_istream<char>;
-  extern template istream& ws(istream&);
-  extern template istream& operator>>(istream&, char&);
-  extern template istream& operator>>(istream&, char*);
-  extern template istream& operator>>(istream&, unsigned char&);
-  extern template istream& operator>>(istream&, signed char&);
-  extern template istream& operator>>(istream&, unsigned char*);
-  extern template istream& operator>>(istream&, signed char*);
-
-  extern template istream& istream::_M_extract(unsigned short&);
-  extern template istream& istream::_M_extract(unsigned int&);  
-  extern template istream& istream::_M_extract(long&);
-  extern template istream& istream::_M_extract(unsigned long&);
-  extern template istream& istream::_M_extract(bool&);
-#ifdef _GLIBCXX_USE_LONG_LONG
-  extern template istream& istream::_M_extract(long long&);
-  extern template istream& istream::_M_extract(unsigned long long&);
-#endif
-  extern template istream& istream::_M_extract(float&);
-  extern template istream& istream::_M_extract(double&);
-  extern template istream& istream::_M_extract(long double&);
-  extern template istream& istream::_M_extract(void*&);
-
-  extern template class basic_iostream<char>;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_istream<wchar_t>;
-  extern template wistream& ws(wistream&);
-  extern template wistream& operator>>(wistream&, wchar_t&);
-  extern template wistream& operator>>(wistream&, wchar_t*);
-
-  extern template wistream& wistream::_M_extract(unsigned short&);
-  extern template wistream& wistream::_M_extract(unsigned int&);  
-  extern template wistream& wistream::_M_extract(long&);
-  extern template wistream& wistream::_M_extract(unsigned long&);
-  extern template wistream& wistream::_M_extract(bool&);
-#ifdef _GLIBCXX_USE_LONG_LONG
-  extern template wistream& wistream::_M_extract(long long&);
-  extern template wistream& wistream::_M_extract(unsigned long long&);
-#endif
-  extern template wistream& wistream::_M_extract(float&);
-  extern template wistream& wistream::_M_extract(double&);
-  extern template wistream& wistream::_M_extract(long double&);
-  extern template wistream& wistream::_M_extract(void*&);
-
-  extern template class basic_iostream<wchar_t>;
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/list.tcc b/openflow/usr/include/c++/5/bits/list.tcc
deleted file mode 100644
index a9c8a55..0000000
--- a/openflow/usr/include/c++/5/bits/list.tcc
+++ /dev/null
@@ -1,519 +0,0 @@
-// List implementation (out of line) -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/list.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{list}
- */
-
-#ifndef _LIST_TCC
-#define _LIST_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  template<typename _Tp, typename _Alloc>
-    void
-    _List_base<_Tp, _Alloc>::
-    _M_clear() _GLIBCXX_NOEXCEPT
-    {
-      typedef _List_node<_Tp>  _Node;
-      __detail::_List_node_base* __cur = _M_impl._M_node._M_next;
-      while (__cur != &_M_impl._M_node)
-	{
-	  _Node* __tmp = static_cast<_Node*>(__cur);
-	  __cur = __tmp->_M_next;
-#if __cplusplus >= 201103L
-	  _M_get_Node_allocator().destroy(__tmp);
-#else
-	  _M_get_Tp_allocator().destroy(std::__addressof(__tmp->_M_data));
-#endif
-	  _M_put_node(__tmp);
-	}
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Alloc>
-    template<typename... _Args>
-      typename list<_Tp, _Alloc>::iterator
-      list<_Tp, _Alloc>::
-      emplace(const_iterator __position, _Args&&... __args)
-      {
-	_Node* __tmp = _M_create_node(std::forward<_Args>(__args)...);
-	__tmp->_M_hook(__position._M_const_cast()._M_node);
-	this->_M_inc_size(1);
-	return iterator(__tmp);
-      }
-#endif
-
-  template<typename _Tp, typename _Alloc>
-    typename list<_Tp, _Alloc>::iterator
-    list<_Tp, _Alloc>::
-#if __cplusplus >= 201103L
-    insert(const_iterator __position, const value_type& __x)
-#else
-    insert(iterator __position, const value_type& __x)
-#endif
-    {
-      _Node* __tmp = _M_create_node(__x);
-      __tmp->_M_hook(__position._M_const_cast()._M_node);
-      this->_M_inc_size(1);
-      return iterator(__tmp);
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Alloc>
-    typename list<_Tp, _Alloc>::iterator
-    list<_Tp, _Alloc>::
-    insert(const_iterator __position, size_type __n, const value_type& __x)
-    {
-      if (__n)
-	{
-	  list __tmp(__n, __x, get_allocator());
-	  iterator __it = __tmp.begin();
-	  splice(__position, __tmp);
-	  return __it;
-	}
-      return __position._M_const_cast();
-    }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename _InputIterator, typename>
-      typename list<_Tp, _Alloc>::iterator
-      list<_Tp, _Alloc>::
-      insert(const_iterator __position, _InputIterator __first,
-	     _InputIterator __last)
-      {
-	list __tmp(__first, __last, get_allocator());
-	if (!__tmp.empty())
-	  {
-	    iterator __it = __tmp.begin();
-	    splice(__position, __tmp);
-	    return __it;
-	  }
-	return __position._M_const_cast();
-      }
-#endif
-
-  template<typename _Tp, typename _Alloc>
-    typename list<_Tp, _Alloc>::iterator
-    list<_Tp, _Alloc>::
-#if __cplusplus >= 201103L
-    erase(const_iterator __position) noexcept
-#else
-    erase(iterator __position)
-#endif
-    {
-      iterator __ret = iterator(__position._M_node->_M_next);
-      _M_erase(__position._M_const_cast());
-      return __ret;
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp, _Alloc>::
-    _M_default_append(size_type __n)
-    {
-      size_type __i = 0;
-      __try
-	{
-	  for (; __i < __n; ++__i)
-	    emplace_back();
-	}
-      __catch(...)
-	{
-	  for (; __i; --__i)
-	    pop_back();
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp, _Alloc>::
-    resize(size_type __new_size)
-    {
-      iterator __i = begin();
-      size_type __len = 0;
-      for (; __i != end() && __len < __new_size; ++__i, ++__len)
-        ;
-      if (__len == __new_size)
-        erase(__i, end());
-      else                          // __i == end()
-	_M_default_append(__new_size - __len);
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp, _Alloc>::
-    resize(size_type __new_size, const value_type& __x)
-    {
-      iterator __i = begin();
-      size_type __len = 0;
-      for (; __i != end() && __len < __new_size; ++__i, ++__len)
-        ;
-      if (__len == __new_size)
-        erase(__i, end());
-      else                          // __i == end()
-        insert(end(), __new_size - __len, __x);
-    }
-#else
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp, _Alloc>::
-    resize(size_type __new_size, value_type __x)
-    {
-      iterator __i = begin();
-      size_type __len = 0;
-      for (; __i != end() && __len < __new_size; ++__i, ++__len)
-        ;
-      if (__len == __new_size)
-        erase(__i, end());
-      else                          // __i == end()
-        insert(end(), __new_size - __len, __x);
-    }
-#endif
-
-  template<typename _Tp, typename _Alloc>
-    list<_Tp, _Alloc>&
-    list<_Tp, _Alloc>::
-    operator=(const list& __x)
-    {
-      if (this != &__x)
-	{
-	  iterator __first1 = begin();
-	  iterator __last1 = end();
-	  const_iterator __first2 = __x.begin();
-	  const_iterator __last2 = __x.end();
-	  for (; __first1 != __last1 && __first2 != __last2;
-	       ++__first1, ++__first2)
-	    *__first1 = *__first2;
-	  if (__first2 == __last2)
-	    erase(__first1, __last1);
-	  else
-	    insert(__last1, __first2, __last2);
-	}
-      return *this;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp, _Alloc>::
-    _M_fill_assign(size_type __n, const value_type& __val)
-    {
-      iterator __i = begin();
-      for (; __i != end() && __n > 0; ++__i, --__n)
-        *__i = __val;
-      if (__n > 0)
-        insert(end(), __n, __val);
-      else
-        erase(__i, end());
-    }
-
-  template<typename _Tp, typename _Alloc>
-    template <typename _InputIterator>
-      void
-      list<_Tp, _Alloc>::
-      _M_assign_dispatch(_InputIterator __first2, _InputIterator __last2,
-			 __false_type)
-      {
-        iterator __first1 = begin();
-        iterator __last1 = end();
-        for (; __first1 != __last1 && __first2 != __last2;
-	     ++__first1, ++__first2)
-          *__first1 = *__first2;
-        if (__first2 == __last2)
-          erase(__first1, __last1);
-        else
-          insert(__last1, __first2, __last2);
-      }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp, _Alloc>::
-    remove(const value_type& __value)
-    {
-      iterator __first = begin();
-      iterator __last = end();
-      iterator __extra = __last;
-      while (__first != __last)
-	{
-	  iterator __next = __first;
-	  ++__next;
-	  if (*__first == __value)
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 526. Is it undefined if a function in the standard changes
-	      // in parameters?
-	      if (std::__addressof(*__first) != std::__addressof(__value))
-		_M_erase(__first);
-	      else
-		__extra = __first;
-	    }
-	  __first = __next;
-	}
-      if (__extra != __last)
-	_M_erase(__extra);
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp, _Alloc>::
-    unique()
-    {
-      iterator __first = begin();
-      iterator __last = end();
-      if (__first == __last)
-	return;
-      iterator __next = __first;
-      while (++__next != __last)
-	{
-	  if (*__first == *__next)
-	    _M_erase(__next);
-	  else
-	    __first = __next;
-	  __next = __first;
-	}
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp, _Alloc>::
-#if __cplusplus >= 201103L
-    merge(list&& __x)
-#else
-    merge(list& __x)
-#endif
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 300. list::merge() specification incomplete
-      if (this != &__x)
-	{
-	  _M_check_equal_allocators(__x); 
-
-	  iterator __first1 = begin();
-	  iterator __last1 = end();
-	  iterator __first2 = __x.begin();
-	  iterator __last2 = __x.end();
-	  while (__first1 != __last1 && __first2 != __last2)
-	    if (*__first2 < *__first1)
-	      {
-		iterator __next = __first2;
-		_M_transfer(__first1, __first2, ++__next);
-		__first2 = __next;
-	      }
-	    else
-	      ++__first1;
-	  if (__first2 != __last2)
-	    _M_transfer(__last1, __first2, __last2);
-
-	  this->_M_inc_size(__x._M_get_size());
-	  __x._M_set_size(0);
-	}
-    }
-
-  template<typename _Tp, typename _Alloc>
-    template <typename _StrictWeakOrdering>
-      void
-      list<_Tp, _Alloc>::
-#if __cplusplus >= 201103L
-      merge(list&& __x, _StrictWeakOrdering __comp)
-#else
-      merge(list& __x, _StrictWeakOrdering __comp)
-#endif
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 300. list::merge() specification incomplete
-	if (this != &__x)
-	  {
-	    _M_check_equal_allocators(__x);
-
-	    iterator __first1 = begin();
-	    iterator __last1 = end();
-	    iterator __first2 = __x.begin();
-	    iterator __last2 = __x.end();
-	    while (__first1 != __last1 && __first2 != __last2)
-	      if (__comp(*__first2, *__first1))
-		{
-		  iterator __next = __first2;
-		  _M_transfer(__first1, __first2, ++__next);
-		  __first2 = __next;
-		}
-	      else
-		++__first1;
-	    if (__first2 != __last2)
-	      _M_transfer(__last1, __first2, __last2);
-
-	    this->_M_inc_size(__x._M_get_size());
-	    __x._M_set_size(0);
-	  }
-      }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp, _Alloc>::
-    sort()
-    {
-      // Do nothing if the list has length 0 or 1.
-      if (this->_M_impl._M_node._M_next != &this->_M_impl._M_node
-	  && this->_M_impl._M_node._M_next->_M_next != &this->_M_impl._M_node)
-      {
-        list __carry;
-        list __tmp[64];
-        list * __fill = &__tmp[0];
-        list * __counter;
-
-        do
-	  {
-	    __carry.splice(__carry.begin(), *this, begin());
-
-	    for(__counter = &__tmp[0];
-		__counter != __fill && !__counter->empty();
-		++__counter)
-	      {
-		__counter->merge(__carry);
-		__carry.swap(*__counter);
-	      }
-	    __carry.swap(*__counter);
-	    if (__counter == __fill)
-	      ++__fill;
-	  }
-	while ( !empty() );
-
-        for (__counter = &__tmp[1]; __counter != __fill; ++__counter)
-          __counter->merge(*(__counter - 1));
-        swap( *(__fill - 1) );
-      }
-    }
-
-  template<typename _Tp, typename _Alloc>
-    template <typename _Predicate>
-      void
-      list<_Tp, _Alloc>::
-      remove_if(_Predicate __pred)
-      {
-        iterator __first = begin();
-        iterator __last = end();
-        while (__first != __last)
-	  {
-	    iterator __next = __first;
-	    ++__next;
-	    if (__pred(*__first))
-	      _M_erase(__first);
-	    __first = __next;
-	  }
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template <typename _BinaryPredicate>
-      void
-      list<_Tp, _Alloc>::
-      unique(_BinaryPredicate __binary_pred)
-      {
-        iterator __first = begin();
-        iterator __last = end();
-        if (__first == __last)
-	  return;
-        iterator __next = __first;
-        while (++__next != __last)
-	  {
-	    if (__binary_pred(*__first, *__next))
-	      _M_erase(__next);
-	    else
-	      __first = __next;
-	    __next = __first;
-	  }
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template <typename _StrictWeakOrdering>
-      void
-      list<_Tp, _Alloc>::
-      sort(_StrictWeakOrdering __comp)
-      {
-	// Do nothing if the list has length 0 or 1.
-	if (this->_M_impl._M_node._M_next != &this->_M_impl._M_node
-	    && this->_M_impl._M_node._M_next->_M_next != &this->_M_impl._M_node)
-	  {
-	    list __carry;
-	    list __tmp[64];
-	    list * __fill = &__tmp[0];
-	    list * __counter;
-
-	    do
-	      {
-		__carry.splice(__carry.begin(), *this, begin());
-
-		for(__counter = &__tmp[0];
-		    __counter != __fill && !__counter->empty();
-		    ++__counter)
-		  {
-		    __counter->merge(__carry, __comp);
-		    __carry.swap(*__counter);
-		  }
-		__carry.swap(*__counter);
-		if (__counter == __fill)
-		  ++__fill;
-	      }
-	    while ( !empty() );
-
-	    for (__counter = &__tmp[1]; __counter != __fill; ++__counter)
-	      __counter->merge(*(__counter - 1), __comp);
-	    swap(*(__fill - 1));
-	  }
-      }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif /* _LIST_TCC */
-
diff --git a/openflow/usr/include/c++/5/bits/locale_classes.h b/openflow/usr/include/c++/5/bits/locale_classes.h
deleted file mode 100644
index f3898eb..0000000
--- a/openflow/usr/include/c++/5/bits/locale_classes.h
+++ /dev/null
@@ -1,844 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/locale_classes.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-#ifndef _LOCALE_CLASSES_H
-#define _LOCALE_CLASSES_H 1
-
-#pragma GCC system_header
-
-#include <bits/localefwd.h>
-#include <string>
-#include <ext/atomicity.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // 22.1.1 Class locale
-  /**
-   *  @brief  Container class for localization functionality.
-   *  @ingroup locales
-   *
-   *  The locale class is first a class wrapper for C library locales.  It is
-   *  also an extensible container for user-defined localization.  A locale is
-   *  a collection of facets that implement various localization features such
-   *  as money, time, and number printing.
-   *
-   *  Constructing C++ locales does not change the C library locale.
-   *
-   *  This library supports efficient construction and copying of locales
-   *  through a reference counting implementation of the locale class.
-  */
-  class locale
-  {
-  public:
-    // Types:
-    /// Definition of locale::category.
-    typedef int	category;
-
-    // Forward decls and friends:
-    class facet;
-    class id;
-    class _Impl;
-
-    friend class facet;
-    friend class _Impl;
-
-    template<typename _Facet>
-      friend bool
-      has_facet(const locale&) throw();
-
-    template<typename _Facet>
-      friend const _Facet&
-      use_facet(const locale&);
-
-    template<typename _Cache>
-      friend struct __use_cache;
-
-    //@{
-    /**
-     *  @brief  Category values.
-     *
-     *  The standard category values are none, ctype, numeric, collate, time,
-     *  monetary, and messages.  They form a bitmask that supports union and
-     *  intersection.  The category all is the union of these values.
-     *
-     *  NB: Order must match _S_facet_categories definition in locale.cc
-    */
-    static const category none		= 0;
-    static const category ctype		= 1L << 0;
-    static const category numeric	= 1L << 1;
-    static const category collate	= 1L << 2;
-    static const category time		= 1L << 3;
-    static const category monetary	= 1L << 4;
-    static const category messages	= 1L << 5;
-    static const category all		= (ctype | numeric | collate |
-					   time  | monetary | messages);
-    //@}
-
-    // Construct/copy/destroy:
-
-    /**
-     *  @brief  Default constructor.
-     *
-     *  Constructs a copy of the global locale.  If no locale has been
-     *  explicitly set, this is the C locale.
-    */
-    locale() throw();
-
-    /**
-     *  @brief  Copy constructor.
-     *
-     *  Constructs a copy of @a other.
-     *
-     *  @param  __other  The locale to copy.
-    */
-    locale(const locale& __other) throw();
-
-    /**
-     *  @brief  Named locale constructor.
-     *
-     *  Constructs a copy of the named C library locale.
-     *
-     *  @param  __s  Name of the locale to construct.
-     *  @throw  std::runtime_error if __s is null or an undefined locale.
-    */
-    explicit
-    locale(const char* __s);
-
-    /**
-     *  @brief  Construct locale with facets from another locale.
-     *
-     *  Constructs a copy of the locale @a base.  The facets specified by @a
-     *  cat are replaced with those from the locale named by @a s.  If base is
-     *  named, this locale instance will also be named.
-     *
-     *  @param  __base  The locale to copy.
-     *  @param  __s  Name of the locale to use facets from.
-     *  @param  __cat  Set of categories defining the facets to use from __s.
-     *  @throw  std::runtime_error if __s is null or an undefined locale.
-    */
-    locale(const locale& __base, const char* __s, category __cat);
-
-#if __cplusplus >= 201103L
-    /**
-     *  @brief  Named locale constructor.
-     *
-     *  Constructs a copy of the named C library locale.
-     *
-     *  @param  __s  Name of the locale to construct.
-     *  @throw  std::runtime_error if __s is an undefined locale.
-    */
-    explicit
-    locale(const std::string& __s) : locale(__s.c_str()) { }
-
-    /**
-     *  @brief  Construct locale with facets from another locale.
-     *
-     *  Constructs a copy of the locale @a base.  The facets specified by @a
-     *  cat are replaced with those from the locale named by @a s.  If base is
-     *  named, this locale instance will also be named.
-     *
-     *  @param  __base  The locale to copy.
-     *  @param  __s  Name of the locale to use facets from.
-     *  @param  __cat  Set of categories defining the facets to use from __s.
-     *  @throw  std::runtime_error if __s is an undefined locale.
-    */
-    locale(const locale& __base, const std::string& __s, category __cat)
-    : locale(__base, __s.c_str(), __cat) { }
-#endif
-
-    /**
-     *  @brief  Construct locale with facets from another locale.
-     *
-     *  Constructs a copy of the locale @a base.  The facets specified by @a
-     *  cat are replaced with those from the locale @a add.  If @a base and @a
-     *  add are named, this locale instance will also be named.
-     *
-     *  @param  __base  The locale to copy.
-     *  @param  __add  The locale to use facets from.
-     *  @param  __cat  Set of categories defining the facets to use from add.
-    */
-    locale(const locale& __base, const locale& __add, category __cat);
-
-    /**
-     *  @brief  Construct locale with another facet.
-     *
-     *  Constructs a copy of the locale @a __other.  The facet @a __f
-     *  is added to @a __other, replacing an existing facet of type
-     *  Facet if there is one.  If @a __f is null, this locale is a
-     *  copy of @a __other.
-     *
-     *  @param  __other  The locale to copy.
-     *  @param  __f  The facet to add in.
-    */
-    template<typename _Facet>
-      locale(const locale& __other, _Facet* __f);
-
-    /// Locale destructor.
-    ~locale() throw();
-
-    /**
-     *  @brief  Assignment operator.
-     *
-     *  Set this locale to be a copy of @a other.
-     *
-     *  @param  __other  The locale to copy.
-     *  @return  A reference to this locale.
-    */
-    const locale&
-    operator=(const locale& __other) throw();
-
-    /**
-     *  @brief  Construct locale with another facet.
-     *
-     *  Constructs and returns a new copy of this locale.  Adds or replaces an
-     *  existing facet of type Facet from the locale @a other into the new
-     *  locale.
-     *
-     *  @tparam  _Facet  The facet type to copy from other
-     *  @param  __other  The locale to copy from.
-     *  @return  Newly constructed locale.
-     *  @throw  std::runtime_error if __other has no facet of type _Facet.
-    */
-    template<typename _Facet>
-      locale
-      combine(const locale& __other) const;
-
-    // Locale operations:
-    /**
-     *  @brief  Return locale name.
-     *  @return  Locale name or "*" if unnamed.
-    */
-    _GLIBCXX_DEFAULT_ABI_TAG
-    string
-    name() const;
-
-    /**
-     *  @brief  Locale equality.
-     *
-     *  @param  __other  The locale to compare against.
-     *  @return  True if other and this refer to the same locale instance, are
-     *		 copies, or have the same name.  False otherwise.
-    */
-    bool
-    operator==(const locale& __other) const throw();
-
-    /**
-     *  @brief  Locale inequality.
-     *
-     *  @param  __other  The locale to compare against.
-     *  @return  ! (*this == __other)
-    */
-    bool
-    operator!=(const locale& __other) const throw()
-    { return !(this->operator==(__other)); }
-
-    /**
-     *  @brief  Compare two strings according to collate.
-     *
-     *  Template operator to compare two strings using the compare function of
-     *  the collate facet in this locale.  One use is to provide the locale to
-     *  the sort function.  For example, a vector v of strings could be sorted
-     *  according to locale loc by doing:
-     *  @code
-     *  std::sort(v.begin(), v.end(), loc);
-     *  @endcode
-     *
-     *  @param  __s1  First string to compare.
-     *  @param  __s2  Second string to compare.
-     *  @return  True if collate<_Char> facet compares __s1 < __s2, else false.
-    */
-    template<typename _Char, typename _Traits, typename _Alloc>
-      bool
-      operator()(const basic_string<_Char, _Traits, _Alloc>& __s1,
-		 const basic_string<_Char, _Traits, _Alloc>& __s2) const;
-
-    // Global locale objects:
-    /**
-     *  @brief  Set global locale
-     *
-     *  This function sets the global locale to the argument and returns a
-     *  copy of the previous global locale.  If the argument has a name, it
-     *  will also call std::setlocale(LC_ALL, loc.name()).
-     *
-     *  @param  __loc  The new locale to make global.
-     *  @return  Copy of the old global locale.
-    */
-    static locale
-    global(const locale& __loc);
-
-    /**
-     *  @brief  Return reference to the C locale.
-    */
-    static const locale&
-    classic();
-
-  private:
-    // The (shared) implementation
-    _Impl*		_M_impl;
-
-    // The "C" reference locale
-    static _Impl*       _S_classic;
-
-    // Current global locale
-    static _Impl*	_S_global;
-
-    // Names of underlying locale categories.
-    // NB: locale::global() has to know how to modify all the
-    // underlying categories, not just the ones required by the C++
-    // standard.
-    static const char* const* const _S_categories;
-
-    // Number of standard categories. For C++, these categories are
-    // collate, ctype, monetary, numeric, time, and messages. These
-    // directly correspond to ISO C99 macros LC_COLLATE, LC_CTYPE,
-    // LC_MONETARY, LC_NUMERIC, and LC_TIME. In addition, POSIX (IEEE
-    // 1003.1-2001) specifies LC_MESSAGES.
-    // In addition to the standard categories, the underlying
-    // operating system is allowed to define extra LC_*
-    // macros. For GNU systems, the following are also valid:
-    // LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, LC_MEASUREMENT,
-    // and LC_IDENTIFICATION.
-    enum { _S_categories_size = 6 + _GLIBCXX_NUM_CATEGORIES };
-
-#ifdef __GTHREADS
-    static __gthread_once_t _S_once;
-#endif
-
-    explicit
-    locale(_Impl*) throw();
-
-    static void
-    _S_initialize();
-
-    static void
-    _S_initialize_once() throw();
-
-    static category
-    _S_normalize_category(category);
-
-    void
-    _M_coalesce(const locale& __base, const locale& __add, category __cat);
-
-#if _GLIBCXX_USE_CXX11_ABI
-    static const id* const _S_twinned_facets[];
-#endif
-  };
-
-
-  // 22.1.1.1.2  Class locale::facet
-  /**
-   *  @brief  Localization functionality base class.
-   *  @ingroup locales
-   *
-   *  The facet class is the base class for a localization feature, such as
-   *  money, time, and number printing.  It provides common support for facets
-   *  and reference management.
-   *
-   *  Facets may not be copied or assigned.
-  */
-  class locale::facet
-  {
-  private:
-    friend class locale;
-    friend class locale::_Impl;
-
-    mutable _Atomic_word		_M_refcount;
-
-    // Contains data from the underlying "C" library for the classic locale.
-    static __c_locale                   _S_c_locale;
-
-    // String literal for the name of the classic locale.
-    static const char			_S_c_name[2];
-
-#ifdef __GTHREADS
-    static __gthread_once_t		_S_once;
-#endif
-
-    static void
-    _S_initialize_once();
-
-  protected:
-    /**
-     *  @brief  Facet constructor.
-     *
-     *  This is the constructor provided by the standard.  If refs is 0, the
-     *  facet is destroyed when the last referencing locale is destroyed.
-     *  Otherwise the facet will never be destroyed.
-     *
-     *  @param __refs  The initial value for reference count.
-    */
-    explicit
-    facet(size_t __refs = 0) throw() : _M_refcount(__refs ? 1 : 0)
-    { }
-
-    /// Facet destructor.
-    virtual
-    ~facet();
-
-    static void
-    _S_create_c_locale(__c_locale& __cloc, const char* __s,
-		       __c_locale __old = 0);
-
-    static __c_locale
-    _S_clone_c_locale(__c_locale& __cloc) throw();
-
-    static void
-    _S_destroy_c_locale(__c_locale& __cloc);
-
-    static __c_locale
-    _S_lc_ctype_c_locale(__c_locale __cloc, const char* __s);
-
-    // Returns data from the underlying "C" library data for the
-    // classic locale.
-    static __c_locale
-    _S_get_c_locale();
-
-    _GLIBCXX_CONST static const char*
-    _S_get_c_name() throw();
-
-  private:
-    void
-    _M_add_reference() const throw()
-    { __gnu_cxx::__atomic_add_dispatch(&_M_refcount, 1); }
-
-    void
-    _M_remove_reference() const throw()
-    {
-      // Be race-detector-friendly.  For more info see bits/c++config.
-      _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_refcount);
-      if (__gnu_cxx::__exchange_and_add_dispatch(&_M_refcount, -1) == 1)
-	{
-          _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&_M_refcount);
-	  __try
-	    { delete this; }
-	  __catch(...)
-	    { }
-	}
-    }
-
-    facet(const facet&);  // Not defined.
-
-    facet&
-    operator=(const facet&);  // Not defined.
-
-    class __shim;
-
-    const facet* _M_sso_shim(const id*) const;
-    const facet* _M_cow_shim(const id*) const;
-  };
-
-
-  // 22.1.1.1.3 Class locale::id
-  /**
-   *  @brief  Facet ID class.
-   *  @ingroup locales
-   *
-   *  The ID class provides facets with an index used to identify them.
-   *  Every facet class must define a public static member locale::id, or be
-   *  derived from a facet that provides this member, otherwise the facet
-   *  cannot be used in a locale.  The locale::id ensures that each class
-   *  type gets a unique identifier.
-  */
-  class locale::id
-  {
-  private:
-    friend class locale;
-    friend class locale::_Impl;
-
-    template<typename _Facet>
-      friend const _Facet&
-      use_facet(const locale&);
-
-    template<typename _Facet>
-      friend bool
-      has_facet(const locale&) throw();
-
-    // NB: There is no accessor for _M_index because it may be used
-    // before the constructor is run; the effect of calling a member
-    // function (even an inline) would be undefined.
-    mutable size_t		_M_index;
-
-    // Last id number assigned.
-    static _Atomic_word		_S_refcount;
-
-    void
-    operator=(const id&);  // Not defined.
-
-    id(const id&);  // Not defined.
-
-  public:
-    // NB: This class is always a static data member, and thus can be
-    // counted on to be zero-initialized.
-    /// Constructor.
-    id() { }
-
-    size_t
-    _M_id() const throw();
-  };
-
-
-  // Implementation object for locale.
-  class locale::_Impl
-  {
-  public:
-    // Friends.
-    friend class locale;
-    friend class locale::facet;
-
-    template<typename _Facet>
-      friend bool
-      has_facet(const locale&) throw();
-
-    template<typename _Facet>
-      friend const _Facet&
-      use_facet(const locale&);
-
-    template<typename _Cache>
-      friend struct __use_cache;
-
-  private:
-    // Data Members.
-    _Atomic_word			_M_refcount;
-    const facet**			_M_facets;
-    size_t				_M_facets_size;
-    const facet**			_M_caches;
-    char**				_M_names;
-    static const locale::id* const	_S_id_ctype[];
-    static const locale::id* const	_S_id_numeric[];
-    static const locale::id* const	_S_id_collate[];
-    static const locale::id* const	_S_id_time[];
-    static const locale::id* const	_S_id_monetary[];
-    static const locale::id* const	_S_id_messages[];
-    static const locale::id* const* const _S_facet_categories[];
-
-    void
-    _M_add_reference() throw()
-    { __gnu_cxx::__atomic_add_dispatch(&_M_refcount, 1); }
-
-    void
-    _M_remove_reference() throw()
-    {
-      // Be race-detector-friendly.  For more info see bits/c++config.
-      _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_refcount);
-      if (__gnu_cxx::__exchange_and_add_dispatch(&_M_refcount, -1) == 1)
-	{
-          _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&_M_refcount);
-	  __try
-	    { delete this; }
-	  __catch(...)
-	    { }
-	}
-    }
-
-    _Impl(const _Impl&, size_t);
-    _Impl(const char*, size_t);
-    _Impl(size_t) throw();
-
-   ~_Impl() throw();
-
-    _Impl(const _Impl&);  // Not defined.
-
-    void
-    operator=(const _Impl&);  // Not defined.
-
-    bool
-    _M_check_same_name()
-    {
-      bool __ret = true;
-      if (_M_names[1])
-	// We must actually compare all the _M_names: can be all equal!
-	for (size_t __i = 0; __ret && __i < _S_categories_size - 1; ++__i)
-	  __ret = __builtin_strcmp(_M_names[__i], _M_names[__i + 1]) == 0;
-      return __ret;
-    }
-
-    void
-    _M_replace_categories(const _Impl*, category);
-
-    void
-    _M_replace_category(const _Impl*, const locale::id* const*);
-
-    void
-    _M_replace_facet(const _Impl*, const locale::id*);
-
-    void
-    _M_install_facet(const locale::id*, const facet*);
-
-    template<typename _Facet>
-      void
-      _M_init_facet(_Facet* __facet)
-      { _M_install_facet(&_Facet::id, __facet); }
-
-    template<typename _Facet>
-      void
-      _M_init_facet_unchecked(_Facet* __facet)
-      {
-	__facet->_M_add_reference();
-	_M_facets[_Facet::id._M_id()] = __facet;
-      }
-
-    void
-    _M_install_cache(const facet*, size_t);
-
-    void _M_init_extra(facet**);
-    void _M_init_extra(void*, void*, const char*, const char*);
-  };
-
-
-  /**
-   *  @brief  Facet for localized string comparison.
-   *
-   *  This facet encapsulates the code to compare strings in a localized
-   *  manner.
-   *
-   *  The collate template uses protected virtual functions to provide
-   *  the actual results.  The public accessors forward the call to
-   *  the virtual functions.  These virtual functions are hooks for
-   *  developers to implement the behavior they require from the
-   *  collate facet.
-  */
-  template<typename _CharT>
-    class _GLIBCXX_NAMESPACE_CXX11 collate : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-
-    protected:
-      // Underlying "C" library locale information saved from
-      // initialization, needed by collate_byname as well.
-      __c_locale			_M_c_locale_collate;
-
-    public:
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      collate(size_t __refs = 0)
-      : facet(__refs), _M_c_locale_collate(_S_get_c_locale())
-      { }
-
-      /**
-       *  @brief  Internal constructor. Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up new
-       *  locales.
-       *
-       *  @param __cloc  The C locale.
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      collate(__c_locale __cloc, size_t __refs = 0)
-      : facet(__refs), _M_c_locale_collate(_S_clone_c_locale(__cloc))
-      { }
-
-      /**
-       *  @brief  Compare two strings.
-       *
-       *  This function compares two strings and returns the result by calling
-       *  collate::do_compare().
-       *
-       *  @param __lo1  Start of string 1.
-       *  @param __hi1  End of string 1.
-       *  @param __lo2  Start of string 2.
-       *  @param __hi2  End of string 2.
-       *  @return  1 if string1 > string2, -1 if string1 < string2, else 0.
-      */
-      int
-      compare(const _CharT* __lo1, const _CharT* __hi1,
-	      const _CharT* __lo2, const _CharT* __hi2) const
-      { return this->do_compare(__lo1, __hi1, __lo2, __hi2); }
-
-      /**
-       *  @brief  Transform string to comparable form.
-       *
-       *  This function is a wrapper for strxfrm functionality.  It takes the
-       *  input string and returns a modified string that can be directly
-       *  compared to other transformed strings.  In the C locale, this
-       *  function just returns a copy of the input string.  In some other
-       *  locales, it may replace two chars with one, change a char for
-       *  another, etc.  It does so by returning collate::do_transform().
-       *
-       *  @param __lo  Start of string.
-       *  @param __hi  End of string.
-       *  @return  Transformed string_type.
-      */
-      string_type
-      transform(const _CharT* __lo, const _CharT* __hi) const
-      { return this->do_transform(__lo, __hi); }
-
-      /**
-       *  @brief  Return hash of a string.
-       *
-       *  This function computes and returns a hash on the input string.  It
-       *  does so by returning collate::do_hash().
-       *
-       *  @param __lo  Start of string.
-       *  @param __hi  End of string.
-       *  @return  Hash value.
-      */
-      long
-      hash(const _CharT* __lo, const _CharT* __hi) const
-      { return this->do_hash(__lo, __hi); }
-
-      // Used to abstract out _CharT bits in virtual member functions, below.
-      int
-      _M_compare(const _CharT*, const _CharT*) const throw();
-
-      size_t
-      _M_transform(_CharT*, const _CharT*, size_t) const throw();
-
-  protected:
-      /// Destructor.
-      virtual
-      ~collate()
-      { _S_destroy_c_locale(_M_c_locale_collate); }
-
-      /**
-       *  @brief  Compare two strings.
-       *
-       *  This function is a hook for derived classes to change the value
-       *  returned.  @see compare().
-       *
-       *  @param __lo1  Start of string 1.
-       *  @param __hi1  End of string 1.
-       *  @param __lo2  Start of string 2.
-       *  @param __hi2  End of string 2.
-       *  @return  1 if string1 > string2, -1 if string1 < string2, else 0.
-      */
-      virtual int
-      do_compare(const _CharT* __lo1, const _CharT* __hi1,
-		 const _CharT* __lo2, const _CharT* __hi2) const;
-
-      /**
-       *  @brief  Transform string to comparable form.
-       *
-       *  This function is a hook for derived classes to change the value
-       *  returned.
-       *
-       *  @param __lo  Start.
-       *  @param __hi  End.
-       *  @return  transformed string.
-      */
-      virtual string_type
-      do_transform(const _CharT* __lo, const _CharT* __hi) const;
-
-      /**
-       *  @brief  Return hash of a string.
-       *
-       *  This function computes and returns a hash on the input string.  This
-       *  function is a hook for derived classes to change the value returned.
-       *
-       *  @param __lo  Start of string.
-       *  @param __hi  End of string.
-       *  @return  Hash value.
-      */
-      virtual long
-      do_hash(const _CharT* __lo, const _CharT* __hi) const;
-    };
-
-  template<typename _CharT>
-    locale::id collate<_CharT>::id;
-
-  // Specializations.
-  template<>
-    int
-    collate<char>::_M_compare(const char*, const char*) const throw();
-
-  template<>
-    size_t
-    collate<char>::_M_transform(char*, const char*, size_t) const throw();
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    int
-    collate<wchar_t>::_M_compare(const wchar_t*, const wchar_t*) const throw();
-
-  template<>
-    size_t
-    collate<wchar_t>::_M_transform(wchar_t*, const wchar_t*, size_t) const throw();
-#endif
-
-  /// class collate_byname [22.2.4.2].
-  template<typename _CharT>
-    class _GLIBCXX_NAMESPACE_CXX11 collate_byname : public collate<_CharT>
-    {
-    public:
-      //@{
-      /// Public typedefs
-      typedef _CharT               char_type;
-      typedef basic_string<_CharT> string_type;
-      //@}
-
-      explicit
-      collate_byname(const char* __s, size_t __refs = 0)
-      : collate<_CharT>(__refs)
-      {
-	if (__builtin_strcmp(__s, "C") != 0
-	    && __builtin_strcmp(__s, "POSIX") != 0)
-	  {
-	    this->_S_destroy_c_locale(this->_M_c_locale_collate);
-	    this->_S_create_c_locale(this->_M_c_locale_collate, __s);
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      explicit
-      collate_byname(const string& __s, size_t __refs = 0)
-      : collate_byname(__s.c_str(), __refs) { }
-#endif
-
-    protected:
-      virtual
-      ~collate_byname() { }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-# include <bits/locale_classes.tcc>
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/locale_classes.tcc b/openflow/usr/include/c++/5/bits/locale_classes.tcc
deleted file mode 100644
index dbc8c8e..0000000
--- a/openflow/usr/include/c++/5/bits/locale_classes.tcc
+++ /dev/null
@@ -1,298 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/locale_classes.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-#ifndef _LOCALE_CLASSES_TCC
-#define _LOCALE_CLASSES_TCC 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Facet>
-    locale::
-    locale(const locale& __other, _Facet* __f)
-    {
-      _M_impl = new _Impl(*__other._M_impl, 1);
-
-      __try
-	{ _M_impl->_M_install_facet(&_Facet::id, __f); }
-      __catch(...)
-	{
-	  _M_impl->_M_remove_reference();
-	  __throw_exception_again;
-	}
-      delete [] _M_impl->_M_names[0];
-      _M_impl->_M_names[0] = 0;   // Unnamed.
-    }
-
-  template<typename _Facet>
-    locale
-    locale::
-    combine(const locale& __other) const
-    {
-      _Impl* __tmp = new _Impl(*_M_impl, 1);
-      __try
-	{
-	  __tmp->_M_replace_facet(__other._M_impl, &_Facet::id);
-	}
-      __catch(...)
-	{
-	  __tmp->_M_remove_reference();
-	  __throw_exception_again;
-	}
-      return locale(__tmp);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    bool
-    locale::
-    operator()(const basic_string<_CharT, _Traits, _Alloc>& __s1,
-	       const basic_string<_CharT, _Traits, _Alloc>& __s2) const
-    {
-      typedef std::collate<_CharT> __collate_type;
-      const __collate_type& __collate = use_facet<__collate_type>(*this);
-      return (__collate.compare(__s1.data(), __s1.data() + __s1.length(),
-				__s2.data(), __s2.data() + __s2.length()) < 0);
-    }
-
-  /**
-   *  @brief  Test for the presence of a facet.
-   *  @ingroup locales
-   *
-   *  has_facet tests the locale argument for the presence of the facet type
-   *  provided as the template parameter.  Facets derived from the facet
-   *  parameter will also return true.
-   *
-   *  @tparam  _Facet  The facet type to test the presence of.
-   *  @param  __loc  The locale to test.
-   *  @return  true if @p __loc contains a facet of type _Facet, else false.
-  */
-  template<typename _Facet>
-    bool
-    has_facet(const locale& __loc) throw()
-    {
-      const size_t __i = _Facet::id._M_id();
-      const locale::facet** __facets = __loc._M_impl->_M_facets;
-      return (__i < __loc._M_impl->_M_facets_size
-#if __cpp_rtti
-	      && dynamic_cast<const _Facet*>(__facets[__i]));
-#else
-              && static_cast<const _Facet*>(__facets[__i]));
-#endif
-    }
-
-  /**
-   *  @brief  Return a facet.
-   *  @ingroup locales
-   *
-   *  use_facet looks for and returns a reference to a facet of type Facet
-   *  where Facet is the template parameter.  If has_facet(locale) is true,
-   *  there is a suitable facet to return.  It throws std::bad_cast if the
-   *  locale doesn't contain a facet of type Facet.
-   *
-   *  @tparam  _Facet  The facet type to access.
-   *  @param  __loc  The locale to use.
-   *  @return  Reference to facet of type Facet.
-   *  @throw  std::bad_cast if @p __loc doesn't contain a facet of type _Facet.
-  */
-  template<typename _Facet>
-    const _Facet&
-    use_facet(const locale& __loc)
-    {
-      const size_t __i = _Facet::id._M_id();
-      const locale::facet** __facets = __loc._M_impl->_M_facets;
-      if (__i >= __loc._M_impl->_M_facets_size || !__facets[__i])
-        __throw_bad_cast();
-#if __cpp_rtti
-      return dynamic_cast<const _Facet&>(*__facets[__i]);
-#else
-      return static_cast<const _Facet&>(*__facets[__i]);
-#endif
-    }
-
-
-  // Generic version does nothing.
-  template<typename _CharT>
-    int
-    collate<_CharT>::_M_compare(const _CharT*, const _CharT*) const throw ()
-    { return 0; }
-
-  // Generic version does nothing.
-  template<typename _CharT>
-    size_t
-    collate<_CharT>::_M_transform(_CharT*, const _CharT*, size_t) const throw ()
-    { return 0; }
-
-  template<typename _CharT>
-    int
-    collate<_CharT>::
-    do_compare(const _CharT* __lo1, const _CharT* __hi1,
-	       const _CharT* __lo2, const _CharT* __hi2) const
-    {
-      // strcoll assumes zero-terminated strings so we make a copy
-      // and then put a zero at the end.
-      const string_type __one(__lo1, __hi1);
-      const string_type __two(__lo2, __hi2);
-
-      const _CharT* __p = __one.c_str();
-      const _CharT* __pend = __one.data() + __one.length();
-      const _CharT* __q = __two.c_str();
-      const _CharT* __qend = __two.data() + __two.length();
-
-      // strcoll stops when it sees a nul character so we break
-      // the strings into zero-terminated substrings and pass those
-      // to strcoll.
-      for (;;)
-	{
-	  const int __res = _M_compare(__p, __q);
-	  if (__res)
-	    return __res;
-
-	  __p += char_traits<_CharT>::length(__p);
-	  __q += char_traits<_CharT>::length(__q);
-	  if (__p == __pend && __q == __qend)
-	    return 0;
-	  else if (__p == __pend)
-	    return -1;
-	  else if (__q == __qend)
-	    return 1;
-
-	  __p++;
-	  __q++;
-	}
-    }
-
-  template<typename _CharT>
-    typename collate<_CharT>::string_type
-    collate<_CharT>::
-    do_transform(const _CharT* __lo, const _CharT* __hi) const
-    {
-      string_type __ret;
-
-      // strxfrm assumes zero-terminated strings so we make a copy
-      const string_type __str(__lo, __hi);
-
-      const _CharT* __p = __str.c_str();
-      const _CharT* __pend = __str.data() + __str.length();
-
-      size_t __len = (__hi - __lo) * 2;
-
-      _CharT* __c = new _CharT[__len];
-
-      __try
-	{
-	  // strxfrm stops when it sees a nul character so we break
-	  // the string into zero-terminated substrings and pass those
-	  // to strxfrm.
-	  for (;;)
-	    {
-	      // First try a buffer perhaps big enough.
-	      size_t __res = _M_transform(__c, __p, __len);
-	      // If the buffer was not large enough, try again with the
-	      // correct size.
-	      if (__res >= __len)
-		{
-		  __len = __res + 1;
-		  delete [] __c, __c = 0;
-		  __c = new _CharT[__len];
-		  __res = _M_transform(__c, __p, __len);
-		}
-
-	      __ret.append(__c, __res);
-	      __p += char_traits<_CharT>::length(__p);
-	      if (__p == __pend)
-		break;
-
-	      __p++;
-	      __ret.push_back(_CharT());
-	    }
-	}
-      __catch(...)
-	{
-	  delete [] __c;
-	  __throw_exception_again;
-	}
-
-      delete [] __c;
-
-      return __ret;
-    }
-
-  template<typename _CharT>
-    long
-    collate<_CharT>::
-    do_hash(const _CharT* __lo, const _CharT* __hi) const
-    {
-      unsigned long __val = 0;
-      for (; __lo < __hi; ++__lo)
-	__val =
-	  *__lo + ((__val << 7)
-		   | (__val >> (__gnu_cxx::__numeric_traits<unsigned long>::
-				__digits - 7)));
-      return static_cast<long>(__val);
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class collate<char>;
-  extern template class collate_byname<char>;
-
-  extern template
-    const collate<char>&
-    use_facet<collate<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<collate<char> >(const locale&);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class collate<wchar_t>;
-  extern template class collate_byname<wchar_t>;
-
-  extern template
-    const collate<wchar_t>&
-    use_facet<collate<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<collate<wchar_t> >(const locale&);
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/locale_conv.h b/openflow/usr/include/c++/5/bits/locale_conv.h
deleted file mode 100644
index 16b4875..0000000
--- a/openflow/usr/include/c++/5/bits/locale_conv.h
+++ /dev/null
@@ -1,545 +0,0 @@
-// wstring_convert implementation -*- C++ -*-
-
-// Copyright (C) 2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/locale_conv.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-#ifndef _LOCALE_CONV_H
-#define _LOCALE_CONV_H 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <streambuf>
-#include "stringfwd.h"
-#include "allocator.h"
-#include "codecvt.h"
-#include "unique_ptr.h"
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup locales
-   * @{
-   */
-
-  template<typename _OutStr, typename _InChar, typename _Codecvt,
-	   typename _State, typename _Fn>
-    bool
-    __do_str_codecvt(const _InChar* __first, const _InChar* __last,
-		     _OutStr& __outstr, const _Codecvt& __cvt, _State& __state,
-		     size_t& __count, _Fn __fn)
-    {
-      if (__first == __last)
-	{
-	  __outstr.clear();
-	  __count = 0;
-	  return true;
-	}
-
-      size_t __outchars = 0;
-      auto __next = __first;
-      const auto __maxlen = __cvt.max_length() + 1;
-
-      codecvt_base::result __result;
-      do
-	{
-	  __outstr.resize(__outstr.size() + (__last - __next) * __maxlen);
-	  auto __outnext = &__outstr.front() + __outchars;
-	  auto const __outlast = &__outstr.back() + 1;
-	  __result = (__cvt.*__fn)(__state, __next, __last, __next,
-					__outnext, __outlast, __outnext);
-	  __outchars = __outnext - &__outstr.front();
-	}
-      while (__result == codecvt_base::partial && __next != __last
-	     && (__outstr.size() - __outchars) < __maxlen);
-
-      if (__result == codecvt_base::error)
-	return false;
-
-      if (__result == codecvt_base::noconv)
-	{
-	  __outstr.assign(__first, __last);
-	  __count = __last - __first;
-	}
-      else
-	{
-	  __outstr.resize(__outchars);
-	  __count = __next - __first;
-	}
-
-      return true;
-    }
-
-  // Convert narrow character string to wide.
-  template<typename _CharT, typename _Traits, typename _Alloc, typename _State>
-    inline bool
-    __str_codecvt_in(const char* __first, const char* __last,
-		     basic_string<_CharT, _Traits, _Alloc>& __outstr,
-		     const codecvt<_CharT, char, _State>& __cvt,
-		     _State& __state, size_t& __count)
-    {
-      using _Codecvt = codecvt<_CharT, char, _State>;
-      using _ConvFn
-	= codecvt_base::result
-	  (_Codecvt::*)(_State&, const char*, const char*, const char*&,
-			_CharT*, _CharT*, _CharT*&) const;
-      _ConvFn __fn = &codecvt<_CharT, char, _State>::in;
-      return __do_str_codecvt(__first, __last, __outstr, __cvt, __state,
-			      __count, __fn);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc, typename _State>
-    inline bool
-    __str_codecvt_in(const char* __first, const char* __last,
-		     basic_string<_CharT, _Traits, _Alloc>& __outstr,
-		     const codecvt<_CharT, char, _State>& __cvt)
-    {
-      _State __state = {};
-      size_t __n;
-      return __str_codecvt_in(__first, __last, __outstr, __cvt, __state, __n);
-    }
-
-  // Convert wide character string to narrow.
-  template<typename _CharT, typename _Traits, typename _Alloc, typename _State>
-    inline bool
-    __str_codecvt_out(const _CharT* __first, const _CharT* __last,
-		      basic_string<char, _Traits, _Alloc>& __outstr,
-		      const codecvt<_CharT, char, _State>& __cvt,
-		      _State& __state, size_t& __count)
-    {
-      using _Codecvt = codecvt<_CharT, char, _State>;
-      using _ConvFn
-	= codecvt_base::result
-	  (_Codecvt::*)(_State&, const _CharT*, const _CharT*, const _CharT*&,
-			char*, char*, char*&) const;
-      _ConvFn __fn = &codecvt<_CharT, char, _State>::out;
-      return __do_str_codecvt(__first, __last, __outstr, __cvt, __state,
-			      __count, __fn);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc, typename _State>
-    inline bool
-    __str_codecvt_out(const _CharT* __first, const _CharT* __last,
-		      basic_string<char, _Traits, _Alloc>& __outstr,
-		      const codecvt<_CharT, char, _State>& __cvt)
-    {
-      _State __state = {};
-      size_t __n;
-      return __str_codecvt_out(__first, __last, __outstr, __cvt, __state, __n);
-    }
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  /// String conversions
-  template<typename _Codecvt, typename _Elem = wchar_t,
-	   typename _Wide_alloc = allocator<_Elem>,
-	   typename _Byte_alloc = allocator<char>>
-    class wstring_convert
-    {
-    public:
-      typedef basic_string<char, char_traits<char>, _Byte_alloc>   byte_string;
-      typedef basic_string<_Elem, char_traits<_Elem>, _Wide_alloc> wide_string;
-      typedef typename _Codecvt::state_type 			   state_type;
-      typedef typename wide_string::traits_type::int_type	   int_type;
-
-      /** Default constructor.
-       *
-       * @param  __pcvt The facet to use for conversions.
-       *
-       * Takes ownership of @p __pcvt and will delete it in the destructor.
-       */
-      explicit
-      wstring_convert(_Codecvt* __pcvt = new _Codecvt()) : _M_cvt(__pcvt)
-      {
-	if (!_M_cvt)
-	  __throw_logic_error("wstring_convert");
-      }
-
-      /** Construct with an initial converstion state.
-       *
-       * @param  __pcvt The facet to use for conversions.
-       * @param  __state Initial conversion state.
-       *
-       * Takes ownership of @p __pcvt and will delete it in the destructor.
-       * The object's conversion state will persist between conversions.
-       */
-      wstring_convert(_Codecvt* __pcvt, state_type __state)
-      : _M_cvt(__pcvt), _M_state(__state), _M_with_cvtstate(true)
-      {
-	if (!_M_cvt)
-	  __throw_logic_error("wstring_convert");
-      }
-
-      /** Construct with error strings.
-       *
-       * @param  __byte_err A string to return on failed conversions.
-       * @param  __wide_err A wide string to return on failed conversions.
-       */
-      explicit
-      wstring_convert(const byte_string& __byte_err,
-		      const wide_string& __wide_err = wide_string())
-      : _M_cvt(new _Codecvt),
-	_M_byte_err_string(__byte_err), _M_wide_err_string(__wide_err),
-	_M_with_strings(true)
-      {
-	if (!_M_cvt)
-	  __throw_logic_error("wstring_convert");
-      }
-
-      ~wstring_convert() = default;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2176. Special members for wstring_convert and wbuffer_convert
-      wstring_convert(const wstring_convert&) = delete;
-      wstring_convert& operator=(const wstring_convert&) = delete;
-
-      /// @{ Convert from bytes.
-      wide_string
-      from_bytes(char __byte)
-      {
-	char __bytes[2] = { __byte };
-	return from_bytes(__bytes, __bytes+1);
-      }
-
-      wide_string
-      from_bytes(const char* __ptr)
-      { return from_bytes(__ptr, __ptr+char_traits<char>::length(__ptr)); }
-
-      wide_string
-      from_bytes(const byte_string& __str)
-      {
-	auto __ptr = __str.data();
-	return from_bytes(__ptr, __ptr + __str.size());
-      }
-
-      wide_string
-      from_bytes(const char* __first, const char* __last)
-      {
-	if (!_M_with_cvtstate)
-	  _M_state = state_type();
-	wide_string __out{ _M_wide_err_string.get_allocator() };
-	if (__str_codecvt_in(__first, __last, __out, *_M_cvt, _M_state,
-			     _M_count))
-	  return __out;
-	if (_M_with_strings)
-	  return _M_wide_err_string;
-	__throw_range_error("wstring_convert::from_bytes");
-      }
-      /// @}
-
-      /// @{ Convert to bytes.
-      byte_string
-      to_bytes(_Elem __wchar)
-      {
-	_Elem __wchars[2] = { __wchar };
-	return to_bytes(__wchars, __wchars+1);
-      }
-
-      byte_string
-      to_bytes(const _Elem* __ptr)
-      {
-	return to_bytes(__ptr, __ptr+wide_string::traits_type::length(__ptr));
-      }
-
-      byte_string
-      to_bytes(const wide_string& __wstr)
-      {
-	auto __ptr = __wstr.data();
-	return to_bytes(__ptr, __ptr + __wstr.size());
-      }
-
-      byte_string
-      to_bytes(const _Elem* __first, const _Elem* __last)
-      {
-	if (!_M_with_cvtstate)
-	  _M_state = state_type();
-	byte_string __out{ _M_byte_err_string.get_allocator() };
-	if (__str_codecvt_out(__first, __last, __out, *_M_cvt, _M_state,
-			      _M_count))
-	  return __out;
-	if (_M_with_strings)
-	  return _M_byte_err_string;
-	__throw_range_error("wstring_convert::to_bytes");
-      }
-      /// @}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2174. wstring_convert::converted() should be noexcept
-      /// The number of elements successfully converted in the last conversion.
-      size_t converted() const noexcept { return _M_count; }
-
-      /// The final conversion state of the last conversion.
-      state_type state() const { return _M_state; }
-
-    private:
-      unique_ptr<_Codecvt>	_M_cvt;
-      byte_string		_M_byte_err_string;
-      wide_string		_M_wide_err_string;
-      state_type		_M_state = state_type();
-      size_t			_M_count = 0;
-      bool			_M_with_cvtstate = false;
-      bool			_M_with_strings = false;
-    };
-
-_GLIBCXX_END_NAMESPACE_CXX11
-
-  /// Buffer conversions
-  template<typename _Codecvt, typename _Elem = wchar_t,
-	   typename _Tr = char_traits<_Elem>>
-    class wbuffer_convert : public basic_streambuf<_Elem, _Tr>
-    {
-      typedef basic_streambuf<_Elem, _Tr> _Wide_streambuf;
-
-    public:
-      typedef typename _Codecvt::state_type state_type;
-
-      /** Default constructor.
-       *
-       * @param  __bytebuf The underlying byte stream buffer.
-       * @param  __pcvt    The facet to use for conversions.
-       * @param  __state   Initial conversion state.
-       *
-       * Takes ownership of @p __pcvt and will delete it in the destructor.
-       */
-      explicit
-      wbuffer_convert(streambuf* __bytebuf = 0, _Codecvt* __pcvt = new _Codecvt,
-		      state_type __state = state_type())
-      : _M_buf(__bytebuf), _M_cvt(__pcvt), _M_state(__state)
-      {
-	if (!_M_cvt)
-	  __throw_logic_error("wbuffer_convert");
-
-	_M_always_noconv = _M_cvt->always_noconv();
-
-	if (_M_buf)
-	  {
-	    this->setp(_M_put_area, _M_put_area + _S_buffer_length);
-	    this->setg(_M_get_area + _S_putback_length,
-		       _M_get_area + _S_putback_length,
-		       _M_get_area + _S_putback_length);
-	  }
-      }
-
-      ~wbuffer_convert() = default;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2176. Special members for wstring_convert and wbuffer_convert
-      wbuffer_convert(const wbuffer_convert&) = delete;
-      wbuffer_convert& operator=(const wbuffer_convert&) = delete;
-
-      streambuf* rdbuf() const noexcept { return _M_buf; }
-
-      streambuf*
-      rdbuf(streambuf *__bytebuf) noexcept
-      {
-	auto __prev = _M_buf;
-	_M_buf = __bytebuf;
-	return __prev;
-      }
-
-      /// The conversion state following the last conversion.
-      state_type state() const noexcept { return _M_state; }
-
-    protected:
-      int
-      sync()
-      { return _M_buf && _M_conv_put() && _M_buf->pubsync() ? 0 : -1; }
-
-      typename _Wide_streambuf::int_type
-      overflow(typename _Wide_streambuf::int_type __out)
-      {
-	if (!_M_buf || !_M_conv_put())
-	  return _Tr::eof();
-	else if (!_Tr::eq_int_type(__out, _Tr::eof()))
-	  return this->sputc(__out);
-	return _Tr::not_eof(__out);
-      }
-
-      typename _Wide_streambuf::int_type
-      underflow()
-      {
-	if (!_M_buf)
-	  return _Tr::eof();
-
-	if (this->gptr() < this->egptr() || (_M_buf && _M_conv_get()))
-	  return _Tr::to_int_type(*this->gptr());
-	else
-	  return _Tr::eof();
-      }
-
-      streamsize
-      xsputn(const typename _Wide_streambuf::char_type* __s, streamsize __n)
-      {
-	if (!_M_buf || __n == 0)
-	  return 0;
-	streamsize __done = 0;
-	do
-	{
-	  auto __nn = std::min<streamsize>(this->epptr() - this->pptr(),
-					   __n - __done);
-	  _Tr::copy(this->pptr(), __s + __done, __nn);
-	  this->pbump(__nn);
-	  __done += __nn;
-	} while (__done < __n && _M_conv_put());
-	return __done;
-      }
-
-    private:
-      // fill the get area from converted contents of the byte stream buffer
-      bool
-      _M_conv_get()
-      {
-	const streamsize __pb1 = this->gptr() - this->eback();
-	const streamsize __pb2 = _S_putback_length;
-	const streamsize __npb = std::min(__pb1, __pb2);
-
-	_Tr::move(_M_get_area + _S_putback_length - __npb,
-		  this->gptr() - __npb, __npb);
-
-	streamsize __nbytes = sizeof(_M_get_buf) - _M_unconv;
-	__nbytes = std::min(__nbytes, _M_buf->in_avail());
-	if (__nbytes < 1)
-	  __nbytes == 1;
-	__nbytes = _M_buf->sgetn(_M_get_buf + _M_unconv, __nbytes);
-	if (__nbytes < 1)
-	  return false;
-	__nbytes += _M_unconv;
-
-	// convert _M_get_buf into _M_get_area
-
-	_Elem* __outbuf = _M_get_area + _S_putback_length;
-	_Elem* __outnext = __outbuf;
-	const char* __bnext = _M_get_buf;
-
-	codecvt_base::result __result;
-	if (_M_always_noconv)
-	  __result = codecvt_base::noconv;
-	else
-	  {
-	    _Elem* __outend = _M_get_area + _S_buffer_length;
-
-	    __result = _M_cvt->in(_M_state,
-				  __bnext, __bnext + __nbytes, __bnext,
-				  __outbuf, __outend, __outnext);
-	  }
-
-	if (__result == codecvt_base::noconv)
-	  {
-	    // cast is safe because noconv means _Elem is same type as char
-	    auto __get_buf = reinterpret_cast<const _Elem*>(_M_get_buf);
-	    _Tr::copy(__outbuf, __get_buf, __nbytes);
-	    _M_unconv = 0;
-	    return true;
-	  }
-
-	if ((_M_unconv = _M_get_buf + __nbytes - __bnext))
-	  char_traits<char>::move(_M_get_buf, __bnext, _M_unconv);
-
-	this->setg(__outbuf, __outbuf, __outnext);
-
-	return __result != codecvt_base::error;
-      }
-
-      // unused
-      bool
-      _M_put(...)
-      { return false; }
-
-      bool
-      _M_put(const char* __p, streamsize __n)
-      {
-	if (_M_buf->sputn(__p, __n) < __n)
-	  return false;
-      }
-
-      // convert the put area and write to the byte stream buffer
-      bool
-      _M_conv_put()
-      {
-	_Elem* const __first = this->pbase();
-	const _Elem* const __last = this->pptr();
-	const streamsize __pending = __last - __first;
-
-	if (_M_always_noconv)
-	  return _M_put(__first, __pending);
-
-	char __outbuf[2 * _S_buffer_length];
-
-	const _Elem* __next = __first;
-	const _Elem* __start;
-	do
-	  {
-	    __start = __next;
-	    char* __outnext = __outbuf;
-	    char* const __outlast = __outbuf + sizeof(__outbuf);
-	    auto __result = _M_cvt->out(_M_state, __next, __last, __next,
-					__outnext, __outlast, __outnext);
-	    if (__result == codecvt_base::error)
-	      return false;
-	    else if (__result == codecvt_base::noconv)
-	      return _M_put(__next, __pending);
-
-	    if (!_M_put(__outbuf, __outnext - __outbuf))
-	      return false;
-	  }
-	while (__next != __last && __next != __start);
-
-	if (__next != __last)
-	  _Tr::move(__first, __next, __last - __next);
-
-	this->pbump(__first - __next);
-	return __next != __first;
-      }
-
-      streambuf*		_M_buf;
-      unique_ptr<_Codecvt>	_M_cvt;
-      state_type		_M_state;
-
-      static const streamsize	_S_buffer_length = 32;
-      static const streamsize	_S_putback_length = 3;
-      _Elem                     _M_put_area[_S_buffer_length];
-      _Elem                     _M_get_area[_S_buffer_length];
-      streamsize		_M_unconv = 0;
-      char			_M_get_buf[_S_buffer_length-_S_putback_length];
-      bool			_M_always_noconv;
-    };
-
-#endif  // _GLIBCXX_USE_WCHAR_T
-
-  /// @} group locales
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // __cplusplus
-
-#endif /* _LOCALE_CONV_H */
diff --git a/openflow/usr/include/c++/5/bits/locale_facets.h b/openflow/usr/include/c++/5/bits/locale_facets.h
deleted file mode 100644
index 0226b49..0000000
--- a/openflow/usr/include/c++/5/bits/locale_facets.h
+++ /dev/null
@@ -1,2653 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/locale_facets.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-#ifndef _LOCALE_FACETS_H
-#define _LOCALE_FACETS_H 1
-
-#pragma GCC system_header
-
-#include <cwctype>	// For wctype_t
-#include <cctype>
-#include <bits/ctype_base.h>
-#include <iosfwd>
-#include <bits/ios_base.h>  // For ios_base, ios_base::iostate
-#include <streambuf>
-#include <bits/cpp_type_traits.h>
-#include <ext/type_traits.h>
-#include <ext/numeric_traits.h>
-#include <bits/streambuf_iterator.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // NB: Don't instantiate required wchar_t facets if no wchar_t support.
-#ifdef _GLIBCXX_USE_WCHAR_T
-# define  _GLIBCXX_NUM_FACETS 28
-# define  _GLIBCXX_NUM_CXX11_FACETS 16
-#else
-# define  _GLIBCXX_NUM_FACETS 14
-# define  _GLIBCXX_NUM_CXX11_FACETS 8
-#endif
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-# define _GLIBCXX_NUM_UNICODE_FACETS 2
-#else
-# define _GLIBCXX_NUM_UNICODE_FACETS 0
-#endif
-
-  // Convert string to numeric value of type _Tp and store results.
-  // NB: This is specialized for all required types, there is no
-  // generic definition.
-  template<typename _Tp>
-    void
-    __convert_to_v(const char*, _Tp&, ios_base::iostate&,
-		   const __c_locale&) throw();
-
-  // Explicit specializations for required types.
-  template<>
-    void
-    __convert_to_v(const char*, float&, ios_base::iostate&,
-		   const __c_locale&) throw();
-
-  template<>
-    void
-    __convert_to_v(const char*, double&, ios_base::iostate&,
-		   const __c_locale&) throw();
-
-  template<>
-    void
-    __convert_to_v(const char*, long double&, ios_base::iostate&,
-		   const __c_locale&) throw();
-
-  // NB: __pad is a struct, rather than a function, so it can be
-  // partially-specialized.
-  template<typename _CharT, typename _Traits>
-    struct __pad
-    {
-      static void
-      _S_pad(ios_base& __io, _CharT __fill, _CharT* __news,
-	     const _CharT* __olds, streamsize __newlen, streamsize __oldlen);
-    };
-
-  // Used by both numeric and monetary facets.
-  // Inserts "group separator" characters into an array of characters.
-  // It's recursive, one iteration per group.  It moves the characters
-  // in the buffer this way: "xxxx12345" -> "12,345xxx".  Call this
-  // only with __gsize != 0.
-  template<typename _CharT>
-    _CharT*
-    __add_grouping(_CharT* __s, _CharT __sep,
-		   const char* __gbeg, size_t __gsize,
-		   const _CharT* __first, const _CharT* __last);
-
-  // This template permits specializing facet output code for
-  // ostreambuf_iterator.  For ostreambuf_iterator, sputn is
-  // significantly more efficient than incrementing iterators.
-  template<typename _CharT>
-    inline
-    ostreambuf_iterator<_CharT>
-    __write(ostreambuf_iterator<_CharT> __s, const _CharT* __ws, int __len)
-    {
-      __s._M_put(__ws, __len);
-      return __s;
-    }
-
-  // This is the unspecialized form of the template.
-  template<typename _CharT, typename _OutIter>
-    inline
-    _OutIter
-    __write(_OutIter __s, const _CharT* __ws, int __len)
-    {
-      for (int __j = 0; __j < __len; __j++, ++__s)
-	*__s = __ws[__j];
-      return __s;
-    }
-
-
-  // 22.2.1.1  Template class ctype
-  // Include host and configuration specific ctype enums for ctype_base.
-
-  /**
-   *  @brief  Common base for ctype facet
-   *
-   *  This template class provides implementations of the public functions
-   *  that forward to the protected virtual functions.
-   *
-   *  This template also provides abstract stubs for the protected virtual
-   *  functions.
-  */
-  template<typename _CharT>
-    class __ctype_abstract_base : public locale::facet, public ctype_base
-    {
-    public:
-      // Types:
-      /// Typedef for the template parameter
-      typedef _CharT char_type;
-
-      /**
-       *  @brief  Test char_type classification.
-       *
-       *  This function finds a mask M for @a __c and compares it to
-       *  mask @a __m.  It does so by returning the value of
-       *  ctype<char_type>::do_is().
-       *
-       *  @param __c  The char_type to compare the mask of.
-       *  @param __m  The mask to compare against.
-       *  @return  (M & __m) != 0.
-      */
-      bool
-      is(mask __m, char_type __c) const
-      { return this->do_is(__m, __c); }
-
-      /**
-       *  @brief  Return a mask array.
-       *
-       *  This function finds the mask for each char_type in the range [lo,hi)
-       *  and successively writes it to vec.  vec must have as many elements
-       *  as the char array.  It does so by returning the value of
-       *  ctype<char_type>::do_is().
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __vec  Pointer to an array of mask storage.
-       *  @return  @a __hi.
-      */
-      const char_type*
-      is(const char_type *__lo, const char_type *__hi, mask *__vec) const
-      { return this->do_is(__lo, __hi, __vec); }
-
-      /**
-       *  @brief  Find char_type matching a mask
-       *
-       *  This function searches for and returns the first char_type c in
-       *  [lo,hi) for which is(m,c) is true.  It does so by returning
-       *  ctype<char_type>::do_scan_is().
-       *
-       *  @param __m  The mask to compare against.
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  Pointer to matching char_type if found, else @a __hi.
-      */
-      const char_type*
-      scan_is(mask __m, const char_type* __lo, const char_type* __hi) const
-      { return this->do_scan_is(__m, __lo, __hi); }
-
-      /**
-       *  @brief  Find char_type not matching a mask
-       *
-       *  This function searches for and returns the first char_type c in
-       *  [lo,hi) for which is(m,c) is false.  It does so by returning
-       *  ctype<char_type>::do_scan_not().
-       *
-       *  @param __m  The mask to compare against.
-       *  @param __lo  Pointer to first char in range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  Pointer to non-matching char if found, else @a __hi.
-      */
-      const char_type*
-      scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-      { return this->do_scan_not(__m, __lo, __hi); }
-
-      /**
-       *  @brief  Convert to uppercase.
-       *
-       *  This function converts the argument to uppercase if possible.
-       *  If not possible (for example, '2'), returns the argument.  It does
-       *  so by returning ctype<char_type>::do_toupper().
-       *
-       *  @param __c  The char_type to convert.
-       *  @return  The uppercase char_type if convertible, else @a __c.
-      */
-      char_type
-      toupper(char_type __c) const
-      { return this->do_toupper(__c); }
-
-      /**
-       *  @brief  Convert array to uppercase.
-       *
-       *  This function converts each char_type in the range [lo,hi) to
-       *  uppercase if possible.  Other elements remain untouched.  It does so
-       *  by returning ctype<char_type>:: do_toupper(lo, hi).
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  @a __hi.
-      */
-      const char_type*
-      toupper(char_type *__lo, const char_type* __hi) const
-      { return this->do_toupper(__lo, __hi); }
-
-      /**
-       *  @brief  Convert to lowercase.
-       *
-       *  This function converts the argument to lowercase if possible.  If
-       *  not possible (for example, '2'), returns the argument.  It does so
-       *  by returning ctype<char_type>::do_tolower(c).
-       *
-       *  @param __c  The char_type to convert.
-       *  @return  The lowercase char_type if convertible, else @a __c.
-      */
-      char_type
-      tolower(char_type __c) const
-      { return this->do_tolower(__c); }
-
-      /**
-       *  @brief  Convert array to lowercase.
-       *
-       *  This function converts each char_type in the range [__lo,__hi) to
-       *  lowercase if possible.  Other elements remain untouched.  It does so
-       *  by returning ctype<char_type>:: do_tolower(__lo, __hi).
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  @a __hi.
-      */
-      const char_type*
-      tolower(char_type* __lo, const char_type* __hi) const
-      { return this->do_tolower(__lo, __hi); }
-
-      /**
-       *  @brief  Widen char to char_type
-       *
-       *  This function converts the char argument to char_type using the
-       *  simplest reasonable transformation.  It does so by returning
-       *  ctype<char_type>::do_widen(c).
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __c  The char to convert.
-       *  @return  The converted char_type.
-      */
-      char_type
-      widen(char __c) const
-      { return this->do_widen(__c); }
-
-      /**
-       *  @brief  Widen array to char_type
-       *
-       *  This function converts each char in the input to char_type using the
-       *  simplest reasonable transformation.  It does so by returning
-       *  ctype<char_type>::do_widen(c).
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __to  Pointer to the destination array.
-       *  @return  @a __hi.
-      */
-      const char*
-      widen(const char* __lo, const char* __hi, char_type* __to) const
-      { return this->do_widen(__lo, __hi, __to); }
-
-      /**
-       *  @brief  Narrow char_type to char
-       *
-       *  This function converts the char_type to char using the simplest
-       *  reasonable transformation.  If the conversion fails, dfault is
-       *  returned instead.  It does so by returning
-       *  ctype<char_type>::do_narrow(__c).
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __c  The char_type to convert.
-       *  @param __dfault  Char to return if conversion fails.
-       *  @return  The converted char.
-      */
-      char
-      narrow(char_type __c, char __dfault) const
-      { return this->do_narrow(__c, __dfault); }
-
-      /**
-       *  @brief  Narrow array to char array
-       *
-       *  This function converts each char_type in the input to char using the
-       *  simplest reasonable transformation and writes the results to the
-       *  destination array.  For any char_type in the input that cannot be
-       *  converted, @a dfault is used instead.  It does so by returning
-       *  ctype<char_type>::do_narrow(__lo, __hi, __dfault, __to).
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __dfault  Char to use if conversion fails.
-       *  @param __to  Pointer to the destination array.
-       *  @return  @a __hi.
-      */
-      const char_type*
-      narrow(const char_type* __lo, const char_type* __hi,
-	      char __dfault, char* __to) const
-      { return this->do_narrow(__lo, __hi, __dfault, __to); }
-
-    protected:
-      explicit
-      __ctype_abstract_base(size_t __refs = 0): facet(__refs) { }
-
-      virtual
-      ~__ctype_abstract_base() { }
-
-      /**
-       *  @brief  Test char_type classification.
-       *
-       *  This function finds a mask M for @a c and compares it to mask @a m.
-       *
-       *  do_is() is a hook for a derived facet to change the behavior of
-       *  classifying.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param __c  The char_type to find the mask of.
-       *  @param __m  The mask to compare against.
-       *  @return  (M & __m) != 0.
-      */
-      virtual bool
-      do_is(mask __m, char_type __c) const = 0;
-
-      /**
-       *  @brief  Return a mask array.
-       *
-       *  This function finds the mask for each char_type in the range [lo,hi)
-       *  and successively writes it to vec.  vec must have as many elements
-       *  as the input.
-       *
-       *  do_is() is a hook for a derived facet to change the behavior of
-       *  classifying.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __vec  Pointer to an array of mask storage.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_is(const char_type* __lo, const char_type* __hi,
-	    mask* __vec) const = 0;
-
-      /**
-       *  @brief  Find char_type matching mask
-       *
-       *  This function searches for and returns the first char_type c in
-       *  [__lo,__hi) for which is(__m,c) is true.
-       *
-       *  do_scan_is() is a hook for a derived facet to change the behavior of
-       *  match searching.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param __m  The mask to compare against.
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  Pointer to a matching char_type if found, else @a __hi.
-      */
-      virtual const char_type*
-      do_scan_is(mask __m, const char_type* __lo,
-		 const char_type* __hi) const = 0;
-
-      /**
-       *  @brief  Find char_type not matching mask
-       *
-       *  This function searches for and returns a pointer to the first
-       *  char_type c of [lo,hi) for which is(m,c) is false.
-       *
-       *  do_scan_is() is a hook for a derived facet to change the behavior of
-       *  match searching.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param __m  The mask to compare against.
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  Pointer to a non-matching char_type if found, else @a __hi.
-      */
-      virtual const char_type*
-      do_scan_not(mask __m, const char_type* __lo,
-		  const char_type* __hi) const = 0;
-
-      /**
-       *  @brief  Convert to uppercase.
-       *
-       *  This virtual function converts the char_type argument to uppercase
-       *  if possible.  If not possible (for example, '2'), returns the
-       *  argument.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param __c  The char_type to convert.
-       *  @return  The uppercase char_type if convertible, else @a __c.
-      */
-      virtual char_type
-      do_toupper(char_type __c) const = 0;
-
-      /**
-       *  @brief  Convert array to uppercase.
-       *
-       *  This virtual function converts each char_type in the range [__lo,__hi)
-       *  to uppercase if possible.  Other elements remain untouched.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_toupper(char_type* __lo, const char_type* __hi) const = 0;
-
-      /**
-       *  @brief  Convert to lowercase.
-       *
-       *  This virtual function converts the argument to lowercase if
-       *  possible.  If not possible (for example, '2'), returns the argument.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param __c  The char_type to convert.
-       *  @return  The lowercase char_type if convertible, else @a __c.
-      */
-      virtual char_type
-      do_tolower(char_type __c) const = 0;
-
-      /**
-       *  @brief  Convert array to lowercase.
-       *
-       *  This virtual function converts each char_type in the range [__lo,__hi)
-       *  to lowercase if possible.  Other elements remain untouched.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_tolower(char_type* __lo, const char_type* __hi) const = 0;
-
-      /**
-       *  @brief  Widen char
-       *
-       *  This virtual function converts the char to char_type using the
-       *  simplest reasonable transformation.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __c  The char to convert.
-       *  @return  The converted char_type
-      */
-      virtual char_type
-      do_widen(char __c) const = 0;
-
-      /**
-       *  @brief  Widen char array
-       *
-       *  This function converts each char in the input to char_type using the
-       *  simplest reasonable transformation.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __lo  Pointer to start range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __to  Pointer to the destination array.
-       *  @return  @a __hi.
-      */
-      virtual const char*
-      do_widen(const char* __lo, const char* __hi, char_type* __to) const = 0;
-
-      /**
-       *  @brief  Narrow char_type to char
-       *
-       *  This virtual function converts the argument to char using the
-       *  simplest reasonable transformation.  If the conversion fails, dfault
-       *  is returned instead.
-       *
-       *  do_narrow() is a hook for a derived facet to change the behavior of
-       *  narrowing.  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __c  The char_type to convert.
-       *  @param __dfault  Char to return if conversion fails.
-       *  @return  The converted char.
-      */
-      virtual char
-      do_narrow(char_type __c, char __dfault) const = 0;
-
-      /**
-       *  @brief  Narrow char_type array to char
-       *
-       *  This virtual function converts each char_type in the range
-       *  [__lo,__hi) to char using the simplest reasonable
-       *  transformation and writes the results to the destination
-       *  array.  For any element in the input that cannot be
-       *  converted, @a __dfault is used instead.
-       *
-       *  do_narrow() is a hook for a derived facet to change the behavior of
-       *  narrowing.  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __dfault  Char to use if conversion fails.
-       *  @param __to  Pointer to the destination array.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_narrow(const char_type* __lo, const char_type* __hi,
-		char __dfault, char* __to) const = 0;
-    };
-
-  /**
-   *  @brief  Primary class template ctype facet.
-   *  @ingroup locales
-   *
-   *  This template class defines classification and conversion functions for
-   *  character sets.  It wraps cctype functionality.  Ctype gets used by
-   *  streams for many I/O operations.
-   *
-   *  This template provides the protected virtual functions the developer
-   *  will have to replace in a derived class or specialization to make a
-   *  working facet.  The public functions that access them are defined in
-   *  __ctype_abstract_base, to allow for implementation flexibility.  See
-   *  ctype<wchar_t> for an example.  The functions are documented in
-   *  __ctype_abstract_base.
-   *
-   *  Note: implementations are provided for all the protected virtual
-   *  functions, but will likely not be useful.
-  */
-  template<typename _CharT>
-    class ctype : public __ctype_abstract_base<_CharT>
-    {
-    public:
-      // Types:
-      typedef _CharT			char_type;
-      typedef typename __ctype_abstract_base<_CharT>::mask mask;
-
-      /// The facet id for ctype<char_type>
-      static locale::id			id;
-
-      explicit
-      ctype(size_t __refs = 0) : __ctype_abstract_base<_CharT>(__refs) { }
-
-   protected:
-      virtual
-      ~ctype();
-
-      virtual bool
-      do_is(mask __m, char_type __c) const;
-
-      virtual const char_type*
-      do_is(const char_type* __lo, const char_type* __hi, mask* __vec) const;
-
-      virtual const char_type*
-      do_scan_is(mask __m, const char_type* __lo, const char_type* __hi) const;
-
-      virtual const char_type*
-      do_scan_not(mask __m, const char_type* __lo,
-		  const char_type* __hi) const;
-
-      virtual char_type
-      do_toupper(char_type __c) const;
-
-      virtual const char_type*
-      do_toupper(char_type* __lo, const char_type* __hi) const;
-
-      virtual char_type
-      do_tolower(char_type __c) const;
-
-      virtual const char_type*
-      do_tolower(char_type* __lo, const char_type* __hi) const;
-
-      virtual char_type
-      do_widen(char __c) const;
-
-      virtual const char*
-      do_widen(const char* __lo, const char* __hi, char_type* __dest) const;
-
-      virtual char
-      do_narrow(char_type, char __dfault) const;
-
-      virtual const char_type*
-      do_narrow(const char_type* __lo, const char_type* __hi,
-		char __dfault, char* __to) const;
-    };
-
-  template<typename _CharT>
-    locale::id ctype<_CharT>::id;
-
-  /**
-   *  @brief  The ctype<char> specialization.
-   *  @ingroup locales
-   *
-   *  This class defines classification and conversion functions for
-   *  the char type.  It gets used by char streams for many I/O
-   *  operations.  The char specialization provides a number of
-   *  optimizations as well.
-  */
-  template<>
-    class ctype<char> : public locale::facet, public ctype_base
-    {
-    public:
-      // Types:
-      /// Typedef for the template parameter char.
-      typedef char		char_type;
-
-    protected:
-      // Data Members:
-      __c_locale		_M_c_locale_ctype;
-      bool			_M_del;
-      __to_type			_M_toupper;
-      __to_type			_M_tolower;
-      const mask*		_M_table;
-      mutable char		_M_widen_ok;
-      mutable char		_M_widen[1 + static_cast<unsigned char>(-1)];
-      mutable char		_M_narrow[1 + static_cast<unsigned char>(-1)];
-      mutable char		_M_narrow_ok;	// 0 uninitialized, 1 init,
-						// 2 memcpy can't be used
-
-    public:
-      /// The facet id for ctype<char>
-      static locale::id        id;
-      /// The size of the mask table.  It is SCHAR_MAX + 1.
-      static const size_t      table_size = 1 + static_cast<unsigned char>(-1);
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __table If non-zero, table is used as the per-char mask.
-       *               Else classic_table() is used.
-       *  @param __del   If true, passes ownership of table to this facet.
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      ctype(const mask* __table = 0, bool __del = false, size_t __refs = 0);
-
-      /**
-       *  @brief  Constructor performs static initialization.
-       *
-       *  This constructor is used to construct the initial C locale facet.
-       *
-       *  @param __cloc  Handle to C locale data.
-       *  @param __table If non-zero, table is used as the per-char mask.
-       *  @param __del   If true, passes ownership of table to this facet.
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      ctype(__c_locale __cloc, const mask* __table = 0, bool __del = false,
-	    size_t __refs = 0);
-
-      /**
-       *  @brief  Test char classification.
-       *
-       *  This function compares the mask table[c] to @a __m.
-       *
-       *  @param __c  The char to compare the mask of.
-       *  @param __m  The mask to compare against.
-       *  @return  True if __m & table[__c] is true, false otherwise.
-      */
-      inline bool
-      is(mask __m, char __c) const;
-
-      /**
-       *  @brief  Return a mask array.
-       *
-       *  This function finds the mask for each char in the range [lo, hi) and
-       *  successively writes it to vec.  vec must have as many elements as
-       *  the char array.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __vec  Pointer to an array of mask storage.
-       *  @return  @a __hi.
-      */
-      inline const char*
-      is(const char* __lo, const char* __hi, mask* __vec) const;
-
-      /**
-       *  @brief  Find char matching a mask
-       *
-       *  This function searches for and returns the first char in [lo,hi) for
-       *  which is(m,char) is true.
-       *
-       *  @param __m  The mask to compare against.
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  Pointer to a matching char if found, else @a __hi.
-      */
-      inline const char*
-      scan_is(mask __m, const char* __lo, const char* __hi) const;
-
-      /**
-       *  @brief  Find char not matching a mask
-       *
-       *  This function searches for and returns a pointer to the first char
-       *  in [__lo,__hi) for which is(m,char) is false.
-       *
-       *  @param __m  The mask to compare against.
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  Pointer to a non-matching char if found, else @a __hi.
-      */
-      inline const char*
-      scan_not(mask __m, const char* __lo, const char* __hi) const;
-
-      /**
-       *  @brief  Convert to uppercase.
-       *
-       *  This function converts the char argument to uppercase if possible.
-       *  If not possible (for example, '2'), returns the argument.
-       *
-       *  toupper() acts as if it returns ctype<char>::do_toupper(c).
-       *  do_toupper() must always return the same result for the same input.
-       *
-       *  @param __c  The char to convert.
-       *  @return  The uppercase char if convertible, else @a __c.
-      */
-      char_type
-      toupper(char_type __c) const
-      { return this->do_toupper(__c); }
-
-      /**
-       *  @brief  Convert array to uppercase.
-       *
-       *  This function converts each char in the range [__lo,__hi) to uppercase
-       *  if possible.  Other chars remain untouched.
-       *
-       *  toupper() acts as if it returns ctype<char>:: do_toupper(__lo, __hi).
-       *  do_toupper() must always return the same result for the same input.
-       *
-       *  @param __lo  Pointer to first char in range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  @a __hi.
-      */
-      const char_type*
-      toupper(char_type *__lo, const char_type* __hi) const
-      { return this->do_toupper(__lo, __hi); }
-
-      /**
-       *  @brief  Convert to lowercase.
-       *
-       *  This function converts the char argument to lowercase if possible.
-       *  If not possible (for example, '2'), returns the argument.
-       *
-       *  tolower() acts as if it returns ctype<char>::do_tolower(__c).
-       *  do_tolower() must always return the same result for the same input.
-       *
-       *  @param __c  The char to convert.
-       *  @return  The lowercase char if convertible, else @a __c.
-      */
-      char_type
-      tolower(char_type __c) const
-      { return this->do_tolower(__c); }
-
-      /**
-       *  @brief  Convert array to lowercase.
-       *
-       *  This function converts each char in the range [lo,hi) to lowercase
-       *  if possible.  Other chars remain untouched.
-       *
-       *  tolower() acts as if it returns ctype<char>:: do_tolower(__lo, __hi).
-       *  do_tolower() must always return the same result for the same input.
-       *
-       *  @param __lo  Pointer to first char in range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  @a __hi.
-      */
-      const char_type*
-      tolower(char_type* __lo, const char_type* __hi) const
-      { return this->do_tolower(__lo, __hi); }
-
-      /**
-       *  @brief  Widen char
-       *
-       *  This function converts the char to char_type using the simplest
-       *  reasonable transformation.  For an underived ctype<char> facet, the
-       *  argument will be returned unchanged.
-       *
-       *  This function works as if it returns ctype<char>::do_widen(c).
-       *  do_widen() must always return the same result for the same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __c  The char to convert.
-       *  @return  The converted character.
-      */
-      char_type
-      widen(char __c) const
-      {
-	if (_M_widen_ok)
-	  return _M_widen[static_cast<unsigned char>(__c)];
-	this->_M_widen_init();
-	return this->do_widen(__c);
-      }
-
-      /**
-       *  @brief  Widen char array
-       *
-       *  This function converts each char in the input to char using the
-       *  simplest reasonable transformation.  For an underived ctype<char>
-       *  facet, the argument will be copied unchanged.
-       *
-       *  This function works as if it returns ctype<char>::do_widen(c).
-       *  do_widen() must always return the same result for the same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __lo  Pointer to first char in range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __to  Pointer to the destination array.
-       *  @return  @a __hi.
-      */
-      const char*
-      widen(const char* __lo, const char* __hi, char_type* __to) const
-      {
-	if (_M_widen_ok == 1)
-	  {
-	    __builtin_memcpy(__to, __lo, __hi - __lo);
-	    return __hi;
-	  }
-	if (!_M_widen_ok)
-	  _M_widen_init();
-	return this->do_widen(__lo, __hi, __to);
-      }
-
-      /**
-       *  @brief  Narrow char
-       *
-       *  This function converts the char to char using the simplest
-       *  reasonable transformation.  If the conversion fails, dfault is
-       *  returned instead.  For an underived ctype<char> facet, @a c
-       *  will be returned unchanged.
-       *
-       *  This function works as if it returns ctype<char>::do_narrow(c).
-       *  do_narrow() must always return the same result for the same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __c  The char to convert.
-       *  @param __dfault  Char to return if conversion fails.
-       *  @return  The converted character.
-      */
-      char
-      narrow(char_type __c, char __dfault) const
-      {
-	if (_M_narrow[static_cast<unsigned char>(__c)])
-	  return _M_narrow[static_cast<unsigned char>(__c)];
-	const char __t = do_narrow(__c, __dfault);
-	if (__t != __dfault)
-	  _M_narrow[static_cast<unsigned char>(__c)] = __t;
-	return __t;
-      }
-
-      /**
-       *  @brief  Narrow char array
-       *
-       *  This function converts each char in the input to char using the
-       *  simplest reasonable transformation and writes the results to the
-       *  destination array.  For any char in the input that cannot be
-       *  converted, @a dfault is used instead.  For an underived ctype<char>
-       *  facet, the argument will be copied unchanged.
-       *
-       *  This function works as if it returns ctype<char>::do_narrow(lo, hi,
-       *  dfault, to).  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __dfault  Char to use if conversion fails.
-       *  @param __to  Pointer to the destination array.
-       *  @return  @a __hi.
-      */
-      const char_type*
-      narrow(const char_type* __lo, const char_type* __hi,
-	     char __dfault, char* __to) const
-      {
-	if (__builtin_expect(_M_narrow_ok == 1, true))
-	  {
-	    __builtin_memcpy(__to, __lo, __hi - __lo);
-	    return __hi;
-	  }
-	if (!_M_narrow_ok)
-	  _M_narrow_init();
-	return this->do_narrow(__lo, __hi, __dfault, __to);
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 695. ctype<char>::classic_table() not accessible.
-      /// Returns a pointer to the mask table provided to the constructor, or
-      /// the default from classic_table() if none was provided.
-      const mask*
-      table() const throw()
-      { return _M_table; }
-
-      /// Returns a pointer to the C locale mask table.
-      static const mask*
-      classic_table() throw();
-    protected:
-
-      /**
-       *  @brief  Destructor.
-       *
-       *  This function deletes table() if @a del was true in the
-       *  constructor.
-      */
-      virtual
-      ~ctype();
-
-      /**
-       *  @brief  Convert to uppercase.
-       *
-       *  This virtual function converts the char argument to uppercase if
-       *  possible.  If not possible (for example, '2'), returns the argument.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param __c  The char to convert.
-       *  @return  The uppercase char if convertible, else @a __c.
-      */
-      virtual char_type
-      do_toupper(char_type __c) const;
-
-      /**
-       *  @brief  Convert array to uppercase.
-       *
-       *  This virtual function converts each char in the range [lo,hi) to
-       *  uppercase if possible.  Other chars remain untouched.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_toupper(char_type* __lo, const char_type* __hi) const;
-
-      /**
-       *  @brief  Convert to lowercase.
-       *
-       *  This virtual function converts the char argument to lowercase if
-       *  possible.  If not possible (for example, '2'), returns the argument.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param __c  The char to convert.
-       *  @return  The lowercase char if convertible, else @a __c.
-      */
-      virtual char_type
-      do_tolower(char_type __c) const;
-
-      /**
-       *  @brief  Convert array to lowercase.
-       *
-       *  This virtual function converts each char in the range [lo,hi) to
-       *  lowercase if possible.  Other chars remain untouched.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param __lo  Pointer to first char in range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_tolower(char_type* __lo, const char_type* __hi) const;
-
-      /**
-       *  @brief  Widen char
-       *
-       *  This virtual function converts the char to char using the simplest
-       *  reasonable transformation.  For an underived ctype<char> facet, the
-       *  argument will be returned unchanged.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __c  The char to convert.
-       *  @return  The converted character.
-      */
-      virtual char_type
-      do_widen(char __c) const
-      { return __c; }
-
-      /**
-       *  @brief  Widen char array
-       *
-       *  This function converts each char in the range [lo,hi) to char using
-       *  the simplest reasonable transformation.  For an underived
-       *  ctype<char> facet, the argument will be copied unchanged.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __to  Pointer to the destination array.
-       *  @return  @a __hi.
-      */
-      virtual const char*
-      do_widen(const char* __lo, const char* __hi, char_type* __to) const
-      {
-	__builtin_memcpy(__to, __lo, __hi - __lo);
-	return __hi;
-      }
-
-      /**
-       *  @brief  Narrow char
-       *
-       *  This virtual function converts the char to char using the simplest
-       *  reasonable transformation.  If the conversion fails, dfault is
-       *  returned instead.  For an underived ctype<char> facet, @a c will be
-       *  returned unchanged.
-       *
-       *  do_narrow() is a hook for a derived facet to change the behavior of
-       *  narrowing.  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __c  The char to convert.
-       *  @param __dfault  Char to return if conversion fails.
-       *  @return  The converted char.
-      */
-      virtual char
-      do_narrow(char_type __c, char __dfault) const
-      { return __c; }
-
-      /**
-       *  @brief  Narrow char array to char array
-       *
-       *  This virtual function converts each char in the range [lo,hi) to
-       *  char using the simplest reasonable transformation and writes the
-       *  results to the destination array.  For any char in the input that
-       *  cannot be converted, @a dfault is used instead.  For an underived
-       *  ctype<char> facet, the argument will be copied unchanged.
-       *
-       *  do_narrow() is a hook for a derived facet to change the behavior of
-       *  narrowing.  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __dfault  Char to use if conversion fails.
-       *  @param __to  Pointer to the destination array.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_narrow(const char_type* __lo, const char_type* __hi,
-		char __dfault, char* __to) const
-      {
-	__builtin_memcpy(__to, __lo, __hi - __lo);
-	return __hi;
-      }
-
-    private:
-      void _M_narrow_init() const;
-      void _M_widen_init() const;
-    };
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /**
-   *  @brief  The ctype<wchar_t> specialization.
-   *  @ingroup locales
-   *
-   *  This class defines classification and conversion functions for the
-   *  wchar_t type.  It gets used by wchar_t streams for many I/O operations.
-   *  The wchar_t specialization provides a number of optimizations as well.
-   *
-   *  ctype<wchar_t> inherits its public methods from
-   *  __ctype_abstract_base<wchar_t>.
-  */
-  template<>
-    class ctype<wchar_t> : public __ctype_abstract_base<wchar_t>
-    {
-    public:
-      // Types:
-      /// Typedef for the template parameter wchar_t.
-      typedef wchar_t		char_type;
-      typedef wctype_t		__wmask_type;
-
-    protected:
-      __c_locale		_M_c_locale_ctype;
-
-      // Pre-computed narrowed and widened chars.
-      bool                      _M_narrow_ok;
-      char                      _M_narrow[128];
-      wint_t                    _M_widen[1 + static_cast<unsigned char>(-1)];
-
-      // Pre-computed elements for do_is.
-      mask                      _M_bit[16];
-      __wmask_type              _M_wmask[16];
-
-    public:
-      // Data Members:
-      /// The facet id for ctype<wchar_t>
-      static locale::id		id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      ctype(size_t __refs = 0);
-
-      /**
-       *  @brief  Constructor performs static initialization.
-       *
-       *  This constructor is used to construct the initial C locale facet.
-       *
-       *  @param __cloc  Handle to C locale data.
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      ctype(__c_locale __cloc, size_t __refs = 0);
-
-    protected:
-      __wmask_type
-      _M_convert_to_wmask(const mask __m) const throw();
-
-      /// Destructor
-      virtual
-      ~ctype();
-
-      /**
-       *  @brief  Test wchar_t classification.
-       *
-       *  This function finds a mask M for @a c and compares it to mask @a m.
-       *
-       *  do_is() is a hook for a derived facet to change the behavior of
-       *  classifying.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param __c  The wchar_t to find the mask of.
-       *  @param __m  The mask to compare against.
-       *  @return  (M & __m) != 0.
-      */
-      virtual bool
-      do_is(mask __m, char_type __c) const;
-
-      /**
-       *  @brief  Return a mask array.
-       *
-       *  This function finds the mask for each wchar_t in the range [lo,hi)
-       *  and successively writes it to vec.  vec must have as many elements
-       *  as the input.
-       *
-       *  do_is() is a hook for a derived facet to change the behavior of
-       *  classifying.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __vec  Pointer to an array of mask storage.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_is(const char_type* __lo, const char_type* __hi, mask* __vec) const;
-
-      /**
-       *  @brief  Find wchar_t matching mask
-       *
-       *  This function searches for and returns the first wchar_t c in
-       *  [__lo,__hi) for which is(__m,c) is true.
-       *
-       *  do_scan_is() is a hook for a derived facet to change the behavior of
-       *  match searching.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param __m  The mask to compare against.
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  Pointer to a matching wchar_t if found, else @a __hi.
-      */
-      virtual const char_type*
-      do_scan_is(mask __m, const char_type* __lo, const char_type* __hi) const;
-
-      /**
-       *  @brief  Find wchar_t not matching mask
-       *
-       *  This function searches for and returns a pointer to the first
-       *  wchar_t c of [__lo,__hi) for which is(__m,c) is false.
-       *
-       *  do_scan_is() is a hook for a derived facet to change the behavior of
-       *  match searching.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param __m  The mask to compare against.
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  Pointer to a non-matching wchar_t if found, else @a __hi.
-      */
-      virtual const char_type*
-      do_scan_not(mask __m, const char_type* __lo,
-		  const char_type* __hi) const;
-
-      /**
-       *  @brief  Convert to uppercase.
-       *
-       *  This virtual function converts the wchar_t argument to uppercase if
-       *  possible.  If not possible (for example, '2'), returns the argument.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param __c  The wchar_t to convert.
-       *  @return  The uppercase wchar_t if convertible, else @a __c.
-      */
-      virtual char_type
-      do_toupper(char_type __c) const;
-
-      /**
-       *  @brief  Convert array to uppercase.
-       *
-       *  This virtual function converts each wchar_t in the range [lo,hi) to
-       *  uppercase if possible.  Other elements remain untouched.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_toupper(char_type* __lo, const char_type* __hi) const;
-
-      /**
-       *  @brief  Convert to lowercase.
-       *
-       *  This virtual function converts the argument to lowercase if
-       *  possible.  If not possible (for example, '2'), returns the argument.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param __c  The wchar_t to convert.
-       *  @return  The lowercase wchar_t if convertible, else @a __c.
-      */
-      virtual char_type
-      do_tolower(char_type __c) const;
-
-      /**
-       *  @brief  Convert array to lowercase.
-       *
-       *  This virtual function converts each wchar_t in the range [lo,hi) to
-       *  lowercase if possible.  Other elements remain untouched.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_tolower(char_type* __lo, const char_type* __hi) const;
-
-      /**
-       *  @brief  Widen char to wchar_t
-       *
-       *  This virtual function converts the char to wchar_t using the
-       *  simplest reasonable transformation.  For an underived ctype<wchar_t>
-       *  facet, the argument will be cast to wchar_t.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __c  The char to convert.
-       *  @return  The converted wchar_t.
-      */
-      virtual char_type
-      do_widen(char __c) const;
-
-      /**
-       *  @brief  Widen char array to wchar_t array
-       *
-       *  This function converts each char in the input to wchar_t using the
-       *  simplest reasonable transformation.  For an underived ctype<wchar_t>
-       *  facet, the argument will be copied, casting each element to wchar_t.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __lo  Pointer to start range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __to  Pointer to the destination array.
-       *  @return  @a __hi.
-      */
-      virtual const char*
-      do_widen(const char* __lo, const char* __hi, char_type* __to) const;
-
-      /**
-       *  @brief  Narrow wchar_t to char
-       *
-       *  This virtual function converts the argument to char using
-       *  the simplest reasonable transformation.  If the conversion
-       *  fails, dfault is returned instead.  For an underived
-       *  ctype<wchar_t> facet, @a c will be cast to char and
-       *  returned.
-       *
-       *  do_narrow() is a hook for a derived facet to change the
-       *  behavior of narrowing.  do_narrow() must always return the
-       *  same result for the same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __c  The wchar_t to convert.
-       *  @param __dfault  Char to return if conversion fails.
-       *  @return  The converted char.
-      */
-      virtual char
-      do_narrow(char_type __c, char __dfault) const;
-
-      /**
-       *  @brief  Narrow wchar_t array to char array
-       *
-       *  This virtual function converts each wchar_t in the range [lo,hi) to
-       *  char using the simplest reasonable transformation and writes the
-       *  results to the destination array.  For any wchar_t in the input that
-       *  cannot be converted, @a dfault is used instead.  For an underived
-       *  ctype<wchar_t> facet, the argument will be copied, casting each
-       *  element to char.
-       *
-       *  do_narrow() is a hook for a derived facet to change the behavior of
-       *  narrowing.  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param __lo  Pointer to start of range.
-       *  @param __hi  Pointer to end of range.
-       *  @param __dfault  Char to use if conversion fails.
-       *  @param __to  Pointer to the destination array.
-       *  @return  @a __hi.
-      */
-      virtual const char_type*
-      do_narrow(const char_type* __lo, const char_type* __hi,
-		char __dfault, char* __to) const;
-
-      // For use at construction time only.
-      void
-      _M_initialize_ctype() throw();
-    };
-#endif //_GLIBCXX_USE_WCHAR_T
-
-  /// class ctype_byname [22.2.1.2].
-  template<typename _CharT>
-    class ctype_byname : public ctype<_CharT>
-    {
-    public:
-      typedef typename ctype<_CharT>::mask  mask;
-
-      explicit
-      ctype_byname(const char* __s, size_t __refs = 0);
-
-#if __cplusplus >= 201103L
-      explicit
-      ctype_byname(const string& __s, size_t __refs = 0)
-      : ctype_byname(__s.c_str(), __refs) { }
-#endif
-
-    protected:
-      virtual
-      ~ctype_byname() { };
-    };
-
-  /// 22.2.1.4  Class ctype_byname specializations.
-  template<>
-    class ctype_byname<char> : public ctype<char>
-    {
-    public:
-      explicit
-      ctype_byname(const char* __s, size_t __refs = 0);
-
-#if __cplusplus >= 201103L
-      explicit
-      ctype_byname(const string& __s, size_t __refs = 0);
-#endif
-
-    protected:
-      virtual
-      ~ctype_byname();
-    };
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    class ctype_byname<wchar_t> : public ctype<wchar_t>
-    {
-    public:
-      explicit
-      ctype_byname(const char* __s, size_t __refs = 0);
-
-#if __cplusplus >= 201103L
-      explicit
-      ctype_byname(const string& __s, size_t __refs = 0);
-#endif
-
-    protected:
-      virtual
-      ~ctype_byname();
-    };
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-// Include host and configuration specific ctype inlines.
-#include <bits/ctype_inline.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // 22.2.2  The numeric category.
-  class __num_base
-  {
-  public:
-    // NB: Code depends on the order of _S_atoms_out elements.
-    // Below are the indices into _S_atoms_out.
-    enum
-      {
-	_S_ominus,
-	_S_oplus,
-	_S_ox,
-	_S_oX,
-	_S_odigits,
-	_S_odigits_end = _S_odigits + 16,
-	_S_oudigits = _S_odigits_end,
-	_S_oudigits_end = _S_oudigits + 16,
-	_S_oe = _S_odigits + 14,  // For scientific notation, 'e'
-	_S_oE = _S_oudigits + 14, // For scientific notation, 'E'
-	_S_oend = _S_oudigits_end
-      };
-
-    // A list of valid numeric literals for output.  This array
-    // contains chars that will be passed through the current locale's
-    // ctype<_CharT>.widen() and then used to render numbers.
-    // For the standard "C" locale, this is
-    // "-+xX0123456789abcdef0123456789ABCDEF".
-    static const char* _S_atoms_out;
-
-    // String literal of acceptable (narrow) input, for num_get.
-    // "-+xX0123456789abcdefABCDEF"
-    static const char* _S_atoms_in;
-
-    enum
-    {
-      _S_iminus,
-      _S_iplus,
-      _S_ix,
-      _S_iX,
-      _S_izero,
-      _S_ie = _S_izero + 14,
-      _S_iE = _S_izero + 20,
-      _S_iend = 26
-    };
-
-    // num_put
-    // Construct and return valid scanf format for floating point types.
-    static void
-    _S_format_float(const ios_base& __io, char* __fptr, char __mod) throw();
-  };
-
-  template<typename _CharT>
-    struct __numpunct_cache : public locale::facet
-    {
-      const char*			_M_grouping;
-      size_t                            _M_grouping_size;
-      bool				_M_use_grouping;
-      const _CharT*			_M_truename;
-      size_t                            _M_truename_size;
-      const _CharT*			_M_falsename;
-      size_t                            _M_falsename_size;
-      _CharT				_M_decimal_point;
-      _CharT				_M_thousands_sep;
-
-      // A list of valid numeric literals for output: in the standard
-      // "C" locale, this is "-+xX0123456789abcdef0123456789ABCDEF".
-      // This array contains the chars after having been passed
-      // through the current locale's ctype<_CharT>.widen().
-      _CharT				_M_atoms_out[__num_base::_S_oend];
-
-      // A list of valid numeric literals for input: in the standard
-      // "C" locale, this is "-+xX0123456789abcdefABCDEF"
-      // This array contains the chars after having been passed
-      // through the current locale's ctype<_CharT>.widen().
-      _CharT				_M_atoms_in[__num_base::_S_iend];
-
-      bool				_M_allocated;
-
-      __numpunct_cache(size_t __refs = 0)
-      : facet(__refs), _M_grouping(0), _M_grouping_size(0),
-	_M_use_grouping(false),
-	_M_truename(0), _M_truename_size(0), _M_falsename(0),
-	_M_falsename_size(0), _M_decimal_point(_CharT()),
-	_M_thousands_sep(_CharT()), _M_allocated(false)
-	{ }
-
-      ~__numpunct_cache();
-
-      void
-      _M_cache(const locale& __loc);
-
-    private:
-      __numpunct_cache&
-      operator=(const __numpunct_cache&);
-
-      explicit
-      __numpunct_cache(const __numpunct_cache&);
-    };
-
-  template<typename _CharT>
-    __numpunct_cache<_CharT>::~__numpunct_cache()
-    {
-      if (_M_allocated)
-	{
-	  delete [] _M_grouping;
-	  delete [] _M_truename;
-	  delete [] _M_falsename;
-	}
-    }
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  /**
-   *  @brief  Primary class template numpunct.
-   *  @ingroup locales
-   *
-   *  This facet stores several pieces of information related to printing and
-   *  scanning numbers, such as the decimal point character.  It takes a
-   *  template parameter specifying the char type.  The numpunct facet is
-   *  used by streams for many I/O operations involving numbers.
-   *
-   *  The numpunct template uses protected virtual functions to provide the
-   *  actual results.  The public accessors forward the call to the virtual
-   *  functions.  These virtual functions are hooks for developers to
-   *  implement the behavior they require from a numpunct facet.
-  */
-  template<typename _CharT>
-    class numpunct : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-      typedef __numpunct_cache<_CharT>  __cache_type;
-
-    protected:
-      __cache_type*			_M_data;
-
-    public:
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Numpunct constructor.
-       *
-       *  @param  __refs  Refcount to pass to the base class.
-       */
-      explicit
-      numpunct(size_t __refs = 0)
-      : facet(__refs), _M_data(0)
-      { _M_initialize_numpunct(); }
-
-      /**
-       *  @brief  Internal constructor.  Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up the
-       *  predefined locale facets.
-       *
-       *  @param  __cache  __numpunct_cache object.
-       *  @param  __refs  Refcount to pass to the base class.
-       */
-      explicit
-      numpunct(__cache_type* __cache, size_t __refs = 0)
-      : facet(__refs), _M_data(__cache)
-      { _M_initialize_numpunct(); }
-
-      /**
-       *  @brief  Internal constructor.  Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up new
-       *  locales.
-       *
-       *  @param  __cloc  The C locale.
-       *  @param  __refs  Refcount to pass to the base class.
-       */
-      explicit
-      numpunct(__c_locale __cloc, size_t __refs = 0)
-      : facet(__refs), _M_data(0)
-      { _M_initialize_numpunct(__cloc); }
-
-      /**
-       *  @brief  Return decimal point character.
-       *
-       *  This function returns a char_type to use as a decimal point.  It
-       *  does so by returning returning
-       *  numpunct<char_type>::do_decimal_point().
-       *
-       *  @return  @a char_type representing a decimal point.
-      */
-      char_type
-      decimal_point() const
-      { return this->do_decimal_point(); }
-
-      /**
-       *  @brief  Return thousands separator character.
-       *
-       *  This function returns a char_type to use as a thousands
-       *  separator.  It does so by returning returning
-       *  numpunct<char_type>::do_thousands_sep().
-       *
-       *  @return  char_type representing a thousands separator.
-      */
-      char_type
-      thousands_sep() const
-      { return this->do_thousands_sep(); }
-
-      /**
-       *  @brief  Return grouping specification.
-       *
-       *  This function returns a string representing groupings for the
-       *  integer part of a number.  Groupings indicate where thousands
-       *  separators should be inserted in the integer part of a number.
-       *
-       *  Each char in the return string is interpret as an integer
-       *  rather than a character.  These numbers represent the number
-       *  of digits in a group.  The first char in the string
-       *  represents the number of digits in the least significant
-       *  group.  If a char is negative, it indicates an unlimited
-       *  number of digits for the group.  If more chars from the
-       *  string are required to group a number, the last char is used
-       *  repeatedly.
-       *
-       *  For example, if the grouping() returns "\003\002" and is
-       *  applied to the number 123456789, this corresponds to
-       *  12,34,56,789.  Note that if the string was "32", this would
-       *  put more than 50 digits into the least significant group if
-       *  the character set is ASCII.
-       *
-       *  The string is returned by calling
-       *  numpunct<char_type>::do_grouping().
-       *
-       *  @return  string representing grouping specification.
-      */
-      string
-      grouping() const
-      { return this->do_grouping(); }
-
-      /**
-       *  @brief  Return string representation of bool true.
-       *
-       *  This function returns a string_type containing the text
-       *  representation for true bool variables.  It does so by calling
-       *  numpunct<char_type>::do_truename().
-       *
-       *  @return  string_type representing printed form of true.
-      */
-      string_type
-      truename() const
-      { return this->do_truename(); }
-
-      /**
-       *  @brief  Return string representation of bool false.
-       *
-       *  This function returns a string_type containing the text
-       *  representation for false bool variables.  It does so by calling
-       *  numpunct<char_type>::do_falsename().
-       *
-       *  @return  string_type representing printed form of false.
-      */
-      string_type
-      falsename() const
-      { return this->do_falsename(); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~numpunct();
-
-      /**
-       *  @brief  Return decimal point character.
-       *
-       *  Returns a char_type to use as a decimal point.  This function is a
-       *  hook for derived classes to change the value returned.
-       *
-       *  @return  @a char_type representing a decimal point.
-      */
-      virtual char_type
-      do_decimal_point() const
-      { return _M_data->_M_decimal_point; }
-
-      /**
-       *  @brief  Return thousands separator character.
-       *
-       *  Returns a char_type to use as a thousands separator.  This function
-       *  is a hook for derived classes to change the value returned.
-       *
-       *  @return  @a char_type representing a thousands separator.
-      */
-      virtual char_type
-      do_thousands_sep() const
-      { return _M_data->_M_thousands_sep; }
-
-      /**
-       *  @brief  Return grouping specification.
-       *
-       *  Returns a string representing groupings for the integer part of a
-       *  number.  This function is a hook for derived classes to change the
-       *  value returned.  @see grouping() for details.
-       *
-       *  @return  String representing grouping specification.
-      */
-      virtual string
-      do_grouping() const
-      { return _M_data->_M_grouping; }
-
-      /**
-       *  @brief  Return string representation of bool true.
-       *
-       *  Returns a string_type containing the text representation for true
-       *  bool variables.  This function is a hook for derived classes to
-       *  change the value returned.
-       *
-       *  @return  string_type representing printed form of true.
-      */
-      virtual string_type
-      do_truename() const
-      { return _M_data->_M_truename; }
-
-      /**
-       *  @brief  Return string representation of bool false.
-       *
-       *  Returns a string_type containing the text representation for false
-       *  bool variables.  This function is a hook for derived classes to
-       *  change the value returned.
-       *
-       *  @return  string_type representing printed form of false.
-      */
-      virtual string_type
-      do_falsename() const
-      { return _M_data->_M_falsename; }
-
-      // For use at construction time only.
-      void
-      _M_initialize_numpunct(__c_locale __cloc = 0);
-    };
-
-  template<typename _CharT>
-    locale::id numpunct<_CharT>::id;
-
-  template<>
-    numpunct<char>::~numpunct();
-
-  template<>
-    void
-    numpunct<char>::_M_initialize_numpunct(__c_locale __cloc);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    numpunct<wchar_t>::~numpunct();
-
-  template<>
-    void
-    numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc);
-#endif
-
-  /// class numpunct_byname [22.2.3.2].
-  template<typename _CharT>
-    class numpunct_byname : public numpunct<_CharT>
-    {
-    public:
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-
-      explicit
-      numpunct_byname(const char* __s, size_t __refs = 0)
-      : numpunct<_CharT>(__refs)
-      {
-	if (__builtin_strcmp(__s, "C") != 0
-	    && __builtin_strcmp(__s, "POSIX") != 0)
-	  {
-	    __c_locale __tmp;
-	    this->_S_create_c_locale(__tmp, __s);
-	    this->_M_initialize_numpunct(__tmp);
-	    this->_S_destroy_c_locale(__tmp);
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      explicit
-      numpunct_byname(const string& __s, size_t __refs = 0)
-      : numpunct_byname(__s.c_str(), __refs) { }
-#endif
-
-    protected:
-      virtual
-      ~numpunct_byname() { }
-    };
-
-_GLIBCXX_END_NAMESPACE_CXX11
-
-_GLIBCXX_BEGIN_NAMESPACE_LDBL
-
-  /**
-   *  @brief  Primary class template num_get.
-   *  @ingroup locales
-   *
-   *  This facet encapsulates the code to parse and return a number
-   *  from a string.  It is used by the istream numeric extraction
-   *  operators.
-   *
-   *  The num_get template uses protected virtual functions to provide the
-   *  actual results.  The public accessors forward the call to the virtual
-   *  functions.  These virtual functions are hooks for developers to
-   *  implement the behavior they require from the num_get facet.
-  */
-  template<typename _CharT, typename _InIter>
-    class num_get : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef _InIter			iter_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      num_get(size_t __refs = 0) : facet(__refs) { }
-
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the bool @a v.  It does so by calling
-       *  num_get::do_get().
-       *
-       *  If ios_base::boolalpha is set, attempts to read
-       *  ctype<CharT>::truename() or ctype<CharT>::falsename().  Sets
-       *  @a v to true or false if successful.  Sets err to
-       *  ios_base::failbit if reading the string fails.  Sets err to
-       *  ios_base::eofbit if the stream is emptied.
-       *
-       *  If ios_base::boolalpha is not set, proceeds as with reading a long,
-       *  except if the value is 1, sets @a v to true, if the value is 0, sets
-       *  @a v to false, and otherwise set err to ios_base::failbit.
-       *
-       *  @param  __in  Start of input stream.
-       *  @param  __end  End of input stream.
-       *  @param  __io  Source of locale and flags.
-       *  @param  __err  Error flags to set.
-       *  @param  __v  Value to format and insert.
-       *  @return  Iterator after reading.
-      */
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, bool& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      //@{
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the integral variable @a v.  It does so
-       *  by calling num_get::do_get().
-       *
-       *  Parsing is affected by the flag settings in @a io.
-       *
-       *  The basic parse is affected by the value of io.flags() &
-       *  ios_base::basefield.  If equal to ios_base::oct, parses like the
-       *  scanf %o specifier.  Else if equal to ios_base::hex, parses like %X
-       *  specifier.  Else if basefield equal to 0, parses like the %i
-       *  specifier.  Otherwise, parses like %d for signed and %u for unsigned
-       *  types.  The matching type length modifier is also used.
-       *
-       *  Digit grouping is interpreted according to
-       *  numpunct::grouping() and numpunct::thousands_sep().  If the
-       *  pattern of digit groups isn't consistent, sets err to
-       *  ios_base::failbit.
-       *
-       *  If parsing the string yields a valid value for @a v, @a v is set.
-       *  Otherwise, sets err to ios_base::failbit and leaves @a v unaltered.
-       *  Sets err to ios_base::eofbit if the stream is emptied.
-       *
-       *  @param  __in  Start of input stream.
-       *  @param  __end  End of input stream.
-       *  @param  __io  Source of locale and flags.
-       *  @param  __err  Error flags to set.
-       *  @param  __v  Value to format and insert.
-       *  @return  Iterator after reading.
-      */
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, long& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, unsigned short& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, unsigned int& __v)   const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, unsigned long& __v)  const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, long long& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, unsigned long long& __v)  const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the integral variable @a v.  It does so
-       *  by calling num_get::do_get().
-       *
-       *  The input characters are parsed like the scanf %g specifier.  The
-       *  matching type length modifier is also used.
-       *
-       *  The decimal point character used is numpunct::decimal_point().
-       *  Digit grouping is interpreted according to
-       *  numpunct::grouping() and numpunct::thousands_sep().  If the
-       *  pattern of digit groups isn't consistent, sets err to
-       *  ios_base::failbit.
-       *
-       *  If parsing the string yields a valid value for @a v, @a v is set.
-       *  Otherwise, sets err to ios_base::failbit and leaves @a v unaltered.
-       *  Sets err to ios_base::eofbit if the stream is emptied.
-       *
-       *  @param  __in  Start of input stream.
-       *  @param  __end  End of input stream.
-       *  @param  __io  Source of locale and flags.
-       *  @param  __err  Error flags to set.
-       *  @param  __v  Value to format and insert.
-       *  @return  Iterator after reading.
-      */
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, float& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, double& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, long double& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-      //@}
-
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the pointer variable @a v.  It does so
-       *  by calling num_get::do_get().
-       *
-       *  The input characters are parsed like the scanf %p specifier.
-       *
-       *  Digit grouping is interpreted according to
-       *  numpunct::grouping() and numpunct::thousands_sep().  If the
-       *  pattern of digit groups isn't consistent, sets err to
-       *  ios_base::failbit.
-       *
-       *  Note that the digit grouping effect for pointers is a bit ambiguous
-       *  in the standard and shouldn't be relied on.  See DR 344.
-       *
-       *  If parsing the string yields a valid value for @a v, @a v is set.
-       *  Otherwise, sets err to ios_base::failbit and leaves @a v unaltered.
-       *  Sets err to ios_base::eofbit if the stream is emptied.
-       *
-       *  @param  __in  Start of input stream.
-       *  @param  __end  End of input stream.
-       *  @param  __io  Source of locale and flags.
-       *  @param  __err  Error flags to set.
-       *  @param  __v  Value to format and insert.
-       *  @return  Iterator after reading.
-      */
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, void*& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-    protected:
-      /// Destructor.
-      virtual ~num_get() { }
-
-      _GLIBCXX_DEFAULT_ABI_TAG
-      iter_type
-      _M_extract_float(iter_type, iter_type, ios_base&, ios_base::iostate&,
-		       string&) const;
-
-      template<typename _ValueT>
-	_GLIBCXX_DEFAULT_ABI_TAG
-	iter_type
-	_M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&,
-		       _ValueT&) const;
-
-      template<typename _CharT2>
-      typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, int>::__type
-	_M_find(const _CharT2*, size_t __len, _CharT2 __c) const
-	{
-	  int __ret = -1;
-	  if (__len <= 10)
-	    {
-	      if (__c >= _CharT2('0') && __c < _CharT2(_CharT2('0') + __len))
-		__ret = __c - _CharT2('0');
-	    }
-	  else
-	    {
-	      if (__c >= _CharT2('0') && __c <= _CharT2('9'))
-		__ret = __c - _CharT2('0');
-	      else if (__c >= _CharT2('a') && __c <= _CharT2('f'))
-		__ret = 10 + (__c - _CharT2('a'));
-	      else if (__c >= _CharT2('A') && __c <= _CharT2('F'))
-		__ret = 10 + (__c - _CharT2('A'));
-	    }
-	  return __ret;
-	}
-
-      template<typename _CharT2>
-      typename __gnu_cxx::__enable_if<!__is_char<_CharT2>::__value,
-				      int>::__type
-	_M_find(const _CharT2* __zero, size_t __len, _CharT2 __c) const
-	{
-	  int __ret = -1;
-	  const char_type* __q = char_traits<_CharT2>::find(__zero, __len, __c);
-	  if (__q)
-	    {
-	      __ret = __q - __zero;
-	      if (__ret > 15)
-		__ret -= 6;
-	    }
-	  return __ret;
-	}
-
-      //@{
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the variable @a v.  This function is a
-       *  hook for derived classes to change the value returned.  @see get()
-       *  for more details.
-       *
-       *  @param  __beg  Start of input stream.
-       *  @param  __end  End of input stream.
-       *  @param  __io  Source of locale and flags.
-       *  @param  __err  Error flags to set.
-       *  @param  __v  Value to format and insert.
-       *  @return  Iterator after reading.
-      */
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const;
-
-      virtual iter_type
-      do_get(iter_type __beg, iter_type __end, ios_base& __io,
-	     ios_base::iostate& __err, long& __v) const
-      { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
-      virtual iter_type
-      do_get(iter_type __beg, iter_type __end, ios_base& __io,
-	     ios_base::iostate& __err, unsigned short& __v) const
-      { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
-      virtual iter_type
-      do_get(iter_type __beg, iter_type __end, ios_base& __io,
-	     ios_base::iostate& __err, unsigned int& __v) const
-      { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
-      virtual iter_type
-      do_get(iter_type __beg, iter_type __end, ios_base& __io,
-	     ios_base::iostate& __err, unsigned long& __v) const
-      { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      virtual iter_type
-      do_get(iter_type __beg, iter_type __end, ios_base& __io,
-	     ios_base::iostate& __err, long long& __v) const
-      { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
-      virtual iter_type
-      do_get(iter_type __beg, iter_type __end, ios_base& __io,
-	     ios_base::iostate& __err, unsigned long long& __v) const
-      { return _M_extract_int(__beg, __end, __io, __err, __v); }
-#endif
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, float&) const;
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate&,
-	     double&) const;
-
-      // XXX GLIBCXX_ABI Deprecated
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
-      virtual iter_type
-      __do_get(iter_type, iter_type, ios_base&, ios_base::iostate&,
-	       double&) const;
-#else
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate&,
-	     long double&) const;
-#endif
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, void*&) const;
-
-      // XXX GLIBCXX_ABI Deprecated
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate&,
-	     long double&) const;
-#endif
-      //@}
-    };
-
-  template<typename _CharT, typename _InIter>
-    locale::id num_get<_CharT, _InIter>::id;
-
-
-  /**
-   *  @brief  Primary class template num_put.
-   *  @ingroup locales
-   *
-   *  This facet encapsulates the code to convert a number to a string.  It is
-   *  used by the ostream numeric insertion operators.
-   *
-   *  The num_put template uses protected virtual functions to provide the
-   *  actual results.  The public accessors forward the call to the virtual
-   *  functions.  These virtual functions are hooks for developers to
-   *  implement the behavior they require from the num_put facet.
-  */
-  template<typename _CharT, typename _OutIter>
-    class num_put : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT		char_type;
-      typedef _OutIter		iter_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id		id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      num_put(size_t __refs = 0) : facet(__refs) { }
-
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  Formats the boolean @a v and inserts it into a stream.  It does so
-       *  by calling num_put::do_put().
-       *
-       *  If ios_base::boolalpha is set, writes ctype<CharT>::truename() or
-       *  ctype<CharT>::falsename().  Otherwise formats @a v as an int.
-       *
-       *  @param  __s  Stream to write to.
-       *  @param  __io  Source of locale and flags.
-       *  @param  __fill  Char_type to use for filling.
-       *  @param  __v  Value to format and insert.
-       *  @return  Iterator after writing.
-      */
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill, bool __v) const
-      { return this->do_put(__s, __io, __fill, __v); }
-
-      //@{
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  Formats the integral value @a v and inserts it into a
-       *  stream.  It does so by calling num_put::do_put().
-       *
-       *  Formatting is affected by the flag settings in @a io.
-       *
-       *  The basic format is affected by the value of io.flags() &
-       *  ios_base::basefield.  If equal to ios_base::oct, formats like the
-       *  printf %o specifier.  Else if equal to ios_base::hex, formats like
-       *  %x or %X with ios_base::uppercase unset or set respectively.
-       *  Otherwise, formats like %d, %ld, %lld for signed and %u, %lu, %llu
-       *  for unsigned values.  Note that if both oct and hex are set, neither
-       *  will take effect.
-       *
-       *  If ios_base::showpos is set, '+' is output before positive values.
-       *  If ios_base::showbase is set, '0' precedes octal values (except 0)
-       *  and '0[xX]' precedes hex values.
-       *
-       *  The decimal point character used is numpunct::decimal_point().
-       *  Thousands separators are inserted according to
-       *  numpunct::grouping() and numpunct::thousands_sep().
-       *
-       *  If io.width() is non-zero, enough @a fill characters are inserted to
-       *  make the result at least that wide.  If
-       *  (io.flags() & ios_base::adjustfield) == ios_base::left, result is
-       *  padded at the end.  If ios_base::internal, then padding occurs
-       *  immediately after either a '+' or '-' or after '0x' or '0X'.
-       *  Otherwise, padding occurs at the beginning.
-       *
-       *  @param  __s  Stream to write to.
-       *  @param  __io  Source of locale and flags.
-       *  @param  __fill  Char_type to use for filling.
-       *  @param  __v  Value to format and insert.
-       *  @return  Iterator after writing.
-      */
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill, long __v) const
-      { return this->do_put(__s, __io, __fill, __v); }
-
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill,
-	  unsigned long __v) const
-      { return this->do_put(__s, __io, __fill, __v); }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill, long long __v) const
-      { return this->do_put(__s, __io, __fill, __v); }
-
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill,
-	  unsigned long long __v) const
-      { return this->do_put(__s, __io, __fill, __v); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  Formats the floating point value @a v and inserts it into a stream.
-       *  It does so by calling num_put::do_put().
-       *
-       *  Formatting is affected by the flag settings in @a io.
-       *
-       *  The basic format is affected by the value of io.flags() &
-       *  ios_base::floatfield.  If equal to ios_base::fixed, formats like the
-       *  printf %f specifier.  Else if equal to ios_base::scientific, formats
-       *  like %e or %E with ios_base::uppercase unset or set respectively.
-       *  Otherwise, formats like %g or %G depending on uppercase.  Note that
-       *  if both fixed and scientific are set, the effect will also be like
-       *  %g or %G.
-       *
-       *  The output precision is given by io.precision().  This precision is
-       *  capped at numeric_limits::digits10 + 2 (different for double and
-       *  long double).  The default precision is 6.
-       *
-       *  If ios_base::showpos is set, '+' is output before positive values.
-       *  If ios_base::showpoint is set, a decimal point will always be
-       *  output.
-       *
-       *  The decimal point character used is numpunct::decimal_point().
-       *  Thousands separators are inserted according to
-       *  numpunct::grouping() and numpunct::thousands_sep().
-       *
-       *  If io.width() is non-zero, enough @a fill characters are inserted to
-       *  make the result at least that wide.  If
-       *  (io.flags() & ios_base::adjustfield) == ios_base::left, result is
-       *  padded at the end.  If ios_base::internal, then padding occurs
-       *  immediately after either a '+' or '-' or after '0x' or '0X'.
-       *  Otherwise, padding occurs at the beginning.
-       *
-       *  @param  __s  Stream to write to.
-       *  @param  __io  Source of locale and flags.
-       *  @param  __fill  Char_type to use for filling.
-       *  @param  __v  Value to format and insert.
-       *  @return  Iterator after writing.
-      */
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill, double __v) const
-      { return this->do_put(__s, __io, __fill, __v); }
-
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill,
-	  long double __v) const
-      { return this->do_put(__s, __io, __fill, __v); }
-      //@}
-
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  Formats the pointer value @a v and inserts it into a stream.  It
-       *  does so by calling num_put::do_put().
-       *
-       *  This function formats @a v as an unsigned long with ios_base::hex
-       *  and ios_base::showbase set.
-       *
-       *  @param  __s  Stream to write to.
-       *  @param  __io  Source of locale and flags.
-       *  @param  __fill  Char_type to use for filling.
-       *  @param  __v  Value to format and insert.
-       *  @return  Iterator after writing.
-      */
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill,
-	  const void* __v) const
-      { return this->do_put(__s, __io, __fill, __v); }
-
-    protected:
-      template<typename _ValueT>
-	iter_type
-	_M_insert_float(iter_type, ios_base& __io, char_type __fill,
-			char __mod, _ValueT __v) const;
-
-      void
-      _M_group_float(const char* __grouping, size_t __grouping_size,
-		     char_type __sep, const char_type* __p, char_type* __new,
-		     char_type* __cs, int& __len) const;
-
-      template<typename _ValueT>
-	iter_type
-	_M_insert_int(iter_type, ios_base& __io, char_type __fill,
-		      _ValueT __v) const;
-
-      void
-      _M_group_int(const char* __grouping, size_t __grouping_size,
-		   char_type __sep, ios_base& __io, char_type* __new,
-		   char_type* __cs, int& __len) const;
-
-      void
-      _M_pad(char_type __fill, streamsize __w, ios_base& __io,
-	     char_type* __new, const char_type* __cs, int& __len) const;
-
-      /// Destructor.
-      virtual
-      ~num_put() { };
-
-      //@{
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  These functions do the work of formatting numeric values and
-       *  inserting them into a stream. This function is a hook for derived
-       *  classes to change the value returned.
-       *
-       *  @param  __s  Stream to write to.
-       *  @param  __io  Source of locale and flags.
-       *  @param  __fill  Char_type to use for filling.
-       *  @param  __v  Value to format and insert.
-       *  @return  Iterator after writing.
-      */
-      virtual iter_type
-      do_put(iter_type __s, ios_base& __io, char_type __fill, bool __v) const;
-
-      virtual iter_type
-      do_put(iter_type __s, ios_base& __io, char_type __fill, long __v) const
-      { return _M_insert_int(__s, __io, __fill, __v); }
-
-      virtual iter_type
-      do_put(iter_type __s, ios_base& __io, char_type __fill,
-	     unsigned long __v) const
-      { return _M_insert_int(__s, __io, __fill, __v); }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      virtual iter_type
-      do_put(iter_type __s, ios_base& __io, char_type __fill,
-	     long long __v) const
-      { return _M_insert_int(__s, __io, __fill, __v); }
-
-      virtual iter_type
-      do_put(iter_type __s, ios_base& __io, char_type __fill,
-	     unsigned long long __v) const
-      { return _M_insert_int(__s, __io, __fill, __v); }
-#endif
-
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type, double) const;
-
-      // XXX GLIBCXX_ABI Deprecated
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
-      virtual iter_type
-      __do_put(iter_type, ios_base&, char_type, double) const;
-#else
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type, long double) const;
-#endif
-
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type, const void*) const;
-
-      // XXX GLIBCXX_ABI Deprecated
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type, long double) const;
-#endif
-      //@}
-    };
-
-  template <typename _CharT, typename _OutIter>
-    locale::id num_put<_CharT, _OutIter>::id;
-
-_GLIBCXX_END_NAMESPACE_LDBL
-
-  // Subclause convenience interfaces, inlines.
-  // NB: These are inline because, when used in a loop, some compilers
-  // can hoist the body out of the loop; then it's just as fast as the
-  // C is*() function.
-
-  /// Convenience interface to ctype.is(ctype_base::space, __c).
-  template<typename _CharT>
-    inline bool
-    isspace(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::space, __c); }
-
-  /// Convenience interface to ctype.is(ctype_base::print, __c).
-  template<typename _CharT>
-    inline bool
-    isprint(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c); }
-
-  /// Convenience interface to ctype.is(ctype_base::cntrl, __c).
-  template<typename _CharT>
-    inline bool
-    iscntrl(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::cntrl, __c); }
-
-  /// Convenience interface to ctype.is(ctype_base::upper, __c).
-  template<typename _CharT>
-    inline bool
-    isupper(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::upper, __c); }
-
-  /// Convenience interface to ctype.is(ctype_base::lower, __c).
-  template<typename _CharT>
-    inline bool
-    islower(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::lower, __c); }
-
-  /// Convenience interface to ctype.is(ctype_base::alpha, __c).
-  template<typename _CharT>
-    inline bool
-    isalpha(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::alpha, __c); }
-
-  /// Convenience interface to ctype.is(ctype_base::digit, __c).
-  template<typename _CharT>
-    inline bool
-    isdigit(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::digit, __c); }
-
-  /// Convenience interface to ctype.is(ctype_base::punct, __c).
-  template<typename _CharT>
-    inline bool
-    ispunct(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::punct, __c); }
-
-  /// Convenience interface to ctype.is(ctype_base::xdigit, __c).
-  template<typename _CharT>
-    inline bool
-    isxdigit(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::xdigit, __c); }
-
-  /// Convenience interface to ctype.is(ctype_base::alnum, __c).
-  template<typename _CharT>
-    inline bool
-    isalnum(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::alnum, __c); }
-
-  /// Convenience interface to ctype.is(ctype_base::graph, __c).
-  template<typename _CharT>
-    inline bool
-    isgraph(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::graph, __c); }
-
-#if __cplusplus >= 201103L
-  /// Convenience interface to ctype.is(ctype_base::blank, __c).
-  template<typename _CharT>
-    inline bool
-    isblank(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::blank, __c); }
-#endif
-
-  /// Convenience interface to ctype.toupper(__c).
-  template<typename _CharT>
-    inline _CharT
-    toupper(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).toupper(__c); }
-
-  /// Convenience interface to ctype.tolower(__c).
-  template<typename _CharT>
-    inline _CharT
-    tolower(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).tolower(__c); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-# include <bits/locale_facets.tcc>
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/locale_facets.tcc b/openflow/usr/include/c++/5/bits/locale_facets.tcc
deleted file mode 100644
index bd58771..0000000
--- a/openflow/usr/include/c++/5/bits/locale_facets.tcc
+++ /dev/null
@@ -1,1377 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/locale_facets.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-#ifndef _LOCALE_FACETS_TCC
-#define _LOCALE_FACETS_TCC 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Routine to access a cache for the facet.  If the cache didn't
-  // exist before, it gets constructed on the fly.
-  template<typename _Facet>
-    struct __use_cache
-    {
-      const _Facet*
-      operator() (const locale& __loc) const;
-    };
-
-  // Specializations.
-  template<typename _CharT>
-    struct __use_cache<__numpunct_cache<_CharT> >
-    {
-      const __numpunct_cache<_CharT>*
-      operator() (const locale& __loc) const
-      {
-	const size_t __i = numpunct<_CharT>::id._M_id();
-	const locale::facet** __caches = __loc._M_impl->_M_caches;
-	if (!__caches[__i])
-	  {
-	    __numpunct_cache<_CharT>* __tmp = 0;
-	    __try
-	      {
-		__tmp = new __numpunct_cache<_CharT>;
-		__tmp->_M_cache(__loc);
-	      }
-	    __catch(...)
-	      {
-		delete __tmp;
-		__throw_exception_again;
-	      }
-	    __loc._M_impl->_M_install_cache(__tmp, __i);
-	  }
-	return static_cast<const __numpunct_cache<_CharT>*>(__caches[__i]);
-      }
-    };
-
-  template<typename _CharT>
-    void
-    __numpunct_cache<_CharT>::_M_cache(const locale& __loc)
-    {
-      const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__loc);
-
-      char* __grouping = 0;
-      _CharT* __truename = 0;
-      _CharT* __falsename = 0;
-      __try
-	{
-	  const string& __g = __np.grouping();
-	  _M_grouping_size = __g.size();
-	  __grouping = new char[_M_grouping_size];
-	  __g.copy(__grouping, _M_grouping_size);
-	  _M_use_grouping = (_M_grouping_size
-			     && static_cast<signed char>(__grouping[0]) > 0
-			     && (__grouping[0]
-				 != __gnu_cxx::__numeric_traits<char>::__max));
-
-	  const basic_string<_CharT>& __tn = __np.truename();
-	  _M_truename_size = __tn.size();
-	  __truename = new _CharT[_M_truename_size];
-	  __tn.copy(__truename, _M_truename_size);
-
-	  const basic_string<_CharT>& __fn = __np.falsename();
-	  _M_falsename_size = __fn.size();
-	  __falsename = new _CharT[_M_falsename_size];
-	  __fn.copy(__falsename, _M_falsename_size);
-
-	  _M_decimal_point = __np.decimal_point();
-	  _M_thousands_sep = __np.thousands_sep();
-
-	  const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__loc);
-	  __ct.widen(__num_base::_S_atoms_out,
-		     __num_base::_S_atoms_out
-		     + __num_base::_S_oend, _M_atoms_out);
-	  __ct.widen(__num_base::_S_atoms_in,
-		     __num_base::_S_atoms_in
-		     + __num_base::_S_iend, _M_atoms_in);
-
-	  _M_grouping = __grouping;
-	  _M_truename = __truename;
-	  _M_falsename = __falsename;
-	  _M_allocated = true;
-	}
-      __catch(...)
-	{
-	  delete [] __grouping;
-	  delete [] __truename;
-	  delete [] __falsename;
-	  __throw_exception_again;
-	}
-    }
-
-  // Used by both numeric and monetary facets.
-  // Check to make sure that the __grouping_tmp string constructed in
-  // money_get or num_get matches the canonical grouping for a given
-  // locale.
-  // __grouping_tmp is parsed L to R
-  // 1,222,444 == __grouping_tmp of "\1\3\3"
-  // __grouping is parsed R to L
-  // 1,222,444 == __grouping of "\3" == "\3\3\3"
-  _GLIBCXX_PURE bool
-  __verify_grouping(const char* __grouping, size_t __grouping_size,
-		    const string& __grouping_tmp) throw ();
-
-_GLIBCXX_BEGIN_NAMESPACE_LDBL
-
-  template<typename _CharT, typename _InIter>
-    _GLIBCXX_DEFAULT_ABI_TAG
-    _InIter
-    num_get<_CharT, _InIter>::
-    _M_extract_float(_InIter __beg, _InIter __end, ios_base& __io,
-		     ios_base::iostate& __err, string& __xtrc) const
-    {
-      typedef char_traits<_CharT>			__traits_type;
-      typedef __numpunct_cache<_CharT>                  __cache_type;
-      __use_cache<__cache_type> __uc;
-      const locale& __loc = __io._M_getloc();
-      const __cache_type* __lc = __uc(__loc);
-      const _CharT* __lit = __lc->_M_atoms_in;
-      char_type __c = char_type();
-
-      // True if __beg becomes equal to __end.
-      bool __testeof = __beg == __end;
-
-      // First check for sign.
-      if (!__testeof)
-	{
-	  __c = *__beg;
-	  const bool __plus = __c == __lit[__num_base::_S_iplus];
-	  if ((__plus || __c == __lit[__num_base::_S_iminus])
-	      && !(__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-	      && !(__c == __lc->_M_decimal_point))
-	    {
-	      __xtrc += __plus ? '+' : '-';
-	      if (++__beg != __end)
-		__c = *__beg;
-	      else
-		__testeof = true;
-	    }
-	}
-
-      // Next, look for leading zeros.
-      bool __found_mantissa = false;
-      int __sep_pos = 0;
-      while (!__testeof)
-	{
-	  if ((__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-	      || __c == __lc->_M_decimal_point)
-	    break;
-	  else if (__c == __lit[__num_base::_S_izero])
-	    {
-	      if (!__found_mantissa)
-		{
-		  __xtrc += '0';
-		  __found_mantissa = true;
-		}
-	      ++__sep_pos;
-
-	      if (++__beg != __end)
-		__c = *__beg;
-	      else
-		__testeof = true;
-	    }
-	  else
-	    break;
-	}
-
-      // Only need acceptable digits for floating point numbers.
-      bool __found_dec = false;
-      bool __found_sci = false;
-      string __found_grouping;
-      if (__lc->_M_use_grouping)
-	__found_grouping.reserve(32);
-      const char_type* __lit_zero = __lit + __num_base::_S_izero;
-
-      if (!__lc->_M_allocated)
-	// "C" locale
-	while (!__testeof)
-	  {
-	    const int __digit = _M_find(__lit_zero, 10, __c);
-	    if (__digit != -1)
-	      {
-		__xtrc += '0' + __digit;
-		__found_mantissa = true;
-	      }
-	    else if (__c == __lc->_M_decimal_point
-		     && !__found_dec && !__found_sci)
-	      {
-		__xtrc += '.';
-		__found_dec = true;
-	      }
-	    else if ((__c == __lit[__num_base::_S_ie] 
-		      || __c == __lit[__num_base::_S_iE])
-		     && !__found_sci && __found_mantissa)
-	      {
-		// Scientific notation.
-		__xtrc += 'e';
-		__found_sci = true;
-		
-		// Remove optional plus or minus sign, if they exist.
-		if (++__beg != __end)
-		  {
-		    __c = *__beg;
-		    const bool __plus = __c == __lit[__num_base::_S_iplus];
-		    if (__plus || __c == __lit[__num_base::_S_iminus])
-		      __xtrc += __plus ? '+' : '-';
-		    else
-		      continue;
-		  }
-		else
-		  {
-		    __testeof = true;
-		    break;
-		  }
-	      }
-	    else
-	      break;
-
-	    if (++__beg != __end)
-	      __c = *__beg;
-	    else
-	      __testeof = true;
-	  }
-      else
-	while (!__testeof)
-	  {
-	    // According to 22.2.2.1.2, p8-9, first look for thousands_sep
-	    // and decimal_point.
-	    if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-	      {
-		if (!__found_dec && !__found_sci)
-		  {
-		    // NB: Thousands separator at the beginning of a string
-		    // is a no-no, as is two consecutive thousands separators.
-		    if (__sep_pos)
-		      {
-			__found_grouping += static_cast<char>(__sep_pos);
-			__sep_pos = 0;
-		      }
-		    else
-		      {
-			// NB: __convert_to_v will not assign __v and will
-			// set the failbit.
-			__xtrc.clear();
-			break;
-		      }
-		  }
-		else
-		  break;
-	      }
-	    else if (__c == __lc->_M_decimal_point)
-	      {
-		if (!__found_dec && !__found_sci)
-		  {
-		    // If no grouping chars are seen, no grouping check
-		    // is applied. Therefore __found_grouping is adjusted
-		    // only if decimal_point comes after some thousands_sep.
-		    if (__found_grouping.size())
-		      __found_grouping += static_cast<char>(__sep_pos);
-		    __xtrc += '.';
-		    __found_dec = true;
-		  }
-		else
-		  break;
-	      }
-	    else
-	      {
-		const char_type* __q =
-		  __traits_type::find(__lit_zero, 10, __c);
-		if (__q)
-		  {
-		    __xtrc += '0' + (__q - __lit_zero);
-		    __found_mantissa = true;
-		    ++__sep_pos;
-		  }
-		else if ((__c == __lit[__num_base::_S_ie] 
-			  || __c == __lit[__num_base::_S_iE])
-			 && !__found_sci && __found_mantissa)
-		  {
-		    // Scientific notation.
-		    if (__found_grouping.size() && !__found_dec)
-		      __found_grouping += static_cast<char>(__sep_pos);
-		    __xtrc += 'e';
-		    __found_sci = true;
-		    
-		    // Remove optional plus or minus sign, if they exist.
-		    if (++__beg != __end)
-		      {
-			__c = *__beg;
-			const bool __plus = __c == __lit[__num_base::_S_iplus];
-			if ((__plus || __c == __lit[__num_base::_S_iminus])
-			    && !(__lc->_M_use_grouping
-				 && __c == __lc->_M_thousands_sep)
-			    && !(__c == __lc->_M_decimal_point))
-		      __xtrc += __plus ? '+' : '-';
-			else
-			  continue;
-		      }
-		    else
-		      {
-			__testeof = true;
-			break;
-		      }
-		  }
-		else
-		  break;
-	      }
-	    
-	    if (++__beg != __end)
-	      __c = *__beg;
-	    else
-	      __testeof = true;
-	  }
-
-      // Digit grouping is checked. If grouping and found_grouping don't
-      // match, then get very very upset, and set failbit.
-      if (__found_grouping.size())
-        {
-          // Add the ending grouping if a decimal or 'e'/'E' wasn't found.
-	  if (!__found_dec && !__found_sci)
-	    __found_grouping += static_cast<char>(__sep_pos);
-
-          if (!std::__verify_grouping(__lc->_M_grouping, 
-				      __lc->_M_grouping_size,
-				      __found_grouping))
-	    __err = ios_base::failbit;
-        }
-
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    template<typename _ValueT>
-      _GLIBCXX_DEFAULT_ABI_TAG
-      _InIter
-      num_get<_CharT, _InIter>::
-      _M_extract_int(_InIter __beg, _InIter __end, ios_base& __io,
-		     ios_base::iostate& __err, _ValueT& __v) const
-      {
-        typedef char_traits<_CharT>			     __traits_type;
-	using __gnu_cxx::__add_unsigned;
-	typedef typename __add_unsigned<_ValueT>::__type __unsigned_type;
-	typedef __numpunct_cache<_CharT>                     __cache_type;
-	__use_cache<__cache_type> __uc;
-	const locale& __loc = __io._M_getloc();
-	const __cache_type* __lc = __uc(__loc);
-	const _CharT* __lit = __lc->_M_atoms_in;
-	char_type __c = char_type();
-
-	// NB: Iff __basefield == 0, __base can change based on contents.
-	const ios_base::fmtflags __basefield = __io.flags()
-	                                       & ios_base::basefield;
-	const bool __oct = __basefield == ios_base::oct;
-	int __base = __oct ? 8 : (__basefield == ios_base::hex ? 16 : 10);
-
-	// True if __beg becomes equal to __end.
-	bool __testeof = __beg == __end;
-
-	// First check for sign.
-	bool __negative = false;
-	if (!__testeof)
-	  {
-	    __c = *__beg;
-	    __negative = __c == __lit[__num_base::_S_iminus];
-	    if ((__negative || __c == __lit[__num_base::_S_iplus])
-		&& !(__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-		&& !(__c == __lc->_M_decimal_point))
-	      {
-		if (++__beg != __end)
-		  __c = *__beg;
-		else
-		  __testeof = true;
-	      }
-	  }
-
-	// Next, look for leading zeros and check required digits
-	// for base formats.
-	bool __found_zero = false;
-	int __sep_pos = 0;
-	while (!__testeof)
-	  {
-	    if ((__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-		|| __c == __lc->_M_decimal_point)
-	      break;
-	    else if (__c == __lit[__num_base::_S_izero] 
-		     && (!__found_zero || __base == 10))
-	      {
-		__found_zero = true;
-		++__sep_pos;
-		if (__basefield == 0)
-		  __base = 8;
-		if (__base == 8)
-		  __sep_pos = 0;
-	      }
-	    else if (__found_zero
-		     && (__c == __lit[__num_base::_S_ix]
-			 || __c == __lit[__num_base::_S_iX]))
-	      {
-		if (__basefield == 0)
-		  __base = 16;
-		if (__base == 16)
-		  {
-		    __found_zero = false;
-		    __sep_pos = 0;
-		  }
-		else
-		  break;
-	      }
-	    else
-	      break;
-
-	    if (++__beg != __end)
-	      {
-		__c = *__beg;
-		if (!__found_zero)
-		  break;
-	      }
-	    else
-	      __testeof = true;
-	  }
-	
-	// At this point, base is determined. If not hex, only allow
-	// base digits as valid input.
-	const size_t __len = (__base == 16 ? __num_base::_S_iend
-			      - __num_base::_S_izero : __base);
-
-	// Extract.
-	string __found_grouping;
-	if (__lc->_M_use_grouping)
-	  __found_grouping.reserve(32);
-	bool __testfail = false;
-	bool __testoverflow = false;
-	const __unsigned_type __max =
-	  (__negative && __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
-	  ? -__gnu_cxx::__numeric_traits<_ValueT>::__min
-	  : __gnu_cxx::__numeric_traits<_ValueT>::__max;
-	const __unsigned_type __smax = __max / __base;
-	__unsigned_type __result = 0;
-	int __digit = 0;
-	const char_type* __lit_zero = __lit + __num_base::_S_izero;
-
-	if (!__lc->_M_allocated)
-	  // "C" locale
-	  while (!__testeof)
-	    {
-	      __digit = _M_find(__lit_zero, __len, __c);
-	      if (__digit == -1)
-		break;
-	      
-	      if (__result > __smax)
-		__testoverflow = true;
-	      else
-		{
-		  __result *= __base;
-		  __testoverflow |= __result > __max - __digit;
-		  __result += __digit;
-		  ++__sep_pos;
-		}
-	      
-	      if (++__beg != __end)
-		__c = *__beg;
-	      else
-		__testeof = true;
-	    }
-	else
-	  while (!__testeof)
-	    {
-	      // According to 22.2.2.1.2, p8-9, first look for thousands_sep
-	      // and decimal_point.
-	      if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-		{
-		  // NB: Thousands separator at the beginning of a string
-		  // is a no-no, as is two consecutive thousands separators.
-		  if (__sep_pos)
-		    {
-		      __found_grouping += static_cast<char>(__sep_pos);
-		      __sep_pos = 0;
-		    }
-		  else
-		    {
-		      __testfail = true;
-		      break;
-		    }
-		}
-	      else if (__c == __lc->_M_decimal_point)
-		break;
-	      else
-		{
-		  const char_type* __q =
-		    __traits_type::find(__lit_zero, __len, __c);
-		  if (!__q)
-		    break;
-		  
-		  __digit = __q - __lit_zero;
-		  if (__digit > 15)
-		    __digit -= 6;
-		  if (__result > __smax)
-		    __testoverflow = true;
-		  else
-		    {
-		      __result *= __base;
-		      __testoverflow |= __result > __max - __digit;
-		      __result += __digit;
-		      ++__sep_pos;
-		    }
-		}
-	      
-	      if (++__beg != __end)
-		__c = *__beg;
-	      else
-		__testeof = true;
-	    }
-	
-	// Digit grouping is checked. If grouping and found_grouping don't
-	// match, then get very very upset, and set failbit.
-	if (__found_grouping.size())
-	  {
-	    // Add the ending grouping.
-	    __found_grouping += static_cast<char>(__sep_pos);
-
-	    if (!std::__verify_grouping(__lc->_M_grouping,
-					__lc->_M_grouping_size,
-					__found_grouping))
-	      __err = ios_base::failbit;
-	  }
-
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 23. Num_get overflow result.
-	if ((!__sep_pos && !__found_zero && !__found_grouping.size())
-	    || __testfail)
-	  {
-	    __v = 0;
-	    __err = ios_base::failbit;
-	  }
-	else if (__testoverflow)
-	  {
-	    if (__negative
-		&& __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
-	      __v = __gnu_cxx::__numeric_traits<_ValueT>::__min;
-	    else
-	      __v = __gnu_cxx::__numeric_traits<_ValueT>::__max;
-	    __err = ios_base::failbit;
-	  }
-	else
-	  __v = __negative ? -__result : __result;
-
-	if (__testeof)
-	  __err |= ios_base::eofbit;
-	return __beg;
-      }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 17.  Bad bool parsing
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, bool& __v) const
-    {
-      if (!(__io.flags() & ios_base::boolalpha))
-        {
-	  // Parse bool values as long.
-          // NB: We can't just call do_get(long) here, as it might
-          // refer to a derived class.
-	  long __l = -1;
-          __beg = _M_extract_int(__beg, __end, __io, __err, __l);
-	  if (__l == 0 || __l == 1)
-	    __v = bool(__l);
-	  else
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 23. Num_get overflow result.
-	      __v = true;
-	      __err = ios_base::failbit;
-	      if (__beg == __end)
-		__err |= ios_base::eofbit;
-	    }
-        }
-      else
-        {
-	  // Parse bool values as alphanumeric.
-	  typedef __numpunct_cache<_CharT>  __cache_type;
-	  __use_cache<__cache_type> __uc;
-	  const locale& __loc = __io._M_getloc();
-	  const __cache_type* __lc = __uc(__loc);
-
-	  bool __testf = true;
-	  bool __testt = true;
-	  bool __donef = __lc->_M_falsename_size == 0;
-	  bool __donet = __lc->_M_truename_size == 0;
-	  bool __testeof = false;
-	  size_t __n = 0;
-	  while (!__donef || !__donet)
-	    {
-	      if (__beg == __end)
-		{
-		  __testeof = true;
-		  break;
-		}
-
-	      const char_type __c = *__beg;
-
-	      if (!__donef)
-		__testf = __c == __lc->_M_falsename[__n];
-
-	      if (!__testf && __donet)
-		break;
-
-	      if (!__donet)
-		__testt = __c == __lc->_M_truename[__n];
-
-	      if (!__testt && __donef)
-		break;
-
-	      if (!__testt && !__testf)
-		break;
-
-	      ++__n;
-	      ++__beg;
-
-	      __donef = !__testf || __n >= __lc->_M_falsename_size;
-	      __donet = !__testt || __n >= __lc->_M_truename_size;
-	    }
-	  if (__testf && __n == __lc->_M_falsename_size && __n)
-	    {
-	      __v = false;
-	      if (__testt && __n == __lc->_M_truename_size)
-		__err = ios_base::failbit;
-	      else
-		__err = __testeof ? ios_base::eofbit : ios_base::goodbit;
-	    }
-	  else if (__testt && __n == __lc->_M_truename_size && __n)
-	    {
-	      __v = true;
-	      __err = __testeof ? ios_base::eofbit : ios_base::goodbit;
-	    }
-	  else
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 23. Num_get overflow result.
-	      __v = false;
-	      __err = ios_base::failbit;
-	      if (__testeof)
-		__err |= ios_base::eofbit;
-	    }
-	}
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-	   ios_base::iostate& __err, float& __v) const
-    {
-      string __xtrc;
-      __xtrc.reserve(32);
-      __beg = _M_extract_float(__beg, __end, __io, __err, __xtrc);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err, _S_get_c_locale());
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, double& __v) const
-    {
-      string __xtrc;
-      __xtrc.reserve(32);
-      __beg = _M_extract_float(__beg, __end, __io, __err, __xtrc);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err, _S_get_c_locale());
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    __do_get(iter_type __beg, iter_type __end, ios_base& __io,
-	     ios_base::iostate& __err, double& __v) const
-    {
-      string __xtrc;
-      __xtrc.reserve(32);
-      __beg = _M_extract_float(__beg, __end, __io, __err, __xtrc);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err, _S_get_c_locale());
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-#endif
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, long double& __v) const
-    {
-      string __xtrc;
-      __xtrc.reserve(32);
-      __beg = _M_extract_float(__beg, __end, __io, __err, __xtrc);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err, _S_get_c_locale());
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, void*& __v) const
-    {
-      // Prepare for hex formatted input.
-      typedef ios_base::fmtflags        fmtflags;
-      const fmtflags __fmt = __io.flags();
-      __io.flags((__fmt & ~ios_base::basefield) | ios_base::hex);
-
-      typedef __gnu_cxx::__conditional_type<(sizeof(void*)
-					     <= sizeof(unsigned long)),
-	unsigned long, unsigned long long>::__type _UIntPtrType;       
-
-      _UIntPtrType __ul;
-      __beg = _M_extract_int(__beg, __end, __io, __err, __ul);
-
-      // Reset from hex formatted input.
-      __io.flags(__fmt);
-
-      __v = reinterpret_cast<void*>(__ul);
-      return __beg;
-    }
-
-  // For use by integer and floating-point types after they have been
-  // converted into a char_type string.
-  template<typename _CharT, typename _OutIter>
-    void
-    num_put<_CharT, _OutIter>::
-    _M_pad(_CharT __fill, streamsize __w, ios_base& __io,
-	   _CharT* __new, const _CharT* __cs, int& __len) const
-    {
-      // [22.2.2.2.2] Stage 3.
-      // If necessary, pad.
-      __pad<_CharT, char_traits<_CharT> >::_S_pad(__io, __fill, __new,
-						  __cs, __w, __len);
-      __len = static_cast<int>(__w);
-    }
-
-_GLIBCXX_END_NAMESPACE_LDBL
-
-  template<typename _CharT, typename _ValueT>
-    int
-    __int_to_char(_CharT* __bufend, _ValueT __v, const _CharT* __lit,
-		  ios_base::fmtflags __flags, bool __dec)
-    {
-      _CharT* __buf = __bufend;
-      if (__builtin_expect(__dec, true))
-	{
-	  // Decimal.
-	  do
-	    {
-	      *--__buf = __lit[(__v % 10) + __num_base::_S_odigits];
-	      __v /= 10;
-	    }
-	  while (__v != 0);
-	}
-      else if ((__flags & ios_base::basefield) == ios_base::oct)
-	{
-	  // Octal.
-	  do
-	    {
-	      *--__buf = __lit[(__v & 0x7) + __num_base::_S_odigits];
-	      __v >>= 3;
-	    }
-	  while (__v != 0);
-	}
-      else
-	{
-	  // Hex.
-	  const bool __uppercase = __flags & ios_base::uppercase;
-	  const int __case_offset = __uppercase ? __num_base::_S_oudigits
-	                                        : __num_base::_S_odigits;
-	  do
-	    {
-	      *--__buf = __lit[(__v & 0xf) + __case_offset];
-	      __v >>= 4;
-	    }
-	  while (__v != 0);
-	}
-      return __bufend - __buf;
-    }
-
-_GLIBCXX_BEGIN_NAMESPACE_LDBL
-
-  template<typename _CharT, typename _OutIter>
-    void
-    num_put<_CharT, _OutIter>::
-    _M_group_int(const char* __grouping, size_t __grouping_size, _CharT __sep,
-		 ios_base&, _CharT* __new, _CharT* __cs, int& __len) const
-    {
-      _CharT* __p = std::__add_grouping(__new, __sep, __grouping,
-					__grouping_size, __cs, __cs + __len);
-      __len = __p - __new;
-    }
-  
-  template<typename _CharT, typename _OutIter>
-    template<typename _ValueT>
-      _OutIter
-      num_put<_CharT, _OutIter>::
-      _M_insert_int(_OutIter __s, ios_base& __io, _CharT __fill,
-		    _ValueT __v) const
-      {
-	using __gnu_cxx::__add_unsigned;
-	typedef typename __add_unsigned<_ValueT>::__type __unsigned_type;
-	typedef __numpunct_cache<_CharT>	             __cache_type;
-	__use_cache<__cache_type> __uc;
-	const locale& __loc = __io._M_getloc();
-	const __cache_type* __lc = __uc(__loc);
-	const _CharT* __lit = __lc->_M_atoms_out;
-	const ios_base::fmtflags __flags = __io.flags();
-
-	// Long enough to hold hex, dec, and octal representations.
-	const int __ilen = 5 * sizeof(_ValueT);
-	_CharT* __cs = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							     * __ilen));
-
-	// [22.2.2.2.2] Stage 1, numeric conversion to character.
-	// Result is returned right-justified in the buffer.
-	const ios_base::fmtflags __basefield = __flags & ios_base::basefield;
-	const bool __dec = (__basefield != ios_base::oct
-			    && __basefield != ios_base::hex);
-	const __unsigned_type __u = ((__v > 0 || !__dec)
-				     ? __unsigned_type(__v)
-				     : -__unsigned_type(__v));
- 	int __len = __int_to_char(__cs + __ilen, __u, __lit, __flags, __dec);
-	__cs += __ilen - __len;
-
-	// Add grouping, if necessary.
-	if (__lc->_M_use_grouping)
-	  {
-	    // Grouping can add (almost) as many separators as the number
-	    // of digits + space is reserved for numeric base or sign.
-	    _CharT* __cs2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-								  * (__len + 1)
-								  * 2));
-	    _M_group_int(__lc->_M_grouping, __lc->_M_grouping_size,
-			 __lc->_M_thousands_sep, __io, __cs2 + 2, __cs, __len);
-	    __cs = __cs2 + 2;
-	  }
-
-	// Complete Stage 1, prepend numeric base or sign.
-	if (__builtin_expect(__dec, true))
-	  {
-	    // Decimal.
-	    if (__v >= 0)
-	      {
-		if (bool(__flags & ios_base::showpos)
-		    && __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
-		  *--__cs = __lit[__num_base::_S_oplus], ++__len;
-	      }
-	    else
-	      *--__cs = __lit[__num_base::_S_ominus], ++__len;
-	  }
-	else if (bool(__flags & ios_base::showbase) && __v)
-	  {
-	    if (__basefield == ios_base::oct)
-	      *--__cs = __lit[__num_base::_S_odigits], ++__len;
-	    else
-	      {
-		// 'x' or 'X'
-		const bool __uppercase = __flags & ios_base::uppercase;
-		*--__cs = __lit[__num_base::_S_ox + __uppercase];
-		// '0'
-		*--__cs = __lit[__num_base::_S_odigits];
-		__len += 2;
-	      }
-	  }
-
-	// Pad.
-	const streamsize __w = __io.width();
-	if (__w > static_cast<streamsize>(__len))
-	  {
-	    _CharT* __cs3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-								  * __w));
-	    _M_pad(__fill, __w, __io, __cs3, __cs, __len);
-	    __cs = __cs3;
-	  }
-	__io.width(0);
-
-	// [22.2.2.2.2] Stage 4.
-	// Write resulting, fully-formatted string to output iterator.
-	return std::__write(__s, __cs, __len);
-      }
-
-  template<typename _CharT, typename _OutIter>
-    void
-    num_put<_CharT, _OutIter>::
-    _M_group_float(const char* __grouping, size_t __grouping_size,
-		   _CharT __sep, const _CharT* __p, _CharT* __new,
-		   _CharT* __cs, int& __len) const
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 282. What types does numpunct grouping refer to?
-      // Add grouping, if necessary.
-      const int __declen = __p ? __p - __cs : __len;
-      _CharT* __p2 = std::__add_grouping(__new, __sep, __grouping,
-					 __grouping_size,
-					 __cs, __cs + __declen);
-
-      // Tack on decimal part.
-      int __newlen = __p2 - __new;
-      if (__p)
-	{
-	  char_traits<_CharT>::copy(__p2, __p, __len - __declen);
-	  __newlen += __len - __declen;
-	}
-      __len = __newlen;
-    }
-
-  // The following code uses vsnprintf (or vsprintf(), when
-  // _GLIBCXX_USE_C99 is not defined) to convert floating point values
-  // for insertion into a stream.  An optimization would be to replace
-  // them with code that works directly on a wide buffer and then use
-  // __pad to do the padding.  It would be good to replace them anyway
-  // to gain back the efficiency that C++ provides by knowing up front
-  // the type of the values to insert.  Also, sprintf is dangerous
-  // since may lead to accidental buffer overruns.  This
-  // implementation follows the C++ standard fairly directly as
-  // outlined in 22.2.2.2 [lib.locale.num.put]
-  template<typename _CharT, typename _OutIter>
-    template<typename _ValueT>
-      _OutIter
-      num_put<_CharT, _OutIter>::
-      _M_insert_float(_OutIter __s, ios_base& __io, _CharT __fill, char __mod,
-		       _ValueT __v) const
-      {
-	typedef __numpunct_cache<_CharT>                __cache_type;
-	__use_cache<__cache_type> __uc;
-	const locale& __loc = __io._M_getloc();
-	const __cache_type* __lc = __uc(__loc);
-
-	// Use default precision if out of range.
-	const streamsize __prec = __io.precision() < 0 ? 6 : __io.precision();
-
-	const int __max_digits =
-	  __gnu_cxx::__numeric_traits<_ValueT>::__digits10;
-
-	// [22.2.2.2.2] Stage 1, numeric conversion to character.
-	int __len;
-	// Long enough for the max format spec.
-	char __fbuf[16];
-	__num_base::_S_format_float(__io, __fbuf, __mod);
-
-#ifdef _GLIBCXX_USE_C99
-	// Precision is always used except for hexfloat format.
-	const bool __use_prec =
-	  (__io.flags() & ios_base::floatfield) != ios_base::floatfield;
-
-	// First try a buffer perhaps big enough (most probably sufficient
-	// for non-ios_base::fixed outputs)
-	int __cs_size = __max_digits * 3;
-	char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-	if (__use_prec)
-	  __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size,
-					__fbuf, __prec, __v);
-	else
-	  __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size,
-					__fbuf, __v);
-
-	// If the buffer was not large enough, try again with the correct size.
-	if (__len >= __cs_size)
-	  {
-	    __cs_size = __len + 1;
-	    __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-	    if (__use_prec)
-	      __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size,
-					    __fbuf, __prec, __v);
-	    else
-	      __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size,
-					    __fbuf, __v);
-	  }
-#else
-	// Consider the possibility of long ios_base::fixed outputs
-	const bool __fixed = __io.flags() & ios_base::fixed;
-	const int __max_exp =
-	  __gnu_cxx::__numeric_traits<_ValueT>::__max_exponent10;
-
-	// The size of the output string is computed as follows.
-	// ios_base::fixed outputs may need up to __max_exp + 1 chars
-	// for the integer part + __prec chars for the fractional part
-	// + 3 chars for sign, decimal point, '\0'. On the other hand,
-	// for non-fixed outputs __max_digits * 2 + __prec chars are
-	// largely sufficient.
-	const int __cs_size = __fixed ? __max_exp + __prec + 4
-	                              : __max_digits * 2 + __prec;
-	char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-	__len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, __fbuf, 
-				      __prec, __v);
-#endif
-
-	// [22.2.2.2.2] Stage 2, convert to char_type, using correct
-	// numpunct.decimal_point() values for '.' and adding grouping.
-	const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-	
-	_CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							     * __len));
-	__ctype.widen(__cs, __cs + __len, __ws);
-	
-	// Replace decimal point.
-	_CharT* __wp = 0;
-	const char* __p = char_traits<char>::find(__cs, __len, '.');
-	if (__p)
-	  {
-	    __wp = __ws + (__p - __cs);
-	    *__wp = __lc->_M_decimal_point;
-	  }
-	
-	// Add grouping, if necessary.
-	// N.B. Make sure to not group things like 2e20, i.e., no decimal
-	// point, scientific notation.
-	if (__lc->_M_use_grouping
-	    && (__wp || __len < 3 || (__cs[1] <= '9' && __cs[2] <= '9'
-				      && __cs[1] >= '0' && __cs[2] >= '0')))
-	  {
-	    // Grouping can add (almost) as many separators as the
-	    // number of digits, but no more.
-	    _CharT* __ws2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-								  * __len * 2));
-	    
-	    streamsize __off = 0;
-	    if (__cs[0] == '-' || __cs[0] == '+')
-	      {
-		__off = 1;
-		__ws2[0] = __ws[0];
-		__len -= 1;
-	      }
-	    
-	    _M_group_float(__lc->_M_grouping, __lc->_M_grouping_size,
-			   __lc->_M_thousands_sep, __wp, __ws2 + __off,
-			   __ws + __off, __len);
-	    __len += __off;
-	    
-	    __ws = __ws2;
-	  }
-
-	// Pad.
-	const streamsize __w = __io.width();
-	if (__w > static_cast<streamsize>(__len))
-	  {
-	    _CharT* __ws3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-								  * __w));
-	    _M_pad(__fill, __w, __io, __ws3, __ws, __len);
-	    __ws = __ws3;
-	  }
-	__io.width(0);
-	
-	// [22.2.2.2.2] Stage 4.
-	// Write resulting, fully-formatted string to output iterator.
-	return std::__write(__s, __ws, __len);
-      }
-  
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill, bool __v) const
-    {
-      const ios_base::fmtflags __flags = __io.flags();
-      if ((__flags & ios_base::boolalpha) == 0)
-        {
-          const long __l = __v;
-          __s = _M_insert_int(__s, __io, __fill, __l);
-        }
-      else
-        {
-	  typedef __numpunct_cache<_CharT>              __cache_type;
-	  __use_cache<__cache_type> __uc;
-	  const locale& __loc = __io._M_getloc();
-	  const __cache_type* __lc = __uc(__loc);
-
-	  const _CharT* __name = __v ? __lc->_M_truename
-	                             : __lc->_M_falsename;
-	  int __len = __v ? __lc->_M_truename_size
-	                  : __lc->_M_falsename_size;
-
-	  const streamsize __w = __io.width();
-	  if (__w > static_cast<streamsize>(__len))
-	    {
-	      const streamsize __plen = __w - __len;
-	      _CharT* __ps
-		= static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							* __plen));
-
-	      char_traits<_CharT>::assign(__ps, __plen, __fill);
-	      __io.width(0);
-
-	      if ((__flags & ios_base::adjustfield) == ios_base::left)
-		{
-		  __s = std::__write(__s, __name, __len);
-		  __s = std::__write(__s, __ps, __plen);
-		}
-	      else
-		{
-		  __s = std::__write(__s, __ps, __plen);
-		  __s = std::__write(__s, __name, __len);
-		}
-	      return __s;
-	    }
-	  __io.width(0);
-	  __s = std::__write(__s, __name, __len);
-	}
-      return __s;
-    }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill, double __v) const
-    { return _M_insert_float(__s, __io, __fill, char(), __v); }
-
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    __do_put(iter_type __s, ios_base& __io, char_type __fill, double __v) const
-    { return _M_insert_float(__s, __io, __fill, char(), __v); }
-#endif
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill,
-	   long double __v) const
-    { return _M_insert_float(__s, __io, __fill, 'L', __v); }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill,
-           const void* __v) const
-    {
-      const ios_base::fmtflags __flags = __io.flags();
-      const ios_base::fmtflags __fmt = ~(ios_base::basefield
-					 | ios_base::uppercase);
-      __io.flags((__flags & __fmt) | (ios_base::hex | ios_base::showbase));
-
-      typedef __gnu_cxx::__conditional_type<(sizeof(const void*)
-					     <= sizeof(unsigned long)),
-	unsigned long, unsigned long long>::__type _UIntPtrType;       
-
-      __s = _M_insert_int(__s, __io, __fill,
-			  reinterpret_cast<_UIntPtrType>(__v));
-      __io.flags(__flags);
-      return __s;
-    }
-
-_GLIBCXX_END_NAMESPACE_LDBL
-
-  // Construct correctly padded string, as per 22.2.2.2.2
-  // Assumes
-  // __newlen > __oldlen
-  // __news is allocated for __newlen size
-
-  // NB: Of the two parameters, _CharT can be deduced from the
-  // function arguments. The other (_Traits) has to be explicitly specified.
-  template<typename _CharT, typename _Traits>
-    void
-    __pad<_CharT, _Traits>::_S_pad(ios_base& __io, _CharT __fill,
-				   _CharT* __news, const _CharT* __olds,
-				   streamsize __newlen, streamsize __oldlen)
-    {
-      const size_t __plen = static_cast<size_t>(__newlen - __oldlen);
-      const ios_base::fmtflags __adjust = __io.flags() & ios_base::adjustfield;
-
-      // Padding last.
-      if (__adjust == ios_base::left)
-	{
-	  _Traits::copy(__news, __olds, __oldlen);
-	  _Traits::assign(__news + __oldlen, __plen, __fill);
-	  return;
-	}
-
-      size_t __mod = 0;
-      if (__adjust == ios_base::internal)
-	{
-	  // Pad after the sign, if there is one.
-	  // Pad after 0[xX], if there is one.
-	  // Who came up with these rules, anyway? Jeeze.
-          const locale& __loc = __io._M_getloc();
-	  const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-	  if (__ctype.widen('-') == __olds[0]
-	      || __ctype.widen('+') == __olds[0])
-	    {
-	      __news[0] = __olds[0];
-	      __mod = 1;
-	      ++__news;
-	    }
-	  else if (__ctype.widen('0') == __olds[0]
-		   && __oldlen > 1
-		   && (__ctype.widen('x') == __olds[1]
-		       || __ctype.widen('X') == __olds[1]))
-	    {
-	      __news[0] = __olds[0];
-	      __news[1] = __olds[1];
-	      __mod = 2;
-	      __news += 2;
-	    }
-	  // else Padding first.
-	}
-      _Traits::assign(__news, __plen, __fill);
-      _Traits::copy(__news + __plen, __olds + __mod, __oldlen - __mod);
-    }
-
-  template<typename _CharT>
-    _CharT*
-    __add_grouping(_CharT* __s, _CharT __sep,
-		   const char* __gbeg, size_t __gsize,
-		   const _CharT* __first, const _CharT* __last)
-    {
-      size_t __idx = 0;
-      size_t __ctr = 0;
-
-      while (__last - __first > __gbeg[__idx]
-	     && static_cast<signed char>(__gbeg[__idx]) > 0
-	     && __gbeg[__idx] != __gnu_cxx::__numeric_traits<char>::__max)
-	{
-	  __last -= __gbeg[__idx];
-	  __idx < __gsize - 1 ? ++__idx : ++__ctr;
-	}
-
-      while (__first != __last)
-	*__s++ = *__first++;
-
-      while (__ctr--)
-	{
-	  *__s++ = __sep;	  
-	  for (char __i = __gbeg[__idx]; __i > 0; --__i)
-	    *__s++ = *__first++;
-	}
-
-      while (__idx--)
-	{
-	  *__s++ = __sep;	  
-	  for (char __i = __gbeg[__idx]; __i > 0; --__i)
-	    *__s++ = *__first++;
-	}
-
-      return __s;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class _GLIBCXX_NAMESPACE_CXX11 numpunct<char>;
-  extern template class _GLIBCXX_NAMESPACE_CXX11 numpunct_byname<char>;
-  extern template class _GLIBCXX_NAMESPACE_LDBL num_get<char>;
-  extern template class _GLIBCXX_NAMESPACE_LDBL num_put<char>;
-  extern template class ctype_byname<char>;
-
-  extern template
-    const ctype<char>&
-    use_facet<ctype<char> >(const locale&);
-
-  extern template
-    const numpunct<char>&
-    use_facet<numpunct<char> >(const locale&);
-
-  extern template
-    const num_put<char>&
-    use_facet<num_put<char> >(const locale&);
-
-  extern template
-    const num_get<char>&
-    use_facet<num_get<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<ctype<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<numpunct<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<num_put<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<num_get<char> >(const locale&);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class _GLIBCXX_NAMESPACE_CXX11 numpunct<wchar_t>;
-  extern template class _GLIBCXX_NAMESPACE_CXX11 numpunct_byname<wchar_t>;
-  extern template class _GLIBCXX_NAMESPACE_LDBL num_get<wchar_t>;
-  extern template class _GLIBCXX_NAMESPACE_LDBL num_put<wchar_t>;
-  extern template class ctype_byname<wchar_t>;
-
-  extern template
-    const ctype<wchar_t>&
-    use_facet<ctype<wchar_t> >(const locale&);
-
-  extern template
-    const numpunct<wchar_t>&
-    use_facet<numpunct<wchar_t> >(const locale&);
-
-  extern template
-    const num_put<wchar_t>&
-    use_facet<num_put<wchar_t> >(const locale&);
-
-  extern template
-    const num_get<wchar_t>&
-    use_facet<num_get<wchar_t> >(const locale&);
-
- extern template
-    bool
-    has_facet<ctype<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<numpunct<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<num_put<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<num_get<wchar_t> >(const locale&);
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/locale_facets_nonio.h b/openflow/usr/include/c++/5/bits/locale_facets_nonio.h
deleted file mode 100644
index 527296b..0000000
--- a/openflow/usr/include/c++/5/bits/locale_facets_nonio.h
+++ /dev/null
@@ -1,2015 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/locale_facets_nonio.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-#ifndef _LOCALE_FACETS_NONIO_H
-#define _LOCALE_FACETS_NONIO_H 1
-
-#pragma GCC system_header
-
-#include <ctime>	// For struct tm
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief  Time format ordering data.
-   *  @ingroup locales
-   *
-   *  This class provides an enum representing different orderings of
-   *  time: day, month, and year.
-  */
-  class time_base
-  {
-  public:
-    enum dateorder { no_order, dmy, mdy, ymd, ydm };
-  };
-
-  template<typename _CharT>
-    struct __timepunct_cache : public locale::facet
-    {
-      // List of all known timezones, with GMT first.
-      static const _CharT*		_S_timezones[14];
-
-      const _CharT*			_M_date_format;
-      const _CharT*			_M_date_era_format;
-      const _CharT*			_M_time_format;
-      const _CharT*			_M_time_era_format;
-      const _CharT*			_M_date_time_format;
-      const _CharT*			_M_date_time_era_format;
-      const _CharT*			_M_am;
-      const _CharT*			_M_pm;
-      const _CharT*			_M_am_pm_format;
-
-      // Day names, starting with "C"'s Sunday.
-      const _CharT*			_M_day1;
-      const _CharT*			_M_day2;
-      const _CharT*			_M_day3;
-      const _CharT*			_M_day4;
-      const _CharT*			_M_day5;
-      const _CharT*			_M_day6;
-      const _CharT*			_M_day7;
-
-      // Abbreviated day names, starting with "C"'s Sun.
-      const _CharT*			_M_aday1;
-      const _CharT*			_M_aday2;
-      const _CharT*			_M_aday3;
-      const _CharT*			_M_aday4;
-      const _CharT*			_M_aday5;
-      const _CharT*			_M_aday6;
-      const _CharT*			_M_aday7;
-
-      // Month names, starting with "C"'s January.
-      const _CharT*			_M_month01;
-      const _CharT*			_M_month02;
-      const _CharT*			_M_month03;
-      const _CharT*			_M_month04;
-      const _CharT*			_M_month05;
-      const _CharT*			_M_month06;
-      const _CharT*			_M_month07;
-      const _CharT*			_M_month08;
-      const _CharT*			_M_month09;
-      const _CharT*			_M_month10;
-      const _CharT*			_M_month11;
-      const _CharT*			_M_month12;
-
-      // Abbreviated month names, starting with "C"'s Jan.
-      const _CharT*			_M_amonth01;
-      const _CharT*			_M_amonth02;
-      const _CharT*			_M_amonth03;
-      const _CharT*			_M_amonth04;
-      const _CharT*			_M_amonth05;
-      const _CharT*			_M_amonth06;
-      const _CharT*			_M_amonth07;
-      const _CharT*			_M_amonth08;
-      const _CharT*			_M_amonth09;
-      const _CharT*			_M_amonth10;
-      const _CharT*			_M_amonth11;
-      const _CharT*			_M_amonth12;
-
-      bool				_M_allocated;
-
-      __timepunct_cache(size_t __refs = 0) : facet(__refs),
-      _M_date_format(0), _M_date_era_format(0), _M_time_format(0),
-      _M_time_era_format(0), _M_date_time_format(0),
-      _M_date_time_era_format(0), _M_am(0), _M_pm(0),
-      _M_am_pm_format(0), _M_day1(0), _M_day2(0), _M_day3(0),
-      _M_day4(0), _M_day5(0), _M_day6(0), _M_day7(0),
-      _M_aday1(0), _M_aday2(0), _M_aday3(0), _M_aday4(0),
-      _M_aday5(0), _M_aday6(0), _M_aday7(0), _M_month01(0),
-      _M_month02(0), _M_month03(0), _M_month04(0), _M_month05(0),
-      _M_month06(0), _M_month07(0), _M_month08(0), _M_month09(0),
-      _M_month10(0), _M_month11(0), _M_month12(0), _M_amonth01(0),
-      _M_amonth02(0), _M_amonth03(0), _M_amonth04(0),
-      _M_amonth05(0), _M_amonth06(0), _M_amonth07(0),
-      _M_amonth08(0), _M_amonth09(0), _M_amonth10(0),
-      _M_amonth11(0), _M_amonth12(0), _M_allocated(false)
-      { }
-
-      ~__timepunct_cache();
-
-    private:
-      __timepunct_cache&
-      operator=(const __timepunct_cache&);
-      
-      explicit
-      __timepunct_cache(const __timepunct_cache&);
-    };
-
-  template<typename _CharT>
-    __timepunct_cache<_CharT>::~__timepunct_cache()
-    {
-      if (_M_allocated)
-	{
-	  // Unused.
-	}
-    }
-
-  // Specializations.
-  template<>
-    const char*
-    __timepunct_cache<char>::_S_timezones[14];
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    const wchar_t*
-    __timepunct_cache<wchar_t>::_S_timezones[14];
-#endif
-
-  // Generic.
-  template<typename _CharT>
-    const _CharT* __timepunct_cache<_CharT>::_S_timezones[14];
-
-  template<typename _CharT>
-    class __timepunct : public locale::facet
-    {
-    public:
-      // Types:
-      typedef _CharT			__char_type;
-      typedef __timepunct_cache<_CharT>	__cache_type;
-
-    protected:
-      __cache_type*			_M_data;
-      __c_locale			_M_c_locale_timepunct;
-      const char*			_M_name_timepunct;
-
-    public:
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      explicit
-      __timepunct(size_t __refs = 0);
-
-      explicit
-      __timepunct(__cache_type* __cache, size_t __refs = 0);
-
-      /**
-       *  @brief  Internal constructor. Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up new
-       *  locales.
-       *
-       *  @param __cloc  The C locale.
-       *  @param __s  The name of a locale.
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      __timepunct(__c_locale __cloc, const char* __s, size_t __refs = 0);
-
-      // FIXME: for error checking purposes _M_put should return the return
-      // value of strftime/wcsftime.
-      void
-      _M_put(_CharT* __s, size_t __maxlen, const _CharT* __format,
-	     const tm* __tm) const throw ();
-
-      void
-      _M_date_formats(const _CharT** __date) const
-      {
-	// Always have default first.
-	__date[0] = _M_data->_M_date_format;
-	__date[1] = _M_data->_M_date_era_format;
-      }
-
-      void
-      _M_time_formats(const _CharT** __time) const
-      {
-	// Always have default first.
-	__time[0] = _M_data->_M_time_format;
-	__time[1] = _M_data->_M_time_era_format;
-      }
-
-      void
-      _M_date_time_formats(const _CharT** __dt) const
-      {
-	// Always have default first.
-	__dt[0] = _M_data->_M_date_time_format;
-	__dt[1] = _M_data->_M_date_time_era_format;
-      }
-
-      void
-      _M_am_pm_format(const _CharT* __ampm) const
-      { __ampm = _M_data->_M_am_pm_format; }
-
-      void
-      _M_am_pm(const _CharT** __ampm) const
-      {
-	__ampm[0] = _M_data->_M_am;
-	__ampm[1] = _M_data->_M_pm;
-      }
-
-      void
-      _M_days(const _CharT** __days) const
-      {
-	__days[0] = _M_data->_M_day1;
-	__days[1] = _M_data->_M_day2;
-	__days[2] = _M_data->_M_day3;
-	__days[3] = _M_data->_M_day4;
-	__days[4] = _M_data->_M_day5;
-	__days[5] = _M_data->_M_day6;
-	__days[6] = _M_data->_M_day7;
-      }
-
-      void
-      _M_days_abbreviated(const _CharT** __days) const
-      {
-	__days[0] = _M_data->_M_aday1;
-	__days[1] = _M_data->_M_aday2;
-	__days[2] = _M_data->_M_aday3;
-	__days[3] = _M_data->_M_aday4;
-	__days[4] = _M_data->_M_aday5;
-	__days[5] = _M_data->_M_aday6;
-	__days[6] = _M_data->_M_aday7;
-      }
-
-      void
-      _M_months(const _CharT** __months) const
-      {
-	__months[0] = _M_data->_M_month01;
-	__months[1] = _M_data->_M_month02;
-	__months[2] = _M_data->_M_month03;
-	__months[3] = _M_data->_M_month04;
-	__months[4] = _M_data->_M_month05;
-	__months[5] = _M_data->_M_month06;
-	__months[6] = _M_data->_M_month07;
-	__months[7] = _M_data->_M_month08;
-	__months[8] = _M_data->_M_month09;
-	__months[9] = _M_data->_M_month10;
-	__months[10] = _M_data->_M_month11;
-	__months[11] = _M_data->_M_month12;
-      }
-
-      void
-      _M_months_abbreviated(const _CharT** __months) const
-      {
-	__months[0] = _M_data->_M_amonth01;
-	__months[1] = _M_data->_M_amonth02;
-	__months[2] = _M_data->_M_amonth03;
-	__months[3] = _M_data->_M_amonth04;
-	__months[4] = _M_data->_M_amonth05;
-	__months[5] = _M_data->_M_amonth06;
-	__months[6] = _M_data->_M_amonth07;
-	__months[7] = _M_data->_M_amonth08;
-	__months[8] = _M_data->_M_amonth09;
-	__months[9] = _M_data->_M_amonth10;
-	__months[10] = _M_data->_M_amonth11;
-	__months[11] = _M_data->_M_amonth12;
-      }
-
-    protected:
-      virtual
-      ~__timepunct();
-
-      // For use at construction time only.
-      void
-      _M_initialize_timepunct(__c_locale __cloc = 0);
-    };
-
-  template<typename _CharT>
-    locale::id __timepunct<_CharT>::id;
-
-  // Specializations.
-  template<>
-    void
-    __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc);
-
-  template<>
-    void
-    __timepunct<char>::_M_put(char*, size_t, const char*, const tm*) const throw ();
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    void
-    __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc);
-
-  template<>
-    void
-    __timepunct<wchar_t>::_M_put(wchar_t*, size_t, const wchar_t*,
-				 const tm*) const throw ();
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-  // Include host and configuration specific timepunct functions.
-  #include <bits/time_members.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  /**
-   *  @brief  Primary class template time_get.
-   *  @ingroup locales
-   *
-   *  This facet encapsulates the code to parse and return a date or
-   *  time from a string.  It is used by the istream numeric
-   *  extraction operators.
-   *
-   *  The time_get template uses protected virtual functions to provide the
-   *  actual results.  The public accessors forward the call to the virtual
-   *  functions.  These virtual functions are hooks for developers to
-   *  implement the behavior they require from the time_get facet.
-  */
-  template<typename _CharT, typename _InIter>
-    class time_get : public locale::facet, public time_base
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef _InIter			iter_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      time_get(size_t __refs = 0)
-      : facet (__refs) { }
-
-      /**
-       *  @brief  Return preferred order of month, day, and year.
-       *
-       *  This function returns an enum from time_base::dateorder giving the
-       *  preferred ordering if the format @a x given to time_put::put() only
-       *  uses month, day, and year.  If the format @a x for the associated
-       *  locale uses other fields, this function returns
-       *  time_base::dateorder::noorder.
-       *
-       *  NOTE: The library always returns noorder at the moment.
-       *
-       *  @return  A member of time_base::dateorder.
-      */
-      dateorder
-      date_order()  const
-      { return this->do_date_order(); }
-
-      /**
-       *  @brief  Parse input time string.
-       *
-       *  This function parses a time according to the format @a X and puts the
-       *  results into a user-supplied struct tm.  The result is returned by
-       *  calling time_get::do_get_time().
-       *
-       *  If there is a valid time string according to format @a X, @a tm will
-       *  be filled in accordingly and the returned iterator will point to the
-       *  first character beyond the time string.  If an error occurs before
-       *  the end, err |= ios_base::failbit.  If parsing reads all the
-       *  characters, err |= ios_base::eofbit.
-       *
-       *  @param  __beg  Start of string to parse.
-       *  @param  __end  End of string to parse.
-       *  @param  __io  Source of the locale.
-       *  @param  __err  Error flags to set.
-       *  @param  __tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond time string.
-      */
-      iter_type
-      get_time(iter_type __beg, iter_type __end, ios_base& __io,
-	       ios_base::iostate& __err, tm* __tm)  const
-      { return this->do_get_time(__beg, __end, __io, __err, __tm); }
-
-      /**
-       *  @brief  Parse input date string.
-       *
-       *  This function parses a date according to the format @a x and puts the
-       *  results into a user-supplied struct tm.  The result is returned by
-       *  calling time_get::do_get_date().
-       *
-       *  If there is a valid date string according to format @a x, @a tm will
-       *  be filled in accordingly and the returned iterator will point to the
-       *  first character beyond the date string.  If an error occurs before
-       *  the end, err |= ios_base::failbit.  If parsing reads all the
-       *  characters, err |= ios_base::eofbit.
-       *
-       *  @param  __beg  Start of string to parse.
-       *  @param  __end  End of string to parse.
-       *  @param  __io  Source of the locale.
-       *  @param  __err  Error flags to set.
-       *  @param  __tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond date string.
-      */
-      iter_type
-      get_date(iter_type __beg, iter_type __end, ios_base& __io,
-	       ios_base::iostate& __err, tm* __tm)  const
-      { return this->do_get_date(__beg, __end, __io, __err, __tm); }
-
-      /**
-       *  @brief  Parse input weekday string.
-       *
-       *  This function parses a weekday name and puts the results into a
-       *  user-supplied struct tm.  The result is returned by calling
-       *  time_get::do_get_weekday().
-       *
-       *  Parsing starts by parsing an abbreviated weekday name.  If a valid
-       *  abbreviation is followed by a character that would lead to the full
-       *  weekday name, parsing continues until the full name is found or an
-       *  error occurs.  Otherwise parsing finishes at the end of the
-       *  abbreviated name.
-       *
-       *  If an error occurs before the end, err |= ios_base::failbit.  If
-       *  parsing reads all the characters, err |= ios_base::eofbit.
-       *
-       *  @param  __beg  Start of string to parse.
-       *  @param  __end  End of string to parse.
-       *  @param  __io  Source of the locale.
-       *  @param  __err  Error flags to set.
-       *  @param  __tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond weekday name.
-      */
-      iter_type
-      get_weekday(iter_type __beg, iter_type __end, ios_base& __io,
-		  ios_base::iostate& __err, tm* __tm) const
-      { return this->do_get_weekday(__beg, __end, __io, __err, __tm); }
-
-      /**
-       *  @brief  Parse input month string.
-       *
-       *  This function parses a month name and puts the results into a
-       *  user-supplied struct tm.  The result is returned by calling
-       *  time_get::do_get_monthname().
-       *
-       *  Parsing starts by parsing an abbreviated month name.  If a valid
-       *  abbreviation is followed by a character that would lead to the full
-       *  month name, parsing continues until the full name is found or an
-       *  error occurs.  Otherwise parsing finishes at the end of the
-       *  abbreviated name.
-       *
-       *  If an error occurs before the end, err |= ios_base::failbit.  If
-       *  parsing reads all the characters, err |=
-       *  ios_base::eofbit.
-       *
-       *  @param  __beg  Start of string to parse.
-       *  @param  __end  End of string to parse.
-       *  @param  __io  Source of the locale.
-       *  @param  __err  Error flags to set.
-       *  @param  __tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond month name.
-      */
-      iter_type
-      get_monthname(iter_type __beg, iter_type __end, ios_base& __io,
-		    ios_base::iostate& __err, tm* __tm) const
-      { return this->do_get_monthname(__beg, __end, __io, __err, __tm); }
-
-      /**
-       *  @brief  Parse input year string.
-       *
-       *  This function reads up to 4 characters to parse a year string and
-       *  puts the results into a user-supplied struct tm.  The result is
-       *  returned by calling time_get::do_get_year().
-       *
-       *  4 consecutive digits are interpreted as a full year.  If there are
-       *  exactly 2 consecutive digits, the library interprets this as the
-       *  number of years since 1900.
-       *
-       *  If an error occurs before the end, err |= ios_base::failbit.  If
-       *  parsing reads all the characters, err |= ios_base::eofbit.
-       *
-       *  @param  __beg  Start of string to parse.
-       *  @param  __end  End of string to parse.
-       *  @param  __io  Source of the locale.
-       *  @param  __err  Error flags to set.
-       *  @param  __tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond year.
-      */
-      iter_type
-      get_year(iter_type __beg, iter_type __end, ios_base& __io,
-	       ios_base::iostate& __err, tm* __tm) const
-      { return this->do_get_year(__beg, __end, __io, __err, __tm); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Parse input string according to format.
-       *
-       *  This function calls time_get::do_get with the provided
-       *  parameters.  @see do_get() and get().
-       *
-       *  @param __s        Start of string to parse.
-       *  @param __end      End of string to parse.
-       *  @param __io       Source of the locale.
-       *  @param __err      Error flags to set.
-       *  @param __tm       Pointer to struct tm to fill in.
-       *  @param __format   Format specifier.
-       *  @param __modifier Format modifier.
-       *  @return  Iterator to first char not parsed.
-       */
-      inline
-      iter_type get(iter_type __s, iter_type __end, ios_base& __io,
-                    ios_base::iostate& __err, tm* __tm, char __format,
-                    char __modifier = 0) const
-      {
-        return this->do_get(__s, __end, __io, __err, __tm, __format,
-                            __modifier);
-      }
-
-      /**
-       *  @brief  Parse input string according to format.
-       *
-       *  This function parses the input string according to a
-       *  provided format string.  It does the inverse of
-       *  time_put::put.  The format string follows the format
-       *  specified for strftime(3)/strptime(3).  The actual parsing
-       *  is done by time_get::do_get.
-       *
-       *  @param __s        Start of string to parse.
-       *  @param __end      End of string to parse.
-       *  @param __io       Source of the locale.
-       *  @param __err      Error flags to set.
-       *  @param __tm       Pointer to struct tm to fill in.
-       *  @param __fmt      Start of the format string.
-       *  @param __fmtend   End of the format string.
-       *  @return  Iterator to first char not parsed.
-       */
-      iter_type get(iter_type __s, iter_type __end, ios_base& __io,
-                    ios_base::iostate& __err, tm* __tm, const char_type* __fmt,
-                    const char_type* __fmtend) const;
-#endif // __cplusplus >= 201103L
-
-    protected:
-      /// Destructor.
-      virtual
-      ~time_get() { }
-
-      /**
-       *  @brief  Return preferred order of month, day, and year.
-       *
-       *  This function returns an enum from time_base::dateorder giving the
-       *  preferred ordering if the format @a x given to time_put::put() only
-       *  uses month, day, and year.  This function is a hook for derived
-       *  classes to change the value returned.
-       *
-       *  @return  A member of time_base::dateorder.
-      */
-      virtual dateorder
-      do_date_order() const;
-
-      /**
-       *  @brief  Parse input time string.
-       *
-       *  This function parses a time according to the format @a x and puts the
-       *  results into a user-supplied struct tm.  This function is a hook for
-       *  derived classes to change the value returned.  @see get_time() for
-       *  details.
-       *
-       *  @param  __beg  Start of string to parse.
-       *  @param  __end  End of string to parse.
-       *  @param  __io  Source of the locale.
-       *  @param  __err  Error flags to set.
-       *  @param  __tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond time string.
-      */
-      virtual iter_type
-      do_get_time(iter_type __beg, iter_type __end, ios_base& __io,
-		  ios_base::iostate& __err, tm* __tm) const;
-
-      /**
-       *  @brief  Parse input date string.
-       *
-       *  This function parses a date according to the format @a X and puts the
-       *  results into a user-supplied struct tm.  This function is a hook for
-       *  derived classes to change the value returned.  @see get_date() for
-       *  details.
-       *
-       *  @param  __beg  Start of string to parse.
-       *  @param  __end  End of string to parse.
-       *  @param  __io  Source of the locale.
-       *  @param  __err  Error flags to set.
-       *  @param  __tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond date string.
-      */
-      virtual iter_type
-      do_get_date(iter_type __beg, iter_type __end, ios_base& __io,
-		  ios_base::iostate& __err, tm* __tm) const;
-
-      /**
-       *  @brief  Parse input weekday string.
-       *
-       *  This function parses a weekday name and puts the results into a
-       *  user-supplied struct tm.  This function is a hook for derived
-       *  classes to change the value returned.  @see get_weekday() for
-       *  details.
-       *
-       *  @param  __beg  Start of string to parse.
-       *  @param  __end  End of string to parse.
-       *  @param  __io  Source of the locale.
-       *  @param  __err  Error flags to set.
-       *  @param  __tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond weekday name.
-      */
-      virtual iter_type
-      do_get_weekday(iter_type __beg, iter_type __end, ios_base&,
-		     ios_base::iostate& __err, tm* __tm) const;
-
-      /**
-       *  @brief  Parse input month string.
-       *
-       *  This function parses a month name and puts the results into a
-       *  user-supplied struct tm.  This function is a hook for derived
-       *  classes to change the value returned.  @see get_monthname() for
-       *  details.
-       *
-       *  @param  __beg  Start of string to parse.
-       *  @param  __end  End of string to parse.
-       *  @param  __io  Source of the locale.
-       *  @param  __err  Error flags to set.
-       *  @param  __tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond month name.
-      */
-      virtual iter_type
-      do_get_monthname(iter_type __beg, iter_type __end, ios_base&,
-		       ios_base::iostate& __err, tm* __tm) const;
-
-      /**
-       *  @brief  Parse input year string.
-       *
-       *  This function reads up to 4 characters to parse a year string and
-       *  puts the results into a user-supplied struct tm.  This function is a
-       *  hook for derived classes to change the value returned.  @see
-       *  get_year() for details.
-       *
-       *  @param  __beg  Start of string to parse.
-       *  @param  __end  End of string to parse.
-       *  @param  __io  Source of the locale.
-       *  @param  __err  Error flags to set.
-       *  @param  __tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond year.
-      */
-      virtual iter_type
-      do_get_year(iter_type __beg, iter_type __end, ios_base& __io,
-		  ios_base::iostate& __err, tm* __tm) const;
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Parse input string according to format.
-       *
-       *  This function parses the string according to the provided
-       *  format and optional modifier.  This function is a hook for
-       *  derived classes to change the value returned.  @see get()
-       *  for more details.
-       *
-       *  @param __s        Start of string to parse.
-       *  @param __end      End of string to parse.
-       *  @param __f        Source of the locale.
-       *  @param __err      Error flags to set.
-       *  @param __tm       Pointer to struct tm to fill in.
-       *  @param __format   Format specifier.
-       *  @param __modifier Format modifier.
-       *  @return  Iterator to first char not parsed.
-       */
-#if _GLIBCXX_USE_CXX11_ABI
-      virtual
-#endif
-      iter_type
-      do_get(iter_type __s, iter_type __end, ios_base& __f,
-             ios_base::iostate& __err, tm* __tm,
-             char __format, char __modifier) const;
-#endif // __cplusplus >= 201103L
-
-      // Extract numeric component of length __len.
-      iter_type
-      _M_extract_num(iter_type __beg, iter_type __end, int& __member,
-		     int __min, int __max, size_t __len,
-		     ios_base& __io, ios_base::iostate& __err) const;
-
-      // Extract any unique array of string literals in a const _CharT* array.
-      iter_type
-      _M_extract_name(iter_type __beg, iter_type __end, int& __member,
-		      const _CharT** __names, size_t __indexlen,
-		      ios_base& __io, ios_base::iostate& __err) const;
-
-      // Extract day or month name in a const _CharT* array.
-      iter_type
-      _M_extract_wday_or_month(iter_type __beg, iter_type __end, int& __member,
-			       const _CharT** __names, size_t __indexlen,
-			       ios_base& __io, ios_base::iostate& __err) const;
-
-      // Extract on a component-by-component basis, via __format argument.
-      iter_type
-      _M_extract_via_format(iter_type __beg, iter_type __end, ios_base& __io,
-			    ios_base::iostate& __err, tm* __tm,
-			    const _CharT* __format) const;
-    };
-
-  template<typename _CharT, typename _InIter>
-    locale::id time_get<_CharT, _InIter>::id;
-
-  /// class time_get_byname [22.2.5.2].
-  template<typename _CharT, typename _InIter>
-    class time_get_byname : public time_get<_CharT, _InIter>
-    {
-    public:
-      // Types:
-      typedef _CharT			char_type;
-      typedef _InIter			iter_type;
-
-      explicit
-      time_get_byname(const char*, size_t __refs = 0)
-      : time_get<_CharT, _InIter>(__refs) { }
-
-#if __cplusplus >= 201103L
-      explicit
-      time_get_byname(const string& __s, size_t __refs = 0)
-      : time_get_byname(__s.c_str(), __refs) { }
-#endif
-
-    protected:
-      virtual
-      ~time_get_byname() { }
-    };
-
-_GLIBCXX_END_NAMESPACE_CXX11
-
-  /**
-   *  @brief  Primary class template time_put.
-   *  @ingroup locales
-   *
-   *  This facet encapsulates the code to format and output dates and times
-   *  according to formats used by strftime().
-   *
-   *  The time_put template uses protected virtual functions to provide the
-   *  actual results.  The public accessors forward the call to the virtual
-   *  functions.  These virtual functions are hooks for developers to
-   *  implement the behavior they require from the time_put facet.
-  */
-  template<typename _CharT, typename _OutIter>
-    class time_put : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef _OutIter			iter_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      time_put(size_t __refs = 0)
-      : facet(__refs) { }
-
-      /**
-       *  @brief  Format and output a time or date.
-       *
-       *  This function formats the data in struct tm according to the
-       *  provided format string.  The format string is interpreted as by
-       *  strftime().
-       *
-       *  @param  __s  The stream to write to.
-       *  @param  __io  Source of locale.
-       *  @param  __fill  char_type to use for padding.
-       *  @param  __tm  Struct tm with date and time info to format.
-       *  @param  __beg  Start of format string.
-       *  @param  __end  End of format string.
-       *  @return  Iterator after writing.
-       */
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill, const tm* __tm,
-	  const _CharT* __beg, const _CharT* __end) const;
-
-      /**
-       *  @brief  Format and output a time or date.
-       *
-       *  This function formats the data in struct tm according to the
-       *  provided format char and optional modifier.  The format and modifier
-       *  are interpreted as by strftime().  It does so by returning
-       *  time_put::do_put().
-       *
-       *  @param  __s  The stream to write to.
-       *  @param  __io  Source of locale.
-       *  @param  __fill  char_type to use for padding.
-       *  @param  __tm  Struct tm with date and time info to format.
-       *  @param  __format  Format char.
-       *  @param  __mod  Optional modifier char.
-       *  @return  Iterator after writing.
-       */
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill,
-	  const tm* __tm, char __format, char __mod = 0) const
-      { return this->do_put(__s, __io, __fill, __tm, __format, __mod); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~time_put()
-      { }
-
-      /**
-       *  @brief  Format and output a time or date.
-       *
-       *  This function formats the data in struct tm according to the
-       *  provided format char and optional modifier.  This function is a hook
-       *  for derived classes to change the value returned.  @see put() for
-       *  more details.
-       *
-       *  @param  __s  The stream to write to.
-       *  @param  __io  Source of locale.
-       *  @param  __fill  char_type to use for padding.
-       *  @param  __tm  Struct tm with date and time info to format.
-       *  @param  __format  Format char.
-       *  @param  __mod  Optional modifier char.
-       *  @return  Iterator after writing.
-       */
-      virtual iter_type
-      do_put(iter_type __s, ios_base& __io, char_type __fill, const tm* __tm,
-	     char __format, char __mod) const;
-    };
-
-  template<typename _CharT, typename _OutIter>
-    locale::id time_put<_CharT, _OutIter>::id;
-
-  /// class time_put_byname [22.2.5.4].
-  template<typename _CharT, typename _OutIter>
-    class time_put_byname : public time_put<_CharT, _OutIter>
-    {
-    public:
-      // Types:
-      typedef _CharT			char_type;
-      typedef _OutIter			iter_type;
-
-      explicit
-      time_put_byname(const char*, size_t __refs = 0)
-      : time_put<_CharT, _OutIter>(__refs)
-      { };
-
-#if __cplusplus >= 201103L
-      explicit
-      time_put_byname(const string& __s, size_t __refs = 0)
-      : time_put_byname(__s.c_str(), __refs) { }
-#endif
-
-    protected:
-      virtual
-      ~time_put_byname() { }
-    };
-
-
-  /**
-   *  @brief  Money format ordering data.
-   *  @ingroup locales
-   *
-   *  This class contains an ordered array of 4 fields to represent the
-   *  pattern for formatting a money amount.  Each field may contain one entry
-   *  from the part enum.  symbol, sign, and value must be present and the
-   *  remaining field must contain either none or space.  @see
-   *  moneypunct::pos_format() and moneypunct::neg_format() for details of how
-   *  these fields are interpreted.
-  */
-  class money_base
-  {
-  public:
-    enum part { none, space, symbol, sign, value };
-    struct pattern { char field[4]; };
-
-    static const pattern _S_default_pattern;
-
-    enum
-    {
-      _S_minus,
-      _S_zero,
-      _S_end = 11
-    };
-
-    // String literal of acceptable (narrow) input/output, for
-    // money_get/money_put. "-0123456789"
-    static const char* _S_atoms;
-
-    // Construct and return valid pattern consisting of some combination of:
-    // space none symbol sign value
-    _GLIBCXX_CONST static pattern
-    _S_construct_pattern(char __precedes, char __space, char __posn) throw ();
-  };
-
-  template<typename _CharT, bool _Intl>
-    struct __moneypunct_cache : public locale::facet
-    {
-      const char*			_M_grouping;
-      size_t                            _M_grouping_size;
-      bool				_M_use_grouping;
-      _CharT				_M_decimal_point;
-      _CharT				_M_thousands_sep;
-      const _CharT*			_M_curr_symbol;
-      size_t                            _M_curr_symbol_size;
-      const _CharT*			_M_positive_sign;
-      size_t                            _M_positive_sign_size;
-      const _CharT*			_M_negative_sign;
-      size_t                            _M_negative_sign_size;
-      int				_M_frac_digits;
-      money_base::pattern		_M_pos_format;
-      money_base::pattern	        _M_neg_format;
-
-      // A list of valid numeric literals for input and output: in the standard
-      // "C" locale, this is "-0123456789". This array contains the chars after
-      // having been passed through the current locale's ctype<_CharT>.widen().
-      _CharT				_M_atoms[money_base::_S_end];
-
-      bool				_M_allocated;
-
-      __moneypunct_cache(size_t __refs = 0) : facet(__refs),
-      _M_grouping(0), _M_grouping_size(0), _M_use_grouping(false),
-      _M_decimal_point(_CharT()), _M_thousands_sep(_CharT()),
-      _M_curr_symbol(0), _M_curr_symbol_size(0),
-      _M_positive_sign(0), _M_positive_sign_size(0),
-      _M_negative_sign(0), _M_negative_sign_size(0),
-      _M_frac_digits(0),
-      _M_pos_format(money_base::pattern()),
-      _M_neg_format(money_base::pattern()), _M_allocated(false)
-      { }
-
-      ~__moneypunct_cache();
-
-      void
-      _M_cache(const locale& __loc);
-
-    private:
-      __moneypunct_cache&
-      operator=(const __moneypunct_cache&);
-      
-      explicit
-      __moneypunct_cache(const __moneypunct_cache&);
-    };
-
-  template<typename _CharT, bool _Intl>
-    __moneypunct_cache<_CharT, _Intl>::~__moneypunct_cache()
-    {
-      if (_M_allocated)
-	{
-	  delete [] _M_grouping;
-	  delete [] _M_curr_symbol;
-	  delete [] _M_positive_sign;
-	  delete [] _M_negative_sign;
-	}
-    }
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  /**
-   *  @brief  Primary class template moneypunct.
-   *  @ingroup locales
-   *
-   *  This facet encapsulates the punctuation, grouping and other formatting
-   *  features of money amount string representations.
-  */
-  template<typename _CharT, bool _Intl>
-    class moneypunct : public locale::facet, public money_base
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-      typedef __moneypunct_cache<_CharT, _Intl>     __cache_type;
-
-    private:
-      __cache_type*			_M_data;
-
-    public:
-      /// This value is provided by the standard, but no reason for its
-      /// existence.
-      static const bool			intl = _Intl;
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      moneypunct(size_t __refs = 0)
-      : facet(__refs), _M_data(0)
-      { _M_initialize_moneypunct(); }
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is an internal constructor.
-       *
-       *  @param __cache  Cache for optimization.
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      moneypunct(__cache_type* __cache, size_t __refs = 0)
-      : facet(__refs), _M_data(__cache)
-      { _M_initialize_moneypunct(); }
-
-      /**
-       *  @brief  Internal constructor. Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up new
-       *  locales.
-       *
-       *  @param __cloc  The C locale.
-       *  @param __s  The name of a locale.
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      moneypunct(__c_locale __cloc, const char* __s, size_t __refs = 0)
-      : facet(__refs), _M_data(0)
-      { _M_initialize_moneypunct(__cloc, __s); }
-
-      /**
-       *  @brief  Return decimal point character.
-       *
-       *  This function returns a char_type to use as a decimal point.  It
-       *  does so by returning returning
-       *  moneypunct<char_type>::do_decimal_point().
-       *
-       *  @return  @a char_type representing a decimal point.
-      */
-      char_type
-      decimal_point() const
-      { return this->do_decimal_point(); }
-
-      /**
-       *  @brief  Return thousands separator character.
-       *
-       *  This function returns a char_type to use as a thousands
-       *  separator.  It does so by returning returning
-       *  moneypunct<char_type>::do_thousands_sep().
-       *
-       *  @return  char_type representing a thousands separator.
-      */
-      char_type
-      thousands_sep() const
-      { return this->do_thousands_sep(); }
-
-      /**
-       *  @brief  Return grouping specification.
-       *
-       *  This function returns a string representing groupings for the
-       *  integer part of an amount.  Groupings indicate where thousands
-       *  separators should be inserted.
-       *
-       *  Each char in the return string is interpret as an integer rather
-       *  than a character.  These numbers represent the number of digits in a
-       *  group.  The first char in the string represents the number of digits
-       *  in the least significant group.  If a char is negative, it indicates
-       *  an unlimited number of digits for the group.  If more chars from the
-       *  string are required to group a number, the last char is used
-       *  repeatedly.
-       *
-       *  For example, if the grouping() returns <code>\003\002</code>
-       *  and is applied to the number 123456789, this corresponds to
-       *  12,34,56,789.  Note that if the string was <code>32</code>, this would
-       *  put more than 50 digits into the least significant group if
-       *  the character set is ASCII.
-       *
-       *  The string is returned by calling
-       *  moneypunct<char_type>::do_grouping().
-       *
-       *  @return  string representing grouping specification.
-      */
-      string
-      grouping() const
-      { return this->do_grouping(); }
-
-      /**
-       *  @brief  Return currency symbol string.
-       *
-       *  This function returns a string_type to use as a currency symbol.  It
-       *  does so by returning returning
-       *  moneypunct<char_type>::do_curr_symbol().
-       *
-       *  @return  @a string_type representing a currency symbol.
-      */
-      string_type
-      curr_symbol() const
-      { return this->do_curr_symbol(); }
-
-      /**
-       *  @brief  Return positive sign string.
-       *
-       *  This function returns a string_type to use as a sign for positive
-       *  amounts.  It does so by returning returning
-       *  moneypunct<char_type>::do_positive_sign().
-       *
-       *  If the return value contains more than one character, the first
-       *  character appears in the position indicated by pos_format() and the
-       *  remainder appear at the end of the formatted string.
-       *
-       *  @return  @a string_type representing a positive sign.
-      */
-      string_type
-      positive_sign() const
-      { return this->do_positive_sign(); }
-
-      /**
-       *  @brief  Return negative sign string.
-       *
-       *  This function returns a string_type to use as a sign for negative
-       *  amounts.  It does so by returning returning
-       *  moneypunct<char_type>::do_negative_sign().
-       *
-       *  If the return value contains more than one character, the first
-       *  character appears in the position indicated by neg_format() and the
-       *  remainder appear at the end of the formatted string.
-       *
-       *  @return  @a string_type representing a negative sign.
-      */
-      string_type
-      negative_sign() const
-      { return this->do_negative_sign(); }
-
-      /**
-       *  @brief  Return number of digits in fraction.
-       *
-       *  This function returns the exact number of digits that make up the
-       *  fractional part of a money amount.  It does so by returning
-       *  returning moneypunct<char_type>::do_frac_digits().
-       *
-       *  The fractional part of a money amount is optional.  But if it is
-       *  present, there must be frac_digits() digits.
-       *
-       *  @return  Number of digits in amount fraction.
-      */
-      int
-      frac_digits() const
-      { return this->do_frac_digits(); }
-
-      //@{
-      /**
-       *  @brief  Return pattern for money values.
-       *
-       *  This function returns a pattern describing the formatting of a
-       *  positive or negative valued money amount.  It does so by returning
-       *  returning moneypunct<char_type>::do_pos_format() or
-       *  moneypunct<char_type>::do_neg_format().
-       *
-       *  The pattern has 4 fields describing the ordering of symbol, sign,
-       *  value, and none or space.  There must be one of each in the pattern.
-       *  The none and space enums may not appear in the first field and space
-       *  may not appear in the final field.
-       *
-       *  The parts of a money string must appear in the order indicated by
-       *  the fields of the pattern.  The symbol field indicates that the
-       *  value of curr_symbol() may be present.  The sign field indicates
-       *  that the value of positive_sign() or negative_sign() must be
-       *  present.  The value field indicates that the absolute value of the
-       *  money amount is present.  none indicates 0 or more whitespace
-       *  characters, except at the end, where it permits no whitespace.
-       *  space indicates that 1 or more whitespace characters must be
-       *  present.
-       *
-       *  For example, for the US locale and pos_format() pattern
-       *  {symbol,sign,value,none}, curr_symbol() == &apos;$&apos;
-       *  positive_sign() == &apos;+&apos;, and value 10.01, and
-       *  options set to force the symbol, the corresponding string is
-       *  <code>$+10.01</code>.
-       *
-       *  @return  Pattern for money values.
-      */
-      pattern
-      pos_format() const
-      { return this->do_pos_format(); }
-
-      pattern
-      neg_format() const
-      { return this->do_neg_format(); }
-      //@}
-
-    protected:
-      /// Destructor.
-      virtual
-      ~moneypunct();
-
-      /**
-       *  @brief  Return decimal point character.
-       *
-       *  Returns a char_type to use as a decimal point.  This function is a
-       *  hook for derived classes to change the value returned.
-       *
-       *  @return  @a char_type representing a decimal point.
-      */
-      virtual char_type
-      do_decimal_point() const
-      { return _M_data->_M_decimal_point; }
-
-      /**
-       *  @brief  Return thousands separator character.
-       *
-       *  Returns a char_type to use as a thousands separator.  This function
-       *  is a hook for derived classes to change the value returned.
-       *
-       *  @return  @a char_type representing a thousands separator.
-      */
-      virtual char_type
-      do_thousands_sep() const
-      { return _M_data->_M_thousands_sep; }
-
-      /**
-       *  @brief  Return grouping specification.
-       *
-       *  Returns a string representing groupings for the integer part of a
-       *  number.  This function is a hook for derived classes to change the
-       *  value returned.  @see grouping() for details.
-       *
-       *  @return  String representing grouping specification.
-      */
-      virtual string
-      do_grouping() const
-      { return _M_data->_M_grouping; }
-
-      /**
-       *  @brief  Return currency symbol string.
-       *
-       *  This function returns a string_type to use as a currency symbol.
-       *  This function is a hook for derived classes to change the value
-       *  returned.  @see curr_symbol() for details.
-       *
-       *  @return  @a string_type representing a currency symbol.
-      */
-      virtual string_type
-      do_curr_symbol()   const
-      { return _M_data->_M_curr_symbol; }
-
-      /**
-       *  @brief  Return positive sign string.
-       *
-       *  This function returns a string_type to use as a sign for positive
-       *  amounts.  This function is a hook for derived classes to change the
-       *  value returned.  @see positive_sign() for details.
-       *
-       *  @return  @a string_type representing a positive sign.
-      */
-      virtual string_type
-      do_positive_sign() const
-      { return _M_data->_M_positive_sign; }
-
-      /**
-       *  @brief  Return negative sign string.
-       *
-       *  This function returns a string_type to use as a sign for negative
-       *  amounts.  This function is a hook for derived classes to change the
-       *  value returned.  @see negative_sign() for details.
-       *
-       *  @return  @a string_type representing a negative sign.
-      */
-      virtual string_type
-      do_negative_sign() const
-      { return _M_data->_M_negative_sign; }
-
-      /**
-       *  @brief  Return number of digits in fraction.
-       *
-       *  This function returns the exact number of digits that make up the
-       *  fractional part of a money amount.  This function is a hook for
-       *  derived classes to change the value returned.  @see frac_digits()
-       *  for details.
-       *
-       *  @return  Number of digits in amount fraction.
-      */
-      virtual int
-      do_frac_digits() const
-      { return _M_data->_M_frac_digits; }
-
-      /**
-       *  @brief  Return pattern for money values.
-       *
-       *  This function returns a pattern describing the formatting of a
-       *  positive valued money amount.  This function is a hook for derived
-       *  classes to change the value returned.  @see pos_format() for
-       *  details.
-       *
-       *  @return  Pattern for money values.
-      */
-      virtual pattern
-      do_pos_format() const
-      { return _M_data->_M_pos_format; }
-
-      /**
-       *  @brief  Return pattern for money values.
-       *
-       *  This function returns a pattern describing the formatting of a
-       *  negative valued money amount.  This function is a hook for derived
-       *  classes to change the value returned.  @see neg_format() for
-       *  details.
-       *
-       *  @return  Pattern for money values.
-      */
-      virtual pattern
-      do_neg_format() const
-      { return _M_data->_M_neg_format; }
-
-      // For use at construction time only.
-       void
-       _M_initialize_moneypunct(__c_locale __cloc = 0,
-				const char* __name = 0);
-    };
-
-  template<typename _CharT, bool _Intl>
-    locale::id moneypunct<_CharT, _Intl>::id;
-
-  template<typename _CharT, bool _Intl>
-    const bool moneypunct<_CharT, _Intl>::intl;
-
-  template<>
-    moneypunct<char, true>::~moneypunct();
-
-  template<>
-    moneypunct<char, false>::~moneypunct();
-
-  template<>
-    void
-    moneypunct<char, true>::_M_initialize_moneypunct(__c_locale, const char*);
-
-  template<>
-    void
-    moneypunct<char, false>::_M_initialize_moneypunct(__c_locale, const char*);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    moneypunct<wchar_t, true>::~moneypunct();
-
-  template<>
-    moneypunct<wchar_t, false>::~moneypunct();
-
-  template<>
-    void
-    moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale,
-							const char*);
-
-  template<>
-    void
-    moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale,
-							 const char*);
-#endif
-
-  /// class moneypunct_byname [22.2.6.4].
-  template<typename _CharT, bool _Intl>
-    class moneypunct_byname : public moneypunct<_CharT, _Intl>
-    {
-    public:
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-
-      static const bool intl = _Intl;
-
-      explicit
-      moneypunct_byname(const char* __s, size_t __refs = 0)
-      : moneypunct<_CharT, _Intl>(__refs)
-      {
-	if (__builtin_strcmp(__s, "C") != 0
-	    && __builtin_strcmp(__s, "POSIX") != 0)
-	  {
-	    __c_locale __tmp;
-	    this->_S_create_c_locale(__tmp, __s);
-	    this->_M_initialize_moneypunct(__tmp);
-	    this->_S_destroy_c_locale(__tmp);
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      explicit
-      moneypunct_byname(const string& __s, size_t __refs = 0)
-      : moneypunct_byname(__s.c_str(), __refs) { }
-#endif
-
-    protected:
-      virtual
-      ~moneypunct_byname() { }
-    };
-
-  template<typename _CharT, bool _Intl>
-    const bool moneypunct_byname<_CharT, _Intl>::intl;
-
-_GLIBCXX_END_NAMESPACE_CXX11
-
-_GLIBCXX_BEGIN_NAMESPACE_LDBL_OR_CXX11
-
-  /**
-   *  @brief  Primary class template money_get.
-   *  @ingroup locales
-   *
-   *  This facet encapsulates the code to parse and return a monetary
-   *  amount from a string.
-   *
-   *  The money_get template uses protected virtual functions to
-   *  provide the actual results.  The public accessors forward the
-   *  call to the virtual functions.  These virtual functions are
-   *  hooks for developers to implement the behavior they require from
-   *  the money_get facet.
-  */
-  template<typename _CharT, typename _InIter>
-    class money_get : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef _InIter			iter_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      money_get(size_t __refs = 0) : facet(__refs) { }
-
-      /**
-       *  @brief  Read and parse a monetary value.
-       *
-       *  This function reads characters from @a __s, interprets them as a
-       *  monetary value according to moneypunct and ctype facets retrieved
-       *  from io.getloc(), and returns the result in @a units as an integral
-       *  value moneypunct::frac_digits() * the actual amount.  For example,
-       *  the string $10.01 in a US locale would store 1001 in @a units.
-       *
-       *  Any characters not part of a valid money amount are not consumed.
-       *
-       *  If a money value cannot be parsed from the input stream, sets
-       *  err=(err|io.failbit).  If the stream is consumed before finishing
-       *  parsing,  sets err=(err|io.failbit|io.eofbit).  @a units is
-       *  unchanged if parsing fails.
-       *
-       *  This function works by returning the result of do_get().
-       *
-       *  @param  __s  Start of characters to parse.
-       *  @param  __end  End of characters to parse.
-       *  @param  __intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  __io  Source of facets and io state.
-       *  @param  __err  Error field to set if parsing fails.
-       *  @param  __units  Place to store result of parsing.
-       *  @return  Iterator referencing first character beyond valid money
-       *	   amount.
-       */
-      iter_type
-      get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
-	  ios_base::iostate& __err, long double& __units) const
-      { return this->do_get(__s, __end, __intl, __io, __err, __units); }
-
-      /**
-       *  @brief  Read and parse a monetary value.
-       *
-       *  This function reads characters from @a __s, interprets them as
-       *  a monetary value according to moneypunct and ctype facets
-       *  retrieved from io.getloc(), and returns the result in @a
-       *  digits.  For example, the string $10.01 in a US locale would
-       *  store <code>1001</code> in @a digits.
-       *
-       *  Any characters not part of a valid money amount are not consumed.
-       *
-       *  If a money value cannot be parsed from the input stream, sets
-       *  err=(err|io.failbit).  If the stream is consumed before finishing
-       *  parsing,  sets err=(err|io.failbit|io.eofbit).
-       *
-       *  This function works by returning the result of do_get().
-       *
-       *  @param  __s  Start of characters to parse.
-       *  @param  __end  End of characters to parse.
-       *  @param  __intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  __io  Source of facets and io state.
-       *  @param  __err  Error field to set if parsing fails.
-       *  @param  __digits  Place to store result of parsing.
-       *  @return  Iterator referencing first character beyond valid money
-       *	   amount.
-       */
-      iter_type
-      get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
-	  ios_base::iostate& __err, string_type& __digits) const
-      { return this->do_get(__s, __end, __intl, __io, __err, __digits); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~money_get() { }
-
-      /**
-       *  @brief  Read and parse a monetary value.
-       *
-       *  This function reads and parses characters representing a monetary
-       *  value.  This function is a hook for derived classes to change the
-       *  value returned.  @see get() for details.
-       */
-      // XXX GLIBCXX_ABI Deprecated
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__ \
-      && _GLIBCXX_USE_CXX11_ABI == 0
-      virtual iter_type
-      __do_get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
-	       ios_base::iostate& __err, double& __units) const;
-#else
-      virtual iter_type
-      do_get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
-	     ios_base::iostate& __err, long double& __units) const;
-#endif
-
-      /**
-       *  @brief  Read and parse a monetary value.
-       *
-       *  This function reads and parses characters representing a monetary
-       *  value.  This function is a hook for derived classes to change the
-       *  value returned.  @see get() for details.
-       */
-      virtual iter_type
-      do_get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
-	     ios_base::iostate& __err, string_type& __digits) const;
-
-      // XXX GLIBCXX_ABI Deprecated
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__ \
-      && _GLIBCXX_USE_CXX11_ABI == 0
-      virtual iter_type
-      do_get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
-	     ios_base::iostate& __err, long double& __units) const;
-#endif
-
-      template<bool _Intl>
-        iter_type
-        _M_extract(iter_type __s, iter_type __end, ios_base& __io,
-		   ios_base::iostate& __err, string& __digits) const;     
-    };
-
-  template<typename _CharT, typename _InIter>
-    locale::id money_get<_CharT, _InIter>::id;
-
-  /**
-   *  @brief  Primary class template money_put.
-   *  @ingroup locales
-   *
-   *  This facet encapsulates the code to format and output a monetary
-   *  amount.
-   *
-   *  The money_put template uses protected virtual functions to
-   *  provide the actual results.  The public accessors forward the
-   *  call to the virtual functions.  These virtual functions are
-   *  hooks for developers to implement the behavior they require from
-   *  the money_put facet.
-  */
-  template<typename _CharT, typename _OutIter>
-    class money_put : public locale::facet
-    {
-    public:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef _OutIter			iter_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      money_put(size_t __refs = 0) : facet(__refs) { }
-
-      /**
-       *  @brief  Format and output a monetary value.
-       *
-       *  This function formats @a units as a monetary value according to
-       *  moneypunct and ctype facets retrieved from io.getloc(), and writes
-       *  the resulting characters to @a __s.  For example, the value 1001 in a
-       *  US locale would write <code>$10.01</code> to @a __s.
-       *
-       *  This function works by returning the result of do_put().
-       *
-       *  @param  __s  The stream to write to.
-       *  @param  __intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  __io  Source of facets and io state.
-       *  @param  __fill  char_type to use for padding.
-       *  @param  __units  Place to store result of parsing.
-       *  @return  Iterator after writing.
-       */
-      iter_type
-      put(iter_type __s, bool __intl, ios_base& __io,
-	  char_type __fill, long double __units) const
-      { return this->do_put(__s, __intl, __io, __fill, __units); }
-
-      /**
-       *  @brief  Format and output a monetary value.
-       *
-       *  This function formats @a digits as a monetary value
-       *  according to moneypunct and ctype facets retrieved from
-       *  io.getloc(), and writes the resulting characters to @a __s.
-       *  For example, the string <code>1001</code> in a US locale
-       *  would write <code>$10.01</code> to @a __s.
-       *
-       *  This function works by returning the result of do_put().
-       *
-       *  @param  __s  The stream to write to.
-       *  @param  __intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  __io  Source of facets and io state.
-       *  @param  __fill  char_type to use for padding.
-       *  @param  __digits  Place to store result of parsing.
-       *  @return  Iterator after writing.
-       */
-      iter_type
-      put(iter_type __s, bool __intl, ios_base& __io,
-	  char_type __fill, const string_type& __digits) const
-      { return this->do_put(__s, __intl, __io, __fill, __digits); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~money_put() { }
-
-      /**
-       *  @brief  Format and output a monetary value.
-       *
-       *  This function formats @a units as a monetary value according to
-       *  moneypunct and ctype facets retrieved from io.getloc(), and writes
-       *  the resulting characters to @a __s.  For example, the value 1001 in a
-       *  US locale would write <code>$10.01</code> to @a __s.
-       *
-       *  This function is a hook for derived classes to change the value
-       *  returned.  @see put().
-       *
-       *  @param  __s  The stream to write to.
-       *  @param  __intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  __io  Source of facets and io state.
-       *  @param  __fill  char_type to use for padding.
-       *  @param  __units  Place to store result of parsing.
-       *  @return  Iterator after writing.
-       */
-      // XXX GLIBCXX_ABI Deprecated
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__ \
-      && _GLIBCXX_USE_CXX11_ABI == 0
-      virtual iter_type
-      __do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	       double __units) const;
-#else
-      virtual iter_type
-      do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	     long double __units) const;
-#endif
-
-      /**
-       *  @brief  Format and output a monetary value.
-       *
-       *  This function formats @a digits as a monetary value
-       *  according to moneypunct and ctype facets retrieved from
-       *  io.getloc(), and writes the resulting characters to @a __s.
-       *  For example, the string <code>1001</code> in a US locale
-       *  would write <code>$10.01</code> to @a __s.
-       *
-       *  This function is a hook for derived classes to change the value
-       *  returned.  @see put().
-       *
-       *  @param  __s  The stream to write to.
-       *  @param  __intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  __io  Source of facets and io state.
-       *  @param  __fill  char_type to use for padding.
-       *  @param  __digits  Place to store result of parsing.
-       *  @return  Iterator after writing.
-       */
-      virtual iter_type
-      do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	     const string_type& __digits) const;
-
-      // XXX GLIBCXX_ABI Deprecated
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__ \
-      && _GLIBCXX_USE_CXX11_ABI == 0
-      virtual iter_type
-      do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	     long double __units) const;
-#endif
-
-      template<bool _Intl>
-        iter_type
-        _M_insert(iter_type __s, ios_base& __io, char_type __fill,
-		  const string_type& __digits) const;
-    };
-
-  template<typename _CharT, typename _OutIter>
-    locale::id money_put<_CharT, _OutIter>::id;
-
-_GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11
-
-  /**
-   *  @brief  Messages facet base class providing catalog typedef.
-   *  @ingroup locales
-   */
-  struct messages_base
-  {
-    typedef int catalog;
-  };
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  /**
-   *  @brief  Primary class template messages.
-   *  @ingroup locales
-   *
-   *  This facet encapsulates the code to retrieve messages from
-   *  message catalogs.  The only thing defined by the standard for this facet
-   *  is the interface.  All underlying functionality is
-   *  implementation-defined.
-   *
-   *  This library currently implements 3 versions of the message facet.  The
-   *  first version (gnu) is a wrapper around gettext, provided by libintl.
-   *  The second version (ieee) is a wrapper around catgets.  The final
-   *  version (default) does no actual translation.  These implementations are
-   *  only provided for char and wchar_t instantiations.
-   *
-   *  The messages template uses protected virtual functions to
-   *  provide the actual results.  The public accessors forward the
-   *  call to the virtual functions.  These virtual functions are
-   *  hooks for developers to implement the behavior they require from
-   *  the messages facet.
-  */
-  template<typename _CharT>
-    class messages : public locale::facet, public messages_base
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-
-    protected:
-      // Underlying "C" library locale information saved from
-      // initialization, needed by messages_byname as well.
-      __c_locale			_M_c_locale_messages;
-      const char*			_M_name_messages;
-
-    public:
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param __refs  Passed to the base facet class.
-      */
-      explicit
-      messages(size_t __refs = 0);
-
-      // Non-standard.
-      /**
-       *  @brief  Internal constructor.  Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up new
-       *  locales.
-       *
-       *  @param  __cloc  The C locale.
-       *  @param  __s  The name of a locale.
-       *  @param  __refs  Refcount to pass to the base class.
-       */
-      explicit
-      messages(__c_locale __cloc, const char* __s, size_t __refs = 0);
-
-      /*
-       *  @brief  Open a message catalog.
-       *
-       *  This function opens and returns a handle to a message catalog by
-       *  returning do_open(__s, __loc).
-       *
-       *  @param  __s  The catalog to open.
-       *  @param  __loc  Locale to use for character set conversions.
-       *  @return  Handle to the catalog or value < 0 if open fails.
-      */
-      catalog
-      open(const basic_string<char>& __s, const locale& __loc) const
-      { return this->do_open(__s, __loc); }
-
-      // Non-standard and unorthodox, yet effective.
-      /*
-       *  @brief  Open a message catalog.
-       *
-       *  This non-standard function opens and returns a handle to a message
-       *  catalog by returning do_open(s, loc).  The third argument provides a
-       *  message catalog root directory for gnu gettext and is ignored
-       *  otherwise.
-       *
-       *  @param  __s  The catalog to open.
-       *  @param  __loc  Locale to use for character set conversions.
-       *  @param  __dir  Message catalog root directory.
-       *  @return  Handle to the catalog or value < 0 if open fails.
-      */
-      catalog
-      open(const basic_string<char>&, const locale&, const char*) const;
-
-      /*
-       *  @brief  Look up a string in a message catalog.
-       *
-       *  This function retrieves and returns a message from a catalog by
-       *  returning do_get(c, set, msgid, s).
-       *
-       *  For gnu, @a __set and @a msgid are ignored.  Returns gettext(s).
-       *  For default, returns s. For ieee, returns catgets(c,set,msgid,s).
-       *
-       *  @param  __c  The catalog to access.
-       *  @param  __set  Implementation-defined.
-       *  @param  __msgid  Implementation-defined.
-       *  @param  __s  Default return value if retrieval fails.
-       *  @return  Retrieved message or @a __s if get fails.
-      */
-      string_type
-      get(catalog __c, int __set, int __msgid, const string_type& __s) const
-      { return this->do_get(__c, __set, __msgid, __s); }
-
-      /*
-       *  @brief  Close a message catalog.
-       *
-       *  Closes catalog @a c by calling do_close(c).
-       *
-       *  @param  __c  The catalog to close.
-      */
-      void
-      close(catalog __c) const
-      { return this->do_close(__c); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~messages();
-
-      /*
-       *  @brief  Open a message catalog.
-       *
-       *  This function opens and returns a handle to a message catalog in an
-       *  implementation-defined manner.  This function is a hook for derived
-       *  classes to change the value returned.
-       *
-       *  @param  __s  The catalog to open.
-       *  @param  __loc  Locale to use for character set conversions.
-       *  @return  Handle to the opened catalog, value < 0 if open failed.
-      */
-      virtual catalog
-      do_open(const basic_string<char>&, const locale&) const;
-
-      /*
-       *  @brief  Look up a string in a message catalog.
-       *
-       *  This function retrieves and returns a message from a catalog in an
-       *  implementation-defined manner.  This function is a hook for derived
-       *  classes to change the value returned.
-       *
-       *  For gnu, @a __set and @a __msgid are ignored.  Returns gettext(s).
-       *  For default, returns s. For ieee, returns catgets(c,set,msgid,s).
-       *
-       *  @param  __c  The catalog to access.
-       *  @param  __set  Implementation-defined.
-       *  @param  __msgid  Implementation-defined.
-       *  @param  __s  Default return value if retrieval fails.
-       *  @return  Retrieved message or @a __s if get fails.
-      */
-      virtual string_type
-      do_get(catalog, int, int, const string_type& __dfault) const;
-
-      /*
-       *  @brief  Close a message catalog.
-       *
-       *  @param  __c  The catalog to close.
-      */
-      virtual void
-      do_close(catalog) const;
-
-      // Returns a locale and codeset-converted string, given a char* message.
-      char*
-      _M_convert_to_char(const string_type& __msg) const
-      {
-	// XXX
-	return reinterpret_cast<char*>(const_cast<_CharT*>(__msg.c_str()));
-      }
-
-      // Returns a locale and codeset-converted string, given a char* message.
-      string_type
-      _M_convert_from_char(char*) const
-      {
-	// XXX
-	return string_type();
-      }
-     };
-
-  template<typename _CharT>
-    locale::id messages<_CharT>::id;
-
-  /// Specializations for required instantiations.
-  template<>
-    string
-    messages<char>::do_get(catalog, int, int, const string&) const;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    wstring
-    messages<wchar_t>::do_get(catalog, int, int, const wstring&) const;
-#endif
-
-   /// class messages_byname [22.2.7.2].
-   template<typename _CharT>
-    class messages_byname : public messages<_CharT>
-    {
-    public:
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-
-      explicit
-      messages_byname(const char* __s, size_t __refs = 0);
-
-#if __cplusplus >= 201103L
-      explicit
-      messages_byname(const string& __s, size_t __refs = 0)
-      : messages_byname(__s.c_str(), __refs) { }
-#endif
-
-    protected:
-      virtual
-      ~messages_byname()
-      { }
-    };
-
-_GLIBCXX_END_NAMESPACE_CXX11
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-// Include host and configuration specific messages functions.
-#include <bits/messages_members.h>
-
-// 22.2.1.5  Template class codecvt
-#include <bits/codecvt.h>
-
-#include <bits/locale_facets_nonio.tcc>
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/locale_facets_nonio.tcc b/openflow/usr/include/c++/5/bits/locale_facets_nonio.tcc
deleted file mode 100644
index 188d07b..0000000
--- a/openflow/usr/include/c++/5/bits/locale_facets_nonio.tcc
+++ /dev/null
@@ -1,1484 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/locale_facets_nonio.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-#ifndef _LOCALE_FACETS_NONIO_TCC
-#define _LOCALE_FACETS_NONIO_TCC 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, bool _Intl>
-    struct __use_cache<__moneypunct_cache<_CharT, _Intl> >
-    {
-      const __moneypunct_cache<_CharT, _Intl>*
-      operator() (const locale& __loc) const
-      {
-	const size_t __i = moneypunct<_CharT, _Intl>::id._M_id();
-	const locale::facet** __caches = __loc._M_impl->_M_caches;
-	if (!__caches[__i])
-	  {
-	    __moneypunct_cache<_CharT, _Intl>* __tmp = 0;
-	    __try
-	      {
-		__tmp = new __moneypunct_cache<_CharT, _Intl>;
-		__tmp->_M_cache(__loc);
-	      }
-	    __catch(...)
-	      {
-		delete __tmp;
-		__throw_exception_again;
-	      }
-	    __loc._M_impl->_M_install_cache(__tmp, __i);
-	  }
-	return static_cast<
-	  const __moneypunct_cache<_CharT, _Intl>*>(__caches[__i]);
-      }
-    };
-
-  template<typename _CharT, bool _Intl>
-    void
-    __moneypunct_cache<_CharT, _Intl>::_M_cache(const locale& __loc)
-    {
-      const moneypunct<_CharT, _Intl>& __mp =
-	use_facet<moneypunct<_CharT, _Intl> >(__loc);
-
-      _M_decimal_point = __mp.decimal_point();
-      _M_thousands_sep = __mp.thousands_sep();
-      _M_frac_digits = __mp.frac_digits();
-
-      char* __grouping = 0;
-      _CharT* __curr_symbol = 0;
-      _CharT* __positive_sign = 0;
-      _CharT* __negative_sign = 0;     
-      __try
-	{
-	  const string& __g = __mp.grouping();
-	  _M_grouping_size = __g.size();
-	  __grouping = new char[_M_grouping_size];
-	  __g.copy(__grouping, _M_grouping_size);
-	  _M_use_grouping = (_M_grouping_size
-			     && static_cast<signed char>(__grouping[0]) > 0
-			     && (__grouping[0]
-				 != __gnu_cxx::__numeric_traits<char>::__max));
-
-	  const basic_string<_CharT>& __cs = __mp.curr_symbol();
-	  _M_curr_symbol_size = __cs.size();
-	  __curr_symbol = new _CharT[_M_curr_symbol_size];
-	  __cs.copy(__curr_symbol, _M_curr_symbol_size);
-
-	  const basic_string<_CharT>& __ps = __mp.positive_sign();
-	  _M_positive_sign_size = __ps.size();
-	  __positive_sign = new _CharT[_M_positive_sign_size];
-	  __ps.copy(__positive_sign, _M_positive_sign_size);
-
-	  const basic_string<_CharT>& __ns = __mp.negative_sign();
-	  _M_negative_sign_size = __ns.size();
-	  __negative_sign = new _CharT[_M_negative_sign_size];
-	  __ns.copy(__negative_sign, _M_negative_sign_size);
-
-	  _M_pos_format = __mp.pos_format();
-	  _M_neg_format = __mp.neg_format();
-
-	  const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__loc);
-	  __ct.widen(money_base::_S_atoms,
-		     money_base::_S_atoms + money_base::_S_end, _M_atoms);
-
-	  _M_grouping = __grouping;
-	  _M_curr_symbol = __curr_symbol;
-	  _M_positive_sign = __positive_sign;
-	  _M_negative_sign = __negative_sign;
-	  _M_allocated = true;
-	}
-      __catch(...)
-	{
-	  delete [] __grouping;
-	  delete [] __curr_symbol;
-	  delete [] __positive_sign;
-	  delete [] __negative_sign;
-	  __throw_exception_again;
-	}
-    }
-
-_GLIBCXX_BEGIN_NAMESPACE_LDBL_OR_CXX11
-
-  template<typename _CharT, typename _InIter>
-    template<bool _Intl>
-      _InIter
-      money_get<_CharT, _InIter>::
-      _M_extract(iter_type __beg, iter_type __end, ios_base& __io,
-		 ios_base::iostate& __err, string& __units) const
-      {
-	typedef char_traits<_CharT>			  __traits_type;
-	typedef typename string_type::size_type	          size_type;	
-	typedef money_base::part			  part;
-	typedef __moneypunct_cache<_CharT, _Intl>         __cache_type;
-	
-	const locale& __loc = __io._M_getloc();
-	const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-	__use_cache<__cache_type> __uc;
-	const __cache_type* __lc = __uc(__loc);
-	const char_type* __lit = __lc->_M_atoms;
-
-	// Deduced sign.
-	bool __negative = false;
-	// Sign size.
-	size_type __sign_size = 0;
-	// True if sign is mandatory.
-	const bool __mandatory_sign = (__lc->_M_positive_sign_size
-				       && __lc->_M_negative_sign_size);
-	// String of grouping info from thousands_sep plucked from __units.
-	string __grouping_tmp;
-	if (__lc->_M_use_grouping)
-	  __grouping_tmp.reserve(32);
-	// Last position before the decimal point.
-	int __last_pos = 0;
-	// Separator positions, then, possibly, fractional digits.
-	int __n = 0;
-	// If input iterator is in a valid state.
-	bool __testvalid = true;
-	// Flag marking when a decimal point is found.
-	bool __testdecfound = false;
-
-	// The tentative returned string is stored here.
-	string __res;
-	__res.reserve(32);
-
-	const char_type* __lit_zero = __lit + money_base::_S_zero;
-	const money_base::pattern __p = __lc->_M_neg_format;
-	for (int __i = 0; __i < 4 && __testvalid; ++__i)
-	  {
-	    const part __which = static_cast<part>(__p.field[__i]);
-	    switch (__which)
-	      {
-	      case money_base::symbol:
-		// According to 22.2.6.1.2, p2, symbol is required
-		// if (__io.flags() & ios_base::showbase), otherwise
-		// is optional and consumed only if other characters
-		// are needed to complete the format.
-		if (__io.flags() & ios_base::showbase || __sign_size > 1
-		    || __i == 0
-		    || (__i == 1 && (__mandatory_sign
-				     || (static_cast<part>(__p.field[0])
-					 == money_base::sign)
-				     || (static_cast<part>(__p.field[2])
-					 == money_base::space)))
-		    || (__i == 2 && ((static_cast<part>(__p.field[3])
-				      == money_base::value)
-				     || (__mandatory_sign
-					 && (static_cast<part>(__p.field[3])
-					     == money_base::sign)))))
-		  {
-		    const size_type __len = __lc->_M_curr_symbol_size;
-		    size_type __j = 0;
-		    for (; __beg != __end && __j < __len
-			   && *__beg == __lc->_M_curr_symbol[__j];
-			 ++__beg, ++__j);
-		    if (__j != __len
-			&& (__j || __io.flags() & ios_base::showbase))
-		      __testvalid = false;
-		  }
-		break;
-	      case money_base::sign:
-		// Sign might not exist, or be more than one character long.
-		if (__lc->_M_positive_sign_size && __beg != __end
-		    && *__beg == __lc->_M_positive_sign[0])
-		  {
-		    __sign_size = __lc->_M_positive_sign_size;
-		    ++__beg;
-		  }
-		else if (__lc->_M_negative_sign_size && __beg != __end
-			 && *__beg == __lc->_M_negative_sign[0])
-		  {
-		    __negative = true;
-		    __sign_size = __lc->_M_negative_sign_size;
-		    ++__beg;
-		  }
-		else if (__lc->_M_positive_sign_size
-			 && !__lc->_M_negative_sign_size)
-		  // "... if no sign is detected, the result is given the sign
-		  // that corresponds to the source of the empty string"
-		  __negative = true;
-		else if (__mandatory_sign)
-		  __testvalid = false;
-		break;
-	      case money_base::value:
-		// Extract digits, remove and stash away the
-		// grouping of found thousands separators.
-		for (; __beg != __end; ++__beg)
-		  {
-		    const char_type __c = *__beg;
-		    const char_type* __q = __traits_type::find(__lit_zero, 
-							       10, __c);
-		    if (__q != 0)
-		      {
-			__res += money_base::_S_atoms[__q - __lit];
-			++__n;
-		      }
-		    else if (__c == __lc->_M_decimal_point 
-			     && !__testdecfound)
-		      {
-			if (__lc->_M_frac_digits <= 0)
-			  break;
-
-			__last_pos = __n;
-			__n = 0;
-			__testdecfound = true;
-		      }
-		    else if (__lc->_M_use_grouping
-			     && __c == __lc->_M_thousands_sep
-			     && !__testdecfound)
-		      {
-			if (__n)
-			  {
-			    // Mark position for later analysis.
-			    __grouping_tmp += static_cast<char>(__n);
-			    __n = 0;
-			  }
-			else
-			  {
-			    __testvalid = false;
-			    break;
-			  }
-		      }
-		    else
-		      break;
-		  }
-		if (__res.empty())
-		  __testvalid = false;
-		break;
-	      case money_base::space:
-		// At least one space is required.
-		if (__beg != __end && __ctype.is(ctype_base::space, *__beg))
-		  ++__beg;
-		else
-		  __testvalid = false;
-	      case money_base::none:
-		// Only if not at the end of the pattern.
-		if (__i != 3)
-		  for (; __beg != __end
-			 && __ctype.is(ctype_base::space, *__beg); ++__beg);
-		break;
-	      }
-	  }
-
-	// Need to get the rest of the sign characters, if they exist.
-	if (__sign_size > 1 && __testvalid)
-	  {
-	    const char_type* __sign = __negative ? __lc->_M_negative_sign
-	                                         : __lc->_M_positive_sign;
-	    size_type __i = 1;
-	    for (; __beg != __end && __i < __sign_size
-		   && *__beg == __sign[__i]; ++__beg, ++__i);
-	    
-	    if (__i != __sign_size)
-	      __testvalid = false;
-	  }
-
-	if (__testvalid)
-	  {
-	    // Strip leading zeros.
-	    if (__res.size() > 1)
-	      {
-		const size_type __first = __res.find_first_not_of('0');
-		const bool __only_zeros = __first == string::npos;
-		if (__first)
-		  __res.erase(0, __only_zeros ? __res.size() - 1 : __first);
-	      }
-
-	    // 22.2.6.1.2, p4
-	    if (__negative && __res[0] != '0')
-	      __res.insert(__res.begin(), '-');
-	    
-	    // Test for grouping fidelity.
-	    if (__grouping_tmp.size())
-	      {
-		// Add the ending grouping.
-		__grouping_tmp += static_cast<char>(__testdecfound ? __last_pos
-						                   : __n);
-		if (!std::__verify_grouping(__lc->_M_grouping,
-					    __lc->_M_grouping_size,
-					    __grouping_tmp))
-		  __err |= ios_base::failbit;
-	      }
-	    
-	    // Iff not enough digits were supplied after the decimal-point.
-	    if (__testdecfound && __n != __lc->_M_frac_digits)
-	      __testvalid = false;
-	  }
-
-	// Iff valid sequence is not recognized.
-	if (!__testvalid)
-	  __err |= ios_base::failbit;
-	else
-	  __units.swap(__res);
-	
-	// Iff no more characters are available.
-	if (__beg == __end)
-	  __err |= ios_base::eofbit;
-	return __beg;
-      }
-
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__ \
-      && _GLIBCXX_USE_CXX11_ABI == 0
-  template<typename _CharT, typename _InIter>
-    _InIter
-    money_get<_CharT, _InIter>::
-    __do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io,
-	     ios_base::iostate& __err, double& __units) const
-    {
-      string __str;
-      __beg = __intl ? _M_extract<true>(__beg, __end, __io, __err, __str)
-                     : _M_extract<false>(__beg, __end, __io, __err, __str);
-      std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale());
-      return __beg;
-    }
-#endif
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    money_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io,
-	   ios_base::iostate& __err, long double& __units) const
-    {
-      string __str;
-      __beg = __intl ? _M_extract<true>(__beg, __end, __io, __err, __str)
-	             : _M_extract<false>(__beg, __end, __io, __err, __str);
-      std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale());
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    money_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io,
-	   ios_base::iostate& __err, string_type& __digits) const
-    {
-      typedef typename string::size_type                  size_type;
-
-      const locale& __loc = __io._M_getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-      string __str;
-      __beg = __intl ? _M_extract<true>(__beg, __end, __io, __err, __str)
-	             : _M_extract<false>(__beg, __end, __io, __err, __str);
-      const size_type __len = __str.size();
-      if (__len)
-	{
-	  __digits.resize(__len);
-	  __ctype.widen(__str.data(), __str.data() + __len, &__digits[0]);
-	}
-      return __beg;
-    }
-
-  template<typename _CharT, typename _OutIter>
-    template<bool _Intl>
-      _OutIter
-      money_put<_CharT, _OutIter>::
-      _M_insert(iter_type __s, ios_base& __io, char_type __fill,
-		const string_type& __digits) const
-      {
-	typedef typename string_type::size_type	          size_type;
-	typedef money_base::part                          part;
-	typedef __moneypunct_cache<_CharT, _Intl>         __cache_type;
-      
-	const locale& __loc = __io._M_getloc();
-	const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-	__use_cache<__cache_type> __uc;
-	const __cache_type* __lc = __uc(__loc);
-	const char_type* __lit = __lc->_M_atoms;
-
-	// Determine if negative or positive formats are to be used, and
-	// discard leading negative_sign if it is present.
-	const char_type* __beg = __digits.data();
-
-	money_base::pattern __p;
-	const char_type* __sign;
-	size_type __sign_size;
-	if (!(*__beg == __lit[money_base::_S_minus]))
-	  {
-	    __p = __lc->_M_pos_format;
-	    __sign = __lc->_M_positive_sign;
-	    __sign_size = __lc->_M_positive_sign_size;
-	  }
-	else
-	  {
-	    __p = __lc->_M_neg_format;
-	    __sign = __lc->_M_negative_sign;
-	    __sign_size = __lc->_M_negative_sign_size;
-	    if (__digits.size())
-	      ++__beg;
-	  }
-       
-	// Look for valid numbers in the ctype facet within input digits.
-	size_type __len = __ctype.scan_not(ctype_base::digit, __beg,
-					   __beg + __digits.size()) - __beg;
-	if (__len)
-	  {
-	    // Assume valid input, and attempt to format.
-	    // Break down input numbers into base components, as follows:
-	    //   final_value = grouped units + (decimal point) + (digits)
-	    string_type __value;
-	    __value.reserve(2 * __len);
-
-	    // Add thousands separators to non-decimal digits, per
-	    // grouping rules.
-	    long __paddec = __len - __lc->_M_frac_digits;
-	    if (__paddec > 0)
-  	      {
-		if (__lc->_M_frac_digits < 0)
-		  __paddec = __len;
-  		if (__lc->_M_grouping_size)
-  		  {
-		    __value.assign(2 * __paddec, char_type());
- 		    _CharT* __vend = 
-		      std::__add_grouping(&__value[0], __lc->_M_thousands_sep,
-					  __lc->_M_grouping,
-					  __lc->_M_grouping_size,
-					  __beg, __beg + __paddec);
-		    __value.erase(__vend - &__value[0]);
-  		  }
-  		else
-		  __value.assign(__beg, __paddec);
-	      }
-
-	    // Deal with decimal point, decimal digits.
-	    if (__lc->_M_frac_digits > 0)
-	      {
-		__value += __lc->_M_decimal_point;
-		if (__paddec >= 0)
-		  __value.append(__beg + __paddec, __lc->_M_frac_digits);
-		else
-		  {
-		    // Have to pad zeros in the decimal position.
-		    __value.append(-__paddec, __lit[money_base::_S_zero]);
-		    __value.append(__beg, __len);
-		  }
-  	      }
-  
-	    // Calculate length of resulting string.
-	    const ios_base::fmtflags __f = __io.flags() 
-	                                   & ios_base::adjustfield;
-	    __len = __value.size() + __sign_size;
-	    __len += ((__io.flags() & ios_base::showbase)
-		      ? __lc->_M_curr_symbol_size : 0);
-
-	    string_type __res;
-	    __res.reserve(2 * __len);
-	    
-	    const size_type __width = static_cast<size_type>(__io.width());  
-	    const bool __testipad = (__f == ios_base::internal
-				     && __len < __width);
-	    // Fit formatted digits into the required pattern.
-	    for (int __i = 0; __i < 4; ++__i)
-	      {
-		const part __which = static_cast<part>(__p.field[__i]);
-		switch (__which)
-		  {
-		  case money_base::symbol:
-		    if (__io.flags() & ios_base::showbase)
-		      __res.append(__lc->_M_curr_symbol,
-				   __lc->_M_curr_symbol_size);
-		    break;
-		  case money_base::sign:
-		    // Sign might not exist, or be more than one
-		    // character long. In that case, add in the rest
-		    // below.
-		    if (__sign_size)
-		      __res += __sign[0];
-		    break;
-		  case money_base::value:
-		    __res += __value;
-		    break;
-		  case money_base::space:
-		    // At least one space is required, but if internal
-		    // formatting is required, an arbitrary number of
-		    // fill spaces will be necessary.
-		    if (__testipad)
-		      __res.append(__width - __len, __fill);
-		    else
-		      __res += __fill;
-		    break;
-		  case money_base::none:
-		    if (__testipad)
-		      __res.append(__width - __len, __fill);
-		    break;
-		  }
-	      }
-	    
-	    // Special case of multi-part sign parts.
-	    if (__sign_size > 1)
-	      __res.append(__sign + 1, __sign_size - 1);
-	    
-	    // Pad, if still necessary.
-	    __len = __res.size();
-	    if (__width > __len)
-	      {
-		if (__f == ios_base::left)
-		  // After.
-		  __res.append(__width - __len, __fill);
-		else
-		  // Before.
-		  __res.insert(0, __width - __len, __fill);
-		__len = __width;
-	      }
-	    
-	    // Write resulting, fully-formatted string to output iterator.
-	    __s = std::__write(__s, __res.data(), __len);
-	  }
-	__io.width(0);
-	return __s;    
-      }
-
-#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__ \
-      && _GLIBCXX_USE_CXX11_ABI == 0
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    money_put<_CharT, _OutIter>::
-    __do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	     double __units) const
-    { return this->do_put(__s, __intl, __io, __fill, (long double) __units); }
-#endif
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    money_put<_CharT, _OutIter>::
-    do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	   long double __units) const
-    {
-      const locale __loc = __io.getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-#ifdef _GLIBCXX_USE_C99
-      // First try a buffer perhaps big enough.
-      int __cs_size = 64;
-      char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 328. Bad sprintf format modifier in money_put<>::do_put()
-      int __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size,
-					"%.*Lf", 0, __units);
-      // If the buffer was not large enough, try again with the correct size.
-      if (__len >= __cs_size)
-	{
-	  __cs_size = __len + 1;
-	  __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-	  __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size,
-					"%.*Lf", 0, __units);
-	}
-#else
-      // max_exponent10 + 1 for the integer part, + 2 for sign and '\0'.
-      const int __cs_size =
-	__gnu_cxx::__numeric_traits<long double>::__max_exponent10 + 3;
-      char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-      int __len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, "%.*Lf", 
-					0, __units);
-#endif
-      string_type __digits(__len, char_type());
-      __ctype.widen(__cs, __cs + __len, &__digits[0]);
-      return __intl ? _M_insert<true>(__s, __io, __fill, __digits)
-	            : _M_insert<false>(__s, __io, __fill, __digits);
-    }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    money_put<_CharT, _OutIter>::
-    do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	   const string_type& __digits) const
-    { return __intl ? _M_insert<true>(__s, __io, __fill, __digits)
-	            : _M_insert<false>(__s, __io, __fill, __digits); }
-
-_GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11
-
-  // NB: Not especially useful. Without an ios_base object or some
-  // kind of locale reference, we are left clawing at the air where
-  // the side of the mountain used to be...
-  template<typename _CharT, typename _InIter>
-    time_base::dateorder
-    time_get<_CharT, _InIter>::do_date_order() const
-    { return time_base::no_order; }
-
-  // Expand a strftime format string and parse it.  E.g., do_get_date() may
-  // pass %m/%d/%Y => extracted characters.
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    _M_extract_via_format(iter_type __beg, iter_type __end, ios_base& __io,
-			  ios_base::iostate& __err, tm* __tm,
-			  const _CharT* __format) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-      const size_t __len = char_traits<_CharT>::length(__format);
-
-      ios_base::iostate __tmperr = ios_base::goodbit;
-      size_t __i = 0;
-      for (; __beg != __end && __i < __len && !__tmperr; ++__i)
-	{
-	  if (__ctype.narrow(__format[__i], 0) == '%')
-	    {
-	      // Verify valid formatting code, attempt to extract.
-	      char __c = __ctype.narrow(__format[++__i], 0);
-	      int __mem = 0;
-	      if (__c == 'E' || __c == 'O')
-		__c = __ctype.narrow(__format[++__i], 0);
-	      switch (__c)
-		{
-		  const char* __cs;
-		  _CharT __wcs[10];
-		case 'a':
-		  // Abbreviated weekday name [tm_wday]
-		  const char_type*  __days1[7];
-		  __tp._M_days_abbreviated(__days1);
-		  __beg = _M_extract_name(__beg, __end, __tm->tm_wday, __days1,
-					  7, __io, __tmperr);
-		  break;
-		case 'A':
-		  // Weekday name [tm_wday].
-		  const char_type*  __days2[7];
-		  __tp._M_days(__days2);
-		  __beg = _M_extract_name(__beg, __end, __tm->tm_wday, __days2,
-					  7, __io, __tmperr);
-		  break;
-		case 'h':
-		case 'b':
-		  // Abbreviated month name [tm_mon]
-		  const char_type*  __months1[12];
-		  __tp._M_months_abbreviated(__months1);
-		  __beg = _M_extract_name(__beg, __end, __tm->tm_mon, 
-					  __months1, 12, __io, __tmperr);
-		  break;
-		case 'B':
-		  // Month name [tm_mon].
-		  const char_type*  __months2[12];
-		  __tp._M_months(__months2);
-		  __beg = _M_extract_name(__beg, __end, __tm->tm_mon, 
-					  __months2, 12, __io, __tmperr);
-		  break;
-		case 'c':
-		  // Default time and date representation.
-		  const char_type*  __dt[2];
-		  __tp._M_date_time_formats(__dt);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __tmperr, 
-						__tm, __dt[0]);
-		  break;
-		case 'd':
-		  // Day [01, 31]. [tm_mday]
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_mday, 1, 31, 2,
-					 __io, __tmperr);
-		  break;
-		case 'e':
-		  // Day [1, 31], with single digits preceded by
-		  // space. [tm_mday]
-		  if (__ctype.is(ctype_base::space, *__beg))
-		    __beg = _M_extract_num(++__beg, __end, __tm->tm_mday, 1, 9,
-					   1, __io, __tmperr);
-		  else
-		    __beg = _M_extract_num(__beg, __end, __tm->tm_mday, 10, 31,
-					   2, __io, __tmperr);
-		  break;
-		case 'D':
-		  // Equivalent to %m/%d/%y.[tm_mon, tm_mday, tm_year]
-		  __cs = "%m/%d/%y";
-		  __ctype.widen(__cs, __cs + 9, __wcs);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __tmperr, 
-						__tm, __wcs);
-		  break;
-		case 'H':
-		  // Hour [00, 23]. [tm_hour]
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_hour, 0, 23, 2,
-					 __io, __tmperr);
-		  break;
-		case 'I':
-		  // Hour [01, 12]. [tm_hour]
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_hour, 1, 12, 2,
-					 __io, __tmperr);
-		  break;
-		case 'm':
-		  // Month [01, 12]. [tm_mon]
-		  __beg = _M_extract_num(__beg, __end, __mem, 1, 12, 2, 
-					 __io, __tmperr);
-		  if (!__tmperr)
-		    __tm->tm_mon = __mem - 1;
-		  break;
-		case 'M':
-		  // Minute [00, 59]. [tm_min]
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_min, 0, 59, 2,
-					 __io, __tmperr);
-		  break;
-		case 'n':
-		  if (__ctype.narrow(*__beg, 0) == '\n')
-		    ++__beg;
-		  else
-		    __tmperr |= ios_base::failbit;
-		  break;
-		case 'R':
-		  // Equivalent to (%H:%M).
-		  __cs = "%H:%M";
-		  __ctype.widen(__cs, __cs + 6, __wcs);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __tmperr, 
-						__tm, __wcs);
-		  break;
-		case 'S':
-		  // Seconds. [tm_sec]
-		  // [00, 60] in C99 (one leap-second), [00, 61] in C89.
-#ifdef _GLIBCXX_USE_C99
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 60, 2,
-#else
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 61, 2,
-#endif
-					 __io, __tmperr);
-		  break;
-		case 't':
-		  if (__ctype.narrow(*__beg, 0) == '\t')
-		    ++__beg;
-		  else
-		    __tmperr |= ios_base::failbit;
-		  break;
-		case 'T':
-		  // Equivalent to (%H:%M:%S).
-		  __cs = "%H:%M:%S";
-		  __ctype.widen(__cs, __cs + 9, __wcs);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __tmperr, 
-						__tm, __wcs);
-		  break;
-		case 'x':
-		  // Locale's date.
-		  const char_type*  __dates[2];
-		  __tp._M_date_formats(__dates);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __tmperr, 
-						__tm, __dates[0]);
-		  break;
-		case 'X':
-		  // Locale's time.
-		  const char_type*  __times[2];
-		  __tp._M_time_formats(__times);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __tmperr, 
-						__tm, __times[0]);
-		  break;
-		case 'y':
-		case 'C': // C99
-		  // Two digit year.
-		case 'Y':
-		  // Year [1900).
-		  // NB: We parse either two digits, implicitly years since
-		  // 1900, or 4 digits, full year.  In both cases we can 
-		  // reconstruct [tm_year].  See also libstdc++/26701.
-		  __beg = _M_extract_num(__beg, __end, __mem, 0, 9999, 4,
-					 __io, __tmperr);
-		  if (!__tmperr)
-		    __tm->tm_year = __mem < 0 ? __mem + 100 : __mem - 1900;
-		  break;
-		case 'Z':
-		  // Timezone info.
-		  if (__ctype.is(ctype_base::upper, *__beg))
-		    {
-		      int __tmp;
-		      __beg = _M_extract_name(__beg, __end, __tmp,
-				       __timepunct_cache<_CharT>::_S_timezones,
-					      14, __io, __tmperr);
-
-		      // GMT requires special effort.
-		      if (__beg != __end && !__tmperr && __tmp == 0
-			  && (*__beg == __ctype.widen('-')
-			      || *__beg == __ctype.widen('+')))
-			{
-			  __beg = _M_extract_num(__beg, __end, __tmp, 0, 23, 2,
-						 __io, __tmperr);
-			  __beg = _M_extract_num(__beg, __end, __tmp, 0, 59, 2,
-						 __io, __tmperr);
-			}
-		    }
-		  else
-		    __tmperr |= ios_base::failbit;
-		  break;
-		default:
-		  // Not recognized.
-		  __tmperr |= ios_base::failbit;
-		}
-	    }
-	  else
-	    {
-	      // Verify format and input match, extract and discard.
-	      if (__format[__i] == *__beg)
-		++__beg;
-	      else
-		__tmperr |= ios_base::failbit;
-	    }
-	}
-
-      if (__tmperr || __i != __len)
-	__err |= ios_base::failbit;
-  
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    _M_extract_num(iter_type __beg, iter_type __end, int& __member,
-		   int __min, int __max, size_t __len,
-		   ios_base& __io, ios_base::iostate& __err) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-      // As-is works for __len = 1, 2, 4, the values actually used.
-      int __mult = __len == 2 ? 10 : (__len == 4 ? 1000 : 1);
-
-      ++__min;
-      size_t __i = 0;
-      int __value = 0;
-      for (; __beg != __end && __i < __len; ++__beg, ++__i)
-	{
-	  const char __c = __ctype.narrow(*__beg, '*');
-	  if (__c >= '0' && __c <= '9')
-	    {
-	      __value = __value * 10 + (__c - '0');
-	      const int __valuec = __value * __mult;
-	      if (__valuec > __max || __valuec + __mult < __min)
-		break;
-	      __mult /= 10;
-	    }
-	  else
-	    break;
-	}
-      if (__i == __len)
-	__member = __value;
-      // Special encoding for do_get_year, 'y', and 'Y' above.
-      else if (__len == 4 && __i == 2)
-	__member = __value - 100;
-      else
-	__err |= ios_base::failbit;
-
-      return __beg;
-    }
-
-  // Assumptions:
-  // All elements in __names are unique.
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    _M_extract_name(iter_type __beg, iter_type __end, int& __member,
-		    const _CharT** __names, size_t __indexlen,
-		    ios_base& __io, ios_base::iostate& __err) const
-    {
-      typedef char_traits<_CharT>		__traits_type;
-      const locale& __loc = __io._M_getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-      int* __matches = static_cast<int*>(__builtin_alloca(sizeof(int)
-							  * __indexlen));
-      size_t __nmatches = 0;
-      size_t __pos = 0;
-      bool __testvalid = true;
-      const char_type* __name;
-
-      // Look for initial matches.
-      // NB: Some of the locale data is in the form of all lowercase
-      // names, and some is in the form of initially-capitalized
-      // names. Look for both.
-      if (__beg != __end)
-	{
-	  const char_type __c = *__beg;
-	  for (size_t __i1 = 0; __i1 < __indexlen; ++__i1)
-	    if (__c == __names[__i1][0]
-		|| __c == __ctype.toupper(__names[__i1][0]))
-	      __matches[__nmatches++] = __i1;
-	}
-
-      while (__nmatches > 1)
-	{
-	  // Find smallest matching string.
-	  size_t __minlen = __traits_type::length(__names[__matches[0]]);
-	  for (size_t __i2 = 1; __i2 < __nmatches; ++__i2)
-	    __minlen = std::min(__minlen,
-			      __traits_type::length(__names[__matches[__i2]]));
-	  ++__beg, ++__pos;
-	  if (__pos < __minlen && __beg != __end)
-	    for (size_t __i3 = 0; __i3 < __nmatches;)
-	      {
-		__name = __names[__matches[__i3]];
-		if (!(__name[__pos] == *__beg))
-		  __matches[__i3] = __matches[--__nmatches];
-		else
-		  ++__i3;
-	      }
-	  else
-	    break;
-	}
-
-      if (__nmatches == 1)
-	{
-	  // Make sure found name is completely extracted.
-	  ++__beg, ++__pos;
-	  __name = __names[__matches[0]];
-	  const size_t __len = __traits_type::length(__name);
-	  while (__pos < __len && __beg != __end && __name[__pos] == *__beg)
-	    ++__beg, ++__pos;
-
-	  if (__len == __pos)
-	    __member = __matches[0];
-	  else
-	    __testvalid = false;
-	}
-      else
-	__testvalid = false;
-      if (!__testvalid)
-	__err |= ios_base::failbit;
-
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    _M_extract_wday_or_month(iter_type __beg, iter_type __end, int& __member,
-			     const _CharT** __names, size_t __indexlen,
-			     ios_base& __io, ios_base::iostate& __err) const
-    {
-      typedef char_traits<_CharT>		__traits_type;
-      const locale& __loc = __io._M_getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-      int* __matches = static_cast<int*>(__builtin_alloca(2 * sizeof(int)
-							  * __indexlen));
-      size_t __nmatches = 0;
-      size_t* __matches_lengths = 0;
-      size_t __pos = 0;
-
-      if (__beg != __end)
-	{
-	  const char_type __c = *__beg;
-	  for (size_t __i = 0; __i < 2 * __indexlen; ++__i)
-	    if (__c == __names[__i][0]
-		|| __c == __ctype.toupper(__names[__i][0]))
-	      __matches[__nmatches++] = __i;
-	}
-
-      if (__nmatches)
-	{
-	  ++__beg, ++__pos;
-
-	  __matches_lengths
-	    = static_cast<size_t*>(__builtin_alloca(sizeof(size_t)
-						    * __nmatches));
-	  for (size_t __i = 0; __i < __nmatches; ++__i)
-	    __matches_lengths[__i]
-	      = __traits_type::length(__names[__matches[__i]]);
-	}
-
-      for (; __beg != __end; ++__beg, ++__pos)
-	{
-	  size_t __nskipped = 0;
-	  const char_type __c = *__beg;
-	  for (size_t __i = 0; __i < __nmatches;)
-	    {
-	      const char_type* __name = __names[__matches[__i]];
-	      if (__pos >= __matches_lengths[__i])
-		++__nskipped, ++__i;
-	      else if (!(__name[__pos] == __c))
-		{
-		  --__nmatches;
-		  __matches[__i] = __matches[__nmatches];
-		  __matches_lengths[__i] = __matches_lengths[__nmatches];
-		}
-	      else
-		++__i;
-	    }
-	  if (__nskipped == __nmatches)
-	    break;
-	}
-
-      if ((__nmatches == 1 && __matches_lengths[0] == __pos)
-	  || (__nmatches == 2 && (__matches_lengths[0] == __pos
-				  || __matches_lengths[1] == __pos)))
-	__member = (__matches[0] >= __indexlen
-		    ? __matches[0] - __indexlen : __matches[0]);
-      else
-	__err |= ios_base::failbit;
-
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get_time(iter_type __beg, iter_type __end, ios_base& __io,
-		ios_base::iostate& __err, tm* __tm) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const char_type*  __times[2];
-      __tp._M_time_formats(__times);
-      __beg = _M_extract_via_format(__beg, __end, __io, __err, 
-				    __tm, __times[0]);
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get_date(iter_type __beg, iter_type __end, ios_base& __io,
-		ios_base::iostate& __err, tm* __tm) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const char_type*  __dates[2];
-      __tp._M_date_formats(__dates);
-      __beg = _M_extract_via_format(__beg, __end, __io, __err, 
-				    __tm, __dates[0]);
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get_weekday(iter_type __beg, iter_type __end, ios_base& __io,
-		   ios_base::iostate& __err, tm* __tm) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-      const char_type* __days[14];
-      __tp._M_days_abbreviated(__days);
-      __tp._M_days(__days + 7);
-      int __tmpwday;
-      ios_base::iostate __tmperr = ios_base::goodbit;
-
-      __beg = _M_extract_wday_or_month(__beg, __end, __tmpwday, __days, 7,
-				       __io, __tmperr);
-      if (!__tmperr)
-	__tm->tm_wday = __tmpwday;
-      else
-	__err |= ios_base::failbit;
-
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-     }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get_monthname(iter_type __beg, iter_type __end,
-                     ios_base& __io, ios_base::iostate& __err, tm* __tm) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-      const char_type*  __months[24];
-      __tp._M_months_abbreviated(__months);
-      __tp._M_months(__months + 12);
-      int __tmpmon;
-      ios_base::iostate __tmperr = ios_base::goodbit;
-
-      __beg = _M_extract_wday_or_month(__beg, __end, __tmpmon, __months, 12,
-				       __io, __tmperr);
-      if (!__tmperr)
-	__tm->tm_mon = __tmpmon;
-      else
-	__err |= ios_base::failbit;
-
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get_year(iter_type __beg, iter_type __end, ios_base& __io,
-		ios_base::iostate& __err, tm* __tm) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-      int __tmpyear;
-      ios_base::iostate __tmperr = ios_base::goodbit;
-
-      __beg = _M_extract_num(__beg, __end, __tmpyear, 0, 9999, 4,
-			     __io, __tmperr);
-      if (!__tmperr)
-	__tm->tm_year = __tmpyear < 0 ? __tmpyear + 100 : __tmpyear - 1900;
-      else
-	__err |= ios_base::failbit;
-
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _CharT, typename _InIter>
-    inline
-    _InIter
-    time_get<_CharT, _InIter>::
-    get(iter_type __s, iter_type __end, ios_base& __io,
-        ios_base::iostate& __err, tm* __tm, const char_type* __fmt,
-        const char_type* __fmtend) const
-    {
-      const locale& __loc = __io._M_getloc();
-      ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc);
-      __err = ios_base::goodbit;
-      while (__fmt != __fmtend &&
-             __err == ios_base::goodbit)
-        {
-          if (__s == __end)
-            {
-              __err = ios_base::eofbit | ios_base::failbit;
-              break;
-            }
-          else if (__ctype.narrow(*__fmt, 0) == '%')
-            {
-              char __format;
-              char __mod = 0;
-              if (++__fmt == __fmtend)
-                {
-                  __err = ios_base::failbit;
-                  break;
-                }
-              const char __c = __ctype.narrow(*__fmt, 0);
-              if (__c != 'E' && __c != 'O')
-                __format = __c;
-              else if (++__fmt != __fmtend)
-                {
-                  __mod = __c;
-                  __format = __ctype.narrow(*__fmt, 0);
-                }
-              else
-                {
-                  __err = ios_base::failbit;
-                  break;
-                }
-              __s = this->do_get(__s, __end, __io, __err, __tm, __format,
-				 __mod);
-              ++__fmt;
-            }
-          else if (__ctype.is(ctype_base::space, *__fmt))
-            {
-              ++__fmt;
-              while (__fmt != __fmtend &&
-                     __ctype.is(ctype_base::space, *__fmt))
-                ++__fmt;
-
-              while (__s != __end &&
-                     __ctype.is(ctype_base::space, *__s))
-                ++__s;
-            }
-          // TODO real case-insensitive comparison
-          else if (__ctype.tolower(*__s) == __ctype.tolower(*__fmt) ||
-                   __ctype.toupper(*__s) == __ctype.toupper(*__fmt))
-            {
-              ++__s;
-              ++__fmt;
-            }
-          else
-            {
-              __err = ios_base::failbit;
-              break;
-            }
-        }
-      return __s;
-    }
-
-  template<typename _CharT, typename _InIter>
-    inline
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, tm* __tm,
-           char __format, char __mod) const
-    {
-      const locale& __loc = __io._M_getloc();
-      ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc);
-      __err = ios_base::goodbit;
-
-      char_type __fmt[4];
-      __fmt[0] = __ctype.widen('%');
-      if (!__mod)
-        {
-          __fmt[1] = __format;
-          __fmt[2] = char_type();
-        }
-      else
-        {
-          __fmt[1] = __mod;
-          __fmt[2] = __format;
-          __fmt[3] = char_type();
-        }
-
-      __beg = _M_extract_via_format(__beg, __end, __io, __err, __tm, __fmt);
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-#endif // __cplusplus >= 201103L
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    time_put<_CharT, _OutIter>::
-    put(iter_type __s, ios_base& __io, char_type __fill, const tm* __tm,
-	const _CharT* __beg, const _CharT* __end) const
-    {
-      const locale& __loc = __io._M_getloc();
-      ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc);
-      for (; __beg != __end; ++__beg)
-	if (__ctype.narrow(*__beg, 0) != '%')
-	  {
-	    *__s = *__beg;
-	    ++__s;
-	  }
-	else if (++__beg != __end)
-	  {
-	    char __format;
-	    char __mod = 0;
-	    const char __c = __ctype.narrow(*__beg, 0);
-	    if (__c != 'E' && __c != 'O')
-	      __format = __c;
-	    else if (++__beg != __end)
-	      {
-		__mod = __c;
-		__format = __ctype.narrow(*__beg, 0);
-	      }
-	    else
-	      break;
-	    __s = this->do_put(__s, __io, __fill, __tm, __format, __mod);
-	  }
-	else
-	  break;
-      return __s;
-    }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    time_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type, const tm* __tm,
-	   char __format, char __mod) const
-    {
-      const locale& __loc = __io._M_getloc();
-      ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc);
-      __timepunct<_CharT> const& __tp = use_facet<__timepunct<_CharT> >(__loc);
-
-      // NB: This size is arbitrary. Should this be a data member,
-      // initialized at construction?
-      const size_t __maxlen = 128;
-      char_type __res[__maxlen];
-
-      // NB: In IEE 1003.1-200x, and perhaps other locale models, it
-      // is possible that the format character will be longer than one
-      // character. Possibilities include 'E' or 'O' followed by a
-      // format character: if __mod is not the default argument, assume
-      // it's a valid modifier.
-      char_type __fmt[4];
-      __fmt[0] = __ctype.widen('%');
-      if (!__mod)
-	{
-	  __fmt[1] = __format;
-	  __fmt[2] = char_type();
-	}
-      else
-	{
-	  __fmt[1] = __mod;
-	  __fmt[2] = __format;
-	  __fmt[3] = char_type();
-	}
-
-      __tp._M_put(__res, __maxlen, __fmt, __tm);
-
-      // Write resulting, fully-formatted string to output iterator.
-      return std::__write(__s, __res, char_traits<char_type>::length(__res));
-    }
-
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class moneypunct<char, false>;
-  extern template class moneypunct<char, true>;
-  extern template class moneypunct_byname<char, false>;
-  extern template class moneypunct_byname<char, true>;
-  extern template class _GLIBCXX_NAMESPACE_LDBL_OR_CXX11 money_get<char>;
-  extern template class _GLIBCXX_NAMESPACE_LDBL_OR_CXX11 money_put<char>;
-  extern template class __timepunct<char>;
-  extern template class time_put<char>;
-  extern template class time_put_byname<char>;
-  extern template class time_get<char>;
-  extern template class time_get_byname<char>;
-  extern template class messages<char>;
-  extern template class messages_byname<char>;
-
-  extern template
-    const moneypunct<char, true>&
-    use_facet<moneypunct<char, true> >(const locale&);
-
-  extern template
-    const moneypunct<char, false>&
-    use_facet<moneypunct<char, false> >(const locale&);
-
-  extern template
-    const money_put<char>&
-    use_facet<money_put<char> >(const locale&);
-
-  extern template
-    const money_get<char>&
-    use_facet<money_get<char> >(const locale&);
-
-  extern template
-    const __timepunct<char>&
-    use_facet<__timepunct<char> >(const locale&);
-
-  extern template
-    const time_put<char>&
-    use_facet<time_put<char> >(const locale&);
-
-  extern template
-    const time_get<char>&
-    use_facet<time_get<char> >(const locale&);
-
-  extern template
-    const messages<char>&
-    use_facet<messages<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<moneypunct<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<money_put<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<money_get<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<__timepunct<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<time_put<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<time_get<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<messages<char> >(const locale&);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class moneypunct<wchar_t, false>;
-  extern template class moneypunct<wchar_t, true>;
-  extern template class moneypunct_byname<wchar_t, false>;
-  extern template class moneypunct_byname<wchar_t, true>;
-  extern template class _GLIBCXX_NAMESPACE_LDBL_OR_CXX11 money_get<wchar_t>;
-  extern template class _GLIBCXX_NAMESPACE_LDBL_OR_CXX11 money_put<wchar_t>;
-  extern template class __timepunct<wchar_t>;
-  extern template class time_put<wchar_t>;
-  extern template class time_put_byname<wchar_t>;
-  extern template class time_get<wchar_t>;
-  extern template class time_get_byname<wchar_t>;
-  extern template class messages<wchar_t>;
-  extern template class messages_byname<wchar_t>;
-
-  extern template
-    const moneypunct<wchar_t, true>&
-    use_facet<moneypunct<wchar_t, true> >(const locale&);
-
-  extern template
-    const moneypunct<wchar_t, false>&
-    use_facet<moneypunct<wchar_t, false> >(const locale&);
-
-  extern template
-    const money_put<wchar_t>&
-    use_facet<money_put<wchar_t> >(const locale&);
-
-  extern template
-    const money_get<wchar_t>&
-    use_facet<money_get<wchar_t> >(const locale&);
-
-  extern template
-    const __timepunct<wchar_t>&
-    use_facet<__timepunct<wchar_t> >(const locale&);
-
-  extern template
-    const time_put<wchar_t>&
-    use_facet<time_put<wchar_t> >(const locale&);
-
-  extern template
-    const time_get<wchar_t>&
-    use_facet<time_get<wchar_t> >(const locale&);
-
-  extern template
-    const messages<wchar_t>&
-    use_facet<messages<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<moneypunct<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<money_put<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<money_get<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<__timepunct<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<time_put<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<time_get<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<messages<wchar_t> >(const locale&);
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/localefwd.h b/openflow/usr/include/c++/5/bits/localefwd.h
deleted file mode 100644
index e9d795f..0000000
--- a/openflow/usr/include/c++/5/bits/localefwd.h
+++ /dev/null
@@ -1,206 +0,0 @@
-// <locale> Forward declarations -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/localefwd.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{locale}
- */
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-#ifndef _LOCALE_FWD_H
-#define _LOCALE_FWD_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/c++locale.h>  // Defines __c_locale, config-specific include
-#include <iosfwd>            // For ostreambuf_iterator, istreambuf_iterator
-#include <cctype>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /** 
-   *  @defgroup locales Locales
-   *
-   *  Classes and functions for internationalization and localization.
-   */
-
-  // 22.1.1 Locale
-  class locale;
-
-  template<typename _Facet>
-    bool
-    has_facet(const locale&) throw();
-
-  template<typename _Facet>
-    const _Facet&
-    use_facet(const locale&);
-
-  // 22.1.3 Convenience interfaces
-  template<typename _CharT>
-    bool
-    isspace(_CharT, const locale&);
-
-  template<typename _CharT>
-    bool
-    isprint(_CharT, const locale&);
-
-  template<typename _CharT>
-    bool
-    iscntrl(_CharT, const locale&);
-
-  template<typename _CharT>
-    bool
-    isupper(_CharT, const locale&);
-
-  template<typename _CharT>
-    bool
-    islower(_CharT, const locale&);
-
-  template<typename _CharT>
-    bool
-    isalpha(_CharT, const locale&);
-
-  template<typename _CharT>
-    bool
-    isdigit(_CharT, const locale&);
-
-  template<typename _CharT>
-    bool
-    ispunct(_CharT, const locale&);
-
-  template<typename _CharT>
-    bool
-    isxdigit(_CharT, const locale&);
-
-  template<typename _CharT>
-    bool
-    isalnum(_CharT, const locale&);
-
-  template<typename _CharT>
-    bool
-    isgraph(_CharT, const locale&);
-
-#if __cplusplus >= 201103L
-  template<typename _CharT>
-    bool
-    isblank(_CharT, const locale&);
-#endif
-
-  template<typename _CharT>
-    _CharT
-    toupper(_CharT, const locale&);
-
-  template<typename _CharT>
-    _CharT
-    tolower(_CharT, const locale&);
-
-  // 22.2.1 and 22.2.1.3 ctype
-  class ctype_base;
-  template<typename _CharT>
-    class ctype;
-  template<> class ctype<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<> class ctype<wchar_t>;
-#endif
-  template<typename _CharT>
-    class ctype_byname;
-  // NB: Specialized for char and wchar_t in locale_facets.h.
-
-  class codecvt_base;
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    class codecvt;
-  template<> class codecvt<char, char, mbstate_t>;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<> class codecvt<wchar_t, char, mbstate_t>;
-#endif
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    class codecvt_byname;
-
-  // 22.2.2 and 22.2.3 numeric
-_GLIBCXX_BEGIN_NAMESPACE_LDBL
-  template<typename _CharT, typename _InIter = istreambuf_iterator<_CharT> >
-    class num_get;
-  template<typename _CharT, typename _OutIter = ostreambuf_iterator<_CharT> >
-    class num_put;
-_GLIBCXX_END_NAMESPACE_LDBL
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-  template<typename _CharT> class numpunct;
-  template<typename _CharT> class numpunct_byname;
-_GLIBCXX_END_NAMESPACE_CXX11
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-  // 22.2.4 collation
-  template<typename _CharT>
-    class collate;
-  template<typename _CharT>
-    class collate_byname;
-_GLIBCXX_END_NAMESPACE_CXX11
-
-  // 22.2.5 date and time
-  class time_base;
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-  template<typename _CharT, typename _InIter =  istreambuf_iterator<_CharT> >
-    class time_get;
-  template<typename _CharT, typename _InIter =  istreambuf_iterator<_CharT> >
-    class time_get_byname;
-_GLIBCXX_END_NAMESPACE_CXX11
-  template<typename _CharT, typename _OutIter = ostreambuf_iterator<_CharT> >
-    class time_put;
-  template<typename _CharT, typename _OutIter = ostreambuf_iterator<_CharT> >
-    class time_put_byname;
-
-  // 22.2.6 money
-  class money_base;
-_GLIBCXX_BEGIN_NAMESPACE_LDBL_OR_CXX11
-  template<typename _CharT, typename _InIter =  istreambuf_iterator<_CharT> >
-    class money_get;
-  template<typename _CharT, typename _OutIter = ostreambuf_iterator<_CharT> >
-    class money_put;
-_GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-  template<typename _CharT, bool _Intl = false>
-    class moneypunct;
-  template<typename _CharT, bool _Intl = false>
-    class moneypunct_byname;
-_GLIBCXX_END_NAMESPACE_CXX11
-
-  // 22.2.7 message retrieval
-  class messages_base;
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-  template<typename _CharT>
-    class messages;
-  template<typename _CharT>
-    class messages_byname;
-_GLIBCXX_END_NAMESPACE_CXX11
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/mask_array.h b/openflow/usr/include/c++/5/bits/mask_array.h
deleted file mode 100644
index 5078f17..0000000
--- a/openflow/usr/include/c++/5/bits/mask_array.h
+++ /dev/null
@@ -1,208 +0,0 @@
-// The template and inlines for the -*- C++ -*- mask_array class.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/mask_array.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{valarray}
- */
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-#ifndef _MASK_ARRAY_H
-#define _MASK_ARRAY_H 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup numeric_arrays
-   * @{
-   */
-
-  /**
-   *  @brief  Reference to selected subset of an array.
-   *
-   *  A mask_array is a reference to the actual elements of an array specified
-   *  by a bitmask in the form of an array of bool.  The way to get a
-   *  mask_array is to call operator[](valarray<bool>) on a valarray.  The
-   *  returned mask_array then permits carrying operations out on the
-   *  referenced subset of elements in the original valarray.
-   *
-   *  For example, if a mask_array is obtained using the array (false, true,
-   *  false, true) as an argument, the mask array has two elements referring
-   *  to array[1] and array[3] in the underlying array.
-   *
-   *  @param  Tp  Element type.
-   */
-  template <class _Tp>
-    class mask_array
-    {
-    public:
-      typedef _Tp value_type;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 253. valarray helper functions are almost entirely useless
-
-      ///  Copy constructor.  Both slices refer to the same underlying array.
-      mask_array (const mask_array&);
-      
-      ///  Assignment operator.  Assigns elements to corresponding elements
-      ///  of @a a.
-      mask_array& operator=(const mask_array&);
-
-      void operator=(const valarray<_Tp>&) const;
-      ///  Multiply slice elements by corresponding elements of @a v.
-      void operator*=(const valarray<_Tp>&) const;
-      ///  Divide slice elements by corresponding elements of @a v.
-      void operator/=(const valarray<_Tp>&) const;
-      ///  Modulo slice elements by corresponding elements of @a v.
-      void operator%=(const valarray<_Tp>&) const;
-      ///  Add corresponding elements of @a v to slice elements.
-      void operator+=(const valarray<_Tp>&) const;
-      ///  Subtract corresponding elements of @a v from slice elements.
-      void operator-=(const valarray<_Tp>&) const;
-      ///  Logical xor slice elements with corresponding elements of @a v.
-      void operator^=(const valarray<_Tp>&) const;
-      ///  Logical and slice elements with corresponding elements of @a v.
-      void operator&=(const valarray<_Tp>&) const;
-      ///  Logical or slice elements with corresponding elements of @a v.
-      void operator|=(const valarray<_Tp>&) const;
-      ///  Left shift slice elements by corresponding elements of @a v.
-      void operator<<=(const valarray<_Tp>&) const;
-      ///  Right shift slice elements by corresponding elements of @a v.
-      void operator>>=(const valarray<_Tp>&) const;
-      ///  Assign all slice elements to @a t.
-      void operator=(const _Tp&) const;
-
-        //        ~mask_array ();
-
-      template<class _Dom>
-        void operator=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator*=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator/=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator%=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator+=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator-=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator^=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator&=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator|=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator<<=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator>>=(const _Expr<_Dom,_Tp>&) const;
-
-    private:
-      mask_array(_Array<_Tp>, size_t, _Array<bool>);
-      friend class valarray<_Tp>;
-
-      const size_t       _M_sz;
-      const _Array<bool> _M_mask;
-      const _Array<_Tp>  _M_array;
-
-      // not implemented
-      mask_array();
-    };
-
-  template<typename _Tp>
-    inline mask_array<_Tp>::mask_array(const mask_array<_Tp>& a)
-    : _M_sz(a._M_sz), _M_mask(a._M_mask), _M_array(a._M_array) {}
-
-  template<typename _Tp>
-    inline
-    mask_array<_Tp>::mask_array(_Array<_Tp> __a, size_t __s, _Array<bool> __m)
-    : _M_sz(__s), _M_mask(__m), _M_array(__a) {}
-
-  template<typename _Tp>
-    inline mask_array<_Tp>&
-    mask_array<_Tp>::operator=(const mask_array<_Tp>& __a)
-    {
-      std::__valarray_copy(__a._M_array, __a._M_mask,
-			   _M_sz, _M_array, _M_mask);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline void
-    mask_array<_Tp>::operator=(const _Tp& __t) const
-    { std::__valarray_fill(_M_array, _M_sz, _M_mask, __t); }
-
-  template<typename _Tp>
-    inline void
-    mask_array<_Tp>::operator=(const valarray<_Tp>& __v) const
-    { std::__valarray_copy(_Array<_Tp>(__v), __v.size(), _M_array, _M_mask); }
-
-  template<typename _Tp>
-    template<class _Ex>
-      inline void
-      mask_array<_Tp>::operator=(const _Expr<_Ex, _Tp>& __e) const
-      { std::__valarray_copy(__e, __e.size(), _M_array, _M_mask); }
-
-#undef _DEFINE_VALARRAY_OPERATOR
-#define _DEFINE_VALARRAY_OPERATOR(_Op, _Name)				\
-  template<typename _Tp>						\
-    inline void								\
-    mask_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const	\
-    {									\
-      _Array_augmented_##_Name(_M_array, _M_mask,			\
-			       _Array<_Tp>(__v), __v.size());		\
-    }									\
-									\
-  template<typename _Tp>                                                \
-    template<class _Dom>			                        \
-      inline void							\
-      mask_array<_Tp>::operator _Op##=(const _Expr<_Dom, _Tp>& __e) const\
-      {									\
-	_Array_augmented_##_Name(_M_array, _M_mask, __e, __e.size());   \
-      }
-
-_DEFINE_VALARRAY_OPERATOR(*, __multiplies)
-_DEFINE_VALARRAY_OPERATOR(/, __divides)
-_DEFINE_VALARRAY_OPERATOR(%, __modulus)
-_DEFINE_VALARRAY_OPERATOR(+, __plus)
-_DEFINE_VALARRAY_OPERATOR(-, __minus)
-_DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
-_DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
-_DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
-_DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
-_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_OPERATOR
-
-  // @} group numeric_arrays
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _MASK_ARRAY_H */
diff --git a/openflow/usr/include/c++/5/bits/memoryfwd.h b/openflow/usr/include/c++/5/bits/memoryfwd.h
deleted file mode 100644
index bbee8d9..0000000
--- a/openflow/usr/include/c++/5/bits/memoryfwd.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// <memory> Forward declarations -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996-1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/memoryfwd.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _MEMORYFWD_H
-#define _MEMORYFWD_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup allocators Allocators
-   * @ingroup memory
-   *
-   * Classes encapsulating memory operations.
-   *
-   * @{
-   */
-
-  template<typename>
-    class allocator;
-
-  template<>
-    class allocator<void>;
-
-  /// Declare uses_allocator so it can be specialized in \<queue\> etc.
-  template<typename, typename>
-    struct uses_allocator;
-
-  /// @} group memory
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/move.h b/openflow/usr/include/c++/5/bits/move.h
deleted file mode 100644
index 1dfd667..0000000
--- a/openflow/usr/include/c++/5/bits/move.h
+++ /dev/null
@@ -1,208 +0,0 @@
-// Move, forward and identity for C++0x + swap -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/move.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{utility}
- */
-
-#ifndef _MOVE_H
-#define _MOVE_H 1
-
-#include <bits/c++config.h>
-#include <bits/concept_check.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Used, in C++03 mode too, by allocators, etc.
-  /**
-   *  @brief Same as C++11 std::addressof
-   *  @ingroup utilities
-   */
-  template<typename _Tp>
-    inline _Tp*
-    __addressof(_Tp& __r) _GLIBCXX_NOEXCEPT
-    {
-      return reinterpret_cast<_Tp*>
-	(&const_cast<char&>(reinterpret_cast<const volatile char&>(__r)));
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if __cplusplus >= 201103L
-#include <type_traits> // Brings in std::declval too.
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @addtogroup utilities
-   *  @{
-   */
-
-  /**
-   *  @brief  Forward an lvalue.
-   *  @return The parameter cast to the specified type.
-   *
-   *  This function is used to implement "perfect forwarding".
-   */
-  template<typename _Tp>
-    constexpr _Tp&&
-    forward(typename std::remove_reference<_Tp>::type& __t) noexcept
-    { return static_cast<_Tp&&>(__t); }
-
-  /**
-   *  @brief  Forward an rvalue.
-   *  @return The parameter cast to the specified type.
-   *
-   *  This function is used to implement "perfect forwarding".
-   */
-  template<typename _Tp>
-    constexpr _Tp&&
-    forward(typename std::remove_reference<_Tp>::type&& __t) noexcept
-    {
-      static_assert(!std::is_lvalue_reference<_Tp>::value, "template argument"
-		    " substituting _Tp is an lvalue reference type");
-      return static_cast<_Tp&&>(__t);
-    }
-
-  /**
-   *  @brief  Convert a value to an rvalue.
-   *  @param  __t  A thing of arbitrary type.
-   *  @return The parameter cast to an rvalue-reference to allow moving it.
-  */
-  template<typename _Tp>
-    constexpr typename std::remove_reference<_Tp>::type&&
-    move(_Tp&& __t) noexcept
-    { return static_cast<typename std::remove_reference<_Tp>::type&&>(__t); }
-
-
-  template<typename _Tp>
-    struct __move_if_noexcept_cond
-    : public __and_<__not_<is_nothrow_move_constructible<_Tp>>,
-                    is_copy_constructible<_Tp>>::type { };
-
-  /**
-   *  @brief  Conditionally convert a value to an rvalue.
-   *  @param  __x  A thing of arbitrary type.
-   *  @return The parameter, possibly cast to an rvalue-reference.
-   *
-   *  Same as std::move unless the type's move constructor could throw and the
-   *  type is copyable, in which case an lvalue-reference is returned instead.
-   */
-  template<typename _Tp>
-    constexpr typename
-    conditional<__move_if_noexcept_cond<_Tp>::value, const _Tp&, _Tp&&>::type
-    move_if_noexcept(_Tp& __x) noexcept
-    { return std::move(__x); }
-
-  // declval, from type_traits.
-
-  /**
-   *  @brief Returns the actual address of the object or function
-   *         referenced by r, even in the presence of an overloaded
-   *         operator&.
-   *  @param  __r  Reference to an object or function.
-   *  @return   The actual address.
-  */
-  template<typename _Tp>
-    inline _Tp*
-    addressof(_Tp& __r) noexcept
-    { return std::__addressof(__r); }
-
-  // C++11 version of std::exchange for internal use.
-  template <typename _Tp, typename _Up = _Tp>
-    inline _Tp
-    __exchange(_Tp& __obj, _Up&& __new_val)
-    {
-      _Tp __old_val = std::move(__obj);
-      __obj = std::forward<_Up>(__new_val);
-      return __old_val;
-    }
-
-  /// @} group utilities
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#define _GLIBCXX_MOVE(__val) std::move(__val)
-#define _GLIBCXX_FORWARD(_Tp, __val) std::forward<_Tp>(__val)
-#else
-#define _GLIBCXX_MOVE(__val) (__val)
-#define _GLIBCXX_FORWARD(_Tp, __val) (__val)
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @addtogroup utilities
-   *  @{
-   */
-
-  /**
-   *  @brief Swaps two values.
-   *  @param  __a  A thing of arbitrary type.
-   *  @param  __b  Another thing of arbitrary type.
-   *  @return   Nothing.
-  */
-  template<typename _Tp>
-    inline void
-    swap(_Tp& __a, _Tp& __b)
-#if __cplusplus >= 201103L
-    noexcept(__and_<is_nothrow_move_constructible<_Tp>,
-	            is_nothrow_move_assignable<_Tp>>::value)
-#endif
-    {
-      // concept requirements
-      __glibcxx_function_requires(_SGIAssignableConcept<_Tp>)
-
-      _Tp __tmp = _GLIBCXX_MOVE(__a);
-      __a = _GLIBCXX_MOVE(__b);
-      __b = _GLIBCXX_MOVE(__tmp);
-    }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // DR 809. std::swap should be overloaded for array types.
-  /// Swap the contents of two arrays.
-  template<typename _Tp, size_t _Nm>
-    inline void
-    swap(_Tp (&__a)[_Nm], _Tp (&__b)[_Nm])
-#if __cplusplus >= 201103L
-    noexcept(noexcept(swap(*__a, *__b)))
-#endif
-    {
-      for (size_t __n = 0; __n < _Nm; ++__n)
-	swap(__a[__n], __b[__n]);
-    }
-
-  /// @} group utilities
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _MOVE_H */
diff --git a/openflow/usr/include/c++/5/bits/nested_exception.h b/openflow/usr/include/c++/5/bits/nested_exception.h
deleted file mode 100644
index a716f75..0000000
--- a/openflow/usr/include/c++/5/bits/nested_exception.h
+++ /dev/null
@@ -1,173 +0,0 @@
-// Nested Exception support header (nested_exception class) for -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/nested_exception.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{exception}
- */
-
-#ifndef _GLIBCXX_NESTED_EXCEPTION_H
-#define _GLIBCXX_NESTED_EXCEPTION_H 1
-
-#pragma GCC visibility push(default)
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <bits/c++config.h>
-
-#if ATOMIC_INT_LOCK_FREE < 2
-#  error This platform does not support exception propagation.
-#endif
-
-extern "C++" {
-
-namespace std
-{
-  /**
-   * @addtogroup exceptions
-   * @{
-   */
-
-  /// Exception class with exception_ptr data member.
-  class nested_exception
-  {
-    exception_ptr _M_ptr;
-
-  public:
-    nested_exception() noexcept : _M_ptr(current_exception()) { }
-
-    nested_exception(const nested_exception&) noexcept = default;
-
-    nested_exception& operator=(const nested_exception&) noexcept = default;
-
-    virtual ~nested_exception() noexcept;
-
-    [[noreturn]]
-    void
-    rethrow_nested() const
-    {
-      if (_M_ptr)
-	rethrow_exception(_M_ptr);
-      std::terminate();
-    }
-
-    exception_ptr
-    nested_ptr() const noexcept
-    { return _M_ptr; }
-  };
-
-  template<typename _Except>
-    struct _Nested_exception : public _Except, public nested_exception
-    {
-      explicit _Nested_exception(const _Except& __ex)
-      : _Except(__ex)
-      { }
-
-      explicit _Nested_exception(_Except&& __ex)
-      : _Except(static_cast<_Except&&>(__ex))
-      { }
-    };
-
-  template<typename _Tp,
-	   bool __with_nested = !__is_base_of(nested_exception, _Tp)>
-    struct _Throw_with_nested_impl
-    {
-      template<typename _Up>
-	static void _S_throw(_Up&& __t)
-	{ throw _Nested_exception<_Tp>{static_cast<_Up&&>(__t)}; }
-    };
-
-  template<typename _Tp>
-    struct _Throw_with_nested_impl<_Tp, false>
-    {
-      template<typename _Up>
-	static void _S_throw(_Up&& __t)
-	{ throw static_cast<_Up&&>(__t); }
-    };
-
-  template<typename _Tp, bool = __is_class(_Tp) && !__is_final(_Tp)>
-    struct _Throw_with_nested_helper : _Throw_with_nested_impl<_Tp>
-    { };
-
-  template<typename _Tp>
-    struct _Throw_with_nested_helper<_Tp, false>
-    : _Throw_with_nested_impl<_Tp, false>
-    { };
-
-  template<typename _Tp>
-    struct _Throw_with_nested_helper<_Tp&, false>
-    : _Throw_with_nested_helper<_Tp>
-    { };
-
-  template<typename _Tp>
-    struct _Throw_with_nested_helper<_Tp&&, false>
-    : _Throw_with_nested_helper<_Tp>
-    { };
-
-  /// If @p __t is derived from nested_exception, throws @p __t.
-  /// Else, throws an implementation-defined object derived from both.
-  template<typename _Tp>
-    [[noreturn]]
-    inline void
-    throw_with_nested(_Tp&& __t)
-    {
-      _Throw_with_nested_helper<_Tp>::_S_throw(static_cast<_Tp&&>(__t));
-    }
-
-  template<typename _Tp, bool = __is_polymorphic(_Tp)>
-    struct _Rethrow_if_nested_impl
-    {
-      static void _S_rethrow(const _Tp& __t)
-      {
-	if (auto __tp = dynamic_cast<const nested_exception*>(&__t))
-	  __tp->rethrow_nested();
-      }
-    };
-
-  template<typename _Tp>
-    struct _Rethrow_if_nested_impl<_Tp, false>
-    {
-      static void _S_rethrow(const _Tp&) { }
-    };
-
-  /// If @p __ex is derived from nested_exception, @p __ex.rethrow_nested().
-  template<typename _Ex>
-    inline void
-    rethrow_if_nested(const _Ex& __ex)
-    {
-      _Rethrow_if_nested_impl<_Ex>::_S_rethrow(__ex);
-    }
-
-  // @} group exceptions
-} // namespace std
-
-} // extern "C++"
-
-#endif // C++11
-
-#pragma GCC visibility pop
-
-#endif // _GLIBCXX_NESTED_EXCEPTION_H
diff --git a/openflow/usr/include/c++/5/bits/ostream.tcc b/openflow/usr/include/c++/5/bits/ostream.tcc
deleted file mode 100644
index 50e7619..0000000
--- a/openflow/usr/include/c++/5/bits/ostream.tcc
+++ /dev/null
@@ -1,407 +0,0 @@
-// ostream classes -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/ostream.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ostream}
- */
-
-//
-// ISO C++ 14882: 27.6.2  Output streams
-//
-
-#ifndef _OSTREAM_TCC
-#define _OSTREAM_TCC 1
-
-#pragma GCC system_header
-
-#include <bits/cxxabi_forced.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>::sentry::
-    sentry(basic_ostream<_CharT, _Traits>& __os)
-    : _M_ok(false), _M_os(__os)
-    {
-      // XXX MT
-      if (__os.tie() && __os.good())
-	__os.tie()->flush();
-
-      if (__os.good())
-	_M_ok = true;
-      else
-	__os.setstate(ios_base::failbit);
-    }
-
-  template<typename _CharT, typename _Traits>
-    template<typename _ValueT>
-      basic_ostream<_CharT, _Traits>&
-      basic_ostream<_CharT, _Traits>::
-      _M_insert(_ValueT __v)
-      {
-	sentry __cerb(*this);
-	if (__cerb)
-	  {
-	    ios_base::iostate __err = ios_base::goodbit;
-	    __try
-	      {
-		const __num_put_type& __np = __check_facet(this->_M_num_put);
-		if (__np.put(*this, *this, this->fill(), __v).failed())
-		  __err |= ios_base::badbit;
-	      }
-	    __catch(__cxxabiv1::__forced_unwind&)
-	      {
-		this->_M_setstate(ios_base::badbit);		
-		__throw_exception_again;
-	      }
-	    __catch(...)
-	      { this->_M_setstate(ios_base::badbit); }
-	    if (__err)
-	      this->setstate(__err);
-	  }
-	return *this;
-      }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(short __n)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 117. basic_ostream uses nonexistent num_put member functions.
-      const ios_base::fmtflags __fmt = this->flags() & ios_base::basefield;
-      if (__fmt == ios_base::oct || __fmt == ios_base::hex)
-	return _M_insert(static_cast<long>(static_cast<unsigned short>(__n)));
-      else
-	return _M_insert(static_cast<long>(__n));
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(int __n)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 117. basic_ostream uses nonexistent num_put member functions.
-      const ios_base::fmtflags __fmt = this->flags() & ios_base::basefield;
-      if (__fmt == ios_base::oct || __fmt == ios_base::hex)
-	return _M_insert(static_cast<long>(static_cast<unsigned int>(__n)));
-      else
-	return _M_insert(static_cast<long>(__n));
-    }
-  
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(__streambuf_type* __sbin)
-    {
-      ios_base::iostate __err = ios_base::goodbit;
-      sentry __cerb(*this);
-      if (__cerb && __sbin)
-	{
-	  __try
-	    {
-	      if (!__copy_streambufs(__sbin, this->rdbuf()))
-		__err |= ios_base::failbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);		
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::failbit); }
-	}
-      else if (!__sbin)
-	__err |= ios_base::badbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    put(char_type __c)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 60. What is a formatted input function?
-      // basic_ostream::put(char_type) is an unformatted output function.
-      // DR 63. Exception-handling policy for unformatted output.
-      // Unformatted output functions should catch exceptions thrown
-      // from streambuf members.
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      const int_type __put = this->rdbuf()->sputc(__c);
-	      if (traits_type::eq_int_type(__put, traits_type::eof()))
-		__err |= ios_base::badbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);		
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    write(const _CharT* __s, streamsize __n)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 60. What is a formatted input function?
-      // basic_ostream::write(const char_type*, streamsize) is an
-      // unformatted output function.
-      // DR 63. Exception-handling policy for unformatted output.
-      // Unformatted output functions should catch exceptions thrown
-      // from streambuf members.
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  __try
-	    { _M_write(__s, __n); }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      this->_M_setstate(ios_base::badbit);		
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    flush()
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 60. What is a formatted input function?
-      // basic_ostream::flush() is *not* an unformatted output function.
-      ios_base::iostate __err = ios_base::goodbit;
-      __try
-	{
-	  if (this->rdbuf() && this->rdbuf()->pubsync() == -1)
-	    __err |= ios_base::badbit;
-	}
-      __catch(__cxxabiv1::__forced_unwind&)
-	{
-	  this->_M_setstate(ios_base::badbit);		
-	  __throw_exception_again;
-	}
-      __catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_ostream<_CharT, _Traits>::pos_type
-    basic_ostream<_CharT, _Traits>::
-    tellp()
-    {
-      pos_type __ret = pos_type(-1);
-      __try
-	{
-	  if (!this->fail())
-	    __ret = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::out);
-	}
-      __catch(__cxxabiv1::__forced_unwind&)
-	{
-	  this->_M_setstate(ios_base::badbit);		
-	  __throw_exception_again;
-	}
-      __catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    seekp(pos_type __pos)
-    {
-      ios_base::iostate __err = ios_base::goodbit;
-      __try
-	{
-	  if (!this->fail())
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 136.  seekp, seekg setting wrong streams?
-	      const pos_type __p = this->rdbuf()->pubseekpos(__pos,
-							     ios_base::out);
-
-	      // 129. Need error indication from seekp() and seekg()
-	      if (__p == pos_type(off_type(-1)))
-		__err |= ios_base::failbit;
-	    }
-	}
-      __catch(__cxxabiv1::__forced_unwind&)
-	{
-	  this->_M_setstate(ios_base::badbit);		
-	  __throw_exception_again;
-	}
-      __catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    seekp(off_type __off, ios_base::seekdir __dir)
-    {
-      ios_base::iostate __err = ios_base::goodbit;
-      __try
-	{
-	  if (!this->fail())
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 136.  seekp, seekg setting wrong streams?
-	      const pos_type __p = this->rdbuf()->pubseekoff(__off, __dir,
-							     ios_base::out);
-
-	      // 129. Need error indication from seekp() and seekg()
-	      if (__p == pos_type(off_type(-1)))
-		__err |= ios_base::failbit;
-	    }
-	}
-      __catch(__cxxabiv1::__forced_unwind&)
-	{
-	  this->_M_setstate(ios_base::badbit);		
-	  __throw_exception_again;
-	}
-      __catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, const char* __s)
-    {
-      if (!__s)
-	__out.setstate(ios_base::badbit);
-      else
-	{
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 167.  Improper use of traits_type::length()
-	  const size_t __clen = char_traits<char>::length(__s);
-	  __try
-	    {
-	      struct __ptr_guard
-	      {
-		_CharT *__p;
-		__ptr_guard (_CharT *__ip): __p(__ip) { }
-		~__ptr_guard() { delete[] __p; }
-		_CharT* __get() { return __p; }
-	      } __pg (new _CharT[__clen]);
-
-	      _CharT *__ws = __pg.__get();
-	      for (size_t  __i = 0; __i < __clen; ++__i)
-		__ws[__i] = __out.widen(__s[__i]);
-	      __ostream_insert(__out, __ws, __clen);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __out._M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { __out._M_setstate(ios_base::badbit); }
-	}
-      return __out;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_ostream<char>;
-  extern template ostream& endl(ostream&);
-  extern template ostream& ends(ostream&);
-  extern template ostream& flush(ostream&);
-  extern template ostream& operator<<(ostream&, char);
-  extern template ostream& operator<<(ostream&, unsigned char);
-  extern template ostream& operator<<(ostream&, signed char);
-  extern template ostream& operator<<(ostream&, const char*);
-  extern template ostream& operator<<(ostream&, const unsigned char*);
-  extern template ostream& operator<<(ostream&, const signed char*);
-
-  extern template ostream& ostream::_M_insert(long);
-  extern template ostream& ostream::_M_insert(unsigned long);
-  extern template ostream& ostream::_M_insert(bool);
-#ifdef _GLIBCXX_USE_LONG_LONG
-  extern template ostream& ostream::_M_insert(long long);
-  extern template ostream& ostream::_M_insert(unsigned long long);
-#endif
-  extern template ostream& ostream::_M_insert(double);
-  extern template ostream& ostream::_M_insert(long double);
-  extern template ostream& ostream::_M_insert(const void*);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_ostream<wchar_t>;
-  extern template wostream& endl(wostream&);
-  extern template wostream& ends(wostream&);
-  extern template wostream& flush(wostream&);
-  extern template wostream& operator<<(wostream&, wchar_t);
-  extern template wostream& operator<<(wostream&, char);
-  extern template wostream& operator<<(wostream&, const wchar_t*);
-  extern template wostream& operator<<(wostream&, const char*);
-
-  extern template wostream& wostream::_M_insert(long);
-  extern template wostream& wostream::_M_insert(unsigned long);
-  extern template wostream& wostream::_M_insert(bool);
-#ifdef _GLIBCXX_USE_LONG_LONG
-  extern template wostream& wostream::_M_insert(long long);
-  extern template wostream& wostream::_M_insert(unsigned long long);
-#endif
-  extern template wostream& wostream::_M_insert(double);
-  extern template wostream& wostream::_M_insert(long double);
-  extern template wostream& wostream::_M_insert(const void*);
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/ostream_insert.h b/openflow/usr/include/c++/5/bits/ostream_insert.h
deleted file mode 100644
index dd60145..0000000
--- a/openflow/usr/include/c++/5/bits/ostream_insert.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// Helpers for ostream inserters -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/ostream_insert.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ostream}
- */
-
-#ifndef _OSTREAM_INSERT_H
-#define _OSTREAM_INSERT_H 1
-
-#pragma GCC system_header
-
-#include <iosfwd>
-#include <bits/cxxabi_forced.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits>
-    inline void
-    __ostream_write(basic_ostream<_CharT, _Traits>& __out,
-		    const _CharT* __s, streamsize __n)
-    {
-      typedef basic_ostream<_CharT, _Traits>       __ostream_type;      
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const streamsize __put = __out.rdbuf()->sputn(__s, __n);
-      if (__put != __n)
-	__out.setstate(__ios_base::badbit);
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline void
-    __ostream_fill(basic_ostream<_CharT, _Traits>& __out, streamsize __n)
-    {
-      typedef basic_ostream<_CharT, _Traits>       __ostream_type;      
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const _CharT __c = __out.fill();
-      for (; __n > 0; --__n)
-	{
-	  const typename _Traits::int_type __put = __out.rdbuf()->sputc(__c);
-	  if (_Traits::eq_int_type(__put, _Traits::eof()))
-	    {
-	      __out.setstate(__ios_base::badbit);
-	      break;
-	    }
-	}
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    __ostream_insert(basic_ostream<_CharT, _Traits>& __out,
-		     const _CharT* __s, streamsize __n)
-    {
-      typedef basic_ostream<_CharT, _Traits>       __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      typename __ostream_type::sentry __cerb(__out);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      const streamsize __w = __out.width();
-	      if (__w > __n)
-		{
-		  const bool __left = ((__out.flags()
-					& __ios_base::adjustfield)
-				       == __ios_base::left);
-		  if (!__left)
-		    __ostream_fill(__out, __w - __n);
-		  if (__out.good())
-		    __ostream_write(__out, __s, __n);
-		  if (__left && __out.good())
-		    __ostream_fill(__out, __w - __n);
-		}
-	      else
-		__ostream_write(__out, __s, __n);
-	      __out.width(0);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __out._M_setstate(__ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { __out._M_setstate(__ios_base::badbit); }
-	}
-      return __out;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template ostream& __ostream_insert(ostream&, const char*, streamsize);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template wostream& __ostream_insert(wostream&, const wchar_t*,
-					     streamsize);
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif /* _OSTREAM_INSERT_H */
diff --git a/openflow/usr/include/c++/5/bits/parse_numbers.h b/openflow/usr/include/c++/5/bits/parse_numbers.h
deleted file mode 100644
index 85ea4db..0000000
--- a/openflow/usr/include/c++/5/bits/parse_numbers.h
+++ /dev/null
@@ -1,288 +0,0 @@
-// Components for compile-time parsing of numbers -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/parse_numbers.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{chrono}
- */
-
-#ifndef _GLIBCXX_PARSE_NUMBERS_H
-#define _GLIBCXX_PARSE_NUMBERS_H 1
-
-#pragma GCC system_header
-
-// From n3642.pdf except I added binary literals and digit separator '\''.
-
-#if __cplusplus > 201103L
-
-#include <limits>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-namespace __parse_int
-{
-  template<unsigned _Base, char _Dig>
-    struct _Digit;
-
-  template<unsigned _Base>
-    struct _Digit<_Base, '0'> : integral_constant<unsigned, 0>
-    {
-      using __valid = true_type;
-    };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, '1'> : integral_constant<unsigned, 1>
-    {
-      using __valid = true_type;
-    };
-
-  template<unsigned _Base, unsigned _Val>
-    struct _Digit_impl : integral_constant<unsigned, _Val>
-    {
-      static_assert(_Base > _Val, "invalid digit");
-      using __valid = true_type;
-    };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, '2'> : _Digit_impl<_Base, 2>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, '3'> : _Digit_impl<_Base, 3>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, '4'> : _Digit_impl<_Base, 4>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, '5'> : _Digit_impl<_Base, 5>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, '6'> : _Digit_impl<_Base, 6>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, '7'> : _Digit_impl<_Base, 7>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, '8'> : _Digit_impl<_Base, 8>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, '9'> : _Digit_impl<_Base, 9>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'a'> : _Digit_impl<_Base, 0xa>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'A'> : _Digit_impl<_Base, 0xa>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'b'> : _Digit_impl<_Base, 0xb>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'B'> : _Digit_impl<_Base, 0xb>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'c'> : _Digit_impl<_Base, 0xc>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'C'> : _Digit_impl<_Base, 0xc>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'd'> : _Digit_impl<_Base, 0xd>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'D'> : _Digit_impl<_Base, 0xd>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'e'> : _Digit_impl<_Base, 0xe>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'E'> : _Digit_impl<_Base, 0xe>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'f'> : _Digit_impl<_Base, 0xf>
-    { };
-
-  template<unsigned _Base>
-    struct _Digit<_Base, 'F'> : _Digit_impl<_Base, 0xf>
-    { };
-
-  //  Digit separator
-  template<unsigned _Base>
-    struct _Digit<_Base, '\''> : integral_constant<unsigned, 0>
-    {
-      using __valid = false_type;
-    };
-
-//------------------------------------------------------------------------------
-
-  template<unsigned long long _Val>
-    using __ull_constant = integral_constant<unsigned long long, _Val>;
-
-  template<unsigned _Base, char _Dig, char... _Digs>
-    struct _Power_help
-    {
-      using __next = typename _Power_help<_Base, _Digs...>::type;
-      using __valid_digit = typename _Digit<_Base, _Dig>::__valid;
-      using type
-	= __ull_constant<__next::value * (__valid_digit{} ? _Base : 1ULL)>;
-    };
-
-  template<unsigned _Base, char _Dig>
-    struct _Power_help<_Base, _Dig>
-    {
-      using __valid_digit = typename _Digit<_Base, _Dig>::__valid;
-      using type = __ull_constant<__valid_digit::value>;
-    };
-
-  template<unsigned _Base, char... _Digs>
-    struct _Power : _Power_help<_Base, _Digs...>::type
-    { };
-
-  template<unsigned _Base>
-    struct _Power<_Base> : __ull_constant<0>
-    { };
-
-//------------------------------------------------------------------------------
-
-  template<unsigned _Base, unsigned long long _Pow, char _Dig, char... _Digs>
-    struct _Number_help
-    {
-      using __digit = _Digit<_Base, _Dig>;
-      using __valid_digit = typename __digit::__valid;
-      using __next = _Number_help<_Base,
-				  __valid_digit::value ? _Pow / _Base : _Pow,
-				  _Digs...>;
-      using type = __ull_constant<_Pow * __digit::value + __next::type::value>;
-      static_assert((type::value / _Pow) == __digit::value,
-		    "integer literal does not fit in unsigned long long");
-    };
-
-  template<unsigned _Base, unsigned long long _Pow, char _Dig>
-    struct _Number_help<_Base, _Pow, _Dig>
-    {
-      //static_assert(_Pow == 1U, "power should be one");
-      using type = __ull_constant<_Digit<_Base, _Dig>::value>;
-    };
-
-  template<unsigned _Base, char... _Digs>
-    struct _Number
-    : _Number_help<_Base, _Power<_Base, _Digs...>::value, _Digs...>::type
-    { };
-
-  template<unsigned _Base>
-    struct _Number<_Base>
-    : __ull_constant<0>
-    { };
-
-//------------------------------------------------------------------------------
-
-  template<char... _Digs>
-    struct _Parse_int;
-
-  template<char... _Digs>
-    struct _Parse_int<'0', 'b', _Digs...>
-    : _Number<2U, _Digs...>::type
-    { };
-
-  template<char... _Digs>
-    struct _Parse_int<'0', 'B', _Digs...>
-    : _Number<2U, _Digs...>::type
-    { };
-
-  template<char... _Digs>
-    struct _Parse_int<'0', 'x', _Digs...>
-    : _Number<16U, _Digs...>::type
-    { };
-
-  template<char... _Digs>
-    struct _Parse_int<'0', 'X', _Digs...>
-    : _Number<16U, _Digs...>::type
-    { };
-
-  template<char... _Digs>
-    struct _Parse_int<'0', _Digs...>
-    : _Number<8U, _Digs...>::type
-    { };
-
-  template<char... _Digs>
-    struct _Parse_int
-    : _Number<10U, _Digs...>::type
-    { };
-
-} // namespace __parse_int
-
-
-namespace __select_int
-{
-  template<unsigned long long _Val, typename... _Ints>
-    struct _Select_int_base;
-
-  template<unsigned long long _Val, typename _IntType, typename... _Ints>
-    struct _Select_int_base<_Val, _IntType, _Ints...>
-    : conditional_t<(_Val <= std::numeric_limits<_IntType>::max()),
-		    integral_constant<_IntType, _Val>,
-		    _Select_int_base<_Val, _Ints...>>
-    { };
-
-  template<unsigned long long _Val>
-    struct _Select_int_base<_Val>
-    { };
-
-  template<char... _Digs>
-    using _Select_int = typename _Select_int_base<
-	__parse_int::_Parse_int<_Digs...>::value,
-	unsigned char,
-	unsigned short,
-	unsigned int,
-	unsigned long,
-	unsigned long long
-      >::type;
-
-} // namespace __select_int
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif // __cplusplus > 201103L
-
-#endif // _GLIBCXX_PARSE_NUMBERS_H
diff --git a/openflow/usr/include/c++/5/bits/postypes.h b/openflow/usr/include/c++/5/bits/postypes.h
deleted file mode 100644
index 746bcb1..0000000
--- a/openflow/usr/include/c++/5/bits/postypes.h
+++ /dev/null
@@ -1,242 +0,0 @@
-// Position types -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/postypes.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iosfwd}
- */
-
-//
-// ISO C++ 14882: 27.4.1 - Types
-// ISO C++ 14882: 27.4.3 - Template class fpos
-//
-
-#ifndef _GLIBCXX_POSTYPES_H
-#define _GLIBCXX_POSTYPES_H 1
-
-#pragma GCC system_header
-
-#include <cwchar> // For mbstate_t
-
-// XXX If <stdint.h> is really needed, make sure to define the macros
-// before including it, in order not to break <tr1/cstdint> (and <cstdint>
-// in C++0x).  Reconsider all this as soon as possible...
-#if (defined(_GLIBCXX_HAVE_INT64_T) && !defined(_GLIBCXX_HAVE_INT64_T_LONG) \
-     && !defined(_GLIBCXX_HAVE_INT64_T_LONG_LONG))
-
-#ifndef __STDC_LIMIT_MACROS
-# define _UNDEF__STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS
-#endif
-#ifndef __STDC_CONSTANT_MACROS
-# define _UNDEF__STDC_CONSTANT_MACROS
-# define __STDC_CONSTANT_MACROS
-#endif
-#include <stdint.h> // For int64_t
-#ifdef _UNDEF__STDC_LIMIT_MACROS
-# undef __STDC_LIMIT_MACROS
-# undef _UNDEF__STDC_LIMIT_MACROS
-#endif
-#ifdef _UNDEF__STDC_CONSTANT_MACROS
-# undef __STDC_CONSTANT_MACROS
-# undef _UNDEF__STDC_CONSTANT_MACROS
-#endif
-
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // The types streamoff, streampos and wstreampos and the class
-  // template fpos<> are described in clauses 21.1.2, 21.1.3, 27.1.2,
-  // 27.2, 27.4.1, 27.4.3 and D.6. Despite all this verbiage, the
-  // behaviour of these types is mostly implementation defined or
-  // unspecified. The behaviour in this implementation is as noted
-  // below.
-
-  /**
-   *  @brief  Type used by fpos, char_traits<char>, and char_traits<wchar_t>.
-   *
-   *  In clauses 21.1.3.1 and 27.4.1 streamoff is described as an
-   *  implementation defined type.
-   *  Note: In versions of GCC up to and including GCC 3.3, streamoff
-   *  was typedef long.
-  */  
-#ifdef _GLIBCXX_HAVE_INT64_T_LONG
-  typedef long          streamoff;
-#elif defined(_GLIBCXX_HAVE_INT64_T_LONG_LONG)
-  typedef long long     streamoff;
-#elif defined(_GLIBCXX_HAVE_INT64_T) 
-  typedef int64_t       streamoff;
-#else
-  typedef long long     streamoff;
-#endif
-
-  /// Integral type for I/O operation counts and buffer sizes.
-  typedef ptrdiff_t	streamsize; // Signed integral type
-
-  /**
-   *  @brief  Class representing stream positions.
-   *
-   *  The standard places no requirements upon the template parameter StateT.
-   *  In this implementation StateT must be DefaultConstructible,
-   *  CopyConstructible and Assignable.  The standard only requires that fpos
-   *  should contain a member of type StateT. In this implementation it also
-   *  contains an offset stored as a signed integer.
-   *
-   *  @param  StateT  Type passed to and returned from state().
-   */
-  template<typename _StateT>
-    class fpos
-    {
-    private:
-      streamoff	                _M_off;
-      _StateT			_M_state;
-
-    public:
-      // The standard doesn't require that fpos objects can be default
-      // constructed. This implementation provides a default
-      // constructor that initializes the offset to 0 and default
-      // constructs the state.
-      fpos()
-      : _M_off(0), _M_state() { }
-
-      // The standard requires that fpos objects can be constructed
-      // from streamoff objects using the constructor syntax, and
-      // fails to give any meaningful semantics. In this
-      // implementation implicit conversion is also allowed, and this
-      // constructor stores the streamoff as the offset and default
-      // constructs the state.
-      /// Construct position from offset.
-      fpos(streamoff __off)
-      : _M_off(__off), _M_state() { }
-
-      /// Convert to streamoff.
-      operator streamoff() const { return _M_off; }
-
-      /// Remember the value of @a st.
-      void
-      state(_StateT __st)
-      { _M_state = __st; }
-
-      /// Return the last set value of @a st.
-      _StateT
-      state() const
-      { return _M_state; }
-
-      // The standard requires that this operator must be defined, but
-      // gives no semantics. In this implementation it just adds its
-      // argument to the stored offset and returns *this.
-      /// Add offset to this position.
-      fpos&
-      operator+=(streamoff __off)
-      {
-	_M_off += __off;
-	return *this;
-      }
-
-      // The standard requires that this operator must be defined, but
-      // gives no semantics. In this implementation it just subtracts
-      // its argument from the stored offset and returns *this.
-      /// Subtract offset from this position.
-      fpos&
-      operator-=(streamoff __off)
-      {
-	_M_off -= __off;
-	return *this;
-      }
-
-      // The standard requires that this operator must be defined, but
-      // defines its semantics only in terms of operator-. In this
-      // implementation it constructs a copy of *this, adds the
-      // argument to that copy using operator+= and then returns the
-      // copy.
-      /// Add position and offset.
-      fpos
-      operator+(streamoff __off) const
-      {
-	fpos __pos(*this);
-	__pos += __off;
-	return __pos;
-      }
-
-      // The standard requires that this operator must be defined, but
-      // defines its semantics only in terms of operator+. In this
-      // implementation it constructs a copy of *this, subtracts the
-      // argument from that copy using operator-= and then returns the
-      // copy.
-      /// Subtract offset from position.
-      fpos
-      operator-(streamoff __off) const
-      {
-	fpos __pos(*this);
-	__pos -= __off;
-	return __pos;
-      }
-
-      // The standard requires that this operator must be defined, but
-      // defines its semantics only in terms of operator+. In this
-      // implementation it returns the difference between the offset
-      // stored in *this and in the argument.
-      /// Subtract position to return offset.
-      streamoff
-      operator-(const fpos& __other) const
-      { return _M_off - __other._M_off; }
-    };
-
-  // The standard only requires that operator== must be an
-  // equivalence relation. In this implementation two fpos<StateT>
-  // objects belong to the same equivalence class if the contained
-  // offsets compare equal.
-  /// Test if equivalent to another position.
-  template<typename _StateT>
-    inline bool
-    operator==(const fpos<_StateT>& __lhs, const fpos<_StateT>& __rhs)
-    { return streamoff(__lhs) == streamoff(__rhs); }
-
-  template<typename _StateT>
-    inline bool
-    operator!=(const fpos<_StateT>& __lhs, const fpos<_StateT>& __rhs)
-    { return streamoff(__lhs) != streamoff(__rhs); }
-
-  // Clauses 21.1.3.1 and 21.1.3.2 describe streampos and wstreampos
-  // as implementation defined types, but clause 27.2 requires that
-  // they must both be typedefs for fpos<mbstate_t>
-  /// File position for char streams.
-  typedef fpos<mbstate_t> streampos;
-  /// File position for wchar_t streams.
-  typedef fpos<mbstate_t> wstreampos;
-
-#if __cplusplus >= 201103L
-  /// File position for char16_t streams.
-  typedef fpos<mbstate_t> u16streampos;
-  /// File position for char32_t streams.
-  typedef fpos<mbstate_t> u32streampos;
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/predefined_ops.h b/openflow/usr/include/c++/5/bits/predefined_ops.h
deleted file mode 100644
index 7178567..0000000
--- a/openflow/usr/include/c++/5/bits/predefined_ops.h
+++ /dev/null
@@ -1,307 +0,0 @@
-// Default predicates for internal use -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file predefined_ops.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _GLIBCXX_PREDEFINED_OPS_H
-#define _GLIBCXX_PREDEFINED_OPS_H	1
-
-namespace __gnu_cxx
-{
-namespace __ops
-{
-  struct _Iter_less_iter
-  {
-    template<typename _Iterator1, typename _Iterator2>
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(_Iterator1 __it1, _Iterator2 __it2) const
-      { return *__it1 < *__it2; }
-  };
-  _GLIBCXX14_CONSTEXPR
-  inline _Iter_less_iter
-  __iter_less_iter()
-  { return _Iter_less_iter(); }
-
-  struct _Iter_less_val
-  {
-    template<typename _Iterator, typename _Value>
-      bool
-      operator()(_Iterator __it, _Value& __val) const
-      { return *__it < __val; }
-    };
-
-  inline _Iter_less_val
-  __iter_less_val()
-  { return _Iter_less_val(); }
-
-  inline _Iter_less_val
-  __iter_comp_val(_Iter_less_iter)
-  { return _Iter_less_val(); }
-
-  struct _Val_less_iter
-  {
-    template<typename _Value, typename _Iterator>
-      bool
-      operator()(_Value& __val, _Iterator __it) const
-      { return __val < *__it; }
-    };
-
-  inline _Val_less_iter
-  __val_less_iter()
-  { return _Val_less_iter(); }
-
-  inline _Val_less_iter
-  __val_comp_iter(_Iter_less_iter)
-  { return _Val_less_iter(); }
-
-  struct _Iter_equal_to_iter
-  {
-    template<typename _Iterator1, typename _Iterator2>
-      bool
-      operator()(_Iterator1 __it1, _Iterator2 __it2) const
-      { return *__it1 == *__it2; }
-    };
-
-  inline _Iter_equal_to_iter
-  __iter_equal_to_iter()
-  { return _Iter_equal_to_iter(); }
-
-  struct _Iter_equal_to_val
-  {
-    template<typename _Iterator, typename _Value>
-      bool
-      operator()(_Iterator __it, _Value& __val) const
-      { return *__it == __val; }
-    };
-
-  inline _Iter_equal_to_val
-  __iter_equal_to_val()
-  { return _Iter_equal_to_val(); }
-
-  inline _Iter_equal_to_val
-  __iter_comp_val(_Iter_equal_to_iter)
-  { return _Iter_equal_to_val(); }
-
-  template<typename _Compare>
-    struct _Iter_comp_iter
-    {
-      _Compare _M_comp;
-      _GLIBCXX14_CONSTEXPR
-      _Iter_comp_iter(_Compare __comp)
-	: _M_comp(__comp)
-      { }
-
-      template<typename _Iterator1, typename _Iterator2>
-        _GLIBCXX14_CONSTEXPR
-        bool
-        operator()(_Iterator1 __it1, _Iterator2 __it2)
-        { return bool(_M_comp(*__it1, *__it2)); }
-    };
-
-  template<typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    inline _Iter_comp_iter<_Compare>
-    __iter_comp_iter(_Compare __comp)
-    { return _Iter_comp_iter<_Compare>(__comp); }
-
-  template<typename _Compare>
-    struct _Iter_comp_val
-    {
-      _Compare _M_comp;
-
-      _Iter_comp_val(_Compare __comp)
-	: _M_comp(__comp)
-      { }
-
-      template<typename _Iterator, typename _Value>
-	bool
-	operator()(_Iterator __it, _Value& __val)
-	{ return bool(_M_comp(*__it, __val)); }
-    };
-
-  template<typename _Compare>
-   inline _Iter_comp_val<_Compare>
-    __iter_comp_val(_Compare __comp)
-    { return _Iter_comp_val<_Compare>(__comp); }
-
-  template<typename _Compare>
-    inline _Iter_comp_val<_Compare>
-    __iter_comp_val(_Iter_comp_iter<_Compare> __comp)
-    { return _Iter_comp_val<_Compare>(__comp._M_comp); }
-
-  template<typename _Compare>
-    struct _Val_comp_iter
-    {
-      _Compare _M_comp;
-
-      _Val_comp_iter(_Compare __comp)
-	: _M_comp(__comp)
-      { }
-
-      template<typename _Value, typename _Iterator>
-	bool
-	operator()(_Value& __val, _Iterator __it)
-	{ return bool(_M_comp(__val, *__it)); }
-    };
-
-  template<typename _Compare>
-    inline _Val_comp_iter<_Compare>
-    __val_comp_iter(_Compare __comp)
-    { return _Val_comp_iter<_Compare>(__comp); }
-
-  template<typename _Compare>
-    inline _Val_comp_iter<_Compare>
-    __val_comp_iter(_Iter_comp_iter<_Compare> __comp)
-    { return _Val_comp_iter<_Compare>(__comp._M_comp); }
-
-  template<typename _Value>
-    struct _Iter_equals_val
-    {
-      _Value& _M_value;
-
-      _Iter_equals_val(_Value& __value)
-	: _M_value(__value)
-      { }
-
-      template<typename _Iterator>
-	bool
-	operator()(_Iterator __it)
-	{ return *__it == _M_value; }
-    };
-
-  template<typename _Value>
-    inline _Iter_equals_val<_Value>
-    __iter_equals_val(_Value& __val)
-    { return _Iter_equals_val<_Value>(__val); }
-
-  template<typename _Iterator1>
-    struct _Iter_equals_iter
-    {
-      typename std::iterator_traits<_Iterator1>::reference _M_ref;
-
-      _Iter_equals_iter(_Iterator1 __it1)
-	: _M_ref(*__it1)
-      { }
-
-      template<typename _Iterator2>
-	bool
-	operator()(_Iterator2 __it2)
-	{ return *__it2 == _M_ref; }
-    };
-
-  template<typename _Iterator>
-    inline _Iter_equals_iter<_Iterator>
-    __iter_comp_iter(_Iter_equal_to_iter, _Iterator __it)
-    { return _Iter_equals_iter<_Iterator>(__it); }
-
-  template<typename _Predicate>
-    struct _Iter_pred
-    {
-      _Predicate _M_pred;
-
-      _Iter_pred(_Predicate __pred)
-	: _M_pred(__pred)
-      { }
-
-      template<typename _Iterator>
-	bool
-	operator()(_Iterator __it)
-	{ return bool(_M_pred(*__it)); }
-    };
-
-  template<typename _Predicate>
-    inline _Iter_pred<_Predicate>
-    __pred_iter(_Predicate __pred)
-    { return _Iter_pred<_Predicate>(__pred); }
-
-  template<typename _Compare, typename _Value>
-    struct _Iter_comp_to_val
-    {
-      _Compare _M_comp;
-      _Value& _M_value;
-
-      _Iter_comp_to_val(_Compare __comp, _Value& __value)
-	: _M_comp(__comp), _M_value(__value)
-      { }
-
-      template<typename _Iterator>
-	bool
-	operator()(_Iterator __it)
-	{ return bool(_M_comp(*__it, _M_value)); }
-    };
-
-  template<typename _Compare, typename _Value>
-    _Iter_comp_to_val<_Compare, _Value>
-    __iter_comp_val(_Compare __comp, _Value &__val)
-    { return _Iter_comp_to_val<_Compare, _Value>(__comp, __val); }
-
-  template<typename _Compare, typename _Iterator1>
-    struct _Iter_comp_to_iter
-    {
-      _Compare _M_comp;
-      typename std::iterator_traits<_Iterator1>::reference _M_ref;
-
-      _Iter_comp_to_iter(_Compare __comp, _Iterator1 __it1)
-	: _M_comp(__comp), _M_ref(*__it1)
-      { }
-
-      template<typename _Iterator2>
-	bool
-	operator()(_Iterator2 __it2)
-	{ return bool(_M_comp(*__it2, _M_ref)); }
-    };
-
-  template<typename _Compare, typename _Iterator>
-    inline _Iter_comp_to_iter<_Compare, _Iterator>
-    __iter_comp_iter(_Iter_comp_iter<_Compare> __comp, _Iterator __it)
-    { return _Iter_comp_to_iter<_Compare, _Iterator>(__comp._M_comp, __it); }
-
-  template<typename _Predicate>
-    struct _Iter_negate
-    {
-      _Predicate _M_pred;
-
-      _Iter_negate(_Predicate __pred)
-	: _M_pred(__pred)
-      { }
-
-      template<typename _Iterator>
-	bool
-	operator()(_Iterator __it)
-	{ return !bool(_M_pred(*__it)); }
-    };
-
-  template<typename _Predicate>
-    inline _Iter_negate<_Predicate>
-    __negate(_Iter_pred<_Predicate> __pred)
-    { return _Iter_negate<_Predicate>(__pred._M_pred); }
-
-} // namespace __ops
-} // namespace __gnu_cxx
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/ptr_traits.h b/openflow/usr/include/c++/5/bits/ptr_traits.h
deleted file mode 100644
index 9fd6bf8..0000000
--- a/openflow/usr/include/c++/5/bits/ptr_traits.h
+++ /dev/null
@@ -1,177 +0,0 @@
-// Pointer Traits -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/ptr_traits.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _PTR_TRAITS_H
-#define _PTR_TRAITS_H 1
-
-#if __cplusplus >= 201103L
-
-#include <type_traits> // For _GLIBCXX_HAS_NESTED_TYPE
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-_GLIBCXX_HAS_NESTED_TYPE(element_type)
-_GLIBCXX_HAS_NESTED_TYPE(difference_type)
-
-  template<typename _Tp, bool = __has_element_type<_Tp>::value>
-    struct __ptrtr_elt_type;
-
-  template<typename _Tp>
-    struct __ptrtr_elt_type<_Tp, true>
-    {
-      typedef typename _Tp::element_type __type;
-    };
-
-  template<template<typename, typename...> class _SomePtr, typename _Tp,
-            typename... _Args>
-    struct __ptrtr_elt_type<_SomePtr<_Tp, _Args...>, false>
-    {
-      typedef _Tp __type;
-    };
-
-  template<typename _Tp, bool = __has_difference_type<_Tp>::value>
-    struct __ptrtr_diff_type
-    {
-      typedef typename _Tp::difference_type __type;
-    };
-
-  template<typename _Tp>
-    struct __ptrtr_diff_type<_Tp, false>
-    {
-      typedef ptrdiff_t __type;
-    };
-
-  template<typename _Ptr, typename _Up>
-    class __ptrtr_rebind_helper
-    {
-      template<typename _Ptr2, typename _Up2>
-	static constexpr true_type
-	_S_chk(typename _Ptr2::template rebind<_Up2>*);
-
-      template<typename, typename>
-	static constexpr false_type
-	_S_chk(...);
-
-    public:
-      using __type = decltype(_S_chk<_Ptr, _Up>(nullptr));
-    };
-
-  template<typename _Tp, typename _Up,
-           bool = __ptrtr_rebind_helper<_Tp, _Up>::__type::value>
-    struct __ptrtr_rebind;
-
-  template<typename _Tp, typename _Up>
-    struct __ptrtr_rebind<_Tp, _Up, true>
-    {
-      typedef typename _Tp::template rebind<_Up> __type;
-    };
-
-  template<template<typename, typename...> class _SomePtr, typename _Up,
-            typename _Tp, typename... _Args>
-    struct __ptrtr_rebind<_SomePtr<_Tp, _Args...>, _Up, false>
-    {
-      typedef _SomePtr<_Up, _Args...> __type;
-    };
-
-  template<typename _Tp, typename = typename remove_cv<_Tp>::type>
-    struct __ptrtr_not_void
-    {
-      typedef _Tp __type;
-    };
-
-  template<typename _Tp>
-    struct __ptrtr_not_void<_Tp, void>
-    {
-      struct __type { };
-    };
-
-  template<typename _Ptr>
-    class __ptrtr_pointer_to
-    {
-      typedef typename __ptrtr_elt_type<_Ptr>::__type   __orig_type;
-      typedef typename __ptrtr_not_void<__orig_type>::__type __element_type;
-
-    public:
-      static _Ptr pointer_to(__element_type& __e)
-      { return _Ptr::pointer_to(__e); }
-    };
-
-  /**
-   * @brief  Uniform interface to all pointer-like types
-   * @ingroup pointer_abstractions
-  */
-  template<typename _Ptr>
-    struct pointer_traits : __ptrtr_pointer_to<_Ptr>
-    {
-      /// The pointer type
-      typedef _Ptr                                      pointer;
-      /// The type pointed to
-      typedef typename __ptrtr_elt_type<_Ptr>::__type   element_type;
-      /// Type used to represent the difference between two pointers
-      typedef typename __ptrtr_diff_type<_Ptr>::__type  difference_type;
-
-      template<typename _Up>
-        using rebind = typename __ptrtr_rebind<_Ptr, _Up>::__type;
-    };
-
-  /**
-   * @brief  Partial specialization for built-in pointers.
-   * @ingroup pointer_abstractions
-  */
-  template<typename _Tp>
-    struct pointer_traits<_Tp*>
-    {
-      /// The pointer type
-      typedef _Tp* pointer;
-      /// The type pointed to
-      typedef _Tp  element_type;
-      /// Type used to represent the difference between two pointers
-      typedef ptrdiff_t difference_type;
-
-      template<typename _Up>
-        using rebind = _Up*;
-
-      /**
-       *  @brief  Obtain a pointer to an object
-       *  @param  __r  A reference to an object of type @c element_type
-       *  @return @c addressof(__r)
-      */
-      static pointer
-      pointer_to(typename __ptrtr_not_void<element_type>::__type& __r) noexcept
-      { return std::addressof(__r); }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/quoted_string.h b/openflow/usr/include/c++/5/bits/quoted_string.h
deleted file mode 100644
index 7e75ce4..0000000
--- a/openflow/usr/include/c++/5/bits/quoted_string.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// Helpers for quoted stream manipulators -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/quoted_string.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iomanip}
- */
-
-#ifndef _GLIBCXX_QUOTED_STRING_H
-#define _GLIBCXX_QUOTED_STRING_H 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-#include <sstream>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-  namespace __detail {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     * @brief Struct for delimited strings.
-     */
-    template<typename _String, typename _CharT>
-      struct _Quoted_string
-      {
-	static_assert(is_reference<_String>::value
-		   || is_pointer<_String>::value,
-		      "String type must be pointer or reference");
-
-	_Quoted_string(_String __str, _CharT __del, _CharT __esc)
-	: _M_string(__str), _M_delim{__del}, _M_escape{__esc}
-	{ }
-
-	_Quoted_string&
-	operator=(_Quoted_string&) = delete;
-
-	_String _M_string;
-	_CharT _M_delim;
-	_CharT _M_escape;
-      };
-
-    /**
-     * @brief Inserter for quoted strings.
-     *
-     *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-     *  DR 2344 quoted()'s interaction with padding is unclear
-     */
-    template<typename _CharT, typename _Traits>
-      std::basic_ostream<_CharT, _Traits>&
-      operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		 const _Quoted_string<const _CharT*, _CharT>& __str)
-      {
-	std::basic_ostringstream<_CharT, _Traits> __ostr;
-	__ostr << __str._M_delim;
-	for (const _CharT* __c = __str._M_string; *__c; ++__c)
-	  {
-	    if (*__c == __str._M_delim || *__c == __str._M_escape)
-	      __ostr << __str._M_escape;
-	    __ostr << *__c;
-	  }
-	__ostr << __str._M_delim;
-
-	return __os << __ostr.str();
-      }
-
-    /**
-     * @brief Inserter for quoted strings.
-     *
-     *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-     *  DR 2344 quoted()'s interaction with padding is unclear
-     */
-    template<typename _CharT, typename _Traits, typename _String>
-      std::basic_ostream<_CharT, _Traits>&
-      operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		 const _Quoted_string<_String, _CharT>& __str)
-      {
-	std::basic_ostringstream<_CharT, _Traits> __ostr;
-	__ostr << __str._M_delim;
-	for (auto& __c : __str._M_string)
-	  {
-	    if (__c == __str._M_delim || __c == __str._M_escape)
-	      __ostr << __str._M_escape;
-	    __ostr << __c;
-	  }
-	__ostr << __str._M_delim;
-
-	return __os << __ostr.str();
-      }
-
-    /**
-     * @brief Extractor for delimited strings.
-     *        The left and right delimiters can be different.
-     */
-    template<typename _CharT, typename _Traits, typename _Alloc>
-      std::basic_istream<_CharT, _Traits>&
-      operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		 const _Quoted_string<basic_string<_CharT, _Traits, _Alloc>&,
-				      _CharT>& __str)
-      {
-	_CharT __c;
-	__is >> __c;
-	if (!__is.good())
-	  return __is;
-	if (__c != __str._M_delim)
-	  {
-	    __is.unget();
-	    __is >> __str._M_string;
-	    return __is;
-	  }
-	__str._M_string.clear();
-	std::ios_base::fmtflags __flags
-	  = __is.flags(__is.flags() & ~std::ios_base::skipws);
-	do
-	  {
-	    __is >> __c;
-	    if (!__is.good())
-	      break;
-	    if (__c == __str._M_escape)
-	      {
-		__is >> __c;
-		if (!__is.good())
-		  break;
-	      }
-	    else if (__c == __str._M_delim)
-	      break;
-	    __str._M_string += __c;
-	  }
-	while (true);
-	__is.setf(__flags);
-
-	return __is;
-      }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace __detail
-} // namespace std
-
-#endif // C++11
-#endif /* _GLIBCXX_QUOTED_STRING_H */
diff --git a/openflow/usr/include/c++/5/bits/random.h b/openflow/usr/include/c++/5/bits/random.h
deleted file mode 100644
index 8caade5..0000000
--- a/openflow/usr/include/c++/5/bits/random.h
+++ /dev/null
@@ -1,6068 +0,0 @@
-// random number generation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- * @file bits/random.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{random}
- */
-
-#ifndef _RANDOM_H
-#define _RANDOM_H 1
-
-#include <vector>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // [26.4] Random number generation
-
-  /**
-   * @defgroup random Random Number Generation
-   * @ingroup numerics
-   *
-   * A facility for generating random numbers on selected distributions.
-   * @{
-   */
-
-  /**
-   * @brief A function template for converting the output of a (integral)
-   * uniform random number generator to a floatng point result in the range
-   * [0-1).
-   */
-  template<typename _RealType, size_t __bits,
-	   typename _UniformRandomNumberGenerator>
-    _RealType
-    generate_canonical(_UniformRandomNumberGenerator& __g);
-
-_GLIBCXX_END_NAMESPACE_VERSION
-
-  /*
-   * Implementation-space details.
-   */
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    template<typename _UIntType, size_t __w,
-	     bool = __w < static_cast<size_t>
-			  (std::numeric_limits<_UIntType>::digits)>
-      struct _Shift
-      { static const _UIntType __value = 0; };
-
-    template<typename _UIntType, size_t __w>
-      struct _Shift<_UIntType, __w, true>
-      { static const _UIntType __value = _UIntType(1) << __w; };
-
-    template<int __s,
-	     int __which = ((__s <= __CHAR_BIT__ * sizeof (int))
-			    + (__s <= __CHAR_BIT__ * sizeof (long))
-			    + (__s <= __CHAR_BIT__ * sizeof (long long))
-			    /* assume long long no bigger than __int128 */
-			    + (__s <= 128))>
-      struct _Select_uint_least_t
-      {
-	static_assert(__which < 0, /* needs to be dependent */
-		      "sorry, would be too much trouble for a slow result");
-      };
-
-    template<int __s>
-      struct _Select_uint_least_t<__s, 4>
-      { typedef unsigned int type; };
-
-    template<int __s>
-      struct _Select_uint_least_t<__s, 3>
-      { typedef unsigned long type; };
-
-    template<int __s>
-      struct _Select_uint_least_t<__s, 2>
-      { typedef unsigned long long type; };
-
-#ifdef _GLIBCXX_USE_INT128
-    template<int __s>
-      struct _Select_uint_least_t<__s, 1>
-      { typedef unsigned __int128 type; };
-#endif
-
-    // Assume a != 0, a < m, c < m, x < m.
-    template<typename _Tp, _Tp __m, _Tp __a, _Tp __c,
-	     bool __big_enough = (!(__m & (__m - 1))
-				  || (_Tp(-1) - __c) / __a >= __m - 1),
-             bool __schrage_ok = __m % __a < __m / __a>
-      struct _Mod
-      {
-	typedef typename _Select_uint_least_t<std::__lg(__a)
-					      + std::__lg(__m) + 2>::type _Tp2;
-	static _Tp
-	__calc(_Tp __x)
-	{ return static_cast<_Tp>((_Tp2(__a) * __x + __c) % __m); }
-      };
-
-    // Schrage.
-    template<typename _Tp, _Tp __m, _Tp __a, _Tp __c>
-      struct _Mod<_Tp, __m, __a, __c, false, true>
-      {
-	static _Tp
-	__calc(_Tp __x);
-      };
-
-    // Special cases:
-    // - for m == 2^n or m == 0, unsigned integer overflow is safe.
-    // - a * (m - 1) + c fits in _Tp, there is no overflow.
-    template<typename _Tp, _Tp __m, _Tp __a, _Tp __c, bool __s>
-      struct _Mod<_Tp, __m, __a, __c, true, __s>
-      {
-	static _Tp
-	__calc(_Tp __x)
-	{
-	  _Tp __res = __a * __x + __c;
-	  if (__m)
-	    __res %= __m;
-	  return __res;
-	}
-      };
-
-    template<typename _Tp, _Tp __m, _Tp __a = 1, _Tp __c = 0>
-      inline _Tp
-      __mod(_Tp __x)
-      { return _Mod<_Tp, __m, __a, __c>::__calc(__x); }
-
-    /* Determine whether number is a power of 2.  */
-    template<typename _Tp>
-      inline bool
-      _Power_of_2(_Tp __x)
-      {
-	return ((__x - 1) & __x) == 0;
-      };
-
-    /*
-     * An adaptor class for converting the output of any Generator into
-     * the input for a specific Distribution.
-     */
-    template<typename _Engine, typename _DInputType>
-      struct _Adaptor
-      {
-	static_assert(std::is_floating_point<_DInputType>::value,
-		      "template argument not a floating point type");
-
-      public:
-	_Adaptor(_Engine& __g)
-	: _M_g(__g) { }
-
-	_DInputType
-	min() const
-	{ return _DInputType(0); }
-
-	_DInputType
-	max() const
-	{ return _DInputType(1); }
-
-	/*
-	 * Converts a value generated by the adapted random number generator
-	 * into a value in the input domain for the dependent random number
-	 * distribution.
-	 */
-	_DInputType
-	operator()()
-	{
-	  return std::generate_canonical<_DInputType,
-	                            std::numeric_limits<_DInputType>::digits,
-	                            _Engine>(_M_g);
-	}
-
-      private:
-	_Engine& _M_g;
-      };
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace __detail
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup random_generators Random Number Generators
-   * @ingroup random
-   *
-   * These classes define objects which provide random or pseudorandom
-   * numbers, either from a discrete or a continuous interval.  The
-   * random number generator supplied as a part of this library are
-   * all uniform random number generators which provide a sequence of
-   * random number uniformly distributed over their range.
-   *
-   * A number generator is a function object with an operator() that
-   * takes zero arguments and returns a number.
-   *
-   * A compliant random number generator must satisfy the following
-   * requirements.  <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Random Number Generator Requirements</caption>
-   * <tr><td>To be documented.</td></tr> </table>
-   *
-   * @{
-   */
-
-  /**
-   * @brief A model of a linear congruential random number generator.
-   *
-   * A random number generator that produces pseudorandom numbers via
-   * linear function:
-   * @f[
-   *     x_{i+1}\leftarrow(ax_{i} + c) \bmod m 
-   * @f]
-   *
-   * The template parameter @p _UIntType must be an unsigned integral type
-   * large enough to store values up to (__m-1). If the template parameter
-   * @p __m is 0, the modulus @p __m used is
-   * std::numeric_limits<_UIntType>::max() plus 1. Otherwise, the template
-   * parameters @p __a and @p __c must be less than @p __m.
-   *
-   * The size of the state is @f$1@f$.
-   */
-  template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    class linear_congruential_engine
-    {
-      static_assert(std::is_unsigned<_UIntType>::value, "template argument "
-		    "substituting _UIntType not an unsigned integral type");
-      static_assert(__m == 0u || (__a < __m && __c < __m),
-		    "template argument substituting __m out of bounds");
-
-    public:
-      /** The type of the generated random value. */
-      typedef _UIntType result_type;
-
-      /** The multiplier. */
-      static constexpr result_type multiplier   = __a;
-      /** An increment. */
-      static constexpr result_type increment    = __c;
-      /** The modulus. */
-      static constexpr result_type modulus      = __m;
-      static constexpr result_type default_seed = 1u;
-
-      /**
-       * @brief Constructs a %linear_congruential_engine random number
-       *        generator engine with seed @p __s.  The default seed value
-       *        is 1.
-       *
-       * @param __s The initial seed value.
-       */
-      explicit
-      linear_congruential_engine(result_type __s = default_seed)
-      { seed(__s); }
-
-      /**
-       * @brief Constructs a %linear_congruential_engine random number
-       *        generator engine seeded from the seed sequence @p __q.
-       *
-       * @param __q the seed sequence.
-       */
-      template<typename _Sseq, typename = typename
-	std::enable_if<!std::is_same<_Sseq, linear_congruential_engine>::value>
-	       ::type>
-        explicit
-        linear_congruential_engine(_Sseq& __q)
-        { seed(__q); }
-
-      /**
-       * @brief Reseeds the %linear_congruential_engine random number generator
-       *        engine sequence to the seed @p __s.
-       *
-       * @param __s The new seed.
-       */
-      void
-      seed(result_type __s = default_seed);
-
-      /**
-       * @brief Reseeds the %linear_congruential_engine random number generator
-       *        engine
-       * sequence using values from the seed sequence @p __q.
-       *
-       * @param __q the seed sequence.
-       */
-      template<typename _Sseq>
-        typename std::enable_if<std::is_class<_Sseq>::value>::type
-        seed(_Sseq& __q);
-
-      /**
-       * @brief Gets the smallest possible value in the output range.
-       *
-       * The minimum depends on the @p __c parameter: if it is zero, the
-       * minimum generated must be > 0, otherwise 0 is allowed.
-       */
-      static constexpr result_type
-      min()
-      { return __c == 0u ? 1u : 0u; }
-
-      /**
-       * @brief Gets the largest possible value in the output range.
-       */
-      static constexpr result_type
-      max()
-      { return __m - 1u; }
-
-      /**
-       * @brief Discard a sequence of random numbers.
-       */
-      void
-      discard(unsigned long long __z)
-      {
-	for (; __z != 0ULL; --__z)
-	  (*this)();
-      }
-
-      /**
-       * @brief Gets the next random number in the sequence.
-       */
-      result_type
-      operator()()
-      {
-	_M_x = __detail::__mod<_UIntType, __m, __a, __c>(_M_x);
-	return _M_x;
-      }
-
-      /**
-       * @brief Compares two linear congruential random number generator
-       * objects of the same type for equality.
-       *
-       * @param __lhs A linear congruential random number generator object.
-       * @param __rhs Another linear congruential random number generator
-       *              object.
-       *
-       * @returns true if the infinite sequences of generated values
-       *          would be equal, false otherwise.
-       */
-      friend bool
-      operator==(const linear_congruential_engine& __lhs,
-		 const linear_congruential_engine& __rhs)
-      { return __lhs._M_x == __rhs._M_x; }
-
-      /**
-       * @brief Writes the textual representation of the state x(i) of x to
-       *        @p __os.
-       *
-       * @param __os  The output stream.
-       * @param __lcr A % linear_congruential_engine random number generator.
-       * @returns __os.
-       */
-      template<typename _UIntType1, _UIntType1 __a1, _UIntType1 __c1,
-	       _UIntType1 __m1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::linear_congruential_engine<_UIntType1,
-		   __a1, __c1, __m1>& __lcr);
-
-      /**
-       * @brief Sets the state of the engine by reading its textual
-       *        representation from @p __is.
-       *
-       * The textual representation must have been previously written using
-       * an output stream whose imbued locale and whose type's template
-       * specialization arguments _CharT and _Traits were the same as those
-       * of @p __is.
-       *
-       * @param __is  The input stream.
-       * @param __lcr A % linear_congruential_engine random number generator.
-       * @returns __is.
-       */
-      template<typename _UIntType1, _UIntType1 __a1, _UIntType1 __c1,
-	       _UIntType1 __m1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::linear_congruential_engine<_UIntType1, __a1,
-		   __c1, __m1>& __lcr);
-
-    private:
-      _UIntType _M_x;
-    };
-
-  /**
-   * @brief Compares two linear congruential random number generator
-   * objects of the same type for inequality.
-   *
-   * @param __lhs A linear congruential random number generator object.
-   * @param __rhs Another linear congruential random number generator
-   *              object.
-   *
-   * @returns true if the infinite sequences of generated values
-   *          would be different, false otherwise.
-   */
-  template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    inline bool
-    operator!=(const std::linear_congruential_engine<_UIntType, __a,
-	       __c, __m>& __lhs,
-	       const std::linear_congruential_engine<_UIntType, __a,
-	       __c, __m>& __rhs)
-    { return !(__lhs == __rhs); }
-
-
-  /**
-   * A generalized feedback shift register discrete random number generator.
-   *
-   * This algorithm avoids multiplication and division and is designed to be
-   * friendly to a pipelined architecture.  If the parameters are chosen
-   * correctly, this generator will produce numbers with a very long period and
-   * fairly good apparent entropy, although still not cryptographically strong.
-   *
-   * The best way to use this generator is with the predefined mt19937 class.
-   *
-   * This algorithm was originally invented by Makoto Matsumoto and
-   * Takuji Nishimura.
-   *
-   * @tparam __w  Word size, the number of bits in each element of 
-   *              the state vector.
-   * @tparam __n  The degree of recursion.
-   * @tparam __m  The period parameter.
-   * @tparam __r  The separation point bit index.
-   * @tparam __a  The last row of the twist matrix.
-   * @tparam __u  The first right-shift tempering matrix parameter.
-   * @tparam __d  The first right-shift tempering matrix mask.
-   * @tparam __s  The first left-shift tempering matrix parameter.
-   * @tparam __b  The first left-shift tempering matrix mask.
-   * @tparam __t  The second left-shift tempering matrix parameter.
-   * @tparam __c  The second left-shift tempering matrix mask.
-   * @tparam __l  The second right-shift tempering matrix parameter.
-   * @tparam __f  Initialization multiplier.
-   */
-  template<typename _UIntType, size_t __w,
-	   size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t,
-	   _UIntType __c, size_t __l, _UIntType __f>
-    class mersenne_twister_engine
-    {
-      static_assert(std::is_unsigned<_UIntType>::value, "template argument "
-		    "substituting _UIntType not an unsigned integral type");
-      static_assert(1u <= __m && __m <= __n,
-		    "template argument substituting __m out of bounds");
-      static_assert(__r <= __w, "template argument substituting "
-		    "__r out of bound");
-      static_assert(__u <= __w, "template argument substituting "
-		    "__u out of bound");
-      static_assert(__s <= __w, "template argument substituting "
-		    "__s out of bound");
-      static_assert(__t <= __w, "template argument substituting "
-		    "__t out of bound");
-      static_assert(__l <= __w, "template argument substituting "
-		    "__l out of bound");
-      static_assert(__w <= std::numeric_limits<_UIntType>::digits,
-		    "template argument substituting __w out of bound");
-      static_assert(__a <= (__detail::_Shift<_UIntType, __w>::__value - 1),
-		    "template argument substituting __a out of bound");
-      static_assert(__b <= (__detail::_Shift<_UIntType, __w>::__value - 1),
-		    "template argument substituting __b out of bound");
-      static_assert(__c <= (__detail::_Shift<_UIntType, __w>::__value - 1),
-		    "template argument substituting __c out of bound");
-      static_assert(__d <= (__detail::_Shift<_UIntType, __w>::__value - 1),
-		    "template argument substituting __d out of bound");
-      static_assert(__f <= (__detail::_Shift<_UIntType, __w>::__value - 1),
-		    "template argument substituting __f out of bound");
-
-    public:
-      /** The type of the generated random value. */
-      typedef _UIntType result_type;
-
-      // parameter values
-      static constexpr size_t      word_size                 = __w;
-      static constexpr size_t      state_size                = __n;
-      static constexpr size_t      shift_size                = __m;
-      static constexpr size_t      mask_bits                 = __r;
-      static constexpr result_type xor_mask                  = __a;
-      static constexpr size_t      tempering_u               = __u;
-      static constexpr result_type tempering_d               = __d;
-      static constexpr size_t      tempering_s               = __s;
-      static constexpr result_type tempering_b               = __b;
-      static constexpr size_t      tempering_t               = __t;
-      static constexpr result_type tempering_c               = __c;
-      static constexpr size_t      tempering_l               = __l;
-      static constexpr result_type initialization_multiplier = __f;
-      static constexpr result_type default_seed = 5489u;
-
-      // constructors and member function
-      explicit
-      mersenne_twister_engine(result_type __sd = default_seed)
-      { seed(__sd); }
-
-      /**
-       * @brief Constructs a %mersenne_twister_engine random number generator
-       *        engine seeded from the seed sequence @p __q.
-       *
-       * @param __q the seed sequence.
-       */
-      template<typename _Sseq, typename = typename
-        std::enable_if<!std::is_same<_Sseq, mersenne_twister_engine>::value>
-	       ::type>
-        explicit
-        mersenne_twister_engine(_Sseq& __q)
-        { seed(__q); }
-
-      void
-      seed(result_type __sd = default_seed);
-
-      template<typename _Sseq>
-	typename std::enable_if<std::is_class<_Sseq>::value>::type
-        seed(_Sseq& __q);
-
-      /**
-       * @brief Gets the smallest possible value in the output range.
-       */
-      static constexpr result_type
-      min()
-      { return 0; };
-
-      /**
-       * @brief Gets the largest possible value in the output range.
-       */
-      static constexpr result_type
-      max()
-      { return __detail::_Shift<_UIntType, __w>::__value - 1; }
-
-      /**
-       * @brief Discard a sequence of random numbers.
-       */
-      void
-      discard(unsigned long long __z);
-
-      result_type
-      operator()();
-
-      /**
-       * @brief Compares two % mersenne_twister_engine random number generator
-       *        objects of the same type for equality.
-       *
-       * @param __lhs A % mersenne_twister_engine random number generator
-       *              object.
-       * @param __rhs Another % mersenne_twister_engine random number
-       *              generator object.
-       *
-       * @returns true if the infinite sequences of generated values
-       *          would be equal, false otherwise.
-       */
-      friend bool
-      operator==(const mersenne_twister_engine& __lhs,
-		 const mersenne_twister_engine& __rhs)
-      { return (std::equal(__lhs._M_x, __lhs._M_x + state_size, __rhs._M_x)
-		&& __lhs._M_p == __rhs._M_p); }
-
-      /**
-       * @brief Inserts the current state of a % mersenne_twister_engine
-       *        random number generator engine @p __x into the output stream
-       *        @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A % mersenne_twister_engine random number generator
-       *             engine.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _UIntType1,
-	       size_t __w1, size_t __n1,
-	       size_t __m1, size_t __r1,
-	       _UIntType1 __a1, size_t __u1,
-	       _UIntType1 __d1, size_t __s1,
-	       _UIntType1 __b1, size_t __t1,
-	       _UIntType1 __c1, size_t __l1, _UIntType1 __f1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::mersenne_twister_engine<_UIntType1, __w1, __n1,
-		   __m1, __r1, __a1, __u1, __d1, __s1, __b1, __t1, __c1,
-		   __l1, __f1>& __x);
-
-      /**
-       * @brief Extracts the current state of a % mersenne_twister_engine
-       *        random number generator engine @p __x from the input stream
-       *        @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A % mersenne_twister_engine random number generator
-       *             engine.
-       *
-       * @returns The input stream with the state of @p __x extracted or in
-       * an error state.
-       */
-      template<typename _UIntType1,
-	       size_t __w1, size_t __n1,
-	       size_t __m1, size_t __r1,
-	       _UIntType1 __a1, size_t __u1,
-	       _UIntType1 __d1, size_t __s1,
-	       _UIntType1 __b1, size_t __t1,
-	       _UIntType1 __c1, size_t __l1, _UIntType1 __f1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::mersenne_twister_engine<_UIntType1, __w1, __n1, __m1,
-		   __r1, __a1, __u1, __d1, __s1, __b1, __t1, __c1,
-		   __l1, __f1>& __x);
-
-    private:
-      void _M_gen_rand();
-
-      _UIntType _M_x[state_size];
-      size_t    _M_p;
-    };
-
-  /**
-   * @brief Compares two % mersenne_twister_engine random number generator
-   *        objects of the same type for inequality.
-   *
-   * @param __lhs A % mersenne_twister_engine random number generator
-   *              object.
-   * @param __rhs Another % mersenne_twister_engine random number
-   *              generator object.
-   *
-   * @returns true if the infinite sequences of generated values
-   *          would be different, false otherwise.
-   */
-  template<typename _UIntType, size_t __w,
-	   size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t,
-	   _UIntType __c, size_t __l, _UIntType __f>
-    inline bool
-    operator!=(const std::mersenne_twister_engine<_UIntType, __w, __n, __m,
-	       __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>& __lhs,
-	       const std::mersenne_twister_engine<_UIntType, __w, __n, __m,
-	       __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>& __rhs)
-    { return !(__lhs == __rhs); }
-
-
-  /**
-   * @brief The Marsaglia-Zaman generator.
-   *
-   * This is a model of a Generalized Fibonacci discrete random number
-   * generator, sometimes referred to as the SWC generator.
-   *
-   * A discrete random number generator that produces pseudorandom
-   * numbers using:
-   * @f[
-   *     x_{i}\leftarrow(x_{i - s} - x_{i - r} - carry_{i-1}) \bmod m 
-   * @f]
-   *
-   * The size of the state is @f$r@f$
-   * and the maximum period of the generator is @f$(m^r - m^s - 1)@f$.
-   */
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r>
-    class subtract_with_carry_engine
-    {
-      static_assert(std::is_unsigned<_UIntType>::value, "template argument "
-		    "substituting _UIntType not an unsigned integral type");
-      static_assert(0u < __s && __s < __r,
-		    "template argument substituting __s out of bounds");
-      static_assert(0u < __w && __w <= std::numeric_limits<_UIntType>::digits,
-		    "template argument substituting __w out of bounds");
-
-    public:
-      /** The type of the generated random value. */
-      typedef _UIntType result_type;
-
-      // parameter values
-      static constexpr size_t      word_size    = __w;
-      static constexpr size_t      short_lag    = __s;
-      static constexpr size_t      long_lag     = __r;
-      static constexpr result_type default_seed = 19780503u;
-
-      /**
-       * @brief Constructs an explicitly seeded % subtract_with_carry_engine
-       *        random number generator.
-       */
-      explicit
-      subtract_with_carry_engine(result_type __sd = default_seed)
-      { seed(__sd); }
-
-      /**
-       * @brief Constructs a %subtract_with_carry_engine random number engine
-       *        seeded from the seed sequence @p __q.
-       *
-       * @param __q the seed sequence.
-       */
-      template<typename _Sseq, typename = typename
-        std::enable_if<!std::is_same<_Sseq, subtract_with_carry_engine>::value>
-	       ::type>
-        explicit
-        subtract_with_carry_engine(_Sseq& __q)
-        { seed(__q); }
-
-      /**
-       * @brief Seeds the initial state @f$x_0@f$ of the random number
-       *        generator.
-       *
-       * N1688[4.19] modifies this as follows.  If @p __value == 0,
-       * sets value to 19780503.  In any case, with a linear
-       * congruential generator lcg(i) having parameters @f$ m_{lcg} =
-       * 2147483563, a_{lcg} = 40014, c_{lcg} = 0, and lcg(0) = value
-       * @f$, sets @f$ x_{-r} \dots x_{-1} @f$ to @f$ lcg(1) \bmod m
-       * \dots lcg(r) \bmod m @f$ respectively.  If @f$ x_{-1} = 0 @f$
-       * set carry to 1, otherwise sets carry to 0.
-       */
-      void
-      seed(result_type __sd = default_seed);
-
-      /**
-       * @brief Seeds the initial state @f$x_0@f$ of the
-       * % subtract_with_carry_engine random number generator.
-       */
-      template<typename _Sseq>
-	typename std::enable_if<std::is_class<_Sseq>::value>::type
-        seed(_Sseq& __q);
-
-      /**
-       * @brief Gets the inclusive minimum value of the range of random
-       * integers returned by this generator.
-       */
-      static constexpr result_type
-      min()
-      { return 0; }
-
-      /**
-       * @brief Gets the inclusive maximum value of the range of random
-       * integers returned by this generator.
-       */
-      static constexpr result_type
-      max()
-      { return __detail::_Shift<_UIntType, __w>::__value - 1; }
-
-      /**
-       * @brief Discard a sequence of random numbers.
-       */
-      void
-      discard(unsigned long long __z)
-      {
-	for (; __z != 0ULL; --__z)
-	  (*this)();
-      }
-
-      /**
-       * @brief Gets the next random number in the sequence.
-       */
-      result_type
-      operator()();
-
-      /**
-       * @brief Compares two % subtract_with_carry_engine random number
-       *        generator objects of the same type for equality.
-       *
-       * @param __lhs A % subtract_with_carry_engine random number generator
-       *              object.
-       * @param __rhs Another % subtract_with_carry_engine random number
-       *              generator object.
-       *
-       * @returns true if the infinite sequences of generated values
-       *          would be equal, false otherwise.
-      */
-      friend bool
-      operator==(const subtract_with_carry_engine& __lhs,
-		 const subtract_with_carry_engine& __rhs)
-      { return (std::equal(__lhs._M_x, __lhs._M_x + long_lag, __rhs._M_x)
-		&& __lhs._M_carry == __rhs._M_carry
-		&& __lhs._M_p == __rhs._M_p); }
-
-      /**
-       * @brief Inserts the current state of a % subtract_with_carry_engine
-       *        random number generator engine @p __x into the output stream
-       *        @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A % subtract_with_carry_engine random number generator
-       *             engine.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _UIntType1, size_t __w1, size_t __s1, size_t __r1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::subtract_with_carry_engine<_UIntType1, __w1,
-		   __s1, __r1>& __x);
-
-      /**
-       * @brief Extracts the current state of a % subtract_with_carry_engine
-       *        random number generator engine @p __x from the input stream
-       *        @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A % subtract_with_carry_engine random number generator
-       *             engine.
-       *
-       * @returns The input stream with the state of @p __x extracted or in
-       * an error state.
-       */
-      template<typename _UIntType1, size_t __w1, size_t __s1, size_t __r1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::subtract_with_carry_engine<_UIntType1, __w1,
-		   __s1, __r1>& __x);
-
-    private:
-      /// The state of the generator.  This is a ring buffer.
-      _UIntType  _M_x[long_lag];
-      _UIntType  _M_carry;		///< The carry
-      size_t     _M_p;			///< Current index of x(i - r).
-    };
-
-  /**
-   * @brief Compares two % subtract_with_carry_engine random number
-   *        generator objects of the same type for inequality.
-   *
-   * @param __lhs A % subtract_with_carry_engine random number generator
-   *              object.
-   * @param __rhs Another % subtract_with_carry_engine random number
-   *              generator object.
-   *
-   * @returns true if the infinite sequences of generated values
-   *          would be different, false otherwise.
-   */
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r>
-    inline bool
-    operator!=(const std::subtract_with_carry_engine<_UIntType, __w,
-	       __s, __r>& __lhs,
-	       const std::subtract_with_carry_engine<_UIntType, __w,
-	       __s, __r>& __rhs)
-    { return !(__lhs == __rhs); }
-
-
-  /**
-   * Produces random numbers from some base engine by discarding blocks of
-   * data.
-   *
-   * 0 <= @p __r <= @p __p
-   */
-  template<typename _RandomNumberEngine, size_t __p, size_t __r>
-    class discard_block_engine
-    {
-      static_assert(1 <= __r && __r <= __p,
-		    "template argument substituting __r out of bounds");
-
-    public:
-      /** The type of the generated random value. */
-      typedef typename _RandomNumberEngine::result_type result_type;
-
-      // parameter values
-      static constexpr size_t block_size = __p;
-      static constexpr size_t used_block = __r;
-
-      /**
-       * @brief Constructs a default %discard_block_engine engine.
-       *
-       * The underlying engine is default constructed as well.
-       */
-      discard_block_engine()
-      : _M_b(), _M_n(0) { }
-
-      /**
-       * @brief Copy constructs a %discard_block_engine engine.
-       *
-       * Copies an existing base class random number generator.
-       * @param __rng An existing (base class) engine object.
-       */
-      explicit
-      discard_block_engine(const _RandomNumberEngine& __rng)
-      : _M_b(__rng), _M_n(0) { }
-
-      /**
-       * @brief Move constructs a %discard_block_engine engine.
-       *
-       * Copies an existing base class random number generator.
-       * @param __rng An existing (base class) engine object.
-       */
-      explicit
-      discard_block_engine(_RandomNumberEngine&& __rng)
-      : _M_b(std::move(__rng)), _M_n(0) { }
-
-      /**
-       * @brief Seed constructs a %discard_block_engine engine.
-       *
-       * Constructs the underlying generator engine seeded with @p __s.
-       * @param __s A seed value for the base class engine.
-       */
-      explicit
-      discard_block_engine(result_type __s)
-      : _M_b(__s), _M_n(0) { }
-
-      /**
-       * @brief Generator construct a %discard_block_engine engine.
-       *
-       * @param __q A seed sequence.
-       */
-      template<typename _Sseq, typename = typename
-	std::enable_if<!std::is_same<_Sseq, discard_block_engine>::value
-		       && !std::is_same<_Sseq, _RandomNumberEngine>::value>
-	       ::type>
-        explicit
-        discard_block_engine(_Sseq& __q)
-	: _M_b(__q), _M_n(0)
-        { }
-
-      /**
-       * @brief Reseeds the %discard_block_engine object with the default
-       *        seed for the underlying base class generator engine.
-       */
-      void
-      seed()
-      {
-	_M_b.seed();
-	_M_n = 0;
-      }
-
-      /**
-       * @brief Reseeds the %discard_block_engine object with the default
-       *        seed for the underlying base class generator engine.
-       */
-      void
-      seed(result_type __s)
-      {
-	_M_b.seed(__s);
-	_M_n = 0;
-      }
-
-      /**
-       * @brief Reseeds the %discard_block_engine object with the given seed
-       *        sequence.
-       * @param __q A seed generator function.
-       */
-      template<typename _Sseq>
-        void
-        seed(_Sseq& __q)
-        {
-	  _M_b.seed(__q);
-	  _M_n = 0;
-	}
-
-      /**
-       * @brief Gets a const reference to the underlying generator engine
-       *        object.
-       */
-      const _RandomNumberEngine&
-      base() const noexcept
-      { return _M_b; }
-
-      /**
-       * @brief Gets the minimum value in the generated random number range.
-       */
-      static constexpr result_type
-      min()
-      { return _RandomNumberEngine::min(); }
-
-      /**
-       * @brief Gets the maximum value in the generated random number range.
-       */
-      static constexpr result_type
-      max()
-      { return _RandomNumberEngine::max(); }
-
-      /**
-       * @brief Discard a sequence of random numbers.
-       */
-      void
-      discard(unsigned long long __z)
-      {
-	for (; __z != 0ULL; --__z)
-	  (*this)();
-      }
-
-      /**
-       * @brief Gets the next value in the generated random number sequence.
-       */
-      result_type
-      operator()();
-
-      /**
-       * @brief Compares two %discard_block_engine random number generator
-       *        objects of the same type for equality.
-       *
-       * @param __lhs A %discard_block_engine random number generator object.
-       * @param __rhs Another %discard_block_engine random number generator
-       *              object.
-       *
-       * @returns true if the infinite sequences of generated values
-       *          would be equal, false otherwise.
-       */
-      friend bool
-      operator==(const discard_block_engine& __lhs,
-		 const discard_block_engine& __rhs)
-      { return __lhs._M_b == __rhs._M_b && __lhs._M_n == __rhs._M_n; }
-
-      /**
-       * @brief Inserts the current state of a %discard_block_engine random
-       *        number generator engine @p __x into the output stream
-       *        @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %discard_block_engine random number generator engine.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RandomNumberEngine1, size_t __p1, size_t __r1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::discard_block_engine<_RandomNumberEngine1,
-		   __p1, __r1>& __x);
-
-      /**
-       * @brief Extracts the current state of a % subtract_with_carry_engine
-       *        random number generator engine @p __x from the input stream
-       *        @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %discard_block_engine random number generator engine.
-       *
-       * @returns The input stream with the state of @p __x extracted or in
-       * an error state.
-       */
-      template<typename _RandomNumberEngine1, size_t __p1, size_t __r1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::discard_block_engine<_RandomNumberEngine1,
-		   __p1, __r1>& __x);
-
-    private:
-      _RandomNumberEngine _M_b;
-      size_t _M_n;
-    };
-
-  /**
-   * @brief Compares two %discard_block_engine random number generator
-   *        objects of the same type for inequality.
-   *
-   * @param __lhs A %discard_block_engine random number generator object.
-   * @param __rhs Another %discard_block_engine random number generator
-   *              object.
-   *
-   * @returns true if the infinite sequences of generated values
-   *          would be different, false otherwise.
-   */
-  template<typename _RandomNumberEngine, size_t __p, size_t __r>
-    inline bool
-    operator!=(const std::discard_block_engine<_RandomNumberEngine, __p,
-	       __r>& __lhs,
-	       const std::discard_block_engine<_RandomNumberEngine, __p,
-	       __r>& __rhs)
-    { return !(__lhs == __rhs); }
-
-
-  /**
-   * Produces random numbers by combining random numbers from some base
-   * engine to produce random numbers with a specifies number of bits @p __w.
-   */
-  template<typename _RandomNumberEngine, size_t __w, typename _UIntType>
-    class independent_bits_engine
-    {
-      static_assert(std::is_unsigned<_UIntType>::value, "template argument "
-		    "substituting _UIntType not an unsigned integral type");
-      static_assert(0u < __w && __w <= std::numeric_limits<_UIntType>::digits,
-		    "template argument substituting __w out of bounds");
-
-    public:
-      /** The type of the generated random value. */
-      typedef _UIntType result_type;
-
-      /**
-       * @brief Constructs a default %independent_bits_engine engine.
-       *
-       * The underlying engine is default constructed as well.
-       */
-      independent_bits_engine()
-      : _M_b() { }
-
-      /**
-       * @brief Copy constructs a %independent_bits_engine engine.
-       *
-       * Copies an existing base class random number generator.
-       * @param __rng An existing (base class) engine object.
-       */
-      explicit
-      independent_bits_engine(const _RandomNumberEngine& __rng)
-      : _M_b(__rng) { }
-
-      /**
-       * @brief Move constructs a %independent_bits_engine engine.
-       *
-       * Copies an existing base class random number generator.
-       * @param __rng An existing (base class) engine object.
-       */
-      explicit
-      independent_bits_engine(_RandomNumberEngine&& __rng)
-      : _M_b(std::move(__rng)) { }
-
-      /**
-       * @brief Seed constructs a %independent_bits_engine engine.
-       *
-       * Constructs the underlying generator engine seeded with @p __s.
-       * @param __s A seed value for the base class engine.
-       */
-      explicit
-      independent_bits_engine(result_type __s)
-      : _M_b(__s) { }
-
-      /**
-       * @brief Generator construct a %independent_bits_engine engine.
-       *
-       * @param __q A seed sequence.
-       */
-      template<typename _Sseq, typename = typename
-	std::enable_if<!std::is_same<_Sseq, independent_bits_engine>::value
-		       && !std::is_same<_Sseq, _RandomNumberEngine>::value>
-               ::type>
-        explicit
-        independent_bits_engine(_Sseq& __q)
-        : _M_b(__q)
-        { }
-
-      /**
-       * @brief Reseeds the %independent_bits_engine object with the default
-       *        seed for the underlying base class generator engine.
-       */
-      void
-      seed()
-      { _M_b.seed(); }
-
-      /**
-       * @brief Reseeds the %independent_bits_engine object with the default
-       *        seed for the underlying base class generator engine.
-       */
-      void
-      seed(result_type __s)
-      { _M_b.seed(__s); }
-
-      /**
-       * @brief Reseeds the %independent_bits_engine object with the given
-       *        seed sequence.
-       * @param __q A seed generator function.
-       */
-      template<typename _Sseq>
-        void
-        seed(_Sseq& __q)
-        { _M_b.seed(__q); }
-
-      /**
-       * @brief Gets a const reference to the underlying generator engine
-       *        object.
-       */
-      const _RandomNumberEngine&
-      base() const noexcept
-      { return _M_b; }
-
-      /**
-       * @brief Gets the minimum value in the generated random number range.
-       */
-      static constexpr result_type
-      min()
-      { return 0U; }
-
-      /**
-       * @brief Gets the maximum value in the generated random number range.
-       */
-      static constexpr result_type
-      max()
-      { return __detail::_Shift<_UIntType, __w>::__value - 1; }
-
-      /**
-       * @brief Discard a sequence of random numbers.
-       */
-      void
-      discard(unsigned long long __z)
-      {
-	for (; __z != 0ULL; --__z)
-	  (*this)();
-      }
-
-      /**
-       * @brief Gets the next value in the generated random number sequence.
-       */
-      result_type
-      operator()();
-
-      /**
-       * @brief Compares two %independent_bits_engine random number generator
-       * objects of the same type for equality.
-       *
-       * @param __lhs A %independent_bits_engine random number generator
-       *              object.
-       * @param __rhs Another %independent_bits_engine random number generator
-       *              object.
-       *
-       * @returns true if the infinite sequences of generated values
-       *          would be equal, false otherwise.
-       */
-      friend bool
-      operator==(const independent_bits_engine& __lhs,
-		 const independent_bits_engine& __rhs)
-      { return __lhs._M_b == __rhs._M_b; }
-
-      /**
-       * @brief Extracts the current state of a % subtract_with_carry_engine
-       *        random number generator engine @p __x from the input stream
-       *        @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %independent_bits_engine random number generator
-       *             engine.
-       *
-       * @returns The input stream with the state of @p __x extracted or in
-       *          an error state.
-       */
-      template<typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::independent_bits_engine<_RandomNumberEngine,
-		   __w, _UIntType>& __x)
-	{
-	  __is >> __x._M_b;
-	  return __is;
-	}
-
-    private:
-      _RandomNumberEngine _M_b;
-    };
-
-  /**
-   * @brief Compares two %independent_bits_engine random number generator
-   * objects of the same type for inequality.
-   *
-   * @param __lhs A %independent_bits_engine random number generator
-   *              object.
-   * @param __rhs Another %independent_bits_engine random number generator
-   *              object.
-   *
-   * @returns true if the infinite sequences of generated values
-   *          would be different, false otherwise.
-   */
-  template<typename _RandomNumberEngine, size_t __w, typename _UIntType>
-    inline bool
-    operator!=(const std::independent_bits_engine<_RandomNumberEngine, __w,
-	       _UIntType>& __lhs,
-	       const std::independent_bits_engine<_RandomNumberEngine, __w,
-	       _UIntType>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   * @brief Inserts the current state of a %independent_bits_engine random
-   *        number generator engine @p __x into the output stream @p __os.
-   *
-   * @param __os An output stream.
-   * @param __x  A %independent_bits_engine random number generator engine.
-   *
-   * @returns The output stream with the state of @p __x inserted or in
-   *          an error state.
-   */
-  template<typename _RandomNumberEngine, size_t __w, typename _UIntType,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const std::independent_bits_engine<_RandomNumberEngine,
-	       __w, _UIntType>& __x)
-    {
-      __os << __x.base();
-      return __os;
-    }
-
-
-  /**
-   * @brief Produces random numbers by combining random numbers from some
-   * base engine to produce random numbers with a specifies number of bits
-   * @p __w.
-   */
-  template<typename _RandomNumberEngine, size_t __k>
-    class shuffle_order_engine
-    {
-      static_assert(1u <= __k, "template argument substituting "
-		    "__k out of bound");
-
-    public:
-      /** The type of the generated random value. */
-      typedef typename _RandomNumberEngine::result_type result_type;
-
-      static constexpr size_t table_size = __k;
-
-      /**
-       * @brief Constructs a default %shuffle_order_engine engine.
-       *
-       * The underlying engine is default constructed as well.
-       */
-      shuffle_order_engine()
-      : _M_b()
-      { _M_initialize(); }
-
-      /**
-       * @brief Copy constructs a %shuffle_order_engine engine.
-       *
-       * Copies an existing base class random number generator.
-       * @param __rng An existing (base class) engine object.
-       */
-      explicit
-      shuffle_order_engine(const _RandomNumberEngine& __rng)
-      : _M_b(__rng)
-      { _M_initialize(); }
-
-      /**
-       * @brief Move constructs a %shuffle_order_engine engine.
-       *
-       * Copies an existing base class random number generator.
-       * @param __rng An existing (base class) engine object.
-       */
-      explicit
-      shuffle_order_engine(_RandomNumberEngine&& __rng)
-      : _M_b(std::move(__rng))
-      { _M_initialize(); }
-
-      /**
-       * @brief Seed constructs a %shuffle_order_engine engine.
-       *
-       * Constructs the underlying generator engine seeded with @p __s.
-       * @param __s A seed value for the base class engine.
-       */
-      explicit
-      shuffle_order_engine(result_type __s)
-      : _M_b(__s)
-      { _M_initialize(); }
-
-      /**
-       * @brief Generator construct a %shuffle_order_engine engine.
-       *
-       * @param __q A seed sequence.
-       */
-      template<typename _Sseq, typename = typename
-	std::enable_if<!std::is_same<_Sseq, shuffle_order_engine>::value
-		       && !std::is_same<_Sseq, _RandomNumberEngine>::value>
-	       ::type>
-        explicit
-        shuffle_order_engine(_Sseq& __q)
-        : _M_b(__q)
-        { _M_initialize(); }
-
-      /**
-       * @brief Reseeds the %shuffle_order_engine object with the default seed
-                for the underlying base class generator engine.
-       */
-      void
-      seed()
-      {
-	_M_b.seed();
-	_M_initialize();
-      }
-
-      /**
-       * @brief Reseeds the %shuffle_order_engine object with the default seed
-       *        for the underlying base class generator engine.
-       */
-      void
-      seed(result_type __s)
-      {
-	_M_b.seed(__s);
-	_M_initialize();
-      }
-
-      /**
-       * @brief Reseeds the %shuffle_order_engine object with the given seed
-       *        sequence.
-       * @param __q A seed generator function.
-       */
-      template<typename _Sseq>
-        void
-        seed(_Sseq& __q)
-        {
-	  _M_b.seed(__q);
-	  _M_initialize();
-	}
-
-      /**
-       * Gets a const reference to the underlying generator engine object.
-       */
-      const _RandomNumberEngine&
-      base() const noexcept
-      { return _M_b; }
-
-      /**
-       * Gets the minimum value in the generated random number range.
-       */
-      static constexpr result_type
-      min()
-      { return _RandomNumberEngine::min(); }
-
-      /**
-       * Gets the maximum value in the generated random number range.
-       */
-      static constexpr result_type
-      max()
-      { return _RandomNumberEngine::max(); }
-
-      /**
-       * Discard a sequence of random numbers.
-       */
-      void
-      discard(unsigned long long __z)
-      {
-	for (; __z != 0ULL; --__z)
-	  (*this)();
-      }
-
-      /**
-       * Gets the next value in the generated random number sequence.
-       */
-      result_type
-      operator()();
-
-      /**
-       * Compares two %shuffle_order_engine random number generator objects
-       * of the same type for equality.
-       *
-       * @param __lhs A %shuffle_order_engine random number generator object.
-       * @param __rhs Another %shuffle_order_engine random number generator
-       *              object.
-       *
-       * @returns true if the infinite sequences of generated values
-       *          would be equal, false otherwise.
-      */
-      friend bool
-      operator==(const shuffle_order_engine& __lhs,
-		 const shuffle_order_engine& __rhs)
-      { return (__lhs._M_b == __rhs._M_b
-		&& std::equal(__lhs._M_v, __lhs._M_v + __k, __rhs._M_v)
-		&& __lhs._M_y == __rhs._M_y); }
-
-      /**
-       * @brief Inserts the current state of a %shuffle_order_engine random
-       *        number generator engine @p __x into the output stream
-	@p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %shuffle_order_engine random number generator engine.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RandomNumberEngine1, size_t __k1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::shuffle_order_engine<_RandomNumberEngine1,
-		   __k1>& __x);
-
-      /**
-       * @brief Extracts the current state of a % subtract_with_carry_engine
-       *        random number generator engine @p __x from the input stream
-       *        @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %shuffle_order_engine random number generator engine.
-       *
-       * @returns The input stream with the state of @p __x extracted or in
-       * an error state.
-       */
-      template<typename _RandomNumberEngine1, size_t __k1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::shuffle_order_engine<_RandomNumberEngine1, __k1>& __x);
-
-    private:
-      void _M_initialize()
-      {
-	for (size_t __i = 0; __i < __k; ++__i)
-	  _M_v[__i] = _M_b();
-	_M_y = _M_b();
-      }
-
-      _RandomNumberEngine _M_b;
-      result_type _M_v[__k];
-      result_type _M_y;
-    };
-
-  /**
-   * Compares two %shuffle_order_engine random number generator objects
-   * of the same type for inequality.
-   *
-   * @param __lhs A %shuffle_order_engine random number generator object.
-   * @param __rhs Another %shuffle_order_engine random number generator
-   *              object.
-   *
-   * @returns true if the infinite sequences of generated values
-   *          would be different, false otherwise.
-   */
-  template<typename _RandomNumberEngine, size_t __k>
-    inline bool
-    operator!=(const std::shuffle_order_engine<_RandomNumberEngine,
-	       __k>& __lhs,
-	       const std::shuffle_order_engine<_RandomNumberEngine,
-	       __k>& __rhs)
-    { return !(__lhs == __rhs); }
-
-
-  /**
-   * The classic Minimum Standard rand0 of Lewis, Goodman, and Miller.
-   */
-  typedef linear_congruential_engine<uint_fast32_t, 16807UL, 0UL, 2147483647UL>
-  minstd_rand0;
-
-  /**
-   * An alternative LCR (Lehmer Generator function).
-   */
-  typedef linear_congruential_engine<uint_fast32_t, 48271UL, 0UL, 2147483647UL>
-  minstd_rand;
-
-  /**
-   * The classic Mersenne Twister.
-   *
-   * Reference:
-   * M. Matsumoto and T. Nishimura, Mersenne Twister: A 623-Dimensionally
-   * Equidistributed Uniform Pseudo-Random Number Generator, ACM Transactions
-   * on Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.
-   */
-  typedef mersenne_twister_engine<
-    uint_fast32_t,
-    32, 624, 397, 31,
-    0x9908b0dfUL, 11,
-    0xffffffffUL, 7,
-    0x9d2c5680UL, 15,
-    0xefc60000UL, 18, 1812433253UL> mt19937;
-
-  /**
-   * An alternative Mersenne Twister.
-   */
-  typedef mersenne_twister_engine<
-    uint_fast64_t,
-    64, 312, 156, 31,
-    0xb5026f5aa96619e9ULL, 29,
-    0x5555555555555555ULL, 17,
-    0x71d67fffeda60000ULL, 37,
-    0xfff7eee000000000ULL, 43,
-    6364136223846793005ULL> mt19937_64;
-
-  typedef subtract_with_carry_engine<uint_fast32_t, 24, 10, 24>
-    ranlux24_base;
-
-  typedef subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>
-    ranlux48_base;
-
-  typedef discard_block_engine<ranlux24_base, 223, 23> ranlux24;
-
-  typedef discard_block_engine<ranlux48_base, 389, 11> ranlux48;
-
-  typedef shuffle_order_engine<minstd_rand0, 256> knuth_b;
-
-  typedef minstd_rand0 default_random_engine;
-
-  /**
-   * A standard interface to a platform-specific non-deterministic
-   * random number generator (if any are available).
-   */
-  class random_device
-  {
-  public:
-    /** The type of the generated random value. */
-    typedef unsigned int result_type;
-
-    // constructors, destructors and member functions
-
-#ifdef _GLIBCXX_USE_RANDOM_TR1
-
-    explicit
-    random_device(const std::string& __token = "default")
-    {
-      _M_init(__token);
-    }
-
-    ~random_device()
-    { _M_fini(); }
-
-#else
-
-    explicit
-    random_device(const std::string& __token = "mt19937")
-    { _M_init_pretr1(__token); }
-
-  public:
-
-#endif
-
-    static constexpr result_type
-    min()
-    { return std::numeric_limits<result_type>::min(); }
-
-    static constexpr result_type
-    max()
-    { return std::numeric_limits<result_type>::max(); }
-
-    double
-    entropy() const noexcept
-    { return 0.0; }
-
-    result_type
-    operator()()
-    {
-#ifdef _GLIBCXX_USE_RANDOM_TR1
-      return this->_M_getval();
-#else
-      return this->_M_getval_pretr1();
-#endif
-    }
-
-    // No copy functions.
-    random_device(const random_device&) = delete;
-    void operator=(const random_device&) = delete;
-
-  private:
-
-    void _M_init(const std::string& __token);
-    void _M_init_pretr1(const std::string& __token);
-    void _M_fini();
-
-    result_type _M_getval();
-    result_type _M_getval_pretr1();
-
-    union
-    {
-      void*      _M_file;
-      mt19937    _M_mt;
-    };
-  };
-
-  /* @} */ // group random_generators
-
-  /**
-   * @addtogroup random_distributions Random Number Distributions
-   * @ingroup random
-   * @{
-   */
-
-  /**
-   * @addtogroup random_distributions_uniform Uniform Distributions
-   * @ingroup random_distributions
-   * @{
-   */
-
-  /**
-   * @brief Uniform discrete distribution for random numbers.
-   * A discrete random distribution on the range @f$[min, max]@f$ with equal
-   * probability throughout the range.
-   */
-  template<typename _IntType = int>
-    class uniform_int_distribution
-    {
-      static_assert(std::is_integral<_IntType>::value,
-		    "template argument not an integral type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _IntType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef uniform_int_distribution<_IntType> distribution_type;
-
-	explicit
-	param_type(_IntType __a = 0,
-		   _IntType __b = std::numeric_limits<_IntType>::max())
-	: _M_a(__a), _M_b(__b)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_a <= _M_b);
-	}
-
-	result_type
-	a() const
-	{ return _M_a; }
-
-	result_type
-	b() const
-	{ return _M_b; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_a == __p2._M_a && __p1._M_b == __p2._M_b; }
-
-      private:
-	_IntType _M_a;
-	_IntType _M_b;
-      };
-
-    public:
-      /**
-       * @brief Constructs a uniform distribution object.
-       */
-      explicit
-      uniform_int_distribution(_IntType __a = 0,
-			   _IntType __b = std::numeric_limits<_IntType>::max())
-      : _M_param(__a, __b)
-      { }
-
-      explicit
-      uniform_int_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       *
-       * Does nothing for the uniform integer distribution.
-       */
-      void
-      reset() { }
-
-      result_type
-      a() const
-      { return _M_param.a(); }
-
-      result_type
-      b() const
-      { return _M_param.b(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the inclusive lower bound of the distribution range.
-       */
-      result_type
-      min() const
-      { return this->a(); }
-
-      /**
-       * @brief Returns the inclusive upper bound of the distribution range.
-       */
-      result_type
-      max() const
-      { return this->b(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-        { return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two uniform integer distributions have
-       *        the same parameters.
-       */
-      friend bool
-      operator==(const uniform_int_distribution& __d1,
-		 const uniform_int_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-   * @brief Return true if two uniform integer distributions have
-   *        different parameters.
-   */
-  template<typename _IntType>
-    inline bool
-    operator!=(const std::uniform_int_distribution<_IntType>& __d1,
-	       const std::uniform_int_distribution<_IntType>& __d2)
-    { return !(__d1 == __d2); }
-
-  /**
-   * @brief Inserts a %uniform_int_distribution random number
-   *        distribution @p __x into the output stream @p os.
-   *
-   * @param __os An output stream.
-   * @param __x  A %uniform_int_distribution random number distribution.
-   *
-   * @returns The output stream with the state of @p __x inserted or in
-   * an error state.
-   */
-  template<typename _IntType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>&,
-	       const std::uniform_int_distribution<_IntType>&);
-
-  /**
-   * @brief Extracts a %uniform_int_distribution random number distribution
-   * @p __x from the input stream @p __is.
-   *
-   * @param __is An input stream.
-   * @param __x  A %uniform_int_distribution random number generator engine.
-   *
-   * @returns The input stream with @p __x extracted or in an error state.
-   */
-  template<typename _IntType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>&,
-	       std::uniform_int_distribution<_IntType>&);
-
-
-  /**
-   * @brief Uniform continuous distribution for random numbers.
-   *
-   * A continuous random distribution on the range [min, max) with equal
-   * probability throughout the range.  The URNG should be real-valued and
-   * deliver number in the range [0, 1).
-   */
-  template<typename _RealType = double>
-    class uniform_real_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef uniform_real_distribution<_RealType> distribution_type;
-
-	explicit
-	param_type(_RealType __a = _RealType(0),
-		   _RealType __b = _RealType(1))
-	: _M_a(__a), _M_b(__b)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_a <= _M_b);
-	}
-
-	result_type
-	a() const
-	{ return _M_a; }
-
-	result_type
-	b() const
-	{ return _M_b; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_a == __p2._M_a && __p1._M_b == __p2._M_b; }
-
-      private:
-	_RealType _M_a;
-	_RealType _M_b;
-      };
-
-    public:
-      /**
-       * @brief Constructs a uniform_real_distribution object.
-       *
-       * @param __a [IN]  The lower bound of the distribution.
-       * @param __b [IN]  The upper bound of the distribution.
-       */
-      explicit
-      uniform_real_distribution(_RealType __a = _RealType(0),
-				_RealType __b = _RealType(1))
-      : _M_param(__a, __b)
-      { }
-
-      explicit
-      uniform_real_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       *
-       * Does nothing for the uniform real distribution.
-       */
-      void
-      reset() { }
-
-      result_type
-      a() const
-      { return _M_param.a(); }
-
-      result_type
-      b() const
-      { return _M_param.b(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the inclusive lower bound of the distribution range.
-       */
-      result_type
-      min() const
-      { return this->a(); }
-
-      /**
-       * @brief Returns the inclusive upper bound of the distribution range.
-       */
-      result_type
-      max() const
-      { return this->b(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-        { return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{
-	  __detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	    __aurng(__urng);
-	  return (__aurng() * (__p.b() - __p.a())) + __p.a();
-	}
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two uniform real distributions have
-       *        the same parameters.
-       */
-      friend bool
-      operator==(const uniform_real_distribution& __d1,
-		 const uniform_real_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-   * @brief Return true if two uniform real distributions have
-   *        different parameters.
-   */
-  template<typename _IntType>
-    inline bool
-    operator!=(const std::uniform_real_distribution<_IntType>& __d1,
-	       const std::uniform_real_distribution<_IntType>& __d2)
-    { return !(__d1 == __d2); }
-
-  /**
-   * @brief Inserts a %uniform_real_distribution random number
-   *        distribution @p __x into the output stream @p __os.
-   *
-   * @param __os An output stream.
-   * @param __x  A %uniform_real_distribution random number distribution.
-   *
-   * @returns The output stream with the state of @p __x inserted or in
-   *          an error state.
-   */
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>&,
-	       const std::uniform_real_distribution<_RealType>&);
-
-  /**
-   * @brief Extracts a %uniform_real_distribution random number distribution
-   * @p __x from the input stream @p __is.
-   *
-   * @param __is An input stream.
-   * @param __x  A %uniform_real_distribution random number generator engine.
-   *
-   * @returns The input stream with @p __x extracted or in an error state.
-   */
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>&,
-	       std::uniform_real_distribution<_RealType>&);
-
-  /* @} */ // group random_distributions_uniform
-
-  /**
-   * @addtogroup random_distributions_normal Normal Distributions
-   * @ingroup random_distributions
-   * @{
-   */
-
-  /**
-   * @brief A normal continuous distribution for random numbers.
-   *
-   * The formula for the normal probability density function is
-   * @f[
-   *     p(x|\mu,\sigma) = \frac{1}{\sigma \sqrt{2 \pi}}
-   *            e^{- \frac{{x - \mu}^ {2}}{2 \sigma ^ {2}} } 
-   * @f]
-   */
-  template<typename _RealType = double>
-    class normal_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef normal_distribution<_RealType> distribution_type;
-
-	explicit
-	param_type(_RealType __mean = _RealType(0),
-		   _RealType __stddev = _RealType(1))
-	: _M_mean(__mean), _M_stddev(__stddev)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_stddev > _RealType(0));
-	}
-
-	_RealType
-	mean() const
-	{ return _M_mean; }
-
-	_RealType
-	stddev() const
-	{ return _M_stddev; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return (__p1._M_mean == __p2._M_mean
-		  && __p1._M_stddev == __p2._M_stddev); }
-
-      private:
-	_RealType _M_mean;
-	_RealType _M_stddev;
-      };
-
-    public:
-      /**
-       * Constructs a normal distribution with parameters @f$mean@f$ and
-       * standard deviation.
-       */
-      explicit
-      normal_distribution(result_type __mean = result_type(0),
-			  result_type __stddev = result_type(1))
-      : _M_param(__mean, __stddev), _M_saved_available(false)
-      { }
-
-      explicit
-      normal_distribution(const param_type& __p)
-      : _M_param(__p), _M_saved_available(false)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_saved_available = false; }
-
-      /**
-       * @brief Returns the mean of the distribution.
-       */
-      _RealType
-      mean() const
-      { return _M_param.mean(); }
-
-      /**
-       * @brief Returns the standard deviation of the distribution.
-       */
-      _RealType
-      stddev() const
-      { return _M_param.stddev(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return std::numeric_limits<result_type>::lowest(); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two normal distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      template<typename _RealType1>
-	friend bool
-        operator==(const std::normal_distribution<_RealType1>& __d1,
-		   const std::normal_distribution<_RealType1>& __d2);
-
-      /**
-       * @brief Inserts a %normal_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %normal_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::normal_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %normal_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %normal_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error
-       *          state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::normal_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type  _M_param;
-      result_type _M_saved;
-      bool        _M_saved_available;
-    };
-
-  /**
-   * @brief Return true if two normal distributions are different.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::normal_distribution<_RealType>& __d1,
-	       const std::normal_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A lognormal_distribution random number distribution.
-   *
-   * The formula for the normal probability mass function is
-   * @f[
-   *     p(x|m,s) = \frac{1}{sx\sqrt{2\pi}}
-   *                \exp{-\frac{(\ln{x} - m)^2}{2s^2}} 
-   * @f]
-   */
-  template<typename _RealType = double>
-    class lognormal_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef lognormal_distribution<_RealType> distribution_type;
-
-	explicit
-	param_type(_RealType __m = _RealType(0),
-		   _RealType __s = _RealType(1))
-	: _M_m(__m), _M_s(__s)
-	{ }
-
-	_RealType
-	m() const
-	{ return _M_m; }
-
-	_RealType
-	s() const
-	{ return _M_s; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_m == __p2._M_m && __p1._M_s == __p2._M_s; }
-
-      private:
-	_RealType _M_m;
-	_RealType _M_s;
-      };
-
-      explicit
-      lognormal_distribution(_RealType __m = _RealType(0),
-			     _RealType __s = _RealType(1))
-      : _M_param(__m, __s), _M_nd()
-      { }
-
-      explicit
-      lognormal_distribution(const param_type& __p)
-      : _M_param(__p), _M_nd()
-      { }
-
-      /**
-       * Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_nd.reset(); }
-
-      /**
-       *
-       */
-      _RealType
-      m() const
-      { return _M_param.m(); }
-
-      _RealType
-      s() const
-      { return _M_param.s(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-        { return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-        { return std::exp(__p.s() * _M_nd(__urng) + __p.m()); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two lognormal distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      friend bool
-      operator==(const lognormal_distribution& __d1,
-		 const lognormal_distribution& __d2)
-      { return (__d1._M_param == __d2._M_param
-		&& __d1._M_nd == __d2._M_nd); }
-
-      /**
-       * @brief Inserts a %lognormal_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %lognormal_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::lognormal_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %lognormal_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %lognormal_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::lognormal_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      std::normal_distribution<result_type> _M_nd;
-    };
-
-  /**
-   * @brief Return true if two lognormal distributions are different.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::lognormal_distribution<_RealType>& __d1,
-	       const std::lognormal_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A gamma continuous distribution for random numbers.
-   *
-   * The formula for the gamma probability density function is:
-   * @f[
-   *     p(x|\alpha,\beta) = \frac{1}{\beta\Gamma(\alpha)}
-   *                         (x/\beta)^{\alpha - 1} e^{-x/\beta} 
-   * @f]
-   */
-  template<typename _RealType = double>
-    class gamma_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef gamma_distribution<_RealType> distribution_type;
-	friend class gamma_distribution<_RealType>;
-
-	explicit
-	param_type(_RealType __alpha_val = _RealType(1),
-		   _RealType __beta_val = _RealType(1))
-	: _M_alpha(__alpha_val), _M_beta(__beta_val)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_alpha > _RealType(0));
-	  _M_initialize();
-	}
-
-	_RealType
-	alpha() const
-	{ return _M_alpha; }
-
-	_RealType
-	beta() const
-	{ return _M_beta; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return (__p1._M_alpha == __p2._M_alpha
-		  && __p1._M_beta == __p2._M_beta); }
-
-      private:
-	void
-	_M_initialize();
-
-	_RealType _M_alpha;
-	_RealType _M_beta;
-
-	_RealType _M_malpha, _M_a2;
-      };
-
-    public:
-      /**
-       * @brief Constructs a gamma distribution with parameters
-       * @f$\alpha@f$ and @f$\beta@f$.
-       */
-      explicit
-      gamma_distribution(_RealType __alpha_val = _RealType(1),
-			 _RealType __beta_val = _RealType(1))
-      : _M_param(__alpha_val, __beta_val), _M_nd()
-      { }
-
-      explicit
-      gamma_distribution(const param_type& __p)
-      : _M_param(__p), _M_nd()
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_nd.reset(); }
-
-      /**
-       * @brief Returns the @f$\alpha@f$ of the distribution.
-       */
-      _RealType
-      alpha() const
-      { return _M_param.alpha(); }
-
-      /**
-       * @brief Returns the @f$\beta@f$ of the distribution.
-       */
-      _RealType
-      beta() const
-      { return _M_param.beta(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two gamma distributions have the same
-       *        parameters and the sequences that would be generated
-       *        are equal.
-       */
-      friend bool
-      operator==(const gamma_distribution& __d1,
-		 const gamma_distribution& __d2)
-      { return (__d1._M_param == __d2._M_param
-		&& __d1._M_nd == __d2._M_nd); }
-
-      /**
-       * @brief Inserts a %gamma_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %gamma_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::gamma_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %gamma_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %gamma_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::gamma_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      std::normal_distribution<result_type> _M_nd;
-    };
-
-  /**
-   * @brief Return true if two gamma distributions are different.
-   */
-   template<typename _RealType>
-     inline bool
-     operator!=(const std::gamma_distribution<_RealType>& __d1,
-		const std::gamma_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A chi_squared_distribution random number distribution.
-   *
-   * The formula for the normal probability mass function is
-   * @f$p(x|n) = \frac{x^{(n/2) - 1}e^{-x/2}}{\Gamma(n/2) 2^{n/2}}@f$
-   */
-  template<typename _RealType = double>
-    class chi_squared_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef chi_squared_distribution<_RealType> distribution_type;
-
-	explicit
-	param_type(_RealType __n = _RealType(1))
-	: _M_n(__n)
-	{ }
-
-	_RealType
-	n() const
-	{ return _M_n; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_n == __p2._M_n; }
-
-      private:
-	_RealType _M_n;
-      };
-
-      explicit
-      chi_squared_distribution(_RealType __n = _RealType(1))
-      : _M_param(__n), _M_gd(__n / 2)
-      { }
-
-      explicit
-      chi_squared_distribution(const param_type& __p)
-      : _M_param(__p), _M_gd(__p.n() / 2)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_gd.reset(); }
-
-      /**
-       *
-       */
-      _RealType
-      n() const
-      { return _M_param.n(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return 2 * _M_gd(__urng); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-        {
-	  typedef typename std::gamma_distribution<result_type>::param_type
-	    param_type;
-	  return 2 * _M_gd(__urng, param_type(__p.n() / 2));
-	}
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-        { this->__generate_impl(__f, __t, __urng); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ typename std::gamma_distribution<result_type>::param_type
-	    __p2(__p.n() / 2);
-	  this->__generate_impl(__f, __t, __urng, __p2); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng)
-        { this->__generate_impl(__f, __t, __urng); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ typename std::gamma_distribution<result_type>::param_type
-	    __p2(__p.n() / 2);
-	  this->__generate_impl(__f, __t, __urng, __p2); }
-
-      /**
-       * @brief Return true if two Chi-squared distributions have
-       *        the same parameters and the sequences that would be
-       *        generated are equal.
-       */
-      friend bool
-      operator==(const chi_squared_distribution& __d1,
-		 const chi_squared_distribution& __d2)
-      { return __d1._M_param == __d2._M_param && __d1._M_gd == __d2._M_gd; }
-
-      /**
-       * @brief Inserts a %chi_squared_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %chi_squared_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::chi_squared_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %chi_squared_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %chi_squared_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::chi_squared_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const typename
-			std::gamma_distribution<result_type>::param_type& __p);
-
-      param_type _M_param;
-
-      std::gamma_distribution<result_type> _M_gd;
-    };
-
-  /**
-   * @brief Return true if two Chi-squared distributions are different.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::chi_squared_distribution<_RealType>& __d1,
-	       const std::chi_squared_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A cauchy_distribution random number distribution.
-   *
-   * The formula for the normal probability mass function is
-   * @f$p(x|a,b) = (\pi b (1 + (\frac{x-a}{b})^2))^{-1}@f$
-   */
-  template<typename _RealType = double>
-    class cauchy_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef cauchy_distribution<_RealType> distribution_type;
-
-	explicit
-	param_type(_RealType __a = _RealType(0),
-		   _RealType __b = _RealType(1))
-	: _M_a(__a), _M_b(__b)
-	{ }
-
-	_RealType
-	a() const
-	{ return _M_a; }
-
-	_RealType
-	b() const
-	{ return _M_b; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_a == __p2._M_a && __p1._M_b == __p2._M_b; }
-
-      private:
-	_RealType _M_a;
-	_RealType _M_b;
-      };
-
-      explicit
-      cauchy_distribution(_RealType __a = _RealType(0),
-			  _RealType __b = _RealType(1))
-      : _M_param(__a, __b)
-      { }
-
-      explicit
-      cauchy_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       *
-       */
-      _RealType
-      a() const
-      { return _M_param.a(); }
-
-      _RealType
-      b() const
-      { return _M_param.b(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return std::numeric_limits<result_type>::lowest(); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two Cauchy distributions have
-       *        the same parameters.
-       */
-      friend bool
-      operator==(const cauchy_distribution& __d1,
-		 const cauchy_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-   * @brief Return true if two Cauchy distributions have
-   *        different parameters.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::cauchy_distribution<_RealType>& __d1,
-	       const std::cauchy_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-  /**
-   * @brief Inserts a %cauchy_distribution random number distribution
-   * @p __x into the output stream @p __os.
-   *
-   * @param __os An output stream.
-   * @param __x  A %cauchy_distribution random number distribution.
-   *
-   * @returns The output stream with the state of @p __x inserted or in
-   * an error state.
-   */
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const std::cauchy_distribution<_RealType>& __x);
-
-  /**
-   * @brief Extracts a %cauchy_distribution random number distribution
-   * @p __x from the input stream @p __is.
-   *
-   * @param __is An input stream.
-   * @param __x A %cauchy_distribution random number
-   *            generator engine.
-   *
-   * @returns The input stream with @p __x extracted or in an error state.
-   */
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       std::cauchy_distribution<_RealType>& __x);
-
-
-  /**
-   * @brief A fisher_f_distribution random number distribution.
-   *
-   * The formula for the normal probability mass function is
-   * @f[
-   *     p(x|m,n) = \frac{\Gamma((m+n)/2)}{\Gamma(m/2)\Gamma(n/2)}
-   *                (\frac{m}{n})^{m/2} x^{(m/2)-1}
-   *                (1 + \frac{mx}{n})^{-(m+n)/2} 
-   * @f]
-   */
-  template<typename _RealType = double>
-    class fisher_f_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef fisher_f_distribution<_RealType> distribution_type;
-
-	explicit
-	param_type(_RealType __m = _RealType(1),
-		   _RealType __n = _RealType(1))
-	: _M_m(__m), _M_n(__n)
-	{ }
-
-	_RealType
-	m() const
-	{ return _M_m; }
-
-	_RealType
-	n() const
-	{ return _M_n; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_m == __p2._M_m && __p1._M_n == __p2._M_n; }
-
-      private:
-	_RealType _M_m;
-	_RealType _M_n;
-      };
-
-      explicit
-      fisher_f_distribution(_RealType __m = _RealType(1),
-			    _RealType __n = _RealType(1))
-      : _M_param(__m, __n), _M_gd_x(__m / 2), _M_gd_y(__n / 2)
-      { }
-
-      explicit
-      fisher_f_distribution(const param_type& __p)
-      : _M_param(__p), _M_gd_x(__p.m() / 2), _M_gd_y(__p.n() / 2)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      {
-	_M_gd_x.reset();
-	_M_gd_y.reset();
-      }
-
-      /**
-       *
-       */
-      _RealType
-      m() const
-      { return _M_param.m(); }
-
-      _RealType
-      n() const
-      { return _M_param.n(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return (_M_gd_x(__urng) * n()) / (_M_gd_y(__urng) * m()); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-        {
-	  typedef typename std::gamma_distribution<result_type>::param_type
-	    param_type;
-	  return ((_M_gd_x(__urng, param_type(__p.m() / 2)) * n())
-		  / (_M_gd_y(__urng, param_type(__p.n() / 2)) * m()));
-	}
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate_impl(__f, __t, __urng); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate_impl(__f, __t, __urng); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two Fisher f distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      friend bool
-      operator==(const fisher_f_distribution& __d1,
-		 const fisher_f_distribution& __d2)
-      { return (__d1._M_param == __d2._M_param
-		&& __d1._M_gd_x == __d2._M_gd_x
-		&& __d1._M_gd_y == __d2._M_gd_y); }
-
-      /**
-       * @brief Inserts a %fisher_f_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %fisher_f_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::fisher_f_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %fisher_f_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %fisher_f_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::fisher_f_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      std::gamma_distribution<result_type> _M_gd_x, _M_gd_y;
-    };
-
-  /**
-   * @brief Return true if two Fisher f distributions are different.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::fisher_f_distribution<_RealType>& __d1,
-	       const std::fisher_f_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-  /**
-   * @brief A student_t_distribution random number distribution.
-   *
-   * The formula for the normal probability mass function is:
-   * @f[
-   *     p(x|n) = \frac{1}{\sqrt(n\pi)} \frac{\Gamma((n+1)/2)}{\Gamma(n/2)}
-   *              (1 + \frac{x^2}{n}) ^{-(n+1)/2} 
-   * @f]
-   */
-  template<typename _RealType = double>
-    class student_t_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef student_t_distribution<_RealType> distribution_type;
-
-	explicit
-	param_type(_RealType __n = _RealType(1))
-	: _M_n(__n)
-	{ }
-
-	_RealType
-	n() const
-	{ return _M_n; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_n == __p2._M_n; }
-
-      private:
-	_RealType _M_n;
-      };
-
-      explicit
-      student_t_distribution(_RealType __n = _RealType(1))
-      : _M_param(__n), _M_nd(), _M_gd(__n / 2, 2)
-      { }
-
-      explicit
-      student_t_distribution(const param_type& __p)
-      : _M_param(__p), _M_nd(), _M_gd(__p.n() / 2, 2)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      {
-	_M_nd.reset();
-	_M_gd.reset();
-      }
-
-      /**
-       *
-       */
-      _RealType
-      n() const
-      { return _M_param.n(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return std::numeric_limits<result_type>::lowest(); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-        operator()(_UniformRandomNumberGenerator& __urng)
-        { return _M_nd(__urng) * std::sqrt(n() / _M_gd(__urng)); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-        {
-	  typedef typename std::gamma_distribution<result_type>::param_type
-	    param_type;
-	
-	  const result_type __g = _M_gd(__urng, param_type(__p.n() / 2, 2));
-	  return _M_nd(__urng) * std::sqrt(__p.n() / __g);
-        }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate_impl(__f, __t, __urng); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate_impl(__f, __t, __urng); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two Student t distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      friend bool
-      operator==(const student_t_distribution& __d1,
-		 const student_t_distribution& __d2)
-      { return (__d1._M_param == __d2._M_param
-		&& __d1._M_nd == __d2._M_nd && __d1._M_gd == __d2._M_gd); }
-
-      /**
-       * @brief Inserts a %student_t_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %student_t_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::student_t_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %student_t_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %student_t_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::student_t_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng);
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      std::normal_distribution<result_type> _M_nd;
-      std::gamma_distribution<result_type> _M_gd;
-    };
-
-  /**
-   * @brief Return true if two Student t distributions are different.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::student_t_distribution<_RealType>& __d1,
-	       const std::student_t_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /* @} */ // group random_distributions_normal
-
-  /**
-   * @addtogroup random_distributions_bernoulli Bernoulli Distributions
-   * @ingroup random_distributions
-   * @{
-   */
-
-  /**
-   * @brief A Bernoulli random number distribution.
-   *
-   * Generates a sequence of true and false values with likelihood @f$p@f$
-   * that true will come up and @f$(1 - p)@f$ that false will appear.
-   */
-  class bernoulli_distribution
-  {
-  public:
-    /** The type of the range of the distribution. */
-    typedef bool result_type;
-    /** Parameter type. */
-    struct param_type
-    {
-      typedef bernoulli_distribution distribution_type;
-
-      explicit
-      param_type(double __p = 0.5)
-      : _M_p(__p)
-      {
-	_GLIBCXX_DEBUG_ASSERT((_M_p >= 0.0) && (_M_p <= 1.0));
-      }
-
-      double
-      p() const
-      { return _M_p; }
-
-      friend bool
-      operator==(const param_type& __p1, const param_type& __p2)
-      { return __p1._M_p == __p2._M_p; }
-
-    private:
-      double _M_p;
-    };
-
-  public:
-    /**
-     * @brief Constructs a Bernoulli distribution with likelihood @p p.
-     *
-     * @param __p  [IN]  The likelihood of a true result being returned.
-     *                   Must be in the interval @f$[0, 1]@f$.
-     */
-    explicit
-    bernoulli_distribution(double __p = 0.5)
-    : _M_param(__p)
-    { }
-
-    explicit
-    bernoulli_distribution(const param_type& __p)
-    : _M_param(__p)
-    { }
-
-    /**
-     * @brief Resets the distribution state.
-     *
-     * Does nothing for a Bernoulli distribution.
-     */
-    void
-    reset() { }
-
-    /**
-     * @brief Returns the @p p parameter of the distribution.
-     */
-    double
-    p() const
-    { return _M_param.p(); }
-
-    /**
-     * @brief Returns the parameter set of the distribution.
-     */
-    param_type
-    param() const
-    { return _M_param; }
-
-    /**
-     * @brief Sets the parameter set of the distribution.
-     * @param __param The new parameter set of the distribution.
-     */
-    void
-    param(const param_type& __param)
-    { _M_param = __param; }
-
-    /**
-     * @brief Returns the greatest lower bound value of the distribution.
-     */
-    result_type
-    min() const
-    { return std::numeric_limits<result_type>::min(); }
-
-    /**
-     * @brief Returns the least upper bound value of the distribution.
-     */
-    result_type
-    max() const
-    { return std::numeric_limits<result_type>::max(); }
-
-    /**
-     * @brief Generating functions.
-     */
-    template<typename _UniformRandomNumberGenerator>
-      result_type
-      operator()(_UniformRandomNumberGenerator& __urng)
-      { return this->operator()(__urng, _M_param); }
-
-    template<typename _UniformRandomNumberGenerator>
-      result_type
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      {
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-	if ((__aurng() - __aurng.min())
-	     < __p.p() * (__aurng.max() - __aurng.min()))
-	  return true;
-	return false;
-      }
-
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      __generate(_ForwardIterator __f, _ForwardIterator __t,
-		 _UniformRandomNumberGenerator& __urng)
-      { this->__generate(__f, __t, __urng, _M_param); }
-
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      __generate(_ForwardIterator __f, _ForwardIterator __t,
-		 _UniformRandomNumberGenerator& __urng, const param_type& __p)
-      { this->__generate_impl(__f, __t, __urng, __p); }
-
-    template<typename _UniformRandomNumberGenerator>
-      void
-      __generate(result_type* __f, result_type* __t,
-		 _UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      { this->__generate_impl(__f, __t, __urng, __p); }
-
-    /**
-     * @brief Return true if two Bernoulli distributions have
-     *        the same parameters.
-     */
-    friend bool
-    operator==(const bernoulli_distribution& __d1,
-	       const bernoulli_distribution& __d2)
-    { return __d1._M_param == __d2._M_param; }
-
-  private:
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p);
-
-    param_type _M_param;
-  };
-
-  /**
-   * @brief Return true if two Bernoulli distributions have
-   *        different parameters.
-   */
-  inline bool
-  operator!=(const std::bernoulli_distribution& __d1,
-	     const std::bernoulli_distribution& __d2)
-  { return !(__d1 == __d2); }
-
-  /**
-   * @brief Inserts a %bernoulli_distribution random number distribution
-   * @p __x into the output stream @p __os.
-   *
-   * @param __os An output stream.
-   * @param __x  A %bernoulli_distribution random number distribution.
-   *
-   * @returns The output stream with the state of @p __x inserted or in
-   * an error state.
-   */
-  template<typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const std::bernoulli_distribution& __x);
-
-  /**
-   * @brief Extracts a %bernoulli_distribution random number distribution
-   * @p __x from the input stream @p __is.
-   *
-   * @param __is An input stream.
-   * @param __x  A %bernoulli_distribution random number generator engine.
-   *
-   * @returns The input stream with @p __x extracted or in an error state.
-   */
-  template<typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       std::bernoulli_distribution& __x)
-    {
-      double __p;
-      __is >> __p;
-      __x.param(bernoulli_distribution::param_type(__p));
-      return __is;
-    }
-
-
-  /**
-   * @brief A discrete binomial random number distribution.
-   *
-   * The formula for the binomial probability density function is
-   * @f$p(i|t,p) = \binom{t}{i} p^i (1 - p)^{t - i}@f$ where @f$t@f$
-   * and @f$p@f$ are the parameters of the distribution.
-   */
-  template<typename _IntType = int>
-    class binomial_distribution
-    {
-      static_assert(std::is_integral<_IntType>::value,
-		    "template argument not an integral type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _IntType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef binomial_distribution<_IntType> distribution_type;
-	friend class binomial_distribution<_IntType>;
-
-	explicit
-	param_type(_IntType __t = _IntType(1), double __p = 0.5)
-	: _M_t(__t), _M_p(__p)
-	{
-	  _GLIBCXX_DEBUG_ASSERT((_M_t >= _IntType(0))
-				&& (_M_p >= 0.0)
-				&& (_M_p <= 1.0));
-	  _M_initialize();
-	}
-
-	_IntType
-	t() const
-	{ return _M_t; }
-
-	double
-	p() const
-	{ return _M_p; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_t == __p2._M_t && __p1._M_p == __p2._M_p; }
-
-      private:
-	void
-	_M_initialize();
-
-	_IntType _M_t;
-	double _M_p;
-
-	double _M_q;
-#if _GLIBCXX_USE_C99_MATH_TR1
-	double _M_d1, _M_d2, _M_s1, _M_s2, _M_c,
-	       _M_a1, _M_a123, _M_s, _M_lf, _M_lp1p;
-#endif
-	bool   _M_easy;
-      };
-
-      // constructors and member function
-      explicit
-      binomial_distribution(_IntType __t = _IntType(1),
-			    double __p = 0.5)
-      : _M_param(__t, __p), _M_nd()
-      { }
-
-      explicit
-      binomial_distribution(const param_type& __p)
-      : _M_param(__p), _M_nd()
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_nd.reset(); }
-
-      /**
-       * @brief Returns the distribution @p t parameter.
-       */
-      _IntType
-      t() const
-      { return _M_param.t(); }
-
-      /**
-       * @brief Returns the distribution @p p parameter.
-       */
-      double
-      p() const
-      { return _M_param.p(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return 0; }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return _M_param.t(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two binomial distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-	friend bool
-        operator==(const binomial_distribution& __d1,
-		   const binomial_distribution& __d2)
-#ifdef _GLIBCXX_USE_C99_MATH_TR1
-	{ return __d1._M_param == __d2._M_param && __d1._M_nd == __d2._M_nd; }
-#else
-        { return __d1._M_param == __d2._M_param; }
-#endif
-
-      /**
-       * @brief Inserts a %binomial_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %binomial_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _IntType1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::binomial_distribution<_IntType1>& __x);
-
-      /**
-       * @brief Extracts a %binomial_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %binomial_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error
-       *          state.
-       */
-      template<typename _IntType1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::binomial_distribution<_IntType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	_M_waiting(_UniformRandomNumberGenerator& __urng,
-		   _IntType __t, double __q);
-
-      param_type _M_param;
-
-      // NB: Unused when _GLIBCXX_USE_C99_MATH_TR1 is undefined.
-      std::normal_distribution<double> _M_nd;
-    };
-
-  /**
-   * @brief Return true if two binomial distributions are different.
-   */
-  template<typename _IntType>
-    inline bool
-    operator!=(const std::binomial_distribution<_IntType>& __d1,
-	       const std::binomial_distribution<_IntType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A discrete geometric random number distribution.
-   *
-   * The formula for the geometric probability density function is
-   * @f$p(i|p) = p(1 - p)^{i}@f$ where @f$p@f$ is the parameter of the
-   * distribution.
-   */
-  template<typename _IntType = int>
-    class geometric_distribution
-    {
-      static_assert(std::is_integral<_IntType>::value,
-		    "template argument not an integral type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _IntType  result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef geometric_distribution<_IntType> distribution_type;
-	friend class geometric_distribution<_IntType>;
-
-	explicit
-	param_type(double __p = 0.5)
-	: _M_p(__p)
-	{
-	  _GLIBCXX_DEBUG_ASSERT((_M_p > 0.0) && (_M_p < 1.0));
-	  _M_initialize();
-	}
-
-	double
-	p() const
-	{ return _M_p; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_p == __p2._M_p; }
-
-      private:
-	void
-	_M_initialize()
-	{ _M_log_1_p = std::log(1.0 - _M_p); }
-
-	double _M_p;
-
-	double _M_log_1_p;
-      };
-
-      // constructors and member function
-      explicit
-      geometric_distribution(double __p = 0.5)
-      : _M_param(__p)
-      { }
-
-      explicit
-      geometric_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       *
-       * Does nothing for the geometric distribution.
-       */
-      void
-      reset() { }
-
-      /**
-       * @brief Returns the distribution parameter @p p.
-       */
-      double
-      p() const
-      { return _M_param.p(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return 0; }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two geometric distributions have
-       *        the same parameters.
-       */
-      friend bool
-      operator==(const geometric_distribution& __d1,
-		 const geometric_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-   * @brief Return true if two geometric distributions have
-   *        different parameters.
-   */
-  template<typename _IntType>
-    inline bool
-    operator!=(const std::geometric_distribution<_IntType>& __d1,
-	       const std::geometric_distribution<_IntType>& __d2)
-    { return !(__d1 == __d2); }
-
-  /**
-   * @brief Inserts a %geometric_distribution random number distribution
-   * @p __x into the output stream @p __os.
-   *
-   * @param __os An output stream.
-   * @param __x  A %geometric_distribution random number distribution.
-   *
-   * @returns The output stream with the state of @p __x inserted or in
-   * an error state.
-   */
-  template<typename _IntType,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const std::geometric_distribution<_IntType>& __x);
-
-  /**
-   * @brief Extracts a %geometric_distribution random number distribution
-   * @p __x from the input stream @p __is.
-   *
-   * @param __is An input stream.
-   * @param __x  A %geometric_distribution random number generator engine.
-   *
-   * @returns The input stream with @p __x extracted or in an error state.
-   */
-  template<typename _IntType,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       std::geometric_distribution<_IntType>& __x);
-
-
-  /**
-   * @brief A negative_binomial_distribution random number distribution.
-   *
-   * The formula for the negative binomial probability mass function is
-   * @f$p(i) = \binom{n}{i} p^i (1 - p)^{t - i}@f$ where @f$t@f$
-   * and @f$p@f$ are the parameters of the distribution.
-   */
-  template<typename _IntType = int>
-    class negative_binomial_distribution
-    {
-      static_assert(std::is_integral<_IntType>::value,
-		    "template argument not an integral type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _IntType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef negative_binomial_distribution<_IntType> distribution_type;
-
-	explicit
-	param_type(_IntType __k = 1, double __p = 0.5)
-	: _M_k(__k), _M_p(__p)
-	{
-	  _GLIBCXX_DEBUG_ASSERT((_M_k > 0) && (_M_p > 0.0) && (_M_p <= 1.0));
-	}
-
-	_IntType
-	k() const
-	{ return _M_k; }
-
-	double
-	p() const
-	{ return _M_p; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_k == __p2._M_k && __p1._M_p == __p2._M_p; }
-
-      private:
-	_IntType _M_k;
-	double _M_p;
-      };
-
-      explicit
-      negative_binomial_distribution(_IntType __k = 1, double __p = 0.5)
-      : _M_param(__k, __p), _M_gd(__k, (1.0 - __p) / __p)
-      { }
-
-      explicit
-      negative_binomial_distribution(const param_type& __p)
-      : _M_param(__p), _M_gd(__p.k(), (1.0 - __p.p()) / __p.p())
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_gd.reset(); }
-
-      /**
-       * @brief Return the @f$k@f$ parameter of the distribution.
-       */
-      _IntType
-      k() const
-      { return _M_param.k(); }
-
-      /**
-       * @brief Return the @f$p@f$ parameter of the distribution.
-       */
-      double
-      p() const
-      { return _M_param.p(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-        operator()(_UniformRandomNumberGenerator& __urng);
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate_impl(__f, __t, __urng); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate_impl(__f, __t, __urng); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two negative binomial distributions have
-       *        the same parameters and the sequences that would be
-       *        generated are equal.
-       */
-      friend bool
-      operator==(const negative_binomial_distribution& __d1,
-		 const negative_binomial_distribution& __d2)
-      { return __d1._M_param == __d2._M_param && __d1._M_gd == __d2._M_gd; }
-
-      /**
-       * @brief Inserts a %negative_binomial_distribution random
-       *        number distribution @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %negative_binomial_distribution random number
-       *             distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       *          an error state.
-       */
-      template<typename _IntType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::negative_binomial_distribution<_IntType1>& __x);
-
-      /**
-       * @brief Extracts a %negative_binomial_distribution random number
-       *        distribution @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %negative_binomial_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _IntType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::negative_binomial_distribution<_IntType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng);
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      std::gamma_distribution<double> _M_gd;
-    };
-
-  /**
-   * @brief Return true if two negative binomial distributions are different.
-   */
-  template<typename _IntType>
-    inline bool
-    operator!=(const std::negative_binomial_distribution<_IntType>& __d1,
-	       const std::negative_binomial_distribution<_IntType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /* @} */ // group random_distributions_bernoulli
-
-  /**
-   * @addtogroup random_distributions_poisson Poisson Distributions
-   * @ingroup random_distributions
-   * @{
-   */
-
-  /**
-   * @brief A discrete Poisson random number distribution.
-   *
-   * The formula for the Poisson probability density function is
-   * @f$p(i|\mu) = \frac{\mu^i}{i!} e^{-\mu}@f$ where @f$\mu@f$ is the
-   * parameter of the distribution.
-   */
-  template<typename _IntType = int>
-    class poisson_distribution
-    {
-      static_assert(std::is_integral<_IntType>::value,
-		    "template argument not an integral type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _IntType  result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef poisson_distribution<_IntType> distribution_type;
-	friend class poisson_distribution<_IntType>;
-
-	explicit
-	param_type(double __mean = 1.0)
-	: _M_mean(__mean)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_mean > 0.0);
-	  _M_initialize();
-	}
-
-	double
-	mean() const
-	{ return _M_mean; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_mean == __p2._M_mean; }
-
-      private:
-	// Hosts either log(mean) or the threshold of the simple method.
-	void
-	_M_initialize();
-
-	double _M_mean;
-
-	double _M_lm_thr;
-#if _GLIBCXX_USE_C99_MATH_TR1
-	double _M_lfm, _M_sm, _M_d, _M_scx, _M_1cx, _M_c2b, _M_cb;
-#endif
-      };
-
-      // constructors and member function
-      explicit
-      poisson_distribution(double __mean = 1.0)
-      : _M_param(__mean), _M_nd()
-      { }
-
-      explicit
-      poisson_distribution(const param_type& __p)
-      : _M_param(__p), _M_nd()
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_nd.reset(); }
-
-      /**
-       * @brief Returns the distribution parameter @p mean.
-       */
-      double
-      mean() const
-      { return _M_param.mean(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return 0; }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-       /**
-	* @brief Return true if two Poisson distributions have the same
-	*        parameters and the sequences that would be generated
-	*        are equal.
-	*/
-      friend bool
-      operator==(const poisson_distribution& __d1,
-		 const poisson_distribution& __d2)
-#ifdef _GLIBCXX_USE_C99_MATH_TR1
-      { return __d1._M_param == __d2._M_param && __d1._M_nd == __d2._M_nd; }
-#else
-      { return __d1._M_param == __d2._M_param; }
-#endif
-
-      /**
-       * @brief Inserts a %poisson_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %poisson_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _IntType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::poisson_distribution<_IntType1>& __x);
-
-      /**
-       * @brief Extracts a %poisson_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %poisson_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error
-       *          state.
-       */
-      template<typename _IntType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::poisson_distribution<_IntType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      // NB: Unused when _GLIBCXX_USE_C99_MATH_TR1 is undefined.
-      std::normal_distribution<double> _M_nd;
-    };
-
-  /**
-   * @brief Return true if two Poisson distributions are different.
-   */
-  template<typename _IntType>
-    inline bool
-    operator!=(const std::poisson_distribution<_IntType>& __d1,
-	       const std::poisson_distribution<_IntType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief An exponential continuous distribution for random numbers.
-   *
-   * The formula for the exponential probability density function is
-   * @f$p(x|\lambda) = \lambda e^{-\lambda x}@f$.
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$\frac{1}{\lambda}@f$</td></tr>
-   * <tr><td>Median</td><td>@f$\frac{\ln 2}{\lambda}@f$</td></tr>
-   * <tr><td>Mode</td><td>@f$zero@f$</td></tr>
-   * <tr><td>Range</td><td>@f$[0, \infty]@f$</td></tr>
-   * <tr><td>Standard Deviation</td><td>@f$\frac{1}{\lambda}@f$</td></tr>
-   * </table>
-   */
-  template<typename _RealType = double>
-    class exponential_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef exponential_distribution<_RealType> distribution_type;
-
-	explicit
-	param_type(_RealType __lambda = _RealType(1))
-	: _M_lambda(__lambda)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_lambda > _RealType(0));
-	}
-
-	_RealType
-	lambda() const
-	{ return _M_lambda; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_lambda == __p2._M_lambda; }
-
-      private:
-	_RealType _M_lambda;
-      };
-
-    public:
-      /**
-       * @brief Constructs an exponential distribution with inverse scale
-       *        parameter @f$\lambda@f$.
-       */
-      explicit
-      exponential_distribution(const result_type& __lambda = result_type(1))
-      : _M_param(__lambda)
-      { }
-
-      explicit
-      exponential_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       *
-       * Has no effect on exponential distributions.
-       */
-      void
-      reset() { }
-
-      /**
-       * @brief Returns the inverse scale parameter of the distribution.
-       */
-      _RealType
-      lambda() const
-      { return _M_param.lambda(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-        { return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{
-	  __detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	    __aurng(__urng);
-	  return -std::log(result_type(1) - __aurng()) / __p.lambda();
-	}
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two exponential distributions have the same
-       *        parameters.
-       */
-      friend bool
-      operator==(const exponential_distribution& __d1,
-		 const exponential_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-   * @brief Return true if two exponential distributions have different
-   *        parameters.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::exponential_distribution<_RealType>& __d1,
-	       const std::exponential_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-  /**
-   * @brief Inserts a %exponential_distribution random number distribution
-   * @p __x into the output stream @p __os.
-   *
-   * @param __os An output stream.
-   * @param __x  A %exponential_distribution random number distribution.
-   *
-   * @returns The output stream with the state of @p __x inserted or in
-   * an error state.
-   */
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const std::exponential_distribution<_RealType>& __x);
-
-  /**
-   * @brief Extracts a %exponential_distribution random number distribution
-   * @p __x from the input stream @p __is.
-   *
-   * @param __is An input stream.
-   * @param __x A %exponential_distribution random number
-   *            generator engine.
-   *
-   * @returns The input stream with @p __x extracted or in an error state.
-   */
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       std::exponential_distribution<_RealType>& __x);
-
-
-  /**
-   * @brief A weibull_distribution random number distribution.
-   *
-   * The formula for the normal probability density function is:
-   * @f[
-   *     p(x|\alpha,\beta) = \frac{\alpha}{\beta} (\frac{x}{\beta})^{\alpha-1}
-   *                         \exp{(-(\frac{x}{\beta})^\alpha)} 
-   * @f]
-   */
-  template<typename _RealType = double>
-    class weibull_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef weibull_distribution<_RealType> distribution_type;
-
-	explicit
-	param_type(_RealType __a = _RealType(1),
-		   _RealType __b = _RealType(1))
-	: _M_a(__a), _M_b(__b)
-	{ }
-
-	_RealType
-	a() const
-	{ return _M_a; }
-
-	_RealType
-	b() const
-	{ return _M_b; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_a == __p2._M_a && __p1._M_b == __p2._M_b; }
-
-      private:
-	_RealType _M_a;
-	_RealType _M_b;
-      };
-
-      explicit
-      weibull_distribution(_RealType __a = _RealType(1),
-			   _RealType __b = _RealType(1))
-      : _M_param(__a, __b)
-      { }
-
-      explicit
-      weibull_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       * @brief Return the @f$a@f$ parameter of the distribution.
-       */
-      _RealType
-      a() const
-      { return _M_param.a(); }
-
-      /**
-       * @brief Return the @f$b@f$ parameter of the distribution.
-       */
-      _RealType
-      b() const
-      { return _M_param.b(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two Weibull distributions have the same
-       *        parameters.
-       */
-      friend bool
-      operator==(const weibull_distribution& __d1,
-		 const weibull_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-   /**
-    * @brief Return true if two Weibull distributions have different
-    *        parameters.
-    */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::weibull_distribution<_RealType>& __d1,
-	       const std::weibull_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-  /**
-   * @brief Inserts a %weibull_distribution random number distribution
-   * @p __x into the output stream @p __os.
-   *
-   * @param __os An output stream.
-   * @param __x  A %weibull_distribution random number distribution.
-   *
-   * @returns The output stream with the state of @p __x inserted or in
-   * an error state.
-   */
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const std::weibull_distribution<_RealType>& __x);
-
-  /**
-   * @brief Extracts a %weibull_distribution random number distribution
-   * @p __x from the input stream @p __is.
-   *
-   * @param __is An input stream.
-   * @param __x A %weibull_distribution random number
-   *            generator engine.
-   *
-   * @returns The input stream with @p __x extracted or in an error state.
-   */
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       std::weibull_distribution<_RealType>& __x);
-
-
-  /**
-   * @brief A extreme_value_distribution random number distribution.
-   *
-   * The formula for the normal probability mass function is
-   * @f[
-   *     p(x|a,b) = \frac{1}{b}
-   *                \exp( \frac{a-x}{b} - \exp(\frac{a-x}{b})) 
-   * @f]
-   */
-  template<typename _RealType = double>
-    class extreme_value_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef extreme_value_distribution<_RealType> distribution_type;
-
-	explicit
-	param_type(_RealType __a = _RealType(0),
-		   _RealType __b = _RealType(1))
-	: _M_a(__a), _M_b(__b)
-	{ }
-
-	_RealType
-	a() const
-	{ return _M_a; }
-
-	_RealType
-	b() const
-	{ return _M_b; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_a == __p2._M_a && __p1._M_b == __p2._M_b; }
-
-      private:
-	_RealType _M_a;
-	_RealType _M_b;
-      };
-
-      explicit
-      extreme_value_distribution(_RealType __a = _RealType(0),
-				 _RealType __b = _RealType(1))
-      : _M_param(__a, __b)
-      { }
-
-      explicit
-      extreme_value_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       * @brief Return the @f$a@f$ parameter of the distribution.
-       */
-      _RealType
-      a() const
-      { return _M_param.a(); }
-
-      /**
-       * @brief Return the @f$b@f$ parameter of the distribution.
-       */
-      _RealType
-      b() const
-      { return _M_param.b(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return std::numeric_limits<result_type>::lowest(); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two extreme value distributions have the same
-       *        parameters.
-       */
-      friend bool
-      operator==(const extreme_value_distribution& __d1,
-		 const extreme_value_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-    * @brief Return true if two extreme value distributions have different
-    *        parameters.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::extreme_value_distribution<_RealType>& __d1,
-	       const std::extreme_value_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-  /**
-   * @brief Inserts a %extreme_value_distribution random number distribution
-   * @p __x into the output stream @p __os.
-   *
-   * @param __os An output stream.
-   * @param __x  A %extreme_value_distribution random number distribution.
-   *
-   * @returns The output stream with the state of @p __x inserted or in
-   * an error state.
-   */
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const std::extreme_value_distribution<_RealType>& __x);
-
-  /**
-   * @brief Extracts a %extreme_value_distribution random number
-   *        distribution @p __x from the input stream @p __is.
-   *
-   * @param __is An input stream.
-   * @param __x A %extreme_value_distribution random number
-   *            generator engine.
-   *
-   * @returns The input stream with @p __x extracted or in an error state.
-   */
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       std::extreme_value_distribution<_RealType>& __x);
-
-
-  /**
-   * @brief A discrete_distribution random number distribution.
-   *
-   * The formula for the discrete probability mass function is
-   *
-   */
-  template<typename _IntType = int>
-    class discrete_distribution
-    {
-      static_assert(std::is_integral<_IntType>::value,
-		    "template argument not an integral type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _IntType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef discrete_distribution<_IntType> distribution_type;
-	friend class discrete_distribution<_IntType>;
-
-	param_type()
-	: _M_prob(), _M_cp()
-	{ }
-
-	template<typename _InputIterator>
-	  param_type(_InputIterator __wbegin,
-		     _InputIterator __wend)
-	  : _M_prob(__wbegin, __wend), _M_cp()
-	  { _M_initialize(); }
-
-	param_type(initializer_list<double> __wil)
-	: _M_prob(__wil.begin(), __wil.end()), _M_cp()
-	{ _M_initialize(); }
-
-	template<typename _Func>
-	  param_type(size_t __nw, double __xmin, double __xmax,
-		     _Func __fw);
-
-	// See: http://cpp-next.com/archive/2010/10/implicit-move-must-go/
-	param_type(const param_type&) = default;
-	param_type& operator=(const param_type&) = default;
-
-	std::vector<double>
-	probabilities() const
-	{ return _M_prob.empty() ? std::vector<double>(1, 1.0) : _M_prob; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_prob == __p2._M_prob; }
-
-      private:
-	void
-	_M_initialize();
-
-	std::vector<double> _M_prob;
-	std::vector<double> _M_cp;
-      };
-
-      discrete_distribution()
-      : _M_param()
-      { }
-
-      template<typename _InputIterator>
-	discrete_distribution(_InputIterator __wbegin,
-			      _InputIterator __wend)
-	: _M_param(__wbegin, __wend)
-	{ }
-
-      discrete_distribution(initializer_list<double> __wl)
-      : _M_param(__wl)
-      { }
-
-      template<typename _Func>
-	discrete_distribution(size_t __nw, double __xmin, double __xmax,
-			      _Func __fw)
-	: _M_param(__nw, __xmin, __xmax, __fw)
-	{ }
-
-      explicit
-      discrete_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       * @brief Returns the probabilities of the distribution.
-       */
-      std::vector<double>
-      probabilities() const
-      {
-	return _M_param._M_prob.empty()
-	  ? std::vector<double>(1, 1.0) : _M_param._M_prob;
-      }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      {
-	return _M_param._M_prob.empty()
-	  ? result_type(0) : result_type(_M_param._M_prob.size() - 1);
-      }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two discrete distributions have the same
-       *        parameters.
-       */
-      friend bool
-      operator==(const discrete_distribution& __d1,
-		 const discrete_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-      /**
-       * @brief Inserts a %discrete_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %discrete_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _IntType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::discrete_distribution<_IntType1>& __x);
-
-      /**
-       * @brief Extracts a %discrete_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %discrete_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error
-       *          state.
-       */
-      template<typename _IntType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::discrete_distribution<_IntType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-    * @brief Return true if two discrete distributions have different
-    *        parameters.
-    */
-  template<typename _IntType>
-    inline bool
-    operator!=(const std::discrete_distribution<_IntType>& __d1,
-	       const std::discrete_distribution<_IntType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A piecewise_constant_distribution random number distribution.
-   *
-   * The formula for the piecewise constant probability mass function is
-   *
-   */
-  template<typename _RealType = double>
-    class piecewise_constant_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef piecewise_constant_distribution<_RealType> distribution_type;
-	friend class piecewise_constant_distribution<_RealType>;
-
-	param_type()
-	: _M_int(), _M_den(), _M_cp()
-	{ }
-
-	template<typename _InputIteratorB, typename _InputIteratorW>
-	  param_type(_InputIteratorB __bfirst,
-		     _InputIteratorB __bend,
-		     _InputIteratorW __wbegin);
-
-	template<typename _Func>
-	  param_type(initializer_list<_RealType> __bi, _Func __fw);
-
-	template<typename _Func>
-	  param_type(size_t __nw, _RealType __xmin, _RealType __xmax,
-		     _Func __fw);
-
-	// See: http://cpp-next.com/archive/2010/10/implicit-move-must-go/
-	param_type(const param_type&) = default;
-	param_type& operator=(const param_type&) = default;
-
-	std::vector<_RealType>
-	intervals() const
-	{
-	  if (_M_int.empty())
-	    {
-	      std::vector<_RealType> __tmp(2);
-	      __tmp[1] = _RealType(1);
-	      return __tmp;
-	    }
-	  else
-	    return _M_int;
-	}
-
-	std::vector<double>
-	densities() const
-	{ return _M_den.empty() ? std::vector<double>(1, 1.0) : _M_den; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_int == __p2._M_int && __p1._M_den == __p2._M_den; }
-
-      private:
-	void
-	_M_initialize();
-
-	std::vector<_RealType> _M_int;
-	std::vector<double> _M_den;
-	std::vector<double> _M_cp;
-      };
-
-      explicit
-      piecewise_constant_distribution()
-      : _M_param()
-      { }
-
-      template<typename _InputIteratorB, typename _InputIteratorW>
-	piecewise_constant_distribution(_InputIteratorB __bfirst,
-					_InputIteratorB __bend,
-					_InputIteratorW __wbegin)
-	: _M_param(__bfirst, __bend, __wbegin)
-	{ }
-
-      template<typename _Func>
-	piecewise_constant_distribution(initializer_list<_RealType> __bl,
-					_Func __fw)
-	: _M_param(__bl, __fw)
-	{ }
-
-      template<typename _Func>
-	piecewise_constant_distribution(size_t __nw,
-					_RealType __xmin, _RealType __xmax,
-					_Func __fw)
-	: _M_param(__nw, __xmin, __xmax, __fw)
-	{ }
-
-      explicit
-      piecewise_constant_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       * @brief Returns a vector of the intervals.
-       */
-      std::vector<_RealType>
-      intervals() const
-      {
-	if (_M_param._M_int.empty())
-	  {
-	    std::vector<_RealType> __tmp(2);
-	    __tmp[1] = _RealType(1);
-	    return __tmp;
-	  }
-	else
-	  return _M_param._M_int;
-      }
-
-      /**
-       * @brief Returns a vector of the probability densities.
-       */
-      std::vector<double>
-      densities() const
-      {
-	return _M_param._M_den.empty()
-	  ? std::vector<double>(1, 1.0) : _M_param._M_den;
-      }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      {
-	return _M_param._M_int.empty()
-	  ? result_type(0) : _M_param._M_int.front();
-      }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      {
-	return _M_param._M_int.empty()
-	  ? result_type(1) : _M_param._M_int.back();
-      }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two piecewise constant distributions have the
-       *        same parameters.
-       */
-      friend bool
-      operator==(const piecewise_constant_distribution& __d1,
-		 const piecewise_constant_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-      /**
-       * @brief Inserts a %piecewise_constant_distribution random
-       *        number distribution @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %piecewise_constant_distribution random number
-       *             distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::piecewise_constant_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %piecewise_constant_distribution random
-       *        number distribution @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %piecewise_constant_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error
-       *          state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::piecewise_constant_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-    * @brief Return true if two piecewise constant distributions have 
-    *        different parameters.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::piecewise_constant_distribution<_RealType>& __d1,
-	       const std::piecewise_constant_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A piecewise_linear_distribution random number distribution.
-   *
-   * The formula for the piecewise linear probability mass function is
-   *
-   */
-  template<typename _RealType = double>
-    class piecewise_linear_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef piecewise_linear_distribution<_RealType> distribution_type;
-	friend class piecewise_linear_distribution<_RealType>;
-
-	param_type()
-	: _M_int(), _M_den(), _M_cp(), _M_m()
-	{ }
-
-	template<typename _InputIteratorB, typename _InputIteratorW>
-	  param_type(_InputIteratorB __bfirst,
-		     _InputIteratorB __bend,
-		     _InputIteratorW __wbegin);
-
-	template<typename _Func>
-	  param_type(initializer_list<_RealType> __bl, _Func __fw);
-
-	template<typename _Func>
-	  param_type(size_t __nw, _RealType __xmin, _RealType __xmax,
-		     _Func __fw);
-
-	// See: http://cpp-next.com/archive/2010/10/implicit-move-must-go/
-	param_type(const param_type&) = default;
-	param_type& operator=(const param_type&) = default;
-
-	std::vector<_RealType>
-	intervals() const
-	{
-	  if (_M_int.empty())
-	    {
-	      std::vector<_RealType> __tmp(2);
-	      __tmp[1] = _RealType(1);
-	      return __tmp;
-	    }
-	  else
-	    return _M_int;
-	}
-
-	std::vector<double>
-	densities() const
-	{ return _M_den.empty() ? std::vector<double>(2, 1.0) : _M_den; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return (__p1._M_int == __p2._M_int
-		  && __p1._M_den == __p2._M_den); }
-
-      private:
-	void
-	_M_initialize();
-
-	std::vector<_RealType> _M_int;
-	std::vector<double> _M_den;
-	std::vector<double> _M_cp;
-	std::vector<double> _M_m;
-      };
-
-      explicit
-      piecewise_linear_distribution()
-      : _M_param()
-      { }
-
-      template<typename _InputIteratorB, typename _InputIteratorW>
-	piecewise_linear_distribution(_InputIteratorB __bfirst,
-				      _InputIteratorB __bend,
-				      _InputIteratorW __wbegin)
-	: _M_param(__bfirst, __bend, __wbegin)
-	{ }
-
-      template<typename _Func>
-	piecewise_linear_distribution(initializer_list<_RealType> __bl,
-				      _Func __fw)
-	: _M_param(__bl, __fw)
-	{ }
-
-      template<typename _Func>
-	piecewise_linear_distribution(size_t __nw,
-				      _RealType __xmin, _RealType __xmax,
-				      _Func __fw)
-	: _M_param(__nw, __xmin, __xmax, __fw)
-	{ }
-
-      explicit
-      piecewise_linear_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       * @brief Return the intervals of the distribution.
-       */
-      std::vector<_RealType>
-      intervals() const
-      {
-	if (_M_param._M_int.empty())
-	  {
-	    std::vector<_RealType> __tmp(2);
-	    __tmp[1] = _RealType(1);
-	    return __tmp;
-	  }
-	else
-	  return _M_param._M_int;
-      }
-
-      /**
-       * @brief Return a vector of the probability densities of the
-       *        distribution.
-       */
-      std::vector<double>
-      densities() const
-      {
-	return _M_param._M_den.empty()
-	  ? std::vector<double>(2, 1.0) : _M_param._M_den;
-      }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      {
-	return _M_param._M_int.empty()
-	  ? result_type(0) : _M_param._M_int.front();
-      }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      {
-	return _M_param._M_int.empty()
-	  ? result_type(1) : _M_param._M_int.back();
-      }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two piecewise linear distributions have the
-       *        same parameters.
-       */
-      friend bool
-      operator==(const piecewise_linear_distribution& __d1,
-		 const piecewise_linear_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-      /**
-       * @brief Inserts a %piecewise_linear_distribution random number
-       *        distribution @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %piecewise_linear_distribution random number
-       *             distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       *          an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const std::piecewise_linear_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %piecewise_linear_distribution random number
-       *        distribution @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %piecewise_linear_distribution random number
-       *             generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error
-       *          state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   std::piecewise_linear_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-    * @brief Return true if two piecewise linear distributions have
-    *        different parameters.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const std::piecewise_linear_distribution<_RealType>& __d1,
-	       const std::piecewise_linear_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /* @} */ // group random_distributions_poisson
-
-  /* @} */ // group random_distributions
-
-  /**
-   * @addtogroup random_utilities Random Number Utilities
-   * @ingroup random
-   * @{
-   */
-
-  /**
-   * @brief The seed_seq class generates sequences of seeds for random
-   *        number generators.
-   */
-  class seed_seq
-  {
-
-  public:
-    /** The type of the seed vales. */
-    typedef uint_least32_t result_type;
-
-    /** Default constructor. */
-    seed_seq()
-    : _M_v()
-    { }
-
-    template<typename _IntType>
-      seed_seq(std::initializer_list<_IntType> il);
-
-    template<typename _InputIterator>
-      seed_seq(_InputIterator __begin, _InputIterator __end);
-
-    // generating functions
-    template<typename _RandomAccessIterator>
-      void
-      generate(_RandomAccessIterator __begin, _RandomAccessIterator __end);
-
-    // property functions
-    size_t size() const
-    { return _M_v.size(); }
-
-    template<typename OutputIterator>
-      void
-      param(OutputIterator __dest) const
-      { std::copy(_M_v.begin(), _M_v.end(), __dest); }
-
-  private:
-    ///
-    std::vector<result_type> _M_v;
-  };
-
-  /* @} */ // group random_utilities
-
-  /* @} */ // group random
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/random.tcc b/openflow/usr/include/c++/5/bits/random.tcc
deleted file mode 100644
index f10d052..0000000
--- a/openflow/usr/include/c++/5/bits/random.tcc
+++ /dev/null
@@ -1,3489 +0,0 @@
-// random number generation (out of line) -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/random.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{random}
- */
-
-#ifndef _RANDOM_TCC
-#define _RANDOM_TCC 1
-
-#include <numeric> // std::accumulate and std::partial_sum
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-  /*
-   * (Further) implementation-space details.
-   */
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    // General case for x = (ax + c) mod m -- use Schrage's algorithm
-    // to avoid integer overflow.
-    //
-    // Preconditions:  a > 0, m > 0.
-    //
-    // Note: only works correctly for __m % __a < __m / __a.
-    template<typename _Tp, _Tp __m, _Tp __a, _Tp __c>
-      _Tp
-      _Mod<_Tp, __m, __a, __c, false, true>::
-      __calc(_Tp __x)
-      {
-	if (__a == 1)
-	  __x %= __m;
-	else
-	  {
-	    static const _Tp __q = __m / __a;
-	    static const _Tp __r = __m % __a;
-
-	    _Tp __t1 = __a * (__x % __q);
-	    _Tp __t2 = __r * (__x / __q);
-	    if (__t1 >= __t2)
-	      __x = __t1 - __t2;
-	    else
-	      __x = __m - __t2 + __t1;
-	  }
-
-	if (__c != 0)
-	  {
-	    const _Tp __d = __m - __x;
-	    if (__d > __c)
-	      __x += __c;
-	    else
-	      __x = __c - __d;
-	  }
-	return __x;
-      }
-
-    template<typename _InputIterator, typename _OutputIterator,
-	     typename _Tp>
-      _OutputIterator
-      __normalize(_InputIterator __first, _InputIterator __last,
-		  _OutputIterator __result, const _Tp& __factor)
-      {
-	for (; __first != __last; ++__first, ++__result)
-	  *__result = *__first / __factor;
-	return __result;
-      }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace __detail
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    constexpr _UIntType
-    linear_congruential_engine<_UIntType, __a, __c, __m>::multiplier;
-
-  template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    constexpr _UIntType
-    linear_congruential_engine<_UIntType, __a, __c, __m>::increment;
-
-  template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    constexpr _UIntType
-    linear_congruential_engine<_UIntType, __a, __c, __m>::modulus;
-
-  template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    constexpr _UIntType
-    linear_congruential_engine<_UIntType, __a, __c, __m>::default_seed;
-
-  /**
-   * Seeds the LCR with integral value @p __s, adjusted so that the
-   * ring identity is never a member of the convergence set.
-   */
-  template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    void
-    linear_congruential_engine<_UIntType, __a, __c, __m>::
-    seed(result_type __s)
-    {
-      if ((__detail::__mod<_UIntType, __m>(__c) == 0)
-	  && (__detail::__mod<_UIntType, __m>(__s) == 0))
-	_M_x = 1;
-      else
-	_M_x = __detail::__mod<_UIntType, __m>(__s);
-    }
-
-  /**
-   * Seeds the LCR engine with a value generated by @p __q.
-   */
-  template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    template<typename _Sseq>
-      typename std::enable_if<std::is_class<_Sseq>::value>::type
-      linear_congruential_engine<_UIntType, __a, __c, __m>::
-      seed(_Sseq& __q)
-      {
-	const _UIntType __k0 = __m == 0 ? std::numeric_limits<_UIntType>::digits
-	                                : std::__lg(__m);
-	const _UIntType __k = (__k0 + 31) / 32;
-	uint_least32_t __arr[__k + 3];
-	__q.generate(__arr + 0, __arr + __k + 3);
-	_UIntType __factor = 1u;
-	_UIntType __sum = 0u;
-	for (size_t __j = 0; __j < __k; ++__j)
-	  {
-	    __sum += __arr[__j + 3] * __factor;
-	    __factor *= __detail::_Shift<_UIntType, 32>::__value;
-	  }
-	seed(__sum);
-      }
-
-  template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const linear_congruential_engine<_UIntType,
-						__a, __c, __m>& __lcr)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__os.widen(' '));
-
-      __os << __lcr._M_x;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       linear_congruential_engine<_UIntType, __a, __c, __m>& __lcr)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec);
-
-      __is >> __lcr._M_x;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr size_t
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::word_size;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr size_t
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::state_size;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr size_t
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::shift_size;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr size_t
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::mask_bits;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr _UIntType
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::xor_mask;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr size_t
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::tempering_u;
-   
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr _UIntType
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::tempering_d;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr size_t
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::tempering_s;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr _UIntType
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::tempering_b;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr size_t
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::tempering_t;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr _UIntType
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::tempering_c;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr size_t
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::tempering_l;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr _UIntType
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::
-                                              initialization_multiplier;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    constexpr _UIntType
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::default_seed;
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    void
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::
-    seed(result_type __sd)
-    {
-      _M_x[0] = __detail::__mod<_UIntType,
-	__detail::_Shift<_UIntType, __w>::__value>(__sd);
-
-      for (size_t __i = 1; __i < state_size; ++__i)
-	{
-	  _UIntType __x = _M_x[__i - 1];
-	  __x ^= __x >> (__w - 2);
-	  __x *= __f;
-	  __x += __detail::__mod<_UIntType, __n>(__i);
-	  _M_x[__i] = __detail::__mod<_UIntType,
-	    __detail::_Shift<_UIntType, __w>::__value>(__x);
-	}
-      _M_p = state_size;
-    }
-
-  template<typename _UIntType,
-	   size_t __w, size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    template<typename _Sseq>
-      typename std::enable_if<std::is_class<_Sseq>::value>::type
-      mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			      __s, __b, __t, __c, __l, __f>::
-      seed(_Sseq& __q)
-      {
-	const _UIntType __upper_mask = (~_UIntType()) << __r;
-	const size_t __k = (__w + 31) / 32;
-	uint_least32_t __arr[__n * __k];
-	__q.generate(__arr + 0, __arr + __n * __k);
-
-	bool __zero = true;
-	for (size_t __i = 0; __i < state_size; ++__i)
-	  {
-	    _UIntType __factor = 1u;
-	    _UIntType __sum = 0u;
-	    for (size_t __j = 0; __j < __k; ++__j)
-	      {
-		__sum += __arr[__k * __i + __j] * __factor;
-		__factor *= __detail::_Shift<_UIntType, 32>::__value;
-	      }
-	    _M_x[__i] = __detail::__mod<_UIntType,
-	      __detail::_Shift<_UIntType, __w>::__value>(__sum);
-
-	    if (__zero)
-	      {
-		if (__i == 0)
-		  {
-		    if ((_M_x[0] & __upper_mask) != 0u)
-		      __zero = false;
-		  }
-		else if (_M_x[__i] != 0u)
-		  __zero = false;
-	      }
-	  }
-        if (__zero)
-          _M_x[0] = __detail::_Shift<_UIntType, __w - 1>::__value;
-	_M_p = state_size;
-      }
-
-  template<typename _UIntType, size_t __w,
-	   size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    void
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::
-    _M_gen_rand(void)
-    {
-      const _UIntType __upper_mask = (~_UIntType()) << __r;
-      const _UIntType __lower_mask = ~__upper_mask;
-
-      for (size_t __k = 0; __k < (__n - __m); ++__k)
-        {
-	  _UIntType __y = ((_M_x[__k] & __upper_mask)
-			   | (_M_x[__k + 1] & __lower_mask));
-	  _M_x[__k] = (_M_x[__k + __m] ^ (__y >> 1)
-		       ^ ((__y & 0x01) ? __a : 0));
-        }
-
-      for (size_t __k = (__n - __m); __k < (__n - 1); ++__k)
-	{
-	  _UIntType __y = ((_M_x[__k] & __upper_mask)
-			   | (_M_x[__k + 1] & __lower_mask));
-	  _M_x[__k] = (_M_x[__k + (__m - __n)] ^ (__y >> 1)
-		       ^ ((__y & 0x01) ? __a : 0));
-	}
-
-      _UIntType __y = ((_M_x[__n - 1] & __upper_mask)
-		       | (_M_x[0] & __lower_mask));
-      _M_x[__n - 1] = (_M_x[__m - 1] ^ (__y >> 1)
-		       ^ ((__y & 0x01) ? __a : 0));
-      _M_p = 0;
-    }
-
-  template<typename _UIntType, size_t __w,
-	   size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    void
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::
-    discard(unsigned long long __z)
-    {
-      while (__z > state_size - _M_p)
-	{
-	  __z -= state_size - _M_p;
-	  _M_gen_rand();
-	}
-      _M_p += __z;
-    }
-
-  template<typename _UIntType, size_t __w,
-	   size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f>
-    typename
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d,
-			    __s, __b, __t, __c, __l, __f>::
-    operator()()
-    {
-      // Reload the vector - cost is O(n) amortized over n calls.
-      if (_M_p >= state_size)
-	_M_gen_rand();
-
-      // Calculate o(x(i)).
-      result_type __z = _M_x[_M_p++];
-      __z ^= (__z >> __u) & __d;
-      __z ^= (__z << __s) & __b;
-      __z ^= (__z << __t) & __c;
-      __z ^= (__z >> __l);
-
-      return __z;
-    }
-
-  template<typename _UIntType, size_t __w,
-	   size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const mersenne_twister_engine<_UIntType, __w, __n, __m,
-	       __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__space);
-
-      for (size_t __i = 0; __i < __n; ++__i)
-	__os << __x._M_x[__i] << __space;
-      __os << __x._M_p;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<typename _UIntType, size_t __w,
-	   size_t __n, size_t __m, size_t __r,
-	   _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-	   _UIntType __b, size_t __t, _UIntType __c, size_t __l,
-	   _UIntType __f, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       mersenne_twister_engine<_UIntType, __w, __n, __m,
-	       __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      for (size_t __i = 0; __i < __n; ++__i)
-	__is >> __x._M_x[__i];
-      __is >> __x._M_p;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r>
-    constexpr size_t
-    subtract_with_carry_engine<_UIntType, __w, __s, __r>::word_size;
-
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r>
-    constexpr size_t
-    subtract_with_carry_engine<_UIntType, __w, __s, __r>::short_lag;
-
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r>
-    constexpr size_t
-    subtract_with_carry_engine<_UIntType, __w, __s, __r>::long_lag;
-
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r>
-    constexpr _UIntType
-    subtract_with_carry_engine<_UIntType, __w, __s, __r>::default_seed;
-
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r>
-    void
-    subtract_with_carry_engine<_UIntType, __w, __s, __r>::
-    seed(result_type __value)
-    {
-      std::linear_congruential_engine<result_type, 40014u, 0u, 2147483563u>
-	__lcg(__value == 0u ? default_seed : __value);
-
-      const size_t __n = (__w + 31) / 32;
-
-      for (size_t __i = 0; __i < long_lag; ++__i)
-	{
-	  _UIntType __sum = 0u;
-	  _UIntType __factor = 1u;
-	  for (size_t __j = 0; __j < __n; ++__j)
-	    {
-	      __sum += __detail::__mod<uint_least32_t,
-		       __detail::_Shift<uint_least32_t, 32>::__value>
-			 (__lcg()) * __factor;
-	      __factor *= __detail::_Shift<_UIntType, 32>::__value;
-	    }
-	  _M_x[__i] = __detail::__mod<_UIntType,
-	    __detail::_Shift<_UIntType, __w>::__value>(__sum);
-	}
-      _M_carry = (_M_x[long_lag - 1] == 0) ? 1 : 0;
-      _M_p = 0;
-    }
-
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r>
-    template<typename _Sseq>
-      typename std::enable_if<std::is_class<_Sseq>::value>::type
-      subtract_with_carry_engine<_UIntType, __w, __s, __r>::
-      seed(_Sseq& __q)
-      {
-	const size_t __k = (__w + 31) / 32;
-	uint_least32_t __arr[__r * __k];
-	__q.generate(__arr + 0, __arr + __r * __k);
-
-	for (size_t __i = 0; __i < long_lag; ++__i)
-	  {
-	    _UIntType __sum = 0u;
-	    _UIntType __factor = 1u;
-	    for (size_t __j = 0; __j < __k; ++__j)
-	      {
-		__sum += __arr[__k * __i + __j] * __factor;
-		__factor *= __detail::_Shift<_UIntType, 32>::__value;
-	      }
-	    _M_x[__i] = __detail::__mod<_UIntType,
-	      __detail::_Shift<_UIntType, __w>::__value>(__sum);
-	  }
-	_M_carry = (_M_x[long_lag - 1] == 0) ? 1 : 0;
-	_M_p = 0;
-      }
-
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r>
-    typename subtract_with_carry_engine<_UIntType, __w, __s, __r>::
-	     result_type
-    subtract_with_carry_engine<_UIntType, __w, __s, __r>::
-    operator()()
-    {
-      // Derive short lag index from current index.
-      long __ps = _M_p - short_lag;
-      if (__ps < 0)
-	__ps += long_lag;
-
-      // Calculate new x(i) without overflow or division.
-      // NB: Thanks to the requirements for _UIntType, _M_x[_M_p] + _M_carry
-      // cannot overflow.
-      _UIntType __xi;
-      if (_M_x[__ps] >= _M_x[_M_p] + _M_carry)
-	{
-	  __xi = _M_x[__ps] - _M_x[_M_p] - _M_carry;
-	  _M_carry = 0;
-	}
-      else
-	{
-	  __xi = (__detail::_Shift<_UIntType, __w>::__value
-		  - _M_x[_M_p] - _M_carry + _M_x[__ps]);
-	  _M_carry = 1;
-	}
-      _M_x[_M_p] = __xi;
-
-      // Adjust current index to loop around in ring buffer.
-      if (++_M_p >= long_lag)
-	_M_p = 0;
-
-      return __xi;
-    }
-
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const subtract_with_carry_engine<_UIntType,
-						__w, __s, __r>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__space);
-
-      for (size_t __i = 0; __i < __r; ++__i)
-	__os << __x._M_x[__i] << __space;
-      __os << __x._M_carry << __space << __x._M_p;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<typename _UIntType, size_t __w, size_t __s, size_t __r,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       subtract_with_carry_engine<_UIntType, __w, __s, __r>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      for (size_t __i = 0; __i < __r; ++__i)
-	__is >> __x._M_x[__i];
-      __is >> __x._M_carry;
-      __is >> __x._M_p;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RandomNumberEngine, size_t __p, size_t __r>
-    constexpr size_t
-    discard_block_engine<_RandomNumberEngine, __p, __r>::block_size;
-
-  template<typename _RandomNumberEngine, size_t __p, size_t __r>
-    constexpr size_t
-    discard_block_engine<_RandomNumberEngine, __p, __r>::used_block;
-
-  template<typename _RandomNumberEngine, size_t __p, size_t __r>
-    typename discard_block_engine<_RandomNumberEngine,
-			   __p, __r>::result_type
-    discard_block_engine<_RandomNumberEngine, __p, __r>::
-    operator()()
-    {
-      if (_M_n >= used_block)
-	{
-	  _M_b.discard(block_size - _M_n);
-	  _M_n = 0;
-	}
-      ++_M_n;
-      return _M_b();
-    }
-
-  template<typename _RandomNumberEngine, size_t __p, size_t __r,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const discard_block_engine<_RandomNumberEngine,
-	       __p, __r>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__space);
-
-      __os << __x.base() << __space << __x._M_n;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<typename _RandomNumberEngine, size_t __p, size_t __r,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       discard_block_engine<_RandomNumberEngine, __p, __r>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      __is >> __x._M_b >> __x._M_n;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RandomNumberEngine, size_t __w, typename _UIntType>
-    typename independent_bits_engine<_RandomNumberEngine, __w, _UIntType>::
-      result_type
-    independent_bits_engine<_RandomNumberEngine, __w, _UIntType>::
-    operator()()
-    {
-      typedef typename _RandomNumberEngine::result_type _Eresult_type;
-      const _Eresult_type __r
-	= (_M_b.max() - _M_b.min() < std::numeric_limits<_Eresult_type>::max()
-	   ? _M_b.max() - _M_b.min() + 1 : 0);
-      const unsigned __edig = std::numeric_limits<_Eresult_type>::digits;
-      const unsigned __m = __r ? std::__lg(__r) : __edig;
-
-      typedef typename std::common_type<_Eresult_type, result_type>::type
-	__ctype;
-      const unsigned __cdig = std::numeric_limits<__ctype>::digits;
-
-      unsigned __n, __n0;
-      __ctype __s0, __s1, __y0, __y1;
-
-      for (size_t __i = 0; __i < 2; ++__i)
-	{
-	  __n = (__w + __m - 1) / __m + __i;
-	  __n0 = __n - __w % __n;
-	  const unsigned __w0 = __w / __n;  // __w0 <= __m
-
-	  __s0 = 0;
-	  __s1 = 0;
-	  if (__w0 < __cdig)
-	    {
-	      __s0 = __ctype(1) << __w0;
-	      __s1 = __s0 << 1;
-	    }
-
-	  __y0 = 0;
-	  __y1 = 0;
-	  if (__r)
-	    {
-	      __y0 = __s0 * (__r / __s0);
-	      if (__s1)
-		__y1 = __s1 * (__r / __s1);
-
-	      if (__r - __y0 <= __y0 / __n)
-		break;
-	    }
-	  else
-	    break;
-	}
-
-      result_type __sum = 0;
-      for (size_t __k = 0; __k < __n0; ++__k)
-	{
-	  __ctype __u;
-	  do
-	    __u = _M_b() - _M_b.min();
-	  while (__y0 && __u >= __y0);
-	  __sum = __s0 * __sum + (__s0 ? __u % __s0 : __u);
-	}
-      for (size_t __k = __n0; __k < __n; ++__k)
-	{
-	  __ctype __u;
-	  do
-	    __u = _M_b() - _M_b.min();
-	  while (__y1 && __u >= __y1);
-	  __sum = __s1 * __sum + (__s1 ? __u % __s1 : __u);
-	}
-      return __sum;
-    }
-
-
-  template<typename _RandomNumberEngine, size_t __k>
-    constexpr size_t
-    shuffle_order_engine<_RandomNumberEngine, __k>::table_size;
-
-  template<typename _RandomNumberEngine, size_t __k>
-    typename shuffle_order_engine<_RandomNumberEngine, __k>::result_type
-    shuffle_order_engine<_RandomNumberEngine, __k>::
-    operator()()
-    {
-      size_t __j = __k * ((_M_y - _M_b.min())
-			  / (_M_b.max() - _M_b.min() + 1.0L));
-      _M_y = _M_v[__j];
-      _M_v[__j] = _M_b();
-
-      return _M_y;
-    }
-
-  template<typename _RandomNumberEngine, size_t __k,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const shuffle_order_engine<_RandomNumberEngine, __k>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__space);
-
-      __os << __x.base();
-      for (size_t __i = 0; __i < __k; ++__i)
-	__os << __space << __x._M_v[__i];
-      __os << __space << __x._M_y;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<typename _RandomNumberEngine, size_t __k,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       shuffle_order_engine<_RandomNumberEngine, __k>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      __is >> __x._M_b;
-      for (size_t __i = 0; __i < __k; ++__i)
-	__is >> __x._M_v[__i];
-      __is >> __x._M_y;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _IntType>
-    template<typename _UniformRandomNumberGenerator>
-      typename uniform_int_distribution<_IntType>::result_type
-      uniform_int_distribution<_IntType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	typedef typename _UniformRandomNumberGenerator::result_type
-	  _Gresult_type;
-	typedef typename std::make_unsigned<result_type>::type __utype;
-	typedef typename std::common_type<_Gresult_type, __utype>::type
-	  __uctype;
-
-	const __uctype __urngmin = __urng.min();
-	const __uctype __urngmax = __urng.max();
-	const __uctype __urngrange = __urngmax - __urngmin;
-	const __uctype __urange
-	  = __uctype(__param.b()) - __uctype(__param.a());
-
-	__uctype __ret;
-
-	if (__urngrange > __urange)
-	  {
-	    // downscaling
-	    const __uctype __uerange = __urange + 1; // __urange can be zero
-	    const __uctype __scaling = __urngrange / __uerange;
-	    const __uctype __past = __uerange * __scaling;
-	    do
-	      __ret = __uctype(__urng()) - __urngmin;
-	    while (__ret >= __past);
-	    __ret /= __scaling;
-	  }
-	else if (__urngrange < __urange)
-	  {
-	    // upscaling
-	    /*
-	      Note that every value in [0, urange]
-	      can be written uniquely as
-
-	      (urngrange + 1) * high + low
-
-	      where
-
-	      high in [0, urange / (urngrange + 1)]
-
-	      and
-	
-	      low in [0, urngrange].
-	    */
-	    __uctype __tmp; // wraparound control
-	    do
-	      {
-		const __uctype __uerngrange = __urngrange + 1;
-		__tmp = (__uerngrange * operator()
-			 (__urng, param_type(0, __urange / __uerngrange)));
-		__ret = __tmp + (__uctype(__urng()) - __urngmin);
-	      }
-	    while (__ret > __urange || __ret < __tmp);
-	  }
-	else
-	  __ret = __uctype(__urng()) - __urngmin;
-
-	return __ret + __param.a();
-      }
-
-
-  template<typename _IntType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      uniform_int_distribution<_IntType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	typedef typename _UniformRandomNumberGenerator::result_type
-	  _Gresult_type;
-	typedef typename std::make_unsigned<result_type>::type __utype;
-	typedef typename std::common_type<_Gresult_type, __utype>::type
-	  __uctype;
-
-	const __uctype __urngmin = __urng.min();
-	const __uctype __urngmax = __urng.max();
-	const __uctype __urngrange = __urngmax - __urngmin;
-	const __uctype __urange
-	  = __uctype(__param.b()) - __uctype(__param.a());
-
-	__uctype __ret;
-
-	if (__urngrange > __urange)
-	  {
-	    if (__detail::_Power_of_2(__urngrange + 1)
-		&& __detail::_Power_of_2(__urange + 1))
-	      {
-		while (__f != __t)
-		  {
-		    __ret = __uctype(__urng()) - __urngmin;
-		    *__f++ = (__ret & __urange) + __param.a();
-		  }
-	      }
-	    else
-	      {
-		// downscaling
-		const __uctype __uerange = __urange + 1; // __urange can be zero
-		const __uctype __scaling = __urngrange / __uerange;
-		const __uctype __past = __uerange * __scaling;
-		while (__f != __t)
-		  {
-		    do
-		      __ret = __uctype(__urng()) - __urngmin;
-		    while (__ret >= __past);
-		    *__f++ = __ret / __scaling + __param.a();
-		  }
-	      }
-	  }
-	else if (__urngrange < __urange)
-	  {
-	    // upscaling
-	    /*
-	      Note that every value in [0, urange]
-	      can be written uniquely as
-
-	      (urngrange + 1) * high + low
-
-	      where
-
-	      high in [0, urange / (urngrange + 1)]
-
-	      and
-
-	      low in [0, urngrange].
-	    */
-	    __uctype __tmp; // wraparound control
-	    while (__f != __t)
-	      {
-		do
-		  {
-		    const __uctype __uerngrange = __urngrange + 1;
-		    __tmp = (__uerngrange * operator()
-			     (__urng, param_type(0, __urange / __uerngrange)));
-		    __ret = __tmp + (__uctype(__urng()) - __urngmin);
-		  }
-		while (__ret > __urange || __ret < __tmp);
-		*__f++ = __ret;
-	      }
-	  }
-	else
-	  while (__f != __t)
-	    *__f++ = __uctype(__urng()) - __urngmin + __param.a();
-      }
-
-  template<typename _IntType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const uniform_int_distribution<_IntType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-
-      __os << __x.a() << __space << __x.b();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<typename _IntType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       uniform_int_distribution<_IntType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _IntType __a, __b;
-      __is >> __a >> __b;
-      __x.param(typename uniform_int_distribution<_IntType>::
-		param_type(__a, __b));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      uniform_real_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-	auto __range = __p.b() - __p.a();
-	while (__f != __t)
-	  *__f++ = __aurng() * __range + __p.a();
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const uniform_real_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.a() << __space << __x.b();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       uniform_real_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::skipws);
-
-      _RealType __a, __b;
-      __is >> __a >> __b;
-      __x.param(typename uniform_real_distribution<_RealType>::
-		param_type(__a, __b));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _ForwardIterator,
-	   typename _UniformRandomNumberGenerator>
-    void
-    std::bernoulli_distribution::
-    __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		    _UniformRandomNumberGenerator& __urng,
-		    const param_type& __p)
-    {
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	__aurng(__urng);
-      auto __limit = __p.p() * (__aurng.max() - __aurng.min());
-
-      while (__f != __t)
-	*__f++ = (__aurng() - __aurng.min()) < __limit;
-    }
-
-  template<typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const bernoulli_distribution& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__os.widen(' '));
-      __os.precision(std::numeric_limits<double>::max_digits10);
-
-      __os << __x.p();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-
-  template<typename _IntType>
-    template<typename _UniformRandomNumberGenerator>
-      typename geometric_distribution<_IntType>::result_type
-      geometric_distribution<_IntType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	// About the epsilon thing see this thread:
-	// http://gcc.gnu.org/ml/gcc-patches/2006-10/msg00971.html
-	const double __naf =
-	  (1 - std::numeric_limits<double>::epsilon()) / 2;
-	// The largest _RealType convertible to _IntType.
-	const double __thr =
-	  std::numeric_limits<_IntType>::max() + __naf;
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-
-	double __cand;
-	do
-	  __cand = std::floor(std::log(1.0 - __aurng()) / __param._M_log_1_p);
-	while (__cand >= __thr);
-
-	return result_type(__cand + __naf);
-      }
-
-  template<typename _IntType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      geometric_distribution<_IntType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	// About the epsilon thing see this thread:
-	// http://gcc.gnu.org/ml/gcc-patches/2006-10/msg00971.html
-	const double __naf =
-	  (1 - std::numeric_limits<double>::epsilon()) / 2;
-	// The largest _RealType convertible to _IntType.
-	const double __thr =
-	  std::numeric_limits<_IntType>::max() + __naf;
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-
-	while (__f != __t)
-	  {
-	    double __cand;
-	    do
-	      __cand = std::floor(std::log(1.0 - __aurng())
-				  / __param._M_log_1_p);
-	    while (__cand >= __thr);
-
-	    *__f++ = __cand + __naf;
-	  }
-      }
-
-  template<typename _IntType,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const geometric_distribution<_IntType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__os.widen(' '));
-      __os.precision(std::numeric_limits<double>::max_digits10);
-
-      __os << __x.p();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _IntType,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       geometric_distribution<_IntType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::skipws);
-
-      double __p;
-      __is >> __p;
-      __x.param(typename geometric_distribution<_IntType>::param_type(__p));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-  // This is Leger's algorithm, also in Devroye, Ch. X, Example 1.5.
-  template<typename _IntType>
-    template<typename _UniformRandomNumberGenerator>
-      typename negative_binomial_distribution<_IntType>::result_type
-      negative_binomial_distribution<_IntType>::
-      operator()(_UniformRandomNumberGenerator& __urng)
-      {
-	const double __y = _M_gd(__urng);
-
-	// XXX Is the constructor too slow?
-	std::poisson_distribution<result_type> __poisson(__y);
-	return __poisson(__urng);
-      }
-
-  template<typename _IntType>
-    template<typename _UniformRandomNumberGenerator>
-      typename negative_binomial_distribution<_IntType>::result_type
-      negative_binomial_distribution<_IntType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      {
-	typedef typename std::gamma_distribution<double>::param_type
-	  param_type;
-	
-	const double __y =
-	  _M_gd(__urng, param_type(__p.k(), (1.0 - __p.p()) / __p.p()));
-
-	std::poisson_distribution<result_type> __poisson(__y);
-	return __poisson(__urng);
-      }
-
-  template<typename _IntType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      negative_binomial_distribution<_IntType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	while (__f != __t)
-	  {
-	    const double __y = _M_gd(__urng);
-
-	    // XXX Is the constructor too slow?
-	    std::poisson_distribution<result_type> __poisson(__y);
-	    *__f++ = __poisson(__urng);
-	  }
-      }
-
-  template<typename _IntType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      negative_binomial_distribution<_IntType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	typename std::gamma_distribution<result_type>::param_type
-	  __p2(__p.k(), (1.0 - __p.p()) / __p.p());
-
-	while (__f != __t)
-	  {
-	    const double __y = _M_gd(__urng, __p2);
-
-	    std::poisson_distribution<result_type> __poisson(__y);
-	    *__f++ = __poisson(__urng);
-	  }
-      }
-
-  template<typename _IntType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const negative_binomial_distribution<_IntType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__os.widen(' '));
-      __os.precision(std::numeric_limits<double>::max_digits10);
-
-      __os << __x.k() << __space << __x.p()
-	   << __space << __x._M_gd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _IntType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       negative_binomial_distribution<_IntType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::skipws);
-
-      _IntType __k;
-      double __p;
-      __is >> __k >> __p >> __x._M_gd;
-      __x.param(typename negative_binomial_distribution<_IntType>::
-		param_type(__k, __p));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _IntType>
-    void
-    poisson_distribution<_IntType>::param_type::
-    _M_initialize()
-    {
-#if _GLIBCXX_USE_C99_MATH_TR1
-      if (_M_mean >= 12)
-	{
-	  const double __m = std::floor(_M_mean);
-	  _M_lm_thr = std::log(_M_mean);
-	  _M_lfm = std::lgamma(__m + 1);
-	  _M_sm = std::sqrt(__m);
-
-	  const double __pi_4 = 0.7853981633974483096156608458198757L;
-	  const double __dx = std::sqrt(2 * __m * std::log(32 * __m
-							      / __pi_4));
-	  _M_d = std::round(std::max(6.0, std::min(__m, __dx)));
-	  const double __cx = 2 * __m + _M_d;
-	  _M_scx = std::sqrt(__cx / 2);
-	  _M_1cx = 1 / __cx;
-
-	  _M_c2b = std::sqrt(__pi_4 * __cx) * std::exp(_M_1cx);
-	  _M_cb = 2 * __cx * std::exp(-_M_d * _M_1cx * (1 + _M_d / 2))
-		/ _M_d;
-	}
-      else
-#endif
-	_M_lm_thr = std::exp(-_M_mean);
-      }
-
-  /**
-   * A rejection algorithm when mean >= 12 and a simple method based
-   * upon the multiplication of uniform random variates otherwise.
-   * NB: The former is available only if _GLIBCXX_USE_C99_MATH_TR1
-   * is defined.
-   *
-   * Reference:
-   * Devroye, L. Non-Uniform Random Variates Generation. Springer-Verlag,
-   * New York, 1986, Ch. X, Sects. 3.3 & 3.4 (+ Errata!).
-   */
-  template<typename _IntType>
-    template<typename _UniformRandomNumberGenerator>
-      typename poisson_distribution<_IntType>::result_type
-      poisson_distribution<_IntType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-#if _GLIBCXX_USE_C99_MATH_TR1
-	if (__param.mean() >= 12)
-	  {
-	    double __x;
-
-	    // See comments above...
-	    const double __naf =
-	      (1 - std::numeric_limits<double>::epsilon()) / 2;
-	    const double __thr =
-	      std::numeric_limits<_IntType>::max() + __naf;
-
-	    const double __m = std::floor(__param.mean());
-	    // sqrt(pi / 2)
-	    const double __spi_2 = 1.2533141373155002512078826424055226L;
-	    const double __c1 = __param._M_sm * __spi_2;
-	    const double __c2 = __param._M_c2b + __c1;
-	    const double __c3 = __c2 + 1;
-	    const double __c4 = __c3 + 1;
-	    // e^(1 / 78)
-	    const double __e178 = 1.0129030479320018583185514777512983L;
-	    const double __c5 = __c4 + __e178;
-	    const double __c = __param._M_cb + __c5;
-	    const double __2cx = 2 * (2 * __m + __param._M_d);
-
-	    bool __reject = true;
-	    do
-	      {
-		const double __u = __c * __aurng();
-		const double __e = -std::log(1.0 - __aurng());
-
-		double __w = 0.0;
-
-		if (__u <= __c1)
-		  {
-		    const double __n = _M_nd(__urng);
-		    const double __y = -std::abs(__n) * __param._M_sm - 1;
-		    __x = std::floor(__y);
-		    __w = -__n * __n / 2;
-		    if (__x < -__m)
-		      continue;
-		  }
-		else if (__u <= __c2)
-		  {
-		    const double __n = _M_nd(__urng);
-		    const double __y = 1 + std::abs(__n) * __param._M_scx;
-		    __x = std::ceil(__y);
-		    __w = __y * (2 - __y) * __param._M_1cx;
-		    if (__x > __param._M_d)
-		      continue;
-		  }
-		else if (__u <= __c3)
-		  // NB: This case not in the book, nor in the Errata,
-		  // but should be ok...
-		  __x = -1;
-		else if (__u <= __c4)
-		  __x = 0;
-		else if (__u <= __c5)
-		  __x = 1;
-		else
-		  {
-		    const double __v = -std::log(1.0 - __aurng());
-		    const double __y = __param._M_d
-				     + __v * __2cx / __param._M_d;
-		    __x = std::ceil(__y);
-		    __w = -__param._M_d * __param._M_1cx * (1 + __y / 2);
-		  }
-
-		__reject = (__w - __e - __x * __param._M_lm_thr
-			    > __param._M_lfm - std::lgamma(__x + __m + 1));
-
-		__reject |= __x + __m >= __thr;
-
-	      } while (__reject);
-
-	    return result_type(__x + __m + __naf);
-	  }
-	else
-#endif
-	  {
-	    _IntType     __x = 0;
-	    double __prod = 1.0;
-
-	    do
-	      {
-		__prod *= __aurng();
-		__x += 1;
-	      }
-	    while (__prod > __param._M_lm_thr);
-
-	    return __x - 1;
-	  }
-      }
-
-  template<typename _IntType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      poisson_distribution<_IntType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	// We could duplicate everything from operator()...
-	while (__f != __t)
-	  *__f++ = this->operator()(__urng, __param);
-      }
-
-  template<typename _IntType,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const poisson_distribution<_IntType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<double>::max_digits10);
-
-      __os << __x.mean() << __space << __x._M_nd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _IntType,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       poisson_distribution<_IntType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::skipws);
-
-      double __mean;
-      __is >> __mean >> __x._M_nd;
-      __x.param(typename poisson_distribution<_IntType>::param_type(__mean));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _IntType>
-    void
-    binomial_distribution<_IntType>::param_type::
-    _M_initialize()
-    {
-      const double __p12 = _M_p <= 0.5 ? _M_p : 1.0 - _M_p;
-
-      _M_easy = true;
-
-#if _GLIBCXX_USE_C99_MATH_TR1
-      if (_M_t * __p12 >= 8)
-	{
-	  _M_easy = false;
-	  const double __np = std::floor(_M_t * __p12);
-	  const double __pa = __np / _M_t;
-	  const double __1p = 1 - __pa;
-
-	  const double __pi_4 = 0.7853981633974483096156608458198757L;
-	  const double __d1x =
-	    std::sqrt(__np * __1p * std::log(32 * __np
-					     / (81 * __pi_4 * __1p)));
-	  _M_d1 = std::round(std::max(1.0, __d1x));
-	  const double __d2x =
-	    std::sqrt(__np * __1p * std::log(32 * _M_t * __1p
-					     / (__pi_4 * __pa)));
-	  _M_d2 = std::round(std::max(1.0, __d2x));
-
-	  // sqrt(pi / 2)
-	  const double __spi_2 = 1.2533141373155002512078826424055226L;
-	  _M_s1 = std::sqrt(__np * __1p) * (1 + _M_d1 / (4 * __np));
-	  _M_s2 = std::sqrt(__np * __1p) * (1 + _M_d2 / (4 * _M_t * __1p));
-	  _M_c = 2 * _M_d1 / __np;
-	  _M_a1 = std::exp(_M_c) * _M_s1 * __spi_2;
-	  const double __a12 = _M_a1 + _M_s2 * __spi_2;
-	  const double __s1s = _M_s1 * _M_s1;
-	  _M_a123 = __a12 + (std::exp(_M_d1 / (_M_t * __1p))
-			     * 2 * __s1s / _M_d1
-			     * std::exp(-_M_d1 * _M_d1 / (2 * __s1s)));
-	  const double __s2s = _M_s2 * _M_s2;
-	  _M_s = (_M_a123 + 2 * __s2s / _M_d2
-		  * std::exp(-_M_d2 * _M_d2 / (2 * __s2s)));
-	  _M_lf = (std::lgamma(__np + 1)
-		   + std::lgamma(_M_t - __np + 1));
-	  _M_lp1p = std::log(__pa / __1p);
-
-	  _M_q = -std::log(1 - (__p12 - __pa) / __1p);
-	}
-      else
-#endif
-	_M_q = -std::log(1 - __p12);
-    }
-
-  template<typename _IntType>
-    template<typename _UniformRandomNumberGenerator>
-      typename binomial_distribution<_IntType>::result_type
-      binomial_distribution<_IntType>::
-      _M_waiting(_UniformRandomNumberGenerator& __urng,
-		 _IntType __t, double __q)
-      {
-	_IntType __x = 0;
-	double __sum = 0.0;
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-
-	do
-	  {
-	    if (__t == __x)
-	      return __x;
-	    const double __e = -std::log(1.0 - __aurng());
-	    __sum += __e / (__t - __x);
-	    __x += 1;
-	  }
-	while (__sum <= __q);
-
-	return __x - 1;
-      }
-
-  /**
-   * A rejection algorithm when t * p >= 8 and a simple waiting time
-   * method - the second in the referenced book - otherwise.
-   * NB: The former is available only if _GLIBCXX_USE_C99_MATH_TR1
-   * is defined.
-   *
-   * Reference:
-   * Devroye, L. Non-Uniform Random Variates Generation. Springer-Verlag,
-   * New York, 1986, Ch. X, Sect. 4 (+ Errata!).
-   */
-  template<typename _IntType>
-    template<typename _UniformRandomNumberGenerator>
-      typename binomial_distribution<_IntType>::result_type
-      binomial_distribution<_IntType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	result_type __ret;
-	const _IntType __t = __param.t();
-	const double __p = __param.p();
-	const double __p12 = __p <= 0.5 ? __p : 1.0 - __p;
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-
-#if _GLIBCXX_USE_C99_MATH_TR1
-	if (!__param._M_easy)
-	  {
-	    double __x;
-
-	    // See comments above...
-	    const double __naf =
-	      (1 - std::numeric_limits<double>::epsilon()) / 2;
-	    const double __thr =
-	      std::numeric_limits<_IntType>::max() + __naf;
-
-	    const double __np = std::floor(__t * __p12);
-
-	    // sqrt(pi / 2)
-	    const double __spi_2 = 1.2533141373155002512078826424055226L;
-	    const double __a1 = __param._M_a1;
-	    const double __a12 = __a1 + __param._M_s2 * __spi_2;
-	    const double __a123 = __param._M_a123;
-	    const double __s1s = __param._M_s1 * __param._M_s1;
-	    const double __s2s = __param._M_s2 * __param._M_s2;
-
-	    bool __reject;
-	    do
-	      {
-		const double __u = __param._M_s * __aurng();
-
-		double __v;
-
-		if (__u <= __a1)
-		  {
-		    const double __n = _M_nd(__urng);
-		    const double __y = __param._M_s1 * std::abs(__n);
-		    __reject = __y >= __param._M_d1;
-		    if (!__reject)
-		      {
-			const double __e = -std::log(1.0 - __aurng());
-			__x = std::floor(__y);
-			__v = -__e - __n * __n / 2 + __param._M_c;
-		      }
-		  }
-		else if (__u <= __a12)
-		  {
-		    const double __n = _M_nd(__urng);
-		    const double __y = __param._M_s2 * std::abs(__n);
-		    __reject = __y >= __param._M_d2;
-		    if (!__reject)
-		      {
-			const double __e = -std::log(1.0 - __aurng());
-			__x = std::floor(-__y);
-			__v = -__e - __n * __n / 2;
-		      }
-		  }
-		else if (__u <= __a123)
-		  {
-		    const double __e1 = -std::log(1.0 - __aurng());
-		    const double __e2 = -std::log(1.0 - __aurng());
-
-		    const double __y = __param._M_d1
-				     + 2 * __s1s * __e1 / __param._M_d1;
-		    __x = std::floor(__y);
-		    __v = (-__e2 + __param._M_d1 * (1 / (__t - __np)
-						    -__y / (2 * __s1s)));
-		    __reject = false;
-		  }
-		else
-		  {
-		    const double __e1 = -std::log(1.0 - __aurng());
-		    const double __e2 = -std::log(1.0 - __aurng());
-
-		    const double __y = __param._M_d2
-				     + 2 * __s2s * __e1 / __param._M_d2;
-		    __x = std::floor(-__y);
-		    __v = -__e2 - __param._M_d2 * __y / (2 * __s2s);
-		    __reject = false;
-		  }
-
-		__reject = __reject || __x < -__np || __x > __t - __np;
-		if (!__reject)
-		  {
-		    const double __lfx =
-		      std::lgamma(__np + __x + 1)
-		      + std::lgamma(__t - (__np + __x) + 1);
-		    __reject = __v > __param._M_lf - __lfx
-			     + __x * __param._M_lp1p;
-		  }
-
-		__reject |= __x + __np >= __thr;
-	      }
-	    while (__reject);
-
-	    __x += __np + __naf;
-
-	    const _IntType __z = _M_waiting(__urng, __t - _IntType(__x),
-					    __param._M_q);
-	    __ret = _IntType(__x) + __z;
-	  }
-	else
-#endif
-	  __ret = _M_waiting(__urng, __t, __param._M_q);
-
-	if (__p12 != __p)
-	  __ret = __t - __ret;
-	return __ret;
-      }
-
-  template<typename _IntType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      binomial_distribution<_IntType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	// We could duplicate everything from operator()...
-	while (__f != __t)
-	  *__f++ = this->operator()(__urng, __param);
-      }
-
-  template<typename _IntType,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const binomial_distribution<_IntType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<double>::max_digits10);
-
-      __os << __x.t() << __space << __x.p()
-	   << __space << __x._M_nd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _IntType,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       binomial_distribution<_IntType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _IntType __t;
-      double __p;
-      __is >> __t >> __p >> __x._M_nd;
-      __x.param(typename binomial_distribution<_IntType>::
-		param_type(__t, __p));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      std::exponential_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-	while (__f != __t)
-	  *__f++ = -std::log(result_type(1) - __aurng()) / __p.lambda();
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const exponential_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__os.widen(' '));
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.lambda();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       exponential_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __lambda;
-      __is >> __lambda;
-      __x.param(typename exponential_distribution<_RealType>::
-		param_type(__lambda));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  /**
-   * Polar method due to Marsaglia.
-   *
-   * Devroye, L. Non-Uniform Random Variates Generation. Springer-Verlag,
-   * New York, 1986, Ch. V, Sect. 4.4.
-   */
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename normal_distribution<_RealType>::result_type
-      normal_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	result_type __ret;
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-
-	if (_M_saved_available)
-	  {
-	    _M_saved_available = false;
-	    __ret = _M_saved;
-	  }
-	else
-	  {
-	    result_type __x, __y, __r2;
-	    do
-	      {
-		__x = result_type(2.0) * __aurng() - 1.0;
-		__y = result_type(2.0) * __aurng() - 1.0;
-		__r2 = __x * __x + __y * __y;
-	      }
-	    while (__r2 > 1.0 || __r2 == 0.0);
-
-	    const result_type __mult = std::sqrt(-2 * std::log(__r2) / __r2);
-	    _M_saved = __x * __mult;
-	    _M_saved_available = true;
-	    __ret = __y * __mult;
-	  }
-
-	__ret = __ret * __param.stddev() + __param.mean();
-	return __ret;
-      }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      normal_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-
-	if (__f == __t)
-	  return;
-
-	if (_M_saved_available)
-	  {
-	    _M_saved_available = false;
-	    *__f++ = _M_saved * __param.stddev() + __param.mean();
-
-	    if (__f == __t)
-	      return;
-	  }
-
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-
-	while (__f + 1 < __t)
-	  {
-	    result_type __x, __y, __r2;
-	    do
-	      {
-		__x = result_type(2.0) * __aurng() - 1.0;
-		__y = result_type(2.0) * __aurng() - 1.0;
-		__r2 = __x * __x + __y * __y;
-	      }
-	    while (__r2 > 1.0 || __r2 == 0.0);
-
-	    const result_type __mult = std::sqrt(-2 * std::log(__r2) / __r2);
-	    *__f++ = __y * __mult * __param.stddev() + __param.mean();
-	    *__f++ = __x * __mult * __param.stddev() + __param.mean();
-	  }
-
-	if (__f != __t)
-	  {
-	    result_type __x, __y, __r2;
-	    do
-	      {
-		__x = result_type(2.0) * __aurng() - 1.0;
-		__y = result_type(2.0) * __aurng() - 1.0;
-		__r2 = __x * __x + __y * __y;
-	      }
-	    while (__r2 > 1.0 || __r2 == 0.0);
-
-	    const result_type __mult = std::sqrt(-2 * std::log(__r2) / __r2);
-	    _M_saved = __x * __mult;
-	    _M_saved_available = true;
-	    *__f = __y * __mult * __param.stddev() + __param.mean();
-	  }
-      }
-
-  template<typename _RealType>
-    bool
-    operator==(const std::normal_distribution<_RealType>& __d1,
-	       const std::normal_distribution<_RealType>& __d2)
-    {
-      if (__d1._M_param == __d2._M_param
-	  && __d1._M_saved_available == __d2._M_saved_available)
-	{
-	  if (__d1._M_saved_available
-	      && __d1._M_saved == __d2._M_saved)
-	    return true;
-	  else if(!__d1._M_saved_available)
-	    return true;
-	  else
-	    return false;
-	}
-      else
-	return false;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const normal_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.mean() << __space << __x.stddev()
-	   << __space << __x._M_saved_available;
-      if (__x._M_saved_available)
-	__os << __space << __x._M_saved;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       normal_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      double __mean, __stddev;
-      __is >> __mean >> __stddev
-	   >> __x._M_saved_available;
-      if (__x._M_saved_available)
-	__is >> __x._M_saved;
-      __x.param(typename normal_distribution<_RealType>::
-		param_type(__mean, __stddev));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      lognormal_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	  while (__f != __t)
-	    *__f++ = std::exp(__p.s() * _M_nd(__urng) + __p.m());
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const lognormal_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.m() << __space << __x.s()
-	   << __space << __x._M_nd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       lognormal_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __m, __s;
-      __is >> __m >> __s >> __x._M_nd;
-      __x.param(typename lognormal_distribution<_RealType>::
-		param_type(__m, __s));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      std::chi_squared_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	while (__f != __t)
-	  *__f++ = 2 * _M_gd(__urng);
-      }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      std::chi_squared_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const typename
-		      std::gamma_distribution<result_type>::param_type& __p)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	while (__f != __t)
-	  *__f++ = 2 * _M_gd(__urng, __p);
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const chi_squared_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.n() << __space << __x._M_gd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       chi_squared_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __n;
-      __is >> __n >> __x._M_gd;
-      __x.param(typename chi_squared_distribution<_RealType>::
-		param_type(__n));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename cauchy_distribution<_RealType>::result_type
-      cauchy_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      {
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-	_RealType __u;
-	do
-	  __u = __aurng();
-	while (__u == 0.5);
-
-	const _RealType __pi = 3.1415926535897932384626433832795029L;
-	return __p.a() + __p.b() * std::tan(__pi * __u);
-      }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      cauchy_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	const _RealType __pi = 3.1415926535897932384626433832795029L;
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-	while (__f != __t)
-	  {
-	    _RealType __u;
-	    do
-	      __u = __aurng();
-	    while (__u == 0.5);
-
-	    *__f++ = __p.a() + __p.b() * std::tan(__pi * __u);
-	  }
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const cauchy_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.a() << __space << __x.b();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       cauchy_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __a, __b;
-      __is >> __a >> __b;
-      __x.param(typename cauchy_distribution<_RealType>::
-		param_type(__a, __b));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      std::fisher_f_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	while (__f != __t)
-	  *__f++ = ((_M_gd_x(__urng) * n()) / (_M_gd_y(__urng) * m()));
-      }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      std::fisher_f_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	typedef typename std::gamma_distribution<result_type>::param_type
-	  param_type;
-	param_type __p1(__p.m() / 2);
-	param_type __p2(__p.n() / 2);
-	while (__f != __t)
-	  *__f++ = ((_M_gd_x(__urng, __p1) * n())
-		    / (_M_gd_y(__urng, __p2) * m()));
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const fisher_f_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.m() << __space << __x.n()
-	   << __space << __x._M_gd_x << __space << __x._M_gd_y;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       fisher_f_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __m, __n;
-      __is >> __m >> __n >> __x._M_gd_x >> __x._M_gd_y;
-      __x.param(typename fisher_f_distribution<_RealType>::
-		param_type(__m, __n));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      std::student_t_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	while (__f != __t)
-	  *__f++ = _M_nd(__urng) * std::sqrt(n() / _M_gd(__urng));
-      }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      std::student_t_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	typename std::gamma_distribution<result_type>::param_type
-	  __p2(__p.n() / 2, 2);
-	while (__f != __t)
-	  *__f++ =  _M_nd(__urng) * std::sqrt(__p.n() / _M_gd(__urng, __p2));
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const student_t_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.n() << __space << __x._M_nd << __space << __x._M_gd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       student_t_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __n;
-      __is >> __n >> __x._M_nd >> __x._M_gd;
-      __x.param(typename student_t_distribution<_RealType>::param_type(__n));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    void
-    gamma_distribution<_RealType>::param_type::
-    _M_initialize()
-    {
-      _M_malpha = _M_alpha < 1.0 ? _M_alpha + _RealType(1.0) : _M_alpha;
-
-      const _RealType __a1 = _M_malpha - _RealType(1.0) / _RealType(3.0);
-      _M_a2 = _RealType(1.0) / std::sqrt(_RealType(9.0) * __a1);
-    }
-
-  /**
-   * Marsaglia, G. and Tsang, W. W.
-   * "A Simple Method for Generating Gamma Variables"
-   * ACM Transactions on Mathematical Software, 26, 3, 363-372, 2000.
-   */
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename gamma_distribution<_RealType>::result_type
-      gamma_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-
-	result_type __u, __v, __n;
-	const result_type __a1 = (__param._M_malpha
-				  - _RealType(1.0) / _RealType(3.0));
-
-	do
-	  {
-	    do
-	      {
-		__n = _M_nd(__urng);
-		__v = result_type(1.0) + __param._M_a2 * __n; 
-	      }
-	    while (__v <= 0.0);
-
-	    __v = __v * __v * __v;
-	    __u = __aurng();
-	  }
-	while (__u > result_type(1.0) - 0.331 * __n * __n * __n * __n
-	       && (std::log(__u) > (0.5 * __n * __n + __a1
-				    * (1.0 - __v + std::log(__v)))));
-
-	if (__param.alpha() == __param._M_malpha)
-	  return __a1 * __v * __param.beta();
-	else
-	  {
-	    do
-	      __u = __aurng();
-	    while (__u == 0.0);
-	    
-	    return (std::pow(__u, result_type(1.0) / __param.alpha())
-		    * __a1 * __v * __param.beta());
-	  }
-      }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      gamma_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-
-	result_type __u, __v, __n;
-	const result_type __a1 = (__param._M_malpha
-				  - _RealType(1.0) / _RealType(3.0));
-
-	if (__param.alpha() == __param._M_malpha)
-	  while (__f != __t)
-	    {
-	      do
-		{
-		  do
-		    {
-		      __n = _M_nd(__urng);
-		      __v = result_type(1.0) + __param._M_a2 * __n;
-		    }
-		  while (__v <= 0.0);
-
-		  __v = __v * __v * __v;
-		  __u = __aurng();
-		}
-	      while (__u > result_type(1.0) - 0.331 * __n * __n * __n * __n
-		     && (std::log(__u) > (0.5 * __n * __n + __a1
-					  * (1.0 - __v + std::log(__v)))));
-
-	      *__f++ = __a1 * __v * __param.beta();
-	    }
-	else
-	  while (__f != __t)
-	    {
-	      do
-		{
-		  do
-		    {
-		      __n = _M_nd(__urng);
-		      __v = result_type(1.0) + __param._M_a2 * __n;
-		    }
-		  while (__v <= 0.0);
-
-		  __v = __v * __v * __v;
-		  __u = __aurng();
-		}
-	      while (__u > result_type(1.0) - 0.331 * __n * __n * __n * __n
-		     && (std::log(__u) > (0.5 * __n * __n + __a1
-					  * (1.0 - __v + std::log(__v)))));
-
-	      do
-		__u = __aurng();
-	      while (__u == 0.0);
-
-	      *__f++ = (std::pow(__u, result_type(1.0) / __param.alpha())
-			* __a1 * __v * __param.beta());
-	    }
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const gamma_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.alpha() << __space << __x.beta()
-	   << __space << __x._M_nd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       gamma_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __alpha_val, __beta_val;
-      __is >> __alpha_val >> __beta_val >> __x._M_nd;
-      __x.param(typename gamma_distribution<_RealType>::
-		param_type(__alpha_val, __beta_val));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename weibull_distribution<_RealType>::result_type
-      weibull_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      {
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-	return __p.b() * std::pow(-std::log(result_type(1) - __aurng()),
-				  result_type(1) / __p.a());
-      }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      weibull_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-	auto __inv_a = result_type(1) / __p.a();
-
-	while (__f != __t)
-	  *__f++ = __p.b() * std::pow(-std::log(result_type(1) - __aurng()),
-				      __inv_a);
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const weibull_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.a() << __space << __x.b();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       weibull_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __a, __b;
-      __is >> __a >> __b;
-      __x.param(typename weibull_distribution<_RealType>::
-		param_type(__a, __b));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename extreme_value_distribution<_RealType>::result_type
-      extreme_value_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      {
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-	return __p.a() - __p.b() * std::log(-std::log(result_type(1)
-						      - __aurng()));
-      }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      extreme_value_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-
-	while (__f != __t)
-	  *__f++ = __p.a() - __p.b() * std::log(-std::log(result_type(1)
-							  - __aurng()));
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const extreme_value_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.a() << __space << __x.b();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       extreme_value_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __a, __b;
-      __is >> __a >> __b;
-      __x.param(typename extreme_value_distribution<_RealType>::
-		param_type(__a, __b));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _IntType>
-    void
-    discrete_distribution<_IntType>::param_type::
-    _M_initialize()
-    {
-      if (_M_prob.size() < 2)
-	{
-	  _M_prob.clear();
-	  return;
-	}
-
-      const double __sum = std::accumulate(_M_prob.begin(),
-					   _M_prob.end(), 0.0);
-      // Now normalize the probabilites.
-      __detail::__normalize(_M_prob.begin(), _M_prob.end(), _M_prob.begin(),
-			    __sum);
-      // Accumulate partial sums.
-      _M_cp.reserve(_M_prob.size());
-      std::partial_sum(_M_prob.begin(), _M_prob.end(),
-		       std::back_inserter(_M_cp));
-      // Make sure the last cumulative probability is one.
-      _M_cp[_M_cp.size() - 1] = 1.0;
-    }
-
-  template<typename _IntType>
-    template<typename _Func>
-      discrete_distribution<_IntType>::param_type::
-      param_type(size_t __nw, double __xmin, double __xmax, _Func __fw)
-      : _M_prob(), _M_cp()
-      {
-	const size_t __n = __nw == 0 ? 1 : __nw;
-	const double __delta = (__xmax - __xmin) / __n;
-
-	_M_prob.reserve(__n);
-	for (size_t __k = 0; __k < __nw; ++__k)
-	  _M_prob.push_back(__fw(__xmin + __k * __delta + 0.5 * __delta));
-
-	_M_initialize();
-      }
-
-  template<typename _IntType>
-    template<typename _UniformRandomNumberGenerator>
-      typename discrete_distribution<_IntType>::result_type
-      discrete_distribution<_IntType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	if (__param._M_cp.empty())
-	  return result_type(0);
-
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-
-	const double __p = __aurng();
-	auto __pos = std::lower_bound(__param._M_cp.begin(),
-				      __param._M_cp.end(), __p);
-
-	return __pos - __param._M_cp.begin();
-      }
-
-  template<typename _IntType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      discrete_distribution<_IntType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-
-	if (__param._M_cp.empty())
-	  {
-	    while (__f != __t)
-	      *__f++ = result_type(0);
-	    return;
-	  }
-
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-
-	while (__f != __t)
-	  {
-	    const double __p = __aurng();
-	    auto __pos = std::lower_bound(__param._M_cp.begin(),
-					  __param._M_cp.end(), __p);
-
-	    *__f++ = __pos - __param._M_cp.begin();
-	  }
-      }
-
-  template<typename _IntType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const discrete_distribution<_IntType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<double>::max_digits10);
-
-      std::vector<double> __prob = __x.probabilities();
-      __os << __prob.size();
-      for (auto __dit = __prob.begin(); __dit != __prob.end(); ++__dit)
-	__os << __space << *__dit;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _IntType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       discrete_distribution<_IntType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      size_t __n;
-      __is >> __n;
-
-      std::vector<double> __prob_vec;
-      __prob_vec.reserve(__n);
-      for (; __n != 0; --__n)
-	{
-	  double __prob;
-	  __is >> __prob;
-	  __prob_vec.push_back(__prob);
-	}
-
-      __x.param(typename discrete_distribution<_IntType>::
-		param_type(__prob_vec.begin(), __prob_vec.end()));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    void
-    piecewise_constant_distribution<_RealType>::param_type::
-    _M_initialize()
-    {
-      if (_M_int.size() < 2
-	  || (_M_int.size() == 2
-	      && _M_int[0] == _RealType(0)
-	      && _M_int[1] == _RealType(1)))
-	{
-	  _M_int.clear();
-	  _M_den.clear();
-	  return;
-	}
-
-      const double __sum = std::accumulate(_M_den.begin(),
-					   _M_den.end(), 0.0);
-
-      __detail::__normalize(_M_den.begin(), _M_den.end(), _M_den.begin(),
-			    __sum);
-
-      _M_cp.reserve(_M_den.size());
-      std::partial_sum(_M_den.begin(), _M_den.end(),
-		       std::back_inserter(_M_cp));
-
-      // Make sure the last cumulative probability is one.
-      _M_cp[_M_cp.size() - 1] = 1.0;
-
-      for (size_t __k = 0; __k < _M_den.size(); ++__k)
-	_M_den[__k] /= _M_int[__k + 1] - _M_int[__k];
-    }
-
-  template<typename _RealType>
-    template<typename _InputIteratorB, typename _InputIteratorW>
-      piecewise_constant_distribution<_RealType>::param_type::
-      param_type(_InputIteratorB __bbegin,
-		 _InputIteratorB __bend,
-		 _InputIteratorW __wbegin)
-      : _M_int(), _M_den(), _M_cp()
-      {
-	if (__bbegin != __bend)
-	  {
-	    for (;;)
-	      {
-		_M_int.push_back(*__bbegin);
-		++__bbegin;
-		if (__bbegin == __bend)
-		  break;
-
-		_M_den.push_back(*__wbegin);
-		++__wbegin;
-	      }
-	  }
-
-	_M_initialize();
-      }
-
-  template<typename _RealType>
-    template<typename _Func>
-      piecewise_constant_distribution<_RealType>::param_type::
-      param_type(initializer_list<_RealType> __bl, _Func __fw)
-      : _M_int(), _M_den(), _M_cp()
-      {
-	_M_int.reserve(__bl.size());
-	for (auto __biter = __bl.begin(); __biter != __bl.end(); ++__biter)
-	  _M_int.push_back(*__biter);
-
-	_M_den.reserve(_M_int.size() - 1);
-	for (size_t __k = 0; __k < _M_int.size() - 1; ++__k)
-	  _M_den.push_back(__fw(0.5 * (_M_int[__k + 1] + _M_int[__k])));
-
-	_M_initialize();
-      }
-
-  template<typename _RealType>
-    template<typename _Func>
-      piecewise_constant_distribution<_RealType>::param_type::
-      param_type(size_t __nw, _RealType __xmin, _RealType __xmax, _Func __fw)
-      : _M_int(), _M_den(), _M_cp()
-      {
-	const size_t __n = __nw == 0 ? 1 : __nw;
-	const _RealType __delta = (__xmax - __xmin) / __n;
-
-	_M_int.reserve(__n + 1);
-	for (size_t __k = 0; __k <= __nw; ++__k)
-	  _M_int.push_back(__xmin + __k * __delta);
-
-	_M_den.reserve(__n);
-	for (size_t __k = 0; __k < __nw; ++__k)
-	  _M_den.push_back(__fw(_M_int[__k] + 0.5 * __delta));
-
-	_M_initialize();
-      }
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename piecewise_constant_distribution<_RealType>::result_type
-      piecewise_constant_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-
-	const double __p = __aurng();
-	if (__param._M_cp.empty())
-	  return __p;
-
-	auto __pos = std::lower_bound(__param._M_cp.begin(),
-				      __param._M_cp.end(), __p);
-	const size_t __i = __pos - __param._M_cp.begin();
-
-	const double __pref = __i > 0 ? __param._M_cp[__i - 1] : 0.0;
-
-	return __param._M_int[__i] + (__p - __pref) / __param._M_den[__i];
-      }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      piecewise_constant_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-
-	if (__param._M_cp.empty())
-	  {
-	    while (__f != __t)
-	      *__f++ = __aurng();
-	    return;
-	  }
-
-	while (__f != __t)
-	  {
-	    const double __p = __aurng();
-
-	    auto __pos = std::lower_bound(__param._M_cp.begin(),
-					  __param._M_cp.end(), __p);
-	    const size_t __i = __pos - __param._M_cp.begin();
-
-	    const double __pref = __i > 0 ? __param._M_cp[__i - 1] : 0.0;
-
-	    *__f++ = (__param._M_int[__i]
-		      + (__p - __pref) / __param._M_den[__i]);
-	  }
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const piecewise_constant_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      std::vector<_RealType> __int = __x.intervals();
-      __os << __int.size() - 1;
-
-      for (auto __xit = __int.begin(); __xit != __int.end(); ++__xit)
-	__os << __space << *__xit;
-
-      std::vector<double> __den = __x.densities();
-      for (auto __dit = __den.begin(); __dit != __den.end(); ++__dit)
-	__os << __space << *__dit;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       piecewise_constant_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      size_t __n;
-      __is >> __n;
-
-      std::vector<_RealType> __int_vec;
-      __int_vec.reserve(__n + 1);
-      for (size_t __i = 0; __i <= __n; ++__i)
-	{
-	  _RealType __int;
-	  __is >> __int;
-	  __int_vec.push_back(__int);
-	}
-
-      std::vector<double> __den_vec;
-      __den_vec.reserve(__n);
-      for (size_t __i = 0; __i < __n; ++__i)
-	{
-	  double __den;
-	  __is >> __den;
-	  __den_vec.push_back(__den);
-	}
-
-      __x.param(typename piecewise_constant_distribution<_RealType>::
-	  param_type(__int_vec.begin(), __int_vec.end(), __den_vec.begin()));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    void
-    piecewise_linear_distribution<_RealType>::param_type::
-    _M_initialize()
-    {
-      if (_M_int.size() < 2
-	  || (_M_int.size() == 2
-	      && _M_int[0] == _RealType(0)
-	      && _M_int[1] == _RealType(1)
-	      && _M_den[0] == _M_den[1]))
-	{
-	  _M_int.clear();
-	  _M_den.clear();
-	  return;
-	}
-
-      double __sum = 0.0;
-      _M_cp.reserve(_M_int.size() - 1);
-      _M_m.reserve(_M_int.size() - 1);
-      for (size_t __k = 0; __k < _M_int.size() - 1; ++__k)
-	{
-	  const _RealType __delta = _M_int[__k + 1] - _M_int[__k];
-	  __sum += 0.5 * (_M_den[__k + 1] + _M_den[__k]) * __delta;
-	  _M_cp.push_back(__sum);
-	  _M_m.push_back((_M_den[__k + 1] - _M_den[__k]) / __delta);
-	}
-
-      //  Now normalize the densities...
-      __detail::__normalize(_M_den.begin(), _M_den.end(), _M_den.begin(),
-			    __sum);
-      //  ... and partial sums... 
-      __detail::__normalize(_M_cp.begin(), _M_cp.end(), _M_cp.begin(), __sum);
-      //  ... and slopes.
-      __detail::__normalize(_M_m.begin(), _M_m.end(), _M_m.begin(), __sum);
-
-      //  Make sure the last cumulative probablility is one.
-      _M_cp[_M_cp.size() - 1] = 1.0;
-     }
-
-  template<typename _RealType>
-    template<typename _InputIteratorB, typename _InputIteratorW>
-      piecewise_linear_distribution<_RealType>::param_type::
-      param_type(_InputIteratorB __bbegin,
-		 _InputIteratorB __bend,
-		 _InputIteratorW __wbegin)
-      : _M_int(), _M_den(), _M_cp(), _M_m()
-      {
-	for (; __bbegin != __bend; ++__bbegin, ++__wbegin)
-	  {
-	    _M_int.push_back(*__bbegin);
-	    _M_den.push_back(*__wbegin);
-	  }
-
-	_M_initialize();
-      }
-
-  template<typename _RealType>
-    template<typename _Func>
-      piecewise_linear_distribution<_RealType>::param_type::
-      param_type(initializer_list<_RealType> __bl, _Func __fw)
-      : _M_int(), _M_den(), _M_cp(), _M_m()
-      {
-	_M_int.reserve(__bl.size());
-	_M_den.reserve(__bl.size());
-	for (auto __biter = __bl.begin(); __biter != __bl.end(); ++__biter)
-	  {
-	    _M_int.push_back(*__biter);
-	    _M_den.push_back(__fw(*__biter));
-	  }
-
-	_M_initialize();
-      }
-
-  template<typename _RealType>
-    template<typename _Func>
-      piecewise_linear_distribution<_RealType>::param_type::
-      param_type(size_t __nw, _RealType __xmin, _RealType __xmax, _Func __fw)
-      : _M_int(), _M_den(), _M_cp(), _M_m()
-      {
-	const size_t __n = __nw == 0 ? 1 : __nw;
-	const _RealType __delta = (__xmax - __xmin) / __n;
-
-	_M_int.reserve(__n + 1);
-	_M_den.reserve(__n + 1);
-	for (size_t __k = 0; __k <= __nw; ++__k)
-	  {
-	    _M_int.push_back(__xmin + __k * __delta);
-	    _M_den.push_back(__fw(_M_int[__k] + __delta));
-	  }
-
-	_M_initialize();
-      }
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename piecewise_linear_distribution<_RealType>::result_type
-      piecewise_linear_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-
-	const double __p = __aurng();
-	if (__param._M_cp.empty())
-	  return __p;
-
-	auto __pos = std::lower_bound(__param._M_cp.begin(),
-				      __param._M_cp.end(), __p);
-	const size_t __i = __pos - __param._M_cp.begin();
-
-	const double __pref = __i > 0 ? __param._M_cp[__i - 1] : 0.0;
-
-	const double __a = 0.5 * __param._M_m[__i];
-	const double __b = __param._M_den[__i];
-	const double __cm = __p - __pref;
-
-	_RealType __x = __param._M_int[__i];
-	if (__a == 0)
-	  __x += __cm / __b;
-	else
-	  {
-	    const double __d = __b * __b + 4.0 * __a * __cm;
-	    __x += 0.5 * (std::sqrt(__d) - __b) / __a;
-          }
-
-        return __x;
-      }
-
-  template<typename _RealType>
-    template<typename _ForwardIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      piecewise_linear_distribution<_RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-	// We could duplicate everything from operator()...
-	while (__f != __t)
-	  *__f++ = this->operator()(__urng, __param);
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const piecewise_linear_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      std::vector<_RealType> __int = __x.intervals();
-      __os << __int.size() - 1;
-
-      for (auto __xit = __int.begin(); __xit != __int.end(); ++__xit)
-	__os << __space << *__xit;
-
-      std::vector<double> __den = __x.densities();
-      for (auto __dit = __den.begin(); __dit != __den.end(); ++__dit)
-	__os << __space << *__dit;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       piecewise_linear_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      size_t __n;
-      __is >> __n;
-
-      std::vector<_RealType> __int_vec;
-      __int_vec.reserve(__n + 1);
-      for (size_t __i = 0; __i <= __n; ++__i)
-	{
-	  _RealType __int;
-	  __is >> __int;
-	  __int_vec.push_back(__int);
-	}
-
-      std::vector<double> __den_vec;
-      __den_vec.reserve(__n + 1);
-      for (size_t __i = 0; __i <= __n; ++__i)
-	{
-	  double __den;
-	  __is >> __den;
-	  __den_vec.push_back(__den);
-	}
-
-      __x.param(typename piecewise_linear_distribution<_RealType>::
-	  param_type(__int_vec.begin(), __int_vec.end(), __den_vec.begin()));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _IntType>
-    seed_seq::seed_seq(std::initializer_list<_IntType> __il)
-    {
-      for (auto __iter = __il.begin(); __iter != __il.end(); ++__iter)
-	_M_v.push_back(__detail::__mod<result_type,
-		       __detail::_Shift<result_type, 32>::__value>(*__iter));
-    }
-
-  template<typename _InputIterator>
-    seed_seq::seed_seq(_InputIterator __begin, _InputIterator __end)
-    {
-      for (_InputIterator __iter = __begin; __iter != __end; ++__iter)
-	_M_v.push_back(__detail::__mod<result_type,
-		       __detail::_Shift<result_type, 32>::__value>(*__iter));
-    }
-
-  template<typename _RandomAccessIterator>
-    void
-    seed_seq::generate(_RandomAccessIterator __begin,
-		       _RandomAccessIterator __end)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-        _Type;
-
-      if (__begin == __end)
-	return;
-
-      std::fill(__begin, __end, _Type(0x8b8b8b8bu));
-
-      const size_t __n = __end - __begin;
-      const size_t __s = _M_v.size();
-      const size_t __t = (__n >= 623) ? 11
-		       : (__n >=  68) ? 7
-		       : (__n >=  39) ? 5
-		       : (__n >=   7) ? 3
-		       : (__n - 1) / 2;
-      const size_t __p = (__n - __t) / 2;
-      const size_t __q = __p + __t;
-      const size_t __m = std::max(size_t(__s + 1), __n);
-
-      for (size_t __k = 0; __k < __m; ++__k)
-	{
-	  _Type __arg = (__begin[__k % __n]
-			 ^ __begin[(__k + __p) % __n]
-			 ^ __begin[(__k - 1) % __n]);
-	  _Type __r1 = __arg ^ (__arg >> 27);
-	  __r1 = __detail::__mod<_Type,
-		    __detail::_Shift<_Type, 32>::__value>(1664525u * __r1);
-	  _Type __r2 = __r1;
-	  if (__k == 0)
-	    __r2 += __s;
-	  else if (__k <= __s)
-	    __r2 += __k % __n + _M_v[__k - 1];
-	  else
-	    __r2 += __k % __n;
-	  __r2 = __detail::__mod<_Type,
-	           __detail::_Shift<_Type, 32>::__value>(__r2);
-	  __begin[(__k + __p) % __n] += __r1;
-	  __begin[(__k + __q) % __n] += __r2;
-	  __begin[__k % __n] = __r2;
-	}
-
-      for (size_t __k = __m; __k < __m + __n; ++__k)
-	{
-	  _Type __arg = (__begin[__k % __n]
-			 + __begin[(__k + __p) % __n]
-			 + __begin[(__k - 1) % __n]);
-	  _Type __r3 = __arg ^ (__arg >> 27);
-	  __r3 = __detail::__mod<_Type,
-		   __detail::_Shift<_Type, 32>::__value>(1566083941u * __r3);
-	  _Type __r4 = __r3 - __k % __n;
-	  __r4 = __detail::__mod<_Type,
-	           __detail::_Shift<_Type, 32>::__value>(__r4);
-	  __begin[(__k + __p) % __n] ^= __r3;
-	  __begin[(__k + __q) % __n] ^= __r4;
-	  __begin[__k % __n] = __r4;
-	}
-    }
-
-  template<typename _RealType, size_t __bits,
-	   typename _UniformRandomNumberGenerator>
-    _RealType
-    generate_canonical(_UniformRandomNumberGenerator& __urng)
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-      const size_t __b
-	= std::min(static_cast<size_t>(std::numeric_limits<_RealType>::digits),
-                   __bits);
-      const long double __r = static_cast<long double>(__urng.max())
-			    - static_cast<long double>(__urng.min()) + 1.0L;
-      const size_t __log2r = std::log(__r) / std::log(2.0L);
-      size_t __k = std::max<size_t>(1UL, (__b + __log2r - 1UL) / __log2r);
-      _RealType __sum = _RealType(0);
-      _RealType __tmp = _RealType(1);
-      for (; __k != 0; --__k)
-	{
-	  __sum += _RealType(__urng() - __urng.min()) * __tmp;
-	  __tmp *= __r;
-	}
-      return __sum / __tmp;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/range_access.h b/openflow/usr/include/c++/5/bits/range_access.h
deleted file mode 100644
index 89dc4d6..0000000
--- a/openflow/usr/include/c++/5/bits/range_access.h
+++ /dev/null
@@ -1,238 +0,0 @@
-// <range_access.h> -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/range_access.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iterator}
- */
-
-#ifndef _GLIBCXX_RANGE_ACCESS_H
-#define _GLIBCXX_RANGE_ACCESS_H 1
-
-#pragma GCC system_header
-
-#if __cplusplus >= 201103L
-#include <initializer_list>
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief  Return an iterator pointing to the first element of
-   *          the container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline auto
-    begin(_Container& __cont) -> decltype(__cont.begin())
-    { return __cont.begin(); }
-
-  /**
-   *  @brief  Return an iterator pointing to the first element of
-   *          the const container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline auto
-    begin(const _Container& __cont) -> decltype(__cont.begin())
-    { return __cont.begin(); }
-
-  /**
-   *  @brief  Return an iterator pointing to one past the last element of
-   *          the container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline auto
-    end(_Container& __cont) -> decltype(__cont.end())
-    { return __cont.end(); }
-
-  /**
-   *  @brief  Return an iterator pointing to one past the last element of
-   *          the const container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline auto
-    end(const _Container& __cont) -> decltype(__cont.end())
-    { return __cont.end(); }
-
-  /**
-   *  @brief  Return an iterator pointing to the first element of the array.
-   *  @param  __arr  Array.
-   */
-  template<class _Tp, size_t _Nm>
-    inline _GLIBCXX14_CONSTEXPR _Tp*
-    begin(_Tp (&__arr)[_Nm])
-    { return __arr; }
-
-  /**
-   *  @brief  Return an iterator pointing to one past the last element
-   *          of the array.
-   *  @param  __arr  Array.
-   */
-  template<class _Tp, size_t _Nm>
-    inline _GLIBCXX14_CONSTEXPR _Tp*
-    end(_Tp (&__arr)[_Nm])
-    { return __arr + _Nm; }
-
-#if __cplusplus >= 201402L
-
-  template<typename _Tp> class valarray;
-  // These overloads must be declared for cbegin and cend to use them.
-  template<typename _Tp> _Tp* begin(valarray<_Tp>&);
-  template<typename _Tp> const _Tp* begin(const valarray<_Tp>&);
-  template<typename _Tp> _Tp* end(valarray<_Tp>&);
-  template<typename _Tp> const _Tp* end(const valarray<_Tp>&);
-
-  /**
-   *  @brief  Return an iterator pointing to the first element of
-   *          the const container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline constexpr auto
-    cbegin(const _Container& __cont) noexcept(noexcept(std::begin(__cont)))
-      -> decltype(std::begin(__cont))
-    { return std::begin(__cont); }
-
-  /**
-   *  @brief  Return an iterator pointing to one past the last element of
-   *          the const container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline constexpr auto
-    cend(const _Container& __cont) noexcept(noexcept(std::end(__cont)))
-      -> decltype(std::end(__cont))
-    { return std::end(__cont); }
-
-  /**
-   *  @brief  Return a reverse iterator pointing to the last element of
-   *          the container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline auto
-    rbegin(_Container& __cont) -> decltype(__cont.rbegin())
-    { return __cont.rbegin(); }
-
-  /**
-   *  @brief  Return a reverse iterator pointing to the last element of
-   *          the const container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline auto
-    rbegin(const _Container& __cont) -> decltype(__cont.rbegin())
-    { return __cont.rbegin(); }
-
-  /**
-   *  @brief  Return a reverse iterator pointing one past the first element of
-   *          the container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline auto
-    rend(_Container& __cont) -> decltype(__cont.rend())
-    { return __cont.rend(); }
-
-  /**
-   *  @brief  Return a reverse iterator pointing one past the first element of
-   *          the const container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline auto
-    rend(const _Container& __cont) -> decltype(__cont.rend())
-    { return __cont.rend(); }
-
-  /**
-   *  @brief  Return a reverse iterator pointing to the last element of
-   *          the array.
-   *  @param  __arr  Array.
-   */
-  template<class _Tp, size_t _Nm>
-    inline reverse_iterator<_Tp*>
-    rbegin(_Tp (&__arr)[_Nm])
-    { return reverse_iterator<_Tp*>(__arr + _Nm); }
-
-  /**
-   *  @brief  Return a reverse iterator pointing one past the first element of
-   *          the array.
-   *  @param  __arr  Array.
-   */
-  template<class _Tp, size_t _Nm>
-    inline reverse_iterator<_Tp*>
-    rend(_Tp (&__arr)[_Nm])
-    { return reverse_iterator<_Tp*>(__arr); }
-
-  /**
-   *  @brief  Return a reverse iterator pointing to the last element of
-   *          the initializer_list.
-   *  @param  __il  initializer_list.
-   */
-  template<class _Tp>
-    inline reverse_iterator<const _Tp*>
-    rbegin(initializer_list<_Tp> __il)
-    { return reverse_iterator<const _Tp*>(__il.end()); }
-
-  /**
-   *  @brief  Return a reverse iterator pointing one past the first element of
-   *          the initializer_list.
-   *  @param  __il  initializer_list.
-   */
-  template<class _Tp>
-    inline reverse_iterator<const _Tp*>
-    rend(initializer_list<_Tp> __il)
-    { return reverse_iterator<const _Tp*>(__il.begin()); }
-
-  /**
-   *  @brief  Return a reverse iterator pointing to the last element of
-   *          the const container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline auto
-    crbegin(const _Container& __cont) -> decltype(std::rbegin(__cont))
-    { return std::rbegin(__cont); }
-
-  /**
-   *  @brief  Return a reverse iterator pointing one past the first element of
-   *          the const container.
-   *  @param  __cont  Container.
-   */
-  template<class _Container>
-    inline auto
-    crend(const _Container& __cont) -> decltype(std::rend(__cont))
-    { return std::rend(__cont); }
-
-#endif // C++14
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // C++11
-
-#endif // _GLIBCXX_RANGE_ACCESS_H
diff --git a/openflow/usr/include/c++/5/bits/regex.h b/openflow/usr/include/c++/5/bits/regex.h
deleted file mode 100644
index a23c2c9..0000000
--- a/openflow/usr/include/c++/5/bits/regex.h
+++ /dev/null
@@ -1,2796 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-  template<typename, typename>
-    class basic_regex;
-
-  template<typename, typename>
-    class match_results;
-
-_GLIBCXX_END_NAMESPACE_CXX11
-_GLIBCXX_END_NAMESPACE_VERSION
-
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  enum class _RegexExecutorPolicy : int
-    { _S_auto, _S_alternate };
-
-  template<typename _BiIter, typename _Alloc,
-	   typename _CharT, typename _TraitsT,
-	   _RegexExecutorPolicy __policy,
-	   bool __match_mode>
-    bool
-    __regex_algo_impl(_BiIter                              __s,
-		      _BiIter                              __e,
-		      match_results<_BiIter, _Alloc>&      __m,
-		      const basic_regex<_CharT, _TraitsT>& __re,
-		      regex_constants::match_flag_type     __flags);
-
-  template<typename, typename, typename, bool>
-    class _Executor;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  /**
-   * @addtogroup regex
-   * @{
-   */
-
-  /**
-   * @brief Describes aspects of a regular expression.
-   *
-   * A regular expression traits class that satisfies the requirements of
-   * section [28.7].
-   *
-   * The class %regex is parameterized around a set of related types and
-   * functions used to complete the definition of its semantics.  This class
-   * satisfies the requirements of such a traits class.
-   */
-  template<typename _Ch_type>
-    struct regex_traits
-    {
-    public:
-      typedef _Ch_type                     	char_type;
-      typedef std::basic_string<char_type> 	string_type;
-      typedef std::locale                  	locale_type;
-    private:
-      struct _RegexMask
-	{
-	  typedef std::ctype_base::mask _BaseType;
-	  _BaseType _M_base;
-	  unsigned char _M_extended;
-	  static constexpr unsigned char _S_under = 1 << 0;
-	  static constexpr unsigned char _S_valid_mask = 0x1;
-
-	  constexpr _RegexMask(_BaseType __base = 0,
-			       unsigned char __extended = 0)
-	  : _M_base(__base), _M_extended(__extended)
-	  { }
-
-	  constexpr _RegexMask
-	  operator&(_RegexMask __other) const
-	  {
-	    return _RegexMask(_M_base & __other._M_base,
-			      _M_extended & __other._M_extended);
-	  }
-
-	  constexpr _RegexMask
-	  operator|(_RegexMask __other) const
-	  {
-	    return _RegexMask(_M_base | __other._M_base,
-			      _M_extended | __other._M_extended);
-	  }
-
-	  constexpr _RegexMask
-	  operator^(_RegexMask __other) const
-	  {
-	    return _RegexMask(_M_base ^ __other._M_base,
-			      _M_extended ^ __other._M_extended);
-	  }
-
-	  constexpr _RegexMask
-	  operator~() const
-	  { return _RegexMask(~_M_base, ~_M_extended); }
-
-	  _RegexMask&
-	  operator&=(_RegexMask __other)
-	  { return *this = (*this) & __other; }
-
-	  _RegexMask&
-	  operator|=(_RegexMask __other)
-	  { return *this = (*this) | __other; }
-
-	  _RegexMask&
-	  operator^=(_RegexMask __other)
-	  { return *this = (*this) ^ __other; }
-
-	  constexpr bool
-	  operator==(_RegexMask __other) const
-	  {
-	    return (_M_extended & _S_valid_mask)
-		   == (__other._M_extended & _S_valid_mask)
-		     && _M_base == __other._M_base;
-	  }
-
-	  constexpr bool
-	  operator!=(_RegexMask __other) const
-	  { return !((*this) == __other); }
-
-	};
-    public:
-      typedef _RegexMask char_class_type;
-
-    public:
-      /**
-       * @brief Constructs a default traits object.
-       */
-      regex_traits() { }
-
-      /**
-       * @brief Gives the length of a C-style string starting at @p __p.
-       *
-       * @param __p a pointer to the start of a character sequence.
-       *
-       * @returns the number of characters between @p *__p and the first
-       * default-initialized value of type @p char_type.  In other words, uses
-       * the C-string algorithm for determining the length of a sequence of
-       * characters.
-       */
-      static std::size_t
-      length(const char_type* __p)
-      { return string_type::traits_type::length(__p); }
-
-      /**
-       * @brief Performs the identity translation.
-       *
-       * @param __c A character to the locale-specific character set.
-       *
-       * @returns __c.
-       */
-      char_type
-      translate(char_type __c) const
-      { return __c; }
-
-      /**
-       * @brief Translates a character into a case-insensitive equivalent.
-       *
-       * @param __c A character to the locale-specific character set.
-       *
-       * @returns the locale-specific lower-case equivalent of __c.
-       * @throws std::bad_cast if the imbued locale does not support the ctype
-       *         facet.
-       */
-      char_type
-      translate_nocase(char_type __c) const
-      {
-	typedef std::ctype<char_type> __ctype_type;
-	const __ctype_type& __fctyp(use_facet<__ctype_type>(_M_locale));
-	return __fctyp.tolower(__c);
-      }
-
-      /**
-       * @brief Gets a sort key for a character sequence.
-       *
-       * @param __first beginning of the character sequence.
-       * @param __last  one-past-the-end of the character sequence.
-       *
-       * Returns a sort key for the character sequence designated by the
-       * iterator range [F1, F2) such that if the character sequence [G1, G2)
-       * sorts before the character sequence [H1, H2) then
-       * v.transform(G1, G2) < v.transform(H1, H2).
-       *
-       * What this really does is provide a more efficient way to compare a
-       * string to multiple other strings in locales with fancy collation
-       * rules and equivalence classes.
-       *
-       * @returns a locale-specific sort key equivalent to the input range.
-       *
-       * @throws std::bad_cast if the current locale does not have a collate
-       *         facet.
-       */
-      template<typename _Fwd_iter>
-	string_type
-	transform(_Fwd_iter __first, _Fwd_iter __last) const
-	{
-	  typedef std::collate<char_type> __collate_type;
-	  const __collate_type& __fclt(use_facet<__collate_type>(_M_locale));
-	  string_type __s(__first, __last);
-	  return __fclt.transform(__s.data(), __s.data() + __s.size());
-	}
-
-      /**
-       * @brief Gets a sort key for a character sequence, independent of case.
-       *
-       * @param __first beginning of the character sequence.
-       * @param __last  one-past-the-end of the character sequence.
-       *
-       * Effects: if typeid(use_facet<collate<_Ch_type> >) ==
-       * typeid(collate_byname<_Ch_type>) and the form of the sort key
-       * returned by collate_byname<_Ch_type>::transform(__first, __last)
-       * is known and can be converted into a primary sort key
-       * then returns that key, otherwise returns an empty string.
-       *
-       * @todo Implement this function correctly.
-       */
-      template<typename _Fwd_iter>
-	string_type
-	transform_primary(_Fwd_iter __first, _Fwd_iter __last) const
-	{
-	  // TODO : this is not entirely correct.
-	  // This function requires extra support from the platform.
-	  //
-	  // Read http://gcc.gnu.org/ml/libstdc++/2013-09/msg00117.html and
-	  // http://www.open-std.org/Jtc1/sc22/wg21/docs/papers/2003/n1429.htm
-	  // for details.
-	  typedef std::ctype<char_type> __ctype_type;
-	  const __ctype_type& __fctyp(use_facet<__ctype_type>(_M_locale));
-	  std::vector<char_type> __s(__first, __last);
-	  __fctyp.tolower(__s.data(), __s.data() + __s.size());
-	  return this->transform(__s.data(), __s.data() + __s.size());
-	}
-
-      /**
-       * @brief Gets a collation element by name.
-       *
-       * @param __first beginning of the collation element name.
-       * @param __last  one-past-the-end of the collation element name.
-       *
-       * @returns a sequence of one or more characters that represents the
-       * collating element consisting of the character sequence designated by
-       * the iterator range [__first, __last). Returns an empty string if the
-       * character sequence is not a valid collating element.
-       */
-      template<typename _Fwd_iter>
-	string_type
-	lookup_collatename(_Fwd_iter __first, _Fwd_iter __last) const;
-
-      /**
-       * @brief Maps one or more characters to a named character
-       *        classification.
-       *
-       * @param __first beginning of the character sequence.
-       * @param __last  one-past-the-end of the character sequence.
-       * @param __icase ignores the case of the classification name.
-       *
-       * @returns an unspecified value that represents the character
-       * classification named by the character sequence designated by
-       * the iterator range [__first, __last). If @p icase is true,
-       * the returned mask identifies the classification regardless of
-       * the case of the characters to be matched (for example,
-       * [[:lower:]] is the same as [[:alpha:]]), otherwise a
-       * case-dependent classification is returned.  The value
-       * returned shall be independent of the case of the characters
-       * in the character sequence. If the name is not recognized then
-       * returns a value that compares equal to 0.
-       *
-       * At least the following names (or their wide-character equivalent) are
-       * supported.
-       * - d
-       * - w
-       * - s
-       * - alnum
-       * - alpha
-       * - blank
-       * - cntrl
-       * - digit
-       * - graph
-       * - lower
-       * - print
-       * - punct
-       * - space
-       * - upper
-       * - xdigit
-       */
-      template<typename _Fwd_iter>
-	char_class_type
-	lookup_classname(_Fwd_iter __first, _Fwd_iter __last,
-			 bool __icase = false) const;
-
-      /**
-       * @brief Determines if @p c is a member of an identified class.
-       *
-       * @param __c a character.
-       * @param __f a class type (as returned from lookup_classname).
-       *
-       * @returns true if the character @p __c is a member of the classification
-       * represented by @p __f, false otherwise.
-       *
-       * @throws std::bad_cast if the current locale does not have a ctype
-       *         facet.
-       */
-      bool
-      isctype(_Ch_type __c, char_class_type __f) const;
-
-      /**
-       * @brief Converts a digit to an int.
-       *
-       * @param __ch    a character representing a digit.
-       * @param __radix the radix if the numeric conversion (limited to 8, 10,
-       *              or 16).
-       *
-       * @returns the value represented by the digit __ch in base radix if the
-       * character __ch is a valid digit in base radix; otherwise returns -1.
-       */
-      int
-      value(_Ch_type __ch, int __radix) const;
-
-      /**
-       * @brief Imbues the regex_traits object with a copy of a new locale.
-       *
-       * @param __loc A locale.
-       *
-       * @returns a copy of the previous locale in use by the regex_traits
-       *          object.
-       *
-       * @note Calling imbue with a different locale than the one currently in
-       *       use invalidates all cached data held by *this.
-       */
-      locale_type
-      imbue(locale_type __loc)
-      {
-	std::swap(_M_locale, __loc);
-	return __loc;
-      }
-
-      /**
-       * @brief Gets a copy of the current locale in use by the regex_traits
-       * object.
-       */
-      locale_type
-      getloc() const
-      { return _M_locale; }
-
-    protected:
-      locale_type _M_locale;
-    };
-
-  // [7.8] Class basic_regex
-  /**
-   * Objects of specializations of this class represent regular expressions
-   * constructed from sequences of character type @p _Ch_type.
-   *
-   * Storage for the regular expression is allocated and deallocated as
-   * necessary by the member functions of this class.
-   */
-  template<typename _Ch_type, typename _Rx_traits = regex_traits<_Ch_type>>
-    class basic_regex
-    {
-    public:
-      static_assert(is_same<_Ch_type, typename _Rx_traits::char_type>::value,
-		    "regex traits class must have the same char_type");
-
-      // types:
-      typedef _Ch_type                            value_type;
-      typedef _Rx_traits                          traits_type;
-      typedef typename traits_type::string_type   string_type;
-      typedef regex_constants::syntax_option_type flag_type;
-      typedef typename traits_type::locale_type   locale_type;
-
-      /**
-       * @name Constants
-       * std [28.8.1](1)
-       */
-      //@{
-      static constexpr flag_type icase = regex_constants::icase;
-      static constexpr flag_type nosubs = regex_constants::nosubs;
-      static constexpr flag_type optimize = regex_constants::optimize;
-      static constexpr flag_type collate = regex_constants::collate;
-      static constexpr flag_type ECMAScript = regex_constants::ECMAScript;
-      static constexpr flag_type basic = regex_constants::basic;
-      static constexpr flag_type extended = regex_constants::extended;
-      static constexpr flag_type awk = regex_constants::awk;
-      static constexpr flag_type grep = regex_constants::grep;
-      static constexpr flag_type egrep = regex_constants::egrep;
-      //@}
-
-      // [7.8.2] construct/copy/destroy
-      /**
-       * Constructs a basic regular expression that does not match any
-       * character sequence.
-       */
-      basic_regex()
-      : _M_flags(ECMAScript), _M_loc(), _M_automaton(nullptr)
-      { }
-
-      /**
-       * @brief Constructs a basic regular expression from the
-       * sequence [__p, __p + char_traits<_Ch_type>::length(__p))
-       * interpreted according to the flags in @p __f.
-       *
-       * @param __p A pointer to the start of a C-style null-terminated string
-       *          containing a regular expression.
-       * @param __f Flags indicating the syntax rules and options.
-       *
-       * @throws regex_error if @p __p is not a valid regular expression.
-       */
-      explicit
-      basic_regex(const _Ch_type* __p, flag_type __f = ECMAScript)
-      : basic_regex(__p, __p + char_traits<_Ch_type>::length(__p), __f)
-      { }
-
-      /**
-       * @brief Constructs a basic regular expression from the sequence
-       * [p, p + len) interpreted according to the flags in @p f.
-       *
-       * @param __p   A pointer to the start of a string containing a regular
-       *              expression.
-       * @param __len The length of the string containing the regular
-       *              expression.
-       * @param __f   Flags indicating the syntax rules and options.
-       *
-       * @throws regex_error if @p __p is not a valid regular expression.
-       */
-      basic_regex(const _Ch_type* __p, std::size_t __len,
-		  flag_type __f = ECMAScript)
-      : basic_regex(__p, __p + __len, __f)
-      { }
-
-      /**
-       * @brief Copy-constructs a basic regular expression.
-       *
-       * @param __rhs A @p regex object.
-       */
-      basic_regex(const basic_regex& __rhs) = default;
-
-      /**
-       * @brief Move-constructs a basic regular expression.
-       *
-       * @param __rhs A @p regex object.
-       */
-      basic_regex(basic_regex&& __rhs) noexcept = default;
-
-      /**
-       * @brief Constructs a basic regular expression from the string
-       * @p s interpreted according to the flags in @p f.
-       *
-       * @param __s A string containing a regular expression.
-       * @param __f Flags indicating the syntax rules and options.
-       *
-       * @throws regex_error if @p __s is not a valid regular expression.
-       */
-      template<typename _Ch_traits, typename _Ch_alloc>
-	explicit
-	basic_regex(const std::basic_string<_Ch_type, _Ch_traits,
-					    _Ch_alloc>& __s,
-		    flag_type __f = ECMAScript)
-	: basic_regex(__s.data(), __s.data() + __s.size(), __f)
-	{ }
-
-      /**
-       * @brief Constructs a basic regular expression from the range
-       * [first, last) interpreted according to the flags in @p f.
-       *
-       * @param __first The start of a range containing a valid regular
-       *                expression.
-       * @param __last  The end of a range containing a valid regular
-       *                expression.
-       * @param __f     The format flags of the regular expression.
-       *
-       * @throws regex_error if @p [__first, __last) is not a valid regular
-       *         expression.
-       */
-      template<typename _FwdIter>
-	basic_regex(_FwdIter __first, _FwdIter __last,
-		    flag_type __f = ECMAScript)
-	: basic_regex(std::move(__first), std::move(__last), locale_type(), __f)
-	{ }
-
-      /**
-       * @brief Constructs a basic regular expression from an initializer list.
-       *
-       * @param __l  The initializer list.
-       * @param __f  The format flags of the regular expression.
-       *
-       * @throws regex_error if @p __l is not a valid regular expression.
-       */
-      basic_regex(initializer_list<_Ch_type> __l, flag_type __f = ECMAScript)
-      : basic_regex(__l.begin(), __l.end(), __f)
-      { }
-
-      /**
-       * @brief Destroys a basic regular expression.
-       */
-      ~basic_regex()
-      { }
-
-      /**
-       * @brief Assigns one regular expression to another.
-       */
-      basic_regex&
-      operator=(const basic_regex& __rhs)
-      { return this->assign(__rhs); }
-
-      /**
-       * @brief Move-assigns one regular expression to another.
-       */
-      basic_regex&
-      operator=(basic_regex&& __rhs) noexcept
-      { return this->assign(std::move(__rhs)); }
-
-      /**
-       * @brief Replaces a regular expression with a new one constructed from
-       * a C-style null-terminated string.
-       *
-       * @param __p A pointer to the start of a null-terminated C-style string
-       *        containing a regular expression.
-       */
-      basic_regex&
-      operator=(const _Ch_type* __p)
-      { return this->assign(__p); }
-
-      /**
-       * @brief Replaces a regular expression with a new one constructed from
-       * an initializer list.
-       *
-       * @param __l  The initializer list.
-       *
-       * @throws regex_error if @p __l is not a valid regular expression.
-       */
-      basic_regex&
-      operator=(initializer_list<_Ch_type> __l)
-      { return this->assign(__l.begin(), __l.end()); }
-
-      /**
-       * @brief Replaces a regular expression with a new one constructed from
-       * a string.
-       *
-       * @param __s A pointer to a string containing a regular expression.
-       */
-      template<typename _Ch_traits, typename _Alloc>
-	basic_regex&
-	operator=(const basic_string<_Ch_type, _Ch_traits, _Alloc>& __s)
-	{ return this->assign(__s); }
-
-      // [7.8.3] assign
-      /**
-       * @brief the real assignment operator.
-       *
-       * @param __rhs Another regular expression object.
-       */
-      basic_regex&
-      assign(const basic_regex& __rhs)
-      {
-	basic_regex __tmp(__rhs);
-	this->swap(__tmp);
-	return *this;
-      }
-
-      /**
-       * @brief The move-assignment operator.
-       *
-       * @param __rhs Another regular expression object.
-       */
-      basic_regex&
-      assign(basic_regex&& __rhs) noexcept
-      {
-	basic_regex __tmp(std::move(__rhs));
-	this->swap(__tmp);
-	return *this;
-      }
-
-      /**
-       * @brief Assigns a new regular expression to a regex object from a
-       * C-style null-terminated string containing a regular expression
-       * pattern.
-       *
-       * @param __p     A pointer to a C-style null-terminated string containing
-       *              a regular expression pattern.
-       * @param __flags Syntax option flags.
-       *
-       * @throws regex_error if __p does not contain a valid regular
-       * expression pattern interpreted according to @p __flags.  If
-       * regex_error is thrown, *this remains unchanged.
-       */
-      basic_regex&
-      assign(const _Ch_type* __p, flag_type __flags = ECMAScript)
-      { return this->assign(string_type(__p), __flags); }
-
-      /**
-       * @brief Assigns a new regular expression to a regex object from a
-       * C-style string containing a regular expression pattern.
-       *
-       * @param __p     A pointer to a C-style string containing a
-       *                regular expression pattern.
-       * @param __len   The length of the regular expression pattern string.
-       * @param __flags Syntax option flags.
-       *
-       * @throws regex_error if p does not contain a valid regular
-       * expression pattern interpreted according to @p __flags.  If
-       * regex_error is thrown, *this remains unchanged.
-       */
-      basic_regex&
-      assign(const _Ch_type* __p, std::size_t __len, flag_type __flags)
-      { return this->assign(string_type(__p, __len), __flags); }
-
-      /**
-       * @brief Assigns a new regular expression to a regex object from a
-       * string containing a regular expression pattern.
-       *
-       * @param __s     A string containing a regular expression pattern.
-       * @param __flags Syntax option flags.
-       *
-       * @throws regex_error if __s does not contain a valid regular
-       * expression pattern interpreted according to @p __flags.  If
-       * regex_error is thrown, *this remains unchanged.
-       */
-      template<typename _Ch_traits, typename _Alloc>
-	basic_regex&
-	assign(const basic_string<_Ch_type, _Ch_traits, _Alloc>& __s,
-	       flag_type __flags = ECMAScript)
-	{
-	  return this->assign(basic_regex(__s.data(), __s.data() + __s.size(),
-					  _M_loc, __flags));
-	}
-
-      /**
-       * @brief Assigns a new regular expression to a regex object.
-       *
-       * @param __first The start of a range containing a valid regular
-       *                expression.
-       * @param __last  The end of a range containing a valid regular
-       *                expression.
-       * @param __flags Syntax option flags.
-       *
-       * @throws regex_error if p does not contain a valid regular
-       * expression pattern interpreted according to @p __flags.  If
-       * regex_error is thrown, the object remains unchanged.
-       */
-      template<typename _InputIterator>
-	basic_regex&
-	assign(_InputIterator __first, _InputIterator __last,
-	       flag_type __flags = ECMAScript)
-	{ return this->assign(string_type(__first, __last), __flags); }
-
-      /**
-       * @brief Assigns a new regular expression to a regex object.
-       *
-       * @param __l     An initializer list representing a regular expression.
-       * @param __flags Syntax option flags.
-       *
-       * @throws regex_error if @p __l does not contain a valid
-       * regular expression pattern interpreted according to @p
-       * __flags.  If regex_error is thrown, the object remains
-       * unchanged.
-       */
-      basic_regex&
-      assign(initializer_list<_Ch_type> __l, flag_type __flags = ECMAScript)
-      { return this->assign(__l.begin(), __l.end(), __flags); }
-
-      // [7.8.4] const operations
-      /**
-       * @brief Gets the number of marked subexpressions within the regular
-       * expression.
-       */
-      unsigned int
-      mark_count() const
-      {
-	if (_M_automaton)
-	  return _M_automaton->_M_sub_count() - 1;
-	return 0;
-      }
-
-      /**
-       * @brief Gets the flags used to construct the regular expression
-       * or in the last call to assign().
-       */
-      flag_type
-      flags() const
-      { return _M_flags; }
-
-      // [7.8.5] locale
-      /**
-       * @brief Imbues the regular expression object with the given locale.
-       *
-       * @param __loc A locale.
-       */
-      locale_type
-      imbue(locale_type __loc)
-      {
-	std::swap(__loc, _M_loc);
-	_M_automaton.reset();
-	return __loc;
-      }
-
-      /**
-       * @brief Gets the locale currently imbued in the regular expression
-       *        object.
-       */
-      locale_type
-      getloc() const
-      { return _M_loc; }
-
-      // [7.8.6] swap
-      /**
-       * @brief Swaps the contents of two regular expression objects.
-       *
-       * @param __rhs Another regular expression object.
-       */
-      void
-      swap(basic_regex& __rhs)
-      {
-	std::swap(_M_flags, __rhs._M_flags);
-	std::swap(_M_loc, __rhs._M_loc);
-	std::swap(_M_automaton, __rhs._M_automaton);
-      }
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      _M_dot(std::ostream& __ostr)
-      { _M_automaton->_M_dot(__ostr); }
-#endif
-
-    private:
-      typedef std::shared_ptr<const __detail::_NFA<_Rx_traits>> _AutomatonPtr;
-
-      template<typename _FwdIter>
-	basic_regex(_FwdIter __first, _FwdIter __last, locale_type __loc,
-		    flag_type __f)
-	: _M_flags(__f), _M_loc(std::move(__loc)),
-	_M_automaton(__detail::__compile_nfa<_FwdIter, _Rx_traits>(
-	  std::move(__first), std::move(__last), _M_loc, _M_flags))
-	{ }
-
-      template<typename _Bp, typename _Ap, typename _Cp, typename _Rp,
-	__detail::_RegexExecutorPolicy, bool>
-	friend bool
-	__detail::__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
-				    const basic_regex<_Cp, _Rp>&,
-				    regex_constants::match_flag_type);
-
-      template<typename, typename, typename, bool>
-	friend class __detail::_Executor;
-
-      flag_type              _M_flags;
-      locale_type            _M_loc;
-      _AutomatonPtr          _M_automaton;
-    };
-
-  /** @brief Standard regular expressions. */
-  typedef basic_regex<char>    regex;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /** @brief Standard wide-character regular expressions. */
-  typedef basic_regex<wchar_t> wregex;
-#endif
-
-
-  // [7.8.6] basic_regex swap
-  /**
-   * @brief Swaps the contents of two regular expression objects.
-   * @param __lhs First regular expression.
-   * @param __rhs Second regular expression.
-   */
-  template<typename _Ch_type, typename _Rx_traits>
-    inline void
-    swap(basic_regex<_Ch_type, _Rx_traits>& __lhs,
-	 basic_regex<_Ch_type, _Rx_traits>& __rhs)
-    { __lhs.swap(__rhs); }
-
-
-  // [7.9] Class template sub_match
-  /**
-   * A sequence of characters matched by a particular marked sub-expression.
-   *
-   * An object of this class is essentially a pair of iterators marking a
-   * matched subexpression within a regular expression pattern match. Such
-   * objects can be converted to and compared with std::basic_string objects
-   * of a similar base character type as the pattern matched by the regular
-   * expression.
-   *
-   * The iterators that make up the pair are the usual half-open interval
-   * referencing the actual original pattern matched.
-   */
-  template<typename _BiIter>
-    class sub_match : public std::pair<_BiIter, _BiIter>
-    {
-      typedef iterator_traits<_BiIter>			__iter_traits;
-	
-    public:
-      typedef typename __iter_traits::value_type      	value_type;
-      typedef typename __iter_traits::difference_type 	difference_type;
-      typedef _BiIter                                   iterator;
-      typedef std::basic_string<value_type>             string_type;
-
-      bool matched;
-
-      constexpr sub_match() : matched() { }
-
-      /**
-       * Gets the length of the matching sequence.
-       */
-      difference_type
-      length() const
-      { return this->matched ? std::distance(this->first, this->second) : 0; }
-
-      /**
-       * @brief Gets the matching sequence as a string.
-       *
-       * @returns the matching sequence as a string.
-       *
-       * This is the implicit conversion operator.  It is identical to the
-       * str() member function except that it will want to pop up in
-       * unexpected places and cause a great deal of confusion and cursing
-       * from the unwary.
-       */
-      operator string_type() const
-      {
-	return this->matched
-	  ? string_type(this->first, this->second)
-	  : string_type();
-      }
-
-      /**
-       * @brief Gets the matching sequence as a string.
-       *
-       * @returns the matching sequence as a string.
-       */
-      string_type
-      str() const
-      {
-	return this->matched
-	  ? string_type(this->first, this->second)
-	  : string_type();
-      }
-
-      /**
-       * @brief Compares this and another matched sequence.
-       *
-       * @param __s Another matched sequence to compare to this one.
-       *
-       * @retval <0 this matched sequence will collate before @p __s.
-       * @retval =0 this matched sequence is equivalent to @p __s.
-       * @retval <0 this matched sequence will collate after @p __s.
-       */
-      int
-      compare(const sub_match& __s) const
-      { return this->str().compare(__s.str()); }
-
-      /**
-       * @brief Compares this sub_match to a string.
-       *
-       * @param __s A string to compare to this sub_match.
-       *
-       * @retval <0 this matched sequence will collate before @p __s.
-       * @retval =0 this matched sequence is equivalent to @p __s.
-       * @retval <0 this matched sequence will collate after @p __s.
-       */
-      int
-      compare(const string_type& __s) const
-      { return this->str().compare(__s); }
-
-      /**
-       * @brief Compares this sub_match to a C-style string.
-       *
-       * @param __s A C-style string to compare to this sub_match.
-       *
-       * @retval <0 this matched sequence will collate before @p __s.
-       * @retval =0 this matched sequence is equivalent to @p __s.
-       * @retval <0 this matched sequence will collate after @p __s.
-       */
-      int
-      compare(const value_type* __s) const
-      { return this->str().compare(__s); }
-    };
-
-
-  /** @brief Standard regex submatch over a C-style null-terminated string. */
-  typedef sub_match<const char*>             csub_match;
-
-  /** @brief Standard regex submatch over a standard string. */
-  typedef sub_match<string::const_iterator>  ssub_match;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /** @brief Regex submatch over a C-style null-terminated wide string. */
-  typedef sub_match<const wchar_t*>          wcsub_match;
-
-  /** @brief Regex submatch over a standard wide string. */
-  typedef sub_match<wstring::const_iterator> wssub_match;
-#endif
-
-  // [7.9.2] sub_match non-member operators
-
-  /**
-   * @brief Tests the equivalence of two regular expression submatches.
-   * @param __lhs First regular expression submatch.
-   * @param __rhs Second regular expression submatch.
-   * @returns true if @a __lhs  is equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator==(const sub_match<_BiIter>& __lhs, const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) == 0; }
-
-  /**
-   * @brief Tests the inequivalence of two regular expression submatches.
-   * @param __lhs First regular expression submatch.
-   * @param __rhs Second regular expression submatch.
-   * @returns true if @a __lhs  is not equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator!=(const sub_match<_BiIter>& __lhs, const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) != 0; }
-
-  /**
-   * @brief Tests the ordering of two regular expression submatches.
-   * @param __lhs First regular expression submatch.
-   * @param __rhs Second regular expression submatch.
-   * @returns true if @a __lhs precedes @a __rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator<(const sub_match<_BiIter>& __lhs, const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) < 0; }
-
-  /**
-   * @brief Tests the ordering of two regular expression submatches.
-   * @param __lhs First regular expression submatch.
-   * @param __rhs Second regular expression submatch.
-   * @returns true if @a __lhs does not succeed @a __rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator<=(const sub_match<_BiIter>& __lhs, const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) <= 0; }
-
-  /**
-   * @brief Tests the ordering of two regular expression submatches.
-   * @param __lhs First regular expression submatch.
-   * @param __rhs Second regular expression submatch.
-   * @returns true if @a __lhs does not precede @a __rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator>=(const sub_match<_BiIter>& __lhs, const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) >= 0; }
-
-  /**
-   * @brief Tests the ordering of two regular expression submatches.
-   * @param __lhs First regular expression submatch.
-   * @param __rhs Second regular expression submatch.
-   * @returns true if @a __lhs succeeds @a __rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator>(const sub_match<_BiIter>& __lhs, const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) > 0; }
-
-  // Alias for sub_match'd string.
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    using __sub_match_string = basic_string<
-			      typename iterator_traits<_Bi_iter>::value_type,
-			      _Ch_traits, _Ch_alloc>;
-
-  /**
-   * @brief Tests the equivalence of a string and a regular expression
-   *        submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs  is equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator==(const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    {
-      typedef typename sub_match<_Bi_iter>::string_type string_type;
-      return __rhs.compare(string_type(__lhs.data(), __lhs.size())) == 0;
-    }
-
-  /**
-   * @brief Tests the inequivalence of a string and a regular expression
-   *        submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs  is not equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator!=(const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs precedes @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator<(const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __lhs,
-	      const sub_match<_Bi_iter>& __rhs)
-    {
-      typedef typename sub_match<_Bi_iter>::string_type string_type;
-      return __rhs.compare(string_type(__lhs.data(), __lhs.size())) > 0;
-    }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs succeeds @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator>(const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __lhs,
-	      const sub_match<_Bi_iter>& __rhs)
-    { return __rhs < __lhs; }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs does not precede @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator>=(const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return !(__lhs < __rhs); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs does not succeed @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator<=(const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return !(__rhs < __lhs); }
-
-  /**
-   * @brief Tests the equivalence of a regular expression submatch and a
-   *        string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs is equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator==(const sub_match<_Bi_iter>& __lhs,
-	       const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __rhs)
-    {
-      typedef typename sub_match<_Bi_iter>::string_type string_type;
-      return __lhs.compare(string_type(__rhs.data(), __rhs.size())) == 0;
-    }
-
-  /**
-   * @brief Tests the inequivalence of a regular expression submatch and a
-   *        string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs is not equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator!=(const sub_match<_Bi_iter>& __lhs,
-	       const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs precedes @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, class _Ch_traits, class _Ch_alloc>
-    inline bool
-    operator<(const sub_match<_Bi_iter>& __lhs,
-	      const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __rhs)
-    {
-      typedef typename sub_match<_Bi_iter>::string_type string_type;
-      return __lhs.compare(string_type(__rhs.data(), __rhs.size())) < 0;
-    }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs succeeds @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, class _Ch_traits, class _Ch_alloc>
-    inline bool
-    operator>(const sub_match<_Bi_iter>& __lhs,
-	      const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __rhs)
-    { return __rhs < __lhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs does not precede @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, class _Ch_traits, class _Ch_alloc>
-    inline bool
-    operator>=(const sub_match<_Bi_iter>& __lhs,
-	       const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __rhs)
-    { return !(__lhs < __rhs); }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs does not succeed @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter, class _Ch_traits, class _Ch_alloc>
-    inline bool
-    operator<=(const sub_match<_Bi_iter>& __lhs,
-	       const __sub_match_string<_Bi_iter, _Ch_traits, _Ch_alloc>& __rhs)
-    { return !(__rhs < __lhs); }
-
-  /**
-   * @brief Tests the equivalence of a C string and a regular expression
-   *        submatch.
-   * @param __lhs A C string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs  is equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator==(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return __rhs.compare(__lhs) == 0; }
-
-  /**
-   * @brief Tests the inequivalence of an iterator value and a regular
-   *        expression submatch.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs is not equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator!=(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs precedes @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	      const sub_match<_Bi_iter>& __rhs)
-    { return __rhs.compare(__lhs) > 0; }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs succeeds @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	      const sub_match<_Bi_iter>& __rhs)
-    { return __rhs < __lhs; }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs does not precede @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>=(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return !(__lhs < __rhs); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs does not succeed @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<=(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return !(__rhs < __lhs); }
-
-  /**
-   * @brief Tests the equivalence of a regular expression submatch and a
-   *        string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A pointer to a string?
-   * @returns true if @a __lhs  is equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator==(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return __lhs.compare(__rhs) == 0; }
-
-  /**
-   * @brief Tests the inequivalence of a regular expression submatch and a
-   *        string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A pointer to a string.
-   * @returns true if @a __lhs is not equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator!=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs precedes @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<(const sub_match<_Bi_iter>& __lhs,
-	      typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return __lhs.compare(__rhs) < 0; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs succeeds @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>(const sub_match<_Bi_iter>& __lhs,
-	      typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return __rhs < __lhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs does not precede @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return !(__lhs < __rhs); }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A string.
-   * @returns true if @a __lhs does not succeed @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return !(__rhs < __lhs); }
-
-  /**
-   * @brief Tests the equivalence of a string and a regular expression
-   *        submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs is equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator==(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    {
-      typedef typename sub_match<_Bi_iter>::string_type string_type;
-      return __rhs.compare(string_type(1, __lhs)) == 0;
-    }
-
-  /**
-   * @brief Tests the inequivalence of a string and a regular expression
-   *        submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs is not equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator!=(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs precedes @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	      const sub_match<_Bi_iter>& __rhs)
-    {
-      typedef typename sub_match<_Bi_iter>::string_type string_type;
-      return __rhs.compare(string_type(1, __lhs)) > 0;
-    }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs succeeds @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	      const sub_match<_Bi_iter>& __rhs)
-    { return __rhs < __lhs; }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs does not precede @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>=(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return !(__lhs < __rhs); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param __lhs A string.
-   * @param __rhs A regular expression submatch.
-   * @returns true if @a __lhs does not succeed @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<=(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return !(__rhs < __lhs); }
-
-  /**
-   * @brief Tests the equivalence of a regular expression submatch and a
-   *        string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A const string reference.
-   * @returns true if @a __lhs  is equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator==(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    {
-      typedef typename sub_match<_Bi_iter>::string_type string_type;
-      return __lhs.compare(string_type(1, __rhs)) == 0;
-    }
-
-  /**
-   * @brief Tests the inequivalence of a regular expression submatch and a
-   *        string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A const string reference.
-   * @returns true if @a __lhs is not equivalent to @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator!=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A const string reference.
-   * @returns true if @a __lhs precedes @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<(const sub_match<_Bi_iter>& __lhs,
-	      typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    {
-      typedef typename sub_match<_Bi_iter>::string_type string_type;
-      return __lhs.compare(string_type(1, __rhs)) < 0;
-    }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A const string reference.
-   * @returns true if @a __lhs succeeds @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>(const sub_match<_Bi_iter>& __lhs,
-	      typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    { return __rhs < __lhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A const string reference.
-   * @returns true if @a __lhs does not precede @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    { return !(__lhs < __rhs); }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param __lhs A regular expression submatch.
-   * @param __rhs A const string reference.
-   * @returns true if @a __lhs does not succeed @a __rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    { return !(__rhs < __lhs); }
-
-  /**
-   * @brief Inserts a matched string into an output stream.
-   *
-   * @param __os The output stream.
-   * @param __m  A submatch string.
-   *
-   * @returns the output stream with the submatch string inserted.
-   */
-  template<typename _Ch_type, typename _Ch_traits, typename _Bi_iter>
-    inline
-    basic_ostream<_Ch_type, _Ch_traits>&
-    operator<<(basic_ostream<_Ch_type, _Ch_traits>& __os,
-	       const sub_match<_Bi_iter>& __m)
-    { return __os << __m.str(); }
-
-  // [7.10] Class template match_results
-
-  /**
-   * @brief The results of a match or search operation.
-   *
-   * A collection of character sequences representing the result of a regular
-   * expression match.  Storage for the collection is allocated and freed as
-   * necessary by the member functions of class template match_results.
-   *
-   * This class satisfies the Sequence requirements, with the exception that
-   * only the operations defined for a const-qualified Sequence are supported.
-   *
-   * The sub_match object stored at index 0 represents sub-expression 0, i.e.
-   * the whole match. In this case the %sub_match member matched is always true.
-   * The sub_match object stored at index n denotes what matched the marked
-   * sub-expression n within the matched expression. If the sub-expression n
-   * participated in a regular expression match then the %sub_match member
-   * matched evaluates to true, and members first and second denote the range
-   * of characters [first, second) which formed that match. Otherwise matched
-   * is false, and members first and second point to the end of the sequence
-   * that was searched.
-   *
-   * @nosubgrouping
-   */
-  template<typename _Bi_iter,
-	   typename _Alloc = allocator<sub_match<_Bi_iter> > >
-    class match_results
-    : private std::vector<sub_match<_Bi_iter>, _Alloc>
-    {
-    private:
-      /*
-       * The vector base is empty if this does not represent a match (!ready());
-       * Otherwise if it's a match failure, it contains 3 elements:
-       * [0] unmatched
-       * [1] prefix
-       * [2] suffix
-       * Otherwise it contains n+4 elements where n is the number of marked
-       * sub-expressions:
-       * [0] entire match
-       * [1] 1st marked subexpression
-       * ...
-       * [n] nth marked subexpression
-       * [n+1] unmatched
-       * [n+2] prefix
-       * [n+3] suffix
-       */
-      typedef std::vector<sub_match<_Bi_iter>, _Alloc>     _Base_type;
-      typedef std::iterator_traits<_Bi_iter>   	   	   __iter_traits;
-      typedef regex_constants::match_flag_type		   match_flag_type;
-
-    public:
-      /**
-       * @name 10.? Public Types
-       */
-      //@{
-      typedef sub_match<_Bi_iter>                          value_type;
-      typedef const value_type&                            const_reference;
-      typedef const_reference                              reference;
-      typedef typename _Base_type::const_iterator          const_iterator;
-      typedef const_iterator                               iterator;
-      typedef typename __iter_traits::difference_type	   difference_type;
-      typedef typename allocator_traits<_Alloc>::size_type size_type;
-      typedef _Alloc                                       allocator_type;
-      typedef typename __iter_traits::value_type 	   char_type;
-      typedef std::basic_string<char_type>                 string_type;
-      //@}
-
-    public:
-      /**
-       * @name 28.10.1 Construction, Copying, and Destruction
-       */
-      //@{
-
-      /**
-       * @brief Constructs a default %match_results container.
-       * @post size() returns 0 and str() returns an empty string.
-       */
-      explicit
-      match_results(const _Alloc& __a = _Alloc())
-      : _Base_type(__a)
-      { }
-
-      /**
-       * @brief Copy constructs a %match_results.
-       */
-      match_results(const match_results& __rhs) = default;
-
-      /**
-       * @brief Move constructs a %match_results.
-       */
-      match_results(match_results&& __rhs) noexcept = default;
-
-      /**
-       * @brief Assigns rhs to *this.
-       */
-      match_results&
-      operator=(const match_results& __rhs) = default;
-
-      /**
-       * @brief Move-assigns rhs to *this.
-       */
-      match_results&
-      operator=(match_results&& __rhs) = default;
-
-      /**
-       * @brief Destroys a %match_results object.
-       */
-      ~match_results()
-      { }
-
-      //@}
-
-      // 28.10.2, state:
-      /**
-       * @brief Indicates if the %match_results is ready.
-       * @retval true   The object has a fully-established result state.
-       * @retval false  The object is not ready.
-       */
-      bool ready() const { return !_Base_type::empty(); }
-
-      /**
-       * @name 28.10.2 Size
-       */
-      //@{
-
-      /**
-       * @brief Gets the number of matches and submatches.
-       *
-       * The number of matches for a given regular expression will be either 0
-       * if there was no match or mark_count() + 1 if a match was successful.
-       * Some matches may be empty.
-       *
-       * @returns the number of matches found.
-       */
-      size_type
-      size() const
-      { return _Base_type::empty() ? 0 : _Base_type::size() - 3; }
-
-      size_type
-      max_size() const
-      { return _Base_type::max_size(); }
-
-      /**
-       * @brief Indicates if the %match_results contains no results.
-       * @retval true The %match_results object is empty.
-       * @retval false The %match_results object is not empty.
-       */
-      bool
-      empty() const
-      { return size() == 0; }
-
-      //@}
-
-      /**
-       * @name 10.3 Element Access
-       */
-      //@{
-
-      /**
-       * @brief Gets the length of the indicated submatch.
-       * @param __sub indicates the submatch.
-       * @pre   ready() == true
-       *
-       * This function returns the length of the indicated submatch, or the
-       * length of the entire match if @p __sub is zero (the default).
-       */
-      difference_type
-      length(size_type __sub = 0) const
-      { return (*this)[__sub].length(); }
-
-      /**
-       * @brief Gets the offset of the beginning of the indicated submatch.
-       * @param __sub indicates the submatch.
-       * @pre   ready() == true
-       *
-       * This function returns the offset from the beginning of the target
-       * sequence to the beginning of the submatch, unless the value of @p __sub
-       * is zero (the default), in which case this function returns the offset
-       * from the beginning of the target sequence to the beginning of the
-       * match.
-       */
-      difference_type
-      position(size_type __sub = 0) const
-      { return std::distance(_M_begin, (*this)[__sub].first); }
-
-      /**
-       * @brief Gets the match or submatch converted to a string type.
-       * @param __sub indicates the submatch.
-       * @pre   ready() == true
-       *
-       * This function gets the submatch (or match, if @p __sub is
-       * zero) extracted from the target range and converted to the
-       * associated string type.
-       */
-      string_type
-      str(size_type __sub = 0) const
-      { return string_type((*this)[__sub]); }
-
-      /**
-       * @brief Gets a %sub_match reference for the match or submatch.
-       * @param __sub indicates the submatch.
-       * @pre   ready() == true
-       *
-       * This function gets a reference to the indicated submatch, or
-       * the entire match if @p __sub is zero.
-       *
-       * If @p __sub >= size() then this function returns a %sub_match with a
-       * special value indicating no submatch.
-       */
-      const_reference
-      operator[](size_type __sub) const
-      {
-	_GLIBCXX_DEBUG_ASSERT( ready() );
-	return __sub < size()
-	       ? _Base_type::operator[](__sub)
-	       : _M_unmatched_sub();
-      }
-
-      /**
-       * @brief Gets a %sub_match representing the match prefix.
-       * @pre   ready() == true
-       *
-       * This function gets a reference to a %sub_match object representing the
-       * part of the target range between the start of the target range and the
-       * start of the match.
-       */
-      const_reference
-      prefix() const
-      {
-	_GLIBCXX_DEBUG_ASSERT( ready() );
-	return !empty() ? _M_prefix() : _M_unmatched_sub();
-      }
-
-      /**
-       * @brief Gets a %sub_match representing the match suffix.
-       * @pre   ready() == true
-       *
-       * This function gets a reference to a %sub_match object representing the
-       * part of the target range between the end of the match and the end of
-       * the target range.
-       */
-      const_reference
-      suffix() const
-      {
-	_GLIBCXX_DEBUG_ASSERT( ready() );
-	return !empty() ? _M_suffix() : _M_unmatched_sub();
-      }
-
-      /**
-       * @brief Gets an iterator to the start of the %sub_match collection.
-       */
-      const_iterator
-      begin() const
-      { return _Base_type::begin(); }
-
-      /**
-       * @brief Gets an iterator to the start of the %sub_match collection.
-       */
-      const_iterator
-      cbegin() const
-      { return this->begin(); }
-
-      /**
-       * @brief Gets an iterator to one-past-the-end of the collection.
-       */
-      const_iterator
-      end() const
-      { return _Base_type::end() - 3; }
-
-      /**
-       * @brief Gets an iterator to one-past-the-end of the collection.
-       */
-      const_iterator
-      cend() const
-      { return this->end(); }
-
-      //@}
-
-      /**
-       * @name 10.4 Formatting
-       *
-       * These functions perform formatted substitution of the matched
-       * character sequences into their target.  The format specifiers and
-       * escape sequences accepted by these functions are determined by
-       * their @p flags parameter as documented above.
-       */
-       //@{
-
-      /**
-       * @pre   ready() == true
-       */
-      template<typename _Out_iter>
-	_Out_iter
-	format(_Out_iter __out, const char_type* __fmt_first,
-	       const char_type* __fmt_last,
-	       match_flag_type __flags = regex_constants::format_default) const;
-
-      /**
-       * @pre   ready() == true
-       */
-      template<typename _Out_iter, typename _St, typename _Sa>
-	_Out_iter
-	format(_Out_iter __out, const basic_string<char_type, _St, _Sa>& __fmt,
-	       match_flag_type __flags = regex_constants::format_default) const
-	{
-	  return format(__out, __fmt.data(), __fmt.data() + __fmt.size(),
-			__flags);
-	}
-
-      /**
-       * @pre   ready() == true
-       */
-      template<typename _St, typename _Sa>
-	basic_string<char_type, _St, _Sa>
-	format(const basic_string<char_type, _St, _Sa>& __fmt,
-	       match_flag_type __flags = regex_constants::format_default) const
-	{
-	  basic_string<char_type, _St, _Sa> __result;
-	  format(std::back_inserter(__result), __fmt, __flags);
-	  return __result;
-	}
-
-      /**
-       * @pre   ready() == true
-       */
-      string_type
-      format(const char_type* __fmt,
-	     match_flag_type __flags = regex_constants::format_default) const
-      {
-	string_type __result;
-	format(std::back_inserter(__result),
-	       __fmt,
-	       __fmt + char_traits<char_type>::length(__fmt),
-	       __flags);
-	return __result;
-      }
-
-      //@}
-
-      /**
-       * @name 10.5 Allocator
-       */
-      //@{
-
-      /**
-       * @brief Gets a copy of the allocator.
-       */
-      allocator_type
-      get_allocator() const
-      { return _Base_type::get_allocator(); }
-
-      //@}
-
-      /**
-       * @name 10.6 Swap
-       */
-       //@{
-
-      /**
-       * @brief Swaps the contents of two match_results.
-       */
-      void
-      swap(match_results& __that)
-      {
-	using std::swap;
-	_Base_type::swap(__that);
-	swap(_M_begin, __that._M_begin);
-      }
-      //@}
-
-    private:
-      template<typename, typename, typename, bool>
-	friend class __detail::_Executor;
-
-      template<typename, typename, typename>
-	friend class regex_iterator;
-
-      template<typename _Bp, typename _Ap, typename _Cp, typename _Rp,
-	__detail::_RegexExecutorPolicy, bool>
-	friend bool
-	__detail::__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
-				    const basic_regex<_Cp, _Rp>&,
-				    regex_constants::match_flag_type);
-
-      void
-      _M_resize(unsigned int __size)
-      { _Base_type::resize(__size + 3); }
-
-      const_reference
-      _M_unmatched_sub() const
-      { return _Base_type::operator[](_Base_type::size() - 3); }
-
-      sub_match<_Bi_iter>&
-      _M_unmatched_sub()
-      { return _Base_type::operator[](_Base_type::size() - 3); }
-
-      const_reference
-      _M_prefix() const
-      { return _Base_type::operator[](_Base_type::size() - 2); }
-
-      sub_match<_Bi_iter>&
-      _M_prefix()
-      { return _Base_type::operator[](_Base_type::size() - 2); }
-
-      const_reference
-      _M_suffix() const
-      { return _Base_type::operator[](_Base_type::size() - 1); }
-
-      sub_match<_Bi_iter>&
-      _M_suffix()
-      { return _Base_type::operator[](_Base_type::size() - 1); }
-
-      _Bi_iter _M_begin;
-    };
-
-  typedef match_results<const char*>             cmatch;
-  typedef match_results<string::const_iterator>  smatch;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  typedef match_results<const wchar_t*>          wcmatch;
-  typedef match_results<wstring::const_iterator> wsmatch;
-#endif
-
-  // match_results comparisons
-  /**
-   * @brief Compares two match_results for equality.
-   * @returns true if the two objects refer to the same match,
-   * false otherwise.
-   */
-  template<typename _Bi_iter, typename _Alloc>
-    inline bool
-    operator==(const match_results<_Bi_iter, _Alloc>& __m1,
-	       const match_results<_Bi_iter, _Alloc>& __m2)
-    {
-      if (__m1.ready() != __m2.ready())
-	return false;
-      if (!__m1.ready())  // both are not ready
-	return true;
-      if (__m1.empty() != __m2.empty())
-	return false;
-      if (__m1.empty())   // both are empty
-	return true;
-      return __m1.prefix() == __m2.prefix()
-	&& __m1.size() == __m2.size()
-	&& std::equal(__m1.begin(), __m1.end(), __m2.begin())
-	&& __m1.suffix() == __m2.suffix();
-    }
-
-  /**
-   * @brief Compares two match_results for inequality.
-   * @returns true if the two objects do not refer to the same match,
-   * false otherwise.
-   */
-  template<typename _Bi_iter, class _Alloc>
-    inline bool
-    operator!=(const match_results<_Bi_iter, _Alloc>& __m1,
-	       const match_results<_Bi_iter, _Alloc>& __m2)
-    { return !(__m1 == __m2); }
-
-  // [7.10.6] match_results swap
-  /**
-   * @brief Swaps two match results.
-   * @param __lhs A match result.
-   * @param __rhs A match result.
-   *
-   * The contents of the two match_results objects are swapped.
-   */
-  template<typename _Bi_iter, typename _Alloc>
-    inline void
-    swap(match_results<_Bi_iter, _Alloc>& __lhs,
-	 match_results<_Bi_iter, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-
-_GLIBCXX_END_NAMESPACE_CXX11
-
-  // [7.11.2] Function template regex_match
-  /**
-   * @name Matching, Searching, and Replacing
-   */
-  //@{
-
-  /**
-   * @brief Determines if there is a match between the regular expression @p e
-   * and all of the character sequence [first, last).
-   *
-   * @param __s     Start of the character sequence to match.
-   * @param __e     One-past-the-end of the character sequence to match.
-   * @param __m     The match results.
-   * @param __re    The regular expression.
-   * @param __flags Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Bi_iter, typename _Alloc,
-	   typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_match(_Bi_iter                                 __s,
-		_Bi_iter                                 __e,
-		match_results<_Bi_iter, _Alloc>&         __m,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type         __flags
-			       = regex_constants::match_default)
-    {
-      return __detail::__regex_algo_impl<_Bi_iter, _Alloc, _Ch_type, _Rx_traits,
-	__detail::_RegexExecutorPolicy::_S_auto, true>
-	  (__s, __e, __m, __re, __flags);
-    }
-
-  /**
-   * @brief Indicates if there is a match between the regular expression @p e
-   * and all of the character sequence [first, last).
-   *
-   * @param __first Beginning of the character sequence to match.
-   * @param __last  One-past-the-end of the character sequence to match.
-   * @param __re    The regular expression.
-   * @param __flags Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Bi_iter, typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_match(_Bi_iter __first, _Bi_iter __last,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __flags
-		= regex_constants::match_default)
-    {
-      match_results<_Bi_iter> __what;
-      return regex_match(__first, __last, __what, __re, __flags);
-    }
-
-  /**
-   * @brief Determines if there is a match between the regular expression @p e
-   * and a C-style null-terminated string.
-   *
-   * @param __s  The C-style null-terminated string to match.
-   * @param __m  The match results.
-   * @param __re The regular expression.
-   * @param __f  Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_type, typename _Alloc, typename _Rx_traits>
-    inline bool
-    regex_match(const _Ch_type* __s,
-		match_results<const _Ch_type*, _Alloc>& __m,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __f
-		= regex_constants::match_default)
-    { return regex_match(__s, __s + _Rx_traits::length(__s), __m, __re, __f); }
-
-  /**
-   * @brief Determines if there is a match between the regular expression @p e
-   * and a string.
-   *
-   * @param __s     The string to match.
-   * @param __m     The match results.
-   * @param __re    The regular expression.
-   * @param __flags Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_traits, typename _Ch_alloc,
-	   typename _Alloc, typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_match(const basic_string<_Ch_type, _Ch_traits, _Ch_alloc>& __s,
-		match_results<typename basic_string<_Ch_type,
-		_Ch_traits, _Ch_alloc>::const_iterator, _Alloc>& __m,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __flags
-		= regex_constants::match_default)
-    { return regex_match(__s.begin(), __s.end(), __m, __re, __flags); }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 2329. regex_match() with match_results should forbid temporary strings
-  /// Prevent unsafe attempts to get match_results from a temporary string.
-  template<typename _Ch_traits, typename _Ch_alloc,
-	   typename _Alloc, typename _Ch_type, typename _Rx_traits>
-    bool
-    regex_match(const basic_string<_Ch_type, _Ch_traits, _Ch_alloc>&&,
-		match_results<typename basic_string<_Ch_type,
-		_Ch_traits, _Ch_alloc>::const_iterator, _Alloc>&,
-		const basic_regex<_Ch_type, _Rx_traits>&,
-		regex_constants::match_flag_type
-		= regex_constants::match_default) = delete;
-
-  /**
-   * @brief Indicates if there is a match between the regular expression @p e
-   * and a C-style null-terminated string.
-   *
-   * @param __s  The C-style null-terminated string to match.
-   * @param __re The regular expression.
-   * @param __f  Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_type, class _Rx_traits>
-    inline bool
-    regex_match(const _Ch_type* __s,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __f
-		= regex_constants::match_default)
-    { return regex_match(__s, __s + _Rx_traits::length(__s), __re, __f); }
-
-  /**
-   * @brief Indicates if there is a match between the regular expression @p e
-   * and a string.
-   *
-   * @param __s     [IN] The string to match.
-   * @param __re    [IN] The regular expression.
-   * @param __flags [IN] Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_traits, typename _Str_allocator,
-	   typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_match(const basic_string<_Ch_type, _Ch_traits, _Str_allocator>& __s,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __flags
-		= regex_constants::match_default)
-    { return regex_match(__s.begin(), __s.end(), __re, __flags); }
-
-  // [7.11.3] Function template regex_search
-  /**
-   * Searches for a regular expression within a range.
-   * @param __s     [IN]  The start of the string to search.
-   * @param __e     [IN]  One-past-the-end of the string to search.
-   * @param __m     [OUT] The match results.
-   * @param __re    [IN]  The regular expression to search for.
-   * @param __flags [IN]  Search policy flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string, the content of %m is
-   *               undefined.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Bi_iter, typename _Alloc,
-	   typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_search(_Bi_iter __s, _Bi_iter __e,
-		 match_results<_Bi_iter, _Alloc>& __m,
-		 const basic_regex<_Ch_type, _Rx_traits>& __re,
-		 regex_constants::match_flag_type __flags
-		 = regex_constants::match_default)
-    {
-      return __detail::__regex_algo_impl<_Bi_iter, _Alloc, _Ch_type, _Rx_traits,
-	__detail::_RegexExecutorPolicy::_S_auto, false>
-	  (__s, __e, __m, __re, __flags);
-    }
-
-  /**
-   * Searches for a regular expression within a range.
-   * @param __first [IN]  The start of the string to search.
-   * @param __last  [IN]  One-past-the-end of the string to search.
-   * @param __re    [IN]  The regular expression to search for.
-   * @param __flags [IN]  Search policy flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Bi_iter, typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_search(_Bi_iter __first, _Bi_iter __last,
-		 const basic_regex<_Ch_type, _Rx_traits>& __re,
-		 regex_constants::match_flag_type __flags
-		 = regex_constants::match_default)
-    {
-      match_results<_Bi_iter> __what;
-      return regex_search(__first, __last, __what, __re, __flags);
-    }
-
-  /**
-   * @brief Searches for a regular expression within a C-string.
-   * @param __s [IN]  A C-string to search for the regex.
-   * @param __m [OUT] The set of regex matches.
-   * @param __e [IN]  The regex to search for in @p s.
-   * @param __f [IN]  The search flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string, the content of %m is
-   *               undefined.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_type, class _Alloc, class _Rx_traits>
-    inline bool
-    regex_search(const _Ch_type* __s,
-		 match_results<const _Ch_type*, _Alloc>& __m,
-		 const basic_regex<_Ch_type, _Rx_traits>& __e,
-		 regex_constants::match_flag_type __f
-		 = regex_constants::match_default)
-    { return regex_search(__s, __s + _Rx_traits::length(__s), __m, __e, __f); }
-
-  /**
-   * @brief Searches for a regular expression within a C-string.
-   * @param __s [IN]  The C-string to search.
-   * @param __e [IN]  The regular expression to search for.
-   * @param __f [IN]  Search policy flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_search(const _Ch_type* __s,
-		 const basic_regex<_Ch_type, _Rx_traits>& __e,
-		 regex_constants::match_flag_type __f
-		 = regex_constants::match_default)
-    { return regex_search(__s, __s + _Rx_traits::length(__s), __e, __f); }
-
-  /**
-   * @brief Searches for a regular expression within a string.
-   * @param __s     [IN]  The string to search.
-   * @param __e     [IN]  The regular expression to search for.
-   * @param __flags [IN]  Search policy flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_traits, typename _String_allocator,
-	   typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_search(const basic_string<_Ch_type, _Ch_traits,
-		 _String_allocator>& __s,
-		 const basic_regex<_Ch_type, _Rx_traits>& __e,
-		 regex_constants::match_flag_type __flags
-		 = regex_constants::match_default)
-    { return regex_search(__s.begin(), __s.end(), __e, __flags); }
-
-  /**
-   * @brief Searches for a regular expression within a string.
-   * @param __s [IN]  A C++ string to search for the regex.
-   * @param __m [OUT] The set of regex matches.
-   * @param __e [IN]  The regex to search for in @p s.
-   * @param __f [IN]  The search flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string, the content of %m is
-   *               undefined.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_traits, typename _Ch_alloc,
-	   typename _Alloc, typename _Ch_type,
-	   typename _Rx_traits>
-    inline bool
-    regex_search(const basic_string<_Ch_type, _Ch_traits, _Ch_alloc>& __s,
-		 match_results<typename basic_string<_Ch_type,
-		 _Ch_traits, _Ch_alloc>::const_iterator, _Alloc>& __m,
-		 const basic_regex<_Ch_type, _Rx_traits>& __e,
-		 regex_constants::match_flag_type __f
-		 = regex_constants::match_default)
-    { return regex_search(__s.begin(), __s.end(), __m, __e, __f); }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 2329. regex_search() with match_results should forbid temporary strings
-  /// Prevent unsafe attempts to get match_results from a temporary string.
-  template<typename _Ch_traits, typename _Ch_alloc,
-	   typename _Alloc, typename _Ch_type,
-	   typename _Rx_traits>
-    bool
-    regex_search(const basic_string<_Ch_type, _Ch_traits, _Ch_alloc>&&,
-		 match_results<typename basic_string<_Ch_type,
-		 _Ch_traits, _Ch_alloc>::const_iterator, _Alloc>&,
-		 const basic_regex<_Ch_type, _Rx_traits>&,
-		 regex_constants::match_flag_type
-		 = regex_constants::match_default) = delete;
-
-  // std [28.11.4] Function template regex_replace
-  /**
-   * @brief Search for a regular expression within a range for multiple times,
-   and replace the matched parts through filling a format string.
-   * @param __out   [OUT] The output iterator.
-   * @param __first [IN]  The start of the string to search.
-   * @param __last  [IN]  One-past-the-end of the string to search.
-   * @param __e     [IN]  The regular expression to search for.
-   * @param __fmt   [IN]  The format string.
-   * @param __flags [IN]  Search and replace policy flags.
-   *
-   * @returns __out
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Out_iter, typename _Bi_iter,
-	   typename _Rx_traits, typename _Ch_type,
-	   typename _St, typename _Sa>
-    inline _Out_iter
-    regex_replace(_Out_iter __out, _Bi_iter __first, _Bi_iter __last,
-		  const basic_regex<_Ch_type, _Rx_traits>& __e,
-		  const basic_string<_Ch_type, _St, _Sa>& __fmt,
-		  regex_constants::match_flag_type __flags
-		  = regex_constants::match_default)
-    {
-      return regex_replace(__out, __first, __last, __e, __fmt.c_str(), __flags);
-    }
-
-  /**
-   * @brief Search for a regular expression within a range for multiple times,
-   and replace the matched parts through filling a format C-string.
-   * @param __out   [OUT] The output iterator.
-   * @param __first [IN]  The start of the string to search.
-   * @param __last  [IN]  One-past-the-end of the string to search.
-   * @param __e     [IN]  The regular expression to search for.
-   * @param __fmt   [IN]  The format C-string.
-   * @param __flags [IN]  Search and replace policy flags.
-   *
-   * @returns __out
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Out_iter, typename _Bi_iter,
-	   typename _Rx_traits, typename _Ch_type>
-    _Out_iter
-    regex_replace(_Out_iter __out, _Bi_iter __first, _Bi_iter __last,
-		  const basic_regex<_Ch_type, _Rx_traits>& __e,
-		  const _Ch_type* __fmt,
-		  regex_constants::match_flag_type __flags
-		  = regex_constants::match_default);
-
-  /**
-   * @brief Search for a regular expression within a string for multiple times,
-   and replace the matched parts through filling a format string.
-   * @param __s     [IN] The string to search and replace.
-   * @param __e     [IN] The regular expression to search for.
-   * @param __fmt   [IN] The format string.
-   * @param __flags [IN] Search and replace policy flags.
-   *
-   * @returns The string after replacing.
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Rx_traits, typename _Ch_type,
-	   typename _St, typename _Sa, typename _Fst, typename _Fsa>
-    inline basic_string<_Ch_type, _St, _Sa>
-    regex_replace(const basic_string<_Ch_type, _St, _Sa>& __s,
-		  const basic_regex<_Ch_type, _Rx_traits>& __e,
-		  const basic_string<_Ch_type, _Fst, _Fsa>& __fmt,
-		  regex_constants::match_flag_type __flags
-		  = regex_constants::match_default)
-    {
-      basic_string<_Ch_type, _St, _Sa> __result;
-      regex_replace(std::back_inserter(__result),
-		    __s.begin(), __s.end(), __e, __fmt, __flags);
-      return __result;
-    }
-
-  /**
-   * @brief Search for a regular expression within a string for multiple times,
-   and replace the matched parts through filling a format C-string.
-   * @param __s     [IN] The string to search and replace.
-   * @param __e     [IN] The regular expression to search for.
-   * @param __fmt   [IN] The format C-string.
-   * @param __flags [IN] Search and replace policy flags.
-   *
-   * @returns The string after replacing.
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Rx_traits, typename _Ch_type,
-	   typename _St, typename _Sa>
-    inline basic_string<_Ch_type, _St, _Sa>
-    regex_replace(const basic_string<_Ch_type, _St, _Sa>& __s,
-		  const basic_regex<_Ch_type, _Rx_traits>& __e,
-		  const _Ch_type* __fmt,
-		  regex_constants::match_flag_type __flags
-		  = regex_constants::match_default)
-    {
-      basic_string<_Ch_type, _St, _Sa> __result;
-      regex_replace(std::back_inserter(__result),
-		    __s.begin(), __s.end(), __e, __fmt, __flags);
-      return __result;
-    }
-
-  /**
-   * @brief Search for a regular expression within a C-string for multiple
-   times, and replace the matched parts through filling a format string.
-   * @param __s     [IN] The C-string to search and replace.
-   * @param __e     [IN] The regular expression to search for.
-   * @param __fmt   [IN] The format string.
-   * @param __flags [IN] Search and replace policy flags.
-   *
-   * @returns The string after replacing.
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Rx_traits, typename _Ch_type,
-	   typename _St, typename _Sa>
-    inline basic_string<_Ch_type>
-    regex_replace(const _Ch_type* __s,
-		  const basic_regex<_Ch_type, _Rx_traits>& __e,
-		  const basic_string<_Ch_type, _St, _Sa>& __fmt,
-		  regex_constants::match_flag_type __flags
-		  = regex_constants::match_default)
-    {
-      basic_string<_Ch_type> __result;
-      regex_replace(std::back_inserter(__result), __s,
-		    __s + char_traits<_Ch_type>::length(__s),
-		    __e, __fmt, __flags);
-      return __result;
-    }
-
-  /**
-   * @brief Search for a regular expression within a C-string for multiple
-   times, and replace the matched parts through filling a format C-string.
-   * @param __s     [IN] The C-string to search and replace.
-   * @param __e     [IN] The regular expression to search for.
-   * @param __fmt   [IN] The format C-string.
-   * @param __flags [IN] Search and replace policy flags.
-   *
-   * @returns The string after replacing.
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Rx_traits, typename _Ch_type>
-    inline basic_string<_Ch_type>
-    regex_replace(const _Ch_type* __s,
-		  const basic_regex<_Ch_type, _Rx_traits>& __e,
-		  const _Ch_type* __fmt,
-		  regex_constants::match_flag_type __flags
-		  = regex_constants::match_default)
-    {
-      basic_string<_Ch_type> __result;
-      regex_replace(std::back_inserter(__result), __s,
-		    __s + char_traits<_Ch_type>::length(__s),
-		    __e, __fmt, __flags);
-      return __result;
-    }
-
-  //@}
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  // std [28.12] Class template regex_iterator
-  /**
-   * An iterator adaptor that will provide repeated calls of regex_search over
-   * a range until no more matches remain.
-   */
-  template<typename _Bi_iter,
-	   typename _Ch_type = typename iterator_traits<_Bi_iter>::value_type,
-	   typename _Rx_traits = regex_traits<_Ch_type> >
-    class regex_iterator
-    {
-    public:
-      typedef basic_regex<_Ch_type, _Rx_traits>  regex_type;
-      typedef match_results<_Bi_iter>            value_type;
-      typedef std::ptrdiff_t                     difference_type;
-      typedef const value_type*                  pointer;
-      typedef const value_type&                  reference;
-      typedef std::forward_iterator_tag          iterator_category;
-
-      /**
-       * @brief Provides a singular iterator, useful for indicating
-       * one-past-the-end of a range.
-       */
-      regex_iterator()
-      : _M_match()
-      { }
-
-      /**
-       * Constructs a %regex_iterator...
-       * @param __a  [IN] The start of a text range to search.
-       * @param __b  [IN] One-past-the-end of the text range to search.
-       * @param __re [IN] The regular expression to match.
-       * @param __m  [IN] Policy flags for match rules.
-       */
-      regex_iterator(_Bi_iter __a, _Bi_iter __b, const regex_type& __re,
-		     regex_constants::match_flag_type __m
-		     = regex_constants::match_default)
-      : _M_begin(__a), _M_end(__b), _M_pregex(&__re), _M_flags(__m), _M_match()
-      {
-	if (!regex_search(_M_begin, _M_end, _M_match, *_M_pregex, _M_flags))
-	  *this = regex_iterator();
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2332. regex_iterator should forbid temporary regexes
-      regex_iterator(_Bi_iter, _Bi_iter, const regex_type&&,
-		     regex_constants::match_flag_type
-		     = regex_constants::match_default) = delete;
-      /**
-       * Copy constructs a %regex_iterator.
-       */
-      regex_iterator(const regex_iterator& __rhs) = default;
-
-      /**
-       * @brief Assigns one %regex_iterator to another.
-       */
-      regex_iterator&
-      operator=(const regex_iterator& __rhs) = default;
-
-      /**
-       * @brief Tests the equivalence of two regex iterators.
-       */
-      bool
-      operator==(const regex_iterator& __rhs) const;
-
-      /**
-       * @brief Tests the inequivalence of two regex iterators.
-       */
-      bool
-      operator!=(const regex_iterator& __rhs) const
-      { return !(*this == __rhs); }
-
-      /**
-       * @brief Dereferences a %regex_iterator.
-       */
-      const value_type&
-      operator*() const
-      { return _M_match; }
-
-      /**
-       * @brief Selects a %regex_iterator member.
-       */
-      const value_type*
-      operator->() const
-      { return &_M_match; }
-
-      /**
-       * @brief Increments a %regex_iterator.
-       */
-      regex_iterator&
-      operator++();
-
-      /**
-       * @brief Postincrements a %regex_iterator.
-       */
-      regex_iterator
-      operator++(int)
-      {
-	auto __tmp = *this;
-	++(*this);
-	return __tmp;
-      }
-
-    private:
-      _Bi_iter                         _M_begin;
-      _Bi_iter                         _M_end;
-      const regex_type*                _M_pregex;
-      regex_constants::match_flag_type _M_flags;
-      match_results<_Bi_iter>          _M_match;
-    };
-
-  typedef regex_iterator<const char*>             cregex_iterator;
-  typedef regex_iterator<string::const_iterator>  sregex_iterator;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  typedef regex_iterator<const wchar_t*>          wcregex_iterator;
-  typedef regex_iterator<wstring::const_iterator> wsregex_iterator;
-#endif
-
-  // [7.12.2] Class template regex_token_iterator
-  /**
-   * Iterates over submatches in a range (or @a splits a text string).
-   *
-   * The purpose of this iterator is to enumerate all, or all specified,
-   * matches of a regular expression within a text range.  The dereferenced
-   * value of an iterator of this class is a std::sub_match object.
-   */
-  template<typename _Bi_iter,
-	   typename _Ch_type = typename iterator_traits<_Bi_iter>::value_type,
-	   typename _Rx_traits = regex_traits<_Ch_type> >
-    class regex_token_iterator
-    {
-    public:
-      typedef basic_regex<_Ch_type, _Rx_traits> regex_type;
-      typedef sub_match<_Bi_iter>               value_type;
-      typedef std::ptrdiff_t                    difference_type;
-      typedef const value_type*                 pointer;
-      typedef const value_type&                 reference;
-      typedef std::forward_iterator_tag         iterator_category;
-
-    public:
-      /**
-       * @brief Default constructs a %regex_token_iterator.
-       *
-       * A default-constructed %regex_token_iterator is a singular iterator
-       * that will compare equal to the one-past-the-end value for any
-       * iterator of the same type.
-       */
-      regex_token_iterator()
-      : _M_position(), _M_subs(), _M_suffix(), _M_n(0), _M_result(nullptr),
-      _M_has_m1(false)
-      { }
-
-      /**
-       * Constructs a %regex_token_iterator...
-       * @param __a          [IN] The start of the text to search.
-       * @param __b          [IN] One-past-the-end of the text to search.
-       * @param __re         [IN] The regular expression to search for.
-       * @param __submatch   [IN] Which submatch to return.  There are some
-       *                        special values for this parameter:
-       *                        - -1 each enumerated subexpression does NOT
-       *                          match the regular expression (aka field
-       *                          splitting)
-       *                        - 0 the entire string matching the
-       *                          subexpression is returned for each match
-       *                          within the text.
-       *                        - >0 enumerates only the indicated
-       *                          subexpression from a match within the text.
-       * @param __m          [IN] Policy flags for match rules.
-       */
-      regex_token_iterator(_Bi_iter __a, _Bi_iter __b, const regex_type& __re,
-			   int __submatch = 0,
-			   regex_constants::match_flag_type __m
-			   = regex_constants::match_default)
-      : _M_position(__a, __b, __re, __m), _M_subs(1, __submatch), _M_n(0)
-      { _M_init(__a, __b); }
-
-      /**
-       * Constructs a %regex_token_iterator...
-       * @param __a          [IN] The start of the text to search.
-       * @param __b          [IN] One-past-the-end of the text to search.
-       * @param __re         [IN] The regular expression to search for.
-       * @param __submatches [IN] A list of subexpressions to return for each
-       *                          regular expression match within the text.
-       * @param __m          [IN] Policy flags for match rules.
-       */
-      regex_token_iterator(_Bi_iter __a, _Bi_iter __b,
-			   const regex_type& __re,
-			   const std::vector<int>& __submatches,
-			   regex_constants::match_flag_type __m
-			     = regex_constants::match_default)
-      : _M_position(__a, __b, __re, __m), _M_subs(__submatches), _M_n(0)
-      { _M_init(__a, __b); }
-
-      /**
-       * Constructs a %regex_token_iterator...
-       * @param __a          [IN] The start of the text to search.
-       * @param __b          [IN] One-past-the-end of the text to search.
-       * @param __re         [IN] The regular expression to search for.
-       * @param __submatches [IN] A list of subexpressions to return for each
-       *                          regular expression match within the text.
-       * @param __m          [IN] Policy flags for match rules.
-       */
-      regex_token_iterator(_Bi_iter __a, _Bi_iter __b,
-			   const regex_type& __re,
-			   initializer_list<int> __submatches,
-			   regex_constants::match_flag_type __m
-			     = regex_constants::match_default)
-      : _M_position(__a, __b, __re, __m), _M_subs(__submatches), _M_n(0)
-      { _M_init(__a, __b); }
-
-      /**
-       * Constructs a %regex_token_iterator...
-       * @param __a          [IN] The start of the text to search.
-       * @param __b          [IN] One-past-the-end of the text to search.
-       * @param __re         [IN] The regular expression to search for.
-       * @param __submatches [IN] A list of subexpressions to return for each
-       *                          regular expression match within the text.
-       * @param __m          [IN] Policy flags for match rules.
-       */
-      template<std::size_t _Nm>
-	regex_token_iterator(_Bi_iter __a, _Bi_iter __b,
-			     const regex_type& __re,
-			     const int (&__submatches)[_Nm],
-			     regex_constants::match_flag_type __m
-			     = regex_constants::match_default)
-      : _M_position(__a, __b, __re, __m),
-      _M_subs(__submatches, __submatches + _Nm), _M_n(0)
-      { _M_init(__a, __b); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2332. regex_token_iterator should forbid temporary regexes
-      regex_token_iterator(_Bi_iter, _Bi_iter, const regex_type&&, int = 0,
-			   regex_constants::match_flag_type =
-			   regex_constants::match_default) = delete;
-      regex_token_iterator(_Bi_iter, _Bi_iter, const regex_type&&,
-			   const std::vector<int>&,
-			   regex_constants::match_flag_type =
-			   regex_constants::match_default) = delete;
-      regex_token_iterator(_Bi_iter, _Bi_iter, const regex_type&&,
-			   initializer_list<int>,
-			   regex_constants::match_flag_type =
-			   regex_constants::match_default) = delete;
-      template <std::size_t N>
-	regex_token_iterator(_Bi_iter, _Bi_iter, const regex_type&&,
-			     const int (&)[N],
-			     regex_constants::match_flag_type =
-			     regex_constants::match_default) = delete;
-
-      /**
-       * @brief Copy constructs a %regex_token_iterator.
-       * @param __rhs [IN] A %regex_token_iterator to copy.
-       */
-      regex_token_iterator(const regex_token_iterator& __rhs)
-      : _M_position(__rhs._M_position), _M_subs(__rhs._M_subs),
-      _M_suffix(__rhs._M_suffix), _M_n(__rhs._M_n), _M_has_m1(__rhs._M_has_m1)
-      { _M_normalize_result(); }
-
-      /**
-       * @brief Assigns a %regex_token_iterator to another.
-       * @param __rhs [IN] A %regex_token_iterator to copy.
-       */
-      regex_token_iterator&
-      operator=(const regex_token_iterator& __rhs);
-
-      /**
-       * @brief Compares a %regex_token_iterator to another for equality.
-       */
-      bool
-      operator==(const regex_token_iterator& __rhs) const;
-
-      /**
-       * @brief Compares a %regex_token_iterator to another for inequality.
-       */
-      bool
-      operator!=(const regex_token_iterator& __rhs) const
-      { return !(*this == __rhs); }
-
-      /**
-       * @brief Dereferences a %regex_token_iterator.
-       */
-      const value_type&
-      operator*() const
-      { return *_M_result; }
-
-      /**
-       * @brief Selects a %regex_token_iterator member.
-       */
-      const value_type*
-      operator->() const
-      { return _M_result; }
-
-      /**
-       * @brief Increments a %regex_token_iterator.
-       */
-      regex_token_iterator&
-      operator++();
-
-      /**
-       * @brief Postincrements a %regex_token_iterator.
-       */
-      regex_token_iterator
-      operator++(int)
-      {
-	auto __tmp = *this;
-	++(*this);
-	return __tmp;
-      }
-
-    private:
-      typedef regex_iterator<_Bi_iter, _Ch_type, _Rx_traits> _Position;
-
-      void
-      _M_init(_Bi_iter __a, _Bi_iter __b);
-
-      const value_type&
-      _M_current_match() const
-      {
-	if (_M_subs[_M_n] == -1)
-	  return (*_M_position).prefix();
-	else
-	  return (*_M_position)[_M_subs[_M_n]];
-      }
-
-      constexpr bool
-      _M_end_of_seq() const
-      { return _M_result == nullptr; }
-
-      // [28.12.2.2.4]
-      void
-      _M_normalize_result()
-      {
-	if (_M_position != _Position())
-	  _M_result = &_M_current_match();
-	else if (_M_has_m1)
-	  _M_result = &_M_suffix;
-	else
-	  _M_result = nullptr;
-      }
-
-      _Position         _M_position;
-      std::vector<int>  _M_subs;
-      value_type        _M_suffix;
-      std::size_t       _M_n;
-      const value_type* _M_result;
-
-      // Show whether _M_subs contains -1
-      bool              _M_has_m1;
-    };
-
-  /** @brief Token iterator for C-style NULL-terminated strings. */
-  typedef regex_token_iterator<const char*>             cregex_token_iterator;
-
-  /** @brief Token iterator for standard strings. */
-  typedef regex_token_iterator<string::const_iterator>  sregex_token_iterator;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /** @brief Token iterator for C-style NULL-terminated wide strings. */
-  typedef regex_token_iterator<const wchar_t*>          wcregex_token_iterator;
-
-  /** @brief Token iterator for standard wide-character strings. */
-  typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
-#endif
-
-  //@} // group regex
-
-_GLIBCXX_END_NAMESPACE_CXX11
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#include <bits/regex.tcc>
diff --git a/openflow/usr/include/c++/5/bits/regex.tcc b/openflow/usr/include/c++/5/bits/regex.tcc
deleted file mode 100644
index 823ad51..0000000
--- a/openflow/usr/include/c++/5/bits/regex.tcc
+++ /dev/null
@@ -1,678 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-// A non-standard switch to let the user pick the matching algorithm.
-// If _GLIBCXX_REGEX_USE_THOMPSON_NFA is defined, the thompson NFA
-// algorithm will be used. This algorithm is not enabled by default,
-// and cannot be used if the regex contains back-references, but has better
-// (polynomial instead of exponential) worst case performance.
-// See __regex_algo_impl below.
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Result of merging regex_match and regex_search.
-  //
-  // __policy now can be _S_auto (auto dispatch) and _S_alternate (use
-  // the other one if possible, for test purpose).
-  //
-  // That __match_mode is true means regex_match, else regex_search.
-  template<typename _BiIter, typename _Alloc,
-	   typename _CharT, typename _TraitsT,
-	   _RegexExecutorPolicy __policy,
-	   bool __match_mode>
-    bool
-    __regex_algo_impl(_BiIter                              __s,
-		      _BiIter                              __e,
-		      match_results<_BiIter, _Alloc>&      __m,
-		      const basic_regex<_CharT, _TraitsT>& __re,
-		      regex_constants::match_flag_type     __flags)
-    {
-      if (__re._M_automaton == nullptr)
-	return false;
-
-      typename match_results<_BiIter, _Alloc>::_Base_type& __res = __m;
-      __m._M_begin = __s;
-      __m._M_resize(__re._M_automaton->_M_sub_count());
-      for (auto& __it : __res)
-	__it.matched = false;
-
-      // __policy is used by testsuites so that they can use Thompson NFA
-      // without defining a macro. Users should define
-      // _GLIBCXX_REGEX_USE_THOMPSON_NFA if they need to use this approach.
-      bool __ret;
-      if (!__re._M_automaton->_M_has_backref
-	  && !(__re._M_flags & regex_constants::ECMAScript)
-#ifndef _GLIBCXX_REGEX_USE_THOMPSON_NFA
-	  && __policy == _RegexExecutorPolicy::_S_alternate
-#endif
-	  )
-	{
-	  _Executor<_BiIter, _Alloc, _TraitsT, false>
-	    __executor(__s, __e, __m, __re, __flags);
-	  if (__match_mode)
-	    __ret = __executor._M_match();
-	  else
-	    __ret = __executor._M_search();
-	}
-      else
-	{
-	  _Executor<_BiIter, _Alloc, _TraitsT, true>
-	    __executor(__s, __e, __m, __re, __flags);
-	  if (__match_mode)
-	    __ret = __executor._M_match();
-	  else
-	    __ret = __executor._M_search();
-	}
-      if (__ret)
-	{
-	  for (auto& __it : __res)
-	    if (!__it.matched)
-	      __it.first = __it.second = __e;
-	  auto& __pre = __m._M_prefix();
-	  auto& __suf = __m._M_suffix();
-	  if (__match_mode)
-	    {
-	      __pre.matched = false;
-	      __pre.first = __s;
-	      __pre.second = __s;
-	      __suf.matched = false;
-	      __suf.first = __e;
-	      __suf.second = __e;
-	    }
-	  else
-	    {
-	      __pre.first = __s;
-	      __pre.second = __res[0].first;
-	      __pre.matched = (__pre.first != __pre.second);
-	      __suf.first = __res[0].second;
-	      __suf.second = __e;
-	      __suf.matched = (__suf.first != __suf.second);
-	    }
-	}
-      else
-	{
-	  __m._M_resize(0);
-	  for (auto& __it : __res)
-	    {
-	      __it.matched = false;
-	      __it.first = __it.second = __e;
-	    }
-	}
-      return __ret;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Ch_type>
-  template<typename _Fwd_iter>
-    typename regex_traits<_Ch_type>::string_type
-    regex_traits<_Ch_type>::
-    lookup_collatename(_Fwd_iter __first, _Fwd_iter __last) const
-    {
-      typedef std::ctype<char_type> __ctype_type;
-      const __ctype_type& __fctyp(use_facet<__ctype_type>(_M_locale));
-
-      static const char* __collatenames[] =
-	{
-	  "NUL",
-	  "SOH",
-	  "STX",
-	  "ETX",
-	  "EOT",
-	  "ENQ",
-	  "ACK",
-	  "alert",
-	  "backspace",
-	  "tab",
-	  "newline",
-	  "vertical-tab",
-	  "form-feed",
-	  "carriage-return",
-	  "SO",
-	  "SI",
-	  "DLE",
-	  "DC1",
-	  "DC2",
-	  "DC3",
-	  "DC4",
-	  "NAK",
-	  "SYN",
-	  "ETB",
-	  "CAN",
-	  "EM",
-	  "SUB",
-	  "ESC",
-	  "IS4",
-	  "IS3",
-	  "IS2",
-	  "IS1",
-	  "space",
-	  "exclamation-mark",
-	  "quotation-mark",
-	  "number-sign",
-	  "dollar-sign",
-	  "percent-sign",
-	  "ampersand",
-	  "apostrophe",
-	  "left-parenthesis",
-	  "right-parenthesis",
-	  "asterisk",
-	  "plus-sign",
-	  "comma",
-	  "hyphen",
-	  "period",
-	  "slash",
-	  "zero",
-	  "one",
-	  "two",
-	  "three",
-	  "four",
-	  "five",
-	  "six",
-	  "seven",
-	  "eight",
-	  "nine",
-	  "colon",
-	  "semicolon",
-	  "less-than-sign",
-	  "equals-sign",
-	  "greater-than-sign",
-	  "question-mark",
-	  "commercial-at",
-	  "A",
-	  "B",
-	  "C",
-	  "D",
-	  "E",
-	  "F",
-	  "G",
-	  "H",
-	  "I",
-	  "J",
-	  "K",
-	  "L",
-	  "M",
-	  "N",
-	  "O",
-	  "P",
-	  "Q",
-	  "R",
-	  "S",
-	  "T",
-	  "U",
-	  "V",
-	  "W",
-	  "X",
-	  "Y",
-	  "Z",
-	  "left-square-bracket",
-	  "backslash",
-	  "right-square-bracket",
-	  "circumflex",
-	  "underscore",
-	  "grave-accent",
-	  "a",
-	  "b",
-	  "c",
-	  "d",
-	  "e",
-	  "f",
-	  "g",
-	  "h",
-	  "i",
-	  "j",
-	  "k",
-	  "l",
-	  "m",
-	  "n",
-	  "o",
-	  "p",
-	  "q",
-	  "r",
-	  "s",
-	  "t",
-	  "u",
-	  "v",
-	  "w",
-	  "x",
-	  "y",
-	  "z",
-	  "left-curly-bracket",
-	  "vertical-line",
-	  "right-curly-bracket",
-	  "tilde",
-	  "DEL",
-	};
-
-      string __s;
-      for (; __first != __last; ++__first)
-	__s += __fctyp.narrow(*__first, 0);
-
-      for (const auto& __it : __collatenames)
-	if (__s == __it)
-	  return string_type(1, __fctyp.widen(
-	    static_cast<char>(&__it - __collatenames)));
-
-      // TODO Add digraph support:
-      // http://boost.sourceforge.net/libs/regex/doc/collating_names.html
-
-      return string_type();
-    }
-
-  template<typename _Ch_type>
-  template<typename _Fwd_iter>
-    typename regex_traits<_Ch_type>::char_class_type
-    regex_traits<_Ch_type>::
-    lookup_classname(_Fwd_iter __first, _Fwd_iter __last, bool __icase) const
-    {
-      typedef std::ctype<char_type> __ctype_type;
-      const __ctype_type& __fctyp(use_facet<__ctype_type>(_M_locale));
-
-      // Mappings from class name to class mask.
-      static const pair<const char*, char_class_type> __classnames[] =
-      {
-	{"d", ctype_base::digit},
-	{"w", {ctype_base::alnum, _RegexMask::_S_under}},
-	{"s", ctype_base::space},
-	{"alnum", ctype_base::alnum},
-	{"alpha", ctype_base::alpha},
-	{"blank", ctype_base::blank},
-	{"cntrl", ctype_base::cntrl},
-	{"digit", ctype_base::digit},
-	{"graph", ctype_base::graph},
-	{"lower", ctype_base::lower},
-	{"print", ctype_base::print},
-	{"punct", ctype_base::punct},
-	{"space", ctype_base::space},
-	{"upper", ctype_base::upper},
-	{"xdigit", ctype_base::xdigit},
-      };
-
-      string __s;
-      for (; __first != __last; ++__first)
-	__s += __fctyp.narrow(__fctyp.tolower(*__first), 0);
-
-      for (const auto& __it : __classnames)
-	if (__s == __it.first)
-	  {
-	    if (__icase
-		&& ((__it.second
-		     & (ctype_base::lower | ctype_base::upper)) != 0))
-	      return ctype_base::alpha;
-	    return __it.second;
-	  }
-      return 0;
-    }
-
-  template<typename _Ch_type>
-    bool
-    regex_traits<_Ch_type>::
-    isctype(_Ch_type __c, char_class_type __f) const
-    {
-      typedef std::ctype<char_type> __ctype_type;
-      const __ctype_type& __fctyp(use_facet<__ctype_type>(_M_locale));
-
-      return __fctyp.is(__f._M_base, __c)
-	// [[:w:]]
-	|| ((__f._M_extended & _RegexMask::_S_under)
-	    && __c == __fctyp.widen('_'));
-    }
-
-  template<typename _Ch_type>
-    int
-    regex_traits<_Ch_type>::
-    value(_Ch_type __ch, int __radix) const
-    {
-      std::basic_istringstream<char_type> __is(string_type(1, __ch));
-      long __v;
-      if (__radix == 8)
-	__is >> std::oct;
-      else if (__radix == 16)
-	__is >> std::hex;
-      __is >> __v;
-      return __is.fail() ? -1 : __v;
-    }
-
-  template<typename _Bi_iter, typename _Alloc>
-  template<typename _Out_iter>
-    _Out_iter match_results<_Bi_iter, _Alloc>::
-    format(_Out_iter __out,
-	   const match_results<_Bi_iter, _Alloc>::char_type* __fmt_first,
-	   const match_results<_Bi_iter, _Alloc>::char_type* __fmt_last,
-	   match_flag_type __flags) const
-    {
-      _GLIBCXX_DEBUG_ASSERT( ready() );
-      regex_traits<char_type> __traits;
-      typedef std::ctype<char_type> __ctype_type;
-      const __ctype_type&
-	__fctyp(use_facet<__ctype_type>(__traits.getloc()));
-
-      auto __output = [&](size_t __idx)
-	{
-	  auto& __sub = (*this)[__idx];
-	  if (__sub.matched)
-	    __out = std::copy(__sub.first, __sub.second, __out);
-	};
-
-      if (__flags & regex_constants::format_sed)
-	{
-	  for (; __fmt_first != __fmt_last;)
-	    if (*__fmt_first == '&')
-	      {
-		__output(0);
-		++__fmt_first;
-	      }
-	    else if (*__fmt_first == '\\')
-	      {
-		if (++__fmt_first != __fmt_last
-		    && __fctyp.is(__ctype_type::digit, *__fmt_first))
-		  __output(__traits.value(*__fmt_first++, 10));
-		else
-		  *__out++ = '\\';
-	      }
-	    else
-	      *__out++ = *__fmt_first++;
-	}
-      else
-	{
-	  while (1)
-	    {
-	      auto __next = std::find(__fmt_first, __fmt_last, '$');
-	      if (__next == __fmt_last)
-		break;
-
-	      __out = std::copy(__fmt_first, __next, __out);
-
-	      auto __eat = [&](char __ch) -> bool
-		{
-		  if (*__next == __ch)
-		    {
-		      ++__next;
-		      return true;
-		    }
-		  return false;
-		};
-
-	      if (++__next == __fmt_last)
-		*__out++ = '$';
-	      else if (__eat('$'))
-		*__out++ = '$';
-	      else if (__eat('&'))
-		__output(0);
-	      else if (__eat('`'))
-		{
-		  auto& __sub = _M_prefix();
-		  if (__sub.matched)
-		    __out = std::copy(__sub.first, __sub.second, __out);
-		}
-	      else if (__eat('\''))
-		{
-		  auto& __sub = _M_suffix();
-		  if (__sub.matched)
-		    __out = std::copy(__sub.first, __sub.second, __out);
-		}
-	      else if (__fctyp.is(__ctype_type::digit, *__next))
-		{
-		  long __num = __traits.value(*__next, 10);
-		  if (++__next != __fmt_last
-		      && __fctyp.is(__ctype_type::digit, *__next))
-		    {
-		      __num *= 10;
-		      __num += __traits.value(*__next++, 10);
-		    }
-		  if (0 <= __num && __num < this->size())
-		    __output(__num);
-		}
-	      else
-		*__out++ = '$';
-	      __fmt_first = __next;
-	    }
-	  __out = std::copy(__fmt_first, __fmt_last, __out);
-	}
-      return __out;
-    }
-
-  template<typename _Out_iter, typename _Bi_iter,
-	   typename _Rx_traits, typename _Ch_type>
-    _Out_iter
-    regex_replace(_Out_iter __out, _Bi_iter __first, _Bi_iter __last,
-		  const basic_regex<_Ch_type, _Rx_traits>& __e,
-		  const _Ch_type* __fmt,
-		  regex_constants::match_flag_type __flags)
-    {
-      typedef regex_iterator<_Bi_iter, _Ch_type, _Rx_traits> _IterT;
-      _IterT __i(__first, __last, __e, __flags);
-      _IterT __end;
-      if (__i == __end)
-	{
-	  if (!(__flags & regex_constants::format_no_copy))
-	    __out = std::copy(__first, __last, __out);
-	}
-      else
-	{
-	  sub_match<_Bi_iter> __last;
-	  auto __len = char_traits<_Ch_type>::length(__fmt);
-	  for (; __i != __end; ++__i)
-	    {
-	      if (!(__flags & regex_constants::format_no_copy))
-		__out = std::copy(__i->prefix().first, __i->prefix().second,
-				  __out);
-	      __out = __i->format(__out, __fmt, __fmt + __len, __flags);
-	      __last = __i->suffix();
-	      if (__flags & regex_constants::format_first_only)
-		break;
-	    }
-	  if (!(__flags & regex_constants::format_no_copy))
-	    __out = std::copy(__last.first, __last.second, __out);
-	}
-      return __out;
-    }
-
-  template<typename _Bi_iter,
-	   typename _Ch_type,
-	   typename _Rx_traits>
-    bool
-    regex_iterator<_Bi_iter, _Ch_type, _Rx_traits>::
-    operator==(const regex_iterator& __rhs) const
-    {
-      return (_M_match.empty() && __rhs._M_match.empty())
-	|| (_M_begin == __rhs._M_begin
-	    && _M_end == __rhs._M_end
-	    && _M_pregex == __rhs._M_pregex
-	    && _M_flags == __rhs._M_flags
-	    && _M_match[0] == __rhs._M_match[0]);
-    }
-
-  template<typename _Bi_iter,
-	   typename _Ch_type,
-	   typename _Rx_traits>
-    regex_iterator<_Bi_iter, _Ch_type, _Rx_traits>&
-    regex_iterator<_Bi_iter, _Ch_type, _Rx_traits>::
-    operator++()
-    {
-      // In all cases in which the call to regex_search returns true,
-      // match.prefix().first shall be equal to the previous value of
-      // match[0].second, and for each index i in the half-open range
-      // [0, match.size()) for which match[i].matched is true,
-      // match[i].position() shall return distance(begin, match[i].first).
-      // [28.12.1.4.5]
-      if (_M_match[0].matched)
-	{
-	  auto __start = _M_match[0].second;
-	  auto __prefix_first = _M_match[0].second;
-	  if (_M_match[0].first == _M_match[0].second)
-	    {
-	      if (__start == _M_end)
-		{
-		  _M_match = value_type();
-		  return *this;
-		}
-	      else
-		{
-		  if (regex_search(__start, _M_end, _M_match, *_M_pregex,
-				   _M_flags
-				   | regex_constants::match_not_null
-				   | regex_constants::match_continuous))
-		    {
-		      _GLIBCXX_DEBUG_ASSERT(_M_match[0].matched);
-		      auto& __prefix = _M_match._M_prefix();
-		      __prefix.first = __prefix_first;
-		      __prefix.matched = __prefix.first != __prefix.second;
-		      // [28.12.1.4.5]
-		      _M_match._M_begin = _M_begin;
-		      return *this;
-		    }
-		  else
-		    ++__start;
-		}
-	    }
-	  _M_flags |= regex_constants::match_prev_avail;
-	  if (regex_search(__start, _M_end, _M_match, *_M_pregex, _M_flags))
-	    {
-	      _GLIBCXX_DEBUG_ASSERT(_M_match[0].matched);
-	      auto& __prefix = _M_match._M_prefix();
-	      __prefix.first = __prefix_first;
-	      __prefix.matched = __prefix.first != __prefix.second;
-	      // [28.12.1.4.5]
-	      _M_match._M_begin = _M_begin;
-	    }
-	  else
-	    _M_match = value_type();
-	}
-      return *this;
-    }
-
-  template<typename _Bi_iter,
-	   typename _Ch_type,
-	   typename _Rx_traits>
-    regex_token_iterator<_Bi_iter, _Ch_type, _Rx_traits>&
-    regex_token_iterator<_Bi_iter, _Ch_type, _Rx_traits>::
-    operator=(const regex_token_iterator& __rhs)
-    {
-      _M_position = __rhs._M_position;
-      _M_subs = __rhs._M_subs;
-      _M_n = __rhs._M_n;
-      _M_suffix = __rhs._M_suffix;
-      _M_has_m1 = __rhs._M_has_m1;
-      _M_normalize_result();
-      return *this;
-    }
-
-  template<typename _Bi_iter,
-	   typename _Ch_type,
-	   typename _Rx_traits>
-    bool
-    regex_token_iterator<_Bi_iter, _Ch_type, _Rx_traits>::
-    operator==(const regex_token_iterator& __rhs) const
-    {
-      if (_M_end_of_seq() && __rhs._M_end_of_seq())
-	return true;
-      if (_M_suffix.matched && __rhs._M_suffix.matched
-	  && _M_suffix == __rhs._M_suffix)
-	return true;
-      if (_M_end_of_seq() || _M_suffix.matched
-	  || __rhs._M_end_of_seq() || __rhs._M_suffix.matched)
-	return false;
-      return _M_position == __rhs._M_position
-	&& _M_n == __rhs._M_n
-	&& _M_subs == __rhs._M_subs;
-    }
-
-  template<typename _Bi_iter,
-	   typename _Ch_type,
-	   typename _Rx_traits>
-    regex_token_iterator<_Bi_iter, _Ch_type, _Rx_traits>&
-    regex_token_iterator<_Bi_iter, _Ch_type, _Rx_traits>::
-    operator++()
-    {
-      _Position __prev = _M_position;
-      if (_M_suffix.matched)
-	*this = regex_token_iterator();
-      else if (_M_n + 1 < _M_subs.size())
-	{
-	  _M_n++;
-	  _M_result = &_M_current_match();
-	}
-      else
-	{
-	  _M_n = 0;
-	  ++_M_position;
-	  if (_M_position != _Position())
-	    _M_result = &_M_current_match();
-	  else if (_M_has_m1 && __prev->suffix().length() != 0)
-	    {
-	      _M_suffix.matched = true;
-	      _M_suffix.first = __prev->suffix().first;
-	      _M_suffix.second = __prev->suffix().second;
-	      _M_result = &_M_suffix;
-	    }
-	  else
-	    *this = regex_token_iterator();
-	}
-      return *this;
-    }
-
-  template<typename _Bi_iter,
-	   typename _Ch_type,
-	   typename _Rx_traits>
-    void
-    regex_token_iterator<_Bi_iter, _Ch_type, _Rx_traits>::
-    _M_init(_Bi_iter __a, _Bi_iter __b)
-    {
-      _M_has_m1 = false;
-      for (auto __it : _M_subs)
-	if (__it == -1)
-	  {
-	    _M_has_m1 = true;
-	    break;
-	  }
-      if (_M_position != _Position())
-	_M_result = &_M_current_match();
-      else if (_M_has_m1)
-	{
-	  _M_suffix.matched = true;
-	  _M_suffix.first = __a;
-	  _M_suffix.second = __b;
-	  _M_result = &_M_suffix;
-	}
-      else
-	_M_result = nullptr;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
diff --git a/openflow/usr/include/c++/5/bits/regex_automaton.h b/openflow/usr/include/c++/5/bits/regex_automaton.h
deleted file mode 100644
index fc0eb41..0000000
--- a/openflow/usr/include/c++/5/bits/regex_automaton.h
+++ /dev/null
@@ -1,330 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex_automaton.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-// This macro defines the maximal state number a NFA can have.
-#ifndef _GLIBCXX_REGEX_STATE_LIMIT
-#define _GLIBCXX_REGEX_STATE_LIMIT 100000
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @defgroup regex-detail Base and Implementation Classes
-   *  @ingroup regex
-   *  @{
-   */
-
-  typedef long _StateIdT;
-  static const _StateIdT _S_invalid_state_id  = -1;
-
-  template<typename _CharT>
-    using _Matcher = std::function<bool (_CharT)>;
-
-  /// Operation codes that define the type of transitions within the base NFA
-  /// that represents the regular expression.
-  enum _Opcode : int
-  {
-      _S_opcode_unknown,
-      _S_opcode_alternative,
-      _S_opcode_repeat,
-      _S_opcode_backref,
-      _S_opcode_line_begin_assertion,
-      _S_opcode_line_end_assertion,
-      _S_opcode_word_boundary,
-      _S_opcode_subexpr_lookahead,
-      _S_opcode_subexpr_begin,
-      _S_opcode_subexpr_end,
-      _S_opcode_dummy,
-      _S_opcode_match,
-      _S_opcode_accept,
-  };
-
-  struct _State_base
-  {
-    _Opcode      _M_opcode;           // type of outgoing transition
-    _StateIdT    _M_next;             // outgoing transition
-    union // Since they are mutually exclusive.
-    {
-      size_t _M_subexpr;        // for _S_opcode_subexpr_*
-      size_t _M_backref_index;  // for _S_opcode_backref
-      struct
-      {
-	// for _S_opcode_alternative, _S_opcode_repeat and
-	// _S_opcode_subexpr_lookahead
-	_StateIdT  _M_alt;
-	// for _S_opcode_word_boundary or _S_opcode_subexpr_lookahead or
-	// quantifiers (ungreedy if set true)
-	bool       _M_neg;
-      };
-    };
-
-    explicit _State_base(_Opcode __opcode)
-    : _M_opcode(__opcode), _M_next(_S_invalid_state_id)
-    { }
-
-  protected:
-    ~_State_base() = default;
-
-  public:
-#ifdef _GLIBCXX_DEBUG
-    std::ostream&
-    _M_print(std::ostream& ostr) const;
-
-    // Prints graphviz dot commands for state.
-    std::ostream&
-    _M_dot(std::ostream& __ostr, _StateIdT __id) const;
-#endif
-  };
-
-  template<typename _TraitsT>
-    struct _State : _State_base
-    {
-      typedef _Matcher<typename _TraitsT::char_type> _MatcherT;
-
-      _MatcherT      _M_matches;        // for _S_opcode_match
-
-      explicit _State(_Opcode __opcode) : _State_base(__opcode) { }
-    };
-
-  struct _NFA_base
-  {
-    typedef size_t                              _SizeT;
-    typedef regex_constants::syntax_option_type _FlagT;
-
-    explicit
-    _NFA_base(_FlagT __f)
-    : _M_flags(__f), _M_start_state(0), _M_subexpr_count(0),
-    _M_has_backref(false)
-    { }
-
-    _NFA_base(_NFA_base&&) = default;
-
-  protected:
-    ~_NFA_base() = default;
-
-  public:
-    _FlagT
-    _M_options() const
-    { return _M_flags; }
-
-    _StateIdT
-    _M_start() const
-    { return _M_start_state; }
-
-    _SizeT
-    _M_sub_count() const
-    { return _M_subexpr_count; }
-
-    std::vector<size_t>       _M_paren_stack;
-    _FlagT                    _M_flags;
-    _StateIdT                 _M_start_state;
-    _SizeT                    _M_subexpr_count;
-    bool                      _M_has_backref;
-  };
-
-  template<typename _TraitsT>
-    struct _NFA
-    : _NFA_base, std::vector<_State<_TraitsT>>
-    {
-      typedef _State<_TraitsT>				_StateT;
-      typedef _Matcher<typename _TraitsT::char_type>	_MatcherT;
-
-      _NFA(const typename _TraitsT::locale_type& __loc, _FlagT __flags)
-      : _NFA_base(__flags)
-      { _M_traits.imbue(__loc); }
-
-      // for performance reasons _NFA objects should only be moved not copied
-      _NFA(const _NFA&) = delete;
-      _NFA(_NFA&&) = default;
-
-      _StateIdT
-      _M_insert_accept()
-      {
-	auto __ret = _M_insert_state(_StateT(_S_opcode_accept));
-	return __ret;
-      }
-
-      _StateIdT
-      _M_insert_alt(_StateIdT __next, _StateIdT __alt, bool __neg)
-      {
-	_StateT __tmp(_S_opcode_alternative);
-	// It labels every quantifier to make greedy comparison easier in BFS
-	// approach.
-	__tmp._M_next = __next;
-	__tmp._M_alt = __alt;
-	return _M_insert_state(std::move(__tmp));
-      }
-
-      _StateIdT
-      _M_insert_repeat(_StateIdT __next, _StateIdT __alt, bool __neg)
-      {
-	_StateT __tmp(_S_opcode_repeat);
-	// It labels every quantifier to make greedy comparison easier in BFS
-	// approach.
-	__tmp._M_next = __next;
-	__tmp._M_alt = __alt;
-	__tmp._M_neg = __neg;
-	return _M_insert_state(std::move(__tmp));
-      }
-
-      _StateIdT
-      _M_insert_matcher(_MatcherT __m)
-      {
-	_StateT __tmp(_S_opcode_match);
-	__tmp._M_matches = std::move(__m);
-	return _M_insert_state(std::move(__tmp));
-      }
-
-      _StateIdT
-      _M_insert_subexpr_begin()
-      {
-	auto __id = this->_M_subexpr_count++;
-	this->_M_paren_stack.push_back(__id);
-	_StateT __tmp(_S_opcode_subexpr_begin);
-	__tmp._M_subexpr = __id;
-	return _M_insert_state(std::move(__tmp));
-      }
-
-      _StateIdT
-      _M_insert_subexpr_end()
-      {
-	_StateT __tmp(_S_opcode_subexpr_end);
-	__tmp._M_subexpr = this->_M_paren_stack.back();
-	this->_M_paren_stack.pop_back();
-	return _M_insert_state(std::move(__tmp));
-      }
-
-      _StateIdT
-      _M_insert_backref(size_t __index);
-
-      _StateIdT
-      _M_insert_line_begin()
-      { return _M_insert_state(_StateT(_S_opcode_line_begin_assertion)); }
-
-      _StateIdT
-      _M_insert_line_end()
-      { return _M_insert_state(_StateT(_S_opcode_line_end_assertion)); }
-
-      _StateIdT
-      _M_insert_word_bound(bool __neg)
-      {
-	_StateT __tmp(_S_opcode_word_boundary);
-	__tmp._M_neg = __neg;
-	return _M_insert_state(std::move(__tmp));
-      }
-
-      _StateIdT
-      _M_insert_lookahead(_StateIdT __alt, bool __neg)
-      {
-	_StateT __tmp(_S_opcode_subexpr_lookahead);
-	__tmp._M_alt = __alt;
-	__tmp._M_neg = __neg;
-	return _M_insert_state(std::move(__tmp));
-      }
-
-      _StateIdT
-      _M_insert_dummy()
-      { return _M_insert_state(_StateT(_S_opcode_dummy)); }
-
-      _StateIdT
-      _M_insert_state(_StateT __s)
-      {
-	this->push_back(std::move(__s));
-	if (this->size() > _GLIBCXX_REGEX_STATE_LIMIT)
-	  __throw_regex_error(regex_constants::error_space);
-	return this->size()-1;
-      }
-
-      // Eliminate dummy node in this NFA to make it compact.
-      void
-      _M_eliminate_dummy();
-
-#ifdef _GLIBCXX_DEBUG
-      std::ostream&
-      _M_dot(std::ostream& __ostr) const;
-#endif
-    public:
-      _TraitsT                  _M_traits;
-    };
-
-  /// Describes a sequence of one or more %_State, its current start
-  /// and end(s).  This structure contains fragments of an NFA during
-  /// construction.
-  template<typename _TraitsT>
-    class _StateSeq
-    {
-    public:
-      typedef _NFA<_TraitsT> _RegexT;
-
-    public:
-      _StateSeq(_RegexT& __nfa, _StateIdT __s)
-      : _M_nfa(__nfa), _M_start(__s), _M_end(__s)
-      { }
-
-      _StateSeq(_RegexT& __nfa, _StateIdT __s, _StateIdT __end)
-      : _M_nfa(__nfa), _M_start(__s), _M_end(__end)
-      { }
-
-      // Append a state on *this and change *this to the new sequence.
-      void
-      _M_append(_StateIdT __id)
-      {
-	_M_nfa[_M_end]._M_next = __id;
-	_M_end = __id;
-      }
-
-      // Append a sequence on *this and change *this to the new sequence.
-      void
-      _M_append(const _StateSeq& __s)
-      {
-	_M_nfa[_M_end]._M_next = __s._M_start;
-	_M_end = __s._M_end;
-      }
-
-      // Clones an entire sequence.
-      _StateSeq
-      _M_clone();
-
-    public:
-      _RegexT&  _M_nfa;
-      _StateIdT _M_start;
-      _StateIdT _M_end;
-    };
-
- //@} regex-detail
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __detail
-} // namespace std
-
-#include <bits/regex_automaton.tcc>
diff --git a/openflow/usr/include/c++/5/bits/regex_automaton.tcc b/openflow/usr/include/c++/5/bits/regex_automaton.tcc
deleted file mode 100644
index fbc3389..0000000
--- a/openflow/usr/include/c++/5/bits/regex_automaton.tcc
+++ /dev/null
@@ -1,238 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex_automaton.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#ifdef _GLIBCXX_DEBUG
-  inline std::ostream&
-  _State_base::_M_print(std::ostream& ostr) const
-  {
-    switch (_M_opcode)
-    {
-      case _S_opcode_alternative:
-      case _S_opcode_repeat:
-	ostr << "alt next=" << _M_next << " alt=" << _M_alt;
-	break;
-      case _S_opcode_subexpr_begin:
-	ostr << "subexpr begin next=" << _M_next << " index=" << _M_subexpr;
-	break;
-      case _S_opcode_subexpr_end:
-	ostr << "subexpr end next=" << _M_next << " index=" << _M_subexpr;
-	break;
-      case _S_opcode_backref:
-	ostr << "backref next=" << _M_next << " index=" << _M_backref_index;
-	break;
-      case _S_opcode_match:
-	ostr << "match next=" << _M_next;
-	break;
-      case _S_opcode_accept:
-	ostr << "accept next=" << _M_next;
-	break;
-      default:
-	ostr << "unknown next=" << _M_next;
-	break;
-    }
-    return ostr;
-  }
-
-  // Prints graphviz dot commands for state.
-  inline std::ostream&
-  _State_base::_M_dot(std::ostream& __ostr, _StateIdT __id) const
-  {
-    switch (_M_opcode)
-    {
-      case _S_opcode_alternative:
-      case _S_opcode_repeat:
-	__ostr << __id << " [label=\"" << __id << "\\nALT\"];\n"
-	       << __id << " -> " << _M_next
-	       << " [label=\"next\", tailport=\"s\"];\n"
-	       << __id << " -> " << _M_alt
-	       << " [label=\"alt\", tailport=\"n\"];\n";
-	break;
-      case _S_opcode_backref:
-	__ostr << __id << " [label=\"" << __id << "\\nBACKREF "
-	       << _M_subexpr << "\"];\n"
-	       << __id << " -> " << _M_next << " [label=\"<match>\"];\n";
-	break;
-      case _S_opcode_line_begin_assertion:
-	__ostr << __id << " [label=\"" << __id << "\\nLINE_BEGIN \"];\n"
-	       << __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
-	break;
-      case _S_opcode_line_end_assertion:
-	__ostr << __id << " [label=\"" << __id << "\\nLINE_END \"];\n"
-	       << __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
-	break;
-      case _S_opcode_word_boundary:
-	__ostr << __id << " [label=\"" << __id << "\\nWORD_BOUNDRY "
-	       << _M_neg << "\"];\n"
-	       << __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
-	break;
-      case _S_opcode_subexpr_lookahead:
-	__ostr << __id << " [label=\"" << __id << "\\nLOOK_AHEAD\"];\n"
-	       << __id << " -> " << _M_next
-	       << " [label=\"epsilon\", tailport=\"s\"];\n"
-	       << __id << " -> " << _M_alt
-	       << " [label=\"<assert>\", tailport=\"n\"];\n";
-	break;
-      case _S_opcode_subexpr_begin:
-	__ostr << __id << " [label=\"" << __id << "\\nSBEGIN "
-	       << _M_subexpr << "\"];\n"
-	       << __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
-	break;
-      case _S_opcode_subexpr_end:
-	__ostr << __id << " [label=\"" << __id << "\\nSEND "
-	       << _M_subexpr << "\"];\n"
-	       << __id << " -> " << _M_next << " [label=\"epsilon\"];\n";
-	break;
-      case _S_opcode_dummy:
-	break;
-      case _S_opcode_match:
-	__ostr << __id << " [label=\"" << __id << "\\nMATCH\"];\n"
-	       << __id << " -> " << _M_next << " [label=\"<match>\"];\n";
-	break;
-      case _S_opcode_accept:
-	__ostr << __id << " [label=\"" << __id << "\\nACC\"];\n" ;
-	break;
-      default:
-	_GLIBCXX_DEBUG_ASSERT(false);
-	break;
-    }
-    return __ostr;
-  }
-
-  template<typename _TraitsT>
-    std::ostream&
-    _NFA<_TraitsT>::_M_dot(std::ostream& __ostr) const
-    {
-      __ostr << "digraph _Nfa {\n"
-		"  rankdir=LR;\n";
-      for (size_t __i = 0; __i < this->size(); ++__i)
-	(*this)[__i]._M_dot(__ostr, __i);
-      __ostr << "}\n";
-      return __ostr;
-    }
-#endif
-
-  template<typename _TraitsT>
-    _StateIdT
-    _NFA<_TraitsT>::_M_insert_backref(size_t __index)
-    {
-      // To figure out whether a backref is valid, a stack is used to store
-      // unfinished sub-expressions. For example, when parsing
-      // "(a(b)(c\\1(d)))" at '\\1', _M_subexpr_count is 3, indicating that 3
-      // sub expressions are parsed or partially parsed(in the stack), aka,
-      // "(a..", "(b)" and "(c..").
-      // _M_paren_stack is {1, 3}, for incomplete "(a.." and "(c..". At this
-      // time, "\\2" is valid, but "\\1" and "\\3" are not.
-      if (__index >= _M_subexpr_count)
-	__throw_regex_error(regex_constants::error_backref);
-      for (auto __it : this->_M_paren_stack)
-	if (__index == __it)
-	  __throw_regex_error(regex_constants::error_backref);
-      this->_M_has_backref = true;
-      _StateT __tmp(_S_opcode_backref);
-      __tmp._M_backref_index = __index;
-      return _M_insert_state(std::move(__tmp));
-    }
-
-  template<typename _TraitsT>
-    void
-    _NFA<_TraitsT>::_M_eliminate_dummy()
-    {
-      for (auto& __it : *this)
-	{
-	  while (__it._M_next >= 0 && (*this)[__it._M_next]._M_opcode
-		 == _S_opcode_dummy)
-	    __it._M_next = (*this)[__it._M_next]._M_next;
-	  if (__it._M_opcode == _S_opcode_alternative
-	      || __it._M_opcode == _S_opcode_repeat
-	      || __it._M_opcode == _S_opcode_subexpr_lookahead)
-	    while (__it._M_alt >= 0 && (*this)[__it._M_alt]._M_opcode
-		   == _S_opcode_dummy)
-	      __it._M_alt = (*this)[__it._M_alt]._M_next;
-	}
-    }
-
-  // Just apply DFS on the sequence and re-link their links.
-  template<typename _TraitsT>
-    _StateSeq<_TraitsT>
-    _StateSeq<_TraitsT>::_M_clone()
-    {
-      std::map<_StateIdT, _StateIdT> __m;
-      std::stack<_StateIdT> __stack;
-      __stack.push(_M_start);
-      while (!__stack.empty())
-	{
-	  auto __u = __stack.top();
-	  __stack.pop();
-	  auto __dup = _M_nfa[__u];
-	  // _M_insert_state() never return -1
-	  auto __id = _M_nfa._M_insert_state(__dup);
-	  __m[__u] = __id;
-	  if (__dup._M_opcode == _S_opcode_alternative
-	      || __dup._M_opcode == _S_opcode_repeat
-	      || __dup._M_opcode == _S_opcode_subexpr_lookahead)
-	    if (__dup._M_alt != _S_invalid_state_id
-		&& __m.count(__dup._M_alt) == 0)
-	      __stack.push(__dup._M_alt);
-	  if (__u == _M_end)
-	    continue;
-	  if (__dup._M_next != _S_invalid_state_id
-	      && __m.count(__dup._M_next) == 0)
-	    __stack.push(__dup._M_next);
-	}
-      for (auto __it : __m)
-	{
-	  auto __v = __it.second;
-	  auto& __ref = _M_nfa[__v];
-	  if (__ref._M_next != _S_invalid_state_id)
-	    {
-	      _GLIBCXX_DEBUG_ASSERT(__m.count(__ref._M_next) > 0);
-	      __ref._M_next = __m[__ref._M_next];
-	    }
-	  if (__ref._M_opcode == _S_opcode_alternative
-	      || __ref._M_opcode == _S_opcode_repeat
-	      || __ref._M_opcode == _S_opcode_subexpr_lookahead)
-	    if (__ref._M_alt != _S_invalid_state_id)
-	      {
-		_GLIBCXX_DEBUG_ASSERT(__m.count(__ref._M_alt) > 0);
-		__ref._M_alt = __m[__ref._M_alt];
-	      }
-	}
-      return _StateSeq(_M_nfa, __m[_M_start], __m[_M_end]);
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __detail
-} // namespace
diff --git a/openflow/usr/include/c++/5/bits/regex_compiler.h b/openflow/usr/include/c++/5/bits/regex_compiler.h
deleted file mode 100644
index 0cb0c04..0000000
--- a/openflow/usr/include/c++/5/bits/regex_compiler.h
+++ /dev/null
@@ -1,519 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex_compiler.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup regex-detail
-   * @{
-   */
-
-  template<typename, bool, bool>
-    struct _BracketMatcher;
-
-  /**
-   * @brief Builds an NFA from an input iterator range.
-   *
-   * The %_TraitsT type should fulfill requirements [28.3].
-   */
-  template<typename _TraitsT>
-    class _Compiler
-    {
-    public:
-      typedef typename _TraitsT::char_type        _CharT;
-      typedef const _CharT*                       _IterT;
-      typedef _NFA<_TraitsT>              	  _RegexT;
-      typedef regex_constants::syntax_option_type _FlagT;
-
-      _Compiler(_IterT __b, _IterT __e,
-		const typename _TraitsT::locale_type& __traits, _FlagT __flags);
-
-      shared_ptr<const _RegexT>
-      _M_get_nfa()
-      { return std::move(_M_nfa); }
-
-    private:
-      typedef _Scanner<_CharT>               _ScannerT;
-      typedef typename _TraitsT::string_type _StringT;
-      typedef typename _ScannerT::_TokenT    _TokenT;
-      typedef _StateSeq<_TraitsT>            _StateSeqT;
-      typedef std::stack<_StateSeqT>         _StackT;
-      typedef std::ctype<_CharT>             _CtypeT;
-
-      // accepts a specific token or returns false.
-      bool
-      _M_match_token(_TokenT __token);
-
-      void
-      _M_disjunction();
-
-      void
-      _M_alternative();
-
-      bool
-      _M_term();
-
-      bool
-      _M_assertion();
-
-      bool
-      _M_quantifier();
-
-      bool
-      _M_atom();
-
-      bool
-      _M_bracket_expression();
-
-      template<bool __icase, bool __collate>
-	void
-	_M_insert_any_matcher_ecma();
-
-      template<bool __icase, bool __collate>
-	void
-	_M_insert_any_matcher_posix();
-
-      template<bool __icase, bool __collate>
-	void
-	_M_insert_char_matcher();
-
-      template<bool __icase, bool __collate>
-	void
-	_M_insert_character_class_matcher();
-
-      template<bool __icase, bool __collate>
-	void
-	_M_insert_bracket_matcher(bool __neg);
-
-      // Returns true if successfully matched one term and should continue.
-      // Returns false if the compiler should move on.
-      template<bool __icase, bool __collate>
-	bool
-	_M_expression_term(pair<bool, _CharT>& __last_char,
-			   _BracketMatcher<_TraitsT, __icase, __collate>&
-			   __matcher);
-
-      int
-      _M_cur_int_value(int __radix);
-
-      bool
-      _M_try_char();
-
-      _StateSeqT
-      _M_pop()
-      {
-	auto ret = _M_stack.top();
-	_M_stack.pop();
-	return ret;
-      }
-
-      _FlagT              _M_flags;
-      _ScannerT           _M_scanner;
-      shared_ptr<_RegexT> _M_nfa;
-      _StringT            _M_value;
-      _StackT             _M_stack;
-      const _TraitsT&     _M_traits;
-      const _CtypeT&      _M_ctype;
-    };
-
-  template<typename _Tp>
-    struct __has_contiguous_iter : std::false_type { };
-
-  template<typename _Ch, typename _Tr, typename _Alloc>
-    struct __has_contiguous_iter<std::basic_string<_Ch, _Tr, _Alloc>>
-    : std::true_type
-    { };
-
-  template<typename _Tp, typename _Alloc>
-    struct __has_contiguous_iter<std::vector<_Tp, _Alloc>>
-    : std::true_type
-    { };
-
-  template<typename _Tp>
-    struct __is_contiguous_normal_iter : std::false_type { };
-
-  template<typename _CharT>
-    struct __is_contiguous_normal_iter<_CharT*> : std::true_type { };
-
-  template<typename _Tp, typename _Cont>
-    struct
-    __is_contiguous_normal_iter<__gnu_cxx::__normal_iterator<_Tp, _Cont>>
-    : __has_contiguous_iter<_Cont>::type
-    { };
-
-  template<typename _Iter, typename _TraitsT>
-    using __enable_if_contiguous_normal_iter
-      = typename enable_if< __is_contiguous_normal_iter<_Iter>::value,
-                           std::shared_ptr<const _NFA<_TraitsT>> >::type;
-
-  template<typename _Iter, typename _TraitsT>
-    using __disable_if_contiguous_normal_iter
-      = typename enable_if< !__is_contiguous_normal_iter<_Iter>::value,
-                           std::shared_ptr<const _NFA<_TraitsT>> >::type;
-
-  template<typename _FwdIter, typename _TraitsT>
-    inline __enable_if_contiguous_normal_iter<_FwdIter, _TraitsT>
-    __compile_nfa(_FwdIter __first, _FwdIter __last,
-		  const typename _TraitsT::locale_type& __loc,
-		  regex_constants::syntax_option_type __flags)
-    {
-      size_t __len = __last - __first;
-      const auto* __cfirst = __len ? std::__addressof(*__first) : nullptr;
-      using _Cmplr = _Compiler<_TraitsT>;
-      return _Cmplr(__cfirst, __cfirst + __len, __loc, __flags)._M_get_nfa();
-    }
-
-  template<typename _FwdIter, typename _TraitsT>
-    inline __disable_if_contiguous_normal_iter<_FwdIter, _TraitsT>
-    __compile_nfa(_FwdIter __first, _FwdIter __last,
-		  const typename _TraitsT::locale_type& __loc,
-		  regex_constants::syntax_option_type __flags)
-    {
-      basic_string<typename _TraitsT::char_type> __str(__first, __last);
-      return __compile_nfa(__str.data(), __str.data() + __str.size(), __loc,
-          __flags);
-    }
-
-  // [28.13.14]
-  template<typename _TraitsT, bool __icase, bool __collate>
-    class _RegexTranslator
-    {
-    public:
-      typedef typename _TraitsT::char_type	      _CharT;
-      typedef typename _TraitsT::string_type	      _StringT;
-      typedef typename std::conditional<__collate,
-					_StringT,
-					_CharT>::type _StrTransT;
-
-      explicit
-      _RegexTranslator(const _TraitsT& __traits)
-      : _M_traits(__traits)
-      { }
-
-      _CharT
-      _M_translate(_CharT __ch) const
-      {
-	if (__icase)
-	  return _M_traits.translate_nocase(__ch);
-	else if (__collate)
-	  return _M_traits.translate(__ch);
-	else
-	  return __ch;
-      }
-
-      _StrTransT
-      _M_transform(_CharT __ch) const
-      {
-	return _M_transform_impl(__ch, typename integral_constant<bool,
-				 __collate>::type());
-      }
-
-    private:
-      _StrTransT
-      _M_transform_impl(_CharT __ch, false_type) const
-      { return __ch; }
-
-      _StrTransT
-      _M_transform_impl(_CharT __ch, true_type) const
-      {
-	_StrTransT __str = _StrTransT(1, _M_translate(__ch));
-	return _M_traits.transform(__str.begin(), __str.end());
-      }
-
-      const _TraitsT& _M_traits;
-    };
-
-  template<typename _TraitsT>
-    class _RegexTranslator<_TraitsT, false, false>
-    {
-    public:
-      typedef typename _TraitsT::char_type _CharT;
-      typedef _CharT                       _StrTransT;
-
-      explicit
-      _RegexTranslator(const _TraitsT&)
-      { }
-
-      _CharT
-      _M_translate(_CharT __ch) const
-      { return __ch; }
-
-      _StrTransT
-      _M_transform(_CharT __ch) const
-      { return __ch; }
-    };
-
-  template<typename _TraitsT, bool __is_ecma, bool __icase, bool __collate>
-    struct _AnyMatcher;
-
-  template<typename _TraitsT, bool __icase, bool __collate>
-    struct _AnyMatcher<_TraitsT, false, __icase, __collate>
-    {
-      typedef _RegexTranslator<_TraitsT, __icase, __collate> _TransT;
-      typedef typename _TransT::_CharT                       _CharT;
-
-      explicit
-      _AnyMatcher(const _TraitsT& __traits)
-      : _M_translator(__traits)
-      { }
-
-      bool
-      operator()(_CharT __ch) const
-      {
-	static auto __nul = _M_translator._M_translate('\0');
-	return _M_translator._M_translate(__ch) != __nul;
-      }
-
-      _TransT _M_translator;
-    };
-
-  template<typename _TraitsT, bool __icase, bool __collate>
-    struct _AnyMatcher<_TraitsT, true, __icase, __collate>
-    {
-      typedef _RegexTranslator<_TraitsT, __icase, __collate> _TransT;
-      typedef typename _TransT::_CharT                       _CharT;
-
-      explicit
-      _AnyMatcher(const _TraitsT& __traits)
-      : _M_translator(__traits)
-      { }
-
-      bool
-      operator()(_CharT __ch) const
-      { return _M_apply(__ch, typename is_same<_CharT, char>::type()); }
-
-      bool
-      _M_apply(_CharT __ch, true_type) const
-      {
-	auto __c = _M_translator._M_translate(__ch);
-	auto __n = _M_translator._M_translate('\n');
-	auto __r = _M_translator._M_translate('\r');
-	return __c != __n && __c != __r;
-      }
-
-      bool
-      _M_apply(_CharT __ch, false_type) const
-      {
-	auto __c = _M_translator._M_translate(__ch);
-	auto __n = _M_translator._M_translate('\n');
-	auto __r = _M_translator._M_translate('\r');
-	auto __u2028 = _M_translator._M_translate(u'\u2028');
-	auto __u2029 = _M_translator._M_translate(u'\u2029');
-	return __c != __n && __c != __r && __c != __u2028 && __c != __u2029;
-      }
-
-      _TransT _M_translator;
-    };
-
-  template<typename _TraitsT, bool __icase, bool __collate>
-    struct _CharMatcher
-    {
-      typedef _RegexTranslator<_TraitsT, __icase, __collate> _TransT;
-      typedef typename _TransT::_CharT                       _CharT;
-
-      _CharMatcher(_CharT __ch, const _TraitsT& __traits)
-      : _M_translator(__traits), _M_ch(_M_translator._M_translate(__ch))
-      { }
-
-      bool
-      operator()(_CharT __ch) const
-      { return _M_ch == _M_translator._M_translate(__ch); }
-
-      _TransT _M_translator;
-      _CharT  _M_ch;
-    };
-
-  /// Matches a character range (bracket expression)
-  template<typename _TraitsT, bool __icase, bool __collate>
-    struct _BracketMatcher
-    {
-    public:
-      typedef _RegexTranslator<_TraitsT, __icase, __collate> _TransT;
-      typedef typename _TransT::_CharT                       _CharT;
-      typedef typename _TransT::_StrTransT                   _StrTransT;
-      typedef typename _TraitsT::string_type                 _StringT;
-      typedef typename _TraitsT::char_class_type             _CharClassT;
-
-    public:
-      _BracketMatcher(bool __is_non_matching,
-		      const _TraitsT& __traits)
-      : _M_class_set(0), _M_translator(__traits), _M_traits(__traits),
-      _M_is_non_matching(__is_non_matching)
-#ifdef _GLIBCXX_DEBUG
-      , _M_is_ready(false)
-#endif
-      { }
-
-      bool
-      operator()(_CharT __ch) const
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_is_ready);
-	return _M_apply(__ch, _UseCache());
-      }
-
-      void
-      _M_add_char(_CharT __c)
-      {
-	_M_char_set.push_back(_M_translator._M_translate(__c));
-#ifdef _GLIBCXX_DEBUG
-	_M_is_ready = false;
-#endif
-      }
-
-      _StringT
-      _M_add_collate_element(const _StringT& __s)
-      {
-	auto __st = _M_traits.lookup_collatename(__s.data(),
-						 __s.data() + __s.size());
-	if (__st.empty())
-	  __throw_regex_error(regex_constants::error_collate);
-	_M_char_set.push_back(_M_translator._M_translate(__st[0]));
-#ifdef _GLIBCXX_DEBUG
-	_M_is_ready = false;
-#endif
-	return __st;
-      }
-
-      void
-      _M_add_equivalence_class(const _StringT& __s)
-      {
-	auto __st = _M_traits.lookup_collatename(__s.data(),
-						 __s.data() + __s.size());
-	if (__st.empty())
-	  __throw_regex_error(regex_constants::error_collate);
-	__st = _M_traits.transform_primary(__st.data(),
-					   __st.data() + __st.size());
-	_M_equiv_set.push_back(__st);
-#ifdef _GLIBCXX_DEBUG
-	_M_is_ready = false;
-#endif
-      }
-
-      // __neg should be true for \D, \S and \W only.
-      void
-      _M_add_character_class(const _StringT& __s, bool __neg)
-      {
-	auto __mask = _M_traits.lookup_classname(__s.data(),
-						 __s.data() + __s.size(),
-						 __icase);
-	if (__mask == 0)
-	  __throw_regex_error(regex_constants::error_ctype);
-	if (!__neg)
-	  _M_class_set |= __mask;
-	else
-	  _M_neg_class_set.push_back(__mask);
-#ifdef _GLIBCXX_DEBUG
-	_M_is_ready = false;
-#endif
-      }
-
-      void
-      _M_make_range(_CharT __l, _CharT __r)
-      {
-	if (__l > __r)
-	  __throw_regex_error(regex_constants::error_range);
-	_M_range_set.push_back(make_pair(_M_translator._M_transform(__l),
-					 _M_translator._M_transform(__r)));
-#ifdef _GLIBCXX_DEBUG
-	_M_is_ready = false;
-#endif
-      }
-
-      void
-      _M_ready()
-      {
-	std::sort(_M_char_set.begin(), _M_char_set.end());
-	auto __end = std::unique(_M_char_set.begin(), _M_char_set.end());
-	_M_char_set.erase(__end, _M_char_set.end());
-	_M_make_cache(_UseCache());
-#ifdef _GLIBCXX_DEBUG
-	_M_is_ready = true;
-#endif
-      }
-
-    private:
-      // Currently we only use the cache for char
-      typedef typename std::is_same<_CharT, char>::type _UseCache;
-
-      static constexpr size_t
-      _S_cache_size()
-      {
-	return 1ul << (sizeof(_CharT) * __CHAR_BIT__ * int(_UseCache::value));
-      }
-
-      struct _Dummy { };
-      typedef typename std::conditional<_UseCache::value,
-					std::bitset<_S_cache_size()>,
-					_Dummy>::type _CacheT;
-      typedef typename std::make_unsigned<_CharT>::type _UnsignedCharT;
-
-      bool
-      _M_apply(_CharT __ch, false_type) const;
-
-      bool
-      _M_apply(_CharT __ch, true_type) const
-      { return _M_cache[static_cast<_UnsignedCharT>(__ch)]; }
-
-      void
-      _M_make_cache(true_type)
-      {
-	for (unsigned __i = 0; __i < _M_cache.size(); __i++)
-	  _M_cache[__i] = _M_apply(static_cast<_CharT>(__i), false_type());
-      }
-
-      void
-      _M_make_cache(false_type)
-      { }
-
-    private:
-      std::vector<_CharT>                       _M_char_set;
-      std::vector<_StringT>                     _M_equiv_set;
-      std::vector<pair<_StrTransT, _StrTransT>> _M_range_set;
-      std::vector<_CharClassT>                  _M_neg_class_set;
-      _CharClassT                               _M_class_set;
-      _TransT                                   _M_translator;
-      const _TraitsT&                           _M_traits;
-      bool                                      _M_is_non_matching;
-      _CacheT					_M_cache;
-#ifdef _GLIBCXX_DEBUG
-      bool                                      _M_is_ready;
-#endif
-    };
-
- //@} regex-detail
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __detail
-} // namespace std
-
-#include <bits/regex_compiler.tcc>
diff --git a/openflow/usr/include/c++/5/bits/regex_compiler.tcc b/openflow/usr/include/c++/5/bits/regex_compiler.tcc
deleted file mode 100644
index 9a62311..0000000
--- a/openflow/usr/include/c++/5/bits/regex_compiler.tcc
+++ /dev/null
@@ -1,603 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex_compiler.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-// FIXME make comments doxygen format.
-
-// This compiler refers to "Regular Expression Matching Can Be Simple And Fast"
-// (http://swtch.com/~rsc/regexp/regexp1.html"),
-// but doesn't strictly follow it.
-//
-// When compiling, states are *chained* instead of tree- or graph-constructed.
-// It's more like structured programs: there's if statement and loop statement.
-//
-// For alternative structure (say "a|b"), aka "if statement", two branches
-// should be constructed. However, these two shall merge to an "end_tag" at
-// the end of this operator:
-//
-//                branch1
-//              /        \
-// => begin_tag            end_tag =>
-//              \        /
-//                branch2
-//
-// This is the difference between this implementation and that in Russ's
-// article.
-//
-// That's why we introduced dummy node here ------ "end_tag" is a dummy node.
-// All dummy node will be eliminated at the end of compiling process.
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _TraitsT>
-    _Compiler<_TraitsT>::
-    _Compiler(_IterT __b, _IterT __e,
-	      const typename _TraitsT::locale_type& __loc, _FlagT __flags)
-    : _M_flags((__flags
-		& (regex_constants::ECMAScript
-		   | regex_constants::basic
-		   | regex_constants::extended
-		   | regex_constants::grep
-		   | regex_constants::egrep
-		   | regex_constants::awk))
-	       ? __flags
-	       : __flags | regex_constants::ECMAScript),
-      _M_scanner(__b, __e, _M_flags, __loc),
-      _M_nfa(make_shared<_RegexT>(__loc, _M_flags)),
-      _M_traits(_M_nfa->_M_traits),
-      _M_ctype(std::use_facet<_CtypeT>(__loc))
-    {
-      _StateSeqT __r(*_M_nfa, _M_nfa->_M_start());
-      __r._M_append(_M_nfa->_M_insert_subexpr_begin());
-      this->_M_disjunction();
-      if (!_M_match_token(_ScannerT::_S_token_eof))
-	__throw_regex_error(regex_constants::error_paren);
-      __r._M_append(_M_pop());
-      _GLIBCXX_DEBUG_ASSERT(_M_stack.empty());
-      __r._M_append(_M_nfa->_M_insert_subexpr_end());
-      __r._M_append(_M_nfa->_M_insert_accept());
-      _M_nfa->_M_eliminate_dummy();
-    }
-
-  template<typename _TraitsT>
-    void
-    _Compiler<_TraitsT>::
-    _M_disjunction()
-    {
-      this->_M_alternative();
-      while (_M_match_token(_ScannerT::_S_token_or))
-	{
-	  _StateSeqT __alt1 = _M_pop();
-	  this->_M_alternative();
-	  _StateSeqT __alt2 = _M_pop();
-	  auto __end = _M_nfa->_M_insert_dummy();
-	  __alt1._M_append(__end);
-	  __alt2._M_append(__end);
-	  // __alt2 is state._M_next, __alt1 is state._M_alt. The executor
-	  // executes _M_alt before _M_next, as well as executing left
-	  // alternative before right one.
-	  _M_stack.push(_StateSeqT(*_M_nfa,
-				   _M_nfa->_M_insert_alt(
-				     __alt2._M_start, __alt1._M_start, false),
-				   __end));
-	}
-    }
-
-  template<typename _TraitsT>
-    void
-    _Compiler<_TraitsT>::
-    _M_alternative()
-    {
-      if (this->_M_term())
-	{
-	  _StateSeqT __re = _M_pop();
-	  this->_M_alternative();
-	  __re._M_append(_M_pop());
-	  _M_stack.push(__re);
-	}
-      else
-	_M_stack.push(_StateSeqT(*_M_nfa, _M_nfa->_M_insert_dummy()));
-    }
-
-  template<typename _TraitsT>
-    bool
-    _Compiler<_TraitsT>::
-    _M_term()
-    {
-      if (this->_M_assertion())
-	return true;
-      if (this->_M_atom())
-	{
-	  while (this->_M_quantifier());
-	  return true;
-	}
-      return false;
-    }
-
-  template<typename _TraitsT>
-    bool
-    _Compiler<_TraitsT>::
-    _M_assertion()
-    {
-      if (_M_match_token(_ScannerT::_S_token_line_begin))
-	_M_stack.push(_StateSeqT(*_M_nfa, _M_nfa->_M_insert_line_begin()));
-      else if (_M_match_token(_ScannerT::_S_token_line_end))
-	_M_stack.push(_StateSeqT(*_M_nfa, _M_nfa->_M_insert_line_end()));
-      else if (_M_match_token(_ScannerT::_S_token_word_bound))
-	// _M_value[0] == 'n' means it's negative, say "not word boundary".
-	_M_stack.push(_StateSeqT(*_M_nfa, _M_nfa->
-	      _M_insert_word_bound(_M_value[0] == 'n')));
-      else if (_M_match_token(_ScannerT::_S_token_subexpr_lookahead_begin))
-	{
-	  auto __neg = _M_value[0] == 'n';
-	  this->_M_disjunction();
-	  if (!_M_match_token(_ScannerT::_S_token_subexpr_end))
-	    __throw_regex_error(regex_constants::error_paren);
-	  auto __tmp = _M_pop();
-	  __tmp._M_append(_M_nfa->_M_insert_accept());
-	  _M_stack.push(
-	      _StateSeqT(
-		*_M_nfa,
-		_M_nfa->_M_insert_lookahead(__tmp._M_start, __neg)));
-	}
-      else
-	return false;
-      return true;
-    }
-
-  template<typename _TraitsT>
-    bool
-    _Compiler<_TraitsT>::
-    _M_quantifier()
-    {
-      bool __neg = (_M_flags & regex_constants::ECMAScript);
-      auto __init = [this, &__neg]()
-	{
-	  if (_M_stack.empty())
-	    __throw_regex_error(regex_constants::error_badrepeat);
-	  __neg = __neg && _M_match_token(_ScannerT::_S_token_opt);
-	};
-      if (_M_match_token(_ScannerT::_S_token_closure0))
-	{
-	  __init();
-	  auto __e = _M_pop();
-	  _StateSeqT __r(*_M_nfa,
-			 _M_nfa->_M_insert_repeat(_S_invalid_state_id,
-						  __e._M_start, __neg));
-	  __e._M_append(__r);
-	  _M_stack.push(__r);
-	}
-      else if (_M_match_token(_ScannerT::_S_token_closure1))
-	{
-	  __init();
-	  auto __e = _M_pop();
-	  __e._M_append(_M_nfa->_M_insert_repeat(_S_invalid_state_id,
-						 __e._M_start, __neg));
-	  _M_stack.push(__e);
-	}
-      else if (_M_match_token(_ScannerT::_S_token_opt))
-	{
-	  __init();
-	  auto __e = _M_pop();
-	  auto __end = _M_nfa->_M_insert_dummy();
-	  _StateSeqT __r(*_M_nfa,
-			 _M_nfa->_M_insert_repeat(_S_invalid_state_id,
-						  __e._M_start, __neg));
-	  __e._M_append(__end);
-	  __r._M_append(__end);
-	  _M_stack.push(__r);
-	}
-      else if (_M_match_token(_ScannerT::_S_token_interval_begin))
-	{
-	  if (_M_stack.empty())
-	    __throw_regex_error(regex_constants::error_badrepeat);
-	  if (!_M_match_token(_ScannerT::_S_token_dup_count))
-	    __throw_regex_error(regex_constants::error_badbrace);
-	  _StateSeqT __r(_M_pop());
-	  _StateSeqT __e(*_M_nfa, _M_nfa->_M_insert_dummy());
-	  long __min_rep = _M_cur_int_value(10);
-	  bool __infi = false;
-	  long __n;
-
-	  // {3
-	  if (_M_match_token(_ScannerT::_S_token_comma))
-	    if (_M_match_token(_ScannerT::_S_token_dup_count)) // {3,7}
-	      __n = _M_cur_int_value(10) - __min_rep;
-	    else
-	      __infi = true;
-	  else
-	    __n = 0;
-	  if (!_M_match_token(_ScannerT::_S_token_interval_end))
-	    __throw_regex_error(regex_constants::error_brace);
-
-	  __neg = __neg && _M_match_token(_ScannerT::_S_token_opt);
-
-	  for (long __i = 0; __i < __min_rep; ++__i)
-	    __e._M_append(__r._M_clone());
-
-	  if (__infi)
-	    {
-	      auto __tmp = __r._M_clone();
-	      _StateSeqT __s(*_M_nfa,
-			     _M_nfa->_M_insert_repeat(_S_invalid_state_id,
-						      __tmp._M_start, __neg));
-	      __tmp._M_append(__s);
-	      __e._M_append(__s);
-	    }
-	  else
-	    {
-	      if (__n < 0)
-		__throw_regex_error(regex_constants::error_badbrace);
-	      auto __end = _M_nfa->_M_insert_dummy();
-	      // _M_alt is the "match more" branch, and _M_next is the
-	      // "match less" one. Switch _M_alt and _M_next of all created
-	      // nodes. This is a hack but IMO works well.
-	      std::stack<_StateIdT> __stack;
-	      for (long __i = 0; __i < __n; ++__i)
-		{
-		  auto __tmp = __r._M_clone();
-		  auto __alt = _M_nfa->_M_insert_repeat(__tmp._M_start,
-							__end, __neg);
-		  __stack.push(__alt);
-		  __e._M_append(_StateSeqT(*_M_nfa, __alt, __tmp._M_end));
-		}
-	      __e._M_append(__end);
-	      while (!__stack.empty())
-		{
-		  auto& __tmp = (*_M_nfa)[__stack.top()];
-		  __stack.pop();
-		  std::swap(__tmp._M_next, __tmp._M_alt);
-		}
-	    }
-	  _M_stack.push(__e);
-	}
-      else
-	return false;
-      return true;
-    }
-
-#define __INSERT_REGEX_MATCHER(__func, args...)\
-	do\
-	  if (!(_M_flags & regex_constants::icase))\
-	    if (!(_M_flags & regex_constants::collate))\
-	      __func<false, false>(args);\
-	    else\
-	      __func<false, true>(args);\
-	  else\
-	    if (!(_M_flags & regex_constants::collate))\
-	      __func<true, false>(args);\
-	    else\
-	      __func<true, true>(args);\
-	while (false)
-
-  template<typename _TraitsT>
-    bool
-    _Compiler<_TraitsT>::
-    _M_atom()
-    {
-      if (_M_match_token(_ScannerT::_S_token_anychar))
-	{
-	  if (!(_M_flags & regex_constants::ECMAScript))
-	    __INSERT_REGEX_MATCHER(_M_insert_any_matcher_posix);
-	  else
-	    __INSERT_REGEX_MATCHER(_M_insert_any_matcher_ecma);
-	}
-      else if (_M_try_char())
-	__INSERT_REGEX_MATCHER(_M_insert_char_matcher);
-      else if (_M_match_token(_ScannerT::_S_token_backref))
-	_M_stack.push(_StateSeqT(*_M_nfa, _M_nfa->
-				 _M_insert_backref(_M_cur_int_value(10))));
-      else if (_M_match_token(_ScannerT::_S_token_quoted_class))
-	__INSERT_REGEX_MATCHER(_M_insert_character_class_matcher);
-      else if (_M_match_token(_ScannerT::_S_token_subexpr_no_group_begin))
-	{
-	  _StateSeqT __r(*_M_nfa, _M_nfa->_M_insert_dummy());
-	  this->_M_disjunction();
-	  if (!_M_match_token(_ScannerT::_S_token_subexpr_end))
-	    __throw_regex_error(regex_constants::error_paren);
-	  __r._M_append(_M_pop());
-	  _M_stack.push(__r);
-	}
-      else if (_M_match_token(_ScannerT::_S_token_subexpr_begin))
-	{
-	  _StateSeqT __r(*_M_nfa, _M_nfa->_M_insert_subexpr_begin());
-	  this->_M_disjunction();
-	  if (!_M_match_token(_ScannerT::_S_token_subexpr_end))
-	    __throw_regex_error(regex_constants::error_paren);
-	  __r._M_append(_M_pop());
-	  __r._M_append(_M_nfa->_M_insert_subexpr_end());
-	  _M_stack.push(__r);
-	}
-      else if (!_M_bracket_expression())
-	return false;
-      return true;
-    }
-
-  template<typename _TraitsT>
-    bool
-    _Compiler<_TraitsT>::
-    _M_bracket_expression()
-    {
-      bool __neg =
-	_M_match_token(_ScannerT::_S_token_bracket_neg_begin);
-      if (!(__neg || _M_match_token(_ScannerT::_S_token_bracket_begin)))
-	return false;
-      __INSERT_REGEX_MATCHER(_M_insert_bracket_matcher, __neg);
-      return true;
-    }
-#undef __INSERT_REGEX_MATCHER
-
-  template<typename _TraitsT>
-  template<bool __icase, bool __collate>
-    void
-    _Compiler<_TraitsT>::
-    _M_insert_any_matcher_ecma()
-    {
-      _M_stack.push(_StateSeqT(*_M_nfa,
-	_M_nfa->_M_insert_matcher
-	  (_AnyMatcher<_TraitsT, true, __icase, __collate>
-	    (_M_traits))));
-    }
-
-  template<typename _TraitsT>
-  template<bool __icase, bool __collate>
-    void
-    _Compiler<_TraitsT>::
-    _M_insert_any_matcher_posix()
-    {
-      _M_stack.push(_StateSeqT(*_M_nfa,
-	_M_nfa->_M_insert_matcher
-	  (_AnyMatcher<_TraitsT, false, __icase, __collate>
-	    (_M_traits))));
-    }
-
-  template<typename _TraitsT>
-  template<bool __icase, bool __collate>
-    void
-    _Compiler<_TraitsT>::
-    _M_insert_char_matcher()
-    {
-      _M_stack.push(_StateSeqT(*_M_nfa,
-	_M_nfa->_M_insert_matcher
-	  (_CharMatcher<_TraitsT, __icase, __collate>
-	    (_M_value[0], _M_traits))));
-    }
-
-  template<typename _TraitsT>
-  template<bool __icase, bool __collate>
-    void
-    _Compiler<_TraitsT>::
-    _M_insert_character_class_matcher()
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_value.size() == 1);
-      _BracketMatcher<_TraitsT, __icase, __collate> __matcher
-	(_M_ctype.is(_CtypeT::upper, _M_value[0]), _M_traits);
-      __matcher._M_add_character_class(_M_value, false);
-      __matcher._M_ready();
-      _M_stack.push(_StateSeqT(*_M_nfa,
-	_M_nfa->_M_insert_matcher(std::move(__matcher))));
-    }
-
-  template<typename _TraitsT>
-  template<bool __icase, bool __collate>
-    void
-    _Compiler<_TraitsT>::
-    _M_insert_bracket_matcher(bool __neg)
-    {
-      _BracketMatcher<_TraitsT, __icase, __collate> __matcher(__neg, _M_traits);
-      pair<bool, _CharT> __last_char; // Optional<_CharT>
-      __last_char.first = false;
-      if (!(_M_flags & regex_constants::ECMAScript))
-	if (_M_try_char())
-	  {
-	    __matcher._M_add_char(_M_value[0]);
-	    __last_char.first = true;
-	    __last_char.second = _M_value[0];
-	  }
-      while (_M_expression_term(__last_char, __matcher));
-      __matcher._M_ready();
-      _M_stack.push(_StateSeqT(
-		      *_M_nfa,
-		      _M_nfa->_M_insert_matcher(std::move(__matcher))));
-    }
-
-  template<typename _TraitsT>
-  template<bool __icase, bool __collate>
-    bool
-    _Compiler<_TraitsT>::
-    _M_expression_term(pair<bool, _CharT>& __last_char,
-		       _BracketMatcher<_TraitsT, __icase, __collate>& __matcher)
-    {
-      if (_M_match_token(_ScannerT::_S_token_bracket_end))
-	return false;
-
-      if (_M_match_token(_ScannerT::_S_token_collsymbol))
-	{
-	  auto __symbol = __matcher._M_add_collate_element(_M_value);
-	  if (__symbol.size() == 1)
-	    {
-	      __last_char.first = true;
-	      __last_char.second = __symbol[0];
-	    }
-	}
-      else if (_M_match_token(_ScannerT::_S_token_equiv_class_name))
-	__matcher._M_add_equivalence_class(_M_value);
-      else if (_M_match_token(_ScannerT::_S_token_char_class_name))
-	__matcher._M_add_character_class(_M_value, false);
-      // POSIX doesn't allow '-' as a start-range char (say [a-z--0]),
-      // except when the '-' is the first or last character in the bracket
-      // expression ([--0]). ECMAScript treats all '-' after a range as a
-      // normal character. Also see above, where _M_expression_term gets called.
-      //
-      // As a result, POSIX rejects [-----], but ECMAScript doesn't.
-      // Boost (1.57.0) always uses POSIX style even in its ECMAScript syntax.
-      // Clang (3.5) always uses ECMAScript style even in its POSIX syntax.
-      //
-      // It turns out that no one reads BNFs ;)
-      else if (_M_try_char())
-	{
-	  if (!__last_char.first)
-	    {
-	      __matcher._M_add_char(_M_value[0]);
-	      if (_M_value[0] == '-'
-		  && !(_M_flags & regex_constants::ECMAScript))
-		{
-		  if (_M_match_token(_ScannerT::_S_token_bracket_end))
-		    return false;
-		  __throw_regex_error(regex_constants::error_range);
-		}
-	      __last_char.first = true;
-	      __last_char.second = _M_value[0];
-	    }
-	  else
-	    {
-	      if (_M_value[0] == '-')
-		{
-		  if (_M_try_char())
-		    {
-		      __matcher._M_make_range(__last_char.second , _M_value[0]);
-		      __last_char.first = false;
-		    }
-		  else
-		    {
-		      if (_M_scanner._M_get_token()
-			  != _ScannerT::_S_token_bracket_end)
-			__throw_regex_error(regex_constants::error_range);
-		      __matcher._M_add_char(_M_value[0]);
-		    }
-		}
-	      else
-		{
-		  __matcher._M_add_char(_M_value[0]);
-		  __last_char.second = _M_value[0];
-		}
-	    }
-	}
-      else if (_M_match_token(_ScannerT::_S_token_quoted_class))
-	__matcher._M_add_character_class(_M_value,
-					 _M_ctype.is(_CtypeT::upper,
-						     _M_value[0]));
-      else
-	__throw_regex_error(regex_constants::error_brack);
-
-      return true;
-    }
-
-  template<typename _TraitsT>
-    bool
-    _Compiler<_TraitsT>::
-    _M_try_char()
-    {
-      bool __is_char = false;
-      if (_M_match_token(_ScannerT::_S_token_oct_num))
-	{
-	  __is_char = true;
-	  _M_value.assign(1, _M_cur_int_value(8));
-	}
-      else if (_M_match_token(_ScannerT::_S_token_hex_num))
-	{
-	  __is_char = true;
-	  _M_value.assign(1, _M_cur_int_value(16));
-	}
-      else if (_M_match_token(_ScannerT::_S_token_ord_char))
-	__is_char = true;
-      return __is_char;
-    }
-
-  template<typename _TraitsT>
-    bool
-    _Compiler<_TraitsT>::
-    _M_match_token(_TokenT token)
-    {
-      if (token == _M_scanner._M_get_token())
-	{
-	  _M_value = _M_scanner._M_get_value();
-	  _M_scanner._M_advance();
-	  return true;
-	}
-      return false;
-    }
-
-  template<typename _TraitsT>
-    int
-    _Compiler<_TraitsT>::
-    _M_cur_int_value(int __radix)
-    {
-      long __v = 0;
-      for (typename _StringT::size_type __i = 0;
-	   __i < _M_value.length(); ++__i)
-	__v =__v * __radix + _M_traits.value(_M_value[__i], __radix);
-      return __v;
-    }
-
-  template<typename _TraitsT, bool __icase, bool __collate>
-    bool
-    _BracketMatcher<_TraitsT, __icase, __collate>::
-    _M_apply(_CharT __ch, false_type) const
-    {
-      bool __ret = std::binary_search(_M_char_set.begin(), _M_char_set.end(),
-				      _M_translator._M_translate(__ch));
-      if (!__ret)
-	{
-	  auto __s = _M_translator._M_transform(__ch);
-	  for (auto& __it : _M_range_set)
-	    if (__it.first <= __s && __s <= __it.second)
-	      {
-		__ret = true;
-		break;
-	      }
-	  if (_M_traits.isctype(__ch, _M_class_set))
-	    __ret = true;
-	  else if (std::find(_M_equiv_set.begin(), _M_equiv_set.end(),
-			     _M_traits.transform_primary(&__ch, &__ch+1))
-		   != _M_equiv_set.end())
-	    __ret = true;
-	  else
-	    {
-	      for (auto& __it : _M_neg_class_set)
-		if (!_M_traits.isctype(__ch, __it))
-		  {
-		    __ret = true;
-		    break;
-		  }
-	    }
-	}
-      if (_M_is_non_matching)
-	return !__ret;
-      else
-	return __ret;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __detail
-} // namespace
diff --git a/openflow/usr/include/c++/5/bits/regex_constants.h b/openflow/usr/include/c++/5/bits/regex_constants.h
deleted file mode 100644
index e2c7631..0000000
--- a/openflow/usr/include/c++/5/bits/regex_constants.h
+++ /dev/null
@@ -1,405 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex_constants.h
- *  @brief Constant definitions for the std regex library.
- *
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-/**
- * @defgroup regex Regular Expressions
- *
- * A facility for performing regular expression pattern matching.
- * @{
- */
-
-/**
- * @namespace std::regex_constants
- * @brief ISO C++-0x entities sub namespace for regex.
- */
-namespace regex_constants
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @name 5.1 Regular Expression Syntax Options
-   */
-  //@{
-  enum __syntax_option
-  {
-    _S_icase,
-    _S_nosubs,
-    _S_optimize,
-    _S_collate,
-    _S_ECMAScript,
-    _S_basic,
-    _S_extended,
-    _S_awk,
-    _S_grep,
-    _S_egrep,
-    _S_syntax_last
-  };
-
-  /**
-   * @brief This is a bitmask type indicating how to interpret the regex.
-   *
-   * The @c syntax_option_type is implementation defined but it is valid to
-   * perform bitwise operations on these values and expect the right thing to
-   * happen.
-   *
-   * A valid value of type syntax_option_type shall have exactly one of the
-   * elements @c ECMAScript, @c basic, @c extended, @c awk, @c grep, @c egrep
-   * %set.
-   */
-  enum syntax_option_type : unsigned int { };
-
-  /**
-   * Specifies that the matching of regular expressions against a character
-   * sequence shall be performed without regard to case.
-   */
-  constexpr syntax_option_type icase =
-    static_cast<syntax_option_type>(1 << _S_icase);
-
-  /**
-   * Specifies that when a regular expression is matched against a character
-   * container sequence, no sub-expression matches are to be stored in the
-   * supplied match_results structure.
-   */
-  constexpr syntax_option_type nosubs =
-    static_cast<syntax_option_type>(1 << _S_nosubs);
-
-  /**
-   * Specifies that the regular expression engine should pay more attention to
-   * the speed with which regular expressions are matched, and less to the
-   * speed with which regular expression objects are constructed. Otherwise
-   * it has no detectable effect on the program output.
-   */
-  constexpr syntax_option_type optimize =
-    static_cast<syntax_option_type>(1 << _S_optimize);
-
-  /**
-   * Specifies that character ranges of the form [a-b] should be locale
-   * sensitive.
-   */
-  constexpr syntax_option_type collate =
-    static_cast<syntax_option_type>(1 << _S_collate);
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by ECMAScript in ECMA-262 [Ecma International, ECMAScript
-   * Language Specification, Standard Ecma-262, third edition, 1999], as
-   * modified in section [28.13].  This grammar is similar to that defined
-   * in the PERL scripting language but extended with elements found in the
-   * POSIX regular expression grammar.
-   */
-  constexpr syntax_option_type ECMAScript =
-    static_cast<syntax_option_type>(1 << _S_ECMAScript);
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by POSIX basic regular expressions in IEEE Std 1003.1-2001,
-   * Portable Operating System Interface (POSIX), Base Definitions and
-   * Headers, Section 9, Regular Expressions [IEEE, Information Technology --
-   * Portable Operating System Interface (POSIX), IEEE Standard 1003.1-2001].
-   */
-  constexpr syntax_option_type basic =
-    static_cast<syntax_option_type>(1 << _S_basic);
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by POSIX extended regular expressions in IEEE Std 1003.1-2001,
-   * Portable Operating System Interface (POSIX), Base Definitions and
-   * Headers, Section 9, Regular Expressions.
-   */
-  constexpr syntax_option_type extended =
-    static_cast<syntax_option_type>(1 << _S_extended);
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by POSIX utility awk in IEEE Std 1003.1-2001.  This option is
-   * identical to syntax_option_type extended, except that C-style escape
-   * sequences are supported.  These sequences are:
-   * \\\\, \\a, \\b, \\f, \\n, \\r, \\t , \\v, \\&apos,, &apos,,
-   * and \\ddd (where ddd is one, two, or three octal digits).
-   */
-  constexpr syntax_option_type awk =
-    static_cast<syntax_option_type>(1 << _S_awk);
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by POSIX utility grep in IEEE Std 1003.1-2001.  This option is
-   * identical to syntax_option_type basic, except that newlines are treated
-   * as whitespace.
-   */
-  constexpr syntax_option_type grep =
-    static_cast<syntax_option_type>(1 << _S_grep);
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by POSIX utility grep when given the -E option in
-   * IEEE Std 1003.1-2001.  This option is identical to syntax_option_type
-   * extended, except that newlines are treated as whitespace.
-   */
-  constexpr syntax_option_type egrep =
-    static_cast<syntax_option_type>(1 << _S_egrep);
-
-  constexpr inline syntax_option_type
-  operator&(syntax_option_type __a, syntax_option_type __b)
-  {
-    return (syntax_option_type)(static_cast<unsigned int>(__a)
-				& static_cast<unsigned int>(__b));
-  }
-
-  constexpr inline syntax_option_type
-  operator|(syntax_option_type __a, syntax_option_type __b)
-  {
-    return (syntax_option_type)(static_cast<unsigned int>(__a)
-				| static_cast<unsigned int>(__b));
-  }
-
-  constexpr inline syntax_option_type
-  operator^(syntax_option_type __a, syntax_option_type __b)
-  {
-    return (syntax_option_type)(static_cast<unsigned int>(__a)
-				^ static_cast<unsigned int>(__b));
-  }
-
-  constexpr inline syntax_option_type
-  operator~(syntax_option_type __a)
-  { return (syntax_option_type)(~static_cast<unsigned int>(__a)); }
-
-  inline syntax_option_type&
-  operator&=(syntax_option_type& __a, syntax_option_type __b)
-  { return __a = __a & __b; }
-
-  inline syntax_option_type&
-  operator|=(syntax_option_type& __a, syntax_option_type __b)
-  { return __a = __a | __b; }
-
-  inline syntax_option_type&
-  operator^=(syntax_option_type& __a, syntax_option_type __b)
-  { return __a = __a ^ __b; }
-
-  //@}
-
-  /**
-   * @name 5.2 Matching Rules
-   *
-   * Matching a regular expression against a sequence of characters [first,
-   * last) proceeds according to the rules of the grammar specified for the
-   * regular expression object, modified according to the effects listed
-   * below for any bitmask elements set.
-   *
-   */
-  //@{
-
-  enum __match_flag
-  {
-    _S_not_bol,
-    _S_not_eol,
-    _S_not_bow,
-    _S_not_eow,
-    _S_any,
-    _S_not_null,
-    _S_continuous,
-    _S_prev_avail,
-    _S_sed,
-    _S_no_copy,
-    _S_first_only,
-    _S_match_flag_last
-  };
-
-  /**
-   * @brief This is a bitmask type indicating regex matching rules.
-   *
-   * The @c match_flag_type is implementation defined but it is valid to
-   * perform bitwise operations on these values and expect the right thing to
-   * happen.
-   */
-  enum match_flag_type : unsigned int { };
-
-  /**
-   * The default matching rules.
-   */
-  constexpr match_flag_type match_default = static_cast<match_flag_type>(0);
-
-  /**
-   * The first character in the sequence [first, last) is treated as though it
-   * is not at the beginning of a line, so the character (^) in the regular
-   * expression shall not match [first, first).
-   */
-  constexpr match_flag_type match_not_bol =
-    static_cast<match_flag_type>(1 << _S_not_bol);
-
-  /**
-   * The last character in the sequence [first, last) is treated as though it
-   * is not at the end of a line, so the character ($) in the regular
-   * expression shall not match [last, last).
-   */
-  constexpr match_flag_type match_not_eol =
-    static_cast<match_flag_type>(1 << _S_not_eol);
-
-  /**
-   * The expression \\b is not matched against the sub-sequence
-   * [first,first).
-   */
-  constexpr match_flag_type match_not_bow =
-    static_cast<match_flag_type>(1 << _S_not_bow);
-
-  /**
-   * The expression \\b should not be matched against the sub-sequence
-   * [last,last).
-   */
-  constexpr match_flag_type match_not_eow =
-    static_cast<match_flag_type>(1 << _S_not_eow);
-
-  /**
-   * If more than one match is possible then any match is an acceptable
-   * result.
-   */
-  constexpr match_flag_type match_any =
-    static_cast<match_flag_type>(1 << _S_any);
-
-  /**
-   * The expression does not match an empty sequence.
-   */
-  constexpr match_flag_type match_not_null =
-    static_cast<match_flag_type>(1 << _S_not_null);
-
-  /**
-   * The expression only matches a sub-sequence that begins at first .
-   */
-  constexpr match_flag_type match_continuous =
-    static_cast<match_flag_type>(1 << _S_continuous);
-
-  /**
-   * --first is a valid iterator position.  When this flag is set then the
-   * flags match_not_bol and match_not_bow are ignored by the regular
-   * expression algorithms 28.11 and iterators 28.12.
-   */
-  constexpr match_flag_type match_prev_avail =
-    static_cast<match_flag_type>(1 << _S_prev_avail);
-
-  /**
-   * When a regular expression match is to be replaced by a new string, the
-   * new string is constructed using the rules used by the ECMAScript replace
-   * function in ECMA- 262 [Ecma International, ECMAScript Language
-   * Specification, Standard Ecma-262, third edition, 1999], part 15.5.4.11
-   * String.prototype.replace. In addition, during search and replace
-   * operations all non-overlapping occurrences of the regular expression
-   * are located and replaced, and sections of the input that did not match
-   * the expression are copied unchanged to the output string.
-   *
-   * Format strings (from ECMA-262 [15.5.4.11]):
-   * @li $$  The dollar-sign itself ($)
-   * @li $&  The matched substring.
-   * @li $`  The portion of @a string that precedes the matched substring.
-   *         This would be match_results::prefix().
-   * @li $'  The portion of @a string that follows the matched substring.
-   *         This would be match_results::suffix().
-   * @li $n  The nth capture, where n is in [1,9] and $n is not followed by a
-   *         decimal digit.  If n <= match_results::size() and the nth capture
-   *         is undefined, use the empty string instead.  If n >
-   *         match_results::size(), the result is implementation-defined.
-   * @li $nn The nnth capture, where nn is a two-digit decimal number on
-   *         [01, 99].  If nn <= match_results::size() and the nth capture is
-   *         undefined, use the empty string instead. If
-   *         nn > match_results::size(), the result is implementation-defined.
-   */
-  constexpr match_flag_type format_default = static_cast<match_flag_type>(0);
-
-  /**
-   * When a regular expression match is to be replaced by a new string, the
-   * new string is constructed using the rules used by the POSIX sed utility
-   * in IEEE Std 1003.1- 2001 [IEEE, Information Technology -- Portable
-   * Operating System Interface (POSIX), IEEE Standard 1003.1-2001].
-   */
-  constexpr match_flag_type format_sed =
-    static_cast<match_flag_type>(1 << _S_sed);
-
-  /**
-   * During a search and replace operation, sections of the character
-   * container sequence being searched that do not match the regular
-   * expression shall not be copied to the output string.
-   */
-  constexpr match_flag_type format_no_copy =
-    static_cast<match_flag_type>(1 << _S_no_copy);
-
-  /**
-   * When specified during a search and replace operation, only the first
-   * occurrence of the regular expression shall be replaced.
-   */
-  constexpr match_flag_type format_first_only =
-    static_cast<match_flag_type>(1 << _S_first_only);
-
-  constexpr inline match_flag_type
-  operator&(match_flag_type __a, match_flag_type __b)
-  {
-    return (match_flag_type)(static_cast<unsigned int>(__a)
-				& static_cast<unsigned int>(__b));
-  }
-
-  constexpr inline match_flag_type
-  operator|(match_flag_type __a, match_flag_type __b)
-  {
-    return (match_flag_type)(static_cast<unsigned int>(__a)
-				| static_cast<unsigned int>(__b));
-  }
-
-  constexpr inline match_flag_type
-  operator^(match_flag_type __a, match_flag_type __b)
-  {
-    return (match_flag_type)(static_cast<unsigned int>(__a)
-				^ static_cast<unsigned int>(__b));
-  }
-
-  constexpr inline match_flag_type
-  operator~(match_flag_type __a)
-  { return (match_flag_type)(~static_cast<unsigned int>(__a)); }
-
-  inline match_flag_type&
-  operator&=(match_flag_type& __a, match_flag_type __b)
-  { return __a = __a & __b; }
-
-  inline match_flag_type&
-  operator|=(match_flag_type& __a, match_flag_type __b)
-  { return __a = __a | __b; }
-
-  inline match_flag_type&
-  operator^=(match_flag_type& __a, match_flag_type __b)
-  { return __a = __a ^ __b; }
-
-  //@}
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace regex_constants
-
-/* @} */ // group regex
-} // namespace std
-
diff --git a/openflow/usr/include/c++/5/bits/regex_error.h b/openflow/usr/include/c++/5/bits/regex_error.h
deleted file mode 100644
index 778edd5..0000000
--- a/openflow/usr/include/c++/5/bits/regex_error.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- * @file bits/regex_error.h
- * @brief Error and exception objects for the std regex library.
- *
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-/**
- * @addtogroup regex
- * @{
- */
-
-namespace regex_constants
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @name 5.3 Error Types
-   */
-  //@{
-
-  enum error_type
-    {
-      _S_error_collate,
-      _S_error_ctype,
-      _S_error_escape,
-      _S_error_backref,
-      _S_error_brack,
-      _S_error_paren,
-      _S_error_brace,
-      _S_error_badbrace,
-      _S_error_range,
-      _S_error_space,
-      _S_error_badrepeat,
-      _S_error_complexity,
-      _S_error_stack,
-    };
-
-  /** The expression contained an invalid collating element name. */
-  constexpr error_type error_collate(_S_error_collate);
-
-  /** The expression contained an invalid character class name. */
-  constexpr error_type error_ctype(_S_error_ctype);
-
-  /**
-   * The expression contained an invalid escaped character, or a trailing
-   * escape.
-   */
-  constexpr error_type error_escape(_S_error_escape);
-
-  /** The expression contained an invalid back reference. */
-  constexpr error_type error_backref(_S_error_backref);
-
-  /** The expression contained mismatched [ and ]. */
-  constexpr error_type error_brack(_S_error_brack);
-
-  /** The expression contained mismatched ( and ). */
-  constexpr error_type error_paren(_S_error_paren);
-
-  /** The expression contained mismatched { and } */
-  constexpr error_type error_brace(_S_error_brace);
-
-  /** The expression contained an invalid range in a {} expression. */
-  constexpr error_type error_badbrace(_S_error_badbrace);
-
-  /**
-   * The expression contained an invalid character range,
-   * such as [b-a] in most encodings.
-   */
-  constexpr error_type error_range(_S_error_range);
-
-  /**
-   * There was insufficient memory to convert the expression into a
-   * finite state machine.
-   */
-  constexpr error_type error_space(_S_error_space);
-
-  /**
-   * One of <em>*?+{</em> was not preceded by a valid regular expression.
-   */
-  constexpr error_type error_badrepeat(_S_error_badrepeat);
-
-  /**
-   * The complexity of an attempted match against a regular expression
-   * exceeded a pre-set level.
-   */
-  constexpr error_type error_complexity(_S_error_complexity);
-
-  /**
-   * There was insufficient memory to determine whether the
-   * regular expression could match the specified character sequence.
-   */
-  constexpr error_type error_stack(_S_error_stack);
-
-  //@}
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace regex_constants
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // [7.8] Class regex_error
-  /**
-   * @brief A regular expression exception class.
-   * @ingroup exceptions
-   *
-   * The regular expression library throws objects of this class on error.
-   */
-  class regex_error : public std::runtime_error
-  {
-    regex_constants::error_type _M_code;
-
-  public:
-    /**
-     * @brief Constructs a regex_error object.
-     *
-     * @param __ecode the regex error code.
-     */
-    explicit
-    regex_error(regex_constants::error_type __ecode);
-
-    virtual ~regex_error() throw();
-
-    /**
-     * @brief Gets the regex error code.
-     *
-     * @returns the regex error code.
-     */
-    regex_constants::error_type
-    code() const
-    { return _M_code; }
-  };
-
-  //@} // group regex
-
-  void
-  __throw_regex_error(regex_constants::error_type __ecode);
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
diff --git a/openflow/usr/include/c++/5/bits/regex_executor.h b/openflow/usr/include/c++/5/bits/regex_executor.h
deleted file mode 100644
index 404f30b..0000000
--- a/openflow/usr/include/c++/5/bits/regex_executor.h
+++ /dev/null
@@ -1,225 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex_executor.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-// FIXME convert comments to doxygen format.
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup regex-detail
-   * @{
-   */
-
-  /**
-   * @brief Takes a regex and an input string and does the matching.
-   *
-   * The %_Executor class has two modes: DFS mode and BFS mode, controlled
-   * by the template parameter %__dfs_mode.
-   */
-  template<typename _BiIter, typename _Alloc, typename _TraitsT,
-	   bool __dfs_mode>
-    class _Executor
-    {
-      using __search_mode = integral_constant<bool, __dfs_mode>;
-      using __dfs = true_type;
-      using __bfs = false_type;
-
-      enum class _Match_mode : unsigned char { _Exact, _Prefix };
-
-    public:
-      typedef typename iterator_traits<_BiIter>::value_type _CharT;
-      typedef basic_regex<_CharT, _TraitsT>                 _RegexT;
-      typedef std::vector<sub_match<_BiIter>, _Alloc>       _ResultsVec;
-      typedef regex_constants::match_flag_type              _FlagT;
-      typedef typename _TraitsT::char_class_type            _ClassT;
-      typedef _NFA<_TraitsT>                                _NFAT;
-
-    public:
-      _Executor(_BiIter         __begin,
-		_BiIter         __end,
-		_ResultsVec&    __results,
-		const _RegexT&  __re,
-		_FlagT          __flags)
-      : _M_begin(__begin),
-      _M_end(__end),
-      _M_re(__re),
-      _M_nfa(*__re._M_automaton),
-      _M_results(__results),
-      _M_rep_count(_M_nfa.size()),
-      _M_states(_M_nfa._M_start(), _M_nfa.size()),
-      _M_flags((__flags & regex_constants::match_prev_avail)
-	       ? (__flags
-		  & ~regex_constants::match_not_bol
-		  & ~regex_constants::match_not_bow)
-	       : __flags)
-      { }
-
-      // Set matched when string exactly matches the pattern.
-      bool
-      _M_match()
-      {
-	_M_current = _M_begin;
-	return _M_main(_Match_mode::_Exact);
-      }
-
-      // Set matched when some prefix of the string matches the pattern.
-      bool
-      _M_search_from_first()
-      {
-	_M_current = _M_begin;
-	return _M_main(_Match_mode::_Prefix);
-      }
-
-      bool
-      _M_search();
-
-    private:
-      void
-      _M_rep_once_more(_Match_mode __match_mode, _StateIdT);
-
-      void
-      _M_dfs(_Match_mode __match_mode, _StateIdT __start);
-
-      bool
-      _M_main(_Match_mode __match_mode)
-      { return _M_main_dispatch(__match_mode, __search_mode{}); }
-
-      bool
-      _M_main_dispatch(_Match_mode __match_mode, __dfs);
-
-      bool
-      _M_main_dispatch(_Match_mode __match_mode, __bfs);
-
-      bool
-      _M_is_word(_CharT __ch) const
-      {
-	static const _CharT __s[2] = { 'w' };
-	return _M_re._M_automaton->_M_traits.isctype
-	  (__ch, _M_re._M_automaton->_M_traits.lookup_classname(__s, __s+1));
-      }
-
-      bool
-      _M_at_begin() const
-      {
-	return _M_current == _M_begin
-	  && !(_M_flags & (regex_constants::match_not_bol
-			   | regex_constants::match_prev_avail));
-      }
-
-      bool
-      _M_at_end() const
-      {
-	return _M_current == _M_end
-	  && !(_M_flags & regex_constants::match_not_eol);
-      }
-
-      bool
-      _M_word_boundary() const;
-
-      bool
-      _M_lookahead(_State<_TraitsT> __state);
-
-       // Holds additional information used in BFS-mode.
-      template<typename _SearchMode, typename _ResultsVec>
-	struct _State_info;
-
-      template<typename _ResultsVec>
-	struct _State_info<__bfs, _ResultsVec>
-	{
-	  explicit
-	  _State_info(_StateIdT __start, size_t __n)
-	  : _M_visited_states(new bool[__n]()), _M_start(__start)
-	  { }
-
-	  bool _M_visited(_StateIdT __i)
-	  {
-	    if (_M_visited_states[__i])
-	      return true;
-	    _M_visited_states[__i] = true;
-	    return false;
-	  }
-
-	  void _M_queue(_StateIdT __i, const _ResultsVec& __res)
-	  { _M_match_queue.emplace_back(__i, __res); }
-
-	  // Dummy implementations for BFS mode.
-	  _BiIter* _M_get_sol_pos() { return nullptr; }
-
-	  // Saves states that need to be considered for the next character.
-	  vector<pair<_StateIdT, _ResultsVec>>	_M_match_queue;
-	  // Indicates which states are already visited.
-	  unique_ptr<bool[]>			_M_visited_states;
-	  // To record current solution.
-	  _StateIdT _M_start;
-	};
-
-      template<typename _ResultsVec>
-	struct _State_info<__dfs, _ResultsVec>
-	{
-	  explicit
-	  _State_info(_StateIdT __start, size_t) : _M_start(__start)
-	  { }
-
-	  // Dummy implementations for DFS mode.
-	  bool _M_visited(_StateIdT) const { return false; }
-	  void _M_queue(_StateIdT, const _ResultsVec&) { }
-
-	  _BiIter* _M_get_sol_pos() { return &_M_sol_pos; }
-
-	  // To record current solution.
-	  _StateIdT _M_start;
-	  _BiIter   _M_sol_pos;
-	};
-
-    public:
-      _ResultsVec                                           _M_cur_results;
-      _BiIter                                               _M_current;
-      _BiIter                                               _M_begin;
-      const _BiIter                                         _M_end;
-      const _RegexT&                                        _M_re;
-      const _NFAT&                                          _M_nfa;
-      _ResultsVec&                                          _M_results;
-      vector<pair<_BiIter, int>>                            _M_rep_count;
-      _State_info<__search_mode, _ResultsVec>		    _M_states;
-      _FlagT                                                _M_flags;
-      // Do we have a solution so far?
-      bool                                                  _M_has_sol;
-    };
-
- //@} regex-detail
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __detail
-} // namespace std
-
-#include <bits/regex_executor.tcc>
diff --git a/openflow/usr/include/c++/5/bits/regex_executor.tcc b/openflow/usr/include/c++/5/bits/regex_executor.tcc
deleted file mode 100644
index de217da..0000000
--- a/openflow/usr/include/c++/5/bits/regex_executor.tcc
+++ /dev/null
@@ -1,439 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex_executor.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _BiIter, typename _Alloc, typename _TraitsT,
-	   bool __dfs_mode>
-    bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
-    _M_search()
-    {
-      if (_M_search_from_first())
-	return true;
-      if (_M_flags & regex_constants::match_continuous)
-	return false;
-      _M_flags |= regex_constants::match_prev_avail;
-      while (_M_begin != _M_end)
-	{
-	  ++_M_begin;
-	  if (_M_search_from_first())
-	    return true;
-	}
-      return false;
-    }
-
-  // The _M_main function operates in different modes, DFS mode or BFS mode,
-  // indicated by template parameter __dfs_mode, and dispatches to one of the
-  // _M_main_dispatch overloads.
-  //
-  // ------------------------------------------------------------
-  //
-  // DFS mode:
-  //
-  // It applies a Depth-First-Search (aka backtracking) on given NFA and input
-  // string.
-  // At the very beginning the executor stands in the start state, then it
-  // tries every possible state transition in current state recursively. Some
-  // state transitions consume input string, say, a single-char-matcher or a
-  // back-reference matcher; some don't, like assertion or other anchor nodes.
-  // When the input is exhausted and/or the current state is an accepting
-  // state, the whole executor returns true.
-  //
-  // TODO: This approach is exponentially slow for certain input.
-  //       Try to compile the NFA to a DFA.
-  //
-  // Time complexity: \Omega(match_length), O(2^(_M_nfa.size()))
-  // Space complexity: \theta(match_results.size() + match_length)
-  //
-  template<typename _BiIter, typename _Alloc, typename _TraitsT,
-	   bool __dfs_mode>
-    bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
-    _M_main_dispatch(_Match_mode __match_mode, __dfs)
-    {
-      _M_has_sol = false;
-      *_M_states._M_get_sol_pos() = _BiIter();
-      _M_cur_results = _M_results;
-      _M_dfs(__match_mode, _M_states._M_start);
-      return _M_has_sol;
-    }
-
-  // ------------------------------------------------------------
-  //
-  // BFS mode:
-  //
-  // Russ Cox's article (http://swtch.com/~rsc/regexp/regexp1.html)
-  // explained this algorithm clearly.
-  //
-  // It first computes epsilon closure (states that can be achieved without
-  // consuming characters) for every state that's still matching,
-  // using the same DFS algorithm, but doesn't re-enter states (using
-  // _M_states._M_visited to check), nor follow _S_opcode_match.
-  //
-  // Then apply DFS using every _S_opcode_match (in _M_states._M_match_queue)
-  // as the start state.
-  //
-  // It significantly reduces potential duplicate states, so has a better
-  // upper bound; but it requires more overhead.
-  //
-  // Time complexity: \Omega(match_length * match_results.size())
-  //                  O(match_length * _M_nfa.size() * match_results.size())
-  // Space complexity: \Omega(_M_nfa.size() + match_results.size())
-  //                   O(_M_nfa.size() * match_results.size())
-  template<typename _BiIter, typename _Alloc, typename _TraitsT,
-	   bool __dfs_mode>
-    bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
-    _M_main_dispatch(_Match_mode __match_mode, __bfs)
-    {
-      _M_states._M_queue(_M_states._M_start, _M_results);
-      bool __ret = false;
-      while (1)
-	{
-	  _M_has_sol = false;
-	  if (_M_states._M_match_queue.empty())
-	    break;
-	  std::fill_n(_M_states._M_visited_states.get(), _M_nfa.size(), false);
-	  auto __old_queue = std::move(_M_states._M_match_queue);
-	  for (auto& __task : __old_queue)
-	    {
-	      _M_cur_results = std::move(__task.second);
-	      _M_dfs(__match_mode, __task.first);
-	    }
-	  if (__match_mode == _Match_mode::_Prefix)
-	    __ret |= _M_has_sol;
-	  if (_M_current == _M_end)
-	    break;
-	  ++_M_current;
-	}
-      if (__match_mode == _Match_mode::_Exact)
-	__ret = _M_has_sol;
-      _M_states._M_match_queue.clear();
-      return __ret;
-    }
-
-  // Return whether now match the given sub-NFA.
-  template<typename _BiIter, typename _Alloc, typename _TraitsT,
-	   bool __dfs_mode>
-    bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
-    _M_lookahead(_State<_TraitsT> __state)
-    {
-      // Backreferences may refer to captured content.
-      // We may want to make this faster by not copying,
-      // but let's not be clever prematurely.
-      _ResultsVec __what(_M_cur_results);
-      _Executor __sub(_M_current, _M_end, __what, _M_re, _M_flags);
-      __sub._M_states._M_start = __state._M_alt;
-      if (__sub._M_search_from_first())
-	{
-	  for (size_t __i = 0; __i < __what.size(); __i++)
-	    if (__what[__i].matched)
-	      _M_cur_results[__i] = __what[__i];
-	  return true;
-	}
-      return false;
-    }
-
-  // __rep_count records how many times (__rep_count.second)
-  // this node is visited under certain input iterator
-  // (__rep_count.first). This prevent the executor from entering
-  // infinite loop by refusing to continue when it's already been
-  // visited more than twice. It's `twice` instead of `once` because
-  // we need to spare one more time for potential group capture.
-  template<typename _BiIter, typename _Alloc, typename _TraitsT,
-    bool __dfs_mode>
-    void _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
-    _M_rep_once_more(_Match_mode __match_mode, _StateIdT __i)
-    {
-      const auto& __state = _M_nfa[__i];
-      auto& __rep_count = _M_rep_count[__i];
-      if (__rep_count.second == 0 || __rep_count.first != _M_current)
-	{
-	  auto __back = __rep_count;
-	  __rep_count.first = _M_current;
-	  __rep_count.second = 1;
-	  _M_dfs(__match_mode, __state._M_alt);
-	  __rep_count = __back;
-	}
-      else
-	{
-	  if (__rep_count.second < 2)
-	    {
-	      __rep_count.second++;
-	      _M_dfs(__match_mode, __state._M_alt);
-	      __rep_count.second--;
-	    }
-	}
-    };
-
-  template<typename _BiIter, typename _Alloc, typename _TraitsT,
-	   bool __dfs_mode>
-    void _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
-    _M_dfs(_Match_mode __match_mode, _StateIdT __i)
-    {
-      if (_M_states._M_visited(__i))
-	return;
-
-      const auto& __state = _M_nfa[__i];
-      // Every change on _M_cur_results and _M_current will be rolled back after
-      // finishing the recursion step.
-      switch (__state._M_opcode)
-	{
-	// _M_alt branch is "match once more", while _M_next is "get me out
-	// of this quantifier". Executing _M_next first or _M_alt first don't
-	// mean the same thing, and we need to choose the correct order under
-	// given greedy mode.
-	case _S_opcode_repeat:
-	  {
-	    // Greedy.
-	    if (!__state._M_neg)
-	      {
-		_M_rep_once_more(__match_mode, __i);
-		// If it's DFS executor and already accepted, we're done.
-		if (!__dfs_mode || !_M_has_sol)
-		  _M_dfs(__match_mode, __state._M_next);
-	      }
-	    else // Non-greedy mode
-	      {
-		if (__dfs_mode)
-		  {
-		    // vice-versa.
-		    _M_dfs(__match_mode, __state._M_next);
-		    if (!_M_has_sol)
-		      _M_rep_once_more(__match_mode, __i);
-		  }
-		else
-		  {
-		    // DON'T attempt anything, because there's already another
-		    // state with higher priority accepted. This state cannot
-		    // be better by attempting its next node.
-		    if (!_M_has_sol)
-		      {
-			_M_dfs(__match_mode, __state._M_next);
-			// DON'T attempt anything if it's already accepted. An
-			// accepted state *must* be better than a solution that
-			// matches a non-greedy quantifier one more time.
-			if (!_M_has_sol)
-			  _M_rep_once_more(__match_mode, __i);
-		      }
-		  }
-	      }
-	    }
-	  break;
-	case _S_opcode_subexpr_begin:
-	  {
-	    auto& __res = _M_cur_results[__state._M_subexpr];
-	    auto __back = __res.first;
-	    __res.first = _M_current;
-	    _M_dfs(__match_mode, __state._M_next);
-	    __res.first = __back;
-	  }
-	  break;
-	case _S_opcode_subexpr_end:
-	  {
-	    auto& __res = _M_cur_results[__state._M_subexpr];
-	    auto __back = __res;
-	    __res.second = _M_current;
-	    __res.matched = true;
-	    _M_dfs(__match_mode, __state._M_next);
-	    __res = __back;
-	  }
-	  break;
-	case _S_opcode_line_begin_assertion:
-	  if (_M_at_begin())
-	    _M_dfs(__match_mode, __state._M_next);
-	  break;
-	case _S_opcode_line_end_assertion:
-	  if (_M_at_end())
-	    _M_dfs(__match_mode, __state._M_next);
-	  break;
-	case _S_opcode_word_boundary:
-	  if (_M_word_boundary() == !__state._M_neg)
-	    _M_dfs(__match_mode, __state._M_next);
-	  break;
-	// Here __state._M_alt offers a single start node for a sub-NFA.
-	// We recursively invoke our algorithm to match the sub-NFA.
-	case _S_opcode_subexpr_lookahead:
-	  if (_M_lookahead(__state) == !__state._M_neg)
-	    _M_dfs(__match_mode, __state._M_next);
-	  break;
-	case _S_opcode_match:
-	  if (_M_current == _M_end)
-	    break;
-	  if (__dfs_mode)
-	    {
-	      if (__state._M_matches(*_M_current))
-		{
-		  ++_M_current;
-		  _M_dfs(__match_mode, __state._M_next);
-		  --_M_current;
-		}
-	    }
-	  else
-	    if (__state._M_matches(*_M_current))
-	      _M_states._M_queue(__state._M_next, _M_cur_results);
-	  break;
-	// First fetch the matched result from _M_cur_results as __submatch;
-	// then compare it with
-	// (_M_current, _M_current + (__submatch.second - __submatch.first)).
-	// If matched, keep going; else just return and try another state.
-	case _S_opcode_backref:
-	  {
-	    _GLIBCXX_DEBUG_ASSERT(__dfs_mode);
-	    auto& __submatch = _M_cur_results[__state._M_backref_index];
-	    if (!__submatch.matched)
-	      break;
-	    auto __last = _M_current;
-	    for (auto __tmp = __submatch.first;
-		 __last != _M_end && __tmp != __submatch.second;
-		 ++__tmp)
-	      ++__last;
-	    if (_M_re._M_automaton->_M_traits.transform(__submatch.first,
-							__submatch.second)
-		== _M_re._M_automaton->_M_traits.transform(_M_current, __last))
-	      {
-		if (__last != _M_current)
-		  {
-		    auto __backup = _M_current;
-		    _M_current = __last;
-		    _M_dfs(__match_mode, __state._M_next);
-		    _M_current = __backup;
-		  }
-		else
-		  _M_dfs(__match_mode, __state._M_next);
-	      }
-	  }
-	  break;
-	case _S_opcode_accept:
-	  if (__dfs_mode)
-	    {
-	      _GLIBCXX_DEBUG_ASSERT(!_M_has_sol);
-	      if (__match_mode == _Match_mode::_Exact)
-		_M_has_sol = _M_current == _M_end;
-	      else
-		_M_has_sol = true;
-	      if (_M_current == _M_begin
-		  && (_M_flags & regex_constants::match_not_null))
-		_M_has_sol = false;
-	      if (_M_has_sol)
-		{
-		  if (_M_nfa._M_flags & regex_constants::ECMAScript)
-		    _M_results = _M_cur_results;
-		  else // POSIX
-		    {
-		      _GLIBCXX_DEBUG_ASSERT(_M_states._M_get_sol_pos());
-		      // Here's POSIX's logic: match the longest one. However
-		      // we never know which one (lhs or rhs of "|") is longer
-		      // unless we try both of them and compare the results.
-		      // The member variable _M_sol_pos records the end
-		      // position of the last successful match. It's better
-		      // to be larger, because POSIX regex is always greedy.
-		      // TODO: This could be slow.
-		      if (*_M_states._M_get_sol_pos() == _BiIter()
-			  || std::distance(_M_begin,
-					   *_M_states._M_get_sol_pos())
-			     < std::distance(_M_begin, _M_current))
-			{
-			  *_M_states._M_get_sol_pos() = _M_current;
-			  _M_results = _M_cur_results;
-			}
-		    }
-		}
-	    }
-	  else
-	    {
-	      if (_M_current == _M_begin
-		  && (_M_flags & regex_constants::match_not_null))
-		break;
-	      if (__match_mode == _Match_mode::_Prefix || _M_current == _M_end)
-		if (!_M_has_sol)
-		  {
-		    _M_has_sol = true;
-		    _M_results = _M_cur_results;
-		  }
-	    }
-	  break;
-	case _S_opcode_alternative:
-	  if (_M_nfa._M_flags & regex_constants::ECMAScript)
-	    {
-	      // TODO: Let BFS support ECMAScript's alternative operation.
-	      _GLIBCXX_DEBUG_ASSERT(__dfs_mode);
-	      _M_dfs(__match_mode, __state._M_alt);
-	      // Pick lhs if it matches. Only try rhs if it doesn't.
-	      if (!_M_has_sol)
-		_M_dfs(__match_mode, __state._M_next);
-	    }
-	  else
-	    {
-	      // Try both and compare the result.
-	      // See "case _S_opcode_accept:" handling above.
-	      _M_dfs(__match_mode, __state._M_alt);
-	      auto __has_sol = _M_has_sol;
-	      _M_has_sol = false;
-	      _M_dfs(__match_mode, __state._M_next);
-	      _M_has_sol |= __has_sol;
-	    }
-	  break;
-	default:
-	  _GLIBCXX_DEBUG_ASSERT(false);
-	}
-    }
-
-  // Return whether now is at some word boundary.
-  template<typename _BiIter, typename _Alloc, typename _TraitsT,
-	   bool __dfs_mode>
-    bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
-    _M_word_boundary() const
-    {
-      bool __left_is_word = false;
-      if (_M_current != _M_begin
-	  || (_M_flags & regex_constants::match_prev_avail))
-	{
-	  auto __prev = _M_current;
-	  if (_M_is_word(*std::prev(__prev)))
-	    __left_is_word = true;
-	}
-      bool __right_is_word =
-        _M_current != _M_end && _M_is_word(*_M_current);
-
-      if (__left_is_word == __right_is_word)
-	return false;
-      if (__left_is_word && !(_M_flags & regex_constants::match_not_eow))
-	return true;
-      if (__right_is_word && !(_M_flags & regex_constants::match_not_bow))
-	return true;
-      return false;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __detail
-} // namespace
diff --git a/openflow/usr/include/c++/5/bits/regex_scanner.h b/openflow/usr/include/c++/5/bits/regex_scanner.h
deleted file mode 100644
index 6fefed7..0000000
--- a/openflow/usr/include/c++/5/bits/regex_scanner.h
+++ /dev/null
@@ -1,271 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex_scanner.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup regex-detail
-   * @{
-   */
-
-  struct _ScannerBase
-  {
-  public:
-    /// Token types returned from the scanner.
-    enum _TokenT
-    {
-      _S_token_anychar,
-      _S_token_ord_char,
-      _S_token_oct_num,
-      _S_token_hex_num,
-      _S_token_backref,
-      _S_token_subexpr_begin,
-      _S_token_subexpr_no_group_begin,
-      _S_token_subexpr_lookahead_begin, // neg if _M_value[0] == 'n'
-      _S_token_subexpr_end,
-      _S_token_bracket_begin,
-      _S_token_bracket_neg_begin,
-      _S_token_bracket_end,
-      _S_token_interval_begin,
-      _S_token_interval_end,
-      _S_token_quoted_class,
-      _S_token_char_class_name,
-      _S_token_collsymbol,
-      _S_token_equiv_class_name,
-      _S_token_opt,
-      _S_token_or,
-      _S_token_closure0,
-      _S_token_closure1,
-      _S_token_line_begin,
-      _S_token_line_end,
-      _S_token_word_bound, // neg if _M_value[0] == 'n'
-      _S_token_comma,
-      _S_token_dup_count,
-      _S_token_eof,
-      _S_token_unknown
-    };
-
-  protected:
-    typedef regex_constants::syntax_option_type _FlagT;
-
-    enum _StateT
-    {
-      _S_state_normal,
-      _S_state_in_brace,
-      _S_state_in_bracket,
-    };
-
-  protected:
-    _ScannerBase(_FlagT __flags)
-    : _M_state(_S_state_normal),
-    _M_flags(__flags),
-    _M_escape_tbl(_M_is_ecma()
-		  ? _M_ecma_escape_tbl
-		  : _M_awk_escape_tbl),
-    _M_spec_char(_M_is_ecma()
-		 ? _M_ecma_spec_char
-		 : _M_flags & regex_constants::basic
-		 ? _M_basic_spec_char
-		 : _M_flags & regex_constants::extended
-		 ? _M_extended_spec_char
-		 : _M_flags & regex_constants::grep
-		 ?  ".[\\*^$\n"
-		 : _M_flags & regex_constants::egrep
-		 ? ".[\\()*+?{|^$\n"
-		 : _M_flags & regex_constants::awk
-		 ? _M_extended_spec_char
-		 : nullptr),
-    _M_at_bracket_start(false)
-    { __glibcxx_assert(_M_spec_char); }
-
-  protected:
-    const char*
-    _M_find_escape(char __c)
-    {
-      auto __it = _M_escape_tbl;
-      for (; __it->first != '\0'; ++__it)
-	if (__it->first == __c)
-	  return &__it->second;
-      return nullptr;
-    }
-
-    bool
-    _M_is_ecma() const
-    { return _M_flags & regex_constants::ECMAScript; }
-
-    bool
-    _M_is_basic() const
-    { return _M_flags & (regex_constants::basic | regex_constants::grep); }
-
-    bool
-    _M_is_extended() const
-    {
-      return _M_flags & (regex_constants::extended
-			 | regex_constants::egrep
-			 | regex_constants::awk);
-    }
-
-    bool
-    _M_is_grep() const
-    { return _M_flags & (regex_constants::grep | regex_constants::egrep); }
-
-    bool
-    _M_is_awk() const
-    { return _M_flags & regex_constants::awk; }
-
-  protected:
-    // TODO: Make them static in the next abi change.
-    const std::pair<char, _TokenT> _M_token_tbl[9] =
-      {
-	{'^', _S_token_line_begin},
-	{'$', _S_token_line_end},
-	{'.', _S_token_anychar},
-	{'*', _S_token_closure0},
-	{'+', _S_token_closure1},
-	{'?', _S_token_opt},
-	{'|', _S_token_or},
-	{'\n', _S_token_or}, // grep and egrep
-	{'\0', _S_token_or},
-      };
-    const std::pair<char, char> _M_ecma_escape_tbl[8] =
-      {
-	{'0', '\0'},
-	{'b', '\b'},
-	{'f', '\f'},
-	{'n', '\n'},
-	{'r', '\r'},
-	{'t', '\t'},
-	{'v', '\v'},
-	{'\0', '\0'},
-      };
-    const std::pair<char, char> _M_awk_escape_tbl[11] =
-      {
-	{'"', '"'},
-	{'/', '/'},
-	{'\\', '\\'},
-	{'a', '\a'},
-	{'b', '\b'},
-	{'f', '\f'},
-	{'n', '\n'},
-	{'r', '\r'},
-	{'t', '\t'},
-	{'v', '\v'},
-	{'\0', '\0'},
-      };
-    const char* _M_ecma_spec_char = "^$\\.*+?()[]{}|";
-    const char* _M_basic_spec_char = ".[\\*^$";
-    const char* _M_extended_spec_char = ".[\\()*+?{|^$";
-
-    _StateT                       _M_state;
-    _FlagT                        _M_flags;
-    _TokenT                       _M_token;
-    const std::pair<char, char>*  _M_escape_tbl;
-    const char*                   _M_spec_char;
-    bool                          _M_at_bracket_start;
-  };
-
-  /**
-   * @brief Scans an input range for regex tokens.
-   *
-   * The %_Scanner class interprets the regular expression pattern in
-   * the input range passed to its constructor as a sequence of parse
-   * tokens passed to the regular expression compiler.  The sequence
-   * of tokens provided depends on the flag settings passed to the
-   * constructor: different regular expression grammars will interpret
-   * the same input pattern in syntactically different ways.
-   */
-  template<typename _CharT>
-    class _Scanner
-    : public _ScannerBase
-    {
-    public:
-      typedef const _CharT*                                       _IterT;
-      typedef std::basic_string<_CharT>                           _StringT;
-      typedef regex_constants::syntax_option_type                 _FlagT;
-      typedef const std::ctype<_CharT>                            _CtypeT;
-
-      _Scanner(_IterT __begin, _IterT __end,
-	       _FlagT __flags, std::locale __loc);
-
-      void
-      _M_advance();
-
-      _TokenT
-      _M_get_token() const
-      { return _M_token; }
-
-      const _StringT&
-      _M_get_value() const
-      { return _M_value; }
-
-#ifdef _GLIBCXX_DEBUG
-      std::ostream&
-      _M_print(std::ostream&);
-#endif
-
-    private:
-      void
-      _M_scan_normal();
-
-      void
-      _M_scan_in_bracket();
-
-      void
-      _M_scan_in_brace();
-
-      void
-      _M_eat_escape_ecma();
-
-      void
-      _M_eat_escape_posix();
-
-      void
-      _M_eat_escape_awk();
-
-      void
-      _M_eat_class(char);
-
-      _IterT                        _M_current;
-      _IterT                        _M_end;
-      _CtypeT&                      _M_ctype;
-      _StringT                      _M_value;
-      void (_Scanner::* _M_eat_escape)();
-    };
-
- //@} regex-detail
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __detail
-} // namespace std
-
-#include <bits/regex_scanner.tcc>
diff --git a/openflow/usr/include/c++/5/bits/regex_scanner.tcc b/openflow/usr/include/c++/5/bits/regex_scanner.tcc
deleted file mode 100644
index 4658f99..0000000
--- a/openflow/usr/include/c++/5/bits/regex_scanner.tcc
+++ /dev/null
@@ -1,564 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file bits/regex_scanner.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{regex}
- */
-
-// FIXME make comments doxygen format.
-
-// N3376 specified 6 regex styles: ECMAScript, basic, extended, grep, egrep
-// and awk
-// 1) grep is basic except '\n' is treated as '|'
-// 2) egrep is extended except '\n' is treated as '|'
-// 3) awk is extended except special escaping rules, and there's no
-//    back-reference.
-//
-// References:
-//
-// ECMAScript: ECMA-262 15.10
-//
-// basic, extended:
-// http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html
-//
-// awk: http://pubs.opengroup.org/onlinepubs/000095399/utilities/awk.html
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT>
-    _Scanner<_CharT>::
-    _Scanner(typename _Scanner::_IterT __begin,
-	     typename _Scanner::_IterT __end,
-	     _FlagT __flags, std::locale __loc)
-    : _ScannerBase(__flags),
-      _M_current(__begin), _M_end(__end),
-      _M_ctype(std::use_facet<_CtypeT>(__loc)),
-      _M_eat_escape(_M_is_ecma()
-		    ? &_Scanner::_M_eat_escape_ecma
-		    : &_Scanner::_M_eat_escape_posix)
-    { _M_advance(); }
-
-  template<typename _CharT>
-    void
-    _Scanner<_CharT>::
-    _M_advance()
-    {
-      if (_M_current == _M_end)
-	{
-	  _M_token = _S_token_eof;
-	  return;
-	}
-
-      if (_M_state == _S_state_normal)
-	_M_scan_normal();
-      else if (_M_state == _S_state_in_bracket)
-	_M_scan_in_bracket();
-      else if (_M_state == _S_state_in_brace)
-	_M_scan_in_brace();
-      else
-	{
-	  _GLIBCXX_DEBUG_ASSERT(false);
-	}
-    }
-
-  // Differences between styles:
-  // 1) "\(", "\)", "\{" in basic. It's not escaping.
-  // 2) "(?:", "(?=", "(?!" in ECMAScript.
-  template<typename _CharT>
-    void
-    _Scanner<_CharT>::
-    _M_scan_normal()
-    {
-      auto __c = *_M_current++;
-
-      if (std::strchr(_M_spec_char, _M_ctype.narrow(__c, ' ')) == nullptr)
-	{
-	  _M_token = _S_token_ord_char;
-	  _M_value.assign(1, __c);
-	  return;
-	}
-      if (__c == '\\')
-	{
-	  if (_M_current == _M_end)
-	    __throw_regex_error(regex_constants::error_escape);
-
-	  if (!_M_is_basic()
-	      || (*_M_current != '('
-		  && *_M_current != ')'
-		  && *_M_current != '{'))
-	    {
-	      (this->*_M_eat_escape)();
-	      return;
-	    }
-	  __c = *_M_current++;
-	}
-      if (__c == '(')
-	{
-	  if (_M_is_ecma() && *_M_current == '?')
-	    {
-	      if (++_M_current == _M_end)
-		__throw_regex_error(regex_constants::error_paren);
-
-	      if (*_M_current == ':')
-		{
-		  ++_M_current;
-		  _M_token = _S_token_subexpr_no_group_begin;
-		}
-	      else if (*_M_current == '=')
-		{
-		  ++_M_current;
-		  _M_token = _S_token_subexpr_lookahead_begin;
-		  _M_value.assign(1, 'p');
-		}
-	      else if (*_M_current == '!')
-		{
-		  ++_M_current;
-		  _M_token = _S_token_subexpr_lookahead_begin;
-		  _M_value.assign(1, 'n');
-		}
-	      else
-		__throw_regex_error(regex_constants::error_paren);
-	    }
-	  else if (_M_flags & regex_constants::nosubs)
-	    _M_token = _S_token_subexpr_no_group_begin;
-	  else
-	    _M_token = _S_token_subexpr_begin;
-	}
-      else if (__c == ')')
-	_M_token = _S_token_subexpr_end;
-      else if (__c == '[')
-	{
-	  _M_state = _S_state_in_bracket;
-	  _M_at_bracket_start = true;
-	  if (_M_current != _M_end && *_M_current == '^')
-	    {
-	      _M_token = _S_token_bracket_neg_begin;
-	      ++_M_current;
-	    }
-	  else
-	    _M_token = _S_token_bracket_begin;
-	}
-      else if (__c == '{')
-	{
-	  _M_state = _S_state_in_brace;
-	  _M_token = _S_token_interval_begin;
-	}
-      else if (__c != ']' && __c != '}')
-	{
-	  auto __it = _M_token_tbl;
-	  auto __narrowc = _M_ctype.narrow(__c, '\0');
-	  for (; __it->first != '\0'; ++__it)
-	    if (__it->first == __narrowc)
-	      {
-		_M_token = __it->second;
-		return;
-	      }
-	  _GLIBCXX_DEBUG_ASSERT(false);
-	}
-      else
-	{
-	  _M_token = _S_token_ord_char;
-	  _M_value.assign(1, __c);
-	}
-    }
-
-  // Differences between styles:
-  // 1) different semantics of "[]" and "[^]".
-  // 2) Escaping in bracket expr.
-  template<typename _CharT>
-    void
-    _Scanner<_CharT>::
-    _M_scan_in_bracket()
-    {
-      if (_M_current == _M_end)
-	__throw_regex_error(regex_constants::error_brack);
-
-      auto __c = *_M_current++;
-
-      if (__c == '[')
-	{
-	  if (_M_current == _M_end)
-	    __throw_regex_error(regex_constants::error_brack);
-
-	  if (*_M_current == '.')
-	    {
-	      _M_token = _S_token_collsymbol;
-	      _M_eat_class(*_M_current++);
-	    }
-	  else if (*_M_current == ':')
-	    {
-	      _M_token = _S_token_char_class_name;
-	      _M_eat_class(*_M_current++);
-	    }
-	  else if (*_M_current == '=')
-	    {
-	      _M_token = _S_token_equiv_class_name;
-	      _M_eat_class(*_M_current++);
-	    }
-	  else
-	    {
-	      _M_token = _S_token_ord_char;
-	      _M_value.assign(1, __c);
-	    }
-	}
-      // In POSIX, when encountering "[]" or "[^]", the ']' is interpreted
-      // literally. So "[]]" and "[^]]" are valid regexes. See the testcases
-      // `*/empty_range.cc`.
-      else if (__c == ']' && (_M_is_ecma() || !_M_at_bracket_start))
-	{
-	  _M_token = _S_token_bracket_end;
-	  _M_state = _S_state_normal;
-	}
-      // ECMAScript and awk permits escaping in bracket.
-      else if (__c == '\\' && (_M_is_ecma() || _M_is_awk()))
-	(this->*_M_eat_escape)();
-      else
-	{
-	  _M_token = _S_token_ord_char;
-	  _M_value.assign(1, __c);
-	}
-      _M_at_bracket_start = false;
-    }
-
-  // Differences between styles:
-  // 1) "\}" in basic style.
-  template<typename _CharT>
-    void
-    _Scanner<_CharT>::
-    _M_scan_in_brace()
-    {
-      if (_M_current == _M_end)
-	__throw_regex_error(regex_constants::error_brace);
-
-      auto __c = *_M_current++;
-
-      if (_M_ctype.is(_CtypeT::digit, __c))
-	{
-	  _M_token = _S_token_dup_count;
-	  _M_value.assign(1, __c);
-	  while (_M_current != _M_end
-		 && _M_ctype.is(_CtypeT::digit, *_M_current))
-	    _M_value += *_M_current++;
-	}
-      else if (__c == ',')
-	_M_token = _S_token_comma;
-      // basic use \}.
-      else if (_M_is_basic())
-	{
-	  if (__c == '\\' && _M_current != _M_end && *_M_current == '}')
-	    {
-	      _M_state = _S_state_normal;
-	      _M_token = _S_token_interval_end;
-	      ++_M_current;
-	    }
-	  else
-	    __throw_regex_error(regex_constants::error_badbrace);
-	}
-      else if (__c == '}')
-	{
-	  _M_state = _S_state_normal;
-	  _M_token = _S_token_interval_end;
-	}
-      else
-	__throw_regex_error(regex_constants::error_badbrace);
-    }
-
-  template<typename _CharT>
-    void
-    _Scanner<_CharT>::
-    _M_eat_escape_ecma()
-    {
-      if (_M_current == _M_end)
-	__throw_regex_error(regex_constants::error_escape);
-
-      auto __c = *_M_current++;
-      auto __pos = _M_find_escape(_M_ctype.narrow(__c, '\0'));
-
-      if (__pos != nullptr && (__c != 'b' || _M_state == _S_state_in_bracket))
-	{
-	  _M_token = _S_token_ord_char;
-	  _M_value.assign(1, *__pos);
-	}
-      else if (__c == 'b')
-	{
-	  _M_token = _S_token_word_bound;
-	  _M_value.assign(1, 'p');
-	}
-      else if (__c == 'B')
-	{
-	  _M_token = _S_token_word_bound;
-	  _M_value.assign(1, 'n');
-	}
-      // N3376 28.13
-      else if (__c == 'd'
-	       || __c == 'D'
-	       || __c == 's'
-	       || __c == 'S'
-	       || __c == 'w'
-	       || __c == 'W')
-	{
-	  _M_token = _S_token_quoted_class;
-	  _M_value.assign(1, __c);
-	}
-      else if (__c == 'c')
-	{
-	  if (_M_current == _M_end)
-	    __throw_regex_error(regex_constants::error_escape);
-	  _M_token = _S_token_ord_char;
-	  _M_value.assign(1, *_M_current++);
-	}
-      else if (__c == 'x' || __c == 'u')
-	{
-	  _M_value.erase();
-	  for (int __i = 0; __i < (__c == 'x' ? 2 : 4); __i++)
-	    {
-	      if (_M_current == _M_end
-		  || !_M_ctype.is(_CtypeT::xdigit, *_M_current))
-		__throw_regex_error(regex_constants::error_escape);
-	      _M_value += *_M_current++;
-	    }
-	  _M_token = _S_token_hex_num;
-	}
-      // ECMAScript recognizes multi-digit back-references.
-      else if (_M_ctype.is(_CtypeT::digit, __c))
-	{
-	  _M_value.assign(1, __c);
-	  while (_M_current != _M_end
-		 && _M_ctype.is(_CtypeT::digit, *_M_current))
-	    _M_value += *_M_current++;
-	  _M_token = _S_token_backref;
-	}
-      else
-	{
-	  _M_token = _S_token_ord_char;
-	  _M_value.assign(1, __c);
-	}
-    }
-
-  // Differences between styles:
-  // 1) Extended doesn't support backref, but basic does.
-  template<typename _CharT>
-    void
-    _Scanner<_CharT>::
-    _M_eat_escape_posix()
-    {
-      if (_M_current == _M_end)
-	__throw_regex_error(regex_constants::error_escape);
-
-      auto __c = *_M_current;
-      auto __pos = std::strchr(_M_spec_char, _M_ctype.narrow(__c, '\0'));
-
-      if (__pos != nullptr && *__pos != '\0')
-	{
-	  _M_token = _S_token_ord_char;
-	  _M_value.assign(1, __c);
-	}
-      // We MUST judge awk before handling backrefs. There's no backref in awk.
-      else if (_M_is_awk())
-	{
-	  _M_eat_escape_awk();
-	  return;
-	}
-      else if (_M_is_basic() && _M_ctype.is(_CtypeT::digit, __c) && __c != '0')
-	{
-	  _M_token = _S_token_backref;
-	  _M_value.assign(1, __c);
-	}
-      else
-	{
-#ifdef __STRICT_ANSI__
-	  // POSIX says it is undefined to escape ordinary characters
-	  __throw_regex_error(regex_constants::error_escape);
-#else
-	  _M_token = _S_token_ord_char;
-	  _M_value.assign(1, __c);
-#endif
-	}
-      ++_M_current;
-    }
-
-  template<typename _CharT>
-    void
-    _Scanner<_CharT>::
-    _M_eat_escape_awk()
-    {
-      auto __c = *_M_current++;
-      auto __pos = _M_find_escape(_M_ctype.narrow(__c, '\0'));
-
-      if (__pos != nullptr)
-	{
-	  _M_token = _S_token_ord_char;
-	  _M_value.assign(1, *__pos);
-	}
-      // \ddd for oct representation
-      else if (_M_ctype.is(_CtypeT::digit, __c)
-	       && __c != '8'
-	       && __c != '9')
-	{
-	  _M_value.assign(1,  __c);
-	  for (int __i = 0;
-	       __i < 2
-	       && _M_current != _M_end
-	       && _M_ctype.is(_CtypeT::digit, *_M_current)
-	       && *_M_current != '8'
-	       && *_M_current != '9';
-	       __i++)
-	    _M_value += *_M_current++;
-	  _M_token = _S_token_oct_num;
-	  return;
-	}
-      else
-	__throw_regex_error(regex_constants::error_escape);
-    }
-
-  // Eats a character class or throws an exception.
-  // __ch could be ':', '.' or '=', _M_current is the char after ']' when
-  // returning.
-  template<typename _CharT>
-    void
-    _Scanner<_CharT>::
-    _M_eat_class(char __ch)
-    {
-      for (_M_value.clear(); _M_current != _M_end && *_M_current != __ch;)
-	_M_value += *_M_current++;
-      if (_M_current == _M_end
-	  || *_M_current++ != __ch
-	  || _M_current == _M_end // skip __ch
-	  || *_M_current++ != ']') // skip ']'
-	{
-	  if (__ch == ':')
-	    __throw_regex_error(regex_constants::error_ctype);
-	  else
-	    __throw_regex_error(regex_constants::error_collate);
-	}
-    }
-
-#ifdef _GLIBCXX_DEBUG
-  template<typename _CharT>
-    std::ostream&
-    _Scanner<_CharT>::
-    _M_print(std::ostream& ostr)
-    {
-      switch (_M_token)
-      {
-      case _S_token_anychar:
-	ostr << "any-character\n";
-	break;
-      case _S_token_backref:
-	ostr << "backref\n";
-	break;
-      case _S_token_bracket_begin:
-	ostr << "bracket-begin\n";
-	break;
-      case _S_token_bracket_neg_begin:
-	ostr << "bracket-neg-begin\n";
-	break;
-      case _S_token_bracket_end:
-	ostr << "bracket-end\n";
-	break;
-      case _S_token_char_class_name:
-	ostr << "char-class-name \"" << _M_value << "\"\n";
-	break;
-      case _S_token_closure0:
-	ostr << "closure0\n";
-	break;
-      case _S_token_closure1:
-	ostr << "closure1\n";
-	break;
-      case _S_token_collsymbol:
-	ostr << "collsymbol \"" << _M_value << "\"\n";
-	break;
-      case _S_token_comma:
-	ostr << "comma\n";
-	break;
-      case _S_token_dup_count:
-	ostr << "dup count: " << _M_value << "\n";
-	break;
-      case _S_token_eof:
-	ostr << "EOF\n";
-	break;
-      case _S_token_equiv_class_name:
-	ostr << "equiv-class-name \"" << _M_value << "\"\n";
-	break;
-      case _S_token_interval_begin:
-	ostr << "interval begin\n";
-	break;
-      case _S_token_interval_end:
-	ostr << "interval end\n";
-	break;
-      case _S_token_line_begin:
-	ostr << "line begin\n";
-	break;
-      case _S_token_line_end:
-	ostr << "line end\n";
-	break;
-      case _S_token_opt:
-	ostr << "opt\n";
-	break;
-      case _S_token_or:
-	ostr << "or\n";
-	break;
-      case _S_token_ord_char:
-	ostr << "ordinary character: \"" << _M_value << "\"\n";
-	break;
-      case _S_token_subexpr_begin:
-	ostr << "subexpr begin\n";
-	break;
-      case _S_token_subexpr_no_group_begin:
-	ostr << "no grouping subexpr begin\n";
-	break;
-      case _S_token_subexpr_lookahead_begin:
-	ostr << "lookahead subexpr begin\n";
-	break;
-      case _S_token_subexpr_end:
-	ostr << "subexpr end\n";
-	break;
-      case _S_token_unknown:
-	ostr << "-- unknown token --\n";
-	break;
-      case _S_token_oct_num:
-	ostr << "oct number " << _M_value << "\n";
-	break;
-      case _S_token_hex_num:
-	ostr << "hex number " << _M_value << "\n";
-	break;
-      case _S_token_quoted_class:
-	ostr << "quoted class " << "\\" << _M_value << "\n";
-	break;
-      default:
-	_GLIBCXX_DEBUG_ASSERT(false);
-      }
-      return ostr;
-    }
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __detail
-} // namespace
diff --git a/openflow/usr/include/c++/5/bits/shared_ptr.h b/openflow/usr/include/c++/5/bits/shared_ptr.h
deleted file mode 100644
index 26a0ad3..0000000
--- a/openflow/usr/include/c++/5/bits/shared_ptr.h
+++ /dev/null
@@ -1,654 +0,0 @@
-// shared_ptr and weak_ptr implementation -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// GCC Note: Based on files from version 1.32.0 of the Boost library.
-
-//  shared_count.hpp
-//  Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
-
-//  shared_ptr.hpp
-//  Copyright (C) 1998, 1999 Greg Colvin and Beman Dawes.
-//  Copyright (C) 2001, 2002, 2003 Peter Dimov
-
-//  weak_ptr.hpp
-//  Copyright (C) 2001, 2002, 2003 Peter Dimov
-
-//  enable_shared_from_this.hpp
-//  Copyright (C) 2002 Peter Dimov
-
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-/** @file bits/shared_ptr.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _SHARED_PTR_H
-#define _SHARED_PTR_H 1
-
-#include <bits/shared_ptr_base.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup pointer_abstractions
-   * @{
-   */
-
-  /// 20.7.2.2.11 shared_ptr I/O
-  template<typename _Ch, typename _Tr, typename _Tp, _Lock_policy _Lp>
-    inline std::basic_ostream<_Ch, _Tr>&
-    operator<<(std::basic_ostream<_Ch, _Tr>& __os,
-	       const __shared_ptr<_Tp, _Lp>& __p)
-    {
-      __os << __p.get();
-      return __os;
-    }
-
-  /// 20.7.2.2.10 shared_ptr get_deleter
-  template<typename _Del, typename _Tp, _Lock_policy _Lp>
-    inline _Del*
-    get_deleter(const __shared_ptr<_Tp, _Lp>& __p) noexcept
-    {
-#if __cpp_rtti
-      return static_cast<_Del*>(__p._M_get_deleter(typeid(_Del)));
-#else
-      return 0;
-#endif
-    }
-
-
-  /**
-   *  @brief  A smart pointer with reference-counted copy semantics.
-   *
-   *  The object pointed to is deleted when the last shared_ptr pointing to
-   *  it is destroyed or reset.
-  */
-  template<typename _Tp>
-    class shared_ptr : public __shared_ptr<_Tp>
-    {
-      template<typename _Ptr>
-	using _Convertible
-	  = typename enable_if<is_convertible<_Ptr, _Tp*>::value>::type;
-
-    public:
-      /**
-       *  @brief  Construct an empty %shared_ptr.
-       *  @post   use_count()==0 && get()==0
-       */
-      constexpr shared_ptr() noexcept
-      : __shared_ptr<_Tp>() { }
-
-      shared_ptr(const shared_ptr&) noexcept = default;
-
-      /**
-       *  @brief  Construct a %shared_ptr that owns the pointer @a __p.
-       *  @param  __p  A pointer that is convertible to element_type*.
-       *  @post   use_count() == 1 && get() == __p
-       *  @throw  std::bad_alloc, in which case @c delete @a __p is called.
-       */
-      template<typename _Tp1>
-	explicit shared_ptr(_Tp1* __p)
-        : __shared_ptr<_Tp>(__p) { }
-
-      /**
-       *  @brief  Construct a %shared_ptr that owns the pointer @a __p
-       *          and the deleter @a __d.
-       *  @param  __p  A pointer.
-       *  @param  __d  A deleter.
-       *  @post   use_count() == 1 && get() == __p
-       *  @throw  std::bad_alloc, in which case @a __d(__p) is called.
-       *
-       *  Requirements: _Deleter's copy constructor and destructor must
-       *  not throw
-       *
-       *  __shared_ptr will release __p by calling __d(__p)
-       */
-      template<typename _Tp1, typename _Deleter>
-	shared_ptr(_Tp1* __p, _Deleter __d)
-        : __shared_ptr<_Tp>(__p, __d) { }
-
-      /**
-       *  @brief  Construct a %shared_ptr that owns a null pointer
-       *          and the deleter @a __d.
-       *  @param  __p  A null pointer constant.
-       *  @param  __d  A deleter.
-       *  @post   use_count() == 1 && get() == __p
-       *  @throw  std::bad_alloc, in which case @a __d(__p) is called.
-       *
-       *  Requirements: _Deleter's copy constructor and destructor must
-       *  not throw
-       *
-       *  The last owner will call __d(__p)
-       */
-      template<typename _Deleter>
-	shared_ptr(nullptr_t __p, _Deleter __d)
-        : __shared_ptr<_Tp>(__p, __d) { }
-
-      /**
-       *  @brief  Construct a %shared_ptr that owns the pointer @a __p
-       *          and the deleter @a __d.
-       *  @param  __p  A pointer.
-       *  @param  __d  A deleter.
-       *  @param  __a  An allocator.
-       *  @post   use_count() == 1 && get() == __p
-       *  @throw  std::bad_alloc, in which case @a __d(__p) is called.
-       *
-       *  Requirements: _Deleter's copy constructor and destructor must
-       *  not throw _Alloc's copy constructor and destructor must not
-       *  throw.
-       *
-       *  __shared_ptr will release __p by calling __d(__p)
-       */
-      template<typename _Tp1, typename _Deleter, typename _Alloc>
-	shared_ptr(_Tp1* __p, _Deleter __d, _Alloc __a)
-	: __shared_ptr<_Tp>(__p, __d, std::move(__a)) { }
-
-      /**
-       *  @brief  Construct a %shared_ptr that owns a null pointer
-       *          and the deleter @a __d.
-       *  @param  __p  A null pointer constant.
-       *  @param  __d  A deleter.
-       *  @param  __a  An allocator.
-       *  @post   use_count() == 1 && get() == __p
-       *  @throw  std::bad_alloc, in which case @a __d(__p) is called.
-       *
-       *  Requirements: _Deleter's copy constructor and destructor must
-       *  not throw _Alloc's copy constructor and destructor must not
-       *  throw.
-       *
-       *  The last owner will call __d(__p)
-       */
-      template<typename _Deleter, typename _Alloc>
-	shared_ptr(nullptr_t __p, _Deleter __d, _Alloc __a)
-	: __shared_ptr<_Tp>(__p, __d, std::move(__a)) { }
-
-      // Aliasing constructor
-
-      /**
-       *  @brief  Constructs a %shared_ptr instance that stores @a __p
-       *          and shares ownership with @a __r.
-       *  @param  __r  A %shared_ptr.
-       *  @param  __p  A pointer that will remain valid while @a *__r is valid.
-       *  @post   get() == __p && use_count() == __r.use_count()
-       *
-       *  This can be used to construct a @c shared_ptr to a sub-object
-       *  of an object managed by an existing @c shared_ptr.
-       *
-       * @code
-       * shared_ptr< pair<int,int> > pii(new pair<int,int>());
-       * shared_ptr<int> pi(pii, &pii->first);
-       * assert(pii.use_count() == 2);
-       * @endcode
-       */
-      template<typename _Tp1>
-	shared_ptr(const shared_ptr<_Tp1>& __r, _Tp* __p) noexcept
-	: __shared_ptr<_Tp>(__r, __p) { }
-
-      /**
-       *  @brief  If @a __r is empty, constructs an empty %shared_ptr;
-       *          otherwise construct a %shared_ptr that shares ownership
-       *          with @a __r.
-       *  @param  __r  A %shared_ptr.
-       *  @post   get() == __r.get() && use_count() == __r.use_count()
-       */
-      template<typename _Tp1, typename = _Convertible<_Tp1*>>
-	shared_ptr(const shared_ptr<_Tp1>& __r) noexcept
-        : __shared_ptr<_Tp>(__r) { }
-
-      /**
-       *  @brief  Move-constructs a %shared_ptr instance from @a __r.
-       *  @param  __r  A %shared_ptr rvalue.
-       *  @post   *this contains the old value of @a __r, @a __r is empty.
-       */
-      shared_ptr(shared_ptr&& __r) noexcept
-      : __shared_ptr<_Tp>(std::move(__r)) { }
-
-      /**
-       *  @brief  Move-constructs a %shared_ptr instance from @a __r.
-       *  @param  __r  A %shared_ptr rvalue.
-       *  @post   *this contains the old value of @a __r, @a __r is empty.
-       */
-      template<typename _Tp1, typename = _Convertible<_Tp1*>>
-	shared_ptr(shared_ptr<_Tp1>&& __r) noexcept
-	: __shared_ptr<_Tp>(std::move(__r)) { }
-
-      /**
-       *  @brief  Constructs a %shared_ptr that shares ownership with @a __r
-       *          and stores a copy of the pointer stored in @a __r.
-       *  @param  __r  A weak_ptr.
-       *  @post   use_count() == __r.use_count()
-       *  @throw  bad_weak_ptr when __r.expired(),
-       *          in which case the constructor has no effect.
-       */
-      template<typename _Tp1>
-	explicit shared_ptr(const weak_ptr<_Tp1>& __r)
-	: __shared_ptr<_Tp>(__r) { }
-
-#if _GLIBCXX_USE_DEPRECATED
-      template<typename _Tp1>
-	shared_ptr(std::auto_ptr<_Tp1>&& __r);
-#endif
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2399. shared_ptr's constructor from unique_ptr should be constrained
-      template<typename _Tp1, typename _Del, typename
-	       = _Convertible<typename unique_ptr<_Tp1, _Del>::pointer>>
-	shared_ptr(std::unique_ptr<_Tp1, _Del>&& __r)
-	: __shared_ptr<_Tp>(std::move(__r)) { }
-
-      /**
-       *  @brief  Construct an empty %shared_ptr.
-       *  @post   use_count() == 0 && get() == nullptr
-       */
-      constexpr shared_ptr(nullptr_t) noexcept : shared_ptr() { }
-
-      shared_ptr& operator=(const shared_ptr&) noexcept = default;
-
-      template<typename _Tp1>
-	shared_ptr&
-	operator=(const shared_ptr<_Tp1>& __r) noexcept
-	{
-	  this->__shared_ptr<_Tp>::operator=(__r);
-	  return *this;
-	}
-
-#if _GLIBCXX_USE_DEPRECATED
-      template<typename _Tp1>
-	shared_ptr&
-	operator=(std::auto_ptr<_Tp1>&& __r)
-	{
-	  this->__shared_ptr<_Tp>::operator=(std::move(__r));
-	  return *this;
-	}
-#endif
-
-      shared_ptr&
-      operator=(shared_ptr&& __r) noexcept
-      {
-	this->__shared_ptr<_Tp>::operator=(std::move(__r));
-	return *this;
-      }
-
-      template<class _Tp1>
-	shared_ptr&
-	operator=(shared_ptr<_Tp1>&& __r) noexcept
-	{
-	  this->__shared_ptr<_Tp>::operator=(std::move(__r));
-	  return *this;
-	}
-
-      template<typename _Tp1, typename _Del>
-	shared_ptr&
-	operator=(std::unique_ptr<_Tp1, _Del>&& __r)
-	{
-	  this->__shared_ptr<_Tp>::operator=(std::move(__r));
-	  return *this;
-	}
-
-    private:
-      // This constructor is non-standard, it is used by allocate_shared.
-      template<typename _Alloc, typename... _Args>
-	shared_ptr(_Sp_make_shared_tag __tag, const _Alloc& __a,
-		   _Args&&... __args)
-	: __shared_ptr<_Tp>(__tag, __a, std::forward<_Args>(__args)...)
-	{ }
-
-      template<typename _Tp1, typename _Alloc, typename... _Args>
-	friend shared_ptr<_Tp1>
-	allocate_shared(const _Alloc& __a, _Args&&... __args);
-
-      // This constructor is non-standard, it is used by weak_ptr::lock().
-      shared_ptr(const weak_ptr<_Tp>& __r, std::nothrow_t)
-      : __shared_ptr<_Tp>(__r, std::nothrow) { }
-
-      friend class weak_ptr<_Tp>;
-    };
-
-  // 20.7.2.2.7 shared_ptr comparisons
-  template<typename _Tp1, typename _Tp2>
-    inline bool
-    operator==(const shared_ptr<_Tp1>& __a,
-	       const shared_ptr<_Tp2>& __b) noexcept
-    { return __a.get() == __b.get(); }
-
-  template<typename _Tp>
-    inline bool
-    operator==(const shared_ptr<_Tp>& __a, nullptr_t) noexcept
-    { return !__a; }
-
-  template<typename _Tp>
-    inline bool
-    operator==(nullptr_t, const shared_ptr<_Tp>& __a) noexcept
-    { return !__a; }
-
-  template<typename _Tp1, typename _Tp2>
-    inline bool
-    operator!=(const shared_ptr<_Tp1>& __a,
-	       const shared_ptr<_Tp2>& __b) noexcept
-    { return __a.get() != __b.get(); }
-
-  template<typename _Tp>
-    inline bool
-    operator!=(const shared_ptr<_Tp>& __a, nullptr_t) noexcept
-    { return (bool)__a; }
-
-  template<typename _Tp>
-    inline bool
-    operator!=(nullptr_t, const shared_ptr<_Tp>& __a) noexcept
-    { return (bool)__a; }
-
-  template<typename _Tp1, typename _Tp2>
-    inline bool
-    operator<(const shared_ptr<_Tp1>& __a,
-	      const shared_ptr<_Tp2>& __b) noexcept
-    {
-      typedef typename std::common_type<_Tp1*, _Tp2*>::type _CT;
-      return std::less<_CT>()(__a.get(), __b.get());
-    }
-
-  template<typename _Tp>
-    inline bool
-    operator<(const shared_ptr<_Tp>& __a, nullptr_t) noexcept
-    { return std::less<_Tp*>()(__a.get(), nullptr); }
-
-  template<typename _Tp>
-    inline bool
-    operator<(nullptr_t, const shared_ptr<_Tp>& __a) noexcept
-    { return std::less<_Tp*>()(nullptr, __a.get()); }
-
-  template<typename _Tp1, typename _Tp2>
-    inline bool
-    operator<=(const shared_ptr<_Tp1>& __a,
-	       const shared_ptr<_Tp2>& __b) noexcept
-    { return !(__b < __a); }
-
-  template<typename _Tp>
-    inline bool
-    operator<=(const shared_ptr<_Tp>& __a, nullptr_t) noexcept
-    { return !(nullptr < __a); }
-
-  template<typename _Tp>
-    inline bool
-    operator<=(nullptr_t, const shared_ptr<_Tp>& __a) noexcept
-    { return !(__a < nullptr); }
-
-  template<typename _Tp1, typename _Tp2>
-    inline bool
-    operator>(const shared_ptr<_Tp1>& __a,
-	      const shared_ptr<_Tp2>& __b) noexcept
-    { return (__b < __a); }
-
-  template<typename _Tp>
-    inline bool
-    operator>(const shared_ptr<_Tp>& __a, nullptr_t) noexcept
-    { return std::less<_Tp*>()(nullptr, __a.get()); }
-
-  template<typename _Tp>
-    inline bool
-    operator>(nullptr_t, const shared_ptr<_Tp>& __a) noexcept
-    { return std::less<_Tp*>()(__a.get(), nullptr); }
-
-  template<typename _Tp1, typename _Tp2>
-    inline bool
-    operator>=(const shared_ptr<_Tp1>& __a,
-	       const shared_ptr<_Tp2>& __b) noexcept
-    { return !(__a < __b); }
-
-  template<typename _Tp>
-    inline bool
-    operator>=(const shared_ptr<_Tp>& __a, nullptr_t) noexcept
-    { return !(__a < nullptr); }
-
-  template<typename _Tp>
-    inline bool
-    operator>=(nullptr_t, const shared_ptr<_Tp>& __a) noexcept
-    { return !(nullptr < __a); }
-
-  template<typename _Tp>
-    struct less<shared_ptr<_Tp>> : public _Sp_less<shared_ptr<_Tp>>
-    { };
-
-  // 20.7.2.2.8 shared_ptr specialized algorithms.
-  template<typename _Tp>
-    inline void
-    swap(shared_ptr<_Tp>& __a, shared_ptr<_Tp>& __b) noexcept
-    { __a.swap(__b); }
-
-  // 20.7.2.2.9 shared_ptr casts.
-  template<typename _Tp, typename _Tp1>
-    inline shared_ptr<_Tp>
-    static_pointer_cast(const shared_ptr<_Tp1>& __r) noexcept
-    { return shared_ptr<_Tp>(__r, static_cast<_Tp*>(__r.get())); }
-
-  template<typename _Tp, typename _Tp1>
-    inline shared_ptr<_Tp>
-    const_pointer_cast(const shared_ptr<_Tp1>& __r) noexcept
-    { return shared_ptr<_Tp>(__r, const_cast<_Tp*>(__r.get())); }
-
-  template<typename _Tp, typename _Tp1>
-    inline shared_ptr<_Tp>
-    dynamic_pointer_cast(const shared_ptr<_Tp1>& __r) noexcept
-    {
-      if (_Tp* __p = dynamic_cast<_Tp*>(__r.get()))
-	return shared_ptr<_Tp>(__r, __p);
-      return shared_ptr<_Tp>();
-    }
-
-
-  /**
-   *  @brief  A smart pointer with weak semantics.
-   *
-   *  With forwarding constructors and assignment operators.
-   */
-  template<typename _Tp>
-    class weak_ptr : public __weak_ptr<_Tp>
-    {
-      template<typename _Ptr>
-	using _Convertible
-	  = typename enable_if<is_convertible<_Ptr, _Tp*>::value>::type;
-
-    public:
-      constexpr weak_ptr() noexcept = default;
-
-      template<typename _Tp1, typename = _Convertible<_Tp1*>>
-	weak_ptr(const shared_ptr<_Tp1>& __r) noexcept
-	: __weak_ptr<_Tp>(__r) { }
-
-      weak_ptr(const weak_ptr&) noexcept = default;
-
-      template<typename _Tp1, typename = _Convertible<_Tp1*>>
-	weak_ptr(const weak_ptr<_Tp1>& __r) noexcept
-	: __weak_ptr<_Tp>(__r) { }
-
-      weak_ptr(weak_ptr&&) noexcept = default;
-
-      template<typename _Tp1, typename = _Convertible<_Tp1*>>
-	weak_ptr(weak_ptr<_Tp1>&& __r) noexcept
-	: __weak_ptr<_Tp>(std::move(__r)) { }
-
-      weak_ptr&
-      operator=(const weak_ptr& __r) noexcept = default;
-
-      template<typename _Tp1>
-	weak_ptr&
-	operator=(const weak_ptr<_Tp1>& __r) noexcept
-	{
-	  this->__weak_ptr<_Tp>::operator=(__r);
-	  return *this;
-	}
-
-      template<typename _Tp1>
-	weak_ptr&
-	operator=(const shared_ptr<_Tp1>& __r) noexcept
-	{
-	  this->__weak_ptr<_Tp>::operator=(__r);
-	  return *this;
-	}
-
-      weak_ptr&
-      operator=(weak_ptr&& __r) noexcept = default;
-
-      template<typename _Tp1>
-	weak_ptr&
-	operator=(weak_ptr<_Tp1>&& __r) noexcept
-	{
-	  this->__weak_ptr<_Tp>::operator=(std::move(__r));
-	  return *this;
-	}
-
-      shared_ptr<_Tp>
-      lock() const noexcept
-      { return shared_ptr<_Tp>(*this, std::nothrow); }
-    };
-
-  // 20.7.2.3.6 weak_ptr specialized algorithms.
-  template<typename _Tp>
-    inline void
-    swap(weak_ptr<_Tp>& __a, weak_ptr<_Tp>& __b) noexcept
-    { __a.swap(__b); }
-
-
-  /// Primary template owner_less
-  template<typename _Tp>
-    struct owner_less;
-
-  /// Partial specialization of owner_less for shared_ptr.
-  template<typename _Tp>
-    struct owner_less<shared_ptr<_Tp>>
-    : public _Sp_owner_less<shared_ptr<_Tp>, weak_ptr<_Tp>>
-    { };
-
-  /// Partial specialization of owner_less for weak_ptr.
-  template<typename _Tp>
-    struct owner_less<weak_ptr<_Tp>>
-    : public _Sp_owner_less<weak_ptr<_Tp>, shared_ptr<_Tp>>
-    { };
-
-  /**
-   *  @brief Base class allowing use of member function shared_from_this.
-   */
-  template<typename _Tp>
-    class enable_shared_from_this
-    {
-    protected:
-      constexpr enable_shared_from_this() noexcept { }
-
-      enable_shared_from_this(const enable_shared_from_this&) noexcept { }
-
-      enable_shared_from_this&
-      operator=(const enable_shared_from_this&) noexcept
-      { return *this; }
-
-      ~enable_shared_from_this() { }
-
-    public:
-      shared_ptr<_Tp>
-      shared_from_this()
-      { return shared_ptr<_Tp>(this->_M_weak_this); }
-
-      shared_ptr<const _Tp>
-      shared_from_this() const
-      { return shared_ptr<const _Tp>(this->_M_weak_this); }
-
-    private:
-      template<typename _Tp1>
-	void
-	_M_weak_assign(_Tp1* __p, const __shared_count<>& __n) const noexcept
-	{ _M_weak_this._M_assign(__p, __n); }
-
-      template<typename _Tp1, typename _Tp2>
-	friend void
-	__enable_shared_from_this_helper(const __shared_count<>&,
-					 const enable_shared_from_this<_Tp1>*,
-					 const _Tp2*) noexcept;
-
-      mutable weak_ptr<_Tp>  _M_weak_this;
-    };
-
-  template<typename _Tp1, typename _Tp2>
-    inline void
-    __enable_shared_from_this_helper(const __shared_count<>& __pn,
-				     const enable_shared_from_this<_Tp1>*
-				     __pe, const _Tp2* __px) noexcept
-    {
-      if (__pe != nullptr)
-	__pe->_M_weak_assign(const_cast<_Tp2*>(__px), __pn);
-    }
-
-  /**
-   *  @brief  Create an object that is owned by a shared_ptr.
-   *  @param  __a     An allocator.
-   *  @param  __args  Arguments for the @a _Tp object's constructor.
-   *  @return A shared_ptr that owns the newly created object.
-   *  @throw  An exception thrown from @a _Alloc::allocate or from the
-   *          constructor of @a _Tp.
-   *
-   *  A copy of @a __a will be used to allocate memory for the shared_ptr
-   *  and the new object.
-   */
-  template<typename _Tp, typename _Alloc, typename... _Args>
-    inline shared_ptr<_Tp>
-    allocate_shared(const _Alloc& __a, _Args&&... __args)
-    {
-      return shared_ptr<_Tp>(_Sp_make_shared_tag(), __a,
-			     std::forward<_Args>(__args)...);
-    }
-
-  /**
-   *  @brief  Create an object that is owned by a shared_ptr.
-   *  @param  __args  Arguments for the @a _Tp object's constructor.
-   *  @return A shared_ptr that owns the newly created object.
-   *  @throw  std::bad_alloc, or an exception thrown from the
-   *          constructor of @a _Tp.
-   */
-  template<typename _Tp, typename... _Args>
-    inline shared_ptr<_Tp>
-    make_shared(_Args&&... __args)
-    {
-      typedef typename std::remove_const<_Tp>::type _Tp_nc;
-      return std::allocate_shared<_Tp>(std::allocator<_Tp_nc>(),
-				       std::forward<_Args>(__args)...);
-    }
-
-  /// std::hash specialization for shared_ptr.
-  template<typename _Tp>
-    struct hash<shared_ptr<_Tp>>
-    : public __hash_base<size_t, shared_ptr<_Tp>>
-    {
-      size_t
-      operator()(const shared_ptr<_Tp>& __s) const noexcept
-      { return std::hash<_Tp*>()(__s.get()); }
-    };
-
-  // @} group pointer_abstractions
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // _SHARED_PTR_H
diff --git a/openflow/usr/include/c++/5/bits/shared_ptr_atomic.h b/openflow/usr/include/c++/5/bits/shared_ptr_atomic.h
deleted file mode 100644
index 9eec3e0..0000000
--- a/openflow/usr/include/c++/5/bits/shared_ptr_atomic.h
+++ /dev/null
@@ -1,330 +0,0 @@
-// shared_ptr atomic access -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/shared_ptr_atomic.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _SHARED_PTR_ATOMIC_H
-#define _SHARED_PTR_ATOMIC_H 1
-
-#include <bits/atomic_base.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup pointer_abstractions
-   * @{
-   */
-
-  struct _Sp_locker
-  {
-    _Sp_locker(const _Sp_locker&) = delete;
-    _Sp_locker& operator=(const _Sp_locker&) = delete;
-
-#ifdef __GTHREADS
-    explicit
-    _Sp_locker(const void*) noexcept;
-    _Sp_locker(const void*, const void*) noexcept;
-    ~_Sp_locker();
-
-  private:
-    unsigned char _M_key1;
-    unsigned char _M_key2;
-#else
-    explicit _Sp_locker(const void*, const void* = nullptr) { }
-#endif
-  };
-
-  /**
-   *  @brief  Report whether shared_ptr atomic operations are lock-free.
-   *  @param  __p A non-null pointer to a shared_ptr object.
-   *  @return True if atomic access to @c *__p is lock-free, false otherwise.
-   *  @{
-  */
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    atomic_is_lock_free(const __shared_ptr<_Tp, _Lp>* __p)
-    {
-#ifdef __GTHREADS
-      return __gthread_active_p() == 0;
-#else
-      return true;
-#endif
-    }
-
-  template<typename _Tp>
-    inline bool
-    atomic_is_lock_free(const shared_ptr<_Tp>* __p)
-    { return std::atomic_is_lock_free<_Tp, __default_lock_policy>(__p); }
-
-  // @}
-
-  /**
-   *  @brief  Atomic load for shared_ptr objects.
-   *  @param  __p A non-null pointer to a shared_ptr object.
-   *  @return @c *__p
-   *
-   *  The memory order shall not be @c memory_order_release or
-   *  @c memory_order_acq_rel.
-   *  @{
-  */
-  template<typename _Tp>
-    inline shared_ptr<_Tp>
-    atomic_load_explicit(const shared_ptr<_Tp>* __p, memory_order)
-    {
-      _Sp_locker __lock{__p};
-      return *__p;
-    }
-
-  template<typename _Tp>
-    inline shared_ptr<_Tp>
-    atomic_load(const shared_ptr<_Tp>* __p)
-    { return std::atomic_load_explicit(__p, memory_order_seq_cst); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline __shared_ptr<_Tp, _Lp>
-    atomic_load_explicit(const __shared_ptr<_Tp, _Lp>* __p, memory_order)
-    {
-      _Sp_locker __lock{__p};
-      return *__p;
-    }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline __shared_ptr<_Tp, _Lp>
-    atomic_load(const __shared_ptr<_Tp, _Lp>* __p)
-    { return std::atomic_load_explicit(__p, memory_order_seq_cst); }
-  // @}
-
-  /**
-   *  @brief  Atomic store for shared_ptr objects.
-   *  @param  __p A non-null pointer to a shared_ptr object.
-   *  @param  __r The value to store.
-   *
-   *  The memory order shall not be @c memory_order_acquire or
-   *  @c memory_order_acq_rel.
-   *  @{
-  */
-  template<typename _Tp>
-    inline void
-    atomic_store_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r,
-			  memory_order)
-    {
-      _Sp_locker __lock{__p};
-      __p->swap(__r); // use swap so that **__p not destroyed while lock held
-    }
-
-  template<typename _Tp>
-    inline void
-    atomic_store(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r)
-    { std::atomic_store_explicit(__p, std::move(__r), memory_order_seq_cst); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline void
-    atomic_store_explicit(__shared_ptr<_Tp, _Lp>* __p,
-			  __shared_ptr<_Tp, _Lp> __r,
-			  memory_order)
-    {
-      _Sp_locker __lock{__p};
-      __p->swap(__r); // use swap so that **__p not destroyed while lock held
-    }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline void
-    atomic_store(__shared_ptr<_Tp, _Lp>* __p, __shared_ptr<_Tp, _Lp> __r)
-    { std::atomic_store_explicit(__p, std::move(__r), memory_order_seq_cst); }
-  // @}
-
-  /**
-   *  @brief  Atomic exchange for shared_ptr objects.
-   *  @param  __p A non-null pointer to a shared_ptr object.
-   *  @param  __r New value to store in @c *__p.
-   *  @return The original value of @c *__p
-   *  @{
-  */
-  template<typename _Tp>
-    inline shared_ptr<_Tp>
-    atomic_exchange_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r,
-			     memory_order)
-    {
-      _Sp_locker __lock{__p};
-      __p->swap(__r);
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline shared_ptr<_Tp>
-    atomic_exchange(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r)
-    {
-      return std::atomic_exchange_explicit(__p, std::move(__r),
-					   memory_order_seq_cst);
-    }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline __shared_ptr<_Tp, _Lp>
-    atomic_exchange_explicit(__shared_ptr<_Tp, _Lp>* __p,
-			     __shared_ptr<_Tp, _Lp> __r,
-			     memory_order)
-    {
-      _Sp_locker __lock{__p};
-      __p->swap(__r);
-      return __r;
-    }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline __shared_ptr<_Tp, _Lp>
-    atomic_exchange(__shared_ptr<_Tp, _Lp>* __p, __shared_ptr<_Tp, _Lp> __r)
-    {
-      return std::atomic_exchange_explicit(__p, std::move(__r),
-					   memory_order_seq_cst);
-    }
-  // @}
-
-  /**
-   *  @brief  Atomic compare-and-swap for shared_ptr objects.
-   *  @param  __p A non-null pointer to a shared_ptr object.
-   *  @param  __v A non-null pointer to a shared_ptr object.
-   *  @param  __w A non-null pointer to a shared_ptr object.
-   *  @return True if @c *__p was equivalent to @c *__v, false otherwise.
-   *
-   *  The memory order for failure shall not be @c memory_order_release or
-   *  @c memory_order_acq_rel, or stronger than the memory order for success.
-   *  @{
-  */
-  template<typename _Tp>
-    bool
-    atomic_compare_exchange_strong_explicit(shared_ptr<_Tp>* __p,
-					    shared_ptr<_Tp>* __v,
-					    shared_ptr<_Tp> __w,
-					    memory_order,
-					    memory_order)
-    {
-      shared_ptr<_Tp> __x; // goes out of scope after __lock
-      _Sp_locker __lock{__p, __v};
-      owner_less<shared_ptr<_Tp>> __less;
-      if (*__p == *__v && !__less(*__p, *__v) && !__less(*__v, *__p))
-	{
-	  __x = std::move(*__p);
-	  *__p = std::move(__w);
-	  return true;
-	}
-      __x = std::move(*__v);
-      *__v = *__p;
-      return false;
-    }
-
-  template<typename _Tp>
-    inline bool
-    atomic_compare_exchange_strong(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v,
-				 shared_ptr<_Tp> __w)
-    {
-      return std::atomic_compare_exchange_strong_explicit(__p, __v,
-	  std::move(__w), memory_order_seq_cst, memory_order_seq_cst);
-    }
-
-  template<typename _Tp>
-    inline bool
-    atomic_compare_exchange_weak_explicit(shared_ptr<_Tp>* __p,
-					  shared_ptr<_Tp>* __v,
-					  shared_ptr<_Tp> __w,
-					  memory_order __success,
-					  memory_order __failure)
-    {
-      return std::atomic_compare_exchange_strong_explicit(__p, __v,
-	  std::move(__w), __success, __failure);
-    }
-
-  template<typename _Tp>
-    inline bool
-    atomic_compare_exchange_weak(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v,
-				 shared_ptr<_Tp> __w)
-    {
-      return std::atomic_compare_exchange_weak_explicit(__p, __v,
-	  std::move(__w), memory_order_seq_cst, memory_order_seq_cst);
-    }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    bool
-    atomic_compare_exchange_strong_explicit(__shared_ptr<_Tp, _Lp>* __p,
-					    __shared_ptr<_Tp, _Lp>* __v,
-					    __shared_ptr<_Tp, _Lp> __w,
-					    memory_order,
-					    memory_order)
-    {
-      __shared_ptr<_Tp, _Lp> __x; // goes out of scope after __lock
-      _Sp_locker __lock{__p, __v};
-      owner_less<__shared_ptr<_Tp, _Lp>> __less;
-      if (*__p == *__v && !__less(*__p, *__v) && !__less(*__v, *__p))
-	{
-	  __x = std::move(*__p);
-	  *__p = std::move(__w);
-	  return true;
-	}
-      __x = std::move(*__v);
-      *__v = *__p;
-      return false;
-    }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    atomic_compare_exchange_strong(__shared_ptr<_Tp, _Lp>* __p,
-				   __shared_ptr<_Tp, _Lp>* __v,
-				   __shared_ptr<_Tp, _Lp> __w)
-    {
-      return std::atomic_compare_exchange_strong_explicit(__p, __v,
-	  std::move(__w), memory_order_seq_cst, memory_order_seq_cst);
-    }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    atomic_compare_exchange_weak_explicit(__shared_ptr<_Tp, _Lp>* __p,
-					  __shared_ptr<_Tp, _Lp>* __v,
-					  __shared_ptr<_Tp, _Lp> __w,
-					  memory_order __success,
-					  memory_order __failure)
-    {
-      return std::atomic_compare_exchange_strong_explicit(__p, __v,
-	  std::move(__w), __success, __failure);
-    }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    atomic_compare_exchange_weak(__shared_ptr<_Tp, _Lp>* __p,
-				 __shared_ptr<_Tp, _Lp>* __v,
-				 __shared_ptr<_Tp, _Lp> __w)
-    {
-      return std::atomic_compare_exchange_weak_explicit(__p, __v,
-	  std::move(__w), memory_order_seq_cst, memory_order_seq_cst);
-    }
-  // @}
-
-  // @} group pointer_abstractions
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // _SHARED_PTR_ATOMIC_H
diff --git a/openflow/usr/include/c++/5/bits/shared_ptr_base.h b/openflow/usr/include/c++/5/bits/shared_ptr_base.h
deleted file mode 100644
index d71df31..0000000
--- a/openflow/usr/include/c++/5/bits/shared_ptr_base.h
+++ /dev/null
@@ -1,1593 +0,0 @@
-// shared_ptr and weak_ptr implementation details -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// GCC Note: Based on files from version 1.32.0 of the Boost library.
-
-//  shared_count.hpp
-//  Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
-
-//  shared_ptr.hpp
-//  Copyright (C) 1998, 1999 Greg Colvin and Beman Dawes.
-//  Copyright (C) 2001, 2002, 2003 Peter Dimov
-
-//  weak_ptr.hpp
-//  Copyright (C) 2001, 2002, 2003 Peter Dimov
-
-//  enable_shared_from_this.hpp
-//  Copyright (C) 2002 Peter Dimov
-
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-/** @file bits/shared_ptr_base.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _SHARED_PTR_BASE_H
-#define _SHARED_PTR_BASE_H 1
-
-#include <bits/allocated_ptr.h>
-#include <ext/aligned_buffer.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if _GLIBCXX_USE_DEPRECATED
-  template<typename> class auto_ptr;
-#endif
-
- /**
-   *  @brief  Exception possibly thrown by @c shared_ptr.
-   *  @ingroup exceptions
-   */
-  class bad_weak_ptr : public std::exception
-  {
-  public:
-    virtual char const*
-    what() const noexcept;
-
-    virtual ~bad_weak_ptr() noexcept;    
-  };
-
-  // Substitute for bad_weak_ptr object in the case of -fno-exceptions.
-  inline void
-  __throw_bad_weak_ptr()
-  { _GLIBCXX_THROW_OR_ABORT(bad_weak_ptr()); }
-
-  using __gnu_cxx::_Lock_policy;
-  using __gnu_cxx::__default_lock_policy;
-  using __gnu_cxx::_S_single;
-  using __gnu_cxx::_S_mutex;
-  using __gnu_cxx::_S_atomic;
-
-  // Empty helper class except when the template argument is _S_mutex.
-  template<_Lock_policy _Lp>
-    class _Mutex_base
-    {
-    protected:
-      // The atomic policy uses fully-fenced builtins, single doesn't care.
-      enum { _S_need_barriers = 0 };
-    };
-
-  template<>
-    class _Mutex_base<_S_mutex>
-    : public __gnu_cxx::__mutex
-    {
-    protected:
-      // This policy is used when atomic builtins are not available.
-      // The replacement atomic operations might not have the necessary
-      // memory barriers.
-      enum { _S_need_barriers = 1 };
-    };
-
-  template<_Lock_policy _Lp = __default_lock_policy>
-    class _Sp_counted_base
-    : public _Mutex_base<_Lp>
-    {
-    public:  
-      _Sp_counted_base() noexcept
-      : _M_use_count(1), _M_weak_count(1) { }
-      
-      virtual
-      ~_Sp_counted_base() noexcept
-      { }
-  
-      // Called when _M_use_count drops to zero, to release the resources
-      // managed by *this.
-      virtual void
-      _M_dispose() noexcept = 0;
-      
-      // Called when _M_weak_count drops to zero.
-      virtual void
-      _M_destroy() noexcept
-      { delete this; }
-      
-      virtual void*
-      _M_get_deleter(const std::type_info&) noexcept = 0;
-
-      void
-      _M_add_ref_copy()
-      { __gnu_cxx::__atomic_add_dispatch(&_M_use_count, 1); }
-  
-      void
-      _M_add_ref_lock();
-
-      bool
-      _M_add_ref_lock_nothrow();
-
-      void
-      _M_release() noexcept
-      {
-        // Be race-detector-friendly.  For more info see bits/c++config.
-        _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_use_count);
-	if (__gnu_cxx::__exchange_and_add_dispatch(&_M_use_count, -1) == 1)
-	  {
-            _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&_M_use_count);
-	    _M_dispose();
-	    // There must be a memory barrier between dispose() and destroy()
-	    // to ensure that the effects of dispose() are observed in the
-	    // thread that runs destroy().
-	    // See http://gcc.gnu.org/ml/libstdc++/2005-11/msg00136.html
-	    if (_Mutex_base<_Lp>::_S_need_barriers)
-	      {
-	        _GLIBCXX_READ_MEM_BARRIER;
-	        _GLIBCXX_WRITE_MEM_BARRIER;
-	      }
-
-            // Be race-detector-friendly.  For more info see bits/c++config.
-            _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_weak_count);
-	    if (__gnu_cxx::__exchange_and_add_dispatch(&_M_weak_count,
-						       -1) == 1)
-              {
-                _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&_M_weak_count);
-	        _M_destroy();
-              }
-	  }
-      }
-  
-      void
-      _M_weak_add_ref() noexcept
-      { __gnu_cxx::__atomic_add_dispatch(&_M_weak_count, 1); }
-
-      void
-      _M_weak_release() noexcept
-      {
-        // Be race-detector-friendly. For more info see bits/c++config.
-        _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_weak_count);
-	if (__gnu_cxx::__exchange_and_add_dispatch(&_M_weak_count, -1) == 1)
-	  {
-            _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&_M_weak_count);
-	    if (_Mutex_base<_Lp>::_S_need_barriers)
-	      {
-	        // See _M_release(),
-	        // destroy() must observe results of dispose()
-	        _GLIBCXX_READ_MEM_BARRIER;
-	        _GLIBCXX_WRITE_MEM_BARRIER;
-	      }
-	    _M_destroy();
-	  }
-      }
-  
-      long
-      _M_get_use_count() const noexcept
-      {
-        // No memory barrier is used here so there is no synchronization
-        // with other threads.
-        return __atomic_load_n(&_M_use_count, __ATOMIC_RELAXED);
-      }
-
-    private:  
-      _Sp_counted_base(_Sp_counted_base const&) = delete;
-      _Sp_counted_base& operator=(_Sp_counted_base const&) = delete;
-
-      _Atomic_word  _M_use_count;     // #shared
-      _Atomic_word  _M_weak_count;    // #weak + (#shared != 0)
-    };
-
-  template<>
-    inline void
-    _Sp_counted_base<_S_single>::
-    _M_add_ref_lock()
-    {
-      if (_M_use_count == 0)
-	__throw_bad_weak_ptr();
-      ++_M_use_count;
-    }
-
-  template<>
-    inline void
-    _Sp_counted_base<_S_mutex>::
-    _M_add_ref_lock()
-    {
-      __gnu_cxx::__scoped_lock sentry(*this);
-      if (__gnu_cxx::__exchange_and_add_dispatch(&_M_use_count, 1) == 0)
-	{
-	  _M_use_count = 0;
-	  __throw_bad_weak_ptr();
-	}
-    }
-
-  template<> 
-    inline void
-    _Sp_counted_base<_S_atomic>::
-    _M_add_ref_lock()
-    {
-      // Perform lock-free add-if-not-zero operation.
-      _Atomic_word __count = _M_get_use_count();
-      do
-	{
-	  if (__count == 0)
-	    __throw_bad_weak_ptr();
-	  // Replace the current counter value with the old value + 1, as
-	  // long as it's not changed meanwhile. 
-	}
-      while (!__atomic_compare_exchange_n(&_M_use_count, &__count, __count + 1,
-					  true, __ATOMIC_ACQ_REL, 
-					  __ATOMIC_RELAXED));
-    }
-
-  template<>
-    inline bool
-    _Sp_counted_base<_S_single>::
-    _M_add_ref_lock_nothrow()
-    {
-      if (_M_use_count == 0)
-	return false;
-      ++_M_use_count;
-      return true;
-    }
-
-  template<>
-    inline bool
-    _Sp_counted_base<_S_mutex>::
-    _M_add_ref_lock_nothrow()
-    {
-      __gnu_cxx::__scoped_lock sentry(*this);
-      if (__gnu_cxx::__exchange_and_add_dispatch(&_M_use_count, 1) == 0)
-	{
-	  _M_use_count = 0;
-	  return false;
-	}
-      return true;
-    }
-
-  template<>
-    inline bool
-    _Sp_counted_base<_S_atomic>::
-    _M_add_ref_lock_nothrow()
-    {
-      // Perform lock-free add-if-not-zero operation.
-      _Atomic_word __count = _M_get_use_count();
-      do
-	{
-	  if (__count == 0)
-	    return false;
-	  // Replace the current counter value with the old value + 1, as
-	  // long as it's not changed meanwhile.
-	}
-      while (!__atomic_compare_exchange_n(&_M_use_count, &__count, __count + 1,
-					  true, __ATOMIC_ACQ_REL,
-					  __ATOMIC_RELAXED));
-      return true;
-    }
-
-  template<>
-    inline void
-    _Sp_counted_base<_S_single>::_M_add_ref_copy()
-    { ++_M_use_count; }
-
-  template<>
-    inline void
-    _Sp_counted_base<_S_single>::_M_release() noexcept
-    {
-      if (--_M_use_count == 0)
-        {
-          _M_dispose();
-          if (--_M_weak_count == 0)
-            _M_destroy();
-        }
-    }
-
-  template<>
-    inline void
-    _Sp_counted_base<_S_single>::_M_weak_add_ref() noexcept
-    { ++_M_weak_count; }
-
-  template<>
-    inline void
-    _Sp_counted_base<_S_single>::_M_weak_release() noexcept
-    {
-      if (--_M_weak_count == 0)
-        _M_destroy();
-    }
-
-  template<>
-    inline long
-    _Sp_counted_base<_S_single>::_M_get_use_count() const noexcept
-    { return _M_use_count; }
-
-
-  // Forward declarations.
-  template<typename _Tp, _Lock_policy _Lp = __default_lock_policy>
-    class __shared_ptr;
-
-  template<typename _Tp, _Lock_policy _Lp = __default_lock_policy>
-    class __weak_ptr;
-
-  template<typename _Tp, _Lock_policy _Lp = __default_lock_policy>
-    class __enable_shared_from_this;
-
-  template<typename _Tp>
-    class shared_ptr;
-
-  template<typename _Tp>
-    class weak_ptr;
-
-  template<typename _Tp>
-    struct owner_less;
-
-  template<typename _Tp>
-    class enable_shared_from_this;
-
-  template<_Lock_policy _Lp = __default_lock_policy>
-    class __weak_count;
-
-  template<_Lock_policy _Lp = __default_lock_policy>
-    class __shared_count;
-
-
-  // Counted ptr with no deleter or allocator support
-  template<typename _Ptr, _Lock_policy _Lp>
-    class _Sp_counted_ptr final : public _Sp_counted_base<_Lp>
-    {
-    public:
-      explicit
-      _Sp_counted_ptr(_Ptr __p) noexcept
-      : _M_ptr(__p) { }
-
-      virtual void
-      _M_dispose() noexcept
-      { delete _M_ptr; }
-
-      virtual void
-      _M_destroy() noexcept
-      { delete this; }
-
-      virtual void*
-      _M_get_deleter(const std::type_info&) noexcept
-      { return nullptr; }
-
-      _Sp_counted_ptr(const _Sp_counted_ptr&) = delete;
-      _Sp_counted_ptr& operator=(const _Sp_counted_ptr&) = delete;
-
-    private:
-      _Ptr             _M_ptr;
-    };
-
-  template<>
-    inline void
-    _Sp_counted_ptr<nullptr_t, _S_single>::_M_dispose() noexcept { }
-
-  template<>
-    inline void
-    _Sp_counted_ptr<nullptr_t, _S_mutex>::_M_dispose() noexcept { }
-
-  template<>
-    inline void
-    _Sp_counted_ptr<nullptr_t, _S_atomic>::_M_dispose() noexcept { }
-
-  template<int _Nm, typename _Tp,
-	   bool __use_ebo = !__is_final(_Tp) && __is_empty(_Tp)>
-    struct _Sp_ebo_helper;
-
-  /// Specialization using EBO.
-  template<int _Nm, typename _Tp>
-    struct _Sp_ebo_helper<_Nm, _Tp, true> : private _Tp
-    {
-      explicit _Sp_ebo_helper(const _Tp& __tp) : _Tp(__tp) { }
-
-      static _Tp&
-      _S_get(_Sp_ebo_helper& __eboh) { return static_cast<_Tp&>(__eboh); }
-    };
-
-  /// Specialization not using EBO.
-  template<int _Nm, typename _Tp>
-    struct _Sp_ebo_helper<_Nm, _Tp, false>
-    {
-      explicit _Sp_ebo_helper(const _Tp& __tp) : _M_tp(__tp) { }
-
-      static _Tp&
-      _S_get(_Sp_ebo_helper& __eboh)
-      { return __eboh._M_tp; }
-
-    private:
-      _Tp _M_tp;
-    };
-
-  // Support for custom deleter and/or allocator
-  template<typename _Ptr, typename _Deleter, typename _Alloc, _Lock_policy _Lp>
-    class _Sp_counted_deleter final : public _Sp_counted_base<_Lp>
-    {
-      class _Impl : _Sp_ebo_helper<0, _Deleter>, _Sp_ebo_helper<1, _Alloc>
-      {
-	typedef _Sp_ebo_helper<0, _Deleter>	_Del_base;
-	typedef _Sp_ebo_helper<1, _Alloc>	_Alloc_base;
-
-      public:
-	_Impl(_Ptr __p, _Deleter __d, const _Alloc& __a) noexcept
-	: _M_ptr(__p), _Del_base(__d), _Alloc_base(__a)
-	{ }
-
-	_Deleter& _M_del() noexcept { return _Del_base::_S_get(*this); }
-	_Alloc& _M_alloc() noexcept { return _Alloc_base::_S_get(*this); }
-
-	_Ptr _M_ptr;
-      };
-
-    public:
-      using __allocator_type = __alloc_rebind<_Alloc, _Sp_counted_deleter>;
-
-      // __d(__p) must not throw.
-      _Sp_counted_deleter(_Ptr __p, _Deleter __d) noexcept
-      : _M_impl(__p, __d, _Alloc()) { }
-
-      // __d(__p) must not throw.
-      _Sp_counted_deleter(_Ptr __p, _Deleter __d, const _Alloc& __a) noexcept
-      : _M_impl(__p, __d, __a) { }
-
-      ~_Sp_counted_deleter() noexcept { }
-
-      virtual void
-      _M_dispose() noexcept
-      { _M_impl._M_del()(_M_impl._M_ptr); }
-
-      virtual void
-      _M_destroy() noexcept
-      {
-	__allocator_type __a(_M_impl._M_alloc());
-	__allocated_ptr<__allocator_type> __guard_ptr{ __a, this };
-	this->~_Sp_counted_deleter();
-      }
-
-      virtual void*
-      _M_get_deleter(const std::type_info& __ti) noexcept
-      {
-#if __cpp_rtti
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 2400. shared_ptr's get_deleter() should use addressof()
-        return __ti == typeid(_Deleter)
-	  ? std::__addressof(_M_impl._M_del())
-	  : nullptr;
-#else
-        return nullptr;
-#endif
-      }
-
-    private:
-      _Impl _M_impl;
-    };
-
-  // helpers for make_shared / allocate_shared
-
-  struct _Sp_make_shared_tag { };
-
-  template<typename _Tp, typename _Alloc, _Lock_policy _Lp>
-    class _Sp_counted_ptr_inplace final : public _Sp_counted_base<_Lp>
-    {
-      class _Impl : _Sp_ebo_helper<0, _Alloc>
-      {
-	typedef _Sp_ebo_helper<0, _Alloc>	_A_base;
-
-      public:
-	explicit _Impl(_Alloc __a) noexcept : _A_base(__a) { }
-
-	_Alloc& _M_alloc() noexcept { return _A_base::_S_get(*this); }
-
-	__gnu_cxx::__aligned_buffer<_Tp> _M_storage;
-      };
-
-    public:
-      using __allocator_type = __alloc_rebind<_Alloc, _Sp_counted_ptr_inplace>;
-
-      template<typename... _Args>
-	_Sp_counted_ptr_inplace(_Alloc __a, _Args&&... __args)
-	: _M_impl(__a)
-	{
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 2070.  allocate_shared should use allocator_traits<A>::construct
-	  allocator_traits<_Alloc>::construct(__a, _M_ptr(),
-	      std::forward<_Args>(__args)...); // might throw
-	}
-
-      ~_Sp_counted_ptr_inplace() noexcept { }
-
-      virtual void
-      _M_dispose() noexcept
-      {
-	allocator_traits<_Alloc>::destroy(_M_impl._M_alloc(), _M_ptr());
-      }
-
-      // Override because the allocator needs to know the dynamic type
-      virtual void
-      _M_destroy() noexcept
-      {
-	__allocator_type __a(_M_impl._M_alloc());
-	__allocated_ptr<__allocator_type> __guard_ptr{ __a, this };
-	this->~_Sp_counted_ptr_inplace();
-      }
-
-      // Sneaky trick so __shared_ptr can get the managed pointer
-      virtual void*
-      _M_get_deleter(const std::type_info& __ti) noexcept
-      {
-#if __cpp_rtti
-	if (__ti == typeid(_Sp_make_shared_tag))
-	  return const_cast<typename remove_cv<_Tp>::type*>(_M_ptr());
-#endif
-	return nullptr;
-      }
-
-    private:
-      _Tp* _M_ptr() noexcept { return _M_impl._M_storage._M_ptr(); }
-
-      _Impl _M_impl;
-    };
-
-
-  template<_Lock_policy _Lp>
-    class __shared_count
-    {
-    public:
-      constexpr __shared_count() noexcept : _M_pi(0)
-      { }
-
-      template<typename _Ptr>
-        explicit
-	__shared_count(_Ptr __p) : _M_pi(0)
-	{
-	  __try
-	    {
-	      _M_pi = new _Sp_counted_ptr<_Ptr, _Lp>(__p);
-	    }
-	  __catch(...)
-	    {
-	      delete __p;
-	      __throw_exception_again;
-	    }
-	}
-
-      template<typename _Ptr, typename _Deleter>
-	__shared_count(_Ptr __p, _Deleter __d)
-	: __shared_count(__p, std::move(__d), allocator<void>())
-	{ }
-
-      template<typename _Ptr, typename _Deleter, typename _Alloc>
-	__shared_count(_Ptr __p, _Deleter __d, _Alloc __a) : _M_pi(0)
-	{
-	  typedef _Sp_counted_deleter<_Ptr, _Deleter, _Alloc, _Lp> _Sp_cd_type;
-	  __try
-	    {
-	      typename _Sp_cd_type::__allocator_type __a2(__a);
-	      auto __guard = std::__allocate_guarded(__a2);
-	      _Sp_cd_type* __mem = __guard.get();
-	      ::new (__mem) _Sp_cd_type(__p, std::move(__d), std::move(__a));
-	      _M_pi = __mem;
-	      __guard = nullptr;
-	    }
-	  __catch(...)
-	    {
-	      __d(__p); // Call _Deleter on __p.
-	      __throw_exception_again;
-	    }
-	}
-
-      template<typename _Tp, typename _Alloc, typename... _Args>
-	__shared_count(_Sp_make_shared_tag, _Tp*, const _Alloc& __a,
-		       _Args&&... __args)
-	: _M_pi(0)
-	{
-	  typedef _Sp_counted_ptr_inplace<_Tp, _Alloc, _Lp> _Sp_cp_type;
-	  typename _Sp_cp_type::__allocator_type __a2(__a);
-	  auto __guard = std::__allocate_guarded(__a2);
-	  _Sp_cp_type* __mem = __guard.get();
-	  ::new (__mem) _Sp_cp_type(std::move(__a),
-				    std::forward<_Args>(__args)...);
-	  _M_pi = __mem;
-	  __guard = nullptr;
-	}
-
-#if _GLIBCXX_USE_DEPRECATED
-      // Special case for auto_ptr<_Tp> to provide the strong guarantee.
-      template<typename _Tp>
-        explicit
-	__shared_count(std::auto_ptr<_Tp>&& __r);
-#endif
-
-      // Special case for unique_ptr<_Tp,_Del> to provide the strong guarantee.
-      template<typename _Tp, typename _Del>
-        explicit
-	__shared_count(std::unique_ptr<_Tp, _Del>&& __r) : _M_pi(0)
-	{
-	  using _Ptr = typename unique_ptr<_Tp, _Del>::pointer;
-	  using _Del2 = typename conditional<is_reference<_Del>::value,
-	      reference_wrapper<typename remove_reference<_Del>::type>,
-	      _Del>::type;
-	  using _Sp_cd_type
-	    = _Sp_counted_deleter<_Ptr, _Del2, allocator<void>, _Lp>;
-	  using _Alloc = allocator<_Sp_cd_type>;
-	  using _Alloc_traits = allocator_traits<_Alloc>;
-	  _Alloc __a;
-	  _Sp_cd_type* __mem = _Alloc_traits::allocate(__a, 1);
-	  _Alloc_traits::construct(__a, __mem, __r.release(),
-				   __r.get_deleter());  // non-throwing
-	  _M_pi = __mem;
-	}
-
-      // Throw bad_weak_ptr when __r._M_get_use_count() == 0.
-      explicit __shared_count(const __weak_count<_Lp>& __r);
-
-      // Does not throw if __r._M_get_use_count() == 0, caller must check.
-      explicit __shared_count(const __weak_count<_Lp>& __r, std::nothrow_t);
-
-      ~__shared_count() noexcept
-      {
-	if (_M_pi != nullptr)
-	  _M_pi->_M_release();
-      }
-
-      __shared_count(const __shared_count& __r) noexcept
-      : _M_pi(__r._M_pi)
-      {
-	if (_M_pi != 0)
-	  _M_pi->_M_add_ref_copy();
-      }
-
-      __shared_count&
-      operator=(const __shared_count& __r) noexcept
-      {
-	_Sp_counted_base<_Lp>* __tmp = __r._M_pi;
-	if (__tmp != _M_pi)
-	  {
-	    if (__tmp != 0)
-	      __tmp->_M_add_ref_copy();
-	    if (_M_pi != 0)
-	      _M_pi->_M_release();
-	    _M_pi = __tmp;
-	  }
-	return *this;
-      }
-
-      void
-      _M_swap(__shared_count& __r) noexcept
-      {
-	_Sp_counted_base<_Lp>* __tmp = __r._M_pi;
-	__r._M_pi = _M_pi;
-	_M_pi = __tmp;
-      }
-
-      long
-      _M_get_use_count() const noexcept
-      { return _M_pi != 0 ? _M_pi->_M_get_use_count() : 0; }
-
-      bool
-      _M_unique() const noexcept
-      { return this->_M_get_use_count() == 1; }
-
-      void*
-      _M_get_deleter(const std::type_info& __ti) const noexcept
-      { return _M_pi ? _M_pi->_M_get_deleter(__ti) : nullptr; }
-
-      bool
-      _M_less(const __shared_count& __rhs) const noexcept
-      { return std::less<_Sp_counted_base<_Lp>*>()(this->_M_pi, __rhs._M_pi); }
-
-      bool
-      _M_less(const __weak_count<_Lp>& __rhs) const noexcept
-      { return std::less<_Sp_counted_base<_Lp>*>()(this->_M_pi, __rhs._M_pi); }
-
-      // Friend function injected into enclosing namespace and found by ADL
-      friend inline bool
-      operator==(const __shared_count& __a, const __shared_count& __b) noexcept
-      { return __a._M_pi == __b._M_pi; }
-
-    private:
-      friend class __weak_count<_Lp>;
-
-      _Sp_counted_base<_Lp>*  _M_pi;
-    };
-
-
-  template<_Lock_policy _Lp>
-    class __weak_count
-    {
-    public:
-      constexpr __weak_count() noexcept : _M_pi(nullptr)
-      { }
-
-      __weak_count(const __shared_count<_Lp>& __r) noexcept
-      : _M_pi(__r._M_pi)
-      {
-	if (_M_pi != nullptr)
-	  _M_pi->_M_weak_add_ref();
-      }
-
-      __weak_count(const __weak_count& __r) noexcept
-      : _M_pi(__r._M_pi)
-      {
-	if (_M_pi != nullptr)
-	  _M_pi->_M_weak_add_ref();
-      }
-
-      __weak_count(__weak_count&& __r) noexcept
-      : _M_pi(__r._M_pi)
-      { __r._M_pi = nullptr; }
-
-      ~__weak_count() noexcept
-      {
-	if (_M_pi != nullptr)
-	  _M_pi->_M_weak_release();
-      }
-
-      __weak_count&
-      operator=(const __shared_count<_Lp>& __r) noexcept
-      {
-	_Sp_counted_base<_Lp>* __tmp = __r._M_pi;
-	if (__tmp != nullptr)
-	  __tmp->_M_weak_add_ref();
-	if (_M_pi != nullptr)
-	  _M_pi->_M_weak_release();
-	_M_pi = __tmp;
-	return *this;
-      }
-
-      __weak_count&
-      operator=(const __weak_count& __r) noexcept
-      {
-	_Sp_counted_base<_Lp>* __tmp = __r._M_pi;
-	if (__tmp != nullptr)
-	  __tmp->_M_weak_add_ref();
-	if (_M_pi != nullptr)
-	  _M_pi->_M_weak_release();
-	_M_pi = __tmp;
-	return *this;
-      }
-
-      __weak_count&
-      operator=(__weak_count&& __r) noexcept
-      {
-	if (_M_pi != nullptr)
-	  _M_pi->_M_weak_release();
-	_M_pi = __r._M_pi;
-        __r._M_pi = nullptr;
-	return *this;
-      }
-
-      void
-      _M_swap(__weak_count& __r) noexcept
-      {
-	_Sp_counted_base<_Lp>* __tmp = __r._M_pi;
-	__r._M_pi = _M_pi;
-	_M_pi = __tmp;
-      }
-
-      long
-      _M_get_use_count() const noexcept
-      { return _M_pi != nullptr ? _M_pi->_M_get_use_count() : 0; }
-
-      bool
-      _M_less(const __weak_count& __rhs) const noexcept
-      { return std::less<_Sp_counted_base<_Lp>*>()(this->_M_pi, __rhs._M_pi); }
-
-      bool
-      _M_less(const __shared_count<_Lp>& __rhs) const noexcept
-      { return std::less<_Sp_counted_base<_Lp>*>()(this->_M_pi, __rhs._M_pi); }
-
-      // Friend function injected into enclosing namespace and found by ADL
-      friend inline bool
-      operator==(const __weak_count& __a, const __weak_count& __b) noexcept
-      { return __a._M_pi == __b._M_pi; }
-
-    private:
-      friend class __shared_count<_Lp>;
-
-      _Sp_counted_base<_Lp>*  _M_pi;
-    };
-
-  // Now that __weak_count is defined we can define this constructor:
-  template<_Lock_policy _Lp>
-    inline
-    __shared_count<_Lp>::__shared_count(const __weak_count<_Lp>& __r)
-    : _M_pi(__r._M_pi)
-    {
-      if (_M_pi != nullptr)
-	_M_pi->_M_add_ref_lock();
-      else
-	__throw_bad_weak_ptr();
-    }
-
-  // Now that __weak_count is defined we can define this constructor:
-  template<_Lock_policy _Lp>
-    inline
-    __shared_count<_Lp>::
-    __shared_count(const __weak_count<_Lp>& __r, std::nothrow_t)
-    : _M_pi(__r._M_pi)
-    {
-      if (_M_pi != nullptr)
-	if (!_M_pi->_M_add_ref_lock_nothrow())
-	  _M_pi = nullptr;
-    }
-
-  // Support for enable_shared_from_this.
-
-  // Friend of __enable_shared_from_this.
-  template<_Lock_policy _Lp, typename _Tp1, typename _Tp2>
-    void
-    __enable_shared_from_this_helper(const __shared_count<_Lp>&,
-				     const __enable_shared_from_this<_Tp1,
-				     _Lp>*, const _Tp2*) noexcept;
-
-  // Friend of enable_shared_from_this.
-  template<typename _Tp1, typename _Tp2>
-    void
-    __enable_shared_from_this_helper(const __shared_count<>&,
-				     const enable_shared_from_this<_Tp1>*,
-				     const _Tp2*) noexcept;
-
-  template<_Lock_policy _Lp>
-    inline void
-    __enable_shared_from_this_helper(const __shared_count<_Lp>&, ...) noexcept
-    { }
-
-
-  template<typename _Tp, _Lock_policy _Lp>
-    class __shared_ptr
-    {
-      template<typename _Ptr>
-	using _Convertible
-	  = typename enable_if<is_convertible<_Ptr, _Tp*>::value>::type;
-
-    public:
-      typedef _Tp   element_type;
-
-      constexpr __shared_ptr() noexcept
-      : _M_ptr(0), _M_refcount()
-      { }
-
-      template<typename _Tp1>
-	explicit __shared_ptr(_Tp1* __p)
-        : _M_ptr(__p), _M_refcount(__p)
-	{
-	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-	  static_assert( !is_void<_Tp1>::value, "incomplete type" );
-	  static_assert( sizeof(_Tp1) > 0, "incomplete type" );
-	  __enable_shared_from_this_helper(_M_refcount, __p, __p);
-	}
-
-      template<typename _Tp1, typename _Deleter>
-	__shared_ptr(_Tp1* __p, _Deleter __d)
-	: _M_ptr(__p), _M_refcount(__p, __d)
-	{
-	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-	  // TODO requires _Deleter CopyConstructible and __d(__p) well-formed
-	  __enable_shared_from_this_helper(_M_refcount, __p, __p);
-	}
-
-      template<typename _Tp1, typename _Deleter, typename _Alloc>
-	__shared_ptr(_Tp1* __p, _Deleter __d, _Alloc __a)
-	: _M_ptr(__p), _M_refcount(__p, __d, std::move(__a))
-	{
-	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-	  // TODO requires _Deleter CopyConstructible and __d(__p) well-formed
-	  __enable_shared_from_this_helper(_M_refcount, __p, __p);
-	}
-
-      template<typename _Deleter>
-	__shared_ptr(nullptr_t __p, _Deleter __d)
-	: _M_ptr(0), _M_refcount(__p, __d)
-	{ }
-
-      template<typename _Deleter, typename _Alloc>
-        __shared_ptr(nullptr_t __p, _Deleter __d, _Alloc __a)
-	: _M_ptr(0), _M_refcount(__p, __d, std::move(__a))
-	{ }
-
-      template<typename _Tp1>
-	__shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r, _Tp* __p) noexcept
-	: _M_ptr(__p), _M_refcount(__r._M_refcount) // never throws
-	{ }
-
-      __shared_ptr(const __shared_ptr&) noexcept = default;
-      __shared_ptr& operator=(const __shared_ptr&) noexcept = default;
-      ~__shared_ptr() = default;
-
-      template<typename _Tp1, typename = _Convertible<_Tp1*>>
-	__shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r) noexcept
-	: _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount)
-	{ }
-
-      __shared_ptr(__shared_ptr&& __r) noexcept
-      : _M_ptr(__r._M_ptr), _M_refcount()
-      {
-	_M_refcount._M_swap(__r._M_refcount);
-	__r._M_ptr = 0;
-      }
-
-      template<typename _Tp1, typename = _Convertible<_Tp1*>>
-	__shared_ptr(__shared_ptr<_Tp1, _Lp>&& __r) noexcept
-	: _M_ptr(__r._M_ptr), _M_refcount()
-	{
-	  _M_refcount._M_swap(__r._M_refcount);
-	  __r._M_ptr = 0;
-	}
-
-      template<typename _Tp1>
-	explicit __shared_ptr(const __weak_ptr<_Tp1, _Lp>& __r)
-	: _M_refcount(__r._M_refcount) // may throw
-	{
-	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-
-	  // It is now safe to copy __r._M_ptr, as
-	  // _M_refcount(__r._M_refcount) did not throw.
-	  _M_ptr = __r._M_ptr;
-	}
-
-      // If an exception is thrown this constructor has no effect.
-      template<typename _Tp1, typename _Del, typename
-	       = _Convertible<typename unique_ptr<_Tp1, _Del>::pointer>>
-	__shared_ptr(std::unique_ptr<_Tp1, _Del>&& __r)
-	: _M_ptr(__r.get()), _M_refcount()
-	{
-	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-	  auto __raw = _S_raw_ptr(__r.get());
-	  _M_refcount = __shared_count<_Lp>(std::move(__r));
-	  __enable_shared_from_this_helper(_M_refcount, __raw, __raw);
-	}
-
-#if _GLIBCXX_USE_DEPRECATED
-      // Postcondition: use_count() == 1 and __r.get() == 0
-      template<typename _Tp1>
-	__shared_ptr(std::auto_ptr<_Tp1>&& __r);
-#endif
-
-      constexpr __shared_ptr(nullptr_t) noexcept : __shared_ptr() { }
-
-      template<typename _Tp1>
-	__shared_ptr&
-	operator=(const __shared_ptr<_Tp1, _Lp>& __r) noexcept
-	{
-	  _M_ptr = __r._M_ptr;
-	  _M_refcount = __r._M_refcount; // __shared_count::op= doesn't throw
-	  return *this;
-	}
-
-#if _GLIBCXX_USE_DEPRECATED
-      template<typename _Tp1>
-	__shared_ptr&
-	operator=(std::auto_ptr<_Tp1>&& __r)
-	{
-	  __shared_ptr(std::move(__r)).swap(*this);
-	  return *this;
-	}
-#endif
-
-      __shared_ptr&
-      operator=(__shared_ptr&& __r) noexcept
-      {
-	__shared_ptr(std::move(__r)).swap(*this);
-	return *this;
-      }
-
-      template<class _Tp1>
-	__shared_ptr&
-	operator=(__shared_ptr<_Tp1, _Lp>&& __r) noexcept
-	{
-	  __shared_ptr(std::move(__r)).swap(*this);
-	  return *this;
-	}
-
-      template<typename _Tp1, typename _Del>
-	__shared_ptr&
-	operator=(std::unique_ptr<_Tp1, _Del>&& __r)
-	{
-	  __shared_ptr(std::move(__r)).swap(*this);
-	  return *this;
-	}
-
-      void
-      reset() noexcept
-      { __shared_ptr().swap(*this); }
-
-      template<typename _Tp1>
-	void
-	reset(_Tp1* __p) // _Tp1 must be complete.
-	{
-	  // Catch self-reset errors.
-	  _GLIBCXX_DEBUG_ASSERT(__p == 0 || __p != _M_ptr);
-	  __shared_ptr(__p).swap(*this);
-	}
-
-      template<typename _Tp1, typename _Deleter>
-	void
-	reset(_Tp1* __p, _Deleter __d)
-	{ __shared_ptr(__p, __d).swap(*this); }
-
-      template<typename _Tp1, typename _Deleter, typename _Alloc>
-	void
-        reset(_Tp1* __p, _Deleter __d, _Alloc __a)
-        { __shared_ptr(__p, __d, std::move(__a)).swap(*this); }
-
-      // Allow class instantiation when _Tp is [cv-qual] void.
-      typename std::add_lvalue_reference<_Tp>::type
-      operator*() const noexcept
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_ptr != 0);
-	return *_M_ptr;
-      }
-
-      _Tp*
-      operator->() const noexcept
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_ptr != 0);
-	return _M_ptr;
-      }
-
-      _Tp*
-      get() const noexcept
-      { return _M_ptr; }
-
-      explicit operator bool() const // never throws
-      { return _M_ptr == 0 ? false : true; }
-
-      bool
-      unique() const noexcept
-      { return _M_refcount._M_unique(); }
-
-      long
-      use_count() const noexcept
-      { return _M_refcount._M_get_use_count(); }
-
-      void
-      swap(__shared_ptr<_Tp, _Lp>& __other) noexcept
-      {
-	std::swap(_M_ptr, __other._M_ptr);
-	_M_refcount._M_swap(__other._M_refcount);
-      }
-
-      template<typename _Tp1>
-	bool
-	owner_before(__shared_ptr<_Tp1, _Lp> const& __rhs) const
-	{ return _M_refcount._M_less(__rhs._M_refcount); }
-
-      template<typename _Tp1>
-	bool
-	owner_before(__weak_ptr<_Tp1, _Lp> const& __rhs) const
-	{ return _M_refcount._M_less(__rhs._M_refcount); }
-
-#if __cpp_rtti
-    protected:
-      // This constructor is non-standard, it is used by allocate_shared.
-      template<typename _Alloc, typename... _Args>
-	__shared_ptr(_Sp_make_shared_tag __tag, const _Alloc& __a,
-		     _Args&&... __args)
-	: _M_ptr(), _M_refcount(__tag, (_Tp*)0, __a,
-				std::forward<_Args>(__args)...)
-	{
-	  // _M_ptr needs to point to the newly constructed object.
-	  // This relies on _Sp_counted_ptr_inplace::_M_get_deleter.
-	  void* __p = _M_refcount._M_get_deleter(typeid(__tag));
-	  _M_ptr = static_cast<_Tp*>(__p);
-	  __enable_shared_from_this_helper(_M_refcount, _M_ptr, _M_ptr);
-	}
-#else
-      template<typename _Alloc>
-        struct _Deleter
-        {
-          void operator()(typename _Alloc::value_type* __ptr)
-          {
-	    __allocated_ptr<_Alloc> __guard{ _M_alloc, __ptr };
-	    allocator_traits<_Alloc>::destroy(_M_alloc, __guard.get());
-          }
-          _Alloc _M_alloc;
-        };
-
-      template<typename _Alloc, typename... _Args>
-	__shared_ptr(_Sp_make_shared_tag __tag, const _Alloc& __a,
-		     _Args&&... __args)
-	: _M_ptr(), _M_refcount()
-	{
-	  typedef typename allocator_traits<_Alloc>::template
-	    rebind_traits<typename std::remove_cv<_Tp>::type> __traits;
-	  _Deleter<typename __traits::allocator_type> __del = { __a };
-	  auto __guard = std::__allocate_guarded(__del._M_alloc);
-	  auto __ptr = __guard.get();
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 2070. allocate_shared should use allocator_traits<A>::construct
-	  __traits::construct(__del._M_alloc, __ptr,
-			      std::forward<_Args>(__args)...);
-	  __guard = nullptr;
-	  __shared_count<_Lp> __count(__ptr, __del, __del._M_alloc);
-	  _M_refcount._M_swap(__count);
-	  _M_ptr = __ptr;
-	  __enable_shared_from_this_helper(_M_refcount, _M_ptr, _M_ptr);
-	}
-#endif
-
-      template<typename _Tp1, _Lock_policy _Lp1, typename _Alloc,
-	       typename... _Args>
-	friend __shared_ptr<_Tp1, _Lp1>
-	__allocate_shared(const _Alloc& __a, _Args&&... __args);
-
-      // This constructor is used by __weak_ptr::lock() and
-      // shared_ptr::shared_ptr(const weak_ptr&, std::nothrow_t).
-      __shared_ptr(const __weak_ptr<_Tp, _Lp>& __r, std::nothrow_t)
-      : _M_refcount(__r._M_refcount, std::nothrow)
-      {
-	_M_ptr = _M_refcount._M_get_use_count() ? __r._M_ptr : nullptr;
-      }
-
-      friend class __weak_ptr<_Tp, _Lp>;
-
-    private:
-      void*
-      _M_get_deleter(const std::type_info& __ti) const noexcept
-      { return _M_refcount._M_get_deleter(__ti); }
-
-      template<typename _Tp1>
-	static _Tp1*
-	_S_raw_ptr(_Tp1* __ptr)
-	{ return __ptr; }
-
-      template<typename _Tp1>
-	static auto
-	_S_raw_ptr(_Tp1 __ptr) -> decltype(std::__addressof(*__ptr))
-	{ return std::__addressof(*__ptr); }
-
-      template<typename _Tp1, _Lock_policy _Lp1> friend class __shared_ptr;
-      template<typename _Tp1, _Lock_policy _Lp1> friend class __weak_ptr;
-
-      template<typename _Del, typename _Tp1, _Lock_policy _Lp1>
-	friend _Del* get_deleter(const __shared_ptr<_Tp1, _Lp1>&) noexcept;
-
-      _Tp*	   	   _M_ptr;         // Contained pointer.
-      __shared_count<_Lp>  _M_refcount;    // Reference counter.
-    };
-
-
-  // 20.7.2.2.7 shared_ptr comparisons
-  template<typename _Tp1, typename _Tp2, _Lock_policy _Lp>
-    inline bool
-    operator==(const __shared_ptr<_Tp1, _Lp>& __a,
-	       const __shared_ptr<_Tp2, _Lp>& __b) noexcept
-    { return __a.get() == __b.get(); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator==(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept
-    { return !__a; }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator==(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept
-    { return !__a; }
-
-  template<typename _Tp1, typename _Tp2, _Lock_policy _Lp>
-    inline bool
-    operator!=(const __shared_ptr<_Tp1, _Lp>& __a,
-	       const __shared_ptr<_Tp2, _Lp>& __b) noexcept
-    { return __a.get() != __b.get(); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator!=(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept
-    { return (bool)__a; }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator!=(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept
-    { return (bool)__a; }
-
-  template<typename _Tp1, typename _Tp2, _Lock_policy _Lp>
-    inline bool
-    operator<(const __shared_ptr<_Tp1, _Lp>& __a,
-	      const __shared_ptr<_Tp2, _Lp>& __b) noexcept
-    {
-      typedef typename std::common_type<_Tp1*, _Tp2*>::type _CT;
-      return std::less<_CT>()(__a.get(), __b.get());
-    }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator<(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept
-    { return std::less<_Tp*>()(__a.get(), nullptr); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator<(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept
-    { return std::less<_Tp*>()(nullptr, __a.get()); }
-
-  template<typename _Tp1, typename _Tp2, _Lock_policy _Lp>
-    inline bool
-    operator<=(const __shared_ptr<_Tp1, _Lp>& __a,
-	       const __shared_ptr<_Tp2, _Lp>& __b) noexcept
-    { return !(__b < __a); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator<=(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept
-    { return !(nullptr < __a); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator<=(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept
-    { return !(__a < nullptr); }
-
-  template<typename _Tp1, typename _Tp2, _Lock_policy _Lp>
-    inline bool
-    operator>(const __shared_ptr<_Tp1, _Lp>& __a,
-	      const __shared_ptr<_Tp2, _Lp>& __b) noexcept
-    { return (__b < __a); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator>(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept
-    { return std::less<_Tp*>()(nullptr, __a.get()); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator>(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept
-    { return std::less<_Tp*>()(__a.get(), nullptr); }
-
-  template<typename _Tp1, typename _Tp2, _Lock_policy _Lp>
-    inline bool
-    operator>=(const __shared_ptr<_Tp1, _Lp>& __a,
-	       const __shared_ptr<_Tp2, _Lp>& __b) noexcept
-    { return !(__a < __b); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator>=(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept
-    { return !(__a < nullptr); }
-
-  template<typename _Tp, _Lock_policy _Lp>
-    inline bool
-    operator>=(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept
-    { return !(nullptr < __a); }
-
-  template<typename _Sp>
-    struct _Sp_less : public binary_function<_Sp, _Sp, bool>
-    {
-      bool
-      operator()(const _Sp& __lhs, const _Sp& __rhs) const noexcept
-      {
-	typedef typename _Sp::element_type element_type;
-	return std::less<element_type*>()(__lhs.get(), __rhs.get());
-      }
-    };
-
-  template<typename _Tp, _Lock_policy _Lp>
-    struct less<__shared_ptr<_Tp, _Lp>>
-    : public _Sp_less<__shared_ptr<_Tp, _Lp>>
-    { };
-
-  // 20.7.2.2.8 shared_ptr specialized algorithms.
-  template<typename _Tp, _Lock_policy _Lp>
-    inline void
-    swap(__shared_ptr<_Tp, _Lp>& __a, __shared_ptr<_Tp, _Lp>& __b) noexcept
-    { __a.swap(__b); }
-
-  // 20.7.2.2.9 shared_ptr casts
-
-  // The seemingly equivalent code:
-  // shared_ptr<_Tp, _Lp>(static_cast<_Tp*>(__r.get()))
-  // will eventually result in undefined behaviour, attempting to
-  // delete the same object twice.
-  /// static_pointer_cast
-  template<typename _Tp, typename _Tp1, _Lock_policy _Lp>
-    inline __shared_ptr<_Tp, _Lp>
-    static_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r) noexcept
-    { return __shared_ptr<_Tp, _Lp>(__r, static_cast<_Tp*>(__r.get())); }
-
-  // The seemingly equivalent code:
-  // shared_ptr<_Tp, _Lp>(const_cast<_Tp*>(__r.get()))
-  // will eventually result in undefined behaviour, attempting to
-  // delete the same object twice.
-  /// const_pointer_cast
-  template<typename _Tp, typename _Tp1, _Lock_policy _Lp>
-    inline __shared_ptr<_Tp, _Lp>
-    const_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r) noexcept
-    { return __shared_ptr<_Tp, _Lp>(__r, const_cast<_Tp*>(__r.get())); }
-
-  // The seemingly equivalent code:
-  // shared_ptr<_Tp, _Lp>(dynamic_cast<_Tp*>(__r.get()))
-  // will eventually result in undefined behaviour, attempting to
-  // delete the same object twice.
-  /// dynamic_pointer_cast
-  template<typename _Tp, typename _Tp1, _Lock_policy _Lp>
-    inline __shared_ptr<_Tp, _Lp>
-    dynamic_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r) noexcept
-    {
-      if (_Tp* __p = dynamic_cast<_Tp*>(__r.get()))
-	return __shared_ptr<_Tp, _Lp>(__r, __p);
-      return __shared_ptr<_Tp, _Lp>();
-    }
-
-
-  template<typename _Tp, _Lock_policy _Lp>
-    class __weak_ptr
-    {
-      template<typename _Ptr>
-	using _Convertible
-	  = typename enable_if<is_convertible<_Ptr, _Tp*>::value>::type;
-
-    public:
-      typedef _Tp element_type;
-
-      constexpr __weak_ptr() noexcept
-      : _M_ptr(nullptr), _M_refcount()
-      { }
-
-      __weak_ptr(const __weak_ptr&) noexcept = default;
-
-      ~__weak_ptr() = default;
-
-      // The "obvious" converting constructor implementation:
-      //
-      //  template<typename _Tp1>
-      //    __weak_ptr(const __weak_ptr<_Tp1, _Lp>& __r)
-      //    : _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) // never throws
-      //    { }
-      //
-      // has a serious problem.
-      //
-      //  __r._M_ptr may already have been invalidated. The _M_ptr(__r._M_ptr)
-      //  conversion may require access to *__r._M_ptr (virtual inheritance).
-      //
-      // It is not possible to avoid spurious access violations since
-      // in multithreaded programs __r._M_ptr may be invalidated at any point.
-      template<typename _Tp1, typename = _Convertible<_Tp1*>>
-	__weak_ptr(const __weak_ptr<_Tp1, _Lp>& __r) noexcept
-	: _M_refcount(__r._M_refcount)
-        { _M_ptr = __r.lock().get(); }
-
-      template<typename _Tp1, typename = _Convertible<_Tp1*>>
-	__weak_ptr(const __shared_ptr<_Tp1, _Lp>& __r) noexcept
-	: _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount)
-	{ }
-
-      __weak_ptr(__weak_ptr&& __r) noexcept
-      : _M_ptr(__r._M_ptr), _M_refcount(std::move(__r._M_refcount))
-      { __r._M_ptr = nullptr; }
-
-      template<typename _Tp1, typename = _Convertible<_Tp1*>>
-	__weak_ptr(__weak_ptr<_Tp1, _Lp>&& __r) noexcept
-	: _M_ptr(__r.lock().get()), _M_refcount(std::move(__r._M_refcount))
-        { __r._M_ptr = nullptr; }
-
-      __weak_ptr&
-      operator=(const __weak_ptr& __r) noexcept = default;
-
-      template<typename _Tp1>
-	__weak_ptr&
-	operator=(const __weak_ptr<_Tp1, _Lp>& __r) noexcept
-	{
-	  _M_ptr = __r.lock().get();
-	  _M_refcount = __r._M_refcount;
-	  return *this;
-	}
-
-      template<typename _Tp1>
-	__weak_ptr&
-	operator=(const __shared_ptr<_Tp1, _Lp>& __r) noexcept
-	{
-	  _M_ptr = __r._M_ptr;
-	  _M_refcount = __r._M_refcount;
-	  return *this;
-	}
-
-      __weak_ptr&
-      operator=(__weak_ptr&& __r) noexcept
-      {
-	_M_ptr = __r._M_ptr;
-	_M_refcount = std::move(__r._M_refcount);
-	__r._M_ptr = nullptr;
-	return *this;
-      }
-
-      template<typename _Tp1>
-	__weak_ptr&
-	operator=(__weak_ptr<_Tp1, _Lp>&& __r) noexcept
-	{
-	  _M_ptr = __r.lock().get();
-	  _M_refcount = std::move(__r._M_refcount);
-	  __r._M_ptr = nullptr;
-	  return *this;
-	}
-
-      __shared_ptr<_Tp, _Lp>
-      lock() const noexcept
-      { return __shared_ptr<element_type, _Lp>(*this, std::nothrow); }
-
-      long
-      use_count() const noexcept
-      { return _M_refcount._M_get_use_count(); }
-
-      bool
-      expired() const noexcept
-      { return _M_refcount._M_get_use_count() == 0; }
-
-      template<typename _Tp1>
-	bool
-	owner_before(const __shared_ptr<_Tp1, _Lp>& __rhs) const
-	{ return _M_refcount._M_less(__rhs._M_refcount); }
-
-      template<typename _Tp1>
-	bool
-	owner_before(const __weak_ptr<_Tp1, _Lp>& __rhs) const
-	{ return _M_refcount._M_less(__rhs._M_refcount); }
-
-      void
-      reset() noexcept
-      { __weak_ptr().swap(*this); }
-
-      void
-      swap(__weak_ptr& __s) noexcept
-      {
-	std::swap(_M_ptr, __s._M_ptr);
-	_M_refcount._M_swap(__s._M_refcount);
-      }
-
-    private:
-      // Used by __enable_shared_from_this.
-      void
-      _M_assign(_Tp* __ptr, const __shared_count<_Lp>& __refcount) noexcept
-      {
-	_M_ptr = __ptr;
-	_M_refcount = __refcount;
-      }
-
-      template<typename _Tp1, _Lock_policy _Lp1> friend class __shared_ptr;
-      template<typename _Tp1, _Lock_policy _Lp1> friend class __weak_ptr;
-      friend class __enable_shared_from_this<_Tp, _Lp>;
-      friend class enable_shared_from_this<_Tp>;
-
-      _Tp*	 	 _M_ptr;         // Contained pointer.
-      __weak_count<_Lp>  _M_refcount;    // Reference counter.
-    };
-
-  // 20.7.2.3.6 weak_ptr specialized algorithms.
-  template<typename _Tp, _Lock_policy _Lp>
-    inline void
-    swap(__weak_ptr<_Tp, _Lp>& __a, __weak_ptr<_Tp, _Lp>& __b) noexcept
-    { __a.swap(__b); }
-
-  template<typename _Tp, typename _Tp1>
-    struct _Sp_owner_less : public binary_function<_Tp, _Tp, bool>
-    {
-      bool
-      operator()(const _Tp& __lhs, const _Tp& __rhs) const
-      { return __lhs.owner_before(__rhs); }
-
-      bool
-      operator()(const _Tp& __lhs, const _Tp1& __rhs) const
-      { return __lhs.owner_before(__rhs); }
-
-      bool
-      operator()(const _Tp1& __lhs, const _Tp& __rhs) const
-      { return __lhs.owner_before(__rhs); }
-    };
-
-  template<typename _Tp, _Lock_policy _Lp>
-    struct owner_less<__shared_ptr<_Tp, _Lp>>
-    : public _Sp_owner_less<__shared_ptr<_Tp, _Lp>, __weak_ptr<_Tp, _Lp>>
-    { };
-
-  template<typename _Tp, _Lock_policy _Lp>
-    struct owner_less<__weak_ptr<_Tp, _Lp>>
-    : public _Sp_owner_less<__weak_ptr<_Tp, _Lp>, __shared_ptr<_Tp, _Lp>>
-    { };
-
-
-  template<typename _Tp, _Lock_policy _Lp>
-    class __enable_shared_from_this
-    {
-    protected:
-      constexpr __enable_shared_from_this() noexcept { }
-
-      __enable_shared_from_this(const __enable_shared_from_this&) noexcept { }
-
-      __enable_shared_from_this&
-      operator=(const __enable_shared_from_this&) noexcept
-      { return *this; }
-
-      ~__enable_shared_from_this() { }
-
-    public:
-      __shared_ptr<_Tp, _Lp>
-      shared_from_this()
-      { return __shared_ptr<_Tp, _Lp>(this->_M_weak_this); }
-
-      __shared_ptr<const _Tp, _Lp>
-      shared_from_this() const
-      { return __shared_ptr<const _Tp, _Lp>(this->_M_weak_this); }
-
-    private:
-      template<typename _Tp1>
-	void
-	_M_weak_assign(_Tp1* __p, const __shared_count<_Lp>& __n) const noexcept
-	{ _M_weak_this._M_assign(__p, __n); }
-
-      template<_Lock_policy _Lp1, typename _Tp1, typename _Tp2>
-	friend void
-	__enable_shared_from_this_helper(const __shared_count<_Lp1>&,
-					 const __enable_shared_from_this<_Tp1,
-					 _Lp1>*, const _Tp2*) noexcept;
-
-      mutable __weak_ptr<_Tp, _Lp>  _M_weak_this;
-    };
-
-  template<_Lock_policy _Lp1, typename _Tp1, typename _Tp2>
-    inline void
-    __enable_shared_from_this_helper(const __shared_count<_Lp1>& __pn,
-				     const __enable_shared_from_this<_Tp1,
-				     _Lp1>* __pe,
-				     const _Tp2* __px) noexcept
-    {
-      if (__pe != nullptr)
-	__pe->_M_weak_assign(const_cast<_Tp2*>(__px), __pn);
-    }
-
-  template<typename _Tp, _Lock_policy _Lp, typename _Alloc, typename... _Args>
-    inline __shared_ptr<_Tp, _Lp>
-    __allocate_shared(const _Alloc& __a, _Args&&... __args)
-    {
-      return __shared_ptr<_Tp, _Lp>(_Sp_make_shared_tag(), __a,
-				    std::forward<_Args>(__args)...);
-    }
-
-  template<typename _Tp, _Lock_policy _Lp, typename... _Args>
-    inline __shared_ptr<_Tp, _Lp>
-    __make_shared(_Args&&... __args)
-    {
-      typedef typename std::remove_const<_Tp>::type _Tp_nc;
-      return std::__allocate_shared<_Tp, _Lp>(std::allocator<_Tp_nc>(),
-					      std::forward<_Args>(__args)...);
-    }
-
-  /// std::hash specialization for __shared_ptr.
-  template<typename _Tp, _Lock_policy _Lp>
-    struct hash<__shared_ptr<_Tp, _Lp>>
-    : public __hash_base<size_t, __shared_ptr<_Tp, _Lp>>
-    {
-      size_t
-      operator()(const __shared_ptr<_Tp, _Lp>& __s) const noexcept
-      { return std::hash<_Tp*>()(__s.get()); }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // _SHARED_PTR_BASE_H
diff --git a/openflow/usr/include/c++/5/bits/slice_array.h b/openflow/usr/include/c++/5/bits/slice_array.h
deleted file mode 100644
index ee1c546..0000000
--- a/openflow/usr/include/c++/5/bits/slice_array.h
+++ /dev/null
@@ -1,274 +0,0 @@
-// The template and inlines for the -*- C++ -*- slice_array class.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/slice_array.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{valarray}
- */
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-#ifndef _SLICE_ARRAY_H
-#define _SLICE_ARRAY_H 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup numeric_arrays
-   * @{
-   */
-
-  /**
-   *  @brief  Class defining one-dimensional subset of an array.
-   *
-   *  The slice class represents a one-dimensional subset of an array,
-   *  specified by three parameters: start offset, size, and stride.  The
-   *  start offset is the index of the first element of the array that is part
-   *  of the subset.  The size is the total number of elements in the subset.
-   *  Stride is the distance between each successive array element to include
-   *  in the subset.
-   *
-   *  For example, with an array of size 10, and a slice with offset 1, size 3
-   *  and stride 2, the subset consists of array elements 1, 3, and 5.
-   */
-  class slice
-  {
-  public:
-    ///  Construct an empty slice.
-    slice();
-
-    /**
-     *  @brief  Construct a slice.
-     *
-     *  @param  __o  Offset in array of first element.
-     *  @param  __d  Number of elements in slice.
-     *  @param  __s  Stride between array elements.
-     */
-    slice(size_t __o, size_t __d, size_t __s);
-
-    ///  Return array offset of first slice element.
-    size_t start() const;
-    ///  Return size of slice.
-    size_t size() const;
-    ///  Return array stride of slice.
-    size_t stride() const;
-
-  private:
-    size_t _M_off;                      // offset
-    size_t _M_sz;			// size
-    size_t _M_st;			// stride unit
-  };
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 543. valarray slice default constructor
-  inline
-  slice::slice() 
-  : _M_off(0), _M_sz(0), _M_st(0) {}
-
-  inline
-  slice::slice(size_t __o, size_t __d, size_t __s)
-  : _M_off(__o), _M_sz(__d), _M_st(__s) {}
-
-  inline size_t
-  slice::start() const
-  { return _M_off; }
-
-  inline size_t
-  slice::size() const
-  { return _M_sz; }
-
-  inline size_t
-  slice::stride() const
-  { return _M_st; }
-
-  /**
-   *  @brief  Reference to one-dimensional subset of an array.
-   *
-   *  A slice_array is a reference to the actual elements of an array
-   *  specified by a slice.  The way to get a slice_array is to call
-   *  operator[](slice) on a valarray.  The returned slice_array then permits
-   *  carrying operations out on the referenced subset of elements in the
-   *  original valarray.  For example, operator+=(valarray) will add values
-   *  to the subset of elements in the underlying valarray this slice_array
-   *  refers to.
-   *
-   *  @param  Tp  Element type.
-   */
-  template<typename _Tp>
-    class slice_array
-    {
-    public:
-      typedef _Tp value_type;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 253. valarray helper functions are almost entirely useless
-
-      ///  Copy constructor.  Both slices refer to the same underlying array.
-      slice_array(const slice_array&);
-
-      ///  Assignment operator.  Assigns slice elements to corresponding
-      ///  elements of @a a.
-      slice_array& operator=(const slice_array&);
-
-      ///  Assign slice elements to corresponding elements of @a v.
-      void operator=(const valarray<_Tp>&) const;
-      ///  Multiply slice elements by corresponding elements of @a v.
-      void operator*=(const valarray<_Tp>&) const;
-      ///  Divide slice elements by corresponding elements of @a v.
-      void operator/=(const valarray<_Tp>&) const;
-      ///  Modulo slice elements by corresponding elements of @a v.
-      void operator%=(const valarray<_Tp>&) const;
-      ///  Add corresponding elements of @a v to slice elements.
-      void operator+=(const valarray<_Tp>&) const;
-      ///  Subtract corresponding elements of @a v from slice elements.
-      void operator-=(const valarray<_Tp>&) const;
-      ///  Logical xor slice elements with corresponding elements of @a v.
-      void operator^=(const valarray<_Tp>&) const;
-      ///  Logical and slice elements with corresponding elements of @a v.
-      void operator&=(const valarray<_Tp>&) const;
-      ///  Logical or slice elements with corresponding elements of @a v.
-      void operator|=(const valarray<_Tp>&) const;
-      ///  Left shift slice elements by corresponding elements of @a v.
-      void operator<<=(const valarray<_Tp>&) const;
-      ///  Right shift slice elements by corresponding elements of @a v.
-      void operator>>=(const valarray<_Tp>&) const;
-      ///  Assign all slice elements to @a t.
-      void operator=(const _Tp &) const;
-      //        ~slice_array ();
-
-      template<class _Dom>
-        void operator=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-	void operator*=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-	void operator/=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-	void operator%=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-	void operator+=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-	void operator-=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-	void operator^=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-	void operator&=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-	void operator|=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-	void operator<<=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-	void operator>>=(const _Expr<_Dom, _Tp>&) const;
-
-    private:
-      friend class valarray<_Tp>;
-      slice_array(_Array<_Tp>, const slice&);
-
-      const size_t      _M_sz;
-      const size_t      _M_stride;
-      const _Array<_Tp> _M_array;
-
-      // not implemented
-      slice_array();
-    };
-
-  template<typename _Tp>
-    inline
-    slice_array<_Tp>::slice_array(_Array<_Tp> __a, const slice& __s)
-    : _M_sz(__s.size()), _M_stride(__s.stride()),
-      _M_array(__a.begin() + __s.start()) {}
-
-  template<typename _Tp>
-    inline
-    slice_array<_Tp>::slice_array(const slice_array<_Tp>& a)
-    : _M_sz(a._M_sz), _M_stride(a._M_stride), _M_array(a._M_array) {}
-
-  //    template<typename _Tp>
-  //    inline slice_array<_Tp>::~slice_array () {}
-
-  template<typename _Tp>
-    inline slice_array<_Tp>&
-    slice_array<_Tp>::operator=(const slice_array<_Tp>& __a)
-    {
-      std::__valarray_copy(__a._M_array, __a._M_sz, __a._M_stride,
-			   _M_array, _M_stride);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline void
-    slice_array<_Tp>::operator=(const _Tp& __t) const
-    { std::__valarray_fill(_M_array, _M_sz, _M_stride, __t); }
-
-  template<typename _Tp>
-    inline void
-    slice_array<_Tp>::operator=(const valarray<_Tp>& __v) const
-    { std::__valarray_copy(_Array<_Tp>(__v), _M_array, _M_sz, _M_stride); }
-
-  template<typename _Tp>
-  template<class _Dom>
-    inline void
-    slice_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const
-    { std::__valarray_copy(__e, _M_sz, _M_array, _M_stride); }
-
-#undef _DEFINE_VALARRAY_OPERATOR
-#define _DEFINE_VALARRAY_OPERATOR(_Op,_Name)				\
-  template<typename _Tp>						\
-    inline void								\
-    slice_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const	\
-    {									\
-      _Array_augmented_##_Name(_M_array, _M_sz, _M_stride, _Array<_Tp>(__v));\
-    }									\
-									\
-  template<typename _Tp>                                                \
-    template<class _Dom>				                \
-      inline void							\
-      slice_array<_Tp>::operator _Op##=(const _Expr<_Dom,_Tp>& __e) const\
-      {									\
-	  _Array_augmented_##_Name(_M_array, _M_stride, __e, _M_sz);	\
-      }
-
-
-_DEFINE_VALARRAY_OPERATOR(*, __multiplies)
-_DEFINE_VALARRAY_OPERATOR(/, __divides)
-_DEFINE_VALARRAY_OPERATOR(%, __modulus)
-_DEFINE_VALARRAY_OPERATOR(+, __plus)
-_DEFINE_VALARRAY_OPERATOR(-, __minus)
-_DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
-_DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
-_DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
-_DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
-_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_OPERATOR
-
-  // @} group numeric_arrays
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _SLICE_ARRAY_H */
diff --git a/openflow/usr/include/c++/5/bits/sstream.tcc b/openflow/usr/include/c++/5/bits/sstream.tcc
deleted file mode 100644
index 67c27f7..0000000
--- a/openflow/usr/include/c++/5/bits/sstream.tcc
+++ /dev/null
@@ -1,288 +0,0 @@
-// String based streams -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/sstream.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{sstream}
- */
-
-//
-// ISO C++ 14882: 27.7  String-based streams
-//
-
-#ifndef _SSTREAM_TCC
-#define _SSTREAM_TCC 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template <class _CharT, class _Traits, class _Alloc>
-    typename basic_stringbuf<_CharT, _Traits, _Alloc>::int_type
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    pbackfail(int_type __c)
-    {
-      int_type __ret = traits_type::eof();
-      if (this->eback() < this->gptr())
-	{
-	  // Try to put back __c into input sequence in one of three ways.
-	  // Order these tests done in is unspecified by the standard.
-	  const bool __testeof = traits_type::eq_int_type(__c, __ret);
-	  if (!__testeof)
-	    {
-	      const bool __testeq = traits_type::eq(traits_type::
-						    to_char_type(__c),
-						    this->gptr()[-1]);	  
-	      const bool __testout = this->_M_mode & ios_base::out;
-	      if (__testeq || __testout)
-		{
-		  this->gbump(-1);
-		  if (!__testeq)
-		    *this->gptr() = traits_type::to_char_type(__c);
-		  __ret = __c;
-		}
-	    }
-	  else
-	    {
-	      this->gbump(-1);
-	      __ret = traits_type::not_eof(__c);
-	    }
-	}
-      return __ret;
-    }
-
-  template <class _CharT, class _Traits, class _Alloc>
-    typename basic_stringbuf<_CharT, _Traits, _Alloc>::int_type
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    overflow(int_type __c)
-    {
-      const bool __testout = this->_M_mode & ios_base::out;
-      if (__builtin_expect(!__testout, false))
-	return traits_type::eof();
-
-      const bool __testeof = traits_type::eq_int_type(__c, traits_type::eof());
-      if (__builtin_expect(__testeof, false))
-	return traits_type::not_eof(__c);
-
-      const __size_type __capacity = _M_string.capacity();
-      const __size_type __max_size = _M_string.max_size();
-      const bool __testput = this->pptr() < this->epptr();
-      if (__builtin_expect(!__testput && __capacity == __max_size, false))
-	return traits_type::eof();
-
-      // Try to append __c into output sequence in one of two ways.
-      // Order these tests done in is unspecified by the standard.
-      const char_type __conv = traits_type::to_char_type(__c);
-      if (!__testput)
-	{
-	  // NB: Start ostringstream buffers at 512 chars.  This is an
-	  // experimental value (pronounced "arbitrary" in some of the
-	  // hipper English-speaking countries), and can be changed to
-	  // suit particular needs.
-	  //
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 169. Bad efficiency of overflow() mandated
-	  // 432. stringbuf::overflow() makes only one write position
-	  //      available
-	  const __size_type __opt_len = std::max(__size_type(2 * __capacity),
-						 __size_type(512));
-	  const __size_type __len = std::min(__opt_len, __max_size);
-	  __string_type __tmp;
-	  __tmp.reserve(__len);
-	  if (this->pbase())
-	    __tmp.assign(this->pbase(), this->epptr() - this->pbase());
-	  __tmp.push_back(__conv);
-	  _M_string.swap(__tmp);
-	  _M_sync(const_cast<char_type*>(_M_string.data()),
-		  this->gptr() - this->eback(), this->pptr() - this->pbase());
-	}
-      else
-	*this->pptr() = __conv;
-      this->pbump(1);
-      return __c;
-    }
-
-  template <class _CharT, class _Traits, class _Alloc>
-    typename basic_stringbuf<_CharT, _Traits, _Alloc>::int_type
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    underflow()
-    {
-      int_type __ret = traits_type::eof();
-      const bool __testin = this->_M_mode & ios_base::in;
-      if (__testin)
-	{
-	  // Update egptr() to match the actual string end.
-	  _M_update_egptr();
-
-	  if (this->gptr() < this->egptr())
-	    __ret = traits_type::to_int_type(*this->gptr());
-	}
-      return __ret;
-    }
-
-  template <class _CharT, class _Traits, class _Alloc>
-    typename basic_stringbuf<_CharT, _Traits, _Alloc>::pos_type
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    seekoff(off_type __off, ios_base::seekdir __way, ios_base::openmode __mode)
-    {
-      pos_type __ret =  pos_type(off_type(-1));
-      bool __testin = (ios_base::in & this->_M_mode & __mode) != 0;
-      bool __testout = (ios_base::out & this->_M_mode & __mode) != 0;
-      const bool __testboth = __testin && __testout && __way != ios_base::cur;
-      __testin &= !(__mode & ios_base::out);
-      __testout &= !(__mode & ios_base::in);
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 453. basic_stringbuf::seekoff need not always fail for an empty stream.
-      const char_type* __beg = __testin ? this->eback() : this->pbase();
-      if ((__beg || !__off) && (__testin || __testout || __testboth))
-	{
-	  _M_update_egptr();
-
-	  off_type __newoffi = __off;
-	  off_type __newoffo = __newoffi;
-	  if (__way == ios_base::cur)
-	    {
-	      __newoffi += this->gptr() - __beg;
-	      __newoffo += this->pptr() - __beg;
-	    }
-	  else if (__way == ios_base::end)
-	    __newoffo = __newoffi += this->egptr() - __beg;
-
-	  if ((__testin || __testboth)
-	      && __newoffi >= 0
-	      && this->egptr() - __beg >= __newoffi)
-	    {
-	      this->setg(this->eback(), this->eback() + __newoffi,
-			 this->egptr());
-	      __ret = pos_type(__newoffi);
-	    }
-	  if ((__testout || __testboth)
-	      && __newoffo >= 0
-	      && this->egptr() - __beg >= __newoffo)
-	    {
-	      _M_pbump(this->pbase(), this->epptr(), __newoffo);
-	      __ret = pos_type(__newoffo);
-	    }
-	}
-      return __ret;
-    }
-
-  template <class _CharT, class _Traits, class _Alloc>
-    typename basic_stringbuf<_CharT, _Traits, _Alloc>::pos_type
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    seekpos(pos_type __sp, ios_base::openmode __mode)
-    {
-      pos_type __ret =  pos_type(off_type(-1));
-      const bool __testin = (ios_base::in & this->_M_mode & __mode) != 0;
-      const bool __testout = (ios_base::out & this->_M_mode & __mode) != 0;
-
-      const char_type* __beg = __testin ? this->eback() : this->pbase();
-      if ((__beg || !off_type(__sp)) && (__testin || __testout))
-	{
-	  _M_update_egptr();
-
-	  const off_type __pos(__sp);
-	  const bool __testpos = (0 <= __pos
-				  && __pos <= this->egptr() - __beg);
-	  if (__testpos)
-	    {
-	      if (__testin)
-		this->setg(this->eback(), this->eback() + __pos,
-			   this->egptr());
-	      if (__testout)
-		_M_pbump(this->pbase(), this->epptr(), __pos);
-	      __ret = __sp;
-	    }
-	}
-      return __ret;
-    }
-
-  template <class _CharT, class _Traits, class _Alloc>
-    void
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    _M_sync(char_type* __base, __size_type __i, __size_type __o)
-    {
-      const bool __testin = _M_mode & ios_base::in;
-      const bool __testout = _M_mode & ios_base::out;
-      char_type* __endg = __base + _M_string.size();
-      char_type* __endp = __base + _M_string.capacity();
-
-      if (__base != _M_string.data())
-	{
-	  // setbuf: __i == size of buffer area (_M_string.size() == 0).
-	  __endg += __i;
-	  __i = 0;
-	  __endp = __endg;
-	}
-
-      if (__testin)
-	this->setg(__base, __base + __i, __endg);
-      if (__testout)
-	{
-	  _M_pbump(__base, __endp, __o);
-	  // egptr() always tracks the string end.  When !__testin,
-	  // for the correct functioning of the streambuf inlines
-	  // the other get area pointers are identical.
-	  if (!__testin)
-	    this->setg(__endg, __endg, __endg);
-	}
-    }
-
-  template <class _CharT, class _Traits, class _Alloc>
-    void
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    _M_pbump(char_type* __pbeg, char_type* __pend, off_type __off)
-    {
-      this->setp(__pbeg, __pend);
-      while (__off > __gnu_cxx::__numeric_traits<int>::__max)
-	{
-	  this->pbump(__gnu_cxx::__numeric_traits<int>::__max);
-	  __off -= __gnu_cxx::__numeric_traits<int>::__max;
-	}
-      this->pbump(__off);
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_stringbuf<char>;
-  extern template class basic_istringstream<char>;
-  extern template class basic_ostringstream<char>;
-  extern template class basic_stringstream<char>;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_stringbuf<wchar_t>;
-  extern template class basic_istringstream<wchar_t>;
-  extern template class basic_ostringstream<wchar_t>;
-  extern template class basic_stringstream<wchar_t>;
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/stl_algo.h b/openflow/usr/include/c++/5/bits/stl_algo.h
deleted file mode 100644
index 53c455b..0000000
--- a/openflow/usr/include/c++/5/bits/stl_algo.h
+++ /dev/null
@@ -1,5546 +0,0 @@
-// Algorithm implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_algo.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{algorithm}
- */
-
-#ifndef _STL_ALGO_H
-#define _STL_ALGO_H 1
-
-#include <cstdlib>             // for rand
-#include <bits/algorithmfwd.h>
-#include <bits/stl_heap.h>
-#include <bits/stl_tempbuf.h>  // for _Temporary_buffer
-#include <bits/predefined_ops.h>
-
-#if __cplusplus >= 201103L
-#include <random>     // for std::uniform_int_distribution
-#endif
-
-// See concept_check.h for the __glibcxx_*_requires macros.
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /// Swaps the median value of *__a, *__b and *__c under __comp to *__result
-  template<typename _Iterator, typename _Compare>
-    void
-    __move_median_to_first(_Iterator __result,_Iterator __a, _Iterator __b,
-			   _Iterator __c, _Compare __comp)
-    {
-      if (__comp(__a, __b))
-	{
-	  if (__comp(__b, __c))
-	    std::iter_swap(__result, __b);
-	  else if (__comp(__a, __c))
-	    std::iter_swap(__result, __c);
-	  else
-	    std::iter_swap(__result, __a);
-	}
-      else if (__comp(__a, __c))
-	std::iter_swap(__result, __a);
-      else if (__comp(__b, __c))
-	std::iter_swap(__result, __c);
-      else
-	std::iter_swap(__result, __b);
-    }
-
-  /// This is an overload used by find algos for the Input Iterator case.
-  template<typename _InputIterator, typename _Predicate>
-    inline _InputIterator
-    __find_if(_InputIterator __first, _InputIterator __last,
-	      _Predicate __pred, input_iterator_tag)
-    {
-      while (__first != __last && !__pred(__first))
-	++__first;
-      return __first;
-    }
-
-  /// This is an overload used by find algos for the RAI case.
-  template<typename _RandomAccessIterator, typename _Predicate>
-    _RandomAccessIterator
-    __find_if(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	      _Predicate __pred, random_access_iterator_tag)
-    {
-      typename iterator_traits<_RandomAccessIterator>::difference_type
-	__trip_count = (__last - __first) >> 2;
-
-      for (; __trip_count > 0; --__trip_count)
-	{
-	  if (__pred(__first))
-	    return __first;
-	  ++__first;
-
-	  if (__pred(__first))
-	    return __first;
-	  ++__first;
-
-	  if (__pred(__first))
-	    return __first;
-	  ++__first;
-
-	  if (__pred(__first))
-	    return __first;
-	  ++__first;
-	}
-
-      switch (__last - __first)
-	{
-	case 3:
-	  if (__pred(__first))
-	    return __first;
-	  ++__first;
-	case 2:
-	  if (__pred(__first))
-	    return __first;
-	  ++__first;
-	case 1:
-	  if (__pred(__first))
-	    return __first;
-	  ++__first;
-	case 0:
-	default:
-	  return __last;
-	}
-    }
-
-  template<typename _Iterator, typename _Predicate>
-    inline _Iterator
-    __find_if(_Iterator __first, _Iterator __last, _Predicate __pred)
-    {
-      return __find_if(__first, __last, __pred,
-		       std::__iterator_category(__first));
-    }
-
-  /// Provided for stable_partition to use.
-  template<typename _InputIterator, typename _Predicate>
-    inline _InputIterator
-    __find_if_not(_InputIterator __first, _InputIterator __last,
-		  _Predicate __pred)
-    {
-      return std::__find_if(__first, __last,
-			    __gnu_cxx::__ops::__negate(__pred),
-			    std::__iterator_category(__first));
-    }
-
-  /// Like find_if_not(), but uses and updates a count of the
-  /// remaining range length instead of comparing against an end
-  /// iterator.
-  template<typename _InputIterator, typename _Predicate, typename _Distance>
-    _InputIterator
-    __find_if_not_n(_InputIterator __first, _Distance& __len, _Predicate __pred)
-    {
-      for (; __len; --__len, ++__first)
-	if (!__pred(__first))
-	  break;
-      return __first;
-    }
-
-  // set_difference
-  // set_intersection
-  // set_symmetric_difference
-  // set_union
-  // for_each
-  // find
-  // find_if
-  // find_first_of
-  // adjacent_find
-  // count
-  // count_if
-  // search
-
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    _ForwardIterator1
-    __search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	     _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-	     _BinaryPredicate  __predicate)
-    {
-      // Test for empty ranges
-      if (__first1 == __last1 || __first2 == __last2)
-	return __first1;
-
-      // Test for a pattern of length 1.
-      _ForwardIterator2 __p1(__first2);
-      if (++__p1 == __last2)
-	return std::__find_if(__first1, __last1,
-		__gnu_cxx::__ops::__iter_comp_iter(__predicate, __first2));
-
-      // General case.
-      _ForwardIterator2 __p;
-      _ForwardIterator1 __current = __first1;
-
-      for (;;)
-	{
-	  __first1 =
-	    std::__find_if(__first1, __last1,
-		__gnu_cxx::__ops::__iter_comp_iter(__predicate, __first2));
-
-	  if (__first1 == __last1)
-	    return __last1;
-
-	  __p = __p1;
-	  __current = __first1;
-	  if (++__current == __last1)
-	    return __last1;
-
-	  while (__predicate(__current, __p))
-	    {
-	      if (++__p == __last2)
-		return __first1;
-	      if (++__current == __last1)
-		return __last1;
-	    }
-	  ++__first1;
-	}
-      return __first1;
-    }
-
-  // search_n
-
-  /**
-   *  This is an helper function for search_n overloaded for forward iterators.
-  */
-  template<typename _ForwardIterator, typename _Integer,
-	   typename _UnaryPredicate>
-    _ForwardIterator
-    __search_n_aux(_ForwardIterator __first, _ForwardIterator __last,
-		   _Integer __count, _UnaryPredicate __unary_pred,
-		   std::forward_iterator_tag)
-    {
-      __first = std::__find_if(__first, __last, __unary_pred);
-      while (__first != __last)
-	{
-	  typename iterator_traits<_ForwardIterator>::difference_type
-	    __n = __count;
-	  _ForwardIterator __i = __first;
-	  ++__i;
-	  while (__i != __last && __n != 1 && __unary_pred(__i))
-	    {
-	      ++__i;
-	      --__n;
-	    }
-	  if (__n == 1)
-	    return __first;
-	  if (__i == __last)
-	    return __last;
-	  __first = std::__find_if(++__i, __last, __unary_pred);
-	}
-      return __last;
-    }
-
-  /**
-   *  This is an helper function for search_n overloaded for random access
-   *  iterators.
-  */
-  template<typename _RandomAccessIter, typename _Integer,
-	   typename _UnaryPredicate>
-    _RandomAccessIter
-    __search_n_aux(_RandomAccessIter __first, _RandomAccessIter __last,
-		   _Integer __count, _UnaryPredicate __unary_pred,
-		   std::random_access_iterator_tag)
-    {
-      typedef typename std::iterator_traits<_RandomAccessIter>::difference_type
-	_DistanceType;
-
-      _DistanceType __tailSize = __last - __first;
-      _DistanceType __remainder = __count;
-
-      while (__remainder <= __tailSize) // the main loop...
-	{
-	  __first += __remainder;
-	  __tailSize -= __remainder;
-	  // __first here is always pointing to one past the last element of
-	  // next possible match.
-	  _RandomAccessIter __backTrack = __first; 
-	  while (__unary_pred(--__backTrack))
-	    {
-	      if (--__remainder == 0)
-	        return (__first - __count); // Success
-	    }
-	  __remainder = __count + 1 - (__first - __backTrack);
-	}
-      return __last; // Failure
-    }
-
-  template<typename _ForwardIterator, typename _Integer,
-           typename _UnaryPredicate>
-    _ForwardIterator
-    __search_n(_ForwardIterator __first, _ForwardIterator __last,
-	       _Integer __count,
-	       _UnaryPredicate __unary_pred)
-    {
-      if (__count <= 0)
-	return __first;
-
-      if (__count == 1)
-	return std::__find_if(__first, __last, __unary_pred);
-
-      return std::__search_n_aux(__first, __last, __count, __unary_pred,
-				 std::__iterator_category(__first));
-    }
-
-  // find_end for forward iterators.
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    _ForwardIterator1
-    __find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	       _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-	       forward_iterator_tag, forward_iterator_tag,
-	       _BinaryPredicate __comp)
-    {
-      if (__first2 == __last2)
-	return __last1;
-
-      _ForwardIterator1 __result = __last1;
-      while (1)
-	{
-	  _ForwardIterator1 __new_result
-	    = std::__search(__first1, __last1, __first2, __last2, __comp);
-	  if (__new_result == __last1)
-	    return __result;
-	  else
-	    {
-	      __result = __new_result;
-	      __first1 = __new_result;
-	      ++__first1;
-	    }
-	}
-    }
-
-  // find_end for bidirectional iterators (much faster).
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
-	   typename _BinaryPredicate>
-    _BidirectionalIterator1
-    __find_end(_BidirectionalIterator1 __first1,
-	       _BidirectionalIterator1 __last1,
-	       _BidirectionalIterator2 __first2,
-	       _BidirectionalIterator2 __last2,
-	       bidirectional_iterator_tag, bidirectional_iterator_tag,
-	       _BinaryPredicate __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator1>)
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator2>)
-
-      typedef reverse_iterator<_BidirectionalIterator1> _RevIterator1;
-      typedef reverse_iterator<_BidirectionalIterator2> _RevIterator2;
-
-      _RevIterator1 __rlast1(__first1);
-      _RevIterator2 __rlast2(__first2);
-      _RevIterator1 __rresult = std::__search(_RevIterator1(__last1), __rlast1,
-					      _RevIterator2(__last2), __rlast2,
-					      __comp);
-
-      if (__rresult == __rlast1)
-	return __last1;
-      else
-	{
-	  _BidirectionalIterator1 __result = __rresult.base();
-	  std::advance(__result, -std::distance(__first2, __last2));
-	  return __result;
-	}
-    }
-
-  /**
-   *  @brief  Find last matching subsequence in a sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  Start of range to search.
-   *  @param  __last1   End of range to search.
-   *  @param  __first2  Start of sequence to match.
-   *  @param  __last2   End of sequence to match.
-   *  @return   The last iterator @c i in the range
-   *  @p [__first1,__last1-(__last2-__first2)) such that @c *(i+N) ==
-   *  @p *(__first2+N) for each @c N in the range @p
-   *  [0,__last2-__first2), or @p __last1 if no such iterator exists.
-   *
-   *  Searches the range @p [__first1,__last1) for a sub-sequence that
-   *  compares equal value-by-value with the sequence given by @p
-   *  [__first2,__last2) and returns an iterator to the __first
-   *  element of the sub-sequence, or @p __last1 if the sub-sequence
-   *  is not found.  The sub-sequence will be the last such
-   *  subsequence contained in [__first1,__last1).
-   *
-   *  Because the sub-sequence must lie completely within the range @p
-   *  [__first1,__last1) it must start at a position less than @p
-   *  __last1-(__last2-__first2) where @p __last2-__first2 is the
-   *  length of the sub-sequence.  This means that the returned
-   *  iterator @c i will be in the range @p
-   *  [__first1,__last1-(__last2-__first2))
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    inline _ForwardIterator1
-    find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	     _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_ForwardIterator1>::value_type,
-	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return std::__find_end(__first1, __last1, __first2, __last2,
-			     std::__iterator_category(__first1),
-			     std::__iterator_category(__first2),
-			     __gnu_cxx::__ops::__iter_equal_to_iter());
-    }
-
-  /**
-   *  @brief  Find last matching subsequence in a sequence using a predicate.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  Start of range to search.
-   *  @param  __last1   End of range to search.
-   *  @param  __first2  Start of sequence to match.
-   *  @param  __last2   End of sequence to match.
-   *  @param  __comp    The predicate to use.
-   *  @return The last iterator @c i in the range @p
-   *  [__first1,__last1-(__last2-__first2)) such that @c
-   *  predicate(*(i+N), @p (__first2+N)) is true for each @c N in the
-   *  range @p [0,__last2-__first2), or @p __last1 if no such iterator
-   *  exists.
-   *
-   *  Searches the range @p [__first1,__last1) for a sub-sequence that
-   *  compares equal value-by-value with the sequence given by @p
-   *  [__first2,__last2) using comp as a predicate and returns an
-   *  iterator to the first element of the sub-sequence, or @p __last1
-   *  if the sub-sequence is not found.  The sub-sequence will be the
-   *  last such subsequence contained in [__first,__last1).
-   *
-   *  Because the sub-sequence must lie completely within the range @p
-   *  [__first1,__last1) it must start at a position less than @p
-   *  __last1-(__last2-__first2) where @p __last2-__first2 is the
-   *  length of the sub-sequence.  This means that the returned
-   *  iterator @c i will be in the range @p
-   *  [__first1,__last1-(__last2-__first2))
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    inline _ForwardIterator1
-    find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	     _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-	     _BinaryPredicate __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_ForwardIterator1>::value_type,
-	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return std::__find_end(__first1, __last1, __first2, __last2,
-			     std::__iterator_category(__first1),
-			     std::__iterator_category(__first2),
-			     __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-#if __cplusplus >= 201103L
-  /**
-   *  @brief  Checks that a predicate is true for all the elements
-   *          of a sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first   An input iterator.
-   *  @param  __last    An input iterator.
-   *  @param  __pred    A predicate.
-   *  @return  True if the check is true, false otherwise.
-   *
-   *  Returns true if @p __pred is true for each element in the range
-   *  @p [__first,__last), and false otherwise.
-  */
-  template<typename _InputIterator, typename _Predicate>
-    inline bool
-    all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-    { return __last == std::find_if_not(__first, __last, __pred); }
-
-  /**
-   *  @brief  Checks that a predicate is false for all the elements
-   *          of a sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first   An input iterator.
-   *  @param  __last    An input iterator.
-   *  @param  __pred    A predicate.
-   *  @return  True if the check is true, false otherwise.
-   *
-   *  Returns true if @p __pred is false for each element in the range
-   *  @p [__first,__last), and false otherwise.
-  */
-  template<typename _InputIterator, typename _Predicate>
-    inline bool
-    none_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-    { return __last == _GLIBCXX_STD_A::find_if(__first, __last, __pred); }
-
-  /**
-   *  @brief  Checks that a predicate is false for at least an element
-   *          of a sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first   An input iterator.
-   *  @param  __last    An input iterator.
-   *  @param  __pred    A predicate.
-   *  @return  True if the check is true, false otherwise.
-   *
-   *  Returns true if an element exists in the range @p
-   *  [__first,__last) such that @p __pred is true, and false
-   *  otherwise.
-  */
-  template<typename _InputIterator, typename _Predicate>
-    inline bool
-    any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-    { return !std::none_of(__first, __last, __pred); }
-
-  /**
-   *  @brief  Find the first element in a sequence for which a
-   *          predicate is false.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __pred   A predicate.
-   *  @return   The first iterator @c i in the range @p [__first,__last)
-   *  such that @p __pred(*i) is false, or @p __last if no such iterator exists.
-  */
-  template<typename _InputIterator, typename _Predicate>
-    inline _InputIterator
-    find_if_not(_InputIterator __first, _InputIterator __last,
-		_Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	      typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-      return std::__find_if_not(__first, __last,
-				__gnu_cxx::__ops::__pred_iter(__pred));
-    }
-
-  /**
-   *  @brief  Checks whether the sequence is partitioned.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __pred   A predicate.
-   *  @return  True if the range @p [__first,__last) is partioned by @p __pred,
-   *  i.e. if all elements that satisfy @p __pred appear before those that
-   *  do not.
-  */
-  template<typename _InputIterator, typename _Predicate>
-    inline bool
-    is_partitioned(_InputIterator __first, _InputIterator __last,
-		   _Predicate __pred)
-    {
-      __first = std::find_if_not(__first, __last, __pred);
-      return std::none_of(__first, __last, __pred);
-    }
-
-  /**
-   *  @brief  Find the partition point of a partitioned range.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __pred    A predicate.
-   *  @return  An iterator @p mid such that @p all_of(__first, mid, __pred)
-   *           and @p none_of(mid, __last, __pred) are both true.
-  */
-  template<typename _ForwardIterator, typename _Predicate>
-    _ForwardIterator
-    partition_point(_ForwardIterator __first, _ForwardIterator __last,
-		    _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	      typename iterator_traits<_ForwardIterator>::value_type>)
-
-      // A specific debug-mode test will be necessary...
-      __glibcxx_requires_valid_range(__first, __last);
-
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      _DistanceType __len = std::distance(__first, __last);
-      _DistanceType __half;
-      _ForwardIterator __middle;
-
-      while (__len > 0)
-	{
-	  __half = __len >> 1;
-	  __middle = __first;
-	  std::advance(__middle, __half);
-	  if (__pred(*__middle))
-	    {
-	      __first = __middle;
-	      ++__first;
-	      __len = __len - __half - 1;
-	    }
-	  else
-	    __len = __half;
-	}
-      return __first;
-    }
-#endif
-
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _Predicate>
-    _OutputIterator
-    __remove_copy_if(_InputIterator __first, _InputIterator __last,
-		     _OutputIterator __result, _Predicate __pred)
-    {
-      for (; __first != __last; ++__first)
-	if (!__pred(__first))
-	  {
-	    *__result = *__first;
-	    ++__result;
-	  }
-      return __result;
-    }
-
-  /**
-   *  @brief Copy a sequence, removing elements of a given value.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   An input iterator.
-   *  @param  __last    An input iterator.
-   *  @param  __result  An output iterator.
-   *  @param  __value   The value to be removed.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies each element in the range @p [__first,__last) not equal
-   *  to @p __value to the range beginning at @p __result.
-   *  remove_copy() is stable, so the relative order of elements that
-   *  are copied is unchanged.
-  */
-  template<typename _InputIterator, typename _OutputIterator, typename _Tp>
-    inline _OutputIterator
-    remove_copy(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result, const _Tp& __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__remove_copy_if(__first, __last, __result,
-	__gnu_cxx::__ops::__iter_equals_val(__value));
-    }
-
-  /**
-   *  @brief Copy a sequence, removing elements for which a predicate is true.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   An input iterator.
-   *  @param  __last    An input iterator.
-   *  @param  __result  An output iterator.
-   *  @param  __pred    A predicate.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies each element in the range @p [__first,__last) for which
-   *  @p __pred returns false to the range beginning at @p __result.
-   *
-   *  remove_copy_if() is stable, so the relative order of elements that are
-   *  copied is unchanged.
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _Predicate>
-    inline _OutputIterator
-    remove_copy_if(_InputIterator __first, _InputIterator __last,
-		   _OutputIterator __result, _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__remove_copy_if(__first, __last, __result,
-				   __gnu_cxx::__ops::__pred_iter(__pred));
-    }
-
-#if __cplusplus >= 201103L
-  /**
-   *  @brief Copy the elements of a sequence for which a predicate is true.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   An input iterator.
-   *  @param  __last    An input iterator.
-   *  @param  __result  An output iterator.
-   *  @param  __pred    A predicate.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies each element in the range @p [__first,__last) for which
-   *  @p __pred returns true to the range beginning at @p __result.
-   *
-   *  copy_if() is stable, so the relative order of elements that are
-   *  copied is unchanged.
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _Predicate>
-    _OutputIterator
-    copy_if(_InputIterator __first, _InputIterator __last,
-	    _OutputIterator __result, _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for (; __first != __last; ++__first)
-	if (__pred(*__first))
-	  {
-	    *__result = *__first;
-	    ++__result;
-	  }
-      return __result;
-    }
-
-  template<typename _InputIterator, typename _Size, typename _OutputIterator>
-    _OutputIterator
-    __copy_n(_InputIterator __first, _Size __n,
-	     _OutputIterator __result, input_iterator_tag)
-    {
-      if (__n > 0)
-	{
-	  while (true)
-	    {
-	      *__result = *__first;
-	      ++__result;
-	      if (--__n > 0)
-		++__first;
-	      else
-		break;
-	    }
-	}
-      return __result;
-    }
-
-  template<typename _RandomAccessIterator, typename _Size,
-	   typename _OutputIterator>
-    inline _OutputIterator
-    __copy_n(_RandomAccessIterator __first, _Size __n,
-	     _OutputIterator __result, random_access_iterator_tag)
-    { return std::copy(__first, __first + __n, __result); }
-
-  /**
-   *  @brief Copies the range [first,first+n) into [result,result+n).
-   *  @ingroup mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __n      The number of elements to copy.
-   *  @param  __result An output iterator.
-   *  @return  result+n.
-   *
-   *  This inline function will boil down to a call to @c memmove whenever
-   *  possible.  Failing that, if random access iterators are passed, then the
-   *  loop count will be known (and therefore a candidate for compiler
-   *  optimizations such as unrolling).
-  */
-  template<typename _InputIterator, typename _Size, typename _OutputIterator>
-    inline _OutputIterator
-    copy_n(_InputIterator __first, _Size __n, _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-
-      return std::__copy_n(__first, __n, __result,
-			   std::__iterator_category(__first));
-    }
-
-  /**
-   *  @brief Copy the elements of a sequence to separate output sequences
-   *         depending on the truth value of a predicate.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   An input iterator.
-   *  @param  __last    An input iterator.
-   *  @param  __out_true   An output iterator.
-   *  @param  __out_false  An output iterator.
-   *  @param  __pred    A predicate.
-   *  @return   A pair designating the ends of the resulting sequences.
-   *
-   *  Copies each element in the range @p [__first,__last) for which
-   *  @p __pred returns true to the range beginning at @p out_true
-   *  and each element for which @p __pred returns false to @p __out_false.
-  */
-  template<typename _InputIterator, typename _OutputIterator1,
-	   typename _OutputIterator2, typename _Predicate>
-    pair<_OutputIterator1, _OutputIterator2>
-    partition_copy(_InputIterator __first, _InputIterator __last,
-		   _OutputIterator1 __out_true, _OutputIterator2 __out_false,
-		   _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator1,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator2,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-      
-      for (; __first != __last; ++__first)
-	if (__pred(*__first))
-	  {
-	    *__out_true = *__first;
-	    ++__out_true;
-	  }
-	else
-	  {
-	    *__out_false = *__first;
-	    ++__out_false;
-	  }
-
-      return pair<_OutputIterator1, _OutputIterator2>(__out_true, __out_false);
-    }
-#endif
-
-  template<typename _ForwardIterator, typename _Predicate>
-    _ForwardIterator
-    __remove_if(_ForwardIterator __first, _ForwardIterator __last,
-		_Predicate __pred)
-    {
-      __first = std::__find_if(__first, __last, __pred);
-      if (__first == __last)
-        return __first;
-      _ForwardIterator __result = __first;
-      ++__first;
-      for (; __first != __last; ++__first)
-        if (!__pred(__first))
-          {
-            *__result = _GLIBCXX_MOVE(*__first);
-            ++__result;
-          }
-      return __result;
-    }
-
-  /**
-   *  @brief Remove elements from a sequence.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __value  The value to be removed.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  All elements equal to @p __value are removed from the range
-   *  @p [__first,__last).
-   *
-   *  remove() is stable, so the relative order of elements that are
-   *  not removed is unchanged.
-   *
-   *  Elements between the end of the resulting sequence and @p __last
-   *  are still present, but their value is unspecified.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    inline _ForwardIterator
-    remove(_ForwardIterator __first, _ForwardIterator __last,
-	   const _Tp& __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__remove_if(__first, __last,
-		__gnu_cxx::__ops::__iter_equals_val(__value));
-    }
-
-  /**
-   *  @brief Remove elements from a sequence using a predicate.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  A forward iterator.
-   *  @param  __last   A forward iterator.
-   *  @param  __pred   A predicate.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  All elements for which @p __pred returns true are removed from the range
-   *  @p [__first,__last).
-   *
-   *  remove_if() is stable, so the relative order of elements that are
-   *  not removed is unchanged.
-   *
-   *  Elements between the end of the resulting sequence and @p __last
-   *  are still present, but their value is unspecified.
-  */
-  template<typename _ForwardIterator, typename _Predicate>
-    inline _ForwardIterator
-    remove_if(_ForwardIterator __first, _ForwardIterator __last,
-	      _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__remove_if(__first, __last,
-			      __gnu_cxx::__ops::__pred_iter(__pred));
-    }
-
-  template<typename _ForwardIterator, typename _BinaryPredicate>
-    _ForwardIterator
-    __adjacent_find(_ForwardIterator __first, _ForwardIterator __last,
-		    _BinaryPredicate __binary_pred)
-    {
-      if (__first == __last)
-	return __last;
-      _ForwardIterator __next = __first;
-      while (++__next != __last)
-	{
-	  if (__binary_pred(__first, __next))
-	    return __first;
-	  __first = __next;
-	}
-      return __last;
-    }
-
-  template<typename _ForwardIterator, typename _BinaryPredicate>
-    _ForwardIterator
-    __unique(_ForwardIterator __first, _ForwardIterator __last,
-	     _BinaryPredicate __binary_pred)
-    {
-      // Skip the beginning, if already unique.
-      __first = std::__adjacent_find(__first, __last, __binary_pred);
-      if (__first == __last)
-	return __last;
-
-      // Do the real copy work.
-      _ForwardIterator __dest = __first;
-      ++__first;
-      while (++__first != __last)
-	if (!__binary_pred(__dest, __first))
-	  *++__dest = _GLIBCXX_MOVE(*__first);
-      return ++__dest;
-    }
-
-  /**
-   *  @brief Remove consecutive duplicate values from a sequence.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  A forward iterator.
-   *  @param  __last   A forward iterator.
-   *  @return  An iterator designating the end of the resulting sequence.
-   *
-   *  Removes all but the first element from each group of consecutive
-   *  values that compare equal.
-   *  unique() is stable, so the relative order of elements that are
-   *  not removed is unchanged.
-   *  Elements between the end of the resulting sequence and @p __last
-   *  are still present, but their value is unspecified.
-  */
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    unique(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_EqualityComparableConcept<
-		     typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__unique(__first, __last,
-			   __gnu_cxx::__ops::__iter_equal_to_iter());
-    }
-
-  /**
-   *  @brief Remove consecutive values from a sequence using a predicate.
-   *  @ingroup mutating_algorithms
-   *  @param  __first        A forward iterator.
-   *  @param  __last         A forward iterator.
-   *  @param  __binary_pred  A binary predicate.
-   *  @return  An iterator designating the end of the resulting sequence.
-   *
-   *  Removes all but the first element from each group of consecutive
-   *  values for which @p __binary_pred returns true.
-   *  unique() is stable, so the relative order of elements that are
-   *  not removed is unchanged.
-   *  Elements between the end of the resulting sequence and @p __last
-   *  are still present, but their value is unspecified.
-  */
-  template<typename _ForwardIterator, typename _BinaryPredicate>
-    inline _ForwardIterator
-    unique(_ForwardIterator __first, _ForwardIterator __last,
-           _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-		typename iterator_traits<_ForwardIterator>::value_type,
-		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__unique(__first, __last,
-			   __gnu_cxx::__ops::__iter_comp_iter(__binary_pred));
-    }
-
-  /**
-   *  This is an uglified
-   *  unique_copy(_InputIterator, _InputIterator, _OutputIterator,
-   *              _BinaryPredicate)
-   *  overloaded for forward iterators and output iterator as result.
-  */
-  template<typename _ForwardIterator, typename _OutputIterator,
-	   typename _BinaryPredicate>
-    _OutputIterator
-    __unique_copy(_ForwardIterator __first, _ForwardIterator __last,
-		  _OutputIterator __result, _BinaryPredicate __binary_pred,
-		  forward_iterator_tag, output_iterator_tag)
-    {
-      // concept requirements -- iterators already checked
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	  typename iterator_traits<_ForwardIterator>::value_type,
-	  typename iterator_traits<_ForwardIterator>::value_type>)
-
-      _ForwardIterator __next = __first;
-      *__result = *__first;
-      while (++__next != __last)
-	if (!__binary_pred(__first, __next))
-	  {
-	    __first = __next;
-	    *++__result = *__first;
-	  }
-      return ++__result;
-    }
-
-  /**
-   *  This is an uglified
-   *  unique_copy(_InputIterator, _InputIterator, _OutputIterator,
-   *              _BinaryPredicate)
-   *  overloaded for input iterators and output iterator as result.
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _BinaryPredicate>
-    _OutputIterator
-    __unique_copy(_InputIterator __first, _InputIterator __last,
-		  _OutputIterator __result, _BinaryPredicate __binary_pred,
-		  input_iterator_tag, output_iterator_tag)
-    {
-      // concept requirements -- iterators already checked
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	  typename iterator_traits<_InputIterator>::value_type,
-	  typename iterator_traits<_InputIterator>::value_type>)
-
-      typename iterator_traits<_InputIterator>::value_type __value = *__first;
-      __decltype(__gnu_cxx::__ops::__iter_comp_val(__binary_pred))
-	__rebound_pred
-	= __gnu_cxx::__ops::__iter_comp_val(__binary_pred);
-      *__result = __value;
-      while (++__first != __last)
-	if (!__rebound_pred(__first, __value))
-	  {
-	    __value = *__first;
-	    *++__result = __value;
-	  }
-      return ++__result;
-    }
-
-  /**
-   *  This is an uglified
-   *  unique_copy(_InputIterator, _InputIterator, _OutputIterator,
-   *              _BinaryPredicate)
-   *  overloaded for input iterators and forward iterator as result.
-  */
-  template<typename _InputIterator, typename _ForwardIterator,
-	   typename _BinaryPredicate>
-    _ForwardIterator
-    __unique_copy(_InputIterator __first, _InputIterator __last,
-		  _ForwardIterator __result, _BinaryPredicate __binary_pred,
-		  input_iterator_tag, forward_iterator_tag)
-    {
-      // concept requirements -- iterators already checked
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	  typename iterator_traits<_ForwardIterator>::value_type,
-	  typename iterator_traits<_InputIterator>::value_type>)
-      *__result = *__first;
-      while (++__first != __last)
-	if (!__binary_pred(__result, __first))
-	  *++__result = *__first;
-      return ++__result;
-    }
-
-  /**
-   *  This is an uglified reverse(_BidirectionalIterator,
-   *                              _BidirectionalIterator)
-   *  overloaded for bidirectional iterators.
-  */
-  template<typename _BidirectionalIterator>
-    void
-    __reverse(_BidirectionalIterator __first, _BidirectionalIterator __last,
-	      bidirectional_iterator_tag)
-    {
-      while (true)
-	if (__first == __last || __first == --__last)
-	  return;
-	else
-	  {
-	    std::iter_swap(__first, __last);
-	    ++__first;
-	  }
-    }
-
-  /**
-   *  This is an uglified reverse(_BidirectionalIterator,
-   *                              _BidirectionalIterator)
-   *  overloaded for random access iterators.
-  */
-  template<typename _RandomAccessIterator>
-    void
-    __reverse(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	      random_access_iterator_tag)
-    {
-      if (__first == __last)
-	return;
-      --__last;
-      while (__first < __last)
-	{
-	  std::iter_swap(__first, __last);
-	  ++__first;
-	  --__last;
-	}
-    }
-
-  /**
-   *  @brief Reverse a sequence.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  A bidirectional iterator.
-   *  @param  __last   A bidirectional iterator.
-   *  @return   reverse() returns no value.
-   *
-   *  Reverses the order of the elements in the range @p [__first,__last),
-   *  so that the first element becomes the last etc.
-   *  For every @c i such that @p 0<=i<=(__last-__first)/2), @p reverse()
-   *  swaps @p *(__first+i) and @p *(__last-(i+1))
-  */
-  template<typename _BidirectionalIterator>
-    inline void
-    reverse(_BidirectionalIterator __first, _BidirectionalIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      std::__reverse(__first, __last, std::__iterator_category(__first));
-    }
-
-  /**
-   *  @brief Copy a sequence, reversing its elements.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   A bidirectional iterator.
-   *  @param  __last    A bidirectional iterator.
-   *  @param  __result  An output iterator.
-   *  @return  An iterator designating the end of the resulting sequence.
-   *
-   *  Copies the elements in the range @p [__first,__last) to the
-   *  range @p [__result,__result+(__last-__first)) such that the
-   *  order of the elements is reversed.  For every @c i such that @p
-   *  0<=i<=(__last-__first), @p reverse_copy() performs the
-   *  assignment @p *(__result+(__last-__first)-1-i) = *(__first+i).
-   *  The ranges @p [__first,__last) and @p
-   *  [__result,__result+(__last-__first)) must not overlap.
-  */
-  template<typename _BidirectionalIterator, typename _OutputIterator>
-    _OutputIterator
-    reverse_copy(_BidirectionalIterator __first, _BidirectionalIterator __last,
-		 _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-		typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      while (__first != __last)
-	{
-	  --__last;
-	  *__result = *__last;
-	  ++__result;
-	}
-      return __result;
-    }
-
-  /**
-   *  This is a helper function for the rotate algorithm specialized on RAIs.
-   *  It returns the greatest common divisor of two integer values.
-  */
-  template<typename _EuclideanRingElement>
-    _EuclideanRingElement
-    __gcd(_EuclideanRingElement __m, _EuclideanRingElement __n)
-    {
-      while (__n != 0)
-	{
-	  _EuclideanRingElement __t = __m % __n;
-	  __m = __n;
-	  __n = __t;
-	}
-      return __m;
-    }
-
-  inline namespace _V2
-  {
-
-  /// This is a helper function for the rotate algorithm.
-  template<typename _ForwardIterator>
-    _ForwardIterator
-    __rotate(_ForwardIterator __first,
-	     _ForwardIterator __middle,
-	     _ForwardIterator __last,
-	     forward_iterator_tag)
-    {
-      if (__first == __middle)
-	return __last;
-      else if (__last  == __middle)
-	return __first;
-
-      _ForwardIterator __first2 = __middle;
-      do
-	{
-	  std::iter_swap(__first, __first2);
-	  ++__first;
-	  ++__first2;
-	  if (__first == __middle)
-	    __middle = __first2;
-	}
-      while (__first2 != __last);
-
-      _ForwardIterator __ret = __first;
-
-      __first2 = __middle;
-
-      while (__first2 != __last)
-	{
-	  std::iter_swap(__first, __first2);
-	  ++__first;
-	  ++__first2;
-	  if (__first == __middle)
-	    __middle = __first2;
-	  else if (__first2 == __last)
-	    __first2 = __middle;
-	}
-      return __ret;
-    }
-
-   /// This is a helper function for the rotate algorithm.
-  template<typename _BidirectionalIterator>
-    _BidirectionalIterator
-    __rotate(_BidirectionalIterator __first,
-	     _BidirectionalIterator __middle,
-	     _BidirectionalIterator __last,
-	      bidirectional_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-
-      if (__first == __middle)
-	return __last;
-      else if (__last  == __middle)
-	return __first;
-
-      std::__reverse(__first,  __middle, bidirectional_iterator_tag());
-      std::__reverse(__middle, __last,   bidirectional_iterator_tag());
-
-      while (__first != __middle && __middle != __last)
-	{
-	  std::iter_swap(__first, --__last);
-	  ++__first;
-	}
-
-      if (__first == __middle)
-	{
-	  std::__reverse(__middle, __last,   bidirectional_iterator_tag());
-	  return __last;
-	}
-      else
-	{
-	  std::__reverse(__first,  __middle, bidirectional_iterator_tag());
-	  return __first;
-	}
-    }
-
-  /// This is a helper function for the rotate algorithm.
-  template<typename _RandomAccessIterator>
-    _RandomAccessIterator
-    __rotate(_RandomAccessIterator __first,
-	     _RandomAccessIterator __middle,
-	     _RandomAccessIterator __last,
-	     random_access_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-
-      if (__first == __middle)
-	return __last;
-      else if (__last  == __middle)
-	return __first;
-
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_Distance;
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      _Distance __n = __last   - __first;
-      _Distance __k = __middle - __first;
-
-      if (__k == __n - __k)
-	{
-	  std::swap_ranges(__first, __middle, __middle);
-	  return __middle;
-	}
-
-      _RandomAccessIterator __p = __first;
-      _RandomAccessIterator __ret = __first + (__last - __middle);
-
-      for (;;)
-	{
-	  if (__k < __n - __k)
-	    {
-	      if (__is_pod(_ValueType) && __k == 1)
-		{
-		  _ValueType __t = _GLIBCXX_MOVE(*__p);
-		  _GLIBCXX_MOVE3(__p + 1, __p + __n, __p);
-		  *(__p + __n - 1) = _GLIBCXX_MOVE(__t);
-		  return __ret;
-		}
-	      _RandomAccessIterator __q = __p + __k;
-	      for (_Distance __i = 0; __i < __n - __k; ++ __i)
-		{
-		  std::iter_swap(__p, __q);
-		  ++__p;
-		  ++__q;
-		}
-	      __n %= __k;
-	      if (__n == 0)
-		return __ret;
-	      std::swap(__n, __k);
-	      __k = __n - __k;
-	    }
-	  else
-	    {
-	      __k = __n - __k;
-	      if (__is_pod(_ValueType) && __k == 1)
-		{
-		  _ValueType __t = _GLIBCXX_MOVE(*(__p + __n - 1));
-		  _GLIBCXX_MOVE_BACKWARD3(__p, __p + __n - 1, __p + __n);
-		  *__p = _GLIBCXX_MOVE(__t);
-		  return __ret;
-		}
-	      _RandomAccessIterator __q = __p + __n;
-	      __p = __q - __k;
-	      for (_Distance __i = 0; __i < __n - __k; ++ __i)
-		{
-		  --__p;
-		  --__q;
-		  std::iter_swap(__p, __q);
-		}
-	      __n %= __k;
-	      if (__n == 0)
-		return __ret;
-	      std::swap(__n, __k);
-	    }
-	}
-    }
-
-   // _GLIBCXX_RESOLVE_LIB_DEFECTS
-   // DR 488. rotate throws away useful information
-  /**
-   *  @brief Rotate the elements of a sequence.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   A forward iterator.
-   *  @param  __middle  A forward iterator.
-   *  @param  __last    A forward iterator.
-   *  @return  first + (last - middle).
-   *
-   *  Rotates the elements of the range @p [__first,__last) by 
-   *  @p (__middle - __first) positions so that the element at @p __middle
-   *  is moved to @p __first, the element at @p __middle+1 is moved to
-   *  @p __first+1 and so on for each element in the range
-   *  @p [__first,__last).
-   *
-   *  This effectively swaps the ranges @p [__first,__middle) and
-   *  @p [__middle,__last).
-   *
-   *  Performs
-   *   @p *(__first+(n+(__last-__middle))%(__last-__first))=*(__first+n)
-   *  for each @p n in the range @p [0,__last-__first).
-  */
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    rotate(_ForwardIterator __first, _ForwardIterator __middle,
-	   _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_requires_valid_range(__first, __middle);
-      __glibcxx_requires_valid_range(__middle, __last);
-
-      return std::__rotate(__first, __middle, __last,
-			   std::__iterator_category(__first));
-    }
-
-  } // namespace _V2
-
-  /**
-   *  @brief Copy a sequence, rotating its elements.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   A forward iterator.
-   *  @param  __middle  A forward iterator.
-   *  @param  __last    A forward iterator.
-   *  @param  __result  An output iterator.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies the elements of the range @p [__first,__last) to the
-   *  range beginning at @result, rotating the copied elements by 
-   *  @p (__middle-__first) positions so that the element at @p __middle
-   *  is moved to @p __result, the element at @p __middle+1 is moved
-   *  to @p __result+1 and so on for each element in the range @p
-   *  [__first,__last).
-   *
-   *  Performs 
-   *  @p *(__result+(n+(__last-__middle))%(__last-__first))=*(__first+n)
-   *  for each @p n in the range @p [0,__last-__first).
-  */
-  template<typename _ForwardIterator, typename _OutputIterator>
-    inline _OutputIterator
-    rotate_copy(_ForwardIterator __first, _ForwardIterator __middle,
-                _ForwardIterator __last, _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __middle);
-      __glibcxx_requires_valid_range(__middle, __last);
-
-      return std::copy(__first, __middle,
-                       std::copy(__middle, __last, __result));
-    }
-
-  /// This is a helper function...
-  template<typename _ForwardIterator, typename _Predicate>
-    _ForwardIterator
-    __partition(_ForwardIterator __first, _ForwardIterator __last,
-		_Predicate __pred, forward_iterator_tag)
-    {
-      if (__first == __last)
-	return __first;
-
-      while (__pred(*__first))
-	if (++__first == __last)
-	  return __first;
-
-      _ForwardIterator __next = __first;
-
-      while (++__next != __last)
-	if (__pred(*__next))
-	  {
-	    std::iter_swap(__first, __next);
-	    ++__first;
-	  }
-
-      return __first;
-    }
-
-  /// This is a helper function...
-  template<typename _BidirectionalIterator, typename _Predicate>
-    _BidirectionalIterator
-    __partition(_BidirectionalIterator __first, _BidirectionalIterator __last,
-		_Predicate __pred, bidirectional_iterator_tag)
-    {
-      while (true)
-	{
-	  while (true)
-	    if (__first == __last)
-	      return __first;
-	    else if (__pred(*__first))
-	      ++__first;
-	    else
-	      break;
-	  --__last;
-	  while (true)
-	    if (__first == __last)
-	      return __first;
-	    else if (!bool(__pred(*__last)))
-	      --__last;
-	    else
-	      break;
-	  std::iter_swap(__first, __last);
-	  ++__first;
-	}
-    }
-
-  // partition
-
-  /// This is a helper function...
-  /// Requires __first != __last and !__pred(__first)
-  /// and __len == distance(__first, __last).
-  ///
-  /// !__pred(__first) allows us to guarantee that we don't
-  /// move-assign an element onto itself.
-  template<typename _ForwardIterator, typename _Pointer, typename _Predicate,
-	   typename _Distance>
-    _ForwardIterator
-    __stable_partition_adaptive(_ForwardIterator __first,
-				_ForwardIterator __last,
-				_Predicate __pred, _Distance __len,
-				_Pointer __buffer,
-				_Distance __buffer_size)
-    {
-      if (__len == 1)
-	return __first;
-
-      if (__len <= __buffer_size)
-	{
-	  _ForwardIterator __result1 = __first;
-	  _Pointer __result2 = __buffer;
-
-	  // The precondition guarantees that !__pred(__first), so
-	  // move that element to the buffer before starting the loop.
-	  // This ensures that we only call __pred once per element.
-	  *__result2 = _GLIBCXX_MOVE(*__first);
-	  ++__result2;
-	  ++__first;
-	  for (; __first != __last; ++__first)
-	    if (__pred(__first))
-	      {
-		*__result1 = _GLIBCXX_MOVE(*__first);
-		++__result1;
-	      }
-	    else
-	      {
-		*__result2 = _GLIBCXX_MOVE(*__first);
-		++__result2;
-	      }
-
-	  _GLIBCXX_MOVE3(__buffer, __result2, __result1);
-	  return __result1;
-	}
-
-      _ForwardIterator __middle = __first;
-      std::advance(__middle, __len / 2);
-      _ForwardIterator __left_split =
-	std::__stable_partition_adaptive(__first, __middle, __pred,
-					 __len / 2, __buffer,
-					 __buffer_size);
-
-      // Advance past true-predicate values to satisfy this
-      // function's preconditions.
-      _Distance __right_len = __len - __len / 2;
-      _ForwardIterator __right_split =
-	std::__find_if_not_n(__middle, __right_len, __pred);
-
-      if (__right_len)
-	__right_split =
-	  std::__stable_partition_adaptive(__right_split, __last, __pred,
-					   __right_len,
-					   __buffer, __buffer_size);
-
-      std::rotate(__left_split, __middle, __right_split);
-      std::advance(__left_split, std::distance(__middle, __right_split));
-      return __left_split;
-    }
-
-  template<typename _ForwardIterator, typename _Predicate>
-    _ForwardIterator
-    __stable_partition(_ForwardIterator __first, _ForwardIterator __last,
-		       _Predicate __pred)
-    {
-      __first = std::__find_if_not(__first, __last, __pred);
-
-      if (__first == __last)
-	return __first;
-
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      _Temporary_buffer<_ForwardIterator, _ValueType> __buf(__first, __last);
-      return
-	std::__stable_partition_adaptive(__first, __last, __pred,
-					 _DistanceType(__buf.requested_size()),
-					 __buf.begin(),
-					 _DistanceType(__buf.size()));
-    }
-
-  /**
-   *  @brief Move elements for which a predicate is true to the beginning
-   *         of a sequence, preserving relative ordering.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   A forward iterator.
-   *  @param  __last    A forward iterator.
-   *  @param  __pred    A predicate functor.
-   *  @return  An iterator @p middle such that @p __pred(i) is true for each
-   *  iterator @p i in the range @p [first,middle) and false for each @p i
-   *  in the range @p [middle,last).
-   *
-   *  Performs the same function as @p partition() with the additional
-   *  guarantee that the relative ordering of elements in each group is
-   *  preserved, so any two elements @p x and @p y in the range
-   *  @p [__first,__last) such that @p __pred(x)==__pred(y) will have the same
-   *  relative ordering after calling @p stable_partition().
-  */
-  template<typename _ForwardIterator, typename _Predicate>
-    inline _ForwardIterator
-    stable_partition(_ForwardIterator __first, _ForwardIterator __last,
-		     _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__stable_partition(__first, __last,
-				     __gnu_cxx::__ops::__pred_iter(__pred));
-    }
-
-  /// This is a helper function for the sort routines.
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    __heap_select(_RandomAccessIterator __first,
-		  _RandomAccessIterator __middle,
-		  _RandomAccessIterator __last, _Compare __comp)
-    {
-      std::__make_heap(__first, __middle, __comp);
-      for (_RandomAccessIterator __i = __middle; __i < __last; ++__i)
-	if (__comp(__i, __first))
-	  std::__pop_heap(__first, __middle, __i, __comp);
-    }
-
-  // partial_sort
-
-  template<typename _InputIterator, typename _RandomAccessIterator,
-	   typename _Compare>
-    _RandomAccessIterator
-    __partial_sort_copy(_InputIterator __first, _InputIterator __last,
-			_RandomAccessIterator __result_first,
-			_RandomAccessIterator __result_last,
-			_Compare __comp)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type
-	_InputValueType;
-      typedef iterator_traits<_RandomAccessIterator> _RItTraits;
-      typedef typename _RItTraits::difference_type _DistanceType;
-
-      if (__result_first == __result_last)
-	return __result_last;
-      _RandomAccessIterator __result_real_last = __result_first;
-      while (__first != __last && __result_real_last != __result_last)
-	{
-	  *__result_real_last = *__first;
-	  ++__result_real_last;
-	  ++__first;
-	}
-      
-      std::__make_heap(__result_first, __result_real_last, __comp);
-      while (__first != __last)
-	{
-	  if (__comp(__first, __result_first))
-	    std::__adjust_heap(__result_first, _DistanceType(0),
-			       _DistanceType(__result_real_last
-					     - __result_first),
-			       _InputValueType(*__first), __comp);
-	  ++__first;
-	}
-      std::__sort_heap(__result_first, __result_real_last, __comp);
-      return __result_real_last;
-    }
-
-  /**
-   *  @brief Copy the smallest elements of a sequence.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __result_first   A random-access iterator.
-   *  @param  __result_last    Another random-access iterator.
-   *  @return   An iterator indicating the end of the resulting sequence.
-   *
-   *  Copies and sorts the smallest N values from the range @p [__first,__last)
-   *  to the range beginning at @p __result_first, where the number of
-   *  elements to be copied, @p N, is the smaller of @p (__last-__first) and
-   *  @p (__result_last-__result_first).
-   *  After the sort if @e i and @e j are iterators in the range
-   *  @p [__result_first,__result_first+N) such that i precedes j then
-   *  *j<*i is false.
-   *  The value returned is @p __result_first+N.
-  */
-  template<typename _InputIterator, typename _RandomAccessIterator>
-    inline _RandomAccessIterator
-    partial_sort_copy(_InputIterator __first, _InputIterator __last,
-		      _RandomAccessIterator __result_first,
-		      _RandomAccessIterator __result_last)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type
-	_InputValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_OutputValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_ConvertibleConcept<_InputValueType,
-				  _OutputValueType>)
-      __glibcxx_function_requires(_LessThanOpConcept<_InputValueType,
-				                     _OutputValueType>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_OutputValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_valid_range(__result_first, __result_last);
-
-      return std::__partial_sort_copy(__first, __last,
-				      __result_first, __result_last,
-				      __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief Copy the smallest elements of a sequence using a predicate for
-   *         comparison.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An input iterator.
-   *  @param  __last    Another input iterator.
-   *  @param  __result_first   A random-access iterator.
-   *  @param  __result_last    Another random-access iterator.
-   *  @param  __comp    A comparison functor.
-   *  @return   An iterator indicating the end of the resulting sequence.
-   *
-   *  Copies and sorts the smallest N values from the range @p [__first,__last)
-   *  to the range beginning at @p result_first, where the number of
-   *  elements to be copied, @p N, is the smaller of @p (__last-__first) and
-   *  @p (__result_last-__result_first).
-   *  After the sort if @e i and @e j are iterators in the range
-   *  @p [__result_first,__result_first+N) such that i precedes j then
-   *  @p __comp(*j,*i) is false.
-   *  The value returned is @p __result_first+N.
-  */
-  template<typename _InputIterator, typename _RandomAccessIterator,
-	   typename _Compare>
-    inline _RandomAccessIterator
-    partial_sort_copy(_InputIterator __first, _InputIterator __last,
-		      _RandomAccessIterator __result_first,
-		      _RandomAccessIterator __result_last,
-		      _Compare __comp)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type
-	_InputValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_OutputValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __glibcxx_function_requires(_ConvertibleConcept<_InputValueType,
-				  _OutputValueType>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _InputValueType, _OutputValueType>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _OutputValueType, _OutputValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_valid_range(__result_first, __result_last);
-
-      return std::__partial_sort_copy(__first, __last,
-				      __result_first, __result_last,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  /// This is a helper function for the sort routine.
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    __unguarded_linear_insert(_RandomAccessIterator __last,
-			      _Compare __comp)
-    {
-      typename iterator_traits<_RandomAccessIterator>::value_type
-	__val = _GLIBCXX_MOVE(*__last);
-      _RandomAccessIterator __next = __last;
-      --__next;
-      while (__comp(__val, __next))
-	{
-	  *__last = _GLIBCXX_MOVE(*__next);
-	  __last = __next;
-	  --__next;
-	}
-      *__last = _GLIBCXX_MOVE(__val);
-    }
-
-  /// This is a helper function for the sort routine.
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    __insertion_sort(_RandomAccessIterator __first,
-		     _RandomAccessIterator __last, _Compare __comp)
-    {
-      if (__first == __last) return;
-
-      for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-	{
-	  if (__comp(__i, __first))
-	    {
-	      typename iterator_traits<_RandomAccessIterator>::value_type
-		__val = _GLIBCXX_MOVE(*__i);
-	      _GLIBCXX_MOVE_BACKWARD3(__first, __i, __i + 1);
-	      *__first = _GLIBCXX_MOVE(__val);
-	    }
-	  else
-	    std::__unguarded_linear_insert(__i,
-				__gnu_cxx::__ops::__val_comp_iter(__comp));
-	}
-    }
-
-  /// This is a helper function for the sort routine.
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    __unguarded_insertion_sort(_RandomAccessIterator __first,
-			       _RandomAccessIterator __last, _Compare __comp)
-    {
-      for (_RandomAccessIterator __i = __first; __i != __last; ++__i)
-	std::__unguarded_linear_insert(__i,
-				__gnu_cxx::__ops::__val_comp_iter(__comp));
-    }
-
-  /**
-   *  @doctodo
-   *  This controls some aspect of the sort routines.
-  */
-  enum { _S_threshold = 16 };
-
-  /// This is a helper function for the sort routine.
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    __final_insertion_sort(_RandomAccessIterator __first,
-			   _RandomAccessIterator __last, _Compare __comp)
-    {
-      if (__last - __first > int(_S_threshold))
-	{
-	  std::__insertion_sort(__first, __first + int(_S_threshold), __comp);
-	  std::__unguarded_insertion_sort(__first + int(_S_threshold), __last,
-					  __comp);
-	}
-      else
-	std::__insertion_sort(__first, __last, __comp);
-    }
-
-  /// This is a helper function...
-  template<typename _RandomAccessIterator, typename _Compare>
-    _RandomAccessIterator
-    __unguarded_partition(_RandomAccessIterator __first,
-			  _RandomAccessIterator __last,
-			  _RandomAccessIterator __pivot, _Compare __comp)
-    {
-      while (true)
-	{
-	  while (__comp(__first, __pivot))
-	    ++__first;
-	  --__last;
-	  while (__comp(__pivot, __last))
-	    --__last;
-	  if (!(__first < __last))
-	    return __first;
-	  std::iter_swap(__first, __last);
-	  ++__first;
-	}
-    }
-
-  /// This is a helper function...
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline _RandomAccessIterator
-    __unguarded_partition_pivot(_RandomAccessIterator __first,
-				_RandomAccessIterator __last, _Compare __comp)
-    {
-      _RandomAccessIterator __mid = __first + (__last - __first) / 2;
-      std::__move_median_to_first(__first, __first + 1, __mid, __last - 1,
-				  __comp);
-      return std::__unguarded_partition(__first + 1, __last, __first, __comp);
-    }
-
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    __partial_sort(_RandomAccessIterator __first,
-		   _RandomAccessIterator __middle,
-		   _RandomAccessIterator __last,
-		   _Compare __comp)
-    {
-      std::__heap_select(__first, __middle, __last, __comp);
-      std::__sort_heap(__first, __middle, __comp);
-    }
-
-  /// This is a helper function for the sort routine.
-  template<typename _RandomAccessIterator, typename _Size, typename _Compare>
-    void
-    __introsort_loop(_RandomAccessIterator __first,
-		     _RandomAccessIterator __last,
-		     _Size __depth_limit, _Compare __comp)
-    {
-      while (__last - __first > int(_S_threshold))
-	{
-	  if (__depth_limit == 0)
-	    {
-	      std::__partial_sort(__first, __last, __last, __comp);
-	      return;
-	    }
-	  --__depth_limit;
-	  _RandomAccessIterator __cut =
-	    std::__unguarded_partition_pivot(__first, __last, __comp);
-	  std::__introsort_loop(__cut, __last, __depth_limit, __comp);
-	  __last = __cut;
-	}
-    }
-
-  // sort
-
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    __sort(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	   _Compare __comp)
-    {
-      if (__first != __last)
-	{
-	  std::__introsort_loop(__first, __last,
-				std::__lg(__last - __first) * 2,
-				__comp);
-	  std::__final_insertion_sort(__first, __last, __comp);
-	}
-    }
-
-  template<typename _RandomAccessIterator, typename _Size, typename _Compare>
-    void
-    __introselect(_RandomAccessIterator __first, _RandomAccessIterator __nth,
-		  _RandomAccessIterator __last, _Size __depth_limit,
-		  _Compare __comp)
-    {
-      while (__last - __first > 3)
-	{
-	  if (__depth_limit == 0)
-	    {
-	      std::__heap_select(__first, __nth + 1, __last, __comp);
-	      // Place the nth largest element in its final position.
-	      std::iter_swap(__first, __nth);
-	      return;
-	    }
-	  --__depth_limit;
-	  _RandomAccessIterator __cut =
-	    std::__unguarded_partition_pivot(__first, __last, __comp);
-	  if (__cut <= __nth)
-	    __first = __cut;
-	  else
-	    __last = __cut;
-	}
-      std::__insertion_sort(__first, __last, __comp);
-    }
-
-  // nth_element
-
-  // lower_bound moved to stl_algobase.h
-
-  /**
-   *  @brief Finds the first position in which @p __val could be inserted
-   *         without changing the ordering.
-   *  @ingroup binary_search_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __val     The search term.
-   *  @param  __comp    A functor to use for comparisons.
-   *  @return An iterator pointing to the first element <em>not less
-   *           than</em> @p __val, or end() if every element is less
-   *           than @p __val.
-   *  @ingroup binary_search_algorithms
-   *
-   *  The comparison function should have the same effects on ordering as
-   *  the function used for the initial sort.
-  */
-  template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    inline _ForwardIterator
-    lower_bound(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val, _Compare __comp)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _ValueType, _Tp>)
-      __glibcxx_requires_partitioned_lower_pred(__first, __last,
-						__val, __comp);
-
-      return std::__lower_bound(__first, __last, __val,
-				__gnu_cxx::__ops::__iter_comp_val(__comp));
-    }
-
-  template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    _ForwardIterator
-    __upper_bound(_ForwardIterator __first, _ForwardIterator __last,
-		  const _Tp& __val, _Compare __comp)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      _DistanceType __len = std::distance(__first, __last);
-
-      while (__len > 0)
-	{
-	  _DistanceType __half = __len >> 1;
-	  _ForwardIterator __middle = __first;
-	  std::advance(__middle, __half);
-	  if (__comp(__val, __middle))
-	    __len = __half;
-	  else
-	    {
-	      __first = __middle;
-	      ++__first;
-	      __len = __len - __half - 1;
-	    }
-	}
-      return __first;
-    }
-
-  /**
-   *  @brief Finds the last position in which @p __val could be inserted
-   *         without changing the ordering.
-   *  @ingroup binary_search_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __val     The search term.
-   *  @return  An iterator pointing to the first element greater than @p __val,
-   *           or end() if no elements are greater than @p __val.
-   *  @ingroup binary_search_algorithms
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    inline _ForwardIterator
-    upper_bound(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanOpConcept<_Tp, _ValueType>)
-      __glibcxx_requires_partitioned_upper(__first, __last, __val);
-
-      return std::__upper_bound(__first, __last, __val,
-				__gnu_cxx::__ops::__val_less_iter());
-    }
-
-  /**
-   *  @brief Finds the last position in which @p __val could be inserted
-   *         without changing the ordering.
-   *  @ingroup binary_search_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __val     The search term.
-   *  @param  __comp    A functor to use for comparisons.
-   *  @return  An iterator pointing to the first element greater than @p __val,
-   *           or end() if no elements are greater than @p __val.
-   *  @ingroup binary_search_algorithms
-   *
-   *  The comparison function should have the same effects on ordering as
-   *  the function used for the initial sort.
-  */
-  template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    inline _ForwardIterator
-    upper_bound(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val, _Compare __comp)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _Tp, _ValueType>)
-      __glibcxx_requires_partitioned_upper_pred(__first, __last,
-						__val, __comp);
-
-      return std::__upper_bound(__first, __last, __val,
-				__gnu_cxx::__ops::__val_comp_iter(__comp));
-    }
-
-  template<typename _ForwardIterator, typename _Tp,
-	   typename _CompareItTp, typename _CompareTpIt>
-    pair<_ForwardIterator, _ForwardIterator>
-    __equal_range(_ForwardIterator __first, _ForwardIterator __last,
-		  const _Tp& __val,
-		  _CompareItTp __comp_it_val, _CompareTpIt __comp_val_it)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      _DistanceType __len = std::distance(__first, __last);
-
-      while (__len > 0)
-	{
-	  _DistanceType __half = __len >> 1;
-	  _ForwardIterator __middle = __first;
-	  std::advance(__middle, __half);
-	  if (__comp_it_val(__middle, __val))
-	    {
-	      __first = __middle;
-	      ++__first;
-	      __len = __len - __half - 1;
-	    }
-	  else if (__comp_val_it(__val, __middle))
-	    __len = __half;
-	  else
-	    {
-	      _ForwardIterator __left
-		= std::__lower_bound(__first, __middle, __val, __comp_it_val);
-	      std::advance(__first, __len);
-	      _ForwardIterator __right
-		= std::__upper_bound(++__middle, __first, __val, __comp_val_it);
-	      return pair<_ForwardIterator, _ForwardIterator>(__left, __right);
-	    }
-	}
-      return pair<_ForwardIterator, _ForwardIterator>(__first, __first);
-    }
-
-  /**
-   *  @brief Finds the largest subrange in which @p __val could be inserted
-   *         at any place in it without changing the ordering.
-   *  @ingroup binary_search_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __val     The search term.
-   *  @return  An pair of iterators defining the subrange.
-   *  @ingroup binary_search_algorithms
-   *
-   *  This is equivalent to
-   *  @code
-   *    std::make_pair(lower_bound(__first, __last, __val),
-   *                   upper_bound(__first, __last, __val))
-   *  @endcode
-   *  but does not actually call those functions.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    inline pair<_ForwardIterator, _ForwardIterator>
-    equal_range(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType, _Tp>)
-      __glibcxx_function_requires(_LessThanOpConcept<_Tp, _ValueType>)
-      __glibcxx_requires_partitioned_lower(__first, __last, __val);
-      __glibcxx_requires_partitioned_upper(__first, __last, __val);      
-
-      return std::__equal_range(__first, __last, __val,
-				__gnu_cxx::__ops::__iter_less_val(),
-				__gnu_cxx::__ops::__val_less_iter());
-    }
-
-  /**
-   *  @brief Finds the largest subrange in which @p __val could be inserted
-   *         at any place in it without changing the ordering.
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __val     The search term.
-   *  @param  __comp    A functor to use for comparisons.
-   *  @return  An pair of iterators defining the subrange.
-   *  @ingroup binary_search_algorithms
-   *
-   *  This is equivalent to
-   *  @code
-   *    std::make_pair(lower_bound(__first, __last, __val, __comp),
-   *                   upper_bound(__first, __last, __val, __comp))
-   *  @endcode
-   *  but does not actually call those functions.
-  */
-  template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    inline pair<_ForwardIterator, _ForwardIterator>
-    equal_range(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val, _Compare __comp)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _ValueType, _Tp>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _Tp, _ValueType>)
-      __glibcxx_requires_partitioned_lower_pred(__first, __last,
-						__val, __comp);
-      __glibcxx_requires_partitioned_upper_pred(__first, __last,
-						__val, __comp);
-
-      return std::__equal_range(__first, __last, __val,
-				__gnu_cxx::__ops::__iter_comp_val(__comp),
-				__gnu_cxx::__ops::__val_comp_iter(__comp));
-    }
-
-  /**
-   *  @brief Determines whether an element exists in a range.
-   *  @ingroup binary_search_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __val     The search term.
-   *  @return True if @p __val (or its equivalent) is in [@p
-   *  __first,@p __last ].
-   *
-   *  Note that this does not actually return an iterator to @p __val.  For
-   *  that, use std::find or a container's specialized find member functions.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    bool
-    binary_search(_ForwardIterator __first, _ForwardIterator __last,
-                  const _Tp& __val)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanOpConcept<_Tp, _ValueType>)
-      __glibcxx_requires_partitioned_lower(__first, __last, __val);
-      __glibcxx_requires_partitioned_upper(__first, __last, __val);
-
-      _ForwardIterator __i
-	= std::__lower_bound(__first, __last, __val,
-			     __gnu_cxx::__ops::__iter_less_val());
-      return __i != __last && !(__val < *__i);
-    }
-
-  /**
-   *  @brief Determines whether an element exists in a range.
-   *  @ingroup binary_search_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __val     The search term.
-   *  @param  __comp    A functor to use for comparisons.
-   *  @return  True if @p __val (or its equivalent) is in @p [__first,__last].
-   *
-   *  Note that this does not actually return an iterator to @p __val.  For
-   *  that, use std::find or a container's specialized find member functions.
-   *
-   *  The comparison function should have the same effects on ordering as
-   *  the function used for the initial sort.
-  */
-  template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    bool
-    binary_search(_ForwardIterator __first, _ForwardIterator __last,
-                  const _Tp& __val, _Compare __comp)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _Tp, _ValueType>)
-      __glibcxx_requires_partitioned_lower_pred(__first, __last,
-						__val, __comp);
-      __glibcxx_requires_partitioned_upper_pred(__first, __last,
-						__val, __comp);
-
-      _ForwardIterator __i
-	= std::__lower_bound(__first, __last, __val,
-			     __gnu_cxx::__ops::__iter_comp_val(__comp));
-      return __i != __last && !bool(__comp(__val, *__i));
-    }
-
-  // merge
-
-  /// This is a helper function for the __merge_adaptive routines.
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    void
-    __move_merge_adaptive(_InputIterator1 __first1, _InputIterator1 __last1,
-			  _InputIterator2 __first2, _InputIterator2 __last2,
-			  _OutputIterator __result, _Compare __comp)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-	{
-	  if (__comp(__first2, __first1))
-	    {
-	      *__result = _GLIBCXX_MOVE(*__first2);
-	      ++__first2;
-	    }
-	  else
-	    {
-	      *__result = _GLIBCXX_MOVE(*__first1);
-	      ++__first1;
-	    }
-	  ++__result;
-	}
-      if (__first1 != __last1)
-	_GLIBCXX_MOVE3(__first1, __last1, __result);
-    }
-
-  /// This is a helper function for the __merge_adaptive routines.
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
-	   typename _BidirectionalIterator3, typename _Compare>
-    void
-    __move_merge_adaptive_backward(_BidirectionalIterator1 __first1,
-				   _BidirectionalIterator1 __last1,
-				   _BidirectionalIterator2 __first2,
-				   _BidirectionalIterator2 __last2,
-				   _BidirectionalIterator3 __result,
-				   _Compare __comp)
-    {
-      if (__first1 == __last1)
-	{
-	  _GLIBCXX_MOVE_BACKWARD3(__first2, __last2, __result);
-	  return;
-	}
-      else if (__first2 == __last2)
-	return;
-
-      --__last1;
-      --__last2;
-      while (true)
-	{
-	  if (__comp(__last2, __last1))
-	    {
-	      *--__result = _GLIBCXX_MOVE(*__last1);
-	      if (__first1 == __last1)
-		{
-		  _GLIBCXX_MOVE_BACKWARD3(__first2, ++__last2, __result);
-		  return;
-		}
-	      --__last1;
-	    }
-	  else
-	    {
-	      *--__result = _GLIBCXX_MOVE(*__last2);
-	      if (__first2 == __last2)
-		return;
-	      --__last2;
-	    }
-	}
-    }
-
-  /// This is a helper function for the merge routines.
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
-	   typename _Distance>
-    _BidirectionalIterator1
-    __rotate_adaptive(_BidirectionalIterator1 __first,
-		      _BidirectionalIterator1 __middle,
-		      _BidirectionalIterator1 __last,
-		      _Distance __len1, _Distance __len2,
-		      _BidirectionalIterator2 __buffer,
-		      _Distance __buffer_size)
-    {
-      _BidirectionalIterator2 __buffer_end;
-      if (__len1 > __len2 && __len2 <= __buffer_size)
-	{
-	  if (__len2)
-	    {
-	      __buffer_end = _GLIBCXX_MOVE3(__middle, __last, __buffer);
-	      _GLIBCXX_MOVE_BACKWARD3(__first, __middle, __last);
-	      return _GLIBCXX_MOVE3(__buffer, __buffer_end, __first);
-	    }
-	  else
-	    return __first;
-	}
-      else if (__len1 <= __buffer_size)
-	{
-	  if (__len1)
-	    {
-	      __buffer_end = _GLIBCXX_MOVE3(__first, __middle, __buffer);
-	      _GLIBCXX_MOVE3(__middle, __last, __first);
-	      return _GLIBCXX_MOVE_BACKWARD3(__buffer, __buffer_end, __last);
-	    }
-	  else
-	    return __last;
-	}
-      else
-	{
-	  std::rotate(__first, __middle, __last);
-	  std::advance(__first, std::distance(__middle, __last));
-	  return __first;
-	}
-    }
-
-  /// This is a helper function for the merge routines.
-  template<typename _BidirectionalIterator, typename _Distance, 
-	   typename _Pointer, typename _Compare>
-    void
-    __merge_adaptive(_BidirectionalIterator __first,
-                     _BidirectionalIterator __middle,
-		     _BidirectionalIterator __last,
-		     _Distance __len1, _Distance __len2,
-		     _Pointer __buffer, _Distance __buffer_size,
-		     _Compare __comp)
-    {
-      if (__len1 <= __len2 && __len1 <= __buffer_size)
-	{
-	  _Pointer __buffer_end = _GLIBCXX_MOVE3(__first, __middle, __buffer);
-	  std::__move_merge_adaptive(__buffer, __buffer_end, __middle, __last,
-				     __first, __comp);
-	}
-      else if (__len2 <= __buffer_size)
-	{
-	  _Pointer __buffer_end = _GLIBCXX_MOVE3(__middle, __last, __buffer);
-	  std::__move_merge_adaptive_backward(__first, __middle, __buffer,
-					      __buffer_end, __last, __comp);
-	}
-      else
-	{
-	  _BidirectionalIterator __first_cut = __first;
-	  _BidirectionalIterator __second_cut = __middle;
-	  _Distance __len11 = 0;
-	  _Distance __len22 = 0;
-	  if (__len1 > __len2)
-	    {
-	      __len11 = __len1 / 2;
-	      std::advance(__first_cut, __len11);
-	      __second_cut
-		= std::__lower_bound(__middle, __last, *__first_cut,
-				     __gnu_cxx::__ops::__iter_comp_val(__comp));
-	      __len22 = std::distance(__middle, __second_cut);
-	    }
-	  else
-	    {
-	      __len22 = __len2 / 2;
-	      std::advance(__second_cut, __len22);
-	      __first_cut
-		= std::__upper_bound(__first, __middle, *__second_cut,
-				     __gnu_cxx::__ops::__val_comp_iter(__comp));
-	      __len11 = std::distance(__first, __first_cut);
-	    }
-
-	  _BidirectionalIterator __new_middle
-	    = std::__rotate_adaptive(__first_cut, __middle, __second_cut,
-				     __len1 - __len11, __len22, __buffer,
-				     __buffer_size);
-	  std::__merge_adaptive(__first, __first_cut, __new_middle, __len11,
-				__len22, __buffer, __buffer_size, __comp);
-	  std::__merge_adaptive(__new_middle, __second_cut, __last,
-				__len1 - __len11,
-				__len2 - __len22, __buffer,
-				__buffer_size, __comp);
-	}
-    }
-
-  /// This is a helper function for the merge routines.
-  template<typename _BidirectionalIterator, typename _Distance,
-	   typename _Compare>
-    void
-    __merge_without_buffer(_BidirectionalIterator __first,
-                           _BidirectionalIterator __middle,
-			   _BidirectionalIterator __last,
-			   _Distance __len1, _Distance __len2,
-			   _Compare __comp)
-    {
-      if (__len1 == 0 || __len2 == 0)
-	return;
-
-      if (__len1 + __len2 == 2)
-	{
-	  if (__comp(__middle, __first))
-	    std::iter_swap(__first, __middle);
-	  return;
-	}
-
-      _BidirectionalIterator __first_cut = __first;
-      _BidirectionalIterator __second_cut = __middle;
-      _Distance __len11 = 0;
-      _Distance __len22 = 0;
-      if (__len1 > __len2)
-	{
-	  __len11 = __len1 / 2;
-	  std::advance(__first_cut, __len11);
-	  __second_cut
-	    = std::__lower_bound(__middle, __last, *__first_cut,
-				 __gnu_cxx::__ops::__iter_comp_val(__comp));
-	  __len22 = std::distance(__middle, __second_cut);
-	}
-      else
-	{
-	  __len22 = __len2 / 2;
-	  std::advance(__second_cut, __len22);
-	  __first_cut
-	    = std::__upper_bound(__first, __middle, *__second_cut,
-				 __gnu_cxx::__ops::__val_comp_iter(__comp));
-	  __len11 = std::distance(__first, __first_cut);
-	}
-
-      std::rotate(__first_cut, __middle, __second_cut);
-      _BidirectionalIterator __new_middle = __first_cut;
-      std::advance(__new_middle, std::distance(__middle, __second_cut));
-      std::__merge_without_buffer(__first, __first_cut, __new_middle,
-				  __len11, __len22, __comp);
-      std::__merge_without_buffer(__new_middle, __second_cut, __last,
-				  __len1 - __len11, __len2 - __len22, __comp);
-    }
-
-  template<typename _BidirectionalIterator, typename _Compare>
-    void
-    __inplace_merge(_BidirectionalIterator __first,
-		    _BidirectionalIterator __middle,
-		    _BidirectionalIterator __last,
-		    _Compare __comp)
-    {
-      typedef typename iterator_traits<_BidirectionalIterator>::value_type
-          _ValueType;
-      typedef typename iterator_traits<_BidirectionalIterator>::difference_type
-          _DistanceType;
-
-      if (__first == __middle || __middle == __last)
-	return;
-
-      const _DistanceType __len1 = std::distance(__first, __middle);
-      const _DistanceType __len2 = std::distance(__middle, __last);
-
-      typedef _Temporary_buffer<_BidirectionalIterator, _ValueType> _TmpBuf;
-      _TmpBuf __buf(__first, __last);
-
-      if (__buf.begin() == 0)
-	std::__merge_without_buffer
-	  (__first, __middle, __last, __len1, __len2, __comp);
-      else
-	std::__merge_adaptive
-	  (__first, __middle, __last, __len1, __len2, __buf.begin(),
-	   _DistanceType(__buf.size()), __comp);
-    }
-
-  /**
-   *  @brief Merges two sorted ranges in place.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __middle  Another iterator.
-   *  @param  __last    Another iterator.
-   *  @return  Nothing.
-   *
-   *  Merges two sorted and consecutive ranges, [__first,__middle) and
-   *  [__middle,__last), and puts the result in [__first,__last).  The
-   *  output will be sorted.  The sort is @e stable, that is, for
-   *  equivalent elements in the two ranges, elements from the first
-   *  range will always come before elements from the second.
-   *
-   *  If enough additional memory is available, this takes (__last-__first)-1
-   *  comparisons.  Otherwise an NlogN algorithm is used, where N is
-   *  distance(__first,__last).
-  */
-  template<typename _BidirectionalIterator>
-    inline void
-    inplace_merge(_BidirectionalIterator __first,
-		  _BidirectionalIterator __middle,
-		  _BidirectionalIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
-	    _BidirectionalIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_sorted(__first, __middle);
-      __glibcxx_requires_sorted(__middle, __last);
-
-      std::__inplace_merge(__first, __middle, __last,
-			   __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief Merges two sorted ranges in place.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __middle  Another iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __comp    A functor to use for comparisons.
-   *  @return  Nothing.
-   *
-   *  Merges two sorted and consecutive ranges, [__first,__middle) and
-   *  [middle,last), and puts the result in [__first,__last).  The output will
-   *  be sorted.  The sort is @e stable, that is, for equivalent
-   *  elements in the two ranges, elements from the first range will always
-   *  come before elements from the second.
-   *
-   *  If enough additional memory is available, this takes (__last-__first)-1
-   *  comparisons.  Otherwise an NlogN algorithm is used, where N is
-   *  distance(__first,__last).
-   *
-   *  The comparison function should have the same effects on ordering as
-   *  the function used for the initial sort.
-  */
-  template<typename _BidirectionalIterator, typename _Compare>
-    inline void
-    inplace_merge(_BidirectionalIterator __first,
-		  _BidirectionalIterator __middle,
-		  _BidirectionalIterator __last,
-		  _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
-	    _BidirectionalIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_BidirectionalIterator>::value_type,
-	    typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_sorted_pred(__first, __middle, __comp);
-      __glibcxx_requires_sorted_pred(__middle, __last, __comp);
-
-      std::__inplace_merge(__first, __middle, __last,
-			   __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-
-  /// This is a helper function for the __merge_sort_loop routines.
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _Compare>
-    _OutputIterator
-    __move_merge(_InputIterator __first1, _InputIterator __last1,
-		 _InputIterator __first2, _InputIterator __last2,
-		 _OutputIterator __result, _Compare __comp)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-	{
-	  if (__comp(__first2, __first1))
-	    {
-	      *__result = _GLIBCXX_MOVE(*__first2);
-	      ++__first2;
-	    }
-	  else
-	    {
-	      *__result = _GLIBCXX_MOVE(*__first1);
-	      ++__first1;
-	    }
-	  ++__result;
-	}
-      return _GLIBCXX_MOVE3(__first2, __last2,
-			    _GLIBCXX_MOVE3(__first1, __last1,
-					   __result));
-    }
-
-  template<typename _RandomAccessIterator1, typename _RandomAccessIterator2,
-	   typename _Distance, typename _Compare>
-    void
-    __merge_sort_loop(_RandomAccessIterator1 __first,
-		      _RandomAccessIterator1 __last,
-		      _RandomAccessIterator2 __result, _Distance __step_size,
-		      _Compare __comp)
-    {
-      const _Distance __two_step = 2 * __step_size;
-
-      while (__last - __first >= __two_step)
-	{
-	  __result = std::__move_merge(__first, __first + __step_size,
-				       __first + __step_size,
-				       __first + __two_step,
-				       __result, __comp);
-	  __first += __two_step;
-	}
-      __step_size = std::min(_Distance(__last - __first), __step_size);
-
-      std::__move_merge(__first, __first + __step_size,
-			__first + __step_size, __last, __result, __comp);
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance,
-	   typename _Compare>
-    void
-    __chunk_insertion_sort(_RandomAccessIterator __first,
-			   _RandomAccessIterator __last,
-			   _Distance __chunk_size, _Compare __comp)
-    {
-      while (__last - __first >= __chunk_size)
-	{
-	  std::__insertion_sort(__first, __first + __chunk_size, __comp);
-	  __first += __chunk_size;
-	}
-      std::__insertion_sort(__first, __last, __comp);
-    }
-
-  enum { _S_chunk_size = 7 };
-
-  template<typename _RandomAccessIterator, typename _Pointer, typename _Compare>
-    void
-    __merge_sort_with_buffer(_RandomAccessIterator __first,
-			     _RandomAccessIterator __last,
-                             _Pointer __buffer, _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_Distance;
-
-      const _Distance __len = __last - __first;
-      const _Pointer __buffer_last = __buffer + __len;
-
-      _Distance __step_size = _S_chunk_size;
-      std::__chunk_insertion_sort(__first, __last, __step_size, __comp);
-
-      while (__step_size < __len)
-	{
-	  std::__merge_sort_loop(__first, __last, __buffer,
-				 __step_size, __comp);
-	  __step_size *= 2;
-	  std::__merge_sort_loop(__buffer, __buffer_last, __first,
-				 __step_size, __comp);
-	  __step_size *= 2;
-	}
-    }
-
-  template<typename _RandomAccessIterator, typename _Pointer,
-	   typename _Distance, typename _Compare>
-    void
-    __stable_sort_adaptive(_RandomAccessIterator __first,
-			   _RandomAccessIterator __last,
-                           _Pointer __buffer, _Distance __buffer_size,
-                           _Compare __comp)
-    {
-      const _Distance __len = (__last - __first + 1) / 2;
-      const _RandomAccessIterator __middle = __first + __len;
-      if (__len > __buffer_size)
-	{
-	  std::__stable_sort_adaptive(__first, __middle, __buffer,
-				      __buffer_size, __comp);
-	  std::__stable_sort_adaptive(__middle, __last, __buffer,
-				      __buffer_size, __comp);
-	}
-      else
-	{
-	  std::__merge_sort_with_buffer(__first, __middle, __buffer, __comp);
-	  std::__merge_sort_with_buffer(__middle, __last, __buffer, __comp);
-	}
-      std::__merge_adaptive(__first, __middle, __last,
-			    _Distance(__middle - __first),
-			    _Distance(__last - __middle),
-			    __buffer, __buffer_size,
-			    __comp);
-    }
-
-  /// This is a helper function for the stable sorting routines.
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    __inplace_stable_sort(_RandomAccessIterator __first,
-			  _RandomAccessIterator __last, _Compare __comp)
-    {
-      if (__last - __first < 15)
-	{
-	  std::__insertion_sort(__first, __last, __comp);
-	  return;
-	}
-      _RandomAccessIterator __middle = __first + (__last - __first) / 2;
-      std::__inplace_stable_sort(__first, __middle, __comp);
-      std::__inplace_stable_sort(__middle, __last, __comp);
-      std::__merge_without_buffer(__first, __middle, __last,
-				  __middle - __first,
-				  __last - __middle,
-				  __comp);
-    }
-
-  // stable_sort
-
-  // Set algorithms: includes, set_union, set_intersection, set_difference,
-  // set_symmetric_difference.  All of these algorithms have the precondition
-  // that their input ranges are sorted and the postcondition that their output
-  // ranges are sorted.
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _Compare>
-    bool
-    __includes(_InputIterator1 __first1, _InputIterator1 __last1,
-	       _InputIterator2 __first2, _InputIterator2 __last2,
-	       _Compare __comp)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-	if (__comp(__first2, __first1))
-	  return false;
-	else if (__comp(__first1, __first2))
-	  ++__first1;
-	else
-	  ++__first1, ++__first2;
-
-      return __first2 == __last2;
-    }
-
-  /**
-   *  @brief Determines whether all elements of a sequence exists in a range.
-   *  @param  __first1  Start of search range.
-   *  @param  __last1   End of search range.
-   *  @param  __first2  Start of sequence
-   *  @param  __last2   End of sequence.
-   *  @return  True if each element in [__first2,__last2) is contained in order
-   *  within [__first1,__last1).  False otherwise.
-   *  @ingroup set_algorithms
-   *
-   *  This operation expects both [__first1,__last1) and
-   *  [__first2,__last2) to be sorted.  Searches for the presence of
-   *  each element in [__first2,__last2) within [__first1,__last1).
-   *  The iterators over each range only move forward, so this is a
-   *  linear algorithm.  If an element in [__first2,__last2) is not
-   *  found before the search iterator reaches @p __last2, false is
-   *  returned.
-  */
-  template<typename _InputIterator1, typename _InputIterator2>
-    inline bool
-    includes(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2, _InputIterator2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted_set(__first1, __last1, __first2);
-      __glibcxx_requires_sorted_set(__first2, __last2, __first1);
-
-      return std::__includes(__first1, __last1, __first2, __last2,
-			     __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief Determines whether all elements of a sequence exists in a range
-   *  using comparison.
-   *  @ingroup set_algorithms
-   *  @param  __first1  Start of search range.
-   *  @param  __last1   End of search range.
-   *  @param  __first2  Start of sequence
-   *  @param  __last2   End of sequence.
-   *  @param  __comp    Comparison function to use.
-   *  @return True if each element in [__first2,__last2) is contained
-   *  in order within [__first1,__last1) according to comp.  False
-   *  otherwise.  @ingroup set_algorithms
-   *
-   *  This operation expects both [__first1,__last1) and
-   *  [__first2,__last2) to be sorted.  Searches for the presence of
-   *  each element in [__first2,__last2) within [__first1,__last1),
-   *  using comp to decide.  The iterators over each range only move
-   *  forward, so this is a linear algorithm.  If an element in
-   *  [__first2,__last2) is not found before the search iterator
-   *  reaches @p __last2, false is returned.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _Compare>
-    inline bool
-    includes(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2, _InputIterator2 __last2,
-	     _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
-      __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
-
-      return std::__includes(__first1, __last1, __first2, __last2,
-			     __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  // nth_element
-  // merge
-  // set_difference
-  // set_intersection
-  // set_union
-  // stable_sort
-  // set_symmetric_difference
-  // min_element
-  // max_element
-
-  template<typename _BidirectionalIterator, typename _Compare>
-    bool
-    __next_permutation(_BidirectionalIterator __first,
-		       _BidirectionalIterator __last, _Compare __comp)
-    {
-      if (__first == __last)
-	return false;
-      _BidirectionalIterator __i = __first;
-      ++__i;
-      if (__i == __last)
-	return false;
-      __i = __last;
-      --__i;
-
-      for(;;)
-	{
-	  _BidirectionalIterator __ii = __i;
-	  --__i;
-	  if (__comp(__i, __ii))
-	    {
-	      _BidirectionalIterator __j = __last;
-	      while (!__comp(__i, --__j))
-		{}
-	      std::iter_swap(__i, __j);
-	      std::__reverse(__ii, __last,
-			     std::__iterator_category(__first));
-	      return true;
-	    }
-	  if (__i == __first)
-	    {
-	      std::__reverse(__first, __last,
-			     std::__iterator_category(__first));
-	      return false;
-	    }
-	}
-    }
-
-  /**
-   *  @brief  Permute range into the next @e dictionary ordering.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @return  False if wrapped to first permutation, true otherwise.
-   *
-   *  Treats all permutations of the range as a set of @e dictionary sorted
-   *  sequences.  Permutes the current sequence into the next one of this set.
-   *  Returns true if there are more sequences to generate.  If the sequence
-   *  is the largest of the set, the smallest is generated and false returned.
-  */
-  template<typename _BidirectionalIterator>
-    inline bool
-    next_permutation(_BidirectionalIterator __first,
-		     _BidirectionalIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__next_permutation
-	(__first, __last, __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Permute range into the next @e dictionary ordering using
-   *          comparison functor.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @param  __comp   A comparison functor.
-   *  @return  False if wrapped to first permutation, true otherwise.
-   *
-   *  Treats all permutations of the range [__first,__last) as a set of
-   *  @e dictionary sorted sequences ordered by @p __comp.  Permutes the current
-   *  sequence into the next one of this set.  Returns true if there are more
-   *  sequences to generate.  If the sequence is the largest of the set, the
-   *  smallest is generated and false returned.
-  */
-  template<typename _BidirectionalIterator, typename _Compare>
-    inline bool
-    next_permutation(_BidirectionalIterator __first,
-		     _BidirectionalIterator __last, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_BidirectionalIterator>::value_type,
-	    typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__next_permutation
-	(__first, __last, __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _BidirectionalIterator, typename _Compare>
-    bool
-    __prev_permutation(_BidirectionalIterator __first,
-		       _BidirectionalIterator __last, _Compare __comp)
-    {
-      if (__first == __last)
-	return false;
-      _BidirectionalIterator __i = __first;
-      ++__i;
-      if (__i == __last)
-	return false;
-      __i = __last;
-      --__i;
-
-      for(;;)
-	{
-	  _BidirectionalIterator __ii = __i;
-	  --__i;
-	  if (__comp(__ii, __i))
-	    {
-	      _BidirectionalIterator __j = __last;
-	      while (!__comp(--__j, __i))
-		{}
-	      std::iter_swap(__i, __j);
-	      std::__reverse(__ii, __last,
-			     std::__iterator_category(__first));
-	      return true;
-	    }
-	  if (__i == __first)
-	    {
-	      std::__reverse(__first, __last,
-			     std::__iterator_category(__first));
-	      return false;
-	    }
-	}
-    }
-
-  /**
-   *  @brief  Permute range into the previous @e dictionary ordering.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @return  False if wrapped to last permutation, true otherwise.
-   *
-   *  Treats all permutations of the range as a set of @e dictionary sorted
-   *  sequences.  Permutes the current sequence into the previous one of this
-   *  set.  Returns true if there are more sequences to generate.  If the
-   *  sequence is the smallest of the set, the largest is generated and false
-   *  returned.
-  */
-  template<typename _BidirectionalIterator>
-    inline bool
-    prev_permutation(_BidirectionalIterator __first,
-		     _BidirectionalIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__prev_permutation(__first, __last,
-				     __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Permute range into the previous @e dictionary ordering using
-   *          comparison functor.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @param  __comp   A comparison functor.
-   *  @return  False if wrapped to last permutation, true otherwise.
-   *
-   *  Treats all permutations of the range [__first,__last) as a set of
-   *  @e dictionary sorted sequences ordered by @p __comp.  Permutes the current
-   *  sequence into the previous one of this set.  Returns true if there are
-   *  more sequences to generate.  If the sequence is the smallest of the set,
-   *  the largest is generated and false returned.
-  */
-  template<typename _BidirectionalIterator, typename _Compare>
-    inline bool
-    prev_permutation(_BidirectionalIterator __first,
-		     _BidirectionalIterator __last, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_BidirectionalIterator>::value_type,
-	    typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__prev_permutation(__first, __last,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  // replace
-  // replace_if
-
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _Predicate, typename _Tp>
-    _OutputIterator
-    __replace_copy_if(_InputIterator __first, _InputIterator __last,
-		      _OutputIterator __result,
-		      _Predicate __pred, const _Tp& __new_value)
-    {
-      for (; __first != __last; ++__first, ++__result)
-	if (__pred(__first))
-	  *__result = __new_value;
-	else
-	  *__result = *__first;
-      return __result;
-    }
-
-  /**
-   *  @brief Copy a sequence, replacing each element of one value with another
-   *         value.
-   *  @param  __first      An input iterator.
-   *  @param  __last       An input iterator.
-   *  @param  __result     An output iterator.
-   *  @param  __old_value  The value to be replaced.
-   *  @param  __new_value  The replacement value.
-   *  @return   The end of the output sequence, @p result+(last-first).
-   *
-   *  Copies each element in the input range @p [__first,__last) to the
-   *  output range @p [__result,__result+(__last-__first)) replacing elements
-   *  equal to @p __old_value with @p __new_value.
-  */
-  template<typename _InputIterator, typename _OutputIterator, typename _Tp>
-    inline _OutputIterator
-    replace_copy(_InputIterator __first, _InputIterator __last,
-		 _OutputIterator __result,
-		 const _Tp& __old_value, const _Tp& __new_value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__replace_copy_if(__first, __last, __result,
-			__gnu_cxx::__ops::__iter_equals_val(__old_value),
-					      __new_value);
-    }
-
-  /**
-   *  @brief Copy a sequence, replacing each value for which a predicate
-   *         returns true with another value.
-   *  @ingroup mutating_algorithms
-   *  @param  __first      An input iterator.
-   *  @param  __last       An input iterator.
-   *  @param  __result     An output iterator.
-   *  @param  __pred       A predicate.
-   *  @param  __new_value  The replacement value.
-   *  @return   The end of the output sequence, @p __result+(__last-__first).
-   *
-   *  Copies each element in the range @p [__first,__last) to the range
-   *  @p [__result,__result+(__last-__first)) replacing elements for which
-   *  @p __pred returns true with @p __new_value.
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _Predicate, typename _Tp>
-    inline _OutputIterator
-    replace_copy_if(_InputIterator __first, _InputIterator __last,
-		    _OutputIterator __result,
-		    _Predicate __pred, const _Tp& __new_value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__replace_copy_if(__first, __last, __result,
-				__gnu_cxx::__ops::__pred_iter(__pred),
-					      __new_value);
-    }
-
-  template<typename _InputIterator, typename _Predicate>
-    typename iterator_traits<_InputIterator>::difference_type
-    __count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-    {
-      typename iterator_traits<_InputIterator>::difference_type __n = 0;
-      for (; __first != __last; ++__first)
-	if (__pred(__first))
-	  ++__n;
-      return __n;
-    }
-
-#if __cplusplus >= 201103L
-  /**
-   *  @brief  Determines whether the elements of a sequence are sorted.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @return  True if the elements are sorted, false otherwise.
-  */
-  template<typename _ForwardIterator>
-    inline bool
-    is_sorted(_ForwardIterator __first, _ForwardIterator __last)
-    { return std::is_sorted_until(__first, __last) == __last; }
-
-  /**
-   *  @brief  Determines whether the elements of a sequence are sorted
-   *          according to a comparison functor.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __comp    A comparison functor.
-   *  @return  True if the elements are sorted, false otherwise.
-  */
-  template<typename _ForwardIterator, typename _Compare>
-    inline bool
-    is_sorted(_ForwardIterator __first, _ForwardIterator __last,
-	      _Compare __comp)
-    { return std::is_sorted_until(__first, __last, __comp) == __last; }
-
-  template<typename _ForwardIterator, typename _Compare>
-    _ForwardIterator
-    __is_sorted_until(_ForwardIterator __first, _ForwardIterator __last,
-		      _Compare __comp)
-    {
-      if (__first == __last)
-	return __last;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next)
-	if (__comp(__next, __first))
-	  return __next;
-      return __next;
-    }
-
-  /**
-   *  @brief  Determines the end of a sorted sequence.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @return  An iterator pointing to the last iterator i in [__first, __last)
-   *           for which the range [__first, i) is sorted.
-  */
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__is_sorted_until(__first, __last,
-				    __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Determines the end of a sorted sequence using comparison functor.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __comp    A comparison functor.
-   *  @return  An iterator pointing to the last iterator i in [__first, __last)
-   *           for which the range [__first, i) is sorted.
-  */
-  template<typename _ForwardIterator, typename _Compare>
-    inline _ForwardIterator
-    is_sorted_until(_ForwardIterator __first, _ForwardIterator __last,
-		    _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__is_sorted_until(__first, __last,
-				    __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  /**
-   *  @brief  Determines min and max at once as an ordered pair.
-   *  @ingroup sorting_algorithms
-   *  @param  __a  A thing of arbitrary type.
-   *  @param  __b  Another thing of arbitrary type.
-   *  @return A pair(__b, __a) if __b is smaller than __a, pair(__a,
-   *  __b) otherwise.
-  */
-  template<typename _Tp>
-    _GLIBCXX14_CONSTEXPR
-    inline pair<const _Tp&, const _Tp&>
-    minmax(const _Tp& __a, const _Tp& __b)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-
-      return __b < __a ? pair<const _Tp&, const _Tp&>(__b, __a)
-	               : pair<const _Tp&, const _Tp&>(__a, __b);
-    }
-
-  /**
-   *  @brief  Determines min and max at once as an ordered pair.
-   *  @ingroup sorting_algorithms
-   *  @param  __a  A thing of arbitrary type.
-   *  @param  __b  Another thing of arbitrary type.
-   *  @param  __comp  A @link comparison_functors comparison functor @endlink.
-   *  @return A pair(__b, __a) if __b is smaller than __a, pair(__a,
-   *  __b) otherwise.
-  */
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    inline pair<const _Tp&, const _Tp&>
-    minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)
-    {
-      return __comp(__b, __a) ? pair<const _Tp&, const _Tp&>(__b, __a)
-	                      : pair<const _Tp&, const _Tp&>(__a, __b);
-    }
-
-  template<typename _ForwardIterator, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    pair<_ForwardIterator, _ForwardIterator>
-    __minmax_element(_ForwardIterator __first, _ForwardIterator __last,
-		     _Compare __comp)
-    {
-      _ForwardIterator __next = __first;
-      if (__first == __last
-	  || ++__next == __last)
-	return std::make_pair(__first, __first);
-
-      _ForwardIterator __min{}, __max{};
-      if (__comp(__next, __first))
-	{
-	  __min = __next;
-	  __max = __first;
-	}
-      else
-	{
-	  __min = __first;
-	  __max = __next;
-	}
-
-      __first = __next;
-      ++__first;
-
-      while (__first != __last)
-	{
-	  __next = __first;
-	  if (++__next == __last)
-	    {
-	      if (__comp(__first, __min))
-		__min = __first;
-	      else if (!__comp(__first, __max))
-		__max = __first;
-	      break;
-	    }
-
-	  if (__comp(__next, __first))
-	    {
-	      if (__comp(__next, __min))
-		__min = __next;
-	      if (!__comp(__first, __max))
-		__max = __first;
-	    }
-	  else
-	    {
-	      if (__comp(__first, __min))
-		__min = __first;
-	      if (!__comp(__next, __max))
-		__max = __next;
-	    }
-
-	  __first = __next;
-	  ++__first;
-	}
-
-      return std::make_pair(__min, __max);
-    }
-
-  /**
-   *  @brief  Return a pair of iterators pointing to the minimum and maximum
-   *          elements in a range.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @return  make_pair(m, M), where m is the first iterator i in 
-   *           [__first, __last) such that no other element in the range is
-   *           smaller, and where M is the last iterator i in [__first, __last)
-   *           such that no other element in the range is larger.
-  */
-  template<typename _ForwardIterator>
-    _GLIBCXX14_CONSTEXPR
-    inline pair<_ForwardIterator, _ForwardIterator>
-    minmax_element(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__minmax_element(__first, __last,
-				   __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Return a pair of iterators pointing to the minimum and maximum
-   *          elements in a range.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @param  __comp   Comparison functor.
-   *  @return  make_pair(m, M), where m is the first iterator i in 
-   *           [__first, __last) such that no other element in the range is
-   *           smaller, and where M is the last iterator i in [__first, __last)
-   *           such that no other element in the range is larger.
-  */
-  template<typename _ForwardIterator, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    inline pair<_ForwardIterator, _ForwardIterator>
-    minmax_element(_ForwardIterator __first, _ForwardIterator __last,
-		   _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__minmax_element(__first, __last,
-				   __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  // N2722 + DR 915.
-  template<typename _Tp>
-    _GLIBCXX14_CONSTEXPR
-    inline _Tp
-    min(initializer_list<_Tp> __l)
-    { return *std::min_element(__l.begin(), __l.end()); }
-
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    inline _Tp
-    min(initializer_list<_Tp> __l, _Compare __comp)
-    { return *std::min_element(__l.begin(), __l.end(), __comp); }
-
-  template<typename _Tp>
-    _GLIBCXX14_CONSTEXPR
-    inline _Tp
-    max(initializer_list<_Tp> __l)
-    { return *std::max_element(__l.begin(), __l.end()); }
-
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    inline _Tp
-    max(initializer_list<_Tp> __l, _Compare __comp)
-    { return *std::max_element(__l.begin(), __l.end(), __comp); }
-
-  template<typename _Tp>
-    _GLIBCXX14_CONSTEXPR
-    inline pair<_Tp, _Tp>
-    minmax(initializer_list<_Tp> __l)
-    {
-      pair<const _Tp*, const _Tp*> __p =
-	std::minmax_element(__l.begin(), __l.end());
-      return std::make_pair(*__p.first, *__p.second);
-    }
-
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    inline pair<_Tp, _Tp>
-    minmax(initializer_list<_Tp> __l, _Compare __comp)
-    {
-      pair<const _Tp*, const _Tp*> __p =
-	std::minmax_element(__l.begin(), __l.end(), __comp);
-      return std::make_pair(*__p.first, *__p.second);
-    }
-
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    bool
-    __is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-		     _ForwardIterator2 __first2, _BinaryPredicate __pred)
-    {
-      // Efficiently compare identical prefixes:  O(N) if sequences
-      // have the same elements in the same order.
-      for (; __first1 != __last1; ++__first1, ++__first2)
-	if (!__pred(__first1, __first2))
-	  break;
-
-      if (__first1 == __last1)
-	return true;
-
-      // Establish __last2 assuming equal ranges by iterating over the
-      // rest of the list.
-      _ForwardIterator2 __last2 = __first2;
-      std::advance(__last2, std::distance(__first1, __last1));
-      for (_ForwardIterator1 __scan = __first1; __scan != __last1; ++__scan)
-	{
-	  if (__scan != std::__find_if(__first1, __scan,
-			  __gnu_cxx::__ops::__iter_comp_iter(__pred, __scan)))
-	    continue; // We've seen this one before.
-	  
-	  auto __matches
-	    = std::__count_if(__first2, __last2,
-			__gnu_cxx::__ops::__iter_comp_iter(__pred, __scan));
-	  if (0 == __matches ||
-	      std::__count_if(__scan, __last1,
-			__gnu_cxx::__ops::__iter_comp_iter(__pred, __scan))
-	      != __matches)
-	    return false;
-	}
-      return true;
-    }
-
-  /**
-   *  @brief  Checks whether a permutation of the second sequence is equal
-   *          to the first sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @return true if there exists a permutation of the elements in the range
-   *          [__first2, __first2 + (__last1 - __first1)), beginning with 
-   *          ForwardIterator2 begin, such that equal(__first1, __last1, begin)
-   *          returns true; otherwise, returns false.
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    inline bool
-    is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-		   _ForwardIterator2 __first2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-		typename iterator_traits<_ForwardIterator1>::value_type,
-		typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      return std::__is_permutation(__first1, __last1, __first2,
-				   __gnu_cxx::__ops::__iter_equal_to_iter());
-    }
-
-  /**
-   *  @brief  Checks whether a permutation of the second sequence is equal
-   *          to the first sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __pred    A binary predicate.
-   *  @return true if there exists a permutation of the elements in
-   *          the range [__first2, __first2 + (__last1 - __first1)),
-   *          beginning with ForwardIterator2 begin, such that
-   *          equal(__first1, __last1, __begin, __pred) returns true;
-   *          otherwise, returns false.
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    inline bool
-    is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-		   _ForwardIterator2 __first2, _BinaryPredicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_ForwardIterator1>::value_type,
-	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      return std::__is_permutation(__first1, __last1, __first2,
-				   __gnu_cxx::__ops::__iter_comp_iter(__pred));
-    }
-
-#if __cplusplus > 201103L
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    bool
-    __is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-		     _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-		     _BinaryPredicate __pred)
-    {
-      using _Cat1
-	= typename iterator_traits<_ForwardIterator1>::iterator_category;
-      using _Cat2
-	= typename iterator_traits<_ForwardIterator2>::iterator_category;
-      using _It1_is_RA = is_same<_Cat1, random_access_iterator_tag>;
-      using _It2_is_RA = is_same<_Cat2, random_access_iterator_tag>;
-      constexpr bool __ra_iters = _It1_is_RA() && _It2_is_RA();
-      if (__ra_iters)
-	{
-	  auto __d1 = std::distance(__first1, __last1);
-	  auto __d2 = std::distance(__first2, __last2);
-	  if (__d1 != __d2)
-	    return false;
-	}
-
-      // Efficiently compare identical prefixes:  O(N) if sequences
-      // have the same elements in the same order.
-      for (; __first1 != __last1 && __first2 != __last2;
-	  ++__first1, ++__first2)
-	if (!__pred(__first1, __first2))
-	  break;
-
-      if (__ra_iters)
-	{
-	  if (__first1 == __last1)
-	    return true;
-	}
-      else
-	{
-	  auto __d1 = std::distance(__first1, __last1);
-	  auto __d2 = std::distance(__first2, __last2);
-	  if (__d1 == 0 && __d2 == 0)
-	    return true;
-	  if (__d1 != __d2)
-	    return false;
-	}
-
-      for (_ForwardIterator1 __scan = __first1; __scan != __last1; ++__scan)
-	{
-	  if (__scan != std::__find_if(__first1, __scan,
-			__gnu_cxx::__ops::__iter_comp_iter(__pred, __scan)))
-	    continue; // We've seen this one before.
-
-	  auto __matches = std::__count_if(__first2, __last2,
-		__gnu_cxx::__ops::__iter_comp_iter(__pred, __scan));
-	  if (0 == __matches
-	      || std::__count_if(__scan, __last1,
-			__gnu_cxx::__ops::__iter_comp_iter(__pred, __scan))
-	      != __matches)
-	    return false;
-	}
-      return true;
-    }
-
-  /**
-   *  @brief  Checks whether a permutaion of the second sequence is equal
-   *          to the first sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __last2   End of first range.
-   *  @return true if there exists a permutation of the elements in the range
-   *          [__first2, __last2), beginning with ForwardIterator2 begin,
-   *          such that equal(__first1, __last1, begin) returns true;
-   *          otherwise, returns false.
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    inline bool
-    is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-		   _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-    {
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return
-	std::__is_permutation(__first1, __last1, __first2, __last2,
-			      __gnu_cxx::__ops::__iter_equal_to_iter());
-    }
-
-  /**
-   *  @brief  Checks whether a permutation of the second sequence is equal
-   *          to the first sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __last2   End of first range.
-   *  @param  __pred    A binary predicate.
-   *  @return true if there exists a permutation of the elements in the range
-   *          [__first2, __last2), beginning with ForwardIterator2 begin,
-   *          such that equal(__first1, __last1, __begin, __pred) returns true;
-   *          otherwise, returns false.
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    inline bool
-    is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-		   _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-		   _BinaryPredicate __pred)
-    {
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return std::__is_permutation(__first1, __last1, __first2, __last2,
-				   __gnu_cxx::__ops::__iter_comp_iter(__pred));
-    }
-#endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-  /**
-   *  @brief Shuffle the elements of a sequence using a uniform random
-   *         number generator.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   A forward iterator.
-   *  @param  __last    A forward iterator.
-   *  @param  __g       A UniformRandomNumberGenerator (26.5.1.3).
-   *  @return  Nothing.
-   *
-   *  Reorders the elements in the range @p [__first,__last) using @p __g to
-   *  provide random numbers.
-  */
-  template<typename _RandomAccessIterator,
-	   typename _UniformRandomNumberGenerator>
-    void
-    shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	    _UniformRandomNumberGenerator&& __g)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return;
-
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType;
-
-      typedef typename std::make_unsigned<_DistanceType>::type __ud_type;
-      typedef typename std::uniform_int_distribution<__ud_type> __distr_type;
-      typedef typename __distr_type::param_type __p_type;
-      __distr_type __d;
-
-      for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-	std::iter_swap(__i, __first + __d(__g, __p_type(0, __i - __first)));
-    }
-#endif
-
-#endif // C++11
-
-_GLIBCXX_END_NAMESPACE_VERSION
-
-_GLIBCXX_BEGIN_NAMESPACE_ALGO
-
-  /**
-   *  @brief Apply a function to every element of a sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __f      A unary function object.
-   *  @return   @p __f (std::move(@p __f) in C++0x).
-   *
-   *  Applies the function object @p __f to each element in the range
-   *  @p [first,last).  @p __f must not modify the order of the sequence.
-   *  If @p __f has a return value it is ignored.
-  */
-  template<typename _InputIterator, typename _Function>
-    _Function
-    for_each(_InputIterator __first, _InputIterator __last, _Function __f)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      for (; __first != __last; ++__first)
-	__f(*__first);
-      return _GLIBCXX_MOVE(__f);
-    }
-
-  /**
-   *  @brief Find the first occurrence of a value in a sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __val    The value to find.
-   *  @return   The first iterator @c i in the range @p [__first,__last)
-   *  such that @c *i == @p __val, or @p __last if no such iterator exists.
-  */
-  template<typename _InputIterator, typename _Tp>
-    inline _InputIterator
-    find(_InputIterator __first, _InputIterator __last,
-	 const _Tp& __val)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_EqualOpConcept<
-		typename iterator_traits<_InputIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-      return std::__find_if(__first, __last,
-			    __gnu_cxx::__ops::__iter_equals_val(__val));
-    }
-
-  /**
-   *  @brief Find the first element in a sequence for which a
-   *         predicate is true.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __pred   A predicate.
-   *  @return   The first iterator @c i in the range @p [__first,__last)
-   *  such that @p __pred(*i) is true, or @p __last if no such iterator exists.
-  */
-  template<typename _InputIterator, typename _Predicate>
-    inline _InputIterator
-    find_if(_InputIterator __first, _InputIterator __last,
-	    _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	      typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__find_if(__first, __last,
-			    __gnu_cxx::__ops::__pred_iter(__pred));
-    }
-
-  /**
-   *  @brief  Find element from a set in a sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  Start of range to search.
-   *  @param  __last1   End of range to search.
-   *  @param  __first2  Start of match candidates.
-   *  @param  __last2   End of match candidates.
-   *  @return   The first iterator @c i in the range
-   *  @p [__first1,__last1) such that @c *i == @p *(i2) such that i2 is an
-   *  iterator in [__first2,__last2), or @p __last1 if no such iterator exists.
-   *
-   *  Searches the range @p [__first1,__last1) for an element that is
-   *  equal to some element in the range [__first2,__last2).  If
-   *  found, returns an iterator in the range [__first1,__last1),
-   *  otherwise returns @p __last1.
-  */
-  template<typename _InputIterator, typename _ForwardIterator>
-    _InputIterator
-    find_first_of(_InputIterator __first1, _InputIterator __last1,
-		  _ForwardIterator __first2, _ForwardIterator __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      for (; __first1 != __last1; ++__first1)
-	for (_ForwardIterator __iter = __first2; __iter != __last2; ++__iter)
-	  if (*__first1 == *__iter)
-	    return __first1;
-      return __last1;
-    }
-
-  /**
-   *  @brief  Find element from a set in a sequence using a predicate.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  Start of range to search.
-   *  @param  __last1   End of range to search.
-   *  @param  __first2  Start of match candidates.
-   *  @param  __last2   End of match candidates.
-   *  @param  __comp    Predicate to use.
-   *  @return   The first iterator @c i in the range
-   *  @p [__first1,__last1) such that @c comp(*i, @p *(i2)) is true
-   *  and i2 is an iterator in [__first2,__last2), or @p __last1 if no
-   *  such iterator exists.
-   *
-
-   *  Searches the range @p [__first1,__last1) for an element that is
-   *  equal to some element in the range [__first2,__last2).  If
-   *  found, returns an iterator in the range [__first1,__last1),
-   *  otherwise returns @p __last1.
-  */
-  template<typename _InputIterator, typename _ForwardIterator,
-	   typename _BinaryPredicate>
-    _InputIterator
-    find_first_of(_InputIterator __first1, _InputIterator __last1,
-		  _ForwardIterator __first2, _ForwardIterator __last2,
-		  _BinaryPredicate __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_InputIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      for (; __first1 != __last1; ++__first1)
-	for (_ForwardIterator __iter = __first2; __iter != __last2; ++__iter)
-	  if (__comp(*__first1, *__iter))
-	    return __first1;
-      return __last1;
-    }
-
-  /**
-   *  @brief Find two adjacent values in a sequence that are equal.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first  A forward iterator.
-   *  @param  __last   A forward iterator.
-   *  @return   The first iterator @c i such that @c i and @c i+1 are both
-   *  valid iterators in @p [__first,__last) and such that @c *i == @c *(i+1),
-   *  or @p __last if no such iterator exists.
-  */
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    adjacent_find(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_EqualityComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__adjacent_find(__first, __last,
-				  __gnu_cxx::__ops::__iter_equal_to_iter());
-    }
-
-  /**
-   *  @brief Find two adjacent values in a sequence using a predicate.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first         A forward iterator.
-   *  @param  __last          A forward iterator.
-   *  @param  __binary_pred   A binary predicate.
-   *  @return   The first iterator @c i such that @c i and @c i+1 are both
-   *  valid iterators in @p [__first,__last) and such that
-   *  @p __binary_pred(*i,*(i+1)) is true, or @p __last if no such iterator
-   *  exists.
-  */
-  template<typename _ForwardIterator, typename _BinaryPredicate>
-    inline _ForwardIterator
-    adjacent_find(_ForwardIterator __first, _ForwardIterator __last,
-		  _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__adjacent_find(__first, __last,
-			__gnu_cxx::__ops::__iter_comp_iter(__binary_pred));
-    }
-
-  /**
-   *  @brief Count the number of copies of a value in a sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __value  The value to be counted.
-   *  @return   The number of iterators @c i in the range @p [__first,__last)
-   *  for which @c *i == @p __value
-  */
-  template<typename _InputIterator, typename _Tp>
-    inline typename iterator_traits<_InputIterator>::difference_type
-    count(_InputIterator __first, _InputIterator __last, const _Tp& __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__count_if(__first, __last,
-			     __gnu_cxx::__ops::__iter_equals_val(__value));
-    }
-
-  /**
-   *  @brief Count the elements of a sequence for which a predicate is true.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __pred   A predicate.
-   *  @return   The number of iterators @c i in the range @p [__first,__last)
-   *  for which @p __pred(*i) is true.
-  */
-  template<typename _InputIterator, typename _Predicate>
-    inline typename iterator_traits<_InputIterator>::difference_type
-    count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__count_if(__first, __last,
-			     __gnu_cxx::__ops::__pred_iter(__pred));
-    }
-
-  /**
-   *  @brief Search a sequence for a matching sub-sequence.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  A forward iterator.
-   *  @param  __last1   A forward iterator.
-   *  @param  __first2  A forward iterator.
-   *  @param  __last2   A forward iterator.
-   *  @return The first iterator @c i in the range @p
-   *  [__first1,__last1-(__last2-__first2)) such that @c *(i+N) == @p
-   *  *(__first2+N) for each @c N in the range @p
-   *  [0,__last2-__first2), or @p __last1 if no such iterator exists.
-   *
-   *  Searches the range @p [__first1,__last1) for a sub-sequence that
-   *  compares equal value-by-value with the sequence given by @p
-   *  [__first2,__last2) and returns an iterator to the first element
-   *  of the sub-sequence, or @p __last1 if the sub-sequence is not
-   *  found.
-   *
-   *  Because the sub-sequence must lie completely within the range @p
-   *  [__first1,__last1) it must start at a position less than @p
-   *  __last1-(__last2-__first2) where @p __last2-__first2 is the
-   *  length of the sub-sequence.
-   *
-   *  This means that the returned iterator @c i will be in the range
-   *  @p [__first1,__last1-(__last2-__first2))
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    inline _ForwardIterator1
-    search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	   _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_ForwardIterator1>::value_type,
-	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return std::__search(__first1, __last1, __first2, __last2,
-			   __gnu_cxx::__ops::__iter_equal_to_iter());
-    }
-
-  /**
-   *  @brief Search a sequence for a matching sub-sequence using a predicate.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1     A forward iterator.
-   *  @param  __last1      A forward iterator.
-   *  @param  __first2     A forward iterator.
-   *  @param  __last2      A forward iterator.
-   *  @param  __predicate  A binary predicate.
-   *  @return   The first iterator @c i in the range
-   *  @p [__first1,__last1-(__last2-__first2)) such that
-   *  @p __predicate(*(i+N),*(__first2+N)) is true for each @c N in the range
-   *  @p [0,__last2-__first2), or @p __last1 if no such iterator exists.
-   *
-   *  Searches the range @p [__first1,__last1) for a sub-sequence that
-   *  compares equal value-by-value with the sequence given by @p
-   *  [__first2,__last2), using @p __predicate to determine equality,
-   *  and returns an iterator to the first element of the
-   *  sub-sequence, or @p __last1 if no such iterator exists.
-   *
-   *  @see search(_ForwardIter1, _ForwardIter1, _ForwardIter2, _ForwardIter2)
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    inline _ForwardIterator1
-    search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	   _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-	   _BinaryPredicate  __predicate)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_ForwardIterator1>::value_type,
-	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return std::__search(__first1, __last1, __first2, __last2,
-			   __gnu_cxx::__ops::__iter_comp_iter(__predicate));
-    }
-
-  /**
-   *  @brief Search a sequence for a number of consecutive values.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first  A forward iterator.
-   *  @param  __last   A forward iterator.
-   *  @param  __count  The number of consecutive values.
-   *  @param  __val    The value to find.
-   *  @return The first iterator @c i in the range @p
-   *  [__first,__last-__count) such that @c *(i+N) == @p __val for
-   *  each @c N in the range @p [0,__count), or @p __last if no such
-   *  iterator exists.
-   *
-   *  Searches the range @p [__first,__last) for @p count consecutive elements
-   *  equal to @p __val.
-  */
-  template<typename _ForwardIterator, typename _Integer, typename _Tp>
-    inline _ForwardIterator
-    search_n(_ForwardIterator __first, _ForwardIterator __last,
-	     _Integer __count, const _Tp& __val)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__search_n(__first, __last, __count,
-			     __gnu_cxx::__ops::__iter_equals_val(__val));
-    }
-
-
-  /**
-   *  @brief Search a sequence for a number of consecutive values using a
-   *         predicate.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first        A forward iterator.
-   *  @param  __last         A forward iterator.
-   *  @param  __count        The number of consecutive values.
-   *  @param  __val          The value to find.
-   *  @param  __binary_pred  A binary predicate.
-   *  @return The first iterator @c i in the range @p
-   *  [__first,__last-__count) such that @p
-   *  __binary_pred(*(i+N),__val) is true for each @c N in the range
-   *  @p [0,__count), or @p __last if no such iterator exists.
-   *
-   *  Searches the range @p [__first,__last) for @p __count
-   *  consecutive elements for which the predicate returns true.
-  */
-  template<typename _ForwardIterator, typename _Integer, typename _Tp,
-           typename _BinaryPredicate>
-    inline _ForwardIterator
-    search_n(_ForwardIterator __first, _ForwardIterator __last,
-	     _Integer __count, const _Tp& __val,
-	     _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__search_n(__first, __last, __count,
-		__gnu_cxx::__ops::__iter_comp_val(__binary_pred, __val));
-    }
-
-
-  /**
-   *  @brief Perform an operation on a sequence.
-   *  @ingroup mutating_algorithms
-   *  @param  __first     An input iterator.
-   *  @param  __last      An input iterator.
-   *  @param  __result    An output iterator.
-   *  @param  __unary_op  A unary operator.
-   *  @return   An output iterator equal to @p __result+(__last-__first).
-   *
-   *  Applies the operator to each element in the input range and assigns
-   *  the results to successive elements of the output sequence.
-   *  Evaluates @p *(__result+N)=unary_op(*(__first+N)) for each @c N in the
-   *  range @p [0,__last-__first).
-   *
-   *  @p unary_op must not alter its argument.
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _UnaryOperation>
-    _OutputIterator
-    transform(_InputIterator __first, _InputIterator __last,
-	      _OutputIterator __result, _UnaryOperation __unary_op)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-            // "the type returned by a _UnaryOperation"
-            __typeof__(__unary_op(*__first))>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for (; __first != __last; ++__first, ++__result)
-	*__result = __unary_op(*__first);
-      return __result;
-    }
-
-  /**
-   *  @brief Perform an operation on corresponding elements of two sequences.
-   *  @ingroup mutating_algorithms
-   *  @param  __first1     An input iterator.
-   *  @param  __last1      An input iterator.
-   *  @param  __first2     An input iterator.
-   *  @param  __result     An output iterator.
-   *  @param  __binary_op  A binary operator.
-   *  @return   An output iterator equal to @p result+(last-first).
-   *
-   *  Applies the operator to the corresponding elements in the two
-   *  input ranges and assigns the results to successive elements of the
-   *  output sequence.
-   *  Evaluates @p
-   *  *(__result+N)=__binary_op(*(__first1+N),*(__first2+N)) for each
-   *  @c N in the range @p [0,__last1-__first1).
-   *
-   *  @p binary_op must not alter either of its arguments.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _BinaryOperation>
-    _OutputIterator
-    transform(_InputIterator1 __first1, _InputIterator1 __last1,
-	      _InputIterator2 __first2, _OutputIterator __result,
-	      _BinaryOperation __binary_op)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-            // "the type returned by a _BinaryOperation"
-            __typeof__(__binary_op(*__first1,*__first2))>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for (; __first1 != __last1; ++__first1, ++__first2, ++__result)
-	*__result = __binary_op(*__first1, *__first2);
-      return __result;
-    }
-
-  /**
-   *  @brief Replace each occurrence of one value in a sequence with another
-   *         value.
-   *  @ingroup mutating_algorithms
-   *  @param  __first      A forward iterator.
-   *  @param  __last       A forward iterator.
-   *  @param  __old_value  The value to be replaced.
-   *  @param  __new_value  The replacement value.
-   *  @return   replace() returns no value.
-   *
-   *  For each iterator @c i in the range @p [__first,__last) if @c *i ==
-   *  @p __old_value then the assignment @c *i = @p __new_value is performed.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    void
-    replace(_ForwardIterator __first, _ForwardIterator __last,
-	    const _Tp& __old_value, const _Tp& __new_value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for (; __first != __last; ++__first)
-	if (*__first == __old_value)
-	  *__first = __new_value;
-    }
-
-  /**
-   *  @brief Replace each value in a sequence for which a predicate returns
-   *         true with another value.
-   *  @ingroup mutating_algorithms
-   *  @param  __first      A forward iterator.
-   *  @param  __last       A forward iterator.
-   *  @param  __pred       A predicate.
-   *  @param  __new_value  The replacement value.
-   *  @return   replace_if() returns no value.
-   *
-   *  For each iterator @c i in the range @p [__first,__last) if @p __pred(*i)
-   *  is true then the assignment @c *i = @p __new_value is performed.
-  */
-  template<typename _ForwardIterator, typename _Predicate, typename _Tp>
-    void
-    replace_if(_ForwardIterator __first, _ForwardIterator __last,
-	       _Predicate __pred, const _Tp& __new_value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for (; __first != __last; ++__first)
-	if (__pred(*__first))
-	  *__first = __new_value;
-    }
-
-  /**
-   *  @brief Assign the result of a function object to each value in a
-   *         sequence.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  A forward iterator.
-   *  @param  __last   A forward iterator.
-   *  @param  __gen    A function object taking no arguments and returning
-   *                 std::iterator_traits<_ForwardIterator>::value_type
-   *  @return   generate() returns no value.
-   *
-   *  Performs the assignment @c *i = @p __gen() for each @c i in the range
-   *  @p [__first,__last).
-  */
-  template<typename _ForwardIterator, typename _Generator>
-    void
-    generate(_ForwardIterator __first, _ForwardIterator __last,
-	     _Generator __gen)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_GeneratorConcept<_Generator,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for (; __first != __last; ++__first)
-	*__first = __gen();
-    }
-
-  /**
-   *  @brief Assign the result of a function object to each value in a
-   *         sequence.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  A forward iterator.
-   *  @param  __n      The length of the sequence.
-   *  @param  __gen    A function object taking no arguments and returning
-   *                 std::iterator_traits<_ForwardIterator>::value_type
-   *  @return   The end of the sequence, @p __first+__n
-   *
-   *  Performs the assignment @c *i = @p __gen() for each @c i in the range
-   *  @p [__first,__first+__n).
-   *
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-   *  DR 865. More algorithms that throw away information
-  */
-  template<typename _OutputIterator, typename _Size, typename _Generator>
-    _OutputIterator
-    generate_n(_OutputIterator __first, _Size __n, _Generator __gen)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-            // "the type returned by a _Generator"
-            __typeof__(__gen())>)
-
-      for (__decltype(__n + 0) __niter = __n;
-	   __niter > 0; --__niter, ++__first)
-	*__first = __gen();
-      return __first;
-    }
-
-  /**
-   *  @brief Copy a sequence, removing consecutive duplicate values.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   An input iterator.
-   *  @param  __last    An input iterator.
-   *  @param  __result  An output iterator.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies each element in the range @p [__first,__last) to the range
-   *  beginning at @p __result, except that only the first element is copied
-   *  from groups of consecutive elements that compare equal.
-   *  unique_copy() is stable, so the relative order of elements that are
-   *  copied is unchanged.
-   *
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-   *  DR 241. Does unique_copy() require CopyConstructible and Assignable?
-   *  
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-   *  DR 538. 241 again: Does unique_copy() require CopyConstructible and 
-   *  Assignable?
-  */
-  template<typename _InputIterator, typename _OutputIterator>
-    inline _OutputIterator
-    unique_copy(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_EqualityComparableConcept<
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return __result;
-      return std::__unique_copy(__first, __last, __result,
-				__gnu_cxx::__ops::__iter_equal_to_iter(),
-				std::__iterator_category(__first),
-				std::__iterator_category(__result));
-    }
-
-  /**
-   *  @brief Copy a sequence, removing consecutive values using a predicate.
-   *  @ingroup mutating_algorithms
-   *  @param  __first        An input iterator.
-   *  @param  __last         An input iterator.
-   *  @param  __result       An output iterator.
-   *  @param  __binary_pred  A binary predicate.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies each element in the range @p [__first,__last) to the range
-   *  beginning at @p __result, except that only the first element is copied
-   *  from groups of consecutive elements for which @p __binary_pred returns
-   *  true.
-   *  unique_copy() is stable, so the relative order of elements that are
-   *  copied is unchanged.
-   *
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-   *  DR 241. Does unique_copy() require CopyConstructible and Assignable?
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _BinaryPredicate>
-    inline _OutputIterator
-    unique_copy(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result,
-		_BinaryPredicate __binary_pred)
-    {
-      // concept requirements -- predicates checked later
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return __result;
-      return std::__unique_copy(__first, __last, __result,
-			__gnu_cxx::__ops::__iter_comp_iter(__binary_pred),
-				std::__iterator_category(__first),
-				std::__iterator_category(__result));
-    }
-
-  /**
-   *  @brief Randomly shuffle the elements of a sequence.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   A forward iterator.
-   *  @param  __last    A forward iterator.
-   *  @return  Nothing.
-   *
-   *  Reorder the elements in the range @p [__first,__last) using a random
-   *  distribution, so that every possible ordering of the sequence is
-   *  equally likely.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first != __last)
-	for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-	  {
-	    // XXX rand() % N is not uniformly distributed
-	    _RandomAccessIterator __j = __first
-					+ std::rand() % ((__i - __first) + 1);
-	    if (__i != __j)
-	      std::iter_swap(__i, __j);
-	  }
-    }
-
-  /**
-   *  @brief Shuffle the elements of a sequence using a random number
-   *         generator.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   A forward iterator.
-   *  @param  __last    A forward iterator.
-   *  @param  __rand    The RNG functor or function.
-   *  @return  Nothing.
-   *
-   *  Reorders the elements in the range @p [__first,__last) using @p __rand to
-   *  provide a random distribution. Calling @p __rand(N) for a positive
-   *  integer @p N should return a randomly chosen integer from the
-   *  range [0,N).
-  */
-  template<typename _RandomAccessIterator, typename _RandomNumberGenerator>
-    void
-    random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
-#if __cplusplus >= 201103L
-		   _RandomNumberGenerator&& __rand)
-#else
-		   _RandomNumberGenerator& __rand)
-#endif
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return;
-      for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-	{
-	  _RandomAccessIterator __j = __first + __rand((__i - __first) + 1);
-	  if (__i != __j)
-	    std::iter_swap(__i, __j);
-	}
-    }
-
-
-  /**
-   *  @brief Move elements for which a predicate is true to the beginning
-   *         of a sequence.
-   *  @ingroup mutating_algorithms
-   *  @param  __first   A forward iterator.
-   *  @param  __last    A forward iterator.
-   *  @param  __pred    A predicate functor.
-   *  @return  An iterator @p middle such that @p __pred(i) is true for each
-   *  iterator @p i in the range @p [__first,middle) and false for each @p i
-   *  in the range @p [middle,__last).
-   *
-   *  @p __pred must not modify its operand. @p partition() does not preserve
-   *  the relative ordering of elements in each group, use
-   *  @p stable_partition() if this is needed.
-  */
-  template<typename _ForwardIterator, typename _Predicate>
-    inline _ForwardIterator
-    partition(_ForwardIterator __first, _ForwardIterator __last,
-	      _Predicate   __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__partition(__first, __last, __pred,
-			      std::__iterator_category(__first));
-    }
-
-
-  /**
-   *  @brief Sort the smallest elements of a sequence.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __middle  Another iterator.
-   *  @param  __last    Another iterator.
-   *  @return  Nothing.
-   *
-   *  Sorts the smallest @p (__middle-__first) elements in the range
-   *  @p [first,last) and moves them to the range @p [__first,__middle). The
-   *  order of the remaining elements in the range @p [__middle,__last) is
-   *  undefined.
-   *  After the sort if @e i and @e j are iterators in the range
-   *  @p [__first,__middle) such that i precedes j and @e k is an iterator in
-   *  the range @p [__middle,__last) then *j<*i and *k<*i are both false.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    partial_sort(_RandomAccessIterator __first,
-		 _RandomAccessIterator __middle,
-		 _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __middle);
-      __glibcxx_requires_valid_range(__middle, __last);
-
-      std::__partial_sort(__first, __middle, __last,
-			  __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief Sort the smallest elements of a sequence using a predicate
-   *         for comparison.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __middle  Another iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __comp    A comparison functor.
-   *  @return  Nothing.
-   *
-   *  Sorts the smallest @p (__middle-__first) elements in the range
-   *  @p [__first,__last) and moves them to the range @p [__first,__middle). The
-   *  order of the remaining elements in the range @p [__middle,__last) is
-   *  undefined.
-   *  After the sort if @e i and @e j are iterators in the range
-   *  @p [__first,__middle) such that i precedes j and @e k is an iterator in
-   *  the range @p [__middle,__last) then @p *__comp(j,*i) and @p __comp(*k,*i)
-   *  are both false.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    partial_sort(_RandomAccessIterator __first,
-		 _RandomAccessIterator __middle,
-		 _RandomAccessIterator __last,
-		 _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_RandomAccessIterator>::value_type,
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __middle);
-      __glibcxx_requires_valid_range(__middle, __last);
-
-      std::__partial_sort(__first, __middle, __last,
-			  __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  /**
-   *  @brief Sort a sequence just enough to find a particular position.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __nth     Another iterator.
-   *  @param  __last    Another iterator.
-   *  @return  Nothing.
-   *
-   *  Rearranges the elements in the range @p [__first,__last) so that @p *__nth
-   *  is the same element that would have been in that position had the
-   *  whole sequence been sorted. The elements either side of @p *__nth are
-   *  not completely sorted, but for any iterator @e i in the range
-   *  @p [__first,__nth) and any iterator @e j in the range @p [__nth,__last) it
-   *  holds that *j < *i is false.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth,
-		_RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __nth);
-      __glibcxx_requires_valid_range(__nth, __last);
-
-      if (__first == __last || __nth == __last)
-	return;
-
-      std::__introselect(__first, __nth, __last,
-			 std::__lg(__last - __first) * 2,
-			 __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief Sort a sequence just enough to find a particular position
-   *         using a predicate for comparison.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __nth     Another iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __comp    A comparison functor.
-   *  @return  Nothing.
-   *
-   *  Rearranges the elements in the range @p [__first,__last) so that @p *__nth
-   *  is the same element that would have been in that position had the
-   *  whole sequence been sorted. The elements either side of @p *__nth are
-   *  not completely sorted, but for any iterator @e i in the range
-   *  @p [__first,__nth) and any iterator @e j in the range @p [__nth,__last) it
-   *  holds that @p __comp(*j,*i) is false.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth,
-		_RandomAccessIterator __last, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_RandomAccessIterator>::value_type,
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __nth);
-      __glibcxx_requires_valid_range(__nth, __last);
-
-      if (__first == __last || __nth == __last)
-	return;
-
-      std::__introselect(__first, __nth, __last,
-			 std::__lg(__last - __first) * 2,
-			 __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  /**
-   *  @brief Sort the elements of a sequence.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @return  Nothing.
-   *
-   *  Sorts the elements in the range @p [__first,__last) in ascending order,
-   *  such that for each iterator @e i in the range @p [__first,__last-1),  
-   *  *(i+1)<*i is false.
-   *
-   *  The relative ordering of equivalent elements is not preserved, use
-   *  @p stable_sort() if this is needed.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      std::__sort(__first, __last, __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief Sort the elements of a sequence using a predicate for comparison.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __comp    A comparison functor.
-   *  @return  Nothing.
-   *
-   *  Sorts the elements in the range @p [__first,__last) in ascending order,
-   *  such that @p __comp(*(i+1),*i) is false for every iterator @e i in the
-   *  range @p [__first,__last-1).
-   *
-   *  The relative ordering of equivalent elements is not preserved, use
-   *  @p stable_sort() if this is needed.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    sort(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	 _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_RandomAccessIterator>::value_type,
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      std::__sort(__first, __last, __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    _OutputIterator
-    __merge(_InputIterator1 __first1, _InputIterator1 __last1,
-	    _InputIterator2 __first2, _InputIterator2 __last2,
-	    _OutputIterator __result, _Compare __comp)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-	{
-	  if (__comp(__first2, __first1))
-	    {
-	      *__result = *__first2;
-	      ++__first2;
-	    }
-	  else
-	    {
-	      *__result = *__first1;
-	      ++__first1;
-	    }
-	  ++__result;
-	}
-      return std::copy(__first2, __last2,
-		       std::copy(__first1, __last1, __result));
-    }
-
-  /**
-   *  @brief Merges two sorted ranges.
-   *  @ingroup sorting_algorithms
-   *  @param  __first1  An iterator.
-   *  @param  __first2  Another iterator.
-   *  @param  __last1   Another iterator.
-   *  @param  __last2   Another iterator.
-   *  @param  __result  An iterator pointing to the end of the merged range.
-   *  @return         An iterator pointing to the first element <em>not less
-   *                  than</em> @e val.
-   *
-   *  Merges the ranges @p [__first1,__last1) and @p [__first2,__last2) into
-   *  the sorted range @p [__result, __result + (__last1-__first1) +
-   *  (__last2-__first2)).  Both input ranges must be sorted, and the
-   *  output range must not overlap with either of the input ranges.
-   *  The sort is @e stable, that is, for equivalent elements in the
-   *  two ranges, elements from the first range will always come
-   *  before elements from the second.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator>
-    inline _OutputIterator
-    merge(_InputIterator1 __first1, _InputIterator1 __last1,
-	  _InputIterator2 __first2, _InputIterator2 __last2,
-	  _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)	
-      __glibcxx_requires_sorted_set(__first1, __last1, __first2);
-      __glibcxx_requires_sorted_set(__first2, __last2, __first1);
-
-      return _GLIBCXX_STD_A::__merge(__first1, __last1,
-				     __first2, __last2, __result,
-				     __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief Merges two sorted ranges.
-   *  @ingroup sorting_algorithms
-   *  @param  __first1  An iterator.
-   *  @param  __first2  Another iterator.
-   *  @param  __last1   Another iterator.
-   *  @param  __last2   Another iterator.
-   *  @param  __result  An iterator pointing to the end of the merged range.
-   *  @param  __comp    A functor to use for comparisons.
-   *  @return         An iterator pointing to the first element "not less
-   *                  than" @e val.
-   *
-   *  Merges the ranges @p [__first1,__last1) and @p [__first2,__last2) into
-   *  the sorted range @p [__result, __result + (__last1-__first1) +
-   *  (__last2-__first2)).  Both input ranges must be sorted, and the
-   *  output range must not overlap with either of the input ranges.
-   *  The sort is @e stable, that is, for equivalent elements in the
-   *  two ranges, elements from the first range will always come
-   *  before elements from the second.
-   *
-   *  The comparison function should have the same effects on ordering as
-   *  the function used for the initial sort.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    inline _OutputIterator
-    merge(_InputIterator1 __first1, _InputIterator1 __last1,
-	  _InputIterator2 __first2, _InputIterator2 __last2,
-	  _OutputIterator __result, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
-      __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
-
-      return _GLIBCXX_STD_A::__merge(__first1, __last1,
-				__first2, __last2, __result,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    __stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last,
-		  _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType;
-
-      typedef _Temporary_buffer<_RandomAccessIterator, _ValueType> _TmpBuf;
-      _TmpBuf __buf(__first, __last);
-
-      if (__buf.begin() == 0)
-	std::__inplace_stable_sort(__first, __last, __comp);
-      else
-	std::__stable_sort_adaptive(__first, __last, __buf.begin(),
-				    _DistanceType(__buf.size()), __comp);
-    }
-
-  /**
-   *  @brief Sort the elements of a sequence, preserving the relative order
-   *         of equivalent elements.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @return  Nothing.
-   *
-   *  Sorts the elements in the range @p [__first,__last) in ascending order,
-   *  such that for each iterator @p i in the range @p [__first,__last-1),
-   *  @p *(i+1)<*i is false.
-   *
-   *  The relative ordering of equivalent elements is preserved, so any two
-   *  elements @p x and @p y in the range @p [__first,__last) such that
-   *  @p x<y is false and @p y<x is false will have the same relative
-   *  ordering after calling @p stable_sort().
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      _GLIBCXX_STD_A::__stable_sort(__first, __last,
-				    __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief Sort the elements of a sequence using a predicate for comparison,
-   *         preserving the relative order of equivalent elements.
-   *  @ingroup sorting_algorithms
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __comp    A comparison functor.
-   *  @return  Nothing.
-   *
-   *  Sorts the elements in the range @p [__first,__last) in ascending order,
-   *  such that for each iterator @p i in the range @p [__first,__last-1),
-   *  @p __comp(*(i+1),*i) is false.
-   *
-   *  The relative ordering of equivalent elements is preserved, so any two
-   *  elements @p x and @p y in the range @p [__first,__last) such that
-   *  @p __comp(x,y) is false and @p __comp(y,x) is false will have the same
-   *  relative ordering after calling @p stable_sort().
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last,
-		_Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_RandomAccessIterator>::value_type,
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      _GLIBCXX_STD_A::__stable_sort(__first, __last,
-				    __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator,
-	   typename _Compare>
-    _OutputIterator
-    __set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-		_InputIterator2 __first2, _InputIterator2 __last2,
-		_OutputIterator __result, _Compare __comp)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-	{
-	  if (__comp(__first1, __first2))
-	    {
-	      *__result = *__first1;
-	      ++__first1;
-	    }
-	  else if (__comp(__first2, __first1))
-	    {
-	      *__result = *__first2;
-	      ++__first2;
-	    }
-	  else
-	    {
-	      *__result = *__first1;
-	      ++__first1;
-	      ++__first2;
-	    }
-	  ++__result;
-	}
-      return std::copy(__first2, __last2,
-		       std::copy(__first1, __last1, __result));
-    }
-
-  /**
-   *  @brief Return the union of two sorted ranges.
-   *  @ingroup set_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __last2   End of second range.
-   *  @return  End of the output range.
-   *  @ingroup set_algorithms
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  each range in order to the output range.  Iterators increment for each
-   *  range.  When the current element of one range is less than the other,
-   *  that element is copied and the iterator advanced.  If an element is
-   *  contained in both ranges, the element from the first range is copied and
-   *  both ranges advance.  The output range may not overlap either input
-   *  range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator>
-    inline _OutputIterator
-    set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-	      _InputIterator2 __first2, _InputIterator2 __last2,
-	      _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted_set(__first1, __last1, __first2);
-      __glibcxx_requires_sorted_set(__first2, __last2, __first1);
-
-      return _GLIBCXX_STD_A::__set_union(__first1, __last1,
-				__first2, __last2, __result,
-				__gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief Return the union of two sorted ranges using a comparison functor.
-   *  @ingroup set_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __last2   End of second range.
-   *  @param  __comp    The comparison functor.
-   *  @return  End of the output range.
-   *  @ingroup set_algorithms
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  each range in order to the output range.  Iterators increment for each
-   *  range.  When the current element of one range is less than the other
-   *  according to @p __comp, that element is copied and the iterator advanced.
-   *  If an equivalent element according to @p __comp is contained in both
-   *  ranges, the element from the first range is copied and both ranges
-   *  advance.  The output range may not overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    inline _OutputIterator
-    set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-	      _InputIterator2 __first2, _InputIterator2 __last2,
-	      _OutputIterator __result, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
-      __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
-
-      return _GLIBCXX_STD_A::__set_union(__first1, __last1,
-				__first2, __last2, __result,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator,
-	   typename _Compare>
-    _OutputIterator
-    __set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-		       _InputIterator2 __first2, _InputIterator2 __last2,
-		       _OutputIterator __result, _Compare __comp)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-	if (__comp(__first1, __first2))
-	  ++__first1;
-	else if (__comp(__first2, __first1))
-	  ++__first2;
-	else
-	  {
-	    *__result = *__first1;
-	    ++__first1;
-	    ++__first2;
-	    ++__result;
-	  }
-      return __result;
-    }
-
-  /**
-   *  @brief Return the intersection of two sorted ranges.
-   *  @ingroup set_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __last2   End of second range.
-   *  @return  End of the output range.
-   *  @ingroup set_algorithms
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  both ranges in order to the output range.  Iterators increment for each
-   *  range.  When the current element of one range is less than the other,
-   *  that iterator advances.  If an element is contained in both ranges, the
-   *  element from the first range is copied and both ranges advance.  The
-   *  output range may not overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator>
-    inline _OutputIterator
-    set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-		     _InputIterator2 __first2, _InputIterator2 __last2,
-		     _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted_set(__first1, __last1, __first2);
-      __glibcxx_requires_sorted_set(__first2, __last2, __first1);
-
-      return _GLIBCXX_STD_A::__set_intersection(__first1, __last1,
-				     __first2, __last2, __result,
-				     __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief Return the intersection of two sorted ranges using comparison
-   *  functor.
-   *  @ingroup set_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __last2   End of second range.
-   *  @param  __comp    The comparison functor.
-   *  @return  End of the output range.
-   *  @ingroup set_algorithms
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  both ranges in order to the output range.  Iterators increment for each
-   *  range.  When the current element of one range is less than the other
-   *  according to @p __comp, that iterator advances.  If an element is
-   *  contained in both ranges according to @p __comp, the element from the
-   *  first range is copied and both ranges advance.  The output range may not
-   *  overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    inline _OutputIterator
-    set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-		     _InputIterator2 __first2, _InputIterator2 __last2,
-		     _OutputIterator __result, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
-      __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
-
-      return _GLIBCXX_STD_A::__set_intersection(__first1, __last1,
-				__first2, __last2, __result,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator,
-	   typename _Compare>
-    _OutputIterator
-    __set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-		     _InputIterator2 __first2, _InputIterator2 __last2,
-		     _OutputIterator __result, _Compare __comp)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-	if (__comp(__first1, __first2))
-	  {
-	    *__result = *__first1;
-	    ++__first1;
-	    ++__result;
-	  }
-	else if (__comp(__first2, __first1))
-	  ++__first2;
-	else
-	  {
-	    ++__first1;
-	    ++__first2;
-	  }
-      return std::copy(__first1, __last1, __result);
-    }
-
-  /**
-   *  @brief Return the difference of two sorted ranges.
-   *  @ingroup set_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __last2   End of second range.
-   *  @return  End of the output range.
-   *  @ingroup set_algorithms
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  the first range but not the second in order to the output range.
-   *  Iterators increment for each range.  When the current element of the
-   *  first range is less than the second, that element is copied and the
-   *  iterator advances.  If the current element of the second range is less,
-   *  the iterator advances, but no element is copied.  If an element is
-   *  contained in both ranges, no elements are copied and both ranges
-   *  advance.  The output range may not overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator>
-    inline _OutputIterator
-    set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-		   _InputIterator2 __first2, _InputIterator2 __last2,
-		   _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)	
-      __glibcxx_requires_sorted_set(__first1, __last1, __first2);
-      __glibcxx_requires_sorted_set(__first2, __last2, __first1);
-
-      return _GLIBCXX_STD_A::__set_difference(__first1, __last1,
-				   __first2, __last2, __result,
-				   __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Return the difference of two sorted ranges using comparison
-   *  functor.
-   *  @ingroup set_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __last2   End of second range.
-   *  @param  __comp    The comparison functor.
-   *  @return  End of the output range.
-   *  @ingroup set_algorithms
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  the first range but not the second in order to the output range.
-   *  Iterators increment for each range.  When the current element of the
-   *  first range is less than the second according to @p __comp, that element
-   *  is copied and the iterator advances.  If the current element of the
-   *  second range is less, no element is copied and the iterator advances.
-   *  If an element is contained in both ranges according to @p __comp, no
-   *  elements are copied and both ranges advance.  The output range may not
-   *  overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    inline _OutputIterator
-    set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-		   _InputIterator2 __first2, _InputIterator2 __last2,
-		   _OutputIterator __result, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
-      __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
-
-      return _GLIBCXX_STD_A::__set_difference(__first1, __last1,
-				   __first2, __last2, __result,
-				   __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator,
-	   typename _Compare>
-    _OutputIterator
-    __set_symmetric_difference(_InputIterator1 __first1,
-			       _InputIterator1 __last1,
-			       _InputIterator2 __first2,
-			       _InputIterator2 __last2,
-			       _OutputIterator __result,
-			       _Compare __comp)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-	if (__comp(__first1, __first2))
-	  {
-	    *__result = *__first1;
-	    ++__first1;
-	    ++__result;
-	  }
-	else if (__comp(__first2, __first1))
-	  {
-	    *__result = *__first2;
-	    ++__first2;
-	    ++__result;
-	  }
-	else
-	  {
-	    ++__first1;
-	    ++__first2;
-	  }
-      return std::copy(__first2, __last2, 
-		       std::copy(__first1, __last1, __result));
-    }
-
-  /**
-   *  @brief  Return the symmetric difference of two sorted ranges.
-   *  @ingroup set_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __last2   End of second range.
-   *  @return  End of the output range.
-   *  @ingroup set_algorithms
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  one range but not the other in order to the output range.  Iterators
-   *  increment for each range.  When the current element of one range is less
-   *  than the other, that element is copied and the iterator advances.  If an
-   *  element is contained in both ranges, no elements are copied and both
-   *  ranges advance.  The output range may not overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator>
-    inline _OutputIterator
-    set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-			     _InputIterator2 __first2, _InputIterator2 __last2,
-			     _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)	
-      __glibcxx_requires_sorted_set(__first1, __last1, __first2);
-      __glibcxx_requires_sorted_set(__first2, __last2, __first1);
-
-      return _GLIBCXX_STD_A::__set_symmetric_difference(__first1, __last1,
-					__first2, __last2, __result,
-					__gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Return the symmetric difference of two sorted ranges using
-   *  comparison functor.
-   *  @ingroup set_algorithms
-   *  @param  __first1  Start of first range.
-   *  @param  __last1   End of first range.
-   *  @param  __first2  Start of second range.
-   *  @param  __last2   End of second range.
-   *  @param  __comp    The comparison functor.
-   *  @return  End of the output range.
-   *  @ingroup set_algorithms
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  one range but not the other in order to the output range.  Iterators
-   *  increment for each range.  When the current element of one range is less
-   *  than the other according to @p comp, that element is copied and the
-   *  iterator advances.  If an element is contained in both ranges according
-   *  to @p __comp, no elements are copied and both ranges advance.  The output
-   *  range may not overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    inline _OutputIterator
-    set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-			     _InputIterator2 __first2, _InputIterator2 __last2,
-			     _OutputIterator __result,
-			     _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted_set_pred(__first1, __last1, __first2, __comp);
-      __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
-
-      return _GLIBCXX_STD_A::__set_symmetric_difference(__first1, __last1,
-				__first2, __last2, __result,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _ForwardIterator, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    _ForwardIterator
-    __min_element(_ForwardIterator __first, _ForwardIterator __last,
-		  _Compare __comp)
-    {
-      if (__first == __last)
-	return __first;
-      _ForwardIterator __result = __first;
-      while (++__first != __last)
-	if (__comp(__first, __result))
-	  __result = __first;
-      return __result;
-    }
-
-  /**
-   *  @brief  Return the minimum element in a range.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @return  Iterator referencing the first instance of the smallest value.
-  */
-  template<typename _ForwardIterator>
-    _GLIBCXX14_CONSTEXPR
-    _ForwardIterator
-    inline min_element(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return _GLIBCXX_STD_A::__min_element(__first, __last,
-				__gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Return the minimum element in a range using comparison functor.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @param  __comp   Comparison functor.
-   *  @return  Iterator referencing the first instance of the smallest value
-   *  according to __comp.
-  */
-  template<typename _ForwardIterator, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    inline _ForwardIterator
-    min_element(_ForwardIterator __first, _ForwardIterator __last,
-		_Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return _GLIBCXX_STD_A::__min_element(__first, __last,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _ForwardIterator, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    _ForwardIterator
-    __max_element(_ForwardIterator __first, _ForwardIterator __last,
-		  _Compare __comp)
-    {
-      if (__first == __last) return __first;
-      _ForwardIterator __result = __first;
-      while (++__first != __last)
-	if (__comp(__result, __first))
-	  __result = __first;
-      return __result;
-    }
-
-  /**
-   *  @brief  Return the maximum element in a range.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @return  Iterator referencing the first instance of the largest value.
-  */
-  template<typename _ForwardIterator>
-    _GLIBCXX14_CONSTEXPR
-    inline _ForwardIterator
-    max_element(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return _GLIBCXX_STD_A::__max_element(__first, __last,
-				__gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Return the maximum element in a range using comparison functor.
-   *  @ingroup sorting_algorithms
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @param  __comp   Comparison functor.
-   *  @return  Iterator referencing the first instance of the largest value
-   *  according to __comp.
-  */
-  template<typename _ForwardIterator, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    inline _ForwardIterator
-    max_element(_ForwardIterator __first, _ForwardIterator __last,
-		_Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return _GLIBCXX_STD_A::__max_element(__first, __last,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-_GLIBCXX_END_NAMESPACE_ALGO
-} // namespace std
-
-#endif /* _STL_ALGO_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_algobase.h b/openflow/usr/include/c++/5/bits/stl_algobase.h
deleted file mode 100644
index 2b69e61..0000000
--- a/openflow/usr/include/c++/5/bits/stl_algobase.h
+++ /dev/null
@@ -1,1433 +0,0 @@
-// Core algorithmic facilities -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_algobase.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{algorithm}
- */
-
-#ifndef _STL_ALGOBASE_H
-#define _STL_ALGOBASE_H 1
-
-#include <bits/c++config.h>
-#include <bits/functexcept.h>
-#include <bits/cpp_type_traits.h>
-#include <ext/type_traits.h>
-#include <ext/numeric_traits.h>
-#include <bits/stl_pair.h>
-#include <bits/stl_iterator_base_types.h>
-#include <bits/stl_iterator_base_funcs.h>
-#include <bits/stl_iterator.h>
-#include <bits/concept_check.h>
-#include <debug/debug.h>
-#include <bits/move.h> // For std::swap and _GLIBCXX_MOVE
-#include <bits/predefined_ops.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if __cplusplus < 201103L
-  // See http://gcc.gnu.org/ml/libstdc++/2004-08/msg00167.html: in a
-  // nutshell, we are partially implementing the resolution of DR 187,
-  // when it's safe, i.e., the value_types are equal.
-  template<bool _BoolType>
-    struct __iter_swap
-    {
-      template<typename _ForwardIterator1, typename _ForwardIterator2>
-        static void
-        iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
-        {
-          typedef typename iterator_traits<_ForwardIterator1>::value_type
-            _ValueType1;
-          _ValueType1 __tmp = _GLIBCXX_MOVE(*__a);
-          *__a = _GLIBCXX_MOVE(*__b);
-          *__b = _GLIBCXX_MOVE(__tmp);
-	}
-    };
-
-  template<>
-    struct __iter_swap<true>
-    {
-      template<typename _ForwardIterator1, typename _ForwardIterator2>
-        static void 
-        iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
-        {
-          swap(*__a, *__b);
-        }
-    };
-#endif
-
-  /**
-   *  @brief Swaps the contents of two iterators.
-   *  @ingroup mutating_algorithms
-   *  @param  __a  An iterator.
-   *  @param  __b  Another iterator.
-   *  @return   Nothing.
-   *
-   *  This function swaps the values pointed to by two iterators, not the
-   *  iterators themselves.
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    inline void
-    iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator1>)
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator2>)
-
-#if __cplusplus < 201103L
-      typedef typename iterator_traits<_ForwardIterator1>::value_type
-	_ValueType1;
-      typedef typename iterator_traits<_ForwardIterator2>::value_type
-	_ValueType2;
-
-      __glibcxx_function_requires(_ConvertibleConcept<_ValueType1,
-				  _ValueType2>)
-      __glibcxx_function_requires(_ConvertibleConcept<_ValueType2,
-				  _ValueType1>)
-
-      typedef typename iterator_traits<_ForwardIterator1>::reference
-	_ReferenceType1;
-      typedef typename iterator_traits<_ForwardIterator2>::reference
-	_ReferenceType2;
-      std::__iter_swap<__are_same<_ValueType1, _ValueType2>::__value
-	&& __are_same<_ValueType1&, _ReferenceType1>::__value
-	&& __are_same<_ValueType2&, _ReferenceType2>::__value>::
-	iter_swap(__a, __b);
-#else
-      swap(*__a, *__b);
-#endif
-    }
-
-  /**
-   *  @brief Swap the elements of two sequences.
-   *  @ingroup mutating_algorithms
-   *  @param  __first1  A forward iterator.
-   *  @param  __last1   A forward iterator.
-   *  @param  __first2  A forward iterator.
-   *  @return   An iterator equal to @p first2+(last1-first1).
-   *
-   *  Swaps each element in the range @p [first1,last1) with the
-   *  corresponding element in the range @p [first2,(last1-first1)).
-   *  The ranges must not overlap.
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    _ForwardIterator2
-    swap_ranges(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-		_ForwardIterator2 __first2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator1>)
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for (; __first1 != __last1; ++__first1, ++__first2)
-	std::iter_swap(__first1, __first2);
-      return __first2;
-    }
-
-  /**
-   *  @brief This does what you think it does.
-   *  @ingroup sorting_algorithms
-   *  @param  __a  A thing of arbitrary type.
-   *  @param  __b  Another thing of arbitrary type.
-   *  @return   The lesser of the parameters.
-   *
-   *  This is the simple classic generic implementation.  It will work on
-   *  temporary expressions, since they are only evaluated once, unlike a
-   *  preprocessor macro.
-  */
-  template<typename _Tp>
-    _GLIBCXX14_CONSTEXPR
-    inline const _Tp&
-    min(const _Tp& __a, const _Tp& __b)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      //return __b < __a ? __b : __a;
-      if (__b < __a)
-	return __b;
-      return __a;
-    }
-
-  /**
-   *  @brief This does what you think it does.
-   *  @ingroup sorting_algorithms
-   *  @param  __a  A thing of arbitrary type.
-   *  @param  __b  Another thing of arbitrary type.
-   *  @return   The greater of the parameters.
-   *
-   *  This is the simple classic generic implementation.  It will work on
-   *  temporary expressions, since they are only evaluated once, unlike a
-   *  preprocessor macro.
-  */
-  template<typename _Tp>
-    _GLIBCXX14_CONSTEXPR
-    inline const _Tp&
-    max(const _Tp& __a, const _Tp& __b)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      //return  __a < __b ? __b : __a;
-      if (__a < __b)
-	return __b;
-      return __a;
-    }
-
-  /**
-   *  @brief This does what you think it does.
-   *  @ingroup sorting_algorithms
-   *  @param  __a  A thing of arbitrary type.
-   *  @param  __b  Another thing of arbitrary type.
-   *  @param  __comp  A @link comparison_functors comparison functor@endlink.
-   *  @return   The lesser of the parameters.
-   *
-   *  This will work on temporary expressions, since they are only evaluated
-   *  once, unlike a preprocessor macro.
-  */
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    inline const _Tp&
-    min(const _Tp& __a, const _Tp& __b, _Compare __comp)
-    {
-      //return __comp(__b, __a) ? __b : __a;
-      if (__comp(__b, __a))
-	return __b;
-      return __a;
-    }
-
-  /**
-   *  @brief This does what you think it does.
-   *  @ingroup sorting_algorithms
-   *  @param  __a  A thing of arbitrary type.
-   *  @param  __b  Another thing of arbitrary type.
-   *  @param  __comp  A @link comparison_functors comparison functor@endlink.
-   *  @return   The greater of the parameters.
-   *
-   *  This will work on temporary expressions, since they are only evaluated
-   *  once, unlike a preprocessor macro.
-  */
-  template<typename _Tp, typename _Compare>
-    _GLIBCXX14_CONSTEXPR
-    inline const _Tp&
-    max(const _Tp& __a, const _Tp& __b, _Compare __comp)
-    {
-      //return __comp(__a, __b) ? __b : __a;
-      if (__comp(__a, __b))
-	return __b;
-      return __a;
-    }
-
-  // If _Iterator is a __normal_iterator return its base (a plain pointer,
-  // normally) otherwise return it untouched.  See copy, fill, ... 
-  template<typename _Iterator>
-    struct _Niter_base
-    : _Iter_base<_Iterator, __is_normal_iterator<_Iterator>::__value>
-    { };
-
-  template<typename _Iterator>
-    inline typename _Niter_base<_Iterator>::iterator_type
-    __niter_base(_Iterator __it)
-    { return std::_Niter_base<_Iterator>::_S_base(__it); }
-
-  // Likewise, for move_iterator.
-  template<typename _Iterator>
-    struct _Miter_base
-    : _Iter_base<_Iterator, __is_move_iterator<_Iterator>::__value>
-    { };
-
-  template<typename _Iterator>
-    inline typename _Miter_base<_Iterator>::iterator_type
-    __miter_base(_Iterator __it)
-    { return std::_Miter_base<_Iterator>::_S_base(__it); }
-
-  // All of these auxiliary structs serve two purposes.  (1) Replace
-  // calls to copy with memmove whenever possible.  (Memmove, not memcpy,
-  // because the input and output ranges are permitted to overlap.)
-  // (2) If we're using random access iterators, then write the loop as
-  // a for loop with an explicit count.
-
-  template<bool, bool, typename>
-    struct __copy_move
-    {
-      template<typename _II, typename _OI>
-        static _OI
-        __copy_m(_II __first, _II __last, _OI __result)
-        {
-	  for (; __first != __last; ++__result, ++__first)
-	    *__result = *__first;
-	  return __result;
-	}
-    };
-
-#if __cplusplus >= 201103L
-  template<typename _Category>
-    struct __copy_move<true, false, _Category>
-    {
-      template<typename _II, typename _OI>
-        static _OI
-        __copy_m(_II __first, _II __last, _OI __result)
-        {
-	  for (; __first != __last; ++__result, ++__first)
-	    *__result = std::move(*__first);
-	  return __result;
-	}
-    };
-#endif
-
-  template<>
-    struct __copy_move<false, false, random_access_iterator_tag>
-    {
-      template<typename _II, typename _OI>
-        static _OI
-        __copy_m(_II __first, _II __last, _OI __result)
-        { 
-	  typedef typename iterator_traits<_II>::difference_type _Distance;
-	  for(_Distance __n = __last - __first; __n > 0; --__n)
-	    {
-	      *__result = *__first;
-	      ++__first;
-	      ++__result;
-	    }
-	  return __result;
-	}
-    };
-
-#if __cplusplus >= 201103L
-  template<>
-    struct __copy_move<true, false, random_access_iterator_tag>
-    {
-      template<typename _II, typename _OI>
-        static _OI
-        __copy_m(_II __first, _II __last, _OI __result)
-        { 
-	  typedef typename iterator_traits<_II>::difference_type _Distance;
-	  for(_Distance __n = __last - __first; __n > 0; --__n)
-	    {
-	      *__result = std::move(*__first);
-	      ++__first;
-	      ++__result;
-	    }
-	  return __result;
-	}
-    };
-#endif
-
-  template<bool _IsMove>
-    struct __copy_move<_IsMove, true, random_access_iterator_tag>
-    {
-      template<typename _Tp>
-        static _Tp*
-        __copy_m(const _Tp* __first, const _Tp* __last, _Tp* __result)
-        {
-#if __cplusplus >= 201103L
-	  // trivial types can have deleted assignment
-	  static_assert( is_copy_assignable<_Tp>::value,
-	                 "type is not assignable" );
-#endif
-	  const ptrdiff_t _Num = __last - __first;
-	  if (_Num)
-	    __builtin_memmove(__result, __first, sizeof(_Tp) * _Num);
-	  return __result + _Num;
-	}
-    };
-
-  template<bool _IsMove, typename _II, typename _OI>
-    inline _OI
-    __copy_move_a(_II __first, _II __last, _OI __result)
-    {
-      typedef typename iterator_traits<_II>::value_type _ValueTypeI;
-      typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
-      typedef typename iterator_traits<_II>::iterator_category _Category;
-      const bool __simple = (__is_trivial(_ValueTypeI)
-	                     && __is_pointer<_II>::__value
-	                     && __is_pointer<_OI>::__value
-			     && __are_same<_ValueTypeI, _ValueTypeO>::__value);
-
-      return std::__copy_move<_IsMove, __simple,
-	                      _Category>::__copy_m(__first, __last, __result);
-    }
-
-  // Helpers for streambuf iterators (either istream or ostream).
-  // NB: avoid including <iosfwd>, relatively large.
-  template<typename _CharT>
-    struct char_traits;
-
-  template<typename _CharT, typename _Traits>
-    class istreambuf_iterator;
-
-  template<typename _CharT, typename _Traits>
-    class ostreambuf_iterator;
-
-  template<bool _IsMove, typename _CharT>
-    typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value, 
-	     ostreambuf_iterator<_CharT, char_traits<_CharT> > >::__type
-    __copy_move_a2(_CharT*, _CharT*,
-		   ostreambuf_iterator<_CharT, char_traits<_CharT> >);
-
-  template<bool _IsMove, typename _CharT>
-    typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value, 
-	     ostreambuf_iterator<_CharT, char_traits<_CharT> > >::__type
-    __copy_move_a2(const _CharT*, const _CharT*,
-		   ostreambuf_iterator<_CharT, char_traits<_CharT> >);
-
-  template<bool _IsMove, typename _CharT>
-    typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value,
-				    _CharT*>::__type
-    __copy_move_a2(istreambuf_iterator<_CharT, char_traits<_CharT> >,
-		   istreambuf_iterator<_CharT, char_traits<_CharT> >, _CharT*);
-
-  template<bool _IsMove, typename _II, typename _OI>
-    inline _OI
-    __copy_move_a2(_II __first, _II __last, _OI __result)
-    {
-      return _OI(std::__copy_move_a<_IsMove>(std::__niter_base(__first),
-					     std::__niter_base(__last),
-					     std::__niter_base(__result)));
-    }
-
-  /**
-   *  @brief Copies the range [first,last) into result.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __result An output iterator.
-   *  @return   result + (first - last)
-   *
-   *  This inline function will boil down to a call to @c memmove whenever
-   *  possible.  Failing that, if random access iterators are passed, then the
-   *  loop count will be known (and therefore a candidate for compiler
-   *  optimizations such as unrolling).  Result may not be contained within
-   *  [first,last); the copy_backward function should be used instead.
-   *
-   *  Note that the end of the output range is permitted to be contained
-   *  within [first,last).
-  */
-  template<typename _II, typename _OI>
-    inline _OI
-    copy(_II __first, _II __last, _OI __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_II>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OI,
-	    typename iterator_traits<_II>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return (std::__copy_move_a2<__is_move_iterator<_II>::__value>
-	      (std::__miter_base(__first), std::__miter_base(__last),
-	       __result));
-    }
-
-#if __cplusplus >= 201103L
-  /**
-   *  @brief Moves the range [first,last) into result.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __result An output iterator.
-   *  @return   result + (first - last)
-   *
-   *  This inline function will boil down to a call to @c memmove whenever
-   *  possible.  Failing that, if random access iterators are passed, then the
-   *  loop count will be known (and therefore a candidate for compiler
-   *  optimizations such as unrolling).  Result may not be contained within
-   *  [first,last); the move_backward function should be used instead.
-   *
-   *  Note that the end of the output range is permitted to be contained
-   *  within [first,last).
-  */
-  template<typename _II, typename _OI>
-    inline _OI
-    move(_II __first, _II __last, _OI __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_II>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OI,
-	    typename iterator_traits<_II>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__copy_move_a2<true>(std::__miter_base(__first),
-				       std::__miter_base(__last), __result);
-    }
-
-#define _GLIBCXX_MOVE3(_Tp, _Up, _Vp) std::move(_Tp, _Up, _Vp)
-#else
-#define _GLIBCXX_MOVE3(_Tp, _Up, _Vp) std::copy(_Tp, _Up, _Vp)
-#endif
-
-  template<bool, bool, typename>
-    struct __copy_move_backward
-    {
-      template<typename _BI1, typename _BI2>
-        static _BI2
-        __copy_move_b(_BI1 __first, _BI1 __last, _BI2 __result)
-        {
-	  while (__first != __last)
-	    *--__result = *--__last;
-	  return __result;
-	}
-    };
-
-#if __cplusplus >= 201103L
-  template<typename _Category>
-    struct __copy_move_backward<true, false, _Category>
-    {
-      template<typename _BI1, typename _BI2>
-        static _BI2
-        __copy_move_b(_BI1 __first, _BI1 __last, _BI2 __result)
-        {
-	  while (__first != __last)
-	    *--__result = std::move(*--__last);
-	  return __result;
-	}
-    };
-#endif
-
-  template<>
-    struct __copy_move_backward<false, false, random_access_iterator_tag>
-    {
-      template<typename _BI1, typename _BI2>
-        static _BI2
-        __copy_move_b(_BI1 __first, _BI1 __last, _BI2 __result)
-        {
-	  typename iterator_traits<_BI1>::difference_type __n;
-	  for (__n = __last - __first; __n > 0; --__n)
-	    *--__result = *--__last;
-	  return __result;
-	}
-    };
-
-#if __cplusplus >= 201103L
-  template<>
-    struct __copy_move_backward<true, false, random_access_iterator_tag>
-    {
-      template<typename _BI1, typename _BI2>
-        static _BI2
-        __copy_move_b(_BI1 __first, _BI1 __last, _BI2 __result)
-        {
-	  typename iterator_traits<_BI1>::difference_type __n;
-	  for (__n = __last - __first; __n > 0; --__n)
-	    *--__result = std::move(*--__last);
-	  return __result;
-	}
-    };
-#endif
-
-  template<bool _IsMove>
-    struct __copy_move_backward<_IsMove, true, random_access_iterator_tag>
-    {
-      template<typename _Tp>
-        static _Tp*
-        __copy_move_b(const _Tp* __first, const _Tp* __last, _Tp* __result)
-        {
-#if __cplusplus >= 201103L
-	  // trivial types can have deleted assignment
-	  static_assert( is_copy_assignable<_Tp>::value,
-	                 "type is not assignable" );
-#endif
-	  const ptrdiff_t _Num = __last - __first;
-	  if (_Num)
-	    __builtin_memmove(__result - _Num, __first, sizeof(_Tp) * _Num);
-	  return __result - _Num;
-	}
-    };
-
-  template<bool _IsMove, typename _BI1, typename _BI2>
-    inline _BI2
-    __copy_move_backward_a(_BI1 __first, _BI1 __last, _BI2 __result)
-    {
-      typedef typename iterator_traits<_BI1>::value_type _ValueType1;
-      typedef typename iterator_traits<_BI2>::value_type _ValueType2;
-      typedef typename iterator_traits<_BI1>::iterator_category _Category;
-      const bool __simple = (__is_trivial(_ValueType1)
-	                     && __is_pointer<_BI1>::__value
-	                     && __is_pointer<_BI2>::__value
-			     && __are_same<_ValueType1, _ValueType2>::__value);
-
-      return std::__copy_move_backward<_IsMove, __simple,
-	                               _Category>::__copy_move_b(__first,
-								 __last,
-								 __result);
-    }
-
-  template<bool _IsMove, typename _BI1, typename _BI2>
-    inline _BI2
-    __copy_move_backward_a2(_BI1 __first, _BI1 __last, _BI2 __result)
-    {
-      return _BI2(std::__copy_move_backward_a<_IsMove>
-		  (std::__niter_base(__first), std::__niter_base(__last),
-		   std::__niter_base(__result)));
-    }
-
-  /**
-   *  @brief Copies the range [first,last) into result.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  A bidirectional iterator.
-   *  @param  __last   A bidirectional iterator.
-   *  @param  __result A bidirectional iterator.
-   *  @return   result - (first - last)
-   *
-   *  The function has the same effect as copy, but starts at the end of the
-   *  range and works its way to the start, returning the start of the result.
-   *  This inline function will boil down to a call to @c memmove whenever
-   *  possible.  Failing that, if random access iterators are passed, then the
-   *  loop count will be known (and therefore a candidate for compiler
-   *  optimizations such as unrolling).
-   *
-   *  Result may not be in the range (first,last].  Use copy instead.  Note
-   *  that the start of the output range may overlap [first,last).
-  */
-  template<typename _BI1, typename _BI2>
-    inline _BI2
-    copy_backward(_BI1 __first, _BI1 __last, _BI2 __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BI1>)
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>)
-      __glibcxx_function_requires(_ConvertibleConcept<
-	    typename iterator_traits<_BI1>::value_type,
-	    typename iterator_traits<_BI2>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return (std::__copy_move_backward_a2<__is_move_iterator<_BI1>::__value>
-	      (std::__miter_base(__first), std::__miter_base(__last),
-	       __result));
-    }
-
-#if __cplusplus >= 201103L
-  /**
-   *  @brief Moves the range [first,last) into result.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  A bidirectional iterator.
-   *  @param  __last   A bidirectional iterator.
-   *  @param  __result A bidirectional iterator.
-   *  @return   result - (first - last)
-   *
-   *  The function has the same effect as move, but starts at the end of the
-   *  range and works its way to the start, returning the start of the result.
-   *  This inline function will boil down to a call to @c memmove whenever
-   *  possible.  Failing that, if random access iterators are passed, then the
-   *  loop count will be known (and therefore a candidate for compiler
-   *  optimizations such as unrolling).
-   *
-   *  Result may not be in the range (first,last].  Use move instead.  Note
-   *  that the start of the output range may overlap [first,last).
-  */
-  template<typename _BI1, typename _BI2>
-    inline _BI2
-    move_backward(_BI1 __first, _BI1 __last, _BI2 __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BI1>)
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>)
-      __glibcxx_function_requires(_ConvertibleConcept<
-	    typename iterator_traits<_BI1>::value_type,
-	    typename iterator_traits<_BI2>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__copy_move_backward_a2<true>(std::__miter_base(__first),
-						std::__miter_base(__last),
-						__result);
-    }
-
-#define _GLIBCXX_MOVE_BACKWARD3(_Tp, _Up, _Vp) std::move_backward(_Tp, _Up, _Vp)
-#else
-#define _GLIBCXX_MOVE_BACKWARD3(_Tp, _Up, _Vp) std::copy_backward(_Tp, _Up, _Vp)
-#endif
-
-  template<typename _ForwardIterator, typename _Tp>
-    inline typename
-    __gnu_cxx::__enable_if<!__is_scalar<_Tp>::__value, void>::__type
-    __fill_a(_ForwardIterator __first, _ForwardIterator __last,
- 	     const _Tp& __value)
-    {
-      for (; __first != __last; ++__first)
-	*__first = __value;
-    }
-    
-  template<typename _ForwardIterator, typename _Tp>
-    inline typename
-    __gnu_cxx::__enable_if<__is_scalar<_Tp>::__value, void>::__type
-    __fill_a(_ForwardIterator __first, _ForwardIterator __last,
-	     const _Tp& __value)
-    {
-      const _Tp __tmp = __value;
-      for (; __first != __last; ++__first)
-	*__first = __tmp;
-    }
-
-  // Specialization: for char types we can use memset.
-  template<typename _Tp>
-    inline typename
-    __gnu_cxx::__enable_if<__is_byte<_Tp>::__value, void>::__type
-    __fill_a(_Tp* __first, _Tp* __last, const _Tp& __c)
-    {
-      const _Tp __tmp = __c;
-      if (const size_t __len = __last - __first)
-	__builtin_memset(__first, static_cast<unsigned char>(__tmp), __len);
-    }
-
-  /**
-   *  @brief Fills the range [first,last) with copies of value.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  A forward iterator.
-   *  @param  __last   A forward iterator.
-   *  @param  __value  A reference-to-const of arbitrary type.
-   *  @return   Nothing.
-   *
-   *  This function fills a range with copies of the same value.  For char
-   *  types filling contiguous areas of memory, this becomes an inline call
-   *  to @c memset or @c wmemset.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    inline void
-    fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      std::__fill_a(std::__niter_base(__first), std::__niter_base(__last),
-		    __value);
-    }
-
-  template<typename _OutputIterator, typename _Size, typename _Tp>
-    inline typename
-    __gnu_cxx::__enable_if<!__is_scalar<_Tp>::__value, _OutputIterator>::__type
-    __fill_n_a(_OutputIterator __first, _Size __n, const _Tp& __value)
-    {
-      for (__decltype(__n + 0) __niter = __n;
-	   __niter > 0; --__niter, ++__first)
-	*__first = __value;
-      return __first;
-    }
-
-  template<typename _OutputIterator, typename _Size, typename _Tp>
-    inline typename
-    __gnu_cxx::__enable_if<__is_scalar<_Tp>::__value, _OutputIterator>::__type
-    __fill_n_a(_OutputIterator __first, _Size __n, const _Tp& __value)
-    {
-      const _Tp __tmp = __value;
-      for (__decltype(__n + 0) __niter = __n;
-	   __niter > 0; --__niter, ++__first)
-	*__first = __tmp;
-      return __first;
-    }
-
-  template<typename _Size, typename _Tp>
-    inline typename
-    __gnu_cxx::__enable_if<__is_byte<_Tp>::__value, _Tp*>::__type
-    __fill_n_a(_Tp* __first, _Size __n, const _Tp& __c)
-    {
-      std::__fill_a(__first, __first + __n, __c);
-      return __first + __n;
-    }
-
-  /**
-   *  @brief Fills the range [first,first+n) with copies of value.
-   *  @ingroup mutating_algorithms
-   *  @param  __first  An output iterator.
-   *  @param  __n      The count of copies to perform.
-   *  @param  __value  A reference-to-const of arbitrary type.
-   *  @return   The iterator at first+n.
-   *
-   *  This function fills a range with copies of the same value.  For char
-   *  types filling contiguous areas of memory, this becomes an inline call
-   *  to @c memset or @ wmemset.
-   *
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-   *  DR 865. More algorithms that throw away information
-  */
-  template<typename _OI, typename _Size, typename _Tp>
-    inline _OI
-    fill_n(_OI __first, _Size __n, const _Tp& __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_OutputIteratorConcept<_OI, _Tp>)
-
-      return _OI(std::__fill_n_a(std::__niter_base(__first), __n, __value));
-    }
-
-  template<bool _BoolType>
-    struct __equal
-    {
-      template<typename _II1, typename _II2>
-        static bool
-        equal(_II1 __first1, _II1 __last1, _II2 __first2)
-        {
-	  for (; __first1 != __last1; ++__first1, ++__first2)
-	    if (!(*__first1 == *__first2))
-	      return false;
-	  return true;
-	}
-    };
-
-  template<>
-    struct __equal<true>
-    {
-      template<typename _Tp>
-        static bool
-        equal(const _Tp* __first1, const _Tp* __last1, const _Tp* __first2)
-        {
-	  if (const size_t __len = (__last1 - __first1))
-	    return !__builtin_memcmp(__first1, __first2, sizeof(_Tp) * __len);
-	  return true;
-	}
-    };
-
-  template<typename _II1, typename _II2>
-    inline bool
-    __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2)
-    {
-      typedef typename iterator_traits<_II1>::value_type _ValueType1;
-      typedef typename iterator_traits<_II2>::value_type _ValueType2;
-      const bool __simple = ((__is_integer<_ValueType1>::__value
-			      || __is_pointer<_ValueType1>::__value)
-	                     && __is_pointer<_II1>::__value
-	                     && __is_pointer<_II2>::__value
-			     && __are_same<_ValueType1, _ValueType2>::__value);
-
-      return std::__equal<__simple>::equal(__first1, __last1, __first2);
-    }
-
-  template<typename, typename>
-    struct __lc_rai
-    {
-      template<typename _II1, typename _II2>
-        static _II1
-        __newlast1(_II1, _II1 __last1, _II2, _II2)
-        { return __last1; }
-
-      template<typename _II>
-        static bool
-        __cnd2(_II __first, _II __last)
-        { return __first != __last; }
-    };
-
-  template<>
-    struct __lc_rai<random_access_iterator_tag, random_access_iterator_tag>
-    {
-      template<typename _RAI1, typename _RAI2>
-        static _RAI1
-        __newlast1(_RAI1 __first1, _RAI1 __last1,
-		   _RAI2 __first2, _RAI2 __last2)
-        {
-	  const typename iterator_traits<_RAI1>::difference_type
-	    __diff1 = __last1 - __first1;
-	  const typename iterator_traits<_RAI2>::difference_type
-	    __diff2 = __last2 - __first2;
-	  return __diff2 < __diff1 ? __first1 + __diff2 : __last1;
-	}
-
-      template<typename _RAI>
-        static bool
-        __cnd2(_RAI, _RAI)
-        { return true; }
-    };
-
-  template<typename _II1, typename _II2, typename _Compare>
-    bool
-    __lexicographical_compare_impl(_II1 __first1, _II1 __last1,
-				   _II2 __first2, _II2 __last2,
-				   _Compare __comp)
-    {
-      typedef typename iterator_traits<_II1>::iterator_category _Category1;
-      typedef typename iterator_traits<_II2>::iterator_category _Category2;
-      typedef std::__lc_rai<_Category1, _Category2> __rai_type;
-
-      __last1 = __rai_type::__newlast1(__first1, __last1, __first2, __last2);
-      for (; __first1 != __last1 && __rai_type::__cnd2(__first2, __last2);
-	   ++__first1, ++__first2)
-	{
-	  if (__comp(__first1, __first2))
-	    return true;
-	  if (__comp(__first2, __first1))
-	    return false;
-	}
-      return __first1 == __last1 && __first2 != __last2;
-    }
-
-  template<bool _BoolType>
-    struct __lexicographical_compare
-    {
-      template<typename _II1, typename _II2>
-        static bool __lc(_II1, _II1, _II2, _II2);
-    };
-
-  template<bool _BoolType>
-    template<typename _II1, typename _II2>
-      bool
-      __lexicographical_compare<_BoolType>::
-      __lc(_II1 __first1, _II1 __last1, _II2 __first2, _II2 __last2)
-      {
-	return std::__lexicographical_compare_impl(__first1, __last1,
-						   __first2, __last2,
-					__gnu_cxx::__ops::__iter_less_iter());
-      }
-
-  template<>
-    struct __lexicographical_compare<true>
-    {
-      template<typename _Tp, typename _Up>
-        static bool
-        __lc(const _Tp* __first1, const _Tp* __last1,
-	     const _Up* __first2, const _Up* __last2)
-	{
-	  const size_t __len1 = __last1 - __first1;
-	  const size_t __len2 = __last2 - __first2;
-	  if (const size_t __len = std::min(__len1, __len2))
-	    if (int __result = __builtin_memcmp(__first1, __first2, __len))
-	      return __result < 0;
-	  return __len1 < __len2;
-	}
-    };
-
-  template<typename _II1, typename _II2>
-    inline bool
-    __lexicographical_compare_aux(_II1 __first1, _II1 __last1,
-				  _II2 __first2, _II2 __last2)
-    {
-      typedef typename iterator_traits<_II1>::value_type _ValueType1;
-      typedef typename iterator_traits<_II2>::value_type _ValueType2;
-      const bool __simple =
-	(__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
-	 && !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
-	 && !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
-	 && __is_pointer<_II1>::__value
-	 && __is_pointer<_II2>::__value);
-
-      return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
-							    __first2, __last2);
-    }
-
-  template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    _ForwardIterator
-    __lower_bound(_ForwardIterator __first, _ForwardIterator __last,
-		  const _Tp& __val, _Compare __comp)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      _DistanceType __len = std::distance(__first, __last);
-
-      while (__len > 0)
-	{
-	  _DistanceType __half = __len >> 1;
-	  _ForwardIterator __middle = __first;
-	  std::advance(__middle, __half);
-	  if (__comp(__middle, __val))
-	    {
-	      __first = __middle;
-	      ++__first;
-	      __len = __len - __half - 1;
-	    }
-	  else
-	    __len = __half;
-	}
-      return __first;
-    }
-
-  /**
-   *  @brief Finds the first position in which @a val could be inserted
-   *         without changing the ordering.
-   *  @param  __first   An iterator.
-   *  @param  __last    Another iterator.
-   *  @param  __val     The search term.
-   *  @return         An iterator pointing to the first element <em>not less
-   *                  than</em> @a val, or end() if every element is less than 
-   *                  @a val.
-   *  @ingroup binary_search_algorithms
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    inline _ForwardIterator
-    lower_bound(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcxx_requires_partitioned_lower(__first, __last, __val);
-
-      return std::__lower_bound(__first, __last, __val,
-				__gnu_cxx::__ops::__iter_less_val());
-    }
-
-  /// This is a helper function for the sort routines and for random.tcc.
-  //  Precondition: __n > 0.
-  inline _GLIBCXX_CONSTEXPR int
-  __lg(int __n)
-  { return sizeof(int) * __CHAR_BIT__  - 1 - __builtin_clz(__n); }
-
-  inline _GLIBCXX_CONSTEXPR unsigned
-  __lg(unsigned __n)
-  { return sizeof(int) * __CHAR_BIT__  - 1 - __builtin_clz(__n); }
-
-  inline _GLIBCXX_CONSTEXPR long
-  __lg(long __n)
-  { return sizeof(long) * __CHAR_BIT__ - 1 - __builtin_clzl(__n); }
-
-  inline _GLIBCXX_CONSTEXPR unsigned long
-  __lg(unsigned long __n)
-  { return sizeof(long) * __CHAR_BIT__ - 1 - __builtin_clzl(__n); }
-
-  inline _GLIBCXX_CONSTEXPR long long
-  __lg(long long __n)
-  { return sizeof(long long) * __CHAR_BIT__ - 1 - __builtin_clzll(__n); }
-
-  inline _GLIBCXX_CONSTEXPR unsigned long long
-  __lg(unsigned long long __n)
-  { return sizeof(long long) * __CHAR_BIT__ - 1 - __builtin_clzll(__n); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-
-_GLIBCXX_BEGIN_NAMESPACE_ALGO
-
-  /**
-   *  @brief Tests a range for element-wise equality.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @return   A boolean true or false.
-   *
-   *  This compares the elements of two ranges using @c == and returns true or
-   *  false depending on whether all of the corresponding elements of the
-   *  ranges are equal.
-  */
-  template<typename _II1, typename _II2>
-    inline bool
-    equal(_II1 __first1, _II1 __last1, _II2 __first2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_II1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_II2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_II1>::value_type,
-	    typename iterator_traits<_II2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      return std::__equal_aux(std::__niter_base(__first1),
-			      std::__niter_base(__last1),
-			      std::__niter_base(__first2));
-    }
-
-  /**
-   *  @brief Tests a range for element-wise equality.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @param __binary_pred A binary predicate @link functors
-   *                  functor@endlink.
-   *  @return         A boolean true or false.
-   *
-   *  This compares the elements of two ranges using the binary_pred
-   *  parameter, and returns true or
-   *  false depending on whether all of the corresponding elements of the
-   *  ranges are equal.
-  */
-  template<typename _IIter1, typename _IIter2, typename _BinaryPredicate>
-    inline bool
-    equal(_IIter1 __first1, _IIter1 __last1,
-	  _IIter2 __first2, _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_IIter1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_IIter2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for (; __first1 != __last1; ++__first1, ++__first2)
-	if (!bool(__binary_pred(*__first1, *__first2)))
-	  return false;
-      return true;
-    }
-
-#if __cplusplus > 201103L
-
-#define __cpp_lib_robust_nonmodifying_seq_ops 201304
-
-  /**
-   *  @brief Tests a range for element-wise equality.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @param  __last2   An input iterator.
-   *  @return   A boolean true or false.
-   *
-   *  This compares the elements of two ranges using @c == and returns true or
-   *  false depending on whether all of the corresponding elements of the
-   *  ranges are equal.
-  */
-  template<typename _II1, typename _II2>
-    inline bool
-    equal(_II1 __first1, _II1 __last1, _II2 __first2, _II2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_II1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_II2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_II1>::value_type,
-	    typename iterator_traits<_II2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      using _RATag = random_access_iterator_tag;
-      using _Cat1 = typename iterator_traits<_II1>::iterator_category;
-      using _Cat2 = typename iterator_traits<_II2>::iterator_category;
-      using _RAIters = __and_<is_same<_Cat1, _RATag>, is_same<_Cat2, _RATag>>;
-      if (_RAIters())
-	{
-	  auto __d1 = std::distance(__first1, __last1);
-	  auto __d2 = std::distance(__first2, __last2);
-	  if (__d1 != __d2)
-	    return false;
-	  return _GLIBCXX_STD_A::equal(__first1, __last1, __first2);
-	}
-
-      for (; __first1 != __last1 && __first2 != __last2; ++__first1, ++__first2)
-	if (!(*__first1 == *__first2))
-	  return false;
-      return __first1 == __last1 && __first2 == __last2;
-    }
-
-  /**
-   *  @brief Tests a range for element-wise equality.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @param  __last2   An input iterator.
-   *  @param __binary_pred A binary predicate @link functors
-   *                  functor@endlink.
-   *  @return         A boolean true or false.
-   *
-   *  This compares the elements of two ranges using the binary_pred
-   *  parameter, and returns true or
-   *  false depending on whether all of the corresponding elements of the
-   *  ranges are equal.
-  */
-  template<typename _IIter1, typename _IIter2, typename _BinaryPredicate>
-    inline bool
-    equal(_IIter1 __first1, _IIter1 __last1,
-	  _IIter2 __first2, _IIter2 __last2, _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_IIter1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_IIter2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      using _RATag = random_access_iterator_tag;
-      using _Cat1 = typename iterator_traits<_IIter1>::iterator_category;
-      using _Cat2 = typename iterator_traits<_IIter2>::iterator_category;
-      using _RAIters = __and_<is_same<_Cat1, _RATag>, is_same<_Cat2, _RATag>>;
-      if (_RAIters())
-	{
-	  auto __d1 = std::distance(__first1, __last1);
-	  auto __d2 = std::distance(__first2, __last2);
-	  if (__d1 != __d2)
-	    return false;
-	  return _GLIBCXX_STD_A::equal(__first1, __last1, __first2,
-				       __binary_pred);
-	}
-
-      for (; __first1 != __last1 && __first2 != __last2; ++__first1, ++__first2)
-	if (!bool(__binary_pred(*__first1, *__first2)))
-	  return false;
-      return __first1 == __last1 && __first2 == __last2;
-    }
-#endif
-
-  /**
-   *  @brief Performs @b dictionary comparison on ranges.
-   *  @ingroup sorting_algorithms
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @param  __last2   An input iterator.
-   *  @return   A boolean true or false.
-   *
-   *  <em>Returns true if the sequence of elements defined by the range
-   *  [first1,last1) is lexicographically less than the sequence of elements
-   *  defined by the range [first2,last2).  Returns false otherwise.</em>
-   *  (Quoted from [25.3.8]/1.)  If the iterators are all character pointers,
-   *  then this is an inline call to @c memcmp.
-  */
-  template<typename _II1, typename _II2>
-    inline bool
-    lexicographical_compare(_II1 __first1, _II1 __last1,
-			    _II2 __first2, _II2 __last2)
-    {
-#ifdef _GLIBCXX_CONCEPT_CHECKS
-      // concept requirements
-      typedef typename iterator_traits<_II1>::value_type _ValueType1;
-      typedef typename iterator_traits<_II2>::value_type _ValueType2;
-#endif
-      __glibcxx_function_requires(_InputIteratorConcept<_II1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_II2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType1, _ValueType2>)
-      __glibcxx_function_requires(_LessThanOpConcept<_ValueType2, _ValueType1>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return std::__lexicographical_compare_aux(std::__niter_base(__first1),
-						std::__niter_base(__last1),
-						std::__niter_base(__first2),
-						std::__niter_base(__last2));
-    }
-
-  /**
-   *  @brief Performs @b dictionary comparison on ranges.
-   *  @ingroup sorting_algorithms
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @param  __last2   An input iterator.
-   *  @param  __comp  A @link comparison_functors comparison functor@endlink.
-   *  @return   A boolean true or false.
-   *
-   *  The same as the four-parameter @c lexicographical_compare, but uses the
-   *  comp parameter instead of @c <.
-  */
-  template<typename _II1, typename _II2, typename _Compare>
-    inline bool
-    lexicographical_compare(_II1 __first1, _II1 __last1,
-			    _II2 __first2, _II2 __last2, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_II1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_II2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return std::__lexicographical_compare_impl
-	(__first1, __last1, __first2, __last2,
-	 __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _BinaryPredicate>
-    pair<_InputIterator1, _InputIterator2>
-    __mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-	       _InputIterator2 __first2, _BinaryPredicate __binary_pred)
-    {
-      while (__first1 != __last1 && __binary_pred(__first1, __first2))
-        {
-	  ++__first1;
-	  ++__first2;
-        }
-      return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
-    }
-
-  /**
-   *  @brief Finds the places in ranges which don't match.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @return   A pair of iterators pointing to the first mismatch.
-   *
-   *  This compares the elements of two ranges using @c == and returns a pair
-   *  of iterators.  The first iterator points into the first range, the
-   *  second iterator points into the second range, and the elements pointed
-   *  to by the iterators are not equal.
-  */
-  template<typename _InputIterator1, typename _InputIterator2>
-    inline pair<_InputIterator1, _InputIterator2>
-    mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      return _GLIBCXX_STD_A::__mismatch(__first1, __last1, __first2,
-			     __gnu_cxx::__ops::__iter_equal_to_iter());
-    }
-
-  /**
-   *  @brief Finds the places in ranges which don't match.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @param __binary_pred A binary predicate @link functors
-   *         functor@endlink.
-   *  @return   A pair of iterators pointing to the first mismatch.
-   *
-   *  This compares the elements of two ranges using the binary_pred
-   *  parameter, and returns a pair
-   *  of iterators.  The first iterator points into the first range, the
-   *  second iterator points into the second range, and the elements pointed
-   *  to by the iterators are not equal.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _BinaryPredicate>
-    inline pair<_InputIterator1, _InputIterator2>
-    mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2, _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      return _GLIBCXX_STD_A::__mismatch(__first1, __last1, __first2,
-	__gnu_cxx::__ops::__iter_comp_iter(__binary_pred));
-    }
-
-#if __cplusplus > 201103L
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _BinaryPredicate>
-    pair<_InputIterator1, _InputIterator2>
-    __mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-	       _InputIterator2 __first2, _InputIterator2 __last2,
-	       _BinaryPredicate __binary_pred)
-    {
-      while (__first1 != __last1 && __first2 != __last2
-	     && __binary_pred(__first1, __first2))
-        {
-	  ++__first1;
-	  ++__first2;
-        }
-      return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
-    }
-
-  /**
-   *  @brief Finds the places in ranges which don't match.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @param  __last2   An input iterator.
-   *  @return   A pair of iterators pointing to the first mismatch.
-   *
-   *  This compares the elements of two ranges using @c == and returns a pair
-   *  of iterators.  The first iterator points into the first range, the
-   *  second iterator points into the second range, and the elements pointed
-   *  to by the iterators are not equal.
-  */
-  template<typename _InputIterator1, typename _InputIterator2>
-    inline pair<_InputIterator1, _InputIterator2>
-    mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2, _InputIterator2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return _GLIBCXX_STD_A::__mismatch(__first1, __last1, __first2, __last2,
-			     __gnu_cxx::__ops::__iter_equal_to_iter());
-    }
-
-  /**
-   *  @brief Finds the places in ranges which don't match.
-   *  @ingroup non_mutating_algorithms
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @param  __last2   An input iterator.
-   *  @param __binary_pred A binary predicate @link functors
-   *         functor@endlink.
-   *  @return   A pair of iterators pointing to the first mismatch.
-   *
-   *  This compares the elements of two ranges using the binary_pred
-   *  parameter, and returns a pair
-   *  of iterators.  The first iterator points into the first range, the
-   *  second iterator points into the second range, and the elements pointed
-   *  to by the iterators are not equal.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _BinaryPredicate>
-    inline pair<_InputIterator1, _InputIterator2>
-    mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2, _InputIterator2 __last2,
-	     _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return _GLIBCXX_STD_A::__mismatch(__first1, __last1, __first2, __last2,
-			     __gnu_cxx::__ops::__iter_comp_iter(__binary_pred));
-    }
-#endif
-
-_GLIBCXX_END_NAMESPACE_ALGO
-} // namespace std
-
-// NB: This file is included within many other C++ includes, as a way
-// of getting the base algorithms. So, make sure that parallel bits
-// come in too if requested. 
-#ifdef _GLIBCXX_PARALLEL
-# include <parallel/algobase.h>
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/stl_bvector.h b/openflow/usr/include/c++/5/bits/stl_bvector.h
deleted file mode 100644
index 71bee21..0000000
--- a/openflow/usr/include/c++/5/bits/stl_bvector.h
+++ /dev/null
@@ -1,1286 +0,0 @@
-// vector<bool> specialization -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1999
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_bvector.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{vector}
- */
-
-#ifndef _STL_BVECTOR_H
-#define _STL_BVECTOR_H 1
-
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  typedef unsigned long _Bit_type;
-  enum { _S_word_bit = int(__CHAR_BIT__ * sizeof(_Bit_type)) };
-
-  struct _Bit_reference
-  {
-    _Bit_type * _M_p;
-    _Bit_type _M_mask;
-
-    _Bit_reference(_Bit_type * __x, _Bit_type __y)
-    : _M_p(__x), _M_mask(__y) { }
-
-    _Bit_reference() _GLIBCXX_NOEXCEPT : _M_p(0), _M_mask(0) { }
-
-    operator bool() const _GLIBCXX_NOEXCEPT
-    { return !!(*_M_p & _M_mask); }
-
-    _Bit_reference&
-    operator=(bool __x) _GLIBCXX_NOEXCEPT
-    {
-      if (__x)
-	*_M_p |= _M_mask;
-      else
-	*_M_p &= ~_M_mask;
-      return *this;
-    }
-
-    _Bit_reference&
-    operator=(const _Bit_reference& __x) _GLIBCXX_NOEXCEPT
-    { return *this = bool(__x); }
-
-    bool
-    operator==(const _Bit_reference& __x) const
-    { return bool(*this) == bool(__x); }
-
-    bool
-    operator<(const _Bit_reference& __x) const
-    { return !bool(*this) && bool(__x); }
-
-    void
-    flip() _GLIBCXX_NOEXCEPT
-    { *_M_p ^= _M_mask; }
-  };
-
-#if __cplusplus >= 201103L
-  inline void
-  swap(_Bit_reference __x, _Bit_reference __y) noexcept
-  {
-    bool __tmp = __x;
-    __x = __y;
-    __y = __tmp;
-  }
-
-  inline void
-  swap(_Bit_reference __x, bool& __y) noexcept
-  {
-    bool __tmp = __x;
-    __x = __y;
-    __y = __tmp;
-  }
-
-  inline void
-  swap(bool& __x, _Bit_reference __y) noexcept
-  {
-    bool __tmp = __x;
-    __x = __y;
-    __y = __tmp;
-  }
-#endif
-
-  struct _Bit_iterator_base
-  : public std::iterator<std::random_access_iterator_tag, bool>
-  {
-    _Bit_type * _M_p;
-    unsigned int _M_offset;
-
-    _Bit_iterator_base(_Bit_type * __x, unsigned int __y)
-    : _M_p(__x), _M_offset(__y) { }
-
-    void
-    _M_bump_up()
-    {
-      if (_M_offset++ == int(_S_word_bit) - 1)
-	{
-	  _M_offset = 0;
-	  ++_M_p;
-	}
-    }
-
-    void
-    _M_bump_down()
-    {
-      if (_M_offset-- == 0)
-	{
-	  _M_offset = int(_S_word_bit) - 1;
-	  --_M_p;
-	}
-    }
-
-    void
-    _M_incr(ptrdiff_t __i)
-    {
-      difference_type __n = __i + _M_offset;
-      _M_p += __n / int(_S_word_bit);
-      __n = __n % int(_S_word_bit);
-      if (__n < 0)
-	{
-	  __n += int(_S_word_bit);
-	  --_M_p;
-	}
-      _M_offset = static_cast<unsigned int>(__n);
-    }
-
-    bool
-    operator==(const _Bit_iterator_base& __i) const
-    { return _M_p == __i._M_p && _M_offset == __i._M_offset; }
-
-    bool
-    operator<(const _Bit_iterator_base& __i) const
-    {
-      return _M_p < __i._M_p
-	     || (_M_p == __i._M_p && _M_offset < __i._M_offset);
-    }
-
-    bool
-    operator!=(const _Bit_iterator_base& __i) const
-    { return !(*this == __i); }
-
-    bool
-    operator>(const _Bit_iterator_base& __i) const
-    { return __i < *this; }
-
-    bool
-    operator<=(const _Bit_iterator_base& __i) const
-    { return !(__i < *this); }
-
-    bool
-    operator>=(const _Bit_iterator_base& __i) const
-    { return !(*this < __i); }
-  };
-
-  inline ptrdiff_t
-  operator-(const _Bit_iterator_base& __x, const _Bit_iterator_base& __y)
-  {
-    return (int(_S_word_bit) * (__x._M_p - __y._M_p)
-	    + __x._M_offset - __y._M_offset);
-  }
-
-  struct _Bit_iterator : public _Bit_iterator_base
-  {
-    typedef _Bit_reference  reference;
-    typedef _Bit_reference* pointer;
-    typedef _Bit_iterator   iterator;
-
-    _Bit_iterator() : _Bit_iterator_base(0, 0) { }
-
-    _Bit_iterator(_Bit_type * __x, unsigned int __y)
-    : _Bit_iterator_base(__x, __y) { }
-
-    iterator
-    _M_const_cast() const
-    { return *this; }
-
-    reference
-    operator*() const
-    { return reference(_M_p, 1UL << _M_offset); }
-
-    iterator&
-    operator++()
-    {
-      _M_bump_up();
-      return *this;
-    }
-
-    iterator
-    operator++(int)
-    {
-      iterator __tmp = *this;
-      _M_bump_up();
-      return __tmp;
-    }
-
-    iterator&
-    operator--()
-    {
-      _M_bump_down();
-      return *this;
-    }
-
-    iterator
-    operator--(int)
-    {
-      iterator __tmp = *this;
-      _M_bump_down();
-      return __tmp;
-    }
-
-    iterator&
-    operator+=(difference_type __i)
-    {
-      _M_incr(__i);
-      return *this;
-    }
-
-    iterator&
-    operator-=(difference_type __i)
-    {
-      *this += -__i;
-      return *this;
-    }
-
-    iterator
-    operator+(difference_type __i) const
-    {
-      iterator __tmp = *this;
-      return __tmp += __i;
-    }
-
-    iterator
-    operator-(difference_type __i) const
-    {
-      iterator __tmp = *this;
-      return __tmp -= __i;
-    }
-
-    reference
-    operator[](difference_type __i) const
-    { return *(*this + __i); }
-  };
-
-  inline _Bit_iterator
-  operator+(ptrdiff_t __n, const _Bit_iterator& __x)
-  { return __x + __n; }
-
-  struct _Bit_const_iterator : public _Bit_iterator_base
-  {
-    typedef bool                 reference;
-    typedef bool                 const_reference;
-    typedef const bool*          pointer;
-    typedef _Bit_const_iterator  const_iterator;
-
-    _Bit_const_iterator() : _Bit_iterator_base(0, 0) { }
-
-    _Bit_const_iterator(_Bit_type * __x, unsigned int __y)
-    : _Bit_iterator_base(__x, __y) { }
-
-    _Bit_const_iterator(const _Bit_iterator& __x)
-    : _Bit_iterator_base(__x._M_p, __x._M_offset) { }
-
-    _Bit_iterator
-    _M_const_cast() const
-    { return _Bit_iterator(_M_p, _M_offset); }
-
-    const_reference
-    operator*() const
-    { return _Bit_reference(_M_p, 1UL << _M_offset); }
-
-    const_iterator&
-    operator++()
-    {
-      _M_bump_up();
-      return *this;
-    }
-
-    const_iterator
-    operator++(int)
-    {
-      const_iterator __tmp = *this;
-      _M_bump_up();
-      return __tmp;
-    }
-
-    const_iterator&
-    operator--()
-    {
-      _M_bump_down();
-      return *this;
-    }
-
-    const_iterator
-    operator--(int)
-    {
-      const_iterator __tmp = *this;
-      _M_bump_down();
-      return __tmp;
-    }
-
-    const_iterator&
-    operator+=(difference_type __i)
-    {
-      _M_incr(__i);
-      return *this;
-    }
-
-    const_iterator&
-    operator-=(difference_type __i)
-    {
-      *this += -__i;
-      return *this;
-    }
-
-    const_iterator 
-    operator+(difference_type __i) const
-    {
-      const_iterator __tmp = *this;
-      return __tmp += __i;
-    }
-
-    const_iterator
-    operator-(difference_type __i) const
-    {
-      const_iterator __tmp = *this;
-      return __tmp -= __i;
-    }
-
-    const_reference
-    operator[](difference_type __i) const
-    { return *(*this + __i); }
-  };
-
-  inline _Bit_const_iterator
-  operator+(ptrdiff_t __n, const _Bit_const_iterator& __x)
-  { return __x + __n; }
-
-  inline void
-  __fill_bvector(_Bit_iterator __first, _Bit_iterator __last, bool __x)
-  {
-    for (; __first != __last; ++__first)
-      *__first = __x;
-  }
-
-  inline void
-  fill(_Bit_iterator __first, _Bit_iterator __last, const bool& __x)
-  {
-    if (__first._M_p != __last._M_p)
-      {
-	std::fill(__first._M_p + 1, __last._M_p, __x ? ~0 : 0);
-	__fill_bvector(__first, _Bit_iterator(__first._M_p + 1, 0), __x);
-	__fill_bvector(_Bit_iterator(__last._M_p, 0), __last, __x);
-      }
-    else
-      __fill_bvector(__first, __last, __x);
-  }
-
-  template<typename _Alloc>
-    struct _Bvector_base
-    {
-      typedef typename __gnu_cxx::__alloc_traits<_Alloc>::template
-        rebind<_Bit_type>::other _Bit_alloc_type;
-      typedef typename __gnu_cxx::__alloc_traits<_Bit_alloc_type>
-	_Bit_alloc_traits;
-      typedef typename _Bit_alloc_traits::pointer _Bit_pointer;
-
-      struct _Bvector_impl
-      : public _Bit_alloc_type
-      {
-	_Bit_iterator 	_M_start;
-	_Bit_iterator 	_M_finish;
-	_Bit_pointer 	_M_end_of_storage;
-
-	_Bvector_impl()
-	: _Bit_alloc_type(), _M_start(), _M_finish(), _M_end_of_storage()
-	{ }
- 
-	_Bvector_impl(const _Bit_alloc_type& __a)
-	: _Bit_alloc_type(__a), _M_start(), _M_finish(), _M_end_of_storage()
-	{ }
-
-#if __cplusplus >= 201103L
-	_Bvector_impl(_Bit_alloc_type&& __a)
-	: _Bit_alloc_type(std::move(__a)), _M_start(), _M_finish(),
-	  _M_end_of_storage()
-	{ }
-#endif
-
-	_Bit_type*
-	_M_end_addr() const _GLIBCXX_NOEXCEPT
-	{
-	  if (_M_end_of_storage)
-	    return std::__addressof(_M_end_of_storage[-1]) + 1;
-	  return 0;
-	}
-      };
-
-    public:
-      typedef _Alloc allocator_type;
-
-      _Bit_alloc_type&
-      _M_get_Bit_allocator() _GLIBCXX_NOEXCEPT
-      { return *static_cast<_Bit_alloc_type*>(&this->_M_impl); }
-
-      const _Bit_alloc_type&
-      _M_get_Bit_allocator() const _GLIBCXX_NOEXCEPT
-      { return *static_cast<const _Bit_alloc_type*>(&this->_M_impl); }
-
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return allocator_type(_M_get_Bit_allocator()); }
-
-      _Bvector_base()
-      : _M_impl() { }
-      
-      _Bvector_base(const allocator_type& __a)
-      : _M_impl(__a) { }
-
-#if __cplusplus >= 201103L
-      _Bvector_base(_Bvector_base&& __x) noexcept
-      : _M_impl(std::move(__x._M_get_Bit_allocator()))
-      {
-	this->_M_impl._M_start = __x._M_impl._M_start;
-	this->_M_impl._M_finish = __x._M_impl._M_finish;
-	this->_M_impl._M_end_of_storage = __x._M_impl._M_end_of_storage;
-	__x._M_impl._M_start = _Bit_iterator();
-	__x._M_impl._M_finish = _Bit_iterator();
-	__x._M_impl._M_end_of_storage = nullptr;
-      }
-#endif
-
-      ~_Bvector_base()
-      { this->_M_deallocate(); }
-
-    protected:
-      _Bvector_impl _M_impl;
-
-      _Bit_pointer
-      _M_allocate(size_t __n)
-      { return _Bit_alloc_traits::allocate(_M_impl, _S_nword(__n)); }
-
-      void
-      _M_deallocate()
-      {
-	if (_M_impl._M_start._M_p)
-	  {
-	    const size_t __n = _M_impl._M_end_addr() - _M_impl._M_start._M_p;
-	    _Bit_alloc_traits::deallocate(_M_impl,
-					  _M_impl._M_end_of_storage - __n,
-					  __n);
-	  }
-      }
-
-      static size_t
-      _S_nword(size_t __n)
-      { return (__n + int(_S_word_bit) - 1) / int(_S_word_bit); }
-    };
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-// Declare a partial specialization of vector<T, Alloc>.
-#include <bits/stl_vector.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /**
-   *  @brief  A specialization of vector for booleans which offers fixed time
-   *  access to individual elements in any order.
-   *
-   *  @ingroup sequences
-   *
-   *  @tparam _Alloc  Allocator type.
-   *
-   *  Note that vector<bool> does not actually meet the requirements for being
-   *  a container.  This is because the reference and pointer types are not
-   *  really references and pointers to bool.  See DR96 for details.  @see
-   *  vector for function documentation.
-   *
-   *  In some terminology a %vector can be described as a dynamic
-   *  C-style array, it offers fast and efficient access to individual
-   *  elements in any order and saves the user from worrying about
-   *  memory and size allocation.  Subscripting ( @c [] ) access is
-   *  also provided as with C-style arrays.
-  */
-template<typename _Alloc>
-  class vector<bool, _Alloc> : protected _Bvector_base<_Alloc>
-  {
-    typedef _Bvector_base<_Alloc>			 _Base;
-    typedef typename _Base::_Bit_pointer		 _Bit_pointer;
-    typedef typename _Base::_Bit_alloc_traits		 _Bit_alloc_traits;
-
-#if __cplusplus >= 201103L
-    template<typename> friend struct hash;
-#endif
-
-  public:
-    typedef bool                                         value_type;
-    typedef size_t                                       size_type;
-    typedef ptrdiff_t                                    difference_type;
-    typedef _Bit_reference                               reference;
-    typedef bool                                         const_reference;
-    typedef _Bit_reference*                              pointer;
-    typedef const bool*                                  const_pointer;
-    typedef _Bit_iterator                                iterator;
-    typedef _Bit_const_iterator                          const_iterator;
-    typedef std::reverse_iterator<const_iterator>        const_reverse_iterator;
-    typedef std::reverse_iterator<iterator>              reverse_iterator;
-    typedef _Alloc                        		 allocator_type;
-
-    allocator_type get_allocator() const
-    { return _Base::get_allocator(); }
-
-  protected:
-    using _Base::_M_allocate;
-    using _Base::_M_deallocate;
-    using _Base::_S_nword;
-    using _Base::_M_get_Bit_allocator;
-
-  public:
-    vector()
-#if __cplusplus >= 201103L
-      noexcept(is_nothrow_default_constructible<allocator_type>::value)
-#endif
-    : _Base() { }
-
-    explicit
-    vector(const allocator_type& __a)
-    : _Base(__a) { }
-
-#if __cplusplus >= 201103L
-    explicit
-    vector(size_type __n, const allocator_type& __a = allocator_type())
-    : vector(__n, false, __a)
-    { }
-
-    vector(size_type __n, const bool& __value, 
-	   const allocator_type& __a = allocator_type())
-    : _Base(__a)
-    {
-      _M_initialize(__n);
-      std::fill(this->_M_impl._M_start._M_p, this->_M_impl._M_end_addr(),
-		__value ? ~0 : 0);
-    }
-#else
-    explicit
-    vector(size_type __n, const bool& __value = bool(), 
-	   const allocator_type& __a = allocator_type())
-    : _Base(__a)
-    {
-      _M_initialize(__n);
-      std::fill(this->_M_impl._M_start._M_p, this->_M_impl._M_end_addr(),
-		__value ? ~0 : 0);
-    }
-#endif
-
-    vector(const vector& __x)
-    : _Base(_Bit_alloc_traits::_S_select_on_copy(__x._M_get_Bit_allocator()))
-    {
-      _M_initialize(__x.size());
-      _M_copy_aligned(__x.begin(), __x.end(), this->_M_impl._M_start);
-    }
-
-#if __cplusplus >= 201103L
-    vector(vector&& __x) noexcept
-    : _Base(std::move(__x)) { }
-
-    vector(vector&& __x, const allocator_type& __a)
-    noexcept(_Bit_alloc_traits::_S_always_equal())
-    : _Base(__a)
-    {
-      if (__x.get_allocator() == __a)
-	{
-	  this->_M_impl._M_start = __x._M_impl._M_start;
-	  this->_M_impl._M_finish = __x._M_impl._M_finish;
-	  this->_M_impl._M_end_of_storage = __x._M_impl._M_end_of_storage;
-	  __x._M_impl._M_start = _Bit_iterator();
-	  __x._M_impl._M_finish = _Bit_iterator();
-	  __x._M_impl._M_end_of_storage = nullptr;
-	}
-      else
-	{
-	  _M_initialize(__x.size());
-	  _M_copy_aligned(__x.begin(), __x.end(), begin());
-	  __x.clear();
-	}
-    }
-
-    vector(const vector& __x, const allocator_type& __a)
-    : _Base(__a)
-    {
-      _M_initialize(__x.size());
-      _M_copy_aligned(__x.begin(), __x.end(), this->_M_impl._M_start);
-    }
-
-    vector(initializer_list<bool> __l,
-	   const allocator_type& __a = allocator_type())
-    : _Base(__a)
-    {
-      _M_initialize_range(__l.begin(), __l.end(),
-			  random_access_iterator_tag());
-    }
-#endif
-
-#if __cplusplus >= 201103L
-    template<typename _InputIterator,
-	     typename = std::_RequireInputIter<_InputIterator>>
-      vector(_InputIterator __first, _InputIterator __last,
-	     const allocator_type& __a = allocator_type())
-      : _Base(__a)
-      { _M_initialize_dispatch(__first, __last, __false_type()); }
-#else
-    template<typename _InputIterator>
-      vector(_InputIterator __first, _InputIterator __last,
-	     const allocator_type& __a = allocator_type())
-      : _Base(__a)
-      {
-	typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	_M_initialize_dispatch(__first, __last, _Integral());
-      }
-#endif
-
-    ~vector() _GLIBCXX_NOEXCEPT { }
-
-    vector&
-    operator=(const vector& __x)
-    {
-      if (&__x == this)
-	return *this;
-#if __cplusplus >= 201103L
-      if (_Bit_alloc_traits::_S_propagate_on_copy_assign())
-	{
-	  if (this->_M_get_Bit_allocator() != __x._M_get_Bit_allocator())
-	    {
-	      this->_M_deallocate();
-	      std::__alloc_on_copy(_M_get_Bit_allocator(),
-				   __x._M_get_Bit_allocator());
-	      _M_initialize(__x.size());
-	    }
-	  else
-	    std::__alloc_on_copy(_M_get_Bit_allocator(),
-				 __x._M_get_Bit_allocator());
-	}
-#endif
-      if (__x.size() > capacity())
-	{
-	  this->_M_deallocate();
-	  _M_initialize(__x.size());
-	}
-      this->_M_impl._M_finish = _M_copy_aligned(__x.begin(), __x.end(),
-						begin());
-      return *this;
-    }
-
-#if __cplusplus >= 201103L
-    vector&
-    operator=(vector&& __x) noexcept(_Bit_alloc_traits::_S_nothrow_move())
-    {
-      if (_Bit_alloc_traits::_S_propagate_on_move_assign()
-	  || this->_M_get_Bit_allocator() == __x._M_get_Bit_allocator())
-	{
-	  this->_M_deallocate();
-	  this->_M_impl._M_start = __x._M_impl._M_start;
-	  this->_M_impl._M_finish = __x._M_impl._M_finish;
-	  this->_M_impl._M_end_of_storage = __x._M_impl._M_end_of_storage;
-	  __x._M_impl._M_start = _Bit_iterator();
-	  __x._M_impl._M_finish = _Bit_iterator();
-	  __x._M_impl._M_end_of_storage = nullptr;
-	  std::__alloc_on_move(_M_get_Bit_allocator(),
-			       __x._M_get_Bit_allocator());
-	}
-      else
-	{
-	  if (__x.size() > capacity())
-	    {
-	      this->_M_deallocate();
-	      _M_initialize(__x.size());
-	    }
-	  this->_M_impl._M_finish = _M_copy_aligned(__x.begin(), __x.end(),
-						    begin());
-	  __x.clear();
-	}
-      return *this;
-    }
-
-    vector&
-    operator=(initializer_list<bool> __l)
-    {
-      this->assign (__l.begin(), __l.end());
-      return *this;
-    }
-#endif
-
-    // assign(), a generalized assignment member function.  Two
-    // versions: one that takes a count, and one that takes a range.
-    // The range version is a member template, so we dispatch on whether
-    // or not the type is an integer.
-    void
-    assign(size_type __n, const bool& __x)
-    { _M_fill_assign(__n, __x); }
-
-#if __cplusplus >= 201103L
-    template<typename _InputIterator,
-	     typename = std::_RequireInputIter<_InputIterator>>
-      void
-      assign(_InputIterator __first, _InputIterator __last)
-      { _M_assign_dispatch(__first, __last, __false_type()); }
-#else
-    template<typename _InputIterator>
-      void
-      assign(_InputIterator __first, _InputIterator __last)
-      {
-	typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	_M_assign_dispatch(__first, __last, _Integral());
-      }
-#endif
-
-#if __cplusplus >= 201103L
-    void
-    assign(initializer_list<bool> __l)
-    { this->assign(__l.begin(), __l.end()); }
-#endif
-
-    iterator
-    begin() _GLIBCXX_NOEXCEPT
-    { return this->_M_impl._M_start; }
-
-    const_iterator
-    begin() const _GLIBCXX_NOEXCEPT
-    { return this->_M_impl._M_start; }
-
-    iterator
-    end() _GLIBCXX_NOEXCEPT
-    { return this->_M_impl._M_finish; }
-
-    const_iterator
-    end() const _GLIBCXX_NOEXCEPT
-    { return this->_M_impl._M_finish; }
-
-    reverse_iterator
-    rbegin() _GLIBCXX_NOEXCEPT
-    { return reverse_iterator(end()); }
-
-    const_reverse_iterator
-    rbegin() const _GLIBCXX_NOEXCEPT
-    { return const_reverse_iterator(end()); }
-
-    reverse_iterator
-    rend() _GLIBCXX_NOEXCEPT
-    { return reverse_iterator(begin()); }
-
-    const_reverse_iterator
-    rend() const _GLIBCXX_NOEXCEPT
-    { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-    const_iterator
-    cbegin() const noexcept
-    { return this->_M_impl._M_start; }
-
-    const_iterator
-    cend() const noexcept
-    { return this->_M_impl._M_finish; }
-
-    const_reverse_iterator
-    crbegin() const noexcept
-    { return const_reverse_iterator(end()); }
-
-    const_reverse_iterator
-    crend() const noexcept
-    { return const_reverse_iterator(begin()); }
-#endif
-
-    size_type
-    size() const _GLIBCXX_NOEXCEPT
-    { return size_type(end() - begin()); }
-
-    size_type
-    max_size() const _GLIBCXX_NOEXCEPT
-    {
-      const size_type __isize =
-	__gnu_cxx::__numeric_traits<difference_type>::__max
-	- int(_S_word_bit) + 1;
-      const size_type __asize
-	= _Bit_alloc_traits::max_size(_M_get_Bit_allocator());
-      return (__asize <= __isize / int(_S_word_bit)
-	      ? __asize * int(_S_word_bit) : __isize);
-    }
-
-    size_type
-    capacity() const _GLIBCXX_NOEXCEPT
-    { return size_type(const_iterator(this->_M_impl._M_end_addr(), 0)
-		       - begin()); }
-
-    bool
-    empty() const _GLIBCXX_NOEXCEPT
-    { return begin() == end(); }
-
-    reference
-    operator[](size_type __n)
-    {
-      return *iterator(this->_M_impl._M_start._M_p
-		       + __n / int(_S_word_bit), __n % int(_S_word_bit));
-    }
-
-    const_reference
-    operator[](size_type __n) const
-    {
-      return *const_iterator(this->_M_impl._M_start._M_p
-			     + __n / int(_S_word_bit), __n % int(_S_word_bit));
-    }
-
-  protected:
-    void
-    _M_range_check(size_type __n) const
-    {
-      if (__n >= this->size())
-	__throw_out_of_range_fmt(__N("vector<bool>::_M_range_check: __n "
-				     "(which is %zu) >= this->size() "
-				     "(which is %zu)"),
-				 __n, this->size());
-    }
-
-  public:
-    reference
-    at(size_type __n)
-    { _M_range_check(__n); return (*this)[__n]; }
-
-    const_reference
-    at(size_type __n) const
-    { _M_range_check(__n); return (*this)[__n]; }
-
-    void
-    reserve(size_type __n)
-    {
-      if (__n > max_size())
-	__throw_length_error(__N("vector::reserve"));
-      if (capacity() < __n)
-	_M_reallocate(__n);
-    }
-
-    reference
-    front()
-    { return *begin(); }
-
-    const_reference
-    front() const
-    { return *begin(); }
-
-    reference
-    back()
-    { return *(end() - 1); }
-
-    const_reference
-    back() const
-    { return *(end() - 1); }
-
-    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-    // DR 464. Suggestion for new member functions in standard containers.
-    // N.B. DR 464 says nothing about vector<bool> but we need something
-    // here due to the way we are implementing DR 464 in the debug-mode
-    // vector class.
-    void
-    data() _GLIBCXX_NOEXCEPT { }
-
-    void
-    push_back(bool __x)
-    {
-      if (this->_M_impl._M_finish._M_p != this->_M_impl._M_end_addr())
-        *this->_M_impl._M_finish++ = __x;
-      else
-        _M_insert_aux(end(), __x);
-    }
-
-    void
-    swap(vector& __x)
-#if __cplusplus >= 201103L
-      noexcept(_Bit_alloc_traits::_S_nothrow_swap())
-#endif
-    {
-      std::swap(this->_M_impl._M_start, __x._M_impl._M_start);
-      std::swap(this->_M_impl._M_finish, __x._M_impl._M_finish);
-      std::swap(this->_M_impl._M_end_of_storage, 
-		__x._M_impl._M_end_of_storage);
-      _Bit_alloc_traits::_S_on_swap(_M_get_Bit_allocator(),
-				    __x._M_get_Bit_allocator());
-    }
-
-    // [23.2.5]/1, third-to-last entry in synopsis listing
-    static void
-    swap(reference __x, reference __y) _GLIBCXX_NOEXCEPT
-    {
-      bool __tmp = __x;
-      __x = __y;
-      __y = __tmp;
-    }
-
-    iterator
-#if __cplusplus >= 201103L
-    insert(const_iterator __position, const bool& __x = bool())
-#else
-    insert(iterator __position, const bool& __x = bool())
-#endif
-    {
-      const difference_type __n = __position - begin();
-      if (this->_M_impl._M_finish._M_p != this->_M_impl._M_end_addr()
-	  && __position == end())
-        *this->_M_impl._M_finish++ = __x;
-      else
-        _M_insert_aux(__position._M_const_cast(), __x);
-      return begin() + __n;
-    }
-
-#if __cplusplus >= 201103L
-    template<typename _InputIterator,
-	     typename = std::_RequireInputIter<_InputIterator>>
-      iterator
-      insert(const_iterator __position,
-	     _InputIterator __first, _InputIterator __last)
-      {
-	difference_type __offset = __position - cbegin();
-	_M_insert_dispatch(__position._M_const_cast(),
-			   __first, __last, __false_type());
-	return begin() + __offset;
-      }
-#else
-    template<typename _InputIterator>
-      void
-      insert(iterator __position,
-	     _InputIterator __first, _InputIterator __last)
-      {
-	typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	_M_insert_dispatch(__position, __first, __last, _Integral());
-      }
-#endif
-
-#if __cplusplus >= 201103L
-    iterator
-    insert(const_iterator __position, size_type __n, const bool& __x)
-    {
-      difference_type __offset = __position - cbegin();
-      _M_fill_insert(__position._M_const_cast(), __n, __x);
-      return begin() + __offset;
-    }
-#else
-    void
-    insert(iterator __position, size_type __n, const bool& __x)
-    { _M_fill_insert(__position, __n, __x); }
-#endif
-
-#if __cplusplus >= 201103L
-    iterator
-    insert(const_iterator __p, initializer_list<bool> __l)
-    { return this->insert(__p, __l.begin(), __l.end()); }
-#endif
-
-    void
-    pop_back()
-    { --this->_M_impl._M_finish; }
-
-    iterator
-#if __cplusplus >= 201103L
-    erase(const_iterator __position)
-#else
-    erase(iterator __position)
-#endif
-    { return _M_erase(__position._M_const_cast()); }
-
-    iterator
-#if __cplusplus >= 201103L
-    erase(const_iterator __first, const_iterator __last)
-#else
-    erase(iterator __first, iterator __last)
-#endif
-    { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
-
-    void
-    resize(size_type __new_size, bool __x = bool())
-    {
-      if (__new_size < size())
-        _M_erase_at_end(begin() + difference_type(__new_size));
-      else
-        insert(end(), __new_size - size(), __x);
-    }
-
-#if __cplusplus >= 201103L
-    void
-    shrink_to_fit()
-    { _M_shrink_to_fit(); }
-#endif
-
-    void
-    flip() _GLIBCXX_NOEXCEPT
-    {
-      _Bit_type * const __end = this->_M_impl._M_end_addr();
-      for (_Bit_type * __p = this->_M_impl._M_start._M_p; __p != __end; ++__p)
-        *__p = ~*__p;
-    }
-
-    void
-    clear() _GLIBCXX_NOEXCEPT
-    { _M_erase_at_end(begin()); }
-
-#if __cplusplus >= 201103L
-    template<typename... _Args>
-      void
-      emplace_back(_Args&&... __args)
-      { push_back(bool(__args...)); }
-
-    template<typename... _Args>
-      iterator
-      emplace(const_iterator __pos, _Args&&... __args)
-      { return insert(__pos, bool(__args...)); }
-#endif
-
-  protected:
-    // Precondition: __first._M_offset == 0 && __result._M_offset == 0.
-    iterator
-    _M_copy_aligned(const_iterator __first, const_iterator __last,
-		    iterator __result)
-    {
-      _Bit_type* __q = std::copy(__first._M_p, __last._M_p, __result._M_p);
-      return std::copy(const_iterator(__last._M_p, 0), __last,
-		       iterator(__q, 0));
-    }
-
-    void
-    _M_initialize(size_type __n)
-    {
-      _Bit_pointer __q = this->_M_allocate(__n);
-      this->_M_impl._M_end_of_storage = __q + _S_nword(__n);
-      this->_M_impl._M_start = iterator(std::__addressof(*__q), 0);
-      this->_M_impl._M_finish = this->_M_impl._M_start + difference_type(__n);
-    }
-
-    void
-    _M_reallocate(size_type __n);
-
-#if __cplusplus >= 201103L
-    bool
-    _M_shrink_to_fit();
-#endif
-
-    // Check whether it's an integral type.  If so, it's not an iterator.
-
-    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-    // 438. Ambiguity in the "do the right thing" clause
-    template<typename _Integer>
-      void
-      _M_initialize_dispatch(_Integer __n, _Integer __x, __true_type)
-      {
-	_M_initialize(static_cast<size_type>(__n));
-	std::fill(this->_M_impl._M_start._M_p, 
-		  this->_M_impl._M_end_addr(), __x ? ~0 : 0);
-      }
-
-    template<typename _InputIterator>
-      void 
-      _M_initialize_dispatch(_InputIterator __first, _InputIterator __last,
-			     __false_type)
-      { _M_initialize_range(__first, __last, 
-			    std::__iterator_category(__first)); }
-
-    template<typename _InputIterator>
-      void
-      _M_initialize_range(_InputIterator __first, _InputIterator __last,
-			  std::input_iterator_tag)
-      {
-	for (; __first != __last; ++__first)
-	  push_back(*__first);
-      }
-
-    template<typename _ForwardIterator>
-      void
-      _M_initialize_range(_ForwardIterator __first, _ForwardIterator __last,
-			  std::forward_iterator_tag)
-      {
-	const size_type __n = std::distance(__first, __last);
-	_M_initialize(__n);
-	std::copy(__first, __last, this->_M_impl._M_start);
-      }
-
-    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-    // 438. Ambiguity in the "do the right thing" clause
-    template<typename _Integer>
-      void
-      _M_assign_dispatch(_Integer __n, _Integer __val, __true_type)
-      { _M_fill_assign(__n, __val); }
-
-    template<class _InputIterator>
-      void
-      _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-			 __false_type)
-      { _M_assign_aux(__first, __last, std::__iterator_category(__first)); }
-
-    void
-    _M_fill_assign(size_t __n, bool __x)
-    {
-      if (__n > size())
-	{
-	  std::fill(this->_M_impl._M_start._M_p, 
-		    this->_M_impl._M_end_addr(), __x ? ~0 : 0);
-	  insert(end(), __n - size(), __x);
-	}
-      else
-	{
-	  _M_erase_at_end(begin() + __n);
-	  std::fill(this->_M_impl._M_start._M_p, 
-		    this->_M_impl._M_end_addr(), __x ? ~0 : 0);
-	}
-    }
-
-    template<typename _InputIterator>
-      void
-      _M_assign_aux(_InputIterator __first, _InputIterator __last,
-		    std::input_iterator_tag)
-      {
-	iterator __cur = begin();
-	for (; __first != __last && __cur != end(); ++__cur, ++__first)
-	  *__cur = *__first;
-	if (__first == __last)
-	  _M_erase_at_end(__cur);
-	else
-	  insert(end(), __first, __last);
-      }
-    
-    template<typename _ForwardIterator>
-      void
-      _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last,
-		    std::forward_iterator_tag)
-      {
-	const size_type __len = std::distance(__first, __last);
-	if (__len < size())
-	  _M_erase_at_end(std::copy(__first, __last, begin()));
-	else
-	  {
-	    _ForwardIterator __mid = __first;
-	    std::advance(__mid, size());
-	    std::copy(__first, __mid, begin());
-	    insert(end(), __mid, __last);
-	  }
-      }
-
-    // Check whether it's an integral type.  If so, it's not an iterator.
-
-    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-    // 438. Ambiguity in the "do the right thing" clause
-    template<typename _Integer>
-      void
-      _M_insert_dispatch(iterator __pos, _Integer __n, _Integer __x,
-			 __true_type)
-      { _M_fill_insert(__pos, __n, __x); }
-
-    template<typename _InputIterator>
-      void
-      _M_insert_dispatch(iterator __pos,
-			 _InputIterator __first, _InputIterator __last,
-			 __false_type)
-      { _M_insert_range(__pos, __first, __last,
-			std::__iterator_category(__first)); }
-
-    void
-    _M_fill_insert(iterator __position, size_type __n, bool __x);
-
-    template<typename _InputIterator>
-      void
-      _M_insert_range(iterator __pos, _InputIterator __first, 
-		      _InputIterator __last, std::input_iterator_tag)
-      {
-	for (; __first != __last; ++__first)
-	  {
-	    __pos = insert(__pos, *__first);
-	    ++__pos;
-	  }
-      }
-
-    template<typename _ForwardIterator>
-      void
-      _M_insert_range(iterator __position, _ForwardIterator __first, 
-		      _ForwardIterator __last, std::forward_iterator_tag);
-
-    void
-    _M_insert_aux(iterator __position, bool __x);
-
-    size_type
-    _M_check_len(size_type __n, const char* __s) const
-    {
-      if (max_size() - size() < __n)
-	__throw_length_error(__N(__s));
-
-      const size_type __len = size() + std::max(size(), __n);
-      return (__len < size() || __len > max_size()) ? max_size() : __len;
-    }
-
-    void
-    _M_erase_at_end(iterator __pos)
-    { this->_M_impl._M_finish = __pos; }
-
-    iterator
-    _M_erase(iterator __pos);
-
-    iterator
-    _M_erase(iterator __first, iterator __last);
-  };
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#if __cplusplus >= 201103L
-
-#include <bits/functional_hash.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // DR 1182.
-  /// std::hash specialization for vector<bool>.
-  template<typename _Alloc>
-    struct hash<_GLIBCXX_STD_C::vector<bool, _Alloc>>
-    : public __hash_base<size_t, _GLIBCXX_STD_C::vector<bool, _Alloc>>
-    {
-      size_t
-      operator()(const _GLIBCXX_STD_C::vector<bool, _Alloc>&) const noexcept;
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}// namespace std
-
-#endif // C++11
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/stl_construct.h b/openflow/usr/include/c++/5/bits/stl_construct.h
deleted file mode 100644
index 5933d2d..0000000
--- a/openflow/usr/include/c++/5/bits/stl_construct.h
+++ /dev/null
@@ -1,158 +0,0 @@
-// nonstandard construct and destroy functions -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_construct.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _STL_CONSTRUCT_H
-#define _STL_CONSTRUCT_H 1
-
-#include <new>
-#include <bits/move.h>
-#include <ext/alloc_traits.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * Constructs an object in existing memory by invoking an allocated
-   * object's constructor with an initializer.
-   */
-#if __cplusplus >= 201103L
-  template<typename _T1, typename... _Args>
-    inline void
-    _Construct(_T1* __p, _Args&&... __args)
-    { ::new(static_cast<void*>(__p)) _T1(std::forward<_Args>(__args)...); }
-#else
-  template<typename _T1, typename _T2>
-    inline void
-    _Construct(_T1* __p, const _T2& __value)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_]allocator::construct
-      ::new(static_cast<void*>(__p)) _T1(__value);
-    }
-#endif
-
-  /**
-   * Destroy the object pointed to by a pointer type.
-   */
-  template<typename _Tp>
-    inline void
-    _Destroy(_Tp* __pointer)
-    { __pointer->~_Tp(); }
-
-  template<bool>
-    struct _Destroy_aux
-    {
-      template<typename _ForwardIterator>
-        static void
-        __destroy(_ForwardIterator __first, _ForwardIterator __last)
-	{
-	  for (; __first != __last; ++__first)
-	    std::_Destroy(std::__addressof(*__first));
-	}
-    };
-
-  template<>
-    struct _Destroy_aux<true>
-    {
-      template<typename _ForwardIterator>
-        static void
-        __destroy(_ForwardIterator, _ForwardIterator) { }
-    };
-
-  /**
-   * Destroy a range of objects.  If the value_type of the object has
-   * a trivial destructor, the compiler should optimize all of this
-   * away, otherwise the objects' destructors must be invoked.
-   */
-  template<typename _ForwardIterator>
-    inline void
-    _Destroy(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-                       _Value_type;
-      std::_Destroy_aux<__has_trivial_destructor(_Value_type)>::
-	__destroy(__first, __last);
-    }
-
-  /**
-   * Destroy a range of objects using the supplied allocator.  For
-   * nondefault allocators we do not optimize away invocation of 
-   * destroy() even if _Tp has a trivial destructor.
-   */
-
-  template<typename _ForwardIterator, typename _Allocator>
-    void
-    _Destroy(_ForwardIterator __first, _ForwardIterator __last,
-	     _Allocator& __alloc)
-    {
-      typedef __gnu_cxx::__alloc_traits<_Allocator> __traits;
-      for (; __first != __last; ++__first)
-	__traits::destroy(__alloc, std::__addressof(*__first));
-    }
-
-  template<typename _ForwardIterator, typename _Tp>
-    inline void
-    _Destroy(_ForwardIterator __first, _ForwardIterator __last,
-	     allocator<_Tp>&)
-    {
-      _Destroy(__first, __last);
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif /* _STL_CONSTRUCT_H */
-
diff --git a/openflow/usr/include/c++/5/bits/stl_deque.h b/openflow/usr/include/c++/5/bits/stl_deque.h
deleted file mode 100644
index fa36023..0000000
--- a/openflow/usr/include/c++/5/bits/stl_deque.h
+++ /dev/null
@@ -1,2282 +0,0 @@
-// Deque implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_deque.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{deque}
- */
-
-#ifndef _STL_DEQUE_H
-#define _STL_DEQUE_H 1
-
-#include <bits/concept_check.h>
-#include <bits/stl_iterator_base_types.h>
-#include <bits/stl_iterator_base_funcs.h>
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /**
-   *  @brief This function controls the size of memory nodes.
-   *  @param  __size  The size of an element.
-   *  @return   The number (not byte size) of elements per node.
-   *
-   *  This function started off as a compiler kludge from SGI, but
-   *  seems to be a useful wrapper around a repeated constant
-   *  expression.  The @b 512 is tunable (and no other code needs to
-   *  change), but no investigation has been done since inheriting the
-   *  SGI code.  Touch _GLIBCXX_DEQUE_BUF_SIZE only if you know what
-   *  you are doing, however: changing it breaks the binary
-   *  compatibility!!
-  */
-
-#ifndef _GLIBCXX_DEQUE_BUF_SIZE
-#define _GLIBCXX_DEQUE_BUF_SIZE 512
-#endif
-
-  _GLIBCXX_CONSTEXPR inline size_t
-  __deque_buf_size(size_t __size)
-  { return (__size < _GLIBCXX_DEQUE_BUF_SIZE
-	    ? size_t(_GLIBCXX_DEQUE_BUF_SIZE / __size) : size_t(1)); }
-
-
-  /**
-   *  @brief A deque::iterator.
-   *
-   *  Quite a bit of intelligence here.  Much of the functionality of
-   *  deque is actually passed off to this class.  A deque holds two
-   *  of these internally, marking its valid range.  Access to
-   *  elements is done as offsets of either of those two, relying on
-   *  operator overloading in this class.
-   *
-   *  All the functions are op overloads except for _M_set_node.
-  */
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    struct _Deque_iterator
-    {
-#if __cplusplus < 201103L
-      typedef _Deque_iterator<_Tp, _Tp&, _Tp*>             iterator;
-      typedef _Deque_iterator<_Tp, const _Tp&, const _Tp*> const_iterator;
-      typedef _Tp*                                         _Elt_pointer;
-      typedef _Tp**                                        _Map_pointer;
-#else
-    private:
-      template<typename _Up>
-	using __ptr_to = typename pointer_traits<_Ptr>::template rebind<_Up>;
-      template<typename _CvTp>
-	using __iter = _Deque_iterator<_Tp, _CvTp&, __ptr_to<_CvTp>>;
-    public:
-      typedef __iter<_Tp>		iterator;
-      typedef __iter<const _Tp>		const_iterator;
-      typedef __ptr_to<_Tp>		_Elt_pointer;
-      typedef __ptr_to<_Elt_pointer>	_Map_pointer;
-#endif
-
-      static size_t _S_buffer_size() _GLIBCXX_NOEXCEPT
-      { return __deque_buf_size(sizeof(_Tp)); }
-
-      typedef std::random_access_iterator_tag iterator_category;
-      typedef _Tp                             value_type;
-      typedef _Ptr                            pointer;
-      typedef _Ref                            reference;
-      typedef size_t                          size_type;
-      typedef ptrdiff_t                       difference_type;
-      typedef _Deque_iterator                 _Self;
-
-      _Elt_pointer _M_cur;
-      _Elt_pointer _M_first;
-      _Elt_pointer _M_last;
-      _Map_pointer _M_node;
-
-      _Deque_iterator(_Elt_pointer __x, _Map_pointer __y) _GLIBCXX_NOEXCEPT
-      : _M_cur(__x), _M_first(*__y),
-        _M_last(*__y + _S_buffer_size()), _M_node(__y) { }
-
-      _Deque_iterator() _GLIBCXX_NOEXCEPT
-      : _M_cur(), _M_first(), _M_last(), _M_node() { }
-
-      _Deque_iterator(const iterator& __x) _GLIBCXX_NOEXCEPT
-      : _M_cur(__x._M_cur), _M_first(__x._M_first),
-        _M_last(__x._M_last), _M_node(__x._M_node) { }
-
-      iterator
-      _M_const_cast() const _GLIBCXX_NOEXCEPT
-      { return iterator(_M_cur, _M_node); }
-
-      reference
-      operator*() const _GLIBCXX_NOEXCEPT
-      { return *_M_cur; }
-
-      pointer
-      operator->() const _GLIBCXX_NOEXCEPT
-      { return _M_cur; }
-
-      _Self&
-      operator++() _GLIBCXX_NOEXCEPT
-      {
-	++_M_cur;
-	if (_M_cur == _M_last)
-	  {
-	    _M_set_node(_M_node + 1);
-	    _M_cur = _M_first;
-	  }
-	return *this;
-      }
-
-      _Self
-      operator++(int) _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	++*this;
-	return __tmp;
-      }
-
-      _Self&
-      operator--() _GLIBCXX_NOEXCEPT
-      {
-	if (_M_cur == _M_first)
-	  {
-	    _M_set_node(_M_node - 1);
-	    _M_cur = _M_last;
-	  }
-	--_M_cur;
-	return *this;
-      }
-
-      _Self
-      operator--(int) _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	--*this;
-	return __tmp;
-      }
-
-      _Self&
-      operator+=(difference_type __n) _GLIBCXX_NOEXCEPT
-      {
-	const difference_type __offset = __n + (_M_cur - _M_first);
-	if (__offset >= 0 && __offset < difference_type(_S_buffer_size()))
-	  _M_cur += __n;
-	else
-	  {
-	    const difference_type __node_offset =
-	      __offset > 0 ? __offset / difference_type(_S_buffer_size())
-	                   : -difference_type((-__offset - 1)
-					      / _S_buffer_size()) - 1;
-	    _M_set_node(_M_node + __node_offset);
-	    _M_cur = _M_first + (__offset - __node_offset
-				 * difference_type(_S_buffer_size()));
-	  }
-	return *this;
-      }
-
-      _Self
-      operator+(difference_type __n) const _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	return __tmp += __n;
-      }
-
-      _Self&
-      operator-=(difference_type __n) _GLIBCXX_NOEXCEPT
-      { return *this += -__n; }
-
-      _Self
-      operator-(difference_type __n) const _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	return __tmp -= __n;
-      }
-
-      reference
-      operator[](difference_type __n) const _GLIBCXX_NOEXCEPT
-      { return *(*this + __n); }
-
-      /** 
-       *  Prepares to traverse new_node.  Sets everything except
-       *  _M_cur, which should therefore be set by the caller
-       *  immediately afterwards, based on _M_first and _M_last.
-       */
-      void
-      _M_set_node(_Map_pointer __new_node) _GLIBCXX_NOEXCEPT
-      {
-	_M_node = __new_node;
-	_M_first = *__new_node;
-	_M_last = _M_first + difference_type(_S_buffer_size());
-      }
-    };
-
-  // Note: we also provide overloads whose operands are of the same type in
-  // order to avoid ambiguous overload resolution when std::rel_ops operators
-  // are in scope (for additional details, see libstdc++/3628)
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator==(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	       const _Deque_iterator<_Tp, _Ref, _Ptr>& __y) _GLIBCXX_NOEXCEPT
-    { return __x._M_cur == __y._M_cur; }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator==(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	       const _Deque_iterator<_Tp, _RefR, _PtrR>& __y) _GLIBCXX_NOEXCEPT
-    { return __x._M_cur == __y._M_cur; }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator!=(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	       const _Deque_iterator<_Tp, _Ref, _Ptr>& __y) _GLIBCXX_NOEXCEPT
-    { return !(__x == __y); }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator!=(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	       const _Deque_iterator<_Tp, _RefR, _PtrR>& __y) _GLIBCXX_NOEXCEPT
-    { return !(__x == __y); }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator<(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	      const _Deque_iterator<_Tp, _Ref, _Ptr>& __y) _GLIBCXX_NOEXCEPT
-    { return (__x._M_node == __y._M_node) ? (__x._M_cur < __y._M_cur)
-                                          : (__x._M_node < __y._M_node); }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator<(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	      const _Deque_iterator<_Tp, _RefR, _PtrR>& __y) _GLIBCXX_NOEXCEPT
-    { return (__x._M_node == __y._M_node) ? (__x._M_cur < __y._M_cur)
-	                                  : (__x._M_node < __y._M_node); }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator>(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	      const _Deque_iterator<_Tp, _Ref, _Ptr>& __y) _GLIBCXX_NOEXCEPT
-    { return __y < __x; }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator>(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	      const _Deque_iterator<_Tp, _RefR, _PtrR>& __y) _GLIBCXX_NOEXCEPT
-    { return __y < __x; }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator<=(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	       const _Deque_iterator<_Tp, _Ref, _Ptr>& __y) _GLIBCXX_NOEXCEPT
-    { return !(__y < __x); }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator<=(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	       const _Deque_iterator<_Tp, _RefR, _PtrR>& __y) _GLIBCXX_NOEXCEPT
-    { return !(__y < __x); }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator>=(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	       const _Deque_iterator<_Tp, _Ref, _Ptr>& __y) _GLIBCXX_NOEXCEPT
-    { return !(__x < __y); }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator>=(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	       const _Deque_iterator<_Tp, _RefR, _PtrR>& __y) _GLIBCXX_NOEXCEPT
-    { return !(__x < __y); }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // According to the resolution of DR179 not only the various comparison
-  // operators but also operator- must accept mixed iterator/const_iterator
-  // parameters.
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline typename _Deque_iterator<_Tp, _Ref, _Ptr>::difference_type
-    operator-(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	      const _Deque_iterator<_Tp, _Ref, _Ptr>& __y) _GLIBCXX_NOEXCEPT
-    {
-      return typename _Deque_iterator<_Tp, _Ref, _Ptr>::difference_type
-	(_Deque_iterator<_Tp, _Ref, _Ptr>::_S_buffer_size())
-	* (__x._M_node - __y._M_node - 1) + (__x._M_cur - __x._M_first)
-	+ (__y._M_last - __y._M_cur);
-    }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline typename _Deque_iterator<_Tp, _RefL, _PtrL>::difference_type
-    operator-(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	      const _Deque_iterator<_Tp, _RefR, _PtrR>& __y) _GLIBCXX_NOEXCEPT
-    {
-      return typename _Deque_iterator<_Tp, _RefL, _PtrL>::difference_type
-	(_Deque_iterator<_Tp, _RefL, _PtrL>::_S_buffer_size())
-	* (__x._M_node - __y._M_node - 1) + (__x._M_cur - __x._M_first)
-	+ (__y._M_last - __y._M_cur);
-    }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline _Deque_iterator<_Tp, _Ref, _Ptr>
-    operator+(ptrdiff_t __n, const _Deque_iterator<_Tp, _Ref, _Ptr>& __x)
-    _GLIBCXX_NOEXCEPT
-    { return __x + __n; }
-
-  template<typename _Tp>
-    void
-    fill(const _Deque_iterator<_Tp, _Tp&, _Tp*>&,
-	 const _Deque_iterator<_Tp, _Tp&, _Tp*>&, const _Tp&);
-
-  template<typename _Tp>
-    _Deque_iterator<_Tp, _Tp&, _Tp*>
-    copy(_Deque_iterator<_Tp, const _Tp&, const _Tp*>,
-	 _Deque_iterator<_Tp, const _Tp&, const _Tp*>,
-	 _Deque_iterator<_Tp, _Tp&, _Tp*>);
-
-  template<typename _Tp>
-    inline _Deque_iterator<_Tp, _Tp&, _Tp*>
-    copy(_Deque_iterator<_Tp, _Tp&, _Tp*> __first,
-	 _Deque_iterator<_Tp, _Tp&, _Tp*> __last,
-	 _Deque_iterator<_Tp, _Tp&, _Tp*> __result)
-    { return std::copy(_Deque_iterator<_Tp, const _Tp&, const _Tp*>(__first),
-		       _Deque_iterator<_Tp, const _Tp&, const _Tp*>(__last),
-		       __result); }
-
-  template<typename _Tp>
-    _Deque_iterator<_Tp, _Tp&, _Tp*>
-    copy_backward(_Deque_iterator<_Tp, const _Tp&, const _Tp*>,
-		  _Deque_iterator<_Tp, const _Tp&, const _Tp*>,
-		  _Deque_iterator<_Tp, _Tp&, _Tp*>);
-
-  template<typename _Tp>
-    inline _Deque_iterator<_Tp, _Tp&, _Tp*>
-    copy_backward(_Deque_iterator<_Tp, _Tp&, _Tp*> __first,
-		  _Deque_iterator<_Tp, _Tp&, _Tp*> __last,
-		  _Deque_iterator<_Tp, _Tp&, _Tp*> __result)
-    { return std::copy_backward(_Deque_iterator<_Tp,
-				const _Tp&, const _Tp*>(__first),
-				_Deque_iterator<_Tp,
-				const _Tp&, const _Tp*>(__last),
-				__result); }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp>
-    _Deque_iterator<_Tp, _Tp&, _Tp*>
-    move(_Deque_iterator<_Tp, const _Tp&, const _Tp*>,
-	 _Deque_iterator<_Tp, const _Tp&, const _Tp*>,
-	 _Deque_iterator<_Tp, _Tp&, _Tp*>);
-
-  template<typename _Tp>
-    inline _Deque_iterator<_Tp, _Tp&, _Tp*>
-    move(_Deque_iterator<_Tp, _Tp&, _Tp*> __first,
-	 _Deque_iterator<_Tp, _Tp&, _Tp*> __last,
-	 _Deque_iterator<_Tp, _Tp&, _Tp*> __result)
-    { return std::move(_Deque_iterator<_Tp, const _Tp&, const _Tp*>(__first),
-		       _Deque_iterator<_Tp, const _Tp&, const _Tp*>(__last),
-		       __result); }
-
-  template<typename _Tp>
-    _Deque_iterator<_Tp, _Tp&, _Tp*>
-    move_backward(_Deque_iterator<_Tp, const _Tp&, const _Tp*>,
-		  _Deque_iterator<_Tp, const _Tp&, const _Tp*>,
-		  _Deque_iterator<_Tp, _Tp&, _Tp*>);
-
-  template<typename _Tp>
-    inline _Deque_iterator<_Tp, _Tp&, _Tp*>
-    move_backward(_Deque_iterator<_Tp, _Tp&, _Tp*> __first,
-		  _Deque_iterator<_Tp, _Tp&, _Tp*> __last,
-		  _Deque_iterator<_Tp, _Tp&, _Tp*> __result)
-    { return std::move_backward(_Deque_iterator<_Tp,
-				const _Tp&, const _Tp*>(__first),
-				_Deque_iterator<_Tp,
-				const _Tp&, const _Tp*>(__last),
-				__result); }
-#endif
-
-  /**
-   *  Deque base class.  This class provides the unified face for %deque's
-   *  allocation.  This class's constructor and destructor allocate and
-   *  deallocate (but do not initialize) storage.  This makes %exception
-   *  safety easier.
-   *
-   *  Nothing in this class ever constructs or destroys an actual Tp element.
-   *  (Deque handles that itself.)  Only/All memory management is performed
-   *  here.
-  */
-  template<typename _Tp, typename _Alloc>
-    class _Deque_base
-    {
-    protected:
-      typedef typename __gnu_cxx::__alloc_traits<_Alloc>::template
-	rebind<_Tp>::other _Tp_alloc_type;
-      typedef __gnu_cxx::__alloc_traits<_Tp_alloc_type>	 _Alloc_traits;
-
-#if __cplusplus < 201103L
-      typedef _Tp*					_Ptr;
-      typedef const _Tp*				_Ptr_const;
-#else
-      typedef typename _Alloc_traits::pointer		_Ptr;
-      typedef typename _Alloc_traits::const_pointer	_Ptr_const;
-#endif
-
-      typedef typename _Alloc_traits::template rebind<_Ptr>::other
-	_Map_alloc_type;
-      typedef __gnu_cxx::__alloc_traits<_Map_alloc_type> _Map_alloc_traits;
-
-    public:
-      typedef _Alloc                  allocator_type;
-      typedef typename _Alloc_traits::size_type size_type;
-
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return allocator_type(_M_get_Tp_allocator()); }
-
-      typedef _Deque_iterator<_Tp, _Tp&, _Ptr>          iterator;
-      typedef _Deque_iterator<_Tp, const _Tp&, _Ptr_const>   const_iterator;
-
-      _Deque_base()
-      : _M_impl()
-      { _M_initialize_map(0); }
-
-      _Deque_base(size_t __num_elements)
-      : _M_impl()
-      { _M_initialize_map(__num_elements); }
-
-      _Deque_base(const allocator_type& __a, size_t __num_elements)
-      : _M_impl(__a)
-      { _M_initialize_map(__num_elements); }
-
-      _Deque_base(const allocator_type& __a)
-      : _M_impl(__a)
-      { /* Caller must initialize map. */ }
-
-#if __cplusplus >= 201103L
-      _Deque_base(_Deque_base&& __x, false_type)
-      : _M_impl(__x._M_move_impl())
-      { }
-
-      _Deque_base(_Deque_base&& __x, true_type)
-      : _M_impl(std::move(__x._M_get_Tp_allocator()))
-      {
-	_M_initialize_map(0);
-	if (__x._M_impl._M_map)
-	  this->_M_impl._M_swap_data(__x._M_impl);
-      }
-
-      _Deque_base(_Deque_base&& __x)
-      : _Deque_base(std::move(__x),
-		    __gnu_cxx::__allocator_always_compares_equal<_Alloc>{})
-      { }
-
-      _Deque_base(_Deque_base&& __x, const allocator_type& __a, size_type __n)
-      : _M_impl(__a)
-      {
-	if (__x.get_allocator() == __a)
-	  {
-	    if (__x._M_impl._M_map)
-	      {
-		_M_initialize_map(0);
-		this->_M_impl._M_swap_data(__x._M_impl);
-	      }
-	  }
-	else
-	  {
-	    _M_initialize_map(__n);
-	  }
-      }
-#endif
-
-      ~_Deque_base() _GLIBCXX_NOEXCEPT;
-
-    protected:
-      typedef typename iterator::_Map_pointer _Map_pointer;
-
-      //This struct encapsulates the implementation of the std::deque
-      //standard container and at the same time makes use of the EBO
-      //for empty allocators.
-      struct _Deque_impl
-      : public _Tp_alloc_type
-      {
-	_Map_pointer _M_map;
-	size_t _M_map_size;
-	iterator _M_start;
-	iterator _M_finish;
-
-	_Deque_impl()
-	: _Tp_alloc_type(), _M_map(), _M_map_size(0),
-	  _M_start(), _M_finish()
-	{ }
-
-	_Deque_impl(const _Tp_alloc_type& __a) _GLIBCXX_NOEXCEPT
-	: _Tp_alloc_type(__a), _M_map(), _M_map_size(0),
-	  _M_start(), _M_finish()
-	{ }
-
-#if __cplusplus >= 201103L
-	_Deque_impl(_Deque_impl&&) = default;
-
-	_Deque_impl(_Tp_alloc_type&& __a) noexcept
-	: _Tp_alloc_type(std::move(__a)), _M_map(), _M_map_size(0),
-	  _M_start(), _M_finish()
-	{ }
-#endif
-
-	void _M_swap_data(_Deque_impl& __x) _GLIBCXX_NOEXCEPT
-	{
-	  using std::swap;
-	  swap(this->_M_start, __x._M_start);
-	  swap(this->_M_finish, __x._M_finish);
-	  swap(this->_M_map, __x._M_map);
-	  swap(this->_M_map_size, __x._M_map_size);
-	}
-      };
-
-      _Tp_alloc_type&
-      _M_get_Tp_allocator() _GLIBCXX_NOEXCEPT
-      { return *static_cast<_Tp_alloc_type*>(&this->_M_impl); }
-
-      const _Tp_alloc_type&
-      _M_get_Tp_allocator() const _GLIBCXX_NOEXCEPT
-      { return *static_cast<const _Tp_alloc_type*>(&this->_M_impl); }
-
-      _Map_alloc_type
-      _M_get_map_allocator() const _GLIBCXX_NOEXCEPT
-      { return _Map_alloc_type(_M_get_Tp_allocator()); }
-
-      _Ptr
-      _M_allocate_node()
-      { 
-	typedef __gnu_cxx::__alloc_traits<_Tp_alloc_type> _Traits;
-	return _Traits::allocate(_M_impl, __deque_buf_size(sizeof(_Tp)));
-      }
-
-      void
-      _M_deallocate_node(_Ptr __p) _GLIBCXX_NOEXCEPT
-      {
-	typedef __gnu_cxx::__alloc_traits<_Tp_alloc_type> _Traits;
-	_Traits::deallocate(_M_impl, __p, __deque_buf_size(sizeof(_Tp)));
-      }
-
-      _Map_pointer
-      _M_allocate_map(size_t __n)
-      {
-	_Map_alloc_type __map_alloc = _M_get_map_allocator();
-	return _Map_alloc_traits::allocate(__map_alloc, __n);
-      }
-
-      void
-      _M_deallocate_map(_Map_pointer __p, size_t __n) _GLIBCXX_NOEXCEPT
-      {
-	_Map_alloc_type __map_alloc = _M_get_map_allocator();
-	_Map_alloc_traits::deallocate(__map_alloc, __p, __n);
-      }
-
-    protected:
-      void _M_initialize_map(size_t);
-      void _M_create_nodes(_Map_pointer __nstart, _Map_pointer __nfinish);
-      void _M_destroy_nodes(_Map_pointer __nstart,
-			    _Map_pointer __nfinish) _GLIBCXX_NOEXCEPT;
-      enum { _S_initial_map_size = 8 };
-
-      _Deque_impl _M_impl;
-
-#if __cplusplus >= 201103L
-    private:
-      _Deque_impl
-      _M_move_impl()
-      {
-	if (!_M_impl._M_map)
-	  return std::move(_M_impl);
-
-	// Create a copy of the current allocator.
-	_Tp_alloc_type __alloc{_M_get_Tp_allocator()};
-	// Put that copy in a moved-from state.
-	_Tp_alloc_type __sink __attribute((__unused__)) {std::move(__alloc)};
-	// Create an empty map that allocates using the moved-from allocator.
-	_Deque_base __empty{__alloc};
-	__empty._M_initialize_map(0);
-	// Now safe to modify current allocator and perform non-throwing swaps.
-	_Deque_impl __ret{std::move(_M_get_Tp_allocator())};
-	_M_impl._M_swap_data(__ret);
-	_M_impl._M_swap_data(__empty._M_impl);
-	return __ret;
-      }
-#endif
-    };
-
-  template<typename _Tp, typename _Alloc>
-    _Deque_base<_Tp, _Alloc>::
-    ~_Deque_base() _GLIBCXX_NOEXCEPT
-    {
-      if (this->_M_impl._M_map)
-	{
-	  _M_destroy_nodes(this->_M_impl._M_start._M_node,
-			   this->_M_impl._M_finish._M_node + 1);
-	  _M_deallocate_map(this->_M_impl._M_map, this->_M_impl._M_map_size);
-	}
-    }
-
-  /**
-   *  @brief Layout storage.
-   *  @param  __num_elements  The count of T's for which to allocate space
-   *                          at first.
-   *  @return   Nothing.
-   *
-   *  The initial underlying memory layout is a bit complicated...
-  */
-  template<typename _Tp, typename _Alloc>
-    void
-    _Deque_base<_Tp, _Alloc>::
-    _M_initialize_map(size_t __num_elements)
-    {
-      const size_t __num_nodes = (__num_elements/ __deque_buf_size(sizeof(_Tp))
-				  + 1);
-
-      this->_M_impl._M_map_size = std::max((size_t) _S_initial_map_size,
-					   size_t(__num_nodes + 2));
-      this->_M_impl._M_map = _M_allocate_map(this->_M_impl._M_map_size);
-
-      // For "small" maps (needing less than _M_map_size nodes), allocation
-      // starts in the middle elements and grows outwards.  So nstart may be
-      // the beginning of _M_map, but for small maps it may be as far in as
-      // _M_map+3.
-
-      _Map_pointer __nstart = (this->_M_impl._M_map
-			       + (this->_M_impl._M_map_size - __num_nodes) / 2);
-      _Map_pointer __nfinish = __nstart + __num_nodes;
-
-      __try
-	{ _M_create_nodes(__nstart, __nfinish); }
-      __catch(...)
-	{
-	  _M_deallocate_map(this->_M_impl._M_map, this->_M_impl._M_map_size);
-	  this->_M_impl._M_map = _Map_pointer();
-	  this->_M_impl._M_map_size = 0;
-	  __throw_exception_again;
-	}
-
-      this->_M_impl._M_start._M_set_node(__nstart);
-      this->_M_impl._M_finish._M_set_node(__nfinish - 1);
-      this->_M_impl._M_start._M_cur = _M_impl._M_start._M_first;
-      this->_M_impl._M_finish._M_cur = (this->_M_impl._M_finish._M_first
-					+ __num_elements
-					% __deque_buf_size(sizeof(_Tp)));
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    _Deque_base<_Tp, _Alloc>::
-    _M_create_nodes(_Map_pointer __nstart, _Map_pointer __nfinish)
-    {
-      _Map_pointer __cur;
-      __try
-	{
-	  for (__cur = __nstart; __cur < __nfinish; ++__cur)
-	    *__cur = this->_M_allocate_node();
-	}
-      __catch(...)
-	{
-	  _M_destroy_nodes(__nstart, __cur);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    _Deque_base<_Tp, _Alloc>::
-    _M_destroy_nodes(_Map_pointer __nstart,
-		     _Map_pointer __nfinish) _GLIBCXX_NOEXCEPT
-    {
-      for (_Map_pointer __n = __nstart; __n < __nfinish; ++__n)
-	_M_deallocate_node(*__n);
-    }
-
-  /**
-   *  @brief  A standard container using fixed-size memory allocation and
-   *  constant-time manipulation of elements at either end.
-   *
-   *  @ingroup sequences
-   *
-   *  @tparam _Tp  Type of element.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_Tp>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>, including the
-   *  <a href="tables.html#68">optional sequence requirements</a>.
-   *
-   *  In previous HP/SGI versions of deque, there was an extra template
-   *  parameter so users could control the node size.  This extension turned
-   *  out to violate the C++ standard (it can be detected using template
-   *  template parameters), and it was removed.
-   *
-   *  Here's how a deque<Tp> manages memory.  Each deque has 4 members:
-   *
-   *  - Tp**        _M_map
-   *  - size_t      _M_map_size
-   *  - iterator    _M_start, _M_finish
-   *
-   *  map_size is at least 8.  %map is an array of map_size
-   *  pointers-to-@a nodes.  (The name %map has nothing to do with the
-   *  std::map class, and @b nodes should not be confused with
-   *  std::list's usage of @a node.)
-   *
-   *  A @a node has no specific type name as such, but it is referred
-   *  to as @a node in this file.  It is a simple array-of-Tp.  If Tp
-   *  is very large, there will be one Tp element per node (i.e., an
-   *  @a array of one).  For non-huge Tp's, node size is inversely
-   *  related to Tp size: the larger the Tp, the fewer Tp's will fit
-   *  in a node.  The goal here is to keep the total size of a node
-   *  relatively small and constant over different Tp's, to improve
-   *  allocator efficiency.
-   *
-   *  Not every pointer in the %map array will point to a node.  If
-   *  the initial number of elements in the deque is small, the
-   *  /middle/ %map pointers will be valid, and the ones at the edges
-   *  will be unused.  This same situation will arise as the %map
-   *  grows: available %map pointers, if any, will be on the ends.  As
-   *  new nodes are created, only a subset of the %map's pointers need
-   *  to be copied @a outward.
-   *
-   *  Class invariants:
-   * - For any nonsingular iterator i:
-   *    - i.node points to a member of the %map array.  (Yes, you read that
-   *      correctly:  i.node does not actually point to a node.)  The member of
-   *      the %map array is what actually points to the node.
-   *    - i.first == *(i.node)    (This points to the node (first Tp element).)
-   *    - i.last  == i.first + node_size
-   *    - i.cur is a pointer in the range [i.first, i.last).  NOTE:
-   *      the implication of this is that i.cur is always a dereferenceable
-   *      pointer, even if i is a past-the-end iterator.
-   * - Start and Finish are always nonsingular iterators.  NOTE: this
-   * means that an empty deque must have one node, a deque with <N
-   * elements (where N is the node buffer size) must have one node, a
-   * deque with N through (2N-1) elements must have two nodes, etc.
-   * - For every node other than start.node and finish.node, every
-   * element in the node is an initialized object.  If start.node ==
-   * finish.node, then [start.cur, finish.cur) are initialized
-   * objects, and the elements outside that range are uninitialized
-   * storage.  Otherwise, [start.cur, start.last) and [finish.first,
-   * finish.cur) are initialized objects, and [start.first, start.cur)
-   * and [finish.cur, finish.last) are uninitialized storage.
-   * - [%map, %map + map_size) is a valid, non-empty range.
-   * - [start.node, finish.node] is a valid range contained within
-   *   [%map, %map + map_size).
-   * - A pointer in the range [%map, %map + map_size) points to an allocated
-   *   node if and only if the pointer is in the range
-   *   [start.node, finish.node].
-   *
-   *  Here's the magic:  nothing in deque is @b aware of the discontiguous
-   *  storage!
-   *
-   *  The memory setup and layout occurs in the parent, _Base, and the iterator
-   *  class is entirely responsible for @a leaping from one node to the next.
-   *  All the implementation routines for deque itself work only through the
-   *  start and finish iterators.  This keeps the routines simple and sane,
-   *  and we can use other standard algorithms as well.
-  */
-  template<typename _Tp, typename _Alloc = std::allocator<_Tp> >
-    class deque : protected _Deque_base<_Tp, _Alloc>
-    {
-      // concept requirements
-      typedef typename _Alloc::value_type        _Alloc_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires2(_Tp, _Alloc_value_type, _SameTypeConcept)
-
-      typedef _Deque_base<_Tp, _Alloc>			_Base;
-      typedef typename _Base::_Tp_alloc_type		_Tp_alloc_type;
-      typedef typename _Base::_Alloc_traits		_Alloc_traits;
-      typedef typename _Base::_Map_pointer		_Map_pointer;
-
-    public:
-      typedef _Tp                                        value_type;
-      typedef typename _Alloc_traits::pointer            pointer;
-      typedef typename _Alloc_traits::const_pointer      const_pointer;
-      typedef typename _Alloc_traits::reference          reference;
-      typedef typename _Alloc_traits::const_reference    const_reference;
-      typedef typename _Base::iterator                   iterator;
-      typedef typename _Base::const_iterator             const_iterator;
-      typedef std::reverse_iterator<const_iterator>      const_reverse_iterator;
-      typedef std::reverse_iterator<iterator>            reverse_iterator;
-      typedef size_t                             size_type;
-      typedef ptrdiff_t                          difference_type;
-      typedef _Alloc                             allocator_type;
-
-    protected:
-      static size_t _S_buffer_size() _GLIBCXX_NOEXCEPT
-      { return __deque_buf_size(sizeof(_Tp)); }
-
-      // Functions controlling memory layout, and nothing else.
-      using _Base::_M_initialize_map;
-      using _Base::_M_create_nodes;
-      using _Base::_M_destroy_nodes;
-      using _Base::_M_allocate_node;
-      using _Base::_M_deallocate_node;
-      using _Base::_M_allocate_map;
-      using _Base::_M_deallocate_map;
-      using _Base::_M_get_Tp_allocator;
-
-      /** 
-       *  A total of four data members accumulated down the hierarchy.
-       *  May be accessed via _M_impl.*
-       */
-      using _Base::_M_impl;
-
-    public:
-      // [23.2.1.1] construct/copy/destroy
-      // (assign() and get_allocator() are also listed in this section)
-
-      /**
-       *  @brief  Creates a %deque with no elements.
-       */
-      deque() : _Base() { }
-
-      /**
-       *  @brief  Creates a %deque with no elements.
-       *  @param  __a  An allocator object.
-       */
-      explicit
-      deque(const allocator_type& __a)
-      : _Base(__a, 0) { }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Creates a %deque with default constructed elements.
-       *  @param  __n  The number of elements to initially create.
-       *
-       *  This constructor fills the %deque with @a n default
-       *  constructed elements.
-       */
-      explicit
-      deque(size_type __n, const allocator_type& __a = allocator_type())
-      : _Base(__a, __n)
-      { _M_default_initialize(); }
-
-      /**
-       *  @brief  Creates a %deque with copies of an exemplar element.
-       *  @param  __n  The number of elements to initially create.
-       *  @param  __value  An element to copy.
-       *  @param  __a  An allocator.
-       *
-       *  This constructor fills the %deque with @a __n copies of @a __value.
-       */
-      deque(size_type __n, const value_type& __value,
-	    const allocator_type& __a = allocator_type())
-      : _Base(__a, __n)
-      { _M_fill_initialize(__value); }
-#else
-      /**
-       *  @brief  Creates a %deque with copies of an exemplar element.
-       *  @param  __n  The number of elements to initially create.
-       *  @param  __value  An element to copy.
-       *  @param  __a  An allocator.
-       *
-       *  This constructor fills the %deque with @a __n copies of @a __value.
-       */
-      explicit
-      deque(size_type __n, const value_type& __value = value_type(),
-	    const allocator_type& __a = allocator_type())
-      : _Base(__a, __n)
-      { _M_fill_initialize(__value); }
-#endif
-
-      /**
-       *  @brief  %Deque copy constructor.
-       *  @param  __x  A %deque of identical element and allocator types.
-       *
-       *  The newly-created %deque uses a copy of the allocation object used
-       *  by @a __x.
-       */
-      deque(const deque& __x)
-      : _Base(_Alloc_traits::_S_select_on_copy(__x._M_get_Tp_allocator()),
-	      __x.size())
-      { std::__uninitialized_copy_a(__x.begin(), __x.end(), 
-				    this->_M_impl._M_start,
-				    _M_get_Tp_allocator()); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  %Deque move constructor.
-       *  @param  __x  A %deque of identical element and allocator types.
-       *
-       *  The newly-created %deque contains the exact contents of @a __x.
-       *  The contents of @a __x are a valid, but unspecified %deque.
-       */
-      deque(deque&& __x)
-      : _Base(std::move(__x)) { }
-
-      /// Copy constructor with alternative allocator
-      deque(const deque& __x, const allocator_type& __a)
-      : _Base(__a, __x.size())
-      { std::__uninitialized_copy_a(__x.begin(), __x.end(),
-				    this->_M_impl._M_start,
-				    _M_get_Tp_allocator()); }
-
-      /// Move constructor with alternative allocator
-      deque(deque&& __x, const allocator_type& __a)
-      : _Base(std::move(__x), __a, __x.size())
-      {
-	if (__x.get_allocator() != __a)
-	  {
-	    std::__uninitialized_move_a(__x.begin(), __x.end(),
-					this->_M_impl._M_start,
-					_M_get_Tp_allocator());
-	    __x.clear();
-	  }
-      }
-
-      /**
-       *  @brief  Builds a %deque from an initializer list.
-       *  @param  __l  An initializer_list.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %deque consisting of copies of the elements in the
-       *  initializer_list @a __l.
-       *
-       *  This will call the element type's copy constructor N times
-       *  (where N is __l.size()) and do no memory reallocation.
-       */
-      deque(initializer_list<value_type> __l,
-	    const allocator_type& __a = allocator_type())
-      : _Base(__a)
-      {
-	_M_range_initialize(__l.begin(), __l.end(),
-			    random_access_iterator_tag());
-      }
-#endif
-
-      /**
-       *  @brief  Builds a %deque from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %deque consisting of copies of the elements from [__first,
-       *  __last).
-       *
-       *  If the iterators are forward, bidirectional, or random-access, then
-       *  this will call the elements' copy constructor N times (where N is
-       *  distance(__first,__last)) and do no memory reallocation.  But if only
-       *  input iterators are used, then this will do at most 2N calls to the
-       *  copy constructor, and logN memory reallocations.
-       */
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        deque(_InputIterator __first, _InputIterator __last,
-	      const allocator_type& __a = allocator_type())
-	: _Base(__a)
-        { _M_initialize_dispatch(__first, __last, __false_type()); }
-#else
-      template<typename _InputIterator>
-        deque(_InputIterator __first, _InputIterator __last,
-	      const allocator_type& __a = allocator_type())
-	: _Base(__a)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  _M_initialize_dispatch(__first, __last, _Integral());
-	}
-#endif
-
-      /**
-       *  The dtor only erases the elements, and note that if the elements
-       *  themselves are pointers, the pointed-to memory is not touched in any
-       *  way.  Managing the pointer is the user's responsibility.
-       */
-      ~deque()
-      { _M_destroy_data(begin(), end(), _M_get_Tp_allocator()); }
-
-      /**
-       *  @brief  %Deque assignment operator.
-       *  @param  __x  A %deque of identical element and allocator types.
-       *
-       *  All the elements of @a x are copied, but unlike the copy constructor,
-       *  the allocator object is not copied.
-       */
-      deque&
-      operator=(const deque& __x);
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  %Deque move assignment operator.
-       *  @param  __x  A %deque of identical element and allocator types.
-       *
-       *  The contents of @a __x are moved into this deque (without copying,
-       *  if the allocators permit it).
-       *  @a __x is a valid, but unspecified %deque.
-       */
-      deque&
-      operator=(deque&& __x) noexcept(_Alloc_traits::_S_always_equal())
-      {
-	constexpr bool __always_equal = _Alloc_traits::_S_always_equal();
-	_M_move_assign1(std::move(__x),
-		        integral_constant<bool, __always_equal>());
-	return *this;
-      }
-
-      /**
-       *  @brief  Assigns an initializer list to a %deque.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills a %deque with copies of the elements in the
-       *  initializer_list @a __l.
-       *
-       *  Note that the assignment completely changes the %deque and that the
-       *  resulting %deque's size is the same as the number of elements
-       *  assigned.  Old data may be lost.
-       */
-      deque&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->assign(__l.begin(), __l.end());
-	return *this;
-      }
-#endif
-
-      /**
-       *  @brief  Assigns a given value to a %deque.
-       *  @param  __n  Number of elements to be assigned.
-       *  @param  __val  Value to be assigned.
-       *
-       *  This function fills a %deque with @a n copies of the given
-       *  value.  Note that the assignment completely changes the
-       *  %deque and that the resulting %deque's size is the same as
-       *  the number of elements assigned.  Old data may be lost.
-       */
-      void
-      assign(size_type __n, const value_type& __val)
-      { _M_fill_assign(__n, __val); }
-
-      /**
-       *  @brief  Assigns a range to a %deque.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *
-       *  This function fills a %deque with copies of the elements in the
-       *  range [__first,__last).
-       *
-       *  Note that the assignment completely changes the %deque and that the
-       *  resulting %deque's size is the same as the number of elements
-       *  assigned.  Old data may be lost.
-       */
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        { _M_assign_dispatch(__first, __last, __false_type()); }
-#else
-      template<typename _InputIterator>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  _M_assign_dispatch(__first, __last, _Integral());
-	}
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Assigns an initializer list to a %deque.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills a %deque with copies of the elements in the
-       *  initializer_list @a __l.
-       *
-       *  Note that the assignment completely changes the %deque and that the
-       *  resulting %deque's size is the same as the number of elements
-       *  assigned.  Old data may be lost.
-       */
-      void
-      assign(initializer_list<value_type> __l)
-      { this->assign(__l.begin(), __l.end()); }
-#endif
-
-      /// Get a copy of the memory allocation object.
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return _Base::get_allocator(); }
-
-      // iterators
-      /**
-       *  Returns a read/write iterator that points to the first element in the
-       *  %deque.  Iteration is done in ordinary element order.
-       */
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_start; }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %deque.  Iteration is done in ordinary element order.
-       */
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_start; }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  element in the %deque.  Iteration is done in ordinary
-       *  element order.
-       */
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_finish; }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past
-       *  the last element in the %deque.  Iteration is done in
-       *  ordinary element order.
-       */
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_finish; }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the
-       *  last element in the %deque.  Iteration is done in reverse
-       *  element order.
-       */
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(this->_M_impl._M_finish); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last element in the %deque.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(this->_M_impl._M_finish); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one
-       *  before the first element in the %deque.  Iteration is done
-       *  in reverse element order.
-       */
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(this->_M_impl._M_start); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first element in the %deque.  Iteration is
-       *  done in reverse element order.
-       */
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(this->_M_impl._M_start); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %deque.  Iteration is done in ordinary element order.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return this->_M_impl._M_start; }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past
-       *  the last element in the %deque.  Iteration is done in
-       *  ordinary element order.
-       */
-      const_iterator
-      cend() const noexcept
-      { return this->_M_impl._M_finish; }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last element in the %deque.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(this->_M_impl._M_finish); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first element in the %deque.  Iteration is
-       *  done in reverse element order.
-       */
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(this->_M_impl._M_start); }
-#endif
-
-      // [23.2.1.2] capacity
-      /**  Returns the number of elements in the %deque.  */
-      size_type
-      size() const _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_finish - this->_M_impl._M_start; }
-
-      /**  Returns the size() of the largest possible %deque.  */
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return _Alloc_traits::max_size(_M_get_Tp_allocator()); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Resizes the %deque to the specified number of elements.
-       *  @param  __new_size  Number of elements the %deque should contain.
-       *
-       *  This function will %resize the %deque to the specified
-       *  number of elements.  If the number is smaller than the
-       *  %deque's current size the %deque is truncated, otherwise
-       *  default constructed elements are appended.
-       */
-      void
-      resize(size_type __new_size)
-      {
-	const size_type __len = size();
-	if (__new_size > __len)
-	  _M_default_append(__new_size - __len);
-	else if (__new_size < __len)
-	  _M_erase_at_end(this->_M_impl._M_start
-			  + difference_type(__new_size));
-      }
-
-      /**
-       *  @brief  Resizes the %deque to the specified number of elements.
-       *  @param  __new_size  Number of elements the %deque should contain.
-       *  @param  __x  Data with which new elements should be populated.
-       *
-       *  This function will %resize the %deque to the specified
-       *  number of elements.  If the number is smaller than the
-       *  %deque's current size the %deque is truncated, otherwise the
-       *  %deque is extended and new elements are populated with given
-       *  data.
-       */
-      void
-      resize(size_type __new_size, const value_type& __x)
-      {
-	const size_type __len = size();
-	if (__new_size > __len)
-	  insert(this->_M_impl._M_finish, __new_size - __len, __x);
-	else if (__new_size < __len)
-	  _M_erase_at_end(this->_M_impl._M_start
-			  + difference_type(__new_size));
-      }
-#else
-      /**
-       *  @brief  Resizes the %deque to the specified number of elements.
-       *  @param  __new_size  Number of elements the %deque should contain.
-       *  @param  __x  Data with which new elements should be populated.
-       *
-       *  This function will %resize the %deque to the specified
-       *  number of elements.  If the number is smaller than the
-       *  %deque's current size the %deque is truncated, otherwise the
-       *  %deque is extended and new elements are populated with given
-       *  data.
-       */
-      void
-      resize(size_type __new_size, value_type __x = value_type())
-      {
-	const size_type __len = size();
-	if (__new_size > __len)
-	  insert(this->_M_impl._M_finish, __new_size - __len, __x);
-	else if (__new_size < __len)
-	  _M_erase_at_end(this->_M_impl._M_start
-			  + difference_type(__new_size));
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      /**  A non-binding request to reduce memory use.  */
-      void
-      shrink_to_fit() noexcept
-      { _M_shrink_to_fit(); }
-#endif
-
-      /**
-       *  Returns true if the %deque is empty.  (Thus begin() would
-       *  equal end().)
-       */
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_finish == this->_M_impl._M_start; }
-
-      // element access
-      /**
-       *  @brief Subscript access to the data contained in the %deque.
-       *  @param __n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read/write reference to data.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      reference
-      operator[](size_type __n) _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_start[difference_type(__n)]; }
-
-      /**
-       *  @brief Subscript access to the data contained in the %deque.
-       *  @param __n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read-only (constant) reference to data.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      const_reference
-      operator[](size_type __n) const _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_start[difference_type(__n)]; }
-
-    protected:
-      /// Safety check used only from at().
-      void
-      _M_range_check(size_type __n) const
-      {
-	if (__n >= this->size())
-	  __throw_out_of_range_fmt(__N("deque::_M_range_check: __n "
-				       "(which is %zu)>= this->size() "
-				       "(which is %zu)"),
-				   __n, this->size());
-      }
-
-    public:
-      /**
-       *  @brief  Provides access to the data contained in the %deque.
-       *  @param __n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read/write reference to data.
-       *  @throw  std::out_of_range  If @a __n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter
-       *  is first checked that it is in the range of the deque.  The
-       *  function throws out_of_range if the check fails.
-       */
-      reference
-      at(size_type __n)
-      {
-	_M_range_check(__n);
-	return (*this)[__n];
-      }
-
-      /**
-       *  @brief  Provides access to the data contained in the %deque.
-       *  @param __n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read-only (constant) reference to data.
-       *  @throw  std::out_of_range  If @a __n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter is first
-       *  checked that it is in the range of the deque.  The function throws
-       *  out_of_range if the check fails.
-       */
-      const_reference
-      at(size_type __n) const
-      {
-	_M_range_check(__n);
-	return (*this)[__n];
-      }
-
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %deque.
-       */
-      reference
-      front() _GLIBCXX_NOEXCEPT
-      { return *begin(); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %deque.
-       */
-      const_reference
-      front() const _GLIBCXX_NOEXCEPT
-      { return *begin(); }
-
-      /**
-       *  Returns a read/write reference to the data at the last element of the
-       *  %deque.
-       */
-      reference
-      back() _GLIBCXX_NOEXCEPT
-      {
-	iterator __tmp = end();
-	--__tmp;
-	return *__tmp;
-      }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the last
-       *  element of the %deque.
-       */
-      const_reference
-      back() const _GLIBCXX_NOEXCEPT
-      {
-	const_iterator __tmp = end();
-	--__tmp;
-	return *__tmp;
-      }
-
-      // [23.2.1.2] modifiers
-      /**
-       *  @brief  Add data to the front of the %deque.
-       *  @param  __x  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an
-       *  element at the front of the %deque and assigns the given
-       *  data to it.  Due to the nature of a %deque this operation
-       *  can be done in constant time.
-       */
-      void
-      push_front(const value_type& __x)
-      {
-	if (this->_M_impl._M_start._M_cur != this->_M_impl._M_start._M_first)
-	  {
-	    _Alloc_traits::construct(this->_M_impl,
-	                             this->_M_impl._M_start._M_cur - 1,
-	                             __x);
-	    --this->_M_impl._M_start._M_cur;
-	  }
-	else
-	  _M_push_front_aux(__x);
-      }
-
-#if __cplusplus >= 201103L
-      void
-      push_front(value_type&& __x)
-      { emplace_front(std::move(__x)); }
-
-      template<typename... _Args>
-        void
-        emplace_front(_Args&&... __args);
-#endif
-
-      /**
-       *  @brief  Add data to the end of the %deque.
-       *  @param  __x  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an
-       *  element at the end of the %deque and assigns the given data
-       *  to it.  Due to the nature of a %deque this operation can be
-       *  done in constant time.
-       */
-      void
-      push_back(const value_type& __x)
-      {
-	if (this->_M_impl._M_finish._M_cur
-	    != this->_M_impl._M_finish._M_last - 1)
-	  {
-	    _Alloc_traits::construct(this->_M_impl,
-	                             this->_M_impl._M_finish._M_cur, __x);
-	    ++this->_M_impl._M_finish._M_cur;
-	  }
-	else
-	  _M_push_back_aux(__x);
-      }
-
-#if __cplusplus >= 201103L
-      void
-      push_back(value_type&& __x)
-      { emplace_back(std::move(__x)); }
-
-      template<typename... _Args>
-        void
-        emplace_back(_Args&&... __args);
-#endif
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical stack operation.  It shrinks the %deque by one.
-       *
-       *  Note that no data is returned, and if the first element's data is
-       *  needed, it should be retrieved before pop_front() is called.
-       */
-      void
-      pop_front() _GLIBCXX_NOEXCEPT
-      {
-	if (this->_M_impl._M_start._M_cur
-	    != this->_M_impl._M_start._M_last - 1)
-	  {
-	    _Alloc_traits::destroy(this->_M_impl,
-	                           this->_M_impl._M_start._M_cur);
-	    ++this->_M_impl._M_start._M_cur;
-	  }
-	else
-	  _M_pop_front_aux();
-      }
-
-      /**
-       *  @brief  Removes last element.
-       *
-       *  This is a typical stack operation.  It shrinks the %deque by one.
-       *
-       *  Note that no data is returned, and if the last element's data is
-       *  needed, it should be retrieved before pop_back() is called.
-       */
-      void
-      pop_back() _GLIBCXX_NOEXCEPT
-      {
-	if (this->_M_impl._M_finish._M_cur
-	    != this->_M_impl._M_finish._M_first)
-	  {
-	    --this->_M_impl._M_finish._M_cur;
-	    _Alloc_traits::destroy(this->_M_impl,
-	                           this->_M_impl._M_finish._M_cur);
-	  }
-	else
-	  _M_pop_back_aux();
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts an object in %deque before specified iterator.
-       *  @param  __position  A const_iterator into the %deque.
-       *  @param  __args  Arguments.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert an object of type T constructed
-       *  with T(std::forward<Args>(args)...) before the specified location.
-       */
-      template<typename... _Args>
-        iterator
-        emplace(const_iterator __position, _Args&&... __args);
-
-      /**
-       *  @brief  Inserts given value into %deque before specified iterator.
-       *  @param  __position  A const_iterator into the %deque.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given value before the
-       *  specified location.
-       */
-      iterator
-      insert(const_iterator __position, const value_type& __x);
-#else
-      /**
-       *  @brief  Inserts given value into %deque before specified iterator.
-       *  @param  __position  An iterator into the %deque.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given value before the
-       *  specified location.
-       */
-      iterator
-      insert(iterator __position, const value_type& __x);
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts given rvalue into %deque before specified iterator.
-       *  @param  __position  A const_iterator into the %deque.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given rvalue before the
-       *  specified location.
-       */
-      iterator
-      insert(const_iterator __position, value_type&& __x)
-      { return emplace(__position, std::move(__x)); }
-
-      /**
-       *  @brief  Inserts an initializer list into the %deque.
-       *  @param  __p  An iterator into the %deque.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function will insert copies of the data in the
-       *  initializer_list @a __l into the %deque before the location
-       *  specified by @a __p.  This is known as <em>list insert</em>.
-       */
-      iterator
-      insert(const_iterator __p, initializer_list<value_type> __l)
-      { return this->insert(__p, __l.begin(), __l.end()); }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts a number of copies of given data into the %deque.
-       *  @param  __position  A const_iterator into the %deque.
-       *  @param  __n  Number of elements to be inserted.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a specified number of copies of the given
-       *  data before the location specified by @a __position.
-       */
-      iterator
-      insert(const_iterator __position, size_type __n, const value_type& __x)
-      {
-	difference_type __offset = __position - cbegin();
-	_M_fill_insert(__position._M_const_cast(), __n, __x);
-	return begin() + __offset;
-      }
-#else
-      /**
-       *  @brief  Inserts a number of copies of given data into the %deque.
-       *  @param  __position  An iterator into the %deque.
-       *  @param  __n  Number of elements to be inserted.
-       *  @param  __x  Data to be inserted.
-       *
-       *  This function will insert a specified number of copies of the given
-       *  data before the location specified by @a __position.
-       */
-      void
-      insert(iterator __position, size_type __n, const value_type& __x)
-      { _M_fill_insert(__position, __n, __x); }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts a range into the %deque.
-       *  @param  __position  A const_iterator into the %deque.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert copies of the data in the range
-       *  [__first,__last) into the %deque before the location specified
-       *  by @a __position.  This is known as <em>range insert</em>.
-       */
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        iterator
-        insert(const_iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-        {
-	  difference_type __offset = __position - cbegin();
-	  _M_insert_dispatch(__position._M_const_cast(),
-			     __first, __last, __false_type());
-	  return begin() + __offset;
-	}
-#else
-      /**
-       *  @brief  Inserts a range into the %deque.
-       *  @param  __position  An iterator into the %deque.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *
-       *  This function will insert copies of the data in the range
-       *  [__first,__last) into the %deque before the location specified
-       *  by @a __position.  This is known as <em>range insert</em>.
-       */
-      template<typename _InputIterator>
-        void
-        insert(iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  _M_insert_dispatch(__position, __first, __last, _Integral());
-	}
-#endif
-
-      /**
-       *  @brief  Remove element at given position.
-       *  @param  __position  Iterator pointing to element to be erased.
-       *  @return  An iterator pointing to the next element (or end()).
-       *
-       *  This function will erase the element at the given position and thus
-       *  shorten the %deque by one.
-       *
-       *  The user is cautioned that
-       *  this function only erases the element, and that if the element is
-       *  itself a pointer, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibility.
-       */
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __position)
-#else
-      erase(iterator __position)
-#endif
-      { return _M_erase(__position._M_const_cast()); }
-
-      /**
-       *  @brief  Remove a range of elements.
-       *  @param  __first  Iterator pointing to the first element to be erased.
-       *  @param  __last  Iterator pointing to one past the last element to be
-       *                erased.
-       *  @return  An iterator pointing to the element pointed to by @a last
-       *           prior to erasing (or end()).
-       *
-       *  This function will erase the elements in the range
-       *  [__first,__last) and shorten the %deque accordingly.
-       *
-       *  The user is cautioned that
-       *  this function only erases the elements, and that if the elements
-       *  themselves are pointers, the pointed-to memory is not touched in any
-       *  way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __first, const_iterator __last)
-#else
-      erase(iterator __first, iterator __last)
-#endif
-      { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
-
-      /**
-       *  @brief  Swaps data with another %deque.
-       *  @param  __x  A %deque of the same element and allocator types.
-       *
-       *  This exchanges the elements between two deques in constant time.
-       *  (Four pointers, so it should be quite fast.)
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(d1,d2) will feed to this function.
-       */
-      void
-      swap(deque& __x)
-#if __cplusplus >= 201103L
-      noexcept(_Alloc_traits::_S_nothrow_swap())
-#endif
-      {
-	_M_impl._M_swap_data(__x._M_impl);
-	_Alloc_traits::_S_on_swap(_M_get_Tp_allocator(),
-				  __x._M_get_Tp_allocator());
-      }
-
-      /**
-       *  Erases all the elements.  Note that this function only erases the
-       *  elements, and that if the elements themselves are pointers, the
-       *  pointed-to memory is not touched in any way.  Managing the pointer is
-       *  the user's responsibility.
-       */
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      { _M_erase_at_end(begin()); }
-
-    protected:
-      // Internal constructor functions follow.
-
-      // called by the range constructor to implement [23.1.1]/9
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-        void
-        _M_initialize_dispatch(_Integer __n, _Integer __x, __true_type)
-        {
-	  _M_initialize_map(static_cast<size_type>(__n));
-	  _M_fill_initialize(__x);
-	}
-
-      // called by the range constructor to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_initialize_dispatch(_InputIterator __first, _InputIterator __last,
-			       __false_type)
-        {
-	  typedef typename std::iterator_traits<_InputIterator>::
-	    iterator_category _IterCategory;
-	  _M_range_initialize(__first, __last, _IterCategory());
-	}
-
-      // called by the second initialize_dispatch above
-      //@{
-      /**
-       *  @brief Fills the deque with whatever is in [first,last).
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @return   Nothing.
-       *
-       *  If the iterators are actually forward iterators (or better), then the
-       *  memory layout can be done all at once.  Else we move forward using
-       *  push_back on each value from the iterator.
-       */
-      template<typename _InputIterator>
-        void
-        _M_range_initialize(_InputIterator __first, _InputIterator __last,
-			    std::input_iterator_tag);
-
-      // called by the second initialize_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_range_initialize(_ForwardIterator __first, _ForwardIterator __last,
-			    std::forward_iterator_tag);
-      //@}
-
-      /**
-       *  @brief Fills the %deque with copies of value.
-       *  @param  __value  Initial value.
-       *  @return   Nothing.
-       *  @pre _M_start and _M_finish have already been initialized,
-       *  but none of the %deque's elements have yet been constructed.
-       *
-       *  This function is called only when the user provides an explicit size
-       *  (with or without an explicit exemplar value).
-       */
-      void
-      _M_fill_initialize(const value_type& __value);
-
-#if __cplusplus >= 201103L
-      // called by deque(n).
-      void
-      _M_default_initialize();
-#endif
-
-      // Internal assign functions follow.  The *_aux functions do the actual
-      // assignment work for the range versions.
-
-      // called by the range assign to implement [23.1.1]/9
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-        void
-        _M_assign_dispatch(_Integer __n, _Integer __val, __true_type)
-        { _M_fill_assign(__n, __val); }
-
-      // called by the range assign to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-			   __false_type)
-        {
-	  typedef typename std::iterator_traits<_InputIterator>::
-	    iterator_category _IterCategory;
-	  _M_assign_aux(__first, __last, _IterCategory());
-	}
-
-      // called by the second assign_dispatch above
-      template<typename _InputIterator>
-        void
-        _M_assign_aux(_InputIterator __first, _InputIterator __last,
-		      std::input_iterator_tag);
-
-      // called by the second assign_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last,
-		      std::forward_iterator_tag)
-        {
-	  const size_type __len = std::distance(__first, __last);
-	  if (__len > size())
-	    {
-	      _ForwardIterator __mid = __first;
-	      std::advance(__mid, size());
-	      std::copy(__first, __mid, begin());
-	      insert(end(), __mid, __last);
-	    }
-	  else
-	    _M_erase_at_end(std::copy(__first, __last, begin()));
-	}
-
-      // Called by assign(n,t), and the range assign when it turns out
-      // to be the same thing.
-      void
-      _M_fill_assign(size_type __n, const value_type& __val)
-      {
-	if (__n > size())
-	  {
-	    std::fill(begin(), end(), __val);
-	    insert(end(), __n - size(), __val);
-	  }
-	else
-	  {
-	    _M_erase_at_end(begin() + difference_type(__n));
-	    std::fill(begin(), end(), __val);
-	  }
-      }
-
-      //@{
-      /// Helper functions for push_* and pop_*.
-#if __cplusplus < 201103L
-      void _M_push_back_aux(const value_type&);
-
-      void _M_push_front_aux(const value_type&);
-#else
-      template<typename... _Args>
-        void _M_push_back_aux(_Args&&... __args);
-
-      template<typename... _Args>
-        void _M_push_front_aux(_Args&&... __args);
-#endif
-
-      void _M_pop_back_aux();
-
-      void _M_pop_front_aux();
-      //@}
-
-      // Internal insert functions follow.  The *_aux functions do the actual
-      // insertion work when all shortcuts fail.
-
-      // called by the range insert to implement [23.1.1]/9
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-        void
-        _M_insert_dispatch(iterator __pos,
-			   _Integer __n, _Integer __x, __true_type)
-        { _M_fill_insert(__pos, __n, __x); }
-
-      // called by the range insert to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_insert_dispatch(iterator __pos,
-			   _InputIterator __first, _InputIterator __last,
-			   __false_type)
-        {
-	  typedef typename std::iterator_traits<_InputIterator>::
-	    iterator_category _IterCategory;
-          _M_range_insert_aux(__pos, __first, __last, _IterCategory());
-	}
-
-      // called by the second insert_dispatch above
-      template<typename _InputIterator>
-        void
-        _M_range_insert_aux(iterator __pos, _InputIterator __first,
-			    _InputIterator __last, std::input_iterator_tag);
-
-      // called by the second insert_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_range_insert_aux(iterator __pos, _ForwardIterator __first,
-			    _ForwardIterator __last, std::forward_iterator_tag);
-
-      // Called by insert(p,n,x), and the range insert when it turns out to be
-      // the same thing.  Can use fill functions in optimal situations,
-      // otherwise passes off to insert_aux(p,n,x).
-      void
-      _M_fill_insert(iterator __pos, size_type __n, const value_type& __x);
-
-      // called by insert(p,x)
-#if __cplusplus < 201103L
-      iterator
-      _M_insert_aux(iterator __pos, const value_type& __x);
-#else
-      template<typename... _Args>
-        iterator
-        _M_insert_aux(iterator __pos, _Args&&... __args);
-#endif
-
-      // called by insert(p,n,x) via fill_insert
-      void
-      _M_insert_aux(iterator __pos, size_type __n, const value_type& __x);
-
-      // called by range_insert_aux for forward iterators
-      template<typename _ForwardIterator>
-        void
-        _M_insert_aux(iterator __pos,
-		      _ForwardIterator __first, _ForwardIterator __last,
-		      size_type __n);
-
-
-      // Internal erase functions follow.
-
-      void
-      _M_destroy_data_aux(iterator __first, iterator __last);
-
-      // Called by ~deque().
-      // NB: Doesn't deallocate the nodes.
-      template<typename _Alloc1>
-        void
-        _M_destroy_data(iterator __first, iterator __last, const _Alloc1&)
-        { _M_destroy_data_aux(__first, __last); }
-
-      void
-      _M_destroy_data(iterator __first, iterator __last,
-		      const std::allocator<_Tp>&)
-      {
-	if (!__has_trivial_destructor(value_type))
-	  _M_destroy_data_aux(__first, __last);
-      }
-
-      // Called by erase(q1, q2).
-      void
-      _M_erase_at_begin(iterator __pos)
-      {
-	_M_destroy_data(begin(), __pos, _M_get_Tp_allocator());
-	_M_destroy_nodes(this->_M_impl._M_start._M_node, __pos._M_node);
-	this->_M_impl._M_start = __pos;
-      }
-
-      // Called by erase(q1, q2), resize(), clear(), _M_assign_aux,
-      // _M_fill_assign, operator=.
-      void
-      _M_erase_at_end(iterator __pos)
-      {
-	_M_destroy_data(__pos, end(), _M_get_Tp_allocator());
-	_M_destroy_nodes(__pos._M_node + 1,
-			 this->_M_impl._M_finish._M_node + 1);
-	this->_M_impl._M_finish = __pos;
-      }
-
-      iterator
-      _M_erase(iterator __pos);
-
-      iterator
-      _M_erase(iterator __first, iterator __last);
-
-#if __cplusplus >= 201103L
-      // Called by resize(sz).
-      void
-      _M_default_append(size_type __n);
-
-      bool
-      _M_shrink_to_fit();
-#endif
-
-      //@{
-      /// Memory-handling helpers for the previous internal insert functions.
-      iterator
-      _M_reserve_elements_at_front(size_type __n)
-      {
-	const size_type __vacancies = this->_M_impl._M_start._M_cur
-	                              - this->_M_impl._M_start._M_first;
-	if (__n > __vacancies)
-	  _M_new_elements_at_front(__n - __vacancies);
-	return this->_M_impl._M_start - difference_type(__n);
-      }
-
-      iterator
-      _M_reserve_elements_at_back(size_type __n)
-      {
-	const size_type __vacancies = (this->_M_impl._M_finish._M_last
-				       - this->_M_impl._M_finish._M_cur) - 1;
-	if (__n > __vacancies)
-	  _M_new_elements_at_back(__n - __vacancies);
-	return this->_M_impl._M_finish + difference_type(__n);
-      }
-
-      void
-      _M_new_elements_at_front(size_type __new_elements);
-
-      void
-      _M_new_elements_at_back(size_type __new_elements);
-      //@}
-
-
-      //@{
-      /**
-       *  @brief Memory-handling helpers for the major %map.
-       *
-       *  Makes sure the _M_map has space for new nodes.  Does not
-       *  actually add the nodes.  Can invalidate _M_map pointers.
-       *  (And consequently, %deque iterators.)
-       */
-      void
-      _M_reserve_map_at_back(size_type __nodes_to_add = 1)
-      {
-	if (__nodes_to_add + 1 > this->_M_impl._M_map_size
-	    - (this->_M_impl._M_finish._M_node - this->_M_impl._M_map))
-	  _M_reallocate_map(__nodes_to_add, false);
-      }
-
-      void
-      _M_reserve_map_at_front(size_type __nodes_to_add = 1)
-      {
-	if (__nodes_to_add > size_type(this->_M_impl._M_start._M_node
-				       - this->_M_impl._M_map))
-	  _M_reallocate_map(__nodes_to_add, true);
-      }
-
-      void
-      _M_reallocate_map(size_type __nodes_to_add, bool __add_at_front);
-      //@}
-
-#if __cplusplus >= 201103L
-      // Constant-time, nothrow move assignment when source object's memory
-      // can be moved because the allocators are equal.
-      void
-      _M_move_assign1(deque&& __x, /* always equal: */ true_type) noexcept
-      {
-	this->_M_impl._M_swap_data(__x._M_impl);
-	__x.clear();
-	std::__alloc_on_move(_M_get_Tp_allocator(), __x._M_get_Tp_allocator());
-      }
-
-      void
-      _M_move_assign1(deque&& __x, /* always equal: */ false_type)
-      {
-	constexpr bool __move_storage =
-	  _Alloc_traits::_S_propagate_on_move_assign();
-	_M_move_assign2(std::move(__x),
-			integral_constant<bool, __move_storage>());
-      }
-
-      // Destroy all elements and deallocate all memory, then replace
-      // with elements created from __args.
-      template<typename... _Args>
-      void
-      _M_replace_map(_Args&&... __args)
-      {
-	// Create new data first, so if allocation fails there are no effects.
-	deque __newobj(std::forward<_Args>(__args)...);
-	// Free existing storage using existing allocator.
-	clear();
-	_M_deallocate_node(*begin()._M_node); // one node left after clear()
-	_M_deallocate_map(this->_M_impl._M_map, this->_M_impl._M_map_size);
-	this->_M_impl._M_map = nullptr;
-	this->_M_impl._M_map_size = 0;
-	// Take ownership of replacement memory.
-	this->_M_impl._M_swap_data(__newobj._M_impl);
-      }
-
-      // Do move assignment when the allocator propagates.
-      void
-      _M_move_assign2(deque&& __x, /* propagate: */ true_type)
-      {
-	// Make a copy of the original allocator state.
-	auto __alloc = __x._M_get_Tp_allocator();
-	// The allocator propagates so storage can be moved from __x,
-	// leaving __x in a valid empty state with a moved-from allocator.
-	_M_replace_map(std::move(__x));
-	// Move the corresponding allocator state too.
-	_M_get_Tp_allocator() = std::move(__alloc);
-      }
-
-      // Do move assignment when it may not be possible to move source
-      // object's memory, resulting in a linear-time operation.
-      void
-      _M_move_assign2(deque&& __x, /* propagate: */ false_type)
-      {
-	if (__x._M_get_Tp_allocator() == this->_M_get_Tp_allocator())
-	  {
-	    // The allocators are equal so storage can be moved from __x,
-	    // leaving __x in a valid empty state with its current allocator.
-	    _M_replace_map(std::move(__x), __x.get_allocator());
-	  }
-	else
-	  {
-	    // The rvalue's allocator cannot be moved and is not equal,
-	    // so we need to individually move each element.
-	    this->assign(std::__make_move_if_noexcept_iterator(__x.begin()),
-			 std::__make_move_if_noexcept_iterator(__x.end()));
-	    __x.clear();
-	  }
-      }
-#endif
-    };
-
-
-  /**
-   *  @brief  Deque equality comparison.
-   *  @param  __x  A %deque.
-   *  @param  __y  A %deque of the same type as @a __x.
-   *  @return  True iff the size and elements of the deques are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the
-   *  deques.  Deques are considered equivalent if their sizes are equal,
-   *  and if corresponding elements compare equal.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const deque<_Tp, _Alloc>& __x,
-                         const deque<_Tp, _Alloc>& __y)
-    { return __x.size() == __y.size()
-             && std::equal(__x.begin(), __x.end(), __y.begin()); }
-
-  /**
-   *  @brief  Deque ordering relation.
-   *  @param  __x  A %deque.
-   *  @param  __y  A %deque of the same type as @a __x.
-   *  @return  True iff @a x is lexicographically less than @a __y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  deques.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const deque<_Tp, _Alloc>& __x,
-	      const deque<_Tp, _Alloc>& __y)
-    { return std::lexicographical_compare(__x.begin(), __x.end(),
-					  __y.begin(), __y.end()); }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const deque<_Tp, _Alloc>& __x,
-	       const deque<_Tp, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const deque<_Tp, _Alloc>& __x,
-	      const deque<_Tp, _Alloc>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const deque<_Tp, _Alloc>& __x,
-	       const deque<_Tp, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const deque<_Tp, _Alloc>& __x,
-	       const deque<_Tp, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::deque::swap().
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(deque<_Tp,_Alloc>& __x, deque<_Tp,_Alloc>& __y)
-    { __x.swap(__y); }
-
-#undef _GLIBCXX_DEQUE_BUF_SIZE
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif /* _STL_DEQUE_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_function.h b/openflow/usr/include/c++/5/bits/stl_function.h
deleted file mode 100644
index 0c16357..0000000
--- a/openflow/usr/include/c++/5/bits/stl_function.h
+++ /dev/null
@@ -1,1131 +0,0 @@
-// Functor implementations -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_function.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{functional}
- */
-
-#ifndef _STL_FUNCTION_H
-#define _STL_FUNCTION_H 1
-
-#if __cplusplus > 201103L
-#include <bits/move.h>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // 20.3.1 base classes
-  /** @defgroup functors Function Objects
-   * @ingroup utilities
-   *
-   *  Function objects, or @e functors, are objects with an @c operator()
-   *  defined and accessible.  They can be passed as arguments to algorithm
-   *  templates and used in place of a function pointer.  Not only is the
-   *  resulting expressiveness of the library increased, but the generated
-   *  code can be more efficient than what you might write by hand.  When we
-   *  refer to @a functors, then, generally we include function pointers in
-   *  the description as well.
-   *
-   *  Often, functors are only created as temporaries passed to algorithm
-   *  calls, rather than being created as named variables.
-   *
-   *  Two examples taken from the standard itself follow.  To perform a
-   *  by-element addition of two vectors @c a and @c b containing @c double,
-   *  and put the result in @c a, use
-   *  \code
-   *  transform (a.begin(), a.end(), b.begin(), a.begin(), plus<double>());
-   *  \endcode
-   *  To negate every element in @c a, use
-   *  \code
-   *  transform(a.begin(), a.end(), a.begin(), negate<double>());
-   *  \endcode
-   *  The addition and negation functions will be inlined directly.
-   *
-   *  The standard functors are derived from structs named @c unary_function
-   *  and @c binary_function.  These two classes contain nothing but typedefs,
-   *  to aid in generic (template) programming.  If you write your own
-   *  functors, you might consider doing the same.
-   *
-   *  @{
-   */
-  /**
-   *  This is one of the @link functors functor base classes@endlink.
-   */
-  template<typename _Arg, typename _Result>
-    struct unary_function
-    {
-      /// @c argument_type is the type of the argument
-      typedef _Arg 	argument_type;   
-
-      /// @c result_type is the return type
-      typedef _Result 	result_type;  
-    };
-
-  /**
-   *  This is one of the @link functors functor base classes@endlink.
-   */
-  template<typename _Arg1, typename _Arg2, typename _Result>
-    struct binary_function
-    {
-      /// @c first_argument_type is the type of the first argument
-      typedef _Arg1 	first_argument_type; 
-
-      /// @c second_argument_type is the type of the second argument
-      typedef _Arg2 	second_argument_type;
-
-      /// @c result_type is the return type
-      typedef _Result 	result_type;
-    };
-  /** @}  */
-
-  // 20.3.2 arithmetic
-  /** @defgroup arithmetic_functors Arithmetic Classes
-   * @ingroup functors
-   *
-   *  Because basic math often needs to be done during an algorithm,
-   *  the library provides functors for those operations.  See the
-   *  documentation for @link functors the base classes@endlink
-   *  for examples of their use.
-   *
-   *  @{
-   */
-
-#if __cplusplus > 201103L
-  struct __is_transparent;  // undefined
-
-  template<typename _Tp = void>
-    struct plus;
-
-  template<typename _Tp = void>
-    struct minus;
-
-  template<typename _Tp = void>
-    struct multiplies;
-
-  template<typename _Tp = void>
-    struct divides;
-
-  template<typename _Tp = void>
-    struct modulus;
-
-  template<typename _Tp = void>
-    struct negate;
-#endif
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<typename _Tp>
-    struct plus : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _GLIBCXX14_CONSTEXPR
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x + __y; }
-    };
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<typename _Tp>
-    struct minus : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _GLIBCXX14_CONSTEXPR
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x - __y; }
-    };
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<typename _Tp>
-    struct multiplies : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _GLIBCXX14_CONSTEXPR
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x * __y; }
-    };
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<typename _Tp>
-    struct divides : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _GLIBCXX14_CONSTEXPR
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x / __y; }
-    };
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<typename _Tp>
-    struct modulus : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _GLIBCXX14_CONSTEXPR
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x % __y; }
-    };
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<typename _Tp>
-    struct negate : public unary_function<_Tp, _Tp>
-    {
-      _GLIBCXX14_CONSTEXPR
-      _Tp
-      operator()(const _Tp& __x) const
-      { return -__x; }
-    };
-
-#if __cplusplus > 201103L
-
-#define __cpp_lib_transparent_operators 201210
-//#define __cpp_lib_generic_associative_lookup 201304
-
-  template<>
-    struct plus<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) + std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) + std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) + std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<>
-    struct minus<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) - std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) - std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) - std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<>
-    struct multiplies<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) * std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) * std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) * std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<>
-    struct divides<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) / std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) / std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) / std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<>
-    struct modulus<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) % std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) % std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) % std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link arithmetic_functors math functors@endlink.
-  template<>
-    struct negate<void>
-    {
-      template <typename _Tp>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t) const
-	noexcept(noexcept(-std::forward<_Tp>(__t)))
-	-> decltype(-std::forward<_Tp>(__t))
-	{ return -std::forward<_Tp>(__t); }
-
-      typedef __is_transparent is_transparent;
-    };
-#endif
-  /** @}  */
-
-  // 20.3.3 comparisons
-  /** @defgroup comparison_functors Comparison Classes
-   * @ingroup functors
-   *
-   *  The library provides six wrapper functors for all the basic comparisons
-   *  in C++, like @c <.
-   *
-   *  @{
-   */
-#if __cplusplus > 201103L
-  template<typename _Tp = void>
-    struct equal_to;
-
-  template<typename _Tp = void>
-    struct not_equal_to;
-
-  template<typename _Tp = void>
-    struct greater;
-
-  template<typename _Tp = void>
-    struct less;
-
-  template<typename _Tp = void>
-    struct greater_equal;
-
-  template<typename _Tp = void>
-    struct less_equal;
-#endif
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<typename _Tp>
-    struct equal_to : public binary_function<_Tp, _Tp, bool>
-    {
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x == __y; }
-    };
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<typename _Tp>
-    struct not_equal_to : public binary_function<_Tp, _Tp, bool>
-    {
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x != __y; }
-    };
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<typename _Tp>
-    struct greater : public binary_function<_Tp, _Tp, bool>
-    {
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x > __y; }
-    };
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<typename _Tp>
-    struct less : public binary_function<_Tp, _Tp, bool>
-    {
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x < __y; }
-    };
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<typename _Tp>
-    struct greater_equal : public binary_function<_Tp, _Tp, bool>
-    {
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x >= __y; }
-    };
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<typename _Tp>
-    struct less_equal : public binary_function<_Tp, _Tp, bool>
-    {
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x <= __y; }
-    };
-
-#if __cplusplus > 201103L
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<>
-    struct equal_to<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) == std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) == std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) == std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<>
-    struct not_equal_to<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) != std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) != std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) != std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<>
-    struct greater<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) > std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) > std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) > std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<>
-    struct less<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) < std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) < std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) < std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<>
-    struct greater_equal<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) >= std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) >= std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) >= std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link comparison_functors comparison functors@endlink.
-  template<>
-    struct less_equal<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) <= std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) <= std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) <= std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-#endif
-  /** @}  */
-
-  // 20.3.4 logical operations
-  /** @defgroup logical_functors Boolean Operations Classes
-   * @ingroup functors
-   *
-   *  Here are wrapper functors for Boolean operations: @c &&, @c ||,
-   *  and @c !.
-   *
-   *  @{
-   */
-#if __cplusplus > 201103L
-  template<typename _Tp = void>
-    struct logical_and;
-
-  template<typename _Tp = void>
-    struct logical_or;
-
-  template<typename _Tp = void>
-    struct logical_not;
-#endif
-
-  /// One of the @link logical_functors Boolean operations functors@endlink.
-  template<typename _Tp>
-    struct logical_and : public binary_function<_Tp, _Tp, bool>
-    {
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x && __y; }
-    };
-
-  /// One of the @link logical_functors Boolean operations functors@endlink.
-  template<typename _Tp>
-    struct logical_or : public binary_function<_Tp, _Tp, bool>
-    {
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x || __y; }
-    };
-
-  /// One of the @link logical_functors Boolean operations functors@endlink.
-  template<typename _Tp>
-    struct logical_not : public unary_function<_Tp, bool>
-    {
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const _Tp& __x) const
-      { return !__x; }
-    };
-
-#if __cplusplus > 201103L
-  /// One of the @link logical_functors Boolean operations functors@endlink.
-  template<>
-    struct logical_and<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) && std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) && std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) && std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link logical_functors Boolean operations functors@endlink.
-  template<>
-    struct logical_or<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) || std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) || std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) || std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  /// One of the @link logical_functors Boolean operations functors@endlink.
-  template<>
-    struct logical_not<void>
-    {
-      template <typename _Tp>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t) const
-	noexcept(noexcept(!std::forward<_Tp>(__t)))
-	-> decltype(!std::forward<_Tp>(__t))
-	{ return !std::forward<_Tp>(__t); }
-
-      typedef __is_transparent is_transparent;
-    };
-#endif
-  /** @}  */
-
-#if __cplusplus > 201103L
-  template<typename _Tp = void>
-    struct bit_and;
-
-  template<typename _Tp = void>
-    struct bit_or;
-
-  template<typename _Tp = void>
-    struct bit_xor;
-
-  template<typename _Tp = void>
-    struct bit_not;
-#endif
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // DR 660. Missing Bitwise Operations.
-  template<typename _Tp>
-    struct bit_and : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _GLIBCXX14_CONSTEXPR
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x & __y; }
-    };
-
-  template<typename _Tp>
-    struct bit_or : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _GLIBCXX14_CONSTEXPR
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x | __y; }
-    };
-
-  template<typename _Tp>
-    struct bit_xor : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _GLIBCXX14_CONSTEXPR
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x ^ __y; }
-    };
-
-  template<typename _Tp>
-    struct bit_not : public unary_function<_Tp, _Tp>
-    {
-    _GLIBCXX14_CONSTEXPR
-      _Tp
-      operator()(const _Tp& __x) const
-      { return ~__x; }
-    };
-
-#if __cplusplus > 201103L
-  template <>
-    struct bit_and<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) & std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) & std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) & std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  template <>
-    struct bit_or<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) | std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) | std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) | std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  template <>
-    struct bit_xor<void>
-    {
-      template <typename _Tp, typename _Up>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t, _Up&& __u) const
-	noexcept(noexcept(std::forward<_Tp>(__t) ^ std::forward<_Up>(__u)))
-	-> decltype(std::forward<_Tp>(__t) ^ std::forward<_Up>(__u))
-	{ return std::forward<_Tp>(__t) ^ std::forward<_Up>(__u); }
-
-      typedef __is_transparent is_transparent;
-    };
-
-  template <>
-    struct bit_not<void>
-    {
-      template <typename _Tp>
-	_GLIBCXX14_CONSTEXPR
-	auto
-	operator()(_Tp&& __t) const
-	noexcept(noexcept(~std::forward<_Tp>(__t)))
-	-> decltype(~std::forward<_Tp>(__t))
-	{ return ~std::forward<_Tp>(__t); }
-
-      typedef __is_transparent is_transparent;
-    };
-#endif
-
-  // 20.3.5 negators
-  /** @defgroup negators Negators
-   * @ingroup functors
-   *
-   *  The functions @c not1 and @c not2 each take a predicate functor
-   *  and return an instance of @c unary_negate or
-   *  @c binary_negate, respectively.  These classes are functors whose
-   *  @c operator() performs the stored predicate function and then returns
-   *  the negation of the result.
-   *
-   *  For example, given a vector of integers and a trivial predicate,
-   *  \code
-   *  struct IntGreaterThanThree
-   *    : public std::unary_function<int, bool>
-   *  {
-   *      bool operator() (int x) { return x > 3; }
-   *  };
-   *
-   *  std::find_if (v.begin(), v.end(), not1(IntGreaterThanThree()));
-   *  \endcode
-   *  The call to @c find_if will locate the first index (i) of @c v for which
-   *  <code>!(v[i] > 3)</code> is true.
-   *
-   *  The not1/unary_negate combination works on predicates taking a single
-   *  argument.  The not2/binary_negate combination works on predicates which
-   *  take two arguments.
-   *
-   *  @{
-   */
-  /// One of the @link negators negation functors@endlink.
-  template<typename _Predicate>
-    class unary_negate
-    : public unary_function<typename _Predicate::argument_type, bool>
-    {
-    protected:
-      _Predicate _M_pred;
-
-    public:
-      _GLIBCXX14_CONSTEXPR
-      explicit
-      unary_negate(const _Predicate& __x) : _M_pred(__x) { }
-
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const typename _Predicate::argument_type& __x) const
-      { return !_M_pred(__x); }
-    };
-
-  /// One of the @link negators negation functors@endlink.
-  template<typename _Predicate>
-    _GLIBCXX14_CONSTEXPR
-    inline unary_negate<_Predicate>
-    not1(const _Predicate& __pred)
-    { return unary_negate<_Predicate>(__pred); }
-
-  /// One of the @link negators negation functors@endlink.
-  template<typename _Predicate>
-    class binary_negate
-    : public binary_function<typename _Predicate::first_argument_type,
-			     typename _Predicate::second_argument_type, bool>
-    {
-    protected:
-      _Predicate _M_pred;
-
-    public:
-      _GLIBCXX14_CONSTEXPR
-      explicit
-      binary_negate(const _Predicate& __x) : _M_pred(__x) { }
-
-      _GLIBCXX14_CONSTEXPR
-      bool
-      operator()(const typename _Predicate::first_argument_type& __x,
-		 const typename _Predicate::second_argument_type& __y) const
-      { return !_M_pred(__x, __y); }
-    };
-
-  /// One of the @link negators negation functors@endlink.
-  template<typename _Predicate>
-    _GLIBCXX14_CONSTEXPR
-    inline binary_negate<_Predicate>
-    not2(const _Predicate& __pred)
-    { return binary_negate<_Predicate>(__pred); }
-  /** @}  */
-
-  // 20.3.7 adaptors pointers functions
-  /** @defgroup pointer_adaptors Adaptors for pointers to functions
-   * @ingroup functors
-   *
-   *  The advantage of function objects over pointers to functions is that
-   *  the objects in the standard library declare nested typedefs describing
-   *  their argument and result types with uniform names (e.g., @c result_type
-   *  from the base classes @c unary_function and @c binary_function).
-   *  Sometimes those typedefs are required, not just optional.
-   *
-   *  Adaptors are provided to turn pointers to unary (single-argument) and
-   *  binary (double-argument) functions into function objects.  The
-   *  long-winded functor @c pointer_to_unary_function is constructed with a
-   *  function pointer @c f, and its @c operator() called with argument @c x
-   *  returns @c f(x).  The functor @c pointer_to_binary_function does the same
-   *  thing, but with a double-argument @c f and @c operator().
-   *
-   *  The function @c ptr_fun takes a pointer-to-function @c f and constructs
-   *  an instance of the appropriate functor.
-   *
-   *  @{
-   */
-  /// One of the @link pointer_adaptors adaptors for function pointers@endlink.
-  template<typename _Arg, typename _Result>
-    class pointer_to_unary_function : public unary_function<_Arg, _Result>
-    {
-    protected:
-      _Result (*_M_ptr)(_Arg);
-
-    public:
-      pointer_to_unary_function() { }
-
-      explicit
-      pointer_to_unary_function(_Result (*__x)(_Arg))
-      : _M_ptr(__x) { }
-
-      _Result
-      operator()(_Arg __x) const
-      { return _M_ptr(__x); }
-    };
-
-  /// One of the @link pointer_adaptors adaptors for function pointers@endlink.
-  template<typename _Arg, typename _Result>
-    inline pointer_to_unary_function<_Arg, _Result>
-    ptr_fun(_Result (*__x)(_Arg))
-    { return pointer_to_unary_function<_Arg, _Result>(__x); }
-
-  /// One of the @link pointer_adaptors adaptors for function pointers@endlink.
-  template<typename _Arg1, typename _Arg2, typename _Result>
-    class pointer_to_binary_function
-    : public binary_function<_Arg1, _Arg2, _Result>
-    {
-    protected:
-      _Result (*_M_ptr)(_Arg1, _Arg2);
-
-    public:
-      pointer_to_binary_function() { }
-
-      explicit
-      pointer_to_binary_function(_Result (*__x)(_Arg1, _Arg2))
-      : _M_ptr(__x) { }
-
-      _Result
-      operator()(_Arg1 __x, _Arg2 __y) const
-      { return _M_ptr(__x, __y); }
-    };
-
-  /// One of the @link pointer_adaptors adaptors for function pointers@endlink.
-  template<typename _Arg1, typename _Arg2, typename _Result>
-    inline pointer_to_binary_function<_Arg1, _Arg2, _Result>
-    ptr_fun(_Result (*__x)(_Arg1, _Arg2))
-    { return pointer_to_binary_function<_Arg1, _Arg2, _Result>(__x); }
-  /** @}  */
-
-  template<typename _Tp>
-    struct _Identity
-    : public unary_function<_Tp,_Tp>
-    {
-      _Tp&
-      operator()(_Tp& __x) const
-      { return __x; }
-
-      const _Tp&
-      operator()(const _Tp& __x) const
-      { return __x; }
-    };
-
-  template<typename _Pair>
-    struct _Select1st
-    : public unary_function<_Pair, typename _Pair::first_type>
-    {
-      typename _Pair::first_type&
-      operator()(_Pair& __x) const
-      { return __x.first; }
-
-      const typename _Pair::first_type&
-      operator()(const _Pair& __x) const
-      { return __x.first; }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair2>
-        typename _Pair2::first_type&
-        operator()(_Pair2& __x) const
-        { return __x.first; }
-
-      template<typename _Pair2>
-        const typename _Pair2::first_type&
-        operator()(const _Pair2& __x) const
-        { return __x.first; }
-#endif
-    };
-
-  template<typename _Pair>
-    struct _Select2nd
-    : public unary_function<_Pair, typename _Pair::second_type>
-    {
-      typename _Pair::second_type&
-      operator()(_Pair& __x) const
-      { return __x.second; }
-
-      const typename _Pair::second_type&
-      operator()(const _Pair& __x) const
-      { return __x.second; }
-    };
-
-  // 20.3.8 adaptors pointers members
-  /** @defgroup memory_adaptors Adaptors for pointers to members
-   * @ingroup functors
-   *
-   *  There are a total of 8 = 2^3 function objects in this family.
-   *   (1) Member functions taking no arguments vs member functions taking
-   *        one argument.
-   *   (2) Call through pointer vs call through reference.
-   *   (3) Const vs non-const member function.
-   *
-   *  All of this complexity is in the function objects themselves.  You can
-   *   ignore it by using the helper function mem_fun and mem_fun_ref,
-   *   which create whichever type of adaptor is appropriate.
-   *
-   *  @{
-   */
-  /// One of the @link memory_adaptors adaptors for member
-  /// pointers@endlink.
-  template<typename _Ret, typename _Tp>
-    class mem_fun_t : public unary_function<_Tp*, _Ret>
-    {
-    public:
-      explicit
-      mem_fun_t(_Ret (_Tp::*__pf)())
-      : _M_f(__pf) { }
-
-      _Ret
-      operator()(_Tp* __p) const
-      { return (__p->*_M_f)(); }
-
-    private:
-      _Ret (_Tp::*_M_f)();
-    };
-
-  /// One of the @link memory_adaptors adaptors for member
-  /// pointers@endlink.
-  template<typename _Ret, typename _Tp>
-    class const_mem_fun_t : public unary_function<const _Tp*, _Ret>
-    {
-    public:
-      explicit
-      const_mem_fun_t(_Ret (_Tp::*__pf)() const)
-      : _M_f(__pf) { }
-
-      _Ret
-      operator()(const _Tp* __p) const
-      { return (__p->*_M_f)(); }
-
-    private:
-      _Ret (_Tp::*_M_f)() const;
-    };
-
-  /// One of the @link memory_adaptors adaptors for member
-  /// pointers@endlink.
-  template<typename _Ret, typename _Tp>
-    class mem_fun_ref_t : public unary_function<_Tp, _Ret>
-    {
-    public:
-      explicit
-      mem_fun_ref_t(_Ret (_Tp::*__pf)())
-      : _M_f(__pf) { }
-
-      _Ret
-      operator()(_Tp& __r) const
-      { return (__r.*_M_f)(); }
-
-    private:
-      _Ret (_Tp::*_M_f)();
-  };
-
-  /// One of the @link memory_adaptors adaptors for member
-  /// pointers@endlink.
-  template<typename _Ret, typename _Tp>
-    class const_mem_fun_ref_t : public unary_function<_Tp, _Ret>
-    {
-    public:
-      explicit
-      const_mem_fun_ref_t(_Ret (_Tp::*__pf)() const)
-      : _M_f(__pf) { }
-
-      _Ret
-      operator()(const _Tp& __r) const
-      { return (__r.*_M_f)(); }
-
-    private:
-      _Ret (_Tp::*_M_f)() const;
-    };
-
-  /// One of the @link memory_adaptors adaptors for member
-  /// pointers@endlink.
-  template<typename _Ret, typename _Tp, typename _Arg>
-    class mem_fun1_t : public binary_function<_Tp*, _Arg, _Ret>
-    {
-    public:
-      explicit
-      mem_fun1_t(_Ret (_Tp::*__pf)(_Arg))
-      : _M_f(__pf) { }
-
-      _Ret
-      operator()(_Tp* __p, _Arg __x) const
-      { return (__p->*_M_f)(__x); }
-
-    private:
-      _Ret (_Tp::*_M_f)(_Arg);
-    };
-
-  /// One of the @link memory_adaptors adaptors for member
-  /// pointers@endlink.
-  template<typename _Ret, typename _Tp, typename _Arg>
-    class const_mem_fun1_t : public binary_function<const _Tp*, _Arg, _Ret>
-    {
-    public:
-      explicit
-      const_mem_fun1_t(_Ret (_Tp::*__pf)(_Arg) const)
-      : _M_f(__pf) { }
-
-      _Ret
-      operator()(const _Tp* __p, _Arg __x) const
-      { return (__p->*_M_f)(__x); }
-
-    private:
-      _Ret (_Tp::*_M_f)(_Arg) const;
-    };
-
-  /// One of the @link memory_adaptors adaptors for member
-  /// pointers@endlink.
-  template<typename _Ret, typename _Tp, typename _Arg>
-    class mem_fun1_ref_t : public binary_function<_Tp, _Arg, _Ret>
-    {
-    public:
-      explicit
-      mem_fun1_ref_t(_Ret (_Tp::*__pf)(_Arg))
-      : _M_f(__pf) { }
-
-      _Ret
-      operator()(_Tp& __r, _Arg __x) const
-      { return (__r.*_M_f)(__x); }
-
-    private:
-      _Ret (_Tp::*_M_f)(_Arg);
-    };
-
-  /// One of the @link memory_adaptors adaptors for member
-  /// pointers@endlink.
-  template<typename _Ret, typename _Tp, typename _Arg>
-    class const_mem_fun1_ref_t : public binary_function<_Tp, _Arg, _Ret>
-    {
-    public:
-      explicit
-      const_mem_fun1_ref_t(_Ret (_Tp::*__pf)(_Arg) const)
-      : _M_f(__pf) { }
-
-      _Ret
-      operator()(const _Tp& __r, _Arg __x) const
-      { return (__r.*_M_f)(__x); }
-
-    private:
-      _Ret (_Tp::*_M_f)(_Arg) const;
-    };
-
-  // Mem_fun adaptor helper functions.  There are only two:
-  // mem_fun and mem_fun_ref.
-  template<typename _Ret, typename _Tp>
-    inline mem_fun_t<_Ret, _Tp>
-    mem_fun(_Ret (_Tp::*__f)())
-    { return mem_fun_t<_Ret, _Tp>(__f); }
-
-  template<typename _Ret, typename _Tp>
-    inline const_mem_fun_t<_Ret, _Tp>
-    mem_fun(_Ret (_Tp::*__f)() const)
-    { return const_mem_fun_t<_Ret, _Tp>(__f); }
-
-  template<typename _Ret, typename _Tp>
-    inline mem_fun_ref_t<_Ret, _Tp>
-    mem_fun_ref(_Ret (_Tp::*__f)())
-    { return mem_fun_ref_t<_Ret, _Tp>(__f); }
-
-  template<typename _Ret, typename _Tp>
-    inline const_mem_fun_ref_t<_Ret, _Tp>
-    mem_fun_ref(_Ret (_Tp::*__f)() const)
-    { return const_mem_fun_ref_t<_Ret, _Tp>(__f); }
-
-  template<typename _Ret, typename _Tp, typename _Arg>
-    inline mem_fun1_t<_Ret, _Tp, _Arg>
-    mem_fun(_Ret (_Tp::*__f)(_Arg))
-    { return mem_fun1_t<_Ret, _Tp, _Arg>(__f); }
-
-  template<typename _Ret, typename _Tp, typename _Arg>
-    inline const_mem_fun1_t<_Ret, _Tp, _Arg>
-    mem_fun(_Ret (_Tp::*__f)(_Arg) const)
-    { return const_mem_fun1_t<_Ret, _Tp, _Arg>(__f); }
-
-  template<typename _Ret, typename _Tp, typename _Arg>
-    inline mem_fun1_ref_t<_Ret, _Tp, _Arg>
-    mem_fun_ref(_Ret (_Tp::*__f)(_Arg))
-    { return mem_fun1_ref_t<_Ret, _Tp, _Arg>(__f); }
-
-  template<typename _Ret, typename _Tp, typename _Arg>
-    inline const_mem_fun1_ref_t<_Ret, _Tp, _Arg>
-    mem_fun_ref(_Ret (_Tp::*__f)(_Arg) const)
-    { return const_mem_fun1_ref_t<_Ret, _Tp, _Arg>(__f); }
-
-  /** @}  */
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if (__cplusplus < 201103L) || _GLIBCXX_USE_DEPRECATED
-# include <backward/binders.h>
-#endif
-
-#endif /* _STL_FUNCTION_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_heap.h b/openflow/usr/include/c++/5/bits/stl_heap.h
deleted file mode 100644
index 3ab37c7..0000000
--- a/openflow/usr/include/c++/5/bits/stl_heap.h
+++ /dev/null
@@ -1,532 +0,0 @@
-// Heap implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_heap.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{queue}
- */
-
-#ifndef _STL_HEAP_H
-#define _STL_HEAP_H 1
-
-#include <debug/debug.h>
-#include <bits/move.h>
-#include <bits/predefined_ops.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup heap_algorithms Heap
-   * @ingroup sorting_algorithms
-   */
-
-  template<typename _RandomAccessIterator, typename _Distance,
-	   typename _Compare>
-    _Distance
-    __is_heap_until(_RandomAccessIterator __first, _Distance __n,
-		    _Compare __comp)
-    {
-      _Distance __parent = 0;
-      for (_Distance __child = 1; __child < __n; ++__child)
-	{
-	  if (__comp(__first + __parent, __first + __child))
-	    return __child;
-	  if ((__child & 1) == 0)
-	    ++__parent;
-	}
-      return __n;
-    }
-
-  // __is_heap, a predicate testing whether or not a range is a heap.
-  // This function is an extension, not part of the C++ standard.
-  template<typename _RandomAccessIterator, typename _Distance>
-    inline bool
-    __is_heap(_RandomAccessIterator __first, _Distance __n)
-    {
-      return std::__is_heap_until(__first, __n,
-			__gnu_cxx::__ops::__iter_less_iter()) == __n;
-    }
-
-  template<typename _RandomAccessIterator, typename _Compare,
-	   typename _Distance>
-    inline bool
-    __is_heap(_RandomAccessIterator __first, _Compare __comp, _Distance __n)
-    {
-      return std::__is_heap_until(__first, __n,
-	__gnu_cxx::__ops::__iter_comp_iter(__comp)) == __n;
-    }
-
-  template<typename _RandomAccessIterator>
-    inline bool
-    __is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    { return std::__is_heap(__first, std::distance(__first, __last)); }
-
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline bool
-    __is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	      _Compare __comp)
-    { return std::__is_heap(__first, __comp, std::distance(__first, __last)); }
-
-  // Heap-manipulation functions: push_heap, pop_heap, make_heap, sort_heap,
-  // + is_heap and is_heap_until in C++0x.
-
-  template<typename _RandomAccessIterator, typename _Distance, typename _Tp,
-	   typename _Compare>
-    void
-    __push_heap(_RandomAccessIterator __first,
-		_Distance __holeIndex, _Distance __topIndex, _Tp __value,
-		_Compare __comp)
-    {
-      _Distance __parent = (__holeIndex - 1) / 2;
-      while (__holeIndex > __topIndex && __comp(__first + __parent, __value))
-	{
-	  *(__first + __holeIndex) = _GLIBCXX_MOVE(*(__first + __parent));
-	  __holeIndex = __parent;
-	  __parent = (__holeIndex - 1) / 2;
-	}
-      *(__first + __holeIndex) = _GLIBCXX_MOVE(__value);
-    }
-
-  /**
-   *  @brief  Push an element onto a heap.
-   *  @param  __first  Start of heap.
-   *  @param  __last   End of heap + element.
-   *  @ingroup heap_algorithms
-   *
-   *  This operation pushes the element at last-1 onto the valid heap
-   *  over the range [__first,__last-1).  After completion,
-   *  [__first,__last) is a valid heap.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	  _ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	  _DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_heap(__first, __last - 1);
-
-      _ValueType __value = _GLIBCXX_MOVE(*(__last - 1));
-      std::__push_heap(__first, _DistanceType((__last - __first) - 1),
-		       _DistanceType(0), _GLIBCXX_MOVE(__value),
-		       __gnu_cxx::__ops::__iter_less_val());
-    }
-
-  /**
-   *  @brief  Push an element onto a heap using comparison functor.
-   *  @param  __first  Start of heap.
-   *  @param  __last   End of heap + element.
-   *  @param  __comp   Comparison functor.
-   *  @ingroup heap_algorithms
-   *
-   *  This operation pushes the element at __last-1 onto the valid
-   *  heap over the range [__first,__last-1).  After completion,
-   *  [__first,__last) is a valid heap.  Compare operations are
-   *  performed using comp.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	      _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	  _ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	  _DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_heap_pred(__first, __last - 1, __comp);
-
-      _ValueType __value = _GLIBCXX_MOVE(*(__last - 1));
-      std::__push_heap(__first, _DistanceType((__last - __first) - 1),
-		       _DistanceType(0), _GLIBCXX_MOVE(__value),
-		       __gnu_cxx::__ops::__iter_comp_val(__comp));
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance,
-	   typename _Tp, typename _Compare>
-    void
-    __adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
-		  _Distance __len, _Tp __value, _Compare __comp)
-    {
-      const _Distance __topIndex = __holeIndex;
-      _Distance __secondChild = __holeIndex;
-      while (__secondChild < (__len - 1) / 2)
-	{
-	  __secondChild = 2 * (__secondChild + 1);
-	  if (__comp(__first + __secondChild,
-		     __first + (__secondChild - 1)))
-	    __secondChild--;
-	  *(__first + __holeIndex) = _GLIBCXX_MOVE(*(__first + __secondChild));
-	  __holeIndex = __secondChild;
-	}
-      if ((__len & 1) == 0 && __secondChild == (__len - 2) / 2)
-	{
-	  __secondChild = 2 * (__secondChild + 1);
-	  *(__first + __holeIndex) = _GLIBCXX_MOVE(*(__first
-						     + (__secondChild - 1)));
-	  __holeIndex = __secondChild - 1;
-	}
-      std::__push_heap(__first, __holeIndex, __topIndex, 
-		       _GLIBCXX_MOVE(__value),
-		       __gnu_cxx::__ops::__iter_comp_val(__comp));
-    }
-
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    __pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	       _RandomAccessIterator __result, _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType;
-
-      _ValueType __value = _GLIBCXX_MOVE(*__result);
-      *__result = _GLIBCXX_MOVE(*__first);
-      std::__adjust_heap(__first, _DistanceType(0),
-			 _DistanceType(__last - __first),
-			 _GLIBCXX_MOVE(__value), __comp);
-    }
-
-  /**
-   *  @brief  Pop an element off a heap.
-   *  @param  __first  Start of heap.
-   *  @param  __last   End of heap.
-   *  @pre    [__first, __last) is a valid, non-empty range.
-   *  @ingroup heap_algorithms
-   *
-   *  This operation pops the top of the heap.  The elements __first
-   *  and __last-1 are swapped and [__first,__last-1) is made into a
-   *  heap.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
-      __glibcxx_requires_non_empty_range(__first, __last);
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_heap(__first, __last);
-
-      if (__last - __first > 1)
-	{
-	  --__last;
-	  std::__pop_heap(__first, __last, __last,
-			  __gnu_cxx::__ops::__iter_less_iter());
-	}
-    }
-
-  /**
-   *  @brief  Pop an element off a heap using comparison functor.
-   *  @param  __first  Start of heap.
-   *  @param  __last   End of heap.
-   *  @param  __comp   Comparison functor to use.
-   *  @ingroup heap_algorithms
-   *
-   *  This operation pops the top of the heap.  The elements __first
-   *  and __last-1 are swapped and [__first,__last-1) is made into a
-   *  heap.  Comparisons are made using comp.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    pop_heap(_RandomAccessIterator __first,
-	     _RandomAccessIterator __last, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_non_empty_range(__first, __last);
-      __glibcxx_requires_heap_pred(__first, __last, __comp);
-
-      if (__last - __first > 1)
-	{
-	  --__last;
-	  std::__pop_heap(__first, __last, __last,
-			  __gnu_cxx::__ops::__iter_comp_iter(__comp));
-	}
-    }
-
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    __make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-		_Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	  _ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	  _DistanceType;
-
-      if (__last - __first < 2)
-	return;
-
-      const _DistanceType __len = __last - __first;
-      _DistanceType __parent = (__len - 2) / 2;
-      while (true)
-	{
-	  _ValueType __value = _GLIBCXX_MOVE(*(__first + __parent));
-	  std::__adjust_heap(__first, __parent, __len, _GLIBCXX_MOVE(__value),
-			     __comp);
-	  if (__parent == 0)
-	    return;
-	  __parent--;
-	}
-    }
-  
-  /**
-   *  @brief  Construct a heap over a range.
-   *  @param  __first  Start of heap.
-   *  @param  __last   End of heap.
-   *  @ingroup heap_algorithms
-   *
-   *  This operation makes the elements in [__first,__last) into a heap.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      std::__make_heap(__first, __last,
-		       __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Construct a heap over a range using comparison functor.
-   *  @param  __first  Start of heap.
-   *  @param  __last   End of heap.
-   *  @param  __comp   Comparison functor to use.
-   *  @ingroup heap_algorithms
-   *
-   *  This operation makes the elements in [__first,__last) into a heap.
-   *  Comparisons are made using __comp.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	      _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      std::__make_heap(__first, __last,
-		       __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    __sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-		_Compare __comp)
-    {
-      while (__last - __first > 1)
-	{
-	  --__last;
-	  std::__pop_heap(__first, __last, __last, __comp);
-	}
-    }
-
-  /**
-   *  @brief  Sort a heap.
-   *  @param  __first  Start of heap.
-   *  @param  __last   End of heap.
-   *  @ingroup heap_algorithms
-   *
-   *  This operation sorts the valid heap in the range [__first,__last).
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_heap(__first, __last);
-
-      std::__sort_heap(__first, __last,
-		       __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Sort a heap using comparison functor.
-   *  @param  __first  Start of heap.
-   *  @param  __last   End of heap.
-   *  @param  __comp   Comparison functor to use.
-   *  @ingroup heap_algorithms
-   *
-   *  This operation sorts the valid heap in the range [__first,__last).
-   *  Comparisons are made using __comp.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	      _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_heap_pred(__first, __last, __comp);
-
-      std::__sort_heap(__first, __last,
-		       __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-#if __cplusplus >= 201103L
-  /**
-   *  @brief  Search the end of a heap.
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @return  An iterator pointing to the first element not in the heap.
-   *  @ingroup heap_algorithms
-   *
-   *  This operation returns the last iterator i in [__first, __last) for which
-   *  the range [__first, i) is a heap.
-  */
-  template<typename _RandomAccessIterator>
-    inline _RandomAccessIterator
-    is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return __first + 
-	std::__is_heap_until(__first, std::distance(__first, __last),
-			     __gnu_cxx::__ops::__iter_less_iter());
-    }
-
-  /**
-   *  @brief  Search the end of a heap using comparison functor.
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @param  __comp   Comparison functor to use.
-   *  @return  An iterator pointing to the first element not in the heap.
-   *  @ingroup heap_algorithms
-   *
-   *  This operation returns the last iterator i in [__first, __last) for which
-   *  the range [__first, i) is a heap.  Comparisons are made using __comp.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline _RandomAccessIterator
-    is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last,
-		  _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return __first
-	+ std::__is_heap_until(__first, std::distance(__first, __last),
-			       __gnu_cxx::__ops::__iter_comp_iter(__comp));
-    }
-
-  /**
-   *  @brief  Determines whether a range is a heap.
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @return  True if range is a heap, false otherwise.
-   *  @ingroup heap_algorithms
-  */
-  template<typename _RandomAccessIterator>
-    inline bool
-    is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    { return std::is_heap_until(__first, __last) == __last; }
-
-  /**
-   *  @brief  Determines whether a range is a heap using comparison functor.
-   *  @param  __first  Start of range.
-   *  @param  __last   End of range.
-   *  @param  __comp   Comparison functor to use.
-   *  @return  True if range is a heap, false otherwise.
-   *  @ingroup heap_algorithms
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline bool
-    is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	    _Compare __comp)
-    { return std::is_heap_until(__first, __last, __comp) == __last; }
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _STL_HEAP_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_iterator.h b/openflow/usr/include/c++/5/bits/stl_iterator.h
deleted file mode 100644
index 7b5872e..0000000
--- a/openflow/usr/include/c++/5/bits/stl_iterator.h
+++ /dev/null
@@ -1,1182 +0,0 @@
-// Iterators -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_iterator.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iterator}
- *
- *  This file implements reverse_iterator, back_insert_iterator,
- *  front_insert_iterator, insert_iterator, __normal_iterator, and their
- *  supporting functions and overloaded operators.
- */
-
-#ifndef _STL_ITERATOR_H
-#define _STL_ITERATOR_H 1
-
-#include <bits/cpp_type_traits.h>
-#include <ext/type_traits.h>
-#include <bits/move.h>
-#include <bits/ptr_traits.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup iterators
-   * @{
-   */
-
-  // 24.4.1 Reverse iterators
-  /**
-   *  Bidirectional and random access iterators have corresponding reverse
-   *  %iterator adaptors that iterate through the data structure in the
-   *  opposite direction.  They have the same signatures as the corresponding
-   *  iterators.  The fundamental relation between a reverse %iterator and its
-   *  corresponding %iterator @c i is established by the identity:
-   *  @code
-   *      &*(reverse_iterator(i)) == &*(i - 1)
-   *  @endcode
-   *
-   *  <em>This mapping is dictated by the fact that while there is always a
-   *  pointer past the end of an array, there might not be a valid pointer
-   *  before the beginning of an array.</em> [24.4.1]/1,2
-   *
-   *  Reverse iterators can be tricky and surprising at first.  Their
-   *  semantics make sense, however, and the trickiness is a side effect of
-   *  the requirement that the iterators must be safe.
-  */
-  template<typename _Iterator>
-    class reverse_iterator
-    : public iterator<typename iterator_traits<_Iterator>::iterator_category,
-		      typename iterator_traits<_Iterator>::value_type,
-		      typename iterator_traits<_Iterator>::difference_type,
-		      typename iterator_traits<_Iterator>::pointer,
-                      typename iterator_traits<_Iterator>::reference>
-    {
-    protected:
-      _Iterator current;
-
-      typedef iterator_traits<_Iterator>		__traits_type;
-
-    public:
-      typedef _Iterator					iterator_type;
-      typedef typename __traits_type::difference_type	difference_type;
-      typedef typename __traits_type::pointer		pointer;
-      typedef typename __traits_type::reference		reference;
-
-      /**
-       *  The default constructor value-initializes member @p current.
-       *  If it is a pointer, that means it is zero-initialized.
-      */
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 235 No specification of default ctor for reverse_iterator
-      reverse_iterator() : current() { }
-
-      /**
-       *  This %iterator will move in the opposite direction that @p x does.
-      */
-      explicit
-      reverse_iterator(iterator_type __x) : current(__x) { }
-
-      /**
-       *  The copy constructor is normal.
-      */
-      reverse_iterator(const reverse_iterator& __x)
-      : current(__x.current) { }
-
-      /**
-       *  A %reverse_iterator across other types can be copied if the
-       *  underlying %iterator can be converted to the type of @c current.
-      */
-      template<typename _Iter>
-        reverse_iterator(const reverse_iterator<_Iter>& __x)
-	: current(__x.base()) { }
-
-      /**
-       *  @return  @c current, the %iterator used for underlying work.
-      */
-      iterator_type
-      base() const
-      { return current; }
-
-      /**
-       *  @return  A reference to the value at @c --current
-       *
-       *  This requires that @c --current is dereferenceable.
-       *
-       *  @warning This implementation requires that for an iterator of the
-       *           underlying iterator type, @c x, a reference obtained by
-       *           @c *x remains valid after @c x has been modified or
-       *           destroyed. This is a bug: http://gcc.gnu.org/PR51823
-      */
-      reference
-      operator*() const
-      {
-	_Iterator __tmp = current;
-	return *--__tmp;
-      }
-
-      /**
-       *  @return  A pointer to the value at @c --current
-       *
-       *  This requires that @c --current is dereferenceable.
-      */
-      pointer
-      operator->() const
-      { return &(operator*()); }
-
-      /**
-       *  @return  @c *this
-       *
-       *  Decrements the underlying iterator.
-      */
-      reverse_iterator&
-      operator++()
-      {
-	--current;
-	return *this;
-      }
-
-      /**
-       *  @return  The original value of @c *this
-       *
-       *  Decrements the underlying iterator.
-      */
-      reverse_iterator
-      operator++(int)
-      {
-	reverse_iterator __tmp = *this;
-	--current;
-	return __tmp;
-      }
-
-      /**
-       *  @return  @c *this
-       *
-       *  Increments the underlying iterator.
-      */
-      reverse_iterator&
-      operator--()
-      {
-	++current;
-	return *this;
-      }
-
-      /**
-       *  @return  A reverse_iterator with the previous value of @c *this
-       *
-       *  Increments the underlying iterator.
-      */
-      reverse_iterator
-      operator--(int)
-      {
-	reverse_iterator __tmp = *this;
-	++current;
-	return __tmp;
-      }
-
-      /**
-       *  @return  A reverse_iterator that refers to @c current - @a __n
-       *
-       *  The underlying iterator must be a Random Access Iterator.
-      */
-      reverse_iterator
-      operator+(difference_type __n) const
-      { return reverse_iterator(current - __n); }
-
-      /**
-       *  @return  *this
-       *
-       *  Moves the underlying iterator backwards @a __n steps.
-       *  The underlying iterator must be a Random Access Iterator.
-      */
-      reverse_iterator&
-      operator+=(difference_type __n)
-      {
-	current -= __n;
-	return *this;
-      }
-
-      /**
-       *  @return  A reverse_iterator that refers to @c current - @a __n
-       *
-       *  The underlying iterator must be a Random Access Iterator.
-      */
-      reverse_iterator
-      operator-(difference_type __n) const
-      { return reverse_iterator(current + __n); }
-
-      /**
-       *  @return  *this
-       *
-       *  Moves the underlying iterator forwards @a __n steps.
-       *  The underlying iterator must be a Random Access Iterator.
-      */
-      reverse_iterator&
-      operator-=(difference_type __n)
-      {
-	current += __n;
-	return *this;
-      }
-
-      /**
-       *  @return  The value at @c current - @a __n - 1
-       *
-       *  The underlying iterator must be a Random Access Iterator.
-      */
-      reference
-      operator[](difference_type __n) const
-      { return *(*this + __n); }
-    };
-
-  //@{
-  /**
-   *  @param  __x  A %reverse_iterator.
-   *  @param  __y  A %reverse_iterator.
-   *  @return  A simple bool.
-   *
-   *  Reverse iterators forward many operations to their underlying base()
-   *  iterators.  Others are implemented in terms of one another.
-   *
-  */
-  template<typename _Iterator>
-    inline bool
-    operator==(const reverse_iterator<_Iterator>& __x,
-	       const reverse_iterator<_Iterator>& __y)
-    { return __x.base() == __y.base(); }
-
-  template<typename _Iterator>
-    inline bool
-    operator<(const reverse_iterator<_Iterator>& __x,
-	      const reverse_iterator<_Iterator>& __y)
-    { return __y.base() < __x.base(); }
-
-  template<typename _Iterator>
-    inline bool
-    operator!=(const reverse_iterator<_Iterator>& __x,
-	       const reverse_iterator<_Iterator>& __y)
-    { return !(__x == __y); }
-
-  template<typename _Iterator>
-    inline bool
-    operator>(const reverse_iterator<_Iterator>& __x,
-	      const reverse_iterator<_Iterator>& __y)
-    { return __y < __x; }
-
-  template<typename _Iterator>
-    inline bool
-    operator<=(const reverse_iterator<_Iterator>& __x,
-	       const reverse_iterator<_Iterator>& __y)
-    { return !(__y < __x); }
-
-  template<typename _Iterator>
-    inline bool
-    operator>=(const reverse_iterator<_Iterator>& __x,
-	       const reverse_iterator<_Iterator>& __y)
-    { return !(__x < __y); }
-
-  template<typename _Iterator>
-    inline typename reverse_iterator<_Iterator>::difference_type
-    operator-(const reverse_iterator<_Iterator>& __x,
-	      const reverse_iterator<_Iterator>& __y)
-    { return __y.base() - __x.base(); }
-
-  template<typename _Iterator>
-    inline reverse_iterator<_Iterator>
-    operator+(typename reverse_iterator<_Iterator>::difference_type __n,
-	      const reverse_iterator<_Iterator>& __x)
-    { return reverse_iterator<_Iterator>(__x.base() - __n); }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // DR 280. Comparison of reverse_iterator to const reverse_iterator.
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator==(const reverse_iterator<_IteratorL>& __x,
-	       const reverse_iterator<_IteratorR>& __y)
-    { return __x.base() == __y.base(); }
-
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator<(const reverse_iterator<_IteratorL>& __x,
-	      const reverse_iterator<_IteratorR>& __y)
-    { return __y.base() < __x.base(); }
-
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator!=(const reverse_iterator<_IteratorL>& __x,
-	       const reverse_iterator<_IteratorR>& __y)
-    { return !(__x == __y); }
-
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator>(const reverse_iterator<_IteratorL>& __x,
-	      const reverse_iterator<_IteratorR>& __y)
-    { return __y < __x; }
-
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator<=(const reverse_iterator<_IteratorL>& __x,
-	       const reverse_iterator<_IteratorR>& __y)
-    { return !(__y < __x); }
-
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator>=(const reverse_iterator<_IteratorL>& __x,
-	       const reverse_iterator<_IteratorR>& __y)
-    { return !(__x < __y); }
-
-  template<typename _IteratorL, typename _IteratorR>
-#if __cplusplus >= 201103L
-    // DR 685.
-    inline auto
-    operator-(const reverse_iterator<_IteratorL>& __x,
-	      const reverse_iterator<_IteratorR>& __y)
-    -> decltype(__y.base() - __x.base())
-#else
-    inline typename reverse_iterator<_IteratorL>::difference_type
-    operator-(const reverse_iterator<_IteratorL>& __x,
-	      const reverse_iterator<_IteratorR>& __y)
-#endif
-    { return __y.base() - __x.base(); }
-  //@}
-
-#if __cplusplus > 201103L
-#define __cpp_lib_make_reverse_iterator 201402
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // DR 2285. make_reverse_iterator
-  /// Generator function for reverse_iterator.
-  template<typename _Iterator>
-    inline reverse_iterator<_Iterator>
-    make_reverse_iterator(_Iterator __i)
-    { return reverse_iterator<_Iterator>(__i); }
-#endif
-
-  // 24.4.2.2.1 back_insert_iterator
-  /**
-   *  @brief  Turns assignment into insertion.
-   *
-   *  These are output iterators, constructed from a container-of-T.
-   *  Assigning a T to the iterator appends it to the container using
-   *  push_back.
-   *
-   *  Tip:  Using the back_inserter function to create these iterators can
-   *  save typing.
-  */
-  template<typename _Container>
-    class back_insert_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    protected:
-      _Container* container;
-
-    public:
-      /// A nested typedef for the type of whatever container you used.
-      typedef _Container          container_type;
-
-      /// The only way to create this %iterator is with a container.
-      explicit
-      back_insert_iterator(_Container& __x) : container(&__x) { }
-
-      /**
-       *  @param  __value  An instance of whatever type
-       *                 container_type::const_reference is; presumably a
-       *                 reference-to-const T for container<T>.
-       *  @return  This %iterator, for chained operations.
-       *
-       *  This kind of %iterator doesn't really have a @a position in the
-       *  container (you can think of the position as being permanently at
-       *  the end, if you like).  Assigning a value to the %iterator will
-       *  always append the value to the end of the container.
-      */
-#if __cplusplus < 201103L
-      back_insert_iterator&
-      operator=(typename _Container::const_reference __value)
-      {
-	container->push_back(__value);
-	return *this;
-      }
-#else
-      back_insert_iterator&
-      operator=(const typename _Container::value_type& __value)
-      {
-	container->push_back(__value);
-	return *this;
-      }
-
-      back_insert_iterator&
-      operator=(typename _Container::value_type&& __value)
-      {
-	container->push_back(std::move(__value));
-	return *this;
-      }
-#endif
-
-      /// Simply returns *this.
-      back_insert_iterator&
-      operator*()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not @a move.)
-      back_insert_iterator&
-      operator++()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not @a move.)
-      back_insert_iterator
-      operator++(int)
-      { return *this; }
-    };
-
-  /**
-   *  @param  __x  A container of arbitrary type.
-   *  @return  An instance of back_insert_iterator working on @p __x.
-   *
-   *  This wrapper function helps in creating back_insert_iterator instances.
-   *  Typing the name of the %iterator requires knowing the precise full
-   *  type of the container, which can be tedious and impedes generic
-   *  programming.  Using this function lets you take advantage of automatic
-   *  template parameter deduction, making the compiler match the correct
-   *  types for you.
-  */
-  template<typename _Container>
-    inline back_insert_iterator<_Container>
-    back_inserter(_Container& __x)
-    { return back_insert_iterator<_Container>(__x); }
-
-  /**
-   *  @brief  Turns assignment into insertion.
-   *
-   *  These are output iterators, constructed from a container-of-T.
-   *  Assigning a T to the iterator prepends it to the container using
-   *  push_front.
-   *
-   *  Tip:  Using the front_inserter function to create these iterators can
-   *  save typing.
-  */
-  template<typename _Container>
-    class front_insert_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    protected:
-      _Container* container;
-
-    public:
-      /// A nested typedef for the type of whatever container you used.
-      typedef _Container          container_type;
-
-      /// The only way to create this %iterator is with a container.
-      explicit front_insert_iterator(_Container& __x) : container(&__x) { }
-
-      /**
-       *  @param  __value  An instance of whatever type
-       *                 container_type::const_reference is; presumably a
-       *                 reference-to-const T for container<T>.
-       *  @return  This %iterator, for chained operations.
-       *
-       *  This kind of %iterator doesn't really have a @a position in the
-       *  container (you can think of the position as being permanently at
-       *  the front, if you like).  Assigning a value to the %iterator will
-       *  always prepend the value to the front of the container.
-      */
-#if __cplusplus < 201103L
-      front_insert_iterator&
-      operator=(typename _Container::const_reference __value)
-      {
-	container->push_front(__value);
-	return *this;
-      }
-#else
-      front_insert_iterator&
-      operator=(const typename _Container::value_type& __value)
-      {
-	container->push_front(__value);
-	return *this;
-      }
-
-      front_insert_iterator&
-      operator=(typename _Container::value_type&& __value)
-      {
-	container->push_front(std::move(__value));
-	return *this;
-      }
-#endif
-
-      /// Simply returns *this.
-      front_insert_iterator&
-      operator*()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not @a move.)
-      front_insert_iterator&
-      operator++()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not @a move.)
-      front_insert_iterator
-      operator++(int)
-      { return *this; }
-    };
-
-  /**
-   *  @param  __x  A container of arbitrary type.
-   *  @return  An instance of front_insert_iterator working on @p x.
-   *
-   *  This wrapper function helps in creating front_insert_iterator instances.
-   *  Typing the name of the %iterator requires knowing the precise full
-   *  type of the container, which can be tedious and impedes generic
-   *  programming.  Using this function lets you take advantage of automatic
-   *  template parameter deduction, making the compiler match the correct
-   *  types for you.
-  */
-  template<typename _Container>
-    inline front_insert_iterator<_Container>
-    front_inserter(_Container& __x)
-    { return front_insert_iterator<_Container>(__x); }
-
-  /**
-   *  @brief  Turns assignment into insertion.
-   *
-   *  These are output iterators, constructed from a container-of-T.
-   *  Assigning a T to the iterator inserts it in the container at the
-   *  %iterator's position, rather than overwriting the value at that
-   *  position.
-   *
-   *  (Sequences will actually insert a @e copy of the value before the
-   *  %iterator's position.)
-   *
-   *  Tip:  Using the inserter function to create these iterators can
-   *  save typing.
-  */
-  template<typename _Container>
-    class insert_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    protected:
-      _Container* container;
-      typename _Container::iterator iter;
-
-    public:
-      /// A nested typedef for the type of whatever container you used.
-      typedef _Container          container_type;
-
-      /**
-       *  The only way to create this %iterator is with a container and an
-       *  initial position (a normal %iterator into the container).
-      */
-      insert_iterator(_Container& __x, typename _Container::iterator __i)
-      : container(&__x), iter(__i) {}
-
-      /**
-       *  @param  __value  An instance of whatever type
-       *                 container_type::const_reference is; presumably a
-       *                 reference-to-const T for container<T>.
-       *  @return  This %iterator, for chained operations.
-       *
-       *  This kind of %iterator maintains its own position in the
-       *  container.  Assigning a value to the %iterator will insert the
-       *  value into the container at the place before the %iterator.
-       *
-       *  The position is maintained such that subsequent assignments will
-       *  insert values immediately after one another.  For example,
-       *  @code
-       *     // vector v contains A and Z
-       *
-       *     insert_iterator i (v, ++v.begin());
-       *     i = 1;
-       *     i = 2;
-       *     i = 3;
-       *
-       *     // vector v contains A, 1, 2, 3, and Z
-       *  @endcode
-      */
-#if __cplusplus < 201103L
-      insert_iterator&
-      operator=(typename _Container::const_reference __value)
-      {
-	iter = container->insert(iter, __value);
-	++iter;
-	return *this;
-      }
-#else
-      insert_iterator&
-      operator=(const typename _Container::value_type& __value)
-      {
-	iter = container->insert(iter, __value);
-	++iter;
-	return *this;
-      }
-
-      insert_iterator&
-      operator=(typename _Container::value_type&& __value)
-      {
-	iter = container->insert(iter, std::move(__value));
-	++iter;
-	return *this;
-      }
-#endif
-
-      /// Simply returns *this.
-      insert_iterator&
-      operator*()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not @a move.)
-      insert_iterator&
-      operator++()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not @a move.)
-      insert_iterator&
-      operator++(int)
-      { return *this; }
-    };
-
-  /**
-   *  @param __x  A container of arbitrary type.
-   *  @return  An instance of insert_iterator working on @p __x.
-   *
-   *  This wrapper function helps in creating insert_iterator instances.
-   *  Typing the name of the %iterator requires knowing the precise full
-   *  type of the container, which can be tedious and impedes generic
-   *  programming.  Using this function lets you take advantage of automatic
-   *  template parameter deduction, making the compiler match the correct
-   *  types for you.
-  */
-  template<typename _Container, typename _Iterator>
-    inline insert_iterator<_Container>
-    inserter(_Container& __x, _Iterator __i)
-    {
-      return insert_iterator<_Container>(__x,
-					 typename _Container::iterator(__i));
-    }
-
-  // @} group iterators
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // This iterator adapter is @a normal in the sense that it does not
-  // change the semantics of any of the operators of its iterator
-  // parameter.  Its primary purpose is to convert an iterator that is
-  // not a class, e.g. a pointer, into an iterator that is a class.
-  // The _Container parameter exists solely so that different containers
-  // using this template can instantiate different types, even if the
-  // _Iterator parameter is the same.
-  using std::iterator_traits;
-  using std::iterator;
-  template<typename _Iterator, typename _Container>
-    class __normal_iterator
-    {
-    protected:
-      _Iterator _M_current;
-
-      typedef iterator_traits<_Iterator>		__traits_type;
-
-    public:
-      typedef _Iterator					iterator_type;
-      typedef typename __traits_type::iterator_category iterator_category;
-      typedef typename __traits_type::value_type  	value_type;
-      typedef typename __traits_type::difference_type 	difference_type;
-      typedef typename __traits_type::reference 	reference;
-      typedef typename __traits_type::pointer   	pointer;
-
-      _GLIBCXX_CONSTEXPR __normal_iterator() _GLIBCXX_NOEXCEPT
-      : _M_current(_Iterator()) { }
-
-      explicit
-      __normal_iterator(const _Iterator& __i) _GLIBCXX_NOEXCEPT
-      : _M_current(__i) { }
-
-      // Allow iterator to const_iterator conversion
-      template<typename _Iter>
-        __normal_iterator(const __normal_iterator<_Iter,
-			  typename __enable_if<
-      	       (std::__are_same<_Iter, typename _Container::pointer>::__value),
-		      _Container>::__type>& __i) _GLIBCXX_NOEXCEPT
-        : _M_current(__i.base()) { }
-
-      // Forward iterator requirements
-      reference
-      operator*() const _GLIBCXX_NOEXCEPT
-      { return *_M_current; }
-
-      pointer
-      operator->() const _GLIBCXX_NOEXCEPT
-      { return _M_current; }
-
-      __normal_iterator&
-      operator++() _GLIBCXX_NOEXCEPT
-      {
-	++_M_current;
-	return *this;
-      }
-
-      __normal_iterator
-      operator++(int) _GLIBCXX_NOEXCEPT
-      { return __normal_iterator(_M_current++); }
-
-      // Bidirectional iterator requirements
-      __normal_iterator&
-      operator--() _GLIBCXX_NOEXCEPT
-      {
-	--_M_current;
-	return *this;
-      }
-
-      __normal_iterator
-      operator--(int) _GLIBCXX_NOEXCEPT
-      { return __normal_iterator(_M_current--); }
-
-      // Random access iterator requirements
-      reference
-      operator[](difference_type __n) const _GLIBCXX_NOEXCEPT
-      { return _M_current[__n]; }
-
-      __normal_iterator&
-      operator+=(difference_type __n) _GLIBCXX_NOEXCEPT
-      { _M_current += __n; return *this; }
-
-      __normal_iterator
-      operator+(difference_type __n) const _GLIBCXX_NOEXCEPT
-      { return __normal_iterator(_M_current + __n); }
-
-      __normal_iterator&
-      operator-=(difference_type __n) _GLIBCXX_NOEXCEPT
-      { _M_current -= __n; return *this; }
-
-      __normal_iterator
-      operator-(difference_type __n) const _GLIBCXX_NOEXCEPT
-      { return __normal_iterator(_M_current - __n); }
-
-      const _Iterator&
-      base() const _GLIBCXX_NOEXCEPT
-      { return _M_current; }
-    };
-
-  // Note: In what follows, the left- and right-hand-side iterators are
-  // allowed to vary in types (conceptually in cv-qualification) so that
-  // comparison between cv-qualified and non-cv-qualified iterators be
-  // valid.  However, the greedy and unfriendly operators in std::rel_ops
-  // will make overload resolution ambiguous (when in scope) if we don't
-  // provide overloads whose operands are of the same type.  Can someone
-  // remind me what generic programming is about? -- Gaby
-
-  // Forward iterator requirements
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator==(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	       const __normal_iterator<_IteratorR, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() == __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator==(const __normal_iterator<_Iterator, _Container>& __lhs,
-	       const __normal_iterator<_Iterator, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() == __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator!=(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	       const __normal_iterator<_IteratorR, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() != __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator!=(const __normal_iterator<_Iterator, _Container>& __lhs,
-	       const __normal_iterator<_Iterator, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() != __rhs.base(); }
-
-  // Random access iterator requirements
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator<(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	      const __normal_iterator<_IteratorR, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() < __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator<(const __normal_iterator<_Iterator, _Container>& __lhs,
-	      const __normal_iterator<_Iterator, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() < __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator>(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	      const __normal_iterator<_IteratorR, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() > __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator>(const __normal_iterator<_Iterator, _Container>& __lhs,
-	      const __normal_iterator<_Iterator, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() > __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator<=(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	       const __normal_iterator<_IteratorR, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() <= __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator<=(const __normal_iterator<_Iterator, _Container>& __lhs,
-	       const __normal_iterator<_Iterator, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() <= __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator>=(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	       const __normal_iterator<_IteratorR, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() >= __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator>=(const __normal_iterator<_Iterator, _Container>& __lhs,
-	       const __normal_iterator<_Iterator, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() >= __rhs.base(); }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // According to the resolution of DR179 not only the various comparison
-  // operators but also operator- must accept mixed iterator/const_iterator
-  // parameters.
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-#if __cplusplus >= 201103L
-    // DR 685.
-    inline auto
-    operator-(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	      const __normal_iterator<_IteratorR, _Container>& __rhs) noexcept
-    -> decltype(__lhs.base() - __rhs.base())
-#else
-    inline typename __normal_iterator<_IteratorL, _Container>::difference_type
-    operator-(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	      const __normal_iterator<_IteratorR, _Container>& __rhs)
-#endif
-    { return __lhs.base() - __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline typename __normal_iterator<_Iterator, _Container>::difference_type
-    operator-(const __normal_iterator<_Iterator, _Container>& __lhs,
-	      const __normal_iterator<_Iterator, _Container>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() - __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline __normal_iterator<_Iterator, _Container>
-    operator+(typename __normal_iterator<_Iterator, _Container>::difference_type
-	      __n, const __normal_iterator<_Iterator, _Container>& __i)
-    _GLIBCXX_NOEXCEPT
-    { return __normal_iterator<_Iterator, _Container>(__i.base() + __n); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if __cplusplus >= 201103L
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup iterators
-   * @{
-   */
-
-  // 24.4.3  Move iterators
-  /**
-   *  Class template move_iterator is an iterator adapter with the same
-   *  behavior as the underlying iterator except that its dereference
-   *  operator implicitly converts the value returned by the underlying
-   *  iterator's dereference operator to an rvalue reference.  Some
-   *  generic algorithms can be called with move iterators to replace
-   *  copying with moving.
-   */
-  template<typename _Iterator>
-    class move_iterator
-    {
-    protected:
-      _Iterator _M_current;
-
-      typedef iterator_traits<_Iterator>		__traits_type;
-      typedef typename __traits_type::reference		__base_ref;
-
-    public:
-      typedef _Iterator					iterator_type;
-      typedef typename __traits_type::iterator_category iterator_category;
-      typedef typename __traits_type::value_type  	value_type;
-      typedef typename __traits_type::difference_type	difference_type;
-      // NB: DR 680.
-      typedef _Iterator					pointer;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2106. move_iterator wrapping iterators returning prvalues
-      typedef typename conditional<is_reference<__base_ref>::value,
-			 typename remove_reference<__base_ref>::type&&,
-			 __base_ref>::type		reference;
-
-      move_iterator()
-      : _M_current() { }
-
-      explicit
-      move_iterator(iterator_type __i)
-      : _M_current(__i) { }
-
-      template<typename _Iter>
-	move_iterator(const move_iterator<_Iter>& __i)
-	: _M_current(__i.base()) { }
-
-      iterator_type
-      base() const
-      { return _M_current; }
-
-      reference
-      operator*() const
-      { return static_cast<reference>(*_M_current); }
-
-      pointer
-      operator->() const
-      { return _M_current; }
-
-      move_iterator&
-      operator++()
-      {
-	++_M_current;
-	return *this;
-      }
-
-      move_iterator
-      operator++(int)
-      {
-	move_iterator __tmp = *this;
-	++_M_current;
-	return __tmp;
-      }
-
-      move_iterator&
-      operator--()
-      {
-	--_M_current;
-	return *this;
-      }
-
-      move_iterator
-      operator--(int)
-      {
-	move_iterator __tmp = *this;
-	--_M_current;
-	return __tmp;
-      }
-
-      move_iterator
-      operator+(difference_type __n) const
-      { return move_iterator(_M_current + __n); }
-
-      move_iterator&
-      operator+=(difference_type __n)
-      {
-	_M_current += __n;
-	return *this;
-      }
-
-      move_iterator
-      operator-(difference_type __n) const
-      { return move_iterator(_M_current - __n); }
-    
-      move_iterator&
-      operator-=(difference_type __n)
-      { 
-	_M_current -= __n;
-	return *this;
-      }
-
-      reference
-      operator[](difference_type __n) const
-      { return std::move(_M_current[__n]); }
-    };
-
-  // Note: See __normal_iterator operators note from Gaby to understand
-  // why there are always 2 versions for most of the move_iterator
-  // operators.
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator==(const move_iterator<_IteratorL>& __x,
-	       const move_iterator<_IteratorR>& __y)
-    { return __x.base() == __y.base(); }
-
-  template<typename _Iterator>
-    inline bool
-    operator==(const move_iterator<_Iterator>& __x,
-	       const move_iterator<_Iterator>& __y)
-    { return __x.base() == __y.base(); }
-
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator!=(const move_iterator<_IteratorL>& __x,
-	       const move_iterator<_IteratorR>& __y)
-    { return !(__x == __y); }
-
-  template<typename _Iterator>
-    inline bool
-    operator!=(const move_iterator<_Iterator>& __x,
-	       const move_iterator<_Iterator>& __y)
-    { return !(__x == __y); }
-
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator<(const move_iterator<_IteratorL>& __x,
-	      const move_iterator<_IteratorR>& __y)
-    { return __x.base() < __y.base(); }
-
-  template<typename _Iterator>
-    inline bool
-    operator<(const move_iterator<_Iterator>& __x,
-	      const move_iterator<_Iterator>& __y)
-    { return __x.base() < __y.base(); }
-
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator<=(const move_iterator<_IteratorL>& __x,
-	       const move_iterator<_IteratorR>& __y)
-    { return !(__y < __x); }
-
-  template<typename _Iterator>
-    inline bool
-    operator<=(const move_iterator<_Iterator>& __x,
-	       const move_iterator<_Iterator>& __y)
-    { return !(__y < __x); }
-
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator>(const move_iterator<_IteratorL>& __x,
-	      const move_iterator<_IteratorR>& __y)
-    { return __y < __x; }
-
-  template<typename _Iterator>
-    inline bool
-    operator>(const move_iterator<_Iterator>& __x,
-	      const move_iterator<_Iterator>& __y)
-    { return __y < __x; }
-
-  template<typename _IteratorL, typename _IteratorR>
-    inline bool
-    operator>=(const move_iterator<_IteratorL>& __x,
-	       const move_iterator<_IteratorR>& __y)
-    { return !(__x < __y); }
-
-  template<typename _Iterator>
-    inline bool
-    operator>=(const move_iterator<_Iterator>& __x,
-	       const move_iterator<_Iterator>& __y)
-    { return !(__x < __y); }
-
-  // DR 685.
-  template<typename _IteratorL, typename _IteratorR>
-    inline auto
-    operator-(const move_iterator<_IteratorL>& __x,
-	      const move_iterator<_IteratorR>& __y)
-    -> decltype(__x.base() - __y.base())
-    { return __x.base() - __y.base(); }
-
-  template<typename _Iterator>
-    inline auto
-    operator-(const move_iterator<_Iterator>& __x,
-	      const move_iterator<_Iterator>& __y)
-    -> decltype(__x.base() - __y.base())
-    { return __x.base() - __y.base(); }
-
-  template<typename _Iterator>
-    inline move_iterator<_Iterator>
-    operator+(typename move_iterator<_Iterator>::difference_type __n,
-	      const move_iterator<_Iterator>& __x)
-    { return __x + __n; }
-
-  template<typename _Iterator>
-    inline move_iterator<_Iterator>
-    make_move_iterator(_Iterator __i)
-    { return move_iterator<_Iterator>(__i); }
-
-  template<typename _Iterator, typename _ReturnType
-    = typename conditional<__move_if_noexcept_cond
-      <typename iterator_traits<_Iterator>::value_type>::value,
-                _Iterator, move_iterator<_Iterator>>::type>
-    inline _ReturnType
-    __make_move_if_noexcept_iterator(_Iterator __i)
-    { return _ReturnType(__i); }
-
-  // @} group iterators
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter)
-#define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) \
-  std::__make_move_if_noexcept_iterator(_Iter)
-#else
-#define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) (_Iter)
-#define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) (_Iter)
-#endif // C++11
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/stl_iterator_base_funcs.h b/openflow/usr/include/c++/5/bits/stl_iterator_base_funcs.h
deleted file mode 100644
index a146611..0000000
--- a/openflow/usr/include/c++/5/bits/stl_iterator_base_funcs.h
+++ /dev/null
@@ -1,205 +0,0 @@
-// Functions used by iterators -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_iterator_base_funcs.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iterator}
- *
- *  This file contains all of the general iterator-related utility
- *  functions, such as distance() and advance().
- */
-
-#ifndef _STL_ITERATOR_BASE_FUNCS_H
-#define _STL_ITERATOR_BASE_FUNCS_H 1
-
-#pragma GCC system_header
-
-#include <bits/concept_check.h>
-#include <debug/debug.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _InputIterator>
-    inline typename iterator_traits<_InputIterator>::difference_type
-    __distance(_InputIterator __first, _InputIterator __last,
-               input_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-
-      typename iterator_traits<_InputIterator>::difference_type __n = 0;
-      while (__first != __last)
-	{
-	  ++__first;
-	  ++__n;
-	}
-      return __n;
-    }
-
-  template<typename _RandomAccessIterator>
-    inline typename iterator_traits<_RandomAccessIterator>::difference_type
-    __distance(_RandomAccessIterator __first, _RandomAccessIterator __last,
-               random_access_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      return __last - __first;
-    }
-
-  /**
-   *  @brief A generalization of pointer arithmetic.
-   *  @param  __first  An input iterator.
-   *  @param  __last  An input iterator.
-   *  @return  The distance between them.
-   *
-   *  Returns @c n such that __first + n == __last.  This requires
-   *  that @p __last must be reachable from @p __first.  Note that @c
-   *  n may be negative.
-   *
-   *  For random access iterators, this uses their @c + and @c - operations
-   *  and are constant time.  For other %iterator classes they are linear time.
-  */
-  template<typename _InputIterator>
-    inline typename iterator_traits<_InputIterator>::difference_type
-    distance(_InputIterator __first, _InputIterator __last)
-    {
-      // concept requirements -- taken care of in __distance
-      return std::__distance(__first, __last,
-			     std::__iterator_category(__first));
-    }
-
-  template<typename _InputIterator, typename _Distance>
-    inline void
-    __advance(_InputIterator& __i, _Distance __n, input_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      _GLIBCXX_DEBUG_ASSERT(__n >= 0);
-      while (__n--)
-	++__i;
-    }
-
-  template<typename _BidirectionalIterator, typename _Distance>
-    inline void
-    __advance(_BidirectionalIterator& __i, _Distance __n,
-	      bidirectional_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      if (__n > 0)
-        while (__n--)
-	  ++__i;
-      else
-        while (__n++)
-	  --__i;
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance>
-    inline void
-    __advance(_RandomAccessIterator& __i, _Distance __n,
-              random_access_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __i += __n;
-    }
-
-  /**
-   *  @brief A generalization of pointer arithmetic.
-   *  @param  __i  An input iterator.
-   *  @param  __n  The @a delta by which to change @p __i.
-   *  @return  Nothing.
-   *
-   *  This increments @p i by @p n.  For bidirectional and random access
-   *  iterators, @p __n may be negative, in which case @p __i is decremented.
-   *
-   *  For random access iterators, this uses their @c + and @c - operations
-   *  and are constant time.  For other %iterator classes they are linear time.
-  */
-  template<typename _InputIterator, typename _Distance>
-    inline void
-    advance(_InputIterator& __i, _Distance __n)
-    {
-      // concept requirements -- taken care of in __advance
-      typename iterator_traits<_InputIterator>::difference_type __d = __n;
-      std::__advance(__i, __d, std::__iterator_category(__i));
-    }
-
-#if __cplusplus >= 201103L
-
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    next(_ForwardIterator __x, typename
-	 iterator_traits<_ForwardIterator>::difference_type __n = 1)
-    {
-      std::advance(__x, __n);
-      return __x;
-    }
-
-  template<typename _BidirectionalIterator>
-    inline _BidirectionalIterator
-    prev(_BidirectionalIterator __x, typename
-	 iterator_traits<_BidirectionalIterator>::difference_type __n = 1) 
-    {
-      std::advance(__x, -__n);
-      return __x;
-    }
-
-#endif // C++11
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _STL_ITERATOR_BASE_FUNCS_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_iterator_base_types.h b/openflow/usr/include/c++/5/bits/stl_iterator_base_types.h
deleted file mode 100644
index 83e6444..0000000
--- a/openflow/usr/include/c++/5/bits/stl_iterator_base_types.h
+++ /dev/null
@@ -1,239 +0,0 @@
-// Types used in iterator implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_iterator_base_types.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iterator}
- *
- *  This file contains all of the general iterator-related utility types,
- *  such as iterator_traits and struct iterator.
- */
-
-#ifndef _STL_ITERATOR_BASE_TYPES_H
-#define _STL_ITERATOR_BASE_TYPES_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-#if __cplusplus >= 201103L
-# include <type_traits>  // For __void_t, is_convertible
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @defgroup iterators Iterators
-   *  Abstractions for uniform iterating through various underlying types.
-  */
-  //@{ 
-
-  /**
-   *  @defgroup iterator_tags Iterator Tags
-   *  These are empty types, used to distinguish different iterators.  The
-   *  distinction is not made by what they contain, but simply by what they
-   *  are.  Different underlying algorithms can then be used based on the
-   *  different operations supported by different iterator types.
-  */
-  //@{ 
-  ///  Marking input iterators.
-  struct input_iterator_tag { };
-
-  ///  Marking output iterators.
-  struct output_iterator_tag { };
-
-  /// Forward iterators support a superset of input iterator operations.
-  struct forward_iterator_tag : public input_iterator_tag { };
-
-  /// Bidirectional iterators support a superset of forward iterator
-  /// operations.
-  struct bidirectional_iterator_tag : public forward_iterator_tag { };
-
-  /// Random-access iterators support a superset of bidirectional
-  /// iterator operations.
-  struct random_access_iterator_tag : public bidirectional_iterator_tag { };
-  //@}
-
-  /**
-   *  @brief  Common %iterator class.
-   *
-   *  This class does nothing but define nested typedefs.  %Iterator classes
-   *  can inherit from this class to save some work.  The typedefs are then
-   *  used in specializations and overloading.
-   *
-   *  In particular, there are no default implementations of requirements
-   *  such as @c operator++ and the like.  (How could there be?)
-  */
-  template<typename _Category, typename _Tp, typename _Distance = ptrdiff_t,
-           typename _Pointer = _Tp*, typename _Reference = _Tp&>
-    struct iterator
-    {
-      /// One of the @link iterator_tags tag types@endlink.
-      typedef _Category  iterator_category;
-      /// The type "pointed to" by the iterator.
-      typedef _Tp        value_type;
-      /// Distance between iterators is represented as this type.
-      typedef _Distance  difference_type;
-      /// This type represents a pointer-to-value_type.
-      typedef _Pointer   pointer;
-      /// This type represents a reference-to-value_type.
-      typedef _Reference reference;
-    };
-
-  /**
-   *  @brief  Traits class for iterators.
-   *
-   *  This class does nothing but define nested typedefs.  The general
-   *  version simply @a forwards the nested typedefs from the Iterator
-   *  argument.  Specialized versions for pointers and pointers-to-const
-   *  provide tighter, more correct semantics.
-  */
-#if __cplusplus >= 201103L
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 2408. SFINAE-friendly common_type/iterator_traits is missing in C++14
-  template<typename _Iterator, typename = __void_t<>>
-    struct __iterator_traits { };
-
-  template<typename _Iterator>
-    struct __iterator_traits<_Iterator,
-			     __void_t<typename _Iterator::iterator_category,
-				      typename _Iterator::value_type,
-				      typename _Iterator::difference_type,
-				      typename _Iterator::pointer,
-				      typename _Iterator::reference>>
-    {
-      typedef typename _Iterator::iterator_category iterator_category;
-      typedef typename _Iterator::value_type        value_type;
-      typedef typename _Iterator::difference_type   difference_type;
-      typedef typename _Iterator::pointer           pointer;
-      typedef typename _Iterator::reference         reference;
-    };
-
-  template<typename _Iterator>
-    struct iterator_traits
-    : public __iterator_traits<_Iterator> { };
-#else
-  template<typename _Iterator>
-    struct iterator_traits
-    {
-      typedef typename _Iterator::iterator_category iterator_category;
-      typedef typename _Iterator::value_type        value_type;
-      typedef typename _Iterator::difference_type   difference_type;
-      typedef typename _Iterator::pointer           pointer;
-      typedef typename _Iterator::reference         reference;
-    };
-#endif
-
-  /// Partial specialization for pointer types.
-  template<typename _Tp>
-    struct iterator_traits<_Tp*>
-    {
-      typedef random_access_iterator_tag iterator_category;
-      typedef _Tp                         value_type;
-      typedef ptrdiff_t                   difference_type;
-      typedef _Tp*                        pointer;
-      typedef _Tp&                        reference;
-    };
-
-  /// Partial specialization for const pointer types.
-  template<typename _Tp>
-    struct iterator_traits<const _Tp*>
-    {
-      typedef random_access_iterator_tag iterator_category;
-      typedef _Tp                         value_type;
-      typedef ptrdiff_t                   difference_type;
-      typedef const _Tp*                  pointer;
-      typedef const _Tp&                  reference;
-    };
-
-  /**
-   *  This function is not a part of the C++ standard but is syntactic
-   *  sugar for internal library use only.
-  */
-  template<typename _Iter>
-    inline typename iterator_traits<_Iter>::iterator_category
-    __iterator_category(const _Iter&)
-    { return typename iterator_traits<_Iter>::iterator_category(); }
-
-  //@}
-
-  // If _Iterator has a base returns it otherwise _Iterator is returned
-  // untouched
-  template<typename _Iterator, bool _HasBase>
-    struct _Iter_base
-    {
-      typedef _Iterator iterator_type;
-      static iterator_type _S_base(_Iterator __it)
-      { return __it; }
-    };
-
-  template<typename _Iterator>
-    struct _Iter_base<_Iterator, true>
-    {
-      typedef typename _Iterator::iterator_type iterator_type;
-      static iterator_type _S_base(_Iterator __it)
-      { return __it.base(); }
-    };
-
-#if __cplusplus >= 201103L
-  template<typename _InIter>
-    using _RequireInputIter = typename
-      enable_if<is_convertible<typename
-		iterator_traits<_InIter>::iterator_category,
-			       input_iterator_tag>::value>::type;
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _STL_ITERATOR_BASE_TYPES_H */
-
diff --git a/openflow/usr/include/c++/5/bits/stl_list.h b/openflow/usr/include/c++/5/bits/stl_list.h
deleted file mode 100644
index f8bfff1..0000000
--- a/openflow/usr/include/c++/5/bits/stl_list.h
+++ /dev/null
@@ -1,1873 +0,0 @@
-// List implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_list.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{list}
- */
-
-#ifndef _STL_LIST_H
-#define _STL_LIST_H 1
-
-#include <bits/concept_check.h>
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    // Supporting structures are split into common and templated
-    // types; the latter publicly inherits from the former in an
-    // effort to reduce code duplication.  This results in some
-    // "needless" static_cast'ing later on, but it's all safe
-    // downcasting.
-
-    /// Common part of a node in the %list. 
-    struct _List_node_base
-    {
-      _List_node_base* _M_next;
-      _List_node_base* _M_prev;
-
-      static void
-      swap(_List_node_base& __x, _List_node_base& __y) _GLIBCXX_USE_NOEXCEPT;
-
-      void
-      _M_transfer(_List_node_base* const __first,
-		  _List_node_base* const __last) _GLIBCXX_USE_NOEXCEPT;
-
-      void
-      _M_reverse() _GLIBCXX_USE_NOEXCEPT;
-
-      void
-      _M_hook(_List_node_base* const __position) _GLIBCXX_USE_NOEXCEPT;
-
-      void
-      _M_unhook() _GLIBCXX_USE_NOEXCEPT;
-    };
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace detail
-
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /// An actual node in the %list.
-  template<typename _Tp>
-    struct _List_node : public __detail::_List_node_base
-    {
-      ///< User's data.
-      _Tp _M_data;
-
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-        _List_node(_Args&&... __args)
-	: __detail::_List_node_base(), _M_data(std::forward<_Args>(__args)...) 
-        { }
-#endif
-    };
-
-  /**
-   *  @brief A list::iterator.
-   *
-   *  All the functions are op overloads.
-  */
-  template<typename _Tp>
-    struct _List_iterator
-    {
-      typedef _List_iterator<_Tp>                _Self;
-      typedef _List_node<_Tp>                    _Node;
-
-      typedef ptrdiff_t                          difference_type;
-      typedef std::bidirectional_iterator_tag    iterator_category;
-      typedef _Tp                                value_type;
-      typedef _Tp*                               pointer;
-      typedef _Tp&                               reference;
-
-      _List_iterator() _GLIBCXX_NOEXCEPT
-      : _M_node() { }
-
-      explicit
-      _List_iterator(__detail::_List_node_base* __x) _GLIBCXX_NOEXCEPT
-      : _M_node(__x) { }
-
-      _Self
-      _M_const_cast() const _GLIBCXX_NOEXCEPT
-      { return *this; }
-
-      // Must downcast from _List_node_base to _List_node to get to _M_data.
-      reference
-      operator*() const _GLIBCXX_NOEXCEPT
-      { return static_cast<_Node*>(_M_node)->_M_data; }
-
-      pointer
-      operator->() const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(static_cast<_Node*>(_M_node)->_M_data); }
-
-      _Self&
-      operator++() _GLIBCXX_NOEXCEPT
-      {
-	_M_node = _M_node->_M_next;
-	return *this;
-      }
-
-      _Self
-      operator++(int) _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	_M_node = _M_node->_M_next;
-	return __tmp;
-      }
-
-      _Self&
-      operator--() _GLIBCXX_NOEXCEPT
-      {
-	_M_node = _M_node->_M_prev;
-	return *this;
-      }
-
-      _Self
-      operator--(int) _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	_M_node = _M_node->_M_prev;
-	return __tmp;
-      }
-
-      bool
-      operator==(const _Self& __x) const _GLIBCXX_NOEXCEPT
-      { return _M_node == __x._M_node; }
-
-      bool
-      operator!=(const _Self& __x) const _GLIBCXX_NOEXCEPT
-      { return _M_node != __x._M_node; }
-
-      // The only member points to the %list element.
-      __detail::_List_node_base* _M_node;
-    };
-
-  /**
-   *  @brief A list::const_iterator.
-   *
-   *  All the functions are op overloads.
-  */
-  template<typename _Tp>
-    struct _List_const_iterator
-    {
-      typedef _List_const_iterator<_Tp>          _Self;
-      typedef const _List_node<_Tp>              _Node;
-      typedef _List_iterator<_Tp>                iterator;
-
-      typedef ptrdiff_t                          difference_type;
-      typedef std::bidirectional_iterator_tag    iterator_category;
-      typedef _Tp                                value_type;
-      typedef const _Tp*                         pointer;
-      typedef const _Tp&                         reference;
-
-      _List_const_iterator() _GLIBCXX_NOEXCEPT
-      : _M_node() { }
-
-      explicit
-      _List_const_iterator(const __detail::_List_node_base* __x)
-      _GLIBCXX_NOEXCEPT
-      : _M_node(__x) { }
-
-      _List_const_iterator(const iterator& __x) _GLIBCXX_NOEXCEPT
-      : _M_node(__x._M_node) { }
-
-      iterator
-      _M_const_cast() const _GLIBCXX_NOEXCEPT
-      { return iterator(const_cast<__detail::_List_node_base*>(_M_node)); }
-
-      // Must downcast from List_node_base to _List_node to get to
-      // _M_data.
-      reference
-      operator*() const _GLIBCXX_NOEXCEPT
-      { return static_cast<_Node*>(_M_node)->_M_data; }
-
-      pointer
-      operator->() const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(static_cast<_Node*>(_M_node)->_M_data); }
-
-      _Self&
-      operator++() _GLIBCXX_NOEXCEPT
-      {
-	_M_node = _M_node->_M_next;
-	return *this;
-      }
-
-      _Self
-      operator++(int) _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	_M_node = _M_node->_M_next;
-	return __tmp;
-      }
-
-      _Self&
-      operator--() _GLIBCXX_NOEXCEPT
-      {
-	_M_node = _M_node->_M_prev;
-	return *this;
-      }
-
-      _Self
-      operator--(int) _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	_M_node = _M_node->_M_prev;
-	return __tmp;
-      }
-
-      bool
-      operator==(const _Self& __x) const _GLIBCXX_NOEXCEPT
-      { return _M_node == __x._M_node; }
-
-      bool
-      operator!=(const _Self& __x) const _GLIBCXX_NOEXCEPT
-      { return _M_node != __x._M_node; }
-
-      // The only member points to the %list element.
-      const __detail::_List_node_base* _M_node;
-    };
-
-  template<typename _Val>
-    inline bool
-    operator==(const _List_iterator<_Val>& __x,
-	       const _List_const_iterator<_Val>& __y) _GLIBCXX_NOEXCEPT
-    { return __x._M_node == __y._M_node; }
-
-  template<typename _Val>
-    inline bool
-    operator!=(const _List_iterator<_Val>& __x,
-               const _List_const_iterator<_Val>& __y) _GLIBCXX_NOEXCEPT
-    { return __x._M_node != __y._M_node; }
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-  /// See bits/stl_deque.h's _Deque_base for an explanation.
-  template<typename _Tp, typename _Alloc>
-    class _List_base
-    {
-    protected:
-      // NOTA BENE
-      // The stored instance is not actually of "allocator_type"'s
-      // type.  Instead we rebind the type to
-      // Allocator<List_node<Tp>>, which according to [20.1.5]/4
-      // should probably be the same.  List_node<Tp> is not the same
-      // size as Tp (it's two pointers larger), and specializations on
-      // Tp may go unused because List_node<Tp> is being bound
-      // instead.
-      //
-      // We put this to the test in the constructors and in
-      // get_allocator, where we use conversions between
-      // allocator_type and _Node_alloc_type. The conversion is
-      // required by table 32 in [20.1.5].
-      typedef typename _Alloc::template rebind<_List_node<_Tp> >::other
-        _Node_alloc_type;
-
-      typedef typename _Alloc::template rebind<_Tp>::other _Tp_alloc_type;
-
-      static size_t
-      _S_distance(const __detail::_List_node_base* __first,
-		  const __detail::_List_node_base* __last)
-      {
-	size_t __n = 0;
-	while (__first != __last)
-	  {
-	    __first = __first->_M_next;
-	    ++__n;
-	  }
-	return __n;
-      }
-
-      struct _List_impl
-      : public _Node_alloc_type
-      {
-#if _GLIBCXX_USE_CXX11_ABI
-	_List_node<size_t> _M_node;
-#else
-	__detail::_List_node_base _M_node;
-#endif
-
-	_List_impl()
-	: _Node_alloc_type(), _M_node()
-	{ }
-
-	_List_impl(const _Node_alloc_type& __a) _GLIBCXX_NOEXCEPT
-	: _Node_alloc_type(__a), _M_node()
-	{ }
-
-#if __cplusplus >= 201103L
-	_List_impl(_Node_alloc_type&& __a) _GLIBCXX_NOEXCEPT
-	: _Node_alloc_type(std::move(__a)), _M_node()
-	{ }
-#endif
-      };
-
-      _List_impl _M_impl;
-
-#if _GLIBCXX_USE_CXX11_ABI
-      size_t _M_get_size() const { return _M_impl._M_node._M_data; }
-
-      void _M_set_size(size_t __n) { _M_impl._M_node._M_data = __n; }
-
-      void _M_inc_size(size_t __n) { _M_impl._M_node._M_data += __n; }
-
-      void _M_dec_size(size_t __n) { _M_impl._M_node._M_data -= __n; }
-
-      size_t
-      _M_distance(const __detail::_List_node_base* __first,
-		  const __detail::_List_node_base* __last) const
-      { return _S_distance(__first, __last); }
-
-      // return the stored size
-      size_t _M_node_count() const { return _M_impl._M_node._M_data; }
-#else
-      // dummy implementations used when the size is not stored
-      size_t _M_get_size() const { return 0; }
-      void _M_set_size(size_t) { }
-      void _M_inc_size(size_t) { }
-      void _M_dec_size(size_t) { }
-      size_t _M_distance(const void*, const void*) const { return 0; }
-
-      // count the number of nodes
-      size_t _M_node_count() const
-      {
-	return _S_distance(_M_impl._M_node._M_next,
-			   std::__addressof(_M_impl._M_node));
-      }
-#endif
-
-      _List_node<_Tp>*
-      _M_get_node()
-      { return _M_impl._Node_alloc_type::allocate(1); }
-
-      void
-      _M_put_node(_List_node<_Tp>* __p) _GLIBCXX_NOEXCEPT
-      { _M_impl._Node_alloc_type::deallocate(__p, 1); }
-
-  public:
-      typedef _Alloc allocator_type;
-
-      _Node_alloc_type&
-      _M_get_Node_allocator() _GLIBCXX_NOEXCEPT
-      { return *static_cast<_Node_alloc_type*>(&_M_impl); }
-
-      const _Node_alloc_type&
-      _M_get_Node_allocator() const _GLIBCXX_NOEXCEPT
-      { return *static_cast<const _Node_alloc_type*>(&_M_impl); }
-
-      _Tp_alloc_type
-      _M_get_Tp_allocator() const _GLIBCXX_NOEXCEPT
-      { return _Tp_alloc_type(_M_get_Node_allocator()); }
-
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return allocator_type(_M_get_Node_allocator()); }
-
-      _List_base()
-      : _M_impl()
-      { _M_init(); }
-
-      _List_base(const _Node_alloc_type& __a) _GLIBCXX_NOEXCEPT
-      : _M_impl(__a)
-      { _M_init(); }
-
-#if __cplusplus >= 201103L
-      _List_base(_List_base&& __x) noexcept
-      : _M_impl(std::move(__x._M_get_Node_allocator()))
-      {
-	auto* const __xnode = std::__addressof(__x._M_impl._M_node);
-	if (__xnode->_M_next == __xnode)
-	  _M_init();
-	else
-	  {
-	    auto* const __node = std::__addressof(_M_impl._M_node);
-	    __node->_M_next = __xnode->_M_next;
-	    __node->_M_prev = __xnode->_M_prev;
-	    __node->_M_next->_M_prev = __node->_M_prev->_M_next = __node;
-	    _M_set_size(__x._M_get_size());
-	    __x._M_init();
-	  }
-      }
-#endif
-
-      // This is what actually destroys the list.
-      ~_List_base() _GLIBCXX_NOEXCEPT
-      { _M_clear(); }
-
-      void
-      _M_clear() _GLIBCXX_NOEXCEPT;
-
-      void
-      _M_init() _GLIBCXX_NOEXCEPT
-      {
-        this->_M_impl._M_node._M_next = &this->_M_impl._M_node;
-        this->_M_impl._M_node._M_prev = &this->_M_impl._M_node;
-	_M_set_size(0);
-      }
-    };
-
-  /**
-   *  @brief A standard container with linear time access to elements,
-   *  and fixed time insertion/deletion at any point in the sequence.
-   *
-   *  @ingroup sequences
-   *
-   *  @tparam _Tp  Type of element.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_Tp>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>, including the
-   *  <a href="tables.html#68">optional sequence requirements</a> with the
-   *  %exception of @c at and @c operator[].
-   *
-   *  This is a @e doubly @e linked %list.  Traversal up and down the
-   *  %list requires linear time, but adding and removing elements (or
-   *  @e nodes) is done in constant time, regardless of where the
-   *  change takes place.  Unlike std::vector and std::deque,
-   *  random-access iterators are not provided, so subscripting ( @c
-   *  [] ) access is not allowed.  For algorithms which only need
-   *  sequential access, this lack makes no difference.
-   *
-   *  Also unlike the other standard containers, std::list provides
-   *  specialized algorithms %unique to linked lists, such as
-   *  splicing, sorting, and in-place reversal.
-   *
-   *  A couple points on memory allocation for list<Tp>:
-   *
-   *  First, we never actually allocate a Tp, we allocate
-   *  List_node<Tp>'s and trust [20.1.5]/4 to DTRT.  This is to ensure
-   *  that after elements from %list<X,Alloc1> are spliced into
-   *  %list<X,Alloc2>, destroying the memory of the second %list is a
-   *  valid operation, i.e., Alloc1 giveth and Alloc2 taketh away.
-   *
-   *  Second, a %list conceptually represented as
-   *  @code
-   *    A <---> B <---> C <---> D
-   *  @endcode
-   *  is actually circular; a link exists between A and D.  The %list
-   *  class holds (as its only data member) a private list::iterator
-   *  pointing to @e D, not to @e A!  To get to the head of the %list,
-   *  we start at the tail and move forward by one.  When this member
-   *  iterator's next/previous pointers refer to itself, the %list is
-   *  %empty. 
-  */
-  template<typename _Tp, typename _Alloc = std::allocator<_Tp> >
-    class list : protected _List_base<_Tp, _Alloc>
-    {
-      // concept requirements
-      typedef typename _Alloc::value_type                _Alloc_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires2(_Tp, _Alloc_value_type, _SameTypeConcept)
-
-      typedef _List_base<_Tp, _Alloc>                    _Base;
-      typedef typename _Base::_Tp_alloc_type		 _Tp_alloc_type;
-      typedef typename _Base::_Node_alloc_type		 _Node_alloc_type;
-
-    public:
-      typedef _Tp                                        value_type;
-      typedef typename _Tp_alloc_type::pointer           pointer;
-      typedef typename _Tp_alloc_type::const_pointer     const_pointer;
-      typedef typename _Tp_alloc_type::reference         reference;
-      typedef typename _Tp_alloc_type::const_reference   const_reference;
-      typedef _List_iterator<_Tp>                        iterator;
-      typedef _List_const_iterator<_Tp>                  const_iterator;
-      typedef std::reverse_iterator<const_iterator>      const_reverse_iterator;
-      typedef std::reverse_iterator<iterator>            reverse_iterator;
-      typedef size_t                                     size_type;
-      typedef ptrdiff_t                                  difference_type;
-      typedef _Alloc                                     allocator_type;
-
-    protected:
-      // Note that pointers-to-_Node's can be ctor-converted to
-      // iterator types.
-      typedef _List_node<_Tp>				 _Node;
-
-      using _Base::_M_impl;
-      using _Base::_M_put_node;
-      using _Base::_M_get_node;
-      using _Base::_M_get_Tp_allocator;
-      using _Base::_M_get_Node_allocator;
-
-      /**
-       *  @param  __args  An instance of user data.
-       *
-       *  Allocates space for a new node and constructs a copy of
-       *  @a __args in it.
-       */
-#if __cplusplus < 201103L
-      _Node*
-      _M_create_node(const value_type& __x)
-      {
-	_Node* __p = this->_M_get_node();
-	__try
-	  {
-	    _M_get_Tp_allocator().construct
-	      (std::__addressof(__p->_M_data), __x);
-	  }
-	__catch(...)
-	  {
-	    _M_put_node(__p);
-	    __throw_exception_again;
-	  }
-	return __p;
-      }
-#else
-      template<typename... _Args>
-        _Node*
-        _M_create_node(_Args&&... __args)
-	{
-	  _Node* __p = this->_M_get_node();
-	  __try
-	    {
-	      _M_get_Node_allocator().construct(__p,
-						std::forward<_Args>(__args)...);
-	    }
-	  __catch(...)
-	    {
-	      _M_put_node(__p);
-	      __throw_exception_again;
-	    }
-	  return __p;
-	}
-#endif
-
-    public:
-      // [23.2.2.1] construct/copy/destroy
-      // (assign() and get_allocator() are also listed in this section)
-
-      /**
-       *  @brief  Creates a %list with no elements.
-       */
-      list()
-#if __cplusplus >= 201103L
-      noexcept(is_nothrow_default_constructible<_Node_alloc_type>::value)
-#endif
-      : _Base() { }
-
-      /**
-       *  @brief  Creates a %list with no elements.
-       *  @param  __a  An allocator object.
-       */
-      explicit
-      list(const allocator_type& __a) _GLIBCXX_NOEXCEPT
-      : _Base(_Node_alloc_type(__a)) { }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Creates a %list with default constructed elements.
-       *  @param  __n  The number of elements to initially create.
-       *
-       *  This constructor fills the %list with @a __n default
-       *  constructed elements.
-       */
-      explicit
-      list(size_type __n)
-      : _Base()
-      { _M_default_initialize(__n); }
-
-      /**
-       *  @brief  Creates a %list with copies of an exemplar element.
-       *  @param  __n  The number of elements to initially create.
-       *  @param  __value  An element to copy.
-       *  @param  __a  An allocator object.
-       *
-       *  This constructor fills the %list with @a __n copies of @a __value.
-       */
-      list(size_type __n, const value_type& __value,
-	   const allocator_type& __a = allocator_type())
-      : _Base(_Node_alloc_type(__a))
-      { _M_fill_initialize(__n, __value); }
-#else
-      /**
-       *  @brief  Creates a %list with copies of an exemplar element.
-       *  @param  __n  The number of elements to initially create.
-       *  @param  __value  An element to copy.
-       *  @param  __a  An allocator object.
-       *
-       *  This constructor fills the %list with @a __n copies of @a __value.
-       */
-      explicit
-      list(size_type __n, const value_type& __value = value_type(),
-	   const allocator_type& __a = allocator_type())
-      : _Base(_Node_alloc_type(__a))
-      { _M_fill_initialize(__n, __value); }
-#endif
-
-      /**
-       *  @brief  %List copy constructor.
-       *  @param  __x  A %list of identical element and allocator types.
-       *
-       *  The newly-created %list uses a copy of the allocation object used
-       *  by @a __x.
-       */
-      list(const list& __x)
-      : _Base(__x._M_get_Node_allocator())
-      { _M_initialize_dispatch(__x.begin(), __x.end(), __false_type()); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  %List move constructor.
-       *  @param  __x  A %list of identical element and allocator types.
-       *
-       *  The newly-created %list contains the exact contents of @a __x.
-       *  The contents of @a __x are a valid, but unspecified %list.
-       */
-      list(list&& __x) noexcept
-      : _Base(std::move(__x)) { }
-
-      /**
-       *  @brief  Builds a %list from an initializer_list
-       *  @param  __l  An initializer_list of value_type.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %list consisting of copies of the elements in the
-       *  initializer_list @a __l.  This is linear in __l.size().
-       */
-      list(initializer_list<value_type> __l,
-           const allocator_type& __a = allocator_type())
-      : _Base(_Node_alloc_type(__a))
-      { _M_initialize_dispatch(__l.begin(), __l.end(), __false_type()); }
-#endif
-
-      /**
-       *  @brief  Builds a %list from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %list consisting of copies of the elements from
-       *  [@a __first,@a __last).  This is linear in N (where N is
-       *  distance(@a __first,@a __last)).
-       */
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        list(_InputIterator __first, _InputIterator __last,
-	     const allocator_type& __a = allocator_type())
-	: _Base(_Node_alloc_type(__a))
-        { _M_initialize_dispatch(__first, __last, __false_type()); }
-#else
-      template<typename _InputIterator>
-        list(_InputIterator __first, _InputIterator __last,
-	     const allocator_type& __a = allocator_type())
-	: _Base(_Node_alloc_type(__a))
-        { 
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  _M_initialize_dispatch(__first, __last, _Integral());
-	}
-#endif
-
-      /**
-       *  No explicit dtor needed as the _Base dtor takes care of
-       *  things.  The _Base dtor only erases the elements, and note
-       *  that if the elements themselves are pointers, the pointed-to
-       *  memory is not touched in any way.  Managing the pointer is
-       *  the user's responsibility.
-       */
-
-      /**
-       *  @brief  %List assignment operator.
-       *  @param  __x  A %list of identical element and allocator types.
-       *
-       *  All the elements of @a __x are copied, but unlike the copy
-       *  constructor, the allocator object is not copied.
-       */
-      list&
-      operator=(const list& __x);
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  %List move assignment operator.
-       *  @param  __x  A %list of identical element and allocator types.
-       *
-       *  The contents of @a __x are moved into this %list (without copying).
-       *  @a __x is a valid, but unspecified %list
-       */
-      list&
-      operator=(list&& __x)
-      {
-	// NB: DR 1204.
-	// NB: DR 675.
-	this->clear();
-	this->swap(__x);
-	return *this;
-      }
-
-      /**
-       *  @brief  %List initializer list assignment operator.
-       *  @param  __l  An initializer_list of value_type.
-       *
-       *  Replace the contents of the %list with copies of the elements
-       *  in the initializer_list @a __l.  This is linear in l.size().
-       */
-      list&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->assign(__l.begin(), __l.end());
-	return *this;
-      }
-#endif
-
-      /**
-       *  @brief  Assigns a given value to a %list.
-       *  @param  __n  Number of elements to be assigned.
-       *  @param  __val  Value to be assigned.
-       *
-       *  This function fills a %list with @a __n copies of the given
-       *  value.  Note that the assignment completely changes the %list
-       *  and that the resulting %list's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      void
-      assign(size_type __n, const value_type& __val)
-      { _M_fill_assign(__n, __val); }
-
-      /**
-       *  @brief  Assigns a range to a %list.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *
-       *  This function fills a %list with copies of the elements in the
-       *  range [@a __first,@a __last).
-       *
-       *  Note that the assignment completely changes the %list and
-       *  that the resulting %list's size is the same as the number of
-       *  elements assigned.  Old data may be lost.
-       */
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        { _M_assign_dispatch(__first, __last, __false_type()); }
-#else
-      template<typename _InputIterator>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  _M_assign_dispatch(__first, __last, _Integral());
-	}
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Assigns an initializer_list to a %list.
-       *  @param  __l  An initializer_list of value_type.
-       *
-       *  Replace the contents of the %list with copies of the elements
-       *  in the initializer_list @a __l.  This is linear in __l.size().
-       */
-      void
-      assign(initializer_list<value_type> __l)
-      { this->assign(__l.begin(), __l.end()); }
-#endif
-
-      /// Get a copy of the memory allocation object.
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return _Base::get_allocator(); }
-
-      // iterators
-      /**
-       *  Returns a read/write iterator that points to the first element in the
-       *  %list.  Iteration is done in ordinary element order.
-       */
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(this->_M_impl._M_node._M_next); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the
-       *  first element in the %list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(this->_M_impl._M_node._M_next); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  element in the %list.  Iteration is done in ordinary element
-       *  order.
-       */
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(&this->_M_impl._M_node); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past
-       *  the last element in the %list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(&this->_M_impl._M_node); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last
-       *  element in the %list.  Iteration is done in reverse element
-       *  order.
-       */
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to
-       *  the last element in the %list.  Iteration is done in reverse
-       *  element order.
-       */
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one
-       *  before the first element in the %list.  Iteration is done in
-       *  reverse element order.
-       */
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to one
-       *  before the first element in the %list.  Iteration is done in reverse
-       *  element order.
-       */
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read-only (constant) iterator that points to the
-       *  first element in the %list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(this->_M_impl._M_node._M_next); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past
-       *  the last element in the %list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(&this->_M_impl._M_node); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to
-       *  the last element in the %list.  Iteration is done in reverse
-       *  element order.
-       */
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to one
-       *  before the first element in the %list.  Iteration is done in reverse
-       *  element order.
-       */
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-      // [23.2.2.2] capacity
-      /**
-       *  Returns true if the %list is empty.  (Thus begin() would equal
-       *  end().)
-       */
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_node._M_next == &this->_M_impl._M_node; }
-
-      /**  Returns the number of elements in the %list.  */
-      size_type
-      size() const _GLIBCXX_NOEXCEPT
-      { return this->_M_node_count(); }
-
-      /**  Returns the size() of the largest possible %list.  */
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return _M_get_Node_allocator().max_size(); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief Resizes the %list to the specified number of elements.
-       *  @param __new_size Number of elements the %list should contain.
-       *
-       *  This function will %resize the %list to the specified number
-       *  of elements.  If the number is smaller than the %list's
-       *  current size the %list is truncated, otherwise default
-       *  constructed elements are appended.
-       */
-      void
-      resize(size_type __new_size);
-
-      /**
-       *  @brief Resizes the %list to the specified number of elements.
-       *  @param __new_size Number of elements the %list should contain.
-       *  @param __x Data with which new elements should be populated.
-       *
-       *  This function will %resize the %list to the specified number
-       *  of elements.  If the number is smaller than the %list's
-       *  current size the %list is truncated, otherwise the %list is
-       *  extended and new elements are populated with given data.
-       */
-      void
-      resize(size_type __new_size, const value_type& __x);
-#else
-      /**
-       *  @brief Resizes the %list to the specified number of elements.
-       *  @param __new_size Number of elements the %list should contain.
-       *  @param __x Data with which new elements should be populated.
-       *
-       *  This function will %resize the %list to the specified number
-       *  of elements.  If the number is smaller than the %list's
-       *  current size the %list is truncated, otherwise the %list is
-       *  extended and new elements are populated with given data.
-       */
-      void
-      resize(size_type __new_size, value_type __x = value_type());
-#endif
-
-      // element access
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %list.
-       */
-      reference
-      front() _GLIBCXX_NOEXCEPT
-      { return *begin(); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %list.
-       */
-      const_reference
-      front() const _GLIBCXX_NOEXCEPT
-      { return *begin(); }
-
-      /**
-       *  Returns a read/write reference to the data at the last element
-       *  of the %list.
-       */
-      reference
-      back() _GLIBCXX_NOEXCEPT
-      { 
-	iterator __tmp = end();
-	--__tmp;
-	return *__tmp;
-      }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the last
-       *  element of the %list.
-       */
-      const_reference
-      back() const _GLIBCXX_NOEXCEPT
-      { 
-	const_iterator __tmp = end();
-	--__tmp;
-	return *__tmp;
-      }
-
-      // [23.2.2.3] modifiers
-      /**
-       *  @brief  Add data to the front of the %list.
-       *  @param  __x  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an
-       *  element at the front of the %list and assigns the given data
-       *  to it.  Due to the nature of a %list this operation can be
-       *  done in constant time, and does not invalidate iterators and
-       *  references.
-       */
-      void
-      push_front(const value_type& __x)
-      { this->_M_insert(begin(), __x); }
-
-#if __cplusplus >= 201103L
-      void
-      push_front(value_type&& __x)
-      { this->_M_insert(begin(), std::move(__x)); }
-
-      template<typename... _Args>
-        void
-        emplace_front(_Args&&... __args)
-        { this->_M_insert(begin(), std::forward<_Args>(__args)...); }
-#endif
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical stack operation.  It shrinks the %list by
-       *  one.  Due to the nature of a %list this operation can be done
-       *  in constant time, and only invalidates iterators/references to
-       *  the element being removed.
-       *
-       *  Note that no data is returned, and if the first element's data
-       *  is needed, it should be retrieved before pop_front() is
-       *  called.
-       */
-      void
-      pop_front() _GLIBCXX_NOEXCEPT
-      { this->_M_erase(begin()); }
-
-      /**
-       *  @brief  Add data to the end of the %list.
-       *  @param  __x  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an
-       *  element at the end of the %list and assigns the given data to
-       *  it.  Due to the nature of a %list this operation can be done
-       *  in constant time, and does not invalidate iterators and
-       *  references.
-       */
-      void
-      push_back(const value_type& __x)
-      { this->_M_insert(end(), __x); }
-
-#if __cplusplus >= 201103L
-      void
-      push_back(value_type&& __x)
-      { this->_M_insert(end(), std::move(__x)); }
-
-      template<typename... _Args>
-        void
-        emplace_back(_Args&&... __args)
-        { this->_M_insert(end(), std::forward<_Args>(__args)...); }
-#endif
-
-      /**
-       *  @brief  Removes last element.
-       *
-       *  This is a typical stack operation.  It shrinks the %list by
-       *  one.  Due to the nature of a %list this operation can be done
-       *  in constant time, and only invalidates iterators/references to
-       *  the element being removed.
-       *
-       *  Note that no data is returned, and if the last element's data
-       *  is needed, it should be retrieved before pop_back() is called.
-       */
-      void
-      pop_back() _GLIBCXX_NOEXCEPT
-      { this->_M_erase(iterator(this->_M_impl._M_node._M_prev)); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Constructs object in %list before specified iterator.
-       *  @param  __position  A const_iterator into the %list.
-       *  @param  __args  Arguments.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert an object of type T constructed
-       *  with T(std::forward<Args>(args)...) before the specified
-       *  location.  Due to the nature of a %list this operation can
-       *  be done in constant time, and does not invalidate iterators
-       *  and references.
-       */
-      template<typename... _Args>
-        iterator
-        emplace(const_iterator __position, _Args&&... __args);
-
-      /**
-       *  @brief  Inserts given value into %list before specified iterator.
-       *  @param  __position  A const_iterator into the %list.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given value before
-       *  the specified location.  Due to the nature of a %list this
-       *  operation can be done in constant time, and does not
-       *  invalidate iterators and references.
-       */
-      iterator
-      insert(const_iterator __position, const value_type& __x);
-#else
-      /**
-       *  @brief  Inserts given value into %list before specified iterator.
-       *  @param  __position  An iterator into the %list.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given value before
-       *  the specified location.  Due to the nature of a %list this
-       *  operation can be done in constant time, and does not
-       *  invalidate iterators and references.
-       */
-      iterator
-      insert(iterator __position, const value_type& __x);
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts given rvalue into %list before specified iterator.
-       *  @param  __position  A const_iterator into the %list.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given rvalue before
-       *  the specified location.  Due to the nature of a %list this
-       *  operation can be done in constant time, and does not
-       *  invalidate iterators and references.
-        */
-      iterator
-      insert(const_iterator __position, value_type&& __x)
-      { return emplace(__position, std::move(__x)); }
-
-      /**
-       *  @brief  Inserts the contents of an initializer_list into %list
-       *          before specified const_iterator.
-       *  @param  __p  A const_iterator into the %list.
-       *  @param  __l  An initializer_list of value_type.
-       *  @return  An iterator pointing to the first element inserted
-       *           (or __position).
-       *
-       *  This function will insert copies of the data in the
-       *  initializer_list @a l into the %list before the location
-       *  specified by @a p.
-       *
-       *  This operation is linear in the number of elements inserted and
-       *  does not invalidate iterators and references.
-       */
-      iterator
-      insert(const_iterator __p, initializer_list<value_type> __l)
-      { return this->insert(__p, __l.begin(), __l.end()); }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts a number of copies of given data into the %list.
-       *  @param  __position  A const_iterator into the %list.
-       *  @param  __n  Number of elements to be inserted.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator pointing to the first element inserted
-       *           (or __position).
-       *
-       *  This function will insert a specified number of copies of the
-       *  given data before the location specified by @a position.
-       *
-       *  This operation is linear in the number of elements inserted and
-       *  does not invalidate iterators and references.
-       */
-      iterator
-      insert(const_iterator __position, size_type __n, const value_type& __x);
-#else
-      /**
-       *  @brief  Inserts a number of copies of given data into the %list.
-       *  @param  __position  An iterator into the %list.
-       *  @param  __n  Number of elements to be inserted.
-       *  @param  __x  Data to be inserted.
-       *
-       *  This function will insert a specified number of copies of the
-       *  given data before the location specified by @a position.
-       *
-       *  This operation is linear in the number of elements inserted and
-       *  does not invalidate iterators and references.
-       */
-      void
-      insert(iterator __position, size_type __n, const value_type& __x)
-      {
-	list __tmp(__n, __x, get_allocator());
-	splice(__position, __tmp);
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts a range into the %list.
-       *  @param  __position  A const_iterator into the %list.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *  @return  An iterator pointing to the first element inserted
-       *           (or __position).
-       *
-       *  This function will insert copies of the data in the range [@a
-       *  first,@a last) into the %list before the location specified by
-       *  @a position.
-       *
-       *  This operation is linear in the number of elements inserted and
-       *  does not invalidate iterators and references.
-       */
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	iterator
-	insert(const_iterator __position, _InputIterator __first,
-	       _InputIterator __last);
-#else
-      /**
-       *  @brief  Inserts a range into the %list.
-       *  @param  __position  An iterator into the %list.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *
-       *  This function will insert copies of the data in the range [@a
-       *  first,@a last) into the %list before the location specified by
-       *  @a position.
-       *
-       *  This operation is linear in the number of elements inserted and
-       *  does not invalidate iterators and references.
-       */
-      template<typename _InputIterator>
-        void
-        insert(iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-        {
-	  list __tmp(__first, __last, get_allocator());
-	  splice(__position, __tmp);
-	}
-#endif
-
-      /**
-       *  @brief  Remove element at given position.
-       *  @param  __position  Iterator pointing to element to be erased.
-       *  @return  An iterator pointing to the next element (or end()).
-       *
-       *  This function will erase the element at the given position and thus
-       *  shorten the %list by one.
-       *
-       *  Due to the nature of a %list this operation can be done in
-       *  constant time, and only invalidates iterators/references to
-       *  the element being removed.  The user is also cautioned that
-       *  this function only erases the element, and that if the element
-       *  is itself a pointer, the pointed-to memory is not touched in
-       *  any way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __position) noexcept;
-#else
-      erase(iterator __position);
-#endif
-
-      /**
-       *  @brief  Remove a range of elements.
-       *  @param  __first  Iterator pointing to the first element to be erased.
-       *  @param  __last  Iterator pointing to one past the last element to be
-       *                erased.
-       *  @return  An iterator pointing to the element pointed to by @a last
-       *           prior to erasing (or end()).
-       *
-       *  This function will erase the elements in the range @a
-       *  [first,last) and shorten the %list accordingly.
-       *
-       *  This operation is linear time in the size of the range and only
-       *  invalidates iterators/references to the element being removed.
-       *  The user is also cautioned that this function only erases the
-       *  elements, and that if the elements themselves are pointers, the
-       *  pointed-to memory is not touched in any way.  Managing the pointer
-       *  is the user's responsibility.
-       */
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __first, const_iterator __last) noexcept
-#else
-      erase(iterator __first, iterator __last)
-#endif
-      {
-	while (__first != __last)
-	  __first = erase(__first);
-	return __last._M_const_cast();
-      }
-
-      /**
-       *  @brief  Swaps data with another %list.
-       *  @param  __x  A %list of the same element and allocator types.
-       *
-       *  This exchanges the elements between two lists in constant
-       *  time.  Note that the global std::swap() function is
-       *  specialized such that std::swap(l1,l2) will feed to this
-       *  function.
-       */
-      void
-      swap(list& __x)
-      {
-	__detail::_List_node_base::swap(this->_M_impl._M_node, 
-					__x._M_impl._M_node);
-
-	size_t __xsize = __x._M_get_size();
-	__x._M_set_size(this->_M_get_size());
-	this->_M_set_size(__xsize);
-
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 431. Swapping containers with unequal allocators.
-	std::__alloc_swap<typename _Base::_Node_alloc_type>::
-	  _S_do_it(_M_get_Node_allocator(), __x._M_get_Node_allocator());
-      }
-
-      /**
-       *  Erases all the elements.  Note that this function only erases
-       *  the elements, and that if the elements themselves are
-       *  pointers, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibility.
-       */
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-        _Base::_M_clear();
-        _Base::_M_init();
-      }
-
-      // [23.2.2.4] list operations
-      /**
-       *  @brief  Insert contents of another %list.
-       *  @param  __position  Iterator referencing the element to insert before.
-       *  @param  __x  Source list.
-       *
-       *  The elements of @a __x are inserted in constant time in front of
-       *  the element referenced by @a __position.  @a __x becomes an empty
-       *  list.
-       *
-       *  Requires this != @a __x.
-       */
-      void
-#if __cplusplus >= 201103L
-      splice(const_iterator __position, list&& __x) noexcept
-#else
-      splice(iterator __position, list& __x)
-#endif
-      {
-	if (!__x.empty())
-	  {
-	    _M_check_equal_allocators(__x);
-
-	    this->_M_transfer(__position._M_const_cast(),
-			      __x.begin(), __x.end());
-
-	    this->_M_inc_size(__x._M_get_size());
-	    __x._M_set_size(0);
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      void
-      splice(const_iterator __position, list& __x) noexcept
-      { splice(__position, std::move(__x)); }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert element from another %list.
-       *  @param  __position  Const_iterator referencing the element to
-       *                      insert before.
-       *  @param  __x  Source list.
-       *  @param  __i  Const_iterator referencing the element to move.
-       *
-       *  Removes the element in list @a __x referenced by @a __i and
-       *  inserts it into the current list before @a __position.
-       */
-      void
-      splice(const_iterator __position, list&& __x, const_iterator __i) noexcept
-#else
-      /**
-       *  @brief  Insert element from another %list.
-       *  @param  __position  Iterator referencing the element to insert before.
-       *  @param  __x  Source list.
-       *  @param  __i  Iterator referencing the element to move.
-       *
-       *  Removes the element in list @a __x referenced by @a __i and
-       *  inserts it into the current list before @a __position.
-       */
-      void
-      splice(iterator __position, list& __x, iterator __i)
-#endif
-      {
-	iterator __j = __i._M_const_cast();
-	++__j;
-	if (__position == __i || __position == __j)
-	  return;
-
-	if (this != &__x)
-	  _M_check_equal_allocators(__x);
-
-	this->_M_transfer(__position._M_const_cast(),
-			  __i._M_const_cast(), __j);
-
-	this->_M_inc_size(1);
-	__x._M_dec_size(1);
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert element from another %list.
-       *  @param  __position  Const_iterator referencing the element to
-       *                      insert before.
-       *  @param  __x  Source list.
-       *  @param  __i  Const_iterator referencing the element to move.
-       *
-       *  Removes the element in list @a __x referenced by @a __i and
-       *  inserts it into the current list before @a __position.
-       */
-      void
-      splice(const_iterator __position, list& __x, const_iterator __i) noexcept
-      { splice(__position, std::move(__x), __i); }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert range from another %list.
-       *  @param  __position  Const_iterator referencing the element to
-       *                      insert before.
-       *  @param  __x  Source list.
-       *  @param  __first  Const_iterator referencing the start of range in x.
-       *  @param  __last  Const_iterator referencing the end of range in x.
-       *
-       *  Removes elements in the range [__first,__last) and inserts them
-       *  before @a __position in constant time.
-       *
-       *  Undefined if @a __position is in [__first,__last).
-       */
-      void
-      splice(const_iterator __position, list&& __x, const_iterator __first,
-	     const_iterator __last) noexcept
-#else
-      /**
-       *  @brief  Insert range from another %list.
-       *  @param  __position  Iterator referencing the element to insert before.
-       *  @param  __x  Source list.
-       *  @param  __first  Iterator referencing the start of range in x.
-       *  @param  __last  Iterator referencing the end of range in x.
-       *
-       *  Removes elements in the range [__first,__last) and inserts them
-       *  before @a __position in constant time.
-       *
-       *  Undefined if @a __position is in [__first,__last).
-       */
-      void
-      splice(iterator __position, list& __x, iterator __first,
-	     iterator __last)
-#endif
-      {
-	if (__first != __last)
-	  {
-	    if (this != &__x)
-	      _M_check_equal_allocators(__x);
-
-	    size_t __n = this->_M_distance(__first._M_node, __last._M_node);
-	    this->_M_inc_size(__n);
-	    __x._M_dec_size(__n);
-
-	    this->_M_transfer(__position._M_const_cast(),
-			      __first._M_const_cast(),
-			      __last._M_const_cast());
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert range from another %list.
-       *  @param  __position  Const_iterator referencing the element to
-       *                      insert before.
-       *  @param  __x  Source list.
-       *  @param  __first  Const_iterator referencing the start of range in x.
-       *  @param  __last  Const_iterator referencing the end of range in x.
-       *
-       *  Removes elements in the range [__first,__last) and inserts them
-       *  before @a __position in constant time.
-       *
-       *  Undefined if @a __position is in [__first,__last).
-       */
-      void
-      splice(const_iterator __position, list& __x, const_iterator __first,
-	     const_iterator __last) noexcept
-      { splice(__position, std::move(__x), __first, __last); }
-#endif
-
-      /**
-       *  @brief  Remove all elements equal to value.
-       *  @param  __value  The value to remove.
-       *
-       *  Removes every element in the list equal to @a value.
-       *  Remaining elements stay in list order.  Note that this
-       *  function only erases the elements, and that if the elements
-       *  themselves are pointers, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      void
-      remove(const _Tp& __value);
-
-      /**
-       *  @brief  Remove all elements satisfying a predicate.
-       *  @tparam  _Predicate  Unary predicate function or object.
-       *
-       *  Removes every element in the list for which the predicate
-       *  returns true.  Remaining elements stay in list order.  Note
-       *  that this function only erases the elements, and that if the
-       *  elements themselves are pointers, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      template<typename _Predicate>
-        void
-        remove_if(_Predicate);
-
-      /**
-       *  @brief  Remove consecutive duplicate elements.
-       *
-       *  For each consecutive set of elements with the same value,
-       *  remove all but the first one.  Remaining elements stay in
-       *  list order.  Note that this function only erases the
-       *  elements, and that if the elements themselves are pointers,
-       *  the pointed-to memory is not touched in any way.  Managing
-       *  the pointer is the user's responsibility.
-       */
-      void
-      unique();
-
-      /**
-       *  @brief  Remove consecutive elements satisfying a predicate.
-       *  @tparam _BinaryPredicate  Binary predicate function or object.
-       *
-       *  For each consecutive set of elements [first,last) that
-       *  satisfy predicate(first,i) where i is an iterator in
-       *  [first,last), remove all but the first one.  Remaining
-       *  elements stay in list order.  Note that this function only
-       *  erases the elements, and that if the elements themselves are
-       *  pointers, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibility.
-       */
-      template<typename _BinaryPredicate>
-        void
-        unique(_BinaryPredicate);
-
-      /**
-       *  @brief  Merge sorted lists.
-       *  @param  __x  Sorted list to merge.
-       *
-       *  Assumes that both @a __x and this list are sorted according to
-       *  operator<().  Merges elements of @a __x into this list in
-       *  sorted order, leaving @a __x empty when complete.  Elements in
-       *  this list precede elements in @a __x that are equal.
-       */
-#if __cplusplus >= 201103L
-      void
-      merge(list&& __x);
-
-      void
-      merge(list& __x)
-      { merge(std::move(__x)); }
-#else
-      void
-      merge(list& __x);
-#endif
-
-      /**
-       *  @brief  Merge sorted lists according to comparison function.
-       *  @tparam _StrictWeakOrdering Comparison function defining
-       *  sort order.
-       *  @param  __x  Sorted list to merge.
-       *  @param  __comp  Comparison functor.
-       *
-       *  Assumes that both @a __x and this list are sorted according to
-       *  StrictWeakOrdering.  Merges elements of @a __x into this list
-       *  in sorted order, leaving @a __x empty when complete.  Elements
-       *  in this list precede elements in @a __x that are equivalent
-       *  according to StrictWeakOrdering().
-       */
-#if __cplusplus >= 201103L
-      template<typename _StrictWeakOrdering>
-        void
-        merge(list&& __x, _StrictWeakOrdering __comp);
-
-      template<typename _StrictWeakOrdering>
-        void
-        merge(list& __x, _StrictWeakOrdering __comp)
-        { merge(std::move(__x), __comp); }
-#else
-      template<typename _StrictWeakOrdering>
-        void
-        merge(list& __x, _StrictWeakOrdering __comp);
-#endif
-
-      /**
-       *  @brief  Reverse the elements in list.
-       *
-       *  Reverse the order of elements in the list in linear time.
-       */
-      void
-      reverse() _GLIBCXX_NOEXCEPT
-      { this->_M_impl._M_node._M_reverse(); }
-
-      /**
-       *  @brief  Sort the elements.
-       *
-       *  Sorts the elements of this list in NlogN time.  Equivalent
-       *  elements remain in list order.
-       */
-      void
-      sort();
-
-      /**
-       *  @brief  Sort the elements according to comparison function.
-       *
-       *  Sorts the elements of this list in NlogN time.  Equivalent
-       *  elements remain in list order.
-       */
-      template<typename _StrictWeakOrdering>
-        void
-        sort(_StrictWeakOrdering);
-
-    protected:
-      // Internal constructor functions follow.
-
-      // Called by the range constructor to implement [23.1.1]/9
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-        void
-        _M_initialize_dispatch(_Integer __n, _Integer __x, __true_type)
-        { _M_fill_initialize(static_cast<size_type>(__n), __x); }
-
-      // Called by the range constructor to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_initialize_dispatch(_InputIterator __first, _InputIterator __last,
-			       __false_type)
-        {
-	  for (; __first != __last; ++__first)
-#if __cplusplus >= 201103L
-	    emplace_back(*__first);
-#else
-	    push_back(*__first);
-#endif
-	}
-
-      // Called by list(n,v,a), and the range constructor when it turns out
-      // to be the same thing.
-      void
-      _M_fill_initialize(size_type __n, const value_type& __x)
-      {
-	for (; __n; --__n)
-	  push_back(__x);
-      }
-
-#if __cplusplus >= 201103L
-      // Called by list(n).
-      void
-      _M_default_initialize(size_type __n)
-      {
-	for (; __n; --__n)
-	  emplace_back();
-      }
-
-      // Called by resize(sz).
-      void
-      _M_default_append(size_type __n);
-#endif
-
-      // Internal assign functions follow.
-
-      // Called by the range assign to implement [23.1.1]/9
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-        void
-        _M_assign_dispatch(_Integer __n, _Integer __val, __true_type)
-        { _M_fill_assign(__n, __val); }
-
-      // Called by the range assign to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-			   __false_type);
-
-      // Called by assign(n,t), and the range assign when it turns out
-      // to be the same thing.
-      void
-      _M_fill_assign(size_type __n, const value_type& __val);
-
-
-      // Moves the elements from [first,last) before position.
-      void
-      _M_transfer(iterator __position, iterator __first, iterator __last)
-      { __position._M_node->_M_transfer(__first._M_node, __last._M_node); }
-
-      // Inserts new element at position given and with value given.
-#if __cplusplus < 201103L
-      void
-      _M_insert(iterator __position, const value_type& __x)
-      {
-        _Node* __tmp = _M_create_node(__x);
-        __tmp->_M_hook(__position._M_node);
-	this->_M_inc_size(1);
-      }
-#else
-     template<typename... _Args>
-       void
-       _M_insert(iterator __position, _Args&&... __args)
-       {
-	 _Node* __tmp = _M_create_node(std::forward<_Args>(__args)...);
-	 __tmp->_M_hook(__position._M_node);
-	 this->_M_inc_size(1);
-       }
-#endif
-
-      // Erases element at position given.
-      void
-      _M_erase(iterator __position) _GLIBCXX_NOEXCEPT
-      {
-	this->_M_dec_size(1);
-        __position._M_node->_M_unhook();
-        _Node* __n = static_cast<_Node*>(__position._M_node);
-#if __cplusplus >= 201103L
-        _M_get_Node_allocator().destroy(__n);
-#else
-	_M_get_Tp_allocator().destroy(std::__addressof(__n->_M_data));
-#endif
-        _M_put_node(__n);
-      }
-
-      // To implement the splice (and merge) bits of N1599.
-      void
-      _M_check_equal_allocators(list& __x) _GLIBCXX_NOEXCEPT
-      {
-	if (std::__alloc_neq<typename _Base::_Node_alloc_type>::
-	    _S_do_it(_M_get_Node_allocator(), __x._M_get_Node_allocator()))
-	  __builtin_abort();
-      }
-    };
-_GLIBCXX_END_NAMESPACE_CXX11
-
-  /**
-   *  @brief  List equality comparison.
-   *  @param  __x  A %list.
-   *  @param  __y  A %list of the same type as @a __x.
-   *  @return  True iff the size and elements of the lists are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of
-   *  the lists.  Lists are considered equivalent if their sizes are
-   *  equal, and if corresponding elements compare equal.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-    {
-      typedef typename list<_Tp, _Alloc>::const_iterator const_iterator;
-      const_iterator __end1 = __x.end();
-      const_iterator __end2 = __y.end();
-
-      const_iterator __i1 = __x.begin();
-      const_iterator __i2 = __y.begin();
-      while (__i1 != __end1 && __i2 != __end2 && *__i1 == *__i2)
-	{
-	  ++__i1;
-	  ++__i2;
-	}
-      return __i1 == __end1 && __i2 == __end2;
-    }
-
-  /**
-   *  @brief  List ordering relation.
-   *  @param  __x  A %list.
-   *  @param  __y  A %list of the same type as @a __x.
-   *  @return  True iff @a __x is lexicographically less than @a __y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  lists.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-    { return std::lexicographical_compare(__x.begin(), __x.end(),
-					  __y.begin(), __y.end()); }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::list::swap().
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(list<_Tp, _Alloc>& __x, list<_Tp, _Alloc>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif /* _STL_LIST_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_map.h b/openflow/usr/include/c++/5/bits/stl_map.h
deleted file mode 100644
index 179e3f2..0000000
--- a/openflow/usr/include/c++/5/bits/stl_map.h
+++ /dev/null
@@ -1,1132 +0,0 @@
-// Map implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_map.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{map}
- */
-
-#ifndef _STL_MAP_H
-#define _STL_MAP_H 1
-
-#include <bits/functexcept.h>
-#include <bits/concept_check.h>
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#include <tuple>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /**
-   *  @brief A standard container made up of (key,value) pairs, which can be
-   *  retrieved based on a key, in logarithmic time.
-   *
-   *  @ingroup associative_containers
-   *
-   *  @tparam _Key  Type of key objects.
-   *  @tparam  _Tp  Type of mapped objects.
-   *  @tparam _Compare  Comparison function object type, defaults to less<_Key>.
-   *  @tparam _Alloc  Allocator type, defaults to 
-   *                  allocator<pair<const _Key, _Tp>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and an
-   *  <a href="tables.html#69">associative container</a> (using unique keys).
-   *  For a @c map<Key,T> the key_type is Key, the mapped_type is T, and the
-   *  value_type is std::pair<const Key,T>.
-   *
-   *  Maps support bidirectional iterators.
-   *
-   *  The private tree data is declared exactly the same way for map and
-   *  multimap; the distinction is made entirely in how the tree functions are
-   *  called (*_unique versus *_equal, same as the standard).
-  */
-  template <typename _Key, typename _Tp, typename _Compare = std::less<_Key>,
-            typename _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-    class map
-    {
-    public:
-      typedef _Key                                          key_type;
-      typedef _Tp                                           mapped_type;
-      typedef std::pair<const _Key, _Tp>                    value_type;
-      typedef _Compare                                      key_compare;
-      typedef _Alloc                                        allocator_type;
-
-    private:
-      // concept requirements
-      typedef typename _Alloc::value_type                   _Alloc_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires4(_Compare, bool, _Key, _Key,
-				_BinaryFunctionConcept)
-      __glibcxx_class_requires2(value_type, _Alloc_value_type, _SameTypeConcept)
-
-    public:
-      class value_compare
-      : public std::binary_function<value_type, value_type, bool>
-      {
-	friend class map<_Key, _Tp, _Compare, _Alloc>;
-      protected:
-	_Compare comp;
-
-	value_compare(_Compare __c)
-	: comp(__c) { }
-
-      public:
-	bool operator()(const value_type& __x, const value_type& __y) const
-	{ return comp(__x.first, __y.first); }
-      };
-
-    private:
-      /// This turns a red-black tree into a [multi]map. 
-      typedef typename __gnu_cxx::__alloc_traits<_Alloc>::template
-	rebind<value_type>::other _Pair_alloc_type;
-
-      typedef _Rb_tree<key_type, value_type, _Select1st<value_type>,
-		       key_compare, _Pair_alloc_type> _Rep_type;
-
-      /// The actual tree structure.
-      _Rep_type _M_t;
-
-      typedef __gnu_cxx::__alloc_traits<_Pair_alloc_type> _Alloc_traits;
-
-    public:
-      // many of these are specified differently in ISO, but the following are
-      // "functionally equivalent"
-      typedef typename _Alloc_traits::pointer            pointer;
-      typedef typename _Alloc_traits::const_pointer      const_pointer;
-      typedef typename _Alloc_traits::reference          reference;
-      typedef typename _Alloc_traits::const_reference    const_reference;
-      typedef typename _Rep_type::iterator               iterator;
-      typedef typename _Rep_type::const_iterator         const_iterator;
-      typedef typename _Rep_type::size_type              size_type;
-      typedef typename _Rep_type::difference_type        difference_type;
-      typedef typename _Rep_type::reverse_iterator       reverse_iterator;
-      typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
-
-      // [23.3.1.1] construct/copy/destroy
-      // (get_allocator() is also listed in this section)
-
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      map()
-#if __cplusplus >= 201103L
-      noexcept(is_nothrow_default_constructible<allocator_type>::value)
-#endif
-      : _M_t() { }
-
-      /**
-       *  @brief  Creates a %map with no elements.
-       *  @param  __comp  A comparison object.
-       *  @param  __a  An allocator object.
-       */
-      explicit
-      map(const _Compare& __comp,
-	  const allocator_type& __a = allocator_type())
-      : _M_t(__comp, _Pair_alloc_type(__a)) { }
-
-      /**
-       *  @brief  %Map copy constructor.
-       *  @param  __x  A %map of identical element and allocator types.
-       *
-       *  The newly-created %map uses a copy of the allocation object
-       *  used by @a __x.
-       */
-      map(const map& __x)
-      : _M_t(__x._M_t) { }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  %Map move constructor.
-       *  @param  __x  A %map of identical element and allocator types.
-       *
-       *  The newly-created %map contains the exact contents of @a __x.
-       *  The contents of @a __x are a valid, but unspecified %map.
-       */
-      map(map&& __x)
-      noexcept(is_nothrow_copy_constructible<_Compare>::value)
-      : _M_t(std::move(__x._M_t)) { }
-
-      /**
-       *  @brief  Builds a %map from an initializer_list.
-       *  @param  __l  An initializer_list.
-       *  @param  __comp  A comparison object.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %map consisting of copies of the elements in the
-       *  initializer_list @a __l.
-       *  This is linear in N if the range is already sorted, and NlogN
-       *  otherwise (where N is @a __l.size()).
-       */
-      map(initializer_list<value_type> __l,
-	  const _Compare& __comp = _Compare(),
-	  const allocator_type& __a = allocator_type())
-      : _M_t(__comp, _Pair_alloc_type(__a))
-      { _M_t._M_insert_unique(__l.begin(), __l.end()); }
-
-      /// Allocator-extended default constructor.
-      explicit
-      map(const allocator_type& __a)
-      : _M_t(_Compare(), _Pair_alloc_type(__a)) { }
-
-      /// Allocator-extended copy constructor.
-      map(const map& __m, const allocator_type& __a)
-      : _M_t(__m._M_t, _Pair_alloc_type(__a)) { }
-
-      /// Allocator-extended move constructor.
-      map(map&& __m, const allocator_type& __a)
-      noexcept(is_nothrow_copy_constructible<_Compare>::value
-	       && _Alloc_traits::_S_always_equal())
-      : _M_t(std::move(__m._M_t), _Pair_alloc_type(__a)) { }
-
-      /// Allocator-extended initialier-list constructor.
-      map(initializer_list<value_type> __l, const allocator_type& __a)
-      : _M_t(_Compare(), _Pair_alloc_type(__a))
-      { _M_t._M_insert_unique(__l.begin(), __l.end()); }
-
-      /// Allocator-extended range constructor.
-      template<typename _InputIterator>
-        map(_InputIterator __first, _InputIterator __last,
-	    const allocator_type& __a)
-	: _M_t(_Compare(), _Pair_alloc_type(__a))
-        { _M_t._M_insert_unique(__first, __last); }
-#endif
-
-      /**
-       *  @brief  Builds a %map from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *
-       *  Create a %map consisting of copies of the elements from
-       *  [__first,__last).  This is linear in N if the range is
-       *  already sorted, and NlogN otherwise (where N is
-       *  distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-        map(_InputIterator __first, _InputIterator __last)
-	: _M_t()
-        { _M_t._M_insert_unique(__first, __last); }
-
-      /**
-       *  @brief  Builds a %map from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param  __comp  A comparison functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %map consisting of copies of the elements from
-       *  [__first,__last).  This is linear in N if the range is
-       *  already sorted, and NlogN otherwise (where N is
-       *  distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-        map(_InputIterator __first, _InputIterator __last,
-	    const _Compare& __comp,
-	    const allocator_type& __a = allocator_type())
-	: _M_t(__comp, _Pair_alloc_type(__a))
-        { _M_t._M_insert_unique(__first, __last); }
-
-      // FIXME There is no dtor declared, but we should have something
-      // generated by Doxygen.  I don't know what tags to add to this
-      // paragraph to make that happen:
-      /**
-       *  The dtor only erases the elements, and note that if the elements
-       *  themselves are pointers, the pointed-to memory is not touched in any
-       *  way.  Managing the pointer is the user's responsibility.
-       */
-
-      /**
-       *  @brief  %Map assignment operator.
-       *  @param  __x  A %map of identical element and allocator types.
-       *
-       *  All the elements of @a __x are copied, but unlike the copy
-       *  constructor, the allocator object is not copied.
-       */
-      map&
-      operator=(const map& __x)
-      {
-	_M_t = __x._M_t;
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /// Move assignment operator.
-      map&
-      operator=(map&&) = default;
-
-      /**
-       *  @brief  %Map list assignment operator.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills a %map with copies of the elements in the
-       *  initializer list @a __l.
-       *
-       *  Note that the assignment completely changes the %map and
-       *  that the resulting %map's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      map&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_t._M_assign_unique(__l.begin(), __l.end());
-	return *this;
-      }
-#endif
-
-      /// Get a copy of the memory allocation object.
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return allocator_type(_M_t.get_allocator()); }
-
-      // iterators
-      /**
-       *  Returns a read/write iterator that points to the first pair in the
-       *  %map.
-       *  Iteration is done in ascending order according to the keys.
-       */
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first pair
-       *  in the %map.  Iteration is done in ascending order according to the
-       *  keys.
-       */
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  pair in the %map.  Iteration is done in ascending order
-       *  according to the keys.
-       */
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  pair in the %map.  Iteration is done in ascending order according to
-       *  the keys.
-       */
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last pair in
-       *  the %map.  Iteration is done in descending order according to the
-       *  keys.
-       */
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last pair in the %map.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one before the
-       *  first pair in the %map.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return _M_t.rend(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to one
-       *  before the first pair in the %map.  Iteration is done in descending
-       *  order according to the keys.
-       */
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return _M_t.rend(); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read-only (constant) iterator that points to the first pair
-       *  in the %map.  Iteration is done in ascending order according to the
-       *  keys.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  pair in the %map.  Iteration is done in ascending order according to
-       *  the keys.
-       */
-      const_iterator
-      cend() const noexcept
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last pair in the %map.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to one
-       *  before the first pair in the %map.  Iteration is done in descending
-       *  order according to the keys.
-       */
-      const_reverse_iterator
-      crend() const noexcept
-      { return _M_t.rend(); }
-#endif
-
-      // capacity
-      /** Returns true if the %map is empty.  (Thus begin() would equal
-       *  end().)
-      */
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return _M_t.empty(); }
-
-      /** Returns the size of the %map.  */
-      size_type
-      size() const _GLIBCXX_NOEXCEPT
-      { return _M_t.size(); }
-
-      /** Returns the maximum size of the %map.  */
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return _M_t.max_size(); }
-
-      // [23.3.1.2] element access
-      /**
-       *  @brief  Subscript ( @c [] ) access to %map data.
-       *  @param  __k  The key for which data should be retrieved.
-       *  @return  A reference to the data of the (key,data) %pair.
-       *
-       *  Allows for easy lookup with the subscript ( @c [] )
-       *  operator.  Returns data associated with the key specified in
-       *  subscript.  If the key does not exist, a pair with that key
-       *  is created using default values, which is then returned.
-       *
-       *  Lookup requires logarithmic time.
-       */
-      mapped_type&
-      operator[](const key_type& __k)
-      {
-	// concept requirements
-	__glibcxx_function_requires(_DefaultConstructibleConcept<mapped_type>)
-
-	iterator __i = lower_bound(__k);
-	// __i->first is greater than or equivalent to __k.
-	if (__i == end() || key_comp()(__k, (*__i).first))
-#if __cplusplus >= 201103L
-	  __i = _M_t._M_emplace_hint_unique(__i, std::piecewise_construct,
-					    std::tuple<const key_type&>(__k),
-					    std::tuple<>());
-#else
-          __i = insert(__i, value_type(__k, mapped_type()));
-#endif
-	return (*__i).second;
-      }
-
-#if __cplusplus >= 201103L
-      mapped_type&
-      operator[](key_type&& __k)
-      {
-	// concept requirements
-	__glibcxx_function_requires(_DefaultConstructibleConcept<mapped_type>)
-
-	iterator __i = lower_bound(__k);
-	// __i->first is greater than or equivalent to __k.
-	if (__i == end() || key_comp()(__k, (*__i).first))
-	  __i = _M_t._M_emplace_hint_unique(__i, std::piecewise_construct,
-					std::forward_as_tuple(std::move(__k)),
-					std::tuple<>());
-	return (*__i).second;
-      }
-#endif
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 464. Suggestion for new member functions in standard containers.
-      /**
-       *  @brief  Access to %map data.
-       *  @param  __k  The key for which data should be retrieved.
-       *  @return  A reference to the data whose key is equivalent to @a __k, if
-       *           such a data is present in the %map.
-       *  @throw  std::out_of_range  If no such data is present.
-       */
-      mapped_type&
-      at(const key_type& __k)
-      {
-	iterator __i = lower_bound(__k);
-	if (__i == end() || key_comp()(__k, (*__i).first))
-	  __throw_out_of_range(__N("map::at"));
-	return (*__i).second;
-      }
-
-      const mapped_type&
-      at(const key_type& __k) const
-      {
-	const_iterator __i = lower_bound(__k);
-	if (__i == end() || key_comp()(__k, (*__i).first))
-	  __throw_out_of_range(__N("map::at"));
-	return (*__i).second;
-      }
-
-      // modifiers
-#if __cplusplus >= 201103L
-      /**
-       *  @brief Attempts to build and insert a std::pair into the %map.
-       *
-       *  @param __args  Arguments used to generate a new pair instance (see
-       *	        std::piecewise_contruct for passing arguments to each
-       *	        part of the pair constructor).
-       *
-       *  @return  A pair, of which the first element is an iterator that points
-       *           to the possibly inserted pair, and the second is a bool that
-       *           is true if the pair was actually inserted.
-       *
-       *  This function attempts to build and insert a (key, value) %pair into
-       *  the %map.
-       *  A %map relies on unique keys and thus a %pair is only inserted if its
-       *  first element (the key) is not already present in the %map.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{ return _M_t._M_emplace_unique(std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief Attempts to build and insert a std::pair into the %map.
-       *
-       *  @param  __pos  An iterator that serves as a hint as to where the pair
-       *                should be inserted.
-       *  @param  __args  Arguments used to generate a new pair instance (see
-       *	         std::piecewise_contruct for passing arguments to each
-       *	         part of the pair constructor).
-       *  @return An iterator that points to the element with key of the
-       *          std::pair built from @a __args (may or may not be that
-       *          std::pair).
-       *
-       *  This function is not concerned about whether the insertion took place,
-       *  and thus does not return a boolean like the single-argument emplace()
-       *  does.
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process. A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  See
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *  for more on @a hinting.
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  return _M_t._M_emplace_hint_unique(__pos,
-					     std::forward<_Args>(__args)...);
-	}
-#endif
-
-      /**
-       *  @brief Attempts to insert a std::pair into the %map.
-
-       *  @param __x Pair to be inserted (see std::make_pair for easy
-       *	     creation of pairs).
-       *
-       *  @return  A pair, of which the first element is an iterator that 
-       *           points to the possibly inserted pair, and the second is 
-       *           a bool that is true if the pair was actually inserted.
-       *
-       *  This function attempts to insert a (key, value) %pair into the %map.
-       *  A %map relies on unique keys and thus a %pair is only inserted if its
-       *  first element (the key) is not already present in the %map.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      std::pair<iterator, bool>
-      insert(const value_type& __x)
-      { return _M_t._M_insert_unique(__x); }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-        std::pair<iterator, bool>
-        insert(_Pair&& __x)
-        { return _M_t._M_insert_unique(std::forward<_Pair>(__x)); }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief Attempts to insert a list of std::pairs into the %map.
-       *  @param  __list  A std::initializer_list<value_type> of pairs to be
-       *                  inserted.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      void
-      insert(std::initializer_list<value_type> __list)
-      { insert(__list.begin(), __list.end()); }
-#endif
-
-      /**
-       *  @brief Attempts to insert a std::pair into the %map.
-       *  @param  __position  An iterator that serves as a hint as to where the
-       *                    pair should be inserted.
-       *  @param  __x  Pair to be inserted (see std::make_pair for easy creation
-       *               of pairs).
-       *  @return An iterator that points to the element with key of
-       *           @a __x (may or may not be the %pair passed in).
-       *
-
-       *  This function is not concerned about whether the insertion
-       *  took place, and thus does not return a boolean like the
-       *  single-argument insert() does.  Note that the first
-       *  parameter is only a hint and can potentially improve the
-       *  performance of the insertion process.  A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  See
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *  for more on @a hinting.
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __position, const value_type& __x)
-#else
-      insert(iterator __position, const value_type& __x)
-#endif
-      { return _M_t._M_insert_unique_(__position, __x); }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-        iterator
-        insert(const_iterator __position, _Pair&& __x)
-        { return _M_t._M_insert_unique_(__position,
-					std::forward<_Pair>(__x)); }
-#endif
-
-      /**
-       *  @brief Template function that attempts to insert a range of elements.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   inserted.
-       *  @param  __last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template<typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        { _M_t._M_insert_unique(__first, __last); }
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      /**
-       *  @brief Erases an element from a %map.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *  @return An iterator pointing to the element immediately following
-       *          @a position prior to the element being erased. If no such 
-       *          element exists, end() is returned.
-       *
-       *  This function erases an element, pointed to by the given
-       *  iterator, from a %map.  Note that this function only erases
-       *  the element, and that if the element is itself a pointer,
-       *  the pointed-to memory is not touched in any way.  Managing
-       *  the pointer is the user's responsibility.
-       */
-      iterator
-      erase(const_iterator __position)
-      { return _M_t.erase(__position); }
-
-      // LWG 2059
-      _GLIBCXX_ABI_TAG_CXX11
-      iterator
-      erase(iterator __position)
-      { return _M_t.erase(__position); }
-#else
-      /**
-       *  @brief Erases an element from a %map.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *
-       *  This function erases an element, pointed to by the given
-       *  iterator, from a %map.  Note that this function only erases
-       *  the element, and that if the element is itself a pointer,
-       *  the pointed-to memory is not touched in any way.  Managing
-       *  the pointer is the user's responsibility.
-       */
-      void
-      erase(iterator __position)
-      { _M_t.erase(__position); }
-#endif
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  __x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all the elements located by the given key from
-       *  a %map.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_t.erase(__x); }
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      /**
-       *  @brief Erases a [first,last) range of elements from a %map.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   erased.
-       *  @param __last Iterator pointing to the end of the range to
-       *                be erased.
-       *  @return The iterator @a __last.
-       *
-       *  This function erases a sequence of elements from a %map.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      { return _M_t.erase(__first, __last); }
-#else
-      /**
-       *  @brief Erases a [__first,__last) range of elements from a %map.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   erased.
-       *  @param __last Iterator pointing to the end of the range to
-       *                be erased.
-       *
-       *  This function erases a sequence of elements from a %map.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      void
-      erase(iterator __first, iterator __last)
-      { _M_t.erase(__first, __last); }
-#endif
-
-      /**
-       *  @brief  Swaps data with another %map.
-       *  @param  __x  A %map of the same element and allocator types.
-       *
-       *  This exchanges the elements between two maps in constant
-       *  time.  (It is only swapping a pointer, an integer, and an
-       *  instance of the @c Compare type (which itself is often
-       *  stateless and empty), so it should be quite fast.)  Note
-       *  that the global std::swap() function is specialized such
-       *  that std::swap(m1,m2) will feed to this function.
-       */
-      void
-      swap(map& __x)
-#if __cplusplus >= 201103L
-      noexcept(_Alloc_traits::_S_nothrow_swap())
-#endif
-      { _M_t.swap(__x._M_t); }
-
-      /**
-       *  Erases all elements in a %map.  Note that this function only
-       *  erases the elements, and that if the elements themselves are
-       *  pointers, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibility.
-       */
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      { _M_t.clear(); }
-
-      // observers
-      /**
-       *  Returns the key comparison object out of which the %map was
-       *  constructed.
-       */
-      key_compare
-      key_comp() const
-      { return _M_t.key_comp(); }
-
-      /**
-       *  Returns a value comparison object, built from the key comparison
-       *  object out of which the %map was constructed.
-       */
-      value_compare
-      value_comp() const
-      { return value_compare(_M_t.key_comp()); }
-
-      // [23.3.1.3] map operations
-
-      //@{
-      /**
-       *  @brief Tries to locate an element in a %map.
-       *  @param  __x  Key of (key, value) %pair to be located.
-       *  @return  Iterator pointing to sought-after element, or end() if not
-       *           found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after %pair.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-
-      iterator
-      find(const key_type& __x)
-      { return _M_t.find(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	find(const _Kt& __x) -> decltype(_M_t._M_find_tr(__x))
-	{ return _M_t._M_find_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Tries to locate an element in a %map.
-       *  @param  __x  Key of (key, value) %pair to be located.
-       *  @return  Read-only (constant) iterator pointing to sought-after
-       *           element, or end() if not found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns a constant
-       *  iterator pointing to the sought after %pair. If unsuccessful it
-       *  returns the past-the-end ( @c end() ) iterator.
-       */
-
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_t.find(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	find(const _Kt& __x) const -> decltype(_M_t._M_find_tr(__x))
-	{ return _M_t._M_find_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief  Finds the number of elements with given key.
-       *  @param  __x  Key of (key, value) pairs to be located.
-       *  @return  Number of elements with specified key.
-       *
-       *  This function only makes sense for multimaps; for map the result will
-       *  either be 0 (not present) or 1 (present).
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_t.find(__x) == _M_t.end() ? 0 : 1; }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	count(const _Kt& __x) const -> decltype(_M_t._M_count_tr(__x))
-	{ return _M_t._M_find_tr(__x) == _M_t.end() ? 0 : 1; }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pair to be located.
-       *  @return  Iterator pointing to first element equal to or greater
-       *           than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful it returns an iterator
-       *  pointing to the first element that has a greater value than given key
-       *  or end() if no such element exists.
-       */
-      iterator
-      lower_bound(const key_type& __x)
-      { return _M_t.lower_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	lower_bound(const _Kt& __x)
-	-> decltype(_M_t._M_lower_bound_tr(__x))
-	{ return _M_t._M_lower_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pair to be located.
-       *  @return  Read-only (constant) iterator pointing to first element
-       *           equal to or greater than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful it returns an iterator
-       *  pointing to the first element that has a greater value than given key
-       *  or end() if no such element exists.
-       */
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return _M_t.lower_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	lower_bound(const _Kt& __x) const
-	-> decltype(_M_t._M_lower_bound_tr(__x))
-	{ return _M_t._M_lower_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pair to be located.
-       *  @return Iterator pointing to the first element
-       *          greater than key, or end().
-       */
-      iterator
-      upper_bound(const key_type& __x)
-      { return _M_t.upper_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	upper_bound(const _Kt& __x)
-	-> decltype(_M_t._M_upper_bound_tr(__x))
-	{ return _M_t._M_upper_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pair to be located.
-       *  @return  Read-only (constant) iterator pointing to first iterator
-       *           greater than key, or end().
-       */
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return _M_t.upper_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	upper_bound(const _Kt& __x) const
-	-> decltype(_M_t._M_upper_bound_tr(__x))
-	{ return _M_t._M_upper_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pairs to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       *
-       *  This function probably only makes sense for multimaps.
-       */
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __x)
-      { return _M_t.equal_range(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	equal_range(const _Kt& __x)
-	-> decltype(_M_t._M_equal_range_tr(__x))
-	{ return _M_t._M_equal_range_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pairs to be located.
-       *  @return  Pair of read-only (constant) iterators that possibly points
-       *           to the subsequence matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       *
-       *  This function probably only makes sense for multimaps.
-       */
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_t.equal_range(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	equal_range(const _Kt& __x) const
-	-> decltype(_M_t._M_equal_range_tr(__x))
-	{ return _M_t._M_equal_range_tr(__x); }
-#endif
-      //@}
-
-      template<typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator==(const map<_K1, _T1, _C1, _A1>&,
-		   const map<_K1, _T1, _C1, _A1>&);
-
-      template<typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator<(const map<_K1, _T1, _C1, _A1>&,
-		  const map<_K1, _T1, _C1, _A1>&);
-    };
-
-  /**
-   *  @brief  Map equality comparison.
-   *  @param  __x  A %map.
-   *  @param  __y  A %map of the same type as @a x.
-   *  @return  True iff the size and elements of the maps are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the
-   *  maps.  Maps are considered equivalent if their sizes are equal,
-   *  and if corresponding elements compare equal.
-  */
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator==(const map<_Key, _Tp, _Compare, _Alloc>& __x,
-               const map<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return __x._M_t == __y._M_t; }
-
-  /**
-   *  @brief  Map ordering relation.
-   *  @param  __x  A %map.
-   *  @param  __y  A %map of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  maps.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator<(const map<_Key, _Tp, _Compare, _Alloc>& __x,
-              const map<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return __x._M_t < __y._M_t; }
-
-  /// Based on operator==
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator!=(const map<_Key, _Tp, _Compare, _Alloc>& __x,
-               const map<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator>(const map<_Key, _Tp, _Compare, _Alloc>& __x,
-              const map<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator<=(const map<_Key, _Tp, _Compare, _Alloc>& __x,
-               const map<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator>=(const map<_Key, _Tp, _Compare, _Alloc>& __x,
-               const map<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::map::swap().
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline void
-    swap(map<_Key, _Tp, _Compare, _Alloc>& __x,
-	 map<_Key, _Tp, _Compare, _Alloc>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif /* _STL_MAP_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_multimap.h b/openflow/usr/include/c++/5/bits/stl_multimap.h
deleted file mode 100644
index 10ac0fa..0000000
--- a/openflow/usr/include/c++/5/bits/stl_multimap.h
+++ /dev/null
@@ -1,1033 +0,0 @@
-// Multimap implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_multimap.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{map}
- */
-
-#ifndef _STL_MULTIMAP_H
-#define _STL_MULTIMAP_H 1
-
-#include <bits/concept_check.h>
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /**
-   *  @brief A standard container made up of (key,value) pairs, which can be
-   *  retrieved based on a key, in logarithmic time.
-   *
-   *  @ingroup associative_containers
-   *
-   *  @tparam _Key  Type of key objects.
-   *  @tparam  _Tp  Type of mapped objects.
-   *  @tparam _Compare  Comparison function object type, defaults to less<_Key>.
-   *  @tparam _Alloc  Allocator type, defaults to 
-   *                  allocator<pair<const _Key, _Tp>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and an
-   *  <a href="tables.html#69">associative container</a> (using equivalent
-   *  keys).  For a @c multimap<Key,T> the key_type is Key, the mapped_type
-   *  is T, and the value_type is std::pair<const Key,T>.
-   *
-   *  Multimaps support bidirectional iterators.
-   *
-   *  The private tree data is declared exactly the same way for map and
-   *  multimap; the distinction is made entirely in how the tree functions are
-   *  called (*_unique versus *_equal, same as the standard).
-  */
-  template <typename _Key, typename _Tp,
-	    typename _Compare = std::less<_Key>,
-	    typename _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-    class multimap
-    {
-    public:
-      typedef _Key                                          key_type;
-      typedef _Tp                                           mapped_type;
-      typedef std::pair<const _Key, _Tp>                    value_type;
-      typedef _Compare                                      key_compare;
-      typedef _Alloc                                        allocator_type;
-
-    private:
-      // concept requirements
-      typedef typename _Alloc::value_type                   _Alloc_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires4(_Compare, bool, _Key, _Key,
-				_BinaryFunctionConcept)
-      __glibcxx_class_requires2(value_type, _Alloc_value_type, _SameTypeConcept)
-
-    public:
-      class value_compare
-      : public std::binary_function<value_type, value_type, bool>
-      {
-	friend class multimap<_Key, _Tp, _Compare, _Alloc>;
-      protected:
-	_Compare comp;
-
-	value_compare(_Compare __c)
-	: comp(__c) { }
-
-      public:
-	bool operator()(const value_type& __x, const value_type& __y) const
-	{ return comp(__x.first, __y.first); }
-      };
-
-    private:
-      /// This turns a red-black tree into a [multi]map.
-      typedef typename __gnu_cxx::__alloc_traits<_Alloc>::template
-	rebind<value_type>::other _Pair_alloc_type;
-
-      typedef _Rb_tree<key_type, value_type, _Select1st<value_type>,
-		       key_compare, _Pair_alloc_type> _Rep_type;
-      /// The actual tree structure.
-      _Rep_type _M_t;
-
-      typedef __gnu_cxx::__alloc_traits<_Pair_alloc_type> _Alloc_traits;
-
-    public:
-      // many of these are specified differently in ISO, but the following are
-      // "functionally equivalent"
-      typedef typename _Alloc_traits::pointer            pointer;
-      typedef typename _Alloc_traits::const_pointer      const_pointer;
-      typedef typename _Alloc_traits::reference          reference;
-      typedef typename _Alloc_traits::const_reference    const_reference;
-      typedef typename _Rep_type::iterator               iterator;
-      typedef typename _Rep_type::const_iterator         const_iterator;
-      typedef typename _Rep_type::size_type              size_type;
-      typedef typename _Rep_type::difference_type        difference_type;
-      typedef typename _Rep_type::reverse_iterator       reverse_iterator;
-      typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
-
-      // [23.3.2] construct/copy/destroy
-      // (get_allocator() is also listed in this section)
-
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      multimap()
-#if __cplusplus >= 201103L
-      noexcept(is_nothrow_default_constructible<allocator_type>::value)
-#endif
-      : _M_t() { }
-
-      /**
-       *  @brief  Creates a %multimap with no elements.
-       *  @param  __comp  A comparison object.
-       *  @param  __a  An allocator object.
-       */
-      explicit
-      multimap(const _Compare& __comp,
-	       const allocator_type& __a = allocator_type())
-      : _M_t(__comp, _Pair_alloc_type(__a)) { }
-
-      /**
-       *  @brief  %Multimap copy constructor.
-       *  @param  __x  A %multimap of identical element and allocator types.
-       *
-       *  The newly-created %multimap uses a copy of the allocation object
-       *  used by @a __x.
-       */
-      multimap(const multimap& __x)
-      : _M_t(__x._M_t) { }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  %Multimap move constructor.
-       *  @param   __x  A %multimap of identical element and allocator types.
-       *
-       *  The newly-created %multimap contains the exact contents of @a __x.
-       *  The contents of @a __x are a valid, but unspecified %multimap.
-       */
-      multimap(multimap&& __x)
-      noexcept(is_nothrow_copy_constructible<_Compare>::value)
-      : _M_t(std::move(__x._M_t)) { }
-
-      /**
-       *  @brief  Builds a %multimap from an initializer_list.
-       *  @param  __l  An initializer_list.
-       *  @param  __comp  A comparison functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %multimap consisting of copies of the elements from
-       *  the initializer_list.  This is linear in N if the list is already
-       *  sorted, and NlogN otherwise (where N is @a __l.size()).
-       */
-      multimap(initializer_list<value_type> __l,
-	       const _Compare& __comp = _Compare(),
-	       const allocator_type& __a = allocator_type())
-      : _M_t(__comp, _Pair_alloc_type(__a))
-      { _M_t._M_insert_equal(__l.begin(), __l.end()); }
-
-      /// Allocator-extended default constructor.
-      explicit
-      multimap(const allocator_type& __a)
-      : _M_t(_Compare(), _Pair_alloc_type(__a)) { }
-
-      /// Allocator-extended copy constructor.
-      multimap(const multimap& __m, const allocator_type& __a)
-      : _M_t(__m._M_t, _Pair_alloc_type(__a)) { }
-
-      /// Allocator-extended move constructor.
-      multimap(multimap&& __m, const allocator_type& __a)
-      noexcept(is_nothrow_copy_constructible<_Compare>::value
-	       && _Alloc_traits::_S_always_equal())
-      : _M_t(std::move(__m._M_t), _Pair_alloc_type(__a)) { }
-
-      /// Allocator-extended initialier-list constructor.
-      multimap(initializer_list<value_type> __l, const allocator_type& __a)
-      : _M_t(_Compare(), _Pair_alloc_type(__a))
-      { _M_t._M_insert_equal(__l.begin(), __l.end()); }
-
-      /// Allocator-extended range constructor.
-      template<typename _InputIterator>
-        multimap(_InputIterator __first, _InputIterator __last,
-		 const allocator_type& __a)
-	: _M_t(_Compare(), _Pair_alloc_type(__a))
-        { _M_t._M_insert_equal(__first, __last); }
-#endif
-
-      /**
-       *  @brief  Builds a %multimap from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *
-       *  Create a %multimap consisting of copies of the elements from
-       *  [__first,__last).  This is linear in N if the range is already sorted,
-       *  and NlogN otherwise (where N is distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-        multimap(_InputIterator __first, _InputIterator __last)
-	: _M_t()
-        { _M_t._M_insert_equal(__first, __last); }
-
-      /**
-       *  @brief  Builds a %multimap from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param  __comp  A comparison functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %multimap consisting of copies of the elements from
-       *  [__first,__last).  This is linear in N if the range is already sorted,
-       *  and NlogN otherwise (where N is distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-        multimap(_InputIterator __first, _InputIterator __last,
-		 const _Compare& __comp,
-		 const allocator_type& __a = allocator_type())
-	: _M_t(__comp, _Pair_alloc_type(__a))
-        { _M_t._M_insert_equal(__first, __last); }
-
-      // FIXME There is no dtor declared, but we should have something generated
-      // by Doxygen.  I don't know what tags to add to this paragraph to make
-      // that happen:
-      /**
-       *  The dtor only erases the elements, and note that if the elements
-       *  themselves are pointers, the pointed-to memory is not touched in any
-       *  way.  Managing the pointer is the user's responsibility.
-       */
-
-      /**
-       *  @brief  %Multimap assignment operator.
-       *  @param  __x  A %multimap of identical element and allocator types.
-       *
-       *  All the elements of @a __x are copied, but unlike the copy
-       *  constructor, the allocator object is not copied.
-       */
-      multimap&
-      operator=(const multimap& __x)
-      {
-	_M_t = __x._M_t;
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /// Move assignment operator.
-      multimap&
-      operator=(multimap&&) = default;
-
-      /**
-       *  @brief  %Multimap list assignment operator.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills a %multimap with copies of the elements
-       *  in the initializer list @a __l.
-       *
-       *  Note that the assignment completely changes the %multimap and
-       *  that the resulting %multimap's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      multimap&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_t._M_assign_equal(__l.begin(), __l.end());
-	return *this;
-      }
-#endif
-
-      /// Get a copy of the memory allocation object.
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT 
-      { return allocator_type(_M_t.get_allocator()); }
-
-      // iterators
-      /**
-       *  Returns a read/write iterator that points to the first pair in the
-       *  %multimap.  Iteration is done in ascending order according to the
-       *  keys.
-       */
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first pair
-       *  in the %multimap.  Iteration is done in ascending order according to
-       *  the keys.
-       */
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last pair in
-       *  the %multimap.  Iteration is done in ascending order according to the
-       *  keys.
-       */
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  pair in the %multimap.  Iteration is done in ascending order according
-       *  to the keys.
-       */
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last pair in
-       *  the %multimap.  Iteration is done in descending order according to the
-       *  keys.
-       */
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last pair in the %multimap.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one before the
-       *  first pair in the %multimap.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return _M_t.rend(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to one
-       *  before the first pair in the %multimap.  Iteration is done in
-       *  descending order according to the keys.
-       */
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return _M_t.rend(); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read-only (constant) iterator that points to the first pair
-       *  in the %multimap.  Iteration is done in ascending order according to
-       *  the keys.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  pair in the %multimap.  Iteration is done in ascending order according
-       *  to the keys.
-       */
-      const_iterator
-      cend() const noexcept
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last pair in the %multimap.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to one
-       *  before the first pair in the %multimap.  Iteration is done in
-       *  descending order according to the keys.
-       */
-      const_reverse_iterator
-      crend() const noexcept
-      { return _M_t.rend(); }
-#endif
-
-      // capacity
-      /** Returns true if the %multimap is empty.  */
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return _M_t.empty(); }
-
-      /** Returns the size of the %multimap.  */
-      size_type
-      size() const _GLIBCXX_NOEXCEPT
-      { return _M_t.size(); }
-
-      /** Returns the maximum size of the %multimap.  */
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return _M_t.max_size(); }
-
-      // modifiers
-#if __cplusplus >= 201103L
-      /**
-       *  @brief Build and insert a std::pair into the %multimap.
-       *
-       *  @param __args  Arguments used to generate a new pair instance (see
-       *	        std::piecewise_contruct for passing arguments to each
-       *	        part of the pair constructor).
-       *
-       *  @return An iterator that points to the inserted (key,value) pair.
-       *
-       *  This function builds and inserts a (key, value) %pair into the
-       *  %multimap.
-       *  Contrary to a std::map the %multimap does not rely on unique keys and
-       *  thus multiple pairs with the same key can be inserted.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{ return _M_t._M_emplace_equal(std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief Builds and inserts a std::pair into the %multimap.
-       *
-       *  @param  __pos  An iterator that serves as a hint as to where the pair
-       *                should be inserted.
-       *  @param  __args  Arguments used to generate a new pair instance (see
-       *	         std::piecewise_contruct for passing arguments to each
-       *	         part of the pair constructor).
-       *  @return An iterator that points to the inserted (key,value) pair.
-       *
-       *  This function inserts a (key, value) pair into the %multimap.
-       *  Contrary to a std::map the %multimap does not rely on unique keys and
-       *  thus multiple pairs with the same key can be inserted.
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process.  A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  For more on @a hinting, see:
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  return _M_t._M_emplace_hint_equal(__pos,
-					    std::forward<_Args>(__args)...);
-	}
-#endif
-
-      /**
-       *  @brief Inserts a std::pair into the %multimap.
-       *  @param  __x  Pair to be inserted (see std::make_pair for easy creation
-       *             of pairs).
-       *  @return An iterator that points to the inserted (key,value) pair.
-       *
-       *  This function inserts a (key, value) pair into the %multimap.
-       *  Contrary to a std::map the %multimap does not rely on unique keys and
-       *  thus multiple pairs with the same key can be inserted.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      iterator
-      insert(const value_type& __x)
-      { return _M_t._M_insert_equal(__x); }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-        iterator
-        insert(_Pair&& __x)
-        { return _M_t._M_insert_equal(std::forward<_Pair>(__x)); }
-#endif
-
-      /**
-       *  @brief Inserts a std::pair into the %multimap.
-       *  @param  __position  An iterator that serves as a hint as to where the
-       *                      pair should be inserted.
-       *  @param  __x  Pair to be inserted (see std::make_pair for easy creation
-       *               of pairs).
-       *  @return An iterator that points to the inserted (key,value) pair.
-       *
-       *  This function inserts a (key, value) pair into the %multimap.
-       *  Contrary to a std::map the %multimap does not rely on unique keys and
-       *  thus multiple pairs with the same key can be inserted.
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process.  A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  For more on @a hinting, see:
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __position, const value_type& __x)
-#else
-      insert(iterator __position, const value_type& __x)
-#endif
-      { return _M_t._M_insert_equal_(__position, __x); }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-        iterator
-        insert(const_iterator __position, _Pair&& __x)
-        { return _M_t._M_insert_equal_(__position,
-				       std::forward<_Pair>(__x)); }
-#endif
-
-      /**
-       *  @brief A template function that attempts to insert a range
-       *  of elements.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   inserted.
-       *  @param  __last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template<typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        { _M_t._M_insert_equal(__first, __last); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief Attempts to insert a list of std::pairs into the %multimap.
-       *  @param  __l  A std::initializer_list<value_type> of pairs to be
-       *               inserted.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      void
-      insert(initializer_list<value_type> __l)
-      { this->insert(__l.begin(), __l.end()); }
-#endif
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      /**
-       *  @brief Erases an element from a %multimap.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *  @return An iterator pointing to the element immediately following
-       *          @a position prior to the element being erased. If no such 
-       *          element exists, end() is returned.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from a %multimap.  Note that this function only erases the element,
-       *  and that if the element is itself a pointer, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      iterator
-      erase(const_iterator __position)
-      { return _M_t.erase(__position); }
-
-      // LWG 2059.
-      _GLIBCXX_ABI_TAG_CXX11
-      iterator
-      erase(iterator __position)
-      { return _M_t.erase(__position); }
-#else
-      /**
-       *  @brief Erases an element from a %multimap.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from a %multimap.  Note that this function only erases the element,
-       *  and that if the element is itself a pointer, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      void
-      erase(iterator __position)
-      { _M_t.erase(__position); }
-#endif
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  __x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all elements located by the given key from a
-       *  %multimap.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_t.erase(__x); }
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      /**
-       *  @brief Erases a [first,last) range of elements from a %multimap.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   erased.
-       *  @param __last Iterator pointing to the end of the range to be
-       *                erased .
-       *  @return The iterator @a __last.
-       *
-       *  This function erases a sequence of elements from a %multimap.
-       *  Note that this function only erases the elements, and that if
-       *  the elements themselves are pointers, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      { return _M_t.erase(__first, __last); }
-#else
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      /**
-       *  @brief Erases a [first,last) range of elements from a %multimap.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                 erased.
-       *  @param __last Iterator pointing to the end of the range to
-       *                be erased.
-       *
-       *  This function erases a sequence of elements from a %multimap.
-       *  Note that this function only erases the elements, and that if
-       *  the elements themselves are pointers, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      void
-      erase(iterator __first, iterator __last)
-      { _M_t.erase(__first, __last); }
-#endif
-
-      /**
-       *  @brief  Swaps data with another %multimap.
-       *  @param  __x  A %multimap of the same element and allocator types.
-       *
-       *  This exchanges the elements between two multimaps in constant time.
-       *  (It is only swapping a pointer, an integer, and an instance of
-       *  the @c Compare type (which itself is often stateless and empty), so it
-       *  should be quite fast.)
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(m1,m2) will feed to this function.
-       */
-      void
-      swap(multimap& __x)
-#if __cplusplus >= 201103L
-      noexcept(_Alloc_traits::_S_nothrow_swap())
-#endif
-      { _M_t.swap(__x._M_t); }
-
-      /**
-       *  Erases all elements in a %multimap.  Note that this function only
-       *  erases the elements, and that if the elements themselves are pointers,
-       *  the pointed-to memory is not touched in any way.  Managing the pointer
-       *  is the user's responsibility.
-       */
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      { _M_t.clear(); }
-
-      // observers
-      /**
-       *  Returns the key comparison object out of which the %multimap
-       *  was constructed.
-       */
-      key_compare
-      key_comp() const
-      { return _M_t.key_comp(); }
-
-      /**
-       *  Returns a value comparison object, built from the key comparison
-       *  object out of which the %multimap was constructed.
-       */
-      value_compare
-      value_comp() const
-      { return value_compare(_M_t.key_comp()); }
-
-      // multimap operations
-
-      //@{
-      /**
-       *  @brief Tries to locate an element in a %multimap.
-       *  @param  __x  Key of (key, value) pair to be located.
-       *  @return  Iterator pointing to sought-after element,
-       *           or end() if not found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after %pair.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_t.find(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	find(const _Kt& __x) -> decltype(_M_t._M_find_tr(__x))
-	{ return _M_t._M_find_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Tries to locate an element in a %multimap.
-       *  @param  __x  Key of (key, value) pair to be located.
-       *  @return  Read-only (constant) iterator pointing to sought-after
-       *           element, or end() if not found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns a constant
-       *  iterator pointing to the sought after %pair.  If unsuccessful it
-       *  returns the past-the-end ( @c end() ) iterator.
-       */
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_t.find(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	find(const _Kt& __x) const -> decltype(_M_t._M_find_tr(__x))
-	{ return _M_t._M_find_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the number of elements with given key.
-       *  @param  __x  Key of (key, value) pairs to be located.
-       *  @return Number of elements with specified key.
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_t.count(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	count(const _Kt& __x) const -> decltype(_M_t._M_count_tr(__x))
-	{ return _M_t._M_count_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pair to be located.
-       *  @return  Iterator pointing to first element equal to or greater
-       *           than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful it returns an iterator
-       *  pointing to the first element that has a greater value than given key
-       *  or end() if no such element exists.
-       */
-      iterator
-      lower_bound(const key_type& __x)
-      { return _M_t.lower_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	lower_bound(const _Kt& __x)
-	-> decltype(_M_t._M_lower_bound_tr(__x))
-	{ return _M_t._M_lower_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pair to be located.
-       *  @return  Read-only (constant) iterator pointing to first element
-       *           equal to or greater than key, or end().
-       *
-       *  This function returns the first element of a subsequence of
-       *  elements that matches the given key.  If unsuccessful the
-       *  iterator will point to the next greatest element or, if no
-       *  such greater element exists, to end().
-       */
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return _M_t.lower_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	lower_bound(const _Kt& __x) const
-	-> decltype(_M_t._M_lower_bound_tr(__x))
-	{ return _M_t._M_lower_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pair to be located.
-       *  @return Iterator pointing to the first element
-       *          greater than key, or end().
-       */
-      iterator
-      upper_bound(const key_type& __x)
-      { return _M_t.upper_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	upper_bound(const _Kt& __x)
-	-> decltype(_M_t._M_upper_bound_tr(__x))
-	{ return _M_t._M_upper_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pair to be located.
-       *  @return  Read-only (constant) iterator pointing to first iterator
-       *           greater than key, or end().
-       */
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return _M_t.upper_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	upper_bound(const _Kt& __x) const
-	-> decltype(_M_t._M_upper_bound_tr(__x))
-	{ return _M_t._M_upper_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pairs to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       */
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __x)
-      { return _M_t.equal_range(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	equal_range(const _Kt& __x)
-	-> decltype(_M_t._M_equal_range_tr(__x))
-	{ return _M_t._M_equal_range_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  __x  Key of (key, value) pairs to be located.
-       *  @return  Pair of read-only (constant) iterators that possibly points
-       *           to the subsequence matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       */
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_t.equal_range(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	equal_range(const _Kt& __x) const
-	-> decltype(_M_t._M_equal_range_tr(__x))
-	{ return _M_t._M_equal_range_tr(__x); }
-#endif
-      //@}
-
-      template<typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator==(const multimap<_K1, _T1, _C1, _A1>&,
-		   const multimap<_K1, _T1, _C1, _A1>&);
-
-      template<typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator<(const multimap<_K1, _T1, _C1, _A1>&,
-		  const multimap<_K1, _T1, _C1, _A1>&);
-  };
-
-  /**
-   *  @brief  Multimap equality comparison.
-   *  @param  __x  A %multimap.
-   *  @param  __y  A %multimap of the same type as @a __x.
-   *  @return  True iff the size and elements of the maps are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the
-   *  multimaps.  Multimaps are considered equivalent if their sizes are equal,
-   *  and if corresponding elements compare equal.
-  */
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator==(const multimap<_Key, _Tp, _Compare, _Alloc>& __x,
-               const multimap<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return __x._M_t == __y._M_t; }
-
-  /**
-   *  @brief  Multimap ordering relation.
-   *  @param  __x  A %multimap.
-   *  @param  __y  A %multimap of the same type as @a __x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  multimaps.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator<(const multimap<_Key, _Tp, _Compare, _Alloc>& __x,
-              const multimap<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return __x._M_t < __y._M_t; }
-
-  /// Based on operator==
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator!=(const multimap<_Key, _Tp, _Compare, _Alloc>& __x,
-               const multimap<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator>(const multimap<_Key, _Tp, _Compare, _Alloc>& __x,
-              const multimap<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator<=(const multimap<_Key, _Tp, _Compare, _Alloc>& __x,
-               const multimap<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator>=(const multimap<_Key, _Tp, _Compare, _Alloc>& __x,
-               const multimap<_Key, _Tp, _Compare, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::multimap::swap().
-  template<typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline void
-    swap(multimap<_Key, _Tp, _Compare, _Alloc>& __x,
-         multimap<_Key, _Tp, _Compare, _Alloc>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif /* _STL_MULTIMAP_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_multiset.h b/openflow/usr/include/c++/5/bits/stl_multiset.h
deleted file mode 100644
index ffe15ae..0000000
--- a/openflow/usr/include/c++/5/bits/stl_multiset.h
+++ /dev/null
@@ -1,884 +0,0 @@
-// Multiset implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_multiset.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{set}
- */
-
-#ifndef _STL_MULTISET_H
-#define _STL_MULTISET_H 1
-
-#include <bits/concept_check.h>
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /**
-   *  @brief A standard container made up of elements, which can be retrieved
-   *  in logarithmic time.
-   *
-   *  @ingroup associative_containers
-   *
-   *
-   *  @tparam _Key  Type of key objects.
-   *  @tparam _Compare  Comparison function object type, defaults to less<_Key>.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_Key>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and an
-   *  <a href="tables.html#69">associative container</a> (using equivalent
-   *  keys).  For a @c multiset<Key> the key_type and value_type are Key.
-   *
-   *  Multisets support bidirectional iterators.
-   *
-   *  The private tree data is declared exactly the same way for set and
-   *  multiset; the distinction is made entirely in how the tree functions are
-   *  called (*_unique versus *_equal, same as the standard).
-  */
-  template <typename _Key, typename _Compare = std::less<_Key>,
-	    typename _Alloc = std::allocator<_Key> >
-    class multiset
-    {
-      // concept requirements
-      typedef typename _Alloc::value_type                   _Alloc_value_type;
-      __glibcxx_class_requires(_Key, _SGIAssignableConcept)
-      __glibcxx_class_requires4(_Compare, bool, _Key, _Key,
-				_BinaryFunctionConcept)
-      __glibcxx_class_requires2(_Key, _Alloc_value_type, _SameTypeConcept)	
-
-    public:
-      // typedefs:
-      typedef _Key     key_type;
-      typedef _Key     value_type;
-      typedef _Compare key_compare;
-      typedef _Compare value_compare;
-      typedef _Alloc   allocator_type;
-
-    private:
-      /// This turns a red-black tree into a [multi]set.
-      typedef typename __gnu_cxx::__alloc_traits<_Alloc>::template
-	rebind<_Key>::other _Key_alloc_type;
-
-      typedef _Rb_tree<key_type, value_type, _Identity<value_type>,
-		       key_compare, _Key_alloc_type> _Rep_type;
-      /// The actual tree structure.
-      _Rep_type _M_t;
-
-      typedef __gnu_cxx::__alloc_traits<_Key_alloc_type> _Alloc_traits;
-
-    public:
-      typedef typename _Alloc_traits::pointer		    pointer;
-      typedef typename _Alloc_traits::const_pointer	    const_pointer;
-      typedef typename _Alloc_traits::reference		    reference;
-      typedef typename _Alloc_traits::const_reference	    const_reference;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 103. set::iterator is required to be modifiable,
-      // but this allows modification of keys.
-      typedef typename _Rep_type::const_iterator            iterator;
-      typedef typename _Rep_type::const_iterator            const_iterator;
-      typedef typename _Rep_type::const_reverse_iterator    reverse_iterator;
-      typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
-      typedef typename _Rep_type::size_type                 size_type;
-      typedef typename _Rep_type::difference_type           difference_type;
-
-      // allocation/deallocation
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      multiset()
-#if __cplusplus >= 201103L
-      noexcept(is_nothrow_default_constructible<allocator_type>::value)
-#endif
-      : _M_t() { }
-
-      /**
-       *  @brief  Creates a %multiset with no elements.
-       *  @param  __comp  Comparator to use.
-       *  @param  __a  An allocator object.
-       */
-      explicit
-      multiset(const _Compare& __comp,
-	       const allocator_type& __a = allocator_type())
-      : _M_t(__comp, _Key_alloc_type(__a)) { }
-
-      /**
-       *  @brief  Builds a %multiset from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *
-       *  Create a %multiset consisting of copies of the elements from
-       *  [first,last).  This is linear in N if the range is already sorted,
-       *  and NlogN otherwise (where N is distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-        multiset(_InputIterator __first, _InputIterator __last)
-	: _M_t()
-        { _M_t._M_insert_equal(__first, __last); }
-
-      /**
-       *  @brief  Builds a %multiset from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param  __comp  A comparison functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %multiset consisting of copies of the elements from
-       *  [__first,__last).  This is linear in N if the range is already sorted,
-       *  and NlogN otherwise (where N is distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-        multiset(_InputIterator __first, _InputIterator __last,
-		 const _Compare& __comp,
-		 const allocator_type& __a = allocator_type())
-	: _M_t(__comp, _Key_alloc_type(__a))
-        { _M_t._M_insert_equal(__first, __last); }
-
-      /**
-       *  @brief  %Multiset copy constructor.
-       *  @param  __x  A %multiset of identical element and allocator types.
-       *
-       *  The newly-created %multiset uses a copy of the allocation object used
-       *  by @a __x.
-       */
-      multiset(const multiset& __x)
-      : _M_t(__x._M_t) { }
-
-#if __cplusplus >= 201103L
-     /**
-       *  @brief  %Multiset move constructor.
-       *  @param  __x  A %multiset of identical element and allocator types.
-       *
-       *  The newly-created %multiset contains the exact contents of @a __x.
-       *  The contents of @a __x are a valid, but unspecified %multiset.
-       */
-      multiset(multiset&& __x)
-      noexcept(is_nothrow_copy_constructible<_Compare>::value)
-      : _M_t(std::move(__x._M_t)) { }
-
-      /**
-       *  @brief  Builds a %multiset from an initializer_list.
-       *  @param  __l  An initializer_list.
-       *  @param  __comp  A comparison functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %multiset consisting of copies of the elements from
-       *  the list.  This is linear in N if the list is already sorted,
-       *  and NlogN otherwise (where N is @a __l.size()).
-       */
-      multiset(initializer_list<value_type> __l,
-	       const _Compare& __comp = _Compare(),
-	       const allocator_type& __a = allocator_type())
-      : _M_t(__comp, _Key_alloc_type(__a))
-      { _M_t._M_insert_equal(__l.begin(), __l.end()); }
-
-      /// Allocator-extended default constructor.
-      explicit
-      multiset(const allocator_type& __a)
-      : _M_t(_Compare(), _Key_alloc_type(__a)) { }
-
-      /// Allocator-extended copy constructor.
-      multiset(const multiset& __m, const allocator_type& __a)
-      : _M_t(__m._M_t, _Key_alloc_type(__a)) { }
-
-      /// Allocator-extended move constructor.
-      multiset(multiset&& __m, const allocator_type& __a)
-      noexcept(is_nothrow_copy_constructible<_Compare>::value
-	       && _Alloc_traits::_S_always_equal())
-      : _M_t(std::move(__m._M_t), _Key_alloc_type(__a)) { }
-
-      /// Allocator-extended initialier-list constructor.
-      multiset(initializer_list<value_type> __l, const allocator_type& __a)
-      : _M_t(_Compare(), _Key_alloc_type(__a))
-      { _M_t._M_insert_equal(__l.begin(), __l.end()); }
-
-      /// Allocator-extended range constructor.
-      template<typename _InputIterator>
-        multiset(_InputIterator __first, _InputIterator __last,
-		 const allocator_type& __a)
-	: _M_t(_Compare(), _Key_alloc_type(__a))
-        { _M_t._M_insert_equal(__first, __last); }
-#endif
-
-      /**
-       *  @brief  %Multiset assignment operator.
-       *  @param  __x  A %multiset of identical element and allocator types.
-       *
-       *  All the elements of @a __x are copied, but unlike the copy
-       *  constructor, the allocator object is not copied.
-       */
-      multiset&
-      operator=(const multiset& __x)
-      {
-	_M_t = __x._M_t;
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /// Move assignment operator.
-      multiset&
-      operator=(multiset&&) = default;
-
-      /**
-       *  @brief  %Multiset list assignment operator.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills a %multiset with copies of the elements in the
-       *  initializer list @a __l.
-       *
-       *  Note that the assignment completely changes the %multiset and
-       *  that the resulting %multiset's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      multiset&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_t._M_assign_equal(__l.begin(), __l.end());
-	return *this;
-      }
-#endif
-
-      // accessors:
-
-      ///  Returns the comparison object.
-      key_compare
-      key_comp() const
-      { return _M_t.key_comp(); }
-      ///  Returns the comparison object.
-      value_compare
-      value_comp() const
-      { return _M_t.key_comp(); }
-      ///  Returns the memory allocation object.
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return allocator_type(_M_t.get_allocator()); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %multiset.  Iteration is done in ascending order
-       *  according to the keys.
-       */
-      iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %multiset.  Iteration is done in ascending order
-       *  according to the keys.
-       */
-      iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last element in the %multiset.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last element in the %multiset.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return _M_t.rend(); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %multiset.  Iteration is done in ascending order
-       *  according to the keys.
-       */
-      iterator
-      cbegin() const noexcept
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %multiset.  Iteration is done in ascending order
-       *  according to the keys.
-       */
-      iterator
-      cend() const noexcept
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last element in the %multiset.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      crbegin() const noexcept
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last element in the %multiset.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      crend() const noexcept
-      { return _M_t.rend(); }
-#endif
-
-      ///  Returns true if the %set is empty.
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return _M_t.empty(); }
-
-      ///  Returns the size of the %set.
-      size_type
-      size() const _GLIBCXX_NOEXCEPT
-      { return _M_t.size(); }
-
-      ///  Returns the maximum size of the %set.
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return _M_t.max_size(); }
-
-      /**
-       *  @brief  Swaps data with another %multiset.
-       *  @param  __x  A %multiset of the same element and allocator types.
-       *
-       *  This exchanges the elements between two multisets in constant time.
-       *  (It is only swapping a pointer, an integer, and an instance of the @c
-       *  Compare type (which itself is often stateless and empty), so it should
-       *  be quite fast.)
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(s1,s2) will feed to this function.
-       */
-      void
-      swap(multiset& __x)
-#if __cplusplus >= 201103L
-      noexcept(_Alloc_traits::_S_nothrow_swap())
-#endif
-      { _M_t.swap(__x._M_t); }
-
-      // insert/erase
-#if __cplusplus >= 201103L
-      /**
-       *  @brief Builds and inserts an element into the %multiset.
-       *  @param  __args  Arguments used to generate the element instance to be
-       *                 inserted.
-       *  @return An iterator that points to the inserted element.
-       *
-       *  This function inserts an element into the %multiset.  Contrary
-       *  to a std::set the %multiset does not rely on unique keys and thus
-       *  multiple copies of the same element can be inserted.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{ return _M_t._M_emplace_equal(std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief Builds and inserts an element into the %multiset.
-       *  @param  __pos  An iterator that serves as a hint as to where the
-       *                element should be inserted.
-       *  @param  __args  Arguments used to generate the element instance to be
-       *                 inserted.
-       *  @return An iterator that points to the inserted element.
-       *
-       *  This function inserts an element into the %multiset.  Contrary
-       *  to a std::set the %multiset does not rely on unique keys and thus
-       *  multiple copies of the same element can be inserted.
-       *
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process.  A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  See https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *  for more on @a hinting.
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  return _M_t._M_emplace_hint_equal(__pos,
-					    std::forward<_Args>(__args)...);
-	}
-#endif
-
-      /**
-       *  @brief Inserts an element into the %multiset.
-       *  @param  __x  Element to be inserted.
-       *  @return An iterator that points to the inserted element.
-       *
-       *  This function inserts an element into the %multiset.  Contrary
-       *  to a std::set the %multiset does not rely on unique keys and thus
-       *  multiple copies of the same element can be inserted.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      iterator
-      insert(const value_type& __x)
-      { return _M_t._M_insert_equal(__x); }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(value_type&& __x)
-      { return _M_t._M_insert_equal(std::move(__x)); }
-#endif
-
-      /**
-       *  @brief Inserts an element into the %multiset.
-       *  @param  __position  An iterator that serves as a hint as to where the
-       *                    element should be inserted.
-       *  @param  __x  Element to be inserted.
-       *  @return An iterator that points to the inserted element.
-       *
-       *  This function inserts an element into the %multiset.  Contrary
-       *  to a std::set the %multiset does not rely on unique keys and thus
-       *  multiple copies of the same element can be inserted.
-       *
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process.  A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  See https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *  for more on @a hinting.
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      iterator
-      insert(const_iterator __position, const value_type& __x)
-      { return _M_t._M_insert_equal_(__position, __x); }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __position, value_type&& __x)
-      { return _M_t._M_insert_equal_(__position, std::move(__x)); }
-#endif
-
-      /**
-       *  @brief A template function that tries to insert a range of elements.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   inserted.
-       *  @param  __last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template<typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        { _M_t._M_insert_equal(__first, __last); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief Attempts to insert a list of elements into the %multiset.
-       *  @param  __l  A std::initializer_list<value_type> of elements
-       *               to be inserted.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      void
-      insert(initializer_list<value_type> __l)
-      { this->insert(__l.begin(), __l.end()); }
-#endif
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      /**
-       *  @brief Erases an element from a %multiset.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *  @return An iterator pointing to the element immediately following
-       *          @a position prior to the element being erased. If no such 
-       *          element exists, end() is returned.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from a %multiset.  Note that this function only erases the element,
-       *  and that if the element is itself a pointer, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      _GLIBCXX_ABI_TAG_CXX11
-      iterator
-      erase(const_iterator __position)
-      { return _M_t.erase(__position); }
-#else
-      /**
-       *  @brief Erases an element from a %multiset.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from a %multiset.  Note that this function only erases the element,
-       *  and that if the element is itself a pointer, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      void
-      erase(iterator __position)
-      { _M_t.erase(__position); }
-#endif
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  __x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all elements located by the given key from a
-       *  %multiset.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_t.erase(__x); }
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      /**
-       *  @brief Erases a [first,last) range of elements from a %multiset.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   erased.
-       *  @param __last Iterator pointing to the end of the range to
-       *                be erased.
-       *  @return The iterator @a last.
-       *
-       *  This function erases a sequence of elements from a %multiset.
-       *  Note that this function only erases the elements, and that if
-       *  the elements themselves are pointers, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      _GLIBCXX_ABI_TAG_CXX11
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      { return _M_t.erase(__first, __last); }
-#else
-      /**
-       *  @brief Erases a [first,last) range of elements from a %multiset.
-       *  @param  first  Iterator pointing to the start of the range to be
-       *                 erased.
-       *  @param  last  Iterator pointing to the end of the range to be erased.
-       *
-       *  This function erases a sequence of elements from a %multiset.
-       *  Note that this function only erases the elements, and that if
-       *  the elements themselves are pointers, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      void
-      erase(iterator __first, iterator __last)
-      { _M_t.erase(__first, __last); }
-#endif
-
-      /**
-       *  Erases all elements in a %multiset.  Note that this function only
-       *  erases the elements, and that if the elements themselves are pointers,
-       *  the pointed-to memory is not touched in any way.  Managing the pointer
-       *  is the user's responsibility.
-       */
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      { _M_t.clear(); }
-
-      // multiset operations:
-
-      //@{
-      /**
-       *  @brief Finds the number of elements with given key.
-       *  @param  __x  Key of elements to be located.
-       *  @return Number of elements with specified key.
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_t.count(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	count(const _Kt& __x) const -> decltype(_M_t._M_count_tr(__x))
-	{ return _M_t._M_count_tr(__x); }
-#endif
-      //@}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214.  set::find() missing const overload
-      //@{
-      /**
-       *  @brief Tries to locate an element in a %set.
-       *  @param  __x  Element to be located.
-       *  @return  Iterator pointing to sought-after element, or end() if not
-       *           found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after element.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_t.find(__x); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_t.find(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	find(const _Kt& __x)
-	-> decltype(iterator{_M_t._M_find_tr(__x)})
-	{ return iterator{_M_t._M_find_tr(__x)}; }
-
-      template<typename _Kt>
-	auto
-	find(const _Kt& __x) const
-	-> decltype(const_iterator{_M_t._M_find_tr(__x)})
-	{ return const_iterator{_M_t._M_find_tr(__x)}; }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  __x  Key to be located.
-       *  @return  Iterator pointing to first element equal to or greater
-       *           than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful it returns an iterator
-       *  pointing to the first element that has a greater value than given key
-       *  or end() if no such element exists.
-       */
-      iterator
-      lower_bound(const key_type& __x)
-      { return _M_t.lower_bound(__x); }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return _M_t.lower_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	lower_bound(const _Kt& __x)
-	-> decltype(_M_t._M_lower_bound_tr(__x))
-	{ return _M_t._M_lower_bound_tr(__x); }
-
-      template<typename _Kt>
-	auto
-	lower_bound(const _Kt& __x) const
-	-> decltype(_M_t._M_lower_bound_tr(__x))
-	{ return _M_t._M_lower_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  __x  Key to be located.
-       *  @return Iterator pointing to the first element
-       *          greater than key, or end().
-       */
-      iterator
-      upper_bound(const key_type& __x)
-      { return _M_t.upper_bound(__x); }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return _M_t.upper_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	upper_bound(const _Kt& __x)
-	-> decltype(_M_t._M_upper_bound_tr(__x))
-	{ return _M_t._M_upper_bound_tr(__x); }
-
-      template<typename _Kt>
-	auto
-	upper_bound(const _Kt& __x) const
-	-> decltype(_M_t._M_upper_bound_tr(__x))
-	{ return _M_t._M_upper_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  __x  Key to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       *
-       *  This function probably only makes sense for multisets.
-       */
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __x)
-      { return _M_t.equal_range(__x); }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_t.equal_range(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	equal_range(const _Kt& __x)
-	-> decltype(_M_t._M_equal_range_tr(__x))
-	{ return _M_t._M_equal_range_tr(__x); }
-
-      template<typename _Kt>
-	auto
-	equal_range(const _Kt& __x) const
-	-> decltype(_M_t._M_equal_range_tr(__x))
-	{ return _M_t._M_equal_range_tr(__x); }
-#endif
-      //@}
-
-      template<typename _K1, typename _C1, typename _A1>
-        friend bool
-        operator==(const multiset<_K1, _C1, _A1>&,
-		   const multiset<_K1, _C1, _A1>&);
-
-      template<typename _K1, typename _C1, typename _A1>
-        friend bool
-        operator< (const multiset<_K1, _C1, _A1>&,
-		   const multiset<_K1, _C1, _A1>&);
-    };
-
-  /**
-   *  @brief  Multiset equality comparison.
-   *  @param  __x  A %multiset.
-   *  @param  __y  A %multiset of the same type as @a __x.
-   *  @return  True iff the size and elements of the multisets are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the
-   *  multisets.
-   *  Multisets are considered equivalent if their sizes are equal, and if
-   *  corresponding elements compare equal.
-  */
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator==(const multiset<_Key, _Compare, _Alloc>& __x,
-	       const multiset<_Key, _Compare, _Alloc>& __y)
-    { return __x._M_t == __y._M_t; }
-
-  /**
-   *  @brief  Multiset ordering relation.
-   *  @param  __x  A %multiset.
-   *  @param  __y  A %multiset of the same type as @a __x.
-   *  @return  True iff @a __x is lexicographically less than @a __y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  sets.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator<(const multiset<_Key, _Compare, _Alloc>& __x,
-	      const multiset<_Key, _Compare, _Alloc>& __y)
-    { return __x._M_t < __y._M_t; }
-
-  ///  Returns !(x == y).
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator!=(const multiset<_Key, _Compare, _Alloc>& __x,
-	       const multiset<_Key, _Compare, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  ///  Returns y < x.
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator>(const multiset<_Key,_Compare,_Alloc>& __x,
-	      const multiset<_Key,_Compare,_Alloc>& __y)
-    { return __y < __x; }
-
-  ///  Returns !(y < x)
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator<=(const multiset<_Key, _Compare, _Alloc>& __x,
-	       const multiset<_Key, _Compare, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  ///  Returns !(x < y)
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator>=(const multiset<_Key, _Compare, _Alloc>& __x,
-	       const multiset<_Key, _Compare, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::multiset::swap().
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline void
-    swap(multiset<_Key, _Compare, _Alloc>& __x,
-	 multiset<_Key, _Compare, _Alloc>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif /* _STL_MULTISET_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_numeric.h b/openflow/usr/include/c++/5/bits/stl_numeric.h
deleted file mode 100644
index 8ad78fb..0000000
--- a/openflow/usr/include/c++/5/bits/stl_numeric.h
+++ /dev/null
@@ -1,387 +0,0 @@
-// Numeric functions implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_numeric.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{numeric}
- */
-
-#ifndef _STL_NUMERIC_H
-#define _STL_NUMERIC_H 1
-
-#include <bits/concept_check.h>
-#include <debug/debug.h>
-#include <bits/move.h> // For _GLIBCXX_MOVE
-
-#if __cplusplus >= 201103L
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief  Create a range of sequentially increasing values.
-   *
-   *  For each element in the range @p [first,last) assigns @p value and
-   *  increments @p value as if by @p ++value.
-   *
-   *  @param  __first  Start of range.
-   *  @param  __last  End of range.
-   *  @param  __value  Starting value.
-   *  @return  Nothing.
-   */
-  template<typename _ForwardIterator, typename _Tp>
-    void
-    iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for (; __first != __last; ++__first)
-	{
-	  *__first = __value;
-	  ++__value;
-	}
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_ALGO
-
-  /**
-   *  @brief  Accumulate values in a range.
-   *
-   *  Accumulates the values in the range [first,last) using operator+().  The
-   *  initial value is @a init.  The values are processed in order.
-   *
-   *  @param  __first  Start of range.
-   *  @param  __last  End of range.
-   *  @param  __init  Starting value to add other values to.
-   *  @return  The final sum.
-   */
-  template<typename _InputIterator, typename _Tp>
-    inline _Tp
-    accumulate(_InputIterator __first, _InputIterator __last, _Tp __init)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for (; __first != __last; ++__first)
-	__init = __init + *__first;
-      return __init;
-    }
-
-  /**
-   *  @brief  Accumulate values in a range with operation.
-   *
-   *  Accumulates the values in the range [first,last) using the function
-   *  object @p __binary_op.  The initial value is @p __init.  The values are
-   *  processed in order.
-   *
-   *  @param  __first  Start of range.
-   *  @param  __last  End of range.
-   *  @param  __init  Starting value to add other values to.
-   *  @param  __binary_op  Function object to accumulate with.
-   *  @return  The final sum.
-   */
-  template<typename _InputIterator, typename _Tp, typename _BinaryOperation>
-    inline _Tp
-    accumulate(_InputIterator __first, _InputIterator __last, _Tp __init,
-	       _BinaryOperation __binary_op)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for (; __first != __last; ++__first)
-	__init = __binary_op(__init, *__first);
-      return __init;
-    }
-
-  /**
-   *  @brief  Compute inner product of two ranges.
-   *
-   *  Starting with an initial value of @p __init, multiplies successive
-   *  elements from the two ranges and adds each product into the accumulated
-   *  value using operator+().  The values in the ranges are processed in
-   *  order.
-   *
-   *  @param  __first1  Start of range 1.
-   *  @param  __last1  End of range 1.
-   *  @param  __first2  Start of range 2.
-   *  @param  __init  Starting value to add other values to.
-   *  @return  The final inner product.
-   */
-  template<typename _InputIterator1, typename _InputIterator2, typename _Tp>
-    inline _Tp
-    inner_product(_InputIterator1 __first1, _InputIterator1 __last1,
-		  _InputIterator2 __first2, _Tp __init)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for (; __first1 != __last1; ++__first1, ++__first2)
-	__init = __init + (*__first1 * *__first2);
-      return __init;
-    }
-
-  /**
-   *  @brief  Compute inner product of two ranges.
-   *
-   *  Starting with an initial value of @p __init, applies @p __binary_op2 to
-   *  successive elements from the two ranges and accumulates each result into
-   *  the accumulated value using @p __binary_op1.  The values in the ranges are
-   *  processed in order.
-   *
-   *  @param  __first1  Start of range 1.
-   *  @param  __last1  End of range 1.
-   *  @param  __first2  Start of range 2.
-   *  @param  __init  Starting value to add other values to.
-   *  @param  __binary_op1  Function object to accumulate with.
-   *  @param  __binary_op2  Function object to apply to pairs of input values.
-   *  @return  The final inner product.
-   */
-  template<typename _InputIterator1, typename _InputIterator2, typename _Tp,
-	   typename _BinaryOperation1, typename _BinaryOperation2>
-    inline _Tp
-    inner_product(_InputIterator1 __first1, _InputIterator1 __last1,
-		  _InputIterator2 __first2, _Tp __init,
-		  _BinaryOperation1 __binary_op1,
-		  _BinaryOperation2 __binary_op2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for (; __first1 != __last1; ++__first1, ++__first2)
-	__init = __binary_op1(__init, __binary_op2(*__first1, *__first2));
-      return __init;
-    }
-
-  /**
-   *  @brief  Return list of partial sums
-   *
-   *  Accumulates the values in the range [first,last) using the @c + operator.
-   *  As each successive input value is added into the total, that partial sum
-   *  is written to @p __result.  Therefore, the first value in @p __result is
-   *  the first value of the input, the second value in @p __result is the sum
-   *  of the first and second input values, and so on.
-   *
-   *  @param  __first  Start of input range.
-   *  @param  __last  End of input range.
-   *  @param  __result  Output sum.
-   *  @return  Iterator pointing just beyond the values written to __result.
-   */
-  template<typename _InputIterator, typename _OutputIterator>
-    _OutputIterator
-    partial_sum(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-				                         _ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return __result;
-      _ValueType __value = *__first;
-      *__result = __value;
-      while (++__first != __last)
-	{
-	  __value = __value + *__first;
-	  *++__result = __value;
-	}
-      return ++__result;
-    }
-
-  /**
-   *  @brief  Return list of partial sums
-   *
-   *  Accumulates the values in the range [first,last) using @p __binary_op.
-   *  As each successive input value is added into the total, that partial sum
-   *  is written to @p __result.  Therefore, the first value in @p __result is
-   *  the first value of the input, the second value in @p __result is the sum
-   *  of the first and second input values, and so on.
-   *
-   *  @param  __first  Start of input range.
-   *  @param  __last  End of input range.
-   *  @param  __result  Output sum.
-   *  @param  __binary_op  Function object.
-   *  @return  Iterator pointing just beyond the values written to __result.
-   */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _BinaryOperation>
-    _OutputIterator
-    partial_sum(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result, _BinaryOperation __binary_op)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-				                         _ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return __result;
-      _ValueType __value = *__first;
-      *__result = __value;
-      while (++__first != __last)
-	{
-	  __value = __binary_op(__value, *__first);
-	  *++__result = __value;
-	}
-      return ++__result;
-    }
-
-  /**
-   *  @brief  Return differences between adjacent values.
-   *
-   *  Computes the difference between adjacent values in the range
-   *  [first,last) using operator-() and writes the result to @p __result.
-   *
-   *  @param  __first  Start of input range.
-   *  @param  __last  End of input range.
-   *  @param  __result  Output sums.
-   *  @return  Iterator pointing just beyond the values written to result.
-   *
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-   *  DR 539. partial_sum and adjacent_difference should mention requirements
-   */
-  template<typename _InputIterator, typename _OutputIterator>
-    _OutputIterator
-    adjacent_difference(_InputIterator __first,
-			_InputIterator __last, _OutputIterator __result)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-				                         _ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return __result;
-      _ValueType __value = *__first;
-      *__result = __value;
-      while (++__first != __last)
-	{
-	  _ValueType __tmp = *__first;
-	  *++__result = __tmp - __value;
-	  __value = _GLIBCXX_MOVE(__tmp);
-	}
-      return ++__result;
-    }
-
-  /**
-   *  @brief  Return differences between adjacent values.
-   *
-   *  Computes the difference between adjacent values in the range
-   *  [__first,__last) using the function object @p __binary_op and writes the
-   *  result to @p __result.
-   *
-   *  @param  __first  Start of input range.
-   *  @param  __last  End of input range.
-   *  @param  __result  Output sum.
-   *  @param  __binary_op Function object.
-   *  @return  Iterator pointing just beyond the values written to result.
-   *
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-   *  DR 539. partial_sum and adjacent_difference should mention requirements
-   */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _BinaryOperation>
-    _OutputIterator
-    adjacent_difference(_InputIterator __first, _InputIterator __last,
-			_OutputIterator __result, _BinaryOperation __binary_op)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-				                         _ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return __result;
-      _ValueType __value = *__first;
-      *__result = __value;
-      while (++__first != __last)
-	{
-	  _ValueType __tmp = *__first;
-	  *++__result = __binary_op(__tmp, __value);
-	  __value = _GLIBCXX_MOVE(__tmp);
-	}
-      return ++__result;
-    }
-
-_GLIBCXX_END_NAMESPACE_ALGO
-} // namespace std
-
-#endif /* _STL_NUMERIC_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_pair.h b/openflow/usr/include/c++/5/bits/stl_pair.h
deleted file mode 100644
index 3daeb60..0000000
--- a/openflow/usr/include/c++/5/bits/stl_pair.h
+++ /dev/null
@@ -1,295 +0,0 @@
-// Pair implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_pair.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{utility}
- */
-
-#ifndef _STL_PAIR_H
-#define _STL_PAIR_H 1
-
-#include <bits/move.h> // for std::move / std::forward, and std::swap
-
-#if __cplusplus >= 201103L
-#include <type_traits> // for std::__decay_and_strip too
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @addtogroup utilities
-   *  @{
-   */
-
-#if __cplusplus >= 201103L
-  /// piecewise_construct_t
-  struct piecewise_construct_t { };
-
-  /// piecewise_construct
-  constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t();
-
-  // Forward declarations.
-  template<typename...>
-    class tuple;
-
-  template<std::size_t...>
-    struct _Index_tuple;
-#endif
-
- /**
-   *  @brief Struct holding two objects of arbitrary type.
-   *
-   *  @tparam _T1  Type of first object.
-   *  @tparam _T2  Type of second object.
-   */
-  template<class _T1, class _T2>
-    struct pair
-    {
-      typedef _T1 first_type;    /// @c first_type is the first bound type
-      typedef _T2 second_type;   /// @c second_type is the second bound type
-
-      _T1 first;                 /// @c first is a copy of the first object
-      _T2 second;                /// @c second is a copy of the second object
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 265.  std::pair::pair() effects overly restrictive
-      /** The default constructor creates @c first and @c second using their
-       *  respective default constructors.  */
-      _GLIBCXX_CONSTEXPR pair()
-      : first(), second() { }
-
-      /** Two objects may be passed to a @c pair constructor to be copied.  */
-      _GLIBCXX_CONSTEXPR pair(const _T1& __a, const _T2& __b)
-      : first(__a), second(__b) { }
-
-      /** There is also a templated copy ctor for the @c pair class itself.  */
-#if __cplusplus < 201103L
-      template<class _U1, class _U2>
-	pair(const pair<_U1, _U2>& __p)
-	: first(__p.first), second(__p.second) { }
-#else
-      template<class _U1, class _U2, class = typename
-	       enable_if<__and_<is_convertible<const _U1&, _T1>,
-				is_convertible<const _U2&, _T2>>::value>::type>
-	constexpr pair(const pair<_U1, _U2>& __p)
-	: first(__p.first), second(__p.second) { }
-
-      constexpr pair(const pair&) = default;
-      constexpr pair(pair&&) = default;
-
-      // DR 811.
-      template<class _U1, class = typename
-	       enable_if<is_convertible<_U1, _T1>::value>::type>
-	constexpr pair(_U1&& __x, const _T2& __y)
-	: first(std::forward<_U1>(__x)), second(__y) { }
-
-      template<class _U2, class = typename
-	       enable_if<is_convertible<_U2, _T2>::value>::type>
-	constexpr pair(const _T1& __x, _U2&& __y)
-	: first(__x), second(std::forward<_U2>(__y)) { }
-
-      template<class _U1, class _U2, class = typename
-	       enable_if<__and_<is_convertible<_U1, _T1>,
-				is_convertible<_U2, _T2>>::value>::type>
-	constexpr pair(_U1&& __x, _U2&& __y)
-	: first(std::forward<_U1>(__x)), second(std::forward<_U2>(__y)) { }
-
-      template<class _U1, class _U2, class = typename
-	       enable_if<__and_<is_convertible<_U1, _T1>,
-				is_convertible<_U2, _T2>>::value>::type>
-	constexpr pair(pair<_U1, _U2>&& __p)
-	: first(std::forward<_U1>(__p.first)),
-	  second(std::forward<_U2>(__p.second)) { }
-
-      template<typename... _Args1, typename... _Args2>
-        pair(piecewise_construct_t, tuple<_Args1...>, tuple<_Args2...>);
-
-      pair&
-      operator=(const pair& __p)
-      {
-	first = __p.first;
-	second = __p.second;
-	return *this;
-      }
-
-      pair&
-      operator=(pair&& __p)
-      noexcept(__and_<is_nothrow_move_assignable<_T1>,
-	              is_nothrow_move_assignable<_T2>>::value)
-      {
-	first = std::forward<first_type>(__p.first);
-	second = std::forward<second_type>(__p.second);
-	return *this;
-      }
-
-      template<class _U1, class _U2>
-	pair&
-	operator=(const pair<_U1, _U2>& __p)
-	{
-	  first = __p.first;
-	  second = __p.second;
-	  return *this;
-	}
-
-      template<class _U1, class _U2>
-	pair&
-	operator=(pair<_U1, _U2>&& __p)
-	{
-	  first = std::forward<_U1>(__p.first);
-	  second = std::forward<_U2>(__p.second);
-	  return *this;
-	}
-
-      void
-      swap(pair& __p)
-      noexcept(noexcept(swap(first, __p.first))
-	       && noexcept(swap(second, __p.second)))
-      {
-	using std::swap;
-	swap(first, __p.first);
-	swap(second, __p.second);
-      }
-
-    private:
-      template<typename... _Args1, std::size_t... _Indexes1,
-               typename... _Args2, std::size_t... _Indexes2>
-        pair(tuple<_Args1...>&, tuple<_Args2...>&,
-             _Index_tuple<_Indexes1...>, _Index_tuple<_Indexes2...>);
-#endif
-    };
-
-  /// Two pairs of the same type are equal iff their members are equal.
-  template<class _T1, class _T2>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return __x.first == __y.first && __x.second == __y.second; }
-
-  /// <http://gcc.gnu.org/onlinedocs/libstdc++/manual/utilities.html>
-  template<class _T1, class _T2>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator<(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return __x.first < __y.first
-	     || (!(__y.first < __x.first) && __x.second < __y.second); }
-
-  /// Uses @c operator== to find the result.
-  template<class _T1, class _T2>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return !(__x == __y); }
-
-  /// Uses @c operator< to find the result.
-  template<class _T1, class _T2>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return __y < __x; }
-
-  /// Uses @c operator< to find the result.
-  template<class _T1, class _T2>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return !(__y < __x); }
-
-  /// Uses @c operator< to find the result.
-  template<class _T1, class _T2>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return !(__x < __y); }
-
-#if __cplusplus >= 201103L
-  /// See std::pair::swap().
-  // Note:  no std::swap overloads in C++03 mode, this has performance
-  //        implications, see, eg, libstdc++/38466.
-  template<class _T1, class _T2>
-    inline void
-    swap(pair<_T1, _T2>& __x, pair<_T1, _T2>& __y)
-    noexcept(noexcept(__x.swap(__y)))
-    { __x.swap(__y); }
-#endif
-
-  /**
-   *  @brief A convenience wrapper for creating a pair from two objects.
-   *  @param  __x  The first object.
-   *  @param  __y  The second object.
-   *  @return   A newly-constructed pair<> object of the appropriate type.
-   *
-   *  The standard requires that the objects be passed by reference-to-const,
-   *  but LWG issue #181 says they should be passed by const value.  We follow
-   *  the LWG by default.
-   */
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 181.  make_pair() unintended behavior
-#if __cplusplus >= 201103L
-  // NB: DR 706.
-  template<class _T1, class _T2>
-    constexpr pair<typename __decay_and_strip<_T1>::__type,
-                   typename __decay_and_strip<_T2>::__type>
-    make_pair(_T1&& __x, _T2&& __y)
-    {
-      typedef typename __decay_and_strip<_T1>::__type __ds_type1;
-      typedef typename __decay_and_strip<_T2>::__type __ds_type2;
-      typedef pair<__ds_type1, __ds_type2> 	      __pair_type;
-      return __pair_type(std::forward<_T1>(__x), std::forward<_T2>(__y));
-    }
-#else
-  template<class _T1, class _T2>
-    inline pair<_T1, _T2>
-    make_pair(_T1 __x, _T2 __y)
-    { return pair<_T1, _T2>(__x, __y); }
-#endif
-
-  /// @}
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif /* _STL_PAIR_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_queue.h b/openflow/usr/include/c++/5/bits/stl_queue.h
deleted file mode 100644
index 48e1ee7..0000000
--- a/openflow/usr/include/c++/5/bits/stl_queue.h
+++ /dev/null
@@ -1,572 +0,0 @@
-// Queue implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_queue.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{queue}
- */
-
-#ifndef _STL_QUEUE_H
-#define _STL_QUEUE_H 1
-
-#include <bits/concept_check.h>
-#include <debug/debug.h>
-#if __cplusplus >= 201103L
-# include <bits/uses_allocator.h>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief  A standard container giving FIFO behavior.
-   *
-   *  @ingroup sequences
-   *
-   *  @tparam _Tp  Type of element.
-   *  @tparam _Sequence  Type of underlying sequence, defaults to deque<_Tp>.
-   *
-   *  Meets many of the requirements of a
-   *  <a href="tables.html#65">container</a>,
-   *  but does not define anything to do with iterators.  Very few of the
-   *  other standard container interfaces are defined.
-   *
-   *  This is not a true container, but an @e adaptor.  It holds another
-   *  container, and provides a wrapper interface to that container.  The
-   *  wrapper is what enforces strict first-in-first-out %queue behavior.
-   *
-   *  The second template parameter defines the type of the underlying
-   *  sequence/container.  It defaults to std::deque, but it can be any type
-   *  that supports @c front, @c back, @c push_back, and @c pop_front,
-   *  such as std::list or an appropriate user-defined type.
-   *
-   *  Members not found in @a normal containers are @c container_type,
-   *  which is a typedef for the second Sequence parameter, and @c push and
-   *  @c pop, which are standard %queue/FIFO operations.
-  */
-  template<typename _Tp, typename _Sequence = deque<_Tp> >
-    class queue
-    {
-      // concept requirements
-      typedef typename _Sequence::value_type _Sequence_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires(_Sequence, _FrontInsertionSequenceConcept)
-      __glibcxx_class_requires(_Sequence, _BackInsertionSequenceConcept)
-      __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
-
-      template<typename _Tp1, typename _Seq1>
-        friend bool
-        operator==(const queue<_Tp1, _Seq1>&, const queue<_Tp1, _Seq1>&);
-
-      template<typename _Tp1, typename _Seq1>
-        friend bool
-        operator<(const queue<_Tp1, _Seq1>&, const queue<_Tp1, _Seq1>&);
-
-    public:
-      typedef typename _Sequence::value_type                value_type;
-      typedef typename _Sequence::reference                 reference;
-      typedef typename _Sequence::const_reference           const_reference;
-      typedef typename _Sequence::size_type                 size_type;
-      typedef          _Sequence                            container_type;
-
-    protected:
-      /**
-       *  'c' is the underlying container.  Maintainers wondering why
-       *  this isn't uglified as per style guidelines should note that
-       *  this name is specified in the standard, [23.2.3.1].  (Why?
-       *  Presumably for the same reason that it's protected instead
-       *  of private: to allow derivation.  But none of the other
-       *  containers allow for derivation.  Odd.)
-       */
-      _Sequence c;
-
-    public:
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-#if __cplusplus < 201103L
-      explicit
-      queue(const _Sequence& __c = _Sequence())
-      : c(__c) { }
-#else
-      explicit
-      queue(const _Sequence& __c)
-      : c(__c) { }
-
-      explicit
-      queue(_Sequence&& __c = _Sequence())
-      : c(std::move(__c)) { }
-#endif
-
-      /**
-       *  Returns true if the %queue is empty.
-       */
-      bool
-      empty() const
-      { return c.empty(); }
-
-      /**  Returns the number of elements in the %queue.  */
-      size_type
-      size() const
-      { return c.size(); }
-
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %queue.
-       */
-      reference
-      front()
-      {
-	__glibcxx_requires_nonempty();
-	return c.front();
-      }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %queue.
-       */
-      const_reference
-      front() const
-      {
-	__glibcxx_requires_nonempty();
-	return c.front();
-      }
-
-      /**
-       *  Returns a read/write reference to the data at the last
-       *  element of the %queue.
-       */
-      reference
-      back()
-      {
-	__glibcxx_requires_nonempty();
-	return c.back();
-      }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the last
-       *  element of the %queue.
-       */
-      const_reference
-      back() const
-      {
-	__glibcxx_requires_nonempty();
-	return c.back();
-      }
-
-      /**
-       *  @brief  Add data to the end of the %queue.
-       *  @param  __x  Data to be added.
-       *
-       *  This is a typical %queue operation.  The function creates an
-       *  element at the end of the %queue and assigns the given data
-       *  to it.  The time complexity of the operation depends on the
-       *  underlying sequence.
-       */
-      void
-      push(const value_type& __x)
-      { c.push_back(__x); }
-
-#if __cplusplus >= 201103L
-      void
-      push(value_type&& __x)
-      { c.push_back(std::move(__x)); }
-
-      template<typename... _Args>
-        void
-        emplace(_Args&&... __args)
-	{ c.emplace_back(std::forward<_Args>(__args)...); }
-#endif
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical %queue operation.  It shrinks the %queue by one.
-       *  The time complexity of the operation depends on the underlying
-       *  sequence.
-       *
-       *  Note that no data is returned, and if the first element's
-       *  data is needed, it should be retrieved before pop() is
-       *  called.
-       */
-      void
-      pop()
-      {
-	__glibcxx_requires_nonempty();
-	c.pop_front();
-      }
-
-#if __cplusplus >= 201103L
-      void
-      swap(queue& __q)
-      noexcept(noexcept(swap(c, __q.c)))
-      {
-	using std::swap;
-	swap(c, __q.c);
-      }
-#endif
-    };
-
-  /**
-   *  @brief  Queue equality comparison.
-   *  @param  __x  A %queue.
-   *  @param  __y  A %queue of the same type as @a __x.
-   *  @return  True iff the size and elements of the queues are equal.
-   *
-   *  This is an equivalence relation.  Complexity and semantics depend on the
-   *  underlying sequence type, but the expected rules are:  this relation is
-   *  linear in the size of the sequences, and queues are considered equivalent
-   *  if their sequences compare equal.
-  */
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator==(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y)
-    { return __x.c == __y.c; }
-
-  /**
-   *  @brief  Queue ordering relation.
-   *  @param  __x  A %queue.
-   *  @param  __y  A %queue of the same type as @a x.
-   *  @return  True iff @a __x is lexicographically less than @a __y.
-   *
-   *  This is an total ordering relation.  Complexity and semantics
-   *  depend on the underlying sequence type, but the expected rules
-   *  are: this relation is linear in the size of the sequences, the
-   *  elements must be comparable with @c <, and
-   *  std::lexicographical_compare() is usually used to make the
-   *  determination.
-  */
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator<(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y)
-    { return __x.c < __y.c; }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator!=(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator>(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator<=(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator>=(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y)
-    { return !(__x < __y); }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Seq>
-    inline void
-    swap(queue<_Tp, _Seq>& __x, queue<_Tp, _Seq>& __y)
-    noexcept(noexcept(__x.swap(__y)))
-    { __x.swap(__y); }
-
-  template<typename _Tp, typename _Seq, typename _Alloc>
-    struct uses_allocator<queue<_Tp, _Seq>, _Alloc>
-    : public uses_allocator<_Seq, _Alloc>::type { };
-#endif
-
-  /**
-   *  @brief  A standard container automatically sorting its contents.
-   *
-   *  @ingroup sequences
-   *
-   *  @tparam _Tp  Type of element.
-   *  @tparam _Sequence  Type of underlying sequence, defaults to vector<_Tp>.
-   *  @tparam _Compare  Comparison function object type, defaults to 
-   *                    less<_Sequence::value_type>.
-   *
-   *  This is not a true container, but an @e adaptor.  It holds
-   *  another container, and provides a wrapper interface to that
-   *  container.  The wrapper is what enforces priority-based sorting 
-   *  and %queue behavior.  Very few of the standard container/sequence
-   *  interface requirements are met (e.g., iterators).
-   *
-   *  The second template parameter defines the type of the underlying
-   *  sequence/container.  It defaults to std::vector, but it can be
-   *  any type that supports @c front(), @c push_back, @c pop_back,
-   *  and random-access iterators, such as std::deque or an
-   *  appropriate user-defined type.
-   *
-   *  The third template parameter supplies the means of making
-   *  priority comparisons.  It defaults to @c less<value_type> but
-   *  can be anything defining a strict weak ordering.
-   *
-   *  Members not found in @a normal containers are @c container_type,
-   *  which is a typedef for the second Sequence parameter, and @c
-   *  push, @c pop, and @c top, which are standard %queue operations.
-   *
-   *  @note No equality/comparison operators are provided for
-   *  %priority_queue.
-   *
-   *  @note Sorting of the elements takes place as they are added to,
-   *  and removed from, the %priority_queue using the
-   *  %priority_queue's member functions.  If you access the elements
-   *  by other means, and change their data such that the sorting
-   *  order would be different, the %priority_queue will not re-sort
-   *  the elements for you.  (How could it know to do so?)
-  */
-  template<typename _Tp, typename _Sequence = vector<_Tp>,
-	   typename _Compare  = less<typename _Sequence::value_type> >
-    class priority_queue
-    {
-      // concept requirements
-      typedef typename _Sequence::value_type _Sequence_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires(_Sequence, _SequenceConcept)
-      __glibcxx_class_requires(_Sequence, _RandomAccessContainerConcept)
-      __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
-      __glibcxx_class_requires4(_Compare, bool, _Tp, _Tp,
-				_BinaryFunctionConcept)
-
-    public:
-      typedef typename _Sequence::value_type                value_type;
-      typedef typename _Sequence::reference                 reference;
-      typedef typename _Sequence::const_reference           const_reference;
-      typedef typename _Sequence::size_type                 size_type;
-      typedef          _Sequence                            container_type;
-
-    protected:
-      //  See queue::c for notes on these names.
-      _Sequence  c;
-      _Compare   comp;
-
-    public:
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-#if __cplusplus < 201103L
-      explicit
-      priority_queue(const _Compare& __x = _Compare(),
-		     const _Sequence& __s = _Sequence())
-      : c(__s), comp(__x)
-      { std::make_heap(c.begin(), c.end(), comp); }
-#else
-      explicit
-      priority_queue(const _Compare& __x,
-		     const _Sequence& __s)
-      : c(__s), comp(__x)
-      { std::make_heap(c.begin(), c.end(), comp); }
-
-      explicit
-      priority_queue(const _Compare& __x = _Compare(),
-		     _Sequence&& __s = _Sequence())
-      : c(std::move(__s)), comp(__x)
-      { std::make_heap(c.begin(), c.end(), comp); }
-#endif
-
-      /**
-       *  @brief  Builds a %queue from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param  __x  A comparison functor describing a strict weak ordering.
-       *  @param  __s  An initial sequence with which to start.
-       *
-       *  Begins by copying @a __s, inserting a copy of the elements
-       *  from @a [first,last) into the copy of @a __s, then ordering
-       *  the copy according to @a __x.
-       *
-       *  For more information on function objects, see the
-       *  documentation on @link functors functor base
-       *  classes@endlink.
-       */
-#if __cplusplus < 201103L
-      template<typename _InputIterator>
-        priority_queue(_InputIterator __first, _InputIterator __last,
-		       const _Compare& __x = _Compare(),
-		       const _Sequence& __s = _Sequence())
-	: c(__s), comp(__x)
-        {
-	  __glibcxx_requires_valid_range(__first, __last);
-	  c.insert(c.end(), __first, __last);
-	  std::make_heap(c.begin(), c.end(), comp);
-	}
-#else
-      template<typename _InputIterator>
-        priority_queue(_InputIterator __first, _InputIterator __last,
-		       const _Compare& __x,
-		       const _Sequence& __s)
-	: c(__s), comp(__x)
-        {
-	  __glibcxx_requires_valid_range(__first, __last);
-	  c.insert(c.end(), __first, __last);
-	  std::make_heap(c.begin(), c.end(), comp);
-	}
-
-      template<typename _InputIterator>
-        priority_queue(_InputIterator __first, _InputIterator __last,
-		       const _Compare& __x = _Compare(),
-		       _Sequence&& __s = _Sequence())
-	: c(std::move(__s)), comp(__x)
-        {
-	  __glibcxx_requires_valid_range(__first, __last);
-	  c.insert(c.end(), __first, __last);
-	  std::make_heap(c.begin(), c.end(), comp);
-	}
-#endif
-
-      /**
-       *  Returns true if the %queue is empty.
-       */
-      bool
-      empty() const
-      { return c.empty(); }
-
-      /**  Returns the number of elements in the %queue.  */
-      size_type
-      size() const
-      { return c.size(); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %queue.
-       */
-      const_reference
-      top() const
-      {
-	__glibcxx_requires_nonempty();
-	return c.front();
-      }
-
-      /**
-       *  @brief  Add data to the %queue.
-       *  @param  __x  Data to be added.
-       *
-       *  This is a typical %queue operation.
-       *  The time complexity of the operation depends on the underlying
-       *  sequence.
-       */
-      void
-      push(const value_type& __x)
-      {
-	c.push_back(__x);
-	std::push_heap(c.begin(), c.end(), comp);
-      }
-
-#if __cplusplus >= 201103L
-      void
-      push(value_type&& __x)
-      {
-	c.push_back(std::move(__x));
-	std::push_heap(c.begin(), c.end(), comp);
-      }
-
-      template<typename... _Args>
-        void
-        emplace(_Args&&... __args)
-	{
-	  c.emplace_back(std::forward<_Args>(__args)...);
-	  std::push_heap(c.begin(), c.end(), comp);
-	}
-#endif
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical %queue operation.  It shrinks the %queue
-       *  by one.  The time complexity of the operation depends on the
-       *  underlying sequence.
-       *
-       *  Note that no data is returned, and if the first element's
-       *  data is needed, it should be retrieved before pop() is
-       *  called.
-       */
-      void
-      pop()
-      {
-	__glibcxx_requires_nonempty();
-	std::pop_heap(c.begin(), c.end(), comp);
-	c.pop_back();
-      }
-
-#if __cplusplus >= 201103L
-      void
-      swap(priority_queue& __pq)
-      noexcept(noexcept(swap(c, __pq.c)) && noexcept(swap(comp, __pq.comp)))
-      {
-	using std::swap;
-	swap(c, __pq.c);
-	swap(comp, __pq.comp);
-      }
-#endif
-    };
-
-  // No equality/comparison operators are provided for priority_queue.
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Sequence, typename _Compare>
-    inline void
-    swap(priority_queue<_Tp, _Sequence, _Compare>& __x,
-	 priority_queue<_Tp, _Sequence, _Compare>& __y)
-    noexcept(noexcept(__x.swap(__y)))
-    { __x.swap(__y); }
-
-  template<typename _Tp, typename _Sequence, typename _Compare,
-	   typename _Alloc>
-    struct uses_allocator<priority_queue<_Tp, _Sequence, _Compare>, _Alloc>
-    : public uses_allocator<_Sequence, _Alloc>::type { };
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _STL_QUEUE_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_raw_storage_iter.h b/openflow/usr/include/c++/5/bits/stl_raw_storage_iter.h
deleted file mode 100644
index 2ce83ff..0000000
--- a/openflow/usr/include/c++/5/bits/stl_raw_storage_iter.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_raw_storage_iter.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _STL_RAW_STORAGE_ITERATOR_H
-#define _STL_RAW_STORAGE_ITERATOR_H 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  This iterator class lets algorithms store their results into
-   *  uninitialized memory.
-  */
-  template <class _OutputIterator, class _Tp>
-    class raw_storage_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    protected:
-      _OutputIterator _M_iter;
-
-    public:
-      explicit
-      raw_storage_iterator(_OutputIterator __x)
-      : _M_iter(__x) {}
-
-      raw_storage_iterator&
-      operator*() { return *this; }
-
-      raw_storage_iterator&
-      operator=(const _Tp& __element)
-      {
-	std::_Construct(std::__addressof(*_M_iter), __element);
-	return *this;
-      }
-
-      raw_storage_iterator<_OutputIterator, _Tp>&
-      operator++()
-      {
-	++_M_iter;
-	return *this;
-      }
-
-      raw_storage_iterator<_OutputIterator, _Tp>
-      operator++(int)
-      {
-	raw_storage_iterator<_OutputIterator, _Tp> __tmp = *this;
-	++_M_iter;
-	return __tmp;
-      }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/stl_relops.h b/openflow/usr/include/c++/5/bits/stl_relops.h
deleted file mode 100644
index b09694f..0000000
--- a/openflow/usr/include/c++/5/bits/stl_relops.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// std::rel_ops implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the, 2009 Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file bits/stl_relops.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{utility}
- *
- *  Inclusion of this file has been removed from
- *  all of the other STL headers for safety reasons, except std_utility.h.
- *  For more information, see the thread of about twenty messages starting
- *  with http://gcc.gnu.org/ml/libstdc++/2001-01/msg00223.html, or
- *  http://gcc.gnu.org/onlinedocs/libstdc++/faq.html#faq.ambiguous_overloads
- *
- *  Short summary: the rel_ops operators should be avoided for the present.
- */
-
-#ifndef _STL_RELOPS_H
-#define _STL_RELOPS_H 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-  namespace rel_ops
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /** @namespace std::rel_ops
-     *  @brief  The generated relational operators are sequestered here.
-     */
-
-    /**
-     *  @brief Defines @c != for arbitrary types, in terms of @c ==.
-     *  @param  __x  A thing.
-     *  @param  __y  Another thing.
-     *  @return   __x != __y
-     *
-     *  This function uses @c == to determine its result.
-     */
-    template <class _Tp>
-      inline bool
-      operator!=(const _Tp& __x, const _Tp& __y)
-      { return !(__x == __y); }
-
-    /**
-     *  @brief Defines @c > for arbitrary types, in terms of @c <.
-     *  @param  __x  A thing.
-     *  @param  __y  Another thing.
-     *  @return   __x > __y
-     *
-     *  This function uses @c < to determine its result.
-     */
-    template <class _Tp>
-      inline bool
-      operator>(const _Tp& __x, const _Tp& __y)
-      { return __y < __x; }
-
-    /**
-     *  @brief Defines @c <= for arbitrary types, in terms of @c <.
-     *  @param  __x  A thing.
-     *  @param  __y  Another thing.
-     *  @return   __x <= __y
-     *
-     *  This function uses @c < to determine its result.
-     */
-    template <class _Tp>
-      inline bool
-      operator<=(const _Tp& __x, const _Tp& __y)
-      { return !(__y < __x); }
-
-    /**
-     *  @brief Defines @c >= for arbitrary types, in terms of @c <.
-     *  @param  __x  A thing.
-     *  @param  __y  Another thing.
-     *  @return   __x >= __y
-     *
-     *  This function uses @c < to determine its result.
-     */
-    template <class _Tp>
-      inline bool
-      operator>=(const _Tp& __x, const _Tp& __y)
-      { return !(__x < __y); }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace rel_ops
-
-} // namespace std
-
-#endif /* _STL_RELOPS_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_set.h b/openflow/usr/include/c++/5/bits/stl_set.h
deleted file mode 100644
index 35cdf71..0000000
--- a/openflow/usr/include/c++/5/bits/stl_set.h
+++ /dev/null
@@ -1,899 +0,0 @@
-// Set implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_set.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{set}
- */
-
-#ifndef _STL_SET_H
-#define _STL_SET_H 1
-
-#include <bits/concept_check.h>
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /**
-   *  @brief A standard container made up of unique keys, which can be
-   *  retrieved in logarithmic time.
-   *
-   *  @ingroup associative_containers
-   *
-   *  @tparam _Key  Type of key objects.
-   *  @tparam _Compare  Comparison function object type, defaults to less<_Key>.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_Key>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and an
-   *  <a href="tables.html#69">associative container</a> (using unique keys).
-   *
-   *  Sets support bidirectional iterators.
-   *
-   *  The private tree data is declared exactly the same way for set and
-   *  multiset; the distinction is made entirely in how the tree functions are
-   *  called (*_unique versus *_equal, same as the standard).
-  */
-  template<typename _Key, typename _Compare = std::less<_Key>,
-	   typename _Alloc = std::allocator<_Key> >
-    class set
-    {
-      // concept requirements
-      typedef typename _Alloc::value_type                   _Alloc_value_type;
-      __glibcxx_class_requires(_Key, _SGIAssignableConcept)
-      __glibcxx_class_requires4(_Compare, bool, _Key, _Key,
-				_BinaryFunctionConcept)
-      __glibcxx_class_requires2(_Key, _Alloc_value_type, _SameTypeConcept)
-
-    public:
-      // typedefs:
-      //@{
-      /// Public typedefs.
-      typedef _Key     key_type;
-      typedef _Key     value_type;
-      typedef _Compare key_compare;
-      typedef _Compare value_compare;
-      typedef _Alloc   allocator_type;
-      //@}
-
-    private:
-      typedef typename __gnu_cxx::__alloc_traits<_Alloc>::template
-	rebind<_Key>::other _Key_alloc_type;
-
-      typedef _Rb_tree<key_type, value_type, _Identity<value_type>,
-		       key_compare, _Key_alloc_type> _Rep_type;
-      _Rep_type _M_t;  // Red-black tree representing set.
-
-      typedef __gnu_cxx::__alloc_traits<_Key_alloc_type> _Alloc_traits;
-
-    public:
-      //@{
-      ///  Iterator-related typedefs.
-      typedef typename _Alloc_traits::pointer		    pointer;
-      typedef typename _Alloc_traits::const_pointer	    const_pointer;
-      typedef typename _Alloc_traits::reference		    reference;
-      typedef typename _Alloc_traits::const_reference	    const_reference;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 103. set::iterator is required to be modifiable,
-      // but this allows modification of keys.
-      typedef typename _Rep_type::const_iterator            iterator;
-      typedef typename _Rep_type::const_iterator            const_iterator;
-      typedef typename _Rep_type::const_reverse_iterator    reverse_iterator;
-      typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
-      typedef typename _Rep_type::size_type                 size_type;
-      typedef typename _Rep_type::difference_type           difference_type;
-      //@}
-
-      // allocation/deallocation
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      set()
-#if __cplusplus >= 201103L
-      noexcept(is_nothrow_default_constructible<allocator_type>::value)
-#endif
-      : _M_t() { }
-
-      /**
-       *  @brief  Creates a %set with no elements.
-       *  @param  __comp  Comparator to use.
-       *  @param  __a  An allocator object.
-       */
-      explicit
-      set(const _Compare& __comp,
-	  const allocator_type& __a = allocator_type())
-      : _M_t(__comp, _Key_alloc_type(__a)) { }
-
-      /**
-       *  @brief  Builds a %set from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *
-       *  Create a %set consisting of copies of the elements from
-       *  [__first,__last).  This is linear in N if the range is
-       *  already sorted, and NlogN otherwise (where N is
-       *  distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-	set(_InputIterator __first, _InputIterator __last)
-	: _M_t()
-	{ _M_t._M_insert_unique(__first, __last); }
-
-      /**
-       *  @brief  Builds a %set from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param  __comp  A comparison functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %set consisting of copies of the elements from
-       *  [__first,__last).  This is linear in N if the range is
-       *  already sorted, and NlogN otherwise (where N is
-       *  distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-	set(_InputIterator __first, _InputIterator __last,
-	    const _Compare& __comp,
-	    const allocator_type& __a = allocator_type())
-	: _M_t(__comp, _Key_alloc_type(__a))
-        { _M_t._M_insert_unique(__first, __last); }
-
-      /**
-       *  @brief  %Set copy constructor.
-       *  @param  __x  A %set of identical element and allocator types.
-       *
-       *  The newly-created %set uses a copy of the allocation object used
-       *  by @a __x.
-       */
-      set(const set& __x)
-      : _M_t(__x._M_t) { }
-
-#if __cplusplus >= 201103L
-     /**
-       *  @brief %Set move constructor
-       *  @param __x  A %set of identical element and allocator types.
-       *
-       *  The newly-created %set contains the exact contents of @a x.
-       *  The contents of @a x are a valid, but unspecified %set.
-       */
-      set(set&& __x)
-      noexcept(is_nothrow_copy_constructible<_Compare>::value)
-      : _M_t(std::move(__x._M_t)) { }
-
-      /**
-       *  @brief  Builds a %set from an initializer_list.
-       *  @param  __l  An initializer_list.
-       *  @param  __comp  A comparison functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create a %set consisting of copies of the elements in the list.
-       *  This is linear in N if the list is already sorted, and NlogN
-       *  otherwise (where N is @a __l.size()).
-       */
-      set(initializer_list<value_type> __l,
-	  const _Compare& __comp = _Compare(),
-	  const allocator_type& __a = allocator_type())
-      : _M_t(__comp, _Key_alloc_type(__a))
-      { _M_t._M_insert_unique(__l.begin(), __l.end()); }
-
-      /// Allocator-extended default constructor.
-      explicit
-      set(const allocator_type& __a)
-      : _M_t(_Compare(), _Key_alloc_type(__a)) { }
-
-      /// Allocator-extended copy constructor.
-      set(const set& __x, const allocator_type& __a)
-      : _M_t(__x._M_t, _Key_alloc_type(__a)) { }
-
-      /// Allocator-extended move constructor.
-      set(set&& __x, const allocator_type& __a)
-      noexcept(is_nothrow_copy_constructible<_Compare>::value
-	       && _Alloc_traits::_S_always_equal())
-      : _M_t(std::move(__x._M_t), _Key_alloc_type(__a)) { }
-
-      /// Allocator-extended initialier-list constructor.
-      set(initializer_list<value_type> __l, const allocator_type& __a)
-      : _M_t(_Compare(), _Key_alloc_type(__a))
-      { _M_t._M_insert_unique(__l.begin(), __l.end()); }
-
-      /// Allocator-extended range constructor.
-      template<typename _InputIterator>
-        set(_InputIterator __first, _InputIterator __last,
-	    const allocator_type& __a)
-	: _M_t(_Compare(), _Key_alloc_type(__a))
-        { _M_t._M_insert_unique(__first, __last); }
-#endif
-
-      /**
-       *  @brief  %Set assignment operator.
-       *  @param  __x  A %set of identical element and allocator types.
-       *
-       *  All the elements of @a __x are copied, but unlike the copy
-       *  constructor, the allocator object is not copied.
-       */
-      set&
-      operator=(const set& __x)
-      {
-	_M_t = __x._M_t;
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /// Move assignment operator.
-      set&
-      operator=(set&&) = default;
-
-      /**
-       *  @brief  %Set list assignment operator.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills a %set with copies of the elements in the
-       *  initializer list @a __l.
-       *
-       *  Note that the assignment completely changes the %set and
-       *  that the resulting %set's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      set&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_t._M_assign_unique(__l.begin(), __l.end());
-	return *this;
-      }
-#endif
-
-      // accessors:
-
-      ///  Returns the comparison object with which the %set was constructed.
-      key_compare
-      key_comp() const
-      { return _M_t.key_comp(); }
-      ///  Returns the comparison object with which the %set was constructed.
-      value_compare
-      value_comp() const
-      { return _M_t.key_comp(); }
-      ///  Returns the allocator object with which the %set was constructed.
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return allocator_type(_M_t.get_allocator()); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %set.  Iteration is done in ascending order according
-       *  to the keys.
-       */
-      iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %set.  Iteration is done in ascending order according
-       *  to the keys.
-       */
-      iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the last
-       *  element in the %set.  Iteration is done in descending order according
-       *  to the keys.
-       */
-      reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last pair in the %set.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return _M_t.rend(); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %set.  Iteration is done in ascending order according
-       *  to the keys.
-       */
-      iterator
-      cbegin() const noexcept
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %set.  Iteration is done in ascending order according
-       *  to the keys.
-       */
-      iterator
-      cend() const noexcept
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the last
-       *  element in the %set.  Iteration is done in descending order according
-       *  to the keys.
-       */
-      reverse_iterator
-      crbegin() const noexcept
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last pair in the %set.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      crend() const noexcept
-      { return _M_t.rend(); }
-#endif
-
-      ///  Returns true if the %set is empty.
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return _M_t.empty(); }
-
-      ///  Returns the size of the %set.
-      size_type
-      size() const _GLIBCXX_NOEXCEPT
-      { return _M_t.size(); }
-
-      ///  Returns the maximum size of the %set.
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return _M_t.max_size(); }
-
-      /**
-       *  @brief  Swaps data with another %set.
-       *  @param  __x  A %set of the same element and allocator types.
-       *
-       *  This exchanges the elements between two sets in constant
-       *  time.  (It is only swapping a pointer, an integer, and an
-       *  instance of the @c Compare type (which itself is often
-       *  stateless and empty), so it should be quite fast.)  Note
-       *  that the global std::swap() function is specialized such
-       *  that std::swap(s1,s2) will feed to this function.
-       */
-      void
-      swap(set& __x)
-#if __cplusplus >= 201103L
-      noexcept(_Alloc_traits::_S_nothrow_swap())
-#endif
-      { _M_t.swap(__x._M_t); }
-
-      // insert/erase
-#if __cplusplus >= 201103L
-      /**
-       *  @brief Attempts to build and insert an element into the %set.
-       *  @param __args  Arguments used to generate an element.
-       *  @return  A pair, of which the first element is an iterator that points
-       *           to the possibly inserted element, and the second is a bool
-       *           that is true if the element was actually inserted.
-       *
-       *  This function attempts to build and insert an element into the %set.
-       *  A %set relies on unique keys and thus an element is only inserted if
-       *  it is not already present in the %set.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{ return _M_t._M_emplace_unique(std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief Attempts to insert an element into the %set.
-       *  @param  __pos  An iterator that serves as a hint as to where the
-       *                element should be inserted.
-       *  @param  __args  Arguments used to generate the element to be
-       *                 inserted.
-       *  @return An iterator that points to the element with key equivalent to
-       *          the one generated from @a __args (may or may not be the
-       *          element itself).
-       *
-       *  This function is not concerned about whether the insertion took place,
-       *  and thus does not return a boolean like the single-argument emplace()
-       *  does.  Note that the first parameter is only a hint and can
-       *  potentially improve the performance of the insertion process.  A bad
-       *  hint would cause no gains in efficiency.
-       *
-       *  For more on @a hinting, see:
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  return _M_t._M_emplace_hint_unique(__pos,
-					     std::forward<_Args>(__args)...);
-	}
-#endif
-
-      /**
-       *  @brief Attempts to insert an element into the %set.
-       *  @param  __x  Element to be inserted.
-       *  @return  A pair, of which the first element is an iterator that points
-       *           to the possibly inserted element, and the second is a bool
-       *           that is true if the element was actually inserted.
-       *
-       *  This function attempts to insert an element into the %set.  A %set
-       *  relies on unique keys and thus an element is only inserted if it is
-       *  not already present in the %set.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      std::pair<iterator, bool>
-      insert(const value_type& __x)
-      {
-	std::pair<typename _Rep_type::iterator, bool> __p =
-	  _M_t._M_insert_unique(__x);
-	return std::pair<iterator, bool>(__p.first, __p.second);
-      }
-
-#if __cplusplus >= 201103L
-      std::pair<iterator, bool>
-      insert(value_type&& __x)
-      {
-	std::pair<typename _Rep_type::iterator, bool> __p =
-	  _M_t._M_insert_unique(std::move(__x));
-	return std::pair<iterator, bool>(__p.first, __p.second);
-      }
-#endif
-
-      /**
-       *  @brief Attempts to insert an element into the %set.
-       *  @param  __position  An iterator that serves as a hint as to where the
-       *                    element should be inserted.
-       *  @param  __x  Element to be inserted.
-       *  @return An iterator that points to the element with key of
-       *           @a __x (may or may not be the element passed in).
-       *
-       *  This function is not concerned about whether the insertion took place,
-       *  and thus does not return a boolean like the single-argument insert()
-       *  does.  Note that the first parameter is only a hint and can
-       *  potentially improve the performance of the insertion process.  A bad
-       *  hint would cause no gains in efficiency.
-       *
-       *  For more on @a hinting, see:
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      iterator
-      insert(const_iterator __position, const value_type& __x)
-      { return _M_t._M_insert_unique_(__position, __x); }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __position, value_type&& __x)
-      { return _M_t._M_insert_unique_(__position, std::move(__x)); }
-#endif
-
-      /**
-       *  @brief A template function that attempts to insert a range
-       *  of elements.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   inserted.
-       *  @param  __last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{ _M_t._M_insert_unique(__first, __last); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief Attempts to insert a list of elements into the %set.
-       *  @param  __l  A std::initializer_list<value_type> of elements
-       *               to be inserted.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      void
-      insert(initializer_list<value_type> __l)
-      { this->insert(__l.begin(), __l.end()); }
-#endif
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      /**
-       *  @brief Erases an element from a %set.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *  @return An iterator pointing to the element immediately following
-       *          @a __position prior to the element being erased. If no such
-       *          element exists, end() is returned.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from a %set.  Note that this function only erases the element, and
-       *  that if the element is itself a pointer, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      _GLIBCXX_ABI_TAG_CXX11
-      iterator
-      erase(const_iterator __position)
-      { return _M_t.erase(__position); }
-#else
-      /**
-       *  @brief Erases an element from a %set.
-       *  @param  position  An iterator pointing to the element to be erased.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from a %set.  Note that this function only erases the element, and
-       *  that if the element is itself a pointer, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      void
-      erase(iterator __position)
-      { _M_t.erase(__position); }
-#endif
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  __x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all the elements located by the given key from
-       *  a %set.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_t.erase(__x); }
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      /**
-       *  @brief Erases a [__first,__last) range of elements from a %set.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                 erased.
-
-       *  @param __last Iterator pointing to the end of the range to
-       *  be erased.
-       *  @return The iterator @a __last.
-       *
-       *  This function erases a sequence of elements from a %set.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      _GLIBCXX_ABI_TAG_CXX11
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      { return _M_t.erase(__first, __last); }
-#else
-      /**
-       *  @brief Erases a [first,last) range of elements from a %set.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                 erased.
-       *  @param __last Iterator pointing to the end of the range to
-       *  be erased.
-       *
-       *  This function erases a sequence of elements from a %set.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      void
-      erase(iterator __first, iterator __last)
-      { _M_t.erase(__first, __last); }
-#endif
-
-      /**
-       *  Erases all elements in a %set.  Note that this function only erases
-       *  the elements, and that if the elements themselves are pointers, the
-       *  pointed-to memory is not touched in any way.  Managing the pointer is
-       *  the user's responsibility.
-       */
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      { _M_t.clear(); }
-
-      // set operations:
-
-      //@{
-      /**
-       *  @brief  Finds the number of elements.
-       *  @param  __x  Element to located.
-       *  @return  Number of elements with specified key.
-       *
-       *  This function only makes sense for multisets; for set the result will
-       *  either be 0 (not present) or 1 (present).
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_t.find(__x) == _M_t.end() ? 0 : 1; }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	count(const _Kt& __x) const
-	-> decltype(_M_t._M_count_tr(__x))
-	{ return _M_t._M_find_tr(__x) == _M_t.end() ? 0 : 1; }
-#endif
-      //@}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214.  set::find() missing const overload
-      //@{
-      /**
-       *  @brief Tries to locate an element in a %set.
-       *  @param  __x  Element to be located.
-       *  @return  Iterator pointing to sought-after element, or end() if not
-       *           found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after element.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_t.find(__x); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_t.find(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	find(const _Kt& __x)
-	-> decltype(iterator{_M_t._M_find_tr(__x)})
-	{ return iterator{_M_t._M_find_tr(__x)}; }
-
-      template<typename _Kt>
-	auto
-	find(const _Kt& __x) const
-	-> decltype(const_iterator{_M_t._M_find_tr(__x)})
-	{ return const_iterator{_M_t._M_find_tr(__x)}; }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  __x  Key to be located.
-       *  @return  Iterator pointing to first element equal to or greater
-       *           than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful it returns an iterator
-       *  pointing to the first element that has a greater value than given key
-       *  or end() if no such element exists.
-       */
-      iterator
-      lower_bound(const key_type& __x)
-      { return _M_t.lower_bound(__x); }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return _M_t.lower_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	lower_bound(const _Kt& __x)
-	-> decltype(_M_t._M_lower_bound_tr(__x))
-	{ return _M_t._M_lower_bound_tr(__x); }
-
-      template<typename _Kt>
-	auto
-	lower_bound(const _Kt& __x) const
-	-> decltype(_M_t._M_lower_bound_tr(__x))
-	{ return _M_t._M_lower_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  __x  Key to be located.
-       *  @return Iterator pointing to the first element
-       *          greater than key, or end().
-       */
-      iterator
-      upper_bound(const key_type& __x)
-      { return _M_t.upper_bound(__x); }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return _M_t.upper_bound(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	upper_bound(const _Kt& __x)
-	-> decltype(_M_t._M_upper_bound_tr(__x))
-	{ return _M_t._M_upper_bound_tr(__x); }
-
-      template<typename _Kt>
-	auto
-	upper_bound(const _Kt& __x) const
-	-> decltype(_M_t._M_upper_bound_tr(__x))
-	{ return _M_t._M_upper_bound_tr(__x); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  __x  Key to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       *
-       *  This function probably only makes sense for multisets.
-       */
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __x)
-      { return _M_t.equal_range(__x); }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_t.equal_range(__x); }
-
-#if __cplusplus > 201103L
-      template<typename _Kt>
-	auto
-	equal_range(const _Kt& __x)
-	-> decltype(_M_t._M_equal_range_tr(__x))
-	{ return _M_t._M_equal_range_tr(__x); }
-
-      template<typename _Kt>
-	auto
-	equal_range(const _Kt& __x) const
-	-> decltype(_M_t._M_equal_range_tr(__x))
-	{ return _M_t._M_equal_range_tr(__x); }
-#endif
-      //@}
-
-      template<typename _K1, typename _C1, typename _A1>
-	friend bool
-	operator==(const set<_K1, _C1, _A1>&, const set<_K1, _C1, _A1>&);
-
-      template<typename _K1, typename _C1, typename _A1>
-	friend bool
-	operator<(const set<_K1, _C1, _A1>&, const set<_K1, _C1, _A1>&);
-    };
-
-
-  /**
-   *  @brief  Set equality comparison.
-   *  @param  __x  A %set.
-   *  @param  __y  A %set of the same type as @a x.
-   *  @return  True iff the size and elements of the sets are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the sets.
-   *  Sets are considered equivalent if their sizes are equal, and if
-   *  corresponding elements compare equal.
-  */
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator==(const set<_Key, _Compare, _Alloc>& __x,
-	       const set<_Key, _Compare, _Alloc>& __y)
-    { return __x._M_t == __y._M_t; }
-
-  /**
-   *  @brief  Set ordering relation.
-   *  @param  __x  A %set.
-   *  @param  __y  A %set of the same type as @a x.
-   *  @return  True iff @a __x is lexicographically less than @a __y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  sets.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator<(const set<_Key, _Compare, _Alloc>& __x,
-	      const set<_Key, _Compare, _Alloc>& __y)
-    { return __x._M_t < __y._M_t; }
-
-  ///  Returns !(x == y).
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator!=(const set<_Key, _Compare, _Alloc>& __x,
-	       const set<_Key, _Compare, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  ///  Returns y < x.
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator>(const set<_Key, _Compare, _Alloc>& __x,
-	      const set<_Key, _Compare, _Alloc>& __y)
-    { return __y < __x; }
-
-  ///  Returns !(y < x)
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator<=(const set<_Key, _Compare, _Alloc>& __x,
-	       const set<_Key, _Compare, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  ///  Returns !(x < y)
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline bool
-    operator>=(const set<_Key, _Compare, _Alloc>& __x,
-	       const set<_Key, _Compare, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::set::swap().
-  template<typename _Key, typename _Compare, typename _Alloc>
-    inline void
-    swap(set<_Key, _Compare, _Alloc>& __x, set<_Key, _Compare, _Alloc>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} //namespace std
-#endif /* _STL_SET_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_stack.h b/openflow/usr/include/c++/5/bits/stl_stack.h
deleted file mode 100644
index 3ff307f..0000000
--- a/openflow/usr/include/c++/5/bits/stl_stack.h
+++ /dev/null
@@ -1,306 +0,0 @@
-// Stack implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_stack.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{stack}
- */
-
-#ifndef _STL_STACK_H
-#define _STL_STACK_H 1
-
-#include <bits/concept_check.h>
-#include <debug/debug.h>
-#if __cplusplus >= 201103L
-# include <bits/uses_allocator.h>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief  A standard container giving FILO behavior.
-   *
-   *  @ingroup sequences
-   *
-   *  @tparam _Tp  Type of element.
-   *  @tparam _Sequence  Type of underlying sequence, defaults to deque<_Tp>.
-   *
-   *  Meets many of the requirements of a
-   *  <a href="tables.html#65">container</a>,
-   *  but does not define anything to do with iterators.  Very few of the
-   *  other standard container interfaces are defined.
-   *
-   *  This is not a true container, but an @e adaptor.  It holds
-   *  another container, and provides a wrapper interface to that
-   *  container.  The wrapper is what enforces strict
-   *  first-in-last-out %stack behavior.
-   *
-   *  The second template parameter defines the type of the underlying
-   *  sequence/container.  It defaults to std::deque, but it can be
-   *  any type that supports @c back, @c push_back, and @c pop_front,
-   *  such as std::list, std::vector, or an appropriate user-defined
-   *  type.
-   *
-   *  Members not found in @a normal containers are @c container_type,
-   *  which is a typedef for the second Sequence parameter, and @c
-   *  push, @c pop, and @c top, which are standard %stack/FILO
-   *  operations.
-  */
-  template<typename _Tp, typename _Sequence = deque<_Tp> >
-    class stack
-    {
-      // concept requirements
-      typedef typename _Sequence::value_type _Sequence_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires(_Sequence, _BackInsertionSequenceConcept)
-      __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
-
-      template<typename _Tp1, typename _Seq1>
-        friend bool
-        operator==(const stack<_Tp1, _Seq1>&, const stack<_Tp1, _Seq1>&);
-
-      template<typename _Tp1, typename _Seq1>
-        friend bool
-        operator<(const stack<_Tp1, _Seq1>&, const stack<_Tp1, _Seq1>&);
-
-    public:
-      typedef typename _Sequence::value_type                value_type;
-      typedef typename _Sequence::reference                 reference;
-      typedef typename _Sequence::const_reference           const_reference;
-      typedef typename _Sequence::size_type                 size_type;
-      typedef          _Sequence                            container_type;
-
-    protected:
-      //  See queue::c for notes on this name.
-      _Sequence c;
-
-    public:
-      // XXX removed old def ctor, added def arg to this one to match 14882
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-#if __cplusplus < 201103L
-      explicit
-      stack(const _Sequence& __c = _Sequence())
-      : c(__c) { }
-#else
-      explicit
-      stack(const _Sequence& __c)
-      : c(__c) { }
-
-      explicit
-      stack(_Sequence&& __c = _Sequence())
-      : c(std::move(__c)) { }
-#endif
-
-      /**
-       *  Returns true if the %stack is empty.
-       */
-      bool
-      empty() const
-      { return c.empty(); }
-
-      /**  Returns the number of elements in the %stack.  */
-      size_type
-      size() const
-      { return c.size(); }
-
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %stack.
-       */
-      reference
-      top()
-      {
-	__glibcxx_requires_nonempty();
-	return c.back();
-      }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %stack.
-       */
-      const_reference
-      top() const
-      {
-	__glibcxx_requires_nonempty();
-	return c.back();
-      }
-
-      /**
-       *  @brief  Add data to the top of the %stack.
-       *  @param  __x  Data to be added.
-       *
-       *  This is a typical %stack operation.  The function creates an
-       *  element at the top of the %stack and assigns the given data
-       *  to it.  The time complexity of the operation depends on the
-       *  underlying sequence.
-       */
-      void
-      push(const value_type& __x)
-      { c.push_back(__x); }
-
-#if __cplusplus >= 201103L
-      void
-      push(value_type&& __x)
-      { c.push_back(std::move(__x)); }
-
-      template<typename... _Args>
-        void
-        emplace(_Args&&... __args)
-	{ c.emplace_back(std::forward<_Args>(__args)...); }
-#endif
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical %stack operation.  It shrinks the %stack
-       *  by one.  The time complexity of the operation depends on the
-       *  underlying sequence.
-       *
-       *  Note that no data is returned, and if the first element's
-       *  data is needed, it should be retrieved before pop() is
-       *  called.
-       */
-      void
-      pop()
-      {
-	__glibcxx_requires_nonempty();
-	c.pop_back();
-      }
-
-#if __cplusplus >= 201103L
-      void
-      swap(stack& __s)
-      noexcept(noexcept(swap(c, __s.c)))
-      {
-	using std::swap;
-	swap(c, __s.c);
-      }
-#endif
-    };
-
-  /**
-   *  @brief  Stack equality comparison.
-   *  @param  __x  A %stack.
-   *  @param  __y  A %stack of the same type as @a __x.
-   *  @return  True iff the size and elements of the stacks are equal.
-   *
-   *  This is an equivalence relation.  Complexity and semantics
-   *  depend on the underlying sequence type, but the expected rules
-   *  are: this relation is linear in the size of the sequences, and
-   *  stacks are considered equivalent if their sequences compare
-   *  equal.
-  */
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator==(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return __x.c == __y.c; }
-
-  /**
-   *  @brief  Stack ordering relation.
-   *  @param  __x  A %stack.
-   *  @param  __y  A %stack of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a __y.
-   *
-   *  This is an total ordering relation.  Complexity and semantics
-   *  depend on the underlying sequence type, but the expected rules
-   *  are: this relation is linear in the size of the sequences, the
-   *  elements must be comparable with @c <, and
-   *  std::lexicographical_compare() is usually used to make the
-   *  determination.
-  */
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator<(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return __x.c < __y.c; }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator!=(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator>(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator<=(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator>=(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return !(__x < __y); }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Seq>
-    inline void
-    swap(stack<_Tp, _Seq>& __x, stack<_Tp, _Seq>& __y)
-    noexcept(noexcept(__x.swap(__y)))
-    { __x.swap(__y); }
-
-  template<typename _Tp, typename _Seq, typename _Alloc>
-    struct uses_allocator<stack<_Tp, _Seq>, _Alloc>
-    : public uses_allocator<_Seq, _Alloc>::type { };
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _STL_STACK_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_tempbuf.h b/openflow/usr/include/c++/5/bits/stl_tempbuf.h
deleted file mode 100644
index af17091..0000000
--- a/openflow/usr/include/c++/5/bits/stl_tempbuf.h
+++ /dev/null
@@ -1,271 +0,0 @@
-// Temporary buffer implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_tempbuf.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _STL_TEMPBUF_H
-#define _STL_TEMPBUF_H 1
-
-#include <bits/stl_algobase.h>
-#include <bits/stl_construct.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief Allocates a temporary buffer.
-   *  @param  __len  The number of objects of type Tp.
-   *  @return See full description.
-   *
-   *  Reinventing the wheel, but this time with prettier spokes!
-   *
-   *  This function tries to obtain storage for @c __len adjacent Tp
-   *  objects.  The objects themselves are not constructed, of course.
-   *  A pair<> is returned containing <em>the buffer s address and
-   *  capacity (in the units of sizeof(_Tp)), or a pair of 0 values if
-   *  no storage can be obtained.</em>  Note that the capacity obtained
-   *  may be less than that requested if the memory is unavailable;
-   *  you should compare len with the .second return value.
-   *
-   * Provides the nothrow exception guarantee.
-   */
-  template<typename _Tp>
-    pair<_Tp*, ptrdiff_t>
-    get_temporary_buffer(ptrdiff_t __len) _GLIBCXX_NOEXCEPT
-    {
-      const ptrdiff_t __max =
-	__gnu_cxx::__numeric_traits<ptrdiff_t>::__max / sizeof(_Tp);
-      if (__len > __max)
-	__len = __max;
-      
-      while (__len > 0) 
-	{
-	  _Tp* __tmp = static_cast<_Tp*>(::operator new(__len * sizeof(_Tp), 
-							std::nothrow));
-	  if (__tmp != 0)
-	    return std::pair<_Tp*, ptrdiff_t>(__tmp, __len);
-	  __len /= 2;
-	}
-      return std::pair<_Tp*, ptrdiff_t>(static_cast<_Tp*>(0), 0);
-    }
-
-  /**
-   *  @brief The companion to get_temporary_buffer().
-   *  @param  __p  A buffer previously allocated by get_temporary_buffer.
-   *  @return   None.
-   *
-   *  Frees the memory pointed to by __p.
-   */
-  template<typename _Tp>
-    inline void
-    return_temporary_buffer(_Tp* __p)
-    { ::operator delete(__p, std::nothrow); }
-
-
-  /**
-   *  This class is used in two places: stl_algo.h and ext/memory,
-   *  where it is wrapped as the temporary_buffer class.  See
-   *  temporary_buffer docs for more notes.
-   */
-  template<typename _ForwardIterator, typename _Tp>
-    class _Temporary_buffer
-    {
-      // concept requirements
-      __glibcxx_class_requires(_ForwardIterator, _ForwardIteratorConcept)
-
-    public:
-      typedef _Tp         value_type;
-      typedef value_type* pointer;
-      typedef pointer     iterator;
-      typedef ptrdiff_t   size_type;
-
-    protected:
-      size_type  _M_original_len;
-      size_type  _M_len;
-      pointer    _M_buffer;
-
-    public:
-      /// As per Table mumble.
-      size_type
-      size() const
-      { return _M_len; }
-
-      /// Returns the size requested by the constructor; may be >size().
-      size_type
-      requested_size() const
-      { return _M_original_len; }
-
-      /// As per Table mumble.
-      iterator
-      begin()
-      { return _M_buffer; }
-
-      /// As per Table mumble.
-      iterator
-      end()
-      { return _M_buffer + _M_len; }
-
-      /**
-       * Constructs a temporary buffer of a size somewhere between
-       * zero and the size of the given range.
-       */
-      _Temporary_buffer(_ForwardIterator __first, _ForwardIterator __last);
-
-      ~_Temporary_buffer()
-      {
-	std::_Destroy(_M_buffer, _M_buffer + _M_len);
-	std::return_temporary_buffer(_M_buffer);
-      }
-
-    private:
-      // Disable copy constructor and assignment operator.
-      _Temporary_buffer(const _Temporary_buffer&);
-
-      void
-      operator=(const _Temporary_buffer&);
-    };
-
-
-  template<bool>
-    struct __uninitialized_construct_buf_dispatch
-    {
-      template<typename _Pointer, typename _ForwardIterator>
-        static void
-        __ucr(_Pointer __first, _Pointer __last,
-	      _ForwardIterator __seed)
-        {
-	  if(__first == __last)
-	    return;
-
-	  _Pointer __cur = __first;
-	  __try
-	    {
-	      std::_Construct(std::__addressof(*__first),
-			      _GLIBCXX_MOVE(*__seed));
-	      _Pointer __prev = __cur;
-	      ++__cur;
-	      for(; __cur != __last; ++__cur, ++__prev)
-		std::_Construct(std::__addressof(*__cur),
-				_GLIBCXX_MOVE(*__prev));
-	      *__seed = _GLIBCXX_MOVE(*__prev);
-	    }
-	  __catch(...)
-	    {
-	      std::_Destroy(__first, __cur);
-	      __throw_exception_again;
-	    }
-	}
-    };
-
-  template<>
-    struct __uninitialized_construct_buf_dispatch<true>
-    {
-      template<typename _Pointer, typename _ForwardIterator>
-        static void
-        __ucr(_Pointer, _Pointer, _ForwardIterator) { }
-    };
-
-  // Constructs objects in the range [first, last).
-  // Note that while these new objects will take valid values,
-  // their exact value is not defined. In particular they may
-  // be 'moved from'.
-  //
-  // While *__seed may be altered during this algorithm, it will have
-  // the same value when the algorithm finishes, unless one of the
-  // constructions throws.
-  //
-  // Requirements: _Pointer::value_type(_Tp&&) is valid.
-  template<typename _Pointer, typename _ForwardIterator>
-    inline void
-    __uninitialized_construct_buf(_Pointer __first, _Pointer __last,
-				  _ForwardIterator __seed)
-    {
-      typedef typename std::iterator_traits<_Pointer>::value_type
-	_ValueType;
-
-      std::__uninitialized_construct_buf_dispatch<
-        __has_trivial_constructor(_ValueType)>::
-	  __ucr(__first, __last, __seed);
-    }
-
-  template<typename _ForwardIterator, typename _Tp>
-    _Temporary_buffer<_ForwardIterator, _Tp>::
-    _Temporary_buffer(_ForwardIterator __first, _ForwardIterator __last)
-    : _M_original_len(std::distance(__first, __last)),
-      _M_len(0), _M_buffer(0)
-    {
-      __try
-	{
-	  std::pair<pointer, size_type> __p(std::get_temporary_buffer<
-					    value_type>(_M_original_len));
-	  _M_buffer = __p.first;
-	  _M_len = __p.second;
-	  if (_M_buffer)
-	    std::__uninitialized_construct_buf(_M_buffer, _M_buffer + _M_len,
-					       __first);
-	}
-      __catch(...)
-	{
-	  std::return_temporary_buffer(_M_buffer);
-	  _M_buffer = 0;
-	  _M_len = 0;
-	  __throw_exception_again;
-	}
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _STL_TEMPBUF_H */
-
diff --git a/openflow/usr/include/c++/5/bits/stl_tree.h b/openflow/usr/include/c++/5/bits/stl_tree.h
deleted file mode 100644
index d39042f..0000000
--- a/openflow/usr/include/c++/5/bits/stl_tree.h
+++ /dev/null
@@ -1,2370 +0,0 @@
-// RB tree implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- */
-
-/** @file bits/stl_tree.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{map,set}
- */
-
-#ifndef _STL_TREE_H
-#define _STL_TREE_H 1
-
-#pragma GCC system_header
-
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_function.h>
-#include <bits/cpp_type_traits.h>
-#include <ext/alloc_traits.h>
-#if __cplusplus >= 201103L
-#include <ext/aligned_buffer.h>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Red-black tree class, designed for use in implementing STL
-  // associative containers (set, multiset, map, and multimap). The
-  // insertion and deletion algorithms are based on those in Cormen,
-  // Leiserson, and Rivest, Introduction to Algorithms (MIT Press,
-  // 1990), except that
-  //
-  // (1) the header cell is maintained with links not only to the root
-  // but also to the leftmost node of the tree, to enable constant
-  // time begin(), and to the rightmost node of the tree, to enable
-  // linear time performance when used with the generic set algorithms
-  // (set_union, etc.)
-  // 
-  // (2) when a node being deleted has two children its successor node
-  // is relinked into its place, rather than copied, so that the only
-  // iterators invalidated are those referring to the deleted node.
-
-  enum _Rb_tree_color { _S_red = false, _S_black = true };
-
-  struct _Rb_tree_node_base
-  {
-    typedef _Rb_tree_node_base* _Base_ptr;
-    typedef const _Rb_tree_node_base* _Const_Base_ptr;
-
-    _Rb_tree_color	_M_color;
-    _Base_ptr		_M_parent;
-    _Base_ptr		_M_left;
-    _Base_ptr		_M_right;
-
-    static _Base_ptr
-    _S_minimum(_Base_ptr __x) _GLIBCXX_NOEXCEPT
-    {
-      while (__x->_M_left != 0) __x = __x->_M_left;
-      return __x;
-    }
-
-    static _Const_Base_ptr
-    _S_minimum(_Const_Base_ptr __x) _GLIBCXX_NOEXCEPT
-    {
-      while (__x->_M_left != 0) __x = __x->_M_left;
-      return __x;
-    }
-
-    static _Base_ptr
-    _S_maximum(_Base_ptr __x) _GLIBCXX_NOEXCEPT
-    {
-      while (__x->_M_right != 0) __x = __x->_M_right;
-      return __x;
-    }
-
-    static _Const_Base_ptr
-    _S_maximum(_Const_Base_ptr __x) _GLIBCXX_NOEXCEPT
-    {
-      while (__x->_M_right != 0) __x = __x->_M_right;
-      return __x;
-    }
-  };
-
-  template<typename _Val>
-    struct _Rb_tree_node : public _Rb_tree_node_base
-    {
-      typedef _Rb_tree_node<_Val>* _Link_type;
-
-#if __cplusplus < 201103L
-      _Val _M_value_field;
-
-      _Val*
-      _M_valptr()
-      { return std::__addressof(_M_value_field); }
-
-      const _Val*
-      _M_valptr() const
-      { return std::__addressof(_M_value_field); }
-#else
-      __gnu_cxx::__aligned_membuf<_Val> _M_storage;
-
-      _Val*
-      _M_valptr()
-      { return _M_storage._M_ptr(); }
-
-      const _Val*
-      _M_valptr() const
-      { return _M_storage._M_ptr(); }
-#endif
-    };
-
-  _GLIBCXX_PURE _Rb_tree_node_base*
-  _Rb_tree_increment(_Rb_tree_node_base* __x) throw ();
-
-  _GLIBCXX_PURE const _Rb_tree_node_base*
-  _Rb_tree_increment(const _Rb_tree_node_base* __x) throw ();
-
-  _GLIBCXX_PURE _Rb_tree_node_base*
-  _Rb_tree_decrement(_Rb_tree_node_base* __x) throw ();
-
-  _GLIBCXX_PURE const _Rb_tree_node_base*
-  _Rb_tree_decrement(const _Rb_tree_node_base* __x) throw ();
-
-  template<typename _Tp>
-    struct _Rb_tree_iterator
-    {
-      typedef _Tp  value_type;
-      typedef _Tp& reference;
-      typedef _Tp* pointer;
-
-      typedef bidirectional_iterator_tag iterator_category;
-      typedef ptrdiff_t                  difference_type;
-
-      typedef _Rb_tree_iterator<_Tp>        _Self;
-      typedef _Rb_tree_node_base::_Base_ptr _Base_ptr;
-      typedef _Rb_tree_node<_Tp>*           _Link_type;
-
-      _Rb_tree_iterator() _GLIBCXX_NOEXCEPT
-      : _M_node() { }
-
-      explicit
-      _Rb_tree_iterator(_Base_ptr __x) _GLIBCXX_NOEXCEPT
-      : _M_node(__x) { }
-
-      reference
-      operator*() const _GLIBCXX_NOEXCEPT
-      { return *static_cast<_Link_type>(_M_node)->_M_valptr(); }
-
-      pointer
-      operator->() const _GLIBCXX_NOEXCEPT
-      { return static_cast<_Link_type> (_M_node)->_M_valptr(); }
-
-      _Self&
-      operator++() _GLIBCXX_NOEXCEPT
-      {
-	_M_node = _Rb_tree_increment(_M_node);
-	return *this;
-      }
-
-      _Self
-      operator++(int) _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	_M_node = _Rb_tree_increment(_M_node);
-	return __tmp;
-      }
-
-      _Self&
-      operator--() _GLIBCXX_NOEXCEPT
-      {
-	_M_node = _Rb_tree_decrement(_M_node);
-	return *this;
-      }
-
-      _Self
-      operator--(int) _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	_M_node = _Rb_tree_decrement(_M_node);
-	return __tmp;
-      }
-
-      bool
-      operator==(const _Self& __x) const _GLIBCXX_NOEXCEPT
-      { return _M_node == __x._M_node; }
-
-      bool
-      operator!=(const _Self& __x) const _GLIBCXX_NOEXCEPT
-      { return _M_node != __x._M_node; }
-
-      _Base_ptr _M_node;
-  };
-
-  template<typename _Tp>
-    struct _Rb_tree_const_iterator
-    {
-      typedef _Tp        value_type;
-      typedef const _Tp& reference;
-      typedef const _Tp* pointer;
-
-      typedef _Rb_tree_iterator<_Tp> iterator;
-
-      typedef bidirectional_iterator_tag iterator_category;
-      typedef ptrdiff_t                  difference_type;
-
-      typedef _Rb_tree_const_iterator<_Tp>        _Self;
-      typedef _Rb_tree_node_base::_Const_Base_ptr _Base_ptr;
-      typedef const _Rb_tree_node<_Tp>*           _Link_type;
-
-      _Rb_tree_const_iterator() _GLIBCXX_NOEXCEPT
-      : _M_node() { }
-
-      explicit
-      _Rb_tree_const_iterator(_Base_ptr __x) _GLIBCXX_NOEXCEPT
-      : _M_node(__x) { }
-
-      _Rb_tree_const_iterator(const iterator& __it) _GLIBCXX_NOEXCEPT
-      : _M_node(__it._M_node) { }
-
-      iterator
-      _M_const_cast() const _GLIBCXX_NOEXCEPT
-      { return iterator(const_cast<typename iterator::_Base_ptr>(_M_node)); }
-
-      reference
-      operator*() const _GLIBCXX_NOEXCEPT
-      { return *static_cast<_Link_type>(_M_node)->_M_valptr(); }
-
-      pointer
-      operator->() const _GLIBCXX_NOEXCEPT
-      { return static_cast<_Link_type>(_M_node)->_M_valptr(); }
-
-      _Self&
-      operator++() _GLIBCXX_NOEXCEPT
-      {
-	_M_node = _Rb_tree_increment(_M_node);
-	return *this;
-      }
-
-      _Self
-      operator++(int) _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	_M_node = _Rb_tree_increment(_M_node);
-	return __tmp;
-      }
-
-      _Self&
-      operator--() _GLIBCXX_NOEXCEPT
-      {
-	_M_node = _Rb_tree_decrement(_M_node);
-	return *this;
-      }
-
-      _Self
-      operator--(int) _GLIBCXX_NOEXCEPT
-      {
-	_Self __tmp = *this;
-	_M_node = _Rb_tree_decrement(_M_node);
-	return __tmp;
-      }
-
-      bool
-      operator==(const _Self& __x) const _GLIBCXX_NOEXCEPT
-      { return _M_node == __x._M_node; }
-
-      bool
-      operator!=(const _Self& __x) const _GLIBCXX_NOEXCEPT
-      { return _M_node != __x._M_node; }
-
-      _Base_ptr _M_node;
-    };
-
-  template<typename _Val>
-    inline bool
-    operator==(const _Rb_tree_iterator<_Val>& __x,
-               const _Rb_tree_const_iterator<_Val>& __y) _GLIBCXX_NOEXCEPT
-    { return __x._M_node == __y._M_node; }
-
-  template<typename _Val>
-    inline bool
-    operator!=(const _Rb_tree_iterator<_Val>& __x,
-               const _Rb_tree_const_iterator<_Val>& __y) _GLIBCXX_NOEXCEPT
-    { return __x._M_node != __y._M_node; }
-
-  void
-  _Rb_tree_insert_and_rebalance(const bool __insert_left,
-                                _Rb_tree_node_base* __x,
-                                _Rb_tree_node_base* __p,
-                                _Rb_tree_node_base& __header) throw ();
-
-  _Rb_tree_node_base*
-  _Rb_tree_rebalance_for_erase(_Rb_tree_node_base* const __z,
-			       _Rb_tree_node_base& __header) throw ();
-
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc = allocator<_Val> >
-    class _Rb_tree
-    {
-      typedef typename __gnu_cxx::__alloc_traits<_Alloc>::template
-        rebind<_Rb_tree_node<_Val> >::other _Node_allocator;
-
-      typedef __gnu_cxx::__alloc_traits<_Node_allocator> _Alloc_traits;
-
-    protected:
-      typedef _Rb_tree_node_base* 		_Base_ptr;
-      typedef const _Rb_tree_node_base* 	_Const_Base_ptr;
-      typedef _Rb_tree_node<_Val>* 		_Link_type;
-      typedef const _Rb_tree_node<_Val>*	_Const_Link_type;
-
-    private:
-      // Functor recycling a pool of nodes and using allocation once the pool
-      // is empty.
-      struct _Reuse_or_alloc_node
-      {
-	_Reuse_or_alloc_node(_Rb_tree& __t)
-	  : _M_root(__t._M_root()), _M_nodes(__t._M_rightmost()), _M_t(__t)
-	{
-	  if (_M_root)
-	    {
-	      _M_root->_M_parent = 0;
-
-	      if (_M_nodes->_M_left)
-		_M_nodes = _M_nodes->_M_left;
-	    }
-	  else
-	    _M_nodes = 0;
-	}
-
-#if __cplusplus >= 201103L
-	_Reuse_or_alloc_node(const _Reuse_or_alloc_node&) = delete;
-#endif
-
-	~_Reuse_or_alloc_node()
-	{ _M_t._M_erase(static_cast<_Link_type>(_M_root)); }
-
-	template<typename _Arg>
-	  _Link_type
-#if __cplusplus < 201103L
-	  operator()(const _Arg& __arg)
-#else
-	  operator()(_Arg&& __arg)
-#endif
-	  {
-	    _Link_type __node = static_cast<_Link_type>(_M_extract());
-	    if (__node)
-	      {
-		_M_t._M_destroy_node(__node);
-		_M_t._M_construct_node(__node, _GLIBCXX_FORWARD(_Arg, __arg));
-		return __node;
-	      }
-
-	    return _M_t._M_create_node(_GLIBCXX_FORWARD(_Arg, __arg));
-	  }
-
-      private:
-	_Base_ptr
-	_M_extract()
-	{
-	  if (!_M_nodes)
-	    return _M_nodes;
-
-	  _Base_ptr __node = _M_nodes;
-	  _M_nodes = _M_nodes->_M_parent;
-	  if (_M_nodes)
-	    {
-	      if (_M_nodes->_M_right == __node)
-		{
-		  _M_nodes->_M_right = 0;
-
-		  if (_M_nodes->_M_left)
-		    {
-		      _M_nodes = _M_nodes->_M_left;
-
-		      while (_M_nodes->_M_right)
-			_M_nodes = _M_nodes->_M_right;
-
-		      if (_M_nodes->_M_left)
-			_M_nodes = _M_nodes->_M_left;
-		    }
-		}
-	      else // __node is on the left.
-		_M_nodes->_M_left = 0;
-	    }
-	  else
-	    _M_root = 0;
-
-	  return __node;
-	}
-
-	_Base_ptr _M_root;
-	_Base_ptr _M_nodes;
-	_Rb_tree& _M_t;
-      };
-
-      // Functor similar to the previous one but without any pool of nodes to
-      // recycle.
-      struct _Alloc_node
-      {
-	_Alloc_node(_Rb_tree& __t)
-	  : _M_t(__t) { }
-
-	template<typename _Arg>
-	  _Link_type
-#if __cplusplus < 201103L
-	  operator()(const _Arg& __arg) const
-#else
-	  operator()(_Arg&& __arg) const
-#endif
-	  { return _M_t._M_create_node(_GLIBCXX_FORWARD(_Arg, __arg)); }
-
-      private:
-	_Rb_tree& _M_t;
-      };
-
-    public:
-      typedef _Key 				key_type;
-      typedef _Val 				value_type;
-      typedef value_type* 			pointer;
-      typedef const value_type* 		const_pointer;
-      typedef value_type& 			reference;
-      typedef const value_type& 		const_reference;
-      typedef size_t 				size_type;
-      typedef ptrdiff_t 			difference_type;
-      typedef _Alloc 				allocator_type;
-
-      _Node_allocator&
-      _M_get_Node_allocator() _GLIBCXX_NOEXCEPT
-      { return *static_cast<_Node_allocator*>(&this->_M_impl); }
-      
-      const _Node_allocator&
-      _M_get_Node_allocator() const _GLIBCXX_NOEXCEPT
-      { return *static_cast<const _Node_allocator*>(&this->_M_impl); }
-
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return allocator_type(_M_get_Node_allocator()); }
-
-    protected:
-      _Link_type
-      _M_get_node()
-      { return _Alloc_traits::allocate(_M_get_Node_allocator(), 1); }
-
-      void
-      _M_put_node(_Link_type __p) _GLIBCXX_NOEXCEPT
-      { _Alloc_traits::deallocate(_M_get_Node_allocator(), __p, 1); }
-
-#if __cplusplus < 201103L
-      void
-      _M_construct_node(_Link_type __node, const value_type& __x)
-      {
-	__try
-	  { get_allocator().construct(__node->_M_valptr(), __x); }
-	__catch(...)
-	  {
-	    _M_put_node(__node);
-	    __throw_exception_again;
-	  }
-      }
-
-      _Link_type
-      _M_create_node(const value_type& __x)
-      {
-	_Link_type __tmp = _M_get_node();
-	_M_construct_node(__tmp, __x);
-	return __tmp;
-      }
-
-      void
-      _M_destroy_node(_Link_type __p)
-      { get_allocator().destroy(__p->_M_valptr()); }
-#else
-      template<typename... _Args>
-	void
-	_M_construct_node(_Link_type __node, _Args&&... __args)
-	{
-	  __try
-	    {
-	      ::new(__node) _Rb_tree_node<_Val>;
-	      _Alloc_traits::construct(_M_get_Node_allocator(),
-				       __node->_M_valptr(),
-				       std::forward<_Args>(__args)...);
-	    }
-	  __catch(...)
-	    {
-	      __node->~_Rb_tree_node<_Val>();
-	      _M_put_node(__node);
-	      __throw_exception_again;
-	    }
-	}
-
-      template<typename... _Args>
-        _Link_type
-        _M_create_node(_Args&&... __args)
-	{
-	  _Link_type __tmp = _M_get_node();
-	  _M_construct_node(__tmp, std::forward<_Args>(__args)...);
-	  return __tmp;
-	}
-
-      void
-      _M_destroy_node(_Link_type __p) noexcept
-      {
-	_Alloc_traits::destroy(_M_get_Node_allocator(), __p->_M_valptr());
-	__p->~_Rb_tree_node<_Val>();
-      }
-#endif
-
-      void
-      _M_drop_node(_Link_type __p) _GLIBCXX_NOEXCEPT
-      {
-	_M_destroy_node(__p);
-	_M_put_node(__p);
-      }
-
-      template<typename _NodeGen>
-	_Link_type
-	_M_clone_node(_Const_Link_type __x, _NodeGen& __node_gen)
-	{
-	  _Link_type __tmp = __node_gen(*__x->_M_valptr());
-	  __tmp->_M_color = __x->_M_color;
-	  __tmp->_M_left = 0;
-	  __tmp->_M_right = 0;
-	  return __tmp;
-	}
-
-    protected:
-      // Unused _Is_pod_comparator is kept as it is part of mangled name.
-      template<typename _Key_compare,
-	       bool /* _Is_pod_comparator */ = __is_pod(_Key_compare)>
-        struct _Rb_tree_impl : public _Node_allocator
-        {
-	  _Key_compare		_M_key_compare;
-	  _Rb_tree_node_base 	_M_header;
-	  size_type 		_M_node_count; // Keeps track of size of tree.
-
-	  _Rb_tree_impl()
-	  : _Node_allocator(), _M_key_compare(), _M_header(),
-	    _M_node_count(0)
-	  { _M_initialize(); }
-
-	  _Rb_tree_impl(const _Key_compare& __comp, const _Node_allocator& __a)
-	  : _Node_allocator(__a), _M_key_compare(__comp), _M_header(),
-	    _M_node_count(0)
-	  { _M_initialize(); }
-
-#if __cplusplus >= 201103L
-	  _Rb_tree_impl(const _Key_compare& __comp, _Node_allocator&& __a)
-	  : _Node_allocator(std::move(__a)), _M_key_compare(__comp),
-	    _M_header(), _M_node_count(0)
-	  { _M_initialize(); }
-#endif
-
-	  void
-	  _M_reset()
-	  {
-	    this->_M_header._M_parent = 0;
-	    this->_M_header._M_left = &this->_M_header;
-	    this->_M_header._M_right = &this->_M_header;
-	    this->_M_node_count = 0;
-	  }
-
-	private:
-	  void
-	  _M_initialize()
-	  {
-	    this->_M_header._M_color = _S_red;
-	    this->_M_header._M_parent = 0;
-	    this->_M_header._M_left = &this->_M_header;
-	    this->_M_header._M_right = &this->_M_header;
-	  }	    
-	};
-
-      _Rb_tree_impl<_Compare> _M_impl;
-
-    protected:
-      _Base_ptr&
-      _M_root() _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_header._M_parent; }
-
-      _Const_Base_ptr
-      _M_root() const _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_header._M_parent; }
-
-      _Base_ptr&
-      _M_leftmost() _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_header._M_left; }
-
-      _Const_Base_ptr
-      _M_leftmost() const _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_header._M_left; }
-
-      _Base_ptr&
-      _M_rightmost() _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_header._M_right; }
-
-      _Const_Base_ptr
-      _M_rightmost() const _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_header._M_right; }
-
-      _Link_type
-      _M_begin() _GLIBCXX_NOEXCEPT
-      { return static_cast<_Link_type>(this->_M_impl._M_header._M_parent); }
-
-      _Const_Link_type
-      _M_begin() const _GLIBCXX_NOEXCEPT
-      {
-	return static_cast<_Const_Link_type>
-	  (this->_M_impl._M_header._M_parent);
-      }
-
-      _Link_type
-      _M_end() _GLIBCXX_NOEXCEPT
-      { return reinterpret_cast<_Link_type>(&this->_M_impl._M_header); }
-
-      _Const_Link_type
-      _M_end() const _GLIBCXX_NOEXCEPT
-      { return reinterpret_cast<_Const_Link_type>(&this->_M_impl._M_header); }
-
-      static const_reference
-      _S_value(_Const_Link_type __x)
-      { return *__x->_M_valptr(); }
-
-      static const _Key&
-      _S_key(_Const_Link_type __x)
-      { return _KeyOfValue()(_S_value(__x)); }
-
-      static _Link_type
-      _S_left(_Base_ptr __x) _GLIBCXX_NOEXCEPT
-      { return static_cast<_Link_type>(__x->_M_left); }
-
-      static _Const_Link_type
-      _S_left(_Const_Base_ptr __x) _GLIBCXX_NOEXCEPT
-      { return static_cast<_Const_Link_type>(__x->_M_left); }
-
-      static _Link_type
-      _S_right(_Base_ptr __x) _GLIBCXX_NOEXCEPT
-      { return static_cast<_Link_type>(__x->_M_right); }
-
-      static _Const_Link_type
-      _S_right(_Const_Base_ptr __x) _GLIBCXX_NOEXCEPT
-      { return static_cast<_Const_Link_type>(__x->_M_right); }
-
-      static const_reference
-      _S_value(_Const_Base_ptr __x)
-      { return *static_cast<_Const_Link_type>(__x)->_M_valptr(); }
-
-      static const _Key&
-      _S_key(_Const_Base_ptr __x)
-      { return _KeyOfValue()(_S_value(__x)); }
-
-      static _Base_ptr
-      _S_minimum(_Base_ptr __x) _GLIBCXX_NOEXCEPT
-      { return _Rb_tree_node_base::_S_minimum(__x); }
-
-      static _Const_Base_ptr
-      _S_minimum(_Const_Base_ptr __x) _GLIBCXX_NOEXCEPT
-      { return _Rb_tree_node_base::_S_minimum(__x); }
-
-      static _Base_ptr
-      _S_maximum(_Base_ptr __x) _GLIBCXX_NOEXCEPT
-      { return _Rb_tree_node_base::_S_maximum(__x); }
-
-      static _Const_Base_ptr
-      _S_maximum(_Const_Base_ptr __x) _GLIBCXX_NOEXCEPT
-      { return _Rb_tree_node_base::_S_maximum(__x); }
-
-    public:
-      typedef _Rb_tree_iterator<value_type>       iterator;
-      typedef _Rb_tree_const_iterator<value_type> const_iterator;
-
-      typedef std::reverse_iterator<iterator>       reverse_iterator;
-      typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    private:
-      pair<_Base_ptr, _Base_ptr>
-      _M_get_insert_unique_pos(const key_type& __k);
-
-      pair<_Base_ptr, _Base_ptr>
-      _M_get_insert_equal_pos(const key_type& __k);
-
-      pair<_Base_ptr, _Base_ptr>
-      _M_get_insert_hint_unique_pos(const_iterator __pos,
-				    const key_type& __k);
-
-      pair<_Base_ptr, _Base_ptr>
-      _M_get_insert_hint_equal_pos(const_iterator __pos,
-				   const key_type& __k);
-
-#if __cplusplus >= 201103L
-      template<typename _Arg, typename _NodeGen>
-        iterator
-	_M_insert_(_Base_ptr __x, _Base_ptr __y, _Arg&& __v, _NodeGen&);
-
-      iterator
-      _M_insert_node(_Base_ptr __x, _Base_ptr __y, _Link_type __z);
-
-      template<typename _Arg>
-        iterator
-        _M_insert_lower(_Base_ptr __y, _Arg&& __v);
-
-      template<typename _Arg>
-        iterator
-        _M_insert_equal_lower(_Arg&& __x);
-
-      iterator
-      _M_insert_lower_node(_Base_ptr __p, _Link_type __z);
-
-      iterator
-      _M_insert_equal_lower_node(_Link_type __z);
-#else
-      template<typename _NodeGen>
-	iterator
-	_M_insert_(_Base_ptr __x, _Base_ptr __y,
-		   const value_type& __v, _NodeGen&);
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 233. Insertion hints in associative containers.
-      iterator
-      _M_insert_lower(_Base_ptr __y, const value_type& __v);
-
-      iterator
-      _M_insert_equal_lower(const value_type& __x);
-#endif
-
-      template<typename _NodeGen>
-	_Link_type
-	_M_copy(_Const_Link_type __x, _Link_type __p, _NodeGen&);
-
-      _Link_type
-      _M_copy(_Const_Link_type __x, _Link_type __p)
-      {
-	_Alloc_node __an(*this);
-	return _M_copy(__x, __p, __an);
-      }
-
-      void
-      _M_erase(_Link_type __x);
-
-      iterator
-      _M_lower_bound(_Link_type __x, _Link_type __y,
-		     const _Key& __k);
-
-      const_iterator
-      _M_lower_bound(_Const_Link_type __x, _Const_Link_type __y,
-		     const _Key& __k) const;
-
-      iterator
-      _M_upper_bound(_Link_type __x, _Link_type __y,
-		     const _Key& __k);
-
-      const_iterator
-      _M_upper_bound(_Const_Link_type __x, _Const_Link_type __y,
-		     const _Key& __k) const;
-
-    public:
-      // allocation/deallocation
-      _Rb_tree() { }
-
-      _Rb_tree(const _Compare& __comp,
-	       const allocator_type& __a = allocator_type())
-      : _M_impl(__comp, _Node_allocator(__a)) { }
-
-      _Rb_tree(const _Rb_tree& __x)
-      : _M_impl(__x._M_impl._M_key_compare,
-	        _Alloc_traits::_S_select_on_copy(__x._M_get_Node_allocator()))
-      {
-	if (__x._M_root() != 0)
-	  {
-	    _M_root() = _M_copy(__x._M_begin(), _M_end());
-	    _M_leftmost() = _S_minimum(_M_root());
-	    _M_rightmost() = _S_maximum(_M_root());
-	    _M_impl._M_node_count = __x._M_impl._M_node_count;
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      _Rb_tree(const allocator_type& __a)
-      : _M_impl(_Compare(), _Node_allocator(__a))
-      { }
-
-      _Rb_tree(const _Rb_tree& __x, const allocator_type& __a)
-      : _M_impl(__x._M_impl._M_key_compare, _Node_allocator(__a))
-      {
-	if (__x._M_root() != nullptr)
-	  {
-	    _M_root() = _M_copy(__x._M_begin(), _M_end());
-	    _M_leftmost() = _S_minimum(_M_root());
-	    _M_rightmost() = _S_maximum(_M_root());
-	    _M_impl._M_node_count = __x._M_impl._M_node_count;
-	  }
-      }
-
-      _Rb_tree(_Rb_tree&& __x)
-      : _M_impl(__x._M_impl._M_key_compare, __x._M_get_Node_allocator())
-      {
-	if (__x._M_root() != 0)
-	  _M_move_data(__x, std::true_type());
-      }
-
-      _Rb_tree(_Rb_tree&& __x, const allocator_type& __a)
-      : _Rb_tree(std::move(__x), _Node_allocator(__a))
-      { }
-
-      _Rb_tree(_Rb_tree&& __x, _Node_allocator&& __a);
-#endif
-
-      ~_Rb_tree() _GLIBCXX_NOEXCEPT
-      { _M_erase(_M_begin()); }
-
-      _Rb_tree&
-      operator=(const _Rb_tree& __x);
-
-      // Accessors.
-      _Compare
-      key_comp() const
-      { return _M_impl._M_key_compare; }
-
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(this->_M_impl._M_header._M_left); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(this->_M_impl._M_header._M_left); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(&this->_M_impl._M_header); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(&this->_M_impl._M_header); }
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return _M_impl._M_node_count == 0; }
-
-      size_type
-      size() const _GLIBCXX_NOEXCEPT 
-      { return _M_impl._M_node_count; }
-
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return _Alloc_traits::max_size(_M_get_Node_allocator()); }
-
-      void
-#if __cplusplus >= 201103L
-      swap(_Rb_tree& __t) noexcept(_Alloc_traits::_S_nothrow_swap());
-#else
-      swap(_Rb_tree& __t);
-#endif
-
-      // Insert/erase.
-#if __cplusplus >= 201103L
-      template<typename _Arg>
-        pair<iterator, bool>
-        _M_insert_unique(_Arg&& __x);
-
-      template<typename _Arg>
-        iterator
-        _M_insert_equal(_Arg&& __x);
-
-      template<typename _Arg, typename _NodeGen>
-        iterator
-	_M_insert_unique_(const_iterator __pos, _Arg&& __x, _NodeGen&);
-
-      template<typename _Arg>
-	iterator
-	_M_insert_unique_(const_iterator __pos, _Arg&& __x)
-	{
-	  _Alloc_node __an(*this);
-	  return _M_insert_unique_(__pos, std::forward<_Arg>(__x), __an);
-	}
-
-      template<typename _Arg, typename _NodeGen>
-	iterator
-	_M_insert_equal_(const_iterator __pos, _Arg&& __x, _NodeGen&);
-
-      template<typename _Arg>
-	iterator
-	_M_insert_equal_(const_iterator __pos, _Arg&& __x)
-	{
-	  _Alloc_node __an(*this);
-	  return _M_insert_equal_(__pos, std::forward<_Arg>(__x), __an);
-	}
-
-      template<typename... _Args>
-	pair<iterator, bool>
-	_M_emplace_unique(_Args&&... __args);
-
-      template<typename... _Args>
-	iterator
-	_M_emplace_equal(_Args&&... __args);
-
-      template<typename... _Args>
-	iterator
-	_M_emplace_hint_unique(const_iterator __pos, _Args&&... __args);
-
-      template<typename... _Args>
-	iterator
-	_M_emplace_hint_equal(const_iterator __pos, _Args&&... __args);
-#else
-      pair<iterator, bool>
-      _M_insert_unique(const value_type& __x);
-
-      iterator
-      _M_insert_equal(const value_type& __x);
-
-      template<typename _NodeGen>
-	iterator
-	_M_insert_unique_(const_iterator __pos, const value_type& __x,
-			  _NodeGen&);
-
-      iterator
-      _M_insert_unique_(const_iterator __pos, const value_type& __x)
-      {
-	_Alloc_node __an(*this);
-	return _M_insert_unique_(__pos, __x, __an);
-      }
-
-      template<typename _NodeGen>
-	iterator
-	_M_insert_equal_(const_iterator __pos, const value_type& __x,
-			 _NodeGen&);
-      iterator
-      _M_insert_equal_(const_iterator __pos, const value_type& __x)
-      {
-	_Alloc_node __an(*this);
-	return _M_insert_equal_(__pos, __x, __an);
-      }
-#endif
-
-      template<typename _InputIterator>
-        void
-        _M_insert_unique(_InputIterator __first, _InputIterator __last);
-
-      template<typename _InputIterator>
-        void
-        _M_insert_equal(_InputIterator __first, _InputIterator __last);
-
-    private:
-      void
-      _M_erase_aux(const_iterator __position);
-
-      void
-      _M_erase_aux(const_iterator __first, const_iterator __last);
-
-    public:
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      _GLIBCXX_ABI_TAG_CXX11
-      iterator
-      erase(const_iterator __position)
-      {
-	const_iterator __result = __position;
-	++__result;
-	_M_erase_aux(__position);
-	return __result._M_const_cast();
-      }
-
-      // LWG 2059.
-      _GLIBCXX_ABI_TAG_CXX11
-      iterator
-      erase(iterator __position)
-      {
-	iterator __result = __position;
-	++__result;
-	_M_erase_aux(__position);
-	return __result;
-      }
-#else
-      void
-      erase(iterator __position)
-      { _M_erase_aux(__position); }
-
-      void
-      erase(const_iterator __position)
-      { _M_erase_aux(__position); }
-#endif
-      size_type
-      erase(const key_type& __x);
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 130. Associative erase should return an iterator.
-      _GLIBCXX_ABI_TAG_CXX11
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	_M_erase_aux(__first, __last);
-	return __last._M_const_cast();
-      }
-#else
-      void
-      erase(iterator __first, iterator __last)
-      { _M_erase_aux(__first, __last); }
-
-      void
-      erase(const_iterator __first, const_iterator __last)
-      { _M_erase_aux(__first, __last); }
-#endif
-      void
-      erase(const key_type* __first, const key_type* __last);
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-        _M_erase(_M_begin());
-	_M_impl._M_reset();
-      }
-
-      // Set operations.
-      iterator
-      find(const key_type& __k);
-
-      const_iterator
-      find(const key_type& __k) const;
-
-      size_type
-      count(const key_type& __k) const;
-
-      iterator
-      lower_bound(const key_type& __k)
-      { return _M_lower_bound(_M_begin(), _M_end(), __k); }
-
-      const_iterator
-      lower_bound(const key_type& __k) const
-      { return _M_lower_bound(_M_begin(), _M_end(), __k); }
-
-      iterator
-      upper_bound(const key_type& __k)
-      { return _M_upper_bound(_M_begin(), _M_end(), __k); }
-
-      const_iterator
-      upper_bound(const key_type& __k) const
-      { return _M_upper_bound(_M_begin(), _M_end(), __k); }
-
-      pair<iterator, iterator>
-      equal_range(const key_type& __k);
-
-      pair<const_iterator, const_iterator>
-      equal_range(const key_type& __k) const;
-
-#if __cplusplus > 201103L
-      template<typename _Cmp, typename _Kt, typename = __void_t<>>
-	struct __is_transparent { };
-
-      template<typename _Cmp, typename _Kt>
-	struct
-	__is_transparent<_Cmp, _Kt, __void_t<typename _Cmp::is_transparent>>
-	{ typedef void type; };
-
-      static auto _S_iter(_Link_type __x) { return iterator(__x); }
-
-      static auto _S_iter(_Const_Link_type __x) { return const_iterator(__x); }
-
-      template<typename _Cmp, typename _Link, typename _Kt>
-	static auto
-	_S_lower_bound_tr(_Cmp& __cmp, _Link __x, _Link __y, const _Kt& __k)
-	{
-	  while (__x != 0)
-	    if (!__cmp(_S_key(__x), __k))
-	      __y = __x, __x = _S_left(__x);
-	    else
-	      __x = _S_right(__x);
-	  return _S_iter(__y);
-	}
-
-      template<typename _Cmp, typename _Link, typename _Kt>
-	static auto
-	_S_upper_bound_tr(_Cmp& __cmp, _Link __x, _Link __y, const _Kt& __k)
-	{
-	  while (__x != 0)
-	    if (__cmp(__k, _S_key(__x)))
-	      __y = __x, __x = _S_left(__x);
-	    else
-	      __x = _S_right(__x);
-	  return _S_iter(__y);
-	}
-
-      template<typename _Kt,
-	       typename _Req = typename __is_transparent<_Compare, _Kt>::type>
-	iterator
-	_M_find_tr(const _Kt& __k)
-	{
-	  auto& __cmp = _M_impl._M_key_compare;
-	  auto __j = _S_lower_bound_tr(__cmp, _M_begin(), _M_end(), __k);
-	  return (__j == end() || __cmp(__k, _S_key(__j._M_node)))
-	    ? end() : __j;
-	}
-
-      template<typename _Kt,
-	       typename _Req = typename __is_transparent<_Compare, _Kt>::type>
-	const_iterator
-	_M_find_tr(const _Kt& __k) const
-	{
-	  auto& __cmp = _M_impl._M_key_compare;
-	  auto __j = _S_lower_bound_tr(__cmp, _M_begin(), _M_end(), __k);
-	  return (__j == end() || __cmp(__k, _S_key(__j._M_node)))
-	    ? end() : __j;
-	}
-
-      template<typename _Kt,
-	       typename _Req = typename __is_transparent<_Compare, _Kt>::type>
-	size_type
-	_M_count_tr(const _Kt& __k) const
-	{
-	  auto __p = _M_equal_range_tr(__k);
-	  return std::distance(__p.first, __p.second);
-	}
-
-      template<typename _Kt,
-	       typename _Req = typename __is_transparent<_Compare, _Kt>::type>
-	iterator
-	_M_lower_bound_tr(const _Kt& __k)
-	{
-	  auto& __cmp = _M_impl._M_key_compare;
-	  return _S_lower_bound_tr(__cmp, _M_begin(), _M_end(), __k);
-	}
-
-      template<typename _Kt,
-	       typename _Req = typename __is_transparent<_Compare, _Kt>::type>
-	const_iterator
-	_M_lower_bound_tr(const _Kt& __k) const
-	{
-	  auto& __cmp = _M_impl._M_key_compare;
-	  return _S_lower_bound_tr(__cmp, _M_begin(), _M_end(), __k);
-	}
-
-      template<typename _Kt,
-	       typename _Req = typename __is_transparent<_Compare, _Kt>::type>
-	iterator
-	_M_upper_bound_tr(const _Kt& __k)
-	{
-	  auto& __cmp = _M_impl._M_key_compare;
-	  return _S_upper_bound_tr(__cmp, _M_begin(), _M_end(), __k);
-	}
-
-      template<typename _Kt,
-	       typename _Req = typename __is_transparent<_Compare, _Kt>::type>
-	const_iterator
-	_M_upper_bound_tr(const _Kt& __k) const
-	{
-	  auto& __cmp = _M_impl._M_key_compare;
-	  return _S_upper_bound_tr(__cmp, _M_begin(), _M_end(), __k);
-	}
-
-      template<typename _Kt,
-	       typename _Req = typename __is_transparent<_Compare, _Kt>::type>
-	pair<iterator, iterator>
-	_M_equal_range_tr(const _Kt& __k)
-	{
-	  auto __low = _M_lower_bound_tr(__k);
-	  auto __high = __low;
-	  auto& __cmp = _M_impl._M_key_compare;
-	  while (__high != end() && !__cmp(__k, _S_key(__high._M_node)))
-	    ++__high;
-	  return { __low, __high };
-	}
-
-      template<typename _Kt,
-	       typename _Req = typename __is_transparent<_Compare, _Kt>::type>
-	pair<const_iterator, const_iterator>
-	_M_equal_range_tr(const _Kt& __k) const
-	{
-	  auto __low = _M_lower_bound_tr(__k);
-	  auto __high = __low;
-	  auto& __cmp = _M_impl._M_key_compare;
-	  while (__high != end() && !__cmp(__k, _S_key(__high._M_node)))
-	    ++__high;
-	  return { __low, __high };
-	}
-#endif
-
-      // Debugging.
-      bool
-      __rb_verify() const;
-
-#if __cplusplus >= 201103L
-      _Rb_tree&
-      operator=(_Rb_tree&&) noexcept(_Alloc_traits::_S_nothrow_move());
-
-      template<typename _Iterator>
-	void
-	_M_assign_unique(_Iterator, _Iterator);
-
-      template<typename _Iterator>
-	void
-	_M_assign_equal(_Iterator, _Iterator);
-
-    private:
-      // Move elements from container with equal allocator.
-      void
-      _M_move_data(_Rb_tree&, std::true_type);
-
-      // Move elements from container with possibly non-equal allocator,
-      // which might result in a copy not a move.
-      void
-      _M_move_data(_Rb_tree&, std::false_type);
-#endif
-    };
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator==(const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __x,
-	       const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __y)
-    {
-      return __x.size() == __y.size()
-	     && std::equal(__x.begin(), __x.end(), __y.begin());
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator<(const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __x,
-	      const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __y)
-    {
-      return std::lexicographical_compare(__x.begin(), __x.end(), 
-					  __y.begin(), __y.end());
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator!=(const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __x,
-	       const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator>(const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __x,
-	      const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __y)
-    { return __y < __x; }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator<=(const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __x,
-	       const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator>=(const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __x,
-	       const _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline void
-    swap(_Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __x,
-	 _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __y)
-    { __x.swap(__y); }
-
-#if __cplusplus >= 201103L
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _Rb_tree(_Rb_tree&& __x, _Node_allocator&& __a)
-    : _M_impl(__x._M_impl._M_key_compare, std::move(__a))
-    {
-      using __eq = integral_constant<bool, _Alloc_traits::_S_always_equal()>;
-      if (__x._M_root() != nullptr)
-	_M_move_data(__x, __eq());
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_move_data(_Rb_tree& __x, std::true_type)
-    {
-      _M_root() = __x._M_root();
-      _M_leftmost() = __x._M_leftmost();
-      _M_rightmost() = __x._M_rightmost();
-      _M_root()->_M_parent = _M_end();
-
-      __x._M_root() = 0;
-      __x._M_leftmost() = __x._M_end();
-      __x._M_rightmost() = __x._M_end();
-
-      this->_M_impl._M_node_count = __x._M_impl._M_node_count;
-      __x._M_impl._M_node_count = 0;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_move_data(_Rb_tree& __x, std::false_type)
-    {
-      if (_M_get_Node_allocator() == __x._M_get_Node_allocator())
-	  _M_move_data(__x, std::true_type());
-      else
-	{
-	  _Alloc_node __an(*this);
-	  auto __lbd =
-	    [&__an](const value_type& __cval)
-	    {
-	      auto& __val = const_cast<value_type&>(__cval);
-	      return __an(std::move_if_noexcept(__val));
-	    };
-	  _M_root() = _M_copy(__x._M_begin(), _M_end(), __lbd);
-	  _M_leftmost() = _S_minimum(_M_root());
-	  _M_rightmost() = _S_maximum(_M_root());
-	  _M_impl._M_node_count = __x._M_impl._M_node_count;
-	}
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>&
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    operator=(_Rb_tree&& __x)
-    noexcept(_Alloc_traits::_S_nothrow_move())
-    {
-      _M_impl._M_key_compare = __x._M_impl._M_key_compare;
-      if (_Alloc_traits::_S_propagate_on_move_assign()
-	  || _Alloc_traits::_S_always_equal()
-	  || _M_get_Node_allocator() == __x._M_get_Node_allocator())
-	{
-	  clear();
-	  if (__x._M_root() != nullptr)
-	    _M_move_data(__x, std::true_type());
-	  std::__alloc_on_move(_M_get_Node_allocator(),
-			       __x._M_get_Node_allocator());
-	  return *this;
-	}
-
-      // Try to move each node reusing existing nodes and copying __x nodes
-      // structure.
-      _Reuse_or_alloc_node __roan(*this);
-      _M_impl._M_reset();
-      if (__x._M_root() != nullptr)
-	{
-	  auto __lbd =
-	    [&__roan](const value_type& __cval)
-	    {
-	      auto& __val = const_cast<value_type&>(__cval);
-	      return __roan(std::move_if_noexcept(__val));
-	    };
-	  _M_root() = _M_copy(__x._M_begin(), _M_end(), __lbd);
-	  _M_leftmost() = _S_minimum(_M_root());
-	  _M_rightmost() = _S_maximum(_M_root());
-	  _M_impl._M_node_count = __x._M_impl._M_node_count;
-	  __x.clear();
-	}
-      return *this;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    template<typename _Iterator>
-      void
-      _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-      _M_assign_unique(_Iterator __first, _Iterator __last)
-      {
-	_Reuse_or_alloc_node __roan(*this);
-	_M_impl._M_reset();
-	for (; __first != __last; ++__first)
-	  _M_insert_unique_(end(), *__first, __roan);
-      }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    template<typename _Iterator>
-      void
-      _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-      _M_assign_equal(_Iterator __first, _Iterator __last)
-      {
-	_Reuse_or_alloc_node __roan(*this);
-	_M_impl._M_reset();
-	for (; __first != __last; ++__first)
-	  _M_insert_equal_(end(), *__first, __roan);
-      }
-#endif
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>&
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    operator=(const _Rb_tree& __x)
-    {
-      if (this != &__x)
-	{
-	  // Note that _Key may be a constant type.
-#if __cplusplus >= 201103L
-	  if (_Alloc_traits::_S_propagate_on_copy_assign())
-	    {
-	      auto& __this_alloc = this->_M_get_Node_allocator();
-	      auto& __that_alloc = __x._M_get_Node_allocator();
-	      if (!_Alloc_traits::_S_always_equal()
-		  && __this_alloc != __that_alloc)
-		{
-		  // Replacement allocator cannot free existing storage, we need
-		  // to erase nodes first.
-		  clear();
-		  std::__alloc_on_copy(__this_alloc, __that_alloc);
-		}
-	    }
-#endif
-
-	  _Reuse_or_alloc_node __roan(*this);
-	  _M_impl._M_reset();
-	  _M_impl._M_key_compare = __x._M_impl._M_key_compare;
-	  if (__x._M_root() != 0)
-	    {
-	      _M_root() = _M_copy(__x._M_begin(), _M_end(), __roan);
-	      _M_leftmost() = _S_minimum(_M_root());
-	      _M_rightmost() = _S_maximum(_M_root());
-	      _M_impl._M_node_count = __x._M_impl._M_node_count;
-	    }
-	}
-
-      return *this;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-#if __cplusplus >= 201103L
-    template<typename _Arg, typename _NodeGen>
-#else
-    template<typename _NodeGen>
-#endif
-      typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-      _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-      _M_insert_(_Base_ptr __x, _Base_ptr __p,
-#if __cplusplus >= 201103L
-		 _Arg&& __v,
-#else
-		 const _Val& __v,
-#endif
-		 _NodeGen& __node_gen)
-      {
-	bool __insert_left = (__x != 0 || __p == _M_end()
-			      || _M_impl._M_key_compare(_KeyOfValue()(__v),
-							_S_key(__p)));
-
-	_Link_type __z = __node_gen(_GLIBCXX_FORWARD(_Arg, __v));
-
-	_Rb_tree_insert_and_rebalance(__insert_left, __z, __p,
-				      this->_M_impl._M_header);
-	++_M_impl._M_node_count;
-	return iterator(__z);
-      }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-#if __cplusplus >= 201103L
-    template<typename _Arg>
-#endif
-    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-#if __cplusplus >= 201103L
-    _M_insert_lower(_Base_ptr __p, _Arg&& __v)
-#else
-    _M_insert_lower(_Base_ptr __p, const _Val& __v)
-#endif
-    {
-      bool __insert_left = (__p == _M_end()
-			    || !_M_impl._M_key_compare(_S_key(__p),
-						       _KeyOfValue()(__v)));
-
-      _Link_type __z = _M_create_node(_GLIBCXX_FORWARD(_Arg, __v));
-
-      _Rb_tree_insert_and_rebalance(__insert_left, __z, __p,
-				    this->_M_impl._M_header);
-      ++_M_impl._M_node_count;
-      return iterator(__z);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-#if __cplusplus >= 201103L
-    template<typename _Arg>
-#endif
-    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-#if __cplusplus >= 201103L
-    _M_insert_equal_lower(_Arg&& __v)
-#else
-    _M_insert_equal_lower(const _Val& __v)
-#endif
-    {
-      _Link_type __x = _M_begin();
-      _Link_type __y = _M_end();
-      while (__x != 0)
-	{
-	  __y = __x;
-	  __x = !_M_impl._M_key_compare(_S_key(__x), _KeyOfValue()(__v)) ?
-	        _S_left(__x) : _S_right(__x);
-	}
-      return _M_insert_lower(__y, _GLIBCXX_FORWARD(_Arg, __v));
-    }
-
-  template<typename _Key, typename _Val, typename _KoV,
-	   typename _Compare, typename _Alloc>
-    template<typename _NodeGen>
-      typename _Rb_tree<_Key, _Val, _KoV, _Compare, _Alloc>::_Link_type
-      _Rb_tree<_Key, _Val, _KoV, _Compare, _Alloc>::
-      _M_copy(_Const_Link_type __x, _Link_type __p, _NodeGen& __node_gen)
-      {
-	// Structural copy. __x and __p must be non-null.
-	_Link_type __top = _M_clone_node(__x, __node_gen);
-	__top->_M_parent = __p;
-
-	__try
-	  {
-	    if (__x->_M_right)
-	      __top->_M_right = _M_copy(_S_right(__x), __top, __node_gen);
-	    __p = __top;
-	    __x = _S_left(__x);
-
-	    while (__x != 0)
-	      {
-		_Link_type __y = _M_clone_node(__x, __node_gen);
-		__p->_M_left = __y;
-		__y->_M_parent = __p;
-		if (__x->_M_right)
-		  __y->_M_right = _M_copy(_S_right(__x), __y, __node_gen);
-		__p = __y;
-		__x = _S_left(__x);
-	      }
-	  }
-	__catch(...)
-	  {
-	    _M_erase(__top);
-	    __throw_exception_again;
-	  }
-	return __top;
-      }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_erase(_Link_type __x)
-    {
-      // Erase without rebalancing.
-      while (__x != 0)
-	{
-	  _M_erase(_S_right(__x));
-	  _Link_type __y = _S_left(__x);
-	  _M_drop_node(__x);
-	  __x = __y;
-	}
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue,
-		      _Compare, _Alloc>::iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_lower_bound(_Link_type __x, _Link_type __y,
-		   const _Key& __k)
-    {
-      while (__x != 0)
-	if (!_M_impl._M_key_compare(_S_key(__x), __k))
-	  __y = __x, __x = _S_left(__x);
-	else
-	  __x = _S_right(__x);
-      return iterator(__y);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue,
-		      _Compare, _Alloc>::const_iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_lower_bound(_Const_Link_type __x, _Const_Link_type __y,
-		   const _Key& __k) const
-    {
-      while (__x != 0)
-	if (!_M_impl._M_key_compare(_S_key(__x), __k))
-	  __y = __x, __x = _S_left(__x);
-	else
-	  __x = _S_right(__x);
-      return const_iterator(__y);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue,
-		      _Compare, _Alloc>::iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_upper_bound(_Link_type __x, _Link_type __y,
-		   const _Key& __k)
-    {
-      while (__x != 0)
-	if (_M_impl._M_key_compare(__k, _S_key(__x)))
-	  __y = __x, __x = _S_left(__x);
-	else
-	  __x = _S_right(__x);
-      return iterator(__y);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue,
-		      _Compare, _Alloc>::const_iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_upper_bound(_Const_Link_type __x, _Const_Link_type __y,
-		   const _Key& __k) const
-    {
-      while (__x != 0)
-	if (_M_impl._M_key_compare(__k, _S_key(__x)))
-	  __y = __x, __x = _S_left(__x);
-	else
-	  __x = _S_right(__x);
-      return const_iterator(__y);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    pair<typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::iterator,
-	 typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::iterator>
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    equal_range(const _Key& __k)
-    {
-      _Link_type __x = _M_begin();
-      _Link_type __y = _M_end();
-      while (__x != 0)
-	{
-	  if (_M_impl._M_key_compare(_S_key(__x), __k))
-	    __x = _S_right(__x);
-	  else if (_M_impl._M_key_compare(__k, _S_key(__x)))
-	    __y = __x, __x = _S_left(__x);
-	  else
-	    {
-	      _Link_type __xu(__x), __yu(__y);
-	      __y = __x, __x = _S_left(__x);
-	      __xu = _S_right(__xu);
-	      return pair<iterator,
-		          iterator>(_M_lower_bound(__x, __y, __k),
-				    _M_upper_bound(__xu, __yu, __k));
-	    }
-	}
-      return pair<iterator, iterator>(iterator(__y),
-				      iterator(__y));
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    pair<typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::const_iterator,
-	 typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::const_iterator>
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    equal_range(const _Key& __k) const
-    {
-      _Const_Link_type __x = _M_begin();
-      _Const_Link_type __y = _M_end();
-      while (__x != 0)
-	{
-	  if (_M_impl._M_key_compare(_S_key(__x), __k))
-	    __x = _S_right(__x);
-	  else if (_M_impl._M_key_compare(__k, _S_key(__x)))
-	    __y = __x, __x = _S_left(__x);
-	  else
-	    {
-	      _Const_Link_type __xu(__x), __yu(__y);
-	      __y = __x, __x = _S_left(__x);
-	      __xu = _S_right(__xu);
-	      return pair<const_iterator,
-		          const_iterator>(_M_lower_bound(__x, __y, __k),
-					  _M_upper_bound(__xu, __yu, __k));
-	    }
-	}
-      return pair<const_iterator, const_iterator>(const_iterator(__y),
-						  const_iterator(__y));
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    swap(_Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>& __t)
-#if __cplusplus >= 201103L
-    noexcept(_Alloc_traits::_S_nothrow_swap())
-#endif
-    {
-      if (_M_root() == 0)
-	{
-	  if (__t._M_root() != 0)
-	    {
-	      _M_root() = __t._M_root();
-	      _M_leftmost() = __t._M_leftmost();
-	      _M_rightmost() = __t._M_rightmost();
-	      _M_root()->_M_parent = _M_end();
-	      _M_impl._M_node_count = __t._M_impl._M_node_count;
-	      
-	      __t._M_impl._M_reset();
-	    }
-	}
-      else if (__t._M_root() == 0)
-	{
-	  __t._M_root() = _M_root();
-	  __t._M_leftmost() = _M_leftmost();
-	  __t._M_rightmost() = _M_rightmost();
-	  __t._M_root()->_M_parent = __t._M_end();
-	  __t._M_impl._M_node_count = _M_impl._M_node_count;
-	  
-	  _M_impl._M_reset();
-	}
-      else
-	{
-	  std::swap(_M_root(),__t._M_root());
-	  std::swap(_M_leftmost(),__t._M_leftmost());
-	  std::swap(_M_rightmost(),__t._M_rightmost());
-	  
-	  _M_root()->_M_parent = _M_end();
-	  __t._M_root()->_M_parent = __t._M_end();
-	  std::swap(this->_M_impl._M_node_count, __t._M_impl._M_node_count);
-	}
-      // No need to swap header's color as it does not change.
-      std::swap(this->_M_impl._M_key_compare, __t._M_impl._M_key_compare);
-
-      _Alloc_traits::_S_on_swap(_M_get_Node_allocator(),
-				__t._M_get_Node_allocator());
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    pair<typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::_Base_ptr,
-	 typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::_Base_ptr>
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_get_insert_unique_pos(const key_type& __k)
-    {
-      typedef pair<_Base_ptr, _Base_ptr> _Res;
-      _Link_type __x = _M_begin();
-      _Link_type __y = _M_end();
-      bool __comp = true;
-      while (__x != 0)
-	{
-	  __y = __x;
-	  __comp = _M_impl._M_key_compare(__k, _S_key(__x));
-	  __x = __comp ? _S_left(__x) : _S_right(__x);
-	}
-      iterator __j = iterator(__y);
-      if (__comp)
-	{
-	  if (__j == begin())
-	    return _Res(__x, __y);
-	  else
-	    --__j;
-	}
-      if (_M_impl._M_key_compare(_S_key(__j._M_node), __k))
-	return _Res(__x, __y);
-      return _Res(__j._M_node, 0);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    pair<typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::_Base_ptr,
-	 typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::_Base_ptr>
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_get_insert_equal_pos(const key_type& __k)
-    {
-      typedef pair<_Base_ptr, _Base_ptr> _Res;
-      _Link_type __x = _M_begin();
-      _Link_type __y = _M_end();
-      while (__x != 0)
-	{
-	  __y = __x;
-	  __x = _M_impl._M_key_compare(__k, _S_key(__x)) ?
-	        _S_left(__x) : _S_right(__x);
-	}
-      return _Res(__x, __y);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-#if __cplusplus >= 201103L
-    template<typename _Arg>
-#endif
-    pair<typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::iterator, bool>
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-#if __cplusplus >= 201103L
-    _M_insert_unique(_Arg&& __v)
-#else
-    _M_insert_unique(const _Val& __v)
-#endif
-    {
-      typedef pair<iterator, bool> _Res;
-      pair<_Base_ptr, _Base_ptr> __res
-	= _M_get_insert_unique_pos(_KeyOfValue()(__v));
-
-      if (__res.second)
-	{
-	  _Alloc_node __an(*this);
-	  return _Res(_M_insert_(__res.first, __res.second,
-				 _GLIBCXX_FORWARD(_Arg, __v), __an),
-		      true);
-	}
-
-      return _Res(iterator(static_cast<_Link_type>(__res.first)), false);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-#if __cplusplus >= 201103L
-    template<typename _Arg>
-#endif
-    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-#if __cplusplus >= 201103L
-    _M_insert_equal(_Arg&& __v)
-#else
-    _M_insert_equal(const _Val& __v)
-#endif
-    {
-      pair<_Base_ptr, _Base_ptr> __res
-	= _M_get_insert_equal_pos(_KeyOfValue()(__v));
-      _Alloc_node __an(*this);
-      return _M_insert_(__res.first, __res.second,
-			_GLIBCXX_FORWARD(_Arg, __v), __an);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    pair<typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::_Base_ptr,
-         typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::_Base_ptr>
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_get_insert_hint_unique_pos(const_iterator __position,
-				  const key_type& __k)
-    {
-      iterator __pos = __position._M_const_cast();
-      typedef pair<_Base_ptr, _Base_ptr> _Res;
-
-      // end()
-      if (__pos._M_node == _M_end())
-	{
-	  if (size() > 0
-	      && _M_impl._M_key_compare(_S_key(_M_rightmost()), __k))
-	    return _Res(0, _M_rightmost());
-	  else
-	    return _M_get_insert_unique_pos(__k);
-	}
-      else if (_M_impl._M_key_compare(__k, _S_key(__pos._M_node)))
-	{
-	  // First, try before...
-	  iterator __before = __pos;
-	  if (__pos._M_node == _M_leftmost()) // begin()
-	    return _Res(_M_leftmost(), _M_leftmost());
-	  else if (_M_impl._M_key_compare(_S_key((--__before)._M_node), __k))
-	    {
-	      if (_S_right(__before._M_node) == 0)
-		return _Res(0, __before._M_node);
-	      else
-		return _Res(__pos._M_node, __pos._M_node);
-	    }
-	  else
-	    return _M_get_insert_unique_pos(__k);
-	}
-      else if (_M_impl._M_key_compare(_S_key(__pos._M_node), __k))
-	{
-	  // ... then try after.
-	  iterator __after = __pos;
-	  if (__pos._M_node == _M_rightmost())
-	    return _Res(0, _M_rightmost());
-	  else if (_M_impl._M_key_compare(__k, _S_key((++__after)._M_node)))
-	    {
-	      if (_S_right(__pos._M_node) == 0)
-		return _Res(0, __pos._M_node);
-	      else
-		return _Res(__after._M_node, __after._M_node);
-	    }
-	  else
-	    return _M_get_insert_unique_pos(__k);
-	}
-      else
-	// Equivalent keys.
-	return _Res(__pos._M_node, 0);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-#if __cplusplus >= 201103L
-    template<typename _Arg, typename _NodeGen>
-#else
-    template<typename _NodeGen>
-#endif
-      typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-      _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-      _M_insert_unique_(const_iterator __position,
-#if __cplusplus >= 201103L
-			_Arg&& __v,
-#else
-			const _Val& __v,
-#endif
-			_NodeGen& __node_gen)
-    {
-      pair<_Base_ptr, _Base_ptr> __res
-	= _M_get_insert_hint_unique_pos(__position, _KeyOfValue()(__v));
-
-      if (__res.second)
-	return _M_insert_(__res.first, __res.second,
-			  _GLIBCXX_FORWARD(_Arg, __v),
-			  __node_gen);
-      return iterator(static_cast<_Link_type>(__res.first));
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    pair<typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::_Base_ptr,
-         typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			   _Compare, _Alloc>::_Base_ptr>
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_get_insert_hint_equal_pos(const_iterator __position, const key_type& __k)
-    {
-      iterator __pos = __position._M_const_cast();
-      typedef pair<_Base_ptr, _Base_ptr> _Res;
-
-      // end()
-      if (__pos._M_node == _M_end())
-	{
-	  if (size() > 0
-	      && !_M_impl._M_key_compare(__k, _S_key(_M_rightmost())))
-	    return _Res(0, _M_rightmost());
-	  else
-	    return _M_get_insert_equal_pos(__k);
-	}
-      else if (!_M_impl._M_key_compare(_S_key(__pos._M_node), __k))
-	{
-	  // First, try before...
-	  iterator __before = __pos;
-	  if (__pos._M_node == _M_leftmost()) // begin()
-	    return _Res(_M_leftmost(), _M_leftmost());
-	  else if (!_M_impl._M_key_compare(__k, _S_key((--__before)._M_node)))
-	    {
-	      if (_S_right(__before._M_node) == 0)
-		return _Res(0, __before._M_node);
-	      else
-		return _Res(__pos._M_node, __pos._M_node);
-	    }
-	  else
-	    return _M_get_insert_equal_pos(__k);
-	}
-      else
-	{
-	  // ... then try after.  
-	  iterator __after = __pos;
-	  if (__pos._M_node == _M_rightmost())
-	    return _Res(0, _M_rightmost());
-	  else if (!_M_impl._M_key_compare(_S_key((++__after)._M_node), __k))
-	    {
-	      if (_S_right(__pos._M_node) == 0)
-		return _Res(0, __pos._M_node);
-	      else
-		return _Res(__after._M_node, __after._M_node);
-	    }
-	  else
-	    return _Res(0, 0);
-	}
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-#if __cplusplus >= 201103L
-    template<typename _Arg, typename _NodeGen>
-#else
-    template<typename _NodeGen>
-#endif
-      typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-      _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-      _M_insert_equal_(const_iterator __position,
-#if __cplusplus >= 201103L
-		       _Arg&& __v,
-#else
-		       const _Val& __v,
-#endif
-		       _NodeGen& __node_gen)
-      {
-	pair<_Base_ptr, _Base_ptr> __res
-	  = _M_get_insert_hint_equal_pos(__position, _KeyOfValue()(__v));
-
-	if (__res.second)
-	  return _M_insert_(__res.first, __res.second,
-			    _GLIBCXX_FORWARD(_Arg, __v),
-			    __node_gen);
-
-	return _M_insert_equal_lower(_GLIBCXX_FORWARD(_Arg, __v));
-      }
-
-#if __cplusplus >= 201103L
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_insert_node(_Base_ptr __x, _Base_ptr __p, _Link_type __z)
-    {
-      bool __insert_left = (__x != 0 || __p == _M_end()
-			    || _M_impl._M_key_compare(_S_key(__z),
-						      _S_key(__p)));
-
-      _Rb_tree_insert_and_rebalance(__insert_left, __z, __p,
-				    this->_M_impl._M_header);
-      ++_M_impl._M_node_count;
-      return iterator(__z);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_insert_lower_node(_Base_ptr __p, _Link_type __z)
-    {
-      bool __insert_left = (__p == _M_end()
-			    || !_M_impl._M_key_compare(_S_key(__p),
-						       _S_key(__z)));
-
-      _Rb_tree_insert_and_rebalance(__insert_left, __z, __p,
-				    this->_M_impl._M_header);
-      ++_M_impl._M_node_count;
-      return iterator(__z);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_insert_equal_lower_node(_Link_type __z)
-    {
-      _Link_type __x = _M_begin();
-      _Link_type __y = _M_end();
-      while (__x != 0)
-	{
-	  __y = __x;
-	  __x = !_M_impl._M_key_compare(_S_key(__x), _S_key(__z)) ?
-	        _S_left(__x) : _S_right(__x);
-	}
-      return _M_insert_lower_node(__y, __z);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    template<typename... _Args>
-      pair<typename _Rb_tree<_Key, _Val, _KeyOfValue,
-			     _Compare, _Alloc>::iterator, bool>
-      _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-      _M_emplace_unique(_Args&&... __args)
-      {
-	_Link_type __z = _M_create_node(std::forward<_Args>(__args)...);
-
-	__try
-	  {
-	    typedef pair<iterator, bool> _Res;
-	    auto __res = _M_get_insert_unique_pos(_S_key(__z));
-	    if (__res.second)
-	      return _Res(_M_insert_node(__res.first, __res.second, __z), true);
-	
-	    _M_drop_node(__z);
-	    return _Res(iterator(static_cast<_Link_type>(__res.first)), false);
-	  }
-	__catch(...)
-	  {
-	    _M_drop_node(__z);
-	    __throw_exception_again;
-	  }
-      }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    template<typename... _Args>
-      typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-      _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-      _M_emplace_equal(_Args&&... __args)
-      {
-	_Link_type __z = _M_create_node(std::forward<_Args>(__args)...);
-
-	__try
-	  {
-	    auto __res = _M_get_insert_equal_pos(_S_key(__z));
-	    return _M_insert_node(__res.first, __res.second, __z);
-	  }
-	__catch(...)
-	  {
-	    _M_drop_node(__z);
-	    __throw_exception_again;
-	  }
-      }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    template<typename... _Args>
-      typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-      _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-      _M_emplace_hint_unique(const_iterator __pos, _Args&&... __args)
-      {
-	_Link_type __z = _M_create_node(std::forward<_Args>(__args)...);
-
-	__try
-	  {
-	    auto __res = _M_get_insert_hint_unique_pos(__pos, _S_key(__z));
-
-	    if (__res.second)
-	      return _M_insert_node(__res.first, __res.second, __z);
-
-	    _M_drop_node(__z);
-	    return iterator(static_cast<_Link_type>(__res.first));
-	  }
-	__catch(...)
-	  {
-	    _M_drop_node(__z);
-	    __throw_exception_again;
-	  }
-      }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    template<typename... _Args>
-      typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-      _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-      _M_emplace_hint_equal(const_iterator __pos, _Args&&... __args)
-      {
-	_Link_type __z = _M_create_node(std::forward<_Args>(__args)...);
-
-	__try
-	  {
-	    auto __res = _M_get_insert_hint_equal_pos(__pos, _S_key(__z));
-
-	    if (__res.second)
-	      return _M_insert_node(__res.first, __res.second, __z);
-
-	    return _M_insert_equal_lower_node(__z);
-	  }
-	__catch(...)
-	  {
-	    _M_drop_node(__z);
-	    __throw_exception_again;
-	  }
-      }
-#endif
-
-  template<typename _Key, typename _Val, typename _KoV,
-           typename _Cmp, typename _Alloc>
-    template<class _II>
-      void
-      _Rb_tree<_Key, _Val, _KoV, _Cmp, _Alloc>::
-      _M_insert_unique(_II __first, _II __last)
-      {
-	_Alloc_node __an(*this);
-	for (; __first != __last; ++__first)
-	  _M_insert_unique_(end(), *__first, __an);
-      }
-
-  template<typename _Key, typename _Val, typename _KoV,
-           typename _Cmp, typename _Alloc>
-    template<class _II>
-      void
-      _Rb_tree<_Key, _Val, _KoV, _Cmp, _Alloc>::
-      _M_insert_equal(_II __first, _II __last)
-      {
-	_Alloc_node __an(*this);
-	for (; __first != __last; ++__first)
-	  _M_insert_equal_(end(), *__first, __an);
-      }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_erase_aux(const_iterator __position)
-    {
-      _Link_type __y =
-	static_cast<_Link_type>(_Rb_tree_rebalance_for_erase
-				(const_cast<_Base_ptr>(__position._M_node),
-				 this->_M_impl._M_header));
-      _M_drop_node(__y);
-      --_M_impl._M_node_count;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    _M_erase_aux(const_iterator __first, const_iterator __last)
-    {
-      if (__first == begin() && __last == end())
-	clear();
-      else
-	while (__first != __last)
-	  erase(__first++);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::size_type
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    erase(const _Key& __x)
-    {
-      pair<iterator, iterator> __p = equal_range(__x);
-      const size_type __old_size = size();
-      erase(__p.first, __p.second);
-      return __old_size - size();
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    erase(const _Key* __first, const _Key* __last)
-    {
-      while (__first != __last)
-	erase(*__first++);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue,
-		      _Compare, _Alloc>::iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    find(const _Key& __k)
-    {
-      iterator __j = _M_lower_bound(_M_begin(), _M_end(), __k);
-      return (__j == end()
-	      || _M_impl._M_key_compare(__k,
-					_S_key(__j._M_node))) ? end() : __j;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue,
-		      _Compare, _Alloc>::const_iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    find(const _Key& __k) const
-    {
-      const_iterator __j = _M_lower_bound(_M_begin(), _M_end(), __k);
-      return (__j == end()
-	      || _M_impl._M_key_compare(__k, 
-					_S_key(__j._M_node))) ? end() : __j;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::size_type
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    count(const _Key& __k) const
-    {
-      pair<const_iterator, const_iterator> __p = equal_range(__k);
-      const size_type __n = std::distance(__p.first, __p.second);
-      return __n;
-    }
-
-  _GLIBCXX_PURE unsigned int
-  _Rb_tree_black_count(const _Rb_tree_node_base* __node,
-                       const _Rb_tree_node_base* __root) throw ();
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    bool
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::__rb_verify() const
-    {
-      if (_M_impl._M_node_count == 0 || begin() == end())
-	return _M_impl._M_node_count == 0 && begin() == end()
-	       && this->_M_impl._M_header._M_left == _M_end()
-	       && this->_M_impl._M_header._M_right == _M_end();
-
-      unsigned int __len = _Rb_tree_black_count(_M_leftmost(), _M_root());
-      for (const_iterator __it = begin(); __it != end(); ++__it)
-	{
-	  _Const_Link_type __x = static_cast<_Const_Link_type>(__it._M_node);
-	  _Const_Link_type __L = _S_left(__x);
-	  _Const_Link_type __R = _S_right(__x);
-
-	  if (__x->_M_color == _S_red)
-	    if ((__L && __L->_M_color == _S_red)
-		|| (__R && __R->_M_color == _S_red))
-	      return false;
-
-	  if (__L && _M_impl._M_key_compare(_S_key(__x), _S_key(__L)))
-	    return false;
-	  if (__R && _M_impl._M_key_compare(_S_key(__R), _S_key(__x)))
-	    return false;
-
-	  if (!__L && !__R && _Rb_tree_black_count(__x, _M_root()) != __len)
-	    return false;
-	}
-
-      if (_M_leftmost() != _Rb_tree_node_base::_S_minimum(_M_root()))
-	return false;
-      if (_M_rightmost() != _Rb_tree_node_base::_S_maximum(_M_root()))
-	return false;
-      return true;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/stl_uninitialized.h b/openflow/usr/include/c++/5/bits/stl_uninitialized.h
deleted file mode 100644
index 61a1561..0000000
--- a/openflow/usr/include/c++/5/bits/stl_uninitialized.h
+++ /dev/null
@@ -1,688 +0,0 @@
-// Raw memory manipulators -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_uninitialized.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _STL_UNINITIALIZED_H
-#define _STL_UNINITIALIZED_H 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<bool _TrivialValueTypes>
-    struct __uninitialized_copy
-    {
-      template<typename _InputIterator, typename _ForwardIterator>
-        static _ForwardIterator
-        __uninit_copy(_InputIterator __first, _InputIterator __last,
-		      _ForwardIterator __result)
-        {
-	  _ForwardIterator __cur = __result;
-	  __try
-	    {
-	      for (; __first != __last; ++__first, ++__cur)
-		std::_Construct(std::__addressof(*__cur), *__first);
-	      return __cur;
-	    }
-	  __catch(...)
-	    {
-	      std::_Destroy(__result, __cur);
-	      __throw_exception_again;
-	    }
-	}
-    };
-
-  template<>
-    struct __uninitialized_copy<true>
-    {
-      template<typename _InputIterator, typename _ForwardIterator>
-        static _ForwardIterator
-        __uninit_copy(_InputIterator __first, _InputIterator __last,
-		      _ForwardIterator __result)
-        { return std::copy(__first, __last, __result); }
-    };
-
-  /**
-   *  @brief Copies the range [first,last) into result.
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __result An output iterator.
-   *  @return   __result + (__first - __last)
-   *
-   *  Like copy(), but does not require an initialized output range.
-  */
-  template<typename _InputIterator, typename _ForwardIterator>
-    inline _ForwardIterator
-    uninitialized_copy(_InputIterator __first, _InputIterator __last,
-		       _ForwardIterator __result)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type
-	_ValueType1;
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType2;
-#if __cplusplus < 201103L
-      const bool __assignable = true;
-#else
-      // trivial types can have deleted assignment
-      typedef typename iterator_traits<_InputIterator>::reference _RefType1;
-      typedef typename iterator_traits<_ForwardIterator>::reference _RefType2;
-      const bool __assignable = is_assignable<_RefType2, _RefType1>::value;
-#endif
-
-      return std::__uninitialized_copy<__is_trivial(_ValueType1)
-				       && __is_trivial(_ValueType2)
-				       && __assignable>::
-	__uninit_copy(__first, __last, __result);
-    }
-
-
-  template<bool _TrivialValueType>
-    struct __uninitialized_fill
-    {
-      template<typename _ForwardIterator, typename _Tp>
-        static void
-        __uninit_fill(_ForwardIterator __first, _ForwardIterator __last,
-		      const _Tp& __x)
-        {
-	  _ForwardIterator __cur = __first;
-	  __try
-	    {
-	      for (; __cur != __last; ++__cur)
-		std::_Construct(std::__addressof(*__cur), __x);
-	    }
-	  __catch(...)
-	    {
-	      std::_Destroy(__first, __cur);
-	      __throw_exception_again;
-	    }
-	}
-    };
-
-  template<>
-    struct __uninitialized_fill<true>
-    {
-      template<typename _ForwardIterator, typename _Tp>
-        static void
-        __uninit_fill(_ForwardIterator __first, _ForwardIterator __last,
-		      const _Tp& __x)
-        { std::fill(__first, __last, __x); }
-    };
-
-  /**
-   *  @brief Copies the value x into the range [first,last).
-   *  @param  __first  An input iterator.
-   *  @param  __last   An input iterator.
-   *  @param  __x      The source value.
-   *  @return   Nothing.
-   *
-   *  Like fill(), but does not require an initialized output range.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    inline void
-    uninitialized_fill(_ForwardIterator __first, _ForwardIterator __last,
-		       const _Tp& __x)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-#if __cplusplus < 201103L
-      const bool __assignable = true;
-#else
-      // trivial types can have deleted assignment
-      const bool __assignable = is_copy_assignable<_ValueType>::value;
-#endif
-
-      std::__uninitialized_fill<__is_trivial(_ValueType) && __assignable>::
-	__uninit_fill(__first, __last, __x);
-    }
-
-
-  template<bool _TrivialValueType>
-    struct __uninitialized_fill_n
-    {
-      template<typename _ForwardIterator, typename _Size, typename _Tp>
-        static _ForwardIterator
-        __uninit_fill_n(_ForwardIterator __first, _Size __n,
-			const _Tp& __x)
-        {
-	  _ForwardIterator __cur = __first;
-	  __try
-	    {
-	      for (; __n > 0; --__n, ++__cur)
-		std::_Construct(std::__addressof(*__cur), __x);
-	      return __cur;
-	    }
-	  __catch(...)
-	    {
-	      std::_Destroy(__first, __cur);
-	      __throw_exception_again;
-	    }
-	}
-    };
-
-  template<>
-    struct __uninitialized_fill_n<true>
-    {
-      template<typename _ForwardIterator, typename _Size, typename _Tp>
-        static _ForwardIterator
-        __uninit_fill_n(_ForwardIterator __first, _Size __n,
-			const _Tp& __x)
-        { return std::fill_n(__first, __n, __x); }
-    };
-
-   // _GLIBCXX_RESOLVE_LIB_DEFECTS
-   // DR 1339. uninitialized_fill_n should return the end of its range
-  /**
-   *  @brief Copies the value x into the range [first,first+n).
-   *  @param  __first  An input iterator.
-   *  @param  __n      The number of copies to make.
-   *  @param  __x      The source value.
-   *  @return   Nothing.
-   *
-   *  Like fill_n(), but does not require an initialized output range.
-  */
-  template<typename _ForwardIterator, typename _Size, typename _Tp>
-    inline _ForwardIterator
-    uninitialized_fill_n(_ForwardIterator __first, _Size __n, const _Tp& __x)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-#if __cplusplus < 201103L
-      const bool __assignable = true;
-#else
-      // trivial types can have deleted assignment
-      const bool __assignable = is_copy_assignable<_ValueType>::value;
-#endif
-      return __uninitialized_fill_n<__is_trivial(_ValueType) && __assignable>::
-	__uninit_fill_n(__first, __n, __x);
-    }
-
-  // Extensions: versions of uninitialized_copy, uninitialized_fill,
-  //  and uninitialized_fill_n that take an allocator parameter.
-  //  We dispatch back to the standard versions when we're given the
-  //  default allocator.  For nondefault allocators we do not use 
-  //  any of the POD optimizations.
-
-  template<typename _InputIterator, typename _ForwardIterator,
-	   typename _Allocator>
-    _ForwardIterator
-    __uninitialized_copy_a(_InputIterator __first, _InputIterator __last,
-			   _ForwardIterator __result, _Allocator& __alloc)
-    {
-      _ForwardIterator __cur = __result;
-      __try
-	{
-	  typedef __gnu_cxx::__alloc_traits<_Allocator> __traits;
-	  for (; __first != __last; ++__first, ++__cur)
-	    __traits::construct(__alloc, std::__addressof(*__cur), *__first);
-	  return __cur;
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__result, __cur, __alloc);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _InputIterator, typename _ForwardIterator, typename _Tp>
-    inline _ForwardIterator
-    __uninitialized_copy_a(_InputIterator __first, _InputIterator __last,
-			   _ForwardIterator __result, allocator<_Tp>&)
-    { return std::uninitialized_copy(__first, __last, __result); }
-
-  template<typename _InputIterator, typename _ForwardIterator,
-	   typename _Allocator>
-    inline _ForwardIterator
-    __uninitialized_move_a(_InputIterator __first, _InputIterator __last,
-			   _ForwardIterator __result, _Allocator& __alloc)
-    {
-      return std::__uninitialized_copy_a(_GLIBCXX_MAKE_MOVE_ITERATOR(__first),
-					 _GLIBCXX_MAKE_MOVE_ITERATOR(__last),
-					 __result, __alloc);
-    }
-
-  template<typename _InputIterator, typename _ForwardIterator,
-	   typename _Allocator>
-    inline _ForwardIterator
-    __uninitialized_move_if_noexcept_a(_InputIterator __first,
-				       _InputIterator __last,
-				       _ForwardIterator __result,
-				       _Allocator& __alloc)
-    {
-      return std::__uninitialized_copy_a
-	(_GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(__first),
-	 _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(__last), __result, __alloc);
-    }
-
-  template<typename _ForwardIterator, typename _Tp, typename _Allocator>
-    void
-    __uninitialized_fill_a(_ForwardIterator __first, _ForwardIterator __last,
-			   const _Tp& __x, _Allocator& __alloc)
-    {
-      _ForwardIterator __cur = __first;
-      __try
-	{
-	  typedef __gnu_cxx::__alloc_traits<_Allocator> __traits;
-	  for (; __cur != __last; ++__cur)
-	    __traits::construct(__alloc, std::__addressof(*__cur), __x);
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__first, __cur, __alloc);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _ForwardIterator, typename _Tp, typename _Tp2>
-    inline void
-    __uninitialized_fill_a(_ForwardIterator __first, _ForwardIterator __last,
-			   const _Tp& __x, allocator<_Tp2>&)
-    { std::uninitialized_fill(__first, __last, __x); }
-
-  template<typename _ForwardIterator, typename _Size, typename _Tp,
-	   typename _Allocator>
-    _ForwardIterator
-    __uninitialized_fill_n_a(_ForwardIterator __first, _Size __n, 
-			     const _Tp& __x, _Allocator& __alloc)
-    {
-      _ForwardIterator __cur = __first;
-      __try
-	{
-	  typedef __gnu_cxx::__alloc_traits<_Allocator> __traits;
-	  for (; __n > 0; --__n, ++__cur)
-	    __traits::construct(__alloc, std::__addressof(*__cur), __x);
-	  return __cur;
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__first, __cur, __alloc);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _ForwardIterator, typename _Size, typename _Tp,
-	   typename _Tp2>
-    inline _ForwardIterator
-    __uninitialized_fill_n_a(_ForwardIterator __first, _Size __n, 
-			     const _Tp& __x, allocator<_Tp2>&)
-    { return std::uninitialized_fill_n(__first, __n, __x); }
-
-
-  // Extensions: __uninitialized_copy_move, __uninitialized_move_copy,
-  // __uninitialized_fill_move, __uninitialized_move_fill.
-  // All of these algorithms take a user-supplied allocator, which is used
-  // for construction and destruction.
-
-  // __uninitialized_copy_move
-  // Copies [first1, last1) into [result, result + (last1 - first1)), and
-  //  move [first2, last2) into
-  //  [result, result + (last1 - first1) + (last2 - first2)).
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _ForwardIterator, typename _Allocator>
-    inline _ForwardIterator
-    __uninitialized_copy_move(_InputIterator1 __first1,
-			      _InputIterator1 __last1,
-			      _InputIterator2 __first2,
-			      _InputIterator2 __last2,
-			      _ForwardIterator __result,
-			      _Allocator& __alloc)
-    {
-      _ForwardIterator __mid = std::__uninitialized_copy_a(__first1, __last1,
-							   __result,
-							   __alloc);
-      __try
-	{
-	  return std::__uninitialized_move_a(__first2, __last2, __mid, __alloc);
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__result, __mid, __alloc);
-	  __throw_exception_again;
-	}
-    }
-
-  // __uninitialized_move_copy
-  // Moves [first1, last1) into [result, result + (last1 - first1)), and
-  //  copies [first2, last2) into
-  //  [result, result + (last1 - first1) + (last2 - first2)).
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _ForwardIterator, typename _Allocator>
-    inline _ForwardIterator
-    __uninitialized_move_copy(_InputIterator1 __first1,
-			      _InputIterator1 __last1,
-			      _InputIterator2 __first2,
-			      _InputIterator2 __last2,
-			      _ForwardIterator __result,
-			      _Allocator& __alloc)
-    {
-      _ForwardIterator __mid = std::__uninitialized_move_a(__first1, __last1,
-							   __result,
-							   __alloc);
-      __try
-	{
-	  return std::__uninitialized_copy_a(__first2, __last2, __mid, __alloc);
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__result, __mid, __alloc);
-	  __throw_exception_again;
-	}
-    }
-  
-  // __uninitialized_fill_move
-  // Fills [result, mid) with x, and moves [first, last) into
-  //  [mid, mid + (last - first)).
-  template<typename _ForwardIterator, typename _Tp, typename _InputIterator,
-	   typename _Allocator>
-    inline _ForwardIterator
-    __uninitialized_fill_move(_ForwardIterator __result, _ForwardIterator __mid,
-			      const _Tp& __x, _InputIterator __first,
-			      _InputIterator __last, _Allocator& __alloc)
-    {
-      std::__uninitialized_fill_a(__result, __mid, __x, __alloc);
-      __try
-	{
-	  return std::__uninitialized_move_a(__first, __last, __mid, __alloc);
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__result, __mid, __alloc);
-	  __throw_exception_again;
-	}
-    }
-
-  // __uninitialized_move_fill
-  // Moves [first1, last1) into [first2, first2 + (last1 - first1)), and
-  //  fills [first2 + (last1 - first1), last2) with x.
-  template<typename _InputIterator, typename _ForwardIterator, typename _Tp,
-	   typename _Allocator>
-    inline void
-    __uninitialized_move_fill(_InputIterator __first1, _InputIterator __last1,
-			      _ForwardIterator __first2,
-			      _ForwardIterator __last2, const _Tp& __x,
-			      _Allocator& __alloc)
-    {
-      _ForwardIterator __mid2 = std::__uninitialized_move_a(__first1, __last1,
-							    __first2,
-							    __alloc);
-      __try
-	{
-	  std::__uninitialized_fill_a(__mid2, __last2, __x, __alloc);
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__first2, __mid2, __alloc);
-	  __throw_exception_again;
-	}
-    }
-
-#if __cplusplus >= 201103L
-  // Extensions: __uninitialized_default, __uninitialized_default_n,
-  // __uninitialized_default_a, __uninitialized_default_n_a.
-
-  template<bool _TrivialValueType>
-    struct __uninitialized_default_1
-    {
-      template<typename _ForwardIterator>
-        static void
-        __uninit_default(_ForwardIterator __first, _ForwardIterator __last)
-        {
-	  _ForwardIterator __cur = __first;
-	  __try
-	    {
-	      for (; __cur != __last; ++__cur)
-		std::_Construct(std::__addressof(*__cur));
-	    }
-	  __catch(...)
-	    {
-	      std::_Destroy(__first, __cur);
-	      __throw_exception_again;
-	    }
-	}
-    };
-
-  template<>
-    struct __uninitialized_default_1<true>
-    {
-      template<typename _ForwardIterator>
-        static void
-        __uninit_default(_ForwardIterator __first, _ForwardIterator __last)
-        {
-	  typedef typename iterator_traits<_ForwardIterator>::value_type
-	    _ValueType;
-
-	  std::fill(__first, __last, _ValueType());
-	}
-    };
-
-  template<bool _TrivialValueType>
-    struct __uninitialized_default_n_1
-    {
-      template<typename _ForwardIterator, typename _Size>
-        static _ForwardIterator
-        __uninit_default_n(_ForwardIterator __first, _Size __n)
-        {
-	  _ForwardIterator __cur = __first;
-	  __try
-	    {
-	      for (; __n > 0; --__n, ++__cur)
-		std::_Construct(std::__addressof(*__cur));
-	      return __cur;
-	    }
-	  __catch(...)
-	    {
-	      std::_Destroy(__first, __cur);
-	      __throw_exception_again;
-	    }
-	}
-    };
-
-  template<>
-    struct __uninitialized_default_n_1<true>
-    {
-      template<typename _ForwardIterator, typename _Size>
-        static _ForwardIterator
-        __uninit_default_n(_ForwardIterator __first, _Size __n)
-        {
-	  typedef typename iterator_traits<_ForwardIterator>::value_type
-	    _ValueType;
-
-	  return std::fill_n(__first, __n, _ValueType());
-	}
-    };
-
-  // __uninitialized_default
-  // Fills [first, last) with std::distance(first, last) default
-  // constructed value_types(s).
-  template<typename _ForwardIterator>
-    inline void
-    __uninitialized_default(_ForwardIterator __first,
-			    _ForwardIterator __last)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-      // trivial types can have deleted assignment
-      const bool __assignable = is_copy_assignable<_ValueType>::value;
-
-      std::__uninitialized_default_1<__is_trivial(_ValueType)
-				     && __assignable>::
-	__uninit_default(__first, __last);
-    }
-
-  // __uninitialized_default_n
-  // Fills [first, first + n) with n default constructed value_type(s).
-  template<typename _ForwardIterator, typename _Size>
-    inline _ForwardIterator
-    __uninitialized_default_n(_ForwardIterator __first, _Size __n)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-      // trivial types can have deleted assignment
-      const bool __assignable = is_copy_assignable<_ValueType>::value;
-
-      return __uninitialized_default_n_1<__is_trivial(_ValueType)
-				       && __assignable>::
-	__uninit_default_n(__first, __n);
-    }
-
-
-  // __uninitialized_default_a
-  // Fills [first, last) with std::distance(first, last) default
-  // constructed value_types(s), constructed with the allocator alloc.
-  template<typename _ForwardIterator, typename _Allocator>
-    void
-    __uninitialized_default_a(_ForwardIterator __first,
-			      _ForwardIterator __last,
-			      _Allocator& __alloc)
-    {
-      _ForwardIterator __cur = __first;
-      __try
-	{
-	  typedef __gnu_cxx::__alloc_traits<_Allocator> __traits;
-	  for (; __cur != __last; ++__cur)
-	    __traits::construct(__alloc, std::__addressof(*__cur));
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__first, __cur, __alloc);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _ForwardIterator, typename _Tp>
-    inline void
-    __uninitialized_default_a(_ForwardIterator __first,
-			      _ForwardIterator __last,
-			      allocator<_Tp>&)
-    { std::__uninitialized_default(__first, __last); }
-
-
-  // __uninitialized_default_n_a
-  // Fills [first, first + n) with n default constructed value_types(s),
-  // constructed with the allocator alloc.
-  template<typename _ForwardIterator, typename _Size, typename _Allocator>
-    _ForwardIterator
-    __uninitialized_default_n_a(_ForwardIterator __first, _Size __n, 
-				_Allocator& __alloc)
-    {
-      _ForwardIterator __cur = __first;
-      __try
-	{
-	  typedef __gnu_cxx::__alloc_traits<_Allocator> __traits;
-	  for (; __n > 0; --__n, ++__cur)
-	    __traits::construct(__alloc, std::__addressof(*__cur));
-	  return __cur;
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__first, __cur, __alloc);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _ForwardIterator, typename _Size, typename _Tp>
-    inline _ForwardIterator
-    __uninitialized_default_n_a(_ForwardIterator __first, _Size __n, 
-				allocator<_Tp>&)
-    { return std::__uninitialized_default_n(__first, __n); }
-
-
-  template<typename _InputIterator, typename _Size,
-	   typename _ForwardIterator>
-    _ForwardIterator
-    __uninitialized_copy_n(_InputIterator __first, _Size __n,
-			   _ForwardIterator __result, input_iterator_tag)
-    {
-      _ForwardIterator __cur = __result;
-      __try
-	{
-	  for (; __n > 0; --__n, ++__first, ++__cur)
-	    std::_Construct(std::__addressof(*__cur), *__first);
-	  return __cur;
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__result, __cur);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _RandomAccessIterator, typename _Size,
-	   typename _ForwardIterator>
-    inline _ForwardIterator
-    __uninitialized_copy_n(_RandomAccessIterator __first, _Size __n,
-			   _ForwardIterator __result,
-			   random_access_iterator_tag)
-    { return std::uninitialized_copy(__first, __first + __n, __result); }
-
-  /**
-   *  @brief Copies the range [first,first+n) into result.
-   *  @param  __first  An input iterator.
-   *  @param  __n      The number of elements to copy.
-   *  @param  __result An output iterator.
-   *  @return  __result + __n
-   *
-   *  Like copy_n(), but does not require an initialized output range.
-  */
-  template<typename _InputIterator, typename _Size, typename _ForwardIterator>
-    inline _ForwardIterator
-    uninitialized_copy_n(_InputIterator __first, _Size __n,
-			 _ForwardIterator __result)
-    { return std::__uninitialized_copy_n(__first, __n, __result,
-					 std::__iterator_category(__first)); }
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _STL_UNINITIALIZED_H */
diff --git a/openflow/usr/include/c++/5/bits/stl_vector.h b/openflow/usr/include/c++/5/bits/stl_vector.h
deleted file mode 100644
index b00f770..0000000
--- a/openflow/usr/include/c++/5/bits/stl_vector.h
+++ /dev/null
@@ -1,1565 +0,0 @@
-// Vector implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this  software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/stl_vector.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{vector}
- */
-
-#ifndef _STL_VECTOR_H
-#define _STL_VECTOR_H 1
-
-#include <bits/stl_iterator_base_funcs.h>
-#include <bits/functexcept.h>
-#include <bits/concept_check.h>
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /// See bits/stl_deque.h's _Deque_base for an explanation.
-  template<typename _Tp, typename _Alloc>
-    struct _Vector_base
-    {
-      typedef typename __gnu_cxx::__alloc_traits<_Alloc>::template
-        rebind<_Tp>::other _Tp_alloc_type;
-      typedef typename __gnu_cxx::__alloc_traits<_Tp_alloc_type>::pointer
-       	pointer;
-
-      struct _Vector_impl 
-      : public _Tp_alloc_type
-      {
-	pointer _M_start;
-	pointer _M_finish;
-	pointer _M_end_of_storage;
-
-	_Vector_impl()
-	: _Tp_alloc_type(), _M_start(), _M_finish(), _M_end_of_storage()
-	{ }
-
-	_Vector_impl(_Tp_alloc_type const& __a) _GLIBCXX_NOEXCEPT
-	: _Tp_alloc_type(__a), _M_start(), _M_finish(), _M_end_of_storage()
-	{ }
-
-#if __cplusplus >= 201103L
-	_Vector_impl(_Tp_alloc_type&& __a) noexcept
-	: _Tp_alloc_type(std::move(__a)),
-	  _M_start(), _M_finish(), _M_end_of_storage()
-	{ }
-#endif
-
-	void _M_swap_data(_Vector_impl& __x) _GLIBCXX_NOEXCEPT
-	{
-	  std::swap(_M_start, __x._M_start);
-	  std::swap(_M_finish, __x._M_finish);
-	  std::swap(_M_end_of_storage, __x._M_end_of_storage);
-	}
-      };
-      
-    public:
-      typedef _Alloc allocator_type;
-
-      _Tp_alloc_type&
-      _M_get_Tp_allocator() _GLIBCXX_NOEXCEPT
-      { return *static_cast<_Tp_alloc_type*>(&this->_M_impl); }
-
-      const _Tp_alloc_type&
-      _M_get_Tp_allocator() const _GLIBCXX_NOEXCEPT
-      { return *static_cast<const _Tp_alloc_type*>(&this->_M_impl); }
-
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return allocator_type(_M_get_Tp_allocator()); }
-
-      _Vector_base()
-      : _M_impl() { }
-
-      _Vector_base(const allocator_type& __a) _GLIBCXX_NOEXCEPT
-      : _M_impl(__a) { }
-
-      _Vector_base(size_t __n)
-      : _M_impl()
-      { _M_create_storage(__n); }
-
-      _Vector_base(size_t __n, const allocator_type& __a)
-      : _M_impl(__a)
-      { _M_create_storage(__n); }
-
-#if __cplusplus >= 201103L
-      _Vector_base(_Tp_alloc_type&& __a) noexcept
-      : _M_impl(std::move(__a)) { }
-
-      _Vector_base(_Vector_base&& __x) noexcept
-      : _M_impl(std::move(__x._M_get_Tp_allocator()))
-      { this->_M_impl._M_swap_data(__x._M_impl); }
-
-      _Vector_base(_Vector_base&& __x, const allocator_type& __a)
-      : _M_impl(__a)
-      {
-	if (__x.get_allocator() == __a)
-	  this->_M_impl._M_swap_data(__x._M_impl);
-	else
-	  {
-	    size_t __n = __x._M_impl._M_finish - __x._M_impl._M_start;
-	    _M_create_storage(__n);
-	  }
-      }
-#endif
-
-      ~_Vector_base() _GLIBCXX_NOEXCEPT
-      { _M_deallocate(this->_M_impl._M_start, this->_M_impl._M_end_of_storage
-		      - this->_M_impl._M_start); }
-
-    public:
-      _Vector_impl _M_impl;
-
-      pointer
-      _M_allocate(size_t __n)
-      {
-	typedef __gnu_cxx::__alloc_traits<_Tp_alloc_type> _Tr;
-	return __n != 0 ? _Tr::allocate(_M_impl, __n) : pointer();
-      }
-
-      void
-      _M_deallocate(pointer __p, size_t __n)
-      {
-	typedef __gnu_cxx::__alloc_traits<_Tp_alloc_type> _Tr;
-	if (__p)
-	  _Tr::deallocate(_M_impl, __p, __n);
-      }
-
-    private:
-      void
-      _M_create_storage(size_t __n)
-      {
-	this->_M_impl._M_start = this->_M_allocate(__n);
-	this->_M_impl._M_finish = this->_M_impl._M_start;
-	this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __n;
-      }
-    };
-
-
-  /**
-   *  @brief A standard container which offers fixed time access to
-   *  individual elements in any order.
-   *
-   *  @ingroup sequences
-   *
-   *  @tparam _Tp  Type of element.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_Tp>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>, including the
-   *  <a href="tables.html#68">optional sequence requirements</a> with the
-   *  %exception of @c push_front and @c pop_front.
-   *
-   *  In some terminology a %vector can be described as a dynamic
-   *  C-style array, it offers fast and efficient access to individual
-   *  elements in any order and saves the user from worrying about
-   *  memory and size allocation.  Subscripting ( @c [] ) access is
-   *  also provided as with C-style arrays.
-  */
-  template<typename _Tp, typename _Alloc = std::allocator<_Tp> >
-    class vector : protected _Vector_base<_Tp, _Alloc>
-    {
-      // Concept requirements.
-      typedef typename _Alloc::value_type                _Alloc_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires2(_Tp, _Alloc_value_type, _SameTypeConcept)
-      
-      typedef _Vector_base<_Tp, _Alloc>			 _Base;
-      typedef typename _Base::_Tp_alloc_type		 _Tp_alloc_type;
-      typedef __gnu_cxx::__alloc_traits<_Tp_alloc_type>  _Alloc_traits;
-
-    public:
-      typedef _Tp					 value_type;
-      typedef typename _Base::pointer                    pointer;
-      typedef typename _Alloc_traits::const_pointer      const_pointer;
-      typedef typename _Alloc_traits::reference          reference;
-      typedef typename _Alloc_traits::const_reference    const_reference;
-      typedef __gnu_cxx::__normal_iterator<pointer, vector> iterator;
-      typedef __gnu_cxx::__normal_iterator<const_pointer, vector>
-      const_iterator;
-      typedef std::reverse_iterator<const_iterator>  const_reverse_iterator;
-      typedef std::reverse_iterator<iterator>		 reverse_iterator;
-      typedef size_t					 size_type;
-      typedef ptrdiff_t					 difference_type;
-      typedef _Alloc                        		 allocator_type;
-
-    protected:
-      using _Base::_M_allocate;
-      using _Base::_M_deallocate;
-      using _Base::_M_impl;
-      using _Base::_M_get_Tp_allocator;
-
-    public:
-      // [23.2.4.1] construct/copy/destroy
-      // (assign() and get_allocator() are also listed in this section)
-
-      /**
-       *  @brief  Creates a %vector with no elements.
-       */
-      vector()
-#if __cplusplus >= 201103L
-      noexcept(is_nothrow_default_constructible<_Alloc>::value)
-#endif
-      : _Base() { }
-
-      /**
-       *  @brief  Creates a %vector with no elements.
-       *  @param  __a  An allocator object.
-       */
-      explicit
-      vector(const allocator_type& __a) _GLIBCXX_NOEXCEPT
-      : _Base(__a) { }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Creates a %vector with default constructed elements.
-       *  @param  __n  The number of elements to initially create.
-       *  @param  __a  An allocator.
-       *
-       *  This constructor fills the %vector with @a __n default
-       *  constructed elements.
-       */
-      explicit
-      vector(size_type __n, const allocator_type& __a = allocator_type())
-      : _Base(__n, __a)
-      { _M_default_initialize(__n); }
-
-      /**
-       *  @brief  Creates a %vector with copies of an exemplar element.
-       *  @param  __n  The number of elements to initially create.
-       *  @param  __value  An element to copy.
-       *  @param  __a  An allocator.
-       *
-       *  This constructor fills the %vector with @a __n copies of @a __value.
-       */
-      vector(size_type __n, const value_type& __value,
-	     const allocator_type& __a = allocator_type())
-      : _Base(__n, __a)
-      { _M_fill_initialize(__n, __value); }
-#else
-      /**
-       *  @brief  Creates a %vector with copies of an exemplar element.
-       *  @param  __n  The number of elements to initially create.
-       *  @param  __value  An element to copy.
-       *  @param  __a  An allocator.
-       *
-       *  This constructor fills the %vector with @a __n copies of @a __value.
-       */
-      explicit
-      vector(size_type __n, const value_type& __value = value_type(),
-	     const allocator_type& __a = allocator_type())
-      : _Base(__n, __a)
-      { _M_fill_initialize(__n, __value); }
-#endif
-
-      /**
-       *  @brief  %Vector copy constructor.
-       *  @param  __x  A %vector of identical element and allocator types.
-       *
-       *  The newly-created %vector uses a copy of the allocation
-       *  object used by @a __x.  All the elements of @a __x are copied,
-       *  but any extra memory in
-       *  @a __x (for fast expansion) will not be copied.
-       */
-      vector(const vector& __x)
-      : _Base(__x.size(),
-        _Alloc_traits::_S_select_on_copy(__x._M_get_Tp_allocator()))
-      { this->_M_impl._M_finish =
-	  std::__uninitialized_copy_a(__x.begin(), __x.end(),
-				      this->_M_impl._M_start,
-				      _M_get_Tp_allocator());
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  %Vector move constructor.
-       *  @param  __x  A %vector of identical element and allocator types.
-       *
-       *  The newly-created %vector contains the exact contents of @a __x.
-       *  The contents of @a __x are a valid, but unspecified %vector.
-       */
-      vector(vector&& __x) noexcept
-      : _Base(std::move(__x)) { }
-
-      /// Copy constructor with alternative allocator
-      vector(const vector& __x, const allocator_type& __a)
-      : _Base(__x.size(), __a)
-      { this->_M_impl._M_finish =
-	  std::__uninitialized_copy_a(__x.begin(), __x.end(),
-				      this->_M_impl._M_start,
-				      _M_get_Tp_allocator());
-      }
-
-      /// Move constructor with alternative allocator
-      vector(vector&& __rv, const allocator_type& __m)
-      noexcept(_Alloc_traits::_S_always_equal())
-      : _Base(std::move(__rv), __m)
-      {
-	if (__rv.get_allocator() != __m)
-	  {
-	    this->_M_impl._M_finish =
-	      std::__uninitialized_move_a(__rv.begin(), __rv.end(),
-					  this->_M_impl._M_start,
-					  _M_get_Tp_allocator());
-	    __rv.clear();
-	  }
-      }
-
-      /**
-       *  @brief  Builds a %vector from an initializer list.
-       *  @param  __l  An initializer_list.
-       *  @param  __a  An allocator.
-       *
-       *  Create a %vector consisting of copies of the elements in the
-       *  initializer_list @a __l.
-       *
-       *  This will call the element type's copy constructor N times
-       *  (where N is @a __l.size()) and do no memory reallocation.
-       */
-      vector(initializer_list<value_type> __l,
-	     const allocator_type& __a = allocator_type())
-      : _Base(__a)
-      {
-	_M_range_initialize(__l.begin(), __l.end(),
-			    random_access_iterator_tag());
-      }
-#endif
-
-      /**
-       *  @brief  Builds a %vector from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param  __a  An allocator.
-       *
-       *  Create a %vector consisting of copies of the elements from
-       *  [first,last).
-       *
-       *  If the iterators are forward, bidirectional, or
-       *  random-access, then this will call the elements' copy
-       *  constructor N times (where N is distance(first,last)) and do
-       *  no memory reallocation.  But if only input iterators are
-       *  used, then this will do at most 2N calls to the copy
-       *  constructor, and logN memory reallocations.
-       */
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        vector(_InputIterator __first, _InputIterator __last,
-	       const allocator_type& __a = allocator_type())
-	: _Base(__a)
-        { _M_initialize_dispatch(__first, __last, __false_type()); }
-#else
-      template<typename _InputIterator>
-        vector(_InputIterator __first, _InputIterator __last,
-	       const allocator_type& __a = allocator_type())
-	: _Base(__a)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  _M_initialize_dispatch(__first, __last, _Integral());
-	}
-#endif
-
-      /**
-       *  The dtor only erases the elements, and note that if the
-       *  elements themselves are pointers, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      ~vector() _GLIBCXX_NOEXCEPT
-      { std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
-		      _M_get_Tp_allocator()); }
-
-      /**
-       *  @brief  %Vector assignment operator.
-       *  @param  __x  A %vector of identical element and allocator types.
-       *
-       *  All the elements of @a __x are copied, but any extra memory in
-       *  @a __x (for fast expansion) will not be copied.  Unlike the
-       *  copy constructor, the allocator object is not copied.
-       */
-      vector&
-      operator=(const vector& __x);
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  %Vector move assignment operator.
-       *  @param  __x  A %vector of identical element and allocator types.
-       *
-       *  The contents of @a __x are moved into this %vector (without copying,
-       *  if the allocators permit it).
-       *  @a __x is a valid, but unspecified %vector.
-       */
-      vector&
-      operator=(vector&& __x) noexcept(_Alloc_traits::_S_nothrow_move())
-      {
-        constexpr bool __move_storage =
-          _Alloc_traits::_S_propagate_on_move_assign()
-          || _Alloc_traits::_S_always_equal();
-        _M_move_assign(std::move(__x),
-                       integral_constant<bool, __move_storage>());
-	return *this;
-      }
-
-      /**
-       *  @brief  %Vector list assignment operator.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills a %vector with copies of the elements in the
-       *  initializer list @a __l.
-       *
-       *  Note that the assignment completely changes the %vector and
-       *  that the resulting %vector's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      vector&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->assign(__l.begin(), __l.end());
-	return *this;
-      }
-#endif
-
-      /**
-       *  @brief  Assigns a given value to a %vector.
-       *  @param  __n  Number of elements to be assigned.
-       *  @param  __val  Value to be assigned.
-       *
-       *  This function fills a %vector with @a __n copies of the given
-       *  value.  Note that the assignment completely changes the
-       *  %vector and that the resulting %vector's size is the same as
-       *  the number of elements assigned.  Old data may be lost.
-       */
-      void
-      assign(size_type __n, const value_type& __val)
-      { _M_fill_assign(__n, __val); }
-
-      /**
-       *  @brief  Assigns a range to a %vector.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *
-       *  This function fills a %vector with copies of the elements in the
-       *  range [__first,__last).
-       *
-       *  Note that the assignment completely changes the %vector and
-       *  that the resulting %vector's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        { _M_assign_dispatch(__first, __last, __false_type()); }
-#else
-      template<typename _InputIterator>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  _M_assign_dispatch(__first, __last, _Integral());
-	}
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Assigns an initializer list to a %vector.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills a %vector with copies of the elements in the
-       *  initializer list @a __l.
-       *
-       *  Note that the assignment completely changes the %vector and
-       *  that the resulting %vector's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      void
-      assign(initializer_list<value_type> __l)
-      { this->assign(__l.begin(), __l.end()); }
-#endif
-
-      /// Get a copy of the memory allocation object.
-      using _Base::get_allocator;
-
-      // iterators
-      /**
-       *  Returns a read/write iterator that points to the first
-       *  element in the %vector.  Iteration is done in ordinary
-       *  element order.
-       */
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(this->_M_impl._M_start); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the
-       *  first element in the %vector.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(this->_M_impl._M_start); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  element in the %vector.  Iteration is done in ordinary
-       *  element order.
-       */
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(this->_M_impl._M_finish); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past
-       *  the last element in the %vector.  Iteration is done in
-       *  ordinary element order.
-       */
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(this->_M_impl._M_finish); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the
-       *  last element in the %vector.  Iteration is done in reverse
-       *  element order.
-       */
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last element in the %vector.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one
-       *  before the first element in the %vector.  Iteration is done
-       *  in reverse element order.
-       */
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first element in the %vector.  Iteration
-       *  is done in reverse element order.
-       */
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read-only (constant) iterator that points to the
-       *  first element in the %vector.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(this->_M_impl._M_start); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past
-       *  the last element in the %vector.  Iteration is done in
-       *  ordinary element order.
-       */
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(this->_M_impl._M_finish); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last element in the %vector.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first element in the %vector.  Iteration
-       *  is done in reverse element order.
-       */
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-      // [23.2.4.2] capacity
-      /**  Returns the number of elements in the %vector.  */
-      size_type
-      size() const _GLIBCXX_NOEXCEPT
-      { return size_type(this->_M_impl._M_finish - this->_M_impl._M_start); }
-
-      /**  Returns the size() of the largest possible %vector.  */
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return _Alloc_traits::max_size(_M_get_Tp_allocator()); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Resizes the %vector to the specified number of elements.
-       *  @param  __new_size  Number of elements the %vector should contain.
-       *
-       *  This function will %resize the %vector to the specified
-       *  number of elements.  If the number is smaller than the
-       *  %vector's current size the %vector is truncated, otherwise
-       *  default constructed elements are appended.
-       */
-      void
-      resize(size_type __new_size)
-      {
-	if (__new_size > size())
-	  _M_default_append(__new_size - size());
-	else if (__new_size < size())
-	  _M_erase_at_end(this->_M_impl._M_start + __new_size);
-      }
-
-      /**
-       *  @brief  Resizes the %vector to the specified number of elements.
-       *  @param  __new_size  Number of elements the %vector should contain.
-       *  @param  __x  Data with which new elements should be populated.
-       *
-       *  This function will %resize the %vector to the specified
-       *  number of elements.  If the number is smaller than the
-       *  %vector's current size the %vector is truncated, otherwise
-       *  the %vector is extended and new elements are populated with
-       *  given data.
-       */
-      void
-      resize(size_type __new_size, const value_type& __x)
-      {
-	if (__new_size > size())
-	  insert(end(), __new_size - size(), __x);
-	else if (__new_size < size())
-	  _M_erase_at_end(this->_M_impl._M_start + __new_size);
-      }
-#else
-      /**
-       *  @brief  Resizes the %vector to the specified number of elements.
-       *  @param  __new_size  Number of elements the %vector should contain.
-       *  @param  __x  Data with which new elements should be populated.
-       *
-       *  This function will %resize the %vector to the specified
-       *  number of elements.  If the number is smaller than the
-       *  %vector's current size the %vector is truncated, otherwise
-       *  the %vector is extended and new elements are populated with
-       *  given data.
-       */
-      void
-      resize(size_type __new_size, value_type __x = value_type())
-      {
-	if (__new_size > size())
-	  insert(end(), __new_size - size(), __x);
-	else if (__new_size < size())
-	  _M_erase_at_end(this->_M_impl._M_start + __new_size);
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      /**  A non-binding request to reduce capacity() to size().  */
-      void
-      shrink_to_fit()
-      { _M_shrink_to_fit(); }
-#endif
-
-      /**
-       *  Returns the total number of elements that the %vector can
-       *  hold before needing to allocate more memory.
-       */
-      size_type
-      capacity() const _GLIBCXX_NOEXCEPT
-      { return size_type(this->_M_impl._M_end_of_storage
-			 - this->_M_impl._M_start); }
-
-      /**
-       *  Returns true if the %vector is empty.  (Thus begin() would
-       *  equal end().)
-       */
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return begin() == end(); }
-
-      /**
-       *  @brief  Attempt to preallocate enough memory for specified number of
-       *          elements.
-       *  @param  __n  Number of elements required.
-       *  @throw  std::length_error  If @a n exceeds @c max_size().
-       *
-       *  This function attempts to reserve enough memory for the
-       *  %vector to hold the specified number of elements.  If the
-       *  number requested is more than max_size(), length_error is
-       *  thrown.
-       *
-       *  The advantage of this function is that if optimal code is a
-       *  necessity and the user can determine the number of elements
-       *  that will be required, the user can reserve the memory in
-       *  %advance, and thus prevent a possible reallocation of memory
-       *  and copying of %vector data.
-       */
-      void
-      reserve(size_type __n);
-
-      // element access
-      /**
-       *  @brief  Subscript access to the data contained in the %vector.
-       *  @param __n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read/write reference to data.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      reference
-      operator[](size_type __n) _GLIBCXX_NOEXCEPT
-      { return *(this->_M_impl._M_start + __n); }
-
-      /**
-       *  @brief  Subscript access to the data contained in the %vector.
-       *  @param __n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read-only (constant) reference to data.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      const_reference
-      operator[](size_type __n) const _GLIBCXX_NOEXCEPT
-      { return *(this->_M_impl._M_start + __n); }
-
-    protected:
-      /// Safety check used only from at().
-      void
-      _M_range_check(size_type __n) const
-      {
-	if (__n >= this->size())
-	  __throw_out_of_range_fmt(__N("vector::_M_range_check: __n "
-				       "(which is %zu) >= this->size() "
-				       "(which is %zu)"),
-				   __n, this->size());
-      }
-
-    public:
-      /**
-       *  @brief  Provides access to the data contained in the %vector.
-       *  @param __n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read/write reference to data.
-       *  @throw  std::out_of_range  If @a __n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter
-       *  is first checked that it is in the range of the vector.  The
-       *  function throws out_of_range if the check fails.
-       */
-      reference
-      at(size_type __n)
-      {
-	_M_range_check(__n);
-	return (*this)[__n]; 
-      }
-
-      /**
-       *  @brief  Provides access to the data contained in the %vector.
-       *  @param __n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read-only (constant) reference to data.
-       *  @throw  std::out_of_range  If @a __n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter
-       *  is first checked that it is in the range of the vector.  The
-       *  function throws out_of_range if the check fails.
-       */
-      const_reference
-      at(size_type __n) const
-      {
-	_M_range_check(__n);
-	return (*this)[__n];
-      }
-
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %vector.
-       */
-      reference
-      front() _GLIBCXX_NOEXCEPT
-      { return *begin(); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %vector.
-       */
-      const_reference
-      front() const _GLIBCXX_NOEXCEPT
-      { return *begin(); }
-
-      /**
-       *  Returns a read/write reference to the data at the last
-       *  element of the %vector.
-       */
-      reference
-      back() _GLIBCXX_NOEXCEPT
-      { return *(end() - 1); }
-      
-      /**
-       *  Returns a read-only (constant) reference to the data at the
-       *  last element of the %vector.
-       */
-      const_reference
-      back() const _GLIBCXX_NOEXCEPT
-      { return *(end() - 1); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 464. Suggestion for new member functions in standard containers.
-      // data access
-      /**
-       *   Returns a pointer such that [data(), data() + size()) is a valid
-       *   range.  For a non-empty %vector, data() == &front().
-       */
-#if __cplusplus >= 201103L
-      _Tp*
-#else
-      pointer
-#endif
-      data() _GLIBCXX_NOEXCEPT
-      { return _M_data_ptr(this->_M_impl._M_start); }
-
-#if __cplusplus >= 201103L
-      const _Tp*
-#else
-      const_pointer
-#endif
-      data() const _GLIBCXX_NOEXCEPT
-      { return _M_data_ptr(this->_M_impl._M_start); }
-
-      // [23.2.4.3] modifiers
-      /**
-       *  @brief  Add data to the end of the %vector.
-       *  @param  __x  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an
-       *  element at the end of the %vector and assigns the given data
-       *  to it.  Due to the nature of a %vector this operation can be
-       *  done in constant time if the %vector has preallocated space
-       *  available.
-       */
-      void
-      push_back(const value_type& __x)
-      {
-	if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
-	  {
-	    _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish,
-	                             __x);
-	    ++this->_M_impl._M_finish;
-	  }
-	else
-#if __cplusplus >= 201103L
-	  _M_emplace_back_aux(__x);
-#else
-	  _M_insert_aux(end(), __x);
-#endif
-      }
-
-#if __cplusplus >= 201103L
-      void
-      push_back(value_type&& __x)
-      { emplace_back(std::move(__x)); }
-
-      template<typename... _Args>
-        void
-        emplace_back(_Args&&... __args);
-#endif
-
-      /**
-       *  @brief  Removes last element.
-       *
-       *  This is a typical stack operation. It shrinks the %vector by one.
-       *
-       *  Note that no data is returned, and if the last element's
-       *  data is needed, it should be retrieved before pop_back() is
-       *  called.
-       */
-      void
-      pop_back() _GLIBCXX_NOEXCEPT
-      {
-	--this->_M_impl._M_finish;
-	_Alloc_traits::destroy(this->_M_impl, this->_M_impl._M_finish);
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts an object in %vector before specified iterator.
-       *  @param  __position  A const_iterator into the %vector.
-       *  @param  __args  Arguments.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert an object of type T constructed
-       *  with T(std::forward<Args>(args)...) before the specified location.
-       *  Note that this kind of operation could be expensive for a %vector
-       *  and if it is frequently used the user should consider using
-       *  std::list.
-       */
-      template<typename... _Args>
-        iterator
-        emplace(const_iterator __position, _Args&&... __args);
-
-      /**
-       *  @brief  Inserts given value into %vector before specified iterator.
-       *  @param  __position  A const_iterator into the %vector.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given value before
-       *  the specified location.  Note that this kind of operation
-       *  could be expensive for a %vector and if it is frequently
-       *  used the user should consider using std::list.
-       */
-      iterator
-      insert(const_iterator __position, const value_type& __x);
-#else
-      /**
-       *  @brief  Inserts given value into %vector before specified iterator.
-       *  @param  __position  An iterator into the %vector.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given value before
-       *  the specified location.  Note that this kind of operation
-       *  could be expensive for a %vector and if it is frequently
-       *  used the user should consider using std::list.
-       */
-      iterator
-      insert(iterator __position, const value_type& __x);
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts given rvalue into %vector before specified iterator.
-       *  @param  __position  A const_iterator into the %vector.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given rvalue before
-       *  the specified location.  Note that this kind of operation
-       *  could be expensive for a %vector and if it is frequently
-       *  used the user should consider using std::list.
-       */
-      iterator
-      insert(const_iterator __position, value_type&& __x)
-      { return emplace(__position, std::move(__x)); }
-
-      /**
-       *  @brief  Inserts an initializer_list into the %vector.
-       *  @param  __position  An iterator into the %vector.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function will insert copies of the data in the 
-       *  initializer_list @a l into the %vector before the location
-       *  specified by @a position.
-       *
-       *  Note that this kind of operation could be expensive for a
-       *  %vector and if it is frequently used the user should
-       *  consider using std::list.
-       */
-      iterator
-      insert(const_iterator __position, initializer_list<value_type> __l)
-      { return this->insert(__position, __l.begin(), __l.end()); }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts a number of copies of given data into the %vector.
-       *  @param  __position  A const_iterator into the %vector.
-       *  @param  __n  Number of elements to be inserted.
-       *  @param  __x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a specified number of copies of
-       *  the given data before the location specified by @a position.
-       *
-       *  Note that this kind of operation could be expensive for a
-       *  %vector and if it is frequently used the user should
-       *  consider using std::list.
-       */
-      iterator
-      insert(const_iterator __position, size_type __n, const value_type& __x)
-      {
-	difference_type __offset = __position - cbegin();
-	_M_fill_insert(begin() + __offset, __n, __x);
-	return begin() + __offset;
-      }
-#else
-      /**
-       *  @brief  Inserts a number of copies of given data into the %vector.
-       *  @param  __position  An iterator into the %vector.
-       *  @param  __n  Number of elements to be inserted.
-       *  @param  __x  Data to be inserted.
-       *
-       *  This function will insert a specified number of copies of
-       *  the given data before the location specified by @a position.
-       *
-       *  Note that this kind of operation could be expensive for a
-       *  %vector and if it is frequently used the user should
-       *  consider using std::list.
-       */
-      void
-      insert(iterator __position, size_type __n, const value_type& __x)
-      { _M_fill_insert(__position, __n, __x); }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Inserts a range into the %vector.
-       *  @param  __position  A const_iterator into the %vector.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert copies of the data in the range
-       *  [__first,__last) into the %vector before the location specified
-       *  by @a pos.
-       *
-       *  Note that this kind of operation could be expensive for a
-       *  %vector and if it is frequently used the user should
-       *  consider using std::list.
-       */
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        iterator
-        insert(const_iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-        {
-	  difference_type __offset = __position - cbegin();
-	  _M_insert_dispatch(begin() + __offset,
-			     __first, __last, __false_type());
-	  return begin() + __offset;
-	}
-#else
-      /**
-       *  @brief  Inserts a range into the %vector.
-       *  @param  __position  An iterator into the %vector.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *
-       *  This function will insert copies of the data in the range
-       *  [__first,__last) into the %vector before the location specified
-       *  by @a pos.
-       *
-       *  Note that this kind of operation could be expensive for a
-       *  %vector and if it is frequently used the user should
-       *  consider using std::list.
-       */
-      template<typename _InputIterator>
-        void
-        insert(iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  _M_insert_dispatch(__position, __first, __last, _Integral());
-	}
-#endif
-
-      /**
-       *  @brief  Remove element at given position.
-       *  @param  __position  Iterator pointing to element to be erased.
-       *  @return  An iterator pointing to the next element (or end()).
-       *
-       *  This function will erase the element at the given position and thus
-       *  shorten the %vector by one.
-       *
-       *  Note This operation could be expensive and if it is
-       *  frequently used the user should consider using std::list.
-       *  The user is also cautioned that this function only erases
-       *  the element, and that if the element is itself a pointer,
-       *  the pointed-to memory is not touched in any way.  Managing
-       *  the pointer is the user's responsibility.
-       */
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __position)
-      { return _M_erase(begin() + (__position - cbegin())); }
-#else
-      erase(iterator __position)
-      { return _M_erase(__position); }
-#endif
-
-      /**
-       *  @brief  Remove a range of elements.
-       *  @param  __first  Iterator pointing to the first element to be erased.
-       *  @param  __last  Iterator pointing to one past the last element to be
-       *                  erased.
-       *  @return  An iterator pointing to the element pointed to by @a __last
-       *           prior to erasing (or end()).
-       *
-       *  This function will erase the elements in the range
-       *  [__first,__last) and shorten the %vector accordingly.
-       *
-       *  Note This operation could be expensive and if it is
-       *  frequently used the user should consider using std::list.
-       *  The user is also cautioned that this function only erases
-       *  the elements, and that if the elements themselves are
-       *  pointers, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibility.
-       */
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __first, const_iterator __last)
-      {
-	const auto __beg = begin();
-	const auto __cbeg = cbegin();
-	return _M_erase(__beg + (__first - __cbeg), __beg + (__last - __cbeg));
-      }
-#else
-      erase(iterator __first, iterator __last)
-      { return _M_erase(__first, __last); }
-#endif
-
-      /**
-       *  @brief  Swaps data with another %vector.
-       *  @param  __x  A %vector of the same element and allocator types.
-       *
-       *  This exchanges the elements between two vectors in constant time.
-       *  (Three pointers, so it should be quite fast.)
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(v1,v2) will feed to this function.
-       */
-      void
-      swap(vector& __x)
-#if __cplusplus >= 201103L
-      noexcept(_Alloc_traits::_S_nothrow_swap())
-#endif
-      {
-	this->_M_impl._M_swap_data(__x._M_impl);
-	_Alloc_traits::_S_on_swap(_M_get_Tp_allocator(),
-	                          __x._M_get_Tp_allocator());
-      }
-
-      /**
-       *  Erases all the elements.  Note that this function only erases the
-       *  elements, and that if the elements themselves are pointers, the
-       *  pointed-to memory is not touched in any way.  Managing the pointer is
-       *  the user's responsibility.
-       */
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      { _M_erase_at_end(this->_M_impl._M_start); }
-
-    protected:
-      /**
-       *  Memory expansion handler.  Uses the member allocation function to
-       *  obtain @a n bytes of memory, and then copies [first,last) into it.
-       */
-      template<typename _ForwardIterator>
-        pointer
-        _M_allocate_and_copy(size_type __n,
-			     _ForwardIterator __first, _ForwardIterator __last)
-        {
-	  pointer __result = this->_M_allocate(__n);
-	  __try
-	    {
-	      std::__uninitialized_copy_a(__first, __last, __result,
-					  _M_get_Tp_allocator());
-	      return __result;
-	    }
-	  __catch(...)
-	    {
-	      _M_deallocate(__result, __n);
-	      __throw_exception_again;
-	    }
-	}
-
-
-      // Internal constructor functions follow.
-
-      // Called by the range constructor to implement [23.1.1]/9
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-        void
-        _M_initialize_dispatch(_Integer __n, _Integer __value, __true_type)
-        {
-	  this->_M_impl._M_start = _M_allocate(static_cast<size_type>(__n));
-	  this->_M_impl._M_end_of_storage =
-	    this->_M_impl._M_start + static_cast<size_type>(__n);
-	  _M_fill_initialize(static_cast<size_type>(__n), __value);
-	}
-
-      // Called by the range constructor to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_initialize_dispatch(_InputIterator __first, _InputIterator __last,
-			       __false_type)
-        {
-	  typedef typename std::iterator_traits<_InputIterator>::
-	    iterator_category _IterCategory;
-	  _M_range_initialize(__first, __last, _IterCategory());
-	}
-
-      // Called by the second initialize_dispatch above
-      template<typename _InputIterator>
-        void
-        _M_range_initialize(_InputIterator __first,
-			    _InputIterator __last, std::input_iterator_tag)
-        {
-	  for (; __first != __last; ++__first)
-#if __cplusplus >= 201103L
-	    emplace_back(*__first);
-#else
-	    push_back(*__first);
-#endif
-	}
-
-      // Called by the second initialize_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_range_initialize(_ForwardIterator __first,
-			    _ForwardIterator __last, std::forward_iterator_tag)
-        {
-	  const size_type __n = std::distance(__first, __last);
-	  this->_M_impl._M_start = this->_M_allocate(__n);
-	  this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __n;
-	  this->_M_impl._M_finish =
-	    std::__uninitialized_copy_a(__first, __last,
-					this->_M_impl._M_start,
-					_M_get_Tp_allocator());
-	}
-
-      // Called by the first initialize_dispatch above and by the
-      // vector(n,value,a) constructor.
-      void
-      _M_fill_initialize(size_type __n, const value_type& __value)
-      {
-	this->_M_impl._M_finish =
-	  std::__uninitialized_fill_n_a(this->_M_impl._M_start, __n, __value,
-					_M_get_Tp_allocator());
-      }
-
-#if __cplusplus >= 201103L
-      // Called by the vector(n) constructor.
-      void
-      _M_default_initialize(size_type __n)
-      {
-	this->_M_impl._M_finish =
-	  std::__uninitialized_default_n_a(this->_M_impl._M_start, __n,
-					   _M_get_Tp_allocator());
-      }
-#endif
-
-      // Internal assign functions follow.  The *_aux functions do the actual
-      // assignment work for the range versions.
-
-      // Called by the range assign to implement [23.1.1]/9
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-        void
-        _M_assign_dispatch(_Integer __n, _Integer __val, __true_type)
-        { _M_fill_assign(__n, __val); }
-
-      // Called by the range assign to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-			   __false_type)
-        {
-	  typedef typename std::iterator_traits<_InputIterator>::
-	    iterator_category _IterCategory;
-	  _M_assign_aux(__first, __last, _IterCategory());
-	}
-
-      // Called by the second assign_dispatch above
-      template<typename _InputIterator>
-        void
-        _M_assign_aux(_InputIterator __first, _InputIterator __last,
-		      std::input_iterator_tag);
-
-      // Called by the second assign_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last,
-		      std::forward_iterator_tag);
-
-      // Called by assign(n,t), and the range assign when it turns out
-      // to be the same thing.
-      void
-      _M_fill_assign(size_type __n, const value_type& __val);
-
-
-      // Internal insert functions follow.
-
-      // Called by the range insert to implement [23.1.1]/9
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-        void
-        _M_insert_dispatch(iterator __pos, _Integer __n, _Integer __val,
-			   __true_type)
-        { _M_fill_insert(__pos, __n, __val); }
-
-      // Called by the range insert to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_insert_dispatch(iterator __pos, _InputIterator __first,
-			   _InputIterator __last, __false_type)
-        {
-	  typedef typename std::iterator_traits<_InputIterator>::
-	    iterator_category _IterCategory;
-	  _M_range_insert(__pos, __first, __last, _IterCategory());
-	}
-
-      // Called by the second insert_dispatch above
-      template<typename _InputIterator>
-        void
-        _M_range_insert(iterator __pos, _InputIterator __first,
-			_InputIterator __last, std::input_iterator_tag);
-
-      // Called by the second insert_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_range_insert(iterator __pos, _ForwardIterator __first,
-			_ForwardIterator __last, std::forward_iterator_tag);
-
-      // Called by insert(p,n,x), and the range insert when it turns out to be
-      // the same thing.
-      void
-      _M_fill_insert(iterator __pos, size_type __n, const value_type& __x);
-
-#if __cplusplus >= 201103L
-      // Called by resize(n).
-      void
-      _M_default_append(size_type __n);
-
-      bool
-      _M_shrink_to_fit();
-#endif
-
-      // Called by insert(p,x)
-#if __cplusplus < 201103L
-      void
-      _M_insert_aux(iterator __position, const value_type& __x);
-#else
-      template<typename... _Args>
-        void
-        _M_insert_aux(iterator __position, _Args&&... __args);
-
-      template<typename... _Args>
-        void
-        _M_emplace_back_aux(_Args&&... __args);
-#endif
-
-      // Called by the latter.
-      size_type
-      _M_check_len(size_type __n, const char* __s) const
-      {
-	if (max_size() - size() < __n)
-	  __throw_length_error(__N(__s));
-
-	const size_type __len = size() + std::max(size(), __n);
-	return (__len < size() || __len > max_size()) ? max_size() : __len;
-      }
-
-      // Internal erase functions follow.
-
-      // Called by erase(q1,q2), clear(), resize(), _M_fill_assign,
-      // _M_assign_aux.
-      void
-      _M_erase_at_end(pointer __pos) _GLIBCXX_NOEXCEPT
-      {
-	std::_Destroy(__pos, this->_M_impl._M_finish, _M_get_Tp_allocator());
-	this->_M_impl._M_finish = __pos;
-      }
-
-      iterator
-      _M_erase(iterator __position);
-
-      iterator
-      _M_erase(iterator __first, iterator __last);
-
-#if __cplusplus >= 201103L
-    private:
-      // Constant-time move assignment when source object's memory can be
-      // moved, either because the source's allocator will move too
-      // or because the allocators are equal.
-      void
-      _M_move_assign(vector&& __x, std::true_type) noexcept
-      {
-	vector __tmp(get_allocator());
-	this->_M_impl._M_swap_data(__tmp._M_impl);
-	this->_M_impl._M_swap_data(__x._M_impl);
-	std::__alloc_on_move(_M_get_Tp_allocator(), __x._M_get_Tp_allocator());
-      }
-
-      // Do move assignment when it might not be possible to move source
-      // object's memory, resulting in a linear-time operation.
-      void
-      _M_move_assign(vector&& __x, std::false_type)
-      {
-	if (__x._M_get_Tp_allocator() == this->_M_get_Tp_allocator())
-	  _M_move_assign(std::move(__x), std::true_type());
-	else
-	  {
-	    // The rvalue's allocator cannot be moved and is not equal,
-	    // so we need to individually move each element.
-	    this->assign(std::__make_move_if_noexcept_iterator(__x.begin()),
-			 std::__make_move_if_noexcept_iterator(__x.end()));
-	    __x.clear();
-	  }
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      template<typename _Up>
-	_Up*
-	_M_data_ptr(_Up* __ptr) const
-	{ return __ptr; }
-
-      template<typename _Ptr>
-	typename std::pointer_traits<_Ptr>::element_type*
-	_M_data_ptr(_Ptr __ptr) const
-	{ return empty() ? nullptr : std::__addressof(*__ptr); }
-#else
-      template<typename _Ptr>
-	_Ptr
-	_M_data_ptr(_Ptr __ptr) const
-	{ return __ptr; }
-#endif
-    };
-
-
-  /**
-   *  @brief  Vector equality comparison.
-   *  @param  __x  A %vector.
-   *  @param  __y  A %vector of the same type as @a __x.
-   *  @return  True iff the size and elements of the vectors are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the
-   *  vectors.  Vectors are considered equivalent if their sizes are equal,
-   *  and if corresponding elements compare equal.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const vector<_Tp, _Alloc>& __x, const vector<_Tp, _Alloc>& __y)
-    { return (__x.size() == __y.size()
-	      && std::equal(__x.begin(), __x.end(), __y.begin())); }
-
-  /**
-   *  @brief  Vector ordering relation.
-   *  @param  __x  A %vector.
-   *  @param  __y  A %vector of the same type as @a __x.
-   *  @return  True iff @a __x is lexicographically less than @a __y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  vectors.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const vector<_Tp, _Alloc>& __x, const vector<_Tp, _Alloc>& __y)
-    { return std::lexicographical_compare(__x.begin(), __x.end(),
-					  __y.begin(), __y.end()); }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const vector<_Tp, _Alloc>& __x, const vector<_Tp, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const vector<_Tp, _Alloc>& __x, const vector<_Tp, _Alloc>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const vector<_Tp, _Alloc>& __x, const vector<_Tp, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const vector<_Tp, _Alloc>& __x, const vector<_Tp, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::vector::swap().
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(vector<_Tp, _Alloc>& __x, vector<_Tp, _Alloc>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif /* _STL_VECTOR_H */
diff --git a/openflow/usr/include/c++/5/bits/stream_iterator.h b/openflow/usr/include/c++/5/bits/stream_iterator.h
deleted file mode 100644
index 270b01b..0000000
--- a/openflow/usr/include/c++/5/bits/stream_iterator.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// Stream iterators
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/stream_iterator.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iterator}
- */
-
-#ifndef _STREAM_ITERATOR_H
-#define _STREAM_ITERATOR_H 1
-
-#pragma GCC system_header
-
-#include <debug/debug.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup iterators
-   * @{
-   */
-
-  /// Provides input iterator semantics for streams.
-  template<typename _Tp, typename _CharT = char,
-           typename _Traits = char_traits<_CharT>, typename _Dist = ptrdiff_t>
-    class istream_iterator
-    : public iterator<input_iterator_tag, _Tp, _Dist, const _Tp*, const _Tp&>
-    {
-    public:
-      typedef _CharT                         char_type;
-      typedef _Traits                        traits_type;
-      typedef basic_istream<_CharT, _Traits> istream_type;
-
-    private:
-      istream_type*	_M_stream;
-      _Tp		_M_value;
-      bool		_M_ok;
-
-    public:
-      ///  Construct end of input stream iterator.
-      _GLIBCXX_CONSTEXPR istream_iterator()
-      : _M_stream(0), _M_value(), _M_ok(false) {}
-
-      ///  Construct start of input stream iterator.
-      istream_iterator(istream_type& __s)
-      : _M_stream(&__s)
-      { _M_read(); }
-
-      istream_iterator(const istream_iterator& __obj)
-      : _M_stream(__obj._M_stream), _M_value(__obj._M_value),
-        _M_ok(__obj._M_ok)
-      { }
-
-      const _Tp&
-      operator*() const
-      {
-	__glibcxx_requires_cond(_M_ok,
-				_M_message(__gnu_debug::__msg_deref_istream)
-				._M_iterator(*this));
-	return _M_value;
-      }
-
-      const _Tp*
-      operator->() const { return &(operator*()); }
-
-      istream_iterator&
-      operator++()
-      {
-	__glibcxx_requires_cond(_M_ok,
-				_M_message(__gnu_debug::__msg_inc_istream)
-				._M_iterator(*this));
-	_M_read();
-	return *this;
-      }
-
-      istream_iterator
-      operator++(int)
-      {
-	__glibcxx_requires_cond(_M_ok,
-				_M_message(__gnu_debug::__msg_inc_istream)
-				._M_iterator(*this));
-	istream_iterator __tmp = *this;
-	_M_read();
-	return __tmp;
-      }
-
-      bool
-      _M_equal(const istream_iterator& __x) const
-      { return (_M_ok == __x._M_ok) && (!_M_ok || _M_stream == __x._M_stream); }
-
-    private:
-      void
-      _M_read()
-      {
-	_M_ok = (_M_stream && *_M_stream) ? true : false;
-	if (_M_ok)
-	  {
-	    *_M_stream >> _M_value;
-	    _M_ok = *_M_stream ? true : false;
-	  }
-      }
-    };
-
-  ///  Return true if x and y are both end or not end, or x and y are the same.
-  template<typename _Tp, typename _CharT, typename _Traits, typename _Dist>
-    inline bool
-    operator==(const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __x,
-	       const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __y)
-    { return __x._M_equal(__y); }
-
-  ///  Return false if x and y are both end or not end, or x and y are the same.
-  template <class _Tp, class _CharT, class _Traits, class _Dist>
-    inline bool
-    operator!=(const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __x,
-	       const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __y)
-    { return !__x._M_equal(__y); }
-
-  /**
-   *  @brief  Provides output iterator semantics for streams.
-   *
-   *  This class provides an iterator to write to an ostream.  The type Tp is
-   *  the only type written by this iterator and there must be an
-   *  operator<<(Tp) defined.
-   *
-   *  @tparam  _Tp  The type to write to the ostream.
-   *  @tparam  _CharT  The ostream char_type.
-   *  @tparam  _Traits  The ostream char_traits.
-  */
-  template<typename _Tp, typename _CharT = char,
-           typename _Traits = char_traits<_CharT> >
-    class ostream_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    public:
-      //@{
-      /// Public typedef
-      typedef _CharT                         char_type;
-      typedef _Traits                        traits_type;
-      typedef basic_ostream<_CharT, _Traits> ostream_type;
-      //@}
-
-    private:
-      ostream_type*	_M_stream;
-      const _CharT*	_M_string;
-
-    public:
-      /// Construct from an ostream.
-      ostream_iterator(ostream_type& __s) : _M_stream(&__s), _M_string(0) {}
-
-      /**
-       *  Construct from an ostream.
-       *
-       *  The delimiter string @a c is written to the stream after every Tp
-       *  written to the stream.  The delimiter is not copied, and thus must
-       *  not be destroyed while this iterator is in use.
-       *
-       *  @param  __s  Underlying ostream to write to.
-       *  @param  __c  CharT delimiter string to insert.
-      */
-      ostream_iterator(ostream_type& __s, const _CharT* __c)
-      : _M_stream(&__s), _M_string(__c)  { }
-
-      /// Copy constructor.
-      ostream_iterator(const ostream_iterator& __obj)
-      : _M_stream(__obj._M_stream), _M_string(__obj._M_string)  { }
-
-      /// Writes @a value to underlying ostream using operator<<.  If
-      /// constructed with delimiter string, writes delimiter to ostream.
-      ostream_iterator&
-      operator=(const _Tp& __value)
-      {
-	__glibcxx_requires_cond(_M_stream != 0,
-				_M_message(__gnu_debug::__msg_output_ostream)
-				._M_iterator(*this));
-	*_M_stream << __value;
-	if (_M_string) *_M_stream << _M_string;
-	return *this;
-      }
-
-      ostream_iterator&
-      operator*()
-      { return *this; }
-
-      ostream_iterator&
-      operator++()
-      { return *this; }
-
-      ostream_iterator&
-      operator++(int)
-      { return *this; }
-    };
-
-  // @} group iterators
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/streambuf.tcc b/openflow/usr/include/c++/5/bits/streambuf.tcc
deleted file mode 100644
index 76f8513..0000000
--- a/openflow/usr/include/c++/5/bits/streambuf.tcc
+++ /dev/null
@@ -1,175 +0,0 @@
-// Stream buffer classes -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/streambuf.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{streambuf}
- */
-
-//
-// ISO C++ 14882: 27.5  Stream buffers
-//
-
-#ifndef _STREAMBUF_TCC
-#define _STREAMBUF_TCC 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits>
-    streamsize
-    basic_streambuf<_CharT, _Traits>::
-    xsgetn(char_type* __s, streamsize __n)
-    {
-      streamsize __ret = 0;
-      while (__ret < __n)
-	{
-	  const streamsize __buf_len = this->egptr() - this->gptr();
-	  if (__buf_len)
-	    {
-	      const streamsize __remaining = __n - __ret;
-	      const streamsize __len = std::min(__buf_len, __remaining);
-	      traits_type::copy(__s, this->gptr(), __len);
-	      __ret += __len;
-	      __s += __len;
-	      this->__safe_gbump(__len);
-	    }
-
-	  if (__ret < __n)
-	    {
-	      const int_type __c = this->uflow();
-	      if (!traits_type::eq_int_type(__c, traits_type::eof()))
-		{
-		  traits_type::assign(*__s++, traits_type::to_char_type(__c));
-		  ++__ret;
-		}
-	      else
-		break;
-	    }
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    streamsize
-    basic_streambuf<_CharT, _Traits>::
-    xsputn(const char_type* __s, streamsize __n)
-    {
-      streamsize __ret = 0;
-      while (__ret < __n)
-	{
-	  const streamsize __buf_len = this->epptr() - this->pptr();
-	  if (__buf_len)
-	    {
-	      const streamsize __remaining = __n - __ret;
-	      const streamsize __len = std::min(__buf_len, __remaining);
-	      traits_type::copy(this->pptr(), __s, __len);
-	      __ret += __len;
-	      __s += __len;
-	      this->__safe_pbump(__len);
-	    }
-
-	  if (__ret < __n)
-	    {
-	      int_type __c = this->overflow(traits_type::to_int_type(*__s));
-	      if (!traits_type::eq_int_type(__c, traits_type::eof()))
-		{
-		  ++__ret;
-		  ++__s;
-		}
-	      else
-		break;
-	    }
-	}
-      return __ret;
-    }
-
-  // Conceivably, this could be used to implement buffer-to-buffer
-  // copies, if this was ever desired in an un-ambiguous way by the
-  // standard.
-  template<typename _CharT, typename _Traits>
-    streamsize
-    __copy_streambufs_eof(basic_streambuf<_CharT, _Traits>* __sbin,
-			  basic_streambuf<_CharT, _Traits>* __sbout,
-			  bool& __ineof)
-    {
-      streamsize __ret = 0;
-      __ineof = true;
-      typename _Traits::int_type __c = __sbin->sgetc();
-      while (!_Traits::eq_int_type(__c, _Traits::eof()))
-	{
-	  __c = __sbout->sputc(_Traits::to_char_type(__c));
-	  if (_Traits::eq_int_type(__c, _Traits::eof()))
-	    {
-	      __ineof = false;
-	      break;
-	    }
-	  ++__ret;
-	  __c = __sbin->snextc();
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline streamsize
-    __copy_streambufs(basic_streambuf<_CharT, _Traits>* __sbin,
-		      basic_streambuf<_CharT, _Traits>* __sbout)
-    {
-      bool __ineof;
-      return __copy_streambufs_eof(__sbin, __sbout, __ineof);
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_streambuf<char>;
-  extern template
-    streamsize
-    __copy_streambufs(basic_streambuf<char>*,
-		      basic_streambuf<char>*);
-  extern template
-    streamsize
-    __copy_streambufs_eof(basic_streambuf<char>*,
-			  basic_streambuf<char>*, bool&);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_streambuf<wchar_t>;
-  extern template
-    streamsize
-    __copy_streambufs(basic_streambuf<wchar_t>*,
-		      basic_streambuf<wchar_t>*);
-  extern template
-    streamsize
-    __copy_streambufs_eof(basic_streambuf<wchar_t>*,
-			  basic_streambuf<wchar_t>*, bool&);
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/streambuf_iterator.h b/openflow/usr/include/c++/5/bits/streambuf_iterator.h
deleted file mode 100644
index 372b232..0000000
--- a/openflow/usr/include/c++/5/bits/streambuf_iterator.h
+++ /dev/null
@@ -1,412 +0,0 @@
-// Streambuf iterators
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/streambuf_iterator.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{iterator}
- */
-
-#ifndef _STREAMBUF_ITERATOR_H
-#define _STREAMBUF_ITERATOR_H 1
-
-#pragma GCC system_header
-
-#include <streambuf>
-#include <debug/debug.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-     
-  /**
-   * @addtogroup iterators
-   * @{
-   */
-
-  // 24.5.3 Template class istreambuf_iterator
-  /// Provides input iterator semantics for streambufs.
-  template<typename _CharT, typename _Traits>
-    class istreambuf_iterator
-    : public iterator<input_iterator_tag, _CharT, typename _Traits::off_type,
-                      _CharT*,
-#if __cplusplus >= 201103L
-    // LWG 445.
-		      _CharT>
-#else
-		      _CharT&>
-#endif
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT					char_type;
-      typedef _Traits					traits_type;
-      typedef typename _Traits::int_type		int_type;
-      typedef basic_streambuf<_CharT, _Traits>		streambuf_type;
-      typedef basic_istream<_CharT, _Traits>		istream_type;
-      //@}
-
-      template<typename _CharT2>
-	friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value,
-		                    ostreambuf_iterator<_CharT2> >::__type
-	copy(istreambuf_iterator<_CharT2>, istreambuf_iterator<_CharT2>,
-	     ostreambuf_iterator<_CharT2>);
-
-      template<bool _IsMove, typename _CharT2>
-	friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, 
-					       _CharT2*>::__type
-	__copy_move_a2(istreambuf_iterator<_CharT2>,
-		       istreambuf_iterator<_CharT2>, _CharT2*);
-
-      template<typename _CharT2>
-	friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value,
-			            istreambuf_iterator<_CharT2> >::__type
-	find(istreambuf_iterator<_CharT2>, istreambuf_iterator<_CharT2>,
-	     const _CharT2&);
-
-    private:
-      // 24.5.3 istreambuf_iterator
-      // p 1
-      // If the end of stream is reached (streambuf_type::sgetc()
-      // returns traits_type::eof()), the iterator becomes equal to
-      // the "end of stream" iterator value.
-      // NB: This implementation assumes the "end of stream" value
-      // is EOF, or -1.
-      mutable streambuf_type*	_M_sbuf;
-      mutable int_type		_M_c;
-
-    public:
-      ///  Construct end of input stream iterator.
-      _GLIBCXX_CONSTEXPR istreambuf_iterator() _GLIBCXX_USE_NOEXCEPT
-      : _M_sbuf(0), _M_c(traits_type::eof()) { }
-
-#if __cplusplus >= 201103L
-      istreambuf_iterator(const istreambuf_iterator&) noexcept = default;
-
-      ~istreambuf_iterator() = default;
-#endif
-
-      ///  Construct start of input stream iterator.
-      istreambuf_iterator(istream_type& __s) _GLIBCXX_USE_NOEXCEPT
-      : _M_sbuf(__s.rdbuf()), _M_c(traits_type::eof()) { }
-
-      ///  Construct start of streambuf iterator.
-      istreambuf_iterator(streambuf_type* __s) _GLIBCXX_USE_NOEXCEPT
-      : _M_sbuf(__s), _M_c(traits_type::eof()) { }
-
-      ///  Return the current character pointed to by iterator.  This returns
-      ///  streambuf.sgetc().  It cannot be assigned.  NB: The result of
-      ///  operator*() on an end of stream is undefined.
-      char_type
-      operator*() const
-      {
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-	// Dereferencing a past-the-end istreambuf_iterator is a
-	// libstdc++ extension
-	__glibcxx_requires_cond(!_M_at_eof(),
-				_M_message(__gnu_debug::__msg_deref_istreambuf)
-				._M_iterator(*this));
-#endif
-	return traits_type::to_char_type(_M_get());
-      }
-
-      /// Advance the iterator.  Calls streambuf.sbumpc().
-      istreambuf_iterator&
-      operator++()
-      {
-	__glibcxx_requires_cond(!_M_at_eof(),
-				_M_message(__gnu_debug::__msg_inc_istreambuf)
-				._M_iterator(*this));
-	if (_M_sbuf)
-	  {
-	    _M_sbuf->sbumpc();
-	    _M_c = traits_type::eof();
-	  }
-	return *this;
-      }
-
-      /// Advance the iterator.  Calls streambuf.sbumpc().
-      istreambuf_iterator
-      operator++(int)
-      {
-	__glibcxx_requires_cond(!_M_at_eof(),
-				_M_message(__gnu_debug::__msg_inc_istreambuf)
-				._M_iterator(*this));
-
-	istreambuf_iterator __old = *this;
-	if (_M_sbuf)
-	  {
-	    __old._M_c = _M_sbuf->sbumpc();
-	    _M_c = traits_type::eof();
-	  }
-	return __old;
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 110 istreambuf_iterator::equal not const
-      // NB: there is also number 111 (NAD, Future) pending on this function.
-      /// Return true both iterators are end or both are not end.
-      bool
-      equal(const istreambuf_iterator& __b) const
-      { return _M_at_eof() == __b._M_at_eof(); }
-
-    private:
-      int_type
-      _M_get() const
-      {
-	const int_type __eof = traits_type::eof();
-	int_type __ret = __eof;
-	if (_M_sbuf)
-	  {
-	    if (!traits_type::eq_int_type(_M_c, __eof))
-	      __ret = _M_c;
-	    else if (!traits_type::eq_int_type((__ret = _M_sbuf->sgetc()),
-					       __eof))
-	      _M_c = __ret;
-	    else
-	      _M_sbuf = 0;
-	  }
-	return __ret;
-      }
-
-      bool
-      _M_at_eof() const
-      {
-	const int_type __eof = traits_type::eof();
-	return traits_type::eq_int_type(_M_get(), __eof);
-      }
-    };
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator==(const istreambuf_iterator<_CharT, _Traits>& __a,
-	       const istreambuf_iterator<_CharT, _Traits>& __b)
-    { return __a.equal(__b); }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator!=(const istreambuf_iterator<_CharT, _Traits>& __a,
-	       const istreambuf_iterator<_CharT, _Traits>& __b)
-    { return !__a.equal(__b); }
-
-  /// Provides output iterator semantics for streambufs.
-  template<typename _CharT, typename _Traits>
-    class ostreambuf_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT                           char_type;
-      typedef _Traits                          traits_type;
-      typedef basic_streambuf<_CharT, _Traits> streambuf_type;
-      typedef basic_ostream<_CharT, _Traits>   ostream_type;
-      //@}
-
-      template<typename _CharT2>
-	friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value,
-		                    ostreambuf_iterator<_CharT2> >::__type
-	copy(istreambuf_iterator<_CharT2>, istreambuf_iterator<_CharT2>,
-	     ostreambuf_iterator<_CharT2>);
-
-    private:
-      streambuf_type*	_M_sbuf;
-      bool		_M_failed;
-
-    public:
-      ///  Construct output iterator from ostream.
-      ostreambuf_iterator(ostream_type& __s) _GLIBCXX_USE_NOEXCEPT
-      : _M_sbuf(__s.rdbuf()), _M_failed(!_M_sbuf) { }
-
-      ///  Construct output iterator from streambuf.
-      ostreambuf_iterator(streambuf_type* __s) _GLIBCXX_USE_NOEXCEPT
-      : _M_sbuf(__s), _M_failed(!_M_sbuf) { }
-
-      ///  Write character to streambuf.  Calls streambuf.sputc().
-      ostreambuf_iterator&
-      operator=(_CharT __c)
-      {
-	if (!_M_failed &&
-	    _Traits::eq_int_type(_M_sbuf->sputc(__c), _Traits::eof()))
-	  _M_failed = true;
-	return *this;
-      }
-
-      /// Return *this.
-      ostreambuf_iterator&
-      operator*()
-      { return *this; }
-
-      /// Return *this.
-      ostreambuf_iterator&
-      operator++(int)
-      { return *this; }
-
-      /// Return *this.
-      ostreambuf_iterator&
-      operator++()
-      { return *this; }
-
-      /// Return true if previous operator=() failed.
-      bool
-      failed() const _GLIBCXX_USE_NOEXCEPT
-      { return _M_failed; }
-
-      ostreambuf_iterator&
-      _M_put(const _CharT* __ws, streamsize __len)
-      {
-	if (__builtin_expect(!_M_failed, true)
-	    && __builtin_expect(this->_M_sbuf->sputn(__ws, __len) != __len,
-				false))
-	  _M_failed = true;
-	return *this;
-      }
-    };
-
-  // Overloads for streambuf iterators.
-  template<typename _CharT>
-    typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value,
-    	                 	    ostreambuf_iterator<_CharT> >::__type
-    copy(istreambuf_iterator<_CharT> __first,
-	 istreambuf_iterator<_CharT> __last,
-	 ostreambuf_iterator<_CharT> __result)
-    {
-      if (__first._M_sbuf && !__last._M_sbuf && !__result._M_failed)
-	{
-	  bool __ineof;
-	  __copy_streambufs_eof(__first._M_sbuf, __result._M_sbuf, __ineof);
-	  if (!__ineof)
-	    __result._M_failed = true;
-	}
-      return __result;
-    }
-
-  template<bool _IsMove, typename _CharT>
-    typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value, 
-    				    ostreambuf_iterator<_CharT> >::__type
-    __copy_move_a2(_CharT* __first, _CharT* __last,
-		   ostreambuf_iterator<_CharT> __result)
-    {
-      const streamsize __num = __last - __first;
-      if (__num > 0)
-	__result._M_put(__first, __num);
-      return __result;
-    }
-
-  template<bool _IsMove, typename _CharT>
-    typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value,
-				    ostreambuf_iterator<_CharT> >::__type
-    __copy_move_a2(const _CharT* __first, const _CharT* __last,
-		   ostreambuf_iterator<_CharT> __result)
-    {
-      const streamsize __num = __last - __first;
-      if (__num > 0)
-	__result._M_put(__first, __num);
-      return __result;
-    }
-
-  template<bool _IsMove, typename _CharT>
-    typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value, 
-    				    _CharT*>::__type
-    __copy_move_a2(istreambuf_iterator<_CharT> __first,
-		   istreambuf_iterator<_CharT> __last, _CharT* __result)
-    {
-      typedef istreambuf_iterator<_CharT>                  __is_iterator_type;
-      typedef typename __is_iterator_type::traits_type     traits_type;
-      typedef typename __is_iterator_type::streambuf_type  streambuf_type;
-      typedef typename traits_type::int_type               int_type;
-
-      if (__first._M_sbuf && !__last._M_sbuf)
-	{
-	  streambuf_type* __sb = __first._M_sbuf;
-	  int_type __c = __sb->sgetc();
-	  while (!traits_type::eq_int_type(__c, traits_type::eof()))
-	    {
-	      const streamsize __n = __sb->egptr() - __sb->gptr();
-	      if (__n > 1)
-		{
-		  traits_type::copy(__result, __sb->gptr(), __n);
-		  __sb->__safe_gbump(__n);
-		  __result += __n;
-		  __c = __sb->underflow();
-		}
-	      else
-		{
-		  *__result++ = traits_type::to_char_type(__c);
-		  __c = __sb->snextc();
-		}
-	    }
-	}
-      return __result;
-    }
-
-  template<typename _CharT>
-    typename __gnu_cxx::__enable_if<__is_char<_CharT>::__value,
-		  		    istreambuf_iterator<_CharT> >::__type
-    find(istreambuf_iterator<_CharT> __first,
-	 istreambuf_iterator<_CharT> __last, const _CharT& __val)
-    {
-      typedef istreambuf_iterator<_CharT>                  __is_iterator_type;
-      typedef typename __is_iterator_type::traits_type     traits_type;
-      typedef typename __is_iterator_type::streambuf_type  streambuf_type;
-      typedef typename traits_type::int_type               int_type;
-
-      if (__first._M_sbuf && !__last._M_sbuf)
-	{
-	  const int_type __ival = traits_type::to_int_type(__val);
-	  streambuf_type* __sb = __first._M_sbuf;
-	  int_type __c = __sb->sgetc();
-	  while (!traits_type::eq_int_type(__c, traits_type::eof())
-		 && !traits_type::eq_int_type(__c, __ival))
-	    {
-	      streamsize __n = __sb->egptr() - __sb->gptr();
-	      if (__n > 1)
-		{
-		  const _CharT* __p = traits_type::find(__sb->gptr(),
-							__n, __val);
-		  if (__p)
-		    __n = __p - __sb->gptr();
-		  __sb->__safe_gbump(__n);
-		  __c = __sb->sgetc();
-		}
-	      else
-		__c = __sb->snextc();
-	    }
-
-	  if (!traits_type::eq_int_type(__c, traits_type::eof()))
-	    __first._M_c = __c;
-	  else
-	    __first._M_sbuf = 0;
-	}
-      return __first;
-    }
-
-// @} group iterators
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/bits/stringfwd.h b/openflow/usr/include/c++/5/bits/stringfwd.h
deleted file mode 100644
index f1a5e87..0000000
--- a/openflow/usr/include/c++/5/bits/stringfwd.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// <string> Forward declarations -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/stringfwd.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{string}
- */
-
-//
-// ISO C++ 14882: 21 Strings library
-//
-
-#ifndef _STRINGFWD_H
-#define _STRINGFWD_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/memoryfwd.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @defgroup strings Strings
-   *
-   *  @{
-  */
-
-  template<class _CharT>
-    struct char_traits;
-
-  template<> struct char_traits<char>;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<> struct char_traits<wchar_t>;
-#endif
-
-#if ((__cplusplus >= 201103L) \
-     && defined(_GLIBCXX_USE_C99_STDINT_TR1))
-  template<> struct char_traits<char16_t>;
-  template<> struct char_traits<char32_t>;
-#endif
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-           typename _Alloc = allocator<_CharT> >
-    class basic_string;
-
-  /// A string of @c char
-  typedef basic_string<char>    string;   
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /// A string of @c wchar_t
-  typedef basic_string<wchar_t> wstring;   
-#endif
-
-#if ((__cplusplus >= 201103L) \
-     && defined(_GLIBCXX_USE_C99_STDINT_TR1))
-  /// A string of @c char16_t
-  typedef basic_string<char16_t> u16string; 
-
-  /// A string of @c char32_t
-  typedef basic_string<char32_t> u32string; 
-#endif
-
-_GLIBCXX_END_NAMESPACE_CXX11
-
-  /** @}  */
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif	// _STRINGFWD_H
diff --git a/openflow/usr/include/c++/5/bits/unique_ptr.h b/openflow/usr/include/c++/5/bits/unique_ptr.h
deleted file mode 100644
index 59078d7..0000000
--- a/openflow/usr/include/c++/5/bits/unique_ptr.h
+++ /dev/null
@@ -1,784 +0,0 @@
-// unique_ptr implementation -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/unique_ptr.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{memory}
- */
-
-#ifndef _UNIQUE_PTR_H
-#define _UNIQUE_PTR_H 1
-
-#include <bits/c++config.h>
-#include <debug/debug.h>
-#include <type_traits>
-#include <utility>
-#include <tuple>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup pointer_abstractions
-   * @{
-   */
-
-#if _GLIBCXX_USE_DEPRECATED
-  template<typename> class auto_ptr;
-#endif
-
-  /// Primary template of default_delete, used by unique_ptr
-  template<typename _Tp>
-    struct default_delete
-    {
-      /// Default constructor
-      constexpr default_delete() noexcept = default;
-
-      /** @brief Converting constructor.
-       *
-       * Allows conversion from a deleter for arrays of another type, @p _Up,
-       * only if @p _Up* is convertible to @p _Tp*.
-       */
-      template<typename _Up, typename = typename
-	       enable_if<is_convertible<_Up*, _Tp*>::value>::type>
-        default_delete(const default_delete<_Up>&) noexcept { }
-
-      /// Calls @c delete @p __ptr
-      void
-      operator()(_Tp* __ptr) const
-      {
-	static_assert(!is_void<_Tp>::value,
-		      "can't delete pointer to incomplete type");
-	static_assert(sizeof(_Tp)>0,
-		      "can't delete pointer to incomplete type");
-	delete __ptr;
-      }
-    };
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // DR 740 - omit specialization for array objects with a compile time length
-  /// Specialization for arrays, default_delete.
-  template<typename _Tp>
-    struct default_delete<_Tp[]>
-    {
-    private:
-      template<typename _Up>
-	using __remove_cv = typename remove_cv<_Up>::type;
-
-      // Like is_base_of<_Tp, _Up> but false if unqualified types are the same
-      template<typename _Up>
-	using __is_derived_Tp
-	  = __and_< is_base_of<_Tp, _Up>,
-		    __not_<is_same<__remove_cv<_Tp>, __remove_cv<_Up>>> >;
-
-    public:
-      /// Default constructor
-      constexpr default_delete() noexcept = default;
-
-      /** @brief Converting constructor.
-       *
-       * Allows conversion from a deleter for arrays of another type, such as
-       * a const-qualified version of @p _Tp.
-       *
-       * Conversions from types derived from @c _Tp are not allowed because
-       * it is unsafe to @c delete[] an array of derived types through a
-       * pointer to the base type.
-       */
-      template<typename _Up, typename = typename
-	       enable_if<!__is_derived_Tp<_Up>::value>::type>
-        default_delete(const default_delete<_Up[]>&) noexcept { }
-
-      /// Calls @c delete[] @p __ptr
-      void
-      operator()(_Tp* __ptr) const
-      {
-	static_assert(sizeof(_Tp)>0,
-		      "can't delete pointer to incomplete type");
-	delete [] __ptr;
-      }
-
-      template<typename _Up>
-	typename enable_if<__is_derived_Tp<_Up>::value>::type
-	operator()(_Up*) const = delete;
-    };
-
-  /// 20.7.1.2 unique_ptr for single objects.
-  template <typename _Tp, typename _Dp = default_delete<_Tp> >
-    class unique_ptr
-    {
-      // use SFINAE to determine whether _Del::pointer exists
-      class _Pointer
-      {
-	template<typename _Up>
-	  static typename _Up::pointer __test(typename _Up::pointer*);
-
-	template<typename _Up>
-	  static _Tp* __test(...);
-
-	typedef typename remove_reference<_Dp>::type _Del;
-
-      public:
-	typedef decltype(__test<_Del>(0)) type;
-      };
-
-      typedef std::tuple<typename _Pointer::type, _Dp>  __tuple_type;
-      __tuple_type                                      _M_t;
-
-    public:
-      typedef typename _Pointer::type   pointer;
-      typedef _Tp                       element_type;
-      typedef _Dp                       deleter_type;
-
-      // Constructors.
-
-      /// Default constructor, creates a unique_ptr that owns nothing.
-      constexpr unique_ptr() noexcept
-      : _M_t()
-      { static_assert(!is_pointer<deleter_type>::value,
-		     "constructed with null function pointer deleter"); }
-
-      /** Takes ownership of a pointer.
-       *
-       * @param __p  A pointer to an object of @c element_type
-       *
-       * The deleter will be value-initialized.
-       */
-      explicit
-      unique_ptr(pointer __p) noexcept
-      : _M_t(__p, deleter_type())
-      { static_assert(!is_pointer<deleter_type>::value,
-		     "constructed with null function pointer deleter"); }
-
-      /** Takes ownership of a pointer.
-       *
-       * @param __p  A pointer to an object of @c element_type
-       * @param __d  A reference to a deleter.
-       *
-       * The deleter will be initialized with @p __d
-       */
-      unique_ptr(pointer __p,
-	  typename conditional<is_reference<deleter_type>::value,
-	    deleter_type, const deleter_type&>::type __d) noexcept
-      : _M_t(__p, __d) { }
-
-      /** Takes ownership of a pointer.
-       *
-       * @param __p  A pointer to an object of @c element_type
-       * @param __d  An rvalue reference to a deleter.
-       *
-       * The deleter will be initialized with @p std::move(__d)
-       */
-      unique_ptr(pointer __p,
-	  typename remove_reference<deleter_type>::type&& __d) noexcept
-      : _M_t(std::move(__p), std::move(__d))
-      { static_assert(!std::is_reference<deleter_type>::value,
-		      "rvalue deleter bound to reference"); }
-
-      /// Creates a unique_ptr that owns nothing.
-      constexpr unique_ptr(nullptr_t) noexcept : unique_ptr() { }
-
-      // Move constructors.
-
-      /// Move constructor.
-      unique_ptr(unique_ptr&& __u) noexcept
-      : _M_t(__u.release(), std::forward<deleter_type>(__u.get_deleter())) { }
-
-      /** @brief Converting constructor from another type
-       *
-       * Requires that the pointer owned by @p __u is convertible to the
-       * type of pointer owned by this object, @p __u does not own an array,
-       * and @p __u has a compatible deleter type.
-       */
-      template<typename _Up, typename _Ep, typename = _Require<
-	       is_convertible<typename unique_ptr<_Up, _Ep>::pointer, pointer>,
-	       __not_<is_array<_Up>>,
-	       typename conditional<is_reference<_Dp>::value,
-				    is_same<_Ep, _Dp>,
-				    is_convertible<_Ep, _Dp>>::type>>
-	unique_ptr(unique_ptr<_Up, _Ep>&& __u) noexcept
-	: _M_t(__u.release(), std::forward<_Ep>(__u.get_deleter()))
-	{ }
-
-#if _GLIBCXX_USE_DEPRECATED
-      /// Converting constructor from @c auto_ptr
-      template<typename _Up, typename = _Require<
-	       is_convertible<_Up*, _Tp*>, is_same<_Dp, default_delete<_Tp>>>>
-	unique_ptr(auto_ptr<_Up>&& __u) noexcept;
-#endif
-
-      /// Destructor, invokes the deleter if the stored pointer is not null.
-      ~unique_ptr() noexcept
-      {
-	auto& __ptr = std::get<0>(_M_t);
-	if (__ptr != nullptr)
-	  get_deleter()(__ptr);
-	__ptr = pointer();
-      }
-
-      // Assignment.
-
-      /** @brief Move assignment operator.
-       *
-       * @param __u  The object to transfer ownership from.
-       *
-       * Invokes the deleter first if this object owns a pointer.
-       */
-      unique_ptr&
-      operator=(unique_ptr&& __u) noexcept
-      {
-	reset(__u.release());
-	get_deleter() = std::forward<deleter_type>(__u.get_deleter());
-	return *this;
-      }
-
-      /** @brief Assignment from another type.
-       *
-       * @param __u  The object to transfer ownership from, which owns a
-       *             convertible pointer to a non-array object.
-       *
-       * Invokes the deleter first if this object owns a pointer.
-       */
-      template<typename _Up, typename _Ep>
-	typename enable_if< __and_<
-	  is_convertible<typename unique_ptr<_Up, _Ep>::pointer, pointer>,
-	  __not_<is_array<_Up>>
-	  >::value,
-	  unique_ptr&>::type
-	operator=(unique_ptr<_Up, _Ep>&& __u) noexcept
-	{
-	  reset(__u.release());
-	  get_deleter() = std::forward<_Ep>(__u.get_deleter());
-	  return *this;
-	}
-
-      /// Reset the %unique_ptr to empty, invoking the deleter if necessary.
-      unique_ptr&
-      operator=(nullptr_t) noexcept
-      {
-	reset();
-	return *this;
-      }
-
-      // Observers.
-
-      /// Dereference the stored pointer.
-      typename add_lvalue_reference<element_type>::type
-      operator*() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(get() != pointer());
-	return *get();
-      }
-
-      /// Return the stored pointer.
-      pointer
-      operator->() const noexcept
-      {
-	_GLIBCXX_DEBUG_ASSERT(get() != pointer());
-	return get();
-      }
-
-      /// Return the stored pointer.
-      pointer
-      get() const noexcept
-      { return std::get<0>(_M_t); }
-
-      /// Return a reference to the stored deleter.
-      deleter_type&
-      get_deleter() noexcept
-      { return std::get<1>(_M_t); }
-
-      /// Return a reference to the stored deleter.
-      const deleter_type&
-      get_deleter() const noexcept
-      { return std::get<1>(_M_t); }
-
-      /// Return @c true if the stored pointer is not null.
-      explicit operator bool() const noexcept
-      { return get() == pointer() ? false : true; }
-
-      // Modifiers.
-
-      /// Release ownership of any stored pointer.
-      pointer
-      release() noexcept
-      {
-	pointer __p = get();
-	std::get<0>(_M_t) = pointer();
-	return __p;
-      }
-
-      /** @brief Replace the stored pointer.
-       *
-       * @param __p  The new pointer to store.
-       *
-       * The deleter will be invoked if a pointer is already owned.
-       */
-      void
-      reset(pointer __p = pointer()) noexcept
-      {
-	using std::swap;
-	swap(std::get<0>(_M_t), __p);
-	if (__p != pointer())
-	  get_deleter()(__p);
-      }
-
-      /// Exchange the pointer and deleter with another object.
-      void
-      swap(unique_ptr& __u) noexcept
-      {
-	using std::swap;
-	swap(_M_t, __u._M_t);
-      }
-
-      // Disable copy from lvalue.
-      unique_ptr(const unique_ptr&) = delete;
-      unique_ptr& operator=(const unique_ptr&) = delete;
-  };
-
-  /// 20.7.1.3 unique_ptr for array objects with a runtime length
-  // [unique.ptr.runtime]
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // DR 740 - omit specialization for array objects with a compile time length
-  template<typename _Tp, typename _Dp>
-    class unique_ptr<_Tp[], _Dp>
-    {
-      // use SFINAE to determine whether _Del::pointer exists
-      class _Pointer
-      {
-	template<typename _Up>
-	  static typename _Up::pointer __test(typename _Up::pointer*);
-
-	template<typename _Up>
-	  static _Tp* __test(...);
-
-	typedef typename remove_reference<_Dp>::type _Del;
-
-      public:
-	typedef decltype(__test<_Del>(0)) type;
-      };
-
-      typedef std::tuple<typename _Pointer::type, _Dp>  __tuple_type;
-      __tuple_type                                      _M_t;
-
-      template<typename _Up>
-	using __remove_cv = typename remove_cv<_Up>::type;
-
-      // like is_base_of<_Tp, _Up> but false if unqualified types are the same
-      template<typename _Up>
-	using __is_derived_Tp
-	  = __and_< is_base_of<_Tp, _Up>,
-		    __not_<is_same<__remove_cv<_Tp>, __remove_cv<_Up>>> >;
-
-      template<typename _Up, typename _Ep,
-	       typename _Tp_pointer = typename _Pointer::type,
-	       typename _Up_pointer = typename unique_ptr<_Up, _Ep>::pointer>
-	using __safe_conversion = __and_<
-	    is_convertible<_Up_pointer, _Tp_pointer>,
-	    is_array<_Up>,
-	    __or_<__not_<is_pointer<_Up_pointer>>,
-		  __not_<is_pointer<_Tp_pointer>>,
-		  __not_<__is_derived_Tp<typename remove_extent<_Up>::type>>
-	    >
-	  >;
-
-    public:
-      typedef typename _Pointer::type	pointer;
-      typedef _Tp		 	element_type;
-      typedef _Dp                       deleter_type;
-
-      // Constructors.
-
-      /// Default constructor, creates a unique_ptr that owns nothing.
-      constexpr unique_ptr() noexcept
-      : _M_t()
-      { static_assert(!std::is_pointer<deleter_type>::value,
-		      "constructed with null function pointer deleter"); }
-
-      /** Takes ownership of a pointer.
-       *
-       * @param __p  A pointer to an array of @c element_type
-       *
-       * The deleter will be value-initialized.
-       */
-      explicit
-      unique_ptr(pointer __p) noexcept
-      : _M_t(__p, deleter_type())
-      { static_assert(!is_pointer<deleter_type>::value,
-		      "constructed with null function pointer deleter"); }
-
-      // Disable construction from convertible pointer types.
-      template<typename _Up, typename = _Require<is_pointer<pointer>,
-	       is_convertible<_Up*, pointer>, __is_derived_Tp<_Up>>>
-	explicit
-	unique_ptr(_Up* __p) = delete;
-
-      /** Takes ownership of a pointer.
-       *
-       * @param __p  A pointer to an array of @c element_type
-       * @param __d  A reference to a deleter.
-       *
-       * The deleter will be initialized with @p __d
-       */
-      unique_ptr(pointer __p,
-	  typename conditional<is_reference<deleter_type>::value,
-	      deleter_type, const deleter_type&>::type __d) noexcept
-      : _M_t(__p, __d) { }
-
-      /** Takes ownership of a pointer.
-       *
-       * @param __p  A pointer to an array of @c element_type
-       * @param __d  A reference to a deleter.
-       *
-       * The deleter will be initialized with @p std::move(__d)
-       */
-      unique_ptr(pointer __p, typename
-		 remove_reference<deleter_type>::type&& __d) noexcept
-      : _M_t(std::move(__p), std::move(__d))
-      { static_assert(!is_reference<deleter_type>::value,
-		      "rvalue deleter bound to reference"); }
-
-      /// Move constructor.
-      unique_ptr(unique_ptr&& __u) noexcept
-      : _M_t(__u.release(), std::forward<deleter_type>(__u.get_deleter())) { }
-
-      /// Creates a unique_ptr that owns nothing.
-      constexpr unique_ptr(nullptr_t) noexcept : unique_ptr() { }
-
-      template<typename _Up, typename _Ep,
-	       typename = _Require<__safe_conversion<_Up, _Ep>,
-		 typename conditional<is_reference<_Dp>::value,
-				      is_same<_Ep, _Dp>,
-				      is_convertible<_Ep, _Dp>>::type
-	       >>
-	unique_ptr(unique_ptr<_Up, _Ep>&& __u) noexcept
-	: _M_t(__u.release(), std::forward<_Ep>(__u.get_deleter()))
-	{ }
-
-      /// Destructor, invokes the deleter if the stored pointer is not null.
-      ~unique_ptr()
-      {
-	auto& __ptr = std::get<0>(_M_t);
-	if (__ptr != nullptr)
-	  get_deleter()(__ptr);
-	__ptr = pointer();
-      }
-
-      // Assignment.
-
-      /** @brief Move assignment operator.
-       *
-       * @param __u  The object to transfer ownership from.
-       *
-       * Invokes the deleter first if this object owns a pointer.
-       */
-      unique_ptr&
-      operator=(unique_ptr&& __u) noexcept
-      {
-	reset(__u.release());
-	get_deleter() = std::forward<deleter_type>(__u.get_deleter());
-	return *this;
-      }
-
-      /** @brief Assignment from another type.
-       *
-       * @param __u  The object to transfer ownership from, which owns a
-       *             convertible pointer to an array object.
-       *
-       * Invokes the deleter first if this object owns a pointer.
-       */
-      template<typename _Up, typename _Ep>
-	typename
-	enable_if<__safe_conversion<_Up, _Ep>::value, unique_ptr&>::type
-	operator=(unique_ptr<_Up, _Ep>&& __u) noexcept
-	{
-	  reset(__u.release());
-	  get_deleter() = std::forward<_Ep>(__u.get_deleter());
-	  return *this;
-	}
-
-      /// Reset the %unique_ptr to empty, invoking the deleter if necessary.
-      unique_ptr&
-      operator=(nullptr_t) noexcept
-      {
-	reset();
-	return *this;
-      }
-
-      // Observers.
-
-      /// Access an element of owned array.
-      typename std::add_lvalue_reference<element_type>::type
-      operator[](size_t __i) const
-      {
-	_GLIBCXX_DEBUG_ASSERT(get() != pointer());
-	return get()[__i];
-      }
-
-      /// Return the stored pointer.
-      pointer
-      get() const noexcept
-      { return std::get<0>(_M_t); }
-
-      /// Return a reference to the stored deleter.
-      deleter_type&
-      get_deleter() noexcept
-      { return std::get<1>(_M_t); }
-
-      /// Return a reference to the stored deleter.
-      const deleter_type&
-      get_deleter() const noexcept
-      { return std::get<1>(_M_t); }
-
-      /// Return @c true if the stored pointer is not null.
-      explicit operator bool() const noexcept
-      { return get() == pointer() ? false : true; }
-
-      // Modifiers.
-
-      /// Release ownership of any stored pointer.
-      pointer
-      release() noexcept
-      {
-	pointer __p = get();
-	std::get<0>(_M_t) = pointer();
-	return __p;
-      }
-
-      /** @brief Replace the stored pointer.
-       *
-       * @param __p  The new pointer to store.
-       *
-       * The deleter will be invoked if a pointer is already owned.
-       */
-      void
-      reset(pointer __p = pointer()) noexcept
-      {
-	using std::swap;
-	swap(std::get<0>(_M_t), __p);
-	if (__p != nullptr)
-	  get_deleter()(__p);
-      }
-
-      // Disable resetting from convertible pointer types.
-      template<typename _Up, typename = _Require<is_pointer<pointer>,
-	       is_convertible<_Up*, pointer>, __is_derived_Tp<_Up>>>
-	void reset(_Up*) = delete;
-
-      /// Exchange the pointer and deleter with another object.
-      void
-      swap(unique_ptr& __u) noexcept
-      {
-	using std::swap;
-	swap(_M_t, __u._M_t);
-      }
-
-      // Disable copy from lvalue.
-      unique_ptr(const unique_ptr&) = delete;
-      unique_ptr& operator=(const unique_ptr&) = delete;
-
-      // Disable construction from convertible pointer types.
-      template<typename _Up, typename = _Require<is_pointer<pointer>,
-	       is_convertible<_Up*, pointer>, __is_derived_Tp<_Up>>>
-	unique_ptr(_Up*, typename
-		   conditional<is_reference<deleter_type>::value,
-		   deleter_type, const deleter_type&>::type) = delete;
-
-      // Disable construction from convertible pointer types.
-      template<typename _Up, typename = _Require<is_pointer<pointer>,
-	       is_convertible<_Up*, pointer>, __is_derived_Tp<_Up>>>
-	unique_ptr(_Up*, typename
-		   remove_reference<deleter_type>::type&&) = delete;
-    };
-
-  template<typename _Tp, typename _Dp>
-    inline void
-    swap(unique_ptr<_Tp, _Dp>& __x,
-	 unique_ptr<_Tp, _Dp>& __y) noexcept
-    { __x.swap(__y); }
-
-  template<typename _Tp, typename _Dp,
-	   typename _Up, typename _Ep>
-    inline bool
-    operator==(const unique_ptr<_Tp, _Dp>& __x,
-	       const unique_ptr<_Up, _Ep>& __y)
-    { return __x.get() == __y.get(); }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator==(const unique_ptr<_Tp, _Dp>& __x, nullptr_t) noexcept
-    { return !__x; }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator==(nullptr_t, const unique_ptr<_Tp, _Dp>& __x) noexcept
-    { return !__x; }
-
-  template<typename _Tp, typename _Dp,
-	   typename _Up, typename _Ep>
-    inline bool
-    operator!=(const unique_ptr<_Tp, _Dp>& __x,
-	       const unique_ptr<_Up, _Ep>& __y)
-    { return __x.get() != __y.get(); }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator!=(const unique_ptr<_Tp, _Dp>& __x, nullptr_t) noexcept
-    { return (bool)__x; }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator!=(nullptr_t, const unique_ptr<_Tp, _Dp>& __x) noexcept
-    { return (bool)__x; }
-
-  template<typename _Tp, typename _Dp,
-	   typename _Up, typename _Ep>
-    inline bool
-    operator<(const unique_ptr<_Tp, _Dp>& __x,
-	      const unique_ptr<_Up, _Ep>& __y)
-    {
-      typedef typename
-	std::common_type<typename unique_ptr<_Tp, _Dp>::pointer,
-	                 typename unique_ptr<_Up, _Ep>::pointer>::type _CT;
-      return std::less<_CT>()(__x.get(), __y.get());
-    }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator<(const unique_ptr<_Tp, _Dp>& __x, nullptr_t)
-    { return std::less<typename unique_ptr<_Tp, _Dp>::pointer>()(__x.get(),
-								 nullptr); }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator<(nullptr_t, const unique_ptr<_Tp, _Dp>& __x)
-    { return std::less<typename unique_ptr<_Tp, _Dp>::pointer>()(nullptr,
-								 __x.get()); }
-
-  template<typename _Tp, typename _Dp,
-	   typename _Up, typename _Ep>
-    inline bool
-    operator<=(const unique_ptr<_Tp, _Dp>& __x,
-	       const unique_ptr<_Up, _Ep>& __y)
-    { return !(__y < __x); }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator<=(const unique_ptr<_Tp, _Dp>& __x, nullptr_t)
-    { return !(nullptr < __x); }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator<=(nullptr_t, const unique_ptr<_Tp, _Dp>& __x)
-    { return !(__x < nullptr); }
-
-  template<typename _Tp, typename _Dp,
-	   typename _Up, typename _Ep>
-    inline bool
-    operator>(const unique_ptr<_Tp, _Dp>& __x,
-	      const unique_ptr<_Up, _Ep>& __y)
-    { return (__y < __x); }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator>(const unique_ptr<_Tp, _Dp>& __x, nullptr_t)
-    { return std::less<typename unique_ptr<_Tp, _Dp>::pointer>()(nullptr,
-								 __x.get()); }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator>(nullptr_t, const unique_ptr<_Tp, _Dp>& __x)
-    { return std::less<typename unique_ptr<_Tp, _Dp>::pointer>()(__x.get(),
-								 nullptr); }
-
-  template<typename _Tp, typename _Dp,
-	   typename _Up, typename _Ep>
-    inline bool
-    operator>=(const unique_ptr<_Tp, _Dp>& __x,
-	       const unique_ptr<_Up, _Ep>& __y)
-    { return !(__x < __y); }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator>=(const unique_ptr<_Tp, _Dp>& __x, nullptr_t)
-    { return !(__x < nullptr); }
-
-  template<typename _Tp, typename _Dp>
-    inline bool
-    operator>=(nullptr_t, const unique_ptr<_Tp, _Dp>& __x)
-    { return !(nullptr < __x); }
-
-  /// std::hash specialization for unique_ptr.
-  template<typename _Tp, typename _Dp>
-    struct hash<unique_ptr<_Tp, _Dp>>
-    : public __hash_base<size_t, unique_ptr<_Tp, _Dp>>
-    {
-      size_t
-      operator()(const unique_ptr<_Tp, _Dp>& __u) const noexcept
-      {
-	typedef unique_ptr<_Tp, _Dp> _UP;
-	return std::hash<typename _UP::pointer>()(__u.get());
-      }
-    };
-
-#if __cplusplus > 201103L
-
-#define __cpp_lib_make_unique 201304
-
-  template<typename _Tp>
-    struct _MakeUniq
-    { typedef unique_ptr<_Tp> __single_object; };
-
-  template<typename _Tp>
-    struct _MakeUniq<_Tp[]>
-    { typedef unique_ptr<_Tp[]> __array; };
-
-  template<typename _Tp, size_t _Bound>
-    struct _MakeUniq<_Tp[_Bound]>
-    { struct __invalid_type { }; };
-
-  /// std::make_unique for single objects
-  template<typename _Tp, typename... _Args>
-    inline typename _MakeUniq<_Tp>::__single_object
-    make_unique(_Args&&... __args)
-    { return unique_ptr<_Tp>(new _Tp(std::forward<_Args>(__args)...)); }
-
-  /// std::make_unique for arrays of unknown bound
-  template<typename _Tp>
-    inline typename _MakeUniq<_Tp>::__array
-    make_unique(size_t __num)
-    { return unique_ptr<_Tp>(new remove_extent_t<_Tp>[__num]()); }
-
-  /// Disable std::make_unique for arrays of known bound
-  template<typename _Tp, typename... _Args>
-    inline typename _MakeUniq<_Tp>::__invalid_type
-    make_unique(_Args&&...) = delete;
-#endif
-
-  // @} group pointer_abstractions
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _UNIQUE_PTR_H */
diff --git a/openflow/usr/include/c++/5/bits/unordered_map.h b/openflow/usr/include/c++/5/bits/unordered_map.h
deleted file mode 100644
index 3c434ab..0000000
--- a/openflow/usr/include/c++/5/bits/unordered_map.h
+++ /dev/null
@@ -1,1555 +0,0 @@
-// unordered_map implementation -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/unordered_map.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{unordered_map}
- */
-
-#ifndef _UNORDERED_MAP_H
-#define _UNORDERED_MAP_H
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /// Base types for unordered_map.
-  template<bool _Cache>
-    using __umap_traits = __detail::_Hashtable_traits<_Cache, false, true>;
-
-  template<typename _Key,
-	   typename _Tp,
-	   typename _Hash = hash<_Key>,
-	   typename _Pred = std::equal_to<_Key>,
-	   typename _Alloc = std::allocator<std::pair<const _Key, _Tp> >,
-	   typename _Tr = __umap_traits<__cache_default<_Key, _Hash>::value>>
-    using __umap_hashtable = _Hashtable<_Key, std::pair<const _Key, _Tp>,
-                                        _Alloc, __detail::_Select1st,
-				        _Pred, _Hash,
-				        __detail::_Mod_range_hashing,
-				        __detail::_Default_ranged_hash,
-				        __detail::_Prime_rehash_policy, _Tr>;
-
-  /// Base types for unordered_multimap.
-  template<bool _Cache>
-    using __ummap_traits = __detail::_Hashtable_traits<_Cache, false, false>;
-
-  template<typename _Key,
-	   typename _Tp,
-	   typename _Hash = hash<_Key>,
-	   typename _Pred = std::equal_to<_Key>,
-	   typename _Alloc = std::allocator<std::pair<const _Key, _Tp> >,
-	   typename _Tr = __ummap_traits<__cache_default<_Key, _Hash>::value>>
-    using __ummap_hashtable = _Hashtable<_Key, std::pair<const _Key, _Tp>,
-					 _Alloc, __detail::_Select1st,
-					 _Pred, _Hash,
-					 __detail::_Mod_range_hashing,
-					 __detail::_Default_ranged_hash,
-					 __detail::_Prime_rehash_policy, _Tr>;
-
-  /**
-   *  @brief A standard container composed of unique keys (containing
-   *  at most one of each key value) that associates values of another type
-   *  with the keys.
-   *
-   *  @ingroup unordered_associative_containers
-   *
-   *  @tparam  _Key    Type of key objects.
-   *  @tparam  _Tp     Type of mapped objects.
-   *  @tparam  _Hash   Hashing function object type, defaults to hash<_Value>.
-   *  @tparam  _Pred   Predicate function object type, defaults
-   *                   to equal_to<_Value>.
-   *  @tparam  _Alloc  Allocator type, defaults to 
-   *                   std::allocator<std::pair<const _Key, _Tp>>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, and
-   *  <a href="tables.html#xx">unordered associative container</a>
-   *
-   * The resulting value type of the container is std::pair<const _Key, _Tp>.
-   *
-   *  Base is _Hashtable, dispatched at compile time via template
-   *  alias __umap_hashtable.
-   */
-  template<class _Key, class _Tp,
-	   class _Hash = hash<_Key>,
-	   class _Pred = std::equal_to<_Key>,
-	   class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-    class unordered_map
-    {
-      typedef __umap_hashtable<_Key, _Tp, _Hash, _Pred, _Alloc>  _Hashtable;
-      _Hashtable _M_h;
-
-    public:
-      // typedefs:
-      //@{
-      /// Public typedefs.
-      typedef typename _Hashtable::key_type	key_type;
-      typedef typename _Hashtable::value_type	value_type;
-      typedef typename _Hashtable::mapped_type	mapped_type;
-      typedef typename _Hashtable::hasher	hasher;
-      typedef typename _Hashtable::key_equal	key_equal;
-      typedef typename _Hashtable::allocator_type allocator_type;
-      //@}
-
-      //@{
-      ///  Iterator-related typedefs.
-      typedef typename _Hashtable::pointer		pointer;
-      typedef typename _Hashtable::const_pointer	const_pointer;
-      typedef typename _Hashtable::reference		reference;
-      typedef typename _Hashtable::const_reference	const_reference;
-      typedef typename _Hashtable::iterator		iterator;
-      typedef typename _Hashtable::const_iterator	const_iterator;
-      typedef typename _Hashtable::local_iterator	local_iterator;
-      typedef typename _Hashtable::const_local_iterator	const_local_iterator;
-      typedef typename _Hashtable::size_type		size_type;
-      typedef typename _Hashtable::difference_type	difference_type;
-      //@}
-
-      //construct/destroy/copy
-
-      /// Default constructor.
-      unordered_map() = default;
-
-      /**
-       *  @brief  Default constructor creates no elements.
-       *  @param __n  Minimal initial number of buckets.
-       *  @param __hf  A hash functor.
-       *  @param __eql  A key equality functor.
-       *  @param __a  An allocator object.
-       */
-      explicit
-      unordered_map(size_type __n,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _M_h(__n, __hf, __eql, __a)
-      { }
-
-      /**
-       *  @brief  Builds an %unordered_map from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param __n  Minimal initial number of buckets.
-       *  @param __hf  A hash functor.
-       *  @param __eql  A key equality functor.
-       *  @param __a  An allocator object.
-       *
-       *  Create an %unordered_map consisting of copies of the elements from
-       *  [__first,__last).  This is linear in N (where N is
-       *  distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-	unordered_map(_InputIterator __first, _InputIterator __last,
-		      size_type __n = 0,
-		      const hasher& __hf = hasher(),
-		      const key_equal& __eql = key_equal(),
-		      const allocator_type& __a = allocator_type())
-	: _M_h(__first, __last, __n, __hf, __eql, __a)
-	{ }
-
-      /// Copy constructor.
-      unordered_map(const unordered_map&) = default;
-
-      /// Move constructor.
-      unordered_map(unordered_map&&) = default;
-
-      /**
-       *  @brief Creates an %unordered_map with no elements.
-       *  @param __a An allocator object.
-       */
-      explicit
-      unordered_map(const allocator_type& __a)
-	: _M_h(__a)
-      { }
-
-      /*
-       *  @brief Copy constructor with allocator argument.
-       * @param  __uset  Input %unordered_map to copy.
-       * @param  __a  An allocator object.
-       */
-      unordered_map(const unordered_map& __umap,
-		    const allocator_type& __a)
-      : _M_h(__umap._M_h, __a)
-      { }
-
-      /*
-       *  @brief  Move constructor with allocator argument.
-       *  @param  __uset Input %unordered_map to move.
-       *  @param  __a    An allocator object.
-       */
-      unordered_map(unordered_map&& __umap,
-		    const allocator_type& __a)
-      : _M_h(std::move(__umap._M_h), __a)
-      { }
-
-      /**
-       *  @brief  Builds an %unordered_map from an initializer_list.
-       *  @param  __l  An initializer_list.
-       *  @param __n  Minimal initial number of buckets.
-       *  @param __hf  A hash functor.
-       *  @param __eql  A key equality functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create an %unordered_map consisting of copies of the elements in the
-       *  list. This is linear in N (where N is @a __l.size()).
-       */
-      unordered_map(initializer_list<value_type> __l,
-		    size_type __n = 0,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _M_h(__l, __n, __hf, __eql, __a)
-      { }
-
-      unordered_map(size_type __n, const allocator_type& __a)
-      : unordered_map(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_map(size_type __n, const hasher& __hf,
-		    const allocator_type& __a)
-      : unordered_map(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_map(_InputIterator __first, _InputIterator __last,
-		      size_type __n,
-		      const allocator_type& __a)
-	: unordered_map(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_map(_InputIterator __first, _InputIterator __last,
-		      size_type __n, const hasher& __hf,
-		      const allocator_type& __a)
-	  : unordered_map(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_map(initializer_list<value_type> __l,
-		    size_type __n,
-		    const allocator_type& __a)
-      : unordered_map(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_map(initializer_list<value_type> __l,
-		    size_type __n, const hasher& __hf,
-		    const allocator_type& __a)
-      : unordered_map(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      /// Copy assignment operator.
-      unordered_map&
-      operator=(const unordered_map&) = default;
-
-      /// Move assignment operator.
-      unordered_map&
-      operator=(unordered_map&&) = default;
-
-      /**
-       *  @brief  %Unordered_map list assignment operator.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills an %unordered_map with copies of the elements in
-       *  the initializer list @a __l.
-       *
-       *  Note that the assignment completely changes the %unordered_map and
-       *  that the resulting %unordered_map's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      unordered_map&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_h = __l;
-	return *this;
-      }
-
-      ///  Returns the allocator object with which the %unordered_map was
-      ///  constructed.
-      allocator_type
-      get_allocator() const noexcept
-      { return _M_h.get_allocator(); }
-
-      // size and capacity:
-
-      ///  Returns true if the %unordered_map is empty.
-      bool
-      empty() const noexcept
-      { return _M_h.empty(); }
-
-      ///  Returns the size of the %unordered_map.
-      size_type
-      size() const noexcept
-      { return _M_h.size(); }
-
-      ///  Returns the maximum size of the %unordered_map.
-      size_type
-      max_size() const noexcept
-      { return _M_h.max_size(); }
-
-      // iterators.
-
-      /**
-       *  Returns a read/write iterator that points to the first element in the
-       *  %unordered_map.
-       */
-      iterator
-      begin() noexcept
-      { return _M_h.begin(); }
-
-      //@{
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %unordered_map.
-       */
-      const_iterator
-      begin() const noexcept
-      { return _M_h.begin(); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return _M_h.begin(); }
-      //@}
-
-      /**
-       *  Returns a read/write iterator that points one past the last element in
-       *  the %unordered_map.
-       */
-      iterator
-      end() noexcept
-      { return _M_h.end(); }
-
-      //@{
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %unordered_map.
-       */
-      const_iterator
-      end() const noexcept
-      { return _M_h.end(); }
-
-      const_iterator
-      cend() const noexcept
-      { return _M_h.end(); }
-      //@}
-
-      // modifiers.
-
-      /**
-       *  @brief Attempts to build and insert a std::pair into the
-       *  %unordered_map.
-       *
-       *  @param __args  Arguments used to generate a new pair instance (see
-       *	        std::piecewise_contruct for passing arguments to each
-       *	        part of the pair constructor).
-       *
-       *  @return  A pair, of which the first element is an iterator that points
-       *           to the possibly inserted pair, and the second is a bool that
-       *           is true if the pair was actually inserted.
-       *
-       *  This function attempts to build and insert a (key, value) %pair into
-       *  the %unordered_map.
-       *  An %unordered_map relies on unique keys and thus a %pair is only
-       *  inserted if its first element (the key) is not already present in the
-       *  %unordered_map.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{ return _M_h.emplace(std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief Attempts to build and insert a std::pair into the
-       *  %unordered_map.
-       *
-       *  @param  __pos  An iterator that serves as a hint as to where the pair
-       *                should be inserted.
-       *  @param  __args  Arguments used to generate a new pair instance (see
-       *	         std::piecewise_contruct for passing arguments to each
-       *	         part of the pair constructor).
-       *  @return An iterator that points to the element with key of the
-       *          std::pair built from @a __args (may or may not be that
-       *          std::pair).
-       *
-       *  This function is not concerned about whether the insertion took place,
-       *  and thus does not return a boolean like the single-argument emplace()
-       *  does.
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process. A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  See
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *  for more on @a hinting.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{ return _M_h.emplace_hint(__pos, std::forward<_Args>(__args)...); }
-
-      //@{
-      /**
-       *  @brief Attempts to insert a std::pair into the %unordered_map.
-
-       *  @param __x Pair to be inserted (see std::make_pair for easy
-       *	     creation of pairs).
-       *
-       *  @return  A pair, of which the first element is an iterator that 
-       *           points to the possibly inserted pair, and the second is 
-       *           a bool that is true if the pair was actually inserted.
-       *
-       *  This function attempts to insert a (key, value) %pair into the
-       *  %unordered_map. An %unordered_map relies on unique keys and thus a
-       *  %pair is only inserted if its first element (the key) is not already
-       *  present in the %unordered_map.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      std::pair<iterator, bool>
-      insert(const value_type& __x)
-      { return _M_h.insert(__x); }
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	std::pair<iterator, bool>
-	insert(_Pair&& __x)
-        { return _M_h.insert(std::forward<_Pair>(__x)); }
-      //@}
-
-      //@{
-      /**
-       *  @brief Attempts to insert a std::pair into the %unordered_map.
-       *  @param  __hint  An iterator that serves as a hint as to where the
-       *                 pair should be inserted.
-       *  @param  __x  Pair to be inserted (see std::make_pair for easy creation
-       *               of pairs).
-       *  @return An iterator that points to the element with key of
-       *           @a __x (may or may not be the %pair passed in).
-       *
-       *  This function is not concerned about whether the insertion took place,
-       *  and thus does not return a boolean like the single-argument insert()
-       *  does.  Note that the first parameter is only a hint and can
-       *  potentially improve the performance of the insertion process.  A bad
-       *  hint would cause no gains in efficiency.
-       *
-       *  See
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *  for more on @a hinting.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      iterator
-      insert(const_iterator __hint, const value_type& __x)
-      { return _M_h.insert(__hint, __x); }
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(const_iterator __hint, _Pair&& __x)
-	{ return _M_h.insert(__hint, std::forward<_Pair>(__x)); }
-      //@}
-
-      /**
-       *  @brief A template function that attempts to insert a range of
-       *  elements.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   inserted.
-       *  @param  __last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{ _M_h.insert(__first, __last); }
-
-      /**
-       *  @brief Attempts to insert a list of elements into the %unordered_map.
-       *  @param  __l  A std::initializer_list<value_type> of elements
-       *               to be inserted.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      void
-      insert(initializer_list<value_type> __l)
-      { _M_h.insert(__l); }
-
-      //@{
-      /**
-       *  @brief Erases an element from an %unordered_map.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *  @return An iterator pointing to the element immediately following
-       *          @a __position prior to the element being erased. If no such
-       *          element exists, end() is returned.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from an %unordered_map.
-       *  Note that this function only erases the element, and that if the
-       *  element is itself a pointer, the pointed-to memory is not touched in
-       *  any way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-      erase(const_iterator __position)
-      { return _M_h.erase(__position); }
-
-      // LWG 2059.
-      iterator
-      erase(iterator __position)
-      { return _M_h.erase(__position); }
-      //@}
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  __x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all the elements located by the given key from
-       *  an %unordered_map. For an %unordered_map the result of this function
-       *  can only be 0 (not present) or 1 (present).
-       *  Note that this function only erases the element, and that if the
-       *  element is itself a pointer, the pointed-to memory is not touched in
-       *  any way.  Managing the pointer is the user's responsibility.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_h.erase(__x); }
-
-      /**
-       *  @brief Erases a [__first,__last) range of elements from an
-       *  %unordered_map.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                  erased.
-       *  @param __last  Iterator pointing to the end of the range to
-       *                be erased.
-       *  @return The iterator @a __last.
-       *
-       *  This function erases a sequence of elements from an %unordered_map.
-       *  Note that this function only erases the elements, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      { return _M_h.erase(__first, __last); }
-
-      /**
-       *  Erases all elements in an %unordered_map.
-       *  Note that this function only erases the elements, and that if the
-       *  elements themselves are pointers, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      void
-      clear() noexcept
-      { _M_h.clear(); }
-
-      /**
-       *  @brief  Swaps data with another %unordered_map.
-       *  @param  __x  An %unordered_map of the same element and allocator
-       *  types.
-       *
-       *  This exchanges the elements between two %unordered_map in constant
-       *  time.
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(m1,m2) will feed to this function.
-       */
-      void
-      swap(unordered_map& __x)
-      noexcept( noexcept(_M_h.swap(__x._M_h)) )
-      { _M_h.swap(__x._M_h); }
-
-      // observers.
-
-      ///  Returns the hash functor object with which the %unordered_map was
-      ///  constructed.
-      hasher
-      hash_function() const
-      { return _M_h.hash_function(); }
-
-      ///  Returns the key comparison object with which the %unordered_map was
-      ///  constructed.
-      key_equal
-      key_eq() const
-      { return _M_h.key_eq(); }
-
-      // lookup.
-
-      //@{
-      /**
-       *  @brief Tries to locate an element in an %unordered_map.
-       *  @param  __x  Key to be located.
-       *  @return  Iterator pointing to sought-after element, or end() if not
-       *           found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after element.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_h.find(__x); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_h.find(__x); }
-      //@}
-
-      /**
-       *  @brief  Finds the number of elements.
-       *  @param  __x  Key to count.
-       *  @return  Number of elements with specified key.
-       *
-       *  This function only makes sense for %unordered_multimap; for
-       *  %unordered_map the result will either be 0 (not present) or 1
-       *  (present).
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_h.count(__x); }
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  __x  Key to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       *
-       *  This function probably only makes sense for %unordered_multimap.
-       */
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __x)
-      { return _M_h.equal_range(__x); }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_h.equal_range(__x); }
-      //@}
-
-      //@{
-      /**
-       *  @brief  Subscript ( @c [] ) access to %unordered_map data.
-       *  @param  __k  The key for which data should be retrieved.
-       *  @return  A reference to the data of the (key,data) %pair.
-       *
-       *  Allows for easy lookup with the subscript ( @c [] )operator.  Returns
-       *  data associated with the key specified in subscript.  If the key does
-       *  not exist, a pair with that key is created using default values, which
-       *  is then returned.
-       *
-       *  Lookup requires constant time.
-       */
-      mapped_type&
-      operator[](const key_type& __k)
-      { return _M_h[__k]; }
-
-      mapped_type&
-      operator[](key_type&& __k)
-      { return _M_h[std::move(__k)]; }
-      //@}
-
-      //@{
-      /**
-       *  @brief  Access to %unordered_map data.
-       *  @param  __k  The key for which data should be retrieved.
-       *  @return  A reference to the data whose key is equal to @a __k, if
-       *           such a data is present in the %unordered_map.
-       *  @throw  std::out_of_range  If no such data is present.
-       */
-      mapped_type&
-      at(const key_type& __k)
-      { return _M_h.at(__k); }
-
-      const mapped_type&
-      at(const key_type& __k) const
-      { return _M_h.at(__k); }
-      //@}
-
-      // bucket interface.
-
-      /// Returns the number of buckets of the %unordered_map.
-      size_type
-      bucket_count() const noexcept
-      { return _M_h.bucket_count(); }
-
-      /// Returns the maximum number of buckets of the %unordered_map.
-      size_type
-      max_bucket_count() const noexcept
-      { return _M_h.max_bucket_count(); }
-
-      /*
-       * @brief  Returns the number of elements in a given bucket.
-       * @param  __n  A bucket index.
-       * @return  The number of elements in the bucket.
-       */
-      size_type
-      bucket_size(size_type __n) const
-      { return _M_h.bucket_size(__n); }
-
-      /*
-       * @brief  Returns the bucket index of a given element.
-       * @param  __key  A key instance.
-       * @return  The key bucket index.
-       */
-      size_type
-      bucket(const key_type& __key) const
-      { return _M_h.bucket(__key); }
-      
-      /**
-       *  @brief  Returns a read/write iterator pointing to the first bucket
-       *         element.
-       *  @param  __n The bucket index.
-       *  @return  A read/write local iterator.
-       */
-      local_iterator
-      begin(size_type __n)
-      { return _M_h.begin(__n); }
-
-      //@{
-      /**
-       *  @brief  Returns a read-only (constant) iterator pointing to the first
-       *         bucket element.
-       *  @param  __n The bucket index.
-       *  @return  A read-only local iterator.
-       */
-      const_local_iterator
-      begin(size_type __n) const
-      { return _M_h.begin(__n); }
-
-      const_local_iterator
-      cbegin(size_type __n) const
-      { return _M_h.cbegin(__n); }
-      //@}
-
-      /**
-       *  @brief  Returns a read/write iterator pointing to one past the last
-       *         bucket elements.
-       *  @param  __n The bucket index.
-       *  @return  A read/write local iterator.
-       */
-      local_iterator
-      end(size_type __n)
-      { return _M_h.end(__n); }
-
-      //@{
-      /**
-       *  @brief  Returns a read-only (constant) iterator pointing to one past
-       *         the last bucket elements.
-       *  @param  __n The bucket index.
-       *  @return  A read-only local iterator.
-       */
-      const_local_iterator
-      end(size_type __n) const
-      { return _M_h.end(__n); }
-
-      const_local_iterator
-      cend(size_type __n) const
-      { return _M_h.cend(__n); }
-      //@}
-
-      // hash policy.
-
-      /// Returns the average number of elements per bucket.
-      float
-      load_factor() const noexcept
-      { return _M_h.load_factor(); }
-
-      /// Returns a positive number that the %unordered_map tries to keep the
-      /// load factor less than or equal to.
-      float
-      max_load_factor() const noexcept
-      { return _M_h.max_load_factor(); }
-
-      /**
-       *  @brief  Change the %unordered_map maximum load factor.
-       *  @param  __z The new maximum load factor.
-       */
-      void
-      max_load_factor(float __z)
-      { _M_h.max_load_factor(__z); }
-
-      /**
-       *  @brief  May rehash the %unordered_map.
-       *  @param  __n The new number of buckets.
-       *
-       *  Rehash will occur only if the new number of buckets respect the
-       *  %unordered_map maximum load factor.
-       */
-      void
-      rehash(size_type __n)
-      { _M_h.rehash(__n); }
-
-      /**
-       *  @brief  Prepare the %unordered_map for a specified number of
-       *          elements.
-       *  @param  __n Number of elements required.
-       *
-       *  Same as rehash(ceil(n / max_load_factor())).
-       */
-      void
-      reserve(size_type __n)
-      { _M_h.reserve(__n); }
-
-      template<typename _Key1, typename _Tp1, typename _Hash1, typename _Pred1,
-	       typename _Alloc1>
-        friend bool
-      operator==(const unordered_map<_Key1, _Tp1, _Hash1, _Pred1, _Alloc1>&,
-		 const unordered_map<_Key1, _Tp1, _Hash1, _Pred1, _Alloc1>&);
-    };
-
-  /**
-   *  @brief A standard container composed of equivalent keys
-   *  (possibly containing multiple of each key value) that associates
-   *  values of another type with the keys.
-   *
-   *  @ingroup unordered_associative_containers
-   *
-   *  @tparam  _Key    Type of key objects.
-   *  @tparam  _Tp     Type of mapped objects.
-   *  @tparam  _Hash   Hashing function object type, defaults to hash<_Value>.
-   *  @tparam  _Pred   Predicate function object type, defaults
-   *                   to equal_to<_Value>.
-   *  @tparam  _Alloc  Allocator type, defaults to
-   *                   std::allocator<std::pair<const _Key, _Tp>>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, and
-   *  <a href="tables.html#xx">unordered associative container</a>
-   *
-   * The resulting value type of the container is std::pair<const _Key, _Tp>.
-   *
-   *  Base is _Hashtable, dispatched at compile time via template
-   *  alias __ummap_hashtable.
-   */
-  template<class _Key, class _Tp,
-	   class _Hash = hash<_Key>,
-	   class _Pred = std::equal_to<_Key>,
-	   class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-    class unordered_multimap
-    {
-      typedef __ummap_hashtable<_Key, _Tp, _Hash, _Pred, _Alloc>  _Hashtable;
-      _Hashtable _M_h;
-
-    public:
-      // typedefs:
-      //@{
-      /// Public typedefs.
-      typedef typename _Hashtable::key_type	key_type;
-      typedef typename _Hashtable::value_type	value_type;
-      typedef typename _Hashtable::mapped_type	mapped_type;
-      typedef typename _Hashtable::hasher	hasher;
-      typedef typename _Hashtable::key_equal	key_equal;
-      typedef typename _Hashtable::allocator_type allocator_type;
-      //@}
-
-      //@{
-      ///  Iterator-related typedefs.
-      typedef typename _Hashtable::pointer		pointer;
-      typedef typename _Hashtable::const_pointer	const_pointer;
-      typedef typename _Hashtable::reference		reference;
-      typedef typename _Hashtable::const_reference	const_reference;
-      typedef typename _Hashtable::iterator		iterator;
-      typedef typename _Hashtable::const_iterator	const_iterator;
-      typedef typename _Hashtable::local_iterator	local_iterator;
-      typedef typename _Hashtable::const_local_iterator	const_local_iterator;
-      typedef typename _Hashtable::size_type		size_type;
-      typedef typename _Hashtable::difference_type	difference_type;
-      //@}
-
-      //construct/destroy/copy
-
-      /// Default constructor.
-      unordered_multimap() = default;
-
-      /**
-       *  @brief  Default constructor creates no elements.
-       *  @param __n  Mnimal initial number of buckets.
-       *  @param __hf  A hash functor.
-       *  @param __eql  A key equality functor.
-       *  @param __a  An allocator object.
-       */
-      explicit
-      unordered_multimap(size_type __n,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _M_h(__n, __hf, __eql, __a)
-      { }
-
-      /**
-       *  @brief  Builds an %unordered_multimap from a range.
-       *  @param  __first An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param __n      Minimal initial number of buckets.
-       *  @param __hf     A hash functor.
-       *  @param __eql    A key equality functor.
-       *  @param __a      An allocator object.
-       *
-       *  Create an %unordered_multimap consisting of copies of the elements
-       *  from [__first,__last).  This is linear in N (where N is
-       *  distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-	unordered_multimap(_InputIterator __first, _InputIterator __last,
-			   size_type __n = 0,
-			   const hasher& __hf = hasher(),
-			   const key_equal& __eql = key_equal(),
-			   const allocator_type& __a = allocator_type())
-	: _M_h(__first, __last, __n, __hf, __eql, __a)
-	{ }
-
-      /// Copy constructor.
-      unordered_multimap(const unordered_multimap&) = default;
-
-      /// Move constructor.
-      unordered_multimap(unordered_multimap&&) = default;
-
-      /**
-       *  @brief Creates an %unordered_multimap with no elements.
-       *  @param __a An allocator object.
-       */
-      explicit
-      unordered_multimap(const allocator_type& __a)
-      : _M_h(__a)
-      { }
-
-      /*
-       *  @brief Copy constructor with allocator argument.
-       * @param  __uset  Input %unordered_multimap to copy.
-       * @param  __a  An allocator object.
-       */
-      unordered_multimap(const unordered_multimap& __ummap,
-			 const allocator_type& __a)
-      : _M_h(__ummap._M_h, __a)
-      { }
-
-      /*
-       *  @brief  Move constructor with allocator argument.
-       *  @param  __uset Input %unordered_multimap to move.
-       *  @param  __a    An allocator object.
-       */
-      unordered_multimap(unordered_multimap&& __ummap,
-			 const allocator_type& __a)
-      : _M_h(std::move(__ummap._M_h), __a)
-      { }
-
-      /**
-       *  @brief  Builds an %unordered_multimap from an initializer_list.
-       *  @param  __l  An initializer_list.
-       *  @param __n  Minimal initial number of buckets.
-       *  @param __hf  A hash functor.
-       *  @param __eql  A key equality functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create an %unordered_multimap consisting of copies of the elements in
-       *  the list. This is linear in N (where N is @a __l.size()).
-       */
-      unordered_multimap(initializer_list<value_type> __l,
-			 size_type __n = 0,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _M_h(__l, __n, __hf, __eql, __a)
-      { }
-
-      unordered_multimap(size_type __n, const allocator_type& __a)
-      : unordered_multimap(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multimap(size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-      : unordered_multimap(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_multimap(_InputIterator __first, _InputIterator __last,
-			   size_type __n,
-			   const allocator_type& __a)
-	: unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_multimap(_InputIterator __first, _InputIterator __last,
-			   size_type __n, const hasher& __hf,
-			   const allocator_type& __a)
-	: unordered_multimap(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_multimap(initializer_list<value_type> __l,
-			 size_type __n,
-			 const allocator_type& __a)
-      : unordered_multimap(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multimap(initializer_list<value_type> __l,
-			 size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-      : unordered_multimap(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      /// Copy assignment operator.
-      unordered_multimap&
-      operator=(const unordered_multimap&) = default;
-
-      /// Move assignment operator.
-      unordered_multimap&
-      operator=(unordered_multimap&&) = default;
-
-      /**
-       *  @brief  %Unordered_multimap list assignment operator.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills an %unordered_multimap with copies of the elements
-       *  in the initializer list @a __l.
-       *
-       *  Note that the assignment completely changes the %unordered_multimap
-       *  and that the resulting %unordered_multimap's size is the same as the
-       *  number of elements assigned.  Old data may be lost.
-       */
-      unordered_multimap&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_h = __l;
-	return *this;
-      }
-
-      ///  Returns the allocator object with which the %unordered_multimap was
-      ///  constructed.
-      allocator_type
-      get_allocator() const noexcept
-      { return _M_h.get_allocator(); }
-
-      // size and capacity:
-
-      ///  Returns true if the %unordered_multimap is empty.
-      bool
-      empty() const noexcept
-      { return _M_h.empty(); }
-
-      ///  Returns the size of the %unordered_multimap.
-      size_type
-      size() const noexcept
-      { return _M_h.size(); }
-
-      ///  Returns the maximum size of the %unordered_multimap.
-      size_type
-      max_size() const noexcept
-      { return _M_h.max_size(); }
-
-      // iterators.
-
-      /**
-       *  Returns a read/write iterator that points to the first element in the
-       *  %unordered_multimap.
-       */
-      iterator
-      begin() noexcept
-      { return _M_h.begin(); }
-
-      //@{
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %unordered_multimap.
-       */
-      const_iterator
-      begin() const noexcept
-      { return _M_h.begin(); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return _M_h.begin(); }
-      //@}
-
-      /**
-       *  Returns a read/write iterator that points one past the last element in
-       *  the %unordered_multimap.
-       */
-      iterator
-      end() noexcept
-      { return _M_h.end(); }
-
-      //@{
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %unordered_multimap.
-       */
-      const_iterator
-      end() const noexcept
-      { return _M_h.end(); }
-
-      const_iterator
-      cend() const noexcept
-      { return _M_h.end(); }
-      //@}
-
-      // modifiers.
-
-      /**
-       *  @brief Attempts to build and insert a std::pair into the
-       *  %unordered_multimap.
-       *
-       *  @param __args  Arguments used to generate a new pair instance (see
-       *	        std::piecewise_contruct for passing arguments to each
-       *	        part of the pair constructor).
-       *
-       *  @return  An iterator that points to the inserted pair.
-       *
-       *  This function attempts to build and insert a (key, value) %pair into
-       *  the %unordered_multimap.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{ return _M_h.emplace(std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief Attempts to build and insert a std::pair into the
-       *  %unordered_multimap.
-       *
-       *  @param  __pos  An iterator that serves as a hint as to where the pair
-       *                should be inserted.
-       *  @param  __args  Arguments used to generate a new pair instance (see
-       *	         std::piecewise_contruct for passing arguments to each
-       *	         part of the pair constructor).
-       *  @return An iterator that points to the element with key of the
-       *          std::pair built from @a __args.
-       *
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process. A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  See
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *  for more on @a hinting.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{ return _M_h.emplace_hint(__pos, std::forward<_Args>(__args)...); }
-
-      //@{
-      /**
-       *  @brief Inserts a std::pair into the %unordered_multimap.
-       *  @param __x Pair to be inserted (see std::make_pair for easy
-       *	     creation of pairs).
-       *
-       *  @return  An iterator that points to the inserted pair.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      iterator
-      insert(const value_type& __x)
-      { return _M_h.insert(__x); }
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(_Pair&& __x)
-        { return _M_h.insert(std::forward<_Pair>(__x)); }
-      //@}
-
-      //@{
-      /**
-       *  @brief Inserts a std::pair into the %unordered_multimap.
-       *  @param  __hint  An iterator that serves as a hint as to where the
-       *                 pair should be inserted.
-       *  @param  __x  Pair to be inserted (see std::make_pair for easy creation
-       *               of pairs).
-       *  @return An iterator that points to the element with key of
-       *           @a __x (may or may not be the %pair passed in).
-       *
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process.  A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  See
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *  for more on @a hinting.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      iterator
-      insert(const_iterator __hint, const value_type& __x)
-      { return _M_h.insert(__hint, __x); }
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(const_iterator __hint, _Pair&& __x)
-        { return _M_h.insert(__hint, std::forward<_Pair>(__x)); }
-      //@}
-
-      /**
-       *  @brief A template function that attempts to insert a range of
-       *  elements.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   inserted.
-       *  @param  __last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{ _M_h.insert(__first, __last); }
-
-      /**
-       *  @brief Attempts to insert a list of elements into the
-       *  %unordered_multimap.
-       *  @param  __l  A std::initializer_list<value_type> of elements
-       *               to be inserted.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      void
-      insert(initializer_list<value_type> __l)
-      { _M_h.insert(__l); }
-
-      //@{
-      /**
-       *  @brief Erases an element from an %unordered_multimap.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *  @return An iterator pointing to the element immediately following
-       *          @a __position prior to the element being erased. If no such
-       *          element exists, end() is returned.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from an %unordered_multimap.
-       *  Note that this function only erases the element, and that if the
-       *  element is itself a pointer, the pointed-to memory is not touched in
-       *  any way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-      erase(const_iterator __position)
-      { return _M_h.erase(__position); }
-
-      // LWG 2059.
-      iterator
-      erase(iterator __position)
-      { return _M_h.erase(__position); }
-      //@}
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  __x  Key of elements to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all the elements located by the given key from
-       *  an %unordered_multimap.
-       *  Note that this function only erases the element, and that if the
-       *  element is itself a pointer, the pointed-to memory is not touched in
-       *  any way.  Managing the pointer is the user's responsibility.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_h.erase(__x); }
-
-      /**
-       *  @brief Erases a [__first,__last) range of elements from an
-       *  %unordered_multimap.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                  erased.
-       *  @param __last  Iterator pointing to the end of the range to
-       *                be erased.
-       *  @return The iterator @a __last.
-       *
-       *  This function erases a sequence of elements from an
-       *  %unordered_multimap.
-       *  Note that this function only erases the elements, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      { return _M_h.erase(__first, __last); }
-
-      /**
-       *  Erases all elements in an %unordered_multimap.
-       *  Note that this function only erases the elements, and that if the
-       *  elements themselves are pointers, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      void
-      clear() noexcept
-      { _M_h.clear(); }
-
-      /**
-       *  @brief  Swaps data with another %unordered_multimap.
-       *  @param  __x  An %unordered_multimap of the same element and allocator
-       *  types.
-       *
-       *  This exchanges the elements between two %unordered_multimap in
-       *  constant time.
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(m1,m2) will feed to this function.
-       */
-      void
-      swap(unordered_multimap& __x)
-      noexcept( noexcept(_M_h.swap(__x._M_h)) )
-      { _M_h.swap(__x._M_h); }
-
-      // observers.
-
-      ///  Returns the hash functor object with which the %unordered_multimap
-      ///  was constructed.
-      hasher
-      hash_function() const
-      { return _M_h.hash_function(); }
-
-      ///  Returns the key comparison object with which the %unordered_multimap
-      ///  was constructed.
-      key_equal
-      key_eq() const
-      { return _M_h.key_eq(); }
-
-      // lookup.
-
-      //@{
-      /**
-       *  @brief Tries to locate an element in an %unordered_multimap.
-       *  @param  __x  Key to be located.
-       *  @return  Iterator pointing to sought-after element, or end() if not
-       *           found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after element.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_h.find(__x); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_h.find(__x); }
-      //@}
-
-      /**
-       *  @brief  Finds the number of elements.
-       *  @param  __x  Key to count.
-       *  @return  Number of elements with specified key.
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_h.count(__x); }
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  __x  Key to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       */
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __x)
-      { return _M_h.equal_range(__x); }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_h.equal_range(__x); }
-      //@}
-
-      // bucket interface.
-
-      /// Returns the number of buckets of the %unordered_multimap.
-      size_type
-      bucket_count() const noexcept
-      { return _M_h.bucket_count(); }
-
-      /// Returns the maximum number of buckets of the %unordered_multimap.
-      size_type
-      max_bucket_count() const noexcept
-      { return _M_h.max_bucket_count(); }
-
-      /*
-       * @brief  Returns the number of elements in a given bucket.
-       * @param  __n  A bucket index.
-       * @return  The number of elements in the bucket.
-       */
-      size_type
-      bucket_size(size_type __n) const
-      { return _M_h.bucket_size(__n); }
-
-      /*
-       * @brief  Returns the bucket index of a given element.
-       * @param  __key  A key instance.
-       * @return  The key bucket index.
-       */
-      size_type
-      bucket(const key_type& __key) const
-      { return _M_h.bucket(__key); }
-      
-      /**
-       *  @brief  Returns a read/write iterator pointing to the first bucket
-       *         element.
-       *  @param  __n The bucket index.
-       *  @return  A read/write local iterator.
-       */
-      local_iterator
-      begin(size_type __n)
-      { return _M_h.begin(__n); }
-
-      //@{
-      /**
-       *  @brief  Returns a read-only (constant) iterator pointing to the first
-       *         bucket element.
-       *  @param  __n The bucket index.
-       *  @return  A read-only local iterator.
-       */
-      const_local_iterator
-      begin(size_type __n) const
-      { return _M_h.begin(__n); }
-
-      const_local_iterator
-      cbegin(size_type __n) const
-      { return _M_h.cbegin(__n); }
-      //@}
-
-      /**
-       *  @brief  Returns a read/write iterator pointing to one past the last
-       *         bucket elements.
-       *  @param  __n The bucket index.
-       *  @return  A read/write local iterator.
-       */
-      local_iterator
-      end(size_type __n)
-      { return _M_h.end(__n); }
-
-      //@{
-      /**
-       *  @brief  Returns a read-only (constant) iterator pointing to one past
-       *         the last bucket elements.
-       *  @param  __n The bucket index.
-       *  @return  A read-only local iterator.
-       */
-      const_local_iterator
-      end(size_type __n) const
-      { return _M_h.end(__n); }
-
-      const_local_iterator
-      cend(size_type __n) const
-      { return _M_h.cend(__n); }
-      //@}
-
-      // hash policy.
-
-      /// Returns the average number of elements per bucket.
-      float
-      load_factor() const noexcept
-      { return _M_h.load_factor(); }
-
-      /// Returns a positive number that the %unordered_multimap tries to keep
-      /// the load factor less than or equal to.
-      float
-      max_load_factor() const noexcept
-      { return _M_h.max_load_factor(); }
-
-      /**
-       *  @brief  Change the %unordered_multimap maximum load factor.
-       *  @param  __z The new maximum load factor.
-       */
-      void
-      max_load_factor(float __z)
-      { _M_h.max_load_factor(__z); }
-
-      /**
-       *  @brief  May rehash the %unordered_multimap.
-       *  @param  __n The new number of buckets.
-       *
-       *  Rehash will occur only if the new number of buckets respect the
-       *  %unordered_multimap maximum load factor.
-       */
-      void
-      rehash(size_type __n)
-      { _M_h.rehash(__n); }
-
-      /**
-       *  @brief  Prepare the %unordered_multimap for a specified number of
-       *          elements.
-       *  @param  __n Number of elements required.
-       *
-       *  Same as rehash(ceil(n / max_load_factor())).
-       */
-      void
-      reserve(size_type __n)
-      { _M_h.reserve(__n); }
-
-      template<typename _Key1, typename _Tp1, typename _Hash1, typename _Pred1,
-	       typename _Alloc1>
-        friend bool
-	operator==(const unordered_multimap<_Key1, _Tp1,
-					    _Hash1, _Pred1, _Alloc1>&,
-		   const unordered_multimap<_Key1, _Tp1,
-					    _Hash1, _Pred1, _Alloc1>&);
-    };
-
-  template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    inline void
-    swap(unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	 unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    inline void
-    swap(unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	 unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    inline bool
-    operator==(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return __x._M_h._M_equal(__y._M_h); }
-
-  template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    inline bool
-    operator!=(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    inline bool
-    operator==(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return __x._M_h._M_equal(__y._M_h); }
-
-  template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    inline bool
-    operator!=(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif /* _UNORDERED_MAP_H */
diff --git a/openflow/usr/include/c++/5/bits/unordered_set.h b/openflow/usr/include/c++/5/bits/unordered_set.h
deleted file mode 100644
index 664d97e..0000000
--- a/openflow/usr/include/c++/5/bits/unordered_set.h
+++ /dev/null
@@ -1,1434 +0,0 @@
-// unordered_set implementation -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/unordered_set.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{unordered_set}
- */
-
-#ifndef _UNORDERED_SET_H
-#define _UNORDERED_SET_H
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /// Base types for unordered_set.
-  template<bool _Cache>
-    using __uset_traits = __detail::_Hashtable_traits<_Cache, true, true>;
-
-  template<typename _Value,
-	   typename _Hash = hash<_Value>,
-	   typename _Pred = std::equal_to<_Value>,
-  	   typename _Alloc = std::allocator<_Value>,
-	   typename _Tr = __uset_traits<__cache_default<_Value, _Hash>::value>>
-    using __uset_hashtable = _Hashtable<_Value, _Value, _Alloc,
-					__detail::_Identity, _Pred, _Hash,
-					__detail::_Mod_range_hashing,
-					__detail::_Default_ranged_hash,
-					__detail::_Prime_rehash_policy, _Tr>;
-
-  /// Base types for unordered_multiset.
-  template<bool _Cache>
-    using __umset_traits = __detail::_Hashtable_traits<_Cache, true, false>;
-
-  template<typename _Value,
-	   typename _Hash = hash<_Value>,
-	   typename _Pred = std::equal_to<_Value>,
-	   typename _Alloc = std::allocator<_Value>,
-	   typename _Tr = __umset_traits<__cache_default<_Value, _Hash>::value>>
-    using __umset_hashtable = _Hashtable<_Value, _Value, _Alloc,
-					 __detail::_Identity,
-					 _Pred, _Hash,
-					 __detail::_Mod_range_hashing,
-					 __detail::_Default_ranged_hash,
-					 __detail::_Prime_rehash_policy, _Tr>;
-
-  /**
-   *  @brief A standard container composed of unique keys (containing
-   *  at most one of each key value) in which the elements' keys are
-   *  the elements themselves.
-   *
-   *  @ingroup unordered_associative_containers
-   *
-   *  @tparam  _Value  Type of key objects.
-   *  @tparam  _Hash  Hashing function object type, defaults to hash<_Value>.
-
-   *  @tparam _Pred Predicate function object type, defaults to
-   *                equal_to<_Value>.
-   *
-   *  @tparam  _Alloc  Allocator type, defaults to allocator<_Key>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, and
-   *  <a href="tables.html#xx">unordered associative container</a>
-   *
-   *  Base is _Hashtable, dispatched at compile time via template
-   *  alias __uset_hashtable.
-   */
-  template<class _Value,
-	   class _Hash = hash<_Value>,
-	   class _Pred = std::equal_to<_Value>,
-	   class _Alloc = std::allocator<_Value> >
-    class unordered_set
-    {
-      typedef __uset_hashtable<_Value, _Hash, _Pred, _Alloc>  _Hashtable;
-      _Hashtable _M_h;
-
-    public:
-      // typedefs:
-      //@{
-      /// Public typedefs.
-      typedef typename _Hashtable::key_type	key_type;
-      typedef typename _Hashtable::value_type	value_type;
-      typedef typename _Hashtable::hasher	hasher;
-      typedef typename _Hashtable::key_equal	key_equal;
-      typedef typename _Hashtable::allocator_type allocator_type;
-      //@}
-
-      //@{
-      ///  Iterator-related typedefs.
-      typedef typename _Hashtable::pointer		pointer;
-      typedef typename _Hashtable::const_pointer	const_pointer;
-      typedef typename _Hashtable::reference		reference;
-      typedef typename _Hashtable::const_reference	const_reference;
-      typedef typename _Hashtable::iterator		iterator;
-      typedef typename _Hashtable::const_iterator	const_iterator;
-      typedef typename _Hashtable::local_iterator	local_iterator;
-      typedef typename _Hashtable::const_local_iterator	const_local_iterator;
-      typedef typename _Hashtable::size_type		size_type;
-      typedef typename _Hashtable::difference_type	difference_type;
-      //@}
-
-      // construct/destroy/copy
-
-      /// Default constructor.
-      unordered_set() = default;
-
-      /**
-       *  @brief  Default constructor creates no elements.
-       *  @param __n  Minimal initial number of buckets.
-       *  @param __hf  A hash functor.
-       *  @param __eql  A key equality functor.
-       *  @param __a  An allocator object.
-       */
-      explicit
-      unordered_set(size_type __n,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _M_h(__n, __hf, __eql, __a)
-      { }
-
-      /**
-       *  @brief  Builds an %unordered_set from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last  An input iterator.
-       *  @param __n  Minimal initial number of buckets.
-       *  @param __hf  A hash functor.
-       *  @param __eql  A key equality functor.
-       *  @param __a  An allocator object.
-       *
-       *  Create an %unordered_set consisting of copies of the elements from
-       *  [__first,__last).  This is linear in N (where N is
-       *  distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-	unordered_set(_InputIterator __first, _InputIterator __last,
-		      size_type __n = 0,
-		      const hasher& __hf = hasher(),
-		      const key_equal& __eql = key_equal(),
-		      const allocator_type& __a = allocator_type())
-	: _M_h(__first, __last, __n, __hf, __eql, __a)
-	{ }
-
-      /// Copy constructor.
-      unordered_set(const unordered_set&) = default;
-
-      /// Move constructor.
-      unordered_set(unordered_set&&) = default;
-
-      /**
-       *  @brief Creates an %unordered_set with no elements.
-       *  @param __a An allocator object.
-       */
-      explicit
-      unordered_set(const allocator_type& __a)
-      : _M_h(__a)
-      { }
-
-      /*
-       *  @brief Copy constructor with allocator argument.
-       * @param  __uset  Input %unordered_set to copy.
-       * @param  __a  An allocator object.
-       */
-      unordered_set(const unordered_set& __uset,
-		    const allocator_type& __a)
-      : _M_h(__uset._M_h, __a)
-      { }
-
-      /*
-       *  @brief  Move constructor with allocator argument.
-       *  @param  __uset Input %unordered_set to move.
-       *  @param  __a    An allocator object.
-       */
-      unordered_set(unordered_set&& __uset,
-		    const allocator_type& __a)
-      : _M_h(std::move(__uset._M_h), __a)
-      { }
-
-      /**
-       *  @brief  Builds an %unordered_set from an initializer_list.
-       *  @param  __l  An initializer_list.
-       *  @param __n  Minimal initial number of buckets.
-       *  @param __hf  A hash functor.
-       *  @param __eql  A key equality functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create an %unordered_set consisting of copies of the elements in the
-       *  list. This is linear in N (where N is @a __l.size()).
-       */
-      unordered_set(initializer_list<value_type> __l,
-		    size_type __n = 0,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _M_h(__l, __n, __hf, __eql, __a)
-      { }
-
-      unordered_set(size_type __n, const allocator_type& __a)
-      : unordered_set(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_set(size_type __n, const hasher& __hf,
-		    const allocator_type& __a)
-      : unordered_set(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_set(_InputIterator __first, _InputIterator __last,
-		      size_type __n,
-		      const allocator_type& __a)
-	: unordered_set(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_set(_InputIterator __first, _InputIterator __last,
-		      size_type __n, const hasher& __hf,
-		      const allocator_type& __a)
-	: unordered_set(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_set(initializer_list<value_type> __l,
-		    size_type __n,
-		    const allocator_type& __a)
-      : unordered_set(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_set(initializer_list<value_type> __l,
-		    size_type __n, const hasher& __hf,
-		    const allocator_type& __a)
-      : unordered_set(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      /// Copy assignment operator.
-      unordered_set&
-      operator=(const unordered_set&) = default;
-
-      /// Move assignment operator.
-      unordered_set&
-      operator=(unordered_set&&) = default;
-
-      /**
-       *  @brief  %Unordered_set list assignment operator.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills an %unordered_set with copies of the elements in
-       *  the initializer list @a __l.
-       *
-       *  Note that the assignment completely changes the %unordered_set and
-       *  that the resulting %unordered_set's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      unordered_set&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_h = __l;
-	return *this;
-      }
-
-      ///  Returns the allocator object with which the %unordered_set was
-      ///  constructed.
-      allocator_type
-      get_allocator() const noexcept
-      { return _M_h.get_allocator(); }
-
-      // size and capacity:
-
-      ///  Returns true if the %unordered_set is empty.
-      bool
-      empty() const noexcept
-      { return _M_h.empty(); }
-
-      ///  Returns the size of the %unordered_set.
-      size_type
-      size() const noexcept
-      { return _M_h.size(); }
-
-      ///  Returns the maximum size of the %unordered_set.
-      size_type
-      max_size() const noexcept
-      { return _M_h.max_size(); }
-
-      // iterators.
-
-      //@{
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %unordered_set.
-       */
-      iterator
-      begin() noexcept
-      { return _M_h.begin(); }
-
-      const_iterator
-      begin() const noexcept
-      { return _M_h.begin(); }
-      //@}
-
-      //@{
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %unordered_set.
-       */
-      iterator
-      end() noexcept
-      { return _M_h.end(); }
-
-      const_iterator
-      end() const noexcept
-      { return _M_h.end(); }
-      //@}
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %unordered_set.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return _M_h.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %unordered_set.
-       */
-      const_iterator
-      cend() const noexcept
-      { return _M_h.end(); }
-
-      // modifiers.
-
-      /**
-       *  @brief Attempts to build and insert an element into the
-       *  %unordered_set.
-       *  @param __args  Arguments used to generate an element.
-       *  @return  A pair, of which the first element is an iterator that points
-       *           to the possibly inserted element, and the second is a bool
-       *           that is true if the element was actually inserted.
-       *
-       *  This function attempts to build and insert an element into the
-       *  %unordered_set. An %unordered_set relies on unique keys and thus an
-       *  element is only inserted if it is not already present in the
-       *  %unordered_set.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{ return _M_h.emplace(std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief Attempts to insert an element into the %unordered_set.
-       *  @param  __pos  An iterator that serves as a hint as to where the
-       *                element should be inserted.
-       *  @param  __args  Arguments used to generate the element to be
-       *                 inserted.
-       *  @return An iterator that points to the element with key equivalent to
-       *          the one generated from @a __args (may or may not be the
-       *          element itself).
-       *
-       *  This function is not concerned about whether the insertion took place,
-       *  and thus does not return a boolean like the single-argument emplace()
-       *  does.  Note that the first parameter is only a hint and can
-       *  potentially improve the performance of the insertion process.  A bad
-       *  hint would cause no gains in efficiency.
-       *
-       *  For more on @a hinting, see:
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *
-       *  Insertion requires amortized constant time.
-       */
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{ return _M_h.emplace_hint(__pos, std::forward<_Args>(__args)...); }
-
-      //@{
-      /**
-       *  @brief Attempts to insert an element into the %unordered_set.
-       *  @param  __x  Element to be inserted.
-       *  @return  A pair, of which the first element is an iterator that points
-       *           to the possibly inserted element, and the second is a bool
-       *           that is true if the element was actually inserted.
-       *
-       *  This function attempts to insert an element into the %unordered_set.
-       *  An %unordered_set relies on unique keys and thus an element is only
-       *  inserted if it is not already present in the %unordered_set.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      std::pair<iterator, bool>
-      insert(const value_type& __x)
-      { return _M_h.insert(__x); }
-
-      std::pair<iterator, bool>
-      insert(value_type&& __x)
-      { return _M_h.insert(std::move(__x)); }
-      //@}
-
-      //@{
-      /**
-       *  @brief Attempts to insert an element into the %unordered_set.
-       *  @param  __hint  An iterator that serves as a hint as to where the
-       *                 element should be inserted.
-       *  @param  __x  Element to be inserted.
-       *  @return An iterator that points to the element with key of
-       *           @a __x (may or may not be the element passed in).
-       *
-       *  This function is not concerned about whether the insertion took place,
-       *  and thus does not return a boolean like the single-argument insert()
-       *  does.  Note that the first parameter is only a hint and can
-       *  potentially improve the performance of the insertion process.  A bad
-       *  hint would cause no gains in efficiency.
-       *
-       *  For more on @a hinting, see:
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *
-       *  Insertion requires amortized constant.
-       */
-      iterator
-      insert(const_iterator __hint, const value_type& __x)
-      { return _M_h.insert(__hint, __x); }
-
-      iterator
-      insert(const_iterator __hint, value_type&& __x)
-      { return _M_h.insert(__hint, std::move(__x)); }
-      //@}
-
-      /**
-       *  @brief A template function that attempts to insert a range of
-       *  elements.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   inserted.
-       *  @param  __last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{ _M_h.insert(__first, __last); }
-
-      /**
-       *  @brief Attempts to insert a list of elements into the %unordered_set.
-       *  @param  __l  A std::initializer_list<value_type> of elements
-       *               to be inserted.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      void
-      insert(initializer_list<value_type> __l)
-      { _M_h.insert(__l); }
-
-      //@{
-      /**
-       *  @brief Erases an element from an %unordered_set.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *  @return An iterator pointing to the element immediately following
-       *          @a __position prior to the element being erased. If no such
-       *          element exists, end() is returned.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from an %unordered_set.  Note that this function only erases the
-       *  element, and that if the element is itself a pointer, the pointed-to
-       *  memory is not touched in any way.  Managing the pointer is the user's
-       *  responsibility.
-       */
-      iterator
-      erase(const_iterator __position)
-      { return _M_h.erase(__position); }
-
-      // LWG 2059.
-      iterator
-      erase(iterator __position)
-      { return _M_h.erase(__position); }
-      //@}
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  __x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all the elements located by the given key from
-       *  an %unordered_set. For an %unordered_set the result of this function
-       *  can only be 0 (not present) or 1 (present).
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_h.erase(__x); }
-
-      /**
-       *  @brief Erases a [__first,__last) range of elements from an
-       *  %unordered_set.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                  erased.
-       *  @param __last  Iterator pointing to the end of the range to
-       *                be erased.
-       *  @return The iterator @a __last.
-       *
-       *  This function erases a sequence of elements from an %unordered_set.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      { return _M_h.erase(__first, __last); }
-
-      /**
-       *  Erases all elements in an %unordered_set. Note that this function only
-       *  erases the elements, and that if the elements themselves are pointers,
-       *  the pointed-to memory is not touched in any way. Managing the pointer
-       *  is the user's responsibility.
-       */
-      void
-      clear() noexcept
-      { _M_h.clear(); }
-
-      /**
-       *  @brief  Swaps data with another %unordered_set.
-       *  @param  __x  An %unordered_set of the same element and allocator
-       *  types.
-       *
-       *  This exchanges the elements between two sets in constant time.
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(s1,s2) will feed to this function.
-       */
-      void
-      swap(unordered_set& __x)
-      noexcept( noexcept(_M_h.swap(__x._M_h)) )
-      { _M_h.swap(__x._M_h); }
-
-      // observers.
-
-      ///  Returns the hash functor object with which the %unordered_set was
-      ///  constructed.
-      hasher
-      hash_function() const
-      { return _M_h.hash_function(); }
-
-      ///  Returns the key comparison object with which the %unordered_set was
-      ///  constructed.
-      key_equal
-      key_eq() const
-      { return _M_h.key_eq(); }
-
-      // lookup.
-
-      //@{
-      /**
-       *  @brief Tries to locate an element in an %unordered_set.
-       *  @param  __x  Element to be located.
-       *  @return  Iterator pointing to sought-after element, or end() if not
-       *           found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after element.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_h.find(__x); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_h.find(__x); }
-      //@}
-
-      /**
-       *  @brief  Finds the number of elements.
-       *  @param  __x  Element to located.
-       *  @return  Number of elements with specified key.
-       *
-       *  This function only makes sense for unordered_multisets; for
-       *  unordered_set the result will either be 0 (not present) or 1
-       *  (present).
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_h.count(__x); }
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  __x  Key to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       *
-       *  This function probably only makes sense for multisets.
-       */
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __x)
-      { return _M_h.equal_range(__x); }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_h.equal_range(__x); }
-      //@}
-
-      // bucket interface.
-
-      /// Returns the number of buckets of the %unordered_set.
-      size_type
-      bucket_count() const noexcept
-      { return _M_h.bucket_count(); }
-
-      /// Returns the maximum number of buckets of the %unordered_set.
-      size_type
-      max_bucket_count() const noexcept
-      { return _M_h.max_bucket_count(); }
-
-      /*
-       * @brief  Returns the number of elements in a given bucket.
-       * @param  __n  A bucket index.
-       * @return  The number of elements in the bucket.
-       */
-      size_type
-      bucket_size(size_type __n) const
-      { return _M_h.bucket_size(__n); }
-
-      /*
-       * @brief  Returns the bucket index of a given element.
-       * @param  __key  A key instance.
-       * @return  The key bucket index.
-       */
-      size_type
-      bucket(const key_type& __key) const
-      { return _M_h.bucket(__key); }
-
-      //@{
-      /**
-       *  @brief  Returns a read-only (constant) iterator pointing to the first
-       *         bucket element.
-       *  @param  __n The bucket index.
-       *  @return  A read-only local iterator.
-       */
-      local_iterator
-      begin(size_type __n)
-      { return _M_h.begin(__n); }
-
-      const_local_iterator
-      begin(size_type __n) const
-      { return _M_h.begin(__n); }
-
-      const_local_iterator
-      cbegin(size_type __n) const
-      { return _M_h.cbegin(__n); }
-      //@}
-
-      //@{
-      /**
-       *  @brief  Returns a read-only (constant) iterator pointing to one past
-       *         the last bucket elements.
-       *  @param  __n The bucket index.
-       *  @return  A read-only local iterator.
-       */
-      local_iterator
-      end(size_type __n)
-      { return _M_h.end(__n); }
-
-      const_local_iterator
-      end(size_type __n) const
-      { return _M_h.end(__n); }
-
-      const_local_iterator
-      cend(size_type __n) const
-      { return _M_h.cend(__n); }
-      //@}
-
-      // hash policy.
-
-      /// Returns the average number of elements per bucket.
-      float
-      load_factor() const noexcept
-      { return _M_h.load_factor(); }
-
-      /// Returns a positive number that the %unordered_set tries to keep the
-      /// load factor less than or equal to.
-      float
-      max_load_factor() const noexcept
-      { return _M_h.max_load_factor(); }
-
-      /**
-       *  @brief  Change the %unordered_set maximum load factor.
-       *  @param  __z The new maximum load factor.
-       */
-      void
-      max_load_factor(float __z)
-      { _M_h.max_load_factor(__z); }
-
-      /**
-       *  @brief  May rehash the %unordered_set.
-       *  @param  __n The new number of buckets.
-       *
-       *  Rehash will occur only if the new number of buckets respect the
-       *  %unordered_set maximum load factor.
-       */
-      void
-      rehash(size_type __n)
-      { _M_h.rehash(__n); }
-
-      /**
-       *  @brief  Prepare the %unordered_set for a specified number of
-       *          elements.
-       *  @param  __n Number of elements required.
-       *
-       *  Same as rehash(ceil(n / max_load_factor())).
-       */
-      void
-      reserve(size_type __n)
-      { _M_h.reserve(__n); }
-
-      template<typename _Value1, typename _Hash1, typename _Pred1,
-	       typename _Alloc1>
-        friend bool
-        operator==(const unordered_set<_Value1, _Hash1, _Pred1, _Alloc1>&,
-		   const unordered_set<_Value1, _Hash1, _Pred1, _Alloc1>&);
-    };
-
-  /**
-   *  @brief A standard container composed of equivalent keys
-   *  (possibly containing multiple of each key value) in which the
-   *  elements' keys are the elements themselves.
-   *
-   *  @ingroup unordered_associative_containers
-   *
-   *  @tparam  _Value  Type of key objects.
-   *  @tparam  _Hash  Hashing function object type, defaults to hash<_Value>.
-   *  @tparam  _Pred  Predicate function object type, defaults
-   *                  to equal_to<_Value>.
-   *  @tparam  _Alloc  Allocator type, defaults to allocator<_Key>.
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, and
-   *  <a href="tables.html#xx">unordered associative container</a>
-   *
-   *  Base is _Hashtable, dispatched at compile time via template
-   *  alias __umset_hashtable.
-   */
-  template<class _Value,
-	   class _Hash = hash<_Value>,
-	   class _Pred = std::equal_to<_Value>,
-	   class _Alloc = std::allocator<_Value> >
-    class unordered_multiset
-    {
-      typedef __umset_hashtable<_Value, _Hash, _Pred, _Alloc>  _Hashtable;
-      _Hashtable _M_h;
-
-    public:
-      // typedefs:
-      //@{
-      /// Public typedefs.
-      typedef typename _Hashtable::key_type	key_type;
-      typedef typename _Hashtable::value_type	value_type;
-      typedef typename _Hashtable::hasher	hasher;
-      typedef typename _Hashtable::key_equal	key_equal;
-      typedef typename _Hashtable::allocator_type allocator_type;
-      //@}
-
-      //@{
-      ///  Iterator-related typedefs.
-      typedef typename _Hashtable::pointer		pointer;
-      typedef typename _Hashtable::const_pointer	const_pointer;
-      typedef typename _Hashtable::reference		reference;
-      typedef typename _Hashtable::const_reference	const_reference;
-      typedef typename _Hashtable::iterator		iterator;
-      typedef typename _Hashtable::const_iterator	const_iterator;
-      typedef typename _Hashtable::local_iterator	local_iterator;
-      typedef typename _Hashtable::const_local_iterator	const_local_iterator;
-      typedef typename _Hashtable::size_type		size_type;
-      typedef typename _Hashtable::difference_type	difference_type;
-      //@}
-
-      // construct/destroy/copy
-
-      /// Default constructor.
-      unordered_multiset() = default;
-
-      /**
-       *  @brief  Default constructor creates no elements.
-       *  @param __n  Minimal initial number of buckets.
-       *  @param __hf  A hash functor.
-       *  @param __eql  A key equality functor.
-       *  @param __a  An allocator object.
-       */
-      explicit
-      unordered_multiset(size_type __n,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _M_h(__n, __hf, __eql, __a)
-      { }
-
-      /**
-       *  @brief  Builds an %unordered_multiset from a range.
-       *  @param  __first  An input iterator.
-       *  @param  __last   An input iterator.
-       *  @param __n       Minimal initial number of buckets.
-       *  @param __hf      A hash functor.
-       *  @param __eql     A key equality functor.
-       *  @param __a       An allocator object.
-       *
-       *  Create an %unordered_multiset consisting of copies of the elements
-       *  from [__first,__last).  This is linear in N (where N is
-       *  distance(__first,__last)).
-       */
-      template<typename _InputIterator>
-	unordered_multiset(_InputIterator __first, _InputIterator __last,
-			   size_type __n = 0,
-			   const hasher& __hf = hasher(),
-			   const key_equal& __eql = key_equal(),
-			   const allocator_type& __a = allocator_type())
-	: _M_h(__first, __last, __n, __hf, __eql, __a)
-	{ }
-
-      /// Copy constructor.
-      unordered_multiset(const unordered_multiset&) = default;
-
-      /// Move constructor.
-      unordered_multiset(unordered_multiset&&) = default;
-
-      /**
-       *  @brief  Builds an %unordered_multiset from an initializer_list.
-       *  @param  __l  An initializer_list.
-       *  @param __n  Minimal initial number of buckets.
-       *  @param __hf  A hash functor.
-       *  @param __eql  A key equality functor.
-       *  @param  __a  An allocator object.
-       *
-       *  Create an %unordered_multiset consisting of copies of the elements in
-       *  the list. This is linear in N (where N is @a __l.size()).
-       */
-      unordered_multiset(initializer_list<value_type> __l,
-			 size_type __n = 0,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _M_h(__l, __n, __hf, __eql, __a)
-      { }
-
-      /// Copy assignment operator.
-      unordered_multiset&
-      operator=(const unordered_multiset&) = default;
-
-      /// Move assignment operator.
-      unordered_multiset&
-      operator=(unordered_multiset&&) = default;
-
-      /**
-       *  @brief Creates an %unordered_multiset with no elements.
-       *  @param __a An allocator object.
-       */
-      explicit
-      unordered_multiset(const allocator_type& __a)
-      : _M_h(__a)
-      { }
-
-      /*
-       *  @brief Copy constructor with allocator argument.
-       * @param  __uset  Input %unordered_multiset to copy.
-       * @param  __a  An allocator object.
-       */
-      unordered_multiset(const unordered_multiset& __umset,
-			 const allocator_type& __a)
-      : _M_h(__umset._M_h, __a)
-      { }
-
-      /*
-       *  @brief  Move constructor with allocator argument.
-       *  @param  __umset  Input %unordered_multiset to move.
-       *  @param  __a  An allocator object.
-       */
-      unordered_multiset(unordered_multiset&& __umset,
-			 const allocator_type& __a)
-      : _M_h(std::move(__umset._M_h), __a)
-      { }
-
-      unordered_multiset(size_type __n, const allocator_type& __a)
-      : unordered_multiset(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multiset(size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-      : unordered_multiset(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_multiset(_InputIterator __first, _InputIterator __last,
-			   size_type __n,
-			   const allocator_type& __a)
-	: unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_multiset(_InputIterator __first, _InputIterator __last,
-			   size_type __n, const hasher& __hf,
-			   const allocator_type& __a)
-	: unordered_multiset(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_multiset(initializer_list<value_type> __l,
-			 size_type __n,
-			 const allocator_type& __a)
-      : unordered_multiset(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multiset(initializer_list<value_type> __l,
-			 size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-      : unordered_multiset(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      /**
-       *  @brief  %Unordered_multiset list assignment operator.
-       *  @param  __l  An initializer_list.
-       *
-       *  This function fills an %unordered_multiset with copies of the elements
-       *  in the initializer list @a __l.
-       *
-       *  Note that the assignment completely changes the %unordered_multiset
-       *  and that the resulting %unordered_multiset's size is the same as the
-       *  number of elements assigned. Old data may be lost.
-       */
-      unordered_multiset&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_h = __l;
-	return *this;
-      }
-
-      ///  Returns the allocator object with which the %unordered_multiset was
-      ///  constructed.
-      allocator_type
-      get_allocator() const noexcept
-      { return _M_h.get_allocator(); }
-
-      // size and capacity:
-
-      ///  Returns true if the %unordered_multiset is empty.
-      bool
-      empty() const noexcept
-      { return _M_h.empty(); }
-
-      ///  Returns the size of the %unordered_multiset.
-      size_type
-      size() const noexcept
-      { return _M_h.size(); }
-
-      ///  Returns the maximum size of the %unordered_multiset.
-      size_type
-      max_size() const noexcept
-      { return _M_h.max_size(); }
-
-      // iterators.
-
-      //@{
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %unordered_multiset.
-       */
-      iterator
-      begin() noexcept
-      { return _M_h.begin(); }
-
-      const_iterator
-      begin() const noexcept
-      { return _M_h.begin(); }
-      //@}
-
-      //@{
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %unordered_multiset.
-       */
-      iterator
-      end() noexcept
-      { return _M_h.end(); }
-
-      const_iterator
-      end() const noexcept
-      { return _M_h.end(); }
-      //@}
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %unordered_multiset.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return _M_h.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %unordered_multiset.
-       */
-      const_iterator
-      cend() const noexcept
-      { return _M_h.end(); }
-
-      // modifiers.
-
-      /**
-       *  @brief Builds and insert an element into the %unordered_multiset.
-       *  @param __args  Arguments used to generate an element.
-       *  @return  An iterator that points to the inserted element.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{ return _M_h.emplace(std::forward<_Args>(__args)...); }
-
-      /**
-       *  @brief Inserts an element into the %unordered_multiset.
-       *  @param  __pos  An iterator that serves as a hint as to where the
-       *                element should be inserted.
-       *  @param  __args  Arguments used to generate the element to be
-       *                 inserted.
-       *  @return An iterator that points to the inserted element.
-       *
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process.  A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  For more on @a hinting, see:
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *
-       *  Insertion requires amortized constant time.
-       */
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{ return _M_h.emplace_hint(__pos, std::forward<_Args>(__args)...); }
-
-      //@{
-      /**
-       *  @brief Inserts an element into the %unordered_multiset.
-       *  @param  __x  Element to be inserted.
-       *  @return  An iterator that points to the inserted element.
-       *
-       *  Insertion requires amortized constant time.
-       */
-      iterator
-      insert(const value_type& __x)
-      { return _M_h.insert(__x); }
-
-      iterator
-      insert(value_type&& __x)
-      { return _M_h.insert(std::move(__x)); }
-      //@}
-
-      //@{
-      /**
-       *  @brief Inserts an element into the %unordered_multiset.
-       *  @param  __hint  An iterator that serves as a hint as to where the
-       *                 element should be inserted.
-       *  @param  __x  Element to be inserted.
-       *  @return An iterator that points to the inserted element.
-       *
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process.  A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  For more on @a hinting, see:
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/associative.html#containers.associative.insert_hints
-       *
-       *  Insertion requires amortized constant.
-       */
-      iterator
-      insert(const_iterator __hint, const value_type& __x)
-      { return _M_h.insert(__hint, __x); }
-
-      iterator
-      insert(const_iterator __hint, value_type&& __x)
-      { return _M_h.insert(__hint, std::move(__x)); }
-      //@}
-
-      /**
-       *  @brief A template function that inserts a range of elements.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                   inserted.
-       *  @param  __last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{ _M_h.insert(__first, __last); }
-
-      /**
-       *  @brief Inserts a list of elements into the %unordered_multiset.
-       *  @param  __l  A std::initializer_list<value_type> of elements to be
-       *              inserted.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      void
-      insert(initializer_list<value_type> __l)
-      { _M_h.insert(__l); }
-
-      //@{
-      /**
-       *  @brief Erases an element from an %unordered_multiset.
-       *  @param  __position  An iterator pointing to the element to be erased.
-       *  @return An iterator pointing to the element immediately following
-       *          @a __position prior to the element being erased. If no such
-       *          element exists, end() is returned.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from an %unordered_multiset.
-       *
-       *  Note that this function only erases the element, and that if the
-       *  element is itself a pointer, the pointed-to memory is not touched in
-       *  any way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-      erase(const_iterator __position)
-      { return _M_h.erase(__position); }
-
-      // LWG 2059.
-      iterator
-      erase(iterator __position)
-      { return _M_h.erase(__position); }
-      //@}
-
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  __x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all the elements located by the given key from
-       *  an %unordered_multiset.
-       *
-       *  Note that this function only erases the element, and that if the
-       *  element is itself a pointer, the pointed-to memory is not touched in
-       *  any way.  Managing the pointer is the user's responsibility.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_h.erase(__x); }
-
-      /**
-       *  @brief Erases a [__first,__last) range of elements from an
-       *  %unordered_multiset.
-       *  @param  __first  Iterator pointing to the start of the range to be
-       *                  erased.
-       *  @param __last  Iterator pointing to the end of the range to
-       *                be erased.
-       *  @return The iterator @a __last.
-       *
-       *  This function erases a sequence of elements from an
-       *  %unordered_multiset.
-       *
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibility.
-       */
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      { return _M_h.erase(__first, __last); }
-
-      /**
-       *  Erases all elements in an %unordered_multiset.
-       *
-       *  Note that this function only erases the elements, and that if the
-       *  elements themselves are pointers, the pointed-to memory is not touched
-       *  in any way. Managing the pointer is the user's responsibility.
-       */
-      void
-      clear() noexcept
-      { _M_h.clear(); }
-
-      /**
-       *  @brief  Swaps data with another %unordered_multiset.
-       *  @param  __x  An %unordered_multiset of the same element and allocator
-       *  types.
-       *
-       *  This exchanges the elements between two sets in constant time.
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(s1,s2) will feed to this function.
-       */
-      void
-      swap(unordered_multiset& __x)
-      noexcept( noexcept(_M_h.swap(__x._M_h)) )
-      { _M_h.swap(__x._M_h); }
-
-      // observers.
-
-      ///  Returns the hash functor object with which the %unordered_multiset
-      ///  was constructed.
-      hasher
-      hash_function() const
-      { return _M_h.hash_function(); }
-
-      ///  Returns the key comparison object with which the %unordered_multiset
-      ///  was constructed.
-      key_equal
-      key_eq() const
-      { return _M_h.key_eq(); }
-
-      // lookup.
-
-      //@{
-      /**
-       *  @brief Tries to locate an element in an %unordered_multiset.
-       *  @param  __x  Element to be located.
-       *  @return  Iterator pointing to sought-after element, or end() if not
-       *           found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after element.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_h.find(__x); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_h.find(__x); }
-      //@}
-
-      /**
-       *  @brief  Finds the number of elements.
-       *  @param  __x  Element to located.
-       *  @return  Number of elements with specified key.
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_h.count(__x); }
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  __x  Key to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       */
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __x)
-      { return _M_h.equal_range(__x); }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_h.equal_range(__x); }
-      //@}
-
-      // bucket interface.
-
-      /// Returns the number of buckets of the %unordered_multiset.
-      size_type
-      bucket_count() const noexcept
-      { return _M_h.bucket_count(); }
-
-      /// Returns the maximum number of buckets of the %unordered_multiset.
-      size_type
-      max_bucket_count() const noexcept
-      { return _M_h.max_bucket_count(); }
-
-      /*
-       * @brief  Returns the number of elements in a given bucket.
-       * @param  __n  A bucket index.
-       * @return  The number of elements in the bucket.
-       */
-      size_type
-      bucket_size(size_type __n) const
-      { return _M_h.bucket_size(__n); }
-
-      /*
-       * @brief  Returns the bucket index of a given element.
-       * @param  __key  A key instance.
-       * @return  The key bucket index.
-       */
-      size_type
-      bucket(const key_type& __key) const
-      { return _M_h.bucket(__key); }
-
-      //@{
-      /**
-       *  @brief  Returns a read-only (constant) iterator pointing to the first
-       *         bucket element.
-       *  @param  __n The bucket index.
-       *  @return  A read-only local iterator.
-       */
-      local_iterator
-      begin(size_type __n)
-      { return _M_h.begin(__n); }
-
-      const_local_iterator
-      begin(size_type __n) const
-      { return _M_h.begin(__n); }
-
-      const_local_iterator
-      cbegin(size_type __n) const
-      { return _M_h.cbegin(__n); }
-      //@}
-
-      //@{
-      /**
-       *  @brief  Returns a read-only (constant) iterator pointing to one past
-       *         the last bucket elements.
-       *  @param  __n The bucket index.
-       *  @return  A read-only local iterator.
-       */
-      local_iterator
-      end(size_type __n)
-      { return _M_h.end(__n); }
-
-      const_local_iterator
-      end(size_type __n) const
-      { return _M_h.end(__n); }
-
-      const_local_iterator
-      cend(size_type __n) const
-      { return _M_h.cend(__n); }
-      //@}
-
-      // hash policy.
-
-      /// Returns the average number of elements per bucket.
-      float
-      load_factor() const noexcept
-      { return _M_h.load_factor(); }
-
-      /// Returns a positive number that the %unordered_multiset tries to keep the
-      /// load factor less than or equal to.
-      float
-      max_load_factor() const noexcept
-      { return _M_h.max_load_factor(); }
-
-      /**
-       *  @brief  Change the %unordered_multiset maximum load factor.
-       *  @param  __z The new maximum load factor.
-       */
-      void
-      max_load_factor(float __z)
-      { _M_h.max_load_factor(__z); }
-
-      /**
-       *  @brief  May rehash the %unordered_multiset.
-       *  @param  __n The new number of buckets.
-       *
-       *  Rehash will occur only if the new number of buckets respect the
-       *  %unordered_multiset maximum load factor.
-       */
-      void
-      rehash(size_type __n)
-      { _M_h.rehash(__n); }
-
-      /**
-       *  @brief  Prepare the %unordered_multiset for a specified number of
-       *          elements.
-       *  @param  __n Number of elements required.
-       *
-       *  Same as rehash(ceil(n / max_load_factor())).
-       */
-      void
-      reserve(size_type __n)
-      { _M_h.reserve(__n); }
-
-      template<typename _Value1, typename _Hash1, typename _Pred1,
-	       typename _Alloc1>
-        friend bool
-      operator==(const unordered_multiset<_Value1, _Hash1, _Pred1, _Alloc1>&,
-		 const unordered_multiset<_Value1, _Hash1, _Pred1, _Alloc1>&);
-    };
-
-  template<class _Value, class _Hash, class _Pred, class _Alloc>
-    inline void
-    swap(unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-	 unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<class _Value, class _Hash, class _Pred, class _Alloc>
-    inline void
-    swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-	 unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<class _Value, class _Hash, class _Pred, class _Alloc>
-    inline bool
-    operator==(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-    { return __x._M_h._M_equal(__y._M_h); }
-
-  template<class _Value, class _Hash, class _Pred, class _Alloc>
-    inline bool
-    operator!=(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  template<class _Value, class _Hash, class _Pred, class _Alloc>
-    inline bool
-    operator==(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    { return __x._M_h._M_equal(__y._M_h); }
-
-  template<class _Value, class _Hash, class _Pred, class _Alloc>
-    inline bool
-    operator!=(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#endif /* _UNORDERED_SET_H */
diff --git a/openflow/usr/include/c++/5/bits/uses_allocator.h b/openflow/usr/include/c++/5/bits/uses_allocator.h
deleted file mode 100644
index f9ea7d6..0000000
--- a/openflow/usr/include/c++/5/bits/uses_allocator.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Uses-allocator Construction -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-#ifndef _USES_ALLOCATOR_H
-#define _USES_ALLOCATOR_H 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <type_traits>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /// [allocator.tag]
-  struct allocator_arg_t { };
-
-  constexpr allocator_arg_t allocator_arg = allocator_arg_t();
-
-  template<typename _Tp, typename _Alloc, typename = __void_t<>>
-    struct __uses_allocator_helper
-    : false_type { };
-
-  template<typename _Tp, typename _Alloc>
-    struct __uses_allocator_helper<_Tp, _Alloc,
-				   __void_t<typename _Tp::allocator_type>>
-    : is_convertible<_Alloc, typename _Tp::allocator_type>::type
-    { };
-
-  /// [allocator.uses.trait]
-  template<typename _Tp, typename _Alloc>
-    struct uses_allocator
-    : __uses_allocator_helper<_Tp, _Alloc>::type
-    { };
-
-  struct __uses_alloc_base { };
-
-  struct __uses_alloc0 : __uses_alloc_base
-  {
-    struct _Sink { void operator=(const void*) { } } _M_a;
-  };
-
-  template<typename _Alloc>
-    struct __uses_alloc1 : __uses_alloc_base { const _Alloc* _M_a; };
-
-  template<typename _Alloc>
-    struct __uses_alloc2 : __uses_alloc_base { const _Alloc* _M_a; };
-
-  template<bool, typename _Tp, typename _Alloc, typename... _Args>
-    struct __uses_alloc;
-
-  template<typename _Tp, typename _Alloc, typename... _Args>
-    struct __uses_alloc<true, _Tp, _Alloc, _Args...>
-    : conditional<
-        is_constructible<_Tp, allocator_arg_t, _Alloc, _Args...>::value,
-        __uses_alloc1<_Alloc>,
-       	__uses_alloc2<_Alloc>>::type
-    { };
-
-  template<typename _Tp, typename _Alloc, typename... _Args>
-    struct __uses_alloc<false, _Tp, _Alloc, _Args...>
-    : __uses_alloc0 { };
-
-  template<typename _Tp, typename _Alloc, typename... _Args>
-    using __uses_alloc_t =
-      __uses_alloc<uses_allocator<_Tp, _Alloc>::value, _Tp, _Alloc, _Args...>;
-
-  template<typename _Tp, typename _Alloc, typename... _Args>
-    inline __uses_alloc_t<_Tp, _Alloc, _Args...>
-    __use_alloc(const _Alloc& __a)
-    {
-      __uses_alloc_t<_Tp, _Alloc, _Args...> __ret;
-      __ret._M_a = &__a;
-      return __ret;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif
-#endif
diff --git a/openflow/usr/include/c++/5/bits/valarray_after.h b/openflow/usr/include/c++/5/bits/valarray_after.h
deleted file mode 100644
index 0c02ed1..0000000
--- a/openflow/usr/include/c++/5/bits/valarray_after.h
+++ /dev/null
@@ -1,551 +0,0 @@
-// The template and inlines for the -*- C++ -*- internal _Meta class.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/valarray_after.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{valarray}
- */
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@cmla.ens-cachan.fr>
-
-#ifndef _VALARRAY_AFTER_H
-#define _VALARRAY_AFTER_H 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  //
-  // gslice_array closure.
-  //
-  template<class _Dom>
-    class _GBase
-    {
-    public:
-      typedef typename _Dom::value_type value_type;
-      
-      _GBase (const _Dom& __e, const valarray<size_t>& __i)
-      : _M_expr (__e), _M_index(__i) {}
-      
-      value_type
-      operator[] (size_t __i) const
-      { return _M_expr[_M_index[__i]]; }
-      
-      size_t
-      size () const
-      { return _M_index.size(); }
-
-    private:
-      const _Dom&	      _M_expr;
-      const valarray<size_t>& _M_index;
-    };
-
-  template<typename _Tp>
-    class _GBase<_Array<_Tp> >
-    {
-    public:
-      typedef _Tp value_type;
-      
-      _GBase (_Array<_Tp> __a, const valarray<size_t>& __i)
-      : _M_array (__a), _M_index(__i) {}
-      
-      value_type
-      operator[] (size_t __i) const
-      { return _M_array._M_data[_M_index[__i]]; }
-      
-      size_t
-      size () const
-      { return _M_index.size(); }
-
-    private:
-      const _Array<_Tp>       _M_array;
-      const valarray<size_t>& _M_index;
-    };
-
-  template<class _Dom>
-    struct _GClos<_Expr, _Dom>
-    : _GBase<_Dom>
-    {
-      typedef _GBase<_Dom> _Base;
-      typedef typename _Base::value_type value_type;
-      
-      _GClos (const _Dom& __e, const valarray<size_t>& __i)
-      : _Base (__e, __i) {}
-    };
-
-  template<typename _Tp>
-    struct _GClos<_ValArray, _Tp>
-    : _GBase<_Array<_Tp> >
-    {
-      typedef _GBase<_Array<_Tp> > _Base;
-      typedef typename _Base::value_type value_type;
-      
-      _GClos (_Array<_Tp> __a, const valarray<size_t>& __i)
-      : _Base (__a, __i) {}
-    };
-
-  //
-  // indirect_array closure
-  //
-  template<class _Dom>
-    class _IBase
-    {
-    public:
-      typedef typename _Dom::value_type value_type;
-
-      _IBase (const _Dom& __e, const valarray<size_t>& __i)
-      : _M_expr (__e), _M_index (__i) {}
-      
-      value_type
-      operator[] (size_t __i) const
-      { return _M_expr[_M_index[__i]]; }
-      
-      size_t
-      size() const
-      { return _M_index.size(); }
-
-    private:
-      const _Dom&	      _M_expr;
-      const valarray<size_t>& _M_index;
-    };
-
-  template<class _Dom>
-    struct _IClos<_Expr, _Dom>
-    : _IBase<_Dom>
-    {
-      typedef _IBase<_Dom> _Base;
-      typedef typename _Base::value_type value_type;
-      
-      _IClos (const _Dom& __e, const valarray<size_t>& __i)
-      : _Base (__e, __i) {}
-    };
-
-  template<typename _Tp>
-    struct _IClos<_ValArray, _Tp>
-    : _IBase<valarray<_Tp> >
-    {
-      typedef _IBase<valarray<_Tp> > _Base;
-      typedef _Tp value_type;
-      
-      _IClos (const valarray<_Tp>& __a, const valarray<size_t>& __i)
-      : _Base (__a, __i) {}
-    };
-  
-  //
-  // class _Expr
-  //
-  template<class _Clos, typename _Tp>
-    class _Expr
-    {
-    public:
-      typedef _Tp value_type;
-
-      _Expr(const _Clos&);
-
-      const _Clos& operator()() const;
-
-      value_type operator[](size_t) const;
-      valarray<value_type> operator[](slice) const;
-      valarray<value_type> operator[](const gslice&) const;
-      valarray<value_type> operator[](const valarray<bool>&) const;
-      valarray<value_type> operator[](const valarray<size_t>&) const;
-
-      _Expr<_UnClos<__unary_plus, std::_Expr, _Clos>, value_type>
-      operator+() const;
-
-      _Expr<_UnClos<__negate, std::_Expr, _Clos>, value_type>
-      operator-() const;
-
-      _Expr<_UnClos<__bitwise_not, std::_Expr, _Clos>, value_type>
-      operator~() const;
-
-      _Expr<_UnClos<__logical_not, std::_Expr, _Clos>, bool>
-      operator!() const;
-
-      size_t size() const;
-      value_type sum() const;
-
-      valarray<value_type> shift(int) const;
-      valarray<value_type> cshift(int) const;
-
-      value_type min() const;
-      value_type max() const;
-
-      valarray<value_type> apply(value_type (*)(const value_type&)) const;
-      valarray<value_type> apply(value_type (*)(value_type)) const;
-
-    private:
-      const _Clos _M_closure;
-    };
-
-  template<class _Clos, typename _Tp>
-    inline
-    _Expr<_Clos, _Tp>::_Expr(const _Clos& __c) : _M_closure(__c) {}
-
-  template<class _Clos, typename _Tp>
-    inline const _Clos&
-    _Expr<_Clos, _Tp>::operator()() const
-    { return _M_closure; }
-
-  template<class _Clos, typename _Tp>
-    inline _Tp
-    _Expr<_Clos, _Tp>::operator[](size_t __i) const
-    { return _M_closure[__i]; }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::operator[](slice __s) const
-    {
-      valarray<_Tp> __v = valarray<_Tp>(*this)[__s];
-      return __v;
-    }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::operator[](const gslice& __gs) const
-    {
-      valarray<_Tp> __v = valarray<_Tp>(*this)[__gs];
-      return __v;
-    }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::operator[](const valarray<bool>& __m) const
-    {
-      valarray<_Tp> __v = valarray<_Tp>(*this)[__m];
-      return __v;
-    }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::operator[](const valarray<size_t>& __i) const
-    {
-      valarray<_Tp> __v = valarray<_Tp>(*this)[__i];
-      return __v;
-    }
-
-  template<class _Clos, typename _Tp>
-    inline size_t
-    _Expr<_Clos, _Tp>::size() const
-    { return _M_closure.size(); }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::shift(int __n) const
-    {
-      valarray<_Tp> __v = valarray<_Tp>(*this).shift(__n);
-      return __v;
-    }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::cshift(int __n) const
-    {
-      valarray<_Tp> __v = valarray<_Tp>(*this).cshift(__n);
-      return __v;
-    }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::apply(_Tp __f(const _Tp&)) const
-    {
-      valarray<_Tp> __v = valarray<_Tp>(*this).apply(__f);
-      return __v;
-    }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::apply(_Tp __f(_Tp)) const
-    {
-      valarray<_Tp> __v = valarray<_Tp>(*this).apply(__f);
-      return __v;
-    }
-
-  // XXX: replace this with a more robust summation algorithm.
-  template<class _Clos, typename _Tp>
-    inline _Tp
-    _Expr<_Clos, _Tp>::sum() const
-    {
-      size_t __n = _M_closure.size();
-      if (__n == 0)
-	return _Tp();
-      else
-	{
-	  _Tp __s = _M_closure[--__n];
-	  while (__n != 0)
-	    __s += _M_closure[--__n];
-	  return __s;
-        }
-    }
-
-  template<class _Clos, typename _Tp>
-    inline _Tp
-    _Expr<_Clos, _Tp>::min() const
-    { return __valarray_min(_M_closure); }
-
-  template<class _Clos, typename _Tp>
-    inline _Tp
-    _Expr<_Clos, _Tp>::max() const
-    { return __valarray_max(_M_closure); }
-
-  template<class _Dom, typename _Tp>
-    inline _Expr<_UnClos<__logical_not, _Expr, _Dom>, bool>
-    _Expr<_Dom, _Tp>::operator!() const
-    {
-      typedef _UnClos<__logical_not, std::_Expr, _Dom> _Closure;
-      return _Expr<_Closure, bool>(_Closure(this->_M_closure));
-    }
-
-#define _DEFINE_EXPR_UNARY_OPERATOR(_Op, _Name)                           \
-  template<class _Dom, typename _Tp>                                      \
-    inline _Expr<_UnClos<_Name, std::_Expr, _Dom>, _Tp>                   \
-    _Expr<_Dom, _Tp>::operator _Op() const                                \
-    {                                                                     \
-      typedef _UnClos<_Name, std::_Expr, _Dom> _Closure;                  \
-      return _Expr<_Closure, _Tp>(_Closure(this->_M_closure));            \
-    }
-
-    _DEFINE_EXPR_UNARY_OPERATOR(+, __unary_plus)
-    _DEFINE_EXPR_UNARY_OPERATOR(-, __negate)
-    _DEFINE_EXPR_UNARY_OPERATOR(~, __bitwise_not)
-
-#undef _DEFINE_EXPR_UNARY_OPERATOR
-
-#define _DEFINE_EXPR_BINARY_OPERATOR(_Op, _Name)                        \
-  template<class _Dom1, class _Dom2>					\
-    inline _Expr<_BinClos<_Name, _Expr, _Expr, _Dom1, _Dom2>,           \
-           typename __fun<_Name, typename _Dom1::value_type>::result_type> \
-    operator _Op(const _Expr<_Dom1, typename _Dom1::value_type>& __v,   \
-	         const _Expr<_Dom2, typename _Dom2::value_type>& __w)   \
-    {                                                                   \
-      typedef typename _Dom1::value_type _Arg;                          \
-      typedef typename __fun<_Name, _Arg>::result_type _Value;          \
-      typedef _BinClos<_Name, _Expr, _Expr, _Dom1, _Dom2> _Closure;     \
-      return _Expr<_Closure, _Value>(_Closure(__v(), __w()));           \
-    }                                                                   \
-                                                                        \
-  template<class _Dom>                                                  \
-    inline _Expr<_BinClos<_Name, _Expr, _Constant, _Dom,                \
-                          typename _Dom::value_type>,                   \
-             typename __fun<_Name, typename _Dom::value_type>::result_type> \
-    operator _Op(const _Expr<_Dom, typename _Dom::value_type>& __v,     \
-                 const typename _Dom::value_type& __t)                  \
-    {                                                                   \
-      typedef typename _Dom::value_type _Arg;                           \
-      typedef typename __fun<_Name, _Arg>::result_type _Value;          \
-      typedef _BinClos<_Name, _Expr, _Constant, _Dom, _Arg> _Closure;   \
-      return _Expr<_Closure, _Value>(_Closure(__v(), __t));             \
-    }                                                                   \
-                                                                        \
-  template<class _Dom>                                                  \
-    inline _Expr<_BinClos<_Name, _Constant, _Expr,                      \
-                          typename _Dom::value_type, _Dom>,             \
-             typename __fun<_Name, typename _Dom::value_type>::result_type> \
-    operator _Op(const typename _Dom::value_type& __t,                  \
-                 const _Expr<_Dom, typename _Dom::value_type>& __v)     \
-    {                                                                   \
-      typedef typename _Dom::value_type _Arg;                           \
-      typedef typename __fun<_Name, _Arg>::result_type _Value;          \
-      typedef _BinClos<_Name, _Constant, _Expr, _Arg, _Dom> _Closure;   \
-      return _Expr<_Closure, _Value>(_Closure(__t, __v()));             \
-    }                                                                   \
-                                                                        \
-  template<class _Dom>                                                  \
-    inline _Expr<_BinClos<_Name, _Expr, _ValArray,                      \
-                          _Dom, typename _Dom::value_type>,             \
-             typename __fun<_Name, typename _Dom::value_type>::result_type> \
-    operator _Op(const _Expr<_Dom,typename _Dom::value_type>& __e,      \
-                 const valarray<typename _Dom::value_type>& __v)        \
-    {                                                                   \
-      typedef typename _Dom::value_type _Arg;                           \
-      typedef typename __fun<_Name, _Arg>::result_type _Value;          \
-      typedef _BinClos<_Name, _Expr, _ValArray, _Dom, _Arg> _Closure;   \
-      return _Expr<_Closure, _Value>(_Closure(__e(), __v));             \
-    }                                                                   \
-                                                                        \
-  template<class _Dom>                                                  \
-    inline _Expr<_BinClos<_Name, _ValArray, _Expr,                      \
-                 typename _Dom::value_type, _Dom>,                      \
-             typename __fun<_Name, typename _Dom::value_type>::result_type> \
-    operator _Op(const valarray<typename _Dom::value_type>& __v,        \
-                 const _Expr<_Dom, typename _Dom::value_type>& __e)     \
-    {                                                                   \
-      typedef typename _Dom::value_type _Tp;                            \
-      typedef typename __fun<_Name, _Tp>::result_type _Value;           \
-      typedef _BinClos<_Name, _ValArray, _Expr, _Tp, _Dom> _Closure;    \
-      return _Expr<_Closure, _Value>(_Closure(__v, __e ()));            \
-    }
-
-    _DEFINE_EXPR_BINARY_OPERATOR(+, __plus)
-    _DEFINE_EXPR_BINARY_OPERATOR(-, __minus)
-    _DEFINE_EXPR_BINARY_OPERATOR(*, __multiplies)
-    _DEFINE_EXPR_BINARY_OPERATOR(/, __divides)
-    _DEFINE_EXPR_BINARY_OPERATOR(%, __modulus)
-    _DEFINE_EXPR_BINARY_OPERATOR(^, __bitwise_xor)
-    _DEFINE_EXPR_BINARY_OPERATOR(&, __bitwise_and)
-    _DEFINE_EXPR_BINARY_OPERATOR(|, __bitwise_or)
-    _DEFINE_EXPR_BINARY_OPERATOR(<<, __shift_left)
-    _DEFINE_EXPR_BINARY_OPERATOR(>>, __shift_right)
-    _DEFINE_EXPR_BINARY_OPERATOR(&&, __logical_and)
-    _DEFINE_EXPR_BINARY_OPERATOR(||, __logical_or)
-    _DEFINE_EXPR_BINARY_OPERATOR(==, __equal_to)
-    _DEFINE_EXPR_BINARY_OPERATOR(!=, __not_equal_to)
-    _DEFINE_EXPR_BINARY_OPERATOR(<, __less)
-    _DEFINE_EXPR_BINARY_OPERATOR(>, __greater)
-    _DEFINE_EXPR_BINARY_OPERATOR(<=, __less_equal)
-    _DEFINE_EXPR_BINARY_OPERATOR(>=, __greater_equal)
-
-#undef _DEFINE_EXPR_BINARY_OPERATOR
-
-#define _DEFINE_EXPR_UNARY_FUNCTION(_Name, _UName)                       \
-  template<class _Dom>                                                   \
-    inline _Expr<_UnClos<_UName, _Expr, _Dom>,                           \
-                 typename _Dom::value_type>                              \
-    _Name(const _Expr<_Dom, typename _Dom::value_type>& __e)             \
-    {                                                                    \
-      typedef typename _Dom::value_type _Tp;                             \
-      typedef _UnClos<_UName, _Expr, _Dom> _Closure;                     \
-      return _Expr<_Closure, _Tp>(_Closure(__e()));                      \
-    }                                                                    \
-                                                                         \
-  template<typename _Tp>                                                 \
-    inline _Expr<_UnClos<_UName, _ValArray, _Tp>, _Tp>                   \
-    _Name(const valarray<_Tp>& __v)                                      \
-    {                                                                    \
-      typedef _UnClos<_UName, _ValArray, _Tp> _Closure;                  \
-      return _Expr<_Closure, _Tp>(_Closure(__v));                        \
-    }
-
-    _DEFINE_EXPR_UNARY_FUNCTION(abs, _Abs)
-    _DEFINE_EXPR_UNARY_FUNCTION(cos, _Cos)
-    _DEFINE_EXPR_UNARY_FUNCTION(acos, _Acos)
-    _DEFINE_EXPR_UNARY_FUNCTION(cosh, _Cosh)
-    _DEFINE_EXPR_UNARY_FUNCTION(sin, _Sin)
-    _DEFINE_EXPR_UNARY_FUNCTION(asin, _Asin)
-    _DEFINE_EXPR_UNARY_FUNCTION(sinh, _Sinh)
-    _DEFINE_EXPR_UNARY_FUNCTION(tan, _Tan)
-    _DEFINE_EXPR_UNARY_FUNCTION(tanh, _Tanh)
-    _DEFINE_EXPR_UNARY_FUNCTION(atan, _Atan)
-    _DEFINE_EXPR_UNARY_FUNCTION(exp, _Exp)
-    _DEFINE_EXPR_UNARY_FUNCTION(log, _Log)
-    _DEFINE_EXPR_UNARY_FUNCTION(log10, _Log10)
-    _DEFINE_EXPR_UNARY_FUNCTION(sqrt, _Sqrt)
-
-#undef _DEFINE_EXPR_UNARY_FUNCTION
-
-#define _DEFINE_EXPR_BINARY_FUNCTION(_Fun, _UFun)		       \
-  template<class _Dom1, class _Dom2>                                   \
-    inline _Expr<_BinClos<_UFun, _Expr, _Expr, _Dom1, _Dom2>,          \
-		 typename _Dom1::value_type>                           \
-    _Fun(const _Expr<_Dom1, typename _Dom1::value_type>& __e1,         \
-	 const _Expr<_Dom2, typename _Dom2::value_type>& __e2)	       \
-    {                                                                  \
-      typedef typename _Dom1::value_type _Tp;                          \
-      typedef _BinClos<_UFun, _Expr, _Expr, _Dom1, _Dom2> _Closure;    \
-      return _Expr<_Closure, _Tp>(_Closure(__e1(), __e2()));           \
-    }                                                                  \
-                                                                       \
-  template<class _Dom>                                                 \
-    inline _Expr<_BinClos<_UFun, _Expr, _ValArray, _Dom,               \
-			  typename _Dom::value_type>,                  \
-		 typename _Dom::value_type>                            \
-    _Fun(const _Expr<_Dom, typename _Dom::value_type>& __e,            \
-	 const valarray<typename _Dom::value_type>& __v)               \
-    {                                                                  \
-      typedef typename _Dom::value_type _Tp;                           \
-      typedef _BinClos<_UFun, _Expr, _ValArray, _Dom, _Tp> _Closure;   \
-      return _Expr<_Closure, _Tp>(_Closure(__e(), __v));               \
-    }                                                                  \
-                                                                       \
-  template<class _Dom>                                                 \
-    inline _Expr<_BinClos<_UFun, _ValArray, _Expr,                     \
-			  typename _Dom::value_type, _Dom>,            \
-		 typename _Dom::value_type>                            \
-    _Fun(const valarray<typename _Dom::valarray>& __v,                 \
-	 const _Expr<_Dom, typename _Dom::value_type>& __e)            \
-    {                                                                  \
-      typedef typename _Dom::value_type _Tp;                           \
-      typedef _BinClos<_UFun, _ValArray, _Expr, _Tp, _Dom> _Closure;   \
-      return _Expr<_Closure, _Tp>(_Closure(__v, __e()));               \
-    }                                                                  \
-                                                                       \
-  template<class _Dom>                                                 \
-    inline _Expr<_BinClos<_UFun, _Expr, _Constant, _Dom,               \
-			  typename _Dom::value_type>,                  \
-		 typename _Dom::value_type>                            \
-    _Fun(const _Expr<_Dom, typename _Dom::value_type>& __e,            \
-	 const typename _Dom::value_type& __t)                         \
-    {                                                                  \
-      typedef typename _Dom::value_type _Tp;                           \
-      typedef _BinClos<_UFun, _Expr, _Constant, _Dom, _Tp> _Closure;   \
-      return _Expr<_Closure, _Tp>(_Closure(__e(), __t));               \
-    }                                                                  \
-                                                                       \
-  template<class _Dom>                                                 \
-    inline _Expr<_BinClos<_UFun, _Constant, _Expr,                     \
-			  typename _Dom::value_type, _Dom>,            \
-		 typename _Dom::value_type>                            \
-    _Fun(const typename _Dom::value_type& __t,                         \
-	 const _Expr<_Dom, typename _Dom::value_type>& __e)            \
-    {                                                                  \
-      typedef typename _Dom::value_type _Tp;                           \
-      typedef _BinClos<_UFun, _Constant, _Expr, _Tp, _Dom> _Closure;   \
-      return _Expr<_Closure, _Tp>(_Closure(__t, __e()));               \
-    }                                                                  \
-                                                                       \
-  template<typename _Tp>                                               \
-    inline _Expr<_BinClos<_UFun, _ValArray, _ValArray, _Tp, _Tp>, _Tp> \
-    _Fun(const valarray<_Tp>& __v, const valarray<_Tp>& __w)           \
-    {                                                                  \
-      typedef _BinClos<_UFun, _ValArray, _ValArray, _Tp, _Tp> _Closure;\
-      return _Expr<_Closure, _Tp>(_Closure(__v, __w));                 \
-    }                                                                  \
-                                                                       \
-  template<typename _Tp>                                               \
-    inline _Expr<_BinClos<_UFun, _ValArray, _Constant, _Tp, _Tp>, _Tp> \
-    _Fun(const valarray<_Tp>& __v, const _Tp& __t)                     \
-    {                                                                  \
-      typedef _BinClos<_UFun, _ValArray, _Constant, _Tp, _Tp> _Closure;\
-      return _Expr<_Closure, _Tp>(_Closure(__v, __t));                 \
-    }                                                                  \
-								       \
-  template<typename _Tp>                                               \
-    inline _Expr<_BinClos<_UFun, _Constant, _ValArray, _Tp, _Tp>, _Tp> \
-    _Fun(const _Tp& __t, const valarray<_Tp>& __v)                     \
-    {                                                                  \
-      typedef _BinClos<_UFun, _Constant, _ValArray, _Tp, _Tp> _Closure;\
-      return _Expr<_Closure, _Tp>(_Closure(__t, __v));                 \
-    }
-
-_DEFINE_EXPR_BINARY_FUNCTION(atan2, _Atan2)
-_DEFINE_EXPR_BINARY_FUNCTION(pow, _Pow)
-
-#undef _DEFINE_EXPR_BINARY_FUNCTION
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _CPP_VALARRAY_AFTER_H */
diff --git a/openflow/usr/include/c++/5/bits/valarray_array.h b/openflow/usr/include/c++/5/bits/valarray_array.h
deleted file mode 100644
index 307dbf8..0000000
--- a/openflow/usr/include/c++/5/bits/valarray_array.h
+++ /dev/null
@@ -1,693 +0,0 @@
-// The template and inlines for the -*- C++ -*- internal _Array helper class.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/valarray_array.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{valarray}
- */
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-#ifndef _VALARRAY_ARRAY_H
-#define _VALARRAY_ARRAY_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/cpp_type_traits.h>
-#include <cstdlib>
-#include <new>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  //
-  // Helper functions on raw pointers
-  //
-
-  // We get memory by the old fashion way
-  inline void*
-  __valarray_get_memory(size_t __n)
-  { return operator new(__n); }
-
-  template<typename _Tp>
-    inline _Tp*__restrict__
-    __valarray_get_storage(size_t __n)
-    {
-      return static_cast<_Tp*__restrict__>
-	(std::__valarray_get_memory(__n * sizeof(_Tp)));
-    }
-
-  // Return memory to the system
-  inline void
-  __valarray_release_memory(void* __p)
-  { operator delete(__p); }
-
-  // Turn a raw-memory into an array of _Tp filled with _Tp()
-  // This is required in 'valarray<T> v(n);'
-  template<typename _Tp, bool>
-    struct _Array_default_ctor
-    {
-      // Please note that this isn't exception safe.  But
-      // valarrays aren't required to be exception safe.
-      inline static void
-      _S_do_it(_Tp* __b, _Tp* __e)
-      {
-	while (__b != __e)
-	  new(__b++) _Tp();
-      }
-    };
-
-  template<typename _Tp>
-    struct _Array_default_ctor<_Tp, true>
-    {
-      // For fundamental types, it suffices to say 'memset()'
-      inline static void
-      _S_do_it(_Tp* __b, _Tp* __e)
-      { __builtin_memset(__b, 0, (__e - __b) * sizeof(_Tp)); }
-    };
-
-  template<typename _Tp>
-    inline void
-    __valarray_default_construct(_Tp* __b, _Tp* __e)
-    {
-      _Array_default_ctor<_Tp, __is_scalar<_Tp>::__value>::_S_do_it(__b, __e);
-    }
-
-  // Turn a raw-memory into an array of _Tp filled with __t
-  // This is the required in valarray<T> v(n, t).  Also
-  // used in valarray<>::resize().
-  template<typename _Tp, bool>
-    struct _Array_init_ctor
-    {
-      // Please note that this isn't exception safe.  But
-      // valarrays aren't required to be exception safe.
-      inline static void
-      _S_do_it(_Tp* __b, _Tp* __e, const _Tp __t)
-      {
-	while (__b != __e)
-	  new(__b++) _Tp(__t);
-      }
-    };
-
-  template<typename _Tp>
-    struct _Array_init_ctor<_Tp, true>
-    {
-      inline static void
-      _S_do_it(_Tp* __b, _Tp* __e, const _Tp __t)
-      {
-	while (__b != __e)
-	  *__b++ = __t;
-      }
-    };
-
-  template<typename _Tp>
-    inline void
-    __valarray_fill_construct(_Tp* __b, _Tp* __e, const _Tp __t)
-    {
-      _Array_init_ctor<_Tp, __is_trivial(_Tp)>::_S_do_it(__b, __e, __t);
-    }
-
-  //
-  // copy-construct raw array [__o, *) from plain array [__b, __e)
-  // We can't just say 'memcpy()'
-  //
-  template<typename _Tp, bool>
-    struct _Array_copy_ctor
-    {
-      // Please note that this isn't exception safe.  But
-      // valarrays aren't required to be exception safe.
-      inline static void
-      _S_do_it(const _Tp* __b, const _Tp* __e, _Tp* __restrict__ __o)
-      {
-	while (__b != __e)
-	  new(__o++) _Tp(*__b++);
-      }
-    };
-
-  template<typename _Tp>
-    struct _Array_copy_ctor<_Tp, true>
-    {
-      inline static void
-      _S_do_it(const _Tp* __b, const _Tp* __e, _Tp* __restrict__ __o)
-      { __builtin_memcpy(__o, __b, (__e - __b) * sizeof(_Tp)); }
-    };
-
-  template<typename _Tp>
-    inline void
-    __valarray_copy_construct(const _Tp* __b, const _Tp* __e,
-			      _Tp* __restrict__ __o)
-    {
-      _Array_copy_ctor<_Tp, __is_trivial(_Tp)>::_S_do_it(__b, __e, __o);
-    }
-
-  // copy-construct raw array [__o, *) from strided array __a[<__n : __s>]
-  template<typename _Tp>
-    inline void
-    __valarray_copy_construct (const _Tp* __restrict__ __a, size_t __n,
-			       size_t __s, _Tp* __restrict__ __o)
-    {
-      if (__is_trivial(_Tp))
-	while (__n--)
-	  {
-	    *__o++ = *__a;
-	    __a += __s;
-	  }
-      else
-	while (__n--)
-	  {
-	    new(__o++) _Tp(*__a);
-	    __a += __s;
-	  }
-    }
-
-  // copy-construct raw array [__o, *) from indexed array __a[__i[<__n>]]
-  template<typename _Tp>
-    inline void
-    __valarray_copy_construct (const _Tp* __restrict__ __a,
-			       const size_t* __restrict__ __i,
-			       _Tp* __restrict__ __o, size_t __n)
-    {
-      if (__is_trivial(_Tp))
-	while (__n--)
-	  *__o++ = __a[*__i++];
-      else
-	while (__n--)
-	  new (__o++) _Tp(__a[*__i++]);
-    }
-
-  // Do the necessary cleanup when we're done with arrays.
-  template<typename _Tp>
-    inline void
-    __valarray_destroy_elements(_Tp* __b, _Tp* __e)
-    {
-      if (!__is_trivial(_Tp))
-	while (__b != __e)
-	  {
-	    __b->~_Tp();
-	    ++__b;
-	  }
-    }
-
-  // Fill a plain array __a[<__n>] with __t
-  template<typename _Tp>
-    inline void
-    __valarray_fill(_Tp* __restrict__ __a, size_t __n, const _Tp& __t)
-    {
-      while (__n--)
-	*__a++ = __t;
-    }
-  
-  // fill strided array __a[<__n-1 : __s>] with __t
-  template<typename _Tp>
-    inline void
-    __valarray_fill(_Tp* __restrict__ __a, size_t __n,
-		    size_t __s, const _Tp& __t)
-    { 
-      for (size_t __i = 0; __i < __n; ++__i, __a += __s)
-	*__a = __t;
-    }
-
-  // fill indirect array __a[__i[<__n>]] with __i
-  template<typename _Tp>
-    inline void
-    __valarray_fill(_Tp* __restrict__ __a, const size_t* __restrict__ __i,
-		    size_t __n, const _Tp& __t)
-    {
-      for (size_t __j = 0; __j < __n; ++__j, ++__i)
-	__a[*__i] = __t;
-    }
-  
-  // copy plain array __a[<__n>] in __b[<__n>]
-  // For non-fundamental types, it is wrong to say 'memcpy()'
-  template<typename _Tp, bool>
-    struct _Array_copier
-    {
-      inline static void
-      _S_do_it(const _Tp* __restrict__ __a, size_t __n, _Tp* __restrict__ __b)
-      {
-	while(__n--)
-	  *__b++ = *__a++;
-      }
-    };
-
-  template<typename _Tp>
-    struct _Array_copier<_Tp, true>
-    {
-      inline static void
-      _S_do_it(const _Tp* __restrict__ __a, size_t __n, _Tp* __restrict__ __b)
-      { __builtin_memcpy(__b, __a, __n * sizeof (_Tp)); }
-    };
-
-  // Copy a plain array __a[<__n>] into a play array __b[<>]
-  template<typename _Tp>
-    inline void
-    __valarray_copy(const _Tp* __restrict__ __a, size_t __n,
-		    _Tp* __restrict__ __b)
-    {
-      _Array_copier<_Tp, __is_trivial(_Tp)>::_S_do_it(__a, __n, __b);
-    }
-
-  // Copy strided array __a[<__n : __s>] in plain __b[<__n>]
-  template<typename _Tp>
-    inline void
-    __valarray_copy(const _Tp* __restrict__ __a, size_t __n, size_t __s,
-		    _Tp* __restrict__ __b)
-    {
-      for (size_t __i = 0; __i < __n; ++__i, ++__b, __a += __s)
-	*__b = *__a;
-    }
-
-  // Copy a plain array  __a[<__n>] into a strided array __b[<__n : __s>]
-  template<typename _Tp>
-    inline void
-    __valarray_copy(const _Tp* __restrict__ __a, _Tp* __restrict__ __b,
-		    size_t __n, size_t __s)
-    {
-      for (size_t __i = 0; __i < __n; ++__i, ++__a, __b += __s)
-	*__b = *__a;
-    }
-
-  // Copy strided array __src[<__n : __s1>] into another
-  // strided array __dst[< : __s2>].  Their sizes must match.
-  template<typename _Tp>
-    inline void
-    __valarray_copy(const _Tp* __restrict__ __src, size_t __n, size_t __s1,
-		    _Tp* __restrict__ __dst, size_t __s2)
-    {
-      for (size_t __i = 0; __i < __n; ++__i)
-	__dst[__i * __s2] = __src[__i * __s1];
-    }
-
-  // Copy an indexed array __a[__i[<__n>]] in plain array __b[<__n>]
-  template<typename _Tp>
-    inline void
-    __valarray_copy(const _Tp* __restrict__ __a,
-		    const size_t* __restrict__ __i,
-		    _Tp* __restrict__ __b, size_t __n)
-    {
-      for (size_t __j = 0; __j < __n; ++__j, ++__b, ++__i)
-	*__b = __a[*__i];
-    }
-
-  // Copy a plain array __a[<__n>] in an indexed array __b[__i[<__n>]]
-  template<typename _Tp>
-    inline void
-    __valarray_copy(const _Tp* __restrict__ __a, size_t __n,
-		    _Tp* __restrict__ __b, const size_t* __restrict__ __i)
-    {
-      for (size_t __j = 0; __j < __n; ++__j, ++__a, ++__i)
-	__b[*__i] = *__a;
-    }
-
-  // Copy the __n first elements of an indexed array __src[<__i>] into
-  // another indexed array __dst[<__j>].
-  template<typename _Tp>
-    inline void
-    __valarray_copy(const _Tp* __restrict__ __src, size_t __n,
-		    const size_t* __restrict__ __i,
-		    _Tp* __restrict__ __dst, const size_t* __restrict__ __j)
-    {
-      for (size_t __k = 0; __k < __n; ++__k)
-	__dst[*__j++] = __src[*__i++];
-    }
-
-  //
-  // Compute the sum of elements in range [__f, __l)
-  // This is a naive algorithm.  It suffers from cancelling.
-  // In the future try to specialize
-  // for _Tp = float, double, long double using a more accurate
-  // algorithm.
-  //
-  template<typename _Tp>
-    inline _Tp
-    __valarray_sum(const _Tp* __f, const _Tp* __l)
-    {
-      _Tp __r = _Tp();
-      while (__f != __l)
-	__r += *__f++;
-      return __r;
-    }
-
-  // Compute the product of all elements in range [__f, __l)
-  template<typename _Tp>
-    inline _Tp
-    __valarray_product(const _Tp* __f, const _Tp* __l)
-    {
-      _Tp __r = _Tp(1);
-      while (__f != __l)
-	__r = __r * *__f++;
-      return __r;
-    }
-
-  // Compute the min/max of an array-expression
-  template<typename _Ta>
-    inline typename _Ta::value_type
-    __valarray_min(const _Ta& __a)
-    {
-      size_t __s = __a.size();
-      typedef typename _Ta::value_type _Value_type;
-      _Value_type __r = __s == 0 ? _Value_type() : __a[0];
-      for (size_t __i = 1; __i < __s; ++__i)
-	{
-	  _Value_type __t = __a[__i];
-	  if (__t < __r)
-	    __r = __t;
-	}
-      return __r;
-    }
-
-  template<typename _Ta>
-    inline typename _Ta::value_type
-    __valarray_max(const _Ta& __a)
-    {
-      size_t __s = __a.size();
-      typedef typename _Ta::value_type _Value_type;
-      _Value_type __r = __s == 0 ? _Value_type() : __a[0];
-      for (size_t __i = 1; __i < __s; ++__i)
-	{
-	  _Value_type __t = __a[__i];
-	  if (__t > __r)
-	    __r = __t;
-	}
-      return __r;
-    }
-
-  //
-  // Helper class _Array, first layer of valarray abstraction.
-  // All operations on valarray should be forwarded to this class
-  // whenever possible. -- gdr
-  //
-
-  template<typename _Tp>
-    struct _Array
-    {
-      explicit _Array(size_t);
-      explicit _Array(_Tp* const __restrict__);
-      explicit _Array(const valarray<_Tp>&);
-      _Array(const _Tp* __restrict__, size_t);
-      
-      _Tp* begin() const;
-      
-      _Tp* const __restrict__ _M_data;
-    };
-
-
-  // Copy-construct plain array __b[<__n>] from indexed array __a[__i[<__n>]]
-  template<typename _Tp>
-    inline void
-    __valarray_copy_construct(_Array<_Tp> __a, _Array<size_t> __i,
-			      _Array<_Tp> __b, size_t __n)
-    { std::__valarray_copy_construct(__a._M_data, __i._M_data,
-				     __b._M_data, __n); }
-
-  // Copy-construct plain array __b[<__n>] from strided array __a[<__n : __s>]
-  template<typename _Tp>
-    inline void
-    __valarray_copy_construct(_Array<_Tp> __a, size_t __n, size_t __s,
-			      _Array<_Tp> __b)
-    { std::__valarray_copy_construct(__a._M_data, __n, __s, __b._M_data); }
-
-  template<typename _Tp>
-    inline void
-    __valarray_fill (_Array<_Tp> __a, size_t __n, const _Tp& __t)
-    { std::__valarray_fill(__a._M_data, __n, __t); }
-
-  template<typename _Tp>
-    inline void
-    __valarray_fill(_Array<_Tp> __a, size_t __n, size_t __s, const _Tp& __t)
-    { std::__valarray_fill(__a._M_data, __n, __s, __t); }
-
-  template<typename _Tp>
-    inline void
-    __valarray_fill(_Array<_Tp> __a, _Array<size_t> __i,
-		    size_t __n, const _Tp& __t)
-    { std::__valarray_fill(__a._M_data, __i._M_data, __n, __t); }
-
-  // Copy a plain array __a[<__n>] into a play array __b[<>]
-  template<typename _Tp>
-    inline void
-    __valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b)
-    { std::__valarray_copy(__a._M_data, __n, __b._M_data); }
-
-  // Copy strided array __a[<__n : __s>] in plain __b[<__n>]
-  template<typename _Tp>
-    inline void
-    __valarray_copy(_Array<_Tp> __a, size_t __n, size_t __s, _Array<_Tp> __b)
-    { std::__valarray_copy(__a._M_data, __n, __s, __b._M_data); }
-
-  // Copy a plain array  __a[<__n>] into a strided array __b[<__n : __s>]
-  template<typename _Tp>
-    inline void
-    __valarray_copy(_Array<_Tp> __a, _Array<_Tp> __b, size_t __n, size_t __s)
-    { __valarray_copy(__a._M_data, __b._M_data, __n, __s); }
-
-  // Copy strided array __src[<__n : __s1>] into another
-  // strided array __dst[< : __s2>].  Their sizes must match.
-  template<typename _Tp>
-    inline void
-    __valarray_copy(_Array<_Tp> __a, size_t __n, size_t __s1,
-                    _Array<_Tp> __b, size_t __s2)
-    { std::__valarray_copy(__a._M_data, __n, __s1, __b._M_data, __s2); }
-
-  // Copy an indexed array __a[__i[<__n>]] in plain array __b[<__n>]
-  template<typename _Tp>
-    inline void
-    __valarray_copy(_Array<_Tp> __a, _Array<size_t> __i,
-		    _Array<_Tp> __b, size_t __n)
-    { std::__valarray_copy(__a._M_data, __i._M_data, __b._M_data, __n); }
-
-  // Copy a plain array __a[<__n>] in an indexed array __b[__i[<__n>]]
-  template<typename _Tp>
-    inline void
-    __valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b,
-		    _Array<size_t> __i)
-    { std::__valarray_copy(__a._M_data, __n, __b._M_data, __i._M_data); }
-
-  // Copy the __n first elements of an indexed array __src[<__i>] into
-  // another indexed array __dst[<__j>].
-  template<typename _Tp>
-    inline void
-    __valarray_copy(_Array<_Tp> __src, size_t __n, _Array<size_t> __i,
-                    _Array<_Tp> __dst, _Array<size_t> __j)
-    {
-      std::__valarray_copy(__src._M_data, __n, __i._M_data,
-		    __dst._M_data, __j._M_data);
-    }
-
-  template<typename _Tp>
-    inline
-    _Array<_Tp>::_Array(size_t __n)
-    : _M_data(__valarray_get_storage<_Tp>(__n))
-    { std::__valarray_default_construct(_M_data, _M_data + __n); }
-
-  template<typename _Tp>
-    inline
-    _Array<_Tp>::_Array(_Tp* const __restrict__ __p)
-    : _M_data (__p) {}
-
-  template<typename _Tp>
-    inline
-    _Array<_Tp>::_Array(const valarray<_Tp>& __v)
-    : _M_data (__v._M_data) {}
-
-  template<typename _Tp>
-    inline
-    _Array<_Tp>::_Array(const _Tp* __restrict__ __b, size_t __s)
-    : _M_data(__valarray_get_storage<_Tp>(__s))
-    { std::__valarray_copy_construct(__b, __s, _M_data); }
-
-  template<typename _Tp>
-    inline _Tp*
-    _Array<_Tp>::begin () const
-    { return _M_data; }
-
-#define _DEFINE_ARRAY_FUNCTION(_Op, _Name)				\
-  template<typename _Tp>		        			\
-    inline void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a, size_t __n, const _Tp& __t) \
-    {									\
-      for (_Tp* __p = __a._M_data; __p < __a._M_data + __n; ++__p)	\
-        *__p _Op##= __t;						\
-    }									\
-									\
-  template<typename _Tp>						\
-    inline void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b) \
-    {									\
-      _Tp* __p = __a._M_data;						\
-      for (_Tp* __q = __b._M_data; __q < __b._M_data + __n; ++__p, ++__q) \
-        *__p _Op##= *__q;						\
-    }									\
-									\
-  template<typename _Tp, class _Dom>					\
-    void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a,	        		\
-                             const _Expr<_Dom, _Tp>& __e, size_t __n)	\
-    {									\
-      _Tp* __p(__a._M_data);						\
-      for (size_t __i = 0; __i < __n; ++__i, ++__p)                     \
-        *__p _Op##= __e[__i];                                          	\
-    }									\
-									\
-  template<typename _Tp>						\
-    inline void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a, size_t __n, size_t __s,	\
-	                     _Array<_Tp> __b)				\
-    {									\
-      _Tp* __q(__b._M_data);						\
-      for (_Tp* __p = __a._M_data; __p < __a._M_data + __s * __n;       \
-	   __p += __s, ++__q)                                           \
-        *__p _Op##= *__q;						\
-    }									\
-									\
-  template<typename _Tp>						\
-    inline void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a, _Array<_Tp> __b,		\
-		             size_t __n, size_t __s)			\
-    {									\
-      _Tp* __q(__b._M_data);						\
-      for (_Tp* __p = __a._M_data; __p < __a._M_data + __n;             \
-	   ++__p, __q += __s)                                           \
-        *__p _Op##= *__q;						\
-    }									\
-									\
-  template<typename _Tp, class _Dom>					\
-    void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a, size_t __s,		\
-                             const _Expr<_Dom, _Tp>& __e, size_t __n)	\
-    {									\
-      _Tp* __p(__a._M_data);						\
-      for (size_t __i = 0; __i < __n; ++__i, __p += __s)                \
-        *__p _Op##= __e[__i];                                          	\
-    }									\
-									\
-  template<typename _Tp>						\
-    inline void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a, _Array<size_t> __i,	\
-                             _Array<_Tp> __b, size_t __n)		\
-    {									\
-      _Tp* __q(__b._M_data);						\
-      for (size_t* __j = __i._M_data; __j < __i._M_data + __n;          \
-           ++__j, ++__q)                                                \
-        __a._M_data[*__j] _Op##= *__q;					\
-    }									\
-									\
-  template<typename _Tp>						\
-    inline void					        		\
-    _Array_augmented_##_Name(_Array<_Tp> __a, size_t __n,		\
-                             _Array<_Tp> __b, _Array<size_t> __i)	\
-    {									\
-      _Tp* __p(__a._M_data);						\
-      for (size_t* __j = __i._M_data; __j<__i._M_data + __n;            \
-	   ++__j, ++__p)                                                \
-        *__p _Op##= __b._M_data[*__j];					\
-    }									\
-									\
-  template<typename _Tp, class _Dom>					\
-    void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a, _Array<size_t> __i,	\
-                             const _Expr<_Dom, _Tp>& __e, size_t __n)	\
-    {									\
-      size_t* __j(__i._M_data);	        				\
-      for (size_t __k = 0; __k<__n; ++__k, ++__j)			\
-        __a._M_data[*__j] _Op##= __e[__k];				\
-    }									\
-									\
-  template<typename _Tp>						\
-    void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a, _Array<bool> __m,         \
-                             _Array<_Tp> __b, size_t __n)		\
-    {									\
-      bool* __ok(__m._M_data);						\
-      _Tp* __p(__a._M_data);						\
-      for (_Tp* __q = __b._M_data; __q < __b._M_data + __n;             \
-	   ++__q, ++__ok, ++__p)                                        \
-        {                                                               \
-          while (! *__ok)                                               \
-            {						        	\
-              ++__ok;							\
-              ++__p;							\
-            }								\
-          *__p _Op##= *__q;						\
-        }								\
-    }									\
-									\
-  template<typename _Tp>						\
-    void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a, size_t __n,		\
-                             _Array<_Tp> __b, _Array<bool> __m)   	\
-    {									\
-      bool* __ok(__m._M_data);						\
-      _Tp* __q(__b._M_data);						\
-      for (_Tp* __p = __a._M_data; __p < __a._M_data + __n;             \
-	   ++__p, ++__ok, ++__q)                                        \
-        {                                                               \
-          while (! *__ok)                                               \
-            {					        		\
-              ++__ok;							\
-              ++__q;							\
-            }								\
-          *__p _Op##= *__q;						\
-        }								\
-    }									\
-									\
-  template<typename _Tp, class _Dom>					\
-    void								\
-    _Array_augmented_##_Name(_Array<_Tp> __a, _Array<bool> __m,  	\
-                             const _Expr<_Dom, _Tp>& __e, size_t __n)	\
-    {									\
-      bool* __ok(__m._M_data);						\
-      _Tp* __p(__a._M_data);						\
-      for (size_t __i = 0; __i < __n; ++__i, ++__ok, ++__p)             \
-        {	                                           		\
-          while (! *__ok)                                               \
-            {		         					\
-	      ++__ok;							\
-              ++__p;							\
-            }								\
-          *__p _Op##= __e[__i];						\
-        }								\
-    }
-
-   _DEFINE_ARRAY_FUNCTION(+, __plus)
-   _DEFINE_ARRAY_FUNCTION(-, __minus)
-   _DEFINE_ARRAY_FUNCTION(*, __multiplies)
-   _DEFINE_ARRAY_FUNCTION(/, __divides)
-   _DEFINE_ARRAY_FUNCTION(%, __modulus)
-   _DEFINE_ARRAY_FUNCTION(^, __bitwise_xor)
-   _DEFINE_ARRAY_FUNCTION(|, __bitwise_or)
-   _DEFINE_ARRAY_FUNCTION(&, __bitwise_and)
-   _DEFINE_ARRAY_FUNCTION(<<, __shift_left)
-   _DEFINE_ARRAY_FUNCTION(>>, __shift_right)
-
-#undef _DEFINE_ARRAY_FUNCTION
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-# include <bits/valarray_array.tcc>
-
-#endif /* _ARRAY_H */
diff --git a/openflow/usr/include/c++/5/bits/valarray_array.tcc b/openflow/usr/include/c++/5/bits/valarray_array.tcc
deleted file mode 100644
index 7a2d285..0000000
--- a/openflow/usr/include/c++/5/bits/valarray_array.tcc
+++ /dev/null
@@ -1,244 +0,0 @@
-// The template and inlines for the -*- C++ -*- internal _Array helper class.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/valarray_array.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{valarray}
- */
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-#ifndef _VALARRAY_ARRAY_TCC
-#define _VALARRAY_ARRAY_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Tp>
-    void
-    __valarray_fill(_Array<_Tp> __a, size_t __n, _Array<bool> __m,
-		    const _Tp& __t)
-    {
-      _Tp* __p = __a._M_data;
-      bool* __ok (__m._M_data);
-      for (size_t __i=0; __i < __n; ++__i, ++__ok, ++__p)
-	{
-	  while (!*__ok)
-	  {
-	    ++__ok;
-	    ++__p;
-	  }
-	  *__p = __t;
-	}
-    }
-
-  // Copy n elements of a into consecutive elements of b.  When m is
-  // false, the corresponding element of a is skipped.  m must contain
-  // at least n true elements.  a must contain at least n elements and
-  // enough elements to match up with m through the nth true element
-  // of m.  I.e.  if n is 10, m has 15 elements with 5 false followed
-  // by 10 true, a must have 15 elements.
-  template<typename _Tp>
-    void
-    __valarray_copy(_Array<_Tp> __a, _Array<bool> __m, _Array<_Tp> __b,
-		    size_t __n)
-    {
-      _Tp* __p (__a._M_data);
-      bool* __ok (__m._M_data);
-      for (_Tp* __q = __b._M_data; __q < __b._M_data + __n;
-	   ++__q, ++__ok, ++__p)
-	{
-	  while (! *__ok)
-	    {
-	      ++__ok;
-	      ++__p;
-	    }
-	  *__q = *__p;
-	}
-    }
-
-  // Copy n consecutive elements from a into elements of b.  Elements
-  // of b are skipped if the corresponding element of m is false.  m
-  // must contain at least n true elements.  b must have at least as
-  // many elements as the index of the nth true element of m.  I.e. if
-  // m has 15 elements with 5 false followed by 10 true, b must have
-  // at least 15 elements.
-  template<typename _Tp>
-    void
-    __valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b,
-		    _Array<bool> __m)
-    {
-      _Tp* __q (__b._M_data);
-      bool* __ok (__m._M_data);
-      for (_Tp* __p = __a._M_data; __p < __a._M_data+__n;
-	   ++__p, ++__ok, ++__q)
-	{
-	  while (! *__ok)
-	    {
-	      ++__ok;
-	      ++__q;
-	    }
-	  *__q = *__p;
-	}
-    }
-
-  // Copy n elements from a into elements of b.  Elements of a are
-  // skipped if the corresponding element of m is false.  Elements of
-  // b are skipped if the corresponding element of k is false.  m and
-  // k must contain at least n true elements.  a and b must have at
-  // least as many elements as the index of the nth true element of m.
-  template<typename _Tp>
-    void
-    __valarray_copy(_Array<_Tp> __a, _Array<bool> __m, size_t __n,
-		    _Array<_Tp> __b, _Array<bool> __k)
-    {
-      _Tp* __p (__a._M_data);
-      _Tp* __q (__b._M_data);
-      bool* __srcok (__m._M_data);
-      bool* __dstok (__k._M_data);
-      for (size_t __i = 0; __i < __n;
-	   ++__srcok, ++__p, ++__dstok, ++__q, ++__i)
-	{
-	  while (! *__srcok)
-	    {
-	      ++__srcok;
-	      ++__p;
-	    }
-	  while (! *__dstok) 
-	    {
-	      ++__dstok;
-	      ++__q;
-	    }
-	  *__q = *__p;
-	}
-    }
-
-  // Copy n consecutive elements of e into consecutive elements of a.
-  // I.e. a[i] = e[i].
-  template<typename _Tp, class _Dom>
-    void
-    __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n, _Array<_Tp> __a)
-    {
-      _Tp* __p (__a._M_data);
-      for (size_t __i = 0; __i < __n; ++__i, ++__p)
-	*__p = __e[__i];
-    }
-
-  // Copy n consecutive elements of e into elements of a using stride
-  // s.  I.e., a[0] = e[0], a[s] = e[1], a[2*s] = e[2].
-  template<typename _Tp, class _Dom>
-    void
-    __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n,
-		     _Array<_Tp> __a, size_t __s)
-    {
-      _Tp* __p (__a._M_data);
-      for (size_t __i = 0; __i < __n; ++__i, __p += __s)
-	*__p = __e[__i];
-    }
-
-  // Copy n consecutive elements of e into elements of a indexed by
-  // contents of i.  I.e., a[i[0]] = e[0].
-  template<typename _Tp, class _Dom>
-    void
-    __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n,
-		    _Array<_Tp> __a, _Array<size_t> __i)
-    {
-      size_t* __j (__i._M_data);
-      for (size_t __k = 0; __k < __n; ++__k, ++__j)
-	__a._M_data[*__j] = __e[__k];
-    }
-
-  // Copy n elements of e indexed by contents of f into elements of a
-  // indexed by contents of i.  I.e., a[i[0]] = e[f[0]].
-  template<typename _Tp>
-    void
-    __valarray_copy(_Array<_Tp> __e, _Array<size_t> __f,
-		    size_t __n, 
-		    _Array<_Tp> __a, _Array<size_t> __i)
-    {
-      size_t* __g (__f._M_data);
-      size_t* __j (__i._M_data);
-      for (size_t __k = 0; __k < __n; ++__k, ++__j, ++__g) 
-	__a._M_data[*__j] = __e._M_data[*__g];
-    }
-
-  // Copy n consecutive elements of e into elements of a.  Elements of
-  // a are skipped if the corresponding element of m is false.  m must
-  // have at least n true elements and a must have at least as many
-  // elements as the index of the nth true element of m.  I.e. if m
-  // has 5 false followed by 10 true elements and n == 10, a must have
-  // at least 15 elements.
-  template<typename _Tp, class _Dom>
-    void
-    __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n,
-		    _Array<_Tp> __a, _Array<bool> __m)
-    {
-      bool* __ok (__m._M_data);
-      _Tp* __p (__a._M_data);
-      for (size_t __i = 0; __i < __n; ++__i, ++__ok, ++__p)
-	{
-	  while (! *__ok)
-	    {
-	      ++__ok;
-	      ++__p;
-	    }
-	  *__p = __e[__i];
-	}
-    }
-
-
-  template<typename _Tp, class _Dom>
-    void
-    __valarray_copy_construct(const _Expr<_Dom, _Tp>& __e, size_t __n,
-			      _Array<_Tp> __a)
-    {
-      _Tp* __p (__a._M_data);
-      for (size_t __i = 0; __i < __n; ++__i, ++__p)
-	new (__p) _Tp(__e[__i]);
-    }
-
-
-  template<typename _Tp>
-    void
-    __valarray_copy_construct(_Array<_Tp> __a, _Array<bool> __m,
-			      _Array<_Tp> __b, size_t __n)
-    {
-      _Tp* __p (__a._M_data);
-      bool* __ok (__m._M_data);
-      for (_Tp* __q = __b._M_data; __q < __b._M_data+__n; ++__q, ++__ok, ++__p)
-	{
-	  while (! *__ok)
-	    {
-	      ++__ok;
-	      ++__p;
-	    }
-	  new (__q) _Tp(*__p);
-	}
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _VALARRAY_ARRAY_TCC */
diff --git a/openflow/usr/include/c++/5/bits/valarray_before.h b/openflow/usr/include/c++/5/bits/valarray_before.h
deleted file mode 100644
index 498c573..0000000
--- a/openflow/usr/include/c++/5/bits/valarray_before.h
+++ /dev/null
@@ -1,743 +0,0 @@
-// The template and inlines for the -*- C++ -*- internal _Meta class.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file bits/valarray_before.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{valarray}
- */
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@cmla.ens-cachan.fr>
-
-#ifndef _VALARRAY_BEFORE_H
-#define _VALARRAY_BEFORE_H 1
-
-#pragma GCC system_header
-
-#include <bits/slice_array.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  //
-  // Implementing a loosened valarray return value is tricky.
-  // First we need to meet 26.3.1/3: we should not add more than
-  // two levels of template nesting. Therefore we resort to template
-  // template to "flatten" loosened return value types.
-  // At some point we use partial specialization to remove one level
-  // template nesting due to _Expr<>
-  //
-
-  // This class is NOT defined. It doesn't need to.
-  template<typename _Tp1, typename _Tp2> class _Constant;
-
-  // Implementations of unary functions applied to valarray<>s.
-  // I use hard-coded object functions here instead of a generic
-  // approach like pointers to function:
-  //    1) correctness: some functions take references, others values.
-  //       we can't deduce the correct type afterwards.
-  //    2) efficiency -- object functions can be easily inlined
-  //    3) be Koenig-lookup-friendly
-
-  struct _Abs
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return abs(__t); }
-  };
-
-  struct _Cos
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return cos(__t); }
-  };
-
-  struct _Acos
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return acos(__t); }
-  };
-
-  struct _Cosh
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return cosh(__t); }
-  };
-
-  struct _Sin
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return sin(__t); }
-  };
-
-  struct _Asin
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return asin(__t); }
-  };
-
-  struct _Sinh
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return sinh(__t); }
-  };
-
-  struct _Tan
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return tan(__t); }
-  };
-
-  struct _Atan
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return atan(__t); }
-  };
-
-  struct _Tanh
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return tanh(__t); }
-  };
-
-  struct _Exp
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return exp(__t); }
-  };
-
-  struct _Log
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return log(__t); }
-  };
-
-  struct _Log10
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return log10(__t); }
-  };
-
-  struct _Sqrt
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return sqrt(__t); }
-  };
-
-  // In the past, we used to tailor operator applications semantics
-  // to the specialization of standard function objects (i.e. plus<>, etc.)
-  // That is incorrect.  Therefore we provide our own surrogates.
-
-  struct __unary_plus
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return +__t; }
-  };
-
-  struct __negate
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return -__t; }
-  };
-
-  struct __bitwise_not
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const
-      { return ~__t; }
-  };
-
-  struct __plus
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x + __y; }
-  };
-
-  struct __minus
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x - __y; }
-  };
-
-  struct __multiplies
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x * __y; }
-  };
-
-  struct __divides
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x / __y; }
-  };
-
-  struct __modulus
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x % __y; }
-  };
-
-  struct __bitwise_xor
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x ^ __y; }
-  };
-
-  struct __bitwise_and
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x & __y; }
-  };
-
-  struct __bitwise_or
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x | __y; }
-  };
-
-  struct __shift_left
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x << __y; }
-  };
-
-  struct __shift_right
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x >> __y; }
-  };
-
-  struct __logical_and
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x && __y; }
-  };
-
-  struct __logical_or
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x || __y; }
-  };
-
-  struct __logical_not
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x) const
-      { return !__x; }
-  };
-
-  struct __equal_to
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x == __y; }
-  };
-
-  struct __not_equal_to
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x != __y; }
-  };
-
-  struct __less
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x < __y; }
-  };
-
-  struct __greater
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x > __y; }
-  };
-
-  struct __less_equal
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x <= __y; }
-  };
-
-  struct __greater_equal
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x >= __y; }
-  };
-
-  // The few binary functions we miss.
-  struct _Atan2
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return atan2(__x, __y); }
-  };
-
-  struct _Pow
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return pow(__x, __y); }
-  };
-
-  template<typename _Tp, bool _IsValidValarrayValue = !__is_abstract(_Tp)>
-    struct __fun_with_valarray
-    {
-      typedef _Tp result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun_with_valarray<_Tp, false>
-    {
-      // No result type defined for invalid value types.
-    };
-
-  // We need these bits in order to recover the return type of
-  // some functions/operators now that we're no longer using
-  // function templates.
-  template<typename, typename _Tp>
-    struct __fun : __fun_with_valarray<_Tp>
-    {
-    };
-
-  // several specializations for relational operators.
-  template<typename _Tp>
-    struct __fun<__logical_not, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__logical_and, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__logical_or, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__less, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__greater, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__less_equal, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__greater_equal, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__equal_to, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__not_equal_to, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  //
-  // Apply function taking a value/const reference closure
-  //
-
-  template<typename _Dom, typename _Arg>
-    class _FunBase
-    {
-    public:
-      typedef typename _Dom::value_type value_type;
-
-      _FunBase(const _Dom& __e, value_type __f(_Arg))
-      : _M_expr(__e), _M_func(__f) {}
-
-      value_type operator[](size_t __i) const
-      { return _M_func (_M_expr[__i]); }
-
-      size_t size() const { return _M_expr.size ();}
-
-    private:
-      const _Dom& _M_expr;
-      value_type (*_M_func)(_Arg);
-    };
-
-  template<class _Dom>
-    struct _ValFunClos<_Expr,_Dom> : _FunBase<_Dom, typename _Dom::value_type>
-    {
-      typedef _FunBase<_Dom, typename _Dom::value_type> _Base;
-      typedef typename _Base::value_type value_type;
-      typedef value_type _Tp;
-
-      _ValFunClos(const _Dom& __e, _Tp __f(_Tp)) : _Base(__e, __f) {}
-    };
-
-  template<typename _Tp>
-    struct _ValFunClos<_ValArray,_Tp> : _FunBase<valarray<_Tp>, _Tp>
-    {
-      typedef _FunBase<valarray<_Tp>, _Tp> _Base;
-      typedef _Tp value_type;
-
-      _ValFunClos(const valarray<_Tp>& __v, _Tp __f(_Tp)) : _Base(__v, __f) {}
-    };
-
-  template<class _Dom>
-    struct _RefFunClos<_Expr, _Dom>
-    : _FunBase<_Dom, const typename _Dom::value_type&>
-    {
-      typedef _FunBase<_Dom, const typename _Dom::value_type&> _Base;
-      typedef typename _Base::value_type value_type;
-      typedef value_type _Tp;
-
-      _RefFunClos(const _Dom& __e, _Tp __f(const _Tp&))
-      : _Base(__e, __f) {}
-    };
-
-  template<typename _Tp>
-    struct _RefFunClos<_ValArray, _Tp>
-    : _FunBase<valarray<_Tp>, const _Tp&>
-    {
-      typedef _FunBase<valarray<_Tp>, const _Tp&> _Base;
-      typedef _Tp value_type;
-
-      _RefFunClos(const valarray<_Tp>& __v, _Tp __f(const _Tp&))
-      : _Base(__v, __f) {}
-    };
-
-  //
-  // Unary expression closure.
-  //
-
-  template<class _Oper, class _Arg>
-    class _UnBase
-    {
-    public:
-      typedef typename _Arg::value_type _Vt;
-      typedef typename __fun<_Oper, _Vt>::result_type value_type;
-
-      _UnBase(const _Arg& __e) : _M_expr(__e) {}
-
-      value_type operator[](size_t __i) const
-      { return _Oper()(_M_expr[__i]); }
-
-      size_t size() const { return _M_expr.size(); }
-      
-    private:
-      const _Arg& _M_expr;
-    };
-
-  template<class _Oper, class _Dom>
-    struct _UnClos<_Oper, _Expr, _Dom>
-    : _UnBase<_Oper, _Dom>
-    {
-      typedef _Dom _Arg;
-      typedef _UnBase<_Oper, _Dom> _Base;
-      typedef typename _Base::value_type value_type;
-
-      _UnClos(const _Arg& __e) : _Base(__e) {}
-    };
-
-  template<class _Oper, typename _Tp>
-    struct _UnClos<_Oper, _ValArray, _Tp>
-    : _UnBase<_Oper, valarray<_Tp> >
-    {
-      typedef valarray<_Tp> _Arg;
-      typedef _UnBase<_Oper, valarray<_Tp> > _Base;
-      typedef typename _Base::value_type value_type;
-
-      _UnClos(const _Arg& __e) : _Base(__e) {}
-    };
-
-
-  //
-  // Binary expression closure.
-  //
-
-  template<class _Oper, class _FirstArg, class _SecondArg>
-    class _BinBase
-    {
-    public:
-      typedef typename _FirstArg::value_type _Vt;
-      typedef typename __fun<_Oper, _Vt>::result_type value_type;
-
-      _BinBase(const _FirstArg& __e1, const _SecondArg& __e2)
-      : _M_expr1(__e1), _M_expr2(__e2) {}
-
-      value_type operator[](size_t __i) const
-      { return _Oper()(_M_expr1[__i], _M_expr2[__i]); }
-
-      size_t size() const { return _M_expr1.size(); }
-
-    private:
-      const _FirstArg& _M_expr1;
-      const _SecondArg& _M_expr2;
-    };
-
-
-  template<class _Oper, class _Clos>
-    class _BinBase2
-    {
-    public:
-      typedef typename _Clos::value_type _Vt;
-      typedef typename __fun<_Oper, _Vt>::result_type value_type;
-
-      _BinBase2(const _Clos& __e, const _Vt& __t)
-      : _M_expr1(__e), _M_expr2(__t) {}
-
-      value_type operator[](size_t __i) const
-      { return _Oper()(_M_expr1[__i], _M_expr2); }
-
-      size_t size() const { return _M_expr1.size(); }
-
-    private:
-      const _Clos& _M_expr1;
-      const _Vt& _M_expr2;
-    };
-
-  template<class _Oper, class _Clos>
-    class _BinBase1
-    {
-    public:
-      typedef typename _Clos::value_type _Vt;
-      typedef typename __fun<_Oper, _Vt>::result_type value_type;
-
-      _BinBase1(const _Vt& __t, const _Clos& __e)
-      : _M_expr1(__t), _M_expr2(__e) {}
-
-      value_type operator[](size_t __i) const
-      { return _Oper()(_M_expr1, _M_expr2[__i]); }
-
-      size_t size() const { return _M_expr2.size(); }
-
-    private:
-      const _Vt& _M_expr1;
-      const _Clos& _M_expr2;
-    };
-
-  template<class _Oper, class _Dom1, class _Dom2>
-    struct _BinClos<_Oper, _Expr, _Expr, _Dom1, _Dom2>
-    : _BinBase<_Oper, _Dom1, _Dom2>
-    {
-      typedef _BinBase<_Oper, _Dom1, _Dom2> _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const _Dom1& __e1, const _Dom2& __e2) : _Base(__e1, __e2) {}
-    };
-
-  template<class _Oper, typename _Tp>
-    struct _BinClos<_Oper,_ValArray, _ValArray, _Tp, _Tp>
-    : _BinBase<_Oper, valarray<_Tp>, valarray<_Tp> >
-    {
-      typedef _BinBase<_Oper, valarray<_Tp>, valarray<_Tp> > _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const valarray<_Tp>& __v, const valarray<_Tp>& __w)
-      : _Base(__v, __w) {}
-    };
-
-  template<class _Oper, class _Dom>
-    struct _BinClos<_Oper, _Expr, _ValArray, _Dom, typename _Dom::value_type>
-    : _BinBase<_Oper, _Dom, valarray<typename _Dom::value_type> >
-    {
-      typedef typename _Dom::value_type _Tp;
-      typedef _BinBase<_Oper,_Dom,valarray<_Tp> > _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const _Dom& __e1, const valarray<_Tp>& __e2)
-      : _Base(__e1, __e2) {}
-    };
-
-  template<class _Oper, class _Dom>
-    struct _BinClos<_Oper, _ValArray, _Expr, typename _Dom::value_type, _Dom>
-    : _BinBase<_Oper, valarray<typename _Dom::value_type>,_Dom>
-    {
-      typedef typename _Dom::value_type _Tp;
-      typedef _BinBase<_Oper, valarray<_Tp>, _Dom> _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const valarray<_Tp>& __e1, const _Dom& __e2)
-      : _Base(__e1, __e2) {}
-    };
-
-  template<class _Oper, class _Dom>
-    struct _BinClos<_Oper, _Expr, _Constant, _Dom, typename _Dom::value_type>
-    : _BinBase2<_Oper, _Dom>
-    {
-      typedef typename _Dom::value_type _Tp;
-      typedef _BinBase2<_Oper,_Dom> _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const _Dom& __e1, const _Tp& __e2) : _Base(__e1, __e2) {}
-    };
-
-  template<class _Oper, class _Dom>
-    struct _BinClos<_Oper, _Constant, _Expr, typename _Dom::value_type, _Dom>
-    : _BinBase1<_Oper, _Dom>
-    {
-      typedef typename _Dom::value_type _Tp;
-      typedef _BinBase1<_Oper, _Dom> _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const _Tp& __e1, const _Dom& __e2) : _Base(__e1, __e2) {}
-    };
-
-  template<class _Oper, typename _Tp>
-    struct _BinClos<_Oper, _ValArray, _Constant, _Tp, _Tp>
-    : _BinBase2<_Oper, valarray<_Tp> >
-    {
-      typedef _BinBase2<_Oper,valarray<_Tp> > _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const valarray<_Tp>& __v, const _Tp& __t) : _Base(__v, __t) {}
-    };
-
-  template<class _Oper, typename _Tp>
-    struct _BinClos<_Oper, _Constant, _ValArray, _Tp, _Tp>
-    : _BinBase1<_Oper, valarray<_Tp> >
-    {
-      typedef _BinBase1<_Oper, valarray<_Tp> > _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const _Tp& __t, const valarray<_Tp>& __v) : _Base(__t, __v) {}
-    };
-
-    //
-    // slice_array closure.
-    //
-  template<typename _Dom> 
-    class _SBase
-    {
-    public:
-      typedef typename _Dom::value_type value_type;
-      
-      _SBase (const _Dom& __e, const slice& __s)
-      : _M_expr (__e), _M_slice (__s) {}
-        
-      value_type
-      operator[] (size_t __i) const
-      { return _M_expr[_M_slice.start () + __i * _M_slice.stride ()]; }
-        
-      size_t
-      size() const
-      { return _M_slice.size (); }
-
-    private:
-      const _Dom& _M_expr;
-      const slice& _M_slice;
-    };
-
-  template<typename _Tp>
-    class _SBase<_Array<_Tp> >
-    {
-    public:
-      typedef _Tp value_type;
-      
-      _SBase (_Array<_Tp> __a, const slice& __s)
-      : _M_array (__a._M_data+__s.start()), _M_size (__s.size()),
-	_M_stride (__s.stride()) {}
-        
-      value_type
-      operator[] (size_t __i) const
-      { return _M_array._M_data[__i * _M_stride]; }
-      
-      size_t
-      size() const
-      { return _M_size; }
-
-    private:
-      const _Array<_Tp> _M_array;
-      const size_t _M_size;
-      const size_t _M_stride;
-    };
-
-  template<class _Dom>
-    struct _SClos<_Expr, _Dom>
-    : _SBase<_Dom>
-    {
-      typedef _SBase<_Dom> _Base;
-      typedef typename _Base::value_type value_type;
-      
-      _SClos (const _Dom& __e, const slice& __s) : _Base (__e, __s) {}
-    };
-
-  template<typename _Tp>
-    struct _SClos<_ValArray, _Tp>
-    : _SBase<_Array<_Tp> >
-    {
-      typedef  _SBase<_Array<_Tp> > _Base;
-      typedef _Tp value_type;
-      
-      _SClos (_Array<_Tp> __a, const slice& __s) : _Base (__a, __s) {}
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _CPP_VALARRAY_BEFORE_H */
diff --git a/openflow/usr/include/c++/5/bits/vector.tcc b/openflow/usr/include/c++/5/bits/vector.tcc
deleted file mode 100644
index 34118a4..0000000
--- a/openflow/usr/include/c++/5/bits/vector.tcc
+++ /dev/null
@@ -1,887 +0,0 @@
-// Vector implementation (out of line) -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this  software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bits/vector.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{vector}
- */
-
-#ifndef _VECTOR_TCC
-#define _VECTOR_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  template<typename _Tp, typename _Alloc>
-    void
-    vector<_Tp, _Alloc>::
-    reserve(size_type __n)
-    {
-      if (__n > this->max_size())
-	__throw_length_error(__N("vector::reserve"));
-      if (this->capacity() < __n)
-	{
-	  const size_type __old_size = size();
-	  pointer __tmp = _M_allocate_and_copy(__n,
-	    _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(this->_M_impl._M_start),
-	    _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(this->_M_impl._M_finish));
-	  std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
-			_M_get_Tp_allocator());
-	  _M_deallocate(this->_M_impl._M_start,
-			this->_M_impl._M_end_of_storage
-			- this->_M_impl._M_start);
-	  this->_M_impl._M_start = __tmp;
-	  this->_M_impl._M_finish = __tmp + __old_size;
-	  this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __n;
-	}
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Alloc>
-    template<typename... _Args>
-      void
-      vector<_Tp, _Alloc>::
-      emplace_back(_Args&&... __args)
-      {
-	if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
-	  {
-	    _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish,
-				     std::forward<_Args>(__args)...);
-	    ++this->_M_impl._M_finish;
-	  }
-	else
-	  _M_emplace_back_aux(std::forward<_Args>(__args)...);
-      }
-#endif
-
-  template<typename _Tp, typename _Alloc>
-    typename vector<_Tp, _Alloc>::iterator
-    vector<_Tp, _Alloc>::
-#if __cplusplus >= 201103L
-    insert(const_iterator __position, const value_type& __x)
-#else
-    insert(iterator __position, const value_type& __x)
-#endif
-    {
-      const size_type __n = __position - begin();
-      if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage
-	  && __position == end())
-	{
-	  _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish, __x);
-	  ++this->_M_impl._M_finish;
-	}
-      else
-	{
-#if __cplusplus >= 201103L
-	  const auto __pos = begin() + (__position - cbegin());
-	  if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
-	    {
-	      _Tp __x_copy = __x;
-	      _M_insert_aux(__pos, std::move(__x_copy));
-	    }
-	  else
-	    _M_insert_aux(__pos, __x);
-#else
-	    _M_insert_aux(__position, __x);
-#endif
-	}
-      return iterator(this->_M_impl._M_start + __n);
-    }
-
-  template<typename _Tp, typename _Alloc>
-    typename vector<_Tp, _Alloc>::iterator
-    vector<_Tp, _Alloc>::
-    _M_erase(iterator __position)
-    {
-      if (__position + 1 != end())
-	_GLIBCXX_MOVE3(__position + 1, end(), __position);
-      --this->_M_impl._M_finish;
-      _Alloc_traits::destroy(this->_M_impl, this->_M_impl._M_finish);
-      return __position;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    typename vector<_Tp, _Alloc>::iterator
-    vector<_Tp, _Alloc>::
-    _M_erase(iterator __first, iterator __last)
-    {
-      if (__first != __last)
-	{
-	  if (__last != end())
-	    _GLIBCXX_MOVE3(__last, end(), __first);
-	  _M_erase_at_end(__first.base() + (end() - __last));
-	}
-      return __first;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    vector<_Tp, _Alloc>&
-    vector<_Tp, _Alloc>::
-    operator=(const vector<_Tp, _Alloc>& __x)
-    {
-      if (&__x != this)
-	{
-#if __cplusplus >= 201103L
-	  if (_Alloc_traits::_S_propagate_on_copy_assign())
-	    {
-	      if (!_Alloc_traits::_S_always_equal()
-	          && _M_get_Tp_allocator() != __x._M_get_Tp_allocator())
-	        {
-		  // replacement allocator cannot free existing storage
-		  this->clear();
-		  _M_deallocate(this->_M_impl._M_start,
-				this->_M_impl._M_end_of_storage
-				- this->_M_impl._M_start);
-		  this->_M_impl._M_start = nullptr;
-		  this->_M_impl._M_finish = nullptr;
-		  this->_M_impl._M_end_of_storage = nullptr;
-		}
-	      std::__alloc_on_copy(_M_get_Tp_allocator(),
-				   __x._M_get_Tp_allocator());
-	    }
-#endif
-	  const size_type __xlen = __x.size();
-	  if (__xlen > capacity())
-	    {
-	      pointer __tmp = _M_allocate_and_copy(__xlen, __x.begin(),
-						   __x.end());
-	      std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
-			    _M_get_Tp_allocator());
-	      _M_deallocate(this->_M_impl._M_start,
-			    this->_M_impl._M_end_of_storage
-			    - this->_M_impl._M_start);
-	      this->_M_impl._M_start = __tmp;
-	      this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __xlen;
-	    }
-	  else if (size() >= __xlen)
-	    {
-	      std::_Destroy(std::copy(__x.begin(), __x.end(), begin()),
-			    end(), _M_get_Tp_allocator());
-	    }
-	  else
-	    {
-	      std::copy(__x._M_impl._M_start, __x._M_impl._M_start + size(),
-			this->_M_impl._M_start);
-	      std::__uninitialized_copy_a(__x._M_impl._M_start + size(),
-					  __x._M_impl._M_finish,
-					  this->_M_impl._M_finish,
-					  _M_get_Tp_allocator());
-	    }
-	  this->_M_impl._M_finish = this->_M_impl._M_start + __xlen;
-	}
-      return *this;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    vector<_Tp, _Alloc>::
-    _M_fill_assign(size_t __n, const value_type& __val)
-    {
-      if (__n > capacity())
-	{
-	  vector __tmp(__n, __val, _M_get_Tp_allocator());
-	  __tmp._M_impl._M_swap_data(this->_M_impl);
-	}
-      else if (__n > size())
-	{
-	  std::fill(begin(), end(), __val);
-	  this->_M_impl._M_finish =
-	    std::__uninitialized_fill_n_a(this->_M_impl._M_finish,
-					  __n - size(), __val,
-					  _M_get_Tp_allocator());
-	}
-      else
-        _M_erase_at_end(std::fill_n(this->_M_impl._M_start, __n, __val));
-    }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename _InputIterator>
-      void
-      vector<_Tp, _Alloc>::
-      _M_assign_aux(_InputIterator __first, _InputIterator __last,
-		    std::input_iterator_tag)
-      {
-	pointer __cur(this->_M_impl._M_start);
-	for (; __first != __last && __cur != this->_M_impl._M_finish;
-	     ++__cur, ++__first)
-	  *__cur = *__first;
-	if (__first == __last)
-	  _M_erase_at_end(__cur);
-	else
-	  insert(end(), __first, __last);
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename _ForwardIterator>
-      void
-      vector<_Tp, _Alloc>::
-      _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last,
-		    std::forward_iterator_tag)
-      {
-	const size_type __len = std::distance(__first, __last);
-
-	if (__len > capacity())
-	  {
-	    pointer __tmp(_M_allocate_and_copy(__len, __first, __last));
-	    std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
-			  _M_get_Tp_allocator());
-	    _M_deallocate(this->_M_impl._M_start,
-			  this->_M_impl._M_end_of_storage
-			  - this->_M_impl._M_start);
-	    this->_M_impl._M_start = __tmp;
-	    this->_M_impl._M_finish = this->_M_impl._M_start + __len;
-	    this->_M_impl._M_end_of_storage = this->_M_impl._M_finish;
-	  }
-	else if (size() >= __len)
-	  _M_erase_at_end(std::copy(__first, __last, this->_M_impl._M_start));
-	else
-	  {
-	    _ForwardIterator __mid = __first;
-	    std::advance(__mid, size());
-	    std::copy(__first, __mid, this->_M_impl._M_start);
-	    this->_M_impl._M_finish =
-	      std::__uninitialized_copy_a(__mid, __last,
-					  this->_M_impl._M_finish,
-					  _M_get_Tp_allocator());
-	  }
-      }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Alloc>
-    template<typename... _Args>
-      typename vector<_Tp, _Alloc>::iterator
-      vector<_Tp, _Alloc>::
-      emplace(const_iterator __position, _Args&&... __args)
-      {
-	const size_type __n = __position - begin();
-	if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage
-	    && __position == end())
-	  {
-	    _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish,
-				     std::forward<_Args>(__args)...);
-	    ++this->_M_impl._M_finish;
-	  }
-	else
-	  _M_insert_aux(begin() + (__position - cbegin()),
-			std::forward<_Args>(__args)...);
-	return iterator(this->_M_impl._M_start + __n);
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename... _Args>
-      void
-      vector<_Tp, _Alloc>::
-      _M_insert_aux(iterator __position, _Args&&... __args)
-#else
-  template<typename _Tp, typename _Alloc>
-    void
-    vector<_Tp, _Alloc>::
-    _M_insert_aux(iterator __position, const _Tp& __x)
-#endif
-    {
-      if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
-	{
-	  _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish,
-			           _GLIBCXX_MOVE(*(this->_M_impl._M_finish
-				                   - 1)));
-	  ++this->_M_impl._M_finish;
-#if __cplusplus < 201103L
-	  _Tp __x_copy = __x;
-#endif
-	  _GLIBCXX_MOVE_BACKWARD3(__position.base(),
-				  this->_M_impl._M_finish - 2,
-				  this->_M_impl._M_finish - 1);
-#if __cplusplus < 201103L
-	  *__position = __x_copy;
-#else
-	  *__position = _Tp(std::forward<_Args>(__args)...);
-#endif
-	}
-      else
-	{
-	  const size_type __len =
-	    _M_check_len(size_type(1), "vector::_M_insert_aux");
-	  const size_type __elems_before = __position - begin();
-	  pointer __new_start(this->_M_allocate(__len));
-	  pointer __new_finish(__new_start);
-	  __try
-	    {
-	      // The order of the three operations is dictated by the C++0x
-	      // case, where the moves could alter a new element belonging
-	      // to the existing vector.  This is an issue only for callers
-	      // taking the element by const lvalue ref (see 23.1/13).
-	      _Alloc_traits::construct(this->_M_impl,
-		                       __new_start + __elems_before,
-#if __cplusplus >= 201103L
-				       std::forward<_Args>(__args)...);
-#else
-	                               __x);
-#endif
-	      __new_finish = pointer();
-
-	      __new_finish
-		= std::__uninitialized_move_if_noexcept_a
-		(this->_M_impl._M_start, __position.base(),
-		 __new_start, _M_get_Tp_allocator());
-
-	      ++__new_finish;
-
-	      __new_finish
-		= std::__uninitialized_move_if_noexcept_a
-		(__position.base(), this->_M_impl._M_finish,
-		 __new_finish, _M_get_Tp_allocator());
-	    }
-          __catch(...)
-	    {
-	      if (!__new_finish)
-		_Alloc_traits::destroy(this->_M_impl,
-		                       __new_start + __elems_before);
-	      else
-		std::_Destroy(__new_start, __new_finish, _M_get_Tp_allocator());
-	      _M_deallocate(__new_start, __len);
-	      __throw_exception_again;
-	    }
-	  std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
-			_M_get_Tp_allocator());
-	  _M_deallocate(this->_M_impl._M_start,
-			this->_M_impl._M_end_of_storage
-			- this->_M_impl._M_start);
-	  this->_M_impl._M_start = __new_start;
-	  this->_M_impl._M_finish = __new_finish;
-	  this->_M_impl._M_end_of_storage = __new_start + __len;
-	}
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Alloc>
-    template<typename... _Args>
-      void
-      vector<_Tp, _Alloc>::
-      _M_emplace_back_aux(_Args&&... __args)
-      {
-	const size_type __len =
-	  _M_check_len(size_type(1), "vector::_M_emplace_back_aux");
-	pointer __new_start(this->_M_allocate(__len));
-	pointer __new_finish(__new_start);
-	__try
-	  {
-	    _Alloc_traits::construct(this->_M_impl, __new_start + size(),
-				     std::forward<_Args>(__args)...);
-	    __new_finish = pointer();
-
-	    __new_finish
-	      = std::__uninitialized_move_if_noexcept_a
-	      (this->_M_impl._M_start, this->_M_impl._M_finish,
-	       __new_start, _M_get_Tp_allocator());
-
-	    ++__new_finish;
-	  }
-	__catch(...)
-	  {
-	    if (!__new_finish)
-	      _Alloc_traits::destroy(this->_M_impl, __new_start + size());
-	    else
-	      std::_Destroy(__new_start, __new_finish, _M_get_Tp_allocator());
-	    _M_deallocate(__new_start, __len);
-	    __throw_exception_again;
-	  }
-	std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
-		      _M_get_Tp_allocator());
-	_M_deallocate(this->_M_impl._M_start,
-		      this->_M_impl._M_end_of_storage
-		      - this->_M_impl._M_start);
-	this->_M_impl._M_start = __new_start;
-	this->_M_impl._M_finish = __new_finish;
-	this->_M_impl._M_end_of_storage = __new_start + __len;
-      }
-#endif
-
-  template<typename _Tp, typename _Alloc>
-    void
-    vector<_Tp, _Alloc>::
-    _M_fill_insert(iterator __position, size_type __n, const value_type& __x)
-    {
-      if (__n != 0)
-	{
-	  if (size_type(this->_M_impl._M_end_of_storage
-			- this->_M_impl._M_finish) >= __n)
-	    {
-	      value_type __x_copy = __x;
-	      const size_type __elems_after = end() - __position;
-	      pointer __old_finish(this->_M_impl._M_finish);
-	      if (__elems_after > __n)
-		{
-		  std::__uninitialized_move_a(this->_M_impl._M_finish - __n,
-					      this->_M_impl._M_finish,
-					      this->_M_impl._M_finish,
-					      _M_get_Tp_allocator());
-		  this->_M_impl._M_finish += __n;
-		  _GLIBCXX_MOVE_BACKWARD3(__position.base(),
-					  __old_finish - __n, __old_finish);
-		  std::fill(__position.base(), __position.base() + __n,
-			    __x_copy);
-		}
-	      else
-		{
-		  this->_M_impl._M_finish =
-		    std::__uninitialized_fill_n_a(this->_M_impl._M_finish,
-						  __n - __elems_after,
-						  __x_copy,
-						  _M_get_Tp_allocator());
-		  std::__uninitialized_move_a(__position.base(), __old_finish,
-					      this->_M_impl._M_finish,
-					      _M_get_Tp_allocator());
-		  this->_M_impl._M_finish += __elems_after;
-		  std::fill(__position.base(), __old_finish, __x_copy);
-		}
-	    }
-	  else
-	    {
-	      const size_type __len =
-		_M_check_len(__n, "vector::_M_fill_insert");
-	      const size_type __elems_before = __position - begin();
-	      pointer __new_start(this->_M_allocate(__len));
-	      pointer __new_finish(__new_start);
-	      __try
-		{
-		  // See _M_insert_aux above.
-		  std::__uninitialized_fill_n_a(__new_start + __elems_before,
-						__n, __x,
-						_M_get_Tp_allocator());
-		  __new_finish = pointer();
-
-		  __new_finish
-		    = std::__uninitialized_move_if_noexcept_a
-		    (this->_M_impl._M_start, __position.base(),
-		     __new_start, _M_get_Tp_allocator());
-
-		  __new_finish += __n;
-
-		  __new_finish
-		    = std::__uninitialized_move_if_noexcept_a
-		    (__position.base(), this->_M_impl._M_finish,
-		     __new_finish, _M_get_Tp_allocator());
-		}
-	      __catch(...)
-		{
-		  if (!__new_finish)
-		    std::_Destroy(__new_start + __elems_before,
-				  __new_start + __elems_before + __n,
-				  _M_get_Tp_allocator());
-		  else
-		    std::_Destroy(__new_start, __new_finish,
-				  _M_get_Tp_allocator());
-		  _M_deallocate(__new_start, __len);
-		  __throw_exception_again;
-		}
-	      std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
-			    _M_get_Tp_allocator());
-	      _M_deallocate(this->_M_impl._M_start,
-			    this->_M_impl._M_end_of_storage
-			    - this->_M_impl._M_start);
-	      this->_M_impl._M_start = __new_start;
-	      this->_M_impl._M_finish = __new_finish;
-	      this->_M_impl._M_end_of_storage = __new_start + __len;
-	    }
-	}
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Alloc>
-    void
-    vector<_Tp, _Alloc>::
-    _M_default_append(size_type __n)
-    {
-      if (__n != 0)
-	{
-	  if (size_type(this->_M_impl._M_end_of_storage
-			- this->_M_impl._M_finish) >= __n)
-	    {
-	      this->_M_impl._M_finish =
-		std::__uninitialized_default_n_a(this->_M_impl._M_finish,
-						 __n, _M_get_Tp_allocator());
-	    }
-	  else
-	    {
-	      const size_type __len =
-		_M_check_len(__n, "vector::_M_default_append");
-	      const size_type __old_size = this->size();
-	      pointer __new_start(this->_M_allocate(__len));
-	      pointer __new_finish(__new_start);
-	      __try
-		{
-		  __new_finish
-		    = std::__uninitialized_move_if_noexcept_a
-		    (this->_M_impl._M_start, this->_M_impl._M_finish,
-		     __new_start, _M_get_Tp_allocator());
-		  __new_finish =
-		    std::__uninitialized_default_n_a(__new_finish, __n,
-						     _M_get_Tp_allocator());
-		}
-	      __catch(...)
-		{
-		  std::_Destroy(__new_start, __new_finish,
-				_M_get_Tp_allocator());
-		  _M_deallocate(__new_start, __len);
-		  __throw_exception_again;
-		}
-	      std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
-			    _M_get_Tp_allocator());
-	      _M_deallocate(this->_M_impl._M_start,
-			    this->_M_impl._M_end_of_storage
-			    - this->_M_impl._M_start);
-	      this->_M_impl._M_start = __new_start;
-	      this->_M_impl._M_finish = __new_finish;
-	      this->_M_impl._M_end_of_storage = __new_start + __len;
-	    }
-	}
-    }
-
-  template<typename _Tp, typename _Alloc>
-    bool
-    vector<_Tp, _Alloc>::
-    _M_shrink_to_fit()
-    {
-      if (capacity() == size())
-	return false;
-      return std::__shrink_to_fit_aux<vector>::_S_do_it(*this);
-    }
-#endif
-
-  template<typename _Tp, typename _Alloc>
-    template<typename _InputIterator>
-      void
-      vector<_Tp, _Alloc>::
-      _M_range_insert(iterator __pos, _InputIterator __first,
-		      _InputIterator __last, std::input_iterator_tag)
-      {
-	for (; __first != __last; ++__first)
-	  {
-	    __pos = insert(__pos, *__first);
-	    ++__pos;
-	  }
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template<typename _ForwardIterator>
-      void
-      vector<_Tp, _Alloc>::
-      _M_range_insert(iterator __position, _ForwardIterator __first,
-		      _ForwardIterator __last, std::forward_iterator_tag)
-      {
-	if (__first != __last)
-	  {
-	    const size_type __n = std::distance(__first, __last);
-	    if (size_type(this->_M_impl._M_end_of_storage
-			  - this->_M_impl._M_finish) >= __n)
-	      {
-		const size_type __elems_after = end() - __position;
-		pointer __old_finish(this->_M_impl._M_finish);
-		if (__elems_after > __n)
-		  {
-		    std::__uninitialized_move_a(this->_M_impl._M_finish - __n,
-						this->_M_impl._M_finish,
-						this->_M_impl._M_finish,
-						_M_get_Tp_allocator());
-		    this->_M_impl._M_finish += __n;
-		    _GLIBCXX_MOVE_BACKWARD3(__position.base(),
-					    __old_finish - __n, __old_finish);
-		    std::copy(__first, __last, __position);
-		  }
-		else
-		  {
-		    _ForwardIterator __mid = __first;
-		    std::advance(__mid, __elems_after);
-		    std::__uninitialized_copy_a(__mid, __last,
-						this->_M_impl._M_finish,
-						_M_get_Tp_allocator());
-		    this->_M_impl._M_finish += __n - __elems_after;
-		    std::__uninitialized_move_a(__position.base(),
-						__old_finish,
-						this->_M_impl._M_finish,
-						_M_get_Tp_allocator());
-		    this->_M_impl._M_finish += __elems_after;
-		    std::copy(__first, __mid, __position);
-		  }
-	      }
-	    else
-	      {
-		const size_type __len =
-		  _M_check_len(__n, "vector::_M_range_insert");
-		pointer __new_start(this->_M_allocate(__len));
-		pointer __new_finish(__new_start);
-		__try
-		  {
-		    __new_finish
-		      = std::__uninitialized_move_if_noexcept_a
-		      (this->_M_impl._M_start, __position.base(),
-		       __new_start, _M_get_Tp_allocator());
-		    __new_finish
-		      = std::__uninitialized_copy_a(__first, __last,
-						    __new_finish,
-						    _M_get_Tp_allocator());
-		    __new_finish
-		      = std::__uninitialized_move_if_noexcept_a
-		      (__position.base(), this->_M_impl._M_finish,
-		       __new_finish, _M_get_Tp_allocator());
-		  }
-		__catch(...)
-		  {
-		    std::_Destroy(__new_start, __new_finish,
-				  _M_get_Tp_allocator());
-		    _M_deallocate(__new_start, __len);
-		    __throw_exception_again;
-		  }
-		std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
-			      _M_get_Tp_allocator());
-		_M_deallocate(this->_M_impl._M_start,
-			      this->_M_impl._M_end_of_storage
-			      - this->_M_impl._M_start);
-		this->_M_impl._M_start = __new_start;
-		this->_M_impl._M_finish = __new_finish;
-		this->_M_impl._M_end_of_storage = __new_start + __len;
-	      }
-	  }
-      }
-
-
-  // vector<bool>
-  template<typename _Alloc>
-    void
-    vector<bool, _Alloc>::
-    _M_reallocate(size_type __n)
-    {
-      _Bit_pointer __q = this->_M_allocate(__n);
-      iterator __start(std::__addressof(*__q), 0);
-      this->_M_impl._M_finish = _M_copy_aligned(begin(), end(), __start);
-      this->_M_deallocate();
-      this->_M_impl._M_start = __start;
-      this->_M_impl._M_end_of_storage = __q + _S_nword(__n);
-    }
-
-  template<typename _Alloc>
-    void
-    vector<bool, _Alloc>::
-    _M_fill_insert(iterator __position, size_type __n, bool __x)
-    {
-      if (__n == 0)
-	return;
-      if (capacity() - size() >= __n)
-	{
-	  std::copy_backward(__position, end(),
-			     this->_M_impl._M_finish + difference_type(__n));
-	  std::fill(__position, __position + difference_type(__n), __x);
-	  this->_M_impl._M_finish += difference_type(__n);
-	}
-      else
-	{
-	  const size_type __len = 
-	    _M_check_len(__n, "vector<bool>::_M_fill_insert");
-	  _Bit_pointer __q = this->_M_allocate(__len);
-	  iterator __start(std::__addressof(*__q), 0);
-	  iterator __i = _M_copy_aligned(begin(), __position, __start);
-	  std::fill(__i, __i + difference_type(__n), __x);
-	  this->_M_impl._M_finish = std::copy(__position, end(),
-					      __i + difference_type(__n));
-	  this->_M_deallocate();
-	  this->_M_impl._M_end_of_storage = __q + _S_nword(__len);
-	  this->_M_impl._M_start = __start;
-	}
-    }
-
-  template<typename _Alloc>
-    template<typename _ForwardIterator>
-      void
-      vector<bool, _Alloc>::
-      _M_insert_range(iterator __position, _ForwardIterator __first, 
-		      _ForwardIterator __last, std::forward_iterator_tag)
-      {
-	if (__first != __last)
-	  {
-	    size_type __n = std::distance(__first, __last);
-	    if (capacity() - size() >= __n)
-	      {
-		std::copy_backward(__position, end(),
-				   this->_M_impl._M_finish
-				   + difference_type(__n));
-		std::copy(__first, __last, __position);
-		this->_M_impl._M_finish += difference_type(__n);
-	      }
-	    else
-	      {
-		const size_type __len =
-		  _M_check_len(__n, "vector<bool>::_M_insert_range");
-		_Bit_pointer __q = this->_M_allocate(__len);
-		iterator __start(std::__addressof(*__q), 0);
-		iterator __i = _M_copy_aligned(begin(), __position, __start);
-		__i = std::copy(__first, __last, __i);
-		this->_M_impl._M_finish = std::copy(__position, end(), __i);
-		this->_M_deallocate();
-		this->_M_impl._M_end_of_storage = __q + _S_nword(__len);
-		this->_M_impl._M_start = __start;
-	      }
-	  }
-      }
-
-  template<typename _Alloc>
-    void
-    vector<bool, _Alloc>::
-    _M_insert_aux(iterator __position, bool __x)
-    {
-      if (this->_M_impl._M_finish._M_p != this->_M_impl._M_end_addr())
-	{
-	  std::copy_backward(__position, this->_M_impl._M_finish, 
-			     this->_M_impl._M_finish + 1);
-	  *__position = __x;
-	  ++this->_M_impl._M_finish;
-	}
-      else
-	{
-	  const size_type __len =
-	    _M_check_len(size_type(1), "vector<bool>::_M_insert_aux");
-	  _Bit_pointer __q = this->_M_allocate(__len);
-	  iterator __start(std::__addressof(*__q), 0);
-	  iterator __i = _M_copy_aligned(begin(), __position, __start);
-	  *__i++ = __x;
-	  this->_M_impl._M_finish = std::copy(__position, end(), __i);
-	  this->_M_deallocate();
-	  this->_M_impl._M_end_of_storage = __q + _S_nword(__len);
-	  this->_M_impl._M_start = __start;
-	}
-    }
-
-  template<typename _Alloc>
-    typename vector<bool, _Alloc>::iterator
-    vector<bool, _Alloc>::
-    _M_erase(iterator __position)
-    {
-      if (__position + 1 != end())
-        std::copy(__position + 1, end(), __position);
-      --this->_M_impl._M_finish;
-      return __position;
-    }
-
-  template<typename _Alloc>
-    typename vector<bool, _Alloc>::iterator
-    vector<bool, _Alloc>::
-    _M_erase(iterator __first, iterator __last)
-    {
-      if (__first != __last)
-	_M_erase_at_end(std::copy(__last, end(), __first));
-      return __first;
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Alloc>
-    bool
-    vector<bool, _Alloc>::
-    _M_shrink_to_fit()
-    {
-      if (capacity() - size() < int(_S_word_bit))
-	return false;
-      __try
-	{
-	  _M_reallocate(size());
-	  return true;
-	}
-      __catch(...)
-	{ return false; }
-    }
-#endif
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#if __cplusplus >= 201103L
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Alloc>
-    size_t
-    hash<_GLIBCXX_STD_C::vector<bool, _Alloc>>::
-    operator()(const _GLIBCXX_STD_C::vector<bool, _Alloc>& __b) const noexcept
-    {
-      size_t __hash = 0;
-      using _GLIBCXX_STD_C::_S_word_bit;
-      using _GLIBCXX_STD_C::_Bit_type;
-
-      const size_t __words = __b.size() / _S_word_bit;
-      if (__words)
-	{
-	  const size_t __clength = __words * sizeof(_Bit_type);
-	  __hash = std::_Hash_impl::hash(__b._M_impl._M_start._M_p, __clength);
-	}
-
-      const size_t __extrabits = __b.size() % _S_word_bit;
-      if (__extrabits)
-	{
-	  _Bit_type __hiword = *__b._M_impl._M_finish._M_p;
-	  __hiword &= ~((~static_cast<_Bit_type>(0)) << __extrabits);
-
-	  const size_t __clength
-	    = (__extrabits + __CHAR_BIT__ - 1) / __CHAR_BIT__;
-	  if (__words)
-	    __hash = std::_Hash_impl::hash(&__hiword, __clength, __hash);
-	  else
-	    __hash = std::_Hash_impl::hash(&__hiword, __clength);
-	}
-
-      return __hash;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif // C++11
-
-#endif /* _VECTOR_TCC */
diff --git a/openflow/usr/include/c++/5/bitset b/openflow/usr/include/c++/5/bitset
deleted file mode 100644
index 44df60c..0000000
--- a/openflow/usr/include/c++/5/bitset
+++ /dev/null
@@ -1,1594 +0,0 @@
-// <bitset> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/bitset
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_BITSET
-#define _GLIBCXX_BITSET 1
-
-#pragma GCC system_header
-
-#include <string>
-#include <bits/functexcept.h>   // For invalid_argument, out_of_range,
-                                // overflow_error
-#include <iosfwd>
-#include <bits/cxxabi_forced.h>
-
-#define _GLIBCXX_BITSET_BITS_PER_WORD  (__CHAR_BIT__ * __SIZEOF_LONG__)
-#define _GLIBCXX_BITSET_WORDS(__n) \
-  ((__n) / _GLIBCXX_BITSET_BITS_PER_WORD + \
-   ((__n) % _GLIBCXX_BITSET_BITS_PER_WORD == 0 ? 0 : 1))
-
-#define _GLIBCXX_BITSET_BITS_PER_ULL (__CHAR_BIT__ * __SIZEOF_LONG_LONG__)
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CONTAINER
-
-  /**
-   *  Base class, general case.  It is a class invariant that _Nw will be
-   *  nonnegative.
-   *
-   *  See documentation for bitset.
-  */
-  template<size_t _Nw>
-    struct _Base_bitset
-    {
-      typedef unsigned long _WordT;
-
-      /// 0 is the least significant word.
-      _WordT 		_M_w[_Nw];
-
-      _GLIBCXX_CONSTEXPR _Base_bitset() _GLIBCXX_NOEXCEPT
-      : _M_w() { }
-
-#if __cplusplus >= 201103L
-      constexpr _Base_bitset(unsigned long long __val) noexcept
-      : _M_w{ _WordT(__val)
-#if __SIZEOF_LONG_LONG__ > __SIZEOF_LONG__
-	       , _WordT(__val >> _GLIBCXX_BITSET_BITS_PER_WORD)
-#endif
-       } { }
-#else
-      _Base_bitset(unsigned long __val)
-      : _M_w()
-      { _M_w[0] = __val; }
-#endif
-
-      static _GLIBCXX_CONSTEXPR size_t
-      _S_whichword(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static _GLIBCXX_CONSTEXPR size_t
-      _S_whichbyte(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
-
-      static _GLIBCXX_CONSTEXPR size_t
-      _S_whichbit(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static _GLIBCXX_CONSTEXPR _WordT
-      _S_maskbit(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return (static_cast<_WordT>(1)) << _S_whichbit(__pos); }
-
-      _WordT&
-      _M_getword(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return _M_w[_S_whichword(__pos)]; }
-
-      _GLIBCXX_CONSTEXPR _WordT
-      _M_getword(size_t __pos) const _GLIBCXX_NOEXCEPT
-      { return _M_w[_S_whichword(__pos)]; }
-
-#if __cplusplus >= 201103L
-      const _WordT*
-      _M_getdata() const noexcept
-      { return _M_w; }
-#endif
-
-      _WordT&
-      _M_hiword() _GLIBCXX_NOEXCEPT
-      { return _M_w[_Nw - 1]; }
-
-      _GLIBCXX_CONSTEXPR _WordT
-      _M_hiword() const _GLIBCXX_NOEXCEPT
-      { return _M_w[_Nw - 1]; }
-
-      void
-      _M_do_and(const _Base_bitset<_Nw>& __x) _GLIBCXX_NOEXCEPT
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  _M_w[__i] &= __x._M_w[__i];
-      }
-
-      void
-      _M_do_or(const _Base_bitset<_Nw>& __x) _GLIBCXX_NOEXCEPT
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  _M_w[__i] |= __x._M_w[__i];
-      }
-
-      void
-      _M_do_xor(const _Base_bitset<_Nw>& __x) _GLIBCXX_NOEXCEPT
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  _M_w[__i] ^= __x._M_w[__i];
-      }
-
-      void
-      _M_do_left_shift(size_t __shift) _GLIBCXX_NOEXCEPT;
-
-      void
-      _M_do_right_shift(size_t __shift) _GLIBCXX_NOEXCEPT;
-
-      void
-      _M_do_flip() _GLIBCXX_NOEXCEPT
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  _M_w[__i] = ~_M_w[__i];
-      }
-
-      void
-      _M_do_set() _GLIBCXX_NOEXCEPT
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  _M_w[__i] = ~static_cast<_WordT>(0);
-      }
-
-      void
-      _M_do_reset() _GLIBCXX_NOEXCEPT
-      { __builtin_memset(_M_w, 0, _Nw * sizeof(_WordT)); }
-
-      bool
-      _M_is_equal(const _Base_bitset<_Nw>& __x) const _GLIBCXX_NOEXCEPT
-      {
-	for (size_t __i = 0; __i < _Nw; ++__i)
-	  if (_M_w[__i] != __x._M_w[__i])
-	    return false;
-	return true;
-      }
-
-      template<size_t _Nb>
-        bool
-        _M_are_all() const _GLIBCXX_NOEXCEPT
-        {
-	  for (size_t __i = 0; __i < _Nw - 1; __i++)
-	    if (_M_w[__i] != ~static_cast<_WordT>(0))
-	      return false;
-	  return _M_hiword() == (~static_cast<_WordT>(0)
-				 >> (_Nw * _GLIBCXX_BITSET_BITS_PER_WORD
-				     - _Nb));
-	}
-
-      bool
-      _M_is_any() const _GLIBCXX_NOEXCEPT
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  if (_M_w[__i] != static_cast<_WordT>(0))
-	    return true;
-	return false;
-      }
-
-      size_t
-      _M_do_count() const _GLIBCXX_NOEXCEPT
-      {
-	size_t __result = 0;
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  __result += __builtin_popcountl(_M_w[__i]);
-	return __result;
-      }
-
-      unsigned long
-      _M_do_to_ulong() const;
-
-#if __cplusplus >= 201103L
-      unsigned long long
-      _M_do_to_ullong() const;
-#endif
-
-      // find first "on" bit
-      size_t
-      _M_do_find_first(size_t) const _GLIBCXX_NOEXCEPT;
-
-      // find the next "on" bit that follows "prev"
-      size_t
-      _M_do_find_next(size_t, size_t) const _GLIBCXX_NOEXCEPT;
-    };
-
-  // Definitions of non-inline functions from _Base_bitset.
-  template<size_t _Nw>
-    void
-    _Base_bitset<_Nw>::_M_do_left_shift(size_t __shift) _GLIBCXX_NOEXCEPT
-    {
-      if (__builtin_expect(__shift != 0, 1))
-	{
-	  const size_t __wshift = __shift / _GLIBCXX_BITSET_BITS_PER_WORD;
-	  const size_t __offset = __shift % _GLIBCXX_BITSET_BITS_PER_WORD;
-
-	  if (__offset == 0)
-	    for (size_t __n = _Nw - 1; __n >= __wshift; --__n)
-	      _M_w[__n] = _M_w[__n - __wshift];
-	  else
-	    {
-	      const size_t __sub_offset = (_GLIBCXX_BITSET_BITS_PER_WORD 
-					   - __offset);
-	      for (size_t __n = _Nw - 1; __n > __wshift; --__n)
-		_M_w[__n] = ((_M_w[__n - __wshift] << __offset)
-			     | (_M_w[__n - __wshift - 1] >> __sub_offset));
-	      _M_w[__wshift] = _M_w[0] << __offset;
-	    }
-
-	  std::fill(_M_w + 0, _M_w + __wshift, static_cast<_WordT>(0));
-	}
-    }
-
-  template<size_t _Nw>
-    void
-    _Base_bitset<_Nw>::_M_do_right_shift(size_t __shift) _GLIBCXX_NOEXCEPT
-    {
-      if (__builtin_expect(__shift != 0, 1))
-	{
-	  const size_t __wshift = __shift / _GLIBCXX_BITSET_BITS_PER_WORD;
-	  const size_t __offset = __shift % _GLIBCXX_BITSET_BITS_PER_WORD;
-	  const size_t __limit = _Nw - __wshift - 1;
-
-	  if (__offset == 0)
-	    for (size_t __n = 0; __n <= __limit; ++__n)
-	      _M_w[__n] = _M_w[__n + __wshift];
-	  else
-	    {
-	      const size_t __sub_offset = (_GLIBCXX_BITSET_BITS_PER_WORD
-					   - __offset);
-	      for (size_t __n = 0; __n < __limit; ++__n)
-		_M_w[__n] = ((_M_w[__n + __wshift] >> __offset)
-			     | (_M_w[__n + __wshift + 1] << __sub_offset));
-	      _M_w[__limit] = _M_w[_Nw-1] >> __offset;
-	    }
-	  
-	  std::fill(_M_w + __limit + 1, _M_w + _Nw, static_cast<_WordT>(0));
-	}
-    }
-
-  template<size_t _Nw>
-    unsigned long
-    _Base_bitset<_Nw>::_M_do_to_ulong() const
-    {
-      for (size_t __i = 1; __i < _Nw; ++__i)
-	if (_M_w[__i])
-	  __throw_overflow_error(__N("_Base_bitset::_M_do_to_ulong"));
-      return _M_w[0];
-    }
-
-#if __cplusplus >= 201103L
-  template<size_t _Nw>
-    unsigned long long
-    _Base_bitset<_Nw>::_M_do_to_ullong() const
-    {
-      const bool __dw = sizeof(unsigned long long) > sizeof(unsigned long);
-      for (size_t __i = 1 + __dw; __i < _Nw; ++__i)
-	if (_M_w[__i])
-	  __throw_overflow_error(__N("_Base_bitset::_M_do_to_ullong"));
-
-      if (__dw)
-	return _M_w[0] + (static_cast<unsigned long long>(_M_w[1])
-			  << _GLIBCXX_BITSET_BITS_PER_WORD);
-      return _M_w[0];
-    }
-#endif
-
-  template<size_t _Nw>
-    size_t
-    _Base_bitset<_Nw>::
-    _M_do_find_first(size_t __not_found) const _GLIBCXX_NOEXCEPT
-    {
-      for (size_t __i = 0; __i < _Nw; __i++)
-	{
-	  _WordT __thisword = _M_w[__i];
-	  if (__thisword != static_cast<_WordT>(0))
-	    return (__i * _GLIBCXX_BITSET_BITS_PER_WORD
-		    + __builtin_ctzl(__thisword));
-	}
-      // not found, so return an indication of failure.
-      return __not_found;
-    }
-
-  template<size_t _Nw>
-    size_t
-    _Base_bitset<_Nw>::
-    _M_do_find_next(size_t __prev, size_t __not_found) const _GLIBCXX_NOEXCEPT
-    {
-      // make bound inclusive
-      ++__prev;
-
-      // check out of bounds
-      if (__prev >= _Nw * _GLIBCXX_BITSET_BITS_PER_WORD)
-	return __not_found;
-
-      // search first word
-      size_t __i = _S_whichword(__prev);
-      _WordT __thisword = _M_w[__i];
-
-      // mask off bits below bound
-      __thisword &= (~static_cast<_WordT>(0)) << _S_whichbit(__prev);
-
-      if (__thisword != static_cast<_WordT>(0))
-	return (__i * _GLIBCXX_BITSET_BITS_PER_WORD
-		+ __builtin_ctzl(__thisword));
-
-      // check subsequent words
-      __i++;
-      for (; __i < _Nw; __i++)
-	{
-	  __thisword = _M_w[__i];
-	  if (__thisword != static_cast<_WordT>(0))
-	    return (__i * _GLIBCXX_BITSET_BITS_PER_WORD
-		    + __builtin_ctzl(__thisword));
-	}
-      // not found, so return an indication of failure.
-      return __not_found;
-    } // end _M_do_find_next
-
-  /**
-   *  Base class, specialization for a single word.
-   *
-   *  See documentation for bitset.
-  */
-  template<>
-    struct _Base_bitset<1>
-    {
-      typedef unsigned long _WordT;
-      _WordT _M_w;
-
-      _GLIBCXX_CONSTEXPR _Base_bitset() _GLIBCXX_NOEXCEPT
-      : _M_w(0)
-      { }
-
-#if __cplusplus >= 201103L
-      constexpr _Base_bitset(unsigned long long __val) noexcept
-#else
-      _Base_bitset(unsigned long __val)
-#endif
-      : _M_w(__val)
-      { }
-
-      static _GLIBCXX_CONSTEXPR size_t
-      _S_whichword(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static _GLIBCXX_CONSTEXPR size_t
-      _S_whichbyte(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
-
-      static _GLIBCXX_CONSTEXPR size_t
-      _S_whichbit(size_t __pos) _GLIBCXX_NOEXCEPT
-      {  return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static _GLIBCXX_CONSTEXPR _WordT
-      _S_maskbit(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return (static_cast<_WordT>(1)) << _S_whichbit(__pos); }
-
-      _WordT&
-      _M_getword(size_t) _GLIBCXX_NOEXCEPT
-      { return _M_w; }
-
-      _GLIBCXX_CONSTEXPR _WordT
-      _M_getword(size_t) const _GLIBCXX_NOEXCEPT
-      { return _M_w; }
-
-#if __cplusplus >= 201103L
-      const _WordT*
-      _M_getdata() const noexcept
-      { return &_M_w; }
-#endif
-
-      _WordT&
-      _M_hiword() _GLIBCXX_NOEXCEPT
-      { return _M_w; }
-
-      _GLIBCXX_CONSTEXPR _WordT
-      _M_hiword() const _GLIBCXX_NOEXCEPT
-      { return _M_w; }
-
-      void
-      _M_do_and(const _Base_bitset<1>& __x) _GLIBCXX_NOEXCEPT
-      { _M_w &= __x._M_w; }
-
-      void
-      _M_do_or(const _Base_bitset<1>& __x) _GLIBCXX_NOEXCEPT
-      { _M_w |= __x._M_w; }
-
-      void
-      _M_do_xor(const _Base_bitset<1>& __x) _GLIBCXX_NOEXCEPT
-      { _M_w ^= __x._M_w; }
-
-      void
-      _M_do_left_shift(size_t __shift) _GLIBCXX_NOEXCEPT
-      { _M_w <<= __shift; }
-
-      void
-      _M_do_right_shift(size_t __shift) _GLIBCXX_NOEXCEPT
-      { _M_w >>= __shift; }
-
-      void
-      _M_do_flip() _GLIBCXX_NOEXCEPT
-      { _M_w = ~_M_w; }
-
-      void
-      _M_do_set() _GLIBCXX_NOEXCEPT
-      { _M_w = ~static_cast<_WordT>(0); }
-
-      void
-      _M_do_reset() _GLIBCXX_NOEXCEPT
-      { _M_w = 0; }
-
-      bool
-      _M_is_equal(const _Base_bitset<1>& __x) const _GLIBCXX_NOEXCEPT
-      { return _M_w == __x._M_w; }
-
-      template<size_t _Nb>
-        bool
-        _M_are_all() const _GLIBCXX_NOEXCEPT
-        { return _M_w == (~static_cast<_WordT>(0)
-			  >> (_GLIBCXX_BITSET_BITS_PER_WORD - _Nb)); }
-
-      bool
-      _M_is_any() const _GLIBCXX_NOEXCEPT
-      { return _M_w != 0; }
-
-      size_t
-      _M_do_count() const _GLIBCXX_NOEXCEPT
-      { return __builtin_popcountl(_M_w); }
-
-      unsigned long
-      _M_do_to_ulong() const _GLIBCXX_NOEXCEPT
-      { return _M_w; }
-
-#if __cplusplus >= 201103L
-      unsigned long long
-      _M_do_to_ullong() const noexcept
-      { return _M_w; }
-#endif
-
-      size_t
-      _M_do_find_first(size_t __not_found) const _GLIBCXX_NOEXCEPT
-      {
-        if (_M_w != 0)
-          return __builtin_ctzl(_M_w);
-        else
-          return __not_found;
-      }
-
-      // find the next "on" bit that follows "prev"
-      size_t
-      _M_do_find_next(size_t __prev, size_t __not_found) const
-	_GLIBCXX_NOEXCEPT
-      {
-	++__prev;
-	if (__prev >= ((size_t) _GLIBCXX_BITSET_BITS_PER_WORD))
-	  return __not_found;
-
-	_WordT __x = _M_w >> __prev;
-	if (__x != 0)
-	  return __builtin_ctzl(__x) + __prev;
-	else
-	  return __not_found;
-      }
-    };
-
-  /**
-   *  Base class, specialization for no storage (zero-length %bitset).
-   *
-   *  See documentation for bitset.
-  */
-  template<>
-    struct _Base_bitset<0>
-    {
-      typedef unsigned long _WordT;
-
-      _GLIBCXX_CONSTEXPR _Base_bitset() _GLIBCXX_NOEXCEPT
-      { }
-
-#if __cplusplus >= 201103L
-      constexpr _Base_bitset(unsigned long long) noexcept
-#else
-      _Base_bitset(unsigned long)
-#endif
-      { }
-
-      static _GLIBCXX_CONSTEXPR size_t
-      _S_whichword(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static _GLIBCXX_CONSTEXPR size_t
-      _S_whichbyte(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
-
-      static _GLIBCXX_CONSTEXPR size_t
-      _S_whichbit(size_t __pos) _GLIBCXX_NOEXCEPT
-      {  return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static _GLIBCXX_CONSTEXPR _WordT
-      _S_maskbit(size_t __pos) _GLIBCXX_NOEXCEPT
-      { return (static_cast<_WordT>(1)) << _S_whichbit(__pos); }
-
-      // This would normally give access to the data.  The bounds-checking
-      // in the bitset class will prevent the user from getting this far,
-      // but (1) it must still return an lvalue to compile, and (2) the
-      // user might call _Unchecked_set directly, in which case this /needs/
-      // to fail.  Let's not penalize zero-length users unless they actually
-      // make an unchecked call; all the memory ugliness is therefore
-      // localized to this single should-never-get-this-far function.
-      _WordT&
-      _M_getword(size_t) _GLIBCXX_NOEXCEPT
-      {
-	__throw_out_of_range(__N("_Base_bitset::_M_getword")); 
-	return *new _WordT;
-      }
-
-      _GLIBCXX_CONSTEXPR _WordT
-      _M_getword(size_t __pos) const _GLIBCXX_NOEXCEPT
-      { return 0; }
-
-      _GLIBCXX_CONSTEXPR _WordT
-      _M_hiword() const _GLIBCXX_NOEXCEPT
-      { return 0; }
-
-      void
-      _M_do_and(const _Base_bitset<0>&) _GLIBCXX_NOEXCEPT
-      { }
-
-      void
-      _M_do_or(const _Base_bitset<0>&) _GLIBCXX_NOEXCEPT
-      { }
-
-      void
-      _M_do_xor(const _Base_bitset<0>&) _GLIBCXX_NOEXCEPT
-      { }
-
-      void
-      _M_do_left_shift(size_t) _GLIBCXX_NOEXCEPT
-      { }
-
-      void
-      _M_do_right_shift(size_t) _GLIBCXX_NOEXCEPT
-      { }
-
-      void
-      _M_do_flip() _GLIBCXX_NOEXCEPT
-      { }
-
-      void
-      _M_do_set() _GLIBCXX_NOEXCEPT
-      { }
-
-      void
-      _M_do_reset() _GLIBCXX_NOEXCEPT
-      { }
-
-      // Are all empty bitsets equal to each other?  Are they equal to
-      // themselves?  How to compare a thing which has no state?  What is
-      // the sound of one zero-length bitset clapping?
-      bool
-      _M_is_equal(const _Base_bitset<0>&) const _GLIBCXX_NOEXCEPT
-      { return true; }
-
-      template<size_t _Nb>
-        bool
-        _M_are_all() const _GLIBCXX_NOEXCEPT
-        { return true; }
-
-      bool
-      _M_is_any() const _GLIBCXX_NOEXCEPT
-      { return false; }
-
-      size_t
-      _M_do_count() const _GLIBCXX_NOEXCEPT
-      { return 0; }
-
-      unsigned long
-      _M_do_to_ulong() const _GLIBCXX_NOEXCEPT
-      { return 0; }
-
-#if __cplusplus >= 201103L
-      unsigned long long
-      _M_do_to_ullong() const noexcept
-      { return 0; }
-#endif
-
-      // Normally "not found" is the size, but that could also be
-      // misinterpreted as an index in this corner case.  Oh well.
-      size_t
-      _M_do_find_first(size_t) const _GLIBCXX_NOEXCEPT
-      { return 0; }
-
-      size_t
-      _M_do_find_next(size_t, size_t) const _GLIBCXX_NOEXCEPT
-      { return 0; }
-    };
-
-
-  // Helper class to zero out the unused high-order bits in the highest word.
-  template<size_t _Extrabits>
-    struct _Sanitize
-    {
-      typedef unsigned long _WordT;
-
-      static void
-      _S_do_sanitize(_WordT& __val) _GLIBCXX_NOEXCEPT
-      { __val &= ~((~static_cast<_WordT>(0)) << _Extrabits); }
-    };
-
-  template<>
-    struct _Sanitize<0>
-    {
-      typedef unsigned long _WordT;
-
-      static void
-      _S_do_sanitize(_WordT) _GLIBCXX_NOEXCEPT { } 
-    };
-
-#if __cplusplus >= 201103L
-  template<size_t _Nb, bool = (_Nb < _GLIBCXX_BITSET_BITS_PER_ULL)>
-    struct _Sanitize_val
-    {
-      static constexpr unsigned long long
-      _S_do_sanitize_val(unsigned long long __val)
-      { return __val; }
-    };
-
-  template<size_t _Nb>
-    struct _Sanitize_val<_Nb, true>
-    {
-      static constexpr unsigned long long
-      _S_do_sanitize_val(unsigned long long __val)
-      { return __val & ~((~static_cast<unsigned long long>(0)) << _Nb); }
-    };
-#endif
-
-  /**
-   *  @brief The %bitset class represents a @e fixed-size sequence of bits.
-   *  @ingroup utilities
-   *
-   *  (Note that %bitset does @e not meet the formal requirements of a
-   *  <a href="tables.html#65">container</a>.  Mainly, it lacks iterators.)
-   *
-   *  The template argument, @a Nb, may be any non-negative number,
-   *  specifying the number of bits (e.g., "0", "12", "1024*1024").
-   *
-   *  In the general unoptimized case, storage is allocated in word-sized
-   *  blocks.  Let B be the number of bits in a word, then (Nb+(B-1))/B
-   *  words will be used for storage.  B - Nb%B bits are unused.  (They are
-   *  the high-order bits in the highest word.)  It is a class invariant
-   *  that those unused bits are always zero.
-   *
-   *  If you think of %bitset as <em>a simple array of bits</em>, be
-   *  aware that your mental picture is reversed: a %bitset behaves
-   *  the same way as bits in integers do, with the bit at index 0 in
-   *  the <em>least significant / right-hand</em> position, and the bit at
-   *  index Nb-1 in the <em>most significant / left-hand</em> position.
-   *  Thus, unlike other containers, a %bitset's index <em>counts from
-   *  right to left</em>, to put it very loosely.
-   *
-   *  This behavior is preserved when translating to and from strings.  For
-   *  example, the first line of the following program probably prints
-   *  <em>b(&apos;a&apos;) is 0001100001</em> on a modern ASCII system.
-   *
-   *  @code
-   *     #include <bitset>
-   *     #include <iostream>
-   *     #include <sstream>
-   *
-   *     using namespace std;
-   *
-   *     int main()
-   *     {
-   *         long         a = 'a';
-   *         bitset<10>   b(a);
-   *
-   *         cout << "b('a') is " << b << endl;
-   *
-   *         ostringstream s;
-   *         s << b;
-   *         string  str = s.str();
-   *         cout << "index 3 in the string is " << str[3] << " but\n"
-   *              << "index 3 in the bitset is " << b[3] << endl;
-   *     }
-   *  @endcode
-   *
-   *  Also see:
-   *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/ext_containers.html
-   *  for a description of extensions.
-   *
-   *  Most of the actual code isn't contained in %bitset<> itself, but in the
-   *  base class _Base_bitset.  The base class works with whole words, not with
-   *  individual bits.  This allows us to specialize _Base_bitset for the
-   *  important special case where the %bitset is only a single word.
-   *
-   *  Extra confusion can result due to the fact that the storage for
-   *  _Base_bitset @e is a regular array, and is indexed as such.  This is
-   *  carefully encapsulated.
-  */
-  template<size_t _Nb>
-    class bitset
-    : private _Base_bitset<_GLIBCXX_BITSET_WORDS(_Nb)>
-    {
-    private:
-      typedef _Base_bitset<_GLIBCXX_BITSET_WORDS(_Nb)> _Base;
-      typedef unsigned long _WordT;
-
-      template<class _CharT, class _Traits, class _Alloc>
-      void
-      _M_check_initial_position(const std::basic_string<_CharT, _Traits, _Alloc>& __s,
-				size_t __position) const
-      {
-	if (__position > __s.size())
-	  __throw_out_of_range_fmt(__N("bitset::bitset: __position "
-				       "(which is %zu) > __s.size() "
-				       "(which is %zu)"),
-				   __position, __s.size());
-      }
-
-      void _M_check(size_t __position, const char *__s) const
-      {
-	if (__position >= _Nb)
-	  __throw_out_of_range_fmt(__N("%s: __position (which is %zu) "
-				       ">= _Nb (which is %zu)"),
-				   __s, __position, _Nb);
-      }
-
-      void
-      _M_do_sanitize() _GLIBCXX_NOEXCEPT
-      { 
-	typedef _Sanitize<_Nb % _GLIBCXX_BITSET_BITS_PER_WORD> __sanitize_type;
-	__sanitize_type::_S_do_sanitize(this->_M_hiword());
-      }
-
-#if __cplusplus >= 201103L
-      template<typename> friend struct hash;
-#endif
-
-    public:
-      /**
-       *  This encapsulates the concept of a single bit.  An instance of this
-       *  class is a proxy for an actual bit; this way the individual bit
-       *  operations are done as faster word-size bitwise instructions.
-       *
-       *  Most users will never need to use this class directly; conversions
-       *  to and from bool are automatic and should be transparent.  Overloaded
-       *  operators help to preserve the illusion.
-       *
-       *  (On a typical system, this <em>bit %reference</em> is 64
-       *  times the size of an actual bit.  Ha.)
-       */
-      class reference
-      {
-	friend class bitset;
-
-	_WordT*	_M_wp;
-	size_t 	_M_bpos;
-	
-	// left undefined
-	reference();
-	
-      public:
-	reference(bitset& __b, size_t __pos) _GLIBCXX_NOEXCEPT
-	{
-	  _M_wp = &__b._M_getword(__pos);
-	  _M_bpos = _Base::_S_whichbit(__pos);
-	}
-
-	~reference() _GLIBCXX_NOEXCEPT
-	{ }
-
-	// For b[i] = __x;
-	reference&
-	operator=(bool __x) _GLIBCXX_NOEXCEPT
-	{
-	  if (__x)
-	    *_M_wp |= _Base::_S_maskbit(_M_bpos);
-	  else
-	    *_M_wp &= ~_Base::_S_maskbit(_M_bpos);
-	  return *this;
-	}
-
-	// For b[i] = b[__j];
-	reference&
-	operator=(const reference& __j) _GLIBCXX_NOEXCEPT
-	{
-	  if ((*(__j._M_wp) & _Base::_S_maskbit(__j._M_bpos)))
-	    *_M_wp |= _Base::_S_maskbit(_M_bpos);
-	  else
-	    *_M_wp &= ~_Base::_S_maskbit(_M_bpos);
-	  return *this;
-	}
-
-	// Flips the bit
-	bool
-	operator~() const _GLIBCXX_NOEXCEPT
-	{ return (*(_M_wp) & _Base::_S_maskbit(_M_bpos)) == 0; }
-
-	// For __x = b[i];
-	operator bool() const _GLIBCXX_NOEXCEPT
-	{ return (*(_M_wp) & _Base::_S_maskbit(_M_bpos)) != 0; }
-
-	// For b[i].flip();
-	reference&
-	flip() _GLIBCXX_NOEXCEPT
-	{
-	  *_M_wp ^= _Base::_S_maskbit(_M_bpos);
-	  return *this;
-	}
-      };
-      friend class reference;
-
-      // 23.3.5.1 constructors:
-      /// All bits set to zero.
-      _GLIBCXX_CONSTEXPR bitset() _GLIBCXX_NOEXCEPT
-      { }
-
-      /// Initial bits bitwise-copied from a single word (others set to zero).
-#if __cplusplus >= 201103L
-      constexpr bitset(unsigned long long __val) noexcept
-      : _Base(_Sanitize_val<_Nb>::_S_do_sanitize_val(__val)) { }
-#else
-      bitset(unsigned long __val)
-      : _Base(__val)
-      { _M_do_sanitize(); }
-#endif
-
-      /**
-       *  Use a subset of a string.
-       *  @param  __s  A string of @a 0 and @a 1 characters.
-       *  @param  __position  Index of the first character in @a __s to use;
-       *                    defaults to zero.
-       *  @throw  std::out_of_range  If @a pos is bigger the size of @a __s.
-       *  @throw  std::invalid_argument  If a character appears in the string
-       *                                 which is neither @a 0 nor @a 1.
-       */
-      template<class _CharT, class _Traits, class _Alloc>
-	explicit
-	bitset(const std::basic_string<_CharT, _Traits, _Alloc>& __s,
-	       size_t __position = 0)
-	: _Base()
-	{
-	  _M_check_initial_position(__s, __position);
-	  _M_copy_from_string(__s, __position,
-			      std::basic_string<_CharT, _Traits, _Alloc>::npos,
-			      _CharT('0'), _CharT('1'));
-	}
-
-      /**
-       *  Use a subset of a string.
-       *  @param  __s  A string of @a 0 and @a 1 characters.
-       *  @param  __position  Index of the first character in @a __s to use.
-       *  @param  __n    The number of characters to copy.
-       *  @throw std::out_of_range If @a __position is bigger the size
-       *  of @a __s.
-       *  @throw  std::invalid_argument  If a character appears in the string
-       *                                 which is neither @a 0 nor @a 1.
-       */
-      template<class _CharT, class _Traits, class _Alloc>
-	bitset(const std::basic_string<_CharT, _Traits, _Alloc>& __s,
-	       size_t __position, size_t __n)
-	: _Base()
-	{
-	  _M_check_initial_position(__s, __position);
-	  _M_copy_from_string(__s, __position, __n, _CharT('0'), _CharT('1'));
-	}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 396. what are characters zero and one.
-      template<class _CharT, class _Traits, class _Alloc>
-	bitset(const std::basic_string<_CharT, _Traits, _Alloc>& __s,
-	       size_t __position, size_t __n,
-	       _CharT __zero, _CharT __one = _CharT('1'))
-	: _Base()
-	{
-	  _M_check_initial_position(__s, __position);
-	  _M_copy_from_string(__s, __position, __n, __zero, __one);
-	}
-
-#if __cplusplus >= 201103L
-      /**
-       *  Construct from a character %array.
-       *  @param  __str  An %array of characters @a zero and @a one.
-       *  @param  __n    The number of characters to use.
-       *  @param  __zero The character corresponding to the value 0.
-       *  @param  __one  The character corresponding to the value 1.
-       *  @throw  std::invalid_argument If a character appears in the string
-       *                                which is neither @a __zero nor @a __one.
-       */
-      template<typename _CharT>
-        explicit
-        bitset(const _CharT* __str,
-	       typename std::basic_string<_CharT>::size_type __n
-	       = std::basic_string<_CharT>::npos,
-	       _CharT __zero = _CharT('0'), _CharT __one = _CharT('1'))
-        : _Base()
-        {
-	  if (!__str)
-	    __throw_logic_error(__N("bitset::bitset(const _CharT*, ...)"));
-
-	  if (__n == std::basic_string<_CharT>::npos)
-	    __n = std::char_traits<_CharT>::length(__str);
-	  _M_copy_from_ptr<_CharT, std::char_traits<_CharT>>(__str, __n, 0,
-							     __n, __zero,
-							     __one);
-	}
-#endif
-
-      // 23.3.5.2 bitset operations:
-      //@{
-      /**
-       *  Operations on bitsets.
-       *  @param  __rhs  A same-sized bitset.
-       *
-       *  These should be self-explanatory.
-       */
-      bitset<_Nb>&
-      operator&=(const bitset<_Nb>& __rhs) _GLIBCXX_NOEXCEPT
-      {
-	this->_M_do_and(__rhs);
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator|=(const bitset<_Nb>& __rhs) _GLIBCXX_NOEXCEPT
-      {
-	this->_M_do_or(__rhs);
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator^=(const bitset<_Nb>& __rhs) _GLIBCXX_NOEXCEPT
-      {
-	this->_M_do_xor(__rhs);
-	return *this;
-      }
-      //@}
-      
-      //@{
-      /**
-       *  Operations on bitsets.
-       *  @param  __position  The number of places to shift.
-       *
-       *  These should be self-explanatory.
-       */
-      bitset<_Nb>&
-      operator<<=(size_t __position) _GLIBCXX_NOEXCEPT
-      {
-	if (__builtin_expect(__position < _Nb, 1))
-	  {
-	    this->_M_do_left_shift(__position);
-	    this->_M_do_sanitize();
-	  }
-	else
-	  this->_M_do_reset();
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator>>=(size_t __position) _GLIBCXX_NOEXCEPT
-      {
-	if (__builtin_expect(__position < _Nb, 1))
-	  {
-	    this->_M_do_right_shift(__position);
-	    this->_M_do_sanitize();
-	  }
-	else
-	  this->_M_do_reset();
-	return *this;
-      }
-      //@}
-      
-      //@{
-      /**
-       *  These versions of single-bit set, reset, flip, and test are
-       *  extensions from the SGI version.  They do no range checking.
-       *  @ingroup SGIextensions
-       */
-      bitset<_Nb>&
-      _Unchecked_set(size_t __pos) _GLIBCXX_NOEXCEPT
-      {
-	this->_M_getword(__pos) |= _Base::_S_maskbit(__pos);
-	return *this;
-      }
-
-      bitset<_Nb>&
-      _Unchecked_set(size_t __pos, int __val) _GLIBCXX_NOEXCEPT
-      {
-	if (__val)
-	  this->_M_getword(__pos) |= _Base::_S_maskbit(__pos);
-	else
-	  this->_M_getword(__pos) &= ~_Base::_S_maskbit(__pos);
-	return *this;
-      }
-
-      bitset<_Nb>&
-      _Unchecked_reset(size_t __pos) _GLIBCXX_NOEXCEPT
-      {
-	this->_M_getword(__pos) &= ~_Base::_S_maskbit(__pos);
-	return *this;
-      }
-
-      bitset<_Nb>&
-      _Unchecked_flip(size_t __pos) _GLIBCXX_NOEXCEPT
-      {
-	this->_M_getword(__pos) ^= _Base::_S_maskbit(__pos);
-	return *this;
-      }
-
-      _GLIBCXX_CONSTEXPR bool
-      _Unchecked_test(size_t __pos) const _GLIBCXX_NOEXCEPT
-      { return ((this->_M_getword(__pos) & _Base::_S_maskbit(__pos))
-		!= static_cast<_WordT>(0)); }
-      //@}
-      
-      // Set, reset, and flip.
-      /**
-       *  @brief Sets every bit to true.
-       */
-      bitset<_Nb>&
-      set() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_do_set();
-	this->_M_do_sanitize();
-	return *this;
-      }
-
-      /**
-       *  @brief Sets a given bit to a particular value.
-       *  @param  __position  The index of the bit.
-       *  @param  __val  Either true or false, defaults to true.
-       *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
-       */
-      bitset<_Nb>&
-      set(size_t __position, bool __val = true)
-      {
-	this->_M_check(__position, __N("bitset::set"));
-	return _Unchecked_set(__position, __val);
-      }
-
-      /**
-       *  @brief Sets every bit to false.
-       */
-      bitset<_Nb>&
-      reset() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_do_reset();
-	return *this;
-      }
-
-      /**
-       *  @brief Sets a given bit to false.
-       *  @param  __position  The index of the bit.
-       *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
-       *
-       *  Same as writing @c set(pos,false).
-       */
-      bitset<_Nb>&
-      reset(size_t __position)
-      {
-	this->_M_check(__position, __N("bitset::reset"));
-	return _Unchecked_reset(__position);
-      }
-      
-      /**
-       *  @brief Toggles every bit to its opposite value.
-       */
-      bitset<_Nb>&
-      flip() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_do_flip();
-	this->_M_do_sanitize();
-	return *this;
-      }
-
-      /**
-       *  @brief Toggles a given bit to its opposite value.
-       *  @param  __position  The index of the bit.
-       *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
-       */
-      bitset<_Nb>&
-      flip(size_t __position)
-      {
-	this->_M_check(__position, __N("bitset::flip"));
-	return _Unchecked_flip(__position);
-      }
-      
-      /// See the no-argument flip().
-      bitset<_Nb>
-      operator~() const _GLIBCXX_NOEXCEPT
-      { return bitset<_Nb>(*this).flip(); }
-
-      //@{
-      /**
-       *  @brief  Array-indexing support.
-       *  @param  __position  Index into the %bitset.
-       *  @return A bool for a <em>const %bitset</em>.  For non-const
-       *           bitsets, an instance of the reference proxy class.
-       *  @note  These operators do no range checking and throw no exceptions,
-       *         as required by DR 11 to the standard.
-       *
-       *  _GLIBCXX_RESOLVE_LIB_DEFECTS Note that this implementation already
-       *  resolves DR 11 (items 1 and 2), but does not do the range-checking
-       *  required by that DR's resolution.  -pme
-       *  The DR has since been changed:  range-checking is a precondition
-       *  (users' responsibility), and these functions must not throw.  -pme
-       */
-      reference
-      operator[](size_t __position)
-      { return reference(*this, __position); }
-
-      _GLIBCXX_CONSTEXPR bool
-      operator[](size_t __position) const
-      { return _Unchecked_test(__position); }
-      //@}
-      
-      /**
-       *  @brief Returns a numerical interpretation of the %bitset.
-       *  @return  The integral equivalent of the bits.
-       *  @throw  std::overflow_error  If there are too many bits to be
-       *                               represented in an @c unsigned @c long.
-       */
-      unsigned long
-      to_ulong() const
-      { return this->_M_do_to_ulong(); }
-
-#if __cplusplus >= 201103L
-      unsigned long long
-      to_ullong() const
-      { return this->_M_do_to_ullong(); }
-#endif
-
-      /**
-       *  @brief Returns a character interpretation of the %bitset.
-       *  @return  The string equivalent of the bits.
-       *
-       *  Note the ordering of the bits:  decreasing character positions
-       *  correspond to increasing bit positions (see the main class notes for
-       *  an example).
-       */
-      template<class _CharT, class _Traits, class _Alloc>
-	std::basic_string<_CharT, _Traits, _Alloc>
-	to_string() const
-	{
-	  std::basic_string<_CharT, _Traits, _Alloc> __result;
-	  _M_copy_to_string(__result, _CharT('0'), _CharT('1'));
-	  return __result;
-	}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 396. what are characters zero and one.
-      template<class _CharT, class _Traits, class _Alloc>
-	std::basic_string<_CharT, _Traits, _Alloc>
-	to_string(_CharT __zero, _CharT __one = _CharT('1')) const
-	{
-	  std::basic_string<_CharT, _Traits, _Alloc> __result;
-	  _M_copy_to_string(__result, __zero, __one);
-	  return __result;
-	}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 434. bitset::to_string() hard to use.
-      template<class _CharT, class _Traits>
-	std::basic_string<_CharT, _Traits, std::allocator<_CharT> >
-	to_string() const
-	{ return to_string<_CharT, _Traits, std::allocator<_CharT> >(); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 853. to_string needs updating with zero and one.
-      template<class _CharT, class _Traits>
-	std::basic_string<_CharT, _Traits, std::allocator<_CharT> >
-	to_string(_CharT __zero, _CharT __one = _CharT('1')) const
-	{ return to_string<_CharT, _Traits,
-	                   std::allocator<_CharT> >(__zero, __one); }
-
-      template<class _CharT>
-	std::basic_string<_CharT, std::char_traits<_CharT>,
-	                  std::allocator<_CharT> >
-	to_string() const
-	{
-	  return to_string<_CharT, std::char_traits<_CharT>,
-	                   std::allocator<_CharT> >();
-	}
-
-      template<class _CharT>
-	std::basic_string<_CharT, std::char_traits<_CharT>,
-	                  std::allocator<_CharT> >
-	to_string(_CharT __zero, _CharT __one = _CharT('1')) const
-	{
-	  return to_string<_CharT, std::char_traits<_CharT>,
-	                   std::allocator<_CharT> >(__zero, __one);
-	}
-
-      std::basic_string<char, std::char_traits<char>, std::allocator<char> >
-      to_string() const
-      {
-	return to_string<char, std::char_traits<char>,
-	                 std::allocator<char> >();
-      }
-
-      std::basic_string<char, std::char_traits<char>, std::allocator<char> >
-      to_string(char __zero, char __one = '1') const
-      {
-	return to_string<char, std::char_traits<char>,
-	                 std::allocator<char> >(__zero, __one);
-      }
-
-      // Helper functions for string operations.
-      template<class _CharT, class _Traits>
-        void
-        _M_copy_from_ptr(const _CharT*, size_t, size_t, size_t,
-			 _CharT, _CharT);
-
-      template<class _CharT, class _Traits, class _Alloc>
-	void
-	_M_copy_from_string(const std::basic_string<_CharT,
-			    _Traits, _Alloc>& __s, size_t __pos, size_t __n,
-			    _CharT __zero, _CharT __one)
-	{ _M_copy_from_ptr<_CharT, _Traits>(__s.data(), __s.size(), __pos, __n,
-					    __zero, __one); }
-
-      template<class _CharT, class _Traits, class _Alloc>
-	void
-        _M_copy_to_string(std::basic_string<_CharT, _Traits, _Alloc>&,
-			  _CharT, _CharT) const;
-
-      // NB: Backward compat.
-      template<class _CharT, class _Traits, class _Alloc>
-	void
-	_M_copy_from_string(const std::basic_string<_CharT,
-			    _Traits, _Alloc>& __s, size_t __pos, size_t __n)
-	{ _M_copy_from_string(__s, __pos, __n, _CharT('0'), _CharT('1')); }
-
-      template<class _CharT, class _Traits, class _Alloc>
-	void
-        _M_copy_to_string(std::basic_string<_CharT, _Traits,_Alloc>& __s) const
-	{ _M_copy_to_string(__s, _CharT('0'), _CharT('1')); }
-
-      /// Returns the number of bits which are set.
-      size_t
-      count() const _GLIBCXX_NOEXCEPT
-      { return this->_M_do_count(); }
-
-      /// Returns the total number of bits.
-      _GLIBCXX_CONSTEXPR size_t
-      size() const _GLIBCXX_NOEXCEPT
-      { return _Nb; }
-
-      //@{
-      /// These comparisons for equality/inequality are, well, @e bitwise.
-      bool
-      operator==(const bitset<_Nb>& __rhs) const _GLIBCXX_NOEXCEPT
-      { return this->_M_is_equal(__rhs); }
-
-      bool
-      operator!=(const bitset<_Nb>& __rhs) const _GLIBCXX_NOEXCEPT
-      { return !this->_M_is_equal(__rhs); }
-      //@}
-      
-      /**
-       *  @brief Tests the value of a bit.
-       *  @param  __position  The index of a bit.
-       *  @return  The value at @a pos.
-       *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
-       */
-      bool
-      test(size_t __position) const
-      {
-	this->_M_check(__position, __N("bitset::test"));
-	return _Unchecked_test(__position);
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 693. std::bitset::all() missing.
-      /**
-       *  @brief Tests whether all the bits are on.
-       *  @return  True if all the bits are set.
-       */
-      bool
-      all() const _GLIBCXX_NOEXCEPT
-      { return this->template _M_are_all<_Nb>(); }
-
-      /**
-       *  @brief Tests whether any of the bits are on.
-       *  @return  True if at least one bit is set.
-       */
-      bool
-      any() const _GLIBCXX_NOEXCEPT
-      { return this->_M_is_any(); }
-
-      /**
-       *  @brief Tests whether any of the bits are on.
-       *  @return  True if none of the bits are set.
-       */
-      bool
-      none() const _GLIBCXX_NOEXCEPT
-      { return !this->_M_is_any(); }
-
-      //@{
-      /// Self-explanatory.
-      bitset<_Nb>
-      operator<<(size_t __position) const _GLIBCXX_NOEXCEPT
-      { return bitset<_Nb>(*this) <<= __position; }
-
-      bitset<_Nb>
-      operator>>(size_t __position) const _GLIBCXX_NOEXCEPT
-      { return bitset<_Nb>(*this) >>= __position; }
-      //@}
-      
-      /**
-       *  @brief  Finds the index of the first "on" bit.
-       *  @return  The index of the first bit set, or size() if not found.
-       *  @ingroup SGIextensions
-       *  @sa  _Find_next
-       */
-      size_t
-      _Find_first() const _GLIBCXX_NOEXCEPT
-      { return this->_M_do_find_first(_Nb); }
-
-      /**
-       *  @brief  Finds the index of the next "on" bit after prev.
-       *  @return  The index of the next bit set, or size() if not found.
-       *  @param  __prev  Where to start searching.
-       *  @ingroup SGIextensions
-       *  @sa  _Find_first
-       */
-      size_t
-      _Find_next(size_t __prev) const _GLIBCXX_NOEXCEPT
-      { return this->_M_do_find_next(__prev, _Nb); }
-    };
-
-  // Definitions of non-inline member functions.
-  template<size_t _Nb>
-    template<class _CharT, class _Traits>
-      void
-      bitset<_Nb>::
-      _M_copy_from_ptr(const _CharT* __s, size_t __len,
-		       size_t __pos, size_t __n, _CharT __zero, _CharT __one)
-      {
-	reset();
-	const size_t __nbits = std::min(_Nb, std::min(__n, size_t(__len - __pos)));
-	for (size_t __i = __nbits; __i > 0; --__i)
-	  {
-	    const _CharT __c = __s[__pos + __nbits - __i];
-	    if (_Traits::eq(__c, __zero))
-	      ;
-	    else if (_Traits::eq(__c, __one))
-	      _Unchecked_set(__i - 1);
-	    else
-	      __throw_invalid_argument(__N("bitset::_M_copy_from_ptr"));
-	  }
-      }
-
-  template<size_t _Nb>
-    template<class _CharT, class _Traits, class _Alloc>
-      void
-      bitset<_Nb>::
-      _M_copy_to_string(std::basic_string<_CharT, _Traits, _Alloc>& __s,
-			_CharT __zero, _CharT __one) const
-      {
-	__s.assign(_Nb, __zero);
-	for (size_t __i = _Nb; __i > 0; --__i)
-	  if (_Unchecked_test(__i - 1))
-	    _Traits::assign(__s[_Nb - __i], __one);
-      }
-
-  // 23.3.5.3 bitset operations:
-  //@{
-  /**
-   *  @brief  Global bitwise operations on bitsets.
-   *  @param  __x  A bitset.
-   *  @param  __y  A bitset of the same size as @a __x.
-   *  @return  A new bitset.
-   *
-   *  These should be self-explanatory.
-  */
-  template<size_t _Nb>
-    inline bitset<_Nb>
-    operator&(const bitset<_Nb>& __x, const bitset<_Nb>& __y) _GLIBCXX_NOEXCEPT
-    {
-      bitset<_Nb> __result(__x);
-      __result &= __y;
-      return __result;
-    }
-
-  template<size_t _Nb>
-    inline bitset<_Nb>
-    operator|(const bitset<_Nb>& __x, const bitset<_Nb>& __y) _GLIBCXX_NOEXCEPT
-    {
-      bitset<_Nb> __result(__x);
-      __result |= __y;
-      return __result;
-    }
-
-  template <size_t _Nb>
-    inline bitset<_Nb>
-    operator^(const bitset<_Nb>& __x, const bitset<_Nb>& __y) _GLIBCXX_NOEXCEPT
-    {
-      bitset<_Nb> __result(__x);
-      __result ^= __y;
-      return __result;
-    }
-  //@}
-
-  //@{
-  /**
-   *  @brief Global I/O operators for bitsets.
-   *
-   *  Direct I/O between streams and bitsets is supported.  Output is
-   *  straightforward.  Input will skip whitespace, only accept @a 0 and @a 1
-   *  characters, and will only extract as many digits as the %bitset will
-   *  hold.
-  */
-  template<class _CharT, class _Traits, size_t _Nb>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is, bitset<_Nb>& __x)
-    {
-      typedef typename _Traits::char_type          char_type;
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      std::basic_string<_CharT, _Traits> __tmp;
-      __tmp.reserve(_Nb);
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 303. Bitset input operator underspecified
-      const char_type __zero = __is.widen('0');
-      const char_type __one = __is.widen('1');
-
-      typename __ios_base::iostate __state = __ios_base::goodbit;
-      typename __istream_type::sentry __sentry(__is);
-      if (__sentry)
-	{
-	  __try
-	    {
-	      for (size_t __i = _Nb; __i > 0; --__i)
-		{
-		  static typename _Traits::int_type __eof = _Traits::eof();
-		  
-		  typename _Traits::int_type __c1 = __is.rdbuf()->sbumpc();
-		  if (_Traits::eq_int_type(__c1, __eof))
-		    {
-		      __state |= __ios_base::eofbit;
-		      break;
-		    }
-		  else
-		    {
-		      const char_type __c2 = _Traits::to_char_type(__c1);
-		      if (_Traits::eq(__c2, __zero))
-			__tmp.push_back(__zero);
-		      else if (_Traits::eq(__c2, __one))
-			__tmp.push_back(__one);
-		      else if (_Traits::
-			       eq_int_type(__is.rdbuf()->sputbackc(__c2),
-					   __eof))
-			{
-			  __state |= __ios_base::failbit;
-			  break;
-			}
-		    }
-		}
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __is._M_setstate(__ios_base::badbit);		
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { __is._M_setstate(__ios_base::badbit); }
-	}
-
-      if (__tmp.empty() && _Nb)
-	__state |= __ios_base::failbit;
-      else
-	__x._M_copy_from_string(__tmp, static_cast<size_t>(0), _Nb,
-				__zero, __one);
-      if (__state)
-	__is.setstate(__state);
-      return __is;
-    }
-
-  template <class _CharT, class _Traits, size_t _Nb>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const bitset<_Nb>& __x)
-    {
-      std::basic_string<_CharT, _Traits> __tmp;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 396. what are characters zero and one.
-      const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__os.getloc());
-      __x._M_copy_to_string(__tmp, __ct.widen('0'), __ct.widen('1'));
-      return __os << __tmp;
-    }
-  //@}
-
-_GLIBCXX_END_NAMESPACE_CONTAINER
-} // namespace std
-
-#undef _GLIBCXX_BITSET_WORDS
-#undef _GLIBCXX_BITSET_BITS_PER_WORD
-#undef _GLIBCXX_BITSET_BITS_PER_ULL
-
-#if __cplusplus >= 201103L
-
-#include <bits/functional_hash.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // DR 1182.
-  /// std::hash specialization for bitset.
-  template<size_t _Nb>
-    struct hash<_GLIBCXX_STD_C::bitset<_Nb>>
-    : public __hash_base<size_t, _GLIBCXX_STD_C::bitset<_Nb>>
-    {
-      size_t
-      operator()(const _GLIBCXX_STD_C::bitset<_Nb>& __b) const noexcept
-      {
-	const size_t __clength = (_Nb + __CHAR_BIT__ - 1) / __CHAR_BIT__;
-	return std::_Hash_impl::hash(__b._M_getdata(), __clength);
-      }
-    };
-
-  template<>
-    struct hash<_GLIBCXX_STD_C::bitset<0>>
-    : public __hash_base<size_t, _GLIBCXX_STD_C::bitset<0>>
-    {
-      size_t
-      operator()(const _GLIBCXX_STD_C::bitset<0>&) const noexcept
-      { return 0; }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // C++11
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/bitset>
-#endif
-
-#ifdef _GLIBCXX_PROFILE
-# include <profile/bitset>
-#endif
-
-#endif /* _GLIBCXX_BITSET */
diff --git a/openflow/usr/include/c++/5/cassert b/openflow/usr/include/c++/5/cassert
deleted file mode 100644
index e555a38..0000000
--- a/openflow/usr/include/c++/5/cassert
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file cassert
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c assert.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 19.2  Assertions
-//
-
-// No include guards on this header...
-
-#pragma GCC system_header
-
-#include <assert.h>
diff --git a/openflow/usr/include/c++/5/ccomplex b/openflow/usr/include/c++/5/ccomplex
deleted file mode 100644
index bb164df..0000000
--- a/openflow/usr/include/c++/5/ccomplex
+++ /dev/null
@@ -1,40 +0,0 @@
-// <ccomplex> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/ccomplex
- *  This is a Standard C++ Library header.
- */
-
-#pragma GCC system_header
-
-#ifndef _GLIBCXX_CCOMPLEX
-#define _GLIBCXX_CCOMPLEX 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#endif
-
-#include <complex>
-
-#endif
diff --git a/openflow/usr/include/c++/5/cctype b/openflow/usr/include/c++/5/cctype
deleted file mode 100644
index f7a1e5f..0000000
--- a/openflow/usr/include/c++/5/cctype
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cctype
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c ctype.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: <ccytpe>
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <ctype.h>
-
-#ifndef _GLIBCXX_CCTYPE
-#define _GLIBCXX_CCTYPE 1
-
-// Get rid of those macros defined in <ctype.h> in lieu of real functions.
-#undef isalnum
-#undef isalpha
-#undef iscntrl
-#undef isdigit
-#undef isgraph
-#undef islower
-#undef isprint
-#undef ispunct
-#undef isspace
-#undef isupper
-#undef isxdigit
-#undef tolower
-#undef toupper
-
-namespace std
-{
-  using ::isalnum;
-  using ::isalpha;
-  using ::iscntrl;
-  using ::isdigit;
-  using ::isgraph;
-  using ::islower;
-  using ::isprint;
-  using ::ispunct;
-  using ::isspace;
-  using ::isupper;
-  using ::isxdigit;
-  using ::tolower;
-  using ::toupper;
-} // namespace std
-
-#if __cplusplus >= 201103L
-
-#ifdef _GLIBCXX_USE_C99_CTYPE_TR1
-
-#undef isblank
-
-namespace std
-{
-  using ::isblank;
-} // namespace std
-
-#endif // _GLIBCXX_USE_C99_CTYPE_TR1
-
-#endif // C++11
-
-#endif
diff --git a/openflow/usr/include/c++/5/cerrno b/openflow/usr/include/c++/5/cerrno
deleted file mode 100644
index 7060b1e..0000000
--- a/openflow/usr/include/c++/5/cerrno
+++ /dev/null
@@ -1,51 +0,0 @@
-// The -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file cerrno
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c errno.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 19.3  Error numbers
-//
-
-#pragma GCC system_header
-
-#include <errno.h>
-
-#ifndef _GLIBCXX_CERRNO
-#define _GLIBCXX_CERRNO 1
-
-// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998
-#ifndef errno
-#define errno errno
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/cfenv b/openflow/usr/include/c++/5/cfenv
deleted file mode 100644
index 5b62131..0000000
--- a/openflow/usr/include/c++/5/cfenv
+++ /dev/null
@@ -1,84 +0,0 @@
-// <cfenv> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cfenv
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_CFENV
-#define _GLIBCXX_CFENV 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <bits/c++config.h>
-
-#if _GLIBCXX_HAVE_FENV_H
-# include <fenv.h>
-#endif
-
-#ifdef _GLIBCXX_USE_C99_FENV_TR1
-
-#undef feclearexcept
-#undef fegetexceptflag
-#undef feraiseexcept
-#undef fesetexceptflag
-#undef fetestexcept
-#undef fegetround
-#undef fesetround
-#undef fegetenv
-#undef feholdexcept
-#undef fesetenv
-#undef feupdateenv
-
-namespace std
-{
-  // types
-  using ::fenv_t;
-  using ::fexcept_t;
-
-  // functions
-  using ::feclearexcept;
-  using ::fegetexceptflag;
-  using ::feraiseexcept;
-  using ::fesetexceptflag;
-  using ::fetestexcept;
-
-  using ::fegetround;
-  using ::fesetround;
-
-  using ::fegetenv;
-  using ::feholdexcept;
-  using ::fesetenv;
-  using ::feupdateenv;
-} // namespace std
-
-#endif // _GLIBCXX_USE_C99_FENV_TR1
-
-#endif // C++11
-
-#endif // _GLIBCXX_CFENV
diff --git a/openflow/usr/include/c++/5/cfloat b/openflow/usr/include/c++/5/cfloat
deleted file mode 100644
index 2c4ae28..0000000
--- a/openflow/usr/include/c++/5/cfloat
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cfloat
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c float.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 18.2.2  Implementation properties: C library
-//
-
-#pragma GCC system_header
-
-#include <float.h>
-
-#ifndef _GLIBCXX_CFLOAT
-#define _GLIBCXX_CFLOAT 1
-
-#if __cplusplus >= 201103L
-#  ifndef DECIMAL_DIG
-#    define DECIMAL_DIG __DECIMAL_DIG__
-#  endif
-#  ifndef FLT_EVAL_METHOD
-#    define FLT_EVAL_METHOD __FLT_EVAL_METHOD__
-#  endif
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/chrono b/openflow/usr/include/c++/5/chrono
deleted file mode 100644
index 50a2bbf..0000000
--- a/openflow/usr/include/c++/5/chrono
+++ /dev/null
@@ -1,887 +0,0 @@
-// <chrono> -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/chrono
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_CHRONO
-#define _GLIBCXX_CHRONO 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <ratio>
-#include <type_traits>
-#include <limits>
-#include <ctime>
-#include <bits/parse_numbers.h> // for literals support.
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-  /**
-   * @defgroup chrono Time
-   * @ingroup utilities
-   *
-   * Classes and functions for time.
-   * @{
-   */
-
-  /** @namespace std::chrono
-   *  @brief ISO C++ 2011 entities sub-namespace for time and date.
-   */
-  namespace chrono
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    template<typename _Rep, typename _Period = ratio<1>>
-      struct duration;
-
-    template<typename _Clock, typename _Dur = typename _Clock::duration>
-      struct time_point;
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  }
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // 20.11.4.3 specialization of common_type (for duration, sfinae-friendly)
-  
-  template<typename _CT, typename _Period1, typename _Period2>
-    struct __duration_common_type_wrapper
-    {
-    private:
-      typedef __static_gcd<_Period1::num, _Period2::num> __gcd_num;
-      typedef __static_gcd<_Period1::den, _Period2::den> __gcd_den;
-      typedef typename _CT::type __cr;
-      typedef ratio<__gcd_num::value,
-        (_Period1::den / __gcd_den::value) * _Period2::den> __r;
-    public:
-      typedef __success_type<chrono::duration<__cr, __r>> type;
-    };
-
-  template<typename _Period1, typename _Period2>
-    struct __duration_common_type_wrapper<__failure_type, _Period1, _Period2>
-    { typedef __failure_type type; };
-
-  template<typename _Rep1, typename _Period1, typename _Rep2, typename _Period2>
-    struct common_type<chrono::duration<_Rep1, _Period1>,
-             chrono::duration<_Rep2, _Period2>>
-    : public __duration_common_type_wrapper<typename __member_type_wrapper<
-             common_type<_Rep1, _Rep2>>::type, _Period1, _Period2>::type
-    { };
-
-  // 20.11.4.3 specialization of common_type (for time_point, sfinae-friendly)
-  
-  template<typename _CT, typename _Clock>
-    struct __timepoint_common_type_wrapper
-    {
-      typedef __success_type<chrono::time_point<_Clock, typename _CT::type>>
-        type;
-    };
-
-  template<typename _Clock>
-    struct __timepoint_common_type_wrapper<__failure_type, _Clock>
-    { typedef __failure_type type; };
-
-  template<typename _Clock, typename _Duration1, typename _Duration2>
-    struct common_type<chrono::time_point<_Clock, _Duration1>,
-             chrono::time_point<_Clock, _Duration2>>
-    : public __timepoint_common_type_wrapper<typename __member_type_wrapper<
-             common_type<_Duration1, _Duration2>>::type, _Clock>::type
-    { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-
-  namespace chrono
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    // Primary template for duration_cast impl.
-    template<typename _ToDur, typename _CF, typename _CR,
-	     bool _NumIsOne = false, bool _DenIsOne = false>
-      struct __duration_cast_impl
-      {
-	template<typename _Rep, typename _Period>
-	  static constexpr _ToDur
-	  __cast(const duration<_Rep, _Period>& __d)
-	  {
-	    typedef typename _ToDur::rep			__to_rep;
-	    return _ToDur(static_cast<__to_rep>(static_cast<_CR>(__d.count())
-	      * static_cast<_CR>(_CF::num)
-	      / static_cast<_CR>(_CF::den)));
-	  }
-      };
-
-    template<typename _ToDur, typename _CF, typename _CR>
-      struct __duration_cast_impl<_ToDur, _CF, _CR, true, true>
-      {
-	template<typename _Rep, typename _Period>
-	  static constexpr _ToDur
-	  __cast(const duration<_Rep, _Period>& __d)
-	  {
-	    typedef typename _ToDur::rep			__to_rep;
-	    return _ToDur(static_cast<__to_rep>(__d.count()));
-	  }
-      };
-
-    template<typename _ToDur, typename _CF, typename _CR>
-      struct __duration_cast_impl<_ToDur, _CF, _CR, true, false>
-      {
-	template<typename _Rep, typename _Period>
-	  static constexpr _ToDur
-	  __cast(const duration<_Rep, _Period>& __d)
-	  {
-	    typedef typename _ToDur::rep			__to_rep;
-	    return _ToDur(static_cast<__to_rep>(
-	      static_cast<_CR>(__d.count()) / static_cast<_CR>(_CF::den)));
-	  }
-      };
-
-    template<typename _ToDur, typename _CF, typename _CR>
-      struct __duration_cast_impl<_ToDur, _CF, _CR, false, true>
-      {
-	template<typename _Rep, typename _Period>
-	  static constexpr _ToDur
-	  __cast(const duration<_Rep, _Period>& __d)
-	  {
-	    typedef typename _ToDur::rep			__to_rep;
-	    return _ToDur(static_cast<__to_rep>(
-	      static_cast<_CR>(__d.count()) * static_cast<_CR>(_CF::num)));
-	  }
-      };
-
-    template<typename _Tp>
-      struct __is_duration
-      : std::false_type
-      { };
-
-    template<typename _Rep, typename _Period>
-      struct __is_duration<duration<_Rep, _Period>>
-      : std::true_type
-      { };
-
-    /// duration_cast
-    template<typename _ToDur, typename _Rep, typename _Period>
-      constexpr typename enable_if<__is_duration<_ToDur>::value,
-				   _ToDur>::type
-      duration_cast(const duration<_Rep, _Period>& __d)
-      {
-	typedef typename _ToDur::period				__to_period;
-	typedef typename _ToDur::rep				__to_rep;
-	typedef ratio_divide<_Period, __to_period> 		__cf;
-	typedef typename common_type<__to_rep, _Rep, intmax_t>::type
-	  							__cr;
-	typedef  __duration_cast_impl<_ToDur, __cf, __cr,
-				      __cf::num == 1, __cf::den == 1> __dc;
-	return __dc::__cast(__d);
-      }
-
-    /// treat_as_floating_point
-    template<typename _Rep>
-      struct treat_as_floating_point
-      : is_floating_point<_Rep>
-      { };
-
-    /// duration_values
-    template<typename _Rep>
-      struct duration_values
-      {
-	static constexpr _Rep
-	zero()
-	{ return _Rep(0); }
-
-	static constexpr _Rep
-	max()
-	{ return numeric_limits<_Rep>::max(); }
-
-	static constexpr _Rep
-	min()
-	{ return numeric_limits<_Rep>::lowest(); }
-      };
-
-    template<typename _Tp>
-      struct __is_ratio
-      : std::false_type
-      { };
-
-    template<intmax_t _Num, intmax_t _Den>
-      struct __is_ratio<ratio<_Num, _Den>>
-      : std::true_type
-      { };
-
-    /// duration
-    template<typename _Rep, typename _Period>
-      struct duration
-      {
-	typedef _Rep						rep;
-	typedef _Period 					period;
-
-	static_assert(!__is_duration<_Rep>::value, "rep cannot be a duration");
-	static_assert(__is_ratio<_Period>::value,
-		      "period must be a specialization of ratio");
-	static_assert(_Period::num > 0, "period must be positive");
-
-	// 20.11.5.1 construction / copy / destroy
-	constexpr duration() = default;
-
-	// NB: Make constexpr implicit. This cannot be explicitly
-	// constexpr, as any UDT that is not a literal type with a
-	// constexpr copy constructor will be ill-formed.
-	duration(const duration&) = default;
-
-	template<typename _Rep2, typename = typename
-	       enable_if<is_convertible<_Rep2, rep>::value
-			 && (treat_as_floating_point<rep>::value
-			     || !treat_as_floating_point<_Rep2>::value)>::type>
-	  constexpr explicit duration(const _Rep2& __rep)
-	  : __r(static_cast<rep>(__rep)) { }
-
-	template<typename _Rep2, typename _Period2, typename = typename
-	       enable_if<treat_as_floating_point<rep>::value
-			 || (ratio_divide<_Period2, period>::den == 1
-			     && !treat_as_floating_point<_Rep2>::value)>::type>
-	  constexpr duration(const duration<_Rep2, _Period2>& __d)
-	  : __r(duration_cast<duration>(__d).count()) { }
-
-	~duration() = default;
-	duration& operator=(const duration&) = default;
-
-	// 20.11.5.2 observer
-	constexpr rep
-	count() const
-	{ return __r; }
-
-	// 20.11.5.3 arithmetic
-	constexpr duration
-	operator+() const
-	{ return *this; }
-
-	constexpr duration
-	operator-() const
-	{ return duration(-__r); }
-
-	duration&
-	operator++()
-	{
-	  ++__r;
-	  return *this;
-	}
-
-	duration
-	operator++(int)
-	{ return duration(__r++); }
-
-	duration&
-	operator--()
-	{
-	  --__r;
-	  return *this;
-	}
-
-	duration
-	operator--(int)
-	{ return duration(__r--); }
-
-	duration&
-	operator+=(const duration& __d)
-	{
-	  __r += __d.count();
-	  return *this;
-	}
-
-	duration&
-	operator-=(const duration& __d)
-	{
-	  __r -= __d.count();
-	  return *this;
-	}
-
-	duration&
-	operator*=(const rep& __rhs)
-	{
-	  __r *= __rhs;
-	  return *this;
-	}
-
-	duration&
-	operator/=(const rep& __rhs)
-	{
-	  __r /= __rhs;
-	  return *this;
-	}
-
-	// DR 934.
-	template<typename _Rep2 = rep>
-	  typename enable_if<!treat_as_floating_point<_Rep2>::value,
-			     duration&>::type
-	  operator%=(const rep& __rhs)
-	  {
-	    __r %= __rhs;
-	    return *this;
-	  }
-
-	template<typename _Rep2 = rep>
-	  typename enable_if<!treat_as_floating_point<_Rep2>::value,
-			     duration&>::type
-	  operator%=(const duration& __d)
-	  {
-	    __r %= __d.count();
-	    return *this;
-	  }
-
-	// 20.11.5.4 special values
-	static constexpr duration
-	zero()
-	{ return duration(duration_values<rep>::zero()); }
-
-	static constexpr duration
-	min()
-	{ return duration(duration_values<rep>::min()); }
-
-	static constexpr duration
-	max()
-	{ return duration(duration_values<rep>::max()); }
-
-      private:
-	rep __r;
-      };
-
-    template<typename _Rep1, typename _Period1,
-	     typename _Rep2, typename _Period2>
-      constexpr typename common_type<duration<_Rep1, _Period1>,
-				     duration<_Rep2, _Period2>>::type
-      operator+(const duration<_Rep1, _Period1>& __lhs,
-		const duration<_Rep2, _Period2>& __rhs)
-      {
-	typedef duration<_Rep1, _Period1>			__dur1;
-	typedef duration<_Rep2, _Period2>			__dur2;
-	typedef typename common_type<__dur1,__dur2>::type	__cd;
-	return __cd(__cd(__lhs).count() + __cd(__rhs).count());
-      }
-
-    template<typename _Rep1, typename _Period1,
-	     typename _Rep2, typename _Period2>
-      constexpr typename common_type<duration<_Rep1, _Period1>,
-				     duration<_Rep2, _Period2>>::type
-      operator-(const duration<_Rep1, _Period1>& __lhs,
-		const duration<_Rep2, _Period2>& __rhs)
-      {
-	typedef duration<_Rep1, _Period1>			__dur1;
-	typedef duration<_Rep2, _Period2>			__dur2;
-	typedef typename common_type<__dur1,__dur2>::type	__cd;
-	return __cd(__cd(__lhs).count() - __cd(__rhs).count());
-      }
-
-    template<typename _Rep1, typename _Rep2, bool =
-	     is_convertible<_Rep2,
-			    typename common_type<_Rep1, _Rep2>::type>::value>
-      struct __common_rep_type { };
-
-    template<typename _Rep1, typename _Rep2>
-      struct __common_rep_type<_Rep1, _Rep2, true>
-      { typedef typename common_type<_Rep1, _Rep2>::type type; };
-
-    template<typename _Rep1, typename _Period, typename _Rep2>
-      constexpr
-      duration<typename __common_rep_type<_Rep1, _Rep2>::type, _Period>
-      operator*(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
-      {
-	typedef duration<typename common_type<_Rep1, _Rep2>::type, _Period>
-	  __cd;
-	return __cd(__cd(__d).count() * __s);
-      }
-
-    template<typename _Rep1, typename _Rep2, typename _Period>
-      constexpr
-      duration<typename __common_rep_type<_Rep2, _Rep1>::type, _Period>
-      operator*(const _Rep1& __s, const duration<_Rep2, _Period>& __d)
-      { return __d * __s; }
-
-    template<typename _Rep1, typename _Period, typename _Rep2>
-      constexpr duration<typename __common_rep_type<_Rep1, typename
-	enable_if<!__is_duration<_Rep2>::value, _Rep2>::type>::type, _Period>
-      operator/(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
-      {
-	typedef duration<typename common_type<_Rep1, _Rep2>::type, _Period>
-	  __cd;
-	return __cd(__cd(__d).count() / __s);
-      }
-
-    template<typename _Rep1, typename _Period1,
-	     typename _Rep2, typename _Period2>
-      constexpr typename common_type<_Rep1, _Rep2>::type
-      operator/(const duration<_Rep1, _Period1>& __lhs,
-		const duration<_Rep2, _Period2>& __rhs)
-      {
-	typedef duration<_Rep1, _Period1>			__dur1;
-	typedef duration<_Rep2, _Period2>			__dur2;
-	typedef typename common_type<__dur1,__dur2>::type	__cd;
-	return __cd(__lhs).count() / __cd(__rhs).count();
-      }
-
-    // DR 934.
-    template<typename _Rep1, typename _Period, typename _Rep2>
-      constexpr duration<typename __common_rep_type<_Rep1, typename
-	enable_if<!__is_duration<_Rep2>::value, _Rep2>::type>::type, _Period>
-      operator%(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
-      {
-	typedef duration<typename common_type<_Rep1, _Rep2>::type, _Period>
-	  __cd;
-	return __cd(__cd(__d).count() % __s);
-      }
-
-    template<typename _Rep1, typename _Period1,
-	     typename _Rep2, typename _Period2>
-      constexpr typename common_type<duration<_Rep1, _Period1>,
-				     duration<_Rep2, _Period2>>::type
-      operator%(const duration<_Rep1, _Period1>& __lhs,
-		const duration<_Rep2, _Period2>& __rhs)
-      {
-	typedef duration<_Rep1, _Period1>			__dur1;
-	typedef duration<_Rep2, _Period2>			__dur2;
-	typedef typename common_type<__dur1,__dur2>::type	__cd;
-	return __cd(__cd(__lhs).count() % __cd(__rhs).count());
-      }
-
-    // comparisons
-    template<typename _Rep1, typename _Period1,
-	     typename _Rep2, typename _Period2>
-      constexpr bool
-      operator==(const duration<_Rep1, _Period1>& __lhs,
-		 const duration<_Rep2, _Period2>& __rhs)
-      {
-	typedef duration<_Rep1, _Period1>			__dur1;
-	typedef duration<_Rep2, _Period2>			__dur2;
-	typedef typename common_type<__dur1,__dur2>::type	__ct;
-	return __ct(__lhs).count() == __ct(__rhs).count();
-      }
-
-    template<typename _Rep1, typename _Period1,
-	     typename _Rep2, typename _Period2>
-      constexpr bool
-      operator<(const duration<_Rep1, _Period1>& __lhs,
-		const duration<_Rep2, _Period2>& __rhs)
-      {
-	typedef duration<_Rep1, _Period1>			__dur1;
-	typedef duration<_Rep2, _Period2>			__dur2;
-	typedef typename common_type<__dur1,__dur2>::type	__ct;
-	return __ct(__lhs).count() < __ct(__rhs).count();
-      }
-
-    template<typename _Rep1, typename _Period1,
-	     typename _Rep2, typename _Period2>
-      constexpr bool
-      operator!=(const duration<_Rep1, _Period1>& __lhs,
-		 const duration<_Rep2, _Period2>& __rhs)
-      { return !(__lhs == __rhs); }
-
-    template<typename _Rep1, typename _Period1,
-	     typename _Rep2, typename _Period2>
-      constexpr bool
-      operator<=(const duration<_Rep1, _Period1>& __lhs,
-		 const duration<_Rep2, _Period2>& __rhs)
-      { return !(__rhs < __lhs); }
-
-    template<typename _Rep1, typename _Period1,
-	     typename _Rep2, typename _Period2>
-      constexpr bool
-      operator>(const duration<_Rep1, _Period1>& __lhs,
-		const duration<_Rep2, _Period2>& __rhs)
-      { return __rhs < __lhs; }
-
-    template<typename _Rep1, typename _Period1,
-	     typename _Rep2, typename _Period2>
-      constexpr bool
-      operator>=(const duration<_Rep1, _Period1>& __lhs,
-		 const duration<_Rep2, _Period2>& __rhs)
-      { return !(__lhs < __rhs); }
-
-    /// nanoseconds
-    typedef duration<int64_t, nano> 	    nanoseconds;
-
-    /// microseconds
-    typedef duration<int64_t, micro> 	    microseconds;
-
-    /// milliseconds
-    typedef duration<int64_t, milli> 	    milliseconds;
-
-    /// seconds
-    typedef duration<int64_t> 		    seconds;
-
-    /// minutes
-    typedef duration<int64_t, ratio< 60>>   minutes;
-
-    /// hours
-    typedef duration<int64_t, ratio<3600>>  hours;
-
-    /// time_point
-    template<typename _Clock, typename _Dur>
-      struct time_point
-      {
-	typedef _Clock			  			clock;
-	typedef _Dur		  				duration;
-	typedef typename duration::rep	  			rep;
-	typedef typename duration::period			period;
-
-	constexpr time_point() : __d(duration::zero())
-	{ }
-
-	constexpr explicit time_point(const duration& __dur)
-	: __d(__dur)
-	{ }
-
-	// conversions
-	template<typename _Dur2>
-	  constexpr time_point(const time_point<clock, _Dur2>& __t)
-	  : __d(__t.time_since_epoch())
-	  { }
-
-	// observer
-	constexpr duration
-	time_since_epoch() const
-	{ return __d; }
-
-	// arithmetic
-	time_point&
-	operator+=(const duration& __dur)
-	{
-	  __d += __dur;
-	  return *this;
-	}
-
-	time_point&
-	operator-=(const duration& __dur)
-	{
-	  __d -= __dur;
-	  return *this;
-	}
-
-	// special values
-	static constexpr time_point
-	min()
-	{ return time_point(duration::min()); }
-
-	static constexpr time_point
-	max()
-	{ return time_point(duration::max()); }
-
-      private:
-	duration __d;
-      };
-
-    /// time_point_cast
-    template<typename _ToDur, typename _Clock, typename _Dur>
-      constexpr typename enable_if<__is_duration<_ToDur>::value,
-				   time_point<_Clock, _ToDur>>::type
-      time_point_cast(const time_point<_Clock, _Dur>& __t)
-      {
-	typedef time_point<_Clock, _ToDur> 			__time_point;
-	return __time_point(duration_cast<_ToDur>(__t.time_since_epoch()));
-      }
-
-    template<typename _Clock, typename _Dur1,
-	     typename _Rep2, typename _Period2>
-      constexpr time_point<_Clock,
-	typename common_type<_Dur1, duration<_Rep2, _Period2>>::type>
-      operator+(const time_point<_Clock, _Dur1>& __lhs,
-		const duration<_Rep2, _Period2>& __rhs)
-      {
-	typedef duration<_Rep2, _Period2>			__dur2;
-	typedef typename common_type<_Dur1,__dur2>::type	__ct;
-	typedef time_point<_Clock, __ct> 			__time_point;
-	return __time_point(__lhs.time_since_epoch() + __rhs);
-      }
-
-    template<typename _Rep1, typename _Period1,
-	     typename _Clock, typename _Dur2>
-      constexpr time_point<_Clock,
-	typename common_type<duration<_Rep1, _Period1>, _Dur2>::type>
-      operator+(const duration<_Rep1, _Period1>& __lhs,
-		const time_point<_Clock, _Dur2>& __rhs)
-      { 
-	typedef duration<_Rep1, _Period1>			__dur1;
-	typedef typename common_type<__dur1,_Dur2>::type	__ct;
-	typedef time_point<_Clock, __ct> 			__time_point;
-	return __time_point(__rhs.time_since_epoch() + __lhs); 
-      }
-
-    template<typename _Clock, typename _Dur1,
-	     typename _Rep2, typename _Period2>
-      constexpr time_point<_Clock,
-	typename common_type<_Dur1, duration<_Rep2, _Period2>>::type>
-      operator-(const time_point<_Clock, _Dur1>& __lhs,
-		const duration<_Rep2, _Period2>& __rhs)
-      { 
-	typedef duration<_Rep2, _Period2>			__dur2;
-	typedef typename common_type<_Dur1,__dur2>::type	__ct;
-	typedef time_point<_Clock, __ct> 			__time_point;
-	return __time_point(__lhs.time_since_epoch() -__rhs); 
-      }
-
-    template<typename _Clock, typename _Dur1, typename _Dur2>
-      constexpr typename common_type<_Dur1, _Dur2>::type
-      operator-(const time_point<_Clock, _Dur1>& __lhs,
-		const time_point<_Clock, _Dur2>& __rhs)
-      { return __lhs.time_since_epoch() - __rhs.time_since_epoch(); }
-
-    template<typename _Clock, typename _Dur1, typename _Dur2>
-      constexpr bool
-      operator==(const time_point<_Clock, _Dur1>& __lhs,
-		 const time_point<_Clock, _Dur2>& __rhs)
-      { return __lhs.time_since_epoch() == __rhs.time_since_epoch(); }
-
-    template<typename _Clock, typename _Dur1, typename _Dur2>
-      constexpr bool
-      operator!=(const time_point<_Clock, _Dur1>& __lhs,
-		 const time_point<_Clock, _Dur2>& __rhs)
-      { return !(__lhs == __rhs); }
-
-    template<typename _Clock, typename _Dur1, typename _Dur2>
-      constexpr bool
-      operator<(const time_point<_Clock, _Dur1>& __lhs,
-		const time_point<_Clock, _Dur2>& __rhs)
-      { return  __lhs.time_since_epoch() < __rhs.time_since_epoch(); }
-
-    template<typename _Clock, typename _Dur1, typename _Dur2>
-      constexpr bool
-      operator<=(const time_point<_Clock, _Dur1>& __lhs,
-		 const time_point<_Clock, _Dur2>& __rhs)
-      { return !(__rhs < __lhs); }
-
-    template<typename _Clock, typename _Dur1, typename _Dur2>
-      constexpr bool
-      operator>(const time_point<_Clock, _Dur1>& __lhs,
-		const time_point<_Clock, _Dur2>& __rhs)
-      { return __rhs < __lhs; }
-
-    template<typename _Clock, typename _Dur1, typename _Dur2>
-      constexpr bool
-      operator>=(const time_point<_Clock, _Dur1>& __lhs,
-		 const time_point<_Clock, _Dur2>& __rhs)
-      { return !(__lhs < __rhs); }
-
-
-    // Clocks. 
-
-    // Why nanosecond resolution as the default?  
-    // Why have std::system_clock always count in the higest
-    // resolution (ie nanoseconds), even if on some OSes the low 3
-    // or 9 decimal digits will be always zero? This allows later
-    // implementations to change the system_clock::now()
-    // implementation any time to provide better resolution without
-    // changing function signature or units.
-
-    // To support the (forward) evolution of the library's defined
-    // clocks, wrap inside inline namespace so that the current
-    // defintions of system_clock, steady_clock, and
-    // high_resolution_clock types are uniquely mangled. This way, new
-    // code can use the latests clocks, while the library can contain
-    // compatibility definitions for previous versions.  At some
-    // point, when these clocks settle down, the inlined namespaces
-    // can be removed.  XXX GLIBCXX_ABI Deprecated
-    inline namespace _V2 {
-
-    /**
-     *  @brief System clock.
-     *
-     *  Time returned represents wall time from the system-wide clock.
-    */
-    struct system_clock
-    {
-      typedef chrono::nanoseconds     				duration;
-      typedef duration::rep    					rep;
-      typedef duration::period 					period;
-      typedef chrono::time_point<system_clock, duration> 	time_point;
-
-      static_assert(system_clock::duration::min()
-		    < system_clock::duration::zero(),
-		    "a clock's minimum duration cannot be less than its epoch");
-
-      static constexpr bool is_steady = false;
-
-      static time_point
-      now() noexcept;
-
-      // Map to C API
-      static std::time_t
-      to_time_t(const time_point& __t) noexcept
-      {
-	return std::time_t(duration_cast<chrono::seconds>
-			   (__t.time_since_epoch()).count());
-      }
-
-      static time_point
-      from_time_t(std::time_t __t) noexcept
-      {
-	typedef chrono::time_point<system_clock, seconds>	__from;
-	return time_point_cast<system_clock::duration>
-	       (__from(chrono::seconds(__t)));
-      }
-    };
-
-
-    /**
-     *  @brief Monotonic clock
-     *
-     *  Time returned has the property of only increasing at a uniform rate.
-    */
-    struct steady_clock
-    {
-      typedef chrono::nanoseconds 				duration;
-      typedef duration::rep	  				rep;
-      typedef duration::period	  				period;
-      typedef chrono::time_point<steady_clock, duration> 	time_point;
-
-      static constexpr bool is_steady = true;
-
-      static time_point
-      now() noexcept;
-    };
-
-
-    /**
-     *  @brief Highest-resolution clock
-     *
-     *  This is the clock "with the shortest tick period." Alias to
-     *  std::system_clock until higher-than-nanosecond definitions
-     *  become feasible.
-    */
-    using high_resolution_clock = system_clock;
-
-    } // end inline namespace _V2
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace chrono
-
-#if __cplusplus > 201103L
-
-#define __cpp_lib_chrono_udls 201304
-
-  inline namespace literals
-  {
-  inline namespace chrono_literals
-  {
-
-    template<typename _Rep, unsigned long long _Val>
-      struct _Checked_integral_constant
-      : integral_constant<_Rep, static_cast<_Rep>(_Val)>
-      {
-	static_assert(_Checked_integral_constant::value >= 0
-		      && _Checked_integral_constant::value == _Val,
-		      "literal value cannot be represented by duration type");
-      };
-
-    template<typename _Dur, char... _Digits>
-      constexpr _Dur __check_overflow()
-      {
-	using _Val = __parse_int::_Parse_int<_Digits...>;
-	using _Rep = typename _Dur::rep;
-	// TODO: should be simply integral_constant<_Rep, _Val::value>
-	// but GCC doesn't reject narrowing conversions to _Rep.
-	using _CheckedVal = _Checked_integral_constant<_Rep, _Val::value>;
-	return _Dur{_CheckedVal::value};
-      }
-
-    constexpr chrono::duration<long double, ratio<3600,1>>
-    operator""h(long double __hours)
-    { return chrono::duration<long double, ratio<3600,1>>{__hours}; }
-
-    template <char... _Digits>
-      constexpr chrono::hours
-      operator""h()
-      { return __check_overflow<chrono::hours, _Digits...>(); }
-
-    constexpr chrono::duration<long double, ratio<60,1>>
-    operator""min(long double __mins)
-    { return chrono::duration<long double, ratio<60,1>>{__mins}; }
-
-    template <char... _Digits>
-      constexpr chrono::minutes
-      operator""min()
-      { return __check_overflow<chrono::minutes, _Digits...>(); }
-
-    constexpr chrono::duration<long double>
-    operator""s(long double __secs)
-    { return chrono::duration<long double>{__secs}; }
-
-    template <char... _Digits>
-      constexpr chrono::seconds
-      operator""s()
-      { return __check_overflow<chrono::seconds, _Digits...>(); }
-
-    constexpr chrono::duration<long double, milli>
-    operator""ms(long double __msecs)
-    { return chrono::duration<long double, milli>{__msecs}; }
-
-    template <char... _Digits>
-      constexpr chrono::milliseconds
-      operator""ms()
-      { return __check_overflow<chrono::milliseconds, _Digits...>(); }
-
-    constexpr chrono::duration<long double, micro>
-    operator""us(long double __usecs)
-    { return chrono::duration<long double, micro>{__usecs}; }
-
-    template <char... _Digits>
-      constexpr chrono::microseconds
-      operator""us()
-      { return __check_overflow<chrono::microseconds, _Digits...>(); }
-
-    constexpr chrono::duration<long double, nano>
-    operator""ns(long double __nsecs)
-    { return chrono::duration<long double, nano>{__nsecs}; }
-
-    template <char... _Digits>
-      constexpr chrono::nanoseconds
-      operator""ns()
-      { return __check_overflow<chrono::nanoseconds, _Digits...>(); }
-
-  } // inline namespace chrono_literals
-  } // inline namespace literals
-
-  namespace chrono
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using namespace literals::chrono_literals;
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace chrono
-
-#endif // __cplusplus > 201103L
-
-  // @} group chrono
-} // namespace std
-
-#endif //_GLIBCXX_USE_C99_STDINT_TR1
-
-#endif // C++11
-
-#endif //_GLIBCXX_CHRONO
diff --git a/openflow/usr/include/c++/5/cinttypes b/openflow/usr/include/c++/5/cinttypes
deleted file mode 100644
index 5a72a5c..0000000
--- a/openflow/usr/include/c++/5/cinttypes
+++ /dev/null
@@ -1,81 +0,0 @@
-// <cinttypes> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cinttypes
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_CINTTYPES
-#define _GLIBCXX_CINTTYPES 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <cstdint>
-
-// For 27.9.2/3 (see C99, Note 184)
-#if _GLIBCXX_HAVE_INTTYPES_H
-# ifndef __STDC_FORMAT_MACROS
-#  define _UNDEF__STDC_FORMAT_MACROS
-#  define __STDC_FORMAT_MACROS
-# endif
-# include <inttypes.h>
-# ifdef _UNDEF__STDC_FORMAT_MACROS
-#  undef __STDC_FORMAT_MACROS
-#  undef _UNDEF__STDC_FORMAT_MACROS
-# endif
-#endif
-
-#ifdef _GLIBCXX_USE_C99_INTTYPES_TR1
-
-namespace std
-{
-  // types
-  using ::imaxdiv_t;
-
-  // functions
-  using ::imaxabs;
-  using ::imaxdiv;
-
-  // GCC does not support extended integer types
-  // intmax_t abs(intmax_t)
-  // imaxdiv_t div(intmax_t, intmax_t)
-
-  using ::strtoimax;
-  using ::strtoumax;
-
-#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_C99_INTTYPES_WCHAR_T_TR1
-  using ::wcstoimax;
-  using ::wcstoumax;
-#endif
-} // namespace std
-
-#endif // _GLIBCXX_USE_C99_INTTYPES_TR1
-
-#endif // C++11
-
-#endif // _GLIBCXX_CINTTYPES
diff --git a/openflow/usr/include/c++/5/ciso646 b/openflow/usr/include/c++/5/ciso646
deleted file mode 100644
index 818db67..0000000
--- a/openflow/usr/include/c++/5/ciso646
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ciso646
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c iso646.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
diff --git a/openflow/usr/include/c++/5/climits b/openflow/usr/include/c++/5/climits
deleted file mode 100644
index e3da66c..0000000
--- a/openflow/usr/include/c++/5/climits
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/climits
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c limits.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 18.2.2  Implementation properties: C library
-//
-
-#pragma GCC system_header
-
-#include <limits.h>
-
-#ifndef _GLIBCXX_CLIMITS
-#define _GLIBCXX_CLIMITS 1
-
-#ifndef LLONG_MIN
-#define LLONG_MIN (-__LONG_LONG_MAX__ - 1)
-#endif
-
-#ifndef LLONG_MAX
-#define LLONG_MAX __LONG_LONG_MAX__
-#endif
-
-#ifndef ULLONG_MAX
-#define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1)
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/clocale b/openflow/usr/include/c++/5/clocale
deleted file mode 100644
index 95d17d2..0000000
--- a/openflow/usr/include/c++/5/clocale
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file clocale
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c locale.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 18.2.2  Implementation properties: C library
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <locale.h>
-
-#ifndef _GLIBCXX_CLOCALE
-#define _GLIBCXX_CLOCALE 1
-
-// Get rid of those macros defined in <locale.h> in lieu of real functions.
-#undef setlocale
-#undef localeconv
-
-namespace std
-{
-  using ::lconv;
-  using ::setlocale;
-  using ::localeconv;
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/cmath b/openflow/usr/include/c++/5/cmath
deleted file mode 100644
index d3fc8b7..0000000
--- a/openflow/usr/include/c++/5/cmath
+++ /dev/null
@@ -1,1783 +0,0 @@
-// -*- C++ -*- C forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cmath
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c math.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 26.5  C library
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/cpp_type_traits.h>
-#include <ext/type_traits.h>
-#include <math.h>
-
-#ifndef _GLIBCXX_CMATH
-#define _GLIBCXX_CMATH 1
-
-// Get rid of those macros defined in <math.h> in lieu of real functions.
-#undef abs
-#undef div
-#undef acos
-#undef asin
-#undef atan
-#undef atan2
-#undef ceil
-#undef cos
-#undef cosh
-#undef exp
-#undef fabs
-#undef floor
-#undef fmod
-#undef frexp
-#undef ldexp
-#undef log
-#undef log10
-#undef modf
-#undef pow
-#undef sin
-#undef sinh
-#undef sqrt
-#undef tan
-#undef tanh
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR double
-  abs(double __x)
-  { return __builtin_fabs(__x); }
-#endif
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  abs(float __x)
-  { return __builtin_fabsf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  abs(long double __x)
-  { return __builtin_fabsl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                    double>::__type
-    abs(_Tp __x)
-    { return __builtin_fabs(__x); }
-
-  using ::acos;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  acos(float __x)
-  { return __builtin_acosf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  acos(long double __x)
-  { return __builtin_acosl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    double>::__type
-    acos(_Tp __x)
-    { return __builtin_acos(__x); }
-
-  using ::asin;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  asin(float __x)
-  { return __builtin_asinf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  asin(long double __x)
-  { return __builtin_asinl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                    double>::__type
-    asin(_Tp __x)
-    { return __builtin_asin(__x); }
-
-  using ::atan;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  atan(float __x)
-  { return __builtin_atanf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  atan(long double __x)
-  { return __builtin_atanl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                    double>::__type
-    atan(_Tp __x)
-    { return __builtin_atan(__x); }
-
-  using ::atan2;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  atan2(float __y, float __x)
-  { return __builtin_atan2f(__y, __x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  atan2(long double __y, long double __x)
-  { return __builtin_atan2l(__y, __x); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    atan2(_Tp __y, _Up __x)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return atan2(__type(__y), __type(__x));
-    }
-
-  using ::ceil;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  ceil(float __x)
-  { return __builtin_ceilf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  ceil(long double __x)
-  { return __builtin_ceill(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    double>::__type
-    ceil(_Tp __x)
-    { return __builtin_ceil(__x); }
-
-  using ::cos;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  cos(float __x)
-  { return __builtin_cosf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  cos(long double __x)
-  { return __builtin_cosl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                    double>::__type
-    cos(_Tp __x)
-    { return __builtin_cos(__x); }
-
-  using ::cosh;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  cosh(float __x)
-  { return __builtin_coshf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  cosh(long double __x)
-  { return __builtin_coshl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                    double>::__type
-    cosh(_Tp __x)
-    { return __builtin_cosh(__x); }
-
-  using ::exp;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  exp(float __x)
-  { return __builtin_expf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  exp(long double __x)
-  { return __builtin_expl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                    double>::__type
-    exp(_Tp __x)
-    { return __builtin_exp(__x); }
-
-  using ::fabs;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  fabs(float __x)
-  { return __builtin_fabsf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  fabs(long double __x)
-  { return __builtin_fabsl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                    double>::__type
-    fabs(_Tp __x)
-    { return __builtin_fabs(__x); }
-
-  using ::floor;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  floor(float __x)
-  { return __builtin_floorf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  floor(long double __x)
-  { return __builtin_floorl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                    double>::__type
-    floor(_Tp __x)
-    { return __builtin_floor(__x); }
-
-  using ::fmod;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  fmod(float __x, float __y)
-  { return __builtin_fmodf(__x, __y); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  fmod(long double __x, long double __y)
-  { return __builtin_fmodl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    fmod(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return fmod(__type(__x), __type(__y));
-    }
-
-  using ::frexp;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline float
-  frexp(float __x, int* __exp)
-  { return __builtin_frexpf(__x, __exp); }
-
-  inline long double
-  frexp(long double __x, int* __exp)
-  { return __builtin_frexpl(__x, __exp); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    double>::__type
-    frexp(_Tp __x, int* __exp)
-    { return __builtin_frexp(__x, __exp); }
-
-  using ::ldexp;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  ldexp(float __x, int __exp)
-  { return __builtin_ldexpf(__x, __exp); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  ldexp(long double __x, int __exp)
-  { return __builtin_ldexpl(__x, __exp); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    double>::__type
-    ldexp(_Tp __x, int __exp)
-    { return __builtin_ldexp(__x, __exp); }
-
-  using ::log;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  log(float __x)
-  { return __builtin_logf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  log(long double __x)
-  { return __builtin_logl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    double>::__type
-    log(_Tp __x)
-    { return __builtin_log(__x); }
-
-  using ::log10;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  log10(float __x)
-  { return __builtin_log10f(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  log10(long double __x)
-  { return __builtin_log10l(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                    double>::__type
-    log10(_Tp __x)
-    { return __builtin_log10(__x); }
-
-  using ::modf;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline float
-  modf(float __x, float* __iptr)
-  { return __builtin_modff(__x, __iptr); }
-
-  inline long double
-  modf(long double __x, long double* __iptr)
-  { return __builtin_modfl(__x, __iptr); }
-#endif
-
-  using ::pow;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  pow(float __x, float __y)
-  { return __builtin_powf(__x, __y); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  pow(long double __x, long double __y)
-  { return __builtin_powl(__x, __y); }
-
-#if __cplusplus < 201103L
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // DR 550. What should the return type of pow(float,int) be?
-  inline double
-  pow(double __x, int __i)
-  { return __builtin_powi(__x, __i); }
-
-  inline float
-  pow(float __x, int __n)
-  { return __builtin_powif(__x, __n); }
-
-  inline long double
-  pow(long double __x, int __n)
-  { return __builtin_powil(__x, __n); }
-#endif
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    pow(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return pow(__type(__x), __type(__y));
-    }
-
-  using ::sin;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  sin(float __x)
-  { return __builtin_sinf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  sin(long double __x)
-  { return __builtin_sinl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    double>::__type
-    sin(_Tp __x)
-    { return __builtin_sin(__x); }
-
-  using ::sinh;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  sinh(float __x)
-  { return __builtin_sinhf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  sinh(long double __x)
-  { return __builtin_sinhl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    double>::__type
-    sinh(_Tp __x)
-    { return __builtin_sinh(__x); }
-
-  using ::sqrt;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  sqrt(float __x)
-  { return __builtin_sqrtf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  sqrt(long double __x)
-  { return __builtin_sqrtl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    double>::__type
-    sqrt(_Tp __x)
-    { return __builtin_sqrt(__x); }
-
-  using ::tan;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  tan(float __x)
-  { return __builtin_tanf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  tan(long double __x)
-  { return __builtin_tanl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    double>::__type
-    tan(_Tp __x)
-    { return __builtin_tan(__x); }
-
-  using ::tanh;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-  inline _GLIBCXX_CONSTEXPR float
-  tanh(float __x)
-  { return __builtin_tanhf(__x); }
-
-  inline _GLIBCXX_CONSTEXPR long double
-  tanh(long double __x)
-  { return __builtin_tanhl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    double>::__type
-    tanh(_Tp __x)
-    { return __builtin_tanh(__x); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if _GLIBCXX_USE_C99_MATH
-#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
-
-// These are possible macros imported from C99-land.
-#undef fpclassify
-#undef isfinite
-#undef isinf
-#undef isnan
-#undef isnormal
-#undef signbit
-#undef isgreater
-#undef isgreaterequal
-#undef isless
-#undef islessequal
-#undef islessgreater
-#undef isunordered
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if __cplusplus >= 201103L
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr int
-  fpclassify(float __x)
-  { return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL,
-				FP_SUBNORMAL, FP_ZERO, __x); }
-
-  constexpr int
-  fpclassify(double __x)
-  { return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL,
-				FP_SUBNORMAL, FP_ZERO, __x); }
-
-  constexpr int
-  fpclassify(long double __x)
-  { return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL,
-				FP_SUBNORMAL, FP_ZERO, __x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                              int>::__type
-    fpclassify(_Tp __x)
-    { return __x != 0 ? FP_NORMAL : FP_ZERO; }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr bool
-  isfinite(float __x)
-  { return __builtin_isfinite(__x); }
-
-  constexpr bool
-  isfinite(double __x)
-  { return __builtin_isfinite(__x); }
-
-  constexpr bool
-  isfinite(long double __x)
-  { return __builtin_isfinite(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                              bool>::__type
-    isfinite(_Tp __x)
-    { return true; }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr bool
-  isinf(float __x)
-  { return __builtin_isinf(__x); }
-
-  constexpr bool
-  isinf(double __x)
-  { return __builtin_isinf(__x); }
-
-  constexpr bool
-  isinf(long double __x)
-  { return __builtin_isinf(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                              bool>::__type
-    isinf(_Tp __x)
-    { return false; }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr bool
-  isnan(float __x)
-  { return __builtin_isnan(__x); }
-
-  constexpr bool
-  isnan(double __x)
-  { return __builtin_isnan(__x); }
-
-  constexpr bool
-  isnan(long double __x)
-  { return __builtin_isnan(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                              bool>::__type
-    isnan(_Tp __x)
-    { return false; }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr bool
-  isnormal(float __x)
-  { return __builtin_isnormal(__x); }
-
-  constexpr bool
-  isnormal(double __x)
-  { return __builtin_isnormal(__x); }
-
-  constexpr bool
-  isnormal(long double __x)
-  { return __builtin_isnormal(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                              bool>::__type
-    isnormal(_Tp __x)
-    { return __x != 0 ? true : false; }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  // The front-end doesn't provide a type generic builtin (libstdc++/58625).
-  constexpr bool
-  signbit(float __x)
-  { return __builtin_signbitf(__x); }
-
-  constexpr bool
-  signbit(double __x)
-  { return __builtin_signbit(__x); }
-
-  constexpr bool
-  signbit(long double __x)
-  { return __builtin_signbitl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                              bool>::__type
-    signbit(_Tp __x)
-    { return __x < 0 ? true : false; }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr bool
-  isgreater(float __x, float __y)
-  { return __builtin_isgreater(__x, __y); }
-
-  constexpr bool
-  isgreater(double __x, double __y)
-  { return __builtin_isgreater(__x, __y); }
-
-  constexpr bool
-  isgreater(long double __x, long double __y)
-  { return __builtin_isgreater(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename
-    __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
-			    && __is_arithmetic<_Up>::__value), bool>::__type
-    isgreater(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return __builtin_isgreater(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr bool
-  isgreaterequal(float __x, float __y)
-  { return __builtin_isgreaterequal(__x, __y); }
-
-  constexpr bool
-  isgreaterequal(double __x, double __y)
-  { return __builtin_isgreaterequal(__x, __y); }
-
-  constexpr bool
-  isgreaterequal(long double __x, long double __y)
-  { return __builtin_isgreaterequal(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename
-    __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
-			    && __is_arithmetic<_Up>::__value), bool>::__type
-    isgreaterequal(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return __builtin_isgreaterequal(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr bool
-  isless(float __x, float __y)
-  { return __builtin_isless(__x, __y); }
-
-  constexpr bool
-  isless(double __x, double __y)
-  { return __builtin_isless(__x, __y); }
-
-  constexpr bool
-  isless(long double __x, long double __y)
-  { return __builtin_isless(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename
-    __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
-			    && __is_arithmetic<_Up>::__value), bool>::__type
-    isless(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return __builtin_isless(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr bool
-  islessequal(float __x, float __y)
-  { return __builtin_islessequal(__x, __y); }
-
-  constexpr bool
-  islessequal(double __x, double __y)
-  { return __builtin_islessequal(__x, __y); }
-
-  constexpr bool
-  islessequal(long double __x, long double __y)
-  { return __builtin_islessequal(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename
-    __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
-			    && __is_arithmetic<_Up>::__value), bool>::__type
-    islessequal(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return __builtin_islessequal(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr bool
-  islessgreater(float __x, float __y)
-  { return __builtin_islessgreater(__x, __y); }
-
-  constexpr bool
-  islessgreater(double __x, double __y)
-  { return __builtin_islessgreater(__x, __y); }
-
-  constexpr bool
-  islessgreater(long double __x, long double __y)
-  { return __builtin_islessgreater(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename
-    __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
-			    && __is_arithmetic<_Up>::__value), bool>::__type
-    islessgreater(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return __builtin_islessgreater(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr bool
-  isunordered(float __x, float __y)
-  { return __builtin_isunordered(__x, __y); }
-
-  constexpr bool
-  isunordered(double __x, double __y)
-  { return __builtin_isunordered(__x, __y); }
-
-  constexpr bool
-  isunordered(long double __x, long double __y)
-  { return __builtin_isunordered(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename
-    __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
-			    && __is_arithmetic<_Up>::__value), bool>::__type
-    isunordered(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return __builtin_isunordered(__type(__x), __type(__y));
-    }
-
-#else
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    fpclassify(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL,
-				  FP_SUBNORMAL, FP_ZERO, __type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isfinite(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isfinite(__type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isinf(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isinf(__type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isnan(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isnan(__type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isnormal(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isnormal(__type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    signbit(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return sizeof(__type) == sizeof(float)
-	? __builtin_signbitf(__type(__f))
-	: sizeof(__type) == sizeof(double)
-	? __builtin_signbit(__type(__f))
-	: __builtin_signbitl(__type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isgreater(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isgreater(__type(__f1), __type(__f2));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isgreaterequal(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isgreaterequal(__type(__f1), __type(__f2));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isless(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isless(__type(__f1), __type(__f2));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    islessequal(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_islessequal(__type(__f1), __type(__f2));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    islessgreater(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_islessgreater(__type(__f1), __type(__f2));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isunordered(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isunordered(__type(__f1), __type(__f2));
-    }
-
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
-#endif
-
-#if __cplusplus >= 201103L
-
-#ifdef _GLIBCXX_USE_C99_MATH_TR1
-
-#undef acosh
-#undef acoshf
-#undef acoshl
-#undef asinh
-#undef asinhf
-#undef asinhl
-#undef atanh
-#undef atanhf
-#undef atanhl
-#undef cbrt
-#undef cbrtf
-#undef cbrtl
-#undef copysign
-#undef copysignf
-#undef copysignl
-#undef erf
-#undef erff
-#undef erfl
-#undef erfc
-#undef erfcf
-#undef erfcl
-#undef exp2
-#undef exp2f
-#undef exp2l
-#undef expm1
-#undef expm1f
-#undef expm1l
-#undef fdim
-#undef fdimf
-#undef fdiml
-#undef fma
-#undef fmaf
-#undef fmal
-#undef fmax
-#undef fmaxf
-#undef fmaxl
-#undef fmin
-#undef fminf
-#undef fminl
-#undef hypot
-#undef hypotf
-#undef hypotl
-#undef ilogb
-#undef ilogbf
-#undef ilogbl
-#undef lgamma
-#undef lgammaf
-#undef lgammal
-#undef llrint
-#undef llrintf
-#undef llrintl
-#undef llround
-#undef llroundf
-#undef llroundl
-#undef log1p
-#undef log1pf
-#undef log1pl
-#undef log2
-#undef log2f
-#undef log2l
-#undef logb
-#undef logbf
-#undef logbl
-#undef lrint
-#undef lrintf
-#undef lrintl
-#undef lround
-#undef lroundf
-#undef lroundl
-#undef nan
-#undef nanf
-#undef nanl
-#undef nearbyint
-#undef nearbyintf
-#undef nearbyintl
-#undef nextafter
-#undef nextafterf
-#undef nextafterl
-#undef nexttoward
-#undef nexttowardf
-#undef nexttowardl
-#undef remainder
-#undef remainderf
-#undef remainderl
-#undef remquo
-#undef remquof
-#undef remquol
-#undef rint
-#undef rintf
-#undef rintl
-#undef round
-#undef roundf
-#undef roundl
-#undef scalbln
-#undef scalblnf
-#undef scalblnl
-#undef scalbn
-#undef scalbnf
-#undef scalbnl
-#undef tgamma
-#undef tgammaf
-#undef tgammal
-#undef trunc
-#undef truncf
-#undef truncl
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // types
-  using ::double_t;
-  using ::float_t;
-
-  // functions
-  using ::acosh;
-  using ::acoshf;
-  using ::acoshl;
-
-  using ::asinh;
-  using ::asinhf;
-  using ::asinhl;
-
-  using ::atanh;
-  using ::atanhf;
-  using ::atanhl;
-
-  using ::cbrt;
-  using ::cbrtf;
-  using ::cbrtl;
-
-  using ::copysign;
-  using ::copysignf;
-  using ::copysignl;
-
-  using ::erf;
-  using ::erff;
-  using ::erfl;
-
-  using ::erfc;
-  using ::erfcf;
-  using ::erfcl;
-
-  using ::exp2;
-  using ::exp2f;
-  using ::exp2l;
-
-  using ::expm1;
-  using ::expm1f;
-  using ::expm1l;
-
-  using ::fdim;
-  using ::fdimf;
-  using ::fdiml;
-
-  using ::fma;
-  using ::fmaf;
-  using ::fmal;
-
-  using ::fmax;
-  using ::fmaxf;
-  using ::fmaxl;
-
-  using ::fmin;
-  using ::fminf;
-  using ::fminl;
-
-  using ::hypot;
-  using ::hypotf;
-  using ::hypotl;
-
-  using ::ilogb;
-  using ::ilogbf;
-  using ::ilogbl;
-
-  using ::lgamma;
-  using ::lgammaf;
-  using ::lgammal;
-
-  using ::llrint;
-  using ::llrintf;
-  using ::llrintl;
-
-  using ::llround;
-  using ::llroundf;
-  using ::llroundl;
-
-  using ::log1p;
-  using ::log1pf;
-  using ::log1pl;
-
-  using ::log2;
-  using ::log2f;
-  using ::log2l;
-
-  using ::logb;
-  using ::logbf;
-  using ::logbl;
-
-  using ::lrint;
-  using ::lrintf;
-  using ::lrintl;
-
-  using ::lround;
-  using ::lroundf;
-  using ::lroundl;
-
-  using ::nan;
-  using ::nanf;
-  using ::nanl;
-
-  using ::nearbyint;
-  using ::nearbyintf;
-  using ::nearbyintl;
-
-  using ::nextafter;
-  using ::nextafterf;
-  using ::nextafterl;
-
-  using ::nexttoward;
-  using ::nexttowardf;
-  using ::nexttowardl;
-
-  using ::remainder;
-  using ::remainderf;
-  using ::remainderl;
-
-  using ::remquo;
-  using ::remquof;
-  using ::remquol;
-
-  using ::rint;
-  using ::rintf;
-  using ::rintl;
-
-  using ::round;
-  using ::roundf;
-  using ::roundl;
-
-  using ::scalbln;
-  using ::scalblnf;
-  using ::scalblnl;
-
-  using ::scalbn;
-  using ::scalbnf;
-  using ::scalbnl;
-
-  using ::tgamma;
-  using ::tgammaf;
-  using ::tgammal;
-
-  using ::trunc;
-  using ::truncf;
-  using ::truncl;
-
-  /// Additional overloads.
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  acosh(float __x)
-  { return __builtin_acoshf(__x); }
-
-  constexpr long double
-  acosh(long double __x)
-  { return __builtin_acoshl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    acosh(_Tp __x)
-    { return __builtin_acosh(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  asinh(float __x)
-  { return __builtin_asinhf(__x); }
-
-  constexpr long double
-  asinh(long double __x)
-  { return __builtin_asinhl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    asinh(_Tp __x)
-    { return __builtin_asinh(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  atanh(float __x)
-  { return __builtin_atanhf(__x); }
-
-  constexpr long double
-  atanh(long double __x)
-  { return __builtin_atanhl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    atanh(_Tp __x)
-    { return __builtin_atanh(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  cbrt(float __x)
-  { return __builtin_cbrtf(__x); }
-
-  constexpr long double
-  cbrt(long double __x)
-  { return __builtin_cbrtl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    cbrt(_Tp __x)
-    { return __builtin_cbrt(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  copysign(float __x, float __y)
-  { return __builtin_copysignf(__x, __y); }
-
-  constexpr long double
-  copysign(long double __x, long double __y)
-  { return __builtin_copysignl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    copysign(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return copysign(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  erf(float __x)
-  { return __builtin_erff(__x); }
-
-  constexpr long double
-  erf(long double __x)
-  { return __builtin_erfl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    erf(_Tp __x)
-    { return __builtin_erf(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  erfc(float __x)
-  { return __builtin_erfcf(__x); }
-
-  constexpr long double
-  erfc(long double __x)
-  { return __builtin_erfcl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    erfc(_Tp __x)
-    { return __builtin_erfc(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  exp2(float __x)
-  { return __builtin_exp2f(__x); }
-
-  constexpr long double
-  exp2(long double __x)
-  { return __builtin_exp2l(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    exp2(_Tp __x)
-    { return __builtin_exp2(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  expm1(float __x)
-  { return __builtin_expm1f(__x); }
-
-  constexpr long double
-  expm1(long double __x)
-  { return __builtin_expm1l(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    expm1(_Tp __x)
-    { return __builtin_expm1(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  fdim(float __x, float __y)
-  { return __builtin_fdimf(__x, __y); }
-
-  constexpr long double
-  fdim(long double __x, long double __y)
-  { return __builtin_fdiml(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    fdim(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return fdim(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  fma(float __x, float __y, float __z)
-  { return __builtin_fmaf(__x, __y, __z); }
-
-  constexpr long double
-  fma(long double __x, long double __y, long double __z)
-  { return __builtin_fmal(__x, __y, __z); }
-#endif
-
-  template<typename _Tp, typename _Up, typename _Vp>
-    constexpr typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type
-    fma(_Tp __x, _Up __y, _Vp __z)
-    {
-      typedef typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type __type;
-      return fma(__type(__x), __type(__y), __type(__z));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  fmax(float __x, float __y)
-  { return __builtin_fmaxf(__x, __y); }
-
-  constexpr long double
-  fmax(long double __x, long double __y)
-  { return __builtin_fmaxl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    fmax(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return fmax(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  fmin(float __x, float __y)
-  { return __builtin_fminf(__x, __y); }
-
-  constexpr long double
-  fmin(long double __x, long double __y)
-  { return __builtin_fminl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    fmin(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return fmin(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  hypot(float __x, float __y)
-  { return __builtin_hypotf(__x, __y); }
-
-  constexpr long double
-  hypot(long double __x, long double __y)
-  { return __builtin_hypotl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    hypot(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return hypot(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr int
-  ilogb(float __x)
-  { return __builtin_ilogbf(__x); }
-
-  constexpr int
-  ilogb(long double __x)
-  { return __builtin_ilogbl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr
-    typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                    int>::__type
-    ilogb(_Tp __x)
-    { return __builtin_ilogb(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  lgamma(float __x)
-  { return __builtin_lgammaf(__x); }
-
-  constexpr long double
-  lgamma(long double __x)
-  { return __builtin_lgammal(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    lgamma(_Tp __x)
-    { return __builtin_lgamma(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr long long
-  llrint(float __x)
-  { return __builtin_llrintf(__x); }
-
-  constexpr long long
-  llrint(long double __x)
-  { return __builtin_llrintl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              long long>::__type
-    llrint(_Tp __x)
-    { return __builtin_llrint(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr long long
-  llround(float __x)
-  { return __builtin_llroundf(__x); }
-
-  constexpr long long
-  llround(long double __x)
-  { return __builtin_llroundl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              long long>::__type
-    llround(_Tp __x)
-    { return __builtin_llround(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  log1p(float __x)
-  { return __builtin_log1pf(__x); }
-
-  constexpr long double
-  log1p(long double __x)
-  { return __builtin_log1pl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    log1p(_Tp __x)
-    { return __builtin_log1p(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  // DR 568.
-  constexpr float
-  log2(float __x)
-  { return __builtin_log2f(__x); }
-
-  constexpr long double
-  log2(long double __x)
-  { return __builtin_log2l(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    log2(_Tp __x)
-    { return __builtin_log2(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  logb(float __x)
-  { return __builtin_logbf(__x); }
-
-  constexpr long double
-  logb(long double __x)
-  { return __builtin_logbl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    logb(_Tp __x)
-    { return __builtin_logb(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr long
-  lrint(float __x)
-  { return __builtin_lrintf(__x); }
-
-  constexpr long
-  lrint(long double __x)
-  { return __builtin_lrintl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              long>::__type
-    lrint(_Tp __x)
-    { return __builtin_lrint(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr long
-  lround(float __x)
-  { return __builtin_lroundf(__x); }
-
-  constexpr long
-  lround(long double __x)
-  { return __builtin_lroundl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              long>::__type
-    lround(_Tp __x)
-    { return __builtin_lround(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  nearbyint(float __x)
-  { return __builtin_nearbyintf(__x); }
-
-  constexpr long double
-  nearbyint(long double __x)
-  { return __builtin_nearbyintl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    nearbyint(_Tp __x)
-    { return __builtin_nearbyint(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  nextafter(float __x, float __y)
-  { return __builtin_nextafterf(__x, __y); }
-
-  constexpr long double
-  nextafter(long double __x, long double __y)
-  { return __builtin_nextafterl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    nextafter(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return nextafter(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  nexttoward(float __x, long double __y)
-  { return __builtin_nexttowardf(__x, __y); }
-
-  constexpr long double
-  nexttoward(long double __x, long double __y)
-  { return __builtin_nexttowardl(__x, __y); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    nexttoward(_Tp __x, long double __y)
-    { return __builtin_nexttoward(__x, __y); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  remainder(float __x, float __y)
-  { return __builtin_remainderf(__x, __y); }
-
-  constexpr long double
-  remainder(long double __x, long double __y)
-  { return __builtin_remainderl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    constexpr typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    remainder(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return remainder(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  remquo(float __x, float __y, int* __pquo)
-  { return __builtin_remquof(__x, __y, __pquo); }
-
-  inline long double
-  remquo(long double __x, long double __y, int* __pquo)
-  { return __builtin_remquol(__x, __y, __pquo); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    remquo(_Tp __x, _Up __y, int* __pquo)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return remquo(__type(__x), __type(__y), __pquo);
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  rint(float __x)
-  { return __builtin_rintf(__x); }
-
-  constexpr long double
-  rint(long double __x)
-  { return __builtin_rintl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    rint(_Tp __x)
-    { return __builtin_rint(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  round(float __x)
-  { return __builtin_roundf(__x); }
-
-  constexpr long double
-  round(long double __x)
-  { return __builtin_roundl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    round(_Tp __x)
-    { return __builtin_round(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  scalbln(float __x, long __ex)
-  { return __builtin_scalblnf(__x, __ex); }
-
-  constexpr long double
-  scalbln(long double __x, long __ex)
-  { return __builtin_scalblnl(__x, __ex); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    scalbln(_Tp __x, long __ex)
-    { return __builtin_scalbln(__x, __ex); }
- 
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  scalbn(float __x, int __ex)
-  { return __builtin_scalbnf(__x, __ex); }
-
-  constexpr long double
-  scalbn(long double __x, int __ex)
-  { return __builtin_scalbnl(__x, __ex); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    scalbn(_Tp __x, int __ex)
-    { return __builtin_scalbn(__x, __ex); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  tgamma(float __x)
-  { return __builtin_tgammaf(__x); }
-
-  constexpr long double
-  tgamma(long double __x)
-  { return __builtin_tgammal(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    tgamma(_Tp __x)
-    { return __builtin_tgamma(__x); }
- 
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  constexpr float
-  trunc(float __x)
-  { return __builtin_truncf(__x); }
-
-  constexpr long double
-  trunc(long double __x)
-  { return __builtin_truncl(__x); }
-#endif
-
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-                                              double>::__type
-    trunc(_Tp __x)
-    { return __builtin_trunc(__x); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // _GLIBCXX_USE_C99_MATH_TR1
-
-#endif // C++11
-
-#endif
diff --git a/openflow/usr/include/c++/5/codecvt b/openflow/usr/include/c++/5/codecvt
deleted file mode 100644
index e4a7d5b..0000000
--- a/openflow/usr/include/c++/5/codecvt
+++ /dev/null
@@ -1,181 +0,0 @@
-// <codecvt> -*- C++ -*-
-
-// Copyright (C) 2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// ISO C++ 14882: 22.5  Standard code conversion facets
-
-/** @file include/codecvt
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_CODECVT
-#define _GLIBCXX_CODECVT 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <bits/locale_classes.h>
-#include <bits/codecvt.h>
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  enum codecvt_mode
-  {
-    consume_header = 4,
-    generate_header = 2,
-    little_endian = 1
-  };
-
-  template<typename _Elem, unsigned long _Maxcode = 0x10ffff,
-	   codecvt_mode _Mode = (codecvt_mode)0>
-    class codecvt_utf8 : public codecvt<_Elem, char, mbstate_t>
-    {
-    public:
-      explicit
-      codecvt_utf8(size_t __refs = 0);
-
-      ~codecvt_utf8();
-    };
-
-  template<typename _Elem, unsigned long _Maxcode = 0x10ffff,
-	   codecvt_mode _Mode = (codecvt_mode)0>
-    class codecvt_utf16 : public codecvt<_Elem, char, mbstate_t>
-    {
-    public:
-      explicit
-      codecvt_utf16(size_t __refs = 0);
-
-      ~codecvt_utf16();
-    };
-
-  template<typename _Elem, unsigned long _Maxcode = 0x10ffff,
-	   codecvt_mode _Mode = (codecvt_mode)0>
-    class codecvt_utf8_utf16 : public codecvt<_Elem, char, mbstate_t>
-    {
-    public:
-      explicit
-      codecvt_utf8_utf16(size_t __refs = 0);
-
-      ~codecvt_utf8_utf16();
-    };
-
-#define _GLIBCXX_CODECVT_SPECIALIZATION2(_NAME, _ELEM) \
-  template<> \
-    class _NAME<_ELEM> \
-    : public codecvt<_ELEM, char, mbstate_t> \
-    { \
-    public: \
-      typedef _ELEM			intern_type; \
-      typedef char			extern_type; \
-      typedef mbstate_t			state_type; \
- \
-    protected: \
-      _NAME(unsigned long __maxcode, codecvt_mode __mode, size_t __refs) \
-      : codecvt(__refs), _M_maxcode(__maxcode), _M_mode(__mode) { } \
- \
-      virtual \
-      ~_NAME(); \
- \
-      virtual result \
-      do_out(state_type& __state, const intern_type* __from, \
-	     const intern_type* __from_end, const intern_type*& __from_next, \
-	     extern_type* __to, extern_type* __to_end, \
-	     extern_type*& __to_next) const; \
- \
-      virtual result \
-      do_unshift(state_type& __state, \
-		 extern_type* __to, extern_type* __to_end, \
-		 extern_type*& __to_next) const; \
- \
-      virtual result \
-      do_in(state_type& __state, \
-	     const extern_type* __from, const extern_type* __from_end, \
-	     const extern_type*& __from_next, \
-	     intern_type* __to, intern_type* __to_end, \
-	     intern_type*& __to_next) const; \
- \
-      virtual \
-      int do_encoding() const throw(); \
- \
-      virtual \
-      bool do_always_noconv() const throw(); \
- \
-      virtual \
-      int do_length(state_type&, const extern_type* __from, \
-		    const extern_type* __end, size_t __max) const; \
- \
-      virtual int \
-      do_max_length() const throw(); \
- \
-    private: \
-      unsigned long	_M_maxcode; \
-      codecvt_mode	_M_mode; \
-    }
-
-#define _GLIBCXX_CODECVT_SPECIALIZATION(_NAME, _ELEM) \
-  _GLIBCXX_CODECVT_SPECIALIZATION2(__ ## _NAME ## _base, _ELEM); \
-  template<unsigned long _Maxcode, codecvt_mode _Mode> \
-    class _NAME<_ELEM, _Maxcode, _Mode> \
-    : public __ ## _NAME ## _base<_ELEM> \
-    { \
-    public: \
-      explicit \
-      _NAME(size_t __refs = 0) \
-      : __ ## _NAME ## _base<_ELEM>(std::min(_Maxcode, 0x10fffful), \
-				    _Mode, __refs) \
-      { } \
-    }
-
-  template<typename _Elem> class __codecvt_utf8_base;
-  template<typename _Elem> class __codecvt_utf16_base;
-  template<typename _Elem> class __codecvt_utf8_utf16_base;
-
-  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8, char16_t);
-  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf16, char16_t);
-  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8_utf16, char16_t);
-
-  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8, char32_t);
-  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf16, char32_t);
-  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8_utf16, char32_t);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8, wchar_t);
-  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf16, wchar_t);
-  _GLIBCXX_CODECVT_SPECIALIZATION(codecvt_utf8_utf16, wchar_t);
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
-
-#endif
-
-#endif /* _GLIBCXX_CODECVT */
diff --git a/openflow/usr/include/c++/5/complex b/openflow/usr/include/c++/5/complex
deleted file mode 100644
index 585683c..0000000
--- a/openflow/usr/include/c++/5/complex
+++ /dev/null
@@ -1,1973 +0,0 @@
-// The template and inlines for the -*- C++ -*- complex number classes.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/complex
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 14882: 26.2  Complex Numbers
-// Note: this is not a conforming implementation.
-// Initially implemented by Ulrich Drepper <drepper@cygnus.com>
-// Improved by Gabriel Dos Reis <dosreis@cmla.ens-cachan.fr>
-//
-
-#ifndef _GLIBCXX_COMPLEX
-#define _GLIBCXX_COMPLEX 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/cpp_type_traits.h>
-#include <ext/type_traits.h>
-#include <cmath>
-#include <sstream>
-
-// Get rid of a macro possibly defined in <complex.h>
-#undef complex
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup complex_numbers Complex Numbers
-   * @ingroup numerics
-   *
-   * Classes and functions for complex numbers.
-   * @{
-   */
-
-  // Forward declarations.
-  template<typename _Tp> class complex;
-  template<> class complex<float>;
-  template<> class complex<double>;
-  template<> class complex<long double>;
-
-  ///  Return magnitude of @a z.
-  template<typename _Tp> _Tp abs(const complex<_Tp>&);
-  ///  Return phase angle of @a z.
-  template<typename _Tp> _Tp arg(const complex<_Tp>&);
-  ///  Return @a z magnitude squared.
-  template<typename _Tp> _Tp norm(const complex<_Tp>&);
-
-  ///  Return complex conjugate of @a z.
-  template<typename _Tp> complex<_Tp> conj(const complex<_Tp>&);
-  ///  Return complex with magnitude @a rho and angle @a theta.
-  template<typename _Tp> complex<_Tp> polar(const _Tp&, const _Tp& = 0);
-
-  // Transcendentals:
-  /// Return complex cosine of @a z.
-  template<typename _Tp> complex<_Tp> cos(const complex<_Tp>&);
-  /// Return complex hyperbolic cosine of @a z.
-  template<typename _Tp> complex<_Tp> cosh(const complex<_Tp>&);
-  /// Return complex base e exponential of @a z.
-  template<typename _Tp> complex<_Tp> exp(const complex<_Tp>&);
-  /// Return complex natural logarithm of @a z.
-  template<typename _Tp> complex<_Tp> log(const complex<_Tp>&);
-  /// Return complex base 10 logarithm of @a z.
-  template<typename _Tp> complex<_Tp> log10(const complex<_Tp>&);
-  /// Return @a x to the @a y'th power.
-  template<typename _Tp> complex<_Tp> pow(const complex<_Tp>&, int);
-  /// Return @a x to the @a y'th power.
-  template<typename _Tp> complex<_Tp> pow(const complex<_Tp>&, const _Tp&);
-  /// Return @a x to the @a y'th power.
-  template<typename _Tp> complex<_Tp> pow(const complex<_Tp>&, 
-                                          const complex<_Tp>&);
-  /// Return @a x to the @a y'th power.
-  template<typename _Tp> complex<_Tp> pow(const _Tp&, const complex<_Tp>&);
-  /// Return complex sine of @a z.
-  template<typename _Tp> complex<_Tp> sin(const complex<_Tp>&);
-  /// Return complex hyperbolic sine of @a z.
-  template<typename _Tp> complex<_Tp> sinh(const complex<_Tp>&);
-  /// Return complex square root of @a z.
-  template<typename _Tp> complex<_Tp> sqrt(const complex<_Tp>&);
-  /// Return complex tangent of @a z.
-  template<typename _Tp> complex<_Tp> tan(const complex<_Tp>&);
-  /// Return complex hyperbolic tangent of @a z.
-  template<typename _Tp> complex<_Tp> tanh(const complex<_Tp>&);
-    
-    
-  // 26.2.2  Primary template class complex
-  /**
-   *  Template to represent complex numbers.
-   *
-   *  Specializations for float, double, and long double are part of the
-   *  library.  Results with any other type are not guaranteed.
-   *
-   *  @param  Tp  Type of real and imaginary values.
-  */
-  template<typename _Tp>
-    struct complex
-    {
-      /// Value typedef.
-      typedef _Tp value_type;
-      
-      ///  Default constructor.  First parameter is x, second parameter is y.
-      ///  Unspecified parameters default to 0.
-      _GLIBCXX_CONSTEXPR complex(const _Tp& __r = _Tp(), const _Tp& __i = _Tp())
-      : _M_real(__r), _M_imag(__i) { }
-
-      // Let the compiler synthesize the copy constructor
-#if __cplusplus >= 201103L
-      constexpr complex(const complex&) = default;
-#endif
-
-      ///  Converting constructor.
-      template<typename _Up>
-        _GLIBCXX_CONSTEXPR complex(const complex<_Up>& __z)
-	: _M_real(__z.real()), _M_imag(__z.imag()) { }
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 387. std::complex over-encapsulated.
-      _GLIBCXX_ABI_TAG_CXX11
-      constexpr _Tp 
-      real() const { return _M_real; }
-
-      _GLIBCXX_ABI_TAG_CXX11
-      constexpr _Tp 
-      imag() const { return _M_imag; }
-#else
-      ///  Return real part of complex number.
-      _Tp& 
-      real() { return _M_real; }
-
-      ///  Return real part of complex number.
-      const _Tp& 
-      real() const { return _M_real; }
-
-      ///  Return imaginary part of complex number.
-      _Tp& 
-      imag() { return _M_imag; }
-
-      ///  Return imaginary part of complex number.
-      const _Tp& 
-      imag() const { return _M_imag; }
-#endif
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 387. std::complex over-encapsulated.
-      void 
-      real(_Tp __val) { _M_real = __val; }
-
-      void 
-      imag(_Tp __val) { _M_imag = __val; }
-
-      /// Assign a scalar to this complex number.
-      complex<_Tp>& operator=(const _Tp&);
-      
-      /// Add a scalar to this complex number.
-      // 26.2.5/1
-      complex<_Tp>&
-      operator+=(const _Tp& __t)
-      {
-	_M_real += __t;
-	return *this;
-      }
-
-      /// Subtract a scalar from this complex number.
-      // 26.2.5/3
-      complex<_Tp>&
-      operator-=(const _Tp& __t)
-      {
-	_M_real -= __t;
-	return *this;
-      }
-
-      /// Multiply this complex number by a scalar.
-      complex<_Tp>& operator*=(const _Tp&);
-      /// Divide this complex number by a scalar.
-      complex<_Tp>& operator/=(const _Tp&);
-
-      // Let the compiler synthesize the copy assignment operator
-#if __cplusplus >= 201103L
-      complex& operator=(const complex&) = default;
-#endif
-
-      /// Assign another complex number to this one.
-      template<typename _Up>
-        complex<_Tp>& operator=(const complex<_Up>&);
-      /// Add another complex number to this one.
-      template<typename _Up>
-        complex<_Tp>& operator+=(const complex<_Up>&);
-      /// Subtract another complex number from this one.
-      template<typename _Up>
-        complex<_Tp>& operator-=(const complex<_Up>&);
-      /// Multiply this complex number by another.
-      template<typename _Up>
-        complex<_Tp>& operator*=(const complex<_Up>&);
-      /// Divide this complex number by another.
-      template<typename _Up>
-        complex<_Tp>& operator/=(const complex<_Up>&);
-
-      _GLIBCXX_CONSTEXPR complex __rep() const
-      { return *this; }
-
-    private:
-      _Tp _M_real;
-      _Tp _M_imag;
-    };
-
-  template<typename _Tp>
-    complex<_Tp>&
-    complex<_Tp>::operator=(const _Tp& __t)
-    {
-     _M_real = __t;
-     _M_imag = _Tp();
-     return *this;
-    } 
-
-  // 26.2.5/5
-  template<typename _Tp>
-    complex<_Tp>&
-    complex<_Tp>::operator*=(const _Tp& __t)
-    {
-      _M_real *= __t;
-      _M_imag *= __t;
-      return *this;
-    }
-
-  // 26.2.5/7
-  template<typename _Tp>
-    complex<_Tp>&
-    complex<_Tp>::operator/=(const _Tp& __t)
-    {
-      _M_real /= __t;
-      _M_imag /= __t;
-      return *this;
-    }
-
-  template<typename _Tp>
-    template<typename _Up>
-    complex<_Tp>&
-    complex<_Tp>::operator=(const complex<_Up>& __z)
-    {
-      _M_real = __z.real();
-      _M_imag = __z.imag();
-      return *this;
-    }
-
-  // 26.2.5/9
-  template<typename _Tp>
-    template<typename _Up>
-    complex<_Tp>&
-    complex<_Tp>::operator+=(const complex<_Up>& __z)
-    {
-      _M_real += __z.real();
-      _M_imag += __z.imag();
-      return *this;
-    }
-
-  // 26.2.5/11
-  template<typename _Tp>
-    template<typename _Up>
-    complex<_Tp>&
-    complex<_Tp>::operator-=(const complex<_Up>& __z)
-    {
-      _M_real -= __z.real();
-      _M_imag -= __z.imag();
-      return *this;
-    }
-
-  // 26.2.5/13
-  // XXX: This is a grammar school implementation.
-  template<typename _Tp>
-    template<typename _Up>
-    complex<_Tp>&
-    complex<_Tp>::operator*=(const complex<_Up>& __z)
-    {
-      const _Tp __r = _M_real * __z.real() - _M_imag * __z.imag();
-      _M_imag = _M_real * __z.imag() + _M_imag * __z.real();
-      _M_real = __r;
-      return *this;
-    }
-
-  // 26.2.5/15
-  // XXX: This is a grammar school implementation.
-  template<typename _Tp>
-    template<typename _Up>
-    complex<_Tp>&
-    complex<_Tp>::operator/=(const complex<_Up>& __z)
-    {
-      const _Tp __r =  _M_real * __z.real() + _M_imag * __z.imag();
-      const _Tp __n = std::norm(__z);
-      _M_imag = (_M_imag * __z.real() - _M_real * __z.imag()) / __n;
-      _M_real = __r / __n;
-      return *this;
-    }
-    
-  // Operators:
-  //@{
-  ///  Return new complex value @a x plus @a y.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator+(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r += __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator+(const complex<_Tp>& __x, const _Tp& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r += __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator+(const _Tp& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __y;
-      __r += __x;
-      return __r;
-    }
-  //@}
-
-  //@{
-  ///  Return new complex value @a x minus @a y.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator-(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r -= __y;
-      return __r;
-    }
-    
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator-(const complex<_Tp>& __x, const _Tp& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r -= __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator-(const _Tp& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r(__x, -__y.imag());
-      __r -= __y.real();
-      return __r;
-    }
-  //@}
-
-  //@{
-  ///  Return new complex value @a x times @a y.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator*(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r *= __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator*(const complex<_Tp>& __x, const _Tp& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r *= __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator*(const _Tp& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __y;
-      __r *= __x;
-      return __r;
-    }
-  //@}
-
-  //@{
-  ///  Return new complex value @a x divided by @a y.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator/(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r /= __y;
-      return __r;
-    }
-    
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator/(const complex<_Tp>& __x, const _Tp& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r /= __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator/(const _Tp& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r /= __y;
-      return __r;
-    }
-  //@}
-
-  ///  Return @a x.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator+(const complex<_Tp>& __x)
-    { return __x; }
-
-  ///  Return complex negation of @a x.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator-(const complex<_Tp>& __x)
-    {  return complex<_Tp>(-__x.real(), -__x.imag()); }
-
-  //@{
-  ///  Return true if @a x is equal to @a y.
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator==(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    { return __x.real() == __y.real() && __x.imag() == __y.imag(); }
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator==(const complex<_Tp>& __x, const _Tp& __y)
-    { return __x.real() == __y && __x.imag() == _Tp(); }
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator==(const _Tp& __x, const complex<_Tp>& __y)
-    { return __x == __y.real() && _Tp() == __y.imag(); }
-  //@}
-
-  //@{
-  ///  Return false if @a x is equal to @a y.
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator!=(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    { return __x.real() != __y.real() || __x.imag() != __y.imag(); }
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator!=(const complex<_Tp>& __x, const _Tp& __y)
-    { return __x.real() != __y || __x.imag() != _Tp(); }
-
-  template<typename _Tp>
-    inline _GLIBCXX_CONSTEXPR bool
-    operator!=(const _Tp& __x, const complex<_Tp>& __y)
-    { return __x != __y.real() || _Tp() != __y.imag(); }
-  //@}
-
-  ///  Extraction operator for complex values.
-  template<typename _Tp, typename _CharT, class _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __x)
-    {
-      _Tp __re_x, __im_x;
-      _CharT __ch;
-      __is >> __ch;
-      if (__ch == '(') 
-	{
-	  __is >> __re_x >> __ch;
-	  if (__ch == ',') 
-	    {
-	      __is >> __im_x >> __ch;
-	      if (__ch == ')') 
-		__x = complex<_Tp>(__re_x, __im_x);
-	      else
-		__is.setstate(ios_base::failbit);
-	    }
-	  else if (__ch == ')') 
-	    __x = __re_x;
-	  else
-	    __is.setstate(ios_base::failbit);
-	}
-      else 
-	{
-	  __is.putback(__ch);
-	  __is >> __re_x;
-	  __x = __re_x;
-	}
-      return __is;
-    }
-
-  ///  Insertion operator for complex values.
-  template<typename _Tp, typename _CharT, class _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const complex<_Tp>& __x)
-    {
-      basic_ostringstream<_CharT, _Traits> __s;
-      __s.flags(__os.flags());
-      __s.imbue(__os.getloc());
-      __s.precision(__os.precision());
-      __s << '(' << __x.real() << ',' << __x.imag() << ')';
-      return __os << __s.str();
-    }
-
-  // Values
-#if __cplusplus >= 201103L
-  template<typename _Tp>
-    constexpr _Tp
-    real(const complex<_Tp>& __z)
-    { return __z.real(); }
-
-  template<typename _Tp>
-    constexpr _Tp
-    imag(const complex<_Tp>& __z)
-    { return __z.imag(); }
-#else
-  template<typename _Tp>
-    inline _Tp&
-    real(complex<_Tp>& __z)
-    { return __z.real(); }
-    
-  template<typename _Tp>
-    inline const _Tp&
-    real(const complex<_Tp>& __z)
-    { return __z.real(); }
-    
-  template<typename _Tp>
-    inline _Tp&
-    imag(complex<_Tp>& __z)
-    { return __z.imag(); }
-    
-  template<typename _Tp>
-    inline const _Tp&
-    imag(const complex<_Tp>& __z)
-    { return __z.imag(); }
-#endif
-
-  // 26.2.7/3 abs(__z):  Returns the magnitude of __z.
-  template<typename _Tp>
-    inline _Tp
-    __complex_abs(const complex<_Tp>& __z)
-    {
-      _Tp __x = __z.real();
-      _Tp __y = __z.imag();
-      const _Tp __s = std::max(abs(__x), abs(__y));
-      if (__s == _Tp())  // well ...
-        return __s;
-      __x /= __s; 
-      __y /= __s;
-      return __s * sqrt(__x * __x + __y * __y);
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline float
-  __complex_abs(__complex__ float __z) { return __builtin_cabsf(__z); }
-
-  inline double
-  __complex_abs(__complex__ double __z) { return __builtin_cabs(__z); }
-
-  inline long double
-  __complex_abs(const __complex__ long double& __z)
-  { return __builtin_cabsl(__z); }
-
-  template<typename _Tp>
-    inline _Tp
-    abs(const complex<_Tp>& __z) { return __complex_abs(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline _Tp
-    abs(const complex<_Tp>& __z) { return __complex_abs(__z); }
-#endif  
-
-
-  // 26.2.7/4: arg(__z): Returns the phase angle of __z.
-  template<typename _Tp>
-    inline _Tp
-    __complex_arg(const complex<_Tp>& __z)
-    { return  atan2(__z.imag(), __z.real()); }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline float
-  __complex_arg(__complex__ float __z) { return __builtin_cargf(__z); }
-
-  inline double
-  __complex_arg(__complex__ double __z) { return __builtin_carg(__z); }
-
-  inline long double
-  __complex_arg(const __complex__ long double& __z)
-  { return __builtin_cargl(__z); }
-
-  template<typename _Tp>
-    inline _Tp
-    arg(const complex<_Tp>& __z) { return __complex_arg(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline _Tp
-    arg(const complex<_Tp>& __z) { return __complex_arg(__z); }
-#endif
-
-  // 26.2.7/5: norm(__z) returns the squared magnitude of __z.
-  //     As defined, norm() is -not- a norm is the common mathematical
-  //     sense used in numerics.  The helper class _Norm_helper<> tries to
-  //     distinguish between builtin floating point and the rest, so as
-  //     to deliver an answer as close as possible to the real value.
-  template<bool>
-    struct _Norm_helper
-    {
-      template<typename _Tp>
-        static inline _Tp _S_do_it(const complex<_Tp>& __z)
-        {
-          const _Tp __x = __z.real();
-          const _Tp __y = __z.imag();
-          return __x * __x + __y * __y;
-        }
-    };
-
-  template<>
-    struct _Norm_helper<true>
-    {
-      template<typename _Tp>
-        static inline _Tp _S_do_it(const complex<_Tp>& __z)
-        {
-          _Tp __res = std::abs(__z);
-          return __res * __res;
-        }
-    };
-  
-  template<typename _Tp>
-    inline _Tp
-    norm(const complex<_Tp>& __z)
-    {
-      return _Norm_helper<__is_floating<_Tp>::__value 
-	&& !_GLIBCXX_FAST_MATH>::_S_do_it(__z);
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    polar(const _Tp& __rho, const _Tp& __theta)
-    { return complex<_Tp>(__rho * cos(__theta), __rho * sin(__theta)); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    conj(const complex<_Tp>& __z)
-    { return complex<_Tp>(__z.real(), -__z.imag()); }
-  
-  // Transcendentals
-
-  // 26.2.8/1 cos(__z):  Returns the cosine of __z.
-  template<typename _Tp>
-    inline complex<_Tp>
-    __complex_cos(const complex<_Tp>& __z)
-    {
-      const _Tp __x = __z.real();
-      const _Tp __y = __z.imag();
-      return complex<_Tp>(cos(__x) * cosh(__y), -sin(__x) * sinh(__y));
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_cos(__complex__ float __z) { return __builtin_ccosf(__z); }
-
-  inline __complex__ double
-  __complex_cos(__complex__ double __z) { return __builtin_ccos(__z); }
-
-  inline __complex__ long double
-  __complex_cos(const __complex__ long double& __z)
-  { return __builtin_ccosl(__z); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    cos(const complex<_Tp>& __z) { return __complex_cos(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline complex<_Tp>
-    cos(const complex<_Tp>& __z) { return __complex_cos(__z); }
-#endif
-
-  // 26.2.8/2 cosh(__z): Returns the hyperbolic cosine of __z.
-  template<typename _Tp>
-    inline complex<_Tp>
-    __complex_cosh(const complex<_Tp>& __z)
-    {
-      const _Tp __x = __z.real();
-      const _Tp __y = __z.imag();
-      return complex<_Tp>(cosh(__x) * cos(__y), sinh(__x) * sin(__y));
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_cosh(__complex__ float __z) { return __builtin_ccoshf(__z); }
-
-  inline __complex__ double
-  __complex_cosh(__complex__ double __z) { return __builtin_ccosh(__z); }
-
-  inline __complex__ long double
-  __complex_cosh(const __complex__ long double& __z)
-  { return __builtin_ccoshl(__z); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    cosh(const complex<_Tp>& __z) { return __complex_cosh(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline complex<_Tp>
-    cosh(const complex<_Tp>& __z) { return __complex_cosh(__z); }
-#endif
-
-  // 26.2.8/3 exp(__z): Returns the complex base e exponential of x
-  template<typename _Tp>
-    inline complex<_Tp>
-    __complex_exp(const complex<_Tp>& __z)
-    { return std::polar<_Tp>(exp(__z.real()), __z.imag()); }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_exp(__complex__ float __z) { return __builtin_cexpf(__z); }
-
-  inline __complex__ double
-  __complex_exp(__complex__ double __z) { return __builtin_cexp(__z); }
-
-  inline __complex__ long double
-  __complex_exp(const __complex__ long double& __z)
-  { return __builtin_cexpl(__z); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    exp(const complex<_Tp>& __z) { return __complex_exp(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline complex<_Tp>
-    exp(const complex<_Tp>& __z) { return __complex_exp(__z); }
-#endif
-
-  // 26.2.8/5 log(__z): Returns the natural complex logarithm of __z.
-  //                    The branch cut is along the negative axis.
-  template<typename _Tp>
-    inline complex<_Tp>
-    __complex_log(const complex<_Tp>& __z)
-    { return complex<_Tp>(log(std::abs(__z)), std::arg(__z)); }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_log(__complex__ float __z) { return __builtin_clogf(__z); }
-
-  inline __complex__ double
-  __complex_log(__complex__ double __z) { return __builtin_clog(__z); }
-
-  inline __complex__ long double
-  __complex_log(const __complex__ long double& __z)
-  { return __builtin_clogl(__z); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    log(const complex<_Tp>& __z) { return __complex_log(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline complex<_Tp>
-    log(const complex<_Tp>& __z) { return __complex_log(__z); }
-#endif
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    log10(const complex<_Tp>& __z)
-    { return std::log(__z) / log(_Tp(10.0)); }
-
-  // 26.2.8/10 sin(__z): Returns the sine of __z.
-  template<typename _Tp>
-    inline complex<_Tp>
-    __complex_sin(const complex<_Tp>& __z)
-    {
-      const _Tp __x = __z.real();
-      const _Tp __y = __z.imag();
-      return complex<_Tp>(sin(__x) * cosh(__y), cos(__x) * sinh(__y)); 
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_sin(__complex__ float __z) { return __builtin_csinf(__z); }
-
-  inline __complex__ double
-  __complex_sin(__complex__ double __z) { return __builtin_csin(__z); }
-
-  inline __complex__ long double
-  __complex_sin(const __complex__ long double& __z)
-  { return __builtin_csinl(__z); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    sin(const complex<_Tp>& __z) { return __complex_sin(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline complex<_Tp>
-    sin(const complex<_Tp>& __z) { return __complex_sin(__z); }
-#endif
-
-  // 26.2.8/11 sinh(__z): Returns the hyperbolic sine of __z.
-  template<typename _Tp>
-    inline complex<_Tp>
-    __complex_sinh(const complex<_Tp>& __z)
-    {
-      const _Tp __x = __z.real();
-      const _Tp  __y = __z.imag();
-      return complex<_Tp>(sinh(__x) * cos(__y), cosh(__x) * sin(__y));
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_sinh(__complex__ float __z) { return __builtin_csinhf(__z); }      
-
-  inline __complex__ double
-  __complex_sinh(__complex__ double __z) { return __builtin_csinh(__z); }      
-
-  inline __complex__ long double
-  __complex_sinh(const __complex__ long double& __z)
-  { return __builtin_csinhl(__z); }      
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    sinh(const complex<_Tp>& __z) { return __complex_sinh(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline complex<_Tp>
-    sinh(const complex<_Tp>& __z) { return __complex_sinh(__z); }
-#endif
-
-  // 26.2.8/13 sqrt(__z): Returns the complex square root of __z.
-  //                     The branch cut is on the negative axis.
-  template<typename _Tp>
-    complex<_Tp>
-    __complex_sqrt(const complex<_Tp>& __z)
-    {
-      _Tp __x = __z.real();
-      _Tp __y = __z.imag();
-
-      if (__x == _Tp())
-        {
-          _Tp __t = sqrt(abs(__y) / 2);
-          return complex<_Tp>(__t, __y < _Tp() ? -__t : __t);
-        }
-      else
-        {
-          _Tp __t = sqrt(2 * (std::abs(__z) + abs(__x)));
-          _Tp __u = __t / 2;
-          return __x > _Tp()
-            ? complex<_Tp>(__u, __y / __t)
-            : complex<_Tp>(abs(__y) / __t, __y < _Tp() ? -__u : __u);
-        }
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_sqrt(__complex__ float __z) { return __builtin_csqrtf(__z); }
-
-  inline __complex__ double
-  __complex_sqrt(__complex__ double __z) { return __builtin_csqrt(__z); }
-
-  inline __complex__ long double
-  __complex_sqrt(const __complex__ long double& __z)
-  { return __builtin_csqrtl(__z); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    sqrt(const complex<_Tp>& __z) { return __complex_sqrt(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline complex<_Tp>
-    sqrt(const complex<_Tp>& __z) { return __complex_sqrt(__z); }
-#endif
-
-  // 26.2.8/14 tan(__z):  Return the complex tangent of __z.
-  
-  template<typename _Tp>
-    inline complex<_Tp>
-    __complex_tan(const complex<_Tp>& __z)
-    { return std::sin(__z) / std::cos(__z); }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_tan(__complex__ float __z) { return __builtin_ctanf(__z); }
-
-  inline __complex__ double
-  __complex_tan(__complex__ double __z) { return __builtin_ctan(__z); }
-
-  inline __complex__ long double
-  __complex_tan(const __complex__ long double& __z)
-  { return __builtin_ctanl(__z); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    tan(const complex<_Tp>& __z) { return __complex_tan(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline complex<_Tp>
-    tan(const complex<_Tp>& __z) { return __complex_tan(__z); }
-#endif
-
-
-  // 26.2.8/15 tanh(__z):  Returns the hyperbolic tangent of __z.
-  
-  template<typename _Tp>
-    inline complex<_Tp>
-    __complex_tanh(const complex<_Tp>& __z)
-    { return std::sinh(__z) / std::cosh(__z); }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_tanh(__complex__ float __z) { return __builtin_ctanhf(__z); }
-
-  inline __complex__ double
-  __complex_tanh(__complex__ double __z) { return __builtin_ctanh(__z); }
-
-  inline __complex__ long double
-  __complex_tanh(const __complex__ long double& __z)
-  { return __builtin_ctanhl(__z); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    tanh(const complex<_Tp>& __z) { return __complex_tanh(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline complex<_Tp>
-    tanh(const complex<_Tp>& __z) { return __complex_tanh(__z); }
-#endif
-
-
-  // 26.2.8/9  pow(__x, __y): Returns the complex power base of __x
-  //                          raised to the __y-th power.  The branch
-  //                          cut is on the negative axis.
-  template<typename _Tp>
-    complex<_Tp>
-    __complex_pow_unsigned(complex<_Tp> __x, unsigned __n)
-    {
-      complex<_Tp> __y = __n % 2 ? __x : complex<_Tp>(1);
-
-      while (__n >>= 1)
-        {
-          __x *= __x;
-          if (__n % 2)
-            __y *= __x;
-        }
-
-      return __y;
-    }
-
-  // In C++11 mode we used to implement the resolution of
-  // DR 844. complex pow return type is ambiguous.
-  // thus the following overload was disabled in that mode.  However, doing
-  // that causes all sorts of issues, see, for example:
-  //   http://gcc.gnu.org/ml/libstdc++/2013-01/msg00058.html
-  // and also PR57974.
-  template<typename _Tp>
-    inline complex<_Tp>
-    pow(const complex<_Tp>& __z, int __n)
-    {
-      return __n < 0
-	? complex<_Tp>(1) / std::__complex_pow_unsigned(__z, -(unsigned)__n)
-        : std::__complex_pow_unsigned(__z, __n);
-    }
-
-  template<typename _Tp>
-    complex<_Tp>
-    pow(const complex<_Tp>& __x, const _Tp& __y)
-    {
-#ifndef _GLIBCXX_USE_C99_COMPLEX
-      if (__x == _Tp())
-	return _Tp();
-#endif
-      if (__x.imag() == _Tp() && __x.real() > _Tp())
-        return pow(__x.real(), __y);
-
-      complex<_Tp> __t = std::log(__x);
-      return std::polar<_Tp>(exp(__y * __t.real()), __y * __t.imag());
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    __complex_pow(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    { return __x == _Tp() ? _Tp() : std::exp(__y * std::log(__x)); }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_pow(__complex__ float __x, __complex__ float __y)
-  { return __builtin_cpowf(__x, __y); }
-
-  inline __complex__ double
-  __complex_pow(__complex__ double __x, __complex__ double __y)
-  { return __builtin_cpow(__x, __y); }
-
-  inline __complex__ long double
-  __complex_pow(const __complex__ long double& __x,
-		const __complex__ long double& __y)
-  { return __builtin_cpowl(__x, __y); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    pow(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    { return __complex_pow(__x.__rep(), __y.__rep()); }
-#else
-  template<typename _Tp>
-    inline complex<_Tp>
-    pow(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    { return __complex_pow(__x, __y); }
-#endif
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    pow(const _Tp& __x, const complex<_Tp>& __y)
-    {
-      return __x > _Tp() ? std::polar<_Tp>(pow(__x, __y.real()),
-					   __y.imag() * log(__x))
-	                 : std::pow(complex<_Tp>(__x), __y);
-    }
-
-  /// 26.2.3  complex specializations
-  /// complex<float> specialization
-  template<>
-    struct complex<float>
-    {
-      typedef float value_type;
-      typedef __complex__ float _ComplexT;
-
-      _GLIBCXX_CONSTEXPR complex(_ComplexT __z) : _M_value(__z) { }
-
-      _GLIBCXX_CONSTEXPR complex(float __r = 0.0f, float __i = 0.0f)
-#if __cplusplus >= 201103L
-      : _M_value{ __r, __i } { }
-#else
-      {
-	__real__ _M_value = __r;
-	__imag__ _M_value = __i;
-      }
-#endif
-
-      explicit _GLIBCXX_CONSTEXPR complex(const complex<double>&);
-      explicit _GLIBCXX_CONSTEXPR complex(const complex<long double>&);	
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 387. std::complex over-encapsulated.
-      __attribute ((__abi_tag__ ("cxx11")))
-      constexpr float 
-      real() const { return __real__ _M_value; }
-
-      __attribute ((__abi_tag__ ("cxx11")))
-      constexpr float 
-      imag() const { return __imag__ _M_value; }
-#else
-      float& 
-      real() { return __real__ _M_value; }
-
-      const float& 
-      real() const { return __real__ _M_value; }      
-
-      float& 
-      imag() { return __imag__ _M_value; }
-
-      const float& 
-      imag() const { return __imag__ _M_value; }
-#endif
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 387. std::complex over-encapsulated.
-      void 
-      real(float __val) { __real__ _M_value = __val; }
-
-      void 
-      imag(float __val) { __imag__ _M_value = __val; }
-
-      complex&
-      operator=(float __f)
-      {
-	_M_value = __f;
-	return *this;
-      }
-
-      complex&
-      operator+=(float __f)
-      {
-	_M_value += __f;
-	return *this;
-      }
-
-      complex&
-      operator-=(float __f)
-      {
-	_M_value -= __f;
-	return *this;
-      }
-
-      complex&
-      operator*=(float __f)
-      {
-	_M_value *= __f;
-	return *this;
-      }
-
-      complex&
-      operator/=(float __f)
-      {
-	_M_value /= __f;
-	return *this;
-      }
-
-      // Let the compiler synthesize the copy and assignment
-      // operator.  It always does a pretty good job.
-      // complex& operator=(const complex&);
-
-      template<typename _Tp>
-        complex&
-        operator=(const complex<_Tp>&  __z)
-	{
-	  __real__ _M_value = __z.real();
-	  __imag__ _M_value = __z.imag();
-	  return *this;
-	}
-
-      template<typename _Tp>
-        complex&
-        operator+=(const complex<_Tp>& __z)
-	{
-	  __real__ _M_value += __z.real();
-	  __imag__ _M_value += __z.imag();
-	  return *this;
-	}
-
-      template<class _Tp>
-        complex&
-        operator-=(const complex<_Tp>& __z)
-	{
-	  __real__ _M_value -= __z.real();
-	  __imag__ _M_value -= __z.imag();
-	  return *this;
-	}
-
-      template<class _Tp>
-        complex&
-        operator*=(const complex<_Tp>& __z)
-	{
-	  _ComplexT __t;
-	  __real__ __t = __z.real();
-	  __imag__ __t = __z.imag();
-	  _M_value *= __t;
-	  return *this;
-	}
-
-      template<class _Tp>
-        complex&
-        operator/=(const complex<_Tp>& __z)
-	{
-	  _ComplexT __t;
-	  __real__ __t = __z.real();
-	  __imag__ __t = __z.imag();
-	  _M_value /= __t;
-	  return *this;
-	}
-
-      _GLIBCXX_CONSTEXPR _ComplexT __rep() const { return _M_value; }
-
-    private:
-      _ComplexT _M_value;
-    };
-
-  /// 26.2.3  complex specializations
-  /// complex<double> specialization
-  template<>
-    struct complex<double>
-    {
-      typedef double value_type;
-      typedef __complex__ double _ComplexT;
-
-      _GLIBCXX_CONSTEXPR complex(_ComplexT __z) : _M_value(__z) { }
-
-      _GLIBCXX_CONSTEXPR complex(double __r = 0.0, double __i = 0.0)
-#if __cplusplus >= 201103L
-      : _M_value{ __r, __i } { }
-#else
-      {
-	__real__ _M_value = __r;
-	__imag__ _M_value = __i;
-      }
-#endif
-
-      _GLIBCXX_CONSTEXPR complex(const complex<float>& __z)
-      : _M_value(__z.__rep()) { }
-
-      explicit _GLIBCXX_CONSTEXPR complex(const complex<long double>&);	
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 387. std::complex over-encapsulated.
-      __attribute ((__abi_tag__ ("cxx11")))
-      constexpr double 
-      real() const { return __real__ _M_value; }
-
-      __attribute ((__abi_tag__ ("cxx11")))
-      constexpr double 
-      imag() const { return __imag__ _M_value; }
-#else
-      double& 
-      real() { return __real__ _M_value; }
-
-      const double& 
-      real() const { return __real__ _M_value; }
-
-      double& 
-      imag() { return __imag__ _M_value; }
-
-      const double& 
-      imag() const { return __imag__ _M_value; }
-#endif
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 387. std::complex over-encapsulated.
-      void 
-      real(double __val) { __real__ _M_value = __val; }
-
-      void 
-      imag(double __val) { __imag__ _M_value = __val; }
-
-      complex&
-      operator=(double __d)
-      {
-	_M_value = __d;
-	return *this;
-      }
-
-      complex&
-      operator+=(double __d)
-      {
-	_M_value += __d;
-	return *this;
-      }
-	
-      complex&
-      operator-=(double __d)
-      {
-	_M_value -= __d;
-	return *this;
-      }
-
-      complex&
-      operator*=(double __d)
-      {
-	_M_value *= __d;
-	return *this;
-      }
-
-      complex&
-      operator/=(double __d)
-      {
-	_M_value /= __d;
-	return *this;
-      }
-
-      // The compiler will synthesize this, efficiently.
-      // complex& operator=(const complex&);
-
-      template<typename _Tp>
-        complex&
-        operator=(const complex<_Tp>& __z)
-	{
-	  __real__ _M_value = __z.real();
-	  __imag__ _M_value = __z.imag();
-	  return *this;
-	}
-
-      template<typename _Tp>
-        complex&
-        operator+=(const complex<_Tp>& __z)
-	{
-	  __real__ _M_value += __z.real();
-	  __imag__ _M_value += __z.imag();
-	  return *this;
-	}
-
-      template<typename _Tp>
-        complex&
-        operator-=(const complex<_Tp>& __z)
-	{
-	  __real__ _M_value -= __z.real();
-	  __imag__ _M_value -= __z.imag();
-	  return *this;
-	}
-
-      template<typename _Tp>
-        complex&
-        operator*=(const complex<_Tp>& __z)
-	{
-	  _ComplexT __t;
-	  __real__ __t = __z.real();
-	  __imag__ __t = __z.imag();
-	  _M_value *= __t;
-	  return *this;
-	}
-
-      template<typename _Tp>
-        complex&
-        operator/=(const complex<_Tp>& __z)
-	{
-	  _ComplexT __t;
-	  __real__ __t = __z.real();
-	  __imag__ __t = __z.imag();
-	  _M_value /= __t;
-	  return *this;
-	}
-
-      _GLIBCXX_CONSTEXPR _ComplexT __rep() const { return _M_value; }
-
-    private:
-      _ComplexT _M_value;
-    };
-
-  /// 26.2.3  complex specializations
-  /// complex<long double> specialization
-  template<>
-    struct complex<long double>
-    {
-      typedef long double value_type;
-      typedef __complex__ long double _ComplexT;
-
-      _GLIBCXX_CONSTEXPR complex(_ComplexT __z) : _M_value(__z) { }
-
-      _GLIBCXX_CONSTEXPR complex(long double __r = 0.0L, 
-				 long double __i = 0.0L)
-#if __cplusplus >= 201103L
-      : _M_value{ __r, __i } { }
-#else
-      {
-	__real__ _M_value = __r;
-	__imag__ _M_value = __i;
-      }
-#endif
-
-      _GLIBCXX_CONSTEXPR complex(const complex<float>& __z)
-      : _M_value(__z.__rep()) { }
-
-      _GLIBCXX_CONSTEXPR complex(const complex<double>& __z)
-      : _M_value(__z.__rep()) { }
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 387. std::complex over-encapsulated.
-      __attribute ((__abi_tag__ ("cxx11")))
-      constexpr long double 
-      real() const { return __real__ _M_value; }
-
-      __attribute ((__abi_tag__ ("cxx11")))
-      constexpr long double 
-      imag() const { return __imag__ _M_value; }
-#else
-      long double& 
-      real() { return __real__ _M_value; }
-
-      const long double& 
-      real() const { return __real__ _M_value; }
-
-      long double& 
-      imag() { return __imag__ _M_value; }
-
-      const long double& 
-      imag() const { return __imag__ _M_value; }
-#endif
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 387. std::complex over-encapsulated.
-      void 
-      real(long double __val) { __real__ _M_value = __val; }
-
-      void 
-      imag(long double __val) { __imag__ _M_value = __val; }
-
-      complex&
-      operator=(long double __r)
-      {
-	_M_value = __r;
-	return *this;
-      }
-
-      complex&
-      operator+=(long double __r)
-      {
-	_M_value += __r;
-	return *this;
-      }
-
-      complex&
-      operator-=(long double __r)
-      {
-	_M_value -= __r;
-	return *this;
-      }
-
-      complex&
-      operator*=(long double __r)
-      {
-	_M_value *= __r;
-	return *this;
-      }
-
-      complex&
-      operator/=(long double __r)
-      {
-	_M_value /= __r;
-	return *this;
-      }
-
-      // The compiler knows how to do this efficiently
-      // complex& operator=(const complex&);
-
-      template<typename _Tp>
-        complex&
-        operator=(const complex<_Tp>& __z)
-	{
-	  __real__ _M_value = __z.real();
-	  __imag__ _M_value = __z.imag();
-	  return *this;
-	}
-
-      template<typename _Tp>
-        complex&
-	operator+=(const complex<_Tp>& __z)
-	{
-	  __real__ _M_value += __z.real();
-	  __imag__ _M_value += __z.imag();
-	  return *this;
-	}
-
-      template<typename _Tp>
-        complex&
-	operator-=(const complex<_Tp>& __z)
-	{
-	  __real__ _M_value -= __z.real();
-	  __imag__ _M_value -= __z.imag();
-	  return *this;
-	}
-
-      template<typename _Tp>
-        complex&
-	operator*=(const complex<_Tp>& __z)
-	{
-	  _ComplexT __t;
-	  __real__ __t = __z.real();
-	  __imag__ __t = __z.imag();
-	  _M_value *= __t;
-	  return *this;
-	}
-
-      template<typename _Tp>
-        complex&
-	operator/=(const complex<_Tp>& __z)
-	{
-	  _ComplexT __t;
-	  __real__ __t = __z.real();
-	  __imag__ __t = __z.imag();
-	  _M_value /= __t;
-	  return *this;
-	}
-
-      _GLIBCXX_CONSTEXPR _ComplexT __rep() const { return _M_value; }
-
-    private:
-      _ComplexT _M_value;
-    };
-
-  // These bits have to be at the end of this file, so that the
-  // specializations have all been defined.
-  inline _GLIBCXX_CONSTEXPR
-  complex<float>::complex(const complex<double>& __z)
-  : _M_value(__z.__rep()) { }
-
-  inline _GLIBCXX_CONSTEXPR
-  complex<float>::complex(const complex<long double>& __z)
-  : _M_value(__z.__rep()) { }
-
-  inline _GLIBCXX_CONSTEXPR
-  complex<double>::complex(const complex<long double>& __z)
-  : _M_value(__z.__rep()) { }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-  // NB:  This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template istream& operator>>(istream&, complex<float>&);
-  extern template ostream& operator<<(ostream&, const complex<float>&);
-  extern template istream& operator>>(istream&, complex<double>&);
-  extern template ostream& operator<<(ostream&, const complex<double>&);
-  extern template istream& operator>>(istream&, complex<long double>&);
-  extern template ostream& operator<<(ostream&, const complex<long double>&);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template wistream& operator>>(wistream&, complex<float>&);
-  extern template wostream& operator<<(wostream&, const complex<float>&);
-  extern template wistream& operator>>(wistream&, complex<double>&);
-  extern template wostream& operator<<(wostream&, const complex<double>&);
-  extern template wistream& operator>>(wistream&, complex<long double>&);
-  extern template wostream& operator<<(wostream&, const complex<long double>&);
-#endif
-#endif
-
-  // @} group complex_numbers
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // See ext/type_traits.h for the primary template.
-  template<typename _Tp, typename _Up>
-    struct __promote_2<std::complex<_Tp>, _Up>
-    {
-    public:
-      typedef std::complex<typename __promote_2<_Tp, _Up>::__type> __type;
-    };
-
-  template<typename _Tp, typename _Up>
-    struct __promote_2<_Tp, std::complex<_Up> >
-    {
-    public:
-      typedef std::complex<typename __promote_2<_Tp, _Up>::__type> __type;
-    };
-  
-  template<typename _Tp, typename _Up>
-    struct __promote_2<std::complex<_Tp>, std::complex<_Up> >
-    {
-    public:
-      typedef std::complex<typename __promote_2<_Tp, _Up>::__type> __type;
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if __cplusplus >= 201103L
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Forward declarations.
-  template<typename _Tp> std::complex<_Tp> acos(const std::complex<_Tp>&);
-  template<typename _Tp> std::complex<_Tp> asin(const std::complex<_Tp>&);
-  template<typename _Tp> std::complex<_Tp> atan(const std::complex<_Tp>&);
-
-  template<typename _Tp> std::complex<_Tp> acosh(const std::complex<_Tp>&);
-  template<typename _Tp> std::complex<_Tp> asinh(const std::complex<_Tp>&);
-  template<typename _Tp> std::complex<_Tp> atanh(const std::complex<_Tp>&);
-  // DR 595.
-  template<typename _Tp> _Tp               fabs(const std::complex<_Tp>&);
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    __complex_acos(const std::complex<_Tp>& __z)
-    {
-      const std::complex<_Tp> __t = std::asin(__z);
-      const _Tp __pi_2 = 1.5707963267948966192313216916397514L;
-      return std::complex<_Tp>(__pi_2 - __t.real(), -__t.imag());
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_acos(__complex__ float __z)
-  { return __builtin_cacosf(__z); }
-
-  inline __complex__ double
-  __complex_acos(__complex__ double __z)
-  { return __builtin_cacos(__z); }
-
-  inline __complex__ long double
-  __complex_acos(const __complex__ long double& __z)
-  { return __builtin_cacosl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    acos(const std::complex<_Tp>& __z)
-    { return __complex_acos(__z.__rep()); }
-#else
-  /// acos(__z) [8.1.2].
-  //  Effects:  Behaves the same as C99 function cacos, defined
-  //            in subclause 7.3.5.1.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    acos(const std::complex<_Tp>& __z)
-    { return __complex_acos(__z); }
-#endif
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    __complex_asin(const std::complex<_Tp>& __z)
-    {
-      std::complex<_Tp> __t(-__z.imag(), __z.real());
-      __t = std::asinh(__t);
-      return std::complex<_Tp>(__t.imag(), -__t.real());
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_asin(__complex__ float __z)
-  { return __builtin_casinf(__z); }
-
-  inline __complex__ double
-  __complex_asin(__complex__ double __z)
-  { return __builtin_casin(__z); }
-
-  inline __complex__ long double
-  __complex_asin(const __complex__ long double& __z)
-  { return __builtin_casinl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    asin(const std::complex<_Tp>& __z)
-    { return __complex_asin(__z.__rep()); }
-#else
-  /// asin(__z) [8.1.3].
-  //  Effects:  Behaves the same as C99 function casin, defined
-  //            in subclause 7.3.5.2.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    asin(const std::complex<_Tp>& __z)
-    { return __complex_asin(__z); }
-#endif
-  
-  template<typename _Tp>
-    std::complex<_Tp>
-    __complex_atan(const std::complex<_Tp>& __z)
-    {
-      const _Tp __r2 = __z.real() * __z.real();
-      const _Tp __x = _Tp(1.0) - __r2 - __z.imag() * __z.imag();
-
-      _Tp __num = __z.imag() + _Tp(1.0);
-      _Tp __den = __z.imag() - _Tp(1.0);
-
-      __num = __r2 + __num * __num;
-      __den = __r2 + __den * __den;
-
-      return std::complex<_Tp>(_Tp(0.5) * atan2(_Tp(2.0) * __z.real(), __x),
-			       _Tp(0.25) * log(__num / __den));
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_atan(__complex__ float __z)
-  { return __builtin_catanf(__z); }
-
-  inline __complex__ double
-  __complex_atan(__complex__ double __z)
-  { return __builtin_catan(__z); }
-
-  inline __complex__ long double
-  __complex_atan(const __complex__ long double& __z)
-  { return __builtin_catanl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    atan(const std::complex<_Tp>& __z)
-    { return __complex_atan(__z.__rep()); }
-#else
-  /// atan(__z) [8.1.4].
-  //  Effects:  Behaves the same as C99 function catan, defined
-  //            in subclause 7.3.5.3.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    atan(const std::complex<_Tp>& __z)
-    { return __complex_atan(__z); }
-#endif
-
-  template<typename _Tp>
-    std::complex<_Tp>
-    __complex_acosh(const std::complex<_Tp>& __z)
-    {
-      // Kahan's formula.
-      return _Tp(2.0) * std::log(std::sqrt(_Tp(0.5) * (__z + _Tp(1.0)))
-				 + std::sqrt(_Tp(0.5) * (__z - _Tp(1.0))));
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_acosh(__complex__ float __z)
-  { return __builtin_cacoshf(__z); }
-
-  inline __complex__ double
-  __complex_acosh(__complex__ double __z)
-  { return __builtin_cacosh(__z); }
-
-  inline __complex__ long double
-  __complex_acosh(const __complex__ long double& __z)
-  { return __builtin_cacoshl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    acosh(const std::complex<_Tp>& __z)
-    { return __complex_acosh(__z.__rep()); }
-#else
-  /// acosh(__z) [8.1.5].
-  //  Effects:  Behaves the same as C99 function cacosh, defined
-  //            in subclause 7.3.6.1.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    acosh(const std::complex<_Tp>& __z)
-    { return __complex_acosh(__z); }
-#endif
-
-  template<typename _Tp>
-    std::complex<_Tp>
-    __complex_asinh(const std::complex<_Tp>& __z)
-    {
-      std::complex<_Tp> __t((__z.real() - __z.imag())
-			    * (__z.real() + __z.imag()) + _Tp(1.0),
-			    _Tp(2.0) * __z.real() * __z.imag());
-      __t = std::sqrt(__t);
-
-      return std::log(__t + __z);
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_asinh(__complex__ float __z)
-  { return __builtin_casinhf(__z); }
-
-  inline __complex__ double
-  __complex_asinh(__complex__ double __z)
-  { return __builtin_casinh(__z); }
-
-  inline __complex__ long double
-  __complex_asinh(const __complex__ long double& __z)
-  { return __builtin_casinhl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    asinh(const std::complex<_Tp>& __z)
-    { return __complex_asinh(__z.__rep()); }
-#else
-  /// asinh(__z) [8.1.6].
-  //  Effects:  Behaves the same as C99 function casin, defined
-  //            in subclause 7.3.6.2.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    asinh(const std::complex<_Tp>& __z)
-    { return __complex_asinh(__z); }
-#endif
-
-  template<typename _Tp>
-    std::complex<_Tp>
-    __complex_atanh(const std::complex<_Tp>& __z)
-    {
-      const _Tp __i2 = __z.imag() * __z.imag();
-      const _Tp __x = _Tp(1.0) - __i2 - __z.real() * __z.real();
-
-      _Tp __num = _Tp(1.0) + __z.real();
-      _Tp __den = _Tp(1.0) - __z.real();
-
-      __num = __i2 + __num * __num;
-      __den = __i2 + __den * __den;
-
-      return std::complex<_Tp>(_Tp(0.25) * (log(__num) - log(__den)),
-			       _Tp(0.5) * atan2(_Tp(2.0) * __z.imag(), __x));
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_atanh(__complex__ float __z)
-  { return __builtin_catanhf(__z); }
-
-  inline __complex__ double
-  __complex_atanh(__complex__ double __z)
-  { return __builtin_catanh(__z); }
-
-  inline __complex__ long double
-  __complex_atanh(const __complex__ long double& __z)
-  { return __builtin_catanhl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    atanh(const std::complex<_Tp>& __z)
-    { return __complex_atanh(__z.__rep()); }
-#else
-  /// atanh(__z) [8.1.7].
-  //  Effects:  Behaves the same as C99 function catanh, defined
-  //            in subclause 7.3.6.3.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    atanh(const std::complex<_Tp>& __z)
-    { return __complex_atanh(__z); }
-#endif
-
-  template<typename _Tp>
-    inline _Tp
-    /// fabs(__z) [8.1.8].
-    //  Effects:  Behaves the same as C99 function cabs, defined
-    //            in subclause 7.3.8.1.
-    fabs(const std::complex<_Tp>& __z)
-    { return std::abs(__z); }
-
-  /// Additional overloads [8.1.9].
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    arg(_Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-#if (_GLIBCXX_USE_C99_MATH && !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC)
-      return std::signbit(__x) ? __type(3.1415926535897932384626433832795029L)
-	                       : __type();
-#else
-      return std::arg(std::complex<__type>(__x));
-#endif
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    imag(_Tp)
-    { return _Tp(); }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    norm(_Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __type(__x) * __type(__x);
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    real(_Tp __x)
-    { return __x; }
-
-  template<typename _Tp, typename _Up>
-    inline std::complex<typename __gnu_cxx::__promote_2<_Tp, _Up>::__type>
-    pow(const std::complex<_Tp>& __x, const _Up& __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return std::pow(std::complex<__type>(__x), __type(__y));
-    }
-
-  template<typename _Tp, typename _Up>
-    inline std::complex<typename __gnu_cxx::__promote_2<_Tp, _Up>::__type>
-    pow(const _Tp& __x, const std::complex<_Up>& __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return std::pow(__type(__x), std::complex<__type>(__y));
-    }
-
-  template<typename _Tp, typename _Up>
-    inline std::complex<typename __gnu_cxx::__promote_2<_Tp, _Up>::__type>
-    pow(const std::complex<_Tp>& __x, const std::complex<_Up>& __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return std::pow(std::complex<__type>(__x),
-		      std::complex<__type>(__y));
-    }
-
-  // Forward declarations.
-  // DR 781.
-  template<typename _Tp> std::complex<_Tp> proj(const std::complex<_Tp>&);
-
-  template<typename _Tp>
-    std::complex<_Tp>
-    __complex_proj(const std::complex<_Tp>& __z)
-    {
-      const _Tp __den = (__z.real() * __z.real()
-			 + __z.imag() * __z.imag() + _Tp(1.0));
-
-      return std::complex<_Tp>((_Tp(2.0) * __z.real()) / __den,
-			       (_Tp(2.0) * __z.imag()) / __den);
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX
-  inline __complex__ float
-  __complex_proj(__complex__ float __z)
-  { return __builtin_cprojf(__z); }
-
-  inline __complex__ double
-  __complex_proj(__complex__ double __z)
-  { return __builtin_cproj(__z); }
-
-  inline __complex__ long double
-  __complex_proj(const __complex__ long double& __z)
-  { return __builtin_cprojl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    proj(const std::complex<_Tp>& __z)
-    { return __complex_proj(__z.__rep()); }
-#else
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    proj(const std::complex<_Tp>& __z)
-    { return __complex_proj(__z); }
-#endif
-
-  // DR 1137.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    proj(_Tp __x)
-    { return __x; }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    conj(_Tp __x)
-    { return __x; }
-
-#if __cplusplus > 201103L
-
-inline namespace literals {
-inline namespace complex_literals {
-
-#define __cpp_lib_complex_udls 201309
-
-  constexpr std::complex<float>
-  operator""if(long double __num)
-  { return std::complex<float>{0.0F, static_cast<float>(__num)}; }
-
-  constexpr std::complex<float>
-  operator""if(unsigned long long __num)
-  { return std::complex<float>{0.0F, static_cast<float>(__num)}; }
-
-  constexpr std::complex<double>
-  operator""i(long double __num)
-  { return std::complex<double>{0.0, static_cast<double>(__num)}; }
-
-  constexpr std::complex<double>
-  operator""i(unsigned long long __num)
-  { return std::complex<double>{0.0, static_cast<double>(__num)}; }
-
-  constexpr std::complex<long double>
-  operator""il(long double __num)
-  { return std::complex<long double>{0.0L, __num}; }
-
-  constexpr std::complex<long double>
-  operator""il(unsigned long long __num)
-  { return std::complex<long double>{0.0L, static_cast<long double>(__num)}; }
-
-} // inline namespace complex_literals
-} // inline namespace literals
-
-#endif // C++14
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif  // C++11
-
-#endif  /* _GLIBCXX_COMPLEX */
diff --git a/openflow/usr/include/c++/5/complex.h b/openflow/usr/include/c++/5/complex.h
deleted file mode 100644
index b383075..0000000
--- a/openflow/usr/include/c++/5/complex.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*- compatibility header.
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file complex.h
- *  This is a Standard C++ Library header.
- */
-
-#include <bits/c++config.h>
-
-#if __cplusplus >= 201103L
-# include <ccomplex>
-#endif
-
-#if _GLIBCXX_HAVE_COMPLEX_H
-# include_next <complex.h>
-# ifdef _GLIBCXX_COMPLEX
-// See PR56111, keep the macro in C++03 if possible.
-#  undef complex
-# endif
-#endif
-
-#ifndef _GLIBCXX_COMPLEX_H
-#define _GLIBCXX_COMPLEX_H 1
-
-#endif
diff --git a/openflow/usr/include/c++/5/condition_variable b/openflow/usr/include/c++/5/condition_variable
deleted file mode 100644
index f7da017..0000000
--- a/openflow/usr/include/c++/5/condition_variable
+++ /dev/null
@@ -1,312 +0,0 @@
-// <condition_variable> -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/condition_variable
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_CONDITION_VARIABLE
-#define _GLIBCXX_CONDITION_VARIABLE 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <chrono>
-#include <mutex>
-#include <ext/concurrence.h>
-#include <bits/alloc_traits.h>
-#include <bits/allocator.h>
-#include <bits/unique_ptr.h>
-#include <bits/shared_ptr.h>
-
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup condition_variables Condition Variables
-   * @ingroup concurrency
-   *
-   * Classes for condition_variable support.
-   * @{
-   */
-
-  /// cv_status
-  enum class cv_status { no_timeout, timeout };
-  
-  /// condition_variable
-  class condition_variable
-  {
-    typedef chrono::system_clock	__clock_t;
-    typedef __gthread_cond_t		__native_type;
-
-#ifdef __GTHREAD_COND_INIT
-    __native_type			_M_cond = __GTHREAD_COND_INIT;
-#else
-    __native_type			_M_cond;
-#endif
-
-  public:
-    typedef __native_type* 		native_handle_type;
-
-    condition_variable() noexcept;
-    ~condition_variable() noexcept;
-
-    condition_variable(const condition_variable&) = delete;
-    condition_variable& operator=(const condition_variable&) = delete;
-
-    void
-    notify_one() noexcept;
-
-    void
-    notify_all() noexcept;
-
-    void
-    wait(unique_lock<mutex>& __lock);
-
-    template<typename _Predicate>
-      void
-      wait(unique_lock<mutex>& __lock, _Predicate __p)
-      {
-	while (!__p())
-	  wait(__lock);
-      }
-
-    template<typename _Duration>
-      cv_status
-      wait_until(unique_lock<mutex>& __lock,
-		 const chrono::time_point<__clock_t, _Duration>& __atime)
-      { return __wait_until_impl(__lock, __atime); }
-
-    template<typename _Clock, typename _Duration>
-      cv_status
-      wait_until(unique_lock<mutex>& __lock,
-		 const chrono::time_point<_Clock, _Duration>& __atime)
-      {
-	// DR 887 - Sync unknown clock to known clock.
-	const typename _Clock::time_point __c_entry = _Clock::now();
-	const __clock_t::time_point __s_entry = __clock_t::now();
-	const auto __delta = __atime - __c_entry;
-	const auto __s_atime = __s_entry + __delta;
-
-	return __wait_until_impl(__lock, __s_atime);
-      }
-
-    template<typename _Clock, typename _Duration, typename _Predicate>
-      bool
-      wait_until(unique_lock<mutex>& __lock,
-		 const chrono::time_point<_Clock, _Duration>& __atime,
-		 _Predicate __p)
-      {
-	while (!__p())
-	  if (wait_until(__lock, __atime) == cv_status::timeout)
-	    return __p();
-	return true;
-      }
-
-    template<typename _Rep, typename _Period>
-      cv_status
-      wait_for(unique_lock<mutex>& __lock,
-	       const chrono::duration<_Rep, _Period>& __rtime)
-      { return wait_until(__lock, __clock_t::now() + __rtime); }
-
-    template<typename _Rep, typename _Period, typename _Predicate>
-      bool
-      wait_for(unique_lock<mutex>& __lock,
-	       const chrono::duration<_Rep, _Period>& __rtime,
-	       _Predicate __p)
-      { return wait_until(__lock, __clock_t::now() + __rtime, std::move(__p)); }
-
-    native_handle_type
-    native_handle()
-    { return &_M_cond; }
-
-  private:
-    template<typename _Dur>
-      cv_status
-      __wait_until_impl(unique_lock<mutex>& __lock,
-			const chrono::time_point<__clock_t, _Dur>& __atime)
-      {
-	auto __s = chrono::time_point_cast<chrono::seconds>(__atime);
-	auto __ns = chrono::duration_cast<chrono::nanoseconds>(__atime - __s);
-
-	__gthread_time_t __ts =
-	  {
-	    static_cast<std::time_t>(__s.time_since_epoch().count()),
-	    static_cast<long>(__ns.count())
-	  };
-
-	__gthread_cond_timedwait(&_M_cond, __lock.mutex()->native_handle(),
-				 &__ts);
-
-	return (__clock_t::now() < __atime
-		? cv_status::no_timeout : cv_status::timeout);
-      }
-  };
-
-  void
-  notify_all_at_thread_exit(condition_variable&, unique_lock<mutex>);
-
-  struct __at_thread_exit_elt
-  {
-    __at_thread_exit_elt* _M_next;
-    void (*_M_cb)(void*);
-  };
-
-  inline namespace _V2 {
-
-  /// condition_variable_any
-  // Like above, but mutex is not required to have try_lock.
-  class condition_variable_any
-  {
-    typedef chrono::system_clock	__clock_t;
-    condition_variable			_M_cond;
-    shared_ptr<mutex>			_M_mutex;
-
-    // scoped unlock - unlocks in ctor, re-locks in dtor
-    template<typename _Lock>
-      struct _Unlock
-      {
-	explicit _Unlock(_Lock& __lk) : _M_lock(__lk) { __lk.unlock(); }
-
-	~_Unlock() noexcept(false)
-	{
-	  if (uncaught_exception())
-	    {
-	      __try
-	      { _M_lock.lock(); }
-	      __catch(const __cxxabiv1::__forced_unwind&)
-	      { __throw_exception_again; }
-	      __catch(...)
-	      { }
-	    }
-	  else
-	    _M_lock.lock();
-	}
-
-	_Unlock(const _Unlock&) = delete;
-	_Unlock& operator=(const _Unlock&) = delete;
-
-	_Lock& _M_lock;
-      };
-
-  public:
-    condition_variable_any() : _M_mutex(std::make_shared<mutex>()) { }
-    ~condition_variable_any() = default;
-
-    condition_variable_any(const condition_variable_any&) = delete;
-    condition_variable_any& operator=(const condition_variable_any&) = delete;
-
-    void
-    notify_one() noexcept
-    {
-      lock_guard<mutex> __lock(*_M_mutex);
-      _M_cond.notify_one();
-    }
-
-    void
-    notify_all() noexcept
-    {
-      lock_guard<mutex> __lock(*_M_mutex);
-      _M_cond.notify_all();
-    }
-
-    template<typename _Lock>
-      void
-      wait(_Lock& __lock)
-      {
-	shared_ptr<mutex> __mutex = _M_mutex;
-	unique_lock<mutex> __my_lock(*__mutex);
-	_Unlock<_Lock> __unlock(__lock);
-	// *__mutex must be unlocked before re-locking __lock so move
-	// ownership of *__mutex lock to an object with shorter lifetime.
-	unique_lock<mutex> __my_lock2(std::move(__my_lock));
-	_M_cond.wait(__my_lock2);
-      }
-      
-
-    template<typename _Lock, typename _Predicate>
-      void
-      wait(_Lock& __lock, _Predicate __p)
-      {
-	while (!__p())
-	  wait(__lock);
-      }
-
-    template<typename _Lock, typename _Clock, typename _Duration>
-      cv_status
-      wait_until(_Lock& __lock,
-		 const chrono::time_point<_Clock, _Duration>& __atime)
-      {
-	shared_ptr<mutex> __mutex = _M_mutex;
-	unique_lock<mutex> __my_lock(*__mutex);
-	_Unlock<_Lock> __unlock(__lock);
-	// *__mutex must be unlocked before re-locking __lock so move
-	// ownership of *__mutex lock to an object with shorter lifetime.
-	unique_lock<mutex> __my_lock2(std::move(__my_lock));
-	return _M_cond.wait_until(__my_lock2, __atime);
-      }
-
-    template<typename _Lock, typename _Clock,
-	     typename _Duration, typename _Predicate>
-      bool
-      wait_until(_Lock& __lock,
-		 const chrono::time_point<_Clock, _Duration>& __atime,
-		 _Predicate __p)
-      {
-	while (!__p())
-	  if (wait_until(__lock, __atime) == cv_status::timeout)
-	    return __p();
-	return true;
-      }
-
-    template<typename _Lock, typename _Rep, typename _Period>
-      cv_status
-      wait_for(_Lock& __lock, const chrono::duration<_Rep, _Period>& __rtime)
-      { return wait_until(__lock, __clock_t::now() + __rtime); }
-
-    template<typename _Lock, typename _Rep,
-	     typename _Period, typename _Predicate>
-      bool
-      wait_for(_Lock& __lock,
-	       const chrono::duration<_Rep, _Period>& __rtime, _Predicate __p)
-      { return wait_until(__lock, __clock_t::now() + __rtime, std::move(__p)); }
-  };
-
-  } // end inline namespace
-
-  // @} group condition_variables
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
-
-#endif // C++11
-
-#endif // _GLIBCXX_CONDITION_VARIABLE
diff --git a/openflow/usr/include/c++/5/csetjmp b/openflow/usr/include/c++/5/csetjmp
deleted file mode 100644
index baadeee..0000000
--- a/openflow/usr/include/c++/5/csetjmp
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file csetjmp
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c setjmp.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 20.4.6  C library
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <setjmp.h>
-
-#ifndef _GLIBCXX_CSETJMP
-#define _GLIBCXX_CSETJMP 1
-
-// Get rid of those macros defined in <setjmp.h> in lieu of real functions.
-#undef longjmp
-
-// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998
-#ifndef setjmp
-#define setjmp(env) setjmp (env)
-#endif
-
-namespace std
-{
-  using ::jmp_buf;
-  using ::longjmp;
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/csignal b/openflow/usr/include/c++/5/csignal
deleted file mode 100644
index 95d5dfe..0000000
--- a/openflow/usr/include/c++/5/csignal
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file csignal
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c signal.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 20.4.6  C library
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <signal.h>
-
-#ifndef _GLIBCXX_CSIGNAL
-#define _GLIBCXX_CSIGNAL 1
-
-// Get rid of those macros defined in <signal.h> in lieu of real functions.
-#undef raise
-
-namespace std
-{
-  using ::sig_atomic_t;
-  using ::signal;
-  using ::raise;
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/cstdalign b/openflow/usr/include/c++/5/cstdalign
deleted file mode 100644
index 27dff9b..0000000
--- a/openflow/usr/include/c++/5/cstdalign
+++ /dev/null
@@ -1,44 +0,0 @@
-// <cstdalign> -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cstdalign
- *  This is a Standard C++ Library header.
- */
-
-#pragma GCC system_header
-
-#ifndef _GLIBCXX_CSTDALIGN
-#define _GLIBCXX_CSTDALIGN 1
-
-#if __cplusplus < 201103L
-#  include <bits/c++0x_warning.h>
-#else
-#  include <bits/c++config.h>
-#  if _GLIBCXX_HAVE_STDALIGN_H
-#    include <stdalign.h>
-#  endif
-#endif
-
-#endif 
-
diff --git a/openflow/usr/include/c++/5/cstdarg b/openflow/usr/include/c++/5/cstdarg
deleted file mode 100644
index 6dde251..0000000
--- a/openflow/usr/include/c++/5/cstdarg
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cstdarg
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c stdarg.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 20.4.6  C library
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <stdarg.h>
-
-#ifndef _GLIBCXX_CSTDARG
-#define _GLIBCXX_CSTDARG 1
-
-// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998
-#ifndef va_end
-#define va_end(ap) va_end (ap)
-#endif
-
-namespace std
-{
-  using ::va_list;
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/cstdbool b/openflow/usr/include/c++/5/cstdbool
deleted file mode 100644
index 3d0df32..0000000
--- a/openflow/usr/include/c++/5/cstdbool
+++ /dev/null
@@ -1,44 +0,0 @@
-// <cstdbool> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cstdbool
- *  This is a Standard C++ Library header.
- */
-
-#pragma GCC system_header
-
-#ifndef _GLIBCXX_CSTDBOOL
-#define _GLIBCXX_CSTDBOOL 1
-
-#if __cplusplus < 201103L
-#  include <bits/c++0x_warning.h>
-#else
-#  include <bits/c++config.h>
-#  if _GLIBCXX_HAVE_STDBOOL_H
-#    include <stdbool.h>
-#  endif
-#endif
-
-#endif 
-
diff --git a/openflow/usr/include/c++/5/cstddef b/openflow/usr/include/c++/5/cstddef
deleted file mode 100644
index 33f4f8f..0000000
--- a/openflow/usr/include/c++/5/cstddef
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file cstddef
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c stddef.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 18.1  Types
-//
-
-#ifndef _GLIBCXX_CSTDDEF
-#define _GLIBCXX_CSTDDEF 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <stddef.h>
-
-#if __cplusplus >= 201103L
-namespace std
-{
-  // We handle size_t, ptrdiff_t, and nullptr_t in c++config.h.
-  using ::max_align_t;
-}
-#endif
-
-#endif // _GLIBCXX_CSTDDEF
diff --git a/openflow/usr/include/c++/5/cstdint b/openflow/usr/include/c++/5/cstdint
deleted file mode 100644
index 4e226a1..0000000
--- a/openflow/usr/include/c++/5/cstdint
+++ /dev/null
@@ -1,89 +0,0 @@
-// <cstdint> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cstdint
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_CSTDINT
-#define _GLIBCXX_CSTDINT 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <bits/c++config.h>
-
-#if _GLIBCXX_HAVE_STDINT_H
-# include <stdint.h>
-#endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
-namespace std
-{
-  using ::int8_t;
-  using ::int16_t;
-  using ::int32_t;
-  using ::int64_t;
-
-  using ::int_fast8_t;
-  using ::int_fast16_t;
-  using ::int_fast32_t;
-  using ::int_fast64_t;
-
-  using ::int_least8_t;
-  using ::int_least16_t;
-  using ::int_least32_t;
-  using ::int_least64_t;
-
-  using ::intmax_t;
-  using ::intptr_t;
-  
-  using ::uint8_t;
-  using ::uint16_t;
-  using ::uint32_t;
-  using ::uint64_t;
-
-  using ::uint_fast8_t;
-  using ::uint_fast16_t;
-  using ::uint_fast32_t;
-  using ::uint_fast64_t;
-
-  using ::uint_least8_t;
-  using ::uint_least16_t;
-  using ::uint_least32_t;
-  using ::uint_least64_t;
-
-  using ::uintmax_t;
-  using ::uintptr_t;
-} // namespace std
-
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
-
-#endif // C++11
-
-#endif // _GLIBCXX_CSTDINT
diff --git a/openflow/usr/include/c++/5/cstdio b/openflow/usr/include/c++/5/cstdio
deleted file mode 100644
index d1c958b..0000000
--- a/openflow/usr/include/c++/5/cstdio
+++ /dev/null
@@ -1,194 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cstdio
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c stdio.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 27.8.2  C Library files
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <stdio.h>
-
-#ifndef _GLIBCXX_CSTDIO
-#define _GLIBCXX_CSTDIO 1
-
-#ifndef _GLIBCXX_HAVE_GETS
-extern "C" char* gets (char* __s) __attribute__((__deprecated__));
-#endif
-
-// Get rid of those macros defined in <stdio.h> in lieu of real functions.
-#undef clearerr
-#undef fclose
-#undef feof
-#undef ferror
-#undef fflush
-#undef fgetc
-#undef fgetpos
-#undef fgets
-#undef fopen
-#undef fprintf
-#undef fputc
-#undef fputs
-#undef fread
-#undef freopen
-#undef fscanf
-#undef fseek
-#undef fsetpos
-#undef ftell
-#undef fwrite
-#undef getc
-#undef getchar
-#if __cplusplus <= 201103L
-# undef gets
-#endif
-#undef perror
-#undef printf
-#undef putc
-#undef putchar
-#undef puts
-#undef remove
-#undef rename
-#undef rewind
-#undef scanf
-#undef setbuf
-#undef setvbuf
-#undef sprintf
-#undef sscanf
-#undef tmpfile
-#undef tmpnam
-#undef ungetc
-#undef vfprintf
-#undef vprintf
-#undef vsprintf
-
-namespace std
-{
-  using ::FILE;
-  using ::fpos_t;
-
-  using ::clearerr;
-  using ::fclose;
-  using ::feof;
-  using ::ferror;
-  using ::fflush;
-  using ::fgetc;
-  using ::fgetpos;
-  using ::fgets;
-  using ::fopen;
-  using ::fprintf;
-  using ::fputc;
-  using ::fputs;
-  using ::fread;
-  using ::freopen;
-  using ::fscanf;
-  using ::fseek;
-  using ::fsetpos;
-  using ::ftell;
-  using ::fwrite;
-  using ::getc;
-  using ::getchar;
-#if __cplusplus <= 201103L
-  // LWG 2249
-  using ::gets;
-#endif
-  using ::perror;
-  using ::printf;
-  using ::putc;
-  using ::putchar;
-  using ::puts;
-  using ::remove;
-  using ::rename;
-  using ::rewind;
-  using ::scanf;
-  using ::setbuf;
-  using ::setvbuf;
-  using ::sprintf;
-  using ::sscanf;
-  using ::tmpfile;
-#if _GLIBCXX_USE_TMPNAM
-  using ::tmpnam;
-#endif
-  using ::ungetc;
-  using ::vfprintf;
-  using ::vprintf;
-  using ::vsprintf;
-} // namespace
-
-#if _GLIBCXX_USE_C99
-
-#undef snprintf
-#undef vfscanf
-#undef vscanf
-#undef vsnprintf
-#undef vsscanf
-
-namespace __gnu_cxx
-{
-#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
-  extern "C" int
-  (snprintf)(char * __restrict, std::size_t, const char * __restrict, ...)
-  throw ();
-  extern "C" int
-  (vfscanf)(FILE * __restrict, const char * __restrict, __gnuc_va_list);
-  extern "C" int (vscanf)(const char * __restrict, __gnuc_va_list);
-  extern "C" int
-  (vsnprintf)(char * __restrict, std::size_t, const char * __restrict,
-	      __gnuc_va_list) throw ();
-  extern "C" int
-  (vsscanf)(const char * __restrict, const char * __restrict, __gnuc_va_list)
-  throw ();
-#endif
-
-#if !_GLIBCXX_USE_C99_DYNAMIC
-  using ::snprintf;
-  using ::vfscanf;
-  using ::vscanf;
-  using ::vsnprintf;
-  using ::vsscanf;
-#endif
-} // namespace __gnu_cxx
-
-namespace std
-{
-  using ::__gnu_cxx::snprintf;
-  using ::__gnu_cxx::vfscanf;
-  using ::__gnu_cxx::vscanf;
-  using ::__gnu_cxx::vsnprintf;
-  using ::__gnu_cxx::vsscanf;
-} // namespace std
-
-#endif // _GLIBCXX_USE_C99
-
-#endif
diff --git a/openflow/usr/include/c++/5/cstdlib b/openflow/usr/include/c++/5/cstdlib
deleted file mode 100644
index 7e9bb30..0000000
--- a/openflow/usr/include/c++/5/cstdlib
+++ /dev/null
@@ -1,273 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cstdlib
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c stdlib.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 20.4.6  C library
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-#ifndef _GLIBCXX_CSTDLIB
-#define _GLIBCXX_CSTDLIB 1
-
-#if !_GLIBCXX_HOSTED
-// The C standard does not require a freestanding implementation to
-// provide <stdlib.h>.  However, the C++ standard does still require
-// <cstdlib> -- but only the functionality mentioned in
-// [lib.support.start.term].
-
-#define EXIT_SUCCESS 0
-#define EXIT_FAILURE 1
-
-namespace std
-{
-  extern "C" void abort(void) throw () _GLIBCXX_NORETURN;
-  extern "C" int atexit(void (*)(void)) throw ();
-  extern "C" void exit(int) throw () _GLIBCXX_NORETURN;
-#if __cplusplus >= 201103L
-# ifdef _GLIBCXX_HAVE_AT_QUICK_EXIT
-  extern "C" int at_quick_exit(void (*)(void)) throw ();
-# endif
-# ifdef _GLIBCXX_HAVE_QUICK_EXIT
-  extern "C" void quick_exit(int) throw() _GLIBCXX_NORETURN;
-# endif
-#endif
-} // namespace std
-
-#else
-
-#include <stdlib.h>
-
-// Get rid of those macros defined in <stdlib.h> in lieu of real functions.
-#undef abort
-#undef abs
-#undef atexit
-#if __cplusplus >= 201103L
-# ifdef _GLIBCXX_HAVE_AT_QUICK_EXIT
-#  undef at_quick_exit
-# endif
-#endif
-#undef atof
-#undef atoi
-#undef atol
-#undef bsearch
-#undef calloc
-#undef div
-#undef exit
-#undef free
-#undef getenv
-#undef labs
-#undef ldiv
-#undef malloc
-#undef mblen
-#undef mbstowcs
-#undef mbtowc
-#undef qsort
-#if __cplusplus >= 201103L
-# ifdef _GLIBCXX_HAVE_QUICK_EXIT
-#  undef quick_exit
-# endif
-#endif
-#undef rand
-#undef realloc
-#undef srand
-#undef strtod
-#undef strtol
-#undef strtoul
-#undef system
-#undef wcstombs
-#undef wctomb
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using ::div_t;
-  using ::ldiv_t;
-
-  using ::abort;
-  using ::abs;
-  using ::atexit;
-#if __cplusplus >= 201103L
-# ifdef _GLIBCXX_HAVE_AT_QUICK_EXIT
-  using ::at_quick_exit;
-# endif
-#endif
-  using ::atof;
-  using ::atoi;
-  using ::atol;
-  using ::bsearch;
-  using ::calloc;
-  using ::div;
-  using ::exit;
-  using ::free;
-  using ::getenv;
-  using ::labs;
-  using ::ldiv;
-  using ::malloc;
-#ifdef _GLIBCXX_HAVE_MBSTATE_T
-  using ::mblen;
-  using ::mbstowcs;
-  using ::mbtowc;
-#endif // _GLIBCXX_HAVE_MBSTATE_T
-  using ::qsort;
-#if __cplusplus >= 201103L
-# ifdef _GLIBCXX_HAVE_QUICK_EXIT
-  using ::quick_exit;
-# endif
-#endif
-  using ::rand;
-  using ::realloc;
-  using ::srand;
-  using ::strtod;
-  using ::strtol;
-  using ::strtoul;
-  using ::system;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  using ::wcstombs;
-  using ::wctomb;
-#endif // _GLIBCXX_USE_WCHAR_T
-
-#ifndef __CORRECT_ISO_CPP_STDLIB_H_PROTO
-  inline long
-  abs(long __i) { return __builtin_labs(__i); }
-
-  inline ldiv_t
-  div(long __i, long __j) { return ldiv(__i, __j); }
-#endif
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-  inline long long
-  abs(long long __x) { return __builtin_llabs (__x); }
-#endif
-
-#if defined(__GLIBCXX_TYPE_INT_N_0)
-  inline __GLIBCXX_TYPE_INT_N_0
-  abs(__GLIBCXX_TYPE_INT_N_0 __x) { return __x >= 0 ? __x : -__x; }
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_1)
-  inline __GLIBCXX_TYPE_INT_N_1
-  abs(__GLIBCXX_TYPE_INT_N_1 __x) { return __x >= 0 ? __x : -__x; }
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_2)
-  inline __GLIBCXX_TYPE_INT_N_2
-  abs(__GLIBCXX_TYPE_INT_N_2 __x) { return __x >= 0 ? __x : -__x; }
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_3)
-  inline __GLIBCXX_TYPE_INT_N_3
-  abs(__GLIBCXX_TYPE_INT_N_3 __x) { return __x >= 0 ? __x : -__x; }
-#endif
-
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if _GLIBCXX_USE_C99
-
-#undef _Exit
-#undef llabs
-#undef lldiv
-#undef atoll
-#undef strtoll
-#undef strtoull
-#undef strtof
-#undef strtold
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::lldiv_t;
-#endif
-#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
-  extern "C" void (_Exit)(int) throw () _GLIBCXX_NORETURN;
-#endif
-#if !_GLIBCXX_USE_C99_DYNAMIC
-  using ::_Exit;
-#endif
-
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::llabs;
-
-  inline lldiv_t
-  div(long long __n, long long __d)
-  { lldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
-
-  using ::lldiv;
-#endif
-
-#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  extern "C" long long int (atoll)(const char *) throw ();
-  extern "C" long long int
-    (strtoll)(const char * __restrict, char ** __restrict, int) throw ();
-  extern "C" unsigned long long int
-    (strtoull)(const char * __restrict, char ** __restrict, int) throw ();
-#endif
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::atoll;
-  using ::strtoll;
-  using ::strtoull;
-#endif
-  using ::strtof;
-  using ::strtold;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __gnu_cxx
-
-namespace std
-{
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::__gnu_cxx::lldiv_t;
-#endif
-  using ::__gnu_cxx::_Exit;
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::__gnu_cxx::llabs;
-  using ::__gnu_cxx::div;
-  using ::__gnu_cxx::lldiv;
-#endif
-  using ::__gnu_cxx::atoll;
-  using ::__gnu_cxx::strtof;
-  using ::__gnu_cxx::strtoll;
-  using ::__gnu_cxx::strtoull;
-  using ::__gnu_cxx::strtold;
-} // namespace std
-
-#endif // _GLIBCXX_USE_C99
-
-#endif // !_GLIBCXX_HOSTED
-
-#endif
diff --git a/openflow/usr/include/c++/5/cstring b/openflow/usr/include/c++/5/cstring
deleted file mode 100644
index cd6fe5a..0000000
--- a/openflow/usr/include/c++/5/cstring
+++ /dev/null
@@ -1,123 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file cstring
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c string.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 20.4.6  C library
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <string.h>
-
-#ifndef _GLIBCXX_CSTRING
-#define _GLIBCXX_CSTRING 1
-
-// Get rid of those macros defined in <string.h> in lieu of real functions.
-#undef memchr
-#undef memcmp
-#undef memcpy
-#undef memmove
-#undef memset
-#undef strcat
-#undef strchr
-#undef strcmp
-#undef strcoll
-#undef strcpy
-#undef strcspn
-#undef strerror
-#undef strlen
-#undef strncat
-#undef strncmp
-#undef strncpy
-#undef strpbrk
-#undef strrchr
-#undef strspn
-#undef strstr
-#undef strtok
-#undef strxfrm
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using ::memchr;
-  using ::memcmp;
-  using ::memcpy;
-  using ::memmove;
-  using ::memset;
-  using ::strcat;
-  using ::strcmp;
-  using ::strcoll;
-  using ::strcpy;
-  using ::strcspn;
-  using ::strerror;
-  using ::strlen;
-  using ::strncat;
-  using ::strncmp;
-  using ::strncpy;
-  using ::strspn;
-  using ::strtok;
-  using ::strxfrm;
-  using ::strchr;
-  using ::strpbrk;
-  using ::strrchr;
-  using ::strstr;
-
-#ifndef __CORRECT_ISO_CPP_STRING_H_PROTO
-  inline void*
-  memchr(void* __s, int __c, size_t __n)
-  { return __builtin_memchr(__s, __c, __n); }
-
-  inline char*
-  strchr(char* __s, int __n)
-  { return __builtin_strchr(__s, __n); }
-
-  inline char*
-  strpbrk(char* __s1, const char* __s2)
-  { return __builtin_strpbrk(__s1, __s2); }
-
-  inline char*
-  strrchr(char* __s, int __n)
-  { return __builtin_strrchr(__s, __n); }
-
-  inline char*
-  strstr(char* __s1, const char* __s2)
-  { return __builtin_strstr(__s1, __s2); }
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ctgmath b/openflow/usr/include/c++/5/ctgmath
deleted file mode 100644
index e89d1fc..0000000
--- a/openflow/usr/include/c++/5/ctgmath
+++ /dev/null
@@ -1,42 +0,0 @@
-// <ctgmath> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/ctgmath
- *  This is a Standard C++ Library header.
- */
-
-#pragma GCC system_header
-
-#ifndef _GLIBCXX_CTGMATH
-#define _GLIBCXX_CTGMATH 1
-
-#if __cplusplus < 201103L
-#  include <bits/c++0x_warning.h>
-#else
-#  include <cmath>
-#  include <complex>
-#endif
-
-#endif 
-
diff --git a/openflow/usr/include/c++/5/ctime b/openflow/usr/include/c++/5/ctime
deleted file mode 100644
index bc5b0db..0000000
--- a/openflow/usr/include/c++/5/ctime
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/ctime
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c time.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 20.5  Date and time
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <time.h>
-
-#ifndef _GLIBCXX_CTIME
-#define _GLIBCXX_CTIME 1
-
-// Get rid of those macros defined in <time.h> in lieu of real functions.
-#undef clock
-#undef difftime
-#undef mktime
-#undef time
-#undef asctime
-#undef ctime
-#undef gmtime
-#undef localtime
-#undef strftime
-
-namespace std
-{
-  using ::clock_t;
-  using ::time_t;
-  using ::tm;
-
-  using ::clock;
-  using ::difftime;
-  using ::mktime;
-  using ::time;
-  using ::asctime;
-  using ::ctime;
-  using ::gmtime;
-  using ::localtime;
-  using ::strftime;
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/cwchar b/openflow/usr/include/c++/5/cwchar
deleted file mode 100644
index dddb409..0000000
--- a/openflow/usr/include/c++/5/cwchar
+++ /dev/null
@@ -1,303 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cwchar
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c wchar.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: 21.4
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-#if _GLIBCXX_HAVE_WCHAR_H
-#include <wchar.h>
-#endif
-
-#ifndef _GLIBCXX_CWCHAR
-#define _GLIBCXX_CWCHAR 1
-
-// Need to do a bit of trickery here with mbstate_t as char_traits
-// assumes it is in wchar.h, regardless of wchar_t specializations.
-#ifndef _GLIBCXX_HAVE_MBSTATE_T
-extern "C"
-{
-  typedef struct
-  {
-    int __fill[6];
-  } mbstate_t;
-}
-#endif
-
-namespace std
-{
-  using ::mbstate_t;
-} // namespace std
-
-// Get rid of those macros defined in <wchar.h> in lieu of real functions.
-#undef btowc
-#undef fgetwc
-#undef fgetws
-#undef fputwc
-#undef fputws
-#undef fwide
-#undef fwprintf
-#undef fwscanf
-#undef getwc
-#undef getwchar
-#undef mbrlen
-#undef mbrtowc
-#undef mbsinit
-#undef mbsrtowcs
-#undef putwc
-#undef putwchar
-#undef swprintf
-#undef swscanf
-#undef ungetwc
-#undef vfwprintf
-#if _GLIBCXX_HAVE_VFWSCANF
-# undef vfwscanf
-#endif
-#undef vswprintf
-#if _GLIBCXX_HAVE_VSWSCANF
-# undef vswscanf
-#endif
-#undef vwprintf
-#if _GLIBCXX_HAVE_VWSCANF
-# undef vwscanf
-#endif
-#undef wcrtomb
-#undef wcscat
-#undef wcschr
-#undef wcscmp
-#undef wcscoll
-#undef wcscpy
-#undef wcscspn
-#undef wcsftime
-#undef wcslen
-#undef wcsncat
-#undef wcsncmp
-#undef wcsncpy
-#undef wcspbrk
-#undef wcsrchr
-#undef wcsrtombs
-#undef wcsspn
-#undef wcsstr
-#undef wcstod
-#if _GLIBCXX_HAVE_WCSTOF
-# undef wcstof
-#endif
-#undef wcstok
-#undef wcstol
-#undef wcstoul
-#undef wcsxfrm
-#undef wctob
-#undef wmemchr
-#undef wmemcmp
-#undef wmemcpy
-#undef wmemmove
-#undef wmemset
-#undef wprintf
-#undef wscanf
-
-#if _GLIBCXX_USE_WCHAR_T
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using ::wint_t;
-
-  using ::btowc;
-  using ::fgetwc;
-  using ::fgetws;
-  using ::fputwc;
-  using ::fputws;
-  using ::fwide;
-  using ::fwprintf;
-  using ::fwscanf;
-  using ::getwc;
-  using ::getwchar;
-  using ::mbrlen;
-  using ::mbrtowc;
-  using ::mbsinit;
-  using ::mbsrtowcs;
-  using ::putwc;
-  using ::putwchar;
-#ifndef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
-  using ::swprintf;
-#endif
-  using ::swscanf;
-  using ::ungetwc;
-  using ::vfwprintf;
-#if _GLIBCXX_HAVE_VFWSCANF
-  using ::vfwscanf;
-#endif
-#ifndef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
-  using ::vswprintf;
-#endif
-#if _GLIBCXX_HAVE_VSWSCANF
-  using ::vswscanf;
-#endif
-  using ::vwprintf;
-#if _GLIBCXX_HAVE_VWSCANF
-  using ::vwscanf;
-#endif
-  using ::wcrtomb;
-  using ::wcscat;
-  using ::wcscmp;
-  using ::wcscoll;
-  using ::wcscpy;
-  using ::wcscspn;
-  using ::wcsftime;
-  using ::wcslen;
-  using ::wcsncat;
-  using ::wcsncmp;
-  using ::wcsncpy;
-  using ::wcsrtombs;
-  using ::wcsspn;
-  using ::wcstod;
-#if _GLIBCXX_HAVE_WCSTOF
-  using ::wcstof;
-#endif
-  using ::wcstok;
-  using ::wcstol;
-  using ::wcstoul;
-  using ::wcsxfrm;
-  using ::wctob;
-  using ::wmemcmp;
-  using ::wmemcpy;
-  using ::wmemmove;
-  using ::wmemset;
-  using ::wprintf;
-  using ::wscanf;
-  using ::wcschr;
-  using ::wcspbrk;
-  using ::wcsrchr;
-  using ::wcsstr;
-  using ::wmemchr;
-
-#ifndef __CORRECT_ISO_CPP_WCHAR_H_PROTO
-  inline wchar_t*
-  wcschr(wchar_t* __p, wchar_t __c)
-  { return wcschr(const_cast<const wchar_t*>(__p), __c); }
-
-  inline wchar_t*
-  wcspbrk(wchar_t* __s1, const wchar_t* __s2)
-  { return wcspbrk(const_cast<const wchar_t*>(__s1), __s2); }
-
-  inline wchar_t*
-  wcsrchr(wchar_t* __p, wchar_t __c)
-  { return wcsrchr(const_cast<const wchar_t*>(__p), __c); }
-
-  inline wchar_t*
-  wcsstr(wchar_t* __s1, const wchar_t* __s2)
-  { return wcsstr(const_cast<const wchar_t*>(__s1), __s2); }
-
-  inline wchar_t*
-  wmemchr(wchar_t* __p, wchar_t __c, size_t __n)
-  { return wmemchr(const_cast<const wchar_t*>(__p), __c, __n); }
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if _GLIBCXX_USE_C99
-
-#undef wcstold
-#undef wcstoll
-#undef wcstoull
-
-namespace __gnu_cxx
-{
-#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
-  extern "C" long double
-    (wcstold)(const wchar_t * __restrict, wchar_t ** __restrict) throw ();
-#endif
-#if !_GLIBCXX_USE_C99_DYNAMIC
-  using ::wcstold;
-#endif
-#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  extern "C" long long int
-    (wcstoll)(const wchar_t * __restrict, wchar_t ** __restrict, int) throw ();
-  extern "C" unsigned long long int
-    (wcstoull)(const wchar_t * __restrict, wchar_t ** __restrict, int) throw ();
-#endif
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::wcstoll;
-  using ::wcstoull;
-#endif
-} // namespace __gnu_cxx
-
-namespace std
-{
-  using ::__gnu_cxx::wcstold;
-  using ::__gnu_cxx::wcstoll;
-  using ::__gnu_cxx::wcstoull;
-} // namespace
-
-#endif
-
-#endif //_GLIBCXX_USE_WCHAR_T
-
-#if __cplusplus >= 201103L
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-
-namespace std
-{
-#if _GLIBCXX_HAVE_WCSTOF
-  using std::wcstof;
-#endif
-#if _GLIBCXX_HAVE_VFWSCANF
-  using std::vfwscanf;
-#endif
-#if _GLIBCXX_HAVE_VSWSCANF
-  using std::vswscanf;
-#endif
-#if _GLIBCXX_HAVE_VWSCANF
-  using std::vwscanf;
-#endif
-
-#if _GLIBCXX_USE_C99
-  using std::wcstold;
-  using std::wcstoll;
-  using std::wcstoull;
-#endif
-} // namespace
-
-#endif // _GLIBCXX_USE_WCHAR_T
-
-#endif // C++11
-
-#endif
diff --git a/openflow/usr/include/c++/5/cwctype b/openflow/usr/include/c++/5/cwctype
deleted file mode 100644
index 444bc12..0000000
--- a/openflow/usr/include/c++/5/cwctype
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/cwctype
- *  This is a Standard C++ Library file.  You should @c \#include this file
- *  in your programs, rather than any of the @a *.h implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c wctype.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std (except for names which are defined
- *  as macros in C).
- */
-
-//
-// ISO C++ 14882: <cwctype>
-//
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-#if _GLIBCXX_HAVE_WCTYPE_H
-
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
-// Work around glibc BZ 9694
-#include <stddef.h>
-#endif
-
-#include <wctype.h>
-#endif // _GLIBCXX_HAVE_WCTYPE_H
-
-#ifndef _GLIBCXX_CWCTYPE
-#define _GLIBCXX_CWCTYPE 1
-
-// Get rid of those macros defined in <wctype.h> in lieu of real functions.
-#undef iswalnum
-#undef iswalpha
-#if _GLIBCXX_HAVE_ISWBLANK
-# undef iswblank
-#endif
-#undef iswcntrl
-#undef iswctype
-#undef iswdigit
-#undef iswgraph
-#undef iswlower
-#undef iswprint
-#undef iswpunct
-#undef iswspace
-#undef iswupper
-#undef iswxdigit
-#undef towctrans
-#undef towlower
-#undef towupper
-#undef wctrans
-#undef wctype
-
-#if _GLIBCXX_USE_WCHAR_T
-
-namespace std
-{
-  using ::wctrans_t;
-  using ::wctype_t;
-  using ::wint_t;
-
-  using ::iswalnum;
-  using ::iswalpha;
-#if _GLIBCXX_HAVE_ISWBLANK
-  using ::iswblank;
-#endif
-  using ::iswcntrl;
-  using ::iswctype;
-  using ::iswdigit;
-  using ::iswgraph;
-  using ::iswlower;
-  using ::iswprint;
-  using ::iswpunct;
-  using ::iswspace;
-  using ::iswupper;
-  using ::iswxdigit;
-  using ::towctrans;
-  using ::towlower;
-  using ::towupper;
-  using ::wctrans;
-  using ::wctype;
-} // namespace
-
-#endif //_GLIBCXX_USE_WCHAR_T
-
-#endif // _GLIBCXX_CWCTYPE
diff --git a/openflow/usr/include/c++/5/cxxabi.h b/openflow/usr/include/c++/5/cxxabi.h
deleted file mode 100644
index 571e42e..0000000
--- a/openflow/usr/include/c++/5/cxxabi.h
+++ /dev/null
@@ -1,710 +0,0 @@
-// ABI Support -*- C++ -*-
-
-// Copyright (C) 2000-2015 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Written by Nathan Sidwell, Codesourcery LLC, <nathan@codesourcery.com>
-
-/* This file declares the new abi entry points into the runtime. It is not
-   normally necessary for user programs to include this header, or use the
-   entry points directly. However, this header is available should that be
-   needed.
-
-   Some of the entry points are intended for both C and C++, thus this header
-   is includable from both C and C++. Though the C++ specific parts are not
-   available in C, naturally enough.  */
-
-/** @file cxxabi.h
- *  The header provides an interface to the C++ ABI.
- */
-
-#ifndef _CXXABI_H
-#define _CXXABI_H 1
-
-#pragma GCC system_header
-
-#pragma GCC visibility push(default)
-
-#include <stddef.h>
-#include <bits/c++config.h>
-#include <bits/cxxabi_tweaks.h>
-#include <bits/cxxabi_forced.h>
-
-#ifndef _GLIBCXX_CDTOR_CALLABI
-#define _GLIBCXX_CDTOR_CALLABI
-#endif
-
-#ifdef __cplusplus
-namespace __cxxabiv1
-{
-  extern "C"
-  {
-#endif
-
-  typedef __cxa_cdtor_return_type (*__cxa_cdtor_type)(void *);
-
-  // Allocate array.
-  void*
-  __cxa_vec_new(size_t __element_count, size_t __element_size,
-		size_t __padding_size, __cxa_cdtor_type __constructor,
-		__cxa_cdtor_type __destructor);
-
-  void*
-  __cxa_vec_new2(size_t __element_count, size_t __element_size,
-		 size_t __padding_size, __cxa_cdtor_type __constructor,
-		 __cxa_cdtor_type __destructor, void *(*__alloc) (size_t),
-		 void (*__dealloc) (void*));
-
-  void*
-  __cxa_vec_new3(size_t __element_count, size_t __element_size,
-		 size_t __padding_size, __cxa_cdtor_type __constructor,
-		 __cxa_cdtor_type __destructor, void *(*__alloc) (size_t),
-		 void (*__dealloc) (void*, size_t));
-
-  // Construct array.
-  __cxa_vec_ctor_return_type
-  __cxa_vec_ctor(void* __array_address, size_t __element_count,
-		 size_t __element_size, __cxa_cdtor_type __constructor,
-		 __cxa_cdtor_type __destructor);
-
-  __cxa_vec_ctor_return_type
-  __cxa_vec_cctor(void* __dest_array, void* __src_array,
-		  size_t __element_count, size_t __element_size,
-		  __cxa_cdtor_return_type (*__constructor) (void*, void*),
-		  __cxa_cdtor_type __destructor);
-
-  // Destruct array.
-  void
-  __cxa_vec_dtor(void* __array_address, size_t __element_count,
-		 size_t __element_size, __cxa_cdtor_type __destructor);
-
-  void
-  __cxa_vec_cleanup(void* __array_address, size_t __element_count, size_t __s,
-		    __cxa_cdtor_type __destructor) _GLIBCXX_NOTHROW;
-
-  // Destruct and release array.
-  void
-  __cxa_vec_delete(void* __array_address, size_t __element_size,
-		   size_t __padding_size, __cxa_cdtor_type __destructor);
-
-  void
-  __cxa_vec_delete2(void* __array_address, size_t __element_size,
-		    size_t __padding_size, __cxa_cdtor_type __destructor,
-		    void (*__dealloc) (void*));
-
-  void
-  __cxa_vec_delete3(void* __array_address, size_t __element_size,
-		    size_t __padding_size, __cxa_cdtor_type __destructor,
-		    void (*__dealloc) (void*, size_t));
-
-  int
-  __cxa_guard_acquire(__guard*);
-
-  void
-  __cxa_guard_release(__guard*) _GLIBCXX_NOTHROW;
-
-  void
-  __cxa_guard_abort(__guard*) _GLIBCXX_NOTHROW;
-
-  // DSO destruction.
-  int
-  __cxa_atexit(void (*)(void*), void*, void*) _GLIBCXX_NOTHROW;
-
-  int
-  __cxa_finalize(void*);
-
-  // TLS destruction.
-  int
-  __cxa_thread_atexit(void (*)(void*), void*, void *) _GLIBCXX_NOTHROW;
-
-  // Pure virtual functions.
-  void
-  __cxa_pure_virtual(void) __attribute__ ((__noreturn__));
-
-  void
-  __cxa_deleted_virtual(void) __attribute__ ((__noreturn__));
-
-  // Exception handling auxiliary.
-  void 
-  __cxa_bad_cast() __attribute__((__noreturn__));
-
-  void 
-  __cxa_bad_typeid() __attribute__((__noreturn__));
-
-  void
-  __cxa_throw_bad_array_new_length() __attribute__((__noreturn__));
-
-  /**
-   *  @brief Demangling routine.
-   *  ABI-mandated entry point in the C++ runtime library for demangling.
-   *
-   *  @param __mangled_name A NUL-terminated character string
-   *  containing the name to be demangled.
-   *
-   *  @param __output_buffer A region of memory, allocated with
-   *  malloc, of @a *__length bytes, into which the demangled name is
-   *  stored.  If @a __output_buffer is not long enough, it is
-   *  expanded using realloc.  @a __output_buffer may instead be NULL;
-   *  in that case, the demangled name is placed in a region of memory
-   *  allocated with malloc.
-   *
-   *  @param __length If @a __length is non-NULL, the length of the
-   *  buffer containing the demangled name is placed in @a *__length.
-   *
-   *  @param __status @a *__status is set to one of the following values:
-   *   0: The demangling operation succeeded.
-   *  -1: A memory allocation failure occurred.
-   *  -2: @a mangled_name is not a valid name under the C++ ABI mangling rules.
-   *  -3: One of the arguments is invalid.
-   *
-   *  @return A pointer to the start of the NUL-terminated demangled
-   *  name, or NULL if the demangling fails.  The caller is
-   *  responsible for deallocating this memory using @c free.
-   *
-   *  The demangling is performed using the C++ ABI mangling rules,
-   *  with GNU extensions. For example, this function is used in
-   *  __gnu_cxx::__verbose_terminate_handler.
-   *
-   *  See http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt12ch39.html
-   *  for other examples of use.
-   *
-   *  @note The same demangling functionality is available via
-   *  libiberty (@c <libiberty/demangle.h> and @c libiberty.a) in GCC
-   *  3.1 and later, but that requires explicit installation (@c
-   *  --enable-install-libiberty) and uses a different API, although
-   *  the ABI is unchanged.
-   */
-  char*
-  __cxa_demangle(const char* __mangled_name, char* __output_buffer,
-		 size_t* __length, int* __status);
-
-#ifdef __cplusplus
-  }
-} // namespace __cxxabiv1
-#endif
-
-#ifdef __cplusplus
-
-#include <typeinfo>
-
-namespace __cxxabiv1
-{
-  // Type information for int, float etc.
-  class __fundamental_type_info : public std::type_info
-  {
-  public:
-    explicit
-    __fundamental_type_info(const char* __n) : std::type_info(__n) { }
-
-    virtual
-    ~__fundamental_type_info();
-  };
-
-  // Type information for array objects.
-  class __array_type_info : public std::type_info
-  {
-  public:
-    explicit
-    __array_type_info(const char* __n) : std::type_info(__n) { }
-
-    virtual
-    ~__array_type_info();
-  };
-
-  // Type information for functions (both member and non-member).
-  class __function_type_info : public std::type_info
-  {
-  public:
-    explicit
-    __function_type_info(const char* __n) : std::type_info(__n) { }
-
-    virtual
-    ~__function_type_info();
-
-  protected:
-    // Implementation defined member function.
-    virtual bool
-    __is_function_p() const;
-  };
-
-  // Type information for enumerations.
-  class __enum_type_info : public std::type_info
-  {
-  public:
-    explicit
-    __enum_type_info(const char* __n) : std::type_info(__n) { }
-
-    virtual
-    ~__enum_type_info();
-  };
-
-  // Common type information for simple pointers and pointers to member.
-  class __pbase_type_info : public std::type_info
-  {
-  public:
-    unsigned int 		__flags; // Qualification of the target object.
-    const std::type_info* 	__pointee; // Type of pointed to object.
-
-    explicit
-    __pbase_type_info(const char* __n, int __quals,
-		      const std::type_info* __type)
-    : std::type_info(__n), __flags(__quals), __pointee(__type)
-    { }
-
-    virtual
-    ~__pbase_type_info();
-
-    // Implementation defined type.
-    enum __masks
-      {
-	__const_mask = 0x1,
-	__volatile_mask = 0x2,
-	__restrict_mask = 0x4,
-	__incomplete_mask = 0x8,
-	__incomplete_class_mask = 0x10
-      };
-
-  protected:
-    __pbase_type_info(const __pbase_type_info&);
-
-    __pbase_type_info&
-    operator=(const __pbase_type_info&);
-
-    // Implementation defined member functions.
-    virtual bool
-    __do_catch(const std::type_info* __thr_type, void** __thr_obj,
-	       unsigned int __outer) const;
-
-    inline virtual bool
-    __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
-		    unsigned __outer) const;
-  };
-
-  inline bool __pbase_type_info::
-  __pointer_catch (const __pbase_type_info *thrown_type,
-		   void **thr_obj,
-		   unsigned outer) const
-  {
-    return __pointee->__do_catch (thrown_type->__pointee, thr_obj, outer + 2);
-  }
-
-  // Type information for simple pointers.
-  class __pointer_type_info : public __pbase_type_info
-  {
-  public:
-    explicit
-    __pointer_type_info(const char* __n, int __quals,
-			const std::type_info* __type)
-    : __pbase_type_info (__n, __quals, __type) { }
-
-
-    virtual
-    ~__pointer_type_info();
-
-  protected:
-    // Implementation defined member functions.
-    virtual bool
-    __is_pointer_p() const;
-
-    virtual bool
-    __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
-		    unsigned __outer) const;
-  };
-
-  class __class_type_info;
-
-  // Type information for a pointer to member variable.
-  class __pointer_to_member_type_info : public __pbase_type_info
-  {
-  public:
-    __class_type_info* __context;   // Class of the member.
-
-    explicit
-    __pointer_to_member_type_info(const char* __n, int __quals,
-				  const std::type_info* __type,
-				  __class_type_info* __klass)
-    : __pbase_type_info(__n, __quals, __type), __context(__klass) { }
-
-    virtual
-    ~__pointer_to_member_type_info();
-
-  protected:
-    __pointer_to_member_type_info(const __pointer_to_member_type_info&);
-
-    __pointer_to_member_type_info&
-    operator=(const __pointer_to_member_type_info&);
-
-    // Implementation defined member function.
-    virtual bool
-    __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
-		    unsigned __outer) const;
-  };
-
-  // Helper class for __vmi_class_type.
-  class __base_class_type_info
-  {
-  public:
-    const __class_type_info* 	__base_type;  // Base class type.
-#ifdef _GLIBCXX_LLP64
-    long long			__offset_flags;  // Offset and info.
-#else
-    long 			__offset_flags;  // Offset and info.
-#endif
-
-    enum __offset_flags_masks
-      {
-	__virtual_mask = 0x1,
-	__public_mask = 0x2,
-	__hwm_bit = 2,
-	__offset_shift = 8          // Bits to shift offset.
-      };
-
-    // Implementation defined member functions.
-    bool
-    __is_virtual_p() const
-    { return __offset_flags & __virtual_mask; }
-
-    bool
-    __is_public_p() const
-    { return __offset_flags & __public_mask; }
-
-    ptrdiff_t
-    __offset() const
-    {
-      // This shift, being of a signed type, is implementation
-      // defined. GCC implements such shifts as arithmetic, which is
-      // what we want.
-      return static_cast<ptrdiff_t>(__offset_flags) >> __offset_shift;
-    }
-  };
-
-  // Type information for a class.
-  class __class_type_info : public std::type_info
-  {
-  public:
-    explicit
-    __class_type_info (const char *__n) : type_info(__n) { }
-
-    virtual
-    ~__class_type_info ();
-
-    // Implementation defined types.
-    // The type sub_kind tells us about how a base object is contained
-    // within a derived object. We often do this lazily, hence the
-    // UNKNOWN value. At other times we may use NOT_CONTAINED to mean
-    // not publicly contained.
-    enum __sub_kind
-      {
-	// We have no idea.
-	__unknown = 0,
-
-	// Not contained within us (in some circumstances this might
-	// mean not contained publicly)
-	__not_contained,
-
-	// Contained ambiguously.
-	__contained_ambig,
-
-	// Via a virtual path.
-	__contained_virtual_mask = __base_class_type_info::__virtual_mask,
-
-	// Via a public path.
-	__contained_public_mask = __base_class_type_info::__public_mask,
-
-	// Contained within us.
-	__contained_mask = 1 << __base_class_type_info::__hwm_bit,
-
-	__contained_private = __contained_mask,
-	__contained_public = __contained_mask | __contained_public_mask
-      };
-
-    struct __upcast_result;
-    struct __dyncast_result;
-
-  protected:
-    // Implementation defined member functions.
-    virtual bool
-    __do_upcast(const __class_type_info* __dst_type, void**__obj_ptr) const;
-
-    virtual bool
-    __do_catch(const type_info* __thr_type, void** __thr_obj,
-	       unsigned __outer) const;
-
-  public:
-    // Helper for upcast. See if DST is us, or one of our bases.
-    // Return false if not found, true if found.
-    virtual bool
-    __do_upcast(const __class_type_info* __dst, const void* __obj,
-		__upcast_result& __restrict __result) const;
-
-    // Indicate whether SRC_PTR of type SRC_TYPE is contained publicly
-    // within OBJ_PTR. OBJ_PTR points to a base object of our type,
-    // which is the destination type. SRC2DST indicates how SRC
-    // objects might be contained within this type.  If SRC_PTR is one
-    // of our SRC_TYPE bases, indicate the virtuality. Returns
-    // not_contained for non containment or private containment.
-    inline __sub_kind
-    __find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
-		      const __class_type_info* __src_type,
-		      const void* __src_ptr) const;
-
-    // Helper for dynamic cast. ACCESS_PATH gives the access from the
-    // most derived object to this base. DST_TYPE indicates the
-    // desired type we want. OBJ_PTR points to a base of our type
-    // within the complete object. SRC_TYPE indicates the static type
-    // started from and SRC_PTR points to that base within the most
-    // derived object. Fill in RESULT with what we find. Return true
-    // if we have located an ambiguous match.
-    virtual bool
-    __do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
-		 const __class_type_info* __dst_type, const void* __obj_ptr,
-		 const __class_type_info* __src_type, const void* __src_ptr,
-		 __dyncast_result& __result) const;
-
-    // Helper for find_public_subobj. SRC2DST indicates how SRC_TYPE
-    // bases are inherited by the type started from -- which is not
-    // necessarily the current type. The current type will be a base
-    // of the destination type.  OBJ_PTR points to the current base.
-    virtual __sub_kind
-    __do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
-			 const __class_type_info* __src_type,
-			 const void* __src_ptr) const;
-  };
-
-  // Type information for a class with a single non-virtual base.
-  class __si_class_type_info : public __class_type_info
-  {
-  public:
-    const __class_type_info* __base_type;
-
-    explicit
-    __si_class_type_info(const char *__n, const __class_type_info *__base)
-    : __class_type_info(__n), __base_type(__base) { }
-
-    virtual
-    ~__si_class_type_info();
-
-  protected:
-    __si_class_type_info(const __si_class_type_info&);
-
-    __si_class_type_info&
-    operator=(const __si_class_type_info&);
-
-    // Implementation defined member functions.
-    virtual bool
-    __do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
-		 const __class_type_info* __dst_type, const void* __obj_ptr,
-		 const __class_type_info* __src_type, const void* __src_ptr,
-		 __dyncast_result& __result) const;
-
-    virtual __sub_kind
-    __do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
-			 const __class_type_info* __src_type,
-			 const void* __sub_ptr) const;
-
-    virtual bool
-    __do_upcast(const __class_type_info*__dst, const void*__obj,
-		__upcast_result& __restrict __result) const;
-  };
-
-  // Type information for a class with multiple and/or virtual bases.
-  class __vmi_class_type_info : public __class_type_info
-  {
-  public:
-    unsigned int 		__flags;  // Details about the class hierarchy.
-    unsigned int 		__base_count;  // Number of direct bases.
-
-    // The array of bases uses the trailing array struct hack so this
-    // class is not constructable with a normal constructor. It is
-    // internally generated by the compiler.
-    __base_class_type_info 	__base_info[1];  // Array of bases.
-
-    explicit
-    __vmi_class_type_info(const char* __n, int ___flags)
-    : __class_type_info(__n), __flags(___flags), __base_count(0) { }
-
-    virtual
-    ~__vmi_class_type_info();
-
-    // Implementation defined types.
-    enum __flags_masks
-      {
-	__non_diamond_repeat_mask = 0x1, // Distinct instance of repeated base.
-	__diamond_shaped_mask = 0x2, // Diamond shaped multiple inheritance.
-	__flags_unknown_mask = 0x10
-      };
-
-  protected:
-    // Implementation defined member functions.
-    virtual bool
-    __do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
-		 const __class_type_info* __dst_type, const void* __obj_ptr,
-		 const __class_type_info* __src_type, const void* __src_ptr,
-		 __dyncast_result& __result) const;
-
-    virtual __sub_kind
-    __do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
-			 const __class_type_info* __src_type,
-			 const void* __src_ptr) const;
-
-    virtual bool
-    __do_upcast(const __class_type_info* __dst, const void* __obj,
-		__upcast_result& __restrict __result) const;
-  };
-
-  // Exception handling forward declarations.
-  struct __cxa_exception;
-  struct __cxa_refcounted_exception;
-  struct __cxa_dependent_exception;
-  struct __cxa_eh_globals;
-
-  extern "C"
-  {
-  // Dynamic cast runtime.
-
-  // src2dst has the following possible values
-  //  >-1: src_type is a unique public non-virtual base of dst_type
-  //       dst_ptr + src2dst == src_ptr
-  //   -1: unspecified relationship
-  //   -2: src_type is not a public base of dst_type
-  //   -3: src_type is a multiple public non-virtual base of dst_type
-  void*
-  __dynamic_cast(const void* __src_ptr, // Starting object.
-		 const __class_type_info* __src_type, // Static type of object.
-		 const __class_type_info* __dst_type, // Desired target type.
-		 ptrdiff_t __src2dst); // How src and dst are related.
-
-
-  // Exception handling runtime.
-
-  // The __cxa_eh_globals for the current thread can be obtained by using
-  // either of the following functions.  The "fast" version assumes at least
-  // one prior call of __cxa_get_globals has been made from the current
-  // thread, so no initialization is necessary.
-  __cxa_eh_globals*
-  __cxa_get_globals() _GLIBCXX_NOTHROW __attribute__ ((__const__));
-
-  __cxa_eh_globals*
-  __cxa_get_globals_fast() _GLIBCXX_NOTHROW __attribute__ ((__const__));
-
-  // Allocate memory for the primary exception plus the thrown object.
-  void*
-  __cxa_allocate_exception(size_t) _GLIBCXX_NOTHROW;
-
-  // Free the space allocated for the primary exception.
-  void 
-  __cxa_free_exception(void*) _GLIBCXX_NOTHROW;
-
-  // Throw the exception.
-  void
-  __cxa_throw(void*, std::type_info*, void (_GLIBCXX_CDTOR_CALLABI *) (void *))
-  __attribute__((__noreturn__));
-
-  // Used to implement exception handlers.
-  void*
-  __cxa_get_exception_ptr(void*) _GLIBCXX_NOTHROW __attribute__ ((__pure__));
-
-  void*
-  __cxa_begin_catch(void*) _GLIBCXX_NOTHROW;
-
-  void 
-  __cxa_end_catch();
-
-  void 
-  __cxa_rethrow() __attribute__((__noreturn__));
-
-  // Returns the type_info for the currently handled exception [15.3/8], or
-  // null if there is none.
-  std::type_info*
-  __cxa_current_exception_type() _GLIBCXX_NOTHROW __attribute__ ((__pure__));
-
-  // GNU Extensions.
-
-  // Allocate memory for a dependent exception.
-  __cxa_dependent_exception*
-  __cxa_allocate_dependent_exception() _GLIBCXX_NOTHROW;
-
-  // Free the space allocated for the dependent exception.
-  void
-  __cxa_free_dependent_exception(__cxa_dependent_exception*) _GLIBCXX_NOTHROW;
-
-  } // extern "C"
-
-  // A magic placeholder class that can be caught by reference
-  // to recognize foreign exceptions.
-  class __foreign_exception
-  {
-    virtual ~__foreign_exception() throw();
-    virtual void __pure_dummy() = 0; // prevent catch by value
-  };
-
-} // namespace __cxxabiv1
-
-/** @namespace abi
- *  @brief The cross-vendor C++ Application Binary Interface. A
- *  namespace alias to __cxxabiv1, but user programs should use the
- *  alias 'abi'.
- *
- *  A brief overview of an ABI is given in the libstdc++ FAQ, question
- *  5.8 (you may have a copy of the FAQ locally, or you can view the online
- *  version at http://gcc.gnu.org/onlinedocs/libstdc++/faq.html#5_8 ).
- *
- *  GCC subscribes to a cross-vendor ABI for C++, sometimes
- *  called the IA64 ABI because it happens to be the native ABI for that
- *  platform.  It is summarized at http://www.codesourcery.com/cxx-abi/
- *  along with the current specification.
- *
- *  For users of GCC greater than or equal to 3.x, entry points are
- *  available in <cxxabi.h>, which notes, <em>'It is not normally
- *  necessary for user programs to include this header, or use the
- *  entry points directly.  However, this header is available should
- *  that be needed.'</em>
-*/
-namespace abi = __cxxabiv1;
-
-namespace __gnu_cxx
-{
-  /**
-   *  @brief Exception thrown by __cxa_guard_acquire.
-   *  @ingroup exceptions
-   *
-   *  6.7[stmt.dcl]/4: If control re-enters the declaration (recursively)
-   *  while the object is being initialized, the behavior is undefined.
-   *
-   *  Since we already have a library function to handle locking, we might
-   *  as well check for this situation and throw an exception.
-   *  We use the second byte of the guard variable to remember that we're
-   *  in the middle of an initialization.
-   */
-  class recursive_init_error: public std::exception
-  {
-  public:
-    recursive_init_error() throw() { }
-    virtual ~recursive_init_error() throw ();
-  };
-}
-#endif // __cplusplus
-
-#pragma GCC visibility pop
-
-#endif // __CXXABI_H
diff --git a/openflow/usr/include/c++/5/debug/array b/openflow/usr/include/c++/5/debug/array
deleted file mode 100644
index 411e816..0000000
--- a/openflow/usr/include/c++/5/debug/array
+++ /dev/null
@@ -1,310 +0,0 @@
-// Debugging array implementation -*- C++ -*-
-
-// Copyright (C) 2012-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/array
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_DEBUG_ARRAY
-#define _GLIBCXX_DEBUG_ARRAY 1
-
-#pragma GCC system_header
-
-#include <debug/safe_sequence.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  template<typename _Tp, std::size_t _Nm>
-    struct array
-    {
-      typedef _Tp 	    			      value_type;
-      typedef value_type*			      pointer;
-      typedef const value_type*                       const_pointer;
-      typedef value_type&                   	      reference;
-      typedef const value_type&             	      const_reference;
-      typedef value_type*                             iterator;
-      typedef const value_type*                       const_iterator;
-      typedef std::size_t                    	      size_type;
-      typedef std::ptrdiff_t                   	      difference_type;
-      typedef std::reverse_iterator<iterator>	      reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>   const_reverse_iterator;
-
-      // Support for zero-sized arrays mandatory.
-      typedef _GLIBCXX_STD_C::__array_traits<_Tp, _Nm> _AT_Type;
-      typename _AT_Type::_Type                         _M_elems;
-
-      template<std::size_t _Size>
-	struct _Array_check_subscript
- 	{
-	  std::size_t size() { return _Size; }
-
-	  _Array_check_subscript(std::size_t __index)
-	  { __glibcxx_check_subscript(__index); }
-        };
-
-      template<std::size_t _Size>
-	struct _Array_check_nonempty
- 	{
-	  bool empty() { return _Size == 0; }
-
-	  _Array_check_nonempty()
-	  { __glibcxx_check_nonempty(); }
-        };
-
-      // No explicit construct/copy/destroy for aggregate type.
-
-      // DR 776.
-      void
-      fill(const value_type& __u)
-      { std::fill_n(begin(), size(), __u); }
-
-      void
-      swap(array& __other)
-      noexcept(noexcept(swap(std::declval<_Tp&>(), std::declval<_Tp&>())))
-      { std::swap_ranges(begin(), end(), __other.begin()); }
-
-      // Iterators.
-      iterator
-      begin() noexcept
-      { return iterator(data()); }
-
-      const_iterator
-      begin() const noexcept
-      { return const_iterator(data()); }
-
-      iterator
-      end() noexcept
-      { return iterator(data() + _Nm); }
-
-      const_iterator
-      end() const noexcept
-      { return const_iterator(data() + _Nm); }
-
-      reverse_iterator 
-      rbegin() noexcept
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator 
-      rbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator 
-      rend() noexcept
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator 
-      rend() const noexcept
-      { return const_reverse_iterator(begin()); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(data()); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(data() + _Nm); }
-
-      const_reverse_iterator 
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator 
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-
-      // Capacity.
-      constexpr size_type 
-      size() const noexcept { return _Nm; }
-
-      constexpr size_type 
-      max_size() const noexcept { return _Nm; }
-
-      constexpr bool 
-      empty() const noexcept { return size() == 0; }
-
-      // Element access.
-      reference
-      operator[](size_type __n) noexcept
-      {
-	__glibcxx_check_subscript(__n);
-	return _AT_Type::_S_ref(_M_elems, __n);
-      }
-
-      constexpr const_reference
-      operator[](size_type __n) const noexcept
-      {
-	return __n < _Nm ? _AT_Type::_S_ref(_M_elems, __n)
-	 : (_GLIBCXX_THROW_OR_ABORT(_Array_check_subscript<_Nm>(__n)),
-	    _AT_Type::_S_ref(_M_elems, 0));
-      }
-
-      reference
-      at(size_type __n)
-      {
-	if (__n >= _Nm)
-	  std::__throw_out_of_range_fmt(__N("array::at: __n "
-				            "(which is %zu) >= _Nm "
-					    "(which is %zu)"),
-					__n, _Nm);
-	return _AT_Type::_S_ref(_M_elems, __n);
-      }
-
-      constexpr const_reference
-      at(size_type __n) const
-      {
-	// Result of conditional expression must be an lvalue so use
-	// boolean ? lvalue : (throw-expr, lvalue)
-	return __n < _Nm ? _AT_Type::_S_ref(_M_elems, __n)
-	  : (std::__throw_out_of_range_fmt(__N("array::at: __n (which is %zu) "
-					       ">= _Nm (which is %zu)"),
-					   __n, _Nm),
-	     _AT_Type::_S_ref(_M_elems, 0));
-      }
-
-      reference 
-      front() noexcept
-      {
-	__glibcxx_check_nonempty();
-	return *begin();
-      }
-
-      constexpr const_reference 
-      front() const noexcept
-      {
-	return _Nm ? _AT_Type::_S_ref(_M_elems, 0)
-	  : (_GLIBCXX_THROW_OR_ABORT(_Array_check_nonempty<_Nm>()),
-	     _AT_Type::_S_ref(_M_elems, 0));
-      }
-
-      reference 
-      back() noexcept
-      {
-	__glibcxx_check_nonempty();
-	return _Nm ? *(end() - 1) : *end();
-      }
-
-      constexpr const_reference 
-      back() const noexcept
-      {
-	return _Nm ? _AT_Type::_S_ref(_M_elems, _Nm - 1)
-	  : (_GLIBCXX_THROW_OR_ABORT(_Array_check_nonempty<_Nm>()),
-	     _AT_Type::_S_ref(_M_elems, 0));
-      }
-
-      pointer
-      data() noexcept
-      { return _AT_Type::_S_ptr(_M_elems); }
-
-      const_pointer
-      data() const noexcept
-      { return _AT_Type::_S_ptr(_M_elems); }
-    };
-
-  // Array comparisons.
-  template<typename _Tp, std::size_t _Nm>
-    inline bool 
-    operator==(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return std::equal(__one.begin(), __one.end(), __two.begin()); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator!=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one == __two); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator<(const array<_Tp, _Nm>& __a, const array<_Tp, _Nm>& __b)
-    { 
-      return std::lexicographical_compare(__a.begin(), __a.end(),
-					  __b.begin(), __b.end()); 
-    }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator>(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return __two < __one; }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator<=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one > __two); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator>=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one < __two); }
-
-  // Specialized algorithms.
-  template<typename _Tp, std::size_t _Nm>
-    inline void
-    swap(array<_Tp, _Nm>& __one, array<_Tp, _Nm>& __two)
-    noexcept(noexcept(__one.swap(__two)))
-    { __one.swap(__two); }
-
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    constexpr _Tp&
-    get(array<_Tp, _Nm>& __arr) noexcept
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      return _GLIBCXX_STD_C::__array_traits<_Tp, _Nm>::
-	_S_ref(__arr._M_elems, _Int);
-    }
-
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    constexpr _Tp&&
-    get(array<_Tp, _Nm>&& __arr) noexcept
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      return std::move(__debug::get<_Int>(__arr));
-    }
-
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    constexpr const _Tp&
-    get(const array<_Tp, _Nm>& __arr) noexcept
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      return _GLIBCXX_STD_C::__array_traits<_Tp, _Nm>::
-	_S_ref(__arr._M_elems, _Int);
-    }
-} // namespace __debug
-
-  // Tuple interface to class template array.
-
-  /// tuple_size
-  template<typename _Tp, std::size_t _Nm>
-    struct tuple_size<__debug::array<_Tp, _Nm>>
-    : public integral_constant<std::size_t, _Nm> { };
-
-  /// tuple_element
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    struct tuple_element<_Int, __debug::array<_Tp, _Nm>>
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      typedef _Tp type;
-    };
-} // namespace std
-
-#endif // _GLIBCXX_DEBUG_ARRAY
diff --git a/openflow/usr/include/c++/5/debug/bitset b/openflow/usr/include/c++/5/debug/bitset
deleted file mode 100644
index 9cbf457..0000000
--- a/openflow/usr/include/c++/5/debug/bitset
+++ /dev/null
@@ -1,426 +0,0 @@
-// Debugging bitset implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/bitset
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_BITSET
-#define _GLIBCXX_DEBUG_BITSET
-
-#include <bitset>
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::bitset with additional safety/checking/debug instrumentation.
-  template<size_t _Nb>
-    class bitset
-    : public _GLIBCXX_STD_C::bitset<_Nb>
-#if __cplusplus < 201103L
-    , public __gnu_debug::_Safe_sequence_base
-#endif
-    {
-      typedef _GLIBCXX_STD_C::bitset<_Nb> _Base;
-
-    public:
-      // In C++0x we rely on normal reference type to preserve the property
-      // of bitset to be use as a literal.
-      // TODO: Find another solution.
-#if __cplusplus >= 201103L
-      typedef typename _Base::reference reference;
-#else
-      // bit reference:
-      class reference
-      : private _Base::reference
-        , public __gnu_debug::_Safe_iterator_base
-      {
-	typedef typename _Base::reference _Base_ref;
-
-	friend class bitset;
-	reference();
-
-	reference(const _Base_ref& __base,
-		  bitset* __seq __attribute__((__unused__))) _GLIBCXX_NOEXCEPT
-	: _Base_ref(__base)
-	, _Safe_iterator_base(__seq, false)
-	{ }
-
-      public:
-	reference(const reference& __x) _GLIBCXX_NOEXCEPT
-	: _Base_ref(__x)
-	, _Safe_iterator_base(__x, false)
-	{ }
-
-	reference&
-	operator=(bool __x) _GLIBCXX_NOEXCEPT
-	{
-	  _GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			      _M_message(__gnu_debug::__msg_bad_bitset_write)
-				._M_iterator(*this));
-	  *static_cast<_Base_ref*>(this) = __x;
-	  return *this;
-	}
-
-	reference&
-	operator=(const reference& __x) _GLIBCXX_NOEXCEPT
-	{
-	  _GLIBCXX_DEBUG_VERIFY(! __x._M_singular(),
-			       _M_message(__gnu_debug::__msg_bad_bitset_read)
-				._M_iterator(__x));
-	  _GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			      _M_message(__gnu_debug::__msg_bad_bitset_write)
-				._M_iterator(*this));
-	  *static_cast<_Base_ref*>(this) = __x;
-	  return *this;
-	}
-
-	bool
-	operator~() const _GLIBCXX_NOEXCEPT
-	{
-	  _GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			       _M_message(__gnu_debug::__msg_bad_bitset_read)
-				._M_iterator(*this));
-	  return ~(*static_cast<const _Base_ref*>(this));
-	}
-
-	operator bool() const _GLIBCXX_NOEXCEPT
-	{
-	  _GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			      _M_message(__gnu_debug::__msg_bad_bitset_read)
-				._M_iterator(*this));
-	  return *static_cast<const _Base_ref*>(this);
-	}
-
-	reference&
-	flip() _GLIBCXX_NOEXCEPT
-	{
-	  _GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			      _M_message(__gnu_debug::__msg_bad_bitset_flip)
-				._M_iterator(*this));
-	  _Base_ref::flip();
-	  return *this;
-	}
-      };
-#endif
-
-      // 23.3.5.1 constructors:
-      _GLIBCXX_CONSTEXPR bitset() _GLIBCXX_NOEXCEPT
-      : _Base() { }
-
-#if __cplusplus >= 201103L
-      constexpr bitset(unsigned long long __val) noexcept
-#else
-      bitset(unsigned long __val)
-#endif
-      : _Base(__val) { }
-
-      template<typename _CharT, typename _Traits, typename _Alloc>
-        explicit
-        bitset(const std::basic_string<_CharT, _Traits, _Alloc>& __str,
-	       typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
-	       __pos = 0,
-	       typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
-	       __n = (std::basic_string<_CharT, _Traits, _Alloc>::npos))
-	: _Base(__str, __pos, __n) { }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 396. what are characters zero and one.
-      template<class _CharT, class _Traits, class _Alloc>
-	bitset(const std::basic_string<_CharT, _Traits, _Alloc>& __str,
-	       typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
-	       __pos,
-	       typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
-	       __n,
-	       _CharT __zero, _CharT __one = _CharT('1'))
-	: _Base(__str, __pos, __n, __zero, __one) { }
-
-      bitset(const _Base& __x) : _Base(__x) { }
-
-#if __cplusplus >= 201103L
-      template<typename _CharT>
-        explicit
-        bitset(const _CharT* __str,
-	       typename std::basic_string<_CharT>::size_type __n
-	       = std::basic_string<_CharT>::npos,
-	       _CharT __zero = _CharT('0'), _CharT __one = _CharT('1'))
-	: _Base(__str, __n, __zero, __one) { }
-#endif
-
-      // 23.3.5.2 bitset operations:
-      bitset<_Nb>&
-      operator&=(const bitset<_Nb>& __rhs) _GLIBCXX_NOEXCEPT
-      {
-	_M_base() &= __rhs;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator|=(const bitset<_Nb>& __rhs) _GLIBCXX_NOEXCEPT
-      {
-	_M_base() |= __rhs;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator^=(const bitset<_Nb>& __rhs) _GLIBCXX_NOEXCEPT
-      {
-	_M_base() ^= __rhs;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator<<=(size_t __pos) _GLIBCXX_NOEXCEPT
-      {
-	_M_base() <<= __pos;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator>>=(size_t __pos) _GLIBCXX_NOEXCEPT
-      {
-	_M_base() >>= __pos;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      set() _GLIBCXX_NOEXCEPT
-      {
-	_Base::set();
-	return *this;
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 186. bitset::set() second parameter should be bool
-      bitset<_Nb>&
-      set(size_t __pos, bool __val = true)
-      {
-	_Base::set(__pos, __val);
-	return *this;
-      }
-
-      bitset<_Nb>&
-      reset() _GLIBCXX_NOEXCEPT
-      {
-	_Base::reset();
-	return *this;
-      }
-
-      bitset<_Nb>&
-      reset(size_t __pos)
-      {
-	_Base::reset(__pos);
-	return *this;
-      }
-
-      bitset<_Nb>
-      operator~() const _GLIBCXX_NOEXCEPT
-      { return bitset(~_M_base()); }
-
-      bitset<_Nb>&
-      flip() _GLIBCXX_NOEXCEPT
-      {
-	_Base::flip();
-	return *this;
-      }
-
-      bitset<_Nb>&
-      flip(size_t __pos)
-      {
-	_Base::flip(__pos);
-	return *this;
-      }
-
-      // element access:
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 11. Bitset minor problems
-      reference
-      operator[](size_t __pos)
-      {
-	__glibcxx_check_subscript(__pos);
-#if __cplusplus >= 201103L
-	return _M_base()[__pos];
-#else
-	return reference(_M_base()[__pos], this);
-#endif
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 11. Bitset minor problems
-      _GLIBCXX_CONSTEXPR bool
-      operator[](size_t __pos) const
-      {
-#if __cplusplus < 201103L
-	// TODO: Check in debug-mode too.
-	__glibcxx_check_subscript(__pos);
-#endif
-	return _Base::operator[](__pos);
-      }
-
-      using _Base::to_ulong;
-#if __cplusplus >= 201103L
-      using _Base::to_ullong;
-#endif
-
-      template <typename _CharT, typename _Traits, typename _Alloc>
-        std::basic_string<_CharT, _Traits, _Alloc>
-        to_string() const
-        { return _M_base().template to_string<_CharT, _Traits, _Alloc>(); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 396. what are characters zero and one.
-      template<class _CharT, class _Traits, class _Alloc>
-	std::basic_string<_CharT, _Traits, _Alloc>
-	to_string(_CharT __zero, _CharT __one = _CharT('1')) const
-	{
-	  return _M_base().template
-	    to_string<_CharT, _Traits, _Alloc>(__zero, __one);
-	}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 434. bitset::to_string() hard to use.
-      template<typename _CharT, typename _Traits>
-        std::basic_string<_CharT, _Traits, std::allocator<_CharT> >
-        to_string() const
-        { return to_string<_CharT, _Traits, std::allocator<_CharT> >(); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 853. to_string needs updating with zero and one.
-      template<class _CharT, class _Traits>
-	std::basic_string<_CharT, _Traits, std::allocator<_CharT> >
-	to_string(_CharT __zero, _CharT __one = _CharT('1')) const
-	{ return to_string<_CharT, _Traits,
-	                   std::allocator<_CharT> >(__zero, __one); }
-
-      template<typename _CharT>
-        std::basic_string<_CharT, std::char_traits<_CharT>,
-                          std::allocator<_CharT> >
-        to_string() const
-        {
-          return to_string<_CharT, std::char_traits<_CharT>,
-                           std::allocator<_CharT> >();
-        }
-
-      template<class _CharT>
-	std::basic_string<_CharT, std::char_traits<_CharT>,
-	                  std::allocator<_CharT> >
-	to_string(_CharT __zero, _CharT __one = _CharT('1')) const
-	{
-	  return to_string<_CharT, std::char_traits<_CharT>,
-	                   std::allocator<_CharT> >(__zero, __one);
-	}
-
-      std::basic_string<char, std::char_traits<char>, std::allocator<char> >
-      to_string() const
-      {
-	return to_string<char,std::char_traits<char>,std::allocator<char> >();
-      }
-
-      std::basic_string<char, std::char_traits<char>, std::allocator<char> >
-      to_string(char __zero, char __one = '1') const
-      {
-	return to_string<char, std::char_traits<char>,
-	                 std::allocator<char> >(__zero, __one);
-      }
-
-      using _Base::count;
-      using _Base::size;
-
-      bool
-      operator==(const bitset<_Nb>& __rhs) const _GLIBCXX_NOEXCEPT
-      { return _M_base() == __rhs; }
-
-      bool
-      operator!=(const bitset<_Nb>& __rhs) const _GLIBCXX_NOEXCEPT
-      { return _M_base() != __rhs; }
-
-      using _Base::test;
-      using _Base::all;
-      using _Base::any;
-      using _Base::none;
-
-      bitset<_Nb>
-      operator<<(size_t __pos) const _GLIBCXX_NOEXCEPT
-      { return bitset<_Nb>(_M_base() << __pos); }
-
-      bitset<_Nb>
-      operator>>(size_t __pos) const _GLIBCXX_NOEXCEPT
-      { return bitset<_Nb>(_M_base() >> __pos); }
-
-      _Base& 
-      _M_base() _GLIBCXX_NOEXCEPT
-      { return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT
-      { return *this; }
-    };
-
-  template<size_t _Nb>
-    bitset<_Nb>
-    operator&(const bitset<_Nb>& __x, const bitset<_Nb>& __y) _GLIBCXX_NOEXCEPT
-    { return bitset<_Nb>(__x) &= __y; }
-
-  template<size_t _Nb>
-    bitset<_Nb>
-    operator|(const bitset<_Nb>& __x, const bitset<_Nb>& __y) _GLIBCXX_NOEXCEPT
-    { return bitset<_Nb>(__x) |= __y; }
-
-  template<size_t _Nb>
-    bitset<_Nb>
-    operator^(const bitset<_Nb>& __x, const bitset<_Nb>& __y) _GLIBCXX_NOEXCEPT
-    { return bitset<_Nb>(__x) ^= __y; }
-
-  template<typename _CharT, typename _Traits, size_t _Nb>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is, bitset<_Nb>& __x)
-    { return __is >> __x._M_base(); }
-
-  template<typename _CharT, typename _Traits, size_t _Nb>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const bitset<_Nb>& __x)
-    { return __os << __x._M_base(); }
-
-} // namespace __debug
-
-#if __cplusplus >= 201103L
-  // DR 1182.
-  /// std::hash specialization for bitset.
-  template<size_t _Nb>
-    struct hash<__debug::bitset<_Nb>>
-    : public __hash_base<size_t, __debug::bitset<_Nb>>
-    {
-      size_t
-      operator()(const __debug::bitset<_Nb>& __b) const noexcept
-      { return std::hash<_GLIBCXX_STD_C::bitset<_Nb>>()(__b._M_base()); }
-    };
-#endif
-
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/debug.h b/openflow/usr/include/c++/5/debug/debug.h
deleted file mode 100644
index 161108d..0000000
--- a/openflow/usr/include/c++/5/debug/debug.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// Debugging support implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/debug.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_MACRO_SWITCH_H
-#define _GLIBCXX_DEBUG_MACRO_SWITCH_H 1
-
-/** Macros and namespaces used by the implementation outside of debug
- *  wrappers to verify certain properties. The __glibcxx_requires_xxx
- *  macros are merely wrappers around the __glibcxx_check_xxx wrappers
- *  when we are compiling with debug mode, but disappear when we are
- *  in release mode so that there is no checking performed in, e.g.,
- *  the standard library algorithms.
-*/
-
-// Debug mode namespaces.
-
-/**
- * @namespace std::__debug
- * @brief GNU debug code, replaces standard behavior with debug behavior.
- */
-namespace std
-{ 
-  namespace __debug { } 
-}
-
-/** @namespace __gnu_debug
- *  @brief GNU debug classes for public use.
-*/
-namespace __gnu_debug
-{
-  using namespace std::__debug;
-}
-
-#ifndef _GLIBCXX_DEBUG
-
-# define _GLIBCXX_DEBUG_ASSERT(_Condition)
-# define _GLIBCXX_DEBUG_PEDASSERT(_Condition)
-# define _GLIBCXX_DEBUG_ONLY(_Statement) ;
-# define __glibcxx_requires_cond(_Cond,_Msg)
-# define __glibcxx_requires_valid_range(_First,_Last)
-# define __glibcxx_requires_non_empty_range(_First,_Last)
-# define __glibcxx_requires_sorted(_First,_Last)
-# define __glibcxx_requires_sorted_pred(_First,_Last,_Pred)
-# define __glibcxx_requires_sorted_set(_First1,_Last1,_First2)
-# define __glibcxx_requires_sorted_set_pred(_First1,_Last1,_First2,_Pred)
-# define __glibcxx_requires_partitioned_lower(_First,_Last,_Value)
-# define __glibcxx_requires_partitioned_upper(_First,_Last,_Value)
-# define __glibcxx_requires_partitioned_lower_pred(_First,_Last,_Value,_Pred)
-# define __glibcxx_requires_partitioned_upper_pred(_First,_Last,_Value,_Pred)
-# define __glibcxx_requires_heap(_First,_Last)
-# define __glibcxx_requires_heap_pred(_First,_Last,_Pred)
-# define __glibcxx_requires_nonempty()
-# define __glibcxx_requires_string(_String)
-# define __glibcxx_requires_string_len(_String,_Len)
-# define __glibcxx_requires_subscript(_N)
-
-#else
-
-# include <debug/macros.h>
-
-#define _GLIBCXX_DEBUG_ASSERT(_Condition) __glibcxx_assert(_Condition)
-
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-# define _GLIBCXX_DEBUG_PEDASSERT(_Condition) _GLIBCXX_DEBUG_ASSERT(_Condition)
-#else
-# define _GLIBCXX_DEBUG_PEDASSERT(_Condition)
-#endif
-
-# define _GLIBCXX_DEBUG_ONLY(_Statement) _Statement
-
-# define __glibcxx_requires_cond(_Cond,_Msg) _GLIBCXX_DEBUG_VERIFY(_Cond,_Msg)
-# define __glibcxx_requires_valid_range(_First,_Last) \
-     __glibcxx_check_valid_range(_First,_Last)
-# define __glibcxx_requires_non_empty_range(_First,_Last) \
-     __glibcxx_check_non_empty_range(_First,_Last)
-# define __glibcxx_requires_sorted(_First,_Last) \
-     __glibcxx_check_sorted(_First,_Last)
-# define __glibcxx_requires_sorted_pred(_First,_Last,_Pred) \
-     __glibcxx_check_sorted_pred(_First,_Last,_Pred)
-# define __glibcxx_requires_sorted_set(_First1,_Last1,_First2) \
-     __glibcxx_check_sorted_set(_First1,_Last1,_First2)
-# define __glibcxx_requires_sorted_set_pred(_First1,_Last1,_First2,_Pred) \
-     __glibcxx_check_sorted_set_pred(_First1,_Last1,_First2,_Pred)
-# define __glibcxx_requires_partitioned_lower(_First,_Last,_Value)	\
-     __glibcxx_check_partitioned_lower(_First,_Last,_Value)
-# define __glibcxx_requires_partitioned_upper(_First,_Last,_Value)	\
-     __glibcxx_check_partitioned_upper(_First,_Last,_Value)
-# define __glibcxx_requires_partitioned_lower_pred(_First,_Last,_Value,_Pred) \
-     __glibcxx_check_partitioned_lower_pred(_First,_Last,_Value,_Pred)
-# define __glibcxx_requires_partitioned_upper_pred(_First,_Last,_Value,_Pred) \
-     __glibcxx_check_partitioned_upper_pred(_First,_Last,_Value,_Pred)
-# define __glibcxx_requires_heap(_First,_Last) \
-     __glibcxx_check_heap(_First,_Last)
-# define __glibcxx_requires_heap_pred(_First,_Last,_Pred) \
-     __glibcxx_check_heap_pred(_First,_Last,_Pred)
-# define __glibcxx_requires_nonempty() __glibcxx_check_nonempty()
-# define __glibcxx_requires_string(_String) __glibcxx_check_string(_String)
-# define __glibcxx_requires_string_len(_String,_Len)	\
-     __glibcxx_check_string_len(_String,_Len)
-# define __glibcxx_requires_subscript(_N) __glibcxx_check_subscript(_N)
-
-# include <debug/functions.h>
-
-#endif
-
-#endif // _GLIBCXX_DEBUG_MACRO_SWITCH_H
diff --git a/openflow/usr/include/c++/5/debug/deque b/openflow/usr/include/c++/5/debug/deque
deleted file mode 100644
index fffc5e4..0000000
--- a/openflow/usr/include/c++/5/debug/deque
+++ /dev/null
@@ -1,639 +0,0 @@
-// Debugging deque implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/deque
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_DEQUE
-#define _GLIBCXX_DEBUG_DEQUE 1
-
-#include <deque>
-#include <debug/safe_sequence.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::deque with safety/checking/debug instrumentation.
-  template<typename _Tp, typename _Allocator = std::allocator<_Tp> >
-    class deque
-    : public __gnu_debug::_Safe_container<
-	deque<_Tp, _Allocator>, _Allocator,
-	__gnu_debug::_Safe_sequence>,
-      public _GLIBCXX_STD_C::deque<_Tp, _Allocator>
-    {
-      typedef  _GLIBCXX_STD_C::deque<_Tp, _Allocator>		_Base;
-      typedef __gnu_debug::_Safe_container<
-	deque, _Allocator, __gnu_debug::_Safe_sequence>	_Safe;
-
-      typedef typename _Base::const_iterator	_Base_const_iterator;
-      typedef typename _Base::iterator		_Base_iterator;
-      typedef __gnu_debug::_Equal_to<_Base_const_iterator> _Equal;
-
-    public:
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<_Base_iterator, deque>
-							iterator;
-      typedef __gnu_debug::_Safe_iterator<_Base_const_iterator, deque>
-							const_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-
-      typedef _Tp					value_type;
-      typedef _Allocator				allocator_type;
-      typedef typename _Base::pointer			pointer;
-      typedef typename _Base::const_pointer		const_pointer;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      // 23.2.1.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      deque()
-      : _Base() { }
-
-      deque(const deque& __x)
-      : _Base(__x) { }
-
-      ~deque() { }
-#else
-      deque() = default;
-      deque(const deque&) = default;
-      deque(deque&&) = default;
-
-      deque(const deque& __d, const _Allocator& __a)
-      : _Base(__d, __a) { }
-
-      deque(deque&& __d, const _Allocator& __a)
-      : _Safe(std::move(__d)), _Base(std::move(__d), __a) { }
-
-      deque(initializer_list<value_type> __l,
-	    const allocator_type& __a = allocator_type())
-      : _Base(__l, __a) { }
-
-      ~deque() = default;
-#endif
-
-      explicit
-      deque(const _Allocator& __a)
-      : _Base(__a) { }
-
-#if __cplusplus >= 201103L
-      explicit
-      deque(size_type __n, const _Allocator& __a = _Allocator())
-      : _Base(__n, __a) { }
-
-      deque(size_type __n, const _Tp& __value,
-	    const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#else
-      explicit
-      deque(size_type __n, const _Tp& __value = _Tp(),
-	    const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#endif
-
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-	deque(_InputIterator __first, _InputIterator __last,
-	      const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __a)
-	{ }
-
-      deque(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      deque&
-      operator=(const deque& __x)
-      {
-	this->_M_safe() = __x;
-	_M_base() = __x;
-	return *this;
-      }
-#else
-      deque&
-      operator=(const deque&) = default;
-
-      deque&
-      operator=(deque&&) = default;
-
-      deque&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_base() = __l;
-	this->_M_invalidate_all();
-	return *this;
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-	void
-	assign(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::assign(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	  this->_M_invalidate_all();
-	}
-
-      void
-      assign(size_type __n, const _Tp& __t)
-      {
-	_Base::assign(__n, __t);
-	this->_M_invalidate_all();
-      }
-
-#if __cplusplus >= 201103L
-      void
-      assign(initializer_list<value_type> __l)
-      {
-	_Base::assign(__l);
-	this->_M_invalidate_all();
-      }
-#endif
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-    private:
-      void
-      _M_invalidate_after_nth(difference_type __n)
-      {
-	typedef __gnu_debug::_After_nth_from<_Base_const_iterator> _After_nth;
-	this->_M_invalidate_if(_After_nth(__n, _Base::begin()));
-      }
-
-    public:
-      // 23.2.1.2 capacity:
-      using _Base::size;
-      using _Base::max_size;
-
-#if __cplusplus >= 201103L
-      void
-      resize(size_type __sz)
-      {
-	bool __invalidate_all = __sz > this->size();
-	if (__sz < this->size())
-	  this->_M_invalidate_after_nth(__sz);
-
-	_Base::resize(__sz);
-
-	if (__invalidate_all)
-	  this->_M_invalidate_all();
-      }
-
-      void
-      resize(size_type __sz, const _Tp& __c)
-      {
-	bool __invalidate_all = __sz > this->size();
-	if (__sz < this->size())
-	  this->_M_invalidate_after_nth(__sz);
-
-	_Base::resize(__sz, __c);
-
-	if (__invalidate_all)
-	  this->_M_invalidate_all();
-      }
-#else
-      void
-      resize(size_type __sz, _Tp __c = _Tp())
-      {
-	bool __invalidate_all = __sz > this->size();
-	if (__sz < this->size())
-	  this->_M_invalidate_after_nth(__sz);
-
-	_Base::resize(__sz, __c);
-
-	if (__invalidate_all)
-	  this->_M_invalidate_all();
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      void
-      shrink_to_fit() noexcept
-      {
-	if (_Base::_M_shrink_to_fit())
-	  this->_M_invalidate_all();
-      }
-#endif
-
-      using _Base::empty;
-
-      // element access:
-      reference
-      operator[](size_type __n) _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_subscript(__n);
-	return _M_base()[__n];
-      }
-
-      const_reference
-      operator[](size_type __n) const _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_subscript(__n);
-	return _M_base()[__n];
-      }
-
-      using _Base::at;
-
-      reference
-      front() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      const_reference
-      front() const _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      reference
-      back() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      const_reference
-      back() const _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      // 23.2.1.3 modifiers:
-      void
-      push_front(const _Tp& __x)
-      {
-	_Base::push_front(__x);
-	this->_M_invalidate_all();
-      }
-
-      void
-      push_back(const _Tp& __x)
-      {
-	_Base::push_back(__x);
-	this->_M_invalidate_all();
-      }
-
-#if __cplusplus >= 201103L
-      void
-      push_front(_Tp&& __x)
-      { emplace_front(std::move(__x)); }
-
-      void
-      push_back(_Tp&& __x)
-      { emplace_back(std::move(__x)); }
-
-      template<typename... _Args>
-	void
-	emplace_front(_Args&&... __args)
-	{
-	  _Base::emplace_front(std::forward<_Args>(__args)...);
-	  this->_M_invalidate_all();
-	}
-
-      template<typename... _Args>
-	void
-	emplace_back(_Args&&... __args)
-	{
-	  _Base::emplace_back(std::forward<_Args>(__args)...);
-	  this->_M_invalidate_all();
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace(const_iterator __position, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__position);
-	  _Base_iterator __res = _Base::emplace(__position.base(),
-						std::forward<_Args>(__args)...);
-	  this->_M_invalidate_all();
-	  return iterator(__res, this);
-	}
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __position, const _Tp& __x)
-#else
-      insert(iterator __position, const _Tp& __x)
-#endif
-      {
-	__glibcxx_check_insert(__position);
-	_Base_iterator __res = _Base::insert(__position.base(), __x);
-	this->_M_invalidate_all();
-	return iterator(__res, this);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __position, _Tp&& __x)
-      { return emplace(__position, std::move(__x)); }
-
-      iterator
-      insert(const_iterator __position, initializer_list<value_type> __l)
-      {
-	__glibcxx_check_insert(__position);
-	_Base_iterator __res = _Base::insert(__position.base(), __l);
-	this->_M_invalidate_all();
-	return iterator(__res, this);
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __position, size_type __n, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	_Base_iterator __res = _Base::insert(__position.base(), __n, __x);
-	this->_M_invalidate_all();
-	return iterator(__res, this);
-      }
-#else
-      void
-      insert(iterator __position, size_type __n, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	_Base::insert(__position.base(), __n, __x);
-	this->_M_invalidate_all();
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	iterator
-	insert(const_iterator __position,
-	       _InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_insert_range(__position, __first, __last);
-	  _Base_iterator __res = _Base::insert(__position.base(),
-					       __gnu_debug::__base(__first),
-					       __gnu_debug::__base(__last));
-	  this->_M_invalidate_all();
-	  return iterator(__res, this);
-	}
-#else
-      template<class _InputIterator>
-	void
-	insert(iterator __position,
-	       _InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_insert_range(__position, __first, __last);
-	  _Base::insert(__position.base(), __gnu_debug::__base(__first),
-					   __gnu_debug::__base(__last));
-	  this->_M_invalidate_all();
-	}
-#endif
-
-      void
-      pop_front() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	this->_M_invalidate_if(_Equal(_Base::begin()));
-	_Base::pop_front();
-      }
-
-      void
-      pop_back() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	this->_M_invalidate_if(_Equal(--_Base::end()));
-	_Base::pop_back();
-      }
-
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __position)
-#else
-      erase(iterator __position)	
-#endif
-      {
-	__glibcxx_check_erase(__position);
-#if __cplusplus >= 201103L
-	_Base_const_iterator __victim = __position.base();
-#else
-	_Base_iterator __victim = __position.base();
-#endif
-	if (__victim == _Base::begin() || __victim == _Base::end() - 1)
-	  {
-	    this->_M_invalidate_if(_Equal(__victim));
-	    return iterator(_Base::erase(__victim), this);
-	  }
-	else
-	  {
-	    _Base_iterator __res = _Base::erase(__victim);
-	    this->_M_invalidate_all();
-	    return iterator(__res, this);
-	  }
-      }
-
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __first, const_iterator __last)
-#else
-      erase(iterator __first, iterator __last)
-#endif
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-
-	if (__first.base() == __last.base())
-#if __cplusplus >= 201103L
-	  return iterator(__first.base()._M_const_cast(), this);
-#else
-	  return __first;
-#endif
-	else if (__first.base() == _Base::begin()
-		 || __last.base() == _Base::end())
-	  {
-	    this->_M_detach_singular();
-	    for (_Base_const_iterator __position = __first.base();
-		 __position != __last.base(); ++__position)
-	      {
-		this->_M_invalidate_if(_Equal(__position));
-	      }
-	    __try
-	      {
-		return iterator(_Base::erase(__first.base(), __last.base()),
-				this);
-	      }
-	    __catch(...)
-	      {
-		this->_M_revalidate_singular();
-		__throw_exception_again;
-	      }
-	  }
-	else
-	  {
-	    _Base_iterator __res = _Base::erase(__first.base(),
-						__last.base());
-	    this->_M_invalidate_all();
-	    return iterator(__res, this);
-	  }
-      }
-
-      void
-      swap(deque& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-      }
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const deque<_Tp, _Alloc>& __lhs,
-	      const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const deque<_Tp, _Alloc>& __lhs,
-	      const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(deque<_Tp, _Alloc>& __lhs, deque<_Tp, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-
-} // namespace __debug
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/formatter.h b/openflow/usr/include/c++/5/debug/formatter.h
deleted file mode 100644
index 6767cd9..0000000
--- a/openflow/usr/include/c++/5/debug/formatter.h
+++ /dev/null
@@ -1,464 +0,0 @@
-// Debug-mode error formatting implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/formatter.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_FORMATTER_H
-#define _GLIBCXX_DEBUG_FORMATTER_H 1
-
-#include <bits/c++config.h>
-#include <bits/cpp_type_traits.h>
-#include <typeinfo>
-
-namespace __gnu_debug
-{
-  using std::type_info;
-
-  template<typename _Iterator>
-    bool __check_singular(const _Iterator&);
-
-  class _Safe_sequence_base;
-
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_iterator;
-
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_local_iterator;
-
-  template<typename _Sequence>
-    class _Safe_sequence;
-
-  enum _Debug_msg_id
-  {
-    // General checks
-    __msg_valid_range,
-    __msg_insert_singular,
-    __msg_insert_different,
-    __msg_erase_bad,
-    __msg_erase_different,
-    __msg_subscript_oob,
-    __msg_empty,
-    __msg_unpartitioned,
-    __msg_unpartitioned_pred,
-    __msg_unsorted,
-    __msg_unsorted_pred,
-    __msg_not_heap,
-    __msg_not_heap_pred,
-    // std::bitset checks
-    __msg_bad_bitset_write,
-    __msg_bad_bitset_read,
-    __msg_bad_bitset_flip,
-    // std::list checks
-    __msg_self_splice,
-    __msg_splice_alloc,
-    __msg_splice_bad,
-    __msg_splice_other,
-    __msg_splice_overlap,
-    // iterator checks
-    __msg_init_singular,
-    __msg_init_copy_singular,
-    __msg_init_const_singular,
-    __msg_copy_singular,
-    __msg_bad_deref,
-    __msg_bad_inc,
-    __msg_bad_dec,
-    __msg_iter_subscript_oob,
-    __msg_advance_oob,
-    __msg_retreat_oob,
-    __msg_iter_compare_bad,
-    __msg_compare_different,
-    __msg_iter_order_bad,
-    __msg_order_different,
-    __msg_distance_bad,
-    __msg_distance_different,
-    // istream_iterator
-    __msg_deref_istream,
-    __msg_inc_istream,
-    // ostream_iterator
-    __msg_output_ostream,
-    // istreambuf_iterator
-    __msg_deref_istreambuf,
-    __msg_inc_istreambuf,
-    // forward_list
-    __msg_insert_after_end,
-    __msg_erase_after_bad,
-    __msg_valid_range2,
-    // unordered container local iterators
-    __msg_local_iter_compare_bad,
-    __msg_non_empty_range,
-    // self move assign
-    __msg_self_move_assign,
-    // unordered container buckets
-    __msg_bucket_index_oob,
-    __msg_valid_load_factor,
-    // others
-    __msg_equal_allocs,
-    __msg_insert_range_from_self
-  };
-
-  class _Error_formatter
-  {
-    /// Whether an iterator is constant, mutable, or unknown
-    enum _Constness
-    {
-      __unknown_constness,
-      __const_iterator,
-      __mutable_iterator,
-      __last_constness
-    };
-
-    // The state of the iterator (fine-grained), if we know it.
-    enum _Iterator_state
-    {
-      __unknown_state,
-      __singular,      // singular, may still be attached to a sequence
-      __begin,         // dereferenceable, and at the beginning
-      __middle,        // dereferenceable, not at the beginning
-      __end,           // past-the-end, may be at beginning if sequence empty
-      __before_begin,  // before begin
-      __last_state
-    };
-
-    // Tags denoting the type of parameter for construction
-    struct _Is_iterator { };
-    struct _Is_sequence { };
-
-    // A parameter that may be referenced by an error message
-    struct _Parameter
-    {
-      enum
-      {
-	__unused_param,
-	__iterator,
-	__sequence,
-	__integer,
-	__string
-      } _M_kind;
-
-      union
-      {
-	// When _M_kind == __iterator
-	struct
-	{
-	  const char*      _M_name;
-	  const void*      _M_address;
-	  const type_info* _M_type;
-	  _Constness       _M_constness;
-	  _Iterator_state  _M_state;
-	  const void*      _M_sequence;
-	  const type_info* _M_seq_type;
-	} _M_iterator;
-
-	// When _M_kind == __sequence
-	struct
-	{
-	  const char*      _M_name;
-	  const void*      _M_address;
-	  const type_info* _M_type;
-	} _M_sequence;
-
-	// When _M_kind == __integer
-	struct
-	{
-	  const char* _M_name;
-	  long        _M_value;
-	} _M_integer;
-
-	// When _M_kind == __string
-	struct
-	{
-	  const char* _M_name;
-	  const char* _M_value;
-	} _M_string;
-      } _M_variant;
-
-      _Parameter() : _M_kind(__unused_param), _M_variant() { }
-
-      _Parameter(long __value, const char* __name) 
-      : _M_kind(__integer), _M_variant()
-      {
-	_M_variant._M_integer._M_name = __name;
-	_M_variant._M_integer._M_value = __value;
-      }
-
-      _Parameter(const char* __value, const char* __name) 
-      : _M_kind(__string), _M_variant()
-      {
-	_M_variant._M_string._M_name = __name;
-	_M_variant._M_string._M_value = __value;
-      }
-
-      template<typename _Iterator, typename _Sequence>
-        _Parameter(const _Safe_iterator<_Iterator, _Sequence>& __it,
-		   const char* __name, _Is_iterator)
-	: _M_kind(__iterator),  _M_variant()
-        {
-	  _M_variant._M_iterator._M_name = __name;
-	  _M_variant._M_iterator._M_address = &__it;
-#if __cpp_rtti
-	  _M_variant._M_iterator._M_type = &typeid(__it);
-#else
-	  _M_variant._M_iterator._M_type = 0;
-#endif
-	  _M_variant._M_iterator._M_constness =
-	    std::__are_same<_Safe_iterator<_Iterator, _Sequence>,
-	                    typename _Sequence::iterator>::
-	      __value ? __mutable_iterator : __const_iterator;
-	  _M_variant._M_iterator._M_sequence = __it._M_get_sequence();
-#if __cpp_rtti
-	  _M_variant._M_iterator._M_seq_type = &typeid(_Sequence);
-#else
-	  _M_variant._M_iterator._M_seq_type = 0;
-#endif
-
-	  if (__it._M_singular())
-	    _M_variant._M_iterator._M_state = __singular;
-	  else
-	    {
-	      if (__it._M_is_before_begin())
-		_M_variant._M_iterator._M_state = __before_begin;
-	      else if (__it._M_is_end())
-		_M_variant._M_iterator._M_state = __end;
-	      else if (__it._M_is_begin())
-		_M_variant._M_iterator._M_state = __begin;
-	      else
-		_M_variant._M_iterator._M_state = __middle;
-	    }
-	}
-
-      template<typename _Iterator, typename _Sequence>
-	_Parameter(const _Safe_local_iterator<_Iterator, _Sequence>& __it,
-		   const char* __name, _Is_iterator)
-	: _M_kind(__iterator),  _M_variant()
-	{
-	  _M_variant._M_iterator._M_name = __name;
-	  _M_variant._M_iterator._M_address = &__it;
-#if __cpp_rtti
-	  _M_variant._M_iterator._M_type = &typeid(__it);
-#else
-	  _M_variant._M_iterator._M_type = 0;
-#endif
-	  _M_variant._M_iterator._M_constness =
-	    std::__are_same<_Safe_local_iterator<_Iterator, _Sequence>,
-	                    typename _Sequence::local_iterator>::
-	      __value ? __mutable_iterator : __const_iterator;
-	  _M_variant._M_iterator._M_sequence = __it._M_get_sequence();
-#if __cpp_rtti
-	  _M_variant._M_iterator._M_seq_type = &typeid(_Sequence);
-#else
-	  _M_variant._M_iterator._M_seq_type = 0;
-#endif
-
-	  if (__it._M_singular())
-	    _M_variant._M_iterator._M_state = __singular;
-	  else
-	    {
-	      if (__it._M_is_end())
-		_M_variant._M_iterator._M_state = __end;
-	      else if (__it._M_is_begin())
-		_M_variant._M_iterator._M_state = __begin;
-	      else
-		_M_variant._M_iterator._M_state = __middle;
-	    }
-	}
-
-      template<typename _Type>
-        _Parameter(const _Type*& __it, const char* __name, _Is_iterator)
-        : _M_kind(__iterator), _M_variant()
-        {
-	  _M_variant._M_iterator._M_name = __name;
-	  _M_variant._M_iterator._M_address = &__it;
-#if __cpp_rtti
-	  _M_variant._M_iterator._M_type = &typeid(__it);
-#else
-	  _M_variant._M_iterator._M_type = 0;
-#endif
-	  _M_variant._M_iterator._M_constness = __mutable_iterator;
-	  _M_variant._M_iterator._M_state = __it? __unknown_state : __singular;
-	  _M_variant._M_iterator._M_sequence = 0;
-	  _M_variant._M_iterator._M_seq_type = 0;
-	}
-
-      template<typename _Type>
-        _Parameter(_Type*& __it, const char* __name, _Is_iterator)
-        : _M_kind(__iterator), _M_variant()
-        {
-	  _M_variant._M_iterator._M_name = __name;
-	  _M_variant._M_iterator._M_address = &__it;
-#if __cpp_rtti
-	  _M_variant._M_iterator._M_type = &typeid(__it);
-#else
-	  _M_variant._M_iterator._M_type = 0;
-#endif
-	  _M_variant._M_iterator._M_constness = __const_iterator;
-	  _M_variant._M_iterator._M_state = __it? __unknown_state : __singular;
-	  _M_variant._M_iterator._M_sequence = 0;
-	  _M_variant._M_iterator._M_seq_type = 0;
-	}
-
-      template<typename _Iterator>
-        _Parameter(const _Iterator& __it, const char* __name, _Is_iterator)
-        : _M_kind(__iterator), _M_variant()
-        {
-	  _M_variant._M_iterator._M_name = __name;
-	  _M_variant._M_iterator._M_address = &__it;
-#if __cpp_rtti
-	  _M_variant._M_iterator._M_type = &typeid(__it);
-#else
-	  _M_variant._M_iterator._M_type = 0;
-#endif
-	  _M_variant._M_iterator._M_constness = __unknown_constness;
-	  _M_variant._M_iterator._M_state =
-	    __gnu_debug::__check_singular(__it)? __singular : __unknown_state;
-	  _M_variant._M_iterator._M_sequence = 0;
-	  _M_variant._M_iterator._M_seq_type = 0;
-	}
-
-      template<typename _Sequence>
-        _Parameter(const _Safe_sequence<_Sequence>& __seq,
-		   const char* __name, _Is_sequence)
-        : _M_kind(__sequence), _M_variant()
-        {
-	  _M_variant._M_sequence._M_name = __name;
-	  _M_variant._M_sequence._M_address =
-	    static_cast<const _Sequence*>(&__seq);
-#if __cpp_rtti
-	  _M_variant._M_sequence._M_type = &typeid(_Sequence);
-#else
-	  _M_variant._M_sequence._M_type = 0;
-#endif
-	}
-
-      template<typename _Sequence>
-        _Parameter(const _Sequence& __seq, const char* __name, _Is_sequence)
-        : _M_kind(__sequence), _M_variant()
-        {
-	  _M_variant._M_sequence._M_name = __name;
-	  _M_variant._M_sequence._M_address = &__seq;
-#if __cpp_rtti
-	  _M_variant._M_sequence._M_type = &typeid(_Sequence);
-#else
-	  _M_variant._M_sequence._M_type = 0;
-#endif
-	}
-
-      void
-      _M_print_field(const _Error_formatter* __formatter,
-		     const char* __name) const;
-
-      void
-      _M_print_description(const _Error_formatter* __formatter) const;
-    };
-
-    friend struct _Parameter;
-
-  public:
-    template<typename _Iterator>
-      const _Error_formatter&
-      _M_iterator(const _Iterator& __it, const char* __name = 0)  const
-      {
-	if (_M_num_parameters < std::size_t(__max_parameters))
-	  _M_parameters[_M_num_parameters++] = _Parameter(__it, __name,
-							  _Is_iterator());
-	return *this;
-      }
-
-    const _Error_formatter&
-    _M_integer(long __value, const char* __name = 0) const
-    {
-      if (_M_num_parameters < std::size_t(__max_parameters))
-	_M_parameters[_M_num_parameters++] = _Parameter(__value, __name);
-      return *this;
-    }
-
-    const _Error_formatter&
-    _M_string(const char* __value, const char* __name = 0) const
-    {
-      if (_M_num_parameters < std::size_t(__max_parameters))
-	_M_parameters[_M_num_parameters++] = _Parameter(__value, __name);
-      return *this;
-    }
-
-    template<typename _Sequence>
-      const _Error_formatter&
-      _M_sequence(const _Sequence& __seq, const char* __name = 0) const
-      {
-	if (_M_num_parameters < std::size_t(__max_parameters))
-	  _M_parameters[_M_num_parameters++] = _Parameter(__seq, __name,
-							  _Is_sequence());
-	return *this;
-      }
-
-    const _Error_formatter&
-    _M_message(const char* __text) const
-    { _M_text = __text; return *this; }
-
-    const _Error_formatter&
-    _M_message(_Debug_msg_id __id) const throw ();
-
-    _GLIBCXX_NORETURN void
-    _M_error() const;
-
-  private:
-    _Error_formatter(const char* __file, std::size_t __line)
-    : _M_file(__file), _M_line(__line), _M_num_parameters(0), _M_text(0),
-      _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false)
-    { _M_get_max_length(); }
-
-    template<typename _Tp>
-      void
-      _M_format_word(char*, int, const char*, _Tp) const throw ();
-
-    void
-    _M_print_word(const char* __word) const;
-
-    void
-    _M_print_string(const char* __string) const;
-
-    void
-    _M_get_max_length() const throw ();
-
-    enum { __max_parameters = 9 };
-
-    const char*         _M_file;
-    std::size_t         _M_line;
-    mutable _Parameter  _M_parameters[__max_parameters];
-    mutable std::size_t _M_num_parameters;
-    mutable const char* _M_text;
-    mutable std::size_t _M_max_length;
-    enum { _M_indent = 4 } ;
-    mutable std::size_t _M_column;
-    mutable bool        _M_first_line;
-    mutable bool        _M_wordwrap;
-
-  public:
-    static _Error_formatter
-    _M_at(const char* __file, std::size_t __line)
-    { return _Error_formatter(__file, __line); }
-  };
-} // namespace __gnu_debug
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/forward_list b/openflow/usr/include/c++/5/debug/forward_list
deleted file mode 100644
index 0f09d23..0000000
--- a/openflow/usr/include/c++/5/debug/forward_list
+++ /dev/null
@@ -1,827 +0,0 @@
-// <forward_list> -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/forward_list
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_FORWARD_LIST
-#define _GLIBCXX_DEBUG_FORWARD_LIST 1
-
-#pragma GCC system_header
-
-#include <forward_list>
-#include <debug/safe_sequence.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug
-{
-  /// Special iterators swap and invalidation for forward_list because of the
-  /// before_begin iterator.
-  template<typename _SafeSequence>
-    class _Safe_forward_list
-    : public _Safe_sequence<_SafeSequence>
-    {
-      _SafeSequence&
-      _M_this() noexcept
-      { return *static_cast<_SafeSequence*>(this); }
-
-      static void
-      _M_swap_aux(_Safe_sequence_base& __lhs,
-		  _Safe_iterator_base*& __lhs_iterators,
-		  _Safe_sequence_base& __rhs,
-		  _Safe_iterator_base*& __rhs_iterators);
-
-      void _M_swap_single(_Safe_sequence_base&) noexcept;
-
-    protected:
-      void
-      _M_invalidate_all()
-      {
-	using _Base_const_iterator = __decltype(_M_this()._M_base().cend());
-	this->_M_invalidate_if([this](_Base_const_iterator __it)
-	{
-	  return __it != _M_this()._M_base().cbefore_begin()
-	    && __it != _M_this()._M_base().cend(); });
-      }
-
-      void _M_swap(_Safe_sequence_base&) noexcept;
-    };
-
-   template<typename _SafeSequence>
-    void
-    _Safe_forward_list<_SafeSequence>::
-    _M_swap_aux(_Safe_sequence_base& __lhs,
-		_Safe_iterator_base*& __lhs_iterators,
-		_Safe_sequence_base& __rhs,
-		_Safe_iterator_base*& __rhs_iterators)
-    {
-      using const_iterator = typename _SafeSequence::const_iterator;
-      _Safe_iterator_base* __bbegin_its = 0;
-      _Safe_iterator_base* __last_bbegin = 0;
-      _SafeSequence& __rseq = static_cast<_SafeSequence&>(__rhs);
-
-      for (_Safe_iterator_base* __iter = __lhs_iterators; __iter;)
-	{
-	  // Even iterator is cast to const_iterator, not a problem.
-	  _Safe_iterator_base* __victim_base = __iter;
-	  const_iterator* __victim =
-	    static_cast<const_iterator*>(__victim_base);
-	  __iter = __iter->_M_next;
-	  if (__victim->base() == __rseq._M_base().cbefore_begin())
-	    {
-	      __victim->_M_unlink();
-	      if (__lhs_iterators == __victim_base)
-		__lhs_iterators = __victim_base->_M_next;
-	      if (__bbegin_its)
-		{
-		  __victim_base->_M_next = __bbegin_its;
-		  __bbegin_its->_M_prior = __victim_base;
-		}
-	      else
-		__last_bbegin = __victim_base;
-	      __bbegin_its = __victim_base;
-	    }
-	  else
-	    __victim_base->_M_sequence = &__lhs;
-	}
-
-      if (__bbegin_its)
-	{
-	  if (__rhs_iterators)
-	    {
-	      __rhs_iterators->_M_prior = __last_bbegin;
-	      __last_bbegin->_M_next = __rhs_iterators;
-	    }
-	  __rhs_iterators = __bbegin_its;
-	}
-    }
-
-   template<typename _SafeSequence>
-    void
-    _Safe_forward_list<_SafeSequence>::
-    _M_swap_single(_Safe_sequence_base& __other) noexcept
-    {
-      std::swap(_M_this()._M_iterators, __other._M_iterators);
-      std::swap(_M_this()._M_const_iterators, __other._M_const_iterators);
-      // Useless, always 1 on forward_list
-      //std::swap(_M_this()_M_version, __other._M_version);
-      _Safe_iterator_base* __this_its = _M_this()._M_iterators;
-      _M_swap_aux(__other, __other._M_iterators,
-		  _M_this(), _M_this()._M_iterators);
-      _Safe_iterator_base* __this_const_its = _M_this()._M_const_iterators;
-      _M_swap_aux(__other, __other._M_const_iterators,
-		  _M_this(), _M_this()._M_const_iterators);
-      _M_swap_aux(_M_this(), __this_its,
-		  __other, __other._M_iterators);
-      _M_swap_aux(_M_this(), __this_const_its,
-		  __other, __other._M_const_iterators);
-    }
-
-  /* Special forward_list _M_swap version that does not swap the
-   * before-begin ownership.*/
-   template<typename _SafeSequence>
-    void
-    _Safe_forward_list<_SafeSequence>::
-    _M_swap(_Safe_sequence_base& __other) noexcept
-    {
-      // We need to lock both sequences to swap
-      using namespace __gnu_cxx;
-      __mutex *__this_mutex = &_M_this()._M_get_mutex();
-      __mutex *__other_mutex =
-	&static_cast<_SafeSequence&>(__other)._M_get_mutex();
-      if (__this_mutex == __other_mutex)
-	{
-	  __scoped_lock __lock(*__this_mutex);
-	  _M_swap_single(__other);
-	}
-      else
-	{
-	  __scoped_lock __l1(__this_mutex < __other_mutex
-			     ? *__this_mutex : *__other_mutex);
-	  __scoped_lock __l2(__this_mutex < __other_mutex
-			     ? *__other_mutex : *__this_mutex);
-	  _M_swap_single(__other);
-	}
-    }
-}
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::forward_list with safety/checking/debug instrumentation.
-  template<typename _Tp, typename _Alloc = std::allocator<_Tp> >
-    class forward_list
-    : public __gnu_debug::_Safe_container<
-	forward_list<_Tp, _Alloc>, _Alloc, __gnu_debug::_Safe_forward_list>,
-      public _GLIBCXX_STD_C::forward_list<_Tp, _Alloc>
-    {
-      typedef _GLIBCXX_STD_C::forward_list<_Tp, _Alloc>		_Base;
-      typedef __gnu_debug::_Safe_container<
-	forward_list, _Alloc, __gnu_debug::_Safe_forward_list>	_Safe;
-
-      typedef typename _Base::iterator		_Base_iterator;
-      typedef typename _Base::const_iterator	_Base_const_iterator;
-
-    public:
-      typedef typename _Base::reference		reference;
-      typedef typename _Base::const_reference	const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_iterator, forward_list>		iterator;
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_const_iterator, forward_list>	const_iterator;
-
-      typedef typename _Base::size_type		size_type;
-      typedef typename _Base::difference_type	difference_type;
-
-      typedef _Tp				value_type;
-      typedef typename _Base::allocator_type	allocator_type;
-      typedef typename _Base::pointer		pointer;
-      typedef typename _Base::const_pointer	const_pointer;
-
-      // 23.2.3.1 construct/copy/destroy:
-      explicit
-      forward_list(const allocator_type& __al = allocator_type())
-      : _Base(__al) { }
-
-      forward_list(const forward_list& __list, const allocator_type& __al)
-      : _Base(__list, __al)
-      { }
-
-      forward_list(forward_list&& __list, const allocator_type& __al)
-	: _Safe(std::move(__list._M_safe()), __al),
-	  _Base(std::move(__list._M_base()), __al)
-      { }
-
-      explicit
-      forward_list(size_type __n, const allocator_type& __al = allocator_type())
-      : _Base(__n, __al)
-      { }
-
-      forward_list(size_type __n, const _Tp& __value,
-		   const allocator_type& __al = allocator_type())
-      : _Base(__n, __value, __al)
-      { }
-
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	forward_list(_InputIterator __first, _InputIterator __last,
-		     const allocator_type& __al = allocator_type())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __al)
-	{ }
-
-      forward_list(const forward_list&) = default;
-
-      forward_list(forward_list&&) = default;
-
-      forward_list(std::initializer_list<_Tp> __il,
-		   const allocator_type& __al = allocator_type())
-      : _Base(__il, __al)
-      { }
-
-      ~forward_list() = default;
-
-      forward_list&
-      operator=(const forward_list&) = default;
-
-      forward_list&
-      operator=(forward_list&&) = default;
-
-      forward_list&
-      operator=(std::initializer_list<_Tp> __il)
-      {
-	_M_base() = __il;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	void
-	assign(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::assign(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	  this->_M_invalidate_all();
-	}
-
-      void
-      assign(size_type __n, const _Tp& __val)
-      {
-	_Base::assign(__n, __val);
-	this->_M_invalidate_all();
-      }
-
-      void
-      assign(std::initializer_list<_Tp> __il)
-      {
-	_Base::assign(__il);
-	this->_M_invalidate_all();
-      }
-
-      using _Base::get_allocator;
-
-      // iterators:
-
-      iterator
-      before_begin() noexcept
-      { return iterator(_Base::before_begin(), this); }
-
-      const_iterator
-      before_begin() const noexcept
-      { return const_iterator(_Base::before_begin(), this); }
-
-      iterator
-      begin() noexcept
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() noexcept
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::cbegin(), this); }
-
-      const_iterator
-      cbefore_begin() const noexcept
-      { return const_iterator(_Base::cbefore_begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::cend(), this); }
-
-      using _Base::empty;
-      using _Base::max_size;
-
-      // element access:
-
-      reference
-      front()
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      const_reference
-      front() const
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      // modifiers:
-
-      using _Base::emplace_front;
-      using _Base::push_front;
-
-      void
-      pop_front()
-      {
-	__glibcxx_check_nonempty();
-	this->_M_invalidate_if([this](_Base_const_iterator __it)
-	  { return __it == this->_M_base().cbegin(); });
-	_Base::pop_front();
-      }
-
-      template<typename... _Args>
-	iterator
-	emplace_after(const_iterator __pos, _Args&&... __args)
-	{
-	  __glibcxx_check_insert_after(__pos);
-	  return iterator(_Base::emplace_after(__pos.base(),
-					std::forward<_Args>(__args)...),
-			  this);
-       	}
-
-      iterator
-      insert_after(const_iterator __pos, const _Tp& __val)
-      {
-	__glibcxx_check_insert_after(__pos);
-	return iterator(_Base::insert_after(__pos.base(), __val), this);
-      }
-
-      iterator
-      insert_after(const_iterator __pos, _Tp&& __val)
-      {
-	__glibcxx_check_insert_after(__pos);
-	return iterator(_Base::insert_after(__pos.base(), std::move(__val)),
-		       	this);
-      }
-
-      iterator
-      insert_after(const_iterator __pos, size_type __n, const _Tp& __val)
-      {
-	__glibcxx_check_insert_after(__pos);
-	return iterator(_Base::insert_after(__pos.base(), __n, __val),
-		       	this);
-      }
-
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	iterator
-	insert_after(const_iterator __pos,
-		     _InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_insert_range_after(__pos, __first, __last);
-	  return iterator(_Base::insert_after(__pos.base(),
-					      __gnu_debug::__base(__first),
-					      __gnu_debug::__base(__last)),
-			  this);
-	}
-
-      iterator
-      insert_after(const_iterator __pos, std::initializer_list<_Tp> __il)
-      {
-	__glibcxx_check_insert_after(__pos);
-	return iterator(_Base::insert_after(__pos.base(), __il), this);
-      }
-
-    private:
-      _Base_iterator
-      _M_erase_after(_Base_const_iterator __pos)
-      {
-	_Base_const_iterator __next = std::next(__pos);
-	this->_M_invalidate_if([__next](_Base_const_iterator __it)
-	  { return __it == __next; });
-	return _Base::erase_after(__pos);
-      }
-    public:
-      iterator
-      erase_after(const_iterator __pos)
-      {
-	__glibcxx_check_erase_after(__pos);
-	return iterator(_M_erase_after(__pos.base()), this);
-      }
-
-      iterator
-      erase_after(const_iterator __pos, const_iterator __last)
-      {
-	__glibcxx_check_erase_range_after(__pos, __last);
-	for (_Base_const_iterator __victim = std::next(__pos.base());
-	    __victim != __last.base(); ++__victim)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range2)
-				  ._M_sequence(*this, "this")
-				  ._M_iterator(__pos, "pos")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if([__victim](_Base_const_iterator __it)
-	      { return __it == __victim; });
-	  }
-	return iterator(_Base::erase_after(__pos.base(), __last.base()), this);
-      }
-
-      void
-      swap(forward_list& __list)
-	noexcept( noexcept(declval<_Base>().swap(__list)) )
-      {
-	_Safe::_M_swap(__list);
-	_Base::swap(__list);
-      }
-
-      void
-      resize(size_type __sz)
-      {
-	this->_M_detach_singular();
-
-	// if __sz < size(), invalidate all iterators in [begin+__sz, end()
-	_Base_iterator __victim = _Base::begin();
-	_Base_iterator __end = _Base::end();
-	for (size_type __i = __sz; __victim != __end && __i > 0; --__i)
-	  ++__victim;
-
-	for (; __victim != __end; ++__victim)
-	  {
-	    this->_M_invalidate_if([__victim](_Base_const_iterator __it)
-	      { return __it == __victim; });
-	  }
-
-	__try
-	  {
-	    _Base::resize(__sz);
-	  }
-	__catch(...)
-	  {
-	    this->_M_revalidate_singular();
-	    __throw_exception_again;
-	  }
-      }
-
-      void
-      resize(size_type __sz, const value_type& __val)
-      {
-	this->_M_detach_singular();
-
-	// if __sz < size(), invalidate all iterators in [begin+__sz, end())
-	_Base_iterator __victim = _Base::begin();
-	_Base_iterator __end = _Base::end();
-	for (size_type __i = __sz; __victim != __end && __i > 0; --__i)
-	  ++__victim;
-
-	for (; __victim != __end; ++__victim)
-	  {
-	    this->_M_invalidate_if([__victim](_Base_const_iterator __it)
-	      { return __it == __victim; });
-	  }
-
-	__try
-	  {
-	    _Base::resize(__sz, __val);
-	  }
-	__catch(...)
-	  {
-	    this->_M_revalidate_singular();
-	    __throw_exception_again;
-	  }
-      }
-
-      void
-      clear() noexcept
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      // 23.2.3.5 forward_list operations:
-      void
-      splice_after(const_iterator __pos, forward_list&& __list)
-      {
-	__glibcxx_check_insert_after(__pos);
-	_GLIBCXX_DEBUG_VERIFY(&__list != this,
-			      _M_message(__gnu_debug::__msg_self_splice)
-			      ._M_sequence(*this, "this"));
-	_GLIBCXX_DEBUG_VERIFY(__list.get_allocator() == this->get_allocator(),
-			      _M_message(__gnu_debug::__msg_splice_alloc)
-			      ._M_sequence(*this)
-			      ._M_sequence(__list, "__list"));
-	this->_M_transfer_from_if(__list, [&__list](_Base_const_iterator __it)
-	  {
-	    return __it != __list._M_base().cbefore_begin()
-		   && __it != __list._M_base().end();
-	  });
-	_Base::splice_after(__pos.base(), std::move(__list._M_base()));
-      }
-
-      void
-      splice_after(const_iterator __pos, forward_list& __list)
-      { splice_after(__pos, std::move(__list)); }
-
-      void
-      splice_after(const_iterator __pos, forward_list&& __list,
-		   const_iterator __i)
-      {
-	__glibcxx_check_insert_after(__pos);
-	_GLIBCXX_DEBUG_VERIFY(__i._M_before_dereferenceable(),
-			      _M_message(__gnu_debug::__msg_splice_bad)
-			      ._M_iterator(__i, "__i"));
-	_GLIBCXX_DEBUG_VERIFY(__i._M_attached_to(&__list),
-			      _M_message(__gnu_debug::__msg_splice_other)
-			      ._M_iterator(__i, "__i")
-			      ._M_sequence(__list, "__list"));
-	_GLIBCXX_DEBUG_VERIFY(__list.get_allocator() == this->get_allocator(),
-			      _M_message(__gnu_debug::__msg_splice_alloc)
-			      ._M_sequence(*this)
-			      ._M_sequence(__list, "__list"));
-
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 250. splicing invalidates iterators
-	_Base_const_iterator __next = std::next(__i.base());
-	this->_M_transfer_from_if(__list, [__next](_Base_const_iterator __it)
-	  { return __it == __next; });
-	_Base::splice_after(__pos.base(), std::move(__list._M_base()),
-			    __i.base());
-      }
-
-      void
-      splice_after(const_iterator __pos, forward_list& __list,
-		   const_iterator __i)
-      { splice_after(__pos, std::move(__list), __i); }
-
-      void
-      splice_after(const_iterator __pos, forward_list&& __list,
-		   const_iterator __before, const_iterator __last)
-      {
-	__glibcxx_check_insert_after(__pos);
-	__glibcxx_check_valid_range(__before, __last);
-	_GLIBCXX_DEBUG_VERIFY(__before._M_attached_to(&__list),
-			      _M_message(__gnu_debug::__msg_splice_other)
-			      ._M_sequence(__list, "list")
-			      ._M_iterator(__before, "before"));
-	_GLIBCXX_DEBUG_VERIFY(__before._M_dereferenceable()
-			      || __before._M_is_before_begin(),
-			      _M_message(__gnu_debug::__msg_valid_range2)
-			      ._M_sequence(__list, "list")
-			      ._M_iterator(__before, "before")
-			      ._M_iterator(__last, "last"));
-	_GLIBCXX_DEBUG_VERIFY(__before != __last,
-			      _M_message(__gnu_debug::__msg_valid_range2)
-			      ._M_sequence(__list, "list")
-			      ._M_iterator(__before, "before")
-			      ._M_iterator(__last, "last"));
-	_GLIBCXX_DEBUG_VERIFY(__list.get_allocator() == this->get_allocator(),
-			      _M_message(__gnu_debug::__msg_splice_alloc)
-			      ._M_sequence(*this)
-			      ._M_sequence(__list, "__list"));
-
-	for (_Base_const_iterator __tmp = std::next(__before.base());
-	     __tmp != __last.base(); ++__tmp)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__tmp != __list._M_base().end(),
-				  _M_message(__gnu_debug::__msg_valid_range2)
-				  ._M_sequence(__list, "list")
-				  ._M_iterator(__before, "before")
-				  ._M_iterator(__last, "last"));
-	    _GLIBCXX_DEBUG_VERIFY(&__list != this || __tmp != __pos.base(),
-				  _M_message(__gnu_debug::__msg_splice_overlap)
-				  ._M_iterator(__tmp, "position")
-				  ._M_iterator(__before, "before")
-				  ._M_iterator(__last, "last"));
-	    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	    // 250. splicing invalidates iterators
-	    this->_M_transfer_from_if(__list, [__tmp](_Base_const_iterator __it)
-	      { return __it == __tmp; });
-	  }
-
-	_Base::splice_after(__pos.base(), std::move(__list._M_base()),
-			    __before.base(), __last.base());
-      }
-
-      void
-      splice_after(const_iterator __pos, forward_list& __list,
-		   const_iterator __before, const_iterator __last)
-      { splice_after(__pos, std::move(__list), __before, __last); }
-
-      void
-      remove(const _Tp& __val)
-      {
-	_Base_iterator __x = _Base::before_begin();
-	_Base_iterator __old = __x++;
-	while (__x != _Base::end())
-	  {
-	    if (*__x == __val)
-	      __x = _M_erase_after(__old);
-	    else
-	      __old = __x++;
-	  }
-      }
-
-      template<typename _Pred>
-	void
-	remove_if(_Pred __pred)
-	{
-	  _Base_iterator __x = _Base::before_begin();
-	  _Base_iterator __old = __x++;
-	  while (__x != _Base::end())
-	    {
-	      if (__pred(*__x))
-		__x = _M_erase_after(__old);
-	      else
-		__old = __x++;
-	    }
-	}
-
-      void
-      unique()
-      {
-	_Base_iterator __first = _Base::begin();
-	_Base_iterator __last = _Base::end();
-	if (__first == __last)
-	  return;
-	_Base_iterator __next = std::next(__first);
-	while (__next != __last)
-	  {
-	    if (*__first == *__next)
-	      __next = _M_erase_after(__first);
-	    else
-	      __first = __next++;
-	  }
-      }
-
-      template<typename _BinPred>
-	void
-	unique(_BinPred __binary_pred)
-	{
-	  _Base_iterator __first = _Base::begin();
-	  _Base_iterator __last = _Base::end();
-	  if (__first == __last)
-	    return;
-	  _Base_iterator __next = std::next(__first);
-	  while (__next != __last)
-	    {
-	      if (__binary_pred(*__first, *__next))
-		__next = _M_erase_after(__first);
-	      else
-		__first = __next++;
-	    }
-	}
-
-      void
-      merge(forward_list&& __list)
-      {
-	if (this != &__list)
-	{
-	  __glibcxx_check_sorted(_Base::begin(), _Base::end());
-	  __glibcxx_check_sorted(__list._M_base().begin(),
-				 __list._M_base().end());
-	  this->_M_transfer_from_if(__list, [&__list](_Base_const_iterator __it)
-	    {
-	      return __it != __list._M_base().cbefore_begin()
-		     && __it != __list._M_base().cend();
-	    });
-	  _Base::merge(std::move(__list._M_base()));
-	}
-      }
-
-      void
-      merge(forward_list& __list)
-      { merge(std::move(__list)); }
-
-      template<typename _Comp>
-	void
-	merge(forward_list&& __list, _Comp __comp)
-	{
-	  if (this != &__list)
-	  {
-	    __glibcxx_check_sorted_pred(_Base::begin(), _Base::end(), __comp);
-	    __glibcxx_check_sorted_pred(__list._M_base().begin(),
-					__list._M_base().end(), __comp);
-	    this->_M_transfer_from_if(__list,
-				      [&__list](_Base_const_iterator __it)
-	      {
-		return __it != __list._M_base().cbefore_begin()
-		       && __it != __list._M_base().cend();
-	      });
-	    _Base::merge(std::move(__list._M_base()), __comp);
-	  }
-	}
-
-      template<typename _Comp>
-	void
-	merge(forward_list& __list, _Comp __comp)
-	{ merge(std::move(__list), __comp); }
-
-      using _Base::sort;
-      using _Base::reverse;
-
-      _Base&
-      _M_base() noexcept { return *this; }
-
-      const _Base&
-      _M_base() const noexcept { return *this; }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    bool
-    operator==(const forward_list<_Tp, _Alloc>& __lx,
-	       const forward_list<_Tp, _Alloc>& __ly)
-    { return __lx._M_base() == __ly._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const forward_list<_Tp, _Alloc>& __lx,
-	      const forward_list<_Tp, _Alloc>& __ly)
-    { return __lx._M_base() < __ly._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const forward_list<_Tp, _Alloc>& __lx,
-	       const forward_list<_Tp, _Alloc>& __ly)
-    { return !(__lx == __ly); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const forward_list<_Tp, _Alloc>& __lx,
-	      const forward_list<_Tp, _Alloc>& __ly)
-    { return (__ly < __lx); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const forward_list<_Tp, _Alloc>& __lx,
-	       const forward_list<_Tp, _Alloc>& __ly)
-    { return !(__lx < __ly); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const forward_list<_Tp, _Alloc>& __lx,
-	       const forward_list<_Tp, _Alloc>& __ly)
-    { return !(__ly < __lx); }
-
-  /// See std::forward_list::swap().
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(forward_list<_Tp, _Alloc>& __lx,
-	 forward_list<_Tp, _Alloc>& __ly)
-    { __lx.swap(__ly); }
-
-} // namespace __debug
-} // namespace std
-
-namespace __gnu_debug
-{
-  template<class _Tp, class _Alloc>
-    struct _BeforeBeginHelper<std::__debug::forward_list<_Tp, _Alloc> >
-    {
-      typedef std::__debug::forward_list<_Tp, _Alloc> _Sequence;
-
-      template<typename _Iterator>
-	static bool
-	_S_Is(const _Safe_iterator<_Iterator, _Sequence>& __it)
-	{
-	  return
-	    __it.base() == __it._M_get_sequence()->_M_base().before_begin();
-	}
-
-      template<typename _Iterator>
-	static bool
-	_S_Is_Beginnest(const _Safe_iterator<_Iterator, _Sequence>& __it)
-	{ return _S_Is(__it); }
-    };
-
-#ifndef _GLIBCXX_DEBUG_PEDANTIC
-  template<class _Tp, class _Alloc>
-    struct _Insert_range_from_self_is_safe<
-      std::__debug::forward_list<_Tp, _Alloc> >
-    { enum { __value = 1 }; };
-#endif
-}
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/functions.h b/openflow/usr/include/c++/5/debug/functions.h
deleted file mode 100644
index 3bbbd13..0000000
--- a/openflow/usr/include/c++/5/debug/functions.h
+++ /dev/null
@@ -1,562 +0,0 @@
-// Debugging support implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/functions.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_FUNCTIONS_H
-#define _GLIBCXX_DEBUG_FUNCTIONS_H 1
-
-#include <bits/c++config.h>
-#include <bits/stl_iterator_base_types.h> // for iterator_traits, categories and
-					  // _Iter_base
-#include <bits/cpp_type_traits.h>	  // for __is_integer
-#include <bits/move.h>                    // for __addressof and addressof
-#include <bits/stl_function.h>		  // for less
-#if __cplusplus >= 201103L
-# include <type_traits>			  // for is_lvalue_reference and __and_
-#endif
-#include <debug/formatter.h>
-
-namespace __gnu_debug
-{
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_iterator;
-
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_local_iterator;
-
-  template<typename _Sequence>
-    struct _Insert_range_from_self_is_safe
-    { enum { __value = 0 }; };
-
-  template<typename _Sequence>
-    struct _Is_contiguous_sequence : std::__false_type { };
-
-  // An arbitrary iterator pointer is not singular.
-  inline bool
-  __check_singular_aux(const void*) { return false; }
-
-  // We may have an iterator that derives from _Safe_iterator_base but isn't
-  // a _Safe_iterator.
-  template<typename _Iterator>
-    inline bool
-    __check_singular(const _Iterator& __x)
-    { return __check_singular_aux(&__x); }
-
-  /** Non-NULL pointers are nonsingular. */
-  template<typename _Tp>
-    inline bool
-    __check_singular(const _Tp* __ptr)
-    { return __ptr == 0; }
-
-  /** Assume that some arbitrary iterator is dereferenceable, because we
-      can't prove that it isn't. */
-  template<typename _Iterator>
-    inline bool
-    __check_dereferenceable(const _Iterator&)
-    { return true; }
-
-  /** Non-NULL pointers are dereferenceable. */
-  template<typename _Tp>
-    inline bool
-    __check_dereferenceable(const _Tp* __ptr)
-    { return __ptr; }
-
-  /** Safe iterators know if they are dereferenceable. */
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    __check_dereferenceable(const _Safe_iterator<_Iterator, _Sequence>& __x)
-    { return __x._M_dereferenceable(); }
-
-  /** Safe local iterators know if they are dereferenceable. */
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    __check_dereferenceable(const _Safe_local_iterator<_Iterator,
-						       _Sequence>& __x)
-    { return __x._M_dereferenceable(); }
-
-  /** If the distance between two random access iterators is
-   *  nonnegative, assume the range is valid.
-  */
-  template<typename _RandomAccessIterator>
-    inline bool
-    __valid_range_aux2(const _RandomAccessIterator& __first,
-		       const _RandomAccessIterator& __last,
-		       std::random_access_iterator_tag)
-    { return __last - __first >= 0; }
-
-  /** Can't test for a valid range with input iterators, because
-   *  iteration may be destructive. So we just assume that the range
-   *  is valid.
-  */
-  template<typename _InputIterator>
-    inline bool
-    __valid_range_aux2(const _InputIterator&, const _InputIterator&,
-		       std::input_iterator_tag)
-    { return true; }
-
-  /** We say that integral types for a valid range, and defer to other
-   *  routines to realize what to do with integral types instead of
-   *  iterators.
-  */
-  template<typename _Integral>
-    inline bool
-    __valid_range_aux(const _Integral&, const _Integral&, std::__true_type)
-    { return true; }
-
-  /** We have iterators, so figure out what kind of iterators that are
-   *  to see if we can check the range ahead of time.
-  */
-  template<typename _InputIterator>
-    inline bool
-    __valid_range_aux(const _InputIterator& __first,
-		      const _InputIterator& __last, std::__false_type)
-    { return __valid_range_aux2(__first, __last,
-				std::__iterator_category(__first)); }
-
-  /** Don't know what these iterators are, or if they are even
-   *  iterators (we may get an integral type for InputIterator), so
-   *  see if they are integral and pass them on to the next phase
-   *  otherwise.
-  */
-  template<typename _InputIterator>
-    inline bool
-    __valid_range(const _InputIterator& __first, const _InputIterator& __last)
-    {
-      typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-      return __valid_range_aux(__first, __last, _Integral());
-    }
-
-  /** Safe iterators know how to check if they form a valid range. */
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    __valid_range(const _Safe_iterator<_Iterator, _Sequence>& __first,
-		  const _Safe_iterator<_Iterator, _Sequence>& __last)
-    { return __first._M_valid_range(__last); }
-
-  /** Safe local iterators know how to check if they form a valid range. */
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    __valid_range(const _Safe_local_iterator<_Iterator, _Sequence>& __first,
-		  const _Safe_local_iterator<_Iterator, _Sequence>& __last)
-    { return __first._M_valid_range(__last); }
-
-  /* Checks that [first, last) is a valid range, and then returns
-   * __first. This routine is useful when we can't use a separate
-   * assertion statement because, e.g., we are in a constructor.
-  */
-  template<typename _InputIterator>
-    inline _InputIterator
-    __check_valid_range(const _InputIterator& __first,
-			const _InputIterator& __last
-			__attribute__((__unused__)))
-    {
-      __glibcxx_check_valid_range(__first, __last);
-      return __first;
-    }
-
-  /* Handle the case where __other is a pointer to _Sequence::value_type. */
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    __foreign_iterator_aux4(const _Safe_iterator<_Iterator, _Sequence>& __it,
-			    const typename _Sequence::value_type* __other)
-    {
-      typedef const typename _Sequence::value_type* _PointerType;
-      typedef std::less<_PointerType> _Less;
-#if __cplusplus >= 201103L
-      constexpr _Less __l{};
-#else
-      const _Less __l = _Less();
-#endif
-      const _Sequence* __seq = __it._M_get_sequence();
-      const _PointerType __begin = std::__addressof(*__seq->_M_base().begin());
-      const _PointerType __end = std::__addressof(*(__seq->_M_base().end()-1));
-
-      // Check whether __other points within the contiguous storage.
-      return __l(__other, __begin) || __l(__end, __other);
-    }
-
-  /* Fallback overload for when we can't tell, assume it is valid. */
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    __foreign_iterator_aux4(const _Safe_iterator<_Iterator, _Sequence>&, ...)
-    { return true; }
-
-  /* Handle sequences with contiguous storage */
-  template<typename _Iterator, typename _Sequence, typename _InputIterator>
-    inline bool
-    __foreign_iterator_aux3(const _Safe_iterator<_Iterator, _Sequence>& __it,
-			    const _InputIterator& __other,
-			    const _InputIterator& __other_end,
-			    std::__true_type)
-    {
-      if (__other == __other_end)
-	return true;  // inserting nothing is safe even if not foreign iters
-      if (__it._M_get_sequence()->begin() == __it._M_get_sequence()->end())
-	return true;  // can't be self-inserting if self is empty
-      return __foreign_iterator_aux4(__it, std::__addressof(*__other));
-    }
-
-  /* Handle non-contiguous containers, assume it is valid. */
-  template<typename _Iterator, typename _Sequence, typename _InputIterator>
-    inline bool
-    __foreign_iterator_aux3(const _Safe_iterator<_Iterator, _Sequence>&,
-			    const _InputIterator&, const _InputIterator&,
-			    std::__false_type)
-    { return true; }
-
-  /** Handle debug iterators from the same type of container. */
-  template<typename _Iterator, typename _Sequence, typename _OtherIterator>
-    inline bool
-    __foreign_iterator_aux2(const _Safe_iterator<_Iterator, _Sequence>& __it,
-		const _Safe_iterator<_OtherIterator, _Sequence>& __other,
-		const _Safe_iterator<_OtherIterator, _Sequence>&)
-    { return __it._M_get_sequence() != __other._M_get_sequence(); }
-
-  /** Handle debug iterators from different types of container. */
-  template<typename _Iterator, typename _Sequence, typename _OtherIterator,
-	   typename _OtherSequence>
-    inline bool
-    __foreign_iterator_aux2(const _Safe_iterator<_Iterator, _Sequence>& __it,
-		const _Safe_iterator<_OtherIterator, _OtherSequence>&,
-		const _Safe_iterator<_OtherIterator, _OtherSequence>&)
-    { return true; }
-
-  /* Handle non-debug iterators. */
-  template<typename _Iterator, typename _Sequence, typename _InputIterator>
-    inline bool
-    __foreign_iterator_aux2(const _Safe_iterator<_Iterator, _Sequence>& __it,
-			    const _InputIterator& __other,
-			    const _InputIterator& __other_end)
-    {
-#if __cplusplus < 201103L
-      typedef _Is_contiguous_sequence<_Sequence> __tag;
-#else
-      using __lvalref = std::is_lvalue_reference<
-	typename std::iterator_traits<_InputIterator>::reference>;
-      using __contiguous = _Is_contiguous_sequence<_Sequence>;
-      using __tag = typename std::conditional<__lvalref::value, __contiguous,
-					      std::__false_type>::type;
-#endif
-      return __foreign_iterator_aux3(__it, __other, __other_end, __tag());
-    }
-
-  /* Handle the case where we aren't really inserting a range after all */
-  template<typename _Iterator, typename _Sequence, typename _Integral>
-    inline bool
-    __foreign_iterator_aux(const _Safe_iterator<_Iterator, _Sequence>&,
-			   _Integral, _Integral,
-			   std::__true_type)
-    { return true; }
-
-  /* Handle all iterators. */
-  template<typename _Iterator, typename _Sequence,
-	   typename _InputIterator>
-    inline bool
-    __foreign_iterator_aux(const _Safe_iterator<_Iterator, _Sequence>& __it,
-			   _InputIterator __other, _InputIterator __other_end,
-			   std::__false_type)
-    {
-      return _Insert_range_from_self_is_safe<_Sequence>::__value
-	     || __foreign_iterator_aux2(__it, __other, __other_end);
-    }
-
-  template<typename _Iterator, typename _Sequence,
-	   typename _InputIterator>
-    inline bool
-    __foreign_iterator(const _Safe_iterator<_Iterator, _Sequence>& __it,
-		       _InputIterator __other, _InputIterator __other_end)
-    {
-      typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-      return __foreign_iterator_aux(__it, __other, __other_end, _Integral());
-    }
-
-  /** Checks that __s is non-NULL or __n == 0, and then returns __s. */
-  template<typename _CharT, typename _Integer>
-    inline const _CharT*
-    __check_string(const _CharT* __s,
-		   const _Integer& __n __attribute__((__unused__)))
-    {
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-      __glibcxx_assert(__s != 0 || __n == 0);
-#endif
-      return __s;
-    }
-
-  /** Checks that __s is non-NULL and then returns __s. */
-  template<typename _CharT>
-    inline const _CharT*
-    __check_string(const _CharT* __s)
-    {
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-      __glibcxx_assert(__s != 0);
-#endif
-      return __s;
-    }
-
-  // Can't check if an input iterator sequence is sorted, because we
-  // can't step through the sequence.
-  template<typename _InputIterator>
-    inline bool
-    __check_sorted_aux(const _InputIterator&, const _InputIterator&,
-                       std::input_iterator_tag)
-    { return true; }
-
-  // Can verify if a forward iterator sequence is in fact sorted using
-  // std::__is_sorted
-  template<typename _ForwardIterator>
-    inline bool
-    __check_sorted_aux(_ForwardIterator __first, _ForwardIterator __last,
-                       std::forward_iterator_tag)
-    {
-      if (__first == __last)
-        return true;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next)
-        if (*__next < *__first)
-          return false;
-
-      return true;
-    }
-
-  // Can't check if an input iterator sequence is sorted, because we can't step
-  // through the sequence.
-  template<typename _InputIterator, typename _Predicate>
-    inline bool
-    __check_sorted_aux(const _InputIterator&, const _InputIterator&,
-                       _Predicate, std::input_iterator_tag)
-    { return true; }
-
-  // Can verify if a forward iterator sequence is in fact sorted using
-  // std::__is_sorted
-  template<typename _ForwardIterator, typename _Predicate>
-    inline bool
-    __check_sorted_aux(_ForwardIterator __first, _ForwardIterator __last,
-                       _Predicate __pred, std::forward_iterator_tag)
-    {
-      if (__first == __last)
-        return true;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next)
-        if (__pred(*__next, *__first))
-          return false;
-
-      return true;
-    }
-
-  // Determine if a sequence is sorted.
-  template<typename _InputIterator>
-    inline bool
-    __check_sorted(const _InputIterator& __first, const _InputIterator& __last)
-    {
-      // Verify that the < operator for elements in the sequence is a
-      // StrictWeakOrdering by checking that it is irreflexive.
-      __glibcxx_assert(__first == __last || !(*__first < *__first));
-
-      return __check_sorted_aux(__first, __last,
-				std::__iterator_category(__first));
-    }
-
-  template<typename _InputIterator, typename _Predicate>
-    inline bool
-    __check_sorted(const _InputIterator& __first, const _InputIterator& __last,
-                   _Predicate __pred)
-    {
-      // Verify that the predicate is StrictWeakOrdering by checking that it
-      // is irreflexive.
-      __glibcxx_assert(__first == __last || !__pred(*__first, *__first));
-
-      return __check_sorted_aux(__first, __last, __pred,
-				std::__iterator_category(__first));
-    }
-
-  template<typename _InputIterator>
-    inline bool
-    __check_sorted_set_aux(const _InputIterator& __first,
-			   const _InputIterator& __last,
-			   std::__true_type)
-    { return __check_sorted(__first, __last); }
-
-  template<typename _InputIterator>
-    inline bool
-    __check_sorted_set_aux(const _InputIterator&,
-			   const _InputIterator&,
-			   std::__false_type)
-    { return true; }
-
-  template<typename _InputIterator, typename _Predicate>
-    inline bool
-    __check_sorted_set_aux(const _InputIterator& __first,
-			   const _InputIterator& __last,
-			   _Predicate __pred, std::__true_type)
-    { return __check_sorted(__first, __last, __pred); }
-
-  template<typename _InputIterator, typename _Predicate>
-    inline bool
-    __check_sorted_set_aux(const _InputIterator&,
-			   const _InputIterator&, _Predicate,
-			   std::__false_type)
-    { return true; }
-
-  // ... special variant used in std::merge, std::includes, std::set_*.
-  template<typename _InputIterator1, typename _InputIterator2>
-    inline bool
-    __check_sorted_set(const _InputIterator1& __first,
-		       const _InputIterator1& __last,
-		       const _InputIterator2&)
-    {
-      typedef typename std::iterator_traits<_InputIterator1>::value_type
-	_ValueType1;
-      typedef typename std::iterator_traits<_InputIterator2>::value_type
-	_ValueType2;
-
-      typedef typename std::__are_same<_ValueType1, _ValueType2>::__type
-	_SameType;
-      return __check_sorted_set_aux(__first, __last, _SameType());
-    }
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _Predicate>
-    inline bool
-    __check_sorted_set(const _InputIterator1& __first,
-		       const _InputIterator1& __last,
-		       const _InputIterator2&, _Predicate __pred)
-    {
-      typedef typename std::iterator_traits<_InputIterator1>::value_type
-	_ValueType1;
-      typedef typename std::iterator_traits<_InputIterator2>::value_type
-	_ValueType2;
-
-      typedef typename std::__are_same<_ValueType1, _ValueType2>::__type
-	_SameType;
-      return __check_sorted_set_aux(__first, __last, __pred, _SameType());
-   }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 270. Binary search requirements overly strict
-  // Determine if a sequence is partitioned w.r.t. this element.
-  template<typename _ForwardIterator, typename _Tp>
-    inline bool
-    __check_partitioned_lower(_ForwardIterator __first,
-			      _ForwardIterator __last, const _Tp& __value)
-    {
-      while (__first != __last && *__first < __value)
-	++__first;
-      if (__first != __last)
-	{
-	  ++__first;
-	  while (__first != __last && !(*__first < __value))
-	    ++__first;
-	}
-      return __first == __last;
-    }
-
-  template<typename _ForwardIterator, typename _Tp>
-    inline bool
-    __check_partitioned_upper(_ForwardIterator __first,
-			      _ForwardIterator __last, const _Tp& __value)
-    {
-      while (__first != __last && !(__value < *__first))
-	++__first;
-      if (__first != __last)
-	{
-	  ++__first;
-	  while (__first != __last && __value < *__first)
-	    ++__first;
-	}
-      return __first == __last;
-    }
-
-  // Determine if a sequence is partitioned w.r.t. this element.
-  template<typename _ForwardIterator, typename _Tp, typename _Pred>
-    inline bool
-    __check_partitioned_lower(_ForwardIterator __first,
-			      _ForwardIterator __last, const _Tp& __value,
-			      _Pred __pred)
-    {
-      while (__first != __last && bool(__pred(*__first, __value)))
-	++__first;
-      if (__first != __last)
-	{
-	  ++__first;
-	  while (__first != __last && !bool(__pred(*__first, __value)))
-	    ++__first;
-	}
-      return __first == __last;
-    }
-
-  template<typename _ForwardIterator, typename _Tp, typename _Pred>
-    inline bool
-    __check_partitioned_upper(_ForwardIterator __first,
-			      _ForwardIterator __last, const _Tp& __value,
-			      _Pred __pred)
-    {
-      while (__first != __last && !bool(__pred(__value, *__first)))
-	++__first;
-      if (__first != __last)
-	{
-	  ++__first;
-	  while (__first != __last && bool(__pred(__value, *__first)))
-	    ++__first;
-	}
-      return __first == __last;
-    }
-
-  // Helper struct to detect random access safe iterators.
-  template<typename _Iterator>
-    struct __is_safe_random_iterator
-    {
-      enum { __value = 0 };
-      typedef std::__false_type __type;
-    };
-
-  template<typename _Iterator, typename _Sequence>
-    struct __is_safe_random_iterator<_Safe_iterator<_Iterator, _Sequence> >
-    : std::__are_same<std::random_access_iterator_tag,
-                      typename std::iterator_traits<_Iterator>::
-		      iterator_category>
-    { };
-
-  template<typename _Iterator>
-    struct _Siter_base
-    : std::_Iter_base<_Iterator, __is_safe_random_iterator<_Iterator>::__value>
-    { };
-
-  /** Helper function to extract base iterator of random access safe iterator
-      in order to reduce performance impact of debug mode.  Limited to random
-      access iterator because it is the only category for which it is possible
-      to check for correct iterators order in the __valid_range function
-      thanks to the < operator.
-  */
-  template<typename _Iterator>
-    inline typename _Siter_base<_Iterator>::iterator_type
-    __base(_Iterator __it)
-    { return _Siter_base<_Iterator>::_S_base(__it); }
-} // namespace __gnu_debug
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/list b/openflow/usr/include/c++/5/debug/list
deleted file mode 100644
index 41ed7f5..0000000
--- a/openflow/usr/include/c++/5/debug/list
+++ /dev/null
@@ -1,800 +0,0 @@
-// Debugging list implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/list
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_LIST
-#define _GLIBCXX_DEBUG_LIST 1
-
-#include <list>
-#include <debug/safe_sequence.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::list with safety/checking/debug instrumentation.
-  template<typename _Tp, typename _Allocator = std::allocator<_Tp> >
-    class list
-    : public __gnu_debug::_Safe_container<
-	list<_Tp, _Allocator>, _Allocator,
-	__gnu_debug::_Safe_node_sequence, false>,
-      public _GLIBCXX_STD_C::list<_Tp, _Allocator>
-    {
-      typedef _GLIBCXX_STD_C::list<_Tp, _Allocator>			_Base;
-      typedef __gnu_debug::_Safe_container<
-	list, _Allocator, __gnu_debug::_Safe_node_sequence, false>	_Safe;
-
-      typedef typename _Base::iterator		_Base_iterator;
-      typedef typename _Base::const_iterator	_Base_const_iterator;
-      typedef __gnu_debug::_Equal_to<_Base_const_iterator>	_Equal;
-      typedef __gnu_debug::_Not_equal_to<_Base_const_iterator>  _Not_equal;
-
-    public:
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<_Base_iterator, list>
-							iterator;
-      typedef __gnu_debug::_Safe_iterator<_Base_const_iterator, list>
-							const_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-
-      typedef _Tp					value_type;
-      typedef _Allocator				allocator_type;
-      typedef typename _Base::pointer			pointer;
-      typedef typename _Base::const_pointer		const_pointer;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      // 23.2.2.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      list()
-      : _Base() { }
-
-      list(const list& __x)
-      : _Base(__x) { }
-
-      ~list() { }
-#else
-      list() = default;
-      list(const list&) = default;
-      list(list&&) = default;
-
-      list(initializer_list<value_type> __l,
-	   const allocator_type& __a = allocator_type())
-      : _Base(__l, __a) { }
-
-      ~list() = default;
-#endif
-
-      explicit
-      list(const _Allocator& __a) _GLIBCXX_NOEXCEPT
-      : _Base(__a) { }
-
-#if __cplusplus >= 201103L
-      explicit
-      list(size_type __n)
-      : _Base(__n) { }
-
-      list(size_type __n, const _Tp& __value,
-	   const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#else
-      explicit
-      list(size_type __n, const _Tp& __value = _Tp(),
-	   const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#endif
-
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-	list(_InputIterator __first, _InputIterator __last,
-	     const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __a)
-	{ }
-
-      list(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      list&
-      operator=(const list& __x)
-      {
-	this->_M_safe() = __x;
-	_M_base() = __x;
-	return *this;
-      }
-#else
-      list&
-      operator=(const list&) = default;
-
-      list&
-      operator=(list&&) = default;
-
-      list&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_invalidate_all();
-	_M_base() = __l;
-	return *this;
-      }
-
-      void
-      assign(initializer_list<value_type> __l)
-      {
-	_Base::assign(__l);
-	this->_M_invalidate_all();
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-	void
-	assign(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::assign(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	  this->_M_invalidate_all();
-	}
-
-      void
-      assign(size_type __n, const _Tp& __t)
-      {
-	_Base::assign(__n, __t);
-	this->_M_invalidate_all();
-      }
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-      // 23.2.2.2 capacity:
-      using _Base::empty;
-      using _Base::size;
-      using _Base::max_size;
-
-#if __cplusplus >= 201103L
-      void
-      resize(size_type __sz)
-      {
-	this->_M_detach_singular();
-
-	// if __sz < size(), invalidate all iterators in [begin + __sz, end())
-	_Base_iterator __victim = _Base::begin();
-	_Base_iterator __end = _Base::end();
-	for (size_type __i = __sz; __victim != __end && __i > 0; --__i)
-	  ++__victim;
-
-	for (; __victim != __end; ++__victim)
-	  this->_M_invalidate_if(_Equal(__victim));
-
-	__try
-	  {
-	    _Base::resize(__sz);
-	  }
-	__catch(...)
-	  {
-	    this->_M_revalidate_singular();
-	    __throw_exception_again;
-	  }
-      }
-
-      void
-      resize(size_type __sz, const _Tp& __c)
-      {
-	this->_M_detach_singular();
-
-	// if __sz < size(), invalidate all iterators in [begin + __sz, end())
-	_Base_iterator __victim = _Base::begin();
-	_Base_iterator __end = _Base::end();
-	for (size_type __i = __sz; __victim != __end && __i > 0; --__i)
-	  ++__victim;
-
-	for (; __victim != __end; ++__victim)
-	  this->_M_invalidate_if(_Equal(__victim));
-
-	__try
-	  {
-	    _Base::resize(__sz, __c);
-	  }
-	__catch(...)
-	  {
-	    this->_M_revalidate_singular();
-	    __throw_exception_again;
-	  }
-      }
-#else
-      void
-      resize(size_type __sz, _Tp __c = _Tp())
-      {
-	this->_M_detach_singular();
-
-	// if __sz < size(), invalidate all iterators in [begin + __sz, end())
-	_Base_iterator __victim = _Base::begin();
-	_Base_iterator __end = _Base::end();
-	for (size_type __i = __sz; __victim != __end && __i > 0; --__i)
-	  ++__victim;
-
-	for (; __victim != __end; ++__victim)
-	  this->_M_invalidate_if(_Equal(__victim));
-
-	__try
-	  {
-	    _Base::resize(__sz, __c);
-	  }
-	__catch(...)
-	  {
-	    this->_M_revalidate_singular();
-	    __throw_exception_again;
-	  }
-      }
-#endif
-
-      // element access:
-      reference
-      front() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      const_reference
-      front() const _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      reference
-      back() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      const_reference
-      back() const _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      // 23.2.2.3 modifiers:
-      using _Base::push_front;
-
-#if __cplusplus >= 201103L
-      using _Base::emplace_front;
-#endif
-
-      void
-      pop_front() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	this->_M_invalidate_if(_Equal(_Base::begin()));
-	_Base::pop_front();
-      }
-
-      using _Base::push_back;
-
-#if __cplusplus >= 201103L
-      using _Base::emplace_back;
-#endif
-
-      void
-      pop_back() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	this->_M_invalidate_if(_Equal(--_Base::end()));
-	_Base::pop_back();
-      }
-
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	iterator
-	emplace(const_iterator __position, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__position);
-	  return iterator(_Base::emplace(__position.base(),
-					std::forward<_Args>(__args)...), this);
-	}
-#endif
-
-     iterator
-#if __cplusplus >= 201103L
-     insert(const_iterator __position, const _Tp& __x)
-#else
-     insert(iterator __position, const _Tp& __x)
-#endif
-     {
-       __glibcxx_check_insert(__position);
-       return iterator(_Base::insert(__position.base(), __x), this);
-     }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __position, _Tp&& __x)
-      { return emplace(__position, std::move(__x)); }
-
-      iterator
-      insert(const_iterator __p, initializer_list<value_type> __l)
-      {
-	__glibcxx_check_insert(__p);
-	return iterator(_Base::insert(__p.base(), __l), this);
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __position, size_type __n, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __n, __x), this);
-      }
-#else
-      void
-      insert(iterator __position, size_type __n, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	_Base::insert(__position.base(), __n, __x);
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	iterator
-	insert(const_iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-	{
-	  __glibcxx_check_insert_range(__position, __first, __last);
-	  return iterator(_Base::insert(__position.base(),
-					__gnu_debug::__base(__first),
-					__gnu_debug::__base(__last)),
-			  this);
-	}
-#else
-      template<class _InputIterator>
-	void
-	insert(iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-	{
-	  __glibcxx_check_insert_range(__position, __first, __last);
-	  _Base::insert(__position.base(), __gnu_debug::__base(__first),
-					   __gnu_debug::__base(__last));
-	}
-#endif
-
-    private:
-      _Base_iterator
-#if __cplusplus >= 201103L
-      _M_erase(_Base_const_iterator __position) noexcept
-#else
-      _M_erase(_Base_iterator __position)
-#endif
-      {
-	this->_M_invalidate_if(_Equal(__position));
-	return _Base::erase(__position);
-      }
-
-    public:
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __position) noexcept
-#else
-      erase(iterator __position)
-#endif
-      {
-	__glibcxx_check_erase(__position);
-	return iterator(_M_erase(__position.base()), this);
-      }
-
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __first, const_iterator __last) noexcept
-#else
-      erase(iterator __first, iterator __last)
-#endif
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_const_iterator __victim = __first.base();
-	     __victim != __last.base(); ++__victim)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "position")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if(_Equal(__victim));
-	  }
-	return iterator(_Base::erase(__first.base(), __last.base()), this);
-      }
-
-      void
-      swap(list& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-      }
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      // 23.2.2.4 list operations:
-      void
-#if __cplusplus >= 201103L
-      splice(const_iterator __position, list&& __x) noexcept
-#else
-      splice(iterator __position, list& __x)
-#endif
-      {
-	_GLIBCXX_DEBUG_VERIFY(&__x != this,
-			      _M_message(__gnu_debug::__msg_self_splice)
-			      ._M_sequence(*this, "this"));
-	this->_M_transfer_from_if(__x, _Not_equal(__x._M_base().end()));
-	_Base::splice(__position.base(), _GLIBCXX_MOVE(__x._M_base()));
-      }
-
-#if __cplusplus >= 201103L
-      void
-      splice(const_iterator __position, list& __x) noexcept
-      { splice(__position, std::move(__x)); }
-#endif
-
-      void
-#if __cplusplus >= 201103L
-      splice(const_iterator __position, list&& __x, const_iterator __i) noexcept
-#else
-      splice(iterator __position, list& __x, iterator __i)
-#endif
-      {
-	__glibcxx_check_insert(__position);
-
-	// We used to perform the splice_alloc check:  not anymore, redundant
-	// after implementing the relevant bits of N1599.
-
-	_GLIBCXX_DEBUG_VERIFY(__i._M_dereferenceable(),
-			      _M_message(__gnu_debug::__msg_splice_bad)
-			      ._M_iterator(__i, "__i"));
-	_GLIBCXX_DEBUG_VERIFY(__i._M_attached_to(&__x),
-			      _M_message(__gnu_debug::__msg_splice_other)
-			     ._M_iterator(__i, "__i")._M_sequence(__x, "__x"));
-
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 250. splicing invalidates iterators
-	this->_M_transfer_from_if(__x, _Equal(__i.base()));
-	_Base::splice(__position.base(), _GLIBCXX_MOVE(__x._M_base()),
-		      __i.base());
-      }
-
-#if __cplusplus >= 201103L
-      void
-      splice(const_iterator __position, list& __x, const_iterator __i) noexcept
-      { splice(__position, std::move(__x), __i); }
-#endif
-
-      void
-#if __cplusplus >= 201103L
-      splice(const_iterator __position, list&& __x, const_iterator __first,
-	     const_iterator __last) noexcept
-#else
-      splice(iterator __position, list& __x, iterator __first,
-	     iterator __last)
-#endif
-      {
-	__glibcxx_check_insert(__position);
-	__glibcxx_check_valid_range(__first, __last);
-	_GLIBCXX_DEBUG_VERIFY(__first._M_attached_to(&__x),
-			      _M_message(__gnu_debug::__msg_splice_other)
-			      ._M_sequence(__x, "x")
-			      ._M_iterator(__first, "first"));
-
-	// We used to perform the splice_alloc check:  not anymore, redundant
-	// after implementing the relevant bits of N1599.
-
-	for (_Base_const_iterator __tmp = __first.base();
-	     __tmp != __last.base(); ++__tmp)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__tmp != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    _GLIBCXX_DEBUG_VERIFY(&__x != this || __tmp != __position.base(),
-				_M_message(__gnu_debug::__msg_splice_overlap)
-				  ._M_iterator(__tmp, "position")
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	    // 250. splicing invalidates iterators
-	    this->_M_transfer_from_if(__x, _Equal(__tmp));
-	  }
-
-	_Base::splice(__position.base(), _GLIBCXX_MOVE(__x._M_base()),
-		      __first.base(), __last.base());
-      }
-
-#if __cplusplus >= 201103L
-      void
-      splice(const_iterator __position, list& __x,
-	     const_iterator __first, const_iterator __last) noexcept
-      { splice(__position, std::move(__x), __first, __last); }
-#endif
-
-      void
-      remove(const _Tp& __value)
-      {
-	for (_Base_iterator __x = _Base::begin(); __x != _Base::end(); )
-	  {
-	    if (*__x == __value)
-	      __x = _M_erase(__x);
-	    else
-	      ++__x;
-	  }
-      }
-
-      template<class _Predicate>
-	void
-	remove_if(_Predicate __pred)
-	{
-	  for (_Base_iterator __x = _Base::begin(); __x != _Base::end(); )
-	    {
-	      if (__pred(*__x))
-		__x = _M_erase(__x);
-	      else
-		++__x;
-	    }
-	}
-
-      void
-      unique()
-      {
-	_Base_iterator __first = _Base::begin();
-	_Base_iterator __last = _Base::end();
-	if (__first == __last)
-	  return;
-	_Base_iterator __next = __first; ++__next;
-	while (__next != __last)
-	  {
-	    if (*__first == *__next)
-	      __next = _M_erase(__next);
-	    else
-	      __first = __next++;
-	  }
-      }
-
-      template<class _BinaryPredicate>
-	void
-	unique(_BinaryPredicate __binary_pred)
-	{
-	  _Base_iterator __first = _Base::begin();
-	  _Base_iterator __last = _Base::end();
-	  if (__first == __last)
-	    return;
-	  _Base_iterator __next = __first; ++__next;
-	  while (__next != __last)
-	    {
-	      if (__binary_pred(*__first, *__next))
-		__next = _M_erase(__next);
-	      else
-		__first = __next++;
-	    }
-	}
-
-      void
-#if __cplusplus >= 201103L
-      merge(list&& __x)
-#else
-      merge(list& __x)
-#endif
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 300. list::merge() specification incomplete
-	if (this != &__x)
-	  {
-	    __glibcxx_check_sorted(_Base::begin(), _Base::end());
-	    __glibcxx_check_sorted(__x.begin().base(), __x.end().base());
-	    this->_M_transfer_from_if(__x, _Not_equal(__x._M_base().end()));
-	    _Base::merge(_GLIBCXX_MOVE(__x._M_base()));
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      void
-      merge(list& __x)
-      { merge(std::move(__x)); }
-#endif
-
-      template<class _Compare>
-	void
-#if __cplusplus >= 201103L
-	merge(list&& __x, _Compare __comp)
-#else
-	merge(list& __x, _Compare __comp)
-#endif
-	{
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 300. list::merge() specification incomplete
-	  if (this != &__x)
-	    {
-	      __glibcxx_check_sorted_pred(_Base::begin(), _Base::end(),
-					  __comp);
-	      __glibcxx_check_sorted_pred(__x.begin().base(), __x.end().base(),
-					  __comp);
-	      this->_M_transfer_from_if(__x, _Not_equal(__x._M_base().end()));
-	      _Base::merge(_GLIBCXX_MOVE(__x._M_base()), __comp);
-	    }
-	}
-
-#if __cplusplus >= 201103L
-      template<typename _Compare>
-	void
-	merge(list& __x, _Compare __comp)
-	{ merge(std::move(__x), __comp); }
-#endif
-
-      void
-      sort() { _Base::sort(); }
-
-      template<typename _StrictWeakOrdering>
-	void
-	sort(_StrictWeakOrdering __pred) { _Base::sort(__pred); }
-
-      using _Base::reverse;
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const list<_Tp, _Alloc>& __lhs,
-	       const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const list<_Tp, _Alloc>& __lhs,
-	       const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const list<_Tp, _Alloc>& __lhs,
-	      const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const list<_Tp, _Alloc>& __lhs,
-	       const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const list<_Tp, _Alloc>& __lhs,
-	       const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const list<_Tp, _Alloc>& __lhs,
-	      const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(list<_Tp, _Alloc>& __lhs, list<_Tp, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-
-} // namespace __debug
-} // namespace std
-
-#ifndef _GLIBCXX_DEBUG_PEDANTIC
-namespace __gnu_debug
-{
-  template<class _Tp, class _Alloc>
-    struct _Insert_range_from_self_is_safe<std::__debug::list<_Tp, _Alloc> >
-    { enum { __value = 1 }; };
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/macros.h b/openflow/usr/include/c++/5/debug/macros.h
deleted file mode 100644
index f796e71..0000000
--- a/openflow/usr/include/c++/5/debug/macros.h
+++ /dev/null
@@ -1,364 +0,0 @@
-// Debugging support implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/macros.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_MACROS_H
-#define _GLIBCXX_DEBUG_MACROS_H 1
-
-/**
- * Macros used by the implementation to verify certain
- * properties. These macros may only be used directly by the debug
- * wrappers. Note that these are macros (instead of the more obviously
- * @a correct choice of making them functions) because we need line and
- * file information at the call site, to minimize the distance between
- * the user error and where the error is reported.
- *
- */
-#define _GLIBCXX_DEBUG_VERIFY_AT(_Condition,_ErrorMessage,_File,_Line)	\
-  do									\
-  {									\
-    if (! (_Condition))							\
-      __gnu_debug::_Error_formatter::_M_at(_File, _Line)		\
-	  ._ErrorMessage._M_error();					\
-  } while (false)
-
-#define _GLIBCXX_DEBUG_VERIFY(_Condition,_ErrorMessage)			\
-  _GLIBCXX_DEBUG_VERIFY_AT(_Condition,_ErrorMessage,__FILE__,__LINE__)
-
-// Verify that [_First, _Last) forms a valid iterator range.
-#define __glibcxx_check_valid_range(_First,_Last)			\
-_GLIBCXX_DEBUG_VERIFY(__gnu_debug::__valid_range(_First, _Last),	\
-		      _M_message(__gnu_debug::__msg_valid_range)	\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last))
-
-// Verify that [_First, _Last) forms a non-empty iterator range.
-#define __glibcxx_check_non_empty_range(_First,_Last)			\
-_GLIBCXX_DEBUG_VERIFY(_First != _Last,					\
-		      _M_message(__gnu_debug::__msg_non_empty_range)	\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last))
-
-/** Verify that we can insert into *this with the iterator _Position.
- *  Insertion into a container at a specific position requires that
- *  the iterator be nonsingular, either dereferenceable or past-the-end,
- *  and that it reference the sequence we are inserting into. Note that
- *  this macro is only valid when the container is a_Safe_sequence and
- *  the iterator is a _Safe_iterator.
-*/
-#define __glibcxx_check_insert(_Position)				\
-_GLIBCXX_DEBUG_VERIFY(!_Position._M_singular(),				\
-		      _M_message(__gnu_debug::__msg_insert_singular)	\
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position));		\
-_GLIBCXX_DEBUG_VERIFY(_Position._M_attached_to(this),			\
-		      _M_message(__gnu_debug::__msg_insert_different)	\
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position))
-
-/** Verify that we can insert into *this after the iterator _Position.
- *  Insertion into a container after a specific position requires that
- *  the iterator be nonsingular, either dereferenceable or before-begin,
- *  and that it reference the sequence we are inserting into. Note that
- *  this macro is only valid when the container is a_Safe_sequence and
- *  the iterator is a _Safe_iterator.
-*/
-#define __glibcxx_check_insert_after(_Position)				\
-__glibcxx_check_insert(_Position);					\
-_GLIBCXX_DEBUG_VERIFY(!_Position._M_is_end(),				\
-		      _M_message(__gnu_debug::__msg_insert_after_end)	\
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position))
-
-/** Verify that we can insert the values in the iterator range
- *  [_First, _Last) into *this with the iterator _Position.  Insertion
- *  into a container at a specific position requires that the iterator
- *  be nonsingular (i.e., either dereferenceable or past-the-end),
- *  that it reference the sequence we are inserting into, and that the
- *  iterator range [_First, _Last) is a valid (possibly empty)
- *  range which does not reference the sequence we are inserting into.
- *  Note that this macro is only valid when the container is a
- *  _Safe_sequence and the _Position iterator is a _Safe_iterator.
-*/
-#define __glibcxx_check_insert_range(_Position,_First,_Last)		\
-__glibcxx_check_valid_range(_First,_Last);				\
-__glibcxx_check_insert(_Position);					\
-_GLIBCXX_DEBUG_VERIFY(__gnu_debug::__foreign_iterator(_Position,_First,_Last),\
-		      _M_message(__gnu_debug::__msg_insert_range_from_self)\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_sequence(*this, "this"))
-
-/** Verify that we can insert the values in the iterator range
- *  [_First, _Last) into *this after the iterator _Position.  Insertion
- *  into a container after a specific position requires that the iterator
- *  be nonsingular (i.e., either dereferenceable or past-the-end),
- *  that it reference the sequence we are inserting into, and that the
- *  iterator range [_First, _Last) is a valid (possibly empty)
- *  range which does not reference the sequence we are inserting into.
- *  Note that this macro is only valid when the container is a
- *  _Safe_sequence and the _Position iterator is a _Safe_iterator.
-*/
-#define __glibcxx_check_insert_range_after(_Position,_First,_Last)	\
-__glibcxx_check_valid_range(_First,_Last);				\
-__glibcxx_check_insert_after(_Position);				\
-_GLIBCXX_DEBUG_VERIFY(__gnu_debug::__foreign_iterator(_Position,_First,_Last),\
-		      _M_message(__gnu_debug::__msg_insert_range_from_self)\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_sequence(*this, "this"))
-
-/** Verify that we can erase the element referenced by the iterator
- * _Position. We can erase the element if the _Position iterator is
- * dereferenceable and references this sequence.
-*/
-#define __glibcxx_check_erase(_Position)				\
-_GLIBCXX_DEBUG_VERIFY(_Position._M_dereferenceable(),			\
-		      _M_message(__gnu_debug::__msg_erase_bad)	        \
-                      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position));		\
-_GLIBCXX_DEBUG_VERIFY(_Position._M_attached_to(this),			\
-		      _M_message(__gnu_debug::__msg_erase_different)    \
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position))
-
-/** Verify that we can erase the element after the iterator
- * _Position. We can erase the element if the _Position iterator is
- * before a dereferenceable one and references this sequence.
-*/
-#define __glibcxx_check_erase_after(_Position)				\
-_GLIBCXX_DEBUG_VERIFY(_Position._M_before_dereferenceable(),		\
-		      _M_message(__gnu_debug::__msg_erase_after_bad)	\
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position));		\
-_GLIBCXX_DEBUG_VERIFY(_Position._M_attached_to(this),			\
-		      _M_message(__gnu_debug::__msg_erase_different)	\
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position))
-
-/** Verify that we can erase the elements in the iterator range
- *  [_First, _Last). We can erase the elements if [_First, _Last) is a
- *  valid iterator range within this sequence.
-*/
-#define __glibcxx_check_erase_range(_First,_Last)			\
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(_First._M_attached_to(this),			\
-		      _M_message(__gnu_debug::__msg_erase_different)    \
-                      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last))
-
-/** Verify that we can erase the elements in the iterator range
- *  (_First, _Last). We can erase the elements if (_First, _Last) is a
- *  valid iterator range within this sequence.
-*/
-#define __glibcxx_check_erase_range_after(_First,_Last)			\
-_GLIBCXX_DEBUG_VERIFY(_First._M_can_compare(_Last),			\
-		      _M_message(__gnu_debug::__msg_erase_different)	\
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last));			\
-_GLIBCXX_DEBUG_VERIFY(_First._M_attached_to(this),			\
-		      _M_message(__gnu_debug::__msg_erase_different)	\
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_First, #_First));			\
-_GLIBCXX_DEBUG_VERIFY(_First != _Last,					\
-		      _M_message(__gnu_debug::__msg_valid_range2)	\
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last));			\
-_GLIBCXX_DEBUG_VERIFY(_First._M_incrementable(),			\
-		      _M_message(__gnu_debug::__msg_valid_range2)	\
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last));			\
-_GLIBCXX_DEBUG_VERIFY(!_Last._M_is_before_begin(),			\
-		      _M_message(__gnu_debug::__msg_valid_range2)	\
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last))			\
-
-// Verify that the subscript _N is less than the container's size.
-#define __glibcxx_check_subscript(_N)					\
-_GLIBCXX_DEBUG_VERIFY(_N < this->size(),				\
-		      _M_message(__gnu_debug::__msg_subscript_oob)	\
-                      ._M_sequence(*this, "this")			\
-		      ._M_integer(_N, #_N)				\
-		      ._M_integer(this->size(), "size"))
-
-// Verify that the bucket _N is less than the container's buckets count.
-#define __glibcxx_check_bucket_index(_N)				\
-_GLIBCXX_DEBUG_VERIFY(_N < this->bucket_count(),			\
-		      _M_message(__gnu_debug::__msg_bucket_index_oob)	\
-                      ._M_sequence(*this, "this")			\
-		      ._M_integer(_N, #_N)				\
-		      ._M_integer(this->bucket_count(), "size"))
-
-// Verify that the container is nonempty
-#define __glibcxx_check_nonempty()					\
-_GLIBCXX_DEBUG_VERIFY(! this->empty(),					\
-		      _M_message(__gnu_debug::__msg_empty)	        \
-                      ._M_sequence(*this, "this"))
-
-// Verify that the iterator range [_First, _Last) is sorted
-#define __glibcxx_check_sorted(_First,_Last)				\
-__glibcxx_check_valid_range(_First,_Last);				\
- _GLIBCXX_DEBUG_VERIFY(__gnu_debug::__check_sorted(			\
-			__gnu_debug::__base(_First),			\
-			__gnu_debug::__base(_Last)),			\
-		      _M_message(__gnu_debug::__msg_unsorted)	        \
-                      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last))
-
-/** Verify that the iterator range [_First, _Last) is sorted by the
-    predicate _Pred. */
-#define __glibcxx_check_sorted_pred(_First,_Last,_Pred)			\
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(__gnu_debug::__check_sorted(			\
-			__gnu_debug::__base(_First),			\
-			__gnu_debug::__base(_Last), _Pred),		\
-		      _M_message(__gnu_debug::__msg_unsorted_pred)      \
-                      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_string(#_Pred))
-
-// Special variant for std::merge, std::includes, std::set_*
-#define __glibcxx_check_sorted_set(_First1,_Last1,_First2)		\
-__glibcxx_check_valid_range(_First1,_Last1);				\
-_GLIBCXX_DEBUG_VERIFY(                                                  \
-  __gnu_debug::__check_sorted_set(__gnu_debug::__base(_First1),		\
-				  __gnu_debug::__base(_Last1), _First2),\
-  _M_message(__gnu_debug::__msg_unsorted)				\
-  ._M_iterator(_First1, #_First1)					\
-  ._M_iterator(_Last1, #_Last1))
-
-// Likewise with a _Pred.
-#define __glibcxx_check_sorted_set_pred(_First1,_Last1,_First2,_Pred)	\
-__glibcxx_check_valid_range(_First1,_Last1);        			\
-_GLIBCXX_DEBUG_VERIFY(							\
-  __gnu_debug::__check_sorted_set(__gnu_debug::__base(_First1),		\
-				  __gnu_debug::__base(_Last1),		\
-				  _First2, _Pred),			\
-  _M_message(__gnu_debug::__msg_unsorted_pred)				\
-  ._M_iterator(_First1, #_First1)					\
-  ._M_iterator(_Last1, #_Last1)						\
-  ._M_string(#_Pred))
-
-/** Verify that the iterator range [_First, _Last) is partitioned
-    w.r.t. the value _Value. */
-#define __glibcxx_check_partitioned_lower(_First,_Last,_Value)		\
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(__gnu_debug::__check_partitioned_lower(		\
-			__gnu_debug::__base(_First),			\
-			__gnu_debug::__base(_Last), _Value),		\
-		      _M_message(__gnu_debug::__msg_unpartitioned)      \
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_string(#_Value))
-
-#define __glibcxx_check_partitioned_upper(_First,_Last,_Value)		\
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(__gnu_debug::__check_partitioned_upper(		\
-			__gnu_debug::__base(_First),			\
-			__gnu_debug::__base(_Last), _Value),		\
-		      _M_message(__gnu_debug::__msg_unpartitioned)      \
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_string(#_Value))
-
-/** Verify that the iterator range [_First, _Last) is partitioned
-    w.r.t. the value _Value and predicate _Pred. */
-#define __glibcxx_check_partitioned_lower_pred(_First,_Last,_Value,_Pred) \
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(__gnu_debug::__check_partitioned_lower(		\
-			__gnu_debug::__base(_First),			\
-			__gnu_debug::__base(_Last), _Value, _Pred),	\
-		      _M_message(__gnu_debug::__msg_unpartitioned_pred) \
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_string(#_Pred)				\
-                      ._M_string(#_Value))
-
-/** Verify that the iterator range [_First, _Last) is partitioned
-    w.r.t. the value _Value and predicate _Pred. */
-#define __glibcxx_check_partitioned_upper_pred(_First,_Last,_Value,_Pred) \
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(__gnu_debug::__check_partitioned_upper(		\
-			__gnu_debug::__base(_First),			\
-			__gnu_debug::__base(_Last), _Value, _Pred),	\
-		      _M_message(__gnu_debug::__msg_unpartitioned_pred) \
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_string(#_Pred)				\
-                      ._M_string(#_Value))
-
-// Verify that the iterator range [_First, _Last) is a heap
-#define __glibcxx_check_heap(_First,_Last)				\
-  _GLIBCXX_DEBUG_VERIFY(std::__is_heap(__gnu_debug::__base(_First),	\
-				       __gnu_debug::__base(_Last)),	\
-		      _M_message(__gnu_debug::__msg_not_heap)	        \
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last))
-
-/** Verify that the iterator range [_First, _Last) is a heap
-    w.r.t. the predicate _Pred. */
-#define __glibcxx_check_heap_pred(_First,_Last,_Pred)			\
-  _GLIBCXX_DEBUG_VERIFY(std::__is_heap(__gnu_debug::__base(_First),	\
-				       __gnu_debug::__base(_Last),	\
-				       _Pred),				\
-		      _M_message(__gnu_debug::__msg_not_heap_pred)      \
-                      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_string(#_Pred))
-
-// Verify that the container is not self move assigned
-#define __glibcxx_check_self_move_assign(_Other)			\
-_GLIBCXX_DEBUG_VERIFY(this != &_Other,					\
-		      _M_message(__gnu_debug::__msg_self_move_assign)	\
-                      ._M_sequence(*this, "this"))
-
-// Verify that load factor is positive
-#define __glibcxx_check_max_load_factor(_F)				\
-_GLIBCXX_DEBUG_VERIFY(_F > 0.0f,					\
-		      _M_message(__gnu_debug::__msg_valid_load_factor)	\
-                      ._M_sequence(*this, "this"))
-
-#define __glibcxx_check_equal_allocs(_This, _Other)			\
-_GLIBCXX_DEBUG_VERIFY(_This.get_allocator() == _Other.get_allocator(),	\
-		      _M_message(__gnu_debug::__msg_equal_allocs)	\
-		      ._M_sequence(_This, "this"))
-
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-#  define __glibcxx_check_string(_String) _GLIBCXX_DEBUG_ASSERT(_String != 0)
-#  define __glibcxx_check_string_len(_String,_Len) \
-       _GLIBCXX_DEBUG_ASSERT(_String != 0 || _Len == 0)
-#else
-#  define __glibcxx_check_string(_String)
-#  define __glibcxx_check_string_len(_String,_Len)
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/map b/openflow/usr/include/c++/5/debug/map
deleted file mode 100644
index 2593b2b..0000000
--- a/openflow/usr/include/c++/5/debug/map
+++ /dev/null
@@ -1,36 +0,0 @@
-// Debugging map/multimap implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/map
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_MAP
-#define _GLIBCXX_DEBUG_MAP 1
-
-#include <map>
-#include <debug/map.h>
-#include <debug/multimap.h>
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/map.h b/openflow/usr/include/c++/5/debug/map.h
deleted file mode 100644
index 53d8ecc..0000000
--- a/openflow/usr/include/c++/5/debug/map.h
+++ /dev/null
@@ -1,514 +0,0 @@
-// Debugging map implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/map.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_MAP_H
-#define _GLIBCXX_DEBUG_MAP_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-#include <utility>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::map with safety/checking/debug instrumentation.
-  template<typename _Key, typename _Tp, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<std::pair<const _Key, _Tp> > >
-    class map
-    : public __gnu_debug::_Safe_container<
-	map<_Key, _Tp, _Compare, _Allocator>, _Allocator,
-	__gnu_debug::_Safe_node_sequence>,
-      public _GLIBCXX_STD_C::map<_Key, _Tp, _Compare, _Allocator>
-    {
-      typedef _GLIBCXX_STD_C::map<
-	_Key, _Tp, _Compare, _Allocator>			_Base;
-      typedef __gnu_debug::_Safe_container<
-	map, _Allocator, __gnu_debug::_Safe_node_sequence>	_Safe;
-
-      typedef typename _Base::const_iterator	_Base_const_iterator;
-      typedef typename _Base::iterator		_Base_iterator;
-      typedef __gnu_debug::_Equal_to<_Base_const_iterator> _Equal;
-
-    public:
-      // types:
-      typedef _Key					key_type;
-      typedef _Tp					mapped_type;
-      typedef std::pair<const _Key, _Tp>		value_type;
-      typedef _Compare					key_compare;
-      typedef _Allocator				allocator_type;
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<_Base_iterator, map>
-							iterator;
-      typedef __gnu_debug::_Safe_iterator<_Base_const_iterator, map>
-							const_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-      typedef typename _Base::pointer			pointer;
-      typedef typename _Base::const_pointer		const_pointer;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      // 23.3.1.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      map() : _Base() { }
-
-      map(const map& __x)
-      : _Base(__x) { }
-
-      ~map() { }
-#else
-      map() = default;
-      map(const map&) = default;
-      map(map&&) = default;
-
-      map(initializer_list<value_type> __l,
-	  const _Compare& __c = _Compare(),
-	  const allocator_type& __a = allocator_type())
-      : _Base(__l, __c, __a) { }
-
-      explicit
-      map(const allocator_type& __a)
-      : _Base(__a) { }
-
-      map(const map& __m, const allocator_type& __a)
-      : _Base(__m, __a) { }
-
-      map(map&& __m, const allocator_type& __a)
-      : _Safe(std::move(__m._M_safe()), __a),
-	_Base(std::move(__m._M_base()), __a) { }
-
-      map(initializer_list<value_type> __l, const allocator_type& __a)
-      : _Base(__l, __a) { }
-
-      template<typename _InputIterator>
-	map(_InputIterator __first, _InputIterator __last,
-	    const allocator_type& __a)
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __a)
-	{ }
-
-      ~map() = default;
-#endif
-
-      map(const _Base& __x)
-      : _Base(__x) { }
-
-      explicit map(const _Compare& __comp,
-		   const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-      template<typename _InputIterator>
-	map(_InputIterator __first, _InputIterator __last,
-	    const _Compare& __comp = _Compare(),
-	    const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last),
-		__comp, __a) { }
-
-#if __cplusplus < 201103L
-      map&
-      operator=(const map& __x)
-      {
-	this->_M_safe() = __x;
-	_M_base() = __x;
-	return *this;
-      }
-#else
-      map&
-      operator=(const map&) = default;
-
-      map&
-      operator=(map&&) = default;
-
-      map&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_base() = __l;
-	this->_M_invalidate_all();
-	return *this;
-      }
-#endif
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 133. map missing get_allocator()
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-      // capacity:
-      using _Base::empty;
-      using _Base::size;
-      using _Base::max_size;
-
-      // 23.3.1.2 element access:
-      using _Base::operator[];
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 464. Suggestion for new member functions in standard containers.
-      using _Base::at;
-
-      // modifiers:
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{
-	  auto __res = _Base::emplace(std::forward<_Args>(__args)...);
-	  return std::pair<iterator, bool>(iterator(__res.first, this),
-					   __res.second);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__pos);
-	  return iterator(_Base::emplace_hint(__pos.base(),
-					      std::forward<_Args>(__args)...),
-			  this);
-	}
-#endif
-
-      std::pair<iterator, bool>
-      insert(const value_type& __x)
-      {
-	std::pair<_Base_iterator, bool> __res = _Base::insert(__x);
-	return std::pair<iterator, bool>(iterator(__res.first, this),
-					 __res.second);
-      }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	std::pair<iterator, bool>
-	insert(_Pair&& __x)
-	{
-	  std::pair<_Base_iterator, bool> __res
-	    = _Base::insert(std::forward<_Pair>(__x));
-	  return std::pair<iterator, bool>(iterator(__res.first, this),
-					   __res.second);
-	}
-#endif
-
-#if __cplusplus >= 201103L
-      void
-      insert(std::initializer_list<value_type> __list)
-      { _Base::insert(__list); }
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __position, const value_type& __x)
-#else
-      insert(iterator __position, const value_type& __x)
-#endif
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __x), this);
-      }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(const_iterator __position, _Pair&& __x)
-	{
-	  __glibcxx_check_insert(__position);
-	  return iterator(_Base::insert(__position.base(),
-					std::forward<_Pair>(__x)), this);
-	}
-#endif
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::insert(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	}
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	this->_M_invalidate_if(_Equal(__position.base()));
-	return iterator(_Base::erase(__position.base()), this);
-      }
-
-      iterator
-      erase(iterator __position)
-      { return erase(const_iterator(__position)); }
-#else
-      void
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	this->_M_invalidate_if(_Equal(__position.base()));
-	_Base::erase(__position.base());
-      }
-#endif
-
-      size_type
-      erase(const key_type& __x)
-      {
-	_Base_iterator __victim = _Base::find(__x);
-	if (__victim == _Base::end())
-	  return 0;
-	else
-	  {
-	    this->_M_invalidate_if(_Equal(__victim));
-	    _Base::erase(__victim);
-	    return 1;
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_const_iterator __victim = __first.base();
-	     __victim != __last.base(); ++__victim)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if(_Equal(__victim));
-	  }
-	return iterator(_Base::erase(__first.base(), __last.base()), this);
-      }
-#else
-      void
-      erase(iterator __first, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_iterator __victim = __first.base();
-	     __victim != __last.base(); ++__victim)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if(_Equal(__victim));
-	  }
-	_Base::erase(__first.base(), __last.base());
-      }
-#endif
-
-      void
-      swap(map& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-      }
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_invalidate_all();
-	_Base::clear();
-      }
-
-      // observers:
-      using _Base::key_comp;
-      using _Base::value_comp;
-
-      // 23.3.1.3 map operations:
-      iterator
-      find(const key_type& __x)
-      { return iterator(_Base::find(__x), this); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return const_iterator(_Base::find(__x), this); }
-
-      using _Base::count;
-
-      iterator
-      lower_bound(const key_type& __x)
-      { return iterator(_Base::lower_bound(__x), this); }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return const_iterator(_Base::lower_bound(__x), this); }
-
-      iterator
-      upper_bound(const key_type& __x)
-      { return iterator(_Base::upper_bound(__x), this); }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return const_iterator(_Base::upper_bound(__x), this); }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	_Base::equal_range(__x);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	std::pair<_Base_const_iterator, _Base_const_iterator> __res =
-	_Base::equal_range(__x);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-    };
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator==(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator!=(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator<(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	      const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator<=(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator>=(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator>(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	      const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline void
-    swap(map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	 map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { __lhs.swap(__rhs); }
-
-} // namespace __debug
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/multimap.h b/openflow/usr/include/c++/5/debug/multimap.h
deleted file mode 100644
index 5c7f2a9..0000000
--- a/openflow/usr/include/c++/5/debug/multimap.h
+++ /dev/null
@@ -1,495 +0,0 @@
-// Debugging multimap implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/multimap.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_MULTIMAP_H
-#define _GLIBCXX_DEBUG_MULTIMAP_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-#include <utility>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::multimap with safety/checking/debug instrumentation.
-  template<typename _Key, typename _Tp, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<std::pair<const _Key, _Tp> > >
-    class multimap
-      : public __gnu_debug::_Safe_container<
-	multimap<_Key, _Tp, _Compare, _Allocator>, _Allocator,
-	__gnu_debug::_Safe_node_sequence>,
-	public _GLIBCXX_STD_C::multimap<_Key, _Tp, _Compare, _Allocator>
-    {
-      typedef _GLIBCXX_STD_C::multimap<
-	_Key, _Tp, _Compare, _Allocator>			_Base;
-      typedef __gnu_debug::_Safe_container<
-	multimap, _Allocator, __gnu_debug::_Safe_node_sequence>	_Safe;
-
-      typedef typename _Base::const_iterator	_Base_const_iterator;
-      typedef typename _Base::iterator		_Base_iterator;
-      typedef __gnu_debug::_Equal_to<_Base_const_iterator> _Equal;
-
-    public:
-      // types:
-      typedef _Key					key_type;
-      typedef _Tp					mapped_type;
-      typedef std::pair<const _Key, _Tp>		value_type;
-      typedef _Compare					key_compare;
-      typedef _Allocator				allocator_type;
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<_Base_iterator, multimap>
-							iterator;
-      typedef __gnu_debug::_Safe_iterator<_Base_const_iterator,
-					  multimap>	const_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-      typedef typename _Base::pointer			pointer;
-      typedef typename _Base::const_pointer		const_pointer;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      // 23.3.1.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      multimap() : _Base() { }
-
-      multimap(const multimap& __x)
-      : _Base(__x) { }
-
-      ~multimap() { }
-#else
-      multimap() = default;
-      multimap(const multimap&) = default;
-      multimap(multimap&&) = default;
-
-      multimap(initializer_list<value_type> __l,
-	       const _Compare& __c = _Compare(),
-	       const allocator_type& __a = allocator_type())
-      : _Base(__l, __c, __a) { }
-
-      explicit
-      multimap(const allocator_type& __a)
-      : _Base(__a) { }
-
-      multimap(const multimap& __m, const allocator_type& __a)
-      : _Base(__m, __a) { }
-
-      multimap(multimap&& __m, const allocator_type& __a)
-      : _Safe(std::move(__m._M_safe()), __a),
-	_Base(std::move(__m._M_base()), __a) { }
-
-      multimap(initializer_list<value_type> __l, const allocator_type& __a)
-      : _Base(__l, __a) { }
-
-      template<typename _InputIterator>
-	multimap(_InputIterator __first, _InputIterator __last,
-		 const allocator_type& __a)
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __a) { }
-
-      ~multimap() = default;
-#endif
-
-      explicit multimap(const _Compare& __comp,
-			const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-      template<typename _InputIterator>
-      multimap(_InputIterator __first, _InputIterator __last,
-	       const _Compare& __comp = _Compare(),
-	       const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last),
-	      __comp, __a) { }
-
-      multimap(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      multimap&
-      operator=(const multimap& __x)
-      {
-	this->_M_safe() = __x;
-	_M_base() = __x;
-	return *this;
-      }
-#else
-      multimap&
-      operator=(const multimap&) = default;
-
-      multimap&
-      operator=(multimap&&) = default;
-
-      multimap&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_base() = __l;
-	this->_M_invalidate_all();
-	return *this;
-      }
-#endif
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-      // capacity:
-      using _Base::empty;
-      using _Base::size;
-      using _Base::max_size;
-
-      // modifiers:
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{
-	  return iterator(_Base::emplace(std::forward<_Args>(__args)...), this);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__pos);
-	  return iterator(_Base::emplace_hint(__pos.base(),
-					      std::forward<_Args>(__args)...),
-			  this);
-	}
-#endif
-
-      iterator
-      insert(const value_type& __x)
-      { return iterator(_Base::insert(__x), this); }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(_Pair&& __x)
-	{ return iterator(_Base::insert(std::forward<_Pair>(__x)), this); }
-#endif
-
-#if __cplusplus >= 201103L
-      void
-      insert(std::initializer_list<value_type> __list)
-      { _Base::insert(__list); }
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __position, const value_type& __x)
-#else
-      insert(iterator __position, const value_type& __x)
-#endif
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __x), this);
-      }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(const_iterator __position, _Pair&& __x)
-	{
-	  __glibcxx_check_insert(__position);
-	  return iterator(_Base::insert(__position.base(),
-					std::forward<_Pair>(__x)), this);
-	}
-#endif
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::insert(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	}
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	this->_M_invalidate_if(_Equal(__position.base()));
-	return iterator(_Base::erase(__position.base()), this);
-      }
-
-      iterator
-      erase(iterator __position)
-      { return erase(const_iterator(__position)); }
-#else
-      void
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	this->_M_invalidate_if(_Equal(__position.base()));
-	_Base::erase(__position.base());
-      }
-#endif
-
-      size_type
-      erase(const key_type& __x)
-      {
-	std::pair<_Base_iterator, _Base_iterator> __victims =
-	  _Base::equal_range(__x);
-	size_type __count = 0;
-	_Base_iterator __victim = __victims.first;
-	while (__victim !=  __victims.second)
-	  {
-	    this->_M_invalidate_if(_Equal(__victim));
-	    _Base::erase(__victim++);
-	    ++__count;
-	  }
-	return __count;
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_const_iterator __victim = __first.base();
-	     __victim != __last.base(); ++__victim)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if(_Equal(__victim));
-	  }
-	return iterator(_Base::erase(__first.base(), __last.base()), this);
-      }
-#else
-      void
-      erase(iterator __first, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_iterator __victim = __first.base();
-	     __victim != __last.base(); ++__victim)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if(_Equal(__victim));
-	  }
-	_Base::erase(__first.base(), __last.base());
-      }
-#endif
-
-      void
-      swap(multimap& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-      }
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_invalidate_all();
-	_Base::clear();
-      }
-
-      // observers:
-      using _Base::key_comp;
-      using _Base::value_comp;
-
-      // 23.3.1.3 multimap operations:
-      iterator
-      find(const key_type& __x)
-      { return iterator(_Base::find(__x), this); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return const_iterator(_Base::find(__x), this); }
-
-      using _Base::count;
-
-      iterator
-      lower_bound(const key_type& __x)
-      { return iterator(_Base::lower_bound(__x), this); }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return const_iterator(_Base::lower_bound(__x), this); }
-
-      iterator
-      upper_bound(const key_type& __x)
-      { return iterator(_Base::upper_bound(__x), this); }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return const_iterator(_Base::upper_bound(__x), this); }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	_Base::equal_range(__x);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	std::pair<_Base_const_iterator, _Base_const_iterator> __res =
-	  _Base::equal_range(__x);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT { return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT { return *this; }
-    };
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator==(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator!=(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator<(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	      const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator<=(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator>=(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator>(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	      const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline void
-    swap(multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	 multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { __lhs.swap(__rhs); }
-
-} // namespace __debug
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/multiset.h b/openflow/usr/include/c++/5/debug/multiset.h
deleted file mode 100644
index 8dec44e..0000000
--- a/openflow/usr/include/c++/5/debug/multiset.h
+++ /dev/null
@@ -1,483 +0,0 @@
-// Debugging multiset implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/multiset.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_MULTISET_H
-#define _GLIBCXX_DEBUG_MULTISET_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-#include <utility>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::multiset with safety/checking/debug instrumentation.
-  template<typename _Key, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<_Key> >
-    class multiset
-    : public __gnu_debug::_Safe_container<
-	multiset<_Key, _Compare, _Allocator>, _Allocator,
-	__gnu_debug::_Safe_node_sequence>,
-      public _GLIBCXX_STD_C::multiset<_Key, _Compare, _Allocator>
-    {
-      typedef _GLIBCXX_STD_C::multiset<_Key, _Compare, _Allocator>	_Base;
-      typedef __gnu_debug::_Safe_container<
-	multiset, _Allocator, __gnu_debug::_Safe_node_sequence>		_Safe;
-
-      typedef typename _Base::const_iterator	_Base_const_iterator;
-      typedef typename _Base::iterator		_Base_iterator;
-      typedef __gnu_debug::_Equal_to<_Base_const_iterator> _Equal;
-
-    public:
-      // types:
-      typedef _Key					key_type;
-      typedef _Key					value_type;
-      typedef _Compare					key_compare;
-      typedef _Compare					value_compare;
-      typedef _Allocator				allocator_type;
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<_Base_iterator, multiset>
-							iterator;
-      typedef __gnu_debug::_Safe_iterator<_Base_const_iterator,
-					  multiset>	const_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-      typedef typename _Base::pointer			pointer;
-      typedef typename _Base::const_pointer		const_pointer;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      // 23.3.3.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      multiset() : _Base() { }
-
-      multiset(const multiset& __x)
-      : _Base(__x) { }
-
-      ~multiset() { }
-#else
-      multiset() = default;
-      multiset(const multiset&) = default;
-      multiset(multiset&&) = default;
-
-      multiset(initializer_list<value_type> __l,
-	       const _Compare& __comp = _Compare(),
-	       const allocator_type& __a = allocator_type())
-      : _Base(__l, __comp, __a) { }
-
-      explicit
-      multiset(const allocator_type& __a)
-      : _Base(__a) { }
-
-      multiset(const multiset& __m, const allocator_type& __a)
-      : _Base(__m, __a) { }
-
-      multiset(multiset&& __m, const allocator_type& __a)
-      : _Safe(std::move(__m._M_safe()), __a),
-	_Base(std::move(__m._M_base()), __a) { }
-
-      multiset(initializer_list<value_type> __l, const allocator_type& __a)
-	: _Base(__l, __a)
-      { }
-
-      template<typename _InputIterator>
-	multiset(_InputIterator __first, _InputIterator __last,
-		 const allocator_type& __a)
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __a) { }
-
-      ~multiset() = default;
-#endif
-
-      explicit multiset(const _Compare& __comp,
-			const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-      template<typename _InputIterator>
-	multiset(_InputIterator __first, _InputIterator __last,
-		 const _Compare& __comp = _Compare(),
-		 const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last),
-		__comp, __a) { }
-
-      multiset(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      multiset&
-      operator=(const multiset& __x)
-      {
-	this->_M_safe() = __x;
-	_M_base() = __x;
-	return *this;
-      }
-#else
-      multiset&
-      operator=(const multiset&) = default;
-
-      multiset&
-      operator=(multiset&&) = default;
-
-      multiset&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_base() = __l;
-	this->_M_invalidate_all();
-	return *this;
-      }
-#endif
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-      // capacity:
-      using _Base::empty;
-      using _Base::size;
-      using _Base::max_size;
-
-      // modifiers:
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{
-	  return iterator(_Base::emplace(std::forward<_Args>(__args)...),
-			  this);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__pos);
-	  return iterator(_Base::emplace_hint(__pos.base(),
-					      std::forward<_Args>(__args)...),
-			  this);
-	}
-#endif
-
-      iterator
-      insert(const value_type& __x)
-      { return iterator(_Base::insert(__x), this); }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(value_type&& __x)
-      { return iterator(_Base::insert(std::move(__x)), this); }
-#endif
-
-      iterator
-      insert(const_iterator __position, const value_type& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __x), this);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __position, value_type&& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), std::move(__x)),
-			this);
-      }
-#endif
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::insert(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	}
-
-#if __cplusplus >= 201103L
-      void
-      insert(initializer_list<value_type> __l)
-      { _Base::insert(__l); }
-#endif
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	this->_M_invalidate_if(_Equal(__position.base()));
-	return iterator(_Base::erase(__position.base()), this);
-      }
-#else
-      void
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	this->_M_invalidate_if(_Equal(__position.base()));
-	_Base::erase(__position.base());
-      }
-#endif
-
-      size_type
-      erase(const key_type& __x)
-      {
-	std::pair<_Base_iterator, _Base_iterator> __victims =
-	  _Base::equal_range(__x);
-	size_type __count = 0;
-	_Base_iterator __victim = __victims.first;
-	while (__victim != __victims.second)
-	  {
-	    this->_M_invalidate_if(_Equal(__victim));
-	    _Base::erase(__victim++);
-	    ++__count;
-	  }
-	return __count;
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_const_iterator __victim = __first.base();
-	     __victim != __last.base(); ++__victim)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if(_Equal(__victim));
-	  }
-	return iterator(_Base::erase(__first.base(), __last.base()), this);
-      }
-#else
-      void
-      erase(iterator __first, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_iterator __victim = __first.base();
-	     __victim != __last.base(); ++__victim)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if(_Equal(__victim));
-	  }
-	_Base::erase(__first.base(), __last.base());
-      }
-#endif
-
-      void
-      swap(multiset& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-      }
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_invalidate_all();
-	_Base::clear();
-      }
-
-      // observers:
-      using _Base::key_comp;
-      using _Base::value_comp;
-
-      // multiset operations:
-      iterator
-      find(const key_type& __x)
-      { return iterator(_Base::find(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      find(const key_type& __x) const
-      { return const_iterator(_Base::find(__x), this); }
-
-      using _Base::count;
-
-      iterator
-      lower_bound(const key_type& __x)
-      { return iterator(_Base::lower_bound(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return const_iterator(_Base::lower_bound(__x), this); }
-
-      iterator
-      upper_bound(const key_type& __x)
-      { return iterator(_Base::upper_bound(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return const_iterator(_Base::upper_bound(__x), this); }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	  _Base::equal_range(__x);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	std::pair<_Base_const_iterator, _Base_const_iterator> __res =
-	  _Base::equal_range(__x);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT { return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT { return *this; }
-    };
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator==(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	       const multiset<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator!=(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	       const multiset<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	      const multiset<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<=(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	       const multiset<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>=(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	       const multiset<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	      const multiset<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    void
-    swap(multiset<_Key, _Compare, _Allocator>& __x,
-	 multiset<_Key, _Compare, _Allocator>& __y)
-    { return __x.swap(__y); }
-
-} // namespace __debug
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/safe_base.h b/openflow/usr/include/c++/5/debug/safe_base.h
deleted file mode 100644
index c9f32bf..0000000
--- a/openflow/usr/include/c++/5/debug/safe_base.h
+++ /dev/null
@@ -1,262 +0,0 @@
-// Safe sequence/iterator base implementation  -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_base.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_BASE_H
-#define _GLIBCXX_DEBUG_SAFE_BASE_H 1
-
-#include <ext/concurrence.h>
-
-namespace __gnu_debug
-{
-  class _Safe_sequence_base;
-
-  /** \brief Basic functionality for a @a safe iterator.
-   *
-   *  The %_Safe_iterator_base base class implements the functionality
-   *  of a safe iterator that is not specific to a particular iterator
-   *  type. It contains a pointer back to the sequence it references
-   *  along with iterator version information and pointers to form a
-   *  doubly-linked list of iterators referenced by the container.
-   *
-   *  This class must not perform any operations that can throw an
-   *  exception, or the exception guarantees of derived iterators will
-   *  be broken.
-   */
-  class _Safe_iterator_base
-  {
-  public:
-    /** The sequence this iterator references; may be NULL to indicate
-	a singular iterator. */
-    _Safe_sequence_base*	_M_sequence;
-
-    /** The version number of this iterator. The sentinel value 0 is
-     *  used to indicate an invalidated iterator (i.e., one that is
-     *  singular because of an operation on the container). This
-     *  version number must equal the version number in the sequence
-     *  referenced by _M_sequence for the iterator to be
-     *  non-singular.
-     */
-    unsigned int		_M_version;
-
-    /** Pointer to the previous iterator in the sequence's list of
-	iterators. Only valid when _M_sequence != NULL. */
-    _Safe_iterator_base*	_M_prior;
-
-    /** Pointer to the next iterator in the sequence's list of
-	iterators. Only valid when _M_sequence != NULL. */
-    _Safe_iterator_base*	_M_next;
-
-  protected:
-    /** Initializes the iterator and makes it singular. */
-    _Safe_iterator_base()
-    : _M_sequence(0), _M_version(0), _M_prior(0), _M_next(0)
-    { }
-
-    /** Initialize the iterator to reference the sequence pointed to
-     *  by @p __seq. @p __constant is true when we are initializing a
-     *  constant iterator, and false if it is a mutable iterator. Note
-     *  that @p __seq may be NULL, in which case the iterator will be
-     *  singular. Otherwise, the iterator will reference @p __seq and
-     *  be nonsingular.
-     */
-    _Safe_iterator_base(const _Safe_sequence_base* __seq, bool __constant)
-    : _M_sequence(0), _M_version(0), _M_prior(0), _M_next(0)
-    { this->_M_attach(const_cast<_Safe_sequence_base*>(__seq), __constant); }
-
-    /** Initializes the iterator to reference the same sequence that
-	@p __x does. @p __constant is true if this is a constant
-	iterator, and false if it is mutable. */
-    _Safe_iterator_base(const _Safe_iterator_base& __x, bool __constant)
-    : _M_sequence(0), _M_version(0), _M_prior(0), _M_next(0)
-    { this->_M_attach(__x._M_sequence, __constant); }
-
-    ~_Safe_iterator_base() { this->_M_detach(); }
-
-    /** For use in _Safe_iterator. */
-    __gnu_cxx::__mutex&
-    _M_get_mutex() throw ();
-
-  public:
-    /** Attaches this iterator to the given sequence, detaching it
-     *	from whatever sequence it was attached to originally. If the
-     *	new sequence is the NULL pointer, the iterator is left
-     *	unattached.
-     */
-    void
-    _M_attach(_Safe_sequence_base* __seq, bool __constant);
-
-    /** Likewise, but not thread-safe. */
-    void
-    _M_attach_single(_Safe_sequence_base* __seq, bool __constant) throw ();
-
-    /** Detach the iterator for whatever sequence it is attached to,
-     *	if any.
-    */
-    void
-    _M_detach();
-
-    /** Likewise, but not thread-safe. */
-    void
-    _M_detach_single() throw ();
-
-    /** Determines if we are attached to the given sequence. */
-    bool
-    _M_attached_to(const _Safe_sequence_base* __seq) const
-    { return _M_sequence == __seq; }
-
-    /** Is this iterator singular? */
-    _GLIBCXX_PURE bool
-    _M_singular() const throw ();
-
-    /** Can we compare this iterator to the given iterator @p __x?
-	Returns true if both iterators are nonsingular and reference
-	the same sequence. */
-    _GLIBCXX_PURE bool
-    _M_can_compare(const _Safe_iterator_base& __x) const throw ();
-
-    /** Invalidate the iterator, making it singular. */
-    void
-    _M_invalidate()
-    { _M_version = 0; }
-
-    /** Reset all member variables */
-    void
-    _M_reset() throw ();
-
-    /** Unlink itself */
-    void
-    _M_unlink() throw ()
-    {
-      if (_M_prior)
-	_M_prior->_M_next = _M_next;
-      if (_M_next)
-	_M_next->_M_prior = _M_prior;
-    }
-  };
-
-  /**
-   * @brief Base class that supports tracking of iterators that
-   * reference a sequence.
-   *
-   * The %_Safe_sequence_base class provides basic support for
-   * tracking iterators into a sequence. Sequences that track
-   * iterators must derived from %_Safe_sequence_base publicly, so
-   * that safe iterators (which inherit _Safe_iterator_base) can
-   * attach to them. This class contains two linked lists of
-   * iterators, one for constant iterators and one for mutable
-   * iterators, and a version number that allows very fast
-   * invalidation of all iterators that reference the container.
-   *
-   * This class must ensure that no operation on it may throw an
-   * exception, otherwise @a safe sequences may fail to provide the
-   * exception-safety guarantees required by the C++ standard.
-   */
-  class _Safe_sequence_base
-  {
-  public:
-    /// The list of mutable iterators that reference this container
-    _Safe_iterator_base* _M_iterators;
-
-    /// The list of constant iterators that reference this container
-    _Safe_iterator_base* _M_const_iterators;
-
-    /// The container version number. This number may never be 0.
-    mutable unsigned int _M_version;
-
-  protected:
-    // Initialize with a version number of 1 and no iterators
-    _Safe_sequence_base() _GLIBCXX_NOEXCEPT
-    : _M_iterators(0), _M_const_iterators(0), _M_version(1)
-    { }
-
-#if __cplusplus >= 201103L
-    _Safe_sequence_base(const _Safe_sequence_base&) noexcept
-    : _Safe_sequence_base() { }
-#endif
-
-    /** Notify all iterators that reference this sequence that the
-	sequence is being destroyed. */
-    ~_Safe_sequence_base()
-    { this->_M_detach_all(); }
-
-    /** Detach all iterators, leaving them singular. */
-    void
-    _M_detach_all();
-
-    /** Detach all singular iterators.
-     *  @post for all iterators i attached to this sequence,
-     *   i->_M_version == _M_version.
-     */
-    void
-    _M_detach_singular();
-
-    /** Revalidates all attached singular iterators.  This method may
-     *  be used to validate iterators that were invalidated before
-     *  (but for some reason, such as an exception, need to become
-     *  valid again).
-     */
-    void
-    _M_revalidate_singular();
-
-    /** Swap this sequence with the given sequence. This operation
-     *  also swaps ownership of the iterators, so that when the
-     *  operation is complete all iterators that originally referenced
-     *  one container now reference the other container.
-     */
-    void
-    _M_swap(_Safe_sequence_base& __x) _GLIBCXX_USE_NOEXCEPT;
-
-    /** For use in _Safe_sequence. */
-    __gnu_cxx::__mutex&
-    _M_get_mutex() throw ();
-
-  public:
-    /** Invalidates all iterators. */
-    void
-    _M_invalidate_all() const
-    { if (++_M_version == 0) _M_version = 1; }
-
-    /** Attach an iterator to this sequence. */
-    void
-    _M_attach(_Safe_iterator_base* __it, bool __constant);
-
-    /** Likewise but not thread safe. */
-    void
-    _M_attach_single(_Safe_iterator_base* __it, bool __constant) throw ();
-
-    /** Detach an iterator from this sequence */
-    void
-    _M_detach(_Safe_iterator_base* __it);
-
-    /** Likewise but not thread safe. */
-    void
-    _M_detach_single(_Safe_iterator_base* __it) throw ();
-  };
-} // namespace __gnu_debug
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/safe_container.h b/openflow/usr/include/c++/5/debug/safe_container.h
deleted file mode 100644
index 00232b7..0000000
--- a/openflow/usr/include/c++/5/debug/safe_container.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// Safe container implementation  -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_container.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_CONTAINER_H
-#define _GLIBCXX_DEBUG_SAFE_CONTAINER_H 1
-
-#include <ext/alloc_traits.h>
-
-namespace __gnu_debug
-{
-  /// Safe class dealing with some allocator dependent operations.
-  template<typename _SafeContainer,
-	   typename _Alloc,
-	   template<typename> class _SafeBase,
-	   bool _IsCxx11AllocatorAware = true>
-    class _Safe_container
-    : public _SafeBase<_SafeContainer>
-    {
-      typedef _SafeBase<_SafeContainer> _Base;
-
-      _SafeContainer&
-      _M_cont() _GLIBCXX_NOEXCEPT
-      { return *static_cast<_SafeContainer*>(this); }
-
-    protected:
-      _Safe_container&
-      _M_safe() _GLIBCXX_NOEXCEPT
-      { return *this; }
-
-#if __cplusplus >= 201103L
-      _Safe_container() = default;
-      _Safe_container(const _Safe_container&) = default;
-      _Safe_container(_Safe_container&& __x) noexcept
-      : _Safe_container()
-      { _Base::_M_swap(__x); }
-
-      _Safe_container(_Safe_container&& __x,
-		      const _Alloc& __a)
-      : _Safe_container()
-      {
-	if (__x._M_cont().get_allocator() == __a)
-	  _Base::_M_swap(__x);
-	else
-	  __x._M_invalidate_all();
-      }
-#endif
-
-    public:
-      // Copy assignment invalidate all iterators.
-      _Safe_container&
-      operator=(const _Safe_container&) _GLIBCXX_NOEXCEPT
-      {
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      _Safe_container&
-      operator=(_Safe_container&& __x) noexcept
-      {
-	__glibcxx_check_self_move_assign(__x);
-
-	if (_IsCxx11AllocatorAware)
-	  {
-	    typedef __gnu_cxx::__alloc_traits<_Alloc> _Alloc_traits;
-
-	    bool __xfer_memory = _Alloc_traits::_S_propagate_on_move_assign()
-	      || _M_cont().get_allocator() == __x._M_cont().get_allocator();
-	    if (__xfer_memory)
-	      _Base::_M_swap(__x);
-	    else
-	      this->_M_invalidate_all();
-	  }
-	else
-	  _Base::_M_swap(__x);
-
-	__x._M_invalidate_all();
-	return *this;
-      }
-
-      void
-      _M_swap(_Safe_container& __x) noexcept
-      {
-	if (_IsCxx11AllocatorAware)
-	  {
-	    typedef __gnu_cxx::__alloc_traits<_Alloc> _Alloc_traits;
-
-	    if (!_Alloc_traits::_S_propagate_on_swap())
-	      __glibcxx_check_equal_allocs(this->_M_cont()._M_base(),
-					   __x._M_cont()._M_base());
-	  }
-
-	_Base::_M_swap(__x);
-      }
-#endif
-    };
-
-} // namespace __gnu_debug
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/safe_iterator.h b/openflow/usr/include/c++/5/debug/safe_iterator.h
deleted file mode 100644
index 1eea238..0000000
--- a/openflow/usr/include/c++/5/debug/safe_iterator.h
+++ /dev/null
@@ -1,775 +0,0 @@
-// Safe iterator implementation  -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_iterator.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_ITERATOR_H
-#define _GLIBCXX_DEBUG_SAFE_ITERATOR_H 1
-
-#include <debug/debug.h>
-#include <debug/macros.h>
-#include <debug/functions.h>
-#include <debug/safe_base.h>
-#include <bits/stl_pair.h>
-#include <ext/type_traits.h>
-
-namespace __gnu_debug
-{
-  /** Helper struct to deal with sequence offering a before_begin
-   *  iterator.
-   **/
-  template <typename _Sequence>
-    struct _BeforeBeginHelper
-    {
-      template<typename _Iterator>
-	static bool
-	_S_Is(const _Safe_iterator<_Iterator, _Sequence>&)
-	{ return false; }
-
-      template<typename _Iterator>
-	static bool
-	_S_Is_Beginnest(const _Safe_iterator<_Iterator, _Sequence>& __it)
-	{ return __it.base() == __it._M_get_sequence()->_M_base().begin(); }
-    };
-
-  /** Iterators that derive from _Safe_iterator_base can be determined singular
-   *  or non-singular.
-   **/
-  inline bool
-  __check_singular_aux(const _Safe_iterator_base* __x)
-  { return __x->_M_singular(); }
-
-  /** The precision to which we can calculate the distance between
-   *  two iterators.
-   */
-  enum _Distance_precision
-    {
-      __dp_equality, //< Can compare iterator equality, only
-      __dp_sign,     //< Can determine equality and ordering
-      __dp_exact     //< Can determine distance precisely
-    };
-
-  /** Determine the distance between two iterators with some known
-   *	precision.
-  */
-  template<typename _Iterator>
-    inline std::pair<typename std::iterator_traits<_Iterator>::difference_type,
-		     _Distance_precision>
-    __get_distance(const _Iterator& __lhs, const _Iterator& __rhs,
-		   std::random_access_iterator_tag)
-    { return std::make_pair(__rhs - __lhs, __dp_exact); }
-
-  template<typename _Iterator>
-    inline std::pair<typename std::iterator_traits<_Iterator>::difference_type,
-		     _Distance_precision>
-    __get_distance(const _Iterator& __lhs, const _Iterator& __rhs,
-		   std::forward_iterator_tag)
-    { return std::make_pair(__lhs == __rhs? 0 : 1, __dp_equality); }
-
-  template<typename _Iterator>
-    inline std::pair<typename std::iterator_traits<_Iterator>::difference_type,
-		     _Distance_precision>
-    __get_distance(const _Iterator& __lhs, const _Iterator& __rhs)
-    {
-      typedef typename std::iterator_traits<_Iterator>::iterator_category
-	  _Category;
-      return __get_distance(__lhs, __rhs, _Category());
-    }
-
-  /** \brief Safe iterator wrapper.
-   *
-   *  The class template %_Safe_iterator is a wrapper around an
-   *  iterator that tracks the iterator's movement among sequences and
-   *  checks that operations performed on the "safe" iterator are
-   *  legal. In additional to the basic iterator operations (which are
-   *  validated, and then passed to the underlying iterator),
-   *  %_Safe_iterator has member functions for iterator invalidation,
-   *  attaching/detaching the iterator from sequences, and querying
-   *  the iterator's state.
-   *
-   *  Note that _Iterator must be the first base class so that it gets
-   *  initialized before the iterator is being attached to the container's list
-   *  of iterators and it is being detached before _Iterator get
-   *  destroyed. Otherwise it would result in a data race.
-   */
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_iterator
-    : private _Iterator,
-      public _Safe_iterator_base
-    {
-      typedef _Iterator _Iter_base;
-      typedef _Safe_iterator_base _Safe_base;
-      typedef typename _Sequence::const_iterator _Const_iterator;
-
-      /// Determine if this is a constant iterator.
-      bool
-      _M_constant() const
-      { return std::__are_same<_Const_iterator, _Safe_iterator>::__value; }
-
-      typedef std::iterator_traits<_Iterator> _Traits;
-
-      struct _Attach_single
-      { };
-
-      _Safe_iterator(const _Iterator& __i, _Safe_sequence_base* __seq,
-		     _Attach_single)
-      _GLIBCXX_NOEXCEPT
-      : _Iter_base(__i)
-      { _M_attach_single(__seq); }
-
-    public:
-      typedef _Iterator					iterator_type;
-      typedef typename _Traits::iterator_category	iterator_category;
-      typedef typename _Traits::value_type		value_type;
-      typedef typename _Traits::difference_type		difference_type;
-      typedef typename _Traits::reference		reference;
-      typedef typename _Traits::pointer			pointer;
-
-      /// @post the iterator is singular and unattached
-      _Safe_iterator() _GLIBCXX_NOEXCEPT : _Iter_base() { }
-
-      /**
-       * @brief Safe iterator construction from an unsafe iterator and
-       * its sequence.
-       *
-       * @pre @p seq is not NULL
-       * @post this is not singular
-       */
-      _Safe_iterator(const _Iterator& __i, const _Safe_sequence_base* __seq)
-      _GLIBCXX_NOEXCEPT
-      : _Iter_base(__i), _Safe_base(__seq, _M_constant())
-      {
-	_GLIBCXX_DEBUG_VERIFY(!this->_M_singular(),
-			      _M_message(__msg_init_singular)
-			      ._M_iterator(*this, "this"));
-      }
-
-      /**
-       * @brief Copy construction.
-       */
-      _Safe_iterator(const _Safe_iterator& __x) _GLIBCXX_NOEXCEPT
-      : _Iter_base(__x.base())
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// DR 408. Is vector<reverse_iterator<char*> > forbidden?
-	_GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-			      || __x.base() == _Iterator(),
-			      _M_message(__msg_init_copy_singular)
-			      ._M_iterator(*this, "this")
-			      ._M_iterator(__x, "other"));
-	_M_attach(__x._M_sequence);
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       * @brief Move construction.
-       * @post __x is singular and unattached
-       */
-      _Safe_iterator(_Safe_iterator&& __x) noexcept
-      : _Iter_base()
-      {
-	_GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-			      || __x.base() == _Iterator(),
-			      _M_message(__msg_init_copy_singular)
-			      ._M_iterator(*this, "this")
-			      ._M_iterator(__x, "other"));
-	_Safe_sequence_base* __seq = __x._M_sequence;
-	__x._M_detach();
-	std::swap(base(), __x.base());
-	_M_attach(__seq);
-      }
-#endif
-
-      /**
-       *  @brief Converting constructor from a mutable iterator to a
-       *  constant iterator.
-      */
-      template<typename _MutableIterator>
-	_Safe_iterator(
-	  const _Safe_iterator<_MutableIterator,
-	  typename __gnu_cxx::__enable_if<(std::__are_same<_MutableIterator,
-		      typename _Sequence::iterator::iterator_type>::__value),
-		   _Sequence>::__type>& __x) _GLIBCXX_NOEXCEPT
-	: _Iter_base(__x.base())
-	{
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // DR 408. Is vector<reverse_iterator<char*> > forbidden?
-	  _GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-				|| __x.base() == _Iterator(),
-				_M_message(__msg_init_const_singular)
-				._M_iterator(*this, "this")
-				._M_iterator(__x, "other"));
-	  _M_attach(__x._M_sequence);
-	}
-
-      /**
-       * @brief Copy assignment.
-       */
-      _Safe_iterator&
-      operator=(const _Safe_iterator& __x) _GLIBCXX_NOEXCEPT
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// DR 408. Is vector<reverse_iterator<char*> > forbidden?
-	_GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-			      || __x.base() == _Iterator(),
-			      _M_message(__msg_copy_singular)
-			      ._M_iterator(*this, "this")
-			      ._M_iterator(__x, "other"));
-
-	if (this->_M_sequence && this->_M_sequence == __x._M_sequence)
-	  {
-	    __gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	    base() = __x.base();
-	    _M_version = __x._M_sequence->_M_version;
-	  }
-	else
-	  {
-	    _M_detach();
-	    base() = __x.base();
-	    _M_attach(__x._M_sequence);
-	  }
-
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       * @brief Move assignment.
-       * @post __x is singular and unattached
-       */
-      _Safe_iterator&
-      operator=(_Safe_iterator&& __x) noexcept
-      {
-	_GLIBCXX_DEBUG_VERIFY(this != &__x,
-			      _M_message(__msg_self_move_assign)
-			      ._M_iterator(*this, "this"));
-	_GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-			      || __x.base() == _Iterator(),
-			      _M_message(__msg_copy_singular)
-			      ._M_iterator(*this, "this")
-			      ._M_iterator(__x, "other"));
-
-	if (this->_M_sequence && this->_M_sequence == __x._M_sequence)
-	  {
-	    __gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	    base() = __x.base();
-	    _M_version = __x._M_sequence->_M_version;
-	  }
-	else
-	  {
-	    _M_detach();
-	    base() = __x.base();
-	    _M_attach(__x._M_sequence);
-	  }
-
-	__x._M_detach();
-	__x.base() = _Iterator();
-	return *this;
-      }
-#endif
-
-      /**
-       *  @brief Iterator dereference.
-       *  @pre iterator is dereferenceable
-       */
-      reference
-      operator*() const _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_dereferenceable(),
-			      _M_message(__msg_bad_deref)
-			      ._M_iterator(*this, "this"));
-	return *base();
-      }
-
-      /**
-       *  @brief Iterator dereference.
-       *  @pre iterator is dereferenceable
-       *  @todo Make this correct w.r.t. iterators that return proxies
-       */
-      pointer
-      operator->() const _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_dereferenceable(),
-			      _M_message(__msg_bad_deref)
-			      ._M_iterator(*this, "this"));
-	return std::__addressof(*base());
-      }
-
-      // ------ Input iterator requirements ------
-      /**
-       *  @brief Iterator preincrement
-       *  @pre iterator is incrementable
-       */
-      _Safe_iterator&
-      operator++() _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_incrementable(),
-			      _M_message(__msg_bad_inc)
-			      ._M_iterator(*this, "this"));
-	__gnu_cxx::__scoped_lock(this->_M_get_mutex());
-	++base();
-	return *this;
-      }
-
-      /**
-       *  @brief Iterator postincrement
-       *  @pre iterator is incrementable
-       */
-      _Safe_iterator
-      operator++(int) _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_incrementable(),
-			      _M_message(__msg_bad_inc)
-			      ._M_iterator(*this, "this"));
-	__gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	return _Safe_iterator(base()++, this->_M_sequence, _Attach_single());
-      }
-
-      // ------ Bidirectional iterator requirements ------
-      /**
-       *  @brief Iterator predecrement
-       *  @pre iterator is decrementable
-       */
-      _Safe_iterator&
-      operator--() _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_decrementable(),
-			      _M_message(__msg_bad_dec)
-			      ._M_iterator(*this, "this"));
-	__gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	--base();
-	return *this;
-      }
-
-      /**
-       *  @brief Iterator postdecrement
-       *  @pre iterator is decrementable
-       */
-      _Safe_iterator
-      operator--(int) _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_decrementable(),
-			      _M_message(__msg_bad_dec)
-			      ._M_iterator(*this, "this"));
-	__gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	return _Safe_iterator(base()--, this->_M_sequence, _Attach_single());
-      }
-
-      // ------ Random access iterator requirements ------
-      reference
-      operator[](const difference_type& __n) const _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_can_advance(__n)
-			      && this->_M_can_advance(__n+1),
-			      _M_message(__msg_iter_subscript_oob)
-			      ._M_iterator(*this)._M_integer(__n));
-	return base()[__n];
-      }
-
-      _Safe_iterator&
-      operator+=(const difference_type& __n) _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_can_advance(__n),
-			      _M_message(__msg_advance_oob)
-			      ._M_iterator(*this)._M_integer(__n));
-	__gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	base() += __n;
-	return *this;
-      }
-
-      _Safe_iterator
-      operator+(const difference_type& __n) const _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_can_advance(__n),
-			      _M_message(__msg_advance_oob)
-			      ._M_iterator(*this)._M_integer(__n));
-	return _Safe_iterator(base() + __n, this->_M_sequence);
-      }
-
-      _Safe_iterator&
-      operator-=(const difference_type& __n) _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_can_advance(-__n),
-			      _M_message(__msg_retreat_oob)
-			      ._M_iterator(*this)._M_integer(__n));
-	__gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	base() -= __n;
-	return *this;
-      }
-
-      _Safe_iterator
-      operator-(const difference_type& __n) const _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_can_advance(-__n),
-			      _M_message(__msg_retreat_oob)
-			      ._M_iterator(*this)._M_integer(__n));
-	return _Safe_iterator(base() - __n, this->_M_sequence);
-      }
-
-      // ------ Utilities ------
-      /**
-       * @brief Return the underlying iterator
-       */
-      _Iterator&
-      base() _GLIBCXX_NOEXCEPT { return *this; }
-
-      const _Iterator&
-      base() const _GLIBCXX_NOEXCEPT { return *this; }
-
-      /**
-       * @brief Conversion to underlying non-debug iterator to allow
-       * better interaction with non-debug containers.
-       */
-      operator _Iterator() const _GLIBCXX_NOEXCEPT { return *this; }
-
-      /** Attach iterator to the given sequence. */
-      void
-      _M_attach(_Safe_sequence_base* __seq)
-      { _Safe_base::_M_attach(__seq, _M_constant()); }
-
-      /** Likewise, but not thread-safe. */
-      void
-      _M_attach_single(_Safe_sequence_base* __seq)
-      { _Safe_base::_M_attach_single(__seq, _M_constant()); }
-
-      /// Is the iterator dereferenceable?
-      bool
-      _M_dereferenceable() const
-      { return !this->_M_singular() && !_M_is_end() && !_M_is_before_begin(); }
-
-      /// Is the iterator before a dereferenceable one?
-      bool
-      _M_before_dereferenceable() const
-      {
-	if (this->_M_incrementable())
-	{
-	  _Iterator __base = base();
-	  return ++__base != _M_get_sequence()->_M_base().end();
-	}
-	return false;
-      }
-
-      /// Is the iterator incrementable?
-      bool
-      _M_incrementable() const
-      { return !this->_M_singular() && !_M_is_end(); }
-
-      // Is the iterator decrementable?
-      bool
-      _M_decrementable() const { return !_M_singular() && !_M_is_begin(); }
-
-      // Can we advance the iterator @p __n steps (@p __n may be negative)
-      bool
-      _M_can_advance(const difference_type& __n) const;
-
-      // Is the iterator range [*this, __rhs) valid?
-      bool
-      _M_valid_range(const _Safe_iterator& __rhs) const;
-
-      // The sequence this iterator references.
-      typename
-      __gnu_cxx::__conditional_type<std::__are_same<_Const_iterator,
-						    _Safe_iterator>::__value,
-				    const _Sequence*,
-				    _Sequence*>::__type
-      _M_get_sequence() const
-      { return static_cast<_Sequence*>(_M_sequence); }
-
-      /// Is this iterator equal to the sequence's begin() iterator?
-      bool
-      _M_is_begin() const
-      { return base() == _M_get_sequence()->_M_base().begin(); }
-
-      /// Is this iterator equal to the sequence's end() iterator?
-      bool
-      _M_is_end() const
-      { return base() == _M_get_sequence()->_M_base().end(); }
-
-      /// Is this iterator equal to the sequence's before_begin() iterator if
-      /// any?
-      bool
-      _M_is_before_begin() const
-      { return _BeforeBeginHelper<_Sequence>::_S_Is(*this); }
-
-      /// Is this iterator equal to the sequence's before_begin() iterator if
-      /// any or begin() otherwise?
-      bool
-      _M_is_beginnest() const
-      { return _BeforeBeginHelper<_Sequence>::_S_Is_Beginnest(*this); }
-    };
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator==(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	       const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() == __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator==(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-	       const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() == __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator!=(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	       const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() != __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator!=(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-	       const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() != __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator<(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	      const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() < __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator<(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-	      const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() < __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator<=(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	       const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() <= __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator<=(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-	       const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() <= __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator>(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	      const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() > __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator>(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-	      const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() > __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator>=(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	       const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() >= __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator>=(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-	       const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() >= __rhs.base();
-    }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // According to the resolution of DR179 not only the various comparison
-  // operators but also operator- must accept mixed iterator/const_iterator
-  // parameters.
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline typename _Safe_iterator<_IteratorL, _Sequence>::difference_type
-    operator-(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	      const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_distance_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_distance_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() - __rhs.base();
-    }
-
-   template<typename _Iterator, typename _Sequence>
-     inline typename _Safe_iterator<_Iterator, _Sequence>::difference_type
-     operator-(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-	       const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-     {
-       _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			     _M_message(__msg_distance_bad)
-			     ._M_iterator(__lhs, "lhs")
-			     ._M_iterator(__rhs, "rhs"));
-       _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			     _M_message(__msg_distance_different)
-			     ._M_iterator(__lhs, "lhs")
-			     ._M_iterator(__rhs, "rhs"));
-       return __lhs.base() - __rhs.base();
-     }
-
-  template<typename _Iterator, typename _Sequence>
-    inline _Safe_iterator<_Iterator, _Sequence>
-    operator+(typename _Safe_iterator<_Iterator,_Sequence>::difference_type __n,
-	      const _Safe_iterator<_Iterator, _Sequence>& __i) _GLIBCXX_NOEXCEPT
-    { return __i + __n; }
-} // namespace __gnu_debug
-
-#include <debug/safe_iterator.tcc>
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/safe_iterator.tcc b/openflow/usr/include/c++/5/debug/safe_iterator.tcc
deleted file mode 100644
index 47b6f2f..0000000
--- a/openflow/usr/include/c++/5/debug/safe_iterator.tcc
+++ /dev/null
@@ -1,100 +0,0 @@
-// Debugging iterator implementation (out of line) -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_iterator.tcc
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_ITERATOR_TCC
-#define _GLIBCXX_DEBUG_SAFE_ITERATOR_TCC 1
-
-namespace __gnu_debug
-{
-  template<typename _Iterator, typename _Sequence>
-    bool
-    _Safe_iterator<_Iterator, _Sequence>::
-    _M_can_advance(const difference_type& __n) const
-    {
-      if (this->_M_singular())
-	return false;
-      if (__n == 0)
-	return true;
-      if (__n < 0)
-	{
-	  std::pair<difference_type, _Distance_precision> __dist =
-	    __get_distance(_M_get_sequence()->_M_base().begin(), base());
-	  bool __ok =  ((__dist.second == __dp_exact && __dist.first >= -__n)
-			|| (__dist.second != __dp_exact && __dist.first > 0));
-	  return __ok;
-	}
-      else
-	{
-	  std::pair<difference_type, _Distance_precision> __dist =
-	    __get_distance(base(), _M_get_sequence()->_M_base().end());
-	  bool __ok = ((__dist.second == __dp_exact && __dist.first >= __n)
-		       || (__dist.second != __dp_exact && __dist.first > 0));
-	  return __ok;
-	}
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    bool
-    _Safe_iterator<_Iterator, _Sequence>::
-    _M_valid_range(const _Safe_iterator& __rhs) const
-    {
-      if (!_M_can_compare(__rhs))
-	return false;
-
-      /* Determine if we can order the iterators without the help of
-	 the container */
-      std::pair<difference_type, _Distance_precision> __dist =
-	__get_distance(base(), __rhs.base());
-      switch (__dist.second) {
-      case __dp_equality:
-	if (__dist.first == 0)
-	  return true;
-	break;
-
-      case __dp_sign:
-      case __dp_exact:
-	return __dist.first >= 0;
-      }
-
-      /* We can only test for equality, but check if one of the
-	 iterators is at an extreme. */
-      /* Optim for classic [begin, it) or [it, end) ranges, limit checks
-       * when code is valid.  Note, for the special case of forward_list,
-       * before_begin replaces the role of begin.  */ 
-      if (_M_is_beginnest() || __rhs._M_is_end())
-	return true;
-      if (_M_is_end() || __rhs._M_is_beginnest())
-	return false;
-
-      // Assume that this is a valid range; we can't check anything else
-      return true;
-    }
-} // namespace __gnu_debug
-
-#endif
-
diff --git a/openflow/usr/include/c++/5/debug/safe_local_iterator.h b/openflow/usr/include/c++/5/debug/safe_local_iterator.h
deleted file mode 100644
index 066e10b..0000000
--- a/openflow/usr/include/c++/5/debug/safe_local_iterator.h
+++ /dev/null
@@ -1,439 +0,0 @@
-// Safe iterator implementation  -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_local_iterator.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_LOCAL_ITERATOR_H
-#define _GLIBCXX_DEBUG_SAFE_LOCAL_ITERATOR_H 1
-
-#include <debug/debug.h>
-#include <debug/macros.h>
-#include <debug/functions.h>
-#include <debug/safe_unordered_base.h>
-#include <ext/type_traits.h>
-
-namespace __gnu_debug
-{
-  /** \brief Safe iterator wrapper.
-   *
-   *  The class template %_Safe_local_iterator is a wrapper around an
-   *  iterator that tracks the iterator's movement among sequences and
-   *  checks that operations performed on the "safe" iterator are
-   *  legal. In additional to the basic iterator operations (which are
-   *  validated, and then passed to the underlying iterator),
-   *  %_Safe_local_iterator has member functions for iterator invalidation,
-   *  attaching/detaching the iterator from sequences, and querying
-   *  the iterator's state.
-   */
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_local_iterator
-    : private _Iterator
-    , public _Safe_local_iterator_base
-    {
-      typedef _Iterator _Iter_base;
-      typedef _Safe_local_iterator_base _Safe_base;
-      typedef typename _Sequence::const_local_iterator _Const_local_iterator;
-      typedef typename _Sequence::size_type size_type;
-
-      /// Determine if this is a constant iterator.
-      bool
-      _M_constant() const
-      {
-	return std::__are_same<_Const_local_iterator,
-			       _Safe_local_iterator>::__value;
-      }
-
-      typedef std::iterator_traits<_Iterator> _Traits;
-
-      struct _Attach_single
-      { };
-
-      _Safe_local_iterator(const _Iterator& __i, _Safe_sequence_base* __cont,
-			   _Attach_single) noexcept
-      : _Iter_base(__i)
-      { _M_attach_single(__cont); }
-
-    public:
-      typedef _Iterator					iterator_type;
-      typedef typename _Traits::iterator_category	iterator_category;
-      typedef typename _Traits::value_type		value_type;
-      typedef typename _Traits::difference_type		difference_type;
-      typedef typename _Traits::reference		reference;
-      typedef typename _Traits::pointer			pointer;
-
-      /// @post the iterator is singular and unattached
-      _Safe_local_iterator() noexcept : _Iter_base() { }
-
-      /**
-       * @brief Safe iterator construction from an unsafe iterator and
-       * its sequence.
-       *
-       * @pre @p seq is not NULL
-       * @post this is not singular
-       */
-      _Safe_local_iterator(const _Iterator& __i,
-			   const _Safe_sequence_base* __cont)
-      : _Iter_base(__i), _Safe_base(__cont, _M_constant())
-      {
-	_GLIBCXX_DEBUG_VERIFY(!this->_M_singular(),
-			      _M_message(__msg_init_singular)
-			      ._M_iterator(*this, "this"));
-      }
-
-      /**
-       * @brief Copy construction.
-       */
-      _Safe_local_iterator(const _Safe_local_iterator& __x) noexcept
-      : _Iter_base(__x.base())
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// DR 408. Is vector<reverse_iterator<char*> > forbidden?
-	_GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-			      || __x.base() == _Iterator(),
-			      _M_message(__msg_init_copy_singular)
-			      ._M_iterator(*this, "this")
-			      ._M_iterator(__x, "other"));
-	_M_attach(__x._M_sequence);
-      }
-
-      /**
-       * @brief Move construction.
-       * @post __x is singular and unattached
-       */
-      _Safe_local_iterator(_Safe_local_iterator&& __x) noexcept
-      : _Iter_base()
-      {
-	_GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-			      || __x.base() == _Iterator(),
-			      _M_message(__msg_init_copy_singular)
-			      ._M_iterator(*this, "this")
-			      ._M_iterator(__x, "other"));
-	auto __cont = __x._M_sequence;
-	__x._M_detach();
-	std::swap(base(), __x.base());
-	_M_attach(__cont);
-      }
-
-      /**
-       *  @brief Converting constructor from a mutable iterator to a
-       *  constant iterator.
-      */
-      template<typename _MutableIterator>
-	_Safe_local_iterator(
-	  const _Safe_local_iterator<_MutableIterator,
-	  typename __gnu_cxx::__enable_if<std::__are_same<
-	      _MutableIterator,
-	      typename _Sequence::local_iterator::iterator_type>::__value,
-					  _Sequence>::__type>& __x)
-	: _Iter_base(__x.base())
-	{
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // DR 408. Is vector<reverse_iterator<char*> > forbidden?
-	  _GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-				|| __x.base() == _Iterator(),
-				_M_message(__msg_init_const_singular)
-				._M_iterator(*this, "this")
-				._M_iterator(__x, "other"));
-	  _M_attach(__x._M_sequence);
-	}
-
-      /**
-       * @brief Copy assignment.
-       */
-      _Safe_local_iterator&
-      operator=(const _Safe_local_iterator& __x)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// DR 408. Is vector<reverse_iterator<char*> > forbidden?
-	_GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-			      || __x.base() == _Iterator(),
-			      _M_message(__msg_copy_singular)
-			      ._M_iterator(*this, "this")
-			      ._M_iterator(__x, "other"));
-
-	if (this->_M_sequence && this->_M_sequence == __x._M_sequence)
-	  {
-	    __gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	    base() = __x.base();
-	    _M_version = __x._M_sequence->_M_version;
-	  }
-	else
-	  {
-	    _M_detach();
-	    base() = __x.base();
-	    _M_attach(__x._M_sequence);
-	  }
-
-	return *this;
-      }
-
-      /**
-       * @brief Move assignment.
-       * @post __x is singular and unattached
-       */
-      _Safe_local_iterator&
-      operator=(_Safe_local_iterator&& __x) noexcept
-      {
-	_GLIBCXX_DEBUG_VERIFY(this != &__x,
-			      _M_message(__msg_self_move_assign)
-			      ._M_iterator(*this, "this"));
-	_GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-			      || __x.base() == _Iterator(),
-			      _M_message(__msg_copy_singular)
-			      ._M_iterator(*this, "this")
-			      ._M_iterator(__x, "other"));
-
-	if (this->_M_sequence && this->_M_sequence == __x._M_sequence)
-	  {
-	    __gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	    base() = __x.base();
-	    _M_version = __x._M_sequence->_M_version;
-	  }
-	else
-	  {
-	    _M_detach();
-	    base() = __x.base();
-	    _M_attach(__x._M_sequence);
-	  }
-
-	__x._M_detach();
-	__x.base() = _Iterator();
-	return *this;
-      }
-
-      /**
-       *  @brief Iterator dereference.
-       *  @pre iterator is dereferenceable
-       */
-      reference
-      operator*() const
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_dereferenceable(),
-			      _M_message(__msg_bad_deref)
-			      ._M_iterator(*this, "this"));
-	return *base();
-      }
-
-      /**
-       *  @brief Iterator dereference.
-       *  @pre iterator is dereferenceable
-       *  @todo Make this correct w.r.t. iterators that return proxies
-       */
-      pointer
-      operator->() const
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_dereferenceable(),
-			      _M_message(__msg_bad_deref)
-			      ._M_iterator(*this, "this"));
-	return std::__addressof(*base());
-      }
-
-      // ------ Input iterator requirements ------
-      /**
-       *  @brief Iterator preincrement
-       *  @pre iterator is incrementable
-       */
-      _Safe_local_iterator&
-      operator++()
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_incrementable(),
-			      _M_message(__msg_bad_inc)
-			      ._M_iterator(*this, "this"));
-	__gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	++base();
-	return *this;
-      }
-
-      /**
-       *  @brief Iterator postincrement
-       *  @pre iterator is incrementable
-       */
-      _Safe_local_iterator
-      operator++(int)
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_incrementable(),
-			      _M_message(__msg_bad_inc)
-			      ._M_iterator(*this, "this"));
-	__gnu_cxx::__scoped_lock __l(this->_M_get_mutex());
-	return _Safe_local_iterator(base()++, this->_M_sequence,
-				    _Attach_single());
-      }
-
-      // ------ Utilities ------
-      /**
-       * @brief Return the underlying iterator
-       */
-      _Iterator&
-      base() noexcept { return *this; }
-
-      const _Iterator&
-      base() const noexcept { return *this; }
-
-      /**
-       * @brief Return the bucket
-       */
-      size_type
-      bucket() const { return base()._M_get_bucket(); }
-
-      /**
-       * @brief Conversion to underlying non-debug iterator to allow
-       * better interaction with non-debug containers.
-       */
-      operator _Iterator() const { return *this; }
-
-      /** Attach iterator to the given sequence. */
-      void
-      _M_attach(_Safe_sequence_base* __seq)
-      { _Safe_base::_M_attach(__seq, _M_constant()); }
-
-      /** Likewise, but not thread-safe. */
-      void
-      _M_attach_single(_Safe_sequence_base* __seq)
-      { _Safe_base::_M_attach_single(__seq, _M_constant()); }
-
-      /// Is the iterator dereferenceable?
-      bool
-      _M_dereferenceable() const
-      { return !this->_M_singular() && !_M_is_end(); }
-
-      /// Is the iterator incrementable?
-      bool
-      _M_incrementable() const
-      { return !this->_M_singular() && !_M_is_end(); }
-
-      // Is the iterator range [*this, __rhs) valid?
-      bool
-      _M_valid_range(const _Safe_local_iterator& __rhs) const;
-
-      // The sequence this iterator references.
-      typename
-      __gnu_cxx::__conditional_type<std::__are_same<_Const_local_iterator,
-						    _Safe_local_iterator>::__value,
-				    const _Sequence*,
-				    _Sequence*>::__type
-      _M_get_sequence() const
-      { return static_cast<_Sequence*>(_M_sequence); }
-
-      /// Is this iterator equal to the sequence's begin(bucket) iterator?
-      bool _M_is_begin() const
-      { return base() == _M_get_sequence()->_M_base().begin(bucket()); }
-
-      /// Is this iterator equal to the sequence's end(bucket) iterator?
-      bool _M_is_end() const
-      { return base() == _M_get_sequence()->_M_base().end(bucket()); }
-
-      /// Is this iterator part of the same bucket as the other one?
-      template<typename _Other>
-	bool
-	_M_in_same_bucket(const _Safe_local_iterator<_Other,
-						     _Sequence>& __other) const
-	{ return bucket() == __other.bucket(); }
-    };
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator==(const _Safe_local_iterator<_IteratorL, _Sequence>& __lhs,
-	       const _Safe_local_iterator<_IteratorR, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(!__lhs._M_singular() && !__rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_in_same_bucket(__rhs),
-			    _M_message(__msg_local_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() == __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator==(const _Safe_local_iterator<_Iterator, _Sequence>& __lhs,
-	       const _Safe_local_iterator<_Iterator, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(!__lhs._M_singular() && !__rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_in_same_bucket(__rhs),
-			    _M_message(__msg_local_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() == __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator!=(const _Safe_local_iterator<_IteratorL, _Sequence>& __lhs,
-	       const _Safe_local_iterator<_IteratorR, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_in_same_bucket(__rhs),
-			    _M_message(__msg_local_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() != __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator!=(const _Safe_local_iterator<_Iterator, _Sequence>& __lhs,
-	       const _Safe_local_iterator<_Iterator, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(!__lhs._M_singular() && !__rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_in_same_bucket(__rhs),
-			    _M_message(__msg_local_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() != __rhs.base();
-    }
-} // namespace __gnu_debug
-
-#include <debug/safe_local_iterator.tcc>
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/safe_local_iterator.tcc b/openflow/usr/include/c++/5/debug/safe_local_iterator.tcc
deleted file mode 100644
index 455e4cd..0000000
--- a/openflow/usr/include/c++/5/debug/safe_local_iterator.tcc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Debugging iterator implementation (out of line) -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_local_iterator.tcc
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_LOCAL_ITERATOR_TCC
-#define _GLIBCXX_DEBUG_SAFE_LOCAL_ITERATOR_TCC 1
-
-namespace __gnu_debug
-{
-  template<typename _Iterator, typename _Sequence>
-    bool
-    _Safe_local_iterator<_Iterator, _Sequence>::
-    _M_valid_range(const _Safe_local_iterator& __rhs) const
-    {
-      if (!_M_can_compare(__rhs))
-	return false;
-      if (bucket() != __rhs.bucket())
-	return false;
-
-      /* Determine if we can order the iterators without the help of
-	 the container */
-      std::pair<difference_type, _Distance_precision> __dist =
-	__get_distance(base(), __rhs.base());
-      switch (__dist.second)
-	{
-	case __dp_equality:
-	  if (__dist.first == 0)
-	    return true;
-	  break;
-
-	case __dp_sign:
-	case __dp_exact:
-	  return __dist.first >= 0;
-	}
-
-      /* We can only test for equality, but check if one of the
-	 iterators is at an extreme. */
-      /* Optim for classic [begin, it) or [it, end) ranges, limit checks
-       * when code is valid. */
-      if (_M_is_begin() || __rhs._M_is_end())
-	return true;
-      if (_M_is_end() || __rhs._M_is_begin())
-	return false;
-
-      // Assume that this is a valid range; we can't check anything else
-      return true;
-    }
-} // namespace __gnu_debug
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/safe_sequence.h b/openflow/usr/include/c++/5/debug/safe_sequence.h
deleted file mode 100644
index abb0c29..0000000
--- a/openflow/usr/include/c++/5/debug/safe_sequence.h
+++ /dev/null
@@ -1,153 +0,0 @@
-// Safe sequence implementation  -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_sequence.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_SEQUENCE_H
-#define _GLIBCXX_DEBUG_SAFE_SEQUENCE_H 1
-
-#include <debug/debug.h>
-#include <debug/macros.h>
-#include <debug/functions.h>
-#include <debug/safe_base.h>
-
-namespace __gnu_debug
-{
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_iterator;
-
-  /** A simple function object that returns true if the passed-in
-   *  value is not equal to the stored value. It saves typing over
-   *  using both bind1st and not_equal.
-   */
-  template<typename _Type>
-    class _Not_equal_to
-    {
-      _Type __value;
-
-    public:
-      explicit _Not_equal_to(const _Type& __v) : __value(__v) { }
-
-      bool
-      operator()(const _Type& __x) const
-      { return __value != __x; }
-    };
-
-  /** A simple function object that returns true if the passed-in
-   *  value is equal to the stored value. */
-  template <typename _Type>
-    class _Equal_to
-    {
-      _Type __value;
-
-    public:
-      explicit _Equal_to(const _Type& __v) : __value(__v) { }
-
-      bool
-      operator()(const _Type& __x) const
-      { return __value == __x; }
-    };
-
-  /** A function object that returns true when the given random access
-      iterator is at least @c n steps away from the given iterator. */
-  template<typename _Iterator>
-    class _After_nth_from
-    {
-      typedef typename std::iterator_traits<_Iterator>::difference_type
-      difference_type;
-
-      _Iterator _M_base;
-      difference_type _M_n;
-
-    public:
-      _After_nth_from(const difference_type& __n, const _Iterator& __base)
-      : _M_base(__base), _M_n(__n) { }
-
-      bool
-      operator()(const _Iterator& __x) const
-      { return __x - _M_base >= _M_n; }
-    };
-
-  /**
-   * @brief Base class for constructing a @a safe sequence type that
-   * tracks iterators that reference it.
-   *
-   * The class template %_Safe_sequence simplifies the construction of
-   * @a safe sequences that track the iterators that reference the
-   * sequence, so that the iterators are notified of changes in the
-   * sequence that may affect their operation, e.g., if the container
-   * invalidates its iterators or is destructed. This class template
-   * may only be used by deriving from it and passing the name of the
-   * derived class as its template parameter via the curiously
-   * recurring template pattern. The derived class must have @c
-   * iterator and @c const_iterator types that are instantiations of
-   * class template _Safe_iterator for this sequence. Iterators will
-   * then be tracked automatically.
-   */
-  template<typename _Sequence>
-    class _Safe_sequence : public _Safe_sequence_base
-    {
-    public:
-      /** Invalidates all iterators @c x that reference this sequence,
-	  are not singular, and for which @c __pred(x) returns @c
-	  true. @c __pred will be invoked with the normal iterators nested
-	  in the safe ones. */
-      template<typename _Predicate>
-	void
-	_M_invalidate_if(_Predicate __pred);
-
-      /** Transfers all iterators @c x that reference @c from sequence,
-	  are not singular, and for which @c __pred(x) returns @c
-	  true. @c __pred will be invoked with the normal iterators nested
-	  in the safe ones. */
-      template<typename _Predicate>
-	void
-	_M_transfer_from_if(_Safe_sequence& __from, _Predicate __pred);
-    };
-
-  /// Like _Safe_sequence but with a special _M_invalidate_all implementation
-  /// not invalidating past-the-end iterators. Used by node based sequence.
-  template<typename _Sequence>
-    class _Safe_node_sequence
-    : public _Safe_sequence<_Sequence>
-    {
-    protected:
-      void
-      _M_invalidate_all()
-      {
-	typedef typename _Sequence::const_iterator _Const_iterator;
-	typedef typename _Const_iterator::iterator_type _Base_const_iterator;
-	typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
-	const _Sequence& __seq = *static_cast<_Sequence*>(this);
-	this->_M_invalidate_if(_Not_equal(__seq._M_base().end()));
-      }
-    };
-
-} // namespace __gnu_debug
-
-#include <debug/safe_sequence.tcc>
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/safe_sequence.tcc b/openflow/usr/include/c++/5/debug/safe_sequence.tcc
deleted file mode 100644
index d05b59c..0000000
--- a/openflow/usr/include/c++/5/debug/safe_sequence.tcc
+++ /dev/null
@@ -1,153 +0,0 @@
-// Safe sequence implementation  -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_sequence.tcc
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_SEQUENCE_TCC
-#define _GLIBCXX_DEBUG_SAFE_SEQUENCE_TCC 1
-
-namespace __gnu_debug
-{
-  template<typename _Sequence>
-    template<typename _Predicate>
-      void
-      _Safe_sequence<_Sequence>::
-      _M_invalidate_if(_Predicate __pred)
-      {
-	typedef typename _Sequence::iterator iterator;
-	typedef typename _Sequence::const_iterator const_iterator;
-
-	__gnu_cxx::__scoped_lock sentry(this->_M_get_mutex());
-	for (_Safe_iterator_base* __iter = _M_iterators; __iter;)
-	  {
-	    iterator* __victim = static_cast<iterator*>(__iter);
-	    __iter = __iter->_M_next;
-	    if (!__victim->_M_singular() && __pred(__victim->base()))
-	      {
-		__victim->_M_invalidate();
-	      }
-	  }
-
-	for (_Safe_iterator_base* __iter2 = _M_const_iterators; __iter2;)
-	  {
-	    const_iterator* __victim = static_cast<const_iterator*>(__iter2);
-	    __iter2 = __iter2->_M_next;
-	    if (!__victim->_M_singular() && __pred(__victim->base()))
-	      {
-		__victim->_M_invalidate();
-	      }
-	  }
-      }
-
-  template<typename _Sequence>
-    template<typename _Predicate>
-      void
-      _Safe_sequence<_Sequence>::
-      _M_transfer_from_if(_Safe_sequence& __from, _Predicate __pred)
-      {
-	typedef typename _Sequence::iterator iterator;
-	typedef typename _Sequence::const_iterator const_iterator;
-
-	_Safe_iterator_base* __transfered_iterators = 0;
-	_Safe_iterator_base* __transfered_const_iterators = 0;
-	_Safe_iterator_base* __last_iterator = 0;
-	_Safe_iterator_base* __last_const_iterator = 0;
-	{
-	  // We lock __from first and detach iterator(s) to transfer
-	  __gnu_cxx::__scoped_lock sentry(__from._M_get_mutex());
-
-	  for (_Safe_iterator_base* __iter = __from._M_iterators; __iter;)
-	    {
-	      _Safe_iterator_base* __victim_base = __iter;
-	      iterator* __victim = static_cast<iterator*>(__victim_base);
-	      __iter = __iter->_M_next;
-	      if (!__victim->_M_singular() && __pred(__victim->base()))
-		{
-		  __victim->_M_detach_single();
-		  if (__transfered_iterators)
-		    {
-		      __victim_base->_M_next = __transfered_iterators;
-		      __transfered_iterators->_M_prior = __victim_base;
-		    }
-		  else
-		    __last_iterator = __victim_base;
-		  __victim_base->_M_sequence = this;
-		  __victim_base->_M_version = this->_M_version;
-		  __transfered_iterators = __victim_base;
-		}
-	    }
-
-	  for (_Safe_iterator_base* __iter2 = __from._M_const_iterators;
-		 __iter2;)
-	    {
-	      _Safe_iterator_base* __victim_base = __iter2;
-	      const_iterator* __victim =
-		static_cast<const_iterator*>(__victim_base);
-	      __iter2 = __iter2->_M_next;
-	      if (!__victim->_M_singular() && __pred(__victim->base()))
-		{
-		  __victim->_M_detach_single();
-		  if (__transfered_const_iterators)
-		    {
-		      __victim_base->_M_next = __transfered_const_iterators;
-		      __transfered_const_iterators->_M_prior = __victim_base;
-		    }
-		  else
-		    __last_const_iterator = __victim;
-		  __victim_base->_M_sequence = this;
-		  __victim_base->_M_version = this->_M_version;
-		  __transfered_const_iterators = __victim_base;
-		}
-	    }
-	}
-
-	// Now we can lock *this and add the transfered iterators if any
-	if (__last_iterator || __last_const_iterator)
-	  {
-	    __gnu_cxx::__scoped_lock sentry(this->_M_get_mutex());
-	    if (__last_iterator)
-	      {
-		if (this->_M_iterators)
-		  {
-		    this->_M_iterators->_M_prior = __last_iterator;
-		    __last_iterator->_M_next = this->_M_iterators;
-		  }
-		this->_M_iterators = __transfered_iterators;
-	      }
-	    if (__last_const_iterator)
-	      {
-		if (this->_M_const_iterators)
-		  {
-		    this->_M_const_iterators->_M_prior = __last_const_iterator;
-		    __last_const_iterator->_M_next = this->_M_const_iterators;
-		  }
-		this->_M_const_iterators = __transfered_const_iterators;
-	      }
-	  }
-      }
-} // namespace __gnu_debug
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/safe_unordered_base.h b/openflow/usr/include/c++/5/debug/safe_unordered_base.h
deleted file mode 100644
index 8dec59d..0000000
--- a/openflow/usr/include/c++/5/debug/safe_unordered_base.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Safe container/iterator base implementation  -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_unordered_base.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_UNORDERED_BASE_H
-#define _GLIBCXX_DEBUG_SAFE_UNORDERED_BASE_H 1
-
-#include <debug/safe_base.h>
-
-namespace __gnu_debug
-{
-  class _Safe_unordered_container_base;
-
-  /** \brief Basic functionality for a @a safe iterator.
-   *
-   *  The %_Safe_local_iterator_base base class implements the functionality
-   *  of a safe local iterator that is not specific to a particular iterator
-   *  type. It contains a pointer back to the container it references
-   *  along with iterator version information and pointers to form a
-   *  doubly-linked list of local iterators referenced by the container.
-   *
-   *  This class must not perform any operations that can throw an
-   *  exception, or the exception guarantees of derived iterators will
-   *  be broken.
-   */
-  class _Safe_local_iterator_base : public _Safe_iterator_base
-  {
-  protected:
-    /** Initializes the iterator and makes it singular. */
-    _Safe_local_iterator_base()
-    { }
-
-    /** Initialize the iterator to reference the container pointed to
-     *  by @p __seq. @p __constant is true when we are initializing a
-     *  constant local iterator, and false if it is a mutable local iterator.
-     *  Note that @p __seq may be NULL, in which case the iterator will be
-     *  singular. Otherwise, the iterator will reference @p __seq and
-     *  be nonsingular.
-     */
-    _Safe_local_iterator_base(const _Safe_sequence_base* __seq, bool __constant)
-    { this->_M_attach(const_cast<_Safe_sequence_base*>(__seq), __constant); }
-
-    /** Initializes the iterator to reference the same container that
-	@p __x does. @p __constant is true if this is a constant
-	iterator, and false if it is mutable. */
-    _Safe_local_iterator_base(const _Safe_local_iterator_base& __x,
-			      bool __constant)
-    { this->_M_attach(__x._M_sequence, __constant); }
-
-    ~_Safe_local_iterator_base() { this->_M_detach(); }
-
-    _Safe_unordered_container_base*
-    _M_get_container() const noexcept;
-
-  public:
-    /** Attaches this iterator to the given container, detaching it
-     *	from whatever container it was attached to originally. If the
-     *	new container is the NULL pointer, the iterator is left
-     *	unattached.
-     */
-    void _M_attach(_Safe_sequence_base* __seq, bool __constant);
-
-    /** Likewise, but not thread-safe. */
-    void _M_attach_single(_Safe_sequence_base* __seq, bool __constant) throw ();
-
-    /** Detach the iterator for whatever container it is attached to,
-     *	if any.
-    */
-    void _M_detach();
-
-    /** Likewise, but not thread-safe. */
-    void _M_detach_single() throw ();
-  };
-
-  /**
-   * @brief Base class that supports tracking of local iterators that
-   * reference an unordered container.
-   *
-   * The %_Safe_unordered_container_base class provides basic support for
-   * tracking iterators into an unordered container. Containers that track
-   * iterators must derived from %_Safe_unordered_container_base publicly, so
-   * that safe iterators (which inherit _Safe_iterator_base) can
-   * attach to them. This class contains four linked lists of
-   * iterators, one for constant iterators, one for mutable
-   * iterators, one for constant local iterators, one for mutable local
-   * iterators and a version number that allows very fast
-   * invalidation of all iterators that reference the container.
-   *
-   * This class must ensure that no operation on it may throw an
-   * exception, otherwise @a safe containers may fail to provide the
-   * exception-safety guarantees required by the C++ standard.
-   */
-  class _Safe_unordered_container_base : public _Safe_sequence_base
-  {
-    typedef _Safe_sequence_base _Base;
-  public:
-    /// The list of mutable local iterators that reference this container
-    _Safe_iterator_base* _M_local_iterators;
-
-    /// The list of constant local iterators that reference this container
-    _Safe_iterator_base* _M_const_local_iterators;
-
-  protected:
-    // Initialize with a version number of 1 and no iterators
-    _Safe_unordered_container_base() noexcept
-    : _M_local_iterators(nullptr), _M_const_local_iterators(nullptr)
-    { }
-
-    // Copy constructor does not copy iterators.
-    _Safe_unordered_container_base(const _Safe_unordered_container_base&)
-    noexcept
-    : _Safe_unordered_container_base() { }
-
-    // When moved unordered containers iterators are swapped.
-    _Safe_unordered_container_base(_Safe_unordered_container_base&& __x)
-    noexcept
-    : _Safe_unordered_container_base()
-    { this->_M_swap(__x); }
-
-    /** Notify all iterators that reference this container that the
-	container is being destroyed. */
-    ~_Safe_unordered_container_base() noexcept
-    { this->_M_detach_all(); }
-
-    /** Detach all iterators, leaving them singular. */
-    void
-    _M_detach_all();
-
-    /** Swap this container with the given container. This operation
-     *  also swaps ownership of the iterators, so that when the
-     *  operation is complete all iterators that originally referenced
-     *  one container now reference the other container.
-     */
-    void
-    _M_swap(_Safe_unordered_container_base& __x) noexcept;
-
-  public:
-    /** Attach an iterator to this container. */
-    void
-    _M_attach_local(_Safe_iterator_base* __it, bool __constant);
-
-    /** Likewise but not thread safe. */
-    void
-    _M_attach_local_single(_Safe_iterator_base* __it, bool __constant) throw ();
-
-    /** Detach an iterator from this container */
-    void
-    _M_detach_local(_Safe_iterator_base* __it);
-
-    /** Likewise but not thread safe. */
-    void
-    _M_detach_local_single(_Safe_iterator_base* __it) throw ();
-  };
-} // namespace __gnu_debug
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/safe_unordered_container.h b/openflow/usr/include/c++/5/debug/safe_unordered_container.h
deleted file mode 100644
index 05d08b7..0000000
--- a/openflow/usr/include/c++/5/debug/safe_unordered_container.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// Safe container implementation  -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_unordered_container.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_UNORDERED_CONTAINER_H
-#define _GLIBCXX_DEBUG_SAFE_UNORDERED_CONTAINER_H 1
-
-#include <debug/debug.h>
-#include <debug/macros.h>
-#include <debug/functions.h>
-#include <debug/safe_unordered_base.h>
-
-namespace __gnu_debug
-{
-  /**
-   * @brief Base class for constructing a @a safe unordered container type
-   * that tracks iterators that reference it.
-   *
-   * The class template %_Safe_unordered_container simplifies the
-   * construction of @a safe unordered containers that track the iterators
-   * that reference the container, so that the iterators are notified of
-   * changes in the container that may affect their operation, e.g., if
-   * the container invalidates its iterators or is destructed. This class
-   * template may only be used by deriving from it and passing the name
-   * of the derived class as its template parameter via the curiously
-   * recurring template pattern. The derived class must have @c
-   * iterator and @c const_iterator types that are instantiations of
-   * class template _Safe_iterator for this container and @c local_iterator
-   * and @c const_local_iterator types that are instantiations of class
-   * template _Safe_local_iterator for this container. Iterators will
-   * then be tracked automatically.
-   */
-  template<typename _Container>
-    class _Safe_unordered_container : public _Safe_unordered_container_base
-    {
-    private:
-      _Container&
-      _M_cont() noexcept
-      { return *static_cast<_Container*>(this); }
-
-    protected:
-      void
-      _M_invalidate_locals()
-      {
-	auto __local_end = _M_cont()._M_base().end(0);
-	this->_M_invalidate_local_if(
-		[__local_end](__decltype(_M_cont()._M_base().cend(0)) __it)
-		{ return __it != __local_end; });
-      }
-
-      void
-      _M_invalidate_all()
-      {
-	auto __end = _M_cont()._M_base().end();
-	this->_M_invalidate_if(
-		[__end](__decltype(_M_cont()._M_base().cend()) __it)
-		{ return __it != __end; });
-	_M_invalidate_locals();
-      }
-
-      /** Invalidates all iterators @c x that reference this container,
-	  are not singular, and for which @c __pred(x) returns @c
-	  true. @c __pred will be invoked with the normal iterators nested
-	  in the safe ones. */
-      template<typename _Predicate>
-	void
-	_M_invalidate_if(_Predicate __pred);
-
-      /** Invalidates all local iterators @c x that reference this container,
-	  are not singular, and for which @c __pred(x) returns @c
-	  true. @c __pred will be invoked with the normal ilocal iterators
-	  nested in the safe ones. */
-      template<typename _Predicate>
-	void
-	_M_invalidate_local_if(_Predicate __pred);
-    };
-} // namespace __gnu_debug
-
-#include <debug/safe_unordered_container.tcc>
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/safe_unordered_container.tcc b/openflow/usr/include/c++/5/debug/safe_unordered_container.tcc
deleted file mode 100644
index e517d0d..0000000
--- a/openflow/usr/include/c++/5/debug/safe_unordered_container.tcc
+++ /dev/null
@@ -1,100 +0,0 @@
-// Safe container implementation  -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/safe_unordered_container.tcc
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_UNORDERED_CONTAINER_TCC
-#define _GLIBCXX_DEBUG_SAFE_UNORDERED_CONTAINER_TCC 1
-
-namespace __gnu_debug
-{
-  template<typename _Container>
-    template<typename _Predicate>
-      void
-      _Safe_unordered_container<_Container>::
-      _M_invalidate_if(_Predicate __pred)
-      {
-	typedef typename _Container::iterator iterator;
-	typedef typename _Container::const_iterator const_iterator;
-
-	__gnu_cxx::__scoped_lock sentry(this->_M_get_mutex());
-	for (_Safe_iterator_base* __iter = _M_iterators; __iter;)
-	  {
-	    iterator* __victim = static_cast<iterator*>(__iter);
-	    __iter = __iter->_M_next;
-	    if (!__victim->_M_singular() && __pred(__victim->base()))
-	      {
-		__victim->_M_invalidate();
-	      }
-	  }
-
-	for (_Safe_iterator_base* __iter2 = _M_const_iterators; __iter2;)
-	  {
-	    const_iterator* __victim = static_cast<const_iterator*>(__iter2);
-	    __iter2 = __iter2->_M_next;
-	    if (!__victim->_M_singular() && __pred(__victim->base()))
-	      {
-		__victim->_M_invalidate();
-	      }
-	  }
-      }
-
-
-  template<typename _Container>
-    template<typename _Predicate>
-      void
-      _Safe_unordered_container<_Container>::
-      _M_invalidate_local_if(_Predicate __pred)
-      {
-	typedef typename _Container::local_iterator local_iterator;
-	typedef typename _Container::const_local_iterator const_local_iterator;
-
-	__gnu_cxx::__scoped_lock sentry(this->_M_get_mutex());
-	for (_Safe_iterator_base* __iter = _M_local_iterators; __iter;)
-	  {
-	    local_iterator* __victim = static_cast<local_iterator*>(__iter);
-	    __iter = __iter->_M_next;
-	    if (!__victim->_M_singular() && __pred(__victim->base()))
-	      {
-		__victim->_M_invalidate();
-	      }
-	  }
-
-	for (_Safe_iterator_base* __iter2 = _M_const_local_iterators; __iter2;)
-	  {
-	    const_local_iterator* __victim =
-	      static_cast<const_local_iterator*>(__iter2);
-	    __iter2 = __iter2->_M_next;
-	    if (!__victim->_M_singular() && __pred(__victim->base()))
-	      {
-		__victim->_M_invalidate();
-	      }
-	  }
-      }
-
-} // namespace __gnu_debug
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/set b/openflow/usr/include/c++/5/debug/set
deleted file mode 100644
index b45f486..0000000
--- a/openflow/usr/include/c++/5/debug/set
+++ /dev/null
@@ -1,36 +0,0 @@
-// Debugging set/multiset implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/set
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SET
-#define _GLIBCXX_DEBUG_SET 1
-
-#include <set>
-#include <debug/set.h>
-#include <debug/multiset.h>
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/set.h b/openflow/usr/include/c++/5/debug/set.h
deleted file mode 100644
index 00d539f..0000000
--- a/openflow/usr/include/c++/5/debug/set.h
+++ /dev/null
@@ -1,490 +0,0 @@
-// Debugging set implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/set.h
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_SET_H
-#define _GLIBCXX_DEBUG_SET_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-#include <utility>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::set with safety/checking/debug instrumentation.
-  template<typename _Key, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<_Key> >
-    class set
-    : public __gnu_debug::_Safe_container<
-	set<_Key, _Compare, _Allocator>, _Allocator,
-	__gnu_debug::_Safe_node_sequence>,
-      public _GLIBCXX_STD_C::set<_Key,_Compare,_Allocator>
-    {
-      typedef _GLIBCXX_STD_C::set<_Key, _Compare, _Allocator>	_Base;
-      typedef __gnu_debug::_Safe_container<
-	set, _Allocator, __gnu_debug::_Safe_node_sequence>	_Safe;
-
-      typedef typename _Base::const_iterator	_Base_const_iterator;
-      typedef typename _Base::iterator		_Base_iterator;
-      typedef __gnu_debug::_Equal_to<_Base_const_iterator> _Equal;
-
-    public:
-      // types:
-      typedef _Key					key_type;
-      typedef _Key					value_type;
-      typedef _Compare					key_compare;
-      typedef _Compare					value_compare;
-      typedef _Allocator				allocator_type;
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<_Base_iterator, set>
-							iterator;
-      typedef __gnu_debug::_Safe_iterator<_Base_const_iterator, set>
-							const_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-      typedef typename _Base::pointer			pointer;
-      typedef typename _Base::const_pointer		const_pointer;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      // 23.3.3.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      set() : _Base() { }
-
-      set(const set& __x)
-      : _Base(__x) { }
-
-      ~set() { }
-#else
-      set() = default;
-      set(const set&) = default;
-      set(set&&) = default;
-
-      set(initializer_list<value_type> __l,
-	  const _Compare& __comp = _Compare(),
-	  const allocator_type& __a = allocator_type())
-      : _Base(__l, __comp, __a) { }
-
-      explicit
-      set(const allocator_type& __a)
-      : _Base(__a) { }
-
-      set(const set& __x, const allocator_type& __a)
-      : _Base(__x, __a) { }
-
-      set(set&& __x, const allocator_type& __a)
-      : _Safe(std::move(__x._M_safe()), __a),
-	_Base(std::move(__x._M_base()), __a) { }
-
-      set(initializer_list<value_type> __l, const allocator_type& __a)
-      : _Base(__l, __a) { }
-
-      template<typename _InputIterator>
-	set(_InputIterator __first, _InputIterator __last,
-	    const allocator_type& __a)
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __a) { }
-
-      ~set() = default;
-#endif
-
-      explicit set(const _Compare& __comp,
-		   const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-      template<typename _InputIterator>
-	set(_InputIterator __first, _InputIterator __last,
-	    const _Compare& __comp = _Compare(),
-	    const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last),
-		__comp, __a) { }
-
-      set(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      set&
-      operator=(const set& __x)
-      {
-	this->_M_safe() = __x;
-	_M_base() = __x;
-	return *this;
-      }
-#else
-      set&
-      operator=(const set&) = default;
-
-      set&
-      operator=(set&&) = default;
-
-      set&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_base() = __l;
-	this->_M_invalidate_all();
-	return *this;
-      }
-#endif
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-      // capacity:
-      using _Base::empty;
-      using _Base::size;
-      using _Base::max_size;
-
-      // modifiers:
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{
-	  auto __res = _Base::emplace(std::forward<_Args>(__args)...);
-	  return std::pair<iterator, bool>(iterator(__res.first, this),
-					   __res.second);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__pos);
-	  return iterator(_Base::emplace_hint(__pos.base(),
-					      std::forward<_Args>(__args)...),
-			  this);
-	}
-#endif
-
-      std::pair<iterator, bool>
-      insert(const value_type& __x)
-      {
-	std::pair<_Base_iterator, bool> __res = _Base::insert(__x);
-	return std::pair<iterator, bool>(iterator(__res.first, this),
-					 __res.second);
-      }
-
-#if __cplusplus >= 201103L
-      std::pair<iterator, bool>
-      insert(value_type&& __x)
-      {
-	std::pair<_Base_iterator, bool> __res
-	  = _Base::insert(std::move(__x));
-	return std::pair<iterator, bool>(iterator(__res.first, this),
-					 __res.second);
-      }
-#endif
-
-      iterator
-      insert(const_iterator __position, const value_type& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __x), this);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __position, value_type&& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), std::move(__x)),
-			this);
-      }
-#endif
-
-      template <typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::insert(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	}
-
-#if __cplusplus >= 201103L
-      void
-      insert(initializer_list<value_type> __l)
-      { _Base::insert(__l); }
-#endif
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	this->_M_invalidate_if(_Equal(__position.base()));
-	return iterator(_Base::erase(__position.base()), this);
-      }
-#else
-      void
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	this->_M_invalidate_if(_Equal(__position.base()));
-	_Base::erase(__position.base());
-      }
-#endif
-
-      size_type
-      erase(const key_type& __x)
-      {
-	_Base_iterator __victim = _Base::find(__x);
-	if (__victim == _Base::end())
-	  return 0;
-	else
-	  {
-	    this->_M_invalidate_if(_Equal(__victim));
-	    _Base::erase(__victim);
-	    return 1;
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_const_iterator __victim = __first.base();
-	     __victim != __last.base(); ++__victim)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if(_Equal(__victim));
-	  }
-	return iterator(_Base::erase(__first.base(), __last.base()), this);
-      }
-#else
-      void
-      erase(iterator __first, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_iterator __victim = __first.base();
-	     __victim != __last.base(); ++__victim)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if(_Equal(__victim));
-	  }
-	_Base::erase(__first.base(), __last.base());
-      }
-#endif
-
-      void
-      swap(set& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-      }
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_invalidate_all();
-	_Base::clear();
-      }
-
-      // observers:
-      using _Base::key_comp;
-      using _Base::value_comp;
-
-      // set operations:
-      iterator
-      find(const key_type& __x)
-      { return iterator(_Base::find(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      find(const key_type& __x) const
-      { return const_iterator(_Base::find(__x), this); }
-
-      using _Base::count;
-
-      iterator
-      lower_bound(const key_type& __x)
-      { return iterator(_Base::lower_bound(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return const_iterator(_Base::lower_bound(__x), this); }
-
-      iterator
-      upper_bound(const key_type& __x)
-      { return iterator(_Base::upper_bound(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return const_iterator(_Base::upper_bound(__x), this); }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	_Base::equal_range(__x);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	_Base::equal_range(__x);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-    };
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator==(const set<_Key, _Compare, _Allocator>& __lhs,
-	       const set<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator!=(const set<_Key, _Compare, _Allocator>& __lhs,
-	       const set<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<(const set<_Key, _Compare, _Allocator>& __lhs,
-	      const set<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<=(const set<_Key, _Compare, _Allocator>& __lhs,
-	       const set<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>=(const set<_Key, _Compare, _Allocator>& __lhs,
-	       const set<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>(const set<_Key, _Compare, _Allocator>& __lhs,
-	      const set<_Key, _Compare, _Allocator>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    void
-    swap(set<_Key, _Compare, _Allocator>& __x,
-	 set<_Key, _Compare, _Allocator>& __y)
-    { return __x.swap(__y); }
-
-} // namespace __debug
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/string b/openflow/usr/include/c++/5/debug/string
deleted file mode 100644
index 3793a35..0000000
--- a/openflow/usr/include/c++/5/debug/string
+++ /dev/null
@@ -1,1161 +0,0 @@
-// Debugging string implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/string
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_STRING
-#define _GLIBCXX_DEBUG_STRING 1
-
-#include <string>
-#include <debug/safe_sequence.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug
-{
-  /// Class std::basic_string with safety/checking/debug instrumentation.
-  template<typename _CharT, typename _Traits = std::char_traits<_CharT>,
-	   typename _Allocator = std::allocator<_CharT> >
-    class basic_string
-    : public __gnu_debug::_Safe_container<
-	basic_string<_CharT, _Traits, _Allocator>,
-	_Allocator, _Safe_sequence, false>,
-      public std::basic_string<_CharT, _Traits, _Allocator>
-    {
-      typedef std::basic_string<_CharT, _Traits, _Allocator>	_Base;
-      typedef __gnu_debug::_Safe_container<
-	basic_string, _Allocator, _Safe_sequence, false>	_Safe;
-
-  public:
-    // types:
-    typedef _Traits					traits_type;
-    typedef typename _Traits::char_type			value_type;
-    typedef _Allocator					allocator_type;
-    typedef typename _Base::size_type			size_type;
-    typedef typename _Base::difference_type		difference_type;
-    typedef typename _Base::reference			reference;
-    typedef typename _Base::const_reference		const_reference;
-    typedef typename _Base::pointer			pointer;
-    typedef typename _Base::const_pointer		const_pointer;
-
-    typedef __gnu_debug::_Safe_iterator<
-      typename _Base::iterator, basic_string>		iterator;
-    typedef __gnu_debug::_Safe_iterator<
-      typename _Base::const_iterator, basic_string>	const_iterator;
-
-    typedef std::reverse_iterator<iterator>		reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-    using _Base::npos;
-
-    // 21.3.1 construct/copy/destroy:
-    explicit basic_string(const _Allocator& __a = _Allocator())
-    // _GLIBCXX_NOEXCEPT
-    : _Base(__a) { }
-
-#if __cplusplus < 201103L
-    basic_string(const basic_string& __str)
-    : _Base(__str) { }
-
-    ~basic_string() { }
-#else
-    basic_string(const basic_string&) = default;
-    basic_string(basic_string&&) = default;
-
-    basic_string(std::initializer_list<_CharT> __l,
-		 const _Allocator& __a = _Allocator())
-    : _Base(__l, __a)
-    { }
-
-    ~basic_string() = default;
-#endif // C++11
-
-    // Provides conversion from a normal-mode string to a debug-mode string
-    basic_string(const _Base& __base)
-    : _Base(__base) { }
-
-    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-    // 42. string ctors specify wrong default allocator
-    basic_string(const basic_string& __str, size_type __pos,
-		 size_type __n = _Base::npos,
-		 const _Allocator& __a = _Allocator())
-    : _Base(__str, __pos, __n, __a) { }
-
-    basic_string(const _CharT* __s, size_type __n,
-		   const _Allocator& __a = _Allocator())
-    : _Base(__gnu_debug::__check_string(__s, __n), __n, __a) { }
-
-    basic_string(const _CharT* __s, const _Allocator& __a = _Allocator())
-    : _Base(__gnu_debug::__check_string(__s), __a)
-    { this->assign(__s); }
-
-    basic_string(size_type __n, _CharT __c,
-		   const _Allocator& __a = _Allocator())
-    : _Base(__n, __c, __a) { }
-
-    template<typename _InputIterator>
-      basic_string(_InputIterator __begin, _InputIterator __end,
-		   const _Allocator& __a = _Allocator())
-      : _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__begin,
-								   __end)),
-	      __gnu_debug::__base(__end), __a) { }
-
-#if __cplusplus < 201103L
-    basic_string&
-    operator=(const basic_string& __str)
-    {
-      this->_M_safe() = __str;
-      _M_base() = __str;
-      return *this;
-    }
-#else
-    basic_string&
-    operator=(const basic_string&) = default;
-
-    basic_string&
-    operator=(basic_string&&) = default;
-#endif
-
-    basic_string&
-    operator=(const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _M_base() = __s;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    operator=(_CharT __c)
-    {
-      _M_base() = __c;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-#if __cplusplus >= 201103L
-    basic_string&
-    operator=(std::initializer_list<_CharT> __l)
-    {
-      _M_base() = __l;
-      this->_M_invalidate_all();
-      return *this;
-    }
-#endif // C++11
-
-    // 21.3.2 iterators:
-    iterator
-    begin() // _GLIBCXX_NOEXCEPT
-    { return iterator(_Base::begin(), this); }
-
-    const_iterator
-    begin() const _GLIBCXX_NOEXCEPT
-    { return const_iterator(_Base::begin(), this); }
-
-    iterator
-    end() // _GLIBCXX_NOEXCEPT
-    { return iterator(_Base::end(), this); }
-
-    const_iterator
-    end() const _GLIBCXX_NOEXCEPT
-    { return const_iterator(_Base::end(), this); }
-
-    reverse_iterator
-    rbegin() // _GLIBCXX_NOEXCEPT
-    { return reverse_iterator(end()); }
-
-    const_reverse_iterator
-    rbegin() const _GLIBCXX_NOEXCEPT
-    { return const_reverse_iterator(end()); }
-
-    reverse_iterator
-    rend() // _GLIBCXX_NOEXCEPT
-    { return reverse_iterator(begin()); }
-
-    const_reverse_iterator
-    rend() const _GLIBCXX_NOEXCEPT
-    { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-    const_iterator
-    cbegin() const noexcept
-    { return const_iterator(_Base::begin(), this); }
-
-    const_iterator
-    cend() const noexcept
-    { return const_iterator(_Base::end(), this); }
-
-    const_reverse_iterator
-    crbegin() const noexcept
-    { return const_reverse_iterator(end()); }
-
-    const_reverse_iterator
-    crend() const noexcept
-    { return const_reverse_iterator(begin()); }
-#endif
-
-    // 21.3.3 capacity:
-    using _Base::size;
-    using _Base::length;
-    using _Base::max_size;
-
-    void
-    resize(size_type __n, _CharT __c)
-    {
-      _Base::resize(__n, __c);
-      this->_M_invalidate_all();
-    }
-
-    void
-    resize(size_type __n)
-    { this->resize(__n, _CharT()); }
-
-#if __cplusplus >= 201103L
-    void
-    shrink_to_fit() noexcept
-    {
-      if (capacity() > size())
-	{
-	  __try
-	    {
-	      reserve(0);
-	      this->_M_invalidate_all();
-	    }
-	  __catch(...)
-	    { }
-	}
-    }
-#endif
-
-    using _Base::capacity;
-    using _Base::reserve;
-
-    void
-    clear() // _GLIBCXX_NOEXCEPT
-    {
-      _Base::clear();
-      this->_M_invalidate_all();
-    }
-
-    using _Base::empty;
-
-    // 21.3.4 element access:
-    const_reference
-    operator[](size_type __pos) const _GLIBCXX_NOEXCEPT
-    {
-      _GLIBCXX_DEBUG_VERIFY(__pos <= this->size(),
-			    _M_message(__gnu_debug::__msg_subscript_oob)
-			    ._M_sequence(*this, "this")
-			    ._M_integer(__pos, "__pos")
-			    ._M_integer(this->size(), "size"));
-      return _M_base()[__pos];
-    }
-
-    reference
-    operator[](size_type __pos) // _GLIBCXX_NOEXCEPT
-    {
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-      __glibcxx_check_subscript(__pos);
-#else
-      // as an extension v3 allows s[s.size()] when s is non-const.
-      _GLIBCXX_DEBUG_VERIFY(__pos <= this->size(),
-			    _M_message(__gnu_debug::__msg_subscript_oob)
-			    ._M_sequence(*this, "this")
-			    ._M_integer(__pos, "__pos")
-			    ._M_integer(this->size(), "size"));
-#endif
-      return _M_base()[__pos];
-    }
-
-    using _Base::at;
-
-#if __cplusplus >= 201103L
-    using _Base::front;
-    using _Base::back;
-#endif
-
-    // 21.3.5 modifiers:
-    basic_string&
-    operator+=(const basic_string& __str)
-    {
-      _M_base() += __str;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    operator+=(const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _M_base() += __s;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    operator+=(_CharT __c)
-    {
-      _M_base() += __c;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-#if __cplusplus >= 201103L
-    basic_string&
-    operator+=(std::initializer_list<_CharT> __l)
-    {
-      _M_base() += __l;
-      this->_M_invalidate_all();
-      return *this;
-    }
-#endif // C++11
-
-    basic_string&
-    append(const basic_string& __str)
-    {
-      _Base::append(__str);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    append(const basic_string& __str, size_type __pos, size_type __n)
-    {
-      _Base::append(__str, __pos, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    append(const _CharT* __s, size_type __n)
-    {
-      __glibcxx_check_string_len(__s, __n);
-      _Base::append(__s, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    append(const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _Base::append(__s);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    append(size_type __n, _CharT __c)
-    {
-      _Base::append(__n, __c);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    template<typename _InputIterator>
-      basic_string&
-      append(_InputIterator __first, _InputIterator __last)
-      {
-	__glibcxx_check_valid_range(__first, __last);
-	_Base::append(__gnu_debug::__base(__first),
-		      __gnu_debug::__base(__last));
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-    // 7. string clause minor problems
-    void
-    push_back(_CharT __c)
-    {
-      _Base::push_back(__c);
-      this->_M_invalidate_all();
-    }
-
-    basic_string&
-    assign(const basic_string& __x)
-    {
-      _Base::assign(__x);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-#if __cplusplus >= 201103L
-    basic_string&
-    assign(basic_string&& __x)
-    {
-      _Base::assign(std::move(__x));
-      this->_M_invalidate_all();
-      return *this;
-    }
-#endif // C++11
-
-    basic_string&
-    assign(const basic_string& __str, size_type __pos, size_type __n)
-    {
-      _Base::assign(__str, __pos, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    assign(const _CharT* __s, size_type __n)
-    {
-      __glibcxx_check_string_len(__s, __n);
-      _Base::assign(__s, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    assign(const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _Base::assign(__s);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    assign(size_type __n, _CharT __c)
-    {
-      _Base::assign(__n, __c);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    template<typename _InputIterator>
-      basic_string&
-      assign(_InputIterator __first, _InputIterator __last)
-      {
-	__glibcxx_check_valid_range(__first, __last);
-	_Base::assign(__gnu_debug::__base(__first),
-		      __gnu_debug::__base(__last));
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-    basic_string&
-    assign(std::initializer_list<_CharT> __l)
-    {
-      _Base::assign(__l);
-      this->_M_invalidate_all();
-      return *this;
-    }
-#endif // C++11
-
-    basic_string&
-    insert(size_type __pos1, const basic_string& __str)
-    {
-      _Base::insert(__pos1, __str);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    insert(size_type __pos1, const basic_string& __str,
-	   size_type __pos2, size_type __n)
-    {
-      _Base::insert(__pos1, __str, __pos2, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    insert(size_type __pos, const _CharT* __s, size_type __n)
-    {
-      __glibcxx_check_string(__s);
-      _Base::insert(__pos, __s, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    insert(size_type __pos, const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _Base::insert(__pos, __s);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    insert(size_type __pos, size_type __n, _CharT __c)
-    {
-      _Base::insert(__pos, __n, __c);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    iterator
-    insert(iterator __p, _CharT __c)
-    {
-      __glibcxx_check_insert(__p);
-      typename _Base::iterator __res = _Base::insert(__p.base(), __c);
-      this->_M_invalidate_all();
-      return iterator(__res, this);
-    }
-
-    void
-    insert(iterator __p, size_type __n, _CharT __c)
-    {
-      __glibcxx_check_insert(__p);
-      _Base::insert(__p.base(), __n, __c);
-      this->_M_invalidate_all();
-    }
-
-    template<typename _InputIterator>
-      void
-      insert(iterator __p, _InputIterator __first, _InputIterator __last)
-      {
-	__glibcxx_check_insert_range(__p, __first, __last);
-	_Base::insert(__p.base(), __gnu_debug::__base(__first),
-				  __gnu_debug::__base(__last));
-	this->_M_invalidate_all();
-      }
-
-#if __cplusplus >= 201103L
-    void
-    insert(iterator __p, std::initializer_list<_CharT> __l)
-    {
-      __glibcxx_check_insert(__p);
-      _Base::insert(__p.base(), __l);
-      this->_M_invalidate_all();
-    }
-#endif // C++11
-
-    basic_string&
-    erase(size_type __pos = 0, size_type __n = _Base::npos)
-    {
-      _Base::erase(__pos, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    iterator
-    erase(iterator __position)
-    {
-      __glibcxx_check_erase(__position);
-      typename _Base::iterator __res = _Base::erase(__position.base());
-      this->_M_invalidate_all();
-      return iterator(__res, this);
-    }
-
-    iterator
-    erase(iterator __first, iterator __last)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 151. can't currently clear() empty container
-      __glibcxx_check_erase_range(__first, __last);
-      typename _Base::iterator __res = _Base::erase(__first.base(),
-						    __last.base());
-      this->_M_invalidate_all();
-      return iterator(__res, this);
-    }
-
-#if __cplusplus >= 201103L
-    void
-    pop_back() // noexcept
-    {
-      __glibcxx_check_nonempty();
-      _Base::pop_back();
-      this->_M_invalidate_all();
-    }
-#endif // C++11
-
-    basic_string&
-    replace(size_type __pos1, size_type __n1, const basic_string& __str)
-    {
-      _Base::replace(__pos1, __n1, __str);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(size_type __pos1, size_type __n1, const basic_string& __str,
-	    size_type __pos2, size_type __n2)
-    {
-      _Base::replace(__pos1, __n1, __str, __pos2, __n2);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(size_type __pos, size_type __n1, const _CharT* __s,
-	    size_type __n2)
-    {
-      __glibcxx_check_string_len(__s, __n2);
-      _Base::replace(__pos, __n1, __s, __n2);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(size_type __pos, size_type __n1, const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _Base::replace(__pos, __n1, __s);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(size_type __pos, size_type __n1, size_type __n2, _CharT __c)
-    {
-      _Base::replace(__pos, __n1, __n2, __c);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(iterator __i1, iterator __i2, const basic_string& __str)
-    {
-      __glibcxx_check_erase_range(__i1, __i2);
-      _Base::replace(__i1.base(), __i2.base(), __str);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n)
-    {
-      __glibcxx_check_erase_range(__i1, __i2);
-      __glibcxx_check_string_len(__s, __n);
-      _Base::replace(__i1.base(), __i2.base(), __s, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(iterator __i1, iterator __i2, const _CharT* __s)
-    {
-      __glibcxx_check_erase_range(__i1, __i2);
-      __glibcxx_check_string(__s);
-      _Base::replace(__i1.base(), __i2.base(), __s);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(iterator __i1, iterator __i2, size_type __n, _CharT __c)
-    {
-      __glibcxx_check_erase_range(__i1, __i2);
-      _Base::replace(__i1.base(), __i2.base(), __n, __c);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    template<typename _InputIterator>
-      basic_string&
-      replace(iterator __i1, iterator __i2,
-	      _InputIterator __j1, _InputIterator __j2)
-      {
-	__glibcxx_check_erase_range(__i1, __i2);
-	__glibcxx_check_valid_range(__j1, __j2);
-	_Base::replace(__i1.base(), __i2.base(), __j1, __j2);
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      basic_string& replace(iterator __i1, iterator __i2,
-			    std::initializer_list<_CharT> __l)
-      {
-	__glibcxx_check_erase_range(__i1, __i2);
-	_Base::replace(__i1.base(), __i2.base(), __l);
-	this->_M_invalidate_all();
-	return *this;
-      }
-#endif // C++11
-
-    size_type
-    copy(_CharT* __s, size_type __n, size_type __pos = 0) const
-    {
-      __glibcxx_check_string_len(__s, __n);
-      return _Base::copy(__s, __n, __pos);
-    }
-
-    void
-    swap(basic_string& __x)
-    {
-      _Safe::_M_swap(__x);
-      _Base::swap(__x);
-    }
-
-    // 21.3.6 string operations:
-    const _CharT*
-    c_str() const _GLIBCXX_NOEXCEPT
-    {
-      const _CharT* __res = _Base::c_str();
-      this->_M_invalidate_all();
-      return __res;
-    }
-
-    const _CharT*
-    data() const _GLIBCXX_NOEXCEPT
-    {
-      const _CharT* __res = _Base::data();
-      this->_M_invalidate_all();
-      return __res;
-    }
-
-    using _Base::get_allocator;
-
-    size_type
-    find(const basic_string& __str, size_type __pos = 0) const
-      _GLIBCXX_NOEXCEPT
-    { return _Base::find(__str, __pos); }
-
-    size_type
-    find(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find(__s, __pos, __n);
-    }
-
-    size_type
-    find(const _CharT* __s, size_type __pos = 0) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find(__s, __pos);
-    }
-
-    size_type
-    find(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT
-    { return _Base::find(__c, __pos); }
-
-    size_type
-    rfind(const basic_string& __str, size_type __pos = _Base::npos) const
-      _GLIBCXX_NOEXCEPT
-    { return _Base::rfind(__str, __pos); }
-
-    size_type
-    rfind(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string_len(__s, __n);
-      return _Base::rfind(__s, __pos, __n);
-    }
-
-    size_type
-    rfind(const _CharT* __s, size_type __pos = _Base::npos) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::rfind(__s, __pos);
-    }
-
-    size_type
-    rfind(_CharT __c, size_type __pos = _Base::npos) const _GLIBCXX_NOEXCEPT
-    { return _Base::rfind(__c, __pos); }
-
-    size_type
-    find_first_of(const basic_string& __str, size_type __pos = 0) const
-      _GLIBCXX_NOEXCEPT
-    { return _Base::find_first_of(__str, __pos); }
-
-    size_type
-    find_first_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_first_of(__s, __pos, __n);
-    }
-
-    size_type
-    find_first_of(const _CharT* __s, size_type __pos = 0) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_first_of(__s, __pos);
-    }
-
-    size_type
-    find_first_of(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT
-    { return _Base::find_first_of(__c, __pos); }
-
-    size_type
-    find_last_of(const basic_string& __str,
-		 size_type __pos = _Base::npos) const _GLIBCXX_NOEXCEPT
-    { return _Base::find_last_of(__str, __pos); }
-
-    size_type
-    find_last_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_last_of(__s, __pos, __n);
-    }
-
-    size_type
-    find_last_of(const _CharT* __s, size_type __pos = _Base::npos) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_last_of(__s, __pos);
-    }
-
-    size_type
-    find_last_of(_CharT __c, size_type __pos = _Base::npos) const
-      _GLIBCXX_NOEXCEPT
-    { return _Base::find_last_of(__c, __pos); }
-
-    size_type
-    find_first_not_of(const basic_string& __str, size_type __pos = 0) const
-      _GLIBCXX_NOEXCEPT
-    { return _Base::find_first_not_of(__str, __pos); }
-
-    size_type
-    find_first_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string_len(__s, __n);
-      return _Base::find_first_not_of(__s, __pos, __n);
-    }
-
-    size_type
-    find_first_not_of(const _CharT* __s, size_type __pos = 0) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_first_not_of(__s, __pos);
-    }
-
-    size_type
-    find_first_not_of(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT
-    { return _Base::find_first_not_of(__c, __pos); }
-
-    size_type
-    find_last_not_of(const basic_string& __str,
-				  size_type __pos = _Base::npos) const
-      _GLIBCXX_NOEXCEPT
-    { return _Base::find_last_not_of(__str, __pos); }
-
-    size_type
-    find_last_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_last_not_of(__s, __pos, __n);
-    }
-
-    size_type
-    find_last_not_of(const _CharT* __s, size_type __pos = _Base::npos) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_last_not_of(__s, __pos);
-    }
-
-    size_type
-    find_last_not_of(_CharT __c, size_type __pos = _Base::npos) const
-      _GLIBCXX_NOEXCEPT
-    { return _Base::find_last_not_of(__c, __pos); }
-
-    basic_string
-    substr(size_type __pos = 0, size_type __n = _Base::npos) const
-    { return basic_string(_Base::substr(__pos, __n)); }
-
-    int
-    compare(const basic_string& __str) const
-    { return _Base::compare(__str); }
-
-    int
-    compare(size_type __pos1, size_type __n1,
-		  const basic_string& __str) const
-    { return _Base::compare(__pos1, __n1, __str); }
-
-    int
-    compare(size_type __pos1, size_type __n1, const basic_string& __str,
-	      size_type __pos2, size_type __n2) const
-    { return _Base::compare(__pos1, __n1, __str, __pos2, __n2); }
-
-    int
-    compare(const _CharT* __s) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::compare(__s);
-    }
-
-    //  _GLIBCXX_RESOLVE_LIB_DEFECTS
-    //  5. string::compare specification questionable
-    int
-    compare(size_type __pos1, size_type __n1, const _CharT* __s) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::compare(__pos1, __n1, __s);
-    }
-
-    //  _GLIBCXX_RESOLVE_LIB_DEFECTS
-    //  5. string::compare specification questionable
-    int
-    compare(size_type __pos1, size_type __n1,const _CharT* __s,
-	    size_type __n2) const
-    {
-      __glibcxx_check_string_len(__s, __n2);
-      return _Base::compare(__pos1, __n1, __s, __n2);
-    }
-
-    _Base&
-    _M_base() _GLIBCXX_NOEXCEPT		{ return *this; }
-
-    const _Base&
-    _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-
-    using _Safe::_M_invalidate_all;
-  };
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline basic_string<_CharT,_Traits,_Allocator>
-    operator+(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return basic_string<_CharT,_Traits,_Allocator>(__lhs) += __rhs; }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline basic_string<_CharT,_Traits,_Allocator>
-    operator+(const _CharT* __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return basic_string<_CharT,_Traits,_Allocator>(__lhs) += __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline basic_string<_CharT,_Traits,_Allocator>
-    operator+(_CharT __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return basic_string<_CharT,_Traits,_Allocator>(1, __lhs) += __rhs; }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline basic_string<_CharT,_Traits,_Allocator>
-    operator+(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return basic_string<_CharT,_Traits,_Allocator>(__lhs) += __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline basic_string<_CharT,_Traits,_Allocator>
-    operator+(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      _CharT __rhs)
-    { return basic_string<_CharT,_Traits,_Allocator>(__lhs) += __rhs; }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator==(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator==(const _CharT* __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs == __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator==(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() == __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator!=(const _CharT* __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs != __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() != __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<(const _CharT* __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs < __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() < __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<=(const _CharT* __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs <= __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() <= __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>=(const _CharT* __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs >= __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() >= __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>(const _CharT* __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs > __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() > __rhs;
-    }
-
-  // 21.3.7.8:
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline void
-    swap(basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	 basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { __lhs.swap(__rhs); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const basic_string<_CharT, _Traits, _Allocator>& __str)
-    { return __os << __str._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    std::basic_istream<_CharT,_Traits>&
-    operator>>(std::basic_istream<_CharT,_Traits>& __is,
-	       basic_string<_CharT,_Traits,_Allocator>& __str)
-    {
-      std::basic_istream<_CharT,_Traits>& __res = __is >> __str._M_base();
-      __str._M_invalidate_all();
-      return __res;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    std::basic_istream<_CharT,_Traits>&
-    getline(std::basic_istream<_CharT,_Traits>& __is,
-	    basic_string<_CharT,_Traits,_Allocator>& __str, _CharT __delim)
-    {
-      std::basic_istream<_CharT,_Traits>& __res = getline(__is,
-							  __str._M_base(),
-							__delim);
-      __str._M_invalidate_all();
-      return __res;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    std::basic_istream<_CharT,_Traits>&
-    getline(std::basic_istream<_CharT,_Traits>& __is,
-	    basic_string<_CharT,_Traits,_Allocator>& __str)
-    {
-      std::basic_istream<_CharT,_Traits>& __res = getline(__is,
-							  __str._M_base());
-      __str._M_invalidate_all();
-      return __res;
-    }
-
-  typedef basic_string<char>    string;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  typedef basic_string<wchar_t> wstring;
-#endif
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    struct _Insert_range_from_self_is_safe<
-      __gnu_debug::basic_string<_CharT, _Traits, _Allocator> >
-      { enum { __value = 1 }; };
-
-} // namespace __gnu_debug
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/unordered_map b/openflow/usr/include/c++/5/debug/unordered_map
deleted file mode 100644
index 3f46641..0000000
--- a/openflow/usr/include/c++/5/debug/unordered_map
+++ /dev/null
@@ -1,950 +0,0 @@
-// Debugging unordered_map/unordered_multimap implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/unordered_map
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_UNORDERED_MAP
-#define _GLIBCXX_DEBUG_UNORDERED_MAP 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-# include <unordered_map>
-
-#include <debug/safe_unordered_container.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-#include <debug/safe_local_iterator.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::unordered_map with safety/checking/debug instrumentation.
-  template<typename _Key, typename _Tp,
-	   typename _Hash = std::hash<_Key>,
-	   typename _Pred = std::equal_to<_Key>,
-	   typename _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-    class unordered_map
-    : public __gnu_debug::_Safe_container<
-	unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>, _Alloc,
-	__gnu_debug::_Safe_unordered_container>,
-      public _GLIBCXX_STD_C::unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>
-    {
-      typedef _GLIBCXX_STD_C::unordered_map<_Key, _Tp, _Hash,
-					    _Pred, _Alloc>		_Base;
-      typedef __gnu_debug::_Safe_container<unordered_map,
-		   _Alloc, __gnu_debug::_Safe_unordered_container>	_Safe;
-      typedef typename _Base::const_iterator	_Base_const_iterator;
-      typedef typename _Base::iterator		_Base_iterator;
-      typedef typename _Base::const_local_iterator
-						_Base_const_local_iterator;
-      typedef typename _Base::local_iterator	_Base_local_iterator;
-
-    public:
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::hasher			hasher;
-      typedef typename _Base::key_equal			key_equal;
-      typedef typename _Base::allocator_type		allocator_type;
-
-      typedef typename _Base::key_type			key_type;
-      typedef typename _Base::value_type		value_type;
-
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_iterator, unordered_map>			iterator;
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_const_iterator, unordered_map>		const_iterator;
-      typedef __gnu_debug::_Safe_local_iterator<
-	_Base_local_iterator, unordered_map>		local_iterator;
-      typedef __gnu_debug::_Safe_local_iterator<
-	_Base_const_local_iterator, unordered_map>	const_local_iterator;
-
-      unordered_map() = default;
-
-      explicit
-      unordered_map(size_type __n,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a) { }
-
-      template<typename _InputIterator>
-	unordered_map(_InputIterator __first, _InputIterator __last,
-		      size_type __n = 0,
-		      const hasher& __hf = hasher(),
-		      const key_equal& __eql = key_equal(),
-		      const allocator_type& __a = allocator_type())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __n,
-		__hf, __eql, __a) { }
-
-      unordered_map(const unordered_map&) = default;
-
-      unordered_map(const _Base& __x)
-      : _Base(__x) { }
-
-      unordered_map(unordered_map&&) = default;
-
-      explicit
-      unordered_map(const allocator_type& __a)
-      : _Base(__a) { }
-
-      unordered_map(const unordered_map& __umap,
-		    const allocator_type& __a)
-      : _Base(__umap, __a) { }
-
-      unordered_map(unordered_map&& __umap,
-		    const allocator_type& __a)
-      : _Safe(std::move(__umap._M_safe()), __a),
-	_Base(std::move(__umap._M_base()), __a) { }
-
-      unordered_map(initializer_list<value_type> __l,
-		    size_type __n = 0,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _Base(__l, __n, __hf, __eql, __a) { }
-
-      unordered_map(size_type __n, const allocator_type& __a)
-      : unordered_map(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_map(size_type __n,
-		    const hasher& __hf,
-		    const allocator_type& __a)
-      : unordered_map(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_map(_InputIterator __first, _InputIterator __last,
-		      size_type __n,
-		      const allocator_type& __a)
-	  : unordered_map(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_map(_InputIterator __first, _InputIterator __last,
-		      size_type __n,
-		      const hasher& __hf,
-		      const allocator_type& __a)
-	  : unordered_map(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_map(initializer_list<value_type> __l,
-		    size_type __n,
-		    const allocator_type& __a)
-	: unordered_map(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_map(initializer_list<value_type> __l,
-		    size_type __n,
-		    const hasher& __hf,
-		    const allocator_type& __a)
-	: unordered_map(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      ~unordered_map() = default;
-
-      unordered_map&
-      operator=(const unordered_map&) = default;
-
-      unordered_map&
-      operator=(unordered_map&&) = default;
-
-      unordered_map&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_base() = __l;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      void
-      swap(unordered_map& __x)
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-      }
-
-      void
-      clear() noexcept
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      iterator
-      begin() noexcept
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() noexcept
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      // local versions
-      local_iterator
-      begin(size_type __b)
-      {
-	__glibcxx_check_bucket_index(__b);
-	return local_iterator(_Base::begin(__b), this);
-      }
-
-      local_iterator
-      end(size_type __b)
-      {
-	__glibcxx_check_bucket_index(__b);
-	return local_iterator(_Base::end(__b), this);
-      }
-
-      const_local_iterator
-      begin(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::begin(__b), this);
-      }
-
-      const_local_iterator
-      end(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::end(__b), this);
-      }
-
-      const_local_iterator
-      cbegin(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::cbegin(__b), this);
-      }
-
-      const_local_iterator
-      cend(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::cend(__b), this);
-      }
-
-      size_type
-      bucket_size(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return _Base::bucket_size(__b);
-      }
-
-      float
-      max_load_factor() const noexcept
-      { return _Base::max_load_factor(); }
-
-      void
-      max_load_factor(float __f)
-      {
-	__glibcxx_check_max_load_factor(__f);
-	_Base::max_load_factor(__f);
-      }
-
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{
-	  size_type __bucket_count = this->bucket_count();
-	  std::pair<_Base_iterator, bool> __res
-	    = _Base::emplace(std::forward<_Args>(__args)...);
-	  _M_check_rehashed(__bucket_count);
-	  return std::make_pair(iterator(__res.first, this), __res.second);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __hint, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__hint);
-	  size_type __bucket_count = this->bucket_count();
-	  _Base_iterator __it = _Base::emplace_hint(__hint.base(),
-					std::forward<_Args>(__args)...);
-	  _M_check_rehashed(__bucket_count);
-	  return iterator(__it, this);
-	}
-
-      std::pair<iterator, bool>
-      insert(const value_type& __obj)
-      {
-	size_type __bucket_count = this->bucket_count();
-	std::pair<_Base_iterator, bool> __res = _Base::insert(__obj);
-	_M_check_rehashed(__bucket_count);
-	return std::make_pair(iterator(__res.first, this), __res.second);
-      }
-
-      iterator
-      insert(const_iterator __hint, const value_type& __obj)
-      {
-	__glibcxx_check_insert(__hint);
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __it = _Base::insert(__hint.base(), __obj);
-	_M_check_rehashed(__bucket_count);
-	return iterator(__it, this);
-      }
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	std::pair<iterator, bool>
-	insert(_Pair&& __obj)
-	{
-	  size_type __bucket_count = this->bucket_count();
-	  std::pair<_Base_iterator, bool> __res =
-	    _Base::insert(std::forward<_Pair>(__obj));
-	  _M_check_rehashed(__bucket_count);
-	  return std::make_pair(iterator(__res.first, this), __res.second);
-	}
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(const_iterator __hint, _Pair&& __obj)
-	{
-	  __glibcxx_check_insert(__hint);
-	  size_type __bucket_count = this->bucket_count();
-	  _Base_iterator __it =
-	    _Base::insert(__hint.base(), std::forward<_Pair>(__obj));
-	  _M_check_rehashed(__bucket_count);
-	  return iterator(__it, this);
-	}
-
-      void
-      insert(std::initializer_list<value_type> __l)
-      {
-	size_type __bucket_count = this->bucket_count();
-	_Base::insert(__l);
-	_M_check_rehashed(__bucket_count);
-      }
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  size_type __bucket_count = this->bucket_count();
-	  _Base::insert(__gnu_debug::__base(__first),
-			  __gnu_debug::__base(__last));
-	  _M_check_rehashed(__bucket_count);
-	}
-
-      iterator
-      find(const key_type& __key)
-      { return iterator(_Base::find(__key), this); }
-
-      const_iterator
-      find(const key_type& __key) const
-      { return const_iterator(_Base::find(__key), this); }
-
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __key)
-      {
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	  _Base::equal_range(__key);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const
-      {
-	std::pair<_Base_const_iterator, _Base_const_iterator> __res =
-	  _Base::equal_range(__key);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      size_type
-      erase(const key_type& __key)
-      {
-	size_type __ret(0);
-	_Base_iterator __victim(_Base::find(__key));
-	if (__victim != _Base::end())
-	  {
-	    this->_M_invalidate_if([__victim](_Base_const_iterator __it)
-			    { return __it == __victim; });
-	    this->_M_invalidate_local_if(
-			    [__victim](_Base_const_local_iterator __it)
-			    { return __it._M_curr() == __victim._M_cur; });
-	    size_type __bucket_count = this->bucket_count();
-	    _Base::erase(__victim);
-	    _M_check_rehashed(__bucket_count);
-	    __ret = 1;
-	  }
-	return __ret;
-      }
-
-      iterator
-      erase(const_iterator __it)
-      {
-	__glibcxx_check_erase(__it);
-	_Base_const_iterator __victim = __it.base();
-	this->_M_invalidate_if([__victim](_Base_const_iterator __it)
-			{ return __it == __victim; });
-	this->_M_invalidate_local_if(
-			[__victim](_Base_const_local_iterator __it)
-			{ return __it._M_curr() == __victim._M_cur; });
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __next = _Base::erase(__it.base());
-	_M_check_rehashed(__bucket_count);
-	return iterator(__next, this);
-      }
-
-      iterator
-      erase(iterator __it)
-      { return erase(const_iterator(__it)); }
-
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_const_iterator __tmp = __first.base();
-	     __tmp != __last.base(); ++__tmp)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__tmp != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if([__tmp](_Base_const_iterator __it)
-			    { return __it == __tmp; });
-	    this->_M_invalidate_local_if(
-			    [__tmp](_Base_const_local_iterator __it)
-			    { return __it._M_curr() == __tmp._M_cur; });
-	  }
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __next = _Base::erase(__first.base(), __last.base());
-	_M_check_rehashed(__bucket_count);
-	return iterator(__next, this);
-      }
-
-      _Base&
-      _M_base() noexcept	{ return *this; }
-
-      const _Base&
-      _M_base() const noexcept	{ return *this; }
-
-    private:
-      void
-      _M_check_rehashed(size_type __prev_count)
-      {
-	if (__prev_count != this->bucket_count())
-	  this->_M_invalidate_locals();
-      }
-    };
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline void
-    swap(unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	 unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline bool
-    operator==(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return __x._M_base() == __y._M_base(); }
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline bool
-    operator!=(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-
-  /// Class std::unordered_multimap with safety/checking/debug instrumentation.
-  template<typename _Key, typename _Tp,
-	   typename _Hash = std::hash<_Key>,
-	   typename _Pred = std::equal_to<_Key>,
-	   typename _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-    class unordered_multimap
-      : public __gnu_debug::_Safe_container<
-	unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>, _Alloc,
-	__gnu_debug::_Safe_unordered_container>,
-	public _GLIBCXX_STD_C::unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>
-    {
-      typedef _GLIBCXX_STD_C::unordered_multimap<_Key, _Tp, _Hash,
-						 _Pred, _Alloc>		_Base;
-      typedef __gnu_debug::_Safe_container<unordered_multimap,
-	_Alloc, __gnu_debug::_Safe_unordered_container>			_Safe;
-      typedef typename _Base::const_iterator	   _Base_const_iterator;
-      typedef typename _Base::iterator		   _Base_iterator;
-      typedef typename _Base::const_local_iterator _Base_const_local_iterator;
-      typedef typename _Base::local_iterator	   _Base_local_iterator;
-
-    public:
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::hasher			hasher;
-      typedef typename _Base::key_equal			key_equal;
-      typedef typename _Base::allocator_type		allocator_type;
-
-      typedef typename _Base::key_type			key_type;
-      typedef typename _Base::value_type		value_type;
-
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_iterator, unordered_multimap>		iterator;
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_const_iterator, unordered_multimap>	const_iterator;
-      typedef __gnu_debug::_Safe_local_iterator<
-	_Base_local_iterator, unordered_multimap>	local_iterator;
-      typedef __gnu_debug::_Safe_local_iterator<
-	_Base_const_local_iterator, unordered_multimap> const_local_iterator;
-
-      unordered_multimap() = default;
-
-      explicit
-      unordered_multimap(size_type __n,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a) { }
-
-      template<typename _InputIterator>
-	unordered_multimap(_InputIterator __first, _InputIterator __last,
-			   size_type __n = 0,
-			   const hasher& __hf = hasher(),
-			   const key_equal& __eql = key_equal(),
-			   const allocator_type& __a = allocator_type())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __n,
-		__hf, __eql, __a) { }
-
-      unordered_multimap(const unordered_multimap&) = default;
-
-      unordered_multimap(const _Base& __x)
-      : _Base(__x) { }
-
-      unordered_multimap(unordered_multimap&&) = default;
-
-      explicit
-      unordered_multimap(const allocator_type& __a)
-      : _Base(__a) { }
-
-      unordered_multimap(const unordered_multimap& __umap,
-			 const allocator_type& __a)
-      : _Base(__umap, __a) { }
-
-      unordered_multimap(unordered_multimap&& __umap,
-			 const allocator_type& __a)
-      : _Safe(std::move(__umap._M_safe()), __a),
-	_Base(std::move(__umap._M_base()), __a) { }
-
-      unordered_multimap(initializer_list<value_type> __l,
-			 size_type __n = 0,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _Base(__l, __n, __hf, __eql, __a) { }
-
-      unordered_multimap(size_type __n, const allocator_type& __a)
-      : unordered_multimap(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multimap(size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-      : unordered_multimap(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_multimap(_InputIterator __first, _InputIterator __last,
-			   size_type __n,
-			   const allocator_type& __a)
-	  : unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_multimap(_InputIterator __first, _InputIterator __last,
-			   size_type __n, const hasher& __hf,
-			   const allocator_type& __a)
-	  : unordered_multimap(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_multimap(initializer_list<value_type> __l,
-			 size_type __n,
-			 const allocator_type& __a)
-	: unordered_multimap(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multimap(initializer_list<value_type> __l,
-			 size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-	: unordered_multimap(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      ~unordered_multimap() = default;
-
-      unordered_multimap&
-      operator=(const unordered_multimap&) = default;
-
-      unordered_multimap&
-      operator=(unordered_multimap&&) = default;
-
-      unordered_multimap&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_base() = __l;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      void
-      swap(unordered_multimap& __x)
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-      }
-
-      void
-      clear() noexcept
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      iterator
-      begin() noexcept
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() noexcept
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      // local versions
-      local_iterator
-      begin(size_type __b)
-      {
-	__glibcxx_check_bucket_index(__b);
-	return local_iterator(_Base::begin(__b), this);
-      }
-
-      local_iterator
-      end(size_type __b)
-      {
-	__glibcxx_check_bucket_index(__b);
-	return local_iterator(_Base::end(__b), this);
-      }
-
-      const_local_iterator
-      begin(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::begin(__b), this);
-      }
-
-      const_local_iterator
-      end(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::end(__b), this);
-      }
-
-      const_local_iterator
-      cbegin(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::cbegin(__b), this);
-      }
-
-      const_local_iterator
-      cend(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::cend(__b), this);
-      }
-
-      size_type
-      bucket_size(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return _Base::bucket_size(__b);
-      }
-
-      float
-      max_load_factor() const noexcept
-      { return _Base::max_load_factor(); }
-
-      void
-      max_load_factor(float __f)
-      {
-	__glibcxx_check_max_load_factor(__f);
-	_Base::max_load_factor(__f);
-      }
-
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{
-	  size_type __bucket_count = this->bucket_count();
-	  _Base_iterator __it
-	    = _Base::emplace(std::forward<_Args>(__args)...);
-	  _M_check_rehashed(__bucket_count);
-	  return iterator(__it, this);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __hint, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__hint);
-	  size_type __bucket_count = this->bucket_count();
-	  _Base_iterator __it = _Base::emplace_hint(__hint.base(),
-					std::forward<_Args>(__args)...);
-	  _M_check_rehashed(__bucket_count);
-	  return iterator(__it, this);
-	}
-
-      iterator
-      insert(const value_type& __obj)
-      {
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __it = _Base::insert(__obj);
-	_M_check_rehashed(__bucket_count);
-	return iterator(__it, this);
-      }
-
-      iterator
-      insert(const_iterator __hint, const value_type& __obj)
-      {
-	__glibcxx_check_insert(__hint);
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __it = _Base::insert(__hint.base(), __obj);
-	_M_check_rehashed(__bucket_count);
-	return iterator(__it, this);
-      }
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(_Pair&& __obj)
-	{
-	  size_type __bucket_count = this->bucket_count();
-	  _Base_iterator __it = _Base::insert(std::forward<_Pair>(__obj));
-	  _M_check_rehashed(__bucket_count);
-	  return iterator(__it, this);
-	}
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(const_iterator __hint, _Pair&& __obj)
-	{
-	  __glibcxx_check_insert(__hint);
-	  size_type __bucket_count = this->bucket_count();
-	  _Base_iterator __it =
-	    _Base::insert(__hint.base(), std::forward<_Pair>(__obj));
-	  _M_check_rehashed(__bucket_count);
-	  return iterator(__it, this);
-	}
-
-      void
-      insert(std::initializer_list<value_type> __l)
-      { _Base::insert(__l); }
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  size_type __bucket_count = this->bucket_count();
-	  _Base::insert(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	  _M_check_rehashed(__bucket_count);
-	}
-
-      iterator
-      find(const key_type& __key)
-      { return iterator(_Base::find(__key), this); }
-
-      const_iterator
-      find(const key_type& __key) const
-      { return const_iterator(_Base::find(__key), this); }
-
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __key)
-      {
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	  _Base::equal_range(__key);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const
-      {
-	std::pair<_Base_const_iterator, _Base_const_iterator> __res =
-	  _Base::equal_range(__key);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      size_type
-      erase(const key_type& __key)
-      {
-	size_type __ret(0);
-	size_type __bucket_count = this->bucket_count();
-	std::pair<_Base_iterator, _Base_iterator> __pair =
-	  _Base::equal_range(__key);
-	for (_Base_iterator __victim = __pair.first; __victim != __pair.second;)
-	  {
-	    this->_M_invalidate_if([__victim](_Base_const_iterator __it)
-			    { return __it == __victim; });
-	    this->_M_invalidate_local_if(
-			    [__victim](_Base_const_local_iterator __it)
-			    { return __it._M_curr() == __victim._M_cur; });
-	    _Base::erase(__victim++);
-	    ++__ret;
-	  }
-	_M_check_rehashed(__bucket_count);
-	return __ret;
-      }
-
-      iterator
-      erase(const_iterator __it)
-      {
-	__glibcxx_check_erase(__it);
-	_Base_const_iterator __victim = __it.base();
-	this->_M_invalidate_if([__victim](_Base_const_iterator __it)
-			{ return __it == __victim; });
-	this->_M_invalidate_local_if(
-			[__victim](_Base_const_local_iterator __it)
-			{ return __it._M_curr() == __victim._M_cur; });
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __next = _Base::erase(__it.base());
-	_M_check_rehashed(__bucket_count);
-	return iterator(__next, this);
-      }
-
-      iterator
-      erase(iterator __it)
-      { return erase(const_iterator(__it)); }
-
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_const_iterator __tmp = __first.base();
-	     __tmp != __last.base(); ++__tmp)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__tmp != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if([__tmp](_Base_const_iterator __it)
-			    { return __it == __tmp; });
-	    this->_M_invalidate_local_if(
-			    [__tmp](_Base_const_local_iterator __it)
-			    { return __it._M_curr() == __tmp._M_cur; });
-	  }
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __next = _Base::erase(__first.base(), __last.base());
-	_M_check_rehashed(__bucket_count);
-	return iterator(__next, this);
-      }
-
-      _Base&
-      _M_base() noexcept { return *this; }
-
-      const _Base&
-      _M_base() const noexcept { return *this; }
-
-    private:
-      void
-      _M_check_rehashed(size_type __prev_count)
-      {
-	if (__prev_count != this->bucket_count())
-	  this->_M_invalidate_locals();
-      }
-    };
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline void
-    swap(unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	 unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline bool
-    operator==(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return __x._M_base() == __y._M_base(); }
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline bool
-    operator!=(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-} // namespace __debug
-} // namespace std
-
-#endif // C++11
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/unordered_set b/openflow/usr/include/c++/5/debug/unordered_set
deleted file mode 100644
index 10a9c27..0000000
--- a/openflow/usr/include/c++/5/debug/unordered_set
+++ /dev/null
@@ -1,930 +0,0 @@
-// Debugging unordered_set/unordered_multiset implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/unordered_set
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_UNORDERED_SET
-#define _GLIBCXX_DEBUG_UNORDERED_SET 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-# include <unordered_set>
-
-#include <debug/safe_unordered_container.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-#include <debug/safe_local_iterator.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::unordered_set with safety/checking/debug instrumentation.
-  template<typename _Value,
-	   typename _Hash = std::hash<_Value>,
-	   typename _Pred = std::equal_to<_Value>,
-	   typename _Alloc = std::allocator<_Value> >
-    class unordered_set
-    : public __gnu_debug::_Safe_container<
-	unordered_set<_Value, _Hash, _Pred, _Alloc>, _Alloc,
-	__gnu_debug::_Safe_unordered_container>,
-      public _GLIBCXX_STD_C::unordered_set<_Value, _Hash, _Pred, _Alloc>
-    {
-      typedef _GLIBCXX_STD_C::unordered_set<
-	_Value, _Hash, _Pred, _Alloc>					_Base;
-      typedef __gnu_debug::_Safe_container<
-	unordered_set, _Alloc, __gnu_debug::_Safe_unordered_container>	_Safe;
-
-      typedef typename _Base::const_iterator	   _Base_const_iterator;
-      typedef typename _Base::iterator		   _Base_iterator;
-      typedef typename _Base::const_local_iterator _Base_const_local_iterator;
-      typedef typename _Base::local_iterator	   _Base_local_iterator;
-
-    public:
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::hasher			hasher;
-      typedef typename _Base::key_equal			key_equal;
-      typedef typename _Base::allocator_type		allocator_type;
-
-      typedef typename _Base::key_type			key_type;
-      typedef typename _Base::value_type		value_type;
-
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_iterator, unordered_set>			iterator;
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_const_iterator, unordered_set>		const_iterator;
-      typedef __gnu_debug::_Safe_local_iterator<
-	_Base_local_iterator, unordered_set>		local_iterator;
-      typedef __gnu_debug::_Safe_local_iterator<
-	_Base_const_local_iterator, unordered_set>	const_local_iterator;
-
-      unordered_set() = default;
-
-      explicit
-      unordered_set(size_type __n,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a) { }
-
-      template<typename _InputIterator>
-	unordered_set(_InputIterator __first, _InputIterator __last,
-		      size_type __n = 0,
-		      const hasher& __hf = hasher(),
-		      const key_equal& __eql = key_equal(),
-		      const allocator_type& __a = allocator_type())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __n,
-		__hf, __eql, __a) { }
-
-      unordered_set(const unordered_set&) = default;
-
-      unordered_set(const _Base& __x)
-      : _Base(__x) { }
-
-      unordered_set(unordered_set&&) = default;
-
-      explicit
-      unordered_set(const allocator_type& __a)
-      : _Base(__a) { }
-
-      unordered_set(const unordered_set& __uset,
-		    const allocator_type& __a)
-      : _Base(__uset, __a) { }
-
-      unordered_set(unordered_set&& __uset,
-		    const allocator_type& __a)
-      : _Safe(std::move(__uset._M_safe()), __a),
-	_Base(std::move(__uset._M_base()), __a) { }
-
-      unordered_set(initializer_list<value_type> __l,
-		    size_type __n = 0,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _Base(__l, __n, __hf, __eql, __a) { }
-
-      unordered_set(size_type __n, const allocator_type& __a)
-	: unordered_set(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_set(size_type __n, const hasher& __hf,
-		    const allocator_type& __a)
-	: unordered_set(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_set(_InputIterator __first, _InputIterator __last,
-		      size_type __n,
-		      const allocator_type& __a)
-	  : unordered_set(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_set(_InputIterator __first, _InputIterator __last,
-		      size_type __n, const hasher& __hf,
-		      const allocator_type& __a)
-	  : unordered_set(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_set(initializer_list<value_type> __l,
-		    size_type __n,
-		    const allocator_type& __a)
-	: unordered_set(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_set(initializer_list<value_type> __l,
-		    size_type __n, const hasher& __hf,
-		    const allocator_type& __a)
-	: unordered_set(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      ~unordered_set() = default;
-
-      unordered_set&
-      operator=(const unordered_set&) = default;
-
-      unordered_set&
-      operator=(unordered_set&&) = default;
-
-      unordered_set&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_base() = __l;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      void
-      swap(unordered_set& __x)
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-      }
-
-      void
-      clear() noexcept
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      iterator
-      begin() noexcept
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() noexcept
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      // local versions
-      local_iterator
-      begin(size_type __b)
-      {
-	__glibcxx_check_bucket_index(__b);
-	return local_iterator(_Base::begin(__b), this);
-      }
-
-      local_iterator
-      end(size_type __b)
-      {
-	__glibcxx_check_bucket_index(__b);
-	return local_iterator(_Base::end(__b), this);
-      }
-
-      const_local_iterator
-      begin(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::begin(__b), this);
-      }
-
-      const_local_iterator
-      end(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::end(__b), this);
-      }
-
-      const_local_iterator
-      cbegin(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::cbegin(__b), this);
-      }
-
-      const_local_iterator
-      cend(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::cend(__b), this);
-      }
-
-      size_type
-      bucket_size(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return _Base::bucket_size(__b);
-      }
-
-      float
-      max_load_factor() const noexcept
-      { return _Base::max_load_factor(); }
-
-      void
-      max_load_factor(float __f)
-      {
-	__glibcxx_check_max_load_factor(__f);
-	_Base::max_load_factor(__f);
-      }
-
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{
-	  size_type __bucket_count = this->bucket_count();
-	  std::pair<_Base_iterator, bool> __res
-	    = _Base::emplace(std::forward<_Args>(__args)...);
-	  _M_check_rehashed(__bucket_count);
-	  return std::make_pair(iterator(__res.first, this), __res.second);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __hint, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__hint);
-	  size_type __bucket_count = this->bucket_count();
-	  _Base_iterator __it = _Base::emplace_hint(__hint.base(),
-					std::forward<_Args>(__args)...);
-	  _M_check_rehashed(__bucket_count);
-	  return iterator(__it, this);
-	}
-
-      std::pair<iterator, bool>
-      insert(const value_type& __obj)
-      {
-	size_type __bucket_count = this->bucket_count();
-	std::pair<_Base_iterator, bool> __res
-	  = _Base::insert(__obj);
-	_M_check_rehashed(__bucket_count);
-	return std::make_pair(iterator(__res.first, this), __res.second);
-      }
-
-      iterator
-      insert(const_iterator __hint, const value_type& __obj)
-      {
-	__glibcxx_check_insert(__hint);
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __it = _Base::insert(__hint.base(), __obj);
-	_M_check_rehashed(__bucket_count);
-	return iterator(__it, this);
-      }
-
-      std::pair<iterator, bool>
-      insert(value_type&& __obj)
-      {
-	size_type __bucket_count = this->bucket_count();
-	std::pair<_Base_iterator, bool> __res
-	  = _Base::insert(std::move(__obj));
-	_M_check_rehashed(__bucket_count);
-	return std::make_pair(iterator(__res.first, this), __res.second);
-      }
-
-      iterator
-      insert(const_iterator __hint, value_type&& __obj)
-      {
-	__glibcxx_check_insert(__hint);
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __it = _Base::insert(__hint.base(), std::move(__obj));
-	_M_check_rehashed(__bucket_count);
-	return iterator(__it, this);
-      }
-
-      void
-      insert(std::initializer_list<value_type> __l)
-      {
-	size_type __bucket_count = this->bucket_count();
-	_Base::insert(__l);
-	_M_check_rehashed(__bucket_count);
-      }
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  size_type __bucket_count = this->bucket_count();
-	  _Base::insert(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	  _M_check_rehashed(__bucket_count);
-	}
-
-      iterator
-      find(const key_type& __key)
-      { return iterator(_Base::find(__key), this); }
-
-      const_iterator
-      find(const key_type& __key) const
-      { return const_iterator(_Base::find(__key), this); }
-
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __key)
-      {
-	std::pair<_Base_iterator, _Base_iterator> __res
-	  = _Base::equal_range(__key);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const
-      {
-	std::pair<_Base_const_iterator, _Base_const_iterator>
-	  __res = _Base::equal_range(__key);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      size_type
-      erase(const key_type& __key)
-      {
-	size_type __ret(0);
-	_Base_iterator __victim(_Base::find(__key));
-	if (__victim != _Base::end())
-	  {
-	    this->_M_invalidate_if(
-			    [__victim](_Base_const_iterator __it)
-			    { return __it == __victim; });
-	    this->_M_invalidate_local_if(
-			    [__victim](_Base_const_local_iterator __it)
-			    { return __it._M_curr() == __victim._M_cur; });
-	    size_type __bucket_count = this->bucket_count();
-	    _Base::erase(__victim);
-	    _M_check_rehashed(__bucket_count);
-	    __ret = 1;
-	  }
-	return __ret;
-      }
-
-      iterator
-      erase(const_iterator __it)
-      {
-	__glibcxx_check_erase(__it);
-	_Base_const_iterator __victim = __it.base();
-	this->_M_invalidate_if(
-			[__victim](_Base_const_iterator __it)
-			{ return __it == __victim; });
-	this->_M_invalidate_local_if(
-			[__victim](_Base_const_local_iterator __it)
-			{ return __it._M_curr() == __victim._M_cur; });
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __next = _Base::erase(__it.base());
-	_M_check_rehashed(__bucket_count);
-	return iterator(__next, this);
-      }
-
-      iterator
-      erase(iterator __it)
-      { return erase(const_iterator(__it)); }
-
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_const_iterator __tmp = __first.base();
-	     __tmp != __last.base(); ++__tmp)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__tmp != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if(
-			    [__tmp](_Base_const_iterator __it)
-			    { return __it == __tmp; });
-	    this->_M_invalidate_local_if(
-			    [__tmp](_Base_const_local_iterator __it)
-			    { return __it._M_curr() == __tmp._M_cur; });
-	  }
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __next = _Base::erase(__first.base(),
-					     __last.base());
-	_M_check_rehashed(__bucket_count);
-	return iterator(__next, this);
-      }
-
-      _Base&
-      _M_base() noexcept { return *this; }
-
-      const _Base&
-      _M_base() const noexcept { return *this; }
-
-    private:
-      void
-      _M_check_rehashed(size_type __prev_count)
-      {
-	if (__prev_count != this->bucket_count())
-	  this->_M_invalidate_locals();
-      }
-    };
-
-  template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
-    inline void
-    swap(unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-	 unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
-    inline bool
-    operator==(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-    { return __x._M_base() == __y._M_base(); }
-
-  template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
-    inline bool
-    operator!=(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-
-  /// Class std::unordered_multiset with safety/checking/debug instrumentation.
-  template<typename _Value,
-	   typename _Hash = std::hash<_Value>,
-	   typename _Pred = std::equal_to<_Value>,
-	   typename _Alloc = std::allocator<_Value> >
-    class unordered_multiset
-    : public __gnu_debug::_Safe_container<
-	unordered_multiset<_Value, _Hash, _Pred, _Alloc>, _Alloc,
-	__gnu_debug::_Safe_unordered_container>,
-      public _GLIBCXX_STD_C::unordered_multiset<_Value, _Hash, _Pred, _Alloc>
-    {
-      typedef _GLIBCXX_STD_C::unordered_multiset<
-	_Value, _Hash, _Pred, _Alloc>				_Base;
-      typedef __gnu_debug::_Safe_container<unordered_multiset,
-	_Alloc, __gnu_debug::_Safe_unordered_container>		_Safe;
-      typedef typename _Base::const_iterator	_Base_const_iterator;
-      typedef typename _Base::iterator		_Base_iterator;
-      typedef typename _Base::const_local_iterator
-						_Base_const_local_iterator;
-      typedef typename _Base::local_iterator	_Base_local_iterator;
-
-    public:
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::hasher			hasher;
-      typedef typename _Base::key_equal			key_equal;
-      typedef typename _Base::allocator_type		allocator_type;
-
-      typedef typename _Base::key_type			key_type;
-      typedef typename _Base::value_type		value_type;
-
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_iterator, unordered_multiset>		iterator;
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_const_iterator, unordered_multiset>	const_iterator;
-      typedef __gnu_debug::_Safe_local_iterator<
-	_Base_local_iterator, unordered_multiset>	local_iterator;
-      typedef __gnu_debug::_Safe_local_iterator<
-	_Base_const_local_iterator, unordered_multiset> const_local_iterator;
-
-      unordered_multiset() = default;
-
-      explicit
-      unordered_multiset(size_type __n,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a) { }
-
-      template<typename _InputIterator>
-	unordered_multiset(_InputIterator __first, _InputIterator __last,
-			   size_type __n = 0,
-			   const hasher& __hf = hasher(),
-			   const key_equal& __eql = key_equal(),
-			   const allocator_type& __a = allocator_type())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __n,
-		__hf, __eql, __a) { }
-
-      unordered_multiset(const unordered_multiset&) = default;
-
-      unordered_multiset(const _Base& __x)
-      : _Base(__x) { }
-
-      unordered_multiset(unordered_multiset&&) = default;
-
-      explicit
-      unordered_multiset(const allocator_type& __a)
-      : _Base(__a) { }
-
-      unordered_multiset(const unordered_multiset& __uset,
-			 const allocator_type& __a)
-      : _Base(__uset, __a) { }
-
-      unordered_multiset(unordered_multiset&& __uset,
-			 const allocator_type& __a)
-      : _Safe(std::move(__uset._M_safe()), __a),
-	_Base(std::move(__uset._M_base()), __a) { }
-
-      unordered_multiset(initializer_list<value_type> __l,
-			 size_type __n = 0,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _Base(__l, __n, __hf, __eql, __a) { }
-
-      unordered_multiset(size_type __n, const allocator_type& __a)
-	: unordered_multiset(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multiset(size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-	: unordered_multiset(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_multiset(_InputIterator __first, _InputIterator __last,
-			   size_type __n,
-			   const allocator_type& __a)
-	  : unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_multiset(_InputIterator __first, _InputIterator __last,
-			   size_type __n, const hasher& __hf,
-			   const allocator_type& __a)
-	  : unordered_multiset(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_multiset(initializer_list<value_type> __l,
-			 size_type __n,
-			 const allocator_type& __a)
-	: unordered_multiset(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multiset(initializer_list<value_type> __l,
-			 size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-	: unordered_multiset(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      ~unordered_multiset() = default;
-
-      unordered_multiset&
-      operator=(const unordered_multiset&) = default;
-
-      unordered_multiset&
-      operator=(unordered_multiset&&) = default;
-
-      unordered_multiset&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_base() = __l;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      void
-      swap(unordered_multiset& __x)
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-      }
-
-      void
-      clear() noexcept
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      iterator
-      begin() noexcept
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() noexcept
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      // local versions
-      local_iterator
-      begin(size_type __b)
-      {
-	__glibcxx_check_bucket_index(__b);
-	return local_iterator(_Base::begin(__b), this);
-      }
-
-      local_iterator
-      end(size_type __b)
-      {
-	__glibcxx_check_bucket_index(__b);
-	return local_iterator(_Base::end(__b), this);
-      }
-
-      const_local_iterator
-      begin(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::begin(__b), this);
-      }
-
-      const_local_iterator
-      end(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::end(__b), this);
-      }
-
-      const_local_iterator
-      cbegin(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::cbegin(__b), this);
-      }
-
-      const_local_iterator
-      cend(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return const_local_iterator(_Base::cend(__b), this);
-      }
-
-      size_type
-      bucket_size(size_type __b) const
-      {
-	__glibcxx_check_bucket_index(__b);
-	return _Base::bucket_size(__b);
-      }
-
-      float
-      max_load_factor() const noexcept
-      { return _Base::max_load_factor(); }
-
-      void
-      max_load_factor(float __f)
-      {
-	__glibcxx_check_max_load_factor(__f);
-	_Base::max_load_factor(__f);
-      }
-
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{
-	  size_type __bucket_count = this->bucket_count();
-	  _Base_iterator __it
-	    = _Base::emplace(std::forward<_Args>(__args)...);
-	  _M_check_rehashed(__bucket_count);
-	  return iterator(__it, this);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __hint, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__hint);
-	  size_type __bucket_count = this->bucket_count();
-	  _Base_iterator __it = _Base::emplace_hint(__hint.base(),
-					std::forward<_Args>(__args)...);
-	  _M_check_rehashed(__bucket_count);
-	  return iterator(__it, this);
-	}
-
-      iterator
-      insert(const value_type& __obj)
-      {
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __it = _Base::insert(__obj);
-	_M_check_rehashed(__bucket_count);
-	return iterator(__it, this);
-      }
-
-      iterator
-      insert(const_iterator __hint, const value_type& __obj)
-      {
-	__glibcxx_check_insert(__hint);
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __it = _Base::insert(__hint.base(), __obj);
-	_M_check_rehashed(__bucket_count);
-	return iterator(__it, this);
-      }
-
-      iterator
-      insert(value_type&& __obj)
-      {
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __it = _Base::insert(std::move(__obj));
-	_M_check_rehashed(__bucket_count);
-	return iterator(__it, this);
-      }
-
-      iterator
-      insert(const_iterator __hint, value_type&& __obj)
-      {
-	__glibcxx_check_insert(__hint);
-	size_type __bucket_count = this->bucket_count();
-	_Base_iterator __it = _Base::insert(__hint.base(), std::move(__obj));
-	_M_check_rehashed(__bucket_count);
-	return iterator(__it, this);
-      }
-
-      void
-      insert(std::initializer_list<value_type> __l)
-      {
-	size_type __bucket_count = this->bucket_count();
-	_Base::insert(__l);
-	_M_check_rehashed(__bucket_count);
-      }
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  size_type __bucket_count = this->bucket_count();
-	  _Base::insert(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	  _M_check_rehashed(__bucket_count);
-	}
-
-      iterator
-      find(const key_type& __key)
-      { return iterator(_Base::find(__key), this); }
-
-      const_iterator
-      find(const key_type& __key) const
-      { return const_iterator(_Base::find(__key), this); }
-
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __key)
-      {
-	std::pair<_Base_iterator, _Base_iterator> __res
-	  = _Base::equal_range(__key);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const
-      {
-	std::pair<_Base_const_iterator, _Base_const_iterator>
-	  __res = _Base::equal_range(__key);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      size_type
-      erase(const key_type& __key)
-      {
-	size_type __ret(0);
-	std::pair<_Base_iterator, _Base_iterator> __pair =
-	  _Base::equal_range(__key);
-	for (_Base_iterator __victim = __pair.first; __victim != __pair.second;)
-	  {
-	    this->_M_invalidate_if([__victim](_Base_const_iterator __it)
-			    { return __it == __victim; });
-	    this->_M_invalidate_local_if(
-			    [__victim](_Base_const_local_iterator __it)
-			    { return __it._M_curr() == __victim._M_cur; });
-	    _Base::erase(__victim++);
-	    ++__ret;
-	  }
-	return __ret;
-      }
-
-      iterator
-      erase(const_iterator __it)
-      {
-	__glibcxx_check_erase(__it);
-	_Base_const_iterator __victim = __it.base();
-	this->_M_invalidate_if([__victim](_Base_const_iterator __it)
-			{ return __it == __victim; });
-	this->_M_invalidate_local_if(
-			[__victim](_Base_const_local_iterator __it)
-			{ return __it._M_curr() == __victim._M_cur; });
-	return iterator(_Base::erase(__it.base()), this);
-      }
-
-      iterator
-      erase(iterator __it)
-      { return erase(const_iterator(__it)); }
-
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	__glibcxx_check_erase_range(__first, __last);
-	for (_Base_const_iterator __tmp = __first.base();
-	     __tmp != __last.base(); ++__tmp)
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(__tmp != _Base::end(),
-				  _M_message(__gnu_debug::__msg_valid_range)
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    this->_M_invalidate_if([__tmp](_Base_const_iterator __it)
-			    { return __it == __tmp; });
-	    this->_M_invalidate_local_if(
-			    [__tmp](_Base_const_local_iterator __it)
-			    { return __it._M_curr() == __tmp._M_cur; });
-	  }
-	return iterator(_Base::erase(__first.base(),
-				     __last.base()), this);
-      }
-
-      _Base&
-      _M_base() noexcept	{ return *this; }
-
-      const _Base&
-      _M_base() const noexcept	{ return *this; }
-
-    private:
-      void
-      _M_check_rehashed(size_type __prev_count)
-      {
-	if (__prev_count != this->bucket_count())
-	  this->_M_invalidate_locals();
-      }
-    };
-
-  template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
-    inline void
-    swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-	 unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
-    inline bool
-    operator==(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    { return __x._M_base() == __y._M_base(); }
-
-  template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
-    inline bool
-    operator!=(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-} // namespace __debug
-} // namespace std
-
-#endif // C++11
-
-#endif
diff --git a/openflow/usr/include/c++/5/debug/vector b/openflow/usr/include/c++/5/debug/vector
deleted file mode 100644
index 085e5f7..0000000
--- a/openflow/usr/include/c++/5/debug/vector
+++ /dev/null
@@ -1,768 +0,0 @@
-// Debugging vector implementation -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file debug/vector
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_DEBUG_VECTOR
-#define _GLIBCXX_DEBUG_VECTOR 1
-
-#include <vector>
-#include <utility>
-#include <debug/safe_sequence.h>
-#include <debug/safe_container.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug
-{
-  /** @brief Base class for Debug Mode vector.
-   *
-   * Adds information about the guaranteed capacity, which is useful for
-   * detecting code which relies on non-portable implementation details of
-   * the libstdc++ reallocation policy.
-   */
-  template<typename _SafeSequence,
-	   typename _BaseSequence>
-    class _Safe_vector
-    {
-      typedef typename _BaseSequence::size_type size_type;
-
-      const _SafeSequence&
-      _M_seq() const { return *static_cast<const _SafeSequence*>(this); }
-
-    protected:
-      _Safe_vector() _GLIBCXX_NOEXCEPT
-	: _M_guaranteed_capacity(0)
-      { _M_update_guaranteed_capacity(); }
-
-      _Safe_vector(const _Safe_vector&) _GLIBCXX_NOEXCEPT
-	: _M_guaranteed_capacity(0)
-      { _M_update_guaranteed_capacity(); }
-
-      _Safe_vector(size_type __n) _GLIBCXX_NOEXCEPT
-	: _M_guaranteed_capacity(__n)
-      { }
-
-#if __cplusplus >= 201103L
-      _Safe_vector(_Safe_vector&& __x) noexcept
-	: _Safe_vector()
-      { __x._M_guaranteed_capacity = 0; }
-
-      _Safe_vector&
-      operator=(const _Safe_vector&) noexcept
-      {
-	_M_update_guaranteed_capacity();
-	return *this;
-      }
-
-      _Safe_vector&
-      operator=(_Safe_vector&& __x) noexcept
-      {
-	_M_update_guaranteed_capacity();
-	__x._M_guaranteed_capacity = 0;
-	return *this;
-      }
-#endif
-
-      size_type _M_guaranteed_capacity;
-
-      bool
-      _M_requires_reallocation(size_type __elements) const _GLIBCXX_NOEXCEPT
-      { return __elements > _M_seq().capacity(); }
-
-      void
-      _M_update_guaranteed_capacity() _GLIBCXX_NOEXCEPT
-      {
-	if (_M_seq().size() > _M_guaranteed_capacity)
-	  _M_guaranteed_capacity = _M_seq().size();
-      }
-    };
-}
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __debug
-{
-  /// Class std::vector with safety/checking/debug instrumentation.
-  template<typename _Tp,
-	   typename _Allocator = std::allocator<_Tp> >
-    class vector
-    : public __gnu_debug::_Safe_container<
-	vector<_Tp, _Allocator>, _Allocator, __gnu_debug::_Safe_sequence>,
-      public _GLIBCXX_STD_C::vector<_Tp, _Allocator>,
-      public __gnu_debug::_Safe_vector<
-	vector<_Tp, _Allocator>,
-	_GLIBCXX_STD_C::vector<_Tp, _Allocator> >
-    {
-      typedef _GLIBCXX_STD_C::vector<_Tp, _Allocator>		_Base;
-      typedef __gnu_debug::_Safe_container<
-	vector, _Allocator, __gnu_debug::_Safe_sequence>	_Safe;
-      typedef __gnu_debug::_Safe_vector<vector, _Base>		_Safe_vector;
-
-      typedef typename _Base::iterator		_Base_iterator;
-      typedef typename _Base::const_iterator	_Base_const_iterator;
-      typedef __gnu_debug::_Equal_to<_Base_const_iterator> _Equal;
-
-    public:
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_iterator, vector>				iterator;
-      typedef __gnu_debug::_Safe_iterator<
-	_Base_const_iterator, vector>			const_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-
-      typedef _Tp					value_type;
-      typedef _Allocator				allocator_type;
-      typedef typename _Base::pointer			pointer;
-      typedef typename _Base::const_pointer		const_pointer;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      // 23.2.4.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      vector() _GLIBCXX_NOEXCEPT
-      : _Base() { }
-#else
-      vector() = default;
-#endif
-
-      explicit
-      vector(const _Allocator& __a) _GLIBCXX_NOEXCEPT
-      : _Base(__a) { }
-
-#if __cplusplus >= 201103L
-      explicit
-      vector(size_type __n, const _Allocator& __a = _Allocator())
-      : _Base(__n, __a), _Safe_vector(__n) { }
-
-      vector(size_type __n, const _Tp& __value,
-	     const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#else
-      explicit
-      vector(size_type __n, const _Tp& __value = _Tp(),
-	     const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#endif
-
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-	vector(_InputIterator __first, _InputIterator __last,
-	       const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
-								     __last)),
-		__gnu_debug::__base(__last), __a) { }
-
-#if __cplusplus < 201103L
-      vector(const vector& __x)
-      : _Base(__x) { }
-
-      ~vector() _GLIBCXX_NOEXCEPT { }
-#else
-      vector(const vector&) = default;
-      vector(vector&&) = default;
-
-      vector(const vector& __x, const allocator_type& __a)
-      : _Base(__x, __a) { }
-
-      vector(vector&& __x, const allocator_type& __a)
-      : _Safe(std::move(__x._M_safe()), __a),
-	_Base(std::move(__x._M_base()), __a),
-	_Safe_vector(std::move(__x)) { }
-
-      vector(initializer_list<value_type> __l,
-	     const allocator_type& __a = allocator_type())
-      : _Base(__l, __a) { }
-
-      ~vector() = default;
-#endif
-
-      /// Construction from a normal-mode vector
-      vector(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      vector&
-      operator=(const vector& __x)
-      {
-	this->_M_safe() = __x;
-	_M_base() = __x;
-	this->_M_update_guaranteed_capacity();
-	return *this;
-      }
-#else
-      vector&
-      operator=(const vector&) = default;
-
-      vector&
-      operator=(vector&&) = default;
-
-      vector&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_base() = __l;
-	this->_M_invalidate_all();
-	this->_M_update_guaranteed_capacity();
-	return *this;
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<typename _InputIterator>
-#endif
-	void
-	assign(_InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::assign(__gnu_debug::__base(__first),
-			__gnu_debug::__base(__last));
-	  this->_M_invalidate_all();
-	  this->_M_update_guaranteed_capacity();
-	}
-
-      void
-      assign(size_type __n, const _Tp& __u)
-      {
-	_Base::assign(__n, __u);
-	this->_M_invalidate_all();
-	this->_M_update_guaranteed_capacity();
-      }
-
-#if __cplusplus >= 201103L
-      void
-      assign(initializer_list<value_type> __l)
-      {
-	_Base::assign(__l);
-	this->_M_invalidate_all();
-	this->_M_update_guaranteed_capacity();
-      }
-#endif
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-      // 23.2.4.2 capacity:
-      using _Base::size;
-      using _Base::max_size;
-
-#if __cplusplus >= 201103L
-      void
-      resize(size_type __sz)
-      {
-	bool __realloc = this->_M_requires_reallocation(__sz);
-	if (__sz < this->size())
-	  this->_M_invalidate_after_nth(__sz);
-	_Base::resize(__sz);
-	if (__realloc)
-	  this->_M_invalidate_all();
-	this->_M_update_guaranteed_capacity();
-      }
-
-      void
-      resize(size_type __sz, const _Tp& __c)
-      {
-	bool __realloc = this->_M_requires_reallocation(__sz);
-	if (__sz < this->size())
-	  this->_M_invalidate_after_nth(__sz);
-	_Base::resize(__sz, __c);
-	if (__realloc)
-	  this->_M_invalidate_all();
-	this->_M_update_guaranteed_capacity();
-      }
-#else
-      void
-      resize(size_type __sz, _Tp __c = _Tp())
-      {
-	bool __realloc = this->_M_requires_reallocation(__sz);
-	if (__sz < this->size())
-	  this->_M_invalidate_after_nth(__sz);
-	_Base::resize(__sz, __c);
-	if (__realloc)
-	  this->_M_invalidate_all();
-	this->_M_update_guaranteed_capacity();
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      void
-      shrink_to_fit()
-      {
-	if (_Base::_M_shrink_to_fit())
-	  {
-	    this->_M_guaranteed_capacity = _Base::capacity();
-	    this->_M_invalidate_all();
-	  }
-      }
-#endif
-
-      size_type
-      capacity() const _GLIBCXX_NOEXCEPT
-      {
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-	return this->_M_guaranteed_capacity;
-#else
-	return _Base::capacity();
-#endif
-      }
-
-      using _Base::empty;
-
-      void
-      reserve(size_type __n)
-      {
-	bool __realloc = this->_M_requires_reallocation(__n);
-	_Base::reserve(__n);
-	if (__n > this->_M_guaranteed_capacity)
-	  this->_M_guaranteed_capacity = __n;
-	if (__realloc)
-	  this->_M_invalidate_all();
-      }
-
-      // element access:
-      reference
-      operator[](size_type __n) _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_subscript(__n);
-	return _M_base()[__n];
-      }
-
-      const_reference
-      operator[](size_type __n) const _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_subscript(__n);
-	return _M_base()[__n];
-      }
-
-      using _Base::at;
-
-      reference
-      front() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      const_reference
-      front() const _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      reference
-      back() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      const_reference
-      back() const _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 464. Suggestion for new member functions in standard containers.
-      using _Base::data;
-
-      // 23.2.4.3 modifiers:
-      void
-      push_back(const _Tp& __x)
-      {
-	bool __realloc = this->_M_requires_reallocation(this->size() + 1);
-	_Base::push_back(__x);
-	if (__realloc)
-	  this->_M_invalidate_all();
-	this->_M_update_guaranteed_capacity();
-      }
-
-#if __cplusplus >= 201103L
-      template<typename _Up = _Tp>
-	typename __gnu_cxx::__enable_if<!std::__are_same<_Up, bool>::__value,
-					void>::__type
-	push_back(_Tp&& __x)
-	{ emplace_back(std::move(__x)); }
-
-      template<typename... _Args>
-	void
-	emplace_back(_Args&&... __args)
-	{
-	  bool __realloc = this->_M_requires_reallocation(this->size() + 1);
-	  _Base::emplace_back(std::forward<_Args>(__args)...);
-	  if (__realloc)
-	    this->_M_invalidate_all();
-	  this->_M_update_guaranteed_capacity();
-	}
-#endif
-
-      void
-      pop_back() _GLIBCXX_NOEXCEPT
-      {
-	__glibcxx_check_nonempty();
-	this->_M_invalidate_if(_Equal(--_Base::end()));
-	_Base::pop_back();
-      }
-
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	iterator
-	emplace(const_iterator __position, _Args&&... __args)
-	{
-	  __glibcxx_check_insert(__position);
-	  bool __realloc = this->_M_requires_reallocation(this->size() + 1);
-	  difference_type __offset = __position.base() - _Base::begin();
-	  _Base_iterator __res = _Base::emplace(__position.base(),
-						std::forward<_Args>(__args)...);
-	  if (__realloc)
-	    this->_M_invalidate_all();
-	  else
-	    this->_M_invalidate_after_nth(__offset);
-	  this->_M_update_guaranteed_capacity();
-	  return iterator(__res, this);
-	}
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __position, const _Tp& __x)
-#else
-      insert(iterator __position, const _Tp& __x)
-#endif
-      {
-	__glibcxx_check_insert(__position);
-	bool __realloc = this->_M_requires_reallocation(this->size() + 1);
-	difference_type __offset = __position.base() - _Base::begin();
-	_Base_iterator __res = _Base::insert(__position.base(), __x);
-	if (__realloc)
-	  this->_M_invalidate_all();
-	else
-	  this->_M_invalidate_after_nth(__offset);
-	this->_M_update_guaranteed_capacity();
-	return iterator(__res, this);
-      }
-
-#if __cplusplus >= 201103L
-      template<typename _Up = _Tp>
-	typename __gnu_cxx::__enable_if<!std::__are_same<_Up, bool>::__value,
-					iterator>::__type
-	insert(const_iterator __position, _Tp&& __x)
-	{ return emplace(__position, std::move(__x)); }
-
-      iterator
-      insert(const_iterator __position, initializer_list<value_type> __l)
-      { return this->insert(__position, __l.begin(), __l.end()); }
-#endif
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __position, size_type __n, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	bool __realloc = this->_M_requires_reallocation(this->size() + __n);
-	difference_type __offset = __position.base() - _Base::cbegin();
-	_Base_iterator __res = _Base::insert(__position.base(), __n, __x);
-	if (__realloc)
-	  this->_M_invalidate_all();
-	else
-	  this->_M_invalidate_after_nth(__offset);
-	this->_M_update_guaranteed_capacity();
-	return iterator(__res, this);
-      }
-#else
-      void
-      insert(iterator __position, size_type __n, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	bool __realloc = this->_M_requires_reallocation(this->size() + __n);
-	difference_type __offset = __position.base() - _Base::begin();
-	_Base::insert(__position.base(), __n, __x);
-	if (__realloc)
-	  this->_M_invalidate_all();
-	else
-	  this->_M_invalidate_after_nth(__offset);
-	this->_M_update_guaranteed_capacity();
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	iterator
-	insert(const_iterator __position,
-	       _InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_insert_range(__position, __first, __last);
-
-	  /* Hard to guess if invalidation will occur, because __last
-	     - __first can't be calculated in all cases, so we just
-	     punt here by checking if it did occur. */
-	  _Base_iterator __old_begin = _M_base().begin();
-	  difference_type __offset = __position.base() - _Base::cbegin();
-	  _Base_iterator __res = _Base::insert(__position.base(),
-					       __gnu_debug::__base(__first),
-					       __gnu_debug::__base(__last));
-
-	  if (_M_base().begin() != __old_begin)
-	    this->_M_invalidate_all();
-	  else
-	    this->_M_invalidate_after_nth(__offset);
-	  this->_M_update_guaranteed_capacity();
-	  return iterator(__res, this);
-	}
-#else
-      template<class _InputIterator>
-	void
-	insert(iterator __position,
-	       _InputIterator __first, _InputIterator __last)
-	{
-	  __glibcxx_check_insert_range(__position, __first, __last);
-
-	  /* Hard to guess if invalidation will occur, because __last
-	     - __first can't be calculated in all cases, so we just
-	     punt here by checking if it did occur. */
-	  _Base_iterator __old_begin = _M_base().begin();
-	  difference_type __offset = __position.base() - _Base::begin();
-	  _Base::insert(__position.base(), __gnu_debug::__base(__first),
-					   __gnu_debug::__base(__last));
-
-	  if (_M_base().begin() != __old_begin)
-	    this->_M_invalidate_all();
-	  else
-	    this->_M_invalidate_after_nth(__offset);
-	  this->_M_update_guaranteed_capacity();
-	}
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __position)
-#else
-      erase(iterator __position)
-#endif
-      {
-	__glibcxx_check_erase(__position);
-	difference_type __offset = __position.base() - _Base::begin();
-	_Base_iterator __res = _Base::erase(__position.base());
-	this->_M_invalidate_after_nth(__offset);
-	return iterator(__res, this);
-      }
-
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __first, const_iterator __last)
-#else
-      erase(iterator __first, iterator __last)
-#endif
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-
-	if (__first.base() != __last.base())
-	  {
-	    difference_type __offset = __first.base() - _Base::begin();
-	    _Base_iterator __res = _Base::erase(__first.base(),
-						__last.base());
-	    this->_M_invalidate_after_nth(__offset);
-	    return iterator(__res, this);
-	  }
-	else
-#if __cplusplus >= 201103L
-	  return begin() + (__first.base() - cbegin().base());
-#else
-	  return __first;
-#endif
-      }
-
-      void
-      swap(vector& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Safe::_M_swap(__x);
-	_Base::swap(__x);
-	std::swap(this->_M_guaranteed_capacity, __x._M_guaranteed_capacity);
-      }
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT { return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT { return *this; }
-
-    private:
-      void
-      _M_invalidate_after_nth(difference_type __n) _GLIBCXX_NOEXCEPT
-      {
-	typedef __gnu_debug::_After_nth_from<_Base_const_iterator> _After_nth;
-	this->_M_invalidate_if(_After_nth(__n, _Base::begin()));
-      }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const vector<_Tp, _Alloc>& __lhs,
-	      const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const vector<_Tp, _Alloc>& __lhs,
-	      const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(vector<_Tp, _Alloc>& __lhs, vector<_Tp, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-
-} // namespace __debug
-
-#if __cplusplus >= 201103L
-  // DR 1182.
-  /// std::hash specialization for vector<bool>.
-  template<typename _Alloc>
-    struct hash<__debug::vector<bool, _Alloc>>
-    : public __hash_base<size_t, __debug::vector<bool, _Alloc>>
-    {
-      size_t
-      operator()(const __debug::vector<bool, _Alloc>& __b) const noexcept
-      { return std::hash<_GLIBCXX_STD_C::vector<bool, _Alloc>>()
-	  (__b._M_base()); }
-    };
-#endif
-
-} // namespace std
-
-namespace __gnu_debug
-{
-  template<typename _Tp, typename _Alloc>
-    struct _Is_contiguous_sequence<std::__debug::vector<_Tp, _Alloc> >
-    : std::__true_type
-    { };
-
-  template<typename _Alloc>
-    struct _Is_contiguous_sequence<std::__debug::vector<bool, _Alloc> >
-    : std::__false_type
-    { };
-}
-
-#endif
diff --git a/openflow/usr/include/c++/5/decimal/decimal b/openflow/usr/include/c++/5/decimal/decimal
deleted file mode 100644
index 31b6c3d..0000000
--- a/openflow/usr/include/c++/5/decimal/decimal
+++ /dev/null
@@ -1,494 +0,0 @@
-// <decimal> -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file decimal/decimal
- *  This is a Standard C++ Library header.
- */
-
-// ISO/IEC TR 24733 
-// Written by Janis Johnson <janis187@us.ibm.com>
-
-#ifndef _GLIBCXX_DECIMAL
-#define _GLIBCXX_DECIMAL 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-#ifndef _GLIBCXX_USE_DECIMAL_FLOAT
-#error This file requires compiler and library support for ISO/IEC TR 24733 \
-that is currently not available.
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-  /**
-    * @defgroup decimal Decimal Floating-Point Arithmetic
-    * @ingroup numerics
-    *
-    * Classes and functions for decimal floating-point arithmetic.
-    * @{
-    */
-
-  /** @namespace std::decimal
-    * @brief ISO/IEC TR 24733 Decimal floating-point arithmetic.
-    */
-namespace decimal
-{
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  class decimal32;
-  class decimal64;
-  class decimal128;
-
-  // 3.2.5  Initialization from coefficient and exponent.
-  static decimal32 make_decimal32(long long __coeff, int __exp);
-  static decimal32 make_decimal32(unsigned long long __coeff, int __exp);
-  static decimal64 make_decimal64(long long __coeff, int __exp);
-  static decimal64 make_decimal64(unsigned long long __coeff, int __exp);
-  static decimal128 make_decimal128(long long __coeff, int __exp);
-  static decimal128 make_decimal128(unsigned long long __coeff, int __exp);
-
-  /// Non-conforming extension: Conversion to integral type.
-  long long decimal32_to_long_long(decimal32 __d);
-  long long decimal64_to_long_long(decimal64 __d);
-  long long decimal128_to_long_long(decimal128 __d);
-  long long decimal_to_long_long(decimal32 __d);
-  long long decimal_to_long_long(decimal64 __d);
-  long long decimal_to_long_long(decimal128 __d);
-
-  // 3.2.6  Conversion to generic floating-point type.
-  float decimal32_to_float(decimal32 __d);
-  float decimal64_to_float(decimal64 __d);
-  float decimal128_to_float(decimal128 __d);
-  float decimal_to_float(decimal32 __d);
-  float decimal_to_float(decimal64 __d);
-  float decimal_to_float(decimal128 __d);
-
-  double decimal32_to_double(decimal32 __d);
-  double decimal64_to_double(decimal64 __d);
-  double decimal128_to_double(decimal128 __d);
-  double decimal_to_double(decimal32 __d);
-  double decimal_to_double(decimal64 __d);
-  double decimal_to_double(decimal128 __d);
-
-  long double decimal32_to_long_double(decimal32 __d);
-  long double decimal64_to_long_double(decimal64 __d);
-  long double decimal128_to_long_double(decimal128 __d);
-  long double decimal_to_long_double(decimal32 __d);
-  long double decimal_to_long_double(decimal64 __d);
-  long double decimal_to_long_double(decimal128 __d);
-
-  // 3.2.7  Unary arithmetic operators.
-  decimal32  operator+(decimal32 __rhs);
-  decimal64  operator+(decimal64 __rhs);
-  decimal128 operator+(decimal128 __rhs);
-  decimal32  operator-(decimal32 __rhs);
-  decimal64  operator-(decimal64 __rhs);
-  decimal128 operator-(decimal128 __rhs);
-
-  // 3.2.8  Binary arithmetic operators.
-#define _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(_Op, _T1, _T2, _T3)	\
-  _T1 operator _Op(_T2 __lhs, _T3 __rhs);
-#define _DECLARE_DECIMAL_BINARY_OP_WITH_INT(_Op, _Tp)		\
-  _Tp operator _Op(_Tp __lhs, int __rhs);			\
-  _Tp operator _Op(_Tp __lhs, unsigned int __rhs);		\
-  _Tp operator _Op(_Tp __lhs, long __rhs);			\
-  _Tp operator _Op(_Tp __lhs, unsigned long __rhs);		\
-  _Tp operator _Op(_Tp __lhs, long long __rhs);			\
-  _Tp operator _Op(_Tp __lhs, unsigned long long __rhs);	\
-  _Tp operator _Op(int __lhs, _Tp __rhs);			\
-  _Tp operator _Op(unsigned int __lhs, _Tp __rhs);		\
-  _Tp operator _Op(long __lhs, _Tp __rhs);			\
-  _Tp operator _Op(unsigned long __lhs, _Tp __rhs);		\
-  _Tp operator _Op(long long __lhs, _Tp __rhs);			\
-  _Tp operator _Op(unsigned long long __lhs, _Tp __rhs);
-
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal32, decimal32, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(+, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal64, decimal32, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal64, decimal64, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal64, decimal64, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(+, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal128, decimal32, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal128, decimal64, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal128, decimal128, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal128, decimal128, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal128, decimal128, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(+, decimal128)
-
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal32, decimal32, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(-, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal64, decimal32, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal64, decimal64, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal64, decimal64, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(-, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal128, decimal32, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal128, decimal64, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal128, decimal128, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal128, decimal128, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal128, decimal128, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(-, decimal128)
-
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal32, decimal32, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(*, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal64, decimal32, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal64, decimal64, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal64, decimal64, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(*, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal128, decimal32, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal128, decimal64, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal128, decimal128, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal128, decimal128, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal128, decimal128, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(*, decimal128)
-
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal32, decimal32, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(/, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal64, decimal32, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal64, decimal64, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal64, decimal64, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(/, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal128, decimal32, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal128, decimal64, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal128, decimal128, decimal32)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal128, decimal128, decimal64)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal128, decimal128, decimal128)
-  _DECLARE_DECIMAL_BINARY_OP_WITH_INT(/, decimal128)
-
-#undef _DECLARE_DECIMAL_BINARY_OP_WITH_DEC
-#undef _DECLARE_DECIMAL_BINARY_OP_WITH_INT
-
-  // 3.2.9  Comparison operators.
-#define _DECLARE_DECIMAL_COMPARISON(_Op, _Tp)				\
-  bool operator _Op(_Tp __lhs, decimal32 __rhs);			\
-  bool operator _Op(_Tp __lhs, decimal64 __rhs);			\
-  bool operator _Op(_Tp __lhs, decimal128 __rhs);			\
-  bool operator _Op(_Tp __lhs, int __rhs);				\
-  bool operator _Op(_Tp __lhs, unsigned int __rhs);			\
-  bool operator _Op(_Tp __lhs, long __rhs);				\
-  bool operator _Op(_Tp __lhs, unsigned long __rhs);			\
-  bool operator _Op(_Tp __lhs, long long __rhs);			\
-  bool operator _Op(_Tp __lhs, unsigned long long __rhs);		\
-  bool operator _Op(int __lhs, _Tp __rhs);				\
-  bool operator _Op(unsigned int __lhs, _Tp __rhs);			\
-  bool operator _Op(long __lhs, _Tp __rhs);				\
-  bool operator _Op(unsigned long __lhs, _Tp __rhs);			\
-  bool operator _Op(long long __lhs, _Tp __rhs);			\
-  bool operator _Op(unsigned long long __lhs, _Tp __rhs);
-
-  _DECLARE_DECIMAL_COMPARISON(==, decimal32)
-  _DECLARE_DECIMAL_COMPARISON(==, decimal64)
-  _DECLARE_DECIMAL_COMPARISON(==, decimal128)
-
-  _DECLARE_DECIMAL_COMPARISON(!=, decimal32)
-  _DECLARE_DECIMAL_COMPARISON(!=, decimal64)
-  _DECLARE_DECIMAL_COMPARISON(!=, decimal128)
-
-  _DECLARE_DECIMAL_COMPARISON(<, decimal32)
-  _DECLARE_DECIMAL_COMPARISON(<, decimal64)
-  _DECLARE_DECIMAL_COMPARISON(<, decimal128)
-
-  _DECLARE_DECIMAL_COMPARISON(>=, decimal32)
-  _DECLARE_DECIMAL_COMPARISON(>=, decimal64)
-  _DECLARE_DECIMAL_COMPARISON(>=, decimal128)
-
-  _DECLARE_DECIMAL_COMPARISON(>, decimal32)
-  _DECLARE_DECIMAL_COMPARISON(>, decimal64)
-  _DECLARE_DECIMAL_COMPARISON(>, decimal128)
-
-  _DECLARE_DECIMAL_COMPARISON(>=, decimal32)
-  _DECLARE_DECIMAL_COMPARISON(>=, decimal64)
-  _DECLARE_DECIMAL_COMPARISON(>=, decimal128)
-
-#undef _DECLARE_DECIMAL_COMPARISON
-
-  /// 3.2.2  Class decimal32.
-  class decimal32
-  {
-  public:
-    typedef float __decfloat32 __attribute__((mode(SD)));
-
-    // 3.2.2.2  Construct/copy/destroy.
-    decimal32()					: __val(0.e-101DF) {}
-
-    // 3.2.2.3  Conversion from floating-point type.
-    explicit decimal32(decimal64 __d64);
-    explicit decimal32(decimal128 __d128);
-    explicit decimal32(float __r)		: __val(__r) {}
-    explicit decimal32(double __r)		: __val(__r) {}
-    explicit decimal32(long double __r)		: __val(__r) {}
-
-    // 3.2.2.4  Conversion from integral type.
-    decimal32(int __z)				: __val(__z) {}
-    decimal32(unsigned int __z)			: __val(__z) {}
-    decimal32(long __z)				: __val(__z) {}
-    decimal32(unsigned long __z)		: __val(__z) {}
-    decimal32(long long __z)			: __val(__z) {}
-    decimal32(unsigned long long __z)		: __val(__z) {}
-
-    /// Conforming extension: Conversion from scalar decimal type.
-    decimal32(__decfloat32 __z)			: __val(__z) {}
-
-#if __cplusplus >= 201103L
-    // 3.2.2.5  Conversion to integral type.
-    // Note: explicit per n3407.
-    explicit operator long long() const { return (long long)__val; }
-#endif
-
-    // 3.2.2.6  Increment and decrement operators.
-    decimal32& operator++()
-    {
-      __val += 1;
-      return *this;
-    }
-
-    decimal32 operator++(int)
-    {
-      decimal32 __tmp = *this;
-      __val += 1;
-      return __tmp;
-    }
-
-    decimal32& operator--()
-    {
-      __val -= 1;
-      return *this;
-    }
-
-    decimal32   operator--(int)
-    {
-      decimal32 __tmp = *this;
-      __val -= 1;
-      return __tmp;
-    }
-
-    // 3.2.2.7  Compound assignment.
-#define _DECLARE_DECIMAL32_COMPOUND_ASSIGNMENT(_Op)	\
-    decimal32& operator _Op(decimal32 __rhs);		\
-    decimal32& operator _Op(decimal64 __rhs);		\
-    decimal32& operator _Op(decimal128 __rhs);		\
-    decimal32& operator _Op(int __rhs);			\
-    decimal32& operator _Op(unsigned int __rhs);	\
-    decimal32& operator _Op(long __rhs);		\
-    decimal32& operator _Op(unsigned long __rhs);	\
-    decimal32& operator _Op(long long __rhs);		\
-    decimal32& operator _Op(unsigned long long __rhs);
-
-    _DECLARE_DECIMAL32_COMPOUND_ASSIGNMENT(+=)
-    _DECLARE_DECIMAL32_COMPOUND_ASSIGNMENT(-=)
-    _DECLARE_DECIMAL32_COMPOUND_ASSIGNMENT(*=)
-    _DECLARE_DECIMAL32_COMPOUND_ASSIGNMENT(/=)
-#undef _DECLARE_DECIMAL32_COMPOUND_ASSIGNMENT
-
-  private:
-    __decfloat32 __val;
-
-  public:
-    __decfloat32 __getval(void) { return __val; }
-    void __setval(__decfloat32 __x) { __val = __x; }
-  };
-
-  /// 3.2.3  Class decimal64.
-  class decimal64
-  {
-  public:
-    typedef float __decfloat64 __attribute__((mode(DD)));
-
-    // 3.2.3.2  Construct/copy/destroy.
-    decimal64()					: __val(0.e-398dd) {}
-
-    // 3.2.3.3  Conversion from floating-point type.
-	     decimal64(decimal32 d32);
-    explicit decimal64(decimal128 d128);
-    explicit decimal64(float __r)		: __val(__r) {}
-    explicit decimal64(double __r)		: __val(__r) {}
-    explicit decimal64(long double __r)		: __val(__r) {}
-
-    // 3.2.3.4  Conversion from integral type.
-    decimal64(int __z)				: __val(__z) {}
-    decimal64(unsigned int __z)			: __val(__z) {}
-    decimal64(long __z)				: __val(__z) {}
-    decimal64(unsigned long __z)		: __val(__z) {}
-    decimal64(long long __z)			: __val(__z) {}
-    decimal64(unsigned long long __z)		: __val(__z) {}
-
-    /// Conforming extension: Conversion from scalar decimal type.
-    decimal64(__decfloat64 __z)			: __val(__z) {}
-
-#if __cplusplus >= 201103L
-    // 3.2.3.5  Conversion to integral type.
-    // Note: explicit per n3407.
-    explicit operator long long() const { return (long long)__val; }
-#endif
-
-    // 3.2.3.6  Increment and decrement operators.
-    decimal64& operator++()
-    {
-      __val += 1;
-      return *this;
-    }
-
-    decimal64 operator++(int)
-    {
-      decimal64 __tmp = *this;
-      __val += 1;
-      return __tmp;
-    }
-
-    decimal64& operator--()
-    {
-      __val -= 1;
-      return *this;
-    }
-
-    decimal64 operator--(int)
-    {
-      decimal64 __tmp = *this;
-      __val -= 1;
-      return __tmp;
-    }
-
-    // 3.2.3.7  Compound assignment.
-#define _DECLARE_DECIMAL64_COMPOUND_ASSIGNMENT(_Op)	\
-    decimal64& operator _Op(decimal32 __rhs);		\
-    decimal64& operator _Op(decimal64 __rhs);		\
-    decimal64& operator _Op(decimal128 __rhs);		\
-    decimal64& operator _Op(int __rhs);			\
-    decimal64& operator _Op(unsigned int __rhs);	\
-    decimal64& operator _Op(long __rhs);		\
-    decimal64& operator _Op(unsigned long __rhs);	\
-    decimal64& operator _Op(long long __rhs);		\
-    decimal64& operator _Op(unsigned long long __rhs);
-
-    _DECLARE_DECIMAL64_COMPOUND_ASSIGNMENT(+=)
-    _DECLARE_DECIMAL64_COMPOUND_ASSIGNMENT(-=)
-    _DECLARE_DECIMAL64_COMPOUND_ASSIGNMENT(*=)
-    _DECLARE_DECIMAL64_COMPOUND_ASSIGNMENT(/=)
-#undef _DECLARE_DECIMAL64_COMPOUND_ASSIGNMENT
-
-  private:
-    __decfloat64 __val;
-
-  public:
-    __decfloat64 __getval(void) { return __val; }
-    void __setval(__decfloat64 __x) { __val = __x; }
-  };
-
-  /// 3.2.4  Class decimal128.
-  class decimal128
-  {
-  public:
-    typedef float __decfloat128 __attribute__((mode(TD)));
-
-    // 3.2.4.2  Construct/copy/destroy.
-    decimal128()				: __val(0.e-6176DL) {}
-
-    // 3.2.4.3  Conversion from floating-point type.
-	     decimal128(decimal32 d32);
-	     decimal128(decimal64 d64);
-    explicit decimal128(float __r)		: __val(__r) {}
-    explicit decimal128(double __r)		: __val(__r) {}
-    explicit decimal128(long double __r)	: __val(__r) {}
-
-
-    // 3.2.4.4  Conversion from integral type.
-    decimal128(int __z)				: __val(__z) {}
-    decimal128(unsigned int __z)		: __val(__z) {}
-    decimal128(long __z)			: __val(__z) {}
-    decimal128(unsigned long __z)		: __val(__z) {}
-    decimal128(long long __z)			: __val(__z) {}
-    decimal128(unsigned long long __z)		: __val(__z) {}
-
-    /// Conforming extension: Conversion from scalar decimal type.
-    decimal128(__decfloat128 __z)		: __val(__z) {}
-
-#if __cplusplus >= 201103L
-    // 3.2.4.5  Conversion to integral type.
-    // Note: explicit per n3407.
-    explicit operator long long() const { return (long long)__val; }
-#endif
-
-    // 3.2.4.6  Increment and decrement operators.
-    decimal128& operator++()
-    {
-      __val += 1;
-      return *this;
-    }
-
-    decimal128 operator++(int)
-    {
-      decimal128 __tmp = *this;
-      __val += 1;
-      return __tmp;
-    }
-
-    decimal128& operator--()
-    {
-      __val -= 1;
-      return *this;
-    }
-
-    decimal128   operator--(int)
-    {
-      decimal128 __tmp = *this;
-      __val -= 1;
-      return __tmp;
-    }
-
-    // 3.2.4.7  Compound assignment.
-#define _DECLARE_DECIMAL128_COMPOUND_ASSIGNMENT(_Op)	\
-    decimal128& operator _Op(decimal32 __rhs);		\
-    decimal128& operator _Op(decimal64 __rhs);		\
-    decimal128& operator _Op(decimal128 __rhs);		\
-    decimal128& operator _Op(int __rhs);		\
-    decimal128& operator _Op(unsigned int __rhs);	\
-    decimal128& operator _Op(long __rhs);		\
-    decimal128& operator _Op(unsigned long __rhs);	\
-    decimal128& operator _Op(long long __rhs);		\
-    decimal128& operator _Op(unsigned long long __rhs);
-
-    _DECLARE_DECIMAL128_COMPOUND_ASSIGNMENT(+=)
-    _DECLARE_DECIMAL128_COMPOUND_ASSIGNMENT(-=)
-    _DECLARE_DECIMAL128_COMPOUND_ASSIGNMENT(*=)
-    _DECLARE_DECIMAL128_COMPOUND_ASSIGNMENT(/=)
-#undef _DECLARE_DECIMAL128_COMPOUND_ASSIGNMENT
-
-  private:
-    __decfloat128 __val;
-
-  public:
-    __decfloat128 __getval(void) { return __val; }
-    void __setval(__decfloat128 __x) { __val = __x; }
-  };
-
-#define _GLIBCXX_USE_DECIMAL_ 1
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-} // namespace decimal
-  // @} group decimal
-} // namespace std
-
-#include <decimal/decimal.h>
-
-#endif /* _GLIBCXX_DECIMAL */
diff --git a/openflow/usr/include/c++/5/decimal/decimal.h b/openflow/usr/include/c++/5/decimal/decimal.h
deleted file mode 100644
index da2c01e..0000000
--- a/openflow/usr/include/c++/5/decimal/decimal.h
+++ /dev/null
@@ -1,468 +0,0 @@
-// decimal classes -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file decimal/decimal.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{decimal}
- */
-
-// ISO/IEC TR 24733
-// Written by Janis Johnson <janis187@us.ibm.com>
-
-#ifndef _GLIBCXX_DECIMAL_IMPL
-#define _GLIBCXX_DECIMAL_IMPL 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace decimal
-{
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // ISO/IEC TR 24733  3.2.[234].1  Construct/copy/destroy.
-
-  inline decimal32::decimal32(decimal64 __r)	: __val(__r.__getval()) {}
-  inline decimal32::decimal32(decimal128 __r)	: __val(__r.__getval()) {}
-  inline decimal64::decimal64(decimal32 __r)	: __val(__r.__getval()) {}
-  inline decimal64::decimal64(decimal128 __r)	: __val(__r.__getval()) {}
-  inline decimal128::decimal128(decimal32 __r)	: __val(__r.__getval()) {}
-  inline decimal128::decimal128(decimal64 __r)	: __val(__r.__getval()) {}
-
-  // ISO/IEC TR 24733  3.2.[234].6  Compound assignment.
-
-#define _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_DEC(_Op1, _Op2, _T1, _T2)	 \
-  inline _T1& _T1::operator _Op1(_T2 __rhs)				 \
-  {									 \
-    __setval(__getval() _Op2 __rhs.__getval());				 \
-    return *this;							 \
-  }
-
-#define _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_INT(_Op1, _Op2, _T1, _T2)	 \
-  inline _T1& _T1::operator _Op1(_T2 __rhs)				 \
-  {									 \
-    __setval(__getval() _Op2 __rhs);					 \
-    return *this;							 \
-  }
-
-#define _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(_Op1, _Op2, _T1)		 \
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_DEC(_Op1, _Op2, _T1, decimal32)	 \
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_DEC(_Op1, _Op2, _T1, decimal64)	 \
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_DEC(_Op1, _Op2, _T1, decimal128)	 \
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_INT(_Op1, _Op2, _T1, int)		 \
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_INT(_Op1, _Op2, _T1, unsigned int) \
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_INT(_Op1, _Op2, _T1, long)	 \
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_INT(_Op1, _Op2, _T1, unsigned long)\
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_INT(_Op1, _Op2, _T1, long long)	 \
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_INT(_Op1, _Op2, _T1, unsigned long long)
-
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(+=, +, decimal32)
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(-=, -, decimal32)
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(*=, *, decimal32)
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(/=, /, decimal32)
-
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(+=, +, decimal64)
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(-=, -, decimal64)
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(*=, *, decimal64)
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(/=, /, decimal64)
-
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(+=, +, decimal128)
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(-=, -, decimal128)
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(*=, *, decimal128)
-  _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS(/=, /, decimal128)
-
-#undef _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_DEC
-#undef _DEFINE_DECIMAL_COMPOUND_ASSIGNMENT_INT
-#undef _DEFINE_DECIMAL_COMPOUND_ASSIGNMENTS
-
-  // Extension: Conversion to integral type.
-
-  inline long long decimal32_to_long_long(decimal32 __d)
-  { return (long long)__d.__getval(); }
-
-  inline long long decimal64_to_long_long(decimal64 __d)
-  { return (long long)__d.__getval(); }
-
-  inline long long decimal128_to_long_long(decimal128 __d)
-  { return (long long)__d.__getval(); }
-
-  inline long long decimal_to_long_long(decimal32 __d)
-  { return (long long)__d.__getval(); }
-
-  inline long long decimal_to_long_long(decimal64 __d)
-  { return (long long)__d.__getval(); }
-
-  inline long long decimal_to_long_long(decimal128 __d)
-  { return (long long)__d.__getval(); }
-
-  // ISO/IEC TR 24733  3.2.5  Initialization from coefficient and exponent.
-
-  static decimal32 make_decimal32(long long __coeff, int __exponent)
-  {
-    decimal32 __decexp = 1, __multiplier;
-
-    if (__exponent < 0)
-      {
-	__multiplier = 1.E-1DF;
-	__exponent = -__exponent;
-      }
-    else
-      __multiplier = 1.E1DF;
-
-    for (int __i = 0; __i < __exponent; ++__i)
-      __decexp *= __multiplier;
-
-    return __coeff * __decexp;
-  }
-
-  static decimal32 make_decimal32(unsigned long long __coeff, int __exponent)
-  {
-    decimal32 __decexp = 1, __multiplier;
-
-    if (__exponent < 0)
-      {
-	__multiplier = 1.E-1DF;
-	__exponent = -__exponent;
-      }
-    else
-      __multiplier = 1.E1DF;
-
-    for (int __i = 0; __i < __exponent; ++__i)
-      __decexp *= __multiplier;
-
-    return __coeff * __decexp;
-  }
-
-  static decimal64 make_decimal64(long long __coeff, int __exponent)
-  {
-    decimal64 __decexp = 1, __multiplier;
-
-    if (__exponent < 0)
-      {
-	__multiplier = 1.E-1DD;
-	__exponent = -__exponent;
-      }
-    else
-      __multiplier = 1.E1DD;
-
-    for (int __i = 0; __i < __exponent; ++__i)
-      __decexp *= __multiplier;
-
-    return __coeff * __decexp;
-  }
-
-  static decimal64 make_decimal64(unsigned long long __coeff, int __exponent)
-  {
-    decimal64 __decexp = 1, __multiplier;
-
-    if (__exponent < 0)
-      {
-	__multiplier = 1.E-1DD;
-	__exponent = -__exponent;
-      }
-    else
-      __multiplier = 1.E1DD;
-
-    for (int __i = 0; __i < __exponent; ++__i)
-      __decexp *= __multiplier;
-
-    return __coeff * __decexp;
-  }
-
-  static decimal128 make_decimal128(long long __coeff, int __exponent)
-  {
-    decimal128 __decexp = 1, __multiplier;
-
-    if (__exponent < 0)
-      {
-	__multiplier = 1.E-1DL;
-	__exponent = -__exponent;
-      }
-    else
-      __multiplier = 1.E1DL;
-
-    for (int __i = 0; __i < __exponent; ++__i)
-      __decexp *= __multiplier;
-
-    return __coeff * __decexp;
-  }
-
-  static decimal128 make_decimal128(unsigned long long __coeff, int __exponent)
-  {
-    decimal128 __decexp = 1, __multiplier;
-
-    if (__exponent < 0)
-      {
-	__multiplier = 1.E-1DL;
-	__exponent = -__exponent;
-      }
-    else
-      __multiplier = 1.E1DL;
-
-    for (int __i = 0; __i < __exponent; ++__i)
-      __decexp *= __multiplier;
-
-    return __coeff * __decexp;
-  }
-
-  // ISO/IEC TR 24733  3.2.6  Conversion to generic floating-point type.
-
-  inline float decimal32_to_float(decimal32 __d)
-  { return (float)__d.__getval(); }
-
-  inline float decimal64_to_float(decimal64 __d)
-  { return (float)__d.__getval(); }
-
-  inline float decimal128_to_float(decimal128 __d)
-  { return (float)__d.__getval(); }
-
-  inline float decimal_to_float(decimal32 __d)
-  { return (float)__d.__getval(); }
-
-  inline float decimal_to_float(decimal64 __d)
-  { return (float)__d.__getval(); }
-
-  inline float decimal_to_float(decimal128 __d)
-  { return (float)__d.__getval(); }
-
-  inline double decimal32_to_double(decimal32 __d)
-  { return (double)__d.__getval(); }
-
-  inline double decimal64_to_double(decimal64 __d)
-  { return (double)__d.__getval(); }
-
-  inline double decimal128_to_double(decimal128 __d)
-  { return (double)__d.__getval(); }
-
-  inline double decimal_to_double(decimal32 __d)
-  { return (double)__d.__getval(); }
-
-  inline double decimal_to_double(decimal64 __d)
-  { return (double)__d.__getval(); }
-
-  inline double decimal_to_double(decimal128 __d)
-  { return (double)__d.__getval(); }
-
-  inline long double decimal32_to_long_double(decimal32 __d)
-  { return (long double)__d.__getval(); }
-
-  inline long double decimal64_to_long_double(decimal64 __d)
-  { return (long double)__d.__getval(); }
-
-  inline long double decimal128_to_long_double(decimal128 __d)
-  { return (long double)__d.__getval(); }
-
-  inline long double decimal_to_long_double(decimal32 __d)
-  { return (long double)__d.__getval(); }
-
-  inline long double decimal_to_long_double(decimal64 __d)
-  { return (long double)__d.__getval(); }
-
-  inline long double decimal_to_long_double(decimal128 __d)
-  { return (long double)__d.__getval(); }
-
-  // ISO/IEC TR 24733  3.2.7  Unary arithmetic operators.
-
-#define _DEFINE_DECIMAL_UNARY_OP(_Op, _Tp)	\
-  inline _Tp operator _Op(_Tp __rhs)		\
-  {						\
-    _Tp __tmp;					\
-    __tmp.__setval(_Op __rhs.__getval());	\
-    return __tmp;				\
-  }
-
-  _DEFINE_DECIMAL_UNARY_OP(+, decimal32)
-  _DEFINE_DECIMAL_UNARY_OP(+, decimal64)
-  _DEFINE_DECIMAL_UNARY_OP(+, decimal128)
-  _DEFINE_DECIMAL_UNARY_OP(-, decimal32)
-  _DEFINE_DECIMAL_UNARY_OP(-, decimal64)
-  _DEFINE_DECIMAL_UNARY_OP(-, decimal128)
-
-#undef _DEFINE_DECIMAL_UNARY_OP
-
-  // ISO/IEC TR 24733  3.2.8  Binary arithmetic operators.
-
-#define _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(_Op, _T1, _T2, _T3)	\
-  inline _T1 operator _Op(_T2 __lhs, _T3 __rhs)			\
-  {								\
-    _T1 __retval;						\
-    __retval.__setval(__lhs.__getval() _Op __rhs.__getval());	\
-    return __retval;						\
-  }
-
-#define _DEFINE_DECIMAL_BINARY_OP_BOTH(_Op, _T1, _T2, _T3)	\
-  inline _T1 operator _Op(_T2 __lhs, _T3 __rhs)			\
-  {								\
-    _T1 __retval;						\
-    __retval.__setval(__lhs.__getval() _Op __rhs.__getval());	\
-    return __retval;						\
-  }
-
-#define _DEFINE_DECIMAL_BINARY_OP_LHS(_Op, _T1, _T2)		\
-  inline _T1 operator _Op(_T1 __lhs, _T2 __rhs)			\
-  {								\
-    _T1 __retval;						\
-    __retval.__setval(__lhs.__getval() _Op __rhs);		\
-    return __retval;						\
-  }
-
-#define _DEFINE_DECIMAL_BINARY_OP_RHS(_Op, _T1, _T2)		\
-  inline _T1 operator _Op(_T2 __lhs, _T1 __rhs)			\
-  {								\
-    _T1 __retval;						\
-    __retval.__setval(__lhs _Op __rhs.__getval());		\
-    return __retval;						\
-  }
-
-#define _DEFINE_DECIMAL_BINARY_OP_WITH_INT(_Op, _T1)		\
-  _DEFINE_DECIMAL_BINARY_OP_LHS(_Op, _T1, int);			\
-  _DEFINE_DECIMAL_BINARY_OP_LHS(_Op, _T1, unsigned int);	\
-  _DEFINE_DECIMAL_BINARY_OP_LHS(_Op, _T1, long);		\
-  _DEFINE_DECIMAL_BINARY_OP_LHS(_Op, _T1, unsigned long);	\
-  _DEFINE_DECIMAL_BINARY_OP_LHS(_Op, _T1, long long);		\
-  _DEFINE_DECIMAL_BINARY_OP_LHS(_Op, _T1, unsigned long long);	\
-  _DEFINE_DECIMAL_BINARY_OP_RHS(_Op, _T1, int);			\
-  _DEFINE_DECIMAL_BINARY_OP_RHS(_Op, _T1, unsigned int);	\
-  _DEFINE_DECIMAL_BINARY_OP_RHS(_Op, _T1, long);		\
-  _DEFINE_DECIMAL_BINARY_OP_RHS(_Op, _T1, unsigned long);	\
-  _DEFINE_DECIMAL_BINARY_OP_RHS(_Op, _T1, long long);		\
-  _DEFINE_DECIMAL_BINARY_OP_RHS(_Op, _T1, unsigned long long);	\
-
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal32, decimal32, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(+, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal64, decimal32, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal64, decimal64, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal64, decimal64, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(+, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal128, decimal32, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal128, decimal64, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal128, decimal128, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal128, decimal128, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(+, decimal128, decimal128, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(+, decimal128)
-
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal32, decimal32, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(-, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal64, decimal32, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal64, decimal64, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal64, decimal64, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(-, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal128, decimal32, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal128, decimal64, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal128, decimal128, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal128, decimal128, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(-, decimal128, decimal128, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(-, decimal128)
-
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal32, decimal32, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(*, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal64, decimal32, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal64, decimal64, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal64, decimal64, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(*, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal128, decimal32, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal128, decimal64, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal128, decimal128, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal128, decimal128, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(*, decimal128, decimal128, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(*, decimal128)
-
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal32, decimal32, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(/, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal64, decimal32, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal64, decimal64, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal64, decimal64, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(/, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal128, decimal32, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal128, decimal64, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal128, decimal128, decimal32)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal128, decimal128, decimal64)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_DEC(/, decimal128, decimal128, decimal128)
-  _DEFINE_DECIMAL_BINARY_OP_WITH_INT(/, decimal128)
-
-#undef _DEFINE_DECIMAL_BINARY_OP_WITH_DEC
-#undef _DEFINE_DECIMAL_BINARY_OP_BOTH
-#undef _DEFINE_DECIMAL_BINARY_OP_LHS
-#undef _DEFINE_DECIMAL_BINARY_OP_RHS
-#undef _DEFINE_DECIMAL_BINARY_OP_WITH_INT
-
-  // ISO/IEC TR 24733  3.2.9  Comparison operators.
-
-#define _DEFINE_DECIMAL_COMPARISON_BOTH(_Op, _T1, _T2)	\
-  inline bool operator _Op(_T1 __lhs, _T2 __rhs)	\
-  { return __lhs.__getval() _Op __rhs.__getval(); }
-
-#define _DEFINE_DECIMAL_COMPARISON_LHS(_Op, _T1, _T2)	\
-  inline bool operator _Op(_T1 __lhs, _T2 __rhs)	\
-  { return __lhs.__getval() _Op __rhs; }
-
-#define _DEFINE_DECIMAL_COMPARISON_RHS(_Op, _T1, _T2)	\
-  inline bool operator _Op(_T1 __lhs, _T2 __rhs)	\
-  { return __lhs _Op __rhs.__getval(); }
-
-#define _DEFINE_DECIMAL_COMPARISONS(_Op, _Tp)			\
-  _DEFINE_DECIMAL_COMPARISON_BOTH(_Op, _Tp, decimal32)		\
-  _DEFINE_DECIMAL_COMPARISON_BOTH(_Op, _Tp, decimal64)		\
-  _DEFINE_DECIMAL_COMPARISON_BOTH(_Op, _Tp, decimal128)		\
-  _DEFINE_DECIMAL_COMPARISON_LHS(_Op, _Tp, int)			\
-  _DEFINE_DECIMAL_COMPARISON_LHS(_Op, _Tp, unsigned int)	\
-  _DEFINE_DECIMAL_COMPARISON_LHS(_Op, _Tp, long)		\
-  _DEFINE_DECIMAL_COMPARISON_LHS(_Op, _Tp, unsigned long)	\
-  _DEFINE_DECIMAL_COMPARISON_LHS(_Op, _Tp, long long)		\
-  _DEFINE_DECIMAL_COMPARISON_LHS(_Op, _Tp, unsigned long long)	\
-  _DEFINE_DECIMAL_COMPARISON_RHS(_Op, int, _Tp)			\
-  _DEFINE_DECIMAL_COMPARISON_RHS(_Op, unsigned int, _Tp)	\
-  _DEFINE_DECIMAL_COMPARISON_RHS(_Op, long, _Tp)		\
-  _DEFINE_DECIMAL_COMPARISON_RHS(_Op, unsigned long, _Tp)	\
-  _DEFINE_DECIMAL_COMPARISON_RHS(_Op, long long, _Tp)		\
-  _DEFINE_DECIMAL_COMPARISON_RHS(_Op, unsigned long long, _Tp)
-
-  _DEFINE_DECIMAL_COMPARISONS(==, decimal32)
-  _DEFINE_DECIMAL_COMPARISONS(==, decimal64)
-  _DEFINE_DECIMAL_COMPARISONS(==, decimal128)
-  _DEFINE_DECIMAL_COMPARISONS(!=, decimal32)
-  _DEFINE_DECIMAL_COMPARISONS(!=, decimal64)
-  _DEFINE_DECIMAL_COMPARISONS(!=, decimal128)
-  _DEFINE_DECIMAL_COMPARISONS(<,  decimal32)
-  _DEFINE_DECIMAL_COMPARISONS(<,  decimal64)
-  _DEFINE_DECIMAL_COMPARISONS(<,  decimal128)
-  _DEFINE_DECIMAL_COMPARISONS(<=, decimal32)
-  _DEFINE_DECIMAL_COMPARISONS(<=, decimal64)
-  _DEFINE_DECIMAL_COMPARISONS(<=, decimal128)
-  _DEFINE_DECIMAL_COMPARISONS(>,  decimal32)
-  _DEFINE_DECIMAL_COMPARISONS(>,  decimal64)
-  _DEFINE_DECIMAL_COMPARISONS(>,  decimal128)
-  _DEFINE_DECIMAL_COMPARISONS(>=, decimal32)
-  _DEFINE_DECIMAL_COMPARISONS(>=, decimal64)
-  _DEFINE_DECIMAL_COMPARISONS(>=, decimal128)
-
-#undef _DEFINE_DECIMAL_COMPARISON_BOTH
-#undef _DEFINE_DECIMAL_COMPARISON_LHS
-#undef _DEFINE_DECIMAL_COMPARISON_RHS
-#undef _DEFINE_DECIMAL_COMPARISONS
-  _GLIBCXX_END_NAMESPACE_VERSION
-} // namespace decimal
-} // namespace std
-
-#endif /* _GLIBCXX_DECIMAL_IMPL */
diff --git a/openflow/usr/include/c++/5/deque b/openflow/usr/include/c++/5/deque
deleted file mode 100644
index 171e970..0000000
--- a/openflow/usr/include/c++/5/deque
+++ /dev/null
@@ -1,76 +0,0 @@
-// <deque> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/deque
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_DEQUE
-#define _GLIBCXX_DEQUE 1
-
-#pragma GCC system_header
-
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_deque.h>
-#include <bits/range_access.h>
-#include <bits/deque.tcc>
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/deque>
-#endif
-
-#ifdef _GLIBCXX_PROFILE
-# include <profile/deque>
-#endif
-
-#endif /* _GLIBCXX_DEQUE */
diff --git a/openflow/usr/include/c++/5/exception b/openflow/usr/include/c++/5/exception
deleted file mode 100644
index d6c1855..0000000
--- a/openflow/usr/include/c++/5/exception
+++ /dev/null
@@ -1,166 +0,0 @@
-// Exception Handling support header for -*- C++ -*-
-
-// Copyright (C) 1995-2015 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file exception
- *  This is a Standard C++ Library header.
- */
-
-#ifndef __EXCEPTION__
-#define __EXCEPTION__
-
-#pragma GCC system_header
-
-#pragma GCC visibility push(default)
-
-#include <bits/c++config.h>
-#include <bits/atomic_lockfree_defines.h>
-
-extern "C++" {
-
-namespace std
-{
-  /**
-   * @defgroup exceptions Exceptions
-   * @ingroup diagnostics
-   *
-   * Classes and functions for reporting errors via exception classes.
-   * @{
-   */
-
-  /**
-   *  @brief Base class for all library exceptions.
-   *
-   *  This is the base class for all exceptions thrown by the standard
-   *  library, and by certain language expressions.  You are free to derive
-   *  your own %exception classes, or use a different hierarchy, or to
-   *  throw non-class data (e.g., fundamental types).
-   */
-  class exception
-  {
-  public:
-    exception() _GLIBCXX_USE_NOEXCEPT { }
-    virtual ~exception() _GLIBCXX_USE_NOEXCEPT;
-
-    /** Returns a C-style character string describing the general cause
-     *  of the current error.  */
-    virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /** If an %exception is thrown which is not listed in a function's
-   *  %exception specification, one of these may be thrown.  */
-  class bad_exception : public exception
-  {
-  public:
-    bad_exception() _GLIBCXX_USE_NOEXCEPT { }
-
-    // This declaration is not useless:
-    // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
-    virtual ~bad_exception() _GLIBCXX_USE_NOEXCEPT;
-
-    // See comment in eh_exception.cc.
-    virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /// If you write a replacement %terminate handler, it must be of this type.
-  typedef void (*terminate_handler) ();
-
-  /// If you write a replacement %unexpected handler, it must be of this type.
-  typedef void (*unexpected_handler) ();
-
-  /// Takes a new handler function as an argument, returns the old function.
-  terminate_handler set_terminate(terminate_handler) _GLIBCXX_USE_NOEXCEPT;
-
-#if __cplusplus >= 201103L
-  /// Return the current terminate handler.
-  terminate_handler get_terminate() noexcept;
-#endif
-
-  /** The runtime will call this function if %exception handling must be
-   *  abandoned for any reason.  It can also be called by the user.  */
-  void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__));
-
-  /// Takes a new handler function as an argument, returns the old function.
-  unexpected_handler set_unexpected(unexpected_handler) _GLIBCXX_USE_NOEXCEPT;
-
-#if __cplusplus >= 201103L
-  /// Return the current unexpected handler.
-  unexpected_handler get_unexpected() noexcept;
-#endif
-
-  /** The runtime will call this function if an %exception is thrown which
-   *  violates the function's %exception specification.  */
-  void unexpected() __attribute__ ((__noreturn__));
-
-  /** [18.6.4]/1:  'Returns true after completing evaluation of a
-   *  throw-expression until either completing initialization of the
-   *  exception-declaration in the matching handler or entering @c unexpected()
-   *  due to the throw; or after entering @c terminate() for any reason
-   *  other than an explicit call to @c terminate().  [Note: This includes
-   *  stack unwinding [15.2].  end note]'
-   *
-   *  2: 'When @c uncaught_exception() is true, throwing an
-   *  %exception can result in a call of @c terminate()
-   *  (15.5.1).'
-   */
-  bool uncaught_exception() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__));
-
-  // @} group exceptions
-} // namespace std
-
-namespace __gnu_cxx
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief A replacement for the standard terminate_handler which
-   *  prints more information about the terminating exception (if any)
-   *  on stderr.
-   *
-   *  @ingroup exceptions
-   *
-   *  Call
-   *   @code
-   *     std::set_terminate(__gnu_cxx::__verbose_terminate_handler)
-   *   @endcode
-   *  to use.  For more info, see
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt02ch06s02.html
-   *
-   *  In 3.4 and later, this is on by default.
-   */
-  void __verbose_terminate_handler();
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-} // extern "C++"
-
-#pragma GCC visibility pop
-
-#if (__cplusplus >= 201103L) && (ATOMIC_INT_LOCK_FREE > 1)
-#include <bits/exception_ptr.h>
-#include <bits/nested_exception.h>
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/experimental/algorithm b/openflow/usr/include/c++/5/experimental/algorithm
deleted file mode 100644
index 4281b42..0000000
--- a/openflow/usr/include/c++/5/experimental/algorithm
+++ /dev/null
@@ -1,137 +0,0 @@
-// <experimental/algorithm> -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/algorithm
- *  This is a TS C++ Library header.
- */
-
-#ifndef _GLIBCXX_EXPERIMENTAL_ALGORITHM
-#define _GLIBCXX_EXPERIMENTAL_ALGORITHM 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <algorithm>
-#include <random>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _ForwardIterator, typename _Searcher>
-    inline _ForwardIterator
-    search(_ForwardIterator __first, _ForwardIterator __last,
-	   const _Searcher& __searcher)
-    { return __searcher(__first, __last); }
-
-#define __cpp_lib_experimental_sample 201402
-
-  /// Reservoir sampling algorithm.
-  template<typename _InputIterator, typename _RandomAccessIterator,
-           typename _Size, typename _UniformRandomNumberGenerator>
-    _RandomAccessIterator
-    __sample(_InputIterator __first, _InputIterator __last, input_iterator_tag,
-	     _RandomAccessIterator __out, random_access_iterator_tag,
-	     _Size __n, _UniformRandomNumberGenerator&& __g)
-    {
-      using __distrib_type = std::uniform_int_distribution<_Size>;
-      using __param_type = typename __distrib_type::param_type;
-      __distrib_type __d{};
-      _Size __sample_sz = 0;
-      while (__first != __last && __sample_sz != __n)
-	__out[__sample_sz++] = *__first++;
-      for (auto __pop_sz = __sample_sz; __first != __last;
-	  ++__first, ++__pop_sz)
-	{
-	  const auto __k = __d(__g, __param_type{0, __pop_sz});
-	  if (__k < __n)
-	    __out[__k] = *__first;
-	}
-      return __out + __sample_sz;
-    }
-
-  /// Selection sampling algorithm.
-  template<typename _ForwardIterator, typename _OutputIterator, typename _Cat,
-           typename _Size, typename _UniformRandomNumberGenerator>
-    _OutputIterator
-    __sample(_ForwardIterator __first, _ForwardIterator __last,
-	     forward_iterator_tag,
-	     _OutputIterator __out, _Cat,
-	     _Size __n, _UniformRandomNumberGenerator&& __g)
-    {
-      using __distrib_type = std::uniform_int_distribution<_Size>;
-      using __param_type = typename __distrib_type::param_type;
-      __distrib_type __d{};
-      _Size __unsampled_sz = std::distance(__first, __last);
-      for (__n = std::min(__n, __unsampled_sz); __n != 0; ++__first)
-	if (__d(__g, __param_type{0, --__unsampled_sz}) < __n)
-	  {
-	    *__out++ = *__first;
-	    --__n;
-	  }
-      return __out;
-    }
-
-  /// Take a random sample from a population.
-  template<typename _PopulationIterator, typename _SampleIterator,
-           typename _Distance, typename _UniformRandomNumberGenerator>
-    _SampleIterator
-    sample(_PopulationIterator __first, _PopulationIterator __last,
-	   _SampleIterator __out, _Distance __n,
-	   _UniformRandomNumberGenerator&& __g)
-    {
-      using __pop_cat = typename
-	std::iterator_traits<_PopulationIterator>::iterator_category;
-      using __samp_cat = typename
-	std::iterator_traits<_SampleIterator>::iterator_category;
-
-      static_assert(
-	  __or_<is_convertible<__pop_cat, forward_iterator_tag>,
-		is_convertible<__samp_cat, random_access_iterator_tag>>::value,
-	  "output range must use a RandomAccessIterator when input range"
-	  " does not meet the ForwardIterator requirements");
-
-      static_assert(is_integral<_Distance>::value,
-		    "sample size must be an integer type");
-
-      return std::experimental::__sample(
-	  __first, __last, __pop_cat{}, __out, __samp_cat{},
-	  __n, std::forward<_UniformRandomNumberGenerator>(__g));
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v1
-} // namespace experimental
-} // namespace std
-
-#endif // C++14
-
-#endif // _GLIBCXX_EXPERIMENTAL_ALGORITHM
diff --git a/openflow/usr/include/c++/5/experimental/any b/openflow/usr/include/c++/5/experimental/any
deleted file mode 100644
index 487ba01..0000000
--- a/openflow/usr/include/c++/5/experimental/any
+++ /dev/null
@@ -1,437 +0,0 @@
-// <experimental/any> -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/any
- *  This is a TS C++ Library header.
- */
-
-#ifndef _GLIBCXX_EXPERIMENTAL_ANY
-#define _GLIBCXX_EXPERIMENTAL_ANY 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <typeinfo>
-#include <new>
-#include <utility>
-#include <type_traits>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup any Type-safe container of any type
-   * @ingroup experimental
-   *
-   * A type-safe container for single values of value types, as
-   * described in n3804 "Any Library Proposal (Revision 3)".
-   *
-   * @{
-   */
-
-#define __cpp_lib_experimental_any 201411
-
-  /**
-   *  @brief Exception class thrown by a failed @c any_cast
-   *  @ingroup exceptions
-   */
-  class bad_any_cast : public bad_cast
-  {
-  public:
-    virtual const char* what() const noexcept { return "bad any_cast"; }
-  };
-
-  [[gnu::noreturn]] inline void __throw_bad_any_cast()
-  {
-#if __cpp_exceptions
-    throw bad_any_cast{};
-#else
-    __builtin_abort();
-#endif
-  }
-
-  /**
-   *  @brief A type-safe container of any type.
-   * 
-   *  An @c any object's state is either empty or it stores a contained object
-   *  of CopyConstructible type.
-   */
-  class any
-  {
-    // Holds either pointer to a heap object or the contained object itself.
-    union _Storage
-    {
-      void* _M_ptr;
-      std::aligned_storage<sizeof(_M_ptr), sizeof(_M_ptr)>::type _M_buffer;
-    };
-
-    template<typename _Tp, typename _Safe = is_trivially_copyable<_Tp>,
-	     bool _Fits = (sizeof(_Tp) <= sizeof(_Storage))>
-      using _Internal = std::integral_constant<bool, _Safe::value && _Fits>;
-
-    template<typename _Tp>
-      struct _Manager_internal; // uses small-object optimization
-
-    template<typename _Tp>
-      struct _Manager_external; // creates contained object on the heap
-
-    template<typename _Tp>
-      using _Manager = conditional_t<_Internal<_Tp>::value,
-				     _Manager_internal<_Tp>,
-				     _Manager_external<_Tp>>;
-
-    template<typename _Tp, typename _Decayed = decay_t<_Tp>>
-      using _Decay = enable_if_t<!is_same<_Decayed, any>::value, _Decayed>;
-
-  public:
-    // construct/destruct
-
-    /// Default constructor, creates an empty object.
-    any() noexcept : _M_manager(nullptr) { }
-
-    /// Copy constructor, copies the state of @p __other
-    any(const any& __other) : _M_manager(__other._M_manager)
-    {
-      if (!__other.empty())
-	{
-	  _Arg __arg;
-	  __arg._M_any = this;
-	  _M_manager(_Op_clone, &__other, &__arg);
-	}
-    }
-
-    /**
-     * @brief Move constructor, transfer the state from @p __other
-     *
-     * @post @c __other.empty() (not guaranteed for other implementations)
-     */
-    any(any&& __other) noexcept
-    : _M_manager(__other._M_manager),
-      _M_storage(__other._M_storage)
-    { __other._M_manager = nullptr; }
-
-    /// Construct with a copy of @p __value as the contained object.
-    template <typename _ValueType, typename _Tp = _Decay<_ValueType>,
-	      typename _Mgr = _Manager<_Tp>>
-      any(_ValueType&& __value)
-      : _M_manager(&_Mgr::_S_manage),
-        _M_storage(_Mgr::_S_create(std::forward<_ValueType>(__value)))
-      {
-	static_assert(is_copy_constructible<_Tp>::value,
-		      "The contained object must be CopyConstructible");
-      }
-
-    /// Destructor, calls @c clear()
-    ~any() { clear(); }
-
-    // assignments
-
-    /// Copy the state of 
-    any& operator=(const any& __rhs)
-    {
-      any(__rhs).swap(*this);
-      return *this;
-    }
-
-    /**
-     * @brief Move assignment operator
-     *
-     * @post @c __rhs.empty() (not guaranteed for other implementations)
-     */
-    any& operator=(any&& __rhs) noexcept
-    {
-      any(std::move(__rhs)).swap(*this);
-      return *this;
-    }
-
-    /// Store a copy of @p __rhs as the contained object.
-    template<typename _ValueType>
-      any& operator=(_ValueType&& __rhs)
-      {
-	any(std::forward<_ValueType>(__rhs)).swap(*this);
-	return *this;
-      }
-
-    // modifiers
-
-    /// If not empty, destroy the contained object.
-    void clear() noexcept
-    {
-      if (!empty())
-      {
-	_M_manager(_Op_destroy, this, nullptr);
-	_M_manager = nullptr;
-      }
-    }
-
-    /// Exchange state with another object.
-    void swap(any& __rhs) noexcept
-    {
-      std::swap(_M_manager, __rhs._M_manager);
-      std::swap(_M_storage, __rhs._M_storage);
-    }
-
-    // observers
-
-    /// Reports whether there is a contained object or not.
-    bool empty() const noexcept { return _M_manager == nullptr; }
-
-#if __cpp_rtti
-    /// The @c typeid of the contained object, or @c typeid(void) if empty.
-    const type_info& type() const noexcept
-    {
-      if (empty())
-	return typeid(void);
-      _Arg __arg;
-      _M_manager(_Op_get_type_info, this, &__arg);
-      return *__arg._M_typeinfo;
-    }
-#endif
-
-    template<typename _Tp>
-      static constexpr bool __is_valid_cast()
-      { return __or_<is_reference<_Tp>, is_copy_constructible<_Tp>>::value; }
-
-  private:
-    enum _Op { _Op_access, _Op_get_type_info, _Op_clone, _Op_destroy };
-
-    union _Arg
-    {
-	void* _M_obj;
-	const std::type_info* _M_typeinfo;
-	any* _M_any;
-    };
-
-    void (*_M_manager)(_Op, const any*, _Arg*);
-    _Storage _M_storage;
-
-    template<typename _Tp>
-      friend void* __any_caster(const any* __any)
-      {
-	if (__any->_M_manager != &_Manager<decay_t<_Tp>>::_S_manage)
-	  return nullptr;
-	_Arg __arg;
-	__any->_M_manager(_Op_access, __any, &__arg);
-	return __arg._M_obj;
-      }
-
-    // Manage in-place contained object.
-    template<typename _Tp>
-      struct _Manager_internal
-      {
-	static void
-	_S_manage(_Op __which, const any* __anyp, _Arg* __arg);
-
-	template<typename _Up>
-	  static _Storage
-	  _S_create(_Up&& __value)
-	  {
-	    _Storage __storage;
-	    void* __addr = &__storage._M_buffer;
-	    ::new (__addr) _Tp(std::forward<_Up>(__value));
-	    return __storage;
-	  }
-
-	template<typename _Alloc, typename _Up>
-	  static _Storage
-	  _S_alloc(const _Alloc&, _Up&& __value)
-	  {
-	    return _S_create(std::forward<_Up>(__value));
-	  }
-      };
-
-    // Manage external contained object.
-    template<typename _Tp>
-      struct _Manager_external
-      {
-	static void
-	_S_manage(_Op __which, const any* __anyp, _Arg* __arg);
-
-	template<typename _Up>
-	  static _Storage
-	  _S_create(_Up&& __value)
-	  {
-	    _Storage __storage;
-	    __storage._M_ptr = new _Tp(std::forward<_Up>(__value));
-	    return __storage;
-	  }
-      };
-  };
-
-  /// Exchange the states of two @c any objects.
-  inline void swap(any& __x, any& __y) noexcept { __x.swap(__y); }
-
-  /**
-   * @brief Access the contained object.
-   *
-   * @tparam  _ValueType  A const-reference or CopyConstructible type.
-   * @param   __any       The object to access.
-   * @return  The contained object.
-   * @throw   bad_any_cast If <code>
-   *          __any.type() != typeid(remove_reference_t<_ValueType>)
-   *          </code>
-   */
-  template<typename _ValueType>
-    inline _ValueType any_cast(const any& __any)
-    {
-      static_assert(any::__is_valid_cast<_ValueType>(),
-	  "Template argument must be a reference or CopyConstructible type");
-      auto __p = any_cast<add_const_t<remove_reference_t<_ValueType>>>(&__any);
-      if (__p)
-	return *__p;
-      __throw_bad_any_cast();
-    }
-
-  /**
-   * @brief Access the contained object.
-   *
-   * @tparam  _ValueType  A reference or CopyConstructible type.
-   * @param   __any       The object to access.
-   * @return  The contained object.
-   * @throw   bad_any_cast If <code>
-   *          __any.type() != typeid(remove_reference_t<_ValueType>)
-   *          </code>
-   *
-   * @{
-   */
-  template<typename _ValueType>
-    inline _ValueType any_cast(any& __any)
-    {
-      static_assert(any::__is_valid_cast<_ValueType>(),
-	  "Template argument must be a reference or CopyConstructible type");
-      auto __p = any_cast<remove_reference_t<_ValueType>>(&__any);
-      if (__p)
-	return *__p;
-      __throw_bad_any_cast();
-    }
-
-  template<typename _ValueType>
-    inline _ValueType any_cast(any&& __any)
-    {
-      static_assert(any::__is_valid_cast<_ValueType>(),
-	  "Template argument must be a reference or CopyConstructible type");
-      auto __p = any_cast<remove_reference_t<_ValueType>>(&__any);
-      if (__p)
-	return *__p;
-      __throw_bad_any_cast();
-    }
-  // @}
-
-  /**
-   * @brief Access the contained object.
-   *
-   * @tparam  _ValueType  The type of the contained object.
-   * @param   __any       A pointer to the object to access.
-   * @return  The address of the contained object if <code>
-   *          __any != nullptr && __any.type() == typeid(_ValueType)
-   *          </code>, otherwise a null pointer.
-   *
-   * @{
-   */
-  template<typename _ValueType>
-    inline const _ValueType* any_cast(const any* __any) noexcept
-    {
-      if (__any)
-	return static_cast<_ValueType*>(__any_caster<_ValueType>(__any));
-      return nullptr;
-    }
-
-  template<typename _ValueType>
-    inline _ValueType* any_cast(any* __any) noexcept
-    {
-      if (__any)
-	return static_cast<_ValueType*>(__any_caster<_ValueType>(__any));
-      return nullptr;
-    }
-  // @}
-
-  template<typename _Tp>
-    void
-    any::_Manager_internal<_Tp>::
-    _S_manage(_Op __which, const any* __any, _Arg* __arg)
-    {
-      // The contained object is in _M_storage._M_buffer
-      auto __ptr = reinterpret_cast<const _Tp*>(&__any->_M_storage._M_buffer);
-      switch (__which)
-      {
-      case _Op_access:
-	__arg->_M_obj = const_cast<_Tp*>(__ptr);
-	break;
-      case _Op_get_type_info:
-#if __cpp_rtti
-	__arg->_M_typeinfo = &typeid(_Tp);
-#endif
-	break;
-      case _Op_clone:
-	::new(&__arg->_M_any->_M_storage._M_buffer) _Tp(*__ptr);
-	break;
-      case _Op_destroy:
-	__ptr->~_Tp();
-	break;
-      }
-    }
-
-  template<typename _Tp>
-    void
-    any::_Manager_external<_Tp>::
-    _S_manage(_Op __which, const any* __any, _Arg* __arg)
-    {
-      // The contained object is *_M_storage._M_ptr
-      auto __ptr = static_cast<const _Tp*>(__any->_M_storage._M_ptr);
-      switch (__which)
-      {
-      case _Op_access:
-	__arg->_M_obj = const_cast<_Tp*>(__ptr);
-	break;
-      case _Op_get_type_info:
-#if __cpp_rtti
-	__arg->_M_typeinfo = &typeid(_Tp);
-#endif
-	break;
-      case _Op_clone:
-	__arg->_M_any->_M_storage._M_ptr = new _Tp(*__ptr);
-	break;
-      case _Op_destroy:
-	delete __ptr;
-	break;
-      }
-    }
-
-  // @} group any
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v1
-} // namespace experimental
-} // namespace std
-
-#endif // C++14
-
-#endif // _GLIBCXX_EXPERIMENTAL_ANY
diff --git a/openflow/usr/include/c++/5/experimental/chrono b/openflow/usr/include/c++/5/experimental/chrono
deleted file mode 100644
index 0631fa5..0000000
--- a/openflow/usr/include/c++/5/experimental/chrono
+++ /dev/null
@@ -1,65 +0,0 @@
-// Variable Templates For chrono -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/chrono
- *  This is a TS C++ Library header.
- */
-
-//
-// N3932 Variable Templates For Type Traits (Revision 1)
-//
-
-#ifndef _GLIBCXX_EXPERIMENTAL_CHRONO
-#define _GLIBCXX_EXPERIMENTAL_CHRONO 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <chrono>
-
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace chrono {
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-// See C++14 §20.12.4, customization traits
-template <typename _Rep>
-   constexpr bool treat_as_floating_point_v =
-     treat_as_floating_point<_Rep>::value;
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v1
-} // namespace experimental
-} // namespace chrono
-} // namespace std
-
-#endif // __cplusplus <= 201103L
-
-#endif // _GLIBCXX_EXPERIMENTAL_CHRONO
diff --git a/openflow/usr/include/c++/5/experimental/filesystem b/openflow/usr/include/c++/5/experimental/filesystem
deleted file mode 100644
index db7ab11..0000000
--- a/openflow/usr/include/c++/5/experimental/filesystem
+++ /dev/null
@@ -1,77 +0,0 @@
-// <experimental/filesystem> -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/filesystem
- *  This is a TS C++ Library header.
- */
-
-#ifndef _GLIBCXX_EXPERIMENTAL_FILESYSTEM
-#define _GLIBCXX_EXPERIMENTAL_FILESYSTEM 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <experimental/fs_fwd.h>
-#include <experimental/fs_path.h>
-#include <experimental/fs_dir.h>
-#include <experimental/fs_ops.h>
-
-#define __cpp_lib_experimental_filesystem 201406
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-namespace filesystem
-{
-inline namespace v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @ingroup filesystem
-   */
-    inline std::string filesystem_error::_M_gen_what()
-    {
-      std::string __what = "filesystem error: ";
-      __what += system_error::what();
-      if (!_M_path1.empty())
-	  __what += " [" + _M_path1.string() + ']';
-      if (!_M_path2.empty())
-	  __what += " [" + _M_path2.string() + ']';
-      return __what;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace v1
-} // namespace filesystem
-} // namespace experimental
-} // namespace std
-
-#endif // C++11
-
-#endif // _GLIBCXX_EXPERIMENTAL_FILESYSTEM
diff --git a/openflow/usr/include/c++/5/experimental/fs_dir.h b/openflow/usr/include/c++/5/experimental/fs_dir.h
deleted file mode 100644
index 0c5253f..0000000
--- a/openflow/usr/include/c++/5/experimental/fs_dir.h
+++ /dev/null
@@ -1,338 +0,0 @@
-// Filesystem directory utilities -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/fs_dir.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{experimental/filesystem}
- */
-
-#ifndef _GLIBCXX_EXPERIMENTAL_FS_DIR_H
-#define _GLIBCXX_EXPERIMENTAL_FS_DIR_H 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-# include <typeinfo>
-# include <ext/concurrence.h>
-# include <bits/unique_ptr.h>
-# include <bits/shared_ptr.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-namespace filesystem
-{
-inline namespace v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @ingroup filesystem
-   * @{
-   */
-
-  class file_status
-  {
-  public:
-    // constructors
-    explicit
-    file_status(file_type __ft = file_type::none,
-	        perms __prms = perms::unknown) noexcept
-    : _M_type(__ft), _M_perms(__prms) { }
-
-    file_status(const file_status&) noexcept = default;
-    file_status(file_status&&) noexcept = default;
-    ~file_status() = default;
-
-    file_status& operator=(const file_status&) noexcept = default;
-    file_status& operator=(file_status&&) noexcept = default;
-
-    // observers
-    file_type  type() const noexcept { return _M_type; }
-    perms      permissions() const noexcept { return _M_perms; }
-
-    // modifiers
-    void       type(file_type __ft) noexcept { _M_type = __ft; }
-    void       permissions(perms __prms) noexcept { _M_perms = __prms; }
-
-  private:
-    file_type	_M_type;
-    perms	_M_perms;
-  };
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  class directory_entry
-  {
-  public:
-    // constructors and destructor
-    directory_entry() noexcept = default;
-    directory_entry(const directory_entry&) = default;
-    directory_entry(directory_entry&&) noexcept = default;
-    explicit directory_entry(const filesystem::path& __p) : _M_path(__p) { }
-    ~directory_entry() = default;
-
-    // modifiers
-    directory_entry& operator=(const directory_entry&) = default;
-    directory_entry& operator=(directory_entry&&) noexcept = default;
-
-    void assign(const filesystem::path& __p) { _M_path = __p; }
-
-    void
-    replace_filename(const filesystem::path& __p)
-    { _M_path = _M_path.parent_path() / __p; }
-
-    // observers
-    const filesystem::path&  path() const noexcept { return _M_path; }
-    operator const filesystem::path&() const noexcept { return _M_path; }
-
-    file_status
-    status() const
-    { return filesystem::status(_M_path); }
-
-    file_status
-    status(error_code& __ec) const noexcept
-    { return filesystem::status(_M_path, __ec); }
-
-    file_status
-    symlink_status() const
-    { return filesystem::symlink_status(_M_path); }
-
-    file_status
-    symlink_status(error_code& __ec) const noexcept
-    { return filesystem::symlink_status(_M_path, __ec); }
-
-    bool
-    operator< (const directory_entry& __rhs) const noexcept
-    { return _M_path < __rhs._M_path; }
-
-    bool
-    operator==(const directory_entry& __rhs) const noexcept
-    { return _M_path == __rhs._M_path; }
-
-    bool
-    operator!=(const directory_entry& __rhs) const noexcept
-    { return _M_path != __rhs._M_path; }
-
-    bool
-    operator<=(const directory_entry& __rhs) const noexcept
-    { return _M_path <= __rhs._M_path; }
-
-    bool
-    operator> (const directory_entry& __rhs) const noexcept
-    { return _M_path > __rhs._M_path; }
-
-    bool
-    operator>=(const directory_entry& __rhs) const noexcept
-    { return _M_path >= __rhs._M_path; }
-
-  private:
-    filesystem::path    _M_path;
-  };
-
-  struct _Dir;
-  class recursive_directory_iterator;
-
-  class directory_iterator
-  {
-  public:
-    typedef directory_entry        value_type;
-    typedef ptrdiff_t              difference_type;
-    typedef const directory_entry* pointer;
-    typedef const directory_entry& reference;
-    typedef input_iterator_tag     iterator_category;
-
-    directory_iterator() noexcept = default;
-
-    explicit
-    directory_iterator(const path& __p)
-    : directory_iterator(__p, directory_options::none, nullptr) { }
-
-    directory_iterator(const path& __p, directory_options __options)
-    : directory_iterator(__p, __options, nullptr) { }
-
-    directory_iterator(const path& __p, error_code& __ec) noexcept
-    : directory_iterator(__p, directory_options::none, __ec) { }
-
-    directory_iterator(const path& __p,
-      directory_options __options, error_code& __ec) noexcept
-    : directory_iterator(__p, __options, &__ec) { }
-
-    directory_iterator(const directory_iterator& __rhs) = default;
-
-    directory_iterator(directory_iterator&& __rhs) noexcept = default;
-
-    ~directory_iterator() = default;
-
-    directory_iterator& operator=(const directory_iterator& __rhs) = default;
-    directory_iterator& operator=(directory_iterator&& __rhs) noexcept = default;
-
-    const directory_entry& operator*() const;
-    const directory_entry* operator->() const { return &**this; }
-    directory_iterator&    operator++();
-    directory_iterator&    increment(error_code& __ec) noexcept;
-
-    directory_iterator operator++(int)
-    {
-      auto __tmp = *this;
-      ++*this;
-      return __tmp;
-    }
-
-  private:
-    directory_iterator(const path&, directory_options, error_code*);
-
-    friend bool
-    operator==(const directory_iterator& __lhs,
-               const directory_iterator& __rhs);
-
-    friend class recursive_directory_iterator;
-
-    std::shared_ptr<_Dir> _M_dir;
-  };
-
-  inline directory_iterator
-  begin(directory_iterator __iter) { return __iter; }
-
-  inline directory_iterator
-  end(directory_iterator) { return directory_iterator(); }
-
-  inline bool
-  operator==(const directory_iterator& __lhs, const directory_iterator& __rhs)
-  {
-    return !__rhs._M_dir.owner_before(__lhs._M_dir)
-      && !__lhs._M_dir.owner_before(__rhs._M_dir);
-  }
-
-  inline bool
-  operator!=(const directory_iterator& __lhs, const directory_iterator& __rhs)
-  { return !(__lhs == __rhs); }
-
-  class recursive_directory_iterator
-  {
-  public:
-    typedef directory_entry        value_type;
-    typedef ptrdiff_t              difference_type;
-    typedef const directory_entry* pointer;
-    typedef const directory_entry& reference;
-    typedef input_iterator_tag     iterator_category;
-
-    recursive_directory_iterator() noexcept = default;
-
-    explicit
-    recursive_directory_iterator(const path& __p)
-    : recursive_directory_iterator(__p, directory_options::none, nullptr) { }
-
-    recursive_directory_iterator(const path& __p, directory_options __options)
-    : recursive_directory_iterator(__p, __options, nullptr) { }
-
-    recursive_directory_iterator(const path& __p,
-                                 directory_options __options,
-                                 error_code& __ec) noexcept
-    : recursive_directory_iterator(__p, __options, &__ec) { }
-
-    recursive_directory_iterator(const path& __p, error_code& __ec) noexcept
-    : recursive_directory_iterator(__p, directory_options::none, &__ec) { }
-
-    recursive_directory_iterator(
-        const recursive_directory_iterator&) = default;
-
-    recursive_directory_iterator(
-        recursive_directory_iterator&&) noexcept = default;
-
-    ~recursive_directory_iterator();
-
-    // observers
-    directory_options  options() const { return _M_options; }
-    int                depth() const;
-    bool               recursion_pending() const { return _M_pending; }
-
-    const directory_entry& operator*() const;
-    const directory_entry* operator->() const { return &**this; }
-
-    // modifiers
-    recursive_directory_iterator&
-      operator=(const recursive_directory_iterator& __rhs) noexcept;
-    recursive_directory_iterator&
-      operator=(recursive_directory_iterator&& __rhs) noexcept;
-
-    recursive_directory_iterator& operator++();
-    recursive_directory_iterator& increment(error_code& __ec) noexcept;
-
-    recursive_directory_iterator operator++(int)
-    {
-      auto __tmp = *this;
-      ++*this;
-      return __tmp;
-    }
-
-    void pop();
-
-    void disable_recursion_pending() { _M_pending = false; }
-
-  private:
-    recursive_directory_iterator(const path&, directory_options, error_code*);
-
-    friend bool
-    operator==(const recursive_directory_iterator& __lhs,
-               const recursive_directory_iterator& __rhs);
-
-    struct _Dir_stack;
-    std::shared_ptr<_Dir_stack> _M_dirs;
-    directory_options _M_options;
-    bool _M_pending;
-  };
-
-  inline recursive_directory_iterator
-  begin(recursive_directory_iterator __iter) { return __iter; }
-
-  inline recursive_directory_iterator
-  end(recursive_directory_iterator) { return recursive_directory_iterator(); }
-
-  inline bool
-  operator==(const recursive_directory_iterator& __lhs,
-             const recursive_directory_iterator& __rhs)
-  {
-    return !__rhs._M_dirs.owner_before(__lhs._M_dirs)
-      && !__lhs._M_dirs.owner_before(__rhs._M_dirs);
-  }
-
-  inline bool
-  operator!=(const recursive_directory_iterator& __lhs,
-             const recursive_directory_iterator& __rhs)
-  { return !(__lhs == __rhs); }
-
-_GLIBCXX_END_NAMESPACE_CXX11
-
-  // @} group filesystem
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace v1
-} // namespace filesystem
-} // namespace experimental
-} // namespace std
-
-#endif // C++11
-
-#endif // _GLIBCXX_EXPERIMENTAL_FS_DIR_H
diff --git a/openflow/usr/include/c++/5/experimental/fs_fwd.h b/openflow/usr/include/c++/5/experimental/fs_fwd.h
deleted file mode 100644
index dd6f5e6..0000000
--- a/openflow/usr/include/c++/5/experimental/fs_fwd.h
+++ /dev/null
@@ -1,290 +0,0 @@
-// Filesystem declarations -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/fs_fwd.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{experimental/filesystem}
- */
-
-#ifndef _GLIBCXX_EXPERIMENTAL_FS_FWD_H
-#define _GLIBCXX_EXPERIMENTAL_FS_FWD_H 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <system_error>
-#include <cstdint>
-#include <chrono>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-namespace filesystem
-{
-inline namespace v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if _GLIBCXX_USE_CXX11_ABI
-  inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { }
-#endif
-
-  /**
-   * @defgroup filesystem Filesystem
-   * @ingroup experimental
-   *
-   * Utilities for performing operations on file systems and their components,
-   * such as paths, regular files, and directories.
-   *
-   * @{
-   */
-
-  class file_status;
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-  class path;
-  class filesystem_error;
-  class directory_entry;
-  class directory_iterator;
-  class recursive_directory_iterator;
-_GLIBCXX_END_NAMESPACE_CXX11
-
-  struct space_info
-  {
-    uintmax_t capacity;
-    uintmax_t free;
-    uintmax_t available;
-  };
-
-  enum class file_type : signed char {
-      none = 0, not_found = -1, regular = 1, directory = 2, symlink = 3,
-      block = 4, character = 5, fifo = 6, socket = 7, unknown = 8
-  };
-
-  /// Bitmask type
-  enum class copy_options : unsigned short {
-      none = 0,
-      skip_existing = 1, overwrite_existing = 2, update_existing = 4,
-      recursive = 8,
-      copy_symlinks = 16, skip_symlinks = 32,
-      directories_only = 64, create_symlinks = 128, create_hard_links = 256
-  };
-
-  constexpr copy_options
-  operator&(copy_options __x, copy_options __y)
-  {
-    using __utype = typename std::underlying_type<copy_options>::type;
-    return static_cast<copy_options>(
-	static_cast<__utype>(__x) & static_cast<__utype>(__y));
-  }
-
-  constexpr copy_options
-  operator|(copy_options __x, copy_options __y)
-  {
-    using __utype = typename std::underlying_type<copy_options>::type;
-    return static_cast<copy_options>(
-	static_cast<__utype>(__x) | static_cast<__utype>(__y));
-  }
-
-  constexpr copy_options
-  operator^(copy_options __x, copy_options __y)
-  {
-    using __utype = typename std::underlying_type<copy_options>::type;
-    return static_cast<copy_options>(
-	static_cast<__utype>(__x) ^ static_cast<__utype>(__y));
-  }
-
-  constexpr copy_options
-  operator~(copy_options __x)
-  {
-    using __utype = typename std::underlying_type<copy_options>::type;
-    return static_cast<copy_options>(~static_cast<__utype>(__x));
-  }
-
-  inline copy_options&
-  operator&=(copy_options& __x, copy_options __y)
-  { return __x = __x & __y; }
-
-  inline copy_options&
-  operator|=(copy_options& __x, copy_options __y)
-  { return __x = __x | __y; }
-
-  inline copy_options&
-  operator^=(copy_options& __x, copy_options __y)
-  { return __x = __x ^ __y; }
-
-
-  /// Bitmask type
-  enum class perms : unsigned {
-      none		=  0,
-      owner_read	=  0400,
-      owner_write	=  0200,
-      owner_exec	=  0100,
-      owner_all		=  0700,
-      group_read	=   040,
-      group_write	=   020,
-      group_exec	=   010,
-      group_all		=   070,
-      others_read	=    04,
-      others_write	=    02,
-      others_exec	=    01,
-      others_all	=    07,
-      all		=  0777,
-      set_uid		= 04000,
-      set_gid		= 02000,
-      sticky_bit	= 01000,
-      mask		= 07777,
-      unknown		=  0xFFFF,
-      add_perms		= 0x10000,
-      remove_perms	= 0x20000,
-      resolve_symlinks	= 0x40000
-  };
-
-  constexpr perms
-  operator&(perms __x, perms __y)
-  {
-    using __utype = typename std::underlying_type<perms>::type;
-    return static_cast<perms>(
-	static_cast<__utype>(__x) & static_cast<__utype>(__y));
-  }
-
-  constexpr perms
-  operator|(perms __x, perms __y)
-  {
-    using __utype = typename std::underlying_type<perms>::type;
-    return static_cast<perms>(
-	static_cast<__utype>(__x) | static_cast<__utype>(__y));
-  }
-
-  constexpr perms
-  operator^(perms __x, perms __y)
-  {
-    using __utype = typename std::underlying_type<perms>::type;
-    return static_cast<perms>(
-	static_cast<__utype>(__x) ^ static_cast<__utype>(__y));
-  }
-
-  constexpr perms
-  operator~(perms __x)
-  {
-    using __utype = typename std::underlying_type<perms>::type;
-    return static_cast<perms>(~static_cast<__utype>(__x));
-  }
-
-  inline perms&
-  operator&=(perms& __x, perms __y)
-  { return __x = __x & __y; }
-
-  inline perms&
-  operator|=(perms& __x, perms __y)
-  { return __x = __x | __y; }
-
-  inline perms&
-  operator^=(perms& __x, perms __y)
-  { return __x = __x ^ __y; }
-
-  // Bitmask type
-  enum class directory_options : unsigned char {
-      none = 0, follow_directory_symlink = 1, skip_permission_denied = 2
-  };
-
-  constexpr directory_options
-  operator&(directory_options __x, directory_options __y)
-  {
-    using __utype = typename std::underlying_type<directory_options>::type;
-    return static_cast<directory_options>(
-	static_cast<__utype>(__x) & static_cast<__utype>(__y));
-  }
-
-  constexpr directory_options
-  operator|(directory_options __x, directory_options __y)
-  {
-    using __utype = typename std::underlying_type<directory_options>::type;
-    return static_cast<directory_options>(
-	static_cast<__utype>(__x) | static_cast<__utype>(__y));
-  }
-
-  constexpr directory_options
-  operator^(directory_options __x, directory_options __y)
-  {
-    using __utype = typename std::underlying_type<directory_options>::type;
-    return static_cast<directory_options>(
-	static_cast<__utype>(__x) ^ static_cast<__utype>(__y));
-  }
-
-  constexpr directory_options
-  operator~(directory_options __x)
-  {
-    using __utype = typename std::underlying_type<directory_options>::type;
-    return static_cast<directory_options>(~static_cast<__utype>(__x));
-  }
-
-  inline directory_options&
-  operator&=(directory_options& __x, directory_options __y)
-  { return __x = __x & __y; }
-
-  inline directory_options&
-  operator|=(directory_options& __x, directory_options __y)
-  { return __x = __x | __y; }
-
-  inline directory_options&
-  operator^=(directory_options& __x, directory_options __y)
-  { return __x = __x ^ __y; }
-
-  typedef chrono::time_point<chrono::system_clock> file_time_type;
-
-  // operational functions
-
-  void copy(const path& __from, const path& __to, copy_options __options);
-  void copy(const path& __from, const path& __to, copy_options __options,
-	    error_code&) noexcept;
-
-  bool copy_file(const path& __from, const path& __to, copy_options __option);
-  bool copy_file(const path& __from, const path& __to, copy_options __option,
-		 error_code&) noexcept;
-
-  path current_path();
-
-  file_status status(const path&);
-  file_status status(const path&, error_code&) noexcept;
-
-  bool status_known(file_status) noexcept;
-
-  file_status symlink_status(const path&);
-  file_status symlink_status(const path&, error_code&) noexcept;
-
-  bool is_regular_file(file_status) noexcept;
-  bool is_symlink(file_status) noexcept;
-
-  // @} group filesystem
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace v1
-} // namespace filesystem
-} // namespace experimental
-} // namespace std
-
-#endif // C++11
-
-#endif // _GLIBCXX_EXPERIMENTAL_FS_FWD_H
diff --git a/openflow/usr/include/c++/5/experimental/fs_ops.h b/openflow/usr/include/c++/5/experimental/fs_ops.h
deleted file mode 100644
index 91b8902..0000000
--- a/openflow/usr/include/c++/5/experimental/fs_ops.h
+++ /dev/null
@@ -1,292 +0,0 @@
-// Filesystem operational functions -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your __option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/fs_fwd.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{experimental/filesystem}
- */
-
-#ifndef _GLIBCXX_EXPERIMENTAL_FS_OPS_H
-#define _GLIBCXX_EXPERIMENTAL_FS_OPS_H 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <cstdint>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-namespace filesystem
-{
-inline namespace v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @ingroup filesystem
-   * @{
-   */
-
-  path absolute(const path& __p, const path& __base = current_path());
-
-  path canonical(const path& __p, const path& __base = current_path());
-  path canonical(const path& __p, error_code& __ec);
-  path canonical(const path& __p, const path& __base, error_code& __ec);
-
-  inline void
-  copy(const path& __from, const path& __to)
-  { copy(__from, __to, copy_options::none); }
-
-  inline void
-  copy(const path& __from, const path& __to, error_code& __ec) noexcept
-  { copy(__from, __to, copy_options::none, __ec); }
-
-  void copy(const path& __from, const path& __to, copy_options __options);
-  void copy(const path& __from, const path& __to, copy_options __options,
-	    error_code& __ec) noexcept;
-
-  inline bool
-  copy_file(const path& __from, const path& __to)
-  { return copy_file(__from, __to, copy_options::none); }
-
-  inline bool
-  copy_file(const path& __from, const path& __to, error_code& __ec) noexcept
-  { return copy_file(__from, __to, copy_options::none, __ec); }
-
-  bool copy_file(const path& __from, const path& __to, copy_options __option);
-  bool copy_file(const path& __from, const path& __to, copy_options __option,
-		 error_code& __ec) noexcept;
-
-  void copy_symlink(const path& __existing_symlink, const path& __new_symlink);
-  void copy_symlink(const path& __existing_symlink, const path& __new_symlink,
-		    error_code& __ec) noexcept;
-
-  bool create_directories(const path& __p);
-  bool create_directories(const path& __p, error_code& __ec) noexcept;
-
-  bool create_directory(const path& __p);
-  bool create_directory(const path& __p, error_code& __ec) noexcept;
-
-  bool create_directory(const path& __p, const path& attributes);
-  bool create_directory(const path& __p, const path& attributes,
-			error_code& __ec) noexcept;
-
-  void create_directory_symlink(const path& __to, const path& __new_symlink);
-  void create_directory_symlink(const path& __to, const path& __new_symlink,
-				error_code& __ec) noexcept;
-
-  void create_hard_link(const path& __to, const path& __new_hard_link);
-  void create_hard_link(const path& __to, const path& __new_hard_link,
-			error_code& __ec) noexcept;
-
-  void create_symlink(const path& __to, const path& __new_symlink);
-  void create_symlink(const path& __to, const path& __new_symlink,
-		      error_code& __ec) noexcept;
-
-  path current_path();
-  path current_path(error_code& __ec);
-  void current_path(const path& __p);
-  void current_path(const path& __p, error_code& __ec) noexcept;
-
-  inline bool
-  exists(file_status __s) noexcept
-  { return status_known(__s) && __s.type() != file_type::not_found; }
-
-  inline bool
-  exists(const path& __p)
-  { return exists(status(__p)); }
-
-  inline bool
-  exists(const path& __p, error_code& __ec) noexcept
-  { return exists(status(__p, __ec)); }
-
-  bool
-  equivalent(const path& __p1, const path& __p2);
-
-  bool
-  equivalent(const path& __p1, const path& __p2, error_code& __ec) noexcept;
-
-  uintmax_t file_size(const path& __p);
-  uintmax_t file_size(const path& __p, error_code& __ec) noexcept;
-
-  uintmax_t hard_link_count(const path& __p);
-  uintmax_t hard_link_count(const path& __p, error_code& __ec) noexcept;
-
-  inline bool
-  is_block_file(file_status __s) noexcept
-  { return __s.type() == file_type::block; }
-
-  inline bool
-  is_block_file(const path& __p)
-  { return is_block_file(status(__p)); }
-
-  inline bool
-  is_block_file(const path& __p, error_code& __ec) noexcept
-  { return is_block_file(status(__p, __ec)); }
-
-  inline bool
-  is_character_file(file_status __s) noexcept
-  { return __s.type() == file_type::character; }
-
-  inline bool
-  is_character_file(const path& __p)
-  { return is_character_file(status(__p)); }
-
-  inline bool
-  is_character_file(const path& __p, error_code& __ec) noexcept
-  { return is_character_file(status(__p, __ec)); }
-
-  inline bool
-  is_directory(file_status __s) noexcept
-  { return __s.type() == file_type::directory; }
-
-  inline bool
-  is_directory(const path& __p)
-  { return is_directory(status(__p)); }
-
-  inline bool
-  is_directory(const path& __p, error_code& __ec) noexcept
-  { return is_directory(status(__p, __ec)); }
-
-  bool is_empty(const path& __p);
-  bool is_empty(const path& __p, error_code& __ec) noexcept;
-
-  inline bool
-  is_fifo(file_status __s) noexcept
-  { return __s.type() == file_type::fifo; }
-
-  inline bool
-  is_fifo(const path& __p)
-  { return is_fifo(status(__p)); }
-
-  inline bool
-  is_fifo(const path& __p, error_code& __ec) noexcept
-  { return is_fifo(status(__p, __ec)); }
-
-  inline bool
-  is_other(file_status __s) noexcept
-  {
-    return exists(__s) && !is_regular_file(__s) && !is_directory(__s)
-      && !is_symlink(__s);
-  }
-
-  inline bool
-  is_other(const path& __p)
-  { return is_other(status(__p)); }
-
-  inline bool
-  is_other(const path& __p, error_code& __ec) noexcept
-  { return is_other(status(__p, __ec)); }
-
-  inline bool
-  is_regular_file(file_status __s) noexcept
-  { return __s.type() == file_type::regular; }
-
-  inline bool
-  is_regular_file(const path& __p)
-  { return is_regular_file(status(__p)); }
-
-  inline bool
-  is_regular_file(const path& __p, error_code& __ec) noexcept
-  { return is_regular_file(status(__p, __ec)); }
-
-  inline bool
-  is_socket(file_status __s) noexcept
-  { return __s.type() == file_type::socket; }
-
-  inline bool
-  is_socket(const path& __p)
-  { return is_socket(status(__p)); }
-
-  inline bool
-  is_socket(const path& __p, error_code& __ec) noexcept
-  { return is_socket(status(__p, __ec)); }
-
-  inline bool
-  is_symlink(file_status __s) noexcept
-  { return __s.type() == file_type::symlink; }
-
-  inline bool
-  is_symlink(const path& __p)
-  { return is_symlink(symlink_status(__p)); }
-
-  inline bool
-  is_symlink(const path& __p, error_code& __ec) noexcept
-  { return is_symlink(symlink_status(__p, __ec)); }
-
-  file_time_type  last_write_time(const path& __p);
-  file_time_type  last_write_time(const path& __p, error_code& __ec) noexcept;
-  void last_write_time(const path& __p, file_time_type __new_time);
-  void last_write_time(const path& __p, file_time_type __new_time,
-		       error_code& __ec) noexcept;
-
-  void permissions(const path& __p, perms __prms);
-  void permissions(const path& __p, perms __prms, error_code& __ec) noexcept;
-
-  path read_symlink(const path& __p);
-  path read_symlink(const path& __p, error_code& __ec);
-
-  bool remove(const path& __p);
-  bool remove(const path& __p, error_code& __ec) noexcept;
-
-  uintmax_t remove_all(const path& __p);
-  uintmax_t remove_all(const path& __p, error_code& __ec) noexcept;
-
-  void rename(const path& __from, const path& __to);
-  void rename(const path& __from, const path& __to, error_code& __ec) noexcept;
-
-  void resize_file(const path& __p, uintmax_t __size);
-  void resize_file(const path& __p, uintmax_t __size, error_code& __ec) noexcept;
-
-  space_info space(const path& __p);
-  space_info space(const path& __p, error_code& __ec) noexcept;
-
-  file_status status(const path& __p);
-  file_status status(const path& __p, error_code& __ec) noexcept;
-
-  inline bool status_known(file_status __s) noexcept
-  { return __s.type() != file_type::none; }
-
-  file_status symlink_status(const path& __p);
-  file_status symlink_status(const path& __p, error_code& __ec) noexcept;
-
-  path system_complete(const path& __p);
-  path system_complete(const path& __p, error_code& __ec);
-
-  path temp_directory_path();
-  path temp_directory_path(error_code& __ec);
-
-  // @} group filesystem
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace v1
-} // namespace filesystem
-} // namespace experimental
-} // namespace std
-
-#endif // C++11
-
-#endif // _GLIBCXX_EXPERIMENTAL_FS_OPS_H
diff --git a/openflow/usr/include/c++/5/experimental/fs_path.h b/openflow/usr/include/c++/5/experimental/fs_path.h
deleted file mode 100644
index 176918a..0000000
--- a/openflow/usr/include/c++/5/experimental/fs_path.h
+++ /dev/null
@@ -1,1024 +0,0 @@
-// Class filesystem::path -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/fs_path.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{experimental/filesystem}
- */
-
-#ifndef _GLIBCXX_EXPERIMENTAL_FS_PATH_H
-#define _GLIBCXX_EXPERIMENTAL_FS_PATH_H 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <utility>
-#include <type_traits>
-#include <vector>
-#include <locale>
-#include <iosfwd>
-#include <codecvt>
-#include <system_error>
-#include <bits/stl_algobase.h>
-#include <bits/quoted_string.h>
-#include <bits/locale_conv.h>
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-# define _GLIBCXX_FILESYSTEM_IS_WINDOWS 1
-# include <algorithm>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-namespace filesystem
-{
-inline namespace v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  /**
-   * @ingroup filesystem
-   * @{
-   */
-
-  /// A filesystem path.
-  class path
-  {
-    template<typename _CharT>
-      struct __is_encoded_char : std::false_type { };
-
-    template<typename _Iter,
-	     typename _Iter_traits = std::iterator_traits<_Iter>>
-      using __is_path_iter_src
-	= __and_<__is_encoded_char<typename _Iter_traits::value_type>,
-		 std::is_base_of<std::input_iterator_tag,
-				 typename _Iter_traits::iterator_category>>;
-
-    template<typename _Iter>
-      static __is_path_iter_src<_Iter>
-      __is_path_src(_Iter, int);
-
-    template<typename _CharT, typename _Traits, typename _Alloc>
-      static __is_encoded_char<_CharT>
-      __is_path_src(const basic_string<_CharT, _Traits, _Alloc>&, int);
-
-    template<typename _Unknown>
-      static std::false_type
-      __is_path_src(const _Unknown&, ...);
-
-    template<typename _Tp1, typename _Tp2>
-      struct __constructible_from;
-
-    template<typename _Iter>
-      struct __constructible_from<_Iter, _Iter>
-      : __is_path_iter_src<_Iter>
-      { };
-
-    template<typename _Source>
-      struct __constructible_from<_Source, void>
-      : decltype(__is_path_src(std::declval<_Source>(), 0))
-      { };
-
-    template<typename _Tp1, typename _Tp2 = void>
-      using _Path = typename
-	std::enable_if<__and_<__not_<is_same<_Tp1, path>>,
-			      __constructible_from<_Tp1, _Tp2>>::value,
-		       path>::type;
-
-    template<typename _Source>
-      static _Source
-      _S_range_begin(_Source __begin) { return __begin; }
-
-    struct __null_terminated { };
-
-    template<typename _Source>
-      static __null_terminated
-      _S_range_end(_Source) { return {}; }
-
-    template<typename _CharT, typename _Traits, typename _Alloc>
-      static const _CharT*
-      _S_range_begin(const basic_string<_CharT, _Traits, _Alloc>& __str)
-      { return __str.data(); }
-
-    template<typename _CharT, typename _Traits, typename _Alloc>
-      static const _CharT*
-      _S_range_end(const basic_string<_CharT, _Traits, _Alloc>& __str)
-      { return __str.data() + __str.size(); }
-
-    template<typename _Tp,
-	     typename _Iter = decltype(_S_range_begin(std::declval<_Tp>())),
-	     typename _Val = typename std::iterator_traits<_Iter>::value_type>
-      using __value_type_is_char
-	= typename std::enable_if<std::is_same<_Val, char>::value>::type;
-
-  public:
-#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-    typedef wchar_t				value_type;
-    static constexpr value_type			preferred_separator = L'\\';
-#else
-    typedef char				value_type;
-    static constexpr value_type			preferred_separator = '/';
-#endif
-    typedef std::basic_string<value_type>	string_type;
-
-    // constructors and destructor
-
-    path() noexcept { }
-
-    path(const path& __p) = default;
-
-    path(path&& __p) noexcept
-    : _M_pathname(std::move(__p._M_pathname)), _M_type(__p._M_type)
-    {
-      _M_split_cmpts();
-      __p.clear();
-    }
-
-    template<typename _Source,
-	     typename _Require = _Path<_Source>>
-      path(_Source const& __source)
-      : _M_pathname(_S_convert(_S_range_begin(__source),
-			       _S_range_end(__source)))
-      { _M_split_cmpts(); }
-
-    template<typename _InputIterator,
-	     typename _Require = _Path<_InputIterator, _InputIterator>>
-      path(_InputIterator __first, _InputIterator __last)
-      : _M_pathname(_S_convert(__first, __last))
-      { _M_split_cmpts(); }
-
-    template<typename _Source,
-	     typename _Require = _Path<_Source>,
-	     typename _Require2 = __value_type_is_char<_Source>>
-      path(_Source const& __source, const locale& __loc)
-      : _M_pathname(_S_convert_loc(_S_range_begin(__source),
-				   _S_range_end(__source), __loc))
-      { _M_split_cmpts(); }
-
-    template<typename _InputIterator,
-	     typename _Require = _Path<_InputIterator, _InputIterator>,
-	     typename _Require2 = __value_type_is_char<_InputIterator>>
-      path(_InputIterator __first, _InputIterator __last, const locale& __loc)
-      : _M_pathname(_S_convert_loc(__first, __last, __loc))
-      { _M_split_cmpts(); }
-
-    ~path() = default;
-
-    // assignments
-
-    path& operator=(const path& __p) = default;
-    path& operator=(path&& __p) noexcept;
-
-    template<typename _Source>
-      _Path<_Source>&
-      operator=(_Source const& __source)
-      { return *this = path(__source); }
-
-    template<typename _Source>
-      _Path<_Source>&
-      assign(_Source const& __source)
-      { return *this = path(__source); }
-
-    template<typename _InputIterator>
-      _Path<_InputIterator, _InputIterator>&
-      assign(_InputIterator __first, _InputIterator __last)
-      { return *this = path(__first, __last); }
-
-    // appends
-
-    path& operator/=(const path& __p) { return _M_append(__p._M_pathname); }
-
-    template <class _Source>
-      _Path<_Source>&
-      operator/=(_Source const& __source)
-      { return append(__source); }
-
-    template<typename _Source>
-      _Path<_Source>&
-      append(_Source const& __source)
-      {
-	return _M_append(_S_convert(_S_range_begin(__source),
-				    _S_range_end(__source)));
-      }
-
-    template<typename _InputIterator>
-      _Path<_InputIterator, _InputIterator>&
-      append(_InputIterator __first, _InputIterator __last)
-      { return _M_append(_S_convert(__first, __last)); }
-
-    // concatenation
-
-    path& operator+=(const path& __x);
-    path& operator+=(const string_type& __x);
-    path& operator+=(const value_type* __x);
-    path& operator+=(value_type __x);
-
-    template<typename _Source>
-      _Path<_Source>&
-      operator+=(_Source const& __x) { return concat(__x); }
-
-    template<typename _CharT>
-      _Path<_CharT*, _CharT*>&
-      operator+=(_CharT __x);
-
-    template<typename _Source>
-      _Path<_Source>&
-      concat(_Source const& __x)
-      { return *this += _S_convert(_S_range_begin(__x), _S_range_end(__x)); }
-
-    template<typename _InputIterator>
-      _Path<_InputIterator, _InputIterator>&
-      concat(_InputIterator __first, _InputIterator __last)
-      { return *this += _S_convert(__first, __last); }
-
-    // modifiers
-
-    void clear() noexcept { _M_pathname.clear(); _M_split_cmpts(); }
-
-    path& make_preferred();
-    path& remove_filename();
-    path& replace_filename(const path& __replacement);
-    path& replace_extension(const path& __replacement = path());
-
-    void swap(path& __rhs) noexcept;
-
-    // native format observers
-
-    const string_type&  native() const noexcept { return _M_pathname; }
-    const value_type*   c_str() const noexcept { return _M_pathname.c_str(); }
-    operator string_type() const { return _M_pathname; }
-
-    template<typename _CharT, typename _Traits = std::char_traits<_CharT>,
-	     typename _Allocator = std::allocator<_CharT>>
-      std::basic_string<_CharT, _Traits, _Allocator>
-      string(const _Allocator& __a = _Allocator()) const;
-
-    std::string    string() const;
-#if _GLIBCXX_USE_WCHAR_T
-    std::wstring   wstring() const;
-#endif
-    std::string    u8string() const;
-    std::u16string u16string() const;
-    std::u32string u32string() const;
-
-    // generic format observers
-    template<typename _CharT, typename _Traits = std::char_traits<_CharT>,
-	     typename _Allocator = std::allocator<_CharT>>
-      std::basic_string<_CharT, _Traits, _Allocator>
-      generic_string(const _Allocator& __a = _Allocator()) const;
-
-    std::string    generic_string() const;
-#if _GLIBCXX_USE_WCHAR_T
-    std::wstring   generic_wstring() const;
-#endif
-    std::string    generic_u8string() const;
-    std::u16string generic_u16string() const;
-    std::u32string generic_u32string() const;
-
-    // compare
-
-    int compare(const path& __p) const noexcept;
-    int compare(const string_type& __s) const;
-    int compare(const value_type* __s) const;
-
-    // decomposition
-
-    path root_name() const;
-    path root_directory() const;
-    path root_path() const;
-    path relative_path() const;
-    path parent_path() const;
-    path filename() const;
-    path stem() const;
-    path extension() const;
-
-    // query
-
-    bool empty() const noexcept { return _M_pathname.empty(); }
-    bool has_root_name() const;
-    bool has_root_directory() const;
-    bool has_root_path() const;
-    bool has_relative_path() const;
-    bool has_parent_path() const;
-    bool has_filename() const;
-    bool has_stem() const;
-    bool has_extension() const;
-    bool is_absolute() const;
-    bool is_relative() const { return !is_absolute(); }
-
-    // iterators
-    class iterator;
-    typedef iterator const_iterator;
-
-    iterator begin() const;
-    iterator end() const;
-
-  private:
-    enum class _Type : unsigned char {
-	_Multi, _Root_name, _Root_dir, _Filename
-    };
-
-    path(string_type __str, _Type __type) : _M_pathname(__str), _M_type(__type)
-    {
-      _GLIBCXX_DEBUG_ASSERT(!empty());
-      _GLIBCXX_DEBUG_ASSERT(_M_type != _Type::_Multi);
-    }
-
-    enum class _Split { _Stem, _Extension };
-
-    path& _M_append(const string_type& __str)
-    {
-      if (!_M_pathname.empty() && !_S_is_dir_sep(_M_pathname.back())
-	  && !__str.empty() && !_S_is_dir_sep(__str.front()))
-	_M_pathname += preferred_separator;
-      _M_pathname += __str;
-      _M_split_cmpts();
-      return *this;
-    }
-
-    pair<const string_type*, size_t> _M_find_extension() const;
-
-    template<typename _CharT>
-      struct _Cvt;
-
-    static string_type
-    _S_convert(value_type* __src, __null_terminated)
-    { return string_type(__src); }
-
-    static string_type
-    _S_convert(const value_type* __src, __null_terminated)
-    { return string_type(__src); }
-
-    template<typename _Iter>
-      static string_type
-      _S_convert(_Iter __first, _Iter __last)
-      {
-	using __value_type = typename std::iterator_traits<_Iter>::value_type;
-	return _Cvt<__value_type>::_S_convert(__first, __last);
-      }
-
-    template<typename _InputIterator>
-      static string_type
-      _S_convert(_InputIterator __src, __null_terminated)
-      {
-	using _Tp = typename std::iterator_traits<_InputIterator>::value_type;
-	std::basic_string<_Tp> __tmp;
-	while (*__src != _Tp{})
-	  __tmp.push_back(*__src++);
-	return _S_convert(__tmp.data(), __tmp.data() + __tmp.size());
-      }
-
-    static string_type
-    _S_convert_loc(const char* __first, const char* __last,
-		   const std::locale& __loc);
-
-    template<typename _Iter>
-      static string_type
-      _S_convert_loc(_Iter __first, _Iter __last, const std::locale& __loc)
-      {
-	const std::string __str(__first, __last);
-	return _S_convert_loc(__str.data(), __str.data()+__str.size(), __loc);
-      }
-
-    template<typename _InputIterator>
-      static string_type
-      _S_convert_loc(_InputIterator __src, __null_terminated,
-		     const std::locale& __loc)
-      {
-	std::string __tmp;
-	while (*__src != '\0')
-	  __tmp.push_back(*__src++);
-	return _S_convert_loc(__tmp.data(), __tmp.data()+__tmp.size(), __loc);
-      }
-
-    bool _S_is_dir_sep(value_type __ch)
-    {
-#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-      return __ch == L'/' || __ch == preferred_separator;
-#else
-      return __ch == '/';
-#endif
-    }
-
-    void _M_split_cmpts();
-    void _M_trim();
-    void _M_add_root_name(size_t __n);
-    void _M_add_root_dir(size_t __pos);
-    void _M_add_filename(size_t __pos, size_t __n);
-
-    string_type _M_pathname;
-
-    struct _Cmpt;
-    using _List = _GLIBCXX_STD_C::vector<_Cmpt>;
-    _List _M_cmpts; // empty unless _M_type == _Type::_Multi
-    _Type _M_type = _Type::_Multi;
-  };
-
-  inline void swap(path& __lhs, path& __rhs) noexcept { __lhs.swap(__rhs); }
-
-  size_t hash_value(const path& __p) noexcept;
-
-  /// Compare paths
-  inline bool operator<(const path& __lhs, const path& __rhs) noexcept
-  { return __lhs.compare(__rhs) < 0; }
-
-  /// Compare paths
-  inline bool operator<=(const path& __lhs, const path& __rhs) noexcept
-  { return !(__rhs < __lhs); }
-
-  /// Compare paths
-  inline bool operator>(const path& __lhs, const path& __rhs) noexcept
-  { return __rhs < __lhs; }
-
-  /// Compare paths
-  inline bool operator>=(const path& __lhs, const path& __rhs) noexcept
-  { return !(__lhs < __rhs); }
-
-  /// Compare paths
-  inline bool operator==(const path& __lhs, const path& __rhs) noexcept
-  { return __lhs.compare(__rhs) == 0; }
-
-  /// Compare paths
-  inline bool operator!=(const path& __lhs, const path& __rhs) noexcept
-  { return !(__lhs == __rhs); }
-
-  /// Append one path to another
-  inline path operator/(const path& __lhs, const path& __rhs)
-  { return path(__lhs) /= __rhs; }
-
-  /// Write a path to a stream
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const path& __p)
-    {
-      auto __tmp = __p.string<_CharT, _Traits>();
-      using __quoted_string
-	= std::__detail::_Quoted_string<decltype(__tmp)&, _CharT>;
-      __os << __quoted_string{__tmp, '"', '\\'};
-      return __os;
-    }
-
-  /// Read a path from a stream
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, path& __p)
-    {
-      basic_string<_CharT, _Traits> __tmp;
-      using __quoted_string
-	= std::__detail::_Quoted_string<decltype(__tmp)&, _CharT>;
-      if (__is >> __quoted_string{ __tmp, '"', '\\' })
-	__p = std::move(__tmp);
-      return __is;
-    }
-
-  // TODO constrain with _Path<Source> and __value_type_is_char
-  template<typename _Source>
-    inline path
-    u8path(const _Source& __source)
-    {
-#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-      return path{ path::string_type{__source} };
-#else
-      return path{ __source };
-#endif
-    }
-
-  // TODO constrain with _Path<InputIterator, InputIterator> and __value_type_is_char
-  template<typename _InputIterator>
-    inline path
-    u8path(_InputIterator __first, _InputIterator __last)
-    {
-#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-      return path{ path::string_type{__first, __last} };
-#else
-      return path{ __first, __last };
-#endif
-    }
-
-  class filesystem_error : public std::system_error
-  {
-  public:
-    filesystem_error(const string& __what_arg, error_code __ec)
-    : system_error(__ec, __what_arg) { }
-
-    filesystem_error(const string& __what_arg, const path& __p1,
-		     error_code __ec)
-    : system_error(__ec, __what_arg), _M_path1(__p1) { }
-
-    filesystem_error(const string& __what_arg, const path& __p1,
-		     const path& __p2, error_code __ec)
-    : system_error(__ec, __what_arg), _M_path1(__p1), _M_path2(__p2)
-    { }
-
-    ~filesystem_error();
-
-    const path& path1() const noexcept { return _M_path1; }
-    const path& path2() const noexcept { return _M_path2; }
-    const char* what() const noexcept { return _M_what.c_str(); }
-
-  private:
-    std::string _M_gen_what();
-
-    path _M_path1;
-    path _M_path2;
-    std::string _M_what = _M_gen_what();
-  };
-
-  template<>
-    struct path::__is_encoded_char<char> : std::true_type
-    { using value_type = char; };
-
-  template<>
-    struct path::__is_encoded_char<wchar_t> : std::true_type
-    { using value_type = wchar_t; };
-
-  template<>
-    struct path::__is_encoded_char<char16_t> : std::true_type
-    { using value_type = char16_t; };
-
-  template<>
-    struct path::__is_encoded_char<char32_t> : std::true_type
-    { using value_type = char32_t; };
-
-  struct path::_Cmpt : path
-  {
-    _Cmpt(string_type __s, _Type __t, size_t __pos)
-      : path(std::move(__s), __t), _M_pos(__pos) { }
-
-    _Cmpt() : _M_pos(-1) { }
-
-    size_t _M_pos;
-  };
-
-  // specialize _Cvt for degenerate 'noconv' case
-  template<>
-    struct path::_Cvt<path::value_type>
-    {
-      template<typename _Iter>
-	static string_type
-	_S_convert(_Iter __first, _Iter __last)
-	{ return string_type{__first, __last}; }
-    };
-
-  template<typename _CharT>
-    struct path::_Cvt
-    {
-#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-      static string_type
-      _S_wconvert(const char* __f, const char* __l, true_type)
-      {
-	using _Cvt = std::codecvt<wchar_t, char, mbstate_t>;
-	const auto& __cvt = std::use_facet<_Cvt>(std::locale{});
-	std::wstring __wstr;
-	if (__str_codecvt_in(__f, __l, __wstr, __cvt))
-	    return __wstr;
-	_GLIBCXX_THROW_OR_ABORT(filesystem_error(
-	      "Cannot convert character sequence",
-	      std::make_error_code(errc::illegal_byte_sequence)));
-      }
-
-      static string_type
-      _S_wconvert(const _CharT* __f, const _CharT* __l, false_type)
-      {
-	std::codecvt_utf8<_CharT> __cvt;
-	std::string __str;
-	if (__str_codecvt_out(__f, __l, __str, __cvt))
-	  {
-	    const char* __f2 = __str.data();
-	    const char* __l2 = __f2 + __str.size();
-	    std::codecvt_utf8<wchar_t> __wcvt;
-	    std::wstring __wstr;
-	    if (__str_codecvt_in(__f2, __l2, __wstr, __wcvt))
-	      return __wstr;
-	  }
-	_GLIBCXX_THROW_OR_ABORT(filesystem_error(
-	      "Cannot convert character sequence",
-	      std::make_error_code(errc::illegal_byte_sequence)));
-      }
-
-      static string_type
-      _S_convert(const _CharT* __f, const _CharT* __l)
-      {
-	return _S_wconvert(__f, __l, is_same<_CharT, char>{});
-      }
-#else
-      static string_type
-      _S_convert(const _CharT* __f, const _CharT* __l)
-      {
-	std::codecvt_utf8<_CharT> __cvt;
-	std::string __str;
-	if (__str_codecvt_out(__f, __l, __str, __cvt))
-	  return __str;
-	_GLIBCXX_THROW_OR_ABORT(filesystem_error(
-	      "Cannot convert character sequence",
-	      std::make_error_code(errc::illegal_byte_sequence)));
-      }
-#endif
-
-      static string_type
-      _S_convert(_CharT* __f, _CharT* __l)
-      {
-	return _S_convert(const_cast<const _CharT*>(__f),
-			  const_cast<const _CharT*>(__l));
-      }
-
-      template<typename _Iter>
-	static string_type
-	_S_convert(_Iter __first, _Iter __last)
-	{
-	  const std::basic_string<_CharT> __str(__first, __last);
-	  return _S_convert(__str.data(), __str.data() + __str.size());
-	}
-
-      template<typename _Iter, typename _Cont>
-	static string_type
-	_S_convert(__gnu_cxx::__normal_iterator<_Iter, _Cont> __first,
-		  __gnu_cxx::__normal_iterator<_Iter, _Cont> __last)
-	{ return _S_convert(__first.base(), __last.base()); }
-    };
-
-  /// An iterator for the components of a path
-  class path::iterator
-  {
-  public:
-    using difference_type	= std::ptrdiff_t;
-    using value_type		= path;
-    using reference		= const path&;
-    using pointer		= const path*;
-    using iterator_category	= std::bidirectional_iterator_tag;
-
-    iterator() : _M_path(nullptr), _M_cur(), _M_at_end() { }
-
-    iterator(const iterator&) = default;
-    iterator& operator=(const iterator&) = default;
-
-    reference operator*() const;
-    pointer   operator->() const { return std::__addressof(**this); }
-
-    iterator& operator++();
-    iterator  operator++(int) { auto __tmp = *this; ++_M_cur; return __tmp; }
-
-    iterator& operator--();
-    iterator  operator--(int) { auto __tmp = *this; --_M_cur; return __tmp; }
-
-    friend bool operator==(const iterator& __lhs, const iterator& __rhs)
-    { return __lhs._M_equals(__rhs); }
-
-    friend bool operator!=(const iterator& __lhs, const iterator& __rhs)
-    { return !__lhs._M_equals(__rhs); }
-
-  private:
-    friend class path;
-
-    iterator(const path* __path, path::_List::const_iterator __iter)
-    : _M_path(__path), _M_cur(__iter), _M_at_end()
-    { }
-
-    iterator(const path* __path, bool __at_end)
-    : _M_path(__path), _M_cur(), _M_at_end(__at_end)
-    { }
-
-    bool _M_equals(iterator) const;
-
-    const path* 		_M_path;
-    path::_List::const_iterator _M_cur;
-    bool			_M_at_end;  // only used when type != _Multi
-  };
-
-
-  inline path&
-  path::operator=(path&& __p) noexcept
-  {
-    _M_pathname = std::move(__p._M_pathname);
-    _M_cmpts = std::move(__p._M_cmpts);
-    _M_type = __p._M_type;
-    __p.clear();
-    return *this;
-  }
-
-  inline path&
-  path::operator+=(const path& __p)
-  {
-    return operator+=(__p.native());
-  }
-
-  inline path&
-  path::operator+=(const string_type& __x)
-  {
-    _M_pathname += __x;
-    _M_split_cmpts();
-    return *this;
-  }
-
-  inline path&
-  path::operator+=(const value_type* __x)
-  {
-    _M_pathname += __x;
-    _M_split_cmpts();
-    return *this;
-  }
-
-  inline path&
-  path::operator+=(value_type __x)
-  {
-    _M_pathname += __x;
-    _M_split_cmpts();
-    return *this;
-  }
-
-  template<typename _CharT>
-    inline path::_Path<_CharT*, _CharT*>&
-    path::operator+=(_CharT __x)
-    {
-      auto* __addr = std::__addressof(__x);
-      return concat(__addr, __addr + 1);
-    }
-
-  inline path&
-  path::make_preferred()
-  {
-#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-    std::replace(_M_pathname.begin(), _M_pathname.end(), L'/',
-		 preferred_separator);
-#endif
-    return *this;
-  }
-
-  inline void path::swap(path& __rhs) noexcept
-  {
-    _M_pathname.swap(__rhs._M_pathname);
-    _M_cmpts.swap(__rhs._M_cmpts);
-    std::swap(_M_type, __rhs._M_type);
-  }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline std::basic_string<_CharT, _Traits, _Allocator>
-    path::string(const _Allocator& __a) const
-    {
-      if (is_same<_CharT, value_type>::value)
-	return { _M_pathname.begin(), _M_pathname.end(), __a };
-
-      const value_type* __first = _M_pathname.data();
-      const value_type* __last = __first + _M_pathname.size();
-
-#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-      using _CharAlloc = __alloc_rebind<_Allocator, char>;
-      using _String = basic_string<char, char_traits<char>, _CharAlloc>;
-      using _WString = basic_string<_CharT, _Traits, _Allocator>;
-
-      // use codecvt_utf8<wchar_t> to convert native string to UTF-8
-      codecvt_utf8<value_type> __cvt;
-      _String __u8str{_CharAlloc{__a}};
-      if (__str_codecvt_out(__first, __last, __u8str, __cvt))
-	{
-	  struct
-	  {
-	    const _String*
-	    operator()(const _String& __from, _String&, true_type)
-	    { return std::__addressof(__from); }
-
-	    _WString*
-	    operator()(const _String& __from, _WString& __to, false_type)
-	    {
-	      // use codecvt_utf8<_CharT> to convert UTF-8 to wide string
-	      codecvt_utf8<_CharT> __cvt;
-	      const char* __f = __from.data();
-	      const char* __l = __f + __from.size();
-	      if (__str_codecvt_in(__f, __l, __to, __cvt))
-		return std::__addressof(__to);
-	      return nullptr;
-	    }
-	  } __dispatch;
-	  _WString __wstr;
-	  if (auto* __p = __dispatch(__u8str, __wstr, is_same<_CharT, char>{}))
-	    return *__p;
-	}
-#else
-      codecvt_utf8<_CharT> __cvt;
-      basic_string<_CharT, _Traits, _Allocator> __wstr{__a};
-      if (__str_codecvt_in(__first, __last, __wstr, __cvt))
-	return __wstr;
-#endif
-      _GLIBCXX_THROW_OR_ABORT(filesystem_error(
-	    "Cannot convert character sequence",
-	    std::make_error_code(errc::illegal_byte_sequence)));
-    }
-
-  inline std::string
-  path::string() const { return string<char>(); }
-
-#if _GLIBCXX_USE_WCHAR_T
-  inline std::wstring
-  path::wstring() const { return string<wchar_t>(); }
-#endif
-
-  inline std::string
-  path::u8string() const
-  {
-#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-    std::string __str;
-    // convert from native encoding to UTF-8
-    codecvt_utf8<value_type> __cvt;
-    const value_type* __first = _M_pathname.data();
-    const value_type* __last = __first + _M_pathname.size();
-    if (__str_codecvt_out(__first, __last, __str, __cvt))
-      return __str;
-    _GLIBCXX_THROW_OR_ABORT(filesystem_error(
-	  "Cannot convert character sequence",
-	  std::make_error_code(errc::illegal_byte_sequence)));
-#else
-    return _M_pathname;
-#endif
-  }
-
-  inline std::u16string
-  path::u16string() const { return string<char16_t>(); }
-
-  inline std::u32string
-  path::u32string() const { return string<char32_t>(); }
-
-#ifndef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline std::basic_string<_CharT, _Traits, _Allocator>
-    path::generic_string(const _Allocator& __a) const
-    { return string<_CharT, _Traits, _Allocator>(__a); }
-
-  inline std::string
-  path::generic_string() const { return string(); }
-
-#if _GLIBCXX_USE_WCHAR_T
-  inline std::wstring
-  path::generic_wstring() const { return wstring(); }
-#endif
-
-  inline std::string
-  path::generic_u8string() const { return u8string(); }
-
-  inline std::u16string
-  path::generic_u16string() const { return u16string(); }
-
-  inline std::u32string
-  path::generic_u32string() const { return u32string(); }
-#endif
-
-  inline int
-  path::compare(const string_type& __s) const { return compare(path(__s)); }
-
-  inline int
-  path::compare(const value_type* __s) const { return compare(path(__s)); }
-
-  inline path
-  path::filename() const { return empty() ? path() : *--end(); }
-
-  inline path
-  path::stem() const
-  {
-    auto ext = _M_find_extension();
-    if (ext.first && ext.second != 0)
-      return path{ext.first->substr(0, ext.second)};
-    return {};
-  }
-
-  inline path
-  path::extension() const
-  {
-    auto ext = _M_find_extension();
-    if (ext.first && ext.second != string_type::npos)
-      return path{ext.first->substr(ext.second)};
-    return {};
-  }
-
-  inline bool
-  path::has_stem() const
-  {
-    auto ext = _M_find_extension();
-    return ext.first && ext.second != 0;
-  }
-
-  inline bool
-  path::has_extension() const
-  {
-    auto ext = _M_find_extension();
-    return ext.first && ext.second != string_type::npos;
-  }
-
-  inline bool
-  path::is_absolute() const
-  {
-#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-    return has_root_name();
-#else
-    return has_root_directory();
-#endif
-  }
-
-  inline path::iterator
-  path::begin() const
-  {
-    if (_M_type == _Type::_Multi)
-      return iterator(this, _M_cmpts.begin());
-    return iterator(this, false);
-  }
-
-  inline path::iterator
-  path::end() const
-  {
-    if (_M_type == _Type::_Multi)
-      return iterator(this, _M_cmpts.end());
-    return iterator(this, true);
-  }
-
-  inline path::iterator&
-  path::iterator::operator++()
-  {
-    _GLIBCXX_DEBUG_ASSERT(_M_path != nullptr);
-    if (_M_path->_M_type == _Type::_Multi)
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_cur != _M_path->_M_cmpts.end());
-	++_M_cur;
-      }
-    else
-      {
-	_GLIBCXX_DEBUG_ASSERT(!_M_at_end);
-	_M_at_end = true;
-      }
-    return *this;
-  }
-
-  inline path::iterator&
-  path::iterator::operator--()
-  {
-    _GLIBCXX_DEBUG_ASSERT(_M_path != nullptr);
-    if (_M_path->_M_type == _Type::_Multi)
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_cur != _M_path->_M_cmpts.begin());
-	--_M_cur;
-      }
-    else
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_at_end);
-	_M_at_end = false;
-      }
-    return *this;
-  }
-
-  inline path::iterator::reference
-  path::iterator::operator*() const
-  {
-    _GLIBCXX_DEBUG_ASSERT(_M_path != nullptr);
-    if (_M_path->_M_type == _Type::_Multi)
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_cur != _M_path->_M_cmpts.end());
-	return *_M_cur;
-      }
-    return *_M_path;
-  }
-
-  inline bool
-  path::iterator::_M_equals(iterator __rhs) const
-  {
-    if (_M_path != __rhs._M_path)
-      return false;
-    if (_M_path == nullptr)
-      return true;
-    if (_M_path->_M_type == path::_Type::_Multi)
-      return _M_cur == __rhs._M_cur;
-    return _M_at_end == __rhs._M_at_end;
-  }
-
-  // @} group filesystem
-_GLIBCXX_END_NAMESPACE_CXX11
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace v1
-} // namespace filesystem
-} // namespace experimental
-} // namespace std
-
-#endif // C++11
-
-#endif // _GLIBCXX_EXPERIMENTAL_FS_PATH_H
diff --git a/openflow/usr/include/c++/5/experimental/functional b/openflow/usr/include/c++/5/experimental/functional
deleted file mode 100644
index 40d3bd4..0000000
--- a/openflow/usr/include/c++/5/experimental/functional
+++ /dev/null
@@ -1,440 +0,0 @@
-// <experimental/functional> -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/functional
- *  This is a TS C++ Library header.
- */
-
-#ifndef _GLIBCXX_EXPERIMENTAL_FUNCTIONAL
-#define _GLIBCXX_EXPERIMENTAL_FUNCTIONAL 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <functional>
-#include <tuple>
-#include <iterator>
-#include <unordered_map>
-#include <vector>
-#include <array>
-#include <bits/stl_algo.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // See C++14 §20.9.9, Function object binders
-
-  /// Variable template for std::is_bind_expression
-  template<typename _Tp>
-    constexpr bool is_bind_expression_v = std::is_bind_expression<_Tp>::value;
-
-  /// Variable template for std::is_placeholder
-  template<typename _Tp>
-    constexpr int is_placeholder_v = std::is_placeholder<_Tp>::value;
-
-#define __cpp_lib_experimental_boyer_moore_searching 201411
-
-  // Searchers
-
-  template<typename _ForwardIterator1, typename _BinaryPredicate = equal_to<>>
-    class default_searcher
-    {
-    public:
-      default_searcher(_ForwardIterator1 __pat_first,
-		       _ForwardIterator1 __pat_last,
-		       _BinaryPredicate __pred = _BinaryPredicate())
-      : _M_m(__pat_first, __pat_last, std::move(__pred))
-      { }
-
-      template<typename _ForwardIterator2>
-	_ForwardIterator2
-	operator()(_ForwardIterator2 __first, _ForwardIterator2 __last) const
-	{
-	  return std::search(__first, __last,
-			     std::get<0>(_M_m), std::get<1>(_M_m),
-			     std::get<2>(_M_m));
-	}
-
-    private:
-      std::tuple<_ForwardIterator1, _ForwardIterator1, _BinaryPredicate> _M_m;
-    };
-
-  template<typename _Key, typename _Tp, typename _Hash, typename _Pred>
-    struct __boyer_moore_map_base
-    {
-      template<typename _RAIter>
-	__boyer_moore_map_base(_RAIter __pat, size_t __patlen,
-			       _Hash&& __hf, _Pred&& __pred)
-	: _M_bad_char{ __patlen, std::move(__hf), std::move(__pred) }
-	{
-	  if (__patlen > 0)
-	    for (__diff_type __i = 0; __i < __patlen - 1; ++__i)
-	      _M_bad_char[__pat[__i]] = __patlen - 1 - __i;
-	}
-
-      using __diff_type = _Tp;
-
-      __diff_type
-      _M_lookup(_Key __key, __diff_type __not_found) const
-      {
-	auto __iter = _M_bad_char.find(__key);
-	if (__iter == _M_bad_char.end())
-	  return __not_found;
-	return __iter->second;
-      }
-
-      _Pred
-      _M_pred() const { return _M_bad_char.key_eq(); }
-
-      std::unordered_map<_Key, _Tp, _Hash, _Pred> _M_bad_char;
-    };
-
-  template<typename _Tp, size_t _Len, typename _Pred>
-    struct __boyer_moore_array_base
-    {
-      template<typename _RAIter, typename _Unused>
-	__boyer_moore_array_base(_RAIter __pat, size_t __patlen,
-				 _Unused&&, _Pred&& __pred)
-	: _M_bad_char{ {}, std::move(__pred) }
-	{
-	  std::get<0>(_M_bad_char).fill(__patlen);
-	  if (__patlen > 0)
-	    for (__diff_type __i = 0; __i < __patlen - 1; ++__i)
-	      {
-		auto __ch = __pat[__i];
-		using _UCh = std::make_unsigned_t<decltype(__ch)>;
-		auto __uch = static_cast<_UCh>(__ch);
-		std::get<0>(_M_bad_char)[__uch] = __patlen - 1 - __i;
-	      }
-	}
-
-      using __diff_type = _Tp;
-
-      template<typename _Key>
-	__diff_type
-	_M_lookup(_Key __key, __diff_type __not_found) const
-	{
-	  auto __ukey = static_cast<std::make_unsigned_t<_Key>>(__key);
-	  if (__ukey >= _Len)
-	    return __not_found;
-	  return std::get<0>(_M_bad_char)[__ukey];
-	}
-
-      const _Pred&
-      _M_pred() const { return std::get<1>(_M_bad_char); }
-
-      std::tuple<std::array<_Tp, _Len>, _Pred> _M_bad_char;
-    };
-
-  template<typename _Pred>
-    struct __is_std_equal_to : std::false_type { };
-
-  template<>
-    struct __is_std_equal_to<std::equal_to<void>> : std::true_type { };
-
-  // Use __boyer_moore_array_base when pattern consists of narrow characters
-  // and uses std::equal_to as the predicate.
-  template<typename _RAIter, typename _Hash, typename _Pred,
-           typename _Val = typename iterator_traits<_RAIter>::value_type,
-	   typename _Diff = typename iterator_traits<_RAIter>::difference_type>
-    using __boyer_moore_base_t
-      = std::conditional_t<sizeof(_Val) == 1 && is_integral<_Val>::value
-			   && __is_std_equal_to<_Pred>::value,
-			   __boyer_moore_array_base<_Diff, 256, _Pred>,
-			   __boyer_moore_map_base<_Val, _Diff, _Hash, _Pred>>;
-
-  template<typename _RAIter, typename _Hash
-	     = std::hash<typename std::iterator_traits<_RAIter>::value_type>,
-	   typename _BinaryPredicate = std::equal_to<>>
-    class boyer_moore_searcher
-    : __boyer_moore_base_t<_RAIter, _Hash, _BinaryPredicate>
-    {
-      using _Base = __boyer_moore_base_t<_RAIter, _Hash, _BinaryPredicate>;
-      using typename _Base::__diff_type;
-
-    public:
-      boyer_moore_searcher(_RAIter __pat_first, _RAIter __pat_last,
-			   _Hash __hf = _Hash(),
-			   _BinaryPredicate __pred = _BinaryPredicate());
-
-      template<typename _RandomAccessIterator2>
-	_RandomAccessIterator2
-	operator()(_RandomAccessIterator2 __first,
-		   _RandomAccessIterator2 __last) const;
-
-    private:
-      bool
-      _M_is_prefix(_RAIter __word, __diff_type __len,
-		   __diff_type __pos)
-      {
-	const auto& __pred = this->_M_pred();
-	__diff_type __suffixlen = __len - __pos;
-	for (__diff_type __i = 0; __i < __suffixlen; ++__i)
-	  if (!__pred(__word[__i], __word[__pos + __i]))
-	    return false;
-	return true;
-      }
-
-      __diff_type
-      _M_suffix_length(_RAIter __word, __diff_type __len,
-		       __diff_type __pos)
-      {
-	const auto& __pred = this->_M_pred();
-	__diff_type __i = 0;
-	while (__pred(__word[__pos - __i], __word[__len - 1 - __i])
-	       && __i < __pos)
-	  {
-	    ++__i;
-	  }
-	return __i;
-      }
-
-      template<typename _Tp>
-	__diff_type
-	_M_bad_char_shift(_Tp __c) const
-	{ return this->_M_lookup(__c, _M_pat_end - _M_pat); }
-
-      _RAIter _M_pat;
-      _RAIter _M_pat_end;
-      std::vector<__diff_type> _M_good_suffix;
-    };
-
-  template<typename _RAIter, typename _Hash
-	     = std::hash<typename std::iterator_traits<_RAIter>::value_type>,
-	   typename _BinaryPredicate = std::equal_to<>>
-    class boyer_moore_horspool_searcher
-    : __boyer_moore_base_t<_RAIter, _Hash, _BinaryPredicate>
-    {
-      using _Base = __boyer_moore_base_t<_RAIter, _Hash, _BinaryPredicate>;
-      using typename _Base::__diff_type;
-
-    public:
-      boyer_moore_horspool_searcher(_RAIter __pat,
-				    _RAIter __pat_end,
-				    _Hash __hf = _Hash(),
-				    _BinaryPredicate __pred
-				    = _BinaryPredicate())
-      : _Base(__pat, __pat_end - __pat, std::move(__hf), std::move(__pred)),
-	_M_pat(__pat), _M_pat_end(__pat_end)
-      { }
-
-      template<typename _RandomAccessIterator2>
-	_RandomAccessIterator2
-	operator()(_RandomAccessIterator2 __first,
-		   _RandomAccessIterator2 __last) const
-	{
-	  const auto& __pred = this->_M_pred();
-	  auto __patlen = _M_pat_end - _M_pat;
-	  if (__patlen == 0)
-	    return __first;
-	  auto __len = __last - __first;
-	  while (__len >= __patlen)
-	    {
-	      for (auto __scan = __patlen - 1;
-		   __pred(__first[__scan], _M_pat[__scan]); --__scan)
-		if (__scan == 0)
-		  return __first;
-	      auto __shift = _M_bad_char_shift(__first[__patlen - 1]);
-	      __len -= __shift;
-	      __first += __shift;
-	    }
-	  return __last;
-	}
-
-    private:
-      template<typename _Tp>
-	__diff_type
-	_M_bad_char_shift(_Tp __c) const
-	{ return this->_M_lookup(__c, _M_pat_end - _M_pat); }
-
-      _RAIter _M_pat;
-      _RAIter _M_pat_end;
-    };
-
-  /// Generator function for default_searcher
-  template<typename _ForwardIterator,
-	   typename _BinaryPredicate = std::equal_to<>>
-    inline default_searcher<_ForwardIterator, _BinaryPredicate>
-    make_default_searcher(_ForwardIterator __pat_first,
-			  _ForwardIterator __pat_last,
-			  _BinaryPredicate __pred = _BinaryPredicate())
-    { return { __pat_first, __pat_last, __pred }; }
-
-  /// Generator function for boyer_moore_searcher
-  template<typename _RAIter, typename _Hash
-	     = std::hash<typename std::iterator_traits<_RAIter>::value_type>,
-	   typename _BinaryPredicate = equal_to<>>
-    inline boyer_moore_searcher<_RAIter, _Hash, _BinaryPredicate>
-    make_boyer_moore_searcher(_RAIter __pat_first, _RAIter __pat_last,
-			      _Hash __hf = _Hash(),
-			      _BinaryPredicate __pred = _BinaryPredicate())
-    { return { __pat_first, __pat_last, std::move(__hf), std::move(__pred) }; }
-
-  /// Generator function for boyer_moore_horspool_searcher
-  template<typename _RAIter, typename _Hash
-	     = std::hash<typename std::iterator_traits<_RAIter>::value_type>,
-	   typename _BinaryPredicate = equal_to<>>
-    inline boyer_moore_horspool_searcher<_RAIter, _Hash, _BinaryPredicate>
-    make_boyer_moore_horspool_searcher(_RAIter __pat_first, _RAIter __pat_last,
-				       _Hash __hf = _Hash(),
-				       _BinaryPredicate __pred
-				       = _BinaryPredicate())
-    { return { __pat_first, __pat_last, std::move(__hf), std::move(__pred) }; }
-
-  template<typename _RAIter, typename _Hash, typename _BinaryPredicate>
-    boyer_moore_searcher<_RAIter, _Hash, _BinaryPredicate>::
-    boyer_moore_searcher(_RAIter __pat, _RAIter __pat_end,
-			 _Hash __hf, _BinaryPredicate __pred)
-    : _Base(__pat, __pat_end - __pat, std::move(__hf), std::move(__pred)),
-      _M_pat(__pat), _M_pat_end(__pat_end), _M_good_suffix(__pat_end - __pat)
-    {
-      auto __patlen = __pat_end - __pat;
-      if (__patlen == 0)
-	return;
-      __diff_type __last_prefix = __patlen - 1;
-      for (__diff_type __p = __patlen - 1; __p >= 0; --__p)
-	{
-	  if (_M_is_prefix(__pat, __patlen, __p + 1))
-	    __last_prefix = __p + 1;
-	  _M_good_suffix[__p] = __last_prefix + (__patlen - 1 - __p);
-	}
-      for (__diff_type __p = 0; __p < __patlen - 1; ++__p)
-	{
-	  auto __slen = _M_suffix_length(__pat, __patlen, __p);
-	  auto __pos = __patlen - 1 - __slen;
-	  if (!__pred(__pat[__p - __slen], __pat[__pos]))
-	    _M_good_suffix[__pos] = __patlen - 1 - __p + __slen;
-	}
-    }
-
-  template<typename _RAIter, typename _Hash, typename _BinaryPredicate>
-  template<typename _RandomAccessIterator2>
-    _RandomAccessIterator2
-    boyer_moore_searcher<_RAIter, _Hash, _BinaryPredicate>::
-    operator()(_RandomAccessIterator2 __first,
-	       _RandomAccessIterator2 __last) const
-    {
-      auto __patlen = _M_pat_end - _M_pat;
-      if (__patlen == 0)
-	return __first;
-      const auto& __pred = this->_M_pred();
-      __diff_type __i = __patlen - 1;
-      auto __stringlen = __last - __first;
-      while (__i < __stringlen)
-	{
-	  __diff_type __j = __patlen - 1;
-	  while (__j >= 0 && __pred(__first[__i], _M_pat[__j]))
-	    {
-	      --__i;
-	      --__j;
-	    }
-	  if (__j < 0)
-	    return __first + __i + 1;
-	  __i += std::max(_M_bad_char_shift(__first[__i]),
-			  _M_good_suffix[__j]);
-	}
-      return __last;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v1
-
-inline namespace fundamentals_v2
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#define __cpp_lib_experimental_not_fn 201406
-
-  /// Generalized negator.
-  template<typename _Fn>
-    class _Not_fn
-    {
-      _Fn _M_fn;
-
-    public:
-      template<typename _Fn2>
-	explicit
-	_Not_fn(_Fn2&& __fn) : _M_fn(std::forward<_Fn2>(__fn)) { }
-
-      _Not_fn(const _Not_fn& __fn) = default;
-      _Not_fn(_Not_fn&& __fn) = default;
-      _Not_fn& operator=(const _Not_fn& __fn) = default;
-      _Not_fn& operator=(_Not_fn&& __fn) = default;
-      ~_Not_fn() = default;
-
-      template<typename... _Args>
-	auto
-	operator()(_Args&&... __args)
-	noexcept(noexcept(!_M_fn(std::forward<_Args>(__args)...)))
-	-> decltype(!_M_fn(std::forward<_Args>(__args)...))
-	{ return !_M_fn(std::forward<_Args>(__args)...); }
-
-      template<typename... _Args>
-	auto
-	operator()(_Args&&... __args) const
-	noexcept(noexcept(!_M_fn(std::forward<_Args>(__args)...)))
-	-> decltype(!_M_fn(std::forward<_Args>(__args)...))
-	{ return !_M_fn(std::forward<_Args>(__args)...); }
-
-      template<typename... _Args>
-	auto
-	operator()(_Args&&... __args) volatile
-	noexcept(noexcept(!_M_fn(std::forward<_Args>(__args)...)))
-	-> decltype(!_M_fn(std::forward<_Args>(__args)...))
-	{ return !_M_fn(std::forward<_Args>(__args)...); }
-
-      template<typename... _Args>
-	auto
-	operator()(_Args&&... __args) const volatile
-	noexcept(noexcept(!_M_fn(std::forward<_Args>(__args)...)))
-	-> decltype(!_M_fn(std::forward<_Args>(__args)...))
-	{ return !_M_fn(std::forward<_Args>(__args)...); }
-    };
-
-  /// [func.not_fn] Function template not_fn
-  template<typename _Fn>
-    inline auto
-    not_fn(_Fn&& __fn)
-    noexcept(std::is_nothrow_constructible<std::decay_t<_Fn>, _Fn&&>::value)
-    {
-      using __maybe_type = _Maybe_wrap_member_pointer<std::decay_t<_Fn>>;
-      return _Not_fn<typename __maybe_type::type>{std::forward<_Fn>(__fn)};
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v2
-} // namespace experimental
-} // namespace std
-
-#endif // C++14
-
-#endif // _GLIBCXX_EXPERIMENTAL_FUNCTIONAL
diff --git a/openflow/usr/include/c++/5/experimental/optional b/openflow/usr/include/c++/5/experimental/optional
deleted file mode 100644
index f6e3fa0..0000000
--- a/openflow/usr/include/c++/5/experimental/optional
+++ /dev/null
@@ -1,864 +0,0 @@
-// <optional> -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/optional
- *  This is a TS C++ Library header.
- */
-
-#ifndef _GLIBCXX_EXPERIMENTAL_OPTIONAL
-#define _GLIBCXX_EXPERIMENTAL_OPTIONAL 1
-
-/**
- * @defgroup experimental Experimental
- *
- * Components specified by various Technical Specifications.
- *
- * As indicated by the std::experimental namespace and the  header paths,
- * the contents of these Technical Specifications are experimental and not
- * part of the C++ standard. As such the interfaces and implementations may
- * change in the future, and there is <STRONG> no guarantee of compatibility
- * between different GCC releases </STRONG> for these features.
- */
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <utility>
-#include <type_traits>
-#include <stdexcept>
-#include <new>
-#include <initializer_list>
-#include <bits/functexcept.h>
-#include <bits/functional_hash.h>
-#include <bits/enable_special_members.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup optional Optional values
-   * @ingroup experimental
-   *
-   * Class template for optional values and surrounding facilities, as
-   * described in n3793 "A proposal to add a utility class to represent
-   * optional objects (Revision 5)".
-   *
-   * @{
-   */
-
-#define __cpp_lib_experimental_optional 201411
-
-  // All subsequent [X.Y.n] references are against n3793.
-
-  // [X.Y.4]
-  template<typename _Tp>
-    class optional;
-
-  // [X.Y.5]
-  /// Tag type for in-place construction.
-  struct in_place_t { };
-
-  /// Tag for in-place construction.
-  constexpr in_place_t in_place { };
-
-  // [X.Y.6]
-  /// Tag type to disengage optional objects.
-  struct nullopt_t
-  {
-    // Do not user-declare default constructor at all for
-    // optional_value = {} syntax to work.
-    // nullopt_t() = delete;
-
-    // Used for constructing nullopt.
-    enum class _Construct { _Token };
-
-    // Must be constexpr for nullopt_t to be literal.
-    explicit constexpr nullopt_t(_Construct) { }
-  };
-
-  // [X.Y.6]
-  /// Tag to disengage optional objects.
-  constexpr nullopt_t nullopt { nullopt_t::_Construct::_Token };
-
-  // [X.Y.7]
-  /**
-   *  @brief Exception class thrown when a disengaged optional object is
-   *  dereferenced.
-   *  @ingroup exceptions
-   */
-  class bad_optional_access : public logic_error
-  {
-  public:
-    bad_optional_access() : logic_error("bad optional access") { }
-
-    // XXX This constructor is non-standard. Should not be inline
-    explicit bad_optional_access(const char* __arg) : logic_error(__arg) { }
-
-    virtual ~bad_optional_access() noexcept = default;
-  };
-
-  void
-  __throw_bad_optional_access(const char*)
-  __attribute__((__noreturn__));
-
-  // XXX Does not belong here.
-  inline void
-  __throw_bad_optional_access(const char* __s)
-  { _GLIBCXX_THROW_OR_ABORT(bad_optional_access(__s)); }
-
-  template<typename _Tp, typename = void>
-    struct _Has_addressof_mem : std::false_type { };
-
-  template<typename _Tp>
-    struct _Has_addressof_mem<_Tp,
-         __void_t<decltype( std::declval<const _Tp&>().operator&() )>
-      >
-    : std::true_type { };
-
-  template<typename _Tp, typename = void>
-    struct _Has_addressof_free : std::false_type { };
-
-  template<typename _Tp>
-    struct _Has_addressof_free<_Tp,
-         __void_t<decltype( operator&(std::declval<const _Tp&>()) )>
-      >
-    : std::true_type { };
-
-  /**
-    * @brief Trait that detects the presence of an overloaded unary operator&.
-    *
-    * Practically speaking this detects the presence of such an operator when
-    * called on a const-qualified lvalue (i.e.
-    * declval<_Tp * const&>().operator&()).
-    */
-  template<typename _Tp>
-    struct _Has_addressof
-    : std::__or_<_Has_addressof_mem<_Tp>, _Has_addressof_free<_Tp>>::type
-    { };
-
-  /**
-    * @brief An overload that attempts to take the address of an lvalue as a
-    * constant expression. Falls back to __addressof in the presence of an
-    * overloaded addressof operator (unary operator&), in which case the call
-    * will not be a constant expression.
-    */
-  template<typename _Tp, enable_if_t<!_Has_addressof<_Tp>::value, int>...>
-    constexpr _Tp* __constexpr_addressof(_Tp& __t)
-    { return &__t; }
-
-  /**
-    * @brief Fallback overload that defers to __addressof.
-    */
-  template<typename _Tp, enable_if_t<_Has_addressof<_Tp>::value, int>...>
-    inline _Tp* __constexpr_addressof(_Tp& __t)
-    { return std::__addressof(__t); }
-
-  /**
-    * @brief Class template that holds the necessary state for @ref optional
-    * and that has the responsibility for construction and the special members.
-    *
-    * Such a separate base class template is necessary in order to
-    * conditionally enable the special members (e.g. copy/move constructors).
-    * Note that this means that @ref _Optional_base implements the
-    * functionality for copy and move assignment, but not for converting
-    * assignment.
-    *
-    * @see optional, _Enable_special_members
-    */
-  template<typename _Tp, bool _ShouldProvideDestructor =
-	   !is_trivially_destructible<_Tp>::value>
-    class _Optional_base
-    {
-    private:
-      // Remove const to avoid prohibition of reusing object storage for
-      // const-qualified types in [3.8/9]. This is strictly internal
-      // and even optional itself is oblivious to it.
-      using _Stored_type = remove_const_t<_Tp>;
-
-    public:
-      // [X.Y.4.1] Constructors.
-
-      // Constructors for disengaged optionals.
-      constexpr _Optional_base() noexcept
-      : _M_empty{} { }
-
-      constexpr _Optional_base(nullopt_t) noexcept
-      : _Optional_base{} { }
-
-      // Constructors for engaged optionals.
-      constexpr _Optional_base(const _Tp& __t)
-      : _M_payload(__t), _M_engaged(true) { }
-
-      constexpr _Optional_base(_Tp&& __t)
-      : _M_payload(std::move(__t)), _M_engaged(true) { }
-
-      template<typename... _Args>
-        constexpr explicit _Optional_base(in_place_t, _Args&&... __args)
-        : _M_payload(std::forward<_Args>(__args)...), _M_engaged(true) { }
-
-      template<typename _Up, typename... _Args,
-               enable_if_t<is_constructible<_Tp,
-                                            initializer_list<_Up>&,
-                                            _Args&&...>::value,
-                           int>...>
-        constexpr explicit _Optional_base(in_place_t,
-                                          initializer_list<_Up> __il,
-                                          _Args&&... __args)
-        : _M_payload(__il, std::forward<_Args>(__args)...),
-          _M_engaged(true) { }
-
-      // Copy and move constructors.
-      _Optional_base(const _Optional_base& __other)
-      {
-        if (__other._M_engaged)
-          this->_M_construct(__other._M_get());
-      }
-
-      _Optional_base(_Optional_base&& __other)
-      noexcept(is_nothrow_move_constructible<_Tp>())
-      {
-        if (__other._M_engaged)
-          this->_M_construct(std::move(__other._M_get()));
-      }
-
-      // [X.Y.4.3] (partly) Assignment.
-      _Optional_base&
-      operator=(const _Optional_base& __other)
-      {
-        if (this->_M_engaged && __other._M_engaged)
-          this->_M_get() = __other._M_get();
-        else
-	  {
-	    if (__other._M_engaged)
-	      this->_M_construct(__other._M_get());
-	    else
-	      this->_M_reset();
-	  }
-
-        return *this;
-      }
-
-      _Optional_base&
-      operator=(_Optional_base&& __other)
-      noexcept(__and_<is_nothrow_move_constructible<_Tp>,
-		      is_nothrow_move_assignable<_Tp>>())
-      {
-	if (this->_M_engaged && __other._M_engaged)
-	  this->_M_get() = std::move(__other._M_get());
-	else
-	  {
-	    if (__other._M_engaged)
-	      this->_M_construct(std::move(__other._M_get()));
-	    else
-	      this->_M_reset();
-	  }
-	return *this;
-      }
-
-      // [X.Y.4.2] Destructor.
-      ~_Optional_base()
-      {
-        if (this->_M_engaged)
-          this->_M_payload.~_Stored_type();
-      }
-
-      // The following functionality is also needed by optional, hence the
-      // protected accessibility.
-    protected:
-      constexpr bool _M_is_engaged() const noexcept
-      { return this->_M_engaged; }
-
-      // The _M_get operations have _M_engaged as a precondition.
-      constexpr _Tp&
-      _M_get() noexcept
-      { return _M_payload; }
-
-      constexpr const _Tp&
-      _M_get() const noexcept
-      { return _M_payload; }
-
-      // The _M_construct operation has !_M_engaged as a precondition
-      // while _M_destruct has _M_engaged as a precondition.
-      template<typename... _Args>
-        void
-        _M_construct(_Args&&... __args)
-        noexcept(is_nothrow_constructible<_Stored_type, _Args...>())
-        {
-          ::new (std::__addressof(this->_M_payload))
-            _Stored_type(std::forward<_Args>(__args)...);
-          this->_M_engaged = true;
-        }
-
-      void
-      _M_destruct()
-      {
-        this->_M_engaged = false;
-        this->_M_payload.~_Stored_type();
-      }
-
-      // _M_reset is a 'safe' operation with no precondition.
-      void
-      _M_reset()
-      {
-        if (this->_M_engaged)
-          this->_M_destruct();
-      }
-
-    private:
-      struct _Empty_byte { };
-      union {
-          _Empty_byte _M_empty;
-          _Stored_type _M_payload;
-      };
-      bool _M_engaged = false;
-    };
-
-  /// Partial specialization that is exactly identical to the primary template
-  /// save for not providing a destructor, to fulfill triviality requirements.
-  template<typename _Tp>
-    class _Optional_base<_Tp, false>
-    {
-    private:
-      using _Stored_type = remove_const_t<_Tp>;
-
-    public:
-      constexpr _Optional_base() noexcept
-      : _M_empty{} { }
-
-      constexpr _Optional_base(nullopt_t) noexcept
-      : _Optional_base{} { }
-
-      constexpr _Optional_base(const _Tp& __t)
-      : _M_payload(__t), _M_engaged(true) { }
-
-      constexpr _Optional_base(_Tp&& __t)
-      : _M_payload(std::move(__t)), _M_engaged(true) { }
-
-      template<typename... _Args>
-        constexpr explicit _Optional_base(in_place_t, _Args&&... __args)
-        : _M_payload(std::forward<_Args>(__args)...), _M_engaged(true) { }
-
-      template<typename _Up, typename... _Args,
-               enable_if_t<is_constructible<_Tp,
-                                            initializer_list<_Up>&,
-                                            _Args&&...>::value,
-			   int>...>
-        constexpr explicit _Optional_base(in_place_t,
-                                          initializer_list<_Up> __il,
-                                          _Args&&... __args)
-        : _M_payload(__il, std::forward<_Args>(__args)...),
-          _M_engaged(true) { }
-
-      _Optional_base(const _Optional_base& __other)
-      {
-        if (__other._M_engaged)
-          this->_M_construct(__other._M_get());
-      }
-
-      _Optional_base(_Optional_base&& __other)
-      noexcept(is_nothrow_move_constructible<_Tp>())
-      {
-        if (__other._M_engaged)
-          this->_M_construct(std::move(__other._M_get()));
-      }
-
-      _Optional_base&
-      operator=(const _Optional_base& __other)
-      {
-	if (this->_M_engaged && __other._M_engaged)
-	  this->_M_get() = __other._M_get();
-	else
-	  {
-	    if (__other._M_engaged)
-	      this->_M_construct(__other._M_get());
-	    else
-	      this->_M_reset();
-	  }
-	return *this;
-      }
-
-      _Optional_base&
-      operator=(_Optional_base&& __other)
-      noexcept(__and_<is_nothrow_move_constructible<_Tp>,
-		      is_nothrow_move_assignable<_Tp>>())
-      {
-	if (this->_M_engaged && __other._M_engaged)
-	  this->_M_get() = std::move(__other._M_get());
-	else
-	  {
-	    if (__other._M_engaged)
-	      this->_M_construct(std::move(__other._M_get()));
-	    else
-	      this->_M_reset();
-	  }
-	return *this;
-      }
-
-      // Sole difference
-      // ~_Optional_base() noexcept = default;
-
-    protected:
-      constexpr bool _M_is_engaged() const noexcept
-      { return this->_M_engaged; }
-
-      _Tp&
-      _M_get() noexcept
-      { return _M_payload; }
-
-      constexpr const _Tp&
-      _M_get() const noexcept
-      { return _M_payload; }
-
-      template<typename... _Args>
-        void
-        _M_construct(_Args&&... __args)
-        noexcept(is_nothrow_constructible<_Stored_type, _Args...>())
-        {
-          ::new (std::__addressof(this->_M_payload))
-            _Stored_type(std::forward<_Args>(__args)...);
-          this->_M_engaged = true;
-        }
-
-      void
-      _M_destruct()
-      {
-        this->_M_engaged = false;
-        this->_M_payload.~_Stored_type();
-      }
-
-      void
-      _M_reset()
-      {
-        if (this->_M_engaged)
-          this->_M_destruct();
-      }
-
-    private:
-      struct _Empty_byte { };
-      union
-      {
-	_Empty_byte _M_empty;
-	_Stored_type _M_payload;
-      };
-      bool _M_engaged = false;
-    };
-
-  /**
-    * @brief Class template for optional values.
-    */
-  template<typename _Tp>
-    class optional
-    : private _Optional_base<_Tp>,
-      private _Enable_copy_move<
-        // Copy constructor.
-        is_copy_constructible<_Tp>::value,
-        // Copy assignment.
-        __and_<is_copy_constructible<_Tp>, is_copy_assignable<_Tp>>::value,
-        // Move constructor.
-        is_move_constructible<_Tp>::value,
-        // Move assignment.
-        __and_<is_move_constructible<_Tp>, is_move_assignable<_Tp>>::value,
-        // Unique tag type.
-        optional<_Tp>>
-    {
-      static_assert(__and_<__not_<is_same<remove_cv_t<_Tp>, nullopt_t>>,
-			   __not_<is_same<remove_cv_t<_Tp>, in_place_t>>,
-			   __not_<is_reference<_Tp>>>(),
-                    "Invalid instantiation of optional<T>");
-
-    private:
-      using _Base = _Optional_base<_Tp>;
-
-    public:
-      using value_type = _Tp;
-
-      // _Optional_base has the responsibility for construction.
-      using _Base::_Base;
-
-      // [X.Y.4.3] (partly) Assignment.
-      optional&
-      operator=(nullopt_t) noexcept
-      {
-        this->_M_reset();
-        return *this;
-      }
-
-      template<typename _Up>
-        enable_if_t<is_same<_Tp, decay_t<_Up>>::value, optional&>
-        operator=(_Up&& __u)
-        {
-          static_assert(__and_<is_constructible<_Tp, _Up>,
-			       is_assignable<_Tp&, _Up>>(),
-                        "Cannot assign to value type from argument");
-
-          if (this->_M_is_engaged())
-            this->_M_get() = std::forward<_Up>(__u);
-          else
-            this->_M_construct(std::forward<_Up>(__u));
-
-          return *this;
-        }
-
-      template<typename... _Args>
-	void
-	emplace(_Args&&... __args)
-	{
-	  static_assert(is_constructible<_Tp, _Args&&...>(),
-			"Cannot emplace value type from arguments");
-
-	  this->_M_reset();
-	  this->_M_construct(std::forward<_Args>(__args)...);
-	}
-
-      template<typename _Up, typename... _Args>
-        enable_if_t<is_constructible<_Tp, initializer_list<_Up>&,
-				     _Args&&...>::value>
-	emplace(initializer_list<_Up> __il, _Args&&... __args)
-	{
-	  this->_M_reset();
-	  this->_M_construct(__il, std::forward<_Args>(__args)...);
-	}
-
-      // [X.Y.4.2] Destructor is implicit, implemented in _Optional_base.
-
-      // [X.Y.4.4] Swap.
-      void
-      swap(optional& __other)
-      noexcept(is_nothrow_move_constructible<_Tp>()
-               && noexcept(swap(declval<_Tp&>(), declval<_Tp&>())))
-      {
-        using std::swap;
-
-        if (this->_M_is_engaged() && __other._M_is_engaged())
-          swap(this->_M_get(), __other._M_get());
-        else if (this->_M_is_engaged())
-	  {
-	    __other._M_construct(std::move(this->_M_get()));
-	    this->_M_destruct();
-	  }
-        else if (__other._M_is_engaged())
-	  {
-	    this->_M_construct(std::move(__other._M_get()));
-	    __other._M_destruct();
-	  }
-      }
-
-      // [X.Y.4.5] Observers.
-      constexpr const _Tp*
-      operator->() const
-      { return __constexpr_addressof(this->_M_get()); }
-
-      _Tp*
-      operator->()
-      { return std::__addressof(this->_M_get()); }
-
-      constexpr const _Tp&
-      operator*() const&
-      { return this->_M_get(); }
-
-      constexpr _Tp&
-      operator*()&
-      { return this->_M_get(); }
-
-      constexpr _Tp&&
-      operator*()&&
-      { return std::move(this->_M_get()); }
-
-      constexpr const _Tp&&
-      operator*() const&&
-      { return std::move(this->_M_get()); }
-
-      constexpr explicit operator bool() const noexcept
-      { return this->_M_is_engaged(); }
-
-      constexpr const _Tp&
-      value() const&
-      {
-	return this->_M_is_engaged()
-	  ?  this->_M_get()
-	  : (__throw_bad_optional_access("Attempt to access value of a "
-		                         "disengaged optional object"),
-	     this->_M_get());
-      }
-
-      constexpr _Tp&
-      value()&
-      {
-	return this->_M_is_engaged()
-	  ?  this->_M_get()
-	  : (__throw_bad_optional_access("Attempt to access value of a "
-		                         "disengaged optional object"),
-	     this->_M_get());
-      }
-
-      constexpr _Tp&&
-      value()&&
-      {
-	return this->_M_is_engaged()
-	  ?  std::move(this->_M_get())
-	  : (__throw_bad_optional_access("Attempt to access value of a "
-		                         "disengaged optional object"),
-	     std::move(this->_M_get()));
-      }
-
-      constexpr const _Tp&&
-      value() const&&
-      {
-	return this->_M_is_engaged()
-	  ?  std::move(this->_M_get())
-	  : (__throw_bad_optional_access("Attempt to access value of a "
-		                         "disengaged optional object"),
-	     std::move(this->_M_get()));
-      }
-
-      template<typename _Up>
-	constexpr _Tp
-	value_or(_Up&& __u) const&
-	{
-	  static_assert(__and_<is_copy_constructible<_Tp>,
-			       is_convertible<_Up&&, _Tp>>(),
-			"Cannot return value");
-
-	  return this->_M_is_engaged()
-	    ? this->_M_get()
-	    : static_cast<_Tp>(std::forward<_Up>(__u));
-	}
-
-      template<typename _Up>
-	_Tp
-	value_or(_Up&& __u) &&
-	{
-	  static_assert(__and_<is_move_constructible<_Tp>,
-			       is_convertible<_Up&&, _Tp>>(),
-			"Cannot return value" );
-
-	  return this->_M_is_engaged()
-	    ? std::move(this->_M_get())
-	    : static_cast<_Tp>(std::forward<_Up>(__u));
-	}
-    };
-
-  // [X.Y.8] Comparisons between optional values.
-  template<typename _Tp>
-    constexpr bool
-    operator==(const optional<_Tp>& __lhs, const optional<_Tp>& __rhs)
-    {
-      return static_cast<bool>(__lhs) == static_cast<bool>(__rhs)
-	     && (!__lhs || *__lhs == *__rhs);
-    }
-
-  template<typename _Tp>
-    constexpr bool
-    operator!=(const optional<_Tp>& __lhs, const optional<_Tp>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator<(const optional<_Tp>& __lhs, const optional<_Tp>& __rhs)
-    {
-      return static_cast<bool>(__rhs) && (!__lhs || *__lhs < *__rhs);
-    }
-
-  template<typename _Tp>
-    constexpr bool
-    operator>(const optional<_Tp>& __lhs, const optional<_Tp>& __rhs)
-    { return __rhs < __lhs; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator<=(const optional<_Tp>& __lhs, const optional<_Tp>& __rhs)
-    { return !(__rhs < __lhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator>=(const optional<_Tp>& __lhs, const optional<_Tp>& __rhs)
-    { return !(__lhs < __rhs); }
-
-  // [X.Y.9] Comparisons with nullopt.
-  template<typename _Tp>
-    constexpr bool
-    operator==(const optional<_Tp>& __lhs, nullopt_t) noexcept
-    { return !__lhs; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator==(nullopt_t, const optional<_Tp>& __rhs) noexcept
-    { return !__rhs; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator!=(const optional<_Tp>& __lhs, nullopt_t) noexcept
-    { return static_cast<bool>(__lhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator!=(nullopt_t, const optional<_Tp>& __rhs) noexcept
-    { return static_cast<bool>(__rhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator<(const optional<_Tp>& /* __lhs */, nullopt_t) noexcept
-    { return false; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator<(nullopt_t, const optional<_Tp>& __rhs) noexcept
-    { return static_cast<bool>(__rhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator>(const optional<_Tp>& __lhs, nullopt_t) noexcept
-    { return static_cast<bool>(__lhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator>(nullopt_t, const optional<_Tp>& /* __rhs */) noexcept
-    { return false; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator<=(const optional<_Tp>& __lhs, nullopt_t) noexcept
-    { return !__lhs; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator<=(nullopt_t, const optional<_Tp>& /* __rhs */) noexcept
-    { return true; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator>=(const optional<_Tp>& /* __lhs */, nullopt_t) noexcept
-    { return true; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator>=(nullopt_t, const optional<_Tp>& __rhs) noexcept
-    { return !__rhs; }
-
-  // [X.Y.10] Comparisons with value type.
-  template<typename _Tp>
-    constexpr bool
-    operator==(const optional<_Tp>& __lhs, const _Tp& __rhs)
-    { return __lhs && *__lhs == __rhs; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator==(const _Tp& __lhs, const optional<_Tp>& __rhs)
-    { return __rhs && __lhs == *__rhs; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator!=(const optional<_Tp>& __lhs, _Tp const& __rhs)
-    { return !__lhs || !(*__lhs == __rhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator!=(const _Tp& __lhs, const optional<_Tp>& __rhs)
-    { return !__rhs || !(__lhs == *__rhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator<(const optional<_Tp>& __lhs, const _Tp& __rhs)
-    { return !__lhs || *__lhs < __rhs; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator<(const _Tp& __lhs, const optional<_Tp>& __rhs)
-    { return __rhs && __lhs < *__rhs; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator>(const optional<_Tp>& __lhs, const _Tp& __rhs)
-    { return __lhs && __rhs < *__lhs; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator>(const _Tp& __lhs, const optional<_Tp>& __rhs)
-    { return !__rhs || *__rhs < __lhs; }
-
-  template<typename _Tp>
-    constexpr bool
-    operator<=(const optional<_Tp>& __lhs, const _Tp& __rhs)
-    { return !__lhs || !(__rhs < *__lhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator<=(const _Tp& __lhs, const optional<_Tp>& __rhs)
-    { return __rhs && !(*__rhs < __lhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator>=(const optional<_Tp>& __lhs, const _Tp& __rhs)
-    { return __lhs && !(*__lhs < __rhs); }
-
-  template<typename _Tp>
-    constexpr bool
-    operator>=(const _Tp& __lhs, const optional<_Tp>& __rhs)
-    { return !__rhs || !(__lhs < *__rhs); }
-
-  // [X.Y.11]
-  template<typename _Tp>
-    inline void
-    swap(optional<_Tp>& __lhs, optional<_Tp>& __rhs)
-    noexcept(noexcept(__lhs.swap(__rhs)))
-    { __lhs.swap(__rhs); }
-
-  template<typename _Tp>
-    constexpr optional<decay_t<_Tp>>
-    make_optional(_Tp&& __t)
-    { return optional<decay_t<_Tp>> { std::forward<_Tp>(__t) }; }
-
-  // @} group optional
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v1
-}
-
-  // [X.Y.12]
-  template<typename _Tp>
-    struct hash<experimental::optional<_Tp>>
-    {
-      using result_type = size_t;
-      using argument_type = experimental::optional<_Tp>;
-
-      size_t
-      operator()(const experimental::optional<_Tp>& __t) const
-      noexcept(noexcept(hash<_Tp> {}(*__t)))
-      {
-        // We pick an arbitrary hash for disengaged optionals which hopefully
-        // usual values of _Tp won't typically hash to.
-        constexpr size_t __magic_disengaged_hash = static_cast<size_t>(-3333);
-        return __t ? hash<_Tp> {}(*__t) : __magic_disengaged_hash;
-      }
-    };
-}
-
-#endif // C++14
-
-#endif // _GLIBCXX_EXPERIMENTAL_OPTIONAL
diff --git a/openflow/usr/include/c++/5/experimental/ratio b/openflow/usr/include/c++/5/experimental/ratio
deleted file mode 100644
index a009dea..0000000
--- a/openflow/usr/include/c++/5/experimental/ratio
+++ /dev/null
@@ -1,73 +0,0 @@
-// Variable Templates For ratio -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/ratio
- *  This is a TS C++ Library header.
- */
-
-//
-// N3932 Variable Templates For Type Traits (Revision 1)
-//
-
-#ifndef _GLIBCXX_EXPERIMENTAL_RATIO
-#define _GLIBCXX_EXPERIMENTAL_RATIO 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <ratio>
-
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-// See C++14 §20.11.5, ratio comparison
-template <typename _R1, typename _R2>
-  constexpr bool ratio_equal_v = ratio_equal<_R1, _R2>::value;
-template <typename _R1, typename _R2>
-  constexpr bool ratio_not_equal_v = ratio_not_equal<_R1, _R2>::value;
-template <typename _R1, typename _R2>
-  constexpr bool ratio_less_v = ratio_less<_R1, _R2>::value;
-template <typename _R1, typename _R2>
-  constexpr bool ratio_less_equal_v = ratio_less_equal<_R1, _R2>::value;
-template <typename _R1, typename _R2>
-  constexpr bool ratio_greater_v = ratio_greater<_R1, _R2>::value;
-template <typename _R1, typename _R2>
-  constexpr bool ratio_greater_equal_v = ratio_greater_equal<_R1, _R2>::value;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v1
-} // namespace experimental
-} // namespace std
-
-#endif // __cplusplus <= 201103L
-
-#endif // _GLIBCXX_EXPERIMENTAL_RATIO
diff --git a/openflow/usr/include/c++/5/experimental/string_view b/openflow/usr/include/c++/5/experimental/string_view
deleted file mode 100644
index f11a187..0000000
--- a/openflow/usr/include/c++/5/experimental/string_view
+++ /dev/null
@@ -1,693 +0,0 @@
-// Components for manipulating non-owning sequences of characters -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/string_view
- *  This is a TS C++ Library header.
- */
-
-//
-// N3762 basic_string_view library
-//
-
-#ifndef _GLIBCXX_EXPERIMENTAL_STRING_VIEW
-#define _GLIBCXX_EXPERIMENTAL_STRING_VIEW 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <string>
-#include <limits>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#define __cpp_lib_experimental_string_view 201411
-
-  /**
-   *  @class basic_string_view <experimental/string_view>
-   *  @brief  A non-owning reference to a string.
-   *
-   *  @ingroup strings
-   *  @ingroup sequences
-   *  @ingroup experimental
-   *
-   *  @tparam _CharT  Type of character
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *
-   *  A basic_string_view looks like this:
-   *
-   *  @code
-   *    _CharT*    _M_str
-   *    size_t     _M_len
-   *  @endcode
-   */
-  template<typename _CharT, typename _Traits = std::char_traits<_CharT>>
-    class basic_string_view
-    {
-    public:
-
-      // types
-      using traits_type = _Traits;
-      using value_type = _CharT;
-      using pointer = const _CharT*;
-      using const_pointer = const _CharT*;
-      using reference = const _CharT&;
-      using const_reference = const _CharT&;
-      using const_iterator = const _CharT*;
-      using iterator = const_iterator;
-      using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-      using reverse_iterator = const_reverse_iterator;
-      using size_type = size_t;
-      using difference_type = ptrdiff_t;
-      static constexpr size_type npos = size_type(-1);
-
-      // [string.view.cons], construct/copy
-
-      constexpr
-      basic_string_view() noexcept
-      : _M_len{0}, _M_str{nullptr}
-      { }
-
-      constexpr basic_string_view(const basic_string_view&) noexcept = default;
-
-      template<typename _Allocator>
-        basic_string_view(const basic_string<_CharT, _Traits,
-			  _Allocator>& __str) noexcept
-        : _M_len{__str.length()}, _M_str{__str.data()}
-        { }
-
-      constexpr basic_string_view(const _CharT* __str)
-      : _M_len{__str == nullptr ? 0 : traits_type::length(__str)},
-	_M_str{__str}
-      { }
-
-      constexpr basic_string_view(const _CharT* __str, size_type __len)
-      : _M_len{__len},
-        _M_str{__str}
-      { }
-
-      basic_string_view&
-      operator=(const basic_string_view&) noexcept = default;
-
-      // [string.view.iterators], iterators
-
-      constexpr const_iterator
-      begin() const noexcept
-      { return this->_M_str; }
-
-      constexpr const_iterator
-      end() const noexcept
-      { return this->_M_str + this->_M_len; }
-
-      constexpr const_iterator
-      cbegin() const noexcept
-      { return this->_M_str; }
-
-      constexpr const_iterator
-      cend() const noexcept
-      { return this->_M_str + this->_M_len; }
-
-      const_reverse_iterator
-      rbegin() const noexcept
-      { return const_reverse_iterator(this->end()); }
-
-      const_reverse_iterator
-      rend() const noexcept
-      { return const_reverse_iterator(this->begin()); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(this->end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(this->begin()); }
-
-      // [string.view.capacity], capacity
-
-      constexpr size_type
-      size() const noexcept
-      { return this->_M_len; }
-
-      constexpr size_type
-      length() const noexcept
-      { return _M_len; }
-
-      constexpr size_type
-      max_size() const noexcept
-      {
-	return (npos - sizeof(size_type) - sizeof(void*))
-		/ sizeof(value_type) / 4;
-      }
-
-      constexpr bool
-      empty() const noexcept
-      { return this->_M_len == 0; }
-
-      // [string.view.access], element access
-
-      constexpr const _CharT&
-      operator[](size_type __pos) const
-      {
-	// TODO: Assert to restore in a way compatible with the constexpr.
-	// _GLIBCXX_DEBUG_ASSERT(__pos < this->_M_len);
-	return *(this->_M_str + __pos);
-      }
-
-      constexpr const _CharT&
-      at(size_type __pos) const
-      {
-	return __pos < this->_M_len
-	     ? *(this->_M_str + __pos)
-	     : (__throw_out_of_range_fmt(__N("basic_string_view::at: __pos "
-					     "(which is %zu) >= this->size() "
-					     "(which is %zu)"),
-					 __pos, this->size()),
-		*this->_M_str);
-      }
-
-      constexpr const _CharT&
-      front() const
-      {
-	// TODO: Assert to restore in a way compatible with the constexpr.
-	// _GLIBCXX_DEBUG_ASSERT(this->_M_len > 0);
-	return *this->_M_str;
-      }
-
-      constexpr const _CharT&
-      back() const
-      {
-	// TODO: Assert to restore in a way compatible with the constexpr.
-	// _GLIBCXX_DEBUG_ASSERT(this->_M_len > 0);
-	return *(this->_M_str + this->_M_len - 1);
-      }
-
-      constexpr const _CharT*
-      data() const noexcept
-      { return this->_M_str; }
-
-      // [string.view.modifiers], modifiers:
-
-      void
-      remove_prefix(size_type __n)
-      {
-	_GLIBCXX_DEBUG_ASSERT(this->_M_len >= __n);
-	this->_M_str += __n;
-	this->_M_len -= __n;
-      }
-
-      void
-      remove_suffix(size_type __n)
-      { this->_M_len -= __n; }
-
-      void
-      swap(basic_string_view& __sv) noexcept
-      {
-	std::swap(this->_M_len, __sv._M_len);
-	std::swap(this->_M_str, __sv._M_str);
-      }
-
-
-      // [string.view.ops], string operations:
-
-      template<typename _Allocator>
-        explicit operator basic_string<_CharT, _Traits, _Allocator>() const
-        {
-	  return { this->_M_str, this->_M_len };
-	}
-
-      template<typename _Allocator = std::allocator<_CharT>>
-	basic_string<_CharT, _Traits, _Allocator>
-	to_string(const _Allocator& __alloc = _Allocator()) const
-	{
-	  return { this->_M_str, this->_M_len, __alloc };
-	}
-
-      size_type
-      copy(_CharT* __str, size_type __n, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string_len(__str, __n);
-	if (__pos > this->_M_len)
-	  __throw_out_of_range_fmt(__N("basic_string_view::copy: __pos "
-				       "(which is %zu) > this->size() "
-				       "(which is %zu)"),
-				   __pos, this->size());
-	size_type __rlen{std::min(__n, size_type{this->_M_len  - __pos})};
-	for (auto __begin = this->_M_str + __pos,
-	     __end = __begin + __rlen; __begin != __end;)
-	  *__str++ = *__begin++;
-	return __rlen;
-      }
-
-
-      // [string.view.ops], string operations:
-
-      constexpr basic_string_view
-      substr(size_type __pos, size_type __n=npos) const
-      {
-	return __pos <= this->_M_len
-	     ? basic_string_view{this->_M_str + __pos,
-				std::min(__n, size_type{this->_M_len  - __pos})}
-	     : (__throw_out_of_range_fmt(__N("basic_string_view::substr: __pos "
-					     "(which is %zu) > this->size() "
-					     "(which is %zu)"),
-				     __pos, this->size()), basic_string_view{});
-      }
-
-      int
-      compare(basic_string_view __str) const noexcept
-      {
-	int __ret = traits_type::compare(this->_M_str, __str._M_str,
-					 std::min(this->_M_len, __str._M_len));
-	if (__ret == 0)
-	  __ret = _S_compare(this->_M_len, __str._M_len);
-	return __ret;
-      }
-
-      int
-      compare(size_type __pos1, size_type __n1, basic_string_view __str) const
-      { return this->substr(__pos1, __n1).compare(__str); }
-
-      int
-      compare(size_type __pos1, size_type __n1,
-	      basic_string_view __str, size_type __pos2, size_type __n2) const
-      { return this->substr(__pos1, __n1).compare(__str.substr(__pos2, __n2)); }
-
-      int
-      compare(const _CharT* __str) const noexcept
-      { return this->compare(basic_string_view{__str}); }
-
-      int
-      compare(size_type __pos1, size_type __n1, const _CharT* __str) const
-      { return this->substr(__pos1, __n1).compare(basic_string_view{__str}); }
-
-      int
-      compare(size_type __pos1, size_type __n1,
-	      const _CharT* __str, size_type __n2) const
-      {
-	return this->substr(__pos1, __n1)
-		   .compare(basic_string_view(__str, __n2));
-      }
-
-      size_type
-      find(basic_string_view __str, size_type __pos = 0) const noexcept
-      { return this->find(__str._M_str, __pos, __str._M_len); }
-
-      size_type
-      find(_CharT __c, size_type __pos=0) const noexcept;
-
-      size_type
-      find(const _CharT* __str, size_type __pos, size_type __n) const noexcept;
-
-      size_type
-      find(const _CharT* __str, size_type __pos=0) const noexcept
-      { return this->find(__str, __pos, traits_type::length(__str)); }
-
-      size_type
-      rfind(basic_string_view __str, size_type __pos = npos) const noexcept
-      { return this->rfind(__str._M_str, __pos, __str._M_len); }
-
-      size_type
-      rfind(_CharT __c, size_type __pos = npos) const noexcept;
-
-      size_type
-      rfind(const _CharT* __str, size_type __pos, size_type __n) const noexcept;
-
-      size_type
-      rfind(const _CharT* __str, size_type __pos = npos) const noexcept
-      { return this->rfind(__str, __pos, traits_type::length(__str)); }
-
-      size_type
-      find_first_of(basic_string_view __str, size_type __pos = 0) const noexcept
-      { return this->find_first_of(__str._M_str, __pos, __str._M_len); }
-
-      size_type
-      find_first_of(_CharT __c, size_type __pos = 0) const noexcept
-      { return this->find(__c, __pos); }
-
-      size_type
-      find_first_of(const _CharT* __str, size_type __pos, size_type __n) const;
-
-      size_type
-      find_first_of(const _CharT* __str, size_type __pos = 0) const noexcept
-      { return this->find_first_of(__str, __pos, traits_type::length(__str)); }
-
-      size_type
-      find_last_of(basic_string_view __str,
-		   size_type __pos = npos) const noexcept
-      { return this->find_last_of(__str._M_str, __pos, __str._M_len); }
-
-      size_type
-      find_last_of(_CharT __c, size_type __pos=npos) const noexcept
-      { return this->rfind(__c, __pos); }
-
-      size_type
-      find_last_of(const _CharT* __str, size_type __pos, size_type __n) const;
-
-      size_type
-      find_last_of(const _CharT* __str, size_type __pos = npos) const noexcept
-      { return this->find_last_of(__str, __pos, traits_type::length(__str)); }
-
-      size_type
-      find_first_not_of(basic_string_view __str,
-			size_type __pos = 0) const noexcept
-      { return this->find_first_not_of(__str._M_str, __pos, __str._M_len); }
-
-      size_type
-      find_first_not_of(_CharT __c, size_type __pos = 0) const noexcept;
-
-      size_type
-      find_first_not_of(const _CharT* __str,
-			size_type __pos, size_type __n) const;
-
-      size_type
-      find_first_not_of(const _CharT* __str, size_type __pos = 0) const noexcept
-      {
-	return this->find_first_not_of(__str, __pos,
-				       traits_type::length(__str));
-      }
-
-      size_type
-      find_last_not_of(basic_string_view __str,
-		       size_type __pos = npos) const noexcept
-      { return this->find_last_not_of(__str._M_str, __pos, __str._M_len); }
-
-      size_type
-      find_last_not_of(_CharT __c, size_type __pos = npos) const noexcept;
-
-      size_type
-      find_last_not_of(const _CharT* __str,
-		       size_type __pos, size_type __n) const;
-
-      size_type
-      find_last_not_of(const _CharT* __str,
-		       size_type __pos = npos) const noexcept
-      {
-	return this->find_last_not_of(__str, __pos,
-				      traits_type::length(__str));
-      }
-
-    private:
-
-      static constexpr const int
-      _S_compare(size_type __n1, size_type __n2) noexcept
-      {
-	return difference_type{__n1 - __n2} > std::numeric_limits<int>::max()
-	     ? std::numeric_limits<int>::max()
-	     : difference_type{__n1 - __n2} < std::numeric_limits<int>::min()
-	     ? std::numeric_limits<int>::min()
-	     : static_cast<int>(difference_type{__n1 - __n2});
-      }
-
-      size_t	    _M_len;
-      const _CharT* _M_str;
-    };
-
-
-  // [string.view.comparison], non-member basic_string_view comparison functions
-
-  namespace __detail
-  {
-    //  Identity transform to make ADL work with just one argument.
-    //  See n3766.html.
-    template<typename _Tp = void>
-      struct __identity
-      { typedef _Tp type; };
-
-    template<>
-      struct __identity<void>;
-
-    template<typename _Tp>
-      using __idt = typename __identity<_Tp>::type;
-  }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator==(basic_string_view<_CharT, _Traits> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return __x.compare(__y) == 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator==(basic_string_view<_CharT, _Traits> __x,
-               __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
-    { return __x.compare(__y) == 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator==(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return __x.compare(__y) == 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator!=(basic_string_view<_CharT, _Traits> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return !(__x == __y); }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator!=(basic_string_view<_CharT, _Traits> __x,
-               __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
-    { return !(__x == __y); }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator!=(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return !(__x == __y); }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator< (basic_string_view<_CharT, _Traits> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return __x.compare(__y) < 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator< (basic_string_view<_CharT, _Traits> __x,
-               __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
-    { return __x.compare(__y) < 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator< (__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return __x.compare(__y) < 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator> (basic_string_view<_CharT, _Traits> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return __x.compare(__y) > 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator> (basic_string_view<_CharT, _Traits> __x,
-               __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
-    { return __x.compare(__y) > 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator> (__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return __x.compare(__y) > 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator<=(basic_string_view<_CharT, _Traits> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return __x.compare(__y) <= 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator<=(basic_string_view<_CharT, _Traits> __x,
-               __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
-    { return __x.compare(__y) <= 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator<=(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return __x.compare(__y) <= 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator>=(basic_string_view<_CharT, _Traits> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return __x.compare(__y) >= 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator>=(basic_string_view<_CharT, _Traits> __x,
-               __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
-    { return __x.compare(__y) >= 0; }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator>=(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
-               basic_string_view<_CharT, _Traits> __y) noexcept
-    { return __x.compare(__y) >= 0; }
-
-  // [string.view.io], Inserters and extractors
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-	       basic_string_view<_CharT,_Traits> __str)
-    { return __ostream_insert(__os, __str.data(), __str.size()); }
-
-
-  // basic_string_view typedef names
-
-  using string_view = basic_string_view<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  using wstring_view = basic_string_view<wchar_t>;
-#endif
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-  using u16string_view = basic_string_view<char16_t>;
-  using u32string_view = basic_string_view<char32_t>;
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v1
-} // namespace experimental
-
-
-  // [string.view.hash], hash support:
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-  template<typename _Tp>
-    struct hash;
-
-  template<>
-    struct hash<experimental::string_view>
-    : public __hash_base<size_t, experimental::string_view>
-    {
-      size_t
-      operator()(const experimental::string_view& __str) const noexcept
-      { return std::_Hash_impl::hash(__str.data(), __str.length()); }
-    };
-
-  template<>
-    struct __is_fast_hash<hash<experimental::string_view>> : std::false_type
-    { };
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    struct hash<experimental::wstring_view>
-    : public __hash_base<size_t, wstring>
-    {
-      size_t
-      operator()(const experimental::wstring_view& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(),
-                                     __s.length() * sizeof(wchar_t)); }
-    };
-
-  template<>
-    struct __is_fast_hash<hash<experimental::wstring_view>> : std::false_type
-    { };
-#endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-  template<>
-    struct hash<experimental::u16string_view>
-    : public __hash_base<size_t, experimental::u16string_view>
-    {
-      size_t
-      operator()(const experimental::u16string_view& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(),
-                                     __s.length() * sizeof(char16_t)); }
-    };
-
-  template<>
-    struct __is_fast_hash<hash<experimental::u16string_view>> : std::false_type
-    { };
-
-  template<>
-    struct hash<experimental::u32string_view>
-    : public __hash_base<size_t, experimental::u32string_view>
-    {
-      size_t
-      operator()(const experimental::u32string_view& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(),
-                                     __s.length() * sizeof(char32_t)); }
-    };
-
-  template<>
-    struct __is_fast_hash<hash<experimental::u32string_view>> : std::false_type
-    { };
-#endif
-_GLIBCXX_END_NAMESPACE_VERSION
-
-namespace experimental
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // I added these EMSR.
-  inline namespace literals
-  {
-  inline namespace string_view_literals
-  {
-
-    inline constexpr basic_string_view<char>
-    operator""sv(const char* __str, size_t __len)
-    { return basic_string_view<char>{__str, __len}; }
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-    inline constexpr basic_string_view<wchar_t>
-    operator""sv(const wchar_t* __str, size_t __len)
-    { return basic_string_view<wchar_t>{__str, __len}; }
-#endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-    inline constexpr basic_string_view<char16_t>
-    operator""sv(const char16_t* __str, size_t __len)
-    { return basic_string_view<char16_t>{__str, __len}; }
-
-    inline constexpr basic_string_view<char32_t>
-    operator""sv(const char32_t* __str, size_t __len)
-    { return basic_string_view<char32_t>{__str, __len}; }
-#endif
-
-  }
-  }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace experimental
-} // namespace std
-
-#include <experimental/string_view.tcc>
-
-#endif // __cplusplus <= 201103L
-
-#endif // _GLIBCXX_EXPERIMENTAL_STRING_VIEW
diff --git a/openflow/usr/include/c++/5/experimental/string_view.tcc b/openflow/usr/include/c++/5/experimental/string_view.tcc
deleted file mode 100644
index 9421842..0000000
--- a/openflow/usr/include/c++/5/experimental/string_view.tcc
+++ /dev/null
@@ -1,230 +0,0 @@
-// Components for manipulating non-owning sequences of characters -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/string_view.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{experimental/string_view}
- */
-
-//
-// N3762 basic_string_view library
-//
-
-#ifndef _GLIBCXX_EXPERIMENTAL_STRING_VIEW_TCC
-#define _GLIBCXX_EXPERIMENTAL_STRING_VIEW_TCC 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits>
-    typename basic_string_view<_CharT, _Traits>::size_type
-    basic_string_view<_CharT, _Traits>::
-    find(const _CharT* __str, size_type __pos, size_type __n) const noexcept
-    {
-      __glibcxx_requires_string_len(__str, __n);
-
-      if (__n == 0)
-	return __pos <= this->_M_len ? __pos : npos;
-
-      if (__n <= this->_M_len)
-	{
-	  for (; __pos <= this->_M_len - __n; ++__pos)
-	    if (traits_type::eq(this->_M_str[__pos], __str[0])
-		&& traits_type::compare(this->_M_str + __pos + 1,
-					__str + 1, __n - 1) == 0)
-	      return __pos;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_string_view<_CharT, _Traits>::size_type
-    basic_string_view<_CharT, _Traits>::
-    find(_CharT __c, size_type __pos) const noexcept
-    {
-      size_type __ret = npos;
-      if (__pos < this->_M_len)
-	{
-	  const size_type __n = this->_M_len - __pos;
-	  const _CharT* __p = traits_type::find(this->_M_str + __pos, __n, __c);
-	  if (__p)
-	    __ret = __p - this->_M_str;
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_string_view<_CharT, _Traits>::size_type
-    basic_string_view<_CharT, _Traits>::
-    rfind(const _CharT* __str, size_type __pos, size_type __n) const noexcept
-    {
-      __glibcxx_requires_string_len(__str, __n);
-
-      if (__n <= this->_M_len)
-	{
-	  __pos = std::min(size_type(this->_M_len - __n), __pos);
-	  do
-	    {
-	      if (traits_type::compare(this->_M_str + __pos, __str, __n) == 0)
-		return __pos;
-	    }
-	  while (__pos-- > 0);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_string_view<_CharT, _Traits>::size_type
-    basic_string_view<_CharT, _Traits>::
-    rfind(_CharT __c, size_type __pos) const noexcept
-    {
-      size_type __size = this->_M_len;
-      if (__size > 0)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  for (++__size; __size-- > 0; )
-	    if (traits_type::eq(this->_M_str[__size], __c))
-	      return __size;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_string_view<_CharT, _Traits>::size_type
-    basic_string_view<_CharT, _Traits>::
-    find_first_of(const _CharT* __str, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__str, __n);
-      for (; __n && __pos < this->_M_len; ++__pos)
-	{
-	  const _CharT* __p = traits_type::find(__str, __n,
-						this->_M_str[__pos]);
-	  if (__p)
-	    return __pos;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_string_view<_CharT, _Traits>::size_type
-    basic_string_view<_CharT, _Traits>::
-    find_last_of(const _CharT* __str, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__str, __n);
-      size_type __size = this->size();
-      if (__size && __n)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (traits_type::find(__str, __n, this->_M_str[__size]))
-		return __size;
-	    }
-	  while (__size-- != 0);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_string_view<_CharT, _Traits>::size_type
-    basic_string_view<_CharT, _Traits>::
-    find_first_not_of(const _CharT* __str, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__str, __n);
-      for (; __pos < this->_M_len; ++__pos)
-	if (!traits_type::find(__str, __n, this->_M_str[__pos]))
-	  return __pos;
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_string_view<_CharT, _Traits>::size_type
-    basic_string_view<_CharT, _Traits>::
-    find_first_not_of(_CharT __c, size_type __pos) const noexcept
-    {
-      for (; __pos < this->_M_len; ++__pos)
-	if (!traits_type::eq(this->_M_str[__pos], __c))
-	  return __pos;
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_string_view<_CharT, _Traits>::size_type
-    basic_string_view<_CharT, _Traits>::
-    find_last_not_of(const _CharT* __str, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__str, __n);
-      size_type __size = this->_M_len;
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (!traits_type::find(__str, __n, this->_M_str[__size]))
-		return __size;
-	    }
-	  while (__size--);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_string_view<_CharT, _Traits>::size_type
-    basic_string_view<_CharT, _Traits>::
-    find_last_not_of(_CharT __c, size_type __pos) const noexcept
-    {
-      size_type __size = this->_M_len;
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (!traits_type::eq(this->_M_str[__size], __c))
-		return __size;
-	    }
-	  while (__size--);
-	}
-      return npos;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace experimental
-} // namespace std
-
-#endif // __cplusplus <= 201103L
-
-#endif // _GLIBCXX_EXPERIMENTAL_STRING_VIEW_TCC
diff --git a/openflow/usr/include/c++/5/experimental/system_error b/openflow/usr/include/c++/5/experimental/system_error
deleted file mode 100644
index ba3f8be..0000000
--- a/openflow/usr/include/c++/5/experimental/system_error
+++ /dev/null
@@ -1,65 +0,0 @@
-// Variable Templates For system_error -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/system_error
- *  This is a TS C++ Library header.
- */
-
-//
-// N3932 Variable Templates For Type Traits (Revision 1)
-//
-
-#ifndef _GLIBCXX_EXPERIMENTAL_SYSTEM_ERROR
-#define _GLIBCXX_EXPERIMENTAL_SYSTEM_ERROR 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <system_error>
-
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-// See C++14 §19.5, System error support
-template <typename _Tp>
-  constexpr bool is_error_code_enum_v = is_error_code_enum<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_error_condition_enum_v =
-    is_error_condition_enum<_Tp>::value;
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v1
-} // namespace experimental
-} // namespace std
-
-#endif // __cplusplus <= 201103L
-
-#endif // _GLIBCXX_EXPERIMENTAL_SYSTEM_ERROR
diff --git a/openflow/usr/include/c++/5/experimental/tuple b/openflow/usr/include/c++/5/experimental/tuple
deleted file mode 100644
index 99935f1..0000000
--- a/openflow/usr/include/c++/5/experimental/tuple
+++ /dev/null
@@ -1,78 +0,0 @@
-// <experimental/tuple> -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/tuple
- *  This is a TS C++ Library header.
- */
-
-#ifndef _GLIBCXX_EXPERIMENTAL_TUPLE
-#define _GLIBCXX_EXPERIMENTAL_TUPLE 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <tuple>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // See C++14 §20.4.2.5, tuple helper classes
-  template <typename _Tp>
-    constexpr size_t tuple_size_v = tuple_size<_Tp>::value;
-
-#define __cpp_lib_experimental_tuple 201402
-
-  template <typename _Fn, typename _Tuple, std::size_t... _Idx>
-    constexpr decltype(auto)
-    __apply_impl(_Fn&& f, _Tuple&& t, std::index_sequence<_Idx...>)
-    {
-      return std::forward<_Fn>(f)(std::get<_Idx>(std::forward<_Tuple>(t))...);
-    }
-
-  template <typename _Fn, typename _Tuple>
-    constexpr decltype(auto)
-    apply(_Fn&& f, _Tuple&& t)
-    {
-      using _Indices =
-	std::make_index_sequence<std::tuple_size<std::decay_t<_Tuple>>::value>;
-      return __apply_impl(std::forward<_Fn>(f), std::forward<_Tuple>(t),
-			  _Indices{});
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v1
-} // namespace experimental
-} // namespace std
-
-#endif // C++14
-
-#endif // _GLIBCXX_EXPERIMENTAL_TUPLE
diff --git a/openflow/usr/include/c++/5/experimental/type_traits b/openflow/usr/include/c++/5/experimental/type_traits
deleted file mode 100644
index db78eec..0000000
--- a/openflow/usr/include/c++/5/experimental/type_traits
+++ /dev/null
@@ -1,228 +0,0 @@
-// Variable Templates For Type Traits -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file experimental/type_traits
- *  This is a TS C++ Library header.
- */
-
-//
-// N3932 Variable Templates For Type Traits (Revision 1)
-//
-
-#ifndef _GLIBCXX_EXPERIMENTAL_TYPE_TRAITS
-#define _GLIBCXX_EXPERIMENTAL_TYPE_TRAITS 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <type_traits>
-
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#define __cpp_lib_experimental_type_trait_variable_templates 201402
-
-// See C++14 §20.10.4.1, primary type categories
-template <typename _Tp>
-  constexpr bool is_void_v = is_void<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_null_pointer_v = is_null_pointer<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_integral_v = is_integral<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_floating_point_v = is_floating_point<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_array_v = is_array<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_pointer_v = is_pointer<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_lvalue_reference_v = is_lvalue_reference<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_rvalue_reference_v = is_rvalue_reference<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_member_object_pointer_v =
-    is_member_object_pointer<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_member_function_pointer_v =
-    is_member_function_pointer<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_enum_v = is_enum<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_union_v = is_union<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_class_v = is_class<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_function_v = is_function<_Tp>::value;
-
-// See C++14 §20.10.4.2, composite type categories
-template <typename _Tp>
-  constexpr bool is_reference_v = is_reference<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_object_v = is_object<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_scalar_v = is_scalar<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_compound_v = is_compound<_Tp>::value;
-template <typename _Tp>
- constexpr bool is_member_pointer_v = is_member_pointer<_Tp>::value;
-
-// See C++14 §20.10.4.3, type properties
-template <typename _Tp>
-  constexpr bool is_const_v = is_const<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_volatile_v = is_volatile<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_trivial_v = is_trivial<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_trivially_copyable_v = is_trivially_copyable<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_standard_layout_v = is_standard_layout<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_pod_v = is_pod<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_literal_type_v = is_literal_type<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_empty_v = is_empty<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_polymorphic_v = is_polymorphic<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_abstract_v = is_abstract<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_final_v = is_final<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_signed_v = is_signed<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_unsigned_v = is_unsigned<_Tp>::value;
-template <typename _Tp, typename... _Args>
-  constexpr bool is_constructible_v = is_constructible<_Tp, _Args...>::value;
-template <typename _Tp>
-  constexpr bool is_default_constructible_v =
-    is_default_constructible<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_copy_constructible_v = is_copy_constructible<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_move_constructible_v = is_move_constructible<_Tp>::value;
-template <typename _Tp, typename _Up>
-  constexpr bool is_assignable_v = is_assignable<_Tp, _Up>::value;
-template <typename _Tp>
-  constexpr bool is_copy_assignable_v = is_copy_assignable<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_move_assignable_v = is_move_assignable<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_destructible_v = is_destructible<_Tp>::value;
-template <typename _Tp, typename... _Args>
-  constexpr bool is_trivially_constructible_v =
-    is_trivially_constructible<_Tp, _Args...>::value;
-template <typename _Tp>
-  constexpr bool is_trivially_default_constructible_v =
-    is_trivially_default_constructible<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_trivially_copy_constructible_v =
-    is_trivially_copy_constructible<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_trivially_move_constructible_v =
-    is_trivially_move_constructible<_Tp>::value;
-template <typename _Tp, typename _Up>
-  constexpr bool is_trivially_assignable_v =
-    is_trivially_assignable<_Tp, _Up>::value;
-template <typename _Tp>
-  constexpr bool is_trivially_copy_assignable_v =
-    is_trivially_copy_assignable<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_trivially_move_assignable_v =
-    is_trivially_move_assignable<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_trivially_destructible_v =
-    is_trivially_destructible<_Tp>::value;
-template <typename _Tp, typename... _Args>
-  constexpr bool is_nothrow_constructible_v =
-    is_nothrow_constructible<_Tp, _Args...>::value;
-template <typename _Tp>
-  constexpr bool is_nothrow_default_constructible_v =
-    is_nothrow_default_constructible<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_nothrow_copy_constructible_v =
-    is_nothrow_copy_constructible<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_nothrow_move_constructible_v =
-    is_nothrow_move_constructible<_Tp>::value;
-template <typename _Tp, typename _Up>
-  constexpr bool is_nothrow_assignable_v =
-    is_nothrow_assignable<_Tp, _Up>::value;
-template <typename _Tp>
-  constexpr bool is_nothrow_copy_assignable_v =
-    is_nothrow_copy_assignable<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_nothrow_move_assignable_v =
-    is_nothrow_move_assignable<_Tp>::value;
-template <typename _Tp>
-  constexpr bool is_nothrow_destructible_v =
-    is_nothrow_destructible<_Tp>::value;
-template <typename _Tp>
-  constexpr bool has_virtual_destructor_v =
-    has_virtual_destructor<_Tp>::value;
-
-// See C++14 §20.10.5, type property queries
-template <typename _Tp>
-  constexpr size_t alignment_of_v = alignment_of<_Tp>::value;
-template <typename _Tp>
-  constexpr size_t rank_v = rank<_Tp>::value;
-template <typename _Tp, unsigned _Idx = 0>
-  constexpr size_t extent_v = extent<_Tp, _Idx>::value;
-
-// See C++14 §20.10.6, type relations
-template <typename _Tp, typename _Up>
-  constexpr bool is_same_v = is_same<_Tp, _Up>::value;
-template <typename _Base, typename _Derived>
-  constexpr bool is_base_of_v = is_base_of<_Base, _Derived>::value;
-template <typename _From, typename _To>
-  constexpr bool is_convertible_v = is_convertible<_From, _To>::value;
-
-
-  // 3.3.2, Other type transformations
-  // invocation_type (still unimplemented)
-  // raw_invocation_type (still unimplemented)
-  // invocation_type_t (still unimplemented)
-  // raw_invocation_type_t (still unimplemented)
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace fundamentals_v1
-} // namespace experimental
-} // namespace std
-
-#endif // __cplusplus <= 201103L
-
-#endif // _GLIBCXX_EXPERIMENTAL_TYPE_TRAITS
diff --git a/openflow/usr/include/c++/5/ext/algorithm b/openflow/usr/include/c++/5/ext/algorithm
deleted file mode 100644
index 4b68eff..0000000
--- a/openflow/usr/include/c++/5/ext/algorithm
+++ /dev/null
@@ -1,603 +0,0 @@
-// Algorithm extensions -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/algorithm
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).
- */
-
-#ifndef _EXT_ALGORITHM
-#define _EXT_ALGORITHM 1
-
-#pragma GCC system_header
-
-#include <algorithm>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::ptrdiff_t;
-  using std::min;
-  using std::pair;
-  using std::input_iterator_tag;
-  using std::random_access_iterator_tag;
-  using std::iterator_traits;
-
-  //--------------------------------------------------
-  // copy_n (not part of the C++ standard)
-
-  template<typename _InputIterator, typename _Size, typename _OutputIterator>
-    pair<_InputIterator, _OutputIterator>
-    __copy_n(_InputIterator __first, _Size __count,
-	     _OutputIterator __result,
-	     input_iterator_tag)
-    {
-      for ( ; __count > 0; --__count)
-	{
-	  *__result = *__first;
-	  ++__first;
-	  ++__result;
-	}
-      return pair<_InputIterator, _OutputIterator>(__first, __result);
-    }
-
-  template<typename _RAIterator, typename _Size, typename _OutputIterator>
-    inline pair<_RAIterator, _OutputIterator>
-    __copy_n(_RAIterator __first, _Size __count,
-	     _OutputIterator __result,
-	     random_access_iterator_tag)
-    {
-      _RAIterator __last = __first + __count;
-      return pair<_RAIterator, _OutputIterator>(__last, std::copy(__first,
-								  __last,
-								  __result));
-    }
-
-  /**
-   *  @brief Copies the range [first,first+count) into [result,result+count).
-   *  @param  __first  An input iterator.
-   *  @param  __count  The number of elements to copy.
-   *  @param  __result An output iterator.
-   *  @return   A std::pair composed of first+count and result+count.
-   *
-   *  This is an SGI extension.
-   *  This inline function will boil down to a call to @c memmove whenever
-   *  possible.  Failing that, if random access iterators are passed, then the
-   *  loop count will be known (and therefore a candidate for compiler
-   *  optimizations such as unrolling).
-   *  @ingroup SGIextensions
-  */
-  template<typename _InputIterator, typename _Size, typename _OutputIterator>
-    inline pair<_InputIterator, _OutputIterator>
-    copy_n(_InputIterator __first, _Size __count, _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-
-      return __gnu_cxx::__copy_n(__first, __count, __result,
-				 std::__iterator_category(__first));
-    }
-
-  template<typename _InputIterator1, typename _InputIterator2>
-    int
-    __lexicographical_compare_3way(_InputIterator1 __first1,
-				   _InputIterator1 __last1,
-				   _InputIterator2 __first2,
-				   _InputIterator2 __last2)
-    {
-      while (__first1 != __last1 && __first2 != __last2)
-	{
-	  if (*__first1 < *__first2)
-	    return -1;
-	  if (*__first2 < *__first1)
-	    return 1;
-	  ++__first1;
-	  ++__first2;
-	}
-      if (__first2 == __last2)
-	return !(__first1 == __last1);
-      else
-	return -1;
-    }
-
-  inline int
-  __lexicographical_compare_3way(const unsigned char* __first1,
-				 const unsigned char* __last1,
-				 const unsigned char* __first2,
-				 const unsigned char* __last2)
-  {
-    const ptrdiff_t __len1 = __last1 - __first1;
-    const ptrdiff_t __len2 = __last2 - __first2;
-    const int __result = __builtin_memcmp(__first1, __first2,
-					  min(__len1, __len2));
-    return __result != 0 ? __result
-			 : (__len1 == __len2 ? 0 : (__len1 < __len2 ? -1 : 1));
-  }
-
-  inline int
-  __lexicographical_compare_3way(const char* __first1, const char* __last1,
-				 const char* __first2, const char* __last2)
-  {
-#if CHAR_MAX == SCHAR_MAX
-    return __lexicographical_compare_3way((const signed char*) __first1,
-					  (const signed char*) __last1,
-					  (const signed char*) __first2,
-					  (const signed char*) __last2);
-#else
-    return __lexicographical_compare_3way((const unsigned char*) __first1,
-					  (const unsigned char*) __last1,
-					  (const unsigned char*) __first2,
-					  (const unsigned char*) __last2);
-#endif
-  }
-
-  /**
-   *  @brief @c memcmp on steroids.
-   *  @param  __first1  An input iterator.
-   *  @param  __last1   An input iterator.
-   *  @param  __first2  An input iterator.
-   *  @param  __last2   An input iterator.
-   *  @return   An int, as with @c memcmp.
-   *
-   *  The return value will be less than zero if the first range is
-   *  <em>lexigraphically less than</em> the second, greater than zero
-   *  if the second range is <em>lexigraphically less than</em> the
-   *  first, and zero otherwise.
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-  */
-  template<typename _InputIterator1, typename _InputIterator2>
-    int
-    lexicographical_compare_3way(_InputIterator1 __first1,
-				 _InputIterator1 __last1,
-				 _InputIterator2 __first2,
-				 _InputIterator2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return __lexicographical_compare_3way(__first1, __last1, __first2,
-					    __last2);
-    }
-
-  // count and count_if: this version, whose return type is void, was present
-  // in the HP STL, and is retained as an extension for backward compatibility.
-  template<typename _InputIterator, typename _Tp, typename _Size>
-    void
-    count(_InputIterator __first, _InputIterator __last,
-	  const _Tp& __value,
-	  _Size& __n)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_EqualityComparableConcept<
-	    typename iterator_traits<_InputIterator>::value_type >)
-      __glibcxx_function_requires(_EqualityComparableConcept<_Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	if (*__first == __value)
-	  ++__n;
-    }
-
-  template<typename _InputIterator, typename _Predicate, typename _Size>
-    void
-    count_if(_InputIterator __first, _InputIterator __last,
-	     _Predicate __pred,
-	     _Size& __n)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	if (__pred(*__first))
-	  ++__n;
-    }
-
-  // random_sample and random_sample_n (extensions, not part of the standard).
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _ForwardIterator, typename _OutputIterator,
-	   typename _Distance>
-    _OutputIterator
-    random_sample_n(_ForwardIterator __first, _ForwardIterator __last,
-                    _OutputIterator __out, const _Distance __n)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      _Distance __remaining = std::distance(__first, __last);
-      _Distance __m = min(__n, __remaining);
-
-      while (__m > 0)
-	{
-	  if ((std::rand() % __remaining) < __m)
-	    {
-	      *__out = *__first;
-	      ++__out;
-	      --__m;
-	    }
-	  --__remaining;
-	  ++__first;
-	}
-      return __out;
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _ForwardIterator, typename _OutputIterator,
-	   typename _Distance, typename _RandomNumberGenerator>
-    _OutputIterator
-    random_sample_n(_ForwardIterator __first, _ForwardIterator __last,
-                   _OutputIterator __out, const _Distance __n,
-		   _RandomNumberGenerator& __rand)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_function_requires(_UnaryFunctionConcept<
-		_RandomNumberGenerator, _Distance, _Distance>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      _Distance __remaining = std::distance(__first, __last);
-      _Distance __m = min(__n, __remaining);
-
-      while (__m > 0)
-	{
-	  if (__rand(__remaining) < __m)
-	    {
-	      *__out = *__first;
-	      ++__out;
-	      --__m;
-	    }
-	  --__remaining;
-	  ++__first;
-	}
-      return __out;
-    }
-
-  template<typename _InputIterator, typename _RandomAccessIterator,
-	   typename _Distance>
-    _RandomAccessIterator
-    __random_sample(_InputIterator __first, _InputIterator __last,
-		    _RandomAccessIterator __out,
-		    const _Distance __n)
-    {
-      _Distance __m = 0;
-      _Distance __t = __n;
-      for ( ; __first != __last && __m < __n; ++__m, ++__first)
-	__out[__m] = *__first;
-
-      while (__first != __last)
-	{
-	  ++__t;
-	  _Distance __M = std::rand() % (__t);
-	  if (__M < __n)
-	    __out[__M] = *__first;
-	  ++__first;
-	}
-      return __out + __m;
-    }
-
-  template<typename _InputIterator, typename _RandomAccessIterator,
-	   typename _RandomNumberGenerator, typename _Distance>
-    _RandomAccessIterator
-    __random_sample(_InputIterator __first, _InputIterator __last,
-		    _RandomAccessIterator __out,
-		    _RandomNumberGenerator& __rand,
-		    const _Distance __n)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_UnaryFunctionConcept<
-	    _RandomNumberGenerator, _Distance, _Distance>)
-
-      _Distance __m = 0;
-      _Distance __t = __n;
-      for ( ; __first != __last && __m < __n; ++__m, ++__first)
-	__out[__m] = *__first;
-
-      while (__first != __last)
-	{
-	  ++__t;
-	  _Distance __M = __rand(__t);
-	  if (__M < __n)
-	    __out[__M] = *__first;
-	  ++__first;
-	}
-      return __out + __m;
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _InputIterator, typename _RandomAccessIterator>
-    inline _RandomAccessIterator
-    random_sample(_InputIterator __first, _InputIterator __last,
-		  _RandomAccessIterator __out_first,
-		  _RandomAccessIterator __out_last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_valid_range(__out_first, __out_last);
-
-      return __random_sample(__first, __last,
-			     __out_first, __out_last - __out_first);
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _InputIterator, typename _RandomAccessIterator,
-	   typename _RandomNumberGenerator>
-    inline _RandomAccessIterator
-    random_sample(_InputIterator __first, _InputIterator __last,
-		  _RandomAccessIterator __out_first,
-		  _RandomAccessIterator __out_last,
-		  _RandomNumberGenerator& __rand)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_valid_range(__out_first, __out_last);
-
-      return __random_sample(__first, __last,
-			     __out_first, __rand,
-			     __out_last - __out_first);
-    }
-
-#if __cplusplus >= 201103L
-  using std::is_heap;
-#else
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _RandomAccessIterator>
-    inline bool
-    is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__is_heap(__first, __last - __first);
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _RandomAccessIterator, typename _StrictWeakOrdering>
-    inline bool
-    is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	    _StrictWeakOrdering __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_StrictWeakOrdering,
-	    typename iterator_traits<_RandomAccessIterator>::value_type,
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__is_heap(__first, __comp, __last - __first);
-    }
-#endif
-
-#if __cplusplus >= 201103L
-  using std::is_sorted;
-#else
-  // is_sorted, a predicated testing whether a range is sorted in
-  // nondescending order.  This is an extension, not part of the C++
-  // standard.
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _ForwardIterator>
-    bool
-    is_sorted(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return true;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next)
-	if (*__next < *__first)
-	  return false;
-      return true;
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _ForwardIterator, typename _StrictWeakOrdering>
-    bool
-    is_sorted(_ForwardIterator __first, _ForwardIterator __last,
-	      _StrictWeakOrdering __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_StrictWeakOrdering,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return true;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next)
-	if (__comp(*__next, *__first))
-	  return false;
-      return true;
-    }
-#endif  // C++11
-
-  /**
-   *  @brief Find the median of three values.
-   *  @param  __a  A value.
-   *  @param  __b  A value.
-   *  @param  __c  A value.
-   *  @return One of @p a, @p b or @p c.
-   *
-   *  If @c {l,m,n} is some convolution of @p {a,b,c} such that @c l<=m<=n
-   *  then the value returned will be @c m.
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-  */
-  template<typename _Tp>
-    const _Tp&
-    __median(const _Tp& __a, const _Tp& __b, const _Tp& __c)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      if (__a < __b)
-	if (__b < __c)
-	  return __b;
-	else if (__a < __c)
-	  return __c;
-	else
-	  return __a;
-      else if (__a < __c)
-	return __a;
-      else if (__b < __c)
-	return __c;
-      else
-	return __b;
-    }
-
-  /**
-   *  @brief Find the median of three values using a predicate for comparison.
-   *  @param  __a     A value.
-   *  @param  __b     A value.
-   *  @param  __c     A value.
-   *  @param  __comp  A binary predicate.
-   *  @return One of @p a, @p b or @p c.
-   *
-   *  If @c {l,m,n} is some convolution of @p {a,b,c} such that @p comp(l,m)
-   *  and @p comp(m,n) are both true then the value returned will be @c m.
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-  */
-  template<typename _Tp, typename _Compare>
-    const _Tp&
-    __median(const _Tp& __a, const _Tp& __b, const _Tp& __c, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BinaryFunctionConcept<_Compare, bool,
-				                         _Tp, _Tp>)
-      if (__comp(__a, __b))
-	if (__comp(__b, __c))
-	  return __b;
-	else if (__comp(__a, __c))
-	  return __c;
-	else
-	  return __a;
-      else if (__comp(__a, __c))
-	return __a;
-      else if (__comp(__b, __c))
-	return __c;
-      else
-	return __b;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _EXT_ALGORITHM */
diff --git a/openflow/usr/include/c++/5/ext/aligned_buffer.h b/openflow/usr/include/c++/5/ext/aligned_buffer.h
deleted file mode 100644
index d023bc1..0000000
--- a/openflow/usr/include/c++/5/ext/aligned_buffer.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// Aligned memory buffer -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/aligned_buffer.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _ALIGNED_BUFFER_H
-#define _ALIGNED_BUFFER_H 1
-
-#pragma GCC system_header
-
-#if __cplusplus >= 201103L
-# include <type_traits>
-#else
-# include <bits/c++0x_warning.h>
-#endif
-
-namespace __gnu_cxx
-{
-  // A utility type containing a POD object that can hold an object of type
-  // _Tp initialized via placement new or allocator_traits::construct.
-  // Intended for use as a data member subobject, use __aligned_buffer for
-  // complete objects.
-  template<typename _Tp>
-    struct __aligned_membuf
-    {
-      // Target macro ADJUST_FIELD_ALIGN can produce different alignment for
-      // types when used as class members. __aligned_membuf is intended
-      // for use as a class member, so align the buffer as for a class member.
-      struct _Tp2 { _Tp _M_t; };
-
-      alignas(__alignof__(_Tp2::_M_t)) unsigned char _M_storage[sizeof(_Tp)];
-
-      __aligned_membuf() = default;
-
-      // Can be used to avoid value-initialization zeroing _M_storage.
-      __aligned_membuf(std::nullptr_t) { }
-
-      void*
-      _M_addr() noexcept
-      { return static_cast<void*>(&_M_storage); }
-
-      const void*
-      _M_addr() const noexcept
-      { return static_cast<const void*>(&_M_storage); }
-
-      _Tp*
-      _M_ptr() noexcept
-      { return static_cast<_Tp*>(_M_addr()); }
-
-      const _Tp*
-      _M_ptr() const noexcept
-      { return static_cast<const _Tp*>(_M_addr()); }
-    };
-
-  // Similar to __aligned_membuf but aligned for complete objects, not members.
-  // This type is used in <forward_list>, <future>, <bits/shared_ptr_base.h>
-  // and <bits/hashtable_policy.h>, but ideally they would use __aligned_membuf
-  // instead, as it has smaller size for some types on some targets.
-  // This type is still used to avoid an ABI change.
-  template<typename _Tp>
-    struct __aligned_buffer
-    : std::aligned_storage<sizeof(_Tp), std::alignment_of<_Tp>::value>
-    {
-      typename
-	std::aligned_storage<sizeof(_Tp), std::alignment_of<_Tp>::value>::type
-	_M_storage;
-
-      __aligned_buffer() = default;
-
-      // Can be used to avoid value-initialization
-      __aligned_buffer(std::nullptr_t) { }
-
-      void*
-      _M_addr() noexcept
-      {
-        return static_cast<void*>(&_M_storage);
-      }
-
-      const void*
-      _M_addr() const noexcept
-      {
-        return static_cast<const void*>(&_M_storage);
-      }
-
-      _Tp*
-      _M_ptr() noexcept
-      { return static_cast<_Tp*>(_M_addr()); }
-
-      const _Tp*
-      _M_ptr() const noexcept
-      { return static_cast<const _Tp*>(_M_addr()); }
-    };
-
-} // namespace
-
-#endif /* _ALIGNED_BUFFER_H */
diff --git a/openflow/usr/include/c++/5/ext/alloc_traits.h b/openflow/usr/include/c++/5/ext/alloc_traits.h
deleted file mode 100644
index 06bc70a..0000000
--- a/openflow/usr/include/c++/5/ext/alloc_traits.h
+++ /dev/null
@@ -1,215 +0,0 @@
-// Allocator traits -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/alloc_traits.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _EXT_ALLOC_TRAITS_H
-#define _EXT_ALLOC_TRAITS_H 1
-
-#pragma GCC system_header
-
-#if __cplusplus >= 201103L
-# include <bits/move.h>
-# include <bits/alloc_traits.h>
-#else
-# include <bits/allocator.h>  // for __alloc_swap
-#endif
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if __cplusplus >= 201103L
-  template<typename _Alloc>
-    struct __allocator_always_compares_equal : std::false_type { };
-
-  template<typename _Tp>
-    struct __allocator_always_compares_equal<std::allocator<_Tp>>
-    : std::true_type { };
-
-  template<typename, typename> struct array_allocator;
-
-  template<typename _Tp, typename _Array>
-    struct __allocator_always_compares_equal<array_allocator<_Tp, _Array>>
-    : std::true_type { };
-
-  template<typename> struct bitmap_allocator;
-
-  template<typename _Tp>
-    struct __allocator_always_compares_equal<bitmap_allocator<_Tp>>
-    : std::true_type { };
-
-  template<typename> struct malloc_allocator;
-
-  template<typename _Tp>
-    struct __allocator_always_compares_equal<malloc_allocator<_Tp>>
-    : std::true_type { };
-
-  template<typename> struct mt_allocator;
-
-  template<typename _Tp>
-    struct __allocator_always_compares_equal<mt_allocator<_Tp>>
-    : std::true_type { };
-
-  template<typename> struct new_allocator;
-
-  template<typename _Tp>
-    struct __allocator_always_compares_equal<new_allocator<_Tp>>
-    : std::true_type { };
-
-  template<typename> struct pool_allocator;
-
-  template<typename _Tp>
-    struct __allocator_always_compares_equal<pool_allocator<_Tp>>
-    : std::true_type { };
-#endif
-
-/**
- * @brief  Uniform interface to C++98 and C++0x allocators.
- * @ingroup allocators
-*/
-template<typename _Alloc>
-  struct __alloc_traits
-#if __cplusplus >= 201103L
-  : std::allocator_traits<_Alloc>
-#endif
-  {
-    typedef _Alloc allocator_type;
-#if __cplusplus >= 201103L
-    typedef std::allocator_traits<_Alloc>           _Base_type;
-    typedef typename _Base_type::value_type         value_type;
-    typedef typename _Base_type::pointer            pointer;
-    typedef typename _Base_type::const_pointer      const_pointer;
-    typedef typename _Base_type::size_type          size_type;
-    typedef typename _Base_type::difference_type    difference_type;
-    // C++11 allocators do not define reference or const_reference
-    typedef value_type&                             reference;
-    typedef const value_type&                       const_reference;
-    using _Base_type::allocate;
-    using _Base_type::deallocate;
-    using _Base_type::construct;
-    using _Base_type::destroy;
-    using _Base_type::max_size;
-
-  private:
-    template<typename _Ptr>
-      using __is_custom_pointer
-	= std::__and_<std::is_same<pointer, _Ptr>,
-		      std::__not_<std::is_pointer<_Ptr>>>;
-
-  public:
-    // overload construct for non-standard pointer types
-    template<typename _Ptr, typename... _Args>
-      static typename std::enable_if<__is_custom_pointer<_Ptr>::value>::type
-      construct(_Alloc& __a, _Ptr __p, _Args&&... __args)
-      {
-	_Base_type::construct(__a, std::addressof(*__p),
-			      std::forward<_Args>(__args)...);
-      }
-
-    // overload destroy for non-standard pointer types
-    template<typename _Ptr>
-      static typename std::enable_if<__is_custom_pointer<_Ptr>::value>::type
-      destroy(_Alloc& __a, _Ptr __p)
-      { _Base_type::destroy(__a, std::addressof(*__p)); }
-
-    static _Alloc _S_select_on_copy(const _Alloc& __a)
-    { return _Base_type::select_on_container_copy_construction(__a); }
-
-    static void _S_on_swap(_Alloc& __a, _Alloc& __b)
-    { std::__alloc_on_swap(__a, __b); }
-
-    static constexpr bool _S_propagate_on_copy_assign()
-    { return _Base_type::propagate_on_container_copy_assignment::value; }
-
-    static constexpr bool _S_propagate_on_move_assign()
-    { return _Base_type::propagate_on_container_move_assignment::value; }
-
-    static constexpr bool _S_propagate_on_swap()
-    { return _Base_type::propagate_on_container_swap::value; }
-
-    static constexpr bool _S_always_equal()
-    { return __allocator_always_compares_equal<_Alloc>::value; }
-
-    static constexpr bool _S_nothrow_move()
-    { return _S_propagate_on_move_assign() || _S_always_equal(); }
-
-    static constexpr bool _S_nothrow_swap()
-    {
-      using std::swap;
-      return !_S_propagate_on_swap()
-       	|| noexcept(swap(std::declval<_Alloc&>(), std::declval<_Alloc&>()));
-    }
-
-    template<typename _Tp>
-      struct rebind
-      { typedef typename _Base_type::template rebind_alloc<_Tp> other; };
-#else
-
-    typedef typename _Alloc::pointer                pointer;
-    typedef typename _Alloc::const_pointer          const_pointer;
-    typedef typename _Alloc::value_type             value_type;
-    typedef typename _Alloc::reference              reference;
-    typedef typename _Alloc::const_reference        const_reference;
-    typedef typename _Alloc::size_type              size_type;
-    typedef typename _Alloc::difference_type        difference_type;
-
-    static pointer
-    allocate(_Alloc& __a, size_type __n)
-    { return __a.allocate(__n); }
-
-    static void deallocate(_Alloc& __a, pointer __p, size_type __n)
-    { __a.deallocate(__p, __n); }
-
-    template<typename _Tp>
-      static void construct(_Alloc& __a, pointer __p, const _Tp& __arg)
-      { __a.construct(__p, __arg); }
-
-    static void destroy(_Alloc& __a, pointer __p)
-    { __a.destroy(__p); }
-
-    static size_type max_size(const _Alloc& __a)
-    { return __a.max_size(); }
-
-    static const _Alloc& _S_select_on_copy(const _Alloc& __a) { return __a; }
-
-    static void _S_on_swap(_Alloc& __a, _Alloc& __b)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 431. Swapping containers with unequal allocators.
-      std::__alloc_swap<_Alloc>::_S_do_it(__a, __b);
-    }
-
-    template<typename _Tp>
-      struct rebind
-      { typedef typename _Alloc::template rebind<_Tp>::other other; };
-#endif
-  };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __gnu_cxx
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/array_allocator.h b/openflow/usr/include/c++/5/ext/array_allocator.h
deleted file mode 100644
index d909cea..0000000
--- a/openflow/usr/include/c++/5/ext/array_allocator.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// array allocator -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/array_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _ARRAY_ALLOCATOR_H
-#define _ARRAY_ALLOCATOR_H 1
-
-#include <bits/c++config.h>
-#include <new>
-#include <bits/functexcept.h>
-#include <tr1/array>
-#include <bits/move.h>
-#if __cplusplus >= 201103L
-#include <type_traits>
-#endif
-
-// Suppress deprecated warning for this file.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
- using std::size_t;
- using std::ptrdiff_t;
-
-  /// Base class.
- template<typename _Tp>
-    class array_allocator_base
-    {
-    public:
-      typedef size_t     	size_type;
-      typedef ptrdiff_t  	difference_type;
-      typedef _Tp*       	pointer;
-      typedef const _Tp* 	const_pointer;
-      typedef _Tp&       	reference;
-      typedef const _Tp&	const_reference;
-      typedef _Tp        	value_type;
-
-      pointer
-      address(reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      const_pointer
-      address(const_reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      void
-      deallocate(pointer, size_type)
-      { 
-	// Does nothing.
-      }
-
-      size_type
-      max_size() const _GLIBCXX_USE_NOEXCEPT 
-      { return size_t(-1) / sizeof(_Tp); }
-
-#if __cplusplus >= 201103L
-      template<typename _Up, typename... _Args>
-        void
-        construct(_Up* __p, _Args&&... __args)
-	{ ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
-
-      template<typename _Up>
-        void 
-        destroy(_Up* __p) { __p->~_Up(); }
-#else
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_] allocator::construct
-      void 
-      construct(pointer __p, const _Tp& __val) 
-      { ::new((void *)__p) value_type(__val); }
-
-      void 
-      destroy(pointer __p) { __p->~_Tp(); }
-#endif
-    } _GLIBCXX_DEPRECATED;
-
-  /**
-   *  @brief  An allocator that uses previously allocated memory.
-   *  This memory can be externally, globally, or otherwise allocated.
-   *  @ingroup allocators
-   */
-  template<typename _Tp, typename _Array = std::tr1::array<_Tp, 1> >
-    class array_allocator : public array_allocator_base<_Tp>
-    {
-    public:
-      typedef size_t     	size_type;
-      typedef ptrdiff_t  	difference_type;
-      typedef _Tp*       	pointer;
-      typedef const _Tp* 	const_pointer;
-      typedef _Tp&       	reference;
-      typedef const _Tp& 	const_reference;
-      typedef _Tp        	value_type;
-      typedef _Array		array_type;
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2103. std::allocator propagate_on_container_move_assignment
-      typedef std::true_type propagate_on_container_move_assignment;
-#endif
-
-    private:
-      array_type* 	_M_array;
-      size_type 	_M_used;
-
-    public:
-     template<typename _Tp1, typename _Array1 = _Array>
-        struct rebind
-        {
-	  typedef array_allocator<_Tp1, _Array1> other _GLIBCXX_DEPRECATED;
-	} _GLIBCXX_DEPRECATED;
-
-      array_allocator(array_type* __array = 0) _GLIBCXX_USE_NOEXCEPT 
-      : _M_array(__array), _M_used(size_type()) { }
-
-      array_allocator(const array_allocator& __o) _GLIBCXX_USE_NOEXCEPT 
-      : _M_array(__o._M_array), _M_used(__o._M_used) { }
-
-      template<typename _Tp1, typename _Array1>
-        array_allocator(const array_allocator<_Tp1, _Array1>&)
-	_GLIBCXX_USE_NOEXCEPT
-	: _M_array(0), _M_used(size_type()) { }
-
-      ~array_allocator() _GLIBCXX_USE_NOEXCEPT { }
-
-      pointer
-      allocate(size_type __n, const void* = 0)
-      {
-	if (_M_array == 0 || _M_used + __n > _M_array->size())
-	  std::__throw_bad_alloc();
-	pointer __ret = _M_array->begin() + _M_used;
-	_M_used += __n;
-	return __ret;
-      }
-    } _GLIBCXX_DEPRECATED;
-
-  template<typename _Tp, typename _Array>
-    inline bool
-    operator==(const array_allocator<_Tp, _Array>&,
-	       const array_allocator<_Tp, _Array>&)
-    { return true; }
-  
-  template<typename _Tp, typename _Array>
-    inline bool
-    operator!=(const array_allocator<_Tp, _Array>&, 
-	       const array_allocator<_Tp, _Array>&)
-    { return false; }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#pragma GCC diagnostic pop
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/atomicity.h b/openflow/usr/include/c++/5/ext/atomicity.h
deleted file mode 100644
index aff33f8..0000000
--- a/openflow/usr/include/c++/5/ext/atomicity.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Support for atomic operations -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/atomicity.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_ATOMICITY_H
-#define _GLIBCXX_ATOMICITY_H	1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/gthr.h>
-#include <bits/atomic_word.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Functions for portable atomic access.
-  // To abstract locking primitives across all thread policies, use:
-  // __exchange_and_add_dispatch
-  // __atomic_add_dispatch
-#ifdef _GLIBCXX_ATOMIC_BUILTINS
-  static inline _Atomic_word 
-  __exchange_and_add(volatile _Atomic_word* __mem, int __val)
-  { return __atomic_fetch_add(__mem, __val, __ATOMIC_ACQ_REL); }
-
-  static inline void
-  __atomic_add(volatile _Atomic_word* __mem, int __val)
-  { __atomic_fetch_add(__mem, __val, __ATOMIC_ACQ_REL); }
-#else
-  _Atomic_word
-  __attribute__ ((__unused__))
-  __exchange_and_add(volatile _Atomic_word*, int) throw ();
-
-  void
-  __attribute__ ((__unused__))
-  __atomic_add(volatile _Atomic_word*, int) throw ();
-#endif
-
-  static inline _Atomic_word
-  __exchange_and_add_single(_Atomic_word* __mem, int __val)
-  {
-    _Atomic_word __result = *__mem;
-    *__mem += __val;
-    return __result;
-  }
-
-  static inline void
-  __atomic_add_single(_Atomic_word* __mem, int __val)
-  { *__mem += __val; }
-
-  static inline _Atomic_word
-  __attribute__ ((__unused__))
-  __exchange_and_add_dispatch(_Atomic_word* __mem, int __val)
-  {
-#ifdef __GTHREADS
-    if (__gthread_active_p())
-      return __exchange_and_add(__mem, __val);
-    else
-      return __exchange_and_add_single(__mem, __val);
-#else
-    return __exchange_and_add_single(__mem, __val);
-#endif
-  }
-
-  static inline void
-  __attribute__ ((__unused__))
-  __atomic_add_dispatch(_Atomic_word* __mem, int __val)
-  {
-#ifdef __GTHREADS
-    if (__gthread_active_p())
-      __atomic_add(__mem, __val);
-    else
-      __atomic_add_single(__mem, __val);
-#else
-    __atomic_add_single(__mem, __val);
-#endif
-  }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-// Even if the CPU doesn't need a memory barrier, we need to ensure
-// that the compiler doesn't reorder memory accesses across the
-// barriers.
-#ifndef _GLIBCXX_READ_MEM_BARRIER
-#define _GLIBCXX_READ_MEM_BARRIER __asm __volatile ("":::"memory")
-#endif
-#ifndef _GLIBCXX_WRITE_MEM_BARRIER
-#define _GLIBCXX_WRITE_MEM_BARRIER __asm __volatile ("":::"memory")
-#endif
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/bitmap_allocator.h b/openflow/usr/include/c++/5/ext/bitmap_allocator.h
deleted file mode 100644
index ff55866..0000000
--- a/openflow/usr/include/c++/5/ext/bitmap_allocator.h
+++ /dev/null
@@ -1,1119 +0,0 @@
-// Bitmap Allocator. -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/bitmap_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _BITMAP_ALLOCATOR_H
-#define _BITMAP_ALLOCATOR_H 1
-
-#include <utility> // For std::pair.
-#include <bits/functexcept.h> // For __throw_bad_alloc().
-#include <functional> // For greater_equal, and less_equal.
-#include <new> // For operator new.
-#include <debug/debug.h> // _GLIBCXX_DEBUG_ASSERT
-#include <ext/concurrence.h>
-#include <bits/move.h>
-
-/** @brief The constant in the expression below is the alignment
- * required in bytes.
- */
-#define _BALLOC_ALIGN_BYTES 8
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-  using std::size_t;
-  using std::ptrdiff_t;
-
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-    /** @class  __mini_vector bitmap_allocator.h bitmap_allocator.h
-     *
-     *  @brief  __mini_vector<> is a stripped down version of the
-     *  full-fledged std::vector<>.
-     *
-     *  It is to be used only for built-in types or PODs. Notable
-     *  differences are:
-     * 
-     *  1. Not all accessor functions are present.
-     *  2. Used ONLY for PODs.
-     *  3. No Allocator template argument. Uses ::operator new() to get
-     *  memory, and ::operator delete() to free it.
-     *  Caveat: The dtor does NOT free the memory allocated, so this a
-     *  memory-leaking vector!
-     */
-    template<typename _Tp>
-      class __mini_vector
-      {
-	__mini_vector(const __mini_vector&);
-	__mini_vector& operator=(const __mini_vector&);
-
-      public:
-	typedef _Tp value_type;
-	typedef _Tp* pointer;
-	typedef _Tp& reference;
-	typedef const _Tp& const_reference;
-	typedef size_t size_type;
-	typedef ptrdiff_t difference_type;
-	typedef pointer iterator;
-
-      private:
-	pointer _M_start;
-	pointer _M_finish;
-	pointer _M_end_of_storage;
-
-	size_type
-	_M_space_left() const throw()
-	{ return _M_end_of_storage - _M_finish; }
-
-	pointer
-	allocate(size_type __n)
-	{ return static_cast<pointer>(::operator new(__n * sizeof(_Tp))); }
-
-	void
-	deallocate(pointer __p, size_type)
-	{ ::operator delete(__p); }
-
-      public:
-	// Members used: size(), push_back(), pop_back(),
-	// insert(iterator, const_reference), erase(iterator),
-	// begin(), end(), back(), operator[].
-
-	__mini_vector()
-        : _M_start(0), _M_finish(0), _M_end_of_storage(0) { }
-
-	size_type
-	size() const throw()
-	{ return _M_finish - _M_start; }
-
-	iterator
-	begin() const throw()
-	{ return this->_M_start; }
-
-	iterator
-	end() const throw()
-	{ return this->_M_finish; }
-
-	reference
-	back() const throw()
-	{ return *(this->end() - 1); }
-
-	reference
-	operator[](const size_type __pos) const throw()
-	{ return this->_M_start[__pos]; }
-
-	void
-	insert(iterator __pos, const_reference __x);
-
-	void
-	push_back(const_reference __x)
-	{
-	  if (this->_M_space_left())
-	    {
-	      *this->end() = __x;
-	      ++this->_M_finish;
-	    }
-	  else
-	    this->insert(this->end(), __x);
-	}
-
-	void
-	pop_back() throw()
-	{ --this->_M_finish; }
-
-	void
-	erase(iterator __pos) throw();
-
-	void
-	clear() throw()
-	{ this->_M_finish = this->_M_start; }
-      };
-
-    // Out of line function definitions.
-    template<typename _Tp>
-      void __mini_vector<_Tp>::
-      insert(iterator __pos, const_reference __x)
-      {
-	if (this->_M_space_left())
-	  {
-	    size_type __to_move = this->_M_finish - __pos;
-	    iterator __dest = this->end();
-	    iterator __src = this->end() - 1;
-
-	    ++this->_M_finish;
-	    while (__to_move)
-	      {
-		*__dest = *__src;
-		--__dest; --__src; --__to_move;
-	      }
-	    *__pos = __x;
-	  }
-	else
-	  {
-	    size_type __new_size = this->size() ? this->size() * 2 : 1;
-	    iterator __new_start = this->allocate(__new_size);
-	    iterator __first = this->begin();
-	    iterator __start = __new_start;
-	    while (__first != __pos)
-	      {
-		*__start = *__first;
-		++__start; ++__first;
-	      }
-	    *__start = __x;
-	    ++__start;
-	    while (__first != this->end())
-	      {
-		*__start = *__first;
-		++__start; ++__first;
-	      }
-	    if (this->_M_start)
-	      this->deallocate(this->_M_start, this->size());
-
-	    this->_M_start = __new_start;
-	    this->_M_finish = __start;
-	    this->_M_end_of_storage = this->_M_start + __new_size;
-	  }
-      }
-
-    template<typename _Tp>
-      void __mini_vector<_Tp>::
-      erase(iterator __pos) throw()
-      {
-	while (__pos + 1 != this->end())
-	  {
-	    *__pos = __pos[1];
-	    ++__pos;
-	  }
-	--this->_M_finish;
-      }
-
-
-    template<typename _Tp>
-      struct __mv_iter_traits
-      {
-	typedef typename _Tp::value_type value_type;
-	typedef typename _Tp::difference_type difference_type;
-      };
-
-    template<typename _Tp>
-      struct __mv_iter_traits<_Tp*>
-      {
-	typedef _Tp value_type;
-	typedef ptrdiff_t difference_type;
-      };
-
-    enum 
-      { 
-	bits_per_byte = 8,
-	bits_per_block = sizeof(size_t) * size_t(bits_per_byte) 
-      };
-
-    template<typename _ForwardIterator, typename _Tp, typename _Compare>
-      _ForwardIterator
-      __lower_bound(_ForwardIterator __first, _ForwardIterator __last,
-		    const _Tp& __val, _Compare __comp)
-      {
-	typedef typename __mv_iter_traits<_ForwardIterator>::difference_type
-	  _DistanceType;
-
-	_DistanceType __len = __last - __first;
-	_DistanceType __half;
-	_ForwardIterator __middle;
-
-	while (__len > 0)
-	  {
-	    __half = __len >> 1;
-	    __middle = __first;
-	    __middle += __half;
-	    if (__comp(*__middle, __val))
-	      {
-		__first = __middle;
-		++__first;
-		__len = __len - __half - 1;
-	      }
-	    else
-	      __len = __half;
-	  }
-	return __first;
-      }
-
-    /** @brief The number of Blocks pointed to by the address pair
-     *  passed to the function.
-     */
-    template<typename _AddrPair>
-      inline size_t
-      __num_blocks(_AddrPair __ap)
-      { return (__ap.second - __ap.first) + 1; }
-
-    /** @brief The number of Bit-maps pointed to by the address pair
-     *  passed to the function.
-     */
-    template<typename _AddrPair>
-      inline size_t
-      __num_bitmaps(_AddrPair __ap)
-      { return __num_blocks(__ap) / size_t(bits_per_block); }
-
-    // _Tp should be a pointer type.
-    template<typename _Tp>
-      class _Inclusive_between 
-      : public std::unary_function<typename std::pair<_Tp, _Tp>, bool>
-      {
-	typedef _Tp pointer;
-	pointer _M_ptr_value;
-	typedef typename std::pair<_Tp, _Tp> _Block_pair;
-	
-      public:
-	_Inclusive_between(pointer __ptr) : _M_ptr_value(__ptr) 
-	{ }
-	
-	bool 
-	operator()(_Block_pair __bp) const throw()
-	{
-	  if (std::less_equal<pointer>()(_M_ptr_value, __bp.second) 
-	      && std::greater_equal<pointer>()(_M_ptr_value, __bp.first))
-	    return true;
-	  else
-	    return false;
-	}
-      };
-  
-    // Used to pass a Functor to functions by reference.
-    template<typename _Functor>
-      class _Functor_Ref 
-      : public std::unary_function<typename _Functor::argument_type, 
-				   typename _Functor::result_type>
-      {
-	_Functor& _M_fref;
-	
-      public:
-	typedef typename _Functor::argument_type argument_type;
-	typedef typename _Functor::result_type result_type;
-
-	_Functor_Ref(_Functor& __fref) : _M_fref(__fref) 
-	{ }
-
-	result_type 
-	operator()(argument_type __arg) 
-	{ return _M_fref(__arg); }
-      };
-
-    /** @class  _Ffit_finder bitmap_allocator.h bitmap_allocator.h
-     *
-     *  @brief  The class which acts as a predicate for applying the
-     *  first-fit memory allocation policy for the bitmap allocator.
-     */
-    // _Tp should be a pointer type, and _Alloc is the Allocator for
-    // the vector.
-    template<typename _Tp>
-      class _Ffit_finder 
-      : public std::unary_function<typename std::pair<_Tp, _Tp>, bool>
-      {
-	typedef typename std::pair<_Tp, _Tp> _Block_pair;
-	typedef typename __detail::__mini_vector<_Block_pair> _BPVector;
-	typedef typename _BPVector::difference_type _Counter_type;
-
-	size_t* _M_pbitmap;
-	_Counter_type _M_data_offset;
-
-      public:
-	_Ffit_finder() : _M_pbitmap(0), _M_data_offset(0)
-	{ }
-
-	bool 
-	operator()(_Block_pair __bp) throw()
-	{
-	  // Set the _rover to the last physical location bitmap,
-	  // which is the bitmap which belongs to the first free
-	  // block. Thus, the bitmaps are in exact reverse order of
-	  // the actual memory layout. So, we count down the bitmaps,
-	  // which is the same as moving up the memory.
-
-	  // If the used count stored at the start of the Bit Map headers
-	  // is equal to the number of Objects that the current Block can
-	  // store, then there is definitely no space for another single
-	  // object, so just return false.
-	  _Counter_type __diff = __detail::__num_bitmaps(__bp);
-
-	  if (*(reinterpret_cast<size_t*>
-		(__bp.first) - (__diff + 1)) == __detail::__num_blocks(__bp))
-	    return false;
-
-	  size_t* __rover = reinterpret_cast<size_t*>(__bp.first) - 1;
-
-	  for (_Counter_type __i = 0; __i < __diff; ++__i)
-	    {
-	      _M_data_offset = __i;
-	      if (*__rover)
-		{
-		  _M_pbitmap = __rover;
-		  return true;
-		}
-	      --__rover;
-	    }
-	  return false;
-	}
-    
-	size_t*
-	_M_get() const throw()
-	{ return _M_pbitmap; }
-
-	_Counter_type
-	_M_offset() const throw()
-	{ return _M_data_offset * size_t(bits_per_block); }
-      };
-
-    /** @class  _Bitmap_counter bitmap_allocator.h bitmap_allocator.h
-     *
-     *  @brief  The bitmap counter which acts as the bitmap
-     *  manipulator, and manages the bit-manipulation functions and
-     *  the searching and identification functions on the bit-map.
-     */
-    // _Tp should be a pointer type.
-    template<typename _Tp>
-      class _Bitmap_counter
-      {
-	typedef typename
-	__detail::__mini_vector<typename std::pair<_Tp, _Tp> > _BPVector;
-	typedef typename _BPVector::size_type _Index_type;
-	typedef _Tp pointer;
-
-	_BPVector& _M_vbp;
-	size_t* _M_curr_bmap;
-	size_t* _M_last_bmap_in_block;
-	_Index_type _M_curr_index;
-    
-      public:
-	// Use the 2nd parameter with care. Make sure that such an
-	// entry exists in the vector before passing that particular
-	// index to this ctor.
-	_Bitmap_counter(_BPVector& Rvbp, long __index = -1) : _M_vbp(Rvbp)
-	{ this->_M_reset(__index); }
-    
-	void 
-	_M_reset(long __index = -1) throw()
-	{
-	  if (__index == -1)
-	    {
-	      _M_curr_bmap = 0;
-	      _M_curr_index = static_cast<_Index_type>(-1);
-	      return;
-	    }
-
-	  _M_curr_index = __index;
-	  _M_curr_bmap = reinterpret_cast<size_t*>
-	    (_M_vbp[_M_curr_index].first) - 1;
-	  
-	  _GLIBCXX_DEBUG_ASSERT(__index <= (long)_M_vbp.size() - 1);
-	
-	  _M_last_bmap_in_block = _M_curr_bmap
-	    - ((_M_vbp[_M_curr_index].second 
-		- _M_vbp[_M_curr_index].first + 1) 
-	       / size_t(bits_per_block) - 1);
-	}
-    
-	// Dangerous Function! Use with extreme care. Pass to this
-	// function ONLY those values that are known to be correct,
-	// otherwise this will mess up big time.
-	void
-	_M_set_internal_bitmap(size_t* __new_internal_marker) throw()
-	{ _M_curr_bmap = __new_internal_marker; }
-    
-	bool
-	_M_finished() const throw()
-	{ return(_M_curr_bmap == 0); }
-    
-	_Bitmap_counter&
-	operator++() throw()
-	{
-	  if (_M_curr_bmap == _M_last_bmap_in_block)
-	    {
-	      if (++_M_curr_index == _M_vbp.size())
-		_M_curr_bmap = 0;
-	      else
-		this->_M_reset(_M_curr_index);
-	    }
-	  else
-	    --_M_curr_bmap;
-	  return *this;
-	}
-    
-	size_t*
-	_M_get() const throw()
-	{ return _M_curr_bmap; }
-    
-	pointer 
-	_M_base() const throw()
-	{ return _M_vbp[_M_curr_index].first; }
-
-	_Index_type
-	_M_offset() const throw()
-	{
-	  return size_t(bits_per_block)
-	    * ((reinterpret_cast<size_t*>(this->_M_base()) 
-		- _M_curr_bmap) - 1);
-	}
-    
-	_Index_type
-	_M_where() const throw()
-	{ return _M_curr_index; }
-      };
-
-    /** @brief  Mark a memory address as allocated by re-setting the
-     *  corresponding bit in the bit-map.
-     */
-    inline void 
-    __bit_allocate(size_t* __pbmap, size_t __pos) throw()
-    {
-      size_t __mask = 1 << __pos;
-      __mask = ~__mask;
-      *__pbmap &= __mask;
-    }
-  
-    /** @brief  Mark a memory address as free by setting the
-     *  corresponding bit in the bit-map.
-     */
-    inline void 
-    __bit_free(size_t* __pbmap, size_t __pos) throw()
-    {
-      size_t __mask = 1 << __pos;
-      *__pbmap |= __mask;
-    }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace __detail
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /** @brief  Generic Version of the bsf instruction.
-   */
-  inline size_t 
-  _Bit_scan_forward(size_t __num)
-  { return static_cast<size_t>(__builtin_ctzl(__num)); }
-
-  /** @class  free_list bitmap_allocator.h bitmap_allocator.h
-   *
-   *  @brief  The free list class for managing chunks of memory to be
-   *  given to and returned by the bitmap_allocator.
-   */
-  class free_list
-  {
-  public:
-    typedef size_t* 				value_type;
-    typedef __detail::__mini_vector<value_type> vector_type;
-    typedef vector_type::iterator 		iterator;
-    typedef __mutex				__mutex_type;
-
-  private:
-    struct _LT_pointer_compare
-    {
-      bool
-      operator()(const size_t* __pui, 
-		 const size_t __cui) const throw()
-      { return *__pui < __cui; }
-    };
-
-#if defined __GTHREADS
-    __mutex_type&
-    _M_get_mutex()
-    {
-      static __mutex_type _S_mutex;
-      return _S_mutex;
-    }
-#endif
-
-    vector_type&
-    _M_get_free_list()
-    {
-      static vector_type _S_free_list;
-      return _S_free_list;
-    }
-
-    /** @brief  Performs validation of memory based on their size.
-     *
-     *  @param  __addr The pointer to the memory block to be
-     *  validated.
-     *
-     *  Validates the memory block passed to this function and
-     *  appropriately performs the action of managing the free list of
-     *  blocks by adding this block to the free list or deleting this
-     *  or larger blocks from the free list.
-     */
-    void
-    _M_validate(size_t* __addr) throw()
-    {
-      vector_type& __free_list = _M_get_free_list();
-      const vector_type::size_type __max_size = 64;
-      if (__free_list.size() >= __max_size)
-	{
-	  // Ok, the threshold value has been reached.  We determine
-	  // which block to remove from the list of free blocks.
-	  if (*__addr >= *__free_list.back())
-	    {
-	      // Ok, the new block is greater than or equal to the
-	      // last block in the list of free blocks. We just free
-	      // the new block.
-	      ::operator delete(static_cast<void*>(__addr));
-	      return;
-	    }
-	  else
-	    {
-	      // Deallocate the last block in the list of free lists,
-	      // and insert the new one in its correct position.
-	      ::operator delete(static_cast<void*>(__free_list.back()));
-	      __free_list.pop_back();
-	    }
-	}
-	  
-      // Just add the block to the list of free lists unconditionally.
-      iterator __temp = __detail::__lower_bound
-	(__free_list.begin(), __free_list.end(), 
-	 *__addr, _LT_pointer_compare());
-
-      // We may insert the new free list before _temp;
-      __free_list.insert(__temp, __addr);
-    }
-
-    /** @brief  Decides whether the wastage of memory is acceptable for
-     *  the current memory request and returns accordingly.
-     *
-     *  @param __block_size The size of the block available in the free
-     *  list.
-     *
-     *  @param __required_size The required size of the memory block.
-     *
-     *  @return true if the wastage incurred is acceptable, else returns
-     *  false.
-     */
-    bool 
-    _M_should_i_give(size_t __block_size, 
-		     size_t __required_size) throw()
-    {
-      const size_t __max_wastage_percentage = 36;
-      if (__block_size >= __required_size && 
-	  (((__block_size - __required_size) * 100 / __block_size)
-	   < __max_wastage_percentage))
-	return true;
-      else
-	return false;
-    }
-
-  public:
-    /** @brief This function returns the block of memory to the
-     *  internal free list.
-     *
-     *  @param  __addr The pointer to the memory block that was given
-     *  by a call to the _M_get function.
-     */
-    inline void 
-    _M_insert(size_t* __addr) throw()
-    {
-#if defined __GTHREADS
-      __scoped_lock __bfl_lock(_M_get_mutex());
-#endif
-      // Call _M_validate to decide what should be done with
-      // this particular free list.
-      this->_M_validate(reinterpret_cast<size_t*>(__addr) - 1);
-      // See discussion as to why this is 1!
-    }
-    
-    /** @brief  This function gets a block of memory of the specified
-     *  size from the free list.
-     *
-     *  @param  __sz The size in bytes of the memory required.
-     *
-     *  @return  A pointer to the new memory block of size at least
-     *  equal to that requested.
-     */
-    size_t*
-    _M_get(size_t __sz) throw(std::bad_alloc);
-
-    /** @brief  This function just clears the internal Free List, and
-     *  gives back all the memory to the OS.
-     */
-    void 
-    _M_clear();
-  };
-
-
-  // Forward declare the class.
-  template<typename _Tp> 
-    class bitmap_allocator;
-
-  // Specialize for void:
-  template<>
-    class bitmap_allocator<void>
-    {
-    public:
-      typedef void*       pointer;
-      typedef const void* const_pointer;
-
-      // Reference-to-void members are impossible.
-      typedef void  value_type;
-      template<typename _Tp1>
-        struct rebind
-	{
-	  typedef bitmap_allocator<_Tp1> other;
-	};
-    };
-
-  /**
-   * @brief Bitmap Allocator, primary template.
-   * @ingroup allocators
-   */
-  template<typename _Tp>
-    class bitmap_allocator : private free_list
-    {
-    public:
-      typedef size_t    		size_type;
-      typedef ptrdiff_t 		difference_type;
-      typedef _Tp*        		pointer;
-      typedef const _Tp*  		const_pointer;
-      typedef _Tp&        		reference;
-      typedef const _Tp&  		const_reference;
-      typedef _Tp         		value_type;
-      typedef free_list::__mutex_type 	__mutex_type;
-
-      template<typename _Tp1>
-        struct rebind
-	{
-	  typedef bitmap_allocator<_Tp1> other;
-	};
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2103. propagate_on_container_move_assignment
-      typedef std::true_type propagate_on_container_move_assignment;
-#endif
-
-    private:
-      template<size_t _BSize, size_t _AlignSize>
-        struct aligned_size
-	{
-	  enum
-	    { 
-	      modulus = _BSize % _AlignSize,
-	      value = _BSize + (modulus ? _AlignSize - (modulus) : 0)
-	    };
-	};
-
-      struct _Alloc_block
-      {
-	char __M_unused[aligned_size<sizeof(value_type),
-			_BALLOC_ALIGN_BYTES>::value];
-      };
-
-
-      typedef typename std::pair<_Alloc_block*, _Alloc_block*> _Block_pair;
-
-      typedef typename __detail::__mini_vector<_Block_pair> _BPVector;
-      typedef typename _BPVector::iterator _BPiter;
-
-      template<typename _Predicate>
-        static _BPiter
-        _S_find(_Predicate __p)
-        {
-	  _BPiter __first = _S_mem_blocks.begin();
-	  while (__first != _S_mem_blocks.end() && !__p(*__first))
-	    ++__first;
-	  return __first;
-	}
-
-#if defined _GLIBCXX_DEBUG
-      // Complexity: O(lg(N)). Where, N is the number of block of size
-      // sizeof(value_type).
-      void 
-      _S_check_for_free_blocks() throw()
-      {
-	typedef typename __detail::_Ffit_finder<_Alloc_block*> _FFF;
-	_BPiter __bpi = _S_find(_FFF());
-
-	_GLIBCXX_DEBUG_ASSERT(__bpi == _S_mem_blocks.end());
-      }
-#endif
-
-      /** @brief  Responsible for exponentially growing the internal
-       *  memory pool.
-       *
-       *  @throw  std::bad_alloc. If memory can not be allocated.
-       *
-       *  Complexity: O(1), but internally depends upon the
-       *  complexity of the function free_list::_M_get. The part where
-       *  the bitmap headers are written has complexity: O(X),where X
-       *  is the number of blocks of size sizeof(value_type) within
-       *  the newly acquired block. Having a tight bound.
-       */
-      void 
-      _S_refill_pool() throw(std::bad_alloc)
-      {
-#if defined _GLIBCXX_DEBUG
-	_S_check_for_free_blocks();
-#endif
-
-	const size_t __num_bitmaps = (_S_block_size
-				      / size_t(__detail::bits_per_block));
-	const size_t __size_to_allocate = sizeof(size_t) 
-	  + _S_block_size * sizeof(_Alloc_block) 
-	  + __num_bitmaps * sizeof(size_t);
-
-	size_t* __temp =
-	  reinterpret_cast<size_t*>(this->_M_get(__size_to_allocate));
-	*__temp = 0;
-	++__temp;
-
-	// The Header information goes at the Beginning of the Block.
-	_Block_pair __bp = 
-	  std::make_pair(reinterpret_cast<_Alloc_block*>
-			 (__temp + __num_bitmaps), 
-			 reinterpret_cast<_Alloc_block*>
-			 (__temp + __num_bitmaps) 
-			 + _S_block_size - 1);
-	
-	// Fill the Vector with this information.
-	_S_mem_blocks.push_back(__bp);
-
-	for (size_t __i = 0; __i < __num_bitmaps; ++__i)
-	  __temp[__i] = ~static_cast<size_t>(0); // 1 Indicates all Free.
-
-	_S_block_size *= 2;
-      }
-
-      static _BPVector _S_mem_blocks;
-      static size_t _S_block_size;
-      static __detail::_Bitmap_counter<_Alloc_block*> _S_last_request;
-      static typename _BPVector::size_type _S_last_dealloc_index;
-#if defined __GTHREADS
-      static __mutex_type _S_mut;
-#endif
-
-    public:
-
-      /** @brief  Allocates memory for a single object of size
-       *  sizeof(_Tp).
-       *
-       *  @throw  std::bad_alloc. If memory can not be allocated.
-       *
-       *  Complexity: Worst case complexity is O(N), but that
-       *  is hardly ever hit. If and when this particular case is
-       *  encountered, the next few cases are guaranteed to have a
-       *  worst case complexity of O(1)!  That's why this function
-       *  performs very well on average. You can consider this
-       *  function to have a complexity referred to commonly as:
-       *  Amortized Constant time.
-       */
-      pointer 
-      _M_allocate_single_object() throw(std::bad_alloc)
-      {
-#if defined __GTHREADS
-	__scoped_lock __bit_lock(_S_mut);
-#endif
-
-	// The algorithm is something like this: The last_request
-	// variable points to the last accessed Bit Map. When such a
-	// condition occurs, we try to find a free block in the
-	// current bitmap, or succeeding bitmaps until the last bitmap
-	// is reached. If no free block turns up, we resort to First
-	// Fit method.
-
-	// WARNING: Do not re-order the condition in the while
-	// statement below, because it relies on C++'s short-circuit
-	// evaluation. The return from _S_last_request->_M_get() will
-	// NOT be dereference able if _S_last_request->_M_finished()
-	// returns true. This would inevitably lead to a NULL pointer
-	// dereference if tinkered with.
-	while (_S_last_request._M_finished() == false
-	       && (*(_S_last_request._M_get()) == 0))
-	  _S_last_request.operator++();
-
-	if (__builtin_expect(_S_last_request._M_finished() == true, false))
-	  {
-	    // Fall Back to First Fit algorithm.
-	    typedef typename __detail::_Ffit_finder<_Alloc_block*> _FFF;
-	    _FFF __fff;
-	    _BPiter __bpi = _S_find(__detail::_Functor_Ref<_FFF>(__fff));
-
-	    if (__bpi != _S_mem_blocks.end())
-	      {
-		// Search was successful. Ok, now mark the first bit from
-		// the right as 0, meaning Allocated. This bit is obtained
-		// by calling _M_get() on __fff.
-		size_t __nz_bit = _Bit_scan_forward(*__fff._M_get());
-		__detail::__bit_allocate(__fff._M_get(), __nz_bit);
-
-		_S_last_request._M_reset(__bpi - _S_mem_blocks.begin());
-
-		// Now, get the address of the bit we marked as allocated.
-		pointer __ret = reinterpret_cast<pointer>
-		  (__bpi->first + __fff._M_offset() + __nz_bit);
-		size_t* __puse_count = 
-		  reinterpret_cast<size_t*>
-		  (__bpi->first) - (__detail::__num_bitmaps(*__bpi) + 1);
-		
-		++(*__puse_count);
-		return __ret;
-	      }
-	    else
-	      {
-		// Search was unsuccessful. We Add more memory to the
-		// pool by calling _S_refill_pool().
-		_S_refill_pool();
-
-		// _M_Reset the _S_last_request structure to the first
-		// free block's bit map.
-		_S_last_request._M_reset(_S_mem_blocks.size() - 1);
-
-		// Now, mark that bit as allocated.
-	      }
-	  }
-
-	// _S_last_request holds a pointer to a valid bit map, that
-	// points to a free block in memory.
-	size_t __nz_bit = _Bit_scan_forward(*_S_last_request._M_get());
-	__detail::__bit_allocate(_S_last_request._M_get(), __nz_bit);
-
-	pointer __ret = reinterpret_cast<pointer>
-	  (_S_last_request._M_base() + _S_last_request._M_offset() + __nz_bit);
-
-	size_t* __puse_count = reinterpret_cast<size_t*>
-	  (_S_mem_blocks[_S_last_request._M_where()].first)
-	  - (__detail::
-	     __num_bitmaps(_S_mem_blocks[_S_last_request._M_where()]) + 1);
-
-	++(*__puse_count);
-	return __ret;
-      }
-
-      /** @brief  Deallocates memory that belongs to a single object of
-       *  size sizeof(_Tp).
-       *
-       *  Complexity: O(lg(N)), but the worst case is not hit
-       *  often!  This is because containers usually deallocate memory
-       *  close to each other and this case is handled in O(1) time by
-       *  the deallocate function.
-       */
-      void 
-      _M_deallocate_single_object(pointer __p) throw()
-      {
-#if defined __GTHREADS
-	__scoped_lock __bit_lock(_S_mut);
-#endif
-	_Alloc_block* __real_p = reinterpret_cast<_Alloc_block*>(__p);
-
-	typedef typename _BPVector::iterator _Iterator;
-	typedef typename _BPVector::difference_type _Difference_type;
-
-	_Difference_type __diff;
-	long __displacement;
-
-	_GLIBCXX_DEBUG_ASSERT(_S_last_dealloc_index >= 0);
-
-	__detail::_Inclusive_between<_Alloc_block*> __ibt(__real_p);
-	if (__ibt(_S_mem_blocks[_S_last_dealloc_index]))
-	  {
-	    _GLIBCXX_DEBUG_ASSERT(_S_last_dealloc_index
-				  <= _S_mem_blocks.size() - 1);
-
-	    // Initial Assumption was correct!
-	    __diff = _S_last_dealloc_index;
-	    __displacement = __real_p - _S_mem_blocks[__diff].first;
-	  }
-	else
-	  {
-	    _Iterator _iter = _S_find(__ibt);
-
-	    _GLIBCXX_DEBUG_ASSERT(_iter != _S_mem_blocks.end());
-
-	    __diff = _iter - _S_mem_blocks.begin();
-	    __displacement = __real_p - _S_mem_blocks[__diff].first;
-	    _S_last_dealloc_index = __diff;
-	  }
-
-	// Get the position of the iterator that has been found.
-	const size_t __rotate = (__displacement
-				 % size_t(__detail::bits_per_block));
-	size_t* __bitmapC = 
-	  reinterpret_cast<size_t*>
-	  (_S_mem_blocks[__diff].first) - 1;
-	__bitmapC -= (__displacement / size_t(__detail::bits_per_block));
-      
-	__detail::__bit_free(__bitmapC, __rotate);
-	size_t* __puse_count = reinterpret_cast<size_t*>
-	  (_S_mem_blocks[__diff].first)
-	  - (__detail::__num_bitmaps(_S_mem_blocks[__diff]) + 1);
-	
-	_GLIBCXX_DEBUG_ASSERT(*__puse_count != 0);
-
-	--(*__puse_count);
-
-	if (__builtin_expect(*__puse_count == 0, false))
-	  {
-	    _S_block_size /= 2;
-	  
-	    // We can safely remove this block.
-	    // _Block_pair __bp = _S_mem_blocks[__diff];
-	    this->_M_insert(__puse_count);
-	    _S_mem_blocks.erase(_S_mem_blocks.begin() + __diff);
-
-	    // Reset the _S_last_request variable to reflect the
-	    // erased block. We do this to protect future requests
-	    // after the last block has been removed from a particular
-	    // memory Chunk, which in turn has been returned to the
-	    // free list, and hence had been erased from the vector,
-	    // so the size of the vector gets reduced by 1.
-	    if ((_Difference_type)_S_last_request._M_where() >= __diff--)
-	      _S_last_request._M_reset(__diff); 
-
-	    // If the Index into the vector of the region of memory
-	    // that might hold the next address that will be passed to
-	    // deallocated may have been invalidated due to the above
-	    // erase procedure being called on the vector, hence we
-	    // try to restore this invariant too.
-	    if (_S_last_dealloc_index >= _S_mem_blocks.size())
-	      {
-		_S_last_dealloc_index =(__diff != -1 ? __diff : 0);
-		_GLIBCXX_DEBUG_ASSERT(_S_last_dealloc_index >= 0);
-	      }
-	  }
-      }
-
-    public:
-      bitmap_allocator() _GLIBCXX_USE_NOEXCEPT
-      { }
-
-      bitmap_allocator(const bitmap_allocator&) _GLIBCXX_USE_NOEXCEPT
-      { }
-
-      template<typename _Tp1>
-        bitmap_allocator(const bitmap_allocator<_Tp1>&) _GLIBCXX_USE_NOEXCEPT
-        { }
-
-      ~bitmap_allocator() _GLIBCXX_USE_NOEXCEPT
-      { }
-
-      pointer 
-      allocate(size_type __n)
-      {
-	if (__n > this->max_size())
-	  std::__throw_bad_alloc();
-
-	if (__builtin_expect(__n == 1, true))
-	  return this->_M_allocate_single_object();
-	else
-	  { 
-	    const size_type __b = __n * sizeof(value_type);
-	    return reinterpret_cast<pointer>(::operator new(__b));
-	  }
-      }
-
-      pointer 
-      allocate(size_type __n, typename bitmap_allocator<void>::const_pointer)
-      { return allocate(__n); }
-
-      void 
-      deallocate(pointer __p, size_type __n) throw()
-      {
-	if (__builtin_expect(__p != 0, true))
-	  {
-	    if (__builtin_expect(__n == 1, true))
-	      this->_M_deallocate_single_object(__p);
-	    else
-	      ::operator delete(__p);
-	  }
-      }
-
-      pointer 
-      address(reference __r) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__r); }
-
-      const_pointer 
-      address(const_reference __r) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__r); }
-
-      size_type 
-      max_size() const _GLIBCXX_USE_NOEXCEPT
-      { return size_type(-1) / sizeof(value_type); }
-
-#if __cplusplus >= 201103L
-      template<typename _Up, typename... _Args>
-        void
-        construct(_Up* __p, _Args&&... __args)
-	{ ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
-
-      template<typename _Up>
-        void 
-        destroy(_Up* __p)
-        { __p->~_Up(); }
-#else
-      void 
-      construct(pointer __p, const_reference __data)
-      { ::new((void *)__p) value_type(__data); }
-
-      void 
-      destroy(pointer __p)
-      { __p->~value_type(); }
-#endif
-    };
-
-  template<typename _Tp1, typename _Tp2>
-    bool 
-    operator==(const bitmap_allocator<_Tp1>&, 
-	       const bitmap_allocator<_Tp2>&) throw()
-    { return true; }
-  
-  template<typename _Tp1, typename _Tp2>
-    bool 
-    operator!=(const bitmap_allocator<_Tp1>&, 
-	       const bitmap_allocator<_Tp2>&) throw() 
-  { return false; }
-
-  // Static member definitions.
-  template<typename _Tp>
-    typename bitmap_allocator<_Tp>::_BPVector
-    bitmap_allocator<_Tp>::_S_mem_blocks;
-
-  template<typename _Tp>
-    size_t bitmap_allocator<_Tp>::_S_block_size = 
-    2 * size_t(__detail::bits_per_block);
-
-  template<typename _Tp>
-    typename bitmap_allocator<_Tp>::_BPVector::size_type 
-    bitmap_allocator<_Tp>::_S_last_dealloc_index = 0;
-
-  template<typename _Tp>
-    __detail::_Bitmap_counter
-      <typename bitmap_allocator<_Tp>::_Alloc_block*>
-    bitmap_allocator<_Tp>::_S_last_request(_S_mem_blocks);
-
-#if defined __GTHREADS
-  template<typename _Tp>
-    typename bitmap_allocator<_Tp>::__mutex_type
-    bitmap_allocator<_Tp>::_S_mut;
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __gnu_cxx
-
-#endif 
-
diff --git a/openflow/usr/include/c++/5/ext/cast.h b/openflow/usr/include/c++/5/ext/cast.h
deleted file mode 100644
index 64611aa..0000000
--- a/openflow/usr/include/c++/5/ext/cast.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// <cast.h> -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/cast.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ext/pointer.h}
- */
-
-#ifndef _GLIBCXX_CAST_H
-#define _GLIBCXX_CAST_H 1
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * These functions are here to allow containers to support non standard
-   * pointer types.  For normal pointers, these resolve to the use of the
-   * standard cast operation.  For other types the functions will perform
-   * the appropriate cast to/from the custom pointer class so long as that
-   * class meets the following conditions:
-   * 1) has a typedef element_type which names tehe type it points to.
-   * 2) has a get() const method which returns element_type*.
-   * 3) has a constructor which can take one element_type* argument.
-   */
-
-  /**
-   * This type supports the semantics of the pointer cast operators (below.)
-   */
-  template<typename _ToType>
-    struct _Caster
-    { typedef typename _ToType::element_type*  type; };
-
-  template<typename _ToType>
-    struct _Caster<_ToType*>
-    { typedef _ToType*  type; };
-
-  /**
-   * Casting operations for cases where _FromType is not a standard pointer.
-   * _ToType can be a standard or non-standard pointer.  Given that _FromType
-   * is not a pointer, it must have a get() method that returns the standard
-   * pointer equivalent of the address it points to, and must have an
-   * element_type typedef which names the type it points to.
-   */
-  template<typename _ToType, typename _FromType>
-    inline _ToType
-    __static_pointer_cast(const _FromType& __arg)
-    { return _ToType(static_cast<typename _Caster<_ToType>::
-		     type>(__arg.get())); }
-
-  template<typename _ToType, typename _FromType>
-    inline _ToType
-    __dynamic_pointer_cast(const _FromType& __arg)
-    { return _ToType(dynamic_cast<typename _Caster<_ToType>::
-		     type>(__arg.get())); }
-
-  template<typename _ToType, typename _FromType>
-    inline _ToType
-    __const_pointer_cast(const _FromType& __arg)
-    { return _ToType(const_cast<typename _Caster<_ToType>::
-		     type>(__arg.get())); }
-
-  template<typename _ToType, typename _FromType>
-    inline _ToType
-    __reinterpret_pointer_cast(const _FromType& __arg)
-    { return _ToType(reinterpret_cast<typename _Caster<_ToType>::
-		     type>(__arg.get())); }
-
-  /**
-   * Casting operations for cases where _FromType is a standard pointer.
-   * _ToType can be a standard or non-standard pointer.
-   */
-  template<typename _ToType, typename _FromType>
-    inline _ToType
-    __static_pointer_cast(_FromType* __arg)
-    { return _ToType(static_cast<typename _Caster<_ToType>::
-		     type>(__arg)); }
-
-  template<typename _ToType, typename _FromType>
-    inline _ToType
-    __dynamic_pointer_cast(_FromType* __arg)
-    { return _ToType(dynamic_cast<typename _Caster<_ToType>::
-		     type>(__arg)); }
-
-  template<typename _ToType, typename _FromType>
-    inline _ToType
-    __const_pointer_cast(_FromType* __arg)
-    { return _ToType(const_cast<typename _Caster<_ToType>::
-		     type>(__arg)); }
-
-  template<typename _ToType, typename _FromType>
-    inline _ToType
-    __reinterpret_pointer_cast(_FromType* __arg)
-    { return _ToType(reinterpret_cast<typename _Caster<_ToType>::
-		     type>(__arg)); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // _GLIBCXX_CAST_H
diff --git a/openflow/usr/include/c++/5/ext/cmath b/openflow/usr/include/c++/5/ext/cmath
deleted file mode 100644
index 49e1bcb..0000000
--- a/openflow/usr/include/c++/5/ext/cmath
+++ /dev/null
@@ -1,152 +0,0 @@
-// Math extensions -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/cmath
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _EXT_CMATH
-#define _EXT_CMATH 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <cmath>
-#include <type_traits>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // A class for math constants.
-  template<typename _RealType>
-    struct __math_constants
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-      // Constant @f$ \pi @f$.
-      static constexpr _RealType __pi = 3.1415926535897932384626433832795029L;
-      // Constant @f$ \pi / 2 @f$.
-      static constexpr _RealType __pi_half = 1.5707963267948966192313216916397514L;
-      // Constant @f$ \pi / 3 @f$.
-      static constexpr _RealType __pi_third = 1.0471975511965977461542144610931676L;
-      // Constant @f$ \pi / 4 @f$.
-      static constexpr _RealType __pi_quarter = 0.7853981633974483096156608458198757L;
-      // Constant @f$ \sqrt(\pi / 2) @f$.
-      static constexpr _RealType __root_pi_div_2 = 1.2533141373155002512078826424055226L;
-      // Constant @f$ 1 / \pi @f$.
-      static constexpr _RealType __one_div_pi = 0.3183098861837906715377675267450287L;
-      // Constant @f$ 2 / \pi @f$.
-      static constexpr _RealType __two_div_pi = 0.6366197723675813430755350534900574L;
-      // Constant @f$ 2 / \sqrt(\pi) @f$.
-      static constexpr _RealType __two_div_root_pi = 1.1283791670955125738961589031215452L;
-
-      // Constant Euler's number @f$ e @f$.
-      static constexpr _RealType __e = 2.7182818284590452353602874713526625L;
-      // Constant @f$ 1 / e @f$.
-      static constexpr _RealType __one_div_e = 0.36787944117144232159552377016146087L;
-      // Constant @f$ \log_2(e) @f$.
-      static constexpr _RealType __log2_e = 1.4426950408889634073599246810018921L;
-      // Constant @f$ \log_10(e) @f$.
-      static constexpr _RealType __log10_e = 0.4342944819032518276511289189166051L;
-      // Constant @f$ \ln(2) @f$.
-      static constexpr _RealType __ln_2 = 0.6931471805599453094172321214581766L;
-      // Constant @f$ \ln(3) @f$.
-      static constexpr _RealType __ln_3 = 1.0986122886681096913952452369225257L;
-      // Constant @f$ \ln(10) @f$.
-      static constexpr _RealType __ln_10 = 2.3025850929940456840179914546843642L;
-
-      // Constant Euler-Mascheroni @f$ \gamma_E @f$.
-      static constexpr _RealType __gamma_e = 0.5772156649015328606065120900824024L;
-      // Constant Golden Ratio @f$ \phi @f$.
-      static constexpr _RealType __phi = 1.6180339887498948482045868343656381L;
-
-      // Constant @f$ \sqrt(2) @f$.
-      static constexpr _RealType __root_2 = 1.4142135623730950488016887242096981L;
-      // Constant @f$ \sqrt(3) @f$.
-      static constexpr _RealType __root_3 = 1.7320508075688772935274463415058724L;
-      // Constant @f$ \sqrt(5) @f$.
-      static constexpr _RealType __root_5 = 2.2360679774997896964091736687312762L;
-      // Constant @f$ \sqrt(7) @f$.
-      static constexpr _RealType __root_7 = 2.6457513110645905905016157536392604L;
-      // Constant @f$ 1 / \sqrt(2) @f$.
-      static constexpr _RealType __one_div_root_2 = 0.7071067811865475244008443621048490L;
-    };
-
-  // And the template definitions for the constants.
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__pi;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__pi_half;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__pi_third;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__pi_quarter;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__root_pi_div_2;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__one_div_pi;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__two_div_pi;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__two_div_root_pi;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__e;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__one_div_e;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__log2_e;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__log10_e;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__ln_2;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__ln_3;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__ln_10;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__gamma_e;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__phi;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__root_2;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__root_3;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__root_5;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__root_7;
-  template<typename _RealType>
-    constexpr _RealType __math_constants<_RealType>::__one_div_root_2;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __gnu_cxx
-
-#endif // C++11
-
-#endif // _EXT_CMATH
diff --git a/openflow/usr/include/c++/5/ext/codecvt_specializations.h b/openflow/usr/include/c++/5/ext/codecvt_specializations.h
deleted file mode 100644
index 34e90bd..0000000
--- a/openflow/usr/include/c++/5/ext/codecvt_specializations.h
+++ /dev/null
@@ -1,515 +0,0 @@
-// Locale support (codecvt) -*- C++ -*-
-
-// Copyright (C) 2000-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-//
-// ISO C++ 14882: 22.2.1.5 Template class codecvt
-//
-
-// Written by Benjamin Kosnik <bkoz@redhat.com>
-
-/** @file ext/codecvt_specializations.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _EXT_CODECVT_SPECIALIZATIONS_H
-#define _EXT_CODECVT_SPECIALIZATIONS_H 1
-
-#include <bits/c++config.h>
-#include <locale>
-#include <iconv.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /// Extension to use iconv for dealing with character encodings.
-  // This includes conversions and comparisons between various character
-  // sets.  This object encapsulates data that may need to be shared between
-  // char_traits, codecvt and ctype.
-  class encoding_state
-  {
-  public:
-    // Types: 
-    // NB: A conversion descriptor subsumes and enhances the
-    // functionality of a simple state type such as mbstate_t.
-    typedef iconv_t	descriptor_type;
-    
-  protected:
-    // Name of internal character set encoding.
-    std::string	       	_M_int_enc;
-
-    // Name of external character set encoding.
-    std::string  	_M_ext_enc;
-
-    // Conversion descriptor between external encoding to internal encoding.
-    descriptor_type	_M_in_desc;
-
-    // Conversion descriptor between internal encoding to external encoding.
-    descriptor_type	_M_out_desc;
-
-    // The byte-order marker for the external encoding, if necessary.
-    int			_M_ext_bom;
-
-    // The byte-order marker for the internal encoding, if necessary.
-    int			_M_int_bom;
-
-    // Number of external bytes needed to construct one complete
-    // character in the internal encoding.
-    // NB: -1 indicates variable, or stateful, encodings.
-    int 		_M_bytes;
-
-  public:
-    explicit 
-    encoding_state() 
-    : _M_in_desc(0), _M_out_desc(0), _M_ext_bom(0), _M_int_bom(0), _M_bytes(0)
-    { }
-
-    explicit 
-    encoding_state(const char* __int, const char* __ext, 
-		   int __ibom = 0, int __ebom = 0, int __bytes = 1)
-    : _M_int_enc(__int), _M_ext_enc(__ext), _M_in_desc(0), _M_out_desc(0), 
-      _M_ext_bom(__ebom), _M_int_bom(__ibom), _M_bytes(__bytes)
-    { init(); }
-
-    // 21.1.2 traits typedefs
-    // p4
-    // typedef STATE_T state_type
-    // requires: state_type shall meet the requirements of
-    // CopyConstructible types (20.1.3)
-    // NB: This does not preserve the actual state of the conversion
-    // descriptor member, but it does duplicate the encoding
-    // information.
-    encoding_state(const encoding_state& __obj) : _M_in_desc(0), _M_out_desc(0)
-    { construct(__obj); }
-
-    // Need assignment operator as well.
-    encoding_state&
-    operator=(const encoding_state& __obj)
-    {
-      construct(__obj);
-      return *this;
-    }
-
-    ~encoding_state()
-    { destroy(); } 
-
-    bool
-    good() const throw()
-    { 
-      const descriptor_type __err = (iconv_t)(-1);
-      bool __test = _M_in_desc && _M_in_desc != __err; 
-      __test &=  _M_out_desc && _M_out_desc != __err;
-      return __test;
-    }
-    
-    int
-    character_ratio() const
-    { return _M_bytes; }
-
-    const std::string
-    internal_encoding() const
-    { return _M_int_enc; }
-
-    int 
-    internal_bom() const
-    { return _M_int_bom; }
-
-    const std::string
-    external_encoding() const
-    { return _M_ext_enc; }
-
-    int 
-    external_bom() const
-    { return _M_ext_bom; }
-
-    const descriptor_type&
-    in_descriptor() const
-    { return _M_in_desc; }
-
-    const descriptor_type&
-    out_descriptor() const
-    { return _M_out_desc; }
-
-  protected:
-    void
-    init()
-    {
-      const descriptor_type __err = (iconv_t)(-1);
-      const bool __have_encodings = _M_int_enc.size() && _M_ext_enc.size();
-      if (!_M_in_desc && __have_encodings)
-	{
-	  _M_in_desc = iconv_open(_M_int_enc.c_str(), _M_ext_enc.c_str());
-	  if (_M_in_desc == __err)
-	    std::__throw_runtime_error(__N("encoding_state::_M_init "
-				    "creating iconv input descriptor failed"));
-	}
-      if (!_M_out_desc && __have_encodings)
-	{
-	  _M_out_desc = iconv_open(_M_ext_enc.c_str(), _M_int_enc.c_str());
-	  if (_M_out_desc == __err)
-	    std::__throw_runtime_error(__N("encoding_state::_M_init "
-				  "creating iconv output descriptor failed"));
-	}
-    }
-
-    void
-    construct(const encoding_state& __obj)
-    {
-      destroy();
-      _M_int_enc = __obj._M_int_enc;
-      _M_ext_enc = __obj._M_ext_enc;
-      _M_ext_bom = __obj._M_ext_bom;
-      _M_int_bom = __obj._M_int_bom;
-      _M_bytes = __obj._M_bytes;
-      init();
-    }
-
-    void
-    destroy() throw()
-    {
-      const descriptor_type __err = (iconv_t)(-1);
-      if (_M_in_desc && _M_in_desc != __err) 
-	{
-	  iconv_close(_M_in_desc);
-	  _M_in_desc = 0;
-	}
-      if (_M_out_desc && _M_out_desc != __err) 
-	{
-	  iconv_close(_M_out_desc);
-	  _M_out_desc = 0;
-	}
-    }
-  };
-
-  /// encoding_char_traits
-  // Custom traits type with encoding_state for the state type, and the
-  // associated fpos<encoding_state> for the position type, all other
-  // bits equivalent to the required char_traits instantiations.
-  template<typename _CharT>
-    struct encoding_char_traits
-    : public std::char_traits<_CharT>
-    {
-      typedef encoding_state				state_type;
-      typedef typename std::fpos<state_type>		pos_type;
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-_GLIBCXX_END_NAMESPACE_CXX11
-} // namespace
-
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using __gnu_cxx::encoding_state;
-
-  /// codecvt<InternT, _ExternT, encoding_state> specialization.
-  // This partial specialization takes advantage of iconv to provide
-  // code conversions between a large number of character encodings.
-  template<typename _InternT, typename _ExternT>
-    class codecvt<_InternT, _ExternT, encoding_state>
-    : public __codecvt_abstract_base<_InternT, _ExternT, encoding_state>
-    {
-    public:      
-      // Types:
-      typedef codecvt_base::result			result;
-      typedef _InternT 					intern_type;
-      typedef _ExternT 					extern_type;
-      typedef __gnu_cxx::encoding_state 		state_type;
-      typedef state_type::descriptor_type 		descriptor_type;
-
-      // Data Members:
-      static locale::id 		id;
-
-      explicit 
-      codecvt(size_t __refs = 0)
-      : __codecvt_abstract_base<intern_type, extern_type, state_type>(__refs)
-      { }
-
-      explicit 
-      codecvt(state_type& __enc, size_t __refs = 0)
-      : __codecvt_abstract_base<intern_type, extern_type, state_type>(__refs)
-      { }
-
-     protected:
-      virtual 
-      ~codecvt() { }
-
-      virtual result
-      do_out(state_type& __state, const intern_type* __from, 
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const;
-
-      virtual result
-      do_unshift(state_type& __state, extern_type* __to, 
-		 extern_type* __to_end, extern_type*& __to_next) const;
-
-      virtual result
-      do_in(state_type& __state, const extern_type* __from, 
-	    const extern_type* __from_end, const extern_type*& __from_next,
-	    intern_type* __to, intern_type* __to_end, 
-	    intern_type*& __to_next) const;
-
-      virtual int 
-      do_encoding() const throw();
-
-      virtual bool 
-      do_always_noconv() const throw();
-
-      virtual int 
-      do_length(state_type&, const extern_type* __from, 
-		const extern_type* __end, size_t __max) const;
-
-      virtual int 
-      do_max_length() const throw();
-    };
-
-  template<typename _InternT, typename _ExternT>
-    locale::id 
-    codecvt<_InternT, _ExternT, encoding_state>::id;
-
-  // This adaptor works around the signature problems of the second
-  // argument to iconv():  SUSv2 and others use 'const char**', but glibc 2.2
-  // uses 'char**', which matches the POSIX 1003.1-2001 standard.
-  // Using this adaptor, g++ will do the work for us.
-  template<typename _Tp>
-    inline size_t
-    __iconv_adaptor(size_t(*__func)(iconv_t, _Tp, size_t*, char**, size_t*),
-                    iconv_t __cd, char** __inbuf, size_t* __inbytes,
-                    char** __outbuf, size_t* __outbytes)
-    { return __func(__cd, (_Tp)__inbuf, __inbytes, __outbuf, __outbytes); }
-
-  template<typename _InternT, typename _ExternT>
-    codecvt_base::result
-    codecvt<_InternT, _ExternT, encoding_state>::
-    do_out(state_type& __state, const intern_type* __from, 
-	   const intern_type* __from_end, const intern_type*& __from_next,
-	   extern_type* __to, extern_type* __to_end,
-	   extern_type*& __to_next) const
-    {
-      result __ret = codecvt_base::error;
-      if (__state.good())
-	{
-	  const descriptor_type& __desc = __state.out_descriptor();
-	  const size_t __fmultiple = sizeof(intern_type);
-	  size_t __fbytes = __fmultiple * (__from_end - __from);
-	  const size_t __tmultiple = sizeof(extern_type);
-	  size_t __tbytes = __tmultiple * (__to_end - __to); 
-	  
-	  // Argument list for iconv specifies a byte sequence. Thus,
-	  // all to/from arrays must be brutally casted to char*.
-	  char* __cto = reinterpret_cast<char*>(__to);
-	  char* __cfrom;
-	  size_t __conv;
-
-	  // Some encodings need a byte order marker as the first item
-	  // in the byte stream, to designate endian-ness. The default
-	  // value for the byte order marker is NULL, so if this is
-	  // the case, it's not necessary and we can just go on our
-	  // merry way.
-	  int __int_bom = __state.internal_bom();
-	  if (__int_bom)
-	    {	  
-	      size_t __size = __from_end - __from;
-	      intern_type* __cfixed = static_cast<intern_type*>
-		(__builtin_alloca(sizeof(intern_type) * (__size + 1)));
-	      __cfixed[0] = static_cast<intern_type>(__int_bom);
-	      char_traits<intern_type>::copy(__cfixed + 1, __from, __size);
-	      __cfrom = reinterpret_cast<char*>(__cfixed);
-	      __conv = __iconv_adaptor(iconv, __desc, &__cfrom,
-                                        &__fbytes, &__cto, &__tbytes); 
-	    }
-	  else
-	    {
-	      intern_type* __cfixed = const_cast<intern_type*>(__from);
-	      __cfrom = reinterpret_cast<char*>(__cfixed);
-	      __conv = __iconv_adaptor(iconv, __desc, &__cfrom, &__fbytes, 
-				       &__cto, &__tbytes); 
-	    }
-
-	  if (__conv != size_t(-1))
-	    {
-	      __from_next = reinterpret_cast<const intern_type*>(__cfrom);
-	      __to_next = reinterpret_cast<extern_type*>(__cto);
-	      __ret = codecvt_base::ok;
-	    }
-	  else 
-	    {
-	      if (__fbytes < __fmultiple * (__from_end - __from))
-		{
-		  __from_next = reinterpret_cast<const intern_type*>(__cfrom);
-		  __to_next = reinterpret_cast<extern_type*>(__cto);
-		  __ret = codecvt_base::partial;
-		}
-	      else
-		__ret = codecvt_base::error;
-	    }
-	}
-      return __ret; 
-    }
-
-  template<typename _InternT, typename _ExternT>
-    codecvt_base::result
-    codecvt<_InternT, _ExternT, encoding_state>::
-    do_unshift(state_type& __state, extern_type* __to, 
-	       extern_type* __to_end, extern_type*& __to_next) const
-    {
-      result __ret = codecvt_base::error;
-      if (__state.good())
-	{
-	  const descriptor_type& __desc = __state.in_descriptor();
-	  const size_t __tmultiple = sizeof(intern_type);
-	  size_t __tlen = __tmultiple * (__to_end - __to); 
-	  
-	  // Argument list for iconv specifies a byte sequence. Thus,
-	  // all to/from arrays must be brutally casted to char*.
-	  char* __cto = reinterpret_cast<char*>(__to);
-	  size_t __conv = __iconv_adaptor(iconv,__desc, 0, 0,
-                                          &__cto, &__tlen); 
-	  
-	  if (__conv != size_t(-1))
-	    {
-	      __to_next = reinterpret_cast<extern_type*>(__cto);
-	      if (__tlen == __tmultiple * (__to_end - __to))
-		__ret = codecvt_base::noconv;
-	      else if (__tlen == 0)
-		__ret = codecvt_base::ok;
-	      else
-		__ret = codecvt_base::partial;
-	    }
-	  else 
-	    __ret = codecvt_base::error;
-	}
-      return __ret; 
-    }
-   
-  template<typename _InternT, typename _ExternT>
-    codecvt_base::result
-    codecvt<_InternT, _ExternT, encoding_state>::
-    do_in(state_type& __state, const extern_type* __from, 
-	  const extern_type* __from_end, const extern_type*& __from_next,
-	  intern_type* __to, intern_type* __to_end, 
-	  intern_type*& __to_next) const
-    { 
-      result __ret = codecvt_base::error;
-      if (__state.good())
-	{
-	  const descriptor_type& __desc = __state.in_descriptor();
-	  const size_t __fmultiple = sizeof(extern_type);
-	  size_t __flen = __fmultiple * (__from_end - __from);
-	  const size_t __tmultiple = sizeof(intern_type);
-	  size_t __tlen = __tmultiple * (__to_end - __to); 
-	  
-	  // Argument list for iconv specifies a byte sequence. Thus,
-	  // all to/from arrays must be brutally casted to char*.
-	  char* __cto = reinterpret_cast<char*>(__to);
-	  char* __cfrom;
-	  size_t __conv;
-
-	  // Some encodings need a byte order marker as the first item
-	  // in the byte stream, to designate endian-ness. The default
-	  // value for the byte order marker is NULL, so if this is
-	  // the case, it's not necessary and we can just go on our
-	  // merry way.
-	  int __ext_bom = __state.external_bom();
-	  if (__ext_bom)
-	    {	  
-	      size_t __size = __from_end - __from;
-	      extern_type* __cfixed =  static_cast<extern_type*>
-		(__builtin_alloca(sizeof(extern_type) * (__size + 1)));
-	      __cfixed[0] = static_cast<extern_type>(__ext_bom);
-	      char_traits<extern_type>::copy(__cfixed + 1, __from, __size);
-	      __cfrom = reinterpret_cast<char*>(__cfixed);
-	      __conv = __iconv_adaptor(iconv, __desc, &__cfrom,
-                                       &__flen, &__cto, &__tlen); 
-	    }
-	  else
-	    {
-	      extern_type* __cfixed = const_cast<extern_type*>(__from);
-	      __cfrom = reinterpret_cast<char*>(__cfixed);
-	      __conv = __iconv_adaptor(iconv, __desc, &__cfrom,
-                                       &__flen, &__cto, &__tlen); 
-	    }
-
-	  
-	  if (__conv != size_t(-1))
-	    {
-	      __from_next = reinterpret_cast<const extern_type*>(__cfrom);
-	      __to_next = reinterpret_cast<intern_type*>(__cto);
-	      __ret = codecvt_base::ok;
-	    }
-	  else 
-	    {
-	      if (__flen < static_cast<size_t>(__from_end - __from))
-		{
-		  __from_next = reinterpret_cast<const extern_type*>(__cfrom);
-		  __to_next = reinterpret_cast<intern_type*>(__cto);
-		  __ret = codecvt_base::partial;
-		}
-	      else
-		__ret = codecvt_base::error;
-	    }
-	}
-      return __ret; 
-    }
-  
-  template<typename _InternT, typename _ExternT>
-    int 
-    codecvt<_InternT, _ExternT, encoding_state>::
-    do_encoding() const throw()
-    {
-      int __ret = 0;
-      if (sizeof(_ExternT) <= sizeof(_InternT))
-	__ret = sizeof(_InternT) / sizeof(_ExternT);
-      return __ret; 
-    }
-  
-  template<typename _InternT, typename _ExternT>
-    bool 
-    codecvt<_InternT, _ExternT, encoding_state>::
-    do_always_noconv() const throw()
-    { return false; }
-  
-  template<typename _InternT, typename _ExternT>
-    int 
-    codecvt<_InternT, _ExternT, encoding_state>::
-    do_length(state_type&, const extern_type* __from, 
-	      const extern_type* __end, size_t __max) const
-    { return std::min(__max, static_cast<size_t>(__end - __from)); }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 74.  Garbled text for codecvt::do_max_length
-  template<typename _InternT, typename _ExternT>
-    int 
-    codecvt<_InternT, _ExternT, encoding_state>::
-    do_max_length() const throw()
-    { return 1; }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/concurrence.h b/openflow/usr/include/c++/5/ext/concurrence.h
deleted file mode 100644
index 10e5700..0000000
--- a/openflow/usr/include/c++/5/ext/concurrence.h
+++ /dev/null
@@ -1,318 +0,0 @@
-// Support for concurrent programing -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/concurrence.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _CONCURRENCE_H
-#define _CONCURRENCE_H 1
-
-#pragma GCC system_header
-
-#include <exception>
-#include <bits/gthr.h> 
-#include <bits/functexcept.h>
-#include <bits/cpp_type_traits.h>
-#include <ext/type_traits.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Available locking policies:
-  // _S_single    single-threaded code that doesn't need to be locked.
-  // _S_mutex     multi-threaded code that requires additional support
-  //              from gthr.h or abstraction layers in concurrence.h.
-  // _S_atomic    multi-threaded code using atomic operations.
-  enum _Lock_policy { _S_single, _S_mutex, _S_atomic }; 
-
-  // Compile time constant that indicates prefered locking policy in
-  // the current configuration.
-  static const _Lock_policy __default_lock_policy = 
-#ifdef __GTHREADS
-#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2) \
-     && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4))
-  _S_atomic;
-#else
-  _S_mutex;
-#endif
-#else
-  _S_single;
-#endif
-
-  // NB: As this is used in libsupc++, need to only depend on
-  // exception. No stdexception classes, no use of std::string.
-  class __concurrence_lock_error : public std::exception
-  {
-  public:
-    virtual char const*
-    what() const throw()
-    { return "__gnu_cxx::__concurrence_lock_error"; }
-  };
-
-  class __concurrence_unlock_error : public std::exception
-  {
-  public:
-    virtual char const*
-    what() const throw()
-    { return "__gnu_cxx::__concurrence_unlock_error"; }
-  };
-
-  class __concurrence_broadcast_error : public std::exception
-  {
-  public:
-    virtual char const*
-    what() const throw()
-    { return "__gnu_cxx::__concurrence_broadcast_error"; }
-  };
-
-  class __concurrence_wait_error : public std::exception
-  {
-  public:
-    virtual char const*
-    what() const throw()
-    { return "__gnu_cxx::__concurrence_wait_error"; }
-  };
-
-  // Substitute for concurrence_error object in the case of -fno-exceptions.
-  inline void
-  __throw_concurrence_lock_error()
-  { _GLIBCXX_THROW_OR_ABORT(__concurrence_lock_error()); }
-
-  inline void
-  __throw_concurrence_unlock_error()
-  { _GLIBCXX_THROW_OR_ABORT(__concurrence_unlock_error()); }
-
-#ifdef __GTHREAD_HAS_COND
-  inline void
-  __throw_concurrence_broadcast_error()
-  { _GLIBCXX_THROW_OR_ABORT(__concurrence_broadcast_error()); }
-
-  inline void
-  __throw_concurrence_wait_error()
-  { _GLIBCXX_THROW_OR_ABORT(__concurrence_wait_error()); }
-#endif
- 
-  class __mutex 
-  {
-  private:
-#if __GTHREADS && defined __GTHREAD_MUTEX_INIT
-    __gthread_mutex_t _M_mutex = __GTHREAD_MUTEX_INIT;
-#else
-    __gthread_mutex_t _M_mutex;
-#endif
-
-    __mutex(const __mutex&);
-    __mutex& operator=(const __mutex&);
-
-  public:
-    __mutex() 
-    { 
-#if __GTHREADS && ! defined __GTHREAD_MUTEX_INIT
-      if (__gthread_active_p())
-	__GTHREAD_MUTEX_INIT_FUNCTION(&_M_mutex);
-#endif
-    }
-
-#if __GTHREADS && ! defined __GTHREAD_MUTEX_INIT
-    ~__mutex() 
-    { 
-      if (__gthread_active_p())
-	__gthread_mutex_destroy(&_M_mutex); 
-    }
-#endif 
-
-    void lock()
-    {
-#if __GTHREADS
-      if (__gthread_active_p())
-	{
-	  if (__gthread_mutex_lock(&_M_mutex) != 0)
-	    __throw_concurrence_lock_error();
-	}
-#endif
-    }
-    
-    void unlock()
-    {
-#if __GTHREADS
-      if (__gthread_active_p())
-	{
-	  if (__gthread_mutex_unlock(&_M_mutex) != 0)
-	    __throw_concurrence_unlock_error();
-	}
-#endif
-    }
-
-    __gthread_mutex_t* gthread_mutex(void)
-      { return &_M_mutex; }
-  };
-
-  class __recursive_mutex 
-  {
-  private:
-#if __GTHREADS && defined __GTHREAD_RECURSIVE_MUTEX_INIT
-    __gthread_recursive_mutex_t _M_mutex = __GTHREAD_RECURSIVE_MUTEX_INIT;
-#else
-    __gthread_recursive_mutex_t _M_mutex;
-#endif
-
-    __recursive_mutex(const __recursive_mutex&);
-    __recursive_mutex& operator=(const __recursive_mutex&);
-
-  public:
-    __recursive_mutex() 
-    { 
-#if __GTHREADS && ! defined __GTHREAD_RECURSIVE_MUTEX_INIT
-      if (__gthread_active_p())
-	__GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION(&_M_mutex);
-#endif
-    }
-
-#if __GTHREADS && ! defined __GTHREAD_RECURSIVE_MUTEX_INIT
-    ~__recursive_mutex()
-    {
-      if (__gthread_active_p())
-	__gthread_recursive_mutex_destroy(&_M_mutex);
-    }
-#endif
-
-    void lock()
-    { 
-#if __GTHREADS
-      if (__gthread_active_p())
-	{
-	  if (__gthread_recursive_mutex_lock(&_M_mutex) != 0)
-	    __throw_concurrence_lock_error();
-	}
-#endif
-    }
-    
-    void unlock()
-    { 
-#if __GTHREADS
-      if (__gthread_active_p())
-	{
-	  if (__gthread_recursive_mutex_unlock(&_M_mutex) != 0)
-	    __throw_concurrence_unlock_error();
-	}
-#endif
-    }
-
-    __gthread_recursive_mutex_t* gthread_recursive_mutex(void)
-    { return &_M_mutex; }
-  };
-
-  /// Scoped lock idiom.
-  // Acquire the mutex here with a constructor call, then release with
-  // the destructor call in accordance with RAII style.
-  class __scoped_lock
-  {
-  public:
-    typedef __mutex __mutex_type;
-
-  private:
-    __mutex_type& _M_device;
-
-    __scoped_lock(const __scoped_lock&);
-    __scoped_lock& operator=(const __scoped_lock&);
-
-  public:
-    explicit __scoped_lock(__mutex_type& __name) : _M_device(__name)
-    { _M_device.lock(); }
-
-    ~__scoped_lock() throw()
-    { _M_device.unlock(); }
-  };
-
-#ifdef __GTHREAD_HAS_COND
-  class __cond
-  {
-  private:
-#if __GTHREADS && defined __GTHREAD_COND_INIT
-    __gthread_cond_t _M_cond = __GTHREAD_COND_INIT;
-#else
-    __gthread_cond_t _M_cond;
-#endif
-
-    __cond(const __cond&);
-    __cond& operator=(const __cond&);
-
-  public:
-    __cond() 
-    { 
-#if __GTHREADS && ! defined __GTHREAD_COND_INIT
-      if (__gthread_active_p())
-	__GTHREAD_COND_INIT_FUNCTION(&_M_cond);
-#endif
-    }
-
-#if __GTHREADS && ! defined __GTHREAD_COND_INIT
-    ~__cond() 
-    { 
-      if (__gthread_active_p())
-	__gthread_cond_destroy(&_M_cond); 
-    }
-#endif 
-
-    void broadcast()
-    {
-#if __GTHREADS
-      if (__gthread_active_p())
-	{
-	  if (__gthread_cond_broadcast(&_M_cond) != 0)
-	    __throw_concurrence_broadcast_error();
-	}
-#endif
-    }
-
-    void wait(__mutex *mutex)
-    {
-#if __GTHREADS
-      {
-	  if (__gthread_cond_wait(&_M_cond, mutex->gthread_mutex()) != 0)
-	    __throw_concurrence_wait_error();
-      }
-#endif
-    }
-
-    void wait_recursive(__recursive_mutex *mutex)
-    {
-#if __GTHREADS
-      {
-	  if (__gthread_cond_wait_recursive(&_M_cond,
-					    mutex->gthread_recursive_mutex())
-	      != 0)
-	    __throw_concurrence_wait_error();
-      }
-#endif
-    }
-  };
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/debug_allocator.h b/openflow/usr/include/c++/5/ext/debug_allocator.h
deleted file mode 100644
index 161576b..0000000
--- a/openflow/usr/include/c++/5/ext/debug_allocator.h
+++ /dev/null
@@ -1,191 +0,0 @@
-// Allocators -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996-1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/debug_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _DEBUG_ALLOCATOR_H
-#define _DEBUG_ALLOCATOR_H 1
-
-#include <stdexcept>
-#include <bits/functexcept.h>
-#include <ext/alloc_traits.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::size_t;
-
-  /**
-   *  @brief  A meta-allocator with debugging bits.
-   *  @ingroup allocators
-   *
-   *  This is precisely the allocator defined in the C++03 Standard.
-   */
-  template<typename _Alloc>
-    class debug_allocator
-    {
-      template<typename> friend class debug_allocator;
-
-      typedef __alloc_traits<_Alloc> _Traits;
-
-    public:
-      typedef typename _Traits::size_type       	size_type;
-      typedef typename _Traits::difference_type	difference_type;
-      typedef typename _Traits::pointer       	pointer;
-      typedef typename _Traits::const_pointer    const_pointer;
-      typedef typename _Traits::reference       	reference;
-      typedef typename _Traits::const_reference  const_reference;
-      typedef typename _Traits::value_type       value_type;
-
-      template<typename _Up>
-	class rebind
-	{
-	  typedef typename _Traits::template rebind<_Up>::other __other;
-
-	public:
-	  typedef debug_allocator<__other> other;
-	};
-
-    private:
-      // _M_extra is the number of objects that correspond to the
-      // extra space where debug information is stored.
-      size_type 		_M_extra;
-      
-      _Alloc			_M_allocator;
-
-      template<typename _Alloc2,
-	       typename = typename _Alloc2::template rebind<value_type>::other>
-	struct __convertible
-	{ };
-
-      template<typename _Alloc2>
-	struct __convertible<_Alloc2, _Alloc>
-	{
-	  typedef void* __type;
-	};
-
-      size_type _S_extra()
-      {
-	const size_t __obj_size = sizeof(value_type);
-	return (sizeof(size_type) + __obj_size - 1) / __obj_size; 
-      }
-
-    public:
-      debug_allocator() : _M_extra(_S_extra()) { }
-
-      template<typename _Alloc2>
-	debug_allocator(const debug_allocator<_Alloc2>& __a2,
-			typename __convertible<_Alloc2>::__type = 0)
-	: _M_allocator(__a2._M_allocator), _M_extra(_S_extra()) { }
-
-      debug_allocator(const _Alloc& __a)
-      : _M_allocator(__a), _M_extra(_S_extra()) { }
-
-      pointer
-      allocate(size_type __n)
-      {
-        pointer __res = _M_allocator.allocate(__n + _M_extra);      
-	size_type* __ps = reinterpret_cast<size_type*>(__res);
-	*__ps = __n;
-        return __res + _M_extra;
-      }
-
-      pointer
-      allocate(size_type __n, const void* __hint)
-      {
-        pointer __res = _M_allocator.allocate(__n + _M_extra, __hint);
-	size_type* __ps = reinterpret_cast<size_type*>(__res);
-	*__ps = __n;
-        return __res + _M_extra;
-      }
-
-      void
-      deallocate(pointer __p, size_type __n)
-      {
-	using std::__throw_runtime_error;
-	if (__p)
-	  {
-	    pointer __real_p = __p - _M_extra;
-	    if (*reinterpret_cast<size_type*>(__real_p) != __n)
-	      __throw_runtime_error("debug_allocator::deallocate wrong size");
-	    _M_allocator.deallocate(__real_p, __n + _M_extra);
-	  }
-	else
-	  __throw_runtime_error("debug_allocator::deallocate null pointer");
-      }
-
-      void
-      construct(pointer __p, const value_type& __val)
-      { _Traits::construct(_M_allocator, __p, __val); }
-
-#if __cplusplus >= 201103L
-      template<typename _Tp, typename... _Args>
-	void
-	construct(_Tp* __p, _Args&&... __args)
-	{
-	  _Traits::construct(_M_allocator, __p,
-			     std::forward<_Args>(__args)...);
-	}
-#endif
-
-      template<typename _Tp>
-	void
-	destroy(_Tp* __p)
-	{ _Traits::destroy(_M_allocator, __p); }
-
-      size_type
-      max_size() const throw()
-      { return _Traits::max_size(_M_allocator) - _M_extra; }
-
-      friend bool
-      operator==(const debug_allocator& __lhs, const debug_allocator& __rhs)
-      { return __lhs._M_allocator == __rhs._M_allocator; }
-    };
-
-  template<typename _Alloc>
-    inline bool
-    operator!=(const debug_allocator<_Alloc>& __lhs,
-	       const debug_allocator<_Alloc>& __rhs)
-    { return !(__lhs == __rhs); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/enc_filebuf.h b/openflow/usr/include/c++/5/ext/enc_filebuf.h
deleted file mode 100644
index 1b93405..0000000
--- a/openflow/usr/include/c++/5/ext/enc_filebuf.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// filebuf with encoding state type -*- C++ -*-
-
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/enc_filebuf.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _EXT_ENC_FILEBUF_H
-#define _EXT_ENC_FILEBUF_H 1
-
-#include <fstream>
-#include <locale>
-#include <ext/codecvt_specializations.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /// class enc_filebuf.
-  template<typename _CharT>
-    class enc_filebuf
-    : public std::basic_filebuf<_CharT, encoding_char_traits<_CharT> >
-    {
-    public:
-      typedef encoding_char_traits<_CharT>     	traits_type;
-      typedef typename traits_type::state_type	state_type;
-      typedef typename traits_type::pos_type	pos_type;
-
-      enc_filebuf(state_type& __state)
-      : std::basic_filebuf<_CharT, encoding_char_traits<_CharT> >()
-      { this->_M_state_beg = __state; }
-
-    private:
-      // concept requirements:
-      // Set state type to something useful.
-      // Something more than copyconstructible is needed here, so
-      // require default and copy constructible + assignment operator.
-      __glibcxx_class_requires(state_type, _SGIAssignableConcept)
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/extptr_allocator.h b/openflow/usr/include/c++/5/ext/extptr_allocator.h
deleted file mode 100644
index 15915c7..0000000
--- a/openflow/usr/include/c++/5/ext/extptr_allocator.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// <extptr_allocator.h> -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file ext/extptr_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- *
- *  @author Bob Walters
- *
- * An example allocator which uses an alternative pointer type from
- * bits/pointer.h.  Supports test cases which confirm container support
- * for alternative pointers.
- */
-
-#ifndef _EXTPTR_ALLOCATOR_H
-#define _EXTPTR_ALLOCATOR_H 1
-
-#include <memory>
-#include <ext/numeric_traits.h>
-#include <ext/pointer.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @brief An example allocator which uses a non-standard pointer type.
-   * @ingroup allocators
-   *
-   * This allocator specifies that containers use a 'relative pointer' as it's
-   * pointer type.  (See ext/pointer.h)  Memory allocation in this example
-   * is still performed using std::allocator.
-   */
-  template<typename _Tp>
-    class _ExtPtr_allocator
-    {
-    public:
-      typedef std::size_t     size_type;
-      typedef std::ptrdiff_t  difference_type;
-
-      // Note the non-standard pointer types.
-      typedef _Pointer_adapter<_Relative_pointer_impl<_Tp> >       pointer;
-      typedef _Pointer_adapter<_Relative_pointer_impl<const _Tp> > 
-                                                             const_pointer;
-
-      typedef _Tp&       reference;
-      typedef const _Tp& const_reference;
-      typedef _Tp        value_type;
-
-      template<typename _Up>
-        struct rebind
-        { typedef _ExtPtr_allocator<_Up> other; };
-
-      _ExtPtr_allocator() _GLIBCXX_USE_NOEXCEPT 
-      : _M_real_alloc() { }
-
-      _ExtPtr_allocator(const _ExtPtr_allocator& __rarg) _GLIBCXX_USE_NOEXCEPT
-      : _M_real_alloc(__rarg._M_real_alloc) { }
-
-      template<typename _Up>
-        _ExtPtr_allocator(const _ExtPtr_allocator<_Up>& __rarg)
-	_GLIBCXX_USE_NOEXCEPT
-        : _M_real_alloc(__rarg._M_getUnderlyingImp()) { }
-
-      ~_ExtPtr_allocator() _GLIBCXX_USE_NOEXCEPT
-      { }
-
-      pointer address(reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      const_pointer address(const_reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      pointer allocate(size_type __n, void* __hint = 0)
-      { return _M_real_alloc.allocate(__n,__hint); }
-
-      void deallocate(pointer __p, size_type __n)
-      { _M_real_alloc.deallocate(__p.get(), __n); }
-
-      size_type max_size() const _GLIBCXX_USE_NOEXCEPT
-      { return __numeric_traits<size_type>::__max / sizeof(_Tp); }
-
-#if __cplusplus >= 201103L
-      template<typename _Up, typename... _Args>
-        void
-        construct(_Up* __p, _Args&&... __args)
-	{ ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
-
-      template<typename... _Args>
-        void
-        construct(pointer __p, _Args&&... __args)
-	{ construct(__p.get(), std::forward<_Args>(__args)...); }
-
-      template<typename _Up>
-        void 
-        destroy(_Up* __p)
-        { __p->~_Up(); }
-
-      void destroy(pointer __p)
-      { destroy(__p.get()); }
-
-#else
-
-      void construct(pointer __p, const _Tp& __val)
-      { ::new(__p.get()) _Tp(__val); }
-
-      void destroy(pointer __p)
-      { __p->~_Tp(); }
-#endif
-
-      template<typename _Up>
-        inline bool
-        operator==(const _ExtPtr_allocator<_Up>& __rarg)
-        { return _M_real_alloc == __rarg._M_getUnderlyingImp(); }
-
-      inline bool
-      operator==(const _ExtPtr_allocator& __rarg)
-      { return _M_real_alloc == __rarg._M_real_alloc; }
-
-      template<typename _Up>
-        inline bool
-        operator!=(const _ExtPtr_allocator<_Up>& __rarg)
-        { return _M_real_alloc != __rarg._M_getUnderlyingImp(); }
-
-      inline bool
-      operator!=(const _ExtPtr_allocator& __rarg)
-      { return _M_real_alloc != __rarg._M_real_alloc; }
-
-      template<typename _Up>
-        inline friend void
-        swap(_ExtPtr_allocator<_Up>&, _ExtPtr_allocator<_Up>&);
-
-      // A method specific to this implementation.
-      const std::allocator<_Tp>&
-      _M_getUnderlyingImp() const
-      { return _M_real_alloc; }
-
-    private:
-      std::allocator<_Tp>  _M_real_alloc;
-    };
-
-  // _ExtPtr_allocator<void> specialization.
-  template<>
-    class _ExtPtr_allocator<void>
-    {
-    public:
-      typedef std::size_t      size_type;
-      typedef std::ptrdiff_t   difference_type;
-      typedef void             value_type;
-
-      // Note the non-standard pointer types
-      typedef _Pointer_adapter<_Relative_pointer_impl<void> >       pointer;
-      typedef _Pointer_adapter<_Relative_pointer_impl<const void> >
-                                                              const_pointer;
-
-      template<typename _Up>
-        struct rebind
-        { typedef _ExtPtr_allocator<_Up> other; };
-
-    private:
-      std::allocator<void>  _M_real_alloc;
-    };
-
-  template<typename _Tp>
-    inline void
-    swap(_ExtPtr_allocator<_Tp>& __larg, _ExtPtr_allocator<_Tp>& __rarg)
-    {
-      std::allocator<_Tp> __tmp( __rarg._M_real_alloc );
-      __rarg._M_real_alloc = __larg._M_real_alloc;
-      __larg._M_real_alloc = __tmp;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _EXTPTR_ALLOCATOR_H */
diff --git a/openflow/usr/include/c++/5/ext/functional b/openflow/usr/include/c++/5/ext/functional
deleted file mode 100644
index ef32f1b..0000000
--- a/openflow/usr/include/c++/5/ext/functional
+++ /dev/null
@@ -1,430 +0,0 @@
-// Functional extensions -*- C++ -*-
-
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/functional
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).
- */
-
-#ifndef _EXT_FUNCTIONAL
-#define _EXT_FUNCTIONAL 1
-
-#pragma GCC system_header
-
-#include <functional>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::size_t;
-  using std::unary_function;
-  using std::binary_function;
-  using std::mem_fun1_t;
-  using std::const_mem_fun1_t;
-  using std::mem_fun1_ref_t;
-  using std::const_mem_fun1_ref_t;
-
-  /** The @c identity_element functions are not part of the C++
-   *  standard; SGI provided them as an extension.  Its argument is an
-   *  operation, and its return value is the identity element for that
-   *  operation.  It is overloaded for addition and multiplication,
-   *  and you can overload it for your own nefarious operations.
-   *
-   *  @addtogroup SGIextensions
-   *  @{
-   */
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Tp>
-    inline _Tp
-    identity_element(std::plus<_Tp>)
-    { return _Tp(0); }
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Tp>
-    inline _Tp
-    identity_element(std::multiplies<_Tp>)
-    { return _Tp(1); }
-  /** @}  */
-  
-  /** As an extension to the binders, SGI provided composition functors and
-   *  wrapper functions to aid in their creation.  The @c unary_compose
-   *  functor is constructed from two functions/functors, @c f and @c g.
-   *  Calling @c operator() with a single argument @c x returns @c f(g(x)).
-   *  The function @c compose1 takes the two functions and constructs a
-   *  @c unary_compose variable for you.
-   *
-   *  @c binary_compose is constructed from three functors, @c f, @c g1,
-   *  and @c g2.  Its @c operator() returns @c f(g1(x),g2(x)).  The function
-   *  compose2 takes f, g1, and g2, and constructs the @c binary_compose
-   *  instance for you.  For example, if @c f returns an int, then
-   *  \code
-   *  int answer = (compose2(f,g1,g2))(x);
-   *  \endcode
-   *  is equivalent to
-   *  \code
-   *  int temp1 = g1(x);
-   *  int temp2 = g2(x);
-   *  int answer = f(temp1,temp2);
-   *  \endcode
-   *  But the first form is more compact, and can be passed around as a
-   *  functor to other algorithms.
-   *
-   *  @addtogroup SGIextensions
-   *  @{
-   */
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Operation1, class _Operation2>
-    class unary_compose
-    : public unary_function<typename _Operation2::argument_type,
-			    typename _Operation1::result_type>
-    {
-    protected:
-      _Operation1 _M_fn1;
-      _Operation2 _M_fn2;
-
-    public:
-      unary_compose(const _Operation1& __x, const _Operation2& __y)
-      : _M_fn1(__x), _M_fn2(__y) {}
-
-      typename _Operation1::result_type
-      operator()(const typename _Operation2::argument_type& __x) const
-      { return _M_fn1(_M_fn2(__x)); }
-    };
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Operation1, class _Operation2>
-    inline unary_compose<_Operation1, _Operation2>
-    compose1(const _Operation1& __fn1, const _Operation2& __fn2)
-    { return unary_compose<_Operation1,_Operation2>(__fn1, __fn2); }
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Operation1, class _Operation2, class _Operation3>
-    class binary_compose
-    : public unary_function<typename _Operation2::argument_type,
-			    typename _Operation1::result_type>
-    {
-    protected:
-      _Operation1 _M_fn1;
-      _Operation2 _M_fn2;
-      _Operation3 _M_fn3;
-      
-    public:
-      binary_compose(const _Operation1& __x, const _Operation2& __y,
-		     const _Operation3& __z)
-      : _M_fn1(__x), _M_fn2(__y), _M_fn3(__z) { }
-
-      typename _Operation1::result_type
-      operator()(const typename _Operation2::argument_type& __x) const
-      { return _M_fn1(_M_fn2(__x), _M_fn3(__x)); }
-    };
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Operation1, class _Operation2, class _Operation3>
-    inline binary_compose<_Operation1, _Operation2, _Operation3>
-    compose2(const _Operation1& __fn1, const _Operation2& __fn2,
-	     const _Operation3& __fn3)
-    { return binary_compose<_Operation1, _Operation2, _Operation3>
-	(__fn1, __fn2, __fn3); }
-  /** @}  */
-
-  /** As an extension, SGI provided a functor called @c identity.  When a
-   *  functor is required but no operations are desired, this can be used as a
-   *  pass-through.  Its @c operator() returns its argument unchanged.
-   *
-   *  @addtogroup SGIextensions
-   */
-  template <class _Tp>
-    struct identity
-    : public std::_Identity<_Tp> {};
-
-  /** @c select1st and @c select2nd are extensions provided by SGI.  Their
-   *  @c operator()s
-   *  take a @c std::pair as an argument, and return either the first member
-   *  or the second member, respectively.  They can be used (especially with
-   *  the composition functors) to @a strip data from a sequence before
-   *  performing the remainder of an algorithm.
-   *
-   *  @addtogroup SGIextensions
-   *  @{
-   */
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Pair>
-    struct select1st
-    : public std::_Select1st<_Pair> {};
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Pair>
-    struct select2nd
-    : public std::_Select2nd<_Pair> {};
-
-  /** @}  */
-
-  // extension documented next
-  template <class _Arg1, class _Arg2>
-    struct _Project1st : public binary_function<_Arg1, _Arg2, _Arg1>
-    {
-      _Arg1
-      operator()(const _Arg1& __x, const _Arg2&) const
-      { return __x; }
-    };
-
-  template <class _Arg1, class _Arg2>
-    struct _Project2nd : public binary_function<_Arg1, _Arg2, _Arg2>
-    {
-      _Arg2
-      operator()(const _Arg1&, const _Arg2& __y) const
-      { return __y; }
-    };
-
-  /** The @c operator() of the @c project1st functor takes two arbitrary
-   *  arguments and returns the first one, while @c project2nd returns the
-   *  second one.  They are extensions provided by SGI.
-   *
-   *  @addtogroup SGIextensions
-   *  @{
-   */
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Arg1, class _Arg2>
-    struct project1st : public _Project1st<_Arg1, _Arg2> {};
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Arg1, class _Arg2>
-    struct project2nd : public _Project2nd<_Arg1, _Arg2> {};
-  /** @}  */
-
-  // extension documented next
-  template <class _Result>
-    struct _Constant_void_fun
-    {
-      typedef _Result result_type;
-      result_type _M_val;
-
-      _Constant_void_fun(const result_type& __v) : _M_val(__v) {}
-
-      const result_type&
-      operator()() const
-      { return _M_val; }
-    };
-
-  template <class _Result, class _Argument>
-    struct _Constant_unary_fun
-    {
-      typedef _Argument argument_type;
-      typedef  _Result  result_type;
-      result_type _M_val;
-      
-      _Constant_unary_fun(const result_type& __v) : _M_val(__v) {}
-
-      const result_type&
-      operator()(const _Argument&) const
-      { return _M_val; }
-    };
-
-  template <class _Result, class _Arg1, class _Arg2>
-    struct _Constant_binary_fun
-    {
-      typedef  _Arg1   first_argument_type;
-      typedef  _Arg2   second_argument_type;
-      typedef  _Result result_type;
-      _Result _M_val;
-
-      _Constant_binary_fun(const _Result& __v) : _M_val(__v) {}
-      
-      const result_type&
-      operator()(const _Arg1&, const _Arg2&) const
-      { return _M_val; }
-    };
-
-  /** These three functors are each constructed from a single arbitrary
-   *  variable/value.  Later, their @c operator()s completely ignore any
-   *  arguments passed, and return the stored value.
-   *  - @c constant_void_fun's @c operator() takes no arguments
-   *  - @c constant_unary_fun's @c operator() takes one argument (ignored)
-   *  - @c constant_binary_fun's @c operator() takes two arguments (ignored)
-   *
-   *  The helper creator functions @c constant0, @c constant1, and
-   *  @c constant2 each take a @a result argument and construct variables of
-   *  the appropriate functor type.
-   *
-   *  @addtogroup SGIextensions
-   *  @{
-   */
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Result>
-    struct constant_void_fun
-    : public _Constant_void_fun<_Result>
-    {
-      constant_void_fun(const _Result& __v)
-      : _Constant_void_fun<_Result>(__v) {}
-    };
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Result, class _Argument = _Result>
-    struct constant_unary_fun : public _Constant_unary_fun<_Result, _Argument>
-    {
-      constant_unary_fun(const _Result& __v)
-      : _Constant_unary_fun<_Result, _Argument>(__v) {}
-    };
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Result, class _Arg1 = _Result, class _Arg2 = _Arg1>
-    struct constant_binary_fun
-    : public _Constant_binary_fun<_Result, _Arg1, _Arg2>
-    {
-      constant_binary_fun(const _Result& __v)
-      : _Constant_binary_fun<_Result, _Arg1, _Arg2>(__v) {}
-    };
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Result>
-    inline constant_void_fun<_Result>
-    constant0(const _Result& __val)
-    { return constant_void_fun<_Result>(__val); }
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Result>
-    inline constant_unary_fun<_Result, _Result>
-    constant1(const _Result& __val)
-    { return constant_unary_fun<_Result, _Result>(__val); }
-
-  /// An \link SGIextensions SGI extension \endlink.
-  template <class _Result>
-    inline constant_binary_fun<_Result,_Result,_Result>
-    constant2(const _Result& __val)
-    { return constant_binary_fun<_Result, _Result, _Result>(__val); }
-  /** @}  */
-
-  /** The @c subtractive_rng class is documented on
-   *  <a href="http://www.sgi.com/tech/stl/">SGI's site</a>.
-   *  Note that this code assumes that @c int is 32 bits.
-   *
-   *  @ingroup SGIextensions
-   */
-  class subtractive_rng
-  : public unary_function<unsigned int, unsigned int>
-  {
-  private:
-    unsigned int _M_table[55];
-    size_t _M_index1;
-    size_t _M_index2;
-
-  public:
-    /// Returns a number less than the argument.
-    unsigned int
-    operator()(unsigned int __limit)
-    {
-      _M_index1 = (_M_index1 + 1) % 55;
-      _M_index2 = (_M_index2 + 1) % 55;
-      _M_table[_M_index1] = _M_table[_M_index1] - _M_table[_M_index2];
-      return _M_table[_M_index1] % __limit;
-    }
-
-    void
-    _M_initialize(unsigned int __seed)
-    {
-      unsigned int __k = 1;
-      _M_table[54] = __seed;
-      size_t __i;
-      for (__i = 0; __i < 54; __i++)
-	{
-	  size_t __ii = (21 * (__i + 1) % 55) - 1;
-	  _M_table[__ii] = __k;
-	  __k = __seed - __k;
-	  __seed = _M_table[__ii];
-	}
-      for (int __loop = 0; __loop < 4; __loop++)
-	{
-	  for (__i = 0; __i < 55; __i++)
-            _M_table[__i] = _M_table[__i] - _M_table[(1 + __i + 30) % 55];
-	}
-      _M_index1 = 0;
-      _M_index2 = 31;
-    }
-
-    /// Ctor allowing you to initialize the seed.
-    subtractive_rng(unsigned int __seed)
-    { _M_initialize(__seed); }
-
-    /// Default ctor; initializes its state with some number you don't see.
-    subtractive_rng()
-    { _M_initialize(161803398u); }
-  };
-
-  // Mem_fun adaptor helper functions mem_fun1 and mem_fun1_ref,
-  // provided for backward compatibility, they are no longer part of
-  // the C++ standard.
-  
-  template <class _Ret, class _Tp, class _Arg>
-    inline mem_fun1_t<_Ret, _Tp, _Arg>
-    mem_fun1(_Ret (_Tp::*__f)(_Arg))
-    { return mem_fun1_t<_Ret, _Tp, _Arg>(__f); }
-
-  template <class _Ret, class _Tp, class _Arg>
-    inline const_mem_fun1_t<_Ret, _Tp, _Arg>
-    mem_fun1(_Ret (_Tp::*__f)(_Arg) const)
-    { return const_mem_fun1_t<_Ret, _Tp, _Arg>(__f); }
-
-  template <class _Ret, class _Tp, class _Arg>
-    inline mem_fun1_ref_t<_Ret, _Tp, _Arg>
-    mem_fun1_ref(_Ret (_Tp::*__f)(_Arg))
-    { return mem_fun1_ref_t<_Ret, _Tp, _Arg>(__f); }
-
-  template <class _Ret, class _Tp, class _Arg>
-    inline const_mem_fun1_ref_t<_Ret, _Tp, _Arg>
-    mem_fun1_ref(_Ret (_Tp::*__f)(_Arg) const)
-    { return const_mem_fun1_ref_t<_Ret, _Tp, _Arg>(__f); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
-
diff --git a/openflow/usr/include/c++/5/ext/hash_map b/openflow/usr/include/c++/5/ext/hash_map
deleted file mode 100644
index a9dc9cf..0000000
--- a/openflow/usr/include/c++/5/ext/hash_map
+++ /dev/null
@@ -1,599 +0,0 @@
-// Hashing map implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file backward/hash_map
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).
- */
-
-#ifndef _BACKWARD_HASH_MAP
-#define _BACKWARD_HASH_MAP 1
-
-#ifndef _GLIBCXX_PERMIT_BACKWARD_HASH
-#include "backward_warning.h"
-#endif
-
-#include <bits/c++config.h>
-#include <backward/hashtable.h>
-#include <bits/concept_check.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::equal_to;
-  using std::allocator;
-  using std::pair;
-  using std::_Select1st;
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template<class _Key, class _Tp, class _HashFn = hash<_Key>,
-	   class _EqualKey = equal_to<_Key>, class _Alloc = allocator<_Tp> >
-    class hash_map
-    {
-    private:
-      typedef hashtable<pair<const _Key, _Tp>,_Key, _HashFn,
-			_Select1st<pair<const _Key, _Tp> >,
-			_EqualKey, _Alloc> _Ht;
-
-      _Ht _M_ht;
-
-    public:
-      typedef typename _Ht::key_type key_type;
-      typedef _Tp data_type;
-      typedef _Tp mapped_type;
-      typedef typename _Ht::value_type value_type;
-      typedef typename _Ht::hasher hasher;
-      typedef typename _Ht::key_equal key_equal;
-      
-      typedef typename _Ht::size_type size_type;
-      typedef typename _Ht::difference_type difference_type;
-      typedef typename _Ht::pointer pointer;
-      typedef typename _Ht::const_pointer const_pointer;
-      typedef typename _Ht::reference reference;
-      typedef typename _Ht::const_reference const_reference;
-      
-      typedef typename _Ht::iterator iterator;
-      typedef typename _Ht::const_iterator const_iterator;
-      
-      typedef typename _Ht::allocator_type allocator_type;
-      
-      hasher
-      hash_funct() const
-      { return _M_ht.hash_funct(); }
-
-      key_equal
-      key_eq() const
-      { return _M_ht.key_eq(); }
-
-      allocator_type
-      get_allocator() const
-      { return _M_ht.get_allocator(); }
-
-      hash_map()
-      : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-  
-      explicit
-      hash_map(size_type __n)
-      : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-
-      hash_map(size_type __n, const hasher& __hf)
-      : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-
-      hash_map(size_type __n, const hasher& __hf, const key_equal& __eql,
-	       const allocator_type& __a = allocator_type())
-      : _M_ht(__n, __hf, __eql, __a) {}
-
-      template<class _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l)
-	: _M_ht(100, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l, size_type __n)
-	: _M_ht(__n, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf)
-	: _M_ht(__n, __hf, key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf, const key_equal& __eql,
-		 const allocator_type& __a = allocator_type())
-	: _M_ht(__n, __hf, __eql, __a)
-        { _M_ht.insert_unique(__f, __l); }
-
-      size_type
-      size() const
-      { return _M_ht.size(); }
-      
-      size_type
-      max_size() const
-      { return _M_ht.max_size(); }
-      
-      bool
-      empty() const
-      { return _M_ht.empty(); }
-  
-      void
-      swap(hash_map& __hs)
-      { _M_ht.swap(__hs._M_ht); }
-
-      template<class _K1, class _T1, class _HF, class _EqK, class _Al>
-        friend bool
-        operator== (const hash_map<_K1, _T1, _HF, _EqK, _Al>&,
-		    const hash_map<_K1, _T1, _HF, _EqK, _Al>&);
-
-      iterator
-      begin()
-      { return _M_ht.begin(); }
-
-      iterator
-      end()
-      { return _M_ht.end(); }
-
-      const_iterator
-      begin() const
-      { return _M_ht.begin(); }
-
-      const_iterator
-      end() const
-      { return _M_ht.end(); }
-
-      pair<iterator, bool>
-      insert(const value_type& __obj)
-      { return _M_ht.insert_unique(__obj); }
-
-      template<class _InputIterator>
-        void
-        insert(_InputIterator __f, _InputIterator __l)
-        { _M_ht.insert_unique(__f, __l); }
-
-      pair<iterator, bool>
-      insert_noresize(const value_type& __obj)
-      { return _M_ht.insert_unique_noresize(__obj); }
-
-      iterator
-      find(const key_type& __key)
-      { return _M_ht.find(__key); }
-
-      const_iterator
-      find(const key_type& __key) const
-      { return _M_ht.find(__key); }
-
-      _Tp&
-      operator[](const key_type& __key)
-      { return _M_ht.find_or_insert(value_type(__key, _Tp())).second; }
-
-      size_type
-      count(const key_type& __key) const
-      { return _M_ht.count(__key); }
-
-      pair<iterator, iterator>
-      equal_range(const key_type& __key)
-      { return _M_ht.equal_range(__key); }
-
-      pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const
-      { return _M_ht.equal_range(__key); }
-
-      size_type
-      erase(const key_type& __key)
-      {return _M_ht.erase(__key); }
-
-      void
-      erase(iterator __it)
-      { _M_ht.erase(__it); }
-
-      void
-      erase(iterator __f, iterator __l)
-      { _M_ht.erase(__f, __l); }
-
-      void
-      clear()
-      { _M_ht.clear(); }
-
-      void
-      resize(size_type __hint)
-      { _M_ht.resize(__hint); }
-
-      size_type
-      bucket_count() const
-      { return _M_ht.bucket_count(); }
-
-      size_type
-      max_bucket_count() const
-      { return _M_ht.max_bucket_count(); }
-
-      size_type
-      elems_in_bucket(size_type __n) const
-      { return _M_ht.elems_in_bucket(__n); }
-    };
-
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-    inline bool
-    operator==(const hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-	       const hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-    { return __hm1._M_ht == __hm2._M_ht; }
-
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-    inline bool
-    operator!=(const hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-	       const hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-    { return !(__hm1 == __hm2); }
-
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-    inline void
-    swap(hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-	 hash_map<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-    { __hm1.swap(__hm2); }
-
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template<class _Key, class _Tp,
-	   class _HashFn = hash<_Key>,
-	   class _EqualKey = equal_to<_Key>,
-	   class _Alloc = allocator<_Tp> >
-    class hash_multimap
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Key, _SGIAssignableConcept)
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires3(_HashFn, size_t, _Key, _UnaryFunctionConcept)
-      __glibcxx_class_requires3(_EqualKey, _Key, _Key, _BinaryPredicateConcept)
-	
-    private:
-      typedef hashtable<pair<const _Key, _Tp>, _Key, _HashFn,
-			_Select1st<pair<const _Key, _Tp> >, _EqualKey, _Alloc>
-          _Ht;
-
-      _Ht _M_ht;
-
-    public:
-      typedef typename _Ht::key_type key_type;
-      typedef _Tp data_type;
-      typedef _Tp mapped_type;
-      typedef typename _Ht::value_type value_type;
-      typedef typename _Ht::hasher hasher;
-      typedef typename _Ht::key_equal key_equal;
-      
-      typedef typename _Ht::size_type size_type;
-      typedef typename _Ht::difference_type difference_type;
-      typedef typename _Ht::pointer pointer;
-      typedef typename _Ht::const_pointer const_pointer;
-      typedef typename _Ht::reference reference;
-      typedef typename _Ht::const_reference const_reference;
-      
-      typedef typename _Ht::iterator iterator;
-      typedef typename _Ht::const_iterator const_iterator;
-      
-      typedef typename _Ht::allocator_type allocator_type;
-      
-      hasher
-      hash_funct() const
-      { return _M_ht.hash_funct(); }
-
-      key_equal
-      key_eq() const
-      { return _M_ht.key_eq(); }
-
-      allocator_type
-      get_allocator() const
-      { return _M_ht.get_allocator(); }
-
-      hash_multimap()
-      : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-
-      explicit
-      hash_multimap(size_type __n)
-      : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-
-      hash_multimap(size_type __n, const hasher& __hf)
-      : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-
-      hash_multimap(size_type __n, const hasher& __hf, const key_equal& __eql,
-		    const allocator_type& __a = allocator_type())
-      : _M_ht(__n, __hf, __eql, __a) {}
-
-      template<class _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l)
-	: _M_ht(100, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n)
-	: _M_ht(__n, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
-		      const hasher& __hf)
-	: _M_ht(__n, __hf, key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
-		      const hasher& __hf, const key_equal& __eql,
-		      const allocator_type& __a = allocator_type())
-	: _M_ht(__n, __hf, __eql, __a)
-        { _M_ht.insert_equal(__f, __l); }
-
-      size_type
-      size() const
-      { return _M_ht.size(); }
-
-      size_type
-      max_size() const
-      { return _M_ht.max_size(); }
-
-      bool
-      empty() const
-      { return _M_ht.empty(); }
-
-      void
-      swap(hash_multimap& __hs)
-      { _M_ht.swap(__hs._M_ht); }
-
-      template<class _K1, class _T1, class _HF, class _EqK, class _Al>
-        friend bool
-        operator==(const hash_multimap<_K1, _T1, _HF, _EqK, _Al>&,
-		   const hash_multimap<_K1, _T1, _HF, _EqK, _Al>&);
-
-      iterator
-      begin()
-      { return _M_ht.begin(); }
-
-      iterator
-      end()
-      { return _M_ht.end(); }
-
-      const_iterator
-      begin() const
-      { return _M_ht.begin(); }
-
-      const_iterator
-      end() const
-      { return _M_ht.end(); }
-
-      iterator
-      insert(const value_type& __obj)
-      { return _M_ht.insert_equal(__obj); }
-
-      template<class _InputIterator>
-        void
-        insert(_InputIterator __f, _InputIterator __l)
-        { _M_ht.insert_equal(__f,__l); }
-
-      iterator
-      insert_noresize(const value_type& __obj)
-      { return _M_ht.insert_equal_noresize(__obj); }
-
-      iterator
-      find(const key_type& __key)
-      { return _M_ht.find(__key); }
-
-      const_iterator
-      find(const key_type& __key) const
-      { return _M_ht.find(__key); }
-
-      size_type
-      count(const key_type& __key) const
-      { return _M_ht.count(__key); }
-
-      pair<iterator, iterator>
-      equal_range(const key_type& __key)
-      { return _M_ht.equal_range(__key); }
-
-      pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const
-      { return _M_ht.equal_range(__key); }
-
-      size_type
-      erase(const key_type& __key)
-      { return _M_ht.erase(__key); }
-
-      void
-      erase(iterator __it)
-      { _M_ht.erase(__it); }
-
-      void
-      erase(iterator __f, iterator __l)
-      { _M_ht.erase(__f, __l); }
-
-      void
-      clear()
-      { _M_ht.clear(); }
-
-      void
-      resize(size_type __hint)
-      { _M_ht.resize(__hint); }
-
-      size_type
-      bucket_count() const
-      { return _M_ht.bucket_count(); }
-
-      size_type
-      max_bucket_count() const
-      { return _M_ht.max_bucket_count(); }
-      
-      size_type
-      elems_in_bucket(size_type __n) const
-      { return _M_ht.elems_in_bucket(__n); }
-    };
-
-  template<class _Key, class _Tp, class _HF, class _EqKey, class _Alloc>
-    inline bool
-    operator==(const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm1,
-	       const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm2)
-    { return __hm1._M_ht == __hm2._M_ht; }
-
-  template<class _Key, class _Tp, class _HF, class _EqKey, class _Alloc>
-    inline bool
-    operator!=(const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm1,
-	       const hash_multimap<_Key, _Tp, _HF, _EqKey, _Alloc>& __hm2)
-    { return !(__hm1 == __hm2); }
-
-  template<class _Key, class _Tp, class _HashFn, class _EqlKey, class _Alloc>
-    inline void
-    swap(hash_multimap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm1,
-	 hash_multimap<_Key, _Tp, _HashFn, _EqlKey, _Alloc>& __hm2)
-    { __hm1.swap(__hm2); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Specialization of insert_iterator so that it will work for hash_map
-  // and hash_multimap.
-  template<class _Key, class _Tp, class _HashFn,  class _EqKey, class _Alloc>
-    class insert_iterator<__gnu_cxx::hash_map<_Key, _Tp, _HashFn, 
-					      _EqKey, _Alloc> >
-    {
-    protected:
-      typedef __gnu_cxx::hash_map<_Key, _Tp, _HashFn, _EqKey, _Alloc>
-        _Container;
-      _Container* container;
-
-    public:
-      typedef _Container          container_type;
-      typedef output_iterator_tag iterator_category;
-      typedef void                value_type;
-      typedef void                difference_type;
-      typedef void                pointer;
-      typedef void                reference;
-      
-      insert_iterator(_Container& __x)
-      : container(&__x) {}
-
-      insert_iterator(_Container& __x, typename _Container::iterator)
-      : container(&__x) {}
-
-      insert_iterator<_Container>&
-      operator=(const typename _Container::value_type& __value)
-      {
-	container->insert(__value);
-	return *this;
-      }
-
-      insert_iterator<_Container>&
-      operator*()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++() { return *this; }
-
-      insert_iterator<_Container>&
-      operator++(int)
-      { return *this; }
-    };
-
-  template<class _Key, class _Tp, class _HashFn,  class _EqKey, class _Alloc>
-    class insert_iterator<__gnu_cxx::hash_multimap<_Key, _Tp, _HashFn,
-						   _EqKey, _Alloc> >
-    {
-    protected:
-      typedef __gnu_cxx::hash_multimap<_Key, _Tp, _HashFn, _EqKey, _Alloc>
-        _Container;
-      _Container* container;
-      typename _Container::iterator iter;
-
-    public:
-      typedef _Container          container_type;
-      typedef output_iterator_tag iterator_category;
-      typedef void                value_type;
-      typedef void                difference_type;
-      typedef void                pointer;
-      typedef void                reference;
-
-      insert_iterator(_Container& __x)
-      : container(&__x) {}
-
-      insert_iterator(_Container& __x, typename _Container::iterator)
-      : container(&__x) {}
-
-      insert_iterator<_Container>&
-      operator=(const typename _Container::value_type& __value)
-      {
-	container->insert(__value);
-	return *this;
-      }
-
-      insert_iterator<_Container>&
-      operator*()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++(int)
-      { return *this; }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/hash_set b/openflow/usr/include/c++/5/ext/hash_set
deleted file mode 100644
index 3c9ec70..0000000
--- a/openflow/usr/include/c++/5/ext/hash_set
+++ /dev/null
@@ -1,567 +0,0 @@
-// Hashing set implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file backward/hash_set
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).
- */
-
-#ifndef _BACKWARD_HASH_SET
-#define _BACKWARD_HASH_SET 1
-
-#ifndef _GLIBCXX_PERMIT_BACKWARD_HASH
-#include "backward_warning.h"
-#endif
-
-#include <bits/c++config.h>
-#include <backward/hashtable.h>
-#include <bits/concept_check.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::equal_to;
-  using std::allocator;
-  using std::pair;
-  using std::_Identity;
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template<class _Value, class _HashFcn  = hash<_Value>,
-	   class _EqualKey = equal_to<_Value>,
-	   class _Alloc = allocator<_Value> >
-    class hash_set
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Value, _SGIAssignableConcept)
-      __glibcxx_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept)
-      __glibcxx_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept)
-
-    private:
-      typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>,
-			_EqualKey, _Alloc> _Ht;
-      _Ht _M_ht;
-
-    public:
-      typedef typename _Ht::key_type key_type;
-      typedef typename _Ht::value_type value_type;
-      typedef typename _Ht::hasher hasher;
-      typedef typename _Ht::key_equal key_equal;
-      
-      typedef typename _Ht::size_type size_type;
-      typedef typename _Ht::difference_type difference_type;
-      typedef typename _Alloc::pointer pointer;
-      typedef typename _Alloc::const_pointer const_pointer;
-      typedef typename _Alloc::reference reference;
-      typedef typename _Alloc::const_reference const_reference;
-      
-      typedef typename _Ht::const_iterator iterator;
-      typedef typename _Ht::const_iterator const_iterator;
-      
-      typedef typename _Ht::allocator_type allocator_type;
-      
-      hasher
-      hash_funct() const
-      { return _M_ht.hash_funct(); }
-
-      key_equal
-      key_eq() const
-      { return _M_ht.key_eq(); }
-
-      allocator_type
-      get_allocator() const
-      { return _M_ht.get_allocator(); }
-
-      hash_set()
-      : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-
-      explicit
-      hash_set(size_type __n)
-      : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-
-      hash_set(size_type __n, const hasher& __hf)
-      : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-
-      hash_set(size_type __n, const hasher& __hf, const key_equal& __eql,
-	       const allocator_type& __a = allocator_type())
-      : _M_ht(__n, __hf, __eql, __a) {}
-
-      template<class _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l)
-	: _M_ht(100, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l, size_type __n)
-	: _M_ht(__n, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf)
-	: _M_ht(__n, __hf, key_equal(), allocator_type())
-        { _M_ht.insert_unique(__f, __l); }
-
-      template<class _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf, const key_equal& __eql,
-		 const allocator_type& __a = allocator_type())
-	: _M_ht(__n, __hf, __eql, __a)
-        { _M_ht.insert_unique(__f, __l); }
-
-      size_type
-      size() const
-      { return _M_ht.size(); }
-
-      size_type
-      max_size() const
-      { return _M_ht.max_size(); }
-      
-      bool
-      empty() const
-      { return _M_ht.empty(); }
-      
-      void
-      swap(hash_set& __hs)
-      { _M_ht.swap(__hs._M_ht); }
-
-      template<class _Val, class _HF, class _EqK, class _Al>
-        friend bool
-        operator==(const hash_set<_Val, _HF, _EqK, _Al>&,
-		   const hash_set<_Val, _HF, _EqK, _Al>&);
-
-      iterator
-      begin() const
-      { return _M_ht.begin(); }
-      
-      iterator
-      end() const
-      { return _M_ht.end(); }
-
-      pair<iterator, bool>
-      insert(const value_type& __obj)
-      {
-	pair<typename _Ht::iterator, bool> __p = _M_ht.insert_unique(__obj);
-	return pair<iterator,bool>(__p.first, __p.second);
-      }
-
-      template<class _InputIterator>
-        void
-        insert(_InputIterator __f, _InputIterator __l)
-        { _M_ht.insert_unique(__f, __l); }
-
-      pair<iterator, bool>
-      insert_noresize(const value_type& __obj)
-      {
-	pair<typename _Ht::iterator, bool> __p
-	  = _M_ht.insert_unique_noresize(__obj);
-	return pair<iterator, bool>(__p.first, __p.second);
-      }
-
-      iterator
-      find(const key_type& __key) const
-      { return _M_ht.find(__key); }
-
-      size_type
-      count(const key_type& __key) const
-      { return _M_ht.count(__key); }
-
-      pair<iterator, iterator>
-      equal_range(const key_type& __key) const
-      { return _M_ht.equal_range(__key); }
-
-      size_type
-      erase(const key_type& __key)
-      {return _M_ht.erase(__key); }
-      
-      void
-      erase(iterator __it)
-      { _M_ht.erase(__it); }
-      
-      void
-      erase(iterator __f, iterator __l)
-      { _M_ht.erase(__f, __l); }
-      
-      void
-      clear()
-      { _M_ht.clear(); }
-
-      void
-      resize(size_type __hint)
-      { _M_ht.resize(__hint); }
-      
-      size_type
-      bucket_count() const
-      { return _M_ht.bucket_count(); }
-      
-      size_type
-      max_bucket_count() const
-      { return _M_ht.max_bucket_count(); }
-      
-      size_type
-      elems_in_bucket(size_type __n) const
-      { return _M_ht.elems_in_bucket(__n); }
-    };
-
-  template<class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-    inline bool
-    operator==(const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	       const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { return __hs1._M_ht == __hs2._M_ht; }
-
-  template<class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-    inline bool
-    operator!=(const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	       const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { return !(__hs1 == __hs2); }
-
-  template<class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-    inline void
-    swap(hash_set<_Val, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	 hash_set<_Val, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { __hs1.swap(__hs2); }
-
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template<class _Value,
-	   class _HashFcn = hash<_Value>,
-	   class _EqualKey = equal_to<_Value>,
-	   class _Alloc = allocator<_Value> >
-    class hash_multiset
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Value, _SGIAssignableConcept)
-      __glibcxx_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept)
-      __glibcxx_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept)
-
-    private:
-      typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>,
-			_EqualKey, _Alloc> _Ht;
-      _Ht _M_ht;
-
-    public:
-      typedef typename _Ht::key_type key_type;
-      typedef typename _Ht::value_type value_type;
-      typedef typename _Ht::hasher hasher;
-      typedef typename _Ht::key_equal key_equal;
-      
-      typedef typename _Ht::size_type size_type;
-      typedef typename _Ht::difference_type difference_type;
-      typedef typename _Alloc::pointer pointer;
-      typedef typename _Alloc::const_pointer const_pointer;
-      typedef typename _Alloc::reference reference;
-      typedef typename _Alloc::const_reference const_reference;
-
-      typedef typename _Ht::const_iterator iterator;
-      typedef typename _Ht::const_iterator const_iterator;
-      
-      typedef typename _Ht::allocator_type allocator_type;
-      
-      hasher
-      hash_funct() const
-      { return _M_ht.hash_funct(); }
-      
-      key_equal
-      key_eq() const
-      { return _M_ht.key_eq(); }
-      
-      allocator_type
-      get_allocator() const
-      { return _M_ht.get_allocator(); }
-
-      hash_multiset()
-      : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-
-      explicit
-      hash_multiset(size_type __n)
-      : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-
-      hash_multiset(size_type __n, const hasher& __hf)
-      : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-      
-      hash_multiset(size_type __n, const hasher& __hf, const key_equal& __eql,
-		    const allocator_type& __a = allocator_type())
-      : _M_ht(__n, __hf, __eql, __a) {}
-
-      template<class _InputIterator>
-        hash_multiset(_InputIterator __f, _InputIterator __l)
-	: _M_ht(100, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n)
-	: _M_ht(__n, hasher(), key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
-		      const hasher& __hf)
-	: _M_ht(__n, __hf, key_equal(), allocator_type())
-        { _M_ht.insert_equal(__f, __l); }
-
-      template<class _InputIterator>
-        hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
-		      const hasher& __hf, const key_equal& __eql,
-		      const allocator_type& __a = allocator_type())
-	: _M_ht(__n, __hf, __eql, __a)
-        { _M_ht.insert_equal(__f, __l); }
-
-      size_type
-      size() const
-      { return _M_ht.size(); }
-
-      size_type
-      max_size() const
-      { return _M_ht.max_size(); }
-
-      bool
-      empty() const
-      { return _M_ht.empty(); }
-
-      void
-      swap(hash_multiset& hs)
-      { _M_ht.swap(hs._M_ht); }
-
-      template<class _Val, class _HF, class _EqK, class _Al>
-        friend bool
-        operator==(const hash_multiset<_Val, _HF, _EqK, _Al>&,
-		   const hash_multiset<_Val, _HF, _EqK, _Al>&);
-
-      iterator
-      begin() const
-      { return _M_ht.begin(); }
-      
-      iterator
-      end() const
-      { return _M_ht.end(); }
-
-      iterator
-      insert(const value_type& __obj)
-      { return _M_ht.insert_equal(__obj); }
-  
-      template<class _InputIterator>
-        void
-        insert(_InputIterator __f, _InputIterator __l)
-        { _M_ht.insert_equal(__f,__l); }
-  
-      iterator
-      insert_noresize(const value_type& __obj)
-      { return _M_ht.insert_equal_noresize(__obj); }
-
-      iterator
-      find(const key_type& __key) const
-      { return _M_ht.find(__key); }
-
-      size_type
-      count(const key_type& __key) const
-      { return _M_ht.count(__key); }
-
-      pair<iterator, iterator>
-      equal_range(const key_type& __key) const
-      { return _M_ht.equal_range(__key); }
-
-      size_type
-      erase(const key_type& __key)
-      { return _M_ht.erase(__key); }
-  
-      void
-      erase(iterator __it)
-      { _M_ht.erase(__it); }
-  
-      void
-      erase(iterator __f, iterator __l)
-      { _M_ht.erase(__f, __l); }
-  
-      void
-      clear()
-      { _M_ht.clear(); }
-
-      void
-      resize(size_type __hint)
-      { _M_ht.resize(__hint); }
-  
-      size_type
-      bucket_count() const
-      { return _M_ht.bucket_count(); }
-
-      size_type
-      max_bucket_count() const
-      { return _M_ht.max_bucket_count(); }
-
-      size_type
-      elems_in_bucket(size_type __n) const
-      { return _M_ht.elems_in_bucket(__n); }
-    };
-
-  template<class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-    inline bool
-    operator==(const hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	       const hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { return __hs1._M_ht == __hs2._M_ht; }
-
-  template<class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-    inline bool
-    operator!=(const hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	       const hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { return !(__hs1 == __hs2); }
-
-  template<class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-    inline void
-    swap(hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs1,
-	 hash_multiset<_Val, _HashFcn, _EqualKey, _Alloc>& __hs2)
-    { __hs1.swap(__hs2); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Specialization of insert_iterator so that it will work for hash_set
-  // and hash_multiset.
-  template<class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-    class insert_iterator<__gnu_cxx::hash_set<_Value, _HashFcn,
-					      _EqualKey, _Alloc> >
-    {
-    protected:
-      typedef __gnu_cxx::hash_set<_Value, _HashFcn, _EqualKey, _Alloc>
-        _Container;
-      _Container* container;
-
-    public:
-      typedef _Container          container_type;
-      typedef output_iterator_tag iterator_category;
-      typedef void                value_type;
-      typedef void                difference_type;
-      typedef void                pointer;
-      typedef void                reference;
-
-      insert_iterator(_Container& __x)
-      : container(&__x) {}
-      
-      insert_iterator(_Container& __x, typename _Container::iterator)
-      : container(&__x) {}
-
-      insert_iterator<_Container>&
-      operator=(const typename _Container::value_type& __value)
-      {
-	container->insert(__value);
-	return *this;
-      }
-
-      insert_iterator<_Container>&
-      operator*()
-      { return *this; }
-      
-      insert_iterator<_Container>&
-      operator++()
-      { return *this; }
-      
-      insert_iterator<_Container>&
-      operator++(int)
-      { return *this; }
-    };
-
-  template<class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-    class insert_iterator<__gnu_cxx::hash_multiset<_Value, _HashFcn,
-						   _EqualKey, _Alloc> >
-    {
-    protected:
-      typedef __gnu_cxx::hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>
-        _Container;
-      _Container* container;
-      typename _Container::iterator iter;
-
-    public:
-      typedef _Container          container_type;
-      typedef output_iterator_tag iterator_category;
-      typedef void                value_type;
-      typedef void                difference_type;
-      typedef void                pointer;
-      typedef void                reference;
-      
-      insert_iterator(_Container& __x)
-      : container(&__x) {}
-      
-      insert_iterator(_Container& __x, typename _Container::iterator)
-      : container(&__x) {}
-
-      insert_iterator<_Container>&
-      operator=(const typename _Container::value_type& __value)
-      {
-	container->insert(__value);
-	return *this;
-      }
-
-      insert_iterator<_Container>&
-      operator*()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++(int) { return *this; }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/iterator b/openflow/usr/include/c++/5/ext/iterator
deleted file mode 100644
index f330829..0000000
--- a/openflow/usr/include/c++/5/ext/iterator
+++ /dev/null
@@ -1,116 +0,0 @@
-// HP/SGI iterator extensions -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/iterator
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).
- */
-
-#ifndef _EXT_ITERATOR
-#define _EXT_ITERATOR 1
-
-#pragma GCC system_header
-
-#include <bits/concept_check.h>
-#include <iterator>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // There are two signatures for distance.  In addition to the one
-  // taking two iterators and returning a result, there is another
-  // taking two iterators and a reference-to-result variable, and
-  // returning nothing.  The latter seems to be an SGI extension.
-  // -- pedwards
-  template<typename _InputIterator, typename _Distance>
-    inline void
-    __distance(_InputIterator __first, _InputIterator __last,
-	       _Distance& __n, std::input_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      while (__first != __last)
-	{
-	  ++__first;
-	  ++__n;
-	}
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance>
-    inline void
-    __distance(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	       _Distance& __n, std::random_access_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __n += __last - __first;
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _InputIterator, typename _Distance>
-    inline void
-    distance(_InputIterator __first, _InputIterator __last,
-             _Distance& __n)
-    {
-      // concept requirements -- taken care of in __distance
-      __distance(__first, __last, __n, std::__iterator_category(__first));
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
-
diff --git a/openflow/usr/include/c++/5/ext/malloc_allocator.h b/openflow/usr/include/c++/5/ext/malloc_allocator.h
deleted file mode 100644
index 033b3fe..0000000
--- a/openflow/usr/include/c++/5/ext/malloc_allocator.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// Allocator that wraps "C" malloc -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/malloc_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _MALLOC_ALLOCATOR_H
-#define _MALLOC_ALLOCATOR_H 1
-
-#include <cstdlib>
-#include <new>
-#include <bits/functexcept.h>
-#include <bits/move.h>
-#if __cplusplus >= 201103L
-#include <type_traits>
-#endif
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::size_t;
-  using std::ptrdiff_t;
-
-  /**
-   *  @brief  An allocator that uses malloc.
-   *  @ingroup allocators
-   *
-   *  This is precisely the allocator defined in the C++ Standard. 
-   *    - all allocation calls malloc
-   *    - all deallocation calls free
-   */
-  template<typename _Tp>
-    class malloc_allocator
-    {
-    public:
-      typedef size_t     size_type;
-      typedef ptrdiff_t  difference_type;
-      typedef _Tp*       pointer;
-      typedef const _Tp* const_pointer;
-      typedef _Tp&       reference;
-      typedef const _Tp& const_reference;
-      typedef _Tp        value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef malloc_allocator<_Tp1> other; };
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2103. propagate_on_container_move_assignment
-      typedef std::true_type propagate_on_container_move_assignment;
-#endif
-
-      malloc_allocator() _GLIBCXX_USE_NOEXCEPT { }
-
-      malloc_allocator(const malloc_allocator&) _GLIBCXX_USE_NOEXCEPT { }
-
-      template<typename _Tp1>
-        malloc_allocator(const malloc_allocator<_Tp1>&)
-	_GLIBCXX_USE_NOEXCEPT { }
-
-      ~malloc_allocator() _GLIBCXX_USE_NOEXCEPT { }
-
-      pointer
-      address(reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      const_pointer
-      address(const_reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      // NB: __n is permitted to be 0.  The C++ standard says nothing
-      // about what the return value is when __n == 0.
-      pointer
-      allocate(size_type __n, const void* = 0)
-      {
-	if (__n > this->max_size())
-	  std::__throw_bad_alloc();
-
-	pointer __ret = static_cast<_Tp*>(std::malloc(__n * sizeof(_Tp)));
-	if (!__ret)
-	  std::__throw_bad_alloc();
-	return __ret;
-      }
-
-      // __p is not permitted to be a null pointer.
-      void
-      deallocate(pointer __p, size_type)
-      { std::free(static_cast<void*>(__p)); }
-
-      size_type
-      max_size() const _GLIBCXX_USE_NOEXCEPT 
-      { return size_t(-1) / sizeof(_Tp); }
-
-#if __cplusplus >= 201103L
-      template<typename _Up, typename... _Args>
-        void
-        construct(_Up* __p, _Args&&... __args)
-	{ ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
-
-      template<typename _Up>
-        void 
-        destroy(_Up* __p) { __p->~_Up(); }
-#else
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_] allocator::construct
-      void 
-      construct(pointer __p, const _Tp& __val) 
-      { ::new((void *)__p) value_type(__val); }
-
-      void 
-      destroy(pointer __p) { __p->~_Tp(); }
-#endif
-    };
-
-  template<typename _Tp>
-    inline bool
-    operator==(const malloc_allocator<_Tp>&, const malloc_allocator<_Tp>&)
-    { return true; }
-  
-  template<typename _Tp>
-    inline bool
-    operator!=(const malloc_allocator<_Tp>&, const malloc_allocator<_Tp>&)
-    { return false; }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/memory b/openflow/usr/include/c++/5/ext/memory
deleted file mode 100644
index ed82af4..0000000
--- a/openflow/usr/include/c++/5/ext/memory
+++ /dev/null
@@ -1,197 +0,0 @@
-// Memory extensions -*- C++ -*-
-
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/memory
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).
- */
-
-#ifndef _EXT_MEMORY
-#define _EXT_MEMORY 1
-
-#pragma GCC system_header
-
-#include <memory>
-#include <bits/stl_tempbuf.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::ptrdiff_t;
-  using std::pair;
-  using std::__iterator_category;
-  using std::_Temporary_buffer;
-
-  template<typename _InputIter, typename _Size, typename _ForwardIter>
-    pair<_InputIter, _ForwardIter>
-    __uninitialized_copy_n(_InputIter __first, _Size __count,
-			   _ForwardIter __result, std::input_iterator_tag)
-    {
-      _ForwardIter __cur = __result;
-      __try
-	{
-	  for (; __count > 0 ; --__count, ++__first, ++__cur)
-	    std::_Construct(&*__cur, *__first);
-	  return pair<_InputIter, _ForwardIter>(__first, __cur);
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__result, __cur);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _RandomAccessIter, typename _Size, typename _ForwardIter>
-    inline pair<_RandomAccessIter, _ForwardIter>
-    __uninitialized_copy_n(_RandomAccessIter __first, _Size __count,
-			   _ForwardIter __result,
-			   std::random_access_iterator_tag)
-    {
-      _RandomAccessIter __last = __first + __count;
-      return (pair<_RandomAccessIter, _ForwardIter>
-	      (__last, std::uninitialized_copy(__first, __last, __result)));
-    }
-
-  template<typename _InputIter, typename _Size, typename _ForwardIter>
-    inline pair<_InputIter, _ForwardIter>
-    __uninitialized_copy_n(_InputIter __first, _Size __count,
-			   _ForwardIter __result)
-    { return __gnu_cxx::__uninitialized_copy_n(__first, __count, __result,
-					       __iterator_category(__first)); }
-
-  /**
-   *  @brief Copies the range [first,last) into result.
-   *  @param  __first  An input iterator.
-   *  @param  __count  Length
-   *  @param  __result An output iterator.
-   *  @return   __result + (__first + __count)
-   *  @ingroup SGIextensions
-   *
-   *  Like copy(), but does not require an initialized output range.
-  */
-  template<typename _InputIter, typename _Size, typename _ForwardIter>
-    inline pair<_InputIter, _ForwardIter>
-    uninitialized_copy_n(_InputIter __first, _Size __count,
-			 _ForwardIter __result)
-    { return __gnu_cxx::__uninitialized_copy_n(__first, __count, __result,
-					       __iterator_category(__first)); }
-
-
-  // An alternative version of uninitialized_copy_n that constructs
-  // and destroys objects with a user-provided allocator.
-  template<typename _InputIter, typename _Size, typename _ForwardIter,
-           typename _Allocator>
-    pair<_InputIter, _ForwardIter>
-    __uninitialized_copy_n_a(_InputIter __first, _Size __count,
-			     _ForwardIter __result,
-			     _Allocator __alloc)
-    {
-      _ForwardIter __cur = __result;
-      __try
-	{
-	  for (; __count > 0 ; --__count, ++__first, ++__cur)
-	    __alloc.construct(&*__cur, *__first);
-	  return pair<_InputIter, _ForwardIter>(__first, __cur);
-	}
-      __catch(...)
-	{
-	  std::_Destroy(__result, __cur, __alloc);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _InputIter, typename _Size, typename _ForwardIter,
-           typename _Tp>
-    inline pair<_InputIter, _ForwardIter>
-    __uninitialized_copy_n_a(_InputIter __first, _Size __count,
-			     _ForwardIter __result,
-			     std::allocator<_Tp>)
-    {
-      return __gnu_cxx::uninitialized_copy_n(__first, __count, __result);
-    }
-
-  /**
-   *  This class provides similar behavior and semantics of the standard
-   *  functions get_temporary_buffer() and return_temporary_buffer(), but
-   *  encapsulated in a type vaguely resembling a standard container.
-   *
-   *  By default, a temporary_buffer<Iter> stores space for objects of
-   *  whatever type the Iter iterator points to.  It is constructed from a
-   *  typical [first,last) range, and provides the begin(), end(), size()
-   *  functions, as well as requested_size().  For non-trivial types, copies
-   *  of *first will be used to initialize the storage.
-   *
-   *  @c malloc is used to obtain underlying storage.
-   *
-   *  Like get_temporary_buffer(), not all the requested memory may be
-   *  available.  Ideally, the created buffer will be large enough to hold a
-   *  copy of [first,last), but if size() is less than requested_size(),
-   *  then this didn't happen.
-   *
-   *  @ingroup SGIextensions
-  */
-  template <class _ForwardIterator, class _Tp
-	    = typename std::iterator_traits<_ForwardIterator>::value_type >
-    struct temporary_buffer : public _Temporary_buffer<_ForwardIterator, _Tp>
-    {
-      /// Requests storage large enough to hold a copy of [first,last).
-      temporary_buffer(_ForwardIterator __first, _ForwardIterator __last)
-      : _Temporary_buffer<_ForwardIterator, _Tp>(__first, __last) { }
-      
-      /// Destroys objects and frees storage.
-      ~temporary_buffer() { }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
-
diff --git a/openflow/usr/include/c++/5/ext/mt_allocator.h b/openflow/usr/include/c++/5/ext/mt_allocator.h
deleted file mode 100644
index 923d0e6..0000000
--- a/openflow/usr/include/c++/5/ext/mt_allocator.h
+++ /dev/null
@@ -1,766 +0,0 @@
-// MT-optimized allocator -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/mt_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _MT_ALLOCATOR_H
-#define _MT_ALLOCATOR_H 1
-
-#include <new>
-#include <cstdlib>
-#include <bits/functexcept.h>
-#include <ext/atomicity.h>
-#include <bits/move.h>
-#if __cplusplus >= 201103L
-#include <type_traits>
-#endif
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::size_t;
-  using std::ptrdiff_t;
-
-  typedef void (*__destroy_handler)(void*);
-
-  /// Base class for pool object.
-  struct __pool_base
-  {
-    // Using short int as type for the binmap implies we are never
-    // caching blocks larger than 32768 with this allocator.
-    typedef unsigned short int _Binmap_type;
-
-    // Variables used to configure the behavior of the allocator,
-    // assigned and explained in detail below.
-    struct _Tune
-     {
-      // Compile time constants for the default _Tune values.
-      enum { _S_align = 8 };
-      enum { _S_max_bytes = 128 };
-      enum { _S_min_bin = 8 };
-      enum { _S_chunk_size = 4096 - 4 * sizeof(void*) };
-      enum { _S_max_threads = 4096 };
-      enum { _S_freelist_headroom = 10 };
-
-      // Alignment needed.
-      // NB: In any case must be >= sizeof(_Block_record), that
-      // is 4 on 32 bit machines and 8 on 64 bit machines.
-      size_t	_M_align;
-      
-      // Allocation requests (after round-up to power of 2) below
-      // this value will be handled by the allocator. A raw new/
-      // call will be used for requests larger than this value.
-      // NB: Must be much smaller than _M_chunk_size and in any
-      // case <= 32768.
-      size_t	_M_max_bytes; 
-
-      // Size in bytes of the smallest bin.
-      // NB: Must be a power of 2 and >= _M_align (and of course
-      // much smaller than _M_max_bytes).
-      size_t	_M_min_bin;
-
-      // In order to avoid fragmenting and minimize the number of
-      // new() calls we always request new memory using this
-      // value. Based on previous discussions on the libstdc++
-      // mailing list we have chosen the value below.
-      // See http://gcc.gnu.org/ml/libstdc++/2001-07/msg00077.html
-      // NB: At least one order of magnitude > _M_max_bytes. 
-      size_t	_M_chunk_size;
-
-      // The maximum number of supported threads. For
-      // single-threaded operation, use one. Maximum values will
-      // vary depending on details of the underlying system. (For
-      // instance, Linux 2.4.18 reports 4070 in
-      // /proc/sys/kernel/threads-max, while Linux 2.6.6 reports
-      // 65534)
-      size_t 	_M_max_threads;
-
-      // Each time a deallocation occurs in a threaded application
-      // we make sure that there are no more than
-      // _M_freelist_headroom % of used memory on the freelist. If
-      // the number of additional records is more than
-      // _M_freelist_headroom % of the freelist, we move these
-      // records back to the global pool.
-      size_t 	_M_freelist_headroom;
-      
-      // Set to true forces all allocations to use new().
-      bool 	_M_force_new; 
-      
-      explicit
-      _Tune()
-      : _M_align(_S_align), _M_max_bytes(_S_max_bytes), _M_min_bin(_S_min_bin),
-      _M_chunk_size(_S_chunk_size), _M_max_threads(_S_max_threads), 
-      _M_freelist_headroom(_S_freelist_headroom), 
-      _M_force_new(std::getenv("GLIBCXX_FORCE_NEW") ? true : false)
-      { }
-
-      explicit
-      _Tune(size_t __align, size_t __maxb, size_t __minbin, size_t __chunk, 
-	    size_t __maxthreads, size_t __headroom, bool __force) 
-      : _M_align(__align), _M_max_bytes(__maxb), _M_min_bin(__minbin),
-      _M_chunk_size(__chunk), _M_max_threads(__maxthreads),
-      _M_freelist_headroom(__headroom), _M_force_new(__force)
-      { }
-    };
-    
-    struct _Block_address
-    {
-      void* 			_M_initial;
-      _Block_address* 		_M_next;
-    };
-    
-    const _Tune&
-    _M_get_options() const
-    { return _M_options; }
-
-    void
-    _M_set_options(_Tune __t)
-    { 
-      if (!_M_init)
-	_M_options = __t;
-    }
-
-    bool
-    _M_check_threshold(size_t __bytes)
-    { return __bytes > _M_options._M_max_bytes || _M_options._M_force_new; }
-
-    size_t
-    _M_get_binmap(size_t __bytes)
-    { return _M_binmap[__bytes]; }
-
-    size_t
-    _M_get_align()
-    { return _M_options._M_align; }
-
-    explicit 
-    __pool_base() 
-    : _M_options(_Tune()), _M_binmap(0), _M_init(false) { }
-
-    explicit 
-    __pool_base(const _Tune& __options)
-    : _M_options(__options), _M_binmap(0), _M_init(false) { }
-
-  private:
-    explicit 
-    __pool_base(const __pool_base&);
-
-    __pool_base&
-    operator=(const __pool_base&);
-
-  protected:
-    // Configuration options.
-    _Tune 	       		_M_options;
-    
-    _Binmap_type* 		_M_binmap;
-
-    // Configuration of the pool object via _M_options can happen
-    // after construction but before initialization. After
-    // initialization is complete, this variable is set to true.
-    bool 			_M_init;
-  };
-
-
-  /**
-   *  @brief  Data describing the underlying memory pool, parameterized on
-   *  threading support.
-   */
-  template<bool _Thread>
-    class __pool;
-
-  /// Specialization for single thread.
-  template<>
-    class __pool<false> : public __pool_base
-    {
-    public:
-      union _Block_record
-      {
-	// Points to the block_record of the next free block.
-	_Block_record* 			_M_next;
-      };
-
-      struct _Bin_record
-      {
-	// An "array" of pointers to the first free block.
-	_Block_record**			_M_first;
-
-	// A list of the initial addresses of all allocated blocks.
-	_Block_address*		     	_M_address;
-      };
-      
-      void
-      _M_initialize_once()
-      {
-	if (__builtin_expect(_M_init == false, false))
-	  _M_initialize();
-      }
-
-      void
-      _M_destroy() throw();
-
-      char* 
-      _M_reserve_block(size_t __bytes, const size_t __thread_id);
-    
-      void
-      _M_reclaim_block(char* __p, size_t __bytes) throw ();
-    
-      size_t 
-      _M_get_thread_id() { return 0; }
-      
-      const _Bin_record&
-      _M_get_bin(size_t __which)
-      { return _M_bin[__which]; }
-      
-      void
-      _M_adjust_freelist(const _Bin_record&, _Block_record*, size_t)
-      { }
-
-      explicit __pool() 
-      : _M_bin(0), _M_bin_size(1) { }
-
-      explicit __pool(const __pool_base::_Tune& __tune) 
-      : __pool_base(__tune), _M_bin(0), _M_bin_size(1) { }
-
-    private:
-      // An "array" of bin_records each of which represents a specific
-      // power of 2 size. Memory to this "array" is allocated in
-      // _M_initialize().
-      _Bin_record*		 _M_bin;
-      
-      // Actual value calculated in _M_initialize().
-      size_t 	       	     	_M_bin_size;     
-
-      void
-      _M_initialize();
-  };
- 
-#ifdef __GTHREADS
-  /// Specialization for thread enabled, via gthreads.h.
-  template<>
-    class __pool<true> : public __pool_base
-    {
-    public:
-      // Each requesting thread is assigned an id ranging from 1 to
-      // _S_max_threads. Thread id 0 is used as a global memory pool.
-      // In order to get constant performance on the thread assignment
-      // routine, we keep a list of free ids. When a thread first
-      // requests memory we remove the first record in this list and
-      // stores the address in a __gthread_key. When initializing the
-      // __gthread_key we specify a destructor. When this destructor
-      // (i.e. the thread dies) is called, we return the thread id to
-      // the front of this list.
-      struct _Thread_record
-      {
-	// Points to next free thread id record. NULL if last record in list.
-	_Thread_record*			_M_next;
-	
-	// Thread id ranging from 1 to _S_max_threads.
-	size_t                          _M_id;
-      };
-      
-      union _Block_record
-      {
-	// Points to the block_record of the next free block.
-	_Block_record*			_M_next;
-	
-	// The thread id of the thread which has requested this block.
-	size_t                          _M_thread_id;
-      };
-      
-      struct _Bin_record
-      {
-	// An "array" of pointers to the first free block for each
-	// thread id. Memory to this "array" is allocated in
-	// _S_initialize() for _S_max_threads + global pool 0.
-	_Block_record**			_M_first;
-	
-	// A list of the initial addresses of all allocated blocks.
-	_Block_address*		     	_M_address;
-
-	// An "array" of counters used to keep track of the amount of
-	// blocks that are on the freelist/used for each thread id.
-	// - Note that the second part of the allocated _M_used "array"
-	//   actually hosts (atomic) counters of reclaimed blocks:  in
-	//   _M_reserve_block and in _M_reclaim_block those numbers are
-	//   subtracted from the first ones to obtain the actual size
-	//   of the "working set" of the given thread.
-	// - Memory to these "arrays" is allocated in _S_initialize()
-	//   for _S_max_threads + global pool 0.
-	size_t*				_M_free;
-	size_t*			        _M_used;
-	
-	// Each bin has its own mutex which is used to ensure data
-	// integrity while changing "ownership" on a block.  The mutex
-	// is initialized in _S_initialize().
-	__gthread_mutex_t*              _M_mutex;
-      };
-      
-      // XXX GLIBCXX_ABI Deprecated
-      void
-      _M_initialize(__destroy_handler);
-
-      void
-      _M_initialize_once()
-      {
-	if (__builtin_expect(_M_init == false, false))
-	  _M_initialize();
-      }
-
-      void
-      _M_destroy() throw();
-
-      char* 
-      _M_reserve_block(size_t __bytes, const size_t __thread_id);
-    
-      void
-      _M_reclaim_block(char* __p, size_t __bytes) throw ();
-    
-      const _Bin_record&
-      _M_get_bin(size_t __which)
-      { return _M_bin[__which]; }
-      
-      void
-      _M_adjust_freelist(const _Bin_record& __bin, _Block_record* __block, 
-			 size_t __thread_id)
-      {
-	if (__gthread_active_p())
-	  {
-	    __block->_M_thread_id = __thread_id;
-	    --__bin._M_free[__thread_id];
-	    ++__bin._M_used[__thread_id];
-	  }
-      }
-
-      // XXX GLIBCXX_ABI Deprecated
-      _GLIBCXX_CONST void 
-      _M_destroy_thread_key(void*) throw ();
-
-      size_t 
-      _M_get_thread_id();
-
-      explicit __pool() 
-      : _M_bin(0), _M_bin_size(1), _M_thread_freelist(0) 
-      { }
-
-      explicit __pool(const __pool_base::_Tune& __tune) 
-      : __pool_base(__tune), _M_bin(0), _M_bin_size(1), 
-	_M_thread_freelist(0) 
-      { }
-
-    private:
-      // An "array" of bin_records each of which represents a specific
-      // power of 2 size. Memory to this "array" is allocated in
-      // _M_initialize().
-      _Bin_record*		_M_bin;
-
-      // Actual value calculated in _M_initialize().
-      size_t 	       	     	_M_bin_size;
-
-      _Thread_record* 		_M_thread_freelist;
-      void*			_M_thread_freelist_initial;
-
-      void
-      _M_initialize();
-    };
-#endif
-
-  template<template <bool> class _PoolTp, bool _Thread>
-    struct __common_pool
-    {
-      typedef _PoolTp<_Thread> 		pool_type;
-      
-      static pool_type&
-      _S_get_pool()
-      { 
-	static pool_type _S_pool;
-	return _S_pool;
-      }
-    };
-
-  template<template <bool> class _PoolTp, bool _Thread>
-    struct __common_pool_base;
-
-  template<template <bool> class _PoolTp>
-    struct __common_pool_base<_PoolTp, false> 
-    : public __common_pool<_PoolTp, false>
-    {
-      using  __common_pool<_PoolTp, false>::_S_get_pool;
-
-      static void
-      _S_initialize_once()
-      {
-	static bool __init;
-	if (__builtin_expect(__init == false, false))
-	  {
-	    _S_get_pool()._M_initialize_once(); 
-	    __init = true;
-	  }
-      }
-    };
-
-#ifdef __GTHREADS
-  template<template <bool> class _PoolTp>
-    struct __common_pool_base<_PoolTp, true>
-    : public __common_pool<_PoolTp, true>
-    {
-      using  __common_pool<_PoolTp, true>::_S_get_pool;
-      
-      static void
-      _S_initialize() 
-      { _S_get_pool()._M_initialize_once(); }
-
-      static void
-      _S_initialize_once()
-      { 
-	static bool __init;
-	if (__builtin_expect(__init == false, false))
-	  {
-	    if (__gthread_active_p())
-	      {
-		// On some platforms, __gthread_once_t is an aggregate.
-		static __gthread_once_t __once = __GTHREAD_ONCE_INIT;
-		__gthread_once(&__once, _S_initialize);
-	      }
-
-	    // Double check initialization. May be necessary on some
-	    // systems for proper construction when not compiling with
-	    // thread flags.
-	    _S_get_pool()._M_initialize_once(); 
-	    __init = true;
-	  }
-      }
-    };
-#endif
-
-  /// Policy for shared __pool objects.
-  template<template <bool> class _PoolTp, bool _Thread>
-    struct __common_pool_policy : public __common_pool_base<_PoolTp, _Thread>
-    {
-      template<typename _Tp1, template <bool> class _PoolTp1 = _PoolTp, 
-	       bool _Thread1 = _Thread>
-        struct _M_rebind
-        { typedef __common_pool_policy<_PoolTp1, _Thread1> other; };
-
-      using  __common_pool_base<_PoolTp, _Thread>::_S_get_pool;
-      using  __common_pool_base<_PoolTp, _Thread>::_S_initialize_once;
-  };
- 
-
-  template<typename _Tp, template <bool> class _PoolTp, bool _Thread>
-    struct __per_type_pool
-    {
-      typedef _Tp 			value_type;
-      typedef _PoolTp<_Thread> 		pool_type;
-      
-      static pool_type&
-      _S_get_pool()
-      { 
-	// Sane defaults for the _PoolTp.
-	typedef typename pool_type::_Block_record _Block_record;
-	const static size_t __a = (__alignof__(_Tp) >= sizeof(_Block_record)
-				   ? __alignof__(_Tp) : sizeof(_Block_record));
-
-	typedef typename __pool_base::_Tune _Tune;
-	static _Tune _S_tune(__a, sizeof(_Tp) * 64,
-			     sizeof(_Tp) * 2 >= __a ? sizeof(_Tp) * 2 : __a,
-			     sizeof(_Tp) * size_t(_Tune::_S_chunk_size),
-			     _Tune::_S_max_threads,
-			     _Tune::_S_freelist_headroom,
-			     std::getenv("GLIBCXX_FORCE_NEW") ? true : false);
-	static pool_type _S_pool(_S_tune);
-	return _S_pool;
-      }
-    };
-
-  template<typename _Tp, template <bool> class _PoolTp, bool _Thread>
-    struct __per_type_pool_base;
-
-  template<typename _Tp, template <bool> class _PoolTp>
-    struct __per_type_pool_base<_Tp, _PoolTp, false> 
-    : public __per_type_pool<_Tp, _PoolTp, false> 
-    {
-      using  __per_type_pool<_Tp, _PoolTp, false>::_S_get_pool;
-
-      static void
-      _S_initialize_once()
-      {
-	static bool __init;
-	if (__builtin_expect(__init == false, false))
-	  {
-	    _S_get_pool()._M_initialize_once(); 
-	    __init = true;
-	  }
-      }
-    };
-
- #ifdef __GTHREADS
- template<typename _Tp, template <bool> class _PoolTp>
-    struct __per_type_pool_base<_Tp, _PoolTp, true> 
-    : public __per_type_pool<_Tp, _PoolTp, true> 
-    {
-      using  __per_type_pool<_Tp, _PoolTp, true>::_S_get_pool;
-
-      static void
-      _S_initialize() 
-      { _S_get_pool()._M_initialize_once(); }
-
-      static void
-      _S_initialize_once()
-      { 
-	static bool __init;
-	if (__builtin_expect(__init == false, false))
-	  {
-	    if (__gthread_active_p())
-	      {
-		// On some platforms, __gthread_once_t is an aggregate.
-		static __gthread_once_t __once = __GTHREAD_ONCE_INIT;
-		__gthread_once(&__once, _S_initialize);
-	      }
-
-	    // Double check initialization. May be necessary on some
-	    // systems for proper construction when not compiling with
-	    // thread flags.
-	    _S_get_pool()._M_initialize_once(); 
-	    __init = true;
-	  }
-      }
-    };
-#endif
-
-  /// Policy for individual __pool objects.
-  template<typename _Tp, template <bool> class _PoolTp, bool _Thread>
-    struct __per_type_pool_policy 
-    : public __per_type_pool_base<_Tp, _PoolTp, _Thread>
-    {
-      template<typename _Tp1, template <bool> class _PoolTp1 = _PoolTp, 
-	       bool _Thread1 = _Thread>
-        struct _M_rebind
-        { typedef __per_type_pool_policy<_Tp1, _PoolTp1, _Thread1> other; };
-
-      using  __per_type_pool_base<_Tp, _PoolTp, _Thread>::_S_get_pool;
-      using  __per_type_pool_base<_Tp, _PoolTp, _Thread>::_S_initialize_once;
-  };
-
-
-  /// Base class for _Tp dependent member functions.
-  template<typename _Tp>
-    class __mt_alloc_base 
-    {
-    public:
-      typedef size_t                    size_type;
-      typedef ptrdiff_t                 difference_type;
-      typedef _Tp*                      pointer;
-      typedef const _Tp*                const_pointer;
-      typedef _Tp&                      reference;
-      typedef const _Tp&                const_reference;
-      typedef _Tp                       value_type;
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2103. propagate_on_container_move_assignment
-      typedef std::true_type propagate_on_container_move_assignment;
-#endif
-
-      pointer
-      address(reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      const_pointer
-      address(const_reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      size_type
-      max_size() const _GLIBCXX_USE_NOEXCEPT 
-      { return size_t(-1) / sizeof(_Tp); }
-
-#if __cplusplus >= 201103L
-      template<typename _Up, typename... _Args>
-        void
-        construct(_Up* __p, _Args&&... __args)
-	{ ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
-
-      template<typename _Up>
-        void 
-        destroy(_Up* __p) { __p->~_Up(); }
-#else
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_] allocator::construct
-      void 
-      construct(pointer __p, const _Tp& __val) 
-      { ::new((void *)__p) _Tp(__val); }
-
-      void 
-      destroy(pointer __p) { __p->~_Tp(); }
-#endif
-    };
-
-#ifdef __GTHREADS
-#define __thread_default true
-#else
-#define __thread_default false
-#endif
-
-  /**
-   *  @brief  This is a fixed size (power of 2) allocator which - when
-   *  compiled with thread support - will maintain one freelist per
-   *  size per thread plus a @a global one. Steps are taken to limit
-   *  the per thread freelist sizes (by returning excess back to
-   *  the @a global list).
-   *  @ingroup allocators
-   *
-   *  Further details:
-   *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/mt_allocator.html
-   */
-  template<typename _Tp, 
-	   typename _Poolp = __common_pool_policy<__pool, __thread_default> >
-    class __mt_alloc : public __mt_alloc_base<_Tp>
-    {
-    public:
-      typedef size_t                    	size_type;
-      typedef ptrdiff_t                 	difference_type;
-      typedef _Tp*                      	pointer;
-      typedef const _Tp*                	const_pointer;
-      typedef _Tp&                      	reference;
-      typedef const _Tp&                	const_reference;
-      typedef _Tp                       	value_type;
-      typedef _Poolp      			__policy_type;
-      typedef typename _Poolp::pool_type	__pool_type;
-
-      template<typename _Tp1, typename _Poolp1 = _Poolp>
-        struct rebind
-        { 
-	  typedef typename _Poolp1::template _M_rebind<_Tp1>::other pol_type;
-	  typedef __mt_alloc<_Tp1, pol_type> other;
-	};
-
-      __mt_alloc() _GLIBCXX_USE_NOEXCEPT { }
-
-      __mt_alloc(const __mt_alloc&) _GLIBCXX_USE_NOEXCEPT { }
-
-      template<typename _Tp1, typename _Poolp1>
-        __mt_alloc(const __mt_alloc<_Tp1, _Poolp1>&) _GLIBCXX_USE_NOEXCEPT { }
-
-      ~__mt_alloc() _GLIBCXX_USE_NOEXCEPT { }
-
-      pointer
-      allocate(size_type __n, const void* = 0);
-
-      void
-      deallocate(pointer __p, size_type __n);
-
-      const __pool_base::_Tune
-      _M_get_options()
-      { 
-	// Return a copy, not a reference, for external consumption.
-	return __policy_type::_S_get_pool()._M_get_options();
-      }
-      
-      void
-      _M_set_options(__pool_base::_Tune __t)
-      { __policy_type::_S_get_pool()._M_set_options(__t); }
-    };
-
-  template<typename _Tp, typename _Poolp>
-    typename __mt_alloc<_Tp, _Poolp>::pointer
-    __mt_alloc<_Tp, _Poolp>::
-    allocate(size_type __n, const void*)
-    {
-      if (__n > this->max_size())
-	std::__throw_bad_alloc();
-
-      __policy_type::_S_initialize_once();
-
-      // Requests larger than _M_max_bytes are handled by operator
-      // new/delete directly.
-      __pool_type& __pool = __policy_type::_S_get_pool();
-      const size_t __bytes = __n * sizeof(_Tp);
-      if (__pool._M_check_threshold(__bytes))
-	{
-	  void* __ret = ::operator new(__bytes);
-	  return static_cast<_Tp*>(__ret);
-	}
-      
-      // Round up to power of 2 and figure out which bin to use.
-      const size_t __which = __pool._M_get_binmap(__bytes);
-      const size_t __thread_id = __pool._M_get_thread_id();
-      
-      // Find out if we have blocks on our freelist.  If so, go ahead
-      // and use them directly without having to lock anything.
-      char* __c;
-      typedef typename __pool_type::_Bin_record _Bin_record;
-      const _Bin_record& __bin = __pool._M_get_bin(__which);
-      if (__bin._M_first[__thread_id])
-	{
-	  // Already reserved.
-	  typedef typename __pool_type::_Block_record _Block_record;
-	  _Block_record* __block = __bin._M_first[__thread_id];
-	  __bin._M_first[__thread_id] = __block->_M_next;
-	  
-	  __pool._M_adjust_freelist(__bin, __block, __thread_id);
-	  __c = reinterpret_cast<char*>(__block) + __pool._M_get_align();
-	}
-      else
-	{
-	  // Null, reserve.
-	  __c = __pool._M_reserve_block(__bytes, __thread_id);
-	}
-      return static_cast<_Tp*>(static_cast<void*>(__c));
-    }
-  
-  template<typename _Tp, typename _Poolp>
-    void
-    __mt_alloc<_Tp, _Poolp>::
-    deallocate(pointer __p, size_type __n)
-    {
-      if (__builtin_expect(__p != 0, true))
-	{
-	  // Requests larger than _M_max_bytes are handled by
-	  // operators new/delete directly.
-	  __pool_type& __pool = __policy_type::_S_get_pool();
-	  const size_t __bytes = __n * sizeof(_Tp);
-	  if (__pool._M_check_threshold(__bytes))
-	    ::operator delete(__p);
-	  else
-	    __pool._M_reclaim_block(reinterpret_cast<char*>(__p), __bytes);
-	}
-    }
-  
-  template<typename _Tp, typename _Poolp>
-    inline bool
-    operator==(const __mt_alloc<_Tp, _Poolp>&, const __mt_alloc<_Tp, _Poolp>&)
-    { return true; }
-  
-  template<typename _Tp, typename _Poolp>
-    inline bool
-    operator!=(const __mt_alloc<_Tp, _Poolp>&, const __mt_alloc<_Tp, _Poolp>&)
-    { return false; }
-
-#undef __thread_default
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/new_allocator.h b/openflow/usr/include/c++/5/ext/new_allocator.h
deleted file mode 100644
index 83e3a0b..0000000
--- a/openflow/usr/include/c++/5/ext/new_allocator.h
+++ /dev/null
@@ -1,150 +0,0 @@
-// Allocator that wraps operator new -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/new_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _NEW_ALLOCATOR_H
-#define _NEW_ALLOCATOR_H 1
-
-#include <bits/c++config.h>
-#include <new>
-#include <bits/functexcept.h>
-#include <bits/move.h>
-#if __cplusplus >= 201103L
-#include <type_traits>
-#endif
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::size_t;
-  using std::ptrdiff_t;
-
-  /**
-   *  @brief  An allocator that uses global new, as per [20.4].
-   *  @ingroup allocators
-   *
-   *  This is precisely the allocator defined in the C++ Standard. 
-   *    - all allocation calls operator new
-   *    - all deallocation calls operator delete
-   *
-   *  @tparam  _Tp  Type of allocated object.
-   */
-  template<typename _Tp>
-    class new_allocator
-    {
-    public:
-      typedef size_t     size_type;
-      typedef ptrdiff_t  difference_type;
-      typedef _Tp*       pointer;
-      typedef const _Tp* const_pointer;
-      typedef _Tp&       reference;
-      typedef const _Tp& const_reference;
-      typedef _Tp        value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef new_allocator<_Tp1> other; };
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2103. propagate_on_container_move_assignment
-      typedef std::true_type propagate_on_container_move_assignment;
-#endif
-
-      new_allocator() _GLIBCXX_USE_NOEXCEPT { }
-
-      new_allocator(const new_allocator&) _GLIBCXX_USE_NOEXCEPT { }
-
-      template<typename _Tp1>
-        new_allocator(const new_allocator<_Tp1>&) _GLIBCXX_USE_NOEXCEPT { }
-
-      ~new_allocator() _GLIBCXX_USE_NOEXCEPT { }
-
-      pointer
-      address(reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      const_pointer
-      address(const_reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      // NB: __n is permitted to be 0.  The C++ standard says nothing
-      // about what the return value is when __n == 0.
-      pointer
-      allocate(size_type __n, const void* = 0)
-      { 
-	if (__n > this->max_size())
-	  std::__throw_bad_alloc();
-
-	return static_cast<_Tp*>(::operator new(__n * sizeof(_Tp)));
-      }
-
-      // __p is not permitted to be a null pointer.
-      void
-      deallocate(pointer __p, size_type)
-      { ::operator delete(__p); }
-
-      size_type
-      max_size() const _GLIBCXX_USE_NOEXCEPT
-      { return size_t(-1) / sizeof(_Tp); }
-
-#if __cplusplus >= 201103L
-      template<typename _Up, typename... _Args>
-        void
-        construct(_Up* __p, _Args&&... __args)
-	{ ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
-
-      template<typename _Up>
-        void 
-        destroy(_Up* __p) { __p->~_Up(); }
-#else
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_] allocator::construct
-      void 
-      construct(pointer __p, const _Tp& __val) 
-      { ::new((void *)__p) _Tp(__val); }
-
-      void 
-      destroy(pointer __p) { __p->~_Tp(); }
-#endif
-    };
-
-  template<typename _Tp>
-    inline bool
-    operator==(const new_allocator<_Tp>&, const new_allocator<_Tp>&)
-    { return true; }
-  
-  template<typename _Tp>
-    inline bool
-    operator!=(const new_allocator<_Tp>&, const new_allocator<_Tp>&)
-    { return false; }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/numeric b/openflow/usr/include/c++/5/ext/numeric
deleted file mode 100644
index 1adb69a..0000000
--- a/openflow/usr/include/c++/5/ext/numeric
+++ /dev/null
@@ -1,152 +0,0 @@
-// Numeric extensions -*- C++ -*-
-
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/numeric
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset). 
- */
-
-#ifndef _EXT_NUMERIC
-#define _EXT_NUMERIC 1
-
-#pragma GCC system_header
-
-#include <bits/concept_check.h>
-#include <numeric>
-
-#include <ext/functional> // For identity_element
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Returns __x ** __n, where __n >= 0.  _Note that "multiplication"
-  // is required to be associative, but not necessarily commutative.
-  template<typename _Tp, typename _Integer, typename _MonoidOperation>
-    _Tp
-    __power(_Tp __x, _Integer __n, _MonoidOperation __monoid_op)
-    {
-      if (__n == 0)
-	return identity_element(__monoid_op);
-      else
-	{
-	  while ((__n & 1) == 0)
-	    {
-	      __n >>= 1;
-	      __x = __monoid_op(__x, __x);
-	    }
-
-	  _Tp __result = __x;
-	  __n >>= 1;
-	  while (__n != 0)
-	    {
-	      __x = __monoid_op(__x, __x);
-	      if ((__n & 1) != 0)
-		__result = __monoid_op(__result, __x);
-	      __n >>= 1;
-	    }
-	  return __result;
-	}
-    }
-
-  template<typename _Tp, typename _Integer>
-    inline _Tp
-    __power(_Tp __x, _Integer __n)
-    { return __power(__x, __n, std::multiplies<_Tp>()); }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  // Alias for the internal name __power.  Note that power is an extension,
-  // not part of the C++ standard.
-  template<typename _Tp, typename _Integer, typename _MonoidOperation>
-    inline _Tp
-    power(_Tp __x, _Integer __n, _MonoidOperation __monoid_op)
-    { return __power(__x, __n, __monoid_op); }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _Tp, typename _Integer>
-    inline _Tp
-    power(_Tp __x, _Integer __n)
-    { return __power(__x, __n); }
-
-#if __cplusplus >= 201103L
-  using std::iota;
-#else
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  // iota is not part of the C++ standard.  It is an extension.
-  template<typename _ForwardIter, typename _Tp>
-    void
-    iota(_ForwardIter __first, _ForwardIter __last, _Tp __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>)
-      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
-	    typename std::iterator_traits<_ForwardIter>::value_type>)
-
-      while (__first != __last)
-	*__first++ = __value++;
-    }
-#endif  // C++11
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/numeric_traits.h b/openflow/usr/include/c++/5/ext/numeric_traits.h
deleted file mode 100644
index 5ffff78..0000000
--- a/openflow/usr/include/c++/5/ext/numeric_traits.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/numeric_traits.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _EXT_NUMERIC_TRAITS
-#define _EXT_NUMERIC_TRAITS 1
-
-#pragma GCC system_header
-
-#include <bits/cpp_type_traits.h>
-#include <ext/type_traits.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Compile time constants for builtin types.
-  // Sadly std::numeric_limits member functions cannot be used for this.
-#define __glibcxx_signed(_Tp) ((_Tp)(-1) < 0)
-#define __glibcxx_digits(_Tp) \
-  (sizeof(_Tp) * __CHAR_BIT__ - __glibcxx_signed(_Tp))
-
-#define __glibcxx_min(_Tp) \
-  (__glibcxx_signed(_Tp) ? (_Tp)1 << __glibcxx_digits(_Tp) : (_Tp)0)
-
-#define __glibcxx_max(_Tp) \
-  (__glibcxx_signed(_Tp) ? \
-   (((((_Tp)1 << (__glibcxx_digits(_Tp) - 1)) - 1) << 1) + 1) : ~(_Tp)0)
-
-  template<typename _Value>
-    struct __numeric_traits_integer
-    {
-      // Only integers for initialization of member constant.
-      static const _Value __min = __glibcxx_min(_Value);
-      static const _Value __max = __glibcxx_max(_Value);
-
-      // NB: these two also available in std::numeric_limits as compile
-      // time constants, but <limits> is big and we avoid including it.
-      static const bool __is_signed = __glibcxx_signed(_Value);
-      static const int __digits = __glibcxx_digits(_Value);      
-    };
-
-  template<typename _Value>
-    const _Value __numeric_traits_integer<_Value>::__min;
-
-  template<typename _Value>
-    const _Value __numeric_traits_integer<_Value>::__max;
-
-  template<typename _Value>
-    const bool __numeric_traits_integer<_Value>::__is_signed;
-
-  template<typename _Value>
-    const int __numeric_traits_integer<_Value>::__digits;
-
-#undef __glibcxx_signed
-#undef __glibcxx_digits
-#undef __glibcxx_min
-#undef __glibcxx_max
-
-#define __glibcxx_floating(_Tp, _Fval, _Dval, _LDval) \
-  (std::__are_same<_Tp, float>::__value ? _Fval \
-   : std::__are_same<_Tp, double>::__value ? _Dval : _LDval)
-
-#define __glibcxx_max_digits10(_Tp) \
-  (2 + __glibcxx_floating(_Tp, __FLT_MANT_DIG__, __DBL_MANT_DIG__, \
-			  __LDBL_MANT_DIG__) * 643L / 2136)
-
-#define __glibcxx_digits10(_Tp) \
-  __glibcxx_floating(_Tp, __FLT_DIG__, __DBL_DIG__, __LDBL_DIG__)
-
-#define __glibcxx_max_exponent10(_Tp) \
-  __glibcxx_floating(_Tp, __FLT_MAX_10_EXP__, __DBL_MAX_10_EXP__, \
-		     __LDBL_MAX_10_EXP__)
-
-  template<typename _Value>
-    struct __numeric_traits_floating
-    {
-      // Only floating point types. See N1822. 
-      static const int __max_digits10 = __glibcxx_max_digits10(_Value);
-
-      // See above comment...
-      static const bool __is_signed = true;
-      static const int __digits10 = __glibcxx_digits10(_Value);
-      static const int __max_exponent10 = __glibcxx_max_exponent10(_Value);
-    };
-
-  template<typename _Value>
-    const int __numeric_traits_floating<_Value>::__max_digits10;
-
-  template<typename _Value>
-    const bool __numeric_traits_floating<_Value>::__is_signed;
-
-  template<typename _Value>
-    const int __numeric_traits_floating<_Value>::__digits10;
-
-  template<typename _Value>
-    const int __numeric_traits_floating<_Value>::__max_exponent10;
-
-  template<typename _Value>
-    struct __numeric_traits
-    : public __conditional_type<std::__is_integer<_Value>::__value,
-				__numeric_traits_integer<_Value>,
-				__numeric_traits_floating<_Value> >::__type
-    { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#undef __glibcxx_floating
-#undef __glibcxx_max_digits10
-#undef __glibcxx_digits10
-#undef __glibcxx_max_exponent10
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/assoc_container.hpp b/openflow/usr/include/c++/5/ext/pb_ds/assoc_container.hpp
deleted file mode 100644
index 645a1e3..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/assoc_container.hpp
+++ /dev/null
@@ -1,861 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file assoc_container.hpp
- * Contains associative containers.
- */
-
-#ifndef PB_DS_ASSOC_CNTNR_HPP
-#define PB_DS_ASSOC_CNTNR_HPP
-
-#include <bits/c++config.h>
-#include <ext/typelist.h>
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <ext/pb_ds/detail/standard_policies.hpp>
-#include <ext/pb_ds/detail/container_base_dispatch.hpp>
-#include <ext/pb_ds/detail/branch_policy/traits.hpp>
-
-namespace __gnu_pbds
-{
-  /**
-   *  @defgroup containers-pbds Containers
-   *  @ingroup pbds
-   *  @{
-   */
-
-  /**
-   *  @defgroup hash-based Hash-Based
-   *  @ingroup containers-pbds
-   *  @{
-   */
-#define PB_DS_HASH_BASE \
-  detail::container_base_dispatch<Key, Mapped, _Alloc, Tag, \
-    typename __gnu_cxx::typelist::append< \
-    typename __gnu_cxx::typelist::create4<Hash_Fn, Eq_Fn, Resize_Policy, \
-    detail::integral_constant<int, Store_Hash> >::type, Policy_Tl>::type>::type
-
-  /**
-   *  @defgroup hash-detail Base and Policy Classes
-   *  @ingroup hash-based
-   */
-
-  /**
-   *  A hashed container abstraction.
-   *
-   *  @tparam Key 	    	Key type.
-   *  @tparam Mapped 	    	Map type.
-   *  @tparam Hash_Fn	    	Hashing functor.
-   *  @tparam Eq_Fn	    	Equal functor.
-   *  @tparam Resize_Policy 	Resizes hash.
-   *  @tparam Store_Hash    	Indicates whether the hash value
-   *                            will be stored along with each key.
-   *  @tparam Tag 	    	Instantiating data structure type,
-   *			    	see container_tag.
-   *  @tparam Policy_TL	    	Policy typelist.
-   *  @tparam _Alloc 	    	Allocator type.
-   *
-   *  Base is dispatched at compile time via Tag, from the following
-   *  choices: cc_hash_tag, gp_hash_tag, and descendants of basic_hash_tag.
-   *
-   *  Base choices are: detail::cc_ht_map, detail::gp_ht_map
-   */
-  template<typename Key,
-	   typename Mapped,
-	   typename Hash_Fn,
-	   typename Eq_Fn,
-	   typename Resize_Policy,
-	   bool Store_Hash,
-	   typename Tag,
-	   typename Policy_Tl,
-	   typename _Alloc>
-  class basic_hash_table : public PB_DS_HASH_BASE
-  {
-  private:
-    typedef typename PB_DS_HASH_BASE 		base_type;
-
-  public:
-    virtual
-    ~basic_hash_table() { }
-
-  protected:
-    basic_hash_table() { }
-
-    basic_hash_table(const basic_hash_table& other)
-    : base_type((const base_type&)other) { }
-
-    template<typename T0>
-      basic_hash_table(T0 t0) : base_type(t0) { }
-
-    template<typename T0, typename T1>
-      basic_hash_table(T0 t0, T1 t1) : base_type(t0, t1) { }
-
-    template<typename T0, typename T1, typename T2>
-      basic_hash_table(T0 t0, T1 t1, T2 t2) : base_type(t0, t1, t2) { }
-
-    template<typename T0, typename T1, typename T2, typename T3>
-      basic_hash_table(T0 t0, T1 t1, T2 t2, T3 t3)
-      : base_type(t0, t1, t2, t3) { }
-
-    template<typename T0, typename T1, typename T2, typename T3, typename T4>
-      basic_hash_table(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4)
-      : base_type(t0, t1, t2, t3, t4) { }
-
-    template<typename T0, typename T1, typename T2, typename T3, typename T4,
-	     typename T5>
-      basic_hash_table(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-      : base_type(t0, t1, t2, t3, t4, t5) { }
-
-    template<typename T0, typename T1, typename T2, typename T3, typename T4,
-	     typename T5, typename T6>
-      basic_hash_table(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-      : base_type(t0, t1, t2, t3, t4, t5, t6) { }
-
-    template<typename T0, typename T1, typename T2, typename T3, typename T4,
-	     typename T5, typename T6, typename T7>
-      basic_hash_table(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-      : base_type(t0, t1, t2, t3, t4, t5, t6, t7) { }
-
-    template<typename T0, typename T1, typename T2, typename T3, typename T4,
-	     typename T5, typename T6, typename T7, typename T8>
-      basic_hash_table(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6,
-		       T7 t7, T8 t8)
-      : base_type(t0, t1, t2, t3, t4, t5, t6, t7, t8)
-      { }
-
-  private:
-    basic_hash_table&
-    operator=(const base_type&);
-  };
-
-#undef PB_DS_HASH_BASE
-
-
-#define PB_DS_CC_HASH_BASE \
-  basic_hash_table<Key, Mapped,	Hash_Fn, Eq_Fn, Resize_Policy, Store_Hash, \
-		   cc_hash_tag,	\
-	  typename __gnu_cxx::typelist::create1<Comb_Hash_Fn>::type, _Alloc>
-
-
-  /**
-   *  A collision-chaining hash-based associative container.
-   *
-   *  @tparam Key 	    	Key type.
-   *  @tparam Mapped 	    	Map type.
-   *  @tparam Hash_Fn	    	Hashing functor.
-   *  @tparam Eq_Fn	    	Equal functor.
-   *  @tparam Comb_Hash_Fn	Combining hash functor.
-   *                            If Hash_Fn is not null_type, then this
-   *                            is the ranged-hash functor; otherwise,
-   *                            this is the range-hashing functor.
-   *                    XXX(See Design::Hash-Based Containers::Hash Policies.)
-   *  @tparam Resize_Policy 	Resizes hash.
-   *  @tparam Store_Hash    	Indicates whether the hash value
-   *                            will be stored along with each key.
-   *                            If Hash_Fn is null_type, then the
-   *                            container will not compile if this
-   *                            value is true
-   *  @tparam _Alloc 	    	Allocator type.
-   *
-   *  Base tag choices are: 	cc_hash_tag.
-   *
-   *  Base is basic_hash_table.
-   */
-  template<typename Key,
-	   typename Mapped,
-	   typename Hash_Fn = typename detail::default_hash_fn<Key>::type,
-	   typename Eq_Fn = typename detail::default_eq_fn<Key>::type,
-	   typename Comb_Hash_Fn = detail::default_comb_hash_fn::type,
-	   typename Resize_Policy = typename detail::default_resize_policy<Comb_Hash_Fn>::type,
-	   bool Store_Hash = detail::default_store_hash,
-	   typename _Alloc = std::allocator<char> >
-  class cc_hash_table :  public PB_DS_CC_HASH_BASE
-  {
-  private:
-    typedef PB_DS_CC_HASH_BASE 			base_type;
-
-  public:
-    typedef cc_hash_tag	       			container_category;
-    typedef Hash_Fn 				hash_fn;
-    typedef Eq_Fn 				eq_fn;
-    typedef Resize_Policy 			resize_policy;
-    typedef Comb_Hash_Fn 			comb_hash_fn;
-
-    /// Default constructor.
-    cc_hash_table() { }
-
-    /// Constructor taking some policy objects. r_hash_fn will be
-    /// copied by the Hash_Fn object of the container object.
-    cc_hash_table(const hash_fn& h)
-    : base_type(h) { }
-
-    /// Constructor taking some policy objects. r_hash_fn will be
-    /// copied by the hash_fn object of the container object, and
-    /// r_eq_fn will be copied by the eq_fn object of the container
-    /// object.
-    cc_hash_table(const hash_fn& h, const eq_fn& e)
-    : base_type(h, e) { }
-
-    /// Constructor taking some policy objects. r_hash_fn will be
-    /// copied by the hash_fn object of the container object, r_eq_fn
-    /// will be copied by the eq_fn object of the container object,
-    /// and r_comb_hash_fn will be copied by the comb_hash_fn object
-    /// of the container object.
-    cc_hash_table(const hash_fn& h, const eq_fn& e, const comb_hash_fn& ch)
-    : base_type(h, e, ch) { }
-
-    /// Constructor taking some policy objects. r_hash_fn will be
-    /// copied by the hash_fn object of the container object, r_eq_fn
-    /// will be copied by the eq_fn object of the container object,
-    /// r_comb_hash_fn will be copied by the comb_hash_fn object of
-    /// the container object, and r_resize_policy will be copied by
-    /// the resize_policy object of the container object.
-    cc_hash_table(const hash_fn& h, const eq_fn& e, const comb_hash_fn& ch,
-		  const resize_policy& rp)
-    : base_type(h, e, ch, rp) { }
-
-    /// Constructor taking __iterators to a range of value_types. The
-    /// value_types between first_it and last_it will be inserted into
-    /// the container object.
-    template<typename It>
-    cc_hash_table(It first, It last)
-    { base_type::copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects. The value_types between first_it and
-    /// last_it will be inserted into the container object.
-    template<typename It>
-    cc_hash_table(It first, It last, const hash_fn& h)
-    : base_type(h)
-    { this->copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects The value_types between first_it and
-    /// last_it will be inserted into the container object. r_hash_fn
-    /// will be copied by the hash_fn object of the container object,
-    /// and r_eq_fn will be copied by the eq_fn object of the
-    /// container object.
-    template<typename It>
-    cc_hash_table(It first, It last, const hash_fn& h, const eq_fn& e)
-    : base_type(h, e)
-    { this->copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects The value_types between first_it and
-    /// last_it will be inserted into the container object. r_hash_fn
-    /// will be copied by the hash_fn object of the container object,
-    /// r_eq_fn will be copied by the eq_fn object of the container
-    /// object, and r_comb_hash_fn will be copied by the comb_hash_fn
-    /// object of the container object.
-    template<typename It>
-    cc_hash_table(It first, It last, const hash_fn& h, const eq_fn& e,
-		  const comb_hash_fn& ch)
-    : base_type(h, e, ch)
-    { this->copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects The value_types between first_it and
-    /// last_it will be inserted into the container object. r_hash_fn
-    /// will be copied by the hash_fn object of the container object,
-    /// r_eq_fn will be copied by the eq_fn object of the container
-    /// object, r_comb_hash_fn will be copied by the comb_hash_fn
-    /// object of the container object, and r_resize_policy will be
-    /// copied by the resize_policy object of the container object.
-    template<typename It>
-    cc_hash_table(It first, It last, const hash_fn& h, const eq_fn& e,
-		  const comb_hash_fn& ch, const resize_policy& rp)
-    : base_type(h, e, ch, rp)
-    { this->copy_from_range(first, last); }
-
-    cc_hash_table(const cc_hash_table& other)
-    : base_type((const base_type&)other)
-    { }
-
-    virtual
-    ~cc_hash_table() { }
-
-    cc_hash_table&
-    operator=(const cc_hash_table& other)
-    {
-      if (this != &other)
-	{
-	  cc_hash_table tmp(other);
-	  swap(tmp);
-	}
-      return *this;
-    }
-
-    void
-    swap(cc_hash_table& other)
-    { base_type::swap(other); }
-  };
-
-#undef PB_DS_CC_HASH_BASE
-
-
-#define PB_DS_GP_HASH_BASE \
-  basic_hash_table<Key, Mapped,	Hash_Fn, Eq_Fn, Resize_Policy, Store_Hash, \
-		   gp_hash_tag, \
-  typename __gnu_cxx::typelist::create2<Comb_Probe_Fn, Probe_Fn>::type, _Alloc>
-
-
-  /**
-   *  A general-probing hash-based associative container.
-   *
-   *  @tparam Key 	    	Key type.
-   *  @tparam Mapped 	    	Map type.
-   *  @tparam Hash_Fn	    	Hashing functor.
-   *  @tparam Eq_Fn	    	Equal functor.
-   *  @tparam Comb_Probe_Fn	Combining probe functor.
-   *                            If Hash_Fn is not null_type, then this
-   *                            is the ranged-probe functor; otherwise,
-   *                            this is the range-hashing functor.
-   *                    XXX See Design::Hash-Based Containers::Hash Policies.
-   *  @tparam Probe_Fn		Probe functor.
-   *  @tparam Resize_Policy 	Resizes hash.
-   *  @tparam Store_Hash    	Indicates whether the hash value
-   *                            will be stored along with each key.
-   *                            If Hash_Fn is null_type, then the
-   *                            container will not compile if this
-   *                            value is true
-   *  @tparam _Alloc 	    	Allocator type.
-   *
-   *  Base tag choices are: 	gp_hash_tag.
-   *
-   *  Base is basic_hash_table.
-   */
-  template<typename Key,
-	   typename Mapped,
-	   typename Hash_Fn = typename detail::default_hash_fn<Key>::type,
-	   typename Eq_Fn = typename detail::default_eq_fn<Key>::type,
-	   typename Comb_Probe_Fn = detail::default_comb_hash_fn::type,
-	   typename Probe_Fn = typename detail::default_probe_fn<Comb_Probe_Fn>::type,
-	   typename Resize_Policy = typename detail::default_resize_policy<Comb_Probe_Fn>::type,
-	   bool Store_Hash = detail::default_store_hash,
-	   typename _Alloc = std::allocator<char> >
-  class gp_hash_table : public PB_DS_GP_HASH_BASE
-  {
-  private:
-    typedef PB_DS_GP_HASH_BASE 			base_type;
-
-  public:
-    typedef gp_hash_tag	       			container_category;
-    typedef Hash_Fn 				hash_fn;
-    typedef Eq_Fn 				eq_fn;
-    typedef Comb_Probe_Fn			comb_probe_fn;
-    typedef Probe_Fn 				probe_fn;
-    typedef Resize_Policy 			resize_policy;
-
-    /// Default constructor.
-    gp_hash_table() { }
-
-    /// Constructor taking some policy objects. r_hash_fn will be
-    /// copied by the hash_fn object of the container object.
-    gp_hash_table(const hash_fn& h)
-    : base_type(h) { }
-
-    /// Constructor taking some policy objects. r_hash_fn will be
-    /// copied by the hash_fn object of the container object, and
-    /// r_eq_fn will be copied by the eq_fn object of the container
-    /// object.
-    gp_hash_table(const hash_fn& h, const eq_fn& e)
-    : base_type(h, e) { }
-
-    /// Constructor taking some policy objects. r_hash_fn will be
-    /// copied by the hash_fn object of the container object, r_eq_fn
-    /// will be copied by the eq_fn object of the container object,
-    /// and r_comb_probe_fn will be copied by the comb_probe_fn object
-    /// of the container object.
-    gp_hash_table(const hash_fn& h, const eq_fn& e, const comb_probe_fn& cp)
-    : base_type(h, e, cp) { }
-
-    /// Constructor taking some policy objects. r_hash_fn will be
-    /// copied by the hash_fn object of the container object, r_eq_fn
-    /// will be copied by the eq_fn object of the container object,
-    /// r_comb_probe_fn will be copied by the comb_probe_fn object of
-    /// the container object, and r_probe_fn will be copied by the
-    /// probe_fn object of the container object.
-    gp_hash_table(const hash_fn& h, const eq_fn& e, const comb_probe_fn& cp,
-		  const probe_fn& p)
-    : base_type(h, e, cp, p) { }
-
-    /// Constructor taking some policy objects. r_hash_fn will be
-    /// copied by the hash_fn object of the container object, r_eq_fn
-    /// will be copied by the eq_fn object of the container object,
-    /// r_comb_probe_fn will be copied by the comb_probe_fn object of
-    /// the container object, r_probe_fn will be copied by the
-    /// probe_fn object of the container object, and r_resize_policy
-    /// will be copied by the Resize_Policy object of the container
-    /// object.
-    gp_hash_table(const hash_fn& h, const eq_fn& e, const comb_probe_fn& cp,
-		  const probe_fn& p, const resize_policy& rp)
-    : base_type(h, e, cp, p, rp) { }
-
-    /// Constructor taking __iterators to a range of value_types. The
-    /// value_types between first_it and last_it will be inserted into
-    /// the container object.
-    template<typename It>
-    gp_hash_table(It first, It last)
-    { base_type::copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects. The value_types between first_it and
-    /// last_it will be inserted into the container object. r_hash_fn
-    /// will be copied by the hash_fn object of the container object.
-    template<typename It>
-    gp_hash_table(It first, It last, const hash_fn& h)
-    : base_type(h)
-    { base_type::copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects. The value_types between first_it and
-    /// last_it will be inserted into the container object. r_hash_fn
-    /// will be copied by the hash_fn object of the container object,
-    /// and r_eq_fn will be copied by the eq_fn object of the
-    /// container object.
-    template<typename It>
-    gp_hash_table(It first, It last, const hash_fn& h, const eq_fn& e)
-    : base_type(h, e)
-    { base_type::copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects. The value_types between first_it and
-    /// last_it will be inserted into the container object. r_hash_fn
-    /// will be copied by the hash_fn object of the container object,
-    /// r_eq_fn will be copied by the eq_fn object of the container
-    /// object, and r_comb_probe_fn will be copied by the
-    /// comb_probe_fn object of the container object.
-    template<typename It>
-    gp_hash_table(It first, It last, const hash_fn& h, const eq_fn& e,
-		  const comb_probe_fn& cp)
-    : base_type(h, e, cp)
-    { base_type::copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects. The value_types between first_it and
-    /// last_it will be inserted into the container object. r_hash_fn
-    /// will be copied by the hash_fn object of the container object,
-    /// r_eq_fn will be copied by the eq_fn object of the container
-    /// object, r_comb_probe_fn will be copied by the comb_probe_fn
-    /// object of the container object, and r_probe_fn will be copied
-    /// by the probe_fn object of the container object.
-    template<typename It>
-    gp_hash_table(It first, It last, const hash_fn& h, const eq_fn& e,
-		  const comb_probe_fn& cp, const probe_fn& p)
-    : base_type(h, e, cp, p)
-    { base_type::copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects. The value_types between first_it and
-    /// last_it will be inserted into the container object. r_hash_fn
-    /// will be copied by the hash_fn object of the container object,
-    /// r_eq_fn will be copied by the eq_fn object of the container
-    /// object, r_comb_probe_fn will be copied by the comb_probe_fn
-    /// object of the container object, r_probe_fn will be copied by
-    /// the probe_fn object of the container object, and
-    /// r_resize_policy will be copied by the resize_policy object of
-    /// the container object.
-    template<typename It>
-    gp_hash_table(It first, It last, const hash_fn& h, const eq_fn& e,
-		  const comb_probe_fn& cp, const probe_fn& p,
-		  const resize_policy& rp)
-    : base_type(h, e, cp, p, rp)
-    { base_type::copy_from_range(first, last); }
-
-    gp_hash_table(const gp_hash_table& other)
-    : base_type((const base_type&)other)
-    { }
-
-    virtual
-    ~gp_hash_table() { }
-
-    gp_hash_table&
-    operator=(const gp_hash_table& other)
-    {
-      if (this != &other)
-	{
-	  gp_hash_table tmp(other);
-	  swap(tmp);
-	}
-      return *this;
-    }
-
-    void
-    swap(gp_hash_table& other)
-    { base_type::swap(other); }
-  };
-  //@} hash-based
-#undef PB_DS_GP_HASH_BASE
-
-
-  /**
-   *  @defgroup branch-based Branch-Based
-   *  @ingroup containers-pbds
-   *  @{
-   */
-#define PB_DS_BRANCH_BASE \
-  detail::container_base_dispatch<Key, Mapped, _Alloc, Tag, Policy_Tl>::type
-
-  /**
-   *  @defgroup branch-detail Base and Policy Classes
-   *  @ingroup branch-based
-   */
-
-  /**
-   *  A branched, tree-like (tree, trie) container abstraction.
-   *
-   *  @tparam Key 	  	Key type.
-   *  @tparam Mapped 	  	Map type.
-   *  @tparam Tag 	  	Instantiating data structure type,
-   *                            see container_tag.
-   *  @tparam Node_Update 	Updates nodes, restores invariants.
-   *  @tparam Policy_TL         Policy typelist.
-   *  @tparam _Alloc 	  	Allocator type.
-   *
-   *  Base is dispatched at compile time via Tag, from the following
-   *  choices: tree_tag, trie_tag, and their descendants.
-   *
-   *  Base choices are: detail::ov_tree_map, detail::rb_tree_map,
-   *		       	detail::splay_tree_map, and detail::pat_trie_map.
-   */
-  template<typename Key, typename Mapped, typename Tag,
-	   typename Node_Update, typename Policy_Tl, typename _Alloc>
-  class basic_branch : public PB_DS_BRANCH_BASE
-  {
-  private:
-    typedef typename PB_DS_BRANCH_BASE 	       	base_type;
-
-  public:
-    typedef Node_Update 			node_update;
-
-    virtual
-    ~basic_branch() { }
-
-  protected:
-    basic_branch() { }
-
-    basic_branch(const basic_branch& other)
-    : base_type((const base_type&)other) { }
-
-    template<typename T0>
-      basic_branch(T0 t0) : base_type(t0) { }
-
-    template<typename T0, typename T1>
-      basic_branch(T0 t0, T1 t1) : base_type(t0, t1) { }
-
-    template<typename T0, typename T1, typename T2>
-      basic_branch(T0 t0, T1 t1, T2 t2) : base_type(t0, t1, t2) { }
-
-    template<typename T0, typename T1, typename T2, typename T3>
-      basic_branch(T0 t0, T1 t1, T2 t2, T3 t3)
-      : base_type(t0, t1, t2, t3) { }
-
-    template<typename T0, typename T1, typename T2, typename T3, typename T4>
-      basic_branch(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4)
-      : base_type(t0, t1, t2, t3, t4) { }
-
-    template<typename T0, typename T1, typename T2, typename T3, typename T4,
-	     typename T5>
-      basic_branch(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-      : base_type(t0, t1, t2, t3, t4, t5) { }
-
-    template<typename T0, typename T1, typename T2, typename T3, typename T4,
-	     typename T5, typename T6>
-      basic_branch(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-      : base_type(t0, t1, t2, t3, t4, t5, t6) { }
-  };
-#undef PB_DS_BRANCH_BASE
-
-
-#define PB_DS_TREE_NODE_AND_IT_TRAITS \
-  detail::tree_traits<Key, Mapped,Cmp_Fn,Node_Update,Tag,_Alloc>
-
-#define PB_DS_TREE_BASE \
-  basic_branch<Key,Mapped, Tag, \
-	       typename PB_DS_TREE_NODE_AND_IT_TRAITS::node_update, \
-	       typename __gnu_cxx::typelist::create2<Cmp_Fn, \
-	       PB_DS_TREE_NODE_AND_IT_TRAITS>::type, _Alloc>
-
-
-  /**
-   *  A tree-based container.
-   *
-   *  @tparam Key 	 	Key type.
-   *  @tparam Mapped 	 	Map type.
-   *  @tparam Cmp_Fn	 	Comparison functor.
-   *  @tparam Tag 	 	Instantiating data structure type,
-   *                            see container_tag.
-   *  @tparam Node_Update 	Updates tree internal-nodes,
-   *                            restores invariants when invalidated.
-   *                     XXX See design::tree-based-containers::node invariants.
-   *  @tparam _Alloc 	 	Allocator type.
-   *
-   *  Base tag choices are: ov_tree_tag, rb_tree_tag, splay_tree_tag.
-   *
-   *  Base is basic_branch.
-   */
-  template<typename Key, typename Mapped, typename Cmp_Fn = std::less<Key>,
-	   typename Tag = rb_tree_tag,
-	   template<typename Node_CItr, typename Node_Itr,
-		    typename Cmp_Fn_, typename _Alloc_>
-	   class Node_Update = null_node_update,
-	   typename _Alloc = std::allocator<char> >
-  class tree : public PB_DS_TREE_BASE
-  {
-  private:
-    typedef PB_DS_TREE_BASE 			base_type;
-
-  public:
-    /// Comparison functor type.
-    typedef Cmp_Fn 				cmp_fn;
-
-    tree() { }
-
-    /// Constructor taking some policy objects. r_cmp_fn will be
-    /// copied by the Cmp_Fn object of the container object.
-    tree(const cmp_fn& c)
-    : base_type(c) { }
-
-    /// Constructor taking __iterators to a range of value_types. The
-    /// value_types between first_it and last_it will be inserted into
-    /// the container object.
-    template<typename It>
-    tree(It first, It last)
-    { base_type::copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects The value_types between first_it and
-    /// last_it will be inserted into the container object. r_cmp_fn
-    /// will be copied by the cmp_fn object of the container object.
-    template<typename It>
-    tree(It first, It last, const cmp_fn& c)
-    : base_type(c)
-    { base_type::copy_from_range(first, last); }
-
-    tree(const tree& other)
-    : base_type((const base_type&)other) { }
-
-    virtual
-    ~tree() { }
-
-    tree&
-    operator=(const tree& other)
-    {
-      if (this != &other)
-	{
-	  tree tmp(other);
-	  swap(tmp);
-	}
-      return *this;
-    }
-
-    void
-    swap(tree& other)
-    { base_type::swap(other); }
-  };
-
-#undef PB_DS_TREE_BASE
-#undef PB_DS_TREE_NODE_AND_IT_TRAITS
-
-
-#define PB_DS_TRIE_NODE_AND_IT_TRAITS \
-  detail::trie_traits<Key,Mapped,_ATraits,Node_Update,Tag,_Alloc>
-
-#define PB_DS_TRIE_BASE \
-  basic_branch<Key,Mapped,Tag, \
-	       typename PB_DS_TRIE_NODE_AND_IT_TRAITS::node_update, \
-	       typename __gnu_cxx::typelist::create2<_ATraits, \
-	       PB_DS_TRIE_NODE_AND_IT_TRAITS >::type, _Alloc>
-
-
-  /**
-   *  A trie-based container.
-   *
-   *  @tparam Key 	  	Key type.
-   *  @tparam Mapped 	  	Map type.
-   *  @tparam _ATraits	  	Element access traits.
-   *  @tparam Tag 	  	Instantiating data structure type,
-   *                            see container_tag.
-   *  @tparam Node_Update 	Updates trie internal-nodes,
-   *                            restores invariants when invalidated.
-   *                     XXX See design::tree-based-containers::node invariants.
-   *  @tparam _Alloc 	  	Allocator type.
-   *
-   *  Base tag choice is pat_trie_tag.
-   *
-   *  Base is basic_branch.
-   */
-  template<typename Key,
-	   typename Mapped,
-	   typename _ATraits = \
-		    typename detail::default_trie_access_traits<Key>::type,
-	   typename Tag = pat_trie_tag,
-	   template<typename Node_CItr,
-		    typename Node_Itr,
-		    typename _ATraits_,
-		    typename _Alloc_>
-	   class Node_Update = null_node_update,
-	   typename _Alloc = std::allocator<char> >
-  class trie : public PB_DS_TRIE_BASE
-  {
-  private:
-    typedef PB_DS_TRIE_BASE			base_type;
-
-  public:
-    /// Element access traits type.
-    typedef _ATraits 				access_traits;
-
-    trie() { }
-
-    /// Constructor taking some policy objects. r_access_traits will
-    /// be copied by the _ATraits object of the container object.
-    trie(const access_traits& t)
-    : base_type(t) { }
-
-    /// Constructor taking __iterators to a range of value_types. The
-    /// value_types between first_it and last_it will be inserted into
-    /// the container object.
-    template<typename It>
-    trie(It first, It last)
-    { base_type::copy_from_range(first, last); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects. The value_types between first_it and
-    /// last_it will be inserted into the container object.
-    template<typename It>
-    trie(It first, It last, const access_traits& t)
-    : base_type(t)
-    { base_type::copy_from_range(first, last); }
-
-    trie(const trie& other)
-    : base_type((const base_type&)other) { }
-
-    virtual
-    ~trie() { }
-
-    trie&
-    operator=(const trie& other)
-    {
-      if (this != &other)
-	{
-	  trie tmp(other);
-	  swap(tmp);
-	}
-      return *this;
-    }
-
-    void
-    swap(trie& other)
-    { base_type::swap(other); }
-  };
-  //@} branch-based
-#undef PB_DS_TRIE_BASE
-#undef PB_DS_TRIE_NODE_AND_IT_TRAITS
-
-
-  /**
-   *  @defgroup list-based List-Based
-   *  @ingroup containers-pbds
-   *  @{
-   */
-#define PB_DS_LU_BASE \
-  detail::container_base_dispatch<Key, Mapped, _Alloc, list_update_tag,	\
-    typename __gnu_cxx::typelist::create2<Eq_Fn, Update_Policy>::type>::type
-
-
-  /**
-   *  A list-update based associative container.
-   *
-   *  @tparam Key 	    	Key type.
-   *  @tparam Mapped 	    	Map type.
-   *  @tparam Eq_Fn	    	Equal functor.
-   *  @tparam Update_Policy	Update policy, determines when an element
-   *                            will be moved to the front of the list.
-   *  @tparam _Alloc 	    	Allocator type.
-   *
-   *  Base is detail::lu_map.
-   */
-  template<typename Key,
-	   typename Mapped,
-	   class Eq_Fn = typename detail::default_eq_fn<Key>::type,
-	   class Update_Policy = detail::default_update_policy::type,
-	   class _Alloc = std::allocator<char> >
-  class list_update : public PB_DS_LU_BASE
-  {
-  private:
-    typedef typename PB_DS_LU_BASE 		base_type;
-
-  public:
-    typedef list_update_tag	       		container_category;
-    typedef Eq_Fn 				eq_fn;
-    typedef Update_Policy 			update_policy;
-
-    list_update() { }
-
-    /// Constructor taking __iterators to a range of value_types. The
-    /// value_types between first_it and last_it will be inserted into
-    /// the container object.
-    template<typename It>
-    list_update(It first, It last)
-    { base_type::copy_from_range(first, last); }
-
-    list_update(const list_update& other)
-    : base_type((const base_type&)other) { }
-
-    virtual
-    ~list_update() { }
-
-    list_update&
-    operator=(const list_update& other)
-    {
-      if (this !=& other)
-	{
-	  list_update tmp(other);
-	  swap(tmp);
-	}
-      return *this;
-    }
-
-    void
-    swap(list_update& other)
-    { base_type::swap(other); }
-  };
-  //@} list-based
-#undef PB_DS_LU_BASE
-
-  // @} group containers-pbds
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
deleted file mode 100644
index 204c063..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
+++ /dev/null
@@ -1,428 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- *  @file bin_search_tree_/bin_search_tree_.hpp
- *  Contains an implementation class for binary search tree.
- */
-
-#include <ext/pb_ds/exception.hpp>
-#include <ext/pb_ds/tree_policy.hpp>
-#include <ext/pb_ds/detail/eq_fn/eq_by_less.hpp>
-#include <ext/pb_ds/detail/types_traits.hpp>
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/tree_trace_base.hpp>
-#ifdef _GLIBCXX_DEBUG
-#include <ext/pb_ds/detail/debug_map_base.hpp>
-#endif
-#include <utility>
-#include <functional>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-#define PB_DS_BIN_TREE_NAME bin_search_tree_map
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-#define PB_DS_BIN_TREE_NAME bin_search_tree_set
-#endif
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Mapped, typename Cmp_Fn, \
-	     typename Node_And_It_Traits, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    PB_DS_BIN_TREE_NAME<Key, Mapped, Cmp_Fn, Node_And_It_Traits, _Alloc>
-
-#define PB_DS_BIN_TREE_TRAITS_BASE \
-    types_traits<Key, Mapped, _Alloc, false>
-
-#ifdef _GLIBCXX_DEBUG
-#define PB_DS_DEBUG_MAP_BASE_C_DEC  \
-    debug_map_base<Key,	eq_by_less<Key, Cmp_Fn>, \
-	      typename _Alloc::template rebind<Key>::other::const_reference>
-#endif
-
-#ifdef PB_DS_TREE_TRACE
-#define PB_DS_TREE_TRACE_BASE_C_DEC \
-    tree_trace_base<typename Node_And_It_Traits::node_const_iterator, \
-		    typename Node_And_It_Traits::node_iterator,	      \
-		    Cmp_Fn, true, _Alloc>
-#endif
-
-
-    /*
-     *  @brief Binary search tree (BST).
-     *
-     *  This implementation uses an idea from the SGI STL (using a @a
-     *  header node which is needed for efficient iteration).
-     */
-    template<typename Key, typename Mapped, typename Cmp_Fn,
-	     typename Node_And_It_Traits, typename _Alloc>
-    class PB_DS_BIN_TREE_NAME :
-#ifdef _GLIBCXX_DEBUG
-      public PB_DS_DEBUG_MAP_BASE_C_DEC,
-#endif
-#ifdef PB_DS_TREE_TRACE
-      public PB_DS_TREE_TRACE_BASE_C_DEC,
-#endif
-      public Cmp_Fn,
-      public PB_DS_BIN_TREE_TRAITS_BASE,
-      public Node_And_It_Traits::node_update
-    {
-      typedef Node_And_It_Traits 			traits_type;
-
-    protected:
-      typedef PB_DS_BIN_TREE_TRAITS_BASE 	       	traits_base;
-
-      typedef
-      typename _Alloc::template rebind<typename traits_type::node>::other
-      node_allocator;
-
-      typedef typename node_allocator::value_type 	node;
-      typedef typename node_allocator::pointer 		node_pointer;
-
-      typedef typename traits_type::null_node_update_pointer
-      null_node_update_pointer;
-
-    private:
-      typedef cond_dealtor<node, _Alloc> 		cond_dealtor_t;
-
-#ifdef _GLIBCXX_DEBUG
-      typedef PB_DS_DEBUG_MAP_BASE_C_DEC 		debug_base;
-#endif
-
-    public:
-      typedef typename _Alloc::size_type 		size_type;
-      typedef typename _Alloc::difference_type 	difference_type;
-      typedef typename traits_base::key_type 		key_type;
-      typedef typename traits_base::key_pointer 	key_pointer;
-      typedef typename traits_base::key_const_pointer 	key_const_pointer;
-      typedef typename traits_base::key_reference 	key_reference;
-      typedef typename traits_base::key_const_reference key_const_reference;
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      typedef typename traits_base::mapped_type 	mapped_type;
-      typedef typename traits_base::mapped_pointer 	mapped_pointer;
-      typedef typename traits_base::mapped_const_pointer mapped_const_pointer;
-      typedef typename traits_base::mapped_reference 	mapped_reference;
-      typedef typename traits_base::mapped_const_reference mapped_const_reference;
-#endif
-
-      typedef typename traits_base::value_type 		value_type;
-      typedef typename traits_base::pointer 		pointer;
-      typedef typename traits_base::const_pointer 	const_pointer;
-      typedef typename traits_base::reference 		reference;
-      typedef typename traits_base::const_reference 	const_reference;
-      typedef typename traits_type::point_const_iterator point_const_iterator;
-
-      typedef point_const_iterator 			const_iterator;
-      typedef typename traits_type::point_iterator 	point_iterator;
-      typedef point_iterator 				iterator;
-
-      typedef typename traits_type::const_reverse_iterator const_reverse_iterator;
-
-      typedef typename traits_type::reverse_iterator 	reverse_iterator;
-      typedef typename traits_type::node_const_iterator node_const_iterator;
-      typedef typename traits_type::node_iterator 	node_iterator;
-      typedef typename traits_type::node_update 	node_update;
-
-      typedef Cmp_Fn 					cmp_fn;
-      typedef _Alloc 					allocator_type;
-
-      PB_DS_BIN_TREE_NAME();
-
-      PB_DS_BIN_TREE_NAME(const Cmp_Fn&);
-
-      PB_DS_BIN_TREE_NAME(const Cmp_Fn&, const node_update&);
-
-      PB_DS_BIN_TREE_NAME(const PB_DS_CLASS_C_DEC&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      ~PB_DS_BIN_TREE_NAME();
-
-      inline bool
-      empty() const;
-
-      inline size_type
-      size() const;
-
-      inline size_type
-      max_size() const;
-
-      Cmp_Fn&
-      get_cmp_fn();
-
-      const Cmp_Fn&
-      get_cmp_fn() const;
-
-      inline point_iterator
-      lower_bound(key_const_reference);
-
-      inline point_const_iterator
-      lower_bound(key_const_reference) const;
-
-      inline point_iterator
-      upper_bound(key_const_reference);
-
-      inline point_const_iterator
-      upper_bound(key_const_reference) const;
-
-      inline point_iterator
-      find(key_const_reference);
-
-      inline point_const_iterator
-      find(key_const_reference) const;
-
-      inline iterator
-      begin();
-
-      inline const_iterator
-      begin() const;
-
-      inline iterator
-      end();
-
-      inline const_iterator
-      end() const;
-
-      inline reverse_iterator
-      rbegin();
-
-      inline const_reverse_iterator
-      rbegin() const;
-
-      inline reverse_iterator
-      rend();
-
-      inline const_reverse_iterator
-      rend() const;
-
-      /// Returns a const node_iterator corresponding to the node at the
-      /// root of the tree.
-      inline node_const_iterator
-      node_begin() const;
-
-      /// Returns a node_iterator corresponding to the node at the
-      /// root of the tree.
-      inline node_iterator
-      node_begin();
-
-      /// Returns a const node_iterator corresponding to a node just
-      /// after a leaf of the tree.
-      inline node_const_iterator
-      node_end() const;
-
-      /// Returns a node_iterator corresponding to a node just
-      /// after a leaf of the tree.
-      inline node_iterator
-      node_end();
-
-      void
-      clear();
-
-    protected:
-      void
-      value_swap(PB_DS_CLASS_C_DEC&);
-
-      void
-      initialize_min_max();
-
-      inline iterator
-      insert_imp_empty(const_reference);
-
-      inline iterator
-      insert_leaf_new(const_reference, node_pointer, bool);
-
-      inline node_pointer
-      get_new_node_for_leaf_insert(const_reference, false_type);
-
-      inline node_pointer
-      get_new_node_for_leaf_insert(const_reference, true_type);
-
-      inline void
-      actual_erase_node(node_pointer);
-
-      inline std::pair<node_pointer, bool>
-      erase(node_pointer);
-
-      inline void
-      update_min_max_for_erased_node(node_pointer);
-
-      static void
-      clear_imp(node_pointer);
-
-      inline std::pair<point_iterator, bool>
-      insert_leaf(const_reference);
-
-      inline void
-      rotate_left(node_pointer);
-
-      inline void
-      rotate_right(node_pointer);
-
-      inline void
-      rotate_parent(node_pointer);
-
-      inline void
-      apply_update(node_pointer, null_node_update_pointer);
-
-      template<typename Node_Update_>
-	inline void
-	apply_update(node_pointer, Node_Update_*);
-
-      inline void
-      update_to_top(node_pointer, null_node_update_pointer);
-
-      template<typename Node_Update_>
-	inline void
-	update_to_top(node_pointer, Node_Update_*);
-
-      bool
-      join_prep(PB_DS_CLASS_C_DEC&);
-
-      void
-      join_finish(PB_DS_CLASS_C_DEC&);
-
-      bool
-      split_prep(key_const_reference, PB_DS_CLASS_C_DEC&);
-
-      void
-      split_finish(PB_DS_CLASS_C_DEC&);
-
-      size_type
-      recursive_count(node_pointer) const;
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-
-      void
-      structure_only_assert_valid(const char*, int) const;
-
-      void
-      assert_node_consistent(const node_pointer, const char*, int) const;
-#endif
-
-    private:
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_iterators(const char*, int) const;
-
-      void
-      assert_consistent_with_debug_base(const char*, int) const;
-
-      void
-      assert_node_consistent_with_left(const node_pointer,
-				       const char*, int) const;
-
-      void
-      assert_node_consistent_with_right(const node_pointer,
-					const char*, int) const;
-
-      void
-      assert_consistent_with_debug_base(const node_pointer,
-					const char*, int) const;
-
-      void
-      assert_min(const char*, int) const;
-
-      void
-      assert_min_imp(const node_pointer, const char*, int) const;
-
-      void
-      assert_max(const char*, int) const;
-
-      void
-      assert_max_imp(const node_pointer, const char*, int) const;
-
-      void
-      assert_size(const char*, int) const;
-
-      typedef std::pair<const_pointer, const_pointer> node_consistent_t;
-
-      node_consistent_t
-      assert_node_consistent_(const node_pointer, const char*, int) const;
-#endif
-
-      void
-      initialize();
-
-      node_pointer
-      recursive_copy_node(const node_pointer);
-
-    protected:
-      node_pointer 		m_p_head;
-      size_type 		m_size;
-      static node_allocator 	s_node_allocator;
-    };
-
-#define PB_DS_STRUCT_ONLY_ASSERT_VALID(X)				\
-  _GLIBCXX_DEBUG_ONLY(X.structure_only_assert_valid(__FILE__, __LINE__);)
-
-#define PB_DS_ASSERT_NODE_CONSISTENT(_Node)				\
-  _GLIBCXX_DEBUG_ONLY(assert_node_consistent(_Node, __FILE__, __LINE__);)
-
-#include <ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp>
-
-#undef PB_DS_ASSERT_NODE_CONSISTENT
-#undef PB_DS_STRUCT_ONLY_ASSERT_VALID
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_BIN_TREE_NAME
-#undef PB_DS_BIN_TREE_TRAITS_BASE
-#undef PB_DS_DEBUG_MAP_BASE_C_DEC
-
-#ifdef PB_DS_TREE_TRACE
-#undef PB_DS_TREE_TRACE_BASE_C_DEC
-#endif
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index d0b5cd0..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,218 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/constructors_destructor_fn_imps.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_allocator
-PB_DS_CLASS_C_DEC::s_node_allocator;
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_BIN_TREE_NAME() : m_p_head(s_node_allocator.allocate(1)), m_size(0)
-{
-  initialize();
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_BIN_TREE_NAME(const Cmp_Fn& r_cmp_fn) :
-  Cmp_Fn(r_cmp_fn), m_p_head(s_node_allocator.allocate(1)), m_size(0)
-{
-  initialize();
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_BIN_TREE_NAME(const Cmp_Fn& r_cmp_fn, const node_update& r_node_update) :
-  Cmp_Fn(r_cmp_fn),
-  node_update(r_node_update),
-  m_p_head(s_node_allocator.allocate(1)),
-  m_size(0)
-{
-  initialize();
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_BIN_TREE_NAME(const PB_DS_CLASS_C_DEC& other) :
-#ifdef _GLIBCXX_DEBUG
-  debug_base(other),
-#endif 
-#ifdef PB_DS_TREE_TRACE
-  PB_DS_TREE_TRACE_BASE_C_DEC(other),
-#endif 
-  Cmp_Fn(other),
-  node_update(other),
-  m_p_head(s_node_allocator.allocate(1)),
-  m_size(0)
-{
-  initialize();
-  m_size = other.m_size;
-  PB_DS_STRUCT_ONLY_ASSERT_VALID(other)
-
-    __try
-      {
-        m_p_head->m_p_parent = recursive_copy_node(other.m_p_head->m_p_parent);
-        if (m_p_head->m_p_parent != 0)
-	  m_p_head->m_p_parent->m_p_parent = m_p_head;
-        m_size = other.m_size;
-        initialize_min_max();
-      }
-    __catch(...)
-      {
-        _GLIBCXX_DEBUG_ONLY(debug_base::clear();)
-	s_node_allocator.deallocate(m_p_head, 1);
-        __throw_exception_again;
-      }
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-  PB_DS_STRUCT_ONLY_ASSERT_VALID(other)
-  value_swap(other);
-  std::swap((Cmp_Fn& )(*this), (Cmp_Fn& )other);
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-  PB_DS_STRUCT_ONLY_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-value_swap(PB_DS_CLASS_C_DEC& other)
-{
-  _GLIBCXX_DEBUG_ONLY(debug_base::swap(other);)
-  std::swap(m_p_head, other.m_p_head);
-  std::swap(m_size, other.m_size);
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~PB_DS_BIN_TREE_NAME()
-{
-  clear();
-  s_node_allocator.deallocate(m_p_head, 1);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-initialize()
-{
-  m_p_head->m_p_parent = 0;
-  m_p_head->m_p_left = m_p_head;
-  m_p_head->m_p_right = m_p_head;
-  m_size = 0;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-recursive_copy_node(const node_pointer p_nd)
-{
-  if (p_nd == 0)
-    return (0);
-
-  node_pointer p_ret = s_node_allocator.allocate(1);
-  __try
-    {
-      new (p_ret) node(*p_nd);
-    }
-  __catch(...)
-    {
-      s_node_allocator.deallocate(p_ret, 1);
-      __throw_exception_again;
-    }
-
-  p_ret->m_p_left = p_ret->m_p_right = 0;
-
-  __try
-    {
-      p_ret->m_p_left = recursive_copy_node(p_nd->m_p_left);
-      p_ret->m_p_right = recursive_copy_node(p_nd->m_p_right);
-    }
-  __catch(...)
-    {
-      clear_imp(p_ret);
-      __throw_exception_again;
-    }
-
-  if (p_ret->m_p_left != 0)
-    p_ret->m_p_left->m_p_parent = p_ret;
-
-  if (p_ret->m_p_right != 0)
-    p_ret->m_p_right->m_p_parent = p_ret;
-
-  PB_DS_ASSERT_NODE_CONSISTENT(p_ret)
-  return p_ret;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-initialize_min_max()
-{
-  if (m_p_head->m_p_parent == 0)
-    {
-      m_p_head->m_p_left = m_p_head->m_p_right = m_p_head;
-      return;
-    }
-
-  {
-    node_pointer p_min = m_p_head->m_p_parent;
-    while (p_min->m_p_left != 0)
-      p_min = p_min->m_p_left;
-    m_p_head->m_p_left = p_min;
-  }
-
-  {
-    node_pointer p_max = m_p_head->m_p_parent;
-    while (p_max->m_p_right != 0)
-      p_max = p_max->m_p_right;
-    m_p_head->m_p_right = p_max;
-  }
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
deleted file mode 100644
index d09b0ba..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,277 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/debug_fn_imps.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  structure_only_assert_valid(__file, __line);
-  assert_consistent_with_debug_base(__file, __line);
-  assert_size(__file, __line);
-  assert_iterators(__file, __line);
-  if (m_p_head->m_p_parent == 0)
-    {
-      PB_DS_DEBUG_VERIFY(m_size == 0);
-    }
-  else
-    {
-      PB_DS_DEBUG_VERIFY(m_size > 0);
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-structure_only_assert_valid(const char* __file, int __line) const
-{
-  PB_DS_DEBUG_VERIFY(m_p_head != 0);
-  if (m_p_head->m_p_parent == 0)
-    {
-      PB_DS_DEBUG_VERIFY(m_p_head->m_p_left == m_p_head);
-      PB_DS_DEBUG_VERIFY(m_p_head->m_p_right == m_p_head);
-    }
-  else
-    {
-      PB_DS_DEBUG_VERIFY(m_p_head->m_p_parent->m_p_parent == m_p_head);
-      PB_DS_DEBUG_VERIFY(m_p_head->m_p_left != m_p_head);
-      PB_DS_DEBUG_VERIFY(m_p_head->m_p_right != m_p_head);
-    }
-
-  if (m_p_head->m_p_parent != 0)
-    assert_node_consistent(m_p_head->m_p_parent, __file, __line);
-  assert_min(__file, __line);
-  assert_max(__file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_node_consistent(const node_pointer p_nd,
-		       const char* __file, int __line) const
-{
-  assert_node_consistent_(p_nd, __file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_consistent_t
-PB_DS_CLASS_C_DEC::
-assert_node_consistent_(const node_pointer p_nd,
-			const char* __file, int __line) const
-{
-  if (p_nd == 0)
-    return (std::make_pair((const_pointer)0,(const_pointer)0));
-
-  assert_node_consistent_with_left(p_nd, __file, __line);
-  assert_node_consistent_with_right(p_nd, __file, __line);
-
-  const std::pair<const_pointer, const_pointer>
-    l_range = assert_node_consistent_(p_nd->m_p_left, __file, __line);
-
-  if (l_range.second != 0)
-    PB_DS_DEBUG_VERIFY(Cmp_Fn::operator()(PB_DS_V2F(*l_range.second),
-					  PB_DS_V2F(p_nd->m_value)));
-
-  const std::pair<const_pointer, const_pointer>
-    r_range = assert_node_consistent_(p_nd->m_p_right, __file, __line);
-
-  if (r_range.first != 0)
-    PB_DS_DEBUG_VERIFY(Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value),
-					     PB_DS_V2F(*r_range.first)));
-
-  return std::make_pair((l_range.first != 0) ? l_range.first : &p_nd->m_value,
-			(r_range.second != 0)? r_range.second : &p_nd->m_value);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_node_consistent_with_left(const node_pointer p_nd,
-				 const char* __file, int __line) const
-{
-  if (p_nd->m_p_left == 0)
-    return;
-  PB_DS_DEBUG_VERIFY(p_nd->m_p_left->m_p_parent == p_nd);
-  PB_DS_DEBUG_VERIFY(!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value),
-					 PB_DS_V2F(p_nd->m_p_left->m_value)));
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_node_consistent_with_right(const node_pointer p_nd,
-				  const char* __file, int __line) const
-{
-  if (p_nd->m_p_right == 0)
-    return;
-  PB_DS_DEBUG_VERIFY(p_nd->m_p_right->m_p_parent == p_nd);
-  PB_DS_DEBUG_VERIFY(!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_p_right->m_value),
-					 PB_DS_V2F(p_nd->m_value)));
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_min(const char* __file, int __line) const
-{
-  assert_min_imp(m_p_head->m_p_parent, __file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_min_imp(const node_pointer p_nd, const char* __file, int __line) const
-{
-  if (p_nd == 0)
-    {
-      PB_DS_DEBUG_VERIFY(m_p_head->m_p_left == m_p_head);
-      return;
-    }
-
-  if (p_nd->m_p_left == 0)
-    {
-      PB_DS_DEBUG_VERIFY(p_nd == m_p_head->m_p_left);
-      return;
-    }
-  assert_min_imp(p_nd->m_p_left, __file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_max(const char* __file, int __line) const
-{
-  assert_max_imp(m_p_head->m_p_parent, __file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_max_imp(const node_pointer p_nd,
-	       const char* __file, int __line) const
-{
-  if (p_nd == 0)
-    {
-      PB_DS_DEBUG_VERIFY(m_p_head->m_p_right == m_p_head);
-      return;
-    }
-
-  if (p_nd->m_p_right == 0)
-    {
-      PB_DS_DEBUG_VERIFY(p_nd == m_p_head->m_p_right);
-      return;
-    }
-
-  assert_max_imp(p_nd->m_p_right, __file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_iterators(const char* __file, int __line) const
-{
-  size_type iterated_num = 0;
-  const_iterator prev_it = end();
-  for (const_iterator it = begin(); it != end(); ++it)
-    {
-      ++iterated_num;
-      PB_DS_DEBUG_VERIFY(lower_bound(PB_DS_V2F(*it)).m_p_nd == it.m_p_nd);
-      const_iterator upper_bound_it = upper_bound(PB_DS_V2F(*it));
-      --upper_bound_it;
-      PB_DS_DEBUG_VERIFY(upper_bound_it.m_p_nd == it.m_p_nd);
-
-      if (prev_it != end())
-	PB_DS_DEBUG_VERIFY(Cmp_Fn::operator()(PB_DS_V2F(*prev_it),
-					      PB_DS_V2F(*it)));
-      prev_it = it;
-    }
-
-  PB_DS_DEBUG_VERIFY(iterated_num == m_size);
-  size_type reverse_iterated_num = 0;
-  const_reverse_iterator reverse_prev_it = rend();
-  for (const_reverse_iterator reverse_it = rbegin(); reverse_it != rend();
-       ++reverse_it)
-    {
-      ++reverse_iterated_num;
-      PB_DS_DEBUG_VERIFY(lower_bound(
-				   PB_DS_V2F(*reverse_it)).m_p_nd == reverse_it.m_p_nd);
-
-      const_iterator upper_bound_it = upper_bound(PB_DS_V2F(*reverse_it));
-      --upper_bound_it;
-      PB_DS_DEBUG_VERIFY(upper_bound_it.m_p_nd == reverse_it.m_p_nd);
-      if (reverse_prev_it != rend())
-	PB_DS_DEBUG_VERIFY(!Cmp_Fn::operator()(PB_DS_V2F(*reverse_prev_it),
-					       PB_DS_V2F(*reverse_it)));
-      reverse_prev_it = reverse_it;
-    }
-  PB_DS_DEBUG_VERIFY(reverse_iterated_num == m_size);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_consistent_with_debug_base(const char* __file, int __line) const
-{
-  debug_base::check_size(m_size, __file, __line);
-  assert_consistent_with_debug_base(m_p_head->m_p_parent, __file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_consistent_with_debug_base(const node_pointer p_nd,
-				  const char* __file, int __line) const
-{
-  if (p_nd == 0)
-    return;
-  debug_base::check_key_exists(PB_DS_V2F(p_nd->m_value), __file, __line);
-  assert_consistent_with_debug_base(p_nd->m_p_left, __file, __line);
-  assert_consistent_with_debug_base(p_nd->m_p_right, __file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_size(const char* __file, int __line) const
-{ PB_DS_DEBUG_VERIFY(recursive_count(m_p_head->m_p_parent) == m_size); }
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
deleted file mode 100644
index b2425c7..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/erase_fn_imps.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-actual_erase_node(node_pointer p_z)
-{
-  _GLIBCXX_DEBUG_ASSERT(m_size > 0);
-  --m_size;
-  _GLIBCXX_DEBUG_ONLY(debug_base::erase_existing(PB_DS_V2F(p_z->m_value));)
-  p_z->~node();
-  s_node_allocator.deallocate(p_z, 1);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-update_min_max_for_erased_node(node_pointer p_z)
-{
-  if (m_size == 1)
-    {
-      m_p_head->m_p_left = m_p_head->m_p_right = m_p_head;
-      return;
-    }
-
-  if (m_p_head->m_p_left == p_z)
-    {
-      iterator it(p_z);
-      ++it;
-      m_p_head->m_p_left = it.m_p_nd;
-    }
-  else if (m_p_head->m_p_right == p_z)
-    {
-      iterator it(p_z);
-      --it;
-      m_p_head->m_p_right = it.m_p_nd;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-  clear_imp(m_p_head->m_p_parent);
-  m_size = 0;
-  initialize();
-  _GLIBCXX_DEBUG_ONLY(debug_base::clear();)
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear_imp(node_pointer p_nd)
-{
-  if (p_nd == 0)
-    return;
-
-  clear_imp(p_nd->m_p_left);
-  clear_imp(p_nd->m_p_right);
-  p_nd->~node();
-  s_node_allocator.deallocate(p_nd, 1);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
deleted file mode 100644
index bb536f6..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/find_fn_imps.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-lower_bound(key_const_reference r_key) const
-{
-  node_pointer p_pot = m_p_head;
-  node_pointer p_nd = m_p_head->m_p_parent;
-
-  while (p_nd != 0)
-    if (Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), r_key))
-      p_nd = p_nd->m_p_right;
-    else
-      {
-	p_pot = p_nd;
-	p_nd = p_nd->m_p_left;
-      }
-  return iterator(p_pot);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-lower_bound(key_const_reference r_key)
-{
-  node_pointer p_pot = m_p_head;
-  node_pointer p_nd = m_p_head->m_p_parent;
-
-  while (p_nd != 0)
-    if (Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), r_key))
-      p_nd = p_nd->m_p_right;
-    else
-      {
-	p_pot = p_nd;
-	p_nd = p_nd->m_p_left;
-      }
-  return iterator(p_pot);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-upper_bound(key_const_reference r_key) const
-{
-  node_pointer p_pot = m_p_head;
-  node_pointer p_nd = m_p_head->m_p_parent;
-
-  while (p_nd != 0)
-    if (Cmp_Fn::operator()(r_key, PB_DS_V2F(p_nd->m_value)))
-      {
-	p_pot = p_nd;
-	p_nd = p_nd->m_p_left;
-      }
-    else
-      p_nd = p_nd->m_p_right;
-  return const_iterator(p_pot);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-upper_bound(key_const_reference r_key)
-{
-  node_pointer p_pot = m_p_head;
-  node_pointer p_nd = m_p_head->m_p_parent;
-
-  while (p_nd != 0)
-    if (Cmp_Fn::operator()(r_key, PB_DS_V2F(p_nd->m_value)))
-      {
-	p_pot = p_nd;
-	p_nd = p_nd->m_p_left;
-      }
-    else
-      p_nd = p_nd->m_p_right;
-  return point_iterator(p_pot);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-find(key_const_reference r_key)
-{
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-  node_pointer p_pot = m_p_head;
-  node_pointer p_nd = m_p_head->m_p_parent;
-
-  while (p_nd != 0)
-    if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), r_key))
-      {
-	p_pot = p_nd;
-	p_nd = p_nd->m_p_left;
-      }
-    else
-      p_nd = p_nd->m_p_right;
-
-  node_pointer ret = p_pot;
-  if (p_pot != m_p_head)
-    {
-      const bool __cmp = Cmp_Fn::operator()(r_key, PB_DS_V2F(p_pot->m_value));
-      if (__cmp)
-	ret = m_p_head;
-    }
-  return point_iterator(ret);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-find(key_const_reference r_key) const
-{
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-  node_pointer p_pot = m_p_head;
-  node_pointer p_nd = m_p_head->m_p_parent;
-
-  while (p_nd != 0)
-    if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), r_key))
-      {
-	p_pot = p_nd;
-	p_nd = p_nd->m_p_left;
-      }
-    else
-      p_nd = p_nd->m_p_right;
-
-  node_pointer ret = p_pot;
-  if (p_pot != m_p_head)
-    {
-      const bool __cmp = Cmp_Fn::operator()(r_key, PB_DS_V2F(p_pot->m_value));
-      if (__cmp)
-	ret = m_p_head;
-    }
-  return point_const_iterator(ret);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
deleted file mode 100644
index 06798d0..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/info_fn_imps.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-empty() const
-{
-  return (m_size == 0);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size() const
-{
-  return (m_size);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-max_size() const
-{
-  return (s_node_allocator.max_size());
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
deleted file mode 100644
index 5ad82e1..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,180 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/insert_fn_imps.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline std::pair<typename PB_DS_CLASS_C_DEC::point_iterator, bool>
-PB_DS_CLASS_C_DEC::
-insert_leaf(const_reference r_value)
-{
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-
-  if (m_size == 0)
-    return std::make_pair(insert_imp_empty(r_value),
-			  true);
-
-  node_pointer p_nd = m_p_head->m_p_parent;
-  node_pointer p_pot = m_p_head;
-
-  while (p_nd != 0)
-    if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value),
-			    PB_DS_V2F(r_value)))
-      {
-	p_pot = p_nd;
-
-	p_nd = p_nd->m_p_left;
-      }
-    else
-      p_nd = p_nd->m_p_right;
-
-  if (p_pot == m_p_head)
-    return std::make_pair(insert_leaf_new(r_value, m_p_head->m_p_right, false),
-			  true);
-
-  if (!Cmp_Fn::operator()(PB_DS_V2F(r_value),
-			  PB_DS_V2F(p_pot->m_value)))
-    {
-      PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-      PB_DS_CHECK_KEY_EXISTS(PB_DS_V2F(r_value))
-      return std::make_pair(p_pot, false);
-    }
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(PB_DS_V2F(r_value))
-
-  p_nd = p_pot->m_p_left;
-  if (p_nd == 0)
-    return std::make_pair(insert_leaf_new(r_value, p_pot, true),
-			  true);
-
-  while (p_nd->m_p_right != 0)
-    p_nd = p_nd->m_p_right;
-
-  return std::make_pair(insert_leaf_new(r_value, p_nd, false),
-			true);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-insert_leaf_new(const_reference r_value, node_pointer p_nd, bool left_nd)
-{
-  node_pointer p_new_nd =
-    get_new_node_for_leaf_insert(r_value,
-				 traits_base::m_no_throw_copies_indicator);
-
-  if (left_nd)
-    {
-      _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_left == 0);
-      _GLIBCXX_DEBUG_ASSERT(Cmp_Fn::operator()(PB_DS_V2F(r_value),
-					       PB_DS_V2F(p_nd->m_value)));
-
-      p_nd->m_p_left = p_new_nd;
-      if (m_p_head->m_p_left == p_nd)
-	m_p_head->m_p_left = p_new_nd;
-    }
-  else
-    {
-      _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_right == 0);
-      _GLIBCXX_DEBUG_ASSERT(Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value),
-					       PB_DS_V2F(r_value)));
-
-      p_nd->m_p_right = p_new_nd;
-      if (m_p_head->m_p_right == p_nd)
-	m_p_head->m_p_right = p_new_nd;
-    }
-
-  p_new_nd->m_p_parent = p_nd;
-  p_new_nd->m_p_left = p_new_nd->m_p_right = 0;
-  PB_DS_ASSERT_NODE_CONSISTENT(p_nd)
-
-  update_to_top(p_new_nd, (node_update* )this);
-  _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(r_value));)
-  return iterator(p_new_nd);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-insert_imp_empty(const_reference r_value)
-{
-  node_pointer p_new_node =
-    get_new_node_for_leaf_insert(r_value, traits_base::m_no_throw_copies_indicator);
-
-  m_p_head->m_p_left = m_p_head->m_p_right =
-    m_p_head->m_p_parent = p_new_node;
-
-  p_new_node->m_p_parent = m_p_head;
-  p_new_node->m_p_left = p_new_node->m_p_right = 0;
-  _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(r_value));)
-
-  update_to_top(m_p_head->m_p_parent, (node_update*)this);
-  return iterator(p_new_node);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-get_new_node_for_leaf_insert(const_reference r_val, false_type)
-{
-  node_pointer p_new_nd = s_node_allocator.allocate(1);
-  cond_dealtor_t cond(p_new_nd);
-
-  new (const_cast<void* >(static_cast<const void* >(&p_new_nd->m_value)))
-    typename node::value_type(r_val);
-
-  cond.set_no_action();
-  p_new_nd->m_p_left = p_new_nd->m_p_right = 0;
-  ++m_size;
-  return p_new_nd;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-get_new_node_for_leaf_insert(const_reference r_val, true_type)
-{
-  node_pointer p_new_nd = s_node_allocator.allocate(1);
-
-  new (const_cast<void* >(static_cast<const void* >(&p_new_nd->m_value)))
-    typename node::value_type(r_val);
-
-  p_new_nd->m_p_left = p_new_nd->m_p_right = 0;
-  ++m_size;
-  return p_new_nd;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
deleted file mode 100644
index d6c3503..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/iterators_fn_imps.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-begin()
-{
-  return (iterator(m_p_head->m_p_left));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-begin() const
-{
-  return (const_iterator(m_p_head->m_p_left));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-end()
-{
-  return (iterator(m_p_head));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-end() const
-{
-  return (const_iterator(m_p_head));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reverse_iterator
-PB_DS_CLASS_C_DEC::
-rbegin() const
-{
-  return (const_reverse_iterator(m_p_head->m_p_right));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::reverse_iterator
-PB_DS_CLASS_C_DEC::
-rbegin()
-{
-  return (reverse_iterator(m_p_head->m_p_right));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::reverse_iterator
-PB_DS_CLASS_C_DEC::
-rend()
-{
-  return (reverse_iterator(m_p_head));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reverse_iterator
-PB_DS_CLASS_C_DEC::
-rend() const
-{
-  return (const_reverse_iterator(m_p_head));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_const_iterator
-PB_DS_CLASS_C_DEC::
-node_begin() const
-{
-  return (node_const_iterator(m_p_head->m_p_parent));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_iterator
-PB_DS_CLASS_C_DEC::
-node_begin()
-{
-  return (node_iterator(m_p_head->m_p_parent));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_const_iterator
-PB_DS_CLASS_C_DEC::
-node_end() const
-{
-  return (node_const_iterator(0));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_iterator
-PB_DS_CLASS_C_DEC::
-node_end()
-{
-  return (node_iterator(0));
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
deleted file mode 100644
index 9d5f7d7..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/node_iterators.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-#ifndef PB_DS_BIN_SEARCH_TREE_NODE_ITERATORS_HPP
-#define PB_DS_BIN_SEARCH_TREE_NODE_ITERATORS_HPP
-
-#include <ext/pb_ds/tag_and_trait.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC \
-    bin_search_tree_const_node_it_<Node, Const_Iterator, Iterator, _Alloc>
-
-    /// Const node iterator.
-    template<typename Node,
-	     class Const_Iterator,
-	     class Iterator,
-	     typename _Alloc>
-    class bin_search_tree_const_node_it_
-    {
-    private:
-      typedef
-      typename _Alloc::template rebind<
-      Node>::other::pointer
-      node_pointer;
-
-    public:
-      /// Category.
-      typedef trivial_iterator_tag iterator_category;
-
-      /// Difference type.
-      typedef trivial_iterator_difference_type difference_type;
-
-      /// Iterator's value type.
-      typedef Const_Iterator value_type;
-
-      /// Iterator's reference type.
-      typedef Const_Iterator reference;
-
-      /// Iterator's __const reference type.
-      typedef Const_Iterator const_reference;
-
-      /// Metadata type.
-      typedef typename Node::metadata_type metadata_type;
-
-      /// Const metadata reference type.
-      typedef
-      typename _Alloc::template rebind<metadata_type>::other::const_reference
-      metadata_const_reference;
-
-
-      bin_search_tree_const_node_it_(const node_pointer p_nd = 0)
-      : m_p_nd(const_cast<node_pointer>(p_nd))
-      { }
-
-      /// Access.
-      const_reference
-      operator*() const
-      { return Const_Iterator(m_p_nd); }
-
-      /// Metadata access.
-      metadata_const_reference
-      get_metadata() const
-      { return m_p_nd->get_metadata(); }
-
-      /// Returns the __const node iterator associated with the left node.
-      PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC
-      get_l_child() const
-      { return PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC(m_p_nd->m_p_left); }
-
-      /// Returns the __const node iterator associated with the right node.
-      PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC
-      get_r_child() const
-      { return PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC(m_p_nd->m_p_right); }
-
-      /// Compares to a different iterator object.
-      bool
-      operator==(const PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC& other) const
-      { return m_p_nd == other.m_p_nd; }
-
-      /// Compares (negatively) to a different iterator object.
-      bool
-      operator!=(const PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC& other) const
-      { return m_p_nd != other.m_p_nd; }
-
-      node_pointer m_p_nd;
-    };
-
-#define PB_DS_TREE_NODE_ITERATOR_CLASS_C_DEC \
-    bin_search_tree_node_it_<Node, Const_Iterator, Iterator, _Alloc>
-
-    /// Node iterator.
-    template<typename Node,
-	     class Const_Iterator,
-	     class Iterator,
-	     typename _Alloc>
-    class bin_search_tree_node_it_
-    : public PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC
-    {
-    private:
-      typedef
-      typename _Alloc::template rebind<
-      Node>::other::pointer
-      node_pointer;
-
-    public:
-      /// Iterator's value type.
-      typedef Iterator value_type;
-
-      /// Iterator's reference type.
-      typedef Iterator reference;
-
-      /// Iterator's __const reference type.
-      typedef Iterator const_reference;
-
-      inline
-      bin_search_tree_node_it_(const node_pointer p_nd = 0)
-      : PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC(const_cast<node_pointer>(p_nd))
-      { }
-
-      /// Access.
-      Iterator
-      operator*() const
-      { return Iterator(PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC::m_p_nd); }
-
-      /// Returns the node iterator associated with the left node.
-      PB_DS_TREE_NODE_ITERATOR_CLASS_C_DEC
-      get_l_child() const
-      {
-	return PB_DS_TREE_NODE_ITERATOR_CLASS_C_DEC(
-						    PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC::m_p_nd->m_p_left);
-      }
-
-      /// Returns the node iterator associated with the right node.
-      PB_DS_TREE_NODE_ITERATOR_CLASS_C_DEC
-      get_r_child() const
-      {
-	return PB_DS_TREE_NODE_ITERATOR_CLASS_C_DEC(
-						    PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC::m_p_nd->m_p_right);
-      }
-
-    };
-
-#undef PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC
-#undef PB_DS_TREE_NODE_ITERATOR_CLASS_C_DEC
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_BIN_SEARCH_TREE_NODE_ITERATORS_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
deleted file mode 100644
index 101a289..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
+++ /dev/null
@@ -1,367 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/point_iterators.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-#ifndef PB_DS_BIN_SEARCH_TREE_FIND_ITERATORS_HPP
-#define PB_DS_BIN_SEARCH_TREE_FIND_ITERATORS_HPP
-
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-
-#define PB_DS_TREE_CONST_IT_C_DEC					\
-    bin_search_tree_const_it_<						\
-						Node_Pointer,		\
-						Value_Type,		\
-						Pointer,		\
-						Const_Pointer,		\
-						Reference,		\
-						Const_Reference,	\
-						Is_Forward_Iterator,	\
-						_Alloc>
-
-#define PB_DS_TREE_CONST_ODIR_IT_C_DEC					\
-    bin_search_tree_const_it_<						\
-						Node_Pointer,		\
-						Value_Type,		\
-						Pointer,		\
-						Const_Pointer,		\
-						Reference,		\
-						Const_Reference,	\
-						!Is_Forward_Iterator,	\
-						_Alloc>
-
-#define PB_DS_TREE_IT_C_DEC						\
-    bin_search_tree_it_<						\
-						Node_Pointer,		\
-						Value_Type,		\
-						Pointer,		\
-						Const_Pointer,		\
-						Reference,		\
-						Const_Reference,	\
-						Is_Forward_Iterator,	\
-						_Alloc>
-
-#define PB_DS_TREE_ODIR_IT_C_DEC					\
-    bin_search_tree_it_<						\
-							Node_Pointer,	\
-							Value_Type,	\
-							Pointer,	\
-							Const_Pointer,	\
-							Reference,	\
-							Const_Reference, \
-							!Is_Forward_Iterator, \
-							_Alloc>
-
-    /// Const iterator.
-    template<typename Node_Pointer,
-	     typename Value_Type,
-	     typename Pointer,
-	     typename Const_Pointer,
-	     typename Reference,
-	     typename Const_Reference,
-	     bool Is_Forward_Iterator,
-	     typename _Alloc>
-    class bin_search_tree_const_it_
-    {
-    public:
-      typedef std::bidirectional_iterator_tag 		iterator_category;
-      typedef typename _Alloc::difference_type 	difference_type;
-      typedef Value_Type 				value_type;
-      typedef Pointer 					pointer;
-      typedef Const_Pointer 				const_pointer;
-      typedef Reference 				reference;
-      typedef Const_Reference 				const_reference;
-
-      inline
-      bin_search_tree_const_it_(const Node_Pointer p_nd = 0) 
-      : m_p_nd(const_cast<Node_Pointer>(p_nd))
-      { }
-
-      inline
-      bin_search_tree_const_it_(const PB_DS_TREE_CONST_ODIR_IT_C_DEC& other) 
-      : m_p_nd(other.m_p_nd)
-      { }
-
-      inline
-      PB_DS_TREE_CONST_IT_C_DEC& 
-      operator=(const PB_DS_TREE_CONST_IT_C_DEC& other)
-      {
-	m_p_nd = other.m_p_nd;
-	return *this;
-      }
-
-      inline
-      PB_DS_TREE_CONST_IT_C_DEC& 
-      operator=(const PB_DS_TREE_CONST_ODIR_IT_C_DEC& other)
-      {
-	m_p_nd = other.m_p_nd;
-	return *this;
-      }
-
-      inline const_pointer
-      operator->() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd != 0);
-	return &m_p_nd->m_value;
-      }
-
-      inline const_reference
-      operator*() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd != 0);
-	return m_p_nd->m_value;
-      }
-
-      inline bool
-      operator==(const PB_DS_TREE_CONST_IT_C_DEC & other) const
-      { return m_p_nd == other.m_p_nd; }
-
-      inline bool
-      operator==(const PB_DS_TREE_CONST_ODIR_IT_C_DEC & other) const
-      { return m_p_nd == other.m_p_nd; }
-
-      inline bool
-      operator!=(const PB_DS_TREE_CONST_IT_C_DEC& other) const
-      { return m_p_nd != other.m_p_nd; }
-
-      inline bool
-      operator!=(const PB_DS_TREE_CONST_ODIR_IT_C_DEC& other) const
-      { return m_p_nd != other.m_p_nd; }
-
-      inline PB_DS_TREE_CONST_IT_C_DEC& 
-      operator++()
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd != 0);
-	inc(integral_constant<int,Is_Forward_Iterator>());
-	return *this;
-      }
-
-      inline PB_DS_TREE_CONST_IT_C_DEC
-      operator++(int)
-      {
-	PB_DS_TREE_CONST_IT_C_DEC ret_it(m_p_nd);
-	operator++();
-	return ret_it;
-      }
-
-      inline PB_DS_TREE_CONST_IT_C_DEC& 
-      operator--()
-      {
-	dec(integral_constant<int,Is_Forward_Iterator>());
-	return *this;
-      }
-
-      inline PB_DS_TREE_CONST_IT_C_DEC
-      operator--(int)
-      {
-	PB_DS_TREE_CONST_IT_C_DEC ret_it(m_p_nd);
-	operator--();
-	return ret_it;
-      }
-
-    protected:
-      inline void
-      inc(false_type)
-      { dec(true_type()); }
-
-      void
-      inc(true_type)
-      {
-	if (m_p_nd->special()&& 
-	    m_p_nd->m_p_parent->m_p_parent == m_p_nd)
-	  {
-	    m_p_nd = m_p_nd->m_p_left;
-	    return;
-	  }
-
-	if (m_p_nd->m_p_right != 0)
-	  {
-	    m_p_nd = m_p_nd->m_p_right;
-	    while (m_p_nd->m_p_left != 0)
-	      m_p_nd = m_p_nd->m_p_left;
-	    return;
-	  }
-
-	Node_Pointer p_y = m_p_nd->m_p_parent;
-	while (m_p_nd == p_y->m_p_right)
-	  {
-	    m_p_nd = p_y;
-	    p_y = p_y->m_p_parent;
-	  }
-
-	if (m_p_nd->m_p_right != p_y)
-	  m_p_nd = p_y;
-      }
-
-      inline void
-      dec(false_type)
-      { inc(true_type()); }
-
-      void
-      dec(true_type)
-      {
-	if (m_p_nd->special() && m_p_nd->m_p_parent->m_p_parent == m_p_nd)
-	  {
-	    m_p_nd = m_p_nd->m_p_right;
-	    return;
-	  }
-
-	if (m_p_nd->m_p_left != 0)
-	  {
-	    Node_Pointer p_y = m_p_nd->m_p_left;
-	    while (p_y->m_p_right != 0)
-	      p_y = p_y->m_p_right;
-	    m_p_nd = p_y;
-	    return;
-	  }
-
-	Node_Pointer p_y = m_p_nd->m_p_parent;
-	while (m_p_nd == p_y->m_p_left)
-	  {
-	    m_p_nd = p_y;
-	    p_y = p_y->m_p_parent;
-	  }
-	if (m_p_nd->m_p_left != p_y)
-	  m_p_nd = p_y;
-      }
-
-    public:
-      Node_Pointer m_p_nd;
-    };
-
-    /// Iterator.
-    template<typename Node_Pointer,
-	     typename Value_Type,
-	     typename Pointer,
-	     typename Const_Pointer,
-	     typename Reference,
-	     typename Const_Reference,
-	     bool Is_Forward_Iterator,
-	     typename _Alloc>
-    class bin_search_tree_it_ : public PB_DS_TREE_CONST_IT_C_DEC
-    {
-    public:
-      inline
-      bin_search_tree_it_(const Node_Pointer p_nd = 0) 
-      : PB_DS_TREE_CONST_IT_C_DEC((Node_Pointer)p_nd)
-      { }
-
-      inline
-      bin_search_tree_it_(const PB_DS_TREE_ODIR_IT_C_DEC& other) 
-      : PB_DS_TREE_CONST_IT_C_DEC(other.m_p_nd)
-      { }
-
-      inline
-      PB_DS_TREE_IT_C_DEC& 
-      operator=(const PB_DS_TREE_IT_C_DEC& other)
-      {
-	base_it_type::m_p_nd = other.m_p_nd;
-	return *this;
-      }
-
-      inline
-      PB_DS_TREE_IT_C_DEC& 
-      operator=(const PB_DS_TREE_ODIR_IT_C_DEC& other)
-      {
-	base_it_type::m_p_nd = other.m_p_nd;
-	return *this;
-      }
-
-      inline typename PB_DS_TREE_CONST_IT_C_DEC::pointer
-      operator->() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(base_it_type::m_p_nd != 0);
-	return &base_it_type::m_p_nd->m_value;
-      }
-
-      inline typename PB_DS_TREE_CONST_IT_C_DEC::reference
-      operator*() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(base_it_type::m_p_nd != 0);
-	return base_it_type::m_p_nd->m_value;
-      }
-
-      inline PB_DS_TREE_IT_C_DEC& 
-      operator++()
-      {
-	PB_DS_TREE_CONST_IT_C_DEC:: operator++();
-	return *this;
-      }
-
-      inline PB_DS_TREE_IT_C_DEC
-      operator++(int)
-      {
-	PB_DS_TREE_IT_C_DEC ret_it(base_it_type::m_p_nd);
-	operator++();
-	return ret_it;
-      }
-
-      inline PB_DS_TREE_IT_C_DEC& 
-      operator--()
-      {
-	PB_DS_TREE_CONST_IT_C_DEC:: operator--();
-	return *this;
-      }
-
-      inline PB_DS_TREE_IT_C_DEC
-      operator--(int)
-      {
-	PB_DS_TREE_IT_C_DEC ret_it(base_it_type::m_p_nd);
-	operator--();
-	return ret_it;
-      }
-
-    protected:
-      typedef PB_DS_TREE_CONST_IT_C_DEC base_it_type;
-    };
-
-#undef PB_DS_TREE_CONST_IT_C_DEC
-#undef PB_DS_TREE_CONST_ODIR_IT_C_DEC
-#undef PB_DS_TREE_IT_C_DEC
-#undef PB_DS_TREE_ODIR_IT_C_DEC
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
deleted file mode 100644
index 6d8fcd4..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/policy_access_fn_imps.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-Cmp_Fn& 
-PB_DS_CLASS_C_DEC::
-get_cmp_fn()
-{ return (*this); }
-
-PB_DS_CLASS_T_DEC
-const Cmp_Fn& 
-PB_DS_CLASS_C_DEC::
-get_cmp_fn() const
-{ return (*this); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
deleted file mode 100644
index 067e2f5..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/r_erase_fn_imps.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-actual_erase_node(node_pointer p_z)
-{
-  _GLIBCXX_DEBUG_ASSERT(m_size > 0);
-  --m_size;
-  _GLIBCXX_DEBUG_ONLY(erase_existing(PB_DS_V2F(p_z->m_value));)
-  p_z->~node();
-  s_node_allocator.deallocate(p_z, 1);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-update_min_max_for_erased_node(node_pointer p_z)
-{
-  if (m_size == 1)
-    {
-      m_p_head->m_p_left = m_p_head->m_p_right = m_p_head;
-      return;
-    }
-
-  if (m_p_head->m_p_left == p_z)
-    {
-      iterator it(p_z);
-      ++it;
-      m_p_head->m_p_left = it.m_p_nd;
-    }
-  else if (m_p_head->m_p_right == p_z)
-    {
-      iterator it(p_z);
-      --it;
-      m_p_head->m_p_right = it.m_p_nd;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-  clear_imp(m_p_head->m_p_parent);
-  m_size = 0;
-  initialize();
-  _GLIBCXX_DEBUG_ONLY(debug_base::clear();)
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear_imp(node_pointer p_nd)
-{
-  if (p_nd == 0)
-    return;
-
-  clear_imp(p_nd->m_p_left);
-  clear_imp(p_nd->m_p_right);
-  p_nd->~Node();
-  s_node_allocator.deallocate(p_nd, 1);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
deleted file mode 100644
index 95c385e..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/rotate_fn_imps.hpp
- * Contains imps for rotating nodes.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-rotate_left(node_pointer p_x)
-{
-  node_pointer p_y = p_x->m_p_right;
-
-  p_x->m_p_right = p_y->m_p_left;
-
-  if (p_y->m_p_left != 0)
-    p_y->m_p_left->m_p_parent = p_x;
-
-  p_y->m_p_parent = p_x->m_p_parent;
-
-  if (p_x == m_p_head->m_p_parent)
-    m_p_head->m_p_parent = p_y;
-  else if (p_x == p_x->m_p_parent->m_p_left)
-    p_x->m_p_parent->m_p_left = p_y;
-  else
-    p_x->m_p_parent->m_p_right = p_y;
-
-  p_y->m_p_left = p_x;
-  p_x->m_p_parent = p_y;
-
-  PB_DS_ASSERT_NODE_CONSISTENT(p_x)
-  PB_DS_ASSERT_NODE_CONSISTENT(p_y)
-
-  apply_update(p_x, (node_update* )this);
-  apply_update(p_x->m_p_parent, (node_update* )this);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-rotate_right(node_pointer p_x)
-{
-  node_pointer p_y = p_x->m_p_left;
-
-  p_x->m_p_left = p_y->m_p_right;
-
-  if (p_y->m_p_right != 0)
-    p_y->m_p_right->m_p_parent = p_x;
-
-  p_y->m_p_parent = p_x->m_p_parent;
-
-  if (p_x == m_p_head->m_p_parent)
-    m_p_head->m_p_parent = p_y;
-  else if (p_x == p_x->m_p_parent->m_p_right)
-    p_x->m_p_parent->m_p_right = p_y;
-  else
-    p_x->m_p_parent->m_p_left = p_y;
-
-  p_y->m_p_right = p_x;
-  p_x->m_p_parent = p_y;
-
-  PB_DS_ASSERT_NODE_CONSISTENT(p_x)
-  PB_DS_ASSERT_NODE_CONSISTENT(p_y)
-
-  apply_update(p_x, (node_update* )this);
-  apply_update(p_x->m_p_parent, (node_update* )this);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-rotate_parent(node_pointer p_nd)
-{
-  node_pointer p_parent = p_nd->m_p_parent;
-
-  if (p_nd == p_parent->m_p_left)
-    rotate_right(p_parent);
-  else
-    rotate_left(p_parent);
-
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_parent = p_nd);
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_left == p_parent ||
-		   p_nd->m_p_right == p_parent);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-apply_update(node_pointer /*p_nd*/, null_node_update_pointer /*p_update*/)
-{ }
-
-PB_DS_CLASS_T_DEC
-template<typename Node_Update_>
-inline void
-PB_DS_CLASS_C_DEC::
-apply_update(node_pointer p_nd, Node_Update_*  /*p_update*/)
-{
-  node_update::operator()(node_iterator(p_nd),
-			  node_const_iterator(static_cast<node_pointer>(0)));
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Node_Update_>
-inline void
-PB_DS_CLASS_C_DEC::
-update_to_top(node_pointer p_nd, Node_Update_* p_update)
-{
-  while (p_nd != m_p_head)
-    {
-      apply_update(p_nd, p_update);
-
-      p_nd = p_nd->m_p_parent;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-update_to_top(node_pointer /*p_nd*/, null_node_update_pointer /*p_update*/)
-{ }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
deleted file mode 100644
index 7696f21..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/split_join_fn_imps.hpp
- * Contains an implementation class for bin_search_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-bool
-PB_DS_CLASS_C_DEC::
-join_prep(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  if (other.m_size == 0)
-    return false;
-
-  if (m_size == 0)
-    {
-      value_swap(other);
-      return false;
-    }
-
-  const bool greater =
-    Cmp_Fn::operator()(PB_DS_V2F(m_p_head->m_p_right->m_value),
-		       PB_DS_V2F(other.m_p_head->m_p_left->m_value));
-
-  const bool lesser =
-    Cmp_Fn::operator()(PB_DS_V2F(other.m_p_head->m_p_right->m_value),
-		       PB_DS_V2F(m_p_head->m_p_left->m_value));
-
-  if (!greater && !lesser)
-    __throw_join_error();
-
-  if (lesser)
-    value_swap(other);
-
-  m_size += other.m_size;
-  _GLIBCXX_DEBUG_ONLY(debug_base::join(other);)
-  return true;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-join_finish(PB_DS_CLASS_C_DEC& other)
-{
-  initialize_min_max();
-  other.initialize();
-}
-
-PB_DS_CLASS_T_DEC
-bool
-PB_DS_CLASS_C_DEC::
-split_prep(key_const_reference r_key, PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  other.clear();
-
-  if (m_size == 0)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return false;
-    }
-
-  if (Cmp_Fn::operator()(r_key, PB_DS_V2F(m_p_head->m_p_left->m_value)))
-    {
-      value_swap(other);
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return false;
-    }
-
-  if (!Cmp_Fn::operator()(r_key, PB_DS_V2F(m_p_head->m_p_right->m_value)))
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return false;
-    }
-
-  if (m_size == 1)
-    {
-      value_swap(other);
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return false;
-    }
-
-  _GLIBCXX_DEBUG_ONLY(debug_base::split(r_key,(Cmp_Fn& )(*this), other);)
-  return true;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-split_finish(PB_DS_CLASS_C_DEC& other)
-{
-  other.initialize_min_max();
-  other.m_size = std::distance(other.begin(), other.end());
-  m_size -= other.m_size;
-  initialize_min_max();
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-recursive_count(node_pointer p) const
-{
-  if (p == 0)
-    return 0;
-  return 1 + recursive_count(p->m_p_left) + recursive_count(p->m_p_right);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/traits.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/traits.hpp
deleted file mode 100644
index 674fa92..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/bin_search_tree_/traits.hpp
+++ /dev/null
@@ -1,236 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file bin_search_tree_/traits.hpp
- * Contains an implementation for bin_search_tree_.
- */
-
-#ifndef PB_DS_BIN_SEARCH_TREE_NODE_AND_IT_TRAITS_HPP
-#define PB_DS_BIN_SEARCH_TREE_NODE_AND_IT_TRAITS_HPP
-
-#include <ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Binary search tree traits, primary template
-    /// @ingroup traits
-    template<typename Key,
-	     typename Mapped,
-	     class Cmp_Fn,
-	     template<typename Node_CItr,
-		      class Node_Itr,
-		      class _Cmp_Fn,
-		      typename _Alloc>
-	     class Node_Update,
-	     class Node,
-	     typename _Alloc>
-    struct bin_search_tree_traits
-    {
-    private:
-      typedef types_traits<Key, Mapped, _Alloc, false> type_traits;
-
-    public:
-      typedef Node node;
-
-      typedef
-      bin_search_tree_const_it_<
-	typename _Alloc::template rebind<
-	node>::other::pointer,
-	typename type_traits::value_type,
-	typename type_traits::pointer,
-	typename type_traits::const_pointer,
-	typename type_traits::reference,
-	typename type_traits::const_reference,
-	true,
-	_Alloc>
-      point_const_iterator;
-
-      typedef
-      bin_search_tree_it_<
-	typename _Alloc::template rebind<
-	node>::other::pointer,
-	typename type_traits::value_type,
-	typename type_traits::pointer,
-	typename type_traits::const_pointer,
-	typename type_traits::reference,
-	typename type_traits::const_reference,
-	true,
-	_Alloc>
-      point_iterator;
-
-      typedef
-      bin_search_tree_const_it_<
-	typename _Alloc::template rebind<
-	node>::other::pointer,
-	typename type_traits::value_type,
-	typename type_traits::pointer,
-	typename type_traits::const_pointer,
-	typename type_traits::reference,
-	typename type_traits::const_reference,
-	false,
-	_Alloc>
-      const_reverse_iterator;
-
-      typedef
-      bin_search_tree_it_<
-	typename _Alloc::template rebind<
-	node>::other::pointer,
-	typename type_traits::value_type,
-	typename type_traits::pointer,
-	typename type_traits::const_pointer,
-	typename type_traits::reference,
-	typename type_traits::const_reference,
-	false,
-	_Alloc>
-      reverse_iterator;
-
-      /// This is an iterator to an iterator: it iterates over nodes,
-      /// and de-referencing it returns one of the tree's iterators.
-      typedef
-      bin_search_tree_const_node_it_<
-	Node,
-	point_const_iterator,
-	point_iterator,
-	_Alloc>
-      node_const_iterator;
-
-      typedef
-      bin_search_tree_node_it_<
-	Node,
-	point_const_iterator,
-	point_iterator,
-	_Alloc>
-      node_iterator;
-
-      typedef
-      Node_Update<
-	node_const_iterator,
-	node_iterator,
-	Cmp_Fn,
-	_Alloc>
-      node_update;
-
-      typedef
-      __gnu_pbds::null_node_update<
-	node_const_iterator,
-	node_iterator,
-	Cmp_Fn,
-	_Alloc>* 
-      null_node_update_pointer;
-    };
-
-    /// Specialization.
-    /// @ingroup traits
-    template<typename Key,
-	     class Cmp_Fn,
-	     template<typename Node_CItr,
-		      class Node_Itr,
-		      class _Cmp_Fn,
-		      typename _Alloc>
-	     class Node_Update,
-	     class Node,
-	     typename _Alloc>
-    struct
-    bin_search_tree_traits<Key, null_type, Cmp_Fn, Node_Update, Node, _Alloc>
-    {
-    private:
-      typedef types_traits<Key, null_type, _Alloc, false> type_traits;
-
-    public:
-      typedef Node node;
-
-      typedef
-      bin_search_tree_const_it_<
-	typename _Alloc::template rebind<
-	node>::other::pointer,
-	typename type_traits::value_type,
-	typename type_traits::pointer,
-	typename type_traits::const_pointer,
-	typename type_traits::reference,
-	typename type_traits::const_reference,
-	true,
-	_Alloc>
-      point_const_iterator;
-
-      typedef point_const_iterator point_iterator;
-
-      typedef
-      bin_search_tree_const_it_<
-	typename _Alloc::template rebind<
-	node>::other::pointer,
-	typename type_traits::value_type,
-	typename type_traits::pointer,
-	typename type_traits::const_pointer,
-	typename type_traits::reference,
-	typename type_traits::const_reference,
-	false,
-	_Alloc>
-      const_reverse_iterator;
-
-      typedef const_reverse_iterator reverse_iterator;
-
-      /// This is an iterator to an iterator: it iterates over nodes,
-      /// and de-referencing it returns one of the tree's iterators.
-      typedef
-      bin_search_tree_const_node_it_<
-	Node,
-	point_const_iterator,
-	point_iterator,
-	_Alloc>
-      node_const_iterator;
-
-      typedef node_const_iterator node_iterator;
-
-      typedef
-      Node_Update<node_const_iterator, node_iterator, Cmp_Fn, _Alloc>
-      node_update;
-
-      typedef
-      __gnu_pbds::null_node_update<
-	node_const_iterator,
-	node_iterator,
-	Cmp_Fn,
-	_Alloc>* 
-      null_node_update_pointer;
-    };
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_BIN_SEARCH_TREE_NODE_AND_IT_TRAITS_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
deleted file mode 100644
index 813fcdc..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
+++ /dev/null
@@ -1,352 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/binary_heap_.hpp
- * Contains an implementation class for a binary heap.
- */
-
-#ifndef PB_DS_BINARY_HEAP_HPP
-#define PB_DS_BINARY_HEAP_HPP
-
-#include <queue>
-#include <algorithm>
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/binary_heap_/entry_cmp.hpp>
-#include <ext/pb_ds/detail/binary_heap_/entry_pred.hpp>
-#include <ext/pb_ds/detail/binary_heap_/resize_policy.hpp>
-#include <ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp>
-#include <ext/pb_ds/detail/binary_heap_/const_iterator.hpp>
-#ifdef PB_DS_BINARY_HEAP_TRACE_
-#include <iostream>
-#endif
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_CLASS_T_DEC \
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    binary_heap<Value_Type, Cmp_Fn, _Alloc>
-
-#define PB_DS_ENTRY_CMP_DEC \
-    entry_cmp<Value_Type, Cmp_Fn, _Alloc, is_simple<Value_Type>::value>::type
-
-#define PB_DS_RESIZE_POLICY_DEC	\
-    __gnu_pbds::detail::resize_policy<typename _Alloc::size_type>
-
-    /**
-     *  Binary heaps composed of resize and compare policies.
-     *
-     *  @ingroup heap-detail
-     *
-     *  Based on CLRS.
-     */
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-    class binary_heap
-    : public PB_DS_ENTRY_CMP_DEC, public PB_DS_RESIZE_POLICY_DEC
-    {
-    public:
-      typedef Value_Type 				value_type;
-      typedef Cmp_Fn 					cmp_fn;
-      typedef _Alloc 					allocator_type;
-      typedef typename _Alloc::size_type 		size_type;
-      typedef typename _Alloc::difference_type 		difference_type;
-      typedef typename PB_DS_ENTRY_CMP_DEC 		entry_cmp;
-      typedef PB_DS_RESIZE_POLICY_DEC 			resize_policy;
-      typedef cond_dealtor<value_type, _Alloc> 		cond_dealtor_t;
-
-    private:
-      enum
-	{
-	  simple_value = is_simple<value_type>::value
-	};
-
-      typedef integral_constant<int, simple_value> 	no_throw_copies_t;
-
-      typedef typename _Alloc::template rebind<value_type>	__rebind_v;
-      typedef typename __rebind_v::other 		value_allocator;
-
-    public:
-      typedef typename value_allocator::pointer		pointer;
-      typedef typename value_allocator::const_pointer	const_pointer;
-      typedef typename value_allocator::reference	reference;
-      typedef typename value_allocator::const_reference	const_reference;
-
-      typedef typename __conditional_type<simple_value,
-					  value_type, pointer>::__type
-      							entry;
-
-      typedef typename _Alloc::template rebind<entry>::other
-      							entry_allocator;
-
-      typedef typename entry_allocator::pointer 	entry_pointer;
-
-      typedef binary_heap_point_const_iterator_<value_type, entry,
-						simple_value, _Alloc>
-      							point_const_iterator;
-
-      typedef point_const_iterator 			point_iterator;
-
-      typedef binary_heap_const_iterator_<value_type, entry,
-					  simple_value, _Alloc>
-      							const_iterator;
-
-      typedef const_iterator 				iterator;
-
-
-      binary_heap();
-
-      binary_heap(const cmp_fn&);
-
-      binary_heap(const binary_heap&);
-
-      void
-      swap(binary_heap&);
-
-      ~binary_heap();
-
-      inline bool
-      empty() const;
-
-      inline size_type
-      size() const;
-
-      inline size_type
-      max_size() const;
-
-      Cmp_Fn&
-      get_cmp_fn();
-
-      const Cmp_Fn&
-      get_cmp_fn() const;
-
-      inline point_iterator
-      push(const_reference);
-
-      void
-      modify(point_iterator, const_reference);
-
-      inline const_reference
-      top() const;
-
-      inline void
-      pop();
-
-      inline void
-      erase(point_iterator);
-
-      template<typename Pred>
-	size_type
-	erase_if(Pred);
-
-      inline void
-      erase_at(entry_pointer, size_type, false_type);
-
-      inline void
-      erase_at(entry_pointer, size_type, true_type);
-
-      inline iterator
-      begin();
-
-      inline const_iterator
-      begin() const;
-
-      inline iterator
-      end();
-
-      inline const_iterator
-      end() const;
-
-      void
-      clear();
-
-      template<typename Pred>
-	void
-	split(Pred, binary_heap&);
-
-      void
-      join(binary_heap&);
-
-#ifdef PB_DS_BINARY_HEAP_TRACE_
-      void
-      trace() const;
-#endif
-
-    protected:
-      template<typename It>
-	void
-	copy_from_range(It, It);
-
-    private:
-      void
-      value_swap(binary_heap&);
-
-      inline void
-      insert_value(const_reference, false_type);
-
-      inline void
-      insert_value(value_type, true_type);
-
-      inline void
-      resize_for_insert_if_needed();
-
-      inline void
-      swap_value_imp(entry_pointer, value_type, true_type);
-
-      inline void
-      swap_value_imp(entry_pointer, const_reference, false_type);
-
-      void
-      fix(entry_pointer);
-
-      inline const_reference
-      top_imp(true_type) const;
-
-      inline const_reference
-      top_imp(false_type) const;
-
-      inline static size_type
-      left_child(size_type);
-
-      inline static size_type
-      right_child(size_type);
-
-      inline static size_type
-      parent(size_type);
-
-      inline void
-      resize_for_erase_if_needed();
-
-      template<typename Pred>
-      size_type
-      partition(Pred);
-
-      void
-      make_heap()
-      {
-	const entry_cmp& m_cmp = static_cast<entry_cmp&>(*this);
-	entry_pointer end = m_a_entries + m_size;
-	std::make_heap(m_a_entries, end, m_cmp);
-	_GLIBCXX_DEBUG_ASSERT(is_heap());
-      }
-
-      void
-      push_heap()
-      {
-	if (!is_heap())
-	  make_heap();
-	else
-	  {
-	    const entry_cmp& m_cmp = static_cast<entry_cmp&>(*this);
-	    entry_pointer end = m_a_entries + m_size;
-	    std::push_heap(m_a_entries, end, m_cmp);
-	  }
-      }
-
-      void
-      pop_heap()
-      {
-	const entry_cmp& m_cmp = static_cast<entry_cmp&>(*this);
-	entry_pointer end = m_a_entries + m_size;
-	std::pop_heap(m_a_entries, end, m_cmp);
-      }
-
-      bool
-      is_heap()
-      {
-	const entry_cmp& m_cmp = static_cast<entry_cmp&>(*this);
-	entry_pointer end = m_a_entries + m_size;
-	bool p = std::__is_heap(m_a_entries, end, m_cmp);
-	return p;
-      }
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-#endif
-
-#ifdef PB_DS_BINARY_HEAP_TRACE_
-      void
-      trace_entry(const entry&, false_type) const;
-
-      void
-      trace_entry(const entry&, true_type) const;
-#endif
-
-      static entry_allocator 	s_entry_allocator;
-      static value_allocator 	s_value_allocator;
-      static no_throw_copies_t 	s_no_throw_copies_ind;
-
-      size_type 		m_size;
-      size_type 		m_actual_size;
-      entry_pointer 		m_a_entries;
-    };
-
-#define PB_DS_ASSERT_VALID(X) \
-  _GLIBCXX_DEBUG_ONLY(X.assert_valid(__FILE__, __LINE__);)
-
-#define PB_DS_DEBUG_VERIFY(_Cond)					\
-  _GLIBCXX_DEBUG_VERIFY_AT(_Cond,					\
-			   _M_message(#_Cond" assertion from %1;:%2;")	\
-			   ._M_string(__FILE__)._M_integer(__LINE__)	\
-			   ,__file,__line)
-
-#include <ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp>
-#include <ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp>
-#include <ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp>
-#include <ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp>
-#include <ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp>
-#include <ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp>
-
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_ENTRY_CMP_DEC
-#undef PB_DS_RESIZE_POLICY_DEC
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/const_iterator.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
deleted file mode 100644
index eba5559..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/const_iterator.hpp
- * Contains an iterator class returned by the table's const find and insert
- *     methods.
- */
-
-#ifndef PB_DS_BINARY_HEAP_CONST_ITERATOR_HPP
-#define PB_DS_BINARY_HEAP_CONST_ITERATOR_HPP
-
-#include <ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_BIN_HEAP_CIT_BASE \
-    binary_heap_point_const_iterator_<Value_Type, Entry, Simple, _Alloc>
-
-    /// Const point-type iterator.
-    template<typename Value_Type,
-	     typename Entry,
-	     bool Simple,
-	     typename _Alloc>
-    class binary_heap_const_iterator_ : public PB_DS_BIN_HEAP_CIT_BASE
-    {
-    private:
-      typedef PB_DS_BIN_HEAP_CIT_BASE 		       	base_type;
-      typedef typename base_type::entry_pointer 	entry_pointer;
-
-    public:
-      /// Category.
-      typedef std::forward_iterator_tag 		iterator_category;
-
-      /// Difference type.
-      typedef typename _Alloc::difference_type 		difference_type;
-
-      /// Iterator's value type.
-      typedef typename base_type::value_type 		value_type;
-
-      /// Iterator's pointer type.
-      typedef typename base_type::pointer 		pointer;
-
-      /// Iterator's const pointer type.
-      typedef typename base_type::const_pointer 	const_pointer;
-
-      /// Iterator's reference type.
-      typedef typename base_type::reference 		reference;
-
-      /// Iterator's const reference type.
-      typedef typename base_type::const_reference 	const_reference;
-
-      inline
-      binary_heap_const_iterator_(entry_pointer p_e) : base_type(p_e)
-      { }
-
-      /// Default constructor.
-      inline
-      binary_heap_const_iterator_()
-      { }
-
-      /// Copy constructor.
-      inline
-      binary_heap_const_iterator_(const binary_heap_const_iterator_& other) 
-      : base_type(other)
-      { }
-
-      /// Compares content to a different iterator object.
-      inline bool
-      operator==(const binary_heap_const_iterator_& other) const
-      { return base_type::m_p_e == other.m_p_e; }
-
-      /// Compares content (negatively) to a different iterator object.
-      inline bool
-      operator!=(const binary_heap_const_iterator_& other) const
-      { return base_type::m_p_e != other.m_p_e; }
-
-      inline binary_heap_const_iterator_& 
-      operator++()
-      {
-	_GLIBCXX_DEBUG_ASSERT(base_type::m_p_e != 0);
-	inc();
-	return *this;
-      }
-
-      inline binary_heap_const_iterator_
-      operator++(int)
-      {
-	binary_heap_const_iterator_ ret_it(base_type::m_p_e);
-	operator++();
-	return ret_it;
-      }
-
-    private:
-      void
-      inc()
-      { ++base_type::m_p_e; }
-    };
-
-#undef PB_DS_BIN_HEAP_CIT_BASE
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index c579682..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/constructors_destructor_fn_imps.hpp
- * Contains an implementation class for binary_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::entry_allocator
-PB_DS_CLASS_C_DEC::s_entry_allocator;
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::value_allocator
-PB_DS_CLASS_C_DEC::s_value_allocator;
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::no_throw_copies_t
-PB_DS_CLASS_C_DEC::s_no_throw_copies_ind;
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-  while (first_it != last_it)
-    {
-      insert_value(*first_it, s_no_throw_copies_ind);
-      ++first_it;
-    }
-  make_heap();
- PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-binary_heap()
-: m_size(0), m_actual_size(resize_policy::min_size),
-  m_a_entries(s_entry_allocator.allocate(m_actual_size))
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-binary_heap(const Cmp_Fn& r_cmp_fn)
-: entry_cmp(r_cmp_fn), m_size(0), m_actual_size(resize_policy::min_size),
-  m_a_entries(s_entry_allocator.allocate(m_actual_size))
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-binary_heap(const PB_DS_CLASS_C_DEC& other)
-: entry_cmp(other), resize_policy(other), m_size(0),
-  m_actual_size(other.m_actual_size),
-  m_a_entries(s_entry_allocator.allocate(m_actual_size))
-{
-  PB_DS_ASSERT_VALID(other)
-  _GLIBCXX_DEBUG_ASSERT(m_a_entries != other.m_a_entries);
-
-  __try
-    {
-      copy_from_range(other.begin(), other.end());
-    }
-  __catch(...)
-    {
-      for (size_type i = 0; i < m_size; ++i)
-	erase_at(m_a_entries, i, s_no_throw_copies_ind);
-
-      s_entry_allocator.deallocate(m_a_entries, m_actual_size);
-      __throw_exception_again;
-    }
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  _GLIBCXX_DEBUG_ASSERT(m_a_entries != other.m_a_entries);
-  value_swap(other);
-  std::swap((entry_cmp&)(*this), (entry_cmp&)other);
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-value_swap(PB_DS_CLASS_C_DEC& other)
-{
-  std::swap(m_a_entries, other.m_a_entries);
-  std::swap(m_size, other.m_size);
-  std::swap(m_actual_size, other.m_actual_size);
-  static_cast<resize_policy*>(this)->swap(other);
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~binary_heap()
-{
-  for (size_type i = 0; i < m_size; ++i)
-    erase_at(m_a_entries, i, s_no_throw_copies_ind);
-  s_entry_allocator.deallocate(m_a_entries, m_actual_size);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
deleted file mode 100644
index e663534..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/debug_fn_imps.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-#ifdef PB_DS_REGRESSION
-  s_entry_allocator.check_allocated(m_a_entries, m_actual_size);
-#endif
-
-  resize_policy::assert_valid(__file, __line);
-  PB_DS_DEBUG_VERIFY(m_size <= m_actual_size);
-  for (size_type i = 0; i < m_size; ++i)
-    {
-#ifdef PB_DS_REGRESSION
-      s_value_allocator.check_allocated(m_a_entries[i], 1);
-#endif
-
-      if (left_child(i) < m_size)
-	PB_DS_DEBUG_VERIFY(!entry_cmp::operator()(m_a_entries[i], m_a_entries[left_child(i)]));
-
-      PB_DS_DEBUG_VERIFY(parent(left_child(i)) == i);
-
-      if (right_child(i) < m_size)
-	PB_DS_DEBUG_VERIFY(!entry_cmp::operator()(m_a_entries[i], m_a_entries[right_child(i)]));
-
-      PB_DS_DEBUG_VERIFY(parent(right_child(i)) == i);
-    }
-}
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
deleted file mode 100644
index 0511575..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/entry_cmp.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-#ifndef PB_DS_BINARY_HEAP_ENTRY_CMP_HPP
-#define PB_DS_BINARY_HEAP_ENTRY_CMP_HPP
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Entry compare, primary template.
-    template<typename _VTp, typename Cmp_Fn, typename _Alloc, bool No_Throw>
-      struct entry_cmp;
-
-    /// Specialization, true.
-    template<typename _VTp, typename Cmp_Fn, typename _Alloc>
-      struct entry_cmp<_VTp, Cmp_Fn, _Alloc, true>
-      {
-	/// Compare.
-	typedef Cmp_Fn 						type;
-      };
-
-    /// Specialization, false.
-    template<typename _VTp, typename Cmp_Fn, typename _Alloc>
-      struct entry_cmp<_VTp, Cmp_Fn, _Alloc, false>
-      {
-      private:
-	typedef typename _Alloc::template rebind<_VTp>		__rebind_v;
-
-      public:
-	typedef typename __rebind_v::other::const_pointer	entry;
-
-	/// Compare plus entry.
-	struct type : public Cmp_Fn
-	{
-	  type() { }
-
-	  type(const Cmp_Fn& other) : Cmp_Fn(other) { }
-
-	  bool
-	  operator()(entry lhs, entry rhs) const
-	  { return Cmp_Fn::operator()(*lhs, *rhs); }
-	};
-      };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_BINARY_HEAP_ENTRY_CMP_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/entry_pred.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
deleted file mode 100644
index aa2714b..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/entry_pred.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-#ifndef PB_DS_BINARY_HEAP_ENTRY_PRED_HPP
-#define PB_DS_BINARY_HEAP_ENTRY_PRED_HPP
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Entry predicate primary class template.
-    template<typename _VTp, typename Pred, typename _Alloc, bool No_Throw>
-      struct entry_pred;
-
-    /// Specialization, true.
-    template<typename _VTp, typename Pred, typename _Alloc>
-      struct entry_pred<_VTp, Pred, _Alloc, true>
-      {
-	typedef Pred 						type;
-      };
-
-    /// Specialization, false.
-    template<typename _VTp, typename Pred, typename _Alloc>
-      struct entry_pred<_VTp, Pred, _Alloc, false>
-      {
-      private:
-	typedef typename _Alloc::template rebind<_VTp>		__rebind_v;
-
-      public:
-	typedef typename __rebind_v::other::const_pointer	entry;
-
-	struct type : public Pred
-	{
-	  inline
-	  type() { }
-
-	  inline
-	  type(const Pred& other) : Pred(other) { }
-
-	  inline bool
-	  operator()(entry p_v) const
-	  { return Pred::operator()(*p_v); }
-	};
-      };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_BINARY_HEAP_ENTRY_PRED_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
deleted file mode 100644
index fe10de9..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,208 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/erase_fn_imps.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  for (size_type i = 0; i < m_size; ++i)
-    erase_at(m_a_entries, i, s_no_throw_copies_ind);
-
-  __try
-    {
-      const size_type new_size = resize_policy::get_new_size_for_arbitrary(0);
-      entry_pointer new_entries = s_entry_allocator.allocate(new_size);
-      resize_policy::notify_arbitrary(new_size);
-      s_entry_allocator.deallocate(m_a_entries, m_actual_size);
-      m_actual_size = new_size;
-      m_a_entries = new_entries;
-    }
-  __catch(...)
-    { }
-
-  m_size = 0;
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase_at(entry_pointer a_entries, size_type i, false_type)
-{
-  a_entries[i]->~value_type();
-  s_value_allocator.deallocate(a_entries[i], 1);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase_at(entry_pointer, size_type, true_type)
-{ }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-pop()
-{
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(!empty());
-
-  pop_heap();
-  erase_at(m_a_entries, m_size - 1, s_no_throw_copies_ind);
-  resize_for_erase_if_needed();
-  _GLIBCXX_DEBUG_ASSERT(m_size > 0);
-  --m_size;
-
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  PB_DS_ASSERT_VALID((*this))
-
-  typedef typename entry_pred<value_type, Pred, _Alloc, simple_value>::type
-    pred_t;
-
-  const size_type left = partition(pred_t(pred));
-  _GLIBCXX_DEBUG_ASSERT(m_size >= left);
-  const size_type ersd = m_size - left;
-  for (size_type i = left; i < m_size; ++i)
-    erase_at(m_a_entries, i, s_no_throw_copies_ind);
-
-  __try
-    {
-      const size_type new_size =
-	resize_policy::get_new_size_for_arbitrary(left);
-
-      entry_pointer new_entries = s_entry_allocator.allocate(new_size);
-      std::copy(m_a_entries, m_a_entries + left, new_entries);
-      s_entry_allocator.deallocate(m_a_entries, m_actual_size);
-      m_actual_size = new_size;
-      resize_policy::notify_arbitrary(m_actual_size);
-    }
-  __catch(...)
-    { };
-
-  m_size = left;
-  make_heap();
-  PB_DS_ASSERT_VALID((*this))
-  return ersd;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-erase(point_iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(!empty());
-
-  const size_type fix_pos = it.m_p_e - m_a_entries;
-  std::swap(*it.m_p_e, m_a_entries[m_size - 1]);
-  erase_at(m_a_entries, m_size - 1, s_no_throw_copies_ind);
-  resize_for_erase_if_needed();
-
-  _GLIBCXX_DEBUG_ASSERT(m_size > 0);
-  --m_size;
-  _GLIBCXX_DEBUG_ASSERT(fix_pos <= m_size);
-
-  if (fix_pos != m_size)
-    fix(m_a_entries + fix_pos);
-
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-resize_for_erase_if_needed()
-{
-  if (!resize_policy::resize_needed_for_shrink(m_size))
-    return;
-
-  __try
-    {
-      const size_type new_size = resize_policy::get_new_size_for_shrink();
-      entry_pointer new_entries = s_entry_allocator.allocate(new_size);
-      resize_policy::notify_shrink_resize();
-
-      _GLIBCXX_DEBUG_ASSERT(m_size > 0);
-      std::copy(m_a_entries, m_a_entries + m_size - 1, new_entries);
-      s_entry_allocator.deallocate(m_a_entries, m_actual_size);
-      m_actual_size = new_size;
-      m_a_entries = new_entries;
-    }
-  __catch(...)
-    { }
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-partition(Pred pred)
-{
-  size_type left = 0;
-  size_type right = m_size - 1;
-
-  while (right + 1 != left)
-    {
-      _GLIBCXX_DEBUG_ASSERT(left <= m_size);
-
-      if (!pred(m_a_entries[left]))
-	++left;
-      else if (pred(m_a_entries[right]))
-	--right;
-      else
-	{
-	  _GLIBCXX_DEBUG_ASSERT(left < right);
-	  std::swap(m_a_entries[left], m_a_entries[right]);
-	  ++left;
-	  --right;
-	}
-    }
-
-  return left;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
deleted file mode 100644
index 60b7cff..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/find_fn_imps.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reference
-PB_DS_CLASS_C_DEC::
-top() const
-{
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(!empty());
-  return top_imp(s_no_throw_copies_ind);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reference
-PB_DS_CLASS_C_DEC::
-top_imp(true_type) const
-{ return *m_a_entries; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reference
-PB_DS_CLASS_C_DEC::
-top_imp(false_type) const
-{ return **m_a_entries; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-left_child(size_type i)
-{ return i * 2 + 1; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-right_child(size_type i)
-{ return i * 2 + 2; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-parent(size_type i)
-{ return (i - 1) / 2; }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
deleted file mode 100644
index 9af3b1c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/info_fn_imps.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-empty() const
-{ return m_size == 0; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size() const
-{ return m_size; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-max_size() const
-{ return s_entry_allocator.max_size(); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
deleted file mode 100644
index 97ccbed..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/insert_fn_imps.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-push(const_reference r_val)
-{
-  PB_DS_ASSERT_VALID((*this))
-  insert_value(r_val, s_no_throw_copies_ind);
-  push_heap();
-  PB_DS_ASSERT_VALID((*this))
-  return point_iterator(m_a_entries);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-insert_value(value_type val, true_type)
-{
-  resize_for_insert_if_needed();
-  m_a_entries[m_size++] = val;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-insert_value(const_reference r_val, false_type)
-{
-  resize_for_insert_if_needed();
-  pointer p_new = s_value_allocator.allocate(1);
-  cond_dealtor_t cond(p_new);
-  new (p_new) value_type(r_val);
-  cond.set_no_action();
-  m_a_entries[m_size++] = p_new;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-resize_for_insert_if_needed()
-{
-  if (!resize_policy::resize_needed_for_grow(m_size))
-    {
-      _GLIBCXX_DEBUG_ASSERT(m_size < m_actual_size);
-      return;
-    }
-
-  const size_type new_size = resize_policy::get_new_size_for_grow();
-  entry_pointer new_entries = s_entry_allocator.allocate(new_size);
-  resize_policy::notify_grow_resize();
-
-  std::copy(m_a_entries, m_a_entries + m_size, new_entries);
-  s_entry_allocator.deallocate(m_a_entries, m_actual_size);
-  m_actual_size = new_size;
-  m_a_entries = new_entries;
-  make_heap();
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-modify(point_iterator it, const_reference r_new_val)
-{
-  PB_DS_ASSERT_VALID((*this))
-  swap_value_imp(it.m_p_e, r_new_val, s_no_throw_copies_ind);
-  fix(it.m_p_e);
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(is_heap());
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-fix(entry_pointer p_e)
-{
-  size_type i = p_e - m_a_entries;
-  if (i > 0 && entry_cmp::operator()(m_a_entries[parent(i)], m_a_entries[i]))
-    {
-      size_type parent_i = parent(i);
-      while (i > 0
-	     && entry_cmp::operator()(m_a_entries[parent_i], m_a_entries[i]))
-	{
-	  std::swap(m_a_entries[i], m_a_entries[parent_i]);
-	  i = parent_i;
-	  parent_i = parent(i);
-	}
-
-      PB_DS_ASSERT_VALID((*this))
-      return;
-    }
-
-  while (i < m_size)
-    {
-      const size_type lchild_i = left_child(i);
-      const size_type rchild_i = right_child(i);
-      _GLIBCXX_DEBUG_ASSERT(rchild_i > lchild_i);
-
-      const bool smaller_than_lchild = lchild_i < m_size &&
-	entry_cmp::operator()(m_a_entries[i], m_a_entries[lchild_i]);
-
-      const bool smaller_than_rchild = rchild_i < m_size &&
-	entry_cmp::operator()(m_a_entries[i], m_a_entries[rchild_i]);
-
-      const bool swap_with_rchild = smaller_than_rchild && (!smaller_than_lchild || entry_cmp::operator()(m_a_entries[lchild_i], m_a_entries[rchild_i]));
-
-      const bool swap_with_lchild = !swap_with_rchild && smaller_than_lchild;
-
-      if (swap_with_lchild)
-	{
-	  std::swap(m_a_entries[i], m_a_entries[lchild_i]);
-	  i = lchild_i;
-	}
-      else if (swap_with_rchild)
-	{
-	  std::swap(m_a_entries[i], m_a_entries[rchild_i]);
-	  i = rchild_i;
-	}
-      else
-	i = m_size;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-swap_value_imp(entry_pointer p_e, value_type new_val, true_type)
-{ *p_e = new_val; }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-swap_value_imp(entry_pointer p_e, const_reference r_new_val, false_type)
-{
-  value_type tmp(r_new_val);
-  (*p_e)->swap(tmp);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
deleted file mode 100644
index a6da563..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/iterators_fn_imps.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-begin()
-{ return iterator(m_a_entries); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-begin() const
-{ return const_iterator(m_a_entries); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-end()
-{ return iterator(m_a_entries + m_size); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-end() const
-{ return const_iterator(m_a_entries + m_size); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp
deleted file mode 100644
index 321560c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/point_const_iterator.hpp
- * Contains an iterator class returned by the table's const find and insert
- * methods.
- */
-
-#ifndef PB_DS_BINARY_HEAP_CONST_FIND_ITERATOR_HPP
-#define PB_DS_BINARY_HEAP_CONST_FIND_ITERATOR_HPP
-
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Const point-type iterator.
-    template<typename Value_Type, typename Entry, bool Simple, 
-	     typename _Alloc>
-    class binary_heap_point_const_iterator_
-    {
-    protected:
-      typedef typename _Alloc::template rebind<Entry>::other::pointer entry_pointer;
-
-    public:
-      /// Category.
-      typedef trivial_iterator_tag iterator_category;
-
-      /// Difference type.
-      typedef trivial_iterator_difference_type difference_type;
-
-      /// Iterator's value type.
-      typedef Value_Type value_type;
-
-      /// Iterator's pointer type.
-      typedef typename _Alloc::template rebind<value_type>::other::pointer
-      pointer;
-
-      /// Iterator's const pointer type.
-      typedef
-      typename _Alloc::template rebind<value_type>::other::const_pointer
-      const_pointer;
-
-      /// Iterator's reference type.
-      typedef
-      typename _Alloc::template rebind<value_type>::other::reference
-      reference;
-
-      /// Iterator's const reference type.
-      typedef
-      typename _Alloc::template rebind<value_type>::other::const_reference
-      const_reference;
-
-      inline
-      binary_heap_point_const_iterator_(entry_pointer p_e) : m_p_e(p_e)
-      { }
-
-      /// Default constructor.
-      inline
-      binary_heap_point_const_iterator_() : m_p_e(0) { }
-
-      /// Copy constructor.
-      inline
-      binary_heap_point_const_iterator_(const binary_heap_point_const_iterator_& other)
-      : m_p_e(other.m_p_e)
-      { }
-
-      /// Access.
-      inline const_pointer
-      operator->() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_p_e != 0);
-	return to_ptr(integral_constant<int, Simple>());
-      }
-
-      /// Access.
-      inline const_reference
-      operator*() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_p_e != 0);
-	return *to_ptr(integral_constant<int, Simple>());
-      }
-
-      /// Compares content to a different iterator object.
-      inline bool
-      operator==(const binary_heap_point_const_iterator_& other) const
-      { return m_p_e == other.m_p_e; }
-
-      /// Compares content (negatively) to a different iterator object.
-      inline bool
-      operator!=(const binary_heap_point_const_iterator_& other) const
-      { return m_p_e != other.m_p_e; }
-
-    private:
-      inline const_pointer
-      to_ptr(true_type) const
-      { return m_p_e; }
-
-      inline const_pointer
-      to_ptr(false_type) const
-      { return *m_p_e; }
-
-    public:
-      entry_pointer m_p_e;
-    };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
deleted file mode 100644
index df1c8ef..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/policy_access_fn_imps.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-PB_DS_CLASS_T_DEC
-Cmp_Fn& 
-PB_DS_CLASS_C_DEC::
-get_cmp_fn()
-{
-  return (*this);
-}
-
-PB_DS_CLASS_T_DEC
-const Cmp_Fn& 
-PB_DS_CLASS_C_DEC::
-get_cmp_fn() const
-{
-  return (*this);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/resize_policy.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
deleted file mode 100644
index 9b1fc52..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/resize_policy.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-#ifndef PB_DS_BINARY_HEAP_RESIZE_POLICY_HPP
-#define PB_DS_BINARY_HEAP_RESIZE_POLICY_HPP
-
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Resize policy for binary heap.
-    template<typename _Tp>
-    class resize_policy
-    {
-    private:
-      enum
-	{
-	  ratio = 8,
-	  factor = 2
-	};
-
-      /// Next shrink size.
-      _Tp 		m_shrink_size;
-
-      /// Next grow size.
-      _Tp 		m_grow_size;
-
-    public:
-      typedef _Tp	size_type;
-
-      static const _Tp	min_size = 16;
-
-      resize_policy() : m_shrink_size(0), m_grow_size(min_size)
-      { PB_DS_ASSERT_VALID((*this)) }
-
-      resize_policy(const resize_policy& other)
-      : m_shrink_size(other.m_shrink_size), m_grow_size(other.m_grow_size)
-      { PB_DS_ASSERT_VALID((*this)) }
-
-      inline void
-      swap(resize_policy<_Tp>&);
-
-      inline bool
-      resize_needed_for_grow(size_type) const;
-
-      inline bool
-      resize_needed_for_shrink(size_type) const;
-
-      inline bool
-      grow_needed(size_type) const;
-
-      inline bool
-      shrink_needed(size_type) const;
-
-      inline size_type
-      get_new_size_for_grow() const;
-
-      inline size_type
-      get_new_size_for_shrink() const;
-
-      inline size_type
-      get_new_size_for_arbitrary(size_type) const;
-
-      inline void
-      notify_grow_resize();
-
-      inline void
-      notify_shrink_resize();
-
-      void
-      notify_arbitrary(size_type);
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-#endif
-
-#ifdef PB_DS_BINARY_HEAP_TRACE_
-      void
-      trace() const;
-#endif
-    };
-
-    template<typename _Tp>
-      const _Tp resize_policy<_Tp>::min_size;
-
-    template<typename _Tp>
-    inline void
-    resize_policy<_Tp>::
-    swap(resize_policy<_Tp>& other)
-    {
-      std::swap(m_shrink_size, other.m_shrink_size);
-      std::swap(m_grow_size, other.m_grow_size);
-    }
-
-    template<typename _Tp>
-    inline bool
-    resize_policy<_Tp>::
-    resize_needed_for_grow(size_type size) const
-    {
-      _GLIBCXX_DEBUG_ASSERT(size <= m_grow_size);
-      return size == m_grow_size;
-    }
-
-    template<typename _Tp>
-    inline bool
-    resize_policy<_Tp>::
-    resize_needed_for_shrink(size_type size) const
-    {
-      _GLIBCXX_DEBUG_ASSERT(size <= m_grow_size);
-      return size == m_shrink_size;
-    }
-
-    template<typename _Tp>
-    inline typename resize_policy<_Tp>::size_type
-    resize_policy<_Tp>::
-    get_new_size_for_grow() const
-    { return m_grow_size * factor; }
-
-    template<typename _Tp>
-    inline typename resize_policy<_Tp>::size_type
-    resize_policy<_Tp>::
-    get_new_size_for_shrink() const
-    {
-      const size_type half_size = m_grow_size / factor;
-      return std::max(min_size, half_size);
-    }
-
-    template<typename _Tp>
-    inline typename resize_policy<_Tp>::size_type
-    resize_policy<_Tp>::
-    get_new_size_for_arbitrary(size_type size) const
-    {
-      size_type ret = min_size;
-      while (ret < size)
-	ret *= factor;
-      return ret;
-    }
-
-    template<typename _Tp>
-    inline void
-    resize_policy<_Tp>::
-    notify_grow_resize()
-    {
-      PB_DS_ASSERT_VALID((*this))
-      _GLIBCXX_DEBUG_ASSERT(m_grow_size >= min_size);
-      m_grow_size *= factor;
-      m_shrink_size = m_grow_size / ratio;
-      PB_DS_ASSERT_VALID((*this))
-    }
-
-    template<typename _Tp>
-    inline void
-    resize_policy<_Tp>::
-    notify_shrink_resize()
-    {
-      PB_DS_ASSERT_VALID((*this))
-      m_shrink_size /= factor;
-      if (m_shrink_size == 1)
-	m_shrink_size = 0;
-      m_grow_size = std::max(m_grow_size / factor, min_size);
-      PB_DS_ASSERT_VALID((*this))
-    }
-
-    template<typename _Tp>
-    inline void
-    resize_policy<_Tp>::
-    notify_arbitrary(size_type actual_size)
-    {
-      m_grow_size = actual_size;
-      m_shrink_size = m_grow_size / ratio;
-      PB_DS_ASSERT_VALID((*this))
-    }
-
-#ifdef _GLIBCXX_DEBUG
-    template<typename _Tp>
-    void
-    resize_policy<_Tp>::
-    assert_valid(const char* __file, int __line) const
-    {
-      PB_DS_DEBUG_VERIFY(m_shrink_size == 0
-			 || m_shrink_size * ratio == m_grow_size);
-      PB_DS_DEBUG_VERIFY(m_grow_size >= min_size);
-    }
-#endif
-
-#ifdef PB_DS_BINARY_HEAP_TRACE_
-    template<typename _Tp>
-    void
-    resize_policy<_Tp>::
-    trace() const
-    {
-      std::cerr << "shrink = " << m_shrink_size
-		<< " grow = " << m_grow_size << std::endl;
-    }
-#endif
-
-} // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
deleted file mode 100644
index e77d3c2..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/split_join_fn_imps.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-void
-PB_DS_CLASS_C_DEC::
-split(Pred pred, PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-
-  typedef
-    typename entry_pred<value_type, Pred, _Alloc, simple_value>::type
-    pred_t;
-
-  const size_type left = partition(pred_t(pred));
-  _GLIBCXX_DEBUG_ASSERT(m_size >= left);
-
-  const size_type ersd = m_size - left;
-  _GLIBCXX_DEBUG_ASSERT(m_size >= ersd);
-
-  const size_type new_size = resize_policy::get_new_size_for_arbitrary(left);
-  const size_type other_actual_size = other.get_new_size_for_arbitrary(ersd);
-
-  entry_pointer a_entries = 0;
-  entry_pointer a_other_entries = 0;
-
-  __try
-    {
-      a_entries = s_entry_allocator.allocate(new_size);
-      a_other_entries = s_entry_allocator.allocate(other_actual_size);
-    }
-  __catch(...)
-    {
-      if (a_entries != 0)
-	s_entry_allocator.deallocate(a_entries, new_size);
-
-      if (a_other_entries != 0)
-	s_entry_allocator.deallocate(a_other_entries, other_actual_size);
-
-      __throw_exception_again;
-    };
-
-  for (size_type i = 0; i < other.m_size; ++i)
-    erase_at(other.m_a_entries, i, s_no_throw_copies_ind);
-
-  _GLIBCXX_DEBUG_ASSERT(new_size >= left);
-  std::copy(m_a_entries, m_a_entries + left, a_entries);
-  std::copy(m_a_entries + left, m_a_entries + m_size, a_other_entries);
-
-  s_entry_allocator.deallocate(m_a_entries, m_actual_size);
-  s_entry_allocator.deallocate(other.m_a_entries, other.m_actual_size);
-
-  m_actual_size = new_size;
-  other.m_actual_size = other_actual_size;
-
-  m_size = left;
-  other.m_size = ersd;
-
-  m_a_entries = a_entries;
-  other.m_a_entries = a_other_entries;
-
-  make_heap();
-  other.make_heap();
-
-  resize_policy::notify_arbitrary(m_actual_size);
-  other.notify_arbitrary(other.m_actual_size);
-
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-join(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  const size_type len = m_size + other.m_size;
-  const size_type new_size = resize_policy::get_new_size_for_arbitrary(len);
-
-  entry_pointer a_entries = 0;
-  entry_pointer a_other_entries = 0;
-
-  __try
-    {
-      a_entries = s_entry_allocator.allocate(new_size);
-      a_other_entries = s_entry_allocator.allocate(resize_policy::min_size);
-    }
-  __catch(...)
-    {
-      if (a_entries != 0)
-	s_entry_allocator.deallocate(a_entries, new_size);
-
-      if (a_other_entries != 0)
-	s_entry_allocator.deallocate(a_other_entries, resize_policy::min_size);
-
-      __throw_exception_again;
-    }
-
-  std::copy(m_a_entries, m_a_entries + m_size, a_entries);
-  std::copy(other.m_a_entries, other.m_a_entries + other.m_size,
-	    a_entries + m_size);
-
-  s_entry_allocator.deallocate(m_a_entries, m_actual_size);
-  m_a_entries = a_entries;
-  m_size = len;
-  m_actual_size = new_size;
-  resize_policy::notify_arbitrary(new_size);
-  make_heap();
-
-  s_entry_allocator.deallocate(other.m_a_entries, other.m_actual_size);
-  other.m_a_entries = a_other_entries;
-  other.m_size = 0;
-  other.m_actual_size = resize_policy::min_size;
-  other.notify_arbitrary(resize_policy::min_size);
-  other.make_heap();
-  
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
deleted file mode 100644
index 47c257e..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binary_heap_/trace_fn_imps.hpp
- * Contains an implementation class for a binary_heap.
- */
-
-#ifdef PB_DS_BINARY_HEAP_TRACE_
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace() const
-{
-  std::cerr << this << std::endl;
-
-  std::cerr << m_a_entries << std::endl;
-
-  for (size_type i = 0; i < m_size; ++i)
-    trace_entry(m_a_entries[i], s_no_throw_copies_ind);
-
-  std::cerr << std::endl;
-
-  std::cerr << "size = " << m_size << " " << "actual_size = " << m_actual_size << std::endl;
-
-  resize_policy::trace();
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace_entry(const entry& r_e, false_type) const
-{
-  std::cout << r_e << " " <<* r_e << std::endl;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace_entry(const entry& r_e, true_type) const
-{
-  std::cout << r_e << std::endl;
-}
-
-#endif // #ifdef PB_DS_BINARY_HEAP_TRACE_
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
deleted file mode 100644
index bd582c6..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binomial_heap_.hpp
- * Contains an implementation class for a binomial heap.
- */
-
-/*
- * Binomial heap.
- * Vuillemin J is the mastah.
- * Modified from CLRS.
- */
-
-#include <debug/debug.h>
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_CLASS_T_DEC \
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    binomial_heap<Value_Type, Cmp_Fn, _Alloc>
-
-    /**
-     *  Binomial heap.
-     *
-     *  @ingroup heap-detail
-     */
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-    class binomial_heap
-    : public binomial_heap_base<Value_Type, Cmp_Fn, _Alloc>
-    {
-    private:
-      typedef binomial_heap_base<Value_Type, Cmp_Fn, _Alloc> 	base_type;
-      typedef typename base_type::node_pointer 		node_pointer;
-      typedef typename base_type::node_const_pointer 	node_const_pointer;
-
-    public:
-      typedef Value_Type 				value_type;
-      typedef typename _Alloc::size_type 		size_type;
-      typedef typename _Alloc::difference_type 		difference_type;
-      typedef typename base_type::pointer 		pointer;
-      typedef typename base_type::const_pointer 	const_pointer;
-      typedef typename base_type::reference 		reference;
-      typedef typename base_type::const_reference 	const_reference;
-      typedef typename base_type::point_const_iterator 	point_const_iterator;
-      typedef typename base_type::point_iterator 	point_iterator;
-      typedef typename base_type::const_iterator 	const_iterator;
-      typedef typename base_type::iterator 		iterator;
-      typedef typename base_type::cmp_fn 		cmp_fn;
-      typedef typename base_type::allocator_type 	allocator_type;
-
-      binomial_heap();
-
-      binomial_heap(const Cmp_Fn&);
-
-      binomial_heap(const binomial_heap&);
-
-      ~binomial_heap();
-
-    protected:
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-#endif
-    };
-
-#include <ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp>
-
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_CLASS_T_DEC
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index b3f6473..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file detail/binomial_heap_/constructors_destructor_fn_imps.hpp
- * Contains an implementation for binomial_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-binomial_heap()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-binomial_heap(const Cmp_Fn& r_cmp_fn)
-: base_type(r_cmp_fn)
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-binomial_heap(const PB_DS_CLASS_C_DEC& other)
-: base_type(other)
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~binomial_heap() { }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
deleted file mode 100644
index d9259bd..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file detail/binomial_heap_/debug_fn_imps.hpp
- * Contains an implementation for binomial_heap_.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{ base_type::assert_valid(true, __file, __line); }
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
deleted file mode 100644
index 41319bf..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binomial_heap_base_/binomial_heap_base_.hpp
- * Contains an implementation class for a base of binomial heaps.
- */
-
-#ifndef PB_DS_BINOMIAL_HEAP_BASE_HPP
-#define PB_DS_BINOMIAL_HEAP_BASE_HPP
-
-/*
- * Binomial heap base.
- * Vuillemin J is the mastah.
- * Modified from CLRS.
- */
-
-#include <debug/debug.h>
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_CLASS_T_DEC \
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    binomial_heap_base<Value_Type, Cmp_Fn, _Alloc>
-
-#ifdef _GLIBCXX_DEBUG
-#define PB_DS_B_HEAP_BASE \
-  left_child_next_sibling_heap<Value_Type, Cmp_Fn, \
-				typename _Alloc::size_type,  _Alloc, false>
-#else
-#define PB_DS_B_HEAP_BASE \
-  left_child_next_sibling_heap<Value_Type, Cmp_Fn, \
-				typename _Alloc::size_type, _Alloc>
-#endif
-
-    /// Base class for binomial heap.
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-    class binomial_heap_base
-    : public PB_DS_B_HEAP_BASE
-    {
-    private:
-      typedef typename _Alloc::template rebind<Value_Type>::other __rebind_v;
-      typedef PB_DS_B_HEAP_BASE	  			base_type;
-
-    protected:
-      typedef typename base_type::node 			node;
-      typedef typename base_type::node_pointer 		node_pointer;
-      typedef typename base_type::node_const_pointer 	node_const_pointer;
-
-    public:
-      typedef Value_Type 				value_type;
-      typedef Cmp_Fn 					cmp_fn;
-      typedef _Alloc 					allocator_type;
-      typedef typename _Alloc::size_type 		size_type;
-      typedef typename _Alloc::difference_type 		difference_type;
-
-      typedef typename __rebind_v::pointer 		pointer;
-      typedef typename __rebind_v::const_pointer 	const_pointer;
-      typedef typename __rebind_v::reference 		reference;
-      typedef typename __rebind_v::const_reference   	const_reference;
-
-      typedef typename base_type::point_const_iterator 	point_const_iterator;
-      typedef typename base_type::point_iterator 	point_iterator;
-      typedef typename base_type::const_iterator 	const_iterator;
-      typedef typename base_type::iterator 		iterator;
-
-    public:
-
-      inline point_iterator
-      push(const_reference);
-
-      void
-      modify(point_iterator, const_reference);
-
-      inline const_reference
-      top() const;
-
-      void
-      pop();
-
-      void
-      erase(point_iterator);
-
-      inline void
-      clear();
-
-      template<typename Pred>
-      size_type
-      erase_if(Pred);
-
-      template<typename Pred>
-      void
-      split(Pred, PB_DS_CLASS_C_DEC&);
-
-      void
-      join(PB_DS_CLASS_C_DEC&);
-
-    protected:
-
-      binomial_heap_base();
-
-      binomial_heap_base(const Cmp_Fn&);
-
-      binomial_heap_base(const PB_DS_CLASS_C_DEC&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      ~binomial_heap_base();
-
-      template<typename It>
-      void
-      copy_from_range(It, It);
-
-      inline void
-      find_max();
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(bool, const char*, int) const;
-
-      void
-      assert_max(const char*, int) const;
-#endif
-
-    private:
-
-      inline node_pointer
-      fix(node_pointer) const;
-
-      inline void
-      insert_node(node_pointer);
-
-      inline void
-      remove_parentless_node(node_pointer);
-
-      inline node_pointer
-      join(node_pointer, node_pointer) const;
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_node_consistent(node_const_pointer, bool, bool,
-			     const char*, int) const;
-#endif
-
-    protected:
-      node_pointer 	m_p_max;
-    };
-
-#define PB_DS_ASSERT_VALID_COND(X, _StrictlyBinomial)			\
-  _GLIBCXX_DEBUG_ONLY(X.assert_valid(_StrictlyBinomial,__FILE__, __LINE__);)
-
-#define PB_DS_ASSERT_BASE_NODE_CONSISTENT(_Node, _Bool)			\
-  _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(_Node, _Bool,	\
-							__FILE__, __LINE__);)
-
-#include <ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp>
-#include <ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp>
-
-#undef PB_DS_ASSERT_BASE_NODE_CONSISTENT
-#undef PB_DS_ASSERT_VALID_COND
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_B_HEAP_BASE
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index fe81b30..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binomial_heap_base_/constructors_destructor_fn_imps.hpp
- * Contains an implementation class for a base of binomial heaps.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-  while (first_it != last_it)
-    push(*(first_it++));
-  PB_DS_ASSERT_VALID_COND((*this),false)
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-binomial_heap_base() : m_p_max(0)
-{
-  PB_DS_ASSERT_VALID_COND((*this),false)
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-binomial_heap_base(const Cmp_Fn& r_cmp_fn)
-: base_type(r_cmp_fn), m_p_max(0)
-{ PB_DS_ASSERT_VALID_COND((*this),false) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-binomial_heap_base(const PB_DS_CLASS_C_DEC& other)
-: base_type(other), m_p_max(0)
-{ PB_DS_ASSERT_VALID_COND((*this),false) }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID_COND((*this),false)
-  base_type::swap(other);
-  std::swap(m_p_max, other.m_p_max);
-  PB_DS_ASSERT_VALID_COND((*this),false)
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~binomial_heap_base()
-{ }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
deleted file mode 100644
index ee8791f..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binomial_heap_base_/debug_fn_imps.hpp
- * Contains an implementation class for a base of binomial heaps.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(bool strictly_binomial, const char* __file, int __line) const
-{
-  base_type::assert_valid(__file, __line);
-  assert_node_consistent(base_type::m_p_root, strictly_binomial, true,
-			 __file, __line);
-  assert_max(__file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_max(const char* __file, int __line) const
-{
-  if (m_p_max == 0)
-    return;
-  PB_DS_DEBUG_VERIFY(base_type::parent(m_p_max) == 0);
-  for (const_iterator it = base_type::begin(); it != base_type::end(); ++it)
-    PB_DS_DEBUG_VERIFY(!Cmp_Fn::operator()(m_p_max->m_value,
-					   it.m_p_nd->m_value));
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_node_consistent(node_const_pointer p_nd, bool strictly_binomial,
-		       bool increasing, const char* __file, int __line) const
-{
-  PB_DS_DEBUG_VERIFY(increasing || strictly_binomial);
-  base_type::assert_node_consistent(p_nd, false, __file, __line);
-  if (p_nd == 0)
-    return;
-  PB_DS_DEBUG_VERIFY(p_nd->m_metadata == base_type::degree(p_nd));
-  PB_DS_DEBUG_VERIFY(base_type::size_under_node(p_nd) ==
-		   static_cast<size_type>(1 << p_nd->m_metadata));
-  assert_node_consistent(p_nd->m_p_next_sibling, strictly_binomial, increasing,
-			 __file, __line);
-  assert_node_consistent(p_nd->m_p_l_child, true, false, __file, __line);
-  if (p_nd->m_p_next_sibling != 0)
-    {
-      if (increasing)
-	{
-	  if (strictly_binomial)
-	    PB_DS_DEBUG_VERIFY(p_nd->m_metadata
-				  < p_nd->m_p_next_sibling->m_metadata);
-	  else
-	    PB_DS_DEBUG_VERIFY(p_nd->m_metadata
-				  <= p_nd->m_p_next_sibling->m_metadata);
-	}
-      else
-	PB_DS_DEBUG_VERIFY(p_nd->m_metadata
-			      > p_nd->m_p_next_sibling->m_metadata);
-    }
-}
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
deleted file mode 100644
index 0b35b9e..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binomial_heap_base_/erase_fn_imps.hpp
- * Contains an implementation class for a base of binomial heaps.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-pop()
-{
-  PB_DS_ASSERT_VALID_COND((*this),true)
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-
-  if (m_p_max == 0)
-    find_max();
-
-  _GLIBCXX_DEBUG_ASSERT(m_p_max != 0);
-  node_pointer p_nd = m_p_max;
-  remove_parentless_node(m_p_max);
-  base_type::actual_erase_node(p_nd);
-  m_p_max = 0;
-  PB_DS_ASSERT_VALID_COND((*this),true)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-remove_parentless_node(node_pointer p_nd)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-  _GLIBCXX_DEBUG_ASSERT(base_type::parent(p_nd) == 0);
-
-  node_pointer p_cur_root = p_nd == base_type::m_p_root?
-    p_nd->m_p_next_sibling : base_type::m_p_root;
-
-  if (p_cur_root != 0)
-    p_cur_root->m_p_prev_or_parent = 0;
-
-  if (p_nd->m_p_prev_or_parent != 0)
-    p_nd->m_p_prev_or_parent->m_p_next_sibling = p_nd->m_p_next_sibling;
-
-  if (p_nd->m_p_next_sibling != 0)
-    p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd->m_p_prev_or_parent;
-
-  node_pointer p_child = p_nd->m_p_l_child;
-  if (p_child != 0)
-    {
-      p_child->m_p_prev_or_parent = 0;
-      while (p_child->m_p_next_sibling != 0)
-	p_child = p_child->m_p_next_sibling;
-    }
-
-  m_p_max = 0;
-  base_type::m_p_root = join(p_cur_root, p_child);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  base_type::clear();
-  m_p_max = 0;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase(point_iterator it)
-{
-  PB_DS_ASSERT_VALID_COND((*this),true)
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-
-  base_type::bubble_to_top(it.m_p_nd);
-  remove_parentless_node(it.m_p_nd);
-  base_type::actual_erase_node(it.m_p_nd);
-  m_p_max = 0;
-  PB_DS_ASSERT_VALID_COND((*this),true)
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  PB_DS_ASSERT_VALID_COND((*this),true)
-
-  if (base_type::empty())
-    {
-      PB_DS_ASSERT_VALID_COND((*this),true)
-      return 0;
-    }
-
-  base_type::to_linked_list();
-  node_pointer p_out = base_type::prune(pred);
-  size_type ersd = 0;
-  while (p_out != 0)
-    {
-      ++ersd;
-      node_pointer p_next = p_out->m_p_next_sibling;
-      base_type::actual_erase_node(p_out);
-      p_out = p_next;
-    }
-
-  node_pointer p_cur = base_type::m_p_root;
-  base_type::m_p_root = 0;
-  while (p_cur != 0)
-    {
-      node_pointer p_next = p_cur->m_p_next_sibling;
-      p_cur->m_p_l_child = p_cur->m_p_prev_or_parent = 0;
-      p_cur->m_metadata = 0;
-      p_cur->m_p_next_sibling = base_type::m_p_root;
-
-      if (base_type::m_p_root != 0)
-	base_type::m_p_root->m_p_prev_or_parent = p_cur;
-
-      base_type::m_p_root = p_cur;
-      base_type::m_p_root = fix(base_type::m_p_root);
-      p_cur = p_next;
-    }
-
-  m_p_max = 0;
-  PB_DS_ASSERT_VALID_COND((*this),true)
-  return ersd;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
deleted file mode 100644
index 6dced89..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binomial_heap_base_/find_fn_imps.hpp
- * Contains an implementation class for a base of binomial heaps.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reference
-PB_DS_CLASS_C_DEC::
-top() const
-{
-  PB_DS_ASSERT_VALID_COND((*this),false)
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-
-  if (m_p_max == 0)
-    const_cast<PB_DS_CLASS_C_DEC* >(this)->find_max();
-
-  _GLIBCXX_DEBUG_ASSERT(m_p_max != 0);
-  return m_p_max->m_value;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-find_max()
-{
-  node_pointer p_cur = base_type::m_p_root;
-  m_p_max = p_cur;
-  while (p_cur != 0)
-    {
-      if (Cmp_Fn::operator()(m_p_max->m_value, p_cur->m_value))
-	m_p_max = p_cur;
-      p_cur = p_cur->m_p_next_sibling;
-    }
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
deleted file mode 100644
index 51b4c6e..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binomial_heap_base_/insert_fn_imps.hpp
- * Contains an implementation class for a base of binomial heaps.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-push(const_reference r_val)
-{
-  PB_DS_ASSERT_VALID_COND((*this),true)
-  node_pointer p_nd = base_type::get_new_node_for_insert(r_val);
-  insert_node(p_nd);
-  m_p_max = 0;
-  PB_DS_ASSERT_VALID_COND((*this),true)
-  return point_iterator(p_nd);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-insert_node(node_pointer p_nd)
-{
-  if (base_type::m_p_root == 0)
-    {
-      p_nd->m_p_next_sibling = 0;
-      p_nd->m_p_prev_or_parent = 0;
-      p_nd->m_p_l_child = 0;
-      p_nd->m_metadata = 0;
-      base_type::m_p_root = p_nd;
-      return;
-    }
-
-  if (base_type::m_p_root->m_metadata > 0)
-    {
-      p_nd->m_p_prev_or_parent = p_nd->m_p_l_child = 0;
-      p_nd->m_p_next_sibling = base_type::m_p_root;
-      base_type::m_p_root->m_p_prev_or_parent = p_nd;
-      base_type::m_p_root = p_nd;
-      p_nd->m_metadata = 0;
-      return;
-    }
-
-  if (Cmp_Fn::operator()(base_type::m_p_root->m_value, p_nd->m_value))
-    {
-      p_nd->m_p_next_sibling = base_type::m_p_root->m_p_next_sibling;
-      p_nd->m_p_prev_or_parent = 0;
-      p_nd->m_metadata = 1;
-      p_nd->m_p_l_child = base_type::m_p_root;
-      base_type::m_p_root->m_p_prev_or_parent = p_nd;
-      base_type::m_p_root->m_p_next_sibling = 0;
-      base_type::m_p_root = p_nd;
-    }
-  else
-    {
-      p_nd->m_p_next_sibling = 0;
-      p_nd->m_p_l_child = 0;
-      p_nd->m_p_prev_or_parent = base_type::m_p_root;
-      p_nd->m_metadata = 0;
-      _GLIBCXX_DEBUG_ASSERT(base_type::m_p_root->m_p_l_child == 0);
-      base_type::m_p_root->m_p_l_child = p_nd;
-      base_type::m_p_root->m_metadata = 1;
-    }
-
-  base_type::m_p_root = fix(base_type::m_p_root);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-fix(node_pointer p_nd) const
-{
-  while (p_nd->m_p_next_sibling != 0 &&
-	 p_nd->m_metadata == p_nd->m_p_next_sibling->m_metadata)
-    {
-      node_pointer p_next = p_nd->m_p_next_sibling;
-      if (Cmp_Fn::operator()(p_nd->m_value, p_next->m_value))
-	{
-	  p_next->m_p_prev_or_parent = p_nd->m_p_prev_or_parent;
-
-	  if (p_nd->m_p_prev_or_parent != 0)
-	    p_nd->m_p_prev_or_parent->m_p_next_sibling = p_next;
-
-	  base_type::make_child_of(p_nd, p_next);
-	  ++p_next->m_metadata;
-	  p_nd = p_next;
-	}
-      else
-	{
-	  p_nd->m_p_next_sibling = p_next->m_p_next_sibling;
-
-	  if (p_nd->m_p_next_sibling != 0)
-	    p_next->m_p_next_sibling = 0;
-
-	  base_type::make_child_of(p_next, p_nd);
-	  ++p_nd->m_metadata;
-	}
-    }
-
-  if (p_nd->m_p_next_sibling != 0)
-    p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd;
-
-  return p_nd;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-modify(point_iterator it, const_reference r_new_val)
-{
-  PB_DS_ASSERT_VALID_COND((*this),true)
-  node_pointer p_nd = it.m_p_nd;
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-  PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_nd, false)
-
-  const bool bubble_up = Cmp_Fn::operator()(p_nd->m_value, r_new_val);
-  p_nd->m_value = r_new_val;
-
-  if (bubble_up)
-    {
-      node_pointer p_parent = base_type::parent(p_nd);
-      while (p_parent != 0 &&
-	     Cmp_Fn::operator()(p_parent->m_value, p_nd->m_value))
-	{
-	  base_type::swap_with_parent(p_nd, p_parent);
-	  p_parent = base_type::parent(p_nd);
-	}
-
-      if (p_nd->m_p_prev_or_parent == 0)
-	base_type::m_p_root = p_nd;
-
-      m_p_max = 0;
-      PB_DS_ASSERT_VALID_COND((*this),true)
-      return;
-    }
-
-  base_type::bubble_to_top(p_nd);
-  remove_parentless_node(p_nd);
-  insert_node(p_nd);
-  m_p_max = 0;
-  PB_DS_ASSERT_VALID_COND((*this),true)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
deleted file mode 100644
index 44c55a2..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file binomial_heap_base_/split_join_fn_imps.hpp
- * Contains an implementation class for a base of binomial heaps.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-void
-PB_DS_CLASS_C_DEC::
-split(Pred pred, PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID_COND((*this),true)
-  PB_DS_ASSERT_VALID_COND(other,true)
-
-  other.clear();
-  if (base_type::empty())
-    {
-      PB_DS_ASSERT_VALID_COND((*this),true)
-      PB_DS_ASSERT_VALID_COND(other,true)
-      return;
-    }
-
-  base_type::to_linked_list();
-  node_pointer p_out = base_type::prune(pred);
-  while (p_out != 0)
-    {
-      _GLIBCXX_DEBUG_ASSERT(base_type::m_size > 0);
-      --base_type::m_size;
-      ++other.m_size;
-
-      node_pointer p_next = p_out->m_p_next_sibling;
-      p_out->m_p_l_child = p_out->m_p_prev_or_parent = 0;
-      p_out->m_metadata = 0;
-
-      p_out->m_p_next_sibling = other.m_p_root;
-      if (other.m_p_root != 0)
-	other.m_p_root->m_p_prev_or_parent = p_out;
-
-      other.m_p_root = p_out;
-      other.m_p_root = other.fix(other.m_p_root);
-      p_out = p_next;
-    }
-
-  PB_DS_ASSERT_VALID_COND(other,true)
-  node_pointer p_cur = base_type::m_p_root;
-  base_type::m_p_root = 0;
-
-  while (p_cur != 0)
-    {
-      node_pointer p_next = p_cur->m_p_next_sibling;
-      p_cur->m_p_l_child = p_cur->m_p_prev_or_parent = 0;
-      p_cur->m_metadata = 0;
-      p_cur->m_p_next_sibling = base_type::m_p_root;
-
-      if (base_type::m_p_root != 0)
-	base_type::m_p_root->m_p_prev_or_parent = p_cur;
-
-      base_type::m_p_root = p_cur;
-      base_type::m_p_root = fix(base_type::m_p_root);
-      p_cur = p_next;
-    }
-
-  m_p_max = 0;
-  PB_DS_ASSERT_VALID_COND((*this),true)
-  PB_DS_ASSERT_VALID_COND(other,true)
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-join(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID_COND((*this),true)
-  PB_DS_ASSERT_VALID_COND(other,true)
-
-  node_pointer p_other = other.m_p_root;
-  if (p_other != 0)
-    do
-      {
-	node_pointer p_next = p_other->m_p_next_sibling;
-	std::swap(p_other->m_p_next_sibling, p_other->m_p_prev_or_parent);
-	p_other = p_next;
-      }
-    while (p_other != 0);
-
-  base_type::m_p_root = join(base_type::m_p_root, other.m_p_root);
-  base_type::m_size += other.m_size;
-  m_p_max = 0;
-
-  other.m_p_root = 0;
-  other.m_size = 0;
-  other.m_p_max = 0;
-
-  PB_DS_ASSERT_VALID_COND((*this),true)
-  PB_DS_ASSERT_VALID_COND(other,true)
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-join(node_pointer p_lhs, node_pointer p_rhs) const
-{
-  node_pointer p_ret = 0;
-  node_pointer p_cur = 0;
-
-  while (p_lhs != 0 || p_rhs != 0)
-    {
-      if (p_rhs == 0)
-	{
-	  if (p_cur == 0)
-	    p_ret = p_cur = p_lhs;
-	  else
-	    {
-	      p_cur->m_p_next_sibling = p_lhs;
-	      p_lhs->m_p_prev_or_parent = p_cur;
-	    }
-	  p_cur = p_lhs = 0;
-	}
-      else if (p_lhs == 0 || p_rhs->m_metadata < p_lhs->m_metadata)
-	{
-	  if (p_cur == 0)
-	    {
-	      p_ret = p_cur = p_rhs;
-	      p_rhs = p_rhs->m_p_prev_or_parent;
-	    }
-	  else
-	    {
-	      p_cur->m_p_next_sibling = p_rhs;
-	      p_rhs = p_rhs->m_p_prev_or_parent;
-	      p_cur->m_p_next_sibling->m_p_prev_or_parent = p_cur;
-	      p_cur = p_cur->m_p_next_sibling;
-	    }
-	}
-      else if (p_lhs->m_metadata < p_rhs->m_metadata)
-	{
-	  if (p_cur == 0)
-	    p_ret = p_cur = p_lhs;
-	  else
-	    {
-	      p_cur->m_p_next_sibling = p_lhs;
-	      p_lhs->m_p_prev_or_parent = p_cur;
-	      p_cur = p_cur->m_p_next_sibling;
-	    }
-	  p_lhs = p_cur->m_p_next_sibling;
-	}
-      else
-	{
-	  node_pointer p_next_rhs = p_rhs->m_p_prev_or_parent;
-	  p_rhs->m_p_next_sibling = p_lhs;
-	  p_lhs = fix(p_rhs);
-	  p_rhs = p_next_rhs;
-	}
-    }
-
-  if (p_cur != 0)
-    p_cur->m_p_next_sibling = 0;
-
-  if (p_ret != 0)
-    p_ret->m_p_prev_or_parent = 0;
-
-  return p_ret;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/branch_policy/branch_policy.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/branch_policy/branch_policy.hpp
deleted file mode 100644
index 1c364bc..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/branch_policy/branch_policy.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file branch_policy/branch_policy.hpp
- * Contains a base class for branch policies.
- */
-
-#ifndef PB_DS_BRANCH_POLICY_BASE_HPP
-#define PB_DS_BRANCH_POLICY_BASE_HPP
-
-#include <ext/pb_ds/tag_and_trait.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Primary template, base class for branch structure policies.
-    template<typename Node_CItr, typename Node_Itr, typename _Alloc>
-      struct branch_policy
-      {
-      protected:
-	typedef typename Node_Itr::value_type 		it_type;
-	typedef typename std::iterator_traits<it_type>::value_type value_type;
-	typedef typename value_type::first_type 	key_type;
-
-	typedef typename remove_const<value_type>::type	rcvalue_type;
-	typedef typename remove_const<key_type>::type	rckey_type;
-
-	typedef typename _Alloc::template rebind<rcvalue_type>::other rebind_v;
-	typedef typename _Alloc::template rebind<rckey_type>::other   rebind_k;
-
-	typedef	typename rebind_v::reference 		reference;
-	typedef	typename rebind_v::const_reference 	const_reference;
-	typedef	typename rebind_v::const_pointer	const_pointer;
-
-	typedef	typename rebind_k::const_reference 	key_const_reference;
-
-	static inline key_const_reference
-	extract_key(const_reference r_val)
-	{ return r_val.first; }
-
-	virtual it_type
-	end() = 0;
-
-	it_type
-	end_iterator() const
-	{ return const_cast<branch_policy*>(this)->end(); }
-
-	virtual
-	~branch_policy() { }
-      };
-
-    /// Specialization for const iterators.
-    template<typename Node_CItr, typename _Alloc>
-      struct branch_policy<Node_CItr, Node_CItr, _Alloc>
-      {
-      protected:
-	typedef typename Node_CItr::value_type 		   it_type;
-       	typedef typename std::iterator_traits<it_type>::value_type value_type;
-	typedef typename remove_const<value_type>::type		   rcvalue_type;
-	typedef typename _Alloc::template rebind<rcvalue_type>::other rebind_v;
-	typedef	typename rebind_v::reference 		reference;
-	typedef	typename rebind_v::const_reference 	const_reference;
-	typedef	typename rebind_v::const_pointer	const_pointer;
-
-	typedef value_type 				key_type;
-	typedef	typename rebind_v::const_reference 	key_const_reference;
-
-	static inline key_const_reference
-	extract_key(const_reference r_val)
-	{ return r_val; }
-
-	virtual it_type
-	end() const = 0;
-
-	it_type
-	end_iterator() const
-	{ return end(); }
-
-	virtual
-	~branch_policy() { }
-      };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_BRANCH_POLICY_BASE_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/branch_policy/null_node_metadata.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/branch_policy/null_node_metadata.hpp
deleted file mode 100644
index 4e8bcee..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/branch_policy/null_node_metadata.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file branch_policy/null_node_metadata.hpp
- * Contains an implementation class for tree-like classes.
- */
-
-#ifndef PB_DS_0_NODE_METADATA_HPP
-#define PB_DS_0_NODE_METADATA_HPP
-
-#include <ext/pb_ds/detail/types_traits.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Constant node iterator.
-    template<typename Key, typename Data, typename _Alloc>
-      struct dumnode_const_iterator
-      {
-      private:
-	typedef types_traits<Key, Data, _Alloc, false>	__traits_type;
-	typedef typename __traits_type::pointer        	const_iterator;
-	
-      public:
-	typedef const_iterator 				value_type;
-	typedef const_iterator 				const_reference;
-	typedef const_reference 	       		reference;
-      };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/branch_policy/traits.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/branch_policy/traits.hpp
deleted file mode 100644
index 592e7f7..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/branch_policy/traits.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file branch_policy/traits.hpp
- * Contains an implementation class for tree-like classes.
- */
-
-#ifndef PB_DS_NODE_AND_IT_TRAITS_HPP
-#define PB_DS_NODE_AND_IT_TRAITS_HPP
-
-#include <ext/pb_ds/detail/types_traits.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/traits.hpp>
-#include <ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp>
-#include <ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp>
-
-#define PB_DS_DEBUG_VERIFY(_Cond)					\
-  _GLIBCXX_DEBUG_VERIFY_AT(_Cond,					\
-			   _M_message(#_Cond" assertion from %1;:%2;")	\
-			   ._M_string(__FILE__)._M_integer(__LINE__)	\
-			   ,__file,__line)
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Tree traits class, primary template.
-    template<typename Key,
-	     typename Data,
-	     typename Cmp_Fn,
-	     template<typename Node_CItr,
-		      typename Node_Itr,
-		      typename Cmp_Fn_,
-		      typename _Alloc>
-	     class Node_Update,
-	     typename Tag,
-	     typename _Alloc>
-    struct tree_traits;
-
-    /// Trie traits class, primary template.
-    template<typename Key,
-	     typename Data,
-	     typename _ATraits,
-	     template<typename Node_CItr,
-		      typename Node_Itr,
-		      typename _ATraits_,
-		      typename _Alloc>
-	     class Node_Update,
-	     typename Tag,
-	     typename _Alloc>
-    struct trie_traits;
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#include <ext/pb_ds/detail/rb_tree_map_/traits.hpp>
-#include <ext/pb_ds/detail/splay_tree_/traits.hpp>
-#include <ext/pb_ds/detail/ov_tree_map_/traits.hpp>
-#include <ext/pb_ds/detail/pat_trie_/traits.hpp>
-
-#undef PB_DS_DEBUG_VERIFY
-
-#endif // #ifndef PB_DS_NODE_AND_IT_TRAITS_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
deleted file mode 100644
index 8e5713b..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
+++ /dev/null
@@ -1,679 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/cc_ht_map_.hpp
- * Contains an implementation class for cc_ht_map_.
- */
-
-#include <utility>
-#include <iterator>
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp>
-#include <ext/pb_ds/detail/types_traits.hpp>
-#include <ext/pb_ds/exception.hpp>
-#include <ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp>
-#ifdef _GLIBCXX_DEBUG
-#include <ext/pb_ds/detail/debug_map_base.hpp>
-#endif
-#ifdef PB_DS_HT_MAP_TRACE_
-#include <iostream>
-#endif
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-#define PB_DS_CC_HASH_NAME cc_ht_map
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-#define PB_DS_CC_HASH_NAME cc_ht_set
-#endif
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Mapped, typename Hash_Fn, \
-	     typename Eq_Fn, typename _Alloc, bool Store_Hash, \
-	     typename Comb_Hash_Fn, typename Resize_Policy>
-
-#define PB_DS_CLASS_C_DEC \
-    PB_DS_CC_HASH_NAME<Key, Mapped, Hash_Fn, Eq_Fn, _Alloc,	\
-		     Store_Hash, Comb_Hash_Fn, Resize_Policy>
-
-#define PB_DS_HASH_EQ_FN_C_DEC \
-    hash_eq_fn<Key, Eq_Fn, _Alloc, Store_Hash>
-
-#define PB_DS_RANGED_HASH_FN_C_DEC \
-    ranged_hash_fn<Key,	Hash_Fn, _Alloc, Comb_Hash_Fn, Store_Hash>
-
-#define PB_DS_CC_HASH_TRAITS_BASE \
-    types_traits<Key, Mapped, _Alloc, Store_Hash>
-
-#ifdef _GLIBCXX_DEBUG
-#define PB_DS_DEBUG_MAP_BASE_C_DEC \
-    debug_map_base<Key,	Eq_Fn, \
-		  typename _Alloc::template rebind<Key>::other::const_reference>
-#endif
-
-
-    /**
-     *  A collision-chaining hash-based container.
-     *
-     *
-     *  @ingroup hash-detail
-     *
-     *  @tparam Key 	    	Key type.
-     *
-     *  @tparam Mapped 	    	Map type.
-     *
-     *  @tparam Hash_Fn	      	Hashing functor.
-     *                          Default is __gnu_cxx::hash.
-     *
-     *  @tparam Eq_Fn	      	Equal functor.
-     *                          Default std::equal_to<Key>
-     *
-     *  @tparam _Alloc 	    	Allocator type.
-     *
-     *  @tparam Store_Hash    	If key type stores extra metadata.
-     *                          Defaults to false.
-     *
-     *  @tparam Comb_Hash_Fn	Combining hash functor.
-     *                          If Hash_Fn is not null_type, then this
-     *                          is the ranged-hash functor; otherwise,
-     *                          this is the range-hashing functor.
-     *                    XXX(See Design::Hash-Based Containers::Hash Policies.)
-     *                          Default direct_mask_range_hashing.
-     *
-     *  @tparam Resize_Policy 	Resizes hash.
-     *                          Defaults to hash_standard_resize_policy,
-     *                          using hash_exponential_size_policy and
-     *                          hash_load_check_resize_trigger.
-     *
-     *
-     *  Bases are: detail::hash_eq_fn, Resize_Policy, detail::ranged_hash_fn,
-     *             detail::types_traits. (Optional: detail::debug_map_base.)
-     */
-    template<typename Key,
-	     typename Mapped,
-	     typename Hash_Fn,
-	     typename Eq_Fn,
-	     typename _Alloc,
-	     bool Store_Hash,
-	     typename Comb_Hash_Fn,
-	     typename Resize_Policy >
-    class PB_DS_CC_HASH_NAME:
-#ifdef _GLIBCXX_DEBUG
-      protected PB_DS_DEBUG_MAP_BASE_C_DEC,
-#endif
-      public PB_DS_HASH_EQ_FN_C_DEC,
-      public Resize_Policy,
-      public PB_DS_RANGED_HASH_FN_C_DEC,
-      public PB_DS_CC_HASH_TRAITS_BASE
-    {
-    private:
-      typedef PB_DS_CC_HASH_TRAITS_BASE	       	traits_base;
-      typedef typename traits_base::comp_hash 	comp_hash;
-      typedef typename traits_base::value_type 	value_type_;
-      typedef typename traits_base::pointer 	pointer_;
-      typedef typename traits_base::const_pointer const_pointer_;
-      typedef typename traits_base::reference 	reference_;
-      typedef typename traits_base::const_reference const_reference_;
-
-      struct entry : public traits_base::stored_data_type
-      {
-	typename _Alloc::template rebind<entry>::other::pointer m_p_next;
-      };
-
-      typedef cond_dealtor<entry, _Alloc> 	cond_dealtor_t;
-
-      typedef typename _Alloc::template rebind<entry>::other entry_allocator;
-      typedef typename entry_allocator::pointer entry_pointer;
-      typedef typename entry_allocator::const_pointer const_entry_pointer;
-      typedef typename entry_allocator::reference entry_reference;
-      typedef typename entry_allocator::const_reference const_entry_reference;
-
-      typedef typename _Alloc::template rebind<entry_pointer>::other entry_pointer_allocator;
-      typedef typename entry_pointer_allocator::pointer entry_pointer_array;
-
-      typedef PB_DS_RANGED_HASH_FN_C_DEC ranged_hash_fn_base;
-      typedef PB_DS_HASH_EQ_FN_C_DEC hash_eq_fn_base;
-      typedef Resize_Policy resize_base;
-
-#ifdef _GLIBCXX_DEBUG
-      typedef PB_DS_DEBUG_MAP_BASE_C_DEC 	debug_base;
-#endif
-
-#define PB_DS_GEN_POS std::pair<entry_pointer, typename _Alloc::size_type>
-
-#include <ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp>
-#include <ext/pb_ds/detail/unordered_iterator/point_iterator.hpp>
-#include <ext/pb_ds/detail/unordered_iterator/const_iterator.hpp>
-#include <ext/pb_ds/detail/unordered_iterator/iterator.hpp>
-
-#undef PB_DS_GEN_POS
-
-    public:
-      typedef _Alloc 				allocator_type;
-      typedef typename _Alloc::size_type 	size_type;
-      typedef typename _Alloc::difference_type 	difference_type;
-      typedef Hash_Fn 				hash_fn;
-      typedef Eq_Fn 				eq_fn;
-      typedef Comb_Hash_Fn 			comb_hash_fn;
-      typedef Resize_Policy 			resize_policy;
-
-      /// Value stores hash, true or false.
-      enum
-	{
-	  store_hash = Store_Hash
-	};
-
-      typedef typename traits_base::key_type key_type;
-      typedef typename traits_base::key_pointer key_pointer;
-      typedef typename traits_base::key_const_pointer key_const_pointer;
-      typedef typename traits_base::key_reference key_reference;
-      typedef typename traits_base::key_const_reference key_const_reference;
-      typedef typename traits_base::mapped_type mapped_type;
-      typedef typename traits_base::mapped_pointer mapped_pointer;
-      typedef typename traits_base::mapped_const_pointer mapped_const_pointer;
-      typedef typename traits_base::mapped_reference mapped_reference;
-      typedef typename traits_base::mapped_const_reference mapped_const_reference;
-      typedef typename traits_base::value_type 	value_type;
-      typedef typename traits_base::pointer 	pointer;
-      typedef typename traits_base::const_pointer const_pointer;
-      typedef typename traits_base::reference 	reference;
-      typedef typename traits_base::const_reference const_reference;
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      typedef point_iterator_ 			point_iterator;
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-      typedef point_const_iterator_ 		point_iterator;
-#endif
-
-      typedef point_const_iterator_ 		point_const_iterator;
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      typedef iterator_ 			iterator;
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-      typedef const_iterator_ 			iterator;
-#endif
-
-      typedef const_iterator_ 			const_iterator;
-
-      PB_DS_CC_HASH_NAME();
-
-      PB_DS_CC_HASH_NAME(const Hash_Fn&);
-
-      PB_DS_CC_HASH_NAME(const Hash_Fn&, const Eq_Fn&);
-
-      PB_DS_CC_HASH_NAME(const Hash_Fn&, const Eq_Fn&, const Comb_Hash_Fn&);
-
-      PB_DS_CC_HASH_NAME(const Hash_Fn&, const Eq_Fn&, const Comb_Hash_Fn&,
-		       const Resize_Policy&);
-
-      PB_DS_CC_HASH_NAME(const PB_DS_CLASS_C_DEC&);
-
-      virtual
-      ~PB_DS_CC_HASH_NAME();
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      template<typename It>
-      void
-      copy_from_range(It, It);
-
-      void
-      initialize();
-
-      inline size_type
-      size() const;
-
-      inline size_type
-      max_size() const;
-
-      /// True if size() == 0.
-      inline bool
-      empty() const;
-
-      /// Return current hash_fn.
-      Hash_Fn&
-      get_hash_fn();
-
-      /// Return current const hash_fn.
-      const Hash_Fn&
-      get_hash_fn() const;
-
-      /// Return current eq_fn.
-      Eq_Fn&
-      get_eq_fn();
-
-      /// Return current const eq_fn.
-      const Eq_Fn&
-      get_eq_fn() const;
-
-      /// Return current comb_hash_fn.
-      Comb_Hash_Fn&
-      get_comb_hash_fn();
-
-      /// Return current const comb_hash_fn.
-      const Comb_Hash_Fn&
-      get_comb_hash_fn() const;
-
-      /// Return current resize_policy.
-      Resize_Policy&
-      get_resize_policy();
-
-      /// Return current const resize_policy.
-      const Resize_Policy&
-      get_resize_policy() const;
-
-      inline std::pair<point_iterator, bool>
-      insert(const_reference r_val)
-      { return insert_imp(r_val, traits_base::m_store_extra_indicator); }
-
-      inline mapped_reference
-      operator[](key_const_reference r_key)
-      {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-	return (subscript_imp(r_key, traits_base::m_store_extra_indicator));
-#else
-	insert(r_key);
-	return traits_base::s_null_type;
-#endif
-      }
-
-      inline point_iterator
-      find(key_const_reference);
-
-      inline point_const_iterator
-      find(key_const_reference) const;
-
-      inline point_iterator
-      find_end();
-
-      inline point_const_iterator
-      find_end() const;
-
-      inline bool
-      erase(key_const_reference);
-
-      template<typename Pred>
-      inline size_type
-      erase_if(Pred);
-
-      void
-      clear();
-
-      inline iterator
-      begin();
-
-      inline const_iterator
-      begin() const;
-
-      inline iterator
-      end();
-
-      inline const_iterator
-      end() const;
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-#endif
-
-#ifdef PB_DS_HT_MAP_TRACE_
-      void
-      trace() const;
-#endif
-
-    private:
-      void
-      deallocate_all();
-
-      inline bool
-      do_resize_if_needed();
-
-      inline void
-      do_resize_if_needed_no_throw();
-
-      void
-      resize_imp(size_type);
-
-      void
-      do_resize(size_type);
-
-      void
-      resize_imp_no_exceptions(size_type, entry_pointer_array, size_type);
-
-      inline entry_pointer
-      resize_imp_no_exceptions_reassign_pointer(entry_pointer,
-						entry_pointer_array,
-						false_type);
-
-      inline entry_pointer
-      resize_imp_no_exceptions_reassign_pointer(entry_pointer,
-						entry_pointer_array,
-						true_type);
-
-      void
-      deallocate_links_in_list(entry_pointer);
-
-      inline entry_pointer
-      get_entry(const_reference, false_type);
-
-      inline entry_pointer
-      get_entry(const_reference, true_type);
-
-      inline void
-      rels_entry(entry_pointer);
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      inline mapped_reference
-      subscript_imp(key_const_reference r_key, false_type)
-      {
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	const size_type pos = ranged_hash_fn_base::operator()(r_key);
-	entry_pointer p_e = m_entries[pos];
-	resize_base::notify_insert_search_start();
-
-	while (p_e != 0
-	       && !hash_eq_fn_base::operator()(p_e->m_value.first, r_key))
-	  {
-	    resize_base::notify_insert_search_collision();
-	    p_e = p_e->m_p_next;
-	  }
-
-	resize_base::notify_insert_search_end();
-	if (p_e != 0)
-	  {
-	    PB_DS_CHECK_KEY_EXISTS(r_key)
-	    return (p_e->m_value.second);
-	  }
-
-	PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	return insert_new_imp(value_type(r_key, mapped_type()), pos)->second;
-      }
-
-      inline mapped_reference
-      subscript_imp(key_const_reference r_key, true_type)
-      {
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	comp_hash pos_hash_pair = ranged_hash_fn_base::operator()(r_key);
-	entry_pointer p_e = m_entries[pos_hash_pair.first];
-	resize_base::notify_insert_search_start();
-	while (p_e != 0 &&
-	       !hash_eq_fn_base::operator()(p_e->m_value.first, p_e->m_hash,
-					    r_key, pos_hash_pair.second))
-	  {
-	    resize_base::notify_insert_search_collision();
-	    p_e = p_e->m_p_next;
-	  }
-
-	resize_base::notify_insert_search_end();
-	if (p_e != 0)
-	  {
-	    PB_DS_CHECK_KEY_EXISTS(r_key)
-	    return p_e->m_value.second;
-	  }
-
-	PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	return insert_new_imp(value_type(r_key, mapped_type()),
-			      pos_hash_pair)->second;
-      }
-#endif
-
-      inline std::pair<point_iterator, bool>
-      insert_imp(const_reference, false_type);
-
-      inline std::pair<point_iterator, bool>
-      insert_imp(const_reference, true_type);
-
-      inline pointer
-      insert_new_imp(const_reference r_val, size_type pos)
-      {
-	if (do_resize_if_needed())
-	  pos = ranged_hash_fn_base::operator()(PB_DS_V2F(r_val));
-
-	// Following lines might throw an exception.
-	entry_pointer p_e = get_entry(r_val,
-				      traits_base::m_no_throw_copies_indicator);
-
-	// At this point no exceptions can be thrown.
-	p_e->m_p_next = m_entries[pos];
-	m_entries[pos] = p_e;
-	resize_base::notify_inserted(++m_num_used_e);
-
-	_GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(r_val));)
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	return &p_e->m_value;
-      }
-
-      inline pointer
-      insert_new_imp(const_reference r_val, comp_hash& r_pos_hash_pair)
-      {
-	// Following lines might throw an exception.
-	if (do_resize_if_needed())
-	  r_pos_hash_pair = ranged_hash_fn_base::operator()(PB_DS_V2F(r_val));
-
-	entry_pointer p_e = get_entry(r_val,
-				      traits_base::m_no_throw_copies_indicator);
-
-	// At this point no exceptions can be thrown.
-	p_e->m_hash = r_pos_hash_pair.second;
-	p_e->m_p_next = m_entries[r_pos_hash_pair.first];
-	m_entries[r_pos_hash_pair.first] = p_e;
-	resize_base::notify_inserted(++m_num_used_e);
-	_GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(r_val));)
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	return &p_e->m_value;
-      }
-
-      inline pointer
-      find_key_pointer(key_const_reference r_key, false_type)
-      {
-	entry_pointer p_e = m_entries[ranged_hash_fn_base::operator()(r_key)];
-	resize_base::notify_find_search_start();
-	while (p_e != 0 &&
-	       !hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), r_key))
-	  {
-	    resize_base::notify_find_search_collision();
-	    p_e = p_e->m_p_next;
-	  }
-
-	resize_base::notify_find_search_end();
-
-#ifdef _GLIBCXX_DEBUG
-	if (p_e == 0)
-	  PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	else
-	  PB_DS_CHECK_KEY_EXISTS(r_key)
-#endif
-	return &p_e->m_value;
-      }
-
-      inline pointer
-      find_key_pointer(key_const_reference r_key, true_type)
-      {
-	comp_hash pos_hash_pair = ranged_hash_fn_base::operator()(r_key);
-	entry_pointer p_e = m_entries[pos_hash_pair.first];
-	resize_base::notify_find_search_start();
-	while (p_e != 0 &&
-	       !hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value),
-					    p_e->m_hash,
-					    r_key, pos_hash_pair.second))
-	  {
-	    resize_base::notify_find_search_collision();
-	    p_e = p_e->m_p_next;
-	  }
-
-	resize_base::notify_find_search_end();
-
-#ifdef _GLIBCXX_DEBUG
-	if (p_e == 0)
-	  PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	else
-	  PB_DS_CHECK_KEY_EXISTS(r_key)
-#endif
-	return &p_e->m_value;
-      }
-
-      inline bool
-      erase_in_pos_imp(key_const_reference, size_type);
-
-      inline bool
-      erase_in_pos_imp(key_const_reference, const comp_hash&);
-
-      inline void
-      erase_entry_pointer(entry_pointer&);
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      void
-      inc_it_state(pointer& r_p_value,
-		   std::pair<entry_pointer, size_type>& r_pos) const
-      {
-	inc_it_state((mapped_const_pointer& )r_p_value, r_pos);
-      }
-#endif
-
-      void
-      inc_it_state(const_pointer& r_p_value,
-		   std::pair<entry_pointer, size_type>& r_pos) const
-      {
-	_GLIBCXX_DEBUG_ASSERT(r_p_value != 0);
-	r_pos.first = r_pos.first->m_p_next;
-	if (r_pos.first != 0)
-	  {
-	    r_p_value = &r_pos.first->m_value;
-	    return;
-	  }
-
-	for (++r_pos.second; r_pos.second < m_num_e; ++r_pos.second)
-	  if (m_entries[r_pos.second] != 0)
-	    {
-	      r_pos.first = m_entries[r_pos.second];
-	      r_p_value = &r_pos.first->m_value;
-	      return;
-	    }
-	r_p_value = 0;
-      }
-
-      void
-      get_start_it_state(pointer& r_p_value,
-			 std::pair<entry_pointer, size_type>& r_pos) const
-      {
-	for (r_pos.second = 0; r_pos.second < m_num_e; ++r_pos.second)
-	  if (m_entries[r_pos.second] != 0)
-	    {
-	      r_pos.first = m_entries[r_pos.second];
-	      r_p_value = &r_pos.first->m_value;
-	      return;
-	    }
-	r_p_value = 0;
-      }
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_entry_pointer_array_valid(const entry_pointer_array,
-				       const char*, int) const;
-
-      void
-      assert_entry_pointer_valid(const entry_pointer, true_type,
-				 const char*, int) const;
-
-      void
-      assert_entry_pointer_valid(const entry_pointer, false_type,
-				 const char*, int) const;
-#endif
-
-#ifdef PB_DS_HT_MAP_TRACE_
-      void
-      trace_list(const_entry_pointer) const;
-#endif
-
-    private:
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      friend class iterator_;
-#endif
-
-      friend class const_iterator_;
-
-      static entry_allocator 		s_entry_allocator;
-      static entry_pointer_allocator 	s_entry_pointer_allocator;
-      static iterator 			s_end_it;
-      static const_iterator 		s_const_end_it;
-      static point_iterator 		s_find_end_it;
-      static point_const_iterator 	s_const_find_end_it;
-
-      size_type 			m_num_e;
-      size_type 			m_num_used_e;
-      entry_pointer_array 		m_entries;
-
-      enum
-	{
-	  store_hash_ok = !Store_Hash
-			  || !is_same<Hash_Fn, __gnu_pbds::null_type>::value
-	};
-
-      PB_DS_STATIC_ASSERT(sth, store_hash_ok);
-    };
-
-#include <ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_HASH_EQ_FN_C_DEC
-#undef PB_DS_RANGED_HASH_FN_C_DEC
-#undef PB_DS_CC_HASH_TRAITS_BASE
-#undef PB_DS_DEBUG_MAP_BASE_C_DEC
-#undef PB_DS_CC_HASH_NAME
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
deleted file mode 100644
index 6cc4aaf..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/cmp_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s entire container comparison related
- *    functions.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename Other_HT_Map_Type>
-bool
-PB_DS_CLASS_C_DEC::
-operator==(const Other_HT_Map_Type& other) const
-{ return cmp_with_other(other); }
-
-PB_DS_CLASS_T_DEC
-template<typename Other_Map_Type>
-bool
-PB_DS_CLASS_C_DEC::
-cmp_with_other(const Other_Map_Type& other) const
-{
-  if (size() != other.size())
-    return false;
-
-  for (typename Other_Map_Type::const_iterator it = other.begin();
-       it != other.end(); ++it)
-    {
-      key_const_reference r_key = key_const_reference(PB_DS_V2F(*it));
-
-      mapped_const_pointer p_mapped_value =
-	const_cast<PB_DS_CLASS_C_DEC& >(*this).
-	find_key_pointer(r_key, traits_base::m_store_extra_indicator);
-
-      if (p_mapped_value == 0)
-	return false;
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      if (p_mapped_value->second != it->second)
-	return false;
-#endif
-    }
-  return true;
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Other_HT_Map_Type>
-bool
-PB_DS_CLASS_C_DEC::
-operator!=(const Other_HT_Map_Type& other) const
-{ return !operator==(other); }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
deleted file mode 100644
index 5b8b804..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
- * Contains a conditional key destructor, used for exception handling.
- */
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Conditional dey destructor, cc_hash.
-    template<typename HT_Map>
-    class cond_dealtor
-    {
-    public:
-      typedef typename HT_Map::entry 		entry;
-      typedef typename HT_Map::entry_allocator 	entry_allocator;
-      typedef typename HT_Map::key_type 	key_type;
-
-      cond_dealtor(entry_allocator* p_a, entry* p_e)
-      : m_p_a(p_a), m_p_e(p_e), m_key_destruct(false),
-	m_no_action_destructor(false)
-      { }
-
-      inline
-      ~cond_dealtor();
-
-      void
-      set_key_destruct()
-      { m_key_destruct = true; }
-
-      void
-      set_no_action_destructor()
-      { m_no_action_destructor = true; }
-
-    protected:
-      entry_allocator* const 			m_p_a;
-      entry* const 				m_p_e;
-
-      bool 					m_key_destruct;
-      bool 					m_no_action_destructor;
-    };
-
-    template<typename HT_Map>
-    inline
-    cond_dealtor<HT_Map>::
-    ~cond_dealtor()
-    {
-      if (m_no_action_destructor)
-	return;
-      if (m_key_destruct)
-	m_p_e->m_value.first.~key_type();
-      m_p_a->deallocate(m_p_e, 1);
-    }
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
deleted file mode 100644
index 74a8f21..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/constructor_destructor_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s constructors, destructor,
- * and related functions.
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::entry_allocator
-PB_DS_CLASS_C_DEC::s_entry_allocator;
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::entry_pointer_allocator
-PB_DS_CLASS_C_DEC::s_entry_pointer_allocator;
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-  while (first_it != last_it)
-    insert(*(first_it++));
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_CC_HASH_NAME() :
-  ranged_hash_fn_base(resize_base::get_nearest_larger_size(1)),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_pointer_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_CC_HASH_NAME(const Hash_Fn& r_hash_fn) :
-  ranged_hash_fn_base(resize_base::get_nearest_larger_size(1), r_hash_fn),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_pointer_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_CC_HASH_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn) :
-  PB_DS_HASH_EQ_FN_C_DEC(r_eq_fn),
-  ranged_hash_fn_base(resize_base::get_nearest_larger_size(1), r_hash_fn),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_pointer_allocator.allocate(m_num_e))
-{
-  std::fill(m_entries, m_entries + m_num_e, (entry_pointer)0);
-  Resize_Policy::notify_cleared();
-  ranged_hash_fn_base::notify_resized(m_num_e);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_CC_HASH_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn, 
-		   const Comb_Hash_Fn& r_comb_hash_fn) :
-  PB_DS_HASH_EQ_FN_C_DEC(r_eq_fn),
-  ranged_hash_fn_base(resize_base::get_nearest_larger_size(1),
-		      r_hash_fn, r_comb_hash_fn),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_pointer_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_CC_HASH_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn, 
-		   const Comb_Hash_Fn& r_comb_hash_fn, 
-		   const Resize_Policy& r_resize_policy) :
-  PB_DS_HASH_EQ_FN_C_DEC(r_eq_fn),
-  Resize_Policy(r_resize_policy),
-  ranged_hash_fn_base(resize_base::get_nearest_larger_size(1),
-		      r_hash_fn, r_comb_hash_fn),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_pointer_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_CC_HASH_NAME(const PB_DS_CLASS_C_DEC& other) :
-  PB_DS_HASH_EQ_FN_C_DEC(other),
-  resize_base(other), ranged_hash_fn_base(other),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_pointer_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-    __try
-      {
-	copy_from_range(other.begin(), other.end());
-      }
-    __catch(...)
-      {
-	deallocate_all();
-	__throw_exception_again;
-      }
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~PB_DS_CC_HASH_NAME()
-{ deallocate_all(); }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  std::swap(m_entries, other.m_entries);
-  std::swap(m_num_e, other.m_num_e);
-  std::swap(m_num_used_e, other.m_num_used_e);
-  ranged_hash_fn_base::swap(other);
-  hash_eq_fn_base::swap(other);
-  resize_base::swap(other);
-
-  _GLIBCXX_DEBUG_ONLY(debug_base::swap(other));
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-deallocate_all()
-{
-  clear();
-  s_entry_pointer_allocator.deallocate(m_entries, m_num_e);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-initialize()
-{
-  std::fill(m_entries, m_entries + m_num_e, entry_pointer(0));
-  Resize_Policy::notify_resized(m_num_e);
-  Resize_Policy::notify_cleared();
-  ranged_hash_fn_base::notify_resized(m_num_e);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
deleted file mode 100644
index 77f9b51..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s constructors, destructor,
- *    and related functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-constructor_insert_new_imp(mapped_const_reference r_val, size_type pos, 
-			   false_type)
-{
-  // Following lines might throw an exception.
-  entry_pointer p = get_entry(r_val, traits_base::s_no_throw_copies_indicator);
-
-  // At this point no exceptions can be thrown.
-  p->m_p_next = m_entries[pos];
-  m_entries[pos] = p;
-  _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(r_key);)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
deleted file mode 100644
index babec1a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s constructors, destructor,
- * and related functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-constructor_insert_new_imp(const_reference r_val, size_type pos, true_type)
-{
-  // Following lines might throw an exception.
-  entry_pointer p = get_entry(r_val, traits_base::s_no_throw_copies_indicator);
-
-  // At this point no exceptions can be thrown.
-  p->m_p_next = m_entries[pos];
-  p->m_hash = ranged_hash_fn_base::operator()((key_const_reference)(PB_DS_V2F(p->m_value))).second;
-
-  m_entries[pos] = p;
-  _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(r_key);)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
deleted file mode 100644
index 7ccbfbe..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/debug_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s debug-mode functions.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  debug_base::check_size(m_num_used_e, __file, __line);
-  assert_entry_pointer_array_valid(m_entries, __file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_entry_pointer_array_valid(const entry_pointer_array a_p_entries,
-				 const char* __file, int __line) const
-{
-  size_type iterated_num_used_e = 0;
-  for (size_type pos = 0; pos < m_num_e; ++pos)
-    {
-      entry_pointer p_e = a_p_entries[pos];
-      while (p_e != 0)
-        {
-	  ++iterated_num_used_e;
-	  assert_entry_pointer_valid(p_e, traits_base::m_store_extra_indicator,
-				     __file, __line);
-	  p_e = p_e->m_p_next;
-        }
-    }
-  PB_DS_DEBUG_VERIFY(iterated_num_used_e == m_num_used_e);
-}
-
-#include <ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp>
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
deleted file mode 100644
index 3b1e5b8..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s debug-mode functions.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_entry_pointer_valid(const entry_pointer p, false_type,
-			   const char* __file, int __line) const
-{ debug_base::check_key_exists(PB_DS_V2F(p->m_value), __file, __line); }
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
deleted file mode 100644
index 875fed0..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/debug_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s debug-mode functions.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_entry_pointer_valid(const entry_pointer p_e, true_type,
-			   const char* __file, int __line) const
-{
-  debug_base::check_key_exists(PB_DS_V2F(p_e->m_value), __file, __line);
-  comp_hash pos_hash_pair = ranged_hash_fn_base::operator()(PB_DS_V2F(p_e->m_value));
-  PB_DS_DEBUG_VERIFY(p_e->m_hash == pos_hash_pair.second);
-}
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
deleted file mode 100644
index 44acfce..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/entry_list_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s entry-list related functions.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-deallocate_links_in_list(entry_pointer p_e)
-{
-  while (p_e != 0)
-    {
-      entry_pointer p_dealloc_e = p_e;
-      p_e = p_e->m_p_next;
-      s_entry_allocator.deallocate(p_dealloc_e, 1);
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::entry_pointer
-PB_DS_CLASS_C_DEC::
-get_entry(const_reference r_val, true_type)
-{
-  // Following line might throw an exception.
-  entry_pointer p_e = s_entry_allocator.allocate(1);
-
-  // Following lines* cannot* throw an exception.
-  new (&p_e->m_value) value_type(r_val);
-  return p_e;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::entry_pointer
-PB_DS_CLASS_C_DEC::
-get_entry(const_reference r_val, false_type)
-{
-  // Following line might throw an exception.
-  entry_pointer p_e = s_entry_allocator.allocate(1);
-  cond_dealtor_t cond(p_e);
-
-  // Following lines might throw an exception.
-  new (&p_e->m_value) value_type(r_val);
-  cond.set_no_action();
-  return p_e;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-rels_entry(entry_pointer p_e)
-{
-  // The following lines cannot throw exceptions (unless if key-data dtors do).
-  p_e->m_value.~value_type();
-  s_entry_allocator.deallocate(p_e, 1);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
deleted file mode 100644
index cbfe9c4..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/erase_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s erase related functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-erase_entry_pointer(entry_pointer& r_p_e)
-{
-  _GLIBCXX_DEBUG_ONLY(debug_base::erase_existing(PB_DS_V2F(r_p_e->m_value)));
-
-  entry_pointer p_e = r_p_e;
-  r_p_e = r_p_e->m_p_next;
-  rels_entry(p_e);
-  _GLIBCXX_DEBUG_ASSERT(m_num_used_e > 0);
-  resize_base::notify_erased(--m_num_used_e);
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  size_type num_ersd = 0;
-  for (size_type pos = 0; pos < m_num_e; ++pos)
-    {
-      while (m_entries[pos] != 0 && pred(m_entries[pos]->m_value))
-        {
-	  ++num_ersd;
-	  entry_pointer p_next_e = m_entries[pos]->m_p_next;
-	  erase_entry_pointer(m_entries[pos]);
-	  m_entries[pos] = p_next_e;
-        }
-
-      entry_pointer p_e = m_entries[pos];
-      while (p_e != 0 && p_e->m_p_next != 0)
-        {
-	  if (pred(p_e->m_p_next->m_value))
-            {
-	      ++num_ersd;
-	      erase_entry_pointer(p_e->m_p_next);
-            }
-	  else
-	    p_e = p_e->m_p_next;
-        }
-    }
-
-  do_resize_if_needed_no_throw();
-  return num_ersd;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  for (size_type pos = 0; pos < m_num_e; ++pos)
-    while (m_entries[pos] != 0)
-      erase_entry_pointer(m_entries[pos]);
-  do_resize_if_needed_no_throw();
-  resize_base::notify_cleared();
-}
-
-#include <ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp>
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
deleted file mode 100644
index 2caf0c5..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s erase related functions,
- * when the hash value is not stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-erase(key_const_reference r_key)
-{
-  PB_DS_ASSERT_VALID((*this))
-  return erase_in_pos_imp(r_key, ranged_hash_fn_base::operator()(r_key));
-}
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-erase_in_pos_imp(key_const_reference r_key, size_type pos)
-{
-  PB_DS_ASSERT_VALID((*this))
-  entry_pointer p_e = m_entries[pos];
-  resize_base::notify_erase_search_start();
-  if (p_e == 0)
-    {
-      resize_base::notify_erase_search_end();
-      PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-      PB_DS_ASSERT_VALID((*this))
-      return false;
-    }
-
-  if (hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), r_key))
-    {
-      resize_base::notify_erase_search_end();
-      PB_DS_CHECK_KEY_EXISTS(r_key)
-      erase_entry_pointer(m_entries[pos]);
-      do_resize_if_needed_no_throw();
-      PB_DS_ASSERT_VALID((*this))
-      return true;
-    }
-
-  while (true)
-    {
-      entry_pointer p_next_e = p_e->m_p_next;
-      if (p_next_e == 0)
-	{
-	  resize_base::notify_erase_search_end();
-	  PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	  PB_DS_ASSERT_VALID((*this))
-	  return false;
-	}
-
-      if (hash_eq_fn_base::operator()(PB_DS_V2F(p_next_e->m_value), r_key))
-	{
-	  resize_base::notify_erase_search_end();
-	  PB_DS_CHECK_KEY_EXISTS(r_key)
-	  erase_entry_pointer(p_e->m_p_next);
-	  do_resize_if_needed_no_throw();
-	  PB_DS_ASSERT_VALID((*this))
-	  return true;
-	}
-      resize_base::notify_erase_search_collision();
-      p_e = p_next_e;
-    }
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
deleted file mode 100644
index 92a3903..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/erase_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s erase related functions,
- * when the hash value is stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-erase_in_pos_imp(key_const_reference r_key, const comp_hash& r_pos_hash_pair)
-{
-  PB_DS_ASSERT_VALID((*this))
-  entry_pointer p_e = m_entries[r_pos_hash_pair.first];
-  resize_base::notify_erase_search_start();
-  if (p_e == 0)
-    {
-      resize_base::notify_erase_search_end();
-      PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-      PB_DS_ASSERT_VALID((*this))
-      return false;
-    }
-
-  if (hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), p_e->m_hash,
-				  r_key, r_pos_hash_pair.second))
-    {
-      resize_base::notify_erase_search_end();
-      PB_DS_CHECK_KEY_EXISTS(r_key)
-      erase_entry_pointer(m_entries[r_pos_hash_pair.first]);
-      do_resize_if_needed_no_throw();
-      PB_DS_ASSERT_VALID((*this))
-      return true;
-    }
-
-  while (true)
-    {
-      entry_pointer p_next_e = p_e->m_p_next;
-      if (p_next_e == 0)
-	{
-	  resize_base::notify_erase_search_end();
-	  PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	  PB_DS_ASSERT_VALID((*this))
-	  return false;
-	}
-
-      if (hash_eq_fn_base::operator()(PB_DS_V2F(p_next_e->m_value),
-				      p_next_e->m_hash, r_key,
-				      r_pos_hash_pair.second))
-	{
-	  resize_base::notify_erase_search_end();
-	  PB_DS_CHECK_KEY_EXISTS(r_key)
-	  erase_entry_pointer(p_e->m_p_next);
-	  do_resize_if_needed_no_throw();
-	  PB_DS_ASSERT_VALID((*this))
-	  return true;
-	}
-      resize_base::notify_erase_search_collision();
-      p_e = p_next_e;
-    }
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
deleted file mode 100644
index f82bf54..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/find_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s find related functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-find(key_const_reference r_key)
-{
-  PB_DS_ASSERT_VALID((*this))
-  return find_key_pointer(r_key, traits_base::m_store_extra_indicator);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-find(key_const_reference r_key) const
-{
-  PB_DS_ASSERT_VALID((*this))
-  return const_cast<PB_DS_CLASS_C_DEC& >(*this).find_key_pointer(r_key, 
-					traits_base::m_store_extra_indicator);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-find_end()
-{ return 0; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-find_end() const
-{ return 0; }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
deleted file mode 100644
index 0479267..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/find_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s find related functions,
- * when the hash value is stored.
- */
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
deleted file mode 100644
index f7a4888..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/info_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s entire container info related
- * functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size() const
-{ return m_num_used_e; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-max_size() const
-{ return m_entry_allocator.max_size(); }
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-empty() const
-{ return (size() == 0); }
-
-PB_DS_CLASS_T_DEC
-template<typename Other_HT_Map_Type>
-bool
-PB_DS_CLASS_C_DEC::
-operator==(const Other_HT_Map_Type& other) const
-{ return cmp_with_other(other); }
-
-PB_DS_CLASS_T_DEC
-template<typename Other_Map_Type>
-bool
-PB_DS_CLASS_C_DEC::
-cmp_with_other(const Other_Map_Type& other) const
-{
-  if (size() != other.size())
-    return false;
-
-  for (typename Other_Map_Type::const_iterator it = other.begin();
-       it != other.end(); ++it)
-    {
-      key_const_reference r_key =(key_const_reference)PB_DS_V2F(*it);
-      mapped_const_pointer p_mapped_value =
-	const_cast<PB_DS_CLASS_C_DEC& >(*this).
-	find_key_pointer(r_key, traits_base::m_store_extra_indicator);
-
-      if (p_mapped_value == 0)
-	return false;
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      if (p_mapped_value->second != it->second)
-	return false;
-#endif 
-    }
-  return true;
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Other_HT_Map_Type>
-bool
-PB_DS_CLASS_C_DEC::
-operator!=(const Other_HT_Map_Type& other) const
-{ return !operator==(other); }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
deleted file mode 100644
index 4eba5a8..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/insert_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s insert related functions.
- */
-
-#include <ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp>
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
deleted file mode 100644
index 33b4fa7..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s insert related functions,
- * when the hash value is not stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline std::pair<typename PB_DS_CLASS_C_DEC::point_iterator, bool>
-PB_DS_CLASS_C_DEC::
-insert_imp(const_reference r_val, false_type)
-{
-  PB_DS_ASSERT_VALID((*this))
-  key_const_reference r_key = PB_DS_V2F(r_val);
-  const size_type pos = ranged_hash_fn_base::operator()(r_key);
-  entry_pointer p_e = m_entries[pos];
-  resize_base::notify_insert_search_start();
-
-  while (p_e != 0 && !hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), 
-						     r_key))
-    {
-      resize_base::notify_insert_search_collision();
-      p_e = p_e->m_p_next;
-    }
-
-  resize_base::notify_insert_search_end();
-  if (p_e != 0)
-    {
-      PB_DS_CHECK_KEY_EXISTS(r_key)
-      return std::make_pair(&p_e->m_value, false);
-    }
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-  return std::make_pair(insert_new_imp(r_val, pos), true);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
deleted file mode 100644
index 713135c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/insert_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s insert related functions,
- * when the hash value is stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline std::pair<typename PB_DS_CLASS_C_DEC::point_iterator, bool>
-PB_DS_CLASS_C_DEC::
-insert_imp(const_reference r_val, true_type)
-{
-  PB_DS_ASSERT_VALID((*this))
-  key_const_reference key = PB_DS_V2F(r_val);
-  comp_hash pos_hash_pair = ranged_hash_fn_base::operator()(key);
-  entry_pointer p_e = m_entries[pos_hash_pair.first];
-  resize_base::notify_insert_search_start();
-
-  while (p_e != 0 && !hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value),
-						     p_e->m_hash,
-						    key, pos_hash_pair.second))
-    {
-      resize_base::notify_insert_search_collision();
-      p_e = p_e->m_p_next;
-    }
-
-  resize_base::notify_insert_search_end();
-  if (p_e != 0)
-    {
-      PB_DS_CHECK_KEY_EXISTS(key)
-      return std::make_pair(&p_e->m_value, false);
-    }
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(key)
-  return std::make_pair(insert_new_imp(r_val, pos_hash_pair), true);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
deleted file mode 100644
index b4c7878..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/iterators_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s iterators related functions, e.g.,
- * begin().
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::s_end_it;
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::s_const_end_it;
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-begin()
-{
-  pointer p_value;
-  std::pair<entry_pointer, size_type> pos;
-  get_start_it_state(p_value, pos);
-  return iterator(p_value, pos, this);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-end()
-{ return s_end_it; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-begin() const
-{
-  pointer p_value;
-  std::pair<entry_pointer, size_type> pos;
-  get_start_it_state(p_value, pos);
-  return const_iterator(p_value, pos, this);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-end() const
-{ return s_const_end_it; }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
deleted file mode 100644
index adf1738..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/policy_access_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s policy access
- *    functions.
- */
-
-PB_DS_CLASS_T_DEC
-Hash_Fn& 
-PB_DS_CLASS_C_DEC::
-get_hash_fn()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Hash_Fn& 
-PB_DS_CLASS_C_DEC::
-get_hash_fn() const
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-Eq_Fn& 
-PB_DS_CLASS_C_DEC::
-get_eq_fn()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Eq_Fn& 
-PB_DS_CLASS_C_DEC::
-get_eq_fn() const
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-Comb_Hash_Fn& 
-PB_DS_CLASS_C_DEC::
-get_comb_hash_fn()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Comb_Hash_Fn& 
-PB_DS_CLASS_C_DEC::
-get_comb_hash_fn() const
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-Resize_Policy& 
-PB_DS_CLASS_C_DEC::
-get_resize_policy()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Resize_Policy& 
-PB_DS_CLASS_C_DEC::
-get_resize_policy() const
-{ return *this; }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
deleted file mode 100644
index fffb67d..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/resize_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s resize related functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-do_resize_if_needed()
-{
-  if (!resize_base::is_resize_needed())
-    return false;
-  resize_imp(resize_base::get_new_size(m_num_e, m_num_used_e));
-  return true;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-do_resize(size_type len)
-{ resize_imp(resize_base::get_nearest_larger_size(len)); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-do_resize_if_needed_no_throw()
-{
-  if (!resize_base::is_resize_needed())
-    return;
-
-  __try
-    {
-      resize_imp(resize_base::get_new_size(m_num_e, m_num_used_e));
-    }
-  __catch(...)
-    { }
-
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-resize_imp(size_type new_size)
-{
-  PB_DS_ASSERT_VALID((*this))
-  if (new_size == m_num_e)
-    return;
-
-  const size_type old_size = m_num_e;
-  entry_pointer_array a_p_entries_resized;
-
-  // Following line might throw an exception.
-  ranged_hash_fn_base::notify_resized(new_size);
-
-  __try
-    {
-      // Following line might throw an exception.
-      a_p_entries_resized = s_entry_pointer_allocator.allocate(new_size);
-      m_num_e = new_size;
-    }
-  __catch(...)
-    {
-      ranged_hash_fn_base::notify_resized(old_size);
-      __throw_exception_again;
-    }
-
-  // At this point no exceptions can be thrown.
-  resize_imp_no_exceptions(new_size, a_p_entries_resized, old_size);
-  Resize_Policy::notify_resized(new_size);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-resize_imp_no_exceptions(size_type new_size, entry_pointer_array a_p_entries_resized, size_type old_size)
-{
-  std::fill(a_p_entries_resized, a_p_entries_resized + m_num_e,
-	    entry_pointer(0));
-
-  for (size_type pos = 0; pos < old_size; ++pos)
-    {
-      entry_pointer p_e = m_entries[pos];
-      while (p_e != 0)
-	p_e = resize_imp_no_exceptions_reassign_pointer(p_e, a_p_entries_resized,  traits_base::m_store_extra_indicator);
-    }
-
-  m_num_e = new_size;
-  _GLIBCXX_DEBUG_ONLY(assert_entry_pointer_array_valid(a_p_entries_resized,
-						       __FILE__, __LINE__);)
-  s_entry_pointer_allocator.deallocate(m_entries, old_size);
-  m_entries = a_p_entries_resized;
-  PB_DS_ASSERT_VALID((*this))
-}
-
-#include <ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp>
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
deleted file mode 100644
index 897464b..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s resize related functions, when the
- * hash value is not stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::entry_pointer
-PB_DS_CLASS_C_DEC::
-resize_imp_no_exceptions_reassign_pointer(entry_pointer p_e, entry_pointer_array a_p_entries_resized, false_type)
-{
-  const size_type hash_pos =
-    ranged_hash_fn_base::operator()(PB_DS_V2F(p_e->m_value));
-
-  entry_pointer const p_next_e = p_e->m_p_next;
-  p_e->m_p_next = a_p_entries_resized[hash_pos];
-  a_p_entries_resized[hash_pos] = p_e;
-  return p_next_e;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
deleted file mode 100644
index c252d49..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/resize_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s resize related functions, when the
- * hash value is stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::entry_pointer
-PB_DS_CLASS_C_DEC::
-resize_imp_no_exceptions_reassign_pointer(entry_pointer p_e, entry_pointer_array a_p_entries_resized, true_type)
-{
-  const comp_hash pos_hash_pair =
-    ranged_hash_fn_base::operator()(PB_DS_V2F(p_e->m_value), p_e->m_hash);
-
-  entry_pointer const p_next_e = p_e->m_p_next;
-  p_e->m_p_next = a_p_entries_resized[pos_hash_pair.first];
-  a_p_entries_resized[pos_hash_pair.first] = p_e;
-  return p_next_e;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
deleted file mode 100644
index cd2eeb6..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/size_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s entire container size related
- * functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size() const
-{ return m_num_used_e; }
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-empty() const
-{ return (size() == 0); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-max_size() const
-{ return s_entry_allocator.max_size(); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
deleted file mode 100644
index a61c8a2..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_table_map_/trace_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s trace-mode functions.
- */
-
-#ifdef PB_DS_HT_MAP_TRACE_
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace() const
-{
-  std::cerr << static_cast<unsigned long>(m_num_e) << " " 
-	    << static_cast<unsigned long>(m_num_used_e) << std::endl;
-
-  for (size_type i = 0; i < m_num_e; ++i)
-    {
-      std::cerr << static_cast<unsigned long>(i) << " ";
-      trace_list(m_entries[i]);
-      std::cerr << std::endl;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace_list(const_entry_pointer p_l) const
-{
-  size_type iterated_num_used_e = 0;
-  while (p_l != 0)
-    {
-      std::cerr << PB_DS_V2F(p_l->m_value) << " ";
-      p_l = p_l->m_p_next;
-    }
-}
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/cond_dealtor.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/cond_dealtor.hpp
deleted file mode 100644
index 5db9784..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/cond_dealtor.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file detail/cond_dealtor.hpp
- * Contains a conditional deallocator.
- */
-
-#ifndef PB_DS_COND_DEALTOR_HPP
-#define PB_DS_COND_DEALTOR_HPP
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Conditional deallocate constructor argument.
-    template<typename Entry, typename _Alloc>
-      class cond_dealtor
-      {
-	typedef typename _Alloc::template rebind<Entry>	__rebind_e;
-
-      public:
-	typedef typename __rebind_e::other 		entry_allocator;
-	typedef typename entry_allocator::pointer 	entry_pointer;
-
-	cond_dealtor(entry_pointer p_e)
-	: m_p_e(p_e), m_no_action_destructor(false) { }
-
-	~cond_dealtor()
-	{
-	  if (m_no_action_destructor)
-	    return;
-	  s_alloc.deallocate(m_p_e, 1);
-	}
-
-	void
-	set_no_action()
-	{ m_no_action_destructor = true; }
-
-      private:
-	entry_pointer 		m_p_e;
-	bool 			m_no_action_destructor;
-	static entry_allocator 	s_alloc;
-      };
-
-    template<typename Entry, class _Alloc>
-      typename cond_dealtor<Entry, _Alloc>::entry_allocator
-      cond_dealtor<Entry, _Alloc>::s_alloc;
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_COND_DEALTOR_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/container_base_dispatch.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/container_base_dispatch.hpp
deleted file mode 100644
index dc7f9a7..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/container_base_dispatch.hpp
+++ /dev/null
@@ -1,352 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file container_base_dispatch.hpp
- * Contains associative container dispatching.
- */
-
-#ifndef PB_DS_ASSOC_CNTNR_BASE_DS_DISPATCHER_HPP
-#define PB_DS_ASSOC_CNTNR_BASE_DS_DISPATCHER_HPP
-
-#include <ext/typelist.h>
-
-#define PB_DS_ASSERT_VALID(X)						\
-  _GLIBCXX_DEBUG_ONLY(X.assert_valid(__FILE__, __LINE__);)
-
-#define PB_DS_DEBUG_VERIFY(_Cond)					\
-  _GLIBCXX_DEBUG_VERIFY_AT(_Cond,					\
-			   _M_message(#_Cond" assertion from %1;:%2;")	\
-			   ._M_string(__FILE__)._M_integer(__LINE__)	\
-			   ,__file,__line)
-
-#define PB_DS_CHECK_KEY_EXISTS(_Key)					\
-  _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(_Key, __FILE__, __LINE__);)
-
-#define PB_DS_CHECK_KEY_DOES_NOT_EXIST(_Key)				\
-  _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(_Key,	\
-							   __FILE__, __LINE__);)
-
-#define PB_DS_DATA_TRUE_INDICATOR
-#define PB_DS_V2F(X) (X).first
-#define PB_DS_V2S(X) (X).second
-#define PB_DS_EP2VP(X)& ((X)->m_value)
-#include <ext/pb_ds/detail/list_update_map_/lu_map_.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp>
-#include <ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp>
-#include <ext/pb_ds/detail/splay_tree_/splay_tree_.hpp>
-#include <ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp>
-#include <ext/pb_ds/detail/pat_trie_/pat_trie_.hpp>
-#undef PB_DS_DATA_TRUE_INDICATOR
-#undef PB_DS_V2F
-#undef PB_DS_V2S
-#undef PB_DS_EP2VP
-
-#define PB_DS_DATA_FALSE_INDICATOR
-#define PB_DS_V2F(X) (X)
-#define PB_DS_V2S(X) Mapped_Data()
-#define PB_DS_EP2VP(X)& ((X)->m_value.first)
-#include <ext/pb_ds/detail/list_update_map_/lu_map_.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp>
-#include <ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp>
-#include <ext/pb_ds/detail/splay_tree_/splay_tree_.hpp>
-#include <ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp>
-#include <ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp>
-#include <ext/pb_ds/detail/pat_trie_/pat_trie_.hpp>
-#undef PB_DS_DATA_FALSE_INDICATOR
-#undef PB_DS_V2F
-#undef PB_DS_V2S
-#undef PB_DS_EP2VP
-
-#undef PB_DS_CHECK_KEY_DOES_NOT_EXIST
-#undef PB_DS_CHECK_KEY_EXISTS
-#undef PB_DS_DEBUG_VERIFY
-#undef PB_DS_ASSERT_VALID
-
-namespace __gnu_pbds
-{
-namespace detail
-{
-  /// Specialization for list-update map.
-  template<typename Key, typename Mapped, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, Mapped, _Alloc, list_update_tag,
-				   Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-
-    public:
-      /// Dispatched type.
-      typedef lu_map<Key, Mapped, at0t, _Alloc, at1t>	type;
-    };
-
-  /// Specialization for list-update set.
-  template<typename Key, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, null_type, _Alloc, list_update_tag,
-				   Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-
-    public:
-      /// Dispatched type.
-      typedef lu_set<Key, null_type, at0t, _Alloc, at1t> type;
-    };
-
-  /// Specialization for PATRICIA trie map.
-  template<typename Key, typename Mapped, typename _Alloc, typename Policy_Tl>
-  struct container_base_dispatch<Key, Mapped, _Alloc, pat_trie_tag, Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-
-    public:
-      typedef pat_trie_map<Key, Mapped, at1t, _Alloc> 		type;
-    };
-
-  /// Specialization for PATRICIA trie set.
-  template<typename Key, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, null_type, _Alloc, pat_trie_tag,
-				   Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-
-    public:
-      /// Dispatched type.
-      typedef pat_trie_set<Key, null_type, at1t, _Alloc> type;
-    };
-
-  /// Specialization for R-B tree map.
-  template<typename Key, typename Mapped, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, Mapped, _Alloc, rb_tree_tag, Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-
-    public:
-      /// Dispatched type.
-      typedef rb_tree_map<Key, Mapped, at0t, at1t, _Alloc> 	type;
-    };
-
-  /// Specialization for R-B tree set.
-  template<typename Key, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, null_type, _Alloc, rb_tree_tag,
-				   Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-
-    public:
-      typedef rb_tree_set<Key, null_type, at0t, at1t, _Alloc> type;
-    };
-
-  /// Specialization splay tree map.
-  template<typename Key, typename Mapped, typename _Alloc, typename Policy_Tl>
-  struct container_base_dispatch<Key, Mapped, _Alloc, splay_tree_tag,
-				   Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-
-    public:
-      /// Dispatched type.
-      typedef splay_tree_map<Key, Mapped, at0t, at1t, _Alloc> 	type;
-    };
-
-  /// Specialization splay tree set.
-  template<typename Key, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, null_type, _Alloc, splay_tree_tag,
-				   Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-
-    public:
-      /// Dispatched type.
-      typedef splay_tree_set<Key, null_type, at0t, at1t, _Alloc> type;
-  };
-
-    /// Specialization ordered-vector tree map.
-  template<typename Key, typename Mapped, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, Mapped, _Alloc, ov_tree_tag, Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-
-    public:
-      /// Dispatched type.
-      typedef ov_tree_map<Key, Mapped, at0t, at1t, _Alloc> 	type;
-  };
-
-    /// Specialization ordered-vector tree set.
-  template<typename Key, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, null_type, _Alloc, ov_tree_tag,
-				   Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-
-    public:
-      /// Dispatched type.
-      typedef ov_tree_set<Key, null_type, at0t, at1t, _Alloc> type;
-  };
-
-    /// Specialization colision-chaining hash map.
-  template<typename Key, typename Mapped, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, Mapped, _Alloc, cc_hash_tag, Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 2>	at2;
-      typedef typename at2::type			    	at2t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 3>	at3;
-      typedef typename at3::type				at3t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 4> 	at4;
-      typedef typename at4::type			    	at4t;
-
-    public:
-      /// Dispatched type.
-      typedef cc_ht_map<Key, Mapped, at0t, at1t, _Alloc, 
-			at3t::value, at4t, at2t> 	       	type;
-  };
-
-    /// Specialization colision-chaining hash set.
-  template<typename Key, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, null_type, _Alloc, cc_hash_tag,
-				   Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 2>	at2;
-      typedef typename at2::type			    	at2t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 3>	at3;
-      typedef typename at3::type				at3t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 4> 	at4;
-      typedef typename at4::type			    	at4t;
-
-    public:
-      /// Dispatched type.
-      typedef cc_ht_set<Key, null_type, at0t, at1t, _Alloc,
-				 at3t::value, at4t, at2t>    	type;
-  };
-
-    /// Specialization general-probe hash map.
-  template<typename Key, typename Mapped, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, Mapped, _Alloc, gp_hash_tag, Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 2>	at2;
-      typedef typename at2::type			    	at2t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 3>	at3;
-      typedef typename at3::type				at3t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 4> 	at4;
-      typedef typename at4::type			    	at4t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 5> 	at5;
-      typedef typename at5::type			    	at5t;
-
-    public:
-      /// Dispatched type.
-      typedef gp_ht_map<Key, Mapped, at0t, at1t, _Alloc, 
-			at3t::value, at4t, at5t, at2t> 		type;
-  };
-
-    /// Specialization general-probe hash set.
-  template<typename Key, typename _Alloc, typename Policy_Tl>
-    struct container_base_dispatch<Key, null_type, _Alloc, gp_hash_tag,
-				   Policy_Tl>
-    {
-    private:
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 0>	at0;
-      typedef typename at0::type			    	at0t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 1> 	at1;
-      typedef typename at1::type			    	at1t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 2>	at2;
-      typedef typename at2::type			    	at2t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 3>	at3;
-      typedef typename at3::type				at3t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 4> 	at4;
-      typedef typename at4::type			    	at4t;
-      typedef __gnu_cxx::typelist::at_index<Policy_Tl, 5> 	at5;
-      typedef typename at5::type			    	at5t;
-
-    public:
-      /// Dispatched type.
-      typedef gp_ht_set<Key, null_type, at0t, at1t, _Alloc,
-			at3t::value, at4t, at5t, at2t>		type;
-  };
-} // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/debug_map_base.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/debug_map_base.hpp
deleted file mode 100644
index 1dfdb24..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/debug_map_base.hpp
+++ /dev/null
@@ -1,349 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file detail/debug_map_base.hpp
- * Contains a debug-mode base for all maps.
- */
-
-#ifndef PB_DS_DEBUG_MAP_BASE_HPP
-#define PB_DS_DEBUG_MAP_BASE_HPP
-
-#ifdef _GLIBCXX_DEBUG
-
-#include <list>
-#include <utility>
-#include <cstdlib>
-#include <iostream>
-#include <ext/throw_allocator.h>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    // Need std::pair ostream extractor.
-    template<typename _CharT, typename _Traits, typename _Tp1, typename _Tp2>
-    inline std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __out,
-	       const std::pair<_Tp1, _Tp2>& p)
-    { return (__out << '(' << p.first << ',' << p.second << ')'); }
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Eq_Fn, typename Const_Key_Reference>
-
-#define PB_DS_CLASS_C_DEC \
-    debug_map_base<Key, Eq_Fn, Const_Key_Reference>
-
-    /// Debug base class.
-    template<typename Key, typename Eq_Fn, typename Const_Key_Reference>
-    class debug_map_base
-    {
-    private:
-      typedef Const_Key_Reference 			key_const_reference;
-      typedef std::_GLIBCXX_STD_C::list<Key> 		key_repository;
-      typedef typename key_repository::size_type       	size_type;
-      typedef typename key_repository::iterator	       	iterator;
-      typedef typename key_repository::const_iterator  	const_iterator;
-
-    protected:
-      debug_map_base();
-
-      debug_map_base(const PB_DS_CLASS_C_DEC&);
-
-      ~debug_map_base();
-
-      inline void
-      insert_new(key_const_reference);
-
-      inline void
-      erase_existing(key_const_reference);
-
-      void
-      clear();
-
-      inline void
-      check_key_exists(key_const_reference, const char*, int) const;
-
-      inline void
-      check_key_does_not_exist(key_const_reference, const char*, int) const;
-
-      inline void
-      check_size(size_type, const char*, int) const;
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      template<typename Cmp_Fn>
-      void
-      split(key_const_reference, Cmp_Fn, PB_DS_CLASS_C_DEC&);
-
-      void
-      join(PB_DS_CLASS_C_DEC&, bool with_cleanup = true);
-
-    private:
-      void
-      assert_valid(const char*, int) const;
-
-      const_iterator
-      find(key_const_reference) const;
-
-      iterator
-      find(key_const_reference);
-
-      key_repository 	m_keys;
-      Eq_Fn 		m_eq;
-    };
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    debug_map_base()
-    { PB_DS_ASSERT_VALID((*this)) }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    debug_map_base(const PB_DS_CLASS_C_DEC& other)
-    : m_keys(other.m_keys), m_eq(other.m_eq)
-    { PB_DS_ASSERT_VALID((*this)) }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ~debug_map_base()
-    { PB_DS_ASSERT_VALID((*this)) }
-
-    PB_DS_CLASS_T_DEC
-    inline void
-    PB_DS_CLASS_C_DEC::
-    insert_new(key_const_reference r_key)
-    {
-      PB_DS_ASSERT_VALID((*this))
-
-      if (find(r_key) != m_keys.end())
-	{
-	  std::cerr << "insert_new key already present " << r_key << std::endl;
-	  std::abort();
-	}
-
-      __try
-	{
-	  m_keys.push_back(r_key);
-	}
-      __catch(...)
-	{
-	  std::cerr << "insert_new " << r_key << std::endl;
-	  std::abort();
-	}
-
-      PB_DS_ASSERT_VALID((*this))
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline void
-    PB_DS_CLASS_C_DEC::
-    erase_existing(key_const_reference r_key)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      iterator it = find(r_key);
-      if (it == m_keys.end())
-	{
-	  std::cerr << "erase_existing" << r_key << std::endl;
-	  std::abort();
-	}
-      m_keys.erase(it);
-      PB_DS_ASSERT_VALID((*this))
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    clear()
-    {
-      PB_DS_ASSERT_VALID((*this))
-      m_keys.clear();
-      PB_DS_ASSERT_VALID((*this))
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline void
-    PB_DS_CLASS_C_DEC::
-    check_key_exists(key_const_reference r_key,
-		     const char* __file, int __line) const
-    {
-      assert_valid(__file, __line);
-      if (find(r_key) == m_keys.end())
-	{
-	  std::cerr << __file << ':' << __line << ": check_key_exists "
-		    << r_key << std::endl;
-	  std::abort();
-	}
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline void
-    PB_DS_CLASS_C_DEC::
-    check_key_does_not_exist(key_const_reference r_key,
-			     const char* __file, int __line) const
-    {
-      assert_valid(__file, __line);
-      if (find(r_key) != m_keys.end())
-	{
-	  using std::cerr;
-	  using std::endl;
-	  cerr << __file << ':' << __line << ": check_key_does_not_exist "
-	       << r_key << endl;
-	  std::abort();
-	}
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline void
-    PB_DS_CLASS_C_DEC::
-    check_size(size_type size, const char* __file, int __line) const
-    {
-      assert_valid(__file, __line);
-      const size_type keys_size = m_keys.size();
-      if (size != keys_size)
-	{
-	  std::cerr << __file << ':' << __line << ": check_size "
-		    << size << " != " << keys_size << std::endl;
-	  std::abort();
-	}
-     }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    swap(PB_DS_CLASS_C_DEC& other)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      m_keys.swap(other.m_keys);
-      std::swap(m_eq, other.m_eq);
-      PB_DS_ASSERT_VALID((*this))
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::const_iterator
-    PB_DS_CLASS_C_DEC::
-    find(key_const_reference r_key) const
-    {
-      PB_DS_ASSERT_VALID((*this))
-      typedef const_iterator iterator_type;
-      for (iterator_type it = m_keys.begin(); it != m_keys.end(); ++it)
-	if (m_eq(*it, r_key))
-	  return it;
-      return m_keys.end();
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::iterator
-    PB_DS_CLASS_C_DEC::
-    find(key_const_reference r_key)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      iterator it = m_keys.begin();
-      while (it != m_keys.end())
-	{
-	  if (m_eq(*it, r_key))
-	    return it;
-	  ++it;
-	}
-      return it;
-     }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    assert_valid(const char* __file, int __line) const
-    {
-      const_iterator prime_it = m_keys.begin();
-      while (prime_it != m_keys.end())
-	{
-	  const_iterator sec_it = prime_it;
-	  ++sec_it;
-	  while (sec_it != m_keys.end())
-	    {
-	      PB_DS_DEBUG_VERIFY(!m_eq(*sec_it, *prime_it));
-	      PB_DS_DEBUG_VERIFY(!m_eq(*prime_it, *sec_it));
-	      ++sec_it;
-	    }
-	  ++prime_it;
-	}
-    }
-
-    PB_DS_CLASS_T_DEC
-    template<typename Cmp_Fn>
-    void
-    PB_DS_CLASS_C_DEC::
-    split(key_const_reference r_key, Cmp_Fn cmp_fn, PB_DS_CLASS_C_DEC& other)
-    {
-      other.clear();
-      iterator it = m_keys.begin();
-      while (it != m_keys.end())
-	if (cmp_fn(r_key, *it))
-	  {
-	    other.insert_new(*it);
-	    it = m_keys.erase(it);
-	  }
-	else
-	  ++it;
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    join(PB_DS_CLASS_C_DEC& other, bool with_cleanup)
-    {
-      iterator it = other.m_keys.begin();
-      while (it != other.m_keys.end())
-	{
-	  insert_new(*it);
-	  if (with_cleanup)
-	    it = other.m_keys.erase(it);
-	  else
-	    ++it;
-	}
-      _GLIBCXX_DEBUG_ASSERT(!with_cleanup || other.m_keys.empty());
-    }
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-} // namespace detail
-} // namespace __gnu_pbds
-
-
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/eq_fn/eq_by_less.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
deleted file mode 100644
index bb33e8d..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file eq_by_less.hpp
- * Contains an equivalence function.
- */
-
-#ifndef PB_DS_EQ_BY_LESS_HPP
-#define PB_DS_EQ_BY_LESS_HPP
-
-#include <utility>
-#include <functional>
-#include <vector>
-#include <assert.h>
-#include <ext/pb_ds/detail/types_traits.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Equivalence function.
-    template<typename Key, class Cmp_Fn>
-    struct eq_by_less : private Cmp_Fn
-    {
-      bool
-      operator()(const Key& r_lhs, const Key& r_rhs) const
-      {
-	const bool l = Cmp_Fn::operator()(r_lhs, r_rhs);
-	const bool g = Cmp_Fn::operator()(r_rhs, r_lhs);
-	return !(l || g);
-      }
-    };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_EQ_BY_LESS_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
deleted file mode 100644
index 1717eff..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file hash_eq_fn.hpp
- * Contains 2 eqivalence functions, one employing a hash value,
- * and one ignoring it.
- */
-
-#ifndef PB_DS_HASH_EQ_FN_HPP
-#define PB_DS_HASH_EQ_FN_HPP
-
-#include <utility>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Primary template.
-    template<typename Key, typename Eq_Fn, typename _Alloc, bool Store_Hash>
-      struct hash_eq_fn;
-
-    /// Specialization 1 - The client requests that hash values not be stored.
-    template<typename Key, typename Eq_Fn, typename _Alloc>
-    struct hash_eq_fn<Key, Eq_Fn, _Alloc, false> : public Eq_Fn
-    {
-      typedef Eq_Fn 					   eq_fn_base;
-      typedef typename _Alloc::template rebind<Key>::other key_allocator;
-      typedef typename key_allocator::const_reference 	   key_const_reference;
-
-      hash_eq_fn() { }
-
-      hash_eq_fn(const Eq_Fn& r_eq_fn) : Eq_Fn(r_eq_fn) { }
-
-      bool
-      operator()(key_const_reference r_lhs_key, 
-		 key_const_reference r_rhs_key) const
-      { return eq_fn_base::operator()(r_lhs_key, r_rhs_key); }
-
-      void
-      swap(const hash_eq_fn& other)
-      { std::swap((Eq_Fn&)(*this), (Eq_Fn&)other); }
-    };
-
-
-    /// Specialization 2 - The client requests that hash values be stored.
-    template<typename Key, class Eq_Fn, class _Alloc>
-    struct hash_eq_fn<Key, Eq_Fn, _Alloc, true> : public Eq_Fn
-    {
-      typedef typename _Alloc::size_type 		   size_type;
-      typedef Eq_Fn 					   eq_fn_base;
-      typedef typename _Alloc::template rebind<Key>::other key_allocator;
-      typedef typename key_allocator::const_reference 	   key_const_reference;
-
-      hash_eq_fn() { }
-
-      hash_eq_fn(const Eq_Fn& r_eq_fn) : Eq_Fn(r_eq_fn) { }
-
-      bool
-      operator()(key_const_reference r_lhs_key, size_type lhs_hash, 
-		 key_const_reference r_rhs_key, size_type rhs_hash) const
-      {
-	_GLIBCXX_DEBUG_ASSERT(!eq_fn_base::operator()(r_lhs_key, r_rhs_key) 
-			      || lhs_hash == rhs_hash);
-
-	return (lhs_hash == rhs_hash && 
-		eq_fn_base::operator()(r_lhs_key, r_rhs_key));
-      }
-
-      void
-      swap(const hash_eq_fn& other)
-      { std::swap((Eq_Fn&)(*this), (Eq_Fn&)(other)); }
-    };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
deleted file mode 100644
index fbd23d2..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,223 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/constructor_destructor_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s constructors, destructor,
- * and related functions.
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::entry_allocator
-PB_DS_CLASS_C_DEC::s_entry_allocator;
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-  while (first_it != last_it)
-    insert(*(first_it++));
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_GP_HASH_NAME() 
-: ranged_probe_fn_base(resize_base::get_nearest_larger_size(1)),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_GP_HASH_NAME(const Hash_Fn& r_hash_fn)    
-: ranged_probe_fn_base(resize_base::get_nearest_larger_size(1), r_hash_fn),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_GP_HASH_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn) 
-: hash_eq_fn_base(r_eq_fn),
-  ranged_probe_fn_base(resize_base::get_nearest_larger_size(1), r_hash_fn),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_GP_HASH_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn, 
-		 const Comb_Probe_Fn& r_comb_hash_fn) 
-: hash_eq_fn_base(r_eq_fn),
-  ranged_probe_fn_base(resize_base::get_nearest_larger_size(1),
-		       r_hash_fn, r_comb_hash_fn),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_GP_HASH_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn, 
-		 const Comb_Probe_Fn& comb_hash_fn, const Probe_Fn& prober) 
-: hash_eq_fn_base(r_eq_fn),
-  ranged_probe_fn_base(resize_base::get_nearest_larger_size(1),
-		       r_hash_fn, comb_hash_fn, prober),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_GP_HASH_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn, 
-		 const Comb_Probe_Fn& comb_hash_fn, const Probe_Fn& prober, 
-		 const Resize_Policy& r_resize_policy) 
-: hash_eq_fn_base(r_eq_fn), resize_base(r_resize_policy),
-  ranged_probe_fn_base(resize_base::get_nearest_larger_size(1),
-		       r_hash_fn, comb_hash_fn, prober),
-  m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
-  m_entries(s_entry_allocator.allocate(m_num_e))
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_GP_HASH_NAME(const PB_DS_CLASS_C_DEC& other) :
-#ifdef _GLIBCXX_DEBUG
-  debug_base(other),
-#endif 
-  hash_eq_fn_base(other),
-  resize_base(other),
-  ranged_probe_fn_base(other),
-  m_num_e(other.m_num_e),
-  m_num_used_e(other.m_num_used_e),
-  m_entries(s_entry_allocator.allocate(m_num_e))
-{
-  for (size_type i = 0; i < m_num_e; ++i)
-    m_entries[i].m_stat = (entry_status)empty_entry_status;
-
-  __try
-    {
-      for (size_type i = 0; i < m_num_e; ++i)
-        {
-	  m_entries[i].m_stat = other.m_entries[i].m_stat;
-	  if (m_entries[i].m_stat == valid_entry_status)
-	    new (m_entries + i) entry(other.m_entries[i]);
-        }
-    }
-  __catch(...)
-    {
-      deallocate_all();
-      __throw_exception_again;
-    }
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~PB_DS_GP_HASH_NAME()
-{ deallocate_all(); }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  std::swap(m_num_e, other.m_num_e);
-  std::swap(m_num_used_e, other.m_num_used_e);
-  std::swap(m_entries, other.m_entries);
-  ranged_probe_fn_base::swap(other);
-  hash_eq_fn_base::swap(other);
-  resize_base::swap(other);
-  _GLIBCXX_DEBUG_ONLY(debug_base::swap(other));
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-deallocate_all()
-{
-  clear();
-  erase_all_valid_entries(m_entries, m_num_e);
-  s_entry_allocator.deallocate(m_entries, m_num_e);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase_all_valid_entries(entry_array a_entries_resized, size_type len)
-{
-  for (size_type pos = 0; pos < len; ++pos)
-    {
-      entry_pointer p_e = &a_entries_resized[pos];
-      if (p_e->m_stat == valid_entry_status)
-	p_e->m_value.~value_type();
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-initialize()
-{
-  Resize_Policy::notify_resized(m_num_e);
-  Resize_Policy::notify_cleared();
-  ranged_probe_fn_base::notify_resized(m_num_e);
-  for (size_type i = 0; i < m_num_e; ++i)
-    m_entries[i].m_stat = empty_entry_status;
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
deleted file mode 100644
index 73aae64..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s constructors, destructor,
- *    and related functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-constructor_insert_new_imp(mapped_const_reference r_val, size_type pos, 
-			   false_type)
-{
-  _GLIBCXX_DEBUG_ASSERT(m_entries[pos].m_stat != valid_entry_status)k;
-  entry* const p_e = m_entries + pos;
-  new (&p_e->m_value) mapped_value_type(r_val);
-  p_e->m_stat = valid_entry_status;
-  _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(p_e->m_value.first);)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
deleted file mode 100644
index dedc30a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s constructors, destructor,
- * and related functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-constructor_insert_new_imp(mapped_const_reference r_val, size_type pos, 
-			   true_type)
-{
-  _GLIBCXX_DEBUG_ASSERT(m_entries[pos].m_stat != valid_entry_status);
-  entry* const p_e = m_entries + pos;
-  new (&p_e->m_value) mapped_value_type(r_val);
-  p_e->m_hash = ranged_probe_fn_base::operator()(PB_DS_V2F(r_val)).second;
-  p_e->m_stat = valid_entry_status;
-  _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(p_e->m_value.first);)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
deleted file mode 100644
index 2d0f558..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/debug_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s debug-mode functions.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  debug_base::check_size(m_num_used_e, __file, __line);
-  assert_entry_array_valid(m_entries, traits_base::m_store_extra_indicator,
-			   __file, __line);
-}
-
-#include <ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp>
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
deleted file mode 100644
index 5975d0f..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s debug-mode functions.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_entry_array_valid(const entry_array a_entries, false_type,
-			 const char* __file, int __line) const
-{
-  size_type iterated_num_used_e = 0;
-  for (size_type pos = 0; pos < m_num_e; ++pos)
-    {
-      const_entry_pointer p_e = &a_entries[pos];
-      switch(p_e->m_stat)
-        {
-        case empty_entry_status:
-        case erased_entry_status:
-	  break;
-        case valid_entry_status:
-	  {
-	    key_const_reference r_key = PB_DS_V2F(p_e->m_value);
-	    debug_base::check_key_exists(r_key, __file, __line);
-	    ++iterated_num_used_e;
-	    break;
-	  }
-        default:
-	  PB_DS_DEBUG_VERIFY(0);
-        };
-    }
-  PB_DS_DEBUG_VERIFY(iterated_num_used_e == m_num_used_e);
-}
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
deleted file mode 100644
index 111a3b7..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/debug_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s debug-mode functions.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_entry_array_valid(const entry_array a_entries, true_type,
-			 const char* __file, int __line) const
-{
-  size_type iterated_num_used_e = 0;
-
-  for (size_type pos = 0; pos < m_num_e; ++pos)
-    {
-      const_entry_pointer p_e =& a_entries[pos];
-      switch(p_e->m_stat)
-        {
-        case empty_entry_status:
-        case erased_entry_status:
-	  break;
-        case valid_entry_status:
-	  {
-	    key_const_reference r_key = PB_DS_V2F(p_e->m_value);
-	    debug_base::check_key_exists(r_key, __file, __line);
-
-	    const comp_hash pos_hash_pair = ranged_probe_fn_base::operator()(r_key);
-
-	    PB_DS_DEBUG_VERIFY(p_e->m_hash == pos_hash_pair.second);
-	    ++iterated_num_used_e;
-	    break;
-	  }
-        default:
-	  PB_DS_DEBUG_VERIFY(0);
-        };
-    }
-
-  PB_DS_DEBUG_VERIFY(iterated_num_used_e == m_num_used_e);
-}
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
deleted file mode 100644
index 16ce7c1..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/erase_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s erase related functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-erase_entry(entry_pointer p_e)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_e->m_stat = valid_entry_status);
-  _GLIBCXX_DEBUG_ONLY(debug_base::erase_existing(PB_DS_V2F(p_e->m_value));)
-  p_e->m_value.~value_type();
-  p_e->m_stat = erased_entry_status;
-  _GLIBCXX_DEBUG_ASSERT(m_num_used_e > 0);
-  resize_base::notify_erased(--m_num_used_e);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  for (size_type pos = 0; pos < m_num_e; ++pos)
-    {
-      entry_pointer p_e = &m_entries[pos];
-      if (p_e->m_stat == valid_entry_status)
-	erase_entry(p_e);
-    }
-  do_resize_if_needed_no_throw();
-  resize_base::notify_cleared();
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  PB_DS_ASSERT_VALID((*this))
-  size_type num_ersd = 0;
-  for (size_type pos = 0; pos < m_num_e; ++pos)
-    {
-      entry_pointer p_e = &m_entries[pos];
-      if (p_e->m_stat == valid_entry_status)
-	if (pred(p_e->m_value))
-	  {
-	    ++num_ersd;
-	    erase_entry(p_e);
-	  }
-    }
-
-  do_resize_if_needed_no_throw();
-  PB_DS_ASSERT_VALID((*this))
-  return num_ersd;
-}
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-erase(key_const_reference r_key)
-{ return erase_imp(r_key, traits_base::m_store_extra_indicator); }
-
-#include <ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp>
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
deleted file mode 100644
index e5622ac..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s erase related functions,
- * when the hash value is not stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-erase_imp(key_const_reference r_key,  false_type)
-{
-  PB_DS_ASSERT_VALID((*this))
-  size_type hash = ranged_probe_fn_base::operator()(r_key);
-  size_type i;
-  resize_base::notify_erase_search_start();
-
-  for (i = 0; i < m_num_e; ++i)
-    {
-      const size_type pos = ranged_probe_fn_base::operator()(r_key,  hash, i);
-      entry* const p_e = m_entries + pos;
-      switch(p_e->m_stat)
-        {
-        case empty_entry_status:
-	  {
-	    resize_base::notify_erase_search_end();
-	    PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	    return false;
-	  }
-	  break;
-        case valid_entry_status:
-	  if (hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), r_key))
-            {
-	      resize_base::notify_erase_search_end();
-	      erase_entry(p_e);
-	      do_resize_if_needed_no_throw();
-	      return true;
-            }
-	  break;
-        case erased_entry_status:
-	  break;
-        default:
-	  _GLIBCXX_DEBUG_ASSERT(0);
-        };
-      resize_base::notify_erase_search_collision();
-    }
-  resize_base::notify_erase_search_end();
-  return false;
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
deleted file mode 100644
index 2f5a8cc..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/erase_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s erase related functions,
- * when the hash value is stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-erase_imp(key_const_reference r_key, true_type)
-{
-  const comp_hash pos_hash_pair = ranged_probe_fn_base::operator()(r_key);
-  size_type i;
-  resize_base::notify_erase_search_start();
-  for (i = 0; i < m_num_e; ++i)
-    {
-      const size_type pos = ranged_probe_fn_base::operator()(r_key, pos_hash_pair.second, i);
-
-      entry* const p_e = m_entries + pos;
-      switch(p_e->m_stat)
-        {
-        case empty_entry_status:
-	  {
-	    resize_base::notify_erase_search_end();
-	    PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	    return false;
-	  }
-	  break;
-        case valid_entry_status:
-	  if (hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), p_e->m_hash,
-					  r_key, pos_hash_pair.second))
-            {
-	      resize_base::notify_erase_search_end();
-	      erase_entry(p_e);
-	      do_resize_if_needed_no_throw();
-	      return true;
-            }
-	  break;
-        case erased_entry_status:
-	  break;
-        default:
-	  _GLIBCXX_DEBUG_ASSERT(0);
-        };
-
-      resize_base::notify_erase_search_collision();
-    }
-  resize_base::notify_erase_search_end();
-  return false;
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
deleted file mode 100644
index 1558c63..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/find_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s find related functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-find(key_const_reference r_key)
-{
-  PB_DS_ASSERT_VALID((*this))
-  return find_key_pointer(r_key, traits_base::m_store_extra_indicator);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-find(key_const_reference r_key) const
-{
-  PB_DS_ASSERT_VALID((*this))
-  return const_cast<PB_DS_CLASS_C_DEC&>(*this).find_key_pointer(r_key, traits_base::m_store_extra_indicator);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-find_end()
-{ return 0; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-find_end() const
-{ return 0; }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
deleted file mode 100644
index d22c107..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s find related functions,
- * when the hash value is not stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::pointer
-PB_DS_CLASS_C_DEC::
-find_key_pointer(key_const_reference r_key, false_type)
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
deleted file mode 100644
index 809da55..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/find_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s insert related functions,
- * when the hash value is stored.
- */
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
deleted file mode 100644
index a402bef..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
+++ /dev/null
@@ -1,713 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/gp_ht_map_.hpp
- * Contains an implementation class for general probing hash.
- */
-
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp>
-#include <ext/pb_ds/detail/types_traits.hpp>
-#include <ext/pb_ds/exception.hpp>
-#include <ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp>
-#include <utility>
-#ifdef PB_DS_HT_MAP_TRACE_
-#include <iostream>
-#endif
-#ifdef _GLIBCXX_DEBUG
-#include <ext/pb_ds/detail/debug_map_base.hpp>
-#endif
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-#define PB_DS_GP_HASH_NAME gp_ht_map
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-#define PB_DS_GP_HASH_NAME gp_ht_set
-#endif
-
-#define PB_DS_CLASS_T_DEC \
-   template<typename Key, typename Mapped, typename Hash_Fn, typename Eq_Fn, \
-	    typename _Alloc, bool Store_Hash, typename Comb_Probe_Fn, \
-	    typename Probe_Fn,	typename Resize_Policy>
-
-#define PB_DS_CLASS_C_DEC \
-   PB_DS_GP_HASH_NAME<Key, Mapped, Hash_Fn, Eq_Fn, _Alloc, \
-		    Store_Hash, Comb_Probe_Fn, Probe_Fn, Resize_Policy>
-
-#define PB_DS_HASH_EQ_FN_C_DEC \
-    hash_eq_fn<Key, Eq_Fn, _Alloc, Store_Hash>
-
-#define PB_DS_RANGED_PROBE_FN_C_DEC \
-   ranged_probe_fn<Key, Hash_Fn, _Alloc, Comb_Probe_Fn, Probe_Fn, Store_Hash>
-
-#define PB_DS_GP_HASH_TRAITS_BASE \
-   types_traits<Key, Mapped, _Alloc, Store_Hash>
-
-#ifdef _GLIBCXX_DEBUG
-#define PB_DS_DEBUG_MAP_BASE_C_DEC \
-   debug_map_base<Key, Eq_Fn, \
-		  typename _Alloc::template rebind<Key>::other::const_reference>
-#endif
-
-
-    /**
-     *  A general-probing hash-based container.
-     *
-     *
-     *  @ingroup hash-detail
-     *
-     *  @tparam Key 	    	Key type.
-     *
-     *  @tparam Mapped 	    	Map type.
-     *
-     *  @tparam Hash_Fn	      	Hashing functor.
-     *                          Default is __gnu_cxx::hash.
-     *
-     *  @tparam Eq_Fn	      	Equal functor.
-     *                          Default std::equal_to<Key>
-     *
-     *  @tparam _Alloc 	    	Allocator type.
-     *
-     *  @tparam Store_Hash    	If key type stores extra metadata.
-     *                          Defaults to false.
-     *
-     *  @tparam Comb_Probe_Fn	Combining probe functor.
-     *                          If Hash_Fn is not null_type, then this
-     *                          is the ranged-probe functor; otherwise,
-     *                          this is the range-hashing functor.
-     *                    XXX See Design::Hash-Based Containers::Hash Policies.
-     *                          Default direct_mask_range_hashing.
-     *
-     *  @tparam Probe_Fn       	Probe functor.
-     *                          Defaults to linear_probe_fn,
-     *                          also quadratic_probe_fn.
-     *
-     *  @tparam Resize_Policy 	Resizes hash.
-     *                          Defaults to hash_standard_resize_policy,
-     *                          using hash_exponential_size_policy and
-     *                          hash_load_check_resize_trigger.
-     *
-     *
-     *  Bases are: detail::hash_eq_fn, Resize_Policy, detail::ranged_probe_fn,
-     *             detail::types_traits. (Optional: detail::debug_map_base.)
-     */
-    template<typename Key,
-	     typename Mapped,
-	     typename Hash_Fn,
-	     typename Eq_Fn,
-	     typename _Alloc,
-	     bool Store_Hash,
-	     typename Comb_Probe_Fn,
-	     typename Probe_Fn,
-	     typename Resize_Policy>
-    class PB_DS_GP_HASH_NAME :
-#ifdef _GLIBCXX_DEBUG
-      protected PB_DS_DEBUG_MAP_BASE_C_DEC,
-#endif
-      public PB_DS_HASH_EQ_FN_C_DEC,
-      public Resize_Policy,
-      public PB_DS_RANGED_PROBE_FN_C_DEC,
-      public PB_DS_GP_HASH_TRAITS_BASE
-    {
-    private:
-      typedef PB_DS_GP_HASH_TRAITS_BASE	       	traits_base;
-      typedef typename traits_base::value_type 	value_type_;
-      typedef typename traits_base::pointer 	pointer_;
-      typedef typename traits_base::const_pointer const_pointer_;
-      typedef typename traits_base::reference 	reference_;
-      typedef typename traits_base::const_reference const_reference_;
-      typedef typename traits_base::comp_hash	comp_hash;
-
-      enum entry_status
-	{
-	  empty_entry_status,
-	  valid_entry_status,
-	  erased_entry_status
-	} __attribute__ ((__packed__));
-
-      struct entry : public traits_base::stored_data_type
-      {
-	entry_status m_stat;
-      };
-
-      typedef typename _Alloc::template rebind<entry>::other entry_allocator;
-      typedef typename entry_allocator::pointer entry_pointer;
-      typedef typename entry_allocator::const_pointer const_entry_pointer;
-      typedef typename entry_allocator::reference entry_reference;
-      typedef typename entry_allocator::const_reference const_entry_reference;
-      typedef typename entry_allocator::pointer entry_array;
-
-      typedef PB_DS_RANGED_PROBE_FN_C_DEC 	ranged_probe_fn_base;
-
-#ifdef _GLIBCXX_DEBUG
-      typedef PB_DS_DEBUG_MAP_BASE_C_DEC 	debug_base;
-#endif
-
-      typedef PB_DS_HASH_EQ_FN_C_DEC 		hash_eq_fn_base;
-      typedef Resize_Policy 			resize_base;
-
-#define PB_DS_GEN_POS typename _Alloc::size_type
-
-#include <ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp>
-#include <ext/pb_ds/detail/unordered_iterator/point_iterator.hpp>
-#include <ext/pb_ds/detail/unordered_iterator/const_iterator.hpp>
-#include <ext/pb_ds/detail/unordered_iterator/iterator.hpp>
-
-#undef PB_DS_GEN_POS
-
-    public:
-      typedef _Alloc 				allocator_type;
-      typedef typename _Alloc::size_type 	size_type;
-      typedef typename _Alloc::difference_type 	difference_type;
-      typedef Hash_Fn 				hash_fn;
-      typedef Eq_Fn 				eq_fn;
-      typedef Probe_Fn 				probe_fn;
-      typedef Comb_Probe_Fn 			comb_probe_fn;
-      typedef Resize_Policy 			resize_policy;
-
-      /// Value stores hash, true or false.
-      enum
-	{
-	  store_hash = Store_Hash
-	};
-
-      typedef typename traits_base::key_type 	key_type;
-      typedef typename traits_base::key_pointer key_pointer;
-      typedef typename traits_base::key_const_pointer key_const_pointer;
-      typedef typename traits_base::key_reference key_reference;
-      typedef typename traits_base::key_const_reference key_const_reference;
-      typedef typename traits_base::mapped_type mapped_type;
-      typedef typename traits_base::mapped_pointer mapped_pointer;
-      typedef typename traits_base::mapped_const_pointer mapped_const_pointer;
-      typedef typename traits_base::mapped_reference mapped_reference;
-      typedef typename traits_base::mapped_const_reference mapped_const_reference;
-      typedef typename traits_base::value_type value_type;
-      typedef typename traits_base::pointer pointer;
-      typedef typename traits_base::const_pointer const_pointer;
-      typedef typename traits_base::reference reference;
-      typedef typename traits_base::const_reference const_reference;
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      typedef point_iterator_ 			point_iterator;
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-      typedef point_const_iterator_ 		point_iterator;
-#endif
-
-      typedef point_const_iterator_ 		point_const_iterator;
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      typedef iterator_ 			iterator;
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-      typedef const_iterator_ 			iterator;
-#endif
-
-      typedef const_iterator_ 			const_iterator;
-
-      PB_DS_GP_HASH_NAME();
-
-      PB_DS_GP_HASH_NAME(const PB_DS_CLASS_C_DEC&);
-
-      PB_DS_GP_HASH_NAME(const Hash_Fn&);
-
-      PB_DS_GP_HASH_NAME(const Hash_Fn&, const Eq_Fn&);
-
-      PB_DS_GP_HASH_NAME(const Hash_Fn&, const Eq_Fn&, const Comb_Probe_Fn&);
-
-      PB_DS_GP_HASH_NAME(const Hash_Fn&, const Eq_Fn&, const Comb_Probe_Fn&,
-			 const Probe_Fn&);
-
-      PB_DS_GP_HASH_NAME(const Hash_Fn&, const Eq_Fn&, const Comb_Probe_Fn&,
-			 const Probe_Fn&, const Resize_Policy&);
-
-      template<typename It>
-      void
-      copy_from_range(It, It);
-
-      virtual
-      ~PB_DS_GP_HASH_NAME();
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      inline size_type
-      size() const;
-
-      inline size_type
-      max_size() const;
-
-      /// True if size() == 0.
-      inline bool
-      empty() const;
-
-      /// Return current hash_fn.
-      Hash_Fn&
-      get_hash_fn();
-
-      /// Return current const hash_fn.
-      const Hash_Fn&
-      get_hash_fn() const;
-
-      /// Return current eq_fn.
-      Eq_Fn&
-      get_eq_fn();
-
-      /// Return current const eq_fn.
-      const Eq_Fn&
-      get_eq_fn() const;
-
-      /// Return current probe_fn.
-      Probe_Fn&
-      get_probe_fn();
-
-      /// Return current const probe_fn.
-      const Probe_Fn&
-      get_probe_fn() const;
-
-      /// Return current comb_probe_fn.
-      Comb_Probe_Fn&
-      get_comb_probe_fn();
-
-      /// Return current const comb_probe_fn.
-      const Comb_Probe_Fn&
-      get_comb_probe_fn() const;
-
-      /// Return current resize_policy.
-      Resize_Policy&
-      get_resize_policy();
-
-      /// Return current const resize_policy.
-      const Resize_Policy&
-      get_resize_policy() const;
-
-      inline std::pair<point_iterator, bool>
-      insert(const_reference r_val)
-      {
-       _GLIBCXX_DEBUG_ONLY(PB_DS_CLASS_C_DEC::assert_valid(__FILE__, __LINE__);)
-	return insert_imp(r_val, traits_base::m_store_extra_indicator);
-      }
-
-      inline mapped_reference
-      operator[](key_const_reference r_key)
-      {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-	return subscript_imp(r_key, traits_base::m_store_extra_indicator);
-#else
-	insert(r_key);
-	return traits_base::s_null_type;
-#endif
-      }
-
-      inline point_iterator
-      find(key_const_reference);
-
-      inline point_const_iterator
-      find(key_const_reference) const;
-
-      inline point_iterator
-      find_end();
-
-      inline point_const_iterator
-      find_end() const;
-
-      inline bool
-      erase(key_const_reference);
-
-      template<typename Pred>
-        inline size_type
-        erase_if(Pred);
-
-      void
-      clear();
-
-      inline iterator
-      begin();
-
-      inline const_iterator
-      begin() const;
-
-      inline iterator
-      end();
-      
-      inline const_iterator
-      end() const;
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-#endif
-
-#ifdef PB_DS_HT_MAP_TRACE_
-      void
-      trace() const;
-#endif
-
-    private:
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      friend class iterator_;
-#endif
-
-      friend class const_iterator_;
-
-      void
-      deallocate_all();
-
-      void
-      initialize();
-
-      void
-      erase_all_valid_entries(entry_array, size_type);
-
-      inline bool
-      do_resize_if_needed();
-
-      inline void
-      do_resize_if_needed_no_throw();
-
-      void
-      resize_imp(size_type);
-
-      virtual void
-      do_resize(size_type);
-
-      void
-      resize_imp(entry_array, size_type);
-
-      inline void
-      resize_imp_reassign(entry_pointer, entry_array, false_type);
-
-      inline void
-      resize_imp_reassign(entry_pointer, entry_array, true_type);
-
-      inline size_type
-      find_ins_pos(key_const_reference, false_type);
-
-      inline comp_hash
-      find_ins_pos(key_const_reference, true_type);
-
-      inline std::pair<point_iterator, bool>
-      insert_imp(const_reference, false_type);
-
-      inline std::pair<point_iterator, bool>
-      insert_imp(const_reference, true_type);
-
-      inline pointer
-      insert_new_imp(const_reference r_val, size_type pos)
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_entries[pos].m_stat != valid_entry_status);
-
-	if (do_resize_if_needed())
-	  pos = find_ins_pos(PB_DS_V2F(r_val),
-			     traits_base::m_store_extra_indicator);
-
-	_GLIBCXX_DEBUG_ASSERT(m_entries[pos].m_stat != valid_entry_status);
-	entry* const p_e = m_entries + pos;
-	new (&p_e->m_value) value_type(r_val);
-	p_e->m_stat = valid_entry_status;
-	resize_base::notify_inserted(++m_num_used_e);
-
-	_GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(p_e->m_value));)
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	return &p_e->m_value;
-      }
-
-      inline pointer
-      insert_new_imp(const_reference r_val, comp_hash& r_pos_hash_pair)
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_entries[r_pos_hash_pair.first].m_stat !=
-			      valid_entry_status);
-
-	if (do_resize_if_needed())
-	  r_pos_hash_pair = find_ins_pos(PB_DS_V2F(r_val),
-					 traits_base::m_store_extra_indicator);
-
-	_GLIBCXX_DEBUG_ASSERT(m_entries[r_pos_hash_pair.first].m_stat !=
-			      valid_entry_status);
-
-	entry* const p_e = m_entries + r_pos_hash_pair.first;
-	new (&p_e->m_value) value_type(r_val);
-	p_e->m_hash = r_pos_hash_pair.second;
-	p_e->m_stat = valid_entry_status;
-
-	resize_base::notify_inserted(++m_num_used_e);
-
-	_GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(p_e->m_value));)
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	return &p_e->m_value;
-      }
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      inline mapped_reference
-      subscript_imp(key_const_reference key, false_type)
-      {
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-
-	const size_type pos = find_ins_pos(key,
-					 traits_base::m_store_extra_indicator);
-
-	entry_pointer p_e = &m_entries[pos];
-	if (p_e->m_stat != valid_entry_status)
-	  return insert_new_imp(value_type(key, mapped_type()), pos)->second;
-
-	PB_DS_CHECK_KEY_EXISTS(key)
-	return p_e->m_value.second;
-      }
-
-      inline mapped_reference
-      subscript_imp(key_const_reference key, true_type)
-      {
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-
-	comp_hash pos_hash_pair = find_ins_pos(key,
-					 traits_base::m_store_extra_indicator);
-
-	if (m_entries[pos_hash_pair.first].m_stat != valid_entry_status)
-	  return insert_new_imp(value_type(key, mapped_type()),
-				 pos_hash_pair)->second;
-
-	PB_DS_CHECK_KEY_EXISTS(key)
-	return (m_entries + pos_hash_pair.first)->m_value.second;
-      }
-#endif
-
-      inline pointer
-      find_key_pointer(key_const_reference key, false_type)
-      {
-	const size_type hash = ranged_probe_fn_base::operator()(key);
-	resize_base::notify_find_search_start();
-
-	// Loop until entry is found or until all possible entries accessed.
-	for (size_type i = 0; i < m_num_e; ++i)
-	  {
-	    const size_type pos = ranged_probe_fn_base::operator()(key,
-								   hash, i);
-
-	    entry* const p_e = m_entries + pos;
-	    switch (p_e->m_stat)
-	      {
-	      case empty_entry_status:
-		{
-		  resize_base::notify_find_search_end();
-		  PB_DS_CHECK_KEY_DOES_NOT_EXIST(key)
-		  return 0;
-		}
-		break;
-	      case valid_entry_status:
-		if (hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), key))
-		  {
-		    resize_base::notify_find_search_end();
-		    PB_DS_CHECK_KEY_EXISTS(key)
-		    return pointer(&p_e->m_value);
-		  }
-		break;
-	      case erased_entry_status:
-		break;
-	      default:
-		_GLIBCXX_DEBUG_ASSERT(0);
-	      };
-
-	    resize_base::notify_find_search_collision();
-	  }
-
-	PB_DS_CHECK_KEY_DOES_NOT_EXIST(key)
-	resize_base::notify_find_search_end();
-	return 0;
-      }
-
-      inline pointer
-      find_key_pointer(key_const_reference key, true_type)
-      {
-	comp_hash pos_hash_pair = ranged_probe_fn_base::operator()(key);
-	resize_base::notify_find_search_start();
-
-	// Loop until entry is found or until all possible entries accessed.
-	for (size_type i = 0; i < m_num_e; ++i)
-	  {
-	    const size_type pos =
-	      ranged_probe_fn_base::operator()(key, pos_hash_pair.second, i);
-
-	    entry* const p_e = m_entries + pos;
-
-	    switch(p_e->m_stat)
-	      {
-	      case empty_entry_status:
-		{
-		  resize_base::notify_find_search_end();
-		  PB_DS_CHECK_KEY_DOES_NOT_EXIST(key)
-		  return 0;
-		}
-		break;
-	      case valid_entry_status:
-		if (hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value),
-						p_e->m_hash,
-						key, pos_hash_pair.second))
-		  {
-		    resize_base::notify_find_search_end();
-		    PB_DS_CHECK_KEY_EXISTS(key)
-		    return pointer(&p_e->m_value);
-		  }
-		break;
-	      case erased_entry_status:
-		break;
-	      default:
-		_GLIBCXX_DEBUG_ASSERT(0);
-	      };
-
-	    resize_base::notify_find_search_collision();
-	  }
-
-	PB_DS_CHECK_KEY_DOES_NOT_EXIST(key)
-	resize_base::notify_find_search_end();
-	return 0;
-      }
-
-      inline bool
-      erase_imp(key_const_reference, true_type);
-
-      inline bool
-      erase_imp(key_const_reference, false_type);
-
-      inline void
-      erase_entry(entry_pointer);
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      void
-      inc_it_state(pointer& r_p_value, size_type& r_pos) const
-      { inc_it_state((mapped_const_pointer& )r_p_value, r_pos); }
-#endif
-
-      void
-      inc_it_state(const_pointer& r_p_value, size_type& r_pos) const
-      {
-	_GLIBCXX_DEBUG_ASSERT(r_p_value != 0);
-	for (++r_pos; r_pos < m_num_e; ++r_pos)
-	  {
-	    const_entry_pointer p_e =& m_entries[r_pos];
-	    if (p_e->m_stat == valid_entry_status)
-	      {
-		r_p_value =& p_e->m_value;
-		return;
-	      }
-	  }
-	r_p_value = 0;
-      }
-
-      void
-      get_start_it_state(const_pointer& r_p_value, size_type& r_pos) const
-      {
-	for (r_pos = 0; r_pos < m_num_e; ++r_pos)
-	  {
-	    const_entry_pointer p_e = &m_entries[r_pos];
-	    if (p_e->m_stat == valid_entry_status)
-	      {
-		r_p_value = &p_e->m_value;
-		return;
-	      }
-	  }
-	r_p_value = 0;
-      }
-
-      void
-      get_start_it_state(pointer& r_p_value, size_type& r_pos)
-      {
-	for (r_pos = 0; r_pos < m_num_e; ++r_pos)
-	  {
-	    entry_pointer p_e = &m_entries[r_pos];
-	    if (p_e->m_stat == valid_entry_status)
-	      {
-		r_p_value = &p_e->m_value;
-		return;
-	      }
-	  }
-	r_p_value = 0;
-      }
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_entry_array_valid(const entry_array, false_type,
-			       const char*, int) const;
-
-      void
-      assert_entry_array_valid(const entry_array, true_type,
-			       const char*, int) const;
-#endif
-
-      static entry_allocator 	s_entry_allocator;
-      static iterator 		s_end_it;
-      static const_iterator 	s_const_end_it;
-
-      size_type 		m_num_e;
-      size_type 		m_num_used_e;
-      entry_pointer 		m_entries;
-
-      enum
-	{
-	  store_hash_ok = !Store_Hash
-			  || !is_same<Hash_Fn, __gnu_pbds::null_type>::value
-	};
-
-      PB_DS_STATIC_ASSERT(sth, store_hash_ok);
-    };
-
-#include <ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_HASH_EQ_FN_C_DEC
-#undef PB_DS_RANGED_PROBE_FN_C_DEC
-#undef PB_DS_GP_HASH_TRAITS_BASE
-#undef PB_DS_DEBUG_MAP_BASE_C_DEC
-#undef PB_DS_GP_HASH_NAME
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
deleted file mode 100644
index 3f104bf..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/info_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s entire container info related
- * functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size() const
-{ return m_num_used_e; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-max_size() const
-{ return s_entry_allocator.max_size(); }
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-empty() const
-{ return (size() == 0); }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
deleted file mode 100644
index 3d3a84f..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/insert_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s insert related functions.
- */
-
-#include <ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp>
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
deleted file mode 100644
index 9253fb8..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s insert related functions,
- * when the hash value is not stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-find_ins_pos(key_const_reference r_key, false_type)
-{
-  size_type hash = ranged_probe_fn_base::operator()(r_key);
-  size_type i;
-
-  /* The insertion position is initted to a non-legal value to indicate
-   *     that it has not been initted yet.
-   */
-  size_type ins_pos = m_num_e;
-  resize_base::notify_insert_search_start();
-  for (i = 0; i < m_num_e; ++i)
-    {
-      const size_type pos = ranged_probe_fn_base::operator()(r_key, hash, i);
-      _GLIBCXX_DEBUG_ASSERT(pos < m_num_e);
-      entry* const p_e = m_entries + pos;
-      switch(p_e->m_stat)
-        {
-        case empty_entry_status:
-	  {
-            resize_base::notify_insert_search_end();
-	    PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	    return (ins_pos == m_num_e) ? pos : ins_pos;
-	  }
-	  break;
-        case erased_entry_status:
-	  if (ins_pos == m_num_e)
-	    ins_pos = pos;
-	  break;
-        case valid_entry_status:
-	  if (hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), r_key))
-            {
-	      resize_base::notify_insert_search_end();
-	      PB_DS_CHECK_KEY_EXISTS(r_key)
-                return pos;
-            }
-	  break;
-        default:
-	  _GLIBCXX_DEBUG_ASSERT(0);
-        };
-
-      resize_base::notify_insert_search_collision();
-    }
-  resize_base::notify_insert_search_end();
-  if (ins_pos == m_num_e)
-    __throw_insert_error();
-  return ins_pos;
-}
-
-PB_DS_CLASS_T_DEC
-inline std::pair<typename PB_DS_CLASS_C_DEC::point_iterator, bool>
-PB_DS_CLASS_C_DEC::
-insert_imp(const_reference r_val, false_type)
-{
-  key_const_reference r_key = PB_DS_V2F(r_val);
-  const size_type pos = find_ins_pos(r_key, 
-				     traits_base::m_store_extra_indicator);
-
-  if (m_entries[pos].m_stat == valid_entry_status)
-    {
-      PB_DS_CHECK_KEY_EXISTS(r_key)
-      return std::make_pair(&(m_entries + pos)->m_value, false);
-    }
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-  return std::make_pair(insert_new_imp(r_val, pos), true);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
deleted file mode 100644
index ddc0a1f..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,118 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/insert_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s find related functions,
- * when the hash value is stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::comp_hash
-PB_DS_CLASS_C_DEC::
-find_ins_pos(key_const_reference r_key, true_type)
-{
-  PB_DS_ASSERT_VALID((*this))
-  comp_hash pos_hash_pair = ranged_probe_fn_base::operator()(r_key);
-
-  size_type i;
-
-  /* The insertion position is initted to a non-legal value to indicate
-   *     that it has not been initted yet.
-   */
-  size_type ins_pos = m_num_e;
-  resize_base::notify_insert_search_start();
-  for (i = 0; i < m_num_e; ++i)
-    {
-      const size_type pos = ranged_probe_fn_base::operator()(r_key, pos_hash_pair.second, i);
-
-      entry* const p_e = m_entries + pos;
-      switch(p_e->m_stat)
-        {
-        case empty_entry_status:
-	  {
-            resize_base::notify_insert_search_end();
-	    PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-
-	    return ((ins_pos == m_num_e) ?
-		     std::make_pair(pos, pos_hash_pair.second) :
-		     std::make_pair(ins_pos, pos_hash_pair.second));
-	  }
-	  break;
-        case erased_entry_status:
-	  if (ins_pos == m_num_e)
-	    ins_pos = pos;
-	  break;
-        case valid_entry_status:
-	  if (hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), p_e->m_hash,
-					  r_key, pos_hash_pair.second))
-            {
-	      resize_base::notify_insert_search_end();
-	      PB_DS_CHECK_KEY_EXISTS(r_key)
-              return std::make_pair(pos, pos_hash_pair.second);
-            }
-	  break;
-        default:
-	  _GLIBCXX_DEBUG_ASSERT(0);
-        };
-      resize_base::notify_insert_search_collision();
-    }
-  resize_base::notify_insert_search_end();
-  if (ins_pos == m_num_e)
-    __throw_insert_error();
-  return std::make_pair(ins_pos, pos_hash_pair.second);
-}
-
-PB_DS_CLASS_T_DEC
-inline std::pair<typename PB_DS_CLASS_C_DEC::point_iterator, bool>
-PB_DS_CLASS_C_DEC::
-insert_imp(const_reference r_val, true_type)
-{
-  key_const_reference r_key = PB_DS_V2F(r_val);
-  comp_hash pos_hash_pair = find_ins_pos(r_key, 
-					 traits_base::m_store_extra_indicator);
-
-  _GLIBCXX_DEBUG_ASSERT(pos_hash_pair.first < m_num_e);
-  entry_pointer p_e =& m_entries[pos_hash_pair.first];
-  if (p_e->m_stat == valid_entry_status)
-    {
-      PB_DS_CHECK_KEY_EXISTS(r_key)
-      return std::make_pair(&p_e->m_value, false);
-    }
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-  return std::make_pair(insert_new_imp(r_val, pos_hash_pair), true);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
deleted file mode 100644
index c396084..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/iterator_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s iterators related functions, e.g.,
- * begin().
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::s_end_it;
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::s_const_end_it;
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-begin()
-{
-  pointer_ p_value;
-  size_type pos;
-  get_start_it_state(p_value, pos);
-  return iterator(p_value, pos, this);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-end()
-{ return s_end_it; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-begin() const
-{
-  const_pointer_ p_value;
-  size_type pos;
-  get_start_it_state(p_value, pos);
-  return const_iterator(p_value, pos, this);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-end() const
-{ return s_const_end_it; }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
deleted file mode 100644
index 7edb484..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/policy_access_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s policy agpess
- * functions.
- */
-
-PB_DS_CLASS_T_DEC
-Hash_Fn& 
-PB_DS_CLASS_C_DEC::
-get_hash_fn()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Hash_Fn& 
-PB_DS_CLASS_C_DEC::
-get_hash_fn() const
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-Eq_Fn& 
-PB_DS_CLASS_C_DEC::
-get_eq_fn()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Eq_Fn& 
-PB_DS_CLASS_C_DEC::
-get_eq_fn() const
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-Probe_Fn& 
-PB_DS_CLASS_C_DEC::
-get_probe_fn()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Probe_Fn& 
-PB_DS_CLASS_C_DEC::
-get_probe_fn() const
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-Comb_Probe_Fn& 
-PB_DS_CLASS_C_DEC::
-get_comb_probe_fn()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Comb_Probe_Fn& 
-PB_DS_CLASS_C_DEC::
-get_comb_probe_fn() const
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-Resize_Policy& 
-PB_DS_CLASS_C_DEC::
-get_resize_policy()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Resize_Policy& 
-PB_DS_CLASS_C_DEC::
-get_resize_policy() const
-{ return *this; }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
deleted file mode 100644
index 32feefe..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/resize_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s resize related functions.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-do_resize_if_needed()
-{
-  if (!resize_base::is_resize_needed())
-    return false;
-  resize_imp(resize_base::get_new_size(m_num_e, m_num_used_e));
-  return true;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-do_resize(size_type n)
-{ resize_imp(resize_base::get_nearest_larger_size(n)); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-do_resize_if_needed_no_throw()
-{
-  if (!resize_base::is_resize_needed())
-    return;
-
-  __try
-    {
-      resize_imp(resize_base::get_new_size(m_num_e, m_num_used_e));
-    }
-  __catch(...)
-    { }
-
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-resize_imp(size_type new_size)
-{
-#ifdef PB_DS_REGRESSION
-  typename _Alloc::group_adjustor adjust(m_num_e);
-#endif 
-
-  if (new_size == m_num_e)
-    return;
-
-  PB_DS_ASSERT_VALID((*this))
-  const size_type old_size = m_num_e;
-  entry_array a_entries_resized = 0;
-
-  // Following line might throw an exception.
-  a_entries_resized = s_entry_allocator.allocate(new_size);
-
-  ranged_probe_fn_base::notify_resized(new_size);
-  m_num_e = new_size;
-
-  for (size_type i = 0; i < m_num_e; ++i)
-    a_entries_resized[i].m_stat = empty_entry_status;
-
-  __try
-    {
-      resize_imp(a_entries_resized, old_size);
-    }
-  __catch(...)
-    {
-      erase_all_valid_entries(a_entries_resized, new_size);
-      m_num_e = old_size;
-      s_entry_allocator.deallocate(a_entries_resized, new_size);
-      ranged_probe_fn_base::notify_resized(old_size);
-      __throw_exception_again;
-    }
-
-  // At this point no exceptions can be thrown.
-  _GLIBCXX_DEBUG_ONLY(assert_entry_array_valid(a_entries_resized,
-					       traits_base::m_store_extra_indicator,
-					       __FILE__, __LINE__);)
-
-  Resize_Policy::notify_resized(new_size);
-  erase_all_valid_entries(m_entries, old_size);
-  s_entry_allocator.deallocate(m_entries, old_size);
-  m_entries = a_entries_resized;
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-resize_imp(entry_array a_entries_resized, size_type old_size)
-{
-  for (size_type pos = 0; pos < old_size; ++pos)
-    if (m_entries[pos].m_stat == valid_entry_status)
-      resize_imp_reassign(m_entries + pos, a_entries_resized, 
-			  traits_base::m_store_extra_indicator);
-}
-
-#include <ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp>
-#include <ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp>
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
deleted file mode 100644
index 08e6a7e..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s resize related functions, when the
- * hash value is not stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-resize_imp_reassign(entry_pointer p_e, entry_array a_entries_resized, 
-		    false_type)
-{
-  key_const_reference r_key = PB_DS_V2F(p_e->m_value);
-  size_type hash = ranged_probe_fn_base::operator()(r_key);
-  size_type i;
-  for (i = 0; i < m_num_e; ++i)
-    {
-      const size_type pos = ranged_probe_fn_base::operator()(r_key, hash, i);
-      entry_pointer p_new_e = a_entries_resized + pos;
-      switch(p_new_e->m_stat)
-        {
-        case empty_entry_status:
-	  new (&p_new_e->m_value) value_type(p_e->m_value);
-	  p_new_e->m_stat = valid_entry_status;
-	  return;
-        case erased_entry_status:
-	  _GLIBCXX_DEBUG_ASSERT(0);
-	  break;
-        case valid_entry_status:
-	  break;
-        default:
-	  _GLIBCXX_DEBUG_ASSERT(0);
-        };
-    }
-  __throw_insert_error();
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
deleted file mode 100644
index 5c4e9db..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/resize_store_hash_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s resize related functions, when the
- * hash value is stored.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-resize_imp_reassign(entry_pointer p_e, entry_array a_entries_resized, 
-		    true_type)
-{
-  key_const_reference r_key = PB_DS_V2F(p_e->m_value);
-  size_type hash = ranged_probe_fn_base::operator()(r_key, p_e->m_hash);
-
-  size_type i;
-  for (i = 0; i < m_num_e; ++i)
-    {
-      const size_type pos = ranged_probe_fn_base::operator()(r_key, hash, i);
-      entry_pointer p_new_e = a_entries_resized + pos;
-      switch(p_new_e->m_stat)
-        {
-        case empty_entry_status:
-	  new (&p_new_e->m_value) value_type(p_e->m_value);
-	  p_new_e->m_hash = hash;
-	  p_new_e->m_stat = valid_entry_status;
-	  return;
-        case erased_entry_status:
-	  _GLIBCXX_DEBUG_ASSERT(0);
-	  break;
-        case valid_entry_status:
-	  break;
-        default:
-	  _GLIBCXX_DEBUG_ASSERT(0);
-        };
-    }
-  __throw_insert_error();
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
deleted file mode 100644
index 74774bc..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file gp_hash_table_map_/trace_fn_imps.hpp
- * Contains implementations of gp_ht_map_'s trace-mode functions.
- */
-
-#ifdef PB_DS_HT_MAP_TRACE_
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace() const
-{
-  std::cerr << static_cast<unsigned long>(m_num_e) << " " <<
-    static_cast<unsigned long>(m_num_used_e) << std::endl;
-
-  for (size_type i = 0; i < m_num_e; ++i)
-    {
-      std::cerr << static_cast<unsigned long>(i) << " ";
-
-      switch(m_entries[i].m_stat)
-        {
-	case empty_entry_status:
-	  std::cerr << "<empty>";
-	  break;
-	case erased_entry_status:
-	  std::cerr << "<erased>";
-	  break;
-	case valid_entry_status:
-	  std::cerr << PB_DS_V2F(m_entries[i].m_value);
-	  break;
-	default:
-	  _GLIBCXX_DEBUG_ASSERT(0);
-	};
-
-      std::cerr << std::endl;
-    }
-}
-
-#endif // #ifdef PB_DS_HT_MAP_TRACE_
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
deleted file mode 100644
index 0f3c79d..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file direct_mask_range_hashing_imp.hpp
- * Contains a range-hashing policy implementation
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{ mask_based_base::swap(other); }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-notify_resized(size_type size)
-{ mask_based_base::notify_resized(size); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-operator()(size_type hash) const
-{ return mask_based_base::range_hash(hash); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
deleted file mode 100644
index bd4bb69..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file direct_mod_range_hashing_imp.hpp
- * Contains a range-hashing policy implementation
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{ mod_based_base::swap(other); }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-notify_resized(size_type n)
-{ mod_based_base::notify_resized(n); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-operator()(size_type hash) const
-{ return mod_based_base::range_hash(hash); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
deleted file mode 100644
index 1e8b115..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file linear_probe_fn_imp.hpp
- * Contains a probe policy implementation
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{ }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-operator()(size_type i) const
-{
-  return (i);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
deleted file mode 100644
index 08edb79..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file mask_based_range_hashing.hpp
- * Contains a range hashing policy base.
- */
-
-#ifndef PB_DS_MASK_BASED_RANGE_HASHING_HPP
-#define PB_DS_MASK_BASED_RANGE_HASHING_HPP
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Range hashing policy.
-    template<typename Size_Type>
-    class mask_based_range_hashing
-    {
-    protected:
-      typedef Size_Type 	size_type;
-
-      void
-      swap(mask_based_range_hashing& other)
-      { std::swap(m_mask, other.m_mask); }
-
-      void
-      notify_resized(size_type size);
-
-      inline size_type
-      range_hash(size_type hash) const
-      { return size_type(hash & m_mask); }
-
-    private:
-      size_type 		m_mask;
-      const static size_type 	s_num_bits_in_size_type;
-      const static size_type 	s_highest_bit_1;
-    };
-
-    template<typename Size_Type>
-    const typename mask_based_range_hashing<Size_Type>::size_type
-    mask_based_range_hashing<Size_Type>::s_num_bits_in_size_type =
-      sizeof(typename mask_based_range_hashing<Size_Type>::size_type) << 3;
-
-    template<typename Size_Type>
-    const typename mask_based_range_hashing<Size_Type>::size_type mask_based_range_hashing<Size_Type>::s_highest_bit_1 = static_cast<typename mask_based_range_hashing<Size_Type>::size_type>(1) << (s_num_bits_in_size_type - 1);
-
- 
-    template<typename Size_Type>
-    void
-    mask_based_range_hashing<Size_Type>::
-    notify_resized(size_type size)
-    {
-      size_type i = 0;
-      while (size ^ s_highest_bit_1)
-	{
-	  size <<= 1;
-	  ++i;
-	}
-
-      m_mask = 1;
-      i += 2;
-      while (i++ < s_num_bits_in_size_type)
-        m_mask = (m_mask << 1) ^ 1;
-    }
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
deleted file mode 100644
index 7b9667c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file mod_based_range_hashing.hpp
- * Contains a range hashing policy base.
- */
-
-#ifndef PB_DS_MOD_BASED_RANGE_HASHING_HPP
-#define PB_DS_MOD_BASED_RANGE_HASHING_HPP
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Mod based range hashing.
-    template<typename Size_Type>
-    class mod_based_range_hashing
-    {
-    protected:
-      typedef Size_Type 	size_type;
-
-      void
-      swap(mod_based_range_hashing& other)
-      { std::swap(m_size, other.m_size); }
-
-      void
-      notify_resized(size_type s)
-      { m_size = s; }
-
-      inline size_type
-      range_hash(size_type s) const
-      { return s % m_size; }
-
-    private:
-      size_type m_size;
-    };
-  } // namespace detail
-
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_MOD_BASED_RANGE_HASHING_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
deleted file mode 100644
index 228cb92..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file probe_fn_base.hpp
- * Contains a probe policy base.
- */
-
-#ifndef PB_DS_PROBE_FN_BASE_HPP
-#define PB_DS_PROBE_FN_BASE_HPP
-
-#include <functional>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Probe functor base.
-    template<typename _Alloc>
-    class probe_fn_base
-    {
-    protected:
-      ~probe_fn_base() { }
-    };
-} // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
deleted file mode 100644
index 7550a87..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file quadratic_probe_fn_imp.hpp
- * Contains a probe policy implementation
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{ }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-operator()(size_type i) const
-{
-  return (i*  i);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
deleted file mode 100644
index ff42529..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
+++ /dev/null
@@ -1,359 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ranged_hash_fn.hpp
- * Contains a unified ranged hash functor, allowing the hash tables
- * to deal with a single class for ranged hashing.
- */
-
-#ifndef PB_DS_RANGED_HASH_FN_HPP
-#define PB_DS_RANGED_HASH_FN_HPP
-
-#include <utility>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Primary template.
-    template<typename Key, typename Hash_Fn, typename _Alloc, 
-	     typename Comb_Hash_Fn, bool Store_Hash>
-    class ranged_hash_fn;
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Hash_Fn, typename _Alloc, \
-	     typename Comb_Hash_Fn>
-
-#define PB_DS_CLASS_C_DEC \
-    ranged_hash_fn<Key,	Hash_Fn, _Alloc, Comb_Hash_Fn, false>
-
-    /**
-     * Specialization 1
-     * The client supplies a hash function and a ranged hash function,
-     * and requests that hash values not be stored.
-     **/
-    template<typename Key, typename Hash_Fn, typename _Alloc, 
-	     typename Comb_Hash_Fn>
-    class ranged_hash_fn< Key, Hash_Fn, _Alloc, Comb_Hash_Fn, false> 
-    : public Hash_Fn, public Comb_Hash_Fn
-    {
-    protected:
-      typedef typename _Alloc::size_type size_type;
-      typedef Hash_Fn hash_fn_base;
-      typedef Comb_Hash_Fn comb_hash_fn_base;
-      typedef typename _Alloc::template rebind< Key>::other key_allocator;
-      typedef typename key_allocator::const_reference key_const_reference;
-
-      ranged_hash_fn(size_type);
-
-      ranged_hash_fn(size_type, const Hash_Fn&);
-
-      ranged_hash_fn(size_type, const Hash_Fn&, const Comb_Hash_Fn&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      void
-      notify_resized(size_type);
-
-      inline size_type
-      operator()(key_const_reference) const;
-    };
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size)
-    { Comb_Hash_Fn::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size, const Hash_Fn& r_hash_fn) 
-    : Hash_Fn(r_hash_fn)
-    { Comb_Hash_Fn::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size, const Hash_Fn& r_hash_fn, 
-		   const Comb_Hash_Fn& r_comb_hash_fn) 
-    : Hash_Fn(r_hash_fn), Comb_Hash_Fn(r_comb_hash_fn)
-    { comb_hash_fn_base::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    swap(PB_DS_CLASS_C_DEC& other)
-    {
-      comb_hash_fn_base::swap(other);
-      std::swap((Hash_Fn& )(*this), (Hash_Fn& )other);
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    notify_resized(size_type size)
-    { comb_hash_fn_base::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::size_type
-    PB_DS_CLASS_C_DEC::
-    operator()(key_const_reference r_key) const
-    { return (comb_hash_fn_base::operator()(hash_fn_base::operator()(r_key)));}
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Hash_Fn, typename _Alloc, \
-	     typename Comb_Hash_Fn>
-
-#define PB_DS_CLASS_C_DEC \
-    ranged_hash_fn<Key,Hash_Fn,	_Alloc, Comb_Hash_Fn, true>
-
-    /**
-     * Specialization 2
-     * The client supplies a hash function and a ranged hash function,
-     * and requests that hash values be stored.
-     **/
-    template<typename Key, typename Hash_Fn, typename _Alloc,
-	     typename Comb_Hash_Fn>
-    class ranged_hash_fn<Key, Hash_Fn, _Alloc, Comb_Hash_Fn, true> 
-    : public Hash_Fn, public Comb_Hash_Fn
-    {
-    protected:
-      typedef typename _Alloc::size_type size_type;
-      typedef std::pair<size_type, size_type> comp_hash;
-      typedef Hash_Fn hash_fn_base;
-      typedef Comb_Hash_Fn comb_hash_fn_base;
-      typedef typename _Alloc::template rebind<Key>::other key_allocator;
-      typedef typename key_allocator::const_reference key_const_reference;
-
-      ranged_hash_fn(size_type);
-
-      ranged_hash_fn(size_type, const Hash_Fn&);
-
-      ranged_hash_fn(size_type, const Hash_Fn&, const Comb_Hash_Fn&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      void
-      notify_resized(size_type);
-
-      inline comp_hash
-      operator()(key_const_reference) const;
-
-      inline comp_hash
-      operator()(key_const_reference, size_type) const;
-    };
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size)
-    { Comb_Hash_Fn::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size, const Hash_Fn& r_hash_fn) :
-      Hash_Fn(r_hash_fn)
-    { Comb_Hash_Fn::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size, const Hash_Fn& r_hash_fn, 
-		   const Comb_Hash_Fn& r_comb_hash_fn) 
-    : Hash_Fn(r_hash_fn), Comb_Hash_Fn(r_comb_hash_fn)
-    { comb_hash_fn_base::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    swap(PB_DS_CLASS_C_DEC& other)
-    {
-      comb_hash_fn_base::swap(other);
-      std::swap((Hash_Fn& )(*this), (Hash_Fn& )other);
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    notify_resized(size_type size)
-    { comb_hash_fn_base::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::comp_hash
-    PB_DS_CLASS_C_DEC::
-    operator()(key_const_reference r_key) const
-    {
-      const size_type hash = hash_fn_base::operator()(r_key);
-      return std::make_pair(comb_hash_fn_base::operator()(hash), hash);
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::comp_hash
-    PB_DS_CLASS_C_DEC::
-    operator()
-#ifdef _GLIBCXX_DEBUG
-      (key_const_reference r_key, size_type hash) const
-#else 
-      (key_const_reference /*r_key*/, size_type hash) const
-#endif
-    {
-      _GLIBCXX_DEBUG_ASSERT(hash == hash_fn_base::operator()(r_key));
-      return std::make_pair(comb_hash_fn_base::operator()(hash), hash);
-    }
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename _Alloc, typename Comb_Hash_Fn>
-
-#define PB_DS_CLASS_C_DEC \
-    ranged_hash_fn<Key,	null_type, _Alloc, Comb_Hash_Fn, false>
-
-    /**
-     * Specialization 3
-     * The client does not supply a hash function (by specifying
-     * null_type as the Hash_Fn parameter), and requests that hash
-     * values not be stored.
-     **/
-    template<typename Key, typename _Alloc, typename Comb_Hash_Fn>
-    class ranged_hash_fn<Key, null_type, _Alloc, Comb_Hash_Fn, false> 
-    : public Comb_Hash_Fn
-    {
-    protected:
-      typedef typename _Alloc::size_type size_type;
-      typedef Comb_Hash_Fn comb_hash_fn_base;
-
-      ranged_hash_fn(size_type);
-
-      ranged_hash_fn(size_type, const Comb_Hash_Fn&);
-
-      ranged_hash_fn(size_type, const null_type&, const Comb_Hash_Fn&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-    };
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size)
-    { Comb_Hash_Fn::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size, const Comb_Hash_Fn& r_comb_hash_fn) :
-      Comb_Hash_Fn(r_comb_hash_fn)
-    { }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size, const null_type& r_null_type, 
-		   const Comb_Hash_Fn& r_comb_hash_fn) 
-    : Comb_Hash_Fn(r_comb_hash_fn)
-    { }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    swap(PB_DS_CLASS_C_DEC& other)
-    { comb_hash_fn_base::swap(other); }
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename _Alloc, typename Comb_Hash_Fn>
-
-#define PB_DS_CLASS_C_DEC \
-    ranged_hash_fn<Key,	null_type, _Alloc, Comb_Hash_Fn, true>
-
-    /**
-     * Specialization 4
-     * The client does not supply a hash function (by specifying
-     * null_type as the Hash_Fn parameter), and requests that hash
-     * values be stored.
-     **/
-    template<typename Key, typename _Alloc, typename Comb_Hash_Fn>
-    class ranged_hash_fn<Key, null_type, _Alloc, Comb_Hash_Fn, true> 
-    : public Comb_Hash_Fn
-    {
-    protected:
-      typedef typename _Alloc::size_type size_type;
-      typedef Comb_Hash_Fn comb_hash_fn_base;
-
-      ranged_hash_fn(size_type);
-
-      ranged_hash_fn(size_type, const Comb_Hash_Fn&);
-
-      ranged_hash_fn(size_type, const null_type&, const Comb_Hash_Fn&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-    };
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size)
-    { Comb_Hash_Fn::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size, const Comb_Hash_Fn& r_comb_hash_fn) 
-    : Comb_Hash_Fn(r_comb_hash_fn)
-    { }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_hash_fn(size_type size, const null_type& r_null_type, 
-		   const Comb_Hash_Fn& r_comb_hash_fn) 
-    : Comb_Hash_Fn(r_comb_hash_fn)
-    { }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    swap(PB_DS_CLASS_C_DEC& other)
-    { comb_hash_fn_base::swap(other); }
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
deleted file mode 100644
index ec69396..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
+++ /dev/null
@@ -1,327 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ranged_probe_fn.hpp
- * Contains a unified ranged probe functor, allowing the probe tables to deal with
- *    a single class for ranged probeing.
- */
-
-#ifndef PB_DS_RANGED_PROBE_FN_HPP
-#define PB_DS_RANGED_PROBE_FN_HPP
-
-#include <utility>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Primary template.
-    template<typename Key, typename Hash_Fn, typename _Alloc,
-	     typename Comb_Probe_Fn, typename Probe_Fn, bool Store_Hash>
-    class ranged_probe_fn;
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Hash_Fn, typename _Alloc, \
-	     typename Comb_Probe_Fn, typename Probe_Fn>
-
-#define PB_DS_CLASS_C_DEC \
-    ranged_probe_fn<Key, Hash_Fn, _Alloc, Comb_Probe_Fn, Probe_Fn, false>
-
-    /**
-     * Specialization 1     
-     * The client supplies a probe function and a ranged probe
-     * function, and requests that hash values not be stored.
-     **/
-    template<typename Key, typename Hash_Fn, typename _Alloc,
-	     typename Comb_Probe_Fn, typename Probe_Fn>
-    class ranged_probe_fn<Key, Hash_Fn, _Alloc, Comb_Probe_Fn,
-			  Probe_Fn, false> 
-    : public Hash_Fn, public Comb_Probe_Fn, public Probe_Fn
-    {
-    protected:
-      typedef typename _Alloc::size_type size_type;
-      typedef Comb_Probe_Fn comb_probe_fn_base;
-      typedef Hash_Fn hash_fn_base;
-      typedef Probe_Fn probe_fn_base;
-      typedef typename _Alloc::template rebind<Key>::other key_allocator;
-      typedef typename key_allocator::const_reference key_const_reference;
-
-      ranged_probe_fn(size_type);
-
-      ranged_probe_fn(size_type, const Hash_Fn&);
-
-      ranged_probe_fn(size_type, const Hash_Fn&, const Comb_Probe_Fn&);
-
-      ranged_probe_fn(size_type, const Hash_Fn&, const Comb_Probe_Fn&, 
-		      const Probe_Fn&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      void
-      notify_resized(size_type);
-
-      inline size_type
-      operator()(key_const_reference) const;
-
-      inline size_type
-      operator()(key_const_reference, size_type, size_type) const;
-    };
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_probe_fn(size_type size)
-    { Comb_Probe_Fn::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_probe_fn(size_type size, const Hash_Fn& r_hash_fn) 
-    : Hash_Fn(r_hash_fn)
-    { Comb_Probe_Fn::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_probe_fn(size_type size, const Hash_Fn& r_hash_fn, 
-		    const Comb_Probe_Fn& r_comb_probe_fn) 
-    : Hash_Fn(r_hash_fn), Comb_Probe_Fn(r_comb_probe_fn)
-    { comb_probe_fn_base::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_probe_fn(size_type size, const Hash_Fn& r_hash_fn, 
-		    const Comb_Probe_Fn& r_comb_probe_fn, 
-		    const Probe_Fn& r_probe_fn) 
-    : Hash_Fn(r_hash_fn), Comb_Probe_Fn(r_comb_probe_fn), Probe_Fn(r_probe_fn)
-    { comb_probe_fn_base::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    swap(PB_DS_CLASS_C_DEC& other)
-    {
-      comb_probe_fn_base::swap(other);
-      std::swap((Hash_Fn& )(*this), (Hash_Fn&)other);
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    notify_resized(size_type size)
-    { comb_probe_fn_base::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::size_type
-    PB_DS_CLASS_C_DEC::
-    operator()(key_const_reference r_key) const
-    { return comb_probe_fn_base::operator()(hash_fn_base::operator()(r_key)); }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::size_type
-    PB_DS_CLASS_C_DEC::
-    operator()(key_const_reference, size_type hash, size_type i) const
-    {
-      return comb_probe_fn_base::operator()(hash + probe_fn_base::operator()(i));
-    }
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Hash_Fn, typename _Alloc, \
-	     typename Comb_Probe_Fn, typename Probe_Fn>
-
-#define PB_DS_CLASS_C_DEC \
-    ranged_probe_fn<Key, Hash_Fn, _Alloc, Comb_Probe_Fn, Probe_Fn, true>
-
-    /**
-     * Specialization 2- The client supplies a probe function and a ranged
-     *    probe function, and requests that hash values not be stored.
-     **/
-    template<typename Key, typename Hash_Fn, typename _Alloc,
-	     typename Comb_Probe_Fn, typename Probe_Fn>
-    class ranged_probe_fn<Key, Hash_Fn, _Alloc, Comb_Probe_Fn, 
-			  Probe_Fn, true> 
-    : public Hash_Fn, public Comb_Probe_Fn, public Probe_Fn
-    {
-    protected:
-      typedef typename _Alloc::size_type size_type;
-      typedef std::pair<size_type, size_type> comp_hash;
-      typedef Comb_Probe_Fn comb_probe_fn_base;
-      typedef Hash_Fn hash_fn_base;
-      typedef Probe_Fn probe_fn_base;
-      typedef typename _Alloc::template rebind<Key>::other key_allocator;
-      typedef typename key_allocator::const_reference key_const_reference;
-
-      ranged_probe_fn(size_type);
-
-      ranged_probe_fn(size_type, const Hash_Fn&);
-
-      ranged_probe_fn(size_type, const Hash_Fn&, 
-		      const Comb_Probe_Fn&);
-
-      ranged_probe_fn(size_type, const Hash_Fn&, const Comb_Probe_Fn&, 
-		      const Probe_Fn&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      void
-      notify_resized(size_type);
-
-      inline comp_hash
-      operator()(key_const_reference) const;
-
-      inline size_type
-      operator()(key_const_reference, size_type, size_type) const;
-
-      inline size_type
-      operator()(key_const_reference, size_type) const;
-    };
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_probe_fn(size_type size)
-    { Comb_Probe_Fn::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_probe_fn(size_type size, const Hash_Fn& r_hash_fn) 
-    : Hash_Fn(r_hash_fn)
-    { Comb_Probe_Fn::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_probe_fn(size_type size, const Hash_Fn& r_hash_fn, 
-		    const Comb_Probe_Fn& r_comb_probe_fn) 
-    : Hash_Fn(r_hash_fn), Comb_Probe_Fn(r_comb_probe_fn)
-    { comb_probe_fn_base::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    ranged_probe_fn(size_type size, const Hash_Fn& r_hash_fn, 
-		    const Comb_Probe_Fn& r_comb_probe_fn, 
-		    const Probe_Fn& r_probe_fn) 
-    : Hash_Fn(r_hash_fn), Comb_Probe_Fn(r_comb_probe_fn), Probe_Fn(r_probe_fn)
-    { comb_probe_fn_base::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    swap(PB_DS_CLASS_C_DEC& other)
-    {
-      comb_probe_fn_base::swap(other);
-      std::swap((Hash_Fn& )(*this), (Hash_Fn& )other);
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    notify_resized(size_type size)
-    { comb_probe_fn_base::notify_resized(size); }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::comp_hash
-    PB_DS_CLASS_C_DEC::
-    operator()(key_const_reference r_key) const
-    {
-      const size_type hash = hash_fn_base::operator()(r_key);
-      return std::make_pair(comb_probe_fn_base::operator()(hash), hash);
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::size_type
-    PB_DS_CLASS_C_DEC::
-    operator()(key_const_reference, size_type hash, size_type i) const
-    {
-      return comb_probe_fn_base::operator()(hash + probe_fn_base::operator()(i));
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::size_type
-    PB_DS_CLASS_C_DEC::
-    operator()
-#ifdef _GLIBCXX_DEBUG
-      (key_const_reference r_key, size_type hash) const
-#else 
-      (key_const_reference /*r_key*/, size_type hash) const
-#endif 
-    {
-      _GLIBCXX_DEBUG_ASSERT(hash == hash_fn_base::operator()(r_key));
-      return hash;
-    }
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-    /**
-     * Specialization 3 and 4
-     * The client does not supply a hash function or probe function,
-     * and requests that hash values not be stored.
-     **/
-    template<typename Key, typename _Alloc, typename Comb_Probe_Fn>
-    class ranged_probe_fn<Key, null_type, _Alloc, Comb_Probe_Fn, 
-			  null_type, false> 
-    : public Comb_Probe_Fn
-    {
-    protected:
-      typedef typename _Alloc::size_type size_type;
-      typedef Comb_Probe_Fn comb_probe_fn_base;
-      typedef typename _Alloc::template rebind<Key>::other key_allocator;
-      typedef typename key_allocator::const_reference key_const_reference;
-
-      ranged_probe_fn(size_type size)
-      { Comb_Probe_Fn::notify_resized(size); }
-
-      ranged_probe_fn(size_type, const Comb_Probe_Fn& r_comb_probe_fn)
-      : Comb_Probe_Fn(r_comb_probe_fn)
-      { }
-
-      ranged_probe_fn(size_type, const null_type&, 
-		      const Comb_Probe_Fn& r_comb_probe_fn, 
-		      const null_type&)
-      : Comb_Probe_Fn(r_comb_probe_fn)
-      { }
-
-      void
-      swap(ranged_probe_fn& other)
-      { comb_probe_fn_base::swap(other); }
-    };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
deleted file mode 100644
index ac86777..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file sample_probe_fn.hpp
- * Contains a sample probe policy.
- */
-
-#ifndef PB_DS_SAMPLE_PROBE_FN_HPP
-#define PB_DS_SAMPLE_PROBE_FN_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample probe policy.
-  class sample_probe_fn
-  {
-  public:
-    typedef std::size_t size_type;
-
-    /// Default constructor.
-    sample_probe_fn();
-
-    /// Copy constructor.
-    sample_probe_fn(const sample_probe_fn&);
-
-    /// Swaps content.
-    inline void
-    swap(sample_probe_fn&);
-
-  protected:
-    /// Returns the i-th offset from the hash value of some key r_key.
-    inline size_type
-    operator()(key_const_reference r_key, size_type i) const;
-  };
-}
-#endif // #ifndef PB_DS_SAMPLE_PROBE_FN_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
deleted file mode 100644
index cf90ff6..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file sample_range_hashing.hpp
- * Contains a range hashing policy.
- */
-
-#ifndef PB_DS_SAMPLE_RANGE_HASHING_HPP
-#define PB_DS_SAMPLE_RANGE_HASHING_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample range-hashing functor.
-  class sample_range_hashing
-  {
-  public:
-    /// Size type.
-    typedef std::size_t size_type;
-
-    /// Default constructor.
-    sample_range_hashing();
-
-    /// Copy constructor.
-    sample_range_hashing(const sample_range_hashing& other);
-
-    /// Swaps content.
-    inline void
-    swap(sample_range_hashing& other);
-
-  protected:
-    /// Notifies the policy object that the container's size has
-    /// changed to argument's size.
-    void
-    notify_resized(size_type);
-
-    /// Transforms the __hash value hash into a ranged-hash value.
-    inline size_type
-    operator()(size_type ) const;
-  };
-}
-#endif // #ifndef PB_DS_SAMPLE_RANGE_HASHING_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
deleted file mode 100644
index b9063ef..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file sample_ranged_hash_fn.hpp
- * Contains a ranged hash policy.
- */
-
-#ifndef PB_DS_SAMPLE_RANGED_HASH_FN_HPP
-#define PB_DS_SAMPLE_RANGED_HASH_FN_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample ranged-hash functor.
-  class sample_ranged_hash_fn
-  {
-  public:
-    typedef std::size_t size_type;
-
-    /// Default constructor.
-    sample_ranged_hash_fn();
-
-    /// Copy constructor.
-    sample_ranged_hash_fn(const sample_ranged_hash_fn&);
-
-    /// Swaps content.
-    inline void
-    swap(sample_ranged_hash_fn&);
-
-  protected:
-
-    /// Notifies the policy object that the container's __size has
-    /// changed to size.
-    void
-    notify_resized(size_type);
-
-    /// Transforms key_const_reference into a position within the table.
-    inline size_type
-    operator()(key_const_reference) const;
-
-  };
-}
-#endif // #ifndef PB_DS_SAMPLE_RANGED_HASH_FN_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
deleted file mode 100644
index 1ffaadd..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file sample_ranged_probe_fn.hpp
- * Contains a ranged probe policy.
- */
-
-#ifndef PB_DS_SAMPLE_RANGED_PROBE_FN_HPP
-#define PB_DS_SAMPLE_RANGED_PROBE_FN_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample ranged-probe functor.
-  class sample_ranged_probe_fn
-  {
-  public:
-    typedef std::size_t 	size_type;
-
-    // Default constructor.
-    sample_ranged_probe_fn();
-
-    // Copy constructor.
-    sample_ranged_probe_fn(const sample_ranged_probe_fn&);
-
-    // Swaps content.
-    inline void
-    swap(sample_ranged_probe_fn&);
-
-  protected:
-
-    // Notifies the policy object that the container's __size has
-    // changed to size.
-    void
-    notify_resized(size_type);
-
-    // Transforms the const key reference r_key into the i-th position
-    // within the table. This method is called for each collision within
-    // the probe sequence.
-    inline size_type
-    operator()(key_const_reference, std::size_t, size_type) const;
-
-  };
-}
-#endif // #ifndef PB_DS_SAMPLE_RANGED_PROBE_FN_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
deleted file mode 100644
index fee80f1..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/const_iterator.hpp
- * Contains an iterator class returned by the table's const find and insert
- * methods.
- */
-
-#ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_CONST_ITERATOR_HPP
-#define PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_CONST_ITERATOR_HPP
-
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_CLASS_C_DEC  \
-    left_child_next_sibling_heap_const_iterator_<Node, _Alloc>
-
-#define PB_DS_BASIC_HEAP_CIT_BASE \
-    left_child_next_sibling_heap_node_point_const_iterator_<Node, _Alloc>
-
-    /// Const point-type iterator.
-    template<typename Node, typename _Alloc>
-    class left_child_next_sibling_heap_const_iterator_
-    : public PB_DS_BASIC_HEAP_CIT_BASE
-    {
-    private:
-      typedef PB_DS_BASIC_HEAP_CIT_BASE 	      	base_type;
-      typedef typename base_type::node_pointer		node_pointer;
-
-    public:
-      /// Category.
-      typedef std::forward_iterator_tag 		iterator_category;
-
-      /// Difference type.
-      typedef typename _Alloc::difference_type 		difference_type;
-
-      /// Iterator's value type.
-      typedef typename base_type::value_type 		value_type;
-
-      /// Iterator's pointer type.
-      typedef typename base_type::pointer 		pointer;
-
-      /// Iterator's const pointer type.
-      typedef typename base_type::const_pointer 	const_pointer;
-
-      /// Iterator's reference type.
-      typedef typename base_type::reference 		reference;
-
-      /// Iterator's const reference type.
-      typedef typename base_type::const_reference 	const_reference;
-
-      inline
-      left_child_next_sibling_heap_const_iterator_(node_pointer p_nd)
-      : base_type(p_nd)
-      { }
-
-      /// Default constructor.
-      inline
-      left_child_next_sibling_heap_const_iterator_()
-      { }
-
-      /// Copy constructor.
-      inline
-      left_child_next_sibling_heap_const_iterator_(const PB_DS_CLASS_C_DEC& other) : base_type(other)
-      { }
-
-      /// Compares content to a different iterator object.
-      bool
-      operator==(const PB_DS_CLASS_C_DEC& other) const
-      { return (base_type::m_p_nd == other.m_p_nd); }
-
-      /// Compares content (negatively) to a different iterator object.
-      bool
-      operator!=(const PB_DS_CLASS_C_DEC& other) const
-      { return (base_type::m_p_nd != other.m_p_nd); }
-
-      PB_DS_CLASS_C_DEC&
-      operator++()
-      {
-	_GLIBCXX_DEBUG_ASSERT(base_type::m_p_nd != 0);
-	inc();
-	return (*this);
-      }
-
-      PB_DS_CLASS_C_DEC
-      operator++(int)
-      {
-	PB_DS_CLASS_C_DEC ret_it(base_type::m_p_nd);
-	operator++();
-	return (ret_it);
-      }
-
-    private:
-      void
-      inc()
-      {
-	if (base_type::m_p_nd->m_p_next_sibling != 0)
-	  {
-	    base_type::m_p_nd = base_type::m_p_nd->m_p_next_sibling;
-	    while (base_type::m_p_nd->m_p_l_child != 0)
-	      base_type::m_p_nd = base_type::m_p_nd->m_p_l_child;
-	    return;
-	  }
-
-	while (true)
-	  {
-	    node_pointer p_next = base_type::m_p_nd;
-	    base_type::m_p_nd = base_type::m_p_nd->m_p_prev_or_parent;
-	    if (base_type::m_p_nd == 0
-		|| base_type::m_p_nd->m_p_l_child == p_next)
-	      return;
-	  }
-      }
-    };
-
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_BASIC_HEAP_CIT_BASE
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index 5e3bfcd..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
- * Contains an implementation class for left_child_next_sibling_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_allocator
-PB_DS_CLASS_C_DEC::s_node_allocator;
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::no_throw_copies_t
-PB_DS_CLASS_C_DEC::s_no_throw_copies_ind;
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-left_child_next_sibling_heap() :
-  m_p_root(0),
-  m_size(0)
-{
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-left_child_next_sibling_heap(const Cmp_Fn& r_cmp_fn) :
-  Cmp_Fn(r_cmp_fn),
-  m_p_root(0),
-  m_size(0)
-{
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-left_child_next_sibling_heap(const PB_DS_CLASS_C_DEC& other) 
-: Cmp_Fn(other), m_p_root(0), m_size(0)
-{
-  m_size = other.m_size;
-  PB_DS_ASSERT_VALID(other)
-  m_p_root = recursive_copy_node(other.m_p_root);
-  m_size = other.m_size;
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  value_swap(other);
-  std::swap((Cmp_Fn& )(*this), (Cmp_Fn& )other);
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-value_swap(PB_DS_CLASS_C_DEC& other)
-{
-  std::swap(m_p_root, other.m_p_root);
-  std::swap(m_size, other.m_size);
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~left_child_next_sibling_heap()
-{
-  clear();
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-recursive_copy_node(node_const_pointer p_nd)
-{
-  if (p_nd == 0)
-    return (0);
-
-  node_pointer p_ret = s_node_allocator.allocate(1);
-
-  __try
-    {
-      new (p_ret) node(*p_nd);
-    }
-  __catch(...)
-    {
-      s_node_allocator.deallocate(p_ret, 1);
-      __throw_exception_again;
-    }
-
-  p_ret->m_p_l_child = p_ret->m_p_next_sibling =
-    p_ret->m_p_prev_or_parent = 0;
-
-  __try
-    {
-      p_ret->m_p_l_child = recursive_copy_node(p_nd->m_p_l_child);
-      p_ret->m_p_next_sibling = recursive_copy_node(p_nd->m_p_next_sibling);
-    }
-  __catch(...)
-    {
-      clear_imp(p_ret);
-      __throw_exception_again;
-    }
-
-  if (p_ret->m_p_l_child != 0)
-    p_ret->m_p_l_child->m_p_prev_or_parent = p_ret;
-
-  if (p_ret->m_p_next_sibling != 0)
-    p_ret->m_p_next_sibling->m_p_prev_or_parent =
-      p_nd->m_p_next_sibling->m_p_prev_or_parent == p_nd ? p_ret : 0;
-
-  return p_ret;
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
deleted file mode 100644
index 2ed6aee..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/debug_fn_imps.hpp
- * Contains an implementation class for left_child_next_sibling_heap_.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  PB_DS_DEBUG_VERIFY(m_p_root == 0 || m_p_root->m_p_prev_or_parent == 0);
-
-  if (m_p_root != 0)
-    assert_node_consistent(m_p_root, Single_Link_Roots, __file, __line);
-  assert_size(__file, __line);
-  assert_iterators(__file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_node_consistent(node_const_pointer p_nd, bool single_link,
-		       const char* __file, int __line) const
-{
-  if (p_nd == 0)
-    return;
-
-  assert_node_consistent(p_nd->m_p_l_child, false, __file, __line);
-  assert_node_consistent(p_nd->m_p_next_sibling, single_link, __file, __line);
-
-  if (single_link)
-    PB_DS_DEBUG_VERIFY(p_nd->m_p_prev_or_parent == 0);
-  else if (p_nd->m_p_next_sibling != 0)
-    PB_DS_DEBUG_VERIFY(p_nd->m_p_next_sibling->m_p_prev_or_parent == p_nd);
-
-  if (p_nd->m_p_l_child == 0)
-    return;
-
-  node_const_pointer p_child = p_nd->m_p_l_child;
-  while (p_child != 0)
-    {
-      node_const_pointer p_next_child = p_child->m_p_next_sibling;
-      PB_DS_DEBUG_VERIFY(!Cmp_Fn::operator()(p_nd->m_value, p_child->m_value));
-      p_child = p_next_child;
-    }
-  PB_DS_DEBUG_VERIFY(p_nd->m_p_l_child->m_p_prev_or_parent == p_nd);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_iterators(const char* __file, int __line) const
-{
-  PB_DS_DEBUG_VERIFY(std::distance(begin(), end()) == size());
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_size(const char* __file, int __line) const
-{
-  PB_DS_DEBUG_VERIFY(size_from_node(m_p_root) == m_size);
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size_under_node(node_const_pointer p_nd)
-{ return 1 + size_from_node(p_nd->m_p_l_child); }
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size_from_node(node_const_pointer p_nd)
-{
-  size_type ret = 0;
-  while (p_nd != 0)
-    {
-      ret += 1 + size_from_node(p_nd->m_p_l_child);
-      p_nd = p_nd->m_p_next_sibling;
-    }
-  return ret;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-degree(node_const_pointer p_nd)
-{
-  size_type ret = 0;
-  node_const_pointer p_child = p_nd->m_p_l_child;
-  while (p_child != 0)
-    {
-      ++ret;
-      p_child = p_child->m_p_next_sibling;
-    }
-  return ret;
-}
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
deleted file mode 100644
index 0361d1a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/erase_fn_imps.hpp
- * Contains an implementation class for left_child_next_sibling_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  clear_imp(m_p_root);
-  _GLIBCXX_DEBUG_ASSERT(m_size == 0);
-  m_p_root = 0;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-actual_erase_node(node_pointer p_nd)
-{
-  _GLIBCXX_DEBUG_ASSERT(m_size > 0);
-  --m_size;
-  p_nd->~node();
-  s_node_allocator.deallocate(p_nd, 1);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear_imp(node_pointer p_nd)
-{
-  while (p_nd != 0)
-    {
-      clear_imp(p_nd->m_p_l_child);
-      node_pointer p_next = p_nd->m_p_next_sibling;
-      actual_erase_node(p_nd);
-      p_nd = p_next;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-to_linked_list()
-{
-  PB_DS_ASSERT_VALID((*this))
-  node_pointer p_cur = m_p_root;
-  while (p_cur != 0)
-    if (p_cur->m_p_l_child != 0)
-      {
-	node_pointer p_child_next = p_cur->m_p_l_child->m_p_next_sibling;
-	p_cur->m_p_l_child->m_p_next_sibling = p_cur->m_p_next_sibling;
-	p_cur->m_p_next_sibling = p_cur->m_p_l_child;
-	p_cur->m_p_l_child = p_child_next;
-      }
-    else
-      p_cur = p_cur->m_p_next_sibling;
-
-#ifdef _GLIBCXX_DEBUG
-  node_const_pointer p_counter = m_p_root;
-  size_type count = 0;
-  while (p_counter != 0)
-    {
-      ++count;
-      _GLIBCXX_DEBUG_ASSERT(p_counter->m_p_l_child == 0);
-      p_counter = p_counter->m_p_next_sibling;
-    }
-  _GLIBCXX_DEBUG_ASSERT(count == m_size);
-#endif 
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-prune(Pred pred)
-{
-  node_pointer p_cur = m_p_root;
-  m_p_root = 0;
-  node_pointer p_out = 0;
-  while (p_cur != 0)
-    {
-      node_pointer p_next = p_cur->m_p_next_sibling;
-      if (pred(p_cur->m_value))
-        {
-	  p_cur->m_p_next_sibling = p_out;
-	  if (p_out != 0)
-	    p_out->m_p_prev_or_parent = p_cur;
-	  p_out = p_cur;
-        }
-      else
-        {
-	  p_cur->m_p_next_sibling = m_p_root;
-	  if (m_p_root != 0)
-	    m_p_root->m_p_prev_or_parent = p_cur;
-	  m_p_root = p_cur;
-        }
-      p_cur = p_next;
-    }
-  return p_out;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-bubble_to_top(node_pointer p_nd)
-{
-  node_pointer p_parent = parent(p_nd);
-  while (p_parent != 0)
-    {
-      swap_with_parent(p_nd, p_parent);
-      p_parent = parent(p_nd);
-    }
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
deleted file mode 100644
index be95807..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/info_fn_imps.hpp
- * Contains an implementation class for left_child_next_sibling_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-empty() const
-{
-  return (m_size == 0);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size() const
-{
-  return (m_size);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-max_size() const
-{
-  return (s_node_allocator.max_size());
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
deleted file mode 100644
index d100b97..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/insert_fn_imps.hpp
- * Contains an implementation class for left_child_next_sibling_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-get_new_node_for_insert(const_reference r_val)
-{
-  return get_new_node_for_insert(r_val, s_no_throw_copies_ind);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-get_new_node_for_insert(const_reference r_val, false_type)
-{
-  node_pointer p_new_nd = s_node_allocator.allocate(1);
-
-  cond_dealtor_t cond(p_new_nd);
-
-  new (const_cast<void* >(
-			  static_cast<const void* >(&p_new_nd->m_value)))
-    typename node::value_type(r_val);
-
-  cond.set_no_action();
-
-  ++m_size;
-
-  return (p_new_nd);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-get_new_node_for_insert(const_reference r_val, true_type)
-{
-  node_pointer p_new_nd = s_node_allocator.allocate(1);
-
-  new (const_cast<void* >(
-			  static_cast<const void* >(&p_new_nd->m_value)))
-    typename node::value_type(r_val);
-
-  ++m_size;
-
-  return (p_new_nd);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-make_child_of(node_pointer p_nd, node_pointer p_new_parent)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_new_parent != 0);
-
-  p_nd->m_p_next_sibling = p_new_parent->m_p_l_child;
-
-  if (p_new_parent->m_p_l_child != 0)
-    p_new_parent->m_p_l_child->m_p_prev_or_parent = p_nd;
-
-  p_nd->m_p_prev_or_parent = p_new_parent;
-
-  p_new_parent->m_p_l_child = p_nd;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-parent(node_pointer p_nd)
-{
-  while (true)
-    {
-      node_pointer p_pot = p_nd->m_p_prev_or_parent;
-
-      if (p_pot == 0 || p_pot->m_p_l_child == p_nd)
-	return p_pot;
-
-      p_nd = p_pot;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-swap_with_parent(node_pointer p_nd, node_pointer p_parent)
-{
-  if (p_parent == m_p_root)
-    m_p_root = p_nd;
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_parent != 0);
-  _GLIBCXX_DEBUG_ASSERT(parent(p_nd) == p_parent);
-
-  const bool nd_direct_child = p_parent->m_p_l_child == p_nd;
-  const bool parent_root = p_parent->m_p_prev_or_parent == 0;
-  const bool parent_direct_child =
-    !parent_root&&  p_parent->m_p_prev_or_parent->m_p_l_child == p_parent;
-
-  std::swap(p_parent->m_p_prev_or_parent, p_nd->m_p_prev_or_parent);
-  std::swap(p_parent->m_p_next_sibling, p_nd->m_p_next_sibling);
-  std::swap(p_parent->m_p_l_child, p_nd->m_p_l_child);
-  std::swap(p_parent->m_metadata, p_nd->m_metadata);
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_l_child != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_prev_or_parent != 0);
-
-  if (p_nd->m_p_next_sibling != 0)
-    p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd;
-
-  if (p_parent->m_p_next_sibling != 0)
-    p_parent->m_p_next_sibling->m_p_prev_or_parent = p_parent;
-
-  if (p_parent->m_p_l_child != 0)
-    p_parent->m_p_l_child->m_p_prev_or_parent = p_parent;
-
-  if (parent_direct_child)
-    p_nd->m_p_prev_or_parent->m_p_l_child = p_nd;
-  else if (!parent_root)
-    p_nd->m_p_prev_or_parent->m_p_next_sibling = p_nd;
-
-  if (!nd_direct_child)
-    {
-      p_nd->m_p_l_child->m_p_prev_or_parent = p_nd;
-
-      p_parent->m_p_prev_or_parent->m_p_next_sibling = p_parent;
-    }
-  else
-    {
-      _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_l_child == p_nd);
-      _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_prev_or_parent == p_parent);
-
-      p_nd->m_p_l_child = p_parent;
-      p_parent->m_p_prev_or_parent = p_nd;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(parent(p_parent) == p_nd);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
deleted file mode 100644
index 74f8bcc..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/iterators_fn_imps.hpp
- * Contains an implementation class for left_child_next_sibling_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-begin()
-{
-  node_pointer p_nd = m_p_root;
-
-  if (p_nd == 0)
-    return (iterator(0));
-
-  while (p_nd->m_p_l_child != 0)
-    p_nd = p_nd->m_p_l_child;
-
-  return (iterator(p_nd));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-begin() const
-{
-  node_pointer p_nd = m_p_root;
-
-  if (p_nd == 0)
-    return (const_iterator(0));
-
-  while (p_nd->m_p_l_child != 0)
-    p_nd = p_nd->m_p_l_child;
-
-  return (const_iterator(p_nd));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-end()
-{
-  return (iterator(0));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-end() const
-{
-  return (const_iterator(0));
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
deleted file mode 100644
index 874abc5..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
+++ /dev/null
@@ -1,286 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
- * Contains an implementation class for a basic heap.
- */
-
-#ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_HPP
-#define PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_HPP
-
-/*
- * Based on CLRS.
- */
-
-#include <iterator>
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp>
-#ifdef PB_DS_LC_NS_HEAP_TRACE_
-#include <iostream>
-#endif
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#ifdef _GLIBCXX_DEBUG
-#define PB_DS_CLASS_T_DEC \
-    template<typename Value_Type, typename Cmp_Fn, typename Node_Metadata, \
-	     typename _Alloc, bool Single_Link_Roots>
-
-#define PB_DS_CLASS_C_DEC \
-    left_child_next_sibling_heap<Value_Type, Cmp_Fn, Node_Metadata,	\
-				  _Alloc, Single_Link_Roots>
-#else
-#define PB_DS_CLASS_T_DEC \
-    template<typename Value_Type, typename Cmp_Fn, typename Node_Metadata, \
-	     typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    left_child_next_sibling_heap<Value_Type, Cmp_Fn, Node_Metadata, _Alloc>
-#endif
-
-    /// Base class for a basic heap.
-    template<typename Value_Type,
-	     typename Cmp_Fn,
-	     typename Node_Metadata,
-	     typename _Alloc
-#ifdef _GLIBCXX_DEBUG
-	     ,bool Single_Link_Roots>
-#else
-	     >
-#endif
-    class left_child_next_sibling_heap : public Cmp_Fn
-    {
-    protected:
-      typedef
-      typename _Alloc::template rebind<
-      left_child_next_sibling_heap_node_<Value_Type, Node_Metadata,
-					 _Alloc> >::other
-      node_allocator;
-
-      typedef typename node_allocator::value_type     	node;
-      typedef typename node_allocator::pointer 		node_pointer;
-      typedef typename node_allocator::const_pointer	node_const_pointer;
-      typedef Node_Metadata node_metadata;
-      typedef std::pair< node_pointer, node_pointer> 	node_pointer_pair;
-
-    private:
-      typedef cond_dealtor< node, _Alloc> 		cond_dealtor_t;
-
-      enum
-	{
-	  simple_value = is_simple<Value_Type>::value
-	};
-
-      typedef integral_constant<int, simple_value> 	no_throw_copies_t;
-      typedef typename _Alloc::template rebind<Value_Type>	__rebind_v;
-
-    public:
-      typedef typename _Alloc::size_type 		size_type;
-      typedef typename _Alloc::difference_type 	difference_type;
-      typedef Value_Type 				value_type;
-
-      typedef typename __rebind_v::other::pointer 	pointer;
-      typedef typename __rebind_v::other::const_pointer const_pointer;
-      typedef typename __rebind_v::other::reference	reference;
-      typedef typename __rebind_v::other::const_reference const_reference;
-
-      typedef left_child_next_sibling_heap_node_point_const_iterator_<node, _Alloc>
-      point_const_iterator;
-
-      typedef point_const_iterator 			point_iterator;
-
-      typedef left_child_next_sibling_heap_const_iterator_<node, _Alloc>
-      const_iterator;
-
-      typedef const_iterator 				iterator;
-      typedef Cmp_Fn 					cmp_fn;
-      typedef _Alloc 					allocator_type;
-
-      left_child_next_sibling_heap();
-      left_child_next_sibling_heap(const Cmp_Fn&);
-      left_child_next_sibling_heap(const left_child_next_sibling_heap&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      ~left_child_next_sibling_heap();
-
-      inline bool
-      empty() const;
-
-      inline size_type
-      size() const;
-
-      inline size_type
-      max_size() const;
-
-      Cmp_Fn&
-      get_cmp_fn();
-
-      const Cmp_Fn&
-      get_cmp_fn() const;
-
-      inline iterator
-      begin();
-
-      inline const_iterator
-      begin() const;
-
-      inline iterator
-      end();
-
-      inline const_iterator
-      end() const;
-
-      void
-      clear();
-
-#ifdef PB_DS_LC_NS_HEAP_TRACE_
-      void
-      trace() const;
-#endif
-
-    protected:
-      inline node_pointer
-      get_new_node_for_insert(const_reference);
-
-      inline static void
-      make_child_of(node_pointer, node_pointer);
-
-      void
-      value_swap(left_child_next_sibling_heap&);
-
-      inline static node_pointer
-      parent(node_pointer);
-
-      inline void
-      swap_with_parent(node_pointer, node_pointer);
-
-      void
-      bubble_to_top(node_pointer);
-
-      inline void
-      actual_erase_node(node_pointer);
-
-      void
-      clear_imp(node_pointer);
-
-      void
-      to_linked_list();
-
-      template<typename Pred>
-      node_pointer
-      prune(Pred);
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-
-      void
-      assert_node_consistent(node_const_pointer, bool, const char*, int) const;
-
-      static size_type
-      size_under_node(node_const_pointer);
-
-      static size_type
-      degree(node_const_pointer);
-#endif
-
-#ifdef PB_DS_LC_NS_HEAP_TRACE_
-      static void
-      trace_node(node_const_pointer, size_type);
-#endif
-
-    private:
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_iterators(const char*, int) const;
-
-      void
-      assert_size(const char*, int) const;
-
-      static size_type
-      size_from_node(node_const_pointer);
-#endif
-
-      node_pointer
-      recursive_copy_node(node_const_pointer);
-
-      inline node_pointer
-      get_new_node_for_insert(const_reference, false_type);
-
-      inline node_pointer
-      get_new_node_for_insert(const_reference, true_type);
-
-#ifdef PB_DS_LC_NS_HEAP_TRACE_
-      template<typename Metadata_>
-      static void
-      trace_node_metadata(node_const_pointer, type_to_type<Metadata_>);
-
-      static void
-      trace_node_metadata(node_const_pointer, type_to_type<null_type>);
-#endif
-
-      static node_allocator 	s_node_allocator;
-      static no_throw_copies_t 	s_no_throw_copies_ind;
-
-    protected:
-      node_pointer 		m_p_root;
-      size_type 		m_size;
-    };
-
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp>
-
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_CLASS_T_DEC
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
deleted file mode 100644
index 92fafb8..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/node.hpp
- * Contains an implementation struct for this type of heap's node.
- */
-
-#ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_NODE_HPP
-#define PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_NODE_HPP
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Node.
-    template<typename _Value, typename _Metadata, typename _Alloc>
-    struct left_child_next_sibling_heap_node_
-    {
-    private:
-      typedef left_child_next_sibling_heap_node_<_Value, _Metadata, _Alloc> this_type;
-
-    public:
-      typedef _Value 				value_type;
-      typedef typename _Alloc::size_type 	size_type;
-      typedef _Metadata 			metadata_type;
-
-      typedef typename _Alloc::template rebind<this_type>::other::pointer node_pointer;
-
-      value_type 	m_value;
-      metadata_type 	m_metadata;
-      node_pointer 	m_p_l_child;
-      node_pointer 	m_p_next_sibling;
-      node_pointer 	m_p_prev_or_parent;
-    };
-
-    template<typename _Value, typename _Alloc>
-    struct left_child_next_sibling_heap_node_<_Value, null_type, _Alloc>
-    {
-    private:
-      typedef left_child_next_sibling_heap_node_<_Value, null_type, _Alloc> this_type;
-
-    public:
-      typedef _Value 				value_type;
-      typedef typename _Alloc::size_type 	size_type;
-
-      typedef typename _Alloc::template rebind<this_type>::other::pointer node_pointer;
-
-      value_type 	m_value;
-      node_pointer 	m_p_l_child;
-      node_pointer 	m_p_next_sibling;
-      node_pointer 	m_p_prev_or_parent;
-    };
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_NODE_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
deleted file mode 100644
index ce74bdc..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/point_const_iterator.hpp
- * Contains an iterator class returned by the table's const find and insert
- * methods.
- */
-
-#ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_CONST_FIND_ITERATOR_HPP
-#define PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_CONST_FIND_ITERATOR_HPP
-
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-
-#define PB_DS_CLASS_T_DEC			\
-    template<typename Node, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    left_child_next_sibling_heap_node_point_const_iterator_<Node, _Alloc>
-
-    /// Const point-type iterator.
-    template<typename Node, typename _Alloc>
-    class left_child_next_sibling_heap_node_point_const_iterator_
-    {
-    protected:
-      typedef typename _Alloc::template rebind<Node>::other::pointer node_pointer;
-
-    public:
-      /// Category.
-      typedef trivial_iterator_tag iterator_category;
-
-      /// Difference type.
-      typedef trivial_iterator_difference_type difference_type;
-
-      /// Iterator's value type.
-      typedef typename Node::value_type value_type;
-
-      /// Iterator's pointer type.
-      typedef
-      typename _Alloc::template rebind<
-	value_type>::other::pointer
-      pointer;
-
-      /// Iterator's const pointer type.
-      typedef
-      typename _Alloc::template rebind<
-	value_type>::other::const_pointer
-      const_pointer;
-
-      /// Iterator's reference type.
-      typedef
-      typename _Alloc::template rebind<
-	value_type>::other::reference
-      reference;
-
-      /// Iterator's const reference type.
-      typedef
-      typename _Alloc::template rebind<
-	value_type>::other::const_reference
-      const_reference;
-
-      inline
-      left_child_next_sibling_heap_node_point_const_iterator_(node_pointer p_nd) : m_p_nd(p_nd)
-      { }
-
-      /// Default constructor.
-      inline
-      left_child_next_sibling_heap_node_point_const_iterator_() : m_p_nd(0)
-      { }
-
-      /// Copy constructor.
-      inline
-      left_child_next_sibling_heap_node_point_const_iterator_(const PB_DS_CLASS_C_DEC& other) : m_p_nd(other.m_p_nd)
-      { }
-
-      /// Access.
-      const_pointer
-      operator->() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd != 0);
-	return &m_p_nd->m_value;
-      }
-
-      /// Access.
-      const_reference
-      operator*() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd != 0);
-	return m_p_nd->m_value;
-      }
-
-      /// Compares content to a different iterator object.
-      bool
-      operator==(const PB_DS_CLASS_C_DEC& other) const
-      { return m_p_nd == other.m_p_nd; }
-
-      /// Compares content (negatively) to a different iterator object.
-      bool
-      operator!=(const PB_DS_CLASS_C_DEC& other) const
-      { return m_p_nd != other.m_p_nd; }
-
-      node_pointer m_p_nd;
-    };
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
deleted file mode 100644
index b027167..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/policy_access_fn_imps.hpp
- * Contains an implementation class for left_child_next_sibling_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-Cmp_Fn& 
-PB_DS_CLASS_C_DEC::
-get_cmp_fn()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Cmp_Fn& 
-PB_DS_CLASS_C_DEC::
-get_cmp_fn() const
-{ return *this; }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
deleted file mode 100644
index 43299fb..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file left_child_next_sibling_heap_/trace_fn_imps.hpp
- * Contains an implementation class for left_child_next_sibling_heap_.
- */
-
-#ifdef PB_DS_LC_NS_HEAP_TRACE_
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace() const
-{
-  std::cerr << std::endl;
-  trace_node(m_p_root, 0);
-  std::cerr << std::endl;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace_node(node_const_pointer p_nd, size_type level)
-{
-  while (p_nd != 0)
-    {
-      for (size_type i = 0; i < level; ++i)
-	std::cerr << ' ';
-
-      std::cerr << p_nd <<
-	" prev = " << p_nd->m_p_prev_or_parent <<
-	" next " << p_nd->m_p_next_sibling <<
-	" left = " << p_nd->m_p_l_child << " ";
-
-      trace_node_metadata(p_nd, type_to_type<node_metadata>());
-      std::cerr << p_nd->m_value << std::endl;
-      trace_node(p_nd->m_p_l_child, level + 1);
-      p_nd = p_nd->m_p_next_sibling;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Metadata_>
-void
-PB_DS_CLASS_C_DEC::
-trace_node_metadata(node_const_pointer p_nd, type_to_type<Metadata_>)
-{
-  std::cerr << "(" << p_nd->m_metadata << ") ";
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace_node_metadata(node_const_pointer, type_to_type<null_type>)
-{ }
-
-#endif // #ifdef PB_DS_LC_NS_HEAP_TRACE_
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
deleted file mode 100644
index 486e99a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_map_/constructor_destructor_fn_imps.hpp
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::entry_allocator
-PB_DS_CLASS_C_DEC::s_entry_allocator;
-
-PB_DS_CLASS_T_DEC
-Eq_Fn PB_DS_CLASS_C_DEC::s_eq_fn;
-
-PB_DS_CLASS_T_DEC
-null_type PB_DS_CLASS_C_DEC::s_null_type;
-
-PB_DS_CLASS_T_DEC
-Update_Policy PB_DS_CLASS_C_DEC::s_update_policy;
-
-PB_DS_CLASS_T_DEC
-type_to_type<
-  typename PB_DS_CLASS_C_DEC::update_metadata> PB_DS_CLASS_C_DEC::s_metadata_type_indicator;
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-  while (first_it != last_it)
-    insert(*(first_it++));
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_LU_NAME() : m_p_l(0)
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-PB_DS_CLASS_C_DEC::
-PB_DS_LU_NAME(It first_it, It last_it) : m_p_l(0)
-{
-  copy_from_range(first_it, last_it);
-  PB_DS_ASSERT_VALID((*this));
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_LU_NAME(const PB_DS_CLASS_C_DEC& other) :
-m_p_l(0)
-{
-  __try
-    {
-      for (const_iterator it = other.begin(); it != other.end(); ++it)
-	{
-	  entry_pointer p_l = allocate_new_entry(*it,
-				      traits_base::m_no_throw_copies_indicator);
-
-	  p_l->m_p_next = m_p_l;
-	  m_p_l = p_l;
-	}
-    }
-  __catch(...)
-    {
-      deallocate_all();
-      __throw_exception_again;
-    }
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  _GLIBCXX_DEBUG_ONLY(debug_base::swap(other);)
-  std::swap(m_p_l, other.m_p_l);
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-deallocate_all()
-{
-  entry_pointer p_l = m_p_l;
-  while (p_l != 0)
-    {
-      entry_pointer p_next_l = p_l->m_p_next;
-      actual_erase_entry(p_l);
-      p_l = p_next_l;
-    }
-  m_p_l = 0;
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~PB_DS_LU_NAME()
-{ deallocate_all(); }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
deleted file mode 100644
index 9a7b1df..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_map_/debug_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s debug-mode functions.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  size_type calc_size = 0;
-  for (const_iterator it = begin(); it != end(); ++it)
-    {
-      debug_base::check_key_exists(PB_DS_V2F(*it), __file, __line);
-      ++calc_size;
-    }
-  debug_base::check_size(calc_size, __file, __line);
-}
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
deleted file mode 100644
index 8792b0b..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_map_/entry_metadata_base.hpp
- * Contains an implementation for a list update map.
- */
-
-#ifndef PB_DS_LU_MAP_ENTRY_METADATA_BASE_HPP
-#define PB_DS_LU_MAP_ENTRY_METADATA_BASE_HPP
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    template<typename Metadata>
-    struct lu_map_entry_metadata_base
-    {
-      Metadata m_update_metadata;
-    };
-    
-    template<>
-    struct lu_map_entry_metadata_base<null_type>
-    { };  
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
deleted file mode 100644
index 7fe05d5..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_map_/erase_fn_imps.hpp
- * Contains implementations of lu_map_.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-erase(key_const_reference r_key)
-{
-  PB_DS_ASSERT_VALID((*this))
-  if (m_p_l == 0)
-    return false;
-
-  if (s_eq_fn(r_key, PB_DS_V2F(m_p_l->m_value)))
-    {
-      entry_pointer p_next = m_p_l->m_p_next;
-      actual_erase_entry(m_p_l);
-      m_p_l = p_next;
-      return true;
-    }
-
-  entry_pointer p_l = m_p_l;
-  while (p_l->m_p_next != 0)
-    if (s_eq_fn(r_key, PB_DS_V2F(p_l->m_p_next->m_value)))
-      {
-	erase_next(p_l);
-	return true;
-      }
-    else
-      p_l = p_l->m_p_next;
-  return false;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  deallocate_all();
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  PB_DS_ASSERT_VALID((*this))
-  size_type num_ersd = 0;
-  while (m_p_l != 0 && pred(m_p_l->m_value))
-    {
-      entry_pointer p_next = m_p_l->m_p_next;
-      ++num_ersd;
-      actual_erase_entry(m_p_l);
-      m_p_l = p_next;
-    }
-
-  if (m_p_l == 0)
-    return num_ersd;
-
-  entry_pointer p_l = m_p_l;
-  while (p_l->m_p_next != 0)
-    {
-      if (pred(p_l->m_p_next->m_value))
-        {
-	  ++num_ersd;
-	  erase_next(p_l);
-        }
-      else
-	p_l = p_l->m_p_next;
-    }
-
-  PB_DS_ASSERT_VALID((*this))
-  return num_ersd;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase_next(entry_pointer p_l)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_l != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_l->m_p_next != 0);
-  entry_pointer p_next_l = p_l->m_p_next->m_p_next;
-  actual_erase_entry(p_l->m_p_next);
-  p_l->m_p_next = p_next_l;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-actual_erase_entry(entry_pointer p_l)
-{
-  _GLIBCXX_DEBUG_ONLY(debug_base::erase_existing(PB_DS_V2F(p_l->m_value));)
-  p_l->~entry();
-  s_entry_allocator.deallocate(p_l, 1);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
deleted file mode 100644
index 5df5bf3..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_map_/find_fn_imps.hpp
- * Contains implementations of lu_map_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::entry_pointer
-PB_DS_CLASS_C_DEC::
-find_imp(key_const_reference r_key) const
-{
-  if (m_p_l == 0)
-    return 0;
-  if (s_eq_fn(r_key, PB_DS_V2F(m_p_l->m_value)))
-    {
-      apply_update(m_p_l, s_metadata_type_indicator);
-      PB_DS_CHECK_KEY_EXISTS(r_key)
-      return m_p_l;
-    }
-
-  entry_pointer p_l = m_p_l;
-  while (p_l->m_p_next != 0)
-    {
-      entry_pointer p_next = p_l->m_p_next;
-      if (s_eq_fn(r_key, PB_DS_V2F(p_next->m_value)))
-        {
-	  if (apply_update(p_next, s_metadata_type_indicator))
-            {
-	      p_l->m_p_next = p_next->m_p_next;
-	      p_next->m_p_next = m_p_l;
-	      m_p_l = p_next;
-	      return m_p_l;
-            }
-	  return p_next;
-        }
-      else
-	p_l = p_next;
-    }
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-  return 0;
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Metadata>
-inline bool
-PB_DS_CLASS_C_DEC::
-apply_update(entry_pointer p_l, type_to_type<Metadata>)
-{ return s_update_policy(p_l->m_update_metadata); }
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-apply_update(entry_pointer, type_to_type<null_type>)
-{ return s_update_policy(s_null_type); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
deleted file mode 100644
index 4652686..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_map_/info_fn_imps.hpp
- * Contains implementations of lu_map_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size() const
-{ return std::distance(begin(), end()); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-max_size() const
-{ return s_entry_allocator.max_size(); }
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-empty() const
-{ return (m_p_l == 0); }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
deleted file mode 100644
index dce7f73..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_map_/insert_fn_imps.hpp
- * Contains implementations of lu_map_.
- */
-
-PB_DS_CLASS_T_DEC
-inline std::pair<
-  typename PB_DS_CLASS_C_DEC::point_iterator,
-  bool>
-PB_DS_CLASS_C_DEC::
-insert(const_reference r_val)
-{
-  PB_DS_ASSERT_VALID((*this))
-  entry_pointer p_l = find_imp(PB_DS_V2F(r_val));
-
-  if (p_l != 0)
-    {
-      PB_DS_CHECK_KEY_EXISTS(PB_DS_V2F(r_val))
-      return std::make_pair(point_iterator(&p_l->m_value), false);
-    }
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(PB_DS_V2F(r_val))
-
-  p_l = allocate_new_entry(r_val, traits_base::m_no_throw_copies_indicator);
-  p_l->m_p_next = m_p_l;
-  m_p_l = p_l;
-  PB_DS_ASSERT_VALID((*this))
-  return std::make_pair(point_iterator(&p_l->m_value), true);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::entry_pointer
-PB_DS_CLASS_C_DEC::
-allocate_new_entry(const_reference r_val, false_type)
-{
-  entry_pointer p_l = s_entry_allocator.allocate(1);
-  cond_dealtor_t cond(p_l);
-  new (const_cast<void* >(static_cast<const void* >(&p_l->m_value)))
-    value_type(r_val);
-
-  cond.set_no_action();
-  _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(r_val));)
-  init_entry_metadata(p_l, s_metadata_type_indicator);
-  return p_l;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::entry_pointer
-PB_DS_CLASS_C_DEC::
-allocate_new_entry(const_reference    r_val, true_type)
-{
-  entry_pointer p_l = s_entry_allocator.allocate(1);
-  new (&p_l->m_value) value_type(r_val);
-  _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(r_val));)
-  init_entry_metadata(p_l, s_metadata_type_indicator);
-  return p_l;
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Metadata>
-inline void
-PB_DS_CLASS_C_DEC::
-init_entry_metadata(entry_pointer p_l, type_to_type<Metadata>)
-{ new (&p_l->m_update_metadata) Metadata(s_update_policy()); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-init_entry_metadata(entry_pointer, type_to_type<null_type>)
-{ }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
deleted file mode 100644
index a5373ea..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_map_/iterators_fn_imps.hpp
- * Contains implementations of lu_map_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-begin()
-{
-  if (m_p_l == 0)
-    {
-      _GLIBCXX_DEBUG_ASSERT(empty());
-      return end();
-    }
-  return iterator(&m_p_l->m_value, m_p_l, this);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-begin() const
-{
-  if (m_p_l == 0)
-    {
-      _GLIBCXX_DEBUG_ASSERT(empty());
-      return end();
-    }
-  return iterator(&m_p_l->m_value, m_p_l, const_cast<PB_DS_CLASS_C_DEC* >(this));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-end()
-{ return iterator(0, 0, this); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-end() const
-{
-  return const_iterator(0, 0, const_cast<PB_DS_CLASS_C_DEC* const>(this));
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/lu_map_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
deleted file mode 100644
index 18269c3..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
+++ /dev/null
@@ -1,343 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_map_/lu_map_.hpp
- * Contains a list update map.
- */
-
-#include <utility>
-#include <iterator>
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <ext/pb_ds/detail/types_traits.hpp>
-#include <ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp>
-#include <ext/pb_ds/exception.hpp>
-#ifdef _GLIBCXX_DEBUG
-#include <ext/pb_ds/detail/debug_map_base.hpp>
-#endif
-#ifdef PB_DS_LU_MAP_TRACE_
-#include <iostream>
-#endif
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-#define PB_DS_LU_NAME lu_map
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-#define PB_DS_LU_NAME lu_set
-#endif
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Mapped, typename Eq_Fn, \
-	     typename _Alloc, typename Update_Policy>
-
-#define PB_DS_CLASS_C_DEC \
-    PB_DS_LU_NAME<Key, Mapped, Eq_Fn, _Alloc, Update_Policy>
-
-#define PB_DS_LU_TRAITS_BASE \
-    types_traits<Key, Mapped, _Alloc, false>
-
-#ifdef _GLIBCXX_DEBUG
-#define PB_DS_DEBUG_MAP_BASE_C_DEC \
-    debug_map_base<Key, Eq_Fn, \
-	      typename _Alloc::template rebind<Key>::other::const_reference>
-#endif
-
-    /// list-based (with updates) associative container.
-    /// Skip to the lu, my darling.
-    template<typename Key,
-	     typename Mapped,
-	     typename Eq_Fn,
-	     typename _Alloc,
-	     typename Update_Policy>
-    class PB_DS_LU_NAME :
-#ifdef _GLIBCXX_DEBUG
-      protected PB_DS_DEBUG_MAP_BASE_C_DEC,
-#endif
-      public PB_DS_LU_TRAITS_BASE
-    {
-    private:
-      typedef PB_DS_LU_TRAITS_BASE 	       	traits_base;
-
-      struct entry
-     : public lu_map_entry_metadata_base<typename Update_Policy::metadata_type>
-      {
-	typename traits_base::value_type m_value;
-	typename _Alloc::template rebind<entry>::other::pointer m_p_next;
-      };
-
-      typedef typename _Alloc::template rebind<entry>::other entry_allocator;
-      typedef typename entry_allocator::pointer entry_pointer;
-      typedef typename entry_allocator::const_pointer const_entry_pointer;
-      typedef typename entry_allocator::reference entry_reference;
-      typedef typename entry_allocator::const_reference const_entry_reference;
-
-      typedef typename _Alloc::template rebind<entry_pointer>::other entry_pointer_allocator;
-      typedef typename entry_pointer_allocator::pointer entry_pointer_array;
-
-      typedef typename traits_base::value_type value_type_;
-      typedef typename traits_base::pointer pointer_;
-      typedef typename traits_base::const_pointer const_pointer_;
-      typedef typename traits_base::reference reference_;
-      typedef typename traits_base::const_reference const_reference_;
-
-#define PB_DS_GEN_POS entry_pointer
-
-#include <ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp>
-#include <ext/pb_ds/detail/unordered_iterator/point_iterator.hpp>
-#include <ext/pb_ds/detail/unordered_iterator/const_iterator.hpp>
-#include <ext/pb_ds/detail/unordered_iterator/iterator.hpp>
-
-#undef PB_DS_GEN_POS
-
-
-#ifdef _GLIBCXX_DEBUG
-      typedef PB_DS_DEBUG_MAP_BASE_C_DEC debug_base;
-#endif
-
-      typedef cond_dealtor<entry, _Alloc> cond_dealtor_t;
-
-    public:
-      typedef _Alloc allocator_type;
-      typedef typename _Alloc::size_type size_type;
-      typedef typename _Alloc::difference_type difference_type;
-      typedef Eq_Fn eq_fn;
-      typedef Update_Policy update_policy;
-      typedef typename Update_Policy::metadata_type update_metadata;
-      typedef typename traits_base::key_type key_type;
-      typedef typename traits_base::key_pointer key_pointer;
-      typedef typename traits_base::key_const_pointer key_const_pointer;
-      typedef typename traits_base::key_reference key_reference;
-      typedef typename traits_base::key_const_reference key_const_reference;
-      typedef typename traits_base::mapped_type mapped_type;
-      typedef typename traits_base::mapped_pointer mapped_pointer;
-      typedef typename traits_base::mapped_const_pointer mapped_const_pointer;
-      typedef typename traits_base::mapped_reference mapped_reference;
-      typedef typename traits_base::mapped_const_reference mapped_const_reference;
-      typedef typename traits_base::value_type value_type;
-      typedef typename traits_base::pointer pointer;
-      typedef typename traits_base::const_pointer const_pointer;
-      typedef typename traits_base::reference reference;
-      typedef typename traits_base::const_reference const_reference;
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      typedef point_iterator_ 			point_iterator;
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-      typedef point_const_iterator_ 		point_iterator;
-#endif
-
-      typedef point_const_iterator_ 		point_const_iterator;
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      typedef iterator_ 			iterator;
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-      typedef const_iterator_ 			iterator;
-#endif
-
-      typedef const_iterator_ 			const_iterator;
-
-    public:
-      PB_DS_LU_NAME();
-
-      PB_DS_LU_NAME(const PB_DS_CLASS_C_DEC&);
-
-      virtual
-      ~PB_DS_LU_NAME();
-
-      template<typename It>
-      PB_DS_LU_NAME(It, It);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      inline size_type
-      size() const;
-
-      inline size_type
-      max_size() const;
-
-      inline bool
-      empty() const;
-
-      inline mapped_reference
-      operator[](key_const_reference r_key)
-      {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	return insert(std::make_pair(r_key, mapped_type())).first->second;
-#else
-	insert(r_key);
-	return traits_base::s_null_type;
-#endif
-      }
-
-      inline std::pair<point_iterator, bool>
-      insert(const_reference);
-
-      inline point_iterator
-      find(key_const_reference r_key)
-      {
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	entry_pointer p_e = find_imp(r_key);
-	return point_iterator(p_e == 0 ? 0: &p_e->m_value);
-      }
-
-      inline point_const_iterator
-      find(key_const_reference r_key) const
-      {
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	entry_pointer p_e = find_imp(r_key);
-	return point_const_iterator(p_e == 0 ? 0: &p_e->m_value);
-      }
-
-      inline bool
-      erase(key_const_reference);
-
-      template<typename Pred>
-      inline size_type
-      erase_if(Pred);
-
-      void
-      clear();
-
-      inline iterator
-      begin();
-
-      inline const_iterator
-      begin() const;
-
-      inline iterator
-      end();
-
-      inline const_iterator
-      end() const;
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char* file, int line) const;
-#endif
-
-#ifdef PB_DS_LU_MAP_TRACE_
-      void
-      trace() const;
-#endif
-
-    protected:
-
-      template<typename It>
-      void
-      copy_from_range(It, It);
-
-    private:
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      friend class iterator_;
-#endif
-
-      friend class const_iterator_;
-
-      inline entry_pointer
-      allocate_new_entry(const_reference, false_type);
-
-      inline entry_pointer
-      allocate_new_entry(const_reference, true_type);
-
-      template<typename Metadata>
-      inline static void
-      init_entry_metadata(entry_pointer, type_to_type<Metadata>);
-
-      inline static void
-      init_entry_metadata(entry_pointer, type_to_type<null_type>);
-
-      void
-      deallocate_all();
-
-      void
-      erase_next(entry_pointer);
-
-      void
-      actual_erase_entry(entry_pointer);
-
-      void
-      inc_it_state(const_pointer& r_p_value, entry_pointer& r_pos) const
-      {
-	r_pos = r_pos->m_p_next;
-	r_p_value = (r_pos == 0) ? 0 : &r_pos->m_value;
-      }
-
-      template<typename Metadata>
-      inline static bool
-      apply_update(entry_pointer, type_to_type<Metadata>);
-
-      inline static bool
-      apply_update(entry_pointer, type_to_type<null_type>);
-
-      inline entry_pointer
-      find_imp(key_const_reference) const;
-
-      static entry_allocator 			s_entry_allocator;
-      static Eq_Fn 				s_eq_fn;
-      static Update_Policy 			s_update_policy;
-      static type_to_type<update_metadata> 	s_metadata_type_indicator;
-      static null_type 				s_null_type;
-
-      mutable entry_pointer 			m_p_l;
-    };
-
-#include <ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp>
-#include <ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp>
-#include <ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp>
-#include <ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_LU_TRAITS_BASE
-#undef PB_DS_DEBUG_MAP_BASE_C_DEC
-#undef PB_DS_LU_NAME
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
deleted file mode 100644
index f58cae8..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_map_/trace_fn_imps.hpp
- * Contains implementations of lu_map_.
- */
-
-#ifdef PB_DS_LU_MAP_TRACE_
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace() const
-{
-  std::cerr << m_p_l << std::endl << std::endl;
-  const_entry_pointer p_l = m_p_l;
-  while (p_l != 0)
-    {
-      std::cerr << PB_DS_V2F(p_l->m_value) << std::endl;
-      p_l = p_l->m_p_next;
-    }
-  std::cerr << std::endl;
-}
-
-#endif 
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_policy/lu_counter_metadata.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_policy/lu_counter_metadata.hpp
deleted file mode 100644
index afe2f39..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_policy/lu_counter_metadata.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file lu_counter_metadata.hpp
- * Contains implementation of a lu counter policy's metadata.
- */
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    template<typename Size_Type>
-      class lu_counter_policy_base;
-
-    /// A list-update metadata type that moves elements to the front of
-    /// the list based on the counter algorithm.
-    template<typename Size_Type = std::size_t>
-      class lu_counter_metadata
-      {
-      public:
-	typedef Size_Type 	size_type;
-
-      private:
-	lu_counter_metadata(size_type init_count) : m_count(init_count)
-	{ }
-
-	friend class lu_counter_policy_base<size_type>;
-
-	mutable size_type 	m_count;
-    };
-
-    /// Base class for list-update counter policy.
-    template<typename Size_Type>
-      class lu_counter_policy_base
-      {
-      protected:
-	typedef Size_Type 	size_type;
-
-	lu_counter_metadata<size_type>
-	operator()(size_type max_size) const
-	{ return lu_counter_metadata<Size_Type>(std::rand() % max_size); }
-
-	template<typename Metadata_Reference>
-	bool
-	operator()(Metadata_Reference r_data, size_type m_max_count) const
-	{
-	  if (++r_data.m_count != m_max_count)
-	    return false;
-	  r_data.m_count = 0;
-	  return true;
-	}
-      };
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
deleted file mode 100644
index 275646a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file sample_update_policy.hpp
- * Contains a sample policy for list update containers.
- */
-
-#ifndef PB_DS_SAMPLE_UPDATE_POLICY_HPP
-#define PB_DS_SAMPLE_UPDATE_POLICY_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample list-update policy.
-  struct sample_update_policy
-  {
-    /// Default constructor.
-    sample_update_policy();
-
-    /// Copy constructor.
-    sample_update_policy(const sample_update_policy&);
-
-    /// Swaps content.
-    inline void
-    swap(sample_update_policy& other);
-
-  protected:
-    /// Metadata on which this functor operates.
-    typedef some_metadata_type metadata_type;
-
-    /// Creates a metadata object.
-    metadata_type
-    operator()() const;
-
-    /// Decides whether a metadata object should be moved to the front
-    /// of the list. A list-update based containers object will call
-    /// this method to decide whether to move a node to the front of
-    /// the list. The method shoule return true if the node should be
-    /// moved to the front of the list.
-    bool
-    operator()(metadata_reference) const;
-  };
-}
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index dfd312b..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,257 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/constructors_destructor_fn_imps.hpp
- * Contains an implementation class for ov_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::value_allocator
-PB_DS_CLASS_C_DEC::s_value_alloc;
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::metadata_allocator
-PB_DS_CLASS_C_DEC::s_metadata_alloc;
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_OV_TREE_NAME() :
-  m_a_values(0),
-  m_a_metadata(0),
-  m_end_it(0),
-  m_size(0)
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_OV_TREE_NAME(const Cmp_Fn& r_cmp_fn) :
-  cmp_fn(r_cmp_fn),
-  m_a_values(0),
-  m_a_metadata(0),
-  m_end_it(0),
-  m_size(0)
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_OV_TREE_NAME(const Cmp_Fn& r_cmp_fn, const node_update& r_nodeu) :
-  cmp_fn(r_cmp_fn),
-  node_update(r_nodeu),
-  m_a_values(0),
-  m_a_metadata(0),
-  m_end_it(0),
-  m_size(0)
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_OV_TREE_NAME(const PB_DS_CLASS_C_DEC& other) :
-#ifdef PB_DS_TREE_TRACE
-  trace_base(other),
-#endif
-  cmp_fn(other),
-  node_update(other),
-  m_a_values(0),
-  m_a_metadata(0),
-  m_end_it(0),
-  m_size(0)
-{
-  copy_from_ordered_range(other.begin(), other.end());
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-inline void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-  typedef std::map<key_type, mapped_type, Cmp_Fn,
-		   typename _Alloc::template rebind<value_type>::other>
-    map_type;
-#else
-  typedef std::set<key_type, Cmp_Fn,
-		   typename _Alloc::template rebind<Key>::other>
-    map_type;
-#endif
-
-  map_type m(first_it, last_it);
-  copy_from_ordered_range(m.begin(), m.end());
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_ordered_range(It first_it, It last_it)
-{
-  const size_type len = std::distance(first_it, last_it);
-  if (len == 0)
-    return;
-
-  value_vector a_values = s_value_alloc.allocate(len);
-  iterator target_it = a_values;
-  It source_it = first_it;
-  It source_end_it = last_it;
-
-  cond_dtor<size_type> cd(a_values, target_it, len);
-  while (source_it != source_end_it)
-    {
-      void* __v = const_cast<void*>(static_cast<const void*>(target_it));
-      new (__v) value_type(*source_it++);
-      ++target_it;
-    }
-
-  reallocate_metadata((node_update*)this, len);
-  cd.set_no_action();
-  m_a_values = a_values;
-  m_size = len;
-  m_end_it = m_a_values + m_size;
-  update(PB_DS_node_begin_imp(), (node_update*)this);
-
-#ifdef _GLIBCXX_DEBUG
-  for (const_iterator dbg_it = m_a_values; dbg_it != m_end_it; ++dbg_it)
-    debug_base::insert_new(PB_DS_V2F(*dbg_it));
-#endif
-}
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_ordered_range(It first_it, It last_it, It other_first_it,
-			It other_last_it)
-{
-  clear();
-  const size_type len = std::distance(first_it, last_it)
-    			 + std::distance(other_first_it, other_last_it);
-
-  value_vector a_values = s_value_alloc.allocate(len);
-
-  iterator target_it = a_values;
-  It source_it = first_it;
-  It source_end_it = last_it;
-
-  cond_dtor<size_type> cd(a_values, target_it, len);
-  while (source_it != source_end_it)
-    {
-      new (const_cast<void* >(static_cast<const void* >(target_it)))
-	value_type(*source_it++);
-      ++target_it;
-    }
-
-  source_it = other_first_it;
-  source_end_it = other_last_it;
-
-  while (source_it != source_end_it)
-    {
-      new (const_cast<void* >(static_cast<const void* >(target_it)))
-	value_type(*source_it++);
-      ++target_it;
-    }
-
-  reallocate_metadata((node_update* )this, len);
-  cd.set_no_action();
-  m_a_values = a_values;
-  m_size = len;
-  m_end_it = m_a_values + m_size;
-  update(PB_DS_node_begin_imp(), (node_update* )this);
-
-#ifdef _GLIBCXX_DEBUG
-  for (const_iterator dbg_it = m_a_values; dbg_it != m_end_it; ++dbg_it)
-    debug_base::insert_new(PB_DS_V2F(*dbg_it));
-#endif
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  value_swap(other);
-  std::swap(static_cast<cmp_fn&>(*this),
-	    static_cast<cmp_fn&>(other));
-  std::swap(static_cast<traits_base&>(*this),
-	    static_cast<traits_base&>(other));
-  PB_DS_ASSERT_VALID(other)
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-value_swap(PB_DS_CLASS_C_DEC& other)
-{
-  _GLIBCXX_DEBUG_ONLY(debug_base::swap(other);)
-  std::swap(m_a_values, other.m_a_values);
-  std::swap(m_a_metadata, other.m_a_metadata);
-  std::swap(m_size, other.m_size);
-  std::swap(m_end_it, other.m_end_it);
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~PB_DS_OV_TREE_NAME()
-{
-  PB_DS_ASSERT_VALID((*this))
-  cond_dtor<size_type> cd(m_a_values, m_end_it, m_size);
-  reallocate_metadata((node_update*)this, 0);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-update(node_iterator, null_node_update_pointer)
-{ }
-
-PB_DS_CLASS_T_DEC
-template<typename Node_Update>
-void
-PB_DS_CLASS_C_DEC::
-update(node_iterator nd_it, Node_Update* p_update)
-{
-  node_const_iterator end_it = PB_DS_node_end_imp();
-  if (nd_it != end_it)
-    {
-      update(nd_it.get_l_child(), p_update);
-      update(nd_it.get_r_child(), p_update);
-      node_update::operator()(nd_it, end_it);
-    }
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
deleted file mode 100644
index 3acdb9f..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/debug_fn_imps.hpp
- * Contains an implementation class for ov_tree_.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  if (m_a_values == 0 || m_end_it == 0 || m_size == 0)
-    PB_DS_DEBUG_VERIFY(m_a_values == 0 &&  m_end_it == 0 && m_size == 0);
-
-  assert_iterators(__file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_iterators(const char* __file, int __line) const
-{
-  debug_base::check_size(m_size, __file, __line);
-  size_type iterated_num = 0;
-  const_iterator prev_it = end();
-  PB_DS_DEBUG_VERIFY(m_end_it == m_a_values + m_size);
-  for (const_iterator it = begin(); it != end(); ++it)
-    {
-      ++iterated_num;
-      debug_base::check_key_exists(PB_DS_V2F(*it), __file, __line);
-      PB_DS_DEBUG_VERIFY(lower_bound(PB_DS_V2F(*it)) == it);
-      const_iterator upper_bound_it = upper_bound(PB_DS_V2F(*it));
-      --upper_bound_it;
-      PB_DS_DEBUG_VERIFY(upper_bound_it == it);
-      if (prev_it != end())
-	PB_DS_DEBUG_VERIFY(Cmp_Fn::operator()(PB_DS_V2F(*prev_it),
-					      PB_DS_V2F(*it)));
-      prev_it = it;
-    }
-  PB_DS_DEBUG_VERIFY(iterated_num == m_size);
-}
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
deleted file mode 100644
index bebbdc6..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/erase_fn_imps.hpp
- * Contains an implementation class for ov_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  PB_DS_ASSERT_VALID((*this))
-  if (m_size == 0)
-    {
-      return;
-    }
-  else
-    {
-      reallocate_metadata((node_update* )this, 0);
-      cond_dtor<size_type> cd(m_a_values, m_end_it, m_size);
-    }
-
-  _GLIBCXX_DEBUG_ONLY(debug_base::clear();)
-  m_a_values = 0;
-  m_size = 0;
-  m_end_it = m_a_values;
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  PB_DS_ASSERT_VALID((*this))
-
-#ifdef PB_DS_REGRESSION
-    typename _Alloc::group_adjustor adjust(m_size);
-#endif
-
-  size_type new_size = 0;
-  size_type num_val_ersd = 0;
-
-  for (iterator source_it = begin(); source_it != m_end_it; ++source_it)
-    if (!pred(*source_it))
-      ++new_size;
-    else
-      ++num_val_ersd;
-
-  if (new_size == 0)
-    {
-      clear();
-      return num_val_ersd;
-    }
-
-  value_vector a_new_values = s_value_alloc.allocate(new_size);
-  iterator target_it = a_new_values;
-  cond_dtor<size_type> cd(a_new_values, target_it, new_size);
-  _GLIBCXX_DEBUG_ONLY(debug_base::clear());
-  for (iterator source_it = begin(); source_it != m_end_it; ++source_it)
-    {
-      if (!pred(*source_it))
-	{
-	  new (const_cast<void*>(static_cast<const void*>(target_it)))
-	    value_type(*source_it);
-
-	  _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(*source_it)));
-	  ++target_it;
-	}
-    }
-
-  reallocate_metadata((node_update*)this, new_size);
-  cd.set_no_action();
-
-  {
-    cond_dtor<size_type> cd1(m_a_values, m_end_it, m_size);
-  }
-
-  m_a_values = a_new_values;
-  m_size = new_size;
-  m_end_it = target_it;
-  update(node_begin(), (node_update*)this);
-  PB_DS_ASSERT_VALID((*this))
-  return num_val_ersd;
-}
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-It
-PB_DS_CLASS_C_DEC::
-erase_imp(It it)
-{
-  PB_DS_ASSERT_VALID((*this))
-  if (it == end())
-    return end();
-
-  PB_DS_CHECK_KEY_EXISTS(PB_DS_V2F(*it))
-
-#ifdef PB_DS_REGRESSION
-    typename _Alloc::group_adjustor adjust(m_size);
-#endif
-
-  _GLIBCXX_DEBUG_ASSERT(m_size > 0);
-  value_vector a_values = s_value_alloc.allocate(m_size - 1);
-  iterator source_it = begin();
-  iterator source_end_it = end();
-  iterator target_it = a_values;
-  iterator ret_it = end();
-
-  cond_dtor<size_type> cd(a_values, target_it, m_size - 1);
-
-  _GLIBCXX_DEBUG_ONLY(size_type cnt = 0;)
-
-  while (source_it != source_end_it)
-    {
-      if (source_it != it)
-	{
-	  _GLIBCXX_DEBUG_ONLY(++cnt;)
-	  _GLIBCXX_DEBUG_ASSERT(cnt != m_size);
-	  new (const_cast<void*>(static_cast<const void*>(target_it)))
-	      value_type(*source_it);
-
-	  ++target_it;
-	}
-      else
-	ret_it = target_it;
-    ++source_it;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(m_size > 0);
-  reallocate_metadata((node_update*)this, m_size - 1);
-  cd.set_no_action();
-  _GLIBCXX_DEBUG_ONLY(debug_base::erase_existing(PB_DS_V2F(*it));)
-  {
-    cond_dtor<size_type> cd1(m_a_values, m_end_it, m_size);
-  }
-
-  m_a_values = a_values;
-  --m_size;
-  m_end_it = m_a_values + m_size;
-  update(node_begin(), (node_update*)this);
-  PB_DS_ASSERT_VALID((*this))
-  return It(ret_it);
-}
-
-PB_DS_CLASS_T_DEC
-bool
-PB_DS_CLASS_C_DEC::
-erase(key_const_reference r_key)
-{
-  point_iterator it = find(r_key);
-  if (it == end())
-    return false;
-  erase(it);
-  return true;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
deleted file mode 100644
index 5a14ac2..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/info_fn_imps.hpp
- * Contains an implementation class for ov_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size() const
-{
-  PB_DS_ASSERT_VALID((*this))
-  return m_size;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-max_size() const
-{ return s_value_alloc.max_size(); }
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-empty() const
-{ return size() == 0; }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
deleted file mode 100644
index d2d3a86..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/insert_fn_imps.hpp
- * Contains an implementation class for ov_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-reallocate_metadata(null_node_update_pointer, size_type)
-{ }
-
-PB_DS_CLASS_T_DEC
-template<typename Node_Update_>
-void
-PB_DS_CLASS_C_DEC::
-reallocate_metadata(Node_Update_* , size_type new_size)
-{
-  metadata_pointer a_new_metadata_vec =(new_size == 0) ? 0 : s_metadata_alloc.allocate(new_size);
-
-  if (m_a_metadata != 0)
-    {
-      for (size_type i = 0; i < m_size; ++i)
-	m_a_metadata[i].~metadata_type();
-      s_metadata_alloc.deallocate(m_a_metadata, m_size);
-    }
-  std::swap(m_a_metadata, a_new_metadata_vec);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
deleted file mode 100644
index 8148b27..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/iterators_fn_imps.hpp
- * Contains an implementation class for ov_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_const_iterator
-PB_DS_CLASS_C_DEC::
-node_begin() const
-{ return PB_DS_node_begin_imp(); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_const_iterator
-PB_DS_CLASS_C_DEC::
-node_end() const
-{ return PB_DS_node_end_imp(); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_iterator
-PB_DS_CLASS_C_DEC::
-node_begin()
-{ return PB_DS_node_begin_imp(); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_iterator
-PB_DS_CLASS_C_DEC::
-node_end()
-{ return PB_DS_node_end_imp(); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_const_iterator
-PB_DS_CLASS_C_DEC::
-PB_DS_node_begin_imp() const
-{
-  return node_const_iterator(const_cast<pointer>(mid_pointer(begin(), end())),
-			      const_cast<pointer>(begin()),
-			      const_cast<pointer>(end()),(m_a_metadata == 0)?
-			      0 :
-			      mid_pointer(m_a_metadata, m_a_metadata + m_size));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_const_iterator
-PB_DS_CLASS_C_DEC::
-PB_DS_node_end_imp() const
-{
-  return node_const_iterator(end(), end(), end(),
-		     (m_a_metadata == 0) ? 0 : m_a_metadata + m_size);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_iterator
-PB_DS_CLASS_C_DEC::
-PB_DS_node_begin_imp()
-{
-  return node_iterator(mid_pointer(begin(), end()), begin(), end(),
-		       (m_a_metadata == 0) ? 0 : mid_pointer(m_a_metadata, m_a_metadata + m_size));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_iterator
-PB_DS_CLASS_C_DEC::
-PB_DS_node_end_imp()
-{
-  return node_iterator(end(), end(),
-		  end(),(m_a_metadata == 0) ? 0 : m_a_metadata + m_size);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
deleted file mode 100644
index cab573c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
+++ /dev/null
@@ -1,291 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/node_iterators.hpp
- * Contains an implementation class for ov_tree_.
- */
-
-#ifndef PB_DS_OV_TREE_NODE_ITERATORS_HPP
-#define PB_DS_OV_TREE_NODE_ITERATORS_HPP
-
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_OV_TREE_CONST_NODE_ITERATOR_C_DEC	\
-    ov_tree_node_const_it_<Value_Type, Metadata_Type, _Alloc>
-
-    /// Const node reference.
-    template<typename Value_Type, typename Metadata_Type, typename _Alloc>
-    class ov_tree_node_const_it_
-    {
-
-    protected:
-      typedef
-      typename _Alloc::template rebind<
-      Value_Type>::other::pointer
-      pointer;
-
-      typedef
-      typename _Alloc::template rebind<
-	Value_Type>::other::const_pointer
-      const_pointer;
-
-      typedef
-      typename _Alloc::template rebind<
-	Metadata_Type>::other::const_pointer
-      const_metadata_pointer;
-
-      typedef PB_DS_OV_TREE_CONST_NODE_ITERATOR_C_DEC this_type;
-
-    protected:
-
-      template<typename Ptr>
-      inline static Ptr
-      mid_pointer(Ptr p_begin, Ptr p_end)
-      {
-	_GLIBCXX_DEBUG_ASSERT(p_end >= p_begin);
-	return (p_begin + (p_end - p_begin) / 2);
-      }
-
-    public:
-
-      typedef trivial_iterator_tag iterator_category;
-
-      typedef trivial_iterator_difference_type difference_type;
-
-      typedef
-      typename _Alloc::template rebind<
-	Value_Type>::other::const_pointer
-      value_type;
-
-      typedef
-      typename _Alloc::template rebind<
-	typename remove_const<
-	Value_Type>::type>::other::const_pointer
-      reference;
-
-      typedef
-      typename _Alloc::template rebind<
-	typename remove_const<
-	Value_Type>::type>::other::const_pointer
-      const_reference;
-
-      typedef Metadata_Type metadata_type;
-
-      typedef
-      typename _Alloc::template rebind<
-	metadata_type>::other::const_reference
-      metadata_const_reference;
-
-    public:
-      inline
-      ov_tree_node_const_it_(const_pointer p_nd = 0,  const_pointer p_begin_nd = 0,  const_pointer p_end_nd = 0,  const_metadata_pointer p_metadata = 0) : m_p_value(const_cast<pointer>(p_nd)), m_p_begin_value(const_cast<pointer>(p_begin_nd)), m_p_end_value(const_cast<pointer>(p_end_nd)), m_p_metadata(p_metadata)
-      { }
-
-      inline const_reference
-      operator*() const
-      { return m_p_value; }
-
-      inline metadata_const_reference
-      get_metadata() const
-      {
-	enum
-	  {
-	    has_metadata = !is_same<Metadata_Type, null_type>::value
-	  };
-
-	PB_DS_STATIC_ASSERT(should_have_metadata, has_metadata);
-	_GLIBCXX_DEBUG_ASSERT(m_p_metadata != 0);
-	return *m_p_metadata;
-      }
-
-      /// Returns the node iterator associated with the left node.
-      inline this_type
-      get_l_child() const
-      {
-	if (m_p_begin_value == m_p_value)
-	  return (this_type(m_p_begin_value, m_p_begin_value, m_p_begin_value));
-
-	const_metadata_pointer p_begin_metadata =
-	  m_p_metadata - (m_p_value - m_p_begin_value);
-
-	return (this_type(mid_pointer(m_p_begin_value, m_p_value),
-			  m_p_begin_value,
-			  m_p_value,
-			  mid_pointer(p_begin_metadata, m_p_metadata)));
-      }
-
-      /// Returns the node iterator associated with the right node.
-      inline this_type
-      get_r_child() const
-      {
-	if (m_p_value == m_p_end_value)
-	  return (this_type(m_p_end_value, m_p_end_value, m_p_end_value));
-
-	const_metadata_pointer p_end_metadata =
-	  m_p_metadata + (m_p_end_value - m_p_value);
-
-	return (this_type(mid_pointer(m_p_value + 1, m_p_end_value),
-			  m_p_value + 1,
-			  m_p_end_value,(m_p_metadata == 0) ?
-			  0 : mid_pointer(m_p_metadata + 1, p_end_metadata)));
-      }
-
-      inline bool
-      operator==(const this_type& other) const
-      {
-	const bool is_end = m_p_begin_value == m_p_end_value;
-	const bool is_other_end = other.m_p_begin_value == other.m_p_end_value;
-
-	if (is_end)
-	  return (is_other_end);
-
-	if (is_other_end)
-	  return (is_end);
-
-	return m_p_value == other.m_p_value;
-      }
-
-      inline bool
-      operator!=(const this_type& other) const
-      { return !operator==(other); }
-
-    public:
-      pointer m_p_value;
-      pointer m_p_begin_value;
-      pointer m_p_end_value;
-
-      const_metadata_pointer m_p_metadata;
-    };
-
-#define PB_DS_OV_TREE_NODE_ITERATOR_C_DEC \
-    ov_tree_node_it_<Value_Type, Metadata_Type, _Alloc>
-
-    /// Node reference.
-    template<typename Value_Type, typename Metadata_Type, typename _Alloc>
-    class ov_tree_node_it_ : public PB_DS_OV_TREE_CONST_NODE_ITERATOR_C_DEC
-    {
-    private:
-      typedef PB_DS_OV_TREE_NODE_ITERATOR_C_DEC this_type;
-
-      typedef PB_DS_OV_TREE_CONST_NODE_ITERATOR_C_DEC base_type;
-
-      typedef typename base_type::pointer pointer;
-
-      typedef typename base_type::const_pointer const_pointer;
-
-      typedef
-      typename base_type::const_metadata_pointer
-      const_metadata_pointer;
-
-    public:
-      typedef trivial_iterator_tag iterator_category;
-
-      typedef trivial_iterator_difference_type difference_type;
-
-      typedef
-      typename _Alloc::template rebind<
-	Value_Type>::other::pointer
-      value_type;
-
-      typedef
-      typename _Alloc::template rebind<
-	typename remove_const<
-	Value_Type>::type>::other::pointer
-      reference;
-
-      typedef
-      typename _Alloc::template rebind<
-	typename remove_const<
-	Value_Type>::type>::other::pointer
-      const_reference;
-
-      inline
-      ov_tree_node_it_(const_pointer p_nd = 0,  const_pointer p_begin_nd = 0,  const_pointer p_end_nd = 0,  const_metadata_pointer p_metadata = 0) : base_type(p_nd,  p_begin_nd,  p_end_nd,  p_metadata)
-      { }
-
-      /// Access.
-      inline reference
-      operator*() const
-      { return reference(base_type::m_p_value); }
-
-      /// Returns the node reference associated with the left node.
-      inline ov_tree_node_it_
-      get_l_child() const
-      {
-	if (base_type::m_p_begin_value == base_type::m_p_value)
-	  return (this_type(base_type::m_p_begin_value,  base_type::m_p_begin_value,  base_type::m_p_begin_value));
-
-	const_metadata_pointer p_begin_metadata =
-	  base_type::m_p_metadata - (base_type::m_p_value - base_type::m_p_begin_value);
-
-	return (this_type(base_type::mid_pointer(base_type::m_p_begin_value, base_type::m_p_value),
-			  base_type::m_p_begin_value,
-			  base_type::m_p_value,
-			  base_type::mid_pointer(p_begin_metadata, base_type::m_p_metadata)));
-      }
-
-      /// Returns the node reference associated with the right node.
-      inline ov_tree_node_it_
-      get_r_child() const
-      {
-	if (base_type::m_p_value == base_type::m_p_end_value)
-	  return this_type(base_type::m_p_end_value, base_type::m_p_end_value,  
-			   base_type::m_p_end_value);
-
-	const_metadata_pointer p_end_metadata =
-	  base_type::m_p_metadata + (base_type::m_p_end_value - base_type::m_p_value);
-
-	return (this_type(base_type::mid_pointer(base_type::m_p_value + 1, base_type::m_p_end_value),
-			  base_type::m_p_value + 1,
-			  base_type::m_p_end_value,(base_type::m_p_metadata == 0)?
-			  0 : base_type::mid_pointer(base_type::m_p_metadata + 1, p_end_metadata)));
-      }
-
-    };
-
-#undef PB_DS_OV_TREE_NODE_ITERATOR_C_DEC
-#undef PB_DS_OV_TREE_CONST_NODE_ITERATOR_C_DEC
-
-} // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
deleted file mode 100644
index d076af0..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
+++ /dev/null
@@ -1,542 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/ov_tree_map_.hpp
- * Contains an implementation class for ov_tree.
- */
-
-#include <map>
-#include <set>
-#include <ext/pb_ds/exception.hpp>
-#include <ext/pb_ds/tree_policy.hpp>
-#include <ext/pb_ds/detail/eq_fn/eq_by_less.hpp>
-#include <ext/pb_ds/detail/types_traits.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/tree_trace_base.hpp>
-#ifdef _GLIBCXX_DEBUG
-#include <ext/pb_ds/detail/debug_map_base.hpp>
-#endif
-#include <utility>
-#include <functional>
-#include <algorithm>
-#include <vector>
-#include <assert.h>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-#define PB_DS_OV_TREE_NAME ov_tree_map
-#define PB_DS_CONST_NODE_ITERATOR_NAME ov_tree_node_const_iterator_map
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-#define PB_DS_OV_TREE_NAME ov_tree_set
-#define PB_DS_CONST_NODE_ITERATOR_NAME ov_tree_node_const_iterator_set
-#endif
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Mapped, typename Cmp_Fn, \
-	     typename Node_And_It_Traits, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-   PB_DS_OV_TREE_NAME<Key, Mapped, Cmp_Fn, Node_And_It_Traits, _Alloc>
-
-#define PB_DS_OV_TREE_TRAITS_BASE \
-    types_traits<Key, Mapped, _Alloc, false>
-
-#ifdef _GLIBCXX_DEBUG
-#define PB_DS_DEBUG_MAP_BASE_C_DEC \
-    debug_map_base<Key, eq_by_less<Key, Cmp_Fn>, \
-       	typename _Alloc::template rebind<Key>::other::const_reference>
-#endif
-
-#ifdef PB_DS_TREE_TRACE
-#define PB_DS_TREE_TRACE_BASE_C_DEC \
-    tree_trace_base<typename Node_And_It_Traits::node_const_iterator,	\
-		    typename Node_And_It_Traits::node_iterator,		\
-		    Cmp_Fn, false, _Alloc>
-#endif
-
-#ifndef PB_DS_CHECK_KEY_EXISTS
-#  error Missing definition
-#endif
-
-    /**
-     *  @brief Ordered-vector tree associative-container.
-     *  @ingroup branch-detail
-     */
-    template<typename Key, typename Mapped, typename Cmp_Fn,
-	     typename Node_And_It_Traits, typename _Alloc>
-    class PB_DS_OV_TREE_NAME :
-#ifdef _GLIBCXX_DEBUG
-      protected PB_DS_DEBUG_MAP_BASE_C_DEC,
-#endif
-#ifdef PB_DS_TREE_TRACE
-      public PB_DS_TREE_TRACE_BASE_C_DEC,
-#endif
-      public Cmp_Fn,
-      public Node_And_It_Traits::node_update,
-      public PB_DS_OV_TREE_TRAITS_BASE
-    {
-    private:
-      typedef PB_DS_OV_TREE_TRAITS_BASE	       		traits_base;
-      typedef Node_And_It_Traits			traits_type;
-
-      typedef typename remove_const<typename traits_base::value_type>::type non_const_value_type;
-
-      typedef typename _Alloc::template rebind<non_const_value_type>::other value_allocator;
-      typedef typename value_allocator::pointer 	value_vector;
-
-#ifdef _GLIBCXX_DEBUG
-      typedef PB_DS_DEBUG_MAP_BASE_C_DEC 		debug_base;
-#endif
-
-#ifdef PB_DS_TREE_TRACE
-      typedef PB_DS_TREE_TRACE_BASE_C_DEC 		trace_base;
-#endif
-
-      typedef typename traits_base::pointer 		mapped_pointer_;
-      typedef typename traits_base::const_pointer 	mapped_const_pointer_;
-
-      typedef typename traits_type::metadata_type 	metadata_type;
-
-      typedef typename _Alloc::template rebind<metadata_type>::other metadata_allocator;
-      typedef typename metadata_allocator::pointer 	metadata_pointer;
-      typedef typename metadata_allocator::const_reference metadata_const_reference;
-      typedef typename metadata_allocator::reference 	metadata_reference;
-
-      typedef typename traits_type::null_node_update_pointer
-      null_node_update_pointer;
-
-    public:
-      typedef ov_tree_tag 				 container_category;
-      typedef _Alloc 					allocator_type;
-      typedef typename _Alloc::size_type 		size_type;
-      typedef typename _Alloc::difference_type 		difference_type;
-      typedef Cmp_Fn 					cmp_fn;
-
-      typedef typename traits_base::key_type 		key_type;
-      typedef typename traits_base::key_pointer 	key_pointer;
-      typedef typename traits_base::key_const_pointer 	key_const_pointer;
-      typedef typename traits_base::key_reference 	key_reference;
-      typedef typename traits_base::key_const_reference key_const_reference;
-      typedef typename traits_base::mapped_type 	mapped_type;
-      typedef typename traits_base::mapped_pointer 	mapped_pointer;
-      typedef typename traits_base::mapped_const_pointer mapped_const_pointer;
-      typedef typename traits_base::mapped_reference 	mapped_reference;
-      typedef typename traits_base::mapped_const_reference mapped_const_reference;
-      typedef typename traits_base::value_type 		value_type;
-      typedef typename traits_base::pointer 		pointer;
-      typedef typename traits_base::const_pointer 	const_pointer;
-      typedef typename traits_base::reference 		reference;
-      typedef typename traits_base::const_reference 	const_reference;
-
-      typedef const_pointer 				point_const_iterator;
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      typedef pointer 					point_iterator;
-#else
-      typedef point_const_iterator 			point_iterator;
-#endif
-
-      typedef point_iterator 				iterator;
-      typedef point_const_iterator 			const_iterator;
-
-      /// Conditional destructor.
-      template<typename Size_Type>
-        class cond_dtor
-        {
-	public:
-	  cond_dtor(value_vector a_vec, iterator& r_last_it, 
-		    Size_Type total_size) 
-	  : m_a_vec(a_vec), m_r_last_it(r_last_it), m_max_size(total_size),
-	    m_no_action(false)
-	  { }
-
-	  ~cond_dtor()
-	  {
-	    if (m_no_action)
-	      return;
-	    iterator it = m_a_vec;
-	    while (it != m_r_last_it)
-	      {
-		it->~value_type();
-		++it;
-	      }
-	    
-	    if (m_max_size > 0)
-	      value_allocator().deallocate(m_a_vec, m_max_size);
-	  }
-
-	  inline void
-	  set_no_action()
-	  { m_no_action = true; }
-	  
-	protected:
-	  value_vector 		m_a_vec;
-	  iterator& 		m_r_last_it;
-	  const Size_Type 	m_max_size;
-	  bool 			m_no_action;
-       };
-      
-      typedef typename traits_type::node_update 	node_update;
-      typedef typename traits_type::node_iterator 	node_iterator;
-      typedef typename traits_type::node_const_iterator	node_const_iterator;
-
-
-      PB_DS_OV_TREE_NAME();
-
-      PB_DS_OV_TREE_NAME(const Cmp_Fn&);
-
-      PB_DS_OV_TREE_NAME(const Cmp_Fn&, const node_update&);
-
-      PB_DS_OV_TREE_NAME(const PB_DS_CLASS_C_DEC&);
-
-      ~PB_DS_OV_TREE_NAME();
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      template<typename It>
-      void
-      copy_from_range(It, It);
-
-      inline size_type
-      max_size() const;
-
-      inline bool
-      empty() const;
-
-      inline size_type
-      size() const;
-
-      Cmp_Fn&
-      get_cmp_fn();
-
-      const Cmp_Fn&
-      get_cmp_fn() const;
-
-      inline mapped_reference
-      operator[](key_const_reference r_key)
-      {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-	PB_DS_ASSERT_VALID((*this))
-	point_iterator it = lower_bound(r_key);
-	if (it != end() && !Cmp_Fn::operator()(r_key, PB_DS_V2F(*it)))
-	  {
-	    PB_DS_CHECK_KEY_EXISTS(r_key)
-	    PB_DS_ASSERT_VALID((*this))
-	     return it->second;
-	  }
-	return insert_new_val(it, std::make_pair(r_key, mapped_type()))->second;
-#else
-	insert(r_key);
-	return traits_base::s_null_type;
-#endif
-      }
-
-      inline std::pair<point_iterator, bool>
-      insert(const_reference r_value)
-      {
-	PB_DS_ASSERT_VALID((*this))
-	key_const_reference r_key = PB_DS_V2F(r_value);
-	point_iterator it = lower_bound(r_key);
-
-	if (it != end()&&  !Cmp_Fn::operator()(r_key, PB_DS_V2F(*it)))
-	  {
-	    PB_DS_ASSERT_VALID((*this))
-	    PB_DS_CHECK_KEY_EXISTS(r_key)
-	    return std::make_pair(it, false);
-	  }
-
-	return std::make_pair(insert_new_val(it, r_value), true);
-      }
-
-      inline point_iterator
-      lower_bound(key_const_reference r_key)
-      {
-	pointer it = m_a_values;
-	pointer e_it = m_a_values + m_size;
-	while (it != e_it)
-	  {
-	    pointer mid_it = it + ((e_it - it) >> 1);
-	    if (cmp_fn::operator()(PB_DS_V2F(*mid_it), r_key))
-	      it = ++mid_it;
-	    else
-	      e_it = mid_it;
-	  }
-	return it;
-      }
-
-      inline point_const_iterator
-      lower_bound(key_const_reference r_key) const
-      { return const_cast<PB_DS_CLASS_C_DEC& >(*this).lower_bound(r_key); }
-
-      inline point_iterator
-      upper_bound(key_const_reference r_key)
-      {
-	iterator pot_it = lower_bound(r_key);
-	if (pot_it != end() && !Cmp_Fn::operator()(r_key, PB_DS_V2F(*pot_it)))
-	  {
-	    PB_DS_CHECK_KEY_EXISTS(r_key)
-	    return ++pot_it;
-	  }
-
-	PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	return pot_it;
-      }
-
-      inline point_const_iterator
-      upper_bound(key_const_reference r_key) const
-      { return const_cast<PB_DS_CLASS_C_DEC&>(*this).upper_bound(r_key); }
-
-      inline point_iterator
-      find(key_const_reference r_key)
-      {
-	PB_DS_ASSERT_VALID((*this))
-	iterator pot_it = lower_bound(r_key);
-	if (pot_it != end() && !Cmp_Fn::operator()(r_key, PB_DS_V2F(*pot_it)))
-	  {
-	    PB_DS_CHECK_KEY_EXISTS(r_key)
-	    return pot_it;
-	  }
-
-	PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-	return end();
-      }
-
-      inline point_const_iterator
-      find(key_const_reference r_key) const
-      { return (const_cast<PB_DS_CLASS_C_DEC&>(*this).find(r_key)); }
-
-      bool
-      erase(key_const_reference);
-
-      template<typename Pred>
-      inline size_type
-      erase_if(Pred);
-
-      inline iterator
-      erase(iterator it)
-      { return erase_imp<iterator>(it); }
-
-      void
-      clear();
-
-      void
-      join(PB_DS_CLASS_C_DEC&);
-
-      void
-      split(key_const_reference, PB_DS_CLASS_C_DEC&);
-
-      inline iterator
-      begin()
-      { return m_a_values; }
-
-      inline const_iterator
-      begin() const
-      { return m_a_values; }
-
-      inline iterator
-      end()
-      { return m_end_it; }
-
-      inline const_iterator
-      end() const
-      { return m_end_it; }
-
-      /// Returns a const node_iterator corresponding to the node at the
-      /// root of the tree.
-      inline node_const_iterator
-      node_begin() const;
-
-      /// Returns a node_iterator corresponding to the node at the
-      /// root of the tree.
-      inline node_iterator
-      node_begin();
-
-      /// Returns a const node_iterator corresponding to a node just
-      /// after a leaf of the tree.
-      inline node_const_iterator
-      node_end() const;
-
-      /// Returns a node_iterator corresponding to a node just
-      /// after a leaf of the tree.
-      inline node_iterator
-      node_end();
-
-    private:
-
-      inline void
-      update(node_iterator, null_node_update_pointer);
-
-      template<typename Node_Update>
-      void
-      update(node_iterator, Node_Update*);
-
-      void
-      reallocate_metadata(null_node_update_pointer, size_type);
-
-      template<typename Node_Update_>
-      void
-      reallocate_metadata(Node_Update_*, size_type);
-
-      template<typename It>
-      void
-      copy_from_ordered_range(It, It);
-
-      void
-      value_swap(PB_DS_CLASS_C_DEC&);
-
-      template<typename It>
-      void
-      copy_from_ordered_range(It, It, It, It);
-
-      template<typename Ptr>
-      inline static Ptr
-      mid_pointer(Ptr p_begin, Ptr p_end)
-      {
-	_GLIBCXX_DEBUG_ASSERT(p_end >= p_begin);
-	return (p_begin + (p_end - p_begin) / 2);
-      }
-
-      inline iterator
-      insert_new_val(iterator it, const_reference r_value)
-      {
-#ifdef PB_DS_REGRESSION
-	typename _Alloc::group_adjustor adjust(m_size);
-#endif
-
-	PB_DS_CHECK_KEY_DOES_NOT_EXIST(PB_DS_V2F(r_value))
-
-	value_vector a_values = s_value_alloc.allocate(m_size + 1);
-
-	iterator source_it = begin();
-	iterator source_end_it = end();
-	iterator target_it = a_values;
-	iterator ret_it;
-
-	cond_dtor<size_type> cd(a_values, target_it, m_size + 1);
-	while (source_it != it)
-	  {
-	    new (const_cast<void*>(static_cast<const void*>(target_it)))
-	      value_type(*source_it++);
-	    ++target_it;
-	  }
-
-	new (const_cast<void*>(static_cast<const void*>(ret_it = target_it)))
-	  value_type(r_value);
-	++target_it;
-
-	while (source_it != source_end_it)
-	  {
-	    new (const_cast<void*>(static_cast<const void*>(target_it)))
-	      value_type(*source_it++);
-	    ++target_it;
-	  }
-
-	reallocate_metadata((node_update*)this, m_size + 1);
-	cd.set_no_action();
-	if (m_size != 0)
-	  {
-	    cond_dtor<size_type> cd1(m_a_values, m_end_it, m_size);
-	  }
-
-	++m_size;
-	m_a_values = a_values;
-	m_end_it = m_a_values + m_size;
-	_GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(r_value)));
-	update(node_begin(), (node_update* )this);
-	PB_DS_ASSERT_VALID((*this))
-	return ret_it;
-      }
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-
-      void
-      assert_iterators(const char*, int) const;
-#endif
-
-      template<typename It>
-      It
-      erase_imp(It);
-
-      inline node_const_iterator
-      PB_DS_node_begin_imp() const;
-
-      inline node_const_iterator
-      PB_DS_node_end_imp() const;
-
-      inline node_iterator
-      PB_DS_node_begin_imp();
-
-      inline node_iterator
-      PB_DS_node_end_imp();
-
-    private:
-      static value_allocator 	s_value_alloc;
-      static metadata_allocator s_metadata_alloc;
-
-      value_vector 		m_a_values;
-      metadata_pointer 		m_a_metadata;
-      iterator 			m_end_it;
-      size_type 		m_size;
-    };
-
-#include <ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp>
-#include <ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp>
-#include <ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp>
-#include <ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp>
-
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_OV_TREE_NAME
-#undef PB_DS_OV_TREE_TRAITS_BASE
-#undef PB_DS_DEBUG_MAP_BASE_C_DEC
-#ifdef PB_DS_TREE_TRACE
-#undef PB_DS_TREE_TRACE_BASE_C_DEC
-#endif
-#undef PB_DS_CONST_NODE_ITERATOR_NAME
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
deleted file mode 100644
index 55cf072..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/policy_access_fn_imps.hpp
- * Contains an implementation class for ov_tree.
- */
-
-PB_DS_CLASS_T_DEC
-Cmp_Fn& 
-PB_DS_CLASS_C_DEC::
-get_cmp_fn()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Cmp_Fn& 
-PB_DS_CLASS_C_DEC::
-get_cmp_fn() const
-{ return *this; }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
deleted file mode 100644
index dacfb73..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/split_join_fn_imps.hpp
- * Contains an implementation class for ov_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-split(key_const_reference r_key, PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  if (m_size == 0)
-    {
-      other.clear();
-      return;
-    }
-
-  if (Cmp_Fn::operator()(r_key, PB_DS_V2F(*begin())))
-    {
-      value_swap(other);
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  if (!Cmp_Fn::operator()(r_key, PB_DS_V2F(*(end() - 1))))
-    {
-      return;
-    }
-
-  if (m_size == 1)
-    {
-      value_swap(other);
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  iterator it = upper_bound(r_key);
-  PB_DS_CLASS_C_DEC new_other(other, other);
-  new_other.copy_from_ordered_range(it, end());
-  PB_DS_CLASS_C_DEC new_this(*this, *this);
-  new_this.copy_from_ordered_range(begin(), it);
-
-  // No exceptions from this point.
-  other.update(other.node_begin(), (node_update*)(&other));
-  update(node_begin(), (node_update*)this);
-  other.value_swap(new_other);
-  value_swap(new_this);
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-join(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  if (other.m_size == 0)
-    return;
-
-  if (m_size == 0)
-    {
-      value_swap(other);
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  const bool greater = Cmp_Fn::operator()(PB_DS_V2F(*(end() - 1)),
-					  PB_DS_V2F(*other.begin()));
-
-  const bool lesser = Cmp_Fn::operator()(PB_DS_V2F(*(other.end() - 1)),
-					 PB_DS_V2F(*begin()));
-
-  if (!greater && !lesser)
-    __throw_join_error();
-
-  PB_DS_CLASS_C_DEC new_this(*this, *this);
-
-  if (greater)
-    new_this.copy_from_ordered_range(begin(), end(),
-				     other.begin(), other.end());
-  else
-    new_this.copy_from_ordered_range(other.begin(), other.end(),
-				     begin(), end());
-
-  // No exceptions from this point.
-  value_swap(new_this);
-  other.clear();
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/traits.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/traits.hpp
deleted file mode 100644
index 861a7ed..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/ov_tree_map_/traits.hpp
+++ /dev/null
@@ -1,190 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file ov_tree_map_/traits.hpp
- * Contains an implementation class for ov_tree_.
- */
-
-#ifndef PB_DS_OV_TREE_NODE_AND_IT_TRAITS_HPP
-#define PB_DS_OV_TREE_NODE_AND_IT_TRAITS_HPP
-
-#include <ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Tree traits.
-    /// @ingroup traits
-    template<typename Key,
-	     typename Mapped,
-	     class Cmp_Fn,
-	     template<typename Node_CItr,
-		      class Node_Itr,
-		      class Cmp_Fn_,
-		      typename _Alloc_>
-    class Node_Update,
-	     typename _Alloc>
-    struct tree_traits<
-      Key,
-      Mapped,
-      Cmp_Fn,
-      Node_Update,
-      ov_tree_tag,
-      _Alloc>
-    {
-    private:
-      typedef
-      typename types_traits<
-      Key,
-      Mapped,
-      _Alloc,
-      false>::value_type
-      value_type;
-
-    public:
-      typedef
-      typename tree_node_metadata_dispatch<
-      Key,
-      Mapped,
-      Cmp_Fn,
-      Node_Update,
-      _Alloc>::type
-      metadata_type;
-
-      /// This is an iterator to an iterator: it iterates over nodes,
-      /// and de-referencing it returns one of the tree's iterators.
-      typedef
-      ov_tree_node_const_it_<
-	value_type,
-	metadata_type,
-	_Alloc>
-      node_const_iterator;
-
-      typedef
-      ov_tree_node_it_<
-	value_type,
-	metadata_type,
-	_Alloc>
-      node_iterator;
-
-      typedef
-      Node_Update<
-	node_const_iterator,
-	node_iterator,
-	Cmp_Fn,
-	_Alloc>
-      node_update;
-
-      typedef
-      __gnu_pbds::null_node_update<
-	node_const_iterator,
-	node_iterator,
-	Cmp_Fn,
-	_Alloc>* 
-      null_node_update_pointer;
-    };
-
-
-    /// Specialization.
-    /// @ingroup traits
-    template<typename Key,
-	     class Cmp_Fn,
-	     template<typename Node_CItr,
-		      class Node_Itr,
-		      class Cmp_Fn_,
-		      typename _Alloc_>
-    class Node_Update,
-	     typename _Alloc>
-    struct tree_traits<
-      Key,
-      null_type,
-      Cmp_Fn,
-      Node_Update,
-      ov_tree_tag,
-      _Alloc>
-    {
-    private:
-      typedef
-      typename types_traits<
-      Key,
-      null_type,
-      _Alloc,
-      false>::value_type
-      value_type;
-
-    public:
-      typedef
-      typename tree_node_metadata_dispatch<
-      Key,
-      null_type,
-      Cmp_Fn,
-      Node_Update,
-      _Alloc>::type
-      metadata_type;
-
-      /// This is an iterator to an iterator: it iterates over nodes,
-      /// and de-referencing it returns one of the tree's iterators.
-      typedef
-      ov_tree_node_const_it_<
-	value_type,
-	metadata_type,
-	_Alloc>
-      node_const_iterator;
-
-      typedef node_const_iterator node_iterator;
-
-      typedef
-      Node_Update<
-	node_const_iterator,
-	node_const_iterator,
-	Cmp_Fn,
-	_Alloc>
-      node_update;
-
-      typedef
-      __gnu_pbds::null_node_update<
-	node_const_iterator,
-	node_iterator,
-	Cmp_Fn,
-	_Alloc>* 
-      null_node_update_pointer;
-    };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_OV_TREE_NODE_AND_IT_TRAITS_HPP
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index d33e60c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pairing_heap_/constructors_destructor_fn_imps.hpp
- * Contains an implementation class for a pairing heap.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-  while (first_it != last_it)
-    push(*(first_it++));
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-pairing_heap()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-pairing_heap(const Cmp_Fn& r_cmp_fn)
-: base_type(r_cmp_fn)
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-pairing_heap(const PB_DS_CLASS_C_DEC& other)
-: base_type(other)
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  base_type::swap(other);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~pairing_heap()
-{ }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
deleted file mode 100644
index 4478403..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pairing_heap_/debug_fn_imps.hpp
- * Contains an implementation class for a pairing heap.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  PB_DS_DEBUG_VERIFY(base_type::m_p_root == 0 
-		        || base_type::m_p_root->m_p_next_sibling == 0);
-  base_type::assert_valid(__file, __line);
-}
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
deleted file mode 100644
index 00ce84d..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pairing_heap_/erase_fn_imps.hpp
- * Contains an implementation class for a pairing heap.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-pop()
-{
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-
-  node_pointer p_new_root = join_node_children(base_type::m_p_root);
-  PB_DS_ASSERT_NODE_CONSISTENT(p_new_root, false)
-  if (p_new_root != 0)
-    p_new_root->m_p_prev_or_parent = 0;
-
-  base_type::actual_erase_node(base_type::m_p_root);
-  base_type::m_p_root = p_new_root;
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase(point_iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-  remove_node(it.m_p_nd);
-  base_type::actual_erase_node(it.m_p_nd);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-remove_node(node_pointer p_nd)
-{
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-  node_pointer p_new_child = join_node_children(p_nd);
-
-  PB_DS_ASSERT_NODE_CONSISTENT(p_new_child, false)
-
-  if (p_nd == base_type::m_p_root)
-    {
-      if (p_new_child != 0)
-	p_new_child->m_p_prev_or_parent = 0;
-      base_type::m_p_root = p_new_child;
-      PB_DS_ASSERT_NODE_CONSISTENT(base_type::m_p_root, false)
-      return;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_prev_or_parent != 0);
-  if (p_nd->m_p_prev_or_parent->m_p_l_child == p_nd)
-    {
-      if (p_new_child != 0)
-        {
-	  p_new_child->m_p_prev_or_parent = p_nd->m_p_prev_or_parent;
-	  p_new_child->m_p_next_sibling = p_nd->m_p_next_sibling;
-	  if (p_new_child->m_p_next_sibling != 0)
-	    p_new_child->m_p_next_sibling->m_p_prev_or_parent = p_new_child;
-	  p_nd->m_p_prev_or_parent->m_p_l_child = p_new_child;
-	  PB_DS_ASSERT_NODE_CONSISTENT(p_nd->m_p_prev_or_parent, false)
-          return;
-        }
-
-      p_nd->m_p_prev_or_parent->m_p_l_child = p_nd->m_p_next_sibling;
-      if (p_nd->m_p_next_sibling != 0)
-	p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd->m_p_prev_or_parent;
-      PB_DS_ASSERT_NODE_CONSISTENT(p_nd->m_p_prev_or_parent, false)
-      return;
-    }
-
-  if (p_new_child != 0)
-    {
-      p_new_child->m_p_prev_or_parent = p_nd->m_p_prev_or_parent;
-      p_new_child->m_p_next_sibling = p_nd->m_p_next_sibling;
-      if (p_new_child->m_p_next_sibling != 0)
-	p_new_child->m_p_next_sibling->m_p_prev_or_parent = p_new_child;
-      p_new_child->m_p_prev_or_parent->m_p_next_sibling = p_new_child;
-      PB_DS_ASSERT_NODE_CONSISTENT(p_nd->m_p_prev_or_parent, false)
-      return;
-    }
-
-  p_nd->m_p_prev_or_parent->m_p_next_sibling = p_nd->m_p_next_sibling;
-  if (p_nd->m_p_next_sibling != 0)
-    p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd->m_p_prev_or_parent;
-  PB_DS_ASSERT_NODE_CONSISTENT(p_nd->m_p_prev_or_parent, false)
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-join_node_children(node_pointer p_nd)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-  node_pointer p_ret = p_nd->m_p_l_child;
-  if (p_ret == 0)
-    return 0;
-  while (p_ret->m_p_next_sibling != 0)
-    p_ret = forward_join(p_ret, p_ret->m_p_next_sibling);
-  while (p_ret->m_p_prev_or_parent != p_nd)
-    p_ret = back_join(p_ret->m_p_prev_or_parent, p_ret);
-  PB_DS_ASSERT_NODE_CONSISTENT(p_ret, false)
-  return p_ret;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-forward_join(node_pointer p_nd, node_pointer p_next)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_next_sibling == p_next);
-  if (Cmp_Fn::operator()(p_nd->m_value, p_next->m_value))
-    {
-      p_next->m_p_prev_or_parent = p_nd->m_p_prev_or_parent;
-      base_type::make_child_of(p_nd, p_next);
-      return p_next->m_p_next_sibling == 0 
-	? p_next : p_next->m_p_next_sibling;
-    }
-
-  if (p_next->m_p_next_sibling != 0)
-    {
-      p_next->m_p_next_sibling->m_p_prev_or_parent = p_nd;
-      p_nd->m_p_next_sibling = p_next->m_p_next_sibling;
-      base_type::make_child_of(p_next, p_nd);
-      return p_nd->m_p_next_sibling;
-    }
-
-  p_nd->m_p_next_sibling = 0;
-  base_type::make_child_of(p_next, p_nd);
-  PB_DS_ASSERT_NODE_CONSISTENT(p_nd, false)
-  return p_nd;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-back_join(node_pointer p_nd, node_pointer p_next)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_next->m_p_next_sibling == 0);
-
-  if (Cmp_Fn::operator()(p_nd->m_value, p_next->m_value))
-    {
-      p_next->m_p_prev_or_parent = p_nd->m_p_prev_or_parent;
-      base_type::make_child_of(p_nd, p_next);
-      PB_DS_ASSERT_NODE_CONSISTENT(p_next, false)
-      return p_next;
-    }
-
-  p_nd->m_p_next_sibling = 0;
-  base_type::make_child_of(p_next, p_nd);
-  PB_DS_ASSERT_NODE_CONSISTENT(p_nd, false)
-  return p_nd;
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  PB_DS_ASSERT_VALID((*this))
-    if (base_type::empty())
-      {
-        PB_DS_ASSERT_VALID((*this))
-	return 0;
-      }
-  base_type::to_linked_list();
-  node_pointer p_out = base_type::prune(pred);
-  size_type ersd = 0;
-  while (p_out != 0)
-    {
-      ++ersd;
-      node_pointer p_next = p_out->m_p_next_sibling;
-      base_type::actual_erase_node(p_out);
-      p_out = p_next;
-    }
-
-  node_pointer p_cur = base_type::m_p_root;
-  base_type::m_p_root = 0;
-  while (p_cur != 0)
-    {
-      node_pointer p_next = p_cur->m_p_next_sibling;
-      p_cur->m_p_l_child = p_cur->m_p_next_sibling = p_cur->m_p_prev_or_parent = 0;
-
-      push_imp(p_cur);
-      p_cur = p_next;
-    }
-  PB_DS_ASSERT_VALID((*this))
-  return ersd;
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
deleted file mode 100644
index 11a79e3..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pairing_heap_/find_fn_imps.hpp
- * Contains an implementation class for a pairing heap.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reference
-PB_DS_CLASS_C_DEC::
-top() const
-{
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-  return base_type::m_p_root->m_value;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
deleted file mode 100644
index 2068460..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pairing_heap_/insert_fn_imps.hpp
- * Contains an implementation class for a pairing heap.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-push(const_reference r_val)
-{
-  PB_DS_ASSERT_VALID((*this))
-  node_pointer p_new_nd = base_type::get_new_node_for_insert(r_val);
-  push_imp(p_new_nd);
-  PB_DS_ASSERT_VALID((*this))
-  return point_iterator(p_new_nd);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-push_imp(node_pointer p_nd)
-{
-  p_nd->m_p_l_child = 0;
-  if (base_type::m_p_root == 0)
-    {
-      p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = 0;
-      base_type::m_p_root = p_nd;
-    }
-  else if (Cmp_Fn::operator()(base_type::m_p_root->m_value, p_nd->m_value))
-    {
-      p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = 0;
-      base_type::make_child_of(base_type::m_p_root, p_nd);
-      PB_DS_ASSERT_NODE_CONSISTENT(p_nd, false)
-      base_type::m_p_root = p_nd;
-    }
-  else
-    {
-      base_type::make_child_of(p_nd, base_type::m_p_root);
-      PB_DS_ASSERT_NODE_CONSISTENT(base_type::m_p_root, false)
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-modify(point_iterator it, const_reference r_new_val)
-{
-  PB_DS_ASSERT_VALID((*this))
-  remove_node(it.m_p_nd);
-  it.m_p_nd->m_value = r_new_val;
-  push_imp(it.m_p_nd);
-  PB_DS_ASSERT_VALID((*this))
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
deleted file mode 100644
index 3bbfef3..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pairing_heap_/pairing_heap_.hpp
- * Contains an implementation class for a pairing heap.
- */
-
-/*
- * Pairing heap:
- * Michael L. Fredman, Robert Sedgewick, Daniel Dominic Sleator,
- *    and Robert Endre Tarjan, The Pairing Heap:
- *    A New Form of Self-Adjusting Heap, Algorithmica, 1(1):111-129, 1986.
- */
-
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_CLASS_T_DEC \
-  template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-  pairing_heap<Value_Type, Cmp_Fn, _Alloc>
-
-#ifdef _GLIBCXX_DEBUG
-#define PB_DS_P_HEAP_BASE \
-  left_child_next_sibling_heap<Value_Type, Cmp_Fn, null_type, _Alloc, false>
-#else
-#define PB_DS_P_HEAP_BASE \
-  left_child_next_sibling_heap<Value_Type, Cmp_Fn, null_type, _Alloc>
-#endif
-
-    /**
-     *  Pairing heap.
-     *
-     *  @ingroup heap-detail
-     */
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-    class pairing_heap : public PB_DS_P_HEAP_BASE
-    {
-    private:
-      typedef PB_DS_P_HEAP_BASE				base_type;
-      typedef typename base_type::node_pointer 		node_pointer;
-
-      typedef typename _Alloc::template rebind<Value_Type>::other __rebind_a;
-
-    public:
-      typedef Value_Type 				value_type;
-      typedef Cmp_Fn 					cmp_fn;
-      typedef _Alloc 					allocator_type;
-      typedef typename _Alloc::size_type 		size_type;
-      typedef typename _Alloc::difference_type 		difference_type;
-
-      typedef typename __rebind_a::pointer 		pointer;
-      typedef typename __rebind_a::const_pointer 	const_pointer;
-      typedef typename __rebind_a::reference		reference;
-      typedef typename __rebind_a::const_reference 	const_reference;
-
-      typedef typename base_type::point_const_iterator	point_const_iterator;
-      typedef typename base_type::point_iterator 	point_iterator;
-      typedef typename base_type::const_iterator 	const_iterator;
-      typedef typename base_type::iterator 		iterator;
-
-      pairing_heap();
-
-      pairing_heap(const Cmp_Fn&);
-
-      pairing_heap(const pairing_heap&);
-
-      void
-      swap(pairing_heap&);
-
-      ~pairing_heap();
-
-      inline point_iterator
-      push(const_reference);
-
-      void
-      modify(point_iterator, const_reference);
-
-      inline const_reference
-      top() const;
-
-      void
-      pop();
-
-      void
-      erase(point_iterator);
-
-      template<typename Pred>
-      size_type
-      erase_if(Pred);
-
-      template<typename Pred>
-      void
-      split(Pred, pairing_heap&);
-
-      void
-      join(pairing_heap&);
-
-    protected:
-
-      template<typename It>
-      void
-      copy_from_range(It, It);
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-#endif
-
-    private:
-
-      inline void
-      push_imp(node_pointer);
-
-      node_pointer
-      join_node_children(node_pointer);
-
-      node_pointer
-      forward_join(node_pointer, node_pointer);
-
-      node_pointer
-      back_join(node_pointer, node_pointer);
-
-      void
-      remove_node(node_pointer);
-    };
-
-#define PB_DS_ASSERT_NODE_CONSISTENT(_Node, _Bool) \
- _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(_Node, _Bool,	\
-						       __FILE__, __LINE__);)
-
-#include <ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp>
-#include <ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp>
-
-#undef PB_DS_ASSERT_NODE_CONSISTENT
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_P_HEAP_BASE
-
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
deleted file mode 100644
index 7e1b91a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
+++ /dev/null
@@ -1,123 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pairing_heap_/split_join_fn_imps.hpp
- * Contains an implementation class for a pairing heap.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-void
-PB_DS_CLASS_C_DEC::
-split(Pred pred, PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  other.clear();
-
-  if (base_type::empty())
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  base_type::to_linked_list();
-  node_pointer p_out = base_type::prune(pred);
-  while (p_out != 0)
-    {
-      _GLIBCXX_DEBUG_ASSERT(base_type::m_size > 0);
-      --base_type::m_size;
-      ++other.m_size;
-      node_pointer p_next = p_out->m_p_next_sibling;
-      p_out->m_p_l_child = p_out->m_p_next_sibling = p_out->m_p_prev_or_parent = 0;
-
-      other.push_imp(p_out);
-      p_out = p_next;
-    }
-
-  PB_DS_ASSERT_VALID(other)
-  node_pointer p_cur = base_type::m_p_root;
-  base_type::m_p_root = 0;
-  while (p_cur != 0)
-    {
-      node_pointer p_next = p_cur->m_p_next_sibling;
-      p_cur->m_p_l_child = p_cur->m_p_next_sibling = p_cur->m_p_prev_or_parent = 0;
-
-      push_imp(p_cur);
-      p_cur = p_next;
-    }
-
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-join(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  if (other.m_p_root == 0)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  if (base_type::m_p_root == 0)
-    base_type::m_p_root = other.m_p_root;
-  else if (Cmp_Fn::operator()(base_type::m_p_root->m_value, other.m_p_root->m_value))
-    {
-      base_type::make_child_of(base_type::m_p_root, other.m_p_root);
-      PB_DS_ASSERT_NODE_CONSISTENT(other.m_p_root, false)
-      base_type::m_p_root = other.m_p_root;
-    }
-  else
-    {
-      base_type::make_child_of(other.m_p_root, base_type::m_p_root);
-      PB_DS_ASSERT_NODE_CONSISTENT(base_type::m_p_root, false)
-    }
-
-  base_type::m_size += other.m_size;
-  other.m_p_root = 0;
-  other.m_size = 0;
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index 865132f..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,214 +0,0 @@
- // -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/constructors_destructor_fn_imps.hpp
- * Contains an implementation class for pat_trie.
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::head_allocator
-PB_DS_CLASS_C_DEC::s_head_allocator;
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::inode_allocator
-PB_DS_CLASS_C_DEC::s_inode_allocator;
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::leaf_allocator
-PB_DS_CLASS_C_DEC::s_leaf_allocator;
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_PAT_TRIE_NAME() :
-  m_p_head(s_head_allocator.allocate(1)),
-  m_size(0)
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_PAT_TRIE_NAME(const access_traits& r_access_traits) :
-  synth_access_traits(r_access_traits),
-  m_p_head(s_head_allocator.allocate(1)),
-  m_size(0)
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_PAT_TRIE_NAME(const PB_DS_CLASS_C_DEC& other) :
-#ifdef _GLIBCXX_DEBUG
-  debug_base(other),
-#endif
-  synth_access_traits(other),
-  node_update(other),
-  m_p_head(s_head_allocator.allocate(1)),
-  m_size(0)
-{
-  initialize();
-  m_size = other.m_size;
-  PB_DS_ASSERT_VALID(other)
-    if (other.m_p_head->m_p_parent == 0)
-      {
-	PB_DS_ASSERT_VALID((*this))
-	return;
-      }
-  __try
-    {
-      m_p_head->m_p_parent = recursive_copy_node(other.m_p_head->m_p_parent);
-    }
-  __catch(...)
-    {
-      s_head_allocator.deallocate(m_p_head, 1);
-      __throw_exception_again;
-    }
-
-  m_p_head->m_p_min = leftmost_descendant(m_p_head->m_p_parent);
-  m_p_head->m_p_max = rightmost_descendant(m_p_head->m_p_parent);
-  m_p_head->m_p_parent->m_p_parent = m_p_head;
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  value_swap(other);
-  std::swap((access_traits& )(*this), (access_traits& )other);
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-value_swap(PB_DS_CLASS_C_DEC& other)
-{
-  _GLIBCXX_DEBUG_ONLY(debug_base::swap(other);)
-  std::swap(m_p_head, other.m_p_head);
-  std::swap(m_size, other.m_size);
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~PB_DS_PAT_TRIE_NAME()
-{
-  clear();
-  s_head_allocator.deallocate(m_p_head, 1);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-initialize()
-{
-  new (m_p_head) head();
-  m_p_head->m_p_parent = 0;
-  m_p_head->m_p_min = m_p_head;
-  m_p_head->m_p_max = m_p_head;
-  m_size = 0;
-}
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-  while (first_it != last_it)
-    insert(*(first_it++));
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-recursive_copy_node(node_const_pointer p_ncp)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_ncp != 0);
-  if (p_ncp->m_type == leaf_node)
-    {
-      leaf_const_pointer p_other_lf = static_cast<leaf_const_pointer>(p_ncp);
-      leaf_pointer p_new_lf = s_leaf_allocator.allocate(1);
-      cond_dealtor cond(p_new_lf);
-      new (p_new_lf) leaf(p_other_lf->value());
-      apply_update(p_new_lf, (node_update*)this);
-      cond.set_no_action_dtor();
-      return (p_new_lf);
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(p_ncp->m_type == i_node);
-  node_pointer a_p_children[inode::arr_size];
-  size_type child_i = 0;
-  inode_const_pointer p_icp = static_cast<inode_const_pointer>(p_ncp);
-
-  typename inode::const_iterator child_it = p_icp->begin();
-
-  inode_pointer p_ret;
-  __try
-    {
-      while (child_it != p_icp->end())
-	{
-	  a_p_children[child_i] = recursive_copy_node(*(child_it));
-	  child_i++;
-	  child_it++;
-	}
-      p_ret = s_inode_allocator.allocate(1);
-    }
-  __catch(...)
-    {
-      while (child_i-- > 0)
-	clear_imp(a_p_children[child_i]);
-      __throw_exception_again;
-    }
-
-  new (p_ret) inode(p_icp->get_e_ind(), pref_begin(a_p_children[0]));
-
-  --child_i;
-  _GLIBCXX_DEBUG_ASSERT(child_i >= 1);
-  do
-    p_ret->add_child(a_p_children[child_i], pref_begin(a_p_children[child_i]),
-		     pref_end(a_p_children[child_i]), this);
-  while (child_i-- > 0);
-  apply_update(p_ret, (node_update*)this);
-  return p_ret;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
deleted file mode 100644
index 7afded0..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/debug_fn_imps.hpp
- * Contains an implementation class for pat_trie_.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  if (m_p_head->m_p_parent != 0)
-    m_p_head->m_p_parent->assert_valid(this, __file, __line);
-  assert_iterators(__file, __line);
-  assert_reverse_iterators(__file, __line);
-  if (m_p_head->m_p_parent == 0)
-    {
-      PB_DS_DEBUG_VERIFY(m_p_head->m_p_min == m_p_head);
-      PB_DS_DEBUG_VERIFY(m_p_head->m_p_max == m_p_head);
-      PB_DS_DEBUG_VERIFY(empty());
-      return;
-    }
-
-  PB_DS_DEBUG_VERIFY(m_p_head->m_p_min->m_type == leaf_node);
-  PB_DS_DEBUG_VERIFY(m_p_head->m_p_max->m_type == leaf_node);
-  PB_DS_DEBUG_VERIFY(!empty());
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_iterators(const char* __file, int __line) const
-{
-  size_type calc_size = 0;
-  for (const_iterator it = begin(); it != end(); ++it)
-    {
-      ++calc_size;
-      debug_base::check_key_exists(PB_DS_V2F(*it), __file, __line);
-      PB_DS_DEBUG_VERIFY(lower_bound(PB_DS_V2F(*it)) == it);
-      PB_DS_DEBUG_VERIFY(--upper_bound(PB_DS_V2F(*it)) == it);
-    }
-  PB_DS_DEBUG_VERIFY(calc_size == m_size);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_reverse_iterators(const char* __file, int __line) const
-{
-  size_type calc_size = 0;
-  for (const_reverse_iterator it = rbegin(); it != rend(); ++it)
-    {
-      ++calc_size;
-      node_const_pointer p_nd =
-	const_cast<PB_DS_CLASS_C_DEC*>(this)->find_imp(PB_DS_V2F(*it));
-      PB_DS_DEBUG_VERIFY(p_nd == it.m_p_nd);
-    }
-  PB_DS_DEBUG_VERIFY(calc_size == m_size);
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-recursive_count_leafs(node_const_pointer p_nd, const char* __file, int __line)
-{
-  if (p_nd == 0)
-    return (0);
-  if (p_nd->m_type == leaf_node)
-    return (1);
-  PB_DS_DEBUG_VERIFY(p_nd->m_type == i_node);
-  size_type ret = 0;
-  for (typename inode::const_iterator it = static_cast<inode_const_pointer>(p_nd)->begin();
-       it != static_cast<inode_const_pointer>(p_nd)->end();
-       ++it)
-    ret += recursive_count_leafs(*it, __file, __line);
-  return ret;
-}
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
deleted file mode 100644
index 620710e..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,315 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/erase_fn_imps.hpp
- * Contains an implementation class for pat_trie.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-erase(key_const_reference r_key)
-{
-  node_pointer p_nd = find_imp(r_key);
-  if (p_nd == 0 || p_nd->m_type == i_node)
-    {
-      PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-      return false;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_type == leaf_node);
-  if (!synth_access_traits::equal_keys(PB_DS_V2F(reinterpret_cast<leaf_pointer>(p_nd)->value()), r_key))
-    {
-      PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-      return false;
-    }
-
-  PB_DS_CHECK_KEY_EXISTS(r_key)
-  erase_leaf(static_cast<leaf_pointer>(p_nd));
-  PB_DS_ASSERT_VALID((*this))
-  return true;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase_fixup(inode_pointer p_nd)
-{
-  _GLIBCXX_DEBUG_ASSERT(std::distance(p_nd->begin(), p_nd->end()) >= 1);
-  if (std::distance(p_nd->begin(), p_nd->end()) == 1)
-    {
-      node_pointer p_parent = p_nd->m_p_parent;
-      if (p_parent == m_p_head)
-	m_p_head->m_p_parent = *p_nd->begin();
-      else
-	{
-	  _GLIBCXX_DEBUG_ASSERT(p_parent->m_type == i_node);
-	  node_pointer p_new_child = *p_nd->begin();
-
-	  typedef inode_pointer inode_ptr;
-	  inode_ptr p_internal = static_cast<inode_ptr>(p_parent);
-	  p_internal->replace_child(p_new_child, pref_begin(p_new_child),
-				    pref_end(p_new_child), this);
-	}
-      (*p_nd->begin())->m_p_parent = p_nd->m_p_parent;
-      p_nd->~inode();
-      s_inode_allocator.deallocate(p_nd, 1);
-
-      if (p_parent == m_p_head)
-	return;
-
-      _GLIBCXX_DEBUG_ASSERT(p_parent->m_type == i_node);
-      p_nd = static_cast<inode_pointer>(p_parent);
-    }
-
-  while (true)
-    {
-      _GLIBCXX_DEBUG_ASSERT(std::distance(p_nd->begin(), p_nd->end()) > 1);
-      p_nd->update_prefixes(this);
-      apply_update(p_nd, (node_update*)this);
-      PB_DS_ASSERT_NODE_VALID(p_nd)
-      if (p_nd->m_p_parent->m_type == head_node)
-	return;
-
-      _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_parent->m_type == i_node);
-
-      p_nd = static_cast<inode_pointer>(p_nd->m_p_parent);
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-actual_erase_leaf(leaf_pointer p_l)
-{
-  _GLIBCXX_DEBUG_ASSERT(m_size > 0);
-  --m_size;
-  _GLIBCXX_DEBUG_ONLY(debug_base::erase_existing(PB_DS_V2F(p_l->value())));
-  p_l->~leaf();
-  s_leaf_allocator.deallocate(p_l, 1);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  if (!empty())
-    {
-      clear_imp(m_p_head->m_p_parent);
-      m_size = 0;
-      initialize();
-      _GLIBCXX_DEBUG_ONLY(debug_base::clear();)
-      PB_DS_ASSERT_VALID((*this))
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear_imp(node_pointer p_nd)
-{
-  if (p_nd->m_type == i_node)
-    {
-      _GLIBCXX_DEBUG_ASSERT(p_nd->m_type == i_node);
-      for (typename inode::iterator it =
-	     static_cast<inode_pointer>(p_nd)->begin();
-	   it != static_cast<inode_pointer>(p_nd)->end();
-	   ++it)
-	{
-	  node_pointer p_child =* it;
-	  clear_imp(p_child);
-	}
-      s_inode_allocator.deallocate(static_cast<inode_pointer>(p_nd), 1);
-      return;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_type == leaf_node);
-  static_cast<leaf_pointer>(p_nd)->~leaf();
-  s_leaf_allocator.deallocate(static_cast<leaf_pointer>(p_nd), 1);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-erase(const_iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-
-  if (it == end())
-    return it;
-
-  const_iterator ret_it = it;
-  ++ret_it;
-  _GLIBCXX_DEBUG_ASSERT(it.m_p_nd->m_type == leaf_node);
-  erase_leaf(static_cast<leaf_pointer>(it.m_p_nd));
-  PB_DS_ASSERT_VALID((*this))
-  return ret_it;
-}
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-erase(iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-
-  if (it == end())
-    return it;
-  iterator ret_it = it;
-  ++ret_it;
-  _GLIBCXX_DEBUG_ASSERT(it.m_p_nd->m_type == leaf_node);
-  erase_leaf(static_cast<leaf_pointer>(it.m_p_nd));
-  PB_DS_ASSERT_VALID((*this))
-  return ret_it;
-}
-#endif // #ifdef PB_DS_DATA_TRUE_INDICATOR
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reverse_iterator
-PB_DS_CLASS_C_DEC::
-erase(const_reverse_iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-
-  if (it.m_p_nd == m_p_head)
-    return it;
-  const_reverse_iterator ret_it = it;
-  ++ret_it;
-
-  _GLIBCXX_DEBUG_ASSERT(it.m_p_nd->m_type == leaf_node);
-  erase_leaf(static_cast<leaf_pointer>(it.m_p_nd));
-  PB_DS_ASSERT_VALID((*this))
-  return ret_it;
-}
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::reverse_iterator
-PB_DS_CLASS_C_DEC::
-erase(reverse_iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-
-  if (it.m_p_nd == m_p_head)
-    return it;
-  reverse_iterator ret_it = it;
-  ++ret_it;
-
-  _GLIBCXX_DEBUG_ASSERT(it.m_p_nd->m_type == leaf_node);
-  erase_leaf(static_cast<leaf_pointer>(it.m_p_nd));
-  PB_DS_ASSERT_VALID((*this))
-  return ret_it;
-}
-#endif // #ifdef PB_DS_DATA_TRUE_INDICATOR
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  size_type num_ersd = 0;
-  PB_DS_ASSERT_VALID((*this))
-
-  iterator it = begin();
-  while (it != end())
-    {
-      PB_DS_ASSERT_VALID((*this))
-      if (pred(*it))
-	{
-	  ++num_ersd;
-	  it = erase(it);
-	}
-      else
-	++it;
-    }
-
-  PB_DS_ASSERT_VALID((*this))
-  return num_ersd;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase_leaf(leaf_pointer p_l)
-{
-  update_min_max_for_erased_leaf(p_l);
-  if (p_l->m_p_parent->m_type == head_node)
-    {
-      _GLIBCXX_DEBUG_ASSERT(size() == 1);
-      clear();
-      return;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(size() > 1);
-  _GLIBCXX_DEBUG_ASSERT(p_l->m_p_parent->m_type == i_node);
-
-  inode_pointer p_parent = static_cast<inode_pointer>(p_l->m_p_parent);
-
-  p_parent->remove_child(p_l);
-  erase_fixup(p_parent);
-  actual_erase_leaf(p_l);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-update_min_max_for_erased_leaf(leaf_pointer p_l)
-{
-  if (m_size == 1)
-    {
-      m_p_head->m_p_min = m_p_head;
-      m_p_head->m_p_max = m_p_head;
-      return;
-    }
-
-  if (p_l == static_cast<leaf_const_pointer>(m_p_head->m_p_min))
-    {
-      iterator it(p_l);
-      ++it;
-      m_p_head->m_p_min = it.m_p_nd;
-      return;
-    }
-
-  if (p_l == static_cast<leaf_const_pointer>(m_p_head->m_p_max))
-    {
-      iterator it(p_l);
-      --it;
-      m_p_head->m_p_max = it.m_p_nd;
-    }
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
deleted file mode 100644
index a22d30c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
+++ /dev/null
@@ -1,269 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/find_fn_imps.hpp
- * Contains an implementation class for pat_trie.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-find(key_const_reference r_key)
-{
-  PB_DS_ASSERT_VALID((*this))
-  node_pointer p_nd = find_imp(r_key);
-
-  if (p_nd == 0 || p_nd->m_type != leaf_node)
-    {
-      PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-      return end();
-    }
-
-  if (synth_access_traits::equal_keys(PB_DS_V2F(static_cast<leaf_pointer>(p_nd)->value()), r_key))
-    {
-      PB_DS_CHECK_KEY_EXISTS(r_key)
-      return iterator(p_nd);
-    }
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-  return end();
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-find(key_const_reference r_key) const
-{
-  PB_DS_ASSERT_VALID((*this))
-
-  node_const_pointer p_nd = const_cast<PB_DS_CLASS_C_DEC* >(this)->find_imp(r_key);
-
-  if (p_nd == 0 || p_nd->m_type != leaf_node)
-    {
-      PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-      return end();
-    }
-
-  if (synth_access_traits::equal_keys(PB_DS_V2F(static_cast<leaf_const_pointer>(p_nd)->value()), r_key))
-    {
-      PB_DS_CHECK_KEY_EXISTS(r_key)
-      return const_iterator(const_cast<node_pointer>(p_nd));
-    }
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-  return end();
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-find_imp(key_const_reference r_key)
-{
-  if (empty())
-    return 0;
-
-  typename synth_access_traits::const_iterator b_it =
-    synth_access_traits::begin(r_key);
-  typename synth_access_traits::const_iterator e_it =
-    synth_access_traits::end(r_key);
-
-  node_pointer p_nd = m_p_head->m_p_parent;
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-
-  while (p_nd->m_type != leaf_node)
-    {
-      _GLIBCXX_DEBUG_ASSERT(p_nd->m_type == i_node);
-      node_pointer p_next_nd = static_cast<inode_pointer>(p_nd)->get_child_node(b_it,  e_it,  this);
-
-      if (p_next_nd == 0)
-	return p_nd;
-      p_nd = p_next_nd;
-    }
-  return p_nd;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-lower_bound_imp(key_const_reference r_key)
-{
-  if (empty())
-    return (m_p_head);
-
-  node_pointer p_nd = m_p_head->m_p_parent;
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-
-  typename PB_DS_CLASS_C_DEC::a_const_iterator b_it =
-    synth_access_traits::begin(r_key);
-
-  typename PB_DS_CLASS_C_DEC::a_const_iterator e_it =
-    synth_access_traits::end(r_key);
-
-  size_type checked_ind = 0;
-  while (true)
-    {
-      if (p_nd->m_type == leaf_node)
-        {
-	  if (!synth_access_traits::cmp_keys(PB_DS_V2F(static_cast<leaf_const_pointer>(p_nd)->value()), r_key))
-	    return p_nd;
-	  iterator it(p_nd);
-	  ++it;
-	  return it.m_p_nd;
-        }
-
-      _GLIBCXX_DEBUG_ASSERT(p_nd->m_type == i_node);
-      const size_type new_checked_ind =
-	static_cast<inode_pointer>(p_nd)->get_e_ind();
-
-      p_nd =
-	static_cast<inode_pointer>(p_nd)->get_lower_bound_child_node(                b_it, e_it, checked_ind, this);
-      checked_ind = new_checked_ind;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-lower_bound(key_const_reference r_key)
-{ return point_iterator(lower_bound_imp(r_key)); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-lower_bound(key_const_reference r_key) const
-{
-  return point_const_iterator(const_cast<PB_DS_CLASS_C_DEC* >(this)->lower_bound_imp(r_key));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-upper_bound(key_const_reference r_key)
-{
-  point_iterator l_bound_it = lower_bound(r_key);
-
-  _GLIBCXX_DEBUG_ASSERT(l_bound_it == end() ||
-		   !synth_access_traits::cmp_keys(PB_DS_V2F(*l_bound_it),
-						    r_key));
-
-  if (l_bound_it == end() ||
-      synth_access_traits::cmp_keys(r_key, PB_DS_V2F(*l_bound_it)))
-    return l_bound_it;
-
-  return ++l_bound_it;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-upper_bound(key_const_reference r_key) const
-{
-  point_const_iterator l_bound_it = lower_bound(r_key);
-
-  _GLIBCXX_DEBUG_ASSERT(l_bound_it == end() ||
-		   !synth_access_traits::cmp_keys(PB_DS_V2F(*l_bound_it),
-						    r_key));
-
-  if (l_bound_it == end() ||
-      synth_access_traits::cmp_keys(r_key, PB_DS_V2F(*l_bound_it)))
-    return l_bound_it;
-  return ++l_bound_it;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::a_const_iterator
-PB_DS_CLASS_C_DEC::
-pref_begin(node_const_pointer p_nd)
-{
-  if (p_nd->m_type == leaf_node)
-    return (synth_access_traits::begin(PB_DS_V2F(static_cast<leaf_const_pointer>(p_nd)->value())));
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_type == i_node);
-  return static_cast<inode_const_pointer>(p_nd)->pref_b_it();
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::a_const_iterator
-PB_DS_CLASS_C_DEC::
-pref_end(node_const_pointer p_nd)
-{
-  if (p_nd->m_type == leaf_node)
-    return (synth_access_traits::end(PB_DS_V2F(static_cast<leaf_const_pointer>(p_nd)->value())));
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_type == i_node);
-  return static_cast<inode_const_pointer>(p_nd)->pref_e_it();
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::leaf_const_pointer
-PB_DS_CLASS_C_DEC::
-leftmost_descendant(node_const_pointer p_nd)
-{
-  if (p_nd->m_type == leaf_node)
-    return static_cast<leaf_const_pointer>(p_nd);
-  return static_cast<inode_const_pointer>(p_nd)->leftmost_descendant();
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::leaf_pointer
-PB_DS_CLASS_C_DEC::
-leftmost_descendant(node_pointer p_nd)
-{
-  if (p_nd->m_type == leaf_node)
-    return static_cast<leaf_pointer>(p_nd);
-  return static_cast<inode_pointer>(p_nd)->leftmost_descendant();
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::leaf_const_pointer
-PB_DS_CLASS_C_DEC::
-rightmost_descendant(node_const_pointer p_nd)
-{
-  if (p_nd->m_type == leaf_node)
-    return static_cast<leaf_const_pointer>(p_nd);
-  return static_cast<inode_const_pointer>(p_nd)->rightmost_descendant();
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::leaf_pointer
-PB_DS_CLASS_C_DEC::
-rightmost_descendant(node_pointer p_nd)
-{
-  if (p_nd->m_type == leaf_node)
-    return static_cast<leaf_pointer>(p_nd);
-  return static_cast<inode_pointer>(p_nd)->rightmost_descendant();
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
deleted file mode 100644
index 24342ad..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/info_fn_imps.hpp
- * Contains an implementation class for pat_trie.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-empty() const
-{ return (m_size == 0); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-size() const
-{ return m_size; }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-max_size() const
-{ return s_inode_allocator.max_size(); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
deleted file mode 100644
index 56eaf95..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
+++ /dev/null
@@ -1,472 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/insert_join_fn_imps.hpp
- * Contains an implementation class for pat_trie.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-join(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  branch_bag bag;
-  if (!join_prep(other, bag))
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  m_p_head->m_p_parent = rec_join(m_p_head->m_p_parent,
-				  other.m_p_head->m_p_parent, 0, bag);
-
-  m_p_head->m_p_parent->m_p_parent = m_p_head;
-  m_size += other.m_size;
-  other.initialize();
-  PB_DS_ASSERT_VALID(other)
-  m_p_head->m_p_min = leftmost_descendant(m_p_head->m_p_parent);
-  m_p_head->m_p_max = rightmost_descendant(m_p_head->m_p_parent);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-bool
-PB_DS_CLASS_C_DEC::
-join_prep(PB_DS_CLASS_C_DEC& other, branch_bag& r_bag)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  if (other.m_size == 0)
-    return false;
-
-  if (m_size == 0)
-    {
-      value_swap(other);
-      return false;
-    }
-
-  const bool greater =
-    synth_access_traits::cmp_keys(PB_DS_V2F(static_cast<leaf_const_pointer>(m_p_head->m_p_max)->value()),
-				    PB_DS_V2F(static_cast<leaf_const_pointer>(other.m_p_head->m_p_min)->value()));
-
-  const bool lesser =
-    synth_access_traits::cmp_keys(PB_DS_V2F(static_cast<leaf_const_pointer>(other.m_p_head->m_p_max)->value()),
-				    PB_DS_V2F(static_cast<leaf_const_pointer>(m_p_head->m_p_min)->value()));
-
-  if (!greater && !lesser)
-    __throw_join_error();
-
-  rec_join_prep(m_p_head->m_p_parent, other.m_p_head->m_p_parent, r_bag);
-  _GLIBCXX_DEBUG_ONLY(debug_base::join(other, false);)
-  return true;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-rec_join_prep(node_const_pointer p_l, node_const_pointer p_r, 
-	      branch_bag& r_bag)
-{
-  if (p_l->m_type == leaf_node)
-    {
-      if (p_r->m_type == leaf_node)
-	{
-	  rec_join_prep(static_cast<leaf_const_pointer>(p_l),
-			static_cast<leaf_const_pointer>(p_r), r_bag);
-	  return;
-	}
-
-      _GLIBCXX_DEBUG_ASSERT(p_r->m_type == i_node);
-      rec_join_prep(static_cast<leaf_const_pointer>(p_l),
-		    static_cast<inode_const_pointer>(p_r), r_bag);
-      return;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(p_l->m_type == i_node);
-  if (p_r->m_type == leaf_node)
-    {
-      rec_join_prep(static_cast<inode_const_pointer>(p_l),
-		    static_cast<leaf_const_pointer>(p_r), r_bag);
-      return;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(p_r->m_type == i_node);
-
-  rec_join_prep(static_cast<inode_const_pointer>(p_l),
-		static_cast<inode_const_pointer>(p_r), r_bag);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-rec_join_prep(leaf_const_pointer /*p_l*/, leaf_const_pointer /*p_r*/,
-	      branch_bag& r_bag)
-{ r_bag.add_branch(); }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-rec_join_prep(leaf_const_pointer /*p_l*/, inode_const_pointer /*p_r*/,
-	      branch_bag& r_bag)
-{ r_bag.add_branch(); }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-rec_join_prep(inode_const_pointer /*p_l*/, leaf_const_pointer /*p_r*/,
-	      branch_bag& r_bag)
-{ r_bag.add_branch(); }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-rec_join_prep(inode_const_pointer p_l, inode_const_pointer p_r,
-	      branch_bag& r_bag)
-{
-  if (p_l->get_e_ind() == p_r->get_e_ind() &&
-      synth_access_traits::equal_prefixes(p_l->pref_b_it(), p_l->pref_e_it(),
-					    p_r->pref_b_it(), p_r->pref_e_it()))
-    {
-      for (typename inode::const_iterator it = p_r->begin();
-	   it != p_r->end(); ++ it)
-	{
-	  node_const_pointer p_l_join_child = p_l->get_join_child(*it, this);
-	  if (p_l_join_child != 0)
-	    rec_join_prep(p_l_join_child, * it, r_bag);
-	}
-      return;
-    }
-
-  if (p_r->get_e_ind() < p_l->get_e_ind() &&
-      p_r->should_be_mine(p_l->pref_b_it(), p_l->pref_e_it(), 0, this))
-    {
-      node_const_pointer p_r_join_child = p_r->get_join_child(p_l, this);
-      if (p_r_join_child != 0)
-	rec_join_prep(p_r_join_child, p_l, r_bag);
-      return;
-    }
-
-  if (p_r->get_e_ind() < p_l->get_e_ind() &&
-      p_r->should_be_mine(p_l->pref_b_it(), p_l->pref_e_it(), 0, this))
-    {
-      node_const_pointer p_r_join_child = p_r->get_join_child(p_l, this);
-      if (p_r_join_child != 0)
-	rec_join_prep(p_r_join_child, p_l, r_bag);
-      return;
-    }
-  r_bag.add_branch();
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-rec_join(node_pointer p_l, node_pointer p_r, size_type checked_ind, 
-	 branch_bag& r_bag)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_r != 0);
-  if (p_l == 0)
-    {
-      apply_update(p_r, (node_update*)this);
-      return (p_r);
-    }
-
-  if (p_l->m_type == leaf_node)
-    {
-      if (p_r->m_type == leaf_node)
-	{
-	  node_pointer p_ret = rec_join(static_cast<leaf_pointer>(p_l),
-					static_cast<leaf_pointer>(p_r), r_bag);
-	  apply_update(p_ret, (node_update*)this);
-	  return p_ret;
-	}
-
-      _GLIBCXX_DEBUG_ASSERT(p_r->m_type == i_node);
-      node_pointer p_ret = rec_join(static_cast<leaf_pointer>(p_l),
-				    static_cast<inode_pointer>(p_r),
-				    checked_ind, r_bag);
-      apply_update(p_ret, (node_update*)this);
-      return p_ret;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(p_l->m_type == i_node);
-  if (p_r->m_type == leaf_node)
-    {
-      node_pointer p_ret = rec_join(static_cast<inode_pointer>(p_l),
-				    static_cast<leaf_pointer>(p_r),
-				    checked_ind, r_bag);
-      apply_update(p_ret, (node_update*)this);
-      return p_ret;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(p_r->m_type == i_node);
-  node_pointer p_ret = rec_join(static_cast<inode_pointer>(p_l),
-				static_cast<inode_pointer>(p_r),
-				r_bag);
-
-  apply_update(p_ret, (node_update*)this);
-  return p_ret;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-rec_join(leaf_pointer p_l, leaf_pointer p_r, branch_bag& r_bag)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_r != 0);
-  if (p_l == 0)
-    return (p_r);
-  node_pointer p_ret = insert_branch(p_l, p_r, r_bag);
-  _GLIBCXX_DEBUG_ASSERT(PB_DS_RECURSIVE_COUNT_LEAFS(p_ret) == 2);
-  return p_ret;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-rec_join(leaf_pointer p_l, inode_pointer p_r, size_type checked_ind,
-	 branch_bag& r_bag)
-{
-#ifdef _GLIBCXX_DEBUG
-  const size_type lhs_leafs = PB_DS_RECURSIVE_COUNT_LEAFS(p_l);
-  const size_type rhs_leafs = PB_DS_RECURSIVE_COUNT_LEAFS(p_r);
-#endif
-
-  _GLIBCXX_DEBUG_ASSERT(p_r != 0);
-  node_pointer p_ret = rec_join(p_r, p_l, checked_ind, r_bag);
-  _GLIBCXX_DEBUG_ASSERT(PB_DS_RECURSIVE_COUNT_LEAFS(p_ret) == lhs_leafs + rhs_leafs);
-  return p_ret;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-rec_join(inode_pointer p_l, leaf_pointer p_r, size_type checked_ind, branch_bag& r_bag)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_l != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_r != 0);
-
-#ifdef _GLIBCXX_DEBUG
-  const size_type lhs_leafs = PB_DS_RECURSIVE_COUNT_LEAFS(p_l);
-  const size_type rhs_leafs = PB_DS_RECURSIVE_COUNT_LEAFS(p_r);
-#endif
-
-  if (!p_l->should_be_mine(pref_begin(p_r), pref_end(p_r), checked_ind, this))
-    {
-      node_pointer p_ret = insert_branch(p_l, p_r, r_bag);
-      PB_DS_ASSERT_NODE_VALID(p_ret)
-      _GLIBCXX_DEBUG_ASSERT(PB_DS_RECURSIVE_COUNT_LEAFS(p_ret) ==
-       			    lhs_leafs + rhs_leafs);
-      return p_ret;
-    }
-
-  node_pointer p_pot_child = p_l->add_child(p_r, pref_begin(p_r),
-					    pref_end(p_r), this);
-  if (p_pot_child != p_r)
-    {
-      node_pointer p_new_child = rec_join(p_pot_child, p_r, p_l->get_e_ind(),
-					  r_bag);
-
-      p_l->replace_child(p_new_child, pref_begin(p_new_child),
-			 pref_end(p_new_child), this);
-    }
-
-  PB_DS_ASSERT_NODE_VALID(p_l)
-  _GLIBCXX_DEBUG_ASSERT(PB_DS_RECURSIVE_COUNT_LEAFS(p_l) == lhs_leafs + rhs_leafs);
-  return p_l;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-rec_join(inode_pointer p_l, inode_pointer p_r, 
-	 branch_bag& r_bag)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_l != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_r != 0);
-
-#ifdef _GLIBCXX_DEBUG
-  const size_type lhs_leafs = PB_DS_RECURSIVE_COUNT_LEAFS(p_l);
-  const size_type rhs_leafs = PB_DS_RECURSIVE_COUNT_LEAFS(p_r);
-#endif
-
-  if (p_l->get_e_ind() == p_r->get_e_ind() &&
-      synth_access_traits::equal_prefixes(p_l->pref_b_it(), p_l->pref_e_it(),
-					    p_r->pref_b_it(), p_r->pref_e_it()))
-    {
-      for (typename inode::iterator it = p_r->begin();
-	   it != p_r->end(); ++ it)
-	{
-	  node_pointer p_new_child = rec_join(p_l->get_join_child(*it, this),
-					      * it, 0, r_bag);
-	  p_l->replace_child(p_new_child, pref_begin(p_new_child),
-			     pref_end(p_new_child), this);
-	}
-
-      p_r->~inode();
-      s_inode_allocator.deallocate(p_r, 1);
-      PB_DS_ASSERT_NODE_VALID(p_l)
-      _GLIBCXX_DEBUG_ASSERT(PB_DS_RECURSIVE_COUNT_LEAFS(p_l) == lhs_leafs + rhs_leafs);
-      return p_l;
-    }
-
-  if (p_l->get_e_ind() < p_r->get_e_ind() &&
-      p_l->should_be_mine(p_r->pref_b_it(), p_r->pref_e_it(), 0, this))
-    {
-      node_pointer p_new_child = rec_join(p_l->get_join_child(p_r, this),
-					  p_r, 0, r_bag);
-      p_l->replace_child(p_new_child, pref_begin(p_new_child),
-			 pref_end(p_new_child), this);
-      PB_DS_ASSERT_NODE_VALID(p_l)
-      return p_l;
-    }
-
-  if (p_r->get_e_ind() < p_l->get_e_ind() &&
-      p_r->should_be_mine(p_l->pref_b_it(), p_l->pref_e_it(), 0, this))
-    {
-      node_pointer p_new_child = rec_join(p_r->get_join_child(p_l, this), p_l,
-					  0, r_bag);
-
-      p_r->replace_child(p_new_child, pref_begin(p_new_child),
-			 pref_end(p_new_child), this);
-
-      PB_DS_ASSERT_NODE_VALID(p_r)
-      _GLIBCXX_DEBUG_ASSERT(PB_DS_RECURSIVE_COUNT_LEAFS(p_r) == lhs_leafs + rhs_leafs);
-      return p_r;
-    }
-
-  node_pointer p_ret = insert_branch(p_l, p_r, r_bag);
-  PB_DS_ASSERT_NODE_VALID(p_ret)
-  _GLIBCXX_DEBUG_ASSERT(PB_DS_RECURSIVE_COUNT_LEAFS(p_ret) == lhs_leafs + rhs_leafs);
-  return p_ret;
-}
-
-PB_DS_CLASS_T_DEC
-inline std::pair<typename PB_DS_CLASS_C_DEC::iterator, bool>
-PB_DS_CLASS_C_DEC::
-insert(const_reference r_val)
-{
-  node_pointer p_lf = find_imp(PB_DS_V2F(r_val));
-  if (p_lf != 0 && p_lf->m_type == leaf_node &&
-      synth_access_traits::equal_keys(PB_DS_V2F(static_cast<leaf_pointer>(p_lf)->value()), PB_DS_V2F(r_val)))
-    {
-      PB_DS_CHECK_KEY_EXISTS(PB_DS_V2F(r_val))
-      PB_DS_ASSERT_VALID((*this))
-      return std::make_pair(iterator(p_lf), false);
-    }
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(PB_DS_V2F(r_val))
-
-  leaf_pointer p_new_lf = s_leaf_allocator.allocate(1);
-  cond_dealtor cond(p_new_lf);
-
-  new (p_new_lf) leaf(r_val);
-  apply_update(p_new_lf, (node_update*)this);
-  cond.set_call_destructor();
-  branch_bag bag;
-  bag.add_branch();
-  m_p_head->m_p_parent = rec_join(m_p_head->m_p_parent, p_new_lf, 0, bag);
-  m_p_head->m_p_parent->m_p_parent = m_p_head;
-  cond.set_no_action_dtor();
-  ++m_size;
-  update_min_max_for_inserted_leaf(p_new_lf);
-  _GLIBCXX_DEBUG_ONLY(debug_base::insert_new(PB_DS_V2F(r_val));)
-  PB_DS_ASSERT_VALID((*this))
-  return std::make_pair(point_iterator(p_new_lf), true);
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-keys_diff_ind(typename access_traits::const_iterator b_l,
-	      typename access_traits::const_iterator e_l,
-	      typename access_traits::const_iterator b_r,
-	      typename access_traits::const_iterator e_r)
-{
-  size_type diff_pos = 0;
-  while (b_l != e_l)
-    {
-      if (b_r == e_r)
-	return (diff_pos);
-      if (access_traits::e_pos(*b_l) != access_traits::e_pos(*b_r))
-	return (diff_pos);
-      ++b_l;
-      ++b_r;
-      ++diff_pos;
-    }
-  _GLIBCXX_DEBUG_ASSERT(b_r != e_r);
-  return diff_pos;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::inode_pointer
-PB_DS_CLASS_C_DEC::
-insert_branch(node_pointer p_l, node_pointer p_r, branch_bag& r_bag)
-{
-  typename synth_access_traits::const_iterator left_b_it = pref_begin(p_l);
-  typename synth_access_traits::const_iterator left_e_it = pref_end(p_l);
-  typename synth_access_traits::const_iterator right_b_it = pref_begin(p_r);
-  typename synth_access_traits::const_iterator right_e_it = pref_end(p_r);
-
-  const size_type diff_ind = keys_diff_ind(left_b_it, left_e_it,
-					   right_b_it, right_e_it);
-
-  inode_pointer p_new_nd = r_bag.get_branch();
-  new (p_new_nd) inode(diff_ind, left_b_it);
-  p_new_nd->add_child(p_l, left_b_it, left_e_it, this);
-  p_new_nd->add_child(p_r, right_b_it, right_e_it, this);
-  p_l->m_p_parent = p_new_nd;
-  p_r->m_p_parent = p_new_nd;
-  PB_DS_ASSERT_NODE_VALID(p_new_nd)
-  return (p_new_nd);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-update_min_max_for_inserted_leaf(leaf_pointer p_new_lf)
-{
-  if (m_p_head->m_p_min == m_p_head ||
-      synth_access_traits::cmp_keys(PB_DS_V2F(p_new_lf->value()),
-				      PB_DS_V2F(static_cast<leaf_const_pointer>(m_p_head->m_p_min)->value())))
-    m_p_head->m_p_min = p_new_lf;
-
-  if (m_p_head->m_p_max == m_p_head ||
-      synth_access_traits::cmp_keys(PB_DS_V2F(static_cast<leaf_const_pointer>(m_p_head->m_p_max)->value()), PB_DS_V2F(p_new_lf->value())))
-    m_p_head->m_p_max = p_new_lf;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
deleted file mode 100644
index 8e5f09d..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
+++ /dev/null
@@ -1,120 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/iterators_fn_imps.hpp
- * Contains an implementation class for pat_trie.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-begin()
-{ return iterator(m_p_head->m_p_min); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-begin() const
-{ return const_iterator(m_p_head->m_p_min); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-end()
-{ return iterator(m_p_head); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-end() const
-{ return const_iterator(m_p_head); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reverse_iterator
-PB_DS_CLASS_C_DEC::
-rbegin() const
-{
-  if (empty())
-    return rend();
-  return --end();
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::reverse_iterator
-PB_DS_CLASS_C_DEC::
-rbegin()
-{
-  if (empty())
-    return rend();
-  return --end();
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::reverse_iterator
-PB_DS_CLASS_C_DEC::
-rend()
-{ return reverse_iterator(m_p_head); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reverse_iterator
-PB_DS_CLASS_C_DEC::
-rend() const
-{ return const_reverse_iterator(m_p_head); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_const_iterator
-PB_DS_CLASS_C_DEC::
-node_begin() const
-{ return node_const_iterator(m_p_head->m_p_parent, this); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_iterator
-PB_DS_CLASS_C_DEC::
-node_begin()
-{ return node_iterator(m_p_head->m_p_parent, this); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_const_iterator
-PB_DS_CLASS_C_DEC::
-node_end() const
-{ return node_const_iterator(0, this); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_iterator
-PB_DS_CLASS_C_DEC::
-node_end()
-{ return node_iterator(0, this); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
deleted file mode 100644
index e8671a9..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
+++ /dev/null
@@ -1,596 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/pat_trie_.hpp
- * Contains an implementation class for a patricia tree.
- */
-
-#include <iterator>
-#include <utility>
-#include <algorithm>
-#include <functional>
-#include <assert.h>
-#include <list>
-#include <ext/pb_ds/exception.hpp>
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <ext/pb_ds/tree_policy.hpp>
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/types_traits.hpp>
-#include <ext/pb_ds/detail/eq_fn/eq_by_less.hpp>
-#include <ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp>
-#include <ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp>
-#ifdef _GLIBCXX_DEBUG
-#include <ext/pb_ds/detail/debug_map_base.hpp>
-#endif
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-#define PB_DS_PAT_TRIE_NAME pat_trie_map
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-#define PB_DS_PAT_TRIE_NAME pat_trie_set
-#endif
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Mapped, typename Node_And_It_Traits, \
-	     typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    PB_DS_PAT_TRIE_NAME<Key, Mapped, Node_And_It_Traits, _Alloc>
-
-#define PB_DS_PAT_TRIE_TRAITS_BASE \
-    types_traits<Key, Mapped, _Alloc, false>
-
-#ifdef _GLIBCXX_DEBUG
-#define PB_DS_DEBUG_MAP_BASE_C_DEC \
-    debug_map_base<Key,	eq_by_less<Key, std::less<Key> >, \
-		 typename _Alloc::template rebind<Key>::other::const_reference>
-#endif
-
-
-    /**
-     *  @brief PATRICIA trie.
-     *  @ingroup branch-detail
-     *
-     *  This implementation loosely borrows ideas from:
-     *  1) Fast Mergeable Integer Maps, Okasaki, Gill 1998
-     *  2) Ptset: Sets of integers implemented as Patricia trees,
-     *     Jean-Christophe Filliatr, 2000
-     */
-    template<typename Key, typename Mapped, typename Node_And_It_Traits,
-	     typename _Alloc>
-    class PB_DS_PAT_TRIE_NAME :
-#ifdef _GLIBCXX_DEBUG
-      public PB_DS_DEBUG_MAP_BASE_C_DEC,
-#endif
-      public Node_And_It_Traits::synth_access_traits,
-      public Node_And_It_Traits::node_update,
-      public PB_DS_PAT_TRIE_TRAITS_BASE,
-      public pat_trie_base
-    {
-    private:
-      typedef pat_trie_base				base_type;
-      typedef PB_DS_PAT_TRIE_TRAITS_BASE 	       	traits_base;
-      typedef Node_And_It_Traits			traits_type;
-
-      typedef typename traits_type::synth_access_traits synth_access_traits;
-      typedef typename synth_access_traits::const_iterator a_const_iterator;
-
-      typedef typename traits_type::node 		node;
-      typedef typename _Alloc::template rebind<node>	__rebind_n;
-      typedef typename __rebind_n::other::const_pointer node_const_pointer;
-      typedef typename __rebind_n::other::pointer 	node_pointer;
-
-      typedef typename traits_type::head 		head;
-      typedef typename _Alloc::template rebind<head>	__rebind_h;
-      typedef typename __rebind_h::other 		head_allocator;
-      typedef typename head_allocator::pointer 		head_pointer;
-
-      typedef typename traits_type::leaf 		leaf;
-      typedef typename _Alloc::template rebind<leaf>	__rebind_l;
-      typedef typename __rebind_l::other 		leaf_allocator;
-      typedef typename leaf_allocator::pointer 		leaf_pointer;
-      typedef typename leaf_allocator::const_pointer 	leaf_const_pointer;
-
-      typedef typename traits_type::inode 		inode;
-      typedef typename inode::iterator 			inode_iterator;
-      typedef typename _Alloc::template rebind<inode> 	__rebind_in;
-      typedef typename __rebind_in::other 		__rebind_ina;
-      typedef typename __rebind_in::other      	       	inode_allocator;
-      typedef typename __rebind_ina::pointer 		inode_pointer;
-      typedef typename __rebind_ina::const_pointer 	inode_const_pointer;
-
-
-      /// Conditional deallocator.
-      class cond_dealtor
-      {
-      protected:
-	leaf_pointer 		m_p_nd;
-	bool 			m_no_action_dtor;
-	bool 			m_call_destructor;
-
-      public:
-	cond_dealtor(leaf_pointer p_nd)
-	: m_p_nd(p_nd), m_no_action_dtor(false), m_call_destructor(false)
-	{ }
-
-	void
-	set_no_action_dtor()
-	{ m_no_action_dtor = true; }
-
-	void
-	set_call_destructor()
-	{ m_call_destructor = true; }
-
-	~cond_dealtor()
-	{
-	  if (m_no_action_dtor)
-	    return;
-
-	  if (m_call_destructor)
-	    m_p_nd->~leaf();
-
-	  s_leaf_allocator.deallocate(m_p_nd, 1);
-	}
-      };
-
-
-      /// Branch bag, for split-join.
-      class branch_bag
-      {
-      private:
-	typedef inode_pointer 			       	__inp;
-	typedef typename _Alloc::template rebind<__inp>::other 	__rebind_inp;
-
-#ifdef _GLIBCXX_DEBUG
-	typedef std::_GLIBCXX_STD_C::list<__inp, __rebind_inp> 	bag_type;
-#else
-	typedef std::list<__inp, __rebind_inp> 			bag_type;
-#endif
-
-	bag_type 						m_bag;
-      public:
-	void
-	add_branch()
-	{
-	  inode_pointer p_nd = s_inode_allocator.allocate(1);
-	  __try
-	    {
-	      m_bag.push_back(p_nd);
-	    }
-	  __catch(...)
-	    {
-	      s_inode_allocator.deallocate(p_nd, 1);
-	      __throw_exception_again;
-	    }
-	}
-
-	inode_pointer
-	get_branch()
-	{
-	  _GLIBCXX_DEBUG_ASSERT(!m_bag.empty());
-	  inode_pointer p_nd = *m_bag.begin();
-	  m_bag.pop_front();
-	  return p_nd;
-	}
-
-	~branch_bag()
-	{
-	  while (!m_bag.empty())
-	    {
-	      inode_pointer p_nd = *m_bag.begin();
-	      s_inode_allocator.deallocate(p_nd, 1);
-	      m_bag.pop_front();
-	    }
-	}
-
-	inline bool
-	empty() const
-	{ return m_bag.empty(); }
-      };
-
-#ifdef _GLIBCXX_DEBUG
-      typedef PB_DS_DEBUG_MAP_BASE_C_DEC 		debug_base;
-#endif
-
-      typedef typename traits_type::null_node_update_pointer null_node_update_pointer;
-
-    public:
-      typedef pat_trie_tag 				container_category;
-      typedef _Alloc 					allocator_type;
-      typedef typename _Alloc::size_type 		size_type;
-      typedef typename _Alloc::difference_type 		difference_type;
-
-      typedef typename traits_base::key_type 		key_type;
-      typedef typename traits_base::key_pointer 	key_pointer;
-      typedef typename traits_base::key_const_pointer 	key_const_pointer;
-      typedef typename traits_base::key_reference 	key_reference;
-      typedef typename traits_base::key_const_reference key_const_reference;
-      typedef typename traits_base::mapped_type 	mapped_type;
-      typedef typename traits_base::mapped_pointer 	mapped_pointer;
-      typedef typename traits_base::mapped_const_pointer mapped_const_pointer;
-      typedef typename traits_base::mapped_reference 	mapped_reference;
-      typedef typename traits_base::mapped_const_reference mapped_const_reference;
-      typedef typename traits_base::value_type 		value_type;
-      typedef typename traits_base::pointer 		pointer;
-      typedef typename traits_base::const_pointer 	const_pointer;
-      typedef typename traits_base::reference 		reference;
-      typedef typename traits_base::const_reference 	const_reference;
-
-      typedef typename traits_type::access_traits 	access_traits;
-      typedef typename traits_type::const_iterator 	point_const_iterator;
-      typedef typename traits_type::iterator 		point_iterator;
-      typedef point_const_iterator 			const_iterator;
-      typedef point_iterator 				iterator;
-
-      typedef typename traits_type::reverse_iterator 	reverse_iterator;
-      typedef typename traits_type::const_reverse_iterator const_reverse_iterator;
-      typedef typename traits_type::node_const_iterator node_const_iterator;
-      typedef typename traits_type::node_iterator 	node_iterator;
-      typedef typename traits_type::node_update 	node_update;
-
-      PB_DS_PAT_TRIE_NAME();
-
-      PB_DS_PAT_TRIE_NAME(const access_traits&);
-
-      PB_DS_PAT_TRIE_NAME(const PB_DS_CLASS_C_DEC&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      ~PB_DS_PAT_TRIE_NAME();
-
-      inline bool
-      empty() const;
-
-      inline size_type
-      size() const;
-
-      inline size_type
-      max_size() const;
-
-      access_traits&
-      get_access_traits();
-
-      const access_traits&
-      get_access_traits() const;
-
-      node_update&
-      get_node_update();
-
-      const node_update&
-      get_node_update() const;
-
-      inline std::pair<point_iterator, bool>
-      insert(const_reference);
-
-      inline mapped_reference
-      operator[](key_const_reference r_key)
-      {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-	return insert(std::make_pair(r_key, mapped_type())).first->second;
-#else
-	insert(r_key);
-	return traits_base::s_null_type;
-#endif
-      }
-
-      inline point_iterator
-      find(key_const_reference);
-
-      inline point_const_iterator
-      find(key_const_reference) const;
-
-      inline point_iterator
-      lower_bound(key_const_reference);
-
-      inline point_const_iterator
-      lower_bound(key_const_reference) const;
-
-      inline point_iterator
-      upper_bound(key_const_reference);
-
-      inline point_const_iterator
-      upper_bound(key_const_reference) const;
-
-      void
-      clear();
-
-      inline bool
-      erase(key_const_reference);
-
-      inline const_iterator
-      erase(const_iterator);
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      inline iterator
-      erase(iterator);
-#endif
-
-      inline const_reverse_iterator
-      erase(const_reverse_iterator);
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-      inline reverse_iterator
-      erase(reverse_iterator);
-#endif
-
-      template<typename Pred>
-      inline size_type
-      erase_if(Pred);
-
-      void
-      join(PB_DS_CLASS_C_DEC&);
-
-      void
-      split(key_const_reference, PB_DS_CLASS_C_DEC&);
-
-      inline iterator
-      begin();
-
-      inline const_iterator
-      begin() const;
-
-      inline iterator
-      end();
-
-      inline const_iterator
-      end() const;
-
-      inline reverse_iterator
-      rbegin();
-
-      inline const_reverse_iterator
-      rbegin() const;
-
-      inline reverse_iterator
-      rend();
-
-      inline const_reverse_iterator
-      rend() const;
-
-      /// Returns a const node_iterator corresponding to the node at the
-      /// root of the tree.
-      inline node_const_iterator
-      node_begin() const;
-
-      /// Returns a node_iterator corresponding to the node at the
-      /// root of the tree.
-      inline node_iterator
-      node_begin();
-
-      /// Returns a const node_iterator corresponding to a node just
-      /// after a leaf of the tree.
-      inline node_const_iterator
-      node_end() const;
-
-      /// Returns a node_iterator corresponding to a node just
-      /// after a leaf of the tree.
-      inline node_iterator
-      node_end();
-
-#ifdef PB_DS_PAT_TRIE_TRACE_
-      void
-      trace() const;
-#endif
-
-    protected:
-      template<typename It>
-      void
-      copy_from_range(It, It);
-
-      void
-      value_swap(PB_DS_CLASS_C_DEC&);
-
-      node_pointer
-      recursive_copy_node(node_const_pointer);
-
-    private:
-      void
-      initialize();
-
-      inline void
-      apply_update(node_pointer, null_node_update_pointer);
-
-      template<typename Node_Update_>
-      inline void
-      apply_update(node_pointer, Node_Update_*);
-
-      bool
-      join_prep(PB_DS_CLASS_C_DEC&, branch_bag&);
-
-      void
-      rec_join_prep(node_const_pointer, node_const_pointer, branch_bag&);
-
-      void
-      rec_join_prep(leaf_const_pointer, leaf_const_pointer, branch_bag&);
-
-      void
-      rec_join_prep(leaf_const_pointer, inode_const_pointer, branch_bag&);
-
-      void
-      rec_join_prep(inode_const_pointer, leaf_const_pointer, branch_bag&);
-
-      void
-      rec_join_prep(inode_const_pointer, inode_const_pointer, branch_bag&);
-
-      node_pointer
-      rec_join(node_pointer, node_pointer, size_type, branch_bag&);
-
-      node_pointer
-      rec_join(leaf_pointer, leaf_pointer, branch_bag&);
-
-      node_pointer
-      rec_join(leaf_pointer, inode_pointer, size_type, branch_bag&);
-
-      node_pointer
-      rec_join(inode_pointer, leaf_pointer, size_type, branch_bag&);
-
-      node_pointer
-      rec_join(inode_pointer, inode_pointer, branch_bag&);
-
-      size_type
-      keys_diff_ind(typename access_traits::const_iterator,
-		    typename access_traits::const_iterator,
-		    typename access_traits::const_iterator,
-		    typename access_traits::const_iterator);
-
-      inode_pointer
-      insert_branch(node_pointer, node_pointer, branch_bag&);
-
-      void
-      update_min_max_for_inserted_leaf(leaf_pointer);
-
-      void
-      erase_leaf(leaf_pointer);
-
-      inline void
-      actual_erase_leaf(leaf_pointer);
-
-      void
-      clear_imp(node_pointer);
-
-      void
-      erase_fixup(inode_pointer);
-
-      void
-      update_min_max_for_erased_leaf(leaf_pointer);
-
-      static inline a_const_iterator
-      pref_begin(node_const_pointer);
-
-      static inline a_const_iterator
-      pref_end(node_const_pointer);
-
-      inline node_pointer
-      find_imp(key_const_reference);
-
-      inline node_pointer
-      lower_bound_imp(key_const_reference);
-
-      inline node_pointer
-      upper_bound_imp(key_const_reference);
-
-      inline static leaf_const_pointer
-      leftmost_descendant(node_const_pointer);
-
-      inline static leaf_pointer
-      leftmost_descendant(node_pointer);
-
-      inline static leaf_const_pointer
-      rightmost_descendant(node_const_pointer);
-
-      inline static leaf_pointer
-      rightmost_descendant(node_pointer);
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-
-      void
-      assert_iterators(const char*, int) const;
-
-      void
-      assert_reverse_iterators(const char*, int) const;
-
-      static size_type
-      recursive_count_leafs(node_const_pointer, const char*, int);
-#endif
-
-#ifdef PB_DS_PAT_TRIE_TRACE_
-      static void
-      trace_node(node_const_pointer, size_type);
-
-      template<typename Metadata_>
-      static void
-      trace_node_metadata(node_const_pointer, type_to_type<Metadata_>);
-
-      static void
-      trace_node_metadata(node_const_pointer, type_to_type<null_type>);
-#endif
-
-      leaf_pointer
-      split_prep(key_const_reference, PB_DS_CLASS_C_DEC&, branch_bag&);
-
-      node_pointer
-      rec_split(node_pointer, a_const_iterator, a_const_iterator,
-		PB_DS_CLASS_C_DEC&, branch_bag&);
-
-      void
-      split_insert_branch(size_type, a_const_iterator, inode_iterator,
-			  size_type, branch_bag&);
-
-      static head_allocator 		s_head_allocator;
-      static inode_allocator 		s_inode_allocator;
-      static leaf_allocator 		s_leaf_allocator;
-
-      head_pointer 			m_p_head;
-      size_type 			m_size;
-    };
-
-#define PB_DS_ASSERT_NODE_VALID(X) \
-  _GLIBCXX_DEBUG_ONLY(X->assert_valid(this, __FILE__, __LINE__);)
-
-#define PB_DS_RECURSIVE_COUNT_LEAFS(X) \
-  recursive_count_leafs(X, __FILE__, __LINE__)
-
-#include <ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp>
-#include <ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp>
-#include <ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp>
-#include <ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp>
-#include <ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp>
-#include <ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp>
-#include <ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp>
-#include <ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp>
-
-#undef PB_DS_RECURSIVE_COUNT_LEAFS
-#undef PB_DS_ASSERT_NODE_VALID
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_PAT_TRIE_NAME
-#undef PB_DS_PAT_TRIE_TRAITS_BASE
-#undef PB_DS_DEBUG_MAP_BASE_C_DEC
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp
deleted file mode 100644
index a67ea34..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp
+++ /dev/null
@@ -1,1361 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/pat_trie_base.hpp
- * Contains the base class for a patricia tree.
- */
-
-#ifndef PB_DS_PAT_TRIE_BASE
-#define PB_DS_PAT_TRIE_BASE
-
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Base type for PATRICIA trees.
-    struct pat_trie_base
-    {
-      /**
-       *  @brief  Three types of nodes.
-       *
-       *  i_node is used by _Inode, leaf_node by _Leaf, and head_node by _Head.
-       */
-      enum node_type
-	{
-	  i_node,
-	  leaf_node,
-	  head_node
-	};
-
-      /// Metadata base primary template.
-      template<typename Metadata, typename _Alloc>
-	struct _Metadata
-	{
-	  typedef Metadata     					metadata_type;
-	  typedef _Alloc     					allocator_type;
-	  typedef typename _Alloc::template rebind<Metadata>	__rebind_m;
-	  typedef typename __rebind_m::other::const_reference  const_reference;
-
-	  const_reference
-	  get_metadata() const
-	  { return m_metadata; }
-
-	  metadata_type 					m_metadata;
-	};
-
-      /// Specialization for null metadata.
-      template<typename _Alloc>
-	struct _Metadata<null_type, _Alloc>
-	{
-	  typedef null_type 					metadata_type;
-	  typedef _Alloc     					allocator_type;
-	};
-
-
-      /// Node base.
-      template<typename _ATraits, typename Metadata>
-      struct _Node_base
-      : public Metadata
-      {
-      private:
-	typedef typename Metadata::allocator_type		_Alloc;
-
-      public:
-	typedef _Alloc						allocator_type;
-	typedef _ATraits					access_traits;
-	typedef typename _ATraits::type_traits			type_traits;
-	typedef typename _Alloc::template rebind<_Node_base>	__rebind_n;
-	typedef typename __rebind_n::other::pointer 		node_pointer;
-
-	node_pointer 						m_p_parent;
-	const node_type 	       				m_type;
-
-	_Node_base(node_type type) : m_type(type)
-	{ }
-
-	typedef typename _Alloc::template rebind<_ATraits>    __rebind_at;
-	typedef typename __rebind_at::other::const_pointer    a_const_pointer;
-	typedef typename _ATraits::const_iterator	      a_const_iterator;
-
-#ifdef _GLIBCXX_DEBUG
-	typedef std::pair<a_const_iterator, a_const_iterator> node_debug_info;
-
-	void
-	assert_valid(a_const_pointer p_traits,
-		     const char* __file, int __line) const
-	{ assert_valid_imp(p_traits, __file, __line); }
-
-	virtual node_debug_info
-	assert_valid_imp(a_const_pointer, const char*, int) const = 0;
-#endif
-      };
-
-
-    /// Head node for PATRICIA tree.
-    template<typename _ATraits, typename Metadata>
-    struct _Head
-    : public _Node_base<_ATraits, Metadata>
-    {
-      typedef _Node_base<_ATraits, Metadata> 			base_type;
-      typedef typename base_type::type_traits			type_traits;
-      typedef typename base_type::node_pointer			node_pointer;
-
-      node_pointer						m_p_min;
-      node_pointer						m_p_max;
-
-      _Head() : base_type(head_node) { }
-
-#ifdef _GLIBCXX_DEBUG
-      typedef typename base_type::node_debug_info      	       node_debug_info;
-      typedef typename base_type::a_const_pointer 	       a_const_pointer;
-
-      virtual node_debug_info
-      assert_valid_imp(a_const_pointer, const char* __file, int __line) const
-      {
-	_GLIBCXX_DEBUG_VERIFY_AT(false,
-				 _M_message("Assertion from %1;:%2;")
-				 ._M_string(__FILE__)._M_integer(__LINE__),
-				 __file, __line);
-	return node_debug_info();
-      }
-#endif
-    };
-
-
-    /// Leaf node for PATRICIA tree.
-    template<typename _ATraits, typename Metadata>
-    struct _Leaf
-    : public _Node_base<_ATraits, Metadata>
-    {
-      typedef _Node_base<_ATraits, Metadata> 	   	    	base_type;
-      typedef typename base_type::type_traits			type_traits;
-      typedef typename type_traits::value_type			value_type;
-      typedef typename type_traits::reference			reference;
-      typedef typename type_traits::const_reference    		const_reference;
-
-    private:
-      value_type						m_value;
-
-      _Leaf(const _Leaf&);
-
-    public:
-      _Leaf(const_reference other)
-      : base_type(leaf_node), m_value(other) { }
-
-      reference
-      value()
-      { return m_value; }
-
-      const_reference
-      value() const
-      { return m_value; }
-
-#ifdef _GLIBCXX_DEBUG
-      typedef typename base_type::node_debug_info      		node_debug_info;
-      typedef typename base_type::a_const_pointer      		a_const_pointer;
-
-      virtual node_debug_info
-      assert_valid_imp(a_const_pointer p_traits,
-		       const char* __file, int __line) const
-      {
-	PB_DS_DEBUG_VERIFY(base_type::m_type == leaf_node);
-	node_debug_info ret;
-	const_reference r_val = value();
-	return std::make_pair(p_traits->begin(p_traits->extract_key(r_val)),
-			      p_traits->end(p_traits->extract_key(r_val)));
-      }
-
-      virtual
-      ~_Leaf() { }
-#endif
-    };
-
-
-    /// Internal node type, PATRICIA tree.
-    template<typename _ATraits, typename Metadata>
-    struct _Inode
-    : public _Node_base<_ATraits, Metadata>
-    {
-      typedef _Node_base<_ATraits, Metadata> 			base_type;
-      typedef typename base_type::type_traits			type_traits;
-      typedef typename base_type::access_traits	       		access_traits;
-      typedef typename type_traits::value_type 			value_type;
-      typedef typename base_type::allocator_type		_Alloc;
-      typedef _Alloc						allocator_type;
-      typedef typename _Alloc::size_type 			size_type;
-
-    private:
-      typedef typename base_type::a_const_pointer      	       a_const_pointer;
-      typedef typename base_type::a_const_iterator     	      a_const_iterator;
-
-      typedef typename base_type::node_pointer			node_pointer;
-      typedef typename _Alloc::template rebind<base_type>	__rebind_n;
-      typedef typename __rebind_n::other::const_pointer      node_const_pointer;
-
-      typedef _Leaf<_ATraits, Metadata>	 			leaf;
-      typedef typename _Alloc::template rebind<leaf>::other 	__rebind_l;
-      typedef typename __rebind_l::pointer 			leaf_pointer;
-      typedef typename __rebind_l::const_pointer 	    leaf_const_pointer;
-
-      typedef typename _Alloc::template rebind<_Inode>::other 	__rebind_in;
-      typedef typename __rebind_in::pointer 			inode_pointer;
-      typedef typename __rebind_in::const_pointer 	    inode_const_pointer;
-
-      inline size_type
-      get_pref_pos(a_const_iterator, a_const_iterator, a_const_pointer) const;
-
-    public:
-      typedef typename _Alloc::template rebind<node_pointer>::other __rebind_np;
-      typedef typename __rebind_np::pointer 		node_pointer_pointer;
-      typedef typename __rebind_np::reference 		node_pointer_reference;
-
-      enum
-	{
-	  arr_size = _ATraits::max_size + 1
-	};
-      PB_DS_STATIC_ASSERT(min_arr_size, arr_size >= 2);
-
-
-      /// Constant child iterator.
-      struct const_iterator
-      {
-	node_pointer_pointer 				m_p_p_cur;
-	node_pointer_pointer 				m_p_p_end;
-
-	typedef std::forward_iterator_tag 		iterator_category;
-	typedef typename _Alloc::difference_type 	difference_type;
-	typedef node_pointer 				value_type;
-	typedef node_pointer_pointer 			pointer;
-	typedef node_pointer_reference 			reference;
-
-	const_iterator(node_pointer_pointer p_p_cur = 0,
-		       node_pointer_pointer p_p_end = 0)
-	: m_p_p_cur(p_p_cur), m_p_p_end(p_p_end)
-	{ }
-
-	bool
-	operator==(const const_iterator& other) const
-	{ return m_p_p_cur == other.m_p_p_cur; }
-
-	bool
-	operator!=(const const_iterator& other) const
-	{ return m_p_p_cur != other.m_p_p_cur; }
-
-	const_iterator&
-	operator++()
-	{
-	  do
-	    ++m_p_p_cur;
-	  while (m_p_p_cur != m_p_p_end && *m_p_p_cur == 0);
-	  return *this;
-	}
-
-	const_iterator
-	operator++(int)
-	{
-	  const_iterator ret_it(*this);
-	  operator++();
-	  return ret_it;
-	}
-
-	const node_pointer_pointer
-	operator->() const
-	{
-	  _GLIBCXX_DEBUG_ONLY(assert_referencible();)
-	  return m_p_p_cur;
-	}
-
-	node_const_pointer
-	operator*() const
-	{
-	  _GLIBCXX_DEBUG_ONLY(assert_referencible();)
-	  return *m_p_p_cur;
-	}
-
-      protected:
-#ifdef _GLIBCXX_DEBUG
-	void
-	assert_referencible() const
-	{ _GLIBCXX_DEBUG_ASSERT(m_p_p_cur != m_p_p_end && *m_p_p_cur != 0); }
-#endif
-      };
-
-
-      /// Child iterator.
-      struct iterator : public const_iterator
-      {
-      public:
-	typedef std::forward_iterator_tag 		iterator_category;
-	typedef typename _Alloc::difference_type 	difference_type;
-	typedef node_pointer 				value_type;
-	typedef node_pointer_pointer 			pointer;
-	typedef node_pointer_reference 			reference;
-
-	inline
-	iterator(node_pointer_pointer p_p_cur = 0,
-		 node_pointer_pointer p_p_end = 0)
-	: const_iterator(p_p_cur, p_p_end) { }
-
-	bool
-	operator==(const iterator& other) const
-	{ return const_iterator::m_p_p_cur == other.m_p_p_cur; }
-
-	bool
-	operator!=(const iterator& other) const
-	{ return const_iterator::m_p_p_cur != other.m_p_p_cur; }
-
-	iterator&
-	operator++()
-	{
-	  const_iterator::operator++();
-	  return *this;
-	}
-
-	iterator
-	operator++(int)
-	{
-	  iterator ret_it(*this);
-	  operator++();
-	  return ret_it;
-	}
-
-	node_pointer_pointer
-	operator->()
-	{
-	  _GLIBCXX_DEBUG_ONLY(const_iterator::assert_referencible();)
-	  return const_iterator::m_p_p_cur;
-	}
-
-	node_pointer
-	operator*()
-	{
-	  _GLIBCXX_DEBUG_ONLY(const_iterator::assert_referencible();)
-	  return *const_iterator::m_p_p_cur;
-	}
-      };
-
-
-      _Inode(size_type, const a_const_iterator);
-
-      void
-      update_prefixes(a_const_pointer);
-
-      const_iterator
-      begin() const;
-
-      iterator
-      begin();
-
-      const_iterator
-      end() const;
-
-      iterator
-      end();
-
-      inline node_pointer
-      get_child_node(a_const_iterator, a_const_iterator, a_const_pointer);
-
-      inline node_const_pointer
-      get_child_node(a_const_iterator, a_const_iterator, a_const_pointer) const;
-
-      inline iterator
-      get_child_it(a_const_iterator, a_const_iterator, a_const_pointer);
-
-      inline node_pointer
-      get_lower_bound_child_node(a_const_iterator, a_const_iterator,
-				 size_type, a_const_pointer);
-
-      inline node_pointer
-      add_child(node_pointer, a_const_iterator, a_const_iterator,
-		a_const_pointer);
-
-      inline node_const_pointer
-      get_join_child(node_const_pointer, a_const_pointer) const;
-
-      inline node_pointer
-      get_join_child(node_pointer, a_const_pointer);
-
-      void
-      remove_child(node_pointer);
-
-      void
-      remove_child(iterator);
-
-      void
-      replace_child(node_pointer, a_const_iterator, a_const_iterator,
-		    a_const_pointer);
-
-      inline a_const_iterator
-      pref_b_it() const;
-
-      inline a_const_iterator
-      pref_e_it() const;
-
-      bool
-      should_be_mine(a_const_iterator, a_const_iterator, size_type,
-		     a_const_pointer) const;
-
-      leaf_pointer
-      leftmost_descendant();
-
-      leaf_const_pointer
-      leftmost_descendant() const;
-
-      leaf_pointer
-      rightmost_descendant();
-
-      leaf_const_pointer
-      rightmost_descendant() const;
-
-#ifdef _GLIBCXX_DEBUG
-      typedef typename base_type::node_debug_info 	       node_debug_info;
-
-      virtual node_debug_info
-      assert_valid_imp(a_const_pointer, const char*, int) const;
-#endif
-
-      size_type
-      get_e_ind() const
-      { return m_e_ind; }
-
-    private:
-      _Inode(const _Inode&);
-
-      size_type
-      get_begin_pos() const;
-
-      static __rebind_l			s_leaf_alloc;
-      static __rebind_in 		s_inode_alloc;
-
-      const size_type 			m_e_ind;
-      a_const_iterator 			m_pref_b_it;
-      a_const_iterator 			m_pref_e_it;
-      node_pointer 			m_a_p_children[arr_size];
-    };
-
-#define PB_DS_CONST_IT_C_DEC \
-    _CIter<Node, Leaf, Head, Inode, Is_Forward_Iterator>
-
-#define PB_DS_CONST_ODIR_IT_C_DEC \
-    _CIter<Node, Leaf, Head, Inode, !Is_Forward_Iterator>
-
-#define PB_DS_IT_C_DEC \
-    _Iter<Node, Leaf, Head, Inode, Is_Forward_Iterator>
-
-#define PB_DS_ODIR_IT_C_DEC \
-    _Iter<Node, Leaf, Head, Inode, !Is_Forward_Iterator>
-
-
-    /// Const iterator.
-    template<typename Node, typename Leaf, typename Head, typename Inode,
-	     bool Is_Forward_Iterator>
-    class _CIter
-    {
-    public:
-      // These types are all the same for the first four template arguments.
-      typedef typename Node::allocator_type		allocator_type;
-      typedef typename Node::type_traits		type_traits;
-
-      typedef std::bidirectional_iterator_tag 		iterator_category;
-      typedef typename allocator_type::difference_type	difference_type;
-      typedef typename type_traits::value_type		value_type;
-      typedef typename type_traits::pointer 		pointer;
-      typedef typename type_traits::reference 		reference;
-      typedef typename type_traits::const_pointer 	const_pointer;
-      typedef typename type_traits::const_reference 	const_reference;
-
-      typedef allocator_type				_Alloc;
-      typedef typename _Alloc::template rebind<Node>	__rebind_n;
-      typedef typename __rebind_n::other::pointer	node_pointer;
-      typedef typename _Alloc::template rebind<Leaf>	__rebind_l;
-      typedef typename __rebind_l::other::pointer	leaf_pointer;
-      typedef typename __rebind_l::other::const_pointer	leaf_const_pointer;
-      typedef typename _Alloc::template rebind<Head>	__rebind_h;
-      typedef typename __rebind_h::other::pointer	head_pointer;
-
-      typedef typename _Alloc::template rebind<Inode> __rebind_in;
-      typedef typename __rebind_in::other::pointer 	inode_pointer;
-      typedef typename Inode::iterator			inode_iterator;
-
-      node_pointer 					m_p_nd;
-
-      _CIter(node_pointer p_nd = 0) : m_p_nd(p_nd)
-      { }
-
-      _CIter(const PB_DS_CONST_ODIR_IT_C_DEC& other)
-      : m_p_nd(other.m_p_nd)
-      { }
-
-      _CIter&
-      operator=(const _CIter& other)
-      {
-	m_p_nd = other.m_p_nd;
-	return *this;
-      }
-
-      _CIter&
-      operator=(const PB_DS_CONST_ODIR_IT_C_DEC& other)
-      {
-	m_p_nd = other.m_p_nd;
-	return *this;
-      }
-
-      const_pointer
-      operator->() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd->m_type == leaf_node);
-	return &static_cast<leaf_pointer>(m_p_nd)->value();
-      }
-
-      const_reference
-      operator*() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd->m_type == leaf_node);
-	return static_cast<leaf_pointer>(m_p_nd)->value();
-      }
-
-      bool
-      operator==(const _CIter& other) const
-      { return m_p_nd == other.m_p_nd; }
-
-      bool
-      operator==(const PB_DS_CONST_ODIR_IT_C_DEC& other) const
-      { return m_p_nd == other.m_p_nd; }
-
-      bool
-      operator!=(const _CIter& other) const
-      { return m_p_nd != other.m_p_nd; }
-
-      bool
-      operator!=(const PB_DS_CONST_ODIR_IT_C_DEC& other) const
-      { return m_p_nd != other.m_p_nd; }
-
-      _CIter&
-      operator++()
-      {
-	inc(integral_constant<int, Is_Forward_Iterator>());
-	return *this;
-      }
-
-      _CIter
-      operator++(int)
-      {
-	_CIter ret_it(m_p_nd);
-	operator++();
-	return ret_it;
-      }
-
-      _CIter&
-      operator--()
-      {
-	dec(integral_constant<int, Is_Forward_Iterator>());
-	return *this;
-      }
-
-      _CIter
-      operator--(int)
-      {
-	_CIter ret_it(m_p_nd);
-	operator--();
-	return ret_it;
-      }
-
-    protected:
-      void
-      inc(false_type)
-      { dec(true_type()); }
-
-      void
-      inc(true_type)
-      {
-	if (m_p_nd->m_type == head_node)
-	  {
-	    m_p_nd = static_cast<head_pointer>(m_p_nd)->m_p_min;
-	    return;
-	  }
-
-	node_pointer p_y = m_p_nd->m_p_parent;
-	while (p_y->m_type != head_node && get_larger_sibling(m_p_nd) == 0)
-	  {
-	    m_p_nd = p_y;
-	    p_y = p_y->m_p_parent;
-	  }
-
-	if (p_y->m_type == head_node)
-	  {
-	    m_p_nd = p_y;
-	    return;
-	  }
-	m_p_nd = leftmost_descendant(get_larger_sibling(m_p_nd));
-      }
-
-      void
-      dec(false_type)
-      { inc(true_type()); }
-
-      void
-      dec(true_type)
-      {
-	if (m_p_nd->m_type == head_node)
-	  {
-	    m_p_nd = static_cast<head_pointer>(m_p_nd)->m_p_max;
-	    return;
-	  }
-
-	node_pointer p_y = m_p_nd->m_p_parent;
-	while (p_y->m_type != head_node && get_smaller_sibling(m_p_nd) == 0)
-	  {
-	    m_p_nd = p_y;
-	    p_y = p_y->m_p_parent;
-	  }
-
-	if (p_y->m_type == head_node)
-	  {
-	    m_p_nd = p_y;
-	    return;
-	  }
-	m_p_nd = rightmost_descendant(get_smaller_sibling(m_p_nd));
-      }
-
-      static node_pointer
-      get_larger_sibling(node_pointer p_nd)
-      {
-	inode_pointer p_parent = static_cast<inode_pointer>(p_nd->m_p_parent);
-
-	inode_iterator it = p_parent->begin();
-	while (*it != p_nd)
-	  ++it;
-
-	inode_iterator next_it = it;
-	++next_it;
-	return (next_it == p_parent->end())? 0 : *next_it;
-      }
-
-      static node_pointer
-      get_smaller_sibling(node_pointer p_nd)
-      {
-	inode_pointer p_parent = static_cast<inode_pointer>(p_nd->m_p_parent);
-
-	inode_iterator it = p_parent->begin();
-	if (*it == p_nd)
-	  return 0;
-
-	inode_iterator prev_it;
-	do
-	  {
-	    prev_it = it;
-	    ++it;
-	    if (*it == p_nd)
-	      return *prev_it;
-	  }
-	while (true);
-
-	_GLIBCXX_DEBUG_ASSERT(false);
-	return 0;
-      }
-
-      static leaf_pointer
-      leftmost_descendant(node_pointer p_nd)
-      {
-	if (p_nd->m_type == leaf_node)
-	  return static_cast<leaf_pointer>(p_nd);
-	return static_cast<inode_pointer>(p_nd)->leftmost_descendant();
-      }
-
-      static leaf_pointer
-      rightmost_descendant(node_pointer p_nd)
-      {
-	if (p_nd->m_type == leaf_node)
-	  return static_cast<leaf_pointer>(p_nd);
-	return static_cast<inode_pointer>(p_nd)->rightmost_descendant();
-      }
-    };
-
-
-    /// Iterator.
-    template<typename Node, typename Leaf, typename Head, typename Inode,
-	     bool Is_Forward_Iterator>
-    class _Iter
-    : public _CIter<Node, Leaf, Head, Inode, Is_Forward_Iterator>
-    {
-    public:
-      typedef _CIter<Node, Leaf, Head, Inode, Is_Forward_Iterator>
-      							base_type;
-      typedef typename base_type::allocator_type	allocator_type;
-      typedef typename base_type::type_traits		type_traits;
-      typedef typename type_traits::value_type		value_type;
-      typedef typename type_traits::pointer 		pointer;
-      typedef typename type_traits::reference 		reference;
-
-      typedef typename base_type::node_pointer		node_pointer;
-      typedef typename base_type::leaf_pointer		leaf_pointer;
-      typedef typename base_type::leaf_const_pointer	leaf_const_pointer;
-      typedef typename base_type::head_pointer		head_pointer;
-      typedef typename base_type::inode_pointer 	inode_pointer;
-
-      _Iter(node_pointer p_nd = 0)
-      : base_type(p_nd) { }
-
-      _Iter(const PB_DS_ODIR_IT_C_DEC& other)
-      : base_type(other.m_p_nd) { }
-
-      _Iter&
-      operator=(const _Iter& other)
-      {
-	base_type::m_p_nd = other.m_p_nd;
-	return *this;
-      }
-
-      _Iter&
-      operator=(const PB_DS_ODIR_IT_C_DEC& other)
-      {
-	base_type::m_p_nd = other.m_p_nd;
-	return *this;
-      }
-
-      pointer
-      operator->() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(base_type::m_p_nd->m_type == leaf_node);
-	return &static_cast<leaf_pointer>(base_type::m_p_nd)->value();
-      }
-
-      reference
-      operator*() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(base_type::m_p_nd->m_type == leaf_node);
-	return static_cast<leaf_pointer>(base_type::m_p_nd)->value();
-      }
-
-      _Iter&
-      operator++()
-      {
-	base_type::operator++();
-	return *this;
-      }
-
-      _Iter
-      operator++(int)
-      {
-	_Iter ret(base_type::m_p_nd);
-	operator++();
-	return ret;
-      }
-
-      _Iter&
-      operator--()
-      {
-	base_type::operator--();
-	return *this;
-      }
-
-      _Iter
-      operator--(int)
-      {
-	_Iter ret(base_type::m_p_nd);
-	operator--();
-	return ret;
-      }
-    };
-
-#undef PB_DS_CONST_ODIR_IT_C_DEC
-#undef PB_DS_ODIR_IT_C_DEC
-
-
-#define PB_DS_PAT_TRIE_NODE_CONST_ITERATOR_C_DEC \
-    _Node_citer<Node, Leaf, Head, Inode, _CIterator, Iterator, _ATraits, _Alloc>
-
-#define PB_DS_PAT_TRIE_NODE_ITERATOR_C_DEC \
-    _Node_iter<Node, Leaf, Head, Inode, _CIterator, Iterator, _ATraits, _Alloc>
-
-    /// Node const iterator.
-    template<typename Node,
-	     typename Leaf,
-	     typename Head,
-	     typename Inode,
-	     typename _CIterator,
-	     typename Iterator,
-	     typename _Alloc>
-    class _Node_citer
-    {
-    protected:
-      typedef typename _Alloc::template rebind<Node>	__rebind_n;
-      typedef typename __rebind_n::other::pointer	node_pointer;
-
-      typedef typename _Alloc::template rebind<Leaf>	__rebind_l;
-      typedef typename __rebind_l::other::pointer	leaf_pointer;
-      typedef typename __rebind_l::other::const_pointer	leaf_const_pointer;
-
-      typedef typename _Alloc::template rebind<Inode> 	__rebind_in;
-      typedef typename __rebind_in::other::pointer 	inode_pointer;
-      typedef typename __rebind_in::other::const_pointer inode_const_pointer;
-
-      typedef typename Node::a_const_pointer		a_const_pointer;
-      typedef typename Node::a_const_iterator		a_const_iterator;
-
-    private:
-      a_const_iterator
-      pref_begin() const
-      {
-	if (m_p_nd->m_type == leaf_node)
-	  {
-	    leaf_const_pointer lcp = static_cast<leaf_const_pointer>(m_p_nd);
-	    return m_p_traits->begin(m_p_traits->extract_key(lcp->value()));
-	  }
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd->m_type == i_node);
-	return static_cast<inode_const_pointer>(m_p_nd)->pref_b_it();
-      }
-
-      a_const_iterator
-      pref_end() const
-      {
-	if (m_p_nd->m_type == leaf_node)
-	  {
-	    leaf_const_pointer lcp = static_cast<leaf_const_pointer>(m_p_nd);
-	    return m_p_traits->end(m_p_traits->extract_key(lcp->value()));
-	  }
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd->m_type == i_node);
-	return static_cast<inode_const_pointer>(m_p_nd)->pref_e_it();
-      }
-
-    public:
-      typedef trivial_iterator_tag 			iterator_category;
-      typedef trivial_iterator_difference_type 		difference_type;
-      typedef typename _Alloc::size_type 		size_type;
-
-      typedef _CIterator 		       		value_type;
-      typedef value_type 				reference;
-      typedef value_type 				const_reference;
-
-      /// Metadata type.
-      typedef typename Node::metadata_type 		metadata_type;
-
-      /// Const metadata reference type.
-      typedef typename _Alloc::template rebind<metadata_type> __rebind_m;
-      typedef typename __rebind_m::other 		__rebind_ma;
-      typedef typename __rebind_ma::const_reference    metadata_const_reference;
-
-      inline
-      _Node_citer(node_pointer p_nd = 0, a_const_pointer p_traits = 0)
-      : m_p_nd(const_cast<node_pointer>(p_nd)), m_p_traits(p_traits)
-      { }
-
-      /// Subtree valid prefix.
-      std::pair<a_const_iterator, a_const_iterator>
-      valid_prefix() const
-      { return std::make_pair(pref_begin(), pref_end()); }
-
-      /// Const access; returns the __const iterator* associated with
-      /// the current leaf.
-      const_reference
-      operator*() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(num_children() == 0);
-	return _CIterator(m_p_nd);
-      }
-
-      /// Metadata access.
-      metadata_const_reference
-      get_metadata() const
-      { return m_p_nd->get_metadata(); }
-
-      /// Returns the number of children in the corresponding node.
-      size_type
-      num_children() const
-      {
-	if (m_p_nd->m_type == leaf_node)
-	  return 0;
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd->m_type == i_node);
-	inode_pointer inp = static_cast<inode_pointer>(m_p_nd);
-	return std::distance(inp->begin(), inp->end());
-      }
-
-      /// Returns a __const node __iterator to the corresponding node's
-      /// i-th child.
-      _Node_citer
-      get_child(size_type i) const
-      {
-	_GLIBCXX_DEBUG_ASSERT(m_p_nd->m_type == i_node);
-	inode_pointer inp = static_cast<inode_pointer>(m_p_nd);
-	typename Inode::iterator it = inp->begin();
-	std::advance(it, i);
-	return _Node_citer(*it, m_p_traits);
-      }
-
-      /// Compares content to a different iterator object.
-      bool
-      operator==(const _Node_citer& other) const
-      { return m_p_nd == other.m_p_nd; }
-
-      /// Compares content (negatively) to a different iterator object.
-      bool
-      operator!=(const _Node_citer& other) const
-      { return m_p_nd != other.m_p_nd; }
-
-      node_pointer 			m_p_nd;
-      a_const_pointer 			m_p_traits;
-    };
-
-
-    /// Node iterator.
-    template<typename Node,
-	     typename Leaf,
-	     typename Head,
-	     typename Inode,
-	     typename _CIterator,
-	     typename Iterator,
-	     typename _Alloc>
-    class _Node_iter
-    : public _Node_citer<Node, Leaf, Head, Inode, _CIterator, Iterator, _Alloc>
-    {
-    private:
-      typedef _Node_citer<Node, Leaf, Head, Inode,
-			  _CIterator, Iterator, _Alloc>	base_type;
-      typedef typename _Alloc::template rebind<Node>	__rebind_n;
-      typedef typename __rebind_n::other::pointer	node_pointer;
-      typedef typename base_type::inode_pointer 	inode_pointer;
-      typedef typename base_type::a_const_pointer 	a_const_pointer;
-      typedef Iterator 					iterator;
-
-    public:
-      typedef typename base_type::size_type 		size_type;
-
-      typedef Iterator 					value_type;
-      typedef value_type 				reference;
-      typedef value_type 				const_reference;
-
-      _Node_iter(node_pointer p_nd = 0, a_const_pointer p_traits = 0)
-      : base_type(p_nd, p_traits)
-      { }
-
-      /// Access; returns the iterator*  associated with the current leaf.
-      reference
-      operator*() const
-      {
-	_GLIBCXX_DEBUG_ASSERT(base_type::num_children() == 0);
-	return iterator(base_type::m_p_nd);
-      }
-
-      /// Returns a node __iterator to the corresponding node's i-th child.
-      _Node_iter
-      get_child(size_type i) const
-      {
-	_GLIBCXX_DEBUG_ASSERT(base_type::m_p_nd->m_type == i_node);
-
-	typename Inode::iterator it =
-	  static_cast<inode_pointer>(base_type::m_p_nd)->begin();
-
-	std::advance(it, i);
-	return _Node_iter(*it, base_type::m_p_traits);
-      }
-    };
-    };
-
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename _ATraits, typename Metadata>
-
-#define PB_DS_CLASS_C_DEC \
-    pat_trie_base::_Inode<_ATraits, Metadata>
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::__rebind_l
-    PB_DS_CLASS_C_DEC::s_leaf_alloc;
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::__rebind_in
-    PB_DS_CLASS_C_DEC::s_inode_alloc;
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::size_type
-    PB_DS_CLASS_C_DEC::
-    get_pref_pos(a_const_iterator b_it, a_const_iterator e_it,
-		 a_const_pointer p_traits) const
-    {
-      if (static_cast<std::size_t>(std::distance(b_it, e_it)) <= m_e_ind)
-	return 0;
-      std::advance(b_it, m_e_ind);
-      return 1 + p_traits->e_pos(*b_it);
-    }
-
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    _Inode(size_type len, const a_const_iterator it)
-    : base_type(i_node), m_e_ind(len), m_pref_b_it(it), m_pref_e_it(it)
-    {
-      std::advance(m_pref_e_it, m_e_ind);
-      std::fill(m_a_p_children, m_a_p_children + arr_size,
-		static_cast<node_pointer>(0));
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    update_prefixes(a_const_pointer p_traits)
-    {
-      node_pointer p_first = *begin();
-      if (p_first->m_type == leaf_node)
-	{
-	  leaf_const_pointer p = static_cast<leaf_const_pointer>(p_first);
-	  m_pref_b_it = p_traits->begin(access_traits::extract_key(p->value()));
-	}
-      else
-	{
-	  inode_pointer p = static_cast<inode_pointer>(p_first);
-	  _GLIBCXX_DEBUG_ASSERT(p_first->m_type == i_node);
-	  m_pref_b_it = p->pref_b_it();
-	}
-      m_pref_e_it = m_pref_b_it;
-      std::advance(m_pref_e_it, m_e_ind);
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::const_iterator
-    PB_DS_CLASS_C_DEC::
-    begin() const
-    {
-      typedef node_pointer_pointer pointer_type;
-      pointer_type p = const_cast<pointer_type>(m_a_p_children);
-      return const_iterator(p + get_begin_pos(), p + arr_size);
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::iterator
-    PB_DS_CLASS_C_DEC::
-    begin()
-    {
-      return iterator(m_a_p_children + get_begin_pos(),
-		      m_a_p_children + arr_size);
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::const_iterator
-    PB_DS_CLASS_C_DEC::
-    end() const
-    {
-      typedef node_pointer_pointer pointer_type;
-      pointer_type p = const_cast<pointer_type>(m_a_p_children) + arr_size;
-      return const_iterator(p, p);
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::iterator
-    PB_DS_CLASS_C_DEC::
-    end()
-    { return iterator(m_a_p_children + arr_size, m_a_p_children + arr_size); }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::node_pointer
-    PB_DS_CLASS_C_DEC::
-    get_child_node(a_const_iterator b_it, a_const_iterator e_it,
-		   a_const_pointer p_traits)
-    {
-      const size_type i = get_pref_pos(b_it, e_it, p_traits);
-      _GLIBCXX_DEBUG_ASSERT(i < arr_size);
-      return m_a_p_children[i];
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::iterator
-    PB_DS_CLASS_C_DEC::
-    get_child_it(a_const_iterator b_it, a_const_iterator e_it,
-		 a_const_pointer p_traits)
-    {
-      const size_type i = get_pref_pos(b_it, e_it, p_traits);
-      _GLIBCXX_DEBUG_ASSERT(i < arr_size);
-      _GLIBCXX_DEBUG_ASSERT(m_a_p_children[i] != 0);
-      return iterator(m_a_p_children + i, m_a_p_children + i);
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::node_const_pointer
-    PB_DS_CLASS_C_DEC::
-    get_child_node(a_const_iterator b_it, a_const_iterator e_it,
-		   a_const_pointer p_traits) const
-    { return const_cast<node_pointer>(get_child_node(b_it, e_it, p_traits)); }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::node_pointer
-    PB_DS_CLASS_C_DEC::
-    get_lower_bound_child_node(a_const_iterator b_it, a_const_iterator e_it,
-			       size_type checked_ind,
-			       a_const_pointer p_traits)
-    {
-      if (!should_be_mine(b_it, e_it, checked_ind, p_traits))
-	{
-	  if (p_traits->cmp_prefixes(b_it, e_it, m_pref_b_it,
-				     m_pref_e_it, true))
-	    return leftmost_descendant();
-	  return rightmost_descendant();
-	}
-
-      size_type i = get_pref_pos(b_it, e_it, p_traits);
-      _GLIBCXX_DEBUG_ASSERT(i < arr_size);
-
-      if (m_a_p_children[i] != 0)
-	return m_a_p_children[i];
-
-      while (++i < arr_size)
-	if (m_a_p_children[i] != 0)
-	  {
-	    const node_type& __nt = m_a_p_children[i]->m_type;
-	    node_pointer ret = m_a_p_children[i];
-
-	    if (__nt == leaf_node)
-	      return ret;
-
-	    _GLIBCXX_DEBUG_ASSERT(__nt == i_node);
-	    inode_pointer inp = static_cast<inode_pointer>(ret);
-	    return inp->leftmost_descendant();
-	  }
-
-      return rightmost_descendant();
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::node_pointer
-    PB_DS_CLASS_C_DEC::
-    add_child(node_pointer p_nd, a_const_iterator b_it, a_const_iterator e_it,
-	      a_const_pointer p_traits)
-    {
-      const size_type i = get_pref_pos(b_it, e_it, p_traits);
-      _GLIBCXX_DEBUG_ASSERT(i < arr_size);
-      if (m_a_p_children[i] == 0)
-	{
-	  m_a_p_children[i] = p_nd;
-	  p_nd->m_p_parent = this;
-	  return p_nd;
-	}
-      return m_a_p_children[i];
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::node_const_pointer
-    PB_DS_CLASS_C_DEC::
-    get_join_child(node_const_pointer p_nd,
-		   a_const_pointer p_tr) const
-    {
-      node_pointer p = const_cast<node_pointer>(p_nd);
-      return const_cast<inode_pointer>(this)->get_join_child(p, p_tr);
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::node_pointer
-    PB_DS_CLASS_C_DEC::
-    get_join_child(node_pointer p_nd, a_const_pointer p_traits)
-    {
-      size_type i;
-      a_const_iterator b_it;
-      a_const_iterator e_it;
-      if (p_nd->m_type == leaf_node)
-	{
-	  leaf_const_pointer p = static_cast<leaf_const_pointer>(p_nd);
-
-	  typedef typename type_traits::key_const_reference kcr;
-	  kcr r_key = access_traits::extract_key(p->value());
-	  b_it = p_traits->begin(r_key);
-	  e_it = p_traits->end(r_key);
-	}
-      else
-	{
-	  b_it = static_cast<inode_pointer>(p_nd)->pref_b_it();
-	  e_it = static_cast<inode_pointer>(p_nd)->pref_e_it();
-	}
-      i = get_pref_pos(b_it, e_it, p_traits);
-      _GLIBCXX_DEBUG_ASSERT(i < arr_size);
-      return m_a_p_children[i];
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    remove_child(node_pointer p_nd)
-    {
-      size_type i = 0;
-      for (; i < arr_size; ++i)
-	if (m_a_p_children[i] == p_nd)
-	  {
-	    m_a_p_children[i] = 0;
-	    return;
-	  }
-      _GLIBCXX_DEBUG_ASSERT(i != arr_size);
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    remove_child(iterator it)
-    { *it.m_p_p_cur = 0; }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    replace_child(node_pointer p_nd, a_const_iterator b_it,
-		  a_const_iterator e_it,
-		  a_const_pointer p_traits)
-    {
-      const size_type i = get_pref_pos(b_it, e_it, p_traits);
-      _GLIBCXX_DEBUG_ASSERT(i < arr_size);
-      m_a_p_children[i] = p_nd;
-      p_nd->m_p_parent = this;
-    }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::a_const_iterator
-    PB_DS_CLASS_C_DEC::
-    pref_b_it() const
-    { return m_pref_b_it; }
-
-    PB_DS_CLASS_T_DEC
-    inline typename PB_DS_CLASS_C_DEC::a_const_iterator
-    PB_DS_CLASS_C_DEC::
-    pref_e_it() const
-    { return m_pref_e_it; }
-
-    PB_DS_CLASS_T_DEC
-    bool
-    PB_DS_CLASS_C_DEC::
-    should_be_mine(a_const_iterator b_it, a_const_iterator e_it,
-		   size_type checked_ind,
-		   a_const_pointer p_traits) const
-    {
-      if (m_e_ind == 0)
-	return true;
-
-      const size_type num_es = std::distance(b_it, e_it);
-      if (num_es < m_e_ind)
-	return false;
-
-      a_const_iterator key_b_it = b_it;
-      std::advance(key_b_it, checked_ind);
-      a_const_iterator key_e_it = b_it;
-      std::advance(key_e_it, m_e_ind);
-
-      a_const_iterator value_b_it = m_pref_b_it;
-      std::advance(value_b_it, checked_ind);
-      a_const_iterator value_e_it = m_pref_b_it;
-      std::advance(value_e_it, m_e_ind);
-
-      return p_traits->equal_prefixes(key_b_it, key_e_it, value_b_it,
-				      value_e_it);
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::leaf_pointer
-    PB_DS_CLASS_C_DEC::
-    leftmost_descendant()
-    {
-      node_pointer p_pot = *begin();
-      if (p_pot->m_type == leaf_node)
-	return (static_cast<leaf_pointer>(p_pot));
-      _GLIBCXX_DEBUG_ASSERT(p_pot->m_type == i_node);
-      return static_cast<inode_pointer>(p_pot)->leftmost_descendant();
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::leaf_const_pointer
-    PB_DS_CLASS_C_DEC::
-    leftmost_descendant() const
-    { return const_cast<inode_pointer>(this)->leftmost_descendant(); }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::leaf_pointer
-    PB_DS_CLASS_C_DEC::
-    rightmost_descendant()
-    {
-      const size_type num_children = std::distance(begin(), end());
-      _GLIBCXX_DEBUG_ASSERT(num_children >= 2);
-
-      iterator it = begin();
-      std::advance(it, num_children - 1);
-      node_pointer p_pot =* it;
-      if (p_pot->m_type == leaf_node)
-	return static_cast<leaf_pointer>(p_pot);
-      _GLIBCXX_DEBUG_ASSERT(p_pot->m_type == i_node);
-      return static_cast<inode_pointer>(p_pot)->rightmost_descendant();
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::leaf_const_pointer
-    PB_DS_CLASS_C_DEC::
-    rightmost_descendant() const
-    { return const_cast<inode_pointer>(this)->rightmost_descendant(); }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::size_type
-    PB_DS_CLASS_C_DEC::
-    get_begin_pos() const
-    {
-      size_type i = 0;
-      for (; i < arr_size && m_a_p_children[i] == 0; ++i)
-	;
-      return i;
-    }
-
-#ifdef _GLIBCXX_DEBUG
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::node_debug_info
-    PB_DS_CLASS_C_DEC::
-    assert_valid_imp(a_const_pointer p_traits,
-		     const char* __file, int __line) const
-    {
-      PB_DS_DEBUG_VERIFY(base_type::m_type == i_node);
-      PB_DS_DEBUG_VERIFY(static_cast<size_type>(std::distance(pref_b_it(), pref_e_it())) == m_e_ind);
-      PB_DS_DEBUG_VERIFY(std::distance(begin(), end()) >= 2);
-
-      for (typename _Inode::const_iterator it = begin(); it != end(); ++it)
-	{
-	  node_const_pointer p_nd = *it;
-	  PB_DS_DEBUG_VERIFY(p_nd->m_p_parent == this);
-	  node_debug_info child_ret = p_nd->assert_valid_imp(p_traits,
-							     __file, __line);
-
-	  PB_DS_DEBUG_VERIFY(static_cast<size_type>(std::distance(child_ret.first, child_ret.second)) >= m_e_ind);
-	  PB_DS_DEBUG_VERIFY(should_be_mine(child_ret.first, child_ret.second, 0, p_traits));
-	  PB_DS_DEBUG_VERIFY(get_pref_pos(child_ret.first, child_ret.second, p_traits) == static_cast<size_type>(it.m_p_p_cur - m_a_p_children));
-	}
-      return std::make_pair(pref_b_it(), pref_e_it());
-    }
-#endif
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
deleted file mode 100644
index dbcbd3f..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/policy_access_fn_imps.hpp
- * Contains an implementation class for pat_trie.
- */
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::access_traits& 
-PB_DS_CLASS_C_DEC::
-get_access_traits()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const typename PB_DS_CLASS_C_DEC::access_traits& 
-PB_DS_CLASS_C_DEC::
-get_access_traits() const
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_update& 
-PB_DS_CLASS_C_DEC::
-get_node_update()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const typename PB_DS_CLASS_C_DEC::node_update& 
-PB_DS_CLASS_C_DEC::
-get_node_update() const
-{ return *this; }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
deleted file mode 100644
index a091ee8..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/r_erase_fn_imps.hpp
- * Contains an implementation class for pat_trie.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-actual_erase_node(node_pointer p_z)
-{
-  _GLIBCXX_DEBUG_ASSERT(m_size > 0);
-  --m_size;
-  _GLIBCXX_DEBUG_ONLY(debug_base::erase_existing(PB_DS_V2F(p_z->m_value)));
-  p_z->~node();
-  s_node_allocator.deallocate(p_z, 1);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-update_min_max_for_erased_node(node_pointer p_z)
-{
-  if (m_size == 1)
-    {
-      m_p_head->m_p_left = m_p_head->m_p_right = m_p_head;
-      return;
-    }
-
-  if (m_p_head->m_p_left == p_z)
-    {
-      iterator it(p_z);
-      ++it;
-      m_p_head->m_p_left = it.m_p_nd;
-    }
-  else if (m_p_head->m_p_right == p_z)
-    {
-      iterator it(p_z);
-      --it;
-      m_p_head->m_p_right = it.m_p_nd;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  _GLIBCXX_DEBUG_ONLY(assert_valid(true, true);)
-  clear_imp(m_p_head->m_p_parent);
-  m_size = 0;
-  initialize();
-  _GLIBCXX_DEBUG_ONLY(debug_base::clear();)
-  _GLIBCXX_DEBUG_ONLY(assert_valid(true, true);)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear_imp(node_pointer p_nd)
-{
-  if (p_nd == 0)
-    return;
-  clear_imp(p_nd->m_p_left);
-  clear_imp(p_nd->m_p_right);
-  p_nd->~Node();
-  s_node_allocator.deallocate(p_nd, 1);
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
deleted file mode 100644
index 858a29a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/rotate_fn_imps.hpp
- * Contains imps for rotating nodes.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-rotate_left(node_pointer p_x)
-{
-  node_pointer p_y = p_x->m_p_right;
-  p_x->m_p_right = p_y->m_p_left;
-
-  if (p_y->m_p_left != 0)
-    p_y->m_p_left->m_p_parent = p_x;
-
-  p_y->m_p_parent = p_x->m_p_parent;
-  if (p_x == m_p_head->m_p_parent)
-    m_p_head->m_p_parent = p_y;
-  else if (p_x == p_x->m_p_parent->m_p_left)
-    p_x->m_p_parent->m_p_left = p_y;
-  else
-    p_x->m_p_parent->m_p_right = p_y;
-
-  p_y->m_p_left = p_x;
-  p_x->m_p_parent = p_y;
-
-  _GLIBCXX_DEBUG_ONLY(assert_node_consistent(p_x);)
-  _GLIBCXX_DEBUG_ONLY(assert_node_consistent(p_y);)
-
-  apply_update(p_x, (Node_Update*)this);
-  apply_update(p_x->m_p_parent, (Node_Update*)this);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-rotate_right(node_pointer p_x)
-{
-  node_pointer p_y = p_x->m_p_left;
-  p_x->m_p_left = p_y->m_p_right;
-
-  if (p_y->m_p_right != 0)
-    p_y->m_p_right->m_p_parent = p_x;
-
-  p_y->m_p_parent = p_x->m_p_parent;
-  if (p_x == m_p_head->m_p_parent)
-    m_p_head->m_p_parent = p_y;
-  else if (p_x == p_x->m_p_parent->m_p_right)
-    p_x->m_p_parent->m_p_right = p_y;
-  else
-    p_x->m_p_parent->m_p_left = p_y;
-
-  p_y->m_p_right = p_x;
-  p_x->m_p_parent = p_y;
-
-  _GLIBCXX_DEBUG_ONLY(assert_node_consistent(p_x);)
-  _GLIBCXX_DEBUG_ONLY(assert_node_consistent(p_y);)
-
-  apply_update(p_x, (Node_Update*)this);
-  apply_update(p_x->m_p_parent, (Node_Update*)this);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-rotate_parent(node_pointer p_nd)
-{
-  node_pointer p_parent = p_nd->m_p_parent;
-  if (p_nd == p_parent->m_p_left)
-    rotate_right(p_parent);
-  else
-    rotate_left(p_parent);
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_parent = p_nd);
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_left == p_parent || p_nd->m_p_right == p_parent);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-apply_update(node_pointer /*p_nd*/, __gnu_pbds::null_node_update*  /*p_update*/)
-{ }
-
-PB_DS_CLASS_T_DEC
-template<typename Node_Update_>
-inline void
-PB_DS_CLASS_C_DEC::
-apply_update(node_pointer p_nd, Node_Update_* p_update)
-{
-  p_update->operator()(& PB_DS_V2F(p_nd->m_value),(p_nd->m_p_left == 0) ?
-			0 :
-			& PB_DS_V2F(p_nd->m_p_left->m_value),(p_nd->m_p_right == 0) ?
-			0 :
-			& PB_DS_V2F(p_nd->m_p_right->m_value));
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Node_Update_>
-inline void
-PB_DS_CLASS_C_DEC::
-update_to_top(node_pointer p_nd, Node_Update_* p_update)
-{
-  while (p_nd != m_p_head)
-    {
-      apply_update(p_nd, p_update);
-      p_nd = p_nd->m_p_parent;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-update_to_top(node_pointer /*p_nd*/, __gnu_pbds::null_node_update*  /*p_update*/)
-{ }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
deleted file mode 100644
index 512b6d3..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
+++ /dev/null
@@ -1,250 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/split_fn_imps.hpp
- * Contains an implementation class for pat_trie.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-split(key_const_reference r_key, PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  branch_bag bag;
-  leaf_pointer p_split_lf = split_prep(r_key, other, bag);
-  if (p_split_lf == 0)
-    {
-      _GLIBCXX_DEBUG_ASSERT(bag.empty());
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(!bag.empty());
-  other.clear();
-
-  m_p_head->m_p_parent = rec_split(m_p_head->m_p_parent, pref_begin(p_split_lf),
-				   pref_end(p_split_lf), other, bag);
-
-  m_p_head->m_p_parent->m_p_parent = m_p_head;
-
-  head_pointer __ohead = other.m_p_head;
-  __ohead->m_p_max = m_p_head->m_p_max;
-  m_p_head->m_p_max = rightmost_descendant(m_p_head->m_p_parent);
-  __ohead->m_p_min = other.leftmost_descendant(__ohead->m_p_parent);
-
-  other.m_size = std::distance(other.PB_DS_CLASS_C_DEC::begin(),
-			       other.PB_DS_CLASS_C_DEC::end());
-  m_size -= other.m_size;
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::leaf_pointer
-PB_DS_CLASS_C_DEC::
-split_prep(key_const_reference r_key, PB_DS_CLASS_C_DEC& other,
-	   branch_bag& r_bag)
-{
-  _GLIBCXX_DEBUG_ASSERT(r_bag.empty());
-  if (m_size == 0)
-    {
-      other.clear();
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return 0;
-    }
-
-  if (synth_access_traits::cmp_keys(r_key,
-				    PB_DS_V2F(static_cast<leaf_const_pointer>(m_p_head->m_p_min)->value())))
-    {
-      other.clear();
-      value_swap(other);
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return 0;
-    }
-
-  if (!synth_access_traits::cmp_keys(r_key,
-				       PB_DS_V2F(static_cast<leaf_const_pointer>(m_p_head->m_p_max)->value())))
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return 0;
-    }
-
-  iterator it = lower_bound(r_key);
-
-  if (!synth_access_traits::equal_keys(PB_DS_V2F(*it), r_key))
-    --it;
-
-  node_pointer p_nd = it.m_p_nd;
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_type == leaf_node);
-  leaf_pointer p_ret_l = static_cast<leaf_pointer>(p_nd);
-  while (p_nd->m_type != head_node)
-    {
-      r_bag.add_branch();
-      p_nd = p_nd->m_p_parent;
-    }
-  _GLIBCXX_DEBUG_ONLY(debug_base::split(r_key,(synth_access_traits&)(*this), other);)
-
-  return p_ret_l;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-rec_split(node_pointer p_nd, a_const_iterator b_it, a_const_iterator e_it,
-	  PB_DS_CLASS_C_DEC& other, branch_bag& r_bag)
-{
-  if (p_nd->m_type == leaf_node)
-    {
-      _GLIBCXX_DEBUG_ASSERT(other.m_p_head->m_p_parent == 0);
-      return p_nd;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_type == i_node);
-  inode_pointer p_ind = static_cast<inode_pointer>(p_nd);
-
-  node_pointer pfirst = p_ind->get_child_node(b_it, e_it, this);
-  node_pointer p_child_ret = rec_split(pfirst, b_it, e_it, other, r_bag);
-  PB_DS_ASSERT_NODE_VALID(p_child_ret)
-  p_ind->replace_child(p_child_ret, b_it, e_it, this);
-  apply_update(p_ind, (node_update*)this);
-
-  inode_iterator child_it = p_ind->get_child_it(b_it, e_it, this);
-  const size_type lhs_dist = std::distance(p_ind->begin(), child_it);
-  const size_type lhs_num_children = lhs_dist + 1;
-  _GLIBCXX_DEBUG_ASSERT(lhs_num_children > 0);
-
-  const size_type rhs_dist =  std::distance(p_ind->begin(), p_ind->end());
-  size_type rhs_num_children = rhs_dist - lhs_num_children;
-  if (rhs_num_children == 0)
-    {
-      apply_update(p_ind, (node_update*)this);
-      return p_ind;
-    }
-
-  other.split_insert_branch(p_ind->get_e_ind(), b_it, child_it,
-			    rhs_num_children, r_bag);
-
-  child_it = p_ind->get_child_it(b_it, e_it, this);
-  while (rhs_num_children != 0)
-    {
-      ++child_it;
-      p_ind->remove_child(child_it);
-      --rhs_num_children;
-    }
-  apply_update(p_ind, (node_update*)this);
-
-  const size_type int_dist = std::distance(p_ind->begin(), p_ind->end());
-  _GLIBCXX_DEBUG_ASSERT(int_dist >= 1);
-  if (int_dist > 1)
-    {
-      p_ind->update_prefixes(this);
-      PB_DS_ASSERT_NODE_VALID(p_ind)
-      apply_update(p_ind, (node_update*)this);
-      return p_ind;
-    }
-
-  node_pointer p_ret = *p_ind->begin();
-  p_ind->~inode();
-  s_inode_allocator.deallocate(p_ind, 1);
-  apply_update(p_ret, (node_update*)this);
-  return p_ret;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-split_insert_branch(size_type e_ind, a_const_iterator b_it,
-		    inode_iterator child_b_it,
-		    size_type num_children, branch_bag& r_bag)
-{
-#ifdef _GLIBCXX_DEBUG
-  if (m_p_head->m_p_parent != 0)
-    PB_DS_ASSERT_NODE_VALID(m_p_head->m_p_parent)
-#endif
-
-  const size_type start = m_p_head->m_p_parent == 0 ? 0 : 1;
-  const size_type total_num_children = start + num_children;
-  if (total_num_children == 0)
-    {
-      _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_parent == 0);
-      return;
-    }
-
-  if (total_num_children == 1)
-    {
-      if (m_p_head->m_p_parent != 0)
-	{
-	  PB_DS_ASSERT_NODE_VALID(m_p_head->m_p_parent)
-	  return;
-	}
-
-      _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_parent == 0);
-      ++child_b_it;
-      m_p_head->m_p_parent = *child_b_it;
-      m_p_head->m_p_parent->m_p_parent = m_p_head;
-      apply_update(m_p_head->m_p_parent, (node_update*)this);
-      PB_DS_ASSERT_NODE_VALID(m_p_head->m_p_parent)
-      return;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(total_num_children > 1);
-  inode_pointer p_new_root = r_bag.get_branch();
-  new (p_new_root) inode(e_ind, b_it);
-  size_type num_inserted = 0;
-  while (num_inserted++ < num_children)
-    {
-      ++child_b_it;
-      PB_DS_ASSERT_NODE_VALID((*child_b_it))
-      p_new_root->add_child(*child_b_it, pref_begin(*child_b_it),
-			    pref_end(*child_b_it), this);
-    }
-
-  if (m_p_head->m_p_parent != 0)
-    p_new_root->add_child(m_p_head->m_p_parent,
-			  pref_begin(m_p_head->m_p_parent),
-			  pref_end(m_p_head->m_p_parent), this);
-
-  m_p_head->m_p_parent = p_new_root;
-  p_new_root->m_p_parent = m_p_head;
-  apply_update(m_p_head->m_p_parent, (node_update*)this);
-  PB_DS_ASSERT_NODE_VALID(m_p_head->m_p_parent)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp
deleted file mode 100644
index 9c0d1f5..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp
+++ /dev/null
@@ -1,218 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/synth_access_traits.hpp
- * Contains an implementation class for a patricia tree.
- */
-
-#ifndef PB_DS_SYNTH_E_ACCESS_TRAITS_HPP
-#define PB_DS_SYNTH_E_ACCESS_TRAITS_HPP
-
-#include <ext/pb_ds/detail/type_utils.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-
-#define PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC \
-    template<typename Type_Traits, bool Set, typename _ATraits>
-
-#define PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC \
-    synth_access_traits<Type_Traits, Set, _ATraits>
-
-    /// Synthetic element access traits.
-    template<typename Type_Traits, bool Set, typename _ATraits>
-    struct synth_access_traits : public _ATraits
-    {
-      typedef _ATraits 					base_type;
-      typedef typename base_type::const_iterator	const_iterator;
-      typedef Type_Traits 				type_traits;
-      typedef typename type_traits::const_reference 	const_reference;
-      typedef typename type_traits::key_const_reference key_const_reference;
-
-      synth_access_traits();
-
-      synth_access_traits(const base_type&);
-
-      inline bool
-      equal_prefixes(const_iterator, const_iterator, const_iterator,
-		     const_iterator, bool compare_after = true) const;
-
-      bool
-      equal_keys(key_const_reference, key_const_reference) const;
-
-      bool
-      cmp_prefixes(const_iterator, const_iterator, const_iterator,
-		   const_iterator, bool compare_after = false) const;
-
-      bool
-      cmp_keys(key_const_reference, key_const_reference) const;
-
-      inline static key_const_reference
-      extract_key(const_reference);
-
-#ifdef _GLIBCXX_DEBUG
-      bool
-      operator()(key_const_reference, key_const_reference);
-#endif
-
-    private:
-      inline static key_const_reference
-      extract_key(const_reference, true_type);
-
-      inline static key_const_reference
-      extract_key(const_reference, false_type);
-
-      static integral_constant<int, Set> s_set_ind;
-    };
-
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    integral_constant<int,Set>
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::s_set_ind;
-
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::
-    synth_access_traits()
-    { }
-
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::
-    synth_access_traits(const _ATraits& r_traits) 
-    : _ATraits(r_traits)
-    { }
-
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    inline bool
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::
-    equal_prefixes(const_iterator b_l, const_iterator e_l, const_iterator b_r,
-		   const_iterator e_r, bool compare_after /*= false */) const
-    {
-      while (b_l != e_l)
-	{
-	  if (b_r == e_r)
-	    return false;
-	  if (base_type::e_pos(*b_l) != base_type::e_pos(*b_r))
-	    return false;
-	  ++b_l;
-	  ++b_r;
-	}
-      return (!compare_after || b_r == e_r);
-    }
-
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    bool
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::
-    equal_keys(key_const_reference r_lhs_key,
-	       key_const_reference r_rhs_key) const
-    {
-      return equal_prefixes(base_type::begin(r_lhs_key),
-			    base_type::end(r_lhs_key),
-			    base_type::begin(r_rhs_key),
-			    base_type::end(r_rhs_key),
-			    true);
-    }
-
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    bool
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::
-    cmp_prefixes(const_iterator b_l, const_iterator e_l, const_iterator b_r,
-		 const_iterator e_r, bool compare_after /* = false*/) const
-    {
-      while (b_l != e_l)
-	{
-	  if (b_r == e_r)
-	    return false;
-
-	  const typename base_type::size_type l_pos = base_type::e_pos(*b_l);
-	  const typename base_type::size_type r_pos = base_type::e_pos(*b_r);
-	  if (l_pos != r_pos)
-	    return l_pos < r_pos;
-	  ++b_l;
-	  ++b_r;
-	}
-
-      if (!compare_after)
-	return false;
-      return b_r != e_r;
-    }
-
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    bool
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::
-    cmp_keys(key_const_reference r_lhs_key,
-	     key_const_reference r_rhs_key) const
-    {
-      return cmp_prefixes(base_type::begin(r_lhs_key),
-			  base_type::end(r_lhs_key),
-			  base_type::begin(r_rhs_key),
-			  base_type::end(r_rhs_key),
-			  true);
-    }
-
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    inline typename PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::key_const_reference
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::
-    extract_key(const_reference r_val)
-    { return extract_key(r_val, s_set_ind); }
-
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    inline typename PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::key_const_reference
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::
-    extract_key(const_reference r_val, true_type)
-    { return r_val; }
-
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    inline typename PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::key_const_reference
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::
-    extract_key(const_reference r_val, false_type)
-    { return r_val.first; }
-
-#ifdef _GLIBCXX_DEBUG
-    PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-    bool
-    PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC::
-    operator()(key_const_reference r_lhs, key_const_reference r_rhs)
-    { return cmp_keys(r_lhs, r_rhs); }
-#endif
-
-#undef PB_DS_SYNTH_E_ACCESS_TRAITS_T_DEC
-#undef PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
deleted file mode 100644
index 4ed740a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/trace_fn_imps.hpp
- * Contains an implementation class for pat_trie_.
- */
-
-#ifdef PB_DS_PAT_TRIE_TRACE_
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace() const
-{
-  std::cerr << std::endl;
-  if (m_p_head->m_p_parent == 0)
-    return;
-  trace_node(m_p_head->m_p_parent, 0);
-  std::cerr << std::endl;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace_node(node_const_pointer p_nd, size_type level)
-{
-  for (size_type i = 0; i < level; ++i)
-    std::cerr << ' ';
-  std::cerr << p_nd << " ";
-  std::cerr << ((p_nd->m_type == pat_trie_leaf_node_type) ? "l " : "i ");
-
-  trace_node_metadata(p_nd, type_to_type<typename node::metadata_type>());
-  typename access_traits::const_iterator el_it = pref_begin(p_nd);
-  while (el_it != pref_end(p_nd))
-    {
-      std::cerr <<* el_it;
-      ++el_it;
-    }
-
-  if (p_nd->m_type == pat_trie_leaf_node_type)
-    {
-      std::cerr << std::endl;
-      return;
-    }
-
-  inode_const_pointer p_internal = static_cast<inode_const_pointer>(p_nd);
-
-  std::cerr << " " <<
-    static_cast<unsigned long>(p_internal->get_e_ind()) << std::endl;
-
-  const size_type num_children = std::distance(p_internal->begin(),
-					       p_internal->end());
-
-  for (size_type child_i = 0; child_i < num_children; ++child_i)
-    {
-      typename inode::const_iterator child_it = p_internal->begin();
-      std::advance(child_it, num_children - child_i - 1);
-      trace_node(*child_it, level + 1);
-    }
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Metadata_>
-void
-PB_DS_CLASS_C_DEC::
-trace_node_metadata(node_const_pointer p_nd, type_to_type<Metadata_>)
-{
-  std::cerr << "(" << static_cast<unsigned long>(p_nd->get_metadata()) << ") ";
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace_node_metadata(node_const_pointer, type_to_type<null_type>)
-{ }
-
-#endif 
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/traits.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/traits.hpp
deleted file mode 100644
index 613bf1e..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/traits.hpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/traits.hpp
- * Contains an implementation class for pat_trie_.
- */
-
-#ifndef PB_DS_PAT_TRIE_NODE_AND_IT_TRAITS_HPP
-#define PB_DS_PAT_TRIE_NODE_AND_IT_TRAITS_HPP
-
-#include <ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp>
-#include <ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Specialization.
-    /// @ingroup traits
-    template<typename Key,
-	     typename Mapped,
-	     typename _ATraits,
-	     template<typename Node_CItr,
-		      typename Node_Itr,
-		      typename Cmp_Fn_,
-		      typename _Alloc_>
-	     class Node_Update,
-	     typename _Alloc>
-    struct trie_traits<Key, Mapped, _ATraits, Node_Update, pat_trie_tag, _Alloc>
-    {
-    private:
-      typedef pat_trie_base				    	base_type;
-      typedef types_traits<Key, Mapped, _Alloc, false> 		type_traits;
-
-    public:
-      typedef typename trie_node_metadata_dispatch<Key, Mapped, _ATraits, Node_Update, _Alloc>::type metadata_type;
-      typedef base_type::_Metadata<metadata_type, _Alloc>      	metadata;
-      typedef _ATraits 		       			       	access_traits;
-
-      /// Type for synthesized traits.
-      typedef __gnu_pbds::detail::synth_access_traits<type_traits, false, access_traits>   synth_access_traits;
-
-      typedef base_type::_Node_base<synth_access_traits, metadata>     	node;
-      typedef base_type::_Head<synth_access_traits, metadata>	       	head;
-      typedef base_type::_Leaf<synth_access_traits, metadata>	       	leaf;
-      typedef base_type::_Inode<synth_access_traits, metadata> 		inode;
-
-      typedef base_type::_Iter<node, leaf, head, inode, true>	       	iterator;
-      typedef base_type::_CIter<node, leaf, head, inode, true> 	 	const_iterator;
-      typedef base_type::_Iter<node, leaf, head, inode, false> 		reverse_iterator;
-      typedef base_type::_CIter<node, leaf, head, inode, false>	 	const_reverse_iterator;
-
-      /// This is an iterator to an iterator: it iterates over nodes,
-      /// and de-referencing it returns one of the tree's iterators.
-      typedef base_type::_Node_citer<node, leaf, head, inode, const_iterator, iterator, _Alloc> node_const_iterator;
-
-      typedef base_type::_Node_iter<node, leaf, head, inode, const_iterator, iterator, _Alloc> node_iterator;
-
-      /// Type for node update.
-      typedef Node_Update<node_const_iterator, node_iterator, _ATraits, _Alloc> 		node_update;
-
-      typedef null_node_update<node_const_iterator, node_iterator, _ATraits, _Alloc>* 		null_node_update_pointer;
-    };
-
-
-    /// Specialization.
-    /// @ingroup traits
-    template<typename Key,
-	     typename _ATraits,
-	     template<typename Node_CItr,
-		      typename Node_Itr,
-		      typename Cmp_Fn_,
-		      typename _Alloc_>
-	     class Node_Update,
-	     typename _Alloc>
-    struct trie_traits<Key, null_type, _ATraits, Node_Update, pat_trie_tag, _Alloc>
-    {
-    private:
-      typedef pat_trie_base					base_type;
-      typedef types_traits<Key, null_type, _Alloc, false> 	type_traits;
-
-    public:
-      typedef typename trie_node_metadata_dispatch<Key, null_type, _ATraits, Node_Update, _Alloc>::type metadata_type;
-      typedef base_type::_Metadata<metadata_type, _Alloc>				metadata;
-      typedef _ATraits 				     					access_traits;
-
-      /// Type for synthesized traits.
-      typedef __gnu_pbds::detail::synth_access_traits<type_traits, true, access_traits> synth_access_traits;
-
-      typedef base_type::_Node_base<synth_access_traits, metadata>     	node;
-      typedef base_type::_Head<synth_access_traits, metadata> 	       	head;
-      typedef base_type::_Leaf<synth_access_traits, metadata> 	       	leaf;
-      typedef base_type::_Inode<synth_access_traits, metadata> 	       	inode;
-
-      typedef base_type::_CIter<node, leaf, head, inode, true> 		const_iterator;
-      typedef const_iterator 					       	iterator;
-      typedef base_type::_CIter<node, leaf, head, inode, false>	       	const_reverse_iterator;
-      typedef const_reverse_iterator 			       		reverse_iterator;
-
-      /// This is an iterator to an iterator: it iterates over nodes,
-      /// and de-referencing it returns one of the tree's iterators.
-      typedef base_type::_Node_citer<node, leaf, head, inode, const_iterator, iterator, _Alloc> node_const_iterator;
-
-      typedef node_const_iterator 								node_iterator;
-
-      /// Type for node update.
-      typedef Node_Update<node_const_iterator, node_iterator, _ATraits, _Alloc> 		node_update;
-
-      typedef null_node_update<node_const_iterator, node_const_iterator, _ATraits, _Alloc>* 	null_node_update_pointer;
-    };
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_PAT_TRIE_NODE_AND_IT_TRAITS_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
deleted file mode 100644
index 03d9005..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file pat_trie_/update_fn_imps.hpp
- * Contains an implementation class for pat_trie_.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-apply_update(node_pointer, null_node_update_pointer)
-{ }
-
-PB_DS_CLASS_T_DEC
-template<typename Node_Update_>
-inline void
-PB_DS_CLASS_C_DEC::
-apply_update(node_pointer p_nd, Node_Update_*)
-{
-  Node_Update_::operator()(node_iterator(p_nd, this),
-			   node_const_iterator(0, this));
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/priority_queue_base_dispatch.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
deleted file mode 100644
index e8ee8eb..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file detail/priority_queue_base_dispatch.hpp
- * Contains an pqiative container dispatching base.
- */
-
-#ifndef PB_DS_PRIORITY_QUEUE_BASE_DS_DISPATCHER_HPP
-#define PB_DS_PRIORITY_QUEUE_BASE_DS_DISPATCHER_HPP
-
-#define PB_DS_ASSERT_VALID(X)						\
-  _GLIBCXX_DEBUG_ONLY(X.assert_valid(__FILE__, __LINE__);)
-
-#define PB_DS_DEBUG_VERIFY(_Cond)					\
-  _GLIBCXX_DEBUG_VERIFY_AT(_Cond,					\
-			   _M_message(#_Cond" assertion from %1;:%2;")	\
-			   ._M_string(__FILE__)._M_integer(__LINE__)	\
-			   ,__file,__line)
-
-#include <ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp>
-#include <ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp>
-#include <ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp>
-#include <ext/pb_ds/detail/binary_heap_/binary_heap_.hpp>
-#include <ext/pb_ds/detail/thin_heap_/thin_heap_.hpp>
-
-#undef PB_DS_DEBUG_VERIFY
-#undef PB_DS_ASSERT_VALID
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Specialization for pairing_heap.
-    template<typename _VTp, typename Cmp_Fn, typename _Alloc>
-      struct container_base_dispatch<_VTp, Cmp_Fn, _Alloc, pairing_heap_tag,
-				     null_type>
-      {
-	/// Dispatched type.
-	typedef pairing_heap<_VTp, Cmp_Fn, _Alloc> 		type;
-      };
-
-    /// Specialization for binomial_heap.
-    template<typename _VTp, typename Cmp_Fn, typename _Alloc>
-      struct container_base_dispatch<_VTp, Cmp_Fn, _Alloc, binomial_heap_tag,
-				     null_type>
-      {
-	/// Dispatched type.
-	typedef binomial_heap<_VTp, Cmp_Fn, _Alloc> 		type;
-      };
-
-    /// Specialization for rc_binary_heap.
-    template<typename _VTp, typename Cmp_Fn, typename _Alloc>
-      struct container_base_dispatch<_VTp, Cmp_Fn, _Alloc, rc_binomial_heap_tag,
-  				     null_type>
-      {
-	/// Dispatched type.
-	typedef rc_binomial_heap<_VTp, Cmp_Fn, _Alloc>	       	type;
-      };
-
-    /// Specialization for binary_heap.
-    template<typename _VTp, typename Cmp_Fn, typename _Alloc>
-      struct container_base_dispatch<_VTp, Cmp_Fn, _Alloc, binary_heap_tag,
-  				     null_type>
-      {
-	/// Dispatched type.
-	typedef binary_heap<_VTp, Cmp_Fn, _Alloc> 		type;
-      };
-
-    /// Specialization for thin_heap.
-    template<typename _VTp, typename Cmp_Fn, typename _Alloc>
-      struct container_base_dispatch<_VTp, Cmp_Fn, _Alloc, thin_heap_tag,
-  				     null_type>    
-      {
-	/// Dispatched type.
-	typedef thin_heap<_VTp, Cmp_Fn, _Alloc> 		type;
-      };
-    //@} group pbds
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_PRIORITY_QUEUE_BASE_DS_DISPATCHER_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index 32bfd14..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rb_tree_map_/constructors_destructor_fn_imps.hpp
- * Contains an implementation for rb_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-  while (first_it != last_it)
-    insert(*(first_it++));
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_RB_TREE_NAME()
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_RB_TREE_NAME(const Cmp_Fn& r_cmp_fn) :
-  base_type(r_cmp_fn)
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_RB_TREE_NAME(const Cmp_Fn& r_cmp_fn, const node_update& r_node_update) :
-  base_type(r_cmp_fn, r_node_update)
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_RB_TREE_NAME(const PB_DS_CLASS_C_DEC& other) :
-  base_type(other)
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  base_type::swap(other);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-initialize()
-{ base_type::m_p_head->m_red = true; }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
deleted file mode 100644
index cb4c0d6..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rb_tree_map_/debug_fn_imps.hpp
- * Contains an implementation for rb_tree_.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-assert_node_consistent(const node_pointer p_nd, const char* __file,
-						int __line) const
-{
-  if (p_nd == 0)
-    return 1;
-
-  const size_type l_height =
-    assert_node_consistent(p_nd->m_p_left, __file, __line);
-  const size_type r_height =
-    assert_node_consistent(p_nd->m_p_right, __file, __line);
-  if (p_nd->m_red)
-    {
-      PB_DS_DEBUG_VERIFY(is_effectively_black(p_nd->m_p_left));
-      PB_DS_DEBUG_VERIFY(is_effectively_black(p_nd->m_p_right));
-    }
-  PB_DS_DEBUG_VERIFY(l_height == r_height);
-  return (p_nd->m_red ? 0 : 1) + l_height;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  base_type::assert_valid(__file, __line);
-  const node_pointer p_head = base_type::m_p_head;
-  PB_DS_DEBUG_VERIFY(p_head->m_red);
-  if (p_head->m_p_parent != 0)
-    {
-      PB_DS_DEBUG_VERIFY(!p_head->m_p_parent->m_red);
-      assert_node_consistent(p_head->m_p_parent, __file, __line);
-    }
-}
-
-#endif 
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
deleted file mode 100644
index 218f5b1..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,289 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rb_tree_map_/erase_fn_imps.hpp
- * Contains an implementation for rb_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-erase(key_const_reference r_key)
-{
-  point_iterator it = this->find(r_key);
-  if (it == base_type::end())
-    return false;
-  erase(it);
-  return true;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-erase(iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-  if (it == base_type::end())
-    return it;
-
-  iterator ret_it = it;
-  ++ret_it;
-  erase_node(it.m_p_nd);
-  PB_DS_ASSERT_VALID((*this))
-  return ret_it;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::reverse_iterator
-PB_DS_CLASS_C_DEC::
-erase(reverse_iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-  if (it.m_p_nd == base_type::m_p_head)
-    return it;
-
-  reverse_iterator ret_it = it;
-  ++ret_it;
-  erase_node(it.m_p_nd);
-  PB_DS_ASSERT_VALID((*this))
-  return ret_it;
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  PB_DS_ASSERT_VALID((*this))
-  size_type num_ersd = 0;
-  iterator it = base_type::begin();
-  while (it != base_type::end())
-    {
-      if (pred(*it))
-        {
-	  ++num_ersd;
-	  it = erase(it);
-        }
-      else
-	++it;
-    }
-
-  PB_DS_ASSERT_VALID((*this))
-  return num_ersd;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase_node(node_pointer p_nd)
-{
-  remove_node(p_nd);
-  base_type::actual_erase_node(p_nd);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-remove_node(node_pointer p_z)
-{
-  this->update_min_max_for_erased_node(p_z);
-  node_pointer p_y = p_z;
-  node_pointer p_x = 0;
-  node_pointer p_new_x_parent = 0;
-
-  if (p_y->m_p_left == 0)
-    p_x = p_y->m_p_right;
-  else if (p_y->m_p_right == 0)
-    p_x = p_y->m_p_left;
-  else
-    {
-      p_y = p_y->m_p_right;
-      while (p_y->m_p_left != 0)
-	p_y = p_y->m_p_left;
-      p_x = p_y->m_p_right;
-    }
-
-  if (p_y == p_z)
-    {
-      p_new_x_parent = p_y->m_p_parent;
-      if (p_x != 0)
-	p_x->m_p_parent = p_y->m_p_parent;
-
-      if (base_type::m_p_head->m_p_parent == p_z)
-	base_type::m_p_head->m_p_parent = p_x;
-      else if (p_z->m_p_parent->m_p_left == p_z)
-        {
-	  p_y->m_p_left = p_z->m_p_parent;
-	  p_z->m_p_parent->m_p_left = p_x;
-        }
-      else
-        {
-	  p_y->m_p_left = 0;
-	  p_z->m_p_parent->m_p_right = p_x;
-        }
-    }
-  else
-    {
-      p_z->m_p_left->m_p_parent = p_y;
-      p_y->m_p_left = p_z->m_p_left;
-      if (p_y != p_z->m_p_right)
-        {
-	  p_new_x_parent = p_y->m_p_parent;
-	  if (p_x != 0)
-	    p_x->m_p_parent = p_y->m_p_parent;
-	  p_y->m_p_parent->m_p_left = p_x;
-	  p_y->m_p_right = p_z->m_p_right;
-	  p_z->m_p_right->m_p_parent = p_y;
-        }
-      else
-	p_new_x_parent = p_y;
-
-      if (base_type::m_p_head->m_p_parent == p_z)
-	base_type::m_p_head->m_p_parent = p_y;
-      else if (p_z->m_p_parent->m_p_left == p_z)
-	p_z->m_p_parent->m_p_left = p_y;
-      else
-	p_z->m_p_parent->m_p_right = p_y;
-
-      p_y->m_p_parent = p_z->m_p_parent;
-      std::swap(p_y->m_red, p_z->m_red);
-      p_y = p_z;
-    }
-
-  this->update_to_top(p_new_x_parent, (node_update* )this);
-
-  if (p_y->m_red)
-    return;
-
-  remove_fixup(p_x, p_new_x_parent);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-remove_fixup(node_pointer p_x, node_pointer p_new_x_parent)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_x == 0 || p_x->m_p_parent == p_new_x_parent);
-
-  while (p_x != base_type::m_p_head->m_p_parent && is_effectively_black(p_x))
-    if (p_x == p_new_x_parent->m_p_left)
-      {
-	node_pointer p_w = p_new_x_parent->m_p_right;
-	if (p_w->m_red)
-	  {
-	    p_w->m_red = false;
-	    p_new_x_parent->m_red = true;
-	    base_type::rotate_left(p_new_x_parent);
-	    p_w = p_new_x_parent->m_p_right;
-	  }
-
-	if (is_effectively_black(p_w->m_p_left) 
-	    && is_effectively_black(p_w->m_p_right))
-	  {
-	    p_w->m_red = true;
-	    p_x = p_new_x_parent;
-	    p_new_x_parent = p_new_x_parent->m_p_parent;
-	  }
-	else
-	  {
-	    if (is_effectively_black(p_w->m_p_right))
-	      {
-		if (p_w->m_p_left != 0)
-		  p_w->m_p_left->m_red = false;
-
-		p_w->m_red = true;
-		base_type::rotate_right(p_w);
-		p_w = p_new_x_parent->m_p_right;
-	      }
-
-	    p_w->m_red = p_new_x_parent->m_red;
-	    p_new_x_parent->m_red = false;
-
-	    if (p_w->m_p_right != 0)
-	      p_w->m_p_right->m_red = false;
-
-	    base_type::rotate_left(p_new_x_parent);
-	    this->update_to_top(p_new_x_parent, (node_update* )this);
-	    break;
-	  }
-      }
-    else
-      {
-	node_pointer p_w = p_new_x_parent->m_p_left;
-	if (p_w->m_red == true)
-	  {
-	    p_w->m_red = false;
-	    p_new_x_parent->m_red = true;
-	    base_type::rotate_right(p_new_x_parent);
-	    p_w = p_new_x_parent->m_p_left;
-	  }
-
-	if (is_effectively_black(p_w->m_p_right) 
-	    && is_effectively_black(p_w->m_p_left))
-	  {
-	    p_w->m_red = true;
-	    p_x = p_new_x_parent;
-	    p_new_x_parent = p_new_x_parent->m_p_parent;
-	  }
-	else
-	  {
-	    if (is_effectively_black(p_w->m_p_left))
-	      {
-		if (p_w->m_p_right != 0)
-		  p_w->m_p_right->m_red = false;
-
-		p_w->m_red = true;
-		base_type::rotate_left(p_w);
-		p_w = p_new_x_parent->m_p_left;
-	      }
-
-	    p_w->m_red = p_new_x_parent->m_red;
-	    p_new_x_parent->m_red = false;
-
-	    if (p_w->m_p_left != 0)
-	      p_w->m_p_left->m_red = false;
-
-	    base_type::rotate_right(p_new_x_parent);
-	    this->update_to_top(p_new_x_parent, (node_update* )this);
-	    break;
-	  }
-      }
-
-  if (p_x != 0)
-    p_x->m_red = false;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
deleted file mode 100644
index c5dd26c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rb_tree_map_/find_fn_imps.hpp
- * Contains an implementation for rb_tree_.
- */
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
deleted file mode 100644
index ef50fbe..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rb_tree_map_/info_fn_imps.hpp
- * Contains an implementation for rb_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-is_effectively_black(const node_pointer p_nd)
-{ return (p_nd == 0 || !p_nd->m_red); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
deleted file mode 100644
index 21118f3..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rb_tree_map_/insert_fn_imps.hpp
- * Contains an implementation for rb_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline std::pair<typename PB_DS_CLASS_C_DEC::point_iterator, bool>
-PB_DS_CLASS_C_DEC::
-insert(const_reference r_value)
-{
-  PB_DS_ASSERT_VALID((*this))
-  std::pair<point_iterator, bool> ins_pair = base_type::insert_leaf(r_value);
-  if (ins_pair.second == true)
-    {
-      ins_pair.first.m_p_nd->m_red = true;
-      PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-      insert_fixup(ins_pair.first.m_p_nd);
-    }
-
-  PB_DS_ASSERT_VALID((*this))
-  return ins_pair;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-insert_fixup(node_pointer p_nd)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_red == true);
-  while (p_nd != base_type::m_p_head->m_p_parent && p_nd->m_p_parent->m_red)
-    {
-      if (p_nd->m_p_parent == p_nd->m_p_parent->m_p_parent->m_p_left)
-        {
-	  node_pointer p_y = p_nd->m_p_parent->m_p_parent->m_p_right;
-	  if (p_y != 0 && p_y->m_red)
-            {
-	      p_nd->m_p_parent->m_red = false;
-	      p_y->m_red = false;
-	      p_nd->m_p_parent->m_p_parent->m_red = true;
-	      p_nd = p_nd->m_p_parent->m_p_parent;
-            }
-	  else
-            {
-	      if (p_nd == p_nd->m_p_parent->m_p_right)
-                {
-		  p_nd = p_nd->m_p_parent;
-		  base_type::rotate_left(p_nd);
-                }
-	      p_nd->m_p_parent->m_red = false;
-	      p_nd->m_p_parent->m_p_parent->m_red = true;
-	      base_type::rotate_right(p_nd->m_p_parent->m_p_parent);
-            }
-        }
-      else
-        {
-	  node_pointer p_y = p_nd->m_p_parent->m_p_parent->m_p_left;
-	  if (p_y != 0 && p_y->m_red)
-            {
-	      p_nd->m_p_parent->m_red = false;
-	      p_y->m_red = false;
-	      p_nd->m_p_parent->m_p_parent->m_red = true;
-	      p_nd = p_nd->m_p_parent->m_p_parent;
-            }
-	  else
-            {
-	      if (p_nd == p_nd->m_p_parent->m_p_left)
-                {
-		  p_nd = p_nd->m_p_parent;
-		  base_type::rotate_right(p_nd);
-                }
-	      p_nd->m_p_parent->m_red = false;
-	      p_nd->m_p_parent->m_p_parent->m_red = true;
-	      base_type::rotate_left(p_nd->m_p_parent->m_p_parent);
-            }
-        }
-    }
-
-  base_type::update_to_top(p_nd, (node_update* )this);
-  base_type::m_p_head->m_p_parent->m_red = false;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/node.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/node.hpp
deleted file mode 100644
index 0380d99..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/node.hpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rb_tree_map_/node.hpp
- * Contains an implementation for rb_tree_.
- */
-
-#ifndef PB_DS_RB_TREE_NODE_HPP
-#define PB_DS_RB_TREE_NODE_HPP
-
-#include <ext/pb_ds/detail/branch_policy/null_node_metadata.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Node for Red-Black trees.
-    template<typename Value_Type, class Metadata, typename _Alloc>
-    struct rb_tree_node_
-    {
-    public:
-      typedef Value_Type 		value_type;
-      typedef Metadata 			metadata_type;
-
-      typedef
-      typename _Alloc::template rebind<
-      rb_tree_node_<
-      Value_Type,
-      Metadata,
-      _Alloc> >::other::pointer
-      node_pointer;
-
-      typedef
-      typename _Alloc::template rebind<
-	metadata_type>::other::reference
-      metadata_reference;
-
-      typedef
-      typename _Alloc::template rebind<
-	metadata_type>::other::const_reference
-      metadata_const_reference;
-
-      bool
-      special() const
-      { return m_red; }
-
-      metadata_const_reference
-      get_metadata() const
-      { return m_metadata; }
-
-      metadata_reference
-      get_metadata()
-      { return m_metadata; }
-
-#ifdef PB_DS_BIN_SEARCH_TREE_TRACE_
-      void
-      trace() const
-      {
-	std::cout << PB_DS_V2F(m_value) <<(m_red? " <r> " : " <b> ") 
-		  << "(" << m_metadata << ")";
-      }
-#endif
-
-      node_pointer 	m_p_left;
-      node_pointer 	m_p_right;
-      node_pointer 	m_p_parent;
-      value_type 	m_value;
-      bool 		m_red;
-      metadata_type 	m_metadata;
-    };
-
-    template<typename Value_Type, typename _Alloc>
-    struct rb_tree_node_<Value_Type, null_type, _Alloc>
-    {
-    public:
-      typedef Value_Type 		value_type;
-      typedef null_type 	metadata_type;
-
-      typedef
-      typename _Alloc::template rebind<
-      rb_tree_node_<
-      Value_Type,
-      null_type,
-      _Alloc> >::other::pointer
-      node_pointer;
-
-      bool
-      special() const
-      { return m_red; }
-
-#ifdef PB_DS_BIN_SEARCH_TREE_TRACE_
-      void
-      trace() const
-      { std::cout << PB_DS_V2F(m_value) <<(m_red? " <r> " : " <b> "); }
-#endif 
-
-      node_pointer 	m_p_left;
-      node_pointer 	m_p_right;
-      node_pointer 	m_p_parent;
-      value_type 	m_value;
-      bool 		m_red;
-    };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
deleted file mode 100644
index 0d37267..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
+++ /dev/null
@@ -1,248 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rb_tree_map_/rb_tree_.hpp
- * Contains an implementation for Red Black trees.
- */
-
-#include <ext/pb_ds/detail/standard_policies.hpp>
-#include <utility>
-#include <vector>
-#include <assert.h>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Mapped, typename Cmp_Fn, \
-	     typename Node_And_It_Traits, typename _Alloc>
-
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-# define PB_DS_RB_TREE_NAME rb_tree_map
-# define PB_DS_RB_TREE_BASE_NAME bin_search_tree_map
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-# define PB_DS_RB_TREE_NAME rb_tree_set
-# define PB_DS_RB_TREE_BASE_NAME bin_search_tree_set
-#endif
-
-#define PB_DS_CLASS_C_DEC \
-    PB_DS_RB_TREE_NAME<Key, Mapped, Cmp_Fn, Node_And_It_Traits, _Alloc>
-
-#define PB_DS_RB_TREE_BASE \
-    PB_DS_RB_TREE_BASE_NAME<Key, Mapped, Cmp_Fn, Node_And_It_Traits, _Alloc>
-
-
-    /**
-     *  @brief Red-Black tree.
-     *  @ingroup branch-detail
-     *
-     *  This implementation uses an idea from the SGI STL (using a
-     *  @a header node which is needed for efficient iteration).
-     */
-    template<typename Key,
-	     typename Mapped,
-	     typename Cmp_Fn,
-	     typename Node_And_It_Traits,
-	     typename _Alloc>
-    class PB_DS_RB_TREE_NAME : public PB_DS_RB_TREE_BASE
-    {
-    private:
-      typedef PB_DS_RB_TREE_BASE 		       	 base_type;
-      typedef typename base_type::node_pointer 		 node_pointer;
-
-    public:
-      typedef rb_tree_tag 				 container_category;
-      typedef Cmp_Fn 					 cmp_fn;
-      typedef _Alloc 					 allocator_type;
-      typedef typename _Alloc::size_type 		 size_type;
-      typedef typename _Alloc::difference_type 		 difference_type;
-      typedef typename base_type::key_type 		 key_type;
-      typedef typename base_type::key_pointer 		 key_pointer;
-      typedef typename base_type::key_const_pointer 	 key_const_pointer;
-      typedef typename base_type::key_reference 	 key_reference;
-      typedef typename base_type::key_const_reference 	 key_const_reference;
-      typedef typename base_type::mapped_type 		 mapped_type;
-      typedef typename base_type::mapped_pointer 	 mapped_pointer;
-      typedef typename base_type::mapped_const_pointer 	 mapped_const_pointer;
-      typedef typename base_type::mapped_reference 	 mapped_reference;
-      typedef typename base_type::mapped_const_reference mapped_const_reference;
-      typedef typename base_type::value_type 		 value_type;
-      typedef typename base_type::pointer 		 pointer;
-      typedef typename base_type::const_pointer 	 const_pointer;
-      typedef typename base_type::reference 		 reference;
-      typedef typename base_type::const_reference 	 const_reference;
-      typedef typename base_type::point_iterator 	 point_iterator;
-      typedef typename base_type::const_iterator 	 point_const_iterator;
-      typedef typename base_type::iterator 		 iterator;
-      typedef typename base_type::const_iterator 	 const_iterator;
-      typedef typename base_type::reverse_iterator 	 reverse_iterator;
-      typedef typename base_type::const_reverse_iterator const_reverse_iterator;
-      typedef typename base_type::node_update 		 node_update;
-
-      PB_DS_RB_TREE_NAME();
-
-      PB_DS_RB_TREE_NAME(const Cmp_Fn&);
-
-      PB_DS_RB_TREE_NAME(const Cmp_Fn&, const node_update&);
-
-      PB_DS_RB_TREE_NAME(const PB_DS_CLASS_C_DEC&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      template<typename It>
-      void
-      copy_from_range(It, It);
-
-      inline std::pair<point_iterator, bool>
-      insert(const_reference);
-
-      inline mapped_reference
-      operator[](key_const_reference r_key)
-      {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	std::pair<point_iterator, bool> ins_pair =
-	base_type::insert_leaf(value_type(r_key, mapped_type()));
-
-	if (ins_pair.second == true)
-	  {
-	    ins_pair.first.m_p_nd->m_red = true;
-	    _GLIBCXX_DEBUG_ONLY(this->structure_only_assert_valid(__FILE__, __LINE__);)
-	    insert_fixup(ins_pair.first.m_p_nd);
-	  }
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	return ins_pair.first.m_p_nd->m_value.second;
-#else
-	insert(r_key);
-	return base_type::s_null_type;
-#endif
-      }
-
-      inline bool
-      erase(key_const_reference);
-
-      inline iterator
-      erase(iterator);
-
-      inline reverse_iterator
-      erase(reverse_iterator);
-
-      template<typename Pred>
-      inline size_type
-      erase_if(Pred);
-
-      void
-      join(PB_DS_CLASS_C_DEC&);
-
-      void
-      split(key_const_reference, PB_DS_CLASS_C_DEC&);
-
-    private:
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-
-      size_type
-      assert_node_consistent(const node_pointer, const char*, int) const;
-#endif
-
-      inline static bool
-      is_effectively_black(const node_pointer);
-
-      void
-      initialize();
-
-      void
-      insert_fixup(node_pointer);
-
-      void
-      erase_node(node_pointer);
-
-      void
-      remove_node(node_pointer);
-
-      void
-      remove_fixup(node_pointer, node_pointer);
-
-      void
-      split_imp(node_pointer, PB_DS_CLASS_C_DEC&);
-
-      inline node_pointer
-      split_min();
-
-      std::pair<node_pointer, node_pointer>
-      split_min_imp();
-
-      void
-      join_imp(node_pointer, node_pointer);
-
-      std::pair<node_pointer, node_pointer>
-      find_join_pos_right(node_pointer, size_type, size_type);
-
-      std::pair<node_pointer, node_pointer>
-      find_join_pos_left(node_pointer, size_type, size_type);
-
-      inline size_type
-      black_height(node_pointer);
-
-      void
-      split_at_node(node_pointer, PB_DS_CLASS_C_DEC&);
-    };
-
-#define PB_DS_STRUCT_ONLY_ASSERT_VALID(X)				\
-  _GLIBCXX_DEBUG_ONLY(X.structure_only_assert_valid(__FILE__, __LINE__);)
-
-#include <ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp>
-#include <ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp>
-
-#undef PB_DS_STRUCT_ONLY_ASSERT_VALID
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_RB_TREE_NAME
-#undef PB_DS_RB_TREE_BASE_NAME
-#undef PB_DS_RB_TREE_BASE
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
deleted file mode 100644
index f355369..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
+++ /dev/null
@@ -1,306 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rb_tree_map_/split_join_fn_imps.hpp
- * Contains an implementation for rb_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-join(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  if (base_type::join_prep(other) == false)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  const node_pointer p_x = other.split_min();
-  join_imp(p_x, other.m_p_head->m_p_parent);
-  base_type::join_finish(other);
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
- }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-join_imp(node_pointer p_x, node_pointer p_r)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_x != 0);
-  if (p_r != 0)
-    p_r->m_red = false;
-
-  const size_type h = black_height(base_type::m_p_head->m_p_parent);
-  const size_type other_h = black_height(p_r);
-  node_pointer p_x_l;
-  node_pointer p_x_r;
-  std::pair<node_pointer, node_pointer> join_pos;
-  const bool right_join = h >= other_h;
-  if (right_join)
-    {
-      join_pos = find_join_pos_right(base_type::m_p_head->m_p_parent, 
-				     h, other_h);
-      p_x_l = join_pos.first;
-      p_x_r = p_r;
-    }
-  else
-    {
-      p_x_l = base_type::m_p_head->m_p_parent;
-      base_type::m_p_head->m_p_parent = p_r;
-      if (p_r != 0)
-	p_r->m_p_parent = base_type::m_p_head;
-
-      join_pos = find_join_pos_left(base_type::m_p_head->m_p_parent, 
-				    h, other_h);
-      p_x_r = join_pos.first;
-    }
-
-  node_pointer p_parent = join_pos.second;
-  if (p_parent == base_type::m_p_head)
-    {
-      base_type::m_p_head->m_p_parent = p_x;
-      p_x->m_p_parent = base_type::m_p_head;
-    }
-  else
-    {
-      p_x->m_p_parent = p_parent;
-      if (right_join)
-	p_x->m_p_parent->m_p_right = p_x;
-      else
-	p_x->m_p_parent->m_p_left = p_x;
-    }
-
-  p_x->m_p_left = p_x_l;
-  if (p_x_l != 0)
-    p_x_l->m_p_parent = p_x;
-
-  p_x->m_p_right = p_x_r;
-  if (p_x_r != 0)
-    p_x_r->m_p_parent = p_x;
-
-  p_x->m_red = true;
-
-  base_type::initialize_min_max();
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-  base_type::update_to_top(p_x, (node_update* )this);
-  insert_fixup(p_x);
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-split_min()
-{
-  node_pointer p_min = base_type::m_p_head->m_p_left;
-
-#ifdef _GLIBCXX_DEBUG
-  const node_pointer p_head = base_type::m_p_head;
-  _GLIBCXX_DEBUG_ASSERT(p_min != p_head);
-#endif 
-
-  remove_node(p_min);
-  return p_min;
-}
-
-PB_DS_CLASS_T_DEC
-std::pair<
-  typename PB_DS_CLASS_C_DEC::node_pointer,
-  typename PB_DS_CLASS_C_DEC::node_pointer>
-PB_DS_CLASS_C_DEC::
-find_join_pos_right(node_pointer p_l, size_type h_l, size_type h_r)
-{
-  _GLIBCXX_DEBUG_ASSERT(h_l >= h_r);
-
-  if (base_type::m_p_head->m_p_parent == 0)
-    return (std::make_pair((node_pointer)0, base_type::m_p_head));
-
-  node_pointer p_l_parent = base_type::m_p_head;
-  while (h_l > h_r)
-    {
-      if (p_l->m_red == false)
-        {
-	  _GLIBCXX_DEBUG_ASSERT(h_l > 0);
-	  --h_l;
-        }
-
-      p_l_parent = p_l;
-      p_l = p_l->m_p_right;
-    }
-
-  if (!is_effectively_black(p_l))
-    {
-      p_l_parent = p_l;
-      p_l = p_l->m_p_right;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(is_effectively_black(p_l));
-  _GLIBCXX_DEBUG_ASSERT(black_height(p_l) == h_r);
-  _GLIBCXX_DEBUG_ASSERT(p_l == 0 || p_l->m_p_parent == p_l_parent);
-  return std::make_pair(p_l, p_l_parent);
-}
-
-PB_DS_CLASS_T_DEC
-std::pair<
-  typename PB_DS_CLASS_C_DEC::node_pointer,
-  typename PB_DS_CLASS_C_DEC::node_pointer>
-PB_DS_CLASS_C_DEC::
-find_join_pos_left(node_pointer p_r, size_type h_l, size_type h_r)
-{
-  _GLIBCXX_DEBUG_ASSERT(h_r > h_l);
-  if (base_type::m_p_head->m_p_parent == 0)
-    return (std::make_pair((node_pointer)0,
-			   base_type::m_p_head));
-  node_pointer p_r_parent = base_type::m_p_head;
-  while (h_r > h_l)
-    {
-      if (p_r->m_red == false)
-        {
-	  _GLIBCXX_DEBUG_ASSERT(h_r > 0);
-	  --h_r;
-        }
-
-      p_r_parent = p_r;
-      p_r = p_r->m_p_left;
-    }
-
-  if (!is_effectively_black(p_r))
-    {
-      p_r_parent = p_r;
-      p_r = p_r->m_p_left;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(is_effectively_black(p_r));
-  _GLIBCXX_DEBUG_ASSERT(black_height(p_r) == h_l);
-  _GLIBCXX_DEBUG_ASSERT(p_r == 0 || p_r->m_p_parent == p_r_parent);
-  return std::make_pair(p_r, p_r_parent);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-black_height(node_pointer p_nd)
-{
-  size_type h = 1;
-  while (p_nd != 0)
-    {
-      if (p_nd->m_red == false)
-	++h;
-      p_nd = p_nd->m_p_left;
-    }
-  return h;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-split(key_const_reference r_key, PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  if (base_type::split_prep(r_key, other) == false)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-  PB_DS_STRUCT_ONLY_ASSERT_VALID(other)
-  node_pointer p_nd = this->upper_bound(r_key).m_p_nd;
-  do
-    {
-      node_pointer p_next_nd = p_nd->m_p_parent;
-      if (Cmp_Fn::operator()(r_key, PB_DS_V2F(p_nd->m_value)))
-	split_at_node(p_nd, other);
-
-      PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-      PB_DS_STRUCT_ONLY_ASSERT_VALID(other)
-      p_nd = p_next_nd;
-    }
-  while (p_nd != base_type::m_p_head);
-
-  base_type::split_finish(other);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-split_at_node(node_pointer p_nd, PB_DS_CLASS_C_DEC& other)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-
-  node_pointer p_l = p_nd->m_p_left;
-  node_pointer p_r = p_nd->m_p_right;
-  node_pointer p_parent = p_nd->m_p_parent;
-  if (p_parent == base_type::m_p_head)
-    {
-      base_type::m_p_head->m_p_parent = p_l;
-      if (p_l != 0)
-        {
-	  p_l->m_p_parent = base_type::m_p_head;
-	  p_l->m_red = false;
-        }
-    }
-  else
-    {
-      if (p_parent->m_p_left == p_nd)
-	p_parent->m_p_left = p_l;
-      else
-	p_parent->m_p_right = p_l;
-
-      if (p_l != 0)
-	p_l->m_p_parent = p_parent;
-
-      this->update_to_top(p_parent, (node_update* )this);
-
-      if (!p_nd->m_red)
-	remove_fixup(p_l, p_parent);
-    }
-
-  base_type::initialize_min_max();
-  other.join_imp(p_nd, p_r);
-  PB_DS_STRUCT_ONLY_ASSERT_VALID((*this))
-  PB_DS_STRUCT_ONLY_ASSERT_VALID(other)
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/traits.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/traits.hpp
deleted file mode 100644
index 5501577..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rb_tree_map_/traits.hpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rb_tree_map_/traits.hpp
- * Contains an implementation for rb_tree_.
- */
-
-#ifndef PB_DS_RB_TREE_NODE_AND_IT_TRAITS_HPP
-#define PB_DS_RB_TREE_NODE_AND_IT_TRAITS_HPP
-
-#include <ext/pb_ds/detail/rb_tree_map_/node.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Specialization.
-    /// @ingroup traits
-    template<typename Key,
-	     typename Mapped,
-	     typename Cmp_Fn,
-	     template<typename Node_CItr,
-		      typename Node_Itr,
-		      typename Cmp_Fn_,
-		      typename _Alloc_>
-	     class Node_Update,
-	     typename _Alloc>
-    struct tree_traits<Key, Mapped, Cmp_Fn, Node_Update, rb_tree_tag,_Alloc> 
-    : public bin_search_tree_traits<
-      Key,
-      Mapped,
-      Cmp_Fn,
-      Node_Update,
-      rb_tree_node_<
-	typename types_traits<Key, Mapped, _Alloc, false>::value_type,
-	typename tree_node_metadata_dispatch<Key, Mapped, Cmp_Fn, Node_Update,
-					     _Alloc>::type,
-	_Alloc>,
-      _Alloc>
-    { };
-
-    /// Specialization.
-    /// @ingroup traits
-    template<typename Key,
-	     typename Cmp_Fn,
-	     template<typename Node_CItr,
-		      typename Node_Itr,
-		      typename Cmp_Fn_,
-		      typename _Alloc_>
-	     class Node_Update,
-	     typename _Alloc>
-    struct tree_traits<Key, null_type, Cmp_Fn, Node_Update, rb_tree_tag,_Alloc> 
-    : public bin_search_tree_traits<
-      Key,
-      null_type,
-      Cmp_Fn,
-      Node_Update,
-      rb_tree_node_<
-      typename types_traits<Key, null_type, _Alloc, false>::value_type,
-      typename tree_node_metadata_dispatch<Key, null_type, Cmp_Fn, Node_Update,
-					   _Alloc>::type,
-	_Alloc>,
-	  _Alloc>
-    { };
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index 36533d6..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rc_binomial_heap_/constructors_destructor_fn_imps.hpp
- * Contains an implementation for rc_binomial_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-rc_binomial_heap()
-{
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-rc_binomial_heap(const Cmp_Fn& r_cmp_fn) 
-: base_type(r_cmp_fn)
-{
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-rc_binomial_heap(const PB_DS_CLASS_C_DEC& other) 
-: base_type(other)
-{
-  make_binomial_heap();
-  base_type::find_max();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~rc_binomial_heap()
-{ }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  base_type::swap(other);
-  m_rc.swap(other.m_rc);
-
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
deleted file mode 100644
index 0f40b24..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rc_binomial_heap_/debug_fn_imps.hpp
- * Contains an implementation for rc_binomial_heap_.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  base_type::assert_valid(false, __file, __line);
-  if (!base_type::empty())
-    {
-      PB_DS_DEBUG_VERIFY(base_type::m_p_max != 0);
-      base_type::assert_max(__file, __line);
-    }
-
-  m_rc.assert_valid(__file, __line);
-
-  if (m_rc.empty())
-    {
-      base_type::assert_valid(true, __file, __line);
-      PB_DS_DEBUG_VERIFY(next_2_pointer(base_type::m_p_root) == 0);
-      return;
-    }
-
-  node_const_pointer p_nd = next_2_pointer(base_type::m_p_root);
-  typename rc_t::const_iterator it = m_rc.end();
-  --it;
-
-  while (p_nd != 0)
-    {
-      PB_DS_DEBUG_VERIFY(*it == p_nd);
-      node_const_pointer p_next = p_nd->m_p_next_sibling;
-      PB_DS_DEBUG_VERIFY(p_next != 0);
-      PB_DS_DEBUG_VERIFY(p_nd->m_metadata == p_next->m_metadata);
-      PB_DS_DEBUG_VERIFY(p_next->m_p_next_sibling == 0 ||
-		       p_next->m_metadata < p_next->m_p_next_sibling->m_metadata);
-
-      --it;
-      p_nd = next_2_pointer(next_after_0_pointer(p_nd));
-    }
-  PB_DS_DEBUG_VERIFY(it + 1 == m_rc.begin());
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_const_pointer
-PB_DS_CLASS_C_DEC::
-next_2_pointer(node_const_pointer p_nd)
-{
-  if (p_nd == 0)
-    return 0;
-
-  node_pointer p_next = p_nd->m_p_next_sibling;
-
-  if (p_next == 0)
-    return 0;
-
-  if (p_nd->m_metadata == p_next->m_metadata)
-    return p_nd;
-
-  return next_2_pointer(p_next);
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_const_pointer
-PB_DS_CLASS_C_DEC::
-next_after_0_pointer(node_const_pointer p_nd)
-{
-  if (p_nd == 0)
-    return 0;
-
-  node_pointer p_next = p_nd->m_p_next_sibling;
-
-  if (p_next == 0)
-    return 0;
-
-  if (p_nd->m_metadata < p_next->m_metadata)
-    return p_next;
-
-  return next_after_0_pointer(p_next);
-}
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
deleted file mode 100644
index f86df75..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rc_binomial_heap_/erase_fn_imps.hpp
- * Contains an implementation for rc_binomial_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-pop()
-{
-  make_binomial_heap();
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-  base_type::pop();
-  base_type::find_max();
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  base_type::clear();
-  m_rc.clear();
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-make_binomial_heap()
-{
-  node_pointer p_nd = base_type::m_p_root;
-  while (p_nd != 0)
-    {
-      node_pointer p_next = p_nd->m_p_next_sibling;
-      if (p_next == 0)
-	p_nd = p_next;
-      else if (p_nd->m_metadata == p_next->m_metadata)
-	p_nd = link_with_next_sibling(p_nd);
-      else if (p_nd->m_metadata < p_next->m_metadata)
-	p_nd = p_next;
-#ifdef _GLIBCXX_DEBUG
-      else
-	_GLIBCXX_DEBUG_ASSERT(0);
-#endif 
-    }
-
-  m_rc.clear();
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  make_binomial_heap();
-  const size_type ersd = base_type::erase_if(pred);
-  base_type::find_max();
-  PB_DS_ASSERT_VALID((*this))
-  return ersd;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase(point_iterator it)
-{
-  make_binomial_heap();
-  base_type::erase(it);
-  base_type::find_max();
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
deleted file mode 100644
index b244d6a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rc_binomial_heap_/insert_fn_imps.hpp
- * Contains an implementation for rc_binomial_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-push(const_reference r_val)
-{
-  PB_DS_ASSERT_VALID((*this))
-
-  make_0_exposed();
-
-  PB_DS_ASSERT_VALID((*this))
-
-  node_pointer p_nd = base_type::get_new_node_for_insert(r_val);
-
-  p_nd->m_p_l_child = p_nd->m_p_prev_or_parent = 0;
-  p_nd->m_metadata = 0;
-
-  if (base_type::m_p_max == 0 || Cmp_Fn::operator()(base_type::m_p_max->m_value, r_val))
-    base_type::m_p_max = p_nd;
-
-  p_nd->m_p_next_sibling = base_type::m_p_root;
-
-  if (base_type::m_p_root != 0)
-    base_type::m_p_root->m_p_prev_or_parent = p_nd;
-
-  base_type::m_p_root = p_nd;
-
-  if (p_nd->m_p_next_sibling != 0&&  p_nd->m_p_next_sibling->m_metadata == 0)
-    m_rc.push(p_nd);
-
-  PB_DS_ASSERT_VALID((*this))
-
-  return point_iterator(p_nd);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-modify(point_iterator it, const_reference r_new_val)
-{
-  PB_DS_ASSERT_VALID((*this))
-
-  make_binomial_heap();
-
-  base_type::modify(it, r_new_val);
-
-  base_type::find_max();
-
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-link_with_next_sibling(node_pointer p_nd)
-{
-  node_pointer p_next = p_nd->m_p_next_sibling;
-
-  _GLIBCXX_DEBUG_ASSERT(p_next != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_next->m_p_prev_or_parent == p_nd);
-
-  if (Cmp_Fn::operator()(p_nd->m_value, p_next->m_value))
-    {
-      p_next->m_p_prev_or_parent = p_nd->m_p_prev_or_parent;
-
-      if (p_next->m_p_prev_or_parent == 0)
-	base_type::m_p_root = p_next;
-      else
-	p_next->m_p_prev_or_parent->m_p_next_sibling = p_next;
-
-      if (base_type::m_p_max == p_nd)
-	base_type::m_p_max = p_next;
-
-      base_type::make_child_of(p_nd, p_next);
-
-      ++p_next->m_metadata;
-
-      return p_next;
-    }
-
-  p_nd->m_p_next_sibling = p_next->m_p_next_sibling;
-
-  if (p_nd->m_p_next_sibling != 0)
-    p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd;
-
-  if (base_type::m_p_max == p_next)
-    base_type::m_p_max = p_nd;
-
-  base_type::make_child_of(p_next, p_nd);
-
-  ++p_nd->m_metadata;
-
-  return p_nd;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-make_0_exposed()
-{
-  if (m_rc.empty())
-    return;
-
-  node_pointer p_nd = m_rc.top();
-
-  m_rc.pop();
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_next_sibling != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_metadata == p_nd->m_p_next_sibling->m_metadata);
-
-  node_pointer p_res = link_with_next_sibling(p_nd);
-
-  if (p_res->m_p_next_sibling != 0&&  p_res->m_metadata == p_res->m_p_next_sibling->m_metadata)
-    m_rc.push(p_res);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
deleted file mode 100644
index 2646080..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rc_binomial_heap_/rc.hpp
- * Contains a redundant (binary counter).
- */
-
-#ifndef PB_DS_RC_HPP
-#define PB_DS_RC_HPP
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Redundant binary counter.
-    template<typename _Node, typename _Alloc>
-    class rc
-    {
-    private:
-      typedef _Alloc 					 allocator_type;
-      typedef typename allocator_type::size_type 	 size_type;
-      typedef _Node 					 node;
-
-      typedef typename _Alloc::template rebind<node>	 __rebind_n;
-      typedef typename __rebind_n::other::pointer      	 node_pointer;
-
-      typedef typename _Alloc::template rebind<node_pointer>  __rebind_np;
-
-      typedef typename __rebind_np::other::pointer 	 entry_pointer;
-      typedef typename __rebind_np::other::const_pointer entry_const_pointer;
-
-      enum
-	{
-	  max_entries = sizeof(size_type) << 3
-	};
-
-    public:
-      typedef node_pointer 				 entry;
-      typedef entry_const_pointer 			 const_iterator;
-
-      rc();
-
-      rc(const rc&);
-
-      inline void
-      swap(rc&);
-
-      inline void
-      push(entry);
-
-      inline node_pointer
-      top() const;
-
-      inline void
-      pop();
-
-      inline bool
-      empty() const;
-
-      inline size_type
-      size() const;
-
-      void
-      clear();
-
-      const const_iterator
-      begin() const;
-
-      const const_iterator
-      end() const;
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-#endif
-
-#ifdef PB_DS_RC_BINOMIAL_HEAP_TRACE_
-      void
-      trace() const;
-#endif
-
-    private:
-      node_pointer 	m_a_entries[max_entries];
-      size_type 	m_over_top;
-    };
-
-    template<typename _Node, typename _Alloc>
-    rc<_Node, _Alloc>::
-    rc() : m_over_top(0)
-    { PB_DS_ASSERT_VALID((*this)) }
-
-    template<typename _Node, typename _Alloc>
-    rc<_Node, _Alloc>::
-    rc(const rc<_Node, _Alloc>& other) : m_over_top(0)
-    { PB_DS_ASSERT_VALID((*this)) }
-
-    template<typename _Node, typename _Alloc>
-    inline void
-    rc<_Node, _Alloc>::
-    swap(rc<_Node, _Alloc>& other)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-
-      const size_type over_top = std::max(m_over_top, other.m_over_top);
-
-      for (size_type i = 0; i < over_top; ++i)
-	std::swap(m_a_entries[i], other.m_a_entries[i]);
-
-      std::swap(m_over_top, other.m_over_top);
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-     }
-
-    template<typename _Node, typename _Alloc>
-    inline void
-    rc<_Node, _Alloc>::
-    push(entry p_nd)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      _GLIBCXX_DEBUG_ASSERT(m_over_top < max_entries);
-      m_a_entries[m_over_top++] = p_nd;
-      PB_DS_ASSERT_VALID((*this))
-    }
-
-    template<typename _Node, typename _Alloc>
-    inline void
-    rc<_Node, _Alloc>::
-    pop()
-    {
-      PB_DS_ASSERT_VALID((*this))
-      _GLIBCXX_DEBUG_ASSERT(!empty());
-      --m_over_top;
-      PB_DS_ASSERT_VALID((*this))
-    }
-
-    template<typename _Node, typename _Alloc>
-    inline typename rc<_Node, _Alloc>::node_pointer
-    rc<_Node, _Alloc>::
-    top() const
-    {
-      PB_DS_ASSERT_VALID((*this))
-      _GLIBCXX_DEBUG_ASSERT(!empty());
-      return *(m_a_entries + m_over_top - 1);
-    }
-
-    template<typename _Node, typename _Alloc>
-    inline bool
-    rc<_Node, _Alloc>::
-    empty() const
-    {
-      PB_DS_ASSERT_VALID((*this))
-      return m_over_top == 0;
-    }
-
-    template<typename _Node, typename _Alloc>
-    inline typename rc<_Node, _Alloc>::size_type
-    rc<_Node, _Alloc>::
-    size() const
-    { return m_over_top; }
-
-    template<typename _Node, typename _Alloc>
-    void
-    rc<_Node, _Alloc>::
-    clear()
-    {
-      PB_DS_ASSERT_VALID((*this))
-      m_over_top = 0;
-      PB_DS_ASSERT_VALID((*this))
-    }
-
-    template<typename _Node, typename _Alloc>
-    const typename rc<_Node, _Alloc>::const_iterator
-    rc<_Node, _Alloc>::
-    begin() const
-    { return& m_a_entries[0]; }
-
-    template<typename _Node, typename _Alloc>
-    const typename rc<_Node, _Alloc>::const_iterator
-    rc<_Node, _Alloc>::
-    end() const
-    { return& m_a_entries[m_over_top]; }
-
-#ifdef _GLIBCXX_DEBUG
-    template<typename _Node, typename _Alloc>
-    void
-    rc<_Node, _Alloc>::
-    assert_valid(const char* __file, int __line) const
-    { PB_DS_DEBUG_VERIFY(m_over_top < max_entries); }
-#endif
-
-#ifdef PB_DS_RC_BINOMIAL_HEAP_TRACE_
-    template<typename _Node, typename _Alloc>
-    void
-    rc<_Node, _Alloc>::
-    trace() const
-    {
-      std::cout << "rc" << std::endl;
-      for (size_type i = 0; i < m_over_top; ++i)
-	std::cerr << m_a_entries[i] << std::endl;
-      std::cout << std::endl;
-    }
-#endif
-} // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
deleted file mode 100644
index 6d4c5d5..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rc_binomial_heap_/rc_binomial_heap_.hpp
- * Contains an implementation for redundant-counter binomial heap.
- */
-
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp>
-#include <ext/pb_ds/detail/rc_binomial_heap_/rc.hpp>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_CLASS_T_DEC \
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    rc_binomial_heap<Value_Type, Cmp_Fn, _Alloc>
-
-#define PB_DS_RC_C_DEC \
-    rc<typename binomial_heap_base<Value_Type, Cmp_Fn, _Alloc>::node, _Alloc>
-
-    /**
-     *  Redundant-counter binomial heap.
-     *
-     *  @ingroup heap-detail
-     */
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-    class rc_binomial_heap
-    : public binomial_heap_base<Value_Type, Cmp_Fn, _Alloc>
-    {
-    private:
-      typedef binomial_heap_base<Value_Type, Cmp_Fn, _Alloc>
-      							base_type;
-      typedef typename base_type::node_pointer 		node_pointer;
-      typedef typename base_type::node_const_pointer 	node_const_pointer;
-      typedef PB_DS_RC_C_DEC 				rc_t;
-
-    public:
-      typedef Value_Type 				value_type;
-      typedef typename _Alloc::size_type 		size_type;
-      typedef typename _Alloc::difference_type 		difference_type;
-      typedef typename base_type::pointer 		pointer;
-      typedef typename base_type::const_pointer 	const_pointer;
-      typedef typename base_type::reference 		reference;
-      typedef typename base_type::const_reference 	const_reference;
-      typedef typename base_type::point_const_iterator 	point_const_iterator;
-      typedef typename base_type::point_iterator 	point_iterator;
-      typedef typename base_type::const_iterator 	const_iterator;
-      typedef typename base_type::iterator 		iterator;
-      typedef typename base_type::cmp_fn 		cmp_fn;
-      typedef typename base_type::allocator_type 	allocator_type;
-
-      rc_binomial_heap();
-
-      rc_binomial_heap(const Cmp_Fn&);
-
-      rc_binomial_heap(const PB_DS_CLASS_C_DEC&);
-
-      ~rc_binomial_heap();
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      inline point_iterator
-      push(const_reference);
-
-      void
-      modify(point_iterator, const_reference);
-
-      inline void
-      pop();
-
-      void
-      erase(point_iterator);
-
-      inline void
-      clear();
-
-      template<typename Pred>
-      size_type
-      erase_if(Pred);
-
-      template<typename Pred>
-      void
-      split(Pred, PB_DS_CLASS_C_DEC&);
-
-      void
-      join(PB_DS_CLASS_C_DEC&);
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-#endif
-
-#ifdef PB_DS_RC_BINOMIAL_HEAP_TRACE_
-      void
-      trace() const;
-#endif
-
-    private:
-
-      inline node_pointer
-      link_with_next_sibling(node_pointer);
-
-      void
-      make_0_exposed();
-
-      void
-      make_binomial_heap();
-
-#ifdef _GLIBCXX_DEBUG
-      static node_const_pointer
-      next_2_pointer(node_const_pointer);
-
-      static node_const_pointer
-      next_after_0_pointer(node_const_pointer);
-#endif
-
-      rc_t 			m_rc;
-    };
-
-#include <ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp>
-#include <ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp>
-
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_RC_C_DEC
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
deleted file mode 100644
index 8818a2f..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rc_binomial_heap_/split_join_fn_imps.hpp
- * Contains an implementation for rc_binomial_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-void
-PB_DS_CLASS_C_DEC::
-split(Pred pred, PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  make_binomial_heap();
-  other.make_binomial_heap();
-  base_type::split(pred, other);
-  base_type::find_max();
-  other.find_max();
-
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-join(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  make_binomial_heap();
-  other.make_binomial_heap();
-  base_type::join(other);
-  base_type::find_max();
-  other.find_max();
-
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
deleted file mode 100644
index 89257ee..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file rc_binomial_heap_/trace_fn_imps.hpp
- * Contains an implementation for rc_binomial_heap_.
- */
-
-#ifdef PB_DS_RC_BINOMIAL_HEAP_TRACE_
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace() const
-{
-  base_type::trace();
-  m_rc.trace();
-}
-
-#endif // #ifdef PB_DS_RC_BINOMIAL_HEAP_TRACE_
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
deleted file mode 100644
index 93e8610..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file cc_hash_max_collision_check_resize_trigger_imp.hpp
- * Contains a resize trigger implementation.
- */
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-cc_hash_max_collision_check_resize_trigger(float load) :
-  m_load(load),
-  m_size(0),
-  m_num_col(0),
-  m_max_col(0),
-  m_resize_needed(false)
-{ }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_find_search_start()
-{ }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_find_search_collision()
-{ }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_find_search_end()
-{ }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_insert_search_start()
-{ m_num_col = 0; }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_insert_search_collision()
-{ ++m_num_col; }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_insert_search_end()
-{ calc_resize_needed(); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erase_search_start()
-{ }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erase_search_collision()
-{ }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erase_search_end()
-{ }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_inserted(size_type)
-{ }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erased(size_type)
-{ m_resize_needed = true; }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-notify_cleared()
-{ m_resize_needed = false; }
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-is_resize_needed() const
-{ return m_resize_needed; }
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-is_grow_needed(size_type /*size*/, size_type /*num_used_e*/) const
-{ return m_num_col >= m_max_col; }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-notify_resized(size_type new_size)
-{
-  m_size = new_size;
-
-#ifdef PB_DS_HT_MAP_RESIZE_TRACE_
-  std::cerr << "chmccrt::notify_resized " 
-	    << static_cast<unsigned long>(new_size) << std::endl;
-#endif 
-
-  calc_max_num_coll();
-  calc_resize_needed();
-  m_num_col = 0;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-calc_max_num_coll()
-{
-  // max_col <-- \sqrt{2 load \ln( 2 m \ln( m ) ) }
-  const double ln_arg = 2 * m_size * std::log(double(m_size));
-  m_max_col = size_type(std::ceil(std::sqrt(2 * m_load * std::log(ln_arg))));
-
-#ifdef PB_DS_HT_MAP_RESIZE_TRACE_
-  std::cerr << "chmccrt::calc_max_num_coll " 
-	    << static_cast<unsigned long>(m_size) <<    "    " 
-	    << static_cast<unsigned long>(m_max_col) << std::endl;
-#endif 
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-notify_externally_resized(size_type new_size)
-{ notify_resized(new_size); }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  std::swap(m_load, other.m_load);
-  std::swap(m_size, other.m_size);
-  std::swap(m_num_col, other.m_num_col);
-  std::swap(m_max_col, other.m_max_col);
-  std::swap(m_resize_needed, other.m_resize_needed);
-}
-
-PB_DS_CLASS_T_DEC
-inline float
-PB_DS_CLASS_C_DEC::
-get_load() const
-{
-  PB_DS_STATIC_ASSERT(access, external_load_access);
-  return m_load;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-calc_resize_needed()
-{ m_resize_needed = m_resize_needed || m_num_col >= m_max_col; }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-set_load(float load)
-{
-  PB_DS_STATIC_ASSERT(access, external_load_access);
-  m_load = load;
-  calc_max_num_coll();
-  calc_resize_needed();
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
deleted file mode 100644
index 95c785f..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file hash_exponential_size_policy_imp.hpp
- * Contains a resize size policy implementation.
- */
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-hash_exponential_size_policy(size_type start_size, size_type grow_factor) :
-  m_start_size(start_size),
-  m_grow_factor(grow_factor)
-{ }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  std::swap(m_start_size, other.m_start_size);
-  std::swap(m_grow_factor, other.m_grow_factor);
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-get_nearest_larger_size(size_type size) const
-{
-  size_type ret = m_start_size;
-  while (ret <= size)
-    {
-      const size_type next_ret = ret*  m_grow_factor;
-      if (next_ret < ret)
-	__throw_insert_error();
-      ret = next_ret;
-    }
-  return ret;
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-get_nearest_smaller_size(size_type size) const
-{
-  size_type ret = m_start_size;
-  while (true)
-    {
-      const size_type next_ret = ret*  m_grow_factor;
-      if (next_ret < ret)
-	__throw_resize_error();
-      if (next_ret >= size)
-	return (ret);
-      ret = next_ret;
-    }
-  return ret;
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
deleted file mode 100644
index 1cda673..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+++ /dev/null
@@ -1,293 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file hash_load_check_resize_trigger_imp.hpp
- * Contains a resize trigger implementation.
- */
-
-#define PB_DS_ASSERT_VALID(X)						\
-  _GLIBCXX_DEBUG_ONLY(X.assert_valid(__FILE__, __LINE__);)
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-hash_load_check_resize_trigger(float load_min, float load_max)
-: m_load_min(load_min), m_load_max(load_max), m_next_shrink_size(0),
-  m_next_grow_size(0), m_resize_needed(false)
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_find_search_start()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_find_search_collision()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_find_search_end()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_insert_search_start()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_insert_search_collision()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_insert_search_end()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erase_search_start()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erase_search_collision()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erase_search_end()
-{ PB_DS_ASSERT_VALID((*this)) }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_inserted(size_type num_entries)
-{
-  m_resize_needed = (num_entries >= m_next_grow_size);
-  size_base::set_size(num_entries);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erased(size_type num_entries)
-{
-  size_base::set_size(num_entries);
-  m_resize_needed = num_entries <= m_next_shrink_size;
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-is_resize_needed() const
-{
-  PB_DS_ASSERT_VALID((*this))
-  return m_resize_needed;
-}
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-is_grow_needed(size_type /*size*/, size_type num_entries) const
-{
-  _GLIBCXX_DEBUG_ASSERT(m_resize_needed);
-  return num_entries >= m_next_grow_size;
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~hash_load_check_resize_trigger() { }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-notify_resized(size_type new_size)
-{
-  m_resize_needed = false;
-  m_next_grow_size = size_type(m_load_max * new_size - 1);
-  m_next_shrink_size = size_type(m_load_min * new_size);
-
-#ifdef PB_DS_HT_MAP_RESIZE_TRACE_
-  std::cerr << "hlcrt::notify_resized "  << std::endl
-	    << "1 " << new_size << std::endl
-	    << "2 " << m_load_min << std::endl
-	    << "3 " << m_load_max << std::endl
-	    << "4 " << m_next_shrink_size << std::endl
-	    << "5 " << m_next_grow_size << std::endl;
-#endif
-
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-notify_externally_resized(size_type new_size)
-{
-  m_resize_needed = false;
-  size_type new_grow_size = size_type(m_load_max * new_size - 1);
-  size_type new_shrink_size = size_type(m_load_min * new_size);
-
-#ifdef PB_DS_HT_MAP_RESIZE_TRACE_
-  std::cerr << "hlcrt::notify_externally_resized "  << std::endl
-	    << "1 " << new_size << std::endl
-	    << "2 " << m_load_min << std::endl
-	    << "3 " << m_load_max << std::endl
-	    << "4 " << m_next_shrink_size << std::endl
-	    << "5 " << m_next_grow_size << std::endl
-	    << "6 " << new_shrink_size << std::endl
-	    << "7 " << new_grow_size << std::endl;
-#endif
-
-  if (new_grow_size >= m_next_grow_size)
-    {
-      _GLIBCXX_DEBUG_ASSERT(new_shrink_size >= m_next_shrink_size);
-      m_next_grow_size = new_grow_size;
-    }
-  else
-    {
-      _GLIBCXX_DEBUG_ASSERT(new_shrink_size <= m_next_shrink_size);
-      m_next_shrink_size = new_shrink_size;
-    }
-
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-notify_cleared()
-{
-  PB_DS_ASSERT_VALID((*this))
-  size_base::set_size(0);
-  m_resize_needed = (0 < m_next_shrink_size);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  size_base::swap(other);
-  std::swap(m_load_min, other.m_load_min);
-  std::swap(m_load_max, other.m_load_max);
-  std::swap(m_resize_needed, other.m_resize_needed);
-  std::swap(m_next_grow_size, other.m_next_grow_size);
-  std::swap(m_next_shrink_size, other.m_next_shrink_size);
-
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-inline std::pair<float, float>
-PB_DS_CLASS_C_DEC::
-get_loads() const
-{
-  PB_DS_STATIC_ASSERT(access, external_load_access);
-  return std::make_pair(m_load_min, m_load_max);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-set_loads(std::pair<float, float> load_pair)
-{
-  PB_DS_STATIC_ASSERT(access, external_load_access);
-  const float old_load_min = m_load_min;
-  const float old_load_max = m_load_max;
-  const size_type old_next_shrink_size = m_next_shrink_size;
-  const size_type old_next_grow_size = m_next_grow_size;
-  const bool old_resize_needed = m_resize_needed;
-
-  __try
-    {
-      m_load_min = load_pair.first;
-      m_load_max = load_pair.second;
-      do_resize(static_cast<size_type>(size_base::get_size() / ((m_load_min + m_load_max) / 2)));
-    }
-  __catch(...)
-    {
-      m_load_min = old_load_min;
-      m_load_max = old_load_max;
-      m_next_shrink_size = old_next_shrink_size;
-      m_next_grow_size = old_next_grow_size;
-      m_resize_needed = old_resize_needed;
-      __throw_exception_again;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-do_resize(size_type)
-{ std::abort(); }
-
-#ifdef _GLIBCXX_DEBUG
-# define PB_DS_DEBUG_VERIFY(_Cond)					\
-  _GLIBCXX_DEBUG_VERIFY_AT(_Cond,					\
-			   _M_message(#_Cond" assertion from %1;:%2;")	\
-			   ._M_string(__FILE__)._M_integer(__LINE__)	\
-			   ,__file,__line)
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  PB_DS_DEBUG_VERIFY(m_load_max > m_load_min);
-  PB_DS_DEBUG_VERIFY(m_next_grow_size >= m_next_shrink_size);
-}
-# undef PB_DS_DEBUG_VERIFY
-#endif
-#undef PB_DS_ASSERT_VALID
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
deleted file mode 100644
index 4117762..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file hash_load_check_resize_trigger_size_base.hpp
- * Contains an base holding size for some resize policies.
- */
-
-#ifndef PB_DS_HASH_LOAD_CHECK_RESIZE_TRIGGER_SIZE_BASE_HPP
-#define PB_DS_HASH_LOAD_CHECK_RESIZE_TRIGGER_SIZE_BASE_HPP
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Primary template.
-    template<typename Size_Type, bool Hold_Size>
-    class hash_load_check_resize_trigger_size_base;
-
-    /// Specializations.
-    template<typename Size_Type>
-    class hash_load_check_resize_trigger_size_base<Size_Type, true>
-    {
-    protected:
-      typedef Size_Type size_type;
-
-      hash_load_check_resize_trigger_size_base(): m_size(0)
-      { }
-
-      inline void
-      swap(hash_load_check_resize_trigger_size_base& other)
-      { std::swap(m_size, other.m_size); }
-
-      inline void
-      set_size(size_type size)
-      { m_size = size; }
-
-      inline size_type
-      get_size() const
-      { return m_size; }
-
-    private:
-      size_type m_size;
-    };
-
-    template<typename Size_Type>
-    class hash_load_check_resize_trigger_size_base<Size_Type, false>
-    {
-    protected:
-      typedef Size_Type size_type;
-
-    protected:
-      inline void
-      swap(hash_load_check_resize_trigger_size_base& other) { }
-
-      inline void
-      set_size(size_type size) { }
-    };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
deleted file mode 100644
index a4c6b41..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file hash_prime_size_policy_imp.hpp
- * Contains a resize size policy implementation.
- */
-
-#pragma GCC system_header
-
-namespace detail
-{
-  enum
-    {
-      num_distinct_sizes_32_bit = 30,
-      num_distinct_sizes_64_bit = 62,
-      num_distinct_sizes = sizeof(std::size_t) != 8 ? 
-            num_distinct_sizes_32_bit : num_distinct_sizes_64_bit,	
-    };
-
-  // Originally taken from the SGI implementation; acknowledged in the docs.
-  // Further modified (for 64 bits) from tr1's hashtable.
-  static const std::size_t g_a_sizes[num_distinct_sizes_64_bit] =
-    {
-      /* 0     */              5ul,
-      /* 1     */              11ul, 
-      /* 2     */              23ul, 
-      /* 3     */              47ul, 
-      /* 4     */              97ul, 
-      /* 5     */              199ul, 
-      /* 6     */              409ul, 
-      /* 7     */              823ul, 
-      /* 8     */              1741ul, 
-      /* 9     */              3469ul, 
-      /* 10    */              6949ul, 
-      /* 11    */              14033ul, 
-      /* 12    */              28411ul, 
-      /* 13    */              57557ul, 
-      /* 14    */              116731ul, 
-      /* 15    */              236897ul,
-      /* 16    */              480881ul, 
-      /* 17    */              976369ul,
-      /* 18    */              1982627ul, 
-      /* 19    */              4026031ul,
-      /* 20    */              8175383ul, 
-      /* 21    */              16601593ul, 
-      /* 22    */              33712729ul,
-      /* 23    */              68460391ul, 
-      /* 24    */              139022417ul, 
-      /* 25    */              282312799ul, 
-      /* 26    */              573292817ul, 
-      /* 27    */              1164186217ul,
-      /* 28    */              2364114217ul, 
-      /* 29    */              4294967291ul,
-      /* 30    */ (std::size_t)8589934583ull,
-      /* 31    */ (std::size_t)17179869143ull,
-      /* 32    */ (std::size_t)34359738337ull,
-      /* 33    */ (std::size_t)68719476731ull,
-      /* 34    */ (std::size_t)137438953447ull,
-      /* 35    */ (std::size_t)274877906899ull,
-      /* 36    */ (std::size_t)549755813881ull,
-      /* 37    */ (std::size_t)1099511627689ull,
-      /* 38    */ (std::size_t)2199023255531ull,
-      /* 39    */ (std::size_t)4398046511093ull,
-      /* 40    */ (std::size_t)8796093022151ull,
-      /* 41    */ (std::size_t)17592186044399ull,
-      /* 42    */ (std::size_t)35184372088777ull,
-      /* 43    */ (std::size_t)70368744177643ull,
-      /* 44    */ (std::size_t)140737488355213ull,
-      /* 45    */ (std::size_t)281474976710597ull,
-      /* 46    */ (std::size_t)562949953421231ull, 
-      /* 47    */ (std::size_t)1125899906842597ull,
-      /* 48    */ (std::size_t)2251799813685119ull, 
-      /* 49    */ (std::size_t)4503599627370449ull,
-      /* 50    */ (std::size_t)9007199254740881ull, 
-      /* 51    */ (std::size_t)18014398509481951ull,
-      /* 52    */ (std::size_t)36028797018963913ull, 
-      /* 53    */ (std::size_t)72057594037927931ull,
-      /* 54    */ (std::size_t)144115188075855859ull,
-      /* 55    */ (std::size_t)288230376151711717ull,
-      /* 56    */ (std::size_t)576460752303423433ull,
-      /* 57    */ (std::size_t)1152921504606846883ull,
-      /* 58    */ (std::size_t)2305843009213693951ull,
-      /* 59    */ (std::size_t)4611686018427387847ull,
-      /* 60    */ (std::size_t)9223372036854775783ull,
-      /* 61    */ (std::size_t)18446744073709551557ull,
-    };
-
-} // namespace detail
-
-PB_DS_CLASS_T_DEC
-inline
-PB_DS_CLASS_C_DEC::
-hash_prime_size_policy(size_type n) : m_start_size(n)
-{ m_start_size = get_nearest_larger_size(n); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{ std::swap(m_start_size, other.m_start_size); }
-
-PB_DS_CLASS_T_DEC
-inline PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-get_nearest_larger_size(size_type n) const
-{
-  const std::size_t* const p_upper = std::upper_bound(detail::g_a_sizes, 
-		     detail::g_a_sizes + detail::num_distinct_sizes, n);
-
-  if (p_upper == detail::g_a_sizes + detail::num_distinct_sizes)
-    __throw_resize_error();
-  return *p_upper;
-}
-
-PB_DS_CLASS_T_DEC
-inline PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-get_nearest_smaller_size(size_type n) const
-{
-  const std::size_t* p_lower = std::lower_bound(detail::g_a_sizes, 
-		       detail::g_a_sizes + detail::num_distinct_sizes, n);
-
-  if (*p_lower >= n &&  p_lower != detail::g_a_sizes)
-    --p_lower;
-  if (*p_lower < m_start_size)
-    return m_start_size;
-  return *p_lower;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
deleted file mode 100644
index af3097d..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file hash_standard_resize_policy_imp.hpp
- * Contains a resize policy implementation.
- */
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-hash_standard_resize_policy() 
-: m_size(Size_Policy::get_nearest_larger_size(1))
-{ trigger_policy_base::notify_externally_resized(m_size); }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-hash_standard_resize_policy(const Size_Policy& r_size_policy) 
-: Size_Policy(r_size_policy), m_size(Size_Policy::get_nearest_larger_size(1))
-{ trigger_policy_base::notify_externally_resized(m_size); }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-hash_standard_resize_policy(const Size_Policy& r_size_policy, 
-			    const Trigger_Policy& r_trigger_policy) 
-: Size_Policy(r_size_policy), Trigger_Policy(r_trigger_policy),
-  m_size(Size_Policy::get_nearest_larger_size(1))
-{ trigger_policy_base::notify_externally_resized(m_size); }
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~hash_standard_resize_policy()
-{ }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  trigger_policy_base::swap(other);
-  size_policy_base::swap(other);
-  std::swap(m_size, other.m_size);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_find_search_start()
-{ trigger_policy_base::notify_find_search_start(); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_find_search_collision()
-{ trigger_policy_base::notify_find_search_collision(); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_find_search_end()
-{ trigger_policy_base::notify_find_search_end(); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_insert_search_start()
-{ trigger_policy_base::notify_insert_search_start(); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_insert_search_collision()
-{ trigger_policy_base::notify_insert_search_collision(); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_insert_search_end()
-{ trigger_policy_base::notify_insert_search_end(); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erase_search_start()
-{ trigger_policy_base::notify_erase_search_start(); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erase_search_collision()
-{ trigger_policy_base::notify_erase_search_collision(); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erase_search_end()
-{ trigger_policy_base::notify_erase_search_end(); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_inserted(size_type num_e)
-{ trigger_policy_base::notify_inserted(num_e); }
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-notify_erased(size_type num_e)
-{ trigger_policy_base::notify_erased(num_e); }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-notify_cleared()
-{ trigger_policy_base::notify_cleared(); }
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-is_resize_needed() const
-{ return trigger_policy_base::is_resize_needed(); }
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-get_new_size(size_type size, size_type num_used_e) const
-{
-  if (trigger_policy_base::is_grow_needed(size, num_used_e))
-    return size_policy_base::get_nearest_larger_size(size);
-  return size_policy_base::get_nearest_smaller_size(size);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-notify_resized(size_type new_size)
-{
-  trigger_policy_base::notify_resized(new_size);
-  m_size = new_size;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-get_actual_size() const
-{
-  PB_DS_STATIC_ASSERT(access, external_size_access);
-  return m_size;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-resize(size_type new_size)
-{
-  PB_DS_STATIC_ASSERT(access, external_size_access);
-  size_type actual_size = size_policy_base::get_nearest_larger_size(1);
-  while (actual_size < new_size)
-    {
-      const size_type pot = size_policy_base::get_nearest_larger_size(actual_size);
-
-      if (pot == actual_size && pot < new_size)
-	__throw_resize_error();
-      actual_size = pot;
-    }
-
-  if (actual_size > 0)
-    --actual_size;
-
-  const size_type old_size = m_size;
-  __try
-    {
-      do_resize(actual_size - 1);
-    }
-  __catch(insert_error& )
-    {
-      m_size = old_size;
-      __throw_resize_error();
-    }
-  __catch(...)
-    {
-      m_size = old_size;
-      __throw_exception_again;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-do_resize(size_type)
-{
-  // Do nothing
-}
-
-PB_DS_CLASS_T_DEC
-Trigger_Policy& 
-PB_DS_CLASS_C_DEC::
-get_trigger_policy()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Trigger_Policy& 
-PB_DS_CLASS_C_DEC::
-get_trigger_policy() const
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-Size_Policy& 
-PB_DS_CLASS_C_DEC::
-get_size_policy()
-{ return *this; }
-
-PB_DS_CLASS_T_DEC
-const Size_Policy& 
-PB_DS_CLASS_C_DEC::
-get_size_policy() const
-{ return *this; }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
deleted file mode 100644
index d68145a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file sample_resize_policy.hpp
- * Contains a sample resize policy for hash tables.
- */
-
-#ifndef PB_DS_SAMPLE_RESIZE_POLICY_HPP
-#define PB_DS_SAMPLE_RESIZE_POLICY_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample resize policy.
-  class sample_resize_policy
-  {
-  public:
-    /// Size type.
-    typedef std::size_t size_type;
-
-    /// Default constructor.
-    sample_resize_policy();
-
-    /// Copy constructor.
-    sample_range_hashing(const sample_resize_policy& other);
-
-    /// Swaps content.
-    inline void
-    swap(sample_resize_policy& other);
-
-  protected:
-    /// Notifies a search started.
-    inline void
-    notify_insert_search_start();
-
-    /// Notifies a search encountered a collision.
-    inline void
-    notify_insert_search_collision();
-
-    /// Notifies a search ended.
-    inline void
-    notify_insert_search_end();
-
-    /// Notifies a search started.
-    inline void
-    notify_find_search_start();
-
-    /// Notifies a search encountered a collision.
-    inline void
-    notify_find_search_collision();
-
-    /// Notifies a search ended.
-    inline void
-    notify_find_search_end();
-
-    /// Notifies a search started.
-    inline void
-    notify_erase_search_start();
-
-    /// Notifies a search encountered a collision.
-    inline void
-    notify_erase_search_collision();
-
-    /// Notifies a search ended.
-    inline void
-    notify_erase_search_end();
-
-    /// Notifies an element was inserted.
-    inline void
-    notify_inserted(size_type num_e);
-
-    /// Notifies an element was erased.
-    inline void
-    notify_erased(size_type num_e);
-
-    /// Notifies the table was cleared.
-    void
-    notify_cleared();
-
-    /// Notifies the table was resized to new_size.
-    void
-    notify_resized(size_type new_size);
-
-    /// Queries whether a resize is needed.
-    inline bool
-    is_resize_needed() const;
-
-    /// Queries what the new size should be.
-    size_type
-    get_new_size(size_type size, size_type num_used_e) const;
-  };
-}
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
deleted file mode 100644
index 1bacc51..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file sample_resize_trigger.hpp
- * Contains a sample resize trigger policy class.
- */
-
-#ifndef PB_DS_SAMPLE_RESIZE_TRIGGER_HPP
-#define PB_DS_SAMPLE_RESIZE_TRIGGER_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample resize trigger policy.
-  class sample_resize_trigger
-  {
-  public:
-    /// Size type.
-    typedef std::size_t size_type;
-
-    /// Default constructor.
-    sample_resize_trigger();
-
-    /// Copy constructor.
-    sample_range_hashing(const sample_resize_trigger&);
-
-    /// Swaps content.
-    inline void
-    swap(sample_resize_trigger&);
-
-  protected:
-    /// Notifies a search started.
-    inline void
-    notify_insert_search_start();
-
-    /// Notifies a search encountered a collision.
-    inline void
-    notify_insert_search_collision();
-
-    /// Notifies a search ended.
-    inline void
-    notify_insert_search_end();
-
-    /// Notifies a search started.
-    inline void
-    notify_find_search_start();
-
-    /// Notifies a search encountered a collision.
-    inline void
-    notify_find_search_collision();
-
-    /// Notifies a search ended.
-    inline void
-    notify_find_search_end();
-
-    /// Notifies a search started.
-    inline void
-    notify_erase_search_start();
-
-    /// Notifies a search encountered a collision.
-    inline void
-    notify_erase_search_collision();
-
-    /// Notifies a search ended.
-    inline void
-    notify_erase_search_end();
-
-    /// Notifies an element was inserted. the total number of entries in
-    /// the table is num_entries.
-    inline void
-    notify_inserted(size_type num_entries);
-
-    /// Notifies an element was erased.
-    inline void
-    notify_erased(size_type num_entries);
-
-    /// Notifies the table was cleared.
-    void
-    notify_cleared();
-
-    /// Notifies the table was resized as a result of this object's
-    /// signifying that a resize is needed.
-    void
-    notify_resized(size_type new_size);
-
-    /// Notifies the table was resized externally.
-    void
-    notify_externally_resized(size_type new_size);
-
-    /// Queries whether a resize is needed.
-    inline bool
-    is_resize_needed() const;
-
-    /// Queries whether a grow is needed.
-    inline bool
-    is_grow_needed(size_type size, size_type num_entries) const;
-
-  private:
-    /// Resizes to new_size.
-    virtual void
-    do_resize(size_type);
-  };
-}
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
deleted file mode 100644
index ea1549b..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file sample_size_policy.hpp
- * Contains a sample size resize-policy.
- */
-
-#ifndef PB_DS_SAMPLE_SIZE_POLICY_HPP
-#define PB_DS_SAMPLE_SIZE_POLICY_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample size policy.
-  class sample_size_policy
-  {
-  public:
-    /// Size type.
-    typedef std::size_t size_type;
-
-    /// Default constructor.
-    sample_size_policy();
-
-    /// Copy constructor.
-    sample_range_hashing(const sample_size_policy&);
-
-    /// Swaps content.
-    inline void
-    swap(sample_size_policy& other);
-
-  protected:
-    /// Given a __size size, returns a __size that is larger.
-    inline size_type
-    get_nearest_larger_size(size_type size) const;
-
-    /// Given a __size size, returns a __size that is smaller.
-    inline size_type
-    get_nearest_smaller_size(size_type size) const;
-  };
-}
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index 02a2467..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/constructors_destructor_fn_imps.hpp
- * Contains an implementation class for splay_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-  while (first_it != last_it)
-    insert(*(first_it++));
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_S_TREE_NAME()
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_S_TREE_NAME(const Cmp_Fn& r_cmp_fn) :
-  base_type(r_cmp_fn)
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_S_TREE_NAME(const Cmp_Fn& r_cmp_fn, const node_update& r_node_update) :
-  base_type(r_cmp_fn, r_node_update)
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-PB_DS_S_TREE_NAME(const PB_DS_CLASS_C_DEC& other) :
-  base_type(other)
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  base_type::swap(other);
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-initialize()
-{ base_type::m_p_head->m_special = true; }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
deleted file mode 100644
index f1691bf..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/debug_fn_imps.hpp
- * Contains an implementation class for splay_tree_.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  base_type::assert_valid(__file, __line);
-  const node_pointer p_head = base_type::m_p_head;
-  assert_special_imp(p_head, __file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_special_imp(const node_pointer p_nd,
-		   const char* __file, int __line) const
-{
-  if (p_nd == 0)
-    return;
-
-  if (p_nd == base_type::m_p_head)
-    {
-      PB_DS_DEBUG_VERIFY(p_nd->m_special);
-      assert_special_imp(p_nd->m_p_parent, __file, __line);
-      return;
-    }
-
-  PB_DS_DEBUG_VERIFY(!p_nd->m_special);
-  assert_special_imp(p_nd->m_p_left, __file, __line);
-  assert_special_imp(p_nd->m_p_right, __file, __line);
-}
-
-#endif 
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
deleted file mode 100644
index 5b9916d..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/erase_fn_imps.hpp
- * Contains an implementation class for splay_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline bool
-PB_DS_CLASS_C_DEC::
-erase(key_const_reference r_key)
-{
-  point_iterator it = find(r_key);
-  if (it == base_type::end())
-    return false;
-  erase(it);
-  return true;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-erase(iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-  if (it == base_type::end())
-    return it;
-  iterator ret_it = it;
-  ++ret_it;
-  erase_node(it.m_p_nd);
-  PB_DS_ASSERT_VALID((*this))
-  return ret_it;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::reverse_iterator
-PB_DS_CLASS_C_DEC::
-erase(reverse_iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-  if (it.m_p_nd == base_type::m_p_head)
-    return (it);
-  reverse_iterator ret_it = it;
-  ++ret_it;
-  erase_node(it.m_p_nd);
-  PB_DS_ASSERT_VALID((*this))
-  return ret_it;
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  PB_DS_ASSERT_VALID((*this))
-  size_type num_ersd = 0;
-  iterator it = base_type::begin();
-  while (it != base_type::end())
-    {
-      if (pred(*it))
-        {
-	  ++num_ersd;
-	  it = erase(it);
-        }
-      else
-	++it;
-    }
-  PB_DS_ASSERT_VALID((*this))
-  return num_ersd;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase_node(node_pointer p_nd)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-  splay(p_nd);
-
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(p_nd == this->m_p_head->m_p_parent);
-
-  node_pointer p_l = p_nd->m_p_left;
-  node_pointer p_r = p_nd->m_p_right;
-
-  base_type::update_min_max_for_erased_node(p_nd);
-  base_type::actual_erase_node(p_nd);
-  if (p_r == 0)
-    {
-      base_type::m_p_head->m_p_parent = p_l;
-      if (p_l != 0)
-	p_l->m_p_parent = base_type::m_p_head;
-      PB_DS_ASSERT_VALID((*this))
-      return;
-    }
-
-  node_pointer p_target_r = leftmost(p_r);
-  _GLIBCXX_DEBUG_ASSERT(p_target_r != 0);
-  p_r->m_p_parent = base_type::m_p_head;
-  base_type::m_p_head->m_p_parent = p_r;
-  splay(p_target_r);
-
-  _GLIBCXX_DEBUG_ONLY(p_target_r->m_p_left = 0);
-  _GLIBCXX_DEBUG_ASSERT(p_target_r->m_p_parent == this->m_p_head);
-  _GLIBCXX_DEBUG_ASSERT(this->m_p_head->m_p_parent == p_target_r);
-
-  p_target_r->m_p_left = p_l;
-  if (p_l != 0)
-    p_l->m_p_parent = p_target_r;
-  PB_DS_ASSERT_VALID((*this))
-  this->apply_update(p_target_r, (node_update*)this);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-leftmost(node_pointer p_nd)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-  while (p_nd->m_p_left != 0)
-    p_nd = p_nd->m_p_left;
-  return p_nd;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
deleted file mode 100644
index 94f1e40..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/find_fn_imps.hpp
- * Contains an implementation class for splay_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-find(key_const_reference r_key)
-{
-  node_pointer p_found = find_imp(r_key);
-  if (p_found != base_type::m_p_head)
-    splay(p_found);
-  return point_iterator(p_found);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_const_iterator
-PB_DS_CLASS_C_DEC::
-find(key_const_reference r_key) const
-{
-  const node_pointer p_found = find_imp(r_key);
-  if (p_found != base_type::m_p_head)
-    const_cast<PB_DS_CLASS_C_DEC* >(this)->splay(p_found);
-  return point_iterator(p_found);
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-find_imp(key_const_reference r_key)
-{
-  _GLIBCXX_DEBUG_ONLY(base_type::structure_only_assert_valid(__FILE__,
-							     __LINE__);)
-  node_pointer p_nd = base_type::m_p_head->m_p_parent;
-  while (p_nd != 0)
-    if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), r_key))
-      {
-	if (!Cmp_Fn::operator()(r_key, PB_DS_V2F(p_nd->m_value)))
-	  return p_nd;
-	p_nd = p_nd->m_p_left;
-      }
-    else
-      p_nd = p_nd->m_p_right;
-  return base_type::m_p_head;
-}
-
-PB_DS_CLASS_T_DEC
-inline const typename PB_DS_CLASS_C_DEC::node_pointer
-PB_DS_CLASS_C_DEC::
-find_imp(key_const_reference r_key) const
-{
-  PB_DS_ASSERT_VALID((*this))
-  node_pointer p_nd = base_type::m_p_head->m_p_parent;
-  while (p_nd != 0)
-    if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), r_key))
-      {
-	if (!Cmp_Fn::operator()(r_key, PB_DS_V2F(p_nd->m_value)))
-	  return p_nd;
-	p_nd = p_nd->m_p_left;
-      }
-    else
-      p_nd = p_nd->m_p_right;
-  return base_type::m_p_head;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
deleted file mode 100644
index 972dca7..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/info_fn_imps.hpp
- * Contains an implementation.
- */
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
deleted file mode 100644
index 3a1af74..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/insert_fn_imps.hpp
- * Contains an implementation class for splay_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline std::pair<typename PB_DS_CLASS_C_DEC::point_iterator, bool>
-PB_DS_CLASS_C_DEC::
-insert(const_reference r_value)
-{
-  PB_DS_ASSERT_VALID((*this))
-  std::pair<point_iterator, bool> ins_pair = insert_leaf_imp(r_value);
-  ins_pair.first.m_p_nd->m_special = false;
-  PB_DS_ASSERT_VALID((*this))
-  splay(ins_pair.first.m_p_nd);
-  PB_DS_ASSERT_VALID((*this))
-  return ins_pair;
-}
-
-PB_DS_CLASS_T_DEC
-inline std::pair<typename PB_DS_CLASS_C_DEC::point_iterator, bool>
-PB_DS_CLASS_C_DEC::
-insert_leaf_imp(const_reference r_value)
-{
-  _GLIBCXX_DEBUG_ONLY(base_type::structure_only_assert_valid(__FILE__,
-							     __LINE__);)
-  if (base_type::m_size == 0)
-    return std::make_pair(base_type::insert_imp_empty(r_value), true);
-
-  node_pointer p_nd = base_type::m_p_head->m_p_parent;
-  node_pointer p_pot = base_type::m_p_head;
-
-  while (p_nd != 0)
-    if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), PB_DS_V2F(r_value)))
-      {
-	if (!Cmp_Fn::operator()(PB_DS_V2F(r_value), PB_DS_V2F(p_nd->m_value)))
-	  {
-	    return std::make_pair(point_iterator(p_nd), false);
-	  }
-	p_pot = p_nd;
-	p_nd = p_nd->m_p_left;
-      }
-    else
-      p_nd = p_nd->m_p_right;
-
-  if (p_pot == base_type::m_p_head)
-    return std::make_pair(base_type::insert_leaf_new(r_value, base_type::m_p_head->m_p_right, false), true);
-
-  PB_DS_CHECK_KEY_DOES_NOT_EXIST(PB_DS_V2F(r_value))
-
-  p_nd = p_pot->m_p_left;
-  if (p_nd == 0)
-    return (std::make_pair(base_type::insert_leaf_new(r_value, p_pot, true), true));
-
-  while (p_nd->m_p_right != 0)
-    p_nd = p_nd->m_p_right;
-
-  return std::make_pair(this->insert_leaf_new(r_value, p_nd, false), true);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/node.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/node.hpp
deleted file mode 100644
index f87d1e3..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/node.hpp
+++ /dev/null
@@ -1,126 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/node.hpp
- * Contains an implementation struct for splay_tree_'s node.
- */
-
-#ifndef PB_DS_SPLAY_TREE_NODE_HPP
-#define PB_DS_SPLAY_TREE_NODE_HPP
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Node for splay tree.
-    template<typename Value_Type, class Metadata, typename _Alloc>
-    struct splay_tree_node_
-    {
-    public:
-      typedef Value_Type value_type;
-      typedef Metadata metadata_type;
-
-      typedef
-      typename _Alloc::template rebind<
-      splay_tree_node_<Value_Type, Metadata, _Alloc> >::other::pointer
-      node_pointer;
-
-      typedef
-      typename _Alloc::template rebind<metadata_type>::other::reference
-      metadata_reference;
-
-      typedef
-      typename _Alloc::template rebind<metadata_type>::other::const_reference
-      metadata_const_reference;
-
-#ifdef PB_DS_BIN_SEARCH_TREE_TRACE_
-      void
-      trace() const
-      { std::cout << PB_DS_V2F(m_value) << "(" << m_metadata << ")"; }
-#endif
-
-      inline bool
-      special() const
-      { return m_special; }
-
-      inline metadata_const_reference
-      get_metadata() const
-      { return m_metadata; }
-
-      inline metadata_reference
-      get_metadata()
-      { return m_metadata; }
-
-      value_type m_value;
-      bool m_special;
-      node_pointer m_p_left;
-      node_pointer m_p_right;
-      node_pointer m_p_parent;
-      metadata_type m_metadata;
-    };
-
-    template<typename Value_Type, typename _Alloc>
-    struct splay_tree_node_<Value_Type, null_type, _Alloc>
-    {
-    public:
-      typedef Value_Type value_type;
-      typedef null_type metadata_type;
-
-      typedef
-      typename _Alloc::template rebind<
-      splay_tree_node_<Value_Type, null_type, _Alloc> >::other::pointer
-      node_pointer;
-
-      inline bool
-      special() const
-      { return m_special; }
-
-#ifdef PB_DS_BIN_SEARCH_TREE_TRACE_
-      void
-      trace() const
-      { std::cout << PB_DS_V2F(m_value); }
-#endif 
-
-      node_pointer m_p_left;
-      node_pointer m_p_right;
-      node_pointer m_p_parent;
-      value_type m_value;
-      bool m_special;
-    };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
deleted file mode 100644
index 602607a..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
+++ /dev/null
@@ -1,281 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/splay_fn_imps.hpp
- * Contains an implementation class for splay_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-splay(node_pointer p_nd)
-{
-  while (p_nd->m_p_parent != base_type::m_p_head)
-    {
-#ifdef _GLIBCXX_DEBUG
-      {
-	node_pointer p_head = base_type::m_p_head;
-	assert_special_imp(p_head, __FILE__, __LINE__);
-      }
-#endif
-
-      PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_nd)
-
-      if (p_nd->m_p_parent->m_p_parent == base_type::m_p_head)
-	{
-	  base_type::rotate_parent(p_nd);
-	  _GLIBCXX_DEBUG_ASSERT(p_nd == this->m_p_head->m_p_parent);
-	}
-      else
-	{
-	  const node_pointer p_parent = p_nd->m_p_parent;
-	  const node_pointer p_grandparent = p_parent->m_p_parent;
-
-#ifdef _GLIBCXX_DEBUG
-	  const size_type total =
-	    base_type::recursive_count(p_grandparent);
-	  _GLIBCXX_DEBUG_ASSERT(total >= 3);
-#endif
-
-	  if (p_parent->m_p_left == p_nd &&
-	      p_grandparent->m_p_right == p_parent)
-	    splay_zig_zag_left(p_nd, p_parent, p_grandparent);
-	  else if (p_parent->m_p_right == p_nd &&
-		   p_grandparent->m_p_left == p_parent)
-	    splay_zig_zag_right(p_nd, p_parent, p_grandparent);
-	  else if (p_parent->m_p_left == p_nd &&
-		   p_grandparent->m_p_left == p_parent)
-	    splay_zig_zig_left(p_nd, p_parent, p_grandparent);
-	  else
-	    splay_zig_zig_right(p_nd, p_parent, p_grandparent);
-	  _GLIBCXX_DEBUG_ASSERT(total ==this->recursive_count(p_nd));
-	}
-
-      PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_nd)
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-splay_zig_zag_left(node_pointer p_nd, node_pointer p_parent,
-		   node_pointer p_grandparent)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_parent == p_nd->m_p_parent);
-  _GLIBCXX_DEBUG_ASSERT(p_grandparent == p_parent->m_p_parent);
-
-  PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_grandparent)
-
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_left == p_nd &&
-			p_grandparent->m_p_right == p_parent);
-
-  splay_zz_start(p_nd, p_parent, p_grandparent);
-
-  node_pointer p_b = p_nd->m_p_right;
-  node_pointer p_c = p_nd->m_p_left;
-
-  p_nd->m_p_right = p_parent;
-  p_parent->m_p_parent = p_nd;
-
-  p_nd->m_p_left = p_grandparent;
-  p_grandparent->m_p_parent = p_nd;
-
-  p_parent->m_p_left = p_b;
-  if (p_b != 0)
-    p_b->m_p_parent = p_parent;
-
-  p_grandparent->m_p_right = p_c;
-  if (p_c != 0)
-    p_c->m_p_parent = p_grandparent;
-
-  splay_zz_end(p_nd, p_parent, p_grandparent);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-splay_zig_zag_right(node_pointer p_nd, node_pointer p_parent,
-		    node_pointer p_grandparent)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_parent == p_nd->m_p_parent);
-  _GLIBCXX_DEBUG_ASSERT(p_grandparent == p_parent->m_p_parent);
-
-  PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_grandparent)
-
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_right == p_nd &&
-	  		p_grandparent->m_p_left == p_parent);
-
-  splay_zz_start(p_nd, p_parent, p_grandparent);
-
-  node_pointer p_b = p_nd->m_p_left;
-  node_pointer p_c = p_nd->m_p_right;
-
-  p_nd->m_p_left = p_parent;
-  p_parent->m_p_parent = p_nd;
-
-  p_nd->m_p_right = p_grandparent;
-  p_grandparent->m_p_parent = p_nd;
-
-  p_parent->m_p_right = p_b;
-  if (p_b != 0)
-    p_b->m_p_parent = p_parent;
-
-  p_grandparent->m_p_left = p_c;
-  if (p_c != 0)
-    p_c->m_p_parent = p_grandparent;
-
-  splay_zz_end(p_nd, p_parent, p_grandparent);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-splay_zig_zig_left(node_pointer p_nd, node_pointer p_parent,
-		   node_pointer p_grandparent)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_parent == p_nd->m_p_parent);
-  _GLIBCXX_DEBUG_ASSERT(p_grandparent == p_parent->m_p_parent);
-
-  PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_grandparent)
-
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_left == p_nd &&
-		     p_nd->m_p_parent->m_p_parent->m_p_left == p_nd->m_p_parent);
-
-  splay_zz_start(p_nd, p_parent, p_grandparent);
-
-  node_pointer p_b = p_nd->m_p_right;
-  node_pointer p_c = p_parent->m_p_right;
-
-  p_nd->m_p_right = p_parent;
-  p_parent->m_p_parent = p_nd;
-
-  p_parent->m_p_right = p_grandparent;
-  p_grandparent->m_p_parent = p_parent;
-
-  p_parent->m_p_left = p_b;
-  if (p_b != 0)
-    p_b->m_p_parent = p_parent;
-
-  p_grandparent->m_p_left = p_c;
-  if (p_c != 0)
-    p_c->m_p_parent = p_grandparent;
-
-  splay_zz_end(p_nd, p_parent, p_grandparent);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-splay_zig_zig_right(node_pointer p_nd, node_pointer p_parent,
-		    node_pointer p_grandparent)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_parent == p_nd->m_p_parent);
-  _GLIBCXX_DEBUG_ASSERT(p_grandparent == p_parent->m_p_parent);
-  PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_grandparent)
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_right == p_nd &&
-		  p_nd->m_p_parent->m_p_parent->m_p_right == p_nd->m_p_parent);
-
-  splay_zz_start(p_nd, p_parent, p_grandparent);
-
-  node_pointer p_b = p_nd->m_p_left;
-  node_pointer p_c = p_parent->m_p_left;
-
-  p_nd->m_p_left = p_parent;
-  p_parent->m_p_parent = p_nd;
-
-  p_parent->m_p_left = p_grandparent;
-  p_grandparent->m_p_parent = p_parent;
-
-  p_parent->m_p_right = p_b;
-  if (p_b != 0)
-    p_b->m_p_parent = p_parent;
-
-  p_grandparent->m_p_right = p_c;
-  if (p_c != 0)
-    p_c->m_p_parent = p_grandparent;
-
-  base_type::update_to_top(p_grandparent, (node_update*)this);
-  splay_zz_end(p_nd, p_parent, p_grandparent);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-splay_zz_start(node_pointer p_nd,
-#ifdef _GLIBCXX_DEBUG
-	       node_pointer p_parent,
-#else
-	       node_pointer /*p_parent*/,
-#endif
-	       node_pointer p_grandparent)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_parent != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_grandparent != 0);
-
-  const bool grandparent_head = p_grandparent->m_p_parent == base_type::m_p_head;
-
-  if (grandparent_head)
-    {
-      base_type::m_p_head->m_p_parent = base_type::m_p_head->m_p_parent;
-      p_nd->m_p_parent = base_type::m_p_head;
-      return;
-    }
-
-  node_pointer p_greatgrandparent = p_grandparent->m_p_parent;
-
-  p_nd->m_p_parent = p_greatgrandparent;
-
-  if (p_grandparent == p_greatgrandparent->m_p_left)
-    p_greatgrandparent->m_p_left = p_nd;
-  else
-    p_greatgrandparent->m_p_right = p_nd;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-splay_zz_end(node_pointer p_nd, node_pointer p_parent,
-	     node_pointer p_grandparent)
-{
-  if (p_nd->m_p_parent == base_type::m_p_head)
-    base_type::m_p_head->m_p_parent = p_nd;
-
-  this->apply_update(p_grandparent, (node_update*)this);
-  this->apply_update(p_parent, (node_update*)this);
-  this->apply_update(p_nd, (node_update*)this);
-  PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_nd)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
deleted file mode 100644
index 8992686..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
+++ /dev/null
@@ -1,275 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/splay_tree_.hpp
- * Contains an implementation class for splay trees.
- */
-/*
- * This implementation uses an idea from the SGI STL (using a @a header node
- *    which is needed for efficient iteration). Following is the SGI STL
- *    copyright.
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.    Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.    It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.    Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.    It is provided "as is" without express or implied warranty.
- *
- *
- */
-
-#include <utility>
-#include <vector>
-#include <assert.h>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-# define PB_DS_S_TREE_NAME splay_tree_map
-# define PB_DS_S_TREE_BASE_NAME bin_search_tree_map
-#endif
-
-#ifdef PB_DS_DATA_FALSE_INDICATOR
-# define PB_DS_S_TREE_NAME splay_tree_set
-# define PB_DS_S_TREE_BASE_NAME bin_search_tree_set
-#endif
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Key, typename Mapped, typename Cmp_Fn, \
-	     typename Node_And_It_Traits, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    PB_DS_S_TREE_NAME<Key, Mapped, Cmp_Fn, Node_And_It_Traits, _Alloc>
-
-#define PB_DS_S_TREE_BASE \
-    PB_DS_S_TREE_BASE_NAME<Key, Mapped, Cmp_Fn, Node_And_It_Traits, _Alloc>
-
-
-    /**
-     *  @brief Splay tree.
-     *  @ingroup branch-detail
-     */
-    template<typename Key, typename Mapped, typename Cmp_Fn,
-	     typename Node_And_It_Traits, typename _Alloc>
-    class PB_DS_S_TREE_NAME : public PB_DS_S_TREE_BASE
-    {
-    private:
-      typedef PB_DS_S_TREE_BASE 		       	 base_type;
-#ifdef _GLIBCXX_DEBUG
-      typedef base_type debug_base;
-#endif
-      typedef typename base_type::node_pointer 		 node_pointer;
-
-    public:
-      typedef splay_tree_tag 				 container_category;
-      typedef _Alloc 					 allocator_type;
-      typedef typename _Alloc::size_type 		 size_type;
-      typedef typename _Alloc::difference_type 		 difference_type;
-      typedef Cmp_Fn 					 cmp_fn;
-      typedef typename base_type::key_type 		 key_type;
-      typedef typename base_type::key_pointer 		 key_pointer;
-      typedef typename base_type::key_const_pointer 	 key_const_pointer;
-      typedef typename base_type::key_reference 	 key_reference;
-      typedef typename base_type::key_const_reference 	 key_const_reference;
-      typedef typename base_type::mapped_type 	 	 mapped_type;
-      typedef typename base_type::mapped_pointer 	 mapped_pointer;
-      typedef typename base_type::mapped_const_pointer 	 mapped_const_pointer;
-      typedef typename base_type::mapped_reference 	 mapped_reference;
-      typedef typename base_type::mapped_const_reference mapped_const_reference;
-      typedef typename base_type::value_type 		 value_type;
-      typedef typename base_type::pointer 		 pointer;
-      typedef typename base_type::const_pointer 	 const_pointer;
-      typedef typename base_type::reference 	 	 reference;
-      typedef typename base_type::const_reference 	 const_reference;
-      typedef typename base_type::point_iterator 	 point_iterator;
-      typedef typename base_type::const_iterator 	 point_const_iterator;
-      typedef typename base_type::iterator 		 iterator;
-      typedef typename base_type::const_iterator 	 const_iterator;
-      typedef typename base_type::reverse_iterator 	 reverse_iterator;
-      typedef typename base_type::const_reverse_iterator const_reverse_iterator;
-      typedef typename base_type::node_update 		 node_update;
-
-      PB_DS_S_TREE_NAME();
-
-      PB_DS_S_TREE_NAME(const Cmp_Fn&);
-
-      PB_DS_S_TREE_NAME(const Cmp_Fn&, const node_update&);
-
-      PB_DS_S_TREE_NAME(const PB_DS_CLASS_C_DEC&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      template<typename It>
-      void
-      copy_from_range(It, It);
-
-      void
-      initialize();
-
-      inline std::pair<point_iterator, bool>
-      insert(const_reference r_value);
-
-      inline mapped_reference
-      operator[](key_const_reference r_key)
-      {
-#ifdef PB_DS_DATA_TRUE_INDICATOR
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	std::pair<point_iterator, bool> ins_pair =
-	  insert_leaf_imp(value_type(r_key, mapped_type()));
-
-	ins_pair.first.m_p_nd->m_special = false;
-	_GLIBCXX_DEBUG_ONLY(base_type::assert_valid(__FILE__, __LINE__));
-	splay(ins_pair.first.m_p_nd);
-	_GLIBCXX_DEBUG_ONLY(assert_valid(__FILE__, __LINE__);)
-	return ins_pair.first.m_p_nd->m_value.second;
-#else
-	insert(r_key);
-	return base_type::s_null_type;
-#endif
-      }
-
-      inline point_iterator
-      find(key_const_reference);
-
-      inline point_const_iterator
-      find(key_const_reference) const;
-
-      inline bool
-      erase(key_const_reference);
-
-      inline iterator
-      erase(iterator it);
-
-      inline reverse_iterator
-      erase(reverse_iterator);
-
-      template<typename Pred>
-      inline size_type
-      erase_if(Pred);
-
-      void
-      join(PB_DS_CLASS_C_DEC&);
-
-      void
-      split(key_const_reference, PB_DS_CLASS_C_DEC&);
-
-    private:
-      inline std::pair<point_iterator, bool>
-      insert_leaf_imp(const_reference);
-
-      inline node_pointer
-      find_imp(key_const_reference);
-
-      inline const node_pointer
-      find_imp(key_const_reference) const;
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char* file, int line) const;
-
-      void
-      assert_special_imp(const node_pointer, const char* file, int line) const;
-#endif
-
-      void
-      splay(node_pointer);
-
-      inline void
-      splay_zig_zag_left(node_pointer, node_pointer, node_pointer);
-
-      inline void
-      splay_zig_zag_right(node_pointer, node_pointer, node_pointer);
-
-      inline void
-      splay_zig_zig_left(node_pointer, node_pointer, node_pointer);
-
-      inline void
-      splay_zig_zig_right(node_pointer, node_pointer, node_pointer);
-
-      inline void
-      splay_zz_start(node_pointer, node_pointer, node_pointer);
-
-      inline void
-      splay_zz_end(node_pointer, node_pointer, node_pointer);
-
-      inline node_pointer
-      leftmost(node_pointer);
-
-      void
-      erase_node(node_pointer);
-    };
-
-#define PB_DS_ASSERT_BASE_NODE_CONSISTENT(_Node)			\
-  _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(_Node,		\
-							__FILE__, __LINE__);)
-
-#include <ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp>
-#include <ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp>
-#include <ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp>
-
-#undef PB_DS_ASSERT_BASE_NODE_CONSISTENT
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_S_TREE_NAME
-#undef PB_DS_S_TREE_BASE_NAME
-#undef PB_DS_S_TREE_BASE
-  } // namespace detail
-} // namespace __gnu_pbds
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
deleted file mode 100644
index c8d3695..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/split_join_fn_imps.hpp
- * Contains an implementation class for splay_tree_.
- */
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-join(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-  if (base_type::join_prep(other) == false)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  node_pointer p_target_r = other.leftmost(other.m_p_head);
-  _GLIBCXX_DEBUG_ASSERT(p_target_r != 0);
-  other.splay(p_target_r);
-
-  _GLIBCXX_DEBUG_ASSERT(p_target_r == other.m_p_head->m_p_parent);
-  _GLIBCXX_DEBUG_ASSERT(p_target_r->m_p_left == 0);
-
-  p_target_r->m_p_left = base_type::m_p_head->m_p_parent;
-
-  _GLIBCXX_DEBUG_ASSERT(p_target_r->m_p_left != 0);
-  p_target_r->m_p_left->m_p_parent = p_target_r;
-
-  base_type::m_p_head->m_p_parent = p_target_r;
-  p_target_r->m_p_parent = base_type::m_p_head;
-
-  this->apply_update(p_target_r, (node_update*)this);
-  base_type::join_finish(other);
-
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-split(key_const_reference r_key, PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  if (base_type::split_prep(r_key, other) == false)
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  node_pointer p_upper_bound = this->upper_bound(r_key).m_p_nd;
-  _GLIBCXX_DEBUG_ASSERT(p_upper_bound != 0);
-
-  splay(p_upper_bound);
-  _GLIBCXX_DEBUG_ASSERT(p_upper_bound->m_p_parent == this->m_p_head);
-
-  node_pointer p_new_root = p_upper_bound->m_p_left;
-  _GLIBCXX_DEBUG_ASSERT(p_new_root != 0);
-
-  base_type::m_p_head->m_p_parent = p_new_root;
-  p_new_root->m_p_parent = base_type::m_p_head;
-  other.m_p_head->m_p_parent = p_upper_bound;
-  p_upper_bound->m_p_parent = other.m_p_head;
-  p_upper_bound->m_p_left = 0;
-  this->apply_update(p_upper_bound, (node_update*)this);
-  base_type::split_finish(other);
-
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/traits.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/traits.hpp
deleted file mode 100644
index 05f1f67..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/splay_tree_/traits.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file splay_tree_/traits.hpp
- * Contains an implementation for splay_tree_.
- */
-
-#ifndef PB_DS_SPLAY_TREE_NODE_AND_IT_TRAITS_HPP
-#define PB_DS_SPLAY_TREE_NODE_AND_IT_TRAITS_HPP
-
-#include <ext/pb_ds/detail/splay_tree_/node.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Specialization.
-    /// @ingroup traits
-    template<typename Key,
-	     typename Mapped,
-	     typename Cmp_Fn,
-	     template<typename Node_CItr,
-		      typename Node_Itr,
-		      typename Cmp_Fn_,
-		      typename _Alloc_>
-	     class Node_Update,
-	     typename _Alloc>
-    struct tree_traits<Key, Mapped, Cmp_Fn, Node_Update, splay_tree_tag, _Alloc> 
-    : public bin_search_tree_traits<Key, Mapped, Cmp_Fn, Node_Update,
-				    splay_tree_node_<
-      typename types_traits<Key, Mapped, _Alloc, false>::value_type,
-      typename tree_node_metadata_dispatch<Key, Mapped, Cmp_Fn, Node_Update,
-					   _Alloc>::type,
-				      _Alloc>,
-				      _Alloc>
-    { };
-
-    /// Specialization.
-    /// @ingroup traits
-    template<typename Key,
-	     class Cmp_Fn,
-	     template<typename Node_CItr,
-		      class Node_Itr,
-		      class Cmp_Fn_,
-		      typename _Alloc_>
-             class Node_Update,
-	     typename _Alloc>
-    struct tree_traits<Key, null_type, Cmp_Fn, Node_Update,
-		       splay_tree_tag, _Alloc> 
-    : public bin_search_tree_traits<Key, null_type, Cmp_Fn, Node_Update, 
-				    splay_tree_node_<
-      typename types_traits<Key, null_type, _Alloc, false>::value_type,
-      typename tree_node_metadata_dispatch<Key, null_type, Cmp_Fn, Node_Update,
-					   _Alloc>::type,
-				      _Alloc>,
-				    _Alloc>
-    { };
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_SPLAY_TREE_NODE_AND_IT_TRAITS_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/standard_policies.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/standard_policies.hpp
deleted file mode 100644
index 531d6cb..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/standard_policies.hpp
+++ /dev/null
@@ -1,158 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file detail/standard_policies.hpp
- * Contains standard policies for containers.
- */
-
-#ifndef PB_DS_STANDARD_POLICIES_HPP
-#define PB_DS_STANDARD_POLICIES_HPP
-
-#include <memory>
-#include <ext/pb_ds/hash_policy.hpp>
-#include <ext/pb_ds/list_update_policy.hpp>
-#include <ext/pb_ds/detail/branch_policy/null_node_metadata.hpp>
-#include <ext/pb_ds/tree_policy.hpp>
-#include <ext/pb_ds/trie_policy.hpp>
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <tr1/functional>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Primary template, default_hash_fn.
-    template<typename Key>
-    struct default_hash_fn
-    {
-	/// Dispatched type.
-      typedef std::tr1::hash<Key> 				type;
-    };
-
-    /// Primary template, default_eq_fn.
-    template<typename Key>
-    struct default_eq_fn
-    {
-	/// Dispatched type.
-      typedef std::equal_to<Key> 				type;
-    };
-
-    /// Enumeration for default behavior of stored hash data.
-    enum
-      {
-	default_store_hash = false
-      };
-
-    /// Primary template, default_comb_hash_fn.
-    struct default_comb_hash_fn
-    {
-	/// Dispatched type.
-      typedef direct_mask_range_hashing<> 			type;
-    };
-
-    /// Primary template, default_resize_policy.
-    template<typename Comb_Hash_Fn>
-    struct default_resize_policy
-    {
-    private:
-      typedef typename Comb_Hash_Fn::size_type 			size_type;
-
-      typedef direct_mask_range_hashing<size_type> 		default_fn;
-      typedef is_same<default_fn, Comb_Hash_Fn> 		same_type;
-      typedef hash_exponential_size_policy<size_type> 		iftrue;
-      typedef hash_prime_size_policy 				iffalse;
-      typedef __conditional_type<same_type::value, iftrue, iffalse> cond_type;
-      typedef typename cond_type::__type 		       size_policy_type;
-
-      typedef hash_load_check_resize_trigger<false, size_type> 	trigger;
-
-    public:
-	/// Dispatched type.
-      typedef hash_standard_resize_policy<size_policy_type, trigger, 
-					  false, size_type> 	type;
-    };
-
-    /// Default update policy.
-    struct default_update_policy
-    {
-	/// Dispatched type.
-      typedef lu_move_to_front_policy<> 			type;
-    };
-
-    /// Primary template, default_probe_fn.
-    template<typename Comb_Probe_Fn>
-    struct default_probe_fn
-    {
-    private:
-      typedef typename Comb_Probe_Fn::size_type 		size_type;
-      typedef direct_mask_range_hashing<size_type> 		default_fn;
-      typedef is_same<default_fn, Comb_Probe_Fn> 		same_type;
-      typedef linear_probe_fn<size_type> 			iftrue;
-      typedef quadratic_probe_fn<size_type> 			iffalse;
-      typedef __conditional_type<same_type::value, iftrue, iffalse> cond_type;
-
-    public:
-	/// Dispatched type.
-      typedef typename cond_type::__type 			type;
-    };
-
-
-    /// Primary template, default_trie_access_traits.
-    template<typename Key>
-      struct default_trie_access_traits;
-
-#define __dtrie_alloc std::allocator<char>  
-#define __dtrie_string std::basic_string<Char, Char_Traits, __dtrie_alloc> 
-
-    /// Partial specialization, default_trie_access_traits.
-    template<typename Char, typename Char_Traits>
-      struct default_trie_access_traits<__dtrie_string>
-      {
-      private:
-	typedef __dtrie_string					string_type;
-
-      public:
-	/// Dispatched type.
-	typedef trie_string_access_traits<string_type> 		type;
-      };
-
-#undef __dtrie_alloc
-#undef __dtrie_string
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_STANDARD_POLICIES_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
deleted file mode 100644
index 9ea563e..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file thin_heap_/constructors_destructor_fn_imps.hpp
- * Contains an implementation for thin_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename It>
-void
-PB_DS_CLASS_C_DEC::
-copy_from_range(It first_it, It last_it)
-{
-  while (first_it != last_it)
-    push(*(first_it++));
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-thin_heap() : m_p_max(0)
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-thin_heap(const Cmp_Fn& r_cmp_fn) 
-: base_type(r_cmp_fn), m_p_max(0)
-{
-  initialize();
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-thin_heap(const PB_DS_CLASS_C_DEC& other) 
-: base_type(other)
-{
-  initialize();
-  m_p_max = base_type::m_p_root;
-  for (node_pointer p_nd = base_type::m_p_root; p_nd != 0; 
-       p_nd = p_nd->m_p_next_sibling)
-    if (Cmp_Fn::operator()(m_p_max->m_value, p_nd->m_value))
-      m_p_max = p_nd;
-
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-swap(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  base_type::swap(other);
-  std::swap(m_p_max, other.m_p_max);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~thin_heap()
-{ }
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-initialize()
-{ std::fill(m_a_aux, m_a_aux + max_rank, static_cast<node_pointer>(0)); }
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
deleted file mode 100644
index ed36f25..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file thin_heap_/debug_fn_imps.hpp
- * Contains an implementation for thin_heap_.
- */
-
-#ifdef _GLIBCXX_DEBUG
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_valid(const char* __file, int __line) const
-{
-  base_type::assert_valid(__file, __line);
-  assert_node_consistent(base_type::m_p_root, true, __file, __line);
-  assert_max(__file, __line);
-  assert_aux_null(__file, __line);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_aux_null(const char* __file, int __line) const
-{
-  for (size_type i = 0; i < max_rank; ++i)
-    PB_DS_DEBUG_VERIFY(m_a_aux[i] == 0);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_max(const char* __file, int __line) const
-{
-  if (m_p_max == 0)
-    {
-      PB_DS_DEBUG_VERIFY(base_type::empty());
-      return;
-    }
-
-  PB_DS_DEBUG_VERIFY(!base_type::empty());
-  PB_DS_DEBUG_VERIFY(base_type::parent(m_p_max) == 0);
-  PB_DS_DEBUG_VERIFY(m_p_max->m_p_prev_or_parent == 0);
-  for (const_iterator it = base_type::begin(); it != base_type::end(); ++it)
-    PB_DS_DEBUG_VERIFY(!Cmp_Fn::operator()(m_p_max->m_value, it.m_p_nd->m_value));
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-assert_node_consistent(node_const_pointer p_nd, bool root,
-		       const char* __file, int __line) const
-{
-  base_type::assert_node_consistent(p_nd, root, __file, __line);
-  if (p_nd == 0)
-    return;
-
-  assert_node_consistent(p_nd->m_p_next_sibling, root, __file, __line);
-  assert_node_consistent(p_nd->m_p_l_child, false, __file, __line);
-  if (!root)
-    {
-      if (p_nd->m_metadata == 0)
-	PB_DS_DEBUG_VERIFY(p_nd->m_p_next_sibling == 0);
-      else
-	PB_DS_DEBUG_VERIFY(p_nd->m_metadata == p_nd->m_p_next_sibling->m_metadata + 1);
-    }
-
-  if (p_nd->m_p_l_child != 0)
-    PB_DS_DEBUG_VERIFY(p_nd->m_p_l_child->m_metadata + 1 == base_type::degree(p_nd));
-
-  const bool unmarked_valid =
-    (p_nd->m_p_l_child == 0 && p_nd->m_metadata == 0)
-    || (p_nd->m_p_l_child != 0
-	 && p_nd->m_metadata == p_nd->m_p_l_child->m_metadata + 1);
-
-  const bool marked_valid =
-    (p_nd->m_p_l_child == 0 && p_nd->m_metadata == 1)
-    || (p_nd->m_p_l_child != 0
-	&& p_nd->m_metadata == p_nd->m_p_l_child->m_metadata + 2);
-
-  PB_DS_DEBUG_VERIFY(unmarked_valid || marked_valid);
-  if (root)
-    PB_DS_DEBUG_VERIFY(unmarked_valid);
-}
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
deleted file mode 100644
index d9a574c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
+++ /dev/null
@@ -1,255 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file thin_heap_/erase_fn_imps.hpp
- * Contains an implementation for thin_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-pop()
-{
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-  _GLIBCXX_DEBUG_ASSERT(m_p_max != 0);
-
-  node_pointer p_nd = m_p_max;
-  remove_max_node();
-  base_type::actual_erase_node(p_nd);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-remove_max_node()
-{
-  to_aux_except_max();
-  make_from_aux();
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-to_aux_except_max()
-{
-  node_pointer p_add = base_type::m_p_root;
-  while (p_add != m_p_max)
-    {
-      node_pointer p_next_add = p_add->m_p_next_sibling;
-      add_to_aux(p_add);
-      p_add = p_next_add;
-    }
-
-  p_add = m_p_max->m_p_l_child;
-  while (p_add != 0)
-    {
-      node_pointer p_next_add = p_add->m_p_next_sibling;
-      p_add->m_metadata = p_add->m_p_l_child == 0 ?
-	0 : p_add->m_p_l_child->m_metadata + 1;
-
-      add_to_aux(p_add);
-      p_add = p_next_add;
-    }
-
-  p_add = m_p_max->m_p_next_sibling;
-  while (p_add != 0)
-    {
-      node_pointer p_next_add = p_add->m_p_next_sibling;
-      add_to_aux(p_add);
-      p_add = p_next_add;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-add_to_aux(node_pointer p_nd)
-{
-  size_type r = p_nd->m_metadata;
-  while (m_a_aux[r] != 0)
-    {
-      _GLIBCXX_DEBUG_ASSERT(p_nd->m_metadata < rank_bound());
-      if (Cmp_Fn::operator()(m_a_aux[r]->m_value, p_nd->m_value))
-	make_child_of(m_a_aux[r], p_nd);
-      else
-	{
-	  make_child_of(p_nd, m_a_aux[r]);
-	  p_nd = m_a_aux[r];
-	}
-
-      m_a_aux[r] = 0;
-      ++r;
-    }
-
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_metadata < rank_bound());
-
-  m_a_aux[r] = p_nd;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-make_child_of(node_pointer p_nd, node_pointer p_new_parent)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_nd->m_metadata == p_new_parent->m_metadata);
-  _GLIBCXX_DEBUG_ASSERT(m_a_aux[p_nd->m_metadata] == p_nd ||
-		   m_a_aux[p_nd->m_metadata] == p_new_parent);
-
-  ++p_new_parent->m_metadata;
-  base_type::make_child_of(p_nd, p_new_parent);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-make_from_aux()
-{
-  base_type::m_p_root = m_p_max = 0;
-  const size_type rnk_bnd = rank_bound();
-  size_type i = 0;
-  while (i < rnk_bnd)
-    {
-      if (m_a_aux[i] != 0)
-	{
-	  make_root_and_link(m_a_aux[i]);
-	  m_a_aux[i] = 0;
-	}
-      ++i;
-    }
-
-  PB_DS_ASSERT_AUX_NULL((*this))
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-remove_node(node_pointer p_nd)
-{
-  node_pointer p_parent = p_nd;
-  while (base_type::parent(p_parent) != 0)
-    p_parent = base_type::parent(p_parent);
-
-  base_type::bubble_to_top(p_nd);
-  m_p_max = p_nd;
-
-  node_pointer p_fix = base_type::m_p_root;
-  while (p_fix != 0&&  p_fix->m_p_next_sibling != p_parent)
-    p_fix = p_fix->m_p_next_sibling;
-
-  if (p_fix != 0)
-    p_fix->m_p_next_sibling = p_nd;
-
-  remove_max_node();
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-clear()
-{
-  base_type::clear();
-  m_p_max = 0;
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-erase(point_iterator it)
-{
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-
-  node_pointer p_nd = it.m_p_nd;
-  remove_node(p_nd);
-  base_type::actual_erase_node(p_nd);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-erase_if(Pred pred)
-{
-  PB_DS_ASSERT_VALID((*this))
-  if (base_type::empty())
-    {
-      PB_DS_ASSERT_VALID((*this))
-      return 0;
-    }
-
-  base_type::to_linked_list();
-  node_pointer p_out = base_type::prune(pred);
-  size_type ersd = 0;
-  while (p_out != 0)
-    {
-      ++ersd;
-      node_pointer p_next = p_out->m_p_next_sibling;
-      base_type::actual_erase_node(p_out);
-      p_out = p_next;
-    }
-
-  node_pointer p_cur = base_type::m_p_root;
-  m_p_max = base_type::m_p_root = 0;
-  while (p_cur != 0)
-    {
-      node_pointer p_next = p_cur->m_p_next_sibling;
-      make_root_and_link(p_cur);
-      p_cur = p_next;
-    }
-
-  PB_DS_ASSERT_VALID((*this))
-  return ersd;
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-rank_bound()
-{
-  using namespace std;
-  const size_t* const p_upper =
-    std::upper_bound(g_a_rank_bounds,
-		     g_a_rank_bounds + num_distinct_rank_bounds,
-		     base_type::m_size);
-
-  if (p_upper == g_a_rank_bounds + num_distinct_rank_bounds)
-    return max_rank;
-
-  return (p_upper - g_a_rank_bounds);
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
deleted file mode 100644
index 51ba28c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file thin_heap_/find_fn_imps.hpp
- * Contains an implementation for thin_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_reference
-PB_DS_CLASS_C_DEC::
-top() const
-{
-  PB_DS_ASSERT_VALID((*this))
-  _GLIBCXX_DEBUG_ASSERT(!base_type::empty());
-
-  _GLIBCXX_DEBUG_ASSERT(m_p_max != 0);
-  return m_p_max->m_value;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
deleted file mode 100644
index 3248bb2..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
+++ /dev/null
@@ -1,280 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file thin_heap_/insert_fn_imps.hpp
- * Contains an implementation for thin_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::point_iterator
-PB_DS_CLASS_C_DEC::
-push(const_reference r_val)
-{
-  PB_DS_ASSERT_VALID((*this))
-  node_pointer p_nd = base_type::get_new_node_for_insert(r_val);
-  p_nd->m_metadata = 0;
-  p_nd->m_p_prev_or_parent = p_nd->m_p_l_child = 0;
-  if (base_type::m_p_root == 0)
-    {
-      p_nd->m_p_next_sibling = 0;
-      m_p_max = base_type::m_p_root = p_nd;
-      PB_DS_ASSERT_VALID((*this))
-      return point_iterator(p_nd);
-    }
-
-  p_nd->m_p_next_sibling = base_type::m_p_root;
-  base_type::m_p_root->m_p_prev_or_parent = 0;
-  base_type::m_p_root = p_nd;
-  update_max(p_nd);
-  PB_DS_ASSERT_VALID((*this))
-  return point_iterator(p_nd);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-make_root(node_pointer p_nd)
-{
-  p_nd->m_metadata = p_nd->m_p_l_child == 0 
-                     ? 0 : 1 + p_nd->m_p_l_child->m_metadata;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-make_root_and_link(node_pointer p_nd)
-{
-  make_root(p_nd);
-  p_nd->m_p_prev_or_parent = 0;
-  p_nd->m_p_next_sibling = base_type::m_p_root;
-  if (base_type::m_p_root != 0)
-    base_type::m_p_root->m_p_prev_or_parent = 0;
-
-  base_type::m_p_root = p_nd;
-  update_max(p_nd);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-fix(node_pointer p_y)
-{
-  while (true)
-    {
-      if (p_y->m_p_prev_or_parent == 0)
-        {
-	  fix_root(p_y);
-	  return;
-        }
-      else if (p_y->m_metadata == 1&&  p_y->m_p_next_sibling == 0)
-        {
-	  if (p_y->m_p_l_child != 0)
-            {
-	      fix_sibling_rank_1_unmarked(p_y);
-	      return;
-            }
-
-	  fix_sibling_rank_1_marked(p_y);
-	  p_y = p_y->m_p_prev_or_parent;
-        }
-      else if (p_y->m_metadata > p_y->m_p_next_sibling->m_metadata + 1)
-        {
-	  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_l_child != 0);
-	  if (p_y->m_metadata != p_y->m_p_l_child->m_metadata + 2)
-            {
-	      fix_sibling_general_unmarked(p_y);
-	      return;
-            }
-
-	  fix_sibling_general_marked(p_y);
-	  p_y = p_y->m_p_prev_or_parent;
-        }
-      else if ((p_y->m_p_l_child == 0&& 
-                p_y->m_metadata == 2) ||(p_y->m_p_l_child != 0&& 
-					 p_y->m_metadata == p_y->m_p_l_child->m_metadata + 3))
-        {
-	  node_pointer p_z = p_y->m_p_prev_or_parent;
-	  fix_child(p_y);
-	  p_y = p_z;
-        }
-      else
-	return;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-fix_root(node_pointer p_y)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent == 0);
-  make_root(p_y);
-  PB_DS_ASSERT_NODE_CONSISTENT(p_y, true)
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-fix_sibling_rank_1_unmarked(node_pointer p_y)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0);
-
-  _GLIBCXX_DEBUG_ONLY(node_pointer p_w = p_y->m_p_l_child;)
-  _GLIBCXX_DEBUG_ASSERT(p_w != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling == 0);
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_next_sibling == 0);
-
-  p_y->m_p_next_sibling = p_y->m_p_l_child;
-  p_y->m_p_next_sibling->m_p_prev_or_parent = p_y;
-  p_y->m_p_l_child = 0;
-  PB_DS_ASSERT_NODE_CONSISTENT(p_y, false)
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-fix_sibling_rank_1_marked(node_pointer p_y)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_l_child == 0);
-  p_y->m_metadata = 0;
-  PB_DS_ASSERT_NODE_CONSISTENT(p_y, false)
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-fix_sibling_general_unmarked(node_pointer p_y)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0);
-
-  node_pointer p_w = p_y->m_p_l_child;
-  _GLIBCXX_DEBUG_ASSERT(p_w != 0);
-  _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling != 0);
-
-  p_y->m_p_l_child = p_w->m_p_next_sibling;
-  p_w->m_p_next_sibling->m_p_prev_or_parent = p_y;
-
-  p_w->m_p_next_sibling = p_y->m_p_next_sibling;
-  _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling != 0);
-  p_w->m_p_next_sibling->m_p_prev_or_parent = p_w;
-
-  p_y->m_p_next_sibling = p_w;
-  p_w->m_p_prev_or_parent = p_y;
-
-  PB_DS_ASSERT_NODE_CONSISTENT(p_y, false)
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-fix_sibling_general_marked(node_pointer p_y)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0);
-  --p_y->m_metadata;
-  PB_DS_ASSERT_NODE_CONSISTENT(p_y, false)
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-fix_child(node_pointer p_y)
-{
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0);
-
-  if (p_y->m_p_next_sibling != 0)
-    p_y->m_p_next_sibling->m_p_prev_or_parent = p_y->m_p_prev_or_parent;
-
-  if (p_y->m_p_prev_or_parent->m_p_l_child == p_y)
-    p_y->m_p_prev_or_parent->m_p_l_child = p_y->m_p_next_sibling;
-  else
-    p_y->m_p_prev_or_parent->m_p_next_sibling = p_y->m_p_next_sibling;
-
-  make_root_and_link(p_y);
-}
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-modify(point_iterator it, const_reference r_new_val)
-{
-  PB_DS_ASSERT_VALID((*this))
-  node_pointer p_nd = it.m_p_nd;
-  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
-
-  const bool smaller = Cmp_Fn::operator()(r_new_val, p_nd->m_value);
-  p_nd->m_value = r_new_val;
-  if (smaller)
-    {
-      remove_node(p_nd);
-      p_nd->m_p_l_child = 0;
-      make_root_and_link(p_nd);
-      PB_DS_ASSERT_VALID((*this))
-      return;
-    }
-
-  if (p_nd->m_p_prev_or_parent == 0)
-    {
-      update_max(p_nd);
-      PB_DS_ASSERT_VALID((*this))
-      return;
-    }
-
-  node_pointer p_y = p_nd->m_p_prev_or_parent;
-  _GLIBCXX_DEBUG_ASSERT(p_y != 0);
-
-  if (p_nd->m_p_next_sibling != 0)
-    p_nd->m_p_next_sibling->m_p_prev_or_parent = p_y;
-
-  if (p_y->m_p_l_child == p_nd)
-    p_y->m_p_l_child = p_nd->m_p_next_sibling;
-  else
-    p_y->m_p_next_sibling = p_nd->m_p_next_sibling;
-
-  fix(p_y);
-  make_root_and_link(p_nd);
-  PB_DS_ASSERT_VALID((*this))
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-update_max(node_pointer p_nd)
-{
-  if (m_p_max == 0 || Cmp_Fn::operator()(m_p_max->m_value, p_nd->m_value))
-    m_p_max = p_nd;
-}
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
deleted file mode 100644
index 4992908..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file thin_heap_/split_join_fn_imps.hpp
- * Contains an implementation for thin_heap_.
- */
-
-PB_DS_CLASS_T_DEC
-template<typename Pred>
-void
-PB_DS_CLASS_C_DEC::
-split(Pred pred, PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  other.clear();
-  if (base_type::empty())
-    {
-      PB_DS_ASSERT_VALID((*this))
-      PB_DS_ASSERT_VALID(other)
-      return;
-    }
-
-  base_type::to_linked_list();
-  node_pointer p_out = base_type::prune(pred);
-
-  while (p_out != 0)
-    {
-      _GLIBCXX_DEBUG_ASSERT(base_type::m_size > 0);
-      --base_type::m_size;
-      ++other.m_size;
-      node_pointer p_next = p_out->m_p_next_sibling;
-      other.make_root_and_link(p_out);
-      p_out = p_next;
-    }
-
-  PB_DS_ASSERT_VALID(other)
-  node_pointer p_cur = base_type::m_p_root;
-  m_p_max = 0;
-  base_type::m_p_root = 0;
-  while (p_cur != 0)
-    {
-      node_pointer p_next = p_cur->m_p_next_sibling;
-      make_root_and_link(p_cur);
-      p_cur = p_next;
-    }
-
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-join(PB_DS_CLASS_C_DEC& other)
-{
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-
-  node_pointer p_other = other.m_p_root;
-  while (p_other != 0)
-    {
-      node_pointer p_next = p_other->m_p_next_sibling;
-      make_root_and_link(p_other);
-      p_other = p_next;
-    }
-  base_type::m_size += other.m_size;
-  other.m_p_root = 0;
-  other.m_size = 0;
-  other.m_p_max = 0;
-
-  PB_DS_ASSERT_VALID((*this))
-  PB_DS_ASSERT_VALID(other)
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
deleted file mode 100644
index b03d7a3..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
+++ /dev/null
@@ -1,324 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file thin_heap_/thin_heap_.hpp
- * Contains an implementation class for a thin heap.
- */
-
-#ifndef PB_DS_THIN_HEAP_HPP
-#define PB_DS_THIN_HEAP_HPP
-
-#include <algorithm>
-#include <ext/pb_ds/detail/cond_dealtor.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp>
-#include <debug/debug.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#define PB_DS_CLASS_T_DEC \
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    thin_heap<Value_Type, Cmp_Fn, _Alloc>
-
-#ifdef _GLIBCXX_DEBUG
-#define PB_DS_BASE_T_P \
-    <Value_Type, Cmp_Fn, typename _Alloc::size_type, _Alloc, true>
-#else
-#define PB_DS_BASE_T_P \
-    <Value_Type, Cmp_Fn, typename _Alloc::size_type, _Alloc>
-#endif
-
-
-    /**
-     *  Thin heap.
-     *
-     *  @ingroup heap-detail
-     *
-     *  See Tarjan and Kaplan.
-     */
-    template<typename Value_Type, typename Cmp_Fn, typename _Alloc>
-    class thin_heap
-    : public left_child_next_sibling_heap PB_DS_BASE_T_P
-    {
-    private:
-      typedef typename _Alloc::template rebind<Value_Type>::other __rebind_a;
-      typedef left_child_next_sibling_heap PB_DS_BASE_T_P base_type;
-
-    protected:
-      typedef typename base_type::node 			node;
-      typedef typename base_type::node_pointer 		node_pointer;
-      typedef typename base_type::node_const_pointer 	node_const_pointer;
-
-    public:
-      typedef Value_Type 				value_type;
-      typedef Cmp_Fn 					cmp_fn;
-      typedef _Alloc 					allocator_type;
-      typedef typename _Alloc::size_type 		size_type;
-      typedef typename _Alloc::difference_type 		difference_type;
-
-      typedef typename __rebind_a::pointer		pointer;
-      typedef typename __rebind_a::const_pointer	const_pointer;
-      typedef typename __rebind_a::reference		reference;
-      typedef typename __rebind_a::const_reference     	const_reference;
-
-      typedef typename base_type::point_iterator 	point_iterator;
-      typedef typename base_type::point_const_iterator 	point_const_iterator;
-      typedef typename base_type::iterator 		iterator;
-      typedef typename base_type::const_iterator 	const_iterator;
-
-
-      inline point_iterator
-      push(const_reference);
-
-      void
-      modify(point_iterator, const_reference);
-
-      inline const_reference
-      top() const;
-
-      void
-      pop();
-
-      void
-      erase(point_iterator);
-
-      inline void
-      clear();
-
-      template<typename Pred>
-      size_type
-      erase_if(Pred);
-
-      template<typename Pred>
-      void
-      split(Pred, PB_DS_CLASS_C_DEC&);
-
-      void
-      join(PB_DS_CLASS_C_DEC&);
-
-    protected:
-      thin_heap();
-
-      thin_heap(const Cmp_Fn&);
-
-      thin_heap(const PB_DS_CLASS_C_DEC&);
-
-      void
-      swap(PB_DS_CLASS_C_DEC&);
-
-      ~thin_heap();
-
-      template<typename It>
-      void
-      copy_from_range(It, It);
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_valid(const char*, int) const;
-
-      void
-      assert_max(const char*, int) const;
-#endif
-
-#ifdef PB_DS_THIN_HEAP_TRACE_
-      void
-      trace() const;
-#endif
-
-    private:
-      enum
-	{
-	  max_rank = (sizeof(size_type) << 4) + 2
-	};
-
-      void
-      initialize();
-
-      inline void
-      update_max(node_pointer);
-
-      inline void
-      fix(node_pointer);
-
-      inline void
-      fix_root(node_pointer);
-
-      inline void
-      fix_sibling_rank_1_unmarked(node_pointer);
-
-      inline void
-      fix_sibling_rank_1_marked(node_pointer);
-
-      inline void
-      fix_sibling_general_unmarked(node_pointer);
-
-      inline void
-      fix_sibling_general_marked(node_pointer);
-
-      inline void
-      fix_child(node_pointer);
-
-      inline static void
-      make_root(node_pointer);
-
-      inline void
-      make_root_and_link(node_pointer);
-
-      inline void
-      remove_max_node();
-
-      void
-      to_aux_except_max();
-
-      inline void
-      add_to_aux(node_pointer);
-
-      inline void
-      make_from_aux();
-
-      inline size_type
-      rank_bound();
-
-      inline void
-      make_child_of(node_pointer, node_pointer);
-
-      inline void
-      remove_node(node_pointer);
-
-      inline node_pointer
-      join(node_pointer, node_pointer) const;
-
-#ifdef _GLIBCXX_DEBUG
-      void
-      assert_node_consistent(node_const_pointer, bool, const char*, int) const;
-
-      void
-      assert_aux_null(const char*, int) const;
-#endif
-
-      node_pointer 	m_p_max;
-      node_pointer 	m_a_aux[max_rank];
-    };
-
-    enum
-      {
-	num_distinct_rank_bounds = 48
-      };
-
-    // Taken from the SGI implementation; acknowledged in the docs.
-    static const std::size_t g_a_rank_bounds[num_distinct_rank_bounds] =
-      {
-	/* Dealing cards... */
-	/* 0     */ 0ul,
-	/* 1     */ 1ul,
-	/* 2     */ 1ul,
-	/* 3     */ 2ul,
-	/* 4     */ 4ul,
-	/* 5     */ 6ul,
-	/* 6     */ 11ul,
-	/* 7     */ 17ul,
-	/* 8     */ 29ul,
-	/* 9     */ 46ul,
-	/* 10    */ 76ul,
-	/* 11    */ 122ul,
-	/* 12    */ 199ul,
-	/* 13    */ 321ul,
-	/* 14    */ 521ul,
-	/* 15    */ 842ul,
-	/* 16    */ 1364ul,
-	/* 17    */ 2206ul,
-	/* 18    */ 3571ul,
-	/* 19    */ 5777ul,
-	/* 20    */ 9349ul,
-	/* 21    */ 15126ul,
-	/* 22    */ 24476ul,
-	/* 23    */ 39602ul,
-	/* 24    */ 64079ul,
-	/* 25    */ 103681ul,
-	/* 26    */ 167761ul,
-	/* 27    */ 271442ul,
-	/* 28    */ 439204ul,
-	/* 29    */ 710646ul,
-	/* 30    */ 1149851ul,
-	/* 31    */ 1860497ul,
-	/* 32    */ 3010349ul,
-	/* 33    */ 4870846ul,
-	/* 34    */ 7881196ul,
-	/* 35    */ 12752042ul,
-	/* 36    */ 20633239ul,
-	/* 37    */ 33385282ul,
-	/* 38    */ 54018521ul,
-	/* 39    */ 87403803ul,
-	/* 40    */ 141422324ul,
-	/* 41    */ 228826127ul,
-	/* 42    */ 370248451ul,
-	/* 43    */ 599074578ul,
-	/* 44    */ 969323029ul,
-	/* 45    */ 1568397607ul,
-	/* 46    */ 2537720636ul,
-	/* 47    */ 4106118243ul
-	/* Pot's good, let's play */
-      };
-
-#define PB_DS_ASSERT_NODE_CONSISTENT(_Node, _Bool)			\
-  _GLIBCXX_DEBUG_ONLY(assert_node_consistent(_Node, _Bool,		\
-					     __FILE__, __LINE__);)
-
-#define PB_DS_ASSERT_AUX_NULL(X)					\
-  _GLIBCXX_DEBUG_ONLY(X.assert_aux_null(__FILE__, __LINE__);)
-
-#include <ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp>
-#include <ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp>
-#include <ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp>
-#include <ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp>
-#include <ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp>
-#include <ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp>
-#include <ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp>
-
-#undef PB_DS_ASSERT_AUX_NULL
-#undef PB_DS_ASSERT_NODE_CONSISTENT
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_BASE_T_P
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
deleted file mode 100644
index c73310d..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file thin_heap_/trace_fn_imps.hpp
- * Contains an implementation class for left_child_next_sibling_heap_.
- */
-
-#ifdef PB_DS_THIN_HEAP_TRACE_
-
-PB_DS_CLASS_T_DEC
-void
-PB_DS_CLASS_C_DEC::
-trace() const
-{
-  std::cerr << std::endl;
-  std::cerr << "m_p_max " << m_p_max << std::endl;
-  base_type::trace();
-}
-
-#endif // #ifdef PB_DS_THIN_HEAP_TRACE_
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
deleted file mode 100644
index 0268e38..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file tree_policy/node_metadata_selector.hpp
- * Contains an implementation class for trees.
- */
-
-#ifndef PB_DS_TREE_NODE_METADATA_DISPATCH_HPP
-#define PB_DS_TREE_NODE_METADATA_DISPATCH_HPP
-
-#include <ext/pb_ds/detail/branch_policy/null_node_metadata.hpp>
-#include <ext/pb_ds/detail/types_traits.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /**
-     *  @addtogroup traits Traits
-     *  @{
-     */
-
-    /// Tree metadata helper.
-    template<typename Node_Update, bool _BTp>
-      struct tree_metadata_helper;
-
-    /// Specialization, false.
-    template<typename Node_Update>
-      struct tree_metadata_helper<Node_Update, false>
-      {
-	typedef typename Node_Update::metadata_type 	type;
-      };
-
-    /// Specialization, true.
-    template<typename Node_Update>
-      struct tree_metadata_helper<Node_Update, true>
-      {
-	typedef null_type 				type;
-      };
-
-    /// Tree node metadata dispatch.
-    template<typename Key,
-	     typename Data,
-	     typename Cmp_Fn,
-	     template<typename Node_CItr,
-		      typename Const_Iterator,
-		      typename Cmp_Fn_,
-		      typename _Alloc_>
-	     class Node_Update,
-	     typename _Alloc>
-    struct tree_node_metadata_dispatch
-    {
-    private:
-      typedef dumnode_const_iterator<Key, Data, _Alloc>		__it_type;
-      typedef Node_Update<__it_type, __it_type, Cmp_Fn, _Alloc>	__node_u;
-      typedef null_node_update<__it_type, __it_type, Cmp_Fn, _Alloc> __nnode_u;
-
-      enum
-	{
-	  null_update = is_same<__node_u, __nnode_u>::value
-	};
-
-    public:
-      typedef typename tree_metadata_helper<__node_u, null_update>::type type;
-    };
-    //@}
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_TREE_NODE_METADATA_DISPATCH_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
deleted file mode 100644
index a35c519..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file tree_policy/order_statistics_imp.hpp
- * Contains forward declarations for order_statistics_key
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-find_by_order(size_type order)
-{
-  node_iterator it = node_begin();
-  node_iterator end_it = node_end();
-
-  while (it != end_it)
-    {
-      node_iterator l_it = it.get_l_child();
-      const size_type o = (l_it == end_it)? 0 : l_it.get_metadata();
-
-      if (order == o)
-	return *it;
-      else if (order < o)
-	it = l_it;
-      else
-        {
-	  order -= o + 1;
-	  it = it.get_r_child();
-        }
-    }
-
-  return base_type::end_iterator();
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-find_by_order(size_type order) const
-{ return const_cast<PB_DS_CLASS_C_DEC*>(this)->find_by_order(order); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-order_of_key(key_const_reference r_key) const
-{
-  node_const_iterator it = node_begin();
-  node_const_iterator end_it = node_end();
-
-  const cmp_fn& r_cmp_fn = const_cast<PB_DS_CLASS_C_DEC*>(this)->get_cmp_fn();
-  size_type ord = 0;
-  while (it != end_it)
-    {
-      node_const_iterator l_it = it.get_l_child();
-
-      if (r_cmp_fn(r_key, this->extract_key(*(*it))))
-	it = l_it;
-      else if (r_cmp_fn(this->extract_key(*(*it)), r_key))
-        {
-	  ord += (l_it == end_it)? 1 : 1 + l_it.get_metadata();
-	  it = it.get_r_child();
-        }
-      else
-        {
-	  ord += (l_it == end_it)? 0 : l_it.get_metadata();
-	  it = end_it;
-        }
-    }
-  return ord;
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-operator()(node_iterator node_it, node_const_iterator end_nd_it) const
-{
-  node_iterator l_it = node_it.get_l_child();
-  const size_type l_rank = (l_it == end_nd_it) ? 0 : l_it.get_metadata();
-
-  node_iterator r_it = node_it.get_r_child();
-  const size_type r_rank = (r_it == end_nd_it) ? 0 : r_it.get_metadata();
-
-  const_cast<metadata_reference>(node_it.get_metadata())= 1 + l_rank + r_rank;
-}
-
-PB_DS_CLASS_T_DEC
-PB_DS_CLASS_C_DEC::
-~tree_order_statistics_node_update()
-{ }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
deleted file mode 100644
index 23bfe7c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file tree_policy/sample_tree_node_update.hpp
- * Contains a samle node update functor.
- */
-
-#ifndef PB_DS_SAMPLE_TREE_NODE_UPDATOR_HPP
-#define PB_DS_SAMPLE_TREE_NODE_UPDATOR_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample node updator.
-  template<typename Const_Node_Iter, typename Node_Iter, typename Cmp_Fn,
-	   typename _Alloc>
-  class sample_tree_node_update
-  {
-    typedef std::size_t metadata_type;
-
-    /// Default constructor.
-    sample_tree_node_update();
-
-    /// Updates the rank of a node through a node_iterator node_it;
-    /// end_nd_it is the end node iterator.
-    inline void
-    operator()(node_iterator node_it, node_const_iterator end_nd_it) const;
-  };
-}
-#endif // #ifndef PB_DS_SAMPLE_TREE_NODE_UPDATOR_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_trace_base.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_trace_base.hpp
deleted file mode 100644
index 46bc7a1..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/tree_trace_base.hpp
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file detail/tree_trace_base.hpp
- * Contains tree-related policies.
- */
-
-#ifndef PB_DS_TREE_TRACE_BASE_HPP
-#define PB_DS_TREE_TRACE_BASE_HPP
-
-#ifdef PB_DS_TREE_TRACE
-
-#include <ext/pb_ds/detail/branch_policy/branch_policy.hpp>
-#include <ext/pb_ds/detail/branch_policy/null_node_metadata.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-#ifdef PB_DS_TREE_TRACE
-
-#define PB_DS_CLASS_T_DEC						\
-    template<typename Node_CItr, typename Node_Itr,	\
-	     typename Cmp_Fn, bool Node_Based, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC						\
-    tree_trace_base<Node_CItr, Node_Itr, Cmp_Fn,         \
-		    Node_Based, _Alloc>
-
-#define PB_DS_TRACE_BASE \
-    branch_policy<Node_CItr, Node_Itr, _Alloc>
-
-    /// Tracing base class.
-    template<typename Node_CItr, typename Node_Itr,
-	     typename Cmp_Fn, bool Node_Based, typename _Alloc>
-    class tree_trace_base : private PB_DS_TRACE_BASE
-    {
-    public:
-      void
-      trace() const;
-
-    private:
-      typedef PB_DS_TRACE_BASE 			base_type;
-      typedef Node_CItr 		node_const_iterator;
-      typedef typename _Alloc::size_type 	size_type;
-
-      void
-      trace_node(node_const_iterator, size_type) const;
-
-      virtual bool
-      empty() const = 0;
-
-      virtual node_const_iterator
-      node_begin() const = 0;
-
-      virtual node_const_iterator
-      node_end() const = 0;
-
-      static void
-      print_node_pointer(Node_CItr, integral_constant<int,true>);
-
-      static void
-      print_node_pointer(Node_CItr, integral_constant<int,false>);
-
-      template<typename Metadata_>
-      static void
-      trace_it_metadata(Node_CItr, type_to_type<Metadata_>);
-
-      static void
-      trace_it_metadata(Node_CItr, type_to_type<null_type>);
-    };
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    trace() const
-    {
-      if (empty())
-	return;
-      trace_node(node_begin(), 0);
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    trace_node(node_const_iterator nd_it, size_type level) const
-    {
-      if (nd_it.get_r_child() != node_end())
-	trace_node(nd_it.get_r_child(), level + 1);
-
-      for (size_type i = 0; i < level; ++i)
-	std::cerr << ' ';
-
-      print_node_pointer(nd_it, integral_constant<int,Node_Based>());
-      std::cerr << base_type::extract_key(*(*nd_it));
-
-      typedef type_to_type<typename node_const_iterator::metadata_type>
-	m_type_ind_t;
-
-      trace_it_metadata(nd_it, m_type_ind_t());
-
-      std::cerr << std::endl;
-
-      if (nd_it.get_l_child() != node_end())
-	trace_node(nd_it.get_l_child(), level + 1);
-    }
-
-    PB_DS_CLASS_T_DEC
-    template<typename Metadata_>
-    void
-    PB_DS_CLASS_C_DEC::
-    trace_it_metadata(Node_CItr nd_it, type_to_type<Metadata_>)
-    {
-      const unsigned long ul = static_cast<unsigned long>(nd_it.get_metadata());
-      std::cerr << " (" << ul << ") ";
-    }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    trace_it_metadata(Node_CItr, type_to_type<null_type>)
-    { }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    print_node_pointer(Node_CItr nd_it, integral_constant<int,true>)
-    { std::cerr << nd_it.m_p_nd << " "; }
-
-    PB_DS_CLASS_T_DEC
-    void
-    PB_DS_CLASS_C_DEC::
-    print_node_pointer(Node_CItr nd_it, integral_constant<int,false>)
-    { std::cerr << *nd_it << " "; }
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_TRACE_BASE
-#endif // #ifdef    PB_DS_TREE_TRACE
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifdef PB_DS_TREE_TRACE
-
-#endif // #ifndef PB_DS_TREE_TRACE_BASE_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
deleted file mode 100644
index 2b803a1..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file trie_policy/node_metadata_selector.hpp
- * Contains an implementation class for tries.
- */
-
-#ifndef PB_DS_TRIE_NODE_METADATA_DISPATCH_HPP
-#define PB_DS_TRIE_NODE_METADATA_DISPATCH_HPP
-
-#include <ext/pb_ds/detail/branch_policy/null_node_metadata.hpp>
-#include <ext/pb_ds/detail/types_traits.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /**
-     *  @addtogroup traits Traits
-     *  @{
-     */
-
-    /// Trie metadata helper.
-    template<typename Node_Update, bool _BTp>
-      struct trie_metadata_helper;
-
-    /// Specialization, false.
-    template<typename Node_Update>
-      struct trie_metadata_helper<Node_Update, false>
-      {
-	typedef typename Node_Update::metadata_type 	type;
-      };
-
-    /// Specialization, true.
-    template<typename Node_Update>
-      struct trie_metadata_helper<Node_Update, true>
-      {
-	typedef null_type 				type;
-      };
-
-    /// Trie node metadata dispatch.
-    template<typename Key,
-	     typename Data,
-	     typename Cmp_Fn,
-	     template<typename Node_CItr,
-		      typename Const_Iterator,
-		      typename Cmp_Fn_,
-		      typename _Alloc_>
-	     class Node_Update,
-	     typename _Alloc>
-    struct trie_node_metadata_dispatch
-    {
-    private:
-      typedef dumnode_const_iterator<Key, Data, _Alloc>		__it_type;
-      typedef Node_Update<__it_type, __it_type, Cmp_Fn, _Alloc>	__node_u;
-      typedef null_node_update<__it_type, __it_type, Cmp_Fn, _Alloc> __nnode_u;
-
-      enum
-	{
-	  null_update = is_same<__node_u, __nnode_u>::value
-	};
-
-    public:
-      typedef typename trie_metadata_helper<__node_u, null_update>::type type;
-    };
-    //@}
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_TRIE_NODE_METADATA_DISPATCH_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
deleted file mode 100644
index fdc1ae2..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file trie_policy/order_statistics_imp.hpp
- * Contains forward declarations for order_statistics_key
- */
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::iterator
-PB_DS_CLASS_C_DEC::
-find_by_order(size_type order)
-{
-  if (empty())
-    return end();
-
-  ++order;
-  node_iterator nd_it = node_begin();
-
-  while (true)
-    {
-      if (order > nd_it.get_metadata())
-	return ++base_type::rightmost_it(nd_it);
-
-      const size_type num_children = nd_it.num_children();
-      if (num_children == 0)
-	return *nd_it;
-
-      for (size_type i = 0; i < num_children; ++i)
-	{
-	  node_iterator child_nd_it = nd_it.get_child(i);
-	  if (order <= child_nd_it.get_metadata())
-	    {
-	      i = num_children;
-	      nd_it = child_nd_it;
-	    }
-	  else
-	    order -= child_nd_it.get_metadata();
-	}
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-find_by_order(size_type order) const
-{ return const_cast<PB_DS_CLASS_C_DEC*>(this)->find_by_order(order); }
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-order_of_key(key_const_reference r_key) const
-{
-  const _ATraits& r_traits =
-    const_cast<PB_DS_CLASS_C_DEC* >(this)->get_access_traits();
-
-  return order_of_prefix(r_traits.begin(r_key), r_traits.end(r_key));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-order_of_prefix(typename access_traits::const_iterator b,
-		typename access_traits::const_iterator e) const
-{
-  if (empty())
-    return 0;
-
-  const _ATraits& r_traits =
-    const_cast<PB_DS_CLASS_C_DEC*>(this)->get_access_traits();
-
-  node_const_iterator nd_it = node_begin();
-  node_const_iterator end_nd_it = node_end();
-  size_type ord = 0;
-
-  while (true)
-    {
-      const size_type num_children = nd_it.num_children();
-      if (num_children == 0)
-	{
-	  key_const_reference r_key = base_type::extract_key(*(*nd_it));
-	  typename access_traits::const_iterator key_b =
-	    r_traits.begin(r_key);
-
-	  typename access_traits::const_iterator key_e =
-	    r_traits.end(r_key);
-
-	  return (base_type::less(key_b, key_e,  b, e,  r_traits)) ?
-		  ord + 1 : ord;
-	}
-
-      node_const_iterator next_nd_it = end_nd_it;
-      size_type i = num_children - 1;
-
-      do
-	{
-	  node_const_iterator child_nd_it = nd_it.get_child(i);
-
-	  if (next_nd_it != end_nd_it)
-	    ord += child_nd_it.get_metadata();
-	  else if (!base_type::less(b, e,
-				    child_nd_it.valid_prefix().first,
-				    child_nd_it.valid_prefix().second,
-				    r_traits))
-	    next_nd_it = child_nd_it;
-	}
-      while (i-- > 0);
-
-      if (next_nd_it == end_nd_it)
-	return ord;
-
-      nd_it = next_nd_it;
-    }
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-operator()(node_iterator nd_it, node_const_iterator /*end_nd_it*/) const
-{
-  const size_type num_children = nd_it.num_children();
-  size_type children_rank = 0;
-  for (size_type i = 0; i < num_children; ++i)
-    children_rank += nd_it.get_child(i).get_metadata();
-
-  const size_type res = (num_children == 0) ? 1 : children_rank;
-  const_cast<size_type&>(nd_it.get_metadata()) = res;
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
deleted file mode 100644
index eb0b2d4..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file trie_policy/prefix_search_node_update_imp.hpp
- * Contains an implementation of prefix_search_node_update.
- */
-
-PB_DS_CLASS_T_DEC
-std::pair<
-  typename PB_DS_CLASS_C_DEC::const_iterator,
-  typename PB_DS_CLASS_C_DEC::const_iterator>
-PB_DS_CLASS_C_DEC::
-prefix_range(key_const_reference r_key) const
-{
-  const access_traits& r_traits = get_access_traits();
-  return (prefix_range(r_traits.begin(r_key), r_traits.end(r_key)));
-}
-
-PB_DS_CLASS_T_DEC
-std::pair<
-  typename PB_DS_CLASS_C_DEC::iterator,
-  typename PB_DS_CLASS_C_DEC::iterator>
-PB_DS_CLASS_C_DEC::
-prefix_range(key_const_reference r_key)
-{
-  return (prefix_range(get_access_traits().begin(r_key),
-		       get_access_traits().end(r_key)));
-}
-
-PB_DS_CLASS_T_DEC
-std::pair<
-  typename PB_DS_CLASS_C_DEC::const_iterator,
-  typename PB_DS_CLASS_C_DEC::const_iterator>
-PB_DS_CLASS_C_DEC::
-prefix_range(typename access_traits::const_iterator b,
-	     typename access_traits::const_iterator e) const
-{
-  const std::pair<iterator, iterator> non_const_ret =
-    const_cast<PB_DS_CLASS_C_DEC* >(this)->prefix_range(b, e);
-
-  return (std::make_pair(const_iterator(non_const_ret.first),
-			 const_iterator(non_const_ret.second)));
-}
-
-PB_DS_CLASS_T_DEC
-std::pair<
-  typename PB_DS_CLASS_C_DEC::iterator,
-  typename PB_DS_CLASS_C_DEC::iterator>
-PB_DS_CLASS_C_DEC::
-prefix_range(typename access_traits::const_iterator b,
-	     typename access_traits::const_iterator e)
-{
-  Node_Itr nd_it = node_begin();
-  Node_Itr end_nd_it = node_end();
-
-  const access_traits& r_traits = get_access_traits();
-  const size_type given_range_length = std::distance(b, e);
-
-  while (true)
-    {
-      if (nd_it == end_nd_it)
-	return (std::make_pair(end(), end()));
-
-      const size_type common_range_length =
-	base_type::common_prefix_len(nd_it, b, e, r_traits);
-
-      if (common_range_length >= given_range_length)
-	{
-	  iterator ret_b = this->leftmost_it(nd_it);
-	  iterator ret_e = this->rightmost_it(nd_it);
-	  return (std::make_pair(ret_b, ++ret_e));
-	}
-      nd_it = next_child(nd_it, b, e, end_nd_it, r_traits);
-    }
-}
-
-PB_DS_CLASS_T_DEC
-typename PB_DS_CLASS_C_DEC::node_iterator
-PB_DS_CLASS_C_DEC::
-next_child(node_iterator nd_it, typename access_traits::const_iterator b,
-	   typename access_traits::const_iterator e, node_iterator end_nd_it,
-	   const access_traits& r_traits)
-{
-  const size_type num_children = nd_it.num_children();
-  node_iterator ret = end_nd_it;
-  size_type max_length = 0;
-  for (size_type i = 0; i < num_children; ++i)
-    {
-      node_iterator pot = nd_it.get_child(i);
-      const size_type common_range_length =
-	base_type::common_prefix_len(pot, b, e, r_traits);
-
-      if (common_range_length > max_length)
-	{
-	  ret = pot;
-	  max_length = common_range_length;
-	}
-    }
-  return (ret);
-}
-
-PB_DS_CLASS_T_DEC
-inline void
-PB_DS_CLASS_C_DEC::
-operator()(node_iterator /*nd_it*/, node_const_iterator /*end_nd_it*/) const
-{ }
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/sample_trie_access_traits.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/sample_trie_access_traits.hpp
deleted file mode 100644
index f7d5935..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/sample_trie_access_traits.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file trie_policy/sample_trie_access_traits.hpp
- * Contains a sample probe policy.
- */
-
-#ifndef PB_DS_SAMPLE_TRIE_E_ACCESS_TRAITS_HPP
-#define PB_DS_SAMPLE_TRIE_E_ACCESS_TRAITS_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample trie element access traits.
-  struct sample_trie_access_traits
-  {
-    typedef std::size_t 		       		size_type;
-    typedef std::string 			       	key_type;
-
-    typedef typename _Alloc::template rebind<key_type>	__rebind_k;
-    typedef typename __rebind_k::other::const_reference	key_const_reference;
-    typedef std::string::const_iterator 		const_iterator;
-
-    /// Element type.
-    typedef char 				       	e_type;
-
-    enum
-      {
-	max_size = 4
-      };
-
-    /// Returns a const_iterator to the first element of r_key.
-    inline static const_iterator
-    begin(key_const_reference);
-
-    /// Returns a const_iterator to the after-last element of r_key.
-    inline static const_iterator
-    end(key_const_reference);
-
-    /// Maps an element to a position.
-    inline static size_type
-    e_pos(e_type);
-  };
-}
-#endif // #ifndef PB_DS_SAMPLE_TRIE_E_ACCESS_TRAITS_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
deleted file mode 100644
index e3bde56..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file trie_policy/sample_trie_node_update.hpp
- * Contains a samle node update functor.
- */
-
-#ifndef PB_DS_SAMPLE_TRIE_NODE_UPDATOR_HPP
-#define PB_DS_SAMPLE_TRIE_NODE_UPDATOR_HPP
-
-namespace __gnu_pbds
-{
-  /// A sample node updator.
-  template<typename Node_CItr, typename Node_Itr,
-	   typename _ATraits, typename _Alloc>
-  class sample_trie_node_update
-  {
-  public:
-    typedef std::size_t 		metadata_type;
-
-  protected:
-    /// Default constructor.
-    sample_trie_node_update();
-
-    /// Updates the rank of a node through a node_iterator node_it;
-    /// end_nd_it is the end node iterator.
-    inline void
-    operator()(node_iterator, node_const_iterator) const;
-  };
-}
-#endif // #ifndef PB_DS_SAMPLE_TRIE_NODE_UPDATOR_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
deleted file mode 100644
index 215be5d..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
+++ /dev/null
@@ -1,207 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file trie_policy/trie_policy_base.hpp
- * Contains an implementation of trie_policy_base.
- */
-
-#ifndef PB_DS_TRIE_POLICY_BASE_HPP
-#define PB_DS_TRIE_POLICY_BASE_HPP
-
-#include <ext/pb_ds/detail/branch_policy/branch_policy.hpp>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /// Base class for trie policies.
-    template<typename Node_CItr, typename Node_Itr,
-	     typename _ATraits, typename _Alloc>
-    class trie_policy_base
-    : public branch_policy<Node_CItr, Node_Itr, _Alloc>
-    {
-      typedef branch_policy<Node_CItr, Node_Itr, _Alloc> base_type;
-
-    public:
-      typedef _ATraits 				access_traits;
-      typedef _Alloc 					allocator_type;
-      typedef typename allocator_type::size_type 	size_type;
-      typedef null_type 				metadata_type;
-      typedef Node_CItr 				node_const_iterator;
-      typedef Node_Itr 					node_iterator;
-      typedef typename node_const_iterator::value_type 	const_iterator;
-      typedef typename node_iterator::value_type 	iterator;
-      typedef typename base_type::key_type 		key_type;
-      typedef typename base_type::key_const_reference 	key_const_reference;
-
-    protected:
-      virtual const_iterator
-      end() const = 0;
-
-      virtual iterator
-      end() = 0;
-
-      virtual node_const_iterator
-      node_begin() const = 0;
-
-      virtual node_iterator
-      node_begin() = 0;
-
-      virtual node_const_iterator
-      node_end() const = 0;
-
-      virtual node_iterator
-      node_end() = 0;
-
-      virtual const access_traits&
-      get_access_traits() const = 0;
-
-    private:
-      typedef typename access_traits::const_iterator 	e_const_iterator;
-      typedef std::pair<e_const_iterator, e_const_iterator> prefix_range_t;
-
-    protected:
-      static size_type
-      common_prefix_len(node_iterator, e_const_iterator,
-			e_const_iterator, const access_traits&);
-
-      static iterator
-      leftmost_it(node_iterator);
-
-      static iterator
-      rightmost_it(node_iterator);
-
-      static bool
-      less(e_const_iterator, e_const_iterator, e_const_iterator,
-	   e_const_iterator, const access_traits&);
-    };
-
-
-#define PB_DS_CLASS_T_DEC \
-    template<typename Node_CItr, typename Node_Itr, \
-	     typename _ATraits, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-    trie_policy_base<Node_CItr, Node_Itr, _ATraits, _Alloc>
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::size_type
-    PB_DS_CLASS_C_DEC::
-    common_prefix_len(node_iterator nd_it, e_const_iterator b_r,
-		      e_const_iterator e_r, const access_traits& r_traits)
-    {
-      prefix_range_t pref_range = nd_it.valid_prefix();
-
-      e_const_iterator b_l = pref_range.first;
-      e_const_iterator e_l = pref_range.second;
-
-      const size_type range_length_l = std::distance(b_l, e_l);
-      const size_type range_length_r = std::distance(b_r, e_r);
-
-      if (range_length_r < range_length_l)
-	{
-	  std::swap(b_l, b_r);
-	  std::swap(e_l, e_r);
-	}
-
-      size_type ret = 0;
-      while (b_l != e_l)
-	{
-	  if (r_traits.e_pos(*b_l) != r_traits.e_pos(*b_r))
-	    return ret;
-
-	  ++ret;
-	  ++b_l;
-	  ++b_r;
-	}
-
-      return ret;
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::iterator
-    PB_DS_CLASS_C_DEC::
-    leftmost_it(node_iterator nd_it)
-    {
-      if (nd_it.num_children() == 0)
-	return *nd_it;
-
-      return leftmost_it(nd_it.get_child(0));
-    }
-
-    PB_DS_CLASS_T_DEC
-    typename PB_DS_CLASS_C_DEC::iterator
-    PB_DS_CLASS_C_DEC::
-    rightmost_it(node_iterator nd_it)
-    {
-      const size_type num_children = nd_it.num_children();
-
-      if (num_children == 0)
-	return *nd_it;
-
-      return rightmost_it(nd_it.get_child(num_children - 1));
-    }
-
-    PB_DS_CLASS_T_DEC
-    bool
-    PB_DS_CLASS_C_DEC::
-    less(e_const_iterator b_l, e_const_iterator e_l,
-	 e_const_iterator b_r, e_const_iterator e_r,
-	 const access_traits& r_traits)
-    {
-      while (b_l != e_l)
-	{
-	  if (b_r == e_r)
-	    return false;
-
-	  size_type l_pos = r_traits.e_pos(*b_l);
-	  size_type r_pos = r_traits.e_pos(*b_r);
-	  if (l_pos != r_pos)
-	    return (l_pos < r_pos);
-
-	  ++b_l;
-	  ++b_r;
-	}
-      return b_r != e_r;
-    }
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif // #ifndef PB_DS_TRIE_POLICY_BASE_HPP
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/trie_string_access_traits_imp.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/trie_string_access_traits_imp.hpp
deleted file mode 100644
index 48998aa..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/trie_policy/trie_string_access_traits_imp.hpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file trie_policy/trie_string_access_traits_imp.hpp
- * Contains a policy for extracting character positions from
- *    a string for a vector-based PATRICIA tree
- */
-
-PB_DS_CLASS_T_DEC
-detail::integral_constant<int, Reverse> PB_DS_CLASS_C_DEC::s_rev_ind;
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::size_type
-PB_DS_CLASS_C_DEC::
-e_pos(e_type e)
-{
-  return (static_cast<size_type>(e - min_e_val));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-begin(key_const_reference r_key)
-{
-  return (begin_imp(r_key, s_rev_ind));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-end(key_const_reference r_key)
-{
-  return (end_imp(r_key, s_rev_ind));
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-begin_imp(key_const_reference r_key, detail::false_type)
-{
-  return (r_key.begin());
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-begin_imp(key_const_reference r_key, detail::true_type)
-{
-  return (r_key.rbegin());
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-end_imp(key_const_reference r_key, detail::false_type)
-{
-  return (r_key.end());
-}
-
-PB_DS_CLASS_T_DEC
-inline typename PB_DS_CLASS_C_DEC::const_iterator
-PB_DS_CLASS_C_DEC::
-end_imp(key_const_reference r_key, detail::true_type)
-{
-  return (r_key.rend());
-}
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/type_utils.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/type_utils.hpp
deleted file mode 100644
index 1434379..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/type_utils.hpp
+++ /dev/null
@@ -1,167 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file detail/type_utils.hpp
- * Contains utilities for handnling types. All of these classes are based on
- * Modern C++ by Andrei Alxandrescu.
- */
-
-#ifndef PB_DS_TYPE_UTILS_HPP
-#define PB_DS_TYPE_UTILS_HPP
-
-#include <cstddef>
-#include <utility>
-#include <tr1/type_traits>
-#include <ext/type_traits.h>
-#include <ext/numeric_traits.h>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    using std::tr1::is_same;
-    using std::tr1::is_const;
-    using std::tr1::is_pointer;
-    using std::tr1::is_reference;
-    using std::tr1::is_fundamental;
-    using std::tr1::is_member_object_pointer;
-    using std::tr1::is_member_pointer;
-    using std::tr1::is_base_of;
-    using std::tr1::remove_const;
-    using std::tr1::remove_reference;
-
-    // Need integral_const<bool, true> <-> integral_const<int, 1>, so
-    // because of this use the following typedefs instead of importing
-    // std::tr1's.
-    using std::tr1::integral_constant;
-    typedef std::tr1::integral_constant<int, 1> true_type;
-    typedef std::tr1::integral_constant<int, 0> false_type;
-
-    using __gnu_cxx::__conditional_type;
-    using __gnu_cxx::__numeric_traits;
-
-    template<typename T>
-    struct is_const_pointer
-    {
-      enum
-	{
-	  value = is_const<T>::value && is_pointer<T>::value
-	};
-    };
-
-    template<typename T>
-    struct is_const_reference
-    {
-      enum
-	{
-	  value = is_const<T>::value && is_reference<T>::value
-	};
-    };
-
-    template<typename T>
-    struct is_simple
-    {
-      enum
-	{
-	  value = is_fundamental<typename remove_const<T>::type>::value 
-	  || is_pointer<typename remove_const<T>::type>::value 
-	  || is_member_pointer<T>::value 
-	};
-    };
-
-    template<typename T>
-    class is_pair
-    {
-    private:
-      template<typename U>
-      struct is_pair_imp
-      {
-	enum
-	  {
-	    value = 0
-	  };
-      };
-
-      template<typename U, typename V>
-      struct is_pair_imp<std::pair<U,V> >
-      {
-	enum
-	  {
-	    value = 1
-	  };
-      };
-
-    public:
-      enum
-	{
-	  value = is_pair_imp<T>::value
-	};
-    };
-
-    // Use C++0x's static_assert if possible.
-#if __cplusplus >= 201103L
-#define PB_DS_STATIC_ASSERT(UNIQUE, E)  static_assert(E, #UNIQUE)
-#else
-    template<bool>
-    struct __static_assert;
-
-    template<>
-    struct __static_assert<true>
-    { };
-
-    template<int>
-    struct __static_assert_dumclass
-    {
-      enum
-	{
-	  v = 1
-	};
-    };
-
-#define PB_DS_STATIC_ASSERT(UNIQUE, E)  \
-    typedef __gnu_pbds::detail::__static_assert_dumclass<sizeof(__gnu_pbds::detail::__static_assert<bool(E)>)> UNIQUE##__static_assert_type
-
-#endif
-
-    template<typename Type>
-    struct type_to_type
-    {
-      typedef Type type;
-    };
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/types_traits.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/types_traits.hpp
deleted file mode 100644
index f90fa42..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/types_traits.hpp
+++ /dev/null
@@ -1,288 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file detail/types_traits.hpp
- * Contains a traits class of types used by containers.
- */
-
-#ifndef PB_DS_TYPES_TRAITS_HPP
-#define PB_DS_TYPES_TRAITS_HPP
-
-#include <algorithm>
-#include <utility>
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <utility>
-
-namespace __gnu_pbds
-{
-  namespace detail
-  {
-    /**
-     *  @addtogroup traits Traits
-     *  @{
-     */
-
-    /// Primary template.
-    template<typename Key, typename Mapped>
-      struct no_throw_copies
-      {
-	static const bool __simple = is_simple<Key>::value
-			   	 && is_simple<Mapped>::value;
-	typedef integral_constant<int, __simple> 	       	indicator;
-      };
-
-    /// Specialization.
-    template<typename Key>
-      struct no_throw_copies<Key, null_type>
-      {
-	typedef integral_constant<int, is_simple<Key>::value> 	indicator;
-      };
-
-
-    /// Stored value.
-    template<typename _Tv>
-      struct stored_value
-      {
-	typedef _Tv 	value_type;
-	value_type 	m_value;
-      };
-
-    /// Stored hash.
-    template<typename _Th>
-      struct stored_hash
-      {
-	typedef _Th 	hash_type;
-	hash_type 	m_hash;
-      };
-
-    /// Primary template for representation of stored data.
-    /// Two types of data can be stored: value and hash.
-    template<typename _Tv, typename _Th>
-      struct stored_data
-      : public stored_value<_Tv>, public stored_hash<_Th>
-      { };
-
-    /// Specialization for representation of stored data of just value type.
-    template<typename _Tv>
-      struct stored_data<_Tv, null_type>
-      : public stored_value<_Tv>
-      { };
-
-    /// Primary template.
-    template<typename Key, typename Mapped, typename _Alloc, bool Store_Hash>
-      struct type_base;
-
-    /**
-     * Specialization of type_base for the case where the hash value
-     * is not stored alongside each value.
-     */
-    template<typename Key, typename Mapped, typename _Alloc>
-      struct type_base<Key, Mapped, _Alloc, false>
-      {
-      public:
-	typedef typename _Alloc::size_type 		size_type;
-
-      private:
-	typedef typename _Alloc::template rebind<Mapped>	__rebind_m;
-	typedef typename __rebind_m::other			__rebind_ma;
-	typedef std::pair<const Key, Mapped>			__value_type;
-	typedef typename _Alloc::template rebind<__value_type>	__rebind_v;
-       	typedef typename __rebind_v::other			__rebind_va;
-
-      public:
-	typedef typename __rebind_ma::value_type       	mapped_type;
-	typedef typename __rebind_ma::pointer 		mapped_pointer;
-	typedef typename __rebind_ma::const_pointer 	mapped_const_pointer;
-	typedef typename __rebind_ma::reference	       	mapped_reference;
-	typedef typename __rebind_ma::const_reference 	mapped_const_reference;
-
-	typedef typename __rebind_va::value_type 	value_type;
-	typedef typename __rebind_va::pointer 		pointer;
-	typedef typename __rebind_va::const_pointer 	const_pointer;
-	typedef typename __rebind_va::reference 	reference;
-	typedef typename __rebind_va::const_reference 	const_reference;
-
-	typedef stored_data<value_type, null_type>	stored_data_type;
-      };
-
-    /**
-     * Specialization of type_base for the case where the hash value
-     * is stored alongside each value.
-     */
-    template<typename Key, typename Mapped, typename _Alloc>
-      struct type_base<Key, Mapped, _Alloc, true>
-      {
-      public:
-	typedef typename _Alloc::size_type 		size_type;
-
-      private:
-	typedef typename _Alloc::template rebind<Mapped>	__rebind_m;
-	typedef typename __rebind_m::other			__rebind_ma;
-	typedef std::pair<const Key, Mapped>			__value_type;
-	typedef typename _Alloc::template rebind<__value_type>	__rebind_v;
-       	typedef typename __rebind_v::other			__rebind_va;
-
-      public:
-	typedef typename __rebind_ma::value_type       	mapped_type;
-	typedef typename __rebind_ma::pointer 		mapped_pointer;
-	typedef typename __rebind_ma::const_pointer 	mapped_const_pointer;
-	typedef typename __rebind_ma::reference	       	mapped_reference;
-	typedef typename __rebind_ma::const_reference 	mapped_const_reference;
-
-	typedef typename __rebind_va::value_type 	value_type;
-	typedef typename __rebind_va::pointer 		pointer;
-	typedef typename __rebind_va::const_pointer 	const_pointer;
-	typedef typename __rebind_va::reference 	reference;
-	typedef typename __rebind_va::const_reference 	const_reference;
-
-	typedef stored_data<value_type, size_type>	stored_data_type;
-      };
-
-
-    /**
-     * Specialization of type_base for the case where the hash value
-     * is not stored alongside each value.
-     */
-    template<typename Key, typename _Alloc>
-      struct type_base<Key, null_type, _Alloc, false>
-      {
-      public:
-	typedef typename _Alloc::size_type 		size_type;
-	typedef Key 					value_type;
-
-      private:
-	typedef typename _Alloc::template rebind<null_type>  	__rebind_m;
-	typedef typename __rebind_m::other			__rebind_ma;
-	typedef typename _Alloc::template rebind<value_type>	__rebind_v;
-       	typedef typename __rebind_v::other			__rebind_va;
-
-      public:
-	typedef typename __rebind_ma::value_type       	mapped_type;
-	typedef typename __rebind_ma::pointer 		mapped_pointer;
-	typedef typename __rebind_ma::const_pointer 	mapped_const_pointer;
-	typedef typename __rebind_ma::reference	       	mapped_reference;
-	typedef typename __rebind_ma::const_reference 	mapped_const_reference;
-
-	typedef typename __rebind_va::pointer 		pointer;
-	typedef typename __rebind_va::const_pointer 	const_pointer;
-	typedef typename __rebind_va::reference 	reference;
-	typedef typename __rebind_va::const_reference 	const_reference;
-
-	typedef stored_data<value_type, null_type>	stored_data_type;
-
-	static null_type 			s_null_type;
-      };
-
-    template<typename Key, typename _Alloc>
-      null_type
-      type_base<Key, null_type, _Alloc, false>::s_null_type;
-
-
-    /**
-     * Specialization of type_base for the case where the hash value
-     * is stored alongside each value.
-     */
-    template<typename Key, typename _Alloc>
-      struct type_base<Key, null_type, _Alloc, true>
-      {
-      public:
-	typedef typename _Alloc::size_type 		size_type;
-	typedef Key 					value_type;
-
-      private:
-	typedef typename _Alloc::template rebind<null_type>  	__rebind_m;
-	typedef typename __rebind_m::other			__rebind_ma;
-	typedef typename _Alloc::template rebind<value_type>	__rebind_v;
-       	typedef typename __rebind_v::other			__rebind_va;
-
-      public:
-	typedef typename __rebind_ma::value_type       	mapped_type;
-	typedef typename __rebind_ma::pointer 		mapped_pointer;
-	typedef typename __rebind_ma::const_pointer 	mapped_const_pointer;
-	typedef typename __rebind_ma::reference	       	mapped_reference;
-	typedef typename __rebind_ma::const_reference 	mapped_const_reference;
-
-	typedef typename __rebind_va::pointer 		pointer;
-	typedef typename __rebind_va::const_pointer 	const_pointer;
-	typedef typename __rebind_va::reference 	reference;
-	typedef typename __rebind_va::const_reference 	const_reference;
-
-	typedef stored_data<value_type, size_type>	stored_data_type;
-
-	static null_type 		      	s_null_type;
-      };
-
-    template<typename Key, typename _Alloc>
-      null_type
-      type_base<Key, null_type, _Alloc, true>::s_null_type;
-
-
-    /// Type base dispatch.
-    template<typename Key, typename Mapped, typename _Alloc, bool Store_Hash>
-      struct type_dispatch
-      {
-	typedef type_base<Key, Mapped, _Alloc, Store_Hash> type;
-      };
-
-    /// Traits for abstract types.
-    template<typename Key, typename Mapped, typename _Alloc, bool Store_Hash>
-      struct types_traits
-      : public type_dispatch<Key, Mapped, _Alloc, Store_Hash>::type
-      {
-      private:
-	typedef no_throw_copies<Key, Mapped>		__nothrowcopy;
-	typedef typename _Alloc::template rebind<Key>::other __rebind_a;
-
-      public:
-	typedef typename _Alloc::size_type 		size_type;
-	typedef typename __rebind_a::value_type 	key_type;
-	typedef typename __rebind_a::pointer 		key_pointer;
-	typedef typename __rebind_a::const_pointer 	key_const_pointer;
-	typedef typename __rebind_a::reference 		key_reference;
-	typedef typename __rebind_a::const_reference 	key_const_reference;
-	typedef std::pair<size_type, size_type> 	comp_hash;
-	typedef integral_constant<int, Store_Hash> 	store_extra;
-	typedef typename __nothrowcopy::indicator 	no_throw_indicator;
-
-	store_extra			       	m_store_extra_indicator;
-	no_throw_indicator 		 	m_no_throw_copies_indicator;
-    };
-    //@}
-  } // namespace detail
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
deleted file mode 100644
index 1867f4e..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file unordered_iterator/const_iterator.hpp
- * Contains an iterator class used for const ranging over the elements of the
- * table.
- */
-
-/// Const range-type iterator.
-class const_iterator_
-: public point_const_iterator_
-{
-public:
-  /// Category.
-  typedef std::forward_iterator_tag iterator_category;
-
-  /// Difference type.
-  typedef typename _Alloc::difference_type difference_type;
-
-  /// Iterator's value type.
-  typedef value_type_ value_type;
-
-  /// Iterator's pointer type.
-  typedef pointer_ pointer;
-
-  /// Iterator's const pointer type.
-  typedef const_pointer_ const_pointer;
-
-  /// Iterator's reference type.
-  typedef reference_ reference;
-
-  /// Iterator's const reference type.
-  typedef const_reference_ const_reference;
-
-  /// Default constructor.
-  const_iterator_() : m_p_tbl(0)
-  { }
-
-  /// Increments.
-  const_iterator_&
-  operator++()
-  {
-    m_p_tbl->inc_it_state(base_type::m_p_value, m_pos);
-    return *this;
-  }
-
-  /// Increments.
-  const_iterator_
-  operator++(int)
-  {
-    const_iterator_ ret =* this;
-    m_p_tbl->inc_it_state(base_type::m_p_value, m_pos);
-    return ret;
-  }
-
-protected:
-  typedef point_const_iterator_ base_type;
-
-  /**
-   *  Constructor used by the table to initiate the generalized
-   *      pointer and position (e.g., this is called from within a find()
-   *      of a table.
-   * */
-  const_iterator_(const_pointer_ p_value,  PB_DS_GEN_POS pos,
-		  const PB_DS_CLASS_C_DEC* p_tbl)
-  : point_const_iterator_(p_value), m_p_tbl(p_tbl), m_pos(pos)
-  { }
-
-  /**
-   *  Pointer to the table object which created the iterator (used for
-   *      incrementing its position.
-   * */
-  const PB_DS_CLASS_C_DEC* m_p_tbl;
-
-  PB_DS_GEN_POS m_pos;
-
-  friend class PB_DS_CLASS_C_DEC;
-};
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/iterator.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/iterator.hpp
deleted file mode 100644
index 29f40c9..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/iterator.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file iterator.hpp
- * Contains an iterator_ class used for ranging over the elements of the
- *    table.
- */
-
-/// Range-type iterator.
-class iterator_
-: public const_iterator_
-{
-public:
-  /// Category.
-  typedef std::forward_iterator_tag iterator_category;
-
-  /// Difference type.
-  typedef typename _Alloc::difference_type difference_type;
-
-  /// Iterator's value type.
-  typedef value_type_ value_type;
-
-  /// Iterator's pointer type.
-  typedef pointer_ pointer;
-
-  /// Iterator's const pointer type.
-  typedef const_pointer_ const_pointer;
-
-  /// Iterator's reference type.
-  typedef reference_ reference;
-
-  /// Iterator's const reference type.
-  typedef const_reference_ const_reference;
-
-  /// Default constructor.
-  inline
-  iterator_()
-  : const_iterator_(0, PB_DS_GEN_POS(), 0) { }
-
-  /// Conversion to a point-type iterator.
-  inline
-  operator point_iterator_()
-  { return point_iterator_(const_cast<pointer>(const_iterator_::m_p_value)); }
-
-  /// Conversion to a point-type iterator.
-  inline
-  operator const point_iterator_() const
-  { return point_iterator_(const_cast<pointer>(const_iterator_::m_p_value)); }
-
-  /// Access.
-  pointer
-  operator->() const
-  {
-    _GLIBCXX_DEBUG_ASSERT(base_type::m_p_value != 0);
-    return (const_cast<pointer>(base_type::m_p_value));
-  }
-
-  /// Access.
-  reference
-  operator*() const
-  {
-    _GLIBCXX_DEBUG_ASSERT(base_type::m_p_value != 0);
-    return (const_cast<reference>(*base_type::m_p_value));
-  }
-
-  /// Increments.
-  iterator_&
-  operator++()
-  {
-    base_type::m_p_tbl->inc_it_state(base_type::m_p_value, base_type::m_pos);
-    return *this;
-  }
-
-  /// Increments.
-  iterator_
-  operator++(int)
-  {
-    iterator_ ret =* this;
-    base_type::m_p_tbl->inc_it_state(base_type::m_p_value, base_type::m_pos);
-    return ret;
-  }
-
-protected:
-  typedef const_iterator_ base_type;
-
-  /**
-   *  Constructor used by the table to initiate the generalized
-   *      pointer and position (e.g., this is called from within a find()
-   *      of a table.
-   * */
-  inline
-  iterator_(pointer p_value, PB_DS_GEN_POS pos, PB_DS_CLASS_C_DEC* p_tbl)
-  : const_iterator_(p_value, pos, p_tbl)
-  { }
-
-  friend class PB_DS_CLASS_C_DEC;
-};
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp
deleted file mode 100644
index 74330ed..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file unordered_iterator/point_const_iterator.hpp
- * Contains an iterator class returned by the tables' const find and insert
- *     methods.
- */
-
-class point_iterator_;
-
-/// Const point-type iterator.
-class point_const_iterator_
-{
-public:
-  /// Category.
-  typedef trivial_iterator_tag iterator_category;
-
-  /// Difference type.
-  typedef trivial_iterator_difference_type difference_type;
-
-  /// Iterator's value type.
-  typedef value_type_ value_type;
-
-  /// Iterator's pointer type.
-  typedef pointer_ pointer;
-
-  /// Iterator's const pointer type.
-  typedef const_pointer_ const_pointer;
-
-  /// Iterator's reference type.
-  typedef reference_ reference;
-
-  /// Iterator's const reference type.
-  typedef const_reference_ const_reference;
-
-  inline
-  point_const_iterator_(const_pointer p_value) : m_p_value(p_value)
-  { }
-
-  /// Default constructor.
-  inline
-  point_const_iterator_() : m_p_value(0)
-  { }
-
-  /// Copy constructor.
-  inline
-  point_const_iterator_(const point_const_iterator_& other)
-  : m_p_value(other.m_p_value)
-  { }
-
-  /// Copy constructor.
-  inline
-  point_const_iterator_(const point_iterator_& other)
-  : m_p_value(other.m_p_value)
-  { }
-
-  /// Access.
-  const_pointer
-  operator->() const
-  {
-    _GLIBCXX_DEBUG_ASSERT(m_p_value != 0);
-    return m_p_value;
-  }
-
-  /// Access.
-  const_reference
-  operator*() const
-  {
-    _GLIBCXX_DEBUG_ASSERT(m_p_value != 0);
-    return *m_p_value;
-  }
-
-  /// Compares content to a different iterator object.
-  bool
-  operator==(const point_iterator_& other) const
-  { return m_p_value == other.m_p_value; }
-
-  /// Compares content to a different iterator object.
-  bool
-  operator==(const point_const_iterator_& other) const
-  { return m_p_value == other.m_p_value; }
-
-  /// Compares content (negatively) to a different iterator object.
-  bool
-  operator!=(const point_iterator_& other) const
-  { return m_p_value != other.m_p_value; }
-
-  /// Compares content (negatively) to a different iterator object.
-  bool
-  operator!=(const point_const_iterator_& other) const
-  { return m_p_value != other.m_p_value; }
-
-protected:
-  const_pointer m_p_value;
-
-  friend class point_iterator_;
-
-  friend class PB_DS_CLASS_C_DEC;
-};
-
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp b/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
deleted file mode 100644
index 682f954..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
+++ /dev/null
@@ -1,126 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file point_iterator.hpp
- * Contains an iterator class returned by the tables' find and insert
- *     methods.
- */
-
-/// Find type iterator.
-class point_iterator_
-{
-public:
-  /// Category.
-  typedef trivial_iterator_tag iterator_category;
-
-  /// Difference type.
-  typedef trivial_iterator_difference_type difference_type;
-
-  /// Iterator's value type.
-  typedef value_type_ value_type;
-
-  /// Iterator's pointer type.
-  typedef pointer_ pointer;
-
-  /// Iterator's const pointer type.
-  typedef const_pointer_ const_pointer;
-
-  /// Iterator's reference type.
-  typedef reference_ reference;
-
-  /// Iterator's const reference type.
-  typedef const_reference_ const_reference;
-
-  /// Default constructor.
-  inline
-  point_iterator_()
-  : m_p_value(0)
-  { }
-
-  /// Copy constructor.
-  inline
-  point_iterator_(const point_iterator_& other)
-  : m_p_value(other.m_p_value)
-  { }
-
-  /// Access.
-  pointer
-  operator->() const
-  {
-    _GLIBCXX_DEBUG_ASSERT(m_p_value != 0);
-    return (m_p_value);
-  }
-
-  /// Access.
-  reference
-  operator*() const
-  {
-    _GLIBCXX_DEBUG_ASSERT(m_p_value != 0);
-    return (*m_p_value);
-  }
-
-  /// Compares content to a different iterator object.
-  bool
-  operator==(const point_iterator_& other) const
-  { return m_p_value == other.m_p_value; }
-
-  /// Compares content to a different iterator object.
-  bool
-  operator==(const point_const_iterator_& other) const
-  { return m_p_value == other.m_p_value; }
-
-  /// Compares content to a different iterator object.
-  bool
-  operator!=(const point_iterator_& other) const
-  { return m_p_value != other.m_p_value; }
-
-  /// Compares content (negatively) to a different iterator object.
-  bool
-  operator!=(const point_const_iterator_& other) const
-  { return m_p_value != other.m_p_value; }
-
-  inline
-  point_iterator_(pointer p_value) : m_p_value(p_value)
-  { }
-
-protected:
-  friend class point_const_iterator_;
-
-  friend class PB_DS_CLASS_C_DEC;
-
-protected:
-  pointer m_p_value;
-};
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/exception.hpp b/openflow/usr/include/c++/5/ext/pb_ds/exception.hpp
deleted file mode 100644
index 79d14fd..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/exception.hpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file exception.hpp
- * Contains exception classes.
- */
-
-#ifndef PB_DS_EXCEPTION_HPP
-#define PB_DS_EXCEPTION_HPP
-
-#include <bits/c++config.h>
-#include <stdexcept>
-#include <cstdlib>
-
-namespace __gnu_pbds
-{
-  /**
-   *  @defgroup exceptions-pbds Exceptions
-   *  @ingroup pbds
-   *  @{
-   */
-
-  /// Base class for exceptions.
-  struct container_error : public std::logic_error
-  {
-    container_error()
-    : std::logic_error(__N("__gnu_pbds::container_error")) { }
-  };
-
-  /// An entry cannot be inserted into a container object for logical
-  /// reasons (not, e.g., if memory is unabvailable, in which case
-  /// the allocator_type's exception will be thrown).
-  struct insert_error : public container_error { };
-
-  /// A join cannot be performed logical reasons (i.e., the ranges of
-  /// the two container objects being joined overlaps.
-  struct join_error : public container_error { };
-
-  /// A container cannot be resized.
-  struct resize_error : public container_error { };
-
-  inline void
-  __throw_container_error()
-  { _GLIBCXX_THROW_OR_ABORT(container_error()); }
-
-  inline void
-  __throw_insert_error()
-  { _GLIBCXX_THROW_OR_ABORT(insert_error()); }
-
-  inline void
-  __throw_join_error()
-  { _GLIBCXX_THROW_OR_ABORT(join_error()); }
-
-  inline void
-  __throw_resize_error()
-  { _GLIBCXX_THROW_OR_ABORT(resize_error()); }
-  //@}
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/hash_policy.hpp b/openflow/usr/include/c++/5/ext/pb_ds/hash_policy.hpp
deleted file mode 100644
index bda268f..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/hash_policy.hpp
+++ /dev/null
@@ -1,617 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file hash_policy.hpp
- * Contains hash-related policies.
- */
-
-#ifndef PB_DS_HASH_POLICY_HPP
-#define PB_DS_HASH_POLICY_HPP
-
-#include <bits/c++config.h>
-#include <algorithm>
-#include <vector>
-#include <cmath>
-#include <ext/pb_ds/exception.hpp>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp>
-#include <ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp>
-#include <ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp>
-
-namespace __gnu_pbds
-{
-#define PB_DS_CLASS_T_DEC template<typename Size_Type>
-#define PB_DS_CLASS_C_DEC linear_probe_fn<Size_Type>
-
-  /// A probe sequence policy using fixed increments.
-  template<typename Size_Type = std::size_t>
-  class linear_probe_fn
-  {
-  public:
-    typedef Size_Type size_type;
-
-    void
-    swap(PB_DS_CLASS_C_DEC& other);
-
-  protected:
-    /// Returns the i-th offset from the hash value.
-    inline size_type
-    operator()(size_type i) const;
-  };
-
-#include <ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC template<typename Size_Type>
-#define PB_DS_CLASS_C_DEC quadratic_probe_fn<Size_Type>
-
-  /// A probe sequence policy using square increments.
-  template<typename Size_Type = std::size_t>
-  class quadratic_probe_fn
-  {
-  public:
-    typedef Size_Type size_type;
-
-    void
-    swap(PB_DS_CLASS_C_DEC& other);
-
-  protected:
-    /// Returns the i-th offset from the hash value.
-    inline size_type
-    operator()(size_type i) const;
-  };
-
-#include <ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC template<typename Size_Type>
-#define PB_DS_CLASS_C_DEC direct_mask_range_hashing<Size_Type>
-
-  /// A mask range-hashing class (uses a bitmask).
-  template<typename Size_Type = std::size_t>
-  class direct_mask_range_hashing
-  : public detail::mask_based_range_hashing<Size_Type>
-  {
-  private:
-    typedef detail::mask_based_range_hashing<Size_Type> mask_based_base;
-
-  public:
-    typedef Size_Type size_type;
-
-    void
-    swap(PB_DS_CLASS_C_DEC& other);
-
-  protected:
-    void
-    notify_resized(size_type size);
-
-    /// Transforms the __hash value hash into a ranged-hash value
-    /// (using a bit-mask).
-    inline size_type
-    operator()(size_type hash) const;
-  };
-
-#include <ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC template<typename Size_Type>
-#define PB_DS_CLASS_C_DEC direct_mod_range_hashing<Size_Type>
-
-  /// A mod range-hashing class (uses the modulo function).
-  template<typename Size_Type = std::size_t>
-  class direct_mod_range_hashing
-  : public detail::mod_based_range_hashing<Size_Type>
-  {
-  public:
-    typedef Size_Type size_type;
-
-    void
-    swap(PB_DS_CLASS_C_DEC& other);
-
-  protected:
-    void
-    notify_resized(size_type size);
-
-    /// Transforms the __hash value hash into a ranged-hash value
-    /// (using a modulo operation).
-    inline size_type
-    operator()(size_type hash) const;
-
-  private:
-    typedef detail::mod_based_range_hashing<size_type> mod_based_base;
-  };
-
-#include <ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC template<bool External_Load_Access, typename Size_Type>
-#define PB_DS_CLASS_C_DEC hash_load_check_resize_trigger<External_Load_Access, Size_Type>
-#define PB_DS_SIZE_BASE_C_DEC detail::hash_load_check_resize_trigger_size_base<Size_Type, External_Load_Access>
-
-  /// A resize trigger policy based on a load check. It keeps the
-  /// load factor between some load factors load_min and load_max.
-  template<bool External_Load_Access = false, typename Size_Type = std::size_t>
-  class hash_load_check_resize_trigger : private PB_DS_SIZE_BASE_C_DEC
-  {
-  public:
-    typedef Size_Type size_type;
-
-    enum
-      {
-	/// Specifies whether the load factor can be accessed
-	/// externally. The two options have different trade-offs in
-	/// terms of flexibility, genericity, and encapsulation.
-	external_load_access = External_Load_Access
-      };
-
-    /// Default constructor, or constructor taking load_min and
-    /// load_max load factors between which this policy will keep the
-    /// actual load.
-    hash_load_check_resize_trigger(float load_min = 0.125,
-				   float load_max = 0.5);
-
-    void
-    swap(hash_load_check_resize_trigger& other);
-
-    virtual
-    ~hash_load_check_resize_trigger();
-
-    /// Returns a pair of the minimal and maximal loads, respectively.
-    inline std::pair<float, float>
-    get_loads() const;
-
-    /// Sets the loads through a pair of the minimal and maximal
-    /// loads, respectively.
-    void
-    set_loads(std::pair<float, float> load_pair);
-
-  protected:
-    inline void
-    notify_insert_search_start();
-
-    inline void
-    notify_insert_search_collision();
-
-    inline void
-    notify_insert_search_end();
-
-    inline void
-    notify_find_search_start();
-
-    inline void
-    notify_find_search_collision();
-
-    inline void
-    notify_find_search_end();
-
-    inline void
-    notify_erase_search_start();
-
-    inline void
-    notify_erase_search_collision();
-
-    inline void
-    notify_erase_search_end();
-
-    /// Notifies an element was inserted. The total number of entries
-    /// in the table is num_entries.
-    inline void
-    notify_inserted(size_type num_entries);
-
-    inline void
-    notify_erased(size_type num_entries);
-
-    /// Notifies the table was cleared.
-    void
-    notify_cleared();
-
-    /// Notifies the table was resized as a result of this object's
-    /// signifying that a resize is needed.
-    void
-    notify_resized(size_type new_size);
-
-    void
-    notify_externally_resized(size_type new_size);
-
-    inline bool
-    is_resize_needed() const;
-
-    inline bool
-    is_grow_needed(size_type size, size_type num_entries) const;
-
-  private:
-    virtual void
-    do_resize(size_type new_size);
-
-    typedef PB_DS_SIZE_BASE_C_DEC size_base;
-
-#ifdef _GLIBCXX_DEBUG
-    void
-    assert_valid(const char* file, int line) const;
-#endif
-
-    float 	m_load_min;
-    float 	m_load_max;
-    size_type 	m_next_shrink_size;
-    size_type 	m_next_grow_size;
-    bool 	m_resize_needed;
-  };
-
-#include <ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_SIZE_BASE_C_DEC
-
-#define PB_DS_CLASS_T_DEC template<bool External_Load_Access, typename Size_Type>
-#define PB_DS_CLASS_C_DEC cc_hash_max_collision_check_resize_trigger<External_Load_Access, Size_Type>
-
-  /// A resize trigger policy based on collision checks. It keeps the
-  /// simulated load factor lower than some given load factor.
-  template<bool External_Load_Access = false, typename Size_Type = std::size_t>
-  class cc_hash_max_collision_check_resize_trigger
-  {
-  public:
-    typedef Size_Type 	size_type;
-
-    enum
-      {
-	/// Specifies whether the load factor can be accessed
-	/// externally. The two options have different trade-offs in
-	/// terms of flexibility, genericity, and encapsulation.
-	external_load_access = External_Load_Access
-      };
-
-    /// Default constructor, or constructor taking load, a __load
-    /// factor which it will attempt to maintain.
-    cc_hash_max_collision_check_resize_trigger(float load = 0.5);
-
-    void
-    swap(PB_DS_CLASS_C_DEC& other);
-
-    /// Returns the current load.
-    inline float
-    get_load() const;
-
-    /// Sets the load; does not resize the container.
-    void
-    set_load(float load);
-
-  protected:
-    /// Notifies an insert search started.
-    inline void
-    notify_insert_search_start();
-
-    /// Notifies a search encountered a collision.
-    inline void
-    notify_insert_search_collision();
-
-    /// Notifies a search ended.
-    inline void
-    notify_insert_search_end();
-
-    /// Notifies a find search started.
-    inline void
-    notify_find_search_start();
-
-    /// Notifies a search encountered a collision.
-    inline void
-    notify_find_search_collision();
-
-    /// Notifies a search ended.
-    inline void
-    notify_find_search_end();
-
-    /// Notifies an erase search started.
-    inline void
-    notify_erase_search_start();
-
-    /// Notifies a search encountered a collision.
-    inline void
-    notify_erase_search_collision();
-
-    /// Notifies a search ended.
-    inline void
-    notify_erase_search_end();
-
-    /// Notifies an element was inserted.
-    inline void
-    notify_inserted(size_type num_entries);
-
-    /// Notifies an element was erased.
-    inline void
-    notify_erased(size_type num_entries);
-
-    /// Notifies the table was cleared.
-    void
-    notify_cleared();
-
-    /// Notifies the table was resized as a result of this object's
-    /// signifying that a resize is needed.
-    void
-    notify_resized(size_type new_size);
-
-    /// Notifies the table was resized externally.
-    void
-    notify_externally_resized(size_type new_size);
-
-    /// Queries whether a resize is needed.
-    inline bool
-    is_resize_needed() const;
-
-    /// Queries whether a grow is needed. This method is called only
-    /// if this object indicated is needed.
-    inline bool
-    is_grow_needed(size_type size, size_type num_entries) const;
-
-  private:
-    void
-    calc_max_num_coll();
-
-    inline void
-    calc_resize_needed();
-
-    float 	m_load;
-    size_type 	m_size;
-    size_type 	m_num_col;
-    size_type 	m_max_col;
-    bool 	m_resize_needed;
-  };
-
-#include <ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC template<typename Size_Type>
-#define PB_DS_CLASS_C_DEC hash_exponential_size_policy<Size_Type>
-
-  /// A size policy whose sequence of sizes form an exponential
-  /// sequence (typically powers of 2.
-  template<typename Size_Type = std::size_t>
-  class hash_exponential_size_policy
-  {
-  public:
-    typedef Size_Type size_type;
-
-    /// Default constructor, or onstructor taking a start_size, or
-    /// constructor taking a start size and grow_factor. The policy
-    /// will use the sequence of sizes start_size, start_size*
-    /// grow_factor, start_size* grow_factor^2, ...
-    hash_exponential_size_policy(size_type start_size = 8,
-				 size_type grow_factor = 2);
-
-    void
-    swap(PB_DS_CLASS_C_DEC& other);
-
-  protected:
-    size_type
-    get_nearest_larger_size(size_type size) const;
-
-    size_type
-    get_nearest_smaller_size(size_type size) const;
-
-  private:
-    size_type m_start_size;
-    size_type m_grow_factor;
-  };
-
-#include <ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC
-#define PB_DS_CLASS_C_DEC hash_prime_size_policy
-
-  /// A size policy whose sequence of sizes form a nearly-exponential
-  /// sequence of primes.
-  class hash_prime_size_policy
-  {
-  public:
-    /// Size type.
-    typedef std::size_t size_type;
-
-    /// Default constructor, or onstructor taking a start_size The
-    /// policy will use the sequence of sizes approximately
-    /// start_size, start_size* 2, start_size* 2^2, ...
-    hash_prime_size_policy(size_type start_size = 8);
-
-    inline void
-    swap(PB_DS_CLASS_C_DEC& other);
-
-  protected:
-    size_type
-    get_nearest_larger_size(size_type size) const;
-
-    size_type
-    get_nearest_smaller_size(size_type size) const;
-
-  private:
-    size_type m_start_size;
-  };
-
-#include <ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC template<typename Size_Policy, typename Trigger_Policy, bool External_Size_Access, typename Size_Type>
-
-#define PB_DS_CLASS_C_DEC hash_standard_resize_policy<Size_Policy, Trigger_Policy, External_Size_Access, Size_Type>
-
-  /// A resize policy which delegates operations to size and trigger policies.
-  template<typename Size_Policy = hash_exponential_size_policy<>,
-	   typename Trigger_Policy = hash_load_check_resize_trigger<>,
-	   bool External_Size_Access = false,
-	   typename Size_Type = std::size_t>
-  class hash_standard_resize_policy
-  : public Size_Policy, public Trigger_Policy
-  {
-  public:
-    typedef Size_Type 		size_type;
-    typedef Trigger_Policy 	trigger_policy;
-    typedef Size_Policy 	size_policy;
-
-    enum
-      {
-	external_size_access = External_Size_Access
-      };
-
-    /// Default constructor.
-    hash_standard_resize_policy();
-
-    /// constructor taking some policies r_size_policy will be copied
-    /// by the Size_Policy object of this object.
-    hash_standard_resize_policy(const Size_Policy& r_size_policy);
-
-    /// constructor taking some policies. r_size_policy will be
-    /// copied by the Size_Policy object of this
-    /// object. r_trigger_policy will be copied by the Trigger_Policy
-    /// object of this object.
-    hash_standard_resize_policy(const Size_Policy& r_size_policy,
-				const Trigger_Policy& r_trigger_policy);
-
-    virtual
-    ~hash_standard_resize_policy();
-
-    inline void
-    swap(PB_DS_CLASS_C_DEC& other);
-
-    /// Access to the Size_Policy object used.
-    Size_Policy&
-    get_size_policy();
-
-    /// Const access to the Size_Policy object used.
-    const Size_Policy&
-    get_size_policy() const;
-
-    /// Access to the Trigger_Policy object used.
-    Trigger_Policy&
-    get_trigger_policy();
-
-    /// Access to the Trigger_Policy object used.
-    const Trigger_Policy&
-    get_trigger_policy() const;
-
-    /// Returns the actual size of the container.
-    inline size_type
-    get_actual_size() const;
-
-    /// Resizes the container to suggested_new_size, a suggested size
-    /// (the actual size will be determined by the Size_Policy
-    /// object).
-    void
-    resize(size_type suggested_new_size);
-
-  protected:
-    inline void
-    notify_insert_search_start();
-
-    inline void
-    notify_insert_search_collision();
-
-    inline void
-    notify_insert_search_end();
-
-    inline void
-    notify_find_search_start();
-
-    inline void
-    notify_find_search_collision();
-
-    inline void
-    notify_find_search_end();
-
-    inline void
-    notify_erase_search_start();
-
-    inline void
-    notify_erase_search_collision();
-
-    inline void
-    notify_erase_search_end();
-
-    inline void
-    notify_inserted(size_type num_e);
-
-    inline void
-    notify_erased(size_type num_e);
-
-    void
-    notify_cleared();
-
-    void
-    notify_resized(size_type new_size);
-
-    inline bool
-    is_resize_needed() const;
-
-    /// Queries what the new size should be, when the container is
-    /// resized naturally. The current __size of the container is
-    /// size, and the number of used entries within the container is
-    /// num_used_e.
-    size_type
-    get_new_size(size_type size, size_type num_used_e) const;
-
-  private:
-    /// Resizes to new_size.
-    virtual void
-    do_resize(size_type new_size);
-
-    typedef Trigger_Policy trigger_policy_base;
-
-    typedef Size_Policy size_policy_base;
-
-    size_type m_size;
-  };
-
-#include <ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/list_update_policy.hpp b/openflow/usr/include/c++/5/ext/pb_ds/list_update_policy.hpp
deleted file mode 100644
index 15c634c..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/list_update_policy.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file list_update_policy.hpp
- * Contains policies for list update containers.
- */
-
-#ifndef PB_DS_LU_POLICY_HPP
-#define PB_DS_LU_POLICY_HPP
-
-#include <bits/c++config.h>
-#include <cstdlib>
-#include <ext/pb_ds/detail/list_update_policy/lu_counter_metadata.hpp>
-#include <ext/pb_ds/tag_and_trait.hpp>
-
-namespace __gnu_pbds
-{
-  /**
-   *  A list-update policy that unconditionally moves elements to the
-   *  front of the list. A null type means that each link in a
-   *  list-based container does not actually need metadata.
-   */
- template<typename _Alloc = std::allocator<char> >
-   class lu_move_to_front_policy
-   {
-   public:
-     typedef _Alloc 					allocator_type;
-
-     /// Metadata on which this functor operates.
-     typedef null_type 					metadata_type;
-
-   private:
-     typedef typename _Alloc::template rebind<metadata_type> __rebind_m;
-
-   public:
-     /// Reference to metadata on which this functor operates.
-     typedef typename __rebind_m::other::reference 	metadata_reference;
-
-     /// Creates a metadata object.
-     metadata_type
-     operator()() const
-     { return s_metadata; }
-
-     /// Decides whether a metadata object should be moved to the front
-     /// of the list.
-     inline bool
-     operator()(metadata_reference r_metadata) const
-     { return true; }
-
-   private:
-     static null_type 					s_metadata;
-   };
-
-  /**
-   *  A list-update policy that moves elements to the front of the
-   *  list based on the counter algorithm.
-   */
-  template<std::size_t Max_Count = 5, typename _Alloc = std::allocator<char> >
-    class lu_counter_policy
-    : private detail::lu_counter_policy_base<typename _Alloc::size_type>
-    {
-    public:
-      typedef _Alloc 					allocator_type;
-      typedef typename allocator_type::size_type       	size_type;
-
-      enum
-	{
-	  /// When some element is accessed this number of times, it
-	  /// will be moved to the front of the list.
-	  max_count = Max_Count
-	};
-
-      /// Metadata on which this functor operates.
-      typedef detail::lu_counter_metadata<size_type> 	metadata_type;
-
-    private:
-      typedef detail::lu_counter_policy_base<size_type> 	base_type;
-      typedef typename _Alloc::template rebind<metadata_type> __rebind_m;
-
-    public:
-      /// Reference to metadata on which this functor operates.
-      typedef typename __rebind_m::other::reference 	metadata_reference;
-
-      /// Creates a metadata object.
-      metadata_type
-      operator()() const
-      { return base_type::operator()(max_count); }
-
-      /// Decides whether a metadata object should be moved to the front
-      /// of the list.
-      bool
-      operator()(metadata_reference r_data) const
-      { return base_type::operator()(r_data, max_count); }
-    };
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/priority_queue.hpp b/openflow/usr/include/c++/5/ext/pb_ds/priority_queue.hpp
deleted file mode 100644
index ee6f4c4..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/priority_queue.hpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file priority_queue.hpp
- * Contains priority_queues.
- */
-
-#ifndef PB_DS_PRIORITY_QUEUE_HPP
-#define PB_DS_PRIORITY_QUEUE_HPP
-
-#include <bits/c++config.h>
-#include <ext/pb_ds/tag_and_trait.hpp>
-#include <ext/pb_ds/detail/priority_queue_base_dispatch.hpp>
-#include <ext/pb_ds/detail/standard_policies.hpp>
-
-namespace __gnu_pbds
-{
-  /**
-   *  @defgroup heap-based Heap-Based
-   *  @ingroup containers-pbds
-   *  @{
-   */
-
-  /**
-   *  @defgroup heap-detail Base and Policy Classes
-   *  @ingroup heap-based
-   */
-
-  /**
-   *  A priority queue composed of one specific heap policy.
-   *
-   *  @tparam _Tv 	    	Value type.
-   *  @tparam Cmp_Fn	    	Comparison functor.
-   *  @tparam Tag 	    	Instantiating data structure type,
-   *			    	see container_tag.
-   *  @tparam _Alloc 	    	Allocator type.
-   *
-   *  Base is dispatched at compile time via Tag, from the following
-   *  choices: binary_heap_tag, binomial_heap_tag, pairing_heap_tag,
-   *           rc_binomial_heap_tag, thin_heap_tag
-   *
-   *  Base choices are: detail::binary_heap, detail::binomial_heap,
-   *                    detail::pairing_heap, detail::rc_binomial_heap,
-   *                    detail::thin_heap.
-   */
-   template<typename _Tv,
-	   typename Cmp_Fn = std::less<_Tv>,
-	   typename Tag = pairing_heap_tag,
-	   typename _Alloc = std::allocator<char> >
-  class priority_queue
-  : public detail::container_base_dispatch<_Tv, Cmp_Fn, _Alloc, Tag>::type
-  {
-  public:
-    typedef _Tv 					value_type;
-    typedef Cmp_Fn 					cmp_fn;
-    typedef Tag 					container_category;
-    typedef _Alloc 					allocator_type;
-    typedef typename allocator_type::size_type 		size_type;
-    typedef typename allocator_type::difference_type 	difference_type;
-
-  private:
-    typedef typename detail::container_base_dispatch<_Tv, Cmp_Fn, _Alloc,
-						     Tag>::type
- 							base_type;
-    typedef typename _Alloc::template rebind<_Tv>   	__rebind_v;
-    typedef typename __rebind_v::other			__rebind_va;
-
- public:
-    typedef typename __rebind_va::reference 		reference;
-    typedef typename __rebind_va::const_reference 	const_reference;
-    typedef typename __rebind_va::pointer 	   	pointer;
-    typedef typename __rebind_va::const_pointer 	const_pointer;
-
-    typedef typename base_type::point_iterator 		point_iterator;
-    typedef typename base_type::point_const_iterator 	point_const_iterator;
-    typedef typename base_type::iterator 		iterator;
-    typedef typename base_type::const_iterator 		const_iterator;
-
-    priority_queue() { }
-
-    /// Constructor taking some policy objects. r_cmp_fn will be
-    /// copied by the Cmp_Fn object of the container object.
-    priority_queue(const cmp_fn& r_cmp_fn) : base_type(r_cmp_fn) { }
-
-    /// Constructor taking __iterators to a range of value_types. The
-    /// value_types between first_it and last_it will be inserted into
-    /// the container object.
-    template<typename It>
-    priority_queue(It first_it, It last_it)
-    { base_type::copy_from_range(first_it, last_it); }
-
-    /// Constructor taking __iterators to a range of value_types and
-    /// some policy objects The value_types between first_it and
-    /// last_it will be inserted into the container object. r_cmp_fn
-    /// will be copied by the cmp_fn object of the container object.
-    template<typename It>
-    priority_queue(It first_it, It last_it, const cmp_fn& r_cmp_fn)
-    : base_type(r_cmp_fn)
-    { base_type::copy_from_range(first_it, last_it); }
-
-    priority_queue(const priority_queue& other)
-    : base_type((const base_type& )other) { }
-
-    virtual
-    ~priority_queue() { }
-
-    priority_queue&
-    operator=(const priority_queue& other)
-    {
-      if (this != &other)
-	{
-	  priority_queue tmp(other);
-	  swap(tmp);
-	}
-      return *this;
-    }
-
-    void
-    swap(priority_queue& other)
-    { base_type::swap(other); }
-  };
-} // namespace __gnu_pbds
- //@} heap-based
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/tag_and_trait.hpp b/openflow/usr/include/c++/5/ext/pb_ds/tag_and_trait.hpp
deleted file mode 100644
index 6389ce1..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/tag_and_trait.hpp
+++ /dev/null
@@ -1,454 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file tag_and_trait.hpp
- * Contains tags and traits, e.g., ones describing underlying
- * data structures.
- */
-
-#ifndef PB_DS_TAG_AND_TRAIT_HPP
-#define PB_DS_TAG_AND_TRAIT_HPP
-
-#include <bits/c++config.h>
-#include <ext/pb_ds/detail/type_utils.hpp>
-
-/**
- * @namespace __gnu_pbds
- * @brief GNU extensions for policy-based data structures for public use.
- */
-namespace __gnu_pbds
-{
-  /** @defgroup pbds Policy-Based Data Structures
-   *  @ingroup extensions
-   *
-   *  This is a library of policy-based elementary data structures:
-   *  associative containers and priority queues. It is designed for
-   *  high-performance, flexibility, semantic safety, and conformance
-   *  to the corresponding containers in std (except for some points
-   *  where it differs by design).
-   *
-   *  For details, see:
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/ext/pb_ds/index.html
-   *
-   *  @{
-   */
-
-  /**
-   *  @defgroup tags Tags
-   *  @{   
-   */
-  /// A trivial iterator tag. Signifies that the iterators has none of
-  /// std::iterators's movement abilities.
-  struct trivial_iterator_tag
-  { };
-
-  /// Prohibit moving trivial iterators.
-  typedef void trivial_iterator_difference_type;
-
-
-  /**
-   *  @defgroup invalidation_tags  Invalidation Guarantees
-   *  @ingroup tags
-   *  @{
-   */
-
-  /**
-   *  Signifies a basic invalidation guarantee that any iterator,
-   *  pointer, or reference to a container object's mapped value type
-   *  is valid as long as the container is not modified.
-   */
-  struct basic_invalidation_guarantee
-  { };
-
-  /**
-   *  Signifies an invalidation guarantee that includes all those of
-   *  its base, and additionally, that any point-type iterator,
-   *  pointer, or reference to a container object's mapped value type
-   *  is valid as long as its corresponding entry has not be erased,
-   *  regardless of modifications to the container object.
-   */
-  struct point_invalidation_guarantee : public basic_invalidation_guarantee
-  { };
-
-  /**
-   *  Signifies an invalidation guarantee that includes all those of
-   *  its base, and additionally, that any range-type iterator
-   *  (including the returns of begin() and end()) is in the correct
-   *  relative positions to other range-type iterators as long as its
-   *  corresponding entry has not be erased, regardless of
-   *  modifications to the container object.
-   */
-  struct range_invalidation_guarantee : public point_invalidation_guarantee
-  { };
-  //@}
-
-
-  /**
-   *  @defgroup ds_tags Data Structure Type
-   *  @ingroup tags
-   *  @{
-   */
-  /// Base data structure tag.
-  struct container_tag
-  { };
-
-  /// Basic sequence.
-  struct sequence_tag : public container_tag { };
-
-  /// Basic string container, inclusive of strings, ropes, etc.
-  struct string_tag : public sequence_tag { };
-
-  /// Basic associative-container.
-  struct associative_tag : public container_tag { };
-
-  /// Basic hash structure.
-  struct basic_hash_tag : public associative_tag { };
-
-  /// Collision-chaining hash.
-  struct cc_hash_tag : public basic_hash_tag { };
-
-  /// General-probing hash.
-  struct gp_hash_tag : public basic_hash_tag { };
-
-  /// Basic branch structure.
-  struct basic_branch_tag : public associative_tag { };
-
-  /// Basic tree structure.
-  struct tree_tag : public basic_branch_tag { };
-
-  /// Red-black tree.
-  struct rb_tree_tag : public tree_tag { };
-
-  /// Splay tree.
-  struct splay_tree_tag : public tree_tag { };
-
-  /// Ordered-vector tree.
-  struct ov_tree_tag : public tree_tag { };
-
-  /// Basic trie structure.
-  struct trie_tag : public basic_branch_tag { };
-
-  /// PATRICIA trie.
-  struct pat_trie_tag : public trie_tag { };
-
-  /// List-update.
-  struct list_update_tag : public associative_tag { };
-
-  /// Basic priority-queue.
-  struct priority_queue_tag : public container_tag { };
-
-  /// Pairing-heap.
-  struct pairing_heap_tag : public priority_queue_tag { };
-
-  /// Binomial-heap.
-  struct binomial_heap_tag : public priority_queue_tag { };
-
-  /// Redundant-counter binomial-heap.
-  struct rc_binomial_heap_tag : public priority_queue_tag { };
-
-  /// Binary-heap (array-based).
-  struct binary_heap_tag : public priority_queue_tag { };
-
-  /// Thin heap.
-  struct thin_heap_tag : public priority_queue_tag { };
-  //@}
-  //@}
-
-
-  /**
-   *  @defgroup traits Traits
-   *  @{
-   */
-
-  /**
-   *  @brief Represents no type, or absence of type, for template tricks.
-   *
-   *  In a mapped-policy, indicates that an associative container is a set.
-   *
-   *  In a list-update policy, indicates that each link does not need
-   *  metadata.
-   *
-   *  In a hash policy, indicates that the combining hash function
-   *  is actually a ranged hash function.
-   *
-   *  In a probe policy, indicates that the combining probe function
-   *  is actually a ranged probe function.
-   */
-  struct null_type { };
-
-  /// A null node updator, indicating that no node updates are required.
-  template<typename _Tp1, typename _Tp2, typename _Tp3, typename _Tp4>
-    struct null_node_update : public null_type
-    { };
-
-
-  /// Primary template, container traits base.
-  template<typename _Tag>
-    struct container_traits_base;
-
-  /// Specialization, cc hash.
-  template<>
-  struct container_traits_base<cc_hash_tag>
-  {
-    typedef cc_hash_tag 				container_category;
-    typedef point_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = false,
-	erase_can_throw = false,
-	split_join_can_throw = false,
-	reverse_iteration = false
-      };
-  };
-
-  /// Specialization, gp hash.
-  template<>
-  struct container_traits_base<gp_hash_tag>
-  {
-    typedef gp_hash_tag 				container_category;
-    typedef basic_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = false,
-	erase_can_throw = false,
-	split_join_can_throw = false,
-	reverse_iteration = false
-      };
-  };
-
-  /// Specialization, rb tree.
-  template<>
-  struct container_traits_base<rb_tree_tag>
-  {
-    typedef rb_tree_tag 				container_category;
-    typedef range_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = true,
-	erase_can_throw = false,
-	split_join_can_throw = false,
-	reverse_iteration = true
-      };
-  };
-
-  /// Specialization, splay tree.
-  template<>
-  struct container_traits_base<splay_tree_tag>
-  {
-    typedef splay_tree_tag 				container_category;
-    typedef range_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = true,
-	erase_can_throw = false,
-	split_join_can_throw = false,
-	reverse_iteration = true
-      };
-  };
-
-  /// Specialization, ov tree.
-  template<>
-  struct container_traits_base<ov_tree_tag>
-  {
-    typedef ov_tree_tag 				container_category;
-    typedef basic_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = true,
-	erase_can_throw = true,
-	split_join_can_throw = true,
-	reverse_iteration = false
-      };
-  };
-
-  /// Specialization, pat trie.
-  template<>
-  struct container_traits_base<pat_trie_tag>
-  {
-    typedef pat_trie_tag 				container_category;
-    typedef range_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = true,
-	erase_can_throw = false,
-	split_join_can_throw = true,
-	reverse_iteration = true
-      };
-  };
-
-  /// Specialization, list update.
-  template<>
-  struct container_traits_base<list_update_tag>
-  {
-    typedef list_update_tag 				container_category;
-    typedef point_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = false,
-	erase_can_throw = false,
-	split_join_can_throw = false,
-	reverse_iteration = false
-      };
-  };
-
-  /// Specialization, pairing heap.
-  template<>
-  struct container_traits_base<pairing_heap_tag>
-  {
-    typedef pairing_heap_tag 				container_category;
-    typedef point_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = false,
-	erase_can_throw = false,
-	split_join_can_throw = false,
-	reverse_iteration = false
-      };
-  };
-
-  /// Specialization, thin heap.
-  template<>
-  struct container_traits_base<thin_heap_tag>
-  {
-    typedef thin_heap_tag 				container_category;
-    typedef point_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = false,
-	erase_can_throw = false,
-	split_join_can_throw = false,
-	reverse_iteration = false
-      };
-  };
-
-  /// Specialization, binomial heap.
-  template<>
-  struct container_traits_base<binomial_heap_tag>
-  {
-    typedef binomial_heap_tag 				container_category;
-    typedef point_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = false,
-	erase_can_throw = false,
-	split_join_can_throw = false,
-	reverse_iteration = false
-      };
-  };
-
-  /// Specialization, rc binomial heap.
-  template<>
-  struct container_traits_base<rc_binomial_heap_tag>
-  {
-    typedef rc_binomial_heap_tag 			container_category;
-    typedef point_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = false,
-	erase_can_throw = false,
-	split_join_can_throw = false,
-	reverse_iteration = false
-      };
-  };
-
-  /// Specialization, binary heap.
-  template<>
-  struct container_traits_base<binary_heap_tag>
-  {
-    typedef binary_heap_tag 				container_category;
-    typedef basic_invalidation_guarantee 		invalidation_guarantee;
-
-    enum
-      {
-	order_preserving = false,
-	erase_can_throw = false,
-	split_join_can_throw = true,
-	reverse_iteration = false
-      };
-  };
-
-
-  /// Container traits.
-  // See Matt Austern for the name, S. Meyers MEFC++ #2, others.
-  template<typename Cntnr>
-  struct container_traits
-  : public container_traits_base<typename Cntnr::container_category>
-  {
-    typedef Cntnr 				       container_type;
-    typedef typename Cntnr::container_category         container_category;
-    typedef container_traits_base<container_category>  base_type;
-    typedef typename base_type::invalidation_guarantee invalidation_guarantee;
-
-    enum
-      {
-	/// True only if Cntnr objects guarantee storing  keys by order.
-	order_preserving = base_type::order_preserving,
-
-	/// True only if erasing a key can throw.
-	erase_can_throw = base_type::erase_can_throw,
-
-	/// True only if split or join operations can throw.
-	split_join_can_throw = base_type::split_join_can_throw,
-
-	/// True only reverse iterators are supported.
-	reverse_iteration = base_type::reverse_iteration
-      };
-  };
-  //@}
-
-
-  namespace detail
-  {
-    /// Dispatch mechanism, primary template for associative types.
-    template<typename Key, typename Mapped, typename _Alloc, typename Tag,
-	     typename Policy_Tl = null_type>
-      struct container_base_dispatch;
-  } // namespace detail
-  //@}
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/tree_policy.hpp b/openflow/usr/include/c++/5/ext/pb_ds/tree_policy.hpp
deleted file mode 100644
index 6dac3f8..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/tree_policy.hpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file tree_policy.hpp
- * Contains tree-related policies.
- */
-
-#ifndef PB_DS_TREE_POLICY_HPP
-#define PB_DS_TREE_POLICY_HPP
-
-#include <bits/c++config.h>
-#include <iterator>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/branch_policy/branch_policy.hpp>
-
-namespace __gnu_pbds
-{
-#define PB_DS_CLASS_T_DEC \
-  template<typename Node_CItr, typename Node_Itr, typename Cmp_Fn, \
-	   typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-  tree_order_statistics_node_update<Node_CItr, Node_Itr, Cmp_Fn, _Alloc>
-
-#define PB_DS_BRANCH_POLICY_BASE \
-  detail::branch_policy<Node_CItr, Node_Itr, _Alloc>
-
-  /// Functor updating ranks of entrees.
-  template<typename Node_CItr, typename Node_Itr, 
-	   typename Cmp_Fn, typename _Alloc>
-  class tree_order_statistics_node_update : private PB_DS_BRANCH_POLICY_BASE
-  {
-  private:
-    typedef PB_DS_BRANCH_POLICY_BASE 		       	base_type;
-
-  public:
-    typedef Cmp_Fn 					cmp_fn;
-    typedef _Alloc 					allocator_type;
-    typedef typename allocator_type::size_type 		size_type;
-    typedef typename base_type::key_type 		key_type;
-    typedef typename base_type::key_const_reference 	key_const_reference;
-
-    typedef size_type 					metadata_type;
-    typedef Node_CItr 	       			node_const_iterator;
-    typedef Node_Itr 					node_iterator;
-    typedef typename node_const_iterator::value_type 	const_iterator;
-    typedef typename node_iterator::value_type 		iterator;
-
-    /// Finds an entry by __order. Returns a const_iterator to the
-    /// entry with the __order order, or a const_iterator to the
-    /// container object's end if order is at least the size of the
-    /// container object.
-    inline const_iterator
-    find_by_order(size_type) const;
-
-    /// Finds an entry by __order. Returns an iterator to the entry
-    /// with the __order order, or an iterator to the container
-    /// object's end if order is at least the size of the container
-    /// object.
-    inline iterator
-    find_by_order(size_type);
-
-    /// Returns the order of a key within a sequence. For exapmle, if
-    /// r_key is the smallest key, this method will return 0; if r_key
-    /// is a key between the smallest and next key, this method will
-    /// return 1; if r_key is a key larger than the largest key, this
-    /// method will return the size of r_c.
-    inline size_type
-    order_of_key(key_const_reference) const;
-
-  private:
-    /// Const reference to the container's value-type.
-    typedef typename base_type::const_reference 	const_reference;
-
-    /// Const pointer to the container's value-type.
-    typedef typename base_type::const_pointer 		const_pointer;
-
-    typedef typename _Alloc::template rebind<metadata_type>::other __rebind_m;
-
-    /// Const metadata reference.
-    typedef typename __rebind_m::const_reference       metadata_const_reference;
-
-    /// Metadata reference.
-    typedef typename __rebind_m::reference 		metadata_reference;
-
-    /// Returns the node_const_iterator associated with the tree's root node.
-    virtual node_const_iterator
-    node_begin() const = 0;
-
-    /// Returns the node_iterator associated with the tree's root node.
-    virtual node_iterator
-    node_begin() = 0;
-
-    /// Returns the node_const_iterator associated with a just-after leaf node.
-    virtual node_const_iterator
-    node_end() const = 0;
-
-    /// Returns the node_iterator associated with a just-after leaf node.
-    virtual node_iterator
-    node_end() = 0;
-
-    /// Access to the cmp_fn object.
-    virtual cmp_fn& 
-    get_cmp_fn() = 0;
-
-  protected:
-    /// Updates the rank of a node through a node_iterator node_it;
-    /// end_nd_it is the end node iterator.
-    inline void
-    operator()(node_iterator, node_const_iterator) const;
-
-    virtual
-    ~tree_order_statistics_node_update();
-  };
-
-#include <ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_BRANCH_POLICY_BASE
-
-} // namespace __gnu_pbds
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/pb_ds/trie_policy.hpp b/openflow/usr/include/c++/5/ext/pb_ds/trie_policy.hpp
deleted file mode 100644
index f0151f1..0000000
--- a/openflow/usr/include/c++/5/ext/pb_ds/trie_policy.hpp
+++ /dev/null
@@ -1,360 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/**
- * @file trie_policy.hpp
- * Contains trie-related policies.
- */
-
-#ifndef PB_DS_TRIE_POLICY_HPP
-#define PB_DS_TRIE_POLICY_HPP
-
-#include <bits/c++config.h>
-#include <string>
-#include <ext/pb_ds/detail/type_utils.hpp>
-#include <ext/pb_ds/detail/trie_policy/trie_policy_base.hpp>
-
-namespace __gnu_pbds
-{
-#define PB_DS_CLASS_T_DEC \
-  template<typename String, typename String::value_type Min_E_Val, \
-	   typename String::value_type Max_E_Val, bool Reverse, \
-	   typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-  trie_string_access_traits<String, Min_E_Val,Max_E_Val,Reverse,_Alloc>
-
-  /**
-   *  Element access traits for string types.
-   *
-   *  @tparam String 	    	String type.
-   *  @tparam Min_E_Val        	Minimal element value.
-   *  @tparam Max_E_Val	    	Maximum element value.
-   *  @tparam Reverse	        Reverse iteration should be used.
-   *                            Default: false.
-   *  @tparam _Alloc 	    	Allocator type.
-   */
-  template<typename String = std::string,
-	   typename String::value_type Min_E_Val = detail::__numeric_traits<typename String::value_type>::__min,
-	   typename String::value_type Max_E_Val = detail::__numeric_traits<typename String::value_type>::__max,
-	   bool Reverse = false,
-	   typename _Alloc = std::allocator<char> >
-  struct trie_string_access_traits
-  {
-  public:
-    typedef typename _Alloc::size_type			  size_type;
-    typedef String 					  key_type;
-    typedef typename _Alloc::template rebind<key_type>	  __rebind_k;
-    typedef typename __rebind_k::other::const_reference   key_const_reference;
-
-    enum
-      {
-	reverse = Reverse
-      };
-
-    /// Element const iterator type.
-    typedef typename detail::__conditional_type<Reverse, \
-		       typename String::const_reverse_iterator, \
-		       typename String::const_iterator>::__type const_iterator;
-
-    /// Element type.
-    typedef typename std::iterator_traits<const_iterator>::value_type e_type;
-
-    enum
-      {
-	min_e_val = Min_E_Val,
-	max_e_val = Max_E_Val,
-	max_size = max_e_val - min_e_val + 1
-      };
-    PB_DS_STATIC_ASSERT(min_max_size, max_size >= 2);
-
-    /// Returns a const_iterator to the first element of
-    /// key_const_reference agumnet.
-    inline static const_iterator
-    begin(key_const_reference);
-
-    /// Returns a const_iterator to the after-last element of
-    /// key_const_reference argument.
-    inline static const_iterator
-    end(key_const_reference);
-
-    /// Maps an element to a position.
-    inline static size_type
-    e_pos(e_type e);
-
-  private:
-    inline static const_iterator
-    begin_imp(key_const_reference, detail::false_type);
-
-    inline static const_iterator
-    begin_imp(key_const_reference, detail::true_type);
-
-    inline static const_iterator
-    end_imp(key_const_reference, detail::false_type);
-
-    inline static const_iterator
-    end_imp(key_const_reference, detail::true_type);
-
-    static detail::integral_constant<int, Reverse> s_rev_ind;
-  };
-
-#include <ext/pb_ds/detail/trie_policy/trie_string_access_traits_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_T_DEC \
-  template<typename Node_CItr,typename Node_Itr, \
-	   typename _ATraits, typename _Alloc>
-
-#define PB_DS_CLASS_C_DEC \
-  trie_prefix_search_node_update<Node_CItr, Node_Itr, \
-				 _ATraits,_Alloc>
-
-#define PB_DS_TRIE_POLICY_BASE \
-  detail::trie_policy_base<Node_CItr,Node_Itr,_ATraits, _Alloc>
-
-  /// A node updator that allows tries to be searched for the range of
-  /// values that match a certain prefix.
-  template<typename Node_CItr,
-	   typename Node_Itr,
-	   typename _ATraits,
-	   typename _Alloc>
-  class trie_prefix_search_node_update : private PB_DS_TRIE_POLICY_BASE
-  {
-  private:
-    typedef PB_DS_TRIE_POLICY_BASE 		       	base_type;
-
-  public:
-    typedef typename base_type::key_type 		key_type;
-    typedef typename base_type::key_const_reference 	key_const_reference;
-
-    /// Element access traits.
-    typedef _ATraits 				access_traits;
-
-    /// Const element iterator.
-    typedef typename access_traits::const_iterator 	a_const_iterator;
-
-    /// _Alloc type.
-    typedef _Alloc 	       				allocator_type;
-
-    /// Size type.
-    typedef typename allocator_type::size_type 		size_type;
-    typedef null_type 					metadata_type;
-    typedef Node_Itr 					node_iterator;
-    typedef Node_CItr 					node_const_iterator;
-    typedef typename node_iterator::value_type 		iterator;
-    typedef typename node_const_iterator::value_type 	const_iterator;
-
-    /// Finds the const iterator range corresponding to all values
-    /// whose prefixes match r_key.
-    std::pair<const_iterator, const_iterator>
-    prefix_range(key_const_reference) const;
-
-    /// Finds the iterator range corresponding to all values whose
-    /// prefixes match r_key.
-    std::pair<iterator, iterator>
-    prefix_range(key_const_reference);
-
-    /// Finds the const iterator range corresponding to all values
-    /// whose prefixes match [b, e).
-    std::pair<const_iterator, const_iterator>
-    prefix_range(a_const_iterator, a_const_iterator) const;
-
-    /// Finds the iterator range corresponding to all values whose
-    /// prefixes match [b, e).
-    std::pair<iterator, iterator>
-    prefix_range(a_const_iterator, a_const_iterator);
-
-  protected:
-    /// Called to update a node's metadata.
-    inline void
-    operator()(node_iterator node_it, node_const_iterator end_nd_it) const;
-
-  private:
-    node_iterator
-    next_child(node_iterator, a_const_iterator, a_const_iterator,
-	       node_iterator, const access_traits&);
-
-    /// Returns the const iterator associated with the just-after last element.
-    virtual const_iterator
-    end() const = 0;
-
-    /// Returns the iterator associated with the just-after last element.
-    virtual iterator
-    end() = 0;
-
-    /// Returns the node_const_iterator associated with the trie's root node.
-    virtual node_const_iterator
-    node_begin() const = 0;
-
-    /// Returns the node_iterator associated with the trie's root node.
-    virtual node_iterator
-    node_begin() = 0;
-
-    /// Returns the node_const_iterator associated with a just-after leaf node.
-    virtual node_const_iterator
-    node_end() const = 0;
-
-    /// Returns the node_iterator associated with a just-after leaf node.
-    virtual node_iterator
-    node_end() = 0;
-
-    /// Access to the cmp_fn object.
-    virtual const access_traits&
-    get_access_traits() const = 0;
-  };
-
-#include <ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp>
-
-#undef PB_DS_CLASS_C_DEC
-
-#define PB_DS_CLASS_C_DEC \
-  trie_order_statistics_node_update<Node_CItr, Node_Itr, \
-				    _ATraits, _Alloc>
-
-  /// Functor updating ranks of entrees.
-  template<typename Node_CItr,
-	   typename Node_Itr,
-	   typename _ATraits,
-	   typename _Alloc>
-  class trie_order_statistics_node_update : private PB_DS_TRIE_POLICY_BASE
-  {
-  private:
-    typedef PB_DS_TRIE_POLICY_BASE 		       	base_type;
-
-  public:
-    typedef _ATraits 				access_traits;
-    typedef typename access_traits::const_iterator 	a_const_iterator;
-    typedef _Alloc 					allocator_type;
-    typedef typename allocator_type::size_type 		size_type;
-    typedef typename base_type::key_type 		key_type;
-    typedef typename base_type::key_const_reference 	key_const_reference;
-
-    typedef size_type 					metadata_type;
-    typedef Node_CItr 					node_const_iterator;
-    typedef Node_Itr 					node_iterator;
-    typedef typename node_const_iterator::value_type 	const_iterator;
-    typedef typename node_iterator::value_type 		iterator;
-
-    /// Finds an entry by __order. Returns a const_iterator to the
-    /// entry with the __order order, or a const_iterator to the
-    /// container object's end if order is at least the size of the
-    /// container object.
-    inline const_iterator
-    find_by_order(size_type) const;
-
-    /// Finds an entry by __order. Returns an iterator to the entry
-    /// with the __order order, or an iterator to the container
-    /// object's end if order is at least the size of the container
-    /// object.
-    inline iterator
-    find_by_order(size_type);
-
-    /// Returns the order of a key within a sequence. For exapmle, if
-    /// r_key is the smallest key, this method will return 0; if r_key
-    /// is a key between the smallest and next key, this method will
-    /// return 1; if r_key is a key larger than the largest key, this
-    /// method will return the size of r_c.
-    inline size_type
-    order_of_key(key_const_reference) const;
-
-    /// Returns the order of a prefix within a sequence. For exapmle,
-    /// if [b, e] is the smallest prefix, this method will return 0; if
-    /// r_key is a key between the smallest and next key, this method
-    /// will return 1; if r_key is a key larger than the largest key,
-    /// this method will return the size of r_c.
-    inline size_type
-    order_of_prefix(a_const_iterator, a_const_iterator) const;
-
-  protected:
-    /// Updates the rank of a node through a node_iterator node_it;
-    /// end_nd_it is the end node iterator.
-    inline void
-    operator()(node_iterator, node_const_iterator) const;
-
-  private:
-    typedef typename base_type::const_reference 	const_reference;
-    typedef typename base_type::const_pointer 		const_pointer;
-
-    typedef typename _Alloc::template rebind<metadata_type> __rebind_m;
-    typedef typename __rebind_m::other 			__rebind_ma;
-    typedef typename __rebind_ma::const_reference      metadata_const_reference;
-    typedef typename __rebind_ma::reference 		metadata_reference;
-
-    /// Returns true if the container is empty.
-    virtual bool
-    empty() const = 0;
-
-    /// Returns the iterator associated with the trie's first element.
-    virtual iterator
-    begin() = 0;
-
-    /// Returns the iterator associated with the trie's
-    /// just-after-last element.
-    virtual iterator
-    end() = 0;
-
-    /// Returns the node_const_iterator associated with the trie's root node.
-    virtual node_const_iterator
-    node_begin() const = 0;
-
-    /// Returns the node_iterator associated with the trie's root node.
-    virtual node_iterator
-    node_begin() = 0;
-
-    /// Returns the node_const_iterator associated with a just-after
-    /// leaf node.
-    virtual node_const_iterator
-    node_end() const = 0;
-
-    /// Returns the node_iterator associated with a just-after leaf node.
-    virtual node_iterator
-    node_end() = 0;
-
-    /// Access to the cmp_fn object.
-    virtual access_traits&
-    get_access_traits() = 0;
-  };
-
-#include <ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp>
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_TRIE_POLICY_BASE
-
-} // namespace __gnu_pbds
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pod_char_traits.h b/openflow/usr/include/c++/5/ext/pod_char_traits.h
deleted file mode 100644
index 38a84c8..0000000
--- a/openflow/usr/include/c++/5/ext/pod_char_traits.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// POD character, std::char_traits specialization -*- C++ -*-
-
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/pod_char_traits.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-// Gabriel Dos Reis <gdr@integrable-solutions.net>
-// Benjamin Kosnik <bkoz@redhat.com>
-
-#ifndef _POD_CHAR_TRAITS_H
-#define _POD_CHAR_TRAITS_H 1
-
-#pragma GCC system_header
-
-#include <string>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // POD character abstraction.
-  // NB: The char_type parameter is a subset of int_type, as to allow
-  // int_type to properly hold the full range of char_type values as
-  // well as EOF.
-  /// @brief A POD class that serves as a character abstraction class.
-  template<typename _Value, typename _Int, typename _St = std::mbstate_t>
-    struct character
-    {
-      typedef _Value				value_type;
-      typedef _Int				int_type;
-      typedef _St				state_type;
-      typedef character<_Value, _Int, _St>	char_type;
-
-      value_type	value;
-
-      template<typename V2>
-        static char_type
-        from(const V2& v)
-        {
-	  char_type ret = { static_cast<value_type>(v) };
-	  return ret;
-	}
-
-      template<typename V2>
-        static V2
-        to(const char_type& c)
-        {
-	  V2 ret = { static_cast<V2>(c.value) };
-	  return ret;
-	}
-
-    };
-
-  template<typename _Value, typename _Int, typename _St>
-    inline bool
-    operator==(const character<_Value, _Int, _St>& lhs,
-	       const character<_Value, _Int, _St>& rhs)
-    { return lhs.value == rhs.value; }
-
-  template<typename _Value, typename _Int, typename _St>
-    inline bool
-    operator<(const character<_Value, _Int, _St>& lhs,
-	      const character<_Value, _Int, _St>& rhs)
-    { return lhs.value < rhs.value; }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /// char_traits<__gnu_cxx::character> specialization.
-  template<typename _Value, typename _Int, typename _St>
-    struct char_traits<__gnu_cxx::character<_Value, _Int, _St> >
-    {
-      typedef __gnu_cxx::character<_Value, _Int, _St>	char_type;
-      typedef typename char_type::int_type		int_type;
-      typedef typename char_type::state_type		state_type;
-      typedef fpos<state_type>				pos_type;
-      typedef streamoff					off_type;
-
-      static void
-      assign(char_type& __c1, const char_type& __c2)
-      { __c1 = __c2; }
-
-      static bool
-      eq(const char_type& __c1, const char_type& __c2)
-      { return __c1 == __c2; }
-
-      static bool
-      lt(const char_type& __c1, const char_type& __c2)
-      { return __c1 < __c2; }
-
-      static int
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	for (size_t __i = 0; __i < __n; ++__i)
-	  if (!eq(__s1[__i], __s2[__i]))
-	    return lt(__s1[__i], __s2[__i]) ? -1 : 1;
-	return 0;
-      }
-
-      static size_t
-      length(const char_type* __s)
-      {
-	const char_type* __p = __s;
-	while (__p->value)
-	  ++__p;
-	return (__p - __s);
-      }
-
-      static const char_type*
-      find(const char_type* __s, size_t __n, const char_type& __a)
-      {
-	for (const char_type* __p = __s; size_t(__p - __s) < __n; ++__p)
-	  if (*__p == __a)
-	    return __p;
-	return 0;
-      }
-
-      static char_type*
-      move(char_type* __s1, const char_type* __s2, size_t __n)
-      { 
-	if (__n == 0)
-	  return __s1;
-	return static_cast<char_type*>
-	  (__builtin_memmove(__s1, __s2, __n * sizeof(char_type)));
-      }
-
-      static char_type*
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	if (__n == 0)
-	  return __s1;
-	std::copy(__s2, __s2 + __n, __s1);
-	return __s1;
-      }
-
-      static char_type*
-      assign(char_type* __s, size_t __n, char_type __a)
-      {
-	std::fill_n(__s, __n, __a);
-        return __s;
-      }
-
-      static char_type
-      to_char_type(const int_type& __i)
-      { return char_type::template from(__i); }
-
-      static int_type
-      to_int_type(const char_type& __c)
-      { return char_type::template to<int_type>(__c); }
-
-      static bool
-      eq_int_type(const int_type& __c1, const int_type& __c2)
-      { return __c1 == __c2; }
-
-      static int_type
-      eof() 
-      {
-	int_type __r = { static_cast<typename __gnu_cxx::__conditional_type
-			 <std::__is_integer<int_type>::__value,
-			 int_type, int>::__type>(-1) };
-	return __r;
-      }
-
-      static int_type
-      not_eof(const int_type& __c)
-      { return eq_int_type(__c, eof()) ? int_type() : __c; }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/pointer.h b/openflow/usr/include/c++/5/ext/pointer.h
deleted file mode 100644
index fdd0768..0000000
--- a/openflow/usr/include/c++/5/ext/pointer.h
+++ /dev/null
@@ -1,593 +0,0 @@
-// Custom pointer adapter and sample storage policies
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- *  @file ext/pointer.h
- *  This file is a GNU extension to the Standard C++ Library.
- *
- *  @author Bob Walters
- *
- * Provides reusable _Pointer_adapter for assisting in the development of
- * custom pointer types that can be used with the standard containers via
- * the allocator::pointer and allocator::const_pointer typedefs.
- */
-
-#ifndef _POINTER_H
-#define _POINTER_H 1
-
-#pragma GCC system_header
-
-#include <iosfwd>
-#include <bits/stl_iterator_base_types.h>
-#include <ext/cast.h>
-#include <ext/type_traits.h>
-#if __cplusplus >= 201103L
-# include <bits/move.h>
-# include <bits/ptr_traits.h>
-#endif
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /** 
-   * @brief A storage policy for use with _Pointer_adapter<> which yields a
-   *        standard pointer.
-   * 
-   *  A _Storage_policy is required to provide 4 things:
-   *    1) A get() API for returning the stored pointer value.
-   *    2) An set() API for storing a pointer value.
-   *    3) An element_type typedef to define the type this points to.
-   *    4) An operator<() to support pointer comparison.
-   *    5) An operator==() to support pointer comparison.
-   */
-  template<typename _Tp> 
-    class _Std_pointer_impl 
-    {
-    public:
-      // the type this pointer points to.
-      typedef _Tp element_type;
-  
-      // A method to fetch the pointer value as a standard T* value;
-      inline _Tp* 
-      get() const 
-      { return _M_value; }
-  
-      // A method to set the pointer value, from a standard T* value;
-      inline void 
-      set(element_type* __arg) 
-      { _M_value = __arg; }
-  
-      // Comparison of pointers
-      inline bool
-      operator<(const _Std_pointer_impl& __rarg) const
-      { return (_M_value < __rarg._M_value); }
-  
-      inline bool
-      operator==(const _Std_pointer_impl& __rarg) const
-      { return (_M_value == __rarg._M_value); }
-
-    private:
-      element_type* _M_value;
-    };
-
-  /**
-   * @brief A storage policy for use with _Pointer_adapter<> which stores
-   *        the pointer's address as an offset value which is relative to
-   *        its own address.
-   * 
-   * This is intended for pointers within shared memory regions which
-   * might be mapped at different addresses by different processes.
-   * For null pointers, a value of 1 is used.  (0 is legitimate
-   * sometimes for nodes in circularly linked lists) This value was
-   * chosen as the least likely to generate an incorrect null, As
-   * there is no reason why any normal pointer would point 1 byte into
-   * its own pointer address.
-   */
-  template<typename _Tp> 
-    class _Relative_pointer_impl 
-    {
-    public:
-      typedef _Tp element_type;
-  
-      _Tp*
-      get() const 
-      {
-        if (_M_diff == 1)
-          return 0;
-        else
-          return reinterpret_cast<_Tp*>(reinterpret_cast<_UIntPtrType>(this)
-					+ _M_diff);
-      }
-  
-      void 
-      set(_Tp* __arg)
-      {
-        if (!__arg)
-          _M_diff = 1;
-        else
-          _M_diff = reinterpret_cast<_UIntPtrType>(__arg) 
-                    - reinterpret_cast<_UIntPtrType>(this);
-      }
-  
-      // Comparison of pointers
-      inline bool
-      operator<(const _Relative_pointer_impl& __rarg) const
-      { return (reinterpret_cast<_UIntPtrType>(this->get())
-		< reinterpret_cast<_UIntPtrType>(__rarg.get())); }
-
-      inline bool
-      operator==(const _Relative_pointer_impl& __rarg) const
-      { return (reinterpret_cast<_UIntPtrType>(this->get())
-		== reinterpret_cast<_UIntPtrType>(__rarg.get())); }
-
-    private:
-#ifdef _GLIBCXX_USE_LONG_LONG
-      typedef __gnu_cxx::__conditional_type<
-	 (sizeof(unsigned long) >= sizeof(void*)),
-	 unsigned long, unsigned long long>::__type _UIntPtrType;
-#else
-      typedef unsigned long _UIntPtrType;
-#endif
-      _UIntPtrType _M_diff;
-    };
-  
-  /**
-   * Relative_pointer_impl needs a specialization for const T because of
-   * the casting done during pointer arithmetic.
-   */
-  template<typename _Tp> 
-    class _Relative_pointer_impl<const _Tp> 
-    {
-    public:
-      typedef const _Tp element_type;
-  
-      const _Tp*
-      get() const
-      {
-        if (_M_diff == 1)
-          return 0;
-        else
-          return reinterpret_cast<const _Tp*>
-	      (reinterpret_cast<_UIntPtrType>(this) + _M_diff);
-      }
-  
-      void 
-      set(const _Tp* __arg)
-      {
-        if (!__arg)
-          _M_diff = 1;
-        else
-          _M_diff = reinterpret_cast<_UIntPtrType>(__arg) 
-                    - reinterpret_cast<_UIntPtrType>(this);
-      }
-  
-      // Comparison of pointers
-      inline bool
-      operator<(const _Relative_pointer_impl& __rarg) const
-      { return (reinterpret_cast<_UIntPtrType>(this->get())
-		< reinterpret_cast<_UIntPtrType>(__rarg.get())); }
-
-      inline bool
-      operator==(const _Relative_pointer_impl& __rarg) const
-      { return (reinterpret_cast<_UIntPtrType>(this->get())
-		== reinterpret_cast<_UIntPtrType>(__rarg.get())); }
-  
-    private:
-#ifdef _GLIBCXX_USE_LONG_LONG
-      typedef __gnu_cxx::__conditional_type<
-	 (sizeof(unsigned long) >= sizeof(void*)),
-	 unsigned long, unsigned long long>::__type _UIntPtrType;
-#else
-      typedef unsigned long _UIntPtrType;
-#endif
-       _UIntPtrType _M_diff;
-    };
-
-  /**
-   * The specialization on this type helps resolve the problem of
-   * reference to void, and eliminates the need to specialize
-   * _Pointer_adapter for cases of void*, const void*, and so on.
-   */
-  struct _Invalid_type { };
-  
-  template<typename _Tp>
-    struct _Reference_type 
-    { typedef _Tp& reference; };
-
-  template<> 
-    struct _Reference_type<void> 
-    { typedef _Invalid_type& reference; };
-
-  template<> 
-    struct _Reference_type<const void> 
-    { typedef const _Invalid_type& reference; };
-
-  template<> 
-    struct _Reference_type<volatile void> 
-    { typedef volatile _Invalid_type&  reference; };
-
-  template<> 
-    struct _Reference_type<volatile const void> 
-    { typedef const volatile _Invalid_type&  reference; };
-
-  /**
-   * This structure accommodates the way in which
-   * std::iterator_traits<> is normally specialized for const T*, so
-   * that value_type is still T.
-   */
-  template<typename _Tp> 
-    struct _Unqualified_type 
-    { typedef _Tp type; };
-    
-  template<typename _Tp> 
-    struct _Unqualified_type<const _Tp> 
-    { typedef _Tp type; };
-    
-  /**
-   * The following provides an 'alternative pointer' that works with
-   * the containers when specified as the pointer typedef of the
-   * allocator.
-   *
-   * The pointer type used with the containers doesn't have to be this
-   * class, but it must support the implicit conversions, pointer
-   * arithmetic, comparison operators, etc. that are supported by this
-   * class, and avoid raising compile-time ambiguities.  Because
-   * creating a working pointer can be challenging, this pointer
-   * template was designed to wrapper an easier storage policy type,
-   * so that it becomes reusable for creating other pointer types.
-   *
-   * A key point of this class is also that it allows container
-   * writers to 'assume' Allocator::pointer is a typedef for a normal
-   * pointer.  This class supports most of the conventions of a true
-   * pointer, and can, for instance handle implicit conversion to
-   * const and base class pointer types.  The only impositions on
-   * container writers to support extended pointers are: 1) use the
-   * Allocator::pointer typedef appropriately for pointer types.  2)
-   * if you need pointer casting, use the __pointer_cast<> functions
-   * from ext/cast.h.  This allows pointer cast operations to be
-   * overloaded as necessary by custom pointers.
-   *
-   * Note: The const qualifier works with this pointer adapter as
-   * follows:
-   *
-   * _Tp*             == _Pointer_adapter<_Std_pointer_impl<_Tp> >;
-   * const _Tp*       == _Pointer_adapter<_Std_pointer_impl<const _Tp> >;
-   * _Tp* const       == const _Pointer_adapter<_Std_pointer_impl<_Tp> >;
-   * const _Tp* const == const _Pointer_adapter<_Std_pointer_impl<const _Tp> >;
-   */
-  template<typename _Storage_policy>
-    class _Pointer_adapter : public _Storage_policy 
-    {
-    public:
-      typedef typename _Storage_policy::element_type element_type;
-
-      // These are needed for iterator_traits
-      typedef std::random_access_iterator_tag                iterator_category;
-      typedef typename _Unqualified_type<element_type>::type value_type;
-      typedef std::ptrdiff_t                                 difference_type;
-      typedef _Pointer_adapter                               pointer;
-      typedef typename _Reference_type<element_type>::reference  reference;
-
-      // Reminder: 'const' methods mean that the method is valid when the 
-      // pointer is immutable, and has nothing to do with whether the 
-      // 'pointee' is const.
-
-      // Default Constructor (Convert from element_type*)
-      _Pointer_adapter(element_type* __arg = 0)
-      { _Storage_policy::set(__arg); }
-
-      // Copy constructor from _Pointer_adapter of same type.
-      _Pointer_adapter(const _Pointer_adapter& __arg) 
-      { _Storage_policy::set(__arg.get()); }
-
-      // Convert from _Up* if conversion to element_type* is valid.
-      template<typename _Up>
-        _Pointer_adapter(_Up* __arg)
-        { _Storage_policy::set(__arg); }
-
-      // Conversion from another _Pointer_adapter if _Up if static cast is
-      // valid.
-      template<typename _Up>
-        _Pointer_adapter(const _Pointer_adapter<_Up>& __arg)
-        { _Storage_policy::set(__arg.get()); }
-
-      // Destructor
-      ~_Pointer_adapter() { }
-  
-      // Assignment operator
-      _Pointer_adapter&
-      operator=(const _Pointer_adapter& __arg) 
-      {
-        _Storage_policy::set(__arg.get()); 
-        return *this; 
-      }
-
-      template<typename _Up>
-        _Pointer_adapter&
-        operator=(const _Pointer_adapter<_Up>& __arg)
-        {
-          _Storage_policy::set(__arg.get()); 
-          return *this; 
-        }
-
-      template<typename _Up>
-        _Pointer_adapter&
-        operator=(_Up* __arg)
-        {
-          _Storage_policy::set(__arg); 
-          return *this; 
-        }
-
-      // Operator*, returns element_type&
-      inline reference 
-      operator*() const 
-      { return *(_Storage_policy::get()); }
-
-      // Operator->, returns element_type*
-      inline element_type* 
-      operator->() const 
-      { return _Storage_policy::get(); }
-
-      // Operator[], returns a element_type& to the item at that loc.
-      inline reference
-      operator[](std::ptrdiff_t __index) const
-      { return _Storage_policy::get()[__index]; }
-
-      // To allow implicit conversion to "bool", for "if (ptr)..."
-    private:
-      typedef element_type*(_Pointer_adapter::*__unspecified_bool_type)() const;
-
-    public:
-      operator __unspecified_bool_type() const
-      {
-        return _Storage_policy::get() == 0 ? 0 : 
-                         &_Pointer_adapter::operator->; 
-      }
-
-      // ! operator (for: if (!ptr)...)
-      inline bool
-      operator!() const 
-      { return (_Storage_policy::get() == 0); }
-  
-      // Pointer differences
-      inline friend std::ptrdiff_t 
-      operator-(const _Pointer_adapter& __lhs, element_type* __rhs) 
-      { return (__lhs.get() - __rhs); }
-  
-      inline friend std::ptrdiff_t 
-      operator-(element_type* __lhs, const _Pointer_adapter& __rhs) 
-      { return (__lhs - __rhs.get()); }
-  
-      template<typename _Up>
-        inline friend std::ptrdiff_t 
-        operator-(const _Pointer_adapter& __lhs, _Up* __rhs) 
-        { return (__lhs.get() - __rhs); }
-    
-      template<typename _Up>
-        inline friend std::ptrdiff_t 
-        operator-(_Up* __lhs, const _Pointer_adapter& __rhs)
-        { return (__lhs - __rhs.get()); }
-
-      template<typename _Up>
-        inline std::ptrdiff_t 
-        operator-(const _Pointer_adapter<_Up>& __rhs) const 
-        { return (_Storage_policy::get() - __rhs.get()); }
-  
-      // Pointer math
-      // Note: There is a reason for all this overloading based on different
-      // integer types.  In some libstdc++-v3 test cases, a templated
-      // operator+ is declared which can match any types.  This operator
-      // tends to "steal" the recognition of _Pointer_adapter's own operator+ 
-      // unless the integer type matches perfectly.
-
-#define _CXX_POINTER_ARITH_OPERATOR_SET(INT_TYPE) \
-      inline friend _Pointer_adapter \
-      operator+(const _Pointer_adapter& __lhs, INT_TYPE __offset) \
-      { return _Pointer_adapter(__lhs.get() + __offset); } \
-\
-      inline friend _Pointer_adapter \
-      operator+(INT_TYPE __offset, const _Pointer_adapter& __rhs) \
-      { return _Pointer_adapter(__rhs.get() + __offset); } \
-\
-      inline friend _Pointer_adapter \
-      operator-(const _Pointer_adapter& __lhs, INT_TYPE __offset) \
-      { return _Pointer_adapter(__lhs.get() - __offset); } \
-\
-      inline _Pointer_adapter& \
-      operator+=(INT_TYPE __offset) \
-      { \
-        _Storage_policy::set(_Storage_policy::get() + __offset); \
-        return *this; \
-      } \
-\
-      inline _Pointer_adapter& \
-      operator-=(INT_TYPE __offset) \
-      { \
-        _Storage_policy::set(_Storage_policy::get() - __offset); \
-        return *this; \
-      } \
-// END of _CXX_POINTER_ARITH_OPERATOR_SET macro
-  
-      // Expand into the various pointer arithmetic operators needed.
-      _CXX_POINTER_ARITH_OPERATOR_SET(short);
-      _CXX_POINTER_ARITH_OPERATOR_SET(unsigned short);
-      _CXX_POINTER_ARITH_OPERATOR_SET(int);
-      _CXX_POINTER_ARITH_OPERATOR_SET(unsigned int);
-      _CXX_POINTER_ARITH_OPERATOR_SET(long);
-      _CXX_POINTER_ARITH_OPERATOR_SET(unsigned long);
-
-      // Mathematical Manipulators
-      inline _Pointer_adapter& 
-      operator++()
-      {
-        _Storage_policy::set(_Storage_policy::get() + 1); 
-        return *this;
-      }
-  
-      inline _Pointer_adapter 
-      operator++(int)
-      {
-        _Pointer_adapter tmp(*this);
-        _Storage_policy::set(_Storage_policy::get() + 1);
-        return tmp;
-      }
-  
-      inline _Pointer_adapter& 
-      operator--() 
-      {
-        _Storage_policy::set(_Storage_policy::get() - 1); 
-        return *this;
-      }
-  
-      inline _Pointer_adapter
-      operator--(int) 
-      {
-        _Pointer_adapter tmp(*this);
-        _Storage_policy::set(_Storage_policy::get() - 1);
-        return tmp;
-      }
-  
-    }; // class _Pointer_adapter
-
-
-#define _GCC_CXX_POINTER_COMPARISON_OPERATION_SET(OPERATOR) \
-  template<typename _Tp1, typename _Tp2> \
-    inline bool \
-    operator OPERATOR(const _Pointer_adapter<_Tp1>& __lhs, _Tp2 __rhs) \
-    { return __lhs.get() OPERATOR __rhs; } \
-\
-  template<typename _Tp1, typename _Tp2> \
-    inline bool \
-    operator OPERATOR(_Tp1 __lhs, const _Pointer_adapter<_Tp2>& __rhs) \
-    { return __lhs OPERATOR __rhs.get(); } \
-\
-  template<typename _Tp1, typename _Tp2> \
-    inline bool \
-    operator OPERATOR(const _Pointer_adapter<_Tp1>& __lhs, \
-                              const _Pointer_adapter<_Tp2>& __rhs) \
-    { return __lhs.get() OPERATOR __rhs.get(); } \
-\
-// End GCC_CXX_POINTER_COMPARISON_OPERATION_SET Macro
-  
-  // Expand into the various comparison operators needed.
-  _GCC_CXX_POINTER_COMPARISON_OPERATION_SET(==)
-  _GCC_CXX_POINTER_COMPARISON_OPERATION_SET(!=)
-  _GCC_CXX_POINTER_COMPARISON_OPERATION_SET(<)
-  _GCC_CXX_POINTER_COMPARISON_OPERATION_SET(<=)
-  _GCC_CXX_POINTER_COMPARISON_OPERATION_SET(>)
-  _GCC_CXX_POINTER_COMPARISON_OPERATION_SET(>=)
-
-  // These are here for expressions like "ptr == 0", "ptr != 0"
-  template<typename _Tp>
-    inline bool
-    operator==(const _Pointer_adapter<_Tp>& __lhs, int __rhs)
-    { return __lhs.get() == reinterpret_cast<void*>(__rhs); } 
-
-  template<typename _Tp>
-    inline bool
-    operator==(int __lhs, const _Pointer_adapter<_Tp>& __rhs)
-    { return __rhs.get() == reinterpret_cast<void*>(__lhs); } 
-
-  template<typename _Tp>
-    inline bool
-    operator!=(const _Pointer_adapter<_Tp>& __lhs, int __rhs)
-    { return __lhs.get() != reinterpret_cast<void*>(__rhs); } 
-
-  template<typename _Tp>
-    inline bool
-    operator!=(int __lhs, const _Pointer_adapter<_Tp>& __rhs)
-    { return __rhs.get() != reinterpret_cast<void*>(__lhs); } 
-
-  /**
-   * Comparison operators for _Pointer_adapter defer to the base class'
-   * comparison operators, when possible.
-   */
-  template<typename _Tp>
-    inline bool
-    operator==(const _Pointer_adapter<_Tp>& __lhs, 
-               const _Pointer_adapter<_Tp>& __rhs)
-    { return __lhs._Tp::operator==(__rhs); }
-
-  template<typename _Tp>
-    inline bool
-    operator<=(const _Pointer_adapter<_Tp>& __lhs, 
-               const _Pointer_adapter<_Tp>& __rhs)
-    { return __lhs._Tp::operator<(__rhs) || __lhs._Tp::operator==(__rhs); }
-
-  template<typename _Tp>
-    inline bool
-    operator!=(const _Pointer_adapter<_Tp>& __lhs, 
-               const _Pointer_adapter<_Tp>& __rhs)
-    { return !(__lhs._Tp::operator==(__rhs)); }
-
-  template<typename _Tp>
-    inline bool
-    operator>(const _Pointer_adapter<_Tp>& __lhs, 
-              const _Pointer_adapter<_Tp>& __rhs)
-    { return !(__lhs._Tp::operator<(__rhs) || __lhs._Tp::operator==(__rhs)); }
-
-  template<typename _Tp>
-    inline bool
-    operator>=(const _Pointer_adapter<_Tp>& __lhs, 
-               const _Pointer_adapter<_Tp>& __rhs)
-    { return !(__lhs._Tp::operator<(__rhs)); }
-
-  template<typename _CharT, typename _Traits, typename _StoreT>
-    inline std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os, 
-               const _Pointer_adapter<_StoreT>& __p)
-    { return (__os << __p.get()); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if __cplusplus >= 201103L
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Storage_policy>
-    struct pointer_traits<__gnu_cxx::_Pointer_adapter<_Storage_policy>>
-    {
-      /// The pointer type
-      typedef __gnu_cxx::_Pointer_adapter<_Storage_policy>         pointer;
-      /// The type pointed to
-      typedef typename pointer::element_type            element_type;
-      /// Type used to represent the difference between two pointers
-      typedef typename pointer::difference_type         difference_type;
-
-      template<typename _Up>
-        using rebind = typename __gnu_cxx::_Pointer_adapter<
-	typename pointer_traits<_Storage_policy>::template rebind<_Up>>;
-
-      static pointer pointer_to(typename pointer::reference __r) noexcept
-      { return pointer(std::addressof(__r)); }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-#endif
-
-#endif // _POINTER_H
diff --git a/openflow/usr/include/c++/5/ext/pool_allocator.h b/openflow/usr/include/c++/5/ext/pool_allocator.h
deleted file mode 100644
index 5fe6bed..0000000
--- a/openflow/usr/include/c++/5/ext/pool_allocator.h
+++ /dev/null
@@ -1,280 +0,0 @@
-// Allocators -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1996-1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/pool_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _POOL_ALLOCATOR_H
-#define _POOL_ALLOCATOR_H 1
-
-#include <bits/c++config.h>
-#include <cstdlib>
-#include <new>
-#include <bits/functexcept.h>
-#include <ext/atomicity.h>
-#include <ext/concurrence.h>
-#include <bits/move.h>
-#if __cplusplus >= 201103L
-#include <type_traits>
-#endif
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::size_t;
-  using std::ptrdiff_t;
-
-  /**
-   *  @brief  Base class for __pool_alloc.
-   *
-   *  Uses various allocators to fulfill underlying requests (and makes as
-   *  few requests as possible when in default high-speed pool mode).
-   *
-   *  Important implementation properties:
-   *  0. If globally mandated, then allocate objects from new
-   *  1. If the clients request an object of size > _S_max_bytes, the resulting
-   *     object will be obtained directly from new
-   *  2. In all other cases, we allocate an object of size exactly
-   *     _S_round_up(requested_size).  Thus the client has enough size
-   *     information that we can return the object to the proper free list
-   *     without permanently losing part of the object.
-   */
-    class __pool_alloc_base
-    {
-    protected:
-
-      enum { _S_align = 8 };
-      enum { _S_max_bytes = 128 };
-      enum { _S_free_list_size = (size_t)_S_max_bytes / (size_t)_S_align };
-      
-      union _Obj
-      {
-	union _Obj* _M_free_list_link;
-	char        _M_client_data[1];    // The client sees this.
-      };
-      
-      static _Obj* volatile         _S_free_list[_S_free_list_size];
-
-      // Chunk allocation state.
-      static char*                  _S_start_free;
-      static char*                  _S_end_free;
-      static size_t                 _S_heap_size;     
-      
-      size_t
-      _M_round_up(size_t __bytes)
-      { return ((__bytes + (size_t)_S_align - 1) & ~((size_t)_S_align - 1)); }
-      
-      _GLIBCXX_CONST _Obj* volatile*
-      _M_get_free_list(size_t __bytes) throw ();
-    
-      __mutex&
-      _M_get_mutex() throw ();
-
-      // Returns an object of size __n, and optionally adds to size __n
-      // free list.
-      void*
-      _M_refill(size_t __n);
-      
-      // Allocates a chunk for nobjs of size size.  nobjs may be reduced
-      // if it is inconvenient to allocate the requested number.
-      char*
-      _M_allocate_chunk(size_t __n, int& __nobjs);
-    };
-
-
-  /**
-   * @brief  Allocator using a memory pool with a single lock.
-   * @ingroup allocators
-   */
-  template<typename _Tp>
-    class __pool_alloc : private __pool_alloc_base
-    {
-    private:
-      static _Atomic_word	    _S_force_new;
-
-    public:
-      typedef size_t     size_type;
-      typedef ptrdiff_t  difference_type;
-      typedef _Tp*       pointer;
-      typedef const _Tp* const_pointer;
-      typedef _Tp&       reference;
-      typedef const _Tp& const_reference;
-      typedef _Tp        value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef __pool_alloc<_Tp1> other; };
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2103. propagate_on_container_move_assignment
-      typedef std::true_type propagate_on_container_move_assignment;
-#endif
-
-      __pool_alloc() _GLIBCXX_USE_NOEXCEPT { }
-
-      __pool_alloc(const __pool_alloc&) _GLIBCXX_USE_NOEXCEPT { }
-
-      template<typename _Tp1>
-        __pool_alloc(const __pool_alloc<_Tp1>&) _GLIBCXX_USE_NOEXCEPT { }
-
-      ~__pool_alloc() _GLIBCXX_USE_NOEXCEPT { }
-
-      pointer
-      address(reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      const_pointer
-      address(const_reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      size_type
-      max_size() const _GLIBCXX_USE_NOEXCEPT 
-      { return size_t(-1) / sizeof(_Tp); }
-
-#if __cplusplus >= 201103L
-      template<typename _Up, typename... _Args>
-        void
-        construct(_Up* __p, _Args&&... __args)
-	{ ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
-
-      template<typename _Up>
-        void 
-        destroy(_Up* __p) { __p->~_Up(); }
-#else
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_] allocator::construct
-      void 
-      construct(pointer __p, const _Tp& __val) 
-      { ::new((void *)__p) _Tp(__val); }
-
-      void 
-      destroy(pointer __p) { __p->~_Tp(); }
-#endif
-
-      pointer
-      allocate(size_type __n, const void* = 0);
-
-      void
-      deallocate(pointer __p, size_type __n);      
-    };
-
-  template<typename _Tp>
-    inline bool
-    operator==(const __pool_alloc<_Tp>&, const __pool_alloc<_Tp>&)
-    { return true; }
-
-  template<typename _Tp>
-    inline bool
-    operator!=(const __pool_alloc<_Tp>&, const __pool_alloc<_Tp>&)
-    { return false; }
-
-  template<typename _Tp>
-    _Atomic_word
-    __pool_alloc<_Tp>::_S_force_new;
-
-  template<typename _Tp>
-    _Tp*
-    __pool_alloc<_Tp>::allocate(size_type __n, const void*)
-    {
-      pointer __ret = 0;
-      if (__builtin_expect(__n != 0, true))
-	{
-	  if (__n > this->max_size())
-	    std::__throw_bad_alloc();
-
-	  // If there is a race through here, assume answer from getenv
-	  // will resolve in same direction.  Inspired by techniques
-	  // to efficiently support threading found in basic_string.h.
-	  if (_S_force_new == 0)
-	    {
-	      if (std::getenv("GLIBCXX_FORCE_NEW"))
-		__atomic_add_dispatch(&_S_force_new, 1);
-	      else
-		__atomic_add_dispatch(&_S_force_new, -1);
-	    }
-
-	  const size_t __bytes = __n * sizeof(_Tp);	      
-	  if (__bytes > size_t(_S_max_bytes) || _S_force_new > 0)
-	    __ret = static_cast<_Tp*>(::operator new(__bytes));
-	  else
-	    {
-	      _Obj* volatile* __free_list = _M_get_free_list(__bytes);
-	      
-	      __scoped_lock sentry(_M_get_mutex());
-	      _Obj* __restrict__ __result = *__free_list;
-	      if (__builtin_expect(__result == 0, 0))
-		__ret = static_cast<_Tp*>(_M_refill(_M_round_up(__bytes)));
-	      else
-		{
-		  *__free_list = __result->_M_free_list_link;
-		  __ret = reinterpret_cast<_Tp*>(__result);
-		}
-	      if (__ret == 0)
-		std::__throw_bad_alloc();
-	    }
-	}
-      return __ret;
-    }
-
-  template<typename _Tp>
-    void
-    __pool_alloc<_Tp>::deallocate(pointer __p, size_type __n)
-    {
-      if (__builtin_expect(__n != 0 && __p != 0, true))
-	{
-	  const size_t __bytes = __n * sizeof(_Tp);
-	  if (__bytes > static_cast<size_t>(_S_max_bytes) || _S_force_new > 0)
-	    ::operator delete(__p);
-	  else
-	    {
-	      _Obj* volatile* __free_list = _M_get_free_list(__bytes);
-	      _Obj* __q = reinterpret_cast<_Obj*>(__p);
-
-	      __scoped_lock sentry(_M_get_mutex());
-	      __q ->_M_free_list_link = *__free_list;
-	      *__free_list = __q;
-	    }
-	}
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/random b/openflow/usr/include/c++/5/ext/random
deleted file mode 100644
index 37bc732..0000000
--- a/openflow/usr/include/c++/5/ext/random
+++ /dev/null
@@ -1,3500 +0,0 @@
-// Random number extensions -*- C++ -*-
-
-// Copyright (C) 2012-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/random
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _EXT_RANDOM
-#define _EXT_RANDOM 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <random>
-#include <algorithm>
-#include <array>
-#include <ext/cmath>
-#ifdef __SSE2__
-# include <x86intrin.h>
-#endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-
-  /* Mersenne twister implementation optimized for vector operations.
-   *
-   * Reference: http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/
-   */
-  template<typename _UIntType, size_t __m,
-	   size_t __pos1, size_t __sl1, size_t __sl2,
-	   size_t __sr1, size_t __sr2,
-	   uint32_t __msk1, uint32_t __msk2,
-	   uint32_t __msk3, uint32_t __msk4,
-	   uint32_t __parity1, uint32_t __parity2,
-	   uint32_t __parity3, uint32_t __parity4>
-    class simd_fast_mersenne_twister_engine
-    {
-      static_assert(std::is_unsigned<_UIntType>::value, "template argument "
-		    "substituting _UIntType not an unsigned integral type");
-      static_assert(__sr1 < 32, "first right shift too large");
-      static_assert(__sr2 < 16, "second right shift too large");
-      static_assert(__sl1 < 32, "first left shift too large");
-      static_assert(__sl2 < 16, "second left shift too large");
-
-    public:
-      typedef _UIntType result_type;
-
-    private:
-      static constexpr size_t m_w = sizeof(result_type) * 8;
-      static constexpr size_t _M_nstate = __m / 128 + 1;
-      static constexpr size_t _M_nstate32 = _M_nstate * 4;
-
-      static_assert(std::is_unsigned<_UIntType>::value, "template argument "
-		    "substituting _UIntType not an unsigned integral type");
-      static_assert(__pos1 < _M_nstate, "POS1 not smaller than state size");
-      static_assert(16 % sizeof(_UIntType) == 0,
-		    "UIntType size must divide 16");
-
-    public:
-      static constexpr size_t state_size = _M_nstate * (16
-							/ sizeof(result_type));
-      static constexpr result_type default_seed = 5489u;
-
-      // constructors and member function
-      explicit
-      simd_fast_mersenne_twister_engine(result_type __sd = default_seed)
-      { seed(__sd); }
-
-      template<typename _Sseq, typename = typename
-	std::enable_if<!std::is_same<_Sseq,
-				     simd_fast_mersenne_twister_engine>::value>
-	       ::type>
-	explicit
-	simd_fast_mersenne_twister_engine(_Sseq& __q)
-	{ seed(__q); }
-
-      void
-      seed(result_type __sd = default_seed);
-
-      template<typename _Sseq>
-	typename std::enable_if<std::is_class<_Sseq>::value>::type
-	seed(_Sseq& __q);
-
-      static constexpr result_type
-      min()
-      { return 0; };
-
-      static constexpr result_type
-      max()
-      { return std::numeric_limits<result_type>::max(); }
-
-      void
-      discard(unsigned long long __z);
-
-      result_type
-      operator()()
-      {
-	if (__builtin_expect(_M_pos >= state_size, 0))
-	  _M_gen_rand();
-
-	return _M_stateT[_M_pos++];
-      }
-
-      template<typename _UIntType_2, size_t __m_2,
-	       size_t __pos1_2, size_t __sl1_2, size_t __sl2_2,
-	       size_t __sr1_2, size_t __sr2_2,
-	       uint32_t __msk1_2, uint32_t __msk2_2,
-	       uint32_t __msk3_2, uint32_t __msk4_2,
-	       uint32_t __parity1_2, uint32_t __parity2_2,
-	       uint32_t __parity3_2, uint32_t __parity4_2>
-	friend bool
-	operator==(const simd_fast_mersenne_twister_engine<_UIntType_2,
-		   __m_2, __pos1_2, __sl1_2, __sl2_2, __sr1_2, __sr2_2,
-		   __msk1_2, __msk2_2, __msk3_2, __msk4_2,
-		   __parity1_2, __parity2_2, __parity3_2, __parity4_2>& __lhs,
-		   const simd_fast_mersenne_twister_engine<_UIntType_2,
-		   __m_2, __pos1_2, __sl1_2, __sl2_2, __sr1_2, __sr2_2,
-		   __msk1_2, __msk2_2, __msk3_2, __msk4_2,
-		   __parity1_2, __parity2_2, __parity3_2, __parity4_2>& __rhs);
-
-      template<typename _UIntType_2, size_t __m_2,
-	       size_t __pos1_2, size_t __sl1_2, size_t __sl2_2,
-	       size_t __sr1_2, size_t __sr2_2,
-	       uint32_t __msk1_2, uint32_t __msk2_2,
-	       uint32_t __msk3_2, uint32_t __msk4_2,
-	       uint32_t __parity1_2, uint32_t __parity2_2,
-	       uint32_t __parity3_2, uint32_t __parity4_2,
-	       typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const __gnu_cxx::simd_fast_mersenne_twister_engine
-		   <_UIntType_2,
-		   __m_2, __pos1_2, __sl1_2, __sl2_2, __sr1_2, __sr2_2,
-		   __msk1_2, __msk2_2, __msk3_2, __msk4_2,
-		   __parity1_2, __parity2_2, __parity3_2, __parity4_2>& __x);
-
-      template<typename _UIntType_2, size_t __m_2,
-	       size_t __pos1_2, size_t __sl1_2, size_t __sl2_2,
-	       size_t __sr1_2, size_t __sr2_2,
-	       uint32_t __msk1_2, uint32_t __msk2_2,
-	       uint32_t __msk3_2, uint32_t __msk4_2,
-	       uint32_t __parity1_2, uint32_t __parity2_2,
-	       uint32_t __parity3_2, uint32_t __parity4_2,
-	       typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   __gnu_cxx::simd_fast_mersenne_twister_engine<_UIntType_2,
-		   __m_2, __pos1_2, __sl1_2, __sl2_2, __sr1_2, __sr2_2,
-		   __msk1_2, __msk2_2, __msk3_2, __msk4_2,
-		   __parity1_2, __parity2_2, __parity3_2, __parity4_2>& __x);
-
-    private:
-      union
-      {
-#ifdef __SSE2__
-	__m128i _M_state[_M_nstate];
-#endif
-	uint32_t _M_state32[_M_nstate32];
-	result_type _M_stateT[state_size];
-      } __attribute__ ((__aligned__ (16)));
-      size_t _M_pos;
-
-      void _M_gen_rand(void);
-      void _M_period_certification();
-  };
-
-
-  template<typename _UIntType, size_t __m,
-	   size_t __pos1, size_t __sl1, size_t __sl2,
-	   size_t __sr1, size_t __sr2,
-	   uint32_t __msk1, uint32_t __msk2,
-	   uint32_t __msk3, uint32_t __msk4,
-	   uint32_t __parity1, uint32_t __parity2,
-	   uint32_t __parity3, uint32_t __parity4>
-    inline bool
-    operator!=(const __gnu_cxx::simd_fast_mersenne_twister_engine<_UIntType,
-	       __m, __pos1, __sl1, __sl2, __sr1, __sr2, __msk1, __msk2, __msk3,
-	       __msk4, __parity1, __parity2, __parity3, __parity4>& __lhs,
-	       const __gnu_cxx::simd_fast_mersenne_twister_engine<_UIntType,
-	       __m, __pos1, __sl1, __sl2, __sr1, __sr2, __msk1, __msk2, __msk3,
-	       __msk4, __parity1, __parity2, __parity3, __parity4>& __rhs)
-    { return !(__lhs == __rhs); }
-
-
-  /* Definitions for the SIMD-oriented Fast Mersenne Twister as defined
-   * in the C implementation by Daito and Matsumoto, as both a 32-bit
-   * and 64-bit version.
-   */
-  typedef simd_fast_mersenne_twister_engine<uint32_t, 607, 2,
-					    15, 3, 13, 3,
-					    0xfdff37ffU, 0xef7f3f7dU,
-					    0xff777b7dU, 0x7ff7fb2fU,
-					    0x00000001U, 0x00000000U,
-					    0x00000000U, 0x5986f054U>
-    sfmt607;
-
-  typedef simd_fast_mersenne_twister_engine<uint64_t, 607, 2,
-					    15, 3, 13, 3,
-					    0xfdff37ffU, 0xef7f3f7dU,
-					    0xff777b7dU, 0x7ff7fb2fU,
-					    0x00000001U, 0x00000000U,
-					    0x00000000U, 0x5986f054U>
-    sfmt607_64;
-
-
-  typedef simd_fast_mersenne_twister_engine<uint32_t, 1279, 7,
-					    14, 3, 5, 1,
-					    0xf7fefffdU, 0x7fefcfffU,
-					    0xaff3ef3fU, 0xb5ffff7fU,
-					    0x00000001U, 0x00000000U,
-					    0x00000000U, 0x20000000U>
-    sfmt1279;
-
-  typedef simd_fast_mersenne_twister_engine<uint64_t, 1279, 7,
-					    14, 3, 5, 1,
-					    0xf7fefffdU, 0x7fefcfffU,
-					    0xaff3ef3fU, 0xb5ffff7fU,
-					    0x00000001U, 0x00000000U,
-					    0x00000000U, 0x20000000U>
-    sfmt1279_64;
-
-
-  typedef simd_fast_mersenne_twister_engine<uint32_t, 2281, 12,
-					    19, 1, 5, 1,
-					    0xbff7ffbfU, 0xfdfffffeU,
-					    0xf7ffef7fU, 0xf2f7cbbfU,
-					    0x00000001U, 0x00000000U,
-					    0x00000000U, 0x41dfa600U>
-    sfmt2281;
-
-  typedef simd_fast_mersenne_twister_engine<uint64_t, 2281, 12,
-					    19, 1, 5, 1,
-					    0xbff7ffbfU, 0xfdfffffeU,
-					    0xf7ffef7fU, 0xf2f7cbbfU,
-					    0x00000001U, 0x00000000U,
-					    0x00000000U, 0x41dfa600U>
-    sfmt2281_64;
-
-
-  typedef simd_fast_mersenne_twister_engine<uint32_t, 4253, 17,
-					    20, 1, 7, 1,
-					    0x9f7bffffU, 0x9fffff5fU,
-					    0x3efffffbU, 0xfffff7bbU,
-					    0xa8000001U, 0xaf5390a3U,
-					    0xb740b3f8U, 0x6c11486dU>
-    sfmt4253;
-
-  typedef simd_fast_mersenne_twister_engine<uint64_t, 4253, 17,
-					    20, 1, 7, 1,
-					    0x9f7bffffU, 0x9fffff5fU,
-					    0x3efffffbU, 0xfffff7bbU,
-					    0xa8000001U, 0xaf5390a3U,
-					    0xb740b3f8U, 0x6c11486dU>
-    sfmt4253_64;
-
-
-  typedef simd_fast_mersenne_twister_engine<uint32_t, 11213, 68,
-					    14, 3, 7, 3,
-					    0xeffff7fbU, 0xffffffefU,
-					    0xdfdfbfffU, 0x7fffdbfdU,
-					    0x00000001U, 0x00000000U,
-					    0xe8148000U, 0xd0c7afa3U>
-    sfmt11213;
-
-  typedef simd_fast_mersenne_twister_engine<uint64_t, 11213, 68,
-					    14, 3, 7, 3,
-					    0xeffff7fbU, 0xffffffefU,
-					    0xdfdfbfffU, 0x7fffdbfdU,
-					    0x00000001U, 0x00000000U,
-					    0xe8148000U, 0xd0c7afa3U>
-    sfmt11213_64;
-
-
-  typedef simd_fast_mersenne_twister_engine<uint32_t, 19937, 122,
-					    18, 1, 11, 1,
-					    0xdfffffefU, 0xddfecb7fU,
-					    0xbffaffffU, 0xbffffff6U,
-					    0x00000001U, 0x00000000U,
-					    0x00000000U, 0x13c9e684U>
-    sfmt19937;
-
-  typedef simd_fast_mersenne_twister_engine<uint64_t, 19937, 122,
-					    18, 1, 11, 1,
-					    0xdfffffefU, 0xddfecb7fU,
-					    0xbffaffffU, 0xbffffff6U,
-					    0x00000001U, 0x00000000U,
-					    0x00000000U, 0x13c9e684U>
-    sfmt19937_64;
-
-
-  typedef simd_fast_mersenne_twister_engine<uint32_t, 44497, 330,
-					    5, 3, 9, 3,
-					    0xeffffffbU, 0xdfbebfffU,
-					    0xbfbf7befU, 0x9ffd7bffU,
-					    0x00000001U, 0x00000000U,
-					    0xa3ac4000U, 0xecc1327aU>
-    sfmt44497;
-
-  typedef simd_fast_mersenne_twister_engine<uint64_t, 44497, 330,
-					    5, 3, 9, 3,
-					    0xeffffffbU, 0xdfbebfffU,
-					    0xbfbf7befU, 0x9ffd7bffU,
-					    0x00000001U, 0x00000000U,
-					    0xa3ac4000U, 0xecc1327aU>
-    sfmt44497_64;
-
-
-  typedef simd_fast_mersenne_twister_engine<uint32_t, 86243, 366,
-					    6, 7, 19, 1,
-					    0xfdbffbffU, 0xbff7ff3fU,
-					    0xfd77efffU, 0xbf9ff3ffU,
-					    0x00000001U, 0x00000000U,
-					    0x00000000U, 0xe9528d85U>
-    sfmt86243;
-
-  typedef simd_fast_mersenne_twister_engine<uint64_t, 86243, 366,
-					    6, 7, 19, 1,
-					    0xfdbffbffU, 0xbff7ff3fU,
-					    0xfd77efffU, 0xbf9ff3ffU,
-					    0x00000001U, 0x00000000U,
-					    0x00000000U, 0xe9528d85U>
-    sfmt86243_64;
-
-
-  typedef simd_fast_mersenne_twister_engine<uint32_t, 132049, 110,
-					    19, 1, 21, 1,
-					    0xffffbb5fU, 0xfb6ebf95U,
-					    0xfffefffaU, 0xcff77fffU,
-					    0x00000001U, 0x00000000U,
-					    0xcb520000U, 0xc7e91c7dU>
-    sfmt132049;
-
-  typedef simd_fast_mersenne_twister_engine<uint64_t, 132049, 110,
-					    19, 1, 21, 1,
-					    0xffffbb5fU, 0xfb6ebf95U,
-					    0xfffefffaU, 0xcff77fffU,
-					    0x00000001U, 0x00000000U,
-					    0xcb520000U, 0xc7e91c7dU>
-    sfmt132049_64;
-
-
-  typedef simd_fast_mersenne_twister_engine<uint32_t, 216091, 627,
-					    11, 3, 10, 1,
-					    0xbff7bff7U, 0xbfffffffU,
-					    0xbffffa7fU, 0xffddfbfbU,
-					    0xf8000001U, 0x89e80709U,
-					    0x3bd2b64bU, 0x0c64b1e4U>
-    sfmt216091;
-
-  typedef simd_fast_mersenne_twister_engine<uint64_t, 216091, 627,
-					    11, 3, 10, 1,
-					    0xbff7bff7U, 0xbfffffffU,
-					    0xbffffa7fU, 0xffddfbfbU,
-					    0xf8000001U, 0x89e80709U,
-					    0x3bd2b64bU, 0x0c64b1e4U>
-    sfmt216091_64;
-
-#endif // __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-
-  /**
-   * @brief A beta continuous distribution for random numbers.
-   *
-   * The formula for the beta probability density function is:
-   * @f[
-   *     p(x|\alpha,\beta) = \frac{1}{B(\alpha,\beta)}
-   *                         x^{\alpha - 1} (1 - x)^{\beta - 1}
-   * @f]
-   */
-  template<typename _RealType = double>
-    class beta_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef beta_distribution<_RealType> distribution_type;
-	friend class beta_distribution<_RealType>;
-
-	explicit
-	param_type(_RealType __alpha_val = _RealType(1),
-		   _RealType __beta_val = _RealType(1))
-	: _M_alpha(__alpha_val), _M_beta(__beta_val)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_alpha > _RealType(0));
-	  _GLIBCXX_DEBUG_ASSERT(_M_beta > _RealType(0));
-	}
-
-	_RealType
-	alpha() const
-	{ return _M_alpha; }
-
-	_RealType
-	beta() const
-	{ return _M_beta; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return (__p1._M_alpha == __p2._M_alpha
-		  && __p1._M_beta == __p2._M_beta); }
-
-      private:
-	void
-	_M_initialize();
-
-	_RealType _M_alpha;
-	_RealType _M_beta;
-      };
-
-    public:
-      /**
-       * @brief Constructs a beta distribution with parameters
-       * @f$\alpha@f$ and @f$\beta@f$.
-       */
-      explicit
-      beta_distribution(_RealType __alpha_val = _RealType(1),
-			_RealType __beta_val = _RealType(1))
-      : _M_param(__alpha_val, __beta_val)
-      { }
-
-      explicit
-      beta_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       * @brief Returns the @f$\alpha@f$ of the distribution.
-       */
-      _RealType
-      alpha() const
-      { return _M_param.alpha(); }
-
-      /**
-       * @brief Returns the @f$\beta@f$ of the distribution.
-       */
-      _RealType
-      beta() const
-      { return _M_param.beta(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return result_type(1); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two beta distributions have the same
-       *        parameters and the sequences that would be generated
-       *        are equal.
-       */
-      friend bool
-      operator==(const beta_distribution& __d1,
-		 const beta_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-      /**
-       * @brief Inserts a %beta_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %beta_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const __gnu_cxx::beta_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %beta_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %beta_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   __gnu_cxx::beta_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-   * @brief Return true if two beta distributions are different.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const __gnu_cxx::beta_distribution<_RealType>& __d1,
-	       const __gnu_cxx::beta_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A multi-variate normal continuous distribution for random numbers.
-   *
-   * The formula for the normal probability density function is
-   * @f[
-   *     p(\overrightarrow{x}|\overrightarrow{\mu },\Sigma) =
-   *       \frac{1}{\sqrt{(2\pi )^k\det(\Sigma))}}
-   *       e^{-\frac{1}{2}(\overrightarrow{x}-\overrightarrow{\mu})^\text{T}
-   *          \Sigma ^{-1}(\overrightarrow{x}-\overrightarrow{\mu})}
-   * @f]
-   *
-   * where @f$\overrightarrow{x}@f$ and @f$\overrightarrow{\mu}@f$ are
-   * vectors of dimension @f$k@f$ and @f$\Sigma@f$ is the covariance
-   * matrix (which must be positive-definite).
-   */
-  template<std::size_t _Dimen, typename _RealType = double>
-    class normal_mv_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-      static_assert(_Dimen != 0, "dimension is zero");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef std::array<_RealType, _Dimen> result_type;
-      /** Parameter type. */
-      class param_type
-      {
-	static constexpr size_t _M_t_size = _Dimen * (_Dimen + 1) / 2;
-
-      public:
-	typedef normal_mv_distribution<_Dimen, _RealType> distribution_type;
-	friend class normal_mv_distribution<_Dimen, _RealType>;
-
-	param_type()
-	{
-	  std::fill(_M_mean.begin(), _M_mean.end(), _RealType(0));
-	  auto __it = _M_t.begin();
-	  for (size_t __i = 0; __i < _Dimen; ++__i)
-	    {
-	      std::fill_n(__it, __i, _RealType(0));
-	      __it += __i;
-	      *__it++ = _RealType(1);
-	    }
-	}
-
-	template<typename _ForwardIterator1, typename _ForwardIterator2>
-	  param_type(_ForwardIterator1 __meanbegin,
-		     _ForwardIterator1 __meanend,
-		     _ForwardIterator2 __varcovbegin,
-		     _ForwardIterator2 __varcovend)
-	{
-	  __glibcxx_function_requires(_ForwardIteratorConcept<
-				      _ForwardIterator1>)
-	  __glibcxx_function_requires(_ForwardIteratorConcept<
-				      _ForwardIterator2>)
-	  _GLIBCXX_DEBUG_ASSERT(std::distance(__meanbegin, __meanend)
-				<= _Dimen);
-	  const auto __dist = std::distance(__varcovbegin, __varcovend);
-	  _GLIBCXX_DEBUG_ASSERT(__dist == _Dimen * _Dimen
-				|| __dist == _Dimen * (_Dimen + 1) / 2
-				|| __dist == _Dimen);
-
-	  if (__dist == _Dimen * _Dimen)
-	    _M_init_full(__meanbegin, __meanend, __varcovbegin, __varcovend);
-	  else if (__dist == _Dimen * (_Dimen + 1) / 2)
-	    _M_init_lower(__meanbegin, __meanend, __varcovbegin, __varcovend);
-	  else
-	    _M_init_diagonal(__meanbegin, __meanend,
-			     __varcovbegin, __varcovend);
-	}
-
-	param_type(std::initializer_list<_RealType> __mean,
-		   std::initializer_list<_RealType> __varcov)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(__mean.size() <= _Dimen);
-	  _GLIBCXX_DEBUG_ASSERT(__varcov.size() == _Dimen * _Dimen
-				|| __varcov.size() == _Dimen * (_Dimen + 1) / 2
-				|| __varcov.size() == _Dimen);
-
-	  if (__varcov.size() == _Dimen * _Dimen)
-	    _M_init_full(__mean.begin(), __mean.end(),
-			 __varcov.begin(), __varcov.end());
-	  else if (__varcov.size() == _Dimen * (_Dimen + 1) / 2)
-	    _M_init_lower(__mean.begin(), __mean.end(),
-			  __varcov.begin(), __varcov.end());
-	  else
-	    _M_init_diagonal(__mean.begin(), __mean.end(),
-			     __varcov.begin(), __varcov.end());
-	}
-
-	std::array<_RealType, _Dimen>
-	mean() const
-	{ return _M_mean; }
-
-	std::array<_RealType, _M_t_size>
-	varcov() const
-	{ return _M_t; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_mean == __p2._M_mean && __p1._M_t == __p2._M_t; }
-
-      private:
-	template <typename _InputIterator1, typename _InputIterator2>
-	  void _M_init_full(_InputIterator1 __meanbegin,
-			    _InputIterator1 __meanend,
-			    _InputIterator2 __varcovbegin,
-			    _InputIterator2 __varcovend);
-	template <typename _InputIterator1, typename _InputIterator2>
-	  void _M_init_lower(_InputIterator1 __meanbegin,
-			     _InputIterator1 __meanend,
-			     _InputIterator2 __varcovbegin,
-			     _InputIterator2 __varcovend);
-	template <typename _InputIterator1, typename _InputIterator2>
-	  void _M_init_diagonal(_InputIterator1 __meanbegin,
-				_InputIterator1 __meanend,
-				_InputIterator2 __varbegin,
-				_InputIterator2 __varend);
-
-	std::array<_RealType, _Dimen> _M_mean;
-	std::array<_RealType, _M_t_size> _M_t;
-      };
-
-    public:
-      normal_mv_distribution()
-      : _M_param(), _M_nd()
-      { }
-
-      template<typename _ForwardIterator1, typename _ForwardIterator2>
-	normal_mv_distribution(_ForwardIterator1 __meanbegin,
-			       _ForwardIterator1 __meanend,
-			       _ForwardIterator2 __varcovbegin,
-			       _ForwardIterator2 __varcovend)
-	: _M_param(__meanbegin, __meanend, __varcovbegin, __varcovend),
-	  _M_nd()
-	{ }
-
-      normal_mv_distribution(std::initializer_list<_RealType> __mean,
-			     std::initializer_list<_RealType> __varcov)
-      : _M_param(__mean, __varcov), _M_nd()
-      { }
-
-      explicit
-      normal_mv_distribution(const param_type& __p)
-      : _M_param(__p), _M_nd()
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_nd.reset(); }
-
-      /**
-       * @brief Returns the mean of the distribution.
-       */
-      result_type
-      mean() const
-      { return _M_param.mean(); }
-
-      /**
-       * @brief Returns the compact form of the variance/covariance
-       * matrix of the distribution.
-       */
-      std::array<_RealType, _Dimen * (_Dimen + 1) / 2>
-      varcov() const
-      { return _M_param.varcov(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { result_type __res;
-	__res.fill(std::numeric_limits<_RealType>::lowest());
-	return __res; }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { result_type __res;
-	__res.fill(std::numeric_limits<_RealType>::max());
-	return __res; }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ return this->__generate_impl(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ return this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two multi-variant normal distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      template<size_t _Dimen1, typename _RealType1>
-	friend bool
-	operator==(const
-		   __gnu_cxx::normal_mv_distribution<_Dimen1, _RealType1>&
-		   __d1,
-		   const
-		   __gnu_cxx::normal_mv_distribution<_Dimen1, _RealType1>&
-		   __d2);
-
-      /**
-       * @brief Inserts a %normal_mv_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %normal_mv_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<size_t _Dimen1, typename _RealType1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const
-		   __gnu_cxx::normal_mv_distribution<_Dimen1, _RealType1>&
-		   __x);
-
-      /**
-       * @brief Extracts a %normal_mv_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %normal_mv_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error
-       *          state.
-       */
-      template<size_t _Dimen1, typename _RealType1,
-	       typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   __gnu_cxx::normal_mv_distribution<_Dimen1, _RealType1>&
-		   __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-      std::normal_distribution<_RealType> _M_nd;
-  };
-
-  /**
-   * @brief Return true if two multi-variate normal distributions are
-   * different.
-   */
-  template<size_t _Dimen, typename _RealType>
-    inline bool
-    operator!=(const __gnu_cxx::normal_mv_distribution<_Dimen, _RealType>&
-	       __d1,
-	       const __gnu_cxx::normal_mv_distribution<_Dimen, _RealType>&
-	       __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A Rice continuous distribution for random numbers.
-   *
-   * The formula for the Rice probability density function is
-   * @f[
-   *     p(x|\nu,\sigma) = \frac{x}{\sigma^2}
-   *                       \exp\left(-\frac{x^2+\nu^2}{2\sigma^2}\right)
-   *                       I_0\left(\frac{x \nu}{\sigma^2}\right)
-   * @f]
-   * where @f$I_0(z)@f$ is the modified Bessel function of the first kind
-   * of order 0 and @f$\nu >= 0@f$ and @f$\sigma > 0@f$.
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$\sqrt{\pi/2}L_{1/2}(-\nu^2/2\sigma^2)@f$</td></tr>
-   * <tr><td>Variance</td><td>@f$2\sigma^2 + \nu^2
-   *                   + (\pi\sigma^2/2)L^2_{1/2}(-\nu^2/2\sigma^2)@f$</td></tr>
-   * <tr><td>Range</td><td>@f$[0, \infty)@f$</td></tr>
-   * </table>
-   * where @f$L_{1/2}(x)@f$ is the Laguerre polynomial of order 1/2.
-   */
-  template<typename _RealType = double>
-    class
-    rice_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef rice_distribution<result_type> distribution_type;
-
-	param_type(result_type __nu_val = result_type(0),
-		   result_type __sigma_val = result_type(1))
-	: _M_nu(__nu_val), _M_sigma(__sigma_val)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_nu >= result_type(0));
-	  _GLIBCXX_DEBUG_ASSERT(_M_sigma > result_type(0));
-	}
-
-	result_type
-	nu() const
-	{ return _M_nu; }
-
-	result_type
-	sigma() const
-	{ return _M_sigma; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_nu == __p2._M_nu
-	      && __p1._M_sigma == __p2._M_sigma; }
-
-      private:
-	void _M_initialize();
-
-	result_type _M_nu;
-	result_type _M_sigma;
-      };
-
-      /**
-       * @brief Constructors.
-       */
-      explicit
-      rice_distribution(result_type __nu_val = result_type(0),
-			result_type __sigma_val = result_type(1))
-      : _M_param(__nu_val, __sigma_val),
-	_M_ndx(__nu_val, __sigma_val),
-	_M_ndy(result_type(0), __sigma_val)
-      { }
-
-      explicit
-      rice_distribution(const param_type& __p)
-      : _M_param(__p),
-	_M_ndx(__p.nu(), __p.sigma()),
-	_M_ndy(result_type(0), __p.sigma())
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      {
-	_M_ndx.reset();
-	_M_ndy.reset();
-      }
-
-      /**
-       * @brief Return the parameters of the distribution.
-       */
-      result_type
-      nu() const
-      { return _M_param.nu(); }
-
-      result_type
-      sigma() const
-      { return _M_param.sigma(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{
-	  result_type __x = this->_M_ndx(__urng);
-	  result_type __y = this->_M_ndy(__urng);
-#if _GLIBCXX_USE_C99_MATH_TR1
-	  return std::hypot(__x, __y);
-#else
-	  return std::sqrt(__x * __x + __y * __y);
-#endif
-	}
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{
-	  typename std::normal_distribution<result_type>::param_type
-	    __px(__p.nu(), __p.sigma()), __py(result_type(0), __p.sigma());
-	  result_type __x = this->_M_ndx(__px, __urng);
-	  result_type __y = this->_M_ndy(__py, __urng);
-#if _GLIBCXX_USE_C99_MATH_TR1
-	  return std::hypot(__x, __y);
-#else
-	  return std::sqrt(__x * __x + __y * __y);
-#endif
-	}
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two Rice distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      friend bool
-      operator==(const rice_distribution& __d1,
-		 const rice_distribution& __d2)
-      { return (__d1._M_param == __d2._M_param
-		&& __d1._M_ndx == __d2._M_ndx
-		&& __d1._M_ndy == __d2._M_ndy); }
-
-      /**
-       * @brief Inserts a %rice_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %rice_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>&,
-		   const rice_distribution<_RealType1>&);
-
-      /**
-       * @brief Extracts a %rice_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %rice_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>&,
-		   rice_distribution<_RealType1>&);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      std::normal_distribution<result_type> _M_ndx;
-      std::normal_distribution<result_type> _M_ndy;
-    };
-
-  /**
-   * @brief Return true if two Rice distributions are not equal.
-   */
-  template<typename _RealType1>
-    inline bool
-    operator!=(const rice_distribution<_RealType1>& __d1,
-	       const rice_distribution<_RealType1>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A Nakagami continuous distribution for random numbers.
-   *
-   * The formula for the Nakagami probability density function is
-   * @f[
-   *     p(x|\mu,\omega) = \frac{2\mu^\mu}{\Gamma(\mu)\omega^\mu}
-   *                       x^{2\mu-1}e^{-\mu x / \omega}
-   * @f]
-   * where @f$\Gamma(z)@f$ is the gamma function and @f$\mu >= 0.5@f$
-   * and @f$\omega > 0@f$.
-   */
-  template<typename _RealType = double>
-    class
-    nakagami_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef nakagami_distribution<result_type> distribution_type;
-
-	param_type(result_type __mu_val = result_type(1),
-		   result_type __omega_val = result_type(1))
-	: _M_mu(__mu_val), _M_omega(__omega_val)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_mu >= result_type(0.5L));
-	  _GLIBCXX_DEBUG_ASSERT(_M_omega > result_type(0));
-	}
-
-	result_type
-	mu() const
-	{ return _M_mu; }
-
-	result_type
-	omega() const
-	{ return _M_omega; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_mu == __p2._M_mu
-	      && __p1._M_omega == __p2._M_omega; }
-
-      private:
-	void _M_initialize();
-
-	result_type _M_mu;
-	result_type _M_omega;
-      };
-
-      /**
-       * @brief Constructors.
-       */
-      explicit
-      nakagami_distribution(result_type __mu_val = result_type(1),
-			    result_type __omega_val = result_type(1))
-      : _M_param(__mu_val, __omega_val),
-	_M_gd(__mu_val, __omega_val / __mu_val)
-      { }
-
-      explicit
-      nakagami_distribution(const param_type& __p)
-      : _M_param(__p),
-	_M_gd(__p.mu(), __p.omega() / __p.mu())
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_gd.reset(); }
-
-      /**
-       * @brief Return the parameters of the distribution.
-       */
-      result_type
-      mu() const
-      { return _M_param.mu(); }
-
-      result_type
-      omega() const
-      { return _M_param.omega(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return std::sqrt(this->_M_gd(__urng)); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{
-	  typename std::gamma_distribution<result_type>::param_type
-	    __pg(__p.mu(), __p.omega() / __p.mu());
-	  return std::sqrt(this->_M_gd(__pg, __urng));
-	}
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two Nakagami distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      friend bool
-      operator==(const nakagami_distribution& __d1,
-		 const nakagami_distribution& __d2)
-      { return (__d1._M_param == __d2._M_param
-		&& __d1._M_gd == __d2._M_gd); }
-
-      /**
-       * @brief Inserts a %nakagami_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %nakagami_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>&,
-		   const nakagami_distribution<_RealType1>&);
-
-      /**
-       * @brief Extracts a %nakagami_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %nakagami_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>&,
-		   nakagami_distribution<_RealType1>&);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      std::gamma_distribution<result_type> _M_gd;
-    };
-
-  /**
-   * @brief Return true if two Nakagami distributions are not equal.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const nakagami_distribution<_RealType>& __d1,
-	       const nakagami_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A Pareto continuous distribution for random numbers.
-   *
-   * The formula for the Pareto cumulative probability function is
-   * @f[
-   *     P(x|\alpha,\mu) = 1 - \left(\frac{\mu}{x}\right)^\alpha
-   * @f]
-   * The formula for the Pareto probability density function is
-   * @f[
-   *     p(x|\alpha,\mu) = \frac{\alpha + 1}{\mu}
-   *                       \left(\frac{\mu}{x}\right)^{\alpha + 1}
-   * @f]
-   * where @f$x >= \mu@f$ and @f$\mu > 0@f$, @f$\alpha > 0@f$.
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$\alpha \mu / (\alpha - 1)@f$
-   *              for @f$\alpha > 1@f$</td></tr>
-   * <tr><td>Variance</td><td>@f$\alpha \mu^2 / [(\alpha - 1)^2(\alpha - 2)]@f$
-   *              for @f$\alpha > 2@f$</td></tr>
-   * <tr><td>Range</td><td>@f$[\mu, \infty)@f$</td></tr>
-   * </table>
-   */
-  template<typename _RealType = double>
-    class
-    pareto_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef pareto_distribution<result_type> distribution_type;
-
-	param_type(result_type __alpha_val = result_type(1),
-		   result_type __mu_val = result_type(1))
-	: _M_alpha(__alpha_val), _M_mu(__mu_val)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_alpha > result_type(0));
-	  _GLIBCXX_DEBUG_ASSERT(_M_mu > result_type(0));
-	}
-
-	result_type
-	alpha() const
-	{ return _M_alpha; }
-
-	result_type
-	mu() const
-	{ return _M_mu; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_alpha == __p2._M_alpha && __p1._M_mu == __p2._M_mu; }
-
-      private:
-	void _M_initialize();
-
-	result_type _M_alpha;
-	result_type _M_mu;
-      };
-
-      /**
-       * @brief Constructors.
-       */
-      explicit
-      pareto_distribution(result_type __alpha_val = result_type(1),
-			  result_type __mu_val = result_type(1))
-      : _M_param(__alpha_val, __mu_val),
-	_M_ud()
-      { }
-
-      explicit
-      pareto_distribution(const param_type& __p)
-      : _M_param(__p),
-	_M_ud()
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      {
-	_M_ud.reset();
-      }
-
-      /**
-       * @brief Return the parameters of the distribution.
-       */
-      result_type
-      alpha() const
-      { return _M_param.alpha(); }
-
-      result_type
-      mu() const
-      { return _M_param.mu(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return this->mu(); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{
-	  return this->mu() * std::pow(this->_M_ud(__urng),
-				       -result_type(1) / this->alpha());
-	}
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{
-	  return __p.mu() * std::pow(this->_M_ud(__urng),
-					   -result_type(1) / __p.alpha());
-	}
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two Pareto distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      friend bool
-      operator==(const pareto_distribution& __d1,
-		 const pareto_distribution& __d2)
-      { return (__d1._M_param == __d2._M_param
-		&& __d1._M_ud == __d2._M_ud); }
-
-      /**
-       * @brief Inserts a %pareto_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %pareto_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>&,
-		   const pareto_distribution<_RealType1>&);
-
-      /**
-       * @brief Extracts a %pareto_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %pareto_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>&,
-		   pareto_distribution<_RealType1>&);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      std::uniform_real_distribution<result_type> _M_ud;
-    };
-
-  /**
-   * @brief Return true if two Pareto distributions are not equal.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const pareto_distribution<_RealType>& __d1,
-	       const pareto_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A K continuous distribution for random numbers.
-   *
-   * The formula for the K probability density function is
-   * @f[
-   *     p(x|\lambda, \mu, \nu) = \frac{2}{x}
-   *             \left(\frac{\lambda\nu x}{\mu}\right)^{\frac{\lambda + \nu}{2}}
-   *             \frac{1}{\Gamma(\lambda)\Gamma(\nu)}
-   *             K_{\nu - \lambda}\left(2\sqrt{\frac{\lambda\nu x}{\mu}}\right)
-   * @f]
-   * where @f$I_0(z)@f$ is the modified Bessel function of the second kind
-   * of order @f$\nu - \lambda@f$ and @f$\lambda > 0@f$, @f$\mu > 0@f$
-   * and @f$\nu > 0@f$.
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$\mu@f$</td></tr>
-   * <tr><td>Variance</td><td>@f$\mu^2\frac{\lambda + \nu + 1}{\lambda\nu}@f$</td></tr>
-   * <tr><td>Range</td><td>@f$[0, \infty)@f$</td></tr>
-   * </table>
-   */
-  template<typename _RealType = double>
-    class
-    k_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef k_distribution<result_type> distribution_type;
-
-	param_type(result_type __lambda_val = result_type(1),
-		   result_type __mu_val = result_type(1),
-		   result_type __nu_val = result_type(1))
-	: _M_lambda(__lambda_val), _M_mu(__mu_val), _M_nu(__nu_val)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_lambda > result_type(0));
-	  _GLIBCXX_DEBUG_ASSERT(_M_mu > result_type(0));
-	  _GLIBCXX_DEBUG_ASSERT(_M_nu > result_type(0));
-	}
-
-	result_type
-	lambda() const
-	{ return _M_lambda; }
-
-	result_type
-	mu() const
-	{ return _M_mu; }
-
-	result_type
-	nu() const
-	{ return _M_nu; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_lambda == __p2._M_lambda
-	      && __p1._M_mu == __p2._M_mu
-	      && __p1._M_nu == __p2._M_nu; }
-
-      private:
-	void _M_initialize();
-
-	result_type _M_lambda;
-	result_type _M_mu;
-	result_type _M_nu;
-      };
-
-      /**
-       * @brief Constructors.
-       */
-      explicit
-      k_distribution(result_type __lambda_val = result_type(1),
-		     result_type __mu_val = result_type(1),
-		     result_type __nu_val = result_type(1))
-      : _M_param(__lambda_val, __mu_val, __nu_val),
-	_M_gd1(__lambda_val, result_type(1) / __lambda_val),
-	_M_gd2(__nu_val, __mu_val / __nu_val)
-      { }
-
-      explicit
-      k_distribution(const param_type& __p)
-      : _M_param(__p),
-	_M_gd1(__p.lambda(), result_type(1) / __p.lambda()),
-	_M_gd2(__p.nu(), __p.mu() / __p.nu())
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      {
-	_M_gd1.reset();
-	_M_gd2.reset();
-      }
-
-      /**
-       * @brief Return the parameters of the distribution.
-       */
-      result_type
-      lambda() const
-      { return _M_param.lambda(); }
-
-      result_type
-      mu() const
-      { return _M_param.mu(); }
-
-      result_type
-      nu() const
-      { return _M_param.nu(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator&);
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator&, const param_type&);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two K distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      friend bool
-      operator==(const k_distribution& __d1,
-		 const k_distribution& __d2)
-      { return (__d1._M_param == __d2._M_param
-		&& __d1._M_gd1 == __d2._M_gd1
-		&& __d1._M_gd2 == __d2._M_gd2); }
-
-      /**
-       * @brief Inserts a %k_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %k_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>&,
-		   const k_distribution<_RealType1>&);
-
-      /**
-       * @brief Extracts a %k_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %k_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>&,
-		   k_distribution<_RealType1>&);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      std::gamma_distribution<result_type> _M_gd1;
-      std::gamma_distribution<result_type> _M_gd2;
-    };
-
-  /**
-   * @brief Return true if two K distributions are not equal.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const k_distribution<_RealType>& __d1,
-	       const k_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief An arcsine continuous distribution for random numbers.
-   *
-   * The formula for the arcsine probability density function is
-   * @f[
-   *     p(x|a,b) = \frac{1}{\pi \sqrt{(x - a)(b - x)}}
-   * @f]
-   * where @f$x >= a@f$ and @f$x <= b@f$.
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$ (a + b) / 2 @f$</td></tr>
-   * <tr><td>Variance</td><td>@f$ (b - a)^2 / 8 @f$</td></tr>
-   * <tr><td>Range</td><td>@f$[a, b]@f$</td></tr>
-   * </table>
-   */
-  template<typename _RealType = double>
-    class
-    arcsine_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef arcsine_distribution<result_type> distribution_type;
-
-	param_type(result_type __a = result_type(0),
-		   result_type __b = result_type(1))
-	: _M_a(__a), _M_b(__b)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_a <= _M_b);
-	}
-
-	result_type
-	a() const
-	{ return _M_a; }
-
-	result_type
-	b() const
-	{ return _M_b; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_a == __p2._M_a && __p1._M_b == __p2._M_b; }
-
-      private:
-	void _M_initialize();
-
-	result_type _M_a;
-	result_type _M_b;
-      };
-
-      /**
-       * @brief Constructors.
-       */
-      explicit
-      arcsine_distribution(result_type __a = result_type(0),
-			   result_type __b = result_type(1))
-      : _M_param(__a, __b),
-	_M_ud(-1.5707963267948966192313216916397514L,
-	      +1.5707963267948966192313216916397514L)
-      { }
-
-      explicit
-      arcsine_distribution(const param_type& __p)
-      : _M_param(__p),
-	_M_ud(-1.5707963267948966192313216916397514L,
-	      +1.5707963267948966192313216916397514L)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_ud.reset(); }
-
-      /**
-       * @brief Return the parameters of the distribution.
-       */
-      result_type
-      a() const
-      { return _M_param.a(); }
-
-      result_type
-      b() const
-      { return _M_param.b(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return this->a(); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return this->b(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{
-	  result_type __x = std::sin(this->_M_ud(__urng));
-	  return (__x * (this->b() - this->a())
-		  + this->a() + this->b()) / result_type(2);
-	}
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{
-	  result_type __x = std::sin(this->_M_ud(__urng));
-	  return (__x * (__p.b() - __p.a())
-		  + __p.a() + __p.b()) / result_type(2);
-	}
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two arcsine distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      friend bool
-      operator==(const arcsine_distribution& __d1,
-		 const arcsine_distribution& __d2)
-      { return (__d1._M_param == __d2._M_param
-		&& __d1._M_ud == __d2._M_ud); }
-
-      /**
-       * @brief Inserts a %arcsine_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %arcsine_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>&,
-		   const arcsine_distribution<_RealType1>&);
-
-      /**
-       * @brief Extracts a %arcsine_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %arcsine_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>&,
-		   arcsine_distribution<_RealType1>&);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      std::uniform_real_distribution<result_type> _M_ud;
-    };
-
-  /**
-   * @brief Return true if two arcsine distributions are not equal.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const arcsine_distribution<_RealType>& __d1,
-	       const arcsine_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A Hoyt continuous distribution for random numbers.
-   *
-   * The formula for the Hoyt probability density function is
-   * @f[
-   *     p(x|q,\omega) = \frac{(1 + q^2)x}{q\omega}
-   *                     \exp\left(-\frac{(1 + q^2)^2 x^2}{4 q^2 \omega}\right)
-   *                       I_0\left(\frac{(1 - q^4) x^2}{4 q^2 \omega}\right)
-   * @f]
-   * where @f$I_0(z)@f$ is the modified Bessel function of the first kind
-   * of order 0 and @f$0 < q < 1@f$.
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$ \sqrt{\frac{2}{\pi}} \sqrt{\frac{\omega}{1 + q^2}}
-   *                       E(1 - q^2) @f$</td></tr>
-   * <tr><td>Variance</td><td>@f$ \omega \left(1 - \frac{2E^2(1 - q^2)}
-   *                                      {\pi (1 + q^2)}\right) @f$</td></tr>
-   * <tr><td>Range</td><td>@f$[0, \infty)@f$</td></tr>
-   * </table>
-   * where @f$E(x)@f$ is the elliptic function of the second kind.
-   */
-  template<typename _RealType = double>
-    class
-    hoyt_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef hoyt_distribution<result_type> distribution_type;
-
-	param_type(result_type __q = result_type(0.5L),
-		   result_type __omega = result_type(1))
-	: _M_q(__q), _M_omega(__omega)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_q > result_type(0));
-	  _GLIBCXX_DEBUG_ASSERT(_M_q < result_type(1));
-	}
-
-	result_type
-	q() const
-	{ return _M_q; }
-
-	result_type
-	omega() const
-	{ return _M_omega; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_q == __p2._M_q
-	      && __p1._M_omega == __p2._M_omega; }
-
-      private:
-	void _M_initialize();
-
-	result_type _M_q;
-	result_type _M_omega;
-      };
-
-      /**
-       * @brief Constructors.
-       */
-      explicit
-      hoyt_distribution(result_type __q = result_type(0.5L),
-			result_type __omega = result_type(1))
-      : _M_param(__q, __omega),
-	_M_ad(result_type(0.5L) * (result_type(1) + __q * __q),
-	      result_type(0.5L) * (result_type(1) + __q * __q)
-				/ (__q * __q)),
-	_M_ed(result_type(1))
-      { }
-
-      explicit
-      hoyt_distribution(const param_type& __p)
-      : _M_param(__p),
-	_M_ad(result_type(0.5L) * (result_type(1) + __p.q() * __p.q()),
-	      result_type(0.5L) * (result_type(1) + __p.q() * __p.q())
-				/ (__p.q() * __p.q())),
-	_M_ed(result_type(1))
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      {
-	_M_ad.reset();
-	_M_ed.reset();
-      }
-
-      /**
-       * @brief Return the parameters of the distribution.
-       */
-      result_type
-      q() const
-      { return _M_param.q(); }
-
-      result_type
-      omega() const
-      { return _M_param.omega(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return result_type(0); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng);
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two Hoyt distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      friend bool
-      operator==(const hoyt_distribution& __d1,
-		 const hoyt_distribution& __d2)
-      { return (__d1._M_param == __d2._M_param
-		&& __d1._M_ad == __d2._M_ad
-		&& __d1._M_ed == __d2._M_ed); }
-
-      /**
-       * @brief Inserts a %hoyt_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %hoyt_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>&,
-		   const hoyt_distribution<_RealType1>&);
-
-      /**
-       * @brief Extracts a %hoyt_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %hoyt_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>&,
-		   hoyt_distribution<_RealType1>&);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-
-      __gnu_cxx::arcsine_distribution<result_type> _M_ad;
-      std::exponential_distribution<result_type> _M_ed;
-    };
-
-  /**
-   * @brief Return true if two Hoyt distributions are not equal.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const hoyt_distribution<_RealType>& __d1,
-	       const hoyt_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A triangular distribution for random numbers.
-   *
-   * The formula for the triangular probability density function is
-   * @f[
-   *                  / 0                          for x < a
-   *     p(x|a,b,c) = | \frac{2(x-a)}{(c-a)(b-a)}  for a <= x <= b
-   *                  | \frac{2(c-x)}{(c-a)(c-b)}  for b < x <= c
-   *                  \ 0                          for c < x
-   * @f]
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$ \frac{a+b+c}{2} @f$</td></tr>
-   * <tr><td>Variance</td><td>@f$ \frac{a^2+b^2+c^2-ab-ac-bc}
-   *                                   {18}@f$</td></tr>
-   * <tr><td>Range</td><td>@f$[a, c]@f$</td></tr>
-   * </table>
-   */
-  template<typename _RealType = double>
-    class triangular_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	friend class triangular_distribution<_RealType>;
-
-	explicit
-	param_type(_RealType __a = _RealType(0),
-		   _RealType __b = _RealType(0.5),
-		   _RealType __c = _RealType(1))
-	: _M_a(__a), _M_b(__b), _M_c(__c)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_a <= _M_b);
-	  _GLIBCXX_DEBUG_ASSERT(_M_b <= _M_c);
-	  _GLIBCXX_DEBUG_ASSERT(_M_a < _M_c);
-
-	  _M_r_ab = (_M_b - _M_a) / (_M_c - _M_a);
-	  _M_f_ab_ac = (_M_b - _M_a) * (_M_c - _M_a);
-	  _M_f_bc_ac = (_M_c - _M_b) * (_M_c - _M_a);
-	}
-
-	_RealType
-	a() const
-	{ return _M_a; }
-
-	_RealType
-	b() const
-	{ return _M_b; }
-
-	_RealType
-	c() const
-	{ return _M_c; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return (__p1._M_a == __p2._M_a && __p1._M_b == __p2._M_b
-		  && __p1._M_c == __p2._M_c); }
-
-      private:
-
-	_RealType _M_a;
-	_RealType _M_b;
-	_RealType _M_c;
-	_RealType _M_r_ab;
-	_RealType _M_f_ab_ac;
-	_RealType _M_f_bc_ac;
-      };
-
-      /**
-       * @brief Constructs a triangle distribution with parameters
-       * @f$ a @f$, @f$ b @f$ and @f$ c @f$.
-       */
-      explicit
-      triangular_distribution(result_type __a = result_type(0),
-			      result_type __b = result_type(0.5),
-			      result_type __c = result_type(1))
-      : _M_param(__a, __b, __c)
-      { }
-
-      explicit
-      triangular_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       * @brief Returns the @f$ a @f$ of the distribution.
-       */
-      result_type
-      a() const
-      { return _M_param.a(); }
-
-      /**
-       * @brief Returns the @f$ b @f$ of the distribution.
-       */
-      result_type
-      b() const
-      { return _M_param.b(); }
-
-      /**
-       * @brief Returns the @f$ c @f$ of the distribution.
-       */
-      result_type
-      c() const
-      { return _M_param.c(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return _M_param._M_a; }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return _M_param._M_c; }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{
-	  std::__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	    __aurng(__urng);
-	  result_type __rnd = __aurng();
-	  if (__rnd <= __p._M_r_ab)
-	    return __p.a() + std::sqrt(__rnd * __p._M_f_ab_ac);
-	  else
-	    return __p.c() - std::sqrt((result_type(1) - __rnd)
-				       * __p._M_f_bc_ac);
-	}
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two triangle distributions have the same
-       *        parameters and the sequences that would be generated
-       *        are equal.
-       */
-      friend bool
-      operator==(const triangular_distribution& __d1,
-		 const triangular_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-      /**
-       * @brief Inserts a %triangular_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %triangular_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const __gnu_cxx::triangular_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %triangular_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %triangular_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   __gnu_cxx::triangular_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-   * @brief Return true if two triangle distributions are different.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const __gnu_cxx::triangular_distribution<_RealType>& __d1,
-	       const __gnu_cxx::triangular_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A von Mises distribution for random numbers.
-   *
-   * The formula for the von Mises probability density function is
-   * @f[
-   *     p(x|\mu,\kappa) = \frac{e^{\kappa \cos(x-\mu)}}
-   *                            {2\pi I_0(\kappa)}
-   * @f]
-   *
-   * The generating functions use the method according to:
-   *
-   * D. J. Best and N. I. Fisher, 1979. "Efficient Simulation of the
-   * von Mises Distribution", Journal of the Royal Statistical Society.
-   * Series C (Applied Statistics), Vol. 28, No. 2, pp. 152-157.
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$ \mu @f$</td></tr>
-   * <tr><td>Variance</td><td>@f$ 1-I_1(\kappa)/I_0(\kappa) @f$</td></tr>
-   * <tr><td>Range</td><td>@f$[-\pi, \pi]@f$</td></tr>
-   * </table>
-   */
-  template<typename _RealType = double>
-    class von_mises_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	friend class von_mises_distribution<_RealType>;
-
-	explicit
-	param_type(_RealType __mu = _RealType(0),
-		   _RealType __kappa = _RealType(1))
-	: _M_mu(__mu), _M_kappa(__kappa)
-	{
-	  const _RealType __pi = __gnu_cxx::__math_constants<_RealType>::__pi;
-	  _GLIBCXX_DEBUG_ASSERT(_M_mu >= -__pi && _M_mu <= __pi);
-	  _GLIBCXX_DEBUG_ASSERT(_M_kappa >= _RealType(0));
-
-	  auto __tau = std::sqrt(_RealType(4) * _M_kappa * _M_kappa
-				 + _RealType(1)) + _RealType(1);
-	  auto __rho = ((__tau - std::sqrt(_RealType(2) * __tau))
-			/ (_RealType(2) * _M_kappa));
-	  _M_r = (_RealType(1) + __rho * __rho) / (_RealType(2) * __rho);
-	}
-
-	_RealType
-	mu() const
-	{ return _M_mu; }
-
-	_RealType
-	kappa() const
-	{ return _M_kappa; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return (__p1._M_mu == __p2._M_mu
-		  && __p1._M_kappa == __p2._M_kappa); }
-
-      private:
-	_RealType _M_mu;
-	_RealType _M_kappa;
-	_RealType _M_r;
-      };
-
-      /**
-       * @brief Constructs a von Mises distribution with parameters
-       * @f$\mu@f$ and @f$\kappa@f$.
-       */
-      explicit
-      von_mises_distribution(result_type __mu = result_type(0),
-			     result_type __kappa = result_type(1))
-	: _M_param(__mu, __kappa)
-      { }
-
-      explicit
-      von_mises_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       * @brief Returns the @f$ \mu @f$ of the distribution.
-       */
-      result_type
-      mu() const
-      { return _M_param.mu(); }
-
-      /**
-       * @brief Returns the @f$ \kappa @f$ of the distribution.
-       */
-      result_type
-      kappa() const
-      { return _M_param.kappa(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      {
-	return -__gnu_cxx::__math_constants<result_type>::__pi;
-      }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      {
-	return __gnu_cxx::__math_constants<result_type>::__pi;
-      }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, _M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two von Mises distributions have the same
-       *        parameters and the sequences that would be generated
-       *        are equal.
-       */
-      friend bool
-      operator==(const von_mises_distribution& __d1,
-		 const von_mises_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-      /**
-       * @brief Inserts a %von_mises_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %von_mises_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const __gnu_cxx::von_mises_distribution<_RealType1>& __x);
-
-      /**
-       * @brief Extracts a %von_mises_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %von_mises_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   __gnu_cxx::von_mises_distribution<_RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-   * @brief Return true if two von Mises distributions are different.
-   */
-  template<typename _RealType>
-    inline bool
-    operator!=(const __gnu_cxx::von_mises_distribution<_RealType>& __d1,
-	       const __gnu_cxx::von_mises_distribution<_RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A discrete hypergeometric random number distribution.
-   *
-   * The hypergeometric distribution is a discrete probability distribution
-   * that describes the probability of @p k successes in @p n draws @a without
-   * replacement from a finite population of size @p N containing exactly @p K
-   * successes.
-   *
-   * The formula for the hypergeometric probability density function is
-   * @f[
-   *   p(k|N,K,n) = \frac{\binom{K}{k} \binom{N-K}{n-k}}{\binom{N}{n}}
-   * @f]
-   * where @f$N@f$ is the total population of the distribution,
-   * @f$K@f$ is the total population of the distribution.
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$ n\frac{K}{N} @f$</td></tr>
-   * <tr><td>Variance</td><td>@f$ n\frac{K}{N}\frac{N-K}{N}\frac{N-n}{N-1}
-   *   @f$</td></tr>
-   * <tr><td>Range</td><td>@f$[max(0, n+K-N), min(K, n)]@f$</td></tr>
-   * </table>
-   */
-  template<typename _UIntType = unsigned int>
-    class hypergeometric_distribution
-    {
-      static_assert(std::is_unsigned<_UIntType>::value, "template argument "
-		    "substituting _UIntType not an unsigned integral type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _UIntType  result_type;
-
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef hypergeometric_distribution<_UIntType> distribution_type;
-	friend class hypergeometric_distribution<_UIntType>;
-
-	explicit
-	param_type(result_type __N = 10, result_type __K = 5,
-		   result_type __n = 1)
-	: _M_N{__N}, _M_K{__K}, _M_n{__n}
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_N >= _M_K);
-	  _GLIBCXX_DEBUG_ASSERT(_M_N >= _M_n);
-	}
-
-	result_type
-	total_size() const
-	{ return _M_N; }
-
-	result_type
-	successful_size() const
-	{ return _M_K; }
-
-	result_type
-	unsuccessful_size() const
-	{ return _M_N - _M_K; }
-
-	result_type
-	total_draws() const
-	{ return _M_n; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return (__p1._M_N == __p2._M_N)
-	      && (__p1._M_K == __p2._M_K)
-	      && (__p1._M_n == __p2._M_n); }
-
-      private:
-
-	result_type _M_N;
-	result_type _M_K;
-	result_type _M_n;
-      };
-
-      // constructors and member function
-      explicit
-      hypergeometric_distribution(result_type __N = 10, result_type __K = 5,
-				  result_type __n = 1)
-      : _M_param{__N, __K, __n}
-      { }
-
-      explicit
-      hypergeometric_distribution(const param_type& __p)
-      : _M_param{__p}
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       * @brief Returns the distribution parameter @p N,
-       *	the total number of items.
-       */
-      result_type
-      total_size() const
-      { return this->_M_param.total_size(); }
-
-      /**
-       * @brief Returns the distribution parameter @p K,
-       *	the total number of successful items.
-       */
-      result_type
-      successful_size() const
-      { return this->_M_param.successful_size(); }
-
-      /**
-       * @brief Returns the total number of unsuccessful items @f$ N - K @f$.
-       */
-      result_type
-      unsuccessful_size() const
-      { return this->_M_param.unsuccessful_size(); }
-
-      /**
-       * @brief Returns the distribution parameter @p n,
-       *	the total number of draws.
-       */
-      result_type
-      total_draws() const
-      { return this->_M_param.total_draws(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return this->_M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { this->_M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      {
-	using _IntType = typename std::make_signed<result_type>::type;
-	return static_cast<result_type>(std::max(static_cast<_IntType>(0),
-				static_cast<_IntType>(this->total_draws()
-						- this->unsuccessful_size())));
-      }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::min(this->successful_size(), this->total_draws()); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, this->_M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, this->_M_param); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-       /**
-	* @brief Return true if two hypergeometric distributions have the same
-	*        parameters and the sequences that would be generated
-	*        are equal.
-	*/
-      friend bool
-      operator==(const hypergeometric_distribution& __d1,
-		 const hypergeometric_distribution& __d2)
-      { return __d1._M_param == __d2._M_param; }
-
-      /**
-       * @brief Inserts a %hypergeometric_distribution random number
-       * distribution @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %hypergeometric_distribution random number
-       *             distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _UIntType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const __gnu_cxx::hypergeometric_distribution<_UIntType1>&
-		   __x);
-
-      /**
-       * @brief Extracts a %hypergeometric_distribution random number
-       * distribution @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %hypergeometric_distribution random number generator
-       *             distribution.
-       *
-       * @returns The input stream with @p __x extracted or in an error
-       *          state.
-       */
-      template<typename _UIntType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   __gnu_cxx::hypergeometric_distribution<_UIntType1>& __x);
-
-    private:
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-   * @brief Return true if two hypergeometric distributions are different.
-   */
-  template<typename _UIntType>
-    inline bool
-    operator!=(const __gnu_cxx::hypergeometric_distribution<_UIntType>& __d1,
-	       const __gnu_cxx::hypergeometric_distribution<_UIntType>& __d2)
-    { return !(__d1 == __d2); }
-
-  /**
-   * @brief A logistic continuous distribution for random numbers.
-   *
-   * The formula for the logistic probability density function is
-   * @f[
-   *     p(x|\a,\b) = \frac{e^{(x - a)/b}}{b[1 + e^{(x - a)/b}]^2}
-   * @f]
-   * where @f$b > 0@f$.
-   *
-   * The formula for the logistic probability function is
-   * @f[
-   *     cdf(x|\a,\b) = \frac{e^{(x - a)/b}}{1 + e^{(x - a)/b}}
-   * @f]
-   * where @f$b > 0@f$.
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$a@f$</td></tr>
-   * <tr><td>Variance</td><td>@f$b^2\pi^2/3@f$</td></tr>
-   * <tr><td>Range</td><td>@f$[0, \infty)@f$</td></tr>
-   * </table>
-   */
-  template<typename _RealType = double>
-    class
-    logistic_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef _RealType result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	typedef logistic_distribution<result_type> distribution_type;
-
-	param_type(result_type __a = result_type(0),
-		   result_type __b = result_type(1))
-	: _M_a(__a), _M_b(__b)
-	{
-	  _GLIBCXX_DEBUG_ASSERT(_M_b > result_type(0));
-	}
-
-	result_type
-	a() const
-	{ return _M_a; }
-
-	result_type
-	b() const
-	{ return _M_b; }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return __p1._M_a == __p2._M_a
-	      && __p1._M_b == __p2._M_b; }
-
-      private:
-	void _M_initialize();
-
-	result_type _M_a;
-	result_type _M_b;
-      };
-
-      /**
-       * @brief Constructors.
-       */
-      explicit
-      logistic_distribution(result_type __a = result_type(0),
-			    result_type __b = result_type(1))
-      : _M_param(__a, __b)
-      { }
-
-      explicit
-      logistic_distribution(const param_type& __p)
-      : _M_param(__p)
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { }
-
-      /**
-       * @brief Return the parameters of the distribution.
-       */
-      result_type
-      a() const
-      { return _M_param.a(); }
-
-      result_type
-      b() const
-      { return _M_param.b(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       */
-      result_type
-      min() const
-      { return -std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       */
-      result_type
-      max() const
-      { return std::numeric_limits<result_type>::max(); }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, this->_M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator&,
-		   const param_type&);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, this->param()); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two logistic distributions have
-       *        the same parameters and the sequences that would
-       *        be generated are equal.
-       */
-      template<typename _RealType1>
-	friend bool
-	operator==(const logistic_distribution<_RealType1>& __d1,
-		   const logistic_distribution<_RealType1>& __d2)
-	{ return __d1.param() == __d2.param(); }
-
-      /**
-       * @brief Inserts a %logistic_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %logistic_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>&,
-		   const logistic_distribution<_RealType1>&);
-
-      /**
-       * @brief Extracts a %logistic_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %logistic_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>&,
-		   logistic_distribution<_RealType1>&);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-    };
-
-  /**
-   * @brief Return true if two logistic distributions are not equal.
-   */
-  template<typename _RealType1>
-    inline bool
-    operator!=(const logistic_distribution<_RealType1>& __d1,
-	       const logistic_distribution<_RealType1>& __d2)
-    { return !(__d1 == __d2); }
-
-
-  /**
-   * @brief A distribution for random coordinates on a unit sphere.
-   *
-   * The method used in the generation function is attributed by Donald Knuth
-   * to G. W. Brown, Modern Mathematics for the Engineer (1956).
-   */
-  template<std::size_t _Dimen, typename _RealType = double>
-    class uniform_on_sphere_distribution
-    {
-      static_assert(std::is_floating_point<_RealType>::value,
-		    "template argument not a floating point type");
-      static_assert(_Dimen != 0, "dimension is zero");
-
-    public:
-      /** The type of the range of the distribution. */
-      typedef std::array<_RealType, _Dimen> result_type;
-      /** Parameter type. */
-      struct param_type
-      {
-	explicit
-	param_type()
-	{ }
-
-	friend bool
-	operator==(const param_type& __p1, const param_type& __p2)
-	{ return true; }
-      };
-
-      /**
-       * @brief Constructs a uniform on sphere distribution.
-       */
-      explicit
-      uniform_on_sphere_distribution()
-      : _M_param(), _M_nd()
-      { }
-
-      explicit
-      uniform_on_sphere_distribution(const param_type& __p)
-      : _M_param(__p), _M_nd()
-      { }
-
-      /**
-       * @brief Resets the distribution state.
-       */
-      void
-      reset()
-      { _M_nd.reset(); }
-
-      /**
-       * @brief Returns the parameter set of the distribution.
-       */
-      param_type
-      param() const
-      { return _M_param; }
-
-      /**
-       * @brief Sets the parameter set of the distribution.
-       * @param __param The new parameter set of the distribution.
-       */
-      void
-      param(const param_type& __param)
-      { _M_param = __param; }
-
-      /**
-       * @brief Returns the greatest lower bound value of the distribution.
-       * This function makes no sense for this distribution.
-       */
-      result_type
-      min() const
-      {
-	result_type __res;
-	__res.fill(0);
-	return __res;
-      }
-
-      /**
-       * @brief Returns the least upper bound value of the distribution.
-       * This function makes no sense for this distribution.
-       */
-      result_type
-      max() const
-      {
-	result_type __res;
-	__res.fill(0);
-	return __res;
-      }
-
-      /**
-       * @brief Generating functions.
-       */
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng)
-	{ return this->operator()(__urng, _M_param); }
-
-      template<typename _UniformRandomNumberGenerator>
-	result_type
-	operator()(_UniformRandomNumberGenerator& __urng,
-		   const param_type& __p);
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng)
-	{ this->__generate(__f, __t, __urng, this->param()); }
-
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate(_ForwardIterator __f, _ForwardIterator __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      template<typename _UniformRandomNumberGenerator>
-	void
-	__generate(result_type* __f, result_type* __t,
-		   _UniformRandomNumberGenerator& __urng,
-		   const param_type& __p)
-	{ this->__generate_impl(__f, __t, __urng, __p); }
-
-      /**
-       * @brief Return true if two uniform on sphere distributions have
-       *        the same parameters and the sequences that would be
-       *        generated are equal.
-       */
-      friend bool
-      operator==(const uniform_on_sphere_distribution& __d1,
-		 const uniform_on_sphere_distribution& __d2)
-      { return __d1._M_nd == __d2._M_nd; }
-
-      /**
-       * @brief Inserts a %uniform_on_sphere_distribution random number
-       *        distribution @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %uniform_on_sphere_distribution random number
-       *             distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<size_t _Dimen1, typename _RealType1, typename _CharT,
-	       typename _Traits>
-	friend std::basic_ostream<_CharT, _Traits>&
-	operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const __gnu_cxx::uniform_on_sphere_distribution<_Dimen1,
-								   _RealType1>&
-		   __x);
-
-      /**
-       * @brief Extracts a %uniform_on_sphere_distribution random number
-       *        distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %uniform_on_sphere_distribution random number
-       *             generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<std::size_t _Dimen1, typename _RealType1, typename _CharT,
-	       typename _Traits>
-	friend std::basic_istream<_CharT, _Traits>&
-	operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   __gnu_cxx::uniform_on_sphere_distribution<_Dimen1,
-							     _RealType1>& __x);
-
-    private:
-      template<typename _ForwardIterator,
-	       typename _UniformRandomNumberGenerator>
-	void
-	__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-			_UniformRandomNumberGenerator& __urng,
-			const param_type& __p);
-
-      param_type _M_param;
-      std::normal_distribution<_RealType> _M_nd;
-    };
-
-  /**
-   * @brief Return true if two uniform on sphere distributions are different.
-   */
-  template<std::size_t _Dimen, typename _RealType>
-    inline bool
-    operator!=(const __gnu_cxx::uniform_on_sphere_distribution<_Dimen,
-	       _RealType>& __d1,
-	       const __gnu_cxx::uniform_on_sphere_distribution<_Dimen,
-	       _RealType>& __d2)
-    { return !(__d1 == __d2); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __gnu_cxx
-
-#include "ext/opt_random.h"
-#include "random.tcc"
-
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
-
-#endif // C++11
-
-#endif // _EXT_RANDOM
diff --git a/openflow/usr/include/c++/5/ext/random.tcc b/openflow/usr/include/c++/5/ext/random.tcc
deleted file mode 100644
index 1f3aed9..0000000
--- a/openflow/usr/include/c++/5/ext/random.tcc
+++ /dev/null
@@ -1,1676 +0,0 @@
-// Random number extensions -*- C++ -*-
-
-// Copyright (C) 2012-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/random.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ext/random}
- */
-
-#ifndef _EXT_RANDOM_TCC
-#define _EXT_RANDOM_TCC 1
-
-#pragma GCC system_header
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-
-  template<typename _UIntType, size_t __m,
-	   size_t __pos1, size_t __sl1, size_t __sl2,
-	   size_t __sr1, size_t __sr2,
-	   uint32_t __msk1, uint32_t __msk2,
-	   uint32_t __msk3, uint32_t __msk4,
-	   uint32_t __parity1, uint32_t __parity2,
-	   uint32_t __parity3, uint32_t __parity4>
-    void simd_fast_mersenne_twister_engine<_UIntType, __m,
-					   __pos1, __sl1, __sl2, __sr1, __sr2,
-					   __msk1, __msk2, __msk3, __msk4,
-					   __parity1, __parity2, __parity3,
-					   __parity4>::
-    seed(_UIntType __seed)
-    {
-      _M_state32[0] = static_cast<uint32_t>(__seed);
-      for (size_t __i = 1; __i < _M_nstate32; ++__i)
-	_M_state32[__i] = (1812433253UL
-			   * (_M_state32[__i - 1] ^ (_M_state32[__i - 1] >> 30))
-			   + __i);
-      _M_pos = state_size;
-      _M_period_certification();
-    }
-
-
-  namespace {
-
-    inline uint32_t _Func1(uint32_t __x)
-    {
-      return (__x ^ (__x >> 27)) * UINT32_C(1664525);
-    }
-
-    inline uint32_t _Func2(uint32_t __x)
-    {
-      return (__x ^ (__x >> 27)) * UINT32_C(1566083941);
-    }
-
-  }
-
-
-  template<typename _UIntType, size_t __m,
-	   size_t __pos1, size_t __sl1, size_t __sl2,
-	   size_t __sr1, size_t __sr2,
-	   uint32_t __msk1, uint32_t __msk2,
-	   uint32_t __msk3, uint32_t __msk4,
-	   uint32_t __parity1, uint32_t __parity2,
-	   uint32_t __parity3, uint32_t __parity4>
-    template<typename _Sseq>
-      typename std::enable_if<std::is_class<_Sseq>::value>::type
-      simd_fast_mersenne_twister_engine<_UIntType, __m,
-					__pos1, __sl1, __sl2, __sr1, __sr2,
-					__msk1, __msk2, __msk3, __msk4,
-					__parity1, __parity2, __parity3,
-					__parity4>::
-      seed(_Sseq& __q)
-      {
-	size_t __lag;
-
-	if (_M_nstate32 >= 623)
-	  __lag = 11;
-	else if (_M_nstate32 >= 68)
-	  __lag = 7;
-	else if (_M_nstate32 >= 39)
-	  __lag = 5;
-	else
-	  __lag = 3;
-	const size_t __mid = (_M_nstate32 - __lag) / 2;
-
-	std::fill(_M_state32, _M_state32 + _M_nstate32, UINT32_C(0x8b8b8b8b));
-	uint32_t __arr[_M_nstate32];
-	__q.generate(__arr + 0, __arr + _M_nstate32);
-
-	uint32_t __r = _Func1(_M_state32[0] ^ _M_state32[__mid]
-			      ^ _M_state32[_M_nstate32  - 1]);
-	_M_state32[__mid] += __r;
-	__r += _M_nstate32;
-	_M_state32[__mid + __lag] += __r;
-	_M_state32[0] = __r;
-
-	for (size_t __i = 1, __j = 0; __j < _M_nstate32; ++__j)
-	  {
-	    __r = _Func1(_M_state32[__i]
-			 ^ _M_state32[(__i + __mid) % _M_nstate32]
-			 ^ _M_state32[(__i + _M_nstate32 - 1) % _M_nstate32]);
-	    _M_state32[(__i + __mid) % _M_nstate32] += __r;
-	    __r += __arr[__j] + __i;
-	    _M_state32[(__i + __mid + __lag) % _M_nstate32] += __r;
-	    _M_state32[__i] = __r;
-	    __i = (__i + 1) % _M_nstate32;
-	  }
-	for (size_t __j = 0; __j < _M_nstate32; ++__j)
-	  {
-	    const size_t __i = (__j + 1) % _M_nstate32;
-	    __r = _Func2(_M_state32[__i]
-			 + _M_state32[(__i + __mid) % _M_nstate32]
-			 + _M_state32[(__i + _M_nstate32 - 1) % _M_nstate32]);
-	    _M_state32[(__i + __mid) % _M_nstate32] ^= __r;
-	    __r -= __i;
-	    _M_state32[(__i + __mid + __lag) % _M_nstate32] ^= __r;
-	    _M_state32[__i] = __r;
-	  }
-
-	_M_pos = state_size;
-	_M_period_certification();
-      }
-
-
-  template<typename _UIntType, size_t __m,
-	   size_t __pos1, size_t __sl1, size_t __sl2,
-	   size_t __sr1, size_t __sr2,
-	   uint32_t __msk1, uint32_t __msk2,
-	   uint32_t __msk3, uint32_t __msk4,
-	   uint32_t __parity1, uint32_t __parity2,
-	   uint32_t __parity3, uint32_t __parity4>
-    void simd_fast_mersenne_twister_engine<_UIntType, __m,
-					   __pos1, __sl1, __sl2, __sr1, __sr2,
-					   __msk1, __msk2, __msk3, __msk4,
-					   __parity1, __parity2, __parity3,
-					   __parity4>::
-    _M_period_certification(void)
-    {
-      static const uint32_t __parity[4] = { __parity1, __parity2,
-					    __parity3, __parity4 };
-      uint32_t __inner = 0;
-      for (size_t __i = 0; __i < 4; ++__i)
-	if (__parity[__i] != 0)
-	  __inner ^= _M_state32[__i] & __parity[__i];
-
-      if (__builtin_parity(__inner) & 1)
-	return;
-      for (size_t __i = 0; __i < 4; ++__i)
-	if (__parity[__i] != 0)
-	  {
-	    _M_state32[__i] ^= 1 << (__builtin_ffs(__parity[__i]) - 1);
-	    return;
-	  }
-      __builtin_unreachable();
-    }
-
-
-  template<typename _UIntType, size_t __m,
-	   size_t __pos1, size_t __sl1, size_t __sl2,
-	   size_t __sr1, size_t __sr2,
-	   uint32_t __msk1, uint32_t __msk2,
-	   uint32_t __msk3, uint32_t __msk4,
-	   uint32_t __parity1, uint32_t __parity2,
-	   uint32_t __parity3, uint32_t __parity4>
-    void simd_fast_mersenne_twister_engine<_UIntType, __m,
-					   __pos1, __sl1, __sl2, __sr1, __sr2,
-					   __msk1, __msk2, __msk3, __msk4,
-					   __parity1, __parity2, __parity3,
-					   __parity4>::
-    discard(unsigned long long __z)
-    {
-      while (__z > state_size - _M_pos)
-	{
-	  __z -= state_size - _M_pos;
-
-	  _M_gen_rand();
-	}
-
-      _M_pos += __z;
-    }
-
-
-#ifndef  _GLIBCXX_OPT_HAVE_RANDOM_SFMT_GEN_READ
-
-  namespace {
-
-    template<size_t __shift>
-      inline void __rshift(uint32_t *__out, const uint32_t *__in)
-      {
-	uint64_t __th = ((static_cast<uint64_t>(__in[3]) << 32)
-			 | static_cast<uint64_t>(__in[2]));
-	uint64_t __tl = ((static_cast<uint64_t>(__in[1]) << 32)
-			 | static_cast<uint64_t>(__in[0]));
-
-	uint64_t __oh = __th >> (__shift * 8);
-	uint64_t __ol = __tl >> (__shift * 8);
-	__ol |= __th << (64 - __shift * 8);
-	__out[1] = static_cast<uint32_t>(__ol >> 32);
-	__out[0] = static_cast<uint32_t>(__ol);
-	__out[3] = static_cast<uint32_t>(__oh >> 32);
-	__out[2] = static_cast<uint32_t>(__oh);
-      }
-
-
-    template<size_t __shift>
-      inline void __lshift(uint32_t *__out, const uint32_t *__in)
-      {
-	uint64_t __th = ((static_cast<uint64_t>(__in[3]) << 32)
-			 | static_cast<uint64_t>(__in[2]));
-	uint64_t __tl = ((static_cast<uint64_t>(__in[1]) << 32)
-			 | static_cast<uint64_t>(__in[0]));
-
-	uint64_t __oh = __th << (__shift * 8);
-	uint64_t __ol = __tl << (__shift * 8);
-	__oh |= __tl >> (64 - __shift * 8);
-	__out[1] = static_cast<uint32_t>(__ol >> 32);
-	__out[0] = static_cast<uint32_t>(__ol);
-	__out[3] = static_cast<uint32_t>(__oh >> 32);
-	__out[2] = static_cast<uint32_t>(__oh);
-      }
-
-
-    template<size_t __sl1, size_t __sl2, size_t __sr1, size_t __sr2,
-	     uint32_t __msk1, uint32_t __msk2, uint32_t __msk3, uint32_t __msk4>
-      inline void __recursion(uint32_t *__r,
-			      const uint32_t *__a, const uint32_t *__b,
-			      const uint32_t *__c, const uint32_t *__d)
-      {
-	uint32_t __x[4];
-	uint32_t __y[4];
-
-	__lshift<__sl2>(__x, __a);
-	__rshift<__sr2>(__y, __c);
-	__r[0] = (__a[0] ^ __x[0] ^ ((__b[0] >> __sr1) & __msk1)
-		  ^ __y[0] ^ (__d[0] << __sl1));
-	__r[1] = (__a[1] ^ __x[1] ^ ((__b[1] >> __sr1) & __msk2)
-		  ^ __y[1] ^ (__d[1] << __sl1));
-	__r[2] = (__a[2] ^ __x[2] ^ ((__b[2] >> __sr1) & __msk3)
-		  ^ __y[2] ^ (__d[2] << __sl1));
-	__r[3] = (__a[3] ^ __x[3] ^ ((__b[3] >> __sr1) & __msk4)
-		  ^ __y[3] ^ (__d[3] << __sl1));
-      }
-
-  }
-
-
-  template<typename _UIntType, size_t __m,
-	   size_t __pos1, size_t __sl1, size_t __sl2,
-	   size_t __sr1, size_t __sr2,
-	   uint32_t __msk1, uint32_t __msk2,
-	   uint32_t __msk3, uint32_t __msk4,
-	   uint32_t __parity1, uint32_t __parity2,
-	   uint32_t __parity3, uint32_t __parity4>
-    void simd_fast_mersenne_twister_engine<_UIntType, __m,
-					   __pos1, __sl1, __sl2, __sr1, __sr2,
-					   __msk1, __msk2, __msk3, __msk4,
-					   __parity1, __parity2, __parity3,
-					   __parity4>::
-    _M_gen_rand(void)
-    {
-      const uint32_t *__r1 = &_M_state32[_M_nstate32 - 8];
-      const uint32_t *__r2 = &_M_state32[_M_nstate32 - 4];
-      static constexpr size_t __pos1_32 = __pos1 * 4;
-
-      size_t __i;
-      for (__i = 0; __i < _M_nstate32 - __pos1_32; __i += 4)
-	{
-	  __recursion<__sl1, __sl2, __sr1, __sr2,
-		      __msk1, __msk2, __msk3, __msk4>
-	    (&_M_state32[__i], &_M_state32[__i],
-	     &_M_state32[__i + __pos1_32], __r1, __r2);
-	  __r1 = __r2;
-	  __r2 = &_M_state32[__i];
-	}
-
-      for (; __i < _M_nstate32; __i += 4)
-	{
-	  __recursion<__sl1, __sl2, __sr1, __sr2,
-		      __msk1, __msk2, __msk3, __msk4>
-	    (&_M_state32[__i], &_M_state32[__i],
-	     &_M_state32[__i + __pos1_32 - _M_nstate32], __r1, __r2);
-	  __r1 = __r2;
-	  __r2 = &_M_state32[__i];
-	}
-
-      _M_pos = 0;
-    }
-
-#endif
-
-#ifndef _GLIBCXX_OPT_HAVE_RANDOM_SFMT_OPERATOREQUAL
-  template<typename _UIntType, size_t __m,
-	   size_t __pos1, size_t __sl1, size_t __sl2,
-	   size_t __sr1, size_t __sr2,
-	   uint32_t __msk1, uint32_t __msk2,
-	   uint32_t __msk3, uint32_t __msk4,
-	   uint32_t __parity1, uint32_t __parity2,
-	   uint32_t __parity3, uint32_t __parity4>
-    bool
-    operator==(const __gnu_cxx::simd_fast_mersenne_twister_engine<_UIntType,
-	       __m, __pos1, __sl1, __sl2, __sr1, __sr2,
-	       __msk1, __msk2, __msk3, __msk4,
-	       __parity1, __parity2, __parity3, __parity4>& __lhs,
-	       const __gnu_cxx::simd_fast_mersenne_twister_engine<_UIntType,
-	       __m, __pos1, __sl1, __sl2, __sr1, __sr2,
-	       __msk1, __msk2, __msk3, __msk4,
-	       __parity1, __parity2, __parity3, __parity4>& __rhs)
-    {
-      typedef __gnu_cxx::simd_fast_mersenne_twister_engine<_UIntType,
-	       __m, __pos1, __sl1, __sl2, __sr1, __sr2,
-	       __msk1, __msk2, __msk3, __msk4,
-	       __parity1, __parity2, __parity3, __parity4> __engine;
-      return (std::equal(__lhs._M_stateT,
-			 __lhs._M_stateT + __engine::state_size,
-			 __rhs._M_stateT)
-	      && __lhs._M_pos == __rhs._M_pos);
-    }
-#endif
-
-  template<typename _UIntType, size_t __m,
-	   size_t __pos1, size_t __sl1, size_t __sl2,
-	   size_t __sr1, size_t __sr2,
-	   uint32_t __msk1, uint32_t __msk2,
-	   uint32_t __msk3, uint32_t __msk4,
-	   uint32_t __parity1, uint32_t __parity2,
-	   uint32_t __parity3, uint32_t __parity4,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const __gnu_cxx::simd_fast_mersenne_twister_engine<_UIntType,
-	       __m, __pos1, __sl1, __sl2, __sr1, __sr2,
-	       __msk1, __msk2, __msk3, __msk4,
-	       __parity1, __parity2, __parity3, __parity4>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits> __ostream_type;
-      typedef typename __ostream_type::ios_base __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__space);
-
-      for (size_t __i = 0; __i < __x._M_nstate32; ++__i)
-	__os << __x._M_state32[__i] << __space;
-      __os << __x._M_pos;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-
-  template<typename _UIntType, size_t __m,
-	   size_t __pos1, size_t __sl1, size_t __sl2,
-	   size_t __sr1, size_t __sr2,
-	   uint32_t __msk1, uint32_t __msk2,
-	   uint32_t __msk3, uint32_t __msk4,
-	   uint32_t __parity1, uint32_t __parity2,
-	   uint32_t __parity3, uint32_t __parity4,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       __gnu_cxx::simd_fast_mersenne_twister_engine<_UIntType,
-	       __m, __pos1, __sl1, __sl2, __sr1, __sr2,
-	       __msk1, __msk2, __msk3, __msk4,
-	       __parity1, __parity2, __parity3, __parity4>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits> __istream_type;
-      typedef typename __istream_type::ios_base __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      for (size_t __i = 0; __i < __x._M_nstate32; ++__i)
-	__is >> __x._M_state32[__i];
-      __is >> __x._M_pos;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-#endif // __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-
-  /**
-   * Iteration method due to M.D. J<o:>hnk.
-   *
-   * M.D. J<o:>hnk, Erzeugung von betaverteilten und gammaverteilten
-   * Zufallszahlen, Metrika, Volume 8, 1964
-   */
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename beta_distribution<_RealType>::result_type
-      beta_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	std::__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-
-	result_type __x, __y;
-	do
-	  {
-	    __x = std::exp(std::log(__aurng()) / __param.alpha());
-	    __y = std::exp(std::log(__aurng()) / __param.beta());
-	  }
-	while (__x + __y > result_type(1));
-
-	return __x / (__x + __y);
-      }
-
-  template<typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      beta_distribution<_RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	std::__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-
-	while (__f != __t)
-	  {
-	    result_type __x, __y;
-	    do
-	      {
-		__x = std::exp(std::log(__aurng()) / __param.alpha());
-		__y = std::exp(std::log(__aurng()) / __param.beta());
-	      }
-	    while (__x + __y > result_type(1));
-
-	    *__f++ = __x / (__x + __y);
-	  }
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const __gnu_cxx::beta_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.alpha() << __space << __x.beta();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       __gnu_cxx::beta_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __alpha_val, __beta_val;
-      __is >> __alpha_val >> __beta_val;
-      __x.param(typename __gnu_cxx::beta_distribution<_RealType>::
-		param_type(__alpha_val, __beta_val));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<std::size_t _Dimen, typename _RealType>
-    template<typename _InputIterator1, typename _InputIterator2>
-      void
-      normal_mv_distribution<_Dimen, _RealType>::param_type::
-      _M_init_full(_InputIterator1 __meanbegin, _InputIterator1 __meanend,
-		   _InputIterator2 __varcovbegin, _InputIterator2 __varcovend)
-      {
-	__glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-	__glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-	std::fill(std::copy(__meanbegin, __meanend, _M_mean.begin()),
-		  _M_mean.end(), _RealType(0));
-
-	// Perform the Cholesky decomposition
-	auto __w = _M_t.begin();
-	for (size_t __j = 0; __j < _Dimen; ++__j)
-	  {
-	    _RealType __sum = _RealType(0);
-
-	    auto __slitbegin = __w;
-	    auto __cit = _M_t.begin();
-	    for (size_t __i = 0; __i < __j; ++__i)
-	      {
-		auto __slit = __slitbegin;
-		_RealType __s = *__varcovbegin++;
-		for (size_t __k = 0; __k < __i; ++__k)
-		  __s -= *__slit++ * *__cit++;
-
-		*__w++ = __s /= *__cit++;
-		__sum += __s * __s;
-	      }
-
-	    __sum = *__varcovbegin - __sum;
-	    if (__builtin_expect(__sum <= _RealType(0), 0))
-	      std::__throw_runtime_error(__N("normal_mv_distribution::"
-					     "param_type::_M_init_full"));
-	    *__w++ = std::sqrt(__sum);
-
-	    std::advance(__varcovbegin, _Dimen - __j);
-	  }
-      }
-
-  template<std::size_t _Dimen, typename _RealType>
-    template<typename _InputIterator1, typename _InputIterator2>
-      void
-      normal_mv_distribution<_Dimen, _RealType>::param_type::
-      _M_init_lower(_InputIterator1 __meanbegin, _InputIterator1 __meanend,
-		    _InputIterator2 __varcovbegin, _InputIterator2 __varcovend)
-      {
-	__glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-	__glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-	std::fill(std::copy(__meanbegin, __meanend, _M_mean.begin()),
-		  _M_mean.end(), _RealType(0));
-
-	// Perform the Cholesky decomposition
-	auto __w = _M_t.begin();
-	for (size_t __j = 0; __j < _Dimen; ++__j)
-	  {
-	    _RealType __sum = _RealType(0);
-
-	    auto __slitbegin = __w;
-	    auto __cit = _M_t.begin();
-	    for (size_t __i = 0; __i < __j; ++__i)
-	      {
-		auto __slit = __slitbegin;
-		_RealType __s = *__varcovbegin++;
-		for (size_t __k = 0; __k < __i; ++__k)
-		  __s -= *__slit++ * *__cit++;
-
-		*__w++ = __s /= *__cit++;
-		__sum += __s * __s;
-	      }
-
-	    __sum = *__varcovbegin++ - __sum;
-	    if (__builtin_expect(__sum <= _RealType(0), 0))
-	      std::__throw_runtime_error(__N("normal_mv_distribution::"
-					     "param_type::_M_init_full"));
-	    *__w++ = std::sqrt(__sum);
-	  }
-      }
-
-  template<std::size_t _Dimen, typename _RealType>
-    template<typename _InputIterator1, typename _InputIterator2>
-      void
-      normal_mv_distribution<_Dimen, _RealType>::param_type::
-      _M_init_diagonal(_InputIterator1 __meanbegin, _InputIterator1 __meanend,
-		       _InputIterator2 __varbegin, _InputIterator2 __varend)
-      {
-	__glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-	__glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-	std::fill(std::copy(__meanbegin, __meanend, _M_mean.begin()),
-		  _M_mean.end(), _RealType(0));
-
-	auto __w = _M_t.begin();
-	size_t __step = 0;
-	while (__varbegin != __varend)
-	  {
-	    std::fill_n(__w, __step, _RealType(0));
-	    __w += __step++;
-	    if (__builtin_expect(*__varbegin < _RealType(0), 0))
-	      std::__throw_runtime_error(__N("normal_mv_distribution::"
-					     "param_type::_M_init_diagonal"));
-	    *__w++ = std::sqrt(*__varbegin++);
-	  }
-      }
-
-  template<std::size_t _Dimen, typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename normal_mv_distribution<_Dimen, _RealType>::result_type
-      normal_mv_distribution<_Dimen, _RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	result_type __ret;
-
-	_M_nd.__generate(__ret.begin(), __ret.end(), __urng);
-
-	auto __t_it = __param._M_t.crbegin();
-	for (size_t __i = _Dimen; __i > 0; --__i)
-	  {
-	    _RealType __sum = _RealType(0);
-	    for (size_t __j = __i; __j > 0; --__j)
-	      __sum += __ret[__j - 1] * *__t_it++;
-	    __ret[__i - 1] = __sum;
-	  }
-
-	return __ret;
-      }
-
-  template<std::size_t _Dimen, typename _RealType>
-    template<typename _ForwardIterator, typename _UniformRandomNumberGenerator>
-      void
-      normal_mv_distribution<_Dimen, _RealType>::
-      __generate_impl(_ForwardIterator __f, _ForwardIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				    _ForwardIterator>)
-	while (__f != __t)
-	  *__f++ = this->operator()(__urng, __param);
-      }
-
-  template<size_t _Dimen, typename _RealType>
-    bool
-    operator==(const __gnu_cxx::normal_mv_distribution<_Dimen, _RealType>&
-	       __d1,
-	       const __gnu_cxx::normal_mv_distribution<_Dimen, _RealType>&
-	       __d2)
-    {
-      return __d1._M_param == __d2._M_param && __d1._M_nd == __d2._M_nd;
-    }
-
-  template<size_t _Dimen, typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const __gnu_cxx::normal_mv_distribution<_Dimen, _RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      auto __mean = __x._M_param.mean();
-      for (auto __it : __mean)
-	__os << __it << __space;
-      auto __t = __x._M_param.varcov();
-      for (auto __it : __t)
-	__os << __it << __space;
-
-      __os << __x._M_nd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<size_t _Dimen, typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       __gnu_cxx::normal_mv_distribution<_Dimen, _RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      std::array<_RealType, _Dimen> __mean;
-      for (auto& __it : __mean)
-	__is >> __it;
-      std::array<_RealType, _Dimen * (_Dimen + 1) / 2> __varcov;
-      for (auto& __it : __varcov)
-	__is >> __it;
-
-      __is >> __x._M_nd;
-
-      __x.param(typename normal_mv_distribution<_Dimen, _RealType>::
-		param_type(__mean.begin(), __mean.end(),
-			   __varcov.begin(), __varcov.end()));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      rice_distribution<_RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	while (__f != __t)
-	  {
-	    typename std::normal_distribution<result_type>::param_type
-	      __px(__p.nu(), __p.sigma()), __py(result_type(0), __p.sigma());
-	    result_type __x = this->_M_ndx(__px, __urng);
-	    result_type __y = this->_M_ndy(__py, __urng);
-#if _GLIBCXX_USE_C99_MATH_TR1
-	    *__f++ = std::hypot(__x, __y);
-#else
-	    *__f++ = std::sqrt(__x * __x + __y * __y);
-#endif
-	  }
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const rice_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.nu() << __space << __x.sigma();
-      __os << __space << __x._M_ndx;
-      __os << __space << __x._M_ndy;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       rice_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __nu_val, __sigma_val;
-      __is >> __nu_val >> __sigma_val;
-      __is >> __x._M_ndx;
-      __is >> __x._M_ndy;
-      __x.param(typename rice_distribution<_RealType>::
-		param_type(__nu_val, __sigma_val));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      nakagami_distribution<_RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	typename std::gamma_distribution<result_type>::param_type
-	  __pg(__p.mu(), __p.omega() / __p.mu());
-	while (__f != __t)
-	  *__f++ = std::sqrt(this->_M_gd(__pg, __urng));
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const nakagami_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.mu() << __space << __x.omega();
-      __os << __space << __x._M_gd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       nakagami_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __mu_val, __omega_val;
-      __is >> __mu_val >> __omega_val;
-      __is >> __x._M_gd;
-      __x.param(typename nakagami_distribution<_RealType>::
-		param_type(__mu_val, __omega_val));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      pareto_distribution<_RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	result_type __mu_val = __p.mu();
-	result_type __malphinv = -result_type(1) / __p.alpha();
-	while (__f != __t)
-	  *__f++ = __mu_val * std::pow(this->_M_ud(__urng), __malphinv);
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const pareto_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.alpha() << __space << __x.mu();
-      __os << __space << __x._M_ud;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       pareto_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __alpha_val, __mu_val;
-      __is >> __alpha_val >> __mu_val;
-      __is >> __x._M_ud;
-      __x.param(typename pareto_distribution<_RealType>::
-		param_type(__alpha_val, __mu_val));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename k_distribution<_RealType>::result_type
-      k_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng)
-      {
-	result_type __x = this->_M_gd1(__urng);
-	result_type __y = this->_M_gd2(__urng);
-	return std::sqrt(__x * __y);
-      }
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename k_distribution<_RealType>::result_type
-      k_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      {
-	typename std::gamma_distribution<result_type>::param_type
-	  __p1(__p.lambda(), result_type(1) / __p.lambda()),
-	  __p2(__p.nu(), __p.mu() / __p.nu());
-	result_type __x = this->_M_gd1(__p1, __urng);
-	result_type __y = this->_M_gd2(__p2, __urng);
-	return std::sqrt(__x * __y);
-      }
-
-  template<typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      k_distribution<_RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	typename std::gamma_distribution<result_type>::param_type
-	  __p1(__p.lambda(), result_type(1) / __p.lambda()),
-	  __p2(__p.nu(), __p.mu() / __p.nu());
-	while (__f != __t)
-	  {
-	    result_type __x = this->_M_gd1(__p1, __urng);
-	    result_type __y = this->_M_gd2(__p2, __urng);
-	    *__f++ = std::sqrt(__x * __y);
-	  }
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const k_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.lambda() << __space << __x.mu() << __space << __x.nu();
-      __os << __space << __x._M_gd1;
-      __os << __space << __x._M_gd2;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       k_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __lambda_val, __mu_val, __nu_val;
-      __is >> __lambda_val >> __mu_val >> __nu_val;
-      __is >> __x._M_gd1;
-      __is >> __x._M_gd2;
-      __x.param(typename k_distribution<_RealType>::
-		param_type(__lambda_val, __mu_val, __nu_val));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      arcsine_distribution<_RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	result_type __dif = __p.b() - __p.a();
-	result_type __sum = __p.a() + __p.b();
-	while (__f != __t)
-	  {
-	    result_type __x = std::sin(this->_M_ud(__urng));
-	    *__f++ = (__x * __dif + __sum) / result_type(2);
-	  }
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const arcsine_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.a() << __space << __x.b();
-      __os << __space << __x._M_ud;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       arcsine_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __a, __b;
-      __is >> __a >> __b;
-      __is >> __x._M_ud;
-      __x.param(typename arcsine_distribution<_RealType>::
-		param_type(__a, __b));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename hoyt_distribution<_RealType>::result_type
-      hoyt_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng)
-      {
-	result_type __x = this->_M_ad(__urng);
-	result_type __y = this->_M_ed(__urng);
-	return (result_type(2) * this->q()
-		  / (result_type(1) + this->q() * this->q()))
-	       * std::sqrt(this->omega() * __x * __y);
-      }
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename hoyt_distribution<_RealType>::result_type
-      hoyt_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      {
-	result_type __q2 = __p.q() * __p.q();
-	result_type __num = result_type(0.5L) * (result_type(1) + __q2);
-	typename __gnu_cxx::arcsine_distribution<result_type>::param_type
-	  __pa(__num, __num / __q2);
-	result_type __x = this->_M_ad(__pa, __urng);
-	result_type __y = this->_M_ed(__urng);
-	return (result_type(2) * __p.q() / (result_type(1) + __q2))
-	       * std::sqrt(__p.omega() * __x * __y);
-      }
-
-  template<typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      hoyt_distribution<_RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	result_type __2q = result_type(2) * __p.q();
-	result_type __q2 = __p.q() * __p.q();
-	result_type __q2p1 = result_type(1) + __q2;
-	result_type __num = result_type(0.5L) * __q2p1;
-	result_type __omega = __p.omega();
-	typename __gnu_cxx::arcsine_distribution<result_type>::param_type
-	  __pa(__num, __num / __q2);
-	while (__f != __t)
-	  {
-	    result_type __x = this->_M_ad(__pa, __urng);
-	    result_type __y = this->_M_ed(__urng);
-	    *__f++ = (__2q / __q2p1) * std::sqrt(__omega * __x * __y);
-	  }
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const hoyt_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.q() << __space << __x.omega();
-      __os << __space << __x._M_ad;
-      __os << __space << __x._M_ed;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       hoyt_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __q, __omega;
-      __is >> __q >> __omega;
-      __is >> __x._M_ad;
-      __is >> __x._M_ed;
-      __x.param(typename hoyt_distribution<_RealType>::
-		param_type(__q, __omega));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      triangular_distribution<_RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	while (__f != __t)
-	  *__f++ = this->operator()(__urng, __param);
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const __gnu_cxx::triangular_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.a() << __space << __x.b() << __space << __x.c();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       __gnu_cxx::triangular_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __a, __b, __c;
-      __is >> __a >> __b >> __c;
-      __x.param(typename __gnu_cxx::triangular_distribution<_RealType>::
-		param_type(__a, __b, __c));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename von_mises_distribution<_RealType>::result_type
-      von_mises_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      {
-	const result_type __pi
-	  = __gnu_cxx::__math_constants<result_type>::__pi;
-	std::__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-
-	result_type __f;
-	while (1)
-	  {
-	    result_type __rnd = std::cos(__pi * __aurng());
-	    __f = (result_type(1) + __p._M_r * __rnd) / (__p._M_r + __rnd);
-	    result_type __c = __p._M_kappa * (__p._M_r - __f);
-
-	    result_type __rnd2 = __aurng();
-	    if (__c * (result_type(2) - __c) > __rnd2)
-	      break;
-	    if (std::log(__c / __rnd2) >= __c - result_type(1))
-	      break;
-	  }
-
-	result_type __res = std::acos(__f);
-#if _GLIBCXX_USE_C99_MATH_TR1
-	__res = std::copysign(__res, __aurng() - result_type(0.5));
-#else
-	if (__aurng() < result_type(0.5))
-	  __res = -__res;
-#endif
-	__res += __p._M_mu;
-	if (__res > __pi)
-	  __res -= result_type(2) * __pi;
-	else if (__res < -__pi)
-	  __res += result_type(2) * __pi;
-	return __res;
-      }
-
-  template<typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      von_mises_distribution<_RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	while (__f != __t)
-	  *__f++ = this->operator()(__urng, __param);
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const __gnu_cxx::von_mises_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.mu() << __space << __x.kappa();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       __gnu_cxx::von_mises_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __mu, __kappa;
-      __is >> __mu >> __kappa;
-      __x.param(typename __gnu_cxx::von_mises_distribution<_RealType>::
-		param_type(__mu, __kappa));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _UIntType>
-    template<typename _UniformRandomNumberGenerator>
-      typename hypergeometric_distribution<_UIntType>::result_type
-      hypergeometric_distribution<_UIntType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __param)
-      {
-	std::__detail::_Adaptor<_UniformRandomNumberGenerator, double>
-	  __aurng(__urng);
-
-	result_type __a = __param.successful_size();
-	result_type __b = __param.total_size();
-	result_type __k = 0;
-
-	if (__param.total_draws() < __param.total_size() / 2)
-	  {
-	    for (result_type __i = 0; __i < __param.total_draws(); ++__i)
-	      {
-		if (__b * __aurng() < __a)
-		  {
-		    ++__k;
-		    if (__k == __param.successful_size())
-		      return __k;
-		   --__a;
-		  }
-		--__b;
-	      }
-	    return __k;
-	  }
-	else
-	  {
-	    for (result_type __i = 0; __i < __param.unsuccessful_size(); ++__i)
-	      {
-		if (__b * __aurng() < __a)
-		  {
-		    ++__k;
-		    if (__k == __param.successful_size())
-		      return __param.successful_size() - __k;
-		    --__a;
-		  }
-		--__b;
-	      }
-	    return __param.successful_size() - __k;
-	  }
-      }
-
-  template<typename _UIntType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      hypergeometric_distribution<_UIntType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	while (__f != __t)
-	  *__f++ = this->operator()(__urng);
-      }
-
-  template<typename _UIntType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const __gnu_cxx::hypergeometric_distribution<_UIntType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_UIntType>::max_digits10);
-
-      __os << __x.total_size() << __space << __x.successful_size() << __space
-	   << __x.total_draws();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _UIntType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       __gnu_cxx::hypergeometric_distribution<_UIntType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _UIntType __total_size, __successful_size, __total_draws;
-      __is >> __total_size >> __successful_size >> __total_draws;
-      __x.param(typename __gnu_cxx::hypergeometric_distribution<_UIntType>::
-		param_type(__total_size, __successful_size, __total_draws));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename logistic_distribution<_RealType>::result_type
-      logistic_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      {
-	std::__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-
-	result_type __arg = result_type(1);
-	while (__arg == result_type(1) || __arg == result_type(0))
-	  __arg = __aurng();
-	return __p.a()
-	     + __p.b() * std::log(__arg / (result_type(1) - __arg));
-      }
-
-  template<typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      logistic_distribution<_RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __p)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-	std::__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
-	  __aurng(__urng);
-
-	while (__f != __t)
-	  {
-	    result_type __arg = result_type(1);
-	    while (__arg == result_type(1) || __arg == result_type(0))
-	      __arg = __aurng();
-	    *__f++ = __p.a()
-		   + __p.b() * std::log(__arg / (result_type(1) - __arg));
-	  }
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const logistic_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(std::numeric_limits<_RealType>::max_digits10);
-
-      __os << __x.a() << __space << __x.b();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       logistic_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      _RealType __a, __b;
-      __is >> __a >> __b;
-      __x.param(typename logistic_distribution<_RealType>::
-		param_type(__a, __b));
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  namespace {
-
-    // Helper class for the uniform_on_sphere_distribution generation
-    // function.
-    template<std::size_t _Dimen, typename _RealType>
-      class uniform_on_sphere_helper
-      {
-	typedef typename uniform_on_sphere_distribution<_Dimen, _RealType>::
-	  result_type result_type;
-
-      public:
-	template<typename _NormalDistribution,
-		 typename _UniformRandomNumberGenerator>
-	result_type operator()(_NormalDistribution& __nd,
-			       _UniformRandomNumberGenerator& __urng)
-        {
-	  result_type __ret;
-	  typename result_type::value_type __norm;
-
-	  do
-	    {
-	      auto __sum = _RealType(0);
-
-	      std::generate(__ret.begin(), __ret.end(),
-			    [&__nd, &__urng, &__sum](){
-			      _RealType __t = __nd(__urng);
-			      __sum += __t * __t;
-			      return __t; });
-	      __norm = std::sqrt(__sum);
-	    }
-	  while (__norm == _RealType(0) || ! std::isfinite(__norm));
-
-	  std::transform(__ret.begin(), __ret.end(), __ret.begin(),
-			 [__norm](_RealType __val){ return __val / __norm; });
-
-	  return __ret;
-        }
-      };
-
-
-    template<typename _RealType>
-      class uniform_on_sphere_helper<2, _RealType>
-      {
-	typedef typename uniform_on_sphere_distribution<2, _RealType>::
-	  result_type result_type;
-
-      public:
-	template<typename _NormalDistribution,
-		 typename _UniformRandomNumberGenerator>
-	result_type operator()(_NormalDistribution&,
-			       _UniformRandomNumberGenerator& __urng)
-        {
-	  result_type __ret;
-	  _RealType __sq;
-	  std::__detail::_Adaptor<_UniformRandomNumberGenerator,
-				  _RealType> __aurng(__urng);
-
-	  do
-	    {
-	      __ret[0] = _RealType(2) * __aurng() - _RealType(1);
-	      __ret[1] = _RealType(2) * __aurng() - _RealType(1);
-
-	      __sq = __ret[0] * __ret[0] + __ret[1] * __ret[1];
-	    }
-	  while (__sq == _RealType(0) || __sq > _RealType(1));
-
-#if _GLIBCXX_USE_C99_MATH_TR1
-	  // Yes, we do not just use sqrt(__sq) because hypot() is more
-	  // accurate.
-	  auto __norm = std::hypot(__ret[0], __ret[1]);
-#else
-	  auto __norm = std::sqrt(__sq);
-#endif
-	  __ret[0] /= __norm;
-	  __ret[1] /= __norm;
-
-	  return __ret;
-        }
-      };
-
-  }
-
-
-  template<std::size_t _Dimen, typename _RealType>
-    template<typename _UniformRandomNumberGenerator>
-      typename uniform_on_sphere_distribution<_Dimen, _RealType>::result_type
-      uniform_on_sphere_distribution<_Dimen, _RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng,
-		 const param_type& __p)
-      {
-        uniform_on_sphere_helper<_Dimen, _RealType> __helper;
-        return __helper(_M_nd, __urng);
-      }
-
-  template<std::size_t _Dimen, typename _RealType>
-    template<typename _OutputIterator,
-	     typename _UniformRandomNumberGenerator>
-      void
-      uniform_on_sphere_distribution<_Dimen, _RealType>::
-      __generate_impl(_OutputIterator __f, _OutputIterator __t,
-		      _UniformRandomNumberGenerator& __urng,
-		      const param_type& __param)
-      {
-	__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
-
-	while (__f != __t)
-	  *__f++ = this->operator()(__urng, __param);
-      }
-
-  template<std::size_t _Dimen, typename _RealType, typename _CharT,
-	   typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const __gnu_cxx::uniform_on_sphere_distribution<_Dimen,
-							       _RealType>& __x)
-    {
-      return __os << __x._M_nd;
-    }
-
-  template<std::size_t _Dimen, typename _RealType, typename _CharT,
-	   typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       __gnu_cxx::uniform_on_sphere_distribution<_Dimen,
-							 _RealType>& __x)
-    {
-      return __is >> __x._M_nd;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-
-#endif // _EXT_RANDOM_TCC
diff --git a/openflow/usr/include/c++/5/ext/rb_tree b/openflow/usr/include/c++/5/ext/rb_tree
deleted file mode 100644
index d145c0e..0000000
--- a/openflow/usr/include/c++/5/ext/rb_tree
+++ /dev/null
@@ -1,96 +0,0 @@
-// rb_tree extension -*- C++ -*-
-
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/rb_tree
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset). 
- */
-
-#ifndef _RB_TREE
-#define _RB_TREE 1
-
-#pragma GCC system_header
-
-#include <bits/stl_tree.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::_Rb_tree;
-  using std::allocator;
-
-  // Class rb_tree is not part of the C++ standard.  It is provided for
-  // compatibility with the HP STL.
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template <class _Key, class _Value, class _KeyOfValue, class _Compare,
-	    class _Alloc = allocator<_Value> >
-    struct rb_tree
-    : public _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc>
-    {
-      typedef _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc> _Base;
-      typedef typename _Base::allocator_type allocator_type;
-
-      rb_tree(const _Compare& __comp = _Compare(),
-	      const allocator_type& __a = allocator_type())
-      : _Base(__comp, __a) { }
-
-      ~rb_tree() { }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/rc_string_base.h b/openflow/usr/include/c++/5/ext/rc_string_base.h
deleted file mode 100644
index 8e8a8e5..0000000
--- a/openflow/usr/include/c++/5/ext/rc_string_base.h
+++ /dev/null
@@ -1,732 +0,0 @@
-// Reference-counted versatile string base -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/rc_string_base.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ext/vstring.h}
- */
-
-#ifndef _RC_STRING_BASE_H
-#define _RC_STRING_BASE_H 1
-
-#include <ext/atomicity.h>
-#include <bits/stl_iterator_base_funcs.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  Documentation?  What's that?
-   *  Nathan Myers <ncm@cantrip.org>.
-   *
-   *  A string looks like this:
-   *
-   *  @code
-   *                                        [_Rep]
-   *                                        _M_length
-   *   [__rc_string_base<char_type>]        _M_capacity
-   *   _M_dataplus                          _M_refcount
-   *   _M_p ---------------->               unnamed array of char_type
-   *  @endcode
-   *
-   *  Where the _M_p points to the first character in the string, and
-   *  you cast it to a pointer-to-_Rep and subtract 1 to get a
-   *  pointer to the header.
-   *
-   *  This approach has the enormous advantage that a string object
-   *  requires only one allocation.  All the ugliness is confined
-   *  within a single pair of inline functions, which each compile to
-   *  a single @a add instruction: _Rep::_M_refdata(), and
-   *  __rc_string_base::_M_rep(); and the allocation function which gets a
-   *  block of raw bytes and with room enough and constructs a _Rep
-   *  object at the front.
-   *
-   *  The reason you want _M_data pointing to the character array and
-   *  not the _Rep is so that the debugger can see the string
-   *  contents. (Probably we should add a non-inline member to get
-   *  the _Rep for the debugger to use, so users can check the actual
-   *  string length.)
-   *
-   *  Note that the _Rep object is a POD so that you can have a
-   *  static <em>empty string</em> _Rep object already @a constructed before
-   *  static constructors have run.  The reference-count encoding is
-   *  chosen so that a 0 indicates one reference, so you never try to
-   *  destroy the empty-string _Rep object.
-   *
-   *  All but the last paragraph is considered pretty conventional
-   *  for a C++ string implementation.
-  */
- template<typename _CharT, typename _Traits, typename _Alloc>
-    class __rc_string_base
-    : protected __vstring_utility<_CharT, _Traits, _Alloc>
-    {
-    public:
-      typedef _Traits					    traits_type;
-      typedef typename _Traits::char_type		    value_type;
-      typedef _Alloc					    allocator_type;
-
-      typedef __vstring_utility<_CharT, _Traits, _Alloc>    _Util_Base;
-      typedef typename _Util_Base::_CharT_alloc_type        _CharT_alloc_type;
-      typedef typename _CharT_alloc_type::size_type	    size_type;
-
-    private:
-      // _Rep: string representation
-      //   Invariants:
-      //   1. String really contains _M_length + 1 characters: due to 21.3.4
-      //      must be kept null-terminated.
-      //   2. _M_capacity >= _M_length
-      //      Allocated memory is always (_M_capacity + 1) * sizeof(_CharT).
-      //   3. _M_refcount has three states:
-      //      -1: leaked, one reference, no ref-copies allowed, non-const.
-      //       0: one reference, non-const.
-      //     n>0: n + 1 references, operations require a lock, const.
-      //   4. All fields == 0 is an empty string, given the extra storage
-      //      beyond-the-end for a null terminator; thus, the shared
-      //      empty string representation needs no constructor.
-      struct _Rep
-      {
-	union
-	{
-	  struct
-	  {
-	    size_type	    _M_length;
-	    size_type	    _M_capacity;
-	    _Atomic_word    _M_refcount;
-	  }                 _M_info;
-
-	  // Only for alignment purposes.
-	  _CharT            _M_align;
-	};
-
-	typedef typename _Alloc::template rebind<_Rep>::other _Rep_alloc_type;
-
- 	_CharT*
-	_M_refdata() throw()
-	{ return reinterpret_cast<_CharT*>(this + 1); }
-
-	_CharT*
-	_M_refcopy() throw()
-	{
-	  __atomic_add_dispatch(&_M_info._M_refcount, 1);
-	  return _M_refdata();
-	}  // XXX MT
-
-	void
-	_M_set_length(size_type __n)
-	{
-	  _M_info._M_refcount = 0;  // One reference.
-	  _M_info._M_length = __n;
-	  // grrr. (per 21.3.4)
-	  // You cannot leave those LWG people alone for a second.
-	  traits_type::assign(_M_refdata()[__n], _CharT());
-	}
-
-	// Create & Destroy
-	static _Rep*
-	_S_create(size_type, size_type, const _Alloc&);
-
-	void
-	_M_destroy(const _Alloc&) throw();
-
-	_CharT*
-	_M_clone(const _Alloc&, size_type __res = 0);
-      };
-
-      struct _Rep_empty
-      : public _Rep
-      {
-	_CharT              _M_terminal;
-      };
-
-      static _Rep_empty     _S_empty_rep;
-
-      // The maximum number of individual char_type elements of an
-      // individual string is determined by _S_max_size. This is the
-      // value that will be returned by max_size().  (Whereas npos
-      // is the maximum number of bytes the allocator can allocate.)
-      // If one was to divvy up the theoretical largest size string,
-      // with a terminating character and m _CharT elements, it'd
-      // look like this:
-      // npos = sizeof(_Rep) + (m * sizeof(_CharT)) + sizeof(_CharT)
-      //        + sizeof(_Rep) - 1
-      // (NB: last two terms for rounding reasons, see _M_create below)
-      // Solving for m:
-      // m = ((npos - 2 * sizeof(_Rep) + 1) / sizeof(_CharT)) - 1
-      // In addition, this implementation halves this amount.
-      enum { _S_max_size = (((static_cast<size_type>(-1) - 2 * sizeof(_Rep)
-			      + 1) / sizeof(_CharT)) - 1) / 2 };
-
-      // Data Member (private):
-      mutable typename _Util_Base::template _Alloc_hider<_Alloc>  _M_dataplus;
-
-      void
-      _M_data(_CharT* __p)
-      { _M_dataplus._M_p = __p; }
-
-      _Rep*
-      _M_rep() const
-      { return &((reinterpret_cast<_Rep*>(_M_data()))[-1]); }
-
-      _CharT*
-      _M_grab(const _Alloc& __alloc) const
-      {
-	return (!_M_is_leaked() && _M_get_allocator() == __alloc)
-		? _M_rep()->_M_refcopy() : _M_rep()->_M_clone(__alloc);
-      }
-
-      void
-      _M_dispose()
-      {
-	// Be race-detector-friendly.  For more info see bits/c++config.
-	_GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_rep()->_M_info.
-						_M_refcount);
-	if (__exchange_and_add_dispatch(&_M_rep()->_M_info._M_refcount,
-					-1) <= 0)
-	  {
-	    _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&_M_rep()->_M_info.
-						   _M_refcount);
-	    _M_rep()->_M_destroy(_M_get_allocator());
-	  }
-      }  // XXX MT
-
-      bool
-      _M_is_leaked() const
-      { return _M_rep()->_M_info._M_refcount < 0; }
-
-      void
-      _M_set_sharable()
-      { _M_rep()->_M_info._M_refcount = 0; }
-
-      void
-      _M_leak_hard();
-
-      // _S_construct_aux is used to implement the 21.3.1 para 15 which
-      // requires special behaviour if _InIterator is an integral type
-      template<typename _InIterator>
-	static _CharT*
-	_S_construct_aux(_InIterator __beg, _InIterator __end,
-			 const _Alloc& __a, std::__false_type)
-	{
-	  typedef typename iterator_traits<_InIterator>::iterator_category _Tag;
-	  return _S_construct(__beg, __end, __a, _Tag());
-	}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-	static _CharT*
-	_S_construct_aux(_Integer __beg, _Integer __end,
-			 const _Alloc& __a, std::__true_type)
-	{ return _S_construct_aux_2(static_cast<size_type>(__beg),
-				    __end, __a); }
-
-      static _CharT*
-      _S_construct_aux_2(size_type __req, _CharT __c, const _Alloc& __a)
-      { return _S_construct(__req, __c, __a); }
-
-      template<typename _InIterator>
-	static _CharT*
-	_S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a)
-	{
-	  typedef typename std::__is_integer<_InIterator>::__type _Integral;
-	  return _S_construct_aux(__beg, __end, __a, _Integral());
-	}
-
-      // For Input Iterators, used in istreambuf_iterators, etc.
-      template<typename _InIterator>
-	static _CharT*
-	 _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
-		      std::input_iterator_tag);
-
-      // For forward_iterators up to random_access_iterators, used for
-      // string::iterator, _CharT*, etc.
-      template<typename _FwdIterator>
-	static _CharT*
-	_S_construct(_FwdIterator __beg, _FwdIterator __end, const _Alloc& __a,
-		     std::forward_iterator_tag);
-
-      static _CharT*
-      _S_construct(size_type __req, _CharT __c, const _Alloc& __a);
-
-    public:
-      size_type
-      _M_max_size() const
-      { return size_type(_S_max_size); }
-
-      _CharT*
-      _M_data() const
-      { return _M_dataplus._M_p; }
-
-      size_type
-      _M_length() const
-      { return _M_rep()->_M_info._M_length; }
-
-      size_type
-      _M_capacity() const
-      { return _M_rep()->_M_info._M_capacity; }
-
-      bool
-      _M_is_shared() const
-      { return _M_rep()->_M_info._M_refcount > 0; }
-
-      void
-      _M_set_leaked()
-      { _M_rep()->_M_info._M_refcount = -1; }
-
-      void
-      _M_leak()    // for use in begin() & non-const op[]
-      {
-	if (!_M_is_leaked())
-	  _M_leak_hard();
-      }
-
-      void
-      _M_set_length(size_type __n)
-      { _M_rep()->_M_set_length(__n); }
-
-      __rc_string_base()
-      : _M_dataplus(_S_empty_rep._M_refcopy()) { }
-
-      __rc_string_base(const _Alloc& __a);
-
-      __rc_string_base(const __rc_string_base& __rcs);
-
-#if __cplusplus >= 201103L
-      __rc_string_base(__rc_string_base&& __rcs)
-      : _M_dataplus(__rcs._M_dataplus)
-      { __rcs._M_data(_S_empty_rep._M_refcopy()); }
-#endif
-
-      __rc_string_base(size_type __n, _CharT __c, const _Alloc& __a);
-
-      template<typename _InputIterator>
-	__rc_string_base(_InputIterator __beg, _InputIterator __end,
-			 const _Alloc& __a);
-
-      ~__rc_string_base()
-      { _M_dispose(); }
-
-      allocator_type&
-      _M_get_allocator()
-      { return _M_dataplus; }
-
-      const allocator_type&
-      _M_get_allocator() const
-      { return _M_dataplus; }
-
-      void
-      _M_swap(__rc_string_base& __rcs);
-
-      void
-      _M_assign(const __rc_string_base& __rcs);
-
-      void
-      _M_reserve(size_type __res);
-
-      void
-      _M_mutate(size_type __pos, size_type __len1, const _CharT* __s,
-		size_type __len2);
-
-      void
-      _M_erase(size_type __pos, size_type __n);
-
-      void
-      _M_clear()
-      { _M_erase(size_type(0), _M_length()); }
-
-      bool
-      _M_compare(const __rc_string_base&) const
-      { return false; }
-    };
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename __rc_string_base<_CharT, _Traits, _Alloc>::_Rep_empty
-    __rc_string_base<_CharT, _Traits, _Alloc>::_S_empty_rep;
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename __rc_string_base<_CharT, _Traits, _Alloc>::_Rep*
-    __rc_string_base<_CharT, _Traits, _Alloc>::_Rep::
-    _S_create(size_type __capacity, size_type __old_capacity,
-	      const _Alloc& __alloc)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 83.  String::npos vs. string::max_size()
-      if (__capacity > size_type(_S_max_size))
-	std::__throw_length_error(__N("__rc_string_base::_Rep::_S_create"));
-
-      // The standard places no restriction on allocating more memory
-      // than is strictly needed within this layer at the moment or as
-      // requested by an explicit application call to reserve().
-
-      // Many malloc implementations perform quite poorly when an
-      // application attempts to allocate memory in a stepwise fashion
-      // growing each allocation size by only 1 char.  Additionally,
-      // it makes little sense to allocate less linear memory than the
-      // natural blocking size of the malloc implementation.
-      // Unfortunately, we would need a somewhat low-level calculation
-      // with tuned parameters to get this perfect for any particular
-      // malloc implementation.  Fortunately, generalizations about
-      // common features seen among implementations seems to suffice.
-
-      // __pagesize need not match the actual VM page size for good
-      // results in practice, thus we pick a common value on the low
-      // side.  __malloc_header_size is an estimate of the amount of
-      // overhead per memory allocation (in practice seen N * sizeof
-      // (void*) where N is 0, 2 or 4).  According to folklore,
-      // picking this value on the high side is better than
-      // low-balling it (especially when this algorithm is used with
-      // malloc implementations that allocate memory blocks rounded up
-      // to a size which is a power of 2).
-      const size_type __pagesize = 4096;
-      const size_type __malloc_header_size = 4 * sizeof(void*);
-
-      // The below implements an exponential growth policy, necessary to
-      // meet amortized linear time requirements of the library: see
-      // http://gcc.gnu.org/ml/libstdc++/2001-07/msg00085.html.
-      if (__capacity > __old_capacity && __capacity < 2 * __old_capacity)
-	{
-	  __capacity = 2 * __old_capacity;
-	  // Never allocate a string bigger than _S_max_size.
-	  if (__capacity > size_type(_S_max_size))
-	    __capacity = size_type(_S_max_size);
-	}
-
-      // NB: Need an array of char_type[__capacity], plus a terminating
-      // null char_type() element, plus enough for the _Rep data structure,
-      // plus sizeof(_Rep) - 1 to upper round to a size multiple of
-      // sizeof(_Rep).
-      // Whew. Seemingly so needy, yet so elemental.
-      size_type __size = ((__capacity + 1) * sizeof(_CharT)
-			  + 2 * sizeof(_Rep) - 1);
-
-      const size_type __adj_size = __size + __malloc_header_size;
-      if (__adj_size > __pagesize && __capacity > __old_capacity)
-	{
-	  const size_type __extra = __pagesize - __adj_size % __pagesize;
-	  __capacity += __extra / sizeof(_CharT);
-	  if (__capacity > size_type(_S_max_size))
-	    __capacity = size_type(_S_max_size);
-	  __size = (__capacity + 1) * sizeof(_CharT) + 2 * sizeof(_Rep) - 1;
-	}
-
-      // NB: Might throw, but no worries about a leak, mate: _Rep()
-      // does not throw.
-      _Rep* __place = _Rep_alloc_type(__alloc).allocate(__size / sizeof(_Rep));
-      _Rep* __p = new (__place) _Rep;
-      __p->_M_info._M_capacity = __capacity;
-      return __p;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __rc_string_base<_CharT, _Traits, _Alloc>::_Rep::
-    _M_destroy(const _Alloc& __a) throw ()
-    {
-      const size_type __size = ((_M_info._M_capacity + 1) * sizeof(_CharT)
-				+ 2 * sizeof(_Rep) - 1);
-      _Rep_alloc_type(__a).deallocate(this, __size / sizeof(_Rep));
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    _CharT*
-    __rc_string_base<_CharT, _Traits, _Alloc>::_Rep::
-    _M_clone(const _Alloc& __alloc, size_type __res)
-    {
-      // Requested capacity of the clone.
-      const size_type __requested_cap = _M_info._M_length + __res;
-      _Rep* __r = _Rep::_S_create(__requested_cap, _M_info._M_capacity,
-				  __alloc);
-
-      if (_M_info._M_length)
-	__rc_string_base::_S_copy(__r->_M_refdata(), _M_refdata(), _M_info._M_length);
-
-      __r->_M_set_length(_M_info._M_length);
-      return __r->_M_refdata();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    __rc_string_base(const _Alloc& __a)
-    : _M_dataplus(__a, _S_construct(size_type(), _CharT(), __a)) { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    __rc_string_base(const __rc_string_base& __rcs)
-    : _M_dataplus(__rcs._M_get_allocator(),
-		  __rcs._M_grab(__rcs._M_get_allocator())) { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    __rc_string_base(size_type __n, _CharT __c, const _Alloc& __a)
-    : _M_dataplus(__a, _S_construct(__n, __c, __a)) { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InputIterator>
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    __rc_string_base(_InputIterator __beg, _InputIterator __end,
-		     const _Alloc& __a)
-    : _M_dataplus(__a, _S_construct(__beg, __end, __a)) { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    _M_leak_hard()
-    {
-      if (_M_is_shared())
-	_M_erase(0, 0);
-      _M_set_leaked();
-    }
-
-  // NB: This is the special case for Input Iterators, used in
-  // istreambuf_iterators, etc.
-  // Input Iterators have a cost structure very different from
-  // pointers, calling for a different coding style.
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InIterator>
-      _CharT*
-      __rc_string_base<_CharT, _Traits, _Alloc>::
-      _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
-		   std::input_iterator_tag)
-      {
-	if (__beg == __end && __a == _Alloc())
-	  return _S_empty_rep._M_refcopy();
-
-	// Avoid reallocation for common case.
-	_CharT __buf[128];
-	size_type __len = 0;
-	while (__beg != __end && __len < sizeof(__buf) / sizeof(_CharT))
-	  {
-	    __buf[__len++] = *__beg;
-	    ++__beg;
-	  }
-	_Rep* __r = _Rep::_S_create(__len, size_type(0), __a);
-	_S_copy(__r->_M_refdata(), __buf, __len);
-	__try
-	  {
-	    while (__beg != __end)
-	      {
-		if (__len == __r->_M_info._M_capacity)
-		  {
-		    // Allocate more space.
-		    _Rep* __another = _Rep::_S_create(__len + 1, __len, __a);
-		    _S_copy(__another->_M_refdata(), __r->_M_refdata(), __len);
-		    __r->_M_destroy(__a);
-		    __r = __another;
-		  }
-		__r->_M_refdata()[__len++] = *__beg;
-		++__beg;
-	      }
-	  }
-	__catch(...)
-	  {
-	    __r->_M_destroy(__a);
-	    __throw_exception_again;
-	  }
-	__r->_M_set_length(__len);
-	return __r->_M_refdata();
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InIterator>
-      _CharT*
-      __rc_string_base<_CharT, _Traits, _Alloc>::
-      _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
-		   std::forward_iterator_tag)
-      {
-	if (__beg == __end && __a == _Alloc())
-	  return _S_empty_rep._M_refcopy();
-
-	// NB: Not required, but considered best practice.
-	if (__is_null_pointer(__beg) && __beg != __end)
-	  std::__throw_logic_error(__N("__rc_string_base::"
-				       "_S_construct null not valid"));
-
-	const size_type __dnew = static_cast<size_type>(std::distance(__beg,
-								      __end));
-	// Check for out_of_range and length_error exceptions.
-	_Rep* __r = _Rep::_S_create(__dnew, size_type(0), __a);
-	__try
-	  { __rc_string_base::_S_copy_chars(__r->_M_refdata(), __beg, __end); }
-	__catch(...)
-	  {
-	    __r->_M_destroy(__a);
-	    __throw_exception_again;
-	  }
-	__r->_M_set_length(__dnew);
-	return __r->_M_refdata();
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    _CharT*
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    _S_construct(size_type __n, _CharT __c, const _Alloc& __a)
-    {
-      if (__n == 0 && __a == _Alloc())
-	return _S_empty_rep._M_refcopy();
-
-      // Check for out_of_range and length_error exceptions.
-      _Rep* __r = _Rep::_S_create(__n, size_type(0), __a);
-      if (__n)
-	__rc_string_base::_S_assign(__r->_M_refdata(), __n, __c);
-
-      __r->_M_set_length(__n);
-      return __r->_M_refdata();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    _M_swap(__rc_string_base& __rcs)
-    {
-      if (_M_is_leaked())
-	_M_set_sharable();
-      if (__rcs._M_is_leaked())
-	__rcs._M_set_sharable();
-
-      _CharT* __tmp = _M_data();
-      _M_data(__rcs._M_data());
-      __rcs._M_data(__tmp);
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 431. Swapping containers with unequal allocators.
-      std::__alloc_swap<allocator_type>::_S_do_it(_M_get_allocator(),
-						  __rcs._M_get_allocator());
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    _M_assign(const __rc_string_base& __rcs)
-    {
-      if (_M_rep() != __rcs._M_rep())
-	{
-	  _CharT* __tmp = __rcs._M_grab(_M_get_allocator());
-	  _M_dispose();
-	  _M_data(__tmp);
-	}
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    _M_reserve(size_type __res)
-    {
-      // Make sure we don't shrink below the current size.
-      if (__res < _M_length())
-	__res = _M_length();
-
-      if (__res != _M_capacity() || _M_is_shared())
-	{
-	  _CharT* __tmp = _M_rep()->_M_clone(_M_get_allocator(),
-					     __res - _M_length());
-	  _M_dispose();
-	  _M_data(__tmp);
-	}
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    _M_mutate(size_type __pos, size_type __len1, const _CharT* __s,
-	      size_type __len2)
-    {
-      const size_type __how_much = _M_length() - __pos - __len1;
-
-      _Rep* __r = _Rep::_S_create(_M_length() + __len2 - __len1,
-				  _M_capacity(), _M_get_allocator());
-
-      if (__pos)
-	this->_S_copy(__r->_M_refdata(), _M_data(), __pos);
-      if (__s && __len2)
-	this->_S_copy(__r->_M_refdata() + __pos, __s, __len2);
-      if (__how_much)
-	this->_S_copy(__r->_M_refdata() + __pos + __len2,
-		_M_data() + __pos + __len1, __how_much);
-
-      _M_dispose();
-      _M_data(__r->_M_refdata());
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __rc_string_base<_CharT, _Traits, _Alloc>::
-    _M_erase(size_type __pos, size_type __n)
-    {
-      const size_type __new_size = _M_length() - __n;
-      const size_type __how_much = _M_length() - __pos - __n;
-
-      if (_M_is_shared())
-	{
-	  // Must reallocate.
-	  _Rep* __r = _Rep::_S_create(__new_size, _M_capacity(),
-				      _M_get_allocator());
-
-	  if (__pos)
-	    this->_S_copy(__r->_M_refdata(), _M_data(), __pos);
-	  if (__how_much)
-	    this->_S_copy(__r->_M_refdata() + __pos,
-		    _M_data() + __pos + __n, __how_much);
-
-	  _M_dispose();
-	  _M_data(__r->_M_refdata());
-	}
-      else if (__how_much && __n)
-	{
-	  // Work in-place.
-	  this->_S_move(_M_data() + __pos,
-		  _M_data() + __pos + __n, __how_much);
-	}
-
-      _M_rep()->_M_set_length(__new_size);
-    }
-
-  template<>
-    inline bool
-    __rc_string_base<char, std::char_traits<char>,
-		     std::allocator<char> >::
-    _M_compare(const __rc_string_base& __rcs) const
-    {
-      if (_M_rep() == __rcs._M_rep())
-	return true;
-      return false;
-    }
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    inline bool
-    __rc_string_base<wchar_t, std::char_traits<wchar_t>,
-		     std::allocator<wchar_t> >::
-    _M_compare(const __rc_string_base& __rcs) const
-    {
-      if (_M_rep() == __rcs._M_rep())
-	return true;
-      return false;
-    }
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _RC_STRING_BASE_H */
diff --git a/openflow/usr/include/c++/5/ext/rope b/openflow/usr/include/c++/5/ext/rope
deleted file mode 100644
index b982dc8..0000000
--- a/openflow/usr/include/c++/5/ext/rope
+++ /dev/null
@@ -1,2977 +0,0 @@
-// SGI's rope class -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/rope
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset). 
- */
-
-#ifndef _ROPE
-#define _ROPE 1
-
-#pragma GCC system_header
-
-#include <algorithm>
-#include <iosfwd>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_function.h>
-#include <bits/stl_numeric.h>
-#include <bits/allocator.h>
-#include <bits/gthr.h>
-#include <tr1/functional>
-
-# ifdef __GC
-#   define __GC_CONST const
-# else
-#   define __GC_CONST   // constant except for deallocation
-# endif
-
-#include <ext/memory> // For uninitialized_copy_n
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-  namespace __detail
-  {
-    enum { _S_max_rope_depth = 45 };
-    enum _Tag {_S_leaf, _S_concat, _S_substringfn, _S_function};
-  } // namespace __detail
-
-  using std::size_t;
-  using std::ptrdiff_t;
-  using std::allocator;
-  using std::_Destroy;
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // See libstdc++/36832.
-  template<typename _ForwardIterator, typename _Allocator>
-    void
-    _Destroy_const(_ForwardIterator __first,
-		   _ForwardIterator __last, _Allocator __alloc)
-    {
-      for (; __first != __last; ++__first)
-	__alloc.destroy(&*__first);
-    }
-
-  template<typename _ForwardIterator, typename _Tp>
-    inline void
-    _Destroy_const(_ForwardIterator __first,
-		   _ForwardIterator __last, allocator<_Tp>)
-    { _Destroy(__first, __last); }
-
-  // The _S_eos function is used for those functions that
-  // convert to/from C-like strings to detect the end of the string.
-  
-  // The end-of-C-string character.
-  // This is what the draft standard says it should be.
-  template <class _CharT>
-    inline _CharT
-    _S_eos(_CharT*)
-    { return _CharT(); }
-
-  // Test for basic character types.
-  // For basic character types leaves having a trailing eos.
-  template <class _CharT>
-    inline bool
-    _S_is_basic_char_type(_CharT*)
-    { return false; }
-  
-  template <class _CharT>
-    inline bool
-    _S_is_one_byte_char_type(_CharT*)
-    { return false; }
-
-  inline bool
-  _S_is_basic_char_type(char*)
-  { return true; }
-  
-  inline bool
-  _S_is_one_byte_char_type(char*)
-  { return true; }
-  
-  inline bool
-  _S_is_basic_char_type(wchar_t*)
-  { return true; }
-
-  // Store an eos iff _CharT is a basic character type.
-  // Do not reference _S_eos if it isn't.
-  template <class _CharT>
-    inline void
-    _S_cond_store_eos(_CharT&) { }
-
-  inline void
-  _S_cond_store_eos(char& __c)
-  { __c = 0; }
-
-  inline void
-  _S_cond_store_eos(wchar_t& __c)
-  { __c = 0; }
-
-  // char_producers are logically functions that generate a section of
-  // a string.  These can be converted to ropes.  The resulting rope
-  // invokes the char_producer on demand.  This allows, for example,
-  // files to be viewed as ropes without reading the entire file.
-  template <class _CharT>
-    class char_producer
-    {
-    public:
-      virtual ~char_producer() { };
-
-      virtual void
-      operator()(size_t __start_pos, size_t __len,
-		 _CharT* __buffer) = 0;
-      // Buffer should really be an arbitrary output iterator.
-      // That way we could flatten directly into an ostream, etc.
-      // This is thoroughly impossible, since iterator types don't
-      // have runtime descriptions.
-    };
-
-  // Sequence buffers:
-  //
-  // Sequence must provide an append operation that appends an
-  // array to the sequence.  Sequence buffers are useful only if
-  // appending an entire array is cheaper than appending element by element.
-  // This is true for many string representations.
-  // This should  perhaps inherit from ostream<sequence::value_type>
-  // and be implemented correspondingly, so that they can be used
-  // for formatted.  For the sake of portability, we don't do this yet.
-  //
-  // For now, sequence buffers behave as output iterators.  But they also
-  // behave a little like basic_ostringstream<sequence::value_type> and a
-  // little like containers.
-
-  template<class _Sequence, size_t _Buf_sz = 100>
-    class sequence_buffer
-    : public std::iterator<std::output_iterator_tag, void, void, void, void>
-    {
-    public:
-      typedef typename _Sequence::value_type value_type;
-    protected:
-      _Sequence* _M_prefix;
-      value_type _M_buffer[_Buf_sz];
-      size_t     _M_buf_count;
-    public:
-
-      void
-      flush()
-      {
-	_M_prefix->append(_M_buffer, _M_buffer + _M_buf_count);
-	_M_buf_count = 0;
-      }
-      
-      ~sequence_buffer()
-      { flush(); }
-      
-      sequence_buffer()
-      : _M_prefix(0), _M_buf_count(0) { }
-
-      sequence_buffer(const sequence_buffer& __x)
-      {
-	_M_prefix = __x._M_prefix;
-	_M_buf_count = __x._M_buf_count;
-	std::copy(__x._M_buffer, __x._M_buffer + __x._M_buf_count, _M_buffer);
-      }
-      
-      sequence_buffer(sequence_buffer& __x)
-      {
-	__x.flush();
-	_M_prefix = __x._M_prefix;
-	_M_buf_count = 0;
-      }
-      
-      sequence_buffer(_Sequence& __s)
-      : _M_prefix(&__s), _M_buf_count(0) { }
-      
-      sequence_buffer&
-      operator=(sequence_buffer& __x)
-      {
-	__x.flush();
-	_M_prefix = __x._M_prefix;
-	_M_buf_count = 0;
-	return *this;
-      }
-
-      sequence_buffer&
-      operator=(const sequence_buffer& __x)
-      {
-	_M_prefix = __x._M_prefix;
-	_M_buf_count = __x._M_buf_count;
-	std::copy(__x._M_buffer, __x._M_buffer + __x._M_buf_count, _M_buffer);
-	return *this;
-      }
-      
-      void
-      push_back(value_type __x)
-      {
-	if (_M_buf_count < _Buf_sz)
-	  {
-	    _M_buffer[_M_buf_count] = __x;
-	    ++_M_buf_count;
-	  }
-	else
-	  {
-	    flush();
-	    _M_buffer[0] = __x;
-	    _M_buf_count = 1;
-	  }
-      }
-      
-      void
-      append(value_type* __s, size_t __len)
-      {
-	if (__len + _M_buf_count <= _Buf_sz)
-	  {
-	    size_t __i = _M_buf_count;
-	    for (size_t __j = 0; __j < __len; __i++, __j++)
-	      _M_buffer[__i] = __s[__j];
-	    _M_buf_count += __len;
-	  }
-	else if (0 == _M_buf_count)
-	  _M_prefix->append(__s, __s + __len);
-	else
-	  {
-	    flush();
-	    append(__s, __len);
-	  }
-      }
-
-      sequence_buffer&
-      write(value_type* __s, size_t __len)
-      {
-	append(__s, __len);
-	return *this;
-      }
-      
-      sequence_buffer&
-      put(value_type __x)
-      {
-	push_back(__x);
-	return *this;
-      }
-      
-      sequence_buffer&
-      operator=(const value_type& __rhs)
-      {
-	push_back(__rhs);
-	return *this;
-      }
-      
-      sequence_buffer&
-      operator*()
-      { return *this; }
-      
-      sequence_buffer&
-      operator++()
-      { return *this; }
-      
-      sequence_buffer
-      operator++(int)
-      { return *this; }
-    };
-  
-  // The following should be treated as private, at least for now.
-  template<class _CharT>
-    class _Rope_char_consumer
-    {
-    public:
-      // If we had member templates, these should not be virtual.
-      // For now we need to use run-time parametrization where
-      // compile-time would do.  Hence this should all be private
-      // for now.
-      // The symmetry with char_producer is accidental and temporary.
-      virtual ~_Rope_char_consumer() { };
-  
-      virtual bool
-      operator()(const _CharT* __buffer, size_t __len) = 0;
-    };
-  
-  // First a lot of forward declarations.  The standard seems to require
-  // much stricter "declaration before use" than many of the implementations
-  // that preceded it.
-  template<class _CharT, class _Alloc = allocator<_CharT> >
-    class rope;
-  
-  template<class _CharT, class _Alloc>
-    struct _Rope_RopeConcatenation;
-
-  template<class _CharT, class _Alloc>
-    struct _Rope_RopeLeaf;
-  
-  template<class _CharT, class _Alloc>
-    struct _Rope_RopeFunction;
-  
-  template<class _CharT, class _Alloc>
-    struct _Rope_RopeSubstring;
-  
-  template<class _CharT, class _Alloc>
-    class _Rope_iterator;
-  
-  template<class _CharT, class _Alloc>
-    class _Rope_const_iterator;
-  
-  template<class _CharT, class _Alloc>
-    class _Rope_char_ref_proxy;
-  
-  template<class _CharT, class _Alloc>
-    class _Rope_char_ptr_proxy;
-
-  template<class _CharT, class _Alloc>
-    bool
-    operator==(const _Rope_char_ptr_proxy<_CharT, _Alloc>& __x,
-	       const _Rope_char_ptr_proxy<_CharT, _Alloc>& __y);
-
-  template<class _CharT, class _Alloc>
-    _Rope_const_iterator<_CharT, _Alloc>
-    operator-(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-	      ptrdiff_t __n);
-
-  template<class _CharT, class _Alloc>
-    _Rope_const_iterator<_CharT, _Alloc>
-    operator+(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-	      ptrdiff_t __n);
-
-  template<class _CharT, class _Alloc>
-    _Rope_const_iterator<_CharT, _Alloc>
-    operator+(ptrdiff_t __n,
-	      const _Rope_const_iterator<_CharT, _Alloc>& __x);
-
-  template<class _CharT, class _Alloc>
-    bool
-    operator==(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-	       const _Rope_const_iterator<_CharT, _Alloc>& __y);
-
-  template<class _CharT, class _Alloc>
-    bool
-    operator<(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-	      const _Rope_const_iterator<_CharT, _Alloc>& __y);
-  
-  template<class _CharT, class _Alloc>
-    ptrdiff_t
-    operator-(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-	      const _Rope_const_iterator<_CharT, _Alloc>& __y);
-
-  template<class _CharT, class _Alloc>
-    _Rope_iterator<_CharT, _Alloc>
-    operator-(const _Rope_iterator<_CharT, _Alloc>& __x, ptrdiff_t __n);
-
-  template<class _CharT, class _Alloc>
-    _Rope_iterator<_CharT, _Alloc>
-    operator+(const _Rope_iterator<_CharT, _Alloc>& __x, ptrdiff_t __n);
-
-  template<class _CharT, class _Alloc>
-    _Rope_iterator<_CharT, _Alloc>
-    operator+(ptrdiff_t __n, const _Rope_iterator<_CharT, _Alloc>& __x);
-
-  template<class _CharT, class _Alloc>
-    bool
-    operator==(const _Rope_iterator<_CharT, _Alloc>& __x,
-	       const _Rope_iterator<_CharT, _Alloc>& __y);
-
-  template<class _CharT, class _Alloc>
-    bool
-    operator<(const _Rope_iterator<_CharT, _Alloc>& __x,
-	      const _Rope_iterator<_CharT, _Alloc>& __y);
-
-  template<class _CharT, class _Alloc>
-    ptrdiff_t
-    operator-(const _Rope_iterator<_CharT, _Alloc>& __x,
-	      const _Rope_iterator<_CharT, _Alloc>& __y);
-
-  template<class _CharT, class _Alloc>
-    rope<_CharT, _Alloc>
-    operator+(const rope<_CharT, _Alloc>& __left,
-	      const rope<_CharT, _Alloc>& __right);
-
-  template<class _CharT, class _Alloc>
-    rope<_CharT, _Alloc>
-    operator+(const rope<_CharT, _Alloc>& __left, const _CharT* __right);
-
-  template<class _CharT, class _Alloc>
-    rope<_CharT, _Alloc>
-    operator+(const rope<_CharT, _Alloc>& __left, _CharT __right);
-
-  // Some helpers, so we can use power on ropes.
-  // See below for why this isn't local to the implementation.
-  
-  // This uses a nonstandard refcount convention.
-  // The result has refcount 0.
-  template<class _CharT, class _Alloc>
-    struct _Rope_Concat_fn
-    : public std::binary_function<rope<_CharT, _Alloc>, rope<_CharT, _Alloc>,
-				  rope<_CharT, _Alloc> >
-    {
-      rope<_CharT, _Alloc>
-      operator()(const rope<_CharT, _Alloc>& __x,
-		 const rope<_CharT, _Alloc>& __y)
-      { return __x + __y; }
-    };
-
-  template <class _CharT, class _Alloc>
-    inline rope<_CharT, _Alloc>
-    identity_element(_Rope_Concat_fn<_CharT, _Alloc>)
-    { return rope<_CharT, _Alloc>(); }
-
-  // Class _Refcount_Base provides a type, _RC_t, a data member,
-  // _M_ref_count, and member functions _M_incr and _M_decr, which perform
-  // atomic preincrement/predecrement.  The constructor initializes
-  // _M_ref_count.
-  struct _Refcount_Base
-  {
-    // The type _RC_t
-    typedef size_t _RC_t;
-    
-    // The data member _M_ref_count
-    volatile _RC_t _M_ref_count;
-
-    // Constructor
-#ifdef __GTHREAD_MUTEX_INIT
-    __gthread_mutex_t _M_ref_count_lock = __GTHREAD_MUTEX_INIT;
-#else
-    __gthread_mutex_t _M_ref_count_lock;
-#endif
-
-    _Refcount_Base(_RC_t __n) : _M_ref_count(__n)
-    {
-#ifndef __GTHREAD_MUTEX_INIT
-#ifdef __GTHREAD_MUTEX_INIT_FUNCTION
-      __GTHREAD_MUTEX_INIT_FUNCTION (&_M_ref_count_lock);
-#else
-#error __GTHREAD_MUTEX_INIT or __GTHREAD_MUTEX_INIT_FUNCTION should be defined by gthr.h abstraction layer, report problem to libstdc++@gcc.gnu.org.
-#endif
-#endif
-    }
-
-#ifndef __GTHREAD_MUTEX_INIT
-    ~_Refcount_Base()
-    { __gthread_mutex_destroy(&_M_ref_count_lock); }
-#endif
-
-    void
-    _M_incr()
-    {
-      __gthread_mutex_lock(&_M_ref_count_lock);
-      ++_M_ref_count;
-      __gthread_mutex_unlock(&_M_ref_count_lock);
-    }
-
-    _RC_t
-    _M_decr()
-    {
-      __gthread_mutex_lock(&_M_ref_count_lock);
-      volatile _RC_t __tmp = --_M_ref_count;
-      __gthread_mutex_unlock(&_M_ref_count_lock);
-      return __tmp;
-    }
-  };
-
-  //
-  // What follows should really be local to rope.  Unfortunately,
-  // that doesn't work, since it makes it impossible to define generic
-  // equality on rope iterators.  According to the draft standard, the
-  // template parameters for such an equality operator cannot be inferred
-  // from the occurrence of a member class as a parameter.
-  // (SGI compilers in fact allow this, but the __result wouldn't be
-  // portable.)
-  // Similarly, some of the static member functions are member functions
-  // only to avoid polluting the global namespace, and to circumvent
-  // restrictions on type inference for template functions.
-  //
-
-  //
-  // The internal data structure for representing a rope.  This is
-  // private to the implementation.  A rope is really just a pointer
-  // to one of these.
-  //
-  // A few basic functions for manipulating this data structure
-  // are members of _RopeRep.  Most of the more complex algorithms
-  // are implemented as rope members.
-  //
-  // Some of the static member functions of _RopeRep have identically
-  // named functions in rope that simply invoke the _RopeRep versions.
-
-#define __ROPE_DEFINE_ALLOCS(__a) \
-        __ROPE_DEFINE_ALLOC(_CharT,_Data) /* character data */ \
-        typedef _Rope_RopeConcatenation<_CharT,__a> __C; \
-        __ROPE_DEFINE_ALLOC(__C,_C) \
-        typedef _Rope_RopeLeaf<_CharT,__a> __L; \
-        __ROPE_DEFINE_ALLOC(__L,_L) \
-        typedef _Rope_RopeFunction<_CharT,__a> __F; \
-        __ROPE_DEFINE_ALLOC(__F,_F) \
-        typedef _Rope_RopeSubstring<_CharT,__a> __S; \
-        __ROPE_DEFINE_ALLOC(__S,_S)
-
-  //  Internal rope nodes potentially store a copy of the allocator
-  //  instance used to allocate them.  This is mostly redundant.
-  //  But the alternative would be to pass allocator instances around
-  //  in some form to nearly all internal functions, since any pointer
-  //  assignment may result in a zero reference count and thus require
-  //  deallocation.
-
-#define __STATIC_IF_SGI_ALLOC  /* not static */
-
-  template <class _CharT, class _Alloc>
-    struct _Rope_rep_base
-    : public _Alloc
-    {
-      typedef _Alloc allocator_type;
-
-      allocator_type
-      get_allocator() const
-      { return *static_cast<const _Alloc*>(this); }
-
-      allocator_type&
-      _M_get_allocator()
-      { return *static_cast<_Alloc*>(this); }
-
-      const allocator_type&
-      _M_get_allocator() const
-      { return *static_cast<const _Alloc*>(this); }
-
-      _Rope_rep_base(size_t __size, const allocator_type&)
-      : _M_size(__size) { }
-
-      size_t _M_size;
-
-# define __ROPE_DEFINE_ALLOC(_Tp, __name) \
-        typedef typename \
-          _Alloc::template rebind<_Tp>::other __name##Alloc; \
-        static _Tp* __name##_allocate(size_t __n) \
-          { return __name##Alloc().allocate(__n); } \
-        static void __name##_deallocate(_Tp *__p, size_t __n) \
-          { __name##Alloc().deallocate(__p, __n); }
-      __ROPE_DEFINE_ALLOCS(_Alloc)
-# undef __ROPE_DEFINE_ALLOC
-    };
-
-  template<class _CharT, class _Alloc>
-    struct _Rope_RopeRep
-    : public _Rope_rep_base<_CharT, _Alloc>
-# ifndef __GC
-	     , _Refcount_Base
-# endif
-    {
-    public:
-      __detail::_Tag _M_tag:8;
-      bool _M_is_balanced:8;
-      unsigned char _M_depth;
-      __GC_CONST _CharT* _M_c_string;
-#ifdef __GTHREAD_MUTEX_INIT
-      __gthread_mutex_t _M_c_string_lock = __GTHREAD_MUTEX_INIT;
-#else
-      __gthread_mutex_t _M_c_string_lock;
-#endif
-                        /* Flattened version of string, if needed.  */
-                        /* typically 0.                             */
-                        /* If it's not 0, then the memory is owned  */
-                        /* by this node.                            */
-                        /* In the case of a leaf, this may point to */
-                        /* the same memory as the data field.       */
-      typedef typename _Rope_rep_base<_CharT, _Alloc>::allocator_type
-        allocator_type;
-
-      using _Rope_rep_base<_CharT, _Alloc>::get_allocator;
-      using _Rope_rep_base<_CharT, _Alloc>::_M_get_allocator;
-
-      _Rope_RopeRep(__detail::_Tag __t, int __d, bool __b, size_t __size,
-		    const allocator_type& __a)
-      : _Rope_rep_base<_CharT, _Alloc>(__size, __a),
-#ifndef __GC
-	_Refcount_Base(1),
-#endif
-	_M_tag(__t), _M_is_balanced(__b), _M_depth(__d), _M_c_string(0)
-#ifdef __GTHREAD_MUTEX_INIT
-      { }
-#else
-      { __GTHREAD_MUTEX_INIT_FUNCTION (&_M_c_string_lock); }
-      ~_Rope_RopeRep()
-      { __gthread_mutex_destroy (&_M_c_string_lock); }
-#endif
-#ifdef __GC
-      void
-      _M_incr () { }
-#endif
-      static void
-      _S_free_string(__GC_CONST _CharT*, size_t __len,
-		     allocator_type& __a);
-#define __STL_FREE_STRING(__s, __l, __a) _S_free_string(__s, __l, __a);
-                        // Deallocate data section of a leaf.
-                        // This shouldn't be a member function.
-                        // But its hard to do anything else at the
-                        // moment, because it's templatized w.r.t.
-                        // an allocator.
-                        // Does nothing if __GC is defined.
-#ifndef __GC
-      void _M_free_c_string();
-      void _M_free_tree();
-      // Deallocate t. Assumes t is not 0.
-      void
-      _M_unref_nonnil()
-      {
-	if (0 == _M_decr())
-	  _M_free_tree();
-      }
-
-      void
-      _M_ref_nonnil()
-      { _M_incr(); }
-
-      static void
-      _S_unref(_Rope_RopeRep* __t)
-      {
-	if (0 != __t)
-	  __t->_M_unref_nonnil();
-      }
-
-      static void
-      _S_ref(_Rope_RopeRep* __t)
-      {
-	if (0 != __t)
-	  __t->_M_incr();
-      }
-      
-      static void
-      _S_free_if_unref(_Rope_RopeRep* __t)
-      {
-	if (0 != __t && 0 == __t->_M_ref_count)
-	  __t->_M_free_tree();
-      }
-#   else /* __GC */
-      void _M_unref_nonnil() { }
-      void _M_ref_nonnil() { }
-      static void _S_unref(_Rope_RopeRep*) { }
-      static void _S_ref(_Rope_RopeRep*) { }
-      static void _S_free_if_unref(_Rope_RopeRep*) { }
-#   endif
-protected:
-      _Rope_RopeRep&
-      operator=(const _Rope_RopeRep&);
-
-      _Rope_RopeRep(const _Rope_RopeRep&);
-    };
-
-  template<class _CharT, class _Alloc>
-    struct _Rope_RopeLeaf
-    : public _Rope_RopeRep<_CharT, _Alloc>
-    {
-    public:
-      // Apparently needed by VC++
-      // The data fields of leaves are allocated with some
-      // extra space, to accommodate future growth and for basic
-      // character types, to hold a trailing eos character.
-      enum { _S_alloc_granularity = 8 };
-      
-      static size_t
-      _S_rounded_up_size(size_t __n)
-      {
-        size_t __size_with_eos;
-	
-        if (_S_is_basic_char_type((_CharT*)0))
-	  __size_with_eos = __n + 1;
-	else
-	  __size_with_eos = __n;
-#ifdef __GC
-	return __size_with_eos;
-#else
-	// Allow slop for in-place expansion.
-	return ((__size_with_eos + size_t(_S_alloc_granularity) - 1)
-		&~ (size_t(_S_alloc_granularity) - 1));
-#endif
-      }
-      __GC_CONST _CharT* _M_data; /* Not necessarily 0 terminated. */
-                                  /* The allocated size is         */
-                                  /* _S_rounded_up_size(size), except */
-                                  /* in the GC case, in which it   */
-                                  /* doesn't matter.               */
-      typedef typename _Rope_rep_base<_CharT,_Alloc>::allocator_type
-        allocator_type;
-
-      _Rope_RopeLeaf(__GC_CONST _CharT* __d, size_t __size,
-		     const allocator_type& __a)
-      : _Rope_RopeRep<_CharT, _Alloc>(__detail::_S_leaf, 0, true,
-				      __size, __a), _M_data(__d)
-      {
-        if (_S_is_basic_char_type((_CharT *)0))
-	  {
-            // already eos terminated.
-            this->_M_c_string = __d;
-	  }
-      }
-      // The constructor assumes that d has been allocated with
-      // the proper allocator and the properly padded size.
-      // In contrast, the destructor deallocates the data:
-#ifndef __GC
-      ~_Rope_RopeLeaf() throw()
-      {
-        if (_M_data != this->_M_c_string)
-	  this->_M_free_c_string();
-	
-	this->__STL_FREE_STRING(_M_data, this->_M_size, this->_M_get_allocator());
-      }
-#endif
-protected:
-      _Rope_RopeLeaf&
-      operator=(const _Rope_RopeLeaf&);
-
-      _Rope_RopeLeaf(const _Rope_RopeLeaf&);
-    };
-
-  template<class _CharT, class _Alloc>
-    struct _Rope_RopeConcatenation
-    : public _Rope_RopeRep<_CharT, _Alloc>
-    {
-    public:
-      _Rope_RopeRep<_CharT, _Alloc>* _M_left;
-      _Rope_RopeRep<_CharT, _Alloc>* _M_right;
-
-      typedef typename _Rope_rep_base<_CharT, _Alloc>::allocator_type
-        allocator_type;
-
-      _Rope_RopeConcatenation(_Rope_RopeRep<_CharT, _Alloc>* __l,
-			      _Rope_RopeRep<_CharT, _Alloc>* __r,
-			      const allocator_type& __a)
-	: _Rope_RopeRep<_CharT, _Alloc>(__detail::_S_concat,
-				      std::max(__l->_M_depth,
-					       __r->_M_depth) + 1,
-				      false,
-				      __l->_M_size + __r->_M_size, __a),
-        _M_left(__l), _M_right(__r)
-      { }
-#ifndef __GC
-      ~_Rope_RopeConcatenation() throw()
-      {
-	this->_M_free_c_string();
-	_M_left->_M_unref_nonnil();
-	_M_right->_M_unref_nonnil();
-      }
-#endif
-protected:
-      _Rope_RopeConcatenation&
-      operator=(const _Rope_RopeConcatenation&);
-      
-      _Rope_RopeConcatenation(const _Rope_RopeConcatenation&);
-    };
-
-  template<class _CharT, class _Alloc>
-    struct _Rope_RopeFunction
-    : public _Rope_RopeRep<_CharT, _Alloc>
-    {
-    public:
-      char_producer<_CharT>* _M_fn;
-#ifndef __GC
-      bool _M_delete_when_done; // Char_producer is owned by the
-                                // rope and should be explicitly
-                                // deleted when the rope becomes
-                                // inaccessible.
-#else
-      // In the GC case, we either register the rope for
-      // finalization, or not.  Thus the field is unnecessary;
-      // the information is stored in the collector data structures.
-      // We do need a finalization procedure to be invoked by the
-      // collector.
-      static void
-      _S_fn_finalization_proc(void * __tree, void *)
-      { delete ((_Rope_RopeFunction *)__tree) -> _M_fn; }
-#endif
-    typedef typename _Rope_rep_base<_CharT, _Alloc>::allocator_type
-      allocator_type;
-
-      _Rope_RopeFunction(char_producer<_CharT>* __f, size_t __size,
-                        bool __d, const allocator_type& __a)
-      : _Rope_RopeRep<_CharT, _Alloc>(__detail::_S_function, 0, true, __size, __a)
-	, _M_fn(__f)
-#ifndef __GC
-	, _M_delete_when_done(__d)
-#endif
-      {
-#ifdef __GC
-	if (__d)
-	  {
-	    GC_REGISTER_FINALIZER(this, _Rope_RopeFunction::
-				  _S_fn_finalization_proc, 0, 0, 0);
-	  }
-#endif
-      }
-#ifndef __GC
-      ~_Rope_RopeFunction() throw()
-      {
-	this->_M_free_c_string();
-	if (_M_delete_when_done)
-	  delete _M_fn;
-      }
-# endif
-    protected:
-      _Rope_RopeFunction&
-      operator=(const _Rope_RopeFunction&);
-
-      _Rope_RopeFunction(const _Rope_RopeFunction&);
-    };
-  // Substring results are usually represented using just
-  // concatenation nodes.  But in the case of very long flat ropes
-  // or ropes with a functional representation that isn't practical.
-  // In that case, we represent the __result as a special case of
-  // RopeFunction, whose char_producer points back to the rope itself.
-  // In all cases except repeated substring operations and
-  // deallocation, we treat the __result as a RopeFunction.
-  template<class _CharT, class _Alloc>
-    struct _Rope_RopeSubstring
-    : public _Rope_RopeFunction<_CharT, _Alloc>,
-      public char_producer<_CharT>
-    {
-    public:
-      // XXX this whole class should be rewritten.
-      _Rope_RopeRep<_CharT,_Alloc>* _M_base;      // not 0
-      size_t _M_start;
-
-      virtual void
-      operator()(size_t __start_pos, size_t __req_len,
-		 _CharT* __buffer)
-      {
-        switch(_M_base->_M_tag)
-	  {
-	  case __detail::_S_function:
-	  case __detail::_S_substringfn:
-	    {
-	      char_producer<_CharT>* __fn =
-		((_Rope_RopeFunction<_CharT,_Alloc>*)_M_base)->_M_fn;
-	      (*__fn)(__start_pos + _M_start, __req_len, __buffer);
-	    }
-	    break;
-	  case __detail::_S_leaf:
-	    {
-	      __GC_CONST _CharT* __s =
-		((_Rope_RopeLeaf<_CharT,_Alloc>*)_M_base)->_M_data;
-	      uninitialized_copy_n(__s + __start_pos + _M_start, __req_len,
-				   __buffer);
-	    }
-	    break;
-	  default:
-	    break;
-	  }
-      }
-      
-      typedef typename _Rope_rep_base<_CharT, _Alloc>::allocator_type
-        allocator_type;
-
-      _Rope_RopeSubstring(_Rope_RopeRep<_CharT, _Alloc>* __b, size_t __s,
-                          size_t __l, const allocator_type& __a)
-      : _Rope_RopeFunction<_CharT, _Alloc>(this, __l, false, __a),
-        char_producer<_CharT>(), _M_base(__b), _M_start(__s)
-      {
-#ifndef __GC
-	_M_base->_M_ref_nonnil();
-#endif
-        this->_M_tag = __detail::_S_substringfn;
-      }
-    virtual ~_Rope_RopeSubstring() throw()
-      {
-#ifndef __GC
-	_M_base->_M_unref_nonnil();
-	// _M_free_c_string();  -- done by parent class
-#endif
-      }
-    };
-
-  // Self-destructing pointers to Rope_rep.
-  // These are not conventional smart pointers.  Their
-  // only purpose in life is to ensure that unref is called
-  // on the pointer either at normal exit or if an exception
-  // is raised.  It is the caller's responsibility to
-  // adjust reference counts when these pointers are initialized
-  // or assigned to.  (This convention significantly reduces
-  // the number of potentially expensive reference count
-  // updates.)
-#ifndef __GC
-  template<class _CharT, class _Alloc>
-    struct _Rope_self_destruct_ptr
-    {
-      _Rope_RopeRep<_CharT, _Alloc>* _M_ptr;
-
-      ~_Rope_self_destruct_ptr()
-      { _Rope_RopeRep<_CharT, _Alloc>::_S_unref(_M_ptr); }
-#if __cpp_exceptions
-      _Rope_self_destruct_ptr() : _M_ptr(0) { };
-#else
-      _Rope_self_destruct_ptr() { };
-#endif
-      _Rope_self_destruct_ptr(_Rope_RopeRep<_CharT, _Alloc>* __p)
-      : _M_ptr(__p) { }
-    
-      _Rope_RopeRep<_CharT, _Alloc>&
-      operator*()
-      { return *_M_ptr; }
-    
-      _Rope_RopeRep<_CharT, _Alloc>*
-      operator->()
-      { return _M_ptr; }
-    
-      operator _Rope_RopeRep<_CharT, _Alloc>*()
-      { return _M_ptr; }
-    
-      _Rope_self_destruct_ptr&
-      operator=(_Rope_RopeRep<_CharT, _Alloc>* __x)
-      { _M_ptr = __x; return *this; }
-    };
-#endif
-
-  // Dereferencing a nonconst iterator has to return something
-  // that behaves almost like a reference.  It's not possible to
-  // return an actual reference since assignment requires extra
-  // work.  And we would get into the same problems as with the
-  // CD2 version of basic_string.
-  template<class _CharT, class _Alloc>
-    class _Rope_char_ref_proxy
-    {
-      friend class rope<_CharT, _Alloc>;
-      friend class _Rope_iterator<_CharT, _Alloc>;
-      friend class _Rope_char_ptr_proxy<_CharT, _Alloc>;
-#ifdef __GC
-      typedef _Rope_RopeRep<_CharT, _Alloc>* _Self_destruct_ptr;
-#else
-      typedef _Rope_self_destruct_ptr<_CharT, _Alloc> _Self_destruct_ptr;
-#endif
-      typedef _Rope_RopeRep<_CharT, _Alloc> _RopeRep;
-      typedef rope<_CharT, _Alloc> _My_rope;
-      size_t _M_pos;
-      _CharT _M_current;
-      bool _M_current_valid;
-      _My_rope* _M_root;     // The whole rope.
-    public:
-      _Rope_char_ref_proxy(_My_rope* __r, size_t __p)
-      :  _M_pos(__p), _M_current(), _M_current_valid(false), _M_root(__r) { }
-
-      _Rope_char_ref_proxy(const _Rope_char_ref_proxy& __x)
-      : _M_pos(__x._M_pos), _M_current(__x._M_current), 
-	_M_current_valid(false), _M_root(__x._M_root) { }
-
-      // Don't preserve cache if the reference can outlive the
-      // expression.  We claim that's not possible without calling
-      // a copy constructor or generating reference to a proxy
-      // reference.  We declare the latter to have undefined semantics.
-      _Rope_char_ref_proxy(_My_rope* __r, size_t __p, _CharT __c)
-      : _M_pos(__p), _M_current(__c), _M_current_valid(true), _M_root(__r) { }
-
-      inline operator _CharT () const;
-
-      _Rope_char_ref_proxy&
-      operator=(_CharT __c);
-    
-      _Rope_char_ptr_proxy<_CharT, _Alloc> operator&() const;
-      
-      _Rope_char_ref_proxy&
-      operator=(const _Rope_char_ref_proxy& __c)
-      { return operator=((_CharT)__c); }
-    };
-
-  template<class _CharT, class __Alloc>
-    inline void
-    swap(_Rope_char_ref_proxy <_CharT, __Alloc > __a,
-	 _Rope_char_ref_proxy <_CharT, __Alloc > __b)
-    {
-      _CharT __tmp = __a;
-      __a = __b;
-      __b = __tmp;
-    }
-
-  template<class _CharT, class _Alloc>
-    class _Rope_char_ptr_proxy
-    {
-      // XXX this class should be rewritten.
-      friend class _Rope_char_ref_proxy<_CharT, _Alloc>;
-      size_t _M_pos;
-      rope<_CharT,_Alloc>* _M_root;     // The whole rope.
-    public:
-      _Rope_char_ptr_proxy(const _Rope_char_ref_proxy<_CharT,_Alloc>& __x)
-      : _M_pos(__x._M_pos), _M_root(__x._M_root) { }
-
-      _Rope_char_ptr_proxy(const _Rope_char_ptr_proxy& __x)
-      : _M_pos(__x._M_pos), _M_root(__x._M_root) { }
-
-      _Rope_char_ptr_proxy() { }
-      
-      _Rope_char_ptr_proxy(_CharT* __x)
-      : _M_root(0), _M_pos(0) { }
-
-      _Rope_char_ptr_proxy&
-      operator=(const _Rope_char_ptr_proxy& __x)
-      {
-        _M_pos = __x._M_pos;
-        _M_root = __x._M_root;
-        return *this;
-      }
-
-      template<class _CharT2, class _Alloc2>
-        friend bool
-        operator==(const _Rope_char_ptr_proxy<_CharT2, _Alloc2>& __x,
-		   const _Rope_char_ptr_proxy<_CharT2, _Alloc2>& __y);
-
-      _Rope_char_ref_proxy<_CharT, _Alloc> operator*() const
-      { return _Rope_char_ref_proxy<_CharT, _Alloc>(_M_root, _M_pos); }
-    };
-
-  // Rope iterators:
-  // Unlike in the C version, we cache only part of the stack
-  // for rope iterators, since they must be efficiently copyable.
-  // When we run out of cache, we have to reconstruct the iterator
-  // value.
-  // Pointers from iterators are not included in reference counts.
-  // Iterators are assumed to be thread private.  Ropes can
-  // be shared.
-  
-  template<class _CharT, class _Alloc>
-    class _Rope_iterator_base
-    : public std::iterator<std::random_access_iterator_tag, _CharT>
-    {
-      friend class rope<_CharT, _Alloc>;
-    public:
-      typedef _Alloc _allocator_type; // used in _Rope_rotate, VC++ workaround
-      typedef _Rope_RopeRep<_CharT, _Alloc> _RopeRep;
-      // Borland doesn't want this to be protected.
-    protected:
-      enum { _S_path_cache_len = 4 }; // Must be <= 9.
-      enum { _S_iterator_buf_len = 15 };
-      size_t _M_current_pos;
-      _RopeRep* _M_root;     // The whole rope.
-      size_t _M_leaf_pos;    // Starting position for current leaf
-      __GC_CONST _CharT* _M_buf_start;
-                             // Buffer possibly
-                             // containing current char.
-      __GC_CONST _CharT* _M_buf_ptr;
-                             // Pointer to current char in buffer.
-                             // != 0 ==> buffer valid.
-      __GC_CONST _CharT* _M_buf_end;
-                             // One past __last valid char in buffer.
-      // What follows is the path cache.  We go out of our
-      // way to make this compact.
-      // Path_end contains the bottom section of the path from
-      // the root to the current leaf.
-      const _RopeRep* _M_path_end[_S_path_cache_len];
-      int _M_leaf_index;     // Last valid __pos in path_end;
-                             // _M_path_end[0] ... _M_path_end[leaf_index-1]
-                             // point to concatenation nodes.
-      unsigned char _M_path_directions;
-                          // (path_directions >> __i) & 1 is 1
-                          // iff we got from _M_path_end[leaf_index - __i - 1]
-                          // to _M_path_end[leaf_index - __i] by going to the
-                          // __right. Assumes path_cache_len <= 9.
-      _CharT _M_tmp_buf[_S_iterator_buf_len];
-                        // Short buffer for surrounding chars.
-                        // This is useful primarily for
-                        // RopeFunctions.  We put the buffer
-                        // here to avoid locking in the
-                        // multithreaded case.
-      // The cached path is generally assumed to be valid
-      // only if the buffer is valid.
-      static void _S_setbuf(_Rope_iterator_base& __x);
-                                        // Set buffer contents given
-                                        // path cache.
-      static void _S_setcache(_Rope_iterator_base& __x);
-                                        // Set buffer contents and
-                                        // path cache.
-      static void _S_setcache_for_incr(_Rope_iterator_base& __x);
-                                        // As above, but assumes path
-                                        // cache is valid for previous posn.
-      _Rope_iterator_base() { }
-
-      _Rope_iterator_base(_RopeRep* __root, size_t __pos)
-      : _M_current_pos(__pos), _M_root(__root), _M_buf_ptr(0) { }
-
-      void _M_incr(size_t __n);
-      void _M_decr(size_t __n);
-    public:
-      size_t
-      index() const
-      { return _M_current_pos; }
-    
-      _Rope_iterator_base(const _Rope_iterator_base& __x)
-      {
-        if (0 != __x._M_buf_ptr)
-	  *this = __x;
-	else
-	  {
-            _M_current_pos = __x._M_current_pos;
-            _M_root = __x._M_root;
-            _M_buf_ptr = 0;
-	  }
-      }
-    };
-
-  template<class _CharT, class _Alloc>
-    class _Rope_iterator;
-
-  template<class _CharT, class _Alloc>
-    class _Rope_const_iterator
-    : public _Rope_iterator_base<_CharT, _Alloc>
-    {
-      friend class rope<_CharT, _Alloc>;
-    protected:
-      typedef _Rope_RopeRep<_CharT, _Alloc> _RopeRep;
-      // The one from the base class may not be directly visible.
-      _Rope_const_iterator(const _RopeRep* __root, size_t __pos)
-      : _Rope_iterator_base<_CharT, _Alloc>(const_cast<_RopeRep*>(__root),
-					    __pos)
-                   // Only nonconst iterators modify root ref count
-      { }
-  public:
-      typedef _CharT reference;   // Really a value.  Returning a reference
-                                  // Would be a mess, since it would have
-                                  // to be included in refcount.
-      typedef const _CharT* pointer;
-
-    public:
-      _Rope_const_iterator() { };
-
-      _Rope_const_iterator(const _Rope_const_iterator& __x)
-      : _Rope_iterator_base<_CharT,_Alloc>(__x) { }
-
-      _Rope_const_iterator(const _Rope_iterator<_CharT,_Alloc>& __x);
-    
-      _Rope_const_iterator(const rope<_CharT, _Alloc>& __r, size_t __pos)
-      : _Rope_iterator_base<_CharT,_Alloc>(__r._M_tree_ptr, __pos) { }
-
-      _Rope_const_iterator&
-      operator=(const _Rope_const_iterator& __x)
-      {
-        if (0 != __x._M_buf_ptr)
-	  *(static_cast<_Rope_iterator_base<_CharT, _Alloc>*>(this)) = __x;
-	else
-	  {
-            this->_M_current_pos = __x._M_current_pos;
-            this->_M_root = __x._M_root;
-            this->_M_buf_ptr = 0;
-	  }
-        return(*this);
-      }
-
-      reference
-      operator*()
-      {
-        if (0 == this->_M_buf_ptr)
-	  this->_S_setcache(*this);
-        return *this->_M_buf_ptr;
-      }
-
-      // Without this const version, Rope iterators do not meet the
-      // requirements of an Input Iterator.
-      reference
-      operator*() const
-      {
-	return *const_cast<_Rope_const_iterator&>(*this);
-      }
-
-      _Rope_const_iterator&
-      operator++()
-      {
-        __GC_CONST _CharT* __next;
-        if (0 != this->_M_buf_ptr
-	    && (__next = this->_M_buf_ptr + 1) < this->_M_buf_end)
-	  {
-            this->_M_buf_ptr = __next;
-            ++this->_M_current_pos;
-	  }
-	else
-	  this->_M_incr(1);
-	return *this;
-      }
-
-      _Rope_const_iterator&
-      operator+=(ptrdiff_t __n)
-      {
-        if (__n >= 0)
-	  this->_M_incr(__n);
-	else
-	  this->_M_decr(-__n);
-	return *this;
-      }
-
-      _Rope_const_iterator&
-      operator--()
-      {
-        this->_M_decr(1);
-        return *this;
-      }
-
-      _Rope_const_iterator&
-      operator-=(ptrdiff_t __n)
-      {
-        if (__n >= 0)
-	  this->_M_decr(__n);
-	else
-	  this->_M_incr(-__n);
-	return *this;
-      }
-
-      _Rope_const_iterator
-      operator++(int)
-      {
-        size_t __old_pos = this->_M_current_pos;
-        this->_M_incr(1);
-        return _Rope_const_iterator<_CharT,_Alloc>(this->_M_root, __old_pos);
-        // This makes a subsequent dereference expensive.
-        // Perhaps we should instead copy the iterator
-        // if it has a valid cache?
-      }
-
-      _Rope_const_iterator
-      operator--(int)
-      {
-        size_t __old_pos = this->_M_current_pos;
-        this->_M_decr(1);
-        return _Rope_const_iterator<_CharT,_Alloc>(this->_M_root, __old_pos);
-      }
-
-      template<class _CharT2, class _Alloc2>
-        friend _Rope_const_iterator<_CharT2, _Alloc2>
-        operator-(const _Rope_const_iterator<_CharT2, _Alloc2>& __x,
-		  ptrdiff_t __n);
-
-      template<class _CharT2, class _Alloc2>
-        friend _Rope_const_iterator<_CharT2, _Alloc2>
-        operator+(const _Rope_const_iterator<_CharT2, _Alloc2>& __x,
-		  ptrdiff_t __n);
-
-      template<class _CharT2, class _Alloc2>
-        friend _Rope_const_iterator<_CharT2, _Alloc2>
-        operator+(ptrdiff_t __n,
-		  const _Rope_const_iterator<_CharT2, _Alloc2>& __x);
-
-      reference
-      operator[](size_t __n)
-      { return rope<_CharT, _Alloc>::_S_fetch(this->_M_root,
-					      this->_M_current_pos + __n); }
-
-      template<class _CharT2, class _Alloc2>
-        friend bool
-        operator==(const _Rope_const_iterator<_CharT2, _Alloc2>& __x,
-		   const _Rope_const_iterator<_CharT2, _Alloc2>& __y);
-
-      template<class _CharT2, class _Alloc2>
-        friend bool
-        operator<(const _Rope_const_iterator<_CharT2, _Alloc2>& __x,
-		  const _Rope_const_iterator<_CharT2, _Alloc2>& __y);
-
-      template<class _CharT2, class _Alloc2>
-        friend ptrdiff_t
-        operator-(const _Rope_const_iterator<_CharT2, _Alloc2>& __x,
-		  const _Rope_const_iterator<_CharT2, _Alloc2>& __y);
-    };
-
-  template<class _CharT, class _Alloc>
-    class _Rope_iterator
-    : public _Rope_iterator_base<_CharT, _Alloc>
-    {
-      friend class rope<_CharT, _Alloc>;
-    protected:
-      typedef typename _Rope_iterator_base<_CharT, _Alloc>::_RopeRep _RopeRep;
-      rope<_CharT, _Alloc>* _M_root_rope;
-
-      // root is treated as a cached version of this, and is used to
-      // detect changes to the underlying rope.
-
-      // Root is included in the reference count.  This is necessary
-      // so that we can detect changes reliably.  Unfortunately, it
-      // requires careful bookkeeping for the nonGC case.
-      _Rope_iterator(rope<_CharT, _Alloc>* __r, size_t __pos)
-      : _Rope_iterator_base<_CharT, _Alloc>(__r->_M_tree_ptr, __pos),
-        _M_root_rope(__r)
-      { _RopeRep::_S_ref(this->_M_root);
-        if (!(__r -> empty()))
-	  this->_S_setcache(*this);
-      }
-
-      void _M_check();
-    public:
-      typedef _Rope_char_ref_proxy<_CharT, _Alloc>  reference;
-      typedef _Rope_char_ref_proxy<_CharT, _Alloc>* pointer;
-
-      rope<_CharT, _Alloc>&
-      container()
-      { return *_M_root_rope; }
-
-      _Rope_iterator()
-      {
-        this->_M_root = 0;  // Needed for reference counting.
-      };
-
-      _Rope_iterator(const _Rope_iterator& __x)
-      : _Rope_iterator_base<_CharT, _Alloc>(__x)
-      {
-        _M_root_rope = __x._M_root_rope;
-        _RopeRep::_S_ref(this->_M_root);
-      }
-
-      _Rope_iterator(rope<_CharT, _Alloc>& __r, size_t __pos);
-
-      ~_Rope_iterator()
-      { _RopeRep::_S_unref(this->_M_root); }
-
-      _Rope_iterator&
-      operator=(const _Rope_iterator& __x)
-      {
-        _RopeRep* __old = this->_M_root;
-	
-        _RopeRep::_S_ref(__x._M_root);
-        if (0 != __x._M_buf_ptr)
-	  {
-            _M_root_rope = __x._M_root_rope;
-            *(static_cast<_Rope_iterator_base<_CharT, _Alloc>*>(this)) = __x;
-	  }
-	else
-	  {
-	    this->_M_current_pos = __x._M_current_pos;
-            this->_M_root = __x._M_root;
-            _M_root_rope = __x._M_root_rope;
-            this->_M_buf_ptr = 0;
-	  }
-        _RopeRep::_S_unref(__old);
-        return(*this);
-      }
-
-      reference
-      operator*()
-      {
-        _M_check();
-        if (0 == this->_M_buf_ptr)
-	  return _Rope_char_ref_proxy<_CharT, _Alloc>(_M_root_rope,
-						      this->_M_current_pos);
-	else
-	  return _Rope_char_ref_proxy<_CharT, _Alloc>(_M_root_rope,
-						      this->_M_current_pos,
-						      *this->_M_buf_ptr);
-      }
-
-      // See above comment.
-      reference
-      operator*() const
-      {
-	return *const_cast<_Rope_iterator&>(*this);
-      }
-
-      _Rope_iterator&
-      operator++()
-      {
-        this->_M_incr(1);
-        return *this;
-      }
-
-      _Rope_iterator&
-      operator+=(ptrdiff_t __n)
-      {
-        if (__n >= 0)
-	  this->_M_incr(__n);
-	else
-	  this->_M_decr(-__n);
-	return *this;
-      }
-
-      _Rope_iterator&
-      operator--()
-      {
-        this->_M_decr(1);
-        return *this;
-      }
-
-      _Rope_iterator&
-      operator-=(ptrdiff_t __n)
-      {
-        if (__n >= 0)
-	  this->_M_decr(__n);
-	else
-	  this->_M_incr(-__n);
-	return *this;
-      }
-
-      _Rope_iterator
-      operator++(int)
-      {
-        size_t __old_pos = this->_M_current_pos;
-        this->_M_incr(1);
-        return _Rope_iterator<_CharT,_Alloc>(_M_root_rope, __old_pos);
-      }
-
-      _Rope_iterator
-      operator--(int)
-      {
-        size_t __old_pos = this->_M_current_pos;
-        this->_M_decr(1);
-        return _Rope_iterator<_CharT,_Alloc>(_M_root_rope, __old_pos);
-      }
-
-      reference
-      operator[](ptrdiff_t __n)
-      { return _Rope_char_ref_proxy<_CharT, _Alloc>(_M_root_rope,
-						    this->_M_current_pos
-						    + __n); }
-
-      template<class _CharT2, class _Alloc2>
-        friend bool
-        operator==(const _Rope_iterator<_CharT2, _Alloc2>& __x,
-		   const _Rope_iterator<_CharT2, _Alloc2>& __y);
-
-      template<class _CharT2, class _Alloc2>
-        friend bool
-        operator<(const _Rope_iterator<_CharT2, _Alloc2>& __x,
-		  const _Rope_iterator<_CharT2, _Alloc2>& __y);
-
-      template<class _CharT2, class _Alloc2>
-        friend ptrdiff_t
-        operator-(const _Rope_iterator<_CharT2, _Alloc2>& __x,
-		  const _Rope_iterator<_CharT2, _Alloc2>& __y);
-
-      template<class _CharT2, class _Alloc2>
-        friend _Rope_iterator<_CharT2, _Alloc2>
-        operator-(const _Rope_iterator<_CharT2, _Alloc2>& __x, ptrdiff_t __n);
-
-      template<class _CharT2, class _Alloc2>
-        friend _Rope_iterator<_CharT2, _Alloc2>
-        operator+(const _Rope_iterator<_CharT2, _Alloc2>& __x, ptrdiff_t __n);
-
-      template<class _CharT2, class _Alloc2>
-        friend _Rope_iterator<_CharT2, _Alloc2>
-        operator+(ptrdiff_t __n, const _Rope_iterator<_CharT2, _Alloc2>& __x);
-    };
-
-
-  template <class _CharT, class _Alloc>
-    struct _Rope_base
-    : public _Alloc
-    {
-      typedef _Alloc allocator_type;
-
-      allocator_type
-      get_allocator() const
-      { return *static_cast<const _Alloc*>(this); }
-
-      allocator_type&
-      _M_get_allocator()
-      { return *static_cast<_Alloc*>(this); }
-
-      const allocator_type&
-      _M_get_allocator() const
-      { return *static_cast<const _Alloc*>(this); }
-
-      typedef _Rope_RopeRep<_CharT, _Alloc> _RopeRep;
-      // The one in _Base may not be visible due to template rules.
-
-      _Rope_base(_RopeRep* __t, const allocator_type&)
-      : _M_tree_ptr(__t) { }
-
-      _Rope_base(const allocator_type&) { }
-
-      // The only data member of a rope:
-      _RopeRep *_M_tree_ptr;
-
-#define __ROPE_DEFINE_ALLOC(_Tp, __name) \
-        typedef typename \
-          _Alloc::template rebind<_Tp>::other __name##Alloc; \
-        static _Tp* __name##_allocate(size_t __n) \
-          { return __name##Alloc().allocate(__n); } \
-        static void __name##_deallocate(_Tp *__p, size_t __n) \
-          { __name##Alloc().deallocate(__p, __n); }
-      __ROPE_DEFINE_ALLOCS(_Alloc)
-#undef __ROPE_DEFINE_ALLOC
-
-	protected:
-      _Rope_base&
-      operator=(const _Rope_base&);
-      
-      _Rope_base(const _Rope_base&);
-    };
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template <class _CharT, class _Alloc>
-    class rope : public _Rope_base<_CharT, _Alloc>
-    {
-    public:
-      typedef _CharT value_type;
-      typedef ptrdiff_t difference_type;
-      typedef size_t size_type;
-      typedef _CharT const_reference;
-      typedef const _CharT* const_pointer;
-      typedef _Rope_iterator<_CharT, _Alloc> iterator;
-      typedef _Rope_const_iterator<_CharT, _Alloc> const_iterator;
-      typedef _Rope_char_ref_proxy<_CharT, _Alloc> reference;
-      typedef _Rope_char_ptr_proxy<_CharT, _Alloc> pointer;
-
-      friend class _Rope_iterator<_CharT, _Alloc>;
-      friend class _Rope_const_iterator<_CharT, _Alloc>;
-      friend struct _Rope_RopeRep<_CharT, _Alloc>;
-      friend class _Rope_iterator_base<_CharT, _Alloc>;
-      friend class _Rope_char_ptr_proxy<_CharT, _Alloc>;
-      friend class _Rope_char_ref_proxy<_CharT, _Alloc>;
-      friend struct _Rope_RopeSubstring<_CharT, _Alloc>;
-
-    protected:
-      typedef _Rope_base<_CharT, _Alloc> _Base;
-      typedef typename _Base::allocator_type allocator_type;
-      using _Base::_M_tree_ptr;
-      using _Base::get_allocator;
-      using _Base::_M_get_allocator;
-      typedef __GC_CONST _CharT* _Cstrptr;
-      
-      static _CharT _S_empty_c_str[1];
-      
-      static bool
-      _S_is0(_CharT __c)
-      { return __c == _S_eos((_CharT*)0); }
-      
-      enum { _S_copy_max = 23 };
-                // For strings shorter than _S_copy_max, we copy to
-                // concatenate.
-
-      typedef _Rope_RopeRep<_CharT, _Alloc> _RopeRep;
-      typedef _Rope_RopeConcatenation<_CharT, _Alloc> _RopeConcatenation;
-      typedef _Rope_RopeLeaf<_CharT, _Alloc> _RopeLeaf;
-      typedef _Rope_RopeFunction<_CharT, _Alloc> _RopeFunction;
-      typedef _Rope_RopeSubstring<_CharT, _Alloc> _RopeSubstring;
-
-      // Retrieve a character at the indicated position.
-      static _CharT _S_fetch(_RopeRep* __r, size_type __pos);
-
-#ifndef __GC
-      // Obtain a pointer to the character at the indicated position.
-      // The pointer can be used to change the character.
-      // If such a pointer cannot be produced, as is frequently the
-      // case, 0 is returned instead.
-      // (Returns nonzero only if all nodes in the path have a refcount
-      // of 1.)
-      static _CharT* _S_fetch_ptr(_RopeRep* __r, size_type __pos);
-#endif
-
-      static bool
-      _S_apply_to_pieces(// should be template parameter
-			 _Rope_char_consumer<_CharT>& __c,
-			 const _RopeRep* __r,
-			 size_t __begin, size_t __end);
-                         // begin and end are assumed to be in range.
-
-#ifndef __GC
-      static void
-      _S_unref(_RopeRep* __t)
-      { _RopeRep::_S_unref(__t); }
-
-      static void
-      _S_ref(_RopeRep* __t)
-      { _RopeRep::_S_ref(__t); }
-
-#else /* __GC */
-      static void _S_unref(_RopeRep*) { }
-      static void _S_ref(_RopeRep*) { }
-#endif
-
-#ifdef __GC
-      typedef _Rope_RopeRep<_CharT, _Alloc>* _Self_destruct_ptr;
-#else
-      typedef _Rope_self_destruct_ptr<_CharT, _Alloc> _Self_destruct_ptr;
-#endif
-
-      // _Result is counted in refcount.
-      static _RopeRep* _S_substring(_RopeRep* __base,
-                                    size_t __start, size_t __endp1);
-
-      static _RopeRep* _S_concat_char_iter(_RopeRep* __r,
-					   const _CharT* __iter, size_t __slen);
-      // Concatenate rope and char ptr, copying __s.
-      // Should really take an arbitrary iterator.
-      // Result is counted in refcount.
-      static _RopeRep* _S_destr_concat_char_iter(_RopeRep* __r,
-						 const _CharT* __iter,
-						 size_t __slen)
-	// As above, but one reference to __r is about to be
-	// destroyed.  Thus the pieces may be recycled if all
-	// relevant reference counts are 1.
-#ifdef __GC
-	// We can't really do anything since refcounts are unavailable.
-      { return _S_concat_char_iter(__r, __iter, __slen); }
-#else
-      ;
-#endif
-
-      static _RopeRep* _S_concat(_RopeRep* __left, _RopeRep* __right);
-      // General concatenation on _RopeRep.  _Result
-      // has refcount of 1.  Adjusts argument refcounts.
-
-   public:
-      void
-      apply_to_pieces(size_t __begin, size_t __end,
-		      _Rope_char_consumer<_CharT>& __c) const
-      { _S_apply_to_pieces(__c, this->_M_tree_ptr, __begin, __end); }
-
-   protected:
-
-      static size_t
-      _S_rounded_up_size(size_t __n)
-      { return _RopeLeaf::_S_rounded_up_size(__n); }
-
-      static size_t
-      _S_allocated_capacity(size_t __n)
-      {
-	if (_S_is_basic_char_type((_CharT*)0))
-	  return _S_rounded_up_size(__n) - 1;
-	else
-	  return _S_rounded_up_size(__n);
-	
-      }
-
-      // Allocate and construct a RopeLeaf using the supplied allocator
-      // Takes ownership of s instead of copying.
-      static _RopeLeaf*
-      _S_new_RopeLeaf(__GC_CONST _CharT *__s,
-		      size_t __size, allocator_type& __a)
-      {
-	_RopeLeaf* __space = typename _Base::_LAlloc(__a).allocate(1);
-	return new(__space) _RopeLeaf(__s, __size, __a);
-      }
-
-      static _RopeConcatenation*
-      _S_new_RopeConcatenation(_RopeRep* __left, _RopeRep* __right,
-			       allocator_type& __a)
-      {
-	_RopeConcatenation* __space = typename _Base::_CAlloc(__a).allocate(1);
-	return new(__space) _RopeConcatenation(__left, __right, __a);
-      }
-
-      static _RopeFunction*
-      _S_new_RopeFunction(char_producer<_CharT>* __f,
-			  size_t __size, bool __d, allocator_type& __a)
-      {
-	_RopeFunction* __space = typename _Base::_FAlloc(__a).allocate(1);
-	return new(__space) _RopeFunction(__f, __size, __d, __a);
-      }
-
-      static _RopeSubstring*
-      _S_new_RopeSubstring(_Rope_RopeRep<_CharT,_Alloc>* __b, size_t __s,
-			   size_t __l, allocator_type& __a)
-      {
-	_RopeSubstring* __space = typename _Base::_SAlloc(__a).allocate(1);
-	return new(__space) _RopeSubstring(__b, __s, __l, __a);
-      }
-      
-      static _RopeLeaf*
-      _S_RopeLeaf_from_unowned_char_ptr(const _CharT *__s,
-					size_t __size, allocator_type& __a)
-#define __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __size, __a) \
-                _S_RopeLeaf_from_unowned_char_ptr(__s, __size, __a)
-      {
-	if (0 == __size)
-	  return 0;
-	_CharT* __buf = __a.allocate(_S_rounded_up_size(__size));
-	
-	__uninitialized_copy_n_a(__s, __size, __buf, __a);
-	_S_cond_store_eos(__buf[__size]);
-	__try
-	  { return _S_new_RopeLeaf(__buf, __size, __a); }
-	__catch(...)
-	  {
-	    _RopeRep::__STL_FREE_STRING(__buf, __size, __a);
-	    __throw_exception_again;
-	  }
-      }
-
-      // Concatenation of nonempty strings.
-      // Always builds a concatenation node.
-      // Rebalances if the result is too deep.
-      // Result has refcount 1.
-      // Does not increment left and right ref counts even though
-      // they are referenced.
-      static _RopeRep*
-      _S_tree_concat(_RopeRep* __left, _RopeRep* __right);
-
-      // Concatenation helper functions
-      static _RopeLeaf*
-      _S_leaf_concat_char_iter(_RopeLeaf* __r,
-			       const _CharT* __iter, size_t __slen);
-      // Concatenate by copying leaf.
-      // should take an arbitrary iterator
-      // result has refcount 1.
-#ifndef __GC
-      static _RopeLeaf*
-      _S_destr_leaf_concat_char_iter(_RopeLeaf* __r,
-				     const _CharT* __iter, size_t __slen);
-      // A version that potentially clobbers __r if __r->_M_ref_count == 1.
-#endif
-
-    private:
-      
-      static size_t _S_char_ptr_len(const _CharT* __s);
-      // slightly generalized strlen
-
-      rope(_RopeRep* __t, const allocator_type& __a = allocator_type())
-      : _Base(__t, __a) { }
-
-
-      // Copy __r to the _CharT buffer.
-      // Returns __buffer + __r->_M_size.
-      // Assumes that buffer is uninitialized.
-      static _CharT* _S_flatten(_RopeRep* __r, _CharT* __buffer);
-
-      // Again, with explicit starting position and length.
-      // Assumes that buffer is uninitialized.
-      static _CharT* _S_flatten(_RopeRep* __r,
-				size_t __start, size_t __len,
-				_CharT* __buffer);
-
-      static const unsigned long
-      _S_min_len[__detail::_S_max_rope_depth + 1];
-      
-      static bool
-      _S_is_balanced(_RopeRep* __r)
-      { return (__r->_M_size >= _S_min_len[__r->_M_depth]); }
-
-      static bool
-      _S_is_almost_balanced(_RopeRep* __r)
-      { return (__r->_M_depth == 0
-		|| __r->_M_size >= _S_min_len[__r->_M_depth - 1]); }
-
-      static bool
-      _S_is_roughly_balanced(_RopeRep* __r)
-      { return (__r->_M_depth <= 1
-		|| __r->_M_size >= _S_min_len[__r->_M_depth - 2]); }
-
-      // Assumes the result is not empty.
-      static _RopeRep*
-      _S_concat_and_set_balanced(_RopeRep* __left, _RopeRep* __right)
-      {
-	_RopeRep* __result = _S_concat(__left, __right);
-	if (_S_is_balanced(__result))
-	  __result->_M_is_balanced = true;
-	return __result;
-      }
-
-      // The basic rebalancing operation.  Logically copies the
-      // rope.  The result has refcount of 1.  The client will
-      // usually decrement the reference count of __r.
-      // The result is within height 2 of balanced by the above
-      // definition.
-      static _RopeRep* _S_balance(_RopeRep* __r);
-
-      // Add all unbalanced subtrees to the forest of balanced trees.
-      // Used only by balance.
-      static void _S_add_to_forest(_RopeRep*__r, _RopeRep** __forest);
-
-      // Add __r to forest, assuming __r is already balanced.
-      static void _S_add_leaf_to_forest(_RopeRep* __r, _RopeRep** __forest);
-      
-      // Print to stdout, exposing structure
-      static void _S_dump(_RopeRep* __r, int __indent = 0);
-      
-      // Return -1, 0, or 1 if __x < __y, __x == __y, or __x > __y resp.
-      static int _S_compare(const _RopeRep* __x, const _RopeRep* __y);
-      
-    public:
-      bool
-      empty() const
-      { return 0 == this->_M_tree_ptr; }
-      
-      // Comparison member function.  This is public only for those
-      // clients that need a ternary comparison.  Others
-      // should use the comparison operators below.
-      int
-      compare(const rope& __y) const
-      { return _S_compare(this->_M_tree_ptr, __y._M_tree_ptr); }
-
-      rope(const _CharT* __s, const allocator_type& __a = allocator_type())
-      : _Base(__a)
-      {
-	this->_M_tree_ptr =
-	  __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, _S_char_ptr_len(__s),
-					   _M_get_allocator());
-      }
-
-      rope(const _CharT* __s, size_t __len,
-	   const allocator_type& __a = allocator_type())
-      : _Base(__a)
-      {
-	this->_M_tree_ptr =
-	  __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __len, _M_get_allocator());
-      }
-
-      // Should perhaps be templatized with respect to the iterator type
-      // and use Sequence_buffer.  (It should perhaps use sequence_buffer
-      // even now.)
-      rope(const _CharT* __s, const _CharT* __e,
-	   const allocator_type& __a = allocator_type())
-      : _Base(__a)
-      {
-	this->_M_tree_ptr =
-	  __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __e - __s, _M_get_allocator());
-      }
-
-      rope(const const_iterator& __s, const const_iterator& __e,
-	   const allocator_type& __a = allocator_type())
-      : _Base(_S_substring(__s._M_root, __s._M_current_pos,
-			   __e._M_current_pos), __a)
-      { }
-
-      rope(const iterator& __s, const iterator& __e,
-	   const allocator_type& __a = allocator_type())
-      : _Base(_S_substring(__s._M_root, __s._M_current_pos,
-			   __e._M_current_pos), __a)
-      { }
-
-      rope(_CharT __c, const allocator_type& __a = allocator_type())
-      : _Base(__a)
-      {
-	_CharT* __buf = this->_Data_allocate(_S_rounded_up_size(1));
-	
-	_M_get_allocator().construct(__buf, __c);
-	__try
-	  {
-	    this->_M_tree_ptr = _S_new_RopeLeaf(__buf, 1,
-						_M_get_allocator());
-	  }
-	__catch(...)
-	  {
-	    _RopeRep::__STL_FREE_STRING(__buf, 1, _M_get_allocator());
-	    __throw_exception_again;
-	  }
-      }
-
-      rope(size_t __n, _CharT __c,
-	   const allocator_type& __a = allocator_type());
-
-      rope(const allocator_type& __a = allocator_type())
-      : _Base(0, __a) { }
-
-      // Construct a rope from a function that can compute its members
-      rope(char_producer<_CharT> *__fn, size_t __len, bool __delete_fn,
-	   const allocator_type& __a = allocator_type())
-      : _Base(__a)
-      {
-	this->_M_tree_ptr = (0 == __len)
-	  ? 0
-	  : _S_new_RopeFunction(__fn, __len, __delete_fn, _M_get_allocator());
-      }
-
-      rope(const rope& __x, const allocator_type& __a = allocator_type())
-      : _Base(__x._M_tree_ptr, __a)
-      { _S_ref(this->_M_tree_ptr); }
-
-      ~rope() throw()
-      { _S_unref(this->_M_tree_ptr); }
-
-      rope&
-      operator=(const rope& __x)
-      {
-	_RopeRep* __old = this->_M_tree_ptr;
-	this->_M_tree_ptr = __x._M_tree_ptr;
-	_S_ref(this->_M_tree_ptr);
-	_S_unref(__old);
-	return *this;
-      }
-
-      void
-      clear()
-      {
-	_S_unref(this->_M_tree_ptr);
-	this->_M_tree_ptr = 0;
-      }
-      
-      void
-      push_back(_CharT __x)
-      {
-	_RopeRep* __old = this->_M_tree_ptr;
-	this->_M_tree_ptr
-	  = _S_destr_concat_char_iter(this->_M_tree_ptr, &__x, 1);
-	_S_unref(__old);
-      }
-
-      void
-      pop_back()
-      {
-	_RopeRep* __old = this->_M_tree_ptr;
-	this->_M_tree_ptr = _S_substring(this->_M_tree_ptr,
-					 0, this->_M_tree_ptr->_M_size - 1);
-	_S_unref(__old);
-      }
-
-      _CharT
-      back() const
-      { return _S_fetch(this->_M_tree_ptr, this->_M_tree_ptr->_M_size - 1); }
-
-      void
-      push_front(_CharT __x)
-      {
-	_RopeRep* __old = this->_M_tree_ptr;
-	_RopeRep* __left =
-	  __STL_ROPE_FROM_UNOWNED_CHAR_PTR(&__x, 1, _M_get_allocator());
-	__try
-	  {
-	    this->_M_tree_ptr = _S_concat(__left, this->_M_tree_ptr);
-	    _S_unref(__old);
-	    _S_unref(__left);
-	  }
-	__catch(...)
-	  {
-	    _S_unref(__left);
-	    __throw_exception_again;
-	  }
-      }
-
-      void
-      pop_front()
-      {
-	_RopeRep* __old = this->_M_tree_ptr;
-	this->_M_tree_ptr
-	  = _S_substring(this->_M_tree_ptr, 1, this->_M_tree_ptr->_M_size);
-	_S_unref(__old);
-      }
-
-      _CharT
-      front() const
-      { return _S_fetch(this->_M_tree_ptr, 0); }
-
-      void
-      balance()
-      {
-	_RopeRep* __old = this->_M_tree_ptr;
-	this->_M_tree_ptr = _S_balance(this->_M_tree_ptr);
-	_S_unref(__old);
-      }
-
-      void
-      copy(_CharT* __buffer) const
-      {
-	_Destroy_const(__buffer, __buffer + size(), _M_get_allocator());
-	_S_flatten(this->_M_tree_ptr, __buffer);
-      }
-
-      // This is the copy function from the standard, but
-      // with the arguments reordered to make it consistent with the
-      // rest of the interface.
-      // Note that this guaranteed not to compile if the draft standard
-      // order is assumed.
-      size_type
-      copy(size_type __pos, size_type __n, _CharT* __buffer) const
-      {
-	size_t __size = size();
-	size_t __len = (__pos + __n > __size? __size - __pos : __n);
-
-	_Destroy_const(__buffer, __buffer + __len, _M_get_allocator());
-	_S_flatten(this->_M_tree_ptr, __pos, __len, __buffer);
-	return __len;
-      }
-
-      // Print to stdout, exposing structure.  May be useful for
-      // performance debugging.
-      void
-      dump()
-      { _S_dump(this->_M_tree_ptr); }
-      
-      // Convert to 0 terminated string in new allocated memory.
-      // Embedded 0s in the input do not terminate the copy.
-      const _CharT* c_str() const;
-
-      // As above, but also use the flattened representation as
-      // the new rope representation.
-      const _CharT* replace_with_c_str();
-      
-      // Reclaim memory for the c_str generated flattened string.
-      // Intentionally undocumented, since it's hard to say when this
-      // is safe for multiple threads.
-      void
-      delete_c_str ()
-      {
-	if (0 == this->_M_tree_ptr)
-	  return;
-	if (__detail::_S_leaf == this->_M_tree_ptr->_M_tag &&
-	    ((_RopeLeaf*)this->_M_tree_ptr)->_M_data ==
-	    this->_M_tree_ptr->_M_c_string)
-	  {
-	    // Representation shared
-	    return;
-	  }
-#ifndef __GC
-	this->_M_tree_ptr->_M_free_c_string();
-#endif
-	this->_M_tree_ptr->_M_c_string = 0;
-      }
-
-      _CharT
-      operator[] (size_type __pos) const
-      { return _S_fetch(this->_M_tree_ptr, __pos); }
-
-      _CharT
-      at(size_type __pos) const
-      {
-	// if (__pos >= size()) throw out_of_range;  // XXX
-	return (*this)[__pos];
-      }
-
-      const_iterator
-      begin() const
-      { return(const_iterator(this->_M_tree_ptr, 0)); }
-
-      // An easy way to get a const iterator from a non-const container.
-      const_iterator
-      const_begin() const
-      { return(const_iterator(this->_M_tree_ptr, 0)); }
-
-      const_iterator
-      end() const
-      { return(const_iterator(this->_M_tree_ptr, size())); }
-
-      const_iterator
-      const_end() const
-      { return(const_iterator(this->_M_tree_ptr, size())); }
-
-      size_type
-      size() const
-      {	return(0 == this->_M_tree_ptr? 0 : this->_M_tree_ptr->_M_size); }
-      
-      size_type
-      length() const
-      {	return size(); }
-
-      size_type
-      max_size() const
-      {
-	return _S_min_len[int(__detail::_S_max_rope_depth) - 1] - 1;
-	//  Guarantees that the result can be sufficiently
-	//  balanced.  Longer ropes will probably still work,
-	//  but it's harder to make guarantees.
-      }
-
-      typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      const_rbegin() const
-      {	return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(begin()); }
-      
-      const_reverse_iterator
-      const_rend() const
-      {	return const_reverse_iterator(begin()); }
-
-      template<class _CharT2, class _Alloc2>
-        friend rope<_CharT2, _Alloc2>
-        operator+(const rope<_CharT2, _Alloc2>& __left,
-		  const rope<_CharT2, _Alloc2>& __right);
-
-      template<class _CharT2, class _Alloc2>
-        friend rope<_CharT2, _Alloc2>
-        operator+(const rope<_CharT2, _Alloc2>& __left, const _CharT2* __right);
-
-      template<class _CharT2, class _Alloc2>
-        friend rope<_CharT2, _Alloc2>
-        operator+(const rope<_CharT2, _Alloc2>& __left, _CharT2 __right);
-
-      // The symmetric cases are intentionally omitted, since they're
-      // presumed to be less common, and we don't handle them as well.
-
-      // The following should really be templatized.  The first
-      // argument should be an input iterator or forward iterator with
-      // value_type _CharT.
-      rope&
-      append(const _CharT* __iter, size_t __n)
-      {
-	_RopeRep* __result =
-	  _S_destr_concat_char_iter(this->_M_tree_ptr, __iter, __n);
-	_S_unref(this->_M_tree_ptr);
-	this->_M_tree_ptr = __result;
-	return *this;
-      }
-
-      rope&
-      append(const _CharT* __c_string)
-      {
-	size_t __len = _S_char_ptr_len(__c_string);
-	append(__c_string, __len);
-	return(*this);
-      }
-
-      rope&
-      append(const _CharT* __s, const _CharT* __e)
-      {
-	_RopeRep* __result =
-	  _S_destr_concat_char_iter(this->_M_tree_ptr, __s, __e - __s);
-	_S_unref(this->_M_tree_ptr);
-	this->_M_tree_ptr = __result;
-	return *this;
-      }
-
-      rope&
-      append(const_iterator __s, const_iterator __e)
-      {
-	_Self_destruct_ptr __appendee(_S_substring(__s._M_root,
-						   __s._M_current_pos,
-						   __e._M_current_pos));
-	_RopeRep* __result = _S_concat(this->_M_tree_ptr, 
-				       (_RopeRep*)__appendee);
-	_S_unref(this->_M_tree_ptr);
-	this->_M_tree_ptr = __result;
-	return *this;
-      }
-
-      rope&
-      append(_CharT __c)
-      {
-	_RopeRep* __result =
-	  _S_destr_concat_char_iter(this->_M_tree_ptr, &__c, 1);
-	_S_unref(this->_M_tree_ptr);
-	this->_M_tree_ptr = __result;
-	return *this;
-      }
-
-      rope&
-      append()
-      { return append(_CharT()); }  // XXX why?
-
-      rope&
-      append(const rope& __y)
-      {
-	_RopeRep* __result = _S_concat(this->_M_tree_ptr, __y._M_tree_ptr);
-	_S_unref(this->_M_tree_ptr);
-	this->_M_tree_ptr = __result;
-	return *this;
-      }
-
-      rope&
-      append(size_t __n, _CharT __c)
-      {
-	rope<_CharT,_Alloc> __last(__n, __c);
-	return append(__last);
-      }
-
-      void
-      swap(rope& __b)
-      {
-	_RopeRep* __tmp = this->_M_tree_ptr;
-	this->_M_tree_ptr = __b._M_tree_ptr;
-	__b._M_tree_ptr = __tmp;
-      }
-
-    protected:
-      // Result is included in refcount.
-      static _RopeRep*
-      replace(_RopeRep* __old, size_t __pos1,
-	      size_t __pos2, _RopeRep* __r)
-      {
-	if (0 == __old)
-	  {
-	    _S_ref(__r);
-	    return __r;
-	  }
-	_Self_destruct_ptr __left(_S_substring(__old, 0, __pos1));
-	_Self_destruct_ptr __right(_S_substring(__old, __pos2, __old->_M_size));
-	_RopeRep* __result;
-
-	if (0 == __r)
-	  __result = _S_concat(__left, __right);
-	else
-	  {
-	    _Self_destruct_ptr __left_result(_S_concat(__left, __r));
-	    __result = _S_concat(__left_result, __right);
-	  }
-	return __result;
-      }
-
-    public:
-      void
-      insert(size_t __p, const rope& __r)
-      {
-	_RopeRep* __result =
-	  replace(this->_M_tree_ptr, __p, __p, __r._M_tree_ptr);
-	_S_unref(this->_M_tree_ptr);
-	this->_M_tree_ptr = __result;
-      }
-
-      void
-      insert(size_t __p, size_t __n, _CharT __c)
-      {
-	rope<_CharT,_Alloc> __r(__n,__c);
-	insert(__p, __r);
-      }
-      
-      void
-      insert(size_t __p, const _CharT* __i, size_t __n)
-      {
-	_Self_destruct_ptr __left(_S_substring(this->_M_tree_ptr, 0, __p));
-	_Self_destruct_ptr __right(_S_substring(this->_M_tree_ptr,
-						__p, size()));
-	_Self_destruct_ptr __left_result(_S_concat_char_iter(__left, __i, __n));
-	// _S_ destr_concat_char_iter should be safe here.
-	// But as it stands it's probably not a win, since __left
-	// is likely to have additional references.
-	_RopeRep* __result = _S_concat(__left_result, __right);
-	_S_unref(this->_M_tree_ptr);
-	this->_M_tree_ptr = __result;
-      }
-
-      void
-      insert(size_t __p, const _CharT* __c_string)
-      {	insert(__p, __c_string, _S_char_ptr_len(__c_string)); }
-
-      void
-      insert(size_t __p, _CharT __c)
-      { insert(__p, &__c, 1); }
-
-      void
-      insert(size_t __p)
-      {
-	_CharT __c = _CharT();
-	insert(__p, &__c, 1);
-      }
-
-      void
-      insert(size_t __p, const _CharT* __i, const _CharT* __j)
-      {
-	rope __r(__i, __j);
-	insert(__p, __r);
-      }
-
-      void
-      insert(size_t __p, const const_iterator& __i,
-	     const const_iterator& __j)
-      {
-	rope __r(__i, __j);
-	insert(__p, __r);
-      }
-
-      void
-      insert(size_t __p, const iterator& __i,
-	     const iterator& __j)
-      {
-	rope __r(__i, __j);
-	insert(__p, __r);
-      }
-
-      // (position, length) versions of replace operations:
-      
-      void
-      replace(size_t __p, size_t __n, const rope& __r)
-      {
-	_RopeRep* __result =
-	  replace(this->_M_tree_ptr, __p, __p + __n, __r._M_tree_ptr);
-	_S_unref(this->_M_tree_ptr);
-	this->_M_tree_ptr = __result;
-      }
-
-      void
-      replace(size_t __p, size_t __n,
-	      const _CharT* __i, size_t __i_len)
-      {
-	rope __r(__i, __i_len);
-	replace(__p, __n, __r);
-      }
-
-      void
-      replace(size_t __p, size_t __n, _CharT __c)
-      {
-	rope __r(__c);
-	replace(__p, __n, __r);
-      }
-
-      void
-      replace(size_t __p, size_t __n, const _CharT* __c_string)
-      {
-	rope __r(__c_string);
-	replace(__p, __n, __r);
-      }
-      
-      void
-      replace(size_t __p, size_t __n,
-	      const _CharT* __i, const _CharT* __j)
-      {
-	rope __r(__i, __j);
-	replace(__p, __n, __r);
-      }
-      
-      void
-      replace(size_t __p, size_t __n,
-	      const const_iterator& __i, const const_iterator& __j)
-      {
-	rope __r(__i, __j);
-	replace(__p, __n, __r);
-      }
-
-      void
-      replace(size_t __p, size_t __n,
-	      const iterator& __i, const iterator& __j)
-      {
-	rope __r(__i, __j);
-	replace(__p, __n, __r);
-      }
-
-      // Single character variants:
-      void
-      replace(size_t __p, _CharT __c)
-      {
-	iterator __i(this, __p);
-	*__i = __c;
-      }
-
-      void
-      replace(size_t __p, const rope& __r)
-      { replace(__p, 1, __r); }
-
-      void
-      replace(size_t __p, const _CharT* __i, size_t __i_len)
-      { replace(__p, 1, __i, __i_len); }
-
-      void
-      replace(size_t __p, const _CharT* __c_string)
-      {	replace(__p, 1, __c_string); }
-
-      void
-      replace(size_t __p, const _CharT* __i, const _CharT* __j)
-      {	replace(__p, 1, __i, __j); }
-
-      void
-      replace(size_t __p, const const_iterator& __i,
-	      const const_iterator& __j)
-      { replace(__p, 1, __i, __j); }
-
-      void
-      replace(size_t __p, const iterator& __i,
-	      const iterator& __j)
-      { replace(__p, 1, __i, __j); }
-
-      // Erase, (position, size) variant.
-      void
-      erase(size_t __p, size_t __n)
-      {
-	_RopeRep* __result = replace(this->_M_tree_ptr, __p,
-				     __p + __n, 0);
-	_S_unref(this->_M_tree_ptr);
-	this->_M_tree_ptr = __result;
-      }
-
-      // Erase, single character
-      void
-      erase(size_t __p)
-      { erase(__p, __p + 1); }
-
-      // Insert, iterator variants.
-      iterator
-      insert(const iterator& __p, const rope& __r)
-      {
-	insert(__p.index(), __r);
-	return __p;
-      }
-
-      iterator
-      insert(const iterator& __p, size_t __n, _CharT __c)
-      {
-	insert(__p.index(), __n, __c);
-	return __p;
-      }
-
-      iterator insert(const iterator& __p, _CharT __c)
-      {
-	insert(__p.index(), __c);
-	return __p;
-      }
-      
-      iterator
-      insert(const iterator& __p )
-      {
-	insert(__p.index());
-	return __p;
-      }
-      
-      iterator
-      insert(const iterator& __p, const _CharT* c_string)
-      {
-	insert(__p.index(), c_string);
-	return __p;
-      }
-      
-      iterator
-      insert(const iterator& __p, const _CharT* __i, size_t __n)
-      {
-	insert(__p.index(), __i, __n);
-	return __p;
-      }
-      
-      iterator
-      insert(const iterator& __p, const _CharT* __i,
-	     const _CharT* __j)
-      {
-	insert(__p.index(), __i, __j); 
-	return __p;
-      }
-      
-      iterator
-      insert(const iterator& __p,
-	     const const_iterator& __i, const const_iterator& __j)
-      {
-	insert(__p.index(), __i, __j);
-	return __p;
-      }
-      
-      iterator
-      insert(const iterator& __p,
-	     const iterator& __i, const iterator& __j)
-      {
-	insert(__p.index(), __i, __j);
-	return __p;
-      }
-
-      // Replace, range variants.
-      void
-      replace(const iterator& __p, const iterator& __q, const rope& __r)
-      {	replace(__p.index(), __q.index() - __p.index(), __r); }
-
-      void
-      replace(const iterator& __p, const iterator& __q, _CharT __c)
-      { replace(__p.index(), __q.index() - __p.index(), __c); }
-      
-      void
-      replace(const iterator& __p, const iterator& __q,
-	      const _CharT* __c_string)
-      { replace(__p.index(), __q.index() - __p.index(), __c_string); }
-      
-      void
-      replace(const iterator& __p, const iterator& __q,
-	      const _CharT* __i, size_t __n)
-      { replace(__p.index(), __q.index() - __p.index(), __i, __n); }
-      
-      void
-      replace(const iterator& __p, const iterator& __q,
-	      const _CharT* __i, const _CharT* __j)
-      { replace(__p.index(), __q.index() - __p.index(), __i, __j); }
-      
-      void
-      replace(const iterator& __p, const iterator& __q,
-	      const const_iterator& __i, const const_iterator& __j)
-      { replace(__p.index(), __q.index() - __p.index(), __i, __j); }
-      
-      void
-      replace(const iterator& __p, const iterator& __q,
-	      const iterator& __i, const iterator& __j)
-      { replace(__p.index(), __q.index() - __p.index(), __i, __j); }
-
-      // Replace, iterator variants.
-      void
-      replace(const iterator& __p, const rope& __r)
-      { replace(__p.index(), __r); }
-      
-      void
-      replace(const iterator& __p, _CharT __c)
-      { replace(__p.index(), __c); }
-      
-      void
-      replace(const iterator& __p, const _CharT* __c_string)
-      { replace(__p.index(), __c_string); }
-      
-      void
-      replace(const iterator& __p, const _CharT* __i, size_t __n)
-      { replace(__p.index(), __i, __n); }
-      
-      void
-      replace(const iterator& __p, const _CharT* __i, const _CharT* __j)
-      { replace(__p.index(), __i, __j); }
-      
-      void
-      replace(const iterator& __p, const_iterator __i, const_iterator __j)
-      { replace(__p.index(), __i, __j); }
-      
-      void
-      replace(const iterator& __p, iterator __i, iterator __j)
-      { replace(__p.index(), __i, __j); }
-
-      // Iterator and range variants of erase
-      iterator
-      erase(const iterator& __p, const iterator& __q)
-      {
-	size_t __p_index = __p.index();
-	erase(__p_index, __q.index() - __p_index);
-	return iterator(this, __p_index);
-      }
-
-      iterator
-      erase(const iterator& __p)
-      {
-	size_t __p_index = __p.index();
-	erase(__p_index, 1);
-	return iterator(this, __p_index);
-      }
-
-      rope
-      substr(size_t __start, size_t __len = 1) const
-      {
-	return rope<_CharT, _Alloc>(_S_substring(this->_M_tree_ptr,
-						 __start,
-						 __start + __len));
-      }
-
-      rope
-      substr(iterator __start, iterator __end) const
-      {
-	return rope<_CharT, _Alloc>(_S_substring(this->_M_tree_ptr,
-						 __start.index(),
-						 __end.index()));
-      }
-
-      rope
-      substr(iterator __start) const
-      {
-	size_t __pos = __start.index();
-	return rope<_CharT, _Alloc>(_S_substring(this->_M_tree_ptr,
-						 __pos, __pos + 1));
-      }
-
-      rope
-      substr(const_iterator __start, const_iterator __end) const
-      {
-	// This might eventually take advantage of the cache in the
-	// iterator.
-	return rope<_CharT, _Alloc>(_S_substring(this->_M_tree_ptr,
-						 __start.index(),
-						 __end.index()));
-      }
-
-      rope<_CharT, _Alloc>
-      substr(const_iterator __start)
-      {
-	size_t __pos = __start.index();
-	return rope<_CharT, _Alloc>(_S_substring(this->_M_tree_ptr,
-						 __pos, __pos + 1));
-      }
-
-      static const size_type npos;
-
-      size_type find(_CharT __c, size_type __pos = 0) const;
-
-      size_type
-      find(const _CharT* __s, size_type __pos = 0) const
-      {
-	size_type __result_pos;
-	const_iterator __result =
-	  std::search(const_begin() + __pos, const_end(),
-		      __s, __s + _S_char_ptr_len(__s));
-	__result_pos = __result.index();
-#ifndef __STL_OLD_ROPE_SEMANTICS
-	if (__result_pos == size())
-	  __result_pos = npos;
-#endif
-	return __result_pos;
-      }
-
-      iterator
-      mutable_begin()
-      { return(iterator(this, 0)); }
-      
-      iterator
-      mutable_end()
-      { return(iterator(this, size())); }
-
-      typedef std::reverse_iterator<iterator> reverse_iterator;
-      
-      reverse_iterator
-      mutable_rbegin()
-      { return reverse_iterator(mutable_end()); }
-
-      reverse_iterator
-      mutable_rend()
-      { return reverse_iterator(mutable_begin()); }
-
-      reference
-      mutable_reference_at(size_type __pos)
-      { return reference(this, __pos); }
-
-#ifdef __STD_STUFF
-      reference
-      operator[] (size_type __pos)
-      { return _char_ref_proxy(this, __pos); }
-
-      reference
-      at(size_type __pos)
-      {
-	// if (__pos >= size()) throw out_of_range;  // XXX
-	return (*this)[__pos];
-      }
-      
-      void resize(size_type __n, _CharT __c) { }
-      void resize(size_type __n) { }
-      void reserve(size_type __res_arg = 0) { }
-      
-      size_type
-      capacity() const
-      { return max_size(); }
-
-      // Stuff below this line is dangerous because it's error prone.
-      // I would really like to get rid of it.
-      // copy function with funny arg ordering.
-      size_type
-      copy(_CharT* __buffer, size_type __n,
-	   size_type __pos = 0) const
-      { return copy(__pos, __n, __buffer); }
-
-      iterator
-      end()
-      { return mutable_end(); }
-
-      iterator
-      begin()
-      { return mutable_begin(); }
-
-      reverse_iterator
-      rend()
-      { return mutable_rend(); }
-      
-      reverse_iterator
-      rbegin()
-      { return mutable_rbegin(); }
-
-#else
-      const_iterator
-      end()
-      { return const_end(); }
-
-      const_iterator
-      begin()
-      { return const_begin(); }
-
-      const_reverse_iterator
-      rend()
-      { return const_rend(); }
-
-      const_reverse_iterator
-      rbegin()
-      { return const_rbegin(); }
-
-#endif
-    };
-
-  template <class _CharT, class _Alloc>
-    const typename rope<_CharT, _Alloc>::size_type
-    rope<_CharT, _Alloc>::npos = (size_type)(-1);
-  
-  template <class _CharT, class _Alloc>
-    inline bool operator==(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-			   const _Rope_const_iterator<_CharT, _Alloc>& __y)
-    { return (__x._M_current_pos == __y._M_current_pos
-	      && __x._M_root == __y._M_root); }
-
-  template <class _CharT, class _Alloc>
-    inline bool operator<(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-			  const _Rope_const_iterator<_CharT, _Alloc>& __y)
-    { return (__x._M_current_pos < __y._M_current_pos); }
-
-  template <class _CharT, class _Alloc>
-    inline bool operator!=(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-			   const _Rope_const_iterator<_CharT, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  template <class _CharT, class _Alloc>
-    inline bool operator>(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-			  const _Rope_const_iterator<_CharT, _Alloc>& __y)
-    { return __y < __x; }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator<=(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-	       const _Rope_const_iterator<_CharT, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator>=(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-	       const _Rope_const_iterator<_CharT, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  template <class _CharT, class _Alloc>
-    inline ptrdiff_t
-    operator-(const _Rope_const_iterator<_CharT, _Alloc>& __x,
-	      const _Rope_const_iterator<_CharT, _Alloc>& __y)
-    { return (ptrdiff_t)__x._M_current_pos - (ptrdiff_t)__y._M_current_pos; }
-
-  template <class _CharT, class _Alloc>
-    inline _Rope_const_iterator<_CharT, _Alloc>
-    operator-(const _Rope_const_iterator<_CharT, _Alloc>& __x, ptrdiff_t __n)
-    { return _Rope_const_iterator<_CharT, _Alloc>(__x._M_root,
-						  __x._M_current_pos - __n); }
-
-  template <class _CharT, class _Alloc>
-    inline _Rope_const_iterator<_CharT, _Alloc>
-    operator+(const _Rope_const_iterator<_CharT, _Alloc>& __x, ptrdiff_t __n)
-    { return _Rope_const_iterator<_CharT, _Alloc>(__x._M_root,
-						  __x._M_current_pos + __n); }
-
-  template <class _CharT, class _Alloc>
-    inline _Rope_const_iterator<_CharT, _Alloc>
-    operator+(ptrdiff_t __n, const _Rope_const_iterator<_CharT, _Alloc>& __x)
-  { return _Rope_const_iterator<_CharT, _Alloc>(__x._M_root,
-						__x._M_current_pos + __n); }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator==(const _Rope_iterator<_CharT, _Alloc>& __x,
-	       const _Rope_iterator<_CharT, _Alloc>& __y)
-    {return (__x._M_current_pos == __y._M_current_pos
-	     && __x._M_root_rope == __y._M_root_rope); }
-  
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator<(const _Rope_iterator<_CharT, _Alloc>& __x,
-	      const _Rope_iterator<_CharT, _Alloc>& __y)
-    { return (__x._M_current_pos < __y._M_current_pos); }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator!=(const _Rope_iterator<_CharT, _Alloc>& __x,
-	       const _Rope_iterator<_CharT, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator>(const _Rope_iterator<_CharT, _Alloc>& __x,
-	      const _Rope_iterator<_CharT, _Alloc>& __y)
-    { return __y < __x; }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator<=(const _Rope_iterator<_CharT, _Alloc>& __x,
-	       const _Rope_iterator<_CharT, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator>=(const _Rope_iterator<_CharT, _Alloc>& __x,
-	       const _Rope_iterator<_CharT, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  template <class _CharT, class _Alloc>
-    inline ptrdiff_t
-    operator-(const _Rope_iterator<_CharT, _Alloc>& __x,
-	      const _Rope_iterator<_CharT, _Alloc>& __y)
-    { return ((ptrdiff_t)__x._M_current_pos
-	      - (ptrdiff_t)__y._M_current_pos); }
-
-  template <class _CharT, class _Alloc>
-    inline _Rope_iterator<_CharT, _Alloc>
-    operator-(const _Rope_iterator<_CharT, _Alloc>& __x,
-	      ptrdiff_t __n)
-    { return _Rope_iterator<_CharT, _Alloc>(__x._M_root_rope,
-					    __x._M_current_pos - __n); }
-
-  template <class _CharT, class _Alloc>
-    inline _Rope_iterator<_CharT, _Alloc>
-    operator+(const _Rope_iterator<_CharT, _Alloc>& __x, ptrdiff_t __n)
-    { return _Rope_iterator<_CharT, _Alloc>(__x._M_root_rope,
-					    __x._M_current_pos + __n); }
-
-  template <class _CharT, class _Alloc>
-    inline _Rope_iterator<_CharT, _Alloc>
-    operator+(ptrdiff_t __n, const _Rope_iterator<_CharT, _Alloc>& __x)
-    { return _Rope_iterator<_CharT, _Alloc>(__x._M_root_rope,
-					    __x._M_current_pos + __n); }
-
-  template <class _CharT, class _Alloc>
-    inline rope<_CharT, _Alloc>
-    operator+(const rope<_CharT, _Alloc>& __left,
-	      const rope<_CharT, _Alloc>& __right)
-    {
-      // Inlining this should make it possible to keep __left and
-      // __right in registers.
-      typedef rope<_CharT, _Alloc> rope_type;
-      return rope_type(rope_type::_S_concat(__left._M_tree_ptr, 
-					    __right._M_tree_ptr));
-    }
-
-  template <class _CharT, class _Alloc>
-    inline rope<_CharT, _Alloc>&
-    operator+=(rope<_CharT, _Alloc>& __left,
-	       const rope<_CharT, _Alloc>& __right)
-    {
-      __left.append(__right);
-      return __left;
-    }
-
-  template <class _CharT, class _Alloc>
-    inline rope<_CharT, _Alloc>
-    operator+(const rope<_CharT, _Alloc>& __left,
-	      const _CharT* __right)
-    {
-      typedef rope<_CharT, _Alloc> rope_type;
-      size_t __rlen = rope_type::_S_char_ptr_len(__right);
-      return rope_type(rope_type::_S_concat_char_iter(__left._M_tree_ptr,
-						      __right, __rlen));
-    }
-
-  template <class _CharT, class _Alloc>
-    inline rope<_CharT, _Alloc>&
-    operator+=(rope<_CharT, _Alloc>& __left,
-	       const _CharT* __right)
-    {
-      __left.append(__right);
-      return __left;
-    }
-
-  template <class _CharT, class _Alloc>
-    inline rope<_CharT, _Alloc>
-    operator+(const rope<_CharT, _Alloc>& __left, _CharT __right)
-    {
-      typedef rope<_CharT, _Alloc> rope_type;
-      return rope_type(rope_type::_S_concat_char_iter(__left._M_tree_ptr,
-						      &__right, 1));
-    }
-
-  template <class _CharT, class _Alloc>
-    inline rope<_CharT, _Alloc>&
-    operator+=(rope<_CharT, _Alloc>& __left, _CharT __right)
-    {
-      __left.append(__right);
-      return __left;
-    }
-  
-  template <class _CharT, class _Alloc>
-    bool
-    operator<(const rope<_CharT, _Alloc>& __left,
-	      const rope<_CharT, _Alloc>& __right)
-    { return __left.compare(__right) < 0; }
-
-  template <class _CharT, class _Alloc>
-    bool
-    operator==(const rope<_CharT, _Alloc>& __left,
-	       const rope<_CharT, _Alloc>& __right)
-    { return __left.compare(__right) == 0; }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator==(const _Rope_char_ptr_proxy<_CharT, _Alloc>& __x,
-	       const _Rope_char_ptr_proxy<_CharT, _Alloc>& __y)
-    { return (__x._M_pos == __y._M_pos && __x._M_root == __y._M_root); }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator!=(const rope<_CharT, _Alloc>& __x,
-	       const rope<_CharT, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator>(const rope<_CharT, _Alloc>& __x,
-	      const rope<_CharT, _Alloc>& __y)
-    { return __y < __x; }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator<=(const rope<_CharT, _Alloc>& __x,
-	       const rope<_CharT, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator>=(const rope<_CharT, _Alloc>& __x,
-	       const rope<_CharT, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  template <class _CharT, class _Alloc>
-    inline bool
-    operator!=(const _Rope_char_ptr_proxy<_CharT, _Alloc>& __x,
-	       const _Rope_char_ptr_proxy<_CharT, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  template<class _CharT, class _Traits, class _Alloc>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __o,
-	       const rope<_CharT, _Alloc>& __r);
-
-  typedef rope<char> crope;
-  typedef rope<wchar_t> wrope;
-
-  inline crope::reference
-  __mutable_reference_at(crope& __c, size_t __i)
-  { return __c.mutable_reference_at(__i); }
-
-  inline wrope::reference
-  __mutable_reference_at(wrope& __c, size_t __i)
-  { return __c.mutable_reference_at(__i); }
-
-  template <class _CharT, class _Alloc>
-    inline void
-    swap(rope<_CharT, _Alloc>& __x, rope<_CharT, _Alloc>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{ 
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<>
-    struct hash<__gnu_cxx::crope>
-    {
-      size_t
-      operator()(const __gnu_cxx::crope& __str) const
-      {
-	size_t __size = __str.size();
-	if (0 == __size)
-	  return 0;
-	return 13 * __str[0] + 5 * __str[__size - 1] + __size;
-      }
-    };
-
-
-  template<>
-    struct hash<__gnu_cxx::wrope>
-    {
-      size_t
-      operator()(const __gnu_cxx::wrope& __str) const
-      {
-	size_t __size = __str.size();
-	if (0 == __size)
-	  return 0;
-	return 13 * __str[0] + 5 * __str[__size - 1] + __size;
-      }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace tr1
-} // namespace std
-
-# include <ext/ropeimpl.h>
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/ropeimpl.h b/openflow/usr/include/c++/5/ext/ropeimpl.h
deleted file mode 100644
index ceb8bfc..0000000
--- a/openflow/usr/include/c++/5/ext/ropeimpl.h
+++ /dev/null
@@ -1,1703 +0,0 @@
-// SGI's rope class implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ropeimpl.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ext/rope}
- */
-
-#include <cstdio>
-#include <ostream>
-#include <bits/functexcept.h>
-
-#include <ext/algorithm> // For copy_n and lexicographical_compare_3way
-#include <ext/memory> // For uninitialized_copy_n
-#include <ext/numeric> // For power
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::size_t;
-  using std::printf;
-  using std::basic_ostream;
-  using std::__throw_length_error;
-  using std::_Destroy;
-  using std::__uninitialized_fill_n_a;
-
-  // Set buf_start, buf_end, and buf_ptr appropriately, filling tmp_buf
-  // if necessary.  Assumes _M_path_end[leaf_index] and leaf_pos are correct.
-  // Results in a valid buf_ptr if the iterator can be legitimately
-  // dereferenced.
-  template <class _CharT, class _Alloc>
-    void
-    _Rope_iterator_base<_CharT, _Alloc>::
-    _S_setbuf(_Rope_iterator_base<_CharT, _Alloc>& __x)
-    {
-      const _RopeRep* __leaf = __x._M_path_end[__x._M_leaf_index];
-      size_t __leaf_pos = __x._M_leaf_pos;
-      size_t __pos = __x._M_current_pos;
-
-      switch(__leaf->_M_tag)
-	{
-	case __detail::_S_leaf:
-	  __x._M_buf_start = ((_Rope_RopeLeaf<_CharT, _Alloc>*)__leaf)->_M_data;
-	  __x._M_buf_ptr = __x._M_buf_start + (__pos - __leaf_pos);
-	  __x._M_buf_end = __x._M_buf_start + __leaf->_M_size;
-	  break;
-	case __detail::_S_function:
-	case __detail::_S_substringfn:
-	  {
-	    size_t __len = _S_iterator_buf_len;
-	    size_t __buf_start_pos = __leaf_pos;
-	    size_t __leaf_end = __leaf_pos + __leaf->_M_size;
-	    char_producer<_CharT>* __fn = ((_Rope_RopeFunction<_CharT,
-					    _Alloc>*)__leaf)->_M_fn;
-	    if (__buf_start_pos + __len <= __pos)
-	      {
-		__buf_start_pos = __pos - __len / 4;
-		if (__buf_start_pos + __len > __leaf_end)
-		  __buf_start_pos = __leaf_end - __len;
-	      }
-	    if (__buf_start_pos + __len > __leaf_end)
-	      __len = __leaf_end - __buf_start_pos;
-	    (*__fn)(__buf_start_pos - __leaf_pos, __len, __x._M_tmp_buf);
-	    __x._M_buf_ptr = __x._M_tmp_buf + (__pos - __buf_start_pos);
-	    __x._M_buf_start = __x._M_tmp_buf;
-	    __x._M_buf_end = __x._M_tmp_buf + __len;
-	  }
-	  break;
-	default:
-	  break;
-	}
-    }
-
-  // Set path and buffer inside a rope iterator.  We assume that
-  // pos and root are already set.
-  template <class _CharT, class _Alloc>
-    void
-    _Rope_iterator_base<_CharT, _Alloc>::
-    _S_setcache(_Rope_iterator_base<_CharT, _Alloc>& __x)
-    {
-      const _RopeRep* __path[int(__detail::_S_max_rope_depth) + 1];
-      const _RopeRep* __curr_rope;
-      int __curr_depth = -1;  /* index into path    */
-      size_t __curr_start_pos = 0;
-      size_t __pos = __x._M_current_pos;
-      unsigned char __dirns = 0; // Bit vector marking right turns in the path
-
-      if (__pos >= __x._M_root->_M_size)
-	{
-	  __x._M_buf_ptr = 0;
-	  return;
-	}
-      __curr_rope = __x._M_root;
-      if (0 != __curr_rope->_M_c_string)
-	{
-	  /* Treat the root as a leaf. */
-	  __x._M_buf_start = __curr_rope->_M_c_string;
-	  __x._M_buf_end = __curr_rope->_M_c_string + __curr_rope->_M_size;
-	  __x._M_buf_ptr = __curr_rope->_M_c_string + __pos;
-	  __x._M_path_end[0] = __curr_rope;
-	  __x._M_leaf_index = 0;
-	  __x._M_leaf_pos = 0;
-	  return;
-	}
-      for(;;)
-	{
-	  ++__curr_depth;
-	  __path[__curr_depth] = __curr_rope;
-	  switch(__curr_rope->_M_tag)
-	    {
-	    case __detail::_S_leaf:
-	    case __detail::_S_function:
-	    case __detail::_S_substringfn:
-	      __x._M_leaf_pos = __curr_start_pos;
-	      goto done;
-	    case __detail::_S_concat:
-	      {
-		_Rope_RopeConcatenation<_CharT, _Alloc>* __c =
-		  (_Rope_RopeConcatenation<_CharT, _Alloc>*)__curr_rope;
-		_RopeRep* __left = __c->_M_left;
-		size_t __left_len = __left->_M_size;
-
-		__dirns <<= 1;
-		if (__pos >= __curr_start_pos + __left_len)
-		  {
-		    __dirns |= 1;
-		    __curr_rope = __c->_M_right;
-		    __curr_start_pos += __left_len;
-		  }
-		else
-		  __curr_rope = __left;
-	      }
-	      break;
-	    }
-	}
-    done:
-      // Copy last section of path into _M_path_end.
-      {
-	int __i = -1;
-	int __j = __curr_depth + 1 - int(_S_path_cache_len);
-
-	if (__j < 0) __j = 0;
-	while (__j <= __curr_depth)
-	  __x._M_path_end[++__i] = __path[__j++];
-	__x._M_leaf_index = __i;
-      }
-      __x._M_path_directions = __dirns;
-      _S_setbuf(__x);
-    }
-
-  // Specialized version of the above.  Assumes that
-  // the path cache is valid for the previous position.
-  template <class _CharT, class _Alloc>
-    void
-    _Rope_iterator_base<_CharT, _Alloc>::
-    _S_setcache_for_incr(_Rope_iterator_base<_CharT, _Alloc>& __x)
-    {
-      int __current_index = __x._M_leaf_index;
-      const _RopeRep* __current_node = __x._M_path_end[__current_index];
-      size_t __len = __current_node->_M_size;
-      size_t __node_start_pos = __x._M_leaf_pos;
-      unsigned char __dirns = __x._M_path_directions;
-      _Rope_RopeConcatenation<_CharT, _Alloc>* __c;
-
-      if (__x._M_current_pos - __node_start_pos < __len)
-	{
-	  /* More stuff in this leaf, we just didn't cache it. */
-	  _S_setbuf(__x);
-	  return;
-	}
-      //  node_start_pos is starting position of last_node.
-      while (--__current_index >= 0)
-	{
-	  if (!(__dirns & 1) /* Path turned left */)
-	    break;
-	  __current_node = __x._M_path_end[__current_index];
-	  __c = (_Rope_RopeConcatenation<_CharT, _Alloc>*)__current_node;
-	  // Otherwise we were in the right child.  Thus we should pop
-	  // the concatenation node.
-	  __node_start_pos -= __c->_M_left->_M_size;
-	  __dirns >>= 1;
-	}
-      if (__current_index < 0)
-	{
-	  // We underflowed the cache. Punt.
-	  _S_setcache(__x);
-	  return;
-	}
-      __current_node = __x._M_path_end[__current_index];
-      __c = (_Rope_RopeConcatenation<_CharT, _Alloc>*)__current_node;
-      // current_node is a concatenation node.  We are positioned on the first
-      // character in its right child.
-      // node_start_pos is starting position of current_node.
-      __node_start_pos += __c->_M_left->_M_size;
-      __current_node = __c->_M_right;
-      __x._M_path_end[++__current_index] = __current_node;
-      __dirns |= 1;
-      while (__detail::_S_concat == __current_node->_M_tag)
-	{
-	  ++__current_index;
-	  if (int(_S_path_cache_len) == __current_index)
-	    {
-	      int __i;
-	      for (__i = 0; __i < int(_S_path_cache_len) - 1; __i++)
-		__x._M_path_end[__i] = __x._M_path_end[__i+1];
-	      --__current_index;
-	    }
-	  __current_node =
-	    ((_Rope_RopeConcatenation<_CharT, _Alloc>*)__current_node)->_M_left;
-	  __x._M_path_end[__current_index] = __current_node;
-	  __dirns <<= 1;
-	  // node_start_pos is unchanged.
-	}
-      __x._M_leaf_index = __current_index;
-      __x._M_leaf_pos = __node_start_pos;
-      __x._M_path_directions = __dirns;
-      _S_setbuf(__x);
-    }
-
-  template <class _CharT, class _Alloc>
-    void
-    _Rope_iterator_base<_CharT, _Alloc>::
-    _M_incr(size_t __n)
-    {
-      _M_current_pos += __n;
-      if (0 != _M_buf_ptr)
-	{
-	  size_t __chars_left = _M_buf_end - _M_buf_ptr;
-	  if (__chars_left > __n)
-	    _M_buf_ptr += __n;
-	  else if (__chars_left == __n)
-	    {
-	      _M_buf_ptr += __n;
-	      _S_setcache_for_incr(*this);
-	    }
-	  else
-	    _M_buf_ptr = 0;
-	}
-    }
-
-  template <class _CharT, class _Alloc>
-    void
-    _Rope_iterator_base<_CharT, _Alloc>::
-    _M_decr(size_t __n)
-    {
-      if (0 != _M_buf_ptr)
-	{
-	  size_t __chars_left = _M_buf_ptr - _M_buf_start;
-	  if (__chars_left >= __n)
-	    _M_buf_ptr -= __n;
-	  else
-	    _M_buf_ptr = 0;
-	}
-      _M_current_pos -= __n;
-    }
-
-  template <class _CharT, class _Alloc>
-    void
-    _Rope_iterator<_CharT, _Alloc>::
-    _M_check()
-    {
-      if (_M_root_rope->_M_tree_ptr != this->_M_root)
-	{
-	  // _Rope was modified.  Get things fixed up.
-	  _RopeRep::_S_unref(this->_M_root);
-	  this->_M_root = _M_root_rope->_M_tree_ptr;
-	  _RopeRep::_S_ref(this->_M_root);
-	  this->_M_buf_ptr = 0;
-	}
-    }
-
-  template <class _CharT, class _Alloc>
-    inline
-    _Rope_const_iterator<_CharT, _Alloc>::
-    _Rope_const_iterator(const _Rope_iterator<_CharT, _Alloc>& __x)
-    : _Rope_iterator_base<_CharT, _Alloc>(__x)
-    { }
-
-  template <class _CharT, class _Alloc>
-    inline
-    _Rope_iterator<_CharT, _Alloc>::
-    _Rope_iterator(rope<_CharT, _Alloc>& __r, size_t __pos)
-    : _Rope_iterator_base<_CharT,_Alloc>(__r._M_tree_ptr, __pos),
-      _M_root_rope(&__r)
-    { _RopeRep::_S_ref(this->_M_root); }
-
-  template <class _CharT, class _Alloc>
-    inline size_t
-    rope<_CharT, _Alloc>::
-    _S_char_ptr_len(const _CharT* __s)
-    {
-      const _CharT* __p = __s;
-      
-      while (!_S_is0(*__p))
-	++__p;
-      return (__p - __s);
-    }
-
-
-#ifndef __GC
-
-  template <class _CharT, class _Alloc>
-    inline void
-    _Rope_RopeRep<_CharT, _Alloc>::
-    _M_free_c_string()
-    {
-      _CharT* __cstr = _M_c_string;
-      if (0 != __cstr)
-	{
-	  size_t __size = this->_M_size + 1;
-	  _Destroy(__cstr, __cstr + __size, _M_get_allocator());
-	  this->_Data_deallocate(__cstr, __size);
-	}
-    }
-
-  template <class _CharT, class _Alloc>
-    inline void
-    _Rope_RopeRep<_CharT, _Alloc>::
-    _S_free_string(_CharT* __s, size_t __n, allocator_type& __a)
-    {
-      if (!_S_is_basic_char_type((_CharT*)0))
-	_Destroy(__s, __s + __n, __a);
-      
-      //  This has to be a static member, so this gets a bit messy
-      __a.deallocate(__s,
-		     _Rope_RopeLeaf<_CharT, _Alloc>::_S_rounded_up_size(__n));
-    }
-
-  //  There are several reasons for not doing this with virtual destructors
-  //  and a class specific delete operator:
-  //  - A class specific delete operator can't easily get access to
-  //    allocator instances if we need them.
-  //  - Any virtual function would need a 4 or byte vtable pointer;
-  //    this only requires a one byte tag per object.
-  template <class _CharT, class _Alloc>
-    void
-    _Rope_RopeRep<_CharT, _Alloc>::
-    _M_free_tree()
-    {
-      switch(_M_tag)
-	{
-	case __detail::_S_leaf:
-	  {
-	    _Rope_RopeLeaf<_CharT, _Alloc>* __l
-	      = (_Rope_RopeLeaf<_CharT, _Alloc>*)this;
-	    __l->_Rope_RopeLeaf<_CharT, _Alloc>::~_Rope_RopeLeaf();
-	    this->_L_deallocate(__l, 1);
-	    break;
-	  }
-	case __detail::_S_concat:
-	  {
-	    _Rope_RopeConcatenation<_CharT,_Alloc>* __c
-	      = (_Rope_RopeConcatenation<_CharT, _Alloc>*)this;
-	    __c->_Rope_RopeConcatenation<_CharT, _Alloc>::
-	      ~_Rope_RopeConcatenation();
-	    this->_C_deallocate(__c, 1);
-	    break;
-	  }
-	case __detail::_S_function:
-	  {
-	    _Rope_RopeFunction<_CharT, _Alloc>* __f
-	      = (_Rope_RopeFunction<_CharT, _Alloc>*)this;
-	    __f->_Rope_RopeFunction<_CharT, _Alloc>::~_Rope_RopeFunction();
-	    this->_F_deallocate(__f, 1);
-	    break;
-	  }
-	case __detail::_S_substringfn:
-	  {
-	    _Rope_RopeSubstring<_CharT, _Alloc>* __ss =
-	      (_Rope_RopeSubstring<_CharT, _Alloc>*)this;
-	    __ss->_Rope_RopeSubstring<_CharT, _Alloc>::
-	      ~_Rope_RopeSubstring();
-	    this->_S_deallocate(__ss, 1);
-	    break;
-	  }
-	}
-    }
-#else
-
-  template <class _CharT, class _Alloc>
-    inline void
-    _Rope_RopeRep<_CharT, _Alloc>::
-    _S_free_string(const _CharT*, size_t, allocator_type)
-    { }
-
-#endif
-
-  // Concatenate a C string onto a leaf rope by copying the rope data.
-  // Used for short ropes.
-  template <class _CharT, class _Alloc>
-    typename rope<_CharT, _Alloc>::_RopeLeaf*
-    rope<_CharT, _Alloc>::
-    _S_leaf_concat_char_iter(_RopeLeaf* __r, const _CharT* __iter, size_t __len)
-    {
-      size_t __old_len = __r->_M_size;
-      _CharT* __new_data = (_CharT*)
-	rope::_Data_allocate(_S_rounded_up_size(__old_len + __len));
-      _RopeLeaf* __result;
-
-      uninitialized_copy_n(__r->_M_data, __old_len, __new_data);
-      uninitialized_copy_n(__iter, __len, __new_data + __old_len);
-      _S_cond_store_eos(__new_data[__old_len + __len]);
-      __try
-	{
-	  __result = _S_new_RopeLeaf(__new_data, __old_len + __len,
-				     __r->_M_get_allocator());
-	}
-      __catch(...)
-	{
-	  _RopeRep::__STL_FREE_STRING(__new_data, __old_len + __len,
-				      __r->_M_get_allocator());
-	  __throw_exception_again;
-	}
-      return __result;
-    }
-
-#ifndef __GC
-  // As above, but it's OK to clobber original if refcount is 1
-  template <class _CharT, class _Alloc>
-    typename rope<_CharT,_Alloc>::_RopeLeaf*
-    rope<_CharT, _Alloc>::
-    _S_destr_leaf_concat_char_iter(_RopeLeaf* __r, const _CharT* __iter,
-				   size_t __len)
-    {
-      if (__r->_M_ref_count > 1)
-	return _S_leaf_concat_char_iter(__r, __iter, __len);
-      size_t __old_len = __r->_M_size;
-      if (_S_allocated_capacity(__old_len) >= __old_len + __len)
-	{
-	  // The space has been partially initialized for the standard
-	  // character types.  But that doesn't matter for those types.
-	  uninitialized_copy_n(__iter, __len, __r->_M_data + __old_len);
-	  if (_S_is_basic_char_type((_CharT*)0))
-	    _S_cond_store_eos(__r->_M_data[__old_len + __len]);
-	  else if (__r->_M_c_string != __r->_M_data && 0 != __r->_M_c_string)
-	    {
-	      __r->_M_free_c_string();
-	      __r->_M_c_string = 0;
-	    }
-	  __r->_M_size = __old_len + __len;
-	  __r->_M_ref_count = 2;
-	  return __r;
-	}
-      else
-	{
-	  _RopeLeaf* __result = _S_leaf_concat_char_iter(__r, __iter, __len);
-	  return __result;
-	}
-    }
-#endif
-
-  // Assumes left and right are not 0.
-  // Does not increment (nor decrement on exception) child reference counts.
-  // Result has ref count 1.
-  template <class _CharT, class _Alloc>
-    typename rope<_CharT, _Alloc>::_RopeRep*
-    rope<_CharT, _Alloc>::
-    _S_tree_concat(_RopeRep* __left, _RopeRep* __right)
-    {
-      _RopeConcatenation* __result = _S_new_RopeConcatenation(__left, __right,
-							      __left->
-							      _M_get_allocator());
-      size_t __depth = __result->_M_depth;
-      
-      if (__depth > 20
-	  && (__result->_M_size < 1000
-	      || __depth > size_t(__detail::_S_max_rope_depth)))
-	{
-	  _RopeRep* __balanced;
-
-	  __try
-	    {
-	      __balanced = _S_balance(__result);
-	      __result->_M_unref_nonnil();
-	    }
-	  __catch(...)
-	    {
-	      rope::_C_deallocate(__result,1);
-	      __throw_exception_again;
-	    }
-	  // In case of exception, we need to deallocate
-	  // otherwise dangling result node.  But caller
-	  // still owns its children.  Thus unref is
-	  // inappropriate.
-	  return __balanced;
-	}
-      else
-	return __result;
-    }
-
-  template <class _CharT, class _Alloc>
-    typename rope<_CharT, _Alloc>::_RopeRep*
-    rope<_CharT, _Alloc>::
-    _S_concat_char_iter(_RopeRep* __r, const _CharT*__s, size_t __slen)
-    {
-      _RopeRep* __result;
-      if (0 == __slen)
-	{
-	  _S_ref(__r);
-	  return __r;
-	}
-      if (0 == __r)
-	return __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen,
-						__r->_M_get_allocator());
-      if (__r->_M_tag == __detail::_S_leaf
-	  && __r->_M_size + __slen <= size_t(_S_copy_max))
-	{
-	  __result = _S_leaf_concat_char_iter((_RopeLeaf*)__r, __s, __slen);
-	  return __result;
-	}
-      if (__detail::_S_concat == __r->_M_tag
-	  && __detail::_S_leaf == ((_RopeConcatenation*) __r)->_M_right->_M_tag)
-	{
-	  _RopeLeaf* __right =
-	    (_RopeLeaf* )(((_RopeConcatenation* )__r)->_M_right);
-	  if (__right->_M_size + __slen <= size_t(_S_copy_max))
-	    {
-	      _RopeRep* __left = ((_RopeConcatenation*)__r)->_M_left;
-	      _RopeRep* __nright =
-		_S_leaf_concat_char_iter((_RopeLeaf*)__right, __s, __slen);
-	      __left->_M_ref_nonnil();
-	      __try
-		{ __result = _S_tree_concat(__left, __nright); }
-	      __catch(...)
-		{
-		  _S_unref(__left);
-		  _S_unref(__nright);
-		  __throw_exception_again;
-		}
-	      return __result;
-	    }
-	}
-      _RopeRep* __nright =
-	__STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen, __r->_M_get_allocator());
-      __try
-	{
-	  __r->_M_ref_nonnil();
-	  __result = _S_tree_concat(__r, __nright);
-	}
-      __catch(...)
-	{
-	  _S_unref(__r);
-	  _S_unref(__nright);
-	  __throw_exception_again;
-	}
-      return __result;
-    }
-
-#ifndef __GC
-  template <class _CharT, class _Alloc>
-    typename rope<_CharT,_Alloc>::_RopeRep*
-    rope<_CharT,_Alloc>::
-    _S_destr_concat_char_iter(_RopeRep* __r, const _CharT* __s, size_t __slen)
-    {
-      _RopeRep* __result;
-      if (0 == __r)
-	return __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen,
-						__r->_M_get_allocator());
-      size_t __count = __r->_M_ref_count;
-      size_t __orig_size = __r->_M_size;
-      if (__count > 1)
-	return _S_concat_char_iter(__r, __s, __slen);
-      if (0 == __slen)
-	{
-	  __r->_M_ref_count = 2;      // One more than before
-	  return __r;
-	}
-      if (__orig_size + __slen <= size_t(_S_copy_max)
-	  && __detail::_S_leaf == __r->_M_tag)
-	{
-	  __result = _S_destr_leaf_concat_char_iter((_RopeLeaf*)__r, __s, 
-						    __slen);
-	  return __result;
-	}
-      if (__detail::_S_concat == __r->_M_tag)
-	{
-	  _RopeLeaf* __right = (_RopeLeaf*)(((_RopeConcatenation*)
-					     __r)->_M_right);
-	  if (__detail::_S_leaf == __right->_M_tag
-	      && __right->_M_size + __slen <= size_t(_S_copy_max))
-	    {
-	      _RopeRep* __new_right =
-		_S_destr_leaf_concat_char_iter(__right, __s, __slen);
-	      if (__right == __new_right)
-		__new_right->_M_ref_count = 1;
-	      else
-		__right->_M_unref_nonnil();
-	      __r->_M_ref_count = 2;    // One more than before.
-	      ((_RopeConcatenation*)__r)->_M_right = __new_right;
-	      __r->_M_size = __orig_size + __slen;
-	      if (0 != __r->_M_c_string)
-		{
-		  __r->_M_free_c_string();
-		  __r->_M_c_string = 0;
-		}
-	      return __r;
-	    }
-	}
-      _RopeRep* __right =
-	__STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen, __r->_M_get_allocator());
-      __r->_M_ref_nonnil();
-      __try
-	{ __result = _S_tree_concat(__r, __right); }
-      __catch(...)
-	{
-	  _S_unref(__r);
-	  _S_unref(__right);
-	  __throw_exception_again;
-	}
-      return __result;
-    }
-#endif /* !__GC */
-  
-  template <class _CharT, class _Alloc>
-    typename rope<_CharT, _Alloc>::_RopeRep*
-    rope<_CharT, _Alloc>::
-    _S_concat(_RopeRep* __left, _RopeRep* __right)
-    {
-      if (0 == __left)
-	{
-	  _S_ref(__right);
-	  return __right;
-	}
-      if (0 == __right)
-	{
-	  __left->_M_ref_nonnil();
-	  return __left;
-	}
-      if (__detail::_S_leaf == __right->_M_tag)
-	{
-	  if (__detail::_S_leaf == __left->_M_tag)
-	    {
-	      if (__right->_M_size + __left->_M_size <= size_t(_S_copy_max))
-		return _S_leaf_concat_char_iter((_RopeLeaf*)__left,
-						((_RopeLeaf*)__right)->_M_data,
-						__right->_M_size);
-	    }
-	  else if (__detail::_S_concat == __left->_M_tag
-		   && __detail::_S_leaf == ((_RopeConcatenation*)
-						   __left)->_M_right->_M_tag)
-	    {
-	      _RopeLeaf* __leftright =
-		(_RopeLeaf*)(((_RopeConcatenation*)__left)->_M_right);
-	      if (__leftright->_M_size
-		  + __right->_M_size <= size_t(_S_copy_max))
-		{
-		  _RopeRep* __leftleft = ((_RopeConcatenation*)__left)->_M_left;
-		  _RopeRep* __rest = _S_leaf_concat_char_iter(__leftright,
-							      ((_RopeLeaf*)
-							       __right)->
-							      _M_data,
-							      __right->_M_size);
-		  __leftleft->_M_ref_nonnil();
-		  __try
-		    { return(_S_tree_concat(__leftleft, __rest)); }
-		  __catch(...)
-		    {
-		      _S_unref(__leftleft);
-		      _S_unref(__rest);
-		      __throw_exception_again;
-		    }
-		}
-	    }
-	}
-      __left->_M_ref_nonnil();
-      __right->_M_ref_nonnil();
-      __try
-	{ return(_S_tree_concat(__left, __right)); }
-      __catch(...)
-	{
-	  _S_unref(__left);
-	  _S_unref(__right);
-	  __throw_exception_again;
-	}
-    }
-
-  template <class _CharT, class _Alloc>
-    typename rope<_CharT, _Alloc>::_RopeRep*
-    rope<_CharT, _Alloc>::
-    _S_substring(_RopeRep* __base, size_t __start, size_t __endp1)
-    {
-      if (0 == __base)
-	return 0;
-      size_t __len = __base->_M_size;
-      size_t __adj_endp1;
-      const size_t __lazy_threshold = 128;
-      
-      if (__endp1 >= __len)
-	{
-	  if (0 == __start)
-	    {
-	      __base->_M_ref_nonnil();
-	      return __base;
-	    }
-	  else
-	    __adj_endp1 = __len;
-	  
-	}
-      else
-	__adj_endp1 = __endp1;
-
-      switch(__base->_M_tag)
-	{
-	case __detail::_S_concat:
-	    {
-	      _RopeConcatenation* __c = (_RopeConcatenation*)__base;
-	      _RopeRep* __left = __c->_M_left;
-	      _RopeRep* __right = __c->_M_right;
-	      size_t __left_len = __left->_M_size;
-	      _RopeRep* __result;
-	      
-	      if (__adj_endp1 <= __left_len)
-		return _S_substring(__left, __start, __endp1);
-	      else if (__start >= __left_len)
-		return _S_substring(__right, __start - __left_len,
-				    __adj_endp1 - __left_len);
-	      _Self_destruct_ptr __left_result(_S_substring(__left,
-							    __start,
-							    __left_len));
-	      _Self_destruct_ptr __right_result(_S_substring(__right, 0,
-							     __endp1 
-							     - __left_len));
-	      __result = _S_concat(__left_result, __right_result);
-	      return __result;
-	    }
-	case __detail::_S_leaf:
-	  {
-	    _RopeLeaf* __l = (_RopeLeaf*)__base;
-	    _RopeLeaf* __result;
-	    size_t __result_len;
-	    if (__start >= __adj_endp1)
-	      return 0;
-	    __result_len = __adj_endp1 - __start;
-	    if (__result_len > __lazy_threshold)
-	      goto lazy;
-#ifdef __GC
-	    const _CharT* __section = __l->_M_data + __start;
-	    __result = _S_new_RopeLeaf(__section, __result_len,
-				       __base->_M_get_allocator());
-	    __result->_M_c_string = 0;  // Not eos terminated.
-#else
-	    // We should sometimes create substring node instead.
-	    __result = __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__l->_M_data + __start,
-							__result_len,
-							__base->
-							_M_get_allocator());
-#endif
-	    return __result;
-	  }
-	case __detail::_S_substringfn:
-	  // Avoid introducing multiple layers of substring nodes.
-	  {
-	    _RopeSubstring* __old = (_RopeSubstring*)__base;
-	    size_t __result_len;
-	    if (__start >= __adj_endp1)
-	      return 0;
-	    __result_len = __adj_endp1 - __start;
-	    if (__result_len > __lazy_threshold)
-	      {
-		_RopeSubstring* __result =
-		  _S_new_RopeSubstring(__old->_M_base,
-				       __start + __old->_M_start,
-				       __adj_endp1 - __start,
-				       __base->_M_get_allocator());
-		return __result;
-		
-	      } // *** else fall through: ***
-	  }
-	case __detail::_S_function:
-	  {
-	    _RopeFunction* __f = (_RopeFunction*)__base;
-	    _CharT* __section;
-	    size_t __result_len;
-	    if (__start >= __adj_endp1)
-	      return 0;
-	    __result_len = __adj_endp1 - __start;
-	    
-	    if (__result_len > __lazy_threshold)
-	      goto lazy;
-	    __section = (_CharT*)
-	      rope::_Data_allocate(_S_rounded_up_size(__result_len));
-	    __try
-	      {	(*(__f->_M_fn))(__start, __result_len, __section); }
-	    __catch(...)
-	      {
-		_RopeRep::__STL_FREE_STRING(__section, __result_len,
-					    __base->_M_get_allocator());
-		__throw_exception_again;
-	      }
-	    _S_cond_store_eos(__section[__result_len]);
-	    return _S_new_RopeLeaf(__section, __result_len,
-				   __base->_M_get_allocator());
-	  }
-	}
-    lazy:
-      {
-	// Create substring node.
-	return _S_new_RopeSubstring(__base, __start, __adj_endp1 - __start,
-				    __base->_M_get_allocator());
-      }
-    }
-
-  template<class _CharT>
-    class _Rope_flatten_char_consumer
-    : public _Rope_char_consumer<_CharT>
-    {
-    private:
-      _CharT* _M_buf_ptr;
-    public:
-      
-      _Rope_flatten_char_consumer(_CharT* __buffer)
-      { _M_buf_ptr = __buffer; };
-
-      ~_Rope_flatten_char_consumer() {}
-      
-      bool
-      operator()(const _CharT* __leaf, size_t __n)
-      {
-	uninitialized_copy_n(__leaf, __n, _M_buf_ptr);
-	_M_buf_ptr += __n;
-	return true;
-      }
-    };
-
-  template<class _CharT>
-    class _Rope_find_char_char_consumer
-    : public _Rope_char_consumer<_CharT>
-    {
-    private:
-      _CharT _M_pattern;
-    public:
-      size_t _M_count;  // Number of nonmatching characters
-      
-      _Rope_find_char_char_consumer(_CharT __p)
-      : _M_pattern(__p), _M_count(0) {}
-	
-      ~_Rope_find_char_char_consumer() {}
-      
-      bool
-      operator()(const _CharT* __leaf, size_t __n)
-      {
-	size_t __i;
-	for (__i = 0; __i < __n; __i++)
-	  {
-	    if (__leaf[__i] == _M_pattern)
-	      {
-		_M_count += __i;
-		return false;
-	      }
-	  }
-	_M_count += __n; return true;
-      }
-    };
-
-  template<class _CharT, class _Traits>
-  // Here _CharT is both the stream and rope character type.
-    class _Rope_insert_char_consumer
-    : public _Rope_char_consumer<_CharT>
-    {
-    private:
-      typedef basic_ostream<_CharT,_Traits> _Insert_ostream;
-      _Insert_ostream& _M_o;
-    public:
-      _Rope_insert_char_consumer(_Insert_ostream& __writer)
-	: _M_o(__writer) {};
-      ~_Rope_insert_char_consumer() { };
-      // Caller is presumed to own the ostream
-      bool operator() (const _CharT* __leaf, size_t __n);
-      // Returns true to continue traversal.
-    };
-
-  template<class _CharT, class _Traits>
-    bool
-    _Rope_insert_char_consumer<_CharT, _Traits>::
-    operator()(const _CharT* __leaf, size_t __n)
-    {
-      size_t __i;
-      //  We assume that formatting is set up correctly for each element.
-      for (__i = 0; __i < __n; __i++)
-	_M_o.put(__leaf[__i]);
-      return true;
-    }
-
-  template <class _CharT, class _Alloc>
-    bool
-    rope<_CharT, _Alloc>::
-    _S_apply_to_pieces(_Rope_char_consumer<_CharT>& __c,
-		       const _RopeRep* __r, size_t __begin, size_t __end)
-    {
-      if (0 == __r)
-	return true;
-      switch(__r->_M_tag)
-	{
-	case __detail::_S_concat:
-	  {
-	    _RopeConcatenation* __conc = (_RopeConcatenation*)__r;
-	    _RopeRep* __left =  __conc->_M_left;
-	    size_t __left_len = __left->_M_size;
-	    if (__begin < __left_len)
-	      {
-		size_t __left_end = std::min(__left_len, __end);
-		if (!_S_apply_to_pieces(__c, __left, __begin, __left_end))
-		  return false;
-	      }
-	    if (__end > __left_len)
-	      {
-		_RopeRep* __right =  __conc->_M_right;
-		size_t __right_start = std::max(__left_len, __begin);
-		if (!_S_apply_to_pieces(__c, __right,
-					__right_start - __left_len,
-					__end - __left_len))
-		  return false;
-	      }
-	  }
-	  return true;
-	case __detail::_S_leaf:
-	  {
-	    _RopeLeaf* __l = (_RopeLeaf*)__r;
-	    return __c(__l->_M_data + __begin, __end - __begin);
-	  }
-	case __detail::_S_function:
-	case __detail::_S_substringfn:
-	    {
-	      _RopeFunction* __f = (_RopeFunction*)__r;
-	      size_t __len = __end - __begin;
-	      bool __result;
-	      _CharT* __buffer =
-		(_CharT*)_Alloc().allocate(__len * sizeof(_CharT));
-	      __try
-		{
-		  (*(__f->_M_fn))(__begin, __len, __buffer);
-		  __result = __c(__buffer, __len);
-                  _Alloc().deallocate(__buffer, __len * sizeof(_CharT));
-                }
-	      __catch(...)
-		{
-		  _Alloc().deallocate(__buffer, __len * sizeof(_CharT));
-		  __throw_exception_again;
-		}
-	      return __result;
-	    }
-	default:
-	  return false;
-	}
-    }
-
-  template<class _CharT, class _Traits>
-    inline void
-    _Rope_fill(basic_ostream<_CharT, _Traits>& __o, size_t __n)
-    {
-      char __f = __o.fill();
-      size_t __i;
-      
-      for (__i = 0; __i < __n; __i++)
-	__o.put(__f);
-    }
-
-
-  template <class _CharT>
-    inline bool
-    _Rope_is_simple(_CharT*)
-    { return false; }
-
-  inline bool
-  _Rope_is_simple(char*)
-  { return true; }
-
-  inline bool
-  _Rope_is_simple(wchar_t*)
-  { return true; }
-
-  template<class _CharT, class _Traits, class _Alloc>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __o,
-	       const rope<_CharT, _Alloc>& __r)
-    {
-      size_t __w = __o.width();
-      bool __left = bool(__o.flags() & std::ios::left);
-      size_t __pad_len;
-      size_t __rope_len = __r.size();
-      _Rope_insert_char_consumer<_CharT, _Traits> __c(__o);
-      bool __is_simple = _Rope_is_simple((_CharT*)0);
-      
-      if (__rope_len < __w)
-	__pad_len = __w - __rope_len;
-      else
-	__pad_len = 0;
-
-      if (!__is_simple)
-	__o.width(__w / __rope_len);
-      __try
-	{
-	  if (__is_simple && !__left && __pad_len > 0)
-	    _Rope_fill(__o, __pad_len);
-	  __r.apply_to_pieces(0, __r.size(), __c);
-	  if (__is_simple && __left && __pad_len > 0)
-	    _Rope_fill(__o, __pad_len);
-	  if (!__is_simple)
-	    __o.width(__w);
-	}
-      __catch(...)
-	{
-	  if (!__is_simple)
-	    __o.width(__w);
-	  __throw_exception_again;
-	}
-      return __o;
-    }
-
-  template <class _CharT, class _Alloc>
-    _CharT*
-    rope<_CharT, _Alloc>::
-    _S_flatten(_RopeRep* __r, size_t __start, size_t __len,
-	       _CharT* __buffer)
-    {
-      _Rope_flatten_char_consumer<_CharT> __c(__buffer);
-      _S_apply_to_pieces(__c, __r, __start, __start + __len);
-      return(__buffer + __len);
-    }
-
-  template <class _CharT, class _Alloc>
-    size_t
-    rope<_CharT, _Alloc>::
-    find(_CharT __pattern, size_t __start) const
-    {
-      _Rope_find_char_char_consumer<_CharT> __c(__pattern);
-      _S_apply_to_pieces(__c, this->_M_tree_ptr, __start, size());
-      size_type __result_pos = __start + __c._M_count;
-#ifndef __STL_OLD_ROPE_SEMANTICS
-      if (__result_pos == size())
-	__result_pos = npos;
-#endif
-      return __result_pos;
-    }
-
-  template <class _CharT, class _Alloc>
-    _CharT*
-    rope<_CharT, _Alloc>::
-    _S_flatten(_RopeRep* __r, _CharT* __buffer)
-    {
-      if (0 == __r)
-	return __buffer;
-      switch(__r->_M_tag)
-	{
-	case __detail::_S_concat:
-	  {
-	    _RopeConcatenation* __c = (_RopeConcatenation*)__r;
-	    _RopeRep* __left = __c->_M_left;
-	    _RopeRep* __right = __c->_M_right;
-	    _CharT* __rest = _S_flatten(__left, __buffer);
-	    return _S_flatten(__right, __rest);
-	  }
-	case __detail::_S_leaf:
-	  {
-	    _RopeLeaf* __l = (_RopeLeaf*)__r;
-	    return copy_n(__l->_M_data, __l->_M_size, __buffer).second;
-	  }
-	case __detail::_S_function:
-	case __detail::_S_substringfn:
-	  // We don't yet do anything with substring nodes.
-	  // This needs to be fixed before ropefiles will work well.
-	  {
-	    _RopeFunction* __f = (_RopeFunction*)__r;
-	    (*(__f->_M_fn))(0, __f->_M_size, __buffer);
-	    return __buffer + __f->_M_size;
-	  }
-	default:
-	  return 0;
-	}
-    }
-
-  // This needs work for _CharT != char
-  template <class _CharT, class _Alloc>
-    void
-    rope<_CharT, _Alloc>::
-    _S_dump(_RopeRep* __r, int __indent)
-    {
-      for (int __i = 0; __i < __indent; __i++)
-	putchar(' ');
-      if (0 == __r)
-	{
-	  printf("NULL\n");
-	  return;
-	}
-      if (_S_concat == __r->_M_tag)
-	{
-	  _RopeConcatenation* __c = (_RopeConcatenation*)__r;
-	  _RopeRep* __left = __c->_M_left;
-	  _RopeRep* __right = __c->_M_right;
-	  
-#ifdef __GC
-	  printf("Concatenation %p (depth = %d, len = %ld, %s balanced)\n",
-		 __r, __r->_M_depth, __r->_M_size,
-		 __r->_M_is_balanced? "" : "not");
-#else
-	  printf("Concatenation %p (rc = %ld, depth = %d, "
-		 "len = %ld, %s balanced)\n",
-		 __r, __r->_M_ref_count, __r->_M_depth, __r->_M_size,
-		 __r->_M_is_balanced? "" : "not");
-#endif
-	  _S_dump(__left, __indent + 2);
-	  _S_dump(__right, __indent + 2);
-	  return;
-	}
-      else
-	{
-	  char* __kind;
-	  
-	  switch (__r->_M_tag)
-	    {
-	    case __detail::_S_leaf:
-	      __kind = "Leaf";
-	      break;
-	    case __detail::_S_function:
-	      __kind = "Function";
-	      break;
-	    case __detail::_S_substringfn:
-	      __kind = "Function representing substring";
-	      break;
-	    default:
-	      __kind = "(corrupted kind field!)";
-	    }
-#ifdef __GC
-	  printf("%s %p (depth = %d, len = %ld) ",
-		 __kind, __r, __r->_M_depth, __r->_M_size);
-#else
-	  printf("%s %p (rc = %ld, depth = %d, len = %ld) ",
-		 __kind, __r, __r->_M_ref_count, __r->_M_depth, __r->_M_size);
-#endif
-	  if (_S_is_one_byte_char_type((_CharT*)0))
-	    {
-	      const int __max_len = 40;
-	      _Self_destruct_ptr __prefix(_S_substring(__r, 0, __max_len));
-	      _CharT __buffer[__max_len + 1];
-	      bool __too_big = __r->_M_size > __prefix->_M_size;
-	      
-	      _S_flatten(__prefix, __buffer);
-	      __buffer[__prefix->_M_size] = _S_eos((_CharT*)0);
-	      printf("%s%s\n", (char*)__buffer,
-		     __too_big? "...\n" : "\n");
-	    }
-	  else
-	    printf("\n");
-	}
-    }
-
-  template <class _CharT, class _Alloc>
-    const unsigned long
-    rope<_CharT, _Alloc>::
-    _S_min_len[int(__detail::_S_max_rope_depth) + 1] = {
-      /* 0 */1, /* 1 */2, /* 2 */3, /* 3 */5, /* 4 */8, /* 5 */13, /* 6 */21,
-      /* 7 */34, /* 8 */55, /* 9 */89, /* 10 */144, /* 11 */233, /* 12 */377,
-      /* 13 */610, /* 14 */987, /* 15 */1597, /* 16 */2584, /* 17 */4181,
-      /* 18 */6765, /* 19 */10946, /* 20 */17711, /* 21 */28657, /* 22 */46368,
-      /* 23 */75025, /* 24 */121393, /* 25 */196418, /* 26 */317811,
-      /* 27 */514229, /* 28 */832040, /* 29 */1346269, /* 30 */2178309,
-      /* 31 */3524578, /* 32 */5702887, /* 33 */9227465, /* 34 */14930352,
-      /* 35 */24157817, /* 36 */39088169, /* 37 */63245986, /* 38 */102334155,
-      /* 39 */165580141, /* 40 */267914296, /* 41 */433494437,
-      /* 42 */701408733, /* 43 */1134903170, /* 44 */1836311903,
-      /* 45 */2971215073u };
-  // These are Fibonacci numbers < 2**32.
-
-  template <class _CharT, class _Alloc>
-    typename rope<_CharT, _Alloc>::_RopeRep*
-    rope<_CharT, _Alloc>::
-    _S_balance(_RopeRep* __r)
-    {
-      _RopeRep* __forest[int(__detail::_S_max_rope_depth) + 1];
-      _RopeRep* __result = 0;
-      int __i;
-      // Invariant:
-      // The concatenation of forest in descending order is equal to __r.
-      // __forest[__i]._M_size >= _S_min_len[__i]
-      // __forest[__i]._M_depth = __i
-      // References from forest are included in refcount.
-      
-      for (__i = 0; __i <= int(__detail::_S_max_rope_depth); ++__i)
-	__forest[__i] = 0;
-      __try
-	{
-	  _S_add_to_forest(__r, __forest);
-	  for (__i = 0; __i <= int(__detail::_S_max_rope_depth); ++__i)
-	    if (0 != __forest[__i])
-	      {
-#ifndef __GC
-		_Self_destruct_ptr __old(__result);
-#endif
-		__result = _S_concat(__forest[__i], __result);
-		__forest[__i]->_M_unref_nonnil();
-#if !defined(__GC) && __cpp_exceptions
-		__forest[__i] = 0;
-#endif
-	      }
-	}
-      __catch(...)
-	{
-	  for(__i = 0; __i <= int(__detail::_S_max_rope_depth); __i++)
-	    _S_unref(__forest[__i]);
-	  __throw_exception_again;
-	}
-      
-      if (__result->_M_depth > int(__detail::_S_max_rope_depth))
-	__throw_length_error(__N("rope::_S_balance"));
-      return(__result);
-    }
-
-  template <class _CharT, class _Alloc>
-    void
-    rope<_CharT, _Alloc>::
-    _S_add_to_forest(_RopeRep* __r, _RopeRep** __forest)
-    {
-      if (__r->_M_is_balanced)
-	{
-	  _S_add_leaf_to_forest(__r, __forest);
-	  return;
-	}
-
-      {
-	_RopeConcatenation* __c = (_RopeConcatenation*)__r;
-	
-	_S_add_to_forest(__c->_M_left, __forest);
-	_S_add_to_forest(__c->_M_right, __forest);
-      }
-    }
-
-
-  template <class _CharT, class _Alloc>
-    void
-    rope<_CharT, _Alloc>::
-    _S_add_leaf_to_forest(_RopeRep* __r, _RopeRep** __forest)
-    {
-      _RopeRep* __insertee;		// included in refcount
-      _RopeRep* __too_tiny = 0;		// included in refcount
-      int __i;				// forest[0..__i-1] is empty
-      size_t __s = __r->_M_size;
-      
-      for (__i = 0; __s >= _S_min_len[__i+1]/* not this bucket */; ++__i)
-	{
-	  if (0 != __forest[__i])
-	    {
-#ifndef __GC
-	      _Self_destruct_ptr __old(__too_tiny);
-#endif
-	      __too_tiny = _S_concat_and_set_balanced(__forest[__i],
-						      __too_tiny);
-	      __forest[__i]->_M_unref_nonnil();
-	      __forest[__i] = 0;
-	    }
-	}
-      {
-#ifndef __GC
-	_Self_destruct_ptr __old(__too_tiny);
-#endif
-	__insertee = _S_concat_and_set_balanced(__too_tiny, __r);
-      }
-      // Too_tiny dead, and no longer included in refcount.
-      // Insertee is live and included.
-      for (;; ++__i)
-	{
-	  if (0 != __forest[__i])
-	    {
-#ifndef __GC
-	      _Self_destruct_ptr __old(__insertee);
-#endif
-	      __insertee = _S_concat_and_set_balanced(__forest[__i],
-						      __insertee);
-	      __forest[__i]->_M_unref_nonnil();
-	      __forest[__i] = 0;
-	    }
-	  if (__i == int(__detail::_S_max_rope_depth)
-	      || __insertee->_M_size < _S_min_len[__i+1])
-	    {
-	      __forest[__i] = __insertee;
-	      // refcount is OK since __insertee is now dead.
-	      return;
-	    }
-	}
-    }
-
-  template <class _CharT, class _Alloc>
-    _CharT
-    rope<_CharT, _Alloc>::
-    _S_fetch(_RopeRep* __r, size_type __i)
-    {
-      __GC_CONST _CharT* __cstr = __r->_M_c_string;
-      
-      if (0 != __cstr)
-	return __cstr[__i];
-      for(;;)
-	{
-	  switch(__r->_M_tag)
-	    {
-	    case __detail::_S_concat:
-	      {
-		_RopeConcatenation* __c = (_RopeConcatenation*)__r;
-		_RopeRep* __left = __c->_M_left;
-		size_t __left_len = __left->_M_size;
-		
-		if (__i >= __left_len)
-		  {
-		    __i -= __left_len;
-		    __r = __c->_M_right;
-		  } 
-		else
-		  __r = __left;
-	      }
-	      break;
-	    case __detail::_S_leaf:
-	      {
-		_RopeLeaf* __l = (_RopeLeaf*)__r;
-		return __l->_M_data[__i];
-	      }
-	    case __detail::_S_function:
-	    case __detail::_S_substringfn:
-	      {
-		_RopeFunction* __f = (_RopeFunction*)__r;
-		_CharT __result;
-		
-		(*(__f->_M_fn))(__i, 1, &__result);
-		return __result;
-	      }
-	    }
-	}
-    }
-  
-#ifndef __GC
-  // Return a uniquely referenced character slot for the given
-  // position, or 0 if that's not possible.
-  template <class _CharT, class _Alloc>
-    _CharT*
-    rope<_CharT, _Alloc>::
-    _S_fetch_ptr(_RopeRep* __r, size_type __i)
-    {
-      _RopeRep* __clrstack[__detail::_S_max_rope_depth];
-      size_t __csptr = 0;
-      
-      for(;;)
-	{
-	  if (__r->_M_ref_count > 1)
-	    return 0;
-	  switch(__r->_M_tag)
-	    {
-	    case __detail::_S_concat:
-	      {
-		_RopeConcatenation* __c = (_RopeConcatenation*)__r;
-		_RopeRep* __left = __c->_M_left;
-		size_t __left_len = __left->_M_size;
-		
-		if (__c->_M_c_string != 0)
-		  __clrstack[__csptr++] = __c;
-		if (__i >= __left_len)
-		  {
-		    __i -= __left_len;
-		    __r = __c->_M_right;
-		  } 
-		else
-		  __r = __left;
-	      }
-	      break;
-	    case __detail::_S_leaf:
-	      {
-		_RopeLeaf* __l = (_RopeLeaf*)__r;
-		if (__l->_M_c_string != __l->_M_data && __l->_M_c_string != 0)
-		  __clrstack[__csptr++] = __l;
-		while (__csptr > 0)
-		  {
-		    -- __csptr;
-		    _RopeRep* __d = __clrstack[__csptr];
-		    __d->_M_free_c_string();
-		    __d->_M_c_string = 0;
-		  }
-		return __l->_M_data + __i;
-	      }
-	    case __detail::_S_function:
-	    case __detail::_S_substringfn:
-	      return 0;
-	    }
-	}
-    }
-#endif /* __GC */
-
-  // The following could be implemented trivially using
-  // lexicographical_compare_3way.
-  // We do a little more work to avoid dealing with rope iterators for
-  // flat strings.
-  template <class _CharT, class _Alloc>
-    int
-    rope<_CharT, _Alloc>::
-    _S_compare (const _RopeRep* __left, const _RopeRep* __right)
-    {
-      size_t __left_len;
-      size_t __right_len;
-      
-      if (0 == __right)
-	return 0 != __left;
-      if (0 == __left)
-	return -1;
-      __left_len = __left->_M_size;
-      __right_len = __right->_M_size;
-      if (__detail::_S_leaf == __left->_M_tag)
-	{
-	  _RopeLeaf* __l = (_RopeLeaf*) __left;
-	  if (__detail::_S_leaf == __right->_M_tag)
-	    {
-	      _RopeLeaf* __r = (_RopeLeaf*) __right;
-	      return lexicographical_compare_3way(__l->_M_data,
-						  __l->_M_data + __left_len,
-						  __r->_M_data, __r->_M_data
-						  + __right_len);
-	    }
-	  else
-	    {
-	      const_iterator __rstart(__right, 0);
-	      const_iterator __rend(__right, __right_len);
-	      return lexicographical_compare_3way(__l->_M_data, __l->_M_data
-						  + __left_len,
-						  __rstart, __rend);
-	    }
-	}
-      else
-	{
-	  const_iterator __lstart(__left, 0);
-	  const_iterator __lend(__left, __left_len);
-	  if (__detail::_S_leaf == __right->_M_tag)
-	    {
-	      _RopeLeaf* __r = (_RopeLeaf*) __right;
-	      return lexicographical_compare_3way(__lstart, __lend,
-						  __r->_M_data, __r->_M_data
-						  + __right_len);
-	    }
-	  else
-	    {
-	      const_iterator __rstart(__right, 0);
-	      const_iterator __rend(__right, __right_len);
-	      return lexicographical_compare_3way(__lstart, __lend,
-						  __rstart, __rend);
-	    }
-	}
-    }
-
-  // Assignment to reference proxies.
-  template <class _CharT, class _Alloc>
-    _Rope_char_ref_proxy<_CharT, _Alloc>&
-    _Rope_char_ref_proxy<_CharT, _Alloc>::
-    operator=(_CharT __c)
-    {
-      _RopeRep* __old = _M_root->_M_tree_ptr;
-#ifndef __GC
-      // First check for the case in which everything is uniquely
-      // referenced.  In that case we can do this destructively.
-      _CharT* __ptr = _My_rope::_S_fetch_ptr(__old, _M_pos);
-      if (0 != __ptr)
-	{
-	  *__ptr = __c;
-	  return *this;
-	}
-#endif
-      _Self_destruct_ptr __left(_My_rope::_S_substring(__old, 0, _M_pos));
-      _Self_destruct_ptr __right(_My_rope::_S_substring(__old, _M_pos + 1,
-							__old->_M_size));
-      _Self_destruct_ptr __result_left(_My_rope::
-				       _S_destr_concat_char_iter(__left,
-								 &__c, 1));
-
-      _RopeRep* __result = _My_rope::_S_concat(__result_left, __right);
-#ifndef __GC
-      _RopeRep::_S_unref(__old);
-#endif
-      _M_root->_M_tree_ptr = __result;
-      return *this;
-    }
-
-  template <class _CharT, class _Alloc>
-    inline _Rope_char_ref_proxy<_CharT, _Alloc>::
-    operator _CharT() const
-    {
-      if (_M_current_valid)
-	return _M_current;
-      else
-	return _My_rope::_S_fetch(_M_root->_M_tree_ptr, _M_pos);
-    }
-
-  template <class _CharT, class _Alloc>
-    _Rope_char_ptr_proxy<_CharT, _Alloc>
-    _Rope_char_ref_proxy<_CharT, _Alloc>::
-    operator&() const
-    { return _Rope_char_ptr_proxy<_CharT, _Alloc>(*this); }
-
-  template <class _CharT, class _Alloc>
-    rope<_CharT, _Alloc>::
-    rope(size_t __n, _CharT __c, const allocator_type& __a)
-    : _Base(__a)
-    {
-      rope<_CharT,_Alloc> __result;
-      const size_t __exponentiate_threshold = 32;
-      size_t __exponent;
-      size_t __rest;
-      _CharT* __rest_buffer;
-      _RopeRep* __remainder;
-      rope<_CharT, _Alloc> __remainder_rope;
-
-      if (0 == __n)
-	return;
-
-      __exponent = __n / __exponentiate_threshold;
-      __rest = __n % __exponentiate_threshold;
-      if (0 == __rest)
-	__remainder = 0;
-      else
-	{
-	  __rest_buffer = this->_Data_allocate(_S_rounded_up_size(__rest));
-	  __uninitialized_fill_n_a(__rest_buffer, __rest, __c,
-				   _M_get_allocator());
-	  _S_cond_store_eos(__rest_buffer[__rest]);
-	  __try
-	    { __remainder = _S_new_RopeLeaf(__rest_buffer, __rest,
-					    _M_get_allocator()); }
-	  __catch(...)
-	    {
-	      _RopeRep::__STL_FREE_STRING(__rest_buffer, __rest,
-					  _M_get_allocator());
-	      __throw_exception_again;
-	    }
-	}
-      __remainder_rope._M_tree_ptr = __remainder;
-      if (__exponent != 0)
-	{
-	  _CharT* __base_buffer =
-	    this->_Data_allocate(_S_rounded_up_size(__exponentiate_threshold));
-	  _RopeLeaf* __base_leaf;
-	  rope __base_rope;
-	  __uninitialized_fill_n_a(__base_buffer, __exponentiate_threshold, __c,
-				   _M_get_allocator());
-	  _S_cond_store_eos(__base_buffer[__exponentiate_threshold]);
-	  __try
-	    {
-	      __base_leaf = _S_new_RopeLeaf(__base_buffer,
-					    __exponentiate_threshold,
-					    _M_get_allocator());
-	    }
-	  __catch(...)
-	    {
-	      _RopeRep::__STL_FREE_STRING(__base_buffer,
-					  __exponentiate_threshold,
-					  _M_get_allocator());
-	      __throw_exception_again;
-	    }
-	  __base_rope._M_tree_ptr = __base_leaf;
-	  if (1 == __exponent)
-	    __result = __base_rope;
-	  else
-	    __result = power(__base_rope, __exponent,
-			     _Rope_Concat_fn<_CharT, _Alloc>());
-	    
-	  if (0 != __remainder)
-	    __result += __remainder_rope;
-	}
-      else
-	__result = __remainder_rope;
-	  
-      this->_M_tree_ptr = __result._M_tree_ptr;
-      this->_M_tree_ptr->_M_ref_nonnil();
-    }
-      
-  template<class _CharT, class _Alloc>
-    _CharT
-    rope<_CharT, _Alloc>::_S_empty_c_str[1];
-      
-  template<class _CharT, class _Alloc>
-    const _CharT*
-    rope<_CharT, _Alloc>::
-    c_str() const
-    {
-      if (0 == this->_M_tree_ptr)
-	{
-	  _S_empty_c_str[0] = _S_eos((_CharT*)0);  // Possibly redundant,
-	                                           // but probably fast.
-	  return _S_empty_c_str;
-	}
-      __gthread_mutex_lock (&this->_M_tree_ptr->_M_c_string_lock);
-      __GC_CONST _CharT* __result = this->_M_tree_ptr->_M_c_string;
-      if (0 == __result)
-	{
-	  size_t __s = size();
-	  __result = this->_Data_allocate(__s + 1);
-	  _S_flatten(this->_M_tree_ptr, __result);
-	  __result[__s] = _S_eos((_CharT*)0);
-	  this->_M_tree_ptr->_M_c_string = __result;
-	}
-      __gthread_mutex_unlock (&this->_M_tree_ptr->_M_c_string_lock);
-      return(__result);
-    }
-  
-  template<class _CharT, class _Alloc>
-    const _CharT* rope<_CharT, _Alloc>::
-    replace_with_c_str()
-    {
-      if (0 == this->_M_tree_ptr)
-	{
-	  _S_empty_c_str[0] = _S_eos((_CharT*)0);
-	  return _S_empty_c_str;
-	}
-      __GC_CONST _CharT* __old_c_string = this->_M_tree_ptr->_M_c_string;
-      if (__detail::_S_leaf == this->_M_tree_ptr->_M_tag
-	  && 0 != __old_c_string)
-	return(__old_c_string);
-      size_t __s = size();
-      _CharT* __result = this->_Data_allocate(_S_rounded_up_size(__s));
-      _S_flatten(this->_M_tree_ptr, __result);
-      __result[__s] = _S_eos((_CharT*)0);
-      this->_M_tree_ptr->_M_unref_nonnil();
-      this->_M_tree_ptr = _S_new_RopeLeaf(__result, __s,
-					  this->_M_get_allocator());
-      return(__result);
-    }
-
-  // Algorithm specializations.  More should be added.
-  
-  template<class _Rope_iterator>  // was templated on CharT and Alloc
-    void		          // VC++ workaround
-    _Rope_rotate(_Rope_iterator __first,
-		 _Rope_iterator __middle,
-		 _Rope_iterator __last)
-    {
-      typedef typename _Rope_iterator::value_type _CharT;
-      typedef typename _Rope_iterator::_allocator_type _Alloc;
-      
-      rope<_CharT, _Alloc>& __r(__first.container());
-      rope<_CharT, _Alloc> __prefix = __r.substr(0, __first.index());
-      rope<_CharT, _Alloc> __suffix =
-	__r.substr(__last.index(), __r.size() - __last.index());
-      rope<_CharT, _Alloc> __part1 =
-	__r.substr(__middle.index(), __last.index() - __middle.index());
-      rope<_CharT, _Alloc> __part2 =
-	__r.substr(__first.index(), __middle.index() - __first.index());
-      __r = __prefix;
-      __r += __part1;
-      __r += __part2;
-      __r += __suffix;
-    }
-
-#if !defined(__GNUC__)
-  // Appears to confuse g++
-  inline void
-  rotate(_Rope_iterator<char, __STL_DEFAULT_ALLOCATOR(char)> __first,
-	 _Rope_iterator<char, __STL_DEFAULT_ALLOCATOR(char)> __middle,
-	 _Rope_iterator<char, __STL_DEFAULT_ALLOCATOR(char)> __last)
-  { _Rope_rotate(__first, __middle, __last); }
-#endif
-
-# if 0
-  // Probably not useful for several reasons:
-  // - for SGIs 7.1 compiler and probably some others,
-  //   this forces lots of rope<wchar_t, ...> instantiations, creating a
-  //   code bloat and compile time problem.  (Fixed in 7.2.)
-  // - wchar_t is 4 bytes wide on most UNIX platforms, making it
-  //   unattractive for unicode strings.  Unsigned short may be a better
-  //   character type.
-  inline void
-  rotate(_Rope_iterator<wchar_t, __STL_DEFAULT_ALLOCATOR(char)> __first,
-	 _Rope_iterator<wchar_t, __STL_DEFAULT_ALLOCATOR(char)> __middle,
-	 _Rope_iterator<wchar_t, __STL_DEFAULT_ALLOCATOR(char)> __last)
-  { _Rope_rotate(__first, __middle, __last); }
-# endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
diff --git a/openflow/usr/include/c++/5/ext/slist b/openflow/usr/include/c++/5/ext/slist
deleted file mode 100644
index cb7b4e4..0000000
--- a/openflow/usr/include/c++/5/ext/slist
+++ /dev/null
@@ -1,1082 +0,0 @@
-// Singly-linked list implementation -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file ext/slist
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset). 
- */
-
-#ifndef _SLIST
-#define _SLIST 1
-
-#include <algorithm>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/concept_check.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  using std::size_t;
-  using std::ptrdiff_t;
-  using std::_Construct;
-  using std::_Destroy;
-  using std::allocator;
-  using std::__true_type;
-  using std::__false_type;
-
-  struct _Slist_node_base
-  {
-    _Slist_node_base* _M_next;
-  };
-  
-  inline _Slist_node_base*
-  __slist_make_link(_Slist_node_base* __prev_node,
-		    _Slist_node_base* __new_node)
-  {
-    __new_node->_M_next = __prev_node->_M_next;
-    __prev_node->_M_next = __new_node;
-    return __new_node;
-  }
-
-  inline _Slist_node_base*
-  __slist_previous(_Slist_node_base* __head,
-		   const _Slist_node_base* __node)
-  {
-    while (__head && __head->_M_next != __node)
-      __head = __head->_M_next;
-    return __head;
-  }
-
-  inline const _Slist_node_base*
-  __slist_previous(const _Slist_node_base* __head,
-		   const _Slist_node_base* __node)
-  {
-    while (__head && __head->_M_next != __node)
-      __head = __head->_M_next;
-    return __head;
-  }
-
-  inline void
-  __slist_splice_after(_Slist_node_base* __pos,
-		       _Slist_node_base* __before_first,
-		       _Slist_node_base* __before_last)
-  {
-    if (__pos != __before_first && __pos != __before_last)
-      {
-	_Slist_node_base* __first = __before_first->_M_next;
-	_Slist_node_base* __after = __pos->_M_next;
-	__before_first->_M_next = __before_last->_M_next;
-	__pos->_M_next = __first;
-	__before_last->_M_next = __after;
-      }
-  }
-
-  inline void
-  __slist_splice_after(_Slist_node_base* __pos, _Slist_node_base* __head)
-  {
-    _Slist_node_base* __before_last = __slist_previous(__head, 0);
-    if (__before_last != __head)
-      {
-	_Slist_node_base* __after = __pos->_M_next;
-	__pos->_M_next = __head->_M_next;
-	__head->_M_next = 0;
-	__before_last->_M_next = __after;
-      }
-  }
-
-  inline _Slist_node_base*
-  __slist_reverse(_Slist_node_base* __node)
-  {
-    _Slist_node_base* __result = __node;
-    __node = __node->_M_next;
-    __result->_M_next = 0;
-    while(__node)
-      {
-	_Slist_node_base* __next = __node->_M_next;
-	__node->_M_next = __result;
-	__result = __node;
-	__node = __next;
-      }
-    return __result;
-  }
-
-  inline size_t
-  __slist_size(_Slist_node_base* __node)
-  {
-    size_t __result = 0;
-    for (; __node != 0; __node = __node->_M_next)
-      ++__result;
-    return __result;
-  }
-
-  template <class _Tp>
-    struct _Slist_node : public _Slist_node_base
-    {
-      _Tp _M_data;
-    };
-
-  struct _Slist_iterator_base
-  {
-    typedef size_t                    size_type;
-    typedef ptrdiff_t                 difference_type;
-    typedef std::forward_iterator_tag iterator_category;
-
-    _Slist_node_base* _M_node;
-    
-    _Slist_iterator_base(_Slist_node_base* __x)
-    : _M_node(__x) {}
-
-    void
-    _M_incr()
-    { _M_node = _M_node->_M_next; }
-
-    bool
-    operator==(const _Slist_iterator_base& __x) const
-    { return _M_node == __x._M_node; }
-
-    bool
-    operator!=(const _Slist_iterator_base& __x) const
-    { return _M_node != __x._M_node; }
-  };
-
-  template <class _Tp, class _Ref, class _Ptr>
-    struct _Slist_iterator : public _Slist_iterator_base
-    {
-      typedef _Slist_iterator<_Tp, _Tp&, _Tp*>             iterator;
-      typedef _Slist_iterator<_Tp, const _Tp&, const _Tp*> const_iterator;
-      typedef _Slist_iterator<_Tp, _Ref, _Ptr>             _Self;
-
-      typedef _Tp              value_type;
-      typedef _Ptr             pointer;
-      typedef _Ref             reference;
-      typedef _Slist_node<_Tp> _Node;
-
-      explicit
-      _Slist_iterator(_Node* __x)
-      : _Slist_iterator_base(__x) {}
-
-      _Slist_iterator()
-      : _Slist_iterator_base(0) {}
-
-      _Slist_iterator(const iterator& __x)
-      : _Slist_iterator_base(__x._M_node) {}
-
-      reference
-      operator*() const
-      { return ((_Node*) _M_node)->_M_data; }
-
-      pointer
-      operator->() const
-      { return &(operator*()); }
-
-      _Self&
-      operator++()
-      {
-	_M_incr();
-	return *this;
-      }
-
-      _Self
-      operator++(int)
-      {
-	_Self __tmp = *this;
-	_M_incr();
-	return __tmp;
-      }
-    };
-
-  template <class _Tp, class _Alloc>
-    struct _Slist_base
-    : public _Alloc::template rebind<_Slist_node<_Tp> >::other
-    {
-      typedef typename _Alloc::template rebind<_Slist_node<_Tp> >::other
-        _Node_alloc;
-      typedef _Alloc allocator_type;
-
-      allocator_type
-      get_allocator() const
-      { return *static_cast<const _Node_alloc*>(this); }
-
-      _Slist_base(const allocator_type& __a)
-      : _Node_alloc(__a)
-      { this->_M_head._M_next = 0; }
-
-      ~_Slist_base()
-      { _M_erase_after(&this->_M_head, 0); }
-
-    protected:
-      _Slist_node_base _M_head;
-
-      _Slist_node<_Tp>*
-      _M_get_node()
-      { return _Node_alloc::allocate(1); }
-  
-      void
-      _M_put_node(_Slist_node<_Tp>* __p)
-      { _Node_alloc::deallocate(__p, 1); }
-
-    protected:
-      _Slist_node_base* _M_erase_after(_Slist_node_base* __pos)
-      {
-	_Slist_node<_Tp>* __next = (_Slist_node<_Tp>*) (__pos->_M_next);
-	_Slist_node_base* __next_next = __next->_M_next;
-	__pos->_M_next = __next_next;
-	get_allocator().destroy(&__next->_M_data);
-	_M_put_node(__next);
-	return __next_next;
-      }
-      _Slist_node_base* _M_erase_after(_Slist_node_base*, _Slist_node_base*);
-    };
-
-  template <class _Tp, class _Alloc>
-    _Slist_node_base*
-    _Slist_base<_Tp,_Alloc>::_M_erase_after(_Slist_node_base* __before_first,
-					    _Slist_node_base* __last_node)
-    {
-      _Slist_node<_Tp>* __cur = (_Slist_node<_Tp>*) (__before_first->_M_next);
-      while (__cur != __last_node)
-	{
-	  _Slist_node<_Tp>* __tmp = __cur;
-	  __cur = (_Slist_node<_Tp>*) __cur->_M_next;
-	  get_allocator().destroy(&__tmp->_M_data);
-	  _M_put_node(__tmp);
-	}
-      __before_first->_M_next = __last_node;
-      return __last_node;
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template <class _Tp, class _Alloc = allocator<_Tp> >
-    class slist : private _Slist_base<_Tp,_Alloc>
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-	
-    private:
-      typedef _Slist_base<_Tp,_Alloc> _Base;
-
-    public:
-      typedef _Tp               value_type;
-      typedef value_type*       pointer;
-      typedef const value_type* const_pointer;
-      typedef value_type&       reference;
-      typedef const value_type& const_reference;
-      typedef size_t            size_type;
-      typedef ptrdiff_t         difference_type;
-      
-      typedef _Slist_iterator<_Tp, _Tp&, _Tp*>             iterator;
-      typedef _Slist_iterator<_Tp, const _Tp&, const _Tp*> const_iterator;
-      
-      typedef typename _Base::allocator_type allocator_type;
-
-      allocator_type
-      get_allocator() const
-      { return _Base::get_allocator(); }
-
-    private:
-      typedef _Slist_node<_Tp>      _Node;
-      typedef _Slist_node_base      _Node_base;
-      typedef _Slist_iterator_base  _Iterator_base;
-      
-      _Node*
-      _M_create_node(const value_type& __x)
-      {
-	_Node* __node = this->_M_get_node();
-	__try
-	  {
-	    get_allocator().construct(&__node->_M_data, __x);
-	    __node->_M_next = 0;
-	  }
-	__catch(...)
-	  {
-	    this->_M_put_node(__node);
-	    __throw_exception_again;
-	  }
-	return __node;
-      }
-
-      _Node*
-      _M_create_node()
-      {
-	_Node* __node = this->_M_get_node();
-	__try
-	  {
-	    get_allocator().construct(&__node->_M_data, value_type());
-	    __node->_M_next = 0;
-	  }
-	__catch(...)
-	  {
-	    this->_M_put_node(__node);
-	    __throw_exception_again;
-	  }
-	return __node;
-      }
-
-    public:
-      explicit
-      slist(const allocator_type& __a = allocator_type())
-      : _Base(__a) {}
-
-      slist(size_type __n, const value_type& __x,
-	    const allocator_type& __a =  allocator_type())
-      : _Base(__a)
-      { _M_insert_after_fill(&this->_M_head, __n, __x); }
-
-      explicit
-      slist(size_type __n)
-      : _Base(allocator_type())
-      { _M_insert_after_fill(&this->_M_head, __n, value_type()); }
-
-      // We don't need any dispatching tricks here, because
-      // _M_insert_after_range already does them.
-      template <class _InputIterator>
-        slist(_InputIterator __first, _InputIterator __last,
-	      const allocator_type& __a =  allocator_type())
-	: _Base(__a)
-        { _M_insert_after_range(&this->_M_head, __first, __last); }
-
-      slist(const slist& __x)
-      : _Base(__x.get_allocator())
-      { _M_insert_after_range(&this->_M_head, __x.begin(), __x.end()); }
-
-      slist&
-      operator= (const slist& __x);
-
-      ~slist() {}
-
-    public:
-      // assign(), a generalized assignment member function.  Two
-      // versions: one that takes a count, and one that takes a range.
-      // The range version is a member template, so we dispatch on whether
-      // or not the type is an integer.
-      
-      void
-      assign(size_type __n, const _Tp& __val)
-      { _M_fill_assign(__n, __val); }
-
-      void
-      _M_fill_assign(size_type __n, const _Tp& __val);
-
-      template <class _InputIterator>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  _M_assign_dispatch(__first, __last, _Integral());
-	}
-
-      template <class _Integer>
-      void
-      _M_assign_dispatch(_Integer __n, _Integer __val, __true_type)
-      { _M_fill_assign((size_type) __n, (_Tp) __val); }
-
-      template <class _InputIterator>
-      void
-      _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-			 __false_type);
-
-    public:
-
-      iterator
-      begin()
-      { return iterator((_Node*)this->_M_head._M_next); }
-
-      const_iterator
-      begin() const
-      { return const_iterator((_Node*)this->_M_head._M_next);}
-
-      iterator
-      end()
-      { return iterator(0); }
-
-      const_iterator
-      end() const
-      { return const_iterator(0); }
-
-      // Experimental new feature: before_begin() returns a
-      // non-dereferenceable iterator that, when incremented, yields
-      // begin().  This iterator may be used as the argument to
-      // insert_after, erase_after, etc.  Note that even for an empty
-      // slist, before_begin() is not the same iterator as end().  It
-      // is always necessary to increment before_begin() at least once to
-      // obtain end().
-      iterator
-      before_begin()
-      { return iterator((_Node*) &this->_M_head); }
-
-      const_iterator
-      before_begin() const
-      { return const_iterator((_Node*) &this->_M_head); }
-
-      size_type
-      size() const
-      { return __slist_size(this->_M_head._M_next); }
-
-      size_type
-      max_size() const
-      { return size_type(-1); }
-
-      bool
-      empty() const
-      { return this->_M_head._M_next == 0; }
-
-      void
-      swap(slist& __x)
-      { std::swap(this->_M_head._M_next, __x._M_head._M_next); }
-
-    public:
-
-      reference
-      front()
-      { return ((_Node*) this->_M_head._M_next)->_M_data; }
-
-      const_reference
-      front() const
-      { return ((_Node*) this->_M_head._M_next)->_M_data; }
-
-      void
-      push_front(const value_type& __x)
-      { __slist_make_link(&this->_M_head, _M_create_node(__x)); }
-
-      void
-      push_front()
-      { __slist_make_link(&this->_M_head, _M_create_node()); }
-
-      void
-      pop_front()
-      {
-	_Node* __node = (_Node*) this->_M_head._M_next;
-	this->_M_head._M_next = __node->_M_next;
-	get_allocator().destroy(&__node->_M_data);
-	this->_M_put_node(__node);
-      }
-
-      iterator
-      previous(const_iterator __pos)
-      { return iterator((_Node*) __slist_previous(&this->_M_head,
-						  __pos._M_node)); }
-
-      const_iterator
-      previous(const_iterator __pos) const
-      { return const_iterator((_Node*) __slist_previous(&this->_M_head,
-							__pos._M_node)); }
-
-    private:
-      _Node*
-      _M_insert_after(_Node_base* __pos, const value_type& __x)
-      { return (_Node*) (__slist_make_link(__pos, _M_create_node(__x))); }
-
-      _Node*
-      _M_insert_after(_Node_base* __pos)
-      { return (_Node*) (__slist_make_link(__pos, _M_create_node())); }
-
-      void
-      _M_insert_after_fill(_Node_base* __pos,
-			   size_type __n, const value_type& __x)
-      {
-	for (size_type __i = 0; __i < __n; ++__i)
-	  __pos = __slist_make_link(__pos, _M_create_node(__x));
-      }
-
-      // Check whether it's an integral type.  If so, it's not an iterator.
-      template <class _InIterator>
-        void
-        _M_insert_after_range(_Node_base* __pos,
-			      _InIterator __first, _InIterator __last)
-        {
-	  typedef typename std::__is_integer<_InIterator>::__type _Integral;
-	  _M_insert_after_range(__pos, __first, __last, _Integral());
-	}
-
-      template <class _Integer>
-        void
-        _M_insert_after_range(_Node_base* __pos, _Integer __n, _Integer __x,
-			      __true_type)
-        { _M_insert_after_fill(__pos, __n, __x); }
-
-      template <class _InIterator>
-        void
-        _M_insert_after_range(_Node_base* __pos,
-			      _InIterator __first, _InIterator __last,
-			      __false_type)
-        {
-	  while (__first != __last)
-	    {
-	      __pos = __slist_make_link(__pos, _M_create_node(*__first));
-	      ++__first;
-	    }
-	}
-
-    public:
-      iterator
-      insert_after(iterator __pos, const value_type& __x)
-      { return iterator(_M_insert_after(__pos._M_node, __x)); }
-
-      iterator
-      insert_after(iterator __pos)
-      { return insert_after(__pos, value_type()); }
-
-      void
-      insert_after(iterator __pos, size_type __n, const value_type& __x)
-      { _M_insert_after_fill(__pos._M_node, __n, __x); }
-
-      // We don't need any dispatching tricks here, because
-      // _M_insert_after_range already does them.
-      template <class _InIterator>
-        void
-        insert_after(iterator __pos, _InIterator __first, _InIterator __last)
-        { _M_insert_after_range(__pos._M_node, __first, __last); }
-
-      iterator
-      insert(iterator __pos, const value_type& __x)
-      { return iterator(_M_insert_after(__slist_previous(&this->_M_head,
-							 __pos._M_node),
-					__x)); }
-
-      iterator
-      insert(iterator __pos)
-      { return iterator(_M_insert_after(__slist_previous(&this->_M_head,
-							 __pos._M_node),
-					value_type())); }
-
-      void
-      insert(iterator __pos, size_type __n, const value_type& __x)
-      { _M_insert_after_fill(__slist_previous(&this->_M_head, __pos._M_node),
-			     __n, __x); }
-
-      // We don't need any dispatching tricks here, because
-      // _M_insert_after_range already does them.
-      template <class _InIterator>
-        void
-        insert(iterator __pos, _InIterator __first, _InIterator __last)
-        { _M_insert_after_range(__slist_previous(&this->_M_head, __pos._M_node),
-				__first, __last); }
-
-    public:
-      iterator
-      erase_after(iterator __pos)
-      { return iterator((_Node*) this->_M_erase_after(__pos._M_node)); }
-
-      iterator
-      erase_after(iterator __before_first, iterator __last)
-      { 
-	return iterator((_Node*) this->_M_erase_after(__before_first._M_node,
-						      __last._M_node));
-      }
-
-      iterator
-      erase(iterator __pos)
-      { 
-	return iterator((_Node*) this->_M_erase_after
-			(__slist_previous(&this->_M_head, __pos._M_node)));
-      }
-
-      iterator
-      erase(iterator __first, iterator __last)
-      { 
-	return iterator((_Node*) this->_M_erase_after
-			(__slist_previous(&this->_M_head, __first._M_node),
-			 __last._M_node));
-      }
-      
-      void
-      resize(size_type new_size, const _Tp& __x);
-
-      void
-      resize(size_type new_size)
-      { resize(new_size, _Tp()); }
-
-      void
-      clear()
-      { this->_M_erase_after(&this->_M_head, 0); }
-
-    public:
-      // Moves the range [__before_first + 1, __before_last + 1) to *this,
-      //  inserting it immediately after __pos.  This is constant time.
-      void
-      splice_after(iterator __pos,
-		   iterator __before_first, iterator __before_last)
-      {
-	if (__before_first != __before_last)
-	  __slist_splice_after(__pos._M_node, __before_first._M_node,
-			       __before_last._M_node);
-      }
-
-      // Moves the element that follows __prev to *this, inserting it
-      // immediately after __pos.  This is constant time.
-      void
-      splice_after(iterator __pos, iterator __prev)
-      { __slist_splice_after(__pos._M_node,
-			     __prev._M_node, __prev._M_node->_M_next); }
-
-      // Removes all of the elements from the list __x to *this, inserting
-      // them immediately after __pos.  __x must not be *this.  Complexity:
-      // linear in __x.size().
-      void
-      splice_after(iterator __pos, slist& __x)
-      { __slist_splice_after(__pos._M_node, &__x._M_head); }
-
-      // Linear in distance(begin(), __pos), and linear in __x.size().
-      void
-      splice(iterator __pos, slist& __x)
-      {
-	if (__x._M_head._M_next)
-	  __slist_splice_after(__slist_previous(&this->_M_head, __pos._M_node),
-			       &__x._M_head,
-			       __slist_previous(&__x._M_head, 0)); }
-
-      // Linear in distance(begin(), __pos), and in distance(__x.begin(), __i).
-      void
-      splice(iterator __pos, slist& __x, iterator __i)
-      { __slist_splice_after(__slist_previous(&this->_M_head, __pos._M_node),
-			     __slist_previous(&__x._M_head, __i._M_node),
-			     __i._M_node); }
-
-      // Linear in distance(begin(), __pos), in distance(__x.begin(), __first),
-      // and in distance(__first, __last).
-      void
-      splice(iterator __pos, slist& __x, iterator __first, iterator __last)
-      {
-	if (__first != __last)
-	  __slist_splice_after(__slist_previous(&this->_M_head, __pos._M_node),
-			       __slist_previous(&__x._M_head, __first._M_node),
-			       __slist_previous(__first._M_node,
-						__last._M_node));
-      }
-
-    public:
-      void
-      reverse()
-      {
-	if (this->_M_head._M_next)
-	  this->_M_head._M_next = __slist_reverse(this->_M_head._M_next);
-      }
-
-      void
-      remove(const _Tp& __val);
-
-      void
-      unique();
-      
-      void
-      merge(slist& __x);
-      
-      void
-      sort();
-
-      template <class _Predicate>
-        void
-        remove_if(_Predicate __pred);
-
-      template <class _BinaryPredicate>
-        void
-        unique(_BinaryPredicate __pred);
-
-      template <class _StrictWeakOrdering>
-        void
-        merge(slist&, _StrictWeakOrdering);
-
-      template <class _StrictWeakOrdering>
-        void
-        sort(_StrictWeakOrdering __comp);
-    };
-
-  template <class _Tp, class _Alloc>
-    slist<_Tp, _Alloc>&
-    slist<_Tp, _Alloc>::operator=(const slist<_Tp, _Alloc>& __x)
-    {
-      if (&__x != this)
-	{
-	  _Node_base* __p1 = &this->_M_head;
-	  _Node* __n1 = (_Node*) this->_M_head._M_next;
-	  const _Node* __n2 = (const _Node*) __x._M_head._M_next;
-	  while (__n1 && __n2)
-	    {
-	      __n1->_M_data = __n2->_M_data;
-	      __p1 = __n1;
-	      __n1 = (_Node*) __n1->_M_next;
-	      __n2 = (const _Node*) __n2->_M_next;
-	    }
-	  if (__n2 == 0)
-	    this->_M_erase_after(__p1, 0);
-	  else
-	    _M_insert_after_range(__p1, const_iterator((_Node*)__n2),
-                                  const_iterator(0));
-	}
-      return *this;
-    }
-
-  template <class _Tp, class _Alloc>
-    void
-    slist<_Tp, _Alloc>::_M_fill_assign(size_type __n, const _Tp& __val)
-    {
-      _Node_base* __prev = &this->_M_head;
-      _Node* __node = (_Node*) this->_M_head._M_next;
-      for (; __node != 0 && __n > 0; --__n)
-	{
-	  __node->_M_data = __val;
-	  __prev = __node;
-	  __node = (_Node*) __node->_M_next;
-	}
-      if (__n > 0)
-	_M_insert_after_fill(__prev, __n, __val);
-      else
-	this->_M_erase_after(__prev, 0);
-    }
-  
-  template <class _Tp, class _Alloc>
-    template <class _InputIterator>
-      void
-      slist<_Tp, _Alloc>::_M_assign_dispatch(_InputIterator __first,
-					     _InputIterator __last,
-					     __false_type)
-      {
-	_Node_base* __prev = &this->_M_head;
-	_Node* __node = (_Node*) this->_M_head._M_next;
-	while (__node != 0 && __first != __last)
-	  {
-	    __node->_M_data = *__first;
-	    __prev = __node;
-	    __node = (_Node*) __node->_M_next;
-	    ++__first;
-	  }
-	if (__first != __last)
-	  _M_insert_after_range(__prev, __first, __last);
-	else
-	  this->_M_erase_after(__prev, 0);
-      }
-  
-  template <class _Tp, class _Alloc>
-    inline bool
-    operator==(const slist<_Tp, _Alloc>& _SL1, const slist<_Tp, _Alloc>& _SL2)
-    {
-      typedef typename slist<_Tp,_Alloc>::const_iterator const_iterator;
-      const_iterator __end1 = _SL1.end();
-      const_iterator __end2 = _SL2.end();
-      
-      const_iterator __i1 = _SL1.begin();
-      const_iterator __i2 = _SL2.begin();
-      while (__i1 != __end1 && __i2 != __end2 && *__i1 == *__i2)
-	{
-	  ++__i1;
-	  ++__i2;
-	}
-      return __i1 == __end1 && __i2 == __end2;
-    }
-
-
-  template <class _Tp, class _Alloc>
-    inline bool
-    operator<(const slist<_Tp, _Alloc>& _SL1, const slist<_Tp, _Alloc>& _SL2)
-    { return std::lexicographical_compare(_SL1.begin(), _SL1.end(),
-					  _SL2.begin(), _SL2.end()); }
-
-  template <class _Tp, class _Alloc>
-    inline bool
-    operator!=(const slist<_Tp, _Alloc>& _SL1, const slist<_Tp, _Alloc>& _SL2)
-    { return !(_SL1 == _SL2); }
-
-  template <class _Tp, class _Alloc>
-    inline bool
-    operator>(const slist<_Tp, _Alloc>& _SL1, const slist<_Tp, _Alloc>& _SL2)
-    { return _SL2 < _SL1; }
-
-  template <class _Tp, class _Alloc>
-    inline bool
-    operator<=(const slist<_Tp, _Alloc>& _SL1, const slist<_Tp, _Alloc>& _SL2)
-    { return !(_SL2 < _SL1); }
-
-  template <class _Tp, class _Alloc>
-    inline bool
-    operator>=(const slist<_Tp, _Alloc>& _SL1, const slist<_Tp, _Alloc>& _SL2)
-    { return !(_SL1 < _SL2); }
-
-  template <class _Tp, class _Alloc>
-    inline void
-    swap(slist<_Tp, _Alloc>& __x, slist<_Tp, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template <class _Tp, class _Alloc>
-    void
-    slist<_Tp, _Alloc>::resize(size_type __len, const _Tp& __x)
-    {
-      _Node_base* __cur = &this->_M_head;
-      while (__cur->_M_next != 0 && __len > 0)
-	{
-	  --__len;
-	  __cur = __cur->_M_next;
-	}
-      if (__cur->_M_next)
-	this->_M_erase_after(__cur, 0);
-      else
-	_M_insert_after_fill(__cur, __len, __x);
-    }
-
-  template <class _Tp, class _Alloc>
-    void
-    slist<_Tp, _Alloc>::remove(const _Tp& __val)
-    { 
-      _Node_base* __cur = &this->_M_head;
-      while (__cur && __cur->_M_next)
-	{
-	  if (((_Node*) __cur->_M_next)->_M_data == __val)
-	    this->_M_erase_after(__cur);
-	  else
-	    __cur = __cur->_M_next;
-	}
-    }
-
-  template <class _Tp, class _Alloc>
-    void
-    slist<_Tp, _Alloc>::unique()
-    {
-      _Node_base* __cur = this->_M_head._M_next;
-      if (__cur)
-	{
-	  while (__cur->_M_next)
-	    {
-	      if (((_Node*)__cur)->_M_data
-		  == ((_Node*)(__cur->_M_next))->_M_data)
-		this->_M_erase_after(__cur);
-	      else
-		__cur = __cur->_M_next;
-	    }
-	}
-    }
-
-  template <class _Tp, class _Alloc>
-    void
-    slist<_Tp, _Alloc>::merge(slist<_Tp, _Alloc>& __x)
-    {
-      _Node_base* __n1 = &this->_M_head;
-      while (__n1->_M_next && __x._M_head._M_next)
-	{
-	  if (((_Node*) __x._M_head._M_next)->_M_data
-	      < ((_Node*) __n1->_M_next)->_M_data)
-	    __slist_splice_after(__n1, &__x._M_head, __x._M_head._M_next);
-	  __n1 = __n1->_M_next;
-	}
-      if (__x._M_head._M_next)
-	{
-	  __n1->_M_next = __x._M_head._M_next;
-	  __x._M_head._M_next = 0;
-	}
-    }
-
-  template <class _Tp, class _Alloc>
-    void
-    slist<_Tp, _Alloc>::sort()
-    {
-      if (this->_M_head._M_next && this->_M_head._M_next->_M_next)
-	{
-	  slist __carry;
-	  slist __counter[64];
-	  int __fill = 0;
-	  while (!empty())
-	    {
-	      __slist_splice_after(&__carry._M_head,
-				   &this->_M_head, this->_M_head._M_next);
-	      int __i = 0;
-	      while (__i < __fill && !__counter[__i].empty())
-		{
-		  __counter[__i].merge(__carry);
-		  __carry.swap(__counter[__i]);
-		  ++__i;
-		}
-	      __carry.swap(__counter[__i]);
-	      if (__i == __fill)
-		++__fill;
-	    }
-	  
-	  for (int __i = 1; __i < __fill; ++__i)
-	    __counter[__i].merge(__counter[__i-1]);
-	  this->swap(__counter[__fill-1]);
-	}
-    }
-
-  template <class _Tp, class _Alloc>
-    template <class _Predicate>
-      void slist<_Tp, _Alloc>::remove_if(_Predicate __pred)
-      {
-	_Node_base* __cur = &this->_M_head;
-	while (__cur->_M_next)
-	  {
-	    if (__pred(((_Node*) __cur->_M_next)->_M_data))
-	      this->_M_erase_after(__cur);
-	    else
-	      __cur = __cur->_M_next;
-	  }
-      }
-
-  template <class _Tp, class _Alloc>
-    template <class _BinaryPredicate>
-      void
-      slist<_Tp, _Alloc>::unique(_BinaryPredicate __pred)
-      {
-	_Node* __cur = (_Node*) this->_M_head._M_next;
-	if (__cur)
-	  {
-	    while (__cur->_M_next)
-	      {
-		if (__pred(((_Node*)__cur)->_M_data,
-			   ((_Node*)(__cur->_M_next))->_M_data))
-		  this->_M_erase_after(__cur);
-		else
-		  __cur = (_Node*) __cur->_M_next;
-	      }
-	  }
-      }
-
-  template <class _Tp, class _Alloc>
-    template <class _StrictWeakOrdering>
-      void
-      slist<_Tp, _Alloc>::merge(slist<_Tp, _Alloc>& __x,
-			       _StrictWeakOrdering __comp)
-      {
-	_Node_base* __n1 = &this->_M_head;
-	while (__n1->_M_next && __x._M_head._M_next)
-	  {
-	    if (__comp(((_Node*) __x._M_head._M_next)->_M_data,
-		       ((_Node*) __n1->_M_next)->_M_data))
-	      __slist_splice_after(__n1, &__x._M_head, __x._M_head._M_next);
-	    __n1 = __n1->_M_next;
-	  }
-	if (__x._M_head._M_next)
-	  {
-	    __n1->_M_next = __x._M_head._M_next;
-	    __x._M_head._M_next = 0;
-	  }
-      }
-
-  template <class _Tp, class _Alloc>
-    template <class _StrictWeakOrdering>
-      void
-      slist<_Tp, _Alloc>::sort(_StrictWeakOrdering __comp)
-      {
-	if (this->_M_head._M_next && this->_M_head._M_next->_M_next)
-	  {
-	    slist __carry;
-	    slist __counter[64];
-	    int __fill = 0;
-	    while (!empty())
-	      {
-		__slist_splice_after(&__carry._M_head,
-				     &this->_M_head, this->_M_head._M_next);
-		int __i = 0;
-		while (__i < __fill && !__counter[__i].empty())
-		  {
-		    __counter[__i].merge(__carry, __comp);
-		    __carry.swap(__counter[__i]);
-		    ++__i;
-		  }
-		__carry.swap(__counter[__i]);
-		if (__i == __fill)
-		  ++__fill;
-	      }
-
-	    for (int __i = 1; __i < __fill; ++__i)
-	      __counter[__i].merge(__counter[__i-1], __comp);
-	    this->swap(__counter[__fill-1]);
-	  }
-      }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Specialization of insert_iterator so that insertions will be constant
-  // time rather than linear time.
-  template <class _Tp, class _Alloc>
-    class insert_iterator<__gnu_cxx::slist<_Tp, _Alloc> >
-    {
-    protected:
-      typedef __gnu_cxx::slist<_Tp, _Alloc> _Container;
-      _Container* container;
-      typename _Container::iterator iter;
-
-    public:
-      typedef _Container          container_type;
-      typedef output_iterator_tag iterator_category;
-      typedef void                value_type;
-      typedef void                difference_type;
-      typedef void                pointer;
-      typedef void                reference;
-
-      insert_iterator(_Container& __x, typename _Container::iterator __i)
-      : container(&__x)
-      {
-	if (__i == __x.begin())
-	  iter = __x.before_begin();
-	else
-	  iter = __x.previous(__i);
-      }
-
-      insert_iterator<_Container>&
-      operator=(const typename _Container::value_type& __value)
-      {
-	iter = container->insert_after(iter, __value);
-	return *this;
-      }
-
-      insert_iterator<_Container>&
-      operator*()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++()
-      { return *this; }
-
-      insert_iterator<_Container>&
-      operator++(int)
-      { return *this; }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/sso_string_base.h b/openflow/usr/include/c++/5/ext/sso_string_base.h
deleted file mode 100644
index d84cb12..0000000
--- a/openflow/usr/include/c++/5/ext/sso_string_base.h
+++ /dev/null
@@ -1,576 +0,0 @@
-// Short-string-optimized versatile string base -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/sso_string_base.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ext/vstring.h}
- */
-
-#ifndef _SSO_STRING_BASE_H
-#define _SSO_STRING_BASE_H 1
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    class __sso_string_base
-    : protected __vstring_utility<_CharT, _Traits, _Alloc>
-    {
-    public:
-      typedef _Traits					    traits_type;
-      typedef typename _Traits::char_type		    value_type;
-
-      typedef __vstring_utility<_CharT, _Traits, _Alloc>    _Util_Base;
-      typedef typename _Util_Base::_CharT_alloc_type        _CharT_alloc_type;
-      typedef typename _CharT_alloc_type::size_type	    size_type;
-      
-    private:
-      // Data Members:
-      typename _Util_Base::template _Alloc_hider<_CharT_alloc_type>
-                                                            _M_dataplus;
-      size_type                                             _M_string_length;
-
-      enum { _S_local_capacity = 15 };
-      
-      union
-      {
-	_CharT           _M_local_data[_S_local_capacity + 1];
-	size_type        _M_allocated_capacity;
-      };
-
-      void
-      _M_data(_CharT* __p)
-      { _M_dataplus._M_p = __p; }
-
-      void
-      _M_length(size_type __length)
-      { _M_string_length = __length; }
-
-      void
-      _M_capacity(size_type __capacity)
-      { _M_allocated_capacity = __capacity; }
-
-      bool
-      _M_is_local() const
-      { return _M_data() == _M_local_data; }
-
-      // Create & Destroy
-      _CharT*
-      _M_create(size_type&, size_type);
-      
-      void
-      _M_dispose()
-      {
-	if (!_M_is_local())
-	  _M_destroy(_M_allocated_capacity);
-      }
-
-      void
-      _M_destroy(size_type __size) throw()
-      { _M_get_allocator().deallocate(_M_data(), __size + 1); }
-
-      // _M_construct_aux is used to implement the 21.3.1 para 15 which
-      // requires special behaviour if _InIterator is an integral type
-      template<typename _InIterator>
-        void
-        _M_construct_aux(_InIterator __beg, _InIterator __end, 
-			 std::__false_type)
-	{
-          typedef typename iterator_traits<_InIterator>::iterator_category _Tag;
-          _M_construct(__beg, __end, _Tag());
-	}
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 438. Ambiguity in the "do the right thing" clause
-      template<typename _Integer>
-        void
-        _M_construct_aux(_Integer __beg, _Integer __end, std::__true_type)
-	{ _M_construct_aux_2(static_cast<size_type>(__beg), __end); }
-
-      void
-      _M_construct_aux_2(size_type __req, _CharT __c)
-      { _M_construct(__req, __c); }
-
-      template<typename _InIterator>
-        void
-        _M_construct(_InIterator __beg, _InIterator __end)
-	{
-	  typedef typename std::__is_integer<_InIterator>::__type _Integral;
-	  _M_construct_aux(__beg, __end, _Integral());
-        }
-
-      // For Input Iterators, used in istreambuf_iterators, etc.
-      template<typename _InIterator>
-        void
-        _M_construct(_InIterator __beg, _InIterator __end,
-		     std::input_iterator_tag);
-      
-      // For forward_iterators up to random_access_iterators, used for
-      // string::iterator, _CharT*, etc.
-      template<typename _FwdIterator>
-        void
-        _M_construct(_FwdIterator __beg, _FwdIterator __end,
-		     std::forward_iterator_tag);
-
-      void
-      _M_construct(size_type __req, _CharT __c);
-
-    public:
-      size_type
-      _M_max_size() const
-      { return (_M_get_allocator().max_size() - 1) / 2; }
-
-      _CharT*
-      _M_data() const
-      { return _M_dataplus._M_p; }
-
-      size_type
-      _M_length() const
-      { return _M_string_length; }
-
-      size_type
-      _M_capacity() const
-      {
-	return _M_is_local() ? size_type(_S_local_capacity)
-	                     : _M_allocated_capacity; 
-      }
-
-      bool
-      _M_is_shared() const
-      { return false; }
-
-      void
-      _M_set_leaked() { }
-
-      void
-      _M_leak() { }
-
-      void
-      _M_set_length(size_type __n)
-      {
-	_M_length(__n);
-	traits_type::assign(_M_data()[__n], _CharT());
-      }
-
-      __sso_string_base()
-      : _M_dataplus(_M_local_data)
-      { _M_set_length(0); }
-
-      __sso_string_base(const _Alloc& __a);
-
-      __sso_string_base(const __sso_string_base& __rcs);
-
-#if __cplusplus >= 201103L
-      __sso_string_base(__sso_string_base&& __rcs);
-#endif
-
-      __sso_string_base(size_type __n, _CharT __c, const _Alloc& __a);
-
-      template<typename _InputIterator>
-        __sso_string_base(_InputIterator __beg, _InputIterator __end,
-			  const _Alloc& __a);
-
-      ~__sso_string_base()
-      { _M_dispose(); }
-
-      _CharT_alloc_type&
-      _M_get_allocator()
-      { return _M_dataplus; }
-
-      const _CharT_alloc_type&
-      _M_get_allocator() const
-      { return _M_dataplus; }
-
-      void
-      _M_swap(__sso_string_base& __rcs);
-
-      void
-      _M_assign(const __sso_string_base& __rcs);
-
-      void
-      _M_reserve(size_type __res);
-
-      void
-      _M_mutate(size_type __pos, size_type __len1, const _CharT* __s,
-		size_type __len2);
-
-      void
-      _M_erase(size_type __pos, size_type __n);
-
-      void
-      _M_clear()
-      { _M_set_length(0); }
-
-      bool
-      _M_compare(const __sso_string_base&) const
-      { return false; }
-    };
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    _M_swap(__sso_string_base& __rcs)
-    {
-      if (this == &__rcs)
-	return;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 431. Swapping containers with unequal allocators.
-      std::__alloc_swap<_CharT_alloc_type>::_S_do_it(_M_get_allocator(),
-						     __rcs._M_get_allocator());
-
-      if (_M_is_local())
-	if (__rcs._M_is_local())
-	  {
-	    if (_M_length() && __rcs._M_length())
-	      {
-		_CharT __tmp_data[_S_local_capacity + 1];
-		traits_type::copy(__tmp_data, __rcs._M_local_data,
-				  _S_local_capacity + 1);
-		traits_type::copy(__rcs._M_local_data, _M_local_data,
-				  _S_local_capacity + 1);
-		traits_type::copy(_M_local_data, __tmp_data,
-				  _S_local_capacity + 1);
-	      }
-	    else if (__rcs._M_length())
-	      {
-		traits_type::copy(_M_local_data, __rcs._M_local_data,
-				  _S_local_capacity + 1);
-		_M_length(__rcs._M_length());
-		__rcs._M_set_length(0);
-		return;
-	      }
-	    else if (_M_length())
-	      {
-		traits_type::copy(__rcs._M_local_data, _M_local_data,
-				  _S_local_capacity + 1);
-		__rcs._M_length(_M_length());
-		_M_set_length(0);
-		return;
-	      }
-	  }
-	else
-	  {
-	    const size_type __tmp_capacity = __rcs._M_allocated_capacity;
-	    traits_type::copy(__rcs._M_local_data, _M_local_data,
-			      _S_local_capacity + 1);
-	    _M_data(__rcs._M_data());
-	    __rcs._M_data(__rcs._M_local_data);
-	    _M_capacity(__tmp_capacity);
-	  }
-      else
-	{
-	  const size_type __tmp_capacity = _M_allocated_capacity;
-	  if (__rcs._M_is_local())
-	    {
-	      traits_type::copy(_M_local_data, __rcs._M_local_data,
-				_S_local_capacity + 1);
-	      __rcs._M_data(_M_data());
-	      _M_data(_M_local_data);
-	    }
-	  else
-	    {
-	      _CharT* __tmp_ptr = _M_data();
-	      _M_data(__rcs._M_data());
-	      __rcs._M_data(__tmp_ptr);
-	      _M_capacity(__rcs._M_allocated_capacity);
-	    }
-	  __rcs._M_capacity(__tmp_capacity);
-	}
-
-      const size_type __tmp_length = _M_length();
-      _M_length(__rcs._M_length());
-      __rcs._M_length(__tmp_length);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    _CharT*
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    _M_create(size_type& __capacity, size_type __old_capacity)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 83.  String::npos vs. string::max_size()
-      if (__capacity > _M_max_size())
-	std::__throw_length_error(__N("__sso_string_base::_M_create"));
-
-      // The below implements an exponential growth policy, necessary to
-      // meet amortized linear time requirements of the library: see
-      // http://gcc.gnu.org/ml/libstdc++/2001-07/msg00085.html.
-      if (__capacity > __old_capacity && __capacity < 2 * __old_capacity)
-	{
-	  __capacity = 2 * __old_capacity;
-	  // Never allocate a string bigger than max_size.
-	  if (__capacity > _M_max_size())
-	    __capacity = _M_max_size();
-	}
-
-      // NB: Need an array of char_type[__capacity], plus a terminating
-      // null char_type() element.
-      return _M_get_allocator().allocate(__capacity + 1);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    __sso_string_base(const _Alloc& __a)
-    : _M_dataplus(__a, _M_local_data)
-    { _M_set_length(0); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    __sso_string_base(const __sso_string_base& __rcs)
-    : _M_dataplus(__rcs._M_get_allocator(), _M_local_data)
-    { _M_construct(__rcs._M_data(), __rcs._M_data() + __rcs._M_length()); }
-
-#if __cplusplus >= 201103L
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    __sso_string_base(__sso_string_base&& __rcs)
-    : _M_dataplus(__rcs._M_get_allocator(), _M_local_data)
-    {
-      if (__rcs._M_is_local())
-	{
-	  if (__rcs._M_length())
-	    traits_type::copy(_M_local_data, __rcs._M_local_data,
-			      _S_local_capacity + 1);
-	}
-      else
-	{
-	  _M_data(__rcs._M_data());
-	  _M_capacity(__rcs._M_allocated_capacity);
-	}
-
-      _M_set_length(__rcs._M_length());
-      __rcs._M_data(__rcs._M_local_data);
-      __rcs._M_set_length(0);
-    }
-#endif
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    __sso_string_base(size_type __n, _CharT __c, const _Alloc& __a)
-    : _M_dataplus(__a, _M_local_data)
-    { _M_construct(__n, __c); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InputIterator>
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    __sso_string_base(_InputIterator __beg, _InputIterator __end,
-		      const _Alloc& __a)
-    : _M_dataplus(__a, _M_local_data)
-    { _M_construct(__beg, __end); }
-
-  // NB: This is the special case for Input Iterators, used in
-  // istreambuf_iterators, etc.
-  // Input Iterators have a cost structure very different from
-  // pointers, calling for a different coding style.
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InIterator>
-      void
-      __sso_string_base<_CharT, _Traits, _Alloc>::
-      _M_construct(_InIterator __beg, _InIterator __end,
-		   std::input_iterator_tag)
-      {
-	size_type __len = 0;
-	size_type __capacity = size_type(_S_local_capacity);
-
-	while (__beg != __end && __len < __capacity)
-	  {
-	    _M_data()[__len++] = *__beg;
-	    ++__beg;
-	  }
-	
-	__try
-	  {
-	    while (__beg != __end)
-	      {
-		if (__len == __capacity)
-		  {
-		    // Allocate more space.
-		    __capacity = __len + 1;
-		    _CharT* __another = _M_create(__capacity, __len);
-		    this->_S_copy(__another, _M_data(), __len);
-		    _M_dispose();
-		    _M_data(__another);
-		    _M_capacity(__capacity);
-		  }
-		_M_data()[__len++] = *__beg;
-		++__beg;
-	      }
-	  }
-	__catch(...)
-	  {
-	    _M_dispose();
-	    __throw_exception_again;
-	  }
-
-	_M_set_length(__len);
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InIterator>
-      void
-      __sso_string_base<_CharT, _Traits, _Alloc>::
-      _M_construct(_InIterator __beg, _InIterator __end,
-		   std::forward_iterator_tag)
-      {
-	// NB: Not required, but considered best practice.
-	if (__is_null_pointer(__beg) && __beg != __end)
-	  std::__throw_logic_error(__N("__sso_string_base::"
-				       "_M_construct null not valid"));
-
-	size_type __dnew = static_cast<size_type>(std::distance(__beg, __end));
-
-	if (__dnew > size_type(_S_local_capacity))
-	  {
-	    _M_data(_M_create(__dnew, size_type(0)));
-	    _M_capacity(__dnew);
-	  }
-
-	// Check for out_of_range and length_error exceptions.
-	__try
-	  { this->_S_copy_chars(_M_data(), __beg, __end); }
-	__catch(...)
-	  {
-	    _M_dispose();
-	    __throw_exception_again;
-	  }
-
-	_M_set_length(__dnew);
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    _M_construct(size_type __n, _CharT __c)
-    {
-      if (__n > size_type(_S_local_capacity))
-	{
-	  _M_data(_M_create(__n, size_type(0)));
-	  _M_capacity(__n);
-	}
-
-      if (__n)
-	this->_S_assign(_M_data(), __n, __c);
-
-      _M_set_length(__n);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    _M_assign(const __sso_string_base& __rcs)
-    {
-      if (this != &__rcs)
-	{
-	  const size_type __rsize = __rcs._M_length();
-	  const size_type __capacity = _M_capacity();
-
-	  if (__rsize > __capacity)
-	    {
-	      size_type __new_capacity = __rsize;
-	      _CharT* __tmp = _M_create(__new_capacity, __capacity);
-	      _M_dispose();
-	      _M_data(__tmp);
-	      _M_capacity(__new_capacity);
-	    }
-
-	  if (__rsize)
-	    this->_S_copy(_M_data(), __rcs._M_data(), __rsize);
-
-	  _M_set_length(__rsize);
-	}
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    _M_reserve(size_type __res)
-    {
-      // Make sure we don't shrink below the current size.
-      if (__res < _M_length())
-	__res = _M_length();
-
-      const size_type __capacity = _M_capacity();
-      if (__res != __capacity)
-	{
-	  if (__res > __capacity
-	      || __res > size_type(_S_local_capacity))
-	    {
-	      _CharT* __tmp = _M_create(__res, __capacity);
-	      this->_S_copy(__tmp, _M_data(), _M_length() + 1);
-	      _M_dispose();
-	      _M_data(__tmp);
-	      _M_capacity(__res);
-	    }
-	  else if (!_M_is_local())
-	    {
-	      this->_S_copy(_M_local_data, _M_data(), _M_length() + 1);
-	      _M_destroy(__capacity);
-	      _M_data(_M_local_data);
-	    }
-	}
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    _M_mutate(size_type __pos, size_type __len1, const _CharT* __s,
-	      size_type __len2)
-    {
-      const size_type __how_much = _M_length() - __pos - __len1;
-      
-      size_type __new_capacity = _M_length() + __len2 - __len1;
-      _CharT* __r = _M_create(__new_capacity, _M_capacity());
-
-      if (__pos)
-	this->_S_copy(__r, _M_data(), __pos);
-      if (__s && __len2)
-	this->_S_copy(__r + __pos, __s, __len2);
-      if (__how_much)
-	this->_S_copy(__r + __pos + __len2,
-		      _M_data() + __pos + __len1, __how_much);
-      
-      _M_dispose();
-      _M_data(__r);
-      _M_capacity(__new_capacity);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    __sso_string_base<_CharT, _Traits, _Alloc>::
-    _M_erase(size_type __pos, size_type __n)
-    {
-      const size_type __how_much = _M_length() - __pos - __n;
-
-      if (__how_much && __n)
-	this->_S_move(_M_data() + __pos, _M_data() + __pos + __n, __how_much);
-
-      _M_set_length(_M_length() - __n);
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _SSO_STRING_BASE_H */
diff --git a/openflow/usr/include/c++/5/ext/stdio_filebuf.h b/openflow/usr/include/c++/5/ext/stdio_filebuf.h
deleted file mode 100644
index 2ada0ca..0000000
--- a/openflow/usr/include/c++/5/ext/stdio_filebuf.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// File descriptor layer for filebuf -*- C++ -*-
-
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/stdio_filebuf.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _STDIO_FILEBUF_H
-#define _STDIO_FILEBUF_H 1
-
-#pragma GCC system_header
-
-#include <fstream>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief Provides a layer of compatibility for C/POSIX.
-   *  @ingroup io
-   *
-   *  This GNU extension provides extensions for working with standard C
-   *  FILE*'s and POSIX file descriptors.  It must be instantiated by the
-   *  user with the type of character used in the file stream, e.g.,
-   *  stdio_filebuf<char>.
-  */
-  template<typename _CharT, typename _Traits = std::char_traits<_CharT> >
-    class stdio_filebuf : public std::basic_filebuf<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT				        char_type;
-      typedef _Traits				        traits_type;
-      typedef typename traits_type::int_type		int_type;
-      typedef typename traits_type::pos_type		pos_type;
-      typedef typename traits_type::off_type		off_type;
-      typedef std::size_t                               size_t;
-
-    public:
-      /**
-       * deferred initialization
-      */
-      stdio_filebuf() : std::basic_filebuf<_CharT, _Traits>() {}
-
-      /**
-       *  @param  __fd  An open file descriptor.
-       *  @param  __mode  Same meaning as in a standard filebuf.
-       *  @param  __size Optimal or preferred size of internal buffer,
-       *                 in chars.
-       *
-       *  This constructor associates a file stream buffer with an open
-       *  POSIX file descriptor. The file descriptor will be automatically
-       *  closed when the stdio_filebuf is closed/destroyed.
-      */
-      stdio_filebuf(int __fd, std::ios_base::openmode __mode,
-		    size_t __size = static_cast<size_t>(BUFSIZ));
-
-      /**
-       *  @param  __f  An open @c FILE*.
-       *  @param  __mode  Same meaning as in a standard filebuf.
-       *  @param  __size Optimal or preferred size of internal buffer,
-       *                 in chars.  Defaults to system's @c BUFSIZ.
-       *
-       *  This constructor associates a file stream buffer with an open
-       *  C @c FILE*.  The @c FILE* will not be automatically closed when the
-       *  stdio_filebuf is closed/destroyed.
-      */
-      stdio_filebuf(std::__c_file* __f, std::ios_base::openmode __mode,
-		    size_t __size = static_cast<size_t>(BUFSIZ));
-
-      /**
-       *  Closes the external data stream if the file descriptor constructor
-       *  was used.
-      */
-      virtual
-      ~stdio_filebuf();
-
-#if __cplusplus >= 201103L
-      stdio_filebuf(stdio_filebuf&&) = default;
-      stdio_filebuf& operator=(stdio_filebuf&&) = default;
-
-      void
-      swap(stdio_filebuf& __fb)
-      { std::basic_filebuf<_CharT, _Traits>::swap(__fb); }
-#endif
-
-      /**
-       *  @return  The underlying file descriptor.
-       *
-       *  Once associated with an external data stream, this function can be
-       *  used to access the underlying POSIX file descriptor.  Note that
-       *  there is no way for the library to track what you do with the
-       *  descriptor, so be careful.
-      */
-      int
-      fd() { return this->_M_file.fd(); }
-
-      /**
-       *  @return  The underlying FILE*.
-       *
-       *  This function can be used to access the underlying "C" file pointer.
-       *  Note that there is no way for the library to track what you do
-       *  with the file, so be careful.
-       */
-      std::__c_file*
-      file() { return this->_M_file.file(); }
-    };
-
-  template<typename _CharT, typename _Traits>
-    stdio_filebuf<_CharT, _Traits>::~stdio_filebuf()
-    { }
-
-  template<typename _CharT, typename _Traits>
-    stdio_filebuf<_CharT, _Traits>::
-    stdio_filebuf(int __fd, std::ios_base::openmode __mode, size_t __size)
-    {
-      this->_M_file.sys_open(__fd, __mode);
-      if (this->is_open())
-	{
-	  this->_M_mode = __mode;
-	  this->_M_buf_size = __size;
-	  this->_M_allocate_internal_buffer();
-	  this->_M_reading = false;
-	  this->_M_writing = false;
-	  this->_M_set_buffer(-1);
-	}
-    }
-
-  template<typename _CharT, typename _Traits>
-    stdio_filebuf<_CharT, _Traits>::
-    stdio_filebuf(std::__c_file* __f, std::ios_base::openmode __mode,
-		  size_t __size)
-    {
-      this->_M_file.sys_open(__f, __mode);
-      if (this->is_open())
-	{
-	  this->_M_mode = __mode;
-	  this->_M_buf_size = __size;
-	  this->_M_allocate_internal_buffer();
-	  this->_M_reading = false;
-	  this->_M_writing = false;
-	  this->_M_set_buffer(-1);
-	}
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/stdio_sync_filebuf.h b/openflow/usr/include/c++/5/ext/stdio_sync_filebuf.h
deleted file mode 100644
index 8aec993..0000000
--- a/openflow/usr/include/c++/5/ext/stdio_sync_filebuf.h
+++ /dev/null
@@ -1,319 +0,0 @@
-// Iostreams wrapper for stdio FILE* -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/stdio_sync_filebuf.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _STDIO_SYNC_FILEBUF_H
-#define _STDIO_SYNC_FILEBUF_H 1
-
-#pragma GCC system_header
-
-#include <streambuf>
-#include <unistd.h>
-#include <cstdio>
-#include <bits/c++io.h>  // For __c_file
-#include <bits/move.h>   // For __exchange
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-#include <cwchar>
-#endif
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief Provides a layer of compatibility for C.
-   *  @ingroup io
-   *
-   *  This GNU extension provides extensions for working with standard
-   *  C FILE*'s.  It must be instantiated by the user with the type of
-   *  character used in the file stream, e.g., stdio_filebuf<char>.
-  */
-  template<typename _CharT, typename _Traits = std::char_traits<_CharT> >
-    class stdio_sync_filebuf : public std::basic_streambuf<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT					char_type;
-      typedef _Traits					traits_type;
-      typedef typename traits_type::int_type		int_type;
-      typedef typename traits_type::pos_type		pos_type;
-      typedef typename traits_type::off_type		off_type;
-
-    private:
-      typedef std::basic_streambuf<_CharT, _Traits> __streambuf_type;
-
-      // Underlying stdio FILE
-      std::__c_file* _M_file;
-
-      // Last character gotten. This is used when pbackfail is
-      // called from basic_streambuf::sungetc()
-      int_type _M_unget_buf;
-
-    public:
-      explicit
-      stdio_sync_filebuf(std::__c_file* __f)
-      : _M_file(__f), _M_unget_buf(traits_type::eof())
-      { }
-
-#if __cplusplus >= 201103L
-      stdio_sync_filebuf(stdio_sync_filebuf&& __fb) noexcept
-      : __streambuf_type(std::move(__fb)),
-      _M_file(__fb._M_file), _M_unget_buf(__fb._M_unget_buf)
-      {
-	__fb._M_file = nullptr;
-	__fb._M_unget_buf = traits_type::eof();
-      }
-
-      stdio_sync_filebuf&
-      operator=(stdio_sync_filebuf&& __fb) noexcept
-      {
-	__streambuf_type::operator=(__fb);
-	_M_file = std::__exchange(__fb._M_file, nullptr);
-	_M_unget_buf = std::__exchange(__fb._M_unget_buf, traits_type::eof());
-	return *this;
-      }
-
-      void
-      swap(stdio_sync_filebuf& __fb)
-      {
-	__streambuf_type::swap(__fb);
-	std::swap(_M_file, __fb._M_file);
-	std::swap(_M_unget_buf, __fb._M_unget_buf);
-      }
-#endif
-
-      /**
-       *  @return  The underlying FILE*.
-       *
-       *  This function can be used to access the underlying C file pointer.
-       *  Note that there is no way for the library to track what you do
-       *  with the file, so be careful.
-       */
-      std::__c_file*
-      file() { return this->_M_file; }
-
-    protected:
-      int_type
-      syncgetc();
-
-      int_type
-      syncungetc(int_type __c);
-
-      int_type
-      syncputc(int_type __c);
-
-      virtual int_type
-      underflow()
-      {
-	int_type __c = this->syncgetc();
-	return this->syncungetc(__c);
-      }
-
-      virtual int_type
-      uflow()
-      {
-	// Store the gotten character in case we need to unget it.
-	_M_unget_buf = this->syncgetc();
-	return _M_unget_buf;
-      }
-
-      virtual int_type
-      pbackfail(int_type __c = traits_type::eof())
-      {
-	int_type __ret;
-	const int_type __eof = traits_type::eof();
-
-	// Check if the unget or putback was requested
-	if (traits_type::eq_int_type(__c, __eof)) // unget
-	  {
-	    if (!traits_type::eq_int_type(_M_unget_buf, __eof))
-	      __ret = this->syncungetc(_M_unget_buf);
-	    else // buffer invalid, fail.
-	      __ret = __eof;
-	  }
-	else // putback
-	  __ret = this->syncungetc(__c);
-
-	// The buffered character is no longer valid, discard it.
-	_M_unget_buf = __eof;
-	return __ret;
-      }
-
-      virtual std::streamsize
-      xsgetn(char_type* __s, std::streamsize __n);
-
-      virtual int_type
-      overflow(int_type __c = traits_type::eof())
-      {
-	int_type __ret;
-	if (traits_type::eq_int_type(__c, traits_type::eof()))
-	  {
-	    if (std::fflush(_M_file))
-	      __ret = traits_type::eof();
-	    else
-	      __ret = traits_type::not_eof(__c);
-	  }
-	else
-	  __ret = this->syncputc(__c);
-	return __ret;
-      }
-
-      virtual std::streamsize
-      xsputn(const char_type* __s, std::streamsize __n);
-
-      virtual int
-      sync()
-      { return std::fflush(_M_file); }
-
-      virtual std::streampos
-      seekoff(std::streamoff __off, std::ios_base::seekdir __dir,
-	      std::ios_base::openmode = std::ios_base::in | std::ios_base::out)
-      {
-	std::streampos __ret(std::streamoff(-1));
-	int __whence;
-	if (__dir == std::ios_base::beg)
-	  __whence = SEEK_SET;
-	else if (__dir == std::ios_base::cur)
-	  __whence = SEEK_CUR;
-	else
-	  __whence = SEEK_END;
-#ifdef _GLIBCXX_USE_LFS
-	if (!fseeko64(_M_file, __off, __whence))
-	  __ret = std::streampos(ftello64(_M_file));
-#else
-	if (!fseek(_M_file, __off, __whence))
-	  __ret = std::streampos(std::ftell(_M_file));
-#endif
-	return __ret;
-      }
-
-      virtual std::streampos
-      seekpos(std::streampos __pos,
-	      std::ios_base::openmode __mode =
-	      std::ios_base::in | std::ios_base::out)
-      { return seekoff(std::streamoff(__pos), std::ios_base::beg, __mode); }
-    };
-
-  template<>
-    inline stdio_sync_filebuf<char>::int_type
-    stdio_sync_filebuf<char>::syncgetc()
-    { return std::getc(_M_file); }
-
-  template<>
-    inline stdio_sync_filebuf<char>::int_type
-    stdio_sync_filebuf<char>::syncungetc(int_type __c)
-    { return std::ungetc(__c, _M_file); }
-
-  template<>
-    inline stdio_sync_filebuf<char>::int_type
-    stdio_sync_filebuf<char>::syncputc(int_type __c)
-    { return std::putc(__c, _M_file); }
-
-  template<>
-    inline std::streamsize
-    stdio_sync_filebuf<char>::xsgetn(char* __s, std::streamsize __n)
-    {
-      std::streamsize __ret = std::fread(__s, 1, __n, _M_file);
-      if (__ret > 0)
-	_M_unget_buf = traits_type::to_int_type(__s[__ret - 1]);
-      else
-	_M_unget_buf = traits_type::eof();
-      return __ret;
-    }
-
-  template<>
-    inline std::streamsize
-    stdio_sync_filebuf<char>::xsputn(const char* __s, std::streamsize __n)
-    { return std::fwrite(__s, 1, __n, _M_file); }
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    inline stdio_sync_filebuf<wchar_t>::int_type
-    stdio_sync_filebuf<wchar_t>::syncgetc()
-    { return std::getwc(_M_file); }
-
-  template<>
-    inline stdio_sync_filebuf<wchar_t>::int_type
-    stdio_sync_filebuf<wchar_t>::syncungetc(int_type __c)
-    { return std::ungetwc(__c, _M_file); }
-
-  template<>
-    inline stdio_sync_filebuf<wchar_t>::int_type
-    stdio_sync_filebuf<wchar_t>::syncputc(int_type __c)
-    { return std::putwc(__c, _M_file); }
-
-  template<>
-    inline std::streamsize
-    stdio_sync_filebuf<wchar_t>::xsgetn(wchar_t* __s, std::streamsize __n)
-    {
-      std::streamsize __ret = 0;
-      const int_type __eof = traits_type::eof();
-      while (__n--)
-	{
-	  int_type __c = this->syncgetc();
-	  if (traits_type::eq_int_type(__c, __eof))
-	    break;
-	  __s[__ret] = traits_type::to_char_type(__c);
-	  ++__ret;
-	}
-
-      if (__ret > 0)
-	_M_unget_buf = traits_type::to_int_type(__s[__ret - 1]);
-      else
-	_M_unget_buf = traits_type::eof();
-      return __ret;
-    }
-
-  template<>
-    inline std::streamsize
-    stdio_sync_filebuf<wchar_t>::xsputn(const wchar_t* __s,
-					std::streamsize __n)
-    {
-      std::streamsize __ret = 0;
-      const int_type __eof = traits_type::eof();
-      while (__n--)
-	{
-	  if (traits_type::eq_int_type(this->syncputc(*__s++), __eof))
-	    break;
-	  ++__ret;
-	}
-      return __ret;
-    }
-#endif
-
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class stdio_sync_filebuf<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class stdio_sync_filebuf<wchar_t>;
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/string_conversions.h b/openflow/usr/include/c++/5/ext/string_conversions.h
deleted file mode 100644
index f4648a8..0000000
--- a/openflow/usr/include/c++/5/ext/string_conversions.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// String Conversions -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/string_conversions.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _STRING_CONVERSIONS_H
-#define _STRING_CONVERSIONS_H 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <bits/c++config.h>
-#include <ext/numeric_traits.h>
-#include <bits/functexcept.h>
-#include <cstdlib>
-#include <cwchar>
-#include <cstdio>
-#include <cerrno>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Helper for all the sto* functions.
-  template<typename _TRet, typename _Ret = _TRet, typename _CharT,
-	   typename... _Base>
-    _Ret
-    __stoa(_TRet (*__convf) (const _CharT*, _CharT**, _Base...),
-	   const char* __name, const _CharT* __str, std::size_t* __idx,
-	   _Base... __base)
-    {
-      _Ret __ret;
-
-      _CharT* __endptr;
-      errno = 0;
-      const _TRet __tmp = __convf(__str, &__endptr, __base...);
-
-      if (__endptr == __str)
-	std::__throw_invalid_argument(__name);
-      else if (errno == ERANGE
-	       || (std::__are_same<_Ret, int>::__value
-		   && (__tmp < __numeric_traits<int>::__min
-		       || __tmp > __numeric_traits<int>::__max)))
-	std::__throw_out_of_range(__name);
-      else
-	__ret = __tmp;
-
-      if (__idx)
-	*__idx = __endptr - __str;
-
-      return __ret;
-    }
-
-  // Helper for the to_string / to_wstring functions.
-  template<typename _String, typename _CharT = typename _String::value_type>
-    _String
-    __to_xstring(int (*__convf) (_CharT*, std::size_t, const _CharT*,
-				 __builtin_va_list), std::size_t __n,
-		 const _CharT* __fmt, ...)
-    {
-      // XXX Eventually the result will be constructed in place in
-      // the C++0x string, likely with the help of internal hooks.
-      _CharT* __s = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							  * __n));
-
-      __builtin_va_list __args;
-      __builtin_va_start(__args, __fmt);
-
-      const int __len = __convf(__s, __n, __fmt, __args);
-
-      __builtin_va_end(__args);
-
-      return _String(__s, __s + __len);
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // C++11
-
-#endif // _STRING_CONVERSIONS_H
diff --git a/openflow/usr/include/c++/5/ext/throw_allocator.h b/openflow/usr/include/c++/5/ext/throw_allocator.h
deleted file mode 100644
index df9a964..0000000
--- a/openflow/usr/include/c++/5/ext/throw_allocator.h
+++ /dev/null
@@ -1,980 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice
-// and this permission notice appear in supporting documentation. None
-// of the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied
-// warranty.
-
-/** @file ext/throw_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- *
- *  Contains two exception-generating types (throw_value, throw_allocator)
- *  intended to be used as value and allocator types while testing
- *  exception safety in templatized containers and algorithms. The
- *  allocator has additional log and debug features. The exception
- *  generated is of type forced_exception_error.
- */
-
-#ifndef _THROW_ALLOCATOR_H
-#define _THROW_ALLOCATOR_H 1
-
-#include <cmath>
-#include <ctime>
-#include <map>
-#include <string>
-#include <ostream>
-#include <stdexcept>
-#include <utility>
-#include <bits/functexcept.h>
-#include <bits/move.h>
-#if __cplusplus >= 201103L
-# include <functional>
-# include <random>
-#else
-# include <tr1/functional>
-# include <tr1/random>
-#endif
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief Thown by exception safety machinery.
-   *  @ingroup exceptions
-   */
-  struct forced_error : public std::exception
-  { };
-
-  // Substitute for forced_error object when -fno-exceptions.
-  inline void
-  __throw_forced_error()
-  { _GLIBCXX_THROW_OR_ABORT(forced_error()); }
-
-  /**
-   *  @brief Base class for checking address and label information
-   *  about allocations. Create a std::map between the allocated
-   *  address (void*) and a datum for annotations, which are a pair of
-   *  numbers corresponding to label and allocated size.
-   */
-  struct annotate_base
-  {
-    annotate_base()
-    {
-      label();
-      map_alloc();
-    }
-
-    static void
-    set_label(size_t l)
-    { label() = l; }
-
-    static size_t
-    get_label()
-    { return label(); }
-
-    void
-    insert(void* p, size_t size)
-    {
-      if (!p)
-	{
-	  std::string error("annotate_base::insert null insert!\n");
-	  log_to_string(error, make_entry(p, size));
-	  std::__throw_logic_error(error.c_str());
-	}
-
-      const_iterator found = map_alloc().find(p);
-      if (found != map_alloc().end())
-	{
-	  std::string error("annotate_base::insert double insert!\n");
-	  log_to_string(error, make_entry(p, size));
-	  log_to_string(error, *found);
-	  std::__throw_logic_error(error.c_str());
-	}
-
-      map_alloc().insert(make_entry(p, size));
-    }
-
-    void
-    erase(void* p, size_t size)
-    {
-      check_allocated(p, size);
-      map_alloc().erase(p);
-    }
-
-#if __cplusplus >= 201103L
-    void
-    insert_construct(void* p)
-    {
-      if (!p)
-	{
-	  std::string error("annotate_base::insert_construct null!\n");
-	  std::__throw_logic_error(error.c_str());
-	}
-
-      auto found = map_construct().find(p);
-      if (found != map_construct().end())
-	{
-	  std::string error("annotate_base::insert_construct double insert!\n");
-	  log_to_string(error, std::make_pair(p, get_label()));
-	  log_to_string(error, *found);
-	  std::__throw_logic_error(error.c_str());
-	}
-
-      map_construct().insert(std::make_pair(p, get_label()));
-    }
-
-    void
-    erase_construct(void* p)
-    {
-      check_constructed(p);
-      map_construct().erase(p);
-    }
-#endif
-
-    // See if a particular address and allocation size has been saved.
-    inline void
-    check_allocated(void* p, size_t size)
-    {
-      const_iterator found = map_alloc().find(p);
-      if (found == map_alloc().end())
-	{
-	  std::string error("annotate_base::check_allocated by value "
-			    "null erase!\n");
-	  log_to_string(error, make_entry(p, size));
-	  std::__throw_logic_error(error.c_str());
-	}
-
-      if (found->second.second != size)
-	{
-	  std::string error("annotate_base::check_allocated by value "
-			    "wrong-size erase!\n");
-	  log_to_string(error, make_entry(p, size));
-	  log_to_string(error, *found);
-	  std::__throw_logic_error(error.c_str());
-	}
-    }
-
-    // See if a given label has been allocated.
-    inline void
-    check(size_t label)
-    {
-      std::string found;
-      {
-	const_iterator beg = map_alloc().begin();
-	const_iterator end = map_alloc().end();
-	while (beg != end)
-	  {
-	    if (beg->second.first == label)
-	      log_to_string(found, *beg);
-	    ++beg;
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      {
-	auto beg = map_construct().begin();
-	auto end = map_construct().end();
-	while (beg != end)
-	  {
-	    if (beg->second == label)
-	      log_to_string(found, *beg);
-	    ++beg;
-	  }
-      }
-#endif
-
-      if (!found.empty())
-	{
-	  std::string error("annotate_base::check by label\n");
-	  error += found;
-	  std::__throw_logic_error(error.c_str());
-	}
-    }
-
-    // See if there is anything left allocated or constructed.
-    inline static void
-    check()
-    {
-      std::string found;
-      {
-	const_iterator beg = map_alloc().begin();
-	const_iterator end = map_alloc().end();
-	while (beg != end)
-	  {
-	    log_to_string(found, *beg);
-	    ++beg;
-	  }
-      }
-
-#if __cplusplus >= 201103L
-      {
-	auto beg = map_construct().begin();
-	auto end = map_construct().end();
-	while (beg != end)
-	  {
-	    log_to_string(found, *beg);
-	    ++beg;
-	  }
-      }
-#endif
-
-      if (!found.empty())
-	{
-	  std::string error("annotate_base::check \n");
-	  error += found;
-	  std::__throw_logic_error(error.c_str());
-	}
-    }
-
-#if __cplusplus >= 201103L
-    inline void
-    check_constructed(void* p)
-    {
-      auto found = map_construct().find(p);
-      if (found == map_construct().end())
-	{
-	  std::string error("annotate_base::check_constructed not "
-			    "constructed!\n");
-	  log_to_string(error, std::make_pair(p, get_label()));
-	  std::__throw_logic_error(error.c_str());
-	}
-    }
-
-    inline void
-    check_constructed(size_t label)
-    {
-      auto beg = map_construct().begin();
-      auto end = map_construct().end();
-      std::string found;
-      while (beg != end)
-	{
-	  if (beg->second == label)
-	    log_to_string(found, *beg);
-	  ++beg;
-	}
-
-      if (!found.empty())
-	{
-	  std::string error("annotate_base::check_constructed by label\n");
-	  error += found;
-	  std::__throw_logic_error(error.c_str());
-	}
-    }
-#endif
-
-  private:
-    typedef std::pair<size_t, size_t>		data_type;
-    typedef std::map<void*, data_type> 		map_alloc_type;
-    typedef map_alloc_type::value_type 		entry_type;
-    typedef map_alloc_type::const_iterator 		const_iterator;
-    typedef map_alloc_type::const_reference 		const_reference;
-#if __cplusplus >= 201103L
-    typedef std::map<void*, size_t>		map_construct_type;
-#endif
-
-    friend std::ostream&
-    operator<<(std::ostream&, const annotate_base&);
-
-    entry_type
-    make_entry(void* p, size_t size)
-    { return std::make_pair(p, data_type(get_label(), size)); }
-
-    static void
-    log_to_string(std::string& s, const_reference ref)
-    {
-      char buf[40];
-      const char tab('\t');
-      s += "label: ";
-      unsigned long l = static_cast<unsigned long>(ref.second.first);
-      __builtin_sprintf(buf, "%lu", l);
-      s += buf;
-      s += tab;
-      s += "size: ";
-      l = static_cast<unsigned long>(ref.second.second);
-      __builtin_sprintf(buf, "%lu", l);
-      s += buf;
-      s += tab;
-      s += "address: ";
-      __builtin_sprintf(buf, "%p", ref.first);
-      s += buf;
-      s += '\n';
-    }
-
-#if __cplusplus >= 201103L
-    static void
-    log_to_string(std::string& s, const std::pair<const void*, size_t>& ref)
-    {
-      char buf[40];
-      const char tab('\t');
-      s += "label: ";
-      unsigned long l = static_cast<unsigned long>(ref.second);
-      __builtin_sprintf(buf, "%lu", l);
-      s += buf;
-      s += tab;
-      s += "address: ";
-      __builtin_sprintf(buf, "%p", ref.first);
-      s += buf;
-      s += '\n';
-    }
-#endif
-
-    static size_t&
-    label()
-    {
-      static size_t _S_label(std::numeric_limits<size_t>::max());
-      return _S_label;
-    }
-
-    static map_alloc_type&
-    map_alloc()
-    {
-      static map_alloc_type _S_map;
-      return _S_map;
-    }
-
-#if __cplusplus >= 201103L
-    static map_construct_type&
-    map_construct()
-    {
-      static map_construct_type _S_map;
-      return _S_map;
-    }
-#endif
-  };
-
-  inline std::ostream&
-  operator<<(std::ostream& os, const annotate_base& __b)
-  {
-    std::string error;
-    typedef annotate_base base_type;
-    {
-      base_type::const_iterator beg = __b.map_alloc().begin();
-      base_type::const_iterator end = __b.map_alloc().end();
-      for (; beg != end; ++beg)
-	__b.log_to_string(error, *beg);
-    }
-#if __cplusplus >= 201103L
-    {
-      auto beg = __b.map_construct().begin();
-      auto end = __b.map_construct().end();
-      for (; beg != end; ++beg)
-	__b.log_to_string(error, *beg);      
-    }
-#endif
-    return os << error;
-  }
-
-
-  /**
-   *  @brief Base struct for condition policy.
-   *
-   * Requires a public member function with the signature
-   * void throw_conditionally()
-   */
-  struct condition_base
-  {
-    virtual ~condition_base() { };
-  };
-
-
-  /**
-   *  @brief Base class for incremental control and throw.
-   */
-  struct limit_condition : public condition_base
-  {
-    // Scope-level adjustor objects: set limit for throw at the
-    // beginning of a scope block, and restores to previous limit when
-    // object is destroyed on exiting the block.
-    struct adjustor_base
-    {
-    private:
-      const size_t _M_orig;
-
-    public:
-      adjustor_base() : _M_orig(limit()) { }
-
-      virtual
-      ~adjustor_base() { set_limit(_M_orig); }
-    };
-
-    /// Never enter the condition.
-    struct never_adjustor : public adjustor_base
-    {
-      never_adjustor() { set_limit(std::numeric_limits<size_t>::max()); }
-    };
-
-    /// Always enter the condition.
-    struct always_adjustor : public adjustor_base
-    {
-      always_adjustor() { set_limit(count()); }
-    };
-
-    /// Enter the nth condition.
-    struct limit_adjustor : public adjustor_base
-    {
-      limit_adjustor(const size_t __l) { set_limit(__l); }
-    };
-
-    // Increment _S_count every time called.
-    // If _S_count matches the limit count, throw.
-    static void
-    throw_conditionally()
-    {
-      if (count() == limit())
-	__throw_forced_error();
-      ++count();
-    }
-
-    static size_t&
-    count()
-    {
-      static size_t _S_count(0);
-      return _S_count;
-    }
-
-    static size_t&
-    limit()
-    {
-      static size_t _S_limit(std::numeric_limits<size_t>::max());
-      return _S_limit;
-    }
-
-    // Zero the throw counter, set limit to argument.
-    static void
-    set_limit(const size_t __l)
-    {
-      limit() = __l;
-      count() = 0;
-    }
-  };
-
-
-  /**
-   *  @brief Base class for random probability control and throw.
-   */
-  struct random_condition : public condition_base
-  {
-    // Scope-level adjustor objects: set probability for throw at the
-    // beginning of a scope block, and restores to previous
-    // probability when object is destroyed on exiting the block.
-    struct adjustor_base
-    {
-    private:
-      const double _M_orig;
-
-    public:
-      adjustor_base() : _M_orig(probability()) { }
-
-      virtual ~adjustor_base()
-      { set_probability(_M_orig); }
-    };
-
-    /// Group condition.
-    struct group_adjustor : public adjustor_base
-    {
-      group_adjustor(size_t size)
-      { set_probability(1 - std::pow(double(1 - probability()),
-				     double(0.5 / (size + 1))));
-      }
-    };
-
-    /// Never enter the condition.
-    struct never_adjustor : public adjustor_base
-    {
-      never_adjustor() { set_probability(0); }
-    };
-
-    /// Always enter the condition.
-    struct always_adjustor : public adjustor_base
-    {
-      always_adjustor() { set_probability(1); }
-    };
-
-    random_condition()
-    {
-      probability();
-      engine();
-    }
-
-    static void
-    set_probability(double __p)
-    { probability() = __p; }
-
-    static void
-    throw_conditionally()
-    {
-      if (generate() < probability())
-	__throw_forced_error();
-    }
-
-    void
-    seed(unsigned long __s)
-    { engine().seed(__s); }
-
-  private:
-#if __cplusplus >= 201103L
-    typedef std::uniform_real_distribution<double> 	distribution_type;
-    typedef std::mt19937 				engine_type;
-#else
-    typedef std::tr1::uniform_real<double> 		distribution_type;
-    typedef std::tr1::mt19937 				engine_type;
-#endif
-
-    static double
-    generate()
-    {
-#if __cplusplus >= 201103L
-      const distribution_type distribution(0, 1);
-      static auto generator = std::bind(distribution, engine());
-#else
-      // Use variate_generator to get normalized results.
-      typedef std::tr1::variate_generator<engine_type, distribution_type> gen_t;
-      distribution_type distribution(0, 1);
-      static gen_t generator(engine(), distribution);
-#endif
-
-      double random = generator();
-      if (random < distribution.min() || random > distribution.max())
-	{
-	  std::string __s("random_condition::generate");
-	  __s += "\n";
-	  __s += "random number generated is: ";
-	  char buf[40];
-	  __builtin_sprintf(buf, "%f", random);
-	  __s += buf;
-	  std::__throw_out_of_range(__s.c_str());
-	}
-
-      return random;
-    }
-
-    static double&
-    probability()
-    {
-      static double _S_p;
-      return _S_p;
-    }
-
-    static engine_type&
-    engine()
-    {
-      static engine_type _S_e;
-      return _S_e;
-    }
-  };
-
-
-  /**
-   *  @brief Class with exception generation control. Intended to be
-   *  used as a value_type in templatized code.
-   *
-   *  Note: Destructor not allowed to throw.
-   */
-  template<typename _Cond>
-    struct throw_value_base : public _Cond
-    {
-      typedef _Cond  				condition_type;
-
-      using condition_type::throw_conditionally;
-
-      std::size_t			       	_M_i;
-
-#ifndef _GLIBCXX_IS_AGGREGATE
-      throw_value_base() : _M_i(0)
-      { throw_conditionally(); }
-
-      throw_value_base(const throw_value_base& __v) : _M_i(__v._M_i)
-      { throw_conditionally(); }
-
-#if __cplusplus >= 201103L
-      // Shall not throw.
-      throw_value_base(throw_value_base&&) = default;
-#endif
-
-      explicit throw_value_base(const std::size_t __i) : _M_i(__i)
-      { throw_conditionally(); }
-#endif
-
-      throw_value_base&
-      operator=(const throw_value_base& __v)
-      {
-	throw_conditionally();
-	_M_i = __v._M_i;
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      // Shall not throw.
-      throw_value_base&
-      operator=(throw_value_base&&) = default;
-#endif
-
-      throw_value_base&
-      operator++()
-      {
-	throw_conditionally();
-	++_M_i;
-	return *this;
-      }
-    };
-
-  template<typename _Cond>
-    inline void
-    swap(throw_value_base<_Cond>& __a, throw_value_base<_Cond>& __b)
-    {
-      typedef throw_value_base<_Cond> throw_value;
-      throw_value::throw_conditionally();
-      throw_value orig(__a);
-      __a = __b;
-      __b = orig;
-    }
-
-  // General instantiable types requirements.
-  template<typename _Cond>
-    inline bool
-    operator==(const throw_value_base<_Cond>& __a,
-	       const throw_value_base<_Cond>& __b)
-    {
-      typedef throw_value_base<_Cond> throw_value;
-      throw_value::throw_conditionally();
-      bool __ret = __a._M_i == __b._M_i;
-      return __ret;
-    }
-
-  template<typename _Cond>
-    inline bool
-    operator<(const throw_value_base<_Cond>& __a,
-	      const throw_value_base<_Cond>& __b)
-    {
-      typedef throw_value_base<_Cond> throw_value;
-      throw_value::throw_conditionally();
-      bool __ret = __a._M_i < __b._M_i;
-      return __ret;
-    }
-
-  // Numeric algorithms instantiable types requirements.
-  template<typename _Cond>
-    inline throw_value_base<_Cond>
-    operator+(const throw_value_base<_Cond>& __a,
-	      const throw_value_base<_Cond>& __b)
-    {
-      typedef throw_value_base<_Cond> throw_value;
-      throw_value::throw_conditionally();
-      throw_value __ret(__a._M_i + __b._M_i);
-      return __ret;
-    }
-
-  template<typename _Cond>
-    inline throw_value_base<_Cond>
-    operator-(const throw_value_base<_Cond>& __a,
-	      const throw_value_base<_Cond>& __b)
-    {
-      typedef throw_value_base<_Cond> throw_value;
-      throw_value::throw_conditionally();
-      throw_value __ret(__a._M_i - __b._M_i);
-      return __ret;
-    }
-
-  template<typename _Cond>
-    inline throw_value_base<_Cond>
-    operator*(const throw_value_base<_Cond>& __a,
-	      const throw_value_base<_Cond>& __b)
-    {
-      typedef throw_value_base<_Cond> throw_value;
-      throw_value::throw_conditionally();
-      throw_value __ret(__a._M_i * __b._M_i);
-      return __ret;
-    }
-
-
-  /// Type throwing via limit condition.
-  struct throw_value_limit : public throw_value_base<limit_condition>
-  {
-    typedef throw_value_base<limit_condition> base_type;
-
-#ifndef _GLIBCXX_IS_AGGREGATE
-    throw_value_limit() { }
-
-    throw_value_limit(const throw_value_limit& __other)
-    : base_type(__other._M_i) { }
-
-#if __cplusplus >= 201103L
-    throw_value_limit(throw_value_limit&&) = default;
-#endif
-
-    explicit throw_value_limit(const std::size_t __i) : base_type(__i) { }
-#endif
-
-    throw_value_limit&
-    operator=(const throw_value_limit& __other)
-    {
-      base_type::operator=(__other);
-      return *this;
-    }
-
-#if __cplusplus >= 201103L
-    throw_value_limit&
-    operator=(throw_value_limit&&) = default;
-#endif
-  };
-
-  /// Type throwing via random condition.
-  struct throw_value_random : public throw_value_base<random_condition>
-  {
-    typedef throw_value_base<random_condition> base_type;
-
-#ifndef _GLIBCXX_IS_AGGREGATE
-    throw_value_random() { }
-
-    throw_value_random(const throw_value_random& __other)
-    : base_type(__other._M_i) { }
-
-#if __cplusplus >= 201103L
-    throw_value_random(throw_value_random&&) = default;
-#endif
-
-    explicit throw_value_random(const std::size_t __i) : base_type(__i) { }
-#endif
-
-    throw_value_random&
-    operator=(const throw_value_random& __other)
-    {
-      base_type::operator=(__other);
-      return *this;
-    }
-
-#if __cplusplus >= 201103L
-    throw_value_random&
-    operator=(throw_value_random&&) = default;
-#endif
-  };
-
-
-  /**
-   *  @brief Allocator class with logging and exception generation control.
-   * Intended to be used as an allocator_type in templatized code.
-   *  @ingroup allocators
-   *
-   *  Note: Deallocate not allowed to throw.
-   */
-  template<typename _Tp, typename _Cond>
-    class throw_allocator_base
-    : public annotate_base, public _Cond
-    {
-    public:
-      typedef size_t 				size_type;
-      typedef ptrdiff_t 			difference_type;
-      typedef _Tp 				value_type;
-      typedef value_type* 			pointer;
-      typedef const value_type* 		const_pointer;
-      typedef value_type& 			reference;
-      typedef const value_type& 		const_reference;
-
-#if __cplusplus >= 201103L
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2103. std::allocator propagate_on_container_move_assignment
-      typedef std::true_type propagate_on_container_move_assignment;
-#endif
-
-    private:
-      typedef _Cond				condition_type;
-
-      std::allocator<value_type> 		_M_allocator;
-
-      using condition_type::throw_conditionally;
-
-    public:
-      size_type
-      max_size() const _GLIBCXX_USE_NOEXCEPT
-      { return _M_allocator.max_size(); }
-
-      pointer
-      address(reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      const_pointer
-      address(const_reference __x) const _GLIBCXX_NOEXCEPT
-      { return std::__addressof(__x); }
-
-      pointer
-      allocate(size_type __n, std::allocator<void>::const_pointer hint = 0)
-      {
-	if (__n > this->max_size())
-	  std::__throw_bad_alloc();
-
-	throw_conditionally();
-	pointer const a = _M_allocator.allocate(__n, hint);
-	insert(a, sizeof(value_type) * __n);
-	return a;
-      }
-
-#if __cplusplus >= 201103L
-      template<typename _Up, typename... _Args>
-        void
-        construct(_Up* __p, _Args&&... __args)
-	{
-	  _M_allocator.construct(__p, std::forward<_Args>(__args)...);
-	  insert_construct(__p);
-	}
-
-      template<typename _Up>
-        void 
-        destroy(_Up* __p)
-        {
-	  erase_construct(__p);
-	  _M_allocator.destroy(__p);
-	}
-#else
-      void
-      construct(pointer __p, const value_type& val)
-      { return _M_allocator.construct(__p, val); }
-
-      void
-      destroy(pointer __p)
-      { _M_allocator.destroy(__p); }
-#endif
-
-      void
-      deallocate(pointer __p, size_type __n)
-      {
-	erase(__p, sizeof(value_type) * __n);
-	_M_allocator.deallocate(__p, __n);
-      }
-
-      void
-      check_allocated(pointer __p, size_type __n)
-      {
-	size_type __t = sizeof(value_type) * __n;
-	annotate_base::check_allocated(__p, __t);
-      }
-
-      void
-      check(size_type __n)
-      { annotate_base::check(__n); }
-  };
-
-  template<typename _Tp, typename _Cond>
-    inline bool
-    operator==(const throw_allocator_base<_Tp, _Cond>&,
-	       const throw_allocator_base<_Tp, _Cond>&)
-    { return true; }
-
-  template<typename _Tp, typename _Cond>
-    inline bool
-    operator!=(const throw_allocator_base<_Tp, _Cond>&,
-	       const throw_allocator_base<_Tp, _Cond>&)
-    { return false; }
-
-  /// Allocator throwing via limit condition.
-  template<typename _Tp>
-    struct throw_allocator_limit
-    : public throw_allocator_base<_Tp, limit_condition>
-    {
-      template<typename _Tp1>
-	struct rebind
-	{ typedef throw_allocator_limit<_Tp1> other; };
-
-      throw_allocator_limit() _GLIBCXX_USE_NOEXCEPT { }
-
-      throw_allocator_limit(const throw_allocator_limit&)
-      _GLIBCXX_USE_NOEXCEPT { }
-
-      template<typename _Tp1>
-	throw_allocator_limit(const throw_allocator_limit<_Tp1>&)
-	_GLIBCXX_USE_NOEXCEPT { }
-
-      ~throw_allocator_limit() _GLIBCXX_USE_NOEXCEPT { }
-    };
-
-  /// Allocator throwing via random condition.
-  template<typename _Tp>
-    struct throw_allocator_random
-    : public throw_allocator_base<_Tp, random_condition>
-    {
-      template<typename _Tp1>
-	struct rebind
-	{ typedef throw_allocator_random<_Tp1> other; };
-
-      throw_allocator_random() _GLIBCXX_USE_NOEXCEPT { }
-
-      throw_allocator_random(const throw_allocator_random&)
-      _GLIBCXX_USE_NOEXCEPT { }
-
-      template<typename _Tp1>
-	throw_allocator_random(const throw_allocator_random<_Tp1>&)
-	_GLIBCXX_USE_NOEXCEPT { }
-
-      ~throw_allocator_random() _GLIBCXX_USE_NOEXCEPT { }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if __cplusplus >= 201103L
-
-# include <bits/functional_hash.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-  /// Explicit specialization of std::hash for __gnu_cxx::throw_value_limit.
-  template<>
-    struct hash<__gnu_cxx::throw_value_limit>
-    : public std::unary_function<__gnu_cxx::throw_value_limit, size_t>
-    {
-      size_t
-      operator()(const __gnu_cxx::throw_value_limit& __val) const
-      {
-	__gnu_cxx::throw_value_limit::throw_conditionally();
-	std::hash<std::size_t> __h;
-	size_t __result = __h(__val._M_i);
-	return __result;
-      }
-    };
-
-  /// Explicit specialization of std::hash for __gnu_cxx::throw_value_random.
-  template<>
-    struct hash<__gnu_cxx::throw_value_random>
-    : public std::unary_function<__gnu_cxx::throw_value_random, size_t>
-    {
-      size_t
-      operator()(const __gnu_cxx::throw_value_random& __val) const
-      {
-	__gnu_cxx::throw_value_random::throw_conditionally();
-	std::hash<std::size_t> __h;
-	size_t __result = __h(__val._M_i);
-	return __result;
-      }
-    };
-} // end namespace std
-#endif
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/type_traits.h b/openflow/usr/include/c++/5/ext/type_traits.h
deleted file mode 100644
index 198e92c..0000000
--- a/openflow/usr/include/c++/5/ext/type_traits.h
+++ /dev/null
@@ -1,218 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/type_traits.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _EXT_TYPE_TRAITS
-#define _EXT_TYPE_TRAITS 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/cpp_type_traits.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Define a nested type if some predicate holds.
-  template<bool, typename>
-    struct __enable_if 
-    { };
-
-  template<typename _Tp>
-    struct __enable_if<true, _Tp>
-    { typedef _Tp __type; };
-
-
-  // Conditional expression for types. If true, first, if false, second.
-  template<bool _Cond, typename _Iftrue, typename _Iffalse>
-    struct __conditional_type
-    { typedef _Iftrue __type; };
-
-  template<typename _Iftrue, typename _Iffalse>
-    struct __conditional_type<false, _Iftrue, _Iffalse>
-    { typedef _Iffalse __type; };
-
-
-  // Given an integral builtin type, return the corresponding unsigned type.
-  template<typename _Tp>
-    struct __add_unsigned
-    { 
-    private:
-      typedef __enable_if<std::__is_integer<_Tp>::__value, _Tp> __if_type;
-      
-    public:
-      typedef typename __if_type::__type __type; 
-    };
-
-  template<>
-    struct __add_unsigned<char>
-    { typedef unsigned char __type; };
-
-  template<>
-    struct __add_unsigned<signed char>
-    { typedef unsigned char __type; };
-
-  template<>
-    struct __add_unsigned<short>
-    { typedef unsigned short __type; };
-
-  template<>
-    struct __add_unsigned<int>
-    { typedef unsigned int __type; };
-
-  template<>
-    struct __add_unsigned<long>
-    { typedef unsigned long __type; };
-
-  template<>
-    struct __add_unsigned<long long>
-    { typedef unsigned long long __type; };
-
-  // Declare but don't define.
-  template<>
-    struct __add_unsigned<bool>;
-
-  template<>
-    struct __add_unsigned<wchar_t>;
-
-
-  // Given an integral builtin type, return the corresponding signed type.
-  template<typename _Tp>
-    struct __remove_unsigned
-    { 
-    private:
-      typedef __enable_if<std::__is_integer<_Tp>::__value, _Tp> __if_type;
-      
-    public:
-      typedef typename __if_type::__type __type; 
-    };
-
-  template<>
-    struct __remove_unsigned<char>
-    { typedef signed char __type; };
-
-  template<>
-    struct __remove_unsigned<unsigned char>
-    { typedef signed char __type; };
-
-  template<>
-    struct __remove_unsigned<unsigned short>
-    { typedef short __type; };
-
-  template<>
-    struct __remove_unsigned<unsigned int>
-    { typedef int __type; };
-
-  template<>
-    struct __remove_unsigned<unsigned long>
-    { typedef long __type; };
-
-  template<>
-    struct __remove_unsigned<unsigned long long>
-    { typedef long long __type; };
-
-  // Declare but don't define.
-  template<>
-    struct __remove_unsigned<bool>;
-
-  template<>
-    struct __remove_unsigned<wchar_t>;
-
-
-  // For use in string and vstring.
-  template<typename _Type>
-    inline bool
-    __is_null_pointer(_Type* __ptr)
-    { return __ptr == 0; }
-
-  template<typename _Type>
-    inline bool
-    __is_null_pointer(_Type)
-    { return false; }
-
-#if __cplusplus >= 201103L
-  inline bool
-  __is_null_pointer(std::nullptr_t)
-  { return true; }
-#endif
-
-  // For complex and cmath
-  template<typename _Tp, bool = std::__is_integer<_Tp>::__value>
-    struct __promote
-    { typedef double __type; };
-
-  // No nested __type member for non-integer non-floating point types,
-  // allows this type to be used for SFINAE to constrain overloads in
-  // <cmath> and <complex> to only the intended types.
-  template<typename _Tp>
-    struct __promote<_Tp, false>
-    { };
-
-  template<>
-    struct __promote<long double>
-    { typedef long double __type; };
-
-  template<>
-    struct __promote<double>
-    { typedef double __type; };
-
-  template<>
-    struct __promote<float>
-    { typedef float __type; };
-
-  template<typename _Tp, typename _Up,
-           typename _Tp2 = typename __promote<_Tp>::__type,
-           typename _Up2 = typename __promote<_Up>::__type>
-    struct __promote_2
-    {
-      typedef __typeof__(_Tp2() + _Up2()) __type;
-    };
-
-  template<typename _Tp, typename _Up, typename _Vp,
-           typename _Tp2 = typename __promote<_Tp>::__type,
-           typename _Up2 = typename __promote<_Up>::__type,
-           typename _Vp2 = typename __promote<_Vp>::__type>
-    struct __promote_3
-    {
-      typedef __typeof__(_Tp2() + _Up2() + _Vp2()) __type;
-    };
-
-  template<typename _Tp, typename _Up, typename _Vp, typename _Wp,
-           typename _Tp2 = typename __promote<_Tp>::__type,
-           typename _Up2 = typename __promote<_Up>::__type,
-           typename _Vp2 = typename __promote<_Vp>::__type,
-           typename _Wp2 = typename __promote<_Wp>::__type>
-    struct __promote_4
-    {
-      typedef __typeof__(_Tp2() + _Up2() + _Vp2() + _Wp2()) __type;
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif 
diff --git a/openflow/usr/include/c++/5/ext/typelist.h b/openflow/usr/include/c++/5/ext/typelist.h
deleted file mode 100644
index 7cc74b3..0000000
--- a/openflow/usr/include/c++/5/ext/typelist.h
+++ /dev/null
@@ -1,559 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
-
-// Permission to use, copy, modify, sell, and distribute this software
-// is hereby granted without fee, provided that the above copyright
-// notice appears in all copies, and that both that copyright notice and
-// this permission notice appear in supporting documentation. None of
-// the above authors, nor IBM Haifa Research Laboratories, make any
-// representation about the suitability of this software for any
-// purpose. It is provided "as is" without express or implied warranty.
-
-/**
- *  @file ext/typelist.h
- *  This file is a GNU extension to the Standard C++ Library.
- *
- *  Contains typelist_chain definitions.
- *  Typelists are an idea by Andrei Alexandrescu.
- */
-
-#ifndef _TYPELIST_H
-#define _TYPELIST_H 1
-
-#include <ext/type_traits.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-/** @namespace __gnu_cxx::typelist
- *  @brief GNU typelist extensions for public compile-time use.
-*/
-namespace typelist
-{
-  struct null_type { };
-
-  template<typename Root>
-    struct node
-    {
-      typedef Root 	root;
-    };
-
-  // Forward declarations of functors.
-  template<typename Hd, typename Typelist>
-    struct chain
-    {
-      typedef Hd 	head;
-      typedef Typelist 	tail;
-    };
-
-  // Apply all typelist types to unary functor.
-  template<typename Fn, typename Typelist>
-    void
-    apply(Fn&, Typelist);
-
-  /// Apply all typelist types to generator functor.
-  template<typename Gn, typename Typelist>
-    void
-    apply_generator(Gn&, Typelist);
-
-  // Apply all typelist types and values to generator functor.
-  template<typename Gn, typename TypelistT, typename TypelistV>
-    void
-    apply_generator(Gn&, TypelistT, TypelistV);
-
-  template<typename Typelist0, typename Typelist1>
-    struct append;
-
-  template<typename Typelist_Typelist>
-    struct append_typelist;
-
-  template<typename Typelist, typename T>
-    struct contains;
-
-  template<typename Typelist, template<typename T> class Pred>
-    struct filter;
-
-  template<typename Typelist, int i>
-    struct at_index;
-
-  template<typename Typelist, template<typename T> class Transform>
-    struct transform;
-
-  template<typename Typelist_Typelist>
-    struct flatten;
-
-  template<typename Typelist>
-    struct from_first;
-
-  template<typename T1>
-    struct create1;
-
-  template<typename T1, typename T2>
-    struct create2;
-
-  template<typename T1, typename T2, typename T3>
-    struct create3;
-
-  template<typename T1, typename T2, typename T3, typename T4>
-    struct create4;
-
-  template<typename T1, typename T2, typename T3, typename T4, typename T5>
-    struct create5;
-
-  template<typename T1, typename T2, typename T3,
-	   typename T4, typename T5, typename T6>
-    struct create6;
-} // namespace typelist
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-namespace typelist
-{
-namespace detail
-{
-  template<typename Fn, typename Typelist_Chain>
-    struct apply_;
-
-  template<typename Fn, typename Hd, typename Tl>
-    struct apply_<Fn, chain<Hd, Tl> >
-    {
-      void
-      operator()(Fn& f)
-      {
-	f.operator()(Hd());
-	apply_<Fn, Tl> next;
-	next(f);
-      }
-    };
-
-  template<typename Fn>
-    struct apply_<Fn, null_type>
-    {
-      void
-      operator()(Fn&) { }
-    };
-
-  template<typename Gn, typename Typelist_Chain>
-    struct apply_generator1_;
-
-  template<typename Gn, typename Hd, typename Tl>
-    struct apply_generator1_<Gn, chain<Hd, Tl> >
-    {
-      void
-      operator()(Gn& g)
-      {
-	g.template operator()<Hd>();
-	apply_generator1_<Gn, Tl> next;
-	next(g);
-      }
-    };
-
-  template<typename Gn>
-    struct apply_generator1_<Gn, null_type>
-    {
-      void
-      operator()(Gn&) { }
-    };
-
-  template<typename Gn, typename TypelistT_Chain, typename TypelistV_Chain>
-    struct apply_generator2_;
-
-  template<typename Gn, typename Hd1, typename TlT, typename Hd2, typename TlV>
-    struct apply_generator2_<Gn, chain<Hd1, TlT>, chain<Hd2, TlV> >
-    {
-      void
-      operator()(Gn& g)
-      {
-	g.template operator()<Hd1, Hd2>();
-	apply_generator2_<Gn, TlT, TlV> next;
-	next(g);
-      }
-    };
-
-  template<typename Gn>
-    struct apply_generator2_<Gn, null_type, null_type>
-    {
-      void
-      operator()(Gn&) { }
-    };
-
-  template<typename Typelist_Chain0, typename Typelist_Chain1>
-    struct append_;
-
-  template<typename Hd, typename Tl, typename Typelist_Chain>
-    struct append_<chain<Hd, Tl>, Typelist_Chain>
-    {
-    private:
-      typedef append_<Tl, Typelist_Chain> 			append_type;
-
-    public:
-      typedef chain<Hd, typename append_type::type> 		type;
-    };
-
-  template<typename Typelist_Chain>
-    struct append_<null_type, Typelist_Chain>
-    {
-      typedef Typelist_Chain 			      		type;
-    };
-
-  template<typename Typelist_Chain>
-    struct append_<Typelist_Chain, null_type>
-    {
-      typedef Typelist_Chain 					type;
-    };
-
-  template<>
-    struct append_<null_type, null_type>
-    {
-      typedef null_type 					type;
-    };
-
-  template<typename Typelist_Typelist_Chain>
-    struct append_typelist_;
-
-  template<typename Hd>
-    struct append_typelist_<chain<Hd, null_type> >
-    {
-      typedef chain<Hd, null_type> 				type;
-    };
-
-  template<typename Hd, typename Tl>
-    struct append_typelist_<chain< Hd, Tl> >
-    {
-    private:
-      typedef typename append_typelist_<Tl>::type 		rest_type;
-
-    public:
-      typedef typename append<Hd, node<rest_type> >::type::root	type;
-    };
-
-  template<typename Typelist_Chain, typename T>
-    struct contains_;
-
-  template<typename T>
-    struct contains_<null_type, T>
-    {
-      enum
-	{
-	  value = false
-	};
-    };
-
-  template<typename Hd, typename Tl, typename T>
-    struct contains_<chain<Hd, Tl>, T>
-    {
-      enum
-	{
-	  value = contains_<Tl, T>::value
-	};
-    };
-
-  template<typename Tl, typename T>
-    struct contains_<chain<T, Tl>, T>
-    {
-      enum
-	{
-	  value = true
-	};
-    };
-
-  template<typename Typelist_Chain, template<typename T> class Pred>
-    struct chain_filter_;
-
-  template<template<typename T> class Pred>
-    struct chain_filter_<null_type, Pred>
-    {
-      typedef null_type 					type;
-  };
-
-  template<typename Hd, typename Tl, template<typename T> class Pred>
-    struct chain_filter_<chain<Hd, Tl>, Pred>
-    {
-    private:
-      enum
-	{
-	  include_hd = Pred<Hd>::value
-	};
-
-      typedef typename chain_filter_<Tl, Pred>::type 		rest_type;
-      typedef chain<Hd, rest_type> 				chain_type;
-
-    public:
-      typedef typename __conditional_type<include_hd, chain_type, rest_type>::__type type;
-  };
-
-  template<typename Typelist_Chain, int i>
-    struct chain_at_index_;
-
-  template<typename Hd, typename Tl>
-    struct chain_at_index_<chain<Hd, Tl>, 0>
-    {
-      typedef Hd 						type;
-    };
-
-  template<typename Hd, typename Tl, int i>
-    struct chain_at_index_<chain<Hd, Tl>, i>
-    {
-      typedef typename chain_at_index_<Tl, i - 1>::type 	type;
-    };
-
-  template<class Typelist_Chain, template<typename T> class Transform>
-    struct chain_transform_;
-
-  template<template<typename T> class Transform>
-    struct chain_transform_<null_type, Transform>
-    {
-      typedef null_type 					type;
-    };
-
-  template<class Hd, class Tl, template<typename T> class Transform>
-    struct chain_transform_<chain<Hd, Tl>, Transform>
-    {
-    private:
-      typedef typename chain_transform_<Tl, Transform>::type 	rest_type;
-      typedef typename Transform<Hd>::type 			transform_type;
-
-    public:
-      typedef chain<transform_type, rest_type> 			type;
-    };
-
-  template<typename Typelist_Typelist_Chain>
-    struct chain_flatten_;
-
-  template<typename Hd_Tl>
-    struct chain_flatten_<chain<Hd_Tl, null_type> >
-    {
-      typedef typename Hd_Tl::root 				type;
-    };
-
-  template<typename Hd_Typelist, class Tl_Typelist>
-    struct chain_flatten_<chain<Hd_Typelist, Tl_Typelist> >
-    {
-    private:
-      typedef typename chain_flatten_<Tl_Typelist>::type 	rest_type;
-      typedef append<Hd_Typelist, node<rest_type> >		append_type;
-    public:
-      typedef typename append_type::type::root 			type;
-    };
-} // namespace detail
-} // namespace typelist
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#define _GLIBCXX_TYPELIST_CHAIN1(X0) __gnu_cxx::typelist::chain<X0, __gnu_cxx::typelist::null_type>
-#define _GLIBCXX_TYPELIST_CHAIN2(X0, X1) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN1(X1) >
-#define _GLIBCXX_TYPELIST_CHAIN3(X0, X1, X2) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN2(X1, X2) >
-#define _GLIBCXX_TYPELIST_CHAIN4(X0, X1, X2, X3) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN3(X1, X2, X3) >
-#define _GLIBCXX_TYPELIST_CHAIN5(X0, X1, X2, X3, X4) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN4(X1, X2, X3, X4) >
-#define _GLIBCXX_TYPELIST_CHAIN6(X0, X1, X2, X3, X4, X5) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN5(X1, X2, X3, X4, X5) >
-#define _GLIBCXX_TYPELIST_CHAIN7(X0, X1, X2, X3, X4, X5, X6) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN6(X1, X2, X3, X4, X5, X6) >
-#define _GLIBCXX_TYPELIST_CHAIN8(X0, X1, X2, X3, X4, X5, X6, X7) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN7(X1, X2, X3, X4, X5, X6, X7) >
-#define _GLIBCXX_TYPELIST_CHAIN9(X0, X1, X2, X3, X4, X5, X6, X7, X8) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN8(X1, X2, X3, X4, X5, X6, X7, X8) >
-#define _GLIBCXX_TYPELIST_CHAIN10(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN9(X1, X2, X3, X4, X5, X6, X7, X8, X9) >
-#define _GLIBCXX_TYPELIST_CHAIN11(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN10(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10) >
-#define _GLIBCXX_TYPELIST_CHAIN12(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN11(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11) >
-#define _GLIBCXX_TYPELIST_CHAIN13(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN12(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12) >
-#define _GLIBCXX_TYPELIST_CHAIN14(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN13(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13) >
-#define _GLIBCXX_TYPELIST_CHAIN15(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN14(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14) >
-#define _GLIBCXX_TYPELIST_CHAIN16(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN15(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15) >
-#define _GLIBCXX_TYPELIST_CHAIN17(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN16(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16) >
-#define _GLIBCXX_TYPELIST_CHAIN18(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN17(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17) >
-#define _GLIBCXX_TYPELIST_CHAIN19(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN18(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18) >
-#define _GLIBCXX_TYPELIST_CHAIN20(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18, X19) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN19(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18, X19) >
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-namespace typelist
-{
-  template<typename Fn, typename Typelist>
-    void
-    apply(Fn& fn, Typelist)
-    {
-      detail::apply_<Fn, typename Typelist::root> a;
-      a(fn);
-    }
-
-  template<typename Fn, typename Typelist>
-    void
-    apply_generator(Fn& fn, Typelist)
-    {
-      detail::apply_generator1_<Fn, typename Typelist::root> a;
-      a(fn);
-    }
-
-  template<typename Fn, typename TypelistT, typename TypelistV>
-    void
-    apply_generator(Fn& fn, TypelistT, TypelistV)
-    {
-      typedef typename TypelistT::root rootT;
-      typedef typename TypelistV::root rootV;
-      detail::apply_generator2_<Fn, rootT, rootV> a;
-      a(fn);
-    }
-
-  template<typename Typelist0, typename Typelist1>
-    struct append
-    {
-    private:
-      typedef typename Typelist0::root 				root0_type;
-      typedef typename Typelist1::root 				root1_type;
-      typedef detail::append_<root0_type, root1_type> 		append_type;
-
-    public:
-      typedef node<typename append_type::type> 			type;
-    };
-
-  template<typename Typelist_Typelist>
-    struct append_typelist
-    {
-    private:
-      typedef typename Typelist_Typelist::root 		      	root_type;
-      typedef detail::append_typelist_<root_type> 		append_type;
-
-    public:
-      typedef node<typename append_type::type> 			type;
-    };
-
-  template<typename Typelist, typename T>
-    struct contains
-    {
-    private:
-      typedef typename Typelist::root 				root_type;
-
-    public:
-      enum
-	{
-	  value = detail::contains_<root_type, T>::value
-	};
-    };
-
-  template<typename Typelist, template<typename T> class Pred>
-    struct filter
-    {
-    private:
-      typedef typename Typelist::root 				root_type;
-      typedef detail::chain_filter_<root_type, Pred> 		filter_type;
-
-    public:
-      typedef node<typename filter_type::type> 	       		type;
-    };
-
-  template<typename Typelist, int i>
-    struct at_index
-    {
-    private:
-      typedef typename Typelist::root 				root_type;
-      typedef detail::chain_at_index_<root_type, i> 		index_type;
-
-    public:
-      typedef typename index_type::type 			type;
-    };
-
-  template<typename Typelist, template<typename T> class Transform>
-    struct transform
-    {
-    private:
-      typedef typename Typelist::root 				root_type;
-      typedef detail::chain_transform_<root_type, Transform> 	transform_type;
-
-    public:
-      typedef node<typename transform_type::type> 		type;
-    };
-
-  template<typename Typelist_Typelist>
-    struct flatten
-    {
-    private:
-      typedef typename Typelist_Typelist::root 		      	root_type;
-      typedef typename detail::chain_flatten_<root_type>::type 	flatten_type;
-
-    public:
-      typedef node<flatten_type> 				type;
-    };
-
-  template<typename Typelist>
-    struct from_first
-    {
-    private:
-      typedef typename at_index<Typelist, 0>::type 		first_type;
-
-    public:
-      typedef node<chain<first_type, null_type> > 		type;
-    };
-
-  template<typename T1>
-    struct create1
-    {
-      typedef node<_GLIBCXX_TYPELIST_CHAIN1(T1)> 		type;
-    };
-
-  template<typename T1, typename T2>
-    struct create2
-    {
-      typedef node<_GLIBCXX_TYPELIST_CHAIN2(T1,T2)> 		type;
-    };
-
-  template<typename T1, typename T2, typename T3>
-    struct create3
-    {
-      typedef node<_GLIBCXX_TYPELIST_CHAIN3(T1,T2,T3)>		type;
-    };
-
-  template<typename T1, typename T2, typename T3, typename T4>
-    struct create4
-    {
-      typedef node<_GLIBCXX_TYPELIST_CHAIN4(T1,T2,T3,T4)>	type;
-    };
-
-  template<typename T1, typename T2, typename T3,
-	   typename T4, typename T5>
-    struct create5
-    {
-      typedef node<_GLIBCXX_TYPELIST_CHAIN5(T1,T2,T3,T4,T5)>	type;
-    };
-
-  template<typename T1, typename T2, typename T3,
-	   typename T4, typename T5, typename T6>
-    struct create6
-    {
-      typedef node<_GLIBCXX_TYPELIST_CHAIN6(T1,T2,T3,T4,T5,T6)>	type;
-    };
-} // namespace typelist
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-
-#endif
diff --git a/openflow/usr/include/c++/5/ext/vstring.h b/openflow/usr/include/c++/5/ext/vstring.h
deleted file mode 100644
index 63349dd..0000000
--- a/openflow/usr/include/c++/5/ext/vstring.h
+++ /dev/null
@@ -1,2963 +0,0 @@
-// Versatile string -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/vstring.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _VSTRING_H
-#define _VSTRING_H 1
-
-#pragma GCC system_header
-
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-#include <ext/vstring_util.h>
-#include <ext/rc_string_base.h>
-#include <ext/sso_string_base.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @class __versa_string vstring.h
-   *  @brief  Template class __versa_string. 
-   *  @ingroup extensions
-   *
-   *  Data structure managing sequences of characters and
-   *  character-like objects. 
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    class __versa_string
-    : private _Base<_CharT, _Traits, _Alloc>
-    {
-      typedef _Base<_CharT, _Traits, _Alloc>                __vstring_base;    
-      typedef typename __vstring_base::_CharT_alloc_type    _CharT_alloc_type;
-
-      // Types:
-    public:
-      typedef _Traits					    traits_type;
-      typedef typename _Traits::char_type		    value_type;
-      typedef _Alloc					    allocator_type;
-      typedef typename _CharT_alloc_type::size_type	    size_type;
-      typedef typename _CharT_alloc_type::difference_type   difference_type;
-      typedef value_type&               	            reference;
-      typedef const value_type&                             const_reference;
-      typedef typename _CharT_alloc_type::pointer	    pointer;
-      typedef typename _CharT_alloc_type::const_pointer	    const_pointer;
-      typedef __gnu_cxx::__normal_iterator<pointer, __versa_string>  iterator;
-      typedef __gnu_cxx::__normal_iterator<const_pointer, __versa_string>
-                                                            const_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-      typedef std::reverse_iterator<iterator>		    reverse_iterator;
-
-      // Data Member (public):
-      ///  Value returned by various member functions when they fail.
-      static const size_type	npos = static_cast<size_type>(-1);
-
-    private:
-      size_type
-      _M_check(size_type __pos, const char* __s) const
-      {
-	if (__pos > this->size())
-	  std::__throw_out_of_range_fmt(__N("%s: __pos (which is %zu) > "
-					    "this->size() (which is %zu)"),
-					__s, __pos, this->size());
-	return __pos;
-      }
-
-      void
-      _M_check_length(size_type __n1, size_type __n2, const char* __s) const
-      {
-	if (this->max_size() - (this->size() - __n1) < __n2)
-	  std::__throw_length_error(__N(__s));
-      }
-
-      // NB: _M_limit doesn't check for a bad __pos value.
-      size_type
-      _M_limit(size_type __pos, size_type __off) const _GLIBCXX_NOEXCEPT
-      {
-	const bool __testoff =  __off < this->size() - __pos;
-	return __testoff ? __off : this->size() - __pos;
-      }
-
-      // True if _Rep and source do not overlap.
-      bool
-      _M_disjunct(const _CharT* __s) const _GLIBCXX_NOEXCEPT
-      {
-	return (std::less<const _CharT*>()(__s, this->_M_data())
-		|| std::less<const _CharT*>()(this->_M_data()
-					      + this->size(), __s));
-      }
-
-      // For the internal use we have functions similar to `begin'/`end'
-      // but they do not call _M_leak.
-      iterator
-      _M_ibegin() const _GLIBCXX_NOEXCEPT
-      { return iterator(this->_M_data()); }
-
-      iterator
-      _M_iend() const _GLIBCXX_NOEXCEPT
-      { return iterator(this->_M_data() + this->_M_length()); }
-
-    public:
-      // Construct/copy/destroy:
-      // NB: We overload ctors in some cases instead of using default
-      // arguments, per 17.4.4.4 para. 2 item 2.
-
-      /**
-       *  @brief  Construct an empty string using allocator @a a.
-       */
-      explicit
-      __versa_string(const _Alloc& __a = _Alloc()) _GLIBCXX_NOEXCEPT
-      : __vstring_base(__a) { }
-
-      // NB: per LWG issue 42, semantics different from IS:
-      /**
-       *  @brief  Construct string with copy of value of @a __str.
-       *  @param  __str  Source string.
-       */
-      __versa_string(const __versa_string& __str)
-      : __vstring_base(__str) { }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  String move constructor.
-       *  @param  __str  Source string.
-       *
-       *  The newly-constructed %string contains the exact contents of
-       *  @a __str.  The contents of @a __str are a valid, but unspecified
-       *  string.
-       */
-      __versa_string(__versa_string&& __str) noexcept
-      : __vstring_base(std::move(__str)) { }
-
-      /**
-       *  @brief  Construct string from an initializer list.
-       *  @param  __l  std::initializer_list of characters.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-      __versa_string(std::initializer_list<_CharT> __l,
-		     const _Alloc& __a = _Alloc())
-      : __vstring_base(__l.begin(), __l.end(), __a) { }
-#endif
-
-      /**
-       *  @brief  Construct string as copy of a substring.
-       *  @param  __str  Source string.
-       *  @param  __pos  Index of first character to copy from.
-       *  @param  __n  Number of characters to copy (default remainder).
-       */
-      __versa_string(const __versa_string& __str, size_type __pos,
-		     size_type __n = npos)
-      : __vstring_base(__str._M_data()
-		       + __str._M_check(__pos,
-					"__versa_string::__versa_string"),
-		       __str._M_data() + __str._M_limit(__pos, __n)
-		       + __pos, _Alloc()) { }
-
-      /**
-       *  @brief  Construct string as copy of a substring.
-       *  @param  __str  Source string.
-       *  @param  __pos  Index of first character to copy from.
-       *  @param  __n  Number of characters to copy.
-       *  @param  __a  Allocator to use.
-       */
-      __versa_string(const __versa_string& __str, size_type __pos,
-		     size_type __n, const _Alloc& __a)
-      : __vstring_base(__str._M_data()
-		       + __str._M_check(__pos,
-					"__versa_string::__versa_string"),
-		       __str._M_data() + __str._M_limit(__pos, __n)
-		       + __pos, __a) { }
-
-      /**
-       *  @brief  Construct string initialized by a character array.
-       *  @param  __s  Source character array.
-       *  @param  __n  Number of characters to copy.
-       *  @param  __a  Allocator to use (default is default allocator).
-       *
-       *  NB: @a __s must have at least @a __n characters, '\\0' has no special
-       *  meaning.
-       */
-      __versa_string(const _CharT* __s, size_type __n,
-		     const _Alloc& __a = _Alloc())
-      : __vstring_base(__s, __s + __n, __a) { }
-
-      /**
-       *  @brief  Construct string as copy of a C string.
-       *  @param  __s  Source C string.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-      __versa_string(const _CharT* __s, const _Alloc& __a = _Alloc())
-      : __vstring_base(__s, __s ? __s + traits_type::length(__s) :
-		       __s + npos, __a) { }
-
-      /**
-       *  @brief  Construct string as multiple characters.
-       *  @param  __n  Number of characters.
-       *  @param  __c  Character to use.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-      __versa_string(size_type __n, _CharT __c, const _Alloc& __a = _Alloc())
-      : __vstring_base(__n, __c, __a) { }
-
-      /**
-       *  @brief  Construct string as copy of a range.
-       *  @param  __beg  Start of range.
-       *  @param  __end  End of range.
-       *  @param  __a  Allocator to use (default is default allocator).
-       */
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-        __versa_string(_InputIterator __beg, _InputIterator __end,
-		       const _Alloc& __a = _Alloc())
-	: __vstring_base(__beg, __end, __a) { }
-
-      /**
-       *  @brief  Destroy the string instance.
-       */
-      ~__versa_string() _GLIBCXX_NOEXCEPT { }	
-
-      /**
-       *  @brief  Assign the value of @a str to this string.
-       *  @param  __str  Source string.
-       */
-      __versa_string&
-      operator=(const __versa_string& __str) 
-      { return this->assign(__str); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  String move assignment operator.
-       *  @param  __str  Source string.
-       *
-       *  The contents of @a __str are moved into this string (without
-       *  copying).  @a __str is a valid, but unspecified string.
-       */
-      __versa_string&
-      operator=(__versa_string&& __str) noexcept
-      {
-	// NB: DR 1204.
-	this->swap(__str);
-	return *this;
-      }
-
-      /**
-       *  @brief  Set value to string constructed from initializer list.
-       *  @param  __l  std::initializer_list.
-       */
-      __versa_string&
-      operator=(std::initializer_list<_CharT> __l)
-      {
-	this->assign(__l.begin(), __l.end());
-	return *this;
-      }
-#endif
-
-      /**
-       *  @brief  Copy contents of @a __s into this string.
-       *  @param  __s  Source null-terminated string.
-       */
-      __versa_string&
-      operator=(const _CharT* __s) 
-      { return this->assign(__s); }
-
-      /**
-       *  @brief  Set value to string of length 1.
-       *  @param  __c  Source character.
-       *
-       *  Assigning to a character makes this string length 1 and
-       *  (*this)[0] == @a __c.
-       */
-      __versa_string&
-      operator=(_CharT __c) 
-      { 
-	this->assign(1, __c); 
-	return *this;
-      }
-
-      // Iterators:
-      /**
-       *  Returns a read/write iterator that points to the first character in
-       *  the %string.  Unshares the string.
-       */
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_leak();
-	return iterator(this->_M_data());
-      }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  character in the %string.
-       */
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(this->_M_data()); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  character in the %string.  Unshares the string.
-       */
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_leak();
-	return iterator(this->_M_data() + this->size());
-      }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the
-       *  last character in the %string.
-       */
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(this->_M_data() + this->size()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last
-       *  character in the %string.  Iteration is done in reverse element
-       *  order.  Unshares the string.
-       */
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last character in the %string.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one before the
-       *  first character in the %string.  Iteration is done in reverse
-       *  element order.  Unshares the string.
-       */
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(this->begin()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first character in the %string.  Iteration
-       *  is done in reverse element order.
-       */
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(this->begin()); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  character in the %string.
-       */
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(this->_M_data()); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the
-       *  last character in the %string.
-       */
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(this->_M_data() + this->size()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last character in the %string.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first character in the %string.  Iteration
-       *  is done in reverse element order.
-       */
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(this->begin()); }
-#endif
-
-    public:
-      // Capacity:
-      ///  Returns the number of characters in the string, not including any
-      ///  null-termination.
-      size_type
-      size() const _GLIBCXX_NOEXCEPT
-      { return this->_M_length(); }
-
-      ///  Returns the number of characters in the string, not including any
-      ///  null-termination.
-      size_type
-      length() const _GLIBCXX_NOEXCEPT
-      { return this->_M_length(); }
-
-      /// Returns the size() of the largest possible %string.
-      size_type
-      max_size() const _GLIBCXX_NOEXCEPT
-      { return this->_M_max_size(); }
-
-      /**
-       *  @brief  Resizes the %string to the specified number of characters.
-       *  @param  __n  Number of characters the %string should contain.
-       *  @param  __c  Character to fill any new elements.
-       *
-       *  This function will %resize the %string to the specified
-       *  number of characters.  If the number is smaller than the
-       *  %string's current size the %string is truncated, otherwise
-       *  the %string is extended and new elements are set to @a __c.
-       */
-      void
-      resize(size_type __n, _CharT __c);
-
-      /**
-       *  @brief  Resizes the %string to the specified number of characters.
-       *  @param  __n  Number of characters the %string should contain.
-       *
-       *  This function will resize the %string to the specified
-       *  length.  If the new size is smaller than the %string's
-       *  current size the %string is truncated, otherwise the %string
-       *  is extended and new characters are default-constructed.  For
-       *  basic types such as char, this means setting them to 0.
-       */
-      void
-      resize(size_type __n)
-      { this->resize(__n, _CharT()); }
-
-#if __cplusplus >= 201103L
-      /// A non-binding request to reduce capacity() to size().
-      void
-      shrink_to_fit() noexcept
-      {
-	if (capacity() > size())
-	  {
-	    __try
-	      { this->reserve(0); }
-	    __catch(...)
-	      { }
-	  }
-      }
-#endif
-
-      /**
-       *  Returns the total number of characters that the %string can
-       *  hold before needing to allocate more memory.
-       */
-      size_type
-      capacity() const _GLIBCXX_NOEXCEPT
-      { return this->_M_capacity(); }
-
-      /**
-       *  @brief  Attempt to preallocate enough memory for specified number of
-       *          characters.
-       *  @param  __res_arg  Number of characters required.
-       *  @throw  std::length_error  If @a __res_arg exceeds @c max_size().
-       *
-       *  This function attempts to reserve enough memory for the
-       *  %string to hold the specified number of characters.  If the
-       *  number requested is more than max_size(), length_error is
-       *  thrown.
-       *
-       *  The advantage of this function is that if optimal code is a
-       *  necessity and the user can determine the string length that
-       *  will be required, the user can reserve the memory in
-       *  %advance, and thus prevent a possible reallocation of memory
-       *  and copying of %string data.
-       */
-      void
-      reserve(size_type __res_arg = 0)
-      { this->_M_reserve(__res_arg); }
-
-      /**
-       *  Erases the string, making it empty.
-       */
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      { this->_M_clear(); }
-
-      /**
-       *  Returns true if the %string is empty.  Equivalent to 
-       *  <code>*this == ""</code>.
-       */
-      bool
-      empty() const _GLIBCXX_NOEXCEPT
-      { return this->size() == 0; }
-
-      // Element access:
-      /**
-       *  @brief  Subscript access to the data contained in the %string.
-       *  @param  __pos  The index of the character to access.
-       *  @return  Read-only (constant) reference to the character.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      const_reference
-      operator[] (size_type __pos) const _GLIBCXX_NOEXCEPT
-      {
-	_GLIBCXX_DEBUG_ASSERT(__pos <= this->size());
-	return this->_M_data()[__pos];
-      }
-
-      /**
-       *  @brief  Subscript access to the data contained in the %string.
-       *  @param  __pos  The index of the character to access.
-       *  @return  Read/write reference to the character.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)  Unshares the string.
-       */
-      reference
-      operator[](size_type __pos) _GLIBCXX_NOEXCEPT
-      {
-        // Allow pos == size() both in C++98 mode, as v3 extension,
-	// and in C++11 mode.
-	_GLIBCXX_DEBUG_ASSERT(__pos <= this->size());
-        // In pedantic mode be strict in C++98 mode.
-	_GLIBCXX_DEBUG_PEDASSERT(__cplusplus >= 201103L
-				 || __pos < this->size());
-	this->_M_leak();
-	return this->_M_data()[__pos];
-      }
-
-      /**
-       *  @brief  Provides access to the data contained in the %string.
-       *  @param __n The index of the character to access.
-       *  @return  Read-only (const) reference to the character.
-       *  @throw  std::out_of_range  If @a __n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter
-       *  is first checked that it is in the range of the string.  The
-       *  function throws out_of_range if the check fails.
-       */
-      const_reference
-      at(size_type __n) const
-      {
-	if (__n >= this->size())
-	  std::__throw_out_of_range_fmt(__N("__versa_string::at: __n "
-					    "(which is %zu) >= this->size() "
-					    "(which is %zu)"),
-					__n, this->size());
-	return this->_M_data()[__n];
-      }
-
-      /**
-       *  @brief  Provides access to the data contained in the %string.
-       *  @param __n The index of the character to access.
-       *  @return  Read/write reference to the character.
-       *  @throw  std::out_of_range  If @a __n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter
-       *  is first checked that it is in the range of the string.  The
-       *  function throws out_of_range if the check fails.  Success
-       *  results in unsharing the string.
-       */
-      reference
-      at(size_type __n)
-      {
-	if (__n >= this->size())
-	  std::__throw_out_of_range_fmt(__N("__versa_string::at: __n "
-					    "(which is %zu) >= this->size() "
-					    "(which is %zu)"),
-					__n, this->size());
-	this->_M_leak();
-	return this->_M_data()[__n];
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %string.
-       */
-      reference
-      front() _GLIBCXX_NOEXCEPT
-      { return operator[](0); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %string.
-       */
-      const_reference
-      front() const _GLIBCXX_NOEXCEPT
-      { return operator[](0); }
-
-      /**
-       *  Returns a read/write reference to the data at the last
-       *  element of the %string.
-       */
-      reference
-      back() _GLIBCXX_NOEXCEPT
-      { return operator[](this->size() - 1); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the
-       *  last element of the %string.
-       */
-      const_reference
-      back() const _GLIBCXX_NOEXCEPT
-      { return operator[](this->size() - 1); }
-#endif
-
-      // Modifiers:
-      /**
-       *  @brief  Append a string to this string.
-       *  @param __str  The string to append.
-       *  @return  Reference to this string.
-       */
-      __versa_string&
-      operator+=(const __versa_string& __str)
-      { return this->append(__str); }
-
-      /**
-       *  @brief  Append a C string.
-       *  @param __s  The C string to append.
-       *  @return  Reference to this string.
-       */
-      __versa_string&
-      operator+=(const _CharT* __s)
-      { return this->append(__s); }
-
-      /**
-       *  @brief  Append a character.
-       *  @param __c  The character to append.
-       *  @return  Reference to this string.
-       */
-      __versa_string&
-      operator+=(_CharT __c)
-      { 
-	this->push_back(__c);
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Append an initializer_list of characters.
-       *  @param __l  The initializer_list of characters to be appended.
-       *  @return  Reference to this string.
-       */
-      __versa_string&
-      operator+=(std::initializer_list<_CharT> __l)
-      { return this->append(__l.begin(), __l.end()); }
-#endif // C++11
-
-      /**
-       *  @brief  Append a string to this string.
-       *  @param __str  The string to append.
-       *  @return  Reference to this string.
-       */
-      __versa_string&
-      append(const __versa_string& __str)
-      { return _M_append(__str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Append a substring.
-       *  @param __str  The string to append.
-       *  @param __pos  Index of the first character of str to append.
-       *  @param __n  The number of characters to append.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range if @a pos is not a valid index.
-       *
-       *  This function appends @a __n characters from @a __str
-       *  starting at @a __pos to this string.  If @a __n is is larger
-       *  than the number of available characters in @a __str, the
-       *  remainder of @a __str is appended.
-       */
-      __versa_string&
-      append(const __versa_string& __str, size_type __pos, size_type __n)
-      { return _M_append(__str._M_data()
-			 + __str._M_check(__pos, "__versa_string::append"),
-			 __str._M_limit(__pos, __n)); }
-
-      /**
-       *  @brief  Append a C substring.
-       *  @param __s  The C string to append.
-       *  @param __n  The number of characters to append.
-       *  @return  Reference to this string.
-       */
-      __versa_string&
-      append(const _CharT* __s, size_type __n)
-      {
-	__glibcxx_requires_string_len(__s, __n);
-	_M_check_length(size_type(0), __n, "__versa_string::append");
-	return _M_append(__s, __n);
-      }
-
-      /**
-       *  @brief  Append a C string.
-       *  @param __s  The C string to append.
-       *  @return  Reference to this string.
-       */
-      __versa_string&
-      append(const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	const size_type __n = traits_type::length(__s);
-	_M_check_length(size_type(0), __n, "__versa_string::append");
-	return _M_append(__s, __n);
-      }
-
-      /**
-       *  @brief  Append multiple characters.
-       *  @param __n  The number of characters to append.
-       *  @param __c  The character to use.
-       *  @return  Reference to this string.
-       *
-       *  Appends n copies of c to this string.
-       */
-      __versa_string&
-      append(size_type __n, _CharT __c)
-      { return _M_replace_aux(this->size(), size_type(0), __n, __c); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Append an initializer_list of characters.
-       *  @param __l  The initializer_list of characters to append.
-       *  @return  Reference to this string.
-       */
-      __versa_string&
-      append(std::initializer_list<_CharT> __l)
-      { return this->append(__l.begin(), __l.end()); }
-#endif // C++11
-
-      /**
-       *  @brief  Append a range of characters.
-       *  @param __first  Iterator referencing the first character to append.
-       *  @param __last  Iterator marking the end of the range.
-       *  @return  Reference to this string.
-       *
-       *  Appends characters in the range [first,last) to this string.
-       */
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-        __versa_string&
-        append(_InputIterator __first, _InputIterator __last)
-        { return this->replace(_M_iend(), _M_iend(), __first, __last); }
-
-      /**
-       *  @brief  Append a single character.
-       *  @param __c  Character to append.
-       */
-      void
-      push_back(_CharT __c)
-      { 
-	const size_type __size = this->size();
-	if (__size + 1 > this->capacity() || this->_M_is_shared())
-	  this->_M_mutate(__size, size_type(0), 0, size_type(1));
-	traits_type::assign(this->_M_data()[__size], __c);
-	this->_M_set_length(__size + 1);
-      }
-
-      /**
-       *  @brief  Set value to contents of another string.
-       *  @param  __str  Source string to use.
-       *  @return  Reference to this string.
-       */
-      __versa_string&
-      assign(const __versa_string& __str)
-      {
-	this->_M_assign(__str);
-	return *this;
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Set value to contents of another string.
-       *  @param  __str  Source string to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets this string to the exact contents of @a __str.
-       *  @a __str is a valid, but unspecified string.
-       */
-      __versa_string&
-      assign(__versa_string&& __str) noexcept
-      {
-	this->swap(__str);
-	return *this;
-      }
-#endif // C++11
-
-      /**
-       *  @brief  Set value to a substring of a string.
-       *  @param __str  The string to use.
-       *  @param __pos  Index of the first character of str.
-       *  @param __n  Number of characters to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range if @a __pos is not a valid index.
-       *
-       *  This function sets this string to the substring of @a __str
-       *  consisting of @a __n characters at @a __pos.  If @a __n is
-       *  is larger than the number of available characters in @a
-       *  __str, the remainder of @a __str is used.
-       */
-      __versa_string&
-      assign(const __versa_string& __str, size_type __pos, size_type __n)
-      { return _M_replace(size_type(0), this->size(), __str._M_data()
-			  + __str._M_check(__pos, "__versa_string::assign"),
-			  __str._M_limit(__pos, __n)); }
-
-      /**
-       *  @brief  Set value to a C substring.
-       *  @param __s  The C string to use.
-       *  @param __n  Number of characters to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to the first @a
-       *  __n characters of @a __s.  If @a __n is is larger than the
-       *  number of available characters in @a __s, the remainder of
-       *  @a __s is used.
-       */
-      __versa_string&
-      assign(const _CharT* __s, size_type __n)
-      {
-	__glibcxx_requires_string_len(__s, __n);
-	return _M_replace(size_type(0), this->size(), __s, __n);
-      }
-
-      /**
-       *  @brief  Set value to contents of a C string.
-       *  @param __s  The C string to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to the value of
-       *  @a __s.  The data is copied, so there is no dependence on @a
-       *  __s once the function returns.
-       */
-      __versa_string&
-      assign(const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return _M_replace(size_type(0), this->size(), __s,
-			  traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Set value to multiple characters.
-       *  @param __n  Length of the resulting string.
-       *  @param __c  The character to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to @a __n copies of
-       *  character @a __c.
-       */
-      __versa_string&
-      assign(size_type __n, _CharT __c)
-      { return _M_replace_aux(size_type(0), this->size(), __n, __c); }
-
-      /**
-       *  @brief  Set value to a range of characters.
-       *  @param __first  Iterator referencing the first character to append.
-       *  @param __last  Iterator marking the end of the range.
-       *  @return  Reference to this string.
-       *
-       *  Sets value of string to characters in the range
-       *  [first,last).
-      */
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-        __versa_string&
-        assign(_InputIterator __first, _InputIterator __last)
-        { return this->replace(_M_ibegin(), _M_iend(), __first, __last); }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Set value to an initializer_list of characters.
-       *  @param __l  The initializer_list of characters to assign.
-       *  @return  Reference to this string.
-       */
-      __versa_string&
-      assign(std::initializer_list<_CharT> __l)
-      { return this->assign(__l.begin(), __l.end()); }
-#endif // C++11
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert multiple characters.
-       *  @param __p  Const_iterator referencing location in string to
-       *              insert at.
-       *  @param __n  Number of characters to insert
-       *  @param __c  The character to insert.
-       *  @return  Iterator referencing the first inserted char.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts @a __n copies of character @a __c starting at the
-       *  position referenced by iterator @a __p.  If adding
-       *  characters causes the length to exceed max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      iterator
-      insert(const_iterator __p, size_type __n, _CharT __c)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
-	const size_type __pos = __p - _M_ibegin();
-	this->replace(__p, __p, __n, __c);
-	return iterator(this->_M_data() + __pos); 
-      }
-#else
-      /**
-       *  @brief  Insert multiple characters.
-       *  @param __p  Iterator referencing location in string to insert at.
-       *  @param __n  Number of characters to insert
-       *  @param __c  The character to insert.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts @a __n copies of character @a __c starting at the
-       *  position referenced by iterator @a __p.  If adding
-       *  characters causes the length to exceed max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      void
-      insert(iterator __p, size_type __n, _CharT __c)
-      {	this->replace(__p, __p, __n, __c);  }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert a range of characters.
-       *  @param __p  Const_iterator referencing location in string to
-       *              insert at.
-       *  @param __beg  Start of range.
-       *  @param __end  End of range.
-       *  @return  Iterator referencing the first inserted char.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts characters in range [beg,end).  If adding characters
-       *  causes the length to exceed max_size(), length_error is
-       *  thrown.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	iterator
-        insert(const_iterator __p, _InputIterator __beg, _InputIterator __end)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
-	  const size_type __pos = __p - _M_ibegin();
-	  this->replace(__p, __p, __beg, __end);
-	  return iterator(this->_M_data() + __pos);
-	}
-#else
-      /**
-       *  @brief  Insert a range of characters.
-       *  @param __p  Iterator referencing location in string to insert at.
-       *  @param __beg  Start of range.
-       *  @param __end  End of range.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts characters in range [beg,end).  If adding characters
-       *  causes the length to exceed max_size(), length_error is
-       *  thrown.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      template<class _InputIterator>
-        void
-        insert(iterator __p, _InputIterator __beg, _InputIterator __end)
-        { this->replace(__p, __p, __beg, __end); }
-#endif
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Insert an initializer_list of characters.
-       *  @param __p  Const_iterator referencing location in string to
-       *              insert at.
-       *  @param __l  The initializer_list of characters to insert.
-       *  @return  Iterator referencing the first inserted char.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       */
-      iterator
-      insert(const_iterator __p, std::initializer_list<_CharT> __l)
-      { return this->insert(__p, __l.begin(), __l.end()); }
-#endif // C++11
-
-      /**
-       *  @brief  Insert value of a string.
-       *  @param __pos1  Iterator referencing location in string to insert at.
-       *  @param __str  The string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts value of @a __str starting at @a __pos1.  If adding
-       *  characters causes the length to exceed max_size(),
-       *  length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      __versa_string&
-      insert(size_type __pos1, const __versa_string& __str)
-      { return this->replace(__pos1, size_type(0),
-			     __str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Insert a substring.
-       *  @param __pos1  Iterator referencing location in string to insert at.
-       *  @param __str  The string to insert.
-       *  @param __pos2  Start of characters in str to insert.
-       *  @param __n  Number of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a __pos1 > size() or
-       *  @a __pos2 > @a __str.size().
-       *
-       *  Starting at @a __pos1, insert @a __n character of @a __str
-       *  beginning with @a __pos2.  If adding characters causes the
-       *  length to exceed max_size(), length_error is thrown.  If @a
-       *  __pos1 is beyond the end of this string or @a __pos2 is
-       *  beyond the end of @a __str, out_of_range is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      __versa_string&
-      insert(size_type __pos1, const __versa_string& __str,
-	     size_type __pos2, size_type __n)
-      { return this->replace(__pos1, size_type(0), __str._M_data()
-			     + __str._M_check(__pos2, "__versa_string::insert"),
-			     __str._M_limit(__pos2, __n)); }
-
-      /**
-       *  @brief  Insert a C substring.
-       *  @param __pos  Iterator referencing location in string to insert at.
-       *  @param __s  The C string to insert.
-       *  @param __n  The number of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a __pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts the first @a __n characters of @a __s starting at @a
-       *  __pos.  If adding characters causes the length to exceed
-       *  max_size(), length_error is thrown.  If @a __pos is beyond
-       *  end(), out_of_range is thrown.  The value of the string
-       *  doesn't change if an error is thrown.
-      */
-      __versa_string&
-      insert(size_type __pos, const _CharT* __s, size_type __n)
-      { return this->replace(__pos, size_type(0), __s, __n); }
-
-      /**
-       *  @brief  Insert a C string.
-       *  @param __pos  Iterator referencing location in string to insert at.
-       *  @param __s  The C string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a __pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts the first @a __n characters of @a __s starting at @a
-       *  __pos.  If adding characters causes the length to exceed
-       *  max_size(), length_error is thrown.  If @a __pos is beyond
-       *  end(), out_of_range is thrown.  The value of the string
-       *  doesn't change if an error is thrown.
-      */
-      __versa_string&
-      insert(size_type __pos, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->replace(__pos, size_type(0), __s,
-			     traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Insert multiple characters.
-       *  @param __pos  Index in string to insert at.
-       *  @param __n  Number of characters to insert
-       *  @param __c  The character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a __pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts @a __n copies of character @a __c starting at index
-       *  @a __pos.  If adding characters causes the length to exceed
-       *  max_size(), length_error is thrown.  If @a __pos > length(),
-       *  out_of_range is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      __versa_string&
-      insert(size_type __pos, size_type __n, _CharT __c)
-      { return _M_replace_aux(_M_check(__pos, "__versa_string::insert"),
-			      size_type(0), __n, __c); }
-
-      /**
-       *  @brief  Insert one character.
-       *  @param __p  Iterator referencing position in string to insert at.
-       *  @param __c  The character to insert.
-       *  @return  Iterator referencing newly inserted char.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts character @a __c at position referenced by @a __p.
-       *  If adding character causes the length to exceed max_size(),
-       *  length_error is thrown.  If @a __p is beyond end of string,
-       *  out_of_range is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __p, _CharT __c)
-#else
-      insert(iterator __p, _CharT __c)	
-#endif
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
-	const size_type __pos = __p - _M_ibegin();
-	_M_replace_aux(__pos, size_type(0), size_type(1), __c);
-	this->_M_set_leaked();
-	return iterator(this->_M_data() + __pos);
-      }
-
-      /**
-       *  @brief  Remove characters.
-       *  @param __pos  Index of first character to remove (default 0).
-       *  @param __n  Number of characters to remove (default remainder).
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a __pos is beyond the end of this
-       *  string.
-       *
-       *  Removes @a __n characters from this string starting at @a
-       *  __pos.  The length of the string is reduced by @a __n.  If
-       *  there are < @a __n characters to remove, the remainder of
-       *  the string is truncated.  If @a __p is beyond end of string,
-       *  out_of_range is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      __versa_string&
-      erase(size_type __pos = 0, size_type __n = npos)
-      { 
-	this->_M_erase(_M_check(__pos, "__versa_string::erase"),
-		       _M_limit(__pos, __n));
-	return *this;
-      }
-
-      /**
-       *  @brief  Remove one character.
-       *  @param __position  Iterator referencing the character to remove.
-       *  @return  iterator referencing same location after removal.
-       *
-       *  Removes the character at @a __position from this string. The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __position)
-#else
-      erase(iterator __position)	
-#endif
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__position >= _M_ibegin()
-				 && __position < _M_iend());
-	const size_type __pos = __position - _M_ibegin();
-	this->_M_erase(__pos, size_type(1));
-	this->_M_set_leaked();
-	return iterator(this->_M_data() + __pos);
-      }
-
-      /**
-       *  @brief  Remove a range of characters.
-       *  @param __first  Iterator referencing the first character to remove.
-       *  @param __last  Iterator referencing the end of the range.
-       *  @return  Iterator referencing location of first after removal.
-       *
-       *  Removes the characters in the range [first,last) from this
-       *  string.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __first, const_iterator __last)
-#else
-      erase(iterator __first, iterator __last)
-#endif
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__first >= _M_ibegin() && __first <= __last
-				 && __last <= _M_iend());
-        const size_type __pos = __first - _M_ibegin();
-	this->_M_erase(__pos, __last - __first);
-	this->_M_set_leaked();
-	return iterator(this->_M_data() + __pos);
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Remove the last character.
-       *
-       *  The string must be non-empty.
-       */
-      void
-      pop_back()
-      { this->_M_erase(size()-1, 1); }
-#endif // C++11
-
-      /**
-       *  @brief  Replace characters with value from another string.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n  Number of characters to be replaced.
-       *  @param __str  String to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a __pos is beyond the end of this
-       *  string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos,pos+n) from this
-       *  string.  In place, the value of @a __str is inserted.  If @a
-       *  __pos is beyond end of string, out_of_range is thrown.  If
-       *  the length of the result exceeds max_size(), length_error is
-       *  thrown.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      __versa_string&
-      replace(size_type __pos, size_type __n, const __versa_string& __str)
-      { return this->replace(__pos, __n, __str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Replace characters with value from another string.
-       *  @param __pos1  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __str  String to insert.
-       *  @param __pos2  Index of first character of str to use.
-       *  @param __n2  Number of characters from str to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a __pos1 > size() or @a __pos2 >
-       *  str.size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos1,pos1 + n) from
-       *  this string.  In place, the value of @a __str is inserted.
-       *  If @a __pos is beyond end of string, out_of_range is thrown.
-       *  If the length of the result exceeds max_size(), length_error
-       *  is thrown.  The value of the string doesn't change if an
-       *  error is thrown.
-      */
-      __versa_string&
-      replace(size_type __pos1, size_type __n1, const __versa_string& __str,
-	      size_type __pos2, size_type __n2)
-      {
-	return this->replace(__pos1, __n1, __str._M_data()
-			     + __str._M_check(__pos2,
-					      "__versa_string::replace"),
-			     __str._M_limit(__pos2, __n2));
-      }
-
-      /**
-       *  @brief  Replace characters with value of a C substring.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __s  C string to insert.
-       *  @param __n2  Number of characters from @a __s to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a __pos1 > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos,pos + n1) from this
-       *  string.  In place, the first @a __n2 characters of @a __s
-       *  are inserted, or all of @a __s if @a __n2 is too large.  If
-       *  @a __pos is beyond end of string, out_of_range is thrown.
-       *  If the length of result exceeds max_size(), length_error is
-       *  thrown.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      __versa_string&
-      replace(size_type __pos, size_type __n1, const _CharT* __s,
-	      size_type __n2)
-      {
-	__glibcxx_requires_string_len(__s, __n2);
-	return _M_replace(_M_check(__pos, "__versa_string::replace"),
-			  _M_limit(__pos, __n1), __s, __n2);
-      }
-
-      /**
-       *  @brief  Replace characters with value of a C string.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __s  C string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a __pos > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos,pos + n1) from this
-       *  string.  In place, the characters of @a __s are inserted.  If
-       *  @a pos is beyond end of string, out_of_range is thrown.  If
-       *  the length of result exceeds max_size(), length_error is thrown.  
-       *  The value of the string doesn't change if an error is thrown.
-      */
-      __versa_string&
-      replace(size_type __pos, size_type __n1, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->replace(__pos, __n1, __s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Replace characters with multiple characters.
-       *  @param __pos  Index of first character to replace.
-       *  @param __n1  Number of characters to be replaced.
-       *  @param __n2  Number of characters to insert.
-       *  @param __c  Character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a __pos > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos,pos + n1) from this
-       *  string.  In place, @a __n2 copies of @a __c are inserted.
-       *  If @a __pos is beyond end of string, out_of_range is thrown.
-       *  If the length of result exceeds max_size(), length_error is
-       *  thrown.  The value of the string doesn't change if an error
-       *  is thrown.
-      */
-      __versa_string&
-      replace(size_type __pos, size_type __n1, size_type __n2, _CharT __c)
-      { return _M_replace_aux(_M_check(__pos, "__versa_string::replace"),
-			      _M_limit(__pos, __n1), __n2, __c); }
-
-      /**
-       *  @brief  Replace range of characters with string.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __str  String value to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place, the
-       *  value of @a __str is inserted.  If the length of result
-       *  exceeds max_size(), length_error is thrown.  The value of
-       *  the string doesn't change if an error is thrown.
-      */
-      __versa_string&
-#if __cplusplus >= 201103L
-      replace(const_iterator __i1, const_iterator __i2,
-	      const __versa_string& __str)
-#else
-      replace(iterator __i1, iterator __i2, const __versa_string& __str)
-#endif
-      { return this->replace(__i1, __i2, __str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Replace range of characters with C substring.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __s  C string value to insert.
-       *  @param __n  Number of characters from s to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place, the
-       *  first @a n characters of @a __s are inserted.  If the length
-       *  of result exceeds max_size(), length_error is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      __versa_string&
-#if __cplusplus >= 201103L
-      replace(const_iterator __i1, const_iterator __i2,
-	      const _CharT* __s, size_type __n)
-#else
-      replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n)
-#endif
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1, __s, __n);
-      }
-
-      /**
-       *  @brief  Replace range of characters with C string.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __s  C string value to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place, the
-       *  characters of @a __s are inserted.  If the length of result
-       *  exceeds max_size(), length_error is thrown.  The value of
-       *  the string doesn't change if an error is thrown.
-      */
-      __versa_string&
-#if __cplusplus >= 201103L
-      replace(const_iterator __i1, const_iterator __i2, const _CharT* __s)
-#else
-      replace(iterator __i1, iterator __i2, const _CharT* __s)	
-#endif
-      {
-	__glibcxx_requires_string(__s);
-	return this->replace(__i1, __i2, __s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Replace range of characters with multiple characters
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __n  Number of characters to insert.
-       *  @param __c  Character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place, @a
-       *  __n copies of @a __c are inserted.  If the length of result
-       *  exceeds max_size(), length_error is thrown.  The value of
-       *  the string doesn't change if an error is thrown.
-      */
-      __versa_string&
-#if __cplusplus >= 201103L
-      replace(const_iterator __i1, const_iterator __i2, size_type __n,
-	      _CharT __c)
-#else
-      replace(iterator __i1, iterator __i2, size_type __n, _CharT __c)
-#endif
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __c);
-      }
-
-      /**
-       *  @brief  Replace range of characters with range.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __k1  Iterator referencing start of range to insert.
-       *  @param __k2  Iterator referencing end of range to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place,
-       *  characters in the range [k1,k2) are inserted.  If the length
-       *  of result exceeds max_size(), length_error is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-#if __cplusplus >= 201103L
-      template<class _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-        __versa_string&
-        replace(const_iterator __i1, const_iterator __i2,
-		_InputIterator __k1, _InputIterator __k2)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				   && __i2 <= _M_iend());
-	  __glibcxx_requires_valid_range(__k1, __k2);
-	  return this->_M_replace_dispatch(__i1, __i2, __k1, __k2,
-					   std::__false_type());
-	}
-#else
-      template<class _InputIterator>
-        __versa_string&
-        replace(iterator __i1, iterator __i2,
-		_InputIterator __k1, _InputIterator __k2)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				   && __i2 <= _M_iend());
-	  __glibcxx_requires_valid_range(__k1, __k2);
-	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
-	  return this->_M_replace_dispatch(__i1, __i2, __k1, __k2, _Integral());
-	}
-#endif
-
-      // Specializations for the common case of pointer and iterator:
-      // useful to avoid the overhead of temporary buffering in _M_replace.
-      __versa_string&
-#if __cplusplus >= 201103L
-      replace(const_iterator __i1, const_iterator __i2,
-	      _CharT* __k1, _CharT* __k2)
-#else
-      replace(iterator __i1, iterator __i2,
-	      _CharT* __k1, _CharT* __k2)
-#endif
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			     __k1, __k2 - __k1);
-      }
-
-      __versa_string&
-#if __cplusplus >= 201103L
-      replace(const_iterator __i1, const_iterator __i2,
-	      const _CharT* __k1, const _CharT* __k2)
-#else
-      replace(iterator __i1, iterator __i2,
-	      const _CharT* __k1, const _CharT* __k2)
-#endif
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			     __k1, __k2 - __k1);
-      }
-
-      __versa_string&
-#if __cplusplus >= 201103L
-      replace(const_iterator __i1, const_iterator __i2,
-	      iterator __k1, iterator __k2)
-#else
-      replace(iterator __i1, iterator __i2,
-	      iterator __k1, iterator __k2)
-#endif
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			     __k1.base(), __k2 - __k1);
-      }
-
-      __versa_string&
-#if __cplusplus >= 201103L
-      replace(const_iterator __i1, const_iterator __i2,
-	      const_iterator __k1, const_iterator __k2)
-#else
-      replace(iterator __i1, iterator __i2,
-	      const_iterator __k1, const_iterator __k2)
-#endif
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	__glibcxx_requires_valid_range(__k1, __k2);
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			     __k1.base(), __k2 - __k1);
-      }
-      
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Replace range of characters with initializer_list.
-       *  @param __i1  Iterator referencing start of range to replace.
-       *  @param __i2  Iterator referencing end of range to replace.
-       *  @param __l  The initializer_list of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place,
-       *  characters in the range [k1,k2) are inserted.  If the length
-       *  of result exceeds max_size(), length_error is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      __versa_string&
-      replace(const_iterator __i1, const_iterator __i2,
-	      std::initializer_list<_CharT> __l)
-      { return this->replace(__i1, __i2, __l.begin(), __l.end()); }
-#endif // C++11
-
-    private:
-      template<class _Integer>
-	__versa_string&
-	_M_replace_dispatch(const_iterator __i1, const_iterator __i2,
-			    _Integer __n, _Integer __val, std::__true_type)
-        { return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __val); }
-
-      template<class _InputIterator>
-	__versa_string&
-	_M_replace_dispatch(const_iterator __i1, const_iterator __i2,
-			    _InputIterator __k1, _InputIterator __k2,
-			    std::__false_type);
-
-      __versa_string&
-      _M_replace_aux(size_type __pos1, size_type __n1, size_type __n2,
-		     _CharT __c);
-
-      __versa_string&
-      _M_replace(size_type __pos, size_type __len1, const _CharT* __s,
-		 const size_type __len2);
-
-      __versa_string&
-      _M_append(const _CharT* __s, size_type __n);
-
-    public:
-
-      /**
-       *  @brief  Copy substring into C string.
-       *  @param __s  C string to copy value into.
-       *  @param __n  Number of characters to copy.
-       *  @param __pos  Index of first character to copy.
-       *  @return  Number of characters actually copied
-       *  @throw  std::out_of_range  If pos > size().
-       *
-       *  Copies up to @a __n characters starting at @a __pos into the
-       *  C string @a s.  If @a __pos is greater than size(),
-       *  out_of_range is thrown.
-      */
-      size_type
-      copy(_CharT* __s, size_type __n, size_type __pos = 0) const;
-
-      /**
-       *  @brief  Swap contents with another string.
-       *  @param __s  String to swap with.
-       *
-       *  Exchanges the contents of this string with that of @a __s in
-       *  constant time.
-      */
-      void
-      swap(__versa_string& __s) _GLIBCXX_NOEXCEPT
-      { this->_M_swap(__s); }
-
-      // String operations:
-      /**
-       *  @brief  Return const pointer to null-terminated contents.
-       *
-       *  This is a handle to internal data.  Do not modify or dire things may
-       *  happen.
-      */
-      const _CharT*
-      c_str() const _GLIBCXX_NOEXCEPT
-      { return this->_M_data(); }
-
-      /**
-       *  @brief  Return const pointer to contents.
-       *
-       *  This is a handle to internal data.  Do not modify or dire things may
-       *  happen.
-      */
-      const _CharT*
-      data() const _GLIBCXX_NOEXCEPT
-      { return this->_M_data(); }
-
-      /**
-       *  @brief  Return copy of allocator used to construct this string.
-      */
-      allocator_type
-      get_allocator() const _GLIBCXX_NOEXCEPT
-      { return allocator_type(this->_M_get_allocator()); }
-
-      /**
-       *  @brief  Find position of a C substring.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to search from.
-       *  @param __n  Number of characters from @a __s to search for.
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for the first @a
-       *  __n characters in @a __s within this string.  If found,
-       *  returns the index where it begins.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find position of a string.
-       *  @param __str  String to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for value of @a
-       *  __str within this string.  If found, returns the index where
-       *  it begins.  If not found, returns npos.
-      */
-      size_type
-      find(const __versa_string& __str, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a C string.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for the value of @a
-       *  __s within this string.  If found, returns the index where
-       *  it begins.  If not found, returns npos.
-      */
-      size_type
-      find(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for @a __c within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Find last position of a string.
-       *  @param __str  String to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of start of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for value of @a
-       *  __str within this string.  If found, returns the index where
-       *  it begins.  If not found, returns npos.
-      */
-      size_type
-      rfind(const __versa_string& __str, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT
-      { return this->rfind(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a C substring.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to search back from.
-       *  @param __n  Number of characters from s to search for.
-       *  @return  Index of start of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for the first @a
-       *  __n characters in @a __s within this string.  If found,
-       *  returns the index where it begins.  If not found, returns
-       *  npos.
-      */
-      size_type
-      rfind(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find last position of a C string.
-       *  @param __s  C string to locate.
-       *  @param __pos  Index of character to start search at (default end).
-       *  @return  Index of start of  last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for the value of
-       *  @a __s within this string.  If found, returns the index
-       *  where it begins.  If not found, returns npos.
-      */
-      size_type
-      rfind(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->rfind(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for @a __c within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      rfind(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Find position of a character of string.
-       *  @param __str  String containing characters to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for one of the characters of
-       *  @a __str within this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_first_of(const __versa_string& __str, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_first_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a character of C substring.
-       *  @param __s  String containing characters to locate.
-       *  @param __pos  Index of character to search from.
-       *  @param __n  Number of characters from s to search for.
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for one of the
-       *  first @a __n characters of @a __s within this string.  If
-       *  found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      find_first_of(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find position of a character of C string.
-       *  @param __s  String containing characters to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for one of the
-       *  characters of @a __s within this string.  If found, returns
-       *  the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_of(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_first_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for the character
-       *  @a __c within this string.  If found, returns the index
-       *  where it was found.  If not found, returns npos.
-       *
-       *  Note: equivalent to find(c, pos).
-      */
-      size_type
-      find_first_of(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT
-      { return this->find(__c, __pos); }
-
-      /**
-       *  @brief  Find last position of a character of string.
-       *  @param __str  String containing characters to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for one of the
-       *  characters of @a __str within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_last_of(const __versa_string& __str, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_last_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a character of C substring.
-       *  @param __s  C string containing characters to locate.
-       *  @param __pos  Index of character to search back from.
-       *  @param __n  Number of characters from s to search for.
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for one of the
-       *  first @a __n characters of @a __s within this string.  If
-       *  found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      find_last_of(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find last position of a character of C string.
-       *  @param __s  C string containing characters to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for one of the
-       *  characters of @a __s within this string.  If found, returns
-       *  the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_last_of(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_last_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a character.
-       *  @param __c  Character to locate.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for @a __c within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-       *
-       *  Note: equivalent to rfind(c, pos).
-      */
-      size_type
-      find_last_of(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT
-      { return this->rfind(__c, __pos); }
-
-      /**
-       *  @brief  Find position of a character not in string.
-       *  @param __str  String containing characters to avoid.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character not
-       *  contained in @a __str within this string.  If found, returns
-       *  the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const __versa_string& __str, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT
-      { return this->find_first_not_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a character not in C substring.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search from.
-       *  @param __n  Number of characters from s to consider.
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character not
-       *  contained in the first @a __n characters of @a __s within
-       *  this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const _CharT* __s, size_type __pos,
-			size_type __n) const;
-
-      /**
-       *  @brief  Find position of a character not in C string.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character not
-       *  contained in @a __s within this string.  If found, returns
-       *  the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_first_not_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a different character.
-       *  @param __c  Character to avoid.
-       *  @param __pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a __pos, searches forward for a character
-       *  other than @a __c within this string.  If found, returns the
-       *  index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(_CharT __c, size_type __pos = 0) const
-	_GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Find last position of a character not in string.
-       *  @param __str  String containing characters to avoid.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character
-       *  not contained in @a __str within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_last_not_of(const __versa_string& __str,
-		       size_type __pos = npos) const _GLIBCXX_NOEXCEPT
-      { return this->find_last_not_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a character not in C substring.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search back from.
-       *  @param __n  Number of characters from s to consider.
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character
-       *  not contained in the first @a __n characters of @a __s
-       *  within this string.  If found, returns the index where it
-       *  was found.  If not found, returns npos.
-      */
-      size_type
-      find_last_not_of(const _CharT* __s, size_type __pos,
-		       size_type __n) const;
-      /**
-       *  @brief  Find last position of a character not in C string.
-       *  @param __s  C string containing characters to avoid.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character
-       *  not contained in @a __s within this string.  If found,
-       *  returns the index where it was found.  If not found, returns
-       *  npos.
-      */
-      size_type
-      find_last_not_of(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_last_not_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a different character.
-       *  @param __c  Character to avoid.
-       *  @param __pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a __pos, searches backward for a character
-       *  other than @a __c within this string.  If found, returns the
-       *  index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_last_not_of(_CharT __c, size_type __pos = npos) const
-	_GLIBCXX_NOEXCEPT;
-
-      /**
-       *  @brief  Get a substring.
-       *  @param __pos  Index of first character (default 0).
-       *  @param __n  Number of characters in substring (default remainder).
-       *  @return  The new string.
-       *  @throw  std::out_of_range  If pos > size().
-       *
-       *  Construct and return a new string using the @a __n
-       *  characters starting at @a __pos.  If the string is too
-       *  short, use the remainder of the characters.  If @a __pos is
-       *  beyond the end of the string, out_of_range is thrown.
-      */
-      __versa_string
-      substr(size_type __pos = 0, size_type __n = npos) const
-      {
-	return __versa_string(*this, _M_check(__pos, "__versa_string::substr"),
-			      __n);
-      }
-
-      /**
-       *  @brief  Compare to a string.
-       *  @param __str  String to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Returns an integer < 0 if this string is ordered before @a
-       *  __str, 0 if their values are equivalent, or > 0 if this
-       *  string is ordered after @a __str.  Determines the effective
-       *  length rlen of the strings to compare as the smallest of
-       *  size() and str.size().  The function then compares the two
-       *  strings by calling traits::compare(data(), str.data(),rlen).
-       *  If the result of the comparison is nonzero returns it,
-       *  otherwise the shorter one is ordered first.
-      */
-      int
-      compare(const __versa_string& __str) const
-      {
-	if (this->_M_compare(__str))
-	  return 0;
-
-	const size_type __size = this->size();
-	const size_type __osize = __str.size();
-	const size_type __len = std::min(__size, __osize);
-
-	int __r = traits_type::compare(this->_M_data(), __str.data(), __len);
-	if (!__r)
-	  __r = this->_S_compare(__size, __osize);
-	return __r;
-      }
-
-      /**
-       *  @brief  Compare substring to a string.
-       *  @param __pos  Index of first character of substring.
-       *  @param __n  Number of characters in substring.
-       *  @param __str  String to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n characters
-       *  starting at @a __pos.  Returns an integer < 0 if the
-       *  substring is ordered before @a __str, 0 if their values are
-       *  equivalent, or > 0 if the substring is ordered after @a
-       *  __str.  Determines the effective length rlen of the strings
-       *  to compare as the smallest of the length of the substring
-       *  and @a __str.size().  The function then compares the two
-       *  strings by calling
-       *  traits::compare(substring.data(),str.data(),rlen).  If the
-       *  result of the comparison is nonzero returns it, otherwise
-       *  the shorter one is ordered first.
-      */
-      int
-      compare(size_type __pos, size_type __n,
-	      const __versa_string& __str) const;
-
-      /**
-       *  @brief  Compare substring to a substring.
-       *  @param __pos1  Index of first character of substring.
-       *  @param __n1  Number of characters in substring.
-       *  @param __str  String to compare against.
-       *  @param __pos2  Index of first character of substring of str.
-       *  @param __n2  Number of characters in substring of str.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n1
-       *  characters starting at @a __pos1.  Form the substring of @a
-       *  __str from the @a __n2 characters starting at @a __pos2.
-       *  Returns an integer < 0 if this substring is ordered before
-       *  the substring of @a __str, 0 if their values are equivalent,
-       *  or > 0 if this substring is ordered after the substring of
-       *  @a __str.  Determines the effective length rlen of the
-       *  strings to compare as the smallest of the lengths of the
-       *  substrings.  The function then compares the two strings by
-       *  calling
-       *  traits::compare(substring.data(),str.substr(pos2,n2).data(),rlen).
-       *  If the result of the comparison is nonzero returns it,
-       *  otherwise the shorter one is ordered first.
-      */
-      int
-      compare(size_type __pos1, size_type __n1, const __versa_string& __str,
-	      size_type __pos2, size_type __n2) const;
-
-      /**
-       *  @brief  Compare to a C string.
-       *  @param __s  C string to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Returns an integer < 0 if this string is ordered before @a
-       *  __s, 0 if their values are equivalent, or > 0 if this string
-       *  is ordered after @a __s.  Determines the effective length
-       *  rlen of the strings to compare as the smallest of size() and
-       *  the length of a string constructed from @a __s.  The
-       *  function then compares the two strings by calling
-       *  traits::compare(data(),s,rlen).  If the result of the
-       *  comparison is nonzero returns it, otherwise the shorter one
-       *  is ordered first.
-      */
-      int
-      compare(const _CharT* __s) const;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 5 String::compare specification questionable
-      /**
-       *  @brief  Compare substring to a C string.
-       *  @param __pos  Index of first character of substring.
-       *  @param __n1  Number of characters in substring.
-       *  @param __s  C string to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n1
-       *  characters starting at @a __pos.  Returns an integer < 0 if
-       *  the substring is ordered before @a __s, 0 if their values
-       *  are equivalent, or > 0 if the substring is ordered after @a
-       *  __s.  Determines the effective length rlen of the strings to
-       *  compare as the smallest of the length of the substring and
-       *  the length of a string constructed from @a __s.  The
-       *  function then compares the two string by calling
-       *  traits::compare(substring.data(),s,rlen).  If the result of
-       *  the comparison is nonzero returns it, otherwise the shorter
-       *  one is ordered first.
-      */
-      int
-      compare(size_type __pos, size_type __n1, const _CharT* __s) const;
-
-      /**
-       *  @brief  Compare substring against a character array.
-       *  @param __pos  Index of first character of substring.
-       *  @param __n1  Number of characters in substring.
-       *  @param __s  character array to compare against.
-       *  @param __n2  Number of characters of s.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a __n1
-       *  characters starting at @a __pos.  Form a string from the
-       *  first @a __n2 characters of @a __s.  Returns an integer < 0
-       *  if this substring is ordered before the string from @a __s,
-       *  0 if their values are equivalent, or > 0 if this substring
-       *  is ordered after the string from @a __s.  Determines the
-       *  effective length rlen of the strings to compare as the
-       *  smallest of the length of the substring and @a __n2.  The
-       *  function then compares the two strings by calling
-       *  traits::compare(substring.data(),__s,rlen).  If the result of
-       *  the comparison is nonzero returns it, otherwise the shorter
-       *  one is ordered first.
-       *
-       *  NB: __s must have at least n2 characters, <em>\\0</em> has no special
-       *  meaning.
-      */
-      int
-      compare(size_type __pos, size_type __n1, const _CharT* __s,
-	      size_type __n2) const;
-    };
-
-  // operator+
-  /**
-   *  @brief  Concatenate two strings.
-   *  @param __lhs  First string.
-   *  @param __rhs  Last string.
-   *  @return  New string with value of @a __lhs followed by @a __rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs);
-
-  /**
-   *  @brief  Concatenate C string and string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Last string.
-   *  @return  New string with value of @a __lhs followed by @a __rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(const _CharT* __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs);
-
-  /**
-   *  @brief  Concatenate character and string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Last string.
-   *  @return  New string with @a __lhs followed by @a __rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(_CharT __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs);
-
-  /**
-   *  @brief  Concatenate string and C string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Last string.
-   *  @return  New string with @a __lhs followed by @a __rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      const _CharT* __rhs);
-
-  /**
-   *  @brief  Concatenate string and character.
-   *  @param __lhs  First string.
-   *  @param __rhs  Last string.
-   *  @return  New string with @a __lhs followed by @a __rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      _CharT __rhs);
-
-#if __cplusplus >= 201103L
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return std::move(__lhs.append(__rhs)); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      __versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
-    { return std::move(__rhs.insert(0, __lhs)); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
-	      __versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
-    {
-      const auto __size = __lhs.size() + __rhs.size();
-      const bool __cond = (__size > __lhs.capacity()
-			   && __size <= __rhs.capacity());
-      return __cond ? std::move(__rhs.insert(0, __lhs))
-	            : std::move(__lhs.append(__rhs));
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(const _CharT* __lhs,
-	      __versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
-    { return std::move(__rhs.insert(0, __lhs)); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(_CharT __lhs,
-	      __versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
-    { return std::move(__rhs.insert(0, 1, __lhs)); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
-	      const _CharT* __rhs)
-    { return std::move(__lhs.append(__rhs)); }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
-	      _CharT __rhs)
-    { return std::move(__lhs.append(1, __rhs)); }
-#endif
-
-  // operator ==
-  /**
-   *  @brief  Test equivalence of two strings.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs.compare(@a __rhs) == 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator==(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	       const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return __lhs.compare(__rhs) == 0; }
-
-  template<typename _CharT,
-	   template <typename, typename, typename> class _Base>
-    inline typename __enable_if<std::__is_char<_CharT>::__value, bool>::__type
-    operator==(const __versa_string<_CharT, std::char_traits<_CharT>,
-	       std::allocator<_CharT>, _Base>& __lhs,
-	       const __versa_string<_CharT, std::char_traits<_CharT>,
-	       std::allocator<_CharT>, _Base>& __rhs)
-    { return (__lhs.size() == __rhs.size()
-	      && !std::char_traits<_CharT>::compare(__lhs.data(), __rhs.data(),
-						    __lhs.size())); }
-
-  /**
-   *  @brief  Test equivalence of C string and string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __rhs.compare(@a __lhs) == 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator==(const _CharT* __lhs,
-	       const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return __rhs.compare(__lhs) == 0; }
-
-  /**
-   *  @brief  Test equivalence of string and C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs.compare(@a __rhs) == 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator==(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	       const _CharT* __rhs)
-    { return __lhs.compare(__rhs) == 0; }
-
-  // operator !=
-  /**
-   *  @brief  Test difference of two strings.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs.compare(@a __rhs) != 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator!=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	       const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   *  @brief  Test difference of C string and string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __rhs.compare(@a __lhs) != 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator!=(const _CharT* __lhs,
-	       const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  /**
-   *  @brief  Test difference of string and C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs.compare(@a __rhs) != 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator!=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	       const _CharT* __rhs)
-    { return !(__lhs == __rhs); }
-
-  // operator <
-  /**
-   *  @brief  Test if string precedes string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs precedes @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator<(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return __lhs.compare(__rhs) < 0; }
-
-  /**
-   *  @brief  Test if string precedes C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs precedes @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator<(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      const _CharT* __rhs)
-    { return __lhs.compare(__rhs) < 0; }
-
-  /**
-   *  @brief  Test if C string precedes string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __lhs precedes @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator<(const _CharT* __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return __rhs.compare(__lhs) > 0; }
-
-  // operator >
-  /**
-   *  @brief  Test if string follows string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs follows @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator>(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return __lhs.compare(__rhs) > 0; }
-
-  /**
-   *  @brief  Test if string follows C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs follows @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator>(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      const _CharT* __rhs)
-    { return __lhs.compare(__rhs) > 0; }
-
-  /**
-   *  @brief  Test if C string follows string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __lhs follows @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator>(const _CharT* __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return __rhs.compare(__lhs) < 0; }
-
-  // operator <=
-  /**
-   *  @brief  Test if string doesn't follow string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs doesn't follow @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator<=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	       const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return __lhs.compare(__rhs) <= 0; }
-
-  /**
-   *  @brief  Test if string doesn't follow C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs doesn't follow @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator<=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	       const _CharT* __rhs)
-    { return __lhs.compare(__rhs) <= 0; }
-
-  /**
-   *  @brief  Test if C string doesn't follow string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __lhs doesn't follow @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator<=(const _CharT* __lhs,
-	       const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return __rhs.compare(__lhs) >= 0; }
-
-  // operator >=
-  /**
-   *  @brief  Test if string doesn't precede string.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *  @return  True if @a __lhs doesn't precede @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator>=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	       const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return __lhs.compare(__rhs) >= 0; }
-
-  /**
-   *  @brief  Test if string doesn't precede C string.
-   *  @param __lhs  String.
-   *  @param __rhs  C string.
-   *  @return  True if @a __lhs doesn't precede @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator>=(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	       const _CharT* __rhs)
-    { return __lhs.compare(__rhs) >= 0; }
-
-  /**
-   *  @brief  Test if C string doesn't precede string.
-   *  @param __lhs  C string.
-   *  @param __rhs  String.
-   *  @return  True if @a __lhs doesn't precede @a __rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline bool
-    operator>=(const _CharT* __lhs,
-	       const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { return __rhs.compare(__lhs) <= 0; }
-
-  /**
-   *  @brief  Swap contents of two strings.
-   *  @param __lhs  First string.
-   *  @param __rhs  Second string.
-   *
-   *  Exchanges the contents of @a __lhs and @a __rhs in constant time.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline void
-    swap(__versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	 __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    { __lhs.swap(__rhs); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief  Read stream into a string.
-   *  @param __is  Input stream.
-   *  @param __str  Buffer to store into.
-   *  @return  Reference to the input stream.
-   *
-   *  Stores characters from @a __is into @a __str until whitespace is
-   *  found, the end of the stream is encountered, or str.max_size()
-   *  is reached.  If is.width() is non-zero, that is the limit on the
-   *  number of characters stored into @a __str.  Any previous
-   *  contents of @a __str are erased.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-           template <typename, typename, typename> class _Base>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-	       __gnu_cxx::__versa_string<_CharT, _Traits,
-	                                 _Alloc, _Base>& __str);
-
-  /**
-   *  @brief  Write string to a stream.
-   *  @param __os  Output stream.
-   *  @param __str  String to write out.
-   *  @return  Reference to the output stream.
-   *
-   *  Output characters of @a __str into os following the same rules as for
-   *  writing a C string.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    inline basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-	       const __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc,
-	       _Base>& __str)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 586. string inserter not a formatted function
-      return __ostream_insert(__os, __str.data(), __str.size());
-    }
-
-  /**
-   *  @brief  Read a line from stream into a string.
-   *  @param __is  Input stream.
-   *  @param __str  Buffer to store into.
-   *  @param __delim  Character marking end of line.
-   *  @return  Reference to the input stream.
-   *
-   *  Stores characters from @a __is into @a __str until @a __delim is
-   *  found, the end of the stream is encountered, or str.max_size()
-   *  is reached.  If is.width() is non-zero, that is the limit on the
-   *  number of characters stored into @a __str.  Any previous
-   *  contents of @a __str are erased.  If @a delim was encountered,
-   *  it is extracted but not stored into @a __str.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-           template <typename, typename, typename> class _Base>
-    basic_istream<_CharT, _Traits>&
-    getline(basic_istream<_CharT, _Traits>& __is,
-	    __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str,
-	    _CharT __delim);
-
-  /**
-   *  @brief  Read a line from stream into a string.
-   *  @param __is  Input stream.
-   *  @param __str  Buffer to store into.
-   *  @return  Reference to the input stream.
-   *
-   *  Stores characters from is into @a __str until &apos;\n&apos; is
-   *  found, the end of the stream is encountered, or str.max_size()
-   *  is reached.  If is.width() is non-zero, that is the limit on the
-   *  number of characters stored into @a __str.  Any previous
-   *  contents of @a __str are erased.  If end of line was
-   *  encountered, it is extracted but not stored into @a __str.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc,
-           template <typename, typename, typename> class _Base>
-    inline basic_istream<_CharT, _Traits>&
-    getline(basic_istream<_CharT, _Traits>& __is,
-	    __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str)
-    { return getline(__is, __str, __is.widen('\n')); }      
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
-
-#include <ext/string_conversions.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // 21.4 Numeric Conversions [string.conversions].
-  inline int
-  stoi(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa<long, int>(&std::strtol, "stoi", __str.c_str(),
-					__idx, __base); }
-
-  inline long
-  stol(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::strtol, "stol", __str.c_str(),
-			     __idx, __base); }
-
-  inline unsigned long
-  stoul(const __vstring& __str, std::size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::strtoul, "stoul", __str.c_str(),
-			     __idx, __base); }
-
-  inline long long
-  stoll(const __vstring& __str, std::size_t* __idx = 0,	int __base = 10)
-  { return __gnu_cxx::__stoa(&std::strtoll, "stoll", __str.c_str(),
-			     __idx, __base); }
-
-  inline unsigned long long
-  stoull(const __vstring& __str, std::size_t* __idx, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::strtoull, "stoull", __str.c_str(),
-			     __idx, __base); }
-
-  // NB: strtof vs strtod.
-  inline float
-  stof(const __vstring& __str, std::size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::strtof, "stof", __str.c_str(), __idx); }
-
-  inline double
-  stod(const __vstring& __str, std::size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::strtod, "stod", __str.c_str(), __idx); }
-
-  inline long double
-  stold(const __vstring& __str, std::size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::strtold, "stold", __str.c_str(), __idx); }
-
-  // NB: (v)snprintf vs sprintf.
-
-  // DR 1261.
-  inline __vstring
-  to_string(int __val)
-  { return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf, 4 * sizeof(int),
-					      "%d", __val); }
-
-  inline __vstring
-  to_string(unsigned __val)
-  { return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
-					      4 * sizeof(unsigned),
-					      "%u", __val); }
-
-  inline __vstring
-  to_string(long __val)
-  { return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
-					      4 * sizeof(long),
-					      "%ld", __val); }
-
-  inline __vstring
-  to_string(unsigned long __val)
-  { return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
-					      4 * sizeof(unsigned long),
-					      "%lu", __val); }
-
-
-  inline __vstring
-  to_string(long long __val)
-  { return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
-					      4 * sizeof(long long),
-					      "%lld", __val); }
-
-  inline __vstring
-  to_string(unsigned long long __val)
-  { return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf,
-					      4 * sizeof(unsigned long long),
-					      "%llu", __val); }
-
-  inline __vstring
-  to_string(float __val)
-  {
-    const int __n = __numeric_traits<float>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf, __n,
-					      "%f", __val);
-  }
-
-  inline __vstring
-  to_string(double __val)
-  {
-    const int __n = __numeric_traits<double>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf, __n,
-					      "%f", __val);
-  }
-
-  inline __vstring
-  to_string(long double __val)
-  {
-    const int __n = __numeric_traits<long double>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<__vstring>(&std::vsnprintf, __n,
-					      "%Lf", __val);
-  }
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  inline int 
-  stoi(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa<long, int>(&std::wcstol, "stoi", __str.c_str(),
-					__idx, __base); }
-
-  inline long 
-  stol(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::wcstol, "stol", __str.c_str(),
-			     __idx, __base); }
-
-  inline unsigned long
-  stoul(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::wcstoul, "stoul", __str.c_str(),
-			     __idx, __base); }
-
-  inline long long
-  stoll(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::wcstoll, "stoll", __str.c_str(),
-			     __idx, __base); }
-
-  inline unsigned long long
-  stoull(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
-  { return __gnu_cxx::__stoa(&std::wcstoull, "stoull", __str.c_str(),
-			     __idx, __base); }
-
-  // NB: wcstof vs wcstod.
-  inline float
-  stof(const __wvstring& __str, std::size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::wcstof, "stof", __str.c_str(), __idx); }
-
-  inline double
-  stod(const __wvstring& __str, std::size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::wcstod, "stod", __str.c_str(), __idx); }
-
-  inline long double
-  stold(const __wvstring& __str, std::size_t* __idx = 0)
-  { return __gnu_cxx::__stoa(&std::wcstold, "stold", __str.c_str(), __idx); }
-
-#ifndef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
-  // DR 1261.
-  inline __wvstring
-  to_wstring(int __val)
-  { return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
-					       4 * sizeof(int),
-					       L"%d", __val); }
-
-  inline __wvstring
-  to_wstring(unsigned __val)
-  { return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
-					       4 * sizeof(unsigned),
-					       L"%u", __val); }
-
-  inline __wvstring
-  to_wstring(long __val)
-  { return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
-					       4 * sizeof(long),
-					       L"%ld", __val); }
-
-  inline __wvstring
-  to_wstring(unsigned long __val)
-  { return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
-					       4 * sizeof(unsigned long),
-					       L"%lu", __val); }
-
-  inline __wvstring
-  to_wstring(long long __val)
-  { return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
-					       4 * sizeof(long long),
-					       L"%lld", __val); }
-
-  inline __wvstring
-  to_wstring(unsigned long long __val)
-  { return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf,
-					       4 * sizeof(unsigned long long),
-					       L"%llu", __val); }
-
-  inline __wvstring
-  to_wstring(float __val)
-  {
-    const int __n = __numeric_traits<float>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf, __n,
-					       L"%f", __val);
-  }
-
-  inline __wvstring
-  to_wstring(double __val)
-  {
-    const int __n = __numeric_traits<double>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf, __n,
-					       L"%f", __val);
-  }
-
-  inline __wvstring
-  to_wstring(long double __val)
-  {
-    const int __n = __numeric_traits<long double>::__max_exponent10 + 20;
-    return __gnu_cxx::__to_xstring<__wvstring>(&std::vswprintf, __n,
-					       L"%Lf", __val);
-  }
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
-
-#if __cplusplus >= 201103L
-
-#include <bits/functional_hash.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /// std::hash specialization for __vstring.
-  template<>
-    struct hash<__gnu_cxx::__vstring>
-    : public __hash_base<size_t, __gnu_cxx::__vstring>
-    {
-      size_t
-      operator()(const __gnu_cxx::__vstring& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(), __s.length()); }
-    };
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /// std::hash specialization for __wvstring.
-  template<>
-    struct hash<__gnu_cxx::__wvstring>
-    : public __hash_base<size_t, __gnu_cxx::__wvstring>
-    {
-      size_t
-      operator()(const __gnu_cxx::__wvstring& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(),
-                                     __s.length() * sizeof(wchar_t)); }
-    };
-#endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-  /// std::hash specialization for __u16vstring.
-  template<>
-    struct hash<__gnu_cxx::__u16vstring>
-    : public __hash_base<size_t, __gnu_cxx::__u16vstring>
-    {
-      size_t
-      operator()(const __gnu_cxx::__u16vstring& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(),
-                                     __s.length() * sizeof(char16_t)); }
-    };
-
-  /// std::hash specialization for __u32vstring.
-  template<>
-    struct hash<__gnu_cxx::__u32vstring>
-    : public __hash_base<size_t, __gnu_cxx::__u32vstring>
-    {
-      size_t
-      operator()(const __gnu_cxx::__u32vstring& __s) const noexcept
-      { return std::_Hash_impl::hash(__s.data(),
-                                     __s.length() * sizeof(char32_t)); }
-    };
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // C++11
-
-#include "vstring.tcc" 
-
-#endif /* _VSTRING_H */
diff --git a/openflow/usr/include/c++/5/ext/vstring.tcc b/openflow/usr/include/c++/5/ext/vstring.tcc
deleted file mode 100644
index 58abee5..0000000
--- a/openflow/usr/include/c++/5/ext/vstring.tcc
+++ /dev/null
@@ -1,702 +0,0 @@
-// Versatile string -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/vstring.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ext/vstring.h}
- */
-
-#ifndef _VSTRING_TCC
-#define _VSTRING_TCC 1
-
-#pragma GCC system_header
-
-#include <bits/cxxabi_forced.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    const typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::npos;
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    void
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    resize(size_type __n, _CharT __c)
-    {
-      const size_type __size = this->size();
-      if (__size < __n)
-	this->append(__n - __size, __c);
-      else if (__n < __size)
-	this->_M_erase(__n, __size - __n);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>&
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    _M_append(const _CharT* __s, size_type __n)
-    {
-      const size_type __len = __n + this->size();
-
-      if (__len <= this->capacity() && !this->_M_is_shared())
-	{
-	  if (__n)
-	    this->_S_copy(this->_M_data() + this->size(), __s, __n);
-	}
-      else
-	this->_M_mutate(this->size(), size_type(0), __s, __n);
-
-      this->_M_set_length(__len);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    template<typename _InputIterator>
-      __versa_string<_CharT, _Traits, _Alloc, _Base>&
-      __versa_string<_CharT, _Traits, _Alloc, _Base>::
-      _M_replace_dispatch(const_iterator __i1, const_iterator __i2,
-			  _InputIterator __k1, _InputIterator __k2,
-			  std::__false_type)
-      {
-	const __versa_string __s(__k1, __k2);
-	const size_type __n1 = __i2 - __i1;
-	return _M_replace(__i1 - _M_ibegin(), __n1, __s._M_data(),
-			  __s.size());
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>&
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    _M_replace_aux(size_type __pos1, size_type __n1, size_type __n2,
-		   _CharT __c)
-    {
-      _M_check_length(__n1, __n2, "__versa_string::_M_replace_aux");
-
-      const size_type __old_size = this->size();
-      const size_type __new_size = __old_size + __n2 - __n1;
-
-      if (__new_size <= this->capacity() && !this->_M_is_shared())
-	{
-	  _CharT* __p = this->_M_data() + __pos1;
-
-	  const size_type __how_much = __old_size - __pos1 - __n1;
-	  if (__how_much && __n1 != __n2)
-	    this->_S_move(__p + __n2, __p + __n1, __how_much);
-	}
-      else
-	this->_M_mutate(__pos1, __n1, 0, __n2);
-
-      if (__n2)
-	this->_S_assign(this->_M_data() + __pos1, __n2, __c);
-
-      this->_M_set_length(__new_size);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>&
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    _M_replace(size_type __pos, size_type __len1, const _CharT* __s,
-	       const size_type __len2)
-    {
-      _M_check_length(__len1, __len2, "__versa_string::_M_replace");
-
-      const size_type __old_size = this->size();
-      const size_type __new_size = __old_size + __len2 - __len1;
-      
-      if (__new_size <= this->capacity() && !this->_M_is_shared())
-	{
-	  _CharT* __p = this->_M_data() + __pos;
-
-	  const size_type __how_much = __old_size - __pos - __len1;
-	  if (_M_disjunct(__s))
-	    {
-	      if (__how_much && __len1 != __len2)
-		this->_S_move(__p + __len2, __p + __len1, __how_much);
-	      if (__len2)
-		this->_S_copy(__p, __s, __len2);
-	    }
-	  else
-	    {
-	      // Work in-place.
-	      if (__len2 && __len2 <= __len1)
-		this->_S_move(__p, __s, __len2);
-	      if (__how_much && __len1 != __len2)
-		this->_S_move(__p + __len2, __p + __len1, __how_much);
-	      if (__len2 > __len1)
-		{
-		  if (__s + __len2 <= __p + __len1)
-		    this->_S_move(__p, __s, __len2);
-		  else if (__s >= __p + __len1)
-		    this->_S_copy(__p, __s + __len2 - __len1, __len2);
-		  else
-		    {
-		      const size_type __nleft = (__p + __len1) - __s;
-		      this->_S_move(__p, __s, __nleft);
-		      this->_S_copy(__p + __nleft, __p + __len2,
-				    __len2 - __nleft);
-		    }
-		}
-	    }
-	}
-      else
-	this->_M_mutate(__pos, __len1, __s, __len2);
-
-      this->_M_set_length(__new_size);
-      return *this;
-    }
-  
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    {
-      __versa_string<_CharT, _Traits, _Alloc, _Base> __str;
-      __str.reserve(__lhs.size() + __rhs.size());
-      __str.append(__lhs);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(const _CharT* __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    {
-      __glibcxx_requires_string(__lhs);
-      typedef __versa_string<_CharT, _Traits, _Alloc, _Base> __string_type;
-      typedef typename __string_type::size_type	  __size_type;
-      const __size_type __len = _Traits::length(__lhs);
-      __string_type __str;
-      __str.reserve(__len + __rhs.size());
-      __str.append(__lhs, __len);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(_CharT __lhs,
-	      const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
-    {
-      __versa_string<_CharT, _Traits, _Alloc, _Base> __str;
-      __str.reserve(__rhs.size() + 1);
-      __str.push_back(__lhs);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      const _CharT* __rhs)
-    {
-      __glibcxx_requires_string(__rhs);
-      typedef __versa_string<_CharT, _Traits, _Alloc, _Base> __string_type;
-      typedef typename __string_type::size_type	  __size_type;
-      const __size_type __len = _Traits::length(__rhs);
-      __string_type __str;
-      __str.reserve(__lhs.size() + __len);
-      __str.append(__lhs);
-      __str.append(__rhs, __len);
-      return __str;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    __versa_string<_CharT, _Traits, _Alloc, _Base>
-    operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
-	      _CharT __rhs)
-    {
-      __versa_string<_CharT, _Traits, _Alloc, _Base> __str;
-      __str.reserve(__lhs.size() + 1);
-      __str.append(__lhs);
-      __str.push_back(__rhs);
-      return __str;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    copy(_CharT* __s, size_type __n, size_type __pos) const
-    {
-      _M_check(__pos, "__versa_string::copy");
-      __n = _M_limit(__pos, __n);
-      __glibcxx_requires_string_len(__s, __n);
-      if (__n)
-	this->_S_copy(__s, this->_M_data() + __pos, __n);
-      // 21.3.5.7 par 3: do not append null.  (good.)
-      return __n;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    find(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      const size_type __size = this->size();
-      const _CharT* __data = this->_M_data();
-
-      if (__n == 0)
-	return __pos <= __size ? __pos : npos;
-
-      if (__n <= __size)
-	{
-	  for (; __pos <= __size - __n; ++__pos)
-	    if (traits_type::eq(__data[__pos], __s[0])
-		&& traits_type::compare(__data + __pos + 1,
-					__s + 1, __n - 1) == 0)
-	      return __pos;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    find(_CharT __c, size_type __pos) const _GLIBCXX_NOEXCEPT
-    {
-      size_type __ret = npos;
-      const size_type __size = this->size();
-      if (__pos < __size)
-	{
-	  const _CharT* __data = this->_M_data();
-	  const size_type __n = __size - __pos;
-	  const _CharT* __p = traits_type::find(__data + __pos, __n, __c);
-	  if (__p)
-	    __ret = __p - __data;
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    rfind(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      const size_type __size = this->size();
-      if (__n <= __size)
-	{
-	  __pos = std::min(size_type(__size - __n), __pos);
-	  const _CharT* __data = this->_M_data();
-	  do
-	    {
-	      if (traits_type::compare(__data + __pos, __s, __n) == 0)
-		return __pos;
-	    }
-	  while (__pos-- > 0);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    rfind(_CharT __c, size_type __pos) const _GLIBCXX_NOEXCEPT
-    {
-      size_type __size = this->size();
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  for (++__size; __size-- > 0; )
-	    if (traits_type::eq(this->_M_data()[__size], __c))
-	      return __size;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    find_first_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      for (; __n && __pos < this->size(); ++__pos)
-	{
-	  const _CharT* __p = traits_type::find(__s, __n,
-						this->_M_data()[__pos]);
-	  if (__p)
-	    return __pos;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    find_last_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      size_type __size = this->size();
-      if (__size && __n)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (traits_type::find(__s, __n, this->_M_data()[__size]))
-		return __size;
-	    }
-	  while (__size-- != 0);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    find_first_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      for (; __pos < this->size(); ++__pos)
-	if (!traits_type::find(__s, __n, this->_M_data()[__pos]))
-	  return __pos;
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    find_first_not_of(_CharT __c, size_type __pos) const _GLIBCXX_NOEXCEPT
-    {
-      for (; __pos < this->size(); ++__pos)
-	if (!traits_type::eq(this->_M_data()[__pos], __c))
-	  return __pos;
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    find_last_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      size_type __size = this->size();
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (!traits_type::find(__s, __n, this->_M_data()[__size]))
-		return __size;
-	    }
-	  while (__size--);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    typename __versa_string<_CharT, _Traits, _Alloc, _Base>::size_type
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    find_last_not_of(_CharT __c, size_type __pos) const _GLIBCXX_NOEXCEPT
-    {
-      size_type __size = this->size();
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (!traits_type::eq(this->_M_data()[__size], __c))
-		return __size;
-	    }
-	  while (__size--);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    int
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    compare(size_type __pos, size_type __n, const __versa_string& __str) const
-    {
-      _M_check(__pos, "__versa_string::compare");
-      __n = _M_limit(__pos, __n);
-      const size_type __osize = __str.size();
-      const size_type __len = std::min(__n, __osize);
-      int __r = traits_type::compare(this->_M_data() + __pos,
-				     __str.data(), __len);
-      if (!__r)
-	__r = this->_S_compare(__n, __osize);
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    int
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    compare(size_type __pos1, size_type __n1, const __versa_string& __str,
-	    size_type __pos2, size_type __n2) const
-    {
-      _M_check(__pos1, "__versa_string::compare");
-      __str._M_check(__pos2, "__versa_string::compare");
-      __n1 = _M_limit(__pos1, __n1);
-      __n2 = __str._M_limit(__pos2, __n2);
-      const size_type __len = std::min(__n1, __n2);
-      int __r = traits_type::compare(this->_M_data() + __pos1,
-				     __str.data() + __pos2, __len);
-      if (!__r)
-	__r = this->_S_compare(__n1, __n2);
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    int
-    __versa_string<_CharT, _Traits, _Alloc, _Base>::
-    compare(const _CharT* __s) const
-    {
-      __glibcxx_requires_string(__s);
-      const size_type __size = this->size();
-      const size_type __osize = traits_type::length(__s);
-      const size_type __len = std::min(__size, __osize);
-      int __r = traits_type::compare(this->_M_data(), __s, __len);
-      if (!__r)
-	__r = this->_S_compare(__size, __osize);
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    int
-    __versa_string <_CharT, _Traits, _Alloc, _Base>::
-    compare(size_type __pos, size_type __n1, const _CharT* __s) const
-    {
-      __glibcxx_requires_string(__s);
-      _M_check(__pos, "__versa_string::compare");
-      __n1 = _M_limit(__pos, __n1);
-      const size_type __osize = traits_type::length(__s);
-      const size_type __len = std::min(__n1, __osize);
-      int __r = traits_type::compare(this->_M_data() + __pos, __s, __len);
-      if (!__r)
-	__r = this->_S_compare(__n1, __osize);
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-	   template <typename, typename, typename> class _Base>
-    int
-    __versa_string <_CharT, _Traits, _Alloc, _Base>::
-    compare(size_type __pos, size_type __n1, const _CharT* __s,
-	    size_type __n2) const
-    {
-      __glibcxx_requires_string_len(__s, __n2);
-      _M_check(__pos, "__versa_string::compare");
-      __n1 = _M_limit(__pos, __n1);
-      const size_type __len = std::min(__n1, __n2);
-      int __r = traits_type::compare(this->_M_data() + __pos, __s, __len);
-      if (!__r)
-	__r = this->_S_compare(__n1, __n2);
-      return __r;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-           template <typename, typename, typename> class _Base>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in,
-	       __gnu_cxx::__versa_string<_CharT, _Traits,
-	                                 _Alloc, _Base>& __str)
-    {
-      typedef basic_istream<_CharT, _Traits>            __istream_type;
-      typedef typename __istream_type::ios_base         __ios_base;
-      typedef __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>
-	                                                __string_type;
-      typedef typename __istream_type::int_type		__int_type;
-      typedef typename __string_type::size_type		__size_type;
-      typedef ctype<_CharT>				__ctype_type;
-      typedef typename __ctype_type::ctype_base         __ctype_base;
-
-      __size_type __extracted = 0;
-      typename __ios_base::iostate __err = __ios_base::goodbit;
-      typename __istream_type::sentry __cerb(__in, false);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      // Avoid reallocation for common case.
-	      __str.erase();
-	      _CharT __buf[128];
-	      __size_type __len = 0;
-	      const streamsize __w = __in.width();
-	      const __size_type __n = __w > 0 ? static_cast<__size_type>(__w)
-		                              : __str.max_size();
-	      const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
-	      const __int_type __eof = _Traits::eof();
-	      __int_type __c = __in.rdbuf()->sgetc();
-
-	      while (__extracted < __n
-		     && !_Traits::eq_int_type(__c, __eof)
-		     && !__ct.is(__ctype_base::space,
-				 _Traits::to_char_type(__c)))
-		{
-		  if (__len == sizeof(__buf) / sizeof(_CharT))
-		    {
-		      __str.append(__buf, sizeof(__buf) / sizeof(_CharT));
-		      __len = 0;
-		    }
-		  __buf[__len++] = _Traits::to_char_type(__c);
-		  ++__extracted;
-		  __c = __in.rdbuf()->snextc();
-		}
-	      __str.append(__buf, __len);
-
-	      if (_Traits::eq_int_type(__c, __eof))
-		__err |= __ios_base::eofbit;
-	      __in.width(0);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __in._M_setstate(__ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 91. Description of operator>> and getline() for string<>
-	      // might cause endless loop
-	      __in._M_setstate(__ios_base::badbit);
-	    }
-	}
-      // 211.  operator>>(istream&, string&) doesn't set failbit
-      if (!__extracted)
-	__err |= __ios_base::failbit;
-      if (__err)
-	__in.setstate(__err);
-      return __in;
-    }      
-
-  template<typename _CharT, typename _Traits, typename _Alloc,
-           template <typename, typename, typename> class _Base>
-    basic_istream<_CharT, _Traits>&
-    getline(basic_istream<_CharT, _Traits>& __in,
-	    __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str,
-	    _CharT __delim)
-    {
-      typedef basic_istream<_CharT, _Traits>	        __istream_type;
-      typedef typename __istream_type::ios_base         __ios_base;
-      typedef __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>
-	                                                __string_type;
-      typedef typename __istream_type::int_type		__int_type;
-      typedef typename __string_type::size_type		__size_type;
-
-      __size_type __extracted = 0;
-      const __size_type __n = __str.max_size();
-      typename __ios_base::iostate __err = __ios_base::goodbit;
-      typename __istream_type::sentry __cerb(__in, true);
-      if (__cerb)
-	{
-	  __try
-	    {
-	      // Avoid reallocation for common case.
-	      __str.erase();
-	      _CharT __buf[128];
-	      __size_type __len = 0;
-	      const __int_type __idelim = _Traits::to_int_type(__delim);
-	      const __int_type __eof = _Traits::eof();
-	      __int_type __c = __in.rdbuf()->sgetc();
-
-	      while (__extracted < __n
-		     && !_Traits::eq_int_type(__c, __eof)
-		     && !_Traits::eq_int_type(__c, __idelim))
-		{
-		  if (__len == sizeof(__buf) / sizeof(_CharT))
-		    {
-		      __str.append(__buf, sizeof(__buf) / sizeof(_CharT));
-		      __len = 0;
-		    }
-		  __buf[__len++] = _Traits::to_char_type(__c);
-		  ++__extracted;
-		  __c = __in.rdbuf()->snextc();
-		}
-	      __str.append(__buf, __len);
-
-	      if (_Traits::eq_int_type(__c, __eof))
-		__err |= __ios_base::eofbit;
-	      else if (_Traits::eq_int_type(__c, __idelim))
-		{
-		  ++__extracted;		  
-		  __in.rdbuf()->sbumpc();
-		}
-	      else
-		__err |= __ios_base::failbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __in._M_setstate(__ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 91. Description of operator>> and getline() for string<>
-	      // might cause endless loop
-	      __in._M_setstate(__ios_base::badbit);
-	    }
-	}
-      if (!__extracted)
-	__err |= __ios_base::failbit;
-      if (__err)
-	__in.setstate(__err);
-      return __in;
-    }      
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // _VSTRING_TCC
diff --git a/openflow/usr/include/c++/5/ext/vstring_fwd.h b/openflow/usr/include/c++/5/ext/vstring_fwd.h
deleted file mode 100644
index 097d5ef..0000000
--- a/openflow/usr/include/c++/5/ext/vstring_fwd.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// <vstring.h> Forward declarations -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/vstring_fwd.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ext/vstring.h}
- */
-
-#ifndef _VSTRING_FWD_H
-#define _VSTRING_FWD_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/char_traits.h>
-#include <bits/allocator.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    class __sso_string_base;
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    class __rc_string_base;
-
-  template<typename _CharT, typename _Traits = std::char_traits<_CharT>,
-           typename _Alloc = std::allocator<_CharT>,
-	   template
-	   <typename, typename, typename> class _Base = __sso_string_base>
-    class __versa_string;
-
-  typedef __versa_string<char>                              __vstring;
-  typedef __vstring                                         __sso_string;
-  typedef 
-  __versa_string<char, std::char_traits<char>,
-		 std::allocator<char>, __rc_string_base>    __rc_string;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  typedef __versa_string<wchar_t>                           __wvstring;
-  typedef __wvstring                                        __wsso_string;
-  typedef
-  __versa_string<wchar_t, std::char_traits<wchar_t>,
-		 std::allocator<wchar_t>, __rc_string_base> __wrc_string;
-#endif  
-
-#if ((__cplusplus >= 201103L) \
-     && defined(_GLIBCXX_USE_C99_STDINT_TR1))
-
-  typedef __versa_string<char16_t>                          __u16vstring;
-  typedef __u16vstring                                      __u16sso_string;
-  typedef 
-  __versa_string<char16_t, std::char_traits<char16_t>,
-		 std::allocator<char16_t>, __rc_string_base> __u16rc_string;
-
-  typedef __versa_string<char32_t>                          __u32vstring;
-  typedef __u32vstring                                      __u32sso_string;
-  typedef 
-  __versa_string<char32_t, std::char_traits<char32_t>,
-		 std::allocator<char32_t>, __rc_string_base> __u32rc_string;
-
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _VSTRING_FWD_H */
diff --git a/openflow/usr/include/c++/5/ext/vstring_util.h b/openflow/usr/include/c++/5/ext/vstring_util.h
deleted file mode 100644
index d0071e8..0000000
--- a/openflow/usr/include/c++/5/ext/vstring_util.h
+++ /dev/null
@@ -1,183 +0,0 @@
-// Versatile string utility -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file ext/vstring_util.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{ext/vstring.h}
- */
-
-#ifndef _VSTRING_UTIL_H
-#define _VSTRING_UTIL_H 1
-
-#pragma GCC system_header
-
-#include <ext/vstring_fwd.h>
-#include <debug/debug.h>
-#include <bits/stl_function.h>  // For less
-#include <bits/functexcept.h>
-#include <bits/localefwd.h>
-#include <bits/ostream_insert.h>
-#include <bits/stl_iterator.h>
-#include <ext/numeric_traits.h>
-#include <bits/move.h>
-#include <bits/range_access.h>
-
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    struct __vstring_utility
-    {
-      typedef typename _Alloc::template rebind<_CharT>::other _CharT_alloc_type;
-
-      typedef _Traits					    traits_type;
-      typedef typename _Traits::char_type		    value_type;
-      typedef typename _CharT_alloc_type::size_type	    size_type;
-      typedef typename _CharT_alloc_type::difference_type   difference_type;
-      typedef typename _CharT_alloc_type::pointer	    pointer;
-      typedef typename _CharT_alloc_type::const_pointer	    const_pointer;
-
-      // For __sso_string.
-      typedef __gnu_cxx::
-      __normal_iterator<pointer, __gnu_cxx::
-			__versa_string<_CharT, _Traits, _Alloc,
-				       __sso_string_base> >
-	__sso_iterator;
-      typedef __gnu_cxx::
-      __normal_iterator<const_pointer, __gnu_cxx::
-			__versa_string<_CharT, _Traits, _Alloc,
-				       __sso_string_base> >
-	__const_sso_iterator;
-
-      // For __rc_string.
-      typedef __gnu_cxx::
-      __normal_iterator<pointer, __gnu_cxx::
-			__versa_string<_CharT, _Traits, _Alloc,
-				       __rc_string_base> >
-	__rc_iterator;
-      typedef __gnu_cxx::
-      __normal_iterator<const_pointer, __gnu_cxx::
-			__versa_string<_CharT, _Traits, _Alloc,
-				       __rc_string_base> >
-	__const_rc_iterator;
-
-      // NB:  When the allocator is empty, deriving from it saves space
-      // (http://www.cantrip.org/emptyopt.html).
-      template<typename _Alloc1>
-	struct _Alloc_hider
-	: public _Alloc1
-	{
-	  _Alloc_hider(_CharT* __ptr)
-	  : _Alloc1(), _M_p(__ptr) { }
-
-	  _Alloc_hider(const _Alloc1& __a, _CharT* __ptr)
-	  : _Alloc1(__a), _M_p(__ptr) { }
-
-	  _CharT*  _M_p; // The actual data.
-	};
-
-      // When __n = 1 way faster than the general multichar
-      // traits_type::copy/move/assign.
-      static void
-      _S_copy(_CharT* __d, const _CharT* __s, size_type __n)
-      {
-	if (__n == 1)
-	  traits_type::assign(*__d, *__s);
-	else
-	  traits_type::copy(__d, __s, __n);
-      }
-
-      static void
-      _S_move(_CharT* __d, const _CharT* __s, size_type __n)
-      {
-	if (__n == 1)
-	  traits_type::assign(*__d, *__s);
-	else
-	  traits_type::move(__d, __s, __n);
-      }
-
-      static void
-      _S_assign(_CharT* __d, size_type __n, _CharT __c)
-      {
-	if (__n == 1)
-	  traits_type::assign(*__d, __c);
-	else
-	  traits_type::assign(__d, __n, __c);
-      }
-
-      // _S_copy_chars is a separate template to permit specialization
-      // to optimize for the common case of pointers as iterators.
-      template<typename _Iterator>
-	static void
-	_S_copy_chars(_CharT* __p, _Iterator __k1, _Iterator __k2)
-	{
-	  for (; __k1 != __k2; ++__k1, ++__p)
-	    traits_type::assign(*__p, *__k1); // These types are off.
-	}
-
-      static void
-      _S_copy_chars(_CharT* __p, __sso_iterator __k1, __sso_iterator __k2)
-      { _S_copy_chars(__p, __k1.base(), __k2.base()); }
-
-      static void
-      _S_copy_chars(_CharT* __p, __const_sso_iterator __k1,
-		    __const_sso_iterator __k2)
-      { _S_copy_chars(__p, __k1.base(), __k2.base()); }
-
-      static void
-      _S_copy_chars(_CharT* __p, __rc_iterator __k1, __rc_iterator __k2)
-      { _S_copy_chars(__p, __k1.base(), __k2.base()); }
-
-      static void
-      _S_copy_chars(_CharT* __p, __const_rc_iterator __k1,
-		    __const_rc_iterator __k2)
-      { _S_copy_chars(__p, __k1.base(), __k2.base()); }
-
-      static void
-      _S_copy_chars(_CharT* __p, _CharT* __k1, _CharT* __k2)
-      { _S_copy(__p, __k1, __k2 - __k1); }
-
-      static void
-      _S_copy_chars(_CharT* __p, const _CharT* __k1, const _CharT* __k2)
-      { _S_copy(__p, __k1, __k2 - __k1); }
-
-      static int
-      _S_compare(size_type __n1, size_type __n2)
-      {
-	const difference_type __d = difference_type(__n1 - __n2);
-
-	if (__d > __numeric_traits_integer<int>::__max)
-	  return __numeric_traits_integer<int>::__max;
-	else if (__d < __numeric_traits_integer<int>::__min)
-	  return __numeric_traits_integer<int>::__min;
-	else
-	  return int(__d);
-      }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _VSTRING_UTIL_H */
diff --git a/openflow/usr/include/c++/5/fenv.h b/openflow/usr/include/c++/5/fenv.h
deleted file mode 100644
index 81fd000..0000000
--- a/openflow/usr/include/c++/5/fenv.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*- compatibility header.
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file fenv.h
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_FENV_H
-#define _GLIBCXX_FENV_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#if _GLIBCXX_HAVE_FENV_H
-# include_next <fenv.h>
-#endif
-
-#if __cplusplus >= 201103L
-
-#if _GLIBCXX_USE_C99_FENV_TR1
-
-#undef feclearexcept
-#undef fegetexceptflag
-#undef feraiseexcept
-#undef fesetexceptflag
-#undef fetestexcept
-#undef fegetround
-#undef fesetround
-#undef fegetenv
-#undef feholdexcept
-#undef fesetenv
-#undef feupdateenv
-
-namespace std
-{
-  // types
-  using ::fenv_t;
-  using ::fexcept_t;
-
-  // functions
-  using ::feclearexcept;
-  using ::fegetexceptflag;
-  using ::feraiseexcept;
-  using ::fesetexceptflag;
-  using ::fetestexcept;
-
-  using ::fegetround;
-  using ::fesetround;
-
-  using ::fegetenv;
-  using ::feholdexcept;
-  using ::fesetenv;
-  using ::feupdateenv;
-} // namespace
-
-#endif // _GLIBCXX_USE_C99_FENV_TR1
-
-#endif // C++11
-
-#endif // _GLIBCXX_FENV_H
diff --git a/openflow/usr/include/c++/5/forward_list b/openflow/usr/include/c++/5/forward_list
deleted file mode 100644
index 1a268c4..0000000
--- a/openflow/usr/include/c++/5/forward_list
+++ /dev/null
@@ -1,52 +0,0 @@
-// <forward_list> -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/forward_list
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_FORWARD_LIST
-#define _GLIBCXX_FORWARD_LIST 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <bits/forward_list.h>
-#include <bits/range_access.h>
-#include <bits/forward_list.tcc>
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/forward_list>
-#endif
-
-#ifdef _GLIBCXX_PROFILE
-# include <profile/forward_list>
-#endif
-
-#endif // C++11
-
-#endif // _GLIBCXX_FORWARD_LIST
diff --git a/openflow/usr/include/c++/5/fstream b/openflow/usr/include/c++/5/fstream
deleted file mode 100644
index fdb2b3a..0000000
--- a/openflow/usr/include/c++/5/fstream
+++ /dev/null
@@ -1,1083 +0,0 @@
-// File based streams -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/fstream
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 14882: 27.8  File-based streams
-//
-
-#ifndef _GLIBCXX_FSTREAM
-#define _GLIBCXX_FSTREAM 1
-
-#pragma GCC system_header
-
-#include <istream>
-#include <ostream>
-#include <bits/codecvt.h>
-#include <cstdio>             // For BUFSIZ
-#include <bits/basic_file.h>  // For __basic_file, __c_lock
-#if __cplusplus >= 201103L
-#include <string>             // For std::string overloads.
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // [27.8.1.1] template class basic_filebuf
-  /**
-   *  @brief  The actual work of input and output (for files).
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *
-   *  This class associates both its input and output sequence with an
-   *  external disk file, and maintains a joint file position for both
-   *  sequences.  Many of its semantics are described in terms of similar
-   *  behavior in the Standard C Library's @c FILE streams.
-   *
-   *  Requirements on traits_type, specific to this class:
-   *  - traits_type::pos_type must be fpos<traits_type::state_type>
-   *  - traits_type::off_type must be streamoff
-   *  - traits_type::state_type must be Assignable and DefaultConstructible,
-   *  - traits_type::state_type() must be the initial state for codecvt.
-   */
-  template<typename _CharT, typename _Traits>
-    class basic_filebuf : public basic_streambuf<_CharT, _Traits>
-    {
-#if __cplusplus >= 201103L
-      template<typename _Tp>
-	using __chk_state = __and_<is_copy_assignable<_Tp>,
-				   is_copy_constructible<_Tp>,
-				   is_default_constructible<_Tp>>;
-
-      static_assert(__chk_state<typename _Traits::state_type>::value,
-		    "state_type must be CopyAssignable, CopyConstructible"
-		    " and DefaultConstructible");
-
-      static_assert(is_same<typename _Traits::pos_type,
-			    fpos<typename _Traits::state_type>>::value,
-		    "pos_type must be fpos<state_type>");
-#endif
-    public:
-      // Types:
-      typedef _CharT                     	        char_type;
-      typedef _Traits                    	        traits_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      typedef basic_streambuf<char_type, traits_type>  	__streambuf_type;
-      typedef basic_filebuf<char_type, traits_type>     __filebuf_type;
-      typedef __basic_file<char>		        __file_type;
-      typedef typename traits_type::state_type          __state_type;
-      typedef codecvt<char_type, char, __state_type>    __codecvt_type;
-
-      friend class ios_base; // For sync_with_stdio.
-
-    protected:
-      // Data Members:
-      // MT lock inherited from libio or other low-level io library.
-      __c_lock          	_M_lock;
-
-      // External buffer.
-      __file_type 		_M_file;
-
-      /// Place to stash in || out || in | out settings for current filebuf.
-      ios_base::openmode 	_M_mode;
-
-      // Beginning state type for codecvt.
-      __state_type 		_M_state_beg;
-
-      // During output, the state that corresponds to pptr(),
-      // during input, the state that corresponds to egptr() and
-      // _M_ext_next.
-      __state_type		_M_state_cur;
-
-      // Not used for output. During input, the state that corresponds
-      // to eback() and _M_ext_buf.
-      __state_type		_M_state_last;
-
-      /// Pointer to the beginning of internal buffer.
-      char_type*		_M_buf;
-
-      /**
-       *  Actual size of internal buffer. This number is equal to the size
-       *  of the put area + 1 position, reserved for the overflow char of
-       *  a full area.
-       */
-      size_t			_M_buf_size;
-
-      // Set iff _M_buf is allocated memory from _M_allocate_internal_buffer.
-      bool			_M_buf_allocated;
-
-      /**
-       *  _M_reading == false && _M_writing == false for @b uncommitted mode;
-       *  _M_reading == true for @b read mode;
-       *  _M_writing == true for @b write mode;
-       *
-       *  NB: _M_reading == true && _M_writing == true is unused.
-       */
-      bool                      _M_reading;
-      bool                      _M_writing;
-
-      //@{
-      /**
-       *  Necessary bits for putback buffer management.
-       *
-       *  @note pbacks of over one character are not currently supported.
-       */
-      char_type			_M_pback;
-      char_type*		_M_pback_cur_save;
-      char_type*		_M_pback_end_save;
-      bool			_M_pback_init;
-      //@}
-
-      // Cached codecvt facet.
-      const __codecvt_type* 	_M_codecvt;
-
-      /**
-       *  Buffer for external characters. Used for input when
-       *  codecvt::always_noconv() == false. When valid, this corresponds
-       *  to eback().
-       */
-      char*			_M_ext_buf;
-
-      /**
-       *  Size of buffer held by _M_ext_buf.
-       */
-      streamsize		_M_ext_buf_size;
-
-      /**
-       *  Pointers into the buffer held by _M_ext_buf that delimit a
-       *  subsequence of bytes that have been read but not yet converted.
-       *  When valid, _M_ext_next corresponds to egptr().
-       */
-      const char*		_M_ext_next;
-      char*			_M_ext_end;
-
-      /**
-       *  Initializes pback buffers, and moves normal buffers to safety.
-       *  Assumptions:
-       *  _M_in_cur has already been moved back
-       */
-      void
-      _M_create_pback()
-      {
-	if (!_M_pback_init)
-	  {
-	    _M_pback_cur_save = this->gptr();
-	    _M_pback_end_save = this->egptr();
-	    this->setg(&_M_pback, &_M_pback, &_M_pback + 1);
-	    _M_pback_init = true;
-	  }
-      }
-
-      /**
-       *  Deactivates pback buffer contents, and restores normal buffer.
-       *  Assumptions:
-       *  The pback buffer has only moved forward.
-       */
-      void
-      _M_destroy_pback() throw()
-      {
-	if (_M_pback_init)
-	  {
-	    // Length _M_in_cur moved in the pback buffer.
-	    _M_pback_cur_save += this->gptr() != this->eback();
-	    this->setg(_M_buf, _M_pback_cur_save, _M_pback_end_save);
-	    _M_pback_init = false;
-	  }
-      }
-
-    public:
-      // Constructors/destructor:
-      /**
-       *  @brief  Does not open any files.
-       *
-       *  The default constructor initializes the parent class using its
-       *  own default ctor.
-       */
-      basic_filebuf();
-
-#if __cplusplus >= 201103L
-      basic_filebuf(const basic_filebuf&) = delete;
-      basic_filebuf(basic_filebuf&&);
-#endif
-
-      /**
-       *  @brief  The destructor closes the file first.
-       */
-      virtual
-      ~basic_filebuf()
-      { this->close(); }
-
-#if __cplusplus >= 201103L
-      basic_filebuf& operator=(const basic_filebuf&) = delete;
-      basic_filebuf& operator=(basic_filebuf&&);
-      void swap(basic_filebuf&);
-#endif
-
-      // Members:
-      /**
-       *  @brief  Returns true if the external file is open.
-       */
-      bool
-      is_open() const throw()
-      { return _M_file.is_open(); }
-
-      /**
-       *  @brief  Opens an external file.
-       *  @param  __s  The name of the file.
-       *  @param  __mode  The open mode flags.
-       *  @return  @c this on success, NULL on failure
-       *
-       *  If a file is already open, this function immediately fails.
-       *  Otherwise it tries to open the file named @a __s using the flags
-       *  given in @a __mode.
-       *
-       *  Table 92, adapted here, gives the relation between openmode
-       *  combinations and the equivalent @c fopen() flags.
-       *  (NB: lines app, in|out|app, in|app, binary|app, binary|in|out|app,
-       *  and binary|in|app per DR 596)
-       *  <pre>
-       *  +---------------------------------------------------------+
-       *  | ios_base Flag combination            stdio equivalent   |
-       *  |binary  in  out  trunc  app                              |
-       *  +---------------------------------------------------------+
-       *  |             +                        w                  |
-       *  |             +           +            a                  |
-       *  |                         +            a                  |
-       *  |             +     +                  w                  |
-       *  |         +                            r                  |
-       *  |         +   +                        r+                 |
-       *  |         +   +     +                  w+                 |
-       *  |         +   +           +            a+                 |
-       *  |         +               +            a+                 |
-       *  +---------------------------------------------------------+
-       *  |   +         +                        wb                 |
-       *  |   +         +           +            ab                 |
-       *  |   +                     +            ab                 |
-       *  |   +         +     +                  wb                 |
-       *  |   +     +                            rb                 |
-       *  |   +     +   +                        r+b                |
-       *  |   +     +   +     +                  w+b                |
-       *  |   +     +   +           +            a+b                |
-       *  |   +     +               +            a+b                |
-       *  +---------------------------------------------------------+
-       *  </pre>
-       */
-      __filebuf_type*
-      open(const char* __s, ios_base::openmode __mode);
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Opens an external file.
-       *  @param  __s  The name of the file.
-       *  @param  __mode  The open mode flags.
-       *  @return  @c this on success, NULL on failure
-       */
-      __filebuf_type*
-      open(const std::string& __s, ios_base::openmode __mode)
-      { return open(__s.c_str(), __mode); }
-#endif
-
-      /**
-       *  @brief  Closes the currently associated file.
-       *  @return  @c this on success, NULL on failure
-       *
-       *  If no file is currently open, this function immediately fails.
-       *
-       *  If a <em>put buffer area</em> exists, @c overflow(eof) is
-       *  called to flush all the characters.  The file is then
-       *  closed.
-       *
-       *  If any operations fail, this function also fails.
-       */
-      __filebuf_type*
-      close();
-
-    protected:
-      void
-      _M_allocate_internal_buffer();
-
-      void
-      _M_destroy_internal_buffer() throw();
-
-      // [27.8.1.4] overridden virtual functions
-      virtual streamsize
-      showmanyc();
-
-      // Stroustrup, 1998, p. 628
-      // underflow() and uflow() functions are called to get the next
-      // character from the real input source when the buffer is empty.
-      // Buffered input uses underflow()
-
-      virtual int_type
-      underflow();
-
-      virtual int_type
-      pbackfail(int_type __c = _Traits::eof());
-
-      // Stroustrup, 1998, p 648
-      // The overflow() function is called to transfer characters to the
-      // real output destination when the buffer is full. A call to
-      // overflow(c) outputs the contents of the buffer plus the
-      // character c.
-      // 27.5.2.4.5
-      // Consume some sequence of the characters in the pending sequence.
-      virtual int_type
-      overflow(int_type __c = _Traits::eof());
-
-      // Convert internal byte sequence to external, char-based
-      // sequence via codecvt.
-      bool
-      _M_convert_to_external(char_type*, streamsize);
-
-      /**
-       *  @brief  Manipulates the buffer.
-       *  @param  __s  Pointer to a buffer area.
-       *  @param  __n  Size of @a __s.
-       *  @return  @c this
-       *
-       *  If no file has been opened, and both @a __s and @a __n are zero, then
-       *  the stream becomes unbuffered.  Otherwise, @c __s is used as a
-       *  buffer; see
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/streambufs.html#io.streambuf.buffering
-       *  for more.
-       */
-      virtual __streambuf_type*
-      setbuf(char_type* __s, streamsize __n);
-
-      virtual pos_type
-      seekoff(off_type __off, ios_base::seekdir __way,
-	      ios_base::openmode __mode = ios_base::in | ios_base::out);
-
-      virtual pos_type
-      seekpos(pos_type __pos,
-	      ios_base::openmode __mode = ios_base::in | ios_base::out);
-
-      // Common code for seekoff, seekpos, and overflow
-      pos_type
-      _M_seek(off_type __off, ios_base::seekdir __way, __state_type __state);
-      
-      int
-      _M_get_ext_pos(__state_type &__state);
-
-      virtual int
-      sync();
-
-      virtual void
-      imbue(const locale& __loc);
-
-      virtual streamsize
-      xsgetn(char_type* __s, streamsize __n);
-
-      virtual streamsize
-      xsputn(const char_type* __s, streamsize __n);
-
-      // Flushes output buffer, then writes unshift sequence.
-      bool
-      _M_terminate_output();
-
-      /**
-       *  This function sets the pointers of the internal buffer, both get
-       *  and put areas. Typically:
-       *
-       *   __off == egptr() - eback() upon underflow/uflow (@b read mode);
-       *   __off == 0 upon overflow (@b write mode);
-       *   __off == -1 upon open, setbuf, seekoff/pos (@b uncommitted mode).
-       *
-       *  NB: epptr() - pbase() == _M_buf_size - 1, since _M_buf_size
-       *  reflects the actual allocated memory and the last cell is reserved
-       *  for the overflow char of a full put area.
-       */
-      void
-      _M_set_buffer(streamsize __off)
-      {
-	const bool __testin = _M_mode & ios_base::in;
-	const bool __testout = (_M_mode & ios_base::out
-				|| _M_mode & ios_base::app);
-
-	if (__testin && __off > 0)
-	  this->setg(_M_buf, _M_buf, _M_buf + __off);
-	else
-	  this->setg(_M_buf, _M_buf, _M_buf);
-
-	if (__testout && __off == 0 && _M_buf_size > 1 )
-	  this->setp(_M_buf, _M_buf + _M_buf_size - 1);
-	else
-	  this->setp(0, 0);
-      }
-    };
-
-  // [27.8.1.5] Template class basic_ifstream
-  /**
-   *  @brief  Controlling input for files.
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *
-   *  This class supports reading from named files, using the inherited
-   *  functions from std::basic_istream.  To control the associated
-   *  sequence, an instance of std::basic_filebuf is used, which this page
-   *  refers to as @c sb.
-   */
-  template<typename _CharT, typename _Traits>
-    class basic_ifstream : public basic_istream<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard types:
-      typedef basic_filebuf<char_type, traits_type> 	__filebuf_type;
-      typedef basic_istream<char_type, traits_type>	__istream_type;
-
-    private:
-      __filebuf_type	_M_filebuf;
-
-    public:
-      // Constructors/Destructors:
-      /**
-       *  @brief  Default constructor.
-       *
-       *  Initializes @c sb using its default constructor, and passes
-       *  @c &sb to the base class initializer.  Does not open any files
-       *  (you haven't given it a filename to open).
-       */
-      basic_ifstream() : __istream_type(), _M_filebuf()
-      { this->init(&_M_filebuf); }
-
-      /**
-       *  @brief  Create an input file stream.
-       *  @param  __s  Null terminated string specifying the filename.
-       *  @param  __mode  Open file in specified mode (see std::ios_base).
-       *
-       *  @c ios_base::in is automatically included in @a __mode.
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-       */
-      explicit
-      basic_ifstream(const char* __s, ios_base::openmode __mode = ios_base::in)
-      : __istream_type(), _M_filebuf()
-      {
-	this->init(&_M_filebuf);
-	this->open(__s, __mode);
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Create an input file stream.
-       *  @param  __s  std::string specifying the filename.
-       *  @param  __mode  Open file in specified mode (see std::ios_base).
-       *
-       *  @c ios_base::in is automatically included in @a __mode.
-       */
-      explicit
-      basic_ifstream(const std::string& __s,
-		     ios_base::openmode __mode = ios_base::in)
-      : __istream_type(), _M_filebuf()
-      {
-	this->init(&_M_filebuf);
-	this->open(__s, __mode);
-      }
-
-      basic_ifstream(const basic_ifstream&) = delete;
-
-      basic_ifstream(basic_ifstream&& __rhs)
-      : __istream_type(std::move(__rhs)),
-      _M_filebuf(std::move(__rhs._M_filebuf))
-      { __istream_type::set_rdbuf(&_M_filebuf); }
-#endif
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The file is closed by the filebuf object, not the formatting
-       *  stream.
-       */
-      ~basic_ifstream()
-      { }
-
-#if __cplusplus >= 201103L
-      // 27.8.3.2 Assign and swap:
-
-      basic_ifstream&
-      operator=(const basic_ifstream&) = delete;
-
-      basic_ifstream&
-      operator=(basic_ifstream&& __rhs)
-      {
-	__istream_type::operator=(std::move(__rhs));
-	_M_filebuf = std::move(__rhs._M_filebuf);
-	return *this;
-      }
-
-      void
-      swap(basic_ifstream& __rhs)
-      {
-	__istream_type::swap(__rhs);
-	_M_filebuf.swap(__rhs._M_filebuf);
-      }
-#endif
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_filebuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-       */
-      __filebuf_type*
-      rdbuf() const
-      { return const_cast<__filebuf_type*>(&_M_filebuf); }
-
-      /**
-       *  @brief  Wrapper to test for an open file.
-       *  @return  @c rdbuf()->is_open()
-       */
-      bool
-      is_open()
-      { return _M_filebuf.is_open(); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 365. Lack of const-qualification in clause 27
-      bool
-      is_open() const
-      { return _M_filebuf.is_open(); }
-
-      /**
-       *  @brief  Opens an external file.
-       *  @param  __s  The name of the file.
-       *  @param  __mode  The open mode flags.
-       *
-       *  Calls @c std::basic_filebuf::open(s,__mode|in).  If that function
-       *  fails, @c failbit is set in the stream's error state.
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-       */
-      void
-      open(const char* __s, ios_base::openmode __mode = ios_base::in)
-      {
-	if (!_M_filebuf.open(__s, __mode | ios_base::in))
-	  this->setstate(ios_base::failbit);
-	else
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 409. Closing an fstream should clear error state
-	  this->clear();
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Opens an external file.
-       *  @param  __s  The name of the file.
-       *  @param  __mode  The open mode flags.
-       *
-       *  Calls @c std::basic_filebuf::open(__s,__mode|in).  If that function
-       *  fails, @c failbit is set in the stream's error state.
-       */
-      void
-      open(const std::string& __s, ios_base::openmode __mode = ios_base::in)
-      {
-	if (!_M_filebuf.open(__s, __mode | ios_base::in))
-	  this->setstate(ios_base::failbit);
-	else
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 409. Closing an fstream should clear error state
-	  this->clear();
-      }
-#endif
-
-      /**
-       *  @brief  Close the file.
-       *
-       *  Calls @c std::basic_filebuf::close().  If that function
-       *  fails, @c failbit is set in the stream's error state.
-       */
-      void
-      close()
-      {
-	if (!_M_filebuf.close())
-	  this->setstate(ios_base::failbit);
-      }
-    };
-
-
-  // [27.8.1.8] Template class basic_ofstream
-  /**
-   *  @brief  Controlling output for files.
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *
-   *  This class supports reading from named files, using the inherited
-   *  functions from std::basic_ostream.  To control the associated
-   *  sequence, an instance of std::basic_filebuf is used, which this page
-   *  refers to as @c sb.
-   */
-  template<typename _CharT, typename _Traits>
-    class basic_ofstream : public basic_ostream<_CharT,_Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard types:
-      typedef basic_filebuf<char_type, traits_type> 	__filebuf_type;
-      typedef basic_ostream<char_type, traits_type>	__ostream_type;
-
-    private:
-      __filebuf_type	_M_filebuf;
-
-    public:
-      // Constructors:
-      /**
-       *  @brief  Default constructor.
-       *
-       *  Initializes @c sb using its default constructor, and passes
-       *  @c &sb to the base class initializer.  Does not open any files
-       *  (you haven't given it a filename to open).
-       */
-      basic_ofstream(): __ostream_type(), _M_filebuf()
-      { this->init(&_M_filebuf); }
-
-      /**
-       *  @brief  Create an output file stream.
-       *  @param  __s  Null terminated string specifying the filename.
-       *  @param  __mode  Open file in specified mode (see std::ios_base).
-       *
-       *  @c ios_base::out | @c ios_base::trunc is automatically included in
-       *  @a __mode.
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-       */
-      explicit
-      basic_ofstream(const char* __s,
-		     ios_base::openmode __mode = ios_base::out|ios_base::trunc)
-      : __ostream_type(), _M_filebuf()
-      {
-	this->init(&_M_filebuf);
-	this->open(__s, __mode);
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Create an output file stream.
-       *  @param  __s  std::string specifying the filename.
-       *  @param  __mode  Open file in specified mode (see std::ios_base).
-       *
-       *  @c ios_base::out | @c ios_base::trunc is automatically included in
-       *  @a __mode.
-       */
-      explicit
-      basic_ofstream(const std::string& __s,
-		     ios_base::openmode __mode = ios_base::out|ios_base::trunc)
-      : __ostream_type(), _M_filebuf()
-      {
-	this->init(&_M_filebuf);
-	this->open(__s, __mode);
-      }
-
-      basic_ofstream(const basic_ofstream&) = delete;
-
-      basic_ofstream(basic_ofstream&& __rhs)
-      : __ostream_type(std::move(__rhs)),
-      _M_filebuf(std::move(__rhs._M_filebuf))
-      { __ostream_type::set_rdbuf(&_M_filebuf); }
-#endif
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The file is closed by the filebuf object, not the formatting
-       *  stream.
-       */
-      ~basic_ofstream()
-      { }
-
-#if __cplusplus >= 201103L
-      // 27.8.3.2 Assign and swap:
-
-      basic_ofstream&
-      operator=(const basic_ofstream&) = delete;
-
-      basic_ofstream&
-      operator=(basic_ofstream&& __rhs)
-      {
-	__ostream_type::operator=(std::move(__rhs));
-	_M_filebuf = std::move(__rhs._M_filebuf);
-	return *this;
-      }
-
-      void
-      swap(basic_ofstream& __rhs)
-      {
-	__ostream_type::swap(__rhs);
-	_M_filebuf.swap(__rhs._M_filebuf);
-      }
-#endif
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_filebuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-       */
-      __filebuf_type*
-      rdbuf() const
-      { return const_cast<__filebuf_type*>(&_M_filebuf); }
-
-      /**
-       *  @brief  Wrapper to test for an open file.
-       *  @return  @c rdbuf()->is_open()
-       */
-      bool
-      is_open()
-      { return _M_filebuf.is_open(); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 365. Lack of const-qualification in clause 27
-      bool
-      is_open() const
-      { return _M_filebuf.is_open(); }
-
-      /**
-       *  @brief  Opens an external file.
-       *  @param  __s  The name of the file.
-       *  @param  __mode  The open mode flags.
-       *
-       *  Calls @c std::basic_filebuf::open(__s,__mode|out|trunc).  If that
-       *  function fails, @c failbit is set in the stream's error state.
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-       */
-      void
-      open(const char* __s,
-	   ios_base::openmode __mode = ios_base::out | ios_base::trunc)
-      {
-	if (!_M_filebuf.open(__s, __mode | ios_base::out))
-	  this->setstate(ios_base::failbit);
-	else
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 409. Closing an fstream should clear error state
-	  this->clear();
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Opens an external file.
-       *  @param  __s  The name of the file.
-       *  @param  __mode  The open mode flags.
-       *
-       *  Calls @c std::basic_filebuf::open(s,mode|out|trunc).  If that
-       *  function fails, @c failbit is set in the stream's error state.
-       */
-      void
-      open(const std::string& __s,
-	   ios_base::openmode __mode = ios_base::out | ios_base::trunc)
-      {
-	if (!_M_filebuf.open(__s, __mode | ios_base::out))
-	  this->setstate(ios_base::failbit);
-	else
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 409. Closing an fstream should clear error state
-	  this->clear();
-      }
-#endif
-
-      /**
-       *  @brief  Close the file.
-       *
-       *  Calls @c std::basic_filebuf::close().  If that function
-       *  fails, @c failbit is set in the stream's error state.
-       */
-      void
-      close()
-      {
-	if (!_M_filebuf.close())
-	  this->setstate(ios_base::failbit);
-      }
-    };
-
-
-  // [27.8.1.11] Template class basic_fstream
-  /**
-   *  @brief  Controlling input and output for files.
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *
-   *  This class supports reading from and writing to named files, using
-   *  the inherited functions from std::basic_iostream.  To control the
-   *  associated sequence, an instance of std::basic_filebuf is used, which
-   *  this page refers to as @c sb.
-   */
-  template<typename _CharT, typename _Traits>
-    class basic_fstream : public basic_iostream<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard types:
-      typedef basic_filebuf<char_type, traits_type> 	__filebuf_type;
-      typedef basic_ios<char_type, traits_type>		__ios_type;
-      typedef basic_iostream<char_type, traits_type>	__iostream_type;
-
-    private:
-      __filebuf_type	_M_filebuf;
-
-    public:
-      // Constructors/destructor:
-      /**
-       *  @brief  Default constructor.
-       *
-       *  Initializes @c sb using its default constructor, and passes
-       *  @c &sb to the base class initializer.  Does not open any files
-       *  (you haven't given it a filename to open).
-       */
-      basic_fstream()
-      : __iostream_type(), _M_filebuf()
-      { this->init(&_M_filebuf); }
-
-      /**
-       *  @brief  Create an input/output file stream.
-       *  @param  __s  Null terminated string specifying the filename.
-       *  @param  __mode  Open file in specified mode (see std::ios_base).
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-       */
-      explicit
-      basic_fstream(const char* __s,
-		    ios_base::openmode __mode = ios_base::in | ios_base::out)
-      : __iostream_type(0), _M_filebuf()
-      {
-	this->init(&_M_filebuf);
-	this->open(__s, __mode);
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Create an input/output file stream.
-       *  @param  __s  Null terminated string specifying the filename.
-       *  @param  __mode  Open file in specified mode (see std::ios_base).
-       */
-      explicit
-      basic_fstream(const std::string& __s,
-		    ios_base::openmode __mode = ios_base::in | ios_base::out)
-      : __iostream_type(0), _M_filebuf()
-      {
-	this->init(&_M_filebuf);
-	this->open(__s, __mode);
-      }
-
-      basic_fstream(const basic_fstream&) = delete;
-
-      basic_fstream(basic_fstream&& __rhs)
-      : __iostream_type(std::move(__rhs)),
-      _M_filebuf(std::move(__rhs._M_filebuf))
-      { __iostream_type::set_rdbuf(&_M_filebuf); }
-#endif
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The file is closed by the filebuf object, not the formatting
-       *  stream.
-       */
-      ~basic_fstream()
-      { }
-
-#if __cplusplus >= 201103L
-      // 27.8.3.2 Assign and swap:
-
-      basic_fstream&
-      operator=(const basic_fstream&) = delete;
-
-      basic_fstream&
-      operator=(basic_fstream&& __rhs)
-      {
-	__iostream_type::operator=(std::move(__rhs));
-	_M_filebuf = std::move(__rhs._M_filebuf);
-	return *this;
-      }
-
-      void
-      swap(basic_fstream& __rhs)
-      {
-	__iostream_type::swap(__rhs);
-	_M_filebuf.swap(__rhs._M_filebuf);
-      }
-#endif
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_filebuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-       */
-      __filebuf_type*
-      rdbuf() const
-      { return const_cast<__filebuf_type*>(&_M_filebuf); }
-
-      /**
-       *  @brief  Wrapper to test for an open file.
-       *  @return  @c rdbuf()->is_open()
-       */
-      bool
-      is_open()
-      { return _M_filebuf.is_open(); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 365. Lack of const-qualification in clause 27
-      bool
-      is_open() const
-      { return _M_filebuf.is_open(); }
-
-      /**
-       *  @brief  Opens an external file.
-       *  @param  __s  The name of the file.
-       *  @param  __mode  The open mode flags.
-       *
-       *  Calls @c std::basic_filebuf::open(__s,__mode).  If that
-       *  function fails, @c failbit is set in the stream's error state.
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-       */
-      void
-      open(const char* __s,
-	   ios_base::openmode __mode = ios_base::in | ios_base::out)
-      {
-	if (!_M_filebuf.open(__s, __mode))
-	  this->setstate(ios_base::failbit);
-	else
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 409. Closing an fstream should clear error state
-	  this->clear();
-      }
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Opens an external file.
-       *  @param  __s  The name of the file.
-       *  @param  __mode  The open mode flags.
-       *
-       *  Calls @c std::basic_filebuf::open(__s,__mode).  If that
-       *  function fails, @c failbit is set in the stream's error state.
-       */
-      void
-      open(const std::string& __s,
-	   ios_base::openmode __mode = ios_base::in | ios_base::out)
-      {
-	if (!_M_filebuf.open(__s, __mode))
-	  this->setstate(ios_base::failbit);
-	else
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 409. Closing an fstream should clear error state
-	  this->clear();
-      }
-#endif
-
-      /**
-       *  @brief  Close the file.
-       *
-       *  Calls @c std::basic_filebuf::close().  If that function
-       *  fails, @c failbit is set in the stream's error state.
-       */
-      void
-      close()
-      {
-	if (!_M_filebuf.close())
-	  this->setstate(ios_base::failbit);
-      }
-    };
-
-#if __cplusplus >= 201103L
-  /// Swap specialization for filebufs.
-  template <class _CharT, class _Traits>
-    inline void
-    swap(basic_filebuf<_CharT, _Traits>& __x,
-	 basic_filebuf<_CharT, _Traits>& __y)
-    { __x.swap(__y); }
-
-  /// Swap specialization for ifstreams.
-  template <class _CharT, class _Traits>
-    inline void
-    swap(basic_ifstream<_CharT, _Traits>& __x,
-	 basic_ifstream<_CharT, _Traits>& __y)
-    { __x.swap(__y); }
-
-  /// Swap specialization for ofstreams.
-  template <class _CharT, class _Traits>
-    inline void
-    swap(basic_ofstream<_CharT, _Traits>& __x,
-	 basic_ofstream<_CharT, _Traits>& __y)
-    { __x.swap(__y); }
-
-  /// Swap specialization for fstreams.
-  template <class _CharT, class _Traits>
-    inline void
-    swap(basic_fstream<_CharT, _Traits>& __x,
-	 basic_fstream<_CharT, _Traits>& __y)
-    { __x.swap(__y); }
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#include <bits/fstream.tcc>
-
-#endif /* _GLIBCXX_FSTREAM */
diff --git a/openflow/usr/include/c++/5/functional b/openflow/usr/include/c++/5/functional
deleted file mode 100644
index cc40e4d..0000000
--- a/openflow/usr/include/c++/5/functional
+++ /dev/null
@@ -1,2377 +0,0 @@
-// <functional> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file include/functional
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_FUNCTIONAL
-#define _GLIBCXX_FUNCTIONAL 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stl_function.h>
-
-#if __cplusplus >= 201103L
-
-#include <typeinfo>
-#include <new>
-#include <tuple>
-#include <type_traits>
-#include <bits/functexcept.h>
-#include <bits/functional_hash.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _MemberPointer>
-    class _Mem_fn;
-  template<typename _Tp, typename _Class>
-    _Mem_fn<_Tp _Class::*>
-    mem_fn(_Tp _Class::*) noexcept;
-
-  /// If we have found a result_type, extract it.
-  template<typename _Functor, typename = __void_t<>>
-    struct _Maybe_get_result_type
-    { };
-
-  template<typename _Functor>
-    struct _Maybe_get_result_type<_Functor,
-				  __void_t<typename _Functor::result_type>>
-    { typedef typename _Functor::result_type result_type; };
-
-  /**
-   *  Base class for any function object that has a weak result type, as
-   *  defined in 20.8.2 [func.require] of C++11.
-  */
-  template<typename _Functor>
-    struct _Weak_result_type_impl
-    : _Maybe_get_result_type<_Functor>
-    { };
-
-  /// Retrieve the result type for a function type.
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(_ArgTypes...)>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(_ArgTypes......)>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(_ArgTypes...) const>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(_ArgTypes......) const>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(_ArgTypes...) volatile>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(_ArgTypes......) volatile>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(_ArgTypes...) const volatile>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(_ArgTypes......) const volatile>
-    { typedef _Res result_type; };
-
-  /// Retrieve the result type for a function reference.
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(&)(_ArgTypes...)>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(&)(_ArgTypes......)>
-    { typedef _Res result_type; };
-
-  /// Retrieve the result type for a function pointer.
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(*)(_ArgTypes...)>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res(*)(_ArgTypes......)>
-    { typedef _Res result_type; };
-
-  /// Retrieve result type for a member function pointer.
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes...)>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes......)>
-    { typedef _Res result_type; };
-
-  /// Retrieve result type for a const member function pointer.
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes...) const>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes......) const>
-    { typedef _Res result_type; };
-
-  /// Retrieve result type for a volatile member function pointer.
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes...) volatile>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes......) volatile>
-    { typedef _Res result_type; };
-
-  /// Retrieve result type for a const volatile member function pointer.
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes...)
-				  const volatile>
-    { typedef _Res result_type; };
-
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes......)
-				  const volatile>
-    { typedef _Res result_type; };
-
-  /**
-   *  Strip top-level cv-qualifiers from the function object and let
-   *  _Weak_result_type_impl perform the real work.
-  */
-  template<typename _Functor>
-    struct _Weak_result_type
-    : _Weak_result_type_impl<typename remove_cv<_Functor>::type>
-    { };
-
-  /**
-   * Invoke a function object, which may be either a member pointer or a
-   * function object. The first parameter will tell which.
-   */
-  template<typename _Functor, typename... _Args>
-    inline
-    typename enable_if<
-	     (!is_member_pointer<_Functor>::value
-	      && !is_function<_Functor>::value
-	      && !is_function<typename remove_pointer<_Functor>::type>::value),
-	     typename result_of<_Functor&(_Args&&...)>::type
-	   >::type
-    __invoke(_Functor& __f, _Args&&... __args)
-    {
-      return __f(std::forward<_Args>(__args)...);
-    }
-
-  template<typename _Functor, typename... _Args>
-    inline
-    typename enable_if<
-             (is_member_pointer<_Functor>::value
-              && !is_function<_Functor>::value
-              && !is_function<typename remove_pointer<_Functor>::type>::value),
-             typename result_of<_Functor(_Args&&...)>::type
-           >::type
-    __invoke(_Functor& __f, _Args&&... __args)
-    {
-      return std::mem_fn(__f)(std::forward<_Args>(__args)...);
-    }
-
-  // To pick up function references (that will become function pointers)
-  template<typename _Functor, typename... _Args>
-    inline
-    typename enable_if<
-	     (is_pointer<_Functor>::value
-	      && is_function<typename remove_pointer<_Functor>::type>::value),
-	     typename result_of<_Functor(_Args&&...)>::type
-	   >::type
-    __invoke(_Functor __f, _Args&&... __args)
-    {
-      return __f(std::forward<_Args>(__args)...);
-    }
-
-  /**
-   *  Knowing which of unary_function and binary_function _Tp derives
-   *  from, derives from the same and ensures that reference_wrapper
-   *  will have a weak result type. See cases below.
-   */
-  template<bool _Unary, bool _Binary, typename _Tp>
-    struct _Reference_wrapper_base_impl;
-
-  // None of the nested argument types.
-  template<typename _Tp>
-    struct _Reference_wrapper_base_impl<false, false, _Tp>
-    : _Weak_result_type<_Tp>
-    { };
-
-  // Nested argument_type only.
-  template<typename _Tp>
-    struct _Reference_wrapper_base_impl<true, false, _Tp>
-    : _Weak_result_type<_Tp>
-    {
-      typedef typename _Tp::argument_type argument_type;
-    };
-
-  // Nested first_argument_type and second_argument_type only.
-  template<typename _Tp>
-    struct _Reference_wrapper_base_impl<false, true, _Tp>
-    : _Weak_result_type<_Tp>
-    {
-      typedef typename _Tp::first_argument_type first_argument_type;
-      typedef typename _Tp::second_argument_type second_argument_type;
-    };
-
-  // All the nested argument types.
-   template<typename _Tp>
-    struct _Reference_wrapper_base_impl<true, true, _Tp>
-    : _Weak_result_type<_Tp>
-    {
-      typedef typename _Tp::argument_type argument_type;
-      typedef typename _Tp::first_argument_type first_argument_type;
-      typedef typename _Tp::second_argument_type second_argument_type;
-    };
-
-  _GLIBCXX_HAS_NESTED_TYPE(argument_type)
-  _GLIBCXX_HAS_NESTED_TYPE(first_argument_type)
-  _GLIBCXX_HAS_NESTED_TYPE(second_argument_type)
-
-  /**
-   *  Derives from unary_function or binary_function when it
-   *  can. Specializations handle all of the easy cases. The primary
-   *  template determines what to do with a class type, which may
-   *  derive from both unary_function and binary_function.
-  */
-  template<typename _Tp>
-    struct _Reference_wrapper_base
-    : _Reference_wrapper_base_impl<
-      __has_argument_type<_Tp>::value,
-      __has_first_argument_type<_Tp>::value
-      && __has_second_argument_type<_Tp>::value,
-      _Tp>
-    { };
-
-  // - a function type (unary)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res(_T1)>
-    : unary_function<_T1, _Res>
-    { };
-
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res(_T1) const>
-    : unary_function<_T1, _Res>
-    { };
-
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res(_T1) volatile>
-    : unary_function<_T1, _Res>
-    { };
-
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res(_T1) const volatile>
-    : unary_function<_T1, _Res>
-    { };
-
-  // - a function type (binary)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res(_T1, _T2)>
-    : binary_function<_T1, _T2, _Res>
-    { };
-
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res(_T1, _T2) const>
-    : binary_function<_T1, _T2, _Res>
-    { };
-
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res(_T1, _T2) volatile>
-    : binary_function<_T1, _T2, _Res>
-    { };
-
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res(_T1, _T2) const volatile>
-    : binary_function<_T1, _T2, _Res>
-    { };
-
-  // - a function pointer type (unary)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res(*)(_T1)>
-    : unary_function<_T1, _Res>
-    { };
-
-  // - a function pointer type (binary)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res(*)(_T1, _T2)>
-    : binary_function<_T1, _T2, _Res>
-    { };
-
-  // - a pointer to member function type (unary, no qualifiers)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res (_T1::*)()>
-    : unary_function<_T1*, _Res>
-    { };
-
-  // - a pointer to member function type (binary, no qualifiers)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res (_T1::*)(_T2)>
-    : binary_function<_T1*, _T2, _Res>
-    { };
-
-  // - a pointer to member function type (unary, const)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res (_T1::*)() const>
-    : unary_function<const _T1*, _Res>
-    { };
-
-  // - a pointer to member function type (binary, const)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res (_T1::*)(_T2) const>
-    : binary_function<const _T1*, _T2, _Res>
-    { };
-
-  // - a pointer to member function type (unary, volatile)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res (_T1::*)() volatile>
-    : unary_function<volatile _T1*, _Res>
-    { };
-
-  // - a pointer to member function type (binary, volatile)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res (_T1::*)(_T2) volatile>
-    : binary_function<volatile _T1*, _T2, _Res>
-    { };
-
-  // - a pointer to member function type (unary, const volatile)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res (_T1::*)() const volatile>
-    : unary_function<const volatile _T1*, _Res>
-    { };
-
-  // - a pointer to member function type (binary, const volatile)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res (_T1::*)(_T2) const volatile>
-    : binary_function<const volatile _T1*, _T2, _Res>
-    { };
-
-  /**
-   *  @brief Primary class template for reference_wrapper.
-   *  @ingroup functors
-   *  @{
-   */
-  template<typename _Tp>
-    class reference_wrapper
-    : public _Reference_wrapper_base<typename remove_cv<_Tp>::type>
-    {
-      _Tp* _M_data;
-
-    public:
-      typedef _Tp type;
-
-      reference_wrapper(_Tp& __indata) noexcept
-      : _M_data(std::__addressof(__indata))
-      { }
-
-      reference_wrapper(_Tp&&) = delete;
-
-      reference_wrapper(const reference_wrapper&) = default;
-
-      reference_wrapper&
-      operator=(const reference_wrapper&) = default;
-
-      operator _Tp&() const noexcept
-      { return this->get(); }
-
-      _Tp&
-      get() const noexcept
-      { return *_M_data; }
-
-      template<typename... _Args>
-	typename result_of<_Tp&(_Args&&...)>::type
-	operator()(_Args&&... __args) const
-	{
-	  return __invoke(get(), std::forward<_Args>(__args)...);
-	}
-    };
-
-
-  /// Denotes a reference should be taken to a variable.
-  template<typename _Tp>
-    inline reference_wrapper<_Tp>
-    ref(_Tp& __t) noexcept
-    { return reference_wrapper<_Tp>(__t); }
-
-  /// Denotes a const reference should be taken to a variable.
-  template<typename _Tp>
-    inline reference_wrapper<const _Tp>
-    cref(const _Tp& __t) noexcept
-    { return reference_wrapper<const _Tp>(__t); }
-
-  template<typename _Tp>
-    void ref(const _Tp&&) = delete;
-
-  template<typename _Tp>
-    void cref(const _Tp&&) = delete;
-
-  /// Partial specialization.
-  template<typename _Tp>
-    inline reference_wrapper<_Tp>
-    ref(reference_wrapper<_Tp> __t) noexcept
-    { return ref(__t.get()); }
-
-  /// Partial specialization.
-  template<typename _Tp>
-    inline reference_wrapper<const _Tp>
-    cref(reference_wrapper<_Tp> __t) noexcept
-    { return cref(__t.get()); }
-
-  // @} group functors
-
-  template<typename... _Types>
-    struct _Pack : integral_constant<size_t, sizeof...(_Types)>
-    { };
-
-  template<typename _From, typename _To, bool = _From::value == _To::value>
-    struct _AllConvertible : false_type
-    { };
-
-  template<typename... _From, typename... _To>
-    struct _AllConvertible<_Pack<_From...>, _Pack<_To...>, true>
-    : __and_<is_convertible<_From, _To>...>
-    { };
-
-  template<typename _Tp1, typename _Tp2>
-    using _NotSame = __not_<is_same<typename std::decay<_Tp1>::type,
-				    typename std::decay<_Tp2>::type>>;
-
-  /**
-   * Derives from @c unary_function or @c binary_function, or perhaps
-   * nothing, depending on the number of arguments provided. The
-   * primary template is the basis case, which derives nothing.
-   */
-  template<typename _Res, typename... _ArgTypes>
-    struct _Maybe_unary_or_binary_function { };
-
-  /// Derives from @c unary_function, as appropriate.
-  template<typename _Res, typename _T1>
-    struct _Maybe_unary_or_binary_function<_Res, _T1>
-    : std::unary_function<_T1, _Res> { };
-
-  /// Derives from @c binary_function, as appropriate.
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Maybe_unary_or_binary_function<_Res, _T1, _T2>
-    : std::binary_function<_T1, _T2, _Res> { };
-
-  template<typename _Signature>
-    struct _Mem_fn_traits;
-
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    struct _Mem_fn_traits_base
-    {
-      using __result_type = _Res;
-      using __class_type =  _Class;
-      using __arg_types = _Pack<_ArgTypes...>;
-      using __maybe_type
-	= _Maybe_unary_or_binary_function<_Res, _Class*, _ArgTypes...>;
-      using __arity = integral_constant<size_t, sizeof...(_ArgTypes)>;
-    };
-
-#define _GLIBCXX_MEM_FN_TRAITS2(_CV, _REF, _LVAL, _RVAL)		\
-  template<typename _Res, typename _Class, typename... _ArgTypes>	\
-    struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...) _CV _REF>	\
-    : _Mem_fn_traits_base<_Res, _CV _Class, _ArgTypes...>		\
-    {									\
-      using __pmf_type  = _Res (_Class::*)(_ArgTypes...) _CV _REF;	\
-      using __lvalue = _LVAL;						\
-      using __rvalue = _RVAL;						\
-      using __vararg = false_type;					\
-    };									\
-  template<typename _Res, typename _Class, typename... _ArgTypes>	\
-    struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes... ...) _CV _REF>	\
-    : _Mem_fn_traits_base<_Res, _CV _Class, _ArgTypes...>		\
-    {									\
-      using __pmf_type  = _Res (_Class::*)(_ArgTypes... ...) _CV _REF;	\
-      using __lvalue = _LVAL;						\
-      using __rvalue = _RVAL;						\
-      using __vararg = true_type;					\
-    };
-
-#define _GLIBCXX_MEM_FN_TRAITS(_REF, _LVAL, _RVAL)		\
-  _GLIBCXX_MEM_FN_TRAITS2(		, _REF, _LVAL, _RVAL)	\
-  _GLIBCXX_MEM_FN_TRAITS2(const		, _REF, _LVAL, _RVAL)	\
-  _GLIBCXX_MEM_FN_TRAITS2(volatile	, _REF, _LVAL, _RVAL)	\
-  _GLIBCXX_MEM_FN_TRAITS2(const volatile, _REF, _LVAL, _RVAL)
-
-_GLIBCXX_MEM_FN_TRAITS( , true_type, true_type)
-_GLIBCXX_MEM_FN_TRAITS(&, true_type, false_type)
-_GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
-
-#undef _GLIBCXX_MEM_FN_TRAITS
-#undef _GLIBCXX_MEM_FN_TRAITS2
-
-  template<typename _MemFunPtr,
-	   bool __is_mem_fn = is_member_function_pointer<_MemFunPtr>::value>
-    class _Mem_fn_base
-    : public _Mem_fn_traits<_MemFunPtr>::__maybe_type
-    {
-      using _Traits = _Mem_fn_traits<_MemFunPtr>;
-
-      using _Class = typename _Traits::__class_type;
-      using _ArgTypes = typename _Traits::__arg_types;
-      using _Pmf = typename _Traits::__pmf_type;
-
-      using _Arity = typename _Traits::__arity;
-      using _Varargs = typename _Traits::__vararg;
-
-      template<typename _Func, typename... _BoundArgs>
-	friend struct _Bind_check_arity;
-
-      // for varargs functions we just check the number of arguments,
-      // otherwise we also check they are convertible.
-      template<typename _Args>
-	using _CheckArgs = typename conditional<_Varargs::value,
-	  __bool_constant<(_Args::value >= _ArgTypes::value)>,
-	  _AllConvertible<_Args, _ArgTypes>
-	>::type;
-
-    public:
-      using result_type = typename _Traits::__result_type;
-
-      explicit _Mem_fn_base(_Pmf __pmf) : _M_pmf(__pmf) { }
-
-      // Handle objects
-      template<typename... _Args, typename _Req
-               = _Require<typename _Traits::__lvalue,
-                          _CheckArgs<_Pack<_Args...>>>>
-	result_type
-	operator()(_Class& __object, _Args&&... __args) const
-	{ return (__object.*_M_pmf)(std::forward<_Args>(__args)...); }
-
-      template<typename... _Args, typename _Req
-               = _Require<typename _Traits::__rvalue,
-                          _CheckArgs<_Pack<_Args...>>>>
-	result_type
-	operator()(_Class&& __object, _Args&&... __args) const
-	{
-	  return (std::move(__object).*_M_pmf)(std::forward<_Args>(__args)...);
-	}
-
-      // Handle pointers
-      template<typename... _Args, typename _Req
-               = _Require<typename _Traits::__lvalue,
-                          _CheckArgs<_Pack<_Args...>>>>
-	result_type
-	operator()(_Class* __object, _Args&&... __args) const
-	{ return (__object->*_M_pmf)(std::forward<_Args>(__args)...); }
-
-      // Handle smart pointers, references and pointers to derived
-      template<typename _Tp, typename... _Args, typename _Req
-               = _Require<_NotSame<_Class, _Tp>, _NotSame<_Class*, _Tp>,
-                          _CheckArgs<_Pack<_Args...>>>>
-	result_type
-	operator()(_Tp&& __object, _Args&&... __args) const
-	{
-	  return _M_call(std::forward<_Tp>(__object), &__object,
-	      std::forward<_Args>(__args)...);
-	}
-
-      // Handle reference wrappers
-      template<typename _Tp, typename... _Args, typename _Req
-               = _Require<is_base_of<_Class, _Tp>, typename _Traits::__lvalue,
-                          _CheckArgs<_Pack<_Args...>>>>
-	result_type
-	operator()(reference_wrapper<_Tp> __ref, _Args&&... __args) const
-	{ return operator()(__ref.get(), std::forward<_Args>(__args)...); }
-
-    private:
-      template<typename _Tp, typename... _Args>
-	result_type
-	_M_call(_Tp&& __object, const volatile _Class *,
-		_Args&&... __args) const
-	{
-	  return (std::forward<_Tp>(__object).*_M_pmf)
-	    (std::forward<_Args>(__args)...);
-	}
-
-      template<typename _Tp, typename... _Args>
-	result_type
-	_M_call(_Tp&& __ptr, const volatile void *, _Args&&... __args) const
-	{ return ((*__ptr).*_M_pmf)(std::forward<_Args>(__args)...); }
-
-      _Pmf _M_pmf;
-    };
-
-  // Partial specialization for member object pointers.
-  template<typename _Res, typename _Class>
-    class _Mem_fn_base<_Res _Class::*, false>
-    {
-      using __pm_type = _Res _Class::*;
-
-      // This bit of genius is due to Peter Dimov, improved slightly by
-      // Douglas Gregor.
-      // Made less elegant to support perfect forwarding and noexcept.
-      template<typename _Tp>
-	auto
-	_M_call(_Tp&& __object, const _Class *) const noexcept
-	-> decltype(std::forward<_Tp>(__object).*std::declval<__pm_type&>())
-	{ return std::forward<_Tp>(__object).*_M_pm; }
-
-      template<typename _Tp, typename _Up>
-	auto
-	_M_call(_Tp&& __object, _Up * const *) const noexcept
-	-> decltype((*std::forward<_Tp>(__object)).*std::declval<__pm_type&>())
-	{ return (*std::forward<_Tp>(__object)).*_M_pm; }
-
-      template<typename _Tp>
-	auto
-	_M_call(_Tp&& __ptr, const volatile void*) const
-	noexcept(noexcept((*__ptr).*std::declval<__pm_type&>()))
-	-> decltype((*__ptr).*std::declval<__pm_type&>())
-	{ return (*__ptr).*_M_pm; }
-
-      using _Arity = integral_constant<size_t, 0>;
-      using _Varargs = false_type;
-
-      template<typename _Func, typename... _BoundArgs>
-	friend struct _Bind_check_arity;
-
-    public:
-      explicit
-      _Mem_fn_base(_Res _Class::*__pm) noexcept : _M_pm(__pm) { }
-
-      // Handle objects
-      _Res&
-      operator()(_Class& __object) const noexcept
-      { return __object.*_M_pm; }
-
-      const _Res&
-      operator()(const _Class& __object) const noexcept
-      { return __object.*_M_pm; }
-
-      _Res&&
-      operator()(_Class&& __object) const noexcept
-      { return std::forward<_Class>(__object).*_M_pm; }
-
-      const _Res&&
-      operator()(const _Class&& __object) const noexcept
-      { return std::forward<const _Class>(__object).*_M_pm; }
-
-      // Handle pointers
-      _Res&
-      operator()(_Class* __object) const noexcept
-      { return __object->*_M_pm; }
-
-      const _Res&
-      operator()(const _Class* __object) const noexcept
-      { return __object->*_M_pm; }
-
-      // Handle smart pointers and derived
-      template<typename _Tp, typename _Req = _Require<_NotSame<_Class*, _Tp>>>
-	auto
-	operator()(_Tp&& __unknown) const
-	noexcept(noexcept(std::declval<_Mem_fn_base*>()->_M_call
-			  (std::forward<_Tp>(__unknown), &__unknown)))
-	-> decltype(this->_M_call(std::forward<_Tp>(__unknown), &__unknown))
-	{ return _M_call(std::forward<_Tp>(__unknown), &__unknown); }
-
-      template<typename _Tp, typename _Req = _Require<is_base_of<_Class, _Tp>>>
-	auto
-	operator()(reference_wrapper<_Tp> __ref) const
-	noexcept(noexcept(std::declval<_Mem_fn_base&>()(__ref.get())))
-	-> decltype((*this)(__ref.get()))
-	{ return (*this)(__ref.get()); }
-
-    private:
-      _Res _Class::*_M_pm;
-    };
-
-  template<typename _Res, typename _Class>
-    struct _Mem_fn<_Res _Class::*>
-    : _Mem_fn_base<_Res _Class::*>
-    {
-      using _Mem_fn_base<_Res _Class::*>::_Mem_fn_base;
-    };
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 2048.  Unnecessary mem_fn overloads
-  /**
-   *  @brief Returns a function object that forwards to the member
-   *  pointer @a pm.
-   *  @ingroup functors
-   */
-  template<typename _Tp, typename _Class>
-    inline _Mem_fn<_Tp _Class::*>
-    mem_fn(_Tp _Class::* __pm) noexcept
-    {
-      return _Mem_fn<_Tp _Class::*>(__pm);
-    }
-
-  /**
-   *  @brief Determines if the given type _Tp is a function object
-   *  should be treated as a subexpression when evaluating calls to
-   *  function objects returned by bind(). [TR1 3.6.1]
-   *  @ingroup binders
-   */
-  template<typename _Tp>
-    struct is_bind_expression
-    : public false_type { };
-
-  /**
-   *  @brief Determines if the given type _Tp is a placeholder in a
-   *  bind() expression and, if so, which placeholder it is. [TR1 3.6.2]
-   *  @ingroup binders
-   */
-  template<typename _Tp>
-    struct is_placeholder
-    : public integral_constant<int, 0>
-    { };
-
-  /** @brief The type of placeholder objects defined by libstdc++.
-   *  @ingroup binders
-   */
-  template<int _Num> struct _Placeholder { };
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-
-  /** @namespace std::placeholders
-   *  @brief ISO C++11 entities sub-namespace for functional.
-   *  @ingroup binders
-   */
-  namespace placeholders
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-  /* Define a large number of placeholders. There is no way to
-   * simplify this with variadic templates, because we're introducing
-   * unique names for each.
-   */
-    extern const _Placeholder<1> _1;
-    extern const _Placeholder<2> _2;
-    extern const _Placeholder<3> _3;
-    extern const _Placeholder<4> _4;
-    extern const _Placeholder<5> _5;
-    extern const _Placeholder<6> _6;
-    extern const _Placeholder<7> _7;
-    extern const _Placeholder<8> _8;
-    extern const _Placeholder<9> _9;
-    extern const _Placeholder<10> _10;
-    extern const _Placeholder<11> _11;
-    extern const _Placeholder<12> _12;
-    extern const _Placeholder<13> _13;
-    extern const _Placeholder<14> _14;
-    extern const _Placeholder<15> _15;
-    extern const _Placeholder<16> _16;
-    extern const _Placeholder<17> _17;
-    extern const _Placeholder<18> _18;
-    extern const _Placeholder<19> _19;
-    extern const _Placeholder<20> _20;
-    extern const _Placeholder<21> _21;
-    extern const _Placeholder<22> _22;
-    extern const _Placeholder<23> _23;
-    extern const _Placeholder<24> _24;
-    extern const _Placeholder<25> _25;
-    extern const _Placeholder<26> _26;
-    extern const _Placeholder<27> _27;
-    extern const _Placeholder<28> _28;
-    extern const _Placeholder<29> _29;
-  _GLIBCXX_END_NAMESPACE_VERSION
-  }
-
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  Partial specialization of is_placeholder that provides the placeholder
-   *  number for the placeholder objects defined by libstdc++.
-   *  @ingroup binders
-   */
-  template<int _Num>
-    struct is_placeholder<_Placeholder<_Num> >
-    : public integral_constant<int, _Num>
-    { };
-
-  template<int _Num>
-    struct is_placeholder<const _Placeholder<_Num> >
-    : public integral_constant<int, _Num>
-    { };
-
-  /**
-   * Used by _Safe_tuple_element to indicate that there is no tuple
-   * element at this position.
-   */
-  struct _No_tuple_element;
-
-  /**
-   * Implementation helper for _Safe_tuple_element. This primary
-   * template handles the case where it is safe to use @c
-   * tuple_element.
-   */
-  template<std::size_t __i, typename _Tuple, bool _IsSafe>
-    struct _Safe_tuple_element_impl
-    : tuple_element<__i, _Tuple> { };
-
-  /**
-   * Implementation helper for _Safe_tuple_element. This partial
-   * specialization handles the case where it is not safe to use @c
-   * tuple_element. We just return @c _No_tuple_element.
-   */
-  template<std::size_t __i, typename _Tuple>
-    struct _Safe_tuple_element_impl<__i, _Tuple, false>
-    {
-      typedef _No_tuple_element type;
-    };
-
-  /**
-   * Like tuple_element, but returns @c _No_tuple_element when
-   * tuple_element would return an error.
-   */
- template<std::size_t __i, typename _Tuple>
-   struct _Safe_tuple_element
-   : _Safe_tuple_element_impl<__i, _Tuple,
-			      (__i < tuple_size<_Tuple>::value)>
-   { };
-
-  /**
-   *  Maps an argument to bind() into an actual argument to the bound
-   *  function object [TR1 3.6.3/5]. Only the first parameter should
-   *  be specified: the rest are used to determine among the various
-   *  implementations. Note that, although this class is a function
-   *  object, it isn't entirely normal because it takes only two
-   *  parameters regardless of the number of parameters passed to the
-   *  bind expression. The first parameter is the bound argument and
-   *  the second parameter is a tuple containing references to the
-   *  rest of the arguments.
-   */
-  template<typename _Arg,
-	   bool _IsBindExp = is_bind_expression<_Arg>::value,
-	   bool _IsPlaceholder = (is_placeholder<_Arg>::value > 0)>
-    class _Mu;
-
-  /**
-   *  If the argument is reference_wrapper<_Tp>, returns the
-   *  underlying reference. [TR1 3.6.3/5 bullet 1]
-   */
-  template<typename _Tp>
-    class _Mu<reference_wrapper<_Tp>, false, false>
-    {
-    public:
-      typedef _Tp& result_type;
-
-      /* Note: This won't actually work for const volatile
-       * reference_wrappers, because reference_wrapper::get() is const
-       * but not volatile-qualified. This might be a defect in the TR.
-       */
-      template<typename _CVRef, typename _Tuple>
-	result_type
-	operator()(_CVRef& __arg, _Tuple&) const volatile
-	{ return __arg.get(); }
-    };
-
-  /**
-   *  If the argument is a bind expression, we invoke the underlying
-   *  function object with the same cv-qualifiers as we are given and
-   *  pass along all of our arguments (unwrapped). [TR1 3.6.3/5 bullet 2]
-   */
-  template<typename _Arg>
-    class _Mu<_Arg, true, false>
-    {
-    public:
-      template<typename _CVArg, typename... _Args>
-	auto
-	operator()(_CVArg& __arg,
-		   tuple<_Args...>& __tuple) const volatile
-	-> decltype(__arg(declval<_Args>()...))
-	{
-	  // Construct an index tuple and forward to __call
-	  typedef typename _Build_index_tuple<sizeof...(_Args)>::__type
-	    _Indexes;
-	  return this->__call(__arg, __tuple, _Indexes());
-	}
-
-    private:
-      // Invokes the underlying function object __arg by unpacking all
-      // of the arguments in the tuple.
-      template<typename _CVArg, typename... _Args, std::size_t... _Indexes>
-	auto
-	__call(_CVArg& __arg, tuple<_Args...>& __tuple,
-	       const _Index_tuple<_Indexes...>&) const volatile
-	-> decltype(__arg(declval<_Args>()...))
-	{
-	  return __arg(std::forward<_Args>(std::get<_Indexes>(__tuple))...);
-	}
-    };
-
-  /**
-   *  If the argument is a placeholder for the Nth argument, returns
-   *  a reference to the Nth argument to the bind function object.
-   *  [TR1 3.6.3/5 bullet 3]
-   */
-  template<typename _Arg>
-    class _Mu<_Arg, false, true>
-    {
-    public:
-      template<typename _Signature> class result;
-
-      template<typename _CVMu, typename _CVArg, typename _Tuple>
-	class result<_CVMu(_CVArg, _Tuple)>
-	{
-	  // Add a reference, if it hasn't already been done for us.
-	  // This allows us to be a little bit sloppy in constructing
-	  // the tuple that we pass to result_of<...>.
-	  typedef typename _Safe_tuple_element<(is_placeholder<_Arg>::value
-						- 1), _Tuple>::type
-	    __base_type;
-
-	public:
-	  typedef typename add_rvalue_reference<__base_type>::type type;
-	};
-
-      template<typename _Tuple>
-	typename result<_Mu(_Arg, _Tuple)>::type
-	operator()(const volatile _Arg&, _Tuple& __tuple) const volatile
-	{
-	  return std::forward<typename result<_Mu(_Arg, _Tuple)>::type>(
-	      ::std::get<(is_placeholder<_Arg>::value - 1)>(__tuple));
-	}
-    };
-
-  /**
-   *  If the argument is just a value, returns a reference to that
-   *  value. The cv-qualifiers on the reference are the same as the
-   *  cv-qualifiers on the _Mu object. [TR1 3.6.3/5 bullet 4]
-   */
-  template<typename _Arg>
-    class _Mu<_Arg, false, false>
-    {
-    public:
-      template<typename _Signature> struct result;
-
-      template<typename _CVMu, typename _CVArg, typename _Tuple>
-	struct result<_CVMu(_CVArg, _Tuple)>
-	{
-	  typedef typename add_lvalue_reference<_CVArg>::type type;
-	};
-
-      // Pick up the cv-qualifiers of the argument
-      template<typename _CVArg, typename _Tuple>
-	_CVArg&&
-	operator()(_CVArg&& __arg, _Tuple&) const volatile
-	{ return std::forward<_CVArg>(__arg); }
-    };
-
-  /**
-   *  Maps member pointers into instances of _Mem_fn but leaves all
-   *  other function objects untouched. Used by std::bind(). The
-   *  primary template handles the non-member-pointer case.
-   */
-  template<typename _Tp>
-    struct _Maybe_wrap_member_pointer
-    {
-      typedef _Tp type;
-
-      static const _Tp&
-      __do_wrap(const _Tp& __x)
-      { return __x; }
-
-      static _Tp&&
-      __do_wrap(_Tp&& __x)
-      { return static_cast<_Tp&&>(__x); }
-    };
-
-  /**
-   *  Maps member pointers into instances of _Mem_fn but leaves all
-   *  other function objects untouched. Used by std::bind(). This
-   *  partial specialization handles the member pointer case.
-   */
-  template<typename _Tp, typename _Class>
-    struct _Maybe_wrap_member_pointer<_Tp _Class::*>
-    {
-      typedef _Mem_fn<_Tp _Class::*> type;
-
-      static type
-      __do_wrap(_Tp _Class::* __pm)
-      { return type(__pm); }
-    };
-
-  // Specialization needed to prevent "forming reference to void" errors when
-  // bind<void>() is called, because argument deduction instantiates
-  // _Maybe_wrap_member_pointer<void> outside the immediate context where
-  // SFINAE applies.
-  template<>
-    struct _Maybe_wrap_member_pointer<void>
-    {
-      typedef void type;
-    };
-
-  // std::get<I> for volatile-qualified tuples
-  template<std::size_t _Ind, typename... _Tp>
-    inline auto
-    __volget(volatile tuple<_Tp...>& __tuple)
-    -> __tuple_element_t<_Ind, tuple<_Tp...>> volatile&
-    { return std::get<_Ind>(const_cast<tuple<_Tp...>&>(__tuple)); }
-
-  // std::get<I> for const-volatile-qualified tuples
-  template<std::size_t _Ind, typename... _Tp>
-    inline auto
-    __volget(const volatile tuple<_Tp...>& __tuple)
-    -> __tuple_element_t<_Ind, tuple<_Tp...>> const volatile&
-    { return std::get<_Ind>(const_cast<const tuple<_Tp...>&>(__tuple)); }
-
-  /// Type of the function object returned from bind().
-  template<typename _Signature>
-    struct _Bind;
-
-   template<typename _Functor, typename... _Bound_args>
-    class _Bind<_Functor(_Bound_args...)>
-    : public _Weak_result_type<_Functor>
-    {
-      typedef _Bind __self_type;
-      typedef typename _Build_index_tuple<sizeof...(_Bound_args)>::__type
-	_Bound_indexes;
-
-      _Functor _M_f;
-      tuple<_Bound_args...> _M_bound_args;
-
-      // Call unqualified
-      template<typename _Result, typename... _Args, std::size_t... _Indexes>
-	_Result
-	__call(tuple<_Args...>&& __args, _Index_tuple<_Indexes...>)
-	{
-	  return _M_f(_Mu<_Bound_args>()
-		      (std::get<_Indexes>(_M_bound_args), __args)...);
-	}
-
-      // Call as const
-      template<typename _Result, typename... _Args, std::size_t... _Indexes>
-	_Result
-	__call_c(tuple<_Args...>&& __args, _Index_tuple<_Indexes...>) const
-	{
-	  return _M_f(_Mu<_Bound_args>()
-		      (std::get<_Indexes>(_M_bound_args), __args)...);
-	}
-
-      // Call as volatile
-      template<typename _Result, typename... _Args, std::size_t... _Indexes>
-	_Result
-	__call_v(tuple<_Args...>&& __args,
-		 _Index_tuple<_Indexes...>) volatile
-	{
-	  return _M_f(_Mu<_Bound_args>()
-		      (__volget<_Indexes>(_M_bound_args), __args)...);
-	}
-
-      // Call as const volatile
-      template<typename _Result, typename... _Args, std::size_t... _Indexes>
-	_Result
-	__call_c_v(tuple<_Args...>&& __args,
-		   _Index_tuple<_Indexes...>) const volatile
-	{
-	  return _M_f(_Mu<_Bound_args>()
-		      (__volget<_Indexes>(_M_bound_args), __args)...);
-	}
-
-     public:
-      template<typename... _Args>
-	explicit _Bind(const _Functor& __f, _Args&&... __args)
-	: _M_f(__f), _M_bound_args(std::forward<_Args>(__args)...)
-	{ }
-
-      template<typename... _Args>
-	explicit _Bind(_Functor&& __f, _Args&&... __args)
-	: _M_f(std::move(__f)), _M_bound_args(std::forward<_Args>(__args)...)
-	{ }
-
-      _Bind(const _Bind&) = default;
-
-      _Bind(_Bind&& __b)
-      : _M_f(std::move(__b._M_f)), _M_bound_args(std::move(__b._M_bound_args))
-      { }
-
-      // Call unqualified
-      template<typename... _Args, typename _Result
-	= decltype( std::declval<_Functor&>()(
-	      _Mu<_Bound_args>()( std::declval<_Bound_args&>(),
-				  std::declval<tuple<_Args...>&>() )... ) )>
-	_Result
-	operator()(_Args&&... __args)
-	{
-	  return this->__call<_Result>(
-	      std::forward_as_tuple(std::forward<_Args>(__args)...),
-	      _Bound_indexes());
-	}
-
-      // Call as const
-      template<typename... _Args, typename _Result
-	= decltype( std::declval<typename enable_if<(sizeof...(_Args) >= 0),
-		       typename add_const<_Functor>::type&>::type>()(
-	      _Mu<_Bound_args>()( std::declval<const _Bound_args&>(),
-				  std::declval<tuple<_Args...>&>() )... ) )>
-	_Result
-	operator()(_Args&&... __args) const
-	{
-	  return this->__call_c<_Result>(
-	      std::forward_as_tuple(std::forward<_Args>(__args)...),
-	      _Bound_indexes());
-	}
-
-      // Call as volatile
-      template<typename... _Args, typename _Result
-	= decltype( std::declval<typename enable_if<(sizeof...(_Args) >= 0),
-                       typename add_volatile<_Functor>::type&>::type>()(
-	      _Mu<_Bound_args>()( std::declval<volatile _Bound_args&>(),
-				  std::declval<tuple<_Args...>&>() )... ) )>
-	_Result
-	operator()(_Args&&... __args) volatile
-	{
-	  return this->__call_v<_Result>(
-	      std::forward_as_tuple(std::forward<_Args>(__args)...),
-	      _Bound_indexes());
-	}
-
-      // Call as const volatile
-      template<typename... _Args, typename _Result
-	= decltype( std::declval<typename enable_if<(sizeof...(_Args) >= 0),
-                       typename add_cv<_Functor>::type&>::type>()(
-	      _Mu<_Bound_args>()( std::declval<const volatile _Bound_args&>(),
-				  std::declval<tuple<_Args...>&>() )... ) )>
-	_Result
-	operator()(_Args&&... __args) const volatile
-	{
-	  return this->__call_c_v<_Result>(
-	      std::forward_as_tuple(std::forward<_Args>(__args)...),
-	      _Bound_indexes());
-	}
-    };
-
-  /// Type of the function object returned from bind<R>().
-  template<typename _Result, typename _Signature>
-    struct _Bind_result;
-
-  template<typename _Result, typename _Functor, typename... _Bound_args>
-    class _Bind_result<_Result, _Functor(_Bound_args...)>
-    {
-      typedef _Bind_result __self_type;
-      typedef typename _Build_index_tuple<sizeof...(_Bound_args)>::__type
-	_Bound_indexes;
-
-      _Functor _M_f;
-      tuple<_Bound_args...> _M_bound_args;
-
-      // sfinae types
-      template<typename _Res>
-	struct __enable_if_void : enable_if<is_void<_Res>::value, int> { };
-      template<typename _Res>
-	struct __disable_if_void : enable_if<!is_void<_Res>::value, int> { };
-
-      // Call unqualified
-      template<typename _Res, typename... _Args, std::size_t... _Indexes>
-	_Result
-	__call(tuple<_Args...>&& __args, _Index_tuple<_Indexes...>,
-	    typename __disable_if_void<_Res>::type = 0)
-	{
-	  return _M_f(_Mu<_Bound_args>()
-		      (std::get<_Indexes>(_M_bound_args), __args)...);
-	}
-
-      // Call unqualified, return void
-      template<typename _Res, typename... _Args, std::size_t... _Indexes>
-	void
-	__call(tuple<_Args...>&& __args, _Index_tuple<_Indexes...>,
-	    typename __enable_if_void<_Res>::type = 0)
-	{
-	  _M_f(_Mu<_Bound_args>()
-	       (std::get<_Indexes>(_M_bound_args), __args)...);
-	}
-
-      // Call as const
-      template<typename _Res, typename... _Args, std::size_t... _Indexes>
-	_Result
-	__call(tuple<_Args...>&& __args, _Index_tuple<_Indexes...>,
-	    typename __disable_if_void<_Res>::type = 0) const
-	{
-	  return _M_f(_Mu<_Bound_args>()
-		      (std::get<_Indexes>(_M_bound_args), __args)...);
-	}
-
-      // Call as const, return void
-      template<typename _Res, typename... _Args, std::size_t... _Indexes>
-	void
-	__call(tuple<_Args...>&& __args, _Index_tuple<_Indexes...>,
-	    typename __enable_if_void<_Res>::type = 0) const
-	{
-	  _M_f(_Mu<_Bound_args>()
-	       (std::get<_Indexes>(_M_bound_args),  __args)...);
-	}
-
-      // Call as volatile
-      template<typename _Res, typename... _Args, std::size_t... _Indexes>
-	_Result
-	__call(tuple<_Args...>&& __args, _Index_tuple<_Indexes...>,
-	    typename __disable_if_void<_Res>::type = 0) volatile
-	{
-	  return _M_f(_Mu<_Bound_args>()
-		      (__volget<_Indexes>(_M_bound_args), __args)...);
-	}
-
-      // Call as volatile, return void
-      template<typename _Res, typename... _Args, std::size_t... _Indexes>
-	void
-	__call(tuple<_Args...>&& __args, _Index_tuple<_Indexes...>,
-	    typename __enable_if_void<_Res>::type = 0) volatile
-	{
-	  _M_f(_Mu<_Bound_args>()
-	       (__volget<_Indexes>(_M_bound_args), __args)...);
-	}
-
-      // Call as const volatile
-      template<typename _Res, typename... _Args, std::size_t... _Indexes>
-	_Result
-	__call(tuple<_Args...>&& __args, _Index_tuple<_Indexes...>,
-	    typename __disable_if_void<_Res>::type = 0) const volatile
-	{
-	  return _M_f(_Mu<_Bound_args>()
-		      (__volget<_Indexes>(_M_bound_args), __args)...);
-	}
-
-      // Call as const volatile, return void
-      template<typename _Res, typename... _Args, std::size_t... _Indexes>
-	void
-	__call(tuple<_Args...>&& __args,
-	       _Index_tuple<_Indexes...>,
-	    typename __enable_if_void<_Res>::type = 0) const volatile
-	{
-	  _M_f(_Mu<_Bound_args>()
-	       (__volget<_Indexes>(_M_bound_args), __args)...);
-	}
-
-    public:
-      typedef _Result result_type;
-
-      template<typename... _Args>
-	explicit _Bind_result(const _Functor& __f, _Args&&... __args)
-	: _M_f(__f), _M_bound_args(std::forward<_Args>(__args)...)
-	{ }
-
-      template<typename... _Args>
-	explicit _Bind_result(_Functor&& __f, _Args&&... __args)
-	: _M_f(std::move(__f)), _M_bound_args(std::forward<_Args>(__args)...)
-	{ }
-
-      _Bind_result(const _Bind_result&) = default;
-
-      _Bind_result(_Bind_result&& __b)
-      : _M_f(std::move(__b._M_f)), _M_bound_args(std::move(__b._M_bound_args))
-      { }
-
-      // Call unqualified
-      template<typename... _Args>
-	result_type
-	operator()(_Args&&... __args)
-	{
-	  return this->__call<_Result>(
-	      std::forward_as_tuple(std::forward<_Args>(__args)...),
-	      _Bound_indexes());
-	}
-
-      // Call as const
-      template<typename... _Args>
-	result_type
-	operator()(_Args&&... __args) const
-	{
-	  return this->__call<_Result>(
-	      std::forward_as_tuple(std::forward<_Args>(__args)...),
-	      _Bound_indexes());
-	}
-
-      // Call as volatile
-      template<typename... _Args>
-	result_type
-	operator()(_Args&&... __args) volatile
-	{
-	  return this->__call<_Result>(
-	      std::forward_as_tuple(std::forward<_Args>(__args)...),
-	      _Bound_indexes());
-	}
-
-      // Call as const volatile
-      template<typename... _Args>
-	result_type
-	operator()(_Args&&... __args) const volatile
-	{
-	  return this->__call<_Result>(
-	      std::forward_as_tuple(std::forward<_Args>(__args)...),
-	      _Bound_indexes());
-	}
-    };
-
-  /**
-   *  @brief Class template _Bind is always a bind expression.
-   *  @ingroup binders
-   */
-  template<typename _Signature>
-    struct is_bind_expression<_Bind<_Signature> >
-    : public true_type { };
-
-  /**
-   *  @brief Class template _Bind is always a bind expression.
-   *  @ingroup binders
-   */
-  template<typename _Signature>
-    struct is_bind_expression<const _Bind<_Signature> >
-    : public true_type { };
-
-  /**
-   *  @brief Class template _Bind is always a bind expression.
-   *  @ingroup binders
-   */
-  template<typename _Signature>
-    struct is_bind_expression<volatile _Bind<_Signature> >
-    : public true_type { };
-
-  /**
-   *  @brief Class template _Bind is always a bind expression.
-   *  @ingroup binders
-   */
-  template<typename _Signature>
-    struct is_bind_expression<const volatile _Bind<_Signature>>
-    : public true_type { };
-
-  /**
-   *  @brief Class template _Bind_result is always a bind expression.
-   *  @ingroup binders
-   */
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<_Bind_result<_Result, _Signature>>
-    : public true_type { };
-
-  /**
-   *  @brief Class template _Bind_result is always a bind expression.
-   *  @ingroup binders
-   */
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<const _Bind_result<_Result, _Signature>>
-    : public true_type { };
-
-  /**
-   *  @brief Class template _Bind_result is always a bind expression.
-   *  @ingroup binders
-   */
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<volatile _Bind_result<_Result, _Signature>>
-    : public true_type { };
-
-  /**
-   *  @brief Class template _Bind_result is always a bind expression.
-   *  @ingroup binders
-   */
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<const volatile _Bind_result<_Result, _Signature>>
-    : public true_type { };
-
-  template<typename _Func, typename... _BoundArgs>
-    struct _Bind_check_arity { };
-
-  template<typename _Ret, typename... _Args, typename... _BoundArgs>
-    struct _Bind_check_arity<_Ret (*)(_Args...), _BoundArgs...>
-    {
-      static_assert(sizeof...(_BoundArgs) == sizeof...(_Args),
-                   "Wrong number of arguments for function");
-    };
-
-  template<typename _Ret, typename... _Args, typename... _BoundArgs>
-    struct _Bind_check_arity<_Ret (*)(_Args......), _BoundArgs...>
-    {
-      static_assert(sizeof...(_BoundArgs) >= sizeof...(_Args),
-                   "Wrong number of arguments for function");
-    };
-
-  template<typename _Tp, typename _Class, typename... _BoundArgs>
-    struct _Bind_check_arity<_Tp _Class::*, _BoundArgs...>
-    {
-      using _Arity = typename _Mem_fn<_Tp _Class::*>::_Arity;
-      using _Varargs = typename _Mem_fn<_Tp _Class::*>::_Varargs;
-      static_assert(_Varargs::value
-		    ? sizeof...(_BoundArgs) >= _Arity::value + 1
-		    : sizeof...(_BoundArgs) == _Arity::value + 1,
-		    "Wrong number of arguments for pointer-to-member");
-    };
-
-  // Trait type used to remove std::bind() from overload set via SFINAE
-  // when first argument has integer type, so that std::bind() will
-  // not be a better match than ::bind() from the BSD Sockets API.
-  template<typename _Tp, typename _Tp2 = typename decay<_Tp>::type>
-    using __is_socketlike = __or_<is_integral<_Tp2>, is_enum<_Tp2>>;
-
-  template<bool _SocketLike, typename _Func, typename... _BoundArgs>
-    struct _Bind_helper
-    : _Bind_check_arity<typename decay<_Func>::type, _BoundArgs...>
-    {
-      typedef _Maybe_wrap_member_pointer<typename decay<_Func>::type>
-	__maybe_type;
-      typedef typename __maybe_type::type __func_type;
-      typedef _Bind<__func_type(typename decay<_BoundArgs>::type...)> type;
-    };
-
-  // Partial specialization for is_socketlike == true, does not define
-  // nested type so std::bind() will not participate in overload resolution
-  // when the first argument might be a socket file descriptor.
-  template<typename _Func, typename... _BoundArgs>
-    struct _Bind_helper<true, _Func, _BoundArgs...>
-    { };
-
-  /**
-   *  @brief Function template for std::bind.
-   *  @ingroup binders
-   */
-  template<typename _Func, typename... _BoundArgs>
-    inline typename
-    _Bind_helper<__is_socketlike<_Func>::value, _Func, _BoundArgs...>::type
-    bind(_Func&& __f, _BoundArgs&&... __args)
-    {
-      typedef _Bind_helper<false, _Func, _BoundArgs...> __helper_type;
-      typedef typename __helper_type::__maybe_type __maybe_type;
-      typedef typename __helper_type::type __result_type;
-      return __result_type(__maybe_type::__do_wrap(std::forward<_Func>(__f)),
-			   std::forward<_BoundArgs>(__args)...);
-    }
-
-  template<typename _Result, typename _Func, typename... _BoundArgs>
-    struct _Bindres_helper
-    : _Bind_check_arity<typename decay<_Func>::type, _BoundArgs...>
-    {
-      typedef _Maybe_wrap_member_pointer<typename decay<_Func>::type>
-	__maybe_type;
-      typedef typename __maybe_type::type __functor_type;
-      typedef _Bind_result<_Result,
-			   __functor_type(typename decay<_BoundArgs>::type...)>
-	type;
-    };
-
-  /**
-   *  @brief Function template for std::bind<R>.
-   *  @ingroup binders
-   */
-  template<typename _Result, typename _Func, typename... _BoundArgs>
-    inline
-    typename _Bindres_helper<_Result, _Func, _BoundArgs...>::type
-    bind(_Func&& __f, _BoundArgs&&... __args)
-    {
-      typedef _Bindres_helper<_Result, _Func, _BoundArgs...> __helper_type;
-      typedef typename __helper_type::__maybe_type __maybe_type;
-      typedef typename __helper_type::type __result_type;
-      return __result_type(__maybe_type::__do_wrap(std::forward<_Func>(__f)),
-			   std::forward<_BoundArgs>(__args)...);
-    }
-
-  template<typename _Signature>
-    struct _Bind_simple;
-
-  template<typename _Callable, typename... _Args>
-    struct _Bind_simple<_Callable(_Args...)>
-    {
-      typedef typename result_of<_Callable(_Args...)>::type result_type;
-
-      template<typename _Tp, typename... _Up>
-        explicit
-        _Bind_simple(_Tp&& __f, _Up&&... __args)
-        : _M_bound(std::forward<_Tp>(__f), std::forward<_Up>(__args)...)
-        { }
-
-      _Bind_simple(const _Bind_simple&) = default;
-      _Bind_simple(_Bind_simple&&) = default;
-
-      result_type
-      operator()()
-      {
-        typedef typename _Build_index_tuple<sizeof...(_Args)>::__type _Indices;
-        return _M_invoke(_Indices());
-      }
-
-    private:
-      template<std::size_t... _Indices>
-        typename result_of<_Callable(_Args...)>::type
-        _M_invoke(_Index_tuple<_Indices...>)
-        {
-	  // std::bind always forwards bound arguments as lvalues,
-	  // but this type can call functions which only accept rvalues.
-          return std::forward<_Callable>(std::get<0>(_M_bound))(
-              std::forward<_Args>(std::get<_Indices+1>(_M_bound))...);
-        }
-
-      std::tuple<_Callable, _Args...> _M_bound;
-    };
-
-  template<typename _Func, typename... _BoundArgs>
-    struct _Bind_simple_helper
-    : _Bind_check_arity<typename decay<_Func>::type, _BoundArgs...>
-    {
-      typedef _Maybe_wrap_member_pointer<typename decay<_Func>::type>
-        __maybe_type;
-      typedef typename __maybe_type::type __func_type;
-      typedef _Bind_simple<__func_type(typename decay<_BoundArgs>::type...)>
-       	__type;
-    };
-
-  // Simplified version of std::bind for internal use, without support for
-  // unbound arguments, placeholders or nested bind expressions.
-  template<typename _Callable, typename... _Args>
-    typename _Bind_simple_helper<_Callable, _Args...>::__type
-    __bind_simple(_Callable&& __callable, _Args&&... __args)
-    {
-      typedef _Bind_simple_helper<_Callable, _Args...> __helper_type;
-      typedef typename __helper_type::__maybe_type __maybe_type;
-      typedef typename __helper_type::__type __result_type;
-      return __result_type(
-          __maybe_type::__do_wrap( std::forward<_Callable>(__callable)),
-          std::forward<_Args>(__args)...);
-    }
-
-  /**
-   *  @brief Exception class thrown when class template function's
-   *  operator() is called with an empty target.
-   *  @ingroup exceptions
-   */
-  class bad_function_call : public std::exception
-  {
-  public:
-    virtual ~bad_function_call() noexcept;
-
-    const char* what() const noexcept;
-  };
-
-  /**
-   *  Trait identifying "location-invariant" types, meaning that the
-   *  address of the object (or any of its members) will not escape.
-   *  Trivially copyable types are location-invariant and users can
-   *  specialize this trait for other types.
-   */
-  template<typename _Tp>
-    struct __is_location_invariant
-    : is_trivially_copyable<_Tp>::type
-    { };
-
-  class _Undefined_class;
-
-  union _Nocopy_types
-  {
-    void*       _M_object;
-    const void* _M_const_object;
-    void (*_M_function_pointer)();
-    void (_Undefined_class::*_M_member_pointer)();
-  };
-
-  union _Any_data
-  {
-    void*       _M_access()       { return &_M_pod_data[0]; }
-    const void* _M_access() const { return &_M_pod_data[0]; }
-
-    template<typename _Tp>
-      _Tp&
-      _M_access()
-      { return *static_cast<_Tp*>(_M_access()); }
-
-    template<typename _Tp>
-      const _Tp&
-      _M_access() const
-      { return *static_cast<const _Tp*>(_M_access()); }
-
-    _Nocopy_types _M_unused;
-    char _M_pod_data[sizeof(_Nocopy_types)];
-  };
-
-  enum _Manager_operation
-  {
-    __get_type_info,
-    __get_functor_ptr,
-    __clone_functor,
-    __destroy_functor
-  };
-
-  // Simple type wrapper that helps avoid annoying const problems
-  // when casting between void pointers and pointers-to-pointers.
-  template<typename _Tp>
-    struct _Simple_type_wrapper
-    {
-      _Simple_type_wrapper(_Tp __value) : __value(__value) { }
-
-      _Tp __value;
-    };
-
-  template<typename _Tp>
-    struct __is_location_invariant<_Simple_type_wrapper<_Tp> >
-    : __is_location_invariant<_Tp>
-    { };
-
-  // Converts a reference to a function object into a callable
-  // function object.
-  template<typename _Functor>
-    inline _Functor&
-    __callable_functor(_Functor& __f)
-    { return __f; }
-
-  template<typename _Member, typename _Class>
-    inline _Mem_fn<_Member _Class::*>
-    __callable_functor(_Member _Class::* &__p)
-    { return std::mem_fn(__p); }
-
-  template<typename _Member, typename _Class>
-    inline _Mem_fn<_Member _Class::*>
-    __callable_functor(_Member _Class::* const &__p)
-    { return std::mem_fn(__p); }
-
-  template<typename _Member, typename _Class>
-    inline _Mem_fn<_Member _Class::*>
-    __callable_functor(_Member _Class::* volatile &__p)
-    { return std::mem_fn(__p); }
-
-  template<typename _Member, typename _Class>
-    inline _Mem_fn<_Member _Class::*>
-    __callable_functor(_Member _Class::* const volatile &__p)
-    { return std::mem_fn(__p); }
-
-  template<typename _Signature>
-    class function;
-
-  /// Base class of all polymorphic function object wrappers.
-  class _Function_base
-  {
-  public:
-    static const std::size_t _M_max_size = sizeof(_Nocopy_types);
-    static const std::size_t _M_max_align = __alignof__(_Nocopy_types);
-
-    template<typename _Functor>
-      class _Base_manager
-      {
-      protected:
-	static const bool __stored_locally =
-	(__is_location_invariant<_Functor>::value
-	 && sizeof(_Functor) <= _M_max_size
-	 && __alignof__(_Functor) <= _M_max_align
-	 && (_M_max_align % __alignof__(_Functor) == 0));
-
-	typedef integral_constant<bool, __stored_locally> _Local_storage;
-
-	// Retrieve a pointer to the function object
-	static _Functor*
-	_M_get_pointer(const _Any_data& __source)
-	{
-	  const _Functor* __ptr =
-	    __stored_locally? std::__addressof(__source._M_access<_Functor>())
-	    /* have stored a pointer */ : __source._M_access<_Functor*>();
-	  return const_cast<_Functor*>(__ptr);
-	}
-
-	// Clone a location-invariant function object that fits within
-	// an _Any_data structure.
-	static void
-	_M_clone(_Any_data& __dest, const _Any_data& __source, true_type)
-	{
-	  new (__dest._M_access()) _Functor(__source._M_access<_Functor>());
-	}
-
-	// Clone a function object that is not location-invariant or
-	// that cannot fit into an _Any_data structure.
-	static void
-	_M_clone(_Any_data& __dest, const _Any_data& __source, false_type)
-	{
-	  __dest._M_access<_Functor*>() =
-	    new _Functor(*__source._M_access<_Functor*>());
-	}
-
-	// Destroying a location-invariant object may still require
-	// destruction.
-	static void
-	_M_destroy(_Any_data& __victim, true_type)
-	{
-	  __victim._M_access<_Functor>().~_Functor();
-	}
-
-	// Destroying an object located on the heap.
-	static void
-	_M_destroy(_Any_data& __victim, false_type)
-	{
-	  delete __victim._M_access<_Functor*>();
-	}
-
-      public:
-	static bool
-	_M_manager(_Any_data& __dest, const _Any_data& __source,
-		   _Manager_operation __op)
-	{
-	  switch (__op)
-	    {
-#if __cpp_rtti
-	    case __get_type_info:
-	      __dest._M_access<const type_info*>() = &typeid(_Functor);
-	      break;
-#endif
-	    case __get_functor_ptr:
-	      __dest._M_access<_Functor*>() = _M_get_pointer(__source);
-	      break;
-
-	    case __clone_functor:
-	      _M_clone(__dest, __source, _Local_storage());
-	      break;
-
-	    case __destroy_functor:
-	      _M_destroy(__dest, _Local_storage());
-	      break;
-	    }
-	  return false;
-	}
-
-	static void
-	_M_init_functor(_Any_data& __functor, _Functor&& __f)
-	{ _M_init_functor(__functor, std::move(__f), _Local_storage()); }
-
-	template<typename _Signature>
-	  static bool
-	  _M_not_empty_function(const function<_Signature>& __f)
-	  { return static_cast<bool>(__f); }
-
-	template<typename _Tp>
-	  static bool
-	  _M_not_empty_function(_Tp* const& __fp)
-	  { return __fp; }
-
-	template<typename _Class, typename _Tp>
-	  static bool
-	  _M_not_empty_function(_Tp _Class::* const& __mp)
-	  { return __mp; }
-
-	template<typename _Tp>
-	  static bool
-	  _M_not_empty_function(const _Tp&)
-	  { return true; }
-
-      private:
-	static void
-	_M_init_functor(_Any_data& __functor, _Functor&& __f, true_type)
-	{ new (__functor._M_access()) _Functor(std::move(__f)); }
-
-	static void
-	_M_init_functor(_Any_data& __functor, _Functor&& __f, false_type)
-	{ __functor._M_access<_Functor*>() = new _Functor(std::move(__f)); }
-      };
-
-    template<typename _Functor>
-      class _Ref_manager : public _Base_manager<_Functor*>
-      {
-	typedef _Function_base::_Base_manager<_Functor*> _Base;
-
-      public:
-	static bool
-	_M_manager(_Any_data& __dest, const _Any_data& __source,
-		   _Manager_operation __op)
-	{
-	  switch (__op)
-	    {
-#if __cpp_rtti
-	    case __get_type_info:
-	      __dest._M_access<const type_info*>() = &typeid(_Functor);
-	      break;
-#endif
-	    case __get_functor_ptr:
-	      __dest._M_access<_Functor*>() = *_Base::_M_get_pointer(__source);
-	      return is_const<_Functor>::value;
-	      break;
-
-	    default:
-	      _Base::_M_manager(__dest, __source, __op);
-	    }
-	  return false;
-	}
-
-	static void
-	_M_init_functor(_Any_data& __functor, reference_wrapper<_Functor> __f)
-	{
-	  _Base::_M_init_functor(__functor, std::__addressof(__f.get()));
-	}
-      };
-
-    _Function_base() : _M_manager(nullptr) { }
-
-    ~_Function_base()
-    {
-      if (_M_manager)
-	_M_manager(_M_functor, _M_functor, __destroy_functor);
-    }
-
-
-    bool _M_empty() const { return !_M_manager; }
-
-    typedef bool (*_Manager_type)(_Any_data&, const _Any_data&,
-				  _Manager_operation);
-
-    _Any_data     _M_functor;
-    _Manager_type _M_manager;
-  };
-
-  template<typename _Signature, typename _Functor>
-    class _Function_handler;
-
-  template<typename _Res, typename _Functor, typename... _ArgTypes>
-    class _Function_handler<_Res(_ArgTypes...), _Functor>
-    : public _Function_base::_Base_manager<_Functor>
-    {
-      typedef _Function_base::_Base_manager<_Functor> _Base;
-
-    public:
-      static _Res
-      _M_invoke(const _Any_data& __functor, _ArgTypes&&... __args)
-      {
-	return (*_Base::_M_get_pointer(__functor))(
-	    std::forward<_ArgTypes>(__args)...);
-      }
-    };
-
-  template<typename _Functor, typename... _ArgTypes>
-    class _Function_handler<void(_ArgTypes...), _Functor>
-    : public _Function_base::_Base_manager<_Functor>
-    {
-      typedef _Function_base::_Base_manager<_Functor> _Base;
-
-     public:
-      static void
-      _M_invoke(const _Any_data& __functor, _ArgTypes&&... __args)
-      {
-	(*_Base::_M_get_pointer(__functor))(
-	    std::forward<_ArgTypes>(__args)...);
-      }
-    };
-
-  template<typename _Res, typename _Functor, typename... _ArgTypes>
-    class _Function_handler<_Res(_ArgTypes...), reference_wrapper<_Functor> >
-    : public _Function_base::_Ref_manager<_Functor>
-    {
-      typedef _Function_base::_Ref_manager<_Functor> _Base;
-
-     public:
-      static _Res
-      _M_invoke(const _Any_data& __functor, _ArgTypes&&... __args)
-      {
-	return std::__callable_functor(**_Base::_M_get_pointer(__functor))(
-	      std::forward<_ArgTypes>(__args)...);
-      }
-    };
-
-  template<typename _Functor, typename... _ArgTypes>
-    class _Function_handler<void(_ArgTypes...), reference_wrapper<_Functor> >
-    : public _Function_base::_Ref_manager<_Functor>
-    {
-      typedef _Function_base::_Ref_manager<_Functor> _Base;
-
-     public:
-      static void
-      _M_invoke(const _Any_data& __functor, _ArgTypes&&... __args)
-      {
-	std::__callable_functor(**_Base::_M_get_pointer(__functor))(
-	    std::forward<_ArgTypes>(__args)...);
-      }
-    };
-
-  template<typename _Class, typename _Member, typename _Res,
-	   typename... _ArgTypes>
-    class _Function_handler<_Res(_ArgTypes...), _Member _Class::*>
-    : public _Function_handler<void(_ArgTypes...), _Member _Class::*>
-    {
-      typedef _Function_handler<void(_ArgTypes...), _Member _Class::*>
-	_Base;
-
-     public:
-      static _Res
-      _M_invoke(const _Any_data& __functor, _ArgTypes&&... __args)
-      {
-	return std::mem_fn(_Base::_M_get_pointer(__functor)->__value)(
-	    std::forward<_ArgTypes>(__args)...);
-      }
-    };
-
-  template<typename _Class, typename _Member, typename... _ArgTypes>
-    class _Function_handler<void(_ArgTypes...), _Member _Class::*>
-    : public _Function_base::_Base_manager<
-		 _Simple_type_wrapper< _Member _Class::* > >
-    {
-      typedef _Member _Class::* _Functor;
-      typedef _Simple_type_wrapper<_Functor> _Wrapper;
-      typedef _Function_base::_Base_manager<_Wrapper> _Base;
-
-    public:
-      static bool
-      _M_manager(_Any_data& __dest, const _Any_data& __source,
-		 _Manager_operation __op)
-      {
-	switch (__op)
-	  {
-#if __cpp_rtti
-	  case __get_type_info:
-	    __dest._M_access<const type_info*>() = &typeid(_Functor);
-	    break;
-#endif
-	  case __get_functor_ptr:
-	    __dest._M_access<_Functor*>() =
-	      &_Base::_M_get_pointer(__source)->__value;
-	    break;
-
-	  default:
-	    _Base::_M_manager(__dest, __source, __op);
-	  }
-	return false;
-      }
-
-      static void
-      _M_invoke(const _Any_data& __functor, _ArgTypes&&... __args)
-      {
-	std::mem_fn(_Base::_M_get_pointer(__functor)->__value)(
-	    std::forward<_ArgTypes>(__args)...);
-      }
-    };
-
-  template<typename _From, typename _To>
-    using __check_func_return_type
-      = __or_<is_void<_To>, is_convertible<_From, _To>>;
-
-  /**
-   *  @brief Primary class template for std::function.
-   *  @ingroup functors
-   *
-   *  Polymorphic function wrapper.
-   */
-  template<typename _Res, typename... _ArgTypes>
-    class function<_Res(_ArgTypes...)>
-    : public _Maybe_unary_or_binary_function<_Res, _ArgTypes...>,
-      private _Function_base
-    {
-      typedef _Res _Signature_type(_ArgTypes...);
-
-      template<typename _Func,
-	       typename _Res2 = typename result_of<_Func(_ArgTypes...)>::type>
-	struct _Callable : __check_func_return_type<_Res2, _Res> { };
-
-      // Used so the return type convertibility checks aren't done when
-      // performing overload resolution for copy construction/assignment.
-      template<typename _Tp>
-	struct _Callable<function, _Tp> : false_type { };
-
-      template<typename _Cond, typename _Tp>
-	using _Requires = typename enable_if<_Cond::value, _Tp>::type;
-
-    public:
-      typedef _Res result_type;
-
-      // [3.7.2.1] construct/copy/destroy
-
-      /**
-       *  @brief Default construct creates an empty function call wrapper.
-       *  @post @c !(bool)*this
-       */
-      function() noexcept
-      : _Function_base() { }
-
-      /**
-       *  @brief Creates an empty function call wrapper.
-       *  @post @c !(bool)*this
-       */
-      function(nullptr_t) noexcept
-      : _Function_base() { }
-
-      /**
-       *  @brief %Function copy constructor.
-       *  @param __x A %function object with identical call signature.
-       *  @post @c bool(*this) == bool(__x)
-       *
-       *  The newly-created %function contains a copy of the target of @a
-       *  __x (if it has one).
-       */
-      function(const function& __x);
-
-      /**
-       *  @brief %Function move constructor.
-       *  @param __x A %function object rvalue with identical call signature.
-       *
-       *  The newly-created %function contains the target of @a __x
-       *  (if it has one).
-       */
-      function(function&& __x) : _Function_base()
-      {
-	__x.swap(*this);
-      }
-
-      // TODO: needs allocator_arg_t
-
-      /**
-       *  @brief Builds a %function that targets a copy of the incoming
-       *  function object.
-       *  @param __f A %function object that is callable with parameters of
-       *  type @c T1, @c T2, ..., @c TN and returns a value convertible
-       *  to @c Res.
-       *
-       *  The newly-created %function object will target a copy of 
-       *  @a __f. If @a __f is @c reference_wrapper<F>, then this function
-       *  object will contain a reference to the function object @c
-       *  __f.get(). If @a __f is a NULL function pointer or NULL
-       *  pointer-to-member, the newly-created object will be empty.
-       *
-       *  If @a __f is a non-NULL function pointer or an object of type @c
-       *  reference_wrapper<F>, this function will not throw.
-       */
-      template<typename _Functor,
-	       typename = _Requires<__not_<is_same<_Functor, function>>, void>,
-	       typename = _Requires<_Callable<_Functor>, void>>
-	function(_Functor);
-
-      /**
-       *  @brief %Function assignment operator.
-       *  @param __x A %function with identical call signature.
-       *  @post @c (bool)*this == (bool)x
-       *  @returns @c *this
-       *
-       *  The target of @a __x is copied to @c *this. If @a __x has no
-       *  target, then @c *this will be empty.
-       *
-       *  If @a __x targets a function pointer or a reference to a function
-       *  object, then this operation will not throw an %exception.
-       */
-      function&
-      operator=(const function& __x)
-      {
-	function(__x).swap(*this);
-	return *this;
-      }
-
-      /**
-       *  @brief %Function move-assignment operator.
-       *  @param __x A %function rvalue with identical call signature.
-       *  @returns @c *this
-       *
-       *  The target of @a __x is moved to @c *this. If @a __x has no
-       *  target, then @c *this will be empty.
-       *
-       *  If @a __x targets a function pointer or a reference to a function
-       *  object, then this operation will not throw an %exception.
-       */
-      function&
-      operator=(function&& __x)
-      {
-	function(std::move(__x)).swap(*this);
-	return *this;
-      }
-
-      /**
-       *  @brief %Function assignment to zero.
-       *  @post @c !(bool)*this
-       *  @returns @c *this
-       *
-       *  The target of @c *this is deallocated, leaving it empty.
-       */
-      function&
-      operator=(nullptr_t) noexcept
-      {
-	if (_M_manager)
-	  {
-	    _M_manager(_M_functor, _M_functor, __destroy_functor);
-	    _M_manager = nullptr;
-	    _M_invoker = nullptr;
-	  }
-	return *this;
-      }
-
-      /**
-       *  @brief %Function assignment to a new target.
-       *  @param __f A %function object that is callable with parameters of
-       *  type @c T1, @c T2, ..., @c TN and returns a value convertible
-       *  to @c Res.
-       *  @return @c *this
-       *
-       *  This  %function object wrapper will target a copy of @a
-       *  __f. If @a __f is @c reference_wrapper<F>, then this function
-       *  object will contain a reference to the function object @c
-       *  __f.get(). If @a __f is a NULL function pointer or NULL
-       *  pointer-to-member, @c this object will be empty.
-       *
-       *  If @a __f is a non-NULL function pointer or an object of type @c
-       *  reference_wrapper<F>, this function will not throw.
-       */
-      template<typename _Functor>
-	_Requires<_Callable<typename decay<_Functor>::type>, function&>
-	operator=(_Functor&& __f)
-	{
-	  function(std::forward<_Functor>(__f)).swap(*this);
-	  return *this;
-	}
-
-      /// @overload
-      template<typename _Functor>
-	function&
-	operator=(reference_wrapper<_Functor> __f) noexcept
-	{
-	  function(__f).swap(*this);
-	  return *this;
-	}
-
-      // [3.7.2.2] function modifiers
-
-      /**
-       *  @brief Swap the targets of two %function objects.
-       *  @param __x A %function with identical call signature.
-       *
-       *  Swap the targets of @c this function object and @a __f. This
-       *  function will not throw an %exception.
-       */
-      void swap(function& __x)
-      {
-	std::swap(_M_functor, __x._M_functor);
-	std::swap(_M_manager, __x._M_manager);
-	std::swap(_M_invoker, __x._M_invoker);
-      }
-
-      // TODO: needs allocator_arg_t
-      /*
-      template<typename _Functor, typename _Alloc>
-	void
-	assign(_Functor&& __f, const _Alloc& __a)
-	{
-	  function(allocator_arg, __a,
-		   std::forward<_Functor>(__f)).swap(*this);
-	}
-      */
-
-      // [3.7.2.3] function capacity
-
-      /**
-       *  @brief Determine if the %function wrapper has a target.
-       *
-       *  @return @c true when this %function object contains a target,
-       *  or @c false when it is empty.
-       *
-       *  This function will not throw an %exception.
-       */
-      explicit operator bool() const noexcept
-      { return !_M_empty(); }
-
-      // [3.7.2.4] function invocation
-
-      /**
-       *  @brief Invokes the function targeted by @c *this.
-       *  @returns the result of the target.
-       *  @throws bad_function_call when @c !(bool)*this
-       *
-       *  The function call operator invokes the target function object
-       *  stored by @c this.
-       */
-      _Res operator()(_ArgTypes... __args) const;
-
-#if __cpp_rtti
-      // [3.7.2.5] function target access
-      /**
-       *  @brief Determine the type of the target of this function object
-       *  wrapper.
-       *
-       *  @returns the type identifier of the target function object, or
-       *  @c typeid(void) if @c !(bool)*this.
-       *
-       *  This function will not throw an %exception.
-       */
-      const type_info& target_type() const noexcept;
-
-      /**
-       *  @brief Access the stored target function object.
-       *
-       *  @return Returns a pointer to the stored target function object,
-       *  if @c typeid(Functor).equals(target_type()); otherwise, a NULL
-       *  pointer.
-       *
-       * This function will not throw an %exception.
-       */
-      template<typename _Functor>       _Functor* target() noexcept;
-
-      /// @overload
-      template<typename _Functor> const _Functor* target() const noexcept;
-#endif
-
-    private:
-      using _Invoker_type = _Res (*)(const _Any_data&, _ArgTypes&&...);
-      _Invoker_type _M_invoker;
-  };
-
-  // Out-of-line member definitions.
-  template<typename _Res, typename... _ArgTypes>
-    function<_Res(_ArgTypes...)>::
-    function(const function& __x)
-    : _Function_base()
-    {
-      if (static_cast<bool>(__x))
-	{
-	  __x._M_manager(_M_functor, __x._M_functor, __clone_functor);
-	  _M_invoker = __x._M_invoker;
-	  _M_manager = __x._M_manager;
-	}
-    }
-
-  template<typename _Res, typename... _ArgTypes>
-    template<typename _Functor, typename, typename>
-      function<_Res(_ArgTypes...)>::
-      function(_Functor __f)
-      : _Function_base()
-      {
-	typedef _Function_handler<_Signature_type, _Functor> _My_handler;
-
-	if (_My_handler::_M_not_empty_function(__f))
-	  {
-	    _My_handler::_M_init_functor(_M_functor, std::move(__f));
-	    _M_invoker = &_My_handler::_M_invoke;
-	    _M_manager = &_My_handler::_M_manager;
-	  }
-      }
-
-  template<typename _Res, typename... _ArgTypes>
-    _Res
-    function<_Res(_ArgTypes...)>::
-    operator()(_ArgTypes... __args) const
-    {
-      if (_M_empty())
-	__throw_bad_function_call();
-      return _M_invoker(_M_functor, std::forward<_ArgTypes>(__args)...);
-    }
-
-#if __cpp_rtti
-  template<typename _Res, typename... _ArgTypes>
-    const type_info&
-    function<_Res(_ArgTypes...)>::
-    target_type() const noexcept
-    {
-      if (_M_manager)
-	{
-	  _Any_data __typeinfo_result;
-	  _M_manager(__typeinfo_result, _M_functor, __get_type_info);
-	  return *__typeinfo_result._M_access<const type_info*>();
-	}
-      else
-	return typeid(void);
-    }
-
-  template<typename _Res, typename... _ArgTypes>
-    template<typename _Functor>
-      _Functor*
-      function<_Res(_ArgTypes...)>::
-      target() noexcept
-      {
-	if (typeid(_Functor) == target_type() && _M_manager)
-	  {
-	    _Any_data __ptr;
-	    if (_M_manager(__ptr, _M_functor, __get_functor_ptr)
-		&& !is_const<_Functor>::value)
-	      return 0;
-	    else
-	      return __ptr._M_access<_Functor*>();
-	  }
-	else
-	  return 0;
-      }
-
-  template<typename _Res, typename... _ArgTypes>
-    template<typename _Functor>
-      const _Functor*
-      function<_Res(_ArgTypes...)>::
-      target() const noexcept
-      {
-	if (typeid(_Functor) == target_type() && _M_manager)
-	  {
-	    _Any_data __ptr;
-	    _M_manager(__ptr, _M_functor, __get_functor_ptr);
-	    return __ptr._M_access<const _Functor*>();
-	  }
-	else
-	  return 0;
-      }
-#endif
-
-  // [20.7.15.2.6] null pointer comparisons
-
-  /**
-   *  @brief Compares a polymorphic function object wrapper against 0
-   *  (the NULL pointer).
-   *  @returns @c true if the wrapper has no target, @c false otherwise
-   *
-   *  This function will not throw an %exception.
-   */
-  template<typename _Res, typename... _Args>
-    inline bool
-    operator==(const function<_Res(_Args...)>& __f, nullptr_t) noexcept
-    { return !static_cast<bool>(__f); }
-
-  /// @overload
-  template<typename _Res, typename... _Args>
-    inline bool
-    operator==(nullptr_t, const function<_Res(_Args...)>& __f) noexcept
-    { return !static_cast<bool>(__f); }
-
-  /**
-   *  @brief Compares a polymorphic function object wrapper against 0
-   *  (the NULL pointer).
-   *  @returns @c false if the wrapper has no target, @c true otherwise
-   *
-   *  This function will not throw an %exception.
-   */
-  template<typename _Res, typename... _Args>
-    inline bool
-    operator!=(const function<_Res(_Args...)>& __f, nullptr_t) noexcept
-    { return static_cast<bool>(__f); }
-
-  /// @overload
-  template<typename _Res, typename... _Args>
-    inline bool
-    operator!=(nullptr_t, const function<_Res(_Args...)>& __f) noexcept
-    { return static_cast<bool>(__f); }
-
-  // [20.7.15.2.7] specialized algorithms
-
-  /**
-   *  @brief Swap the targets of two polymorphic function object wrappers.
-   *
-   *  This function will not throw an %exception.
-   */
-  template<typename _Res, typename... _Args>
-    inline void
-    swap(function<_Res(_Args...)>& __x, function<_Res(_Args...)>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif // C++11
-
-#endif // _GLIBCXX_FUNCTIONAL
diff --git a/openflow/usr/include/c++/5/future b/openflow/usr/include/c++/5/future
deleted file mode 100644
index fc3f816..0000000
--- a/openflow/usr/include/c++/5/future
+++ /dev/null
@@ -1,1739 +0,0 @@
-// <future> -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/future
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_FUTURE
-#define _GLIBCXX_FUTURE 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <functional>
-#include <mutex>
-#include <thread>
-#include <condition_variable>
-#include <system_error>
-#include <atomic>
-#include <bits/atomic_futex.h>
-#include <bits/functexcept.h>
-#include <bits/unique_ptr.h>
-#include <bits/shared_ptr.h>
-#include <bits/uses_allocator.h>
-#include <bits/allocated_ptr.h>
-#include <ext/aligned_buffer.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup futures Futures
-   * @ingroup concurrency
-   *
-   * Classes for futures support.
-   * @{
-   */
-
-  /// Error code for futures
-  enum class future_errc
-  {
-    future_already_retrieved = 1,
-    promise_already_satisfied,
-    no_state,
-    broken_promise
-  };
-
-  /// Specialization.
-  template<>
-    struct is_error_code_enum<future_errc> : public true_type { };
-
-  /// Points to a statically-allocated object derived from error_category.
-  const error_category&
-  future_category() noexcept;
-
-  /// Overload for make_error_code.
-  inline error_code
-  make_error_code(future_errc __errc) noexcept
-  { return error_code(static_cast<int>(__errc), future_category()); }
-
-  /// Overload for make_error_condition.
-  inline error_condition
-  make_error_condition(future_errc __errc) noexcept
-  { return error_condition(static_cast<int>(__errc), future_category()); }
-
-  /**
-   *  @brief Exception type thrown by futures.
-   *  @ingroup exceptions
-   */
-  class future_error : public logic_error
-  {
-    error_code 			_M_code;
-
-  public:
-    explicit future_error(error_code __ec)
-    : logic_error("std::future_error: " + __ec.message()), _M_code(__ec)
-    { }
-
-    virtual ~future_error() noexcept;
-
-    virtual const char*
-    what() const noexcept;
-
-    const error_code&
-    code() const noexcept { return _M_code; }
-  };
-
-  // Forward declarations.
-  template<typename _Res>
-    class future;
-
-  template<typename _Res>
-    class shared_future;
-
-  template<typename _Signature>
-    class packaged_task;
-
-  template<typename _Res>
-    class promise;
-
-  /// Launch code for futures
-  enum class launch
-  {
-    async = 1,
-    deferred = 2
-  };
-
-  constexpr launch operator&(launch __x, launch __y)
-  {
-    return static_cast<launch>(
-	static_cast<int>(__x) & static_cast<int>(__y));
-  }
-
-  constexpr launch operator|(launch __x, launch __y)
-  {
-    return static_cast<launch>(
-	static_cast<int>(__x) | static_cast<int>(__y));
-  }
-
-  constexpr launch operator^(launch __x, launch __y)
-  {
-    return static_cast<launch>(
-	static_cast<int>(__x) ^ static_cast<int>(__y));
-  }
-
-  constexpr launch operator~(launch __x)
-  { return static_cast<launch>(~static_cast<int>(__x)); }
-
-  inline launch& operator&=(launch& __x, launch __y)
-  { return __x = __x & __y; }
-
-  inline launch& operator|=(launch& __x, launch __y)
-  { return __x = __x | __y; }
-
-  inline launch& operator^=(launch& __x, launch __y)
-  { return __x = __x ^ __y; }
-
-  /// Status code for futures
-  enum class future_status
-  {
-    ready,
-    timeout,
-    deferred
-  };
-
-  template<typename _Fn, typename... _Args>
-    future<typename result_of<_Fn(_Args...)>::type>
-    async(launch __policy, _Fn&& __fn, _Args&&... __args);
-
-  template<typename _Fn, typename... _Args>
-    future<typename result_of<_Fn(_Args...)>::type>
-    async(_Fn&& __fn, _Args&&... __args);
-
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \
-  && (ATOMIC_INT_LOCK_FREE > 1)
-
-  /// Base class and enclosing scope.
-  struct __future_base
-  {
-    /// Base class for results.
-    struct _Result_base
-    {
-      exception_ptr		_M_error;
-
-      _Result_base(const _Result_base&) = delete;
-      _Result_base& operator=(const _Result_base&) = delete;
-
-      // _M_destroy() allows derived classes to control deallocation
-      virtual void _M_destroy() = 0;
-
-      struct _Deleter
-      {
-	void operator()(_Result_base* __fr) const { __fr->_M_destroy(); }
-      };
-
-    protected:
-      _Result_base();
-      virtual ~_Result_base();
-    };
-
-    /// A unique_ptr for result objects.
-    template<typename _Res>
-      using _Ptr = unique_ptr<_Res, _Result_base::_Deleter>;
-
-    /// A result object that has storage for an object of type _Res.
-    template<typename _Res>
-      struct _Result : _Result_base
-      {
-      private:
-	__gnu_cxx::__aligned_buffer<_Res>	_M_storage;
-	bool 					_M_initialized;
-
-      public:
-	typedef _Res result_type;
-
-	_Result() noexcept : _M_initialized() { }
-	
-	~_Result()
-	{
-	  if (_M_initialized)
-	    _M_value().~_Res();
-	}
-
-	// Return lvalue, future will add const or rvalue-reference
-	_Res&
-	_M_value() noexcept { return *_M_storage._M_ptr(); }
-
-	void
-	_M_set(const _Res& __res)
-	{
-	  ::new (_M_storage._M_addr()) _Res(__res);
-	  _M_initialized = true;
-	}
-
-	void
-	_M_set(_Res&& __res)
-	{
-	  ::new (_M_storage._M_addr()) _Res(std::move(__res));
-	  _M_initialized = true;
-	}
-
-      private:
-	void _M_destroy() { delete this; }
-    };
-
-    /// A result object that uses an allocator.
-    template<typename _Res, typename _Alloc>
-      struct _Result_alloc final : _Result<_Res>, _Alloc
-      {
-	using __allocator_type = __alloc_rebind<_Alloc, _Result_alloc>;
-
-        explicit
-	_Result_alloc(const _Alloc& __a) : _Result<_Res>(), _Alloc(__a)
-	{ }
-	
-      private:
-	void _M_destroy()
-	{
-	  __allocator_type __a(*this);
-	  __allocated_ptr<__allocator_type> __guard_ptr{ __a, this };
-	  this->~_Result_alloc();
-	}
-      };
-
-    // Create a result object that uses an allocator.
-    template<typename _Res, typename _Allocator>
-      static _Ptr<_Result_alloc<_Res, _Allocator>>
-      _S_allocate_result(const _Allocator& __a)
-      {
-	using __result_type = _Result_alloc<_Res, _Allocator>;
-	typename __result_type::__allocator_type __a2(__a);
-	auto __guard = std::__allocate_guarded(__a2);
-	__result_type* __p = ::new((void*)__guard.get()) __result_type{__a};
-	__guard = nullptr;
-	return _Ptr<__result_type>(__p);
-      }
-
-    // Keep it simple for std::allocator.
-    template<typename _Res, typename _Tp>
-      static _Ptr<_Result<_Res>>
-      _S_allocate_result(const std::allocator<_Tp>& __a)
-      {
-	return _Ptr<_Result<_Res>>(new _Result<_Res>);
-      }
-
-    // Base class for various types of shared state created by an
-    // asynchronous provider (such as a std::promise) and shared with one
-    // or more associated futures.
-    class _State_baseV2
-    {
-      typedef _Ptr<_Result_base> _Ptr_type;
-
-      enum _Status : unsigned {
-	__not_ready,
-	__ready
-      };
-
-      _Ptr_type			_M_result;
-      __atomic_futex_unsigned<>	_M_status;
-      atomic_flag         	_M_retrieved = ATOMIC_FLAG_INIT;
-      once_flag			_M_once;
-
-    public:
-      _State_baseV2() noexcept : _M_result(), _M_status(_Status::__not_ready)
-	{ }
-      _State_baseV2(const _State_baseV2&) = delete;
-      _State_baseV2& operator=(const _State_baseV2&) = delete;
-      virtual ~_State_baseV2() = default;
-
-      _Result_base&
-      wait()
-      {
-	// Run any deferred function or join any asynchronous thread:
-	_M_complete_async();
-	// Acquire MO makes sure this synchronizes with the thread that made
-	// the future ready.
-	_M_status._M_load_when_equal(_Status::__ready, memory_order_acquire);
-	return *_M_result;
-      }
-
-      template<typename _Rep, typename _Period>
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel)
-        {
-	  // First, check if the future has been made ready.  Use acquire MO
-	  // to synchronize with the thread that made it ready.
-	  if (_M_status._M_load(memory_order_acquire) == _Status::__ready)
-	    return future_status::ready;
-	  if (_M_is_deferred_future())
-	    return future_status::deferred;
-	  if (_M_status._M_load_when_equal_for(_Status::__ready,
-	      memory_order_acquire, __rel))
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 2100.  timed waiting functions must also join
-	      // This call is a no-op by default except on an async future,
-	      // in which case the async thread is joined.  It's also not a
-	      // no-op for a deferred future, but such a future will never
-	      // reach this point because it returns future_status::deferred
-	      // instead of waiting for the future to become ready (see
-	      // above).  Async futures synchronize in this call, so we need
-	      // no further synchronization here.
-	      _M_complete_async();
-
-	      return future_status::ready;
-	    }
-	  return future_status::timeout;
-	}
-
-      template<typename _Clock, typename _Duration>
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs)
-        {
-	  // First, check if the future has been made ready.  Use acquire MO
-	  // to synchronize with the thread that made it ready.
-	  if (_M_status._M_load(memory_order_acquire) == _Status::__ready)
-	    return future_status::ready;
-	  if (_M_is_deferred_future())
-	    return future_status::deferred;
-	  if (_M_status._M_load_when_equal_until(_Status::__ready,
-	      memory_order_acquire, __abs))
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 2100.  timed waiting functions must also join
-	      // See wait_for(...) above.
-	      _M_complete_async();
-
-	      return future_status::ready;
-	    }
-	  return future_status::timeout;
-	}
-
-      // Provide a result to the shared state and make it ready.
-      // Calls at most once: _M_result = __res();
-      void
-      _M_set_result(function<_Ptr_type()> __res, bool __ignore_failure = false)
-      {
-	bool __did_set = false;
-        // all calls to this function are serialized,
-        // side-effects of invoking __res only happen once
-	call_once(_M_once, &_State_baseV2::_M_do_set, this,
-		  std::__addressof(__res), std::__addressof(__did_set));
-	if (__did_set)
-	  // Use release MO to synchronize with observers of the ready state.
-	  _M_status._M_store_notify_all(_Status::__ready,
-					memory_order_release);
-	else if (!__ignore_failure)
-          __throw_future_error(int(future_errc::promise_already_satisfied));
-      }
-
-      // Provide a result to the shared state but delay making it ready
-      // until the calling thread exits.
-      // Calls at most once: _M_result = __res();
-      void
-      _M_set_delayed_result(function<_Ptr_type()> __res,
-			    weak_ptr<_State_baseV2> __self)
-      {
-	bool __did_set = false;
-	unique_ptr<_Make_ready> __mr{new _Make_ready};
-        // all calls to this function are serialized,
-        // side-effects of invoking __res only happen once
-	call_once(_M_once, &_State_baseV2::_M_do_set, this,
-		  std::__addressof(__res), std::__addressof(__did_set));
-	if (!__did_set)
-          __throw_future_error(int(future_errc::promise_already_satisfied));
-	__mr->_M_shared_state = std::move(__self);
-	__mr->_M_set();
-	__mr.release();
-      }
-
-      // Abandon this shared state.
-      void
-      _M_break_promise(_Ptr_type __res)
-      {
-	if (static_cast<bool>(__res))
-	  {
-	    error_code __ec(make_error_code(future_errc::broken_promise));
-	    __res->_M_error = make_exception_ptr(future_error(__ec));
-	    // This function is only called when the last asynchronous result
-	    // provider is abandoning this shared state, so noone can be
-	    // trying to make the shared state ready at the same time, and
-	    // we can access _M_result directly instead of through call_once.
-	    _M_result.swap(__res);
-	    // Use release MO to synchronize with observers of the ready state.
-	    _M_status._M_store_notify_all(_Status::__ready,
-					  memory_order_release);
-	  }
-      }
-
-      // Called when this object is first passed to a future.
-      void
-      _M_set_retrieved_flag()
-      {
-	if (_M_retrieved.test_and_set())
-	  __throw_future_error(int(future_errc::future_already_retrieved));
-      }
-
-      template<typename _Res, typename _Arg>
-        struct _Setter;
-
-      // set lvalues
-      template<typename _Res, typename _Arg>
-        struct _Setter<_Res, _Arg&>
-        {
-          // check this is only used by promise<R>::set_value(const R&)
-          // or promise<R&>::set_value(R&)
-          static_assert(is_same<_Res, _Arg&>::value  // promise<R&>
-              || is_same<const _Res, _Arg>::value,   // promise<R>
-              "Invalid specialisation");
-
-	  // Used by std::promise to copy construct the result.
-          typename promise<_Res>::_Ptr_type operator()() const
-          {
-            _State_baseV2::_S_check(_M_promise->_M_future);
-            _M_promise->_M_storage->_M_set(*_M_arg);
-            return std::move(_M_promise->_M_storage);
-          }
-          promise<_Res>*    _M_promise;
-          _Arg*             _M_arg;
-        };
-
-      // set rvalues
-      template<typename _Res>
-        struct _Setter<_Res, _Res&&>
-        {
-	  // Used by std::promise to move construct the result.
-          typename promise<_Res>::_Ptr_type operator()() const
-          {
-            _State_baseV2::_S_check(_M_promise->_M_future);
-            _M_promise->_M_storage->_M_set(std::move(*_M_arg));
-            return std::move(_M_promise->_M_storage);
-          }
-          promise<_Res>*    _M_promise;
-          _Res*             _M_arg;
-        };
-
-      struct __exception_ptr_tag { };
-
-      // set exceptions
-      template<typename _Res>
-        struct _Setter<_Res, __exception_ptr_tag>
-        {
-	  // Used by std::promise to store an exception as the result.
-          typename promise<_Res>::_Ptr_type operator()() const
-          {
-            _State_baseV2::_S_check(_M_promise->_M_future);
-            _M_promise->_M_storage->_M_error = *_M_ex;
-            return std::move(_M_promise->_M_storage);
-          }
-
-          promise<_Res>*   _M_promise;
-          exception_ptr*    _M_ex;
-        };
-
-      template<typename _Res, typename _Arg>
-        static _Setter<_Res, _Arg&&>
-        __setter(promise<_Res>* __prom, _Arg&& __arg)
-        {
-          return _Setter<_Res, _Arg&&>{ __prom, &__arg };
-        }
-
-      template<typename _Res>
-        static _Setter<_Res, __exception_ptr_tag>
-        __setter(exception_ptr& __ex, promise<_Res>* __prom)
-        {
-          return _Setter<_Res, __exception_ptr_tag>{ __prom, &__ex };
-        }
-
-      template<typename _Tp>
-        static void
-        _S_check(const shared_ptr<_Tp>& __p)
-        {
-          if (!static_cast<bool>(__p))
-            __throw_future_error((int)future_errc::no_state);
-        }
-
-    private:
-      // The function invoked with std::call_once(_M_once, ...).
-      void
-      _M_do_set(function<_Ptr_type()>* __f, bool* __did_set)
-      {
-        _Ptr_type __res = (*__f)();
-        // Notify the caller that we did try to set; if we do not throw an
-        // exception, the caller will be aware that it did set (e.g., see
-        // _M_set_result).
-	*__did_set = true;
-        _M_result.swap(__res); // nothrow
-      }
-
-      // Wait for completion of async function.
-      virtual void _M_complete_async() { }
-
-      // Return true if state corresponds to a deferred function.
-      virtual bool _M_is_deferred_future() const { return false; }
-
-      struct _Make_ready final : __at_thread_exit_elt
-      {
-	weak_ptr<_State_baseV2> _M_shared_state;
-	static void _S_run(void*);
-	void _M_set();
-      };
-    };
-
-#ifdef _GLIBCXX_ASYNC_ABI_COMPAT
-    class _State_base;
-    class _Async_state_common;
-#else
-    using _State_base = _State_baseV2;
-    class _Async_state_commonV2;
-#endif
-
-    template<typename _BoundFn, typename = typename _BoundFn::result_type>
-      class _Deferred_state;
-
-    template<typename _BoundFn, typename = typename _BoundFn::result_type>
-      class _Async_state_impl;
-
-    template<typename _Signature>
-      class _Task_state_base;
-
-    template<typename _Fn, typename _Alloc, typename _Signature>
-      class _Task_state;
-
-    template<typename _BoundFn>
-      static std::shared_ptr<_State_base>
-      _S_make_deferred_state(_BoundFn&& __fn);
-
-    template<typename _BoundFn>
-      static std::shared_ptr<_State_base>
-      _S_make_async_state(_BoundFn&& __fn);
-
-    template<typename _Res_ptr, typename _Fn,
-	     typename _Res = typename _Res_ptr::element_type::result_type>
-      struct _Task_setter;
-
-    template<typename _Res_ptr, typename _BoundFn>
-      static _Task_setter<_Res_ptr, _BoundFn>
-      _S_task_setter(_Res_ptr& __ptr, _BoundFn& __call)
-      {
-	return { std::__addressof(__ptr), std::__addressof(__call) };
-      }
-  };
-
-  /// Partial specialization for reference types.
-  template<typename _Res>
-    struct __future_base::_Result<_Res&> : __future_base::_Result_base
-    {
-      typedef _Res& result_type;
-
-      _Result() noexcept : _M_value_ptr() { }
-
-      void
-      _M_set(_Res& __res) noexcept
-      { _M_value_ptr = std::addressof(__res); }
-
-      _Res& _M_get() noexcept { return *_M_value_ptr; }
-
-    private:
-      _Res* 			_M_value_ptr;
-
-      void _M_destroy() { delete this; }
-    };
-
-  /// Explicit specialization for void.
-  template<>
-    struct __future_base::_Result<void> : __future_base::_Result_base
-    {
-      typedef void result_type;
-
-    private:
-      void _M_destroy() { delete this; }
-    };
-
-#ifndef _GLIBCXX_ASYNC_ABI_COMPAT
-
-  // Allow _Setter objects to be stored locally in std::function
-  template<typename _Res, typename _Arg>
-    struct __is_location_invariant
-    <__future_base::_State_base::_Setter<_Res, _Arg>>
-    : true_type { };
-
-  // Allow _Task_setter objects to be stored locally in std::function
-  template<typename _Res_ptr, typename _Fn, typename _Res>
-    struct __is_location_invariant
-    <__future_base::_Task_setter<_Res_ptr, _Fn, _Res>>
-    : true_type { };
-
-  /// Common implementation for future and shared_future.
-  template<typename _Res>
-    class __basic_future : public __future_base
-    {
-    protected:
-      typedef shared_ptr<_State_base>		__state_type;
-      typedef __future_base::_Result<_Res>&	__result_type;
-
-    private:
-      __state_type 		_M_state;
-
-    public:
-      // Disable copying.
-      __basic_future(const __basic_future&) = delete;
-      __basic_future& operator=(const __basic_future&) = delete;
-
-      bool
-      valid() const noexcept { return static_cast<bool>(_M_state); }
-
-      void
-      wait() const
-      {
-        _State_base::_S_check(_M_state);
-        _M_state->wait();
-      }
-
-      template<typename _Rep, typename _Period>
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel) const
-        {
-          _State_base::_S_check(_M_state);
-          return _M_state->wait_for(__rel);
-        }
-
-      template<typename _Clock, typename _Duration>
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs) const
-        {
-          _State_base::_S_check(_M_state);
-          return _M_state->wait_until(__abs);
-        }
-
-    protected:
-      /// Wait for the state to be ready and rethrow any stored exception
-      __result_type
-      _M_get_result() const
-      {
-        _State_base::_S_check(_M_state);
-        _Result_base& __res = _M_state->wait();
-        if (!(__res._M_error == 0))
-          rethrow_exception(__res._M_error);
-        return static_cast<__result_type>(__res);
-      }
-
-      void _M_swap(__basic_future& __that) noexcept
-      {
-        _M_state.swap(__that._M_state);
-      }
-
-      // Construction of a future by promise::get_future()
-      explicit
-      __basic_future(const __state_type& __state) : _M_state(__state)
-      {
-        _State_base::_S_check(_M_state);
-        _M_state->_M_set_retrieved_flag();
-      }
-
-      // Copy construction from a shared_future
-      explicit
-      __basic_future(const shared_future<_Res>&) noexcept;
-
-      // Move construction from a shared_future
-      explicit
-      __basic_future(shared_future<_Res>&&) noexcept;
-
-      // Move construction from a future
-      explicit
-      __basic_future(future<_Res>&&) noexcept;
-
-      constexpr __basic_future() noexcept : _M_state() { }
-
-      struct _Reset
-      {
-        explicit _Reset(__basic_future& __fut) noexcept : _M_fut(__fut) { }
-        ~_Reset() { _M_fut._M_state.reset(); }
-        __basic_future& _M_fut;
-      };
-    };
-
-
-  /// Primary template for future.
-  template<typename _Res>
-    class future : public __basic_future<_Res>
-    {
-      friend class promise<_Res>;
-      template<typename> friend class packaged_task;
-      template<typename _Fn, typename... _Args>
-        friend future<typename result_of<_Fn(_Args...)>::type>
-        async(launch, _Fn&&, _Args&&...);
-
-      typedef __basic_future<_Res> _Base_type;
-      typedef typename _Base_type::__state_type __state_type;
-
-      explicit
-      future(const __state_type& __state) : _Base_type(__state) { }
-
-    public:
-      constexpr future() noexcept : _Base_type() { }
-
-      /// Move constructor
-      future(future&& __uf) noexcept : _Base_type(std::move(__uf)) { }
-
-      // Disable copying
-      future(const future&) = delete;
-      future& operator=(const future&) = delete;
-
-      future& operator=(future&& __fut) noexcept
-      {
-        future(std::move(__fut))._M_swap(*this);
-        return *this;
-      }
-
-      /// Retrieving the value
-      _Res
-      get()
-      {
-        typename _Base_type::_Reset __reset(*this);
-        return std::move(this->_M_get_result()._M_value());
-      }
-
-      shared_future<_Res> share();
-    };
-
-  /// Partial specialization for future<R&>
-  template<typename _Res>
-    class future<_Res&> : public __basic_future<_Res&>
-    {
-      friend class promise<_Res&>;
-      template<typename> friend class packaged_task;
-      template<typename _Fn, typename... _Args>
-        friend future<typename result_of<_Fn(_Args...)>::type>
-        async(launch, _Fn&&, _Args&&...);
-
-      typedef __basic_future<_Res&> _Base_type;
-      typedef typename _Base_type::__state_type __state_type;
-
-      explicit
-      future(const __state_type& __state) : _Base_type(__state) { }
-
-    public:
-      constexpr future() noexcept : _Base_type() { }
-
-      /// Move constructor
-      future(future&& __uf) noexcept : _Base_type(std::move(__uf)) { }
-
-      // Disable copying
-      future(const future&) = delete;
-      future& operator=(const future&) = delete;
-
-      future& operator=(future&& __fut) noexcept
-      {
-        future(std::move(__fut))._M_swap(*this);
-        return *this;
-      }
-
-      /// Retrieving the value
-      _Res&
-      get()
-      {
-        typename _Base_type::_Reset __reset(*this);
-        return this->_M_get_result()._M_get();
-      }
-
-      shared_future<_Res&> share();
-    };
-
-  /// Explicit specialization for future<void>
-  template<>
-    class future<void> : public __basic_future<void>
-    {
-      friend class promise<void>;
-      template<typename> friend class packaged_task;
-      template<typename _Fn, typename... _Args>
-        friend future<typename result_of<_Fn(_Args...)>::type>
-        async(launch, _Fn&&, _Args&&...);
-
-      typedef __basic_future<void> _Base_type;
-      typedef typename _Base_type::__state_type __state_type;
-
-      explicit
-      future(const __state_type& __state) : _Base_type(__state) { }
-
-    public:
-      constexpr future() noexcept : _Base_type() { }
-
-      /// Move constructor
-      future(future&& __uf) noexcept : _Base_type(std::move(__uf)) { }
-
-      // Disable copying
-      future(const future&) = delete;
-      future& operator=(const future&) = delete;
-
-      future& operator=(future&& __fut) noexcept
-      {
-        future(std::move(__fut))._M_swap(*this);
-        return *this;
-      }
-
-      /// Retrieving the value
-      void
-      get()
-      {
-        typename _Base_type::_Reset __reset(*this);
-        this->_M_get_result();
-      }
-
-      shared_future<void> share();
-    };
-
-
-  /// Primary template for shared_future.
-  template<typename _Res>
-    class shared_future : public __basic_future<_Res>
-    {
-      typedef __basic_future<_Res> _Base_type;
-
-    public:
-      constexpr shared_future() noexcept : _Base_type() { }
-
-      /// Copy constructor
-      shared_future(const shared_future& __sf) : _Base_type(__sf) { }
-
-      /// Construct from a future rvalue
-      shared_future(future<_Res>&& __uf) noexcept
-      : _Base_type(std::move(__uf))
-      { }
-
-      /// Construct from a shared_future rvalue
-      shared_future(shared_future&& __sf) noexcept
-      : _Base_type(std::move(__sf))
-      { }
-
-      shared_future& operator=(const shared_future& __sf)
-      {
-        shared_future(__sf)._M_swap(*this);
-        return *this;
-      }
-
-      shared_future& operator=(shared_future&& __sf) noexcept
-      {
-        shared_future(std::move(__sf))._M_swap(*this);
-        return *this;
-      }
-
-      /// Retrieving the value
-      const _Res&
-      get() const { return this->_M_get_result()._M_value(); }
-    };
-
-  /// Partial specialization for shared_future<R&>
-  template<typename _Res>
-    class shared_future<_Res&> : public __basic_future<_Res&>
-    {
-      typedef __basic_future<_Res&>           _Base_type;
-
-    public:
-      constexpr shared_future() noexcept : _Base_type() { }
-
-      /// Copy constructor
-      shared_future(const shared_future& __sf) : _Base_type(__sf) { }
-
-      /// Construct from a future rvalue
-      shared_future(future<_Res&>&& __uf) noexcept
-      : _Base_type(std::move(__uf))
-      { }
-
-      /// Construct from a shared_future rvalue
-      shared_future(shared_future&& __sf) noexcept
-      : _Base_type(std::move(__sf))
-      { }
-
-      shared_future& operator=(const shared_future& __sf)
-      {
-        shared_future(__sf)._M_swap(*this);
-        return *this;
-      }
-
-      shared_future& operator=(shared_future&& __sf) noexcept
-      {
-        shared_future(std::move(__sf))._M_swap(*this);
-        return *this;
-      }
-
-      /// Retrieving the value
-      _Res&
-      get() const { return this->_M_get_result()._M_get(); }
-    };
-
-  /// Explicit specialization for shared_future<void>
-  template<>
-    class shared_future<void> : public __basic_future<void>
-    {
-      typedef __basic_future<void> _Base_type;
-
-    public:
-      constexpr shared_future() noexcept : _Base_type() { }
-
-      /// Copy constructor
-      shared_future(const shared_future& __sf) : _Base_type(__sf) { }
-
-      /// Construct from a future rvalue
-      shared_future(future<void>&& __uf) noexcept
-      : _Base_type(std::move(__uf))
-      { }
-
-      /// Construct from a shared_future rvalue
-      shared_future(shared_future&& __sf) noexcept
-      : _Base_type(std::move(__sf))
-      { }
-
-      shared_future& operator=(const shared_future& __sf)
-      {
-        shared_future(__sf)._M_swap(*this);
-        return *this;
-      }
-
-      shared_future& operator=(shared_future&& __sf) noexcept
-      {
-        shared_future(std::move(__sf))._M_swap(*this);
-        return *this;
-      }
-
-      // Retrieving the value
-      void
-      get() const { this->_M_get_result(); }
-    };
-
-  // Now we can define the protected __basic_future constructors.
-  template<typename _Res>
-    inline __basic_future<_Res>::
-    __basic_future(const shared_future<_Res>& __sf) noexcept
-    : _M_state(__sf._M_state)
-    { }
-
-  template<typename _Res>
-    inline __basic_future<_Res>::
-    __basic_future(shared_future<_Res>&& __sf) noexcept
-    : _M_state(std::move(__sf._M_state))
-    { }
-
-  template<typename _Res>
-    inline __basic_future<_Res>::
-    __basic_future(future<_Res>&& __uf) noexcept
-    : _M_state(std::move(__uf._M_state))
-    { }
-
-  template<typename _Res>
-    inline shared_future<_Res>
-    future<_Res>::share()
-    { return shared_future<_Res>(std::move(*this)); }
-
-  template<typename _Res>
-    inline shared_future<_Res&>
-    future<_Res&>::share()
-    { return shared_future<_Res&>(std::move(*this)); }
-
-  inline shared_future<void>
-  future<void>::share()
-  { return shared_future<void>(std::move(*this)); }
-
-  /// Primary template for promise
-  template<typename _Res>
-    class promise
-    {
-      typedef __future_base::_State_base 	_State;
-      typedef __future_base::_Result<_Res>	_Res_type;
-      typedef __future_base::_Ptr<_Res_type>	_Ptr_type;
-      template<typename, typename> friend class _State::_Setter;
-
-      shared_ptr<_State>                        _M_future;
-      _Ptr_type                                 _M_storage;
-
-    public:
-      promise()
-      : _M_future(std::make_shared<_State>()),
-	_M_storage(new _Res_type())
-      { }
-
-      promise(promise&& __rhs) noexcept
-      : _M_future(std::move(__rhs._M_future)),
-	_M_storage(std::move(__rhs._M_storage))
-      { }
-
-      template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator& __a)
-        : _M_future(std::allocate_shared<_State>(__a)),
-	  _M_storage(__future_base::_S_allocate_result<_Res>(__a))
-        { }
-
-      template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator&, promise&& __rhs)
-        : _M_future(std::move(__rhs._M_future)),
-	  _M_storage(std::move(__rhs._M_storage))
-        { }
-
-      promise(const promise&) = delete;
-
-      ~promise()
-      {
-        if (static_cast<bool>(_M_future) && !_M_future.unique())
-          _M_future->_M_break_promise(std::move(_M_storage));
-      }
-
-      // Assignment
-      promise&
-      operator=(promise&& __rhs) noexcept
-      {
-        promise(std::move(__rhs)).swap(*this);
-        return *this;
-      }
-
-      promise& operator=(const promise&) = delete;
-
-      void
-      swap(promise& __rhs) noexcept
-      {
-        _M_future.swap(__rhs._M_future);
-        _M_storage.swap(__rhs._M_storage);
-      }
-
-      // Retrieving the result
-      future<_Res>
-      get_future()
-      { return future<_Res>(_M_future); }
-
-      // Setting the result
-      void
-      set_value(const _Res& __r)
-      { _M_future->_M_set_result(_State::__setter(this, __r)); }
-
-      void
-      set_value(_Res&& __r)
-      { _M_future->_M_set_result(_State::__setter(this, std::move(__r))); }
-
-      void
-      set_exception(exception_ptr __p)
-      { _M_future->_M_set_result(_State::__setter(__p, this)); }
-
-      void
-      set_value_at_thread_exit(const _Res& __r)
-      {
-	_M_future->_M_set_delayed_result(_State::__setter(this, __r),
-					 _M_future);
-      }
-
-      void
-      set_value_at_thread_exit(_Res&& __r)
-      {
-	_M_future->_M_set_delayed_result(
-	    _State::__setter(this, std::move(__r)), _M_future);
-      }
-
-      void
-      set_exception_at_thread_exit(exception_ptr __p)
-      {
-	_M_future->_M_set_delayed_result(_State::__setter(__p, this),
-					 _M_future);
-      }
-    };
-
-  template<typename _Res>
-    inline void
-    swap(promise<_Res>& __x, promise<_Res>& __y) noexcept
-    { __x.swap(__y); }
-
-  template<typename _Res, typename _Alloc>
-    struct uses_allocator<promise<_Res>, _Alloc>
-    : public true_type { };
-
-
-  /// Partial specialization for promise<R&>
-  template<typename _Res>
-    class promise<_Res&>
-    {
-      typedef __future_base::_State_base	_State;
-      typedef __future_base::_Result<_Res&>	_Res_type;
-      typedef __future_base::_Ptr<_Res_type> 	_Ptr_type;
-      template<typename, typename> friend class _State::_Setter;
-
-      shared_ptr<_State>                        _M_future;
-      _Ptr_type                                 _M_storage;
-
-    public:
-      promise()
-      : _M_future(std::make_shared<_State>()),
-	_M_storage(new _Res_type())
-      { }
-
-      promise(promise&& __rhs) noexcept
-      : _M_future(std::move(__rhs._M_future)),
-	_M_storage(std::move(__rhs._M_storage))
-      { }
-
-      template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator& __a)
-        : _M_future(std::allocate_shared<_State>(__a)),
-	  _M_storage(__future_base::_S_allocate_result<_Res&>(__a))
-        { }
-
-      template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator&, promise&& __rhs)
-        : _M_future(std::move(__rhs._M_future)),
-	  _M_storage(std::move(__rhs._M_storage))
-        { }
-
-      promise(const promise&) = delete;
-
-      ~promise()
-      {
-        if (static_cast<bool>(_M_future) && !_M_future.unique())
-          _M_future->_M_break_promise(std::move(_M_storage));
-      }
-
-      // Assignment
-      promise&
-      operator=(promise&& __rhs) noexcept
-      {
-        promise(std::move(__rhs)).swap(*this);
-        return *this;
-      }
-
-      promise& operator=(const promise&) = delete;
-
-      void
-      swap(promise& __rhs) noexcept
-      {
-        _M_future.swap(__rhs._M_future);
-        _M_storage.swap(__rhs._M_storage);
-      }
-
-      // Retrieving the result
-      future<_Res&>
-      get_future()
-      { return future<_Res&>(_M_future); }
-
-      // Setting the result
-      void
-      set_value(_Res& __r)
-      { _M_future->_M_set_result(_State::__setter(this, __r)); }
-
-      void
-      set_exception(exception_ptr __p)
-      { _M_future->_M_set_result(_State::__setter(__p, this)); }
-
-      void
-      set_value_at_thread_exit(_Res& __r)
-      {
-	_M_future->_M_set_delayed_result(_State::__setter(this, __r),
-					 _M_future);
-      }
-
-      void
-      set_exception_at_thread_exit(exception_ptr __p)
-      {
-	_M_future->_M_set_delayed_result(_State::__setter(__p, this),
-					 _M_future);
-      }
-    };
-
-  /// Explicit specialization for promise<void>
-  template<>
-    class promise<void>
-    {
-      typedef __future_base::_State_base	_State;
-      typedef __future_base::_Result<void>	_Res_type;
-      typedef __future_base::_Ptr<_Res_type> 	_Ptr_type;
-      template<typename, typename> friend class _State::_Setter;
-
-      shared_ptr<_State>                        _M_future;
-      _Ptr_type                                 _M_storage;
-
-    public:
-      promise()
-      : _M_future(std::make_shared<_State>()),
-	_M_storage(new _Res_type())
-      { }
-
-      promise(promise&& __rhs) noexcept
-      : _M_future(std::move(__rhs._M_future)),
-	_M_storage(std::move(__rhs._M_storage))
-      { }
-
-      template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator& __a)
-        : _M_future(std::allocate_shared<_State>(__a)),
-	  _M_storage(__future_base::_S_allocate_result<void>(__a))
-        { }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2095.  missing constructors needed for uses-allocator construction
-      template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator&, promise&& __rhs)
-        : _M_future(std::move(__rhs._M_future)),
-	  _M_storage(std::move(__rhs._M_storage))
-        { }
-
-      promise(const promise&) = delete;
-
-      ~promise()
-      {
-        if (static_cast<bool>(_M_future) && !_M_future.unique())
-          _M_future->_M_break_promise(std::move(_M_storage));
-      }
-
-      // Assignment
-      promise&
-      operator=(promise&& __rhs) noexcept
-      {
-        promise(std::move(__rhs)).swap(*this);
-        return *this;
-      }
-
-      promise& operator=(const promise&) = delete;
-
-      void
-      swap(promise& __rhs) noexcept
-      {
-        _M_future.swap(__rhs._M_future);
-        _M_storage.swap(__rhs._M_storage);
-      }
-
-      // Retrieving the result
-      future<void>
-      get_future()
-      { return future<void>(_M_future); }
-
-      // Setting the result
-      void set_value();
-
-      void
-      set_exception(exception_ptr __p)
-      { _M_future->_M_set_result(_State::__setter(__p, this)); }
-
-      void
-      set_value_at_thread_exit();
-
-      void
-      set_exception_at_thread_exit(exception_ptr __p)
-      {
-	_M_future->_M_set_delayed_result(_State::__setter(__p, this),
-					 _M_future);
-      }
-    };
-
-  // set void
-  template<>
-    struct __future_base::_State_base::_Setter<void, void>
-    {
-      promise<void>::_Ptr_type operator()() const
-      {
-        _State_base::_S_check(_M_promise->_M_future);
-        return std::move(_M_promise->_M_storage);
-      }
-
-      promise<void>*    _M_promise;
-    };
-
-  inline void
-  promise<void>::set_value()
-  { _M_future->_M_set_result(_State::_Setter<void, void>{ this }); }
-
-  inline void
-  promise<void>::set_value_at_thread_exit()
-  {
-    _M_future->_M_set_delayed_result(_State::_Setter<void, void>{this},
-				     _M_future);
-  }
-
-  template<typename _Ptr_type, typename _Fn, typename _Res>
-    struct __future_base::_Task_setter
-    {
-      // Invoke the function and provide the result to the caller.
-      _Ptr_type operator()() const
-      {
-	__try
-	  {
-	    (*_M_result)->_M_set((*_M_fn)());
-	  }
-	__catch(const __cxxabiv1::__forced_unwind&)
-	  {
-	    __throw_exception_again; // will cause broken_promise
-	  }
-	__catch(...)
-	  {
-	    (*_M_result)->_M_error = current_exception();
-	  }
-	return std::move(*_M_result);
-      }
-      _Ptr_type*	_M_result;
-      _Fn*		_M_fn;
-    };
-
-  template<typename _Ptr_type, typename _Fn>
-    struct __future_base::_Task_setter<_Ptr_type, _Fn, void>
-    {
-      _Ptr_type operator()() const
-      {
-	__try
-	  {
-	    (*_M_fn)();
-	  }
-	__catch(const __cxxabiv1::__forced_unwind&)
-	  {
-	    __throw_exception_again; // will cause broken_promise
-	  }
-	__catch(...)
-	  {
-	    (*_M_result)->_M_error = current_exception();
-	  }
-	return std::move(*_M_result);
-      }
-      _Ptr_type*	_M_result;
-      _Fn*		_M_fn;
-    };
-
-  // Holds storage for a packaged_task's result.
-  template<typename _Res, typename... _Args>
-    struct __future_base::_Task_state_base<_Res(_Args...)>
-    : __future_base::_State_base
-    {
-      typedef _Res _Res_type;
-
-      template<typename _Alloc>
-	_Task_state_base(const _Alloc& __a)
-	: _M_result(_S_allocate_result<_Res>(__a))
-	{ }
-
-      // Invoke the stored task and make the state ready.
-      virtual void
-      _M_run(_Args&&... __args) = 0;
-
-      // Invoke the stored task and make the state ready at thread exit.
-      virtual void
-      _M_run_delayed(_Args&&... __args, weak_ptr<_State_base>) = 0;
-
-      virtual shared_ptr<_Task_state_base>
-      _M_reset() = 0;
-
-      typedef __future_base::_Ptr<_Result<_Res>> _Ptr_type;
-      _Ptr_type _M_result;
-    };
-
-  // Holds a packaged_task's stored task.
-  template<typename _Fn, typename _Alloc, typename _Res, typename... _Args>
-    struct __future_base::_Task_state<_Fn, _Alloc, _Res(_Args...)> final
-    : __future_base::_Task_state_base<_Res(_Args...)>
-    {
-      template<typename _Fn2>
-	_Task_state(_Fn2&& __fn, const _Alloc& __a)
-	: _Task_state_base<_Res(_Args...)>(__a),
-	  _M_impl(std::forward<_Fn2>(__fn), __a)
-	{ }
-
-    private:
-      virtual void
-      _M_run(_Args&&... __args)
-      {
-	// bound arguments decay so wrap lvalue references
-	auto __boundfn = std::__bind_simple(std::ref(_M_impl._M_fn),
-	    _S_maybe_wrap_ref(std::forward<_Args>(__args))...);
-	this->_M_set_result(_S_task_setter(this->_M_result, __boundfn));
-      }
-
-      virtual void
-      _M_run_delayed(_Args&&... __args, weak_ptr<_State_base> __self)
-      {
-	// bound arguments decay so wrap lvalue references
-	auto __boundfn = std::__bind_simple(std::ref(_M_impl._M_fn),
-	    _S_maybe_wrap_ref(std::forward<_Args>(__args))...);
-	this->_M_set_delayed_result(_S_task_setter(this->_M_result, __boundfn),
-				    std::move(__self));
-      }
-
-      virtual shared_ptr<_Task_state_base<_Res(_Args...)>>
-      _M_reset();
-
-      template<typename _Tp>
-	static reference_wrapper<_Tp>
-	_S_maybe_wrap_ref(_Tp& __t)
-	{ return std::ref(__t); }
-
-      template<typename _Tp>
-	static
-	typename enable_if<!is_lvalue_reference<_Tp>::value, _Tp>::type&&
-	_S_maybe_wrap_ref(_Tp&& __t)
-	{ return std::forward<_Tp>(__t); }
-
-      struct _Impl : _Alloc
-      {
-	template<typename _Fn2>
-	  _Impl(_Fn2&& __fn, const _Alloc& __a)
-	  : _Alloc(__a), _M_fn(std::forward<_Fn2>(__fn)) { }
-	_Fn _M_fn;
-      } _M_impl;
-    };
-
-  template<typename _Signature, typename _Fn, typename _Alloc>
-    static shared_ptr<__future_base::_Task_state_base<_Signature>>
-    __create_task_state(_Fn&& __fn, const _Alloc& __a)
-    {
-      typedef typename decay<_Fn>::type _Fn2;
-      typedef __future_base::_Task_state<_Fn2, _Alloc, _Signature> _State;
-      return std::allocate_shared<_State>(__a, std::forward<_Fn>(__fn), __a);
-    }
-
-  template<typename _Fn, typename _Alloc, typename _Res, typename... _Args>
-    shared_ptr<__future_base::_Task_state_base<_Res(_Args...)>>
-    __future_base::_Task_state<_Fn, _Alloc, _Res(_Args...)>::_M_reset()
-    {
-      return __create_task_state<_Res(_Args...)>(std::move(_M_impl._M_fn),
-						 static_cast<_Alloc&>(_M_impl));
-    }
-
-  template<typename _Task, typename _Fn, bool
-	   = is_same<_Task, typename decay<_Fn>::type>::value>
-    struct __constrain_pkgdtask
-    { typedef void __type; };
-
-  template<typename _Task, typename _Fn>
-    struct __constrain_pkgdtask<_Task, _Fn, true>
-    { };
-
-  /// packaged_task
-  template<typename _Res, typename... _ArgTypes>
-    class packaged_task<_Res(_ArgTypes...)>
-    {
-      typedef __future_base::_Task_state_base<_Res(_ArgTypes...)> _State_type;
-      shared_ptr<_State_type>                   _M_state;
-
-    public:
-      // Construction and destruction
-      packaged_task() noexcept { }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2095.  missing constructors needed for uses-allocator construction
-      template<typename _Allocator>
-	packaged_task(allocator_arg_t, const _Allocator& __a) noexcept
-	{ }
-
-      template<typename _Fn, typename = typename
-	       __constrain_pkgdtask<packaged_task, _Fn>::__type>
-	explicit
-	packaged_task(_Fn&& __fn)
-	: packaged_task(allocator_arg, std::allocator<int>(),
-			std::forward<_Fn>(__fn))
-	{ }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 2097.  packaged_task constructors should be constrained
-      template<typename _Fn, typename _Alloc, typename = typename
-	       __constrain_pkgdtask<packaged_task, _Fn>::__type>
-	explicit
-	packaged_task(allocator_arg_t, const _Alloc& __a, _Fn&& __fn)
-	: _M_state(__create_task_state<_Res(_ArgTypes...)>(
-		    std::forward<_Fn>(__fn), __a))
-	{ }
-
-      ~packaged_task()
-      {
-        if (static_cast<bool>(_M_state) && !_M_state.unique())
-	  _M_state->_M_break_promise(std::move(_M_state->_M_result));
-      }
-
-      // No copy
-      packaged_task(const packaged_task&) = delete;
-      packaged_task& operator=(const packaged_task&) = delete;
-
-      template<typename _Allocator>
-	packaged_task(allocator_arg_t, const _Allocator&,
-		      const packaged_task&) = delete;
-
-      // Move support
-      packaged_task(packaged_task&& __other) noexcept
-      { this->swap(__other); }
-
-      template<typename _Allocator>
-	packaged_task(allocator_arg_t, const _Allocator&,
-		      packaged_task&& __other) noexcept
-	{ this->swap(__other); }
-
-      packaged_task& operator=(packaged_task&& __other) noexcept
-      {
-	packaged_task(std::move(__other)).swap(*this);
-	return *this;
-      }
-
-      void
-      swap(packaged_task& __other) noexcept
-      { _M_state.swap(__other._M_state); }
-
-      bool
-      valid() const noexcept
-      { return static_cast<bool>(_M_state); }
-
-      // Result retrieval
-      future<_Res>
-      get_future()
-      { return future<_Res>(_M_state); }
-
-      // Execution
-      void
-      operator()(_ArgTypes... __args)
-      {
-	__future_base::_State_base::_S_check(_M_state);
-	_M_state->_M_run(std::forward<_ArgTypes>(__args)...);
-      }
-
-      void
-      make_ready_at_thread_exit(_ArgTypes... __args)
-      {
-	__future_base::_State_base::_S_check(_M_state);
-	_M_state->_M_run_delayed(std::forward<_ArgTypes>(__args)..., _M_state);
-      }
-
-      void
-      reset()
-      {
-	__future_base::_State_base::_S_check(_M_state);
-	packaged_task __tmp;
-	__tmp._M_state = _M_state;
-	_M_state = _M_state->_M_reset();
-      }
-    };
-
-  /// swap
-  template<typename _Res, typename... _ArgTypes>
-    inline void
-    swap(packaged_task<_Res(_ArgTypes...)>& __x,
-	 packaged_task<_Res(_ArgTypes...)>& __y) noexcept
-    { __x.swap(__y); }
-
-  template<typename _Res, typename _Alloc>
-    struct uses_allocator<packaged_task<_Res>, _Alloc>
-    : public true_type { };
-
-
-  // Shared state created by std::async().
-  // Holds a deferred function and storage for its result.
-  template<typename _BoundFn, typename _Res>
-    class __future_base::_Deferred_state final
-    : public __future_base::_State_base
-    {
-    public:
-      explicit
-      _Deferred_state(_BoundFn&& __fn)
-      : _M_result(new _Result<_Res>()), _M_fn(std::move(__fn))
-      { }
-
-    private:
-      typedef __future_base::_Ptr<_Result<_Res>> _Ptr_type;
-      _Ptr_type _M_result;
-      _BoundFn _M_fn;
-
-      // Run the deferred function.
-      virtual void
-      _M_complete_async()
-      {
-	// Multiple threads can call a waiting function on the future and
-	// reach this point at the same time. The call_once in _M_set_result
-	// ensures only the first one run the deferred function, stores the
-	// result in _M_result, swaps that with the base _M_result and makes
-	// the state ready. Tell _M_set_result to ignore failure so all later
-	// calls do nothing.
-        _M_set_result(_S_task_setter(_M_result, _M_fn), true);
-      }
-
-      // Caller should check whether the state is ready first, because this
-      // function will return true even after the deferred function has run.
-      virtual bool _M_is_deferred_future() const { return true; }
-    };
-
-  // Common functionality hoisted out of the _Async_state_impl template.
-  class __future_base::_Async_state_commonV2
-    : public __future_base::_State_base
-  {
-  protected:
-    ~_Async_state_commonV2() = default;
-
-    // Make waiting functions block until the thread completes, as if joined.
-    //
-    // This function is used by wait() to satisfy the first requirement below
-    // and by wait_for() / wait_until() to satisfy the second.
-    //
-    // [futures.async]:
-    //
-    // — a call to a waiting function on an asynchronous return object that
-    // shares the shared state created by this async call shall block until
-    // the associated thread has completed, as if joined, or else time out.
-    //
-    // — the associated thread completion synchronizes with the return from
-    // the first function that successfully detects the ready status of the
-    // shared state or with the return from the last function that releases
-    // the shared state, whichever happens first.
-    virtual void _M_complete_async() { _M_join(); }
-
-    void _M_join() { std::call_once(_M_once, &thread::join, ref(_M_thread)); }
-
-    thread _M_thread;
-    once_flag _M_once;
-  };
-
-  // Shared state created by std::async().
-  // Starts a new thread that runs a function and makes the shared state ready.
-  template<typename _BoundFn, typename _Res>
-    class __future_base::_Async_state_impl final
-    : public __future_base::_Async_state_commonV2
-    {
-    public:
-      explicit
-      _Async_state_impl(_BoundFn&& __fn)
-      : _M_result(new _Result<_Res>()), _M_fn(std::move(__fn))
-      {
-	_M_thread = std::thread{ [this] {
-	    __try
-	      {
-		_M_set_result(_S_task_setter(_M_result, _M_fn));
-	      }
-	    __catch (const __cxxabiv1::__forced_unwind&)
-	      {
-		// make the shared state ready on thread cancellation
-		if (static_cast<bool>(_M_result))
-		  this->_M_break_promise(std::move(_M_result));
-		__throw_exception_again;
-	      }
-        } };
-      }
-
-      // Must not destroy _M_result and _M_fn until the thread finishes.
-      // Call join() directly rather than through _M_join() because no other
-      // thread can be referring to this state if it is being destroyed.
-      ~_Async_state_impl() { if (_M_thread.joinable()) _M_thread.join(); }
-
-    private:
-      typedef __future_base::_Ptr<_Result<_Res>> _Ptr_type;
-      _Ptr_type _M_result;
-      _BoundFn _M_fn;
-    };
-
-  template<typename _BoundFn>
-    inline std::shared_ptr<__future_base::_State_base>
-    __future_base::_S_make_deferred_state(_BoundFn&& __fn)
-    {
-      typedef typename remove_reference<_BoundFn>::type __fn_type;
-      typedef _Deferred_state<__fn_type> __state_type;
-      return std::make_shared<__state_type>(std::move(__fn));
-    }
-
-  template<typename _BoundFn>
-    inline std::shared_ptr<__future_base::_State_base>
-    __future_base::_S_make_async_state(_BoundFn&& __fn)
-    {
-      typedef typename remove_reference<_BoundFn>::type __fn_type;
-      typedef _Async_state_impl<__fn_type> __state_type;
-      return std::make_shared<__state_type>(std::move(__fn));
-    }
-
-
-  /// async
-  template<typename _Fn, typename... _Args>
-    future<typename result_of<_Fn(_Args...)>::type>
-    async(launch __policy, _Fn&& __fn, _Args&&... __args)
-    {
-      typedef typename result_of<_Fn(_Args...)>::type result_type;
-      std::shared_ptr<__future_base::_State_base> __state;
-      if ((__policy & (launch::async|launch::deferred)) == launch::async)
-	{
-	  __state = __future_base::_S_make_async_state(std::__bind_simple(
-              std::forward<_Fn>(__fn), std::forward<_Args>(__args)...));
-	}
-      else
-	{
-	  __state = __future_base::_S_make_deferred_state(std::__bind_simple(
-              std::forward<_Fn>(__fn), std::forward<_Args>(__args)...));
-	}
-      return future<result_type>(__state);
-    }
-
-  /// async, potential overload
-  template<typename _Fn, typename... _Args>
-    inline future<typename result_of<_Fn(_Args...)>::type>
-    async(_Fn&& __fn, _Args&&... __args)
-    {
-      return async(launch::async|launch::deferred, std::forward<_Fn>(__fn),
-		   std::forward<_Args>(__args)...);
-    }
-
-#endif // _GLIBCXX_ASYNC_ABI_COMPAT
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
-       // && ATOMIC_INT_LOCK_FREE
-
-  // @} group futures
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // C++11
-
-#endif // _GLIBCXX_FUTURE
diff --git a/openflow/usr/include/c++/5/initializer_list b/openflow/usr/include/c++/5/initializer_list
deleted file mode 100644
index e818151..0000000
--- a/openflow/usr/include/c++/5/initializer_list
+++ /dev/null
@@ -1,107 +0,0 @@
-// std::initializer_list support -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file initializer_list
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _INITIALIZER_LIST
-#define _INITIALIZER_LIST
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else // C++0x
-
-#pragma GCC visibility push(default)
-
-#include <bits/c++config.h>
-
-namespace std
-{
-  /// initializer_list
-  template<class _E>
-    class initializer_list
-    {
-    public:
-      typedef _E 		value_type;
-      typedef const _E& 	reference;
-      typedef const _E& 	const_reference;
-      typedef size_t 		size_type;
-      typedef const _E* 	iterator;
-      typedef const _E* 	const_iterator;
-
-    private:
-      iterator			_M_array;
-      size_type			_M_len;
-
-      // The compiler can call a private constructor.
-      constexpr initializer_list(const_iterator __a, size_type __l)
-      : _M_array(__a), _M_len(__l) { }
-
-    public:
-      constexpr initializer_list() noexcept
-      : _M_array(0), _M_len(0) { }
-
-      // Number of elements.
-      constexpr size_type
-      size() const noexcept { return _M_len; }
-
-      // First element.
-      constexpr const_iterator
-      begin() const noexcept { return _M_array; }
-
-      // One past the last element.
-      constexpr const_iterator
-      end() const noexcept { return begin() + size(); }
-    };
-
-  /**
-   *  @brief  Return an iterator pointing to the first element of
-   *          the initializer_list.
-   *  @param  __ils  Initializer list.
-   */
-  template<class _Tp>
-    constexpr const _Tp*
-    begin(initializer_list<_Tp> __ils) noexcept
-    { return __ils.begin(); }
-
-  /**
-   *  @brief  Return an iterator pointing to one past the last element
-   *          of the initializer_list.
-   *  @param  __ils  Initializer list.
-   */
-  template<class _Tp>
-    constexpr const _Tp*
-    end(initializer_list<_Tp> __ils) noexcept
-    { return __ils.end(); }
-}
-
-#pragma GCC visibility pop
-
-#endif // C++11
-
-#endif // _INITIALIZER_LIST
diff --git a/openflow/usr/include/c++/5/iomanip b/openflow/usr/include/c++/5/iomanip
deleted file mode 100644
index 38f8c9d..0000000
--- a/openflow/usr/include/c++/5/iomanip
+++ /dev/null
@@ -1,528 +0,0 @@
-// Standard stream manipulators -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/iomanip
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 14882: 27.6.3  Standard manipulators
-//
-
-#ifndef _GLIBCXX_IOMANIP
-#define _GLIBCXX_IOMANIP 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <iosfwd>
-#include <bits/ios_base.h>
-
-#if __cplusplus >= 201103L
-#include <locale>
-#if __cplusplus > 201103L
-#include <bits/quoted_string.h>
-#endif
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // [27.6.3] standard manipulators
-  // Also see DR 183.
-
-  struct _Resetiosflags { ios_base::fmtflags _M_mask; };
-
-  /**
-   *  @brief  Manipulator for @c setf.
-   *  @param  __mask  A format flags mask.
-   *
-   *  Sent to a stream object, this manipulator resets the specified flags,
-   *  via @e stream.setf(0,__mask).
-  */
-  inline _Resetiosflags 
-  resetiosflags(ios_base::fmtflags __mask)
-  { return { __mask }; }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT, _Traits>& 
-    operator>>(basic_istream<_CharT, _Traits>& __is, _Resetiosflags __f)
-    { 
-      __is.setf(ios_base::fmtflags(0), __f._M_mask); 
-      return __is; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>& 
-    operator<<(basic_ostream<_CharT, _Traits>& __os, _Resetiosflags __f)
-    { 
-      __os.setf(ios_base::fmtflags(0), __f._M_mask); 
-      return __os; 
-    }
-
-
-  struct _Setiosflags { ios_base::fmtflags _M_mask; };
-
-  /**
-   *  @brief  Manipulator for @c setf.
-   *  @param  __mask  A format flags mask.
-   *
-   *  Sent to a stream object, this manipulator sets the format flags
-   *  to @a __mask.
-  */
-  inline _Setiosflags 
-  setiosflags(ios_base::fmtflags __mask)
-  { return { __mask }; }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT, _Traits>& 
-    operator>>(basic_istream<_CharT, _Traits>& __is, _Setiosflags __f)
-    { 
-      __is.setf(__f._M_mask); 
-      return __is; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>& 
-    operator<<(basic_ostream<_CharT, _Traits>& __os, _Setiosflags __f)
-    { 
-      __os.setf(__f._M_mask); 
-      return __os; 
-    }
-
-
-  struct _Setbase { int _M_base; };
-
-  /**
-   *  @brief  Manipulator for @c setf.
-   *  @param  __base  A numeric base.
-   *
-   *  Sent to a stream object, this manipulator changes the
-   *  @c ios_base::basefield flags to @c oct, @c dec, or @c hex when @a base
-   *  is 8, 10, or 16, accordingly, and to 0 if @a __base is any other value.
-  */
-  inline _Setbase 
-  setbase(int __base)
-  { return { __base }; }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT, _Traits>& 
-    operator>>(basic_istream<_CharT, _Traits>& __is, _Setbase __f)
-    {
-      __is.setf(__f._M_base ==  8 ? ios_base::oct : 
-		__f._M_base == 10 ? ios_base::dec : 
-		__f._M_base == 16 ? ios_base::hex : 
-		ios_base::fmtflags(0), ios_base::basefield);
-      return __is; 
-    }
-  
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>& 
-    operator<<(basic_ostream<_CharT, _Traits>& __os, _Setbase __f)
-    {
-      __os.setf(__f._M_base ==  8 ? ios_base::oct : 
-		__f._M_base == 10 ? ios_base::dec : 
-		__f._M_base == 16 ? ios_base::hex : 
-		ios_base::fmtflags(0), ios_base::basefield);
-      return __os; 
-    }
-  
-
-  template<typename _CharT>
-    struct _Setfill { _CharT _M_c; };
-
-  /**
-   *  @brief  Manipulator for @c fill.
-   *  @param  __c  The new fill character.
-   *
-   *  Sent to a stream object, this manipulator calls @c fill(__c) for that
-   *  object.
-  */
-  template<typename _CharT>
-    inline _Setfill<_CharT>
-    setfill(_CharT __c)
-    { return { __c }; }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT, _Traits>& 
-    operator>>(basic_istream<_CharT, _Traits>& __is, _Setfill<_CharT> __f)
-    { 
-      __is.fill(__f._M_c); 
-      return __is; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>& 
-    operator<<(basic_ostream<_CharT, _Traits>& __os, _Setfill<_CharT> __f)
-    { 
-      __os.fill(__f._M_c); 
-      return __os; 
-    }
-
-
-  struct _Setprecision { int _M_n; };
-
-  /**
-   *  @brief  Manipulator for @c precision.
-   *  @param  __n  The new precision.
-   *
-   *  Sent to a stream object, this manipulator calls @c precision(__n) for
-   *  that object.
-  */
-  inline _Setprecision 
-  setprecision(int __n)
-  { return { __n }; }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT, _Traits>& 
-    operator>>(basic_istream<_CharT, _Traits>& __is, _Setprecision __f)
-    { 
-      __is.precision(__f._M_n); 
-      return __is; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>& 
-    operator<<(basic_ostream<_CharT, _Traits>& __os, _Setprecision __f)
-    { 
-      __os.precision(__f._M_n); 
-      return __os; 
-    }
-
-
-  struct _Setw { int _M_n; };
-
-  /**
-   *  @brief  Manipulator for @c width.
-   *  @param  __n  The new width.
-   *
-   *  Sent to a stream object, this manipulator calls @c width(__n) for
-   *  that object.
-  */
-  inline _Setw 
-  setw(int __n)
-  { return { __n }; }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT, _Traits>& 
-    operator>>(basic_istream<_CharT, _Traits>& __is, _Setw __f)
-    {
-      __is.width(__f._M_n);
-      return __is; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>& 
-    operator<<(basic_ostream<_CharT, _Traits>& __os, _Setw __f)
-    {
-      __os.width(__f._M_n);
-      return __os; 
-    }
-
-#if __cplusplus >= 201103L
-  
-  template<typename _MoneyT>
-    struct _Get_money { _MoneyT& _M_mon; bool _M_intl; };
-
-  /**
-   *  @brief  Extended manipulator for extracting money.
-   *  @param  __mon  Either long double or a specialization of @c basic_string.
-   *  @param  __intl A bool indicating whether international format 
-   *                 is to be used.
-   *
-   *  Sent to a stream object, this manipulator extracts @a __mon.
-  */
-  template<typename _MoneyT>
-    inline _Get_money<_MoneyT>
-    get_money(_MoneyT& __mon, bool __intl = false)
-    { return { __mon, __intl }; }
-
-  template<typename _CharT, typename _Traits, typename _MoneyT>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, _Get_money<_MoneyT> __f)
-    {
-      typename basic_istream<_CharT, _Traits>::sentry __cerb(__is, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      typedef istreambuf_iterator<_CharT, _Traits>   _Iter;
-	      typedef money_get<_CharT, _Iter>               _MoneyGet;
-
-	      const _MoneyGet& __mg = use_facet<_MoneyGet>(__is.getloc());
-	      __mg.get(_Iter(__is.rdbuf()), _Iter(), __f._M_intl,
-		       __is, __err, __f._M_mon);
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __is._M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { __is._M_setstate(ios_base::badbit); }
-	  if (__err)
-	    __is.setstate(__err);
-	}
-      return __is; 
-    }
-
-
-  template<typename _MoneyT>
-    struct _Put_money { const _MoneyT& _M_mon; bool _M_intl; };
-
-  /**
-   *  @brief  Extended manipulator for inserting money.
-   *  @param  __mon  Either long double or a specialization of @c basic_string.
-   *  @param  __intl A bool indicating whether international format 
-   *                 is to be used.
-   *
-   *  Sent to a stream object, this manipulator inserts @a __mon.
-  */
-  template<typename _MoneyT>
-    inline _Put_money<_MoneyT>
-    put_money(const _MoneyT& __mon, bool __intl = false)
-    { return { __mon, __intl }; }
-
-  template<typename _CharT, typename _Traits, typename _MoneyT>
-    basic_ostream<_CharT, _Traits>& 
-    operator<<(basic_ostream<_CharT, _Traits>& __os, _Put_money<_MoneyT> __f)
-    {
-      typename basic_ostream<_CharT, _Traits>::sentry __cerb(__os);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::goodbit;
-	  __try
-	    {
-	      typedef ostreambuf_iterator<_CharT, _Traits>   _Iter;
-	      typedef money_put<_CharT, _Iter>               _MoneyPut;
-
-	      const _MoneyPut& __mp = use_facet<_MoneyPut>(__os.getloc());
-	      if (__mp.put(_Iter(__os.rdbuf()), __f._M_intl, __os,
-			   __os.fill(), __f._M_mon).failed())
-		__err |= ios_base::badbit;
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __os._M_setstate(ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { __os._M_setstate(ios_base::badbit); }
-	  if (__err)
-	    __os.setstate(__err);
-	}
-      return __os; 
-    }
-
-  template<typename _CharT>
-    struct _Put_time
-    {
-      const std::tm* _M_tmb;
-      const _CharT* _M_fmt;
-    };
-
-  /**
-   *  @brief  Extended manipulator for formatting time.
-   *
-   *  This manipulator uses time_put::put to format time.
-   *  [ext.manip]
-   *
-   *  @param __tmb  struct tm time data to format.
-   *  @param __fmt  format string.
-   */
-  template<typename _CharT>
-    inline _Put_time<_CharT>
-    put_time(const std::tm* __tmb, const _CharT* __fmt)
-    { return { __tmb, __fmt }; }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, _Put_time<_CharT> __f)
-    {
-      typename basic_ostream<_CharT, _Traits>::sentry __cerb(__os);
-      if (__cerb)
-        {
-          ios_base::iostate __err = ios_base::goodbit;
-          __try
-            {
-              typedef ostreambuf_iterator<_CharT, _Traits>   _Iter;
-              typedef time_put<_CharT, _Iter>                _TimePut;
-
-              const _CharT* const __fmt_end = __f._M_fmt +
-                _Traits::length(__f._M_fmt);
-
-              const _TimePut& __mp = use_facet<_TimePut>(__os.getloc());
-              if (__mp.put(_Iter(__os.rdbuf()), __os, __os.fill(),
-                           __f._M_tmb, __f._M_fmt, __fmt_end).failed())
-                __err |= ios_base::badbit;
-            }
-          __catch(__cxxabiv1::__forced_unwind&)
-            {
-              __os._M_setstate(ios_base::badbit);
-              __throw_exception_again;
-            }
-          __catch(...)
-            { __os._M_setstate(ios_base::badbit); }
-          if (__err)
-            __os.setstate(__err);
-        }
-      return __os;
-    }
-
-  template<typename _CharT>
-    struct _Get_time
-    {
-      std::tm*	    _M_tmb;
-      const _CharT* _M_fmt;
-    };
-
-  /**
-   *  @brief  Extended manipulator for extracting time.
-   *
-   *  This manipulator uses time_get::get to extract time.
-   *  [ext.manip]
-   *
-   *  @param __tmb  struct to extract the time data to.
-   *  @param __fmt  format string.
-   */
-  template<typename _CharT>
-    inline _Get_time<_CharT>
-    get_time(std::tm* __tmb, const _CharT* __fmt)
-    { return { __tmb, __fmt }; }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, _Get_time<_CharT> __f)
-    {
-      typename basic_istream<_CharT, _Traits>::sentry __cerb(__is, false);
-      if (__cerb)
-        {
-          ios_base::iostate __err = ios_base::goodbit;
-          __try
-            {
-              typedef istreambuf_iterator<_CharT, _Traits>   _Iter;
-              typedef time_get<_CharT, _Iter>                _TimeGet;
-
-              const _CharT* const __fmt_end = __f._M_fmt +
-                _Traits::length(__f._M_fmt);
-
-              const _TimeGet& __mg = use_facet<_TimeGet>(__is.getloc());
-              __mg.get(_Iter(__is.rdbuf()), _Iter(), __is,
-                       __err, __f._M_tmb, __f._M_fmt, __fmt_end);
-            }
-          __catch(__cxxabiv1::__forced_unwind&)
-            {
-              __is._M_setstate(ios_base::badbit);
-              __throw_exception_again;
-            }
-          __catch(...)
-            { __is._M_setstate(ios_base::badbit); }
-          if (__err)
-            __is.setstate(__err);
-        }
-      return __is;
-    }
-
-#if __cplusplus > 201103L
-
-#define __cpp_lib_quoted_string_io 201304
-
-  /**
-   * @brief Manipulator for quoted strings.
-   * @param __string String to quote.
-   * @param __delim  Character to quote string with.
-   * @param __escape Escape character to escape itself or quote character.
-   */
-  template<typename _CharT>
-    inline auto
-    quoted(const _CharT* __string,
-	   _CharT __delim = _CharT('"'), _CharT __escape = _CharT('\\'))
-    {
-      return __detail::_Quoted_string<const _CharT*, _CharT>(__string, __delim,
-							     __escape);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline auto
-    quoted(const basic_string<_CharT, _Traits, _Alloc>& __string,
-	   _CharT __delim = _CharT('"'), _CharT __escape = _CharT('\\'))
-    {
-      return __detail::_Quoted_string<
-			const basic_string<_CharT, _Traits, _Alloc>&, _CharT>(
-				__string, __delim, __escape);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline auto
-    quoted(basic_string<_CharT, _Traits, _Alloc>& __string,
-	   _CharT __delim = _CharT('"'), _CharT __escape = _CharT('\\'))
-    {
-      return __detail::_Quoted_string<
-			basic_string<_CharT, _Traits, _Alloc>&, _CharT>(
-				__string, __delim, __escape);
-    }
-
-#endif // __cplusplus > 201103L
-
-#endif // __cplusplus >= 201103L
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.  
-  // NB:  This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template ostream& operator<<(ostream&, _Setfill<char>);
-  extern template ostream& operator<<(ostream&, _Setiosflags);
-  extern template ostream& operator<<(ostream&, _Resetiosflags);
-  extern template ostream& operator<<(ostream&, _Setbase);
-  extern template ostream& operator<<(ostream&, _Setprecision);
-  extern template ostream& operator<<(ostream&, _Setw);
-  extern template istream& operator>>(istream&, _Setfill<char>);
-  extern template istream& operator>>(istream&, _Setiosflags);
-  extern template istream& operator>>(istream&, _Resetiosflags);
-  extern template istream& operator>>(istream&, _Setbase);
-  extern template istream& operator>>(istream&, _Setprecision);
-  extern template istream& operator>>(istream&, _Setw);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template wostream& operator<<(wostream&, _Setfill<wchar_t>);
-  extern template wostream& operator<<(wostream&, _Setiosflags);
-  extern template wostream& operator<<(wostream&, _Resetiosflags);
-  extern template wostream& operator<<(wostream&, _Setbase);
-  extern template wostream& operator<<(wostream&, _Setprecision);
-  extern template wostream& operator<<(wostream&, _Setw);
-  extern template wistream& operator>>(wistream&, _Setfill<wchar_t>);
-  extern template wistream& operator>>(wistream&, _Setiosflags);
-  extern template wistream& operator>>(wistream&, _Resetiosflags);
-  extern template wistream& operator>>(wistream&, _Setbase);
-  extern template wistream& operator>>(wistream&, _Setprecision);
-  extern template wistream& operator>>(wistream&, _Setw);
-#endif
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _GLIBCXX_IOMANIP */
diff --git a/openflow/usr/include/c++/5/ios b/openflow/usr/include/c++/5/ios
deleted file mode 100644
index 7fce3d2..0000000
--- a/openflow/usr/include/c++/5/ios
+++ /dev/null
@@ -1,46 +0,0 @@
-// Iostreams base classes -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/ios
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 14882: 27.4  Iostreams base classes
-//
-
-#ifndef _GLIBCXX_IOS
-#define _GLIBCXX_IOS 1
-
-#pragma GCC system_header
-
-#include <iosfwd>
-#include <exception> 		// For ios_base::failure
-#include <bits/char_traits.h> 	// For char_traits, streamoff, streamsize, fpos
-#include <bits/localefwd.h>	// For class locale
-#include <bits/ios_base.h>	// For ios_base declarations.
-#include <streambuf>
-#include <bits/basic_ios.h>
-
-#endif	/* _GLIBCXX_IOS */
diff --git a/openflow/usr/include/c++/5/iosfwd b/openflow/usr/include/c++/5/iosfwd
deleted file mode 100644
index f77a7a7..0000000
--- a/openflow/usr/include/c++/5/iosfwd
+++ /dev/null
@@ -1,215 +0,0 @@
-// <iosfwd> Forward declarations -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/iosfwd
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 14882: 27.2  Forward declarations
-//
-
-#ifndef _GLIBCXX_IOSFWD
-#define _GLIBCXX_IOSFWD 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stringfwd.h> 	// For string forward declarations.
-#include <bits/postypes.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @defgroup io I/O
-   *
-   *  Nearly all of the I/O classes are parameterized on the type of
-   *  characters they read and write.  (The major exception is ios_base at
-   *  the top of the hierarchy.)  This is a change from pre-Standard
-   *  streams, which were not templates.
-   *
-   *  For ease of use and compatibility, all of the basic_* I/O-related
-   *  classes are given typedef names for both of the builtin character
-   *  widths (wide and narrow).  The typedefs are the same as the
-   *  pre-Standard names, for example:
-   *
-   *  @code
-   *     typedef basic_ifstream<char>  ifstream;
-   *  @endcode
-   *
-   *  Because properly forward-declaring these classes can be difficult, you
-   *  should not do it yourself.  Instead, include the &lt;iosfwd&gt;
-   *  header, which contains only declarations of all the I/O classes as
-   *  well as the typedefs.  Trying to forward-declare the typedefs
-   *  themselves (e.g., <code>class ostream;</code>) is not valid ISO C++.
-   *
-   *  For more specific declarations, see
-   *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/io.html#std.io.objects
-   *
-   *  @{
-  */
-  class ios_base;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_ios;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_streambuf;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_istream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_ostream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_iostream;
-
-
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	    typename _Alloc = allocator<_CharT> >
-    class basic_stringbuf;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	   typename _Alloc = allocator<_CharT> >
-    class basic_istringstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	   typename _Alloc = allocator<_CharT> >
-    class basic_ostringstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	   typename _Alloc = allocator<_CharT> >
-    class basic_stringstream;
-
-_GLIBCXX_END_NAMESPACE_CXX11
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_filebuf;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_ifstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_ofstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_fstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class istreambuf_iterator;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class ostreambuf_iterator;
-
-
-  /// Base class for @c char streams.
-  typedef basic_ios<char> 		ios; 
-
-  /// Base class for @c char buffers.
-  typedef basic_streambuf<char> 	streambuf;
-
-  /// Base class for @c char input streams.
-  typedef basic_istream<char> 		istream;
-
-  /// Base class for @c char output streams.
-  typedef basic_ostream<char> 		ostream;
-
-  /// Base class for @c char mixed input and output streams.
-  typedef basic_iostream<char> 		iostream;
-
-  /// Class for @c char memory buffers.
-  typedef basic_stringbuf<char> 	stringbuf;
-
-  /// Class for @c char input memory streams.
-  typedef basic_istringstream<char> 	istringstream;
-
-  /// Class for @c char output memory streams.
-  typedef basic_ostringstream<char> 	ostringstream;
-
-  /// Class for @c char mixed input and output memory streams.
-  typedef basic_stringstream<char> 	stringstream;
-
-  /// Class for @c char file buffers.
-  typedef basic_filebuf<char> 		filebuf;
-
-  /// Class for @c char input file streams.
-  typedef basic_ifstream<char> 		ifstream;
-
-  /// Class for @c char output file streams.
-  typedef basic_ofstream<char> 		ofstream;
-
-  /// Class for @c char mixed input and output file streams.
-  typedef basic_fstream<char> 		fstream;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /// Base class for @c wchar_t streams.
-  typedef basic_ios<wchar_t> 		wios;
-
-  /// Base class for @c wchar_t buffers.
-  typedef basic_streambuf<wchar_t> 	wstreambuf;
-
-  /// Base class for @c wchar_t input streams.
-  typedef basic_istream<wchar_t> 	wistream;
-
-  /// Base class for @c wchar_t output streams.
-  typedef basic_ostream<wchar_t> 	wostream;
-
-  /// Base class for @c wchar_t mixed input and output streams.
-  typedef basic_iostream<wchar_t> 	wiostream;
-
-  /// Class for @c wchar_t memory buffers.
-  typedef basic_stringbuf<wchar_t> 	wstringbuf;
-
-  /// Class for @c wchar_t input memory streams.
-  typedef basic_istringstream<wchar_t> 	wistringstream;
-
-  /// Class for @c wchar_t output memory streams.
-  typedef basic_ostringstream<wchar_t> 	wostringstream;
-
-  /// Class for @c wchar_t mixed input and output memory streams.
-  typedef basic_stringstream<wchar_t> 	wstringstream;
-
-  /// Class for @c wchar_t file buffers.
-  typedef basic_filebuf<wchar_t> 	wfilebuf;
-
-  /// Class for @c wchar_t input file streams.
-  typedef basic_ifstream<wchar_t> 	wifstream;
-
-  /// Class for @c wchar_t output file streams.
-  typedef basic_ofstream<wchar_t> 	wofstream;
-
-  /// Class for @c wchar_t mixed input and output file streams.
-  typedef basic_fstream<wchar_t> 	wfstream;
-#endif
-  /** @}  */
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _GLIBCXX_IOSFWD */
diff --git a/openflow/usr/include/c++/5/iostream b/openflow/usr/include/c++/5/iostream
deleted file mode 100644
index dad75d0..0000000
--- a/openflow/usr/include/c++/5/iostream
+++ /dev/null
@@ -1,79 +0,0 @@
-// Standard iostream objects -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/iostream
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 14882: 27.3  Standard iostream objects
-//
-
-#ifndef _GLIBCXX_IOSTREAM
-#define _GLIBCXX_IOSTREAM 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <ostream>
-#include <istream>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @name Standard Stream Objects
-   *
-   *  The &lt;iostream&gt; header declares the eight <em>standard stream
-   *  objects</em>.  For other declarations, see
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/io.html
-   *  and the @link iosfwd I/O forward declarations @endlink
-   *
-   *  They are required by default to cooperate with the global C
-   *  library's @c FILE streams, and to be available during program
-   *  startup and termination. For more information, see the section of the
-   *  manual linked to above.
-  */
-  //@{
-  extern istream cin;		/// Linked to standard input
-  extern ostream cout;		/// Linked to standard output
-  extern ostream cerr;		/// Linked to standard error (unbuffered)
-  extern ostream clog;		/// Linked to standard error (buffered)
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern wistream wcin;		/// Linked to standard input
-  extern wostream wcout;	/// Linked to standard output
-  extern wostream wcerr;	/// Linked to standard error (unbuffered)
-  extern wostream wclog;	/// Linked to standard error (buffered)
-#endif
-  //@}
-
-  // For construction of filebuffers for cout, cin, cerr, clog et. al.
-  static ios_base::Init __ioinit;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _GLIBCXX_IOSTREAM */
diff --git a/openflow/usr/include/c++/5/istream b/openflow/usr/include/c++/5/istream
deleted file mode 100644
index 74c0d81..0000000
--- a/openflow/usr/include/c++/5/istream
+++ /dev/null
@@ -1,936 +0,0 @@
-// Input streams -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-//
-// ISO C++ 14882: 27.6.1  Input streams
-//
-
-/** @file include/istream
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_ISTREAM
-#define _GLIBCXX_ISTREAM 1
-
-#pragma GCC system_header
-
-#include <ios>
-#include <ostream>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief  Template class basic_istream.
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *
-   *  This is the base class for all input streams.  It provides text
-   *  formatting of all builtin types, and communicates with any class
-   *  derived from basic_streambuf to do the actual input.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_istream : virtual public basic_ios<_CharT, _Traits>
-    {
-    public:
-      // Types (inherited from basic_ios (27.4.4)):
-      typedef _CharT			 		char_type;
-      typedef typename _Traits::int_type 		int_type;
-      typedef typename _Traits::pos_type 		pos_type;
-      typedef typename _Traits::off_type 		off_type;
-      typedef _Traits			 		traits_type;
-
-      // Non-standard Types:
-      typedef basic_streambuf<_CharT, _Traits> 		__streambuf_type;
-      typedef basic_ios<_CharT, _Traits>		__ios_type;
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef num_get<_CharT, istreambuf_iterator<_CharT, _Traits> >
- 							__num_get_type;
-      typedef ctype<_CharT>	      			__ctype_type;
-
-    protected:
-      // Data Members:
-      /**
-       *  The number of characters extracted in the previous unformatted
-       *  function; see gcount().
-      */
-      streamsize 		_M_gcount;
-
-    public:
-      /**
-       *  @brief  Base constructor.
-       *
-       *  This ctor is almost never called by the user directly, rather from
-       *  derived classes' initialization lists, which pass a pointer to
-       *  their own stream buffer.
-      */
-      explicit
-      basic_istream(__streambuf_type* __sb)
-      : _M_gcount(streamsize(0))
-      { this->init(__sb); }
-
-      /**
-       *  @brief  Base destructor.
-       *
-       *  This does very little apart from providing a virtual base dtor.
-      */
-      virtual
-      ~basic_istream()
-      { _M_gcount = streamsize(0); }
-
-      /// Safe prefix/suffix operations.
-      class sentry;
-      friend class sentry;
-
-      //@{
-      /**
-       *  @brief  Interface for manipulators.
-       *
-       *  Manipulators such as @c std::ws and @c std::dec use these
-       *  functions in constructs like
-       *  <code>std::cin >> std::ws</code>.
-       *  For more information, see the iomanip header.
-      */
-      __istream_type&
-      operator>>(__istream_type& (*__pf)(__istream_type&))
-      { return __pf(*this); }
-
-      __istream_type&
-      operator>>(__ios_type& (*__pf)(__ios_type&))
-      {
-	__pf(*this);
-	return *this;
-      }
-
-      __istream_type&
-      operator>>(ios_base& (*__pf)(ios_base&))
-      {
-	__pf(*this);
-	return *this;
-      }
-      //@}
-
-      //@{
-      /**
-       *  @name Extractors
-       *
-       *  All the @c operator>> functions (aka <em>formatted input
-       *  functions</em>) have some common behavior.  Each starts by
-       *  constructing a temporary object of type std::basic_istream::sentry
-       *  with the second argument (noskipws) set to false.  This has several
-       *  effects, concluding with the setting of a status flag; see the
-       *  sentry documentation for more.
-       *
-       *  If the sentry status is good, the function tries to extract
-       *  whatever data is appropriate for the type of the argument.
-       *
-       *  If an exception is thrown during extraction, ios_base::badbit
-       *  will be turned on in the stream's error state without causing an
-       *  ios_base::failure to be thrown.  The original exception will then
-       *  be rethrown.
-      */
-
-      //@{
-      /**
-       *  @brief  Integer arithmetic extractors
-       *  @param  __n A variable of builtin integral type.
-       *  @return  @c *this if successful
-       *
-       *  These functions use the stream's current locale (specifically, the
-       *  @c num_get facet) to parse the input data.
-      */
-      __istream_type&
-      operator>>(bool& __n)
-      { return _M_extract(__n); }
-
-      __istream_type&
-      operator>>(short& __n);
-
-      __istream_type&
-      operator>>(unsigned short& __n)
-      { return _M_extract(__n); }
-
-      __istream_type&
-      operator>>(int& __n);
-
-      __istream_type&
-      operator>>(unsigned int& __n)
-      { return _M_extract(__n); }
-
-      __istream_type&
-      operator>>(long& __n)
-      { return _M_extract(__n); }
-
-      __istream_type&
-      operator>>(unsigned long& __n)
-      { return _M_extract(__n); }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      __istream_type&
-      operator>>(long long& __n)
-      { return _M_extract(__n); }
-
-      __istream_type&
-      operator>>(unsigned long long& __n)
-      { return _M_extract(__n); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief  Floating point arithmetic extractors
-       *  @param  __f A variable of builtin floating point type.
-       *  @return  @c *this if successful
-       *
-       *  These functions use the stream's current locale (specifically, the
-       *  @c num_get facet) to parse the input data.
-      */
-      __istream_type&
-      operator>>(float& __f)
-      { return _M_extract(__f); }
-
-      __istream_type&
-      operator>>(double& __f)
-      { return _M_extract(__f); }
-
-      __istream_type&
-      operator>>(long double& __f)
-      { return _M_extract(__f); }
-      //@}
-
-      /**
-       *  @brief  Basic arithmetic extractors
-       *  @param  __p A variable of pointer type.
-       *  @return  @c *this if successful
-       *
-       *  These functions use the stream's current locale (specifically, the
-       *  @c num_get facet) to parse the input data.
-      */
-      __istream_type&
-      operator>>(void*& __p)
-      { return _M_extract(__p); }
-
-      /**
-       *  @brief  Extracting into another streambuf.
-       *  @param  __sb  A pointer to a streambuf
-       *
-       *  This function behaves like one of the basic arithmetic extractors,
-       *  in that it also constructs a sentry object and has the same error
-       *  handling behavior.
-       *
-       *  If @p __sb is NULL, the stream will set failbit in its error state.
-       *
-       *  Characters are extracted from this stream and inserted into the
-       *  @p __sb streambuf until one of the following occurs:
-       *
-       *  - the input stream reaches end-of-file,
-       *  - insertion into the output buffer fails (in this case, the
-       *    character that would have been inserted is not extracted), or
-       *  - an exception occurs (and in this case is caught)
-       *
-       *  If the function inserts no characters, failbit is set.
-      */
-      __istream_type&
-      operator>>(__streambuf_type* __sb);
-      //@}
-
-      // [27.6.1.3] unformatted input
-      /**
-       *  @brief  Character counting
-       *  @return  The number of characters extracted by the previous
-       *           unformatted input function dispatched for this stream.
-      */
-      streamsize
-      gcount() const
-      { return _M_gcount; }
-
-      //@{
-      /**
-       *  @name Unformatted Input Functions
-       *
-       *  All the unformatted input functions have some common behavior.
-       *  Each starts by constructing a temporary object of type
-       *  std::basic_istream::sentry with the second argument (noskipws)
-       *  set to true.  This has several effects, concluding with the
-       *  setting of a status flag; see the sentry documentation for more.
-       *
-       *  If the sentry status is good, the function tries to extract
-       *  whatever data is appropriate for the type of the argument.
-       *
-       *  The number of characters extracted is stored for later retrieval
-       *  by gcount().
-       *
-       *  If an exception is thrown during extraction, ios_base::badbit
-       *  will be turned on in the stream's error state without causing an
-       *  ios_base::failure to be thrown.  The original exception will then
-       *  be rethrown.
-      */
-
-      /**
-       *  @brief  Simple extraction.
-       *  @return  A character, or eof().
-       *
-       *  Tries to extract a character.  If none are available, sets failbit
-       *  and returns traits::eof().
-      */
-      int_type
-      get();
-
-      /**
-       *  @brief  Simple extraction.
-       *  @param  __c  The character in which to store data.
-       *  @return  *this
-       *
-       *  Tries to extract a character and store it in @a __c.  If none are
-       *  available, sets failbit and returns traits::eof().
-       *
-       *  @note  This function is not overloaded on signed char and
-       *         unsigned char.
-      */
-      __istream_type&
-      get(char_type& __c);
-
-      /**
-       *  @brief  Simple multiple-character extraction.
-       *  @param  __s  Pointer to an array.
-       *  @param  __n  Maximum number of characters to store in @a __s.
-       *  @param  __delim  A "stop" character.
-       *  @return  *this
-       *
-       *  Characters are extracted and stored into @a __s until one of the
-       *  following happens:
-       *
-       *  - @c __n-1 characters are stored
-       *  - the input sequence reaches EOF
-       *  - the next character equals @a __delim, in which case the character
-       *    is not extracted
-       *
-       * If no characters are stored, failbit is set in the stream's error
-       * state.
-       *
-       * In any case, a null character is stored into the next location in
-       * the array.
-       *
-       *  @note  This function is not overloaded on signed char and
-       *         unsigned char.
-      */
-      __istream_type&
-      get(char_type* __s, streamsize __n, char_type __delim);
-
-      /**
-       *  @brief  Simple multiple-character extraction.
-       *  @param  __s  Pointer to an array.
-       *  @param  __n  Maximum number of characters to store in @a s.
-       *  @return  *this
-       *
-       *  Returns @c get(__s,__n,widen(&apos;\\n&apos;)).
-      */
-      __istream_type&
-      get(char_type* __s, streamsize __n)
-      { return this->get(__s, __n, this->widen('\n')); }
-
-      /**
-       *  @brief  Extraction into another streambuf.
-       *  @param  __sb  A streambuf in which to store data.
-       *  @param  __delim  A "stop" character.
-       *  @return  *this
-       *
-       *  Characters are extracted and inserted into @a __sb until one of the
-       *  following happens:
-       *
-       *  - the input sequence reaches EOF
-       *  - insertion into the output buffer fails (in this case, the
-       *    character that would have been inserted is not extracted)
-       *  - the next character equals @a __delim (in this case, the character
-       *    is not extracted)
-       *  - an exception occurs (and in this case is caught)
-       *
-       * If no characters are stored, failbit is set in the stream's error
-       * state.
-      */
-      __istream_type&
-      get(__streambuf_type& __sb, char_type __delim);
-
-      /**
-       *  @brief  Extraction into another streambuf.
-       *  @param  __sb  A streambuf in which to store data.
-       *  @return  *this
-       *
-       *  Returns @c get(__sb,widen(&apos;\\n&apos;)).
-      */
-      __istream_type&
-      get(__streambuf_type& __sb)
-      { return this->get(__sb, this->widen('\n')); }
-
-      /**
-       *  @brief  String extraction.
-       *  @param  __s  A character array in which to store the data.
-       *  @param  __n  Maximum number of characters to extract.
-       *  @param  __delim  A "stop" character.
-       *  @return  *this
-       *
-       *  Extracts and stores characters into @a __s until one of the
-       *  following happens.  Note that these criteria are required to be
-       *  tested in the order listed here, to allow an input line to exactly
-       *  fill the @a __s array without setting failbit.
-       *
-       *  -# the input sequence reaches end-of-file, in which case eofbit
-       *     is set in the stream error state
-       *  -# the next character equals @c __delim, in which case the character
-       *     is extracted (and therefore counted in @c gcount()) but not stored
-       *  -# @c __n-1 characters are stored, in which case failbit is set
-       *     in the stream error state
-       *
-       *  If no characters are extracted, failbit is set.  (An empty line of
-       *  input should therefore not cause failbit to be set.)
-       *
-       *  In any case, a null character is stored in the next location in
-       *  the array.
-      */
-      __istream_type&
-      getline(char_type* __s, streamsize __n, char_type __delim);
-
-      /**
-       *  @brief  String extraction.
-       *  @param  __s  A character array in which to store the data.
-       *  @param  __n  Maximum number of characters to extract.
-       *  @return  *this
-       *
-       *  Returns @c getline(__s,__n,widen(&apos;\\n&apos;)).
-      */
-      __istream_type&
-      getline(char_type* __s, streamsize __n)
-      { return this->getline(__s, __n, this->widen('\n')); }
-
-      /**
-       *  @brief  Discarding characters
-       *  @param  __n  Number of characters to discard.
-       *  @param  __delim  A "stop" character.
-       *  @return  *this
-       *
-       *  Extracts characters and throws them away until one of the
-       *  following happens:
-       *  - if @a __n @c != @c std::numeric_limits<int>::max(), @a __n
-       *    characters are extracted
-       *  - the input sequence reaches end-of-file
-       *  - the next character equals @a __delim (in this case, the character
-       *    is extracted); note that this condition will never occur if
-       *    @a __delim equals @c traits::eof().
-       *
-       *  NB: Provide three overloads, instead of the single function
-       *  (with defaults) mandated by the Standard: this leads to a
-       *  better performing implementation, while still conforming to
-       *  the Standard.
-      */
-      __istream_type&
-      ignore(streamsize __n, int_type __delim);
-
-      __istream_type&
-      ignore(streamsize __n);
-
-      __istream_type&
-      ignore();
-
-      /**
-       *  @brief  Looking ahead in the stream
-       *  @return  The next character, or eof().
-       *
-       *  If, after constructing the sentry object, @c good() is false,
-       *  returns @c traits::eof().  Otherwise reads but does not extract
-       *  the next input character.
-      */
-      int_type
-      peek();
-
-      /**
-       *  @brief  Extraction without delimiters.
-       *  @param  __s  A character array.
-       *  @param  __n  Maximum number of characters to store.
-       *  @return  *this
-       *
-       *  If the stream state is @c good(), extracts characters and stores
-       *  them into @a __s until one of the following happens:
-       *  - @a __n characters are stored
-       *  - the input sequence reaches end-of-file, in which case the error
-       *    state is set to @c failbit|eofbit.
-       *
-       *  @note  This function is not overloaded on signed char and
-       *         unsigned char.
-      */
-      __istream_type&
-      read(char_type* __s, streamsize __n);
-
-      /**
-       *  @brief  Extraction until the buffer is exhausted, but no more.
-       *  @param  __s  A character array.
-       *  @param  __n  Maximum number of characters to store.
-       *  @return  The number of characters extracted.
-       *
-       *  Extracts characters and stores them into @a __s depending on the
-       *  number of characters remaining in the streambuf's buffer,
-       *  @c rdbuf()->in_avail(), called @c A here:
-       *  - if @c A @c == @c -1, sets eofbit and extracts no characters
-       *  - if @c A @c == @c 0, extracts no characters
-       *  - if @c A @c > @c 0, extracts @c min(A,n)
-       *
-       *  The goal is to empty the current buffer, and to not request any
-       *  more from the external input sequence controlled by the streambuf.
-      */
-      streamsize
-      readsome(char_type* __s, streamsize __n);
-
-      /**
-       *  @brief  Unextracting a single character.
-       *  @param  __c  The character to push back into the input stream.
-       *  @return  *this
-       *
-       *  If @c rdbuf() is not null, calls @c rdbuf()->sputbackc(c).
-       *
-       *  If @c rdbuf() is null or if @c sputbackc() fails, sets badbit in
-       *  the error state.
-       *
-       *  @note  This function first clears eofbit.  Since no characters
-       *         are extracted, the next call to @c gcount() will return 0,
-       *         as required by DR 60.
-      */
-      __istream_type&
-      putback(char_type __c);
-
-      /**
-       *  @brief  Unextracting the previous character.
-       *  @return  *this
-       *
-       *  If @c rdbuf() is not null, calls @c rdbuf()->sungetc(c).
-       *
-       *  If @c rdbuf() is null or if @c sungetc() fails, sets badbit in
-       *  the error state.
-       *
-       *  @note  This function first clears eofbit.  Since no characters
-       *         are extracted, the next call to @c gcount() will return 0,
-       *         as required by DR 60.
-      */
-      __istream_type&
-      unget();
-
-      /**
-       *  @brief  Synchronizing the stream buffer.
-       *  @return  0 on success, -1 on failure
-       *
-       *  If @c rdbuf() is a null pointer, returns -1.
-       *
-       *  Otherwise, calls @c rdbuf()->pubsync(), and if that returns -1,
-       *  sets badbit and returns -1.
-       *
-       *  Otherwise, returns 0.
-       *
-       *  @note  This function does not count the number of characters
-       *         extracted, if any, and therefore does not affect the next
-       *         call to @c gcount().
-      */
-      int
-      sync();
-
-      /**
-       *  @brief  Getting the current read position.
-       *  @return  A file position object.
-       *
-       *  If @c fail() is not false, returns @c pos_type(-1) to indicate
-       *  failure.  Otherwise returns @c rdbuf()->pubseekoff(0,cur,in).
-       *
-       *  @note  This function does not count the number of characters
-       *         extracted, if any, and therefore does not affect the next
-       *         call to @c gcount().  At variance with putback, unget and
-       *         seekg, eofbit is not cleared first.
-      */
-      pos_type
-      tellg();
-
-      /**
-       *  @brief  Changing the current read position.
-       *  @param  __pos  A file position object.
-       *  @return  *this
-       *
-       *  If @c fail() is not true, calls @c rdbuf()->pubseekpos(__pos).  If
-       *  that function fails, sets failbit.
-       *
-       *  @note  This function first clears eofbit.  It does not count the
-       *         number of characters extracted, if any, and therefore does
-       *         not affect the next call to @c gcount().
-      */
-      __istream_type&
-      seekg(pos_type);
-
-      /**
-       *  @brief  Changing the current read position.
-       *  @param  __off  A file offset object.
-       *  @param  __dir  The direction in which to seek.
-       *  @return  *this
-       *
-       *  If @c fail() is not true, calls @c rdbuf()->pubseekoff(__off,__dir).
-       *  If that function fails, sets failbit.
-       *
-       *  @note  This function first clears eofbit.  It does not count the
-       *         number of characters extracted, if any, and therefore does
-       *         not affect the next call to @c gcount().
-      */
-      __istream_type&
-      seekg(off_type, ios_base::seekdir);
-      //@}
-
-    protected:
-      basic_istream()
-      : _M_gcount(streamsize(0))
-      { this->init(0); }
-
-#if __cplusplus >= 201103L
-      basic_istream(const basic_istream&) = delete;
-
-      basic_istream(basic_istream&& __rhs)
-      : __ios_type(), _M_gcount(__rhs._M_gcount)
-      {
-	__ios_type::move(__rhs);
-	__rhs._M_gcount = 0;
-      }
-
-      // 27.7.3.3 Assign/swap
-
-      basic_istream& operator=(const basic_istream&) = delete;
-
-      basic_istream&
-      operator=(basic_istream&& __rhs)
-      {
-	swap(__rhs);
-	return *this;
-      }
-
-      void
-      swap(basic_istream& __rhs)
-      {
-	__ios_type::swap(__rhs);
-	std::swap(_M_gcount, __rhs._M_gcount);
-      }
-#endif
-
-      template<typename _ValueT>
-	__istream_type&
-	_M_extract(_ValueT& __v);
-    };
-
-  /// Explicit specialization declarations, defined in src/istream.cc.
-  template<>
-    basic_istream<char>&
-    basic_istream<char>::
-    getline(char_type* __s, streamsize __n, char_type __delim);
-
-  template<>
-    basic_istream<char>&
-    basic_istream<char>::
-    ignore(streamsize __n);
-
-  template<>
-    basic_istream<char>&
-    basic_istream<char>::
-    ignore(streamsize __n, int_type __delim);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    basic_istream<wchar_t>&
-    basic_istream<wchar_t>::
-    getline(char_type* __s, streamsize __n, char_type __delim);
-
-  template<>
-    basic_istream<wchar_t>&
-    basic_istream<wchar_t>::
-    ignore(streamsize __n);
-
-  template<>
-    basic_istream<wchar_t>&
-    basic_istream<wchar_t>::
-    ignore(streamsize __n, int_type __delim);
-#endif
-
-  /**
-   *  @brief  Performs setup work for input streams.
-   *
-   *  Objects of this class are created before all of the standard
-   *  extractors are run.  It is responsible for <em>exception-safe
-   *  prefix and suffix operations,</em> although only prefix actions
-   *  are currently required by the standard.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_istream<_CharT, _Traits>::sentry
-    {
-      // Data Members.
-      bool _M_ok;
-
-    public:
-      /// Easy access to dependent types.
-      typedef _Traits 					traits_type;
-      typedef basic_streambuf<_CharT, _Traits> 		__streambuf_type;
-      typedef basic_istream<_CharT, _Traits> 		__istream_type;
-      typedef typename __istream_type::__ctype_type 	__ctype_type;
-      typedef typename _Traits::int_type		__int_type;
-
-      /**
-       *  @brief  The constructor performs all the work.
-       *  @param  __is  The input stream to guard.
-       *  @param  __noskipws  Whether to consume whitespace or not.
-       *
-       *  If the stream state is good (@a __is.good() is true), then the
-       *  following actions are performed, otherwise the sentry state
-       *  is false (<em>not okay</em>) and failbit is set in the
-       *  stream state.
-       *
-       *  The sentry's preparatory actions are:
-       *
-       *  -# if the stream is tied to an output stream, @c is.tie()->flush()
-       *     is called to synchronize the output sequence
-       *  -# if @a __noskipws is false, and @c ios_base::skipws is set in
-       *     @c is.flags(), the sentry extracts and discards whitespace
-       *     characters from the stream.  The currently imbued locale is
-       *     used to determine whether each character is whitespace.
-       *
-       *  If the stream state is still good, then the sentry state becomes
-       *  true (@a okay).
-      */
-      explicit
-      sentry(basic_istream<_CharT, _Traits>& __is, bool __noskipws = false);
-
-      /**
-       *  @brief  Quick status checking.
-       *  @return  The sentry state.
-       *
-       *  For ease of use, sentries may be converted to booleans.  The
-       *  return value is that of the sentry state (true == okay).
-      */
-#if __cplusplus >= 201103L
-      explicit
-#endif
-      operator bool() const
-      { return _M_ok; }
-    };
-
-  //@{
-  /**
-   *  @brief  Character extractors
-   *  @param  __in  An input stream.
-   *  @param  __c  A character reference.
-   *  @return  in
-   *
-   *  Behaves like one of the formatted arithmetic extractors described in
-   *  std::basic_istream.  After constructing a sentry object with good
-   *  status, this function extracts a character (if one is available) and
-   *  stores it in @a __c.  Otherwise, sets failbit in the input stream.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c);
-
-  template<class _Traits>
-    inline basic_istream<char, _Traits>&
-    operator>>(basic_istream<char, _Traits>& __in, unsigned char& __c)
-    { return (__in >> reinterpret_cast<char&>(__c)); }
-
-  template<class _Traits>
-    inline basic_istream<char, _Traits>&
-    operator>>(basic_istream<char, _Traits>& __in, signed char& __c)
-    { return (__in >> reinterpret_cast<char&>(__c)); }
-  //@}
-
-  //@{
-  /**
-   *  @brief  Character string extractors
-   *  @param  __in  An input stream.
-   *  @param  __s  A pointer to a character array.
-   *  @return  __in
-   *
-   *  Behaves like one of the formatted arithmetic extractors described in
-   *  std::basic_istream.  After constructing a sentry object with good
-   *  status, this function extracts up to @c n characters and stores them
-   *  into the array starting at @a __s.  @c n is defined as:
-   *
-   *  - if @c width() is greater than zero, @c n is width() otherwise
-   *  - @c n is <em>the number of elements of the largest array of *
-   *  - @c char_type that can store a terminating @c eos.</em>
-   *  - [27.6.1.2.3]/6
-   *
-   *  Characters are extracted and stored until one of the following happens:
-   *  - @c n-1 characters are stored
-   *  - EOF is reached
-   *  - the next character is whitespace according to the current locale
-   *  - the next character is a null byte (i.e., @c charT() )
-   *
-   *  @c width(0) is then called for the input stream.
-   *
-   *  If no characters are extracted, sets failbit.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s);
-
-  // Explicit specialization declaration, defined in src/istream.cc.
-  template<>
-    basic_istream<char>&
-    operator>>(basic_istream<char>& __in, char* __s);
-
-  template<class _Traits>
-    inline basic_istream<char, _Traits>&
-    operator>>(basic_istream<char, _Traits>& __in, unsigned char* __s)
-    { return (__in >> reinterpret_cast<char*>(__s)); }
-
-  template<class _Traits>
-    inline basic_istream<char, _Traits>&
-    operator>>(basic_istream<char, _Traits>& __in, signed char* __s)
-    { return (__in >> reinterpret_cast<char*>(__s)); }
-  //@}
-
-  /**
-   *  @brief  Template class basic_iostream
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *
-   *  This class multiply inherits from the input and output stream classes
-   *  simply to provide a single interface.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_iostream
-    : public basic_istream<_CharT, _Traits>,
-      public basic_ostream<_CharT, _Traits>
-    {
-    public:
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 271. basic_iostream missing typedefs
-      // Types (inherited):
-      typedef _CharT			 		char_type;
-      typedef typename _Traits::int_type 		int_type;
-      typedef typename _Traits::pos_type 		pos_type;
-      typedef typename _Traits::off_type 		off_type;
-      typedef _Traits			 		traits_type;
-
-      // Non-standard Types:
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef basic_ostream<_CharT, _Traits>		__ostream_type;
-
-      /**
-       *  @brief  Constructor does nothing.
-       *
-       *  Both of the parent classes are initialized with the same
-       *  streambuf pointer passed to this constructor.
-      */
-      explicit
-      basic_iostream(basic_streambuf<_CharT, _Traits>* __sb)
-      : __istream_type(__sb), __ostream_type(__sb) { }
-
-      /**
-       *  @brief  Destructor does nothing.
-      */
-      virtual
-      ~basic_iostream() { }
-
-    protected:
-      basic_iostream()
-      : __istream_type(), __ostream_type() { }
-
-#if __cplusplus >= 201103L
-      basic_iostream(const basic_iostream&) = delete;
-
-      basic_iostream(basic_iostream&& __rhs)
-      : __istream_type(std::move(__rhs)), __ostream_type(*this)
-      { }
-
-      // 27.7.3.3 Assign/swap
-
-      basic_iostream& operator=(const basic_iostream&) = delete;
-
-      basic_iostream&
-      operator=(basic_iostream&& __rhs)
-      {
-	swap(__rhs);
-	return *this;
-      }
-
-      void
-      swap(basic_iostream& __rhs)
-      { __istream_type::swap(__rhs); }
-#endif
-    };
-
-  /**
-   *  @brief  Quick and easy way to eat whitespace
-   *
-   *  This manipulator extracts whitespace characters, stopping when the
-   *  next character is non-whitespace, or when the input sequence is empty.
-   *  If the sequence is empty, @c eofbit is set in the stream, but not
-   *  @c failbit.
-   *
-   *  The current locale is used to distinguish whitespace characters.
-   *
-   *  Example:
-   *  @code
-   *     MyClass   mc;
-   *
-   *     std::cin >> std::ws >> mc;
-   *  @endcode
-   *  will skip leading whitespace before calling operator>> on cin and your
-   *  object.  Note that the same effect can be achieved by creating a
-   *  std::basic_istream::sentry inside your definition of operator>>.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    ws(basic_istream<_CharT, _Traits>& __is);
-
-#if __cplusplus >= 201103L
-  // [27.7.1.6] Rvalue stream extraction
-  /**
-   *  @brief  Generic extractor for rvalue stream
-   *  @param  __is  An input stream.
-   *  @param  __x  A reference to the extraction target.
-   *  @return  is
-   *
-   *  This is just a forwarding function to allow extraction from
-   *  rvalue streams since they won't bind to the extractor functions
-   *  that take an lvalue reference.
-  */
-  template<typename _CharT, typename _Traits, typename _Tp>
-    inline basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>&& __is, _Tp& __x)
-    { 
-      __is >> __x;
-      return __is;
-    }
-#endif // C++11
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#include <bits/istream.tcc>
-
-#endif	/* _GLIBCXX_ISTREAM */
diff --git a/openflow/usr/include/c++/5/iterator b/openflow/usr/include/c++/5/iterator
deleted file mode 100644
index fa8bf58..0000000
--- a/openflow/usr/include/c++/5/iterator
+++ /dev/null
@@ -1,70 +0,0 @@
-// <iterator> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/iterator
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_ITERATOR
-#define _GLIBCXX_ITERATOR 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stl_iterator_base_types.h>
-#include <bits/stl_iterator_base_funcs.h>
-#include <bits/stl_iterator.h>
-#include <ostream>
-#include <istream>
-#include <bits/stream_iterator.h>
-#include <bits/streambuf_iterator.h>
-#include <bits/range_access.h>
-
-#endif /* _GLIBCXX_ITERATOR */
diff --git a/openflow/usr/include/c++/5/limits b/openflow/usr/include/c++/5/limits
deleted file mode 100644
index 793683f..0000000
--- a/openflow/usr/include/c++/5/limits
+++ /dev/null
@@ -1,1826 +0,0 @@
-// The template and inlines for the numeric_limits classes. -*- C++ -*-
-
-// Copyright (C) 1999-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/limits
- *  This is a Standard C++ Library header.
- */
-
-// Note: this is not a conforming implementation.
-// Written by Gabriel Dos Reis <gdr@codesourcery.com>
-
-//
-// ISO 14882:1998
-// 18.2.1
-//
-
-#ifndef _GLIBCXX_NUMERIC_LIMITS
-#define _GLIBCXX_NUMERIC_LIMITS 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-//
-// The numeric_limits<> traits document implementation-defined aspects
-// of fundamental arithmetic data types (integers and floating points).
-// From Standard C++ point of view, there are 14 such types:
-//   * integers
-//         bool							(1)
-//         char, signed char, unsigned char, wchar_t            (4)
-//         short, unsigned short				(2)
-//         int, unsigned					(2)
-//         long, unsigned long					(2)
-//
-//   * floating points
-//         float						(1)
-//         double						(1)
-//         long double						(1)
-//
-// GNU C++ understands (where supported by the host C-library)
-//   * integer
-//         long long, unsigned long long			(2)
-//
-// which brings us to 16 fundamental arithmetic data types in GNU C++.
-//
-//
-// Since a numeric_limits<> is a bit tricky to get right, we rely on
-// an interface composed of macros which should be defined in config/os
-// or config/cpu when they differ from the generic (read arbitrary)
-// definitions given here.
-//
-
-// These values can be overridden in the target configuration file.
-// The default values are appropriate for many 32-bit targets.
-
-// GCC only intrinsically supports modulo integral types.  The only remaining
-// integral exceptional values is division by zero.  Only targets that do not
-// signal division by zero in some "hard to ignore" way should use false.
-#ifndef __glibcxx_integral_traps
-# define __glibcxx_integral_traps true
-#endif
-
-// float
-//
-
-// Default values.  Should be overridden in configuration files if necessary.
-
-#ifndef __glibcxx_float_has_denorm_loss
-#  define __glibcxx_float_has_denorm_loss false
-#endif
-#ifndef __glibcxx_float_traps
-#  define __glibcxx_float_traps false
-#endif
-#ifndef __glibcxx_float_tinyness_before
-#  define __glibcxx_float_tinyness_before false
-#endif
-
-// double
-
-// Default values.  Should be overridden in configuration files if necessary.
-
-#ifndef __glibcxx_double_has_denorm_loss
-#  define __glibcxx_double_has_denorm_loss false
-#endif
-#ifndef __glibcxx_double_traps
-#  define __glibcxx_double_traps false
-#endif
-#ifndef __glibcxx_double_tinyness_before
-#  define __glibcxx_double_tinyness_before false
-#endif
-
-// long double
-
-// Default values.  Should be overridden in configuration files if necessary.
-
-#ifndef __glibcxx_long_double_has_denorm_loss
-#  define __glibcxx_long_double_has_denorm_loss false
-#endif
-#ifndef __glibcxx_long_double_traps
-#  define __glibcxx_long_double_traps false
-#endif
-#ifndef __glibcxx_long_double_tinyness_before
-#  define __glibcxx_long_double_tinyness_before false
-#endif
-
-// You should not need to define any macros below this point.
-
-#define __glibcxx_signed_b(T,B)	((T)(-1) < 0)
-
-#define __glibcxx_min_b(T,B)					\
-  (__glibcxx_signed_b (T,B) ? -__glibcxx_max_b (T,B) - 1 : (T)0)
-
-#define __glibcxx_max_b(T,B)						\
-  (__glibcxx_signed_b (T,B) ?						\
-   (((((T)1 << (__glibcxx_digits_b (T,B) - 1)) - 1) << 1) + 1) : ~(T)0)
-
-#define __glibcxx_digits_b(T,B)				\
-  (B - __glibcxx_signed_b (T,B))
-
-// The fraction 643/2136 approximates log10(2) to 7 significant digits.
-#define __glibcxx_digits10_b(T,B)		\
-  (__glibcxx_digits_b (T,B) * 643L / 2136)
-
-#define __glibcxx_signed(T) \
-  __glibcxx_signed_b (T, sizeof(T) * __CHAR_BIT__)
-#define __glibcxx_min(T) \
-  __glibcxx_min_b (T, sizeof(T) * __CHAR_BIT__)
-#define __glibcxx_max(T) \
-  __glibcxx_max_b (T, sizeof(T) * __CHAR_BIT__)
-#define __glibcxx_digits(T) \
-  __glibcxx_digits_b (T, sizeof(T) * __CHAR_BIT__)
-#define __glibcxx_digits10(T) \
-  __glibcxx_digits10_b (T, sizeof(T) * __CHAR_BIT__)
-
-#define __glibcxx_max_digits10(T) \
-  (2 + (T) * 643L / 2136)
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief Describes the rounding style for floating-point types.
-   *
-   *  This is used in the std::numeric_limits class.
-  */
-  enum float_round_style
-  {
-    round_indeterminate       = -1,    /// Intermediate.
-    round_toward_zero         = 0,     /// To zero.
-    round_to_nearest          = 1,     /// To the nearest representable value.
-    round_toward_infinity     = 2,     /// To infinity.
-    round_toward_neg_infinity = 3      /// To negative infinity.
-  };
-
-  /**
-   *  @brief Describes the denormalization for floating-point types.
-   *
-   *  These values represent the presence or absence of a variable number
-   *  of exponent bits.  This type is used in the std::numeric_limits class.
-  */
-  enum float_denorm_style
-  {
-    /// Indeterminate at compile time whether denormalized values are allowed.
-    denorm_indeterminate = -1,
-    /// The type does not allow denormalized values.
-    denorm_absent        = 0,
-    /// The type allows denormalized values.
-    denorm_present       = 1
-  };
-
-  /**
-   *  @brief Part of std::numeric_limits.
-   *
-   *  The @c static @c const members are usable as integral constant
-   *  expressions.
-   *
-   *  @note This is a separate class for purposes of efficiency; you
-   *        should only access these members as part of an instantiation
-   *        of the std::numeric_limits class.
-  */
-  struct __numeric_limits_base
-  {
-    /** This will be true for all fundamental types (which have
-	specializations), and false for everything else.  */
-    static _GLIBCXX_USE_CONSTEXPR bool is_specialized = false;
-
-    /** The number of @c radix digits that be represented without change:  for
-	integer types, the number of non-sign bits in the mantissa; for
-	floating types, the number of @c radix digits in the mantissa.  */
-    static _GLIBCXX_USE_CONSTEXPR int digits = 0;
-
-    /** The number of base 10 digits that can be represented without change. */
-    static _GLIBCXX_USE_CONSTEXPR int digits10 = 0;
-
-#if __cplusplus >= 201103L
-    /** The number of base 10 digits required to ensure that values which
-	differ are always differentiated.  */
-    static constexpr int max_digits10 = 0;
-#endif
-
-    /** True if the type is signed.  */
-    static _GLIBCXX_USE_CONSTEXPR bool is_signed = false;
-
-    /** True if the type is integer.  */
-    static _GLIBCXX_USE_CONSTEXPR bool is_integer = false;
-
-    /** True if the type uses an exact representation. All integer types are
-	exact, but not all exact types are integer.  For example, rational and
-	fixed-exponent representations are exact but not integer. */
-    static _GLIBCXX_USE_CONSTEXPR bool is_exact = false;
-
-    /** For integer types, specifies the base of the representation.  For
-	floating types, specifies the base of the exponent representation.  */
-    static _GLIBCXX_USE_CONSTEXPR int radix = 0;
-
-    /** The minimum negative integer such that @c radix raised to the power of
-	(one less than that integer) is a normalized floating point number.  */
-    static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-
-    /** The minimum negative integer such that 10 raised to that power is in
-	the range of normalized floating point numbers.  */
-    static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-
-    /** The maximum positive integer such that @c radix raised to the power of
-	(one less than that integer) is a representable finite floating point
-	number.  */
-    static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-
-    /** The maximum positive integer such that 10 raised to that power is in
-	the range of representable finite floating point numbers.  */
-    static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-    /** True if the type has a representation for positive infinity.  */
-    static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-
-    /** True if the type has a representation for a quiet (non-signaling)
-	Not a Number.  */
-    static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-
-    /** True if the type has a representation for a signaling
-	Not a Number.  */
-    static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-
-    /** See std::float_denorm_style for more information.  */
-    static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm = denorm_absent;
-
-    /** True if loss of accuracy is detected as a denormalization loss,
-	rather than as an inexact result. */
-    static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-    /** True if-and-only-if the type adheres to the IEC 559 standard, also
-	known as IEEE 754.  (Only makes sense for floating point types.)  */
-    static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-
-    /** True if the set of values representable by the type is
-	finite.  All built-in types are bounded, this member would be
-	false for arbitrary precision types. */
-    static _GLIBCXX_USE_CONSTEXPR bool is_bounded = false;
-
-    /** True if the type is @e modulo. A type is modulo if, for any
-	operation involving +, -, or * on values of that type whose
-	result would fall outside the range [min(),max()], the value
-	returned differs from the true value by an integer multiple of
-	max() - min() + 1. On most machines, this is false for floating
-	types, true for unsigned integers, and true for signed integers.
-	See PR22200 about signed integers.  */
-    static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
-
-    /** True if trapping is implemented for this type.  */
-    static _GLIBCXX_USE_CONSTEXPR bool traps = false;
-
-    /** True if tininess is detected before rounding.  (see IEC 559)  */
-    static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-
-    /** See std::float_round_style for more information.  This is only
-	meaningful for floating types; integer types will all be
-	round_toward_zero.  */
-    static _GLIBCXX_USE_CONSTEXPR float_round_style round_style = 
-						    round_toward_zero;
-  };
-
-  /**
-   *  @brief Properties of fundamental types.
-   *
-   *  This class allows a program to obtain information about the
-   *  representation of a fundamental type on a given platform.  For
-   *  non-fundamental types, the functions will return 0 and the data
-   *  members will all be @c false.
-   *
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS:  DRs 201 and 184 (hi Gaby!) are
-   *  noted, but not incorporated in this documented (yet).
-  */
-  template<typename _Tp>
-    struct numeric_limits : public __numeric_limits_base
-    {
-      /** The minimum finite value, or for floating types with
-	  denormalization, the minimum positive normalized value.  */
-      static _GLIBCXX_CONSTEXPR _Tp
-      min() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
-
-      /** The maximum finite value.  */
-      static _GLIBCXX_CONSTEXPR _Tp
-      max() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
-
-#if __cplusplus >= 201103L
-      /** A finite value x such that there is no other finite value y
-       *  where y < x.  */
-      static constexpr _Tp
-      lowest() noexcept { return _Tp(); }
-#endif
-
-      /** The @e machine @e epsilon:  the difference between 1 and the least
-	  value greater than 1 that is representable.  */
-      static _GLIBCXX_CONSTEXPR _Tp
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
-
-      /** The maximum rounding error measurement (see LIA-1).  */
-      static _GLIBCXX_CONSTEXPR _Tp
-      round_error() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
-
-      /** The representation of positive infinity, if @c has_infinity.  */
-      static _GLIBCXX_CONSTEXPR _Tp
-      infinity() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
-
-      /** The representation of a quiet Not a Number,
-	  if @c has_quiet_NaN. */
-      static _GLIBCXX_CONSTEXPR _Tp
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
-
-      /** The representation of a signaling Not a Number, if
-	  @c has_signaling_NaN. */
-      static _GLIBCXX_CONSTEXPR _Tp
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
-
-      /** The minimum positive denormalized value.  For types where
-	  @c has_denorm is false, this is the minimum positive normalized
-	  value.  */
-      static _GLIBCXX_CONSTEXPR _Tp
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return _Tp(); }
-    };
-
-#if __cplusplus >= 201103L
-  template<typename _Tp>
-    struct numeric_limits<const _Tp>
-    : public numeric_limits<_Tp> { };
-
-  template<typename _Tp>
-    struct numeric_limits<volatile _Tp>
-    : public numeric_limits<_Tp> { };
-
-  template<typename _Tp>
-    struct numeric_limits<const volatile _Tp>
-    : public numeric_limits<_Tp> { };
-#endif
-
-  // Now there follow 16 explicit specializations.  Yes, 16.  Make sure
-  // you get the count right. (18 in c++0x mode)
-
-  /// numeric_limits<bool> specialization.
-  template<>
-    struct numeric_limits<bool>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR bool 
-      min() _GLIBCXX_USE_NOEXCEPT { return false; }
-
-      static _GLIBCXX_CONSTEXPR bool 
-      max() _GLIBCXX_USE_NOEXCEPT { return true; }
-
-#if __cplusplus >= 201103L
-      static constexpr bool
-      lowest() noexcept { return min(); }
-#endif
-      static _GLIBCXX_USE_CONSTEXPR int digits = 1;
-      static _GLIBCXX_USE_CONSTEXPR int digits10 = 0;
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR bool 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return false; }
-
-      static _GLIBCXX_CONSTEXPR bool 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return false; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR bool 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return false; }
-
-      static _GLIBCXX_CONSTEXPR bool 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return false; }
-
-      static _GLIBCXX_CONSTEXPR bool 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return false; }
-
-      static _GLIBCXX_CONSTEXPR bool 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return false; }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
-
-      // It is not clear what it means for a boolean type to trap.
-      // This is a DR on the LWG issue list.  Here, I use integer
-      // promotion semantics.
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<char> specialization.
-  template<>
-    struct numeric_limits<char>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR char 
-      min() _GLIBCXX_USE_NOEXCEPT { return __glibcxx_min(char); }
-
-      static _GLIBCXX_CONSTEXPR char 
-      max() _GLIBCXX_USE_NOEXCEPT { return __glibcxx_max(char); }
-
-#if __cplusplus >= 201103L
-      static constexpr char 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits = __glibcxx_digits (char);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 = __glibcxx_digits10 (char);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = __glibcxx_signed (char);
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR char 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR char 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR 
-      char infinity() _GLIBCXX_USE_NOEXCEPT { return char(); }
-
-      static _GLIBCXX_CONSTEXPR char 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return char(); }
-
-      static _GLIBCXX_CONSTEXPR char 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return char(); }
-
-      static _GLIBCXX_CONSTEXPR char 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return static_cast<char>(0); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = !is_signed;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<signed char> specialization.
-  template<>
-    struct numeric_limits<signed char>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR signed char 
-      min() _GLIBCXX_USE_NOEXCEPT { return -__SCHAR_MAX__ - 1; }
-
-      static _GLIBCXX_CONSTEXPR signed char 
-      max() _GLIBCXX_USE_NOEXCEPT { return __SCHAR_MAX__; }
-
-#if __cplusplus >= 201103L
-      static constexpr signed char 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits = __glibcxx_digits (signed char);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 
-       = __glibcxx_digits10 (signed char);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR signed char 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR signed char 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR signed char 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return static_cast<signed char>(0); }
-
-      static _GLIBCXX_CONSTEXPR signed char 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return static_cast<signed char>(0); }
-
-      static _GLIBCXX_CONSTEXPR signed char 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<signed char>(0); }
-
-      static _GLIBCXX_CONSTEXPR signed char 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<signed char>(0); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<unsigned char> specialization.
-  template<>
-    struct numeric_limits<unsigned char>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR unsigned char 
-      min() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR unsigned char 
-      max() _GLIBCXX_USE_NOEXCEPT { return __SCHAR_MAX__ * 2U + 1; }
-
-#if __cplusplus >= 201103L
-      static constexpr unsigned char 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits 
-       = __glibcxx_digits (unsigned char);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 
-       = __glibcxx_digits10 (unsigned char);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR unsigned char 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR unsigned char 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR unsigned char 
-      infinity() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned char>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned char 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned char>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned char 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned char>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned char 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned char>(0); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = true;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<wchar_t> specialization.
-  template<>
-    struct numeric_limits<wchar_t>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR wchar_t 
-      min() _GLIBCXX_USE_NOEXCEPT { return __glibcxx_min (wchar_t); }
-
-      static _GLIBCXX_CONSTEXPR wchar_t 
-      max() _GLIBCXX_USE_NOEXCEPT { return __glibcxx_max (wchar_t); }
-
-#if __cplusplus >= 201103L
-      static constexpr wchar_t
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits = __glibcxx_digits (wchar_t);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 
-       = __glibcxx_digits10 (wchar_t);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = __glibcxx_signed (wchar_t);
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR wchar_t 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR wchar_t 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR wchar_t 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return wchar_t(); }
-
-      static _GLIBCXX_CONSTEXPR wchar_t 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return wchar_t(); }
-
-      static _GLIBCXX_CONSTEXPR wchar_t 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return wchar_t(); }
-
-      static _GLIBCXX_CONSTEXPR wchar_t 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return wchar_t(); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = !is_signed;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-#if __cplusplus >= 201103L
-  /// numeric_limits<char16_t> specialization.
-  template<>
-    struct numeric_limits<char16_t>
-    {
-      static constexpr bool is_specialized = true;
-
-      static constexpr char16_t 
-      min() noexcept { return __glibcxx_min (char16_t); }
-
-      static constexpr char16_t 
-      max() noexcept { return __glibcxx_max (char16_t); }
-
-      static constexpr char16_t 
-      lowest() noexcept { return min(); }
-
-      static constexpr int digits = __glibcxx_digits (char16_t);
-      static constexpr int digits10 = __glibcxx_digits10 (char16_t);
-      static constexpr int max_digits10 = 0;
-      static constexpr bool is_signed = __glibcxx_signed (char16_t);
-      static constexpr bool is_integer = true;
-      static constexpr bool is_exact = true;
-      static constexpr int radix = 2;
-
-      static constexpr char16_t 
-      epsilon() noexcept { return 0; }
-
-      static constexpr char16_t 
-      round_error() noexcept { return 0; }
-
-      static constexpr int min_exponent = 0;
-      static constexpr int min_exponent10 = 0;
-      static constexpr int max_exponent = 0;
-      static constexpr int max_exponent10 = 0;
-
-      static constexpr bool has_infinity = false;
-      static constexpr bool has_quiet_NaN = false;
-      static constexpr bool has_signaling_NaN = false;
-      static constexpr float_denorm_style has_denorm = denorm_absent;
-      static constexpr bool has_denorm_loss = false;
-
-      static constexpr char16_t 
-      infinity() noexcept { return char16_t(); }
-
-      static constexpr char16_t 
-      quiet_NaN() noexcept { return char16_t(); }
-
-      static constexpr char16_t 
-      signaling_NaN() noexcept { return char16_t(); }
-
-      static constexpr char16_t 
-      denorm_min() noexcept { return char16_t(); }
-
-      static constexpr bool is_iec559 = false;
-      static constexpr bool is_bounded = true;
-      static constexpr bool is_modulo = !is_signed;
-
-      static constexpr bool traps = __glibcxx_integral_traps;
-      static constexpr bool tinyness_before = false;
-      static constexpr float_round_style round_style = round_toward_zero;
-    };
-
-  /// numeric_limits<char32_t> specialization.
-  template<>
-    struct numeric_limits<char32_t>
-    {
-      static constexpr bool is_specialized = true;
-
-      static constexpr char32_t 
-      min() noexcept { return __glibcxx_min (char32_t); }
-
-      static constexpr char32_t 
-      max() noexcept { return __glibcxx_max (char32_t); }
-
-      static constexpr char32_t 
-      lowest() noexcept { return min(); }
-
-      static constexpr int digits = __glibcxx_digits (char32_t);
-      static constexpr int digits10 = __glibcxx_digits10 (char32_t);
-      static constexpr int max_digits10 = 0;
-      static constexpr bool is_signed = __glibcxx_signed (char32_t);
-      static constexpr bool is_integer = true;
-      static constexpr bool is_exact = true;
-      static constexpr int radix = 2;
-
-      static constexpr char32_t 
-      epsilon() noexcept { return 0; }
-
-      static constexpr char32_t 
-      round_error() noexcept { return 0; }
-
-      static constexpr int min_exponent = 0;
-      static constexpr int min_exponent10 = 0;
-      static constexpr int max_exponent = 0;
-      static constexpr int max_exponent10 = 0;
-
-      static constexpr bool has_infinity = false;
-      static constexpr bool has_quiet_NaN = false;
-      static constexpr bool has_signaling_NaN = false;
-      static constexpr float_denorm_style has_denorm = denorm_absent;
-      static constexpr bool has_denorm_loss = false;
-
-      static constexpr char32_t 
-      infinity() noexcept { return char32_t(); }
-
-      static constexpr char32_t 
-      quiet_NaN() noexcept { return char32_t(); }
-
-      static constexpr char32_t 
-      signaling_NaN() noexcept { return char32_t(); }
-
-      static constexpr char32_t 
-      denorm_min() noexcept { return char32_t(); }
-
-      static constexpr bool is_iec559 = false;
-      static constexpr bool is_bounded = true;
-      static constexpr bool is_modulo = !is_signed;
-
-      static constexpr bool traps = __glibcxx_integral_traps;
-      static constexpr bool tinyness_before = false;
-      static constexpr float_round_style round_style = round_toward_zero;
-    };
-#endif
-
-  /// numeric_limits<short> specialization.
-  template<>
-    struct numeric_limits<short>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR short 
-      min() _GLIBCXX_USE_NOEXCEPT { return -__SHRT_MAX__ - 1; }
-
-      static _GLIBCXX_CONSTEXPR short 
-      max() _GLIBCXX_USE_NOEXCEPT { return __SHRT_MAX__; }
-
-#if __cplusplus >= 201103L
-      static constexpr short 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits = __glibcxx_digits (short);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 = __glibcxx_digits10 (short);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR short 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR short 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR short 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return short(); }
-
-      static _GLIBCXX_CONSTEXPR short 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return short(); }
-
-      static _GLIBCXX_CONSTEXPR short 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return short(); }
-
-      static _GLIBCXX_CONSTEXPR short 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return short(); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<unsigned short> specialization.
-  template<>
-    struct numeric_limits<unsigned short>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR unsigned short 
-      min() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR unsigned short 
-      max() _GLIBCXX_USE_NOEXCEPT { return __SHRT_MAX__ * 2U + 1; }
-
-#if __cplusplus >= 201103L
-      static constexpr unsigned short 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits 
-       = __glibcxx_digits (unsigned short);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 
-       = __glibcxx_digits10 (unsigned short);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR unsigned short 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR unsigned short 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR unsigned short 
-      infinity() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned short>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned short 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned short>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned short 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned short>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned short 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned short>(0); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = true;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<int> specialization.
-  template<>
-    struct numeric_limits<int>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR int 
-      min() _GLIBCXX_USE_NOEXCEPT { return -__INT_MAX__ - 1; }
-
-      static _GLIBCXX_CONSTEXPR int 
-      max() _GLIBCXX_USE_NOEXCEPT { return __INT_MAX__; }
-
-#if __cplusplus >= 201103L
-      static constexpr int 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits = __glibcxx_digits (int);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 = __glibcxx_digits10 (int);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR int 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR int 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR int 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return static_cast<int>(0); }
-
-      static _GLIBCXX_CONSTEXPR int 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return static_cast<int>(0); }
-
-      static _GLIBCXX_CONSTEXPR int 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return static_cast<int>(0); }
-
-      static _GLIBCXX_CONSTEXPR int 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return static_cast<int>(0); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<unsigned int> specialization.
-  template<>
-    struct numeric_limits<unsigned int>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR unsigned int 
-      min() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR unsigned int 
-      max() _GLIBCXX_USE_NOEXCEPT { return __INT_MAX__ * 2U + 1; }
-
-#if __cplusplus >= 201103L
-      static constexpr unsigned int 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits 
-       = __glibcxx_digits (unsigned int);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 
-       = __glibcxx_digits10 (unsigned int);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR unsigned int 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR unsigned int 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR unsigned int 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return static_cast<unsigned int>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned int 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned int>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned int 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned int>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned int 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned int>(0); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = true;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<long> specialization.
-  template<>
-    struct numeric_limits<long>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR long
-      min() _GLIBCXX_USE_NOEXCEPT { return -__LONG_MAX__ - 1; }
-
-      static _GLIBCXX_CONSTEXPR long 
-      max() _GLIBCXX_USE_NOEXCEPT { return __LONG_MAX__; }
-
-#if __cplusplus >= 201103L
-      static constexpr long 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits = __glibcxx_digits (long);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 = __glibcxx_digits10 (long);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR long 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR long 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR long 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return static_cast<long>(0); }
-
-      static _GLIBCXX_CONSTEXPR long 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return static_cast<long>(0); }
-
-      static _GLIBCXX_CONSTEXPR long 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return static_cast<long>(0); }
-
-      static _GLIBCXX_CONSTEXPR long 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return static_cast<long>(0); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<unsigned long> specialization.
-  template<>
-    struct numeric_limits<unsigned long>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR unsigned long 
-      min() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR unsigned long 
-      max() _GLIBCXX_USE_NOEXCEPT { return __LONG_MAX__ * 2UL + 1; }
-
-#if __cplusplus >= 201103L
-      static constexpr unsigned long 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits 
-       = __glibcxx_digits (unsigned long);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 
-       = __glibcxx_digits10 (unsigned long);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR unsigned long 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR unsigned long 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR unsigned long 
-      infinity() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned long>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned long 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned long>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned long 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned long>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned long 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned long>(0); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = true;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<long long> specialization.
-  template<>
-    struct numeric_limits<long long>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR long long 
-      min() _GLIBCXX_USE_NOEXCEPT { return -__LONG_LONG_MAX__ - 1; }
-
-      static _GLIBCXX_CONSTEXPR long long 
-      max() _GLIBCXX_USE_NOEXCEPT { return __LONG_LONG_MAX__; }
-
-#if __cplusplus >= 201103L
-      static constexpr long long 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits 
-       = __glibcxx_digits (long long);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 
-       = __glibcxx_digits10 (long long);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR long long 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR long long 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR long long 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return static_cast<long long>(0); }
-
-      static _GLIBCXX_CONSTEXPR long long 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return static_cast<long long>(0); }
-
-      static _GLIBCXX_CONSTEXPR long long 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<long long>(0); }
-
-      static _GLIBCXX_CONSTEXPR long long 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return static_cast<long long>(0); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-  /// numeric_limits<unsigned long long> specialization.
-  template<>
-    struct numeric_limits<unsigned long long>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR unsigned long long 
-      min() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR unsigned long long 
-      max() _GLIBCXX_USE_NOEXCEPT { return __LONG_LONG_MAX__ * 2ULL + 1; }
-
-#if __cplusplus >= 201103L
-      static constexpr unsigned long long 
-      lowest() noexcept { return min(); }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits 
-       = __glibcxx_digits (unsigned long long);
-      static _GLIBCXX_USE_CONSTEXPR int digits10 
-       = __glibcxx_digits10 (unsigned long long);
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10 = 0;
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true;
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2;
-
-      static _GLIBCXX_CONSTEXPR unsigned long long 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_CONSTEXPR unsigned long long 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 
-       = denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
-
-      static _GLIBCXX_CONSTEXPR unsigned long long 
-      infinity() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned long long>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned long long 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned long long>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned long long 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned long long>(0); }
-
-      static _GLIBCXX_CONSTEXPR unsigned long long 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT
-      { return static_cast<unsigned long long>(0); }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = true;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_toward_zero;
-    };
-
-#if !defined(__STRICT_ANSI__)
-
-#define __INT_N(TYPE, BITSIZE, EXT, UEXT)			\
-  template<> 									\
-    struct numeric_limits<TYPE> 						\
-    { 										\
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true; 		\
- 										\
-      static _GLIBCXX_CONSTEXPR TYPE 						\
-	min() _GLIBCXX_USE_NOEXCEPT { return __glibcxx_min_b (TYPE, BITSIZE); } \
- 										\
-      static _GLIBCXX_CONSTEXPR TYPE 						\
-      max() _GLIBCXX_USE_NOEXCEPT { return __glibcxx_max_b (TYPE, BITSIZE); } 	\
- 										\
-      static _GLIBCXX_USE_CONSTEXPR int digits 					\
-       = BITSIZE - 1; 								\
-      static _GLIBCXX_USE_CONSTEXPR int digits10 				\
-       = (BITSIZE - 1) * 643L / 2136; 						\
-      										\
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true; 			\
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true; 			\
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true; 			\
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2; 				\
- 										\
-      static _GLIBCXX_CONSTEXPR TYPE 						\
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; } 				\
- 										\
-      static _GLIBCXX_CONSTEXPR TYPE 						\
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; } 			\
- 										\
-      EXT									\
- 										\
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0; 			\
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0; 			\
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0; 			\
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0; 			\
- 										\
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false; 			\
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false; 		\
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false; 		\
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 		\
-       = denorm_absent; 							\
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false; 		\
- 										\
-      static _GLIBCXX_CONSTEXPR TYPE 						\
-      infinity() _GLIBCXX_USE_NOEXCEPT 						\
-      { return static_cast<TYPE>(0); } 						\
- 										\
-      static _GLIBCXX_CONSTEXPR TYPE 						\
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT 					\
-      { return static_cast<TYPE>(0); } 						\
-       										\
-      static _GLIBCXX_CONSTEXPR TYPE 						\
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT 					\
-      { return static_cast<TYPE>(0); } 						\
-       										\
-      static _GLIBCXX_CONSTEXPR TYPE 						\
-      denorm_min() _GLIBCXX_USE_NOEXCEPT 					\
-      { return static_cast<TYPE>(0); } 						\
- 										\
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false; 			\
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true; 			\
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false; 			\
- 										\
-      static _GLIBCXX_USE_CONSTEXPR bool traps 					\
-       = __glibcxx_integral_traps; 						\
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false; 		\
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 		\
-       = round_toward_zero; 							\
-    }; 										\
- 										\
-  template<> 									\
-    struct numeric_limits<unsigned TYPE> 					\
-    { 										\
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true; 		\
- 										\
-      static _GLIBCXX_CONSTEXPR unsigned TYPE 					\
-      min() _GLIBCXX_USE_NOEXCEPT { return 0; } 				\
- 										\
-      static _GLIBCXX_CONSTEXPR unsigned TYPE 					\
-      max() _GLIBCXX_USE_NOEXCEPT						\
-      { return  __glibcxx_max_b (unsigned TYPE, BITSIZE); }			\
- 										\
-      UEXT									\
- 										\
-      static _GLIBCXX_USE_CONSTEXPR int digits 					\
-       = BITSIZE; 								\
-      static _GLIBCXX_USE_CONSTEXPR int digits10 				\
-       = BITSIZE * 643L / 2136; 						\
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = false; 			\
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = true; 			\
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = true; 			\
-      static _GLIBCXX_USE_CONSTEXPR int radix = 2; 				\
- 										\
-      static _GLIBCXX_CONSTEXPR unsigned TYPE 					\
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return 0; } 				\
- 										\
-      static _GLIBCXX_CONSTEXPR unsigned TYPE 					\
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0; } 			\
- 										\
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = 0; 			\
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = 0; 			\
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = 0; 			\
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = 0; 			\
- 										\
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = false; 			\
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = false; 		\
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = false; 		\
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm 		\
-       = denorm_absent; 							\
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false; 		\
- 										\
-      static _GLIBCXX_CONSTEXPR unsigned TYPE 					\
-      infinity() _GLIBCXX_USE_NOEXCEPT 						\
-      { return static_cast<unsigned TYPE>(0); } 				\
- 										\
-      static _GLIBCXX_CONSTEXPR unsigned TYPE 					\
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT 					\
-      { return static_cast<unsigned TYPE>(0); } 				\
- 										\
-      static _GLIBCXX_CONSTEXPR unsigned TYPE 					\
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT 					\
-      { return static_cast<unsigned TYPE>(0); } 				\
- 										\
-      static _GLIBCXX_CONSTEXPR unsigned TYPE 					\
-      denorm_min() _GLIBCXX_USE_NOEXCEPT 					\
-      { return static_cast<unsigned TYPE>(0); } 				\
- 										\
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559 = false; 			\
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true; 			\
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = true; 			\
- 										\
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_integral_traps; 	\
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false; 		\
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 		\
-       = round_toward_zero; 							\
-    };
-
-#if __cplusplus >= 201103L
-
-#define __INT_N_201103(TYPE)							\
-      static constexpr TYPE 							\
-      lowest() noexcept { return min(); }					\
-      static constexpr int max_digits10 = 0;
-
-#define __INT_N_U201103(TYPE)							\
-      static constexpr unsigned TYPE 						\
-      lowest() noexcept { return min(); }					\
-      static constexpr int max_digits10 = 0;
-
-#else
-#define __INT_N_201103(TYPE)
-#define __INT_N_U201103(TYPE)
-#endif
-
-#ifdef __GLIBCXX_TYPE_INT_N_0
-  __INT_N(__GLIBCXX_TYPE_INT_N_0, __GLIBCXX_BITSIZE_INT_N_0,
-	  __INT_N_201103 (__GLIBCXX_TYPE_INT_N_0), __INT_N_U201103 (__GLIBCXX_TYPE_INT_N_0))
-#endif
-#ifdef __GLIBCXX_TYPE_INT_N_1
-  __INT_N (__GLIBCXX_TYPE_INT_N_1, __GLIBCXX_BITSIZE_INT_N_1,
-	  __INT_N_201103 (__GLIBCXX_TYPE_INT_N_1), __INT_N_U201103 (__GLIBCXX_TYPE_INT_N_1))
-#endif
-#ifdef __GLIBCXX_TYPE_INT_N_2
-  __INT_N (__GLIBCXX_TYPE_INT_N_2, __GLIBCXX_BITSIZE_INT_N_2,
-	  __INT_N_201103 (__GLIBCXX_TYPE_INT_N_2), __INT_N_U201103 (__GLIBCXX_TYPE_INT_N_2))
-#endif
-#ifdef __GLIBCXX_TYPE_INT_N_3
-  __INT_N (__GLIBCXX_TYPE_INT_N_3, __GLIBCXX_BITSIZE_INT_N_3,
-	  __INT_N_201103 (__GLIBCXX_TYPE_INT_N_3), __INT_N_U201103 (__GLIBCXX_TYPE_INT_N_3))
-#endif
-
-#undef __INT_N
-#undef __INT_N_201103
-#undef __INT_N_U201103
-
-#endif
-
-  /// numeric_limits<float> specialization.
-  template<>
-    struct numeric_limits<float>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR float 
-      min() _GLIBCXX_USE_NOEXCEPT { return __FLT_MIN__; }
-
-      static _GLIBCXX_CONSTEXPR float 
-      max() _GLIBCXX_USE_NOEXCEPT { return __FLT_MAX__; }
-
-#if __cplusplus >= 201103L
-      static constexpr float 
-      lowest() noexcept { return -__FLT_MAX__; }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits = __FLT_MANT_DIG__;
-      static _GLIBCXX_USE_CONSTEXPR int digits10 = __FLT_DIG__;
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10
-	 = __glibcxx_max_digits10 (__FLT_MANT_DIG__);
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = false;
-      static _GLIBCXX_USE_CONSTEXPR int radix = __FLT_RADIX__;
-
-      static _GLIBCXX_CONSTEXPR float 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return __FLT_EPSILON__; }
-
-      static _GLIBCXX_CONSTEXPR float 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0.5F; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = __FLT_MIN_EXP__;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = __FLT_MIN_10_EXP__;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = __FLT_MAX_EXP__;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = __FLT_MAX_10_EXP__;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = __FLT_HAS_INFINITY__;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = __FLT_HAS_QUIET_NAN__;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = has_quiet_NaN;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm
-	= bool(__FLT_HAS_DENORM__) ? denorm_present : denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss 
-       = __glibcxx_float_has_denorm_loss;
-
-      static _GLIBCXX_CONSTEXPR float 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return __builtin_huge_valf(); }
-
-      static _GLIBCXX_CONSTEXPR float 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return __builtin_nanf(""); }
-
-      static _GLIBCXX_CONSTEXPR float 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return __builtin_nansf(""); }
-
-      static _GLIBCXX_CONSTEXPR float 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return __FLT_DENORM_MIN__; }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559
-	= has_infinity && has_quiet_NaN && has_denorm == denorm_present;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_float_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before 
-       = __glibcxx_float_tinyness_before;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_to_nearest;
-    };
-
-#undef __glibcxx_float_has_denorm_loss
-#undef __glibcxx_float_traps
-#undef __glibcxx_float_tinyness_before
-
-  /// numeric_limits<double> specialization.
-  template<>
-    struct numeric_limits<double>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR double 
-      min() _GLIBCXX_USE_NOEXCEPT { return __DBL_MIN__; }
-
-      static _GLIBCXX_CONSTEXPR double 
-      max() _GLIBCXX_USE_NOEXCEPT { return __DBL_MAX__; }
-
-#if __cplusplus >= 201103L
-      static constexpr double 
-      lowest() noexcept { return -__DBL_MAX__; }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits = __DBL_MANT_DIG__;
-      static _GLIBCXX_USE_CONSTEXPR int digits10 = __DBL_DIG__;
-#if __cplusplus >= 201103L
-      static constexpr int max_digits10
-	 = __glibcxx_max_digits10 (__DBL_MANT_DIG__);
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = false;
-      static _GLIBCXX_USE_CONSTEXPR int radix = __FLT_RADIX__;
-
-      static _GLIBCXX_CONSTEXPR double 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return __DBL_EPSILON__; }
-
-      static _GLIBCXX_CONSTEXPR double 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0.5; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = __DBL_MIN_EXP__;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = __DBL_MIN_10_EXP__;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = __DBL_MAX_EXP__;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = __DBL_MAX_10_EXP__;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = __DBL_HAS_INFINITY__;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = __DBL_HAS_QUIET_NAN__;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = has_quiet_NaN;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm
-	= bool(__DBL_HAS_DENORM__) ? denorm_present : denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss 
-        = __glibcxx_double_has_denorm_loss;
-
-      static _GLIBCXX_CONSTEXPR double 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return __builtin_huge_val(); }
-
-      static _GLIBCXX_CONSTEXPR double 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return __builtin_nan(""); }
-
-      static _GLIBCXX_CONSTEXPR double 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return __builtin_nans(""); }
-
-      static _GLIBCXX_CONSTEXPR double 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return __DBL_DENORM_MIN__; }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559
-	= has_infinity && has_quiet_NaN && has_denorm == denorm_present;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_double_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before 
-       = __glibcxx_double_tinyness_before;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 
-       = round_to_nearest;
-    };
-
-#undef __glibcxx_double_has_denorm_loss
-#undef __glibcxx_double_traps
-#undef __glibcxx_double_tinyness_before
-
-  /// numeric_limits<long double> specialization.
-  template<>
-    struct numeric_limits<long double>
-    {
-      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
-
-      static _GLIBCXX_CONSTEXPR long double 
-      min() _GLIBCXX_USE_NOEXCEPT { return __LDBL_MIN__; }
-
-      static _GLIBCXX_CONSTEXPR long double 
-      max() _GLIBCXX_USE_NOEXCEPT { return __LDBL_MAX__; }
-
-#if __cplusplus >= 201103L
-      static constexpr long double 
-      lowest() noexcept { return -__LDBL_MAX__; }
-#endif
-
-      static _GLIBCXX_USE_CONSTEXPR int digits = __LDBL_MANT_DIG__;
-      static _GLIBCXX_USE_CONSTEXPR int digits10 = __LDBL_DIG__;
-#if __cplusplus >= 201103L
-      static _GLIBCXX_USE_CONSTEXPR int max_digits10
-	 = __glibcxx_max_digits10 (__LDBL_MANT_DIG__);
-#endif
-      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_integer = false;
-      static _GLIBCXX_USE_CONSTEXPR bool is_exact = false;
-      static _GLIBCXX_USE_CONSTEXPR int radix = __FLT_RADIX__;
-
-      static _GLIBCXX_CONSTEXPR long double 
-      epsilon() _GLIBCXX_USE_NOEXCEPT { return __LDBL_EPSILON__; }
-
-      static _GLIBCXX_CONSTEXPR long double 
-      round_error() _GLIBCXX_USE_NOEXCEPT { return 0.5L; }
-
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent = __LDBL_MIN_EXP__;
-      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = __LDBL_MIN_10_EXP__;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent = __LDBL_MAX_EXP__;
-      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = __LDBL_MAX_10_EXP__;
-
-      static _GLIBCXX_USE_CONSTEXPR bool has_infinity = __LDBL_HAS_INFINITY__;
-      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN = __LDBL_HAS_QUIET_NAN__;
-      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = has_quiet_NaN;
-      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm
-	= bool(__LDBL_HAS_DENORM__) ? denorm_present : denorm_absent;
-      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss
-	= __glibcxx_long_double_has_denorm_loss;
-
-      static _GLIBCXX_CONSTEXPR long double 
-      infinity() _GLIBCXX_USE_NOEXCEPT { return __builtin_huge_vall(); }
-
-      static _GLIBCXX_CONSTEXPR long double 
-      quiet_NaN() _GLIBCXX_USE_NOEXCEPT { return __builtin_nanl(""); }
-
-      static _GLIBCXX_CONSTEXPR long double 
-      signaling_NaN() _GLIBCXX_USE_NOEXCEPT { return __builtin_nansl(""); }
-
-      static _GLIBCXX_CONSTEXPR long double 
-      denorm_min() _GLIBCXX_USE_NOEXCEPT { return __LDBL_DENORM_MIN__; }
-
-      static _GLIBCXX_USE_CONSTEXPR bool is_iec559
-	= has_infinity && has_quiet_NaN && has_denorm == denorm_present;
-      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
-      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
-
-      static _GLIBCXX_USE_CONSTEXPR bool traps = __glibcxx_long_double_traps;
-      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = 
-					 __glibcxx_long_double_tinyness_before;
-      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style = 
-						      round_to_nearest;
-    };
-
-#undef __glibcxx_long_double_has_denorm_loss
-#undef __glibcxx_long_double_traps
-#undef __glibcxx_long_double_tinyness_before
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#undef __glibcxx_signed
-#undef __glibcxx_min
-#undef __glibcxx_max
-#undef __glibcxx_digits
-#undef __glibcxx_digits10
-#undef __glibcxx_max_digits10
-
-#endif // _GLIBCXX_NUMERIC_LIMITS
diff --git a/openflow/usr/include/c++/5/list b/openflow/usr/include/c++/5/list
deleted file mode 100644
index feb2105..0000000
--- a/openflow/usr/include/c++/5/list
+++ /dev/null
@@ -1,75 +0,0 @@
-// <list> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/list
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_LIST
-#define _GLIBCXX_LIST 1
-
-#pragma GCC system_header
-
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/range_access.h>
-#include <bits/stl_list.h>
-#include <bits/list.tcc>
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/list>
-#endif
-
-#ifdef _GLIBCXX_PROFILE
-# include <profile/list>
-#endif
-
-#endif /* _GLIBCXX_LIST */
-
diff --git a/openflow/usr/include/c++/5/locale b/openflow/usr/include/c++/5/locale
deleted file mode 100644
index 102004f..0000000
--- a/openflow/usr/include/c++/5/locale
+++ /dev/null
@@ -1,46 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-/** @file include/locale
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_LOCALE
-#define _GLIBCXX_LOCALE	1
-
-#pragma GCC system_header
-
-#include <bits/localefwd.h>
-#include <bits/locale_classes.h>
-#include <bits/locale_facets.h>
-#include <bits/locale_facets_nonio.h>
-#if __cplusplus >= 201103L
-#  include <bits/locale_conv.h>
-#endif
-
-#endif /* _GLIBCXX_LOCALE */
diff --git a/openflow/usr/include/c++/5/map b/openflow/usr/include/c++/5/map
deleted file mode 100644
index 3ce9c4e..0000000
--- a/openflow/usr/include/c++/5/map
+++ /dev/null
@@ -1,73 +0,0 @@
-// <map> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/map
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_MAP
-#define _GLIBCXX_MAP 1
-
-#pragma GCC system_header
-
-#include <bits/stl_tree.h>
-#include <bits/stl_map.h>
-#include <bits/stl_multimap.h>
-#include <bits/range_access.h>
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/map>
-#endif
-
-#ifdef _GLIBCXX_PROFILE
-# include <profile/map>
-#endif
-
-#endif /* _GLIBCXX_MAP */
diff --git a/openflow/usr/include/c++/5/memory b/openflow/usr/include/c++/5/memory
deleted file mode 100644
index 4257394..0000000
--- a/openflow/usr/include/c++/5/memory
+++ /dev/null
@@ -1,134 +0,0 @@
-// <memory> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- * Copyright (c) 1997-1999
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file include/memory
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_MEMORY
-#define _GLIBCXX_MEMORY 1
-
-#pragma GCC system_header
-
-/**
- * @defgroup memory Memory
- * @ingroup utilities
- *
- * Components for memory allocation, deallocation, and management.
- */
-
-/**
- * @defgroup pointer_abstractions Pointer Abstractions
- * @ingroup memory
- *
- * Smart pointers, etc.
- */
-
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_tempbuf.h>
-#include <bits/stl_raw_storage_iter.h>
-
-#if __cplusplus >= 201103L
-#  include <exception>        	  // std::exception
-#  include <typeinfo>         	  // std::type_info in get_deleter
-#  include <iosfwd>           	  // std::basic_ostream
-#  include <ext/atomicity.h>
-#  include <ext/concurrence.h>
-#  include <bits/functexcept.h>
-#  include <bits/stl_function.h>  // std::less
-#  include <bits/uses_allocator.h>
-#  include <type_traits>
-#  include <functional>
-#  include <debug/debug.h>
-#  include <bits/unique_ptr.h>
-#  include <bits/shared_ptr.h>
-#  include <bits/shared_ptr_atomic.h>
-#  if _GLIBCXX_USE_DEPRECATED
-#    include <backward/auto_ptr.h>
-#  endif
-#else
-#  include <backward/auto_ptr.h>
-#endif
-
-#if __cplusplus >= 201103L
-#  include <cstdint>
-#  ifdef _GLIBCXX_USE_C99_STDINT_TR1
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-/**
- *  @brief Fit aligned storage in buffer.
- *
- *  [ptr.align]
- *
- *  This function tries to fit @a __size bytes of storage with alignment
- *  @a __align into the buffer @a __ptr of size @a __space bytes.  If such
- *  a buffer fits then @a __ptr is changed to point to the first byte of the
- *  aligned storage and @a __space is reduced by the bytes used for alignment.
- *
- *  @param __align   A fundamental or extended alignment value.
- *  @param __size    Size of the aligned storage required.
- *  @param __ptr     Pointer to a buffer of @a __space bytes.
- *  @param __space   Size of the buffer pointed to by @a __ptr.
- *  @return the updated pointer if the aligned storage fits, otherwise nullptr.
- */
-inline void*
-align(size_t __align, size_t __size, void*& __ptr, size_t& __space) noexcept
-{
-  const auto __intptr = reinterpret_cast<uintptr_t>(__ptr);
-  const auto __aligned = (__intptr - 1u + __align) & -__align;
-  const auto __diff = __aligned - __intptr;
-  if ((__size + __diff) > __space)
-    return nullptr;
-  else
-    {
-      __space -= __diff;
-      return __ptr = reinterpret_cast<void*>(__aligned);
-    }
-}
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
-#endif // C++11
-
-#endif /* _GLIBCXX_MEMORY */
diff --git a/openflow/usr/include/c++/5/mutex b/openflow/usr/include/c++/5/mutex
deleted file mode 100644
index b80a8a0..0000000
--- a/openflow/usr/include/c++/5/mutex
+++ /dev/null
@@ -1,757 +0,0 @@
-// <mutex> -*- C++ -*-
-
-// Copyright (C) 2003-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/mutex
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_MUTEX
-#define _GLIBCXX_MUTEX 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <tuple>
-#include <chrono>
-#include <exception>
-#include <type_traits>
-#include <functional>
-#include <system_error>
-#include <bits/functexcept.h>
-#include <bits/gthr.h>
-#include <bits/move.h> // for std::swap
-#include <bits/cxxabi_forced.h>
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#ifdef _GLIBCXX_HAS_GTHREADS
-  // Common base class for std::mutex and std::timed_mutex
-  class __mutex_base
-  {
-  protected:
-    typedef __gthread_mutex_t			__native_type;
-
-#ifdef __GTHREAD_MUTEX_INIT
-    __native_type  _M_mutex = __GTHREAD_MUTEX_INIT;
-
-    constexpr __mutex_base() noexcept = default;
-#else
-    __native_type  _M_mutex;
-
-    __mutex_base() noexcept
-    {
-      // XXX EAGAIN, ENOMEM, EPERM, EBUSY(may), EINVAL(may)
-      __GTHREAD_MUTEX_INIT_FUNCTION(&_M_mutex);
-    }
-
-    ~__mutex_base() noexcept { __gthread_mutex_destroy(&_M_mutex); }
-#endif
-
-    __mutex_base(const __mutex_base&) = delete;
-    __mutex_base& operator=(const __mutex_base&) = delete;
-  };
-
-  // Common base class for std::recursive_mutex and std::recursive_timed_mutex
-  class __recursive_mutex_base
-  {
-  protected:
-    typedef __gthread_recursive_mutex_t		__native_type;
-
-    __recursive_mutex_base(const __recursive_mutex_base&) = delete;
-    __recursive_mutex_base& operator=(const __recursive_mutex_base&) = delete;
-
-#ifdef __GTHREAD_RECURSIVE_MUTEX_INIT
-    __native_type  _M_mutex = __GTHREAD_RECURSIVE_MUTEX_INIT;
-
-    __recursive_mutex_base() = default;
-#else
-    __native_type  _M_mutex;
-
-    __recursive_mutex_base()
-    {
-      // XXX EAGAIN, ENOMEM, EPERM, EBUSY(may), EINVAL(may)
-      __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION(&_M_mutex);
-    }
-
-    ~__recursive_mutex_base()
-    { __gthread_recursive_mutex_destroy(&_M_mutex); }
-#endif
-  };
-
-  /**
-   * @defgroup mutexes Mutexes
-   * @ingroup concurrency
-   *
-   * Classes for mutex support.
-   * @{
-   */
-
-  /// The standard mutex type.
-  class mutex : private __mutex_base
-  {
-  public:
-    typedef __native_type* 			native_handle_type;
-
-#ifdef __GTHREAD_MUTEX_INIT
-    constexpr
-#endif
-    mutex() noexcept = default;
-    ~mutex() = default;
-
-    mutex(const mutex&) = delete;
-    mutex& operator=(const mutex&) = delete;
-
-    void
-    lock()
-    {
-      int __e = __gthread_mutex_lock(&_M_mutex);
-
-      // EINVAL, EAGAIN, EBUSY, EINVAL, EDEADLK(may)
-      if (__e)
-	__throw_system_error(__e);
-    }
-
-    bool
-    try_lock() noexcept
-    {
-      // XXX EINVAL, EAGAIN, EBUSY
-      return !__gthread_mutex_trylock(&_M_mutex);
-    }
-
-    void
-    unlock()
-    {
-      // XXX EINVAL, EAGAIN, EPERM
-      __gthread_mutex_unlock(&_M_mutex);
-    }
-
-    native_handle_type
-    native_handle()
-    { return &_M_mutex; }
-  };
-
-  /// The standard recursive mutex type.
-  class recursive_mutex : private __recursive_mutex_base
-  {
-  public:
-    typedef __native_type* 			native_handle_type;
-
-    recursive_mutex() = default;
-    ~recursive_mutex() = default;
-
-    recursive_mutex(const recursive_mutex&) = delete;
-    recursive_mutex& operator=(const recursive_mutex&) = delete;
-
-    void
-    lock()
-    {
-      int __e = __gthread_recursive_mutex_lock(&_M_mutex);
-
-      // EINVAL, EAGAIN, EBUSY, EINVAL, EDEADLK(may)
-      if (__e)
-	__throw_system_error(__e);
-    }
-
-    bool
-    try_lock() noexcept
-    {
-      // XXX EINVAL, EAGAIN, EBUSY
-      return !__gthread_recursive_mutex_trylock(&_M_mutex);
-    }
-
-    void
-    unlock()
-    {
-      // XXX EINVAL, EAGAIN, EBUSY
-      __gthread_recursive_mutex_unlock(&_M_mutex);
-    }
-
-    native_handle_type
-    native_handle()
-    { return &_M_mutex; }
-  };
-
-#if _GTHREAD_USE_MUTEX_TIMEDLOCK
-  template<typename _Derived>
-    class __timed_mutex_impl
-    {
-    protected:
-      typedef chrono::high_resolution_clock 	__clock_t;
-
-      template<typename _Rep, typename _Period>
-	bool
-	_M_try_lock_for(const chrono::duration<_Rep, _Period>& __rtime)
-	{
-	  using chrono::steady_clock;
-	  auto __rt = chrono::duration_cast<steady_clock::duration>(__rtime);
-	  if (ratio_greater<steady_clock::period, _Period>())
-	    ++__rt;
-	  return _M_try_lock_until(steady_clock::now() + __rt);
-	}
-
-      template<typename _Duration>
-	bool
-	_M_try_lock_until(const chrono::time_point<__clock_t,
-						   _Duration>& __atime)
-	{
-	  auto __s = chrono::time_point_cast<chrono::seconds>(__atime);
-	  auto __ns = chrono::duration_cast<chrono::nanoseconds>(__atime - __s);
-
-	  __gthread_time_t __ts = {
-	    static_cast<std::time_t>(__s.time_since_epoch().count()),
-	    static_cast<long>(__ns.count())
-	  };
-
-	  auto __mutex = static_cast<_Derived*>(this)->native_handle();
-	  return !__gthread_mutex_timedlock(__mutex, &__ts);
-	}
-
-      template<typename _Clock, typename _Duration>
-	bool
-	_M_try_lock_until(const chrono::time_point<_Clock, _Duration>& __atime)
-	{
-	  auto __rtime = __atime - _Clock::now();
-	  return _M_try_lock_until(__clock_t::now() + __rtime);
-	}
-    };
-
-  /// The standard timed mutex type.
-  class timed_mutex
-  : private __mutex_base, public __timed_mutex_impl<timed_mutex>
-  {
-  public:
-    typedef __native_type* 		  	native_handle_type;
-
-    timed_mutex() = default;
-    ~timed_mutex() = default;
-
-    timed_mutex(const timed_mutex&) = delete;
-    timed_mutex& operator=(const timed_mutex&) = delete;
-
-    void
-    lock()
-    {
-      int __e = __gthread_mutex_lock(&_M_mutex);
-
-      // EINVAL, EAGAIN, EBUSY, EINVAL, EDEADLK(may)
-      if (__e)
-	__throw_system_error(__e);
-    }
-
-    bool
-    try_lock() noexcept
-    {
-      // XXX EINVAL, EAGAIN, EBUSY
-      return !__gthread_mutex_trylock(&_M_mutex);
-    }
-
-    template <class _Rep, class _Period>
-      bool
-      try_lock_for(const chrono::duration<_Rep, _Period>& __rtime)
-      { return _M_try_lock_for(__rtime); }
-
-    template <class _Clock, class _Duration>
-      bool
-      try_lock_until(const chrono::time_point<_Clock, _Duration>& __atime)
-      { return _M_try_lock_until(__atime); }
-
-    void
-    unlock()
-    {
-      // XXX EINVAL, EAGAIN, EBUSY
-      __gthread_mutex_unlock(&_M_mutex);
-    }
-
-    native_handle_type
-    native_handle()
-    { return &_M_mutex; }
-  };
-
-  /// The standard recursive timed mutex type.
-  class recursive_timed_mutex
-  : private __recursive_mutex_base,
-    public __timed_mutex_impl<recursive_timed_mutex>
-  {
-  public:
-    typedef __native_type* 			native_handle_type;
-
-    recursive_timed_mutex() = default;
-    ~recursive_timed_mutex() = default;
-
-    recursive_timed_mutex(const recursive_timed_mutex&) = delete;
-    recursive_timed_mutex& operator=(const recursive_timed_mutex&) = delete;
-
-    void
-    lock()
-    {
-      int __e = __gthread_recursive_mutex_lock(&_M_mutex);
-
-      // EINVAL, EAGAIN, EBUSY, EINVAL, EDEADLK(may)
-      if (__e)
-	__throw_system_error(__e);
-    }
-
-    bool
-    try_lock() noexcept
-    {
-      // XXX EINVAL, EAGAIN, EBUSY
-      return !__gthread_recursive_mutex_trylock(&_M_mutex);
-    }
-
-    template <class _Rep, class _Period>
-      bool
-      try_lock_for(const chrono::duration<_Rep, _Period>& __rtime)
-      { return _M_try_lock_for(__rtime); }
-
-    template <class _Clock, class _Duration>
-      bool
-      try_lock_until(const chrono::time_point<_Clock, _Duration>& __atime)
-      { return _M_try_lock_until(__atime); }
-
-    void
-    unlock()
-    {
-      // XXX EINVAL, EAGAIN, EBUSY
-      __gthread_recursive_mutex_unlock(&_M_mutex);
-    }
-
-    native_handle_type
-    native_handle()
-    { return &_M_mutex; }
-  };
-#endif
-#endif // _GLIBCXX_HAS_GTHREADS
-
-  /// Do not acquire ownership of the mutex.
-  struct defer_lock_t { };
-
-  /// Try to acquire ownership of the mutex without blocking.
-  struct try_to_lock_t { };
-
-  /// Assume the calling thread has already obtained mutex ownership
-  /// and manage it.
-  struct adopt_lock_t { };
-
-  /// Tag used to prevent a scoped lock from acquiring ownership of a mutex.
-  constexpr defer_lock_t	defer_lock { };
-
-  /// Tag used to prevent a scoped lock from blocking if a mutex is locked.
-  constexpr try_to_lock_t	try_to_lock { };
-
-  /// Tag used to make a scoped lock take ownership of a locked mutex.
-  constexpr adopt_lock_t	adopt_lock { };
-
-  /** @brief A movable scoped lock type.
-   *
-   * A unique_lock controls mutex ownership within a scope. Ownership of the
-   * mutex can be delayed until after construction and can be transferred
-   * to another unique_lock by move construction or move assignment. If a
-   * mutex lock is owned when the destructor runs ownership will be released.
-   */
-  template<typename _Mutex>
-    class lock_guard
-    {
-    public:
-      typedef _Mutex mutex_type;
-
-      explicit lock_guard(mutex_type& __m) : _M_device(__m)
-      { _M_device.lock(); }
-
-      lock_guard(mutex_type& __m, adopt_lock_t) : _M_device(__m)
-      { } // calling thread owns mutex
-
-      ~lock_guard()
-      { _M_device.unlock(); }
-
-      lock_guard(const lock_guard&) = delete;
-      lock_guard& operator=(const lock_guard&) = delete;
-
-    private:
-      mutex_type&  _M_device;
-    };
-
-  /// unique_lock
-  template<typename _Mutex>
-    class unique_lock
-    {
-    public:
-      typedef _Mutex mutex_type;
-
-      unique_lock() noexcept
-      : _M_device(0), _M_owns(false)
-      { }
-
-      explicit unique_lock(mutex_type& __m)
-      : _M_device(std::__addressof(__m)), _M_owns(false)
-      {
-	lock();
-	_M_owns = true;
-      }
-
-      unique_lock(mutex_type& __m, defer_lock_t) noexcept
-      : _M_device(std::__addressof(__m)), _M_owns(false)
-      { }
-
-      unique_lock(mutex_type& __m, try_to_lock_t)
-      : _M_device(std::__addressof(__m)), _M_owns(_M_device->try_lock())
-      { }
-
-      unique_lock(mutex_type& __m, adopt_lock_t)
-      : _M_device(std::__addressof(__m)), _M_owns(true)
-      {
-	// XXX calling thread owns mutex
-      }
-
-      template<typename _Clock, typename _Duration>
-	unique_lock(mutex_type& __m,
-		    const chrono::time_point<_Clock, _Duration>& __atime)
-	: _M_device(std::__addressof(__m)),
-	  _M_owns(_M_device->try_lock_until(__atime))
-	{ }
-
-      template<typename _Rep, typename _Period>
-	unique_lock(mutex_type& __m,
-		    const chrono::duration<_Rep, _Period>& __rtime)
-	: _M_device(std::__addressof(__m)),
-	  _M_owns(_M_device->try_lock_for(__rtime))
-	{ }
-
-      ~unique_lock()
-      {
-	if (_M_owns)
-	  unlock();
-      }
-
-      unique_lock(const unique_lock&) = delete;
-      unique_lock& operator=(const unique_lock&) = delete;
-
-      unique_lock(unique_lock&& __u) noexcept
-      : _M_device(__u._M_device), _M_owns(__u._M_owns)
-      {
-	__u._M_device = 0;
-	__u._M_owns = false;
-      }
-
-      unique_lock& operator=(unique_lock&& __u) noexcept
-      {
-	if(_M_owns)
-	  unlock();
-
-	unique_lock(std::move(__u)).swap(*this);
-
-	__u._M_device = 0;
-	__u._M_owns = false;
-
-	return *this;
-      }
-
-      void
-      lock()
-      {
-	if (!_M_device)
-	  __throw_system_error(int(errc::operation_not_permitted));
-	else if (_M_owns)
-	  __throw_system_error(int(errc::resource_deadlock_would_occur));
-	else
-	  {
-	    _M_device->lock();
-	    _M_owns = true;
-	  }
-      }
-
-      bool
-      try_lock()
-      {
-	if (!_M_device)
-	  __throw_system_error(int(errc::operation_not_permitted));
-	else if (_M_owns)
-	  __throw_system_error(int(errc::resource_deadlock_would_occur));
-	else
-	  {
-	    _M_owns = _M_device->try_lock();
-	    return _M_owns;
-	  }
-      }
-
-      template<typename _Clock, typename _Duration>
-	bool
-	try_lock_until(const chrono::time_point<_Clock, _Duration>& __atime)
-	{
-	  if (!_M_device)
-	    __throw_system_error(int(errc::operation_not_permitted));
-	  else if (_M_owns)
-	    __throw_system_error(int(errc::resource_deadlock_would_occur));
-	  else
-	    {
-	      _M_owns = _M_device->try_lock_until(__atime);
-	      return _M_owns;
-	    }
-	}
-
-      template<typename _Rep, typename _Period>
-	bool
-	try_lock_for(const chrono::duration<_Rep, _Period>& __rtime)
-	{
-	  if (!_M_device)
-	    __throw_system_error(int(errc::operation_not_permitted));
-	  else if (_M_owns)
-	    __throw_system_error(int(errc::resource_deadlock_would_occur));
-	  else
-	    {
-	      _M_owns = _M_device->try_lock_for(__rtime);
-	      return _M_owns;
-	    }
-	 }
-
-      void
-      unlock()
-      {
-	if (!_M_owns)
-	  __throw_system_error(int(errc::operation_not_permitted));
-	else if (_M_device)
-	  {
-	    _M_device->unlock();
-	    _M_owns = false;
-	  }
-      }
-
-      void
-      swap(unique_lock& __u) noexcept
-      {
-	std::swap(_M_device, __u._M_device);
-	std::swap(_M_owns, __u._M_owns);
-      }
-
-      mutex_type*
-      release() noexcept
-      {
-	mutex_type* __ret = _M_device;
-	_M_device = 0;
-	_M_owns = false;
-	return __ret;
-      }
-
-      bool
-      owns_lock() const noexcept
-      { return _M_owns; }
-
-      explicit operator bool() const noexcept
-      { return owns_lock(); }
-
-      mutex_type*
-      mutex() const noexcept
-      { return _M_device; }
-
-    private:
-      mutex_type*	_M_device;
-      bool		_M_owns; // XXX use atomic_bool
-    };
-
-  /// Swap overload for unique_lock objects.
-  template<typename _Mutex>
-    inline void
-    swap(unique_lock<_Mutex>& __x, unique_lock<_Mutex>& __y) noexcept
-    { __x.swap(__y); }
-
-  template<typename _Lock>
-    inline unique_lock<_Lock>
-    __try_to_lock(_Lock& __l)
-    { return unique_lock<_Lock>{__l, try_to_lock}; }
-
-  template<int _Idx, bool _Continue = true>
-    struct __try_lock_impl
-    {
-      template<typename... _Lock>
-	static void
-	__do_try_lock(tuple<_Lock&...>& __locks, int& __idx)
-	{
-          __idx = _Idx;
-          auto __lock = std::__try_to_lock(std::get<_Idx>(__locks));
-          if (__lock.owns_lock())
-            {
-	      constexpr bool __cont = _Idx + 2 < sizeof...(_Lock);
-	      using __try_locker = __try_lock_impl<_Idx + 1, __cont>;
-	      __try_locker::__do_try_lock(__locks, __idx);
-              if (__idx == -1)
-                __lock.release();
-            }
-	}
-    };
-
-  template<int _Idx>
-    struct __try_lock_impl<_Idx, false>
-    {
-      template<typename... _Lock>
-	static void
-	__do_try_lock(tuple<_Lock&...>& __locks, int& __idx)
-	{
-          __idx = _Idx;
-          auto __lock = std::__try_to_lock(std::get<_Idx>(__locks));
-          if (__lock.owns_lock())
-            {
-              __idx = -1;
-              __lock.release();
-            }
-	}
-    };
-
-  /** @brief Generic try_lock.
-   *  @param __l1 Meets Mutex requirements (try_lock() may throw).
-   *  @param __l2 Meets Mutex requirements (try_lock() may throw).
-   *  @param __l3 Meets Mutex requirements (try_lock() may throw).
-   *  @return Returns -1 if all try_lock() calls return true. Otherwise returns
-   *          a 0-based index corresponding to the argument that returned false.
-   *  @post Either all arguments are locked, or none will be.
-   *
-   *  Sequentially calls try_lock() on each argument.
-   */
-  template<typename _Lock1, typename _Lock2, typename... _Lock3>
-    int
-    try_lock(_Lock1& __l1, _Lock2& __l2, _Lock3&... __l3)
-    {
-      int __idx;
-      auto __locks = std::tie(__l1, __l2, __l3...);
-      __try_lock_impl<0>::__do_try_lock(__locks, __idx);
-      return __idx;
-    }
-
-  /** @brief Generic lock.
-   *  @param __l1 Meets Mutex requirements (try_lock() may throw).
-   *  @param __l2 Meets Mutex requirements (try_lock() may throw).
-   *  @param __l3 Meets Mutex requirements (try_lock() may throw).
-   *  @throw An exception thrown by an argument's lock() or try_lock() member.
-   *  @post All arguments are locked.
-   *
-   *  All arguments are locked via a sequence of calls to lock(), try_lock()
-   *  and unlock().  If the call exits via an exception any locks that were
-   *  obtained will be released.
-   */
-  template<typename _L1, typename _L2, typename... _L3>
-    void
-    lock(_L1& __l1, _L2& __l2, _L3&... __l3)
-    {
-      while (true)
-        {
-          using __try_locker = __try_lock_impl<0, sizeof...(_L3) != 0>;
-          unique_lock<_L1> __first(__l1);
-          int __idx;
-          auto __locks = std::tie(__l2, __l3...);
-          __try_locker::__do_try_lock(__locks, __idx);
-          if (__idx == -1)
-            {
-              __first.release();
-              return;
-            }
-        }
-    }
-
-#ifdef _GLIBCXX_HAS_GTHREADS
-  /// once_flag
-  struct once_flag
-  {
-  private:
-    typedef __gthread_once_t __native_type;
-    __native_type  _M_once = __GTHREAD_ONCE_INIT;
-
-  public:
-    /// Constructor
-    constexpr once_flag() noexcept = default;
-
-    /// Deleted copy constructor
-    once_flag(const once_flag&) = delete;
-    /// Deleted assignment operator
-    once_flag& operator=(const once_flag&) = delete;
-
-    template<typename _Callable, typename... _Args>
-      friend void
-      call_once(once_flag& __once, _Callable&& __f, _Args&&... __args);
-  };
-
-#ifdef _GLIBCXX_HAVE_TLS
-  extern __thread void* __once_callable;
-  extern __thread void (*__once_call)();
-
-  template<typename _Callable>
-    inline void
-    __once_call_impl()
-    {
-      (*(_Callable*)__once_callable)();
-    }
-#else
-  extern function<void()> __once_functor;
-
-  extern void
-  __set_once_functor_lock_ptr(unique_lock<mutex>*);
-
-  extern mutex&
-  __get_once_mutex();
-#endif
-
-  extern "C" void __once_proxy(void);
-
-  /// call_once
-  template<typename _Callable, typename... _Args>
-    void
-    call_once(once_flag& __once, _Callable&& __f, _Args&&... __args)
-    {
-#ifdef _GLIBCXX_HAVE_TLS
-      auto __bound_functor = std::__bind_simple(std::forward<_Callable>(__f),
-          std::forward<_Args>(__args)...);
-      __once_callable = std::__addressof(__bound_functor);
-      __once_call = &__once_call_impl<decltype(__bound_functor)>;
-#else
-      unique_lock<mutex> __functor_lock(__get_once_mutex());
-      auto __callable = std::__bind_simple(std::forward<_Callable>(__f),
-          std::forward<_Args>(__args)...);
-      __once_functor = [&]() { __callable(); };
-      __set_once_functor_lock_ptr(&__functor_lock);
-#endif
-
-      int __e = __gthread_once(&__once._M_once, &__once_proxy);
-
-#ifndef _GLIBCXX_HAVE_TLS
-      if (__functor_lock)
-        __set_once_functor_lock_ptr(0);
-#endif
-
-      if (__e)
-	__throw_system_error(__e);
-    }
-#endif // _GLIBCXX_HAS_GTHREADS
-
-  // @} group mutexes
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
-
-#endif // C++11
-
-#endif // _GLIBCXX_MUTEX
diff --git a/openflow/usr/include/c++/5/new b/openflow/usr/include/c++/5/new
deleted file mode 100644
index bd50b6c..0000000
--- a/openflow/usr/include/c++/5/new
+++ /dev/null
@@ -1,142 +0,0 @@
-// The -*- C++ -*- dynamic memory management header.
-
-// Copyright (C) 1994-2015 Free Software Foundation, Inc.
-
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3, or (at your option)
-// any later version.
-// 
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file new
- *  This is a Standard C++ Library header.
- *
- *  The header @c new defines several functions to manage dynamic memory and
- *  handling memory allocation errors; see
- *  http://gcc.gnu.org/onlinedocs/libstdc++/18_support/howto.html#4 for more.
- */
-
-#ifndef _NEW
-#define _NEW
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <exception>
-
-#pragma GCC visibility push(default)
-
-extern "C++" {
-
-namespace std 
-{
-  /**
-   *  @brief  Exception possibly thrown by @c new.
-   *  @ingroup exceptions
-   *
-   *  @c bad_alloc (or classes derived from it) is used to report allocation
-   *  errors from the throwing forms of @c new.  */
-  class bad_alloc : public exception 
-  {
-  public:
-    bad_alloc() throw() { }
-
-    // This declaration is not useless:
-    // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
-    virtual ~bad_alloc() throw();
-
-    // See comment in eh_exception.cc.
-    virtual const char* what() const throw();
-  };
-
-#if __cplusplus >= 201103L
-  class bad_array_new_length : public bad_alloc
-  {
-  public:
-    bad_array_new_length() throw() { };
-
-    // This declaration is not useless:
-    // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
-    virtual ~bad_array_new_length() throw();
-
-    // See comment in eh_exception.cc.
-    virtual const char* what() const throw();
-  };
-#endif
-
-  struct nothrow_t { };
-
-  extern const nothrow_t nothrow;
-
-  /** If you write your own error handler to be called by @c new, it must
-   *  be of this type.  */
-  typedef void (*new_handler)();
-
-  /// Takes a replacement handler as the argument, returns the
-  /// previous handler.
-  new_handler set_new_handler(new_handler) throw();
-
-#if __cplusplus >= 201103L
-  /// Return the current new handler.
-  new_handler get_new_handler() noexcept;
-#endif
-} // namespace std
-
-//@{
-/** These are replaceable signatures:
- *  - normal single new and delete (no arguments, throw @c bad_alloc on error)
- *  - normal array new and delete (same)
- *  - @c nothrow single new and delete (take a @c nothrow argument, return
- *    @c NULL on error)
- *  - @c nothrow array new and delete (same)
- *
- *  Placement new and delete signatures (take a memory address argument,
- *  does nothing) may not be replaced by a user's program.
-*/
-void* operator new(std::size_t) _GLIBCXX_THROW (std::bad_alloc)
-  __attribute__((__externally_visible__));
-void* operator new[](std::size_t) _GLIBCXX_THROW (std::bad_alloc)
-  __attribute__((__externally_visible__));
-void operator delete(void*) _GLIBCXX_USE_NOEXCEPT
-  __attribute__((__externally_visible__));
-void operator delete[](void*) _GLIBCXX_USE_NOEXCEPT
-  __attribute__((__externally_visible__));
-void* operator new(std::size_t, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT
-  __attribute__((__externally_visible__));
-void* operator new[](std::size_t, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT
-  __attribute__((__externally_visible__));
-void operator delete(void*, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT
-  __attribute__((__externally_visible__));
-void operator delete[](void*, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT
-  __attribute__((__externally_visible__));
-
-// Default placement versions of operator new.
-inline void* operator new(std::size_t, void* __p) _GLIBCXX_USE_NOEXCEPT
-{ return __p; }
-inline void* operator new[](std::size_t, void* __p) _GLIBCXX_USE_NOEXCEPT
-{ return __p; }
-
-// Default placement versions of operator delete.
-inline void operator delete  (void*, void*) _GLIBCXX_USE_NOEXCEPT { }
-inline void operator delete[](void*, void*) _GLIBCXX_USE_NOEXCEPT { }
-//@}
-} // extern "C++"
-
-#pragma GCC visibility pop
-
-#endif
diff --git a/openflow/usr/include/c++/5/numeric b/openflow/usr/include/c++/5/numeric
deleted file mode 100644
index 0daab74..0000000
--- a/openflow/usr/include/c++/5/numeric
+++ /dev/null
@@ -1,77 +0,0 @@
-// <numeric> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/numeric
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_NUMERIC
-#define _GLIBCXX_NUMERIC 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stl_iterator_base_types.h>
-#include <bits/stl_numeric.h>
-
-#ifdef _GLIBCXX_PARALLEL
-# include <parallel/numeric>
-#endif
-
-/**
- * @defgroup numerics Numerics
- *
- * Components for performing numeric operations. Includes support for
- * for complex number types, random number generation, numeric
- * (n-at-a-time) arrays, generalized numeric algorithms, and special
- * math functions.
- */
-
-#endif /* _GLIBCXX_NUMERIC */
diff --git a/openflow/usr/include/c++/5/ostream b/openflow/usr/include/c++/5/ostream
deleted file mode 100644
index 151c42b..0000000
--- a/openflow/usr/include/c++/5/ostream
+++ /dev/null
@@ -1,640 +0,0 @@
-// Output streams -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/ostream
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 14882: 27.6.2  Output streams
-//
-
-#ifndef _GLIBCXX_OSTREAM
-#define _GLIBCXX_OSTREAM 1
-
-#pragma GCC system_header
-
-#include <ios>
-#include <bits/ostream_insert.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief  Template class basic_ostream.
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *
-   *  This is the base class for all output streams.  It provides text
-   *  formatting of all builtin types, and communicates with any class
-   *  derived from basic_streambuf to do the actual output.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_ostream : virtual public basic_ios<_CharT, _Traits>
-    {
-    public:
-      // Types (inherited from basic_ios):
-      typedef _CharT			 		char_type;
-      typedef typename _Traits::int_type 		int_type;
-      typedef typename _Traits::pos_type 		pos_type;
-      typedef typename _Traits::off_type 		off_type;
-      typedef _Traits			 		traits_type;
-
-      // Non-standard Types:
-      typedef basic_streambuf<_CharT, _Traits> 		__streambuf_type;
-      typedef basic_ios<_CharT, _Traits>		__ios_type;
-      typedef basic_ostream<_CharT, _Traits>		__ostream_type;
-      typedef num_put<_CharT, ostreambuf_iterator<_CharT, _Traits> >
-      							__num_put_type;
-      typedef ctype<_CharT>	      			__ctype_type;
-
-      /**
-       *  @brief  Base constructor.
-       *
-       *  This ctor is almost never called by the user directly, rather from
-       *  derived classes' initialization lists, which pass a pointer to
-       *  their own stream buffer.
-      */
-      explicit
-      basic_ostream(__streambuf_type* __sb)
-      { this->init(__sb); }
-
-      /**
-       *  @brief  Base destructor.
-       *
-       *  This does very little apart from providing a virtual base dtor.
-      */
-      virtual
-      ~basic_ostream() { }
-
-      /// Safe prefix/suffix operations.
-      class sentry;
-      friend class sentry;
-
-      //@{
-      /**
-       *  @brief  Interface for manipulators.
-       *
-       *  Manipulators such as @c std::endl and @c std::hex use these
-       *  functions in constructs like "std::cout << std::endl".  For more
-       *  information, see the iomanip header.
-      */
-      __ostream_type&
-      operator<<(__ostream_type& (*__pf)(__ostream_type&))
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// DR 60. What is a formatted input function?
-	// The inserters for manipulators are *not* formatted output functions.
-	return __pf(*this);
-      }
-
-      __ostream_type&
-      operator<<(__ios_type& (*__pf)(__ios_type&))
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// DR 60. What is a formatted input function?
-	// The inserters for manipulators are *not* formatted output functions.
-	__pf(*this);
-	return *this;
-      }
-
-      __ostream_type&
-      operator<<(ios_base& (*__pf) (ios_base&))
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// DR 60. What is a formatted input function?
-	// The inserters for manipulators are *not* formatted output functions.
-	__pf(*this);
-	return *this;
-      }
-      //@}
-
-      //@{
-      /**
-       *  @name Inserters
-       *
-       *  All the @c operator<< functions (aka <em>formatted output
-       *  functions</em>) have some common behavior.  Each starts by
-       *  constructing a temporary object of type std::basic_ostream::sentry.
-       *  This can have several effects, concluding with the setting of a
-       *  status flag; see the sentry documentation for more.
-       *
-       *  If the sentry status is good, the function tries to generate
-       *  whatever data is appropriate for the type of the argument.
-       *
-       *  If an exception is thrown during insertion, ios_base::badbit
-       *  will be turned on in the stream's error state without causing an
-       *  ios_base::failure to be thrown.  The original exception will then
-       *  be rethrown.
-      */
-
-      //@{
-      /**
-       *  @brief Integer arithmetic inserters
-       *  @param  __n A variable of builtin integral type.
-       *  @return  @c *this if successful
-       *
-       *  These functions use the stream's current locale (specifically, the
-       *  @c num_get facet) to perform numeric formatting.
-      */
-      __ostream_type&
-      operator<<(long __n)
-      { return _M_insert(__n); }
-
-      __ostream_type&
-      operator<<(unsigned long __n)
-      { return _M_insert(__n); }
-
-      __ostream_type&
-      operator<<(bool __n)
-      { return _M_insert(__n); }
-
-      __ostream_type&
-      operator<<(short __n);
-
-      __ostream_type&
-      operator<<(unsigned short __n)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 117. basic_ostream uses nonexistent num_put member functions.
-	return _M_insert(static_cast<unsigned long>(__n));
-      }
-
-      __ostream_type&
-      operator<<(int __n);
-
-      __ostream_type&
-      operator<<(unsigned int __n)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 117. basic_ostream uses nonexistent num_put member functions.
-	return _M_insert(static_cast<unsigned long>(__n));
-      }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      __ostream_type&
-      operator<<(long long __n)
-      { return _M_insert(__n); }
-
-      __ostream_type&
-      operator<<(unsigned long long __n)
-      { return _M_insert(__n); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief  Floating point arithmetic inserters
-       *  @param  __f A variable of builtin floating point type.
-       *  @return  @c *this if successful
-       *
-       *  These functions use the stream's current locale (specifically, the
-       *  @c num_get facet) to perform numeric formatting.
-      */
-      __ostream_type&
-      operator<<(double __f)
-      { return _M_insert(__f); }
-
-      __ostream_type&
-      operator<<(float __f)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 117. basic_ostream uses nonexistent num_put member functions.
-	return _M_insert(static_cast<double>(__f));
-      }
-
-      __ostream_type&
-      operator<<(long double __f)
-      { return _M_insert(__f); }
-      //@}
-
-      /**
-       *  @brief  Pointer arithmetic inserters
-       *  @param  __p A variable of pointer type.
-       *  @return  @c *this if successful
-       *
-       *  These functions use the stream's current locale (specifically, the
-       *  @c num_get facet) to perform numeric formatting.
-      */
-      __ostream_type&
-      operator<<(const void* __p)
-      { return _M_insert(__p); }
-
-      /**
-       *  @brief  Extracting from another streambuf.
-       *  @param  __sb  A pointer to a streambuf
-       *
-       *  This function behaves like one of the basic arithmetic extractors,
-       *  in that it also constructs a sentry object and has the same error
-       *  handling behavior.
-       *
-       *  If @p __sb is NULL, the stream will set failbit in its error state.
-       *
-       *  Characters are extracted from @p __sb and inserted into @c *this
-       *  until one of the following occurs:
-       *
-       *  - the input stream reaches end-of-file,
-       *  - insertion into the output sequence fails (in this case, the
-       *    character that would have been inserted is not extracted), or
-       *  - an exception occurs while getting a character from @p __sb, which
-       *    sets failbit in the error state
-       *
-       *  If the function inserts no characters, failbit is set.
-      */
-      __ostream_type&
-      operator<<(__streambuf_type* __sb);
-      //@}
-
-      //@{
-      /**
-       *  @name Unformatted Output Functions
-       *
-       *  All the unformatted output functions have some common behavior.
-       *  Each starts by constructing a temporary object of type
-       *  std::basic_ostream::sentry.  This has several effects, concluding
-       *  with the setting of a status flag; see the sentry documentation
-       *  for more.
-       *
-       *  If the sentry status is good, the function tries to generate
-       *  whatever data is appropriate for the type of the argument.
-       *
-       *  If an exception is thrown during insertion, ios_base::badbit
-       *  will be turned on in the stream's error state.  If badbit is on in
-       *  the stream's exceptions mask, the exception will be rethrown
-       *  without completing its actions.
-      */
-
-      /**
-       *  @brief  Simple insertion.
-       *  @param  __c  The character to insert.
-       *  @return  *this
-       *
-       *  Tries to insert @p __c.
-       *
-       *  @note  This function is not overloaded on signed char and
-       *         unsigned char.
-      */
-      __ostream_type&
-      put(char_type __c);
-
-      /**
-       *  @brief  Core write functionality, without sentry.
-       *  @param  __s  The array to insert.
-       *  @param  __n  Maximum number of characters to insert.
-      */
-      void
-      _M_write(const char_type* __s, streamsize __n)
-      {
-	const streamsize __put = this->rdbuf()->sputn(__s, __n);
-	if (__put != __n)
-	  this->setstate(ios_base::badbit);
-      }
-
-      /**
-       *  @brief  Character string insertion.
-       *  @param  __s  The array to insert.
-       *  @param  __n  Maximum number of characters to insert.
-       *  @return  *this
-       *
-       *  Characters are copied from @p __s and inserted into the stream until
-       *  one of the following happens:
-       *
-       *  - @p __n characters are inserted
-       *  - inserting into the output sequence fails (in this case, badbit
-       *    will be set in the stream's error state)
-       *
-       *  @note  This function is not overloaded on signed char and
-       *         unsigned char.
-      */
-      __ostream_type&
-      write(const char_type* __s, streamsize __n);
-      //@}
-
-      /**
-       *  @brief  Synchronizing the stream buffer.
-       *  @return  *this
-       *
-       *  If @c rdbuf() is a null pointer, changes nothing.
-       *
-       *  Otherwise, calls @c rdbuf()->pubsync(), and if that returns -1,
-       *  sets badbit.
-      */
-      __ostream_type&
-      flush();
-
-      /**
-       *  @brief  Getting the current write position.
-       *  @return  A file position object.
-       *
-       *  If @c fail() is not false, returns @c pos_type(-1) to indicate
-       *  failure.  Otherwise returns @c rdbuf()->pubseekoff(0,cur,out).
-      */
-      pos_type
-      tellp();
-
-      /**
-       *  @brief  Changing the current write position.
-       *  @param  __pos  A file position object.
-       *  @return  *this
-       *
-       *  If @c fail() is not true, calls @c rdbuf()->pubseekpos(pos).  If
-       *  that function fails, sets failbit.
-      */
-      __ostream_type&
-      seekp(pos_type);
-
-      /**
-       *  @brief  Changing the current write position.
-       *  @param  __off  A file offset object.
-       *  @param  __dir  The direction in which to seek.
-       *  @return  *this
-       *
-       *  If @c fail() is not true, calls @c rdbuf()->pubseekoff(off,dir).
-       *  If that function fails, sets failbit.
-      */
-       __ostream_type&
-      seekp(off_type, ios_base::seekdir);
-
-    protected:
-      basic_ostream()
-      { this->init(0); }
-
-#if __cplusplus >= 201103L
-      // Non-standard constructor that does not call init()
-      basic_ostream(basic_iostream<_CharT, _Traits>&) { }
-
-      basic_ostream(const basic_ostream&) = delete;
-
-      basic_ostream(basic_ostream&& __rhs)
-      : __ios_type()
-      { __ios_type::move(__rhs); }
-
-      // 27.7.3.3 Assign/swap
-
-      basic_ostream& operator=(const basic_ostream&) = delete;
-
-      basic_ostream&
-      operator=(basic_ostream&& __rhs)
-      {
-	swap(__rhs);
-	return *this;
-      }
-
-      void
-      swap(basic_ostream& __rhs)
-      { __ios_type::swap(__rhs); }
-#endif
-
-      template<typename _ValueT>
-	__ostream_type&
-	_M_insert(_ValueT __v);
-    };
-
-  /**
-   *  @brief  Performs setup work for output streams.
-   *
-   *  Objects of this class are created before all of the standard
-   *  inserters are run.  It is responsible for <em>exception-safe prefix and
-   *  suffix operations</em>.
-  */
-  template <typename _CharT, typename _Traits>
-    class basic_ostream<_CharT, _Traits>::sentry
-    {
-      // Data Members.
-      bool 				_M_ok;
-      basic_ostream<_CharT, _Traits>& 	_M_os;
-
-    public:
-      /**
-       *  @brief  The constructor performs preparatory work.
-       *  @param  __os  The output stream to guard.
-       *
-       *  If the stream state is good (@a __os.good() is true), then if the
-       *  stream is tied to another output stream, @c is.tie()->flush()
-       *  is called to synchronize the output sequences.
-       *
-       *  If the stream state is still good, then the sentry state becomes
-       *  true (@a okay).
-      */
-      explicit
-      sentry(basic_ostream<_CharT, _Traits>& __os);
-
-      /**
-       *  @brief  Possibly flushes the stream.
-       *
-       *  If @c ios_base::unitbuf is set in @c os.flags(), and
-       *  @c std::uncaught_exception() is true, the sentry destructor calls
-       *  @c flush() on the output stream.
-      */
-      ~sentry()
-      {
-	// XXX MT
-	if (bool(_M_os.flags() & ios_base::unitbuf) && !uncaught_exception())
-	  {
-	    // Can't call flush directly or else will get into recursive lock.
-	    if (_M_os.rdbuf() && _M_os.rdbuf()->pubsync() == -1)
-	      _M_os.setstate(ios_base::badbit);
-	  }
-      }
-
-      /**
-       *  @brief  Quick status checking.
-       *  @return  The sentry state.
-       *
-       *  For ease of use, sentries may be converted to booleans.  The
-       *  return value is that of the sentry state (true == okay).
-      */
-#if __cplusplus >= 201103L
-      explicit
-#endif
-      operator bool() const
-      { return _M_ok; }
-    };
-
-  //@{
-  /**
-   *  @brief  Character inserters
-   *  @param  __out  An output stream.
-   *  @param  __c  A character.
-   *  @return  out
-   *
-   *  Behaves like one of the formatted arithmetic inserters described in
-   *  std::basic_ostream.  After constructing a sentry object with good
-   *  status, this function inserts a single character and any required
-   *  padding (as determined by [22.2.2.2.2]).  @c __out.width(0) is then
-   *  called.
-   *
-   *  If @p __c is of type @c char and the character type of the stream is not
-   *  @c char, the character is widened before insertion.
-  */
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, _CharT __c)
-    { return __ostream_insert(__out, &__c, 1); }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, char __c)
-    { return (__out << __out.widen(__c)); }
-
-  // Specialization
-  template <class _Traits>
-    inline basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, char __c)
-    { return __ostream_insert(__out, &__c, 1); }
-
-  // Signed and unsigned
-  template<class _Traits>
-    inline basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, signed char __c)
-    { return (__out << static_cast<char>(__c)); }
-
-  template<class _Traits>
-    inline basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, unsigned char __c)
-    { return (__out << static_cast<char>(__c)); }
-  //@}
-
-  //@{
-  /**
-   *  @brief  String inserters
-   *  @param  __out  An output stream.
-   *  @param  __s  A character string.
-   *  @return  out
-   *  @pre  @p __s must be a non-NULL pointer
-   *
-   *  Behaves like one of the formatted arithmetic inserters described in
-   *  std::basic_ostream.  After constructing a sentry object with good
-   *  status, this function inserts @c traits::length(__s) characters starting
-   *  at @p __s, widened if necessary, followed by any required padding (as
-   *  determined by [22.2.2.2.2]).  @c __out.width(0) is then called.
-  */
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, const _CharT* __s)
-    {
-      if (!__s)
-	__out.setstate(ios_base::badbit);
-      else
-	__ostream_insert(__out, __s,
-			 static_cast<streamsize>(_Traits::length(__s)));
-      return __out;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits> &
-    operator<<(basic_ostream<_CharT, _Traits>& __out, const char* __s);
-
-  // Partial specializations
-  template<class _Traits>
-    inline basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, const char* __s)
-    {
-      if (!__s)
-	__out.setstate(ios_base::badbit);
-      else
-	__ostream_insert(__out, __s,
-			 static_cast<streamsize>(_Traits::length(__s)));
-      return __out;
-    }
-
-  // Signed and unsigned
-  template<class _Traits>
-    inline basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, const signed char* __s)
-    { return (__out << reinterpret_cast<const char*>(__s)); }
-
-  template<class _Traits>
-    inline basic_ostream<char, _Traits> &
-    operator<<(basic_ostream<char, _Traits>& __out, const unsigned char* __s)
-    { return (__out << reinterpret_cast<const char*>(__s)); }
-  //@}
-
-  // Standard basic_ostream manipulators
-
-  /**
-   *  @brief  Write a newline and flush the stream.
-   *
-   *  This manipulator is often mistakenly used when a simple newline is
-   *  desired, leading to poor buffering performance.  See
-   *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/streambufs.html#io.streambuf.buffering
-   *  for more on this subject.
-  */
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>&
-    endl(basic_ostream<_CharT, _Traits>& __os)
-    { return flush(__os.put(__os.widen('\n'))); }
-
-  /**
-   *  @brief  Write a null character into the output sequence.
-   *
-   *  <em>Null character</em> is @c CharT() by definition.  For CharT
-   *  of @c char, this correctly writes the ASCII @c NUL character
-   *  string terminator.
-  */
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>&
-    ends(basic_ostream<_CharT, _Traits>& __os)
-    { return __os.put(_CharT()); }
-
-  /**
-   *  @brief  Flushes the output stream.
-   *
-   *  This manipulator simply calls the stream's @c flush() member function.
-  */
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT, _Traits>&
-    flush(basic_ostream<_CharT, _Traits>& __os)
-    { return __os.flush(); }
-
-#if __cplusplus >= 201103L
-  /**
-   *  @brief  Generic inserter for rvalue stream
-   *  @param  __os  An input stream.
-   *  @param  __x  A reference to the object being inserted.
-   *  @return  os
-   *
-   *  This is just a forwarding function to allow insertion to
-   *  rvalue streams since they won't bind to the inserter functions
-   *  that take an lvalue reference.
-  */
-  template<typename _CharT, typename _Traits, typename _Tp>
-    inline basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>&& __os, const _Tp& __x)
-    {
-      __os << __x;
-      return __os;
-    }
-#endif // C++11
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#include <bits/ostream.tcc>
-
-#endif	/* _GLIBCXX_OSTREAM */
diff --git a/openflow/usr/include/c++/5/parallel/algo.h b/openflow/usr/include/c++/5/parallel/algo.h
deleted file mode 100644
index 7576c2c..0000000
--- a/openflow/usr/include/c++/5/parallel/algo.h
+++ /dev/null
@@ -1,2354 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/algo.h
- *  @brief Parallel STL function calls corresponding to the stl_algo.h header.
- *
- *  The functions defined here mainly do case switches and
- *  call the actual parallelized versions in other files.
- *  Inlining policy: Functions that basically only contain one function call,
- *  are declared inline.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler and Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_ALGO_H
-#define _GLIBCXX_PARALLEL_ALGO_H 1
-
-#include <parallel/algorithmfwd.h>
-#include <bits/stl_algobase.h>
-#include <bits/stl_algo.h>
-#include <parallel/iterator.h>
-#include <parallel/base.h>
-#include <parallel/sort.h>
-#include <parallel/workstealing.h>
-#include <parallel/par_loop.h>
-#include <parallel/omp_loop.h>
-#include <parallel/omp_loop_static.h>
-#include <parallel/for_each_selectors.h>
-#include <parallel/for_each.h>
-#include <parallel/find.h>
-#include <parallel/find_selectors.h>
-#include <parallel/search.h>
-#include <parallel/random_shuffle.h>
-#include <parallel/partition.h>
-#include <parallel/merge.h>
-#include <parallel/unique_copy.h>
-#include <parallel/set_operations.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __parallel
-{
-  // Sequential fallback
-  template<typename _IIter, typename _Function>
-    inline _Function
-    for_each(_IIter __begin, _IIter __end, _Function __f, 
-             __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::for_each(__begin, __end, __f); }
-
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter, typename _Function, typename _IteratorTag>
-    inline _Function
-    __for_each_switch(_IIter __begin, _IIter __end, _Function __f, 
-                    _IteratorTag)
-    { return for_each(__begin, __end, __f, __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators
-  template<typename _RAIter, typename _Function>
-    _Function
-    __for_each_switch(_RAIter __begin, _RAIter __end, 
-                    _Function __f, random_access_iterator_tag,
-                    __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().for_each_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          bool __dummy;
-    __gnu_parallel::__for_each_selector<_RAIter> __functionality;
-
-          return __gnu_parallel::
-            __for_each_template_random_access(
-              __begin, __end, __f, __functionality,
-              __gnu_parallel::_DummyReduct(), true, __dummy, -1,
-              __parallelism_tag);
-        }
-      else
-        return for_each(__begin, __end, __f, __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface
-  template<typename _Iterator, typename _Function>
-    inline _Function
-    for_each(_Iterator __begin, _Iterator __end, _Function __f, 
-             __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef std::iterator_traits<_Iterator> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      return __for_each_switch(__begin, __end, __f, _IteratorCategory(), 
-                             __parallelism_tag);
-    }
-
-  template<typename _Iterator, typename _Function>
-    inline _Function
-    for_each(_Iterator __begin, _Iterator __end, _Function __f) 
-    {
-      typedef std::iterator_traits<_Iterator> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      return __for_each_switch(__begin, __end, __f, _IteratorCategory());
-    }
-
-
-  // Sequential fallback
-  template<typename _IIter, typename _Tp>
-    inline _IIter
-    find(_IIter __begin, _IIter __end, const _Tp& __val, 
-         __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::find(__begin, __end, __val); }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter, typename _Tp, typename _IteratorTag>
-    inline _IIter
-    __find_switch(_IIter __begin, _IIter __end, const _Tp& __val,
-                _IteratorTag)
-    { return _GLIBCXX_STD_A::find(__begin, __end, __val); }
-
-  // Parallel find for random access iterators
-  template<typename _RAIter, typename _Tp>
-    _RAIter
-    __find_switch(_RAIter __begin, _RAIter __end,
-                const _Tp& __val, random_access_iterator_tag)
-    {
-      typedef iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-
-      if (_GLIBCXX_PARALLEL_CONDITION(true))
-        {
-	  __gnu_parallel::__binder2nd<__gnu_parallel::_EqualTo<_ValueType,
-							       const _Tp&>,
-				      _ValueType, const _Tp&, bool>
-            __comp(__gnu_parallel::_EqualTo<_ValueType, const _Tp&>(), __val);
-          return __gnu_parallel::__find_template(
-                   __begin, __end, __begin, __comp,
-                   __gnu_parallel::__find_if_selector()).first;
-        }
-      else
-        return _GLIBCXX_STD_A::find(__begin, __end, __val);
-    }
-
-  // Public interface
-  template<typename _IIter, typename _Tp>
-    inline _IIter
-    find(_IIter __begin, _IIter __end, const _Tp& __val)
-    {
-      typedef std::iterator_traits<_IIter> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      return __find_switch(__begin, __end, __val, _IteratorCategory());
-    }
-
-  // Sequential fallback
-  template<typename _IIter, typename _Predicate>
-    inline _IIter
-    find_if(_IIter __begin, _IIter __end, _Predicate __pred, 
-            __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::find_if(__begin, __end, __pred); }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter, typename _Predicate, typename _IteratorTag>
-    inline _IIter
-    __find_if_switch(_IIter __begin, _IIter __end, _Predicate __pred, 
-                   _IteratorTag)
-    { return _GLIBCXX_STD_A::find_if(__begin, __end, __pred); }
-
-  // Parallel find_if for random access iterators
-  template<typename _RAIter, typename _Predicate>
-    _RAIter
-    __find_if_switch(_RAIter __begin, _RAIter __end, 
-                   _Predicate __pred, random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(true))
-        return __gnu_parallel::__find_template(__begin, __end, __begin, __pred,
-                                             __gnu_parallel::
-                                             __find_if_selector()).first;
-      else
-        return _GLIBCXX_STD_A::find_if(__begin, __end, __pred);
-    }
-
-  // Public interface
-  template<typename _IIter, typename _Predicate>
-    inline _IIter
-    find_if(_IIter __begin, _IIter __end, _Predicate __pred)
-    {
-      typedef std::iterator_traits<_IIter> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      return __find_if_switch(__begin, __end, __pred, _IteratorCategory());
-    }
-
-  // Sequential fallback
-  template<typename _IIter, typename _FIterator>
-    inline _IIter
-    find_first_of(_IIter __begin1, _IIter __end1, 
-                  _FIterator __begin2, _FIterator __end2, 
-                  __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::find_first_of(__begin1, __end1, __begin2, __end2);
-      }
-
-  // Sequential fallback
-  template<typename _IIter, typename _FIterator,
-           typename _BinaryPredicate>
-    inline _IIter
-    find_first_of(_IIter __begin1, _IIter __end1,
-                  _FIterator __begin2, _FIterator __end2,
-                  _BinaryPredicate __comp, __gnu_parallel::sequential_tag)
-  { return _GLIBCXX_STD_A::find_first_of(
-             __begin1, __end1, __begin2, __end2, __comp); }
-
-  // Sequential fallback for input iterator type
-  template<typename _IIter, typename _FIterator,
-           typename _IteratorTag1, typename _IteratorTag2>
-    inline _IIter
-    __find_first_of_switch(_IIter __begin1, _IIter __end1,
-                         _FIterator __begin2, _FIterator __end2, 
-                         _IteratorTag1, _IteratorTag2)
-    { return find_first_of(__begin1, __end1, __begin2, __end2, 
-                           __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators
-  template<typename _RAIter, typename _FIterator,
-           typename _BinaryPredicate, typename _IteratorTag>
-    inline _RAIter
-    __find_first_of_switch(_RAIter __begin1,
-                         _RAIter __end1,
-                         _FIterator __begin2, _FIterator __end2, 
-                         _BinaryPredicate __comp, random_access_iterator_tag, 
-                         _IteratorTag)
-    {
-      return __gnu_parallel::
-        __find_template(__begin1, __end1, __begin1, __comp,
-                      __gnu_parallel::__find_first_of_selector
-                      <_FIterator>(__begin2, __end2)).first;
-    }
-
-  // Sequential fallback for input iterator type
-  template<typename _IIter, typename _FIterator,
-           typename _BinaryPredicate, typename _IteratorTag1,
-           typename _IteratorTag2>
-    inline _IIter
-    __find_first_of_switch(_IIter __begin1, _IIter __end1,
-                         _FIterator __begin2, _FIterator __end2, 
-                         _BinaryPredicate __comp, _IteratorTag1, _IteratorTag2)
-    { return find_first_of(__begin1, __end1, __begin2, __end2, __comp, 
-                           __gnu_parallel::sequential_tag()); }
-
-  // Public interface
-  template<typename _IIter, typename _FIterator,
-           typename _BinaryPredicate>
-    inline _IIter
-    find_first_of(_IIter __begin1, _IIter __end1,
-                  _FIterator __begin2, _FIterator __end2, 
-                  _BinaryPredicate __comp)
-    {
-      typedef std::iterator_traits<_IIter> _IIterTraits;
-      typedef std::iterator_traits<_FIterator> _FIterTraits;
-      typedef typename _IIterTraits::iterator_category _IIteratorCategory;
-      typedef typename _FIterTraits::iterator_category _FIteratorCategory;
-
-      return __find_first_of_switch(__begin1, __end1, __begin2, __end2, __comp,
-                                  _IIteratorCategory(), _FIteratorCategory());
-    }
-
-  // Public interface, insert default comparator
-  template<typename _IIter, typename _FIterator>
-    inline _IIter
-    find_first_of(_IIter __begin1, _IIter __end1, 
-                  _FIterator __begin2, _FIterator __end2)
-    {
-      typedef std::iterator_traits<_IIter> _IIterTraits;
-      typedef std::iterator_traits<_FIterator> _FIterTraits;
-      typedef typename _IIterTraits::value_type _IValueType;
-      typedef typename _FIterTraits::value_type _FValueType;
-
-      return __gnu_parallel::find_first_of(__begin1, __end1, __begin2, __end2,
-                         __gnu_parallel::_EqualTo<_IValueType, _FValueType>());
-    }
-
-  // Sequential fallback
-  template<typename _IIter, typename _OutputIterator>
-    inline _OutputIterator
-    unique_copy(_IIter __begin1, _IIter __end1, _OutputIterator __out,
-                __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::unique_copy(__begin1, __end1, __out); }
-
-  // Sequential fallback
-  template<typename _IIter, typename _OutputIterator,
-           typename _Predicate>
-    inline _OutputIterator
-    unique_copy(_IIter __begin1, _IIter __end1, _OutputIterator __out,
-                _Predicate __pred, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::unique_copy(__begin1, __end1, __out, __pred); }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter, typename _OutputIterator,
-           typename _Predicate, typename _IteratorTag1, typename _IteratorTag2>
-    inline _OutputIterator
-    __unique_copy_switch(_IIter __begin, _IIter __last, 
-                       _OutputIterator __out, _Predicate __pred, 
-                       _IteratorTag1, _IteratorTag2)
-    { return _GLIBCXX_STD_A::unique_copy(__begin, __last, __out, __pred); }
-
-  // Parallel unique_copy for random access iterators
-  template<typename _RAIter, typename RandomAccessOutputIterator,
-           typename _Predicate>
-    RandomAccessOutputIterator
-    __unique_copy_switch(_RAIter __begin, _RAIter __last, 
-                       RandomAccessOutputIterator __out, _Predicate __pred, 
-                       random_access_iterator_tag, random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__last - __begin)
-            > __gnu_parallel::_Settings::get().unique_copy_minimal_n))
-        return __gnu_parallel::__parallel_unique_copy(
-                 __begin, __last, __out, __pred);
-      else
-        return _GLIBCXX_STD_A::unique_copy(__begin, __last, __out, __pred);
-    }
-
-  // Public interface
-  template<typename _IIter, typename _OutputIterator>
-    inline _OutputIterator
-    unique_copy(_IIter __begin1, _IIter __end1, _OutputIterator __out)
-    {
-      typedef std::iterator_traits<_IIter> _IIterTraits;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits::iterator_category _IIteratorCategory;
-      typedef typename _IIterTraits::value_type _ValueType;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __unique_copy_switch(
-               __begin1, __end1, __out, equal_to<_ValueType>(),
-               _IIteratorCategory(), _OIterCategory());
-    }
-
-  // Public interface
-  template<typename _IIter, typename _OutputIterator, typename _Predicate>
-    inline _OutputIterator
-    unique_copy(_IIter __begin1, _IIter __end1, _OutputIterator __out,
-                _Predicate __pred)
-    {
-      typedef std::iterator_traits<_IIter> _IIterTraits;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits::iterator_category _IIteratorCategory;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __unique_copy_switch(
-               __begin1, __end1, __out, __pred,
-               _IIteratorCategory(), _OIterCategory());
-    }
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator>
-    inline _OutputIterator
-    set_union(_IIter1 __begin1, _IIter1 __end1,
-              _IIter2 __begin2, _IIter2 __end2,
-              _OutputIterator __out, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::set_union(
-               __begin1, __end1, __begin2, __end2, __out); }
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Predicate>
-    inline _OutputIterator
-    set_union(_IIter1 __begin1, _IIter1 __end1,
-              _IIter2 __begin2, _IIter2 __end2,
-              _OutputIterator __out, _Predicate __pred,
-              __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::set_union(__begin1, __end1,
-                                       __begin2, __end2, __out, __pred); }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter1, typename _IIter2, typename _Predicate,
-           typename _OutputIterator, typename _IteratorTag1,
-           typename _IteratorTag2, typename _IteratorTag3>
-    inline _OutputIterator
-    __set_union_switch(
-      _IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2,
-      _OutputIterator __result, _Predicate __pred,
-      _IteratorTag1, _IteratorTag2, _IteratorTag3)
-    { return _GLIBCXX_STD_A::set_union(__begin1, __end1,
-                                       __begin2, __end2, __result, __pred); }
-
-  // Parallel set_union for random access iterators
-  template<typename _RAIter1, typename _RAIter2,
-           typename _Output_RAIter, typename _Predicate>
-    _Output_RAIter
-    __set_union_switch(_RAIter1 __begin1, _RAIter1 __end1, 
-                     _RAIter2 __begin2, _RAIter2 __end2, 
-                     _Output_RAIter __result, _Predicate __pred,
-                     random_access_iterator_tag, random_access_iterator_tag, 
-                     random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end1 - __begin1)
-            >= __gnu_parallel::_Settings::get().set_union_minimal_n
-            || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
-            >= __gnu_parallel::_Settings::get().set_union_minimal_n))
-        return __gnu_parallel::__parallel_set_union(
-                 __begin1, __end1, __begin2, __end2, __result, __pred);
-      else
-        return _GLIBCXX_STD_A::set_union(__begin1, __end1,
-                                         __begin2, __end2, __result, __pred);
-    }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator>
-    inline _OutputIterator 
-    set_union(_IIter1 __begin1, _IIter1 __end1,
-              _IIter2 __begin2, _IIter2 __end2, _OutputIterator __out)
-    {
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-      typedef typename _IIterTraits1::value_type _ValueType1;
-      typedef typename _IIterTraits2::value_type _ValueType2;
-
-      return __set_union_switch(
-               __begin1, __end1, __begin2, __end2, __out,
-               __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
-               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
-    }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Predicate>
-    inline _OutputIterator 
-    set_union(_IIter1 __begin1, _IIter1 __end1,
-              _IIter2 __begin2, _IIter2 __end2,
-              _OutputIterator __out, _Predicate __pred)
-    {
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __set_union_switch(
-               __begin1, __end1, __begin2, __end2, __out, __pred,
-               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
-    }
-
-  // Sequential fallback.
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator>
-    inline _OutputIterator
-    set_intersection(_IIter1 __begin1, _IIter1 __end1,
-                     _IIter2 __begin2, _IIter2 __end2,
-                     _OutputIterator __out, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::set_intersection(__begin1, __end1,
-                                              __begin2, __end2, __out); }
-
-  // Sequential fallback.
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Predicate>
-    inline _OutputIterator
-    set_intersection(_IIter1 __begin1, _IIter1 __end1,
-                     _IIter2 __begin2, _IIter2 __end2,
-                     _OutputIterator __out, _Predicate __pred, 
-                     __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::set_intersection(
-               __begin1, __end1, __begin2, __end2, __out, __pred); }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter1, typename _IIter2,
-           typename _Predicate, typename _OutputIterator,
-           typename _IteratorTag1, typename _IteratorTag2,
-           typename _IteratorTag3>
-    inline _OutputIterator 
-    __set_intersection_switch(_IIter1 __begin1, _IIter1 __end1,
-                              _IIter2 __begin2, _IIter2 __end2,
-                              _OutputIterator __result, _Predicate __pred,
-                              _IteratorTag1, _IteratorTag2, _IteratorTag3)
-    { return _GLIBCXX_STD_A::set_intersection(__begin1, __end1, __begin2,
-                                              __end2, __result, __pred); }
-
-  // Parallel set_intersection for random access iterators
-  template<typename _RAIter1, typename _RAIter2,
-           typename _Output_RAIter, typename _Predicate>
-    _Output_RAIter
-    __set_intersection_switch(_RAIter1 __begin1,
-                            _RAIter1 __end1,
-                            _RAIter2 __begin2,
-                            _RAIter2 __end2,
-                            _Output_RAIter __result,
-                            _Predicate __pred,
-                            random_access_iterator_tag,
-                            random_access_iterator_tag,
-                            random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end1 - __begin1)
-            >= __gnu_parallel::_Settings::get().set_union_minimal_n
-            || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
-            >= __gnu_parallel::_Settings::get().set_union_minimal_n))
-        return __gnu_parallel::__parallel_set_intersection(
-                 __begin1, __end1, __begin2, __end2, __result, __pred);
-      else
-        return _GLIBCXX_STD_A::set_intersection(
-                 __begin1, __end1, __begin2, __end2, __result, __pred);
-    }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator>
-    inline _OutputIterator 
-    set_intersection(_IIter1 __begin1, _IIter1 __end1, 
-                     _IIter2 __begin2, _IIter2 __end2, 
-                     _OutputIterator __out)
-    {
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-      typedef typename _IIterTraits1::value_type _ValueType1;
-      typedef typename _IIterTraits2::value_type _ValueType2;
-
-      return __set_intersection_switch(
-               __begin1, __end1, __begin2, __end2, __out,
-               __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
-               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
-    }
-
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Predicate>
-    inline _OutputIterator 
-    set_intersection(_IIter1 __begin1, _IIter1 __end1,
-                     _IIter2 __begin2, _IIter2 __end2,
-                     _OutputIterator __out, _Predicate __pred)
-    {
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __set_intersection_switch(
-               __begin1, __end1, __begin2, __end2, __out, __pred,
-               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
-    }
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator>
-    inline _OutputIterator
-    set_symmetric_difference(_IIter1 __begin1, _IIter1 __end1,
-                             _IIter2 __begin2, _IIter2 __end2,
-                             _OutputIterator __out,
-                             __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::set_symmetric_difference(
-               __begin1, __end1, __begin2, __end2, __out); }
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Predicate>
-    inline _OutputIterator
-    set_symmetric_difference(_IIter1 __begin1, _IIter1 __end1,
-                             _IIter2 __begin2, _IIter2 __end2,
-                             _OutputIterator __out, _Predicate __pred,
-                             __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::set_symmetric_difference(
-               __begin1, __end1, __begin2, __end2, __out, __pred); }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter1, typename _IIter2,
-           typename _Predicate, typename _OutputIterator,
-           typename _IteratorTag1, typename _IteratorTag2,
-           typename _IteratorTag3>
-    inline _OutputIterator 
-    __set_symmetric_difference_switch(
-      _IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2,
-      _OutputIterator __result, _Predicate __pred,
-      _IteratorTag1, _IteratorTag2, _IteratorTag3)
-    { return _GLIBCXX_STD_A::set_symmetric_difference(
-               __begin1, __end1, __begin2, __end2, __result, __pred); }
-
-  // Parallel set_symmetric_difference for random access iterators
-  template<typename _RAIter1, typename _RAIter2,
-           typename _Output_RAIter, typename _Predicate>
-    _Output_RAIter
-    __set_symmetric_difference_switch(_RAIter1 __begin1,
-                                    _RAIter1 __end1,
-                                    _RAIter2 __begin2,
-                                    _RAIter2 __end2,
-                                    _Output_RAIter __result,
-                                    _Predicate __pred,
-                                    random_access_iterator_tag,
-                                    random_access_iterator_tag,
-                                    random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-      static_cast<__gnu_parallel::_SequenceIndex>(__end1 - __begin1)
-      >= __gnu_parallel::_Settings::get().set_symmetric_difference_minimal_n
-      || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
-      >= __gnu_parallel::_Settings::get().set_symmetric_difference_minimal_n))
-  return __gnu_parallel::__parallel_set_symmetric_difference(
-           __begin1, __end1, __begin2, __end2, __result, __pred);
-      else
-        return _GLIBCXX_STD_A::set_symmetric_difference(
-                 __begin1, __end1, __begin2, __end2, __result, __pred);
-    }
-
-  // Public interface.
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator>
-    inline _OutputIterator 
-    set_symmetric_difference(_IIter1 __begin1, _IIter1 __end1,
-                             _IIter2 __begin2, _IIter2 __end2,
-                             _OutputIterator __out)
-    {
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-      typedef typename _IIterTraits1::value_type _ValueType1;
-      typedef typename _IIterTraits2::value_type _ValueType2;
-
-      return __set_symmetric_difference_switch(
-               __begin1, __end1, __begin2, __end2, __out,
-               __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
-               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
-    }
-
-  // Public interface.
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Predicate>
-    inline _OutputIterator 
-    set_symmetric_difference(_IIter1 __begin1, _IIter1 __end1,
-                             _IIter2 __begin2, _IIter2 __end2,
-                             _OutputIterator __out, _Predicate __pred)
-    {
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __set_symmetric_difference_switch(
-               __begin1, __end1, __begin2, __end2, __out, __pred,
-               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
-    }
-
-  // Sequential fallback.
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator>
-    inline _OutputIterator
-    set_difference(_IIter1 __begin1, _IIter1 __end1, 
-                   _IIter2 __begin2, _IIter2 __end2, 
-                   _OutputIterator __out, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::set_difference(
-               __begin1,__end1, __begin2, __end2, __out); }
-
-  // Sequential fallback.
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Predicate>
-    inline _OutputIterator
-    set_difference(_IIter1 __begin1, _IIter1 __end1, 
-                   _IIter2 __begin2, _IIter2 __end2, 
-                   _OutputIterator __out, _Predicate __pred, 
-                   __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::set_difference(__begin1, __end1,
-                                            __begin2, __end2, __out, __pred); }
-
-  // Sequential fallback for input iterator case.
-  template<typename _IIter1, typename _IIter2, typename _Predicate,
-           typename _OutputIterator, typename _IteratorTag1,
-           typename _IteratorTag2, typename _IteratorTag3>
-    inline _OutputIterator
-    __set_difference_switch(_IIter1 __begin1, _IIter1 __end1, 
-                          _IIter2 __begin2, _IIter2 __end2, 
-                          _OutputIterator __result, _Predicate __pred, 
-                          _IteratorTag1, _IteratorTag2, _IteratorTag3)
-    { return _GLIBCXX_STD_A::set_difference(
-               __begin1, __end1, __begin2, __end2, __result, __pred); }
-
-  // Parallel set_difference for random access iterators
-  template<typename _RAIter1, typename _RAIter2,
-           typename _Output_RAIter, typename _Predicate>
-    _Output_RAIter
-    __set_difference_switch(_RAIter1 __begin1,
-                          _RAIter1 __end1,
-                          _RAIter2 __begin2,
-                          _RAIter2 __end2,
-                          _Output_RAIter __result, _Predicate __pred,
-                          random_access_iterator_tag,
-                          random_access_iterator_tag,
-                          random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end1 - __begin1)
-            >= __gnu_parallel::_Settings::get().set_difference_minimal_n
-            || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
-            >= __gnu_parallel::_Settings::get().set_difference_minimal_n))
-        return __gnu_parallel::__parallel_set_difference(
-                 __begin1, __end1, __begin2, __end2, __result, __pred);
-      else
-        return _GLIBCXX_STD_A::set_difference(
-                 __begin1, __end1, __begin2, __end2, __result, __pred);
-    }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator>
-    inline _OutputIterator
-    set_difference(_IIter1 __begin1, _IIter1 __end1, 
-                   _IIter2 __begin2, _IIter2 __end2, 
-                   _OutputIterator __out)
-    {
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-      typedef typename _IIterTraits1::value_type _ValueType1;
-      typedef typename _IIterTraits2::value_type _ValueType2;
-
-      return __set_difference_switch(
-               __begin1, __end1, __begin2, __end2, __out,
-               __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
-               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
-    }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Predicate>
-    inline _OutputIterator
-    set_difference(_IIter1 __begin1, _IIter1 __end1, 
-                   _IIter2 __begin2, _IIter2 __end2, 
-                   _OutputIterator __out, _Predicate __pred)
-    {
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __set_difference_switch(
-               __begin1, __end1, __begin2, __end2, __out, __pred,
-               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
-    }
-
-  // Sequential fallback
-  template<typename _FIterator>
-    inline _FIterator
-    adjacent_find(_FIterator __begin, _FIterator __end, 
-                  __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::adjacent_find(__begin, __end); }
-
-  // Sequential fallback
-  template<typename _FIterator, typename _BinaryPredicate>
-    inline _FIterator
-    adjacent_find(_FIterator __begin, _FIterator __end, 
-                  _BinaryPredicate __binary_pred,
-                  __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::adjacent_find(__begin, __end, __binary_pred); }
-
-  // Parallel algorithm for random access iterators
-  template<typename _RAIter>
-    _RAIter
-    __adjacent_find_switch(_RAIter __begin, _RAIter __end, 
-                         random_access_iterator_tag)
-    {
-      typedef iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-
-      if (_GLIBCXX_PARALLEL_CONDITION(true))
-        {
-          _RAIter __spot = __gnu_parallel::
-              __find_template(
-                __begin, __end - 1, __begin, equal_to<_ValueType>(),
-                __gnu_parallel::__adjacent_find_selector())
-            .first;
-          if (__spot == (__end - 1))
-            return __end;
-          else
-            return __spot;
-        }
-      else
-        return adjacent_find(__begin, __end, __gnu_parallel::sequential_tag());
-    }
-
-  // Sequential fallback for input iterator case
-  template<typename _FIterator, typename _IteratorTag>
-    inline _FIterator
-    __adjacent_find_switch(_FIterator __begin, _FIterator __end,
-                         _IteratorTag)
-    { return adjacent_find(__begin, __end, __gnu_parallel::sequential_tag()); }
-
-  // Public interface
-  template<typename _FIterator>
-    inline _FIterator
-    adjacent_find(_FIterator __begin, _FIterator __end)
-    {
-      typedef iterator_traits<_FIterator> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __adjacent_find_switch(__begin, __end, _IteratorCategory());
-    }
-
-  // Sequential fallback for input iterator case
-  template<typename _FIterator, typename _BinaryPredicate,
-           typename _IteratorTag>
-    inline _FIterator
-    __adjacent_find_switch(_FIterator __begin, _FIterator __end, 
-                         _BinaryPredicate __pred, _IteratorTag)
-    { return adjacent_find(__begin, __end, __pred,
-                           __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators
-  template<typename _RAIter, typename _BinaryPredicate>
-    _RAIter
-    __adjacent_find_switch(_RAIter __begin, _RAIter __end, 
-                         _BinaryPredicate __pred, random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(true))
-        return __gnu_parallel::__find_template(__begin, __end, __begin, __pred,
-                                             __gnu_parallel::
-                                             __adjacent_find_selector()).first;
-      else
-        return adjacent_find(__begin, __end, __pred,
-                             __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface
-  template<typename _FIterator, typename _BinaryPredicate>
-    inline _FIterator
-    adjacent_find(_FIterator __begin, _FIterator __end, 
-                  _BinaryPredicate __pred)
-    {
-      typedef iterator_traits<_FIterator> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __adjacent_find_switch(__begin, __end, __pred,
-                                    _IteratorCategory());
-    }
-
-  // Sequential fallback
-  template<typename _IIter, typename _Tp>
-    inline typename iterator_traits<_IIter>::difference_type
-    count(_IIter __begin, _IIter __end, const _Tp& __value, 
-          __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::count(__begin, __end, __value); }
-
-  // Parallel code for random access iterators
-  template<typename _RAIter, typename _Tp>
-    typename iterator_traits<_RAIter>::difference_type
-    __count_switch(_RAIter __begin, _RAIter __end, 
-                 const _Tp& __value, random_access_iterator_tag, 
-                 __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef __gnu_parallel::_SequenceIndex _SequenceIndex;
-
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().count_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          __gnu_parallel::__count_selector<_RAIter, _DifferenceType>
-            __functionality;
-          _DifferenceType __res = 0;
-          __gnu_parallel::
-            __for_each_template_random_access(
-              __begin, __end, __value, __functionality,
-              std::plus<_SequenceIndex>(), __res, __res, -1,
-              __parallelism_tag);
-          return __res;
-        }
-      else
-        return count(__begin, __end, __value,
-                     __gnu_parallel::sequential_tag());
-    }
-
-  // Sequential fallback for input iterator case.
-  template<typename _IIter, typename _Tp, typename _IteratorTag>
-    inline typename iterator_traits<_IIter>::difference_type
-    __count_switch(_IIter __begin, _IIter __end, const _Tp& __value, 
-                 _IteratorTag)
-    { return count(__begin, __end, __value, __gnu_parallel::sequential_tag());
-      }
-
-  // Public interface.
-  template<typename _IIter, typename _Tp>
-    inline typename iterator_traits<_IIter>::difference_type
-    count(_IIter __begin, _IIter __end, const _Tp& __value, 
-          __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __count_switch(__begin, __end, __value, _IteratorCategory(),
-                            __parallelism_tag);
-    }
-
-  template<typename _IIter, typename _Tp>
-    inline typename iterator_traits<_IIter>::difference_type
-    count(_IIter __begin, _IIter __end, const _Tp& __value)
-    {
-      typedef iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __count_switch(__begin, __end, __value, _IteratorCategory());
-    }
-
-
-  // Sequential fallback.
-  template<typename _IIter, typename _Predicate>
-    inline typename iterator_traits<_IIter>::difference_type
-    count_if(_IIter __begin, _IIter __end, _Predicate __pred, 
-             __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::count_if(__begin, __end, __pred); }
-
-  // Parallel count_if for random access iterators
-  template<typename _RAIter, typename _Predicate>
-    typename iterator_traits<_RAIter>::difference_type
-    __count_if_switch(_RAIter __begin, _RAIter __end, 
-                    _Predicate __pred, random_access_iterator_tag,
-                    __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef __gnu_parallel::_SequenceIndex _SequenceIndex;
-
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().count_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          _DifferenceType __res = 0;
-          __gnu_parallel::
-            __count_if_selector<_RAIter, _DifferenceType>
-            __functionality;
-          __gnu_parallel::
-            __for_each_template_random_access(
-              __begin, __end, __pred, __functionality,
-              std::plus<_SequenceIndex>(), __res, __res, -1,
-              __parallelism_tag);
-          return __res;
-        }
-      else
-        return count_if(__begin, __end, __pred,
-                        __gnu_parallel::sequential_tag());
-    }
-
-  // Sequential fallback for input iterator case.
-  template<typename _IIter, typename _Predicate, typename _IteratorTag>
-    inline typename iterator_traits<_IIter>::difference_type
-    __count_if_switch(_IIter __begin, _IIter __end, _Predicate __pred, 
-                    _IteratorTag)
-    { return count_if(__begin, __end, __pred,
-                      __gnu_parallel::sequential_tag()); }
-
-  // Public interface.
-  template<typename _IIter, typename _Predicate>
-    inline typename iterator_traits<_IIter>::difference_type
-    count_if(_IIter __begin, _IIter __end, _Predicate __pred, 
-             __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __count_if_switch(__begin, __end, __pred, _IteratorCategory(), 
-                             __parallelism_tag);
-    }
-
-  template<typename _IIter, typename _Predicate>
-    inline typename iterator_traits<_IIter>::difference_type
-    count_if(_IIter __begin, _IIter __end, _Predicate __pred)
-    {
-      typedef iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __count_if_switch(__begin, __end, __pred, _IteratorCategory());
-    }
-
-
-  // Sequential fallback.
-  template<typename _FIterator1, typename _FIterator2>
-    inline _FIterator1
-    search(_FIterator1 __begin1, _FIterator1 __end1,
-           _FIterator2 __begin2, _FIterator2 __end2,
-           __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::search(__begin1, __end1, __begin2, __end2); }
-
-  // Parallel algorithm for random access iterator
-  template<typename _RAIter1, typename _RAIter2>
-    _RAIter1
-    __search_switch(_RAIter1 __begin1, _RAIter1 __end1,
-                  _RAIter2 __begin2, _RAIter2 __end2,
-                  random_access_iterator_tag, random_access_iterator_tag)
-    {
-      typedef std::iterator_traits<_RAIter1> _Iterator1Traits;
-      typedef typename _Iterator1Traits::value_type _ValueType1;
-      typedef std::iterator_traits<_RAIter2> _Iterator2Traits;
-      typedef typename _Iterator2Traits::value_type _ValueType2;
-
-      if (_GLIBCXX_PARALLEL_CONDITION(
-                static_cast<__gnu_parallel::_SequenceIndex>(__end1 - __begin1)
-            >= __gnu_parallel::_Settings::get().search_minimal_n))
-        return __gnu_parallel::
-          __search_template(
-            __begin1, __end1, __begin2, __end2,
-            __gnu_parallel::_EqualTo<_ValueType1, _ValueType2>());
-      else
-        return search(__begin1, __end1, __begin2, __end2,
-                      __gnu_parallel::sequential_tag());
-    }
-
-  // Sequential fallback for input iterator case
-  template<typename _FIterator1, typename _FIterator2,
-           typename _IteratorTag1, typename _IteratorTag2>
-    inline _FIterator1
-    __search_switch(_FIterator1 __begin1, _FIterator1 __end1,
-                  _FIterator2 __begin2, _FIterator2 __end2,
-                  _IteratorTag1, _IteratorTag2)
-    { return search(__begin1, __end1, __begin2, __end2,
-                    __gnu_parallel::sequential_tag()); }
-
-  // Public interface.
-  template<typename _FIterator1, typename _FIterator2>
-    inline _FIterator1
-    search(_FIterator1 __begin1, _FIterator1 __end1,
-           _FIterator2 __begin2, _FIterator2 __end2)
-    {
-      typedef std::iterator_traits<_FIterator1> _Iterator1Traits;
-      typedef typename _Iterator1Traits::iterator_category _IteratorCategory1;
-      typedef std::iterator_traits<_FIterator2> _Iterator2Traits;
-      typedef typename _Iterator2Traits::iterator_category _IteratorCategory2;
-
-      return __search_switch(__begin1, __end1, __begin2, __end2,
-                           _IteratorCategory1(), _IteratorCategory2());
-    }
-
-  // Public interface.
-  template<typename _FIterator1, typename _FIterator2,
-           typename _BinaryPredicate>
-    inline _FIterator1
-    search(_FIterator1 __begin1, _FIterator1 __end1,
-           _FIterator2 __begin2, _FIterator2 __end2,
-           _BinaryPredicate __pred, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::search(
-                               __begin1, __end1, __begin2, __end2, __pred); }
-
-  // Parallel algorithm for random access iterator.
-  template<typename _RAIter1, typename _RAIter2,
-           typename _BinaryPredicate>
-    _RAIter1
-    __search_switch(_RAIter1 __begin1, _RAIter1 __end1,
-                  _RAIter2 __begin2, _RAIter2 __end2,
-                  _BinaryPredicate __pred,
-                  random_access_iterator_tag, random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-                static_cast<__gnu_parallel::_SequenceIndex>(__end1 - __begin1)
-            >= __gnu_parallel::_Settings::get().search_minimal_n))
-        return __gnu_parallel::__search_template(__begin1, __end1,
-                                               __begin2, __end2, __pred);
-      else
-        return search(__begin1, __end1, __begin2, __end2, __pred,
-                      __gnu_parallel::sequential_tag());
-    }
-
-  // Sequential fallback for input iterator case
-  template<typename _FIterator1, typename _FIterator2,
-           typename _BinaryPredicate, typename _IteratorTag1,
-           typename _IteratorTag2>
-    inline _FIterator1
-    __search_switch(_FIterator1 __begin1, _FIterator1 __end1,
-                  _FIterator2 __begin2, _FIterator2 __end2,
-                  _BinaryPredicate __pred, _IteratorTag1, _IteratorTag2)
-    { return search(__begin1, __end1, __begin2, __end2, __pred,
-                    __gnu_parallel::sequential_tag()); }
-
-  // Public interface
-  template<typename _FIterator1, typename _FIterator2,
-           typename _BinaryPredicate>
-    inline _FIterator1
-    search(_FIterator1 __begin1, _FIterator1 __end1,
-           _FIterator2 __begin2, _FIterator2 __end2,
-           _BinaryPredicate  __pred)
-    {
-      typedef std::iterator_traits<_FIterator1> _Iterator1Traits;
-      typedef typename _Iterator1Traits::iterator_category _IteratorCategory1;
-      typedef std::iterator_traits<_FIterator2> _Iterator2Traits;
-      typedef typename _Iterator2Traits::iterator_category _IteratorCategory2;
-      return __search_switch(__begin1, __end1, __begin2, __end2, __pred,
-                           _IteratorCategory1(), _IteratorCategory2());
-    }
-
-  // Sequential fallback
-  template<typename _FIterator, typename _Integer, typename _Tp>
-    inline _FIterator
-    search_n(_FIterator __begin, _FIterator __end, _Integer __count,
-             const _Tp& __val, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::search_n(__begin, __end, __count, __val); }
-
-  // Sequential fallback
-  template<typename _FIterator, typename _Integer, typename _Tp,
-           typename _BinaryPredicate>
-    inline _FIterator
-    search_n(_FIterator __begin, _FIterator __end, _Integer __count,
-             const _Tp& __val, _BinaryPredicate __binary_pred,
-             __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::search_n(
-               __begin, __end, __count, __val, __binary_pred); }
-
-  // Public interface.
-  template<typename _FIterator, typename _Integer, typename _Tp>
-    inline _FIterator
-    search_n(_FIterator __begin, _FIterator __end, _Integer __count,
-             const _Tp& __val)
-    {
-      typedef typename iterator_traits<_FIterator>::value_type _ValueType;
-      return __gnu_parallel::search_n(__begin, __end, __count, __val,
-                      __gnu_parallel::_EqualTo<_ValueType, _Tp>());
-    }
-
-  // Parallel algorithm for random access iterators.
-  template<typename _RAIter, typename _Integer,
-           typename _Tp, typename _BinaryPredicate>
-    _RAIter
-    __search_n_switch(_RAIter __begin, _RAIter __end, _Integer __count,
-                      const _Tp& __val, _BinaryPredicate __binary_pred,
-                      random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-                static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().search_minimal_n))
-        {
-          __gnu_parallel::_PseudoSequence<_Tp, _Integer> __ps(__val, __count);
-          return __gnu_parallel::__search_template(
-                   __begin, __end, __ps.begin(), __ps.end(), __binary_pred);
-        }
-      else
-        return _GLIBCXX_STD_A::search_n(__begin, __end, __count, __val,
-                                        __binary_pred);
-    }
-
-  // Sequential fallback for input iterator case.
-  template<typename _FIterator, typename _Integer, typename _Tp,
-           typename _BinaryPredicate, typename _IteratorTag>
-    inline _FIterator
-    __search_n_switch(_FIterator __begin, _FIterator __end, _Integer __count,
-                      const _Tp& __val, _BinaryPredicate __binary_pred,
-                      _IteratorTag)
-    { return _GLIBCXX_STD_A::search_n(__begin, __end, __count, __val,
-                                      __binary_pred); }
-
-  // Public interface.
-  template<typename _FIterator, typename _Integer, typename _Tp,
-           typename _BinaryPredicate>
-    inline _FIterator
-    search_n(_FIterator __begin, _FIterator __end, _Integer __count,
-             const _Tp& __val, _BinaryPredicate __binary_pred)
-    {
-      return __search_n_switch(__begin, __end, __count, __val, __binary_pred,
-                             typename std::iterator_traits<_FIterator>::
-                             iterator_category());
-    }
-
-
-  // Sequential fallback.
-  template<typename _IIter, typename _OutputIterator,
-           typename _UnaryOperation>
-    inline _OutputIterator
-    transform(_IIter __begin, _IIter __end, _OutputIterator __result, 
-              _UnaryOperation __unary_op, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::transform(__begin, __end, __result, __unary_op); }
-
-  // Parallel unary transform for random access iterators.
-  template<typename _RAIter1, typename _RAIter2,
-           typename _UnaryOperation>
-    _RAIter2
-    __transform1_switch(_RAIter1 __begin, _RAIter1 __end,
-                      _RAIter2 __result, _UnaryOperation __unary_op,
-                      random_access_iterator_tag, random_access_iterator_tag,
-                      __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().transform_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          bool __dummy = true;
-          typedef __gnu_parallel::_IteratorPair<_RAIter1,
-            _RAIter2, random_access_iterator_tag> _ItTrip;
-          _ItTrip __begin_pair(__begin, __result),
-                  __end_pair(__end, __result + (__end - __begin));
-          __gnu_parallel::__transform1_selector<_ItTrip> __functionality;
-          __gnu_parallel::
-            __for_each_template_random_access(
-              __begin_pair, __end_pair, __unary_op, __functionality,
-              __gnu_parallel::_DummyReduct(),
-              __dummy, __dummy, -1, __parallelism_tag);
-          return __functionality._M_finish_iterator;
-        }
-      else
-        return transform(__begin, __end, __result, __unary_op, 
-                         __gnu_parallel::sequential_tag());
-    }
-
-  // Sequential fallback for input iterator case.
-  template<typename _RAIter1, typename _RAIter2,
-           typename _UnaryOperation, typename _IteratorTag1,
-           typename _IteratorTag2>
-    inline _RAIter2
-    __transform1_switch(_RAIter1 __begin, _RAIter1 __end,
-                      _RAIter2 __result, _UnaryOperation __unary_op,
-                      _IteratorTag1, _IteratorTag2)
-    { return transform(__begin, __end, __result, __unary_op, 
-                       __gnu_parallel::sequential_tag()); }
-
-  // Public interface.
-  template<typename _IIter, typename _OutputIterator,
-           typename _UnaryOperation>
-    inline _OutputIterator
-    transform(_IIter __begin, _IIter __end, _OutputIterator __result,
-              _UnaryOperation __unary_op, 
-              __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef std::iterator_traits<_IIter> _IIterTraits;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits::iterator_category _IIteratorCategory;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __transform1_switch(__begin, __end, __result, __unary_op,
-                               _IIteratorCategory(), _OIterCategory(), 
-                               __parallelism_tag);
-    }
-
-  template<typename _IIter, typename _OutputIterator,
-           typename _UnaryOperation>
-    inline _OutputIterator
-    transform(_IIter __begin, _IIter __end, _OutputIterator __result,
-              _UnaryOperation __unary_op)
-    {
-      typedef std::iterator_traits<_IIter> _IIterTraits;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits::iterator_category _IIteratorCategory;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __transform1_switch(__begin, __end, __result, __unary_op,
-                               _IIteratorCategory(), _OIterCategory());
-    }
-
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _BinaryOperation>
-    inline _OutputIterator
-    transform(_IIter1 __begin1, _IIter1 __end1,
-              _IIter2 __begin2, _OutputIterator __result,
-              _BinaryOperation __binary_op, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::transform(__begin1, __end1,
-                                       __begin2, __result, __binary_op); }
-
-  // Parallel binary transform for random access iterators.
-  template<typename _RAIter1, typename _RAIter2,
-           typename _RAIter3, typename _BinaryOperation>
-    _RAIter3
-    __transform2_switch(_RAIter1 __begin1, _RAIter1 __end1,
-                      _RAIter2 __begin2,
-                      _RAIter3 __result, _BinaryOperation __binary_op,
-                      random_access_iterator_tag, random_access_iterator_tag,
-                      random_access_iterator_tag,
-                      __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            (__end1 - __begin1) >=
-                __gnu_parallel::_Settings::get().transform_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          bool __dummy = true;
-          typedef __gnu_parallel::_IteratorTriple<_RAIter1,
-            _RAIter2, _RAIter3,
-            random_access_iterator_tag> _ItTrip;
-          _ItTrip __begin_triple(__begin1, __begin2, __result),
-            __end_triple(__end1, __begin2 + (__end1 - __begin1),
-                       __result + (__end1 - __begin1));
-          __gnu_parallel::__transform2_selector<_ItTrip> __functionality;
-          __gnu_parallel::
-            __for_each_template_random_access(__begin_triple, __end_triple,
-                                            __binary_op, __functionality,
-                                            __gnu_parallel::_DummyReduct(),
-                                            __dummy, __dummy, -1,
-                                            __parallelism_tag);
-          return __functionality._M_finish_iterator;
-        }
-      else
-        return transform(__begin1, __end1, __begin2, __result, __binary_op, 
-                         __gnu_parallel::sequential_tag());
-    }
-
-  // Sequential fallback for input iterator case.
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _BinaryOperation,
-           typename _Tag1, typename _Tag2, typename _Tag3>
-    inline _OutputIterator
-    __transform2_switch(_IIter1 __begin1, _IIter1 __end1, 
-                      _IIter2 __begin2, _OutputIterator __result, 
-                      _BinaryOperation __binary_op, _Tag1, _Tag2, _Tag3)
-    { return transform(__begin1, __end1, __begin2, __result, __binary_op,
-                       __gnu_parallel::sequential_tag()); }
-
-  // Public interface.
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _BinaryOperation>
-    inline _OutputIterator
-    transform(_IIter1 __begin1, _IIter1 __end1,
-              _IIter2 __begin2, _OutputIterator __result,
-              _BinaryOperation __binary_op, 
-              __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __transform2_switch(
-               __begin1, __end1, __begin2, __result, __binary_op,
-               _IIterCategory1(), _IIterCategory2(), _OIterCategory(),
-               __parallelism_tag);
-    }
-
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _BinaryOperation>
-    inline _OutputIterator
-    transform(_IIter1 __begin1, _IIter1 __end1,
-              _IIter2 __begin2, _OutputIterator __result,
-              _BinaryOperation __binary_op)
-    {
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __transform2_switch(
-               __begin1, __end1, __begin2, __result, __binary_op,
-               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
-    }
-
-  // Sequential fallback
-  template<typename _FIterator, typename _Tp>
-    inline void
-    replace(_FIterator __begin, _FIterator __end, const _Tp& __old_value, 
-            const _Tp& __new_value, __gnu_parallel::sequential_tag)
-    { _GLIBCXX_STD_A::replace(__begin, __end, __old_value, __new_value); }
-
-  // Sequential fallback for input iterator case
-  template<typename _FIterator, typename _Tp, typename _IteratorTag>
-    inline void
-    __replace_switch(_FIterator __begin, _FIterator __end, 
-                     const _Tp& __old_value, const _Tp& __new_value,
-                     _IteratorTag)
-    { replace(__begin, __end, __old_value, __new_value, 
-              __gnu_parallel::sequential_tag()); }
-
-  // Parallel replace for random access iterators
-  template<typename _RAIter, typename _Tp>
-    inline void
-    __replace_switch(_RAIter __begin, _RAIter __end, 
-                   const _Tp& __old_value, const _Tp& __new_value, 
-                   random_access_iterator_tag, 
-                   __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      // XXX parallel version is where?
-      replace(__begin, __end, __old_value, __new_value, 
-              __gnu_parallel::sequential_tag()); 
-    }
-
-  // Public interface
-  template<typename _FIterator, typename _Tp>
-    inline void
-    replace(_FIterator __begin, _FIterator __end, const _Tp& __old_value, 
-            const _Tp& __new_value,
-            __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_FIterator> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      __replace_switch(__begin, __end, __old_value, __new_value,
-                       _IteratorCategory(),
-                     __parallelism_tag);
-    }
-
-  template<typename _FIterator, typename _Tp>
-    inline void
-    replace(_FIterator __begin, _FIterator __end, const _Tp& __old_value, 
-            const _Tp& __new_value)
-    {
-      typedef iterator_traits<_FIterator> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      __replace_switch(__begin, __end, __old_value, __new_value,
-                       _IteratorCategory());
-    }
-
-
-  // Sequential fallback
-  template<typename _FIterator, typename _Predicate, typename _Tp>
-    inline void
-    replace_if(_FIterator __begin, _FIterator __end, _Predicate __pred, 
-               const _Tp& __new_value, __gnu_parallel::sequential_tag)
-    { _GLIBCXX_STD_A::replace_if(__begin, __end, __pred, __new_value); }
-
-  // Sequential fallback for input iterator case
-  template<typename _FIterator, typename _Predicate, typename _Tp,
-           typename _IteratorTag>
-    inline void
-    __replace_if_switch(_FIterator __begin, _FIterator __end,
-                      _Predicate __pred, const _Tp& __new_value, _IteratorTag)
-    { replace_if(__begin, __end, __pred, __new_value,
-                 __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators.
-  template<typename _RAIter, typename _Predicate, typename _Tp>
-    void
-    __replace_if_switch(_RAIter __begin, _RAIter __end,
-                      _Predicate __pred, const _Tp& __new_value,
-                      random_access_iterator_tag,
-                      __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().replace_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          bool __dummy;
-          __gnu_parallel::
-            __replace_if_selector<_RAIter, _Predicate, _Tp>
-            __functionality(__new_value);
-          __gnu_parallel::
-            __for_each_template_random_access(
-              __begin, __end, __pred, __functionality,
-              __gnu_parallel::_DummyReduct(),
-              true, __dummy, -1, __parallelism_tag);
-        }
-      else
-        replace_if(__begin, __end, __pred, __new_value, 
-                   __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface.
-  template<typename _FIterator, typename _Predicate, typename _Tp>
-    inline void
-    replace_if(_FIterator __begin, _FIterator __end,
-               _Predicate __pred, const _Tp& __new_value, 
-               __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef std::iterator_traits<_FIterator> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      __replace_if_switch(__begin, __end, __pred, __new_value,
-                          _IteratorCategory(), __parallelism_tag);
-    }
-
-  template<typename _FIterator, typename _Predicate, typename _Tp>
-    inline void
-    replace_if(_FIterator __begin, _FIterator __end,
-               _Predicate __pred, const _Tp& __new_value)
-    {
-      typedef std::iterator_traits<_FIterator> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      __replace_if_switch(__begin, __end, __pred, __new_value,
-                          _IteratorCategory());
-    }
-
-  // Sequential fallback
-  template<typename _FIterator, typename _Generator>
-    inline void
-    generate(_FIterator __begin, _FIterator __end, _Generator __gen, 
-             __gnu_parallel::sequential_tag)
-    { _GLIBCXX_STD_A::generate(__begin, __end, __gen); }
-
-  // Sequential fallback for input iterator case.
-  template<typename _FIterator, typename _Generator, typename _IteratorTag>
-    inline void
-    __generate_switch(_FIterator __begin, _FIterator __end, _Generator __gen,
-                    _IteratorTag)
-    { generate(__begin, __end, __gen, __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators.
-  template<typename _RAIter, typename _Generator>
-    void
-    __generate_switch(_RAIter __begin, _RAIter __end,
-                    _Generator __gen, random_access_iterator_tag, 
-                    __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().generate_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          bool __dummy;
-          __gnu_parallel::__generate_selector<_RAIter>
-            __functionality;
-          __gnu_parallel::
-            __for_each_template_random_access(
-              __begin, __end, __gen, __functionality,
-              __gnu_parallel::_DummyReduct(),
-              true, __dummy, -1, __parallelism_tag);
-        }
-      else
-        generate(__begin, __end, __gen, __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface.
-  template<typename _FIterator, typename _Generator>
-    inline void
-    generate(_FIterator __begin, _FIterator __end,
-             _Generator __gen, __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef std::iterator_traits<_FIterator> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      __generate_switch(__begin, __end, __gen, _IteratorCategory(),
-                        __parallelism_tag);
-    }
-
-  template<typename _FIterator, typename _Generator>
-    inline void
-    generate(_FIterator __begin, _FIterator __end, _Generator __gen)
-    {
-      typedef std::iterator_traits<_FIterator> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      __generate_switch(__begin, __end, __gen, _IteratorCategory());
-    }
-
-
-  // Sequential fallback.
-  template<typename _OutputIterator, typename _Size, typename _Generator>
-    inline _OutputIterator
-    generate_n(_OutputIterator __begin, _Size __n, _Generator __gen, 
-               __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::generate_n(__begin, __n, __gen); }
-
-  // Sequential fallback for input iterator case.
-  template<typename _OutputIterator, typename _Size, typename _Generator,
-           typename _IteratorTag>
-    inline _OutputIterator
-    __generate_n_switch(_OutputIterator __begin, _Size __n, _Generator __gen,
-                        _IteratorTag)
-    { return generate_n(__begin, __n, __gen,
-                        __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators.
-  template<typename _RAIter, typename _Size, typename _Generator>
-    inline _RAIter
-    __generate_n_switch(_RAIter __begin, _Size __n, _Generator __gen, 
-                      random_access_iterator_tag, 
-                      __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      // XXX parallel version is where?
-      return generate_n(__begin, __n, __gen, __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface.
-  template<typename _OutputIterator, typename _Size, typename _Generator>
-    inline _OutputIterator
-    generate_n(_OutputIterator __begin, _Size __n, _Generator __gen, 
-               __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef std::iterator_traits<_OutputIterator> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      return __generate_n_switch(__begin, __n, __gen, _IteratorCategory(), 
-                               __parallelism_tag); 
-    }
-
-  template<typename _OutputIterator, typename _Size, typename _Generator>
-    inline _OutputIterator
-    generate_n(_OutputIterator __begin, _Size __n, _Generator __gen)
-    {
-      typedef std::iterator_traits<_OutputIterator> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      return __generate_n_switch(__begin, __n, __gen, _IteratorCategory());
-    }
-
-
-  // Sequential fallback.
-  template<typename _RAIter>
-    inline void
-    random_shuffle(_RAIter __begin, _RAIter __end, 
-                   __gnu_parallel::sequential_tag)
-    { _GLIBCXX_STD_A::random_shuffle(__begin, __end); }
-
-  // Sequential fallback.
-  template<typename _RAIter, typename _RandomNumberGenerator>
-    inline void
-    random_shuffle(_RAIter __begin, _RAIter __end,
-                   _RandomNumberGenerator& __rand,
-                   __gnu_parallel::sequential_tag)
-    { _GLIBCXX_STD_A::random_shuffle(__begin, __end, __rand); }
-
-
-  /** @brief Functor wrapper for std::rand(). */
-  template<typename _MustBeInt = int>
-    struct _CRandNumber
-    {
-      int
-      operator()(int __limit)
-      { return rand() % __limit; }
-    };
-
-  // Fill in random number generator.
-  template<typename _RAIter>
-    inline void
-    random_shuffle(_RAIter __begin, _RAIter __end)
-    {
-      _CRandNumber<> __r;
-      // Parallelization still possible.
-      __gnu_parallel::random_shuffle(__begin, __end, __r);
-    }
-
-  // Parallel algorithm for random access iterators.
-  template<typename _RAIter, typename _RandomNumberGenerator>
-    void
-    random_shuffle(_RAIter __begin, _RAIter __end,
-#if __cplusplus >= 201103L
-                   _RandomNumberGenerator&& __rand)
-#else
-                   _RandomNumberGenerator& __rand)
-#endif
-    {
-      if (__begin == __end)
-        return;
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().random_shuffle_minimal_n))
-        __gnu_parallel::__parallel_random_shuffle(__begin, __end, __rand);
-      else
-        __gnu_parallel::__sequential_random_shuffle(__begin, __end, __rand);
-    }
-
-  // Sequential fallback.
-  template<typename _FIterator, typename _Predicate>
-    inline _FIterator
-    partition(_FIterator __begin, _FIterator __end,
-              _Predicate __pred, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::partition(__begin, __end, __pred); }
-
-  // Sequential fallback for input iterator case.
-  template<typename _FIterator, typename _Predicate, typename _IteratorTag>
-    inline _FIterator
-    __partition_switch(_FIterator __begin, _FIterator __end,
-                     _Predicate __pred, _IteratorTag)
-    { return partition(__begin, __end, __pred,
-                       __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators.
-  template<typename _RAIter, typename _Predicate>
-    _RAIter
-    __partition_switch(_RAIter __begin, _RAIter __end,
-                     _Predicate __pred, random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().partition_minimal_n))
-        {
-          typedef typename std::iterator_traits<_RAIter>::
-            difference_type _DifferenceType;
-          _DifferenceType __middle = __gnu_parallel::
-            __parallel_partition(__begin, __end, __pred,
-                               __gnu_parallel::__get_max_threads());
-          return __begin + __middle;
-        }
-      else
-        return partition(__begin, __end, __pred,
-                         __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface.
-  template<typename _FIterator, typename _Predicate>
-    inline _FIterator
-    partition(_FIterator __begin, _FIterator __end, _Predicate __pred)
-    {
-      typedef iterator_traits<_FIterator> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __partition_switch(__begin, __end, __pred, _IteratorCategory());
-    }
-
-  // sort interface
-
-  // Sequential fallback
-  template<typename _RAIter>
-    inline void
-    sort(_RAIter __begin, _RAIter __end, 
-         __gnu_parallel::sequential_tag)
-    { _GLIBCXX_STD_A::sort(__begin, __end); }
-
-  // Sequential fallback
-  template<typename _RAIter, typename _Compare>
-    inline void
-    sort(_RAIter __begin, _RAIter __end, _Compare __comp,
-         __gnu_parallel::sequential_tag)
-    { _GLIBCXX_STD_A::sort<_RAIter, _Compare>(__begin, __end,
-                                                             __comp); }
-
-  // Public interface
-  template<typename _RAIter, typename _Compare,
-           typename _Parallelism>
-  void
-  sort(_RAIter __begin, _RAIter __end, _Compare __comp,
-       _Parallelism __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-
-    if (__begin != __end)
-      {
-        if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) >=
-              __gnu_parallel::_Settings::get().sort_minimal_n))
-          __gnu_parallel::__parallel_sort<false>(
-                            __begin, __end, __comp, __parallelism);
-        else
-          sort(__begin, __end, __comp, __gnu_parallel::sequential_tag());
-      }
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-    inline void
-    sort(_RAIter __begin, _RAIter __end)
-    {
-      typedef iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      sort(__begin, __end, std::less<_ValueType>(),
-           __gnu_parallel::default_parallel_tag());
-    }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  sort(_RAIter __begin, _RAIter __end,
-       __gnu_parallel::default_parallel_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  sort(_RAIter __begin, _RAIter __end,
-       __gnu_parallel::parallel_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  sort(_RAIter __begin, _RAIter __end,
-       __gnu_parallel::multiway_mergesort_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  sort(_RAIter __begin, _RAIter __end,
-       __gnu_parallel::multiway_mergesort_sampling_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  sort(_RAIter __begin, _RAIter __end,
-       __gnu_parallel::multiway_mergesort_exact_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  sort(_RAIter __begin, _RAIter __end,
-       __gnu_parallel::quicksort_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  sort(_RAIter __begin, _RAIter __end,
-       __gnu_parallel::balanced_quicksort_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface
-  template<typename _RAIter, typename _Compare>
-    void
-    sort(_RAIter __begin, _RAIter __end, _Compare __comp)
-    {
-      typedef iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-    sort(__begin, __end, __comp, __gnu_parallel::default_parallel_tag());
-  }
-
-
-  // stable_sort interface
-
-
-  // Sequential fallback
-  template<typename _RAIter>
-  inline void
-  stable_sort(_RAIter __begin, _RAIter __end,
-       __gnu_parallel::sequential_tag)
-  { _GLIBCXX_STD_A::stable_sort(__begin, __end); }
-
-  // Sequential fallback
-  template<typename _RAIter, typename _Compare>
-  inline void
-  stable_sort(_RAIter __begin, _RAIter __end,
-              _Compare __comp, __gnu_parallel::sequential_tag)
-  { _GLIBCXX_STD_A::stable_sort<_RAIter, _Compare>(
-      __begin, __end, __comp); }
-
-  // Public interface
-  template<typename _RAIter, typename _Compare,
-           typename _Parallelism>
-  void
-  stable_sort(_RAIter __begin, _RAIter __end,
-              _Compare __comp, _Parallelism __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-
-    if (__begin != __end)
-      {
-        if (_GLIBCXX_PARALLEL_CONDITION(
-              static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) >=
-              __gnu_parallel::_Settings::get().sort_minimal_n))
-          __gnu_parallel::__parallel_sort<true>(
-                            __begin, __end, __comp, __parallelism);
-        else
-          stable_sort(__begin, __end, __comp,
-                      __gnu_parallel::sequential_tag());
-      }
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  stable_sort(_RAIter __begin, _RAIter __end)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    stable_sort(__begin, __end, std::less<_ValueType>(),
-                __gnu_parallel::default_parallel_tag());
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  stable_sort(_RAIter __begin, _RAIter __end,
-              __gnu_parallel::default_parallel_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    stable_sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  stable_sort(_RAIter __begin, _RAIter __end,
-              __gnu_parallel::parallel_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    stable_sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  stable_sort(_RAIter __begin, _RAIter __end,
-              __gnu_parallel::multiway_mergesort_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    stable_sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  stable_sort(_RAIter __begin, _RAIter __end,
-              __gnu_parallel::quicksort_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    stable_sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-  inline void
-  stable_sort(_RAIter __begin, _RAIter __end,
-              __gnu_parallel::balanced_quicksort_tag __parallelism)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    stable_sort(__begin, __end, std::less<_ValueType>(), __parallelism);
-  }
-
-  // Public interface
-  template<typename _RAIter, typename _Compare>
-  void
-  stable_sort(_RAIter __begin, _RAIter __end,
-              _Compare __comp)
-  {
-    typedef iterator_traits<_RAIter> _TraitsType;
-    typedef typename _TraitsType::value_type _ValueType;
-    stable_sort(
-      __begin, __end, __comp, __gnu_parallel::default_parallel_tag());
-  }
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator>
-    inline _OutputIterator
-    merge(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, 
-          _IIter2 __end2, _OutputIterator __result,
-          __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::merge(
-               __begin1, __end1, __begin2, __end2, __result); }
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Compare>
-    inline _OutputIterator
-    merge(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
-          _IIter2 __end2, _OutputIterator __result, _Compare __comp,
-          __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::merge(
-                __begin1, __end1, __begin2, __end2, __result, __comp); }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter1, typename _IIter2, typename _OutputIterator,
-           typename _Compare, typename _IteratorTag1,
-           typename _IteratorTag2, typename _IteratorTag3>
-    inline _OutputIterator
-    __merge_switch(_IIter1 __begin1, _IIter1 __end1,
-                 _IIter2 __begin2, _IIter2 __end2,
-                 _OutputIterator __result, _Compare __comp,
-                 _IteratorTag1, _IteratorTag2, _IteratorTag3)
-     { return _GLIBCXX_STD_A::merge(__begin1, __end1, __begin2, __end2,
-                                    __result, __comp); }
-
-  // Parallel algorithm for random access iterators
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Compare>
-    _OutputIterator
-    __merge_switch(_IIter1 __begin1, _IIter1 __end1, 
-                 _IIter2 __begin2, _IIter2 __end2, 
-                 _OutputIterator __result, _Compare __comp, 
-                 random_access_iterator_tag, random_access_iterator_tag, 
-                 random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            (static_cast<__gnu_parallel::_SequenceIndex>(__end1 - __begin1)
-             >= __gnu_parallel::_Settings::get().merge_minimal_n
-             || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
-             >= __gnu_parallel::_Settings::get().merge_minimal_n)))
-        return __gnu_parallel::__parallel_merge_advance(
-                 __begin1, __end1, __begin2, __end2, __result,
-                 (__end1 - __begin1) + (__end2 - __begin2), __comp);
-      else
-        return __gnu_parallel::__merge_advance(
-                 __begin1, __end1, __begin2, __end2, __result,
-                 (__end1 - __begin1) + (__end2 - __begin2), __comp);
-  }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Compare>
-    inline _OutputIterator
-    merge(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, 
-          _IIter2 __end2, _OutputIterator __result, _Compare __comp)
-    {
-      typedef typename iterator_traits<_IIter1>::value_type _ValueType;
-
-      typedef std::iterator_traits<_IIter1> _IIterTraits1;
-      typedef std::iterator_traits<_IIter2> _IIterTraits2;
-      typedef std::iterator_traits<_OutputIterator> _OIterTraits;
-      typedef typename _IIterTraits1::iterator_category
-        _IIterCategory1;
-      typedef typename _IIterTraits2::iterator_category
-        _IIterCategory2;
-      typedef typename _OIterTraits::iterator_category _OIterCategory;
-
-      return __merge_switch(
-              __begin1, __end1, __begin2, __end2, __result, __comp,
-              _IIterCategory1(), _IIterCategory2(), _OIterCategory());
-  }
-
-
-  // Public interface, insert default comparator
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator>
-    inline _OutputIterator
-    merge(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, 
-          _IIter2 __end2, _OutputIterator __result)
-    {
-      typedef std::iterator_traits<_IIter1> _Iterator1Traits;
-      typedef std::iterator_traits<_IIter2> _Iterator2Traits;
-      typedef typename _Iterator1Traits::value_type _ValueType1;
-      typedef typename _Iterator2Traits::value_type _ValueType2;
-
-      return __gnu_parallel::merge(__begin1, __end1, __begin2, __end2,
-                  __result, __gnu_parallel::_Less<_ValueType1, _ValueType2>());
-    }
-
-  // Sequential fallback
-  template<typename _RAIter>
-    inline void
-    nth_element(_RAIter __begin, _RAIter __nth, 
-                _RAIter __end, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::nth_element(__begin, __nth, __end); }
-
-  // Sequential fallback
-  template<typename _RAIter, typename _Compare>
-    inline void
-    nth_element(_RAIter __begin, _RAIter __nth, 
-                _RAIter __end, _Compare __comp, 
-              __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::nth_element(__begin, __nth, __end, __comp); }
-
-  // Public interface
-  template<typename _RAIter, typename _Compare>
-    inline void
-    nth_element(_RAIter __begin, _RAIter __nth, 
-                _RAIter __end, _Compare __comp)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().nth_element_minimal_n))
-        __gnu_parallel::__parallel_nth_element(__begin, __nth, __end, __comp);
-      else
-        nth_element(__begin, __nth, __end, __comp,
-                    __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-    inline void
-    nth_element(_RAIter __begin, _RAIter __nth, 
-                _RAIter __end)
-    {
-      typedef iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      __gnu_parallel::nth_element(__begin, __nth, __end,
-                                  std::less<_ValueType>());
-    }
-
-  // Sequential fallback
-  template<typename _RAIter, typename _Compare>
-    inline void
-    partial_sort(_RAIter __begin, _RAIter __middle, 
-                 _RAIter __end, _Compare __comp,
-                 __gnu_parallel::sequential_tag)
-    { _GLIBCXX_STD_A::partial_sort(__begin, __middle, __end, __comp); }
-
-  // Sequential fallback
-  template<typename _RAIter>
-    inline void
-    partial_sort(_RAIter __begin, _RAIter __middle, 
-                 _RAIter __end, __gnu_parallel::sequential_tag)
-    { _GLIBCXX_STD_A::partial_sort(__begin, __middle, __end); }
-
-  // Public interface, parallel algorithm for random access iterators
-  template<typename _RAIter, typename _Compare>
-    void
-    partial_sort(_RAIter __begin, _RAIter __middle, 
-                 _RAIter __end, _Compare __comp)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().partial_sort_minimal_n))
-        __gnu_parallel::
-          __parallel_partial_sort(__begin, __middle, __end, __comp);
-      else
-        partial_sort(__begin, __middle, __end, __comp,
-                     __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface, insert default comparator
-  template<typename _RAIter>
-    inline void
-    partial_sort(_RAIter __begin, _RAIter __middle, 
-                 _RAIter __end)
-    {
-      typedef iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      __gnu_parallel::partial_sort(__begin, __middle, __end,
-                                   std::less<_ValueType>());
-    }
-
-  // Sequential fallback
-  template<typename _FIterator>
-    inline _FIterator
-    max_element(_FIterator __begin, _FIterator __end, 
-                __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::max_element(__begin, __end); }
-
-  // Sequential fallback
-  template<typename _FIterator, typename _Compare>
-    inline _FIterator
-    max_element(_FIterator __begin, _FIterator __end, _Compare __comp, 
-                __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::max_element(__begin, __end, __comp); }
-
-  // Sequential fallback for input iterator case
-  template<typename _FIterator, typename _Compare, typename _IteratorTag>
-    inline _FIterator
-    __max_element_switch(_FIterator __begin, _FIterator __end, 
-                       _Compare __comp, _IteratorTag)
-    { return max_element(__begin, __end, __comp,
-                         __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators
-  template<typename _RAIter, typename _Compare>
-    _RAIter
-    __max_element_switch(_RAIter __begin, _RAIter __end, 
-                       _Compare __comp, random_access_iterator_tag, 
-			 __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().max_element_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          _RAIter __res(__begin);
-          __gnu_parallel::__identity_selector<_RAIter>
-            __functionality;
-          __gnu_parallel::
-            __for_each_template_random_access(
-              __begin, __end, __gnu_parallel::_Nothing(), __functionality,
-              __gnu_parallel::__max_element_reduct<_Compare, _RAIter>(__comp),
-              __res, __res, -1, __parallelism_tag);
-          return __res;
-        }
-      else
-        return max_element(__begin, __end, __comp,
-                           __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface, insert default comparator
-  template<typename _FIterator>
-    inline _FIterator
-    max_element(_FIterator __begin, _FIterator __end, 
-                __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef typename iterator_traits<_FIterator>::value_type _ValueType;
-      return max_element(__begin, __end, std::less<_ValueType>(),
-                         __parallelism_tag);
-    }
-
-  template<typename _FIterator>
-    inline _FIterator
-    max_element(_FIterator __begin, _FIterator __end)
-    {
-      typedef typename iterator_traits<_FIterator>::value_type _ValueType;
-      return __gnu_parallel::max_element(__begin, __end,
-                                         std::less<_ValueType>());
-    }
-
-  // Public interface
-  template<typename _FIterator, typename _Compare>
-    inline _FIterator
-    max_element(_FIterator __begin, _FIterator __end, _Compare __comp,
-                __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_FIterator> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __max_element_switch(__begin, __end, __comp, _IteratorCategory(), 
-                                  __parallelism_tag);
-    }
-
-  template<typename _FIterator, typename _Compare>
-    inline _FIterator
-    max_element(_FIterator __begin, _FIterator __end, _Compare __comp)
-    {
-      typedef iterator_traits<_FIterator> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __max_element_switch(__begin, __end, __comp, _IteratorCategory());
-    }
-
-
-  // Sequential fallback
-  template<typename _FIterator>
-    inline _FIterator
-    min_element(_FIterator __begin, _FIterator __end, 
-                __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::min_element(__begin, __end); }
-
-  // Sequential fallback
-  template<typename _FIterator, typename _Compare>
-    inline _FIterator
-    min_element(_FIterator __begin, _FIterator __end, _Compare __comp, 
-                __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::min_element(__begin, __end, __comp); }
-
-  // Sequential fallback for input iterator case
-  template<typename _FIterator, typename _Compare, typename _IteratorTag>
-    inline _FIterator
-    __min_element_switch(_FIterator __begin, _FIterator __end, 
-                       _Compare __comp, _IteratorTag)
-    { return min_element(__begin, __end, __comp,
-                         __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators
-  template<typename _RAIter, typename _Compare>
-    _RAIter
-    __min_element_switch(_RAIter __begin, _RAIter __end, 
-                       _Compare __comp, random_access_iterator_tag, 
-                       __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().min_element_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          _RAIter __res(__begin);
-          __gnu_parallel::__identity_selector<_RAIter>
-            __functionality;
-          __gnu_parallel::
-            __for_each_template_random_access(
-              __begin, __end, __gnu_parallel::_Nothing(), __functionality,
-              __gnu_parallel::__min_element_reduct<_Compare, _RAIter>(__comp),
-              __res, __res, -1, __parallelism_tag);
-          return __res;
-        }
-      else
-        return min_element(__begin, __end, __comp,
-                           __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface, insert default comparator
-  template<typename _FIterator>
-    inline _FIterator
-    min_element(_FIterator __begin, _FIterator __end, 
-                __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef typename iterator_traits<_FIterator>::value_type _ValueType;
-      return min_element(__begin, __end, std::less<_ValueType>(),
-                         __parallelism_tag);
-    }
-
-  template<typename _FIterator>
-    inline _FIterator
-    min_element(_FIterator __begin, _FIterator __end)
-    {
-      typedef typename iterator_traits<_FIterator>::value_type _ValueType;
-      return __gnu_parallel::min_element(__begin, __end,
-                                         std::less<_ValueType>());
-    }
-
-  // Public interface
-  template<typename _FIterator, typename _Compare>
-    inline _FIterator
-    min_element(_FIterator __begin, _FIterator __end, _Compare __comp,
-                __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_FIterator> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __min_element_switch(__begin, __end, __comp, _IteratorCategory(), 
-                                __parallelism_tag);
-    }
-
-  template<typename _FIterator, typename _Compare>
-    inline _FIterator
-    min_element(_FIterator __begin, _FIterator __end, _Compare __comp)
-    {
-      typedef iterator_traits<_FIterator> _TraitsType;
-      typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __min_element_switch(__begin, __end, __comp, _IteratorCategory());
-    }
-} // end namespace
-} // end namespace
-
-#endif /* _GLIBCXX_PARALLEL_ALGO_H */
diff --git a/openflow/usr/include/c++/5/parallel/algobase.h b/openflow/usr/include/c++/5/parallel/algobase.h
deleted file mode 100644
index 481089c..0000000
--- a/openflow/usr/include/c++/5/parallel/algobase.h
+++ /dev/null
@@ -1,432 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/algobase.h
- *  @brief Parallel STL function calls corresponding to the
- *  stl_algobase.h header.  The functions defined here mainly do case
- *  switches and call the actual parallelized versions in other files.
- *  Inlining policy: Functions that basically only contain one
- *  function call, are declared inline.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler and Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_ALGOBASE_H
-#define _GLIBCXX_PARALLEL_ALGOBASE_H 1
-
-#include <bits/stl_algobase.h>
-#include <parallel/base.h>
-#include <parallel/algorithmfwd.h>
-#include <parallel/find.h>
-#include <parallel/find_selectors.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __parallel
-{
-  // NB: equal and lexicographical_compare require mismatch.
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2>
-    inline pair<_IIter1, _IIter2>
-    mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
-             __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::mismatch(__begin1, __end1, __begin2); }
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    inline pair<_IIter1, _IIter2>
-    mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
-             _Predicate __pred, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::mismatch(__begin1, __end1, __begin2, __pred); }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter1, typename _IIter2,
-           typename _Predicate, typename _IteratorTag1, typename _IteratorTag2>
-    inline pair<_IIter1, _IIter2>
-    __mismatch_switch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
-                      _Predicate __pred, _IteratorTag1, _IteratorTag2)
-    { return _GLIBCXX_STD_A::mismatch(__begin1, __end1, __begin2, __pred); }
-
-  // Parallel mismatch for random access iterators
-  template<typename _RAIter1, typename _RAIter2, typename _Predicate>
-    pair<_RAIter1, _RAIter2>
-    __mismatch_switch(_RAIter1 __begin1, _RAIter1 __end1,
-                      _RAIter2 __begin2, _Predicate __pred, 
-                      random_access_iterator_tag, random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(true))
-        {
-          _RAIter1 __res =
-            __gnu_parallel::__find_template(__begin1, __end1, __begin2, __pred,
-                                            __gnu_parallel::
-                                            __mismatch_selector()).first;
-          return make_pair(__res , __begin2 + (__res - __begin1));
-        }
-      else
-        return _GLIBCXX_STD_A::mismatch(__begin1, __end1, __begin2, __pred);
-    }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2>
-    inline pair<_IIter1, _IIter2>
-    mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2)
-    {
-      typedef __gnu_parallel::_EqualTo<
-	typename std::iterator_traits<_IIter1>::value_type,
-	typename std::iterator_traits<_IIter2>::value_type> _EqualTo;
-
-      return __mismatch_switch(__begin1, __end1, __begin2, _EqualTo(),
-                               std::__iterator_category(__begin1),
-			       std::__iterator_category(__begin2));
-    }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    inline pair<_IIter1, _IIter2>
-    mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
-             _Predicate __pred)
-    {
-      return __mismatch_switch(__begin1, __end1, __begin2, __pred,
-                               std::__iterator_category(__begin1),
-			       std::__iterator_category(__begin2));
-    }
-
-#if __cplusplus > 201103L
-  // Sequential fallback.
-  template<typename _InputIterator1, typename _InputIterator2>
-    inline pair<_InputIterator1, _InputIterator2>
-    mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2, _InputIterator2 __last2,
-	     __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::mismatch(__first1, __last1, __first2, __last2); }
-
-  // Sequential fallback.
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _BinaryPredicate>
-    inline pair<_InputIterator1, _InputIterator2>
-    mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2, _InputIterator2 __last2,
-	     _BinaryPredicate __binary_pred,
-	     __gnu_parallel::sequential_tag)
-    {
-      return _GLIBCXX_STD_A::mismatch(__first1, __last1, __first2, __last2,
-				      __binary_pred);
-    }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter1, typename _IIter2,
-           typename _Predicate, typename _IteratorTag1, typename _IteratorTag2>
-    inline pair<_IIter1, _IIter2>
-    __mismatch_switch(_IIter1 __begin1, _IIter1 __end1,
-		      _IIter2 __begin2, _IIter2 __end2, _Predicate __pred,
-		      _IteratorTag1, _IteratorTag2)
-    {
-      return _GLIBCXX_STD_A::mismatch(__begin1, __end1,
-				      __begin2, __end2, __pred);
-    }
-
-  // Parallel mismatch for random access iterators
-  template<typename _RAIter1, typename _RAIter2, typename _Predicate>
-    pair<_RAIter1, _RAIter2>
-    __mismatch_switch(_RAIter1 __begin1, _RAIter1 __end1,
-                      _RAIter2 __begin2, _RAIter2 __end2, _Predicate __pred, 
-                      random_access_iterator_tag, random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(true))
-        {
-	  if ((__end2 - __begin2) < (__end1 - __begin1))
-	    __end1 = __begin1 + (__end2 - __begin2);
-
-          _RAIter1 __res =
-            __gnu_parallel::__find_template(__begin1, __end1, __begin2, __pred,
-                                            __gnu_parallel::
-                                            __mismatch_selector()).first;
-          return make_pair(__res , __begin2 + (__res - __begin1));
-        }
-      else
-        return _GLIBCXX_STD_A::mismatch(__begin1, __end1,
-					__begin2, __end2, __pred);
-    }
-
-  template<typename _IIter1, typename _IIter2>
-    inline pair<_IIter1, _IIter2>
-    mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2)
-    {
-      typedef __gnu_parallel::_EqualTo<
-	typename std::iterator_traits<_IIter1>::value_type,
-	typename std::iterator_traits<_IIter2>::value_type> _EqualTo;
-
-      return __mismatch_switch(__begin1, __end1, __begin2, __end2, _EqualTo(),
-			       std::__iterator_category(__begin1),
-			       std::__iterator_category(__begin2));
-    }
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _BinaryPredicate>
-    inline pair<_InputIterator1, _InputIterator2>
-    mismatch(_InputIterator1 __begin1, _InputIterator1 __end1,
-	     _InputIterator2 __begin2, _InputIterator2 __end2,
-	     _BinaryPredicate __binary_pred)
-    {
-      return __mismatch_switch(__begin1, __end1, __begin2, __end2,
-			       __binary_pred,
-			       std::__iterator_category(__begin1),
-			       std::__iterator_category(__begin2));
-    }
-#endif
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2>
-    inline bool
-    equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, 
-          __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::equal(__begin1, __end1, __begin2); }
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    inline bool
-    equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, 
-          _Predicate __pred, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::equal(__begin1, __end1, __begin2, __pred); }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2>
-    inline bool
-    equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2)
-    {
-      return __gnu_parallel::mismatch(__begin1, __end1, __begin2).first
-              == __end1;
-    }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    inline bool
-    equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, 
-          _Predicate __pred)
-    {
-      return __gnu_parallel::mismatch(__begin1, __end1, __begin2, __pred).first
-              == __end1;
-    }
-
-#if __cplusplus > 201103L
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2>
-    inline bool
-    equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2,
-	  __gnu_parallel::sequential_tag)
-    {
-      return _GLIBCXX_STD_A::equal(__begin1, __end1, __begin2, __end2);
-    }
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2, typename _BinaryPredicate>
-    inline bool
-    equal(_IIter1 __begin1, _IIter1 __end1,
-	  _IIter2 __begin2, _IIter2 __end2, _BinaryPredicate __binary_pred,
-	  __gnu_parallel::sequential_tag)
-    {
-      return _GLIBCXX_STD_A::equal(__begin1, __end1, __begin2, __end2,
-				   __binary_pred);
-    }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter1, typename _IIter2,
-           typename _Predicate, typename _IteratorTag1, typename _IteratorTag2>
-    inline bool
-    __equal_switch(_IIter1 __begin1, _IIter1 __end1,
-		   _IIter2 __begin2, _IIter2 __end2, _Predicate __pred,
-		   _IteratorTag1, _IteratorTag2)
-    {
-      return _GLIBCXX_STD_A::equal(__begin1, __end1,
-				   __begin2, __end2, __pred);
-    }
-
-  // Parallel equal for random access iterators
-  template<typename _RAIter1, typename _RAIter2, typename _Predicate>
-    inline bool
-    __equal_switch(_RAIter1 __begin1, _RAIter1 __end1,
-		   _RAIter2 __begin2, _RAIter2 __end2, _Predicate __pred, 
-		   random_access_iterator_tag, random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(true))
-        {
-	  if (std::distance(__begin1, __end1)
-	      != std::distance(__begin2, __end2))
-	    return false;
-
-	  return __gnu_parallel::mismatch(__begin1, __end1, __begin2, __end2,
-					  __pred).first == __end1;
-        }
-      else
-        return _GLIBCXX_STD_A::equal(__begin1, __end1,
-				     __begin2, __end2, __pred);
-    }
-
-  template<typename _IIter1, typename _IIter2>
-    inline bool
-    equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2)
-    {
-      typedef __gnu_parallel::_EqualTo<
-	typename std::iterator_traits<_IIter1>::value_type,
-	typename std::iterator_traits<_IIter2>::value_type> _EqualTo;
-
-      return __equal_switch(__begin1, __end1, __begin2, __end2, _EqualTo(),
-			    std::__iterator_category(__begin1),
-			    std::__iterator_category(__begin2));
-    }
-
-  template<typename _IIter1, typename _IIter2, typename _BinaryPredicate>
-    inline bool
-    equal(_IIter1 __begin1, _IIter1 __end1,
-	  _IIter2 __begin2, _IIter2 __end2, _BinaryPredicate __binary_pred)
-    {
-      return __equal_switch(__begin1, __end1, __begin2, __end2, __binary_pred,
-			    std::__iterator_category(__begin1),
-			    std::__iterator_category(__begin2));
-    }
-#endif
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2>
-    inline bool
-    lexicographical_compare(_IIter1 __begin1, _IIter1 __end1, 
-                            _IIter2 __begin2, _IIter2 __end2, 
-                            __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::lexicographical_compare(__begin1, __end1,
-                                                     __begin2, __end2); }
-
-  // Sequential fallback
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    inline bool
-    lexicographical_compare(_IIter1 __begin1, _IIter1 __end1, 
-                            _IIter2 __begin2, _IIter2 __end2, 
-                            _Predicate __pred, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::lexicographical_compare(
-               __begin1, __end1, __begin2, __end2, __pred); }
-
-  // Sequential fallback for input iterator case
-  template<typename _IIter1, typename _IIter2,
-           typename _Predicate, typename _IteratorTag1, typename _IteratorTag2>
-    inline bool
-    __lexicographical_compare_switch(_IIter1 __begin1, _IIter1 __end1,
-                                     _IIter2 __begin2, _IIter2 __end2, 
-                                     _Predicate __pred,
-                                     _IteratorTag1, _IteratorTag2)
-    { return _GLIBCXX_STD_A::lexicographical_compare(
-               __begin1, __end1, __begin2, __end2, __pred); }
-
-  // Parallel lexicographical_compare for random access iterators
-  // Limitation: Both valuetypes must be the same
-  template<typename _RAIter1, typename _RAIter2, typename _Predicate>
-    bool
-    __lexicographical_compare_switch(_RAIter1 __begin1, _RAIter1 __end1,
-                                     _RAIter2 __begin2, _RAIter2 __end2,
-                                     _Predicate __pred,
-                                     random_access_iterator_tag, 
-                                     random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(true))
-        {
-          typedef iterator_traits<_RAIter1> _TraitsType1;
-          typedef typename _TraitsType1::value_type _ValueType1;
-
-          typedef iterator_traits<_RAIter2> _TraitsType2;
-          typedef typename _TraitsType2::value_type _ValueType2;
-
-          typedef __gnu_parallel::
-                  _EqualFromLess<_ValueType1, _ValueType2, _Predicate>
-                  _EqualFromLessCompare;
-
-          // Longer sequence in first place.
-          if ((__end1 - __begin1) < (__end2 - __begin2))
-            {
-              typedef pair<_RAIter1, _RAIter2> _SpotType;
-              _SpotType __mm = __mismatch_switch(__begin1, __end1, __begin2, 
-                                             _EqualFromLessCompare(__pred), 
-                                             random_access_iterator_tag(), 
-                                             random_access_iterator_tag());
-
-              return (__mm.first == __end1)
-                        || bool(__pred(*__mm.first, *__mm.second));
-            }
-          else
-            {
-              typedef pair<_RAIter2, _RAIter1> _SpotType;
-              _SpotType __mm = __mismatch_switch(__begin2, __end2, __begin1, 
-                                             _EqualFromLessCompare(__pred), 
-                                             random_access_iterator_tag(), 
-                                             random_access_iterator_tag());
-
-              return (__mm.first != __end2)
-                        && bool(__pred(*__mm.second, *__mm.first));
-            }
-        }
-      else
-        return _GLIBCXX_STD_A::lexicographical_compare(
-                 __begin1, __end1, __begin2, __end2, __pred);
-    }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2>
-    inline bool
-    lexicographical_compare(_IIter1 __begin1, _IIter1 __end1,
-                            _IIter2 __begin2, _IIter2 __end2)
-    {
-      typedef iterator_traits<_IIter1> _TraitsType1;
-      typedef typename _TraitsType1::value_type _ValueType1;
-      typedef typename _TraitsType1::iterator_category _IteratorCategory1;
-
-      typedef iterator_traits<_IIter2> _TraitsType2;
-      typedef typename _TraitsType2::value_type _ValueType2;
-      typedef typename _TraitsType2::iterator_category _IteratorCategory2;
-      typedef __gnu_parallel::_Less<_ValueType1, _ValueType2> _LessType;
-
-      return __lexicographical_compare_switch(
-               __begin1, __end1, __begin2, __end2, _LessType(),
-               _IteratorCategory1(), _IteratorCategory2());
-    }
-
-  // Public interface
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    inline bool
-    lexicographical_compare(_IIter1 __begin1, _IIter1 __end1,
-                            _IIter2 __begin2, _IIter2 __end2,
-                            _Predicate __pred)
-    {
-      typedef iterator_traits<_IIter1> _TraitsType1;
-      typedef typename _TraitsType1::iterator_category _IteratorCategory1;
-
-      typedef iterator_traits<_IIter2> _TraitsType2;
-      typedef typename _TraitsType2::iterator_category _IteratorCategory2;
-
-      return __lexicographical_compare_switch(
-               __begin1, __end1, __begin2, __end2, __pred,
-               _IteratorCategory1(), _IteratorCategory2());
-    }
-} // end namespace
-} // end namespace
-
-#endif /* _GLIBCXX_PARALLEL_ALGOBASE_H */
diff --git a/openflow/usr/include/c++/5/parallel/algorithm b/openflow/usr/include/c++/5/parallel/algorithm
deleted file mode 100644
index 1721185..0000000
--- a/openflow/usr/include/c++/5/parallel/algorithm
+++ /dev/null
@@ -1,39 +0,0 @@
-// Algorithm extensions -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/algorithm
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _PARALLEL_ALGORITHM
-#define _PARALLEL_ALGORITHM 1
-
-#pragma GCC system_header
-
-#include <algorithm>
-#include <parallel/algorithmfwd.h>
-#include <parallel/algobase.h>
-#include <parallel/algo.h>
-
-#endif
diff --git a/openflow/usr/include/c++/5/parallel/algorithmfwd.h b/openflow/usr/include/c++/5/parallel/algorithmfwd.h
deleted file mode 100644
index 727609d..0000000
--- a/openflow/usr/include/c++/5/parallel/algorithmfwd.h
+++ /dev/null
@@ -1,908 +0,0 @@
-// <parallel/algorithm> Forward declarations -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/algorithmfwd.h
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PARALLEL_ALGORITHMFWD_H
-#define _GLIBCXX_PARALLEL_ALGORITHMFWD_H 1
-
-#pragma GCC system_header
-
-#include <parallel/tags.h>
-#include <parallel/settings.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __parallel
-{
-  template<typename _FIter>
-    _FIter
-    adjacent_find(_FIter, _FIter);
-
-  template<typename _FIter>
-    _FIter
-    adjacent_find(_FIter, _FIter, __gnu_parallel::sequential_tag);
-
-  template<typename _FIter, typename _IterTag>
-    _FIter
-    __adjacent_find_switch(_FIter, _FIter, _IterTag);
-
-  template<typename _RAIter>
-    _RAIter
-    __adjacent_find_switch(_RAIter, _RAIter, random_access_iterator_tag);
-
-
-  template<typename _FIter, typename _BiPredicate>
-    _FIter
-    adjacent_find(_FIter, _FIter, _BiPredicate);
-
-  template<typename _FIter, typename _BiPredicate>
-    _FIter
-    adjacent_find(_FIter, _FIter, _BiPredicate,
-                  __gnu_parallel::sequential_tag);
-
-  template<typename _FIter, typename _BiPredicate, typename _IterTag>
-    _FIter
-    __adjacent_find_switch(_FIter, _FIter, _BiPredicate, _IterTag);
-
-  template<typename _RAIter, typename _BiPredicate>
-    _RAIter
-    __adjacent_find_switch(_RAIter, _RAIter, _BiPredicate, 
-                         random_access_iterator_tag);
-
-
-  template<typename _IIter, typename _Tp>
-    typename iterator_traits<_IIter>::difference_type
-    count(_IIter, _IIter, const _Tp&);
-
-  template<typename _IIter, typename _Tp>
-    typename iterator_traits<_IIter>::difference_type
-    count(_IIter, _IIter, const _Tp&, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _Tp>
-    typename iterator_traits<_IIter>::difference_type
-    count(_IIter, _IIter, const _Tp&, __gnu_parallel::_Parallelism);
-
-  template<typename _IIter, typename _Tp, typename _IterTag>
-    typename iterator_traits<_IIter>::difference_type
-    __count_switch(_IIter, _IIter, const _Tp&, _IterTag);
-
-  template<typename _RAIter, typename _Tp>
-    typename iterator_traits<_RAIter>::difference_type
-    __count_switch(_RAIter, _RAIter, const _Tp&, random_access_iterator_tag,
-                 __gnu_parallel::_Parallelism __parallelism
-                 = __gnu_parallel::parallel_unbalanced);
-
-
-  template<typename _IIter, typename _Predicate>
-    typename iterator_traits<_IIter>::difference_type
-    count_if(_IIter, _IIter, _Predicate);
-
-  template<typename _IIter, typename _Predicate>
-    typename iterator_traits<_IIter>::difference_type
-    count_if(_IIter, _IIter, _Predicate, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _Predicate>
-    typename iterator_traits<_IIter>::difference_type
-    count_if(_IIter, _IIter, _Predicate, __gnu_parallel::_Parallelism);
-
-  template<typename _IIter, typename _Predicate, typename _IterTag>
-    typename iterator_traits<_IIter>::difference_type
-    __count_if_switch(_IIter, _IIter, _Predicate, _IterTag);
-
-  template<typename _RAIter, typename _Predicate>
-    typename iterator_traits<_RAIter>::difference_type
-    __count_if_switch(_RAIter, _RAIter, _Predicate, random_access_iterator_tag,
-                    __gnu_parallel::_Parallelism __parallelism
-                    = __gnu_parallel::parallel_unbalanced);
-
-  // algobase.h
-  template<typename _IIter1, typename _IIter2>
-    bool
-    equal(_IIter1, _IIter1, _IIter2, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    bool
-    equal(_IIter1, _IIter1, _IIter2, _Predicate,
-          __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2>
-    bool
-    equal(_IIter1, _IIter1, _IIter2);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    bool
-    equal(_IIter1, _IIter1, _IIter2, _Predicate);
-
-  template<typename _IIter, typename _Tp>
-    _IIter
-    find(_IIter, _IIter, const _Tp&, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _Tp>
-    _IIter
-    find(_IIter, _IIter, const _Tp& __val);
-
-  template<typename _IIter, typename _Tp, typename _IterTag>
-    _IIter
-    __find_switch(_IIter, _IIter, const _Tp&, _IterTag);
-
-  template<typename _RAIter, typename _Tp>
-    _RAIter
-    __find_switch(_RAIter, _RAIter, const _Tp&, random_access_iterator_tag);
-
-  template<typename _IIter, typename _Predicate>
-    _IIter
-    find_if(_IIter, _IIter, _Predicate, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _Predicate>
-    _IIter
-    find_if(_IIter, _IIter, _Predicate);
-
-  template<typename _IIter, typename _Predicate, typename _IterTag>
-    _IIter
-    __find_if_switch(_IIter, _IIter, _Predicate, _IterTag);
-
-  template<typename _RAIter, typename _Predicate>
-    _RAIter
-    __find_if_switch(_RAIter, _RAIter, _Predicate, random_access_iterator_tag);
-
-  template<typename _IIter, typename _FIter>
-    _IIter
-    find_first_of(_IIter, _IIter, _FIter, _FIter,
-                  __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _FIter, typename _BiPredicate>
-    _IIter
-    find_first_of(_IIter, _IIter, _FIter, _FIter, _BiPredicate,
-                  __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _FIter, typename _BiPredicate>
-    _IIter
-    find_first_of(_IIter, _IIter, _FIter, _FIter, _BiPredicate);
-
-  template<typename _IIter, typename _FIter>
-    _IIter
-    find_first_of(_IIter, _IIter, _FIter, _FIter);
-
-  template<typename _IIter, typename _FIter,
-           typename _IterTag1, typename _IterTag2>
-    _IIter
-    __find_first_of_switch(
-      _IIter, _IIter, _FIter, _FIter, _IterTag1, _IterTag2);
-
-  template<typename _RAIter, typename _FIter, typename _BiPredicate,
-           typename _IterTag>
-    _RAIter
-    __find_first_of_switch(_RAIter, _RAIter, _FIter, _FIter, _BiPredicate,
-                         random_access_iterator_tag, _IterTag);
-
-  template<typename _IIter, typename _FIter, typename _BiPredicate,
-           typename _IterTag1, typename _IterTag2>
-    _IIter
-    __find_first_of_switch(_IIter, _IIter, _FIter, _FIter, _BiPredicate,
-                         _IterTag1, _IterTag2);
-
-
-  template<typename _IIter, typename _Function>
-    _Function
-    for_each(_IIter, _IIter, _Function);
-
-  template<typename _IIter, typename _Function>
-    _Function
-    for_each(_IIter, _IIter, _Function, __gnu_parallel::sequential_tag);
-
-  template<typename _Iterator, typename _Function>
-    _Function
-    for_each(_Iterator, _Iterator, _Function, __gnu_parallel::_Parallelism);
-
-  template<typename _IIter, typename _Function, typename _IterTag>
-    _Function
-    __for_each_switch(_IIter, _IIter, _Function, _IterTag);
-
-  template<typename _RAIter, typename _Function>
-    _Function
-    __for_each_switch(_RAIter, _RAIter, _Function, random_access_iterator_tag,
-                    __gnu_parallel::_Parallelism  __parallelism
-                    = __gnu_parallel::parallel_balanced);
-
-
-  template<typename _FIter, typename _Generator>
-    void
-    generate(_FIter, _FIter, _Generator);
-
-  template<typename _FIter, typename _Generator>
-    void
-    generate(_FIter, _FIter, _Generator, __gnu_parallel::sequential_tag);
-
-  template<typename _FIter, typename _Generator>
-    void
-    generate(_FIter, _FIter, _Generator, __gnu_parallel::_Parallelism);
-
-  template<typename _FIter, typename _Generator, typename _IterTag>
-    void
-    __generate_switch(_FIter, _FIter, _Generator, _IterTag);
-
-  template<typename _RAIter, typename _Generator>
-    void
-    __generate_switch(_RAIter, _RAIter, _Generator, random_access_iterator_tag,
-                    __gnu_parallel::_Parallelism __parallelism
-                    = __gnu_parallel::parallel_balanced);
-
-  template<typename _OIter, typename _Size, typename _Generator>
-    _OIter
-    generate_n(_OIter, _Size, _Generator);
-
-  template<typename _OIter, typename _Size, typename _Generator>
-    _OIter
-    generate_n(_OIter, _Size, _Generator, __gnu_parallel::sequential_tag);
-
-  template<typename _OIter, typename _Size, typename _Generator>
-    _OIter
-    generate_n(_OIter, _Size, _Generator, __gnu_parallel::_Parallelism);
-
-  template<typename _OIter, typename _Size, typename _Generator,
-           typename _IterTag>
-    _OIter
-    __generate_n_switch(_OIter, _Size, _Generator, _IterTag);
-
-  template<typename _RAIter, typename _Size, typename _Generator>
-    _RAIter
-    __generate_n_switch(_RAIter, _Size, _Generator, random_access_iterator_tag,
-                      __gnu_parallel::_Parallelism __parallelism
-                      = __gnu_parallel::parallel_balanced);
-
-  template<typename _IIter1, typename _IIter2>
-    bool
-    lexicographical_compare(_IIter1, _IIter1, _IIter2, _IIter2,
-                            __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    bool
-    lexicographical_compare(_IIter1, _IIter1, _IIter2, _IIter2, _Predicate,
-                            __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2>
-    bool
-    lexicographical_compare(_IIter1, _IIter1, _IIter2, _IIter2);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    bool
-    lexicographical_compare(_IIter1, _IIter1, _IIter2, _IIter2, _Predicate);
-
-  template<typename _IIter1, typename _IIter2,
-           typename _Predicate, typename _IterTag1, typename _IterTag2>
-    bool
-    __lexicographical_compare_switch(_IIter1, _IIter1, _IIter2, _IIter2,
-                                   _Predicate, _IterTag1, _IterTag2);
-
-  template<typename _RAIter1, typename _RAIter2, typename _Predicate>
-    bool
-    __lexicographical_compare_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2,
-                                   _Predicate, random_access_iterator_tag,
-                                   random_access_iterator_tag);
-
-  // algo.h
-  template<typename _IIter1, typename _IIter2>
-    pair<_IIter1, _IIter2>
-    mismatch(_IIter1, _IIter1, _IIter2, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    pair<_IIter1, _IIter2>
-    mismatch(_IIter1, _IIter1, _IIter2, _Predicate,
-             __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2>
-    pair<_IIter1, _IIter2>
-    mismatch(_IIter1, _IIter1, _IIter2);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate>
-    pair<_IIter1, _IIter2>
-    mismatch(_IIter1, _IIter1, _IIter2, _Predicate);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate,
-           typename _IterTag1, typename _IterTag2>
-    pair<_IIter1, _IIter2>
-    __mismatch_switch(_IIter1, _IIter1, _IIter2, _Predicate,
-                    _IterTag1, _IterTag2);
-
-  template<typename _RAIter1, typename _RAIter2, typename _Predicate>
-    pair<_RAIter1, _RAIter2>
-    __mismatch_switch(_RAIter1, _RAIter1, _RAIter2, _Predicate,
-                    random_access_iterator_tag, random_access_iterator_tag);
-
-  template<typename _FIter1, typename _FIter2>
-    _FIter1
-    search(_FIter1, _FIter1, _FIter2, _FIter2, __gnu_parallel::sequential_tag);
-
-  template<typename _FIter1, typename _FIter2>
-    _FIter1
-    search(_FIter1, _FIter1, _FIter2, _FIter2);
-
-  template<typename _FIter1, typename _FIter2, typename _BiPredicate>
-    _FIter1
-    search(_FIter1, _FIter1, _FIter2, _FIter2, _BiPredicate,
-           __gnu_parallel::sequential_tag);
-
-  template<typename _FIter1, typename _FIter2, typename _BiPredicate>
-    _FIter1
-    search(_FIter1, _FIter1, _FIter2, _FIter2, _BiPredicate);
-
-  template<typename _RAIter1, typename _RAIter2>
-    _RAIter1
-    __search_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2,
-                  random_access_iterator_tag, random_access_iterator_tag);
-
-  template<typename _FIter1, typename _FIter2, typename _IterTag1,
-           typename _IterTag2>
-    _FIter1
-    __search_switch(_FIter1, _FIter1, _FIter2, _FIter2, _IterTag1, _IterTag2);
-
-  template<typename _RAIter1, typename _RAIter2, typename _BiPredicate>
-    _RAIter1
-    __search_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2, _BiPredicate,
-                  random_access_iterator_tag, random_access_iterator_tag);
-
-  template<typename _FIter1, typename _FIter2, typename _BiPredicate,
-           typename _IterTag1, typename _IterTag2>
-    _FIter1
-    __search_switch(_FIter1, _FIter1, _FIter2, _FIter2, _BiPredicate,
-                  _IterTag1, _IterTag2);
-
-  template<typename _FIter, typename _Integer, typename _Tp>
-    _FIter
-    search_n(_FIter, _FIter, _Integer, const _Tp&,
-             __gnu_parallel::sequential_tag);
-
-  template<typename _FIter, typename _Integer, typename _Tp,
-           typename _BiPredicate>
-    _FIter
-    search_n(_FIter, _FIter, _Integer, const _Tp&, _BiPredicate,
-             __gnu_parallel::sequential_tag);
-    
-  template<typename _FIter, typename _Integer, typename _Tp>
-    _FIter
-    search_n(_FIter, _FIter, _Integer, const _Tp&);
-
-  template<typename _FIter, typename _Integer, typename _Tp,
-           typename _BiPredicate>
-    _FIter
-    search_n(_FIter, _FIter, _Integer, const _Tp&, _BiPredicate);
-
-  template<typename _RAIter, typename _Integer, typename _Tp,
-           typename _BiPredicate>
-    _RAIter
-    __search_n_switch(_RAIter, _RAIter, _Integer, const _Tp&,
-                    _BiPredicate, random_access_iterator_tag);
-
-  template<typename _FIter, typename _Integer, typename _Tp,
-           typename _BiPredicate, typename _IterTag>
-    _FIter
-    __search_n_switch(_FIter, _FIter, _Integer, const _Tp&,
-                    _BiPredicate, _IterTag);
-
-
-  template<typename _IIter, typename _OIter, typename _UnaryOperation>
-    _OIter
-    transform(_IIter, _IIter, _OIter, _UnaryOperation);
-
-  template<typename _IIter, typename _OIter, typename _UnaryOperation>
-    _OIter
-    transform(_IIter, _IIter, _OIter, _UnaryOperation, 
-              __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _OIter, typename _UnaryOperation>
-    _OIter
-    transform(_IIter, _IIter, _OIter, _UnaryOperation, 
-              __gnu_parallel::_Parallelism);
-
-  template<typename _IIter, typename _OIter, typename _UnaryOperation,
-           typename _IterTag1, typename _IterTag2>
-    _OIter
-    __transform1_switch(_IIter, _IIter, _OIter, _UnaryOperation, 
-                      _IterTag1, _IterTag2);
-    
-
-  template<typename _RAIIter, typename _RAOIter, typename _UnaryOperation>
-    _RAOIter
-    __transform1_switch(_RAIIter, _RAIIter, _RAOIter, _UnaryOperation, 
-                      random_access_iterator_tag, random_access_iterator_tag, 
-                      __gnu_parallel::_Parallelism __parallelism
-                      = __gnu_parallel::parallel_balanced);
-
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _BiOperation>
-    _OIter
-    transform(_IIter1, _IIter1, _IIter2, _OIter, _BiOperation);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _BiOperation>
-    _OIter
-    transform(_IIter1, _IIter1, _IIter2, _OIter, _BiOperation, 
-              __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _BiOperation>
-    _OIter
-    transform(_IIter1, _IIter1, _IIter2, _OIter, _BiOperation, 
-              __gnu_parallel::_Parallelism);
-
-  template<typename _RAIter1, typename _RAIter2, typename _RAIter3,
-           typename _BiOperation>
-    _RAIter3
-    __transform2_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter3, _BiOperation, 
-                      random_access_iterator_tag, random_access_iterator_tag, 
-                      random_access_iterator_tag,
-                      __gnu_parallel::_Parallelism __parallelism
-                      = __gnu_parallel::parallel_balanced);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _BiOperation, typename _Tag1,
-           typename _Tag2, typename _Tag3>
-    _OIter
-    __transform2_switch(_IIter1, _IIter1, _IIter2, _OIter, _BiOperation, 
-                      _Tag1, _Tag2, _Tag3);
-
-
-  template<typename _FIter, typename _Tp>
-    void
-    replace(_FIter, _FIter, const _Tp&, const _Tp&);
-
-  template<typename _FIter, typename _Tp>
-    void
-    replace(_FIter, _FIter, const _Tp&, const _Tp&, 
-            __gnu_parallel::sequential_tag);
-
-  template<typename _FIter, typename _Tp>
-    void
-    replace(_FIter, _FIter, const _Tp&, const _Tp&,
-            __gnu_parallel::_Parallelism);
-
-  template<typename _FIter, typename _Tp, typename _IterTag>
-    void
-    __replace_switch(_FIter, _FIter, const _Tp&, const _Tp&, _IterTag);
-
-  template<typename _RAIter, typename _Tp>
-    void
-    __replace_switch(_RAIter, _RAIter, const _Tp&, const _Tp&, 
-                   random_access_iterator_tag, __gnu_parallel::_Parallelism);
-
-
-  template<typename _FIter, typename _Predicate, typename _Tp>
-    void
-    replace_if(_FIter, _FIter, _Predicate, const _Tp&);
-
-  template<typename _FIter, typename _Predicate, typename _Tp>
-    void
-    replace_if(_FIter, _FIter, _Predicate, const _Tp&,
-               __gnu_parallel::sequential_tag);
-
-  template<typename _FIter, typename _Predicate, typename _Tp>
-    void
-    replace_if(_FIter, _FIter, _Predicate, const _Tp&,
-               __gnu_parallel::_Parallelism);
-
-  template<typename _FIter, typename _Predicate, typename _Tp,
-           typename _IterTag>
-    void
-    __replace_if_switch(_FIter, _FIter, _Predicate, const _Tp&, _IterTag);
- 
-  template<typename _RAIter, typename _Predicate, typename _Tp>
-    void
-    __replace_if_switch(_RAIter, _RAIter, _Predicate, const _Tp&,
-                      random_access_iterator_tag,
-                      __gnu_parallel::_Parallelism);
-
-
-  template<typename _FIter>
-    _FIter
-    max_element(_FIter, _FIter);
-
-  template<typename _FIter>
-    _FIter
-    max_element(_FIter, _FIter, __gnu_parallel::sequential_tag);
-
-  template<typename _FIter>
-    _FIter
-    max_element(_FIter, _FIter, __gnu_parallel::_Parallelism);
-
-  template<typename _FIter, typename _Compare>
-    _FIter
-    max_element(_FIter, _FIter, _Compare);
-
-  template<typename _FIter, typename _Compare>
-    _FIter
-    max_element(_FIter, _FIter, _Compare, __gnu_parallel::sequential_tag);
-
-  template<typename _FIter, typename _Compare>
-    _FIter
-    max_element(_FIter, _FIter, _Compare, __gnu_parallel::_Parallelism);
-
-  template<typename _FIter, typename _Compare, typename _IterTag>
-    _FIter
-    __max_element_switch(_FIter, _FIter, _Compare, _IterTag);
-
-  template<typename _RAIter, typename _Compare>
-    _RAIter
-    __max_element_switch(
-      _RAIter, _RAIter, _Compare, random_access_iterator_tag,
-      __gnu_parallel::_Parallelism __parallelism
-      = __gnu_parallel::parallel_balanced);
-
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter
-    merge(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, 
-          __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Compare>
-    _OIter
-    merge(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare, 
-          __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Compare>
-    _OIter
-    merge(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter
-    merge(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Compare, typename _IterTag1, typename _IterTag2,
-           typename _IterTag3>
-    _OIter
-    __merge_switch(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare, 
-                 _IterTag1, _IterTag2, _IterTag3);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Compare>
-    _OIter
-    __merge_switch(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare, 
-                 random_access_iterator_tag, random_access_iterator_tag, 
-                 random_access_iterator_tag);
-
-
-  template<typename _FIter>
-    _FIter
-    min_element(_FIter, _FIter);
-
-  template<typename _FIter>
-    _FIter
-    min_element(_FIter, _FIter, __gnu_parallel::sequential_tag);
-
-  template<typename _FIter>
-    _FIter
-    min_element(_FIter, _FIter,
-                __gnu_parallel::_Parallelism __parallelism_tag);
-
-  template<typename _FIter, typename _Compare>
-    _FIter
-    min_element(_FIter, _FIter, _Compare);
-
-  template<typename _FIter, typename _Compare>
-    _FIter
-    min_element(_FIter, _FIter, _Compare, __gnu_parallel::sequential_tag);
-
-  template<typename _FIter, typename _Compare>
-    _FIter
-    min_element(_FIter, _FIter, _Compare, __gnu_parallel::_Parallelism);
-
-  template<typename _FIter, typename _Compare, typename _IterTag>
-    _FIter
-    __min_element_switch(_FIter, _FIter, _Compare, _IterTag);
-
-  template<typename _RAIter, typename _Compare>
-    _RAIter
-    __min_element_switch(
-      _RAIter, _RAIter, _Compare, random_access_iterator_tag,
-      __gnu_parallel::_Parallelism __parallelism
-      = __gnu_parallel::parallel_balanced);
-
-  template<typename _RAIter>
-    void
-    nth_element(_RAIter, _RAIter, _RAIter, __gnu_parallel::sequential_tag);
-
-  template<typename _RAIter, typename _Compare>
-    void
-    nth_element(_RAIter, _RAIter, _RAIter, _Compare,
-                __gnu_parallel::sequential_tag);
-
-  template<typename _RAIter, typename _Compare>
-    void
-    nth_element(_RAIter, _RAIter, _RAIter, _Compare);
-
-  template<typename _RAIter>
-    void
-    nth_element(_RAIter, _RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void
-    partial_sort(_RAIter, _RAIter, _RAIter, _Compare,
-                 __gnu_parallel::sequential_tag);
-
-  template<typename _RAIter>
-    void
-    partial_sort(_RAIter, _RAIter, _RAIter, __gnu_parallel::sequential_tag);
-
-  template<typename _RAIter, typename _Compare>
-    void
-    partial_sort(_RAIter, _RAIter, _RAIter, _Compare);
-
-  template<typename _RAIter>
-    void
-    partial_sort(_RAIter, _RAIter, _RAIter);
-
-  template<typename _FIter, typename _Predicate>
-    _FIter
-    partition(_FIter, _FIter, _Predicate, __gnu_parallel::sequential_tag);
-    
-  template<typename _FIter, typename _Predicate>
-    _FIter
-    partition(_FIter, _FIter, _Predicate);
-
-  template<typename _FIter, typename _Predicate, typename _IterTag>
-    _FIter
-    __partition_switch(_FIter, _FIter, _Predicate, _IterTag);
-    
-  template<typename _RAIter, typename _Predicate>
-    _RAIter
-    __partition_switch(
-      _RAIter, _RAIter, _Predicate, random_access_iterator_tag);
-
-  template<typename _RAIter>
-    void
-    random_shuffle(_RAIter, _RAIter, __gnu_parallel::sequential_tag);
-
-  template<typename _RAIter, typename _RandomNumberGenerator>
-    void
-    random_shuffle(_RAIter, _RAIter, _RandomNumberGenerator&,
-                   __gnu_parallel::sequential_tag);
-
-  template<typename _RAIter>
-    void
-    random_shuffle(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _RandomNumberGenerator>
-    void
-    random_shuffle(_RAIter, _RAIter,
-#if __cplusplus >= 201103L
-		   _RandomNumberGenerator&&);
-#else
-		   _RandomNumberGenerator&);
-#endif
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter
-    set_union(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-            __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Predicate>
-    _OIter
-    set_union(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate,
-              __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter
-    set_union(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Predicate>
-    _OIter 
-    set_union(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate,
-           typename _OIter, typename _IterTag1, typename _IterTag2,
-           typename _IterTag3>
-    _OIter
-    __set_union_switch(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-                     _Predicate, _IterTag1, _IterTag2, _IterTag3);
-
-  template<typename _RAIter1, typename _RAIter2, typename _Output_RAIter,
-           typename _Predicate>
-    _Output_RAIter
-    __set_union_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2, _Output_RAIter,
-                     _Predicate, random_access_iterator_tag,
-                     random_access_iterator_tag, random_access_iterator_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter
-    set_intersection(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-                     __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Predicate>
-    _OIter
-    set_intersection(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate,
-                     __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter
-    set_intersection(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Predicate>
-    _OIter 
-    set_intersection(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate,
-           typename _OIter, typename _IterTag1, typename _IterTag2,
-           typename _IterTag3>
-    _OIter
-    __set_intersection_switch(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-                            _Predicate, _IterTag1, _IterTag2, _IterTag3);
-
-  template<typename _RAIter1, typename _RAIter2, typename _Output_RAIter,
-           typename _Predicate>
-    _Output_RAIter
-    __set_intersection_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2,
-                            _Output_RAIter, _Predicate,
-                            random_access_iterator_tag,
-                            random_access_iterator_tag,
-                            random_access_iterator_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter
-    set_symmetric_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-                             __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Predicate>
-    _OIter
-    set_symmetric_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-                             _Predicate, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter 
-    set_symmetric_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Predicate>
-    _OIter 
-    set_symmetric_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-                             _Predicate);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate,
-           typename _OIter, typename _IterTag1, typename _IterTag2,
-           typename _IterTag3>
-    _OIter
-    __set_symmetric_difference_switch(_IIter1, _IIter1, _IIter2, _IIter2,
-                                    _OIter, _Predicate, _IterTag1, _IterTag2,
-                                    _IterTag3);
-
-  template<typename _RAIter1, typename _RAIter2, typename _Output_RAIter,
-           typename _Predicate>
-    _Output_RAIter
-    __set_symmetric_difference_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2,
-                                    _Output_RAIter, _Predicate,
-                                    random_access_iterator_tag,
-                                    random_access_iterator_tag,
-                                    random_access_iterator_tag);
-
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter
-    set_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-                   __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Predicate>
-    _OIter
-    set_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate,
-                   __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter>
-    _OIter
-    set_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
-
-  template<typename _IIter1, typename _IIter2, typename _OIter,
-           typename _Predicate>
-    _OIter
-    set_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate);
-
-  template<typename _IIter1, typename _IIter2, typename _Predicate,
-           typename _OIter, typename _IterTag1, typename _IterTag2,
-           typename _IterTag3>
-    _OIter
-    __set_difference_switch(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-                          _Predicate, _IterTag1, _IterTag2, _IterTag3);
-
-  template<typename _RAIter1, typename _RAIter2, typename _Output_RAIter,
-           typename _Predicate>
-    _Output_RAIter
-    __set_difference_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2,
-                          _Output_RAIter, _Predicate,
-                          random_access_iterator_tag,
-                          random_access_iterator_tag,
-                          random_access_iterator_tag);
-
-
-  template<typename _RAIter>
-    void
-    sort(_RAIter, _RAIter, __gnu_parallel::sequential_tag);
-
-  template<typename _RAIter, typename _Compare>
-    void
-    sort(_RAIter, _RAIter, _Compare, __gnu_parallel::sequential_tag);
-
-  template<typename _RAIter>
-    void
-    sort(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void
-    sort(_RAIter, _RAIter, _Compare);
-
-  template<typename _RAIter>
-    void
-    stable_sort(_RAIter, _RAIter, __gnu_parallel::sequential_tag);
-
-  template<typename _RAIter, typename _Compare>
-    void
-    stable_sort(_RAIter, _RAIter, _Compare, __gnu_parallel::sequential_tag);
-
-  template<typename _RAIter>
-    void
-    stable_sort(_RAIter, _RAIter);
-
-  template<typename _RAIter, typename _Compare>
-    void
-    stable_sort(_RAIter, _RAIter, _Compare);
-
-  template<typename _IIter, typename _OIter>
-    _OIter
-    unique_copy(_IIter, _IIter, _OIter, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _OIter, typename _Predicate>
-    _OIter
-    unique_copy(_IIter, _IIter, _OIter, _Predicate,
-                __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _OIter>
-    _OIter
-    unique_copy(_IIter, _IIter, _OIter);
-
-  template<typename _IIter, typename _OIter, typename _Predicate>
-    _OIter
-    unique_copy(_IIter, _IIter, _OIter, _Predicate);
-
-  template<typename _IIter, typename _OIter, typename _Predicate,
-           typename _IterTag1, typename _IterTag2>
-    _OIter
-    __unique_copy_switch(_IIter, _IIter, _OIter, _Predicate,
-                       _IterTag1, _IterTag2);
-
-  template<typename _RAIter, typename _RandomAccess_OIter, typename _Predicate>
-    _RandomAccess_OIter
-    __unique_copy_switch(_RAIter, _RAIter, _RandomAccess_OIter, _Predicate,
-                       random_access_iterator_tag, random_access_iterator_tag);
-} // end namespace __parallel
-} // end namespace std
-
-#endif /* _GLIBCXX_PARALLEL_ALGORITHMFWD_H */
diff --git a/openflow/usr/include/c++/5/parallel/balanced_quicksort.h b/openflow/usr/include/c++/5/parallel/balanced_quicksort.h
deleted file mode 100644
index 8639cdf..0000000
--- a/openflow/usr/include/c++/5/parallel/balanced_quicksort.h
+++ /dev/null
@@ -1,492 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/balanced_quicksort.h
- *  @brief Implementation of a dynamically load-balanced parallel quicksort.
- *
- *  It works in-place and needs only logarithmic extra memory.
- *  The algorithm is similar to the one proposed in
- *
- *  P. Tsigas and Y. Zhang.
- *  A simple, fast parallel implementation of quicksort and
- *  its performance evaluation on SUN enterprise 10000.
- *  In 11th Euromicro Conference on Parallel, Distributed and
- *  Network-Based Processing, page 372, 2003.
- *
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_BALANCED_QUICKSORT_H
-#define _GLIBCXX_PARALLEL_BALANCED_QUICKSORT_H 1
-
-#include <parallel/basic_iterator.h>
-#include <bits/stl_algo.h>
-#include <bits/stl_function.h>
-
-#include <parallel/settings.h>
-#include <parallel/partition.h>
-#include <parallel/random_number.h>
-#include <parallel/queue.h>
-
-#if _GLIBCXX_ASSERTIONS
-#include <parallel/checkers.h>
-#endif
-
-namespace __gnu_parallel
-{
-  /** @brief Information local to one thread in the parallel quicksort run. */
-  template<typename _RAIter>
-    struct _QSBThreadLocal
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      /** @brief Continuous part of the sequence, described by an
-      iterator pair. */
-      typedef std::pair<_RAIter, _RAIter> _Piece;
-
-      /** @brief Initial piece to work on. */
-      _Piece _M_initial;
-
-      /** @brief Work-stealing queue. */
-      _RestrictedBoundedConcurrentQueue<_Piece> _M_leftover_parts;
-
-      /** @brief Number of threads involved in this algorithm. */
-      _ThreadIndex _M_num_threads;
-
-      /** @brief Pointer to a counter of elements left over to sort. */
-      volatile _DifferenceType* _M_elements_leftover;
-
-      /** @brief The complete sequence to sort. */
-      _Piece _M_global;
-
-      /** @brief Constructor.
-       *  @param __queue_size size of the work-stealing queue. */
-      _QSBThreadLocal(int __queue_size) : _M_leftover_parts(__queue_size) { }
-    };
-
-  /** @brief Balanced quicksort divide step.
-    *  @param __begin Begin iterator of subsequence.
-    *  @param __end End iterator of subsequence.
-    *  @param __comp Comparator.
-    *  @param __num_threads Number of threads that are allowed to work on
-    *  this part.
-    *  @pre @c (__end-__begin)>=1 */
-  template<typename _RAIter, typename _Compare>
-    typename std::iterator_traits<_RAIter>::difference_type
-    __qsb_divide(_RAIter __begin, _RAIter __end,
-		 _Compare __comp, _ThreadIndex __num_threads)
-    {
-      _GLIBCXX_PARALLEL_ASSERT(__num_threads > 0);
-
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _RAIter __pivot_pos =
-	__median_of_three_iterators(__begin, __begin + (__end - __begin) / 2,
-				    __end  - 1, __comp);
-
-#if defined(_GLIBCXX_ASSERTIONS)
-      // Must be in between somewhere.
-      _DifferenceType __n = __end - __begin;
-
-      _GLIBCXX_PARALLEL_ASSERT((!__comp(*__pivot_pos, *__begin)
-				&& !__comp(*(__begin + __n / 2),
-					   *__pivot_pos))
-			       || (!__comp(*__pivot_pos, *__begin)
-				   && !__comp(*(__end - 1), *__pivot_pos))
-			       || (!__comp(*__pivot_pos, *(__begin + __n / 2))
-				   && !__comp(*__begin, *__pivot_pos))
-			       || (!__comp(*__pivot_pos, *(__begin + __n / 2))
-				   && !__comp(*(__end - 1), *__pivot_pos))
-			       || (!__comp(*__pivot_pos, *(__end - 1))
-				   && !__comp(*__begin, *__pivot_pos))
-			       || (!__comp(*__pivot_pos, *(__end - 1))
-				   && !__comp(*(__begin + __n / 2),
-					      *__pivot_pos)));
-#endif
-
-      // Swap pivot value to end.
-      if (__pivot_pos != (__end - 1))
-	std::iter_swap(__pivot_pos, __end - 1);
-      __pivot_pos = __end - 1;
-
-      __gnu_parallel::__binder2nd<_Compare, _ValueType, _ValueType, bool>
-	__pred(__comp, *__pivot_pos);
-
-      // Divide, returning __end - __begin - 1 in the worst case.
-      _DifferenceType __split_pos = __parallel_partition(__begin, __end - 1,
-							 __pred,
-							 __num_threads);
-
-      // Swap back pivot to middle.
-      std::iter_swap(__begin + __split_pos, __pivot_pos);
-      __pivot_pos = __begin + __split_pos;
-
-#if _GLIBCXX_ASSERTIONS
-      _RAIter __r;
-      for (__r = __begin; __r != __pivot_pos; ++__r)
-	_GLIBCXX_PARALLEL_ASSERT(__comp(*__r, *__pivot_pos));
-      for (; __r != __end; ++__r)
-	_GLIBCXX_PARALLEL_ASSERT(!__comp(*__r, *__pivot_pos));
-#endif
-
-      return __split_pos;
-    }
-
-  /** @brief Quicksort conquer step.
-    *  @param __tls Array of thread-local storages.
-    *  @param __begin Begin iterator of subsequence.
-    *  @param __end End iterator of subsequence.
-    *  @param __comp Comparator.
-    *  @param __iam Number of the thread processing this function.
-    *  @param __num_threads
-    *          Number of threads that are allowed to work on this part. */
-  template<typename _RAIter, typename _Compare>
-    void
-    __qsb_conquer(_QSBThreadLocal<_RAIter>** __tls,
-		  _RAIter __begin, _RAIter __end,
-		  _Compare __comp,
-		  _ThreadIndex __iam, _ThreadIndex __num_threads,
-		  bool __parent_wait)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _DifferenceType __n = __end - __begin;
-
-      if (__num_threads <= 1 || __n <= 1)
-	{
-          __tls[__iam]->_M_initial.first  = __begin;
-          __tls[__iam]->_M_initial.second = __end;
-
-          __qsb_local_sort_with_helping(__tls, __comp, __iam, __parent_wait);
-
-          return;
-	}
-
-      // Divide step.
-      _DifferenceType __split_pos =
-	__qsb_divide(__begin, __end, __comp, __num_threads);
-
-#if _GLIBCXX_ASSERTIONS
-      _GLIBCXX_PARALLEL_ASSERT(0 <= __split_pos &&
-                               __split_pos < (__end - __begin));
-#endif
-
-      _ThreadIndex
-	__num_threads_leftside = std::max<_ThreadIndex>
-	(1, std::min<_ThreadIndex>(__num_threads - 1, __split_pos
-				   * __num_threads / __n));
-
-#     pragma omp atomic
-      *__tls[__iam]->_M_elements_leftover -= (_DifferenceType)1;
-
-      // Conquer step.
-#     pragma omp parallel num_threads(2)
-      {
-	bool __wait;
-	if(omp_get_num_threads() < 2)
-          __wait = false;
-	else
-          __wait = __parent_wait;
-
-#       pragma omp sections
-	{
-#         pragma omp section
-	  {
-	    __qsb_conquer(__tls, __begin, __begin + __split_pos, __comp,
-			  __iam, __num_threads_leftside, __wait);
-	    __wait = __parent_wait;
-	  }
-	  // The pivot_pos is left in place, to ensure termination.
-#         pragma omp section
-	  {
-	    __qsb_conquer(__tls, __begin + __split_pos + 1, __end, __comp,
-			  __iam + __num_threads_leftside,
-			  __num_threads - __num_threads_leftside, __wait);
-	    __wait = __parent_wait;
-	  }
-	}
-      }
-    }
-
-  /**
-    *  @brief Quicksort step doing load-balanced local sort.
-    *  @param __tls Array of thread-local storages.
-    *  @param __comp Comparator.
-    *  @param __iam Number of the thread processing this function.
-    */
-  template<typename _RAIter, typename _Compare>
-    void
-    __qsb_local_sort_with_helping(_QSBThreadLocal<_RAIter>** __tls,
-				  _Compare& __comp, _ThreadIndex __iam,
-				  bool __wait)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef std::pair<_RAIter, _RAIter> _Piece;
-
-      _QSBThreadLocal<_RAIter>& __tl = *__tls[__iam];
-
-      _DifferenceType
-	__base_case_n = _Settings::get().sort_qsb_base_case_maximal_n;
-      if (__base_case_n < 2)
-	__base_case_n = 2;
-      _ThreadIndex __num_threads = __tl._M_num_threads;
-
-      // Every thread has its own random number generator.
-      _RandomNumber __rng(__iam + 1);
-
-      _Piece __current = __tl._M_initial;
-
-      _DifferenceType __elements_done = 0;
-#if _GLIBCXX_ASSERTIONS
-      _DifferenceType __total_elements_done = 0;
-#endif
-
-      for (;;)
-	{
-          // Invariant: __current must be a valid (maybe empty) range.
-          _RAIter __begin = __current.first, __end = __current.second;
-          _DifferenceType __n = __end - __begin;
-
-          if (__n > __base_case_n)
-            {
-              // Divide.
-              _RAIter __pivot_pos = __begin +  __rng(__n);
-
-              // Swap __pivot_pos value to end.
-              if (__pivot_pos != (__end - 1))
-        	std::iter_swap(__pivot_pos, __end - 1);
-              __pivot_pos = __end - 1;
-
-              __gnu_parallel::__binder2nd
-		<_Compare, _ValueType, _ValueType, bool>
-		__pred(__comp, *__pivot_pos);
-
-              // Divide, leave pivot unchanged in last place.
-              _RAIter __split_pos1, __split_pos2;
-              __split_pos1 = __gnu_sequential::partition(__begin, __end - 1,
-							 __pred);
-
-              // Left side: < __pivot_pos; __right side: >= __pivot_pos.
-#if _GLIBCXX_ASSERTIONS
-              _GLIBCXX_PARALLEL_ASSERT(__begin <= __split_pos1
-                                       && __split_pos1 < __end);
-#endif
-              // Swap pivot back to middle.
-              if (__split_pos1 != __pivot_pos)
-        	std::iter_swap(__split_pos1, __pivot_pos);
-              __pivot_pos = __split_pos1;
-
-              // In case all elements are equal, __split_pos1 == 0.
-              if ((__split_pos1 + 1 - __begin) < (__n >> 7)
-		  || (__end - __split_pos1) < (__n >> 7))
-        	{
-                  // Very unequal split, one part smaller than one 128th
-                  // elements not strictly larger than the pivot.
-                  __gnu_parallel::__unary_negate<__gnu_parallel::__binder1st
-                    <_Compare, _ValueType, _ValueType, bool>, _ValueType>
-                    __pred(__gnu_parallel::__binder1st
-                	 <_Compare, _ValueType, _ValueType, bool>
-			   (__comp, *__pivot_pos));
-
-                  // Find other end of pivot-equal range.
-                  __split_pos2 = __gnu_sequential::partition(__split_pos1 + 1,
-							     __end, __pred);
-        	}
-              else
-        	// Only skip the pivot.
-        	__split_pos2 = __split_pos1 + 1;
-
-              // Elements equal to pivot are done.
-              __elements_done += (__split_pos2 - __split_pos1);
-#if _GLIBCXX_ASSERTIONS
-              __total_elements_done += (__split_pos2 - __split_pos1);
-#endif
-              // Always push larger part onto stack.
-              if (((__split_pos1 + 1) - __begin) < (__end - (__split_pos2)))
-        	{
-                  // Right side larger.
-                  if ((__split_pos2) != __end)
-                    __tl._M_leftover_parts.push_front
-		      (std::make_pair(__split_pos2, __end));
-
-                  //__current.first = __begin;    //already set anyway
-                  __current.second = __split_pos1;
-                  continue;
-        	}
-              else
-        	{
-                  // Left side larger.
-                  if (__begin != __split_pos1)
-                    __tl._M_leftover_parts.push_front(std::make_pair
-						      (__begin, __split_pos1));
-
-                  __current.first = __split_pos2;
-                  //__current.second = __end;     //already set anyway
-                  continue;
-        	}
-            }
-          else
-            {
-              __gnu_sequential::sort(__begin, __end, __comp);
-              __elements_done += __n;
-#if _GLIBCXX_ASSERTIONS
-              __total_elements_done += __n;
-#endif
-
-              // Prefer own stack, small pieces.
-              if (__tl._M_leftover_parts.pop_front(__current))
-        	continue;
-
-#             pragma omp atomic
-              *__tl._M_elements_leftover -= __elements_done;
-
-              __elements_done = 0;
-
-#if _GLIBCXX_ASSERTIONS
-              double __search_start = omp_get_wtime();
-#endif
-
-              // Look for new work.
-              bool __successfully_stolen = false;
-              while (__wait && *__tl._M_elements_leftover > 0
-                     && !__successfully_stolen
-#if _GLIBCXX_ASSERTIONS
-                      // Possible dead-lock.
-                     && (omp_get_wtime() < (__search_start + 1.0))
-#endif
-		     )
-        	{
-                  _ThreadIndex __victim;
-                  __victim = __rng(__num_threads);
-
-                  // Large pieces.
-                  __successfully_stolen = (__victim != __iam)
-		    && __tls[__victim]->_M_leftover_parts.pop_back(__current);
-                  if (!__successfully_stolen)
-                    __yield();
-#if !defined(__ICC) && !defined(__ECC)
-#                 pragma omp flush
-#endif
-        	}
-
-#if _GLIBCXX_ASSERTIONS
-              if (omp_get_wtime() >= (__search_start + 1.0))
-        	{
-                  sleep(1);
-                  _GLIBCXX_PARALLEL_ASSERT(omp_get_wtime()
-                                           < (__search_start + 1.0));
-        	}
-#endif
-              if (!__successfully_stolen)
-        	{
-#if _GLIBCXX_ASSERTIONS
-                  _GLIBCXX_PARALLEL_ASSERT(*__tl._M_elements_leftover == 0);
-#endif
-                  return;
-        	}
-            }
-	}
-    }
-
-  /** @brief Top-level quicksort routine.
-    *  @param __begin Begin iterator of sequence.
-    *  @param __end End iterator of sequence.
-    *  @param __comp Comparator.
-    *  @param __num_threads Number of threads that are allowed to work on
-    *  this part.
-    */
-  template<typename _RAIter, typename _Compare>
-    void
-    __parallel_sort_qsb(_RAIter __begin, _RAIter __end,
-			_Compare __comp, _ThreadIndex __num_threads)
-    {
-      _GLIBCXX_CALL(__end - __begin)
-
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef std::pair<_RAIter, _RAIter> _Piece;
-
-      typedef _QSBThreadLocal<_RAIter> _TLSType;
-
-      _DifferenceType __n = __end - __begin;
-
-      if (__n <= 1)
-	return;
-
-      // At least one element per processor.
-      if (__num_threads > __n)
-	__num_threads = static_cast<_ThreadIndex>(__n);
-
-      // Initialize thread local storage
-      _TLSType** __tls = new _TLSType*[__num_threads];
-      _DifferenceType __queue_size = (__num_threads
-				      * (_ThreadIndex)(__rd_log2(__n) + 1));
-      for (_ThreadIndex __t = 0; __t < __num_threads; ++__t)
-	__tls[__t] = new _QSBThreadLocal<_RAIter>(__queue_size);
-
-      // There can never be more than ceil(__rd_log2(__n)) ranges on the
-      // stack, because
-      // 1. Only one processor pushes onto the stack
-      // 2. The largest range has at most length __n
-      // 3. Each range is larger than half of the range remaining
-      volatile _DifferenceType __elements_leftover = __n;
-      for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	{
-          __tls[__i]->_M_elements_leftover = &__elements_leftover;
-          __tls[__i]->_M_num_threads = __num_threads;
-          __tls[__i]->_M_global = std::make_pair(__begin, __end);
-
-          // Just in case nothing is left to assign.
-          __tls[__i]->_M_initial = std::make_pair(__end, __end);
-	}
-
-      // Main recursion call.
-      __qsb_conquer(__tls, __begin, __begin + __n, __comp, 0,
-		    __num_threads, true);
-
-#if _GLIBCXX_ASSERTIONS
-      // All stack must be empty.
-      _Piece __dummy;
-      for (_ThreadIndex __i = 1; __i < __num_threads; ++__i)
-	_GLIBCXX_PARALLEL_ASSERT(
-          !__tls[__i]->_M_leftover_parts.pop_back(__dummy));
-#endif
-
-      for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	delete __tls[__i];
-      delete[] __tls;
-    }
-} // namespace __gnu_parallel
-
-#endif /* _GLIBCXX_PARALLEL_BALANCED_QUICKSORT_H */
diff --git a/openflow/usr/include/c++/5/parallel/base.h b/openflow/usr/include/c++/5/parallel/base.h
deleted file mode 100644
index f88f90b..0000000
--- a/openflow/usr/include/c++/5/parallel/base.h
+++ /dev/null
@@ -1,426 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/base.h
- *  @brief Sequential helper functions.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_BASE_H
-#define _GLIBCXX_PARALLEL_BASE_H 1
-
-#include <bits/c++config.h>
-#include <bits/stl_function.h>
-#include <omp.h>
-#include <parallel/features.h>
-#include <parallel/basic_iterator.h>
-#include <parallel/parallel.h>
-
-// Parallel mode namespaces.
-
-/**
- * @namespace std::__parallel
- * @brief GNU parallel code, replaces standard behavior with parallel behavior.
- */
-namespace std _GLIBCXX_VISIBILITY(default) 
-{ 
-  namespace __parallel { } 
-}
-
-/**
- * @namespace __gnu_parallel
- * @brief GNU parallel code for public use.
- */
-namespace __gnu_parallel
-{
-  // Import all the parallel versions of components in namespace std.
-  using namespace std::__parallel;
-}
-
-/**
- * @namespace __gnu_sequential
- * @brief GNU sequential classes for public use.
- */
-namespace __gnu_sequential 
-{ 
-  // Import whatever is the serial version.
-#ifdef _GLIBCXX_PARALLEL
-  using namespace std::_GLIBCXX_STD_A;
-#else
-  using namespace std;
-#endif   
-}
-
-
-namespace __gnu_parallel
-{
-  // NB: Including this file cannot produce (unresolved) symbols from
-  // the OpenMP runtime unless the parallel mode is actually invoked
-  // and active, which imples that the OpenMP runtime is actually
-  // going to be linked in.
-  inline _ThreadIndex
-  __get_max_threads() 
-  { 
-    _ThreadIndex __i = omp_get_max_threads();
-    return __i > 1 ? __i : 1; 
-  }
-
-
-  inline bool 
-  __is_parallel(const _Parallelism __p) { return __p != sequential; }
-
-
-  /** @brief Calculates the rounded-down logarithm of @c __n for base 2.
-   *  @param __n Argument.
-   *  @return Returns 0 for any argument <1.
-   */
-  template<typename _Size>
-    inline _Size
-    __rd_log2(_Size __n)
-    {
-      _Size __k;
-      for (__k = 0; __n > 1; __n >>= 1)
-        ++__k;
-      return __k;
-    }
-
-  /** @brief Encode two integers into one gnu_parallel::_CASable.
-   *  @param __a First integer, to be encoded in the most-significant @c
-   *  _CASable_bits/2 bits.
-   *  @param __b Second integer, to be encoded in the least-significant
-   *  @c _CASable_bits/2 bits.
-   *  @return value encoding @c __a and @c __b.
-   *  @see __decode2
-   */
-  inline _CASable
-  __encode2(int __a, int __b)     //must all be non-negative, actually
-  {
-    return (((_CASable)__a) << (_CASable_bits / 2)) | (((_CASable)__b) << 0);
-  }
-
-  /** @brief Decode two integers from one gnu_parallel::_CASable.
-   *  @param __x __gnu_parallel::_CASable to decode integers from.
-   *  @param __a First integer, to be decoded from the most-significant
-   *  @c _CASable_bits/2 bits of @c __x.
-   *  @param __b Second integer, to be encoded in the least-significant
-   *  @c _CASable_bits/2 bits of @c __x.
-   *  @see __encode2
-   */
-  inline void
-  __decode2(_CASable __x, int& __a, int& __b)
-  {
-    __a = (int)((__x >> (_CASable_bits / 2)) & _CASable_mask);
-    __b = (int)((__x >>               0 ) & _CASable_mask);
-  }
-
-  //needed for parallel "numeric", even if "algorithm" not included
-
-  /** @brief Equivalent to std::min. */
-  template<typename _Tp>
-    inline const _Tp&
-    min(const _Tp& __a, const _Tp& __b)
-    { return (__a < __b) ? __a : __b; }
-
-  /** @brief Equivalent to std::max. */
-  template<typename _Tp>
-    inline const _Tp&
-    max(const _Tp& __a, const _Tp& __b)
-    { return (__a > __b) ? __a : __b; }
-
-  /** @brief Constructs predicate for equality from strict weak
-   *  ordering predicate
-   */
-  template<typename _T1, typename _T2, typename _Compare>
-    class _EqualFromLess : public std::binary_function<_T1, _T2, bool>
-    {
-    private:
-      _Compare& _M_comp;
-
-    public:
-      _EqualFromLess(_Compare& __comp) : _M_comp(__comp) { }
-
-      bool operator()(const _T1& __a, const _T2& __b)
-      { return !_M_comp(__a, __b) && !_M_comp(__b, __a); }
-    };
-
-
-  /** @brief Similar to std::unary_negate,
-   *  but giving the argument types explicitly. */
-  template<typename _Predicate, typename argument_type>
-    class __unary_negate
-    : public std::unary_function<argument_type, bool>
-    {
-    protected:
-      _Predicate _M_pred;
-
-    public:
-      explicit
-      __unary_negate(const _Predicate& __x) : _M_pred(__x) { }
-
-      bool
-      operator()(const argument_type& __x)
-      { return !_M_pred(__x); }
-    };
-
-  /** @brief Similar to std::binder1st,
-   *  but giving the argument types explicitly. */
-  template<typename _Operation, typename _FirstArgumentType,
-	   typename _SecondArgumentType, typename _ResultType>
-    class __binder1st
-    : public std::unary_function<_SecondArgumentType, _ResultType>
-    {
-    protected:
-      _Operation _M_op;
-      _FirstArgumentType _M_value;
-
-    public:
-      __binder1st(const _Operation& __x, const _FirstArgumentType& __y)
-      : _M_op(__x), _M_value(__y) { }
-
-      _ResultType
-      operator()(const _SecondArgumentType& __x)
-      { return _M_op(_M_value, __x); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 109.  Missing binders for non-const sequence elements
-      _ResultType
-      operator()(_SecondArgumentType& __x) const
-      { return _M_op(_M_value, __x); }
-    };
-
-  /**
-   *  @brief Similar to std::binder2nd, but giving the argument types
-   *  explicitly.
-   */
-  template<typename _Operation, typename _FirstArgumentType,
-	   typename _SecondArgumentType, typename _ResultType>
-    class __binder2nd
-    : public std::unary_function<_FirstArgumentType, _ResultType>
-    {
-    protected:
-      _Operation _M_op;
-      _SecondArgumentType _M_value;
-
-    public:
-      __binder2nd(const _Operation& __x, const _SecondArgumentType& __y)
-      : _M_op(__x), _M_value(__y) { }
-
-      _ResultType
-      operator()(const _FirstArgumentType& __x) const
-      { return _M_op(__x, _M_value); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 109.  Missing binders for non-const sequence elements
-      _ResultType
-      operator()(_FirstArgumentType& __x)
-      { return _M_op(__x, _M_value); }
-    };
-
-  /** @brief Similar to std::equal_to, but allows two different types. */
-  template<typename _T1, typename _T2>
-    struct _EqualTo : std::binary_function<_T1, _T2, bool>
-    {
-      bool operator()(const _T1& __t1, const _T2& __t2) const
-      { return __t1 == __t2; }
-    };
-
-  /** @brief Similar to std::less, but allows two different types. */
-  template<typename _T1, typename _T2>
-    struct _Less : std::binary_function<_T1, _T2, bool>
-    {
-      bool
-      operator()(const _T1& __t1, const _T2& __t2) const
-      { return __t1 < __t2; }
-
-      bool
-      operator()(const _T2& __t2, const _T1& __t1) const
-      { return __t2 < __t1; }
-    };
-
-  // Partial specialization for one type. Same as std::less.
-  template<typename _Tp>
-    struct _Less<_Tp, _Tp>
-    : public std::less<_Tp> { };
-
-  /** @brief Similar to std::plus, but allows two different types. */
-  template<typename _Tp1, typename _Tp2, typename _Result
-	   = __typeof__(*static_cast<_Tp1*>(0)
-			+ *static_cast<_Tp2*>(0))>
-    struct _Plus : public std::binary_function<_Tp1, _Tp2, _Result>
-    {
-      _Result
-      operator()(const _Tp1& __x, const _Tp2& __y) const
-      { return __x + __y; }
-    };
-
-  // Partial specialization for one type. Same as std::plus.
-  template<typename _Tp>
-    struct _Plus<_Tp, _Tp, _Tp>
-    : public std::plus<_Tp> { };
-
-  /** @brief Similar to std::multiplies, but allows two different types. */
-  template<typename _Tp1, typename _Tp2, typename _Result
-	   = __typeof__(*static_cast<_Tp1*>(0)
-			* *static_cast<_Tp2*>(0))>
-    struct _Multiplies : public std::binary_function<_Tp1, _Tp2, _Result>
-    {
-      _Result
-      operator()(const _Tp1& __x, const _Tp2& __y) const
-      { return __x * __y; }
-    };
-
-  // Partial specialization for one type. Same as std::multiplies.
-  template<typename _Tp>
-    struct _Multiplies<_Tp, _Tp, _Tp>
-    : public std::multiplies<_Tp> { };
-
-  /** @brief _Iterator associated with __gnu_parallel::_PseudoSequence.
-   *  If features the usual random-access iterator functionality.
-   *  @param _Tp Sequence _M_value type.
-   *  @param _DifferenceTp Sequence difference type.
-   */
-  template<typename _Tp, typename _DifferenceTp>
-    class _PseudoSequenceIterator
-    {
-    public:
-      typedef _DifferenceTp _DifferenceType;
-
-      _PseudoSequenceIterator(const _Tp& __val, _DifferenceType __pos)
-      : _M_val(__val), _M_pos(__pos) { }
-
-      // Pre-increment operator.
-      _PseudoSequenceIterator&
-      operator++()
-      {
-	++_M_pos;
-	return *this;
-      }
-
-      // Post-increment operator.
-      _PseudoSequenceIterator
-      operator++(int)
-      { return _PseudoSequenceIterator(_M_pos++); }
-
-      const _Tp&
-      operator*() const
-      { return _M_val; }
-
-      const _Tp&
-      operator[](_DifferenceType) const
-      { return _M_val; }
-
-      bool
-      operator==(const _PseudoSequenceIterator& __i2)
-      { return _M_pos == __i2._M_pos; }
-
-      bool
-      operator!=(const _PseudoSequenceIterator& __i2)
-      { return _M_pos != __i2._M_pos; }
-
-      _DifferenceType
-      operator-(const _PseudoSequenceIterator& __i2)
-      { return _M_pos - __i2._M_pos; }
-
-    private:
-      const _Tp& _M_val;
-      _DifferenceType _M_pos;
-    };
-
-  /** @brief Sequence that conceptually consists of multiple copies of
-      the same element.
-      *  The copies are not stored explicitly, of course.
-      *  @param _Tp Sequence _M_value type.
-      *  @param _DifferenceTp Sequence difference type.
-      */
-  template<typename _Tp, typename _DifferenceTp>
-    class _PseudoSequence
-    {
-    public:
-      typedef _DifferenceTp _DifferenceType;
-
-      // Better cast down to uint64_t, than up to _DifferenceTp.
-      typedef _PseudoSequenceIterator<_Tp, uint64_t> iterator;
-
-      /** @brief Constructor.
-       *  @param __val Element of the sequence.
-       *  @param __count Number of (virtual) copies.
-       */
-      _PseudoSequence(const _Tp& __val, _DifferenceType __count)
-      : _M_val(__val), _M_count(__count)  { }
-
-      /** @brief Begin iterator. */
-      iterator
-      begin() const
-      { return iterator(_M_val, 0); }
-
-      /** @brief End iterator. */
-      iterator
-      end() const
-      { return iterator(_M_val, _M_count); }
-
-    private:
-      const _Tp& _M_val;
-      _DifferenceType _M_count;
-    };
-
-  /** @brief Compute the median of three referenced elements,
-      according to @c __comp.
-      *  @param __a First iterator.
-      *  @param __b Second iterator.
-      *  @param __c Third iterator.
-      *  @param __comp Comparator.
-      */
-  template<typename _RAIter, typename _Compare>
-    _RAIter
-    __median_of_three_iterators(_RAIter __a, _RAIter __b,
-				_RAIter __c, _Compare __comp)
-    {
-      if (__comp(*__a, *__b))
-	if (__comp(*__b, *__c))
-	  return __b;
-	else
-	  if (__comp(*__a, *__c))
-	    return __c;
-	  else
-	    return __a;
-      else
-	{
-	  // Just swap __a and __b.
-	  if (__comp(*__a, *__c))
-	    return __a;
-	  else
-	    if (__comp(*__b, *__c))
-	      return __c;
-	    else
-	      return __b;
-	}
-    }
-
-#define _GLIBCXX_PARALLEL_ASSERT(_Condition) __glibcxx_assert(_Condition)
-
-} //namespace __gnu_parallel
-
-#endif /* _GLIBCXX_PARALLEL_BASE_H */
diff --git a/openflow/usr/include/c++/5/parallel/basic_iterator.h b/openflow/usr/include/c++/5/parallel/basic_iterator.h
deleted file mode 100644
index 14ba3cf..0000000
--- a/openflow/usr/include/c++/5/parallel/basic_iterator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/basic_iterator.h
- *  @brief Includes the original header files concerned with iterators
- *  except for stream iterators.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_BASIC_ITERATOR_H
-#define _GLIBCXX_PARALLEL_BASIC_ITERATOR_H 1
-
-#include <bits/c++config.h>
-#include <bits/stl_iterator_base_types.h>
-#include <bits/stl_iterator_base_funcs.h>
-#include <bits/stl_iterator.h>
-
-#endif /* _GLIBCXX_PARALLEL_BASIC_ITERATOR_H */
diff --git a/openflow/usr/include/c++/5/parallel/checkers.h b/openflow/usr/include/c++/5/parallel/checkers.h
deleted file mode 100644
index 5814fc1..0000000
--- a/openflow/usr/include/c++/5/parallel/checkers.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/checkers.h
- *  @brief Routines for checking the correctness of algorithm results.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_CHECKERS_H
-#define _GLIBCXX_PARALLEL_CHECKERS_H 1
-
-#include <cstdio>
-#include <bits/stl_algobase.h>
-#include <bits/stl_function.h>
-
-namespace __gnu_parallel
-{
-  /**
-   * @brief Check whether @c [__begin, @c __end) is sorted according
-   * to @c __comp.
-   * @param __begin Begin iterator of sequence.
-   * @param __end End iterator of sequence.
-   * @param __comp Comparator.
-   * @return @c true if sorted, @c false otherwise.
-   */
-  template<typename _IIter, typename _Compare>
-    bool
-    __is_sorted(_IIter __begin, _IIter __end, _Compare __comp)
-    {
-      if (__begin == __end)
-        return true;
-
-      _IIter __current(__begin), __recent(__begin);
-
-      unsigned long long __position = 1;
-      for (__current++; __current != __end; __current++)
-        {
-          if (__comp(*__current, *__recent))
-            {
-              return false;
-            }
-          __recent = __current;
-          __position++;
-        }
-
-      return true;
-    }
-}
-
-#endif /* _GLIBCXX_PARALLEL_CHECKERS_H */
diff --git a/openflow/usr/include/c++/5/parallel/compatibility.h b/openflow/usr/include/c++/5/parallel/compatibility.h
deleted file mode 100644
index b8f127d..0000000
--- a/openflow/usr/include/c++/5/parallel/compatibility.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/compatibility.h
- *  @brief Compatibility layer, mostly concerned with atomic operations.
- *
- *  This file is a GNU parallel extension to the Standard C++ Library
- *  and contains implementation details for the library's internal use.
- */
-
-// Written by Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_COMPATIBILITY_H
-#define _GLIBCXX_PARALLEL_COMPATIBILITY_H 1
-
-#include <parallel/types.h>
-#include <parallel/base.h>
-
-#if !defined(_WIN32) || defined (__CYGWIN__)
-#include <sched.h>
-#endif
-
-#ifdef __MINGW32__
-// Including <windows.h> will drag in all the windows32 names.  Since
-// that can cause user code portability problems, we just declare the
-// one needed function here.
-extern "C"
-__attribute((dllimport)) void __attribute__((stdcall)) Sleep (unsigned long);
-#endif
-
-namespace __gnu_parallel
-{
-  template<typename _Tp>
-    inline _Tp
-    __add_omp(volatile _Tp* __ptr, _Tp __addend)
-    {
-      int64_t __res;
-#pragma omp critical
-      {
-	__res = *__ptr;
-	*(__ptr) += __addend;
-      }
-      return __res;
-    }
-
-  /** @brief Add a value to a variable, atomically.
-   *
-   *  @param __ptr Pointer to a signed integer.
-   *  @param __addend Value to add.
-   */
-  template<typename _Tp>
-    inline _Tp
-    __fetch_and_add(volatile _Tp* __ptr, _Tp __addend)
-    {
-      if (__atomic_always_lock_free(sizeof(_Tp), __ptr))
-	return __atomic_fetch_add(__ptr, __addend, __ATOMIC_ACQ_REL);
-      return __add_omp(__ptr, __addend);
-    }
-
-  template<typename _Tp>
-    inline bool
-    __cas_omp(volatile _Tp* __ptr, _Tp __comparand, _Tp __replacement)
-    {
-      bool __res = false;
-#pragma omp critical
-      {
-	if (*__ptr == __comparand)
-	  {
-	    *__ptr = __replacement;
-	    __res = true;
-	  }
-      }
-      return __res;
-    }
-
-  /** @brief Compare-and-swap
-   *
-   * Compare @c *__ptr and @c __comparand. If equal, let @c
-   * *__ptr=__replacement and return @c true, return @c false otherwise.
-   *
-   *  @param __ptr Pointer to signed integer.
-   *  @param __comparand Compare value.
-   *  @param __replacement Replacement value.
-   */
-  template<typename _Tp>
-    inline bool
-    __compare_and_swap(volatile _Tp* __ptr, _Tp __comparand, _Tp __replacement)
-    {
-      if (__atomic_always_lock_free(sizeof(_Tp), __ptr))
-	return __atomic_compare_exchange_n(__ptr, &__comparand, __replacement,
-					   false, __ATOMIC_ACQ_REL,
-					   __ATOMIC_RELAXED);
-      return __cas_omp(__ptr, __comparand, __replacement);
-    }
-
-  /** @brief Yield control to another thread, without waiting for
-   *  the end of the time slice.
-   */
-  inline void
-  __yield()
-  {
-#if defined (_WIN32) && !defined (__CYGWIN__)
-    Sleep(0);
-#else
-    sched_yield();
-#endif
-  }
-} // end namespace
-
-#endif /* _GLIBCXX_PARALLEL_COMPATIBILITY_H */
diff --git a/openflow/usr/include/c++/5/parallel/compiletime_settings.h b/openflow/usr/include/c++/5/parallel/compiletime_settings.h
deleted file mode 100644
index fa83c6a..0000000
--- a/openflow/usr/include/c++/5/parallel/compiletime_settings.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/compiletime_settings.h
- *  @brief Defines on options concerning debugging and performance, at
- *  compile-time.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#include <cstdio>
-
-/** @brief Determine verbosity level of the parallel mode.
- *  Level 1 prints a message each time a parallel-mode function is entered. */
-#define _GLIBCXX_VERBOSE_LEVEL 0
-
-/** @def _GLIBCXX_CALL
- *  @brief Macro to produce log message when entering a function.
- *  @param __n Input size.
- *  @see _GLIBCXX_VERBOSE_LEVEL */
-#if (_GLIBCXX_VERBOSE_LEVEL == 0)
-#define _GLIBCXX_CALL(__n)
-#endif
-#if (_GLIBCXX_VERBOSE_LEVEL == 1)
-#define _GLIBCXX_CALL(__n) \
-  printf("   %__s:\niam = %d, __n = %ld, __num_threads = %d\n", \
-  __PRETTY_FUNCTION__, omp_get_thread_num(), (__n), __get_max_threads());
-#endif
-
-#ifndef _GLIBCXX_SCALE_DOWN_FPU
-/** @brief Use floating-point scaling instead of modulo for mapping
- *  random numbers to a range.  This can be faster on certain CPUs. */
-#define _GLIBCXX_SCALE_DOWN_FPU 0
-#endif
-
-#ifndef _GLIBCXX_ASSERTIONS
-/** @brief Switch on many _GLIBCXX_PARALLEL_ASSERTions in parallel code.
- *  Should be switched on only locally. */
-#define _GLIBCXX_ASSERTIONS 0
-#endif
-
-#ifndef _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_L1
-/** @brief Switch on many _GLIBCXX_PARALLEL_ASSERTions in parallel code.
- *  Consider the size of the L1 cache for
-*  gnu_parallel::__parallel_random_shuffle(). */
-#define _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_L1 0
-#endif
-#ifndef _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_TLB
-/** @brief Switch on many _GLIBCXX_PARALLEL_ASSERTions in parallel code.
- *  Consider the size of the TLB for
-*  gnu_parallel::__parallel_random_shuffle(). */
-#define _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_TLB 0
-#endif
diff --git a/openflow/usr/include/c++/5/parallel/equally_split.h b/openflow/usr/include/c++/5/parallel/equally_split.h
deleted file mode 100644
index db119df..0000000
--- a/openflow/usr/include/c++/5/parallel/equally_split.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/equally_split.h
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_EQUALLY_SPLIT_H
-#define _GLIBCXX_PARALLEL_EQUALLY_SPLIT_H 1
-
-namespace __gnu_parallel
-{
-  /** @brief function to split a sequence into parts of almost equal size.
-   *
-   *  The resulting sequence __s of length __num_threads+1 contains the
-   *  splitting positions when splitting the range [0,__n) into parts of
-   *  almost equal size (plus minus 1).  The first entry is 0, the last
-   *  one n. There may result empty parts.
-   *  @param __n Number of elements
-   *  @param __num_threads Number of parts
-   *  @param __s Splitters
-   *  @returns End of __splitter sequence, i.e. @c __s+__num_threads+1 */
-  template<typename _DifferenceType, typename _OutputIterator>
-    _OutputIterator
-    __equally_split(_DifferenceType __n, _ThreadIndex __num_threads,
-		    _OutputIterator __s)
-    {
-      _DifferenceType __chunk_length = __n / __num_threads;
-      _DifferenceType __num_longer_chunks = __n % __num_threads;
-      _DifferenceType __pos = 0;
-      for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	{
-	  *__s++ = __pos;
-	  __pos += ((__i < __num_longer_chunks)
-		    ? (__chunk_length + 1) : __chunk_length);
-	}
-      *__s++ = __n;
-      return __s;
-    }
-
-  /** @brief function to split a sequence into parts of almost equal size.
-   *
-   *  Returns the position of the splitting point between
-   *  thread number __thread_no (included) and
-   *  thread number __thread_no+1 (excluded).
-   *  @param __n Number of elements
-   *  @param __num_threads Number of parts
-   *  @param __thread_no Number of threads
-   *  @returns splitting point */
-  template<typename _DifferenceType>
-    _DifferenceType
-    __equally_split_point(_DifferenceType __n,
-			  _ThreadIndex __num_threads,
-			  _ThreadIndex __thread_no)
-    {
-      _DifferenceType __chunk_length = __n / __num_threads;
-      _DifferenceType __num_longer_chunks = __n % __num_threads;
-      if (__thread_no < __num_longer_chunks)
-	return __thread_no * (__chunk_length + 1);
-      else
-	return __num_longer_chunks * (__chunk_length + 1)
-          + (__thread_no - __num_longer_chunks) * __chunk_length;
-    }
-}
-
-#endif /* _GLIBCXX_PARALLEL_EQUALLY_SPLIT_H */
diff --git a/openflow/usr/include/c++/5/parallel/features.h b/openflow/usr/include/c++/5/parallel/features.h
deleted file mode 100644
index 796a218..0000000
--- a/openflow/usr/include/c++/5/parallel/features.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/features.h
- *  @brief Defines on whether to include algorithm variants.
- *
- *  Less variants reduce executable size and compile time.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_FEATURES_H
-#define _GLIBCXX_PARALLEL_FEATURES_H 1
-
-#ifndef _GLIBCXX_MERGESORT
-/** @def _GLIBCXX_MERGESORT
- *  @brief Include parallel multi-way mergesort.
- *  @see __gnu_parallel::_Settings::sort_algorithm */
-#define _GLIBCXX_MERGESORT 1
-#endif
-
-#ifndef _GLIBCXX_QUICKSORT
-/** @def _GLIBCXX_QUICKSORT
- *  @brief Include parallel unbalanced quicksort.
- *  @see __gnu_parallel::_Settings::sort_algorithm */
-#define _GLIBCXX_QUICKSORT 1
-#endif
-
-#ifndef _GLIBCXX_BAL_QUICKSORT
-/** @def _GLIBCXX_BAL_QUICKSORT
- *  @brief Include parallel dynamically load-balanced quicksort.
- *  @see __gnu_parallel::_Settings::sort_algorithm */
-#define _GLIBCXX_BAL_QUICKSORT 1
-#endif
-
-#ifndef _GLIBCXX_FIND_GROWING_BLOCKS
-/** @brief Include the growing blocks variant for std::find.
- *  @see __gnu_parallel::_Settings::find_algorithm */
-#define _GLIBCXX_FIND_GROWING_BLOCKS 1
-#endif
-
-#ifndef _GLIBCXX_FIND_CONSTANT_SIZE_BLOCKS
-/** @brief Include the equal-sized blocks variant for std::find.
- *  @see __gnu_parallel::_Settings::find_algorithm */
-#define _GLIBCXX_FIND_CONSTANT_SIZE_BLOCKS 1
-#endif
-
-#ifndef _GLIBCXX_FIND_EQUAL_SPLIT
-/** @def _GLIBCXX_FIND_EQUAL_SPLIT
- *  @brief Include the equal splitting variant for std::find.
- *  @see __gnu_parallel::_Settings::find_algorithm */
-#define _GLIBCXX_FIND_EQUAL_SPLIT 1
-#endif
-
-
-#ifndef _GLIBCXX_TREE_INITIAL_SPLITTING
-/** @def _GLIBCXX_TREE_INITIAL_SPLITTING
- *  @brief Include the initial splitting variant for
- *  _Rb_tree::insert_unique(_IIter beg, _IIter __end).
- *  @see __gnu_parallel::_Rb_tree */
-#define _GLIBCXX_TREE_INITIAL_SPLITTING 1
-#endif
-
-#ifndef _GLIBCXX_TREE_DYNAMIC_BALANCING
-/** @def _GLIBCXX_TREE_DYNAMIC_BALANCING
- *  @brief Include the dynamic balancing variant for
- *  _Rb_tree::insert_unique(_IIter beg, _IIter __end).
- *  @see __gnu_parallel::_Rb_tree */
-#define _GLIBCXX_TREE_DYNAMIC_BALANCING 1
-#endif
-
-#ifndef _GLIBCXX_TREE_FULL_COPY
-/** @def _GLIBCXX_TREE_FULL_COPY
- *  @brief In order to sort the input sequence of
- *  _Rb_tree::insert_unique(_IIter beg, _IIter __end) a
- *  full copy of the input elements is done.
- *  @see __gnu_parallel::_Rb_tree */
-#define _GLIBCXX_TREE_FULL_COPY 1
-#endif
-
-
-#endif /* _GLIBCXX_PARALLEL_FEATURES_H */
diff --git a/openflow/usr/include/c++/5/parallel/find.h b/openflow/usr/include/c++/5/parallel/find.h
deleted file mode 100644
index 6aee8d8..0000000
--- a/openflow/usr/include/c++/5/parallel/find.h
+++ /dev/null
@@ -1,405 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/find.h
- *  @brief Parallel implementation base for std::find(), std::equal()
- *  and related functions.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Felix Putze and Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_FIND_H
-#define _GLIBCXX_PARALLEL_FIND_H 1
-
-#include <bits/stl_algobase.h>
-
-#include <parallel/features.h>
-#include <parallel/parallel.h>
-#include <parallel/compatibility.h>
-#include <parallel/equally_split.h>
-
-namespace __gnu_parallel
-{
-  /**
-   *  @brief Parallel std::find, switch for different algorithms.
-   *  @param __begin1 Begin iterator of first sequence.
-   *  @param __end1 End iterator of first sequence.
-   *  @param __begin2 Begin iterator of second sequence. Must have same
-   *  length as first sequence.
-   *  @param __pred Find predicate.
-   *  @param __selector _Functionality (e. g. std::find_if(), std::equal(),...)
-   *  @return Place of finding in both sequences.
-   */
-  template<typename _RAIter1,
-	   typename _RAIter2,
-	   typename _Pred,
-           typename _Selector>
-    inline std::pair<_RAIter1, _RAIter2>
-    __find_template(_RAIter1 __begin1, _RAIter1 __end1,
-		    _RAIter2 __begin2, _Pred __pred, _Selector __selector)
-    {
-      switch (_Settings::get().find_algorithm)
-	{
-	case GROWING_BLOCKS:
-          return __find_template(__begin1, __end1, __begin2, __pred,
-				 __selector, growing_blocks_tag());
-	case CONSTANT_SIZE_BLOCKS:
-          return __find_template(__begin1, __end1, __begin2, __pred,
-				 __selector, constant_size_blocks_tag());
-	case EQUAL_SPLIT:
-          return __find_template(__begin1, __end1, __begin2, __pred,
-				 __selector, equal_split_tag());
-	default:
-          _GLIBCXX_PARALLEL_ASSERT(false);
-          return std::make_pair(__begin1, __begin2);
-	}
-    }
-
-#if _GLIBCXX_FIND_EQUAL_SPLIT
-
-  /**
-   *  @brief Parallel std::find, equal splitting variant.
-   *  @param __begin1 Begin iterator of first sequence.
-   *  @param __end1 End iterator of first sequence.
-   *  @param __begin2 Begin iterator of second sequence. Second __sequence
-   *  must have same length as first sequence.
-   *  @param __pred Find predicate.
-   *  @param __selector _Functionality (e. g. std::find_if(), std::equal(),...)
-   *  @return Place of finding in both sequences.
-   */
-  template<typename _RAIter1,
-           typename _RAIter2,
-           typename _Pred,
-           typename _Selector>
-    std::pair<_RAIter1, _RAIter2>
-    __find_template(_RAIter1 __begin1, _RAIter1 __end1,
-		    _RAIter2 __begin2, _Pred __pred,
-		    _Selector __selector, equal_split_tag)
-    {
-      _GLIBCXX_CALL(__end1 - __begin1)
-
-      typedef std::iterator_traits<_RAIter1> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef typename _TraitsType::value_type _ValueType;
-
-      _DifferenceType __length = __end1 - __begin1;
-      _DifferenceType __result = __length;
-      _DifferenceType* __borders;
-
-      omp_lock_t __result_lock;
-      omp_init_lock(&__result_lock);
-
-      _ThreadIndex __num_threads = __get_max_threads();
-#     pragma omp parallel num_threads(__num_threads)
-      {
-#     pragma omp single
-	{
-	  __num_threads = omp_get_num_threads();
-	  __borders = new _DifferenceType[__num_threads + 1];
-	  __equally_split(__length, __num_threads, __borders);
-	} //single
-
-	_ThreadIndex __iam = omp_get_thread_num();
-	_DifferenceType __start = __borders[__iam],
-	                 __stop = __borders[__iam + 1];
-
-	_RAIter1 __i1 = __begin1 + __start;
-	_RAIter2 __i2 = __begin2 + __start;
-	for (_DifferenceType __pos = __start; __pos < __stop; ++__pos)
-	  {
-#           pragma omp flush(__result)
-	    // Result has been set to something lower.
-	    if (__result < __pos)
-	      break;
-
-	    if (__selector(__i1, __i2, __pred))
-	      {
-		omp_set_lock(&__result_lock);
-		if (__pos < __result)
-		  __result = __pos;
-		omp_unset_lock(&__result_lock);
-		break;
-	      }
-	    ++__i1;
-	    ++__i2;
-	  }
-      } //parallel
-
-      omp_destroy_lock(&__result_lock);
-      delete[] __borders;
-
-      return std::pair<_RAIter1, _RAIter2>(__begin1 + __result,
-					   __begin2 + __result);
-    }
-
-#endif
-
-#if _GLIBCXX_FIND_GROWING_BLOCKS
-
-  /**
-   *  @brief Parallel std::find, growing block size variant.
-   *  @param __begin1 Begin iterator of first sequence.
-   *  @param __end1 End iterator of first sequence.
-   *  @param __begin2 Begin iterator of second sequence. Second __sequence
-   *  must have same length as first sequence.
-   *  @param __pred Find predicate.
-   *  @param __selector _Functionality (e. g. std::find_if(), std::equal(),...)
-   *  @return Place of finding in both sequences.
-   *  @see __gnu_parallel::_Settings::find_sequential_search_size
-   *  @see __gnu_parallel::_Settings::find_scale_factor
-   *
-   *  There are two main differences between the growing blocks and
-   *  the constant-size blocks variants.
-   *  1. For GB, the block size grows; for CSB, the block size is fixed.
-   *  2. For GB, the blocks are allocated dynamically;
-   *     for CSB, the blocks are allocated in a predetermined manner,
-   *     namely spacial round-robin.
-   */
-  template<typename _RAIter1,
-           typename _RAIter2,
-           typename _Pred,
-           typename _Selector>
-    std::pair<_RAIter1, _RAIter2>
-    __find_template(_RAIter1 __begin1, _RAIter1 __end1,
-		    _RAIter2 __begin2, _Pred __pred, _Selector __selector,
-		    growing_blocks_tag)
-    {
-      _GLIBCXX_CALL(__end1 - __begin1)
-
-      typedef std::iterator_traits<_RAIter1> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef typename _TraitsType::value_type _ValueType;
-
-      const _Settings& __s = _Settings::get();
-
-      _DifferenceType __length = __end1 - __begin1;
-
-      _DifferenceType
-	__sequential_search_size = std::min<_DifferenceType>
-	(__length, __s.find_sequential_search_size);
-
-      // Try it sequentially first.
-      std::pair<_RAIter1, _RAIter2>
-	__find_seq_result = __selector._M_sequential_algorithm
-	(__begin1, __begin1 + __sequential_search_size,
-	 __begin2, __pred);
-
-      if (__find_seq_result.first != (__begin1 + __sequential_search_size))
-	return __find_seq_result;
-
-      // Index of beginning of next free block (after sequential find).
-      _DifferenceType __next_block_start = __sequential_search_size;
-      _DifferenceType __result = __length;
-
-      omp_lock_t __result_lock;
-      omp_init_lock(&__result_lock);
-
-      const float __scale_factor = __s.find_scale_factor;
-
-      _ThreadIndex __num_threads = __get_max_threads();
-#     pragma omp parallel shared(__result) num_threads(__num_threads)
-      {
-#       pragma omp single
-	__num_threads = omp_get_num_threads();
-
-	// Not within first __k elements -> start parallel.
-	_ThreadIndex __iam = omp_get_thread_num();
-
-	_DifferenceType __block_size =
-	  std::max<_DifferenceType>(1, __scale_factor * __next_block_start);
-	_DifferenceType __start = __fetch_and_add<_DifferenceType>
-	  (&__next_block_start, __block_size);
-
-	// Get new block, update pointer to next block.
-	_DifferenceType __stop =
-	  std::min<_DifferenceType>(__length, __start + __block_size);
-
-	std::pair<_RAIter1, _RAIter2> __local_result;
-
-	while (__start < __length)
-	  {
-#           pragma omp flush(__result)
-	    // Get new value of result.
-	    if (__result < __start)
-	      {
-		// No chance to find first element.
-		break;
-	      }
-
-	    __local_result = __selector._M_sequential_algorithm
-	      (__begin1 + __start, __begin1 + __stop,
-	       __begin2 + __start, __pred);
-
-	    if (__local_result.first != (__begin1 + __stop))
-	      {
-		omp_set_lock(&__result_lock);
-		if ((__local_result.first - __begin1) < __result)
-		  {
-		    __result = __local_result.first - __begin1;
-
-		    // Result cannot be in future blocks, stop algorithm.
-		    __fetch_and_add<_DifferenceType>(&__next_block_start,
-						     __length);
-		  }
-		omp_unset_lock(&__result_lock);
-	      }
-
-	    _DifferenceType __block_size =
-	     std::max<_DifferenceType>(1, __scale_factor * __next_block_start);
-
-	    // Get new block, update pointer to next block.
-	    __start = __fetch_and_add<_DifferenceType>(&__next_block_start,
-						       __block_size);
-	    __stop =
-	      std::min<_DifferenceType>(__length, __start + __block_size);
-	  }
-      } //parallel
-
-      omp_destroy_lock(&__result_lock);
-
-      // Return iterator on found element.
-      return
-	std::pair<_RAIter1, _RAIter2>(__begin1 + __result,
-				      __begin2 + __result);
-    }
-
-#endif
-
-#if _GLIBCXX_FIND_CONSTANT_SIZE_BLOCKS
-
-  /**
-   *   @brief Parallel std::find, constant block size variant.
-   *  @param __begin1 Begin iterator of first sequence.
-   *  @param __end1 End iterator of first sequence.
-   *  @param __begin2 Begin iterator of second sequence. Second __sequence
-   *  must have same length as first sequence.
-   *  @param __pred Find predicate.
-   *  @param __selector _Functionality (e. g. std::find_if(), std::equal(),...)
-   *  @return Place of finding in both sequences.
-   *  @see __gnu_parallel::_Settings::find_sequential_search_size
-   *  @see __gnu_parallel::_Settings::find_block_size
-   *  There are two main differences between the growing blocks and the
-   *  constant-size blocks variants.
-   *  1. For GB, the block size grows; for CSB, the block size is fixed.
-   *  2. For GB, the blocks are allocated dynamically; for CSB, the
-   *  blocks are allocated in a predetermined manner, namely spacial
-   *  round-robin.
-   */
-  template<typename _RAIter1,
-           typename _RAIter2,
-           typename _Pred,
-           typename _Selector>
-    std::pair<_RAIter1, _RAIter2>
-    __find_template(_RAIter1 __begin1, _RAIter1 __end1,
-                  _RAIter2 __begin2, _Pred __pred, _Selector __selector,
-                  constant_size_blocks_tag)
-    {
-      _GLIBCXX_CALL(__end1 - __begin1)
-      typedef std::iterator_traits<_RAIter1> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef typename _TraitsType::value_type _ValueType;
-
-      const _Settings& __s = _Settings::get();
-
-      _DifferenceType __length = __end1 - __begin1;
-
-      _DifferenceType __sequential_search_size = std::min<_DifferenceType>
-	(__length, __s.find_sequential_search_size);
-
-      // Try it sequentially first.
-      std::pair<_RAIter1, _RAIter2>
-	__find_seq_result = __selector._M_sequential_algorithm
-	(__begin1, __begin1 + __sequential_search_size, __begin2, __pred);
-
-      if (__find_seq_result.first != (__begin1 + __sequential_search_size))
-	return __find_seq_result;
-
-      _DifferenceType __result = __length;
-      omp_lock_t __result_lock;
-      omp_init_lock(&__result_lock);
-
-      // Not within first __sequential_search_size elements -> start parallel.
-
-      _ThreadIndex __num_threads = __get_max_threads();
-#     pragma omp parallel shared(__result) num_threads(__num_threads)
-      {
-#       pragma omp single
-	__num_threads = omp_get_num_threads();
-
-	_ThreadIndex __iam = omp_get_thread_num();
-	_DifferenceType __block_size = __s.find_initial_block_size;
-
-	// First element of thread's current iteration.
-	_DifferenceType __iteration_start = __sequential_search_size;
-
-	// Where to work (initialization).
-	_DifferenceType __start = __iteration_start + __iam * __block_size;
-	_DifferenceType __stop = std::min<_DifferenceType>(__length,
-							   __start
-							   + __block_size);
-
-	std::pair<_RAIter1, _RAIter2> __local_result;
-
-	while (__start < __length)
-	  {
-	    // Get new value of result.
-#           pragma omp flush(__result)
-	    // No chance to find first element.
-	    if (__result < __start)
-	      break;
-
-	    __local_result = __selector._M_sequential_algorithm
-	      (__begin1 + __start, __begin1 + __stop,
-	       __begin2 + __start, __pred);
-
-	    if (__local_result.first != (__begin1 + __stop))
-	      {
-		omp_set_lock(&__result_lock);
-		if ((__local_result.first - __begin1) < __result)
-		  __result = __local_result.first - __begin1;
-		omp_unset_lock(&__result_lock);
-		// Will not find better value in its interval.
-		break;
-	      }
-
-	    __iteration_start += __num_threads * __block_size;
-
-	    // Where to work.
-	    __start = __iteration_start + __iam * __block_size;
-	    __stop = std::min<_DifferenceType>(__length,
-					       __start + __block_size);
-	  }
-      } //parallel
-
-      omp_destroy_lock(&__result_lock);
-
-      // Return iterator on found element.
-      return std::pair<_RAIter1, _RAIter2>(__begin1 + __result,
-					   __begin2 + __result);
-    }
-#endif
-} // end namespace
-
-#endif /* _GLIBCXX_PARALLEL_FIND_H */
diff --git a/openflow/usr/include/c++/5/parallel/find_selectors.h b/openflow/usr/include/c++/5/parallel/find_selectors.h
deleted file mode 100644
index 145b107..0000000
--- a/openflow/usr/include/c++/5/parallel/find_selectors.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/find_selectors.h
- *  @brief _Function objects representing different tasks to be plugged
- *  into the parallel find algorithm.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_FIND_SELECTORS_H
-#define _GLIBCXX_PARALLEL_FIND_SELECTORS_H 1
-
-#include <parallel/tags.h>
-#include <parallel/basic_iterator.h>
-#include <bits/stl_pair.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Base class of all __gnu_parallel::__find_template selectors. */
-  struct __generic_find_selector
-  { };
-
-  /** 
-   *  @brief Test predicate on a single element, used for std::find()
-   *  and std::find_if ().
-   */
-  struct __find_if_selector : public __generic_find_selector
-  {
-    /** @brief Test on one position.
-     * @param __i1 _Iterator on first sequence.
-     * @param __i2 _Iterator on second sequence (unused).
-     * @param __pred Find predicate.
-     */
-    template<typename _RAIter1, typename _RAIter2,
-             typename _Pred>
-      bool 
-      operator()(_RAIter1 __i1, _RAIter2 __i2, _Pred __pred)
-      { return __pred(*__i1); }
-
-    /** @brief Corresponding sequential algorithm on a sequence.
-     *  @param __begin1 Begin iterator of first sequence.
-     *  @param __end1 End iterator of first sequence.
-     *  @param __begin2 Begin iterator of second sequence.
-     *  @param __pred Find predicate.
-     */
-    template<typename _RAIter1, typename _RAIter2,
-             typename _Pred>
-      std::pair<_RAIter1, _RAIter2> 
-      _M_sequential_algorithm(_RAIter1 __begin1,
-                           _RAIter1 __end1,
-                           _RAIter2 __begin2, _Pred __pred)
-      { return std::make_pair(find_if(__begin1, __end1, __pred,
-                                      sequential_tag()), __begin2); }
-  };
-
-  /** @brief Test predicate on two adjacent elements. */
-  struct __adjacent_find_selector : public __generic_find_selector
-  {
-    /** @brief Test on one position.
-     *  @param __i1 _Iterator on first sequence.
-     *  @param __i2 _Iterator on second sequence (unused).
-     *  @param __pred Find predicate.
-     */
-    template<typename _RAIter1, typename _RAIter2,
-             typename _Pred>
-      bool 
-      operator()(_RAIter1 __i1, _RAIter2 __i2, _Pred __pred)
-      {
-        // Passed end iterator is one short.
-        return __pred(*__i1, *(__i1 + 1));
-      }
-
-    /** @brief Corresponding sequential algorithm on a sequence.
-     *  @param __begin1 Begin iterator of first sequence.
-     *  @param __end1 End iterator of first sequence.
-     *  @param __begin2 Begin iterator of second sequence.
-     *  @param __pred Find predicate.
-     */
-    template<typename _RAIter1, typename _RAIter2,
-             typename _Pred>
-      std::pair<_RAIter1, _RAIter2>
-      _M_sequential_algorithm(_RAIter1 __begin1,
-			      _RAIter1 __end1,
-			      _RAIter2 __begin2, _Pred __pred)
-      {
-        // Passed end iterator is one short.
-        _RAIter1 __spot = adjacent_find(__begin1, __end1 + 1,
-					__pred, sequential_tag());
-        if (__spot == (__end1 + 1))
-          __spot = __end1;
-        return std::make_pair(__spot, __begin2);
-      }
-  };
-
-  /** @brief Test inverted predicate on a single element. */
-  struct __mismatch_selector : public __generic_find_selector
-  {
-    /** 
-     *  @brief Test on one position.
-     *  @param __i1 _Iterator on first sequence.
-     *  @param __i2 _Iterator on second sequence (unused).
-     *  @param __pred Find predicate. 
-     */
-    template<typename _RAIter1, typename _RAIter2,
-             typename _Pred>
-      bool 
-      operator()(_RAIter1 __i1, _RAIter2 __i2, _Pred __pred)
-      { return !__pred(*__i1, *__i2); }
-
-    /** 
-     *  @brief Corresponding sequential algorithm on a sequence.
-     *  @param __begin1 Begin iterator of first sequence.
-     *  @param __end1 End iterator of first sequence.
-     *  @param __begin2 Begin iterator of second sequence.
-     *  @param __pred Find predicate. 
-     */
-    template<typename _RAIter1, typename _RAIter2,
-             typename _Pred>
-      std::pair<_RAIter1, _RAIter2>
-      _M_sequential_algorithm(_RAIter1 __begin1,
-			      _RAIter1 __end1,
-			      _RAIter2 __begin2, _Pred __pred)
-      { return mismatch(__begin1, __end1, __begin2,
-			__pred, sequential_tag()); }
-  };
-
-
-  /** @brief Test predicate on several elements. */
-  template<typename _FIterator>
-    struct __find_first_of_selector : public __generic_find_selector
-    {
-      _FIterator _M_begin;
-      _FIterator _M_end;
-
-      explicit __find_first_of_selector(_FIterator __begin,
-					_FIterator __end)
-      : _M_begin(__begin), _M_end(__end) { }
-
-      /** @brief Test on one position.
-       *  @param __i1 _Iterator on first sequence.
-       *  @param __i2 _Iterator on second sequence (unused).
-       *  @param __pred Find predicate. */
-      template<typename _RAIter1, typename _RAIter2,
-	       typename _Pred>
-        bool
-        operator()(_RAIter1 __i1, _RAIter2 __i2, _Pred __pred)
-        {
-	  for (_FIterator __pos_in_candidates = _M_begin;
-	       __pos_in_candidates != _M_end; ++__pos_in_candidates)
-	    if (__pred(*__i1, *__pos_in_candidates))
-	      return true;
-	  return false;
-	}
-
-      /** @brief Corresponding sequential algorithm on a sequence.
-       *  @param __begin1 Begin iterator of first sequence.
-       *  @param __end1 End iterator of first sequence.
-       *  @param __begin2 Begin iterator of second sequence.
-       *  @param __pred Find predicate. */
-      template<typename _RAIter1, typename _RAIter2,
-	       typename _Pred>
-        std::pair<_RAIter1, _RAIter2>
-        _M_sequential_algorithm(_RAIter1 __begin1,
-				_RAIter1 __end1,
-				_RAIter2 __begin2, _Pred __pred)
-        {
-	  return std::make_pair(find_first_of(__begin1, __end1,
-					      _M_begin, _M_end, __pred,
-					      sequential_tag()), __begin2);
-	}
-     };
-}
-
-#endif /* _GLIBCXX_PARALLEL_FIND_SELECTORS_H */
diff --git a/openflow/usr/include/c++/5/parallel/for_each.h b/openflow/usr/include/c++/5/parallel/for_each.h
deleted file mode 100644
index 4ba6169..0000000
--- a/openflow/usr/include/c++/5/parallel/for_each.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/for_each.h
- *  @brief Main interface for embarrassingly parallel functions.
- *
- *  The explicit implementation are in other header files, like
- *  workstealing.h, par_loop.h, omp_loop.h, and omp_loop_static.h.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_FOR_EACH_H
-#define _GLIBCXX_PARALLEL_FOR_EACH_H 1
-
-#include <parallel/settings.h>
-#include <parallel/par_loop.h>
-#include <parallel/omp_loop.h>
-#include <parallel/workstealing.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Chose the desired algorithm by evaluating @c __parallelism_tag.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __user_op A user-specified functor (comparator, predicate,
-   *  associative operator,...)
-   *  @param __functionality functor to @a process an element with
-   *  __user_op (depends on desired functionality, e. g. accumulate,
-   *  for_each,...
-   *  @param __reduction Reduction functor.
-   *  @param __reduction_start Initial value for reduction.
-   *  @param __output Output iterator.
-   *  @param __bound Maximum number of elements processed.
-   *  @param __parallelism_tag Parallelization method */
-  template<typename _IIter, typename _UserOp,
-           typename _Functionality, typename _Red, typename _Result>
-    _UserOp
-    __for_each_template_random_access(_IIter __begin, _IIter __end,
-                                      _UserOp __user_op,
-                                      _Functionality& __functionality,
-                                      _Red __reduction,
-                                      _Result __reduction_start,
-                                      _Result& __output, typename
-                                      std::iterator_traits<_IIter>::
-                                      difference_type __bound,
-                                      _Parallelism __parallelism_tag)
-    {
-      if (__parallelism_tag == parallel_unbalanced)
-        return __for_each_template_random_access_ed
-	  (__begin, __end, __user_op, __functionality, __reduction,
-	   __reduction_start, __output, __bound);
-      else if (__parallelism_tag == parallel_omp_loop)
-        return __for_each_template_random_access_omp_loop
-	  (__begin, __end, __user_op, __functionality, __reduction,
-	   __reduction_start, __output, __bound);
-      else if (__parallelism_tag == parallel_omp_loop_static)
-        return __for_each_template_random_access_omp_loop
-	  (__begin, __end, __user_op, __functionality, __reduction,
-	   __reduction_start, __output, __bound);
-      else      //e. g. parallel_balanced
-        return __for_each_template_random_access_workstealing
-	  (__begin, __end, __user_op, __functionality, __reduction,
-	   __reduction_start, __output, __bound);
-  }
-}
-
-#endif /* _GLIBCXX_PARALLEL_FOR_EACH_H */
diff --git a/openflow/usr/include/c++/5/parallel/for_each_selectors.h b/openflow/usr/include/c++/5/parallel/for_each_selectors.h
deleted file mode 100644
index 8622283..0000000
--- a/openflow/usr/include/c++/5/parallel/for_each_selectors.h
+++ /dev/null
@@ -1,349 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/for_each_selectors.h
- *  @brief Functors representing different tasks to be plugged into the
- *  generic parallelization methods for embarrassingly parallel functions.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_FOR_EACH_SELECTORS_H
-#define _GLIBCXX_PARALLEL_FOR_EACH_SELECTORS_H 1
-
-#include <parallel/basic_iterator.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Generic __selector for embarrassingly parallel functions. */
-  template<typename _It>
-    struct __generic_for_each_selector
-    {
-      /** @brief _Iterator on last element processed; needed for some
-       *  algorithms (e. g. std::transform()).
-       */
-      _It _M_finish_iterator;
-    };
-
-  /** @brief std::for_each() selector. */
-  template<typename _It>
-    struct __for_each_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Functor execution.
-       *  @param __o Operator.
-       *  @param __i iterator referencing object. */
-      template<typename _Op>
-        bool
-        operator()(_Op& __o, _It __i)
-        {
-          __o(*__i);
-          return true;
-        }
-    };
-
-  /** @brief std::generate() selector. */
-  template<typename _It>
-    struct __generate_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Functor execution.
-       *  @param __o Operator.
-       *  @param __i iterator referencing object. */
-      template<typename _Op>
-        bool
-        operator()(_Op& __o, _It __i)
-        {
-          *__i = __o();
-          return true;
-        }
-    };
-
-  /** @brief std::fill() selector. */
-  template<typename _It>
-    struct __fill_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Functor execution.
-       *  @param __v Current value.
-       *  @param __i iterator referencing object. */
-      template<typename _ValueType>
-        bool
-        operator()(_ValueType& __v, _It __i)
-        {
-          *__i = __v;
-          return true;
-        }
-    };
-
-  /** @brief std::transform() __selector, one input sequence variant. */
-  template<typename _It>
-    struct __transform1_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Functor execution.
-       *  @param __o Operator.
-       *  @param __i iterator referencing object. */
-      template<typename _Op>
-        bool
-        operator()(_Op& __o, _It __i)
-        {
-          *__i.second = __o(*__i.first);
-          return true;
-        }
-    };
-
-  /** @brief std::transform() __selector, two input sequences variant. */
-  template<typename _It>
-    struct __transform2_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Functor execution.
-       *  @param __o Operator.
-       *  @param __i iterator referencing object. */
-      template<typename _Op>
-        bool
-        operator()(_Op& __o, _It __i)
-        {
-          *__i._M_third = __o(*__i._M_first, *__i._M_second);
-          return true;
-        }
-    };
-
-  /** @brief std::replace() selector. */
-  template<typename _It, typename _Tp>
-    struct __replace_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Value to replace with. */
-      const _Tp& __new_val;
-
-      /** @brief Constructor
-       *  @param __new_val Value to replace with. */
-      explicit
-      __replace_selector(const _Tp &__new_val) : __new_val(__new_val) {}
-
-      /** @brief Functor execution.
-       *  @param __v Current value.
-       *  @param __i iterator referencing object. */
-      bool
-      operator()(_Tp& __v, _It __i)
-      {
-        if (*__i == __v)
-          *__i = __new_val;
-        return true;
-      }
-    };
-
-  /** @brief std::replace() selector. */
-  template<typename _It, typename _Op, typename _Tp>
-    struct __replace_if_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Value to replace with. */
-      const _Tp& __new_val;
-
-      /** @brief Constructor.
-       *  @param __new_val Value to replace with. */
-      explicit
-      __replace_if_selector(const _Tp &__new_val) : __new_val(__new_val) { }
-
-      /** @brief Functor execution.
-       *  @param __o Operator.
-       *  @param __i iterator referencing object. */
-      bool
-      operator()(_Op& __o, _It __i)
-      {
-        if (__o(*__i))
-          *__i = __new_val;
-        return true;
-      }
-    };
-
-  /** @brief std::count() selector. */
-  template<typename _It, typename _Diff>
-    struct __count_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Functor execution.
-       *  @param __v Current value.
-       *  @param __i iterator referencing object.
-       *  @return 1 if count, 0 if does not count. */
-      template<typename _ValueType>
-        _Diff
-        operator()(_ValueType& __v, _It __i)
-        { return (__v == *__i) ? 1 : 0; }
-    };
-
-  /** @brief std::count_if () selector. */
-  template<typename _It, typename _Diff>
-    struct __count_if_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Functor execution.
-       *  @param __o Operator.
-       *  @param __i iterator referencing object.
-       *  @return 1 if count, 0 if does not count. */
-      template<typename _Op>
-        _Diff
-        operator()(_Op& __o, _It __i)
-        { return (__o(*__i)) ? 1 : 0; }
-    };
-
-  /** @brief std::accumulate() selector. */
-  template<typename _It>
-    struct __accumulate_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Functor execution.
-       *  @param __o Operator (unused).
-       *  @param __i iterator referencing object.
-       *  @return The current value. */
-      template<typename _Op>
-        typename std::iterator_traits<_It>::value_type
-        operator()(_Op __o, _It __i)
-        { return *__i; }
-    };
-
-  /** @brief std::inner_product() selector. */
-  template<typename _It, typename _It2, typename _Tp>
-    struct __inner_product_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Begin iterator of first sequence. */
-      _It  __begin1_iterator;
-
-      /** @brief Begin iterator of second sequence. */
-      _It2 __begin2_iterator;
-
-      /** @brief Constructor.
-       *  @param __b1 Begin iterator of first sequence.
-       *  @param __b2 Begin iterator of second sequence. */
-      explicit
-      __inner_product_selector(_It __b1, _It2 __b2)
-      : __begin1_iterator(__b1), __begin2_iterator(__b2) { }
-
-      /** @brief Functor execution.
-       *  @param __mult Multiplication functor.
-       *  @param __current iterator referencing object.
-       *  @return Inner product elemental __result. */
-      template<typename _Op>
-        _Tp
-        operator()(_Op __mult, _It __current)
-        {
-          typename std::iterator_traits<_It>::difference_type __position
-            = __current - __begin1_iterator;
-          return __mult(*__current, *(__begin2_iterator + __position));
-        }
-    };
-
-  /** @brief Selector that just returns the passed iterator. */
-  template<typename _It>
-    struct __identity_selector : public __generic_for_each_selector<_It>
-    {
-      /** @brief Functor execution.
-       *  @param __o Operator (unused).
-       *  @param __i iterator referencing object.
-       *  @return Passed iterator. */
-      template<typename _Op>
-        _It
-        operator()(_Op __o, _It __i)
-        { return __i; }
-    };
-
-  /** @brief Selector that returns the difference between two adjacent
-   *  __elements.
-   */
-  template<typename _It>
-    struct __adjacent_difference_selector
-    : public __generic_for_each_selector<_It>
-    {
-      template<typename _Op>
-        bool
-        operator()(_Op& __o, _It __i)
-        {
-          typename _It::first_type __go_back_one = __i.first;
-          --__go_back_one;
-          *__i.second = __o(*__i.first, *__go_back_one);
-          return true;
-        }
-    };
-
-  /** @brief Functor doing nothing
-   *
-   *  For some __reduction tasks (this is not a function object, but is
-   *  passed as __selector __dummy parameter.
-   */
-  struct _Nothing
-  {
-    /** @brief Functor execution.
-     *  @param __i iterator referencing object. */
-    template<typename _It>
-      void
-      operator()(_It __i) { }
-  };
-
-  /** @brief Reduction function doing nothing. */
-  struct _DummyReduct
-  {
-    bool
-    operator()(bool, bool) const
-    { return true; }
-  };
-
-  /** @brief Reduction for finding the maximum element, using a comparator. */
-  template<typename _Compare, typename _It>
-    struct __min_element_reduct
-    {
-      _Compare& __comp;
-
-      explicit
-      __min_element_reduct(_Compare &__c) : __comp(__c) { }
-
-      _It
-      operator()(_It __x, _It __y)
-      { return (__comp(*__x, *__y)) ? __x : __y; }
-    };
-
-  /** @brief Reduction for finding the maximum element, using a comparator. */
-  template<typename _Compare, typename _It>
-    struct __max_element_reduct
-    {
-      _Compare& __comp;
-
-      explicit
-      __max_element_reduct(_Compare& __c) : __comp(__c) { }
-
-      _It
-      operator()(_It __x, _It __y)
-      { return (__comp(*__x, *__y)) ? __y : __x; }
-    };
-
-  /** @brief General reduction, using a binary operator. */
-  template<typename _BinOp>
-    struct __accumulate_binop_reduct
-    {
-      _BinOp& __binop;
-
-      explicit
-      __accumulate_binop_reduct(_BinOp& __b) : __binop(__b) { }
-
-      template<typename _Result, typename _Addend>
-        _Result
-        operator()(const _Result& __x, const _Addend& __y)
-        { return __binop(__x, __y); }
-    };
-}
-
-#endif /* _GLIBCXX_PARALLEL_FOR_EACH_SELECTORS_H */
diff --git a/openflow/usr/include/c++/5/parallel/iterator.h b/openflow/usr/include/c++/5/parallel/iterator.h
deleted file mode 100644
index de54563..0000000
--- a/openflow/usr/include/c++/5/parallel/iterator.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/iterator.h
- * @brief Helper iterator classes for the std::transform() functions.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_ITERATOR_H
-#define _GLIBCXX_PARALLEL_ITERATOR_H 1
-
-#include <parallel/basic_iterator.h>
-#include <bits/stl_pair.h>
-
-namespace __gnu_parallel
-{
-  /** @brief A pair of iterators. The usual iterator operations are
-   *  applied to both child iterators.
-   */
-  template<typename _Iterator1, typename _Iterator2,
-           typename _IteratorCategory>
-    class _IteratorPair : public std::pair<_Iterator1, _Iterator2>
-    {
-    private:
-      typedef std::pair<_Iterator1, _Iterator2> _Base;
-
-    public:
-      typedef _IteratorCategory iterator_category;
-      typedef void value_type;
-
-      typedef std::iterator_traits<_Iterator1> _TraitsType;
-      typedef typename _TraitsType::difference_type difference_type;
-      typedef _IteratorPair* pointer;
-      typedef _IteratorPair& reference;
-
-      _IteratorPair() { }
-
-      _IteratorPair(const _Iterator1& __first, const _Iterator2& __second)
-      : _Base(__first, __second) { }
-
-      // Pre-increment operator.
-      _IteratorPair&
-      operator++()
-      {
-        ++_Base::first;
-        ++_Base::second;
-        return *this;
-      }
-
-      // Post-increment operator.
-      const _IteratorPair
-      operator++(int)
-      { return _IteratorPair(_Base::first++, _Base::second++); }
-
-      // Pre-decrement operator.
-      _IteratorPair&
-      operator--()
-      {
-        --_Base::first;
-        --_Base::second;
-        return *this;
-      }
-
-      // Post-decrement operator.
-      const _IteratorPair
-      operator--(int)
-      { return _IteratorPair(_Base::first--, _Base::second--); }
-
-      // Type conversion.
-      operator _Iterator2() const
-      { return _Base::second; }
-
-      _IteratorPair&
-      operator=(const _IteratorPair& __other)
-      {
-        _Base::first = __other.first;
-        _Base::second = __other.second;
-        return *this;
-      }
-
-      _IteratorPair
-      operator+(difference_type __delta) const
-      { return _IteratorPair(_Base::first + __delta, _Base::second + __delta);
-        }
-
-      difference_type
-      operator-(const _IteratorPair& __other) const
-      { return _Base::first - __other.first; }
-  };
-
-
-  /** @brief A triple of iterators. The usual iterator operations are
-      applied to all three child iterators.
-   */
-  template<typename _Iterator1, typename _Iterator2, typename _Iterator3,
-           typename _IteratorCategory>
-    class _IteratorTriple
-    {
-    public:
-      typedef _IteratorCategory iterator_category;
-      typedef void value_type;
-      typedef typename std::iterator_traits<_Iterator1>::difference_type
-                                                            difference_type;
-      typedef _IteratorTriple* pointer;
-      typedef _IteratorTriple& reference;
-
-      _Iterator1 _M_first;
-      _Iterator2 _M_second;
-      _Iterator3 _M_third;
-
-      _IteratorTriple() { }
-
-      _IteratorTriple(const _Iterator1& __first, const _Iterator2& __second,
-                      const _Iterator3& __third)
-      {
-        _M_first = __first;
-        _M_second = __second;
-        _M_third = __third;
-      }
-
-      // Pre-increment operator.
-      _IteratorTriple&
-      operator++()
-      {
-        ++_M_first;
-        ++_M_second;
-        ++_M_third;
-        return *this;
-      }
-
-      // Post-increment operator.
-      const _IteratorTriple
-      operator++(int)
-      { return _IteratorTriple(_M_first++, _M_second++, _M_third++); }
-
-      // Pre-decrement operator.
-      _IteratorTriple&
-      operator--()
-      {
-        --_M_first;
-        --_M_second;
-        --_M_third;
-        return *this;
-      }
-
-      // Post-decrement operator.
-      const _IteratorTriple
-      operator--(int)
-      { return _IteratorTriple(_M_first--, _M_second--, _M_third--); }
-
-      // Type conversion.
-      operator _Iterator3() const
-      { return _M_third; }
-
-      _IteratorTriple&
-      operator=(const _IteratorTriple& __other)
-      {
-        _M_first = __other._M_first;
-        _M_second = __other._M_second;
-        _M_third = __other._M_third;
-        return *this;
-      }
-
-      _IteratorTriple
-      operator+(difference_type __delta) const
-      { return _IteratorTriple(_M_first + __delta, _M_second + __delta,
-                               _M_third + __delta); }
-
-      difference_type
-      operator-(const _IteratorTriple& __other) const
-      { return _M_first - __other._M_first; }
-  };
-}
-
-#endif /* _GLIBCXX_PARALLEL_ITERATOR_H */
diff --git a/openflow/usr/include/c++/5/parallel/list_partition.h b/openflow/usr/include/c++/5/parallel/list_partition.h
deleted file mode 100644
index 0ee1f9b..0000000
--- a/openflow/usr/include/c++/5/parallel/list_partition.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute __it and/or modify __it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that __it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/list_partition.h
- *  @brief _Functionality to split __sequence referenced by only input
- *  iterators.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Leonor Frias Moya and Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_LIST_PARTITION_H
-#define _GLIBCXX_PARALLEL_LIST_PARTITION_H 1
-
-#include <parallel/parallel.h>
-#include <vector>
-
-namespace __gnu_parallel
-{
-  /** @brief Shrinks and doubles the ranges.
-   *  @param __os_starts Start positions worked on (oversampled).
-   *  @param __count_to_two Counts up to 2.
-   *  @param __range_length Current length of a chunk.
-   *  @param __make_twice Whether the @c __os_starts is allowed to be
-   *  grown or not
-   */
-  template<typename _IIter>
-    void
-    __shrink_and_double(std::vector<_IIter>& __os_starts,
-			size_t& __count_to_two, size_t& __range_length,
-			const bool __make_twice)
-    {
-      ++__count_to_two;
-      if (!__make_twice || __count_to_two < 2)
-        __shrink(__os_starts, __count_to_two, __range_length);
-      else
-        {
-          __os_starts.resize((__os_starts.size() - 1) * 2 + 1);
-          __count_to_two = 0;
-        }
-    }
-
-  /** @brief Combines two ranges into one and thus halves the number of ranges.
-   *  @param __os_starts Start positions worked on (oversampled).
-   *  @param __count_to_two Counts up to 2.
-   *  @param __range_length Current length of a chunk. */
-  template<typename _IIter>
-    void
-    __shrink(std::vector<_IIter>& __os_starts, size_t& __count_to_two,
-	     size_t& __range_length)
-    {
-      for (typename std::vector<_IIter>::size_type __i = 0;
-           __i <= (__os_starts.size() / 2); ++__i)
-        __os_starts[__i] = __os_starts[__i * 2];
-      __range_length *= 2;
-    }
-
-  /** @brief Splits a sequence given by input iterators into parts of
-   * almost equal size
-   *
-   *  The function needs only one pass over the sequence.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __starts Start iterators for the resulting parts, dimension
-   *  @c __num_parts+1. For convenience, @c __starts @c [__num_parts]
-   *  contains the end iterator of the sequence.
-   *  @param __lengths Length of the resulting parts.
-   *  @param __num_parts Number of parts to split the sequence into.
-   *  @param __f Functor to be applied to each element by traversing __it
-   *  @param __oversampling Oversampling factor. If 0, then the
-   *  partitions will differ in at most 
-   *  \f$\sqrt{\mathrm{end} - \mathrm{begin}}\f$ 
-   *  elements. Otherwise, the ratio between the
-   *  longest and the shortest part is bounded by
-   *  \f$1/(\mathrm{oversampling} \cdot \mathrm{num\_parts})\f$
-   *  @return Length of the whole sequence.
-   */
-  template<typename _IIter, typename _FunctorType>
-    size_t
-    list_partition(const _IIter __begin, const _IIter __end,
-                   _IIter* __starts, size_t* __lengths, const int __num_parts,
-                   _FunctorType& __f, int __oversampling = 0)
-    {
-      bool __make_twice = false;
-
-      // The resizing algorithm is chosen according to the oversampling factor.
-      if (__oversampling == 0)
-        {
-          __make_twice = true;
-          __oversampling = 1;
-        }
-
-      std::vector<_IIter> __os_starts(2 * __oversampling * __num_parts + 1);
-
-      __os_starts[0] = __begin;
-      _IIter __prev  = __begin, __it = __begin;
-      size_t __dist_limit = 0, __dist = 0;
-      size_t __cur = 1, __next = 1;
-      size_t __range_length = 1;
-      size_t __count_to_two = 0;
-      while (__it != __end)
-        {
-          __cur = __next;
-          for (; __cur < __os_starts.size() and __it != __end; ++__cur)
-            {
-              for (__dist_limit += __range_length;
-                   __dist < __dist_limit and __it != __end; ++__dist)
-                {
-                  __f(__it);
-                  ++__it;
-                }
-              __os_starts[__cur] = __it;
-            }
-
-          // Must compare for end and not __cur < __os_starts.size() , because
-          // __cur could be == __os_starts.size() as well
-          if (__it == __end)
-            break;
-
-          __shrink_and_double(__os_starts, __count_to_two, __range_length,
-                              __make_twice);
-          __next = __os_starts.size() / 2 + 1;
-        }
-
-      // Calculation of the parts (one must be extracted from __current
-      // because the partition beginning at end, consists only of
-      // itself).
-      size_t __size_part = (__cur - 1) / __num_parts;
-      int __size_greater = static_cast<int>((__cur - 1) % __num_parts);
-      __starts[0] = __os_starts[0];
-
-      size_t __index = 0;
-
-      // Smallest partitions.
-      for (int __i = 1; __i < (__num_parts + 1 - __size_greater); ++__i)
-        {
-          __lengths[__i - 1] =  __size_part * __range_length;
-          __index += __size_part;
-          __starts[__i] = __os_starts[__index];
-        }
-
-      // Biggest partitions.
-      for (int __i = __num_parts + 1 - __size_greater; __i <= __num_parts;
-           ++__i)
-        {
-          __lengths[__i - 1] =  (__size_part+1) * __range_length;
-          __index += (__size_part+1);
-          __starts[__i] = __os_starts[__index];
-        }
-
-      // Correction of the end size (the end iteration has not finished).
-      __lengths[__num_parts - 1] -= (__dist_limit - __dist);
-
-      return __dist;
-    }
-}
-
-#endif /* _GLIBCXX_PARALLEL_LIST_PARTITION_H */
diff --git a/openflow/usr/include/c++/5/parallel/losertree.h b/openflow/usr/include/c++/5/parallel/losertree.h
deleted file mode 100644
index 6526164..0000000
--- a/openflow/usr/include/c++/5/parallel/losertree.h
+++ /dev/null
@@ -1,1063 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/losertree.h
-*  @brief Many generic loser tree variants.
-*  This file is a GNU parallel extension to the Standard C++ Library.
-*/
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_LOSERTREE_H
-#define _GLIBCXX_PARALLEL_LOSERTREE_H 1
-
-#include <bits/stl_algobase.h>
-#include <bits/stl_function.h>
-#include <parallel/features.h>
-#include <parallel/base.h>
-
-namespace __gnu_parallel
-{
-  /**
-   * @brief Guarded loser/tournament tree.
-   *
-   * The smallest element is at the top.
-   *
-   * Guarding is done explicitly through one flag _M_sup per element,
-   * inf is not needed due to a better initialization routine.  This
-   * is a well-performing variant.
-   *
-   * @param _Tp the element type
-   * @param _Compare the comparator to use, defaults to std::less<_Tp>
-   */
-  template<typename _Tp, typename _Compare>
-    class _LoserTreeBase
-    {
-    protected:
-      /** @brief Internal representation of a _LoserTree element. */
-      struct _Loser
-      {
-	/** @brief flag, true iff this is a "maximum" __sentinel. */
-	bool _M_sup;
-	/** @brief __index of the __source __sequence. */
-	int _M_source;
-	/** @brief _M_key of the element in the _LoserTree. */
-	_Tp _M_key;
-      };
-
-      unsigned int _M_ik, _M_k, _M_offset;
-
-      /** log_2{_M_k} */
-      unsigned int _M_log_k;
-
-      /** @brief _LoserTree __elements. */
-      _Loser* _M_losers;
-
-      /** @brief _Compare to use. */
-      _Compare _M_comp;
-
-      /**
-       * @brief State flag that determines whether the _LoserTree is empty.
-       *
-       * Only used for building the _LoserTree.
-       */
-      bool _M_first_insert;
-
-    public:
-      /**
-       * @brief The constructor.
-       *
-       * @param __k The number of sequences to merge.
-       * @param __comp The comparator to use.
-       */
-      _LoserTreeBase(unsigned int __k, _Compare __comp)
-      : _M_comp(__comp)
-      {
-	_M_ik = __k;
-
-	// Compute log_2{_M_k} for the _Loser Tree
-	_M_log_k = __rd_log2(_M_ik - 1) + 1;
-
-	// Next greater power of 2.
-	_M_k = 1 << _M_log_k;
-	_M_offset = _M_k;
-
-	// Avoid default-constructing _M_losers[]._M_key
-	_M_losers = static_cast<_Loser*>(::operator new(2 * _M_k
-							* sizeof(_Loser)));
-	for (unsigned int __i = _M_ik - 1; __i < _M_k; ++__i)
-	  _M_losers[__i + _M_k]._M_sup = true;
-
-	_M_first_insert = true;
-      }
-
-      /**
-       * @brief The destructor.
-       */
-      ~_LoserTreeBase()
-      {
-	for (unsigned int __i = 0; __i < (2 * _M_k); ++__i)
-	  _M_losers[__i].~_Loser();
-	::operator delete(_M_losers);
-      }
-
-      /**
-       * @brief Initializes the sequence "_M_source" with the element "__key".
-       *
-       * @param __key the element to insert
-       * @param __source __index of the __source __sequence
-       * @param __sup flag that determines whether the value to insert is an
-       *   explicit __supremum.
-       */
-      void
-      __insert_start(const _Tp& __key, int __source, bool __sup)
-      {
-	unsigned int __pos = _M_k + __source;
-
-	if (_M_first_insert)
-	  {
-	    // Construct all keys, so we can easily destruct them.
-	    for (unsigned int __i = 0; __i < (2 * _M_k); ++__i)
-	      ::new(&(_M_losers[__i]._M_key)) _Tp(__key);
-	    _M_first_insert = false;
-	  }
-	else
-	  _M_losers[__pos]._M_key = __key;
-
-	_M_losers[__pos]._M_sup = __sup;
-	_M_losers[__pos]._M_source = __source;
-      }
-
-      /**
-       * @return the index of the sequence with the smallest element.
-       */
-      int __get_min_source()
-      { return _M_losers[0]._M_source; }
-    };
-
-    /**
-     * @brief Stable _LoserTree variant.
-     *
-     * Provides the stable implementations of insert_start, __init_winner,
-     * __init and __delete_min_insert.
-     *
-     * Unstable variant is done using partial specialisation below.
-     */
-  template<bool __stable/* default == true */, typename _Tp,
-	   typename _Compare>
-    class _LoserTree
-    : public _LoserTreeBase<_Tp, _Compare>
-    {
-      typedef _LoserTreeBase<_Tp, _Compare> _Base;
-      using _Base::_M_k;
-      using _Base::_M_comp;
-      using _Base::_M_losers;
-      using _Base::_M_first_insert;
-
-    public:
-      _LoserTree(unsigned int __k, _Compare __comp)
-      : _Base::_LoserTreeBase(__k, __comp)
-      { }
-
-      unsigned int
-      __init_winner(unsigned int __root)
-      {
-	if (__root >= _M_k)
-	  return __root;
-	else
-	  {
-	    unsigned int __left = __init_winner(2 * __root);
-	    unsigned int __right = __init_winner(2 * __root + 1);
-	    if (_M_losers[__right]._M_sup
-		|| (!_M_losers[__left]._M_sup
-		    && !_M_comp(_M_losers[__right]._M_key,
-				_M_losers[__left]._M_key)))
-	      {
-		// Left one is less or equal.
-		_M_losers[__root] = _M_losers[__right];
-		return __left;
-	      }
-	    else
-	      {
-		// Right one is less.
-		_M_losers[__root] = _M_losers[__left];
-		return __right;
-	      }
-	  }
-      }
-
-      void __init()
-      { _M_losers[0] = _M_losers[__init_winner(1)]; }
-
-      /**
-       * @brief Delete the smallest element and insert a new element from
-       *   the previously smallest element's sequence.
-       *
-       * This implementation is stable.
-       */
-      // Do not pass a const reference since __key will be used as
-      // local variable.
-      void
-      __delete_min_insert(_Tp __key, bool __sup)
-      {
-        using std::swap;
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top!
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-
-	int __source = _M_losers[0]._M_source;
-	for (unsigned int __pos = (_M_k + __source) / 2; __pos > 0;
-	     __pos /= 2)
-	  {
-	    // The smaller one gets promoted, ties are broken by _M_source.
-	    if ((__sup && (!_M_losers[__pos]._M_sup
-			   || _M_losers[__pos]._M_source < __source))
-		|| (!__sup && !_M_losers[__pos]._M_sup
-		    && ((_M_comp(_M_losers[__pos]._M_key, __key))
-			|| (!_M_comp(__key, _M_losers[__pos]._M_key)
-			    && _M_losers[__pos]._M_source < __source))))
-	      {
-		// The other one is smaller.
-		std::swap(_M_losers[__pos]._M_sup, __sup);
-		std::swap(_M_losers[__pos]._M_source, __source);
-		swap(_M_losers[__pos]._M_key, __key);
-	      }
-	  }
-
-	_M_losers[0]._M_sup = __sup;
-	_M_losers[0]._M_source = __source;
-	_M_losers[0]._M_key = __key;
-      }
-    };
-
-    /**
-     * @brief Unstable _LoserTree variant.
-     *
-     * Stability (non-stable here) is selected with partial specialization.
-     */
-  template<typename _Tp, typename _Compare>
-    class _LoserTree</* __stable == */false, _Tp, _Compare>
-    : public _LoserTreeBase<_Tp, _Compare>
-    {
-      typedef _LoserTreeBase<_Tp, _Compare> _Base;
-      using _Base::_M_log_k;
-      using _Base::_M_k;
-      using _Base::_M_comp;
-      using _Base::_M_losers;
-      using _Base::_M_first_insert;
-
-    public:
-      _LoserTree(unsigned int __k, _Compare __comp)
-      : _Base::_LoserTreeBase(__k, __comp)
-      { }
-
-      /**
-       * Computes the winner of the competition at position "__root".
-       *
-       * Called recursively (starting at 0) to build the initial tree.
-       *
-       * @param __root __index of the "game" to start.
-       */
-      unsigned int
-      __init_winner(unsigned int __root)
-      {
-	if (__root >= _M_k)
-	  return __root;
-	else
-	  {
-	    unsigned int __left = __init_winner(2 * __root);
-	    unsigned int __right = __init_winner(2 * __root + 1);
-	    if (_M_losers[__right]._M_sup
-		|| (!_M_losers[__left]._M_sup
-		    && !_M_comp(_M_losers[__right]._M_key,
-				_M_losers[__left]._M_key)))
-	      {
-		// Left one is less or equal.
-		_M_losers[__root] = _M_losers[__right];
-		return __left;
-	      }
-	    else
-	      {
-		// Right one is less.
-		_M_losers[__root] = _M_losers[__left];
-		return __right;
-	      }
-	  }
-      }
-
-      void
-      __init()
-      { _M_losers[0] = _M_losers[__init_winner(1)]; }
-
-      /**
-       * Delete the _M_key smallest element and insert the element __key
-       * instead.
-       *
-       * @param __key the _M_key to insert
-       * @param __sup true iff __key is an explicitly marked supremum
-       */
-      // Do not pass a const reference since __key will be used as local
-      // variable.
-      void
-      __delete_min_insert(_Tp __key, bool __sup)
-      {
-        using std::swap;
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top!
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-
-	int __source = _M_losers[0]._M_source;
-	for (unsigned int __pos = (_M_k + __source) / 2; __pos > 0;
-	     __pos /= 2)
-	  {
-	    // The smaller one gets promoted.
-	    if (__sup || (!_M_losers[__pos]._M_sup
-			  && _M_comp(_M_losers[__pos]._M_key, __key)))
-	      {
-		// The other one is smaller.
-		std::swap(_M_losers[__pos]._M_sup, __sup);
-		std::swap(_M_losers[__pos]._M_source, __source);
-		swap(_M_losers[__pos]._M_key, __key);
-	      }
-	  }
-
-	_M_losers[0]._M_sup = __sup;
-	_M_losers[0]._M_source = __source;
-	_M_losers[0]._M_key = __key;
-      }
-    };
-
-  /**
-   * @brief Base class of _Loser Tree implementation using pointers.
-   */
-  template<typename _Tp, typename _Compare>
-    class _LoserTreePointerBase
-    {
-    protected:
-      /** @brief Internal representation of _LoserTree __elements. */
-      struct _Loser
-      {
-	bool _M_sup;
-	int _M_source;
-	const _Tp* _M_keyp;
-      };
-
-      unsigned int _M_ik, _M_k, _M_offset;
-      _Loser* _M_losers;
-      _Compare _M_comp;
-
-    public:
-      _LoserTreePointerBase(unsigned int __k,
-			    _Compare __comp = std::less<_Tp>())
-      : _M_comp(__comp)
-      {
-	_M_ik = __k;
-
-	// Next greater power of 2.
-	_M_k = 1 << (__rd_log2(_M_ik - 1) + 1);
-	_M_offset = _M_k;
-	_M_losers = new _Loser[_M_k * 2];
-	for (unsigned int __i = _M_ik - 1; __i < _M_k; __i++)
-	  _M_losers[__i + _M_k]._M_sup = true;
-      }
-
-      ~_LoserTreePointerBase()
-      { delete[] _M_losers; }
-
-      int __get_min_source()
-      { return _M_losers[0]._M_source; }
-
-      void __insert_start(const _Tp& __key, int __source, bool __sup)
-      {
-	unsigned int __pos = _M_k + __source;
-
-	_M_losers[__pos]._M_sup = __sup;
-	_M_losers[__pos]._M_source = __source;
-	_M_losers[__pos]._M_keyp = &__key;
-      }
-    };
-
-  /**
-   * @brief Stable _LoserTree implementation.
-   *
-   * The unstable variant is implemented using partial instantiation below.
-   */
-  template<bool __stable/* default == true */, typename _Tp, typename _Compare>
-    class _LoserTreePointer
-    : public _LoserTreePointerBase<_Tp, _Compare>
-    {
-      typedef _LoserTreePointerBase<_Tp, _Compare> _Base;
-      using _Base::_M_k;
-      using _Base::_M_comp;
-      using _Base::_M_losers;
-
-    public:
-      _LoserTreePointer(unsigned int __k, _Compare __comp = std::less<_Tp>())
-      : _Base::_LoserTreePointerBase(__k, __comp)
-      { }
-
-      unsigned int
-      __init_winner(unsigned int __root)
-      {
-	if (__root >= _M_k)
-	  return __root;
-	else
-	  {
-	    unsigned int __left = __init_winner(2 * __root);
-	    unsigned int __right = __init_winner(2 * __root + 1);
-	    if (_M_losers[__right]._M_sup
-		|| (!_M_losers[__left]._M_sup
-		    && !_M_comp(*_M_losers[__right]._M_keyp,
-				*_M_losers[__left]._M_keyp)))
-	      {
-		// Left one is less or equal.
-		_M_losers[__root] = _M_losers[__right];
-		return __left;
-	      }
-	    else
-	      {
-		// Right one is less.
-		_M_losers[__root] = _M_losers[__left];
-		return __right;
-	      }
-	  }
-      }
-
-      void __init()
-      { _M_losers[0] = _M_losers[__init_winner(1)]; }
-
-      void __delete_min_insert(const _Tp& __key, bool __sup)
-      {
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top!
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-
-	const _Tp* __keyp = &__key;
-	int __source = _M_losers[0]._M_source;
-	for (unsigned int __pos = (_M_k + __source) / 2; __pos > 0;
-	     __pos /= 2)
-	  {
-	    // The smaller one gets promoted, ties are broken by __source.
-	    if ((__sup && (!_M_losers[__pos]._M_sup
-			   || _M_losers[__pos]._M_source < __source))
-		|| (!__sup && !_M_losers[__pos]._M_sup &&
-		    ((_M_comp(*_M_losers[__pos]._M_keyp, *__keyp))
-		     || (!_M_comp(*__keyp, *_M_losers[__pos]._M_keyp)
-			 && _M_losers[__pos]._M_source < __source))))
-	      {
-		// The other one is smaller.
-		std::swap(_M_losers[__pos]._M_sup, __sup);
-		std::swap(_M_losers[__pos]._M_source, __source);
-		std::swap(_M_losers[__pos]._M_keyp, __keyp);
-	      }
-	  }
-
-	_M_losers[0]._M_sup = __sup;
-	_M_losers[0]._M_source = __source;
-	_M_losers[0]._M_keyp = __keyp;
-      }
-    };
-
-  /**
-   * @brief Unstable _LoserTree implementation.
-   *
-   * The stable variant is above.
-   */
-  template<typename _Tp, typename _Compare>
-    class _LoserTreePointer</* __stable == */false, _Tp, _Compare>
-    : public _LoserTreePointerBase<_Tp, _Compare>
-    {
-      typedef _LoserTreePointerBase<_Tp, _Compare> _Base;
-      using _Base::_M_k;
-      using _Base::_M_comp;
-      using _Base::_M_losers;
-
-    public:
-      _LoserTreePointer(unsigned int __k, _Compare __comp = std::less<_Tp>())
-      : _Base::_LoserTreePointerBase(__k, __comp)
-      { }
-
-      unsigned int
-      __init_winner(unsigned int __root)
-      {
-	if (__root >= _M_k)
-	  return __root;
-	else
-	  {
-	    unsigned int __left = __init_winner(2 * __root);
-	    unsigned int __right = __init_winner(2 * __root + 1);
-	    if (_M_losers[__right]._M_sup
-        	|| (!_M_losers[__left]._M_sup
-		    && !_M_comp(*_M_losers[__right]._M_keyp,
-				*_M_losers[__left]._M_keyp)))
-	      {
-		// Left one is less or equal.
-		_M_losers[__root] = _M_losers[__right];
-		return __left;
-	      }
-	    else
-	      {
-		// Right one is less.
-		_M_losers[__root] = _M_losers[__left];
-		return __right;
-	      }
-	  }
-      }
-
-      void __init()
-      { _M_losers[0] = _M_losers[__init_winner(1)]; }
-
-      void __delete_min_insert(const _Tp& __key, bool __sup)
-      {
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top!
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-
-	const _Tp* __keyp = &__key;
-	int __source = _M_losers[0]._M_source;
-	for (unsigned int __pos = (_M_k + __source) / 2; __pos > 0;
-	     __pos /= 2)
-	  {
-	    // The smaller one gets promoted.
-	    if (__sup || (!_M_losers[__pos]._M_sup
-			  && _M_comp(*_M_losers[__pos]._M_keyp, *__keyp)))
-	      {
-		// The other one is smaller.
-		std::swap(_M_losers[__pos]._M_sup, __sup);
-		std::swap(_M_losers[__pos]._M_source, __source);
-		std::swap(_M_losers[__pos]._M_keyp, __keyp);
-	      }
-	  }
-
-	_M_losers[0]._M_sup = __sup;
-	_M_losers[0]._M_source = __source;
-	_M_losers[0]._M_keyp = __keyp;
-      }
-    };
-
-  /** @brief Base class for unguarded _LoserTree implementation.
-   * 
-   * The whole element is copied into the tree structure.
-   *
-   * No guarding is done, therefore not a single input sequence must
-   * run empty.  Unused __sequence heads are marked with a sentinel which
-   * is &gt; all elements that are to be merged.
-   *
-   * This is a very fast variant.
-   */
-  template<typename _Tp, typename _Compare>
-    class _LoserTreeUnguardedBase
-    {
-    protected:
-      struct _Loser
-      {
-	int _M_source;
-	_Tp _M_key;
-      };
-
-      unsigned int _M_ik, _M_k, _M_offset;
-      _Loser* _M_losers;
-      _Compare _M_comp;
-
-    public:
-      _LoserTreeUnguardedBase(unsigned int __k, const _Tp& __sentinel,
-			      _Compare __comp = std::less<_Tp>())
-      : _M_comp(__comp)
-      {
-	_M_ik = __k;
-
-	// Next greater power of 2.
-	_M_k = 1 << (__rd_log2(_M_ik - 1) + 1);
-	_M_offset = _M_k;
-	// Avoid default-constructing _M_losers[]._M_key
-	_M_losers = static_cast<_Loser*>(::operator new(2 * _M_k
-							* sizeof(_Loser)));
-
-        for (unsigned int __i = 0; __i < _M_k; ++__i)
-          {
-	    ::new(&(_M_losers[__i]._M_key)) _Tp(__sentinel);
-	    _M_losers[__i]._M_source = -1;
-	  }
-        for (unsigned int __i = _M_k + _M_ik - 1; __i < (2 * _M_k); ++__i)
-          {
-	    ::new(&(_M_losers[__i]._M_key)) _Tp(__sentinel);
-	    _M_losers[__i]._M_source = -1;
-	  }
-      }
-
-      ~_LoserTreeUnguardedBase()
-      {
-	for (unsigned int __i = 0; __i < (2 * _M_k); ++__i)
-	  _M_losers[__i].~_Loser();
-	::operator delete(_M_losers);
-      }
-
-      int
-      __get_min_source()
-      {
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top!
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-	return _M_losers[0]._M_source;
-      }
-
-      void
-      __insert_start(const _Tp& __key, int __source, bool)
-      {
-	unsigned int __pos = _M_k + __source;
-
-	::new(&(_M_losers[__pos]._M_key)) _Tp(__key);
-	_M_losers[__pos]._M_source = __source;
-      }
-    };
-
-  /**
-   * @brief Stable implementation of unguarded _LoserTree.
-   *
-   * Unstable variant is selected below with partial specialization.
-   */
-  template<bool __stable/* default == true */, typename _Tp, typename _Compare>
-    class _LoserTreeUnguarded
-    : public _LoserTreeUnguardedBase<_Tp, _Compare>
-    {
-      typedef _LoserTreeUnguardedBase<_Tp, _Compare> _Base;
-      using _Base::_M_k;
-      using _Base::_M_comp;
-      using _Base::_M_losers;
-
-  public:
-      _LoserTreeUnguarded(unsigned int __k, const _Tp& __sentinel,
-			  _Compare __comp = std::less<_Tp>())
-      : _Base::_LoserTreeUnguardedBase(__k, __sentinel, __comp)
-      { }
-
-      unsigned int
-      __init_winner(unsigned int __root)
-      {
-	if (__root >= _M_k)
-	  return __root;
-	else
-	  {
-	    unsigned int __left = __init_winner(2 * __root);
-	    unsigned int __right = __init_winner(2 * __root + 1);
-	    if (!_M_comp(_M_losers[__right]._M_key,
-			 _M_losers[__left]._M_key))
-	      {
-		// Left one is less or equal.
-		_M_losers[__root] = _M_losers[__right];
-		return __left;
-	      }
-	    else
-	      {
-		// Right one is less.
-		_M_losers[__root] = _M_losers[__left];
-		return __right;
-	      }
-	  }
-      }
-
-      void
-      __init()
-      {
-	_M_losers[0] = _M_losers[__init_winner(1)];
-
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top at the beginning
-	// (0 sequences!)
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-      }
-
-      // Do not pass a const reference since __key will be used as
-      // local variable.
-      void
-      __delete_min_insert(_Tp __key, bool)
-      {
-        using std::swap;
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top!
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-
-	int __source = _M_losers[0]._M_source;
-	for (unsigned int __pos = (_M_k + __source) / 2; __pos > 0;
-	     __pos /= 2)
-	  {
-	    // The smaller one gets promoted, ties are broken by _M_source.
-	    if (_M_comp(_M_losers[__pos]._M_key, __key)
-        	|| (!_M_comp(__key, _M_losers[__pos]._M_key)
-                    && _M_losers[__pos]._M_source < __source))
-	      {
-		// The other one is smaller.
-		std::swap(_M_losers[__pos]._M_source, __source);
-		swap(_M_losers[__pos]._M_key, __key);
-	      }
-	  }
-
-	_M_losers[0]._M_source = __source;
-	_M_losers[0]._M_key = __key;
-      }
-    };
-
-  /**
-   * @brief Non-Stable implementation of unguarded _LoserTree.
-   *
-   * Stable implementation is above.
-   */
-  template<typename _Tp, typename _Compare>
-    class _LoserTreeUnguarded</* __stable == */false, _Tp, _Compare>
-    : public _LoserTreeUnguardedBase<_Tp, _Compare>
-    {
-      typedef _LoserTreeUnguardedBase<_Tp, _Compare> _Base;
-      using _Base::_M_k;
-      using _Base::_M_comp;
-      using _Base::_M_losers;
-
-    public:
-      _LoserTreeUnguarded(unsigned int __k, const _Tp& __sentinel,
-			  _Compare __comp = std::less<_Tp>())
-      : _Base::_LoserTreeUnguardedBase(__k, __sentinel, __comp)
-      { }
-
-      unsigned int
-      __init_winner(unsigned int __root)
-      {
-	if (__root >= _M_k)
-	  return __root;
-	else
-	  {
-	    unsigned int __left = __init_winner(2 * __root);
-	    unsigned int __right = __init_winner(2 * __root + 1);
-
-#if _GLIBCXX_ASSERTIONS
-	    // If __left one is sentinel then __right one must be, too.
-	    if (_M_losers[__left]._M_source == -1)
-	      _GLIBCXX_PARALLEL_ASSERT(_M_losers[__right]._M_source == -1);
-#endif
-
-	    if (!_M_comp(_M_losers[__right]._M_key,
-			 _M_losers[__left]._M_key))
-	      {
-		// Left one is less or equal.
-		_M_losers[__root] = _M_losers[__right];
-		return __left;
-	      }
-	    else
-	      {
-		// Right one is less.
-		_M_losers[__root] = _M_losers[__left];
-		return __right;
-	      }
-	  }
-      }
-
-      void
-      __init()
-      {
-	_M_losers[0] = _M_losers[__init_winner(1)];
-
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top at the beginning
-	// (0 sequences!)
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-      }
-
-      // Do not pass a const reference since __key will be used as
-      // local variable.
-      void
-      __delete_min_insert(_Tp __key, bool)
-      {
-        using std::swap;
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top!
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-
-	int __source = _M_losers[0]._M_source;
-	for (unsigned int __pos = (_M_k + __source) / 2; __pos > 0;
-	     __pos /= 2)
-	  {
-	    // The smaller one gets promoted.
-	    if (_M_comp(_M_losers[__pos]._M_key, __key))
-	      {
-		// The other one is smaller.
-		std::swap(_M_losers[__pos]._M_source, __source);
-		swap(_M_losers[__pos]._M_key, __key);
-	      }
-	  }
-
-	_M_losers[0]._M_source = __source;
-	_M_losers[0]._M_key = __key;
-      }
-    };
-
-  /** @brief Unguarded loser tree, keeping only pointers to the
-  * elements in the tree structure.
-  *
-  *  No guarding is done, therefore not a single input sequence must
-  *  run empty.  This is a very fast variant.
-  */
-  template<typename _Tp, typename _Compare>
-    class _LoserTreePointerUnguardedBase
-    {
-    protected:
-      struct _Loser
-      {
-	int _M_source;
-	const _Tp* _M_keyp;
-      };
-
-      unsigned int _M_ik, _M_k, _M_offset;
-      _Loser* _M_losers;
-      _Compare _M_comp;
-
-    public:
-
-      _LoserTreePointerUnguardedBase(unsigned int __k, const _Tp& __sentinel,
-				     _Compare __comp = std::less<_Tp>())
-      : _M_comp(__comp)
-      {
-	_M_ik = __k;
-
-	// Next greater power of 2.
-	_M_k = 1 << (__rd_log2(_M_ik - 1) + 1);
-	_M_offset = _M_k;
-	// Avoid default-constructing _M_losers[]._M_key
-	_M_losers = new _Loser[2 * _M_k];
-
-	for (unsigned int __i = _M_k + _M_ik - 1; __i < (2 * _M_k); ++__i)
-	  {
-	    _M_losers[__i]._M_keyp = &__sentinel;
-	    _M_losers[__i]._M_source = -1;
-	  }
-      }
-
-      ~_LoserTreePointerUnguardedBase()
-      { delete[] _M_losers; }
-
-      int
-      __get_min_source()
-      {
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top!
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-	return _M_losers[0]._M_source;
-      }
-
-      void
-      __insert_start(const _Tp& __key, int __source, bool)
-      {
-	unsigned int __pos = _M_k + __source;
-
-	_M_losers[__pos]._M_keyp = &__key;
-	_M_losers[__pos]._M_source = __source;
-      }
-    };
-
-  /**
-   * @brief Stable unguarded _LoserTree variant storing pointers.
-   *
-   * Unstable variant is implemented below using partial specialization.
-   */
-  template<bool __stable/* default == true */, typename _Tp, typename _Compare>
-    class _LoserTreePointerUnguarded
-    : public _LoserTreePointerUnguardedBase<_Tp, _Compare>
-    {
-      typedef _LoserTreePointerUnguardedBase<_Tp, _Compare> _Base;
-      using _Base::_M_k;
-      using _Base::_M_comp;
-      using _Base::_M_losers;
-
-    public:
-      _LoserTreePointerUnguarded(unsigned int __k, const _Tp& __sentinel,
-				 _Compare __comp = std::less<_Tp>())
-      : _Base::_LoserTreePointerUnguardedBase(__k, __sentinel, __comp)
-      { }
-
-      unsigned int
-      __init_winner(unsigned int __root)
-      {
-	if (__root >= _M_k)
-	  return __root;
-	else
-	  {
-	    unsigned int __left = __init_winner(2 * __root);
-	    unsigned int __right = __init_winner(2 * __root + 1);
-	    if (!_M_comp(*_M_losers[__right]._M_keyp,
-			 *_M_losers[__left]._M_keyp))
-	      {
-		// Left one is less or equal.
-		_M_losers[__root] = _M_losers[__right];
-		return __left;
-	      }
-	    else
-	      {
-		// Right one is less.
-		_M_losers[__root] = _M_losers[__left];
-		return __right;
-	      }
-	  }
-      }
-
-      void
-      __init()
-      {
-	_M_losers[0] = _M_losers[__init_winner(1)];
-
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top at the beginning
-	// (0 sequences!)
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-      }
-
-      void
-      __delete_min_insert(const _Tp& __key, bool __sup)
-      {
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top!
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-
-	const _Tp* __keyp = &__key;
-	int __source = _M_losers[0]._M_source;
-	for (unsigned int __pos = (_M_k + __source) / 2; __pos > 0;
-	     __pos /= 2)
-	  {
-	    // The smaller one gets promoted, ties are broken by _M_source.
-	    if (_M_comp(*_M_losers[__pos]._M_keyp, *__keyp)
-		|| (!_M_comp(*__keyp, *_M_losers[__pos]._M_keyp)
-		    && _M_losers[__pos]._M_source < __source))
-	      {
-		// The other one is smaller.
-		std::swap(_M_losers[__pos]._M_source, __source);
-		std::swap(_M_losers[__pos]._M_keyp, __keyp);
-	      }
-	  }
-
-	_M_losers[0]._M_source = __source;
-	_M_losers[0]._M_keyp = __keyp;
-      }
-    };
-
-  /**
-   * @brief Unstable unguarded _LoserTree variant storing pointers.
-   *
-   * Stable variant is above.
-   */
-  template<typename _Tp, typename _Compare>
-    class _LoserTreePointerUnguarded</* __stable == */false, _Tp, _Compare>
-    : public _LoserTreePointerUnguardedBase<_Tp, _Compare>
-    {
-      typedef _LoserTreePointerUnguardedBase<_Tp, _Compare> _Base;
-      using _Base::_M_k;
-      using _Base::_M_comp;
-      using _Base::_M_losers;
-
-  public:
-      _LoserTreePointerUnguarded(unsigned int __k, const _Tp& __sentinel,
-				 _Compare __comp = std::less<_Tp>())
-      : _Base::_LoserTreePointerUnguardedBase(__k, __sentinel, __comp)
-      { }
-
-      unsigned int
-      __init_winner(unsigned int __root)
-      {
-	if (__root >= _M_k)
-	  return __root;
-	else
-	  {
-	    unsigned int __left = __init_winner(2 * __root);
-	    unsigned int __right = __init_winner(2 * __root + 1);
-
-#if _GLIBCXX_ASSERTIONS
-	    // If __left one is sentinel then __right one must be, too.
-	    if (_M_losers[__left]._M_source == -1)
-	      _GLIBCXX_PARALLEL_ASSERT(_M_losers[__right]._M_source == -1);
-#endif
-
-	    if (!_M_comp(*_M_losers[__right]._M_keyp,
-			 *_M_losers[__left]._M_keyp))
-	      {
-		// Left one is less or equal.
-		_M_losers[__root] = _M_losers[__right];
-		return __left;
-	      }
-	    else
-	      {
-		// Right one is less.
-		_M_losers[__root] = _M_losers[__left];
-		return __right;
-	      }
-	  }
-      }
-
-      void
-      __init()
-      {
-	_M_losers[0] = _M_losers[__init_winner(1)];
-
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top at the beginning
-	// (0 sequences!)
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-      }
-
-      void
-      __delete_min_insert(const _Tp& __key, bool __sup)
-      {
-#if _GLIBCXX_ASSERTIONS
-	// no dummy sequence can ever be at the top!
-	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);
-#endif
-
-	const _Tp* __keyp = &__key;
-	int __source = _M_losers[0]._M_source;
-	for (unsigned int __pos = (_M_k + __source) / 2; __pos > 0;
-	     __pos /= 2)
-	  {
-	    // The smaller one gets promoted.
-	    if (_M_comp(*(_M_losers[__pos]._M_keyp), *__keyp))
-	      {
-		// The other one is smaller.
-		std::swap(_M_losers[__pos]._M_source, __source);
-		std::swap(_M_losers[__pos]._M_keyp, __keyp);
-	      }
-	  }
-
-	_M_losers[0]._M_source = __source;
-	_M_losers[0]._M_keyp = __keyp;
-      }
-    };
-} // namespace __gnu_parallel
-
-#endif /* _GLIBCXX_PARALLEL_LOSERTREE_H */
diff --git a/openflow/usr/include/c++/5/parallel/merge.h b/openflow/usr/include/c++/5/parallel/merge.h
deleted file mode 100644
index e6124e7..0000000
--- a/openflow/usr/include/c++/5/parallel/merge.h
+++ /dev/null
@@ -1,251 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/merge.h
- *  @brief Parallel implementation of std::merge().
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_MERGE_H
-#define _GLIBCXX_PARALLEL_MERGE_H 1
-
-#include <parallel/basic_iterator.h>
-#include <bits/stl_algo.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Merge routine being able to merge only the @c __max_length
-   * smallest elements.
-   *
-   * The @c __begin iterators are advanced accordingly, they might not
-   * reach @c __end, in contrast to the usual variant.
-   * @param __begin1 Begin iterator of first sequence.
-   * @param __end1 End iterator of first sequence.
-   * @param __begin2 Begin iterator of second sequence.
-   * @param __end2 End iterator of second sequence.
-   * @param __target Target begin iterator.
-   * @param __max_length Maximum number of elements to merge.
-   * @param __comp Comparator.
-   * @return Output end iterator. */
-  template<typename _RAIter1, typename _RAIter2,
-           typename _OutputIterator, typename _DifferenceTp,
-           typename _Compare>
-    _OutputIterator
-    __merge_advance_usual(_RAIter1& __begin1, _RAIter1 __end1,
-			  _RAIter2& __begin2, _RAIter2 __end2,
-			  _OutputIterator __target,
-			  _DifferenceTp __max_length, _Compare __comp)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      while (__begin1 != __end1 && __begin2 != __end2 && __max_length > 0)
-        {
-          // array1[__i1] < array0[i0]
-          if (__comp(*__begin2, *__begin1))
-            *__target++ = *__begin2++;
-          else
-            *__target++ = *__begin1++;
-          --__max_length;
-        }
-
-      if (__begin1 != __end1)
-        {
-          __target = std::copy(__begin1, __begin1 + __max_length, __target);
-          __begin1 += __max_length;
-        }
-      else
-        {
-          __target = std::copy(__begin2, __begin2 + __max_length, __target);
-          __begin2 += __max_length;
-        }
-      return __target;
-    }
-
-  /** @brief Merge routine being able to merge only the @c __max_length
-   * smallest elements.
-   *
-   * The @c __begin iterators are advanced accordingly, they might not
-   * reach @c __end, in contrast to the usual variant.
-   * Specially designed code should allow the compiler to generate
-   * conditional moves instead of branches.
-   * @param __begin1 Begin iterator of first sequence.
-   * @param __end1 End iterator of first sequence.
-   * @param __begin2 Begin iterator of second sequence.
-   * @param __end2 End iterator of second sequence.
-   * @param __target Target begin iterator.
-   * @param __max_length Maximum number of elements to merge.
-   * @param __comp Comparator.
-   * @return Output end iterator. */
-  template<typename _RAIter1, typename _RAIter2,
-           typename _OutputIterator, typename _DifferenceTp,
-           typename _Compare>
-    _OutputIterator
-    __merge_advance_movc(_RAIter1& __begin1, _RAIter1 __end1,
-			 _RAIter2& __begin2, _RAIter2 __end2,
-			 _OutputIterator __target,
-			 _DifferenceTp __max_length, _Compare __comp)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      typedef typename std::iterator_traits<_RAIter1>::value_type
-        _ValueType1;
-      typedef typename std::iterator_traits<_RAIter2>::value_type
-        _ValueType2;
-
-#if _GLIBCXX_ASSERTIONS
-      _GLIBCXX_PARALLEL_ASSERT(__max_length >= 0);
-#endif
-
-      while (__begin1 != __end1 && __begin2 != __end2 && __max_length > 0)
-        {
-          _RAIter1 __next1 = __begin1 + 1;
-          _RAIter2 __next2 = __begin2 + 1;
-          _ValueType1 __element1 = *__begin1;
-          _ValueType2 __element2 = *__begin2;
-
-          if (__comp(__element2, __element1))
-            {
-              __element1 = __element2;
-              __begin2 = __next2;
-            }
-          else
-            __begin1 = __next1;
-
-          *__target = __element1;
-
-          ++__target;
-          --__max_length;
-        }
-      if (__begin1 != __end1)
-        {
-          __target = std::copy(__begin1, __begin1 + __max_length, __target);
-          __begin1 += __max_length;
-        }
-      else
-        {
-          __target = std::copy(__begin2, __begin2 + __max_length, __target);
-          __begin2 += __max_length;
-        }
-      return __target;
-    }
-
-  /** @brief Merge routine being able to merge only the @c __max_length
-   * smallest elements.
-   *
-   *  The @c __begin iterators are advanced accordingly, they might not
-   *  reach @c __end, in contrast to the usual variant.
-   *  Static switch on whether to use the conditional-move variant.
-   *  @param __begin1 Begin iterator of first sequence.
-   *  @param __end1 End iterator of first sequence.
-   *  @param __begin2 Begin iterator of second sequence.
-   *  @param __end2 End iterator of second sequence.
-   *  @param __target Target begin iterator.
-   *  @param __max_length Maximum number of elements to merge.
-   *  @param __comp Comparator.
-   *  @return Output end iterator. */
-  template<typename _RAIter1, typename _RAIter2,
-           typename _OutputIterator, typename _DifferenceTp,
-           typename _Compare>
-    inline _OutputIterator
-    __merge_advance(_RAIter1& __begin1, _RAIter1 __end1,
-		    _RAIter2& __begin2, _RAIter2 __end2,
-		    _OutputIterator __target, _DifferenceTp __max_length,
-		    _Compare __comp)
-    {
-      _GLIBCXX_CALL(__max_length)
-
-      return __merge_advance_movc(__begin1, __end1, __begin2, __end2,
-				  __target, __max_length, __comp);
-    }
-
-  /** @brief Merge routine fallback to sequential in case the
-      iterators of the two input sequences are of different type.
-      *  @param __begin1 Begin iterator of first sequence.
-      *  @param __end1 End iterator of first sequence.
-      *  @param __begin2 Begin iterator of second sequence.
-      *  @param __end2 End iterator of second sequence.
-      *  @param __target Target begin iterator.
-      *  @param __max_length Maximum number of elements to merge.
-      *  @param __comp Comparator.
-      *  @return Output end iterator. */
-  template<typename _RAIter1, typename _RAIter2,
-           typename _RAIter3, typename _Compare>
-    inline _RAIter3
-    __parallel_merge_advance(_RAIter1& __begin1, _RAIter1 __end1,
-			     _RAIter2& __begin2,
-			     // different iterators, parallel implementation
-			     // not available
-			     _RAIter2 __end2, _RAIter3 __target, typename
-			     std::iterator_traits<_RAIter1>::
-			     difference_type __max_length, _Compare __comp)
-    { return __merge_advance(__begin1, __end1, __begin2, __end2, __target,
-			     __max_length, __comp); }
-
-  /** @brief Parallel merge routine being able to merge only the @c
-   * __max_length smallest elements.
-   *
-   *  The @c __begin iterators are advanced accordingly, they might not
-   *  reach @c __end, in contrast to the usual variant.
-   *  The functionality is projected onto parallel_multiway_merge.
-   *  @param __begin1 Begin iterator of first sequence.
-   *  @param __end1 End iterator of first sequence.
-   *  @param __begin2 Begin iterator of second sequence.
-   *  @param __end2 End iterator of second sequence.
-   *  @param __target Target begin iterator.
-   *  @param __max_length Maximum number of elements to merge.
-   *  @param __comp Comparator.
-   *  @return Output end iterator.
-   */
-  template<typename _RAIter1, typename _RAIter3,
-           typename _Compare>
-    inline _RAIter3
-    __parallel_merge_advance(_RAIter1& __begin1, _RAIter1 __end1,
-			     _RAIter1& __begin2, _RAIter1 __end2,
-			     _RAIter3 __target, typename
-			     std::iterator_traits<_RAIter1>::
-			     difference_type __max_length, _Compare __comp)
-    {
-      typedef typename
-          std::iterator_traits<_RAIter1>::value_type _ValueType;
-      typedef typename std::iterator_traits<_RAIter1>::
-        difference_type _DifferenceType1 /* == difference_type2 */;
-      typedef typename std::iterator_traits<_RAIter3>::
-        difference_type _DifferenceType3;
-      typedef typename std::pair<_RAIter1, _RAIter1>
-        _IteratorPair;
-
-      _IteratorPair __seqs[2] = { std::make_pair(__begin1, __end1),
-				  std::make_pair(__begin2, __end2) };
-      _RAIter3 __target_end = parallel_multiway_merge
-	< /* __stable = */ true, /* __sentinels = */ false>
-	(__seqs, __seqs + 2, __target, multiway_merge_exact_splitting
-	 < /* __stable = */ true, _IteratorPair*,
-	 _Compare, _DifferenceType1>, __max_length, __comp,
-	 omp_get_max_threads());
-
-      return __target_end;
-    }
-}       //namespace __gnu_parallel
-
-#endif /* _GLIBCXX_PARALLEL_MERGE_H */
diff --git a/openflow/usr/include/c++/5/parallel/multiseq_selection.h b/openflow/usr/include/c++/5/parallel/multiseq_selection.h
deleted file mode 100644
index b9bb5ed..0000000
--- a/openflow/usr/include/c++/5/parallel/multiseq_selection.h
+++ /dev/null
@@ -1,644 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/multiseq_selection.h
- *  @brief Functions to find elements of a certain global __rank in
- *  multiple sorted sequences.  Also serves for splitting such
- *  sequence sets.
- *
- *  The algorithm description can be found in 
- *
- *  P. J. Varman, S. D. Scheufler, B. R. Iyer, and G. R. Ricard.
- *  Merging Multiple Lists on Hierarchical-Memory Multiprocessors.
- *  Journal of Parallel and Distributed Computing, 12(2):171–177, 1991.
- *
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_MULTISEQ_SELECTION_H
-#define _GLIBCXX_PARALLEL_MULTISEQ_SELECTION_H 1
-
-#include <vector>
-#include <queue>
-
-#include <bits/stl_algo.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Compare __a pair of types lexicographically, ascending. */
-  template<typename _T1, typename _T2, typename _Compare>
-    class _Lexicographic
-    : public std::binary_function<std::pair<_T1, _T2>,
-				  std::pair<_T1, _T2>, bool>
-    {
-    private:
-      _Compare& _M_comp;
-
-    public:
-      _Lexicographic(_Compare& __comp) : _M_comp(__comp) { }
-
-      bool
-      operator()(const std::pair<_T1, _T2>& __p1,
-                 const std::pair<_T1, _T2>& __p2) const
-      {
-        if (_M_comp(__p1.first, __p2.first))
-          return true;
-
-        if (_M_comp(__p2.first, __p1.first))
-          return false;
-
-        // Firsts are equal.
-        return __p1.second < __p2.second;
-      }
-    };
-
-  /** @brief Compare __a pair of types lexicographically, descending. */
-  template<typename _T1, typename _T2, typename _Compare>
-    class _LexicographicReverse : public std::binary_function<_T1, _T2, bool>
-    {
-    private:
-      _Compare& _M_comp;
-
-    public:
-      _LexicographicReverse(_Compare& __comp) : _M_comp(__comp) { }
-
-      bool
-      operator()(const std::pair<_T1, _T2>& __p1,
-                 const std::pair<_T1, _T2>& __p2) const
-      {
-        if (_M_comp(__p2.first, __p1.first))
-          return true;
-
-        if (_M_comp(__p1.first, __p2.first))
-          return false;
-
-        // Firsts are equal.
-        return __p2.second < __p1.second;
-      }
-    };
-
-  /** 
-   *  @brief Splits several sorted sequences at a certain global __rank,
-   *  resulting in a splitting point for each sequence.
-   *  The sequences are passed via a sequence of random-access
-   *  iterator pairs, none of the sequences may be empty.  If there
-   *  are several equal elements across the split, the ones on the
-   *  __left side will be chosen from sequences with smaller number.
-   *  @param __begin_seqs Begin of the sequence of iterator pairs.
-   *  @param __end_seqs End of the sequence of iterator pairs.
-   *  @param __rank The global rank to partition at.
-   *  @param __begin_offsets A random-access __sequence __begin where the
-   *  __result will be stored in. Each element of the sequence is an
-   *  iterator that points to the first element on the greater part of
-   *  the respective __sequence.
-   *  @param __comp The ordering functor, defaults to std::less<_Tp>. 
-   */
-  template<typename _RanSeqs, typename _RankType, typename _RankIterator,
-            typename _Compare>
-    void
-    multiseq_partition(_RanSeqs __begin_seqs, _RanSeqs __end_seqs,
-                       _RankType __rank,
-                       _RankIterator __begin_offsets,
-                       _Compare __comp = std::less<
-                       typename std::iterator_traits<typename
-                       std::iterator_traits<_RanSeqs>::value_type::
-                       first_type>::value_type>()) // std::less<_Tp>
-    {
-      _GLIBCXX_CALL(__end_seqs - __begin_seqs)
-
-      typedef typename std::iterator_traits<_RanSeqs>::value_type::first_type
-        _It;
-      typedef typename std::iterator_traits<_RanSeqs>::difference_type
-        _SeqNumber;
-      typedef typename std::iterator_traits<_It>::difference_type
-               _DifferenceType;
-      typedef typename std::iterator_traits<_It>::value_type _ValueType;
-
-      _Lexicographic<_ValueType, _SeqNumber, _Compare> __lcomp(__comp);
-      _LexicographicReverse<_ValueType, _SeqNumber, _Compare> __lrcomp(__comp);
-
-      // Number of sequences, number of elements in total (possibly
-      // including padding).
-      _DifferenceType __m = std::distance(__begin_seqs, __end_seqs), __nn = 0,
-                      __nmax, __n, __r;
-
-      for (_SeqNumber __i = 0; __i < __m; __i++)
-        {
-          __nn += std::distance(__begin_seqs[__i].first,
-                               __begin_seqs[__i].second);
-          _GLIBCXX_PARALLEL_ASSERT(
-            std::distance(__begin_seqs[__i].first,
-                          __begin_seqs[__i].second) > 0);
-        }
-
-      if (__rank == __nn)
-        {
-          for (_SeqNumber __i = 0; __i < __m; __i++)
-            __begin_offsets[__i] = __begin_seqs[__i].second; // Very end.
-          // Return __m - 1;
-          return;
-        }
-
-      _GLIBCXX_PARALLEL_ASSERT(__m != 0);
-      _GLIBCXX_PARALLEL_ASSERT(__nn != 0);
-      _GLIBCXX_PARALLEL_ASSERT(__rank >= 0);
-      _GLIBCXX_PARALLEL_ASSERT(__rank < __nn);
-
-      _DifferenceType* __ns = new _DifferenceType[__m];
-      _DifferenceType* __a = new _DifferenceType[__m];
-      _DifferenceType* __b = new _DifferenceType[__m];
-      _DifferenceType __l;
-
-      __ns[0] = std::distance(__begin_seqs[0].first, __begin_seqs[0].second);
-      __nmax = __ns[0];
-      for (_SeqNumber __i = 0; __i < __m; __i++)
-        {
-          __ns[__i] = std::distance(__begin_seqs[__i].first,
-                                    __begin_seqs[__i].second);
-          __nmax = std::max(__nmax, __ns[__i]);
-        }
-
-      __r = __rd_log2(__nmax) + 1;
-
-      // Pad all lists to this length, at least as long as any ns[__i],
-      // equality iff __nmax = 2^__k - 1.
-      __l = (1ULL << __r) - 1;
-
-      for (_SeqNumber __i = 0; __i < __m; __i++)
-        {
-          __a[__i] = 0;
-          __b[__i] = __l;
-        }
-      __n = __l / 2;
-
-      // Invariants:
-      // 0 <= __a[__i] <= __ns[__i], 0 <= __b[__i] <= __l
-
-#define __S(__i) (__begin_seqs[__i].first)
-
-      // Initial partition.
-      std::vector<std::pair<_ValueType, _SeqNumber> > __sample;
-
-      for (_SeqNumber __i = 0; __i < __m; __i++)
-        if (__n < __ns[__i])    //__sequence long enough
-          __sample.push_back(std::make_pair(__S(__i)[__n], __i));
-      __gnu_sequential::sort(__sample.begin(), __sample.end(), __lcomp);
-
-      for (_SeqNumber __i = 0; __i < __m; __i++)       //conceptual infinity
-        if (__n >= __ns[__i])   //__sequence too short, conceptual infinity
-          __sample.push_back(
-            std::make_pair(__S(__i)[0] /*__dummy element*/, __i));
-
-      _DifferenceType __localrank = __rank / __l;
-
-      _SeqNumber __j;
-      for (__j = 0;
-           __j < __localrank && ((__n + 1) <= __ns[__sample[__j].second]);
-           ++__j)
-        __a[__sample[__j].second] += __n + 1;
-      for (; __j < __m; __j++)
-        __b[__sample[__j].second] -= __n + 1;
-      
-      // Further refinement.
-      while (__n > 0)
-        {
-          __n /= 2;
-
-          _SeqNumber __lmax_seq = -1;  // to avoid warning
-          const _ValueType* __lmax = 0; // impossible to avoid the warning?
-          for (_SeqNumber __i = 0; __i < __m; __i++)
-            {
-              if (__a[__i] > 0)
-                {
-                  if (!__lmax)
-                    {
-                      __lmax = &(__S(__i)[__a[__i] - 1]);
-                      __lmax_seq = __i;
-                    }
-                  else
-                    {
-                      // Max, favor rear sequences.
-                      if (!__comp(__S(__i)[__a[__i] - 1], *__lmax))
-                        {
-                          __lmax = &(__S(__i)[__a[__i] - 1]);
-                          __lmax_seq = __i;
-                        }
-                    }
-                }
-            }
-
-          _SeqNumber __i;
-          for (__i = 0; __i < __m; __i++)
-            {
-              _DifferenceType __middle = (__b[__i] + __a[__i]) / 2;
-              if (__lmax && __middle < __ns[__i] &&
-                  __lcomp(std::make_pair(__S(__i)[__middle], __i),
-                        std::make_pair(*__lmax, __lmax_seq)))
-                __a[__i] = std::min(__a[__i] + __n + 1, __ns[__i]);
-              else
-                __b[__i] -= __n + 1;
-            }
-
-          _DifferenceType __leftsize = 0;
-          for (_SeqNumber __i = 0; __i < __m; __i++)
-              __leftsize += __a[__i] / (__n + 1);
-
-          _DifferenceType __skew = __rank / (__n + 1) - __leftsize;
-
-          if (__skew > 0)
-            {
-              // Move to the left, find smallest.
-              std::priority_queue<std::pair<_ValueType, _SeqNumber>,
-                std::vector<std::pair<_ValueType, _SeqNumber> >,
-                _LexicographicReverse<_ValueType, _SeqNumber, _Compare> >
-                __pq(__lrcomp);
-              
-              for (_SeqNumber __i = 0; __i < __m; __i++)
-                if (__b[__i] < __ns[__i])
-                  __pq.push(std::make_pair(__S(__i)[__b[__i]], __i));
-
-              for (; __skew != 0 && !__pq.empty(); --__skew)
-                {
-                  _SeqNumber __source = __pq.top().second;
-                  __pq.pop();
-
-                  __a[__source]
-                      = std::min(__a[__source] + __n + 1, __ns[__source]);
-                  __b[__source] += __n + 1;
-
-                  if (__b[__source] < __ns[__source])
-                    __pq.push(
-                      std::make_pair(__S(__source)[__b[__source]], __source));
-                }
-            }
-          else if (__skew < 0)
-            {
-              // Move to the right, find greatest.
-              std::priority_queue<std::pair<_ValueType, _SeqNumber>,
-                std::vector<std::pair<_ValueType, _SeqNumber> >,
-                _Lexicographic<_ValueType, _SeqNumber, _Compare> >
-                  __pq(__lcomp);
-
-              for (_SeqNumber __i = 0; __i < __m; __i++)
-                if (__a[__i] > 0)
-                  __pq.push(std::make_pair(__S(__i)[__a[__i] - 1], __i));
-
-              for (; __skew != 0; ++__skew)
-                {
-                  _SeqNumber __source = __pq.top().second;
-                  __pq.pop();
-
-                  __a[__source] -= __n + 1;
-                  __b[__source] -= __n + 1;
-
-                  if (__a[__source] > 0)
-                    __pq.push(std::make_pair(
-                        __S(__source)[__a[__source] - 1], __source));
-                }
-            }
-        }
-
-      // Postconditions:
-      // __a[__i] == __b[__i] in most cases, except when __a[__i] has been
-      // clamped because of having reached the boundary
-
-      // Now return the result, calculate the offset.
-
-      // Compare the keys on both edges of the border.
-
-      // Maximum of left edge, minimum of right edge.
-      _ValueType* __maxleft = 0;
-      _ValueType* __minright = 0;
-      for (_SeqNumber __i = 0; __i < __m; __i++)
-        {
-          if (__a[__i] > 0)
-            {
-              if (!__maxleft)
-                __maxleft = &(__S(__i)[__a[__i] - 1]);
-              else
-                {
-                  // Max, favor rear sequences.
-                  if (!__comp(__S(__i)[__a[__i] - 1], *__maxleft))
-                    __maxleft = &(__S(__i)[__a[__i] - 1]);
-                }
-            }
-          if (__b[__i] < __ns[__i])
-            {
-              if (!__minright)
-                __minright = &(__S(__i)[__b[__i]]);
-              else
-                {
-                  // Min, favor fore sequences.
-                  if (__comp(__S(__i)[__b[__i]], *__minright))
-                    __minright = &(__S(__i)[__b[__i]]);
-                }
-            }
-        }
-
-      _SeqNumber __seq = 0;
-      for (_SeqNumber __i = 0; __i < __m; __i++)
-        __begin_offsets[__i] = __S(__i) + __a[__i];
-
-      delete[] __ns;
-      delete[] __a;
-      delete[] __b;
-    }
-
-
-  /** 
-   *  @brief Selects the element at a certain global __rank from several
-   *  sorted sequences.
-   *
-   *  The sequences are passed via a sequence of random-access
-   *  iterator pairs, none of the sequences may be empty.
-   *  @param __begin_seqs Begin of the sequence of iterator pairs.
-   *  @param __end_seqs End of the sequence of iterator pairs.
-   *  @param __rank The global rank to partition at.
-   *  @param __offset The rank of the selected element in the global
-   *  subsequence of elements equal to the selected element. If the
-   *  selected element is unique, this number is 0.
-   *  @param __comp The ordering functor, defaults to std::less. 
-   */
-  template<typename _Tp, typename _RanSeqs, typename _RankType,
-           typename _Compare>
-    _Tp
-    multiseq_selection(_RanSeqs __begin_seqs, _RanSeqs __end_seqs,
-                       _RankType __rank,
-                       _RankType& __offset, _Compare __comp = std::less<_Tp>())
-    {
-      _GLIBCXX_CALL(__end_seqs - __begin_seqs)
-
-      typedef typename std::iterator_traits<_RanSeqs>::value_type::first_type
-        _It;
-      typedef typename std::iterator_traits<_RanSeqs>::difference_type
-        _SeqNumber;
-      typedef typename std::iterator_traits<_It>::difference_type
-        _DifferenceType;
-
-      _Lexicographic<_Tp, _SeqNumber, _Compare> __lcomp(__comp);
-      _LexicographicReverse<_Tp, _SeqNumber, _Compare> __lrcomp(__comp);
-
-      // Number of sequences, number of elements in total (possibly
-      // including padding).
-      _DifferenceType __m = std::distance(__begin_seqs, __end_seqs);
-      _DifferenceType __nn = 0;
-      _DifferenceType __nmax, __n, __r;
-
-      for (_SeqNumber __i = 0; __i < __m; __i++)
-        __nn += std::distance(__begin_seqs[__i].first,
-			      __begin_seqs[__i].second);
-
-      if (__m == 0 || __nn == 0 || __rank < 0 || __rank >= __nn)
-        {
-          // result undefined if there is no data or __rank is outside bounds
-          throw std::exception();
-        }
-
-
-      _DifferenceType* __ns = new _DifferenceType[__m];
-      _DifferenceType* __a = new _DifferenceType[__m];
-      _DifferenceType* __b = new _DifferenceType[__m];
-      _DifferenceType __l;
-
-      __ns[0] = std::distance(__begin_seqs[0].first, __begin_seqs[0].second);
-      __nmax = __ns[0];
-      for (_SeqNumber __i = 0; __i < __m; ++__i)
-        {
-          __ns[__i] = std::distance(__begin_seqs[__i].first,
-                                    __begin_seqs[__i].second);
-          __nmax = std::max(__nmax, __ns[__i]);
-        }
-
-      __r = __rd_log2(__nmax) + 1;
-
-      // Pad all lists to this length, at least as long as any ns[__i],
-      // equality iff __nmax = 2^__k - 1
-      __l = __round_up_to_pow2(__r) - 1;
-
-      for (_SeqNumber __i = 0; __i < __m; ++__i)
-        {
-          __a[__i] = 0;
-          __b[__i] = __l;
-        }
-      __n = __l / 2;
-
-      // Invariants:
-      // 0 <= __a[__i] <= __ns[__i], 0 <= __b[__i] <= __l
-
-#define __S(__i) (__begin_seqs[__i].first)
-
-      // Initial partition.
-      std::vector<std::pair<_Tp, _SeqNumber> > __sample;
-
-      for (_SeqNumber __i = 0; __i < __m; __i++)
-        if (__n < __ns[__i])
-          __sample.push_back(std::make_pair(__S(__i)[__n], __i));
-      __gnu_sequential::sort(__sample.begin(), __sample.end(),
-                             __lcomp, sequential_tag());
-
-      // Conceptual infinity.
-      for (_SeqNumber __i = 0; __i < __m; __i++)
-        if (__n >= __ns[__i])
-          __sample.push_back(
-            std::make_pair(__S(__i)[0] /*__dummy element*/, __i));
-
-      _DifferenceType __localrank = __rank / __l;
-
-      _SeqNumber __j;
-      for (__j = 0;
-           __j < __localrank && ((__n + 1) <= __ns[__sample[__j].second]);
-           ++__j)
-        __a[__sample[__j].second] += __n + 1;
-      for (; __j < __m; ++__j)
-        __b[__sample[__j].second] -= __n + 1;
-
-      // Further refinement.
-      while (__n > 0)
-        {
-          __n /= 2;
-
-          const _Tp* __lmax = 0;
-          for (_SeqNumber __i = 0; __i < __m; ++__i)
-            {
-              if (__a[__i] > 0)
-                {
-                  if (!__lmax)
-                    __lmax = &(__S(__i)[__a[__i] - 1]);
-                  else
-                    {
-                      if (__comp(*__lmax, __S(__i)[__a[__i] - 1]))      //max
-                        __lmax = &(__S(__i)[__a[__i] - 1]);
-                    }
-                }
-            }
-
-          _SeqNumber __i;
-          for (__i = 0; __i < __m; __i++)
-            {
-              _DifferenceType __middle = (__b[__i] + __a[__i]) / 2;
-              if (__lmax && __middle < __ns[__i]
-                  && __comp(__S(__i)[__middle], *__lmax))
-                __a[__i] = std::min(__a[__i] + __n + 1, __ns[__i]);
-              else
-                __b[__i] -= __n + 1;
-            }
-
-          _DifferenceType __leftsize = 0;
-          for (_SeqNumber __i = 0; __i < __m; ++__i)
-              __leftsize += __a[__i] / (__n + 1);
-
-          _DifferenceType __skew = __rank / (__n + 1) - __leftsize;
-
-          if (__skew > 0)
-            {
-              // Move to the left, find smallest.
-              std::priority_queue<std::pair<_Tp, _SeqNumber>,
-                std::vector<std::pair<_Tp, _SeqNumber> >,
-                _LexicographicReverse<_Tp, _SeqNumber, _Compare> >
-                  __pq(__lrcomp);
-
-              for (_SeqNumber __i = 0; __i < __m; ++__i)
-                if (__b[__i] < __ns[__i])
-                  __pq.push(std::make_pair(__S(__i)[__b[__i]], __i));
-
-              for (; __skew != 0 && !__pq.empty(); --__skew)
-                {
-                  _SeqNumber __source = __pq.top().second;
-                  __pq.pop();
-
-                  __a[__source]
-                      = std::min(__a[__source] + __n + 1, __ns[__source]);
-                  __b[__source] += __n + 1;
-
-                  if (__b[__source] < __ns[__source])
-                    __pq.push(
-                      std::make_pair(__S(__source)[__b[__source]], __source));
-                }
-            }
-          else if (__skew < 0)
-            {
-              // Move to the right, find greatest.
-              std::priority_queue<std::pair<_Tp, _SeqNumber>,
-                std::vector<std::pair<_Tp, _SeqNumber> >,
-                _Lexicographic<_Tp, _SeqNumber, _Compare> > __pq(__lcomp);
-
-              for (_SeqNumber __i = 0; __i < __m; ++__i)
-                if (__a[__i] > 0)
-                  __pq.push(std::make_pair(__S(__i)[__a[__i] - 1], __i));
-
-              for (; __skew != 0; ++__skew)
-                {
-                  _SeqNumber __source = __pq.top().second;
-                  __pq.pop();
-
-                  __a[__source] -= __n + 1;
-                  __b[__source] -= __n + 1;
-
-                  if (__a[__source] > 0)
-                    __pq.push(std::make_pair(
-                        __S(__source)[__a[__source] - 1], __source));
-                }
-            }
-        }
-
-      // Postconditions:
-      // __a[__i] == __b[__i] in most cases, except when __a[__i] has been
-      // clamped because of having reached the boundary
-
-      // Now return the result, calculate the offset.
-
-      // Compare the keys on both edges of the border.
-
-      // Maximum of left edge, minimum of right edge.
-      bool __maxleftset = false, __minrightset = false;
-
-      // Impossible to avoid the warning?
-      _Tp __maxleft, __minright;
-      for (_SeqNumber __i = 0; __i < __m; ++__i)
-        {
-          if (__a[__i] > 0)
-            {
-              if (!__maxleftset)
-                {
-                  __maxleft = __S(__i)[__a[__i] - 1];
-                  __maxleftset = true;
-                }
-              else
-                {
-                  // Max.
-                  if (__comp(__maxleft, __S(__i)[__a[__i] - 1]))
-                    __maxleft = __S(__i)[__a[__i] - 1];
-                }
-            }
-          if (__b[__i] < __ns[__i])
-            {
-              if (!__minrightset)
-                {
-                  __minright = __S(__i)[__b[__i]];
-                  __minrightset = true;
-                }
-              else
-                {
-                  // Min.
-                  if (__comp(__S(__i)[__b[__i]], __minright))
-                    __minright = __S(__i)[__b[__i]];
-                }
-            }
-      }
-
-      // Minright is the __splitter, in any case.
-
-      if (!__maxleftset || __comp(__minright, __maxleft))
-        {
-          // Good luck, everything is split unambiguously.
-          __offset = 0;
-        }
-      else
-        {
-          // We have to calculate an offset.
-          __offset = 0;
-
-          for (_SeqNumber __i = 0; __i < __m; ++__i)
-            {
-              _DifferenceType lb
-                = std::lower_bound(__S(__i), __S(__i) + __ns[__i],
-                                   __minright,
-                                   __comp) - __S(__i);
-              __offset += __a[__i] - lb;
-            }
-        }
-
-      delete[] __ns;
-      delete[] __a;
-      delete[] __b;
-
-      return __minright;
-    }
-}
-
-#undef __S
-
-#endif /* _GLIBCXX_PARALLEL_MULTISEQ_SELECTION_H */
diff --git a/openflow/usr/include/c++/5/parallel/multiway_merge.h b/openflow/usr/include/c++/5/parallel/multiway_merge.h
deleted file mode 100644
index 08255d3..0000000
--- a/openflow/usr/include/c++/5/parallel/multiway_merge.h
+++ /dev/null
@@ -1,2072 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/multiway_merge.h
-*  @brief Implementation of sequential and parallel multiway merge.
-*
-*  Explanations on the high-speed merging routines in the appendix of
-*
-*  P. Sanders.
-*  Fast priority queues for cached memory.
-*  ACM Journal of Experimental Algorithmics, 5, 2000.
-*
-*  This file is a GNU parallel extension to the Standard C++ Library.
-*/
-
-// Written by Johannes Singler and Manuel Holtgrewe.
-
-#ifndef _GLIBCXX_PARALLEL_MULTIWAY_MERGE_H
-#define _GLIBCXX_PARALLEL_MULTIWAY_MERGE_H
-
-#include <vector>
-
-#include <bits/stl_algo.h>
-#include <parallel/features.h>
-#include <parallel/parallel.h>
-#include <parallel/losertree.h>
-#include <parallel/multiseq_selection.h>
-#if _GLIBCXX_ASSERTIONS
-#include <parallel/checkers.h>
-#endif
-
-/** @brief Length of a sequence described by a pair of iterators. */
-#define _GLIBCXX_PARALLEL_LENGTH(__s) ((__s).second - (__s).first)
-
-namespace __gnu_parallel
-{
-  template<typename _RAIter1, typename _RAIter2, typename _OutputIterator,
-	   typename _DifferenceTp, typename _Compare>
-    _OutputIterator
-    __merge_advance(_RAIter1&, _RAIter1, _RAIter2&, _RAIter2,
-		    _OutputIterator, _DifferenceTp, _Compare);
-
-  /** @brief _Iterator wrapper supporting an implicit supremum at the end
-   *         of the sequence, dominating all comparisons.
-   *
-   * The implicit supremum comes with a performance cost.
-   *
-   * Deriving from _RAIter is not possible since
-   * _RAIter need not be a class.
-   */
-  template<typename _RAIter, typename _Compare>
-    class _GuardedIterator
-    {
-    private:
-      /** @brief Current iterator __position. */
-      _RAIter _M_current;
-
-      /** @brief End iterator of the sequence. */
-      _RAIter _M_end;
-
-      /** @brief _Compare. */
-      _Compare& __comp;
-
-    public:
-      /** @brief Constructor. Sets iterator to beginning of sequence.
-      *  @param __begin Begin iterator of sequence.
-      *  @param __end End iterator of sequence.
-      *  @param __comp Comparator provided for associated overloaded
-      *  compare operators. */
-      _GuardedIterator(_RAIter __begin, _RAIter __end, _Compare& __comp)
-      : _M_current(__begin), _M_end(__end), __comp(__comp)
-      { }
-
-      /** @brief Pre-increment operator.
-      *  @return This. */
-      _GuardedIterator<_RAIter, _Compare>&
-      operator++()
-      {
-	++_M_current;
-	return *this;
-      }
-
-      /** @brief Dereference operator.
-      *  @return Referenced element. */
-      typename std::iterator_traits<_RAIter>::value_type&
-      operator*()
-      { return *_M_current; }
-
-      /** @brief Convert to wrapped iterator.
-      *  @return Wrapped iterator. */
-      operator _RAIter()
-      { return _M_current; }
-
-      /** @brief Compare two elements referenced by guarded iterators.
-       *  @param __bi1 First iterator.
-       *  @param __bi2 Second iterator.
-       *  @return @c true if less. */
-      friend bool
-      operator<(_GuardedIterator<_RAIter, _Compare>& __bi1,
-		_GuardedIterator<_RAIter, _Compare>& __bi2)
-      {
-	if (__bi1._M_current == __bi1._M_end)       // __bi1 is sup
-	  return __bi2._M_current == __bi2._M_end;  // __bi2 is not sup
-	if (__bi2._M_current == __bi2._M_end)       // __bi2 is sup
-	  return true;
-	return (__bi1.__comp)(*__bi1, *__bi2);      // normal compare
-      }
-
-      /** @brief Compare two elements referenced by guarded iterators.
-       *  @param __bi1 First iterator.
-       *  @param __bi2 Second iterator.
-       *  @return @c True if less equal. */
-      friend bool
-      operator<=(_GuardedIterator<_RAIter, _Compare>& __bi1,
-		 _GuardedIterator<_RAIter, _Compare>& __bi2)
-      {
-	if (__bi2._M_current == __bi2._M_end)       // __bi1 is sup
-	  return __bi1._M_current != __bi1._M_end;  // __bi2 is not sup
-	if (__bi1._M_current == __bi1._M_end)       // __bi2 is sup
-	  return false;
-	return !(__bi1.__comp)(*__bi2, *__bi1);     // normal compare
-      } 
-    };
-
-  template<typename _RAIter, typename _Compare>
-    class _UnguardedIterator
-    {
-    private:
-      /** @brief Current iterator __position. */
-      _RAIter _M_current;
-      /** @brief _Compare. */
-      _Compare& __comp;
-
-    public:
-      /** @brief Constructor. Sets iterator to beginning of sequence.
-      *  @param __begin Begin iterator of sequence.
-      *  @param __end Unused, only for compatibility.
-      *  @param __comp Unused, only for compatibility. */
-      _UnguardedIterator(_RAIter __begin,
-                	 _RAIter /* __end */, _Compare& __comp)
-      : _M_current(__begin), __comp(__comp)
-      { }
-
-      /** @brief Pre-increment operator.
-      *  @return This. */
-      _UnguardedIterator<_RAIter, _Compare>&
-      operator++()
-      {
-	++_M_current;
-	return *this;
-      }
-
-      /** @brief Dereference operator.
-      *  @return Referenced element. */
-      typename std::iterator_traits<_RAIter>::value_type&
-      operator*()
-      { return *_M_current; }
-
-      /** @brief Convert to wrapped iterator.
-      *  @return Wrapped iterator. */
-      operator _RAIter()
-      { return _M_current; }
-
-      /** @brief Compare two elements referenced by unguarded iterators.
-       *  @param __bi1 First iterator.
-       *  @param __bi2 Second iterator.
-       *  @return @c true if less. */
-      friend bool
-      operator<(_UnguardedIterator<_RAIter, _Compare>& __bi1,
-		_UnguardedIterator<_RAIter, _Compare>& __bi2)
-      {
-	// Normal compare.
-	return (__bi1.__comp)(*__bi1, *__bi2);
-      }
-
-      /** @brief Compare two elements referenced by unguarded iterators.
-       *  @param __bi1 First iterator.
-       *  @param __bi2 Second iterator.
-       *  @return @c True if less equal. */
-      friend bool
-      operator<=(_UnguardedIterator<_RAIter, _Compare>& __bi1,
-		 _UnguardedIterator<_RAIter, _Compare>& __bi2)
-      {
-	// Normal compare.
-	return !(__bi1.__comp)(*__bi2, *__bi1);
-      }
-    };
-
-  /** @brief Highly efficient 3-way merging procedure.
-   *
-   * Merging is done with the algorithm implementation described by Peter
-   * Sanders.  Basically, the idea is to minimize the number of necessary
-   * comparison after merging an element.  The implementation trick
-   * that makes this fast is that the order of the sequences is stored
-   * in the instruction pointer (translated into labels in C++).
-   *
-   * This works well for merging up to 4 sequences.
-   *
-   * Note that making the merging stable does @a not come at a
-   * performance hit.
-   *
-   * Whether the merging is done guarded or unguarded is selected by the
-   * used iterator class.
-   *
-   * @param __seqs_begin Begin iterator of iterator pair input sequence.
-   * @param __seqs_end End iterator of iterator pair input sequence.
-   * @param __target Begin iterator of output sequence.
-   * @param __comp Comparator.
-   * @param __length Maximum length to merge, less equal than the
-   * total number of elements available.
-   *
-   * @return End iterator of output sequence.
-   */
-  template<template<typename RAI, typename C> class iterator,
-           typename _RAIterIterator,
-           typename _RAIter3,
-           typename _DifferenceTp,
-           typename _Compare>
-    _RAIter3
-    multiway_merge_3_variant(_RAIterIterator __seqs_begin,
-			     _RAIterIterator __seqs_end,
-			     _RAIter3 __target,
-			     _DifferenceTp __length, _Compare __comp)
-    {
-      _GLIBCXX_CALL(__length);
-
-      typedef _DifferenceTp _DifferenceType;
-
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::value_type::first_type
-	_RAIter1;
-      typedef typename std::iterator_traits<_RAIter1>::value_type
-	_ValueType;
-
-      if (__length == 0)
-	return __target;
-
-#if _GLIBCXX_ASSERTIONS
-      _DifferenceTp __orig_length = __length;
-#endif
-
-      iterator<_RAIter1, _Compare>
-	__seq0(__seqs_begin[0].first, __seqs_begin[0].second, __comp),
-	__seq1(__seqs_begin[1].first, __seqs_begin[1].second, __comp),
-	__seq2(__seqs_begin[2].first, __seqs_begin[2].second, __comp);
-
-      if (__seq0 <= __seq1)
-	{
-          if (__seq1 <= __seq2)
-            goto __s012;
-          else
-            if (__seq2 <  __seq0)
-              goto __s201;
-            else
-              goto __s021;
-	}
-      else
-	{
-          if (__seq1 <= __seq2)
-            {
-              if (__seq0 <= __seq2)
-        	goto __s102;
-              else
-        	goto __s120;
-            }
-          else
-            goto __s210;
-	}
-#define _GLIBCXX_PARALLEL_MERGE_3_CASE(__a, __b, __c, __c0, __c1) \
-      __s ## __a ## __b ## __c :                            \
-	*__target = *__seq ## __a;                          \
-	++__target;                                         \
-	--__length;                                         \
-	++__seq ## __a;                                     \
-	if (__length == 0) goto __finish;                   \
-	if (__seq ## __a __c0 __seq ## __b) goto __s ## __a ## __b ## __c; \
-	if (__seq ## __a __c1 __seq ## __c) goto __s ## __b ## __a ## __c; \
-	goto __s ## __b ## __c ## __a;
-
-      _GLIBCXX_PARALLEL_MERGE_3_CASE(0, 1, 2, <=, <=);
-      _GLIBCXX_PARALLEL_MERGE_3_CASE(1, 2, 0, <=, < );
-      _GLIBCXX_PARALLEL_MERGE_3_CASE(2, 0, 1, < , < );
-      _GLIBCXX_PARALLEL_MERGE_3_CASE(1, 0, 2, < , <=);
-      _GLIBCXX_PARALLEL_MERGE_3_CASE(0, 2, 1, <=, <=);
-      _GLIBCXX_PARALLEL_MERGE_3_CASE(2, 1, 0, < , < );
-
-#undef _GLIBCXX_PARALLEL_MERGE_3_CASE
-
-    __finish:
-      ;
-
-#if _GLIBCXX_ASSERTIONS
-    _GLIBCXX_PARALLEL_ASSERT(
-	((_RAIter1)__seq0 - __seqs_begin[0].first) +
-	((_RAIter1)__seq1 - __seqs_begin[1].first) +
-	((_RAIter1)__seq2 - __seqs_begin[2].first)
-	== __orig_length);
-#endif
-
-      __seqs_begin[0].first = __seq0;
-      __seqs_begin[1].first = __seq1;
-      __seqs_begin[2].first = __seq2;
-
-      return __target;
-    }
-
-  /**
-   * @brief Highly efficient 4-way merging procedure.
-   *
-   * Merging is done with the algorithm implementation described by Peter
-   * Sanders. Basically, the idea is to minimize the number of necessary
-   * comparison after merging an element.  The implementation trick
-   * that makes this fast is that the order of the sequences is stored
-   * in the instruction pointer (translated into goto labels in C++).
-   *
-   * This works well for merging up to 4 sequences.
-   *
-   * Note that making the merging stable does @a not come at a
-   * performance hit.
-   *
-   * Whether the merging is done guarded or unguarded is selected by the
-   * used iterator class.
-   *
-   * @param __seqs_begin Begin iterator of iterator pair input sequence.
-   * @param __seqs_end End iterator of iterator pair input sequence.
-   * @param __target Begin iterator of output sequence.
-   * @param __comp Comparator.
-   * @param __length Maximum length to merge, less equal than the
-   * total number of elements available.
-   *
-   * @return End iterator of output sequence.
-   */
-  template<template<typename RAI, typename C> class iterator,
-           typename _RAIterIterator,
-           typename _RAIter3,
-           typename _DifferenceTp,
-           typename _Compare>
-    _RAIter3
-    multiway_merge_4_variant(_RAIterIterator __seqs_begin,
-                             _RAIterIterator __seqs_end,
-                             _RAIter3 __target,
-                             _DifferenceTp __length, _Compare __comp)
-    {
-      _GLIBCXX_CALL(__length);
-      typedef _DifferenceTp _DifferenceType;
-
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::value_type::first_type
-	_RAIter1;
-      typedef typename std::iterator_traits<_RAIter1>::value_type
-	_ValueType;
-
-      iterator<_RAIter1, _Compare>
-	__seq0(__seqs_begin[0].first, __seqs_begin[0].second, __comp),
-	__seq1(__seqs_begin[1].first, __seqs_begin[1].second, __comp),
-	__seq2(__seqs_begin[2].first, __seqs_begin[2].second, __comp),
-	__seq3(__seqs_begin[3].first, __seqs_begin[3].second, __comp);
-
-#define _GLIBCXX_PARALLEL_DECISION(__a, __b, __c, __d) {  \
-	if (__seq ## __d < __seq ## __a)		  \
-	  goto __s ## __d ## __a ## __b ## __c;		  \
-	if (__seq ## __d < __seq ## __b)		  \
-	  goto __s ## __a ## __d ## __b ## __c;		  \
-	if (__seq ## __d < __seq ## __c)		  \
-	  goto __s ## __a ## __b ## __d ## __c;		  \
-	goto __s ## __a ## __b ## __c ## __d;  }
-
-      if (__seq0 <= __seq1)
-	{
-          if (__seq1 <= __seq2)
-            _GLIBCXX_PARALLEL_DECISION(0,1,2,3)
-            else
-              if (__seq2 < __seq0)
-        	_GLIBCXX_PARALLEL_DECISION(2,0,1,3)
-        	else
-                  _GLIBCXX_PARALLEL_DECISION(0,2,1,3)
-                    }
-      else
-	{
-          if (__seq1 <= __seq2)
-            {
-              if (__seq0 <= __seq2)
-        	_GLIBCXX_PARALLEL_DECISION(1,0,2,3)
-        	else
-                  _GLIBCXX_PARALLEL_DECISION(1,2,0,3)
-                    }
-          else
-            _GLIBCXX_PARALLEL_DECISION(2,1,0,3)
-              }
-
-#define _GLIBCXX_PARALLEL_MERGE_4_CASE(__a, __b, __c, __d,  \
-				       __c0, __c1, __c2)    \
-      __s ## __a ## __b ## __c ## __d:                      \
-      if (__length == 0) goto __finish;                     \
-      *__target = *__seq ## __a;                            \
-      ++__target;                                           \
-      --__length;                                           \
-      ++__seq ## __a;                                       \
-      if (__seq ## __a __c0 __seq ## __b)      \
-	goto __s ## __a ## __b ## __c ## __d;  \
-      if (__seq ## __a __c1 __seq ## __c)      \
-	goto __s ## __b ## __a ## __c ## __d;  \
-      if (__seq ## __a __c2 __seq ## __d)      \
-	goto __s ## __b ## __c ## __a ## __d;  \
-      goto __s ## __b ## __c ## __d ## __a;
-
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(0, 1, 2, 3, <=, <=, <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(0, 1, 3, 2, <=, <=, <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(0, 2, 1, 3, <=, <=, <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(0, 2, 3, 1, <=, <=, <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(0, 3, 1, 2, <=, <=, <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(0, 3, 2, 1, <=, <=, <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(1, 0, 2, 3, < , <=, <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(1, 0, 3, 2, < , <=, <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(1, 2, 0, 3, <=, < , <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(1, 2, 3, 0, <=, <=, < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(1, 3, 0, 2, <=, < , <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(1, 3, 2, 0, <=, <=, < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(2, 0, 1, 3, < , < , <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(2, 0, 3, 1, < , <=, < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(2, 1, 0, 3, < , < , <=);
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(2, 1, 3, 0, < , <=, < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(2, 3, 0, 1, <=, < , < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(2, 3, 1, 0, <=, < , < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(3, 0, 1, 2, < , < , < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(3, 0, 2, 1, < , < , < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(3, 1, 0, 2, < , < , < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(3, 1, 2, 0, < , < , < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(3, 2, 0, 1, < , < , < );
-      _GLIBCXX_PARALLEL_MERGE_4_CASE(3, 2, 1, 0, < , < , < );
-
-#undef _GLIBCXX_PARALLEL_MERGE_4_CASE
-#undef _GLIBCXX_PARALLEL_DECISION
-
-    __finish:
-      ;
-
-      __seqs_begin[0].first = __seq0;
-      __seqs_begin[1].first = __seq1;
-      __seqs_begin[2].first = __seq2;
-      __seqs_begin[3].first = __seq3;
-
-      return __target;
-    }
-
-  /** @brief Multi-way merging procedure for a high branching factor,
-   *         guarded case.
-   *
-   * This merging variant uses a LoserTree class as selected by <tt>_LT</tt>.
-   *
-   * Stability is selected through the used LoserTree class <tt>_LT</tt>.
-   *
-   * At least one non-empty sequence is required.
-   *
-   * @param __seqs_begin Begin iterator of iterator pair input sequence.
-   * @param __seqs_end End iterator of iterator pair input sequence.
-   * @param __target Begin iterator of output sequence.
-   * @param __comp Comparator.
-   * @param __length Maximum length to merge, less equal than the
-   * total number of elements available.
-   *
-   * @return End iterator of output sequence.
-   */
-  template<typename _LT,
-           typename _RAIterIterator,
-           typename _RAIter3,
-           typename _DifferenceTp,
-           typename _Compare>
-    _RAIter3
-    multiway_merge_loser_tree(_RAIterIterator __seqs_begin,
-                              _RAIterIterator __seqs_end,
-                              _RAIter3 __target,
-                              _DifferenceTp __length, _Compare __comp)
-    {
-      _GLIBCXX_CALL(__length)
-
-      typedef _DifferenceTp _DifferenceType;
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::difference_type _SeqNumber;
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::value_type::first_type
-	_RAIter1;
-      typedef typename std::iterator_traits<_RAIter1>::value_type
-	_ValueType;
-
-      _SeqNumber __k = static_cast<_SeqNumber>(__seqs_end - __seqs_begin);
-
-      _LT __lt(__k, __comp);
-
-      // Default value for potentially non-default-constructible types.
-      _ValueType* __arbitrary_element = 0;
-
-      for (_SeqNumber __t = 0; __t < __k; ++__t)
-	{
-          if(!__arbitrary_element
-	     && _GLIBCXX_PARALLEL_LENGTH(__seqs_begin[__t]) > 0)
-            __arbitrary_element = &(*__seqs_begin[__t].first);
-	}
-
-      for (_SeqNumber __t = 0; __t < __k; ++__t)
-	{
-          if (__seqs_begin[__t].first == __seqs_begin[__t].second)
-            __lt.__insert_start(*__arbitrary_element, __t, true);
-          else
-            __lt.__insert_start(*__seqs_begin[__t].first, __t, false);
-	}
-
-      __lt.__init();
-
-      _SeqNumber __source;
-
-      for (_DifferenceType __i = 0; __i < __length; ++__i)
-	{
-          //take out
-          __source = __lt.__get_min_source();
-
-          *(__target++) = *(__seqs_begin[__source].first++);
-
-          // Feed.
-          if (__seqs_begin[__source].first == __seqs_begin[__source].second)
-            __lt.__delete_min_insert(*__arbitrary_element, true);
-          else
-            // Replace from same __source.
-            __lt.__delete_min_insert(*__seqs_begin[__source].first, false);
-	}
-
-      return __target;
-    }
-
-  /** @brief Multi-way merging procedure for a high branching factor,
-   *         unguarded case.
-   *
-   * Merging is done using the LoserTree class <tt>_LT</tt>.
-   *
-   * Stability is selected by the used LoserTrees.
-   *
-   * @pre No input will run out of elements during the merge.
-   *
-   * @param __seqs_begin Begin iterator of iterator pair input sequence.
-   * @param __seqs_end End iterator of iterator pair input sequence.
-   * @param __target Begin iterator of output sequence.
-   * @param __comp Comparator.
-   * @param __length Maximum length to merge, less equal than the
-   * total number of elements available.
-   *
-   * @return End iterator of output sequence.
-   */
-  template<typename _LT,
-	   typename _RAIterIterator,
-	   typename _RAIter3,
-	   typename _DifferenceTp, typename _Compare>
-    _RAIter3
-    multiway_merge_loser_tree_unguarded(_RAIterIterator __seqs_begin,
-					_RAIterIterator __seqs_end,
-					_RAIter3 __target,
-       const typename std::iterator_traits<typename std::iterator_traits<
-	  _RAIterIterator>::value_type::first_type>::value_type&
-					__sentinel,
-					_DifferenceTp __length,
-					_Compare __comp)
-    {
-      _GLIBCXX_CALL(__length)
-      typedef _DifferenceTp _DifferenceType;
-
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::difference_type _SeqNumber;
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::value_type::first_type
-	_RAIter1;
-      typedef typename std::iterator_traits<_RAIter1>::value_type
-	_ValueType;
-
-      _SeqNumber __k = __seqs_end - __seqs_begin;
-
-      _LT __lt(__k, __sentinel, __comp);
-
-      for (_SeqNumber __t = 0; __t < __k; ++__t)
-	{
-#if _GLIBCXX_ASSERTIONS
-          _GLIBCXX_PARALLEL_ASSERT(__seqs_begin[__t].first
-                                   != __seqs_begin[__t].second);
-#endif
-          __lt.__insert_start(*__seqs_begin[__t].first, __t, false);
-	}
-
-      __lt.__init();
-
-      _SeqNumber __source;
-
-#if _GLIBCXX_ASSERTIONS
-      _DifferenceType __i = 0;
-#endif
-
-      _RAIter3 __target_end = __target + __length;
-      while (__target < __target_end)
-	{
-          // Take out.
-          __source = __lt.__get_min_source();
-
-#if _GLIBCXX_ASSERTIONS
-          _GLIBCXX_PARALLEL_ASSERT(0 <= __source && __source < __k);
-          _GLIBCXX_PARALLEL_ASSERT(__i == 0
-              || !__comp(*(__seqs_begin[__source].first), *(__target - 1)));
-#endif
-
-          // Feed.
-          *(__target++) = *(__seqs_begin[__source].first++);
-
-#if _GLIBCXX_ASSERTIONS
-          ++__i;
-#endif
-          // Replace from same __source.
-          __lt.__delete_min_insert(*__seqs_begin[__source].first, false);
-	}
-
-      return __target;
-    }
-
-
-  /** @brief Multi-way merging procedure for a high branching factor,
-   *         requiring sentinels to exist.
-   *
-   * @tparam UnguardedLoserTree _Loser Tree variant to use for the unguarded
-   *   merging.
-   *
-   * @param __seqs_begin Begin iterator of iterator pair input sequence.
-   * @param __seqs_end End iterator of iterator pair input sequence.
-   * @param __target Begin iterator of output sequence.
-   * @param __comp Comparator.
-   * @param __length Maximum length to merge, less equal than the
-   * total number of elements available.
-   *
-   * @return End iterator of output sequence.
-   */
-  template<typename UnguardedLoserTree,
-	   typename _RAIterIterator,
-	   typename _RAIter3,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIter3
-    multiway_merge_loser_tree_sentinel(_RAIterIterator __seqs_begin,
-				       _RAIterIterator __seqs_end,
-				       _RAIter3 __target,
-      const typename std::iterator_traits<typename std::iterator_traits<
-	_RAIterIterator>::value_type::first_type>::value_type&
-				       __sentinel,
-				       _DifferenceTp __length,
-				       _Compare __comp)
-    {
-      _GLIBCXX_CALL(__length)
-
-      typedef _DifferenceTp _DifferenceType;
-      typedef std::iterator_traits<_RAIterIterator> _TraitsType;
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::value_type::first_type
-	_RAIter1;
-      typedef typename std::iterator_traits<_RAIter1>::value_type
-	_ValueType;
-
-      _RAIter3 __target_end;
-
-      for (_RAIterIterator __s = __seqs_begin; __s != __seqs_end; ++__s)
-	// Move the sequence ends to the sentinel.  This has the
-	// effect that the sentinel appears to be within the sequence. Then,
-	// we can use the unguarded variant if we merge out as many
-	// non-sentinel elements as we have.
-	++((*__s).second);
-
-      __target_end = multiway_merge_loser_tree_unguarded<UnguardedLoserTree>
-	(__seqs_begin, __seqs_end, __target, __sentinel, __length, __comp);
-
-#if _GLIBCXX_ASSERTIONS
-      _GLIBCXX_PARALLEL_ASSERT(__target_end == __target + __length);
-      _GLIBCXX_PARALLEL_ASSERT(__is_sorted(__target, __target_end, __comp));
-#endif
-
-      // Restore the sequence ends so the sentinels are not contained in the
-      // sequence any more (see comment in loop above).
-      for (_RAIterIterator __s = __seqs_begin; __s != __seqs_end; ++__s)
-	--((*__s).second);
-
-      return __target_end;
-    }
-
-  /**
-   * @brief Traits for determining whether the loser tree should
-   *   use pointers or copies.
-   *
-   * The field "_M_use_pointer" is used to determine whether to use pointers
-   * in he loser trees or whether to copy the values into the loser tree.
-   *
-   * The default behavior is to use pointers if the data type is 4 times as
-   * big as the pointer to it.
-   *
-   * Specialize for your data type to customize the behavior.
-   *
-   * Example:
-   *
-   *   template<>
-   *   struct _LoserTreeTraits<int>
-   *   { static const bool _M_use_pointer = false; };
-   *
-   *   template<>
-   *   struct _LoserTreeTraits<heavyweight_type>
-   *   { static const bool _M_use_pointer = true; };
-   *
-   * @param _Tp type to give the loser tree traits for.
-   */
-  template <typename _Tp>
-    struct _LoserTreeTraits
-    {
-      /**
-       * @brief True iff to use pointers instead of values in loser trees.
-       *
-       * The default behavior is to use pointers if the data type is four
-       * times as big as the pointer to it.
-       */
-      static const bool _M_use_pointer = (sizeof(_Tp) > 4 * sizeof(_Tp*));
-    };
-
-  /**
-   * @brief Switch for 3-way merging with __sentinels turned off.
-   *
-   * Note that 3-way merging is always stable!
-   */
-  template<bool __sentinels /*default == false*/,
-	   typename _RAIterIterator,
-	   typename _RAIter3,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    struct __multiway_merge_3_variant_sentinel_switch
-    {
-      _RAIter3
-      operator()(_RAIterIterator __seqs_begin,
-		 _RAIterIterator __seqs_end,
-		 _RAIter3 __target,
-		 _DifferenceTp __length, _Compare __comp)
-      { return multiway_merge_3_variant<_GuardedIterator>
-	  (__seqs_begin, __seqs_end, __target, __length, __comp); }
-    };
-
-  /**
-   * @brief Switch for 3-way merging with __sentinels turned on.
-   *
-   * Note that 3-way merging is always stable!
-   */
-  template<typename _RAIterIterator,
-	   typename _RAIter3,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    struct __multiway_merge_3_variant_sentinel_switch<true, _RAIterIterator,
-						      _RAIter3, _DifferenceTp,
-						      _Compare>
-    {
-      _RAIter3
-      operator()(_RAIterIterator __seqs_begin,
-		 _RAIterIterator __seqs_end,
-		 _RAIter3 __target,
-		 _DifferenceTp __length, _Compare __comp)
-      { return multiway_merge_3_variant<_UnguardedIterator>
-	  (__seqs_begin, __seqs_end, __target, __length, __comp); }
-    };
-
-  /**
-   * @brief Switch for 4-way merging with __sentinels turned off.
-   *
-   * Note that 4-way merging is always stable!
-   */
-  template<bool __sentinels /*default == false*/,
-	   typename _RAIterIterator,
-	   typename _RAIter3,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    struct __multiway_merge_4_variant_sentinel_switch
-    {
-      _RAIter3
-      operator()(_RAIterIterator __seqs_begin,
-		 _RAIterIterator __seqs_end,
-		 _RAIter3 __target,
-		 _DifferenceTp __length, _Compare __comp)
-      { return multiway_merge_4_variant<_GuardedIterator>
-	  (__seqs_begin, __seqs_end, __target, __length, __comp); }
-    };
-
-  /**
-   * @brief Switch for 4-way merging with __sentinels turned on.
-   *
-   * Note that 4-way merging is always stable!
-   */
-  template<typename _RAIterIterator,
-	   typename _RAIter3,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    struct __multiway_merge_4_variant_sentinel_switch<true, _RAIterIterator,
-						      _RAIter3, _DifferenceTp,
-						      _Compare>
-    {
-      _RAIter3
-      operator()(_RAIterIterator __seqs_begin,
-		 _RAIterIterator __seqs_end,
-		 _RAIter3 __target,
-		 _DifferenceTp __length, _Compare __comp)
-      { return multiway_merge_4_variant<_UnguardedIterator>
-	  (__seqs_begin, __seqs_end, __target, __length, __comp); }
-    };
-
-  /**
-   * @brief Switch for k-way merging with __sentinels turned on.
-   */
-  template<bool __sentinels,
-	   bool __stable,
-	   typename _RAIterIterator,
-	   typename _RAIter3,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    struct __multiway_merge_k_variant_sentinel_switch
-    {
-      _RAIter3
-      operator()(_RAIterIterator __seqs_begin,
-		 _RAIterIterator __seqs_end,
-		 _RAIter3 __target,
-      const typename std::iterator_traits<typename std::iterator_traits<
-      _RAIterIterator>::value_type::first_type>::value_type&
-		 __sentinel,
-		 _DifferenceTp __length, _Compare __comp)
-      {
-	typedef typename std::iterator_traits<_RAIterIterator>
-	  ::value_type::first_type
-	  _RAIter1;
-	typedef typename std::iterator_traits<_RAIter1>::value_type
-	  _ValueType;
-
-	return multiway_merge_loser_tree_sentinel<
-	typename __gnu_cxx::__conditional_type<
-	_LoserTreeTraits<_ValueType>::_M_use_pointer,
-	  _LoserTreePointerUnguarded<__stable, _ValueType, _Compare>,
-	  _LoserTreeUnguarded<__stable, _ValueType, _Compare>
-          >::__type>
-	  (__seqs_begin, __seqs_end, __target, __sentinel, __length, __comp);
-      }
-    };
-
-  /**
-   * @brief Switch for k-way merging with __sentinels turned off.
-   */
-  template<bool __stable,
-	   typename _RAIterIterator,
-	   typename _RAIter3,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    struct __multiway_merge_k_variant_sentinel_switch<false, __stable,
-						      _RAIterIterator,
-						      _RAIter3, _DifferenceTp,
-						      _Compare>
-    {
-      _RAIter3
-      operator()(_RAIterIterator __seqs_begin,
-		 _RAIterIterator __seqs_end,
-		 _RAIter3 __target,
-       const typename std::iterator_traits<typename std::iterator_traits<
-       _RAIterIterator>::value_type::first_type>::value_type&
-		 __sentinel,
-		 _DifferenceTp __length, _Compare __comp)
-      {
-	typedef typename std::iterator_traits<_RAIterIterator>
-	  ::value_type::first_type
-	  _RAIter1;
-	typedef typename std::iterator_traits<_RAIter1>::value_type
-	  _ValueType;
-
-	return multiway_merge_loser_tree<
-	typename __gnu_cxx::__conditional_type<
-	_LoserTreeTraits<_ValueType>::_M_use_pointer,
-	  _LoserTreePointer<__stable, _ValueType, _Compare>,
-	  _LoserTree<__stable, _ValueType, _Compare>
-          >::__type >(__seqs_begin, __seqs_end, __target, __length, __comp);
-      }
-    };
-
-  /** @brief Sequential multi-way merging switch.
-   *
-   *  The _GLIBCXX_PARALLEL_DECISION is based on the branching factor and
-   *  runtime settings.
-   *  @param __seqs_begin Begin iterator of iterator pair input sequence.
-   *  @param __seqs_end End iterator of iterator pair input sequence.
-   *  @param __target Begin iterator of output sequence.
-   *  @param __comp Comparator.
-   *  @param __length Maximum length to merge, possibly larger than the
-   *  number of elements available.
-   *  @param __sentinel The sequences have __a __sentinel element.
-   *  @return End iterator of output sequence. */
-  template<bool __stable,
-	   bool __sentinels,
-	   typename _RAIterIterator,
-	   typename _RAIter3,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIter3
-    __sequential_multiway_merge(_RAIterIterator __seqs_begin,
-				_RAIterIterator __seqs_end,
-				_RAIter3 __target,
-      const typename std::iterator_traits<typename std::iterator_traits<
-	_RAIterIterator>::value_type::first_type>::value_type&
-				__sentinel,
-				_DifferenceTp __length, _Compare __comp)
-    {
-      _GLIBCXX_CALL(__length)
-
-      typedef _DifferenceTp _DifferenceType;
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::difference_type _SeqNumber;
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::value_type::first_type
-	_RAIter1;
-      typedef typename std::iterator_traits<_RAIter1>::value_type
-	_ValueType;
-
-#if _GLIBCXX_ASSERTIONS
-      for (_RAIterIterator __s = __seqs_begin; __s != __seqs_end; ++__s)
-	{
-          _GLIBCXX_PARALLEL_ASSERT(__is_sorted((*__s).first,
-					       (*__s).second, __comp));
-	}
-#endif
-
-      _DifferenceTp __total_length = 0;
-      for (_RAIterIterator __s = __seqs_begin; __s != __seqs_end; ++__s)
-	__total_length += _GLIBCXX_PARALLEL_LENGTH(*__s);
-
-      __length = std::min<_DifferenceTp>(__length, __total_length);
-
-      if(__length == 0)
-	return __target;
-
-      _RAIter3 __return_target = __target;
-      _SeqNumber __k = static_cast<_SeqNumber>(__seqs_end - __seqs_begin);
-
-      switch (__k)
-	{
-	case 0:
-          break;
-	case 1:
-          __return_target = std::copy(__seqs_begin[0].first,
-				      __seqs_begin[0].first + __length,
-				      __target);
-          __seqs_begin[0].first += __length;
-          break;
-	case 2:
-          __return_target = __merge_advance(__seqs_begin[0].first,
-					    __seqs_begin[0].second,
-					    __seqs_begin[1].first,
-					    __seqs_begin[1].second,
-					    __target, __length, __comp);
-          break;
-	case 3:
-          __return_target = __multiway_merge_3_variant_sentinel_switch
-	    <__sentinels, _RAIterIterator, _RAIter3, _DifferenceTp, _Compare>()
-	    (__seqs_begin, __seqs_end, __target, __length, __comp);
-          break;
-	case 4:
-          __return_target = __multiway_merge_4_variant_sentinel_switch
-	    <__sentinels, _RAIterIterator, _RAIter3, _DifferenceTp, _Compare>()
-	    (__seqs_begin, __seqs_end, __target, __length, __comp);
-          break;
-	default:
-	  __return_target = __multiway_merge_k_variant_sentinel_switch
-	    <__sentinels, __stable, _RAIterIterator, _RAIter3, _DifferenceTp,
-	     _Compare>()
-	    (__seqs_begin, __seqs_end, __target, __sentinel, __length, __comp);
-	  break;
-	}
-#if _GLIBCXX_ASSERTIONS
-      _GLIBCXX_PARALLEL_ASSERT(
-	__is_sorted(__target, __target + __length, __comp));
-#endif
-
-      return __return_target;
-    }
-
-  /**
-   * @brief Stable sorting functor.
-   *
-   * Used to reduce code instanciation in multiway_merge_sampling_splitting.
-   */
-  template<bool __stable, class _RAIter, class _StrictWeakOrdering>
-    struct _SamplingSorter
-    {
-      void
-      operator()(_RAIter __first, _RAIter __last, _StrictWeakOrdering __comp)
-      { __gnu_sequential::stable_sort(__first, __last, __comp); }
-    };
-
-  /**
-   * @brief Non-__stable sorting functor.
-   *
-   * Used to reduce code instantiation in multiway_merge_sampling_splitting.
-   */
-  template<class _RAIter, class _StrictWeakOrdering>
-    struct _SamplingSorter<false, _RAIter, _StrictWeakOrdering>
-    {
-      void
-      operator()(_RAIter __first, _RAIter __last, _StrictWeakOrdering __comp)
-      { __gnu_sequential::sort(__first, __last, __comp); }
-    };
-
-  /**
-   * @brief Sampling based splitting for parallel multiway-merge routine.
-   */
-  template<bool __stable,
-	   typename _RAIterIterator,
-	   typename _Compare,
-	   typename _DifferenceType>
-    void
-    multiway_merge_sampling_splitting(_RAIterIterator __seqs_begin,
-				      _RAIterIterator __seqs_end,
-				      _DifferenceType __length,
-				      _DifferenceType __total_length,
-				      _Compare __comp,
-     std::vector<std::pair<_DifferenceType, _DifferenceType> > *__pieces)
-    {
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::difference_type _SeqNumber;
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::value_type::first_type
-	_RAIter1;
-      typedef typename std::iterator_traits<_RAIter1>::value_type
-	_ValueType;
-
-      // __k sequences.
-      const _SeqNumber __k
-	= static_cast<_SeqNumber>(__seqs_end - __seqs_begin);
-
-      const _ThreadIndex __num_threads = omp_get_num_threads();
-
-      const _DifferenceType __num_samples =
-	__gnu_parallel::_Settings::get().merge_oversampling * __num_threads;
-
-      _ValueType* __samples = static_cast<_ValueType*>
-	(::operator new(sizeof(_ValueType) * __k * __num_samples));
-      // Sample.
-      for (_SeqNumber __s = 0; __s < __k; ++__s)
-	for (_DifferenceType __i = 0; __i < __num_samples; ++__i)
-	  {
-	    _DifferenceType sample_index = static_cast<_DifferenceType>
-	      (_GLIBCXX_PARALLEL_LENGTH(__seqs_begin[__s])
-	       * (double(__i + 1) / (__num_samples + 1))
-	       * (double(__length) / __total_length));
-	    new(&(__samples[__s * __num_samples + __i]))
-              _ValueType(__seqs_begin[__s].first[sample_index]);
-	  }
-
-      // Sort stable or non-stable, depending on value of template parameter
-      // "__stable".
-      _SamplingSorter<__stable, _ValueType*, _Compare>()
-	(__samples, __samples + (__num_samples * __k), __comp);
-
-      for (_ThreadIndex __slab = 0; __slab < __num_threads; ++__slab)
-	// For each slab / processor.
-	for (_SeqNumber __seq = 0; __seq < __k; ++__seq)
-	  {
-	    // For each sequence.
-	    if (__slab > 0)
-	      __pieces[__slab][__seq].first = std::upper_bound
-		(__seqs_begin[__seq].first, __seqs_begin[__seq].second,
-		 __samples[__num_samples * __k * __slab / __num_threads],
-		 __comp)
-		- __seqs_begin[__seq].first;
-	    else
-	      // Absolute beginning.
-	      __pieces[__slab][__seq].first = 0;
-	    if ((__slab + 1) < __num_threads)
-	      __pieces[__slab][__seq].second = std::upper_bound
-		(__seqs_begin[__seq].first, __seqs_begin[__seq].second,
-		 __samples[__num_samples * __k * (__slab + 1) / __num_threads],
-		 __comp)
-		- __seqs_begin[__seq].first;
-	    else
-              // Absolute end.
-	      __pieces[__slab][__seq].second =
-		_GLIBCXX_PARALLEL_LENGTH(__seqs_begin[__seq]);
-	  }
-
-      for (_SeqNumber __s = 0; __s < __k; ++__s)
-	for (_DifferenceType __i = 0; __i < __num_samples; ++__i)
-	  __samples[__s * __num_samples + __i].~_ValueType();
-      ::operator delete(__samples);
-    }
-
-  /**
-   * @brief Exact splitting for parallel multiway-merge routine.
-   *
-   * None of the passed sequences may be empty.
-   */
-  template<bool __stable,
-	   typename _RAIterIterator,
-	   typename _Compare,
-	   typename _DifferenceType>
-    void
-    multiway_merge_exact_splitting(_RAIterIterator __seqs_begin,
-				   _RAIterIterator __seqs_end,
-				   _DifferenceType __length,
-				   _DifferenceType __total_length,
-				   _Compare __comp,
-       std::vector<std::pair<_DifferenceType, _DifferenceType> > *__pieces)
-    {
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::difference_type _SeqNumber;
-      typedef typename std::iterator_traits<_RAIterIterator>
-	::value_type::first_type
-	_RAIter1;
-
-      const bool __tight = (__total_length == __length);
-
-      // __k sequences.
-      const _SeqNumber __k = __seqs_end - __seqs_begin;
-
-      const _ThreadIndex __num_threads = omp_get_num_threads();
-
-      // (Settings::multiway_merge_splitting
-      //  == __gnu_parallel::_Settings::EXACT).
-      std::vector<_RAIter1>* __offsets = 
-	new std::vector<_RAIter1>[__num_threads];
-      std::vector<std::pair<_RAIter1, _RAIter1> > __se(__k);
-
-      copy(__seqs_begin, __seqs_end, __se.begin());
-
-      _DifferenceType* __borders =
-	new _DifferenceType[__num_threads + 1];
-      __equally_split(__length, __num_threads, __borders);
-
-      for (_ThreadIndex __s = 0; __s < (__num_threads - 1); ++__s)
-	{
-	  __offsets[__s].resize(__k);
-	  multiseq_partition(__se.begin(), __se.end(), __borders[__s + 1],
-			     __offsets[__s].begin(), __comp);
-
-	  // Last one also needed and available.
-	  if (!__tight)
-	    {
-	      __offsets[__num_threads - 1].resize(__k);
-	      multiseq_partition(__se.begin(), __se.end(),
-				 _DifferenceType(__length),
-				 __offsets[__num_threads - 1].begin(),
-				 __comp);
-	    }
-	}
-      delete[] __borders;
-
-      for (_ThreadIndex __slab = 0; __slab < __num_threads; ++__slab)
-	{
-	  // For each slab / processor.
-	  for (_SeqNumber __seq = 0; __seq < __k; ++__seq)
-	    {
-	      // For each sequence.
-	      if (__slab == 0)
-		{
-		  // Absolute beginning.
-		  __pieces[__slab][__seq].first = 0;
-		}
-	      else
-		__pieces[__slab][__seq].first =
-		  __pieces[__slab - 1][__seq].second;
-	      if (!__tight || __slab < (__num_threads - 1))
-		__pieces[__slab][__seq].second =
-		  __offsets[__slab][__seq] - __seqs_begin[__seq].first;
-	      else
-		{
-		  // __slab == __num_threads - 1
-		  __pieces[__slab][__seq].second =
-                    _GLIBCXX_PARALLEL_LENGTH(__seqs_begin[__seq]);
-		}
-	    }
-	}
-      delete[] __offsets;
-    }
-
-  /** @brief Parallel multi-way merge routine.
-   *
-   * The _GLIBCXX_PARALLEL_DECISION is based on the branching factor
-   * and runtime settings.
-   *
-   * Must not be called if the number of sequences is 1.
-   *
-   * @tparam _Splitter functor to split input (either __exact or sampling based)
-   * @tparam __stable Stable merging incurs a performance penalty.
-   * @tparam __sentinel Ignored.
-   *
-   * @param __seqs_begin Begin iterator of iterator pair input sequence.
-   * @param __seqs_end End iterator of iterator pair input sequence.
-   * @param __target Begin iterator of output sequence.
-   * @param __comp Comparator.
-   * @param __length Maximum length to merge, possibly larger than the
-   * number of elements available.
-   * @return End iterator of output sequence.
-   */
-  template<bool __stable,
-	   bool __sentinels,
-	   typename _RAIterIterator,
-	   typename _RAIter3,
-	   typename _DifferenceTp,
-	   typename _Splitter,
-	   typename _Compare>
-    _RAIter3
-    parallel_multiway_merge(_RAIterIterator __seqs_begin,
-                            _RAIterIterator __seqs_end,
-                            _RAIter3 __target,
-                            _Splitter __splitter,
-                            _DifferenceTp __length,
-                            _Compare __comp,
-                            _ThreadIndex __num_threads)
-      {
-#if _GLIBCXX_ASSERTIONS
-	_GLIBCXX_PARALLEL_ASSERT(__seqs_end - __seqs_begin > 1);
-#endif
-
-	_GLIBCXX_CALL(__length)
-
-	typedef _DifferenceTp _DifferenceType;
-        typedef typename std::iterator_traits<_RAIterIterator>
-	  ::difference_type _SeqNumber;
-	typedef typename std::iterator_traits<_RAIterIterator>
-          ::value_type::first_type
-          _RAIter1;
-	typedef typename
-          std::iterator_traits<_RAIter1>::value_type _ValueType;
-
-	// Leave only non-empty sequences.
-	typedef std::pair<_RAIter1, _RAIter1> seq_type;
-	seq_type* __ne_seqs = new seq_type[__seqs_end - __seqs_begin];
-	_SeqNumber __k = 0;
-	_DifferenceType __total_length = 0;
-	for (_RAIterIterator __raii = __seqs_begin;
-             __raii != __seqs_end; ++__raii)
-          {
-            _DifferenceTp __seq_length = _GLIBCXX_PARALLEL_LENGTH(*__raii);
-            if(__seq_length > 0)
-              {
-        	__total_length += __seq_length;
-        	__ne_seqs[__k++] = *__raii;
-              }
-          }
-
-	_GLIBCXX_CALL(__total_length)
-
-	__length = std::min<_DifferenceTp>(__length, __total_length);
-
-	if (__total_length == 0 || __k == 0)
-	  {
-	    delete[] __ne_seqs;
-	    return __target;
-	  }
-
-	std::vector<std::pair<_DifferenceType, _DifferenceType> >* __pieces;
-
-	__num_threads = static_cast<_ThreadIndex>
-          (std::min<_DifferenceType>(__num_threads, __total_length));
-
-#       pragma omp parallel num_threads (__num_threads)
-	{
-#         pragma omp single
-	  {
-	    __num_threads = omp_get_num_threads();
-	    // Thread __t will have to merge pieces[__iam][0..__k - 1]
-	    __pieces = new std::vector<
-	    std::pair<_DifferenceType, _DifferenceType> >[__num_threads];
-	    for (_ThreadIndex __s = 0; __s < __num_threads; ++__s)
-	      __pieces[__s].resize(__k);
-
-	    _DifferenceType __num_samples =
-	      __gnu_parallel::_Settings::get().merge_oversampling
-	      * __num_threads;
-
-	    __splitter(__ne_seqs, __ne_seqs + __k, __length, __total_length,
-		       __comp, __pieces);
-	  } //single
-
-	  _ThreadIndex __iam = omp_get_thread_num();
-
-	  _DifferenceType __target_position = 0;
-
-	  for (_SeqNumber __c = 0; __c < __k; ++__c)
-	    __target_position += __pieces[__iam][__c].first;
-
-	  seq_type* __chunks = new seq_type[__k];
-
-	  for (_SeqNumber __s = 0; __s < __k; ++__s)
-	    __chunks[__s] = std::make_pair(__ne_seqs[__s].first
-					   + __pieces[__iam][__s].first,
-					   __ne_seqs[__s].first
-					   + __pieces[__iam][__s].second);
-
-	  if(__length > __target_position)
-	    __sequential_multiway_merge<__stable, __sentinels>
-	      (__chunks, __chunks + __k, __target + __target_position,
-	       *(__seqs_begin->second), __length - __target_position, __comp);
-
-	  delete[] __chunks;
-	} // parallel
-
-#if _GLIBCXX_ASSERTIONS
-	_GLIBCXX_PARALLEL_ASSERT(
-          __is_sorted(__target, __target + __length, __comp));
-#endif
-
-	__k = 0;
-	// Update ends of sequences.
-	for (_RAIterIterator __raii = __seqs_begin;
-             __raii != __seqs_end; ++__raii)
-          {
-            _DifferenceTp __length = _GLIBCXX_PARALLEL_LENGTH(*__raii);
-            if(__length > 0)
-              (*__raii).first += __pieces[__num_threads - 1][__k++].second;
-          }
-
-	delete[] __pieces;
-	delete[] __ne_seqs;
-
-	return __target + __length;
-      }
-
-  /**
-   * @brief Multiway Merge Frontend.
-   *
-   * Merge the sequences specified by seqs_begin and __seqs_end into
-   * __target.  __seqs_begin and __seqs_end must point to a sequence of
-   * pairs.  These pairs must contain an iterator to the beginning
-   * of a sequence in their first entry and an iterator the _M_end of
-   * the same sequence in their second entry.
-   *
-   * Ties are broken arbitrarily.  See stable_multiway_merge for a variant
-   * that breaks ties by sequence number but is slower.
-   *
-   * The first entries of the pairs (i.e. the begin iterators) will be moved
-   * forward.
-   *
-   * The output sequence has to provide enough space for all elements
-   * that are written to it.
-   *
-   * This function will merge the input sequences:
-   *
-   * - not stable
-   * - parallel, depending on the input size and Settings
-   * - using sampling for splitting
-   * - not using sentinels
-   *
-   * Example:
-   *
-   * <pre>
-   *   int sequences[10][10];
-   *   for (int __i = 0; __i < 10; ++__i)
-   *     for (int __j = 0; __i < 10; ++__j)
-   *       sequences[__i][__j] = __j;
-   *
-   *   int __out[33];
-   *   std::vector<std::pair<int*> > seqs;
-   *   for (int __i = 0; __i < 10; ++__i)
-   *     { seqs.push(std::make_pair<int*>(sequences[__i],
-   *                                      sequences[__i] + 10)) }
-   *
-   *   multiway_merge(seqs.begin(), seqs.end(), __target, std::less<int>(), 33);
-   * </pre>
-   *
-   * @see stable_multiway_merge
-   *
-   * @pre All input sequences must be sorted.
-   * @pre Target must provide enough space to merge out length elements or
-   *    the number of elements in all sequences, whichever is smaller.
-   *
-   * @post [__target, return __value) contains merged __elements from the
-   *    input sequences.
-   * @post return __value - __target = min(__length, number of elements in all
-   *    sequences).
-   *
-   * @tparam _RAIterPairIterator iterator over sequence
-   *    of pairs of iterators
-   * @tparam _RAIterOut iterator over target sequence
-   * @tparam _DifferenceTp difference type for the sequence
-   * @tparam _Compare strict weak ordering type to compare elements
-   *    in sequences
-   *
-   * @param __seqs_begin  __begin of sequence __sequence
-   * @param __seqs_end    _M_end of sequence __sequence
-   * @param __target      target sequence to merge to.
-   * @param __comp        strict weak ordering to use for element comparison.
-   * @param __length Maximum length to merge, possibly larger than the
-   * number of elements available.
-   *
-   * @return _M_end iterator of output sequence
-   */
-  // multiway_merge
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    multiway_merge(_RAIterPairIterator __seqs_begin,
-		   _RAIterPairIterator __seqs_end,
-		   _RAIterOut __target,
-		   _DifferenceTp __length, _Compare __comp,
-		   __gnu_parallel::sequential_tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute multiway merge *sequentially*.
-      return __sequential_multiway_merge
-	</* __stable = */ false, /* __sentinels = */ false>
-	(__seqs_begin, __seqs_end, __target,
-	 *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    multiway_merge(_RAIterPairIterator __seqs_begin,
-		   _RAIterPairIterator __seqs_end,
-		   _RAIterOut __target,
-		   _DifferenceTp __length, _Compare __comp,
-		   __gnu_parallel::exact_tag __tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute merge; maybe parallel, depending on the number of merged
-      // elements and the number of sequences and global thresholds in
-      // Settings.
-      if ((__seqs_end - __seqs_begin > 1)
-	  && _GLIBCXX_PARALLEL_CONDITION(
-            ((__seqs_end - __seqs_begin) >=
-               __gnu_parallel::_Settings::get().multiway_merge_minimal_k)
-            && ((_SequenceIndex)__length >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_n)))
-	return parallel_multiway_merge
-	  </* __stable = */ false, /* __sentinels = */ false>
-	  (__seqs_begin, __seqs_end, __target,
-	   multiway_merge_exact_splitting</* __stable = */ false,
-	   typename std::iterator_traits<_RAIterPairIterator>
-	   ::value_type*, _Compare, _DifferenceTp>,
-	   static_cast<_DifferenceType>(__length), __comp,
-	   __tag.__get_num_threads());
-      else
-	return __sequential_multiway_merge
-	  </* __stable = */ false, /* __sentinels = */ false>
-	  (__seqs_begin, __seqs_end, __target,
-	   *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    multiway_merge(_RAIterPairIterator __seqs_begin,
-		   _RAIterPairIterator __seqs_end,
-		   _RAIterOut __target,
-		   _DifferenceTp __length, _Compare __comp,
-		   __gnu_parallel::sampling_tag __tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute merge; maybe parallel, depending on the number of merged
-      // elements and the number of sequences and global thresholds in
-      // Settings.
-      if ((__seqs_end - __seqs_begin > 1)
-	  && _GLIBCXX_PARALLEL_CONDITION(
-            ((__seqs_end - __seqs_begin) >=
-               __gnu_parallel::_Settings::get().multiway_merge_minimal_k)
-            && ((_SequenceIndex)__length >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_n)))
-	return parallel_multiway_merge
-	  </* __stable = */ false, /* __sentinels = */ false>
-	  (__seqs_begin, __seqs_end, __target,
-	   multiway_merge_exact_splitting</* __stable = */ false,
-	   typename std::iterator_traits<_RAIterPairIterator>
-	   ::value_type*, _Compare, _DifferenceTp>,
-	   static_cast<_DifferenceType>(__length), __comp,
-	   __tag.__get_num_threads());
-      else
-	return __sequential_multiway_merge
-	  </* __stable = */ false, /* __sentinels = */ false>
-	  (__seqs_begin, __seqs_end, __target,
-	   *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    multiway_merge(_RAIterPairIterator __seqs_begin,
-		   _RAIterPairIterator __seqs_end,
-		   _RAIterOut __target,
-		   _DifferenceTp __length, _Compare __comp,
-		   parallel_tag __tag = parallel_tag(0))
-    { return multiway_merge(__seqs_begin, __seqs_end, __target, __length,
-			    __comp, exact_tag(__tag.__get_num_threads())); }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    multiway_merge(_RAIterPairIterator __seqs_begin,
-		   _RAIterPairIterator __seqs_end,
-		   _RAIterOut __target,
-		   _DifferenceTp __length, _Compare __comp,
-		   default_parallel_tag __tag)
-    { return multiway_merge(__seqs_begin, __seqs_end, __target, __length,
-			    __comp, exact_tag(__tag.__get_num_threads())); }
-
-  // stable_multiway_merge
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    stable_multiway_merge(_RAIterPairIterator __seqs_begin,
-			  _RAIterPairIterator __seqs_end,
-			  _RAIterOut __target,
-			  _DifferenceTp __length, _Compare __comp,
-			  __gnu_parallel::sequential_tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute multiway merge *sequentially*.
-      return __sequential_multiway_merge
-	</* __stable = */ true, /* __sentinels = */ false>
-          (__seqs_begin, __seqs_end, __target,
-	   *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    stable_multiway_merge(_RAIterPairIterator __seqs_begin,
-			  _RAIterPairIterator __seqs_end,
-			  _RAIterOut __target,
-			  _DifferenceTp __length, _Compare __comp,
-			  __gnu_parallel::exact_tag __tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute merge; maybe parallel, depending on the number of merged
-      // elements and the number of sequences and global thresholds in
-      // Settings.
-      if ((__seqs_end - __seqs_begin > 1)
-	  && _GLIBCXX_PARALLEL_CONDITION(
-            ((__seqs_end - __seqs_begin) >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_k)
-            && ((_SequenceIndex)__length >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_n)))
-	return parallel_multiway_merge
-          </* __stable = */ true, /* __sentinels = */ false>
-	  (__seqs_begin, __seqs_end, __target,
-	   multiway_merge_exact_splitting</* __stable = */ true,
-	   typename std::iterator_traits<_RAIterPairIterator>
-	   ::value_type*, _Compare, _DifferenceTp>,
-	   static_cast<_DifferenceType>(__length), __comp,
-	   __tag.__get_num_threads());
-      else
-	return __sequential_multiway_merge
-	  </* __stable = */ true, /* __sentinels = */ false>
-	  (__seqs_begin, __seqs_end, __target,
-	   *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    stable_multiway_merge(_RAIterPairIterator __seqs_begin,
-			  _RAIterPairIterator __seqs_end,
-			  _RAIterOut __target,
-			  _DifferenceTp __length, _Compare __comp,
-			  sampling_tag __tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute merge; maybe parallel, depending on the number of merged
-      // elements and the number of sequences and global thresholds in
-      // Settings.
-      if ((__seqs_end - __seqs_begin > 1)
-	  && _GLIBCXX_PARALLEL_CONDITION(
-            ((__seqs_end - __seqs_begin) >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_k)
-            && ((_SequenceIndex)__length >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_n)))
-	return parallel_multiway_merge
-          </* __stable = */ true, /* __sentinels = */ false>
-	  (__seqs_begin, __seqs_end, __target,
-	   multiway_merge_sampling_splitting</* __stable = */ true,
-	   typename std::iterator_traits<_RAIterPairIterator>
-	   ::value_type*, _Compare, _DifferenceTp>,
-	   static_cast<_DifferenceType>(__length), __comp,
-	   __tag.__get_num_threads());
-      else
-	return __sequential_multiway_merge
-          </* __stable = */ true, /* __sentinels = */ false>
-	  (__seqs_begin, __seqs_end, __target,
-	   *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    stable_multiway_merge(_RAIterPairIterator __seqs_begin,
-			  _RAIterPairIterator __seqs_end,
-			  _RAIterOut __target,
-			  _DifferenceTp __length, _Compare __comp,
-			  parallel_tag __tag = parallel_tag(0))
-    {
-      return stable_multiway_merge
-	(__seqs_begin, __seqs_end, __target, __length, __comp,
-	 exact_tag(__tag.__get_num_threads()));
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    stable_multiway_merge(_RAIterPairIterator __seqs_begin,
-			  _RAIterPairIterator __seqs_end,
-			  _RAIterOut __target,
-			  _DifferenceTp __length, _Compare __comp,
-			  default_parallel_tag __tag)
-    {
-      return stable_multiway_merge
-	(__seqs_begin, __seqs_end, __target, __length, __comp,
-	 exact_tag(__tag.__get_num_threads()));
-    }
-
-  /**
-   * @brief Multiway Merge Frontend.
-   *
-   * Merge the sequences specified by seqs_begin and __seqs_end into
-   * __target.  __seqs_begin and __seqs_end must point to a sequence of
-   * pairs.  These pairs must contain an iterator to the beginning
-   * of a sequence in their first entry and an iterator the _M_end of
-   * the same sequence in their second entry.
-   *
-   * Ties are broken arbitrarily.  See stable_multiway_merge for a variant
-   * that breaks ties by sequence number but is slower.
-   *
-   * The first entries of the pairs (i.e. the begin iterators) will be moved
-   * forward accordingly.
-   *
-   * The output sequence has to provide enough space for all elements
-   * that are written to it.
-   *
-   * This function will merge the input sequences:
-   *
-   * - not stable
-   * - parallel, depending on the input size and Settings
-   * - using sampling for splitting
-   * - using sentinels
-   *
-   * You have to take care that the element the _M_end iterator points to is
-   * readable and contains a value that is greater than any other non-sentinel
-   * value in all sequences.
-   *
-   * Example:
-   *
-   * <pre>
-   *   int sequences[10][11];
-   *   for (int __i = 0; __i < 10; ++__i)
-   *     for (int __j = 0; __i < 11; ++__j)
-   *       sequences[__i][__j] = __j; // __last one is sentinel!
-   *
-   *   int __out[33];
-   *   std::vector<std::pair<int*> > seqs;
-   *   for (int __i = 0; __i < 10; ++__i)
-   *     { seqs.push(std::make_pair<int*>(sequences[__i],
-   *                                      sequences[__i] + 10)) }
-   *
-   *   multiway_merge(seqs.begin(), seqs.end(), __target, std::less<int>(), 33);
-   * </pre>
-   *
-   * @pre All input sequences must be sorted.
-   * @pre Target must provide enough space to merge out length elements or
-   *    the number of elements in all sequences, whichever is smaller.
-   * @pre For each @c __i, @c __seqs_begin[__i].second must be the end
-   *    marker of the sequence, but also reference the one more __sentinel
-   *    element.
-   *
-   * @post [__target, return __value) contains merged __elements from the
-   *    input sequences.
-   * @post return __value - __target = min(__length, number of elements in all
-   *    sequences).
-   *
-   * @see stable_multiway_merge_sentinels
-   *
-   * @tparam _RAIterPairIterator iterator over sequence
-   *    of pairs of iterators
-   * @tparam _RAIterOut iterator over target sequence
-   * @tparam _DifferenceTp difference type for the sequence
-   * @tparam _Compare strict weak ordering type to compare elements
-   *    in sequences
-   *
-   * @param __seqs_begin  __begin of sequence __sequence
-   * @param __seqs_end    _M_end of sequence __sequence
-   * @param __target      target sequence to merge to.
-   * @param __comp        strict weak ordering to use for element comparison.
-   * @param __length Maximum length to merge, possibly larger than the
-   * number of elements available.
-   *
-   * @return _M_end iterator of output sequence
-   */
-  // multiway_merge_sentinels
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    multiway_merge_sentinels(_RAIterPairIterator __seqs_begin,
-			     _RAIterPairIterator __seqs_end,
-			     _RAIterOut __target,
-			     _DifferenceTp __length, _Compare __comp,
-			     __gnu_parallel::sequential_tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute multiway merge *sequentially*.
-      return __sequential_multiway_merge
-	</* __stable = */ false, /* __sentinels = */ true>
-          (__seqs_begin, __seqs_end,
-           __target, *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    multiway_merge_sentinels(_RAIterPairIterator __seqs_begin,
-			     _RAIterPairIterator __seqs_end,
-			     _RAIterOut __target,
-			     _DifferenceTp __length, _Compare __comp,
-			     __gnu_parallel::exact_tag __tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute merge; maybe parallel, depending on the number of merged
-      // elements and the number of sequences and global thresholds in
-      // Settings.
-      if ((__seqs_end - __seqs_begin > 1)
-	  && _GLIBCXX_PARALLEL_CONDITION(
-            ((__seqs_end - __seqs_begin) >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_k)
-            && ((_SequenceIndex)__length >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_n)))
-	return parallel_multiway_merge
-          </* __stable = */ false, /* __sentinels = */ true>
-	  (__seqs_begin, __seqs_end, __target,
-	   multiway_merge_exact_splitting</* __stable = */ false,
-	   typename std::iterator_traits<_RAIterPairIterator>
-	   ::value_type*, _Compare, _DifferenceTp>,
-	   static_cast<_DifferenceType>(__length), __comp,
-	   __tag.__get_num_threads());
-      else
-	return __sequential_multiway_merge
-          </* __stable = */ false, /* __sentinels = */ true>
-	  (__seqs_begin, __seqs_end, __target,
-	   *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    multiway_merge_sentinels(_RAIterPairIterator __seqs_begin,
-			     _RAIterPairIterator __seqs_end,
-			     _RAIterOut __target,
-			     _DifferenceTp __length, _Compare __comp,
-			     sampling_tag __tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute merge; maybe parallel, depending on the number of merged
-      // elements and the number of sequences and global thresholds in
-      // Settings.
-      if ((__seqs_end - __seqs_begin > 1)
-	  && _GLIBCXX_PARALLEL_CONDITION(
-            ((__seqs_end - __seqs_begin) >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_k)
-            && ((_SequenceIndex)__length >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_n)))
-	return parallel_multiway_merge
-          </* __stable = */ false, /* __sentinels = */ true>
-	  (__seqs_begin, __seqs_end, __target,
-	   multiway_merge_sampling_splitting</* __stable = */ false,
-	   typename std::iterator_traits<_RAIterPairIterator>
-	   ::value_type*, _Compare, _DifferenceTp>,
-	   static_cast<_DifferenceType>(__length), __comp,
-	   __tag.__get_num_threads());
-      else
-	return __sequential_multiway_merge
-          </* __stable = */false, /* __sentinels = */ true>(
-            __seqs_begin, __seqs_end, __target,
-	    *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    multiway_merge_sentinels(_RAIterPairIterator __seqs_begin,
-			     _RAIterPairIterator __seqs_end,
-			     _RAIterOut __target,
-			     _DifferenceTp __length, _Compare __comp,
-			     parallel_tag __tag = parallel_tag(0))
-    {
-      return multiway_merge_sentinels
-	(__seqs_begin, __seqs_end, __target, __length, __comp,
-	 exact_tag(__tag.__get_num_threads()));
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    multiway_merge_sentinels(_RAIterPairIterator __seqs_begin,
-			     _RAIterPairIterator __seqs_end,
-			     _RAIterOut __target,
-			     _DifferenceTp __length, _Compare __comp,
-			     default_parallel_tag __tag)
-    {
-      return multiway_merge_sentinels
-	(__seqs_begin, __seqs_end, __target, __length, __comp,
-	 exact_tag(__tag.__get_num_threads()));
-    }
-
-  // stable_multiway_merge_sentinels
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin,
-				    _RAIterPairIterator __seqs_end,
-				    _RAIterOut __target,
-				    _DifferenceTp __length, _Compare __comp,
-				    __gnu_parallel::sequential_tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute multiway merge *sequentially*.
-      return __sequential_multiway_merge
-	</* __stable = */ true, /* __sentinels = */ true>
-	(__seqs_begin, __seqs_end, __target,
-	 *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin,
-				    _RAIterPairIterator __seqs_end,
-				    _RAIterOut __target,
-				    _DifferenceTp __length, _Compare __comp,
-				    __gnu_parallel::exact_tag __tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute merge; maybe parallel, depending on the number of merged
-      // elements and the number of sequences and global thresholds in
-      // Settings.
-      if ((__seqs_end - __seqs_begin > 1)
-	  && _GLIBCXX_PARALLEL_CONDITION(
-            ((__seqs_end - __seqs_begin) >=
-            __gnu_parallel::_Settings::get().multiway_merge_minimal_k)
-            && ((_SequenceIndex)__length >=
-            __gnu_parallel::_Settings::get().multiway_merge_minimal_n)))
-	return parallel_multiway_merge
-          </* __stable = */ true, /* __sentinels = */ true>
-	  (__seqs_begin, __seqs_end, __target,
-	   multiway_merge_exact_splitting</* __stable = */ true,
-	   typename std::iterator_traits<_RAIterPairIterator>
-	   ::value_type*, _Compare, _DifferenceTp>,
-	   static_cast<_DifferenceType>(__length), __comp,
-	   __tag.__get_num_threads());
-      else
-	return __sequential_multiway_merge
-          </* __stable = */ true, /* __sentinels = */ true>
-	  (__seqs_begin, __seqs_end, __target,
-	   *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin,
-				    _RAIterPairIterator __seqs_end,
-				    _RAIterOut __target,
-				    _DifferenceTp __length,
-				    _Compare __comp,
-				    sampling_tag __tag)
-    {
-      typedef _DifferenceTp _DifferenceType;
-      _GLIBCXX_CALL(__seqs_end - __seqs_begin)
-
-      // catch special case: no sequences
-      if (__seqs_begin == __seqs_end)
-	return __target;
-
-      // Execute merge; maybe parallel, depending on the number of merged
-      // elements and the number of sequences and global thresholds in
-      // Settings.
-      if ((__seqs_end - __seqs_begin > 1)
-	  && _GLIBCXX_PARALLEL_CONDITION(
-            ((__seqs_end - __seqs_begin) >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_k)
-            && ((_SequenceIndex)__length >=
-              __gnu_parallel::_Settings::get().multiway_merge_minimal_n)))
-	return parallel_multiway_merge
-          </* __stable = */ true, /* __sentinels = */ true>
-	  (__seqs_begin, __seqs_end, __target,
-	   multiway_merge_sampling_splitting</* __stable = */ true,
-	   typename std::iterator_traits<_RAIterPairIterator>
-	   ::value_type*, _Compare, _DifferenceTp>,
-	   static_cast<_DifferenceType>(__length), __comp,
-	   __tag.__get_num_threads());
-      else
-	return __sequential_multiway_merge
-          </* __stable = */ true, /* __sentinels = */ true>
-	  (__seqs_begin, __seqs_end, __target,
-	   *(__seqs_begin->second), __length, __comp);
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin,
-				    _RAIterPairIterator __seqs_end,
-				    _RAIterOut __target,
-				    _DifferenceTp __length,
-				    _Compare __comp,
-				    parallel_tag __tag = parallel_tag(0))
-    {
-      return stable_multiway_merge_sentinels
-	(__seqs_begin, __seqs_end, __target, __length, __comp,
-	 exact_tag(__tag.__get_num_threads()));
-    }
-
-  // public interface
-  template<typename _RAIterPairIterator,
-	   typename _RAIterOut,
-	   typename _DifferenceTp,
-	   typename _Compare>
-    _RAIterOut
-    stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin,
-				    _RAIterPairIterator __seqs_end,
-				    _RAIterOut __target,
-				    _DifferenceTp __length, _Compare __comp,
-				    default_parallel_tag __tag)
-    {
-      return stable_multiway_merge_sentinels
-	(__seqs_begin, __seqs_end, __target, __length, __comp,
-	 exact_tag(__tag.__get_num_threads()));
-    }
-}; // namespace __gnu_parallel
-
-#endif /* _GLIBCXX_PARALLEL_MULTIWAY_MERGE_H */
diff --git a/openflow/usr/include/c++/5/parallel/multiway_mergesort.h b/openflow/usr/include/c++/5/parallel/multiway_mergesort.h
deleted file mode 100644
index 01d817d..0000000
--- a/openflow/usr/include/c++/5/parallel/multiway_mergesort.h
+++ /dev/null
@@ -1,480 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/multiway_mergesort.h
- *  @brief Parallel multiway merge sort.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_MULTIWAY_MERGESORT_H
-#define _GLIBCXX_PARALLEL_MULTIWAY_MERGESORT_H 1
-
-#include <vector>
-
-#include <parallel/basic_iterator.h>
-#include <bits/stl_algo.h>
-#include <parallel/parallel.h>
-#include <parallel/multiway_merge.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Subsequence description. */
-  template<typename _DifferenceTp>
-    struct _Piece
-    {
-      typedef _DifferenceTp _DifferenceType;
-
-      /** @brief Begin of subsequence. */
-      _DifferenceType _M_begin;
-
-      /** @brief End of subsequence. */
-      _DifferenceType _M_end;
-    };
-
-  /** @brief Data accessed by all threads.
-   *
-   *  PMWMS = parallel multiway mergesort */
-  template<typename _RAIter>
-    struct _PMWMSSortingData
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      /** @brief Number of threads involved. */
-      _ThreadIndex _M_num_threads;
-
-      /** @brief Input __begin. */
-      _RAIter _M_source;
-
-      /** @brief Start indices, per thread. */
-      _DifferenceType* _M_starts;
-
-      /** @brief Storage in which to sort. */
-      _ValueType** _M_temporary;
-
-      /** @brief Samples. */
-      _ValueType* _M_samples;
-
-      /** @brief Offsets to add to the found positions. */
-      _DifferenceType* _M_offsets;
-
-      /** @brief Pieces of data to merge @c [thread][__sequence] */
-      std::vector<_Piece<_DifferenceType> >* _M_pieces;
-  };
-
-  /**
-   *  @brief Select _M_samples from a sequence.
-   *  @param __sd Pointer to algorithm data. _Result will be placed in
-   *  @c __sd->_M_samples.
-   *  @param __num_samples Number of _M_samples to select.
-   */
-  template<typename _RAIter, typename _DifferenceTp>
-    void
-    __determine_samples(_PMWMSSortingData<_RAIter>* __sd,
-			_DifferenceTp __num_samples)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef _DifferenceTp _DifferenceType;
-
-      _ThreadIndex __iam = omp_get_thread_num();
-
-      _DifferenceType* __es = new _DifferenceType[__num_samples + 2];
-
-      __equally_split(__sd->_M_starts[__iam + 1] - __sd->_M_starts[__iam], 
-		      __num_samples + 1, __es);
-
-      for (_DifferenceType __i = 0; __i < __num_samples; ++__i)
-	::new(&(__sd->_M_samples[__iam * __num_samples + __i]))
-	    _ValueType(__sd->_M_source[__sd->_M_starts[__iam]
-				       + __es[__i + 1]]);
-
-      delete[] __es;
-    }
-
-  /** @brief Split consistently. */
-  template<bool __exact, typename _RAIter,
-	   typename _Compare, typename _SortingPlacesIterator>
-    struct _SplitConsistently
-    { };
-
-  /** @brief Split by exact splitting. */
-  template<typename _RAIter, typename _Compare,
-	   typename _SortingPlacesIterator>
-    struct _SplitConsistently<true, _RAIter, _Compare, _SortingPlacesIterator>
-    {
-      void
-      operator()(const _ThreadIndex __iam,
-		 _PMWMSSortingData<_RAIter>* __sd,
-		 _Compare& __comp,
-		 const typename
-		 std::iterator_traits<_RAIter>::difference_type
-		 __num_samples) const
-      {
-#       pragma omp barrier
-
-	std::vector<std::pair<_SortingPlacesIterator,
-	                      _SortingPlacesIterator> >
-	  __seqs(__sd->_M_num_threads);
-	for (_ThreadIndex __s = 0; __s < __sd->_M_num_threads; __s++)
-	  __seqs[__s] = std::make_pair(__sd->_M_temporary[__s],
-				       __sd->_M_temporary[__s]
-				       + (__sd->_M_starts[__s + 1]
-					  - __sd->_M_starts[__s]));
-
-	std::vector<_SortingPlacesIterator> __offsets(__sd->_M_num_threads);
-
-	// if not last thread
-	if (__iam < __sd->_M_num_threads - 1)
-	  multiseq_partition(__seqs.begin(), __seqs.end(),
-			     __sd->_M_starts[__iam + 1], __offsets.begin(),
-			     __comp);
-
-	for (_ThreadIndex __seq = 0; __seq < __sd->_M_num_threads; __seq++)
-	  {
-	    // for each sequence
-	    if (__iam < (__sd->_M_num_threads - 1))
-	      __sd->_M_pieces[__iam][__seq]._M_end
-		= __offsets[__seq] - __seqs[__seq].first;
-	    else
-	      // very end of this sequence
-	      __sd->_M_pieces[__iam][__seq]._M_end =
-		__sd->_M_starts[__seq + 1] - __sd->_M_starts[__seq];
-	  }
-
-#       pragma omp barrier
-
-	for (_ThreadIndex __seq = 0; __seq < __sd->_M_num_threads; __seq++)
-	  {
-	    // For each sequence.
-	    if (__iam > 0)
-	      __sd->_M_pieces[__iam][__seq]._M_begin =
-		__sd->_M_pieces[__iam - 1][__seq]._M_end;
-	    else
-	      // Absolute beginning.
-	      __sd->_M_pieces[__iam][__seq]._M_begin = 0;
-	  }
-      }
-  };
-
-  /** @brief Split by sampling. */ 
-  template<typename _RAIter, typename _Compare,
-	   typename _SortingPlacesIterator>
-    struct _SplitConsistently<false, _RAIter, _Compare, _SortingPlacesIterator>
-    {
-      void
-      operator()(const _ThreadIndex __iam,
-		 _PMWMSSortingData<_RAIter>* __sd,
-		 _Compare& __comp,
-		 const typename
-		 std::iterator_traits<_RAIter>::difference_type
-		 __num_samples) const
-      {
-	typedef std::iterator_traits<_RAIter> _TraitsType;
-	typedef typename _TraitsType::value_type _ValueType;
-	typedef typename _TraitsType::difference_type _DifferenceType;
-
-	__determine_samples(__sd, __num_samples);
-
-#       pragma omp barrier
-
-#       pragma omp single
-	__gnu_sequential::sort(__sd->_M_samples,
-			       __sd->_M_samples
-			       + (__num_samples * __sd->_M_num_threads),
-			       __comp);
-
-#       pragma omp barrier
-
-	for (_ThreadIndex __s = 0; __s < __sd->_M_num_threads; ++__s)
-	  {
-	    // For each sequence.
-	    if (__num_samples * __iam > 0)
-	      __sd->_M_pieces[__iam][__s]._M_begin =
-                std::lower_bound(__sd->_M_temporary[__s],
-				 __sd->_M_temporary[__s]
-				 + (__sd->_M_starts[__s + 1]
-				    - __sd->_M_starts[__s]),
-				 __sd->_M_samples[__num_samples * __iam],
-				 __comp)
-                - __sd->_M_temporary[__s];
-	    else
-	      // Absolute beginning.
-	      __sd->_M_pieces[__iam][__s]._M_begin = 0;
-
-	    if ((__num_samples * (__iam + 1)) <
-		(__num_samples * __sd->_M_num_threads))
-	      __sd->_M_pieces[__iam][__s]._M_end =
-                std::lower_bound(__sd->_M_temporary[__s],
-				 __sd->_M_temporary[__s]
-				 + (__sd->_M_starts[__s + 1]
-				    - __sd->_M_starts[__s]),
-				 __sd->_M_samples[__num_samples * (__iam + 1)],
-				 __comp)
-                - __sd->_M_temporary[__s];
-	    else
-	      // Absolute end.
-	      __sd->_M_pieces[__iam][__s]._M_end = (__sd->_M_starts[__s + 1]
-						    - __sd->_M_starts[__s]);
-	  }
-      }
-  };
-  
-  template<bool __stable, typename _RAIter, typename _Compare>
-    struct __possibly_stable_sort
-    { };
-
-  template<typename _RAIter, typename _Compare>
-    struct __possibly_stable_sort<true, _RAIter, _Compare>
-    {
-      void operator()(const _RAIter& __begin,
-		      const _RAIter& __end, _Compare& __comp) const
-      { __gnu_sequential::stable_sort(__begin, __end, __comp); }
-    };
-
-  template<typename _RAIter, typename _Compare>
-    struct __possibly_stable_sort<false, _RAIter, _Compare>
-    {
-      void operator()(const _RAIter __begin,
-		      const _RAIter __end, _Compare& __comp) const
-      { __gnu_sequential::sort(__begin, __end, __comp); }
-    };
-
-  template<bool __stable, typename Seq_RAIter,
-	   typename _RAIter, typename _Compare,
-	   typename DiffType>
-    struct __possibly_stable_multiway_merge
-    { };
-
-  template<typename Seq_RAIter, typename _RAIter,
-	   typename _Compare, typename _DiffType>
-    struct __possibly_stable_multiway_merge<true, Seq_RAIter,
-					    _RAIter, _Compare, _DiffType>
-    {
-      void operator()(const Seq_RAIter& __seqs_begin,
-		      const Seq_RAIter& __seqs_end,
-		      const _RAIter& __target,
-		      _Compare& __comp,
-		      _DiffType __length_am) const
-      { stable_multiway_merge(__seqs_begin, __seqs_end, __target,
-			      __length_am, __comp, sequential_tag()); }
-    };
-
-  template<typename Seq_RAIter, typename _RAIter,
-	   typename _Compare, typename _DiffType>
-    struct __possibly_stable_multiway_merge<false, Seq_RAIter,
-					    _RAIter, _Compare, _DiffType>
-    {
-      void operator()(const Seq_RAIter& __seqs_begin,
-                      const Seq_RAIter& __seqs_end,
-                      const _RAIter& __target,
-                      _Compare& __comp,
-                      _DiffType __length_am) const
-      { multiway_merge(__seqs_begin, __seqs_end, __target, __length_am,
-		       __comp, sequential_tag()); }
-    };
-
-  /** @brief PMWMS code executed by each thread.
-   *  @param __sd Pointer to algorithm data.
-   *  @param __comp Comparator.
-   */
-  template<bool __stable, bool __exact, typename _RAIter,
-	   typename _Compare>
-    void
-    parallel_sort_mwms_pu(_PMWMSSortingData<_RAIter>* __sd,
-			  _Compare& __comp)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _ThreadIndex __iam = omp_get_thread_num();
-
-      // Length of this thread's chunk, before merging.
-      _DifferenceType __length_local =
-	__sd->_M_starts[__iam + 1] - __sd->_M_starts[__iam];
-
-      // Sort in temporary storage, leave space for sentinel.
-
-      typedef _ValueType* _SortingPlacesIterator;
-
-      __sd->_M_temporary[__iam] =
-        static_cast<_ValueType*>(::operator new(sizeof(_ValueType)
-						* (__length_local + 1)));
-
-      // Copy there.
-      std::uninitialized_copy(__sd->_M_source + __sd->_M_starts[__iam],
-			      __sd->_M_source + __sd->_M_starts[__iam]
-			      + __length_local,
-			      __sd->_M_temporary[__iam]);
-
-      __possibly_stable_sort<__stable, _SortingPlacesIterator, _Compare>()
-        (__sd->_M_temporary[__iam],
-	 __sd->_M_temporary[__iam] + __length_local,
-         __comp);
-
-      // Invariant: locally sorted subsequence in sd->_M_temporary[__iam],
-      // __sd->_M_temporary[__iam] + __length_local.
-
-      // No barrier here: Synchronization is done by the splitting routine.
-
-      _DifferenceType __num_samples =
-        _Settings::get().sort_mwms_oversampling * __sd->_M_num_threads - 1;
-      _SplitConsistently<__exact, _RAIter, _Compare, _SortingPlacesIterator>()
-        (__iam, __sd, __comp, __num_samples);
-
-      // Offset from __target __begin, __length after merging.
-      _DifferenceType __offset = 0, __length_am = 0;
-      for (_ThreadIndex __s = 0; __s < __sd->_M_num_threads; __s++)
-	{
-	  __length_am += (__sd->_M_pieces[__iam][__s]._M_end
-			  - __sd->_M_pieces[__iam][__s]._M_begin);
-	  __offset += __sd->_M_pieces[__iam][__s]._M_begin;
-	}
-
-      typedef std::vector<
-        std::pair<_SortingPlacesIterator, _SortingPlacesIterator> >
-        _SeqVector;
-      _SeqVector __seqs(__sd->_M_num_threads);
-
-      for (_ThreadIndex __s = 0; __s < __sd->_M_num_threads; ++__s)
-	{
-	  __seqs[__s] =
-	    std::make_pair(__sd->_M_temporary[__s]
-			   + __sd->_M_pieces[__iam][__s]._M_begin,
-			   __sd->_M_temporary[__s]
-			   + __sd->_M_pieces[__iam][__s]._M_end);
-	}
-
-      __possibly_stable_multiway_merge<
-        __stable, typename _SeqVector::iterator,
-	_RAIter, _Compare, _DifferenceType>()(__seqs.begin(), __seqs.end(),
-				     __sd->_M_source + __offset, __comp,
-				     __length_am);
-
-#     pragma omp barrier
-
-      for (_DifferenceType __i = 0; __i < __length_local; ++__i)
-	__sd->_M_temporary[__iam][__i].~_ValueType();
-      ::operator delete(__sd->_M_temporary[__iam]);
-    }
-
-  /** @brief PMWMS main call.
-   *  @param __begin Begin iterator of sequence.
-   *  @param __end End iterator of sequence.
-   *  @param __comp Comparator.
-   *  @param __num_threads Number of threads to use.
-   */
-  template<bool __stable, bool __exact, typename _RAIter,
-           typename _Compare>
-    void
-    parallel_sort_mwms(_RAIter __begin, _RAIter __end,
-		       _Compare __comp,
-		       _ThreadIndex __num_threads)
-    {
-      _GLIBCXX_CALL(__end - __begin)
-
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _DifferenceType __n = __end - __begin;
-
-      if (__n <= 1)
-	return;
-
-      // at least one element per thread
-      if (__num_threads > __n)
-	__num_threads = static_cast<_ThreadIndex>(__n);
-
-      // shared variables
-      _PMWMSSortingData<_RAIter> __sd;
-      _DifferenceType* __starts;
-      _DifferenceType __size;
-
-#     pragma omp parallel num_threads(__num_threads)
-      {
-        __num_threads = omp_get_num_threads(); //no more threads than requested
-
-#       pragma omp single
-	{
-	  __sd._M_num_threads = __num_threads;
-	  __sd._M_source = __begin;
-	  
-	  __sd._M_temporary = new _ValueType*[__num_threads];
-
-	  if (!__exact)
-	    {
-	      __size =
-		(_Settings::get().sort_mwms_oversampling * __num_threads - 1)
-		* __num_threads;
-	      __sd._M_samples = static_cast<_ValueType*>
-		(::operator new(__size * sizeof(_ValueType)));
-	    }
-	  else
-	    __sd._M_samples = 0;
-
-	  __sd._M_offsets = new _DifferenceType[__num_threads - 1];
-	  __sd._M_pieces
-	    = new std::vector<_Piece<_DifferenceType> >[__num_threads];
-	  for (_ThreadIndex __s = 0; __s < __num_threads; ++__s)
-	    __sd._M_pieces[__s].resize(__num_threads);
-	  __starts = __sd._M_starts = new _DifferenceType[__num_threads + 1];
-
-	  _DifferenceType __chunk_length = __n / __num_threads;
-	  _DifferenceType __split = __n % __num_threads;
-	  _DifferenceType __pos = 0;
-	  for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	    {
-	      __starts[__i] = __pos;
-	      __pos += ((__i < __split)
-			? (__chunk_length + 1) : __chunk_length);
-	    }
-	  __starts[__num_threads] = __pos;
-	} //single
-
-        // Now sort in parallel.
-        parallel_sort_mwms_pu<__stable, __exact>(&__sd, __comp);
-      } //parallel
-
-      delete[] __starts;
-      delete[] __sd._M_temporary;
-
-      if (!__exact)
-	{
-	  for (_DifferenceType __i = 0; __i < __size; ++__i)
-	    __sd._M_samples[__i].~_ValueType();
-	  ::operator delete(__sd._M_samples);
-	}
-
-      delete[] __sd._M_offsets;
-      delete[] __sd._M_pieces;
-    }
-
-} //namespace __gnu_parallel
-
-#endif /* _GLIBCXX_PARALLEL_MULTIWAY_MERGESORT_H */
diff --git a/openflow/usr/include/c++/5/parallel/numeric b/openflow/usr/include/c++/5/parallel/numeric
deleted file mode 100644
index 23c97eb..0000000
--- a/openflow/usr/include/c++/5/parallel/numeric
+++ /dev/null
@@ -1,511 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- * @file parallel/numeric
-*
- * @brief Parallel STL function calls corresponding to stl_numeric.h.
- * The functions defined here mainly do case switches and
- * call the actual parallelized versions in other files.
- * Inlining policy: Functions that basically only contain one function call,
- * are declared inline.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler and Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_NUMERIC_H
-#define _GLIBCXX_PARALLEL_NUMERIC_H 1
-
-#include <numeric>
-#include <bits/stl_function.h>
-#include <parallel/numericfwd.h>
-#include <parallel/iterator.h>
-#include <parallel/for_each.h>
-#include <parallel/for_each_selectors.h>
-#include <parallel/partial_sum.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __parallel
-{
-  // Sequential fallback.
-  template<typename _IIter, typename _Tp>
-    inline _Tp
-    accumulate(_IIter __begin, _IIter __end, _Tp __init, 
-               __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::accumulate(__begin, __end, __init); }
-
-  template<typename _IIter, typename _Tp, typename _BinaryOperation>
-    inline _Tp
-    accumulate(_IIter __begin, _IIter __end, _Tp __init,
-               _BinaryOperation __binary_op, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::accumulate(__begin, __end, __init, __binary_op); }
-
-  // Sequential fallback for input iterator case.
-  template<typename _IIter, typename _Tp, typename _IteratorTag>
-    inline _Tp
-    __accumulate_switch(_IIter __begin, _IIter __end,
-                      _Tp __init, _IteratorTag) 
-    { return accumulate(__begin, __end, __init,
-			__gnu_parallel::sequential_tag()); }
-
-  template<typename _IIter, typename _Tp, typename _BinaryOperation,
-           typename _IteratorTag>
-    inline _Tp
-    __accumulate_switch(_IIter __begin, _IIter __end, _Tp __init, 
-                      _BinaryOperation __binary_op, _IteratorTag)
-    { return accumulate(__begin, __end, __init, __binary_op, 
-                        __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators.
-  template<typename __RAIter, typename _Tp, typename _BinaryOperation>
-    _Tp
-    __accumulate_switch(__RAIter __begin, __RAIter __end, 
-                      _Tp __init, _BinaryOperation __binary_op, 
-                      random_access_iterator_tag, 
-                      __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().accumulate_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          _Tp __res = __init;
-          __gnu_parallel::__accumulate_selector<__RAIter>
-            __my_selector;
-          __gnu_parallel::
-            __for_each_template_random_access_ed(__begin, __end,
-						 __gnu_parallel::_Nothing(),
-						 __my_selector,
-						 __gnu_parallel::
-						 __accumulate_binop_reduct
-					       <_BinaryOperation>(__binary_op),
-						 __res, __res, -1);
-          return __res;
-        }
-      else
-        return accumulate(__begin, __end, __init, __binary_op, 
-                          __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface.
-  template<typename _IIter, typename _Tp>
-    inline _Tp
-    accumulate(_IIter __begin, _IIter __end, _Tp __init, 
-               __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef std::iterator_traits<_IIter> _IteratorTraits;
-      typedef typename _IteratorTraits::value_type _ValueType;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-
-      return __accumulate_switch(__begin, __end, __init,
-				 __gnu_parallel::_Plus<_Tp, _ValueType>(),
-				 _IteratorCategory(), __parallelism_tag);
-    }
-
-  template<typename _IIter, typename _Tp>
-    inline _Tp
-    accumulate(_IIter __begin, _IIter __end, _Tp __init)
-    {
-      typedef std::iterator_traits<_IIter> _IteratorTraits;
-      typedef typename _IteratorTraits::value_type _ValueType;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-
-      return __accumulate_switch(__begin, __end, __init,
-				 __gnu_parallel::_Plus<_Tp, _ValueType>(),
-				 _IteratorCategory());
-    }
-
-  template<typename _IIter, typename _Tp, typename _BinaryOperation>
-    inline _Tp
-    accumulate(_IIter __begin, _IIter __end, _Tp __init, 
-               _BinaryOperation __binary_op, 
-               __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_IIter> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      return __accumulate_switch(__begin, __end, __init, __binary_op, 
-				 _IteratorCategory(), __parallelism_tag);
-    }
-
-  template<typename _IIter, typename _Tp, typename _BinaryOperation>
-    inline _Tp
-    accumulate(_IIter __begin, _IIter __end, _Tp __init, 
-               _BinaryOperation __binary_op) 
-    {
-      typedef iterator_traits<_IIter> _IteratorTraits;
-      typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      return __accumulate_switch(__begin, __end, __init, __binary_op, 
-				 _IteratorCategory());
-    }
-
-
-  // Sequential fallback.
-  template<typename _IIter1, typename _IIter2, typename _Tp>
-    inline _Tp
-    inner_product(_IIter1 __first1, _IIter1 __last1, 
-                  _IIter2 __first2, _Tp __init,
-                  __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::inner_product(
-                               __first1, __last1, __first2, __init); }
-
-  template<typename _IIter1, typename _IIter2, typename _Tp,
-           typename _BinaryFunction1, typename _BinaryFunction2>
-    inline _Tp
-    inner_product(_IIter1 __first1, _IIter1 __last1,
-                  _IIter2 __first2, _Tp __init, _BinaryFunction1 __binary_op1, 
-                  _BinaryFunction2 __binary_op2,
-                  __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::inner_product(__first1, __last1, __first2, __init,
-                                           __binary_op1, __binary_op2); }
-
-  // Parallel algorithm for random access iterators.
-  template<typename _RAIter1, typename _RAIter2,
-           typename _Tp, typename _BinaryFunction1, typename _BinaryFunction2>
-    _Tp
-    __inner_product_switch(_RAIter1 __first1,
-			   _RAIter1 __last1,
-			   _RAIter2 __first2, _Tp __init,
-			   _BinaryFunction1 __binary_op1,
-			   _BinaryFunction2 __binary_op2,
-			   random_access_iterator_tag,
-			   random_access_iterator_tag,
-			   __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION((__last1 - __first1)
-                                      >= __gnu_parallel::_Settings::get().
-                                      accumulate_minimal_n
-                                      && __gnu_parallel::
-                                      __is_parallel(__parallelism_tag)))
-        {
-          _Tp __res = __init;
-          __gnu_parallel::
-            __inner_product_selector<_RAIter1,
-            _RAIter2, _Tp> __my_selector(__first1, __first2);
-          __gnu_parallel::
-            __for_each_template_random_access_ed(
-                __first1, __last1, __binary_op2, __my_selector, __binary_op1,
-                __res, __res, -1);
-          return __res;
-        }
-      else
-        return inner_product(__first1, __last1, __first2, __init, 
-                             __gnu_parallel::sequential_tag());
-    }
-
-  // No parallelism for input iterators.
-  template<typename _IIter1, typename _IIter2, typename _Tp,
-           typename _BinaryFunction1, typename _BinaryFunction2,
-           typename _IteratorTag1, typename _IteratorTag2>
-    inline _Tp
-    __inner_product_switch(_IIter1 __first1, _IIter1 __last1, 
-			   _IIter2 __first2, _Tp __init, 
-			   _BinaryFunction1 __binary_op1,
-			   _BinaryFunction2 __binary_op2, 
-			   _IteratorTag1, _IteratorTag2)
-    { return inner_product(__first1, __last1, __first2, __init, __binary_op1,
-			   __binary_op2, __gnu_parallel::sequential_tag()); }
-
-  template<typename _IIter1, typename _IIter2, typename _Tp,
-           typename _BinaryFunction1, typename _BinaryFunction2>
-    inline _Tp
-    inner_product(_IIter1 __first1, _IIter1 __last1, 
-                  _IIter2 __first2, _Tp __init, _BinaryFunction1 __binary_op1, 
-                  _BinaryFunction2 __binary_op2, 
-                  __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_IIter1> _TraitsType1;
-      typedef typename _TraitsType1::iterator_category _IteratorCategory1;
-
-      typedef iterator_traits<_IIter2> _TraitsType2;
-      typedef typename _TraitsType2::iterator_category _IteratorCategory2;
-
-      return __inner_product_switch(__first1, __last1, __first2, __init,
-				    __binary_op1, __binary_op2,
-				    _IteratorCategory1(), _IteratorCategory2(),
-				    __parallelism_tag);
-    }
-
-  template<typename _IIter1, typename _IIter2, typename _Tp,
-           typename _BinaryFunction1, typename _BinaryFunction2>
-    inline _Tp
-    inner_product(_IIter1 __first1, _IIter1 __last1, 
-                  _IIter2 __first2, _Tp __init, _BinaryFunction1 __binary_op1, 
-                  _BinaryFunction2 __binary_op2)
-    {
-      typedef iterator_traits<_IIter1> _TraitsType1;
-      typedef typename _TraitsType1::iterator_category _IteratorCategory1;
-
-      typedef iterator_traits<_IIter2> _TraitsType2;
-      typedef typename _TraitsType2::iterator_category _IteratorCategory2;
-
-      return __inner_product_switch(__first1, __last1, __first2, __init,
-				    __binary_op1, __binary_op2,
-				    _IteratorCategory1(),
-				    _IteratorCategory2());
-    }
-
-  template<typename _IIter1, typename _IIter2, typename _Tp>
-    inline _Tp
-    inner_product(_IIter1 __first1, _IIter1 __last1, 
-                  _IIter2 __first2, _Tp __init, 
-                  __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_IIter1> _TraitsType1;
-      typedef typename _TraitsType1::value_type _ValueType1;
-      typedef iterator_traits<_IIter2> _TraitsType2;
-      typedef typename _TraitsType2::value_type _ValueType2;
-
-      typedef typename
-        __gnu_parallel::_Multiplies<_ValueType1, _ValueType2>::result_type
-        _MultipliesResultType;
-      return __gnu_parallel::inner_product(__first1, __last1, __first2, __init,
-                           __gnu_parallel::_Plus<_Tp, _MultipliesResultType>(),
-                           __gnu_parallel::
-                           _Multiplies<_ValueType1, _ValueType2>(),
-                           __parallelism_tag);
-    }
-
-  template<typename _IIter1, typename _IIter2, typename _Tp>
-    inline _Tp
-    inner_product(_IIter1 __first1, _IIter1 __last1, 
-                  _IIter2 __first2, _Tp __init)
-    {
-      typedef iterator_traits<_IIter1> _TraitsType1;
-      typedef typename _TraitsType1::value_type _ValueType1;
-      typedef iterator_traits<_IIter2> _TraitsType2;
-      typedef typename _TraitsType2::value_type _ValueType2;
-
-      typedef typename
-        __gnu_parallel::_Multiplies<_ValueType1, _ValueType2>::result_type
-        _MultipliesResultType;
-      return __gnu_parallel::inner_product(__first1, __last1, __first2, __init,
-                           __gnu_parallel::_Plus<_Tp, _MultipliesResultType>(),
-                           __gnu_parallel::
-                           _Multiplies<_ValueType1, _ValueType2>());
-    }
-
-  // Sequential fallback.
-  template<typename _IIter, typename _OutputIterator>
-    inline _OutputIterator
-    partial_sum(_IIter __begin, _IIter __end, _OutputIterator __result,
-                __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::partial_sum(__begin, __end, __result); }
-
-  // Sequential fallback.
-  template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation>
-    inline _OutputIterator
-    partial_sum(_IIter __begin, _IIter __end, _OutputIterator __result,
-                _BinaryOperation __bin_op, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::partial_sum(__begin, __end, __result, __bin_op); }
-
-  // Sequential fallback for input iterator case.
-  template<typename _IIter, typename _OutputIterator,
-           typename _BinaryOperation, typename _IteratorTag1,
-           typename _IteratorTag2>
-    inline _OutputIterator
-    __partial_sum_switch(_IIter __begin, _IIter __end,
-			 _OutputIterator __result, _BinaryOperation __bin_op,
-			 _IteratorTag1, _IteratorTag2)
-    { return _GLIBCXX_STD_A::partial_sum(__begin, __end, __result, __bin_op); }
-
-  // Parallel algorithm for random access iterators.
-  template<typename _IIter, typename _OutputIterator,
-           typename _BinaryOperation>
-    _OutputIterator
-    __partial_sum_switch(_IIter __begin, _IIter __end,
-			 _OutputIterator __result, _BinaryOperation __bin_op,
-			 random_access_iterator_tag,
-			 random_access_iterator_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().partial_sum_minimal_n))
-        return __gnu_parallel::__parallel_partial_sum(__begin, __end,
-						      __result, __bin_op);
-      else
-        return partial_sum(__begin, __end, __result, __bin_op,
-                           __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface.
-  template<typename _IIter, typename _OutputIterator>
-    inline _OutputIterator
-    partial_sum(_IIter __begin, _IIter __end, _OutputIterator __result)
-    {
-      typedef typename iterator_traits<_IIter>::value_type _ValueType;
-      return __gnu_parallel::partial_sum(__begin, __end,
-                                         __result, std::plus<_ValueType>());
-    }
-
-  // Public interface
-  template<typename _IIter, typename _OutputIterator,
-           typename _BinaryOperation>
-    inline _OutputIterator
-    partial_sum(_IIter __begin, _IIter __end, _OutputIterator __result,
-                _BinaryOperation __binary_op)
-    {
-      typedef iterator_traits<_IIter> _ITraitsType;
-      typedef typename _ITraitsType::iterator_category _IIteratorCategory;
-
-      typedef iterator_traits<_OutputIterator> _OTraitsType;
-      typedef typename _OTraitsType::iterator_category _OIterCategory;
-
-      return __partial_sum_switch(__begin, __end, __result, __binary_op,
-				  _IIteratorCategory(), _OIterCategory());
-    }
-
-  // Sequential fallback.
-  template<typename _IIter, typename _OutputIterator>
-    inline _OutputIterator
-    adjacent_difference(_IIter __begin, _IIter __end, _OutputIterator __result,
-                        __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::adjacent_difference(__begin, __end, __result); }
-
-  // Sequential fallback.
-  template<typename _IIter, typename _OutputIterator,
-           typename _BinaryOperation>
-    inline _OutputIterator
-    adjacent_difference(_IIter __begin, _IIter __end,
-                        _OutputIterator __result, _BinaryOperation __bin_op,
-                        __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_A::adjacent_difference(__begin, __end,
-						 __result, __bin_op); }
-
-  // Sequential fallback for input iterator case.
-  template<typename _IIter, typename _OutputIterator,
-           typename _BinaryOperation, typename _IteratorTag1,
-           typename _IteratorTag2>
-    inline _OutputIterator
-    __adjacent_difference_switch(_IIter __begin, _IIter __end,
-				 _OutputIterator __result,
-				 _BinaryOperation __bin_op, _IteratorTag1,
-				 _IteratorTag2)
-    { return adjacent_difference(__begin, __end, __result, __bin_op,
-                                 __gnu_parallel::sequential_tag()); }
-
-  // Parallel algorithm for random access iterators.
-  template<typename _IIter, typename _OutputIterator,
-           typename _BinaryOperation>
-    _OutputIterator
-    __adjacent_difference_switch(_IIter __begin, _IIter __end,
-				 _OutputIterator __result,
-				 _BinaryOperation __bin_op,
-				 random_access_iterator_tag,
-				 random_access_iterator_tag,
-				 __gnu_parallel::_Parallelism
-				 __parallelism_tag)
-    {
-      if (_GLIBCXX_PARALLEL_CONDITION(
-            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-            >= __gnu_parallel::_Settings::get().adjacent_difference_minimal_n
-            && __gnu_parallel::__is_parallel(__parallelism_tag)))
-        {
-          bool __dummy = true;
-          typedef __gnu_parallel::_IteratorPair<_IIter, _OutputIterator,
-            random_access_iterator_tag> _ItTrip;
-          *__result = *__begin;
-          _ItTrip __begin_pair(__begin + 1, __result + 1),
-            __end_pair(__end, __result + (__end - __begin));
-          __gnu_parallel::__adjacent_difference_selector<_ItTrip>
-                                                            __functionality;
-          __gnu_parallel::
-            __for_each_template_random_access_ed(
-                __begin_pair, __end_pair, __bin_op, __functionality,
-                __gnu_parallel::_DummyReduct(), __dummy, __dummy, -1);
-          return __functionality._M_finish_iterator;
-        }
-      else
-        return adjacent_difference(__begin, __end, __result, __bin_op, 
-                                   __gnu_parallel::sequential_tag());
-    }
-
-  // Public interface.
-  template<typename _IIter, typename _OutputIterator>
-    inline _OutputIterator
-    adjacent_difference(_IIter __begin, _IIter __end,
-                        _OutputIterator __result,
-                        __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      return adjacent_difference(__begin, __end, __result,
-				 std::minus<_ValueType>(),
-				 __parallelism_tag);
-    }
-
-  template<typename _IIter, typename _OutputIterator>
-    inline _OutputIterator
-    adjacent_difference(_IIter __begin, _IIter __end,
-                        _OutputIterator __result)
-    {
-      typedef iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      return adjacent_difference(__begin, __end, __result,
-				 std::minus<_ValueType>());
-    }
-
-  template<typename _IIter, typename _OutputIterator,
-           typename _BinaryOperation>
-    inline _OutputIterator
-    adjacent_difference(_IIter __begin, _IIter __end,
-                        _OutputIterator __result, _BinaryOperation __binary_op,
-                        __gnu_parallel::_Parallelism __parallelism_tag)
-    {
-      typedef iterator_traits<_IIter> _ITraitsType;
-      typedef typename _ITraitsType::iterator_category _IIteratorCategory;
-
-      typedef iterator_traits<_OutputIterator> _OTraitsType;
-      typedef typename _OTraitsType::iterator_category _OIterCategory;
-
-      return __adjacent_difference_switch(__begin, __end, __result,
-					  __binary_op,
-					  _IIteratorCategory(),
-					  _OIterCategory(),
-					  __parallelism_tag);
-    }
-
-  template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation>
-    inline _OutputIterator
-    adjacent_difference(_IIter __begin, _IIter __end,
-			_OutputIterator __result, _BinaryOperation __binary_op)
-    {
-      typedef iterator_traits<_IIter> _ITraitsType;
-      typedef typename _ITraitsType::iterator_category _IIteratorCategory;
-
-      typedef iterator_traits<_OutputIterator> _OTraitsType;
-      typedef typename _OTraitsType::iterator_category _OIterCategory;
-
-      return __adjacent_difference_switch(__begin, __end, __result,
-					  __binary_op,
-					  _IIteratorCategory(),
-					  _OIterCategory());
-    }
-} // end namespace
-} // end namespace
-
-#endif /* _GLIBCXX_NUMERIC_H */
diff --git a/openflow/usr/include/c++/5/parallel/numericfwd.h b/openflow/usr/include/c++/5/parallel/numericfwd.h
deleted file mode 100644
index c40ba11..0000000
--- a/openflow/usr/include/c++/5/parallel/numericfwd.h
+++ /dev/null
@@ -1,203 +0,0 @@
-// <parallel/numeric> Forward declarations -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/numericfwd.h
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PARALLEL_NUMERICFWD_H
-#define _GLIBCXX_PARALLEL_NUMERICFWD_H 1
-
-#pragma GCC system_header
-
-#include <parallel/tags.h>
-#include <parallel/settings.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __parallel
-{
-  template<typename _IIter, typename _Tp>
-    _Tp
-    accumulate(_IIter, _IIter, _Tp);
-
-  template<typename _IIter, typename _Tp>
-    _Tp
-    accumulate(_IIter, _IIter, _Tp, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _Tp>
-    _Tp
-    accumulate(_IIter, _IIter, _Tp, __gnu_parallel::_Parallelism);
-
-  template<typename _IIter, typename _Tp, typename _Tag>
-    _Tp
-    __accumulate_switch(_IIter, _IIter, _Tp, _Tag);
-
-  template<typename _IIter, typename _Tp, typename _BinaryOper>
-    _Tp
-    accumulate(_IIter, _IIter, _Tp, _BinaryOper);
-
-  template<typename _IIter, typename _Tp, typename _BinaryOper>
-    _Tp
-    accumulate(_IIter, _IIter, _Tp, _BinaryOper,
-               __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _Tp, typename _BinaryOper>
-    _Tp
-    accumulate(_IIter, _IIter, _Tp, _BinaryOper,
-               __gnu_parallel::_Parallelism);
-
-  template<typename _IIter, typename _Tp, typename _BinaryOper,
-           typename _Tag>
-    _Tp
-    __accumulate_switch(_IIter, _IIter, _Tp, _BinaryOper, _Tag);
-
-  template<typename _RAIter, typename _Tp, typename _BinaryOper>
-    _Tp
-    __accumulate_switch(_RAIter, _RAIter, _Tp, _BinaryOper,
-                      random_access_iterator_tag,
-                      __gnu_parallel::_Parallelism __parallelism
-                      = __gnu_parallel::parallel_unbalanced);
-
-  template<typename _IIter, typename _OIter>
-    _OIter
-    adjacent_difference(_IIter, _IIter, _OIter);
-
-  template<typename _IIter, typename _OIter, typename _BinaryOper>
-    _OIter
-    adjacent_difference(_IIter, _IIter, _OIter, _BinaryOper);
-
-  template<typename _IIter, typename _OIter>
-    _OIter
-    adjacent_difference(_IIter, _IIter, _OIter,
-                        __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _OIter, typename _BinaryOper>
-    _OIter
-    adjacent_difference(_IIter, _IIter, _OIter, _BinaryOper, 
-                        __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _OIter>
-    _OIter
-    adjacent_difference(_IIter, _IIter, _OIter,
-                        __gnu_parallel::_Parallelism);
-
-  template<typename _IIter, typename _OIter, typename _BinaryOper>
-    _OIter
-    adjacent_difference(_IIter, _IIter, _OIter, _BinaryOper, 
-                        __gnu_parallel::_Parallelism);
-
-  template<typename _IIter, typename _OIter, typename _BinaryOper,
-           typename _Tag1, typename _Tag2>
-    _OIter
-    __adjacent_difference_switch(_IIter, _IIter, _OIter, _BinaryOper,
-                               _Tag1, _Tag2);
-
-  template<typename _IIter, typename _OIter, typename _BinaryOper>
-    _OIter
-    __adjacent_difference_switch(_IIter, _IIter, _OIter, _BinaryOper, 
-                               random_access_iterator_tag, 
-                               random_access_iterator_tag, 
-                               __gnu_parallel::_Parallelism __parallelism
-                               = __gnu_parallel::parallel_unbalanced);
-
-  template<typename _IIter1, typename _IIter2, typename _Tp>
-    _Tp
-    inner_product(_IIter1, _IIter1, _IIter2, _Tp);
-
-  template<typename _IIter1, typename _IIter2, typename _Tp>
-    _Tp
-    inner_product(_IIter1, _IIter1, _IIter2, _Tp,
-                  __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _Tp>
-    _Tp
-    inner_product(_IIter1, _IIter1, _IIter2, _Tp,
-                  __gnu_parallel::_Parallelism);
-
-  template<typename _IIter1, typename _IIter2, typename _Tp,
-           typename _BinaryFunction1, typename _BinaryFunction2>
-    _Tp
-    inner_product(_IIter1, _IIter1, _IIter2, _Tp,
-                  _BinaryFunction1, _BinaryFunction2);
-
-  template<typename _IIter1, typename _IIter2, typename _Tp,
-           typename _BinaryFunction1, typename _BinaryFunction2>
-    _Tp
-    inner_product(_IIter1, _IIter1, _IIter2, _Tp, _BinaryFunction1,
-                  _BinaryFunction2, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter1, typename _IIter2, typename _Tp,
-           typename BinaryFunction1, typename BinaryFunction2>
-    _Tp
-    inner_product(_IIter1, _IIter1, _IIter2, _Tp, BinaryFunction1,
-                  BinaryFunction2, __gnu_parallel::_Parallelism);
-
-  template<typename _RAIter1, typename _RAIter2, typename _Tp,
-           typename BinaryFunction1, typename BinaryFunction2>
-    _Tp
-    __inner_product_switch(_RAIter1, _RAIter1, _RAIter2, _Tp, BinaryFunction1,
-                         BinaryFunction2, random_access_iterator_tag, 
-                         random_access_iterator_tag, 
-                         __gnu_parallel::_Parallelism
-                         = __gnu_parallel::parallel_unbalanced);
-
-  template<typename _IIter1, typename _IIter2, typename _Tp,
-           typename _BinaryFunction1, typename _BinaryFunction2,
-           typename _Tag1, typename _Tag2>
-    _Tp
-    __inner_product_switch(_IIter1, _IIter1, _IIter2, _Tp, _BinaryFunction1, 
-                         _BinaryFunction2, _Tag1, _Tag2);
-
-
-  template<typename _IIter, typename _OIter>
-    _OIter
-    partial_sum(_IIter, _IIter, _OIter, __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _OIter, typename _BinaryOper>
-    _OIter
-    partial_sum(_IIter, _IIter, _OIter, _BinaryOper,
-                __gnu_parallel::sequential_tag);
-
-  template<typename _IIter, typename _OIter>
-    _OIter
-    partial_sum(_IIter, _IIter, _OIter __result);
-
-  template<typename _IIter, typename _OIter, typename _BinaryOper>
-    _OIter
-    partial_sum(_IIter, _IIter, _OIter, _BinaryOper);
-
-  template<typename _IIter, typename _OIter, typename _BinaryOper,
-           typename _Tag1, typename _Tag2>
-    _OIter
-    __partial_sum_switch(_IIter, _IIter, _OIter, _BinaryOper, _Tag1, _Tag2);
-
-  template<typename _IIter, typename _OIter, typename _BinaryOper>
-    _OIter
-    __partial_sum_switch(_IIter, _IIter, _OIter, _BinaryOper,
-                       random_access_iterator_tag, random_access_iterator_tag);
-} // end namespace
-} // end namespace
-
-#endif /* _GLIBCXX_PARALLEL_NUMERICFWD_H */
diff --git a/openflow/usr/include/c++/5/parallel/omp_loop.h b/openflow/usr/include/c++/5/parallel/omp_loop.h
deleted file mode 100644
index ef33e95..0000000
--- a/openflow/usr/include/c++/5/parallel/omp_loop.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/omp_loop.h
- *  @brief Parallelization of embarrassingly parallel execution by
- *  means of an OpenMP for loop.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_OMP_LOOP_H
-#define _GLIBCXX_PARALLEL_OMP_LOOP_H 1
-
-#include <omp.h>
-
-#include <parallel/settings.h>
-#include <parallel/basic_iterator.h>
-#include <parallel/base.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Embarrassingly parallel algorithm for random access
-   * iterators, using an OpenMP for loop.
-   *
-   *  @param __begin Begin iterator of element sequence.
-   *  @param __end End iterator of element sequence.
-   *  @param __o User-supplied functor (comparator, predicate, adding
-   *  functor, etc.).
-   *  @param __f Functor to @a process an element with __op (depends on
-   *  desired functionality, e. g. for std::for_each(), ...).
-   *  @param __r Functor to @a add a single __result to the already
-   *  processed elements (depends on functionality).
-   *  @param __base Base value for reduction.
-   *  @param __output Pointer to position where final result is written to
-   *  @param __bound Maximum number of elements processed (e. g. for
-   *  std::count_n()).
-   *  @return User-supplied functor (that may contain a part of the result).
-   */
-  template<typename _RAIter,
-	   typename _Op,
-	   typename _Fu,
-	   typename _Red,
-	   typename _Result>
-    _Op
-    __for_each_template_random_access_omp_loop(_RAIter __begin, _RAIter __end,
-					       _Op __o, _Fu& __f, _Red __r,
-					       _Result __base,
-					       _Result& __output,
-      typename std::iterator_traits<_RAIter>::difference_type __bound)
-    {
-      typedef typename std::iterator_traits<_RAIter>::difference_type
-        _DifferenceType;
-
-      _DifferenceType __length = __end - __begin;
-      _ThreadIndex __num_threads = __gnu_parallel::min<_DifferenceType>
-	(__get_max_threads(), __length);
-
-      _Result *__thread_results;
-
-#     pragma omp parallel num_threads(__num_threads)
-      {
-#       pragma omp single
-	{
-	  __num_threads = omp_get_num_threads();
-	  __thread_results = new _Result[__num_threads];
-
-	  for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	    __thread_results[__i] = _Result();
-	}
-
-        _ThreadIndex __iam = omp_get_thread_num();
-
-#pragma omp for schedule(dynamic, _Settings::get().workstealing_chunk_size)
-        for (_DifferenceType __pos = 0; __pos < __length; ++__pos)
-          __thread_results[__iam] = __r(__thread_results[__iam],
-					__f(__o, __begin+__pos));
-      } //parallel
-
-      for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-        __output = __r(__output, __thread_results[__i]);
-
-      delete [] __thread_results;
-
-      // Points to last element processed (needed as return value for
-      // some algorithms like transform).
-      __f._M_finish_iterator = __begin + __length;
-
-      return __o;
-    }
-
-} // end namespace
-
-#endif /* _GLIBCXX_PARALLEL_OMP_LOOP_H */
diff --git a/openflow/usr/include/c++/5/parallel/omp_loop_static.h b/openflow/usr/include/c++/5/parallel/omp_loop_static.h
deleted file mode 100644
index 2ba4fba..0000000
--- a/openflow/usr/include/c++/5/parallel/omp_loop_static.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/omp_loop_static.h
- *  @brief Parallelization of embarrassingly parallel execution by
- *  means of an OpenMP for loop with static scheduling.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_OMP_LOOP_STATIC_H
-#define _GLIBCXX_PARALLEL_OMP_LOOP_STATIC_H 1
-
-#include <omp.h>
-
-#include <parallel/settings.h>
-#include <parallel/basic_iterator.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Embarrassingly parallel algorithm for random access
-   * iterators, using an OpenMP for loop with static scheduling.
-   *
-   *  @param __begin Begin iterator of element sequence.
-   *  @param __end End iterator of element sequence.
-   *  @param __o User-supplied functor (comparator, predicate, adding
-   *  functor, ...).
-   *  @param __f Functor to @a process an element with __op (depends on
-   *  desired functionality, e. g. for std::for_each(), ...).
-   *  @param __r Functor to @a add a single __result to the already processed
-   *  __elements (depends on functionality).
-   *  @param __base Base value for reduction.
-   *  @param __output Pointer to position where final result is written to
-   *  @param __bound Maximum number of elements processed (e. g. for
-   *  std::count_n()).
-   *  @return User-supplied functor (that may contain a part of the result).
-   */
-  template<typename _RAIter,
-	   typename _Op,
-	   typename _Fu,
-	   typename _Red,
-	   typename _Result>
-    _Op
-    __for_each_template_random_access_omp_loop_static(_RAIter __begin,
-						      _RAIter __end, _Op __o,
-						      _Fu& __f, _Red __r,
-						      _Result __base,
-						      _Result& __output,
-      typename std::iterator_traits<_RAIter>::difference_type __bound)
-    {
-      typedef typename std::iterator_traits<_RAIter>::difference_type
-	_DifferenceType;
-
-      _DifferenceType __length = __end - __begin;
-      _ThreadIndex __num_threads = std::min<_DifferenceType>
-	(__get_max_threads(), __length);
-
-      _Result *__thread_results;
-
-#     pragma omp parallel num_threads(__num_threads)
-      {
-#       pragma omp single
-	{
-	  __num_threads = omp_get_num_threads();
-	  __thread_results = new _Result[__num_threads];
-
-	  for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	    __thread_results[__i] = _Result();
-	}
-
-        _ThreadIndex __iam = omp_get_thread_num();
-
-#pragma omp for schedule(static, _Settings::get().workstealing_chunk_size)
-        for (_DifferenceType __pos = 0; __pos < __length; ++__pos)
-          __thread_results[__iam] = __r(__thread_results[__iam],
-                                        __f(__o, __begin+__pos));
-      } //parallel
-
-      for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	__output = __r(__output, __thread_results[__i]);
-
-      delete [] __thread_results;
-
-      // Points to last element processed (needed as return value for
-      // some algorithms like transform).
-      __f.finish_iterator = __begin + __length;
-
-      return __o;
-    }
-
-} // end namespace
-
-#endif /* _GLIBCXX_PARALLEL_OMP_LOOP_STATIC_H */
diff --git a/openflow/usr/include/c++/5/parallel/par_loop.h b/openflow/usr/include/c++/5/parallel/par_loop.h
deleted file mode 100644
index 3426f08..0000000
--- a/openflow/usr/include/c++/5/parallel/par_loop.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/par_loop.h
- *  @brief Parallelization of embarrassingly parallel execution by
- *  means of equal splitting.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_PAR_LOOP_H
-#define _GLIBCXX_PARALLEL_PAR_LOOP_H 1
-
-#include <omp.h>
-#include <parallel/settings.h>
-#include <parallel/base.h>
-#include <parallel/equally_split.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Embarrassingly parallel algorithm for random access
-   * iterators, using hand-crafted parallelization by equal splitting
-   * the work.
-   *
-   *  @param __begin Begin iterator of element sequence.
-   *  @param __end End iterator of element sequence.
-   *  @param __o User-supplied functor (comparator, predicate, adding
-   *  functor, ...)
-   *  @param __f Functor to "process" an element with __op (depends on
-   *  desired functionality, e. g. for std::for_each(), ...).
-   *  @param __r Functor to "add" a single __result to the already
-   *  processed elements (depends on functionality).
-   *  @param __base Base value for reduction.
-   *  @param __output Pointer to position where final result is written to
-   *  @param __bound Maximum number of elements processed (e. g. for
-   *  std::count_n()).
-   *  @return User-supplied functor (that may contain a part of the result).
-   */
-  template<typename _RAIter,
-	   typename _Op,
-	   typename _Fu,
-	   typename _Red,
-	   typename _Result>
-    _Op
-    __for_each_template_random_access_ed(_RAIter __begin, _RAIter __end,
-					 _Op __o, _Fu& __f, _Red __r,
-					 _Result __base, _Result& __output,
-      typename std::iterator_traits<_RAIter>::difference_type __bound)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      const _DifferenceType __length = __end - __begin;
-      _Result *__thread_results;
-      bool* __constructed;
-
-      _ThreadIndex __num_threads = __gnu_parallel::min<_DifferenceType>
-	(__get_max_threads(), __length);
-
-#     pragma omp parallel num_threads(__num_threads)
-      {
-#       pragma omp single
-	{
-	  __num_threads = omp_get_num_threads();
-	  __thread_results = static_cast<_Result*>
-	    (::operator new(__num_threads * sizeof(_Result)));
-	  __constructed = new bool[__num_threads];
-	}
-
-	_ThreadIndex __iam = omp_get_thread_num();
-
-	// Neutral element.
-	_Result* __reduct;
-
-	_DifferenceType
-	  __start = __equally_split_point(__length, __num_threads, __iam),
-	  __stop = __equally_split_point(__length, __num_threads, __iam + 1);
-
-	if (__start < __stop)
-	  {
-	    __reduct = new _Result(__f(__o, __begin + __start));
-	    ++__start;
-	    __constructed[__iam] = true;
-	  }
-	else
-	  __constructed[__iam] = false;
-
-	for (; __start < __stop; ++__start)
-	  *__reduct = __r(*__reduct, __f(__o, __begin + __start));
-
-	if (__constructed[__iam])
-	  {
-	    ::new(&__thread_results[__iam]) _Result(*__reduct);
-	    delete __reduct;
-	  }
-      } //parallel
-
-      for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	if (__constructed[__i])
-	  {
-	    __output = __r(__output, __thread_results[__i]);
-	    __thread_results[__i].~_Result();
-	  }
-
-      // Points to last element processed (needed as return value for
-      // some algorithms like transform).
-      __f._M_finish_iterator = __begin + __length;
-
-      ::operator delete(__thread_results);
-
-      delete[] __constructed;
-
-      return __o;
-    }
-
-} // end namespace
-
-#endif /* _GLIBCXX_PARALLEL_PAR_LOOP_H */
diff --git a/openflow/usr/include/c++/5/parallel/parallel.h b/openflow/usr/include/c++/5/parallel/parallel.h
deleted file mode 100644
index a199edb..0000000
--- a/openflow/usr/include/c++/5/parallel/parallel.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/parallel.h
- *  @brief End-user include file. Provides advanced settings and
- *  tuning options.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Felix Putze and Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_PARALLEL_H
-#define _GLIBCXX_PARALLEL_PARALLEL_H 1
-
-#include <parallel/features.h>
-#include <parallel/compiletime_settings.h>
-#include <parallel/types.h>
-#include <parallel/tags.h>
-#include <parallel/settings.h>
-
-#endif /* _GLIBCXX_PARALLEL_PARALLEL_H */
diff --git a/openflow/usr/include/c++/5/parallel/partial_sum.h b/openflow/usr/include/c++/5/parallel/partial_sum.h
deleted file mode 100644
index c253ffe..0000000
--- a/openflow/usr/include/c++/5/parallel/partial_sum.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/partial_sum.h
- *  @brief Parallel implementation of std::partial_sum(), i.e. prefix
-*  sums.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_PARTIAL_SUM_H
-#define _GLIBCXX_PARALLEL_PARTIAL_SUM_H 1
-
-#include <omp.h>
-#include <new>
-#include <bits/stl_algobase.h>
-#include <parallel/parallel.h>
-#include <parallel/numericfwd.h>
-
-namespace __gnu_parallel
-{
-  // Problem: there is no 0-element given.
-
-  /** @brief Base case prefix sum routine.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __result Begin iterator of output sequence.
-   *  @param __bin_op Associative binary function.
-   *  @param __value Start value. Must be passed since the neutral
-   *  element is unknown in general.
-   *  @return End iterator of output sequence. */
-  template<typename _IIter,
-	   typename _OutputIterator,
-	   typename _BinaryOperation>
-    _OutputIterator
-    __parallel_partial_sum_basecase(_IIter __begin, _IIter __end,
-				    _OutputIterator __result,
-				    _BinaryOperation __bin_op,
-      typename std::iterator_traits <_IIter>::value_type __value)
-    {
-      if (__begin == __end)
-	return __result;
-
-      while (__begin != __end)
-	{
-	  __value = __bin_op(__value, *__begin);
-	  *__result = __value;
-	  ++__result;
-	  ++__begin;
-	}
-      return __result;
-    }
-
-  /** @brief Parallel partial sum implementation, two-phase approach,
-      no recursion.
-      *  @param __begin Begin iterator of input sequence.
-      *  @param __end End iterator of input sequence.
-      *  @param __result Begin iterator of output sequence.
-      *  @param __bin_op Associative binary function.
-      *  @param __n Length of sequence.
-      *  @return End iterator of output sequence.
-      */
-  template<typename _IIter,
-	   typename _OutputIterator,
-	   typename _BinaryOperation>
-    _OutputIterator
-    __parallel_partial_sum_linear(_IIter __begin, _IIter __end,
-				  _OutputIterator __result,
-				  _BinaryOperation __bin_op,
-      typename std::iterator_traits<_IIter>::difference_type __n)
-    {
-      typedef std::iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      if (__begin == __end)
-	return __result;
-
-      _ThreadIndex __num_threads =
-        std::min<_DifferenceType>(__get_max_threads(), __n - 1);
-
-      if (__num_threads < 2)
-	{
-	  *__result = *__begin;
-	  return __parallel_partial_sum_basecase(__begin + 1, __end,
-						 __result + 1, __bin_op,
-						 *__begin);
-	}
-
-      _DifferenceType* __borders;
-      _ValueType* __sums;
-
-      const _Settings& __s = _Settings::get();
-
-#     pragma omp parallel num_threads(__num_threads)
-      {
-#       pragma omp single
-	{
-	  __num_threads = omp_get_num_threads();
-	    
-	  __borders = new _DifferenceType[__num_threads + 2];
-
-	  if (__s.partial_sum_dilation == 1.0f)
-	    __equally_split(__n, __num_threads + 1, __borders);
-	  else
-	    {
-	      _DifferenceType __first_part_length =
-		  std::max<_DifferenceType>(1,
-		    __n / (1.0f + __s.partial_sum_dilation * __num_threads));
-	      _DifferenceType __chunk_length =
-		  (__n - __first_part_length) / __num_threads;
-	      _DifferenceType __borderstart =
-		  __n - __num_threads * __chunk_length;
-	      __borders[0] = 0;
-	      for (_ThreadIndex __i = 1; __i < (__num_threads + 1); ++__i)
-		{
-		  __borders[__i] = __borderstart;
-		  __borderstart += __chunk_length;
-		}
-	      __borders[__num_threads + 1] = __n;
-	    }
-
-	  __sums = static_cast<_ValueType*>(::operator new(sizeof(_ValueType)
-                                                           * __num_threads));
-	  _OutputIterator __target_end;
-	} //single
-
-        _ThreadIndex __iam = omp_get_thread_num();
-        if (__iam == 0)
-          {
-            *__result = *__begin;
-            __parallel_partial_sum_basecase(__begin + 1,
-					    __begin + __borders[1],
-					    __result + 1,
-					    __bin_op, *__begin);
-            ::new(&(__sums[__iam])) _ValueType(*(__result + __borders[1] - 1));
-          }
-        else
-          {
-            ::new(&(__sums[__iam]))
-              _ValueType(__gnu_parallel::accumulate(
-                                         __begin + __borders[__iam] + 1,
-                                         __begin + __borders[__iam + 1],
-                                         *(__begin + __borders[__iam]),
-                                         __bin_op,
-                                         __gnu_parallel::sequential_tag()));
-          }
-
-#       pragma omp barrier
-
-#       pragma omp single
-	__parallel_partial_sum_basecase(__sums + 1, __sums + __num_threads,
-					__sums + 1, __bin_op, __sums[0]);
-
-#       pragma omp barrier
-
-	// Still same team.
-        __parallel_partial_sum_basecase(__begin + __borders[__iam + 1],
-					__begin + __borders[__iam + 2],
-					__result + __borders[__iam + 1],
-					__bin_op, __sums[__iam]);
-      } //parallel
-
-      for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	__sums[__i].~_ValueType();
-      ::operator delete(__sums);
-
-      delete[] __borders;
-
-      return __result + __n;
-    }
-
-  /** @brief Parallel partial sum front-__end.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __result Begin iterator of output sequence.
-   *  @param __bin_op Associative binary function.
-   *  @return End iterator of output sequence. */
-  template<typename _IIter,
-	   typename _OutputIterator,
-	   typename _BinaryOperation>
-    _OutputIterator
-    __parallel_partial_sum(_IIter __begin, _IIter __end,
-			   _OutputIterator __result, _BinaryOperation __bin_op)
-    {
-      _GLIBCXX_CALL(__begin - __end)
-
-      typedef std::iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _DifferenceType __n = __end - __begin;
-
-      switch (_Settings::get().partial_sum_algorithm)
-	{
-	case LINEAR:
-	  // Need an initial offset.
-	  return __parallel_partial_sum_linear(__begin, __end, __result,
-					       __bin_op, __n);
-	default:
-	  // Partial_sum algorithm not implemented.
-	  _GLIBCXX_PARALLEL_ASSERT(0);
-	  return __result + __n;
-	}
-    }
-}
-
-#endif /* _GLIBCXX_PARALLEL_PARTIAL_SUM_H */
diff --git a/openflow/usr/include/c++/5/parallel/partition.h b/openflow/usr/include/c++/5/parallel/partition.h
deleted file mode 100644
index b1912e3..0000000
--- a/openflow/usr/include/c++/5/parallel/partition.h
+++ /dev/null
@@ -1,434 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/partition.h
- *  @brief Parallel implementation of std::partition(),
- *  std::nth_element(), and std::partial_sort().
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler and Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_PARTITION_H
-#define _GLIBCXX_PARALLEL_PARTITION_H 1
-
-#include <parallel/basic_iterator.h>
-#include <parallel/sort.h>
-#include <parallel/random_number.h>
-#include <bits/stl_algo.h>
-#include <parallel/parallel.h>
-
-/** @brief Decide whether to declare certain variables volatile. */
-#define _GLIBCXX_VOLATILE volatile
-
-namespace __gnu_parallel
-{
-  /** @brief Parallel implementation of std::partition.
-    *  @param __begin Begin iterator of input sequence to split.
-    *  @param __end End iterator of input sequence to split.
-    *  @param __pred Partition predicate, possibly including some kind
-    *         of pivot.
-    *  @param __num_threads Maximum number of threads to use for this task.
-    *  @return Number of elements not fulfilling the predicate. */
-  template<typename _RAIter, typename _Predicate>
-    typename std::iterator_traits<_RAIter>::difference_type
-    __parallel_partition(_RAIter __begin, _RAIter __end,
-			 _Predicate __pred, _ThreadIndex __num_threads)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _DifferenceType __n = __end - __begin;
-
-      _GLIBCXX_CALL(__n)
-
-      const _Settings& __s = _Settings::get();
-
-      // shared
-      _GLIBCXX_VOLATILE _DifferenceType __left = 0, __right = __n - 1,
-                                        __dist = __n,
-                                        __leftover_left, __leftover_right,
-                                        __leftnew, __rightnew;
-
-      // just 0 or 1, but int to allow atomic operations
-      int* __reserved_left = 0, * __reserved_right = 0;
-
-      _DifferenceType __chunk_size = __s.partition_chunk_size;
-
-      //at least two chunks per thread
-      if (__dist >= 2 * __num_threads * __chunk_size)
-#       pragma omp parallel num_threads(__num_threads)
-	{
-#         pragma omp single
-	  {
-	    __num_threads = omp_get_num_threads();
-	    __reserved_left = new int[__num_threads];
-	    __reserved_right = new int[__num_threads];
-
-	    if (__s.partition_chunk_share > 0.0)
-	      __chunk_size = std::max<_DifferenceType>
-		(__s.partition_chunk_size, (double)__n 
-		 * __s.partition_chunk_share / (double)__num_threads);
-	    else
-	      __chunk_size = __s.partition_chunk_size;
-	  }
-
-	  while (__dist >= 2 * __num_threads * __chunk_size)
-	    {
-#             pragma omp single
-	      {
-		_DifferenceType __num_chunks = __dist / __chunk_size;
-
-		for (_ThreadIndex __r = 0; __r < __num_threads; ++__r)
-		  {
-		    __reserved_left [__r] = 0; // false
-		    __reserved_right[__r] = 0; // false
-		  }
-		__leftover_left = 0;
-		__leftover_right = 0;
-	      } //implicit barrier
-
-	      // Private.
-	      _DifferenceType __thread_left, __thread_left_border,
-		              __thread_right, __thread_right_border;
-
-	      __thread_left = __left + 1;
-	      // Just to satisfy the condition below.
-	      __thread_left_border = __thread_left - 1;
-
-	      __thread_right = __n - 1;
-             // Just to satisfy the condition below.
-	      __thread_right_border = __thread_right + 1;
-
-	      bool __iam_finished = false;
-	      while (!__iam_finished)
-		{
-		  if (__thread_left > __thread_left_border)
-		    {
-                      _DifferenceType __former_dist =
-                              __fetch_and_add(&__dist, -__chunk_size);
-                      if (__former_dist < __chunk_size)
-                        {
-                          __fetch_and_add(&__dist, __chunk_size);
-                          __iam_finished = true;
-                          break;
-                        }
-                      else
-                        {
-                          __thread_left =
-                                  __fetch_and_add(&__left, __chunk_size);
-                          __thread_left_border =
-                                  __thread_left + (__chunk_size - 1);
-                        }
-		    }
-
-		  if (__thread_right < __thread_right_border)
-		    {
-                      _DifferenceType __former_dist =
-                              __fetch_and_add(&__dist, -__chunk_size);
-                      if (__former_dist < __chunk_size)
-                        {
-                          __fetch_and_add(&__dist, __chunk_size);
-                          __iam_finished = true;
-                          break;
-                        }
-                      else
-                        {
-                          __thread_right =
-                                  __fetch_and_add(&__right, -__chunk_size);
-                          __thread_right_border =
-                                  __thread_right - (__chunk_size - 1);
-                        }
-		    }
-
-		  // Swap as usual.
-		  while (__thread_left < __thread_right)
-		    {
-		      while (__pred(__begin[__thread_left])
-			     && __thread_left <= __thread_left_border)
-			++__thread_left;
-		      while (!__pred(__begin[__thread_right])
-			     && __thread_right >= __thread_right_border)
-			--__thread_right;
-
-		      if (__thread_left > __thread_left_border
-			  || __thread_right < __thread_right_border)
-			// Fetch new chunk(__s).
-			break;
-
-		      std::iter_swap(__begin + __thread_left,
-                             __begin + __thread_right);
-		      ++__thread_left;
-		      --__thread_right;
-		    }
-		}
-
-	      // Now swap the leftover chunks to the right places.
-	      if (__thread_left <= __thread_left_border)
-#               pragma omp atomic
-		++__leftover_left;
-	      if (__thread_right >= __thread_right_border)
-#               pragma omp atomic
-		++__leftover_right;
-
-#             pragma omp barrier
-
-              _DifferenceType
-                    __leftold = __left,
-                    __leftnew = __left - __leftover_left * __chunk_size,
-                    __rightold = __right,
-                    __rightnew = __right + __leftover_right * __chunk_size;
-
-	      // <=> __thread_left_border + (__chunk_size - 1) >= __leftnew
-	      if (__thread_left <= __thread_left_border
-		  && __thread_left_border >= __leftnew)
-		{
-		  // Chunk already in place, reserve spot.
-		__reserved_left[(__left - (__thread_left_border + 1))
-				/ __chunk_size] = 1;
-		}
-
-	      // <=> __thread_right_border - (__chunk_size - 1) <= __rightnew
-	      if (__thread_right >= __thread_right_border
-		  && __thread_right_border <= __rightnew)
-		{
-		  // Chunk already in place, reserve spot.
-		  __reserved_right[((__thread_right_border - 1) - __right)
-				   / __chunk_size] = 1;
-		}
-
-#             pragma omp barrier
-
-	      if (__thread_left <= __thread_left_border
-		  && __thread_left_border < __leftnew)
-		{
-		  // Find spot and swap.
-		  _DifferenceType __swapstart = -1;
-                  for (int __r = 0; __r < __leftover_left; ++__r)
-                    if (__reserved_left[__r] == 0
-                        && __compare_and_swap(&(__reserved_left[__r]), 0, 1))
-                      {
-                        __swapstart = __leftold - (__r + 1) * __chunk_size;
-                        break;
-                      }
-
-#if _GLIBCXX_ASSERTIONS
-		  _GLIBCXX_PARALLEL_ASSERT(__swapstart != -1);
-#endif
-
-		  std::swap_ranges(__begin + __thread_left_border
-				   - (__chunk_size - 1),
-				   __begin + __thread_left_border + 1,
-				   __begin + __swapstart);
-		}
-
-	      if (__thread_right >= __thread_right_border
-		  && __thread_right_border > __rightnew)
-		{
-		  // Find spot and swap
-		  _DifferenceType __swapstart = -1;
-                  for (int __r = 0; __r < __leftover_right; ++__r)
-                    if (__reserved_right[__r] == 0
-                        && __compare_and_swap(&(__reserved_right[__r]), 0, 1))
-                      {
-                        __swapstart = __rightold + __r * __chunk_size + 1;
-                        break;
-                      }
-
-#if _GLIBCXX_ASSERTIONS
-		  _GLIBCXX_PARALLEL_ASSERT(__swapstart != -1);
-#endif
-
-		  std::swap_ranges(__begin + __thread_right_border,
-				   __begin + __thread_right_border
-				   + __chunk_size, __begin + __swapstart);
-	      }
-#if _GLIBCXX_ASSERTIONS
-#             pragma omp barrier
-
-#             pragma omp single
-	      {
-		for (_DifferenceType __r = 0; __r < __leftover_left; ++__r)
-		  _GLIBCXX_PARALLEL_ASSERT(__reserved_left[__r] == 1);
-		for (_DifferenceType __r = 0; __r < __leftover_right; ++__r)
-		  _GLIBCXX_PARALLEL_ASSERT(__reserved_right[__r] == 1);
-	      }
-#endif
-
-	      __left = __leftnew;
-	      __right = __rightnew;
-              __dist = __right - __left + 1;
-	    }
-
-#           pragma omp flush(__left, __right)
-	} // end "recursion" //parallel
-
-        _DifferenceType __final_left = __left, __final_right = __right;
-
-	while (__final_left < __final_right)
-	  {
-	    // Go right until key is geq than pivot.
-	    while (__pred(__begin[__final_left])
-		   && __final_left < __final_right)
-	      ++__final_left;
-
-	    // Go left until key is less than pivot.
-	    while (!__pred(__begin[__final_right])
-		   && __final_left < __final_right)
-	      --__final_right;
-
-	    if (__final_left == __final_right)
-	      break;
-	    std::iter_swap(__begin + __final_left, __begin + __final_right);
-	    ++__final_left;
-	    --__final_right;
-	  }
-
-	// All elements on the left side are < piv, all elements on the
-	// right are >= piv
-	delete[] __reserved_left;
-	delete[] __reserved_right;
-
-	// Element "between" __final_left and __final_right might not have
-	// been regarded yet
-	if (__final_left < __n && !__pred(__begin[__final_left]))
-	  // Really swapped.
-	  return __final_left;
-	else
-	  return __final_left + 1;
-    }
-
-  /**
-    *  @brief Parallel implementation of std::nth_element().
-    *  @param __begin Begin iterator of input sequence.
-    *  @param __nth _Iterator of element that must be in position afterwards.
-    *  @param __end End iterator of input sequence.
-    *  @param __comp Comparator.
-    */
-  template<typename _RAIter, typename _Compare>
-    void 
-    __parallel_nth_element(_RAIter __begin, _RAIter __nth, 
-			   _RAIter __end, _Compare __comp)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _GLIBCXX_CALL(__end - __begin)
-
-      _RAIter __split;
-      _RandomNumber __rng;
-
-      const _Settings& __s = _Settings::get();
-      _DifferenceType __minimum_length = std::max<_DifferenceType>(2,
-        std::max(__s.nth_element_minimal_n, __s.partition_minimal_n));
-
-      // Break if input range to small.
-      while (static_cast<_SequenceIndex>(__end - __begin) >= __minimum_length)
-	{
-          _DifferenceType __n = __end - __begin;
-
-          _RAIter __pivot_pos = __begin + __rng(__n);
-
-          // Swap __pivot_pos value to end.
-          if (__pivot_pos != (__end - 1))
-            std::iter_swap(__pivot_pos, __end - 1);
-          __pivot_pos = __end - 1;
-
-          // _Compare must have first_value_type, second_value_type,
-          // result_type
-          // _Compare ==
-          // __gnu_parallel::_Lexicographic<S, int,
-	  //                                __gnu_parallel::_Less<S, S> >
-          // __pivot_pos == std::pair<S, int>*
-          __gnu_parallel::__binder2nd<_Compare, _ValueType, _ValueType, bool>
-            __pred(__comp, *__pivot_pos);
-
-          // Divide, leave pivot unchanged in last place.
-          _RAIter __split_pos1, __split_pos2;
-          __split_pos1 = __begin + __parallel_partition(__begin, __end - 1,
-							__pred,
-							__get_max_threads());
-
-          // Left side: < __pivot_pos; __right side: >= __pivot_pos
-
-          // Swap pivot back to middle.
-          if (__split_pos1 != __pivot_pos)
-            std::iter_swap(__split_pos1, __pivot_pos);
-          __pivot_pos = __split_pos1;
-
-          // In case all elements are equal, __split_pos1 == 0
-          if ((__split_pos1 + 1 - __begin) < (__n >> 7)
-              || (__end - __split_pos1) < (__n >> 7))
-            {
-              // Very unequal split, one part smaller than one 128th
-              // elements not strictly larger than the pivot.
-              __gnu_parallel::__unary_negate<__gnu_parallel::
-        	__binder1st<_Compare, _ValueType,
-		            _ValueType, bool>, _ValueType>
-        	__pred(__gnu_parallel::__binder1st<_Compare, _ValueType,
-		       _ValueType, bool>(__comp, *__pivot_pos));
-
-              // Find other end of pivot-equal range.
-              __split_pos2 = __gnu_sequential::partition(__split_pos1 + 1,
-							 __end, __pred);
-            }
-          else
-            // Only skip the pivot.
-            __split_pos2 = __split_pos1 + 1;
-
-          // Compare iterators.
-          if (__split_pos2 <= __nth)
-            __begin = __split_pos2;
-          else if (__nth < __split_pos1)
-            __end = __split_pos1;
-          else
-            break;
-	}
-
-      // Only at most _Settings::partition_minimal_n __elements __left.
-      __gnu_sequential::nth_element(__begin, __nth, __end, __comp);
-    }
-
-  /** @brief Parallel implementation of std::partial_sort().
-  *  @param __begin Begin iterator of input sequence.
-  *  @param __middle Sort until this position.
-  *  @param __end End iterator of input sequence.
-  *  @param __comp Comparator. */
-  template<typename _RAIter, typename _Compare>
-    void
-    __parallel_partial_sort(_RAIter __begin,
-			    _RAIter __middle,
-			    _RAIter __end, _Compare __comp)
-    {
-      __parallel_nth_element(__begin, __middle, __end, __comp);
-      std::sort(__begin, __middle, __comp);
-    }
-
-} //namespace __gnu_parallel
-
-#undef _GLIBCXX_VOLATILE
-
-#endif /* _GLIBCXX_PARALLEL_PARTITION_H */
diff --git a/openflow/usr/include/c++/5/parallel/queue.h b/openflow/usr/include/c++/5/parallel/queue.h
deleted file mode 100644
index a20e8e5..0000000
--- a/openflow/usr/include/c++/5/parallel/queue.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/queue.h
- *  @brief Lock-free double-ended queue.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_QUEUE_H
-#define _GLIBCXX_PARALLEL_QUEUE_H 1
-
-#include <parallel/types.h>
-#include <parallel/base.h>
-#include <parallel/compatibility.h>
-
-/** @brief Decide whether to declare certain variable volatile in this file. */
-#define _GLIBCXX_VOLATILE volatile
-
-namespace __gnu_parallel
-{
-  /**@brief Double-ended queue of bounded size, allowing lock-free
-   *  atomic access.  push_front() and pop_front() must not be called
-   *  concurrently to each other, while pop_back() can be called
-   *  concurrently at all times.
-   *  @c empty(), @c size(), and @c top() are intentionally not provided.
-   *  Calling them would not make sense in a concurrent setting.
-   *  @param _Tp Contained element type. */
-  template<typename _Tp>
-    class _RestrictedBoundedConcurrentQueue
-    {
-    private:
-      /** @brief Array of elements, seen as cyclic buffer. */
-      _Tp* _M_base;
-
-      /** @brief Maximal number of elements contained at the same time. */
-      _SequenceIndex _M_max_size;
-
-      /** @brief Cyclic __begin and __end pointers contained in one
-          atomically changeable value. */
-      _GLIBCXX_VOLATILE _CASable _M_borders;
-
-    public:
-      /** @brief Constructor. Not to be called concurrent, of course.
-       *  @param __max_size Maximal number of elements to be contained. */
-      _RestrictedBoundedConcurrentQueue(_SequenceIndex __max_size)
-      {
-        _M_max_size = __max_size;
-        _M_base = new _Tp[__max_size];
-        _M_borders = __encode2(0, 0);
-#pragma omp flush
-      }
-
-      /** @brief Destructor. Not to be called concurrent, of course. */
-      ~_RestrictedBoundedConcurrentQueue()
-      { delete[] _M_base; }
-
-      /** @brief Pushes one element into the queue at the front end.
-       *  Must not be called concurrently with pop_front(). */
-      void
-      push_front(const _Tp& __t)
-      {
-        _CASable __former_borders = _M_borders;
-        int __former_front, __former_back;
-        __decode2(__former_borders, __former_front, __former_back);
-        *(_M_base + __former_front % _M_max_size) = __t;
-#if _GLIBCXX_ASSERTIONS
-        // Otherwise: front - back > _M_max_size eventually.
-        _GLIBCXX_PARALLEL_ASSERT(((__former_front + 1) - __former_back)
-                                 <= _M_max_size);
-#endif
-        __fetch_and_add(&_M_borders, __encode2(1, 0));
-      }
-
-      /** @brief Pops one element from the queue at the front end.
-       *  Must not be called concurrently with pop_front(). */
-      bool
-      pop_front(_Tp& __t)
-      {
-        int __former_front, __former_back;
-#pragma omp flush
-        __decode2(_M_borders, __former_front, __former_back);
-        while (__former_front > __former_back)
-          {
-            // Chance.
-            _CASable __former_borders = __encode2(__former_front,
-						  __former_back);
-            _CASable __new_borders = __encode2(__former_front - 1,
-					       __former_back);
-            if (__compare_and_swap(&_M_borders, __former_borders,
-				   __new_borders))
-              {
-                __t = *(_M_base + (__former_front - 1) % _M_max_size);
-                return true;
-              }
-#pragma omp flush
-            __decode2(_M_borders, __former_front, __former_back);
-          }
-        return false;
-      }
-
-      /** @brief Pops one element from the queue at the front end.
-       *  Must not be called concurrently with pop_front(). */
-      bool
-      pop_back(_Tp& __t)        //queue behavior
-      {
-        int __former_front, __former_back;
-#pragma omp flush
-        __decode2(_M_borders, __former_front, __former_back);
-        while (__former_front > __former_back)
-          {
-            // Chance.
-            _CASable __former_borders = __encode2(__former_front,
-						  __former_back);
-            _CASable __new_borders = __encode2(__former_front,
-					       __former_back + 1);
-            if (__compare_and_swap(&_M_borders, __former_borders,
-				   __new_borders))
-              {
-                __t = *(_M_base + __former_back % _M_max_size);
-                return true;
-              }
-#pragma omp flush
-            __decode2(_M_borders, __former_front, __former_back);
-          }
-        return false;
-      }
-  };
-}       //namespace __gnu_parallel
-
-#undef _GLIBCXX_VOLATILE
-
-#endif /* _GLIBCXX_PARALLEL_QUEUE_H */
diff --git a/openflow/usr/include/c++/5/parallel/quicksort.h b/openflow/usr/include/c++/5/parallel/quicksort.h
deleted file mode 100644
index 55a7958..0000000
--- a/openflow/usr/include/c++/5/parallel/quicksort.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/quicksort.h
- *  @brief Implementation of a unbalanced parallel quicksort (in-place).
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_QUICKSORT_H
-#define _GLIBCXX_PARALLEL_QUICKSORT_H 1
-
-#include <parallel/parallel.h>
-#include <parallel/partition.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Unbalanced quicksort divide step.
-   *  @param __begin Begin iterator of subsequence.
-   *  @param __end End iterator of subsequence.
-   *  @param __comp Comparator.
-   *  @param __pivot_rank Desired __rank of the pivot.
-   *  @param __num_samples Choose pivot from that many samples.
-   *  @param __num_threads Number of threads that are allowed to work on
-   *  this part.
-   */
-  template<typename _RAIter, typename _Compare>
-    typename std::iterator_traits<_RAIter>::difference_type
-    __parallel_sort_qs_divide(_RAIter __begin, _RAIter __end,
-			      _Compare __comp, typename std::iterator_traits
-			      <_RAIter>::difference_type __pivot_rank,
-			      typename std::iterator_traits
-			      <_RAIter>::difference_type
-			      __num_samples, _ThreadIndex __num_threads)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _DifferenceType __n = __end - __begin;
-      __num_samples = std::min(__num_samples, __n);
-
-      // Allocate uninitialized, to avoid default constructor.
-      _ValueType* __samples = static_cast<_ValueType*>
-	(::operator new(__num_samples * sizeof(_ValueType)));
-
-      for (_DifferenceType __s = 0; __s < __num_samples; ++__s)
-        {
-          const unsigned long long __index = static_cast<unsigned long long>
-	    (__s) * __n / __num_samples;
-          ::new(&(__samples[__s])) _ValueType(__begin[__index]);
-        }
-
-      __gnu_sequential::sort(__samples, __samples + __num_samples, __comp);
-
-      _ValueType& __pivot = __samples[__pivot_rank * __num_samples / __n];
-
-      __gnu_parallel::__binder2nd<_Compare, _ValueType, _ValueType, bool>
-        __pred(__comp, __pivot);
-      _DifferenceType __split = __parallel_partition(__begin, __end,
-						     __pred, __num_threads);
-
-      for (_DifferenceType __s = 0; __s < __num_samples; ++__s)
-	__samples[__s].~_ValueType();
-      ::operator delete(__samples);
-
-      return __split;
-    }
-
-  /** @brief Unbalanced quicksort conquer step.
-   *  @param __begin Begin iterator of subsequence.
-   *  @param __end End iterator of subsequence.
-   *  @param __comp Comparator.
-   *  @param __num_threads Number of threads that are allowed to work on
-   *  this part.
-   */
-  template<typename _RAIter, typename _Compare>
-    void
-    __parallel_sort_qs_conquer(_RAIter __begin, _RAIter __end,
-			       _Compare __comp,
-			       _ThreadIndex __num_threads)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      if (__num_threads <= 1)
-        {
-          __gnu_sequential::sort(__begin, __end, __comp);
-          return;
-        }
-
-      _DifferenceType __n = __end - __begin, __pivot_rank;
-
-      if (__n <= 1)
-        return;
-
-      _ThreadIndex __num_threads_left;
-
-      if ((__num_threads % 2) == 1)
-        __num_threads_left = __num_threads / 2 + 1;
-      else
-        __num_threads_left = __num_threads / 2;
-
-      __pivot_rank = __n * __num_threads_left / __num_threads;
-
-      _DifferenceType __split = __parallel_sort_qs_divide
-	(__begin, __end, __comp, __pivot_rank,
-	 _Settings::get().sort_qs_num_samples_preset, __num_threads);
-
-#pragma omp parallel sections num_threads(2)
-      {
-#pragma omp section
-        __parallel_sort_qs_conquer(__begin, __begin + __split,
-				   __comp, __num_threads_left);
-#pragma omp section
-        __parallel_sort_qs_conquer(__begin + __split, __end,
-				   __comp, __num_threads - __num_threads_left);
-      }
-    }
-
-
-  /** @brief Unbalanced quicksort main call.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator input sequence, ignored.
-   *  @param __comp Comparator.
-   *  @param __num_threads Number of threads that are allowed to work on
-   *  this part.
-   */
-  template<typename _RAIter, typename _Compare>
-    void
-    __parallel_sort_qs(_RAIter __begin, _RAIter __end,
-		       _Compare __comp,
-		       _ThreadIndex __num_threads)
-    {
-      _GLIBCXX_CALL(__n)
-
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _DifferenceType __n = __end - __begin;
-
-      // At least one element per processor.
-      if (__num_threads > __n)
-        __num_threads = static_cast<_ThreadIndex>(__n);
-
-      __parallel_sort_qs_conquer(
-        __begin, __begin + __n, __comp, __num_threads);
-    }
-
-} //namespace __gnu_parallel
-
-#endif /* _GLIBCXX_PARALLEL_QUICKSORT_H */
diff --git a/openflow/usr/include/c++/5/parallel/random_number.h b/openflow/usr/include/c++/5/parallel/random_number.h
deleted file mode 100644
index c589682..0000000
--- a/openflow/usr/include/c++/5/parallel/random_number.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/random_number.h
- *  @brief Random number generator based on the Mersenne twister.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_RANDOM_NUMBER_H
-#define _GLIBCXX_PARALLEL_RANDOM_NUMBER_H 1
-
-#include <parallel/types.h>
-#include <tr1/random>
-#include <limits>
-
-namespace __gnu_parallel
-{
-  /** @brief Random number generator, based on the Mersenne twister. */
-  class _RandomNumber
-  {
-  private:
-    std::tr1::mt19937   _M_mt;
-    uint64_t            _M_supremum;
-    uint64_t            _M_rand_sup;
-    double              _M_supremum_reciprocal;
-    double              _M_rand_sup_reciprocal;
-
-    // Assumed to be twice as long as the usual random number.
-    uint64_t              __cache;
-
-    // Bit results.
-    int __bits_left;
-    
-    static uint32_t
-    __scale_down(uint64_t __x,
-#if _GLIBCXX_SCALE_DOWN_FPU
-               uint64_t /*_M_supremum*/, double _M_supremum_reciprocal)
-#else
-               uint64_t _M_supremum, double /*_M_supremum_reciprocal*/)
-#endif
-        {
-#if _GLIBCXX_SCALE_DOWN_FPU
-          return uint32_t(__x * _M_supremum_reciprocal);
-#else
-          return static_cast<uint32_t>(__x % _M_supremum);
-#endif
-        }
-
-  public:
-    /** @brief Default constructor. Seed with 0. */
-    _RandomNumber()
-    : _M_mt(0), _M_supremum(0x100000000ULL),
-      _M_rand_sup(1ULL << std::numeric_limits<uint32_t>::digits),
-      _M_supremum_reciprocal(double(_M_supremum) / double(_M_rand_sup)),
-      _M_rand_sup_reciprocal(1.0 / double(_M_rand_sup)),
-      __cache(0), __bits_left(0) { }
-
-    /** @brief Constructor.
-     *  @param __seed Random __seed.
-     *  @param _M_supremum Generate integer random numbers in the
-     *                  interval @c [0,_M_supremum). */
-    _RandomNumber(uint32_t __seed, uint64_t _M_supremum = 0x100000000ULL)
-    : _M_mt(__seed), _M_supremum(_M_supremum),
-      _M_rand_sup(1ULL << std::numeric_limits<uint32_t>::digits),
-      _M_supremum_reciprocal(double(_M_supremum) / double(_M_rand_sup)),
-      _M_rand_sup_reciprocal(1.0 / double(_M_rand_sup)),
-      __cache(0), __bits_left(0) { }
-
-    /** @brief Generate unsigned random 32-bit integer. */
-    uint32_t
-    operator()()
-    { return __scale_down(_M_mt(), _M_supremum, _M_supremum_reciprocal); }
-
-    /** @brief Generate unsigned random 32-bit integer in the
-        interval @c [0,local_supremum). */
-    uint32_t
-    operator()(uint64_t local_supremum)
-    {
-      return __scale_down(_M_mt(), local_supremum,
-                        double(local_supremum * _M_rand_sup_reciprocal));
-    }
-
-    /** @brief Generate a number of random bits, run-time parameter.
-     *  @param __bits Number of bits to generate. */
-    unsigned long
-    __genrand_bits(int __bits)
-    {
-      unsigned long __res = __cache & ((1 << __bits) - 1);
-      __cache = __cache >> __bits;
-      __bits_left -= __bits;
-      if (__bits_left < 32)
-        {
-          __cache |= ((uint64_t(_M_mt())) << __bits_left);
-          __bits_left += 32;
-        }
-      return __res;
-    }
-};
-
-} // namespace __gnu_parallel
-
-#endif /* _GLIBCXX_PARALLEL_RANDOM_NUMBER_H */
diff --git a/openflow/usr/include/c++/5/parallel/random_shuffle.h b/openflow/usr/include/c++/5/parallel/random_shuffle.h
deleted file mode 100644
index 2220489..0000000
--- a/openflow/usr/include/c++/5/parallel/random_shuffle.h
+++ /dev/null
@@ -1,533 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/random_shuffle.h
- *  @brief Parallel implementation of std::random_shuffle().
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_RANDOM_SHUFFLE_H
-#define _GLIBCXX_PARALLEL_RANDOM_SHUFFLE_H 1
-
-#include <limits>
-#include <bits/stl_numeric.h>
-#include <parallel/parallel.h>
-#include <parallel/random_number.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Type to hold the index of a bin.
-    *
-    *  Since many variables of this type are allocated, it should be
-    *  chosen as small as possible.
-    */
-  typedef unsigned short _BinIndex;
-
-  /** @brief Data known to every thread participating in
-      __gnu_parallel::__parallel_random_shuffle(). */
-  template<typename _RAIter>
-    struct _DRandomShufflingGlobalData
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      /** @brief Begin iterator of the __source. */
-      _RAIter& _M_source;
-
-      /** @brief Temporary arrays for each thread. */
-      _ValueType** _M_temporaries;
-
-      /** @brief Two-dimensional array to hold the thread-bin distribution.
-       *
-       *  Dimensions (_M_num_threads + 1) __x (_M_num_bins + 1). */
-      _DifferenceType** _M_dist;
-
-      /** @brief Start indexes of the threads' __chunks. */
-      _DifferenceType* _M_starts;
-
-      /** @brief Number of the thread that will further process the
-          corresponding bin. */
-      _ThreadIndex* _M_bin_proc;
-
-      /** @brief Number of bins to distribute to. */
-      int _M_num_bins;
-
-      /** @brief Number of bits needed to address the bins. */
-      int _M_num_bits;
-
-      /** @brief Constructor. */
-      _DRandomShufflingGlobalData(_RAIter& __source)
-      : _M_source(__source) { }
-    };
-
-  /** @brief Local data for a thread participating in
-      __gnu_parallel::__parallel_random_shuffle().
-    */
-  template<typename _RAIter, typename _RandomNumberGenerator>
-    struct _DRSSorterPU
-    {
-      /** @brief Number of threads participating in total. */
-      int _M_num_threads;
-
-      /** @brief Begin index for bins taken care of by this thread. */
-      _BinIndex _M_bins_begin;
-
-      /** @brief End index for bins taken care of by this thread. */
-      _BinIndex __bins_end;
-
-      /** @brief Random _M_seed for this thread. */
-      uint32_t _M_seed;
-
-      /** @brief Pointer to global data. */
-      _DRandomShufflingGlobalData<_RAIter>* _M_sd;
-    };
-
-  /** @brief Generate a random number in @c [0,2^__logp).
-    *  @param __logp Logarithm (basis 2) of the upper range __bound.
-    *  @param __rng Random number generator to use.
-    */
-  template<typename _RandomNumberGenerator>
-    inline int
-    __random_number_pow2(int __logp, _RandomNumberGenerator& __rng)
-    { return __rng.__genrand_bits(__logp); }
-
-  /** @brief Random shuffle code executed by each thread.
-    *  @param __pus Array of thread-local data records. */
-  template<typename _RAIter, typename _RandomNumberGenerator>
-    void 
-    __parallel_random_shuffle_drs_pu(_DRSSorterPU<_RAIter,
-				     _RandomNumberGenerator>* __pus)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _ThreadIndex __iam = omp_get_thread_num();
-      _DRSSorterPU<_RAIter, _RandomNumberGenerator>* __d = &__pus[__iam];
-      _DRandomShufflingGlobalData<_RAIter>* __sd = __d->_M_sd;
-
-      // Indexing: _M_dist[bin][processor]
-      _DifferenceType __length = (__sd->_M_starts[__iam + 1]
-				  - __sd->_M_starts[__iam]);
-      _BinIndex* __oracles = new _BinIndex[__length];
-      _DifferenceType* __dist = new _DifferenceType[__sd->_M_num_bins + 1];
-      _BinIndex* __bin_proc = new _BinIndex[__sd->_M_num_bins];
-      _ValueType** __temporaries = new _ValueType*[__d->_M_num_threads];
-
-      // Compute oracles and count appearances.
-      for (_BinIndex __b = 0; __b < __sd->_M_num_bins + 1; ++__b)
-	__dist[__b] = 0;
-      int __num_bits = __sd->_M_num_bits;
-
-      _RandomNumber __rng(__d->_M_seed);
-
-      // First main loop.
-      for (_DifferenceType __i = 0; __i < __length; ++__i)
-	{
-          _BinIndex __oracle = __random_number_pow2(__num_bits, __rng);
-          __oracles[__i] = __oracle;
-
-          // To allow prefix (partial) sum.
-          ++(__dist[__oracle + 1]);
-	}
-
-      for (_BinIndex __b = 0; __b < __sd->_M_num_bins + 1; ++__b)
-	__sd->_M_dist[__b][__iam + 1] = __dist[__b];
-
-#     pragma omp barrier
-
-#     pragma omp single
-      {
-	// Sum up bins, __sd->_M_dist[__s + 1][__d->_M_num_threads] now
-	// contains the total number of items in bin __s
-	for (_BinIndex __s = 0; __s < __sd->_M_num_bins; ++__s)
-          __gnu_sequential::partial_sum(__sd->_M_dist[__s + 1],
-					__sd->_M_dist[__s + 1]
-					+ __d->_M_num_threads + 1,
-					__sd->_M_dist[__s + 1]);
-      }
-
-#     pragma omp barrier
-
-      _SequenceIndex __offset = 0, __global_offset = 0;
-      for (_BinIndex __s = 0; __s < __d->_M_bins_begin; ++__s)
-	__global_offset += __sd->_M_dist[__s + 1][__d->_M_num_threads];
-
-#     pragma omp barrier
-
-      for (_BinIndex __s = __d->_M_bins_begin; __s < __d->__bins_end; ++__s)
-	{
-          for (int __t = 0; __t < __d->_M_num_threads + 1; ++__t)
-            __sd->_M_dist[__s + 1][__t] += __offset;
-          __offset = __sd->_M_dist[__s + 1][__d->_M_num_threads];
-	}
-
-      __sd->_M_temporaries[__iam] = static_cast<_ValueType*>
-	(::operator new(sizeof(_ValueType) * __offset));
-
-#     pragma omp barrier
-
-      // Draw local copies to avoid false sharing.
-      for (_BinIndex __b = 0; __b < __sd->_M_num_bins + 1; ++__b)
-	__dist[__b] = __sd->_M_dist[__b][__iam];
-      for (_BinIndex __b = 0; __b < __sd->_M_num_bins; ++__b)
-	__bin_proc[__b] = __sd->_M_bin_proc[__b];
-      for (_ThreadIndex __t = 0; __t < __d->_M_num_threads; ++__t)
-	__temporaries[__t] = __sd->_M_temporaries[__t];
-
-      _RAIter __source = __sd->_M_source;
-      _DifferenceType __start = __sd->_M_starts[__iam];
-
-      // Distribute according to oracles, second main loop.
-      for (_DifferenceType __i = 0; __i < __length; ++__i)
-	{
-          _BinIndex __target_bin = __oracles[__i];
-          _ThreadIndex __target_p = __bin_proc[__target_bin];
-
-          // Last column [__d->_M_num_threads] stays unchanged.
-	  ::new(&(__temporaries[__target_p][__dist[__target_bin + 1]++]))
-              _ValueType(*(__source + __i + __start));
-	}
-
-      delete[] __oracles;
-      delete[] __dist;
-      delete[] __bin_proc;
-      delete[] __temporaries;
-
-#     pragma omp barrier
-
-      // Shuffle bins internally.
-      for (_BinIndex __b = __d->_M_bins_begin; __b < __d->__bins_end; ++__b)
-	{
-          _ValueType* __begin =
-	    (__sd->_M_temporaries[__iam]
-	     + (__b == __d->_M_bins_begin
-		? 0 : __sd->_M_dist[__b][__d->_M_num_threads])),
-	    *__end = (__sd->_M_temporaries[__iam]
-		      + __sd->_M_dist[__b + 1][__d->_M_num_threads]);
-
-          __sequential_random_shuffle(__begin, __end, __rng);
-          std::copy(__begin, __end, __sd->_M_source + __global_offset
-		    + (__b == __d->_M_bins_begin
-		       ? 0 : __sd->_M_dist[__b][__d->_M_num_threads]));
-	}
-
-      for (_SequenceIndex __i = 0; __i < __offset; ++__i)
-	__sd->_M_temporaries[__iam][__i].~_ValueType();
-      ::operator delete(__sd->_M_temporaries[__iam]);
-    }
-
-  /** @brief Round up to the next greater power of 2.
-    *  @param __x _Integer to round up */
-  template<typename _Tp>
-    _Tp 
-    __round_up_to_pow2(_Tp __x)
-    {
-      if (__x <= 1)
-	return 1;
-      else
-	return (_Tp)1 << (__rd_log2(__x - 1) + 1);
-    }
-
-  /** @brief Main parallel random shuffle step.
-    *  @param __begin Begin iterator of sequence.
-    *  @param __end End iterator of sequence.
-    *  @param __n Length of sequence.
-    *  @param __num_threads Number of threads to use.
-    *  @param __rng Random number generator to use.
-    */
-  template<typename _RAIter, typename _RandomNumberGenerator>
-    void
-    __parallel_random_shuffle_drs(_RAIter __begin, _RAIter __end,
-				  typename std::iterator_traits
-				  <_RAIter>::difference_type __n,
-				  _ThreadIndex __num_threads,
-				  _RandomNumberGenerator& __rng)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _GLIBCXX_CALL(__n)
-
-      const _Settings& __s = _Settings::get();
-
-      if (__num_threads > __n)
-	__num_threads = static_cast<_ThreadIndex>(__n);
-
-      _BinIndex __num_bins, __num_bins_cache;
-
-#if _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_L1
-      // Try the L1 cache first.
-
-      // Must fit into L1.
-      __num_bins_cache =
-	std::max<_DifferenceType>(1, __n / (__s.L1_cache_size_lb
-					    / sizeof(_ValueType)));
-      __num_bins_cache = __round_up_to_pow2(__num_bins_cache);
-
-      // No more buckets than TLB entries, power of 2
-      // Power of 2 and at least one element per bin, at most the TLB size.
-      __num_bins = std::min<_DifferenceType>(__n, __num_bins_cache);
-
-#if _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_TLB
-      // 2 TLB entries needed per bin.
-      __num_bins = std::min<_DifferenceType>(__s.TLB_size / 2, __num_bins);
-#endif
-      __num_bins = __round_up_to_pow2(__num_bins);
-
-      if (__num_bins < __num_bins_cache)
-	{
-#endif
-          // Now try the L2 cache
-          // Must fit into L2
-          __num_bins_cache = static_cast<_BinIndex>
-	    (std::max<_DifferenceType>(1, __n / (__s.L2_cache_size
-						 / sizeof(_ValueType))));
-          __num_bins_cache = __round_up_to_pow2(__num_bins_cache);
-
-          // No more buckets than TLB entries, power of 2.
-          __num_bins = static_cast<_BinIndex>
-	    (std::min(__n, static_cast<_DifferenceType>(__num_bins_cache)));
-          // Power of 2 and at least one element per bin, at most the TLB size.
-#if _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_TLB
-          // 2 TLB entries needed per bin.
-          __num_bins = std::min(static_cast<_DifferenceType>(__s.TLB_size / 2),
-				__num_bins);
-#endif
-            __num_bins = __round_up_to_pow2(__num_bins);
-#if _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_L1
-	}
-#endif
-
-      __num_bins = __round_up_to_pow2(
-                        std::max<_BinIndex>(__num_threads, __num_bins));
-
-      if (__num_threads <= 1)
-      {
-        _RandomNumber __derived_rng(
-                            __rng(std::numeric_limits<uint32_t>::max()));
-	__sequential_random_shuffle(__begin, __end, __derived_rng);
-        return;
-      }
-
-      _DRandomShufflingGlobalData<_RAIter> __sd(__begin);
-      _DRSSorterPU<_RAIter, _RandomNumber >* __pus;
-      _DifferenceType* __starts;
-
-#     pragma omp parallel num_threads(__num_threads)
-      {
-	_ThreadIndex __num_threads = omp_get_num_threads();
-#       pragma omp single
-	{
-	  __pus = new _DRSSorterPU<_RAIter, _RandomNumber>[__num_threads];
-	  
-	  __sd._M_temporaries = new _ValueType*[__num_threads];
-	  __sd._M_dist = new _DifferenceType*[__num_bins + 1];
-	  __sd._M_bin_proc = new _ThreadIndex[__num_bins];
-	  for (_BinIndex __b = 0; __b < __num_bins + 1; ++__b)
-	    __sd._M_dist[__b] = new _DifferenceType[__num_threads + 1];
-	  for (_BinIndex __b = 0; __b < (__num_bins + 1); ++__b)
-	    {
-	      __sd._M_dist[0][0] = 0;
-	      __sd._M_dist[__b][0] = 0;
-	    }
-	  __starts = __sd._M_starts = new _DifferenceType[__num_threads + 1];
-	  int __bin_cursor = 0;
-	  __sd._M_num_bins = __num_bins;
-	  __sd._M_num_bits = __rd_log2(__num_bins);
-
-	  _DifferenceType __chunk_length = __n / __num_threads,
-	                         __split = __n % __num_threads,
-	                         __start = 0;
-	  _DifferenceType __bin_chunk_length = __num_bins / __num_threads,
-	                         __bin_split = __num_bins % __num_threads;
-	  for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	    {
-	      __starts[__i] = __start;
-	      __start += (__i < __split
-			  ? (__chunk_length + 1) : __chunk_length);
-	      int __j = __pus[__i]._M_bins_begin = __bin_cursor;
-
-	      // Range of bins for this processor.
-	      __bin_cursor += (__i < __bin_split
-			       ? (__bin_chunk_length + 1)
-			       : __bin_chunk_length);
-	      __pus[__i].__bins_end = __bin_cursor;
-	      for (; __j < __bin_cursor; ++__j)
-		__sd._M_bin_proc[__j] = __i;
-	      __pus[__i]._M_num_threads = __num_threads;
-	      __pus[__i]._M_seed = __rng(std::numeric_limits<uint32_t>::max());
-	      __pus[__i]._M_sd = &__sd;
-	    }
-	  __starts[__num_threads] = __start;
-	} //single
-          // Now shuffle in parallel.
-	__parallel_random_shuffle_drs_pu(__pus);
-      }  // parallel
-
-      delete[] __starts;
-      delete[] __sd._M_bin_proc;
-      for (int __s = 0; __s < (__num_bins + 1); ++__s)
-	delete[] __sd._M_dist[__s];
-      delete[] __sd._M_dist;
-      delete[] __sd._M_temporaries;
-
-      delete[] __pus;
-    }
-
-  /** @brief Sequential cache-efficient random shuffle.
-   *  @param __begin Begin iterator of sequence.
-   *  @param __end End iterator of sequence.
-   *  @param __rng Random number generator to use.
-   */
-  template<typename _RAIter, typename _RandomNumberGenerator>
-    void
-    __sequential_random_shuffle(_RAIter __begin, _RAIter __end,
-				_RandomNumberGenerator& __rng)
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _DifferenceType __n = __end - __begin;
-      const _Settings& __s = _Settings::get();
-
-      _BinIndex __num_bins, __num_bins_cache;
-
-#if _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_L1
-      // Try the L1 cache first, must fit into L1.
-      __num_bins_cache = std::max<_DifferenceType>
-	(1, __n / (__s.L1_cache_size_lb / sizeof(_ValueType)));
-      __num_bins_cache = __round_up_to_pow2(__num_bins_cache);
-
-      // No more buckets than TLB entries, power of 2
-      // Power of 2 and at least one element per bin, at most the TLB size
-      __num_bins = std::min(__n, (_DifferenceType)__num_bins_cache);
-#if _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_TLB
-      // 2 TLB entries needed per bin
-      __num_bins = std::min((_DifferenceType)__s.TLB_size / 2, __num_bins);
-#endif
-      __num_bins = __round_up_to_pow2(__num_bins);
-
-      if (__num_bins < __num_bins_cache)
-	{
-#endif
-          // Now try the L2 cache, must fit into L2.
-          __num_bins_cache = static_cast<_BinIndex>
-	    (std::max<_DifferenceType>(1, __n / (__s.L2_cache_size
-						 / sizeof(_ValueType))));
-          __num_bins_cache = __round_up_to_pow2(__num_bins_cache);
-
-          // No more buckets than TLB entries, power of 2
-          // Power of 2 and at least one element per bin, at most the TLB size.
-          __num_bins = static_cast<_BinIndex>
-	    (std::min(__n, static_cast<_DifferenceType>(__num_bins_cache)));
-
-#if _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_TLB
-          // 2 TLB entries needed per bin
-          __num_bins = std::min<_DifferenceType>(__s.TLB_size / 2, __num_bins);
-#endif
-          __num_bins = __round_up_to_pow2(__num_bins);
-#if _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_L1
-	}
-#endif
-
-      int __num_bits = __rd_log2(__num_bins);
-
-      if (__num_bins > 1)
-	{
-          _ValueType* __target =
-	    static_cast<_ValueType*>(::operator new(sizeof(_ValueType) * __n));
-          _BinIndex* __oracles = new _BinIndex[__n];
-          _DifferenceType* __dist0 = new _DifferenceType[__num_bins + 1],
-                	 * __dist1 = new _DifferenceType[__num_bins + 1];
-
-          for (int __b = 0; __b < __num_bins + 1; ++__b)
-            __dist0[__b] = 0;
-
-          _RandomNumber __bitrng(__rng(0xFFFFFFFF));
-
-          for (_DifferenceType __i = 0; __i < __n; ++__i)
-            {
-              _BinIndex __oracle = __random_number_pow2(__num_bits, __bitrng);
-              __oracles[__i] = __oracle;
-
-              // To allow prefix (partial) sum.
-              ++(__dist0[__oracle + 1]);
-            }
-
-          // Sum up bins.
-          __gnu_sequential::partial_sum(__dist0, __dist0 + __num_bins + 1,
-					__dist0);
-
-          for (int __b = 0; __b < __num_bins + 1; ++__b)
-            __dist1[__b] = __dist0[__b];
-
-          // Distribute according to oracles.
-          for (_DifferenceType __i = 0; __i < __n; ++__i)
-            ::new(&(__target[(__dist0[__oracles[__i]])++])) 
-		_ValueType(*(__begin + __i));
-
-          for (int __b = 0; __b < __num_bins; ++__b)
-	    __sequential_random_shuffle(__target + __dist1[__b],
-					__target + __dist1[__b + 1], __rng);
-
-          // Copy elements back.
-          std::copy(__target, __target + __n, __begin);
-
-          delete[] __dist0;
-          delete[] __dist1;
-          delete[] __oracles;
-	  
-	  for (_DifferenceType __i = 0; __i < __n; ++__i)
-	    __target[__i].~_ValueType();
-          ::operator delete(__target);
-	}
-      else
-	__gnu_sequential::random_shuffle(__begin, __end, __rng);
-    }
-
-  /** @brief Parallel random public call.
-   *  @param __begin Begin iterator of sequence.
-   *  @param __end End iterator of sequence.
-   *  @param __rng Random number generator to use.
-   */
-  template<typename _RAIter, typename _RandomNumberGenerator>
-    inline void
-    __parallel_random_shuffle(_RAIter __begin, _RAIter __end,
-			      _RandomNumberGenerator __rng = _RandomNumber())
-    {
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      _DifferenceType __n = __end - __begin;
-      __parallel_random_shuffle_drs(__begin, __end, __n,
-				    __get_max_threads(), __rng);
-    }
-}
-
-#endif /* _GLIBCXX_PARALLEL_RANDOM_SHUFFLE_H */
diff --git a/openflow/usr/include/c++/5/parallel/search.h b/openflow/usr/include/c++/5/parallel/search.h
deleted file mode 100644
index 8d165b2..0000000
--- a/openflow/usr/include/c++/5/parallel/search.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/search.h
- *  @brief Parallel implementation base for std::search() and
- *  std::search_n().
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_SEARCH_H
-#define _GLIBCXX_PARALLEL_SEARCH_H 1
-
-#include <bits/stl_algobase.h>
-
-#include <parallel/parallel.h>
-#include <parallel/equally_split.h>
-
-namespace __gnu_parallel
-{
-  /**
-   *  @brief Precalculate __advances for Knuth-Morris-Pratt algorithm.
-   *  @param __elements Begin iterator of sequence to search for.
-   *  @param __length Length of sequence to search for.
-   *  @param __off Returned __offsets. 
-   */
-  template<typename _RAIter, typename _DifferenceTp>
-    void
-    __calc_borders(_RAIter __elements, _DifferenceTp __length, 
-		   _DifferenceTp* __off)
-    {
-      typedef _DifferenceTp _DifferenceType;
-
-      __off[0] = -1;
-      if (__length > 1)
-	__off[1] = 0;
-      _DifferenceType __k = 0;
-      for (_DifferenceType __j = 2; __j <= __length; __j++)
-	{
-          while ((__k >= 0) && !(__elements[__k] == __elements[__j-1]))
-            __k = __off[__k];
-          __off[__j] = ++__k;
-	}
-    }
-
-  // Generic parallel find algorithm (requires random access iterator).
-
-  /** @brief Parallel std::search.
-   *  @param __begin1 Begin iterator of first sequence.
-   *  @param __end1 End iterator of first sequence.
-   *  @param __begin2 Begin iterator of second sequence.
-   *  @param __end2 End iterator of second sequence.
-   *  @param __pred Find predicate.
-   *  @return Place of finding in first sequences. */
-  template<typename __RAIter1,
-           typename __RAIter2,
-           typename _Pred>
-    __RAIter1
-    __search_template(__RAIter1 __begin1, __RAIter1 __end1,
-		      __RAIter2 __begin2, __RAIter2 __end2,
-		      _Pred __pred)
-    {
-      typedef std::iterator_traits<__RAIter1> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _GLIBCXX_CALL((__end1 - __begin1) + (__end2 - __begin2));
-
-      _DifferenceType __pattern_length = __end2 - __begin2;
-
-      // Pattern too short.
-      if(__pattern_length <= 0)
-	return __end1;
-
-      // Last point to start search.
-      _DifferenceType __input_length = (__end1 - __begin1) - __pattern_length;
-
-      // Where is first occurrence of pattern? defaults to end.
-      _DifferenceType __result = (__end1 - __begin1);
-      _DifferenceType *__splitters;
-
-      // Pattern too long.
-      if (__input_length < 0)
-	return __end1;
-
-      omp_lock_t __result_lock;
-      omp_init_lock(&__result_lock);
-
-      _ThreadIndex __num_threads = std::max<_DifferenceType>
-	(1, std::min<_DifferenceType>(__input_length,
-				      __get_max_threads()));
-
-      _DifferenceType __advances[__pattern_length];
-      __calc_borders(__begin2, __pattern_length, __advances);
-
-#     pragma omp parallel num_threads(__num_threads)
-      {
-#       pragma omp single
-	{
-	  __num_threads = omp_get_num_threads();
-	  __splitters = new _DifferenceType[__num_threads + 1];
-	  __equally_split(__input_length, __num_threads, __splitters);
-	}
-
-	_ThreadIndex __iam = omp_get_thread_num();
-
-	_DifferenceType __start = __splitters[__iam],
-	                 __stop = __splitters[__iam + 1];
-
-	_DifferenceType __pos_in_pattern = 0;
-	bool __found_pattern = false;
-
-	while (__start <= __stop && !__found_pattern)
-	  {
-	    // Get new value of result.
-#pragma omp flush(__result)
-	    // No chance for this thread to find first occurrence.
-	    if (__result < __start)
-	      break;
-	    while (__pred(__begin1[__start + __pos_in_pattern],
-			  __begin2[__pos_in_pattern]))
-	      {
-		++__pos_in_pattern;
-		if (__pos_in_pattern == __pattern_length)
-		  {
-		    // Found new candidate for result.
-		    omp_set_lock(&__result_lock);
-		    __result = std::min(__result, __start);
-		    omp_unset_lock(&__result_lock);
-
-		    __found_pattern = true;
-		    break;
-		  }
-	      }
-	    // Make safe jump.
-	    __start += (__pos_in_pattern - __advances[__pos_in_pattern]);
-	    __pos_in_pattern = (__advances[__pos_in_pattern] < 0
-				? 0 : __advances[__pos_in_pattern]);
-	  }
-      } //parallel
-
-      omp_destroy_lock(&__result_lock);
-
-      delete[] __splitters;
-      
-      // Return iterator on found element.
-      return (__begin1 + __result);
-    }
-} // end namespace
-
-#endif /* _GLIBCXX_PARALLEL_SEARCH_H */
diff --git a/openflow/usr/include/c++/5/parallel/set_operations.h b/openflow/usr/include/c++/5/parallel/set_operations.h
deleted file mode 100644
index f425290..0000000
--- a/openflow/usr/include/c++/5/parallel/set_operations.h
+++ /dev/null
@@ -1,529 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- * @file parallel/set_operations.h
- * @brief Parallel implementations of set operations for random-access
- * iterators.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Marius Elvert and Felix Bondarenko.
-
-#ifndef _GLIBCXX_PARALLEL_SET_OPERATIONS_H
-#define _GLIBCXX_PARALLEL_SET_OPERATIONS_H 1
-
-#include <omp.h>
-
-#include <parallel/settings.h>
-#include <parallel/multiseq_selection.h>
-
-namespace __gnu_parallel
-{
-  template<typename _IIter, typename _OutputIterator>
-    _OutputIterator
-    __copy_tail(std::pair<_IIter, _IIter> __b,
-		std::pair<_IIter, _IIter> __e, _OutputIterator __r)
-    {
-      if (__b.first != __e.first)
-	{
-          do
-            {
-              *__r++ = *__b.first++;
-            }
-          while (__b.first != __e.first);
-	}
-      else
-	{
-          while (__b.second != __e.second)
-            *__r++ = *__b.second++;
-	}
-      return __r;
-    }
-
-  template<typename _IIter,
-           typename _OutputIterator,
-           typename _Compare>
-    struct __symmetric_difference_func
-    {
-      typedef std::iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef typename std::pair<_IIter, _IIter> _IteratorPair;
-
-      __symmetric_difference_func(_Compare __comp) : _M_comp(__comp) {}
-
-      _Compare _M_comp;
-
-      _OutputIterator
-      _M_invoke(_IIter __a, _IIter __b, _IIter __c, _IIter __d,
-		_OutputIterator __r) const
-      {
-	while (__a != __b && __c != __d)
-          {
-            if (_M_comp(*__a, *__c))
-              {
-        	*__r = *__a;
-        	++__a;
-        	++__r;
-              }
-            else if (_M_comp(*__c, *__a))
-              {
-        	*__r = *__c;
-        	++__c;
-        	++__r;
-              }
-            else
-              {
-        	++__a;
-        	++__c;
-              }
-          }
-	return std::copy(__c, __d, std::copy(__a, __b, __r));
-      }
-
-      _DifferenceType
-      __count(_IIter __a, _IIter __b, _IIter __c, _IIter __d) const
-      {
-	_DifferenceType __counter = 0;
-
-	while (__a != __b && __c != __d)
-          {
-            if (_M_comp(*__a, *__c))
-              {
-        	++__a;
-        	++__counter;
-              }
-            else if (_M_comp(*__c, *__a))
-              {
-        	++__c;
-        	++__counter;
-              }
-            else
-              {
-        	++__a;
-        	++__c;
-              }
-          }
-
-	return __counter + (__b - __a) + (__d - __c);
-      }
-
-      _OutputIterator
-      __first_empty(_IIter __c, _IIter __d, _OutputIterator __out) const
-      { return std::copy(__c, __d, __out); }
-
-      _OutputIterator
-      __second_empty(_IIter __a, _IIter __b, _OutputIterator __out) const
-      { return std::copy(__a, __b, __out); }
-    };
-
-
-  template<typename _IIter,
-           typename _OutputIterator,
-           typename _Compare>
-    struct __difference_func
-    {
-      typedef std::iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef typename std::pair<_IIter, _IIter> _IteratorPair;
-
-      __difference_func(_Compare __comp) : _M_comp(__comp) {}
-
-      _Compare _M_comp;
-
-      _OutputIterator
-      _M_invoke(_IIter __a, _IIter __b, _IIter __c, _IIter __d,
-		_OutputIterator __r) const
-      {
-	while (__a != __b && __c != __d)
-          {
-            if (_M_comp(*__a, *__c))
-              {
-        	*__r = *__a;
-        	++__a;
-        	++__r;
-              }
-            else if (_M_comp(*__c, *__a))
-              { ++__c; }
-            else
-              {
-        	++__a;
-        	++__c;
-              }
-          }
-	return std::copy(__a, __b, __r);
-      }
-
-      _DifferenceType
-      __count(_IIter __a, _IIter __b,
-	      _IIter __c, _IIter __d) const
-      {
-	_DifferenceType __counter = 0;
-
-	while (__a != __b && __c != __d)
-          {
-            if (_M_comp(*__a, *__c))
-              {
-        	++__a;
-        	++__counter;
-              }
-            else if (_M_comp(*__c, *__a))
-              { ++__c; }
-            else
-              { ++__a; ++__c; }
-          }
-
-	return __counter + (__b - __a);
-      }
-
-      _OutputIterator
-      __first_empty(_IIter, _IIter, _OutputIterator __out) const
-      { return __out; }
-
-      _OutputIterator
-      __second_empty(_IIter __a, _IIter __b, _OutputIterator __out) const
-      { return std::copy(__a, __b, __out); }
-    };
-
-
-  template<typename _IIter,
-           typename _OutputIterator,
-           typename _Compare>
-    struct __intersection_func
-    {
-      typedef std::iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef typename std::pair<_IIter, _IIter> _IteratorPair;
-
-      __intersection_func(_Compare __comp) : _M_comp(__comp) {}
-
-      _Compare _M_comp;
-
-      _OutputIterator
-      _M_invoke(_IIter __a, _IIter __b, _IIter __c, _IIter __d,
-		_OutputIterator __r) const
-      {
-	while (__a != __b && __c != __d)
-          {
-            if (_M_comp(*__a, *__c))
-              { ++__a; }
-            else if (_M_comp(*__c, *__a))
-              { ++__c; }
-            else
-              {
-        	*__r = *__a;
-        	++__a;
-        	++__c;
-        	++__r;
-              }
-          }
-
-	return __r;
-      }
-
-      _DifferenceType
-      __count(_IIter __a, _IIter __b, _IIter __c, _IIter __d) const
-      {
-	_DifferenceType __counter = 0;
-
-	while (__a != __b && __c != __d)
-          {
-            if (_M_comp(*__a, *__c))
-              { ++__a; }
-            else if (_M_comp(*__c, *__a))
-              { ++__c; }
-            else
-              {
-        	++__a;
-        	++__c;
-        	++__counter;
-              }
-          }
-
-	return __counter;
-      }
-
-      _OutputIterator
-      __first_empty(_IIter, _IIter, _OutputIterator __out) const
-      { return __out; }
-
-      _OutputIterator
-      __second_empty(_IIter, _IIter, _OutputIterator __out) const
-      { return __out; }
-    };
-
-  template<class _IIter, class _OutputIterator, class _Compare>
-    struct __union_func
-    {
-      typedef typename std::iterator_traits<_IIter>::difference_type
-      _DifferenceType;
-
-      __union_func(_Compare __comp) : _M_comp(__comp) {}
-
-      _Compare _M_comp;
-
-      _OutputIterator
-      _M_invoke(_IIter __a, const _IIter __b, _IIter __c,
-		const _IIter __d, _OutputIterator __r) const
-      {
-	while (__a != __b && __c != __d)
-          {
-            if (_M_comp(*__a, *__c))
-              {
-        	*__r = *__a;
-        	++__a;
-              }
-            else if (_M_comp(*__c, *__a))
-              {
-        	*__r = *__c;
-        	++__c;
-              }
-            else
-              {
-        	*__r = *__a;
-        	++__a;
-        	++__c;
-              }
-            ++__r;
-          }
-	return std::copy(__c, __d, std::copy(__a, __b, __r));
-      }
-
-      _DifferenceType
-      __count(_IIter __a, _IIter __b, _IIter __c, _IIter __d) const
-      {
-	_DifferenceType __counter = 0;
-
-	while (__a != __b && __c != __d)
-          {
-            if (_M_comp(*__a, *__c))
-              { ++__a; }
-            else if (_M_comp(*__c, *__a))
-              { ++__c; }
-            else
-              {
-        	++__a;
-        	++__c;
-              }
-            ++__counter;
-          }
-
-	__counter += (__b - __a);
-	__counter += (__d - __c);
-	return __counter;
-      }
-
-      _OutputIterator
-      __first_empty(_IIter __c, _IIter __d, _OutputIterator __out) const
-      { return std::copy(__c, __d, __out); }
-
-      _OutputIterator
-      __second_empty(_IIter __a, _IIter __b, _OutputIterator __out) const
-      { return std::copy(__a, __b, __out); }
-    };
-
-  template<typename _IIter,
-           typename _OutputIterator,
-           typename _Operation>
-    _OutputIterator
-    __parallel_set_operation(_IIter __begin1, _IIter __end1,
-			     _IIter __begin2, _IIter __end2,
-			     _OutputIterator __result, _Operation __op)
-    {
-      _GLIBCXX_CALL((__end1 - __begin1) + (__end2 - __begin2))
-
-      typedef std::iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-      typedef typename std::pair<_IIter, _IIter> _IteratorPair;
-
-      if (__begin1 == __end1)
-	return __op.__first_empty(__begin2, __end2, __result);
-
-      if (__begin2 == __end2)
-	return __op.__second_empty(__begin1, __end1, __result);
-
-      const _DifferenceType __size = (__end1 - __begin1) + (__end2 - __begin2);
-
-      const _IteratorPair __sequence[2] = { std::make_pair(__begin1, __end1),
-					    std::make_pair(__begin2, __end2) };
-      _OutputIterator __return_value = __result;
-      _DifferenceType *__borders;
-      _IteratorPair *__block_begins;
-      _DifferenceType* __lengths;
-
-      _ThreadIndex __num_threads =
-          std::min<_DifferenceType>(__get_max_threads(),
-              std::min(__end1 - __begin1, __end2 - __begin2));
-
-#     pragma omp parallel num_threads(__num_threads)
-      {
-#       pragma omp single
-	{
-	  __num_threads = omp_get_num_threads();
-
-	  __borders = new _DifferenceType[__num_threads + 2];
-	  __equally_split(__size, __num_threads + 1, __borders);
-	  __block_begins = new _IteratorPair[__num_threads + 1];
-	  // Very __start.
-	  __block_begins[0] = std::make_pair(__begin1, __begin2);
-	  __lengths = new _DifferenceType[__num_threads];
-	} //single
-
-	_ThreadIndex __iam = omp_get_thread_num();
-
-	// _Result from multiseq_partition.
-	_IIter __offset[2];
-	const _DifferenceType __rank = __borders[__iam + 1];
-
-	multiseq_partition(__sequence, __sequence + 2,
-			   __rank, __offset, __op._M_comp);
-
-	// allowed to read?
-	// together
-	// *(__offset[ 0 ] - 1) == *__offset[ 1 ]
-	if (__offset[ 0 ] != __begin1 && __offset[1] != __end2
-	    && !__op._M_comp(*(__offset[0] - 1), *__offset[1])
-	    && !__op._M_comp(*__offset[1], *(__offset[0] - 1)))
-	  {
-	    // Avoid split between globally equal elements: move one to
-	    // front in first sequence.
-              --__offset[0];
-	  }
-
-	_IteratorPair __block_end = __block_begins[__iam + 1] =
-	  _IteratorPair(__offset[0], __offset[1]);
-
-	// Make sure all threads have their block_begin result written out.
-#       pragma omp barrier
-
-	_IteratorPair __block_begin = __block_begins[__iam];
-
-	// Begin working for the first block, while the others except
-	// the last start to count.
-	if (__iam == 0)
-	  {
-	    // The first thread can copy already.
-	    __lengths[ __iam ] =
-	      __op._M_invoke(__block_begin.first, __block_end.first,
-			     __block_begin.second, __block_end.second,
-			     __result) - __result;
-	  }
-	else
-	  {
-	    __lengths[ __iam ] =
-	      __op.__count(__block_begin.first, __block_end.first,
-			   __block_begin.second, __block_end.second);
-	  }
-
-	// Make sure everyone wrote their lengths.
-#       pragma omp barrier
-
-	_OutputIterator __r = __result;
-
-	if (__iam == 0)
-	  {
-	    // Do the last block.
-	    for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
-	      __r += __lengths[__i];
-
-	    __block_begin = __block_begins[__num_threads];
-
-	    // Return the result iterator of the last block.
-	    __return_value =
-	      __op._M_invoke(__block_begin.first, __end1,
-			     __block_begin.second, __end2, __r);
-
-	  }
-          else
-            {
-              for (_ThreadIndex __i = 0; __i < __iam; ++__i)
-        	__r += __lengths[ __i ];
-
-              // Reset begins for copy pass.
-              __op._M_invoke(__block_begin.first, __block_end.first,
-			     __block_begin.second, __block_end.second, __r);
-            }
-	}
-      return __return_value;
-    }
-
-  template<typename _IIter,
-           typename _OutputIterator,
-           typename _Compare>
-    inline _OutputIterator
-    __parallel_set_union(_IIter __begin1, _IIter __end1,
-			 _IIter __begin2, _IIter __end2,
-			 _OutputIterator __result, _Compare __comp)
-    {
-      return __parallel_set_operation(__begin1, __end1, __begin2, __end2,
-				      __result,
-				      __union_func< _IIter, _OutputIterator,
-				      _Compare>(__comp));
-    }
-
-  template<typename _IIter,
-           typename _OutputIterator,
-           typename _Compare>
-    inline _OutputIterator
-    __parallel_set_intersection(_IIter __begin1, _IIter __end1,
-                        	_IIter __begin2, _IIter __end2,
-                        	_OutputIterator __result, _Compare __comp)
-    {
-      return __parallel_set_operation(__begin1, __end1, __begin2, __end2,
-				      __result,
-				      __intersection_func<_IIter,
-				      _OutputIterator, _Compare>(__comp));
-    }
-
-  template<typename _IIter,
-           typename _OutputIterator,
-           typename _Compare>
-    inline _OutputIterator
-    __parallel_set_difference(_IIter __begin1, _IIter __end1,
-                              _IIter __begin2, _IIter __end2,
-                              _OutputIterator __result, _Compare __comp)
-    {
-      return __parallel_set_operation(__begin1, __end1, __begin2, __end2,
-				      __result,
-				      __difference_func<_IIter,
-				      _OutputIterator, _Compare>(__comp));
-    }
-
-  template<typename _IIter,
-           typename _OutputIterator,
-           typename _Compare>
-    inline _OutputIterator
-    __parallel_set_symmetric_difference(_IIter __begin1, _IIter __end1,
-                                	_IIter __begin2, _IIter __end2,
-                                	_OutputIterator __result,
-                                	_Compare __comp)
-    {
-      return __parallel_set_operation(__begin1, __end1, __begin2, __end2,
-				      __result,
-				      __symmetric_difference_func<_IIter,
-				      _OutputIterator, _Compare>(__comp));
-    }
-}
-
-#endif /* _GLIBCXX_PARALLEL_SET_OPERATIONS_H */
diff --git a/openflow/usr/include/c++/5/parallel/settings.h b/openflow/usr/include/c++/5/parallel/settings.h
deleted file mode 100644
index a34cb3d..0000000
--- a/openflow/usr/include/c++/5/parallel/settings.h
+++ /dev/null
@@ -1,343 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/settings.h
- *  @brief Runtime settings and tuning parameters, heuristics to decide
- *  whether to use parallelized algorithms.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- *
- *  @section parallelization_decision 
- *  The decision whether to run an algorithm in parallel.
- *
- *  There are several ways the user can switch on and __off the parallel
- *  execution of an algorithm, both at compile- and run-time.
- *
- *  Only sequential execution can be forced at compile-time.  This
- *  reduces code size and protects code parts that have
- *  non-thread-safe side effects.
- *
- *  Ultimately, forcing parallel execution at compile-time makes
- *  sense.  Often, the sequential algorithm implementation is used as
- *  a subroutine, so no reduction in code size can be achieved.  Also,
- *  the machine the program is run on might have only one processor
- *  core, so to avoid overhead, the algorithm is executed
- *  sequentially.
- *
- *  To force sequential execution of an algorithm ultimately at
- *  compile-time, the user must add the tag
-*  gnu_parallel::sequential_tag() to the end of the parameter list,
- *  e. g.
- *
- *  \code
- *  std::sort(__v.begin(), __v.end(), __gnu_parallel::sequential_tag());
- *  \endcode
- *
- *  This is compatible with all overloaded algorithm variants.  No
- *  additional code will be instantiated, at all.  The same holds for
- *  most algorithm calls with iterators not providing random access.
- *
- *  If the algorithm call is not forced to be executed sequentially
- *  at compile-time, the decision is made at run-time.
- *  The global variable __gnu_parallel::_Settings::algorithm_strategy
- *  is checked. _It is a tristate variable corresponding to:
- *
- *  a. force_sequential, meaning the sequential algorithm is executed.
-*  b. force_parallel, meaning the parallel algorithm is executed.
-*  c. heuristic
- *
- *  For heuristic, the parallel algorithm implementation is called
- *  only if the input size is sufficiently large.  For most
- *  algorithms, the input size is the (combined) length of the input
-*  sequence(__s).  The threshold can be set by the user, individually
- *  for each algorithm.  The according variables are called
-*  gnu_parallel::_Settings::[algorithm]_minimal_n .
- *
- *  For some of the algorithms, there are even more tuning options,
- *  e. g. the ability to choose from multiple algorithm variants.  See
- *  below for details.
- */
-
-// Written by Johannes Singler and Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_SETTINGS_H
-#define _GLIBCXX_PARALLEL_SETTINGS_H 1
-
-#include <parallel/types.h>
-
-/** 
-  * @brief Determine at compile(?)-time if the parallel variant of an
-  * algorithm should be called.
-  * @param __c A condition that is convertible to bool that is overruled by
-  * __gnu_parallel::_Settings::algorithm_strategy. Usually a decision
-  * based on the input size.
-  */
-#define _GLIBCXX_PARALLEL_CONDITION(__c) \
-  (__gnu_parallel::_Settings::get().algorithm_strategy \
-    != __gnu_parallel::force_sequential \
-  && ((__gnu_parallel::__get_max_threads() > 1 && (__c)) \
-     || __gnu_parallel::_Settings::get().algorithm_strategy \
-        == __gnu_parallel::force_parallel))
-
-/*
-inline bool
-parallel_condition(bool __c)
-{
-  bool ret = false;
-  const _Settings& __s = _Settings::get();
-  if (__s.algorithm_strategy != force_seqential)
-    {
-      if (__s.algorithm_strategy == force_parallel)
-        ret = true;
-      else
-        ret = __get_max_threads() > 1 && __c;
-    }
-  return ret;
-}
-*/
-
-namespace __gnu_parallel
-{
-  /// class _Settings
-  /// Run-time settings for the parallel mode including all tunable parameters.
-  struct _Settings
-  {
-    _AlgorithmStrategy          algorithm_strategy;
-    
-    _SortAlgorithm              sort_algorithm;
-    _PartialSumAlgorithm        partial_sum_algorithm;
-    _MultiwayMergeAlgorithm     multiway_merge_algorithm;
-    _FindAlgorithm              find_algorithm;
-
-    _SplittingAlgorithm         sort_splitting;
-    _SplittingAlgorithm         merge_splitting;
-    _SplittingAlgorithm         multiway_merge_splitting;
-
-    // Per-algorithm settings.
-
-    /// Minimal input size for accumulate.
-    _SequenceIndex              accumulate_minimal_n;
-
-    /// Minimal input size for adjacent_difference.
-    unsigned int                adjacent_difference_minimal_n;
-
-    /// Minimal input size for count and count_if.
-    _SequenceIndex              count_minimal_n;
-
-    /// Minimal input size for fill.
-    _SequenceIndex              fill_minimal_n;
-
-    /// Block size increase factor for find.
-    double                      find_increasing_factor;
-
-    /// Initial block size for find.
-    _SequenceIndex              find_initial_block_size;
-
-    /// Maximal block size for find.
-    _SequenceIndex              find_maximum_block_size;
-
-    /// Start with looking for this many elements sequentially, for find.
-    _SequenceIndex              find_sequential_search_size;
-
-    /// Minimal input size for for_each.
-    _SequenceIndex              for_each_minimal_n;
-
-    /// Minimal input size for generate.
-    _SequenceIndex              generate_minimal_n;
-
-    /// Minimal input size for max_element.
-    _SequenceIndex              max_element_minimal_n;
-
-    /// Minimal input size for merge.
-    _SequenceIndex              merge_minimal_n;
-
-    /// Oversampling factor for merge.
-    unsigned int                merge_oversampling;
-
-    /// Minimal input size for min_element.
-    _SequenceIndex              min_element_minimal_n;
-
-    /// Minimal input size for multiway_merge.
-    _SequenceIndex              multiway_merge_minimal_n;
-
-    /// Oversampling factor for multiway_merge.
-    int                         multiway_merge_minimal_k;
-
-    /// Oversampling factor for multiway_merge.
-    unsigned int                multiway_merge_oversampling;
-
-    /// Minimal input size for nth_element.
-    _SequenceIndex              nth_element_minimal_n;
-
-    /// Chunk size for partition.
-    _SequenceIndex              partition_chunk_size;
-
-    /// Chunk size for partition, relative to input size.  If > 0.0,
-    /// this value overrides partition_chunk_size.
-    double                      partition_chunk_share;
-
-    /// Minimal input size for partition.
-    _SequenceIndex              partition_minimal_n;
-
-    /// Minimal input size for partial_sort.
-    _SequenceIndex              partial_sort_minimal_n;
-
-    /// Ratio for partial_sum. Assume "sum and write result" to be
-    /// this factor slower than just "sum".
-    float                       partial_sum_dilation;
-
-    /// Minimal input size for partial_sum.
-    unsigned int                partial_sum_minimal_n;
-
-    /// Minimal input size for random_shuffle.
-    unsigned int                random_shuffle_minimal_n;
-
-    /// Minimal input size for replace and replace_if.
-    _SequenceIndex              replace_minimal_n;
-
-    /// Minimal input size for set_difference.
-    _SequenceIndex              set_difference_minimal_n;
-
-    /// Minimal input size for set_intersection.
-    _SequenceIndex              set_intersection_minimal_n;
-
-    /// Minimal input size for set_symmetric_difference.
-    _SequenceIndex              set_symmetric_difference_minimal_n;
-
-    /// Minimal input size for set_union.
-    _SequenceIndex              set_union_minimal_n;
-
-    /// Minimal input size for parallel sorting.
-    _SequenceIndex              sort_minimal_n;
-
-    /// Oversampling factor for parallel std::sort (MWMS).
-    unsigned int                sort_mwms_oversampling;
-
-    /// Such many samples to take to find a good pivot (quicksort).
-    unsigned int                sort_qs_num_samples_preset;
-
-    /// Maximal subsequence __length to switch to unbalanced __base case.
-    /// Applies to std::sort with dynamically load-balanced quicksort.
-    _SequenceIndex              sort_qsb_base_case_maximal_n;
-
-    /// Minimal input size for parallel std::transform.
-    _SequenceIndex              transform_minimal_n;
-
-    /// Minimal input size for unique_copy. 
-    _SequenceIndex              unique_copy_minimal_n;
-
-    _SequenceIndex              workstealing_chunk_size;
-
-    // Hardware dependent tuning parameters.
-
-    /// size of the L1 cache in bytes (underestimation).
-    unsigned long long          L1_cache_size;
-
-    /// size of the L2 cache in bytes (underestimation).
-    unsigned long long          L2_cache_size;
-
-    /// size of the Translation Lookaside Buffer (underestimation).
-    unsigned int                TLB_size;
-
-    /// Overestimation of cache line size.  Used to avoid false
-    /// sharing, i.e. elements of different threads are at least this
-    /// amount apart.
-    unsigned int                cache_line_size;
-
-    // Statistics.
-
-    /// The number of stolen ranges in load-balanced quicksort.
-    _SequenceIndex              qsb_steals;
-
-    /// Minimal input size for search and search_n.
-    _SequenceIndex              search_minimal_n;
-
-    /// Block size scale-down factor with respect to current position.
-    float                       find_scale_factor;
-
-    /// Get the global settings.
-    _GLIBCXX_CONST static const _Settings&
-    get() throw();
-
-    /// Set the global settings.
-    static void
-    set(_Settings&) throw();
-
-    explicit 
-    _Settings() :
-            algorithm_strategy(heuristic),
-            sort_algorithm(MWMS),
-            partial_sum_algorithm(LINEAR),
-            multiway_merge_algorithm(LOSER_TREE),
-            find_algorithm(CONSTANT_SIZE_BLOCKS),
-            sort_splitting(EXACT),
-            merge_splitting(EXACT),
-            multiway_merge_splitting(EXACT),
-            accumulate_minimal_n(1000),
-            adjacent_difference_minimal_n(1000),
-            count_minimal_n(1000),
-            fill_minimal_n(1000),
-            find_increasing_factor(2.0),
-            find_initial_block_size(256),
-            find_maximum_block_size(8192),
-            find_sequential_search_size(256),
-            for_each_minimal_n(1000),
-            generate_minimal_n(1000),
-            max_element_minimal_n(1000),
-            merge_minimal_n(1000),
-            merge_oversampling(10),
-            min_element_minimal_n(1000),
-            multiway_merge_minimal_n(1000),
-            multiway_merge_minimal_k(2), multiway_merge_oversampling(10),
-            nth_element_minimal_n(1000),
-            partition_chunk_size(1000),
-            partition_chunk_share(0.0),
-            partition_minimal_n(1000),
-            partial_sort_minimal_n(1000),
-            partial_sum_dilation(1.0f),
-            partial_sum_minimal_n(1000),
-            random_shuffle_minimal_n(1000),
-            replace_minimal_n(1000),
-            set_difference_minimal_n(1000),
-            set_intersection_minimal_n(1000),
-            set_symmetric_difference_minimal_n(1000),
-            set_union_minimal_n(1000),
-            sort_minimal_n(1000),
-            sort_mwms_oversampling(10),
-            sort_qs_num_samples_preset(100),
-            sort_qsb_base_case_maximal_n(100),
-            transform_minimal_n(1000),
-            unique_copy_minimal_n(10000),
-            workstealing_chunk_size(100),
-            L1_cache_size(16 << 10),
-            L2_cache_size(256 << 10),
-            TLB_size(128),
-            cache_line_size(64),
-            qsb_steals(0),
-            search_minimal_n(1000),
-            find_scale_factor(0.01f)
-    { }
-  };
-}
-
-#endif /* _GLIBCXX_PARALLEL_SETTINGS_H */
diff --git a/openflow/usr/include/c++/5/parallel/sort.h b/openflow/usr/include/c++/5/parallel/sort.h
deleted file mode 100644
index 87a7e75..0000000
--- a/openflow/usr/include/c++/5/parallel/sort.h
+++ /dev/null
@@ -1,238 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/sort.h
- *  @brief Parallel sorting algorithm switch.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler.
-
-#ifndef _GLIBCXX_PARALLEL_SORT_H
-#define _GLIBCXX_PARALLEL_SORT_H 1
-
-#include <parallel/basic_iterator.h>
-#include <parallel/features.h>
-#include <parallel/parallel.h>
-
-#if _GLIBCXX_ASSERTIONS
-#include <parallel/checkers.h>
-#endif
-
-#if _GLIBCXX_MERGESORT
-#include <parallel/multiway_mergesort.h>
-#endif
-
-#if _GLIBCXX_QUICKSORT
-#include <parallel/quicksort.h>
-#endif
-
-#if _GLIBCXX_BAL_QUICKSORT
-#include <parallel/balanced_quicksort.h>
-#endif
-
-namespace __gnu_parallel
-{
-  //prototype
-  template<bool __stable, typename _RAIter,
-           typename _Compare, typename _Parallelism>
-    void
-    __parallel_sort(_RAIter __begin, _RAIter __end,
-		    _Compare __comp, _Parallelism __parallelism);
-        
-  /** 
-   *  @brief Choose multiway mergesort, splitting variant at run-time,
-   *  for parallel sorting.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __comp Comparator.
-   *  @tparam __stable Sort stable.
-   *  @callgraph 
-   */
-  template<bool __stable, typename _RAIter, typename _Compare>
-    inline void
-    __parallel_sort(_RAIter __begin, _RAIter __end,
-		    _Compare __comp, multiway_mergesort_tag __parallelism)
-    {
-      _GLIBCXX_CALL(__end - __begin)
-
-      if(_Settings::get().sort_splitting == EXACT)
-	parallel_sort_mwms<__stable, true>
-	  (__begin, __end, __comp, __parallelism.__get_num_threads());
-      else
-	parallel_sort_mwms<__stable, false>
-	  (__begin, __end, __comp, __parallelism.__get_num_threads());
-    }
-
-  /** 
-   *  @brief Choose multiway mergesort with exact splitting,
-   *  for parallel sorting.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __comp Comparator.
-   *  @tparam __stable Sort stable.
-   *  @callgraph 
-   */
-  template<bool __stable, typename _RAIter, typename _Compare>
-    inline void
-    __parallel_sort(_RAIter __begin, _RAIter __end,
-		    _Compare __comp,
-		    multiway_mergesort_exact_tag __parallelism)
-    {
-      _GLIBCXX_CALL(__end - __begin)
-
-      parallel_sort_mwms<__stable, true>
-        (__begin, __end, __comp, __parallelism.__get_num_threads());
-    }
-
-  /** 
-   *  @brief Choose multiway mergesort with splitting by sampling,
-   *  for parallel sorting.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __comp Comparator.
-   *  @tparam __stable Sort stable.
-   *  @callgraph 
-   */
-  template<bool __stable, typename _RAIter, typename _Compare>
-    inline void
-    __parallel_sort(_RAIter __begin, _RAIter __end,
-		    _Compare __comp,
-		    multiway_mergesort_sampling_tag __parallelism)
-    {
-      _GLIBCXX_CALL(__end - __begin)
-
-      parallel_sort_mwms<__stable, false>
-      (__begin, __end, __comp, __parallelism.__get_num_threads());
-    }
-
-  /**
-   *  @brief Choose quicksort for parallel sorting.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __comp Comparator.
-   *  @tparam __stable Sort stable.
-   *  @callgraph 
-   */
-  template<bool __stable, typename _RAIter, typename _Compare>
-    inline void
-    __parallel_sort(_RAIter __begin, _RAIter __end,
-		    _Compare __comp, quicksort_tag __parallelism)
-    {
-      _GLIBCXX_CALL(__end - __begin)
-
-      _GLIBCXX_PARALLEL_ASSERT(__stable == false);
-
-      __parallel_sort_qs(__begin, __end, __comp,
-			 __parallelism.__get_num_threads());
-    }
-
-  /**
-   *  @brief Choose balanced quicksort for parallel sorting.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __comp Comparator.
-   *  @tparam __stable Sort stable.
-   *  @callgraph 
-   */
-   template<bool __stable, typename _RAIter, typename _Compare>
-     inline void
-     __parallel_sort(_RAIter __begin, _RAIter __end,
-		     _Compare __comp, balanced_quicksort_tag __parallelism)
-     {
-       _GLIBCXX_CALL(__end - __begin)
-
-       _GLIBCXX_PARALLEL_ASSERT(__stable == false);
-
-       __parallel_sort_qsb(__begin, __end, __comp,
-			   __parallelism.__get_num_threads());
-     }
-
-  /** 
-   *  @brief Choose multiway mergesort with exact splitting,
-   *  for parallel sorting.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __comp Comparator.
-   *  @tparam __stable Sort stable.
-   *  @callgraph 
-   */
-  template<bool __stable, typename _RAIter, typename _Compare>
-    inline void
-    __parallel_sort(_RAIter __begin, _RAIter __end,
-		    _Compare __comp, default_parallel_tag __parallelism)
-    {
-      _GLIBCXX_CALL(__end - __begin)
-
-      __parallel_sort<__stable>
-	(__begin, __end, __comp,
-	 multiway_mergesort_exact_tag(__parallelism.__get_num_threads()));
-    }
-
-  /**
-   *  @brief Choose a parallel sorting algorithm.
-   *  @param __begin Begin iterator of input sequence.
-   *  @param __end End iterator of input sequence.
-   *  @param __comp Comparator.
-   *  @tparam __stable Sort stable.
-   *  @callgraph 
-   */
-  template<bool __stable, typename _RAIter, typename _Compare>
-    inline void
-    __parallel_sort(_RAIter __begin, _RAIter __end,
-		    _Compare __comp, parallel_tag __parallelism)
-    {
-      _GLIBCXX_CALL(__end - __begin)
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      if (false) ;
-#if _GLIBCXX_MERGESORT
-      else if (__stable || _Settings::get().sort_algorithm == MWMS)
-        {
-          if(_Settings::get().sort_splitting == EXACT)
-            parallel_sort_mwms<__stable, true>
-              (__begin, __end, __comp, __parallelism.__get_num_threads());
-          else
-            parallel_sort_mwms<false, false>
-              (__begin, __end, __comp, __parallelism.__get_num_threads());
-        }
-#endif
-#if _GLIBCXX_QUICKSORT
-      else if (_Settings::get().sort_algorithm == QS)
-        __parallel_sort_qs(__begin, __end, __comp,
-                           __parallelism.__get_num_threads());
-#endif
-#if _GLIBCXX_BAL_QUICKSORT
-      else if (_Settings::get().sort_algorithm == QS_BALANCED)
-        __parallel_sort_qsb(__begin, __end, __comp,
-                            __parallelism.__get_num_threads());
-#endif
-      else
-        __gnu_sequential::sort(__begin, __end, __comp);
-    }
-} // end namespace __gnu_parallel
-
-#endif /* _GLIBCXX_PARALLEL_SORT_H */
diff --git a/openflow/usr/include/c++/5/parallel/tags.h b/openflow/usr/include/c++/5/parallel/tags.h
deleted file mode 100644
index a84e11d..0000000
--- a/openflow/usr/include/c++/5/parallel/tags.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- * @file parallel/tags.h
- * @brief Tags for compile-time selection.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler and Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_TAGS_H
-#define _GLIBCXX_PARALLEL_TAGS_H 1
-
-#include <omp.h>
-#include <parallel/types.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Forces sequential execution at compile time. */
-  struct sequential_tag { };
-
-  /** @brief Recommends parallel execution at compile time,
-   *  optionally using a user-specified number of threads. */
-  struct parallel_tag
-  {
-    private:
-      _ThreadIndex _M_num_threads;
-
-    public:
-      /** @brief Default constructor. Use default number of threads. */
-      parallel_tag()
-      { _M_num_threads = 0; }
-
-      /** @brief Default constructor. Recommend number of threads to use.
-       *  @param __num_threads Desired number of threads. */
-      parallel_tag(_ThreadIndex __num_threads)
-      { _M_num_threads = __num_threads; }
-
-      /** @brief Find out desired number of threads.
-       *  @return Desired number of threads. */
-      _ThreadIndex __get_num_threads()
-      {
-        if(_M_num_threads == 0)
-          return omp_get_max_threads();
-        else
-          return _M_num_threads;
-      }
-
-      /** @brief Set the desired number of threads.
-       *  @param __num_threads Desired number of threads. */
-      void set_num_threads(_ThreadIndex __num_threads)
-      { _M_num_threads = __num_threads; }
-  };
-
-  /** @brief Recommends parallel execution using the
-      default parallel algorithm. */
-  struct default_parallel_tag : public parallel_tag
-  {
-    default_parallel_tag() { }
-    default_parallel_tag(_ThreadIndex __num_threads)
-    : parallel_tag(__num_threads) { }
-  };
-
-  /** @brief Recommends parallel execution using dynamic
-      load-balancing at compile time. */
-  struct balanced_tag : public parallel_tag { };
-
-  /** @brief Recommends parallel execution using static
-      load-balancing at compile time. */
-  struct unbalanced_tag : public parallel_tag { };
-
-  /** @brief Recommends parallel execution using OpenMP dynamic
-      load-balancing at compile time. */
-  struct omp_loop_tag : public parallel_tag { };
-
-  /** @brief Recommends parallel execution using OpenMP static
-      load-balancing at compile time. */
-  struct omp_loop_static_tag : public parallel_tag { };
-
-
-  /** @brief Base class for for std::find() variants. */
-  struct find_tag { };
-
-
-  /** @brief Forces parallel merging
-   *  with exact splitting, at compile time. */
-  struct exact_tag : public parallel_tag
-  {
-    exact_tag() { }
-    exact_tag(_ThreadIndex __num_threads)
-    : parallel_tag(__num_threads) { }
-  };
-
-  /** @brief Forces parallel merging
-   *  with exact splitting, at compile time. */
-  struct sampling_tag : public parallel_tag
-  {
-    sampling_tag() { }
-    sampling_tag(_ThreadIndex __num_threads)
-    : parallel_tag(__num_threads) { }
-  };
-
-
-  /** @brief Forces parallel sorting using multiway mergesort
-   *  at compile time. */
-  struct multiway_mergesort_tag : public parallel_tag
-  {
-    multiway_mergesort_tag() { }
-    multiway_mergesort_tag(_ThreadIndex __num_threads)
-    : parallel_tag(__num_threads) { }
-  };
-
-  /** @brief Forces parallel sorting using multiway mergesort
-   *  with exact splitting at compile time. */
-  struct multiway_mergesort_exact_tag : public parallel_tag
-  {
-    multiway_mergesort_exact_tag() { }
-    multiway_mergesort_exact_tag(_ThreadIndex __num_threads)
-    : parallel_tag(__num_threads) { }
-  };
-
-  /** @brief Forces parallel sorting using multiway mergesort
-   *  with splitting by sampling at compile time. */
-  struct multiway_mergesort_sampling_tag : public parallel_tag
-  {
-    multiway_mergesort_sampling_tag() { }
-    multiway_mergesort_sampling_tag(_ThreadIndex __num_threads)
-    : parallel_tag(__num_threads) { }
-  };
-
-  /** @brief Forces parallel sorting using unbalanced quicksort
-   *  at compile time. */
-  struct quicksort_tag : public parallel_tag
-  {
-    quicksort_tag() { }
-    quicksort_tag(_ThreadIndex __num_threads)
-    : parallel_tag(__num_threads) { }
-  };
-
-  /** @brief Forces parallel sorting using balanced quicksort
-   *  at compile time. */
-  struct balanced_quicksort_tag : public parallel_tag
-  {
-    balanced_quicksort_tag() { }
-    balanced_quicksort_tag(_ThreadIndex __num_threads)
-    : parallel_tag(__num_threads) { }
-  };
-
-
-  /** @brief Selects the growing block size variant for std::find().
-      @see _GLIBCXX_FIND_GROWING_BLOCKS */
-  struct growing_blocks_tag : public find_tag { };
-
-  /** @brief Selects the constant block size variant for std::find().
-      @see _GLIBCXX_FIND_CONSTANT_SIZE_BLOCKS */
-  struct constant_size_blocks_tag : public find_tag { };
-
-  /** @brief Selects the equal splitting variant for std::find().
-      @see _GLIBCXX_FIND_EQUAL_SPLIT */
-  struct equal_split_tag : public find_tag { };
-}
-
-#endif /* _GLIBCXX_PARALLEL_TAGS_H */
diff --git a/openflow/usr/include/c++/5/parallel/types.h b/openflow/usr/include/c++/5/parallel/types.h
deleted file mode 100644
index abfb952..0000000
--- a/openflow/usr/include/c++/5/parallel/types.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/types.h
- *  @brief Basic types and typedefs.
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Johannes Singler and Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_TYPES_H
-#define _GLIBCXX_PARALLEL_TYPES_H 1
-
-#include <cstdlib>
-#include <limits>
-#include <tr1/cstdint>
-
-namespace __gnu_parallel
-{
-  // Enumerated types.
-
-  /// Run-time equivalents for the compile-time tags.
-  enum _Parallelism
-    {
-      /// Not parallel.
-      sequential,
-
-      /// Parallel unbalanced (equal-sized chunks).
-      parallel_unbalanced,
-
-      /// Parallel balanced (work-stealing).
-      parallel_balanced,
-
-      /// Parallel with OpenMP dynamic load-balancing.
-      parallel_omp_loop,
-
-      /// Parallel with OpenMP static load-balancing.
-      parallel_omp_loop_static,
-
-      /// Parallel with OpenMP taskqueue construct.
-      parallel_taskqueue
-    };
-
-  /// Strategies for run-time algorithm selection: 
-  // force_sequential, force_parallel, heuristic.
-  enum _AlgorithmStrategy
-    {
-      heuristic,
-      force_sequential,
-      force_parallel
-    };
-
-  /// Sorting algorithms: 
-  // multi-way mergesort, quicksort, load-balanced quicksort.
-  enum _SortAlgorithm 
-    { 
-      MWMS, 
-      QS, 
-      QS_BALANCED 
-    };
-
-  /// Merging algorithms: 
-  // bubblesort-alike, loser-tree variants, enum __sentinel.
-  enum _MultiwayMergeAlgorithm
-    {
-      LOSER_TREE
-    };
-
-  /// Partial sum algorithms: recursive, linear.
-  enum _PartialSumAlgorithm 
-    { 
-      RECURSIVE, 
-      LINEAR 
-    };
-
-  /// Sorting/merging algorithms: sampling, __exact.
-  enum _SplittingAlgorithm 
-    { 
-      SAMPLING, 
-      EXACT 
-    };
-
-  /// Find algorithms:
-  // growing blocks, equal-sized blocks, equal splitting.
-  enum _FindAlgorithm 
-    { 
-      GROWING_BLOCKS, 
-      CONSTANT_SIZE_BLOCKS, 
-      EQUAL_SPLIT 
-    };
-
-  /**
-   * @brief Unsigned integer to index __elements.
-   * The total number of elements for each algorithm must fit into this type.
-   */
-  typedef uint64_t _SequenceIndex;
-
-  /**
-   * @brief Unsigned integer to index a thread number.
-   * The maximum thread number (for each processor) must fit into this type.
-   */
-  typedef uint16_t _ThreadIndex;
-
-  // XXX atomics interface?
-  /// Longest compare-and-swappable integer type on this platform.
-  typedef int64_t _CASable;
-
-  /// Number of bits of _CASable.
-  static const int _CASable_bits = std::numeric_limits<_CASable>::digits;
-
-  /// ::_CASable with the right half of bits set to 1.
-  static const _CASable _CASable_mask =
-                            ((_CASable(1) << (_CASable_bits / 2)) - 1);
-}
-
-#endif /* _GLIBCXX_PARALLEL_TYPES_H */
diff --git a/openflow/usr/include/c++/5/parallel/unique_copy.h b/openflow/usr/include/c++/5/parallel/unique_copy.h
deleted file mode 100644
index 7abeecb..0000000
--- a/openflow/usr/include/c++/5/parallel/unique_copy.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/unique_copy.h
- *  @brief Parallel implementations of std::unique_copy().
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Robert Geisberger and Robin Dapp.
-
-#ifndef _GLIBCXX_PARALLEL_UNIQUE_COPY_H
-#define _GLIBCXX_PARALLEL_UNIQUE_COPY_H 1
-
-#include <parallel/parallel.h>
-#include <parallel/multiseq_selection.h>
-
-namespace __gnu_parallel
-{
-  /** @brief Parallel std::unique_copy(), w/__o explicit equality predicate.
-    *  @param __first Begin iterator of input sequence.
-    *  @param __last End iterator of input sequence.
-    *  @param __result Begin iterator of result __sequence.
-    *  @param __binary_pred Equality predicate.
-    *  @return End iterator of result __sequence. */
-  template<typename _IIter,
-           class _OutputIterator,
-           class _BinaryPredicate>
-    _OutputIterator
-    __parallel_unique_copy(_IIter __first, _IIter __last,
-			   _OutputIterator __result,
-			   _BinaryPredicate __binary_pred)
-    {
-      _GLIBCXX_CALL(__last - __first)
-
-      typedef std::iterator_traits<_IIter> _TraitsType;
-      typedef typename _TraitsType::value_type _ValueType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      _DifferenceType __size = __last - __first;
-
-      if (__size == 0)
-	return __result;
-
-      // Let the first thread process two parts.
-      _DifferenceType *__counter;
-      _DifferenceType *__borders;
-
-      _ThreadIndex __num_threads = __get_max_threads();
-      // First part contains at least one element.
-#     pragma omp parallel num_threads(__num_threads)
-      {
-#       pragma omp single
-	{
-	  __num_threads = omp_get_num_threads();
-	  __borders = new _DifferenceType[__num_threads + 2];
-	  __equally_split(__size, __num_threads + 1, __borders);
-	  __counter = new _DifferenceType[__num_threads + 1];
-	}
-
-	_ThreadIndex __iam = omp_get_thread_num();
-
-	_DifferenceType __begin, __end;
-
-	// Check for length without duplicates
-	// Needed for position in output
-	_DifferenceType __i = 0;
-	_OutputIterator __out = __result;
-
-	if (__iam == 0)
-          {
-            __begin = __borders[0] + 1;   // == 1
-            __end = __borders[__iam + 1];
-
-            ++__i;
-            *__out++ = *__first;
-
-            for (_IIter __iter = __first + __begin; __iter < __first + __end;
-		 ++__iter)
-              {
-        	if (!__binary_pred(*__iter, *(__iter - 1)))
-                  {
-                    ++__i;
-                    *__out++ = *__iter;
-                  }
-              }
-          }
-	else
-          {
-            __begin = __borders[__iam]; //one part
-            __end = __borders[__iam + 1];
-
-            for (_IIter __iter = __first + __begin; __iter < __first + __end;
-		 ++__iter)
-              {
-        	if (!__binary_pred(*__iter, *(__iter - 1)))
-                  ++__i;
-              }
-          }
-	__counter[__iam] = __i;
-
-	// Last part still untouched.
-	_DifferenceType __begin_output;
-
-#       pragma omp barrier
-
-	// Store result in output on calculated positions.
-	__begin_output = 0;
-
-	if (__iam == 0)
-          {
-            for (_ThreadIndex __t = 0; __t < __num_threads; ++__t)
-              __begin_output += __counter[__t];
-
-            __i = 0;
-
-            _OutputIterator __iter_out = __result + __begin_output;
-
-            __begin = __borders[__num_threads];
-            __end = __size;
-
-            for (_IIter __iter = __first + __begin; __iter < __first + __end;
-		 ++__iter)
-              {
-        	if (__iter == __first
-		    || !__binary_pred(*__iter, *(__iter - 1)))
-                  {
-                    ++__i;
-                    *__iter_out++ = *__iter;
-                  }
-              }
-
-            __counter[__num_threads] = __i;
-          }
-	else
-          {
-            for (_ThreadIndex __t = 0; __t < __iam; __t++)
-              __begin_output += __counter[__t];
-
-            _OutputIterator __iter_out = __result + __begin_output;
-            for (_IIter __iter = __first + __begin; __iter < __first + __end;
-		 ++__iter)
-              {
-        	if (!__binary_pred(*__iter, *(__iter - 1)))
-                  *__iter_out++ = *__iter;
-              }
-          }
-      }
-
-      _DifferenceType __end_output = 0;
-      for (_ThreadIndex __t = 0; __t < __num_threads + 1; __t++)
-	__end_output += __counter[__t];
-
-      delete[] __borders;
-
-      return __result + __end_output;
-    }
-
-  /** @brief Parallel std::unique_copy(), without explicit equality predicate
-    *  @param __first Begin iterator of input sequence.
-    *  @param __last End iterator of input sequence.
-    *  @param __result Begin iterator of result __sequence.
-    *  @return End iterator of result __sequence. */
-  template<typename _IIter, class _OutputIterator>
-    inline _OutputIterator
-    __parallel_unique_copy(_IIter __first, _IIter __last,
-			   _OutputIterator __result)
-    {
-      typedef typename std::iterator_traits<_IIter>::value_type
-	_ValueType;
-      return __parallel_unique_copy(__first, __last, __result,
-				    std::equal_to<_ValueType>());
-    }
-
-}//namespace __gnu_parallel
-
-#endif /* _GLIBCXX_PARALLEL_UNIQUE_COPY_H */
diff --git a/openflow/usr/include/c++/5/parallel/workstealing.h b/openflow/usr/include/c++/5/parallel/workstealing.h
deleted file mode 100644
index d418d89..0000000
--- a/openflow/usr/include/c++/5/parallel/workstealing.h
+++ /dev/null
@@ -1,312 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the terms
-// of the GNU General Public License as published by the Free Software
-// Foundation; either version 3, or (at your option) any later
-// version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file parallel/workstealing.h
- *  @brief Parallelization of embarrassingly parallel execution by
- *  means of work-stealing.
- *
- *  Work stealing is described in
- *
- *  R. D. Blumofe and C. E. Leiserson.
- *  Scheduling multithreaded computations by work stealing.
- *  Journal of the ACM, 46(5):720–748, 1999.
- *
- *  This file is a GNU parallel extension to the Standard C++ Library.
- */
-
-// Written by Felix Putze.
-
-#ifndef _GLIBCXX_PARALLEL_WORKSTEALING_H
-#define _GLIBCXX_PARALLEL_WORKSTEALING_H 1
-
-#include <parallel/parallel.h>
-#include <parallel/random_number.h>
-#include <parallel/compatibility.h>
-
-namespace __gnu_parallel
-{
-
-#define _GLIBCXX_JOB_VOLATILE volatile
-
-  /** @brief One __job for a certain thread. */
-  template<typename _DifferenceTp>
-    struct _Job
-    {
-      typedef _DifferenceTp _DifferenceType;
-
-      /** @brief First element.
-       *
-       *  Changed by owning and stealing thread. By stealing thread,
-       *  always incremented. */
-      _GLIBCXX_JOB_VOLATILE _DifferenceType _M_first;
-
-      /** @brief Last element.
-       *
-       *  Changed by owning thread only. */
-      _GLIBCXX_JOB_VOLATILE _DifferenceType _M_last;
-
-      /** @brief Number of elements, i.e. @c _M_last-_M_first+1.
-       *
-       *  Changed by owning thread only. */
-      _GLIBCXX_JOB_VOLATILE _DifferenceType _M_load;
-    };
-
-  /** @brief Work stealing algorithm for random access iterators.
-    *
-    *  Uses O(1) additional memory. Synchronization at job lists is
-    *  done with atomic operations.
-    *  @param __begin Begin iterator of element sequence.
-    *  @param __end End iterator of element sequence.
-    *  @param __op User-supplied functor (comparator, predicate, adding
-    *  functor, ...).
-    *  @param __f Functor to @a process an element with __op (depends on
-    *  desired functionality, e. g. for std::for_each(), ...).
-    *  @param __r Functor to @a add a single __result to the already
-    *  processed elements (depends on functionality).
-    *  @param __base Base value for reduction.
-    *  @param __output Pointer to position where final result is written to
-    *  @param __bound Maximum number of elements processed (e. g. for
-    *  std::count_n()).
-    *  @return User-supplied functor (that may contain a part of the result).
-    */
-  template<typename _RAIter,
-           typename _Op,
-           typename _Fu,
-           typename _Red,
-           typename _Result>
-    _Op
-    __for_each_template_random_access_workstealing(_RAIter __begin,
-						   _RAIter __end, _Op __op,
-						   _Fu& __f, _Red __r,
-						   _Result __base,
-						   _Result& __output,
-      typename std::iterator_traits<_RAIter>::difference_type __bound)
-    {
-      _GLIBCXX_CALL(__end - __begin)
-
-      typedef std::iterator_traits<_RAIter> _TraitsType;
-      typedef typename _TraitsType::difference_type _DifferenceType;
-
-      const _Settings& __s = _Settings::get();
-
-      _DifferenceType __chunk_size =
-          static_cast<_DifferenceType>(__s.workstealing_chunk_size);
-
-      // How many jobs?
-      _DifferenceType __length = (__bound < 0) ? (__end - __begin) : __bound;
-
-      // To avoid false sharing in a cache line.
-      const int __stride = (__s.cache_line_size * 10
-			    / sizeof(_Job<_DifferenceType>) + 1);
-
-      // Total number of threads currently working.
-      _ThreadIndex __busy = 0;
-
-      _Job<_DifferenceType> *__job;
-
-      omp_lock_t __output_lock;
-      omp_init_lock(&__output_lock);
-
-      // Write base value to output.
-      __output = __base;
-
-      // No more threads than jobs, at least one thread.
-      _ThreadIndex __num_threads = __gnu_parallel::max<_ThreadIndex>
-	(1, __gnu_parallel::min<_DifferenceType>(__length,
-						 __get_max_threads()));
-
-#     pragma omp parallel shared(__busy) num_threads(__num_threads)
-      {
-#       pragma omp single
-	{
-	  __num_threads = omp_get_num_threads();
-
-	  // Create job description array.
-	  __job = new _Job<_DifferenceType>[__num_threads * __stride];
-	}
-
-	// Initialization phase.
-
-	// Flags for every thread if it is doing productive work.
-	bool __iam_working = false;
-
-	// Thread id.
-	_ThreadIndex __iam = omp_get_thread_num();
-
-	// This job.
-	_Job<_DifferenceType>& __my_job = __job[__iam * __stride];
-
-	// Random number (for work stealing).
-	_ThreadIndex __victim;
-
-	// Local value for reduction.
-	_Result __result = _Result();
-
-	// Number of elements to steal in one attempt.
-	_DifferenceType __steal;
-
-	// Every thread has its own random number generator
-	// (modulo __num_threads).
-	_RandomNumber __rand_gen(__iam, __num_threads);
-
-	// This thread is currently working.
-#       pragma omp atomic
-	++__busy;
-
-	__iam_working = true;
-
-	// How many jobs per thread? last thread gets the rest.
-	__my_job._M_first = static_cast<_DifferenceType>
-	  (__iam * (__length / __num_threads));
-
-	__my_job._M_last = (__iam == (__num_threads - 1)
-			    ? (__length - 1)
-			    : ((__iam + 1) * (__length / __num_threads) - 1));
-	__my_job._M_load = __my_job._M_last - __my_job._M_first + 1;
-
-	// Init result with _M_first value (to have a base value for reduction)
-	if (__my_job._M_first <= __my_job._M_last)
-	  {
-	    // Cannot use volatile variable directly.
-	    _DifferenceType __my_first = __my_job._M_first;
-	    __result = __f(__op, __begin + __my_first);
-	    ++__my_job._M_first;
-	    --__my_job._M_load;
-	  }
-
-	_RAIter __current;
-
-#       pragma omp barrier
-
-	// Actual work phase
-	// Work on own or stolen current start
-	while (__busy > 0)
-	  {
-	    // Work until no productive thread left.
-#           pragma omp flush(__busy)
-
-	    // Thread has own work to do
-	    while (__my_job._M_first <= __my_job._M_last)
-	      {
-		// fetch-and-add call
-		// Reserve current job block (size __chunk_size) in my queue.
-		_DifferenceType __current_job =
-		  __fetch_and_add<_DifferenceType>(&(__my_job._M_first),
-						   __chunk_size);
-
-		// Update _M_load, to make the three values consistent,
-		// _M_first might have been changed in the meantime
-		__my_job._M_load = __my_job._M_last - __my_job._M_first + 1;
-		for (_DifferenceType __job_counter = 0;
-		     __job_counter < __chunk_size
-		       && __current_job <= __my_job._M_last;
-		     ++__job_counter)
-		  {
-		    // Yes: process it!
-		    __current = __begin + __current_job;
-		    ++__current_job;
-
-		    // Do actual work.
-		    __result = __r(__result, __f(__op, __current));
-		  }
-
-#               pragma omp flush(__busy)
-	      }
-
-	    // After reaching this point, a thread's __job list is empty.
-	    if (__iam_working)
-	      {
-		// This thread no longer has work.
-#               pragma omp atomic
-		--__busy;
-
-		__iam_working = false;
-	      }
-
-	    _DifferenceType __supposed_first, __supposed_last,
-	                    __supposed_load;
-	    do
-	      {
-		// Find random nonempty deque (not own), do consistency check.
-		__yield();
-#               pragma omp flush(__busy)
-		__victim = __rand_gen();
-		__supposed_first = __job[__victim * __stride]._M_first;
-		__supposed_last = __job[__victim * __stride]._M_last;
-		__supposed_load = __job[__victim * __stride]._M_load;
-	      }
-	    while (__busy > 0
-		   && ((__supposed_load <= 0)
-		       || ((__supposed_first + __supposed_load - 1)
-			   != __supposed_last)));
-
-	    if (__busy == 0)
-	      break;
-
-	    if (__supposed_load > 0)
-	      {
-		// Has work and work to do.
-		// Number of elements to steal (at least one).
-		__steal = (__supposed_load < 2) ? 1 : __supposed_load / 2;
-
-		// Push __victim's current start forward.
-		_DifferenceType __stolen_first =
-		  __fetch_and_add<_DifferenceType>
-		  (&(__job[__victim * __stride]._M_first), __steal);
-		_DifferenceType __stolen_try = (__stolen_first + __steal
-						- _DifferenceType(1));
-
-		__my_job._M_first = __stolen_first;
-		__my_job._M_last = __gnu_parallel::min(__stolen_try,
-						       __supposed_last);
-		__my_job._M_load = __my_job._M_last - __my_job._M_first + 1;
-
-		// Has potential work again.
-#               pragma omp atomic
-		++__busy;
-		__iam_working = true;
-
-#               pragma omp flush(__busy)
-	      }
-#           pragma omp flush(__busy)
-	  } // end while __busy > 0
-	// Add accumulated result to output.
-	omp_set_lock(&__output_lock);
-	__output = __r(__output, __result);
-	omp_unset_lock(&__output_lock);
-      }
-
-      delete[] __job;
-
-      // Points to last element processed (needed as return value for
-      // some algorithms like transform)
-      __f._M_finish_iterator = __begin + __length;
-
-      omp_destroy_lock(&__output_lock);
-
-      return __op;
-    }
-} // end namespace
-
-#endif /* _GLIBCXX_PARALLEL_WORKSTEALING_H */
diff --git a/openflow/usr/include/c++/5/profile/array b/openflow/usr/include/c++/5/profile/array
deleted file mode 100644
index 5198bb3..0000000
--- a/openflow/usr/include/c++/5/profile/array
+++ /dev/null
@@ -1,272 +0,0 @@
-// Profile array implementation -*- C++ -*-
-
-// Copyright (C) 2012-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/array
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_PROFILE_ARRAY
-#define _GLIBCXX_PROFILE_ARRAY 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  template<typename _Tp, std::size_t _Nm>
-    struct array
-    {
-      typedef _Tp 	    			      value_type;
-      typedef value_type*			      pointer;
-      typedef const value_type*                       const_pointer;
-      typedef value_type&                   	      reference;
-      typedef const value_type&             	      const_reference;
-      typedef value_type*                             iterator;
-      typedef const value_type*                       const_iterator;
-      typedef std::size_t                    	      size_type;
-      typedef std::ptrdiff_t                   	      difference_type;
-      typedef std::reverse_iterator<iterator>	      reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>   const_reverse_iterator;
-
-      // Support for zero-sized arrays mandatory.
-      typedef _GLIBCXX_STD_C::__array_traits<_Tp, _Nm> _AT_Type;
-      typename _AT_Type::_Type                         _M_elems;
-
-      // No explicit construct/copy/destroy for aggregate type.
-
-      // DR 776.
-      void
-      fill(const value_type& __u)
-      { std::fill_n(begin(), size(), __u); }
-
-      void
-      swap(array& __other)
-      noexcept(noexcept(swap(std::declval<_Tp&>(), std::declval<_Tp&>())))
-      { std::swap_ranges(begin(), end(), __other.begin()); }
-
-      // Iterators.
-      iterator
-      begin() noexcept
-      { return iterator(data()); }
-
-      const_iterator
-      begin() const noexcept
-      { return const_iterator(data()); }
-
-      iterator
-      end() noexcept
-      { return iterator(data() + _Nm); }
-
-      const_iterator
-      end() const noexcept
-      { return const_iterator(data() + _Nm); }
-
-      reverse_iterator
-      rbegin() noexcept
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend() noexcept
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const noexcept
-      { return const_reverse_iterator(begin()); }
-
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(data()); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(data() + _Nm); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-
-      // Capacity.
-      constexpr size_type
-      size() const noexcept { return _Nm; }
-
-      constexpr size_type
-      max_size() const noexcept { return _Nm; }
-
-      constexpr bool
-      empty() const noexcept { return size() == 0; }
-
-      // Element access.
-      reference
-      operator[](size_type __n) noexcept
-      {	return _AT_Type::_S_ref(_M_elems, __n); }
-
-      constexpr const_reference
-      operator[](size_type __n) const noexcept
-      { return _AT_Type::_S_ref(_M_elems, __n); }
-
-      reference
-      at(size_type __n)
-      {
-	if (__n >= _Nm)
-	  std::__throw_out_of_range_fmt(__N("array::at: __n "
-				            "(which is %zu) >= _Nm "
-					    "(which is %zu)"),
-					__n, _Nm);
-	return _AT_Type::_S_ref(_M_elems, __n);
-      }
-
-      constexpr const_reference
-      at(size_type __n) const
-      {
-	// Result of conditional expression must be an lvalue so use
-	// boolean ? lvalue : (throw-expr, lvalue)
-	return __n < _Nm ? _AT_Type::_S_ref(_M_elems, __n)
-	  : (std::__throw_out_of_range_fmt(__N("array::at: __n (which is %zu) "
-					       ">= _Nm (which is %zu)"),
-					   __n, _Nm),
-	     _AT_Type::_S_ref(_M_elems, 0));
-      }
-
-      reference
-      front() noexcept
-      { return *begin(); }
-
-      constexpr const_reference
-      front() const noexcept
-      { return _AT_Type::_S_ref(_M_elems, 0); }
-
-      reference
-      back() noexcept
-      { return _Nm ? *(end() - 1) : *end(); }
-
-      constexpr const_reference
-      back() const noexcept
-      {
-	return _Nm ? _AT_Type::_S_ref(_M_elems, _Nm - 1)
-		   : _AT_Type::_S_ref(_M_elems, 0);
-      }
-
-      pointer
-      data() noexcept
-      { return _AT_Type::_S_ptr(_M_elems); }
-
-      const_pointer
-      data() const noexcept
-      { return _AT_Type::_S_ptr(_M_elems); }
-    };
-
-  // Array comparisons.
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator==(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return std::equal(__one.begin(), __one.end(), __two.begin()); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator!=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one == __two); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator<(const array<_Tp, _Nm>& __a, const array<_Tp, _Nm>& __b)
-    {
-      return std::lexicographical_compare(__a.begin(), __a.end(),
-					  __b.begin(), __b.end());
-    }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator>(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return __two < __one; }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator<=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one > __two); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator>=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one < __two); }
-
-  // Specialized algorithms.
-  template<typename _Tp, std::size_t _Nm>
-    inline void
-    swap(array<_Tp, _Nm>& __one, array<_Tp, _Nm>& __two)
-    noexcept(noexcept(__one.swap(__two)))
-    { __one.swap(__two); }
-
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    constexpr _Tp&
-    get(array<_Tp, _Nm>& __arr) noexcept
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      return _GLIBCXX_STD_C::__array_traits<_Tp, _Nm>::
-	_S_ref(__arr._M_elems, _Int);
-    }
-
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    constexpr _Tp&&
-    get(array<_Tp, _Nm>&& __arr) noexcept
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      return std::move(__profile::get<_Int>(__arr));
-    }
-
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    constexpr const _Tp&
-    get(const array<_Tp, _Nm>& __arr) noexcept
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      return _GLIBCXX_STD_C::__array_traits<_Tp, _Nm>::
-	_S_ref(__arr._M_elems, _Int);
-    }
-} // namespace __profile
-
-  // Tuple interface to class template array.
-
-  /// tuple_size
-  template<typename _Tp, std::size_t _Nm>
-    struct tuple_size<__profile::array<_Tp, _Nm>>
-    : public integral_constant<std::size_t, _Nm> { };
-
-  /// tuple_element
-  template<std::size_t _Int, typename _Tp, std::size_t _Nm>
-    struct tuple_element<_Int, __profile::array<_Tp, _Nm>>
-    {
-      static_assert(_Int < _Nm, "index is out of bounds");
-      typedef _Tp type;
-    };
-} // namespace std
-
-#endif // _GLIBCXX_PROFILE_ARRAY
diff --git a/openflow/usr/include/c++/5/profile/base.h b/openflow/usr/include/c++/5/profile/base.h
deleted file mode 100644
index 5f408a4..0000000
--- a/openflow/usr/include/c++/5/profile/base.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/base.h
- *  @brief Sequential helper functions.
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-// Written by Lixia Liu
-
-#ifndef _GLIBCXX_PROFILE_BASE_H
-#define _GLIBCXX_PROFILE_BASE_H 1
-
-#include <functional>
-#include <profile/impl/profiler.h>
-
-// Profiling mode namespaces.
-
-/**
- * @namespace std::__profile
- * @brief GNU profile code, replaces standard behavior with profile behavior.
- */
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-  namespace __profile { }
-}
-
-/**
- * @namespace __gnu_profile
- * @brief GNU profile code for public use.
- */
-namespace __gnu_profile
-{
-  // Import all the profile versions of components in namespace std.
-  using namespace std::__profile;
-}
-
-
-#endif /* _GLIBCXX_PROFILE_BASE_H */
diff --git a/openflow/usr/include/c++/5/profile/bitset b/openflow/usr/include/c++/5/profile/bitset
deleted file mode 100644
index 5d5cc3b..0000000
--- a/openflow/usr/include/c++/5/profile/bitset
+++ /dev/null
@@ -1,245 +0,0 @@
-// Profiling bitset implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/bitset
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_BITSET
-#define _GLIBCXX_PROFILE_BITSET
-
-#include <bitset>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  /// Class std::bitset wrapper with performance instrumentation, none at the
-  /// moment.
-  template<size_t _Nb>
-    class bitset
-    : public _GLIBCXX_STD_C::bitset<_Nb>
-    {
-      typedef _GLIBCXX_STD_C::bitset<_Nb> _Base;
-
-    public:
-      // 23.3.5.1 constructors:
-#if __cplusplus < 201103L
-      bitset()
-      : _Base() { }
-#else
-      constexpr bitset() = default;
-#endif
-
-#if __cplusplus >= 201103L
-      constexpr bitset(unsigned long long __val) noexcept
-#else
-      bitset(unsigned long __val)
-#endif
-      : _Base(__val) { }
-
-      template<typename _CharT, typename _Traits, typename _Alloc>
-	explicit
-	bitset(const std::basic_string<_CharT, _Traits, _Alloc>& __str,
-	       typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
-	       __pos = 0,
-	       typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
-	       __n = (std::basic_string<_CharT, _Traits, _Alloc>::npos))
-	: _Base(__str, __pos, __n) { }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 396. what are characters zero and one.
-      template<class _CharT, class _Traits, class _Alloc>
-	bitset(const std::basic_string<_CharT, _Traits, _Alloc>& __str,
-	       typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
-	       __pos,
-	       typename std::basic_string<_CharT, _Traits, _Alloc>::size_type
-	       __n,
-	       _CharT __zero, _CharT __one = _CharT('1'))
-	: _Base(__str, __pos, __n, __zero, __one) { }
-
-      bitset(const _Base& __x) : _Base(__x) { }
-
-#if __cplusplus >= 201103L
-      template<typename _CharT>
-	explicit
-	bitset(const _CharT* __str,
-	       typename std::basic_string<_CharT>::size_type __n
-	       = std::basic_string<_CharT>::npos,
-	       _CharT __zero = _CharT('0'), _CharT __one = _CharT('1'))
-	: _Base(__str, __n, __zero, __one) { }
-#endif
-
-      // 23.3.5.2 bitset operations:
-      bitset<_Nb>&
-      operator&=(const bitset<_Nb>& __rhs) _GLIBCXX_NOEXCEPT
-      {
-	_M_base() &= __rhs;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator|=(const bitset<_Nb>& __rhs) _GLIBCXX_NOEXCEPT
-      {
-	_M_base() |= __rhs;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator^=(const bitset<_Nb>& __rhs) _GLIBCXX_NOEXCEPT
-      {
-	_M_base() ^= __rhs;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator<<=(size_t __pos) _GLIBCXX_NOEXCEPT
-      {
-	_M_base() <<= __pos;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator>>=(size_t __pos) _GLIBCXX_NOEXCEPT
-      {
-	_M_base() >>= __pos;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      set() _GLIBCXX_NOEXCEPT
-      {
-	_Base::set();
-	return *this;
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 186. bitset::set() second parameter should be bool
-      bitset<_Nb>&
-      set(size_t __pos, bool __val = true)
-      {
-	_Base::set(__pos, __val);
-	return *this;
-      }
-
-      bitset<_Nb>&
-      reset() _GLIBCXX_NOEXCEPT
-      {
-	_Base::reset();
-	return *this;
-      }
-
-      bitset<_Nb>&
-      reset(size_t __pos)
-      {
-	_Base::reset(__pos);
-	return *this;
-      }
-
-      bitset<_Nb>
-      operator~() const _GLIBCXX_NOEXCEPT
-      { return bitset(~_M_base()); }
-
-      bitset<_Nb>&
-      flip() _GLIBCXX_NOEXCEPT
-      {
-	_Base::flip();
-	return *this;
-      }
-
-      bitset<_Nb>&
-      flip(size_t __pos)
-      {
-	_Base::flip(__pos);
-	return *this;
-      }
-
-      bool
-      operator==(const bitset<_Nb>& __rhs) const _GLIBCXX_NOEXCEPT
-      { return _M_base() == __rhs; }
-
-      bool
-      operator!=(const bitset<_Nb>& __rhs) const _GLIBCXX_NOEXCEPT
-      { return _M_base() != __rhs; }
-
-      bitset<_Nb>
-      operator<<(size_t __pos) const _GLIBCXX_NOEXCEPT
-      { return bitset<_Nb>(_M_base() << __pos); }
-
-      bitset<_Nb>
-      operator>>(size_t __pos) const _GLIBCXX_NOEXCEPT
-      { return bitset<_Nb>(_M_base() >> __pos); }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT
-      { return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT
-      { return *this; }
-    };
-
-  template<size_t _Nb>
-    bitset<_Nb>
-    operator&(const bitset<_Nb>& __x, const bitset<_Nb>& __y) _GLIBCXX_NOEXCEPT
-    { return bitset<_Nb>(__x) &= __y; }
-
-  template<size_t _Nb>
-    bitset<_Nb>
-    operator|(const bitset<_Nb>& __x, const bitset<_Nb>& __y) _GLIBCXX_NOEXCEPT
-    { return bitset<_Nb>(__x) |= __y; }
-
-  template<size_t _Nb>
-    bitset<_Nb>
-    operator^(const bitset<_Nb>& __x, const bitset<_Nb>& __y) _GLIBCXX_NOEXCEPT
-    { return bitset<_Nb>(__x) ^= __y; }
-
-  template<typename _CharT, typename _Traits, size_t _Nb>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is, bitset<_Nb>& __x)
-    { return __is >> __x._M_base(); }
-
-  template<typename _CharT, typename _Traits, size_t _Nb>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const bitset<_Nb>& __x)
-    { return __os << __x._M_base(); }
-} // namespace __profile
-
-#if __cplusplus >= 201103L
-  // DR 1182.
-  /// std::hash specialization for bitset.
-  template<size_t _Nb>
-    struct hash<__profile::bitset<_Nb>>
-    : public __hash_base<size_t, __profile::bitset<_Nb>>
-    {
-      size_t
-      operator()(const __profile::bitset<_Nb>& __b) const noexcept
-      { return std::hash<_GLIBCXX_STD_C::bitset<_Nb>>()(__b._M_base()); }
-    };
-#endif
-
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/deque b/openflow/usr/include/c++/5/profile/deque
deleted file mode 100644
index c0c6db2..0000000
--- a/openflow/usr/include/c++/5/profile/deque
+++ /dev/null
@@ -1,189 +0,0 @@
-// Profiling deque implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/deque
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_DEQUE
-#define _GLIBCXX_PROFILE_DEQUE 1
-
-#include <deque>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  /// Class std::deque wrapper with performance instrumentation.
-  template<typename _Tp, typename _Allocator = std::allocator<_Tp> >
-    class deque
-    : public _GLIBCXX_STD_C::deque<_Tp, _Allocator>
-    {
-      typedef  _GLIBCXX_STD_C::deque<_Tp, _Allocator> _Base;
-
-    public:
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::value_type		value_type;
-
-      // 23.2.1.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      deque()
-      : _Base() { }
-      deque(const deque& __x)
-      : _Base(__x) { }
-
-      ~deque() { }
-#else
-      deque() = default;
-      deque(const deque&) = default;
-      deque(deque&&) = default;
-
-      deque(const deque& __d, const _Allocator& __a)
-      : _Base(__d, __a) { }
-
-      deque(deque&& __d, const _Allocator& __a)
-      : _Base(std::move(__d), __a) { }
-
-      ~deque() = default;
-
-      deque(initializer_list<value_type> __l,
-	    const _Allocator& __a = _Allocator())
-      : _Base(__l, __a) { }
-#endif
-
-      explicit
-      deque(const _Allocator& __a)
-      : _Base(__a) { }
-
-#if __cplusplus >= 201103L
-      explicit
-      deque(size_type __n, const _Allocator& __a = _Allocator())
-      : _Base(__n, __a) { }
-
-      deque(size_type __n, const _Tp& __value,
-	    const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#else
-      explicit
-      deque(size_type __n, const _Tp& __value = _Tp(),
-	    const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#endif
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<typename _InputIterator>
-#endif
-	deque(_InputIterator __first, _InputIterator __last,
-	      const _Allocator& __a = _Allocator())
-	: _Base(__first, __last, __a)
-	{ }
-
-      deque(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      deque&
-      operator=(const deque& __x)
-      {
-	_M_base() = __x;
-	return *this;
-      }
-#else
-      deque&
-      operator=(const deque&) = default;
-
-      deque&
-      operator=(deque&&) = default;
-
-      deque&
-      operator=(initializer_list<value_type> __l)
-      {
-	_M_base() = __l;
-	return *this;
-      }
-#endif
-
-      void
-      swap(deque& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      { _Base::swap(__x); }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const deque<_Tp, _Alloc>& __lhs,
-	      const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const deque<_Tp, _Alloc>& __lhs,
-	      const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(deque<_Tp, _Alloc>& __lhs, deque<_Tp, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-
-} // namespace __profile
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/forward_list b/openflow/usr/include/c++/5/profile/forward_list
deleted file mode 100644
index 295c4a5..0000000
--- a/openflow/usr/include/c++/5/profile/forward_list
+++ /dev/null
@@ -1,215 +0,0 @@
-// <forward_list> -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/forward_list
- *  This file is a GNU debug extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_FORWARD_LIST
-#define _GLIBCXX_PROFILE_FORWARD_LIST 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <forward_list>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  /// Class std::forward_list wrapper with performance instrumentation.
-  template<typename _Tp, typename _Alloc = std::allocator<_Tp> >
-    class forward_list
-    : public _GLIBCXX_STD_C::forward_list<_Tp, _Alloc>
-    {
-      typedef _GLIBCXX_STD_C::forward_list<_Tp, _Alloc> _Base;
-
-    public:
-      typedef typename _Base::size_type		size_type;
-      typedef typename _Base::const_iterator	const_iterator;
-
-      // 23.2.3.1 construct/copy/destroy:
-      explicit
-      forward_list(const _Alloc& __al = _Alloc())
-      : _Base(__al) { }
-
-      forward_list(const forward_list& __list, const _Alloc& __al)
-      : _Base(__list, __al)
-      { }
-
-      forward_list(forward_list&& __list, const _Alloc& __al)
-      : _Base(std::move(__list), __al)
-      { }
-
-      explicit
-      forward_list(size_type __n, const _Alloc& __al = _Alloc())
-      : _Base(__n, __al)
-      { }
-
-      forward_list(size_type __n, const _Tp& __value,
-		   const _Alloc& __al = _Alloc())
-      : _Base(__n, __value, __al)
-      { }
-
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	forward_list(_InputIterator __first, _InputIterator __last,
-		     const _Alloc& __al = _Alloc())
-	: _Base(__first, __last, __al)
-	{ }
-
-      forward_list(const forward_list&) = default;
-      forward_list(forward_list&&) = default;
-
-      forward_list(std::initializer_list<_Tp> __il,
-		   const _Alloc& __al = _Alloc())
-      : _Base(__il, __al)
-      { }
-
-      ~forward_list() = default;
-
-      forward_list&
-      operator=(const forward_list&) = default;
-
-      forward_list&
-      operator=(forward_list&&) = default;
-
-      forward_list&
-      operator=(std::initializer_list<_Tp> __il)
-      {
-	_M_base() = __il;
-	return *this;
-      }
-
-      void
-      swap(forward_list& __fl)
-	noexcept( noexcept(declval<_Base>().swap(__fl)) )
-      { _Base::swap(__fl); }
-
-      void
-      splice_after(const_iterator __pos, forward_list&& __fl)
-      { _Base::splice_after(__pos, std::move(__fl)); }
-
-      void
-      splice_after(const_iterator __pos, forward_list& __list)
-      { _Base::splice_after(__pos, __list); }
-
-      void
-      splice_after(const_iterator __pos, forward_list&& __list,
-		   const_iterator __i)
-      { _Base::splice_after(__pos, std::move(__list), __i); }
-
-      void
-      splice_after(const_iterator __pos, forward_list& __list,
-		   const_iterator __i)
-      { _Base::splice_after(__pos, __list, __i); }
-
-      void
-      splice_after(const_iterator __pos, forward_list&& __list,
-		   const_iterator __before, const_iterator __last)
-      { _Base::splice_after(__pos, std::move(__list), __before, __last); }
-
-      void
-      splice_after(const_iterator __pos, forward_list& __list,
-		   const_iterator __before, const_iterator __last)
-      { _Base::splice_after(__pos, __list, __before, __last); }
-
-      void
-      merge(forward_list&& __list)
-      { _Base::merge(std::move(__list)); }
-
-      void
-      merge(forward_list& __list)
-      { _Base::merge(__list); }
-
-      template<typename _Comp>
-	void
-	merge(forward_list&& __list, _Comp __comp)
-	{ _Base::merge(std::move(__list), __comp); }
-
-      template<typename _Comp>
-	void
-	merge(forward_list& __list, _Comp __comp)
-	{ _Base::merge(__list, __comp); }
-
-      _Base&
-      _M_base() noexcept	{ return *this; }
-
-      const _Base&
-      _M_base() const noexcept	{ return *this; }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const forward_list<_Tp, _Alloc>& __lx,
-	       const forward_list<_Tp, _Alloc>& __ly)
-    { return __lx._M_base() == __ly._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const forward_list<_Tp, _Alloc>& __lx,
-	      const forward_list<_Tp, _Alloc>& __ly)
-    { return __lx._M_base() < __ly._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const forward_list<_Tp, _Alloc>& __lx,
-	       const forward_list<_Tp, _Alloc>& __ly)
-    { return !(__lx == __ly); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const forward_list<_Tp, _Alloc>& __lx,
-	      const forward_list<_Tp, _Alloc>& __ly)
-    { return (__ly < __lx); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const forward_list<_Tp, _Alloc>& __lx,
-	       const forward_list<_Tp, _Alloc>& __ly)
-    { return !(__lx < __ly); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const forward_list<_Tp, _Alloc>& __lx,
-	       const forward_list<_Tp, _Alloc>& __ly)
-    { return !(__ly < __lx); }
-
-  /// See std::forward_list::swap().
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(forward_list<_Tp, _Alloc>& __lx,
-	 forward_list<_Tp, _Alloc>& __ly)
-    { __lx.swap(__ly); }
-
-} // namespace __profile
-} // namespace std
-
-#endif // C++11
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler.h b/openflow/usr/include/c++/5/profile/impl/profiler.h
deleted file mode 100644
index c705ef8..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler.h
+++ /dev/null
@@ -1,370 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler.h
- *  @brief Interface of the profiling runtime library.
- */
-
-// Written by Lixia Liu and Silvius Rus.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_H
-#define _GLIBCXX_PROFILE_PROFILER_H 1
-
-#include <bits/c++config.h>
-
-// Mechanism to define data with inline linkage.
-#define _GLIBCXX_PROFILE_DEFINE_UNINIT_DATA(__type, __name)             \
-  inline __type&                                                        \
-  __get_##__name()                                                      \
-  {                                                                     \
-    static __type __name;                                               \
-    return __name;                                                      \
-  }
-#define _GLIBCXX_PROFILE_DEFINE_DATA(__type, __name, __initial_value...) \
-  inline __type& __get_##__name() {                                      \
-    static __type __name(__initial_value);                               \
-    return __name;                                                       \
-  }
-#define _GLIBCXX_PROFILE_DATA(__name) \
-  __get_##__name()
-
-namespace __gnu_profile
-{
-  /** @brief Reentrance guard.
-   *
-   * Mechanism to protect all __gnu_profile operations against recursion,
-   * multithreaded and exception reentrance.
-   */
-  struct __reentrance_guard
-  {
-    static bool
-    __get_in()
-    {
-      if (__inside() == true)
-	return false;
-      else
-	{
-	  __inside() = true;
-	  return true;
-	}
-    }
-
-    static bool&
-    __inside()
-    {
-      static __thread bool _S_inside(false);
-      return _S_inside;
-    }
-
-    __reentrance_guard() { }
-    ~__reentrance_guard() { __inside() = false; }
-  };
-
-  // Forward declarations of implementation functions.
-  // Don't use any __gnu_profile:: in user code.
-  // Instead, use the __profcxx... macros, which offer guarded access.
-  class __container_size_info;
-  class __hashfunc_info;
-  class __map2umap_info;
-  class __vector2list_info;
-  class __list2slist_info;
-  class __list2vector_info;
-
-  bool __turn_on();
-  bool __turn_off();
-  bool __is_invalid();
-  bool __is_on();
-  bool __is_off();
-  void __report();
-
-  __container_size_info*
-  __trace_hashtable_size_construct(std::size_t);
-  void __trace_hashtable_size_resize(__container_size_info*,
-				     std::size_t, std::size_t);
-  void __trace_hashtable_size_destruct(__container_size_info*,
-				       std::size_t, std::size_t);
-
-  __hashfunc_info*
-  __trace_hash_func_construct();
-  void __trace_hash_func_destruct(__hashfunc_info*,
-				  std::size_t, std::size_t, std::size_t);
-
-  __container_size_info*
-  __trace_vector_size_construct(std::size_t);
-  void __trace_vector_size_resize(__container_size_info*,
-				  std::size_t, std::size_t);
-  void __trace_vector_size_destruct(__container_size_info*,
-				    std::size_t, std::size_t);
-
-  __vector2list_info*
-  __trace_vector_to_list_construct();
-  void __trace_vector_to_list_insert(__vector2list_info*,
-				     std::size_t, std::size_t);
-  void __trace_vector_to_list_iterate(__vector2list_info*, int);
-  void __trace_vector_to_list_invalid_operator(__vector2list_info*);
-  void __trace_vector_to_list_resize(__vector2list_info*,
-				     std::size_t, std::size_t);
-  void __trace_vector_to_list_destruct(__vector2list_info*);
-
-  __list2slist_info*
-  __trace_list_to_slist_construct();
-  void __trace_list_to_slist_rewind(__list2slist_info*);
-  void __trace_list_to_slist_operation(__list2slist_info*);
-  void __trace_list_to_slist_destruct(__list2slist_info*);
-
-  __list2vector_info*
-  __trace_list_to_vector_construct();
-  void __trace_list_to_vector_insert(__list2vector_info*,
-				     std::size_t, std::size_t);
-  void __trace_list_to_vector_iterate(__list2vector_info*, int);
-  void __trace_list_to_vector_invalid_operator(__list2vector_info*);
-  void __trace_list_to_vector_resize(__list2vector_info*,
-				     std::size_t, std::size_t);
-  void __trace_list_to_vector_destruct(__list2vector_info*);
-
-  __map2umap_info*
-  __trace_map_to_unordered_map_construct();
-  void __trace_map_to_unordered_map_invalidate(__map2umap_info*);
-  void __trace_map_to_unordered_map_insert(__map2umap_info*, std::size_t,
-					   std::size_t);
-  void __trace_map_to_unordered_map_erase(__map2umap_info*, std::size_t,
-					  std::size_t);
-  void __trace_map_to_unordered_map_iterate(__map2umap_info*, std::size_t);
-  void __trace_map_to_unordered_map_find(__map2umap_info*, std::size_t);
-  void __trace_map_to_unordered_map_destruct(__map2umap_info*);
-} // namespace __gnu_profile
-
-// Master switch turns on all diagnostics that are not explicitly turned off.
-#ifdef _GLIBCXX_PROFILE
-#ifndef _GLIBCXX_PROFILE_NO_HASHTABLE_TOO_SMALL
-#define _GLIBCXX_PROFILE_HASHTABLE_TOO_SMALL
-#endif
-#ifndef _GLIBCXX_PROFILE_NO_HASHTABLE_TOO_LARGE
-#define _GLIBCXX_PROFILE_HASHTABLE_TOO_LARGE
-#endif
-#ifndef _GLIBCXX_PROFILE_NO_VECTOR_TOO_SMALL
-#define _GLIBCXX_PROFILE_VECTOR_TOO_SMALL
-#endif
-#ifndef _GLIBCXX_PROFILE_NO_VECTOR_TOO_LARGE
-#define _GLIBCXX_PROFILE_VECTOR_TOO_LARGE
-#endif
-#ifndef _GLIBCXX_PROFILE_NO_INEFFICIENT_HASH
-#define _GLIBCXX_PROFILE_INEFFICIENT_HASH
-#endif
-#ifndef _GLIBCXX_PROFILE_NO_VECTOR_TO_LIST
-#define _GLIBCXX_PROFILE_VECTOR_TO_LIST
-#endif
-#ifndef _GLIBCXX_PROFILE_NO_LIST_TO_SLIST
-#define _GLIBCXX_PROFILE_LIST_TO_SLIST
-#endif
-#ifndef _GLIBCXX_PROFILE_NO_LIST_TO_VECTOR
-#define _GLIBCXX_PROFILE_LIST_TO_VECTOR
-#endif
-#ifndef _GLIBCXX_PROFILE_NO_MAP_TO_UNORDERED_MAP
-#define _GLIBCXX_PROFILE_MAP_TO_UNORDERED_MAP
-#endif
-#endif
-
-// Expose global management routines to user code.
-#ifdef _GLIBCXX_PROFILE
-#define __profcxx_report() __gnu_profile::__report()
-#define __profcxx_turn_on() __gnu_profile::__turn_on()
-#define __profcxx_turn_off() __gnu_profile::__turn_off()
-#define __profcxx_is_invalid() __gnu_profile::__is_invalid()
-#define __profcxx_is_on() __gnu_profile::__is_on()
-#define __profcxx_is_off() __gnu_profile::__is_off()
-#else
-#define __profcxx_report()
-#define __profcxx_turn_on()
-#define __profcxx_turn_off()
-#define __profcxx_is_invalid()
-#define __profcxx_is_on()
-#define __profcxx_is_off()
-#endif
-
-// Turn on/off instrumentation for HASHTABLE_TOO_SMALL and HASHTABLE_TOO_LARGE.
-#if (defined(_GLIBCXX_PROFILE_HASHTABLE_TOO_SMALL) \
-     || defined(_GLIBCXX_PROFILE_HASHTABLE_TOO_LARGE))
-#define __profcxx_hashtable_size_construct(__x...) \
-  __gnu_profile::__trace_hashtable_size_construct(__x)
-#define __profcxx_hashtable_size_resize(__x...) \
-  __gnu_profile::__trace_hashtable_size_resize(__x)
-#define __profcxx_hashtable_size_destruct(__x...) \
-  __gnu_profile::__trace_hashtable_size_destruct(__x)
-#else
-#define __profcxx_hashtable_size_construct(__x...) 0
-#define __profcxx_hashtable_size_resize(__x...)
-#define __profcxx_hashtable_size_destruct(__x...)
-#endif
-
-// Turn on/off instrumentation for VECTOR_TOO_SMALL and VECTOR_TOO_LARGE.
-#if (defined(_GLIBCXX_PROFILE_VECTOR_TOO_SMALL) \
-     || defined(_GLIBCXX_PROFILE_VECTOR_TOO_LARGE))
-#define __profcxx_vector_size_construct(__x...) \
-  __gnu_profile::__trace_vector_size_construct(__x)
-#define __profcxx_vector_size_resize(__x...) \
-  __gnu_profile::__trace_vector_size_resize(__x)
-#define __profcxx_vector_size_destruct(__x...) \
-  __gnu_profile::__trace_vector_size_destruct(__x)
-#else
-#define __profcxx_vector_size_construct(__x...) 0
-#define __profcxx_vector_size_resize(__x...)  
-#define __profcxx_vector_size_destruct(__x...) 
-#endif 
-
-// Turn on/off instrumentation for INEFFICIENT_HASH.
-#if defined(_GLIBCXX_PROFILE_INEFFICIENT_HASH)
-#define __profcxx_hash_func_construct(__x...) \
-  __gnu_profile::__trace_hash_func_construct(__x)
-#define __profcxx_hash_func_destruct(__x...) \
-  __gnu_profile::__trace_hash_func_destruct(__x)
-#else
-#define __profcxx_hash_func_construct(__x...) 0
-#define __profcxx_hash_func_destruct(__x...)
-#endif
-
-// Turn on/off instrumentation for VECTOR_TO_LIST.
-#if defined(_GLIBCXX_PROFILE_VECTOR_TO_LIST)
-#define __profcxx_vector2list_construct(__x...) \
-  __gnu_profile::__trace_vector_to_list_construct(__x)
-#define __profcxx_vector2list_insert(__x...) \
-  __gnu_profile::__trace_vector_to_list_insert(__x)
-#define __profcxx_vector2list_iterate(__x...) \
-  __gnu_profile::__trace_vector_to_list_iterate(__x)
-#define __profcxx_vector2list_invalid_operator(__x...) \
-  __gnu_profile::__trace_vector_to_list_invalid_operator(__x)
-#define __profcxx_vector2list_resize(__x...) \
-  __gnu_profile::__trace_vector_to_list_resize(__x)
-#define __profcxx_vector2list_destruct(__x...) \
-  __gnu_profile::__trace_vector_to_list_destruct(__x)
-#else
-#define __profcxx_vector2list_construct(__x...) 0
-#define __profcxx_vector2list_insert(__x...)
-#define __profcxx_vector2list_iterate(__x...)
-#define __profcxx_vector2list_invalid_operator(__x...)
-#define __profcxx_vector2list_resize(__x...)
-#define __profcxx_vector2list_destruct(__x...)
-#endif
-
-// Turn on/off instrumentation for LIST_TO_VECTOR. 
-#if defined(_GLIBCXX_PROFILE_LIST_TO_VECTOR)
-#define __profcxx_list2vector_construct(__x...) \
-  __gnu_profile::__trace_list_to_vector_construct(__x)
-#define __profcxx_list2vector_insert(__x...) \
-  __gnu_profile::__trace_list_to_vector_insert(__x)
-#define __profcxx_list2vector_iterate(__x...) \
-  __gnu_profile::__trace_list_to_vector_iterate(__x)
-#define __profcxx_list2vector_invalid_operator(__x...) \
-  __gnu_profile::__trace_list_to_vector_invalid_operator(__x)
-#define __profcxx_list2vector_destruct(__x...) \
-  __gnu_profile::__trace_list_to_vector_destruct(__x)
-#else
-#define __profcxx_list2vector_construct(__x...) 0
-#define __profcxx_list2vector_insert(__x...)
-#define __profcxx_list2vector_iterate(__x...)
-#define __profcxx_list2vector_invalid_operator(__x...)
-#define __profcxx_list2vector_destruct(__x...)
-#endif
-
-// Turn on/off instrumentation for LIST_TO_SLIST.  
-#if defined(_GLIBCXX_PROFILE_LIST_TO_SLIST)
-#define __profcxx_list2slist_construct(__x...) \
-    __gnu_profile::__trace_list_to_slist_construct(__x)
-#define __profcxx_list2slist_rewind(__x...) \
-  __gnu_profile::__trace_list_to_slist_rewind(__x)
-#define __profcxx_list2slist_operation(__x...) \
-  __gnu_profile::__trace_list_to_slist_operation(__x)
-#define __profcxx_list2slist_destruct(__x...) \
-  __gnu_profile::__trace_list_to_slist_destruct(__x)
-#else
-#define __profcxx_list2slist_construct(__x...) 0
-#define __profcxx_list2slist_rewind(__x...)
-#define __profcxx_list2slist_operation(__x...)
-#define __profcxx_list2slist_destruct(__x...)
-#endif 
-
-// Turn on/off instrumentation for MAP_TO_UNORDERED_MAP.
-#if defined(_GLIBCXX_PROFILE_MAP_TO_UNORDERED_MAP)
-#define __profcxx_map2umap_construct(__x...) \
-  __gnu_profile::__trace_map_to_unordered_map_construct(__x)
-#define __profcxx_map2umap_insert(__x...) \
-  __gnu_profile::__trace_map_to_unordered_map_insert(__x)
-#define __profcxx_map2umap_erase(__x...) \
-  __gnu_profile::__trace_map_to_unordered_map_erase(__x)
-#define __profcxx_map2umap_iterate(__x...) \
-  __gnu_profile::__trace_map_to_unordered_map_iterate(__x)
-#define __profcxx_map2umap_invalidate(__x...) \
-  __gnu_profile::__trace_map_to_unordered_map_invalidate(__x)
-#define __profcxx_map2umap_find(__x...) \
-  __gnu_profile::__trace_map_to_unordered_map_find(__x)
-#define __profcxx_map2umap_destruct(__x...) \
-  __gnu_profile::__trace_map_to_unordered_map_destruct(__x)
-#else
-#define __profcxx_map2umap_construct(__x...) 0
-#define __profcxx_map2umap_insert(__x...)
-#define __profcxx_map2umap_erase(__x...)
-#define __profcxx_map2umap_iterate(__x...)
-#define __profcxx_map2umap_invalidate(__x...)
-#define __profcxx_map2umap_find(__x...)
-#define __profcxx_map2umap_destruct(__x...)
-#endif
-
-// Set default values for compile-time customizable variables.
-#ifndef _GLIBCXX_PROFILE_TRACE_PATH_ROOT
-#define _GLIBCXX_PROFILE_TRACE_PATH_ROOT "libstdcxx-profile"
-#endif
-#ifndef _GLIBCXX_PROFILE_TRACE_ENV_VAR
-#define _GLIBCXX_PROFILE_TRACE_ENV_VAR "_GLIBCXX_PROFILE_TRACE_PATH_ROOT"
-#endif
-#ifndef _GLIBCXX_PROFILE_MAX_WARN_COUNT_ENV_VAR
-#define _GLIBCXX_PROFILE_MAX_WARN_COUNT_ENV_VAR \
-  "_GLIBCXX_PROFILE_MAX_WARN_COUNT"
-#endif
-#ifndef _GLIBCXX_PROFILE_MAX_WARN_COUNT
-#define _GLIBCXX_PROFILE_MAX_WARN_COUNT 10
-#endif
-#ifndef _GLIBCXX_PROFILE_MAX_STACK_DEPTH
-#define _GLIBCXX_PROFILE_MAX_STACK_DEPTH 32
-#endif
-#ifndef _GLIBCXX_PROFILE_MAX_STACK_DEPTH_ENV_VAR
-#define _GLIBCXX_PROFILE_MAX_STACK_DEPTH_ENV_VAR \
-  "_GLIBCXX_PROFILE_MAX_STACK_DEPTH"
-#endif
-#ifndef _GLIBCXX_PROFILE_MEM_PER_DIAGNOSTIC
-#define _GLIBCXX_PROFILE_MEM_PER_DIAGNOSTIC (1 << 28)
-#endif
-#ifndef _GLIBCXX_PROFILE_MEM_PER_DIAGNOSTIC_ENV_VAR
-#define _GLIBCXX_PROFILE_MEM_PER_DIAGNOSTIC_ENV_VAR \
-  "_GLIBCXX_PROFILE_MEM_PER_DIAGNOSTIC"
-#endif
-
-// Instrumentation hook implementations.
-#include "profile/impl/profiler_hash_func.h"
-#include "profile/impl/profiler_hashtable_size.h"
-#include "profile/impl/profiler_map_to_unordered_map.h"
-#include "profile/impl/profiler_vector_size.h"
-#include "profile/impl/profiler_vector_to_list.h"
-#include "profile/impl/profiler_list_to_slist.h"
-#include "profile/impl/profiler_list_to_vector.h"
-
-#endif // _GLIBCXX_PROFILE_PROFILER_H
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_algos.h b/openflow/usr/include/c++/5/profile/impl/profiler_algos.h
deleted file mode 100644
index 6566d1b..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_algos.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_algos.h
- *  @brief Algorithms used by the profile extension.
- *
- *  This file is needed to avoid including \<algorithm\> or \<bits/stl_algo.h\>.
- *  Including those files would result in recursive includes.
- *  These implementations are oversimplified.  In general, efficiency may be
- *  sacrificed to minimize maintenance overhead.
- */
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_ALGOS_H
-#define _GLIBCXX_PROFILE_PROFILER_ALGOS_H 1
-
-namespace __gnu_profile
-{
-  /* Helper for __top_n.  Insert in sorted vector, but not beyond Nth elem.  */
-  template<typename _Container>
-    void
-    __insert_top_n(_Container& __output,
-		   const typename _Container::value_type& __value,
-		   typename _Container::size_type __n)
-    {
-      typename _Container::iterator __it = __output.begin();
-      typename _Container::size_type __count = 0;
-
-      // Skip up to N - 1 elements larger than VALUE.
-      // XXX: Could do binary search for random iterators.
-      while (true)
-	{
-	  if (__count >= __n)
-	    // VALUE is not in top N.
-	    return;
-
-	  if (__it == __output.end())
-	    break;
-
-	  if (*__it < __value)
-	    break;
-
-	  ++__it;
-	  ++__count;
-	}
-
-      __output.insert(__it, __value);
-    }
-
-  /* Copy the top N elements in INPUT, sorted in reverse order, to OUTPUT.  */
-  template<typename _Container>
-    void
-    __top_n(const _Container& __input, _Container& __output,
-	    typename _Container::size_type __n)
-    {
-      __output.clear();
-      typename _Container::const_iterator __it;
-      for (__it = __input.begin(); __it != __input.end(); ++__it)
-	__insert_top_n(__output, *__it, __n);
-    }
-
-  /* Simplified clone of std::for_each.  */
-  template<typename _InputIterator, typename _Function>
-    _Function 
-    __for_each(_InputIterator __first, _InputIterator __last, _Function __f)
-    {
-      for (; __first != __last; ++__first)
-	__f(*__first);
-      return __f;
-    }
-
-  /* Simplified clone of std::remove.  */
-  template<typename _ForwardIterator, typename _Tp>
-    _ForwardIterator
-    __remove(_ForwardIterator __first, _ForwardIterator __last,
-	     const _Tp& __value)
-    {
-      if(__first == __last)
-	return __first;
-      _ForwardIterator __result = __first;
-      ++__first;
-      for(; __first != __last; ++__first)
-	if(!(*__first == __value))
-	  {
-	    *__result = *__first;
-	    ++__result;
-	  }
-      return __result;
-    }
-} // namespace __gnu_profile
-
-#endif /* _GLIBCXX_PROFILE_PROFILER_ALGOS_H */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_container_size.h b/openflow/usr/include/c++/5/profile/impl/profiler_container_size.h
deleted file mode 100644
index caa9a2c..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_container_size.h
+++ /dev/null
@@ -1,186 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_container_size.h
- *  @brief Diagnostics for container sizes.
- */
-
-// Written by Lixia Liu and Silvius Rus.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_CONTAINER_SIZE_H
-#define _GLIBCXX_PROFILE_PROFILER_CONTAINER_SIZE_H 1
-
-#include <sstream>
-
-#include "profile/impl/profiler.h"
-#include "profile/impl/profiler_node.h"
-#include "profile/impl/profiler_trace.h"
-
-namespace __gnu_profile
-{
-  /** @brief A container size instrumentation line in the object table.  */
-  class __container_size_info
-  : public __object_info_base 
-  {
-  public:
-    __container_size_info(__stack_t __stack)
-    : __object_info_base(__stack), _M_init(0), _M_max(0),
-      _M_min(0), _M_total(0), _M_item_min(0), _M_item_max(0),
-      _M_item_total(0), _M_count(0), _M_resize(0), _M_cost(0)
-    { }
-
-    void
-    __write(FILE* __f) const
-    {
-      std::fprintf(__f, "%Zu %Zu %Zu %Zu %Zu %Zu %Zu %Zu %Zu %Zu\n", 
-		   _M_init, _M_count, _M_cost, _M_resize, _M_min, _M_max,
-		   _M_total, _M_item_min, _M_item_max, _M_item_total);
-    }
-
-    float
-    __magnitude() const
-    { return static_cast<float>(_M_cost); }
-
-    std::string
-    __advice() const
-    {
-      std::stringstream __message;
-      if (_M_init < _M_item_max)
-	__message << "change initial container size from " << _M_init
-		  << " to " << _M_item_max;
-      return __message.str();
-    }
-
-    void
-    __init(std::size_t __num)
-    {
-      _M_init = __num;
-      _M_max = __num;
-    }
-
-    void
-    __merge(const __container_size_info& __o)
-    {
-      __object_info_base::__merge(__o);
-      _M_init        = std::max(_M_init, __o._M_init);
-      _M_max         = std::max(_M_max, __o._M_max);
-      _M_item_max    = std::max(_M_item_max, __o._M_item_max);
-      _M_min         = std::min(_M_min, __o._M_min);
-      _M_item_min    = std::min(_M_item_min, __o._M_item_min);
-      _M_total      += __o._M_total;
-      _M_item_total += __o._M_item_total;
-      _M_count      += __o._M_count;
-      _M_cost       += __o._M_cost;
-      _M_resize     += __o._M_resize;
-    }
-
-    // Call if a container is destructed or cleaned.
-    void
-    __destruct(std::size_t __num, std::size_t __inum)
-    {
-      _M_max = std::max(_M_max, __num);
-      _M_item_max = std::max(_M_item_max, __inum);
-      if (_M_min == 0)
-	{
-	  _M_min = __num; 
-	  _M_item_min = __inum;
-	}
-      else
-	{
-	  _M_min = std::min(_M_min, __num);
-	  _M_item_min = std::min(_M_item_min, __inum);
-	}
-
-      _M_total += __num;
-      _M_item_total += __inum;
-      _M_count += 1;
-    }
-
-    // Estimate the cost of resize/rehash. 
-    float
-    __resize_cost(std::size_t __from, std::size_t)
-    { return __from; }
-
-    // Call if container is resized.
-    void
-    __resize(std::size_t __from, std::size_t __to)
-    {
-      _M_cost += this->__resize_cost(__from, __to);
-      _M_resize += 1;
-      _M_max = std::max(_M_max, __to);
-    }
-
-  private:
-    std::size_t _M_init;
-    std::size_t _M_max;  // range of # buckets
-    std::size_t _M_min;
-    std::size_t _M_total;
-    std::size_t _M_item_min;  // range of # items
-    std::size_t _M_item_max;
-    std::size_t _M_item_total;
-    std::size_t _M_count;
-    std::size_t _M_resize;
-    std::size_t _M_cost;
-  };
-
-  /** @brief A container size instrumentation line in the stack table.  */
-  class __container_size_stack_info
-  : public __container_size_info
-  {
-  public:
-    __container_size_stack_info(const __container_size_info& __o)
-    : __container_size_info(__o) { }
-  };
-  
-  /** @brief Container size instrumentation trace producer.  */
-  class __trace_container_size
-  : public __trace_base<__container_size_info, __container_size_stack_info> 
-  {
-  public:
-    ~__trace_container_size() { }
-
-    __trace_container_size()
-    : __trace_base<__container_size_info, __container_size_stack_info>() { };
-
-    // Insert a new node at construct with object, callstack and initial size. 
-    __container_size_info*
-    __insert(__stack_t __stack, std::size_t __num)
-    {
-      __container_size_info* __ret =  __add_object(__stack);
-      if (__ret)
-	__ret->__init(__num);
-      return __ret;
-    }
-
-    // Call at destruction/clean to set container final size.
-    void
-    __destruct(__container_size_info* __obj_info,
-	       std::size_t __num, std::size_t __inum)
-    {
-      __obj_info->__destruct(__num, __inum);
-      __retire_object(__obj_info);
-    }
-  };
-
-} // namespace __gnu_profile
-#endif /* _GLIBCXX_PROFILE_PROFILER_CONTAINER_SIZE_H */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_hash_func.h b/openflow/usr/include/c++/5/profile/impl/profiler_hash_func.h
deleted file mode 100644
index c40373f..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_hash_func.h
+++ /dev/null
@@ -1,153 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_hash_func.h
- *  @brief Data structures to represent profiling traces.
- */
-
-// Written by Lixia Liu and Silvius Rus.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_HASH_FUNC_H
-#define _GLIBCXX_PROFILE_PROFILER_HASH_FUNC_H 1
-
-#include "profile/impl/profiler.h"
-#include "profile/impl/profiler_node.h"
-#include "profile/impl/profiler_trace.h"
-
-namespace __gnu_profile
-{
-  /** @brief A hash performance instrumentation line in the object table.  */
-  class __hashfunc_info
-  : public __object_info_base
-  {
-  public:
-    __hashfunc_info(__stack_t __stack)
-    : __object_info_base(__stack), _M_longest_chain(0),
-      _M_accesses(0), _M_hops(0) { }
-
-    void
-    __merge(const __hashfunc_info& __o)
-    {
-      __object_info_base::__merge(__o);
-      _M_longest_chain  = std::max(_M_longest_chain, __o._M_longest_chain);
-      _M_accesses      += __o._M_accesses;
-      _M_hops          += __o._M_hops;
-    }
-
-    void
-    __destruct(std::size_t __chain, std::size_t __accesses,
-	       std::size_t __hops)
-    { 
-      _M_longest_chain  = std::max(_M_longest_chain, __chain);
-      _M_accesses      += __accesses;
-      _M_hops          += __hops;
-    }
-
-    void
-    __write(FILE* __f) const
-    { std::fprintf(__f, "%Zu %Zu %Zu\n", _M_hops,
-		   _M_accesses, _M_longest_chain); }
-
-    float
-    __magnitude() const
-    { return static_cast<float>(_M_hops); }
-
-    std::string
-    __advice() const
-    { return "change hash function"; }
-
-  private:
-    std::size_t _M_longest_chain;
-    std::size_t _M_accesses;
-    std::size_t _M_hops;
-  };
-
-  /** @brief A hash performance instrumentation line in the stack table.  */
-  class __hashfunc_stack_info 
-  : public __hashfunc_info
-  {
-  public:
-    __hashfunc_stack_info(const __hashfunc_info& __o)
-    : __hashfunc_info(__o) { }
-  };
-
-  /** @brief Hash performance instrumentation producer.  */
-  class __trace_hash_func
-  : public __trace_base<__hashfunc_info, __hashfunc_stack_info> 
-  {
-  public:
-    __trace_hash_func()
-    : __trace_base<__hashfunc_info, __hashfunc_stack_info>()
-    { __id = "hash-distr"; }
-
-    ~__trace_hash_func() {}
-    
-    // Call at destruction/clean to set container final size.
-    void
-    __destruct(__hashfunc_info* __obj_info, 
-	       std::size_t __chain, std::size_t __accesses, std::size_t __hops)
-    {
-      if (!__obj_info)
-	return;
-
-      __obj_info->__destruct(__chain, __accesses, __hops);
-      __retire_object(__obj_info);
-    }
-  };
-
-  inline void
-  __trace_hash_func_init()
-  { _GLIBCXX_PROFILE_DATA(_S_hash_func) = new __trace_hash_func(); }
-
-  inline void
-  __trace_hash_func_free()
-  { delete _GLIBCXX_PROFILE_DATA(_S_hash_func); }
-
-  inline void
-  __trace_hash_func_report(FILE* __f, __warning_vector_t& __warnings)
-  { __trace_report(_GLIBCXX_PROFILE_DATA(_S_hash_func), __f, __warnings); }
-
-  inline __hashfunc_info*
-  __trace_hash_func_construct()
-  {
-    if (!__profcxx_init())
-      return 0;
-
-    if (!__reentrance_guard::__get_in())
-      return 0;
-
-    __reentrance_guard __get_out;
-    return _GLIBCXX_PROFILE_DATA(_S_hash_func)->__add_object(__get_stack());
-  }
-
-  inline void
-  __trace_hash_func_destruct(__hashfunc_info* __obj_info,
-			     std::size_t __chain, std::size_t __accesses,
-			     std::size_t __hops)
-  {
-    _GLIBCXX_PROFILE_DATA(_S_hash_func)->__destruct(__obj_info, __chain,
-						    __accesses, __hops);
-  }
-
-} // namespace __gnu_profile
-#endif /* _GLIBCXX_PROFILE_PROFILER_HASH_FUNC_H */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_hashtable_size.h b/openflow/usr/include/c++/5/profile/impl/profiler_hashtable_size.h
deleted file mode 100644
index 96f0f60..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_hashtable_size.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_hashtable_size.h
- *  @brief Collection of hashtable size traces.
- */
-
-// Written by Lixia Liu and Silvius Rus.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_HASHTABLE_SIZE_H
-#define _GLIBCXX_PROFILE_PROFILER_HASHTABLE_SIZE_H 1
-
-#include "profile/impl/profiler.h"
-#include "profile/impl/profiler_node.h"
-#include "profile/impl/profiler_trace.h"
-#include "profile/impl/profiler_state.h"
-#include "profile/impl/profiler_container_size.h"
-
-namespace __gnu_profile
-{
-  /** @brief Hashtable size instrumentation trace producer.  */
-  class __trace_hashtable_size
-  : public __trace_container_size
-  {
-  public:
-    __trace_hashtable_size()
-    : __trace_container_size()
-    { __id = "hashtable-size"; }
-  };
-
-  inline void
-  __trace_hashtable_size_init()
-  { _GLIBCXX_PROFILE_DATA(_S_hashtable_size) = new __trace_hashtable_size(); }
-
-  inline void
-  __trace_hashtable_size_free()
-  { delete _GLIBCXX_PROFILE_DATA(_S_hashtable_size); }
-
-  inline void
-  __trace_hashtable_size_report(FILE* __f, __warning_vector_t& __warnings)
-  { __trace_report(_GLIBCXX_PROFILE_DATA(_S_hashtable_size), __f, __warnings); }
-
-  inline __container_size_info*
-  __trace_hashtable_size_construct(std::size_t __num)
-  {
-    if (!__profcxx_init())
-      return 0;
-  
-    if (!__reentrance_guard::__get_in())
-      return 0;
-
-    __reentrance_guard __get_out;
-    return _GLIBCXX_PROFILE_DATA(_S_hashtable_size)->
-      __insert(__get_stack(), __num);
-  }
-
-  inline void
-  __trace_hashtable_size_resize(__container_size_info* __obj_info,
-				std::size_t __from, std::size_t __to)
-  {
-    if (!__obj_info)
-      return;
-
-    __obj_info->__resize(__from, __to);
-  }
-
-  inline void
-  __trace_hashtable_size_destruct(__container_size_info* __obj_info,
-				  std::size_t __num, std::size_t __inum)
-  {
-    if (!__obj_info)
-      return;
-
-    _GLIBCXX_PROFILE_DATA(_S_hashtable_size)->
-      __destruct(__obj_info, __num, __inum);
-  }
-
-} // namespace __gnu_profile
-
-#endif /* _GLIBCXX_PROFILE_PROFILER_HASHTABLE_SIZE_H */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_list_to_slist.h b/openflow/usr/include/c++/5/profile/impl/profiler_list_to_slist.h
deleted file mode 100644
index 874a874..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_list_to_slist.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_list_to_slist.h
- *  @brief Diagnostics for list to slist.
- */
-
-// Written by Changhee Jung.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_LIST_TO_SLIST_H
-#define _GLIBCXX_PROFILE_PROFILER_LIST_TO_SLIST_H 1
-
-#include "profile/impl/profiler.h"
-#include "profile/impl/profiler_node.h"
-#include "profile/impl/profiler_trace.h"
-
-namespace __gnu_profile
-{
-  class __list2slist_info
-  : public __object_info_base
-  {
-  public:
-    __list2slist_info(__stack_t __stack)
-    : __object_info_base(__stack), _M_rewind(false), _M_operations(0) { }
-
-    // XXX: the magnitude should be multiplied with a constant factor F,
-    // where F is 1 when the malloc size class of list nodes is different
-    // from the malloc size class of slist nodes.  When they fall into the same
-    // class, the only slist benefit is from having to set fewer links, so
-    // the factor F should be much smaller, closer to 0 than to 1.
-    // This could be implemented by passing the size classes in the config 
-    // file.  For now, we always assume F to be 1.
-
-    float
-    __magnitude() const
-    {
-      if (!_M_rewind)
-	return _M_operations;
-      else
-	return 0;
-    }
-    
-    void
-    __write(FILE* __f) const
-    { std::fprintf(__f, "%s\n", _M_rewind ? "invalid" : "valid"); }
-
-    std::string
-    __advice() const
-    { return "change std::list to std::forward_list"; }
-
-    void
-    __opr_rewind()
-    {
-      _M_rewind = true;
-      __set_invalid();
-    }
-
-    void
-    __record_operation()
-    { ++_M_operations; }
-
-    bool
-    __has_rewind()
-    { return _M_rewind; }
-
-  private:
-    bool _M_rewind;
-    std::size_t _M_operations;
-  };
-
-  class __list2slist_stack_info
-  : public __list2slist_info
-  {
-  public:
-    __list2slist_stack_info(const __list2slist_info& __o) 
-    : __list2slist_info(__o) { }
-  };
-
-  class __trace_list_to_slist
-  : public __trace_base<__list2slist_info, __list2slist_stack_info> 
-  {
-  public:
-    ~__trace_list_to_slist() { }
-
-    __trace_list_to_slist()
-    : __trace_base<__list2slist_info, __list2slist_stack_info>()
-    { __id = "list-to-slist"; }
-
-    void
-    __destruct(__list2slist_info* __obj_info)
-    { __retire_object(__obj_info); }
-  };
-
-
-  inline void
-  __trace_list_to_slist_init()
-  { _GLIBCXX_PROFILE_DATA(_S_list_to_slist) = new __trace_list_to_slist(); }
-
-  inline void
-  __trace_list_to_slist_free()
-  { delete _GLIBCXX_PROFILE_DATA(_S_list_to_slist); }
-
-  inline void
-  __trace_list_to_slist_report(FILE* __f, __warning_vector_t& __warnings)
-  { __trace_report(_GLIBCXX_PROFILE_DATA(_S_list_to_slist), __f, __warnings); }
-
-  inline __list2slist_info*
-  __trace_list_to_slist_construct()
-  {
-    if (!__profcxx_init())
-      return 0;
-
-    if (!__reentrance_guard::__get_in())
-      return 0;
-
-    __reentrance_guard __get_out;
-    return _GLIBCXX_PROFILE_DATA(_S_list_to_slist)->__add_object(__get_stack());
-  }
-
-  inline void
-  __trace_list_to_slist_rewind(__list2slist_info* __obj_info) 
-  {
-    if (!__obj_info)
-      return;
-
-    __obj_info->__opr_rewind();
-  }
-
-  inline void
-  __trace_list_to_slist_operation(__list2slist_info* __obj_info) 
-  {
-    if (!__obj_info)
-      return;
-
-    __obj_info->__record_operation();
-  }
-
-  inline void
-  __trace_list_to_slist_destruct(__list2slist_info* __obj_info)
-  {
-    if (!__obj_info)
-      return;
-
-    _GLIBCXX_PROFILE_DATA(_S_list_to_slist)->__destruct(__obj_info);
-  }
-
-} // namespace __gnu_profile
-#endif /* _GLIBCXX_PROFILE_PROFILER_LIST_TO_SLIST_H */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_list_to_vector.h b/openflow/usr/include/c++/5/profile/impl/profiler_list_to_vector.h
deleted file mode 100644
index 97995ba..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_list_to_vector.h
+++ /dev/null
@@ -1,261 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_list_to_vector.h
- *  @brief diagnostics for list to vector.
- */
-
-// Written by Changhee Jung.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_LIST_TO_VECTOR_H
-#define _GLIBCXX_PROFILE_PROFILER_LIST_TO_VECTOR_H 1
-
-#include <sstream>
-
-#include "profile/impl/profiler.h"
-#include "profile/impl/profiler_node.h"
-#include "profile/impl/profiler_trace.h"
-
-namespace __gnu_profile
-{
-  /** @brief A list-to-vector instrumentation line in the object table.  */
-  class __list2vector_info
-  : public __object_info_base
-  {
-  public:
-    __list2vector_info(__stack_t __stack)
-    : __object_info_base(__stack), _M_shift_count(0), _M_iterate(0),
-      _M_resize(0), _M_list_cost(0), _M_vector_cost(0),
-      _M_max_size(0) { }
-
-    void
-    __merge(const __list2vector_info& __o)
-    {
-      __object_info_base::__merge(__o);
-      _M_shift_count  += __o._M_shift_count;
-      _M_iterate      += __o._M_iterate;
-      _M_vector_cost  += __o._M_vector_cost;
-      _M_list_cost    += __o._M_list_cost;
-      _M_resize       += __o._M_resize;
-      _M_max_size     = std::max( _M_max_size, __o._M_max_size);
-    }
-
-    void
-    __write(FILE* __f) const
-    {
-      std::fprintf(__f, "%Zu %Zu %Zu %.0f %.0f\n", _M_shift_count,
-		   _M_resize, _M_iterate, _M_vector_cost, _M_list_cost);
-    }
-
-    float
-    __magnitude() const
-    { return _M_list_cost - _M_vector_cost; }
-  
-    std::string
-    __advice() const
-    {
-      std::stringstream __sstream;
-      __sstream 
-	<< "change std::list to std::vector and its initial size from 0 to "
-	<< _M_max_size;
-      return __sstream.str();
-    }
-
-    std::size_t
-    __shift_count()
-    { return _M_shift_count; }
-  
-    std::size_t
-    __iterate()
-    { return _M_iterate; }
-  
-    float
-    __list_cost()
-    { return _M_list_cost; }
-  
-    std::size_t
-    __resize()
-    { return _M_resize; }
-  
-    void
-    __set_list_cost(float __lc)
-    { _M_list_cost = __lc; }
-    
-    void
-    __set_vector_cost(float __vc)
-    { _M_vector_cost = __vc; }
-    
-    void
-    __opr_insert(std::size_t __shift, std::size_t __size)
-    {
-      _M_shift_count += __shift;
-      _M_max_size = std::max(_M_max_size, __size);
-    }
-
-    void
-    __opr_iterate(int __num)
-    { __gnu_cxx::__atomic_add(&_M_iterate, __num); }
-
-    void
-    __resize(std::size_t __from, std::size_t)
-    { _M_resize += __from; }
-
-  private:
-    std::size_t _M_shift_count;
-    mutable _Atomic_word _M_iterate;
-    std::size_t _M_resize;
-    float _M_list_cost;
-    float _M_vector_cost;
-    std::size_t _M_max_size;
-  };
-
-  class __list2vector_stack_info 
-  : public __list2vector_info
-  {
-  public:
-    __list2vector_stack_info(const __list2vector_info& __o) 
-    : __list2vector_info(__o) {}
-  };
-
-  class __trace_list_to_vector
-  : public __trace_base<__list2vector_info, __list2vector_stack_info> 
-  {
-  public:
-    __trace_list_to_vector()
-    : __trace_base<__list2vector_info, __list2vector_stack_info>()
-    { __id = "list-to-vector"; }
-
-    ~__trace_list_to_vector() { }
-
-    // Call at destruction/clean to set container final size.
-    void
-    __destruct(__list2vector_info* __obj_info)
-    {
-      float __vc = __vector_cost(__obj_info->__shift_count(),
-				 __obj_info->__iterate());
-      float __lc = __list_cost(__obj_info->__shift_count(),
-			       __obj_info->__iterate());
-      __obj_info->__set_vector_cost(__vc);
-      __obj_info->__set_list_cost(__lc);
-      __retire_object(__obj_info);
-    }
-
-    // Collect cost of operations.
-    float
-    __vector_cost(std::size_t __shift, std::size_t __iterate)
-    {
-      // The resulting vector will use a 'reserve' method.
-      return (__shift
-	      * _GLIBCXX_PROFILE_DATA(__vector_shift_cost_factor).__value
-	      + __iterate
-	      * _GLIBCXX_PROFILE_DATA(__vector_iterate_cost_factor).__value); 
-    }
-
-    float
-    __list_cost(std::size_t __shift, std::size_t __iterate)
-    {
-      return (__shift
-	      * _GLIBCXX_PROFILE_DATA(__list_shift_cost_factor).__value
-	      + __iterate
-	      * _GLIBCXX_PROFILE_DATA(__list_iterate_cost_factor).__value); 
-    }
-  };
-
-
-  inline void
-  __trace_list_to_vector_init()
-  { _GLIBCXX_PROFILE_DATA(_S_list_to_vector) = new __trace_list_to_vector(); }
-
-  inline void
-  __trace_list_to_vector_free()
-  { delete _GLIBCXX_PROFILE_DATA(_S_list_to_vector); }
-
-  inline void
-  __trace_list_to_vector_report(FILE* __f, __warning_vector_t& __warnings)
-  { __trace_report(_GLIBCXX_PROFILE_DATA(_S_list_to_vector), __f, __warnings); }
-
-  inline __list2vector_info*
-  __trace_list_to_vector_construct()
-  {
-    if (!__profcxx_init())
-      return 0;
-
-    if (!__reentrance_guard::__get_in())
-      return 0;
-
-    __reentrance_guard __get_out;
-    return _GLIBCXX_PROFILE_DATA(_S_list_to_vector)
-      ->__add_object(__get_stack());
-  }
-
-  inline void
-  __trace_list_to_vector_insert(__list2vector_info* __obj_info,
-				std::size_t __shift, std::size_t __size)
-  {
-    if (!__obj_info)
-      return;
-
-    __obj_info->__opr_insert(__shift, __size);
-  }
-
-  inline void
-  __trace_list_to_vector_iterate(__list2vector_info* __obj_info,
-				 int)
-  {
-    if (!__obj_info)
-      return;
-
-    // We only collect if an iteration took place no matter in what side.
-    __obj_info->__opr_iterate(1);
-  }
-
-  inline void
-  __trace_list_to_vector_invalid_operator(__list2vector_info* __obj_info)
-  {
-    if (!__obj_info)
-      return;
-
-    __obj_info->__set_invalid();
-  }
-
-  inline void
-  __trace_list_to_vector_resize(__list2vector_info* __obj_info, 
-				std::size_t __from, std::size_t __to)
-  {
-    if (!__obj_info)
-      return;
-
-    __obj_info->__resize(__from, __to);
-  }
-
-  inline void
-  __trace_list_to_vector_destruct(__list2vector_info* __obj_info)
-  {
-    if (!__obj_info)
-      return;
-
-    _GLIBCXX_PROFILE_DATA(_S_list_to_vector)->__destruct(__obj_info);
-  }
-
-} // namespace __gnu_profile
-#endif /* _GLIBCXX_PROFILE_PROFILER_LIST_TO_VECTOR_H__ */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_map_to_unordered_map.h b/openflow/usr/include/c++/5/profile/impl/profiler_map_to_unordered_map.h
deleted file mode 100644
index c6d77b5..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_map_to_unordered_map.h
+++ /dev/null
@@ -1,275 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_map_to_unordered_map.h
- *  @brief Diagnostics for map to unordered_map.
- */
-
-// Written by Silvius Rus.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_MAP_TO_UNORDERED_MAP_H
-#define _GLIBCXX_PROFILE_PROFILER_MAP_TO_UNORDERED_MAP_H 1
-
-#include "profile/impl/profiler.h"
-#include "profile/impl/profiler_node.h"
-#include "profile/impl/profiler_trace.h"
-
-namespace __gnu_profile
-{
-  inline int
-  __log2(std::size_t __size)
-  {
-    for (int __bit_count = sizeof(std::size_t) - 1; __bit_count >= 0;
-	 -- __bit_count)
-      if ((2 << __bit_count) & __size)
-	return __bit_count;
-    return 0;
-  }
-
-  inline float
-  __map_insert_cost(std::size_t __size)
-  { return (_GLIBCXX_PROFILE_DATA(__map_insert_cost_factor).__value
-	    * static_cast<float>(__log2(__size))); }
-
-  inline float
-  __map_erase_cost(std::size_t __size)
-  { return (_GLIBCXX_PROFILE_DATA(__map_erase_cost_factor).__value
-	    * static_cast<float>(__log2(__size))); }
-
-  inline float
-  __map_find_cost(std::size_t __size)
-  { return (_GLIBCXX_PROFILE_DATA(__map_find_cost_factor).__value
-	    * static_cast<float>(__log2(__size))); }
-
-  /** @brief A map-to-unordered_map instrumentation line in the
-      object table.  */
-  class __map2umap_info
-  : public __object_info_base
-  {
-  public:
-    __map2umap_info(__stack_t __stack)
-    : __object_info_base(__stack), _M_insert(0), _M_erase(0), _M_find(0),
-      _M_iterate(0), _M_umap_cost(0.0), _M_map_cost(0.0)
-    { }
-
-    void
-    __merge(const __map2umap_info& __o)
-    {
-      __object_info_base::__merge(__o);
-      _M_insert		+= __o._M_insert;
-      _M_erase		+= __o._M_erase;
-      _M_find		+= __o._M_find;
-      _M_iterate	+= __o._M_iterate;
-      _M_umap_cost	+= __o._M_umap_cost;
-      _M_map_cost	+= __o._M_map_cost;
-    }
-
-    void
-    __write(FILE* __f) const
-    {
-      std::fprintf(__f, "%Zu %Zu %Zu %Zu %.0f %.0f\n",
-		   _M_insert, _M_erase, _M_find, _M_iterate, _M_map_cost,
-		   _M_umap_cost);
-    }
-
-    float
-    __magnitude() const
-    { return _M_map_cost - _M_umap_cost; }
-
-    std::string
-    __advice() const
-    { return "prefer an unordered container"; }
-
-    void
-    __record_insert(std::size_t __size, std::size_t __count)
-    {
-      ++_M_insert;
-      if (__count)
-	{
-	  _M_map_cost += __count * __map_insert_cost(__size);
-	  _M_umap_cost
-	    += (__count
-		* _GLIBCXX_PROFILE_DATA(__umap_insert_cost_factor).__value);
-	}
-    }
-
-    void
-    __record_erase(std::size_t __size, std::size_t __count)
-    {
-      ++_M_erase;
-      if (__count)
-	{
-	  _M_map_cost += __count * __map_erase_cost(__size);
-	  _M_umap_cost
-	    += (__count
-		* _GLIBCXX_PROFILE_DATA(__umap_erase_cost_factor).__value);
-	}
-    }
-
-    void
-    __record_find(std::size_t __size)
-    {
-      ++_M_find;
-      _M_map_cost += __map_find_cost(__size);
-      _M_umap_cost += _GLIBCXX_PROFILE_DATA(__umap_find_cost_factor).__value;
-    }
-
-    void
-    __record_iterate(int __count)
-    { __gnu_cxx::__atomic_add(&_M_iterate, __count); }
-
-    void
-    __set_iterate_costs()
-    {
-      _M_umap_cost
-	+= (_M_iterate
-	    * _GLIBCXX_PROFILE_DATA(__umap_iterate_cost_factor).__value);
-      _M_map_cost
-	+= (_M_iterate
-	    * _GLIBCXX_PROFILE_DATA(__map_iterate_cost_factor).__value);
-    }
-
-  private:
-    std::size_t _M_insert;
-    std::size_t _M_erase;
-    std::size_t _M_find;
-    mutable _Atomic_word _M_iterate;
-    float _M_umap_cost;
-    float _M_map_cost;
-  };
-
-
-  /** @brief A map-to-unordered_map instrumentation line in the
-      stack table.  */
-  class __map2umap_stack_info
-  : public __map2umap_info
-  {
-  public:
-    __map2umap_stack_info(const __map2umap_info& __o)
-    : __map2umap_info(__o) { }
-  };
-
-  /** @brief Map-to-unordered_map instrumentation producer.  */
-  class __trace_map2umap
-  : public __trace_base<__map2umap_info, __map2umap_stack_info>
-  {
-  public:
-    __trace_map2umap()
-    : __trace_base<__map2umap_info, __map2umap_stack_info>()
-    { __id = "ordered-to-unordered"; }
-
-    // Call at destruction/clean to set container final size.
-    void
-    __destruct(__map2umap_info* __obj_info)
-    {
-      __obj_info->__set_iterate_costs();
-      __retire_object(__obj_info);
-    }
-  };
-
-  inline void
-  __trace_map_to_unordered_map_init()
-  { _GLIBCXX_PROFILE_DATA(_S_map2umap) = new __trace_map2umap(); }
-
-  inline void
-  __trace_map_to_unordered_map_free()
-  { delete _GLIBCXX_PROFILE_DATA(_S_map2umap); }
-
-  inline void
-  __trace_map_to_unordered_map_report(FILE* __f,
-				      __warning_vector_t& __warnings)
-  { __trace_report(_GLIBCXX_PROFILE_DATA(_S_map2umap), __f, __warnings); }
-
-  inline __map2umap_info*
-  __trace_map_to_unordered_map_construct()
-  {
-    if (!__profcxx_init())
-      return 0;
-
-    if (!__reentrance_guard::__get_in())
-      return 0;
-
-    __reentrance_guard __get_out;
-    return _GLIBCXX_PROFILE_DATA(_S_map2umap)->__add_object(__get_stack());
-  }
-
-  inline void
-  __trace_map_to_unordered_map_insert(__map2umap_info* __info,
-				      std::size_t __size, std::size_t __count)
-  {
-    if (!__info)
-      return;
-
-    __info->__record_insert(__size, __count);
-  }
-
-  inline void
-  __trace_map_to_unordered_map_erase(__map2umap_info* __info,
-				     std::size_t __size, std::size_t __count)
-  {
-    if (!__info)
-      return;
-
-    __info->__record_erase(__size, __count);
-  }
-
-  inline void
-  __trace_map_to_unordered_map_find(__map2umap_info* __info,
-				    std::size_t __size)
-  {
-    if (!__info)
-      return;
-
-    __info->__record_find(__size);
-  }
-
-  inline void
-  __trace_map_to_unordered_map_iterate(__map2umap_info* __info,
-				       int)
-  {
-    if (!__info)
-      return;
-
-    // We only collect if an iteration took place no matter in what side.
-    __info->__record_iterate(1);
-  }
-
-  inline void
-  __trace_map_to_unordered_map_invalidate(__map2umap_info* __info)
-  {
-    if (!__info)
-      return;
-
-    __info->__set_invalid();
-  }
-
-  inline void
-  __trace_map_to_unordered_map_destruct(__map2umap_info* __info)
-  {
-    if (!__info)
-      return;
-
-    _GLIBCXX_PROFILE_DATA(_S_map2umap)->__destruct(__info);
-  }
-} // namespace __gnu_profile
-#endif /* _GLIBCXX_PROFILE_PROFILER_MAP_TO_UNORDERED_MAP_H */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_node.h b/openflow/usr/include/c++/5/profile/impl/profiler_node.h
deleted file mode 100644
index ba97d18..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_node.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_node.h
- *  @brief Data structures to represent a single profiling event.
- */
-
-// Written by Lixia Liu and Silvius Rus.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_NODE_H
-#define _GLIBCXX_PROFILE_PROFILER_NODE_H 1
-
-#include <cstdio> // FILE, fprintf
-
-#include <vector>
-#if defined _GLIBCXX_HAVE_EXECINFO_H
-#include <execinfo.h>
-#endif
-
-namespace __gnu_profile
-{
-  typedef void* __instruction_address_t;
-  typedef std::_GLIBCXX_STD_C::vector<__instruction_address_t> __stack_npt;
-  typedef __stack_npt* __stack_t;
-
-  std::size_t __stack_max_depth();
-
-  inline __stack_t
-  __get_stack()
-  {
-#if defined _GLIBCXX_HAVE_EXECINFO_H
-    __try
-      {
-	std::size_t __max_depth = __stack_max_depth();
-	if (__max_depth == 0)
-	  return 0;
-	__stack_npt __buffer(__max_depth);
-	int __depth = backtrace(&__buffer[0], __max_depth);
-	return new(std::nothrow) __stack_npt(__buffer.begin(),
-					     __buffer.begin() + __depth);
-      }
-    __catch(...)
-      {
-	return 0;
-      }
-#else
-    return 0;
-#endif
-  }
-
-  inline std::size_t
-  __size(__stack_t __stack)
-  {
-    if (!__stack)
-      return 0;
-    else
-      return __stack->size();
-  }
-
-  // XXX
-  inline void
-  __write(FILE* __f, __stack_t __stack)
-  {
-    if (!__stack)
-      return;
-  
-    __stack_npt::const_iterator __it;
-    for (__it = __stack->begin(); __it != __stack->end(); ++__it)
-      std::fprintf(__f, "%p ", *__it);
-  }
-
-  /** @brief Hash function for summary trace using call stack as index.  */
-  class __stack_hash 
-  {
-  public:
-    std::size_t
-    operator()(__stack_t __s) const
-    {
-      if (!__s) 
-	return 0;
-
-      std::size_t __index = 0;
-      __stack_npt::const_iterator __it;
-      for (__it = __s->begin(); __it != __s->end(); ++__it)
-	__index += reinterpret_cast<std::size_t>(*__it);
-      return __index;
-    }
-
-    bool operator() (__stack_t __stack1, __stack_t __stack2) const
-    {
-      if (!__stack1 && !__stack2)
-	return true;
-      if (!__stack1 || !__stack2)
-	return false;
-      if (__stack1->size() != __stack2->size())
-	return false;
-
-      std::size_t __byte_size
-	= __stack1->size() * sizeof(__stack_npt::value_type);
-      return __builtin_memcmp(&(*__stack1)[0], &(*__stack2)[0],
-			      __byte_size) == 0;
-    }
-  };
-
-
-  /** @brief Base class for a line in the object table.  */
-  class __object_info_base
-  {
-  public:
-    __object_info_base(__stack_t __stack)
-    : _M_stack(__stack), _M_valid(true) { }
-
-    bool
-    __is_valid() const 
-    { return _M_valid; }
-    
-    void
-    __set_invalid()
-    { _M_valid = false; }
-
-    void
-    __merge(const __object_info_base& __o)
-    { _M_valid &= __o._M_valid; }
-
-    __stack_t
-    __stack() const
-    { return _M_stack; }
-    
-  protected:
-    __stack_t _M_stack;
-    bool _M_valid;
-  };
-
-} // namespace __gnu_profile
-#endif /* _GLIBCXX_PROFILE_PROFILER_NODE_H */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_state.h b/openflow/usr/include/c++/5/profile/impl/profiler_state.h
deleted file mode 100644
index 003c369..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_state.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_state.h
- *  @brief Global profiler state.
- */
-
-// Written by Lixia Liu and Silvius Rus.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_STATE_H
-#define _GLIBCXX_PROFILE_PROFILER_STATE_H 1
-
-namespace __gnu_profile
-{
-  enum __state_type { __ON, __OFF, __INVALID };
-
-  _GLIBCXX_PROFILE_DEFINE_DATA(__state_type, __state, __INVALID);
-
-  inline bool
-  __turn(__state_type __s)
-  { 
-    __state_type inv(__INVALID);
-    return __atomic_compare_exchange_n(&_GLIBCXX_PROFILE_DATA(__state),
-				       &inv, __s, false, __ATOMIC_ACQ_REL, 
-				       __ATOMIC_RELAXED);
-  }
-
-  inline bool
-  __turn_on()
-  { return __turn(__ON); }
-
-  inline bool
-  __turn_off()
-  { return __turn(__OFF); }
-
-  inline bool
-  __is_on()
-  { return _GLIBCXX_PROFILE_DATA(__state) == __ON; }
-
-  inline bool
-  __is_off()
-  { return _GLIBCXX_PROFILE_DATA(__state) == __OFF; }
-
-  inline bool
-  __is_invalid()
-  { return _GLIBCXX_PROFILE_DATA(__state) == __INVALID; }
-
-} // end namespace __gnu_profile
-#endif /* _GLIBCXX_PROFILE_PROFILER_STATE_H */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_trace.h b/openflow/usr/include/c++/5/profile/impl/profiler_trace.h
deleted file mode 100644
index 8ef5d86..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_trace.h
+++ /dev/null
@@ -1,663 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_trace.h
- *  @brief Data structures to represent profiling traces.
- */
-
-// Written by Lixia Liu and Silvius Rus.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_TRACE_H
-#define _GLIBCXX_PROFILE_PROFILER_TRACE_H 1
-
-#include <cstdio>  // fopen, fclose, fprintf, FILE
-#include <cerrno>
-#include <cstdlib> // atof, atoi, strtol, getenv, atexit, abort
-
-#if __cplusplus >= 201103L
-#include <unordered_map>
-#define _GLIBCXX_IMPL_UNORDERED_MAP std::_GLIBCXX_STD_C::unordered_map
-#else
-#include <tr1/unordered_map>
-#define _GLIBCXX_IMPL_UNORDERED_MAP std::tr1::unordered_map
-#endif
-
-#include <ext/concurrence.h>
-#include <fstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "profile/impl/profiler_algos.h"
-#include "profile/impl/profiler_state.h"
-#include "profile/impl/profiler_node.h"
-
-namespace __gnu_profile
-{
-  /** @brief Internal environment.  Values can be set one of two ways:
-      1. In config file "var = value".  The default config file path is 
-	 libstdcxx-profile.conf.
-      2. By setting process environment variables.  For instance, in a Bash
-	 shell you can set the unit cost of iterating through a map like this:
-	 export __map_iterate_cost_factor=5.0.
-	 If a value is set both in the input file and through an environment
-	 variable, the environment value takes precedence.  */
-  typedef _GLIBCXX_IMPL_UNORDERED_MAP<std::string, std::string> __env_t;
-
-  _GLIBCXX_PROFILE_DEFINE_UNINIT_DATA(__env_t, __env);
-
-  /** @brief Master lock.  */
-  _GLIBCXX_PROFILE_DEFINE_UNINIT_DATA(__gnu_cxx::__mutex, __global_mutex);
-
-  /** @brief Representation of a warning.  */
-  struct __warning_data
-  {
-    float __magnitude;
-    __stack_t __context;
-    const char* __warning_id;
-    std::string __warning_message;
-
-    __warning_data()
-    : __magnitude(0.0), __context(0), __warning_id(0) { }
-
-    __warning_data(float __m, __stack_t __c, const char* __id, 
-		   const std::string& __msg)
-    : __magnitude(__m), __context(__c), __warning_id(__id), 
-      __warning_message(__msg) { }
-
-    bool
-    operator<(const __warning_data& __other) const
-    { return __magnitude < __other.__magnitude; }
-  };
-
-  typedef std::_GLIBCXX_STD_C::vector<__warning_data> __warning_vector_t;
-
-  // Defined in profiler_<diagnostic name>.h.
-  class __trace_hash_func;
-  class __trace_hashtable_size;
-  class __trace_map2umap;
-  class __trace_vector_size;
-  class __trace_vector_to_list;
-  class __trace_list_to_slist; 
-  class __trace_list_to_vector; 
-  void __trace_vector_size_init();
-  void __trace_hashtable_size_init();
-  void __trace_hash_func_init();
-  void __trace_vector_to_list_init();
-  void __trace_list_to_slist_init();  
-  void __trace_list_to_vector_init();  
-  void __trace_map_to_unordered_map_init();
-  void __trace_vector_size_report(FILE*, __warning_vector_t&);
-  void __trace_hashtable_size_report(FILE*, __warning_vector_t&);
-  void __trace_hash_func_report(FILE*, __warning_vector_t&);
-  void __trace_vector_to_list_report(FILE*, __warning_vector_t&);
-  void __trace_list_to_slist_report(FILE*, __warning_vector_t&); 
-  void __trace_list_to_vector_report(FILE*, __warning_vector_t&);
-  void __trace_map_to_unordered_map_report(FILE*, __warning_vector_t&);
-  void __trace_vector_size_free();
-  void __trace_hashtable_size_free();
-  void __trace_hash_func_free();
-  void __trace_vector_to_list_free();
-  void __trace_list_to_slist_free();  
-  void __trace_list_to_vector_free();  
-  void __trace_map_to_unordered_map_free();
-
-  struct __cost_factor
-  {
-    const char* __env_var;
-    float __value;
-  };
-
-  typedef std::_GLIBCXX_STD_C::vector<__cost_factor*> __cost_factor_vector;
-
-  _GLIBCXX_PROFILE_DEFINE_DATA(__trace_hash_func*, _S_hash_func, 0);
-  _GLIBCXX_PROFILE_DEFINE_DATA(__trace_hashtable_size*, _S_hashtable_size, 0);
-  _GLIBCXX_PROFILE_DEFINE_DATA(__trace_map2umap*, _S_map2umap, 0);
-  _GLIBCXX_PROFILE_DEFINE_DATA(__trace_vector_size*, _S_vector_size, 0);
-  _GLIBCXX_PROFILE_DEFINE_DATA(__trace_vector_to_list*, _S_vector_to_list, 0);
-  _GLIBCXX_PROFILE_DEFINE_DATA(__trace_list_to_slist*, _S_list_to_slist, 0); 
-  _GLIBCXX_PROFILE_DEFINE_DATA(__trace_list_to_vector*, _S_list_to_vector, 0);
-
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __vector_shift_cost_factor, 
-			       {"__vector_shift_cost_factor", 1.0});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __vector_iterate_cost_factor,
-			       {"__vector_iterate_cost_factor", 1.0});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __vector_resize_cost_factor,
-			       {"__vector_resize_cost_factor", 1.0}); 
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __list_shift_cost_factor,
-			       {"__list_shift_cost_factor", 0.0});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __list_iterate_cost_factor,
-			       {"__list_iterate_cost_factor", 10.0}); 
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __list_resize_cost_factor,
-			       {"__list_resize_cost_factor", 0.0}); 
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __map_insert_cost_factor,
-			       {"__map_insert_cost_factor", 1.5});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __map_erase_cost_factor,
-			       {"__map_erase_cost_factor", 1.5});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __map_find_cost_factor,
-			       {"__map_find_cost_factor", 1});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __map_iterate_cost_factor,
-			       {"__map_iterate_cost_factor", 2.3});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __umap_insert_cost_factor,
-			       {"__umap_insert_cost_factor", 12.0});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __umap_erase_cost_factor,
-			       {"__umap_erase_cost_factor", 12.0});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __umap_find_cost_factor,
-			       {"__umap_find_cost_factor", 10.0});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __umap_iterate_cost_factor,
-			       {"__umap_iterate_cost_factor", 1.7});
-  _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor_vector*, __cost_factors, 0);
-
-  _GLIBCXX_PROFILE_DEFINE_DATA(const char*, _S_trace_file_name,
-			       _GLIBCXX_PROFILE_TRACE_PATH_ROOT);
-  _GLIBCXX_PROFILE_DEFINE_DATA(std::size_t, _S_max_warn_count,
-			       _GLIBCXX_PROFILE_MAX_WARN_COUNT);
-  _GLIBCXX_PROFILE_DEFINE_DATA(std::size_t, _S_max_stack_depth,
-			       _GLIBCXX_PROFILE_MAX_STACK_DEPTH);
-  _GLIBCXX_PROFILE_DEFINE_DATA(std::size_t, _S_max_mem,
-			       _GLIBCXX_PROFILE_MEM_PER_DIAGNOSTIC);
-
-  inline std::size_t
-  __stack_max_depth()
-  { return _GLIBCXX_PROFILE_DATA(_S_max_stack_depth); }
-
-  inline std::size_t
-  __max_mem()
-  { return _GLIBCXX_PROFILE_DATA(_S_max_mem); }
-
-  /** @brief Base class for all trace producers.  */
-  template<typename __object_info, typename __stack_info>
-    class __trace_base
-    {
-    public:
-      // Do not pick the initial size too large, as we don't know which
-      // diagnostics are more active.
-      __trace_base()
-      : __objects_byte_size(0), __stack_table(10000),
-	__stack_table_byte_size(0), __id(0) { }
-
-      ~__trace_base()
-      {
-	for (typename __stack_table_t::iterator __it
-	       = __stack_table.begin(); __it != __stack_table.end(); ++__it)
-	  delete __it->first;
-      }
-
-      __object_info* __add_object(__stack_t __stack);
-      void __retire_object(__object_info* __info);
-      void __write(FILE* __f);
-      void __collect_warnings(__warning_vector_t& __warnings);
-      void __free();
-
-    private:
-      __gnu_cxx::__mutex __trace_mutex;
-      typedef _GLIBCXX_IMPL_UNORDERED_MAP<__stack_t, __stack_info,
-					  __stack_hash, 
-					  __stack_hash> __stack_table_t;
-      std::size_t __objects_byte_size;
-      __stack_table_t __stack_table;
-      std::size_t __stack_table_byte_size;
-
-    protected:
-      const char* __id;
-    };
-
-  template<typename __object_info, typename __stack_info>
-    __object_info*
-    __trace_base<__object_info, __stack_info>::
-    __add_object(__stack_t __stack)
-    {
-      // If we have no backtrace information no need to collect data.
-      if (!__stack)
-	return 0;
-
-      __gnu_cxx::__scoped_lock __lock(this->__trace_mutex);
-
-      if (__max_mem() != 0 && __objects_byte_size >= __max_mem())
-	{
-	  delete __stack;
-	  return 0;
-	}
-
-      __object_info* __ret = new(std::nothrow) __object_info(__stack);
-      if (!__ret)
-	{
-	  delete __stack;
-	  return 0;
-	}
-
-      __objects_byte_size += sizeof(__object_info);
-      return __ret;
-    }
-
-  template<typename __object_info, typename __stack_info>
-    void
-    __trace_base<__object_info, __stack_info>::
-    __retire_object(__object_info* __obj_info)
-    {
-      if (!__obj_info)
-	return;
-
-      __gnu_cxx::__scoped_lock __lock(this->__trace_mutex);
-
-      const __object_info& __info = *__obj_info;
-      __stack_t __stack = __info.__stack();
-      typename __stack_table_t::iterator __stack_it
-	= __stack_table.find(__stack);
-    
-      if (__stack_it == __stack_table.end())
-	{
-	  // First occurrence of this call context.
-	  if (__max_mem() == 0 || __stack_table_byte_size < __max_mem()) 
-	    {
-	      __stack_table_byte_size 
-		+= (sizeof(__instruction_address_t) * __size(__stack)
-		    + sizeof(__stack) + sizeof(__stack_info));
-	      __stack_table.insert(make_pair(__stack,
-					     __stack_info(__info)));
-	    }
-	  else
-	    delete __stack;
-	}
-      else
-	{
-	  // Merge object info into info summary for this call context.
-	  __stack_it->second.__merge(__info);
-	  delete __stack;
-	}
-
-      delete __obj_info;
-      __objects_byte_size -= sizeof(__object_info);
-    }
-
-  template<typename __object_info, typename __stack_info>
-    void
-    __trace_base<__object_info, __stack_info>::
-    __write(FILE* __f)
-    {
-      for (typename __stack_table_t::iterator __it
-	     = __stack_table.begin(); __it != __stack_table.end(); ++__it)
-	if (__it->second.__is_valid())
-	  {
-	    std::fprintf(__f, __id);
-	    std::fprintf(__f, "|");
-	    __gnu_profile::__write(__f, __it->first);
-	    std::fprintf(__f, "|");
-	    __it->second.__write(__f);
-	  }
-    }
-
-  template<typename __object_info, typename __stack_info>
-    void
-    __trace_base<__object_info, __stack_info>::
-    __collect_warnings(__warning_vector_t& __warnings)
-    {
-      for (typename __stack_table_t::iterator __it
-	     = __stack_table.begin(); __it != __stack_table.end(); ++__it)
-	__warnings.push_back(__warning_data(__it->second.__magnitude(),
-					    __it->first, __id,
-					    __it->second.__advice()));
-    }
-
-  template<typename __object_info, typename __stack_info>
-    inline void
-    __trace_report(__trace_base<__object_info, __stack_info>* __cont,
-		   FILE* __f, __warning_vector_t& __warnings)
-    {
-      if (__cont)
-	{
-	  __cont->__collect_warnings(__warnings);
-	  __cont->__write(__f);
-	}
-    }
-  
-  inline std::size_t
-  __env_to_size_t(const char* __env_var, std::size_t __default_value)
-  {
-    char* __env_value = std::getenv(__env_var);
-    if (__env_value)
-      {
-	errno = 0;
-	long __converted_value = std::strtol(__env_value, 0, 10);
-	if (errno || __converted_value < 0)
-	  {
-	    std::fprintf(stderr,
-			 "Bad value for environment variable '%s'.\n",
-			 __env_var);
-	    std::abort();
-	  }
-	else
-	  return static_cast<std::size_t>(__converted_value);
-      }
-    else
-      return __default_value;
-  }
-
-  inline void
-  __set_max_stack_trace_depth()
-  {
-    _GLIBCXX_PROFILE_DATA(_S_max_stack_depth)
-      = __env_to_size_t(_GLIBCXX_PROFILE_MAX_STACK_DEPTH_ENV_VAR,
-			_GLIBCXX_PROFILE_DATA(_S_max_stack_depth));
-  }
-
-  inline void
-  __set_max_mem()
-  {
-    _GLIBCXX_PROFILE_DATA(_S_max_mem) 
-      = __env_to_size_t(_GLIBCXX_PROFILE_MEM_PER_DIAGNOSTIC_ENV_VAR,
-			_GLIBCXX_PROFILE_DATA(_S_max_mem));
-  }
-
-  inline int
-  __log_magnitude(float __f)
-  {
-    const float __log_base = 10.0;
-    int __result = 0;
-    int __sign = 1;
-
-    if (__f < 0) 
-      {
-	__f = -__f;
-	__sign = -1;
-      }
-
-    while (__f > __log_base) 
-      {
-	++__result;
-	__f /= 10.0;
-      }
-    return __sign * __result;
-  }
-
-  inline FILE* 
-  __open_output_file(const char* __extension)
-  {
-    // The path is made of _S_trace_file_name + "." + extension.
-    std::size_t __root_len 
-      = __builtin_strlen(_GLIBCXX_PROFILE_DATA(_S_trace_file_name));
-    std::size_t __ext_len = __builtin_strlen(__extension);
-    char* __file_name = new char[__root_len + 1 + __ext_len + 1];
-    __builtin_memcpy(__file_name,
-		     _GLIBCXX_PROFILE_DATA(_S_trace_file_name),
-		     __root_len);
-    *(__file_name + __root_len) = '.';
-    __builtin_memcpy(__file_name + __root_len + 1,
-		     __extension, __ext_len + 1);
-
-    FILE* __out_file = std::fopen(__file_name, "w");
-    if (!__out_file)
-      {
-	std::fprintf(stderr, "Could not open trace file '%s'.\n",
-		     __file_name);
-	std::abort();
-      }
-
-    delete[] __file_name;
-    return __out_file;
-  }
-
-  struct __warn
-  {
-    FILE* __file;
-
-    __warn(FILE* __f)
-    { __file = __f; }
-
-    void
-    operator()(const __warning_data& __info)
-    {
-      std::fprintf(__file,  __info.__warning_id);
-      std::fprintf(__file, ": improvement = %d",
-		   __log_magnitude(__info.__magnitude));
-      std::fprintf(__file, ": call stack = ");
-      __gnu_profile::__write(__file, __info.__context);
-      std::fprintf(__file, ": advice = %s\n",
-		   __info.__warning_message.c_str());
-    }
-  };
-
-  /** @brief Final report method, registered with @b atexit.
-   *
-   * This can also be called directly by user code, including signal handlers.
-   * It is protected against deadlocks by the reentrance guard in profiler.h.
-   * However, when called from a signal handler that triggers while within
-   * __gnu_profile (under the guarded zone), no output will be produced.
-   */
-  inline void
-  __report()
-  {
-    __gnu_cxx::__scoped_lock __lock(_GLIBCXX_PROFILE_DATA(__global_mutex));
-
-    __warning_vector_t __warnings, __top_warnings;
-
-    FILE* __raw_file = __open_output_file("raw");
-    __trace_vector_size_report(__raw_file, __warnings);
-    __trace_hashtable_size_report(__raw_file, __warnings);
-    __trace_hash_func_report(__raw_file, __warnings);
-    __trace_vector_to_list_report(__raw_file, __warnings);
-    __trace_list_to_slist_report(__raw_file, __warnings);
-    __trace_list_to_vector_report(__raw_file, __warnings);
-    __trace_map_to_unordered_map_report(__raw_file, __warnings);
-    std::fclose(__raw_file);
-
-    // Sort data by magnitude, keeping just top N.
-    std::size_t __cutoff = std::min(_GLIBCXX_PROFILE_DATA(_S_max_warn_count),
-				    __warnings.size());
-    __top_n(__warnings, __top_warnings, __cutoff);
-
-    FILE* __warn_file = __open_output_file("txt");
-    __for_each(__top_warnings.begin(), __top_warnings.end(),
-	       __warn(__warn_file));
-    std::fclose(__warn_file);
-  }
-
-  inline void
-  __report_and_free()
-  {
-    __report();
-
-    __trace_map_to_unordered_map_free();
-    __trace_list_to_vector_free();
-    __trace_list_to_slist_free(); 
-    __trace_vector_to_list_free();
-    __trace_hash_func_free();
-    __trace_hashtable_size_free();
-    __trace_vector_size_free();
-    delete _GLIBCXX_PROFILE_DATA(__cost_factors);
-  }
-
-  inline void
-  __set_trace_path()
-  {
-    char* __env_trace_file_name = std::getenv(_GLIBCXX_PROFILE_TRACE_ENV_VAR);
-
-    if (__env_trace_file_name)
-      _GLIBCXX_PROFILE_DATA(_S_trace_file_name) = __env_trace_file_name;
-
-    // Make sure early that we can create the trace file.
-    std::fclose(__open_output_file("txt"));
-  }
-
-  inline void
-  __set_max_warn_count()
-  {
-    char* __env_max_warn_count_str
-      = std::getenv(_GLIBCXX_PROFILE_MAX_WARN_COUNT_ENV_VAR);
-
-    if (__env_max_warn_count_str)
-      _GLIBCXX_PROFILE_DATA(_S_max_warn_count)
-	= static_cast<std::size_t>(std::atoi(__env_max_warn_count_str));
-  }
-
-  inline void
-  __read_cost_factors()
-  {
-    std::string __conf_file_name(_GLIBCXX_PROFILE_DATA(_S_trace_file_name));
-    __conf_file_name += ".conf";
-
-    std::ifstream __conf_file(__conf_file_name.c_str());
-
-    if (__conf_file.is_open())
-      {
-	std::string __line;
-
-	while (std::getline(__conf_file, __line))
-	  {
-	    std::string::size_type __i = __line.find_first_not_of(" \t\n\v");
-
-	    if (__line.length() <= 0 || __line[__i] == '#')
-	      // Skip empty lines or comments.
-	      continue;
-	  }
-
-	// Trim.
-	__line.erase(__remove(__line.begin(), __line.end(), ' '),
-		     __line.end());
-	std::string::size_type __pos = __line.find("=");
-	std::string __factor_name = __line.substr(0, __pos);
-	std::string::size_type __end = __line.find_first_of(";\n");
-	std::string __factor_value = __line.substr(__pos + 1, __end - __pos);
-
-	_GLIBCXX_PROFILE_DATA(__env)[__factor_name] = __factor_value;
-      }
-  }
-
-  struct __cost_factor_writer
-  {
-    FILE* __file;
-
-    __cost_factor_writer(FILE* __f)
-    : __file(__f) { }
-
-    void
-    operator() (const __cost_factor* __factor)
-    { std::fprintf(__file, "%s = %f\n", __factor->__env_var,
-		   __factor->__value); }
-  };
-
-  inline void
-  __write_cost_factors()
-  {
-    FILE* __file = __open_output_file("conf.out");
-    __for_each(_GLIBCXX_PROFILE_DATA(__cost_factors)->begin(),
-	       _GLIBCXX_PROFILE_DATA(__cost_factors)->end(),
-	       __cost_factor_writer(__file));
-    std::fclose(__file);
-  }
-
-  struct __cost_factor_setter
-  {
-    void
-    operator()(__cost_factor* __factor)
-    {
-      // Look it up in the process environment first.
-      const char* __env_value = std::getenv(__factor->__env_var);
-
-      if (!__env_value)
-	{
-	  // Look it up in the config file.
-	  __env_t::iterator __it
-	    = _GLIBCXX_PROFILE_DATA(__env).find(__factor->__env_var);
-	  if (__it != _GLIBCXX_PROFILE_DATA(__env).end())
-	    __env_value = __it->second.c_str();
-	}
-
-      if (__env_value)
-	__factor->__value = std::atof(__env_value);
-    }
-  };
-
-  inline void
-  __set_cost_factors()
-  {
-    __cost_factor_vector* __factors = new __cost_factor_vector;
-    _GLIBCXX_PROFILE_DATA(__cost_factors) = __factors;
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__vector_shift_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__vector_iterate_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__vector_resize_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__list_shift_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__list_iterate_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__list_resize_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__map_insert_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__map_erase_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__map_find_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__map_iterate_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__umap_insert_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__umap_erase_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__umap_find_cost_factor));
-    __factors->push_back(&_GLIBCXX_PROFILE_DATA(__umap_iterate_cost_factor));
-    __for_each(__factors->begin(), __factors->end(), __cost_factor_setter());
-  }
-
-  inline void
-  __profcxx_init_unconditional()
-  {
-    __gnu_cxx::__scoped_lock __lock(_GLIBCXX_PROFILE_DATA(__global_mutex));
-
-    if (__is_invalid())
-      {
-	__set_max_warn_count();
-
-	if (_GLIBCXX_PROFILE_DATA(_S_max_warn_count) == 0)
-	  __turn_off();
-	else
-	  {
-	    __set_max_stack_trace_depth();
-	    __set_max_mem();
-	    __set_trace_path();
-	    __read_cost_factors(); 
-	    __set_cost_factors();
-	    __write_cost_factors();
-
-	    __trace_vector_size_init();
-	    __trace_hashtable_size_init();
-	    __trace_hash_func_init();
-	    __trace_vector_to_list_init();
-	    __trace_list_to_slist_init(); 
-	    __trace_list_to_vector_init();
-	    __trace_map_to_unordered_map_init();
-
-	    std::atexit(__report_and_free);
-
-	    __turn_on();
-	  }
-      }
-  }
-
-  /** @brief This function must be called by each instrumentation point.
-   *
-   * The common path is inlined fully.
-   */
-  inline bool
-  __profcxx_init()
-  {
-    if (__is_invalid())
-      __profcxx_init_unconditional();
-
-    return __is_on();
-  }
-
-} // namespace __gnu_profile
-
-#endif /* _GLIBCXX_PROFILE_PROFILER_TRACE_H */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_vector_size.h b/openflow/usr/include/c++/5/profile/impl/profiler_vector_size.h
deleted file mode 100644
index 7e4469a..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_vector_size.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_vector_size.h
- *  @brief Collection of vector size traces.
- */
-
-// Written by Lixia Liu and Silvius Rus.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_VECTOR_SIZE_H
-#define _GLIBCXX_PROFILE_PROFILER_VECTOR_SIZE_H 1
-
-#include "profile/impl/profiler.h"
-#include "profile/impl/profiler_node.h"
-#include "profile/impl/profiler_trace.h"
-#include "profile/impl/profiler_state.h"
-#include "profile/impl/profiler_container_size.h"
-
-namespace __gnu_profile
-{
-  /** @brief Hashtable size instrumentation trace producer.  */
-  class __trace_vector_size
-  : public __trace_container_size
-  {
-  public:
-    __trace_vector_size()
-    : __trace_container_size()
-    { __id = "vector-size"; }
-  };
-
-  inline void
-  __trace_vector_size_init()
-  { _GLIBCXX_PROFILE_DATA(_S_vector_size) = new __trace_vector_size(); }
-
-  inline void
-  __trace_vector_size_free()
-  { delete _GLIBCXX_PROFILE_DATA(_S_vector_size); }
-
-  inline void
-  __trace_vector_size_report(FILE* __f, __warning_vector_t& __warnings)
-  { __trace_report(_GLIBCXX_PROFILE_DATA(_S_vector_size), __f, __warnings); }
-
-  inline __container_size_info*
-  __trace_vector_size_construct(std::size_t __num)
-  {
-    if (!__profcxx_init())
-      return 0;
-
-    if (!__reentrance_guard::__get_in())
-      return 0;
-
-    __reentrance_guard __get_out;
-    return _GLIBCXX_PROFILE_DATA(_S_vector_size)->
-      __insert(__get_stack(), __num);
-  }
-
-  inline void
-  __trace_vector_size_resize(__container_size_info* __obj_info,
-			     std::size_t __from, std::size_t __to)
-  {
-    if (!__obj_info)
-      return;
-
-    __obj_info->__resize(__from, __to);
-  }
-
-  inline void
-  __trace_vector_size_destruct(__container_size_info* __obj_info,
-			       std::size_t __num, std::size_t __inum)
-  {
-    if (!__obj_info)
-      return;
-
-    _GLIBCXX_PROFILE_DATA(_S_vector_size)->
-      __destruct(__obj_info, __num, __inum);
-  }
-
-} // namespace __gnu_profile
-
-#endif /* _GLIBCXX_PROFILE_PROFILER_VECTOR_SIZE_H */
diff --git a/openflow/usr/include/c++/5/profile/impl/profiler_vector_to_list.h b/openflow/usr/include/c++/5/profile/impl/profiler_vector_to_list.h
deleted file mode 100644
index 534ef03..0000000
--- a/openflow/usr/include/c++/5/profile/impl/profiler_vector_to_list.h
+++ /dev/null
@@ -1,261 +0,0 @@
-// -*- C++ -*-
-//
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/impl/profiler_vector_to_list.h
- *  @brief diagnostics for vector to list.
- */
-
-// Written by Lixia Liu and Silvius Rus.
-
-#ifndef _GLIBCXX_PROFILE_PROFILER_VECTOR_TO_LIST_H
-#define _GLIBCXX_PROFILE_PROFILER_VECTOR_TO_LIST_H 1
-
-#include "profile/impl/profiler.h"
-#include "profile/impl/profiler_node.h"
-#include "profile/impl/profiler_trace.h"
-
-namespace __gnu_profile
-{
-  /** @brief A vector-to-list instrumentation line in the object table.  */
-  class __vector2list_info
-  : public __object_info_base
-  {
-  public:
-    __vector2list_info(__stack_t __stack)
-    : __object_info_base(__stack), _M_shift_count(0), _M_iterate(0),
-      _M_resize(0), _M_list_cost(0), _M_vector_cost(0)
-    { }
-
-    void
-    __merge(const __vector2list_info& __o)
-    {
-      __object_info_base::__merge(__o);
-      _M_shift_count  += __o._M_shift_count;
-      _M_iterate      += __o._M_iterate;
-      _M_vector_cost  += __o._M_vector_cost;
-      _M_list_cost    += __o._M_list_cost;
-      _M_resize       += __o._M_resize;
-    }
-
-    void
-    __write(FILE* __f) const
-    {
-      std::fprintf(__f, "%Zu %Zu %Zu %.0f %.0f\n", _M_shift_count,
-		   _M_resize, _M_iterate, _M_vector_cost, _M_list_cost);
-    }
-
-    float
-    __magnitude() const
-    { return _M_vector_cost - _M_list_cost; }
-
-    std::string
-    __advice() const 
-    { return "change std::vector to std::list"; }
-
-    std::size_t
-    __shift_count()
-    { return _M_shift_count; }
-
-    std::size_t
-    __iterate()
-    { return _M_iterate; }
-
-    float
-    __list_cost()
-    { return _M_list_cost; }
-
-    std::size_t
-    __resize()
-    { return _M_resize; }
-
-    void
-    __set_list_cost(float __lc)
-    { _M_list_cost = __lc; }
-    
-    void
-    __set_vector_cost(float __vc)
-    { _M_vector_cost = __vc; }
-    
-    void
-    __opr_insert(std::size_t __pos, std::size_t __num)
-    { _M_shift_count += __num - __pos; }
-
-    void
-    __opr_iterate(int __num)
-    { __gnu_cxx::__atomic_add(&_M_iterate, __num); }
-
-    void
-    __resize(std::size_t __from, std::size_t)
-    { _M_resize += __from; }
-
-  private:
-    std::size_t _M_shift_count;
-    mutable _Atomic_word _M_iterate;
-    std::size_t _M_resize;
-    float _M_list_cost;
-    float _M_vector_cost;
-  };
-
-
-  /** @brief A vector-to-list instrumentation line in the stack table.  */
-  class __vector2list_stack_info
-  : public __vector2list_info
-  {
-  public:
-    __vector2list_stack_info(const __vector2list_info& __o) 
-    : __vector2list_info(__o) { }
-  };
-
-
-  /** @brief Vector-to-list instrumentation producer.  */
-  class __trace_vector_to_list
-  : public __trace_base<__vector2list_info, __vector2list_stack_info> 
-  {
-  public:
-    __trace_vector_to_list()
-    : __trace_base<__vector2list_info, __vector2list_stack_info>()
-    { __id = "vector-to-list"; }
-
-    ~__trace_vector_to_list() { }
-
-    // Call at destruction/clean to set container final size.
-    void
-    __destruct(__vector2list_info* __obj_info)
-    {
-      float __vc = __vector_cost(__obj_info->__shift_count(),
-				 __obj_info->__iterate(),
-				 __obj_info->__resize());
-      float __lc = __list_cost(__obj_info->__shift_count(),
-			       __obj_info->__iterate(),
-			       __obj_info->__resize());
-      __obj_info->__set_vector_cost(__vc);
-      __obj_info->__set_list_cost(__lc);
-
-      __retire_object(__obj_info);
-    }
-
-    // Collect cost of operations.
-    float
-    __vector_cost(std::size_t __shift, std::size_t __iterate,
-		  std::size_t __resize)
-    {
-      return (__shift
-	      * _GLIBCXX_PROFILE_DATA(__vector_shift_cost_factor).__value
-	      + __iterate
-	      * _GLIBCXX_PROFILE_DATA(__vector_iterate_cost_factor).__value
-	      + __resize
-	      * _GLIBCXX_PROFILE_DATA(__vector_resize_cost_factor).__value);
-    }
-
-    float
-    __list_cost(std::size_t __shift, std::size_t __iterate,
-		std::size_t __resize)
-    {
-      return (__shift
-	      * _GLIBCXX_PROFILE_DATA(__list_shift_cost_factor).__value
-	      + __iterate
-	      * _GLIBCXX_PROFILE_DATA(__list_iterate_cost_factor).__value
-	      + __resize
-	      * _GLIBCXX_PROFILE_DATA(__list_resize_cost_factor).__value);
-    }
-  };
-
-
-  inline void
-  __trace_vector_to_list_init()
-  { _GLIBCXX_PROFILE_DATA(_S_vector_to_list) = new __trace_vector_to_list(); }
-
-  inline void
-  __trace_vector_to_list_free()
-  { delete _GLIBCXX_PROFILE_DATA(_S_vector_to_list); }
-
-  inline void
-  __trace_vector_to_list_report(FILE* __f, __warning_vector_t& __warnings)
-  { __trace_report(_GLIBCXX_PROFILE_DATA(_S_vector_to_list), __f, __warnings); }
-
-  inline __vector2list_info*
-  __trace_vector_to_list_construct()
-  {
-    if (!__profcxx_init())
-      return 0;
-
-    if (!__reentrance_guard::__get_in())
-      return 0;
-
-    __reentrance_guard __get_out;
-    return _GLIBCXX_PROFILE_DATA(_S_vector_to_list)
-      ->__add_object(__get_stack());
-  }
-
-  inline void
-  __trace_vector_to_list_insert(__vector2list_info* __obj_info,
-				std::size_t __pos,
-				std::size_t __num)
-  {
-    if (!__obj_info)
-      return;
-
-    __obj_info->__opr_insert(__pos, __num);
-  }
-
-  inline void
-  __trace_vector_to_list_iterate(__vector2list_info* __obj_info, int)
-  {
-    if (!__obj_info)
-      return;
-
-    // We only collect if an iteration took place no matter in what side.
-    __obj_info->__opr_iterate(1);
-  }
-
-  inline void
-  __trace_vector_to_list_invalid_operator(__vector2list_info* __obj_info)
-  {
-    if (!__obj_info)
-      return;
-
-    __obj_info->__set_invalid();
-  }
-
-  inline void
-  __trace_vector_to_list_resize(__vector2list_info* __obj_info,
-				std::size_t __from,
-				std::size_t __to)
-  {
-    if (!__obj_info)
-      return;
-
-    __obj_info->__resize(__from, __to);
-  }
-
-  inline void
-  __trace_vector_to_list_destruct(__vector2list_info* __obj_info)
-  {
-    if (!__obj_info)
-      return;
-
-    _GLIBCXX_PROFILE_DATA(_S_vector_to_list)->__destruct(__obj_info);
-  }
-
-} // namespace __gnu_profile
-#endif /* _GLIBCXX_PROFILE_PROFILER_VECTOR_TO_LIST_H */
diff --git a/openflow/usr/include/c++/5/profile/iterator_tracker.h b/openflow/usr/include/c++/5/profile/iterator_tracker.h
deleted file mode 100644
index eb096a1..0000000
--- a/openflow/usr/include/c++/5/profile/iterator_tracker.h
+++ /dev/null
@@ -1,286 +0,0 @@
-// Profiling iterator implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/iterator_tracker.h
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_ITERATOR_TRACKER
-#define _GLIBCXX_PROFILE_ITERATOR_TRACKER 1
-
-#include <ext/type_traits.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  template<typename _Iterator, typename _Sequence>
-    class __iterator_tracker
-    {
-      typedef __iterator_tracker _Self;
-
-      // The underlying iterator
-      _Iterator _M_current;
-
-      // The underlying data structure
-      const _Sequence* _M_ds;
-      typedef std::iterator_traits<_Iterator> _Traits;
-
-    public:
-      typedef _Iterator					_Base_iterator;
-      typedef typename _Traits::iterator_category	iterator_category;
-      typedef typename _Traits::value_type		value_type;
-      typedef typename _Traits::difference_type		difference_type;
-      typedef typename _Traits::reference		reference;
-      typedef typename _Traits::pointer			pointer;
-
-      __iterator_tracker() _GLIBCXX_NOEXCEPT
-      : _M_current(), _M_ds(0) { }
-
-      __iterator_tracker(const _Iterator& __i, const _Sequence* __seq)
-      _GLIBCXX_NOEXCEPT
-      : _M_current(__i), _M_ds(__seq) { }
-
-      __iterator_tracker(const __iterator_tracker& __x) _GLIBCXX_NOEXCEPT
-      : _M_current(__x._M_current), _M_ds(__x._M_ds) { }
-
-      template<typename _MutableIterator>
-	__iterator_tracker(const __iterator_tracker<_MutableIterator,
-			   typename __gnu_cxx::__enable_if
-			   <(std::__are_same<_MutableIterator, typename
-			     _Sequence::iterator::_Base_iterator>::__value),
-			   _Sequence>::__type>& __x) _GLIBCXX_NOEXCEPT
-	:  _M_current(__x.base()), _M_ds(__x._M_get_sequence()) { }
-
-      _Iterator
-      base() const _GLIBCXX_NOEXCEPT { return _M_current; }
-
-      /**
-       * @brief Conversion to underlying non-debug iterator to allow
-       * better interaction with non-profile containers.
-       */
-      operator _Iterator() const _GLIBCXX_NOEXCEPT { return _M_current; }
-
-      pointer
-      operator->() const _GLIBCXX_NOEXCEPT { return &*_M_current; }
-
-      __iterator_tracker&
-      operator++() _GLIBCXX_NOEXCEPT
-      {
-	_M_ds->_M_profile_iterate();
-	++_M_current;
-	return *this;
-      }
-
-      __iterator_tracker
-      operator++(int) _GLIBCXX_NOEXCEPT
-      {
-	_M_ds->_M_profile_iterate();
-	__iterator_tracker __tmp(*this);
-	++_M_current;
-	return __tmp;
-      }
-
-      __iterator_tracker&
-      operator--() _GLIBCXX_NOEXCEPT
-      {
-	_M_ds->_M_profile_iterate(1);
-	--_M_current;
-	return *this;
-      }
-
-      __iterator_tracker
-      operator--(int) _GLIBCXX_NOEXCEPT
-      {
-	_M_ds->_M_profile_iterate(1);
-	__iterator_tracker __tmp(*this);
-	--_M_current;
-	return __tmp;
-      }
-
-      __iterator_tracker&
-      operator=(const __iterator_tracker& __x) _GLIBCXX_NOEXCEPT
-      {
-	_M_current = __x._M_current;
-	_M_ds = __x._M_ds;
-	return *this;
-      }
-
-      reference
-      operator*() const _GLIBCXX_NOEXCEPT
-      { return *_M_current; }
-
-      // ------ Random access iterator requirements ------
-      reference
-      operator[](const difference_type& __n) const  _GLIBCXX_NOEXCEPT
-      { return _M_current[__n]; }
-
-      __iterator_tracker&
-      operator+=(const difference_type& __n) _GLIBCXX_NOEXCEPT
-      {
-	_M_current += __n;
-	return *this;
-      }
-
-      __iterator_tracker
-      operator+(const difference_type& __n) const _GLIBCXX_NOEXCEPT
-      {
-	__iterator_tracker __tmp(*this);
-	__tmp += __n;
-	return __tmp;
-      }
-
-      __iterator_tracker&
-      operator-=(const difference_type& __n) _GLIBCXX_NOEXCEPT
-      {
-	_M_current += -__n;
-	return *this;
-      }
-
-      __iterator_tracker
-      operator-(const difference_type& __n) const _GLIBCXX_NOEXCEPT
-      {
-	__iterator_tracker __tmp(*this);
-	__tmp -= __n;
-	return __tmp;
-      }
-
-      const _Sequence*
-      _M_get_sequence() const
-      { return static_cast<const _Sequence*>(_M_ds); }
-  };
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator==(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
-	       const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() == __rhs.base(); }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator==(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
-	       const __iterator_tracker<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() == __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator!=(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
-	       const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() != __rhs.base(); }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator!=(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
-	       const __iterator_tracker<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() != __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator<(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
-	      const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() < __rhs.base(); }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator<(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
-	      const __iterator_tracker<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() < __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator<=(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
-	       const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() <= __rhs.base(); }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator<=(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
-	       const __iterator_tracker<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() <= __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator>(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
-	      const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() > __rhs.base(); }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator>(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
-	      const __iterator_tracker<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() > __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator>=(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
-	       const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() >= __rhs.base(); }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator>=(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
-	       const __iterator_tracker<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() >= __rhs.base(); }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // According to the resolution of DR179 not only the various comparison
-  // operators but also operator- must accept mixed iterator/const_iterator
-  // parameters.
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline typename __iterator_tracker<_IteratorL, _Sequence>::difference_type
-    operator-(const __iterator_tracker<_IteratorL, _Sequence>& __lhs,
-	      const __iterator_tracker<_IteratorR, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() - __rhs.base(); }
-
-  template<typename _Iterator, typename _Sequence>
-    inline typename __iterator_tracker<_Iterator, _Sequence>::difference_type
-    operator-(const __iterator_tracker<_Iterator, _Sequence>& __lhs,
-	      const __iterator_tracker<_Iterator, _Sequence>& __rhs)
-    _GLIBCXX_NOEXCEPT
-    { return __lhs.base() - __rhs.base(); }
-
-  template<typename _Iterator, typename _Sequence>
-    inline __iterator_tracker<_Iterator, _Sequence>
-    operator+(typename __iterator_tracker<_Iterator,_Sequence>::difference_type
-	      __n,
-	      const __iterator_tracker<_Iterator, _Sequence>& __i)
-    _GLIBCXX_NOEXCEPT
-    { return __i + __n; }
-	
-}  // namespace __profile
-}  // namespace std
-#endif
diff --git a/openflow/usr/include/c++/5/profile/list b/openflow/usr/include/c++/5/profile/list
deleted file mode 100644
index e21244c..0000000
--- a/openflow/usr/include/c++/5/profile/list
+++ /dev/null
@@ -1,645 +0,0 @@
-// Profiling list implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/list
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_LIST
-#define _GLIBCXX_PROFILE_LIST 1
-
-#include <list>
-#include <profile/base.h>
-#include <profile/iterator_tracker.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  template<typename _List>
-    class _List_profile
-    {
-      _List&
-      _M_conjure()
-      { return *static_cast<_List*>(this); }
-
-    public:
-      __gnu_profile::__list2slist_info* _M_list2slist_info;
-      __gnu_profile::__list2vector_info* _M_list2vector_info;
-
-      _List_profile() _GLIBCXX_NOEXCEPT
-      { _M_profile_construct(); }
-
-      void
-      _M_profile_construct() _GLIBCXX_NOEXCEPT
-      {
-	_M_list2slist_info = __profcxx_list2slist_construct();
-	_M_list2vector_info = __profcxx_list2vector_construct();
-      }
-
-      void
-      _M_profile_destruct() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_list2vector_destruct(_M_list2vector_info);
-	_M_list2vector_info = 0;
-	__profcxx_list2slist_destruct(_M_list2slist_info);
-	_M_list2slist_info = 0;
-      }
-
-      void
-      _M_swap(_List_profile& __other)
-      {
-	std::swap(_M_list2slist_info, __other._M_list2slist_info);
-	std::swap(_M_list2vector_info, __other._M_list2vector_info);
-      }
-
-#if __cplusplus >= 201103L
-      _List_profile(const _List_profile&) noexcept
-      : _List_profile() { }
-      _List_profile(_List_profile&& __other) noexcept
-      : _List_profile()
-      { _M_swap(__other); }
-
-      _List_profile&
-      operator=(const _List_profile&) noexcept
-      {
-	_M_profile_destruct();
-	_M_profile_construct();
-      }
-
-      _List_profile&
-      operator=(_List_profile&& __other) noexcept
-      {
-	_M_swap(__other);
-	__other._M_profile_destruct();
-	__other._M_profile_construct();
-      }
-#endif
-
-      ~_List_profile()
-      { _M_profile_destruct(); }
-    };
-
-  /** @brief List wrapper with performance instrumentation.  */
-  template<typename _Tp, typename _Allocator = std::allocator<_Tp> >
-    class list
-    : public _GLIBCXX_STD_C::list<_Tp, _Allocator>,
-      public _List_profile<list<_Tp, _Allocator> >
-    {
-      typedef _GLIBCXX_STD_C::list<_Tp, _Allocator>	_Base;
-
-    public:
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __iterator_tracker<typename _Base::iterator, list>
-							iterator;
-      typedef __iterator_tracker<typename _Base::const_iterator, list>
-							const_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-
-      typedef _Tp					value_type;
-      typedef _Allocator				allocator_type;
-      typedef typename _Base::pointer			pointer;
-      typedef typename _Base::const_pointer		const_pointer;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      // 23.2.2.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      list() { }
-      list(const list& __x)
-      : _Base(__x) { }
-
-      ~list() { }
-#else
-      list() = default;
-      list(const list&) = default;
-      list(list&&) = default;
-      ~list() = default;
-
-      list(initializer_list<value_type> __l,
-	   const allocator_type& __a = allocator_type())
-      : _Base(__l, __a) { }
-#endif
-
-      explicit
-      list(const _Allocator& __a) _GLIBCXX_NOEXCEPT
-      : _Base(__a) { }
-
-#if __cplusplus >= 201103L
-      explicit
-      list(size_type __n)
-      : _Base(__n) { }
-
-      list(size_type __n, const _Tp& __value,
-	   const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#else
-      explicit
-      list(size_type __n, const _Tp& __value = _Tp(),
-	   const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#endif
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<class _InputIterator>
-#endif
-      list(_InputIterator __first, _InputIterator __last,
-	   const _Allocator& __a = _Allocator())
-      : _Base(__first, __last, __a) { }
-
-      list(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      list&
-      operator=(const list& __x)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __x;
-	this->_M_profile_construct();
-	return *this;
-      }
-#else
-      list&
-      operator=(const list&) = default;
-
-      list&
-      operator=(list&&) = default;
-
-      list&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __l;
-	this->_M_profile_construct();
-	return *this;
-      }
-#endif
-
-      // iterators:
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_list2slist_rewind(this->_M_list2slist_info);
-	return iterator(_Base::end(), this);
-      }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_list2slist_rewind(this->_M_list2slist_info);
-	return const_iterator(_Base::end(), this);
-      }
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_list2slist_rewind(this->_M_list2slist_info);
-	return reverse_iterator(end());
-      }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_list2slist_rewind(this->_M_list2slist_info);
-	return const_reverse_iterator(end());
-      }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::cbegin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::cend(), this); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-      // 23.2.2.2 capacity:
-      reference
-      back() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_list2slist_rewind(this->_M_list2slist_info);
-	return _Base::back();
-      }
-
-      const_reference
-      back() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_list2slist_rewind(this->_M_list2slist_info);
-	return _Base::back();
-      }
-
-      // 23.2.2.3 modifiers:
-      void
-      push_front(const value_type& __x)
-      {
-	__profcxx_list2vector_invalid_operator(this->_M_list2vector_info);
-	__profcxx_list2slist_operation(this->_M_list2slist_info);
-	_Base::push_front(__x);
-      }
-
-      void
-      pop_front() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_list2slist_operation(this->_M_list2slist_info);
-	_Base::pop_front();
-      }
-
-      void
-      pop_back() _GLIBCXX_NOEXCEPT
-      {
-	_Base::pop_back();
-	__profcxx_list2slist_rewind(this->_M_list2slist_info);
-      }
-
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	iterator
-	emplace(const_iterator __position, _Args&&... __args)
-	{
-	  return iterator(_Base::emplace(__position.base(),
-					 std::forward<_Args>(__args)...),
-			  this);
-	}
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __pos, const _Tp& __x)
-#else
-      insert(iterator __pos, const _Tp& __x)
-#endif
-      {
-	_M_profile_insert(__pos, this->size());
-	return iterator(_Base::insert(__pos.base(), __x), this);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __pos, _Tp&& __x)
-      {
-	_M_profile_insert(__pos, this->size());
-	return iterator(_Base::emplace(__pos.base(), std::move(__x)),
-			this);
-      }
-
-      iterator
-      insert(const_iterator __pos, initializer_list<value_type> __l)
-      {
-	_M_profile_insert(__pos, this->size());
-	return iterator(_Base::insert(__pos.base(), __l), this);
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __pos, size_type __n, const _Tp& __x)
-      {
-	_M_profile_insert(__pos, this->size());
-	return iterator(_Base::insert(__pos.base(), __n, __x), this);
-      }
-#else
-      void
-      insert(iterator __pos, size_type __n, const _Tp& __x)
-      {
-	_M_profile_insert(__pos, this->size());
-	_Base::insert(__pos.base(), __n, __x);
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	iterator
-	insert(const_iterator __pos, _InputIterator __first,
-	       _InputIterator __last)
-	{
-	  _M_profile_insert(__pos, this->size());
-	  return iterator(_Base::insert(__pos.base(), __first, __last),
-			  this);
-	}
-#else
-      template<class _InputIterator>
-	void
-	insert(iterator __pos, _InputIterator __first,
-	       _InputIterator __last)
-	{
-	  _M_profile_insert(__pos, this->size());
-	  _Base::insert(__pos.base(), __first, __last);
-	}
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __pos) noexcept
-#else
-      erase(iterator __pos)
-#endif
-      {	return iterator(_Base::erase(__pos.base()), this); }
-
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __pos, const_iterator __last) noexcept
-#else
-      erase(iterator __pos, iterator __last)
-#endif
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	return iterator(_Base::erase(__pos.base(), __last.base()), this);
-      }
-
-      void
-      swap(list& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_profile_destruct();
-	_Base::clear();
-	this->_M_profile_construct();
-      }
-
-      // 23.2.2.4 list operations:
-      void
-#if __cplusplus >= 201103L
-      splice(const_iterator __pos, list&& __x) noexcept
-#else
-      splice(iterator __pos, list& __x)
-#endif
-      { this->splice(__pos, _GLIBCXX_MOVE(__x), __x.begin(), __x.end()); }
-
-#if __cplusplus >= 201103L
-      void
-      splice(const_iterator __pos, list& __x) noexcept
-      { this->splice(__pos, std::move(__x)); }
-
-      void
-      splice(const_iterator __pos, list& __x, const_iterator __i)
-      { this->splice(__pos, std::move(__x), __i); }
-#endif
-
-      void
-#if __cplusplus >= 201103L
-      splice(const_iterator __pos, list&& __x, const_iterator __i) noexcept
-#else
-      splice(iterator __pos, list& __x, iterator __i)
-#endif
-      {
-	// We used to perform the splice_alloc check:  not anymore, redundant
-	// after implementing the relevant bits of N1599.
-
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	_Base::splice(__pos.base(), _GLIBCXX_MOVE(__x._M_base()),
-		      __i.base());
-      }
-
-      void
-#if __cplusplus >= 201103L
-      splice(const_iterator __pos, list&& __x, const_iterator __first,
-	     const_iterator __last) noexcept
-#else
-      splice(iterator __pos, list& __x, iterator __first,
-	     iterator __last)
-#endif
-      {
-	_Base::splice(__pos.base(), _GLIBCXX_MOVE(__x._M_base()),
-		      __first.base(), __last.base());
-      }
-
-#if __cplusplus >= 201103L
-      void
-      splice(const_iterator __pos, list& __x,
-	     const_iterator __first, const_iterator __last) noexcept
-      { this->splice(__pos, std::move(__x), __first, __last); }
-#endif
-
-      void
-      remove(const _Tp& __value)
-      {
-	for (iterator __x = begin(); __x != end(); )
-	  {
-	    if (*__x == __value)
-	      __x = erase(__x);
-	    else
-	      ++__x;
-	  }
-      }
-
-      template<class _Predicate>
-	void
-	remove_if(_Predicate __pred)
-	{
-	  for (iterator __x = begin(); __x != end(); )
-	    {
-	      __profcxx_list2slist_operation(this->_M_list2slist_info);
-	      if (__pred(*__x))
-		__x = erase(__x);
-	      else
-		++__x;
-	    }
-	}
-
-      void
-      unique()
-      {
-	iterator __first = begin();
-	iterator __last = end();
-	if (__first == __last)
-	  return;
-	iterator __next = __first;
-	while (++__next != __last)
-	  {
-	    __profcxx_list2slist_operation(this->_M_list2slist_info);
-	    if (*__first == *__next)
-	      erase(__next);
-	    else
-	      __first = __next;
-	    __next = __first;
-	  }
-      }
-
-      template<class _BinaryPredicate>
-	void
-	unique(_BinaryPredicate __binary_pred)
-	{
-	  iterator __first = begin();
-	  iterator __last = end();
-	  if (__first == __last)
-	    return;
-	  iterator __next = __first;
-	  while (++__next != __last)
-	    {
-	      __profcxx_list2slist_operation(this->_M_list2slist_info);
-	      if (__binary_pred(*__first, *__next))
-		erase(__next);
-	      else
-		__first = __next;
-	      __next = __first;
-	    }
-	}
-
-      void
-#if __cplusplus >= 201103L
-      merge(list&& __x)
-#else
-      merge(list& __x)
-#endif
-      { _Base::merge(_GLIBCXX_MOVE(__x._M_base())); }
-
-#if __cplusplus >= 201103L
-      void
-      merge(list& __x)
-      { this->merge(std::move(__x)); }
-#endif
-
-      template<class _Compare>
-	void
-#if __cplusplus >= 201103L
-	merge(list&& __x, _Compare __comp)
-#else
-	merge(list& __x, _Compare __comp)
-#endif
-	{ _Base::merge(_GLIBCXX_MOVE(__x._M_base()), __comp); }
-
-#if __cplusplus >= 201103L
-      template<typename _Compare>
-	void
-	merge(list& __x, _Compare __comp)
-	{ this->merge(std::move(__x), __comp); }
-#endif
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      void _M_profile_iterate(int __rewind = 0) const
-      {
-	__profcxx_list2slist_operation(this->_M_list2slist_info);
-	__profcxx_list2vector_iterate(this->_M_list2vector_info, __rewind);
-	if (__rewind)
-	  __profcxx_list2slist_rewind(this->_M_list2slist_info);
-      }
-
-    private:
-      size_type
-      _M_profile_insert(const_iterator __pos, size_type __size)
-      {
-	size_type __shift = 0;
-	typename _Base::const_iterator __it = __pos.base();
-	for (; __it != _Base::end(); ++__it)
-	  __shift++;
-	__profcxx_list2slist_rewind(this->_M_list2slist_info);
-	__profcxx_list2slist_operation(this->_M_list2slist_info);
-	__profcxx_list2vector_insert(this->_M_list2vector_info, __shift, __size);
-      }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const list<_Tp, _Alloc>& __lhs,
-	       const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const list<_Tp, _Alloc>& __lhs,
-	       const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const list<_Tp, _Alloc>& __lhs,
-	      const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const list<_Tp, _Alloc>& __lhs,
-	       const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const list<_Tp, _Alloc>& __lhs,
-	       const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const list<_Tp, _Alloc>& __lhs,
-	      const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(list<_Tp, _Alloc>& __lhs, list<_Tp, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-
-} // namespace __profile
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/map b/openflow/usr/include/c++/5/profile/map
deleted file mode 100644
index 5cea34d..0000000
--- a/openflow/usr/include/c++/5/profile/map
+++ /dev/null
@@ -1,35 +0,0 @@
-// Profiling map/multimap implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/map
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_MAP
-#define _GLIBCXX_PROFILE_MAP 1
-
-#include <map>
-#include <profile/map.h>
-#include <profile/multimap.h>
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/map.h b/openflow/usr/include/c++/5/profile/map.h
deleted file mode 100644
index 1549d3d..0000000
--- a/openflow/usr/include/c++/5/profile/map.h
+++ /dev/null
@@ -1,592 +0,0 @@
-// Profiling map implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/map.h
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_MAP_H
-#define _GLIBCXX_PROFILE_MAP_H 1
-
-#include <profile/base.h>
-#include <profile/ordered_base.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  /// Class std::map wrapper with performance instrumentation.
-  template<typename _Key, typename _Tp, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<std::pair<const _Key, _Tp> > >
-    class map
-    : public _GLIBCXX_STD_C::map<_Key, _Tp, _Compare, _Allocator>,
-      public _Ordered_profile<map<_Key, _Tp, _Compare, _Allocator> >
-    {
-      typedef _GLIBCXX_STD_C::map<_Key, _Tp, _Compare, _Allocator> _Base;
-
-      typedef typename _Base::iterator			_Base_iterator;
-      typedef typename _Base::const_iterator		_Base_const_iterator;
-
-    public:
-      // types:
-      typedef _Key					key_type;
-      typedef _Tp					mapped_type;
-      typedef typename _Base::value_type		value_type;
-      typedef _Compare					key_compare;
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __iterator_tracker<_Base_iterator, map>	iterator;
-      typedef __iterator_tracker<_Base_const_iterator,
-				 map>			const_iterator;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-
-      // 23.3.1.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      map()
-      : _Base() { }
-      map(const map& __x)
-	: _Base(__x) { }
-      ~map()
-      { }
-#else
-      map() = default;
-      map(const map&) = default;
-      map(map&&) = default;
-      ~map() = default;
-#endif
-
-      explicit
-      map(const _Compare& __comp,
-	  const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<typename _InputIterator>
-#endif
-	map(_InputIterator __first, _InputIterator __last,
-	    const _Compare& __comp = _Compare(),
-	    const _Allocator& __a = _Allocator())
-	: _Base(__first, __last, __comp, __a) { }
-
-      map(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus >= 201103L
-      map(initializer_list<value_type> __l,
-	  const _Compare& __c = _Compare(),
-	  const _Allocator& __a = _Allocator())
-      : _Base(__l, __c, __a) { }
-
-      explicit
-      map(const _Allocator& __a)
-      : _Base(__a) { }
-
-      map(const map& __x, const _Allocator& __a)
-      : _Base(__x, __a) { }
-
-      map(map&& __x, const _Allocator& __a)
-      noexcept( noexcept(_Base(std::move(__x), __a)) )
-      : _Base(std::move(__x), __a) { }
-
-      map(initializer_list<value_type> __l, const _Allocator& __a)
-      : _Base(__l, __a) { }
-
-      template<typename _InputIterator>
-	map(_InputIterator __first, _InputIterator __last,
-	    const _Allocator& __a)
-	: _Base(__first, __last, __a) { }
-#endif
-
-#if __cplusplus < 201103L
-      map&
-      operator=(const map& __x)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __x;
-	this->_M_profile_construct();
-	return *this;
-      }
-#else
-      map&
-      operator=(const map&) = default;
-
-      map&
-      operator=(map&&) = default;
-
-      map&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __l;
-	this->_M_profile_construct();
-	return *this;
-      }
-#endif
-
-      // iterators
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::cbegin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::cend(), this); }
-#endif
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return reverse_iterator(end());
-      }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(end());
-      }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return reverse_iterator(begin());
-      }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(begin());
-      }
-
-#if __cplusplus >= 201103L
-      const_reverse_iterator
-      crbegin() const noexcept
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(cend());
-      }
-
-      const_reverse_iterator
-      crend() const noexcept
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(cbegin());
-      }
-#endif
-
-      // 23.3.1.2 element access:
-      mapped_type&
-      operator[](const key_type& __k)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return _Base::operator[](__k);
-      }
-
-#if __cplusplus >= 201103L
-      mapped_type&
-      operator[](key_type&& __k)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return _Base::operator[](std::move(__k));
-      }
-#endif
-
-      mapped_type&
-      at(const key_type& __k)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return _Base::at(__k);
-      }
-
-      const mapped_type&
-      at(const key_type& __k) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return _Base::at(__k);
-      }
-
-      // modifiers:
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{
-	  // The cost is the same whether or not the element is inserted so we
-	  // always report insertion of 1 element.
-	  __profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	  auto __base_ret = _Base::emplace(std::forward<_Args>(__args)...);
-	  return std::make_pair(iterator(__base_ret.first, this),
-				__base_ret.second);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  auto size_before = this->size();
-	  auto __res
-	    = _Base::emplace_hint(__pos.base(), std::forward<_Args>(__args)...);
-	  __profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	  return iterator(__res, this);
-	}
-#endif
-
-      std::pair<iterator, bool>
-      insert(const value_type& __x)
-      {
-	__profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	std::pair<_Base_iterator, bool> __base_ret = _Base::insert(__x);
-	return std::make_pair(iterator(__base_ret.first, this),
-			      __base_ret.second);
-      }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	std::pair<iterator, bool>
-	insert(_Pair&& __x)
-	{
-	  __profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	  auto __base_ret= _Base::insert(std::forward<_Pair>(__x));
-	  return std::make_pair(iterator(__base_ret.first, this),
-				__base_ret.second);
-	}
-#endif
-
-#if __cplusplus >= 201103L
-      void
-      insert(std::initializer_list<value_type> __list)
-      { insert(__list.begin(), __list.end()); }
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __pos, const value_type& __x)
-#else
-      insert(iterator __pos, const value_type& __x)
-#endif
-      {
-	size_type size_before = this->size();
-	_Base_iterator __res = _Base::insert(__pos.base(), __x);
-	
-	__profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	return iterator(__res, this);
-      }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(const_iterator __pos, _Pair&& __x)
-	{
-	  size_type size_before = this->size();
-	  auto __res = _Base::insert(__pos.base(), std::forward<_Pair>(__x));
-	
-	  __profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	  return iterator(__res, this);
-      }
-#endif
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  for (; __first != __last; ++__first)
-	    insert(*__first);
-	}
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __pos)
-      {
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	return iterator(_Base::erase(__pos.base()), this);
-      }
-
-      iterator
-      erase(iterator __pos)
-      {
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	return iterator(_Base::erase(__pos.base()), this);
-      }
-#else
-      void
-      erase(iterator __pos)
-      {
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	_Base::erase(__pos.base());
-      }
-#endif
-
-      size_type
-      erase(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	return _Base::erase(__x);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	if (__first != __last)
-	  {
-	    iterator __ret;
-	    for (; __first != __last;)
-	      __ret = erase(__first++);
-	    return __ret;
-	  }
-	else
-	  return iterator(_Base::erase(__first.base(), __last.base()), this);
-      }
-#else
-      void
-      erase(iterator __first, iterator __last)
-      {
-	for (; __first != __last;)
-	  erase(__first++);
-      }
-#endif
-
-      void
-      swap(map& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_profile_destruct();
-	_Base::clear();
-	this->_M_profile_construct();
-      }
-
-      // 23.3.1.3 map operations:
-      iterator
-      find(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return iterator(_Base::find(__x), this);
-      }
-
-      const_iterator
-      find(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return const_iterator(_Base::find(__x), this);
-      }
-
-      size_type
-      count(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return _Base::count(__x);
-      }
-
-      iterator
-      lower_bound(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return iterator(_Base::lower_bound(__x), this);
-      }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_iterator(_Base::lower_bound(__x), this);
-      }
-
-      iterator
-      upper_bound(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return iterator(_Base::upper_bound(__x), this);
-      }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_iterator(_Base::upper_bound(__x), this);
-      }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	std::pair<_Base_iterator, _Base_iterator> __base_ret
-	  = _Base::equal_range(__x);
-	return std::make_pair(iterator(__base_ret.first, this),
-			      iterator(__base_ret.second, this));
-      }
-
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	std::pair<_Base_const_iterator, _Base_const_iterator> __base_ret
-	  = _Base::equal_range(__x);
-	return std::make_pair(const_iterator(__base_ret.first, this),
-			      const_iterator(__base_ret.second, this));
-      }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-
-    private:
-      /** If hint is used we consider that the map and unordered_map
-       * operations have equivalent insertion cost so we do not update metrics
-       * about it.
-       * Note that to find out if hint has been used is libstdc++
-       * implementation dependent.
-       */
-      bool
-      _M_hint_used(_Base_const_iterator __hint, _Base_iterator __res)
-      {
-	return (__hint == __res
-		|| (__hint == _M_base().end() && ++__res == _M_base().end())
-		|| (__hint != _M_base().end() && (++__hint == __res
-						  || ++__res == --__hint)));
-      }
-
-
-      template<typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator==(const map<_K1, _T1, _C1, _A1>&,
-		   const map<_K1, _T1, _C1, _A1>&);
-
-      template<typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator<(const map<_K1, _T1, _C1, _A1>&,
-		  const map<_K1, _T1, _C1, _A1>&);      
-    };
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator==(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    {
-      __profcxx_map2umap_invalidate(__lhs._M_map2umap_info);
-      __profcxx_map2umap_invalidate(__rhs._M_map2umap_info);
-      return __lhs._M_base() == __rhs._M_base();
-    }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator<(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	      const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    {
-      __profcxx_map2umap_invalidate(__lhs._M_map2umap_info);
-      __profcxx_map2umap_invalidate(__rhs._M_map2umap_info);
-      return __lhs._M_base() < __rhs._M_base();
-    }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator!=(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator<=(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return !(__rhs < __lhs); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator>=(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return !(__lhs < __rhs); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator>(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	      const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __rhs < __lhs; }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline void
-    swap(map<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	 map<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { __lhs.swap(__rhs); }
-
-} // namespace __profile
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/multimap.h b/openflow/usr/include/c++/5/profile/multimap.h
deleted file mode 100644
index 2ed9fcb..0000000
--- a/openflow/usr/include/c++/5/profile/multimap.h
+++ /dev/null
@@ -1,550 +0,0 @@
-// Profiling multimap implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/multimap.h
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_MULTIMAP_H
-#define _GLIBCXX_PROFILE_MULTIMAP_H 1
-
-#include <profile/base.h>
-#include <profile/ordered_base.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  /// Class std::multimap wrapper with performance instrumentation.
-  template<typename _Key, typename _Tp, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<std::pair<const _Key, _Tp> > >
-    class multimap
-    : public _GLIBCXX_STD_C::multimap<_Key, _Tp, _Compare, _Allocator>,
-      public _Ordered_profile<map<_Key, _Tp, _Compare, _Allocator> >
-    {
-      typedef _GLIBCXX_STD_C::multimap<_Key, _Tp, _Compare, _Allocator> _Base;
-
-      typedef typename _Base::iterator			_Base_iterator;
-      typedef typename _Base::const_iterator		_Base_const_iterator;
-
-    public:
-      // types:
-      typedef _Key					key_type;
-      typedef _Tp					mapped_type;
-      typedef std::pair<const _Key, _Tp>		value_type;
-      typedef _Compare					key_compare;
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __iterator_tracker<_Base_iterator,
-				 multimap>		iterator;
-      typedef __iterator_tracker<_Base_const_iterator,
-				 multimap>		const_iterator;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-
-      // 23.3.1.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      multimap()
-      : _Base() { }
-      multimap(const multimap& __x)
-      : _Base(__x) { }
-      ~multimap() { }
-#else
-      multimap() = default;
-      multimap(const multimap&) = default;
-      multimap(multimap&&) = default;
-      ~multimap() = default;
-#endif
-
-      explicit multimap(const _Compare& __comp,
-			const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<typename _InputIterator>
-#endif
-	multimap(_InputIterator __first, _InputIterator __last,
-		 const _Compare& __comp = _Compare(),
-		 const _Allocator& __a = _Allocator())
-	: _Base(__first, __last, __comp, __a) { }
-
-#if __cplusplus >= 201103L
-      multimap(initializer_list<value_type> __l,
-	       const _Compare& __c = _Compare(),
-	       const _Allocator& __a = _Allocator())
-      : _Base(__l, __c, __a) { }
-
-      explicit
-      multimap(const _Allocator& __a)
-      : _Base(__a) { }
-
-      multimap(const multimap& __x, const _Allocator& __a)
-      : _Base(__x, __a) { }
-
-      multimap(multimap&& __x, const _Allocator& __a)
-      noexcept( noexcept(_Base(std::move(__x), __a)) )
-      : _Base(std::move(__x), __a) { }
-
-      multimap(initializer_list<value_type> __l, const _Allocator& __a)
-      : _Base(__l, __a) { }
-
-      template<typename _InputIterator>
-	multimap(_InputIterator __first, _InputIterator __last,
-		 const _Allocator& __a)
-	: _Base(__first, __last, __a) { }
-#endif
-
-      multimap(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      multimap&
-      operator=(const multimap& __x)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __x;
-	this->_M_profile_construct();
-	return *this;
-      }
-#else
-      multimap&
-      operator=(const multimap&) = default;
-
-      multimap&
-      operator=(multimap&&) = default;
-
-      multimap&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __l;
-	this->_M_profile_construct();
-	return *this;
-      }
-#endif
-
-      // iterators
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::cbegin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::cend(), this); }
-#endif
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return reverse_iterator(end());
-      }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(end());
-      }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return reverse_iterator(begin());
-      }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(begin());
-      }
-
-#if __cplusplus >= 201103L
-      const_reverse_iterator
-      crbegin() const noexcept
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(cend());
-      }
-
-      const_reverse_iterator
-      crend() const noexcept
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(cbegin());
-      }
-#endif
-
-      // modifiers:
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{
-	  __profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	  return iterator(_Base::emplace(std::forward<_Args>(__args)...), this);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  auto size_before = this->size();
-	  auto __res
-	    = _Base::emplace_hint(__pos.base(), std::forward<_Args>(__args)...);
-	  __profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	  return iterator(__res, this);
-	}
-#endif
-
-      iterator
-      insert(const value_type& __x)
-      {
-	__profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	return iterator(_Base::insert(__x), this);
-      }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(_Pair&& __x)
-	{
-	  __profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	  return iterator(_Base::insert(std::forward<_Pair>(__x)), this);
-	}
-#endif
-
-#if __cplusplus >= 201103L
-      void
-      insert(std::initializer_list<value_type> __list)
-      { insert(__list.begin(), __list.end()); }
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __pos, const value_type& __x)
-#else
-      insert(iterator __pos, const value_type& __x)
-#endif
-      {
-	size_type size_before = this->size();
-	_Base_iterator __res = _Base::insert(__pos.base(), __x);
-	__profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	return iterator(__res, this);
-      }
-
-#if __cplusplus >= 201103L
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(const_iterator __pos, _Pair&& __x)
-	{
-	  size_type size_before = this->size();
-	  auto __res = _Base::insert(__pos.base(), std::forward<_Pair>(__x));
-	  __profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	  return iterator(__res, this);
-	}
-#endif
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  for (; __first != __last; ++__first)
-	    insert(*__first);
-	}
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __pos)
-      {
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	return iterator(_Base::erase(__pos.base()), this);
-      }
-
-      iterator
-      erase(iterator __pos)
-      {
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	return iterator(_Base::erase(__pos.base()), this);
-      }
-#else
-      void
-      erase(iterator __pos)
-      {
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	_Base::erase(__pos.base());
-      }
-#endif
-
-      size_type
-      erase(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	return _Base::erase(__x);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	if (__first != __last)
-	  {
-	    iterator __ret;
-	    for (; __first != __last;)
-	      __ret = erase(__first++);
-	    return __ret;
-	  }
-	else
-	  return iterator(_Base::erase(__first.base(), __last.base()), this);
-      }
-#else
-      void
-      erase(iterator __first, iterator __last)
-      {
-	for (; __first != __last;)
-	  erase(__first++);
-      }
-#endif
-
-      void
-      swap(multimap& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	std::swap(this->_M_map2umap_info, __x._M_map2umap_info);
-	_Base::swap(__x);
-      }
- 
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_profile_destruct();
-	_Base::clear();
-	this->_M_profile_construct();
-      }
-
-      // 23.3.1.3 multimap operations:
-      iterator
-      find(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return iterator(_Base::find(__x), this);
-      }
-
-      const_iterator
-      find(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return const_iterator(_Base::find(__x), this);
-      }
-
-      size_type
-      count(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return _Base::count(__x);
-      }
-
-      iterator
-      lower_bound(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return iterator(_Base::lower_bound(__x), this);
-      }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_iterator(_Base::lower_bound(__x), this);
-      }
-
-      iterator
-      upper_bound(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return iterator(_Base::upper_bound(__x), this);
-      }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_iterator(_Base::upper_bound(__x), this);
-      }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	std::pair<_Base_iterator, _Base_iterator> __base_ret
-	  = _Base::equal_range(__x);
-	return std::make_pair(iterator(__base_ret.first, this),
-			      iterator(__base_ret.second, this));
-      }
-
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	std::pair<_Base_const_iterator, _Base_const_iterator> __base_ret
-	  = _Base::equal_range(__x);
-	return std::make_pair(const_iterator(__base_ret.first, this),
-			      const_iterator(__base_ret.second, this));
-      }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-
-    private:
-      /** If hint is used we consider that the map and unordered_map
-       * operations have equivalent insertion cost so we do not update metrics
-       * about it.
-       * Note that to find out if hint has been used is libstdc++
-       * implementation dependent.
-       */
-      bool
-      _M_hint_used(_Base_const_iterator __hint, _Base_iterator __res)
-      {
-	return (__hint == __res
-		|| (__hint == _M_base().end() && ++__res == _M_base().end())
-		|| (__hint != _M_base().end() && (++__hint == __res
-						  || ++__res == --__hint)));
-      }
-
-      template<typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator==(const multimap<_K1, _T1, _C1, _A1>&,
-		   const multimap<_K1, _T1, _C1, _A1>&);
-
-      template<typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator<(const multimap<_K1, _T1, _C1, _A1>&,
-		  const multimap<_K1, _T1, _C1, _A1>&);
-    };
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator==(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    {
-      __profcxx_map2umap_invalidate(__lhs._M_map2umap_info);
-      __profcxx_map2umap_invalidate(__rhs._M_map2umap_info);
-      return __lhs._M_base() == __rhs._M_base();
-    }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator<(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	      const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    {
-      __profcxx_map2umap_invalidate(__lhs._M_map2umap_info);
-      __profcxx_map2umap_invalidate(__rhs._M_map2umap_info);
-      return __lhs._M_base() < __rhs._M_base();
-    }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator!=(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator<=(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return !(__rhs < __lhs); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator>=(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	       const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return !(__lhs < __rhs); }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline bool
-    operator>(const multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	      const multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { return __rhs < __lhs; }
-
-  template<typename _Key, typename _Tp,
-	   typename _Compare, typename _Allocator>
-    inline void
-    swap(multimap<_Key, _Tp, _Compare, _Allocator>& __lhs,
-	 multimap<_Key, _Tp, _Compare, _Allocator>& __rhs)
-    { __lhs.swap(__rhs); }
-
-} // namespace __profile
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/multiset.h b/openflow/usr/include/c++/5/profile/multiset.h
deleted file mode 100644
index f2d2f39..0000000
--- a/openflow/usr/include/c++/5/profile/multiset.h
+++ /dev/null
@@ -1,542 +0,0 @@
-// Profiling multiset implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/multiset.h
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_MULTISET_H
-#define _GLIBCXX_PROFILE_MULTISET_H 1
-
-#include <profile/base.h>
-#include <profile/ordered_base.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  /// Class std::multiset wrapper with performance instrumentation.
-  template<typename _Key, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<_Key> >
-    class multiset
-    : public _GLIBCXX_STD_C::multiset<_Key, _Compare, _Allocator>,
-      public _Ordered_profile<multiset<_Key, _Compare, _Allocator> >
-    {
-      typedef _GLIBCXX_STD_C::multiset<_Key, _Compare, _Allocator> _Base;
-
-      typedef typename _Base::iterator			_Base_iterator;
-      typedef typename _Base::const_iterator		_Base_const_iterator;
-
-    public:
-      // types:
-      typedef _Key					key_type;
-      typedef _Key					value_type;
-      typedef _Compare					key_compare;
-      typedef _Compare					value_compare;
-      typedef _Allocator				allocator_type;
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __iterator_tracker<_Base_iterator,
-				 multiset>		iterator;
-      typedef __iterator_tracker<_Base_const_iterator,
-				 multiset>		const_iterator;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-
-      // 23.3.3.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      multiset()
-      : _Base() { }
-      multiset(const multiset& __x)
-      : _Base(__x) { }
-      ~multiset() { }
-#else
-      multiset() = default;
-      multiset(const multiset&) = default;
-      multiset(multiset&&) = default;
-      ~multiset() = default;
-#endif
-
-      explicit multiset(const _Compare& __comp,
-			const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<typename _InputIterator>
-#endif
-	multiset(_InputIterator __first, _InputIterator __last,
-		 const _Compare& __comp = _Compare(),
-		 const _Allocator& __a = _Allocator())
-	: _Base(__first, __last, __comp, __a) { }
-
-#if __cplusplus >= 201103L
-      multiset(initializer_list<value_type> __l,
-	       const _Compare& __comp = _Compare(),
-	       const allocator_type& __a = allocator_type())
-      : _Base(__l, __comp, __a) { }
-
-      explicit
-      multiset(const allocator_type& __a)
-      : _Base(__a) { }
-
-      multiset(const multiset& __x, const allocator_type& __a)
-      : _Base(__x, __a) { }
-
-      multiset(multiset&& __x, const allocator_type& __a)
-      noexcept( noexcept(_Base(std::move(__x), __a)) )
-      : _Base(std::move(__x), __a) { }
-
-      multiset(initializer_list<value_type> __l, const allocator_type& __a)
-      : _Base(__l, __a) { }
-
-      template<typename _InputIterator>
-	multiset(_InputIterator __first, _InputIterator __last,
-		 const allocator_type& __a)
-	: _Base(__first, __last, __a) { }
-#endif
-
-      multiset(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      multiset&
-      operator=(const multiset& __x)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __x;
-	this->_M_profile_construct();
-	return *this;
-      }
-#else
-      multiset&
-      operator=(const multiset&) = default;
-
-      multiset&
-      operator=(multiset&&) = default;
-
-      multiset&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __l;
-	this->_M_profile_construct();
-	return *this;
-      }
-#endif
-
-      // iterators
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::cbegin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::cend(), this); }
-#endif
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return reverse_iterator(end());
-      }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(end());
-      }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return reverse_iterator(begin());
-      }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(begin());
-      }
-
-#if __cplusplus >= 201103L
-      const_reverse_iterator
-      crbegin() const noexcept
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(cend());
-      }
-
-      const_reverse_iterator
-      crend() const noexcept
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(cbegin());
-      }
-#endif
-
-      void
-      swap(multiset& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      // modifiers:
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{
-	  // The cost is the same whether or not the element is inserted so we
-	  // always report insertion of 1 element.
-	  __profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	  return iterator(_Base::emplace(std::forward<_Args>(__args)...), this);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  auto size_before = this->size();
-	  auto __res
-	    = _Base::emplace_hint(__pos.base(), std::forward<_Args>(__args)...);
-	  __profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	  return iterator(__res, this);
-	}
-#endif
-
-      iterator
-      insert(const value_type& __x)
-      {
-	__profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	return iterator(_Base::insert(__x), this);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(value_type&& __x)
-      {
-	__profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	return iterator(_Base::insert(std::move(__x)), this);
-      }
-#endif
-
-      iterator
-      insert(const_iterator __pos, const value_type& __x)
-      {
-	size_type size_before = this->size();
-	_Base_iterator __res = _Base::insert(__pos.base(), __x);
-	
-	__profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	return iterator(__res, this);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __pos, value_type&& __x)
-      {
-	auto size_before = this->size();
-	auto __res = _Base::insert(__pos.base(), std::move(__x));
-	__profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	return iterator(__res, this);
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<typename _InputIterator>
-#endif
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  for (; __first != __last; ++__first)
-	    insert(*__first);
-	}
-
-#if __cplusplus >= 201103L
-      void
-      insert(initializer_list<value_type> __l)
-      { insert(__l.begin(), __l.end()); }
-#endif
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __pos)
-      {
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	return iterator(_Base::erase(__pos.base()), this);
-      }
-#else
-      void
-      erase(iterator __pos)
-      {
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	_Base::erase(__pos.base());
-      }
-#endif
-
-      size_type
-      erase(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	return _Base::erase(__x);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	if (__first != __last)
-	  {
-	    iterator __ret;
-	    for (; __first != __last;)
-	      __ret = erase(__first++);
-	    return __ret;
-	  }
-	else
-	  return iterator(_Base::erase(__first.base(), __last.base()), this);
-      }
-#else
-      void
-      erase(iterator __first, iterator __last)
-      {
-	for (; __first != __last;)
-	  erase(__first++);
-      }
-#endif
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_profile_destruct();
-	_Base::clear();
-	this->_M_profile_construct();
-      }
- 
-      size_type
-      count(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return _Base::count(__x);
-      }
-
-      // multiset operations:
-      iterator
-      find(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return iterator(_Base::find(__x), this);
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      find(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return const_iterator(_Base::find(__x), this);
-      }
-
-      iterator
-      lower_bound(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return iterator(_Base::lower_bound(__x), this);
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      lower_bound(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_iterator(_Base::lower_bound(__x), this);
-      }
-
-      iterator
-      upper_bound(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return iterator(_Base::upper_bound(__x), this);
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      upper_bound(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_iterator(_Base::upper_bound(__x), this);
-      }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	std::pair<_Base_iterator, _Base_iterator> __base_ret
-	  = _Base::equal_range(__x);
-	return std::make_pair(iterator(__base_ret.first, this),
-			      iterator(__base_ret.second, this));
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	std::pair<_Base_const_iterator, _Base_const_iterator> __base_ret
-	  = _Base::equal_range(__x);
-	return std::make_pair(const_iterator(__base_ret.first, this),
-			      const_iterator(__base_ret.second, this));
-      }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-
-    private:
-      /** If hint is used we consider that the map and unordered_map
-       * operations have equivalent insertion cost so we do not update metrics
-       * about it.
-       * Note that to find out if hint has been used is libstdc++
-       * implementation dependent.
-       */
-      bool
-      _M_hint_used(_Base_const_iterator __hint, _Base_iterator __res)
-      {
-	return (__hint == __res
-		|| (__hint == _M_base().end() && ++__res == _M_base().end())
-		|| (__hint != _M_base().end() && (++__hint == __res
-						  || ++__res == --__hint)));
-      }
-
-      template<typename _K1, typename _C1, typename _A1>
-        friend bool
-        operator==(const multiset<_K1, _C1, _A1>&,
-		   const multiset<_K1, _C1, _A1>&);
-
-      template<typename _K1, typename _C1, typename _A1>
-        friend bool
-        operator< (const multiset<_K1, _C1, _A1>&,
-		   const multiset<_K1, _C1, _A1>&);
-    };
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator==(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	       const multiset<_Key, _Compare, _Allocator>& __rhs)
-    {
-      __profcxx_map2umap_invalidate(__lhs._M_map2umap_info);
-      __profcxx_map2umap_invalidate(__rhs._M_map2umap_info);
-      return __lhs._M_base() == __rhs._M_base();
-    }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	      const multiset<_Key, _Compare, _Allocator>& __rhs)
-    {
-      __profcxx_map2umap_invalidate(__lhs._M_map2umap_info);
-      __profcxx_map2umap_invalidate(__rhs._M_map2umap_info);
-      return __lhs._M_base() < __rhs._M_base();
-    }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator!=(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	       const multiset<_Key, _Compare, _Allocator>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<=(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	       const multiset<_Key, _Compare, _Allocator>& __rhs)
-    { return !(__rhs < __lhs); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>=(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	       const multiset<_Key, _Compare, _Allocator>& __rhs)
-    { return !(__lhs < __rhs); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>(const multiset<_Key, _Compare, _Allocator>& __lhs,
-	      const multiset<_Key, _Compare, _Allocator>& __rhs)
-    { return __rhs < __lhs; }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    void
-    swap(multiset<_Key, _Compare, _Allocator>& __x,
-	 multiset<_Key, _Compare, _Allocator>& __y)
-    { return __x.swap(__y); }
-
-} // namespace __profile
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/ordered_base.h b/openflow/usr/include/c++/5/profile/ordered_base.h
deleted file mode 100644
index 7c91bc2..0000000
--- a/openflow/usr/include/c++/5/profile/ordered_base.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Profiling unordered containers implementation details -*- C++ -*-
-
-// Copyright (C) 2014-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/ordered_base.h
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_ORDERED
-#define _GLIBCXX_PROFILE_ORDERED 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  template<typename _Cont>
-    class _Ordered_profile
-    {
-    public:
-      void
-      _M_profile_iterate(int __rewind = 0) const
-      { __profcxx_map2umap_iterate(this->_M_map2umap_info, __rewind); }
-
-    protected:
-      _Ordered_profile() _GLIBCXX_NOEXCEPT
-      { _M_profile_construct(); }
-
-#if __cplusplus >= 201103L
-      _Ordered_profile(const _Ordered_profile&) noexcept
-      : _Ordered_profile() { }
-      _Ordered_profile(_Ordered_profile&& __other) noexcept
-      : _Ordered_profile()
-      { _M_swap(__other); }
-
-      _Ordered_profile&
-      operator=(const _Ordered_profile&) noexcept
-      {
-	_M_profile_destruct();
-	_M_profile_construct();
-      }
-
-      _Ordered_profile&
-      operator=(_Ordered_profile&& __other) noexcept
-      {
-	_M_swap(__other);
-	
-	__other._M_profile_destruct();
-	__other._M_profile_construct();
-      }
-#endif
-
-      ~_Ordered_profile()
-      { _M_profile_destruct(); }
-
-      void
-      _M_profile_construct() _GLIBCXX_NOEXCEPT
-      { _M_map2umap_info = __profcxx_map2umap_construct(); }
-
-      void
-      _M_profile_destruct() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_destruct(_M_map2umap_info);
-	_M_map2umap_info = 0;
-      }
-
-      void
-      _M_swap(_Ordered_profile& __other)
-      { std::swap(_M_map2umap_info, __other._M_map2umap_info); }
-
-      __gnu_profile::__map2umap_info* _M_map2umap_info;
-
-    private:
-      _Cont&
-      _M_conjure()
-      { return *static_cast<_Cont*>(this); }
-    };
-
-} // namespace __profile
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/set b/openflow/usr/include/c++/5/profile/set
deleted file mode 100644
index 9f342bc..0000000
--- a/openflow/usr/include/c++/5/profile/set
+++ /dev/null
@@ -1,35 +0,0 @@
-// Profiling set/multiset implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/set
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_SET
-#define _GLIBCXX_PROFILE_SET 1
-
-#include <set>
-#include <profile/set.h>
-#include <profile/multiset.h>
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/set.h b/openflow/usr/include/c++/5/profile/set.h
deleted file mode 100644
index a05d10b..0000000
--- a/openflow/usr/include/c++/5/profile/set.h
+++ /dev/null
@@ -1,523 +0,0 @@
-// Profiling set implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/set.h
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_SET_H
-#define _GLIBCXX_PROFILE_SET_H 1
-
-#include <profile/base.h>
-#include <profile/ordered_base.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  /// Class std::set wrapper with performance instrumentation.
-  template<typename _Key, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<_Key> >
-    class set
-    : public _GLIBCXX_STD_C::set<_Key,_Compare,_Allocator>,
-      public _Ordered_profile<set<_Key, _Compare, _Allocator> >
-    {
-      typedef _GLIBCXX_STD_C::set<_Key, _Compare, _Allocator> _Base;
-
-      typedef typename _Base::iterator			_Base_iterator;
-      typedef typename _Base::const_iterator		_Base_const_iterator;
-
-    public:
-      // types:
-      typedef _Key					key_type;
-      typedef _Key					value_type;
-      typedef _Compare					key_compare;
-      typedef _Compare					value_compare;
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __iterator_tracker<_Base_iterator, set>	iterator;
-      typedef __iterator_tracker<_Base_const_iterator,
-				 set>			const_iterator;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-
-      // 23.3.3.1 construct/copy/destroy:
-#if __cplusplus < 201103L
-      set()
-      : _Base() { }
-      set(const set& __x)
-      : _Base(__x) { }
-      ~set() { }
-#else
-      set() = default;
-      set(const set&) = default;
-      set(set&&) = default;
-      ~set() = default;
-#endif
-
-      explicit set(const _Compare& __comp,
-		   const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<typename _InputIterator>
-#endif
-	set(_InputIterator __first, _InputIterator __last,
-	    const _Compare& __comp = _Compare(),
-	    const _Allocator& __a = _Allocator())
-	: _Base(__first, __last, __comp, __a) { }
-
-#if __cplusplus >= 201103L
-      set(initializer_list<value_type> __l,
-	  const _Compare& __comp = _Compare(),
-	  const _Allocator& __a = _Allocator())
-      : _Base(__l, __comp, __a) { }
-
-      explicit
-      set(const _Allocator& __a)
-      : _Base(__a) { }
-
-      set(const set& __x, const _Allocator& __a)
-      : _Base(__x, __a) { }
-
-      set(set&& __x, const _Allocator& __a)
-      noexcept( noexcept(_Base(std::move(__x), __a)) )
-      : _Base(std::move(__x), __a) { }
-
-      set(initializer_list<value_type> __l, const _Allocator& __a)
-      : _Base(__l, __a) { }
-
-      template<typename _InputIterator>
-	set(_InputIterator __first, _InputIterator __last,
-	    const _Allocator& __a)
-	: _Base(__first, __last, __a) { }
-#endif
-
-      set(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus < 201103L
-      set&
-      operator=(const set& __x)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __x;
-	this->_M_profile_construct();
-	return *this;
-      }
-#else
-      set&
-      operator=(const set&) = default;
-
-      set&
-      operator=(set&&) = default;
-
-      set&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __l;
-	this->_M_profile_construct();
-	return *this;
-      }
-#endif
-
-      // iterators
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::cbegin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::cend(), this); }
-#endif
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return reverse_iterator(end());
-      }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(end());
-      }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return reverse_iterator(begin());
-      }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(begin());
-      }
-
-#if __cplusplus >= 201103L
-      const_reverse_iterator
-      crbegin() const noexcept
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(cend());
-      }
-
-      const_reverse_iterator
-      crend() const noexcept
-      {
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_reverse_iterator(cbegin());
-      }
-#endif
-
-      void
-      swap(set& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      // modifiers:
-#if __cplusplus >= 201103L
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{
-	  __profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	  auto __base_ret = _Base::emplace(std::forward<_Args>(__args)...);
-	  return std::make_pair(iterator(__base_ret.first, this),
-				__base_ret.second);
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __pos, _Args&&... __args)
-	{
-	  auto size_before = this->size();
-	  auto __res
-	    = _Base::emplace_hint(__pos.base(), std::forward<_Args>(__args)...);
-	  __profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	  return iterator(__res, this);
-	}
-#endif
-
-      std::pair<iterator, bool>
-      insert(const value_type& __x)
-      {
-	__profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	std::pair<_Base_iterator, bool> __base_ret = _Base::insert(__x);
-	return std::make_pair(iterator(__base_ret.first, this),
-			      __base_ret.second);
-      }
-
-#if __cplusplus >= 201103L
-      std::pair<iterator, bool>
-      insert(value_type&& __x)
-      {
-	__profcxx_map2umap_insert(this->_M_map2umap_info, this->size(), 1);
-	std::pair<_Base_iterator, bool> __base_ret
-	  = _Base::insert(std::move(__x));
-	return std::make_pair(iterator(__base_ret.first, this),
-			      __base_ret.second);
-      }
-#endif
-
-      iterator
-      insert(const_iterator __pos, const value_type& __x)
-      {
-	size_type size_before = this->size();
-	_Base_iterator __res = _Base::insert(__pos.base(), __x);
-	__profcxx_map2umap_insert(this->_M_map2umap_info,
-		size_before, _M_hint_used(__pos.base(), __res) ? 0 : 1);
-	return iterator(__res, this);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __pos, value_type&& __x)
-      { return iterator(_Base::insert(__pos.base(), std::move(__x)), this); }
-#endif
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last)
-	{
-	  for (; __first != __last; ++__first)
-	    insert(*__first);
-	}
-
-#if __cplusplus >= 201103L
-      void
-      insert(initializer_list<value_type> __l)
-      { insert(__l.begin(), __l.end()); }
-#endif
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __pos)
-      {
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	return iterator(_Base::erase(__pos.base()), this);
-      }
-#else
-      void
-      erase(iterator __pos)
-      {
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	_Base::erase(__pos.base());
-      }
-#endif
-
-      size_type
-      erase(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_erase(this->_M_map2umap_info, this->size(), 1);
-	return _Base::erase(__x);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      erase(const_iterator __first, const_iterator __last)
-      {
-	if (__first != __last)
-	  {
-	    iterator __ret;
-	    for (; __first != __last;)
-	      __ret = erase(__first++);
-	    return __ret;
-	  }
-
-	return iterator(_Base::erase(__first.base(), __last.base()), this);
-      }
-#else
-      void
-      erase(iterator __first, iterator __last)
-      {
-	for (; __first != __last;)
-	     erase(__first++);
-      }
-#endif
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_profile_destruct();
-	_Base::clear();
-	this->_M_profile_construct();
-      }
-
-      size_type
-      count(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return _Base::count(__x);
-      }
-
-      // set operations:
-      iterator
-      find(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return iterator(_Base::find(__x), this);
-      }
-
-      const_iterator
-      find(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	return const_iterator(_Base::find(__x), this);
-      }
-
-      iterator
-      lower_bound(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return iterator(_Base::lower_bound(__x), this);
-      }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_iterator(_Base::lower_bound(__x), this);
-      }
-
-      iterator
-      upper_bound(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return iterator(_Base::upper_bound(__x), this);
-      }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	__profcxx_map2umap_invalidate(this->_M_map2umap_info);
-	return const_iterator(_Base::upper_bound(__x), this);
-      }
-
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __x)
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	std::pair<_Base_iterator, _Base_iterator> __base_ret
-	  = _Base::equal_range(__x);
-	return std::make_pair(iterator(__base_ret.first, this),
-			      iterator(__base_ret.second, this));
-      }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	__profcxx_map2umap_find(this->_M_map2umap_info, this->size());
-	std::pair<_Base_const_iterator, _Base_const_iterator> __base_ret
-	  = _Base::equal_range(__x);
-	return std::make_pair(const_iterator(__base_ret.first, this),
-			      const_iterator(__base_ret.second, this));
-      }
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-
-    private:
-      /** If hint is used we consider that the map and unordered_map
-       * operations have equivalent insertion cost so we do not update metrics
-       * about it.
-       * Note that to find out if hint has been used is libstdc++
-       * implementation dependent.
-       */
-      bool
-      _M_hint_used(_Base_const_iterator __hint, _Base_iterator __res)
-      {
-	return (__hint == __res
-		|| (__hint == _M_base().end() && ++__res == _M_base().end())
-		|| (__hint != _M_base().end() && (++__hint == __res
-						  || ++__res == --__hint)));
-      }
-
-      template<typename _K1, typename _C1, typename _A1>
-	friend bool
-	operator==(const set<_K1, _C1, _A1>&, const set<_K1, _C1, _A1>&);
-
-      template<typename _K1, typename _C1, typename _A1>
-	friend bool
-	operator<(const set<_K1, _C1, _A1>&, const set<_K1, _C1, _A1>&);
-    };
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator==(const set<_Key, _Compare, _Allocator>& __lhs,
-	       const set<_Key, _Compare, _Allocator>& __rhs)
-    {
-      __profcxx_map2umap_invalidate(__lhs._M_map2umap_info);
-      __profcxx_map2umap_invalidate(__rhs._M_map2umap_info);
-      return __lhs._M_base() == __rhs._M_base();
-    }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<(const set<_Key, _Compare, _Allocator>& __lhs,
-	      const set<_Key, _Compare, _Allocator>& __rhs)
-    {
-      __profcxx_map2umap_invalidate(__lhs._M_map2umap_info);
-      __profcxx_map2umap_invalidate(__rhs._M_map2umap_info);
-      return __lhs._M_base() < __rhs._M_base();
-    }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator!=(const set<_Key, _Compare, _Allocator>& __lhs,
-	       const set<_Key, _Compare, _Allocator>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<=(const set<_Key, _Compare, _Allocator>& __lhs,
-	       const set<_Key, _Compare, _Allocator>& __rhs)
-    { return !(__rhs < __lhs); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>=(const set<_Key, _Compare, _Allocator>& __lhs,
-	       const set<_Key, _Compare, _Allocator>& __rhs)
-    { return !(__lhs < __rhs); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>(const set<_Key, _Compare, _Allocator>& __lhs,
-	      const set<_Key, _Compare, _Allocator>& __rhs)
-    { return __rhs < __lhs; }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    void
-    swap(set<_Key, _Compare, _Allocator>& __x,
-	 set<_Key, _Compare, _Allocator>& __y)
-    { return __x.swap(__y); }
-
-} // namespace __profile
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/unordered_base.h b/openflow/usr/include/c++/5/profile/unordered_base.h
deleted file mode 100644
index bae5b40..0000000
--- a/openflow/usr/include/c++/5/profile/unordered_base.h
+++ /dev/null
@@ -1,308 +0,0 @@
-// Profiling unordered containers implementation details -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/unordered_base.h
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_UNORDERED
-#define _GLIBCXX_PROFILE_UNORDERED 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  template<typename _UnorderedCont,
-	   typename _Value, bool _Cache_hash_code>
-    struct _Bucket_index_helper;
-
-  template<typename _UnorderedCont, typename _Value>
-    struct _Bucket_index_helper<_UnorderedCont, _Value, true>
-    {
-      static std::size_t
-      bucket(const _UnorderedCont& __uc,
-	     const __detail::_Hash_node<_Value, true>* __node)
-      { return __node->_M_hash_code % __uc.bucket_count(); }
-    };
-
-  template<typename _UnorderedCont, typename _Value>
-    struct _Bucket_index_helper<_UnorderedCont, _Value, false>
-    {
-      static std::size_t
-      bucket(const _UnorderedCont& __uc,
-	     const __detail::_Hash_node<_Value, false>* __node)
-      { return __uc.bucket(__node->_M_v()); }
-    };
-
-  template<typename _UnorderedCont, typename _Key, typename _Mapped>
-    struct _Bucket_index_helper<_UnorderedCont,
-				std::pair<const _Key, _Mapped>, false>
-    {
-      typedef std::pair<const _Key, _Mapped> _Value;
-
-      static std::size_t
-      bucket(const _UnorderedCont& __uc,
-	     const __detail::_Hash_node<_Value, false>* __node)
-      { return __uc.bucket(__node->_M_v().first); }
-    };
-
-  template<typename _UnorderedCont, typename _Value, bool _Cache_hash_code>
-    std::size_t
-    __get_bucket_index(const _UnorderedCont& __uc,
-		       const __detail::_Hash_node<_Value, _Cache_hash_code>* __node)
-    {
-      using __bucket_index_helper
-	= _Bucket_index_helper<_UnorderedCont, _Value, _Cache_hash_code>;
-      return __bucket_index_helper::bucket(__uc, __node);
-    }
-
-  template<typename _UnorderedCont,
-	   typename _Value, bool _Cache_hash_code>
-    struct _Equal_helper;
-
-  template<typename _UnorderedCont, typename _Value>
-    struct _Equal_helper<_UnorderedCont, _Value, true>
-    {
-      static std::size_t
-      are_equal(const _UnorderedCont& __uc,
-		const __detail::_Hash_node<_Value, true>* __lhs,
-		const __detail::_Hash_node<_Value, true>* __rhs)
-      {
-	return __lhs->_M_hash_code == __rhs->_M_hash_code
-	  && __uc.key_eq()(__lhs->_M_v(), __rhs->_M_v());
-      }
-    };
-
-  template<typename _UnorderedCont,
-	   typename _Value>
-    struct _Equal_helper<_UnorderedCont, _Value, false>
-    {
-      static std::size_t
-      are_equal(const _UnorderedCont& __uc,
-		const __detail::_Hash_node<_Value, false>* __lhs,
-		const __detail::_Hash_node<_Value, false>* __rhs)
-      { return __uc.key_eq()(__lhs->_M_v(), __rhs->_M_v()); }
-    };
-
-  template<typename _UnorderedCont,
-	   typename _Key, typename _Mapped>
-    struct _Equal_helper<_UnorderedCont, std::pair<const _Key, _Mapped>, true>
-    {
-      typedef std::pair<const _Key, _Mapped> _Value;
-
-      static std::size_t
-      are_equal(const _UnorderedCont& __uc,
-		const __detail::_Hash_node<_Value, true>* __lhs,
-		const __detail::_Hash_node<_Value, true>* __rhs)
-      {
-	return __lhs->_M_hash_code == __rhs->_M_hash_code
-	  && __uc.key_eq()(__lhs->_M_v().first, __rhs->_M_v().first);
-      }
-    };
-
-  template<typename _UnorderedCont,
-	   typename _Key, typename _Mapped>
-    struct _Equal_helper<_UnorderedCont, std::pair<const _Key, _Mapped>, false>
-    {
-      typedef std::pair<const _Key, _Mapped> _Value;
-
-      static std::size_t
-      are_equal(const _UnorderedCont& __uc,
-		const __detail::_Hash_node<_Value, false>* __lhs,
-		const __detail::_Hash_node<_Value, false>* __rhs)
-      { return __uc.key_eq()(__lhs->_M_v().first, __rhs->_M_v().first); }
-    };
-
-  template<typename _UnorderedCont, typename _Value, bool _Cache_hash_code>
-    bool
-    __are_equal(const _UnorderedCont& __uc,
-		const __detail::_Hash_node<_Value, _Cache_hash_code>* __lhs,
-		const __detail::_Hash_node<_Value, _Cache_hash_code>* __rhs)
-  {
-    using __equal_helper
-      = _Equal_helper<_UnorderedCont, _Value, _Cache_hash_code>;
-    return __equal_helper::are_equal(__uc, __lhs, __rhs);
-  }
-
-  template<typename _UnorderedCont, bool _Unique_keys>
-    class _Unordered_profile
-    {
-      _UnorderedCont&
-      _M_conjure()
-      { return *(static_cast<_UnorderedCont*>(this)); }
-
-      using __unique_keys = std::integral_constant<bool, _Unique_keys>;
-
-    protected:
-      _Unordered_profile() noexcept
-      { _M_profile_construct(); }
-
-      _Unordered_profile(const _Unordered_profile&) noexcept
-	: _Unordered_profile() { }
-
-      _Unordered_profile(_Unordered_profile&& __other) noexcept
-	: _Unordered_profile()
-      { _M_swap(__other); }
-
-      ~_Unordered_profile()
-      { _M_profile_destruct(); }
-
-      _Unordered_profile&
-      operator=(const _Unordered_profile&) noexcept
-      {
-	// Assignment just reset profiling.
-	_M_profile_destruct();
-	_M_profile_construct();
-      }
-
-      _Unordered_profile&
-      operator=(_Unordered_profile&& __other) noexcept
-      {
-	// Take profiling of the moved instance...
-	_M_swap(__other);
-
-	// ...and then reset other instance profiling.
-	__other._M_profile_destruct();
-	__other._M_profile_construct();
-      }
-
-      void
-      _M_profile_construct() noexcept
-      {
-	auto& __uc = _M_conjure();
-	_M_size_info = __profcxx_hashtable_size_construct(__uc.bucket_count());
-	_M_hashfunc_info = __profcxx_hash_func_construct();
-      }
-
-      void
-      _M_profile_destruct() noexcept
-      {
-	auto& __uc = _M_conjure();
-	__profcxx_hashtable_size_destruct(_M_size_info,
-					  __uc.bucket_count(), __uc.size());
-	_M_size_info = 0;
-
-	if (!_M_hashfunc_info)
-	  return;
-
-	_M_profile_destruct(__unique_keys());
-	_M_hashfunc_info = 0;
-      }
-
-      void
-      _M_swap(_Unordered_profile& __other) noexcept
-      {
-	std::swap(_M_size_info, __other._M_size_info);
-	std::swap(_M_hashfunc_info, __other._M_hashfunc_info);
-      }
-
-      void
-      _M_profile_resize(std::size_t __old_size)
-      {
-	auto __new_size = _M_conjure().bucket_count();
-	if (__old_size != __new_size)
-	  __profcxx_hashtable_size_resize(_M_size_info, __old_size, __new_size);
-      }
-
-      __gnu_profile::__container_size_info* _M_size_info;
-      __gnu_profile::__hashfunc_info* _M_hashfunc_info;
-
-    private:
-      void
-      _M_profile_destruct(std::true_type);
-
-      void
-      _M_profile_destruct(std::false_type);
-    };
-
-  template<typename _UnorderedCont, bool _Unique_keys>
-    void
-    _Unordered_profile<_UnorderedCont, _Unique_keys>::
-    _M_profile_destruct(std::true_type)
-    {
-      auto& __uc = _M_conjure();
-      std::size_t __hops = 0, __lc = 0, __chain = 0;
-      auto __it = __uc.begin();
-      while (__it != __uc.end())
-	{
-	  auto __bkt = __get_bucket_index(__uc, __it._M_cur);
-	  auto __lit = __uc.begin(__bkt);
-	  auto __lend = __uc.end(__bkt);
-	  for (++__it, ++__lit; __lit != __lend; ++__it, ++__lit)
-	    ++__chain;
-
-	  if (__chain)
-	    {
-	      ++__chain;
-	      __lc = __lc > __chain ? __lc : __chain;
-	      __hops += __chain * (__chain - 1) / 2;
-	      __chain = 0;
-	    }
-	}
-
-      __profcxx_hash_func_destruct(_M_hashfunc_info,
-				   __lc, __uc.size(), __hops);
-    }
-
-  template<typename _UnorderedCont, bool _Unique_keys>
-    void
-    _Unordered_profile<_UnorderedCont, _Unique_keys>::
-    _M_profile_destruct(std::false_type)
-    {
-      auto& __uc = _M_conjure();
-      std::size_t __hops = 0, __lc = 0, __chain = 0, __unique_size = 0;
-      auto __it = __uc.begin();
-      while (__it != __uc.end())
-	{
-	  auto __bkt = __get_bucket_index(__uc, __it._M_cur);
-	  auto __lit = __uc.begin(__bkt);
-	  auto __lend = __uc.end(__bkt);
-	  auto __pit = __it;
-	  ++__unique_size;
-	  for (++__it, ++__lit; __lit != __lend; ++__it, ++__lit)
-	    {
-	      if (!__are_equal(__uc, __pit._M_cur, __it._M_cur))
-		{
-		  ++__chain;
-		  ++__unique_size;
-		  __pit = __it;
-		}
-	    }
-
-	  if (__chain)
-	    {
-	      ++__chain;
-	      __lc = __lc > __chain ? __lc : __chain;
-	      __hops += __chain * (__chain - 1) / 2;
-	      __chain = 0;
-	    }
-	}
-
-      __profcxx_hash_func_destruct(_M_hashfunc_info,
-				   __lc, __unique_size, __hops);
-    }
-
-} // namespace __profile
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/unordered_map b/openflow/usr/include/c++/5/profile/unordered_map
deleted file mode 100644
index 480faba..0000000
--- a/openflow/usr/include/c++/5/profile/unordered_map
+++ /dev/null
@@ -1,584 +0,0 @@
-// Profiling unordered_map/unordered_multimap implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/unordered_map
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_UNORDERED_MAP
-#define _GLIBCXX_PROFILE_UNORDERED_MAP 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-# include <unordered_map>
-
-#include <profile/base.h>
-#include <profile/unordered_base.h>
-
-#define _GLIBCXX_BASE unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>
-#define _GLIBCXX_STD_BASE _GLIBCXX_STD_C::_GLIBCXX_BASE
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  /// Class std::unordered_map wrapper with performance instrumentation.
-  template<typename _Key, typename _Tp,
-	   typename _Hash = std::hash<_Key>,
-	   typename _Pred = std::equal_to<_Key>,
-	   typename _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-    class unordered_map
-    : public _GLIBCXX_STD_BASE,
-      public _Unordered_profile<unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>,
-				true>
-    {
-      typedef typename _GLIBCXX_STD_BASE _Base;
-
-      _Base&
-      _M_base() noexcept	{ return *this; }
-
-      const _Base&
-      _M_base() const noexcept	{ return *this; }
-
-    public:
-      typedef typename _Base::size_type		size_type;
-      typedef typename _Base::hasher		hasher;
-      typedef typename _Base::key_equal		key_equal;
-      typedef typename _Base::allocator_type	allocator_type;
-      typedef typename _Base::key_type		key_type;
-      typedef typename _Base::value_type	value_type;
-      typedef typename _Base::difference_type	difference_type;
-      typedef typename _Base::reference		reference;
-      typedef typename _Base::const_reference	const_reference;
-      typedef typename _Base::mapped_type	mapped_type;
-
-      typedef typename _Base::iterator		iterator;
-      typedef typename _Base::const_iterator	const_iterator;
-
-      unordered_map() = default;
-
-      explicit
-      unordered_map(size_type __n,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a) { }
-
-      template<typename _InputIterator>
-	unordered_map(_InputIterator __f, _InputIterator __l,
-		      size_type __n = 0,
-		      const hasher& __hf = hasher(),
-		      const key_equal& __eql = key_equal(),
-		      const allocator_type& __a = allocator_type())
-	: _Base(__f, __l, __n, __hf, __eql, __a) { }
-
-      unordered_map(const unordered_map&) = default;
-
-      unordered_map(const _Base& __x)
-      : _Base(__x) { }
-
-      unordered_map(unordered_map&&) = default;
-
-      explicit
-      unordered_map(const allocator_type& __a)
-      : _Base(__a) { }
-
-      unordered_map(const unordered_map& __umap,
-		    const allocator_type& __a)
-      : _Base(__umap, __a) { }
-
-      unordered_map(unordered_map&& __umap,
-		    const allocator_type& __a)
-      : _Base(std::move(__umap._M_base()), __a) { }
-
-      unordered_map(initializer_list<value_type> __l,
-		    size_type __n = 0,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _Base(__l, __n, __hf, __eql, __a) { }
-
-      unordered_map(size_type __n, const allocator_type& __a)
-      : unordered_map(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_map(size_type __n, const hasher& __hf,
-		    const allocator_type& __a)
-      : unordered_map(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_map(_InputIterator __first, _InputIterator __last,
-		      size_type __n,
-		      const allocator_type& __a)
-	  : unordered_map(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_map(_InputIterator __first, _InputIterator __last,
-		      size_type __n, const hasher& __hf,
-		      const allocator_type& __a)
-	  : unordered_map(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_map(initializer_list<value_type> __l,
-		    size_type __n,
-		    const allocator_type& __a)
-	: unordered_map(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_map(initializer_list<value_type> __l,
-		    size_type __n, const hasher& __hf,
-		    const allocator_type& __a)
-	: unordered_map(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      unordered_map&
-      operator=(const unordered_map&) = default;
-
-      unordered_map&
-      operator=(unordered_map&&) = default;
-
-      unordered_map&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __l;
-	this->_M_profile_construct();
-	return *this;
-      }
-
-      void
-      clear() noexcept
-      {
-	this->_M_profile_destruct();
-	_Base::clear();
-	this->_M_profile_construct();
-      }
-
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  std::pair<iterator, bool> __res
-	    = _Base::emplace(std::forward<_Args>(__args)...);
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __it, _Args&&... __args)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  iterator __res
-	    = _Base::emplace_hint(__it, std::forward<_Args>(__args)...);
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      void
-      insert(std::initializer_list<value_type> __l)
-      {
-	size_type __old_size = _Base::bucket_count();
-	_Base::insert(__l);
-	this->_M_profile_resize(__old_size);
-      }
-
-      std::pair<iterator, bool>
-      insert(const value_type& __obj)
-      {
-	size_type __old_size = _Base::bucket_count();
-	std::pair<iterator, bool> __res = _Base::insert(__obj);
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      iterator
-      insert(const_iterator __iter, const value_type& __v)
-      {
-	size_type __old_size = _Base::bucket_count();
-	iterator __res = _Base::insert(__iter, __v);
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	std::pair<iterator, bool>
-	insert(_Pair&& __obj)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  std::pair<iterator, bool> __res
-	    = _Base::insert(std::forward<_Pair>(__obj));
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(const_iterator __iter, _Pair&& __v)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  iterator __res = _Base::insert(__iter, std::forward<_Pair>(__v));
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      template<typename _InputIter>
-	void
-	insert(_InputIter __first, _InputIter __last)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  _Base::insert(__first, __last);
-	  this->_M_profile_resize(__old_size);
-	}
-
-      // operator[]
-      mapped_type&
-      operator[](const _Key& __k)
-      {
-	size_type __old_size = _Base::bucket_count();
-	mapped_type& __res = _M_base()[__k];
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      mapped_type&
-      operator[](_Key&& __k)
-      {
-	size_type __old_size = _Base::bucket_count();
-	mapped_type& __res = _M_base()[std::move(__k)];
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      void
-      swap(unordered_map& __x)
-      noexcept( noexcept(__x._M_base().swap(__x)) )
-      {
-	_Base::swap(__x._M_base());
-	this->_M_swap(__x);
-      }
-
-      void rehash(size_type __n)
-      {
-	size_type __old_size = _Base::bucket_count();
-	_Base::rehash(__n);
-	this->_M_profile_resize(__old_size);
-      }
-  };
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline void
-    swap(unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	 unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline bool
-    operator==(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return static_cast<const _GLIBCXX_STD_BASE&>(__x) == __y; }
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline bool
-    operator!=(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-#undef _GLIBCXX_BASE
-#undef _GLIBCXX_STD_BASE
-#define _GLIBCXX_BASE unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>
-#define _GLIBCXX_STD_BASE _GLIBCXX_STD_C::_GLIBCXX_BASE
-
-  /// Class std::unordered_multimap wrapper with performance instrumentation.
-  template<typename _Key, typename _Tp,
-	   typename _Hash = std::hash<_Key>,
-	   typename _Pred = std::equal_to<_Key>,
-	   typename _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-    class unordered_multimap
-    : public _GLIBCXX_STD_BASE,
-      public _Unordered_profile<unordered_multimap<_Key, _Tp,
-						   _Hash, _Pred, _Alloc>,
-				false>
-    {
-      typedef typename _GLIBCXX_STD_BASE _Base;
-
-      _Base&
-      _M_base() noexcept	{ return *this; }
-
-      const _Base&
-      _M_base() const noexcept	{ return *this; }
-
-    public:
-      typedef typename _Base::size_type		size_type;
-      typedef typename _Base::hasher		hasher;
-      typedef typename _Base::key_equal		key_equal;
-      typedef typename _Base::allocator_type	allocator_type;
-      typedef typename _Base::key_type		key_type;
-      typedef typename _Base::value_type	value_type;
-      typedef typename _Base::difference_type	difference_type;
-      typedef typename _Base::reference		reference;
-      typedef typename _Base::const_reference	const_reference;
-
-      typedef typename _Base::iterator		iterator;
-      typedef typename _Base::const_iterator	const_iterator;
-
-      unordered_multimap() = default;
-
-      explicit
-      unordered_multimap(size_type __n,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a) { }
-
-      template<typename _InputIterator>
-	unordered_multimap(_InputIterator __f, _InputIterator __l,
-			   size_type __n = 0,
-			   const hasher& __hf = hasher(),
-			   const key_equal& __eql = key_equal(),
-			   const allocator_type& __a = allocator_type())
-	: _Base(__f, __l, __n, __hf, __eql, __a) { }
-
-      unordered_multimap(const unordered_multimap&) = default;
-
-      unordered_multimap(const _Base& __x)
-      : _Base(__x) { }
-
-      unordered_multimap(unordered_multimap&&) = default;
-
-      explicit
-      unordered_multimap(const allocator_type& __a)
-      : _Base(__a) { }
-
-      unordered_multimap(const unordered_multimap& __ummap,
-			 const allocator_type& __a)
-      : _Base(__ummap._M_base(), __a) { }
-
-      unordered_multimap(unordered_multimap&& __ummap,
-			 const allocator_type& __a)
-      : _Base(std::move(__ummap._M_base()), __a) { }
-
-      unordered_multimap(initializer_list<value_type> __l,
-			 size_type __n = 0,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _Base(__l, __n, __hf, __eql, __a) { }
-
-      unordered_multimap(size_type __n, const allocator_type& __a)
-      : unordered_multimap(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multimap(size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-      : unordered_multimap(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_multimap(_InputIterator __first, _InputIterator __last,
-			   size_type __n,
-			   const allocator_type& __a)
-	  : unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_multimap(_InputIterator __first, _InputIterator __last,
-			   size_type __n, const hasher& __hf,
-			   const allocator_type& __a)
-	  : unordered_multimap(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_multimap(initializer_list<value_type> __l,
-			 size_type __n,
-			 const allocator_type& __a)
-	: unordered_multimap(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multimap(initializer_list<value_type> __l,
-			 size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-	: unordered_multimap(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      unordered_multimap&
-      operator=(const unordered_multimap&) = default;
-
-      unordered_multimap&
-      operator=(unordered_multimap&&) = default;
-
-      unordered_multimap&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __l;
-	this->_M_profile_construct();
-	return *this;
-      }
-
-      void
-      clear() noexcept
-      {
-	this->_M_profile_destruct();
-	_Base::clear();
-	this->_M_profile_construct();
-      }
-
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  iterator __res
-	    = _Base::emplace(std::forward<_Args>(__args)...);
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __it, _Args&&... __args)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  iterator __res
-	    = _Base::emplace_hint(__it, std::forward<_Args>(__args)...);
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      void
-      insert(std::initializer_list<value_type> __l)
-      {
-	size_type __old_size = _Base::bucket_count();
-	_Base::insert(__l);
-	this->_M_profile_resize(__old_size);
-      }
-
-      iterator
-      insert(const value_type& __obj)
-      {
-	size_type __old_size = _Base::bucket_count();
-	iterator __res = _Base::insert(__obj);
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      iterator
-      insert(const_iterator __iter, const value_type& __v)
-      {
-	size_type __old_size = _Base::bucket_count();
-	iterator __res = _Base::insert(__iter, __v);
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(_Pair&& __obj)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  iterator __res = _Base::insert(std::forward<_Pair>(__obj));
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      template<typename _Pair, typename = typename
-	       std::enable_if<std::is_constructible<value_type,
-						    _Pair&&>::value>::type>
-	iterator
-	insert(const_iterator __iter, _Pair&& __v)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  iterator __res = _Base::insert(__iter, std::forward<_Pair>(__v));
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      template<typename _InputIter>
-	void
-	insert(_InputIter __first, _InputIter __last)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  _Base::insert(__first, __last);
-	  this->_M_profile_resize(__old_size);
-	}
-
-      void
-      swap(unordered_multimap& __x)
-      noexcept( noexcept(__x._M_base().swap(__x)) )
-      {
-	_Base::swap(__x._M_base());
-	this->_M_swap(__x);
-      }
-
-      void
-      rehash(size_type __n)
-      {
-	size_type __old_size = _Base::bucket_count();
-	_Base::rehash(__n);
-	this->_M_profile_resize(__old_size);
-      }
-  };
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline void
-    swap(unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	 unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline bool
-    operator==(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return static_cast<const _GLIBCXX_STD_BASE&>(__x) == __y; }
-
-  template<typename _Key, typename _Tp, typename _Hash,
-	   typename _Pred, typename _Alloc>
-    inline bool
-    operator!=(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-} // namespace __profile
-} // namespace std
-
-#undef _GLIBCXX_BASE
-#undef _GLIBCXX_STD_BASE
-
-#endif // C++11
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/unordered_set b/openflow/usr/include/c++/5/profile/unordered_set
deleted file mode 100644
index 15950b9..0000000
--- a/openflow/usr/include/c++/5/profile/unordered_set
+++ /dev/null
@@ -1,559 +0,0 @@
-// Profiling unordered_set/unordered_multiset implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/unordered_set
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_UNORDERED_SET
-#define _GLIBCXX_PROFILE_UNORDERED_SET 1
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-# include <unordered_set>
-
-#include <profile/base.h>
-#include <profile/unordered_base.h>
-
-#define _GLIBCXX_BASE unordered_set<_Key, _Hash, _Pred, _Alloc>
-#define _GLIBCXX_STD_BASE _GLIBCXX_STD_C::_GLIBCXX_BASE
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  /** @brief Unordered_set wrapper with performance instrumentation.  */
-  template<typename _Key,
-	   typename _Hash = std::hash<_Key>,
-	   typename _Pred = std::equal_to<_Key>,
-	   typename _Alloc =  std::allocator<_Key> >
-    class unordered_set
-    : public _GLIBCXX_STD_BASE,
-      public _Unordered_profile<unordered_set<_Key, _Hash, _Pred, _Alloc>,
-				true>
-    {
-      typedef _GLIBCXX_STD_BASE _Base;
-
-      _Base&
-      _M_base() noexcept       { return *this; }
-
-      const _Base&
-      _M_base() const noexcept { return *this; }
-
-    public:
-      typedef typename _Base::size_type		size_type;
-      typedef typename _Base::hasher		hasher;
-      typedef typename _Base::key_equal		key_equal;
-      typedef typename _Base::allocator_type	allocator_type;
-      typedef typename _Base::key_type		key_type;
-      typedef typename _Base::value_type	value_type;
-      typedef typename _Base::difference_type	difference_type;
-      typedef typename _Base::reference		reference;
-      typedef typename _Base::const_reference	const_reference;
-
-      typedef typename _Base::iterator		iterator;
-      typedef typename _Base::const_iterator	const_iterator;
-
-      unordered_set() = default;
-
-      explicit
-      unordered_set(size_type __n,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-	: _Base(__n, __hf, __eql, __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_set(_InputIterator __f, _InputIterator __l,
-		      size_type __n = 0,
-		      const hasher& __hf = hasher(),
-		      const key_equal& __eql = key_equal(),
-		      const allocator_type& __a = allocator_type())
-	  : _Base(__f, __l, __n, __hf, __eql, __a)
-      { }
-
-      unordered_set(const unordered_set&) = default;
-
-      unordered_set(const _Base& __x)
-	: _Base(__x)
-      { }
-
-      unordered_set(unordered_set&&) = default;
-
-      explicit
-      unordered_set(const allocator_type& __a)
-	: _Base(__a)
-      { }
-
-      unordered_set(const unordered_set& __uset,
-		    const allocator_type& __a)
-	: _Base(__uset._M_base(), __a)
-      { }
-
-      unordered_set(unordered_set&& __uset,
-		    const allocator_type& __a)
-	: _Base(std::move(__uset._M_base()), __a)
-      { }
-
-      unordered_set(initializer_list<value_type> __l,
-		    size_type __n = 0,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _Base(__l, __n, __hf, __eql, __a)
-      { }
-
-      unordered_set(size_type __n, const allocator_type& __a)
-	: unordered_set(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_set(size_type __n, const hasher& __hf,
-		    const allocator_type& __a)
-	: unordered_set(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_set(_InputIterator __first, _InputIterator __last,
-		      size_type __n,
-		      const allocator_type& __a)
-	  : unordered_set(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_set(_InputIterator __first, _InputIterator __last,
-		      size_type __n, const hasher& __hf,
-		      const allocator_type& __a)
-	  : unordered_set(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_set(initializer_list<value_type> __l,
-		    size_type __n,
-		    const allocator_type& __a)
-	: unordered_set(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_set(initializer_list<value_type> __l,
-		    size_type __n, const hasher& __hf,
-		    const allocator_type& __a)
-	: unordered_set(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      unordered_set&
-      operator=(const unordered_set&) = default;
-
-      unordered_set&
-      operator=(unordered_set&&) = default;
-
-      unordered_set&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __l;
-	this->_M_profile_construct();
-	return *this;
-      }
-
-      void
-      swap(unordered_set& __x)
-      noexcept( noexcept(__x._M_base().swap(__x)) )
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      void
-      clear() noexcept
-      {
-	this->_M_profile_destruct();
-	_Base::clear();
-	this->_M_profile_construct();
-      }
-
-      template<typename... _Args>
-	std::pair<iterator, bool>
-	emplace(_Args&&... __args)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  std::pair<iterator, bool> __res
-	    = _Base::emplace(std::forward<_Args>(__args)...);
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __it, _Args&&... __args)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  iterator __res
-	    = _Base::emplace_hint(__it, std::forward<_Args>(__args)...);
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      void
-      insert(std::initializer_list<value_type> __l)
-      {
-	size_type __old_size = _Base::bucket_count();
-	_Base::insert(__l);
-	this->_M_profile_resize(__old_size);
-      }
-
-      std::pair<iterator, bool>
-      insert(const value_type& __obj)
-      {
-	size_type __old_size = _Base::bucket_count();
-	std::pair<iterator, bool> __res = _Base::insert(__obj);
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      iterator
-      insert(const_iterator __iter, const value_type& __v)
-      {
-	size_type __old_size = _Base::bucket_count();
-	iterator __res = _Base::insert(__iter, __v);
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      std::pair<iterator, bool>
-      insert(value_type&& __obj)
-      {
-	size_type __old_size = _Base::bucket_count();
-	std::pair<iterator, bool> __res = _Base::insert(std::move(__obj));
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      iterator
-      insert(const_iterator __iter, value_type&& __v)
-      {
-	size_type __old_size = _Base::bucket_count();
-	iterator __res = _Base::insert(__iter, std::move(__v));
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      template<typename _InputIter>
-	void
-	insert(_InputIter __first, _InputIter __last)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  _Base::insert(__first, __last);
-	  this->_M_profile_resize(__old_size);
-	}
-
-      void
-      rehash(size_type __n)
-      {
-	size_type __old_size = _Base::bucket_count();
-	_Base::rehash(__n);
-	this->_M_profile_resize(__old_size);
-      }
-  };
-
-  template<typename _Key, typename _Hash, typename _Pred, typename _Alloc>
-    inline void
-    swap(unordered_set<_Key, _Hash, _Pred, _Alloc>& __x,
-	 unordered_set<_Key, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<typename _Key, typename _Hash, typename _Pred, typename _Alloc>
-    inline bool
-    operator==(const unordered_set<_Key, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_set<_Key, _Hash, _Pred, _Alloc>& __y)
-    { return static_cast<const _GLIBCXX_STD_BASE&>(__x) == __y; }
-
-  template<typename _Key, typename _Hash, typename _Pred, typename _Alloc>
-    inline bool
-    operator!=(const unordered_set<_Key, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_set<_Key, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-#undef _GLIBCXX_BASE
-#undef _GLIBCXX_STD_BASE
-#define _GLIBCXX_STD_BASE _GLIBCXX_STD_C::_GLIBCXX_BASE
-#define _GLIBCXX_BASE unordered_multiset<_Value, _Hash, _Pred, _Alloc>
-
-  /** @brief Unordered_multiset wrapper with performance instrumentation.  */
-  template<typename _Value,
-	   typename _Hash = std::hash<_Value>,
-	   typename _Pred = std::equal_to<_Value>,
-	   typename _Alloc =  std::allocator<_Value> >
-    class unordered_multiset
-    : public _GLIBCXX_STD_BASE,
-      public _Unordered_profile<unordered_multiset<_Value,
-						   _Hash, _Pred, _Alloc>,
-				false>
-    {
-      typedef _GLIBCXX_STD_BASE _Base;
-
-      _Base&
-      _M_base() noexcept       { return *this; }
-
-      const _Base&
-      _M_base() const noexcept { return *this; }
-
-    public:
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::hasher	  hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::allocator_type  allocator_type;
-      typedef typename _Base::key_type	key_type;
-      typedef typename _Base::value_type      value_type;
-      typedef typename _Base::difference_type difference_type;
-      typedef typename _Base::reference       reference;
-      typedef typename _Base::const_reference const_reference;
-
-      typedef typename _Base::iterator iterator;
-      typedef typename _Base::const_iterator const_iterator;
-
-      unordered_multiset() = default;
-
-      explicit
-      unordered_multiset(size_type __n,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-	: _Base(__n, __hf, __eql, __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_multiset(_InputIterator __f, _InputIterator __l,
-			   size_type __n = 0,
-			   const hasher& __hf = hasher(),
-			   const key_equal& __eql = key_equal(),
-			   const allocator_type& __a = allocator_type())
-	  : _Base(__f, __l, __n, __hf, __eql, __a)
-      { }
-
-      unordered_multiset(const unordered_multiset&) = default;
-
-      unordered_multiset(const _Base& __x)
-	: _Base(__x)
-      { }
-
-      unordered_multiset(unordered_multiset&&) = default;
-
-      explicit
-      unordered_multiset(const allocator_type& __a)
-	: _Base(__a)
-      { }
-
-      unordered_multiset(const unordered_multiset& __umset,
-			 const allocator_type& __a)
-	: _Base(__umset._M_base(), __a)
-      { }
-
-      unordered_multiset(unordered_multiset&& __umset,
-			 const allocator_type& __a)
-	: _Base(std::move(__umset._M_base()), __a)
-      { }
-
-      unordered_multiset(initializer_list<value_type> __l,
-			 size_type __n = 0,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-	: _Base(__l, __n, __hf, __eql, __a)
-      { }
-
-      unordered_multiset(size_type __n, const allocator_type& __a)
-	: unordered_multiset(__n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multiset(size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-	: unordered_multiset(__n, __hf, key_equal(), __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_multiset(_InputIterator __first, _InputIterator __last,
-			   size_type __n,
-			   const allocator_type& __a)
-	  : unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a)
-	{ }
-
-      template<typename _InputIterator>
-	unordered_multiset(_InputIterator __first, _InputIterator __last,
-			   size_type __n, const hasher& __hf,
-			   const allocator_type& __a)
-	  : unordered_multiset(__first, __last, __n, __hf, key_equal(), __a)
-	{ }
-
-      unordered_multiset(initializer_list<value_type> __l,
-			 size_type __n,
-			 const allocator_type& __a)
-	: unordered_multiset(__l, __n, hasher(), key_equal(), __a)
-      { }
-
-      unordered_multiset(initializer_list<value_type> __l,
-			 size_type __n, const hasher& __hf,
-			 const allocator_type& __a)
-	: unordered_multiset(__l, __n, __hf, key_equal(), __a)
-      { }
-
-      unordered_multiset&
-      operator=(const unordered_multiset&) = default;
-
-      unordered_multiset&
-      operator=(unordered_multiset&&) = default;
-
-      unordered_multiset&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __l;
-	this->_M_profile_construct();
-	return *this;
-      }
-
-      void
-      swap(unordered_multiset& __x)
-      noexcept( noexcept(__x._M_base().swap(__x)) )
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      void
-      clear() noexcept
-      {
-	this->_M_profile_destruct();
-	_Base::clear();
-	this->_M_profile_construct();
-      }
-
-      template<typename... _Args>
-	iterator
-	emplace(_Args&&... __args)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  iterator __res = _Base::emplace(std::forward<_Args>(__args)...);
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      template<typename... _Args>
-	iterator
-	emplace_hint(const_iterator __it, _Args&&... __args)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  iterator __res
-	    = _Base::emplace_hint(__it, std::forward<_Args>(__args)...);
-	  this->_M_profile_resize(__old_size);
-	  return __res;
-	}
-
-      void
-      insert(std::initializer_list<value_type> __l)
-      {
-	size_type __old_size = _Base::bucket_count();
-	_Base::insert(__l);
-	this->_M_profile_resize(__old_size);
-      }
-
-      iterator
-      insert(const value_type& __obj)
-      {
-	size_type __old_size = _Base::bucket_count();
-	iterator __res = _Base::insert(__obj);
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      iterator
-      insert(const_iterator __iter, const value_type& __v)
-      {
-	size_type __old_size = _Base::bucket_count();
-	iterator __res = _Base::insert(__iter, __v);
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      iterator
-      insert(value_type&& __obj)
-      {
-	size_type __old_size = _Base::bucket_count();
-	iterator __res = _Base::insert(std::move(__obj));
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      iterator
-      insert(const_iterator __iter, value_type&& __v)
-      {
-	size_type __old_size = _Base::bucket_count();
-	iterator __res = _Base::insert(__iter, std::move(__v));
-	this->_M_profile_resize(__old_size);
-	return __res;
-      }
-
-      template<typename _InputIter>
-	void
-	insert(_InputIter __first, _InputIter __last)
-	{
-	  size_type __old_size = _Base::bucket_count();
-	  _Base::insert(__first, __last);
-	  this->_M_profile_resize(__old_size);
-	}
-
-      void
-      rehash(size_type __n)
-      {
-	size_type __old_size = _Base::bucket_count();
-	_Base::rehash(__n);
-	this->_M_profile_resize(__old_size);
-      }
-   };
-
-  template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
-    inline void
-    swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-	 unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
-    inline bool
-    operator==(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    { return static_cast<const _GLIBCXX_STD_BASE&>(__x) == __y; }
-
-  template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
-    inline bool
-    operator!=(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-	       const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    { return !(__x == __y); }
-
-} // namespace __profile
-} // namespace std
-
-#undef _GLIBCXX_BASE
-#undef _GLIBCXX_STD_BASE
-
-#endif // C++11
-
-#endif
diff --git a/openflow/usr/include/c++/5/profile/vector b/openflow/usr/include/c++/5/profile/vector
deleted file mode 100644
index fdc73ef..0000000
--- a/openflow/usr/include/c++/5/profile/vector
+++ /dev/null
@@ -1,583 +0,0 @@
-// Profiling vector implementation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-/** @file profile/vector
- *  This file is a GNU profile extension to the Standard C++ Library.
- */
-
-#ifndef _GLIBCXX_PROFILE_VECTOR
-#define _GLIBCXX_PROFILE_VECTOR 1
-
-#include <vector>
-#include <utility>
-#include <profile/base.h>
-#include <profile/iterator_tracker.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace __profile
-{
-  template<typename _Vector>
-    class _Vector_profile_pre
-    {
-      _Vector&
-      _M_conjure()
-      { return *static_cast<_Vector*>(this); }
-
-    public:
-#if __cplusplus >= 201103L
-      _Vector_profile_pre() = default;
-      _Vector_profile_pre(const _Vector_profile_pre&) = default;
-      _Vector_profile_pre(_Vector_profile_pre&&) = default;
-
-      _Vector_profile_pre&
-      operator=(const _Vector_profile_pre&)
-      { _M_conjure()._M_profile_destruct(); }
-
-      _Vector_profile_pre&
-      operator=(_Vector_profile_pre&&) noexcept
-      { _M_conjure()._M_profile_destruct(); }
-#endif
-    };
-
-  template<typename _Vector>
-    class _Vector_profile_post
-    {
-      _Vector&
-      _M_conjure()
-      { return *static_cast<_Vector*>(this); }
-
-    protected:
-      __gnu_profile::__container_size_info* _M_size_info;
-      __gnu_profile::__vector2list_info* _M_vect2list_info;
-
-      _Vector_profile_post() _GLIBCXX_NOEXCEPT
-      { _M_profile_construct(); }
-
-#if __cplusplus >= 201103L
-      _Vector_profile_post(const _Vector_profile_post&) noexcept
-      : _Vector_profile_post() { }
-      _Vector_profile_post(_Vector_profile_post&& __other) noexcept
-      : _Vector_profile_post()
-      { _M_swap(__other); }
-
-      _Vector_profile_post&
-      operator=(const _Vector_profile_post&) noexcept
-      { _M_profile_construct(); }
-
-      _Vector_profile_post&
-      operator=(_Vector_profile_post&& __other) noexcept
-      {
-	_M_swap(__other);
-	__other._M_profile_construct();
-      }
-#endif
-
-      ~_Vector_profile_post()
-      { _M_conjure()._M_profile_destruct(); }
-
-    public:
-      void
-      _M_profile_construct() _GLIBCXX_NOEXCEPT
-      {
-	_M_size_info =
-	  __profcxx_vector_size_construct(_M_conjure().capacity());
-	_M_vect2list_info = __profcxx_vector2list_construct();	
-      }
-
-      void
-      _M_profile_destruct() _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_vector2list_destruct(_M_vect2list_info);
-	_M_vect2list_info = 0;
-	__profcxx_vector_size_destruct(_M_size_info,
-				       _M_conjure().capacity(),
-				       _M_conjure().size());
-	_M_size_info = 0;
-      }
-
-      void
-      _M_swap(_Vector_profile_post& __other) _GLIBCXX_NOEXCEPT
-      {
-	std::swap(_M_size_info, __other._M_size_info);
-	std::swap(_M_vect2list_info, __other._M_vect2list_info);
-      }
-    };
-
-  template<typename _Tp,
-	   typename _Allocator = std::allocator<_Tp> >
-    class vector
-    : public _Vector_profile_pre<vector<_Tp, _Allocator> >,
-      public _GLIBCXX_STD_C::vector<_Tp, _Allocator>,
-      public _Vector_profile_post<vector<_Tp, _Allocator> >
-    {
-      typedef _GLIBCXX_STD_C::vector<_Tp, _Allocator>	_Base;
-
-      typedef typename _Base::iterator			_Base_iterator;
-      typedef typename _Base::const_iterator		_Base_const_iterator;
-
-    public:
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __iterator_tracker<_Base_iterator, vector>
-							iterator;
-      typedef __iterator_tracker<_Base_const_iterator, vector>
-							const_iterator;
-
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-
-      typedef _Tp					value_type;
-      typedef _Allocator				allocator_type;
-      typedef typename _Base::pointer			pointer;
-      typedef typename _Base::const_pointer		const_pointer;
-      typedef std::reverse_iterator<iterator>		reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-
-      _Base&
-      _M_base() _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      const _Base&
-      _M_base() const _GLIBCXX_NOEXCEPT	{ return *this; }
-
-      // 23.2.4.1 construct/copy/destroy:
-
-#if __cplusplus < 201103L
-      vector()
-      { }
-
-      vector(const vector& __x)
-      : _Base(__x) { }
-#else
-      vector() = default;
-      vector(const vector&) = default;
-      vector(vector&&) = default;
-#endif
-
-      explicit
-      vector(const _Allocator& __a) _GLIBCXX_NOEXCEPT
-      : _Base(__a) { }
-
-#if __cplusplus >= 201103L
-      explicit
-      vector(size_type __n, const _Allocator& __a = _Allocator())
-      : _Base(__n, __a) { }
-
-      vector(size_type __n, const _Tp& __value,
-	     const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#else
-      explicit
-      vector(size_type __n, const _Tp& __value = _Tp(),
-	     const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-#endif
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-#else
-      template<typename _InputIterator>
-#endif
-	vector(_InputIterator __first, _InputIterator __last,
-	       const _Allocator& __a = _Allocator())
-	: _Base(__first, __last, __a) { }
-
-      /// Construction from a normal-mode vector
-      vector(const _Base& __x)
-      : _Base(__x) { }
-
-#if __cplusplus >= 201103L
-      vector(const _Base& __x, const _Allocator& __a)
-      : _Base(__x, __a) { }
-
-      vector(vector&& __x, const _Allocator& __a)
-      : _Base(std::move(__x), __a) { }
-
-      vector(initializer_list<value_type> __l,
-	     const allocator_type& __a = allocator_type())
-      : _Base(__l, __a) { }
-#endif
-
-#if __cplusplus < 201103L
-      vector&
-      operator=(const vector& __x)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __x;
-	this->_M_profile_construct();
-	return *this;
-      }
-#else
-      vector&
-      operator=(const vector&) = default;
-
-      vector&
-      operator=(vector&&) = default;
-
-      vector&
-      operator=(initializer_list<value_type> __l)
-      {
-	this->_M_profile_destruct();
-	_M_base() = __l;
-	this->_M_profile_construct();
-	return *this;
-      }
-#endif
-
-      // iterators:
-      iterator
-      begin() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end() _GLIBCXX_NOEXCEPT
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend() _GLIBCXX_NOEXCEPT
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const _GLIBCXX_NOEXCEPT
-      { return const_reverse_iterator(begin()); }
-
-#if __cplusplus >= 201103L
-      const_iterator
-      cbegin() const noexcept
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      cend() const noexcept
-      { return const_iterator(_Base::end(), this); }
-
-      const_reverse_iterator
-      crbegin() const noexcept
-      { return const_reverse_iterator(end()); }
-
-      const_reverse_iterator
-      crend() const noexcept
-      { return const_reverse_iterator(begin()); }
-#endif
-
-      // 23.2.4.2 capacity:
-
-#if __cplusplus >= 201103L
-      void
-      resize(size_type __sz)
-      {
-	__profcxx_vector2list_invalid_operator(this->_M_vect2list_info);
-	_M_profile_resize(this->capacity(), __sz);
-	_Base::resize(__sz);
-      }
-
-      void
-      resize(size_type __sz, const _Tp& __c)
-      {
-	__profcxx_vector2list_invalid_operator(this->_M_vect2list_info);
-	_M_profile_resize(this->capacity(), __sz);
-	_Base::resize(__sz, __c);
-      }
-#else
-      void
-      resize(size_type __sz, _Tp __c = _Tp())
-      {
-	__profcxx_vector2list_invalid_operator(this->_M_vect2list_info);
-	_M_profile_resize(this->capacity(), __sz);
-	_Base::resize(__sz, __c);
-      }
-#endif
-
-      // element access:
-      reference
-      operator[](size_type __n) _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_vector2list_invalid_operator(this->_M_vect2list_info);
-	return _M_base()[__n];
-      }
-      const_reference
-      operator[](size_type __n) const _GLIBCXX_NOEXCEPT
-      {
-	__profcxx_vector2list_invalid_operator(this->_M_vect2list_info);
-	return _M_base()[__n];
-      }
-
-      // 23.2.4.3 modifiers:
-      void
-      push_back(const _Tp& __x)
-      {
-	size_type __old_size = this->capacity();
-	_Base::push_back(__x);
-	_M_profile_resize(__old_size, this->capacity());
-      }
-
-#if __cplusplus >= 201103L
-      void
-      push_back(_Tp&& __x)
-      {
-	size_type __old_size = this->capacity();
-	_Base::push_back(std::move(__x));
-	_M_profile_resize(__old_size, this->capacity());
-      }
-
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      insert(const_iterator __pos, const _Tp& __x)
-#else
-      insert(iterator __pos, const _Tp& __x)
-#endif
-      {
-	__profcxx_vector2list_insert(this->_M_vect2list_info,
-				     __pos.base() - _Base::begin(),
-				     this->size());
-	size_type __old_size = this->capacity();
-	_Base_iterator __res = _Base::insert(__pos.base(), __x);
-	_M_profile_resize(__old_size, this->capacity());
-	return iterator(__res, this);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __pos, _Tp&& __x)
-      {
-	__profcxx_vector2list_insert(this->_M_vect2list_info,
-				     __pos.base() - _Base::cbegin(),
-				     this->size());
-	size_type __old_size = this->capacity();
-	_Base_iterator __res = _Base::insert(__pos.base(), __x);
-	_M_profile_resize(__old_size, this->capacity());
-	return iterator(__res, this);
-      }
-
-      template<typename... _Args>
-	iterator
-	emplace(const_iterator __pos, _Args&&... __args)
-	{
-	  _Base_iterator __res = _Base::emplace(__pos.base(),
-						std::forward<_Args>(__args)...);
-	  return iterator(__res, this);
-	}
-
-      iterator
-      insert(const_iterator __pos, initializer_list<value_type> __l)
-      { return this->insert(__pos, __l.begin(), __l.end()); }
-#endif
-
-      void
-      swap(vector& __x)
-#if __cplusplus >= 201103L
-	noexcept( noexcept(declval<_Base>().swap(__x)) )
-#endif
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-#if __cplusplus >= 201103L
-      iterator
-      insert(const_iterator __pos, size_type __n, const _Tp& __x)
-      {
-	__profcxx_vector2list_insert(this->_M_vect2list_info,
-				     __pos.base() - _Base::cbegin(),
-				     this->size());
-	size_type __old_size = this->capacity();
-	_Base_iterator __res = _Base::insert(__pos, __n, __x);
-	_M_profile_resize(__old_size, this->capacity());
-	return iterator(__res, this);
-      }
-#else
-      void
-      insert(iterator __pos, size_type __n, const _Tp& __x)
-      {
-	__profcxx_vector2list_insert(this->_M_vect2list_info,
-				     __pos.base() - _Base::begin(),
-				     this->size());
-	size_type __old_size = this->capacity();
-	_Base::insert(__pos, __n, __x);
-	_M_profile_resize(__old_size, this->capacity());
-      }
-#endif
-
-#if __cplusplus >= 201103L
-      template<typename _InputIterator,
-	       typename = std::_RequireInputIter<_InputIterator>>
-	iterator
-	insert(const_iterator __pos,
-	       _InputIterator __first, _InputIterator __last)
-	{
-	  __profcxx_vector2list_insert(this->_M_vect2list_info,
-				       __pos.base() - _Base::cbegin(),
-				       this->size());
-	  size_type __old_size = this->capacity();
-	  _Base_iterator __res = _Base::insert(__pos, __first, __last);
-	  _M_profile_resize(__old_size, this->capacity());
-	  return iterator(__res, this);
-	}
-#else
-      template<typename _InputIterator>
-	void
-	insert(iterator __pos,
-	       _InputIterator __first, _InputIterator __last)
-	{
-	  __profcxx_vector2list_insert(this->_M_vect2list_info,
-				       __pos.base() - _Base::begin(),
-				       this->size());
-	  size_type __old_size = this->capacity();
-	  _Base::insert(__pos, __first, __last);
-	  _M_profile_resize(__old_size, this->capacity());
-	}
-#endif
-
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __pos)
-#else
-      erase(iterator __pos)	
-#endif
-      { return iterator(_Base::erase(__pos.base()), this); }
-
-      iterator
-#if __cplusplus >= 201103L
-      erase(const_iterator __first, const_iterator __last)
-#else
-      erase(iterator __first, iterator __last)
-#endif
-      { return iterator(_Base::erase(__first.base(), __last.base()), this); }
-
-      void
-      clear() _GLIBCXX_NOEXCEPT
-      {
-	this->_M_profile_destruct();
-	_Base::clear();
-	this->_M_profile_construct();
-      }
-
-      inline void
-      _M_profile_iterate(int __rewind = 0) const
-      { __profcxx_vector2list_iterate(this->_M_vect2list_info, __rewind); }
-
-    private:
-      void _M_profile_resize(size_type __old_size, size_type __new_size)
-      {
-	if (__old_size < __new_size)
-	  {
-	    __profcxx_vector_size_resize(this->_M_size_info,
-					 this->size(), __new_size);
-	    __profcxx_vector2list_resize(this->_M_vect2list_info,
-					 this->size(), __new_size);
-	  }
-      }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const vector<_Tp, _Alloc>& __lhs,
-	      const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const vector<_Tp, _Alloc>& __lhs,
-	      const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(vector<_Tp, _Alloc>& __lhs, vector<_Tp, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(vector<_Tp, _Alloc>&& __lhs, vector<_Tp, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(vector<_Tp, _Alloc>& __lhs, vector<_Tp, _Alloc>&& __rhs)
-    { __lhs.swap(__rhs); }
-#endif
-
-} // namespace __profile
-
-#if __cplusplus >= 201103L
-  // DR 1182.
-  /// std::hash specialization for vector<bool>.
-  template<typename _Alloc>
-    struct hash<__profile::vector<bool, _Alloc>>
-    : public __hash_base<size_t, __profile::vector<bool, _Alloc>>
-    {
-      size_t
-      operator()(const __profile::vector<bool, _Alloc>& __b) const noexcept
-      {
-	return std::hash<_GLIBCXX_STD_C::vector<bool, _Alloc>>()(__b._M_base());
-      }
-    };
-#endif
-
-} // namespace std
-
-#endif
diff --git a/openflow/usr/include/c++/5/queue b/openflow/usr/include/c++/5/queue
deleted file mode 100644
index b4fd662..0000000
--- a/openflow/usr/include/c++/5/queue
+++ /dev/null
@@ -1,66 +0,0 @@
-// <queue> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/queue
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_QUEUE
-#define _GLIBCXX_QUEUE 1
-
-#pragma GCC system_header
-
-#include <deque>
-#include <vector>
-#include <bits/stl_heap.h>
-#include <bits/stl_function.h>
-#include <bits/stl_queue.h>
-
-#endif /* _GLIBCXX_QUEUE */
diff --git a/openflow/usr/include/c++/5/random b/openflow/usr/include/c++/5/random
deleted file mode 100644
index eecf3f0..0000000
--- a/openflow/usr/include/c++/5/random
+++ /dev/null
@@ -1,57 +0,0 @@
-// <random> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/random
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_RANDOM
-#define _GLIBCXX_RANDOM 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <cmath>
-#include <cstdlib>
-#include <string>
-#include <iosfwd>
-#include <limits>
-#include <debug/debug.h>
-#include <type_traits>
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
-#include <cstdint> // For uint_fast32_t, uint_fast64_t, uint_least32_t
-#include <bits/random.h>
-#include <bits/opt_random.h>
-#include <bits/random.tcc>
-
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
-
-#endif // C++11
-
-#endif // _GLIBCXX_RANDOM
diff --git a/openflow/usr/include/c++/5/ratio b/openflow/usr/include/c++/5/ratio
deleted file mode 100644
index e5e6f12..0000000
--- a/openflow/usr/include/c++/5/ratio
+++ /dev/null
@@ -1,538 +0,0 @@
-// ratio -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the 
-// terms of the GNU General Public License as published by the 
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/ratio
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_RATIO
-#define _GLIBCXX_RATIO 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <type_traits>
-#include <cstdint>
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup ratio Rational Arithmetic
-   * @ingroup utilities
-   *
-   * Compile time representation of finite rational numbers.
-   * @{
-   */
-
-  template<intmax_t _Pn>
-    struct __static_sign
-    : integral_constant<intmax_t, (_Pn < 0) ? -1 : 1>
-    { };
-
-  template<intmax_t _Pn>
-    struct __static_abs
-    : integral_constant<intmax_t, _Pn * __static_sign<_Pn>::value>
-    { };
-
-  template<intmax_t _Pn, intmax_t _Qn>
-    struct __static_gcd
-    : __static_gcd<_Qn, (_Pn % _Qn)>
-    { };
-
-  template<intmax_t _Pn>
-    struct __static_gcd<_Pn, 0>
-    : integral_constant<intmax_t, __static_abs<_Pn>::value>
-    { };
-
-  template<intmax_t _Qn>
-    struct __static_gcd<0, _Qn>
-    : integral_constant<intmax_t, __static_abs<_Qn>::value>
-    { };
-
-  // Let c = 2^(half # of bits in an intmax_t)
-  // then we find a1, a0, b1, b0 s.t. N = a1*c + a0, M = b1*c + b0
-  // The multiplication of N and M becomes,
-  // N * M = (a1 * b1)c^2 + (a0 * b1 + b0 * a1)c + a0 * b0
-  // Multiplication is safe if each term and the sum of the terms
-  // is representable by intmax_t.
-  template<intmax_t _Pn, intmax_t _Qn>
-    struct __safe_multiply
-    {
-    private:
-      static const uintmax_t __c = uintmax_t(1) << (sizeof(intmax_t) * 4);
-
-      static const uintmax_t __a0 = __static_abs<_Pn>::value % __c;
-      static const uintmax_t __a1 = __static_abs<_Pn>::value / __c;
-      static const uintmax_t __b0 = __static_abs<_Qn>::value % __c;
-      static const uintmax_t __b1 = __static_abs<_Qn>::value / __c;
-
-      static_assert(__a1 == 0 || __b1 == 0, 
-		    "overflow in multiplication");
-      static_assert(__a0 * __b1 + __b0 * __a1 < (__c >> 1), 
-		    "overflow in multiplication");
-      static_assert(__b0 * __a0 <= __INTMAX_MAX__, 
-		    "overflow in multiplication");
-      static_assert((__a0 * __b1 + __b0 * __a1) * __c
-		    <= __INTMAX_MAX__ -  __b0 * __a0,
-		    "overflow in multiplication");
-
-    public:
-      static const intmax_t value = _Pn * _Qn;
-    };
-
-  // Some double-precision utilities, where numbers are represented as
-  // __hi*2^(8*sizeof(uintmax_t)) + __lo.
-  template<uintmax_t __hi1, uintmax_t __lo1, uintmax_t __hi2, uintmax_t __lo2>
-    struct __big_less
-    : integral_constant<bool, (__hi1 < __hi2
-			       || (__hi1 == __hi2 && __lo1 < __lo2))>
-    { };
-
-  template<uintmax_t __hi1, uintmax_t __lo1, uintmax_t __hi2, uintmax_t __lo2>
-    struct __big_add
-    {
-      static constexpr uintmax_t __lo = __lo1 + __lo2;
-      static constexpr uintmax_t __hi = (__hi1 + __hi2 +
-					 (__lo1 + __lo2 < __lo1)); // carry
-    };
-
-  // Subtract a number from a bigger one.
-  template<uintmax_t __hi1, uintmax_t __lo1, uintmax_t __hi2, uintmax_t __lo2>
-    struct __big_sub
-    {
-      static_assert(!__big_less<__hi1, __lo1, __hi2, __lo2>::value,
-		    "Internal library error");
-      static constexpr uintmax_t __lo = __lo1 - __lo2;
-      static constexpr uintmax_t __hi = (__hi1 - __hi2 -
-					 (__lo1 < __lo2)); // carry
-    };
-
-  // Same principle as __safe_multiply.
-  template<uintmax_t __x, uintmax_t __y>
-    struct __big_mul
-    {
-    private:
-      static constexpr uintmax_t __c = uintmax_t(1) << (sizeof(intmax_t) * 4);
-      static constexpr uintmax_t __x0 = __x % __c;
-      static constexpr uintmax_t __x1 = __x / __c;
-      static constexpr uintmax_t __y0 = __y % __c;
-      static constexpr uintmax_t __y1 = __y / __c;
-      static constexpr uintmax_t __x0y0 = __x0 * __y0;
-      static constexpr uintmax_t __x0y1 = __x0 * __y1;
-      static constexpr uintmax_t __x1y0 = __x1 * __y0;
-      static constexpr uintmax_t __x1y1 = __x1 * __y1;
-      static constexpr uintmax_t __mix = __x0y1 + __x1y0; // possible carry...
-      static constexpr uintmax_t __mix_lo = __mix * __c;
-      static constexpr uintmax_t __mix_hi
-      = __mix / __c + ((__mix < __x0y1) ? __c : 0); // ... added here
-      typedef __big_add<__mix_hi, __mix_lo, __x1y1, __x0y0> _Res;
-    public:
-      static constexpr uintmax_t __hi = _Res::__hi;
-      static constexpr uintmax_t __lo = _Res::__lo;
-    };
-
-  // Adapted from __udiv_qrnnd_c in longlong.h
-  // This version assumes that the high bit of __d is 1.
-  template<uintmax_t __n1, uintmax_t __n0, uintmax_t __d>
-    struct __big_div_impl
-    {
-    private:
-      static_assert(__d >= (uintmax_t(1) << (sizeof(intmax_t) * 8 - 1)),
-		    "Internal library error");
-      static_assert(__n1 < __d, "Internal library error");
-      static constexpr uintmax_t __c = uintmax_t(1) << (sizeof(intmax_t) * 4);
-      static constexpr uintmax_t __d1 = __d / __c;
-      static constexpr uintmax_t __d0 = __d % __c;
-
-      static constexpr uintmax_t __q1x = __n1 / __d1;
-      static constexpr uintmax_t __r1x = __n1 % __d1;
-      static constexpr uintmax_t __m = __q1x * __d0;
-      static constexpr uintmax_t __r1y = __r1x * __c + __n0 / __c;
-      static constexpr uintmax_t __r1z = __r1y + __d;
-      static constexpr uintmax_t __r1
-      = ((__r1y < __m) ? ((__r1z >= __d) && (__r1z < __m))
-	 ? (__r1z + __d) : __r1z : __r1y) - __m;
-      static constexpr uintmax_t __q1
-      = __q1x - ((__r1y < __m)
-		 ? ((__r1z >= __d) && (__r1z < __m)) ? 2 : 1 : 0);
-      static constexpr uintmax_t __q0x = __r1 / __d1;
-      static constexpr uintmax_t __r0x = __r1 % __d1;
-      static constexpr uintmax_t __n = __q0x * __d0;
-      static constexpr uintmax_t __r0y = __r0x * __c + __n0 % __c;
-      static constexpr uintmax_t __r0z = __r0y + __d;
-      static constexpr uintmax_t __r0
-      = ((__r0y < __n) ? ((__r0z >= __d) && (__r0z < __n))
-	 ? (__r0z + __d) : __r0z : __r0y) - __n;
-      static constexpr uintmax_t __q0
-      = __q0x - ((__r0y < __n) ? ((__r0z >= __d)
-				  && (__r0z < __n)) ? 2 : 1 : 0);
-
-    public:
-      static constexpr uintmax_t __quot = __q1 * __c + __q0;
-      static constexpr uintmax_t __rem = __r0;
-
-    private:
-      typedef __big_mul<__quot, __d> _Prod;
-      typedef __big_add<_Prod::__hi, _Prod::__lo, 0, __rem> _Sum;
-      static_assert(_Sum::__hi == __n1 && _Sum::__lo == __n0,
-		    "Internal library error");
-  };
-
-  template<uintmax_t __n1, uintmax_t __n0, uintmax_t __d>
-    struct __big_div
-    {
-    private:
-      static_assert(__d != 0, "Internal library error");
-      static_assert(sizeof (uintmax_t) == sizeof (unsigned long long),
-		    "This library calls __builtin_clzll on uintmax_t, which "
-		    "is unsafe on your platform. Please complain to "
-		    "http://gcc.gnu.org/bugzilla/");
-      static constexpr int __shift = __builtin_clzll(__d);
-      static constexpr int __coshift_ = sizeof(uintmax_t) * 8 - __shift;
-      static constexpr int __coshift = (__shift != 0) ? __coshift_ : 0;
-      static constexpr uintmax_t __c1 = uintmax_t(1) << __shift;
-      static constexpr uintmax_t __c2 = uintmax_t(1) << __coshift;
-      static constexpr uintmax_t __new_d = __d * __c1;
-      static constexpr uintmax_t __new_n0 = __n0 * __c1;
-      static constexpr uintmax_t __n1_shifted = (__n1 % __d) * __c1;
-      static constexpr uintmax_t __n0_top = (__shift != 0) ? (__n0 / __c2) : 0;
-      static constexpr uintmax_t __new_n1 = __n1_shifted + __n0_top;
-      typedef __big_div_impl<__new_n1, __new_n0, __new_d> _Res;
-
-    public:
-      static constexpr uintmax_t __quot_hi = __n1 / __d;
-      static constexpr uintmax_t __quot_lo = _Res::__quot;
-      static constexpr uintmax_t __rem = _Res::__rem / __c1;
-
-    private:
-      typedef __big_mul<__quot_lo, __d> _P0;
-      typedef __big_mul<__quot_hi, __d> _P1;
-      typedef __big_add<_P0::__hi, _P0::__lo, _P1::__lo, __rem> _Sum;
-      // No overflow.
-      static_assert(_P1::__hi == 0, "Internal library error");
-      static_assert(_Sum::__hi >= _P0::__hi, "Internal library error");
-      // Matches the input data.
-      static_assert(_Sum::__hi == __n1 && _Sum::__lo == __n0,
-		    "Internal library error");
-      static_assert(__rem < __d, "Internal library error");
-    };
-
-  /**
-   *  @brief Provides compile-time rational arithmetic.
-   *
-   *  This class template represents any finite rational number with a
-   *  numerator and denominator representable by compile-time constants of
-   *  type intmax_t. The ratio is simplified when instantiated.
-   *
-   *  For example:
-   *  @code
-   *    std::ratio<7,-21>::num == -1;
-   *    std::ratio<7,-21>::den == 3;
-   *  @endcode
-   *  
-  */
-  template<intmax_t _Num, intmax_t _Den = 1>
-    struct ratio
-    {
-      static_assert(_Den != 0, "denominator cannot be zero");
-      static_assert(_Num >= -__INTMAX_MAX__ && _Den >= -__INTMAX_MAX__,
-		    "out of range");
-
-      // Note: sign(N) * abs(N) == N
-      static constexpr intmax_t num =
-        _Num * __static_sign<_Den>::value / __static_gcd<_Num, _Den>::value;
-
-      static constexpr intmax_t den =
-        __static_abs<_Den>::value / __static_gcd<_Num, _Den>::value;
-
-      typedef ratio<num, den> type;
-    };
-
-  template<intmax_t _Num, intmax_t _Den>
-    constexpr intmax_t ratio<_Num, _Den>::num;
-
-  template<intmax_t _Num, intmax_t _Den>
-    constexpr intmax_t ratio<_Num, _Den>::den;
-
-  template<typename _R1, typename _R2>
-    struct __ratio_multiply
-    {
-    private:
-      static const intmax_t __gcd1 =
-        __static_gcd<_R1::num, _R2::den>::value;
-      static const intmax_t __gcd2 =
-        __static_gcd<_R2::num, _R1::den>::value;
-
-    public:
-      typedef ratio<
-        __safe_multiply<(_R1::num / __gcd1),
-                        (_R2::num / __gcd2)>::value,
-        __safe_multiply<(_R1::den / __gcd2),
-                        (_R2::den / __gcd1)>::value> type;
-
-      static constexpr intmax_t num = type::num;
-      static constexpr intmax_t den = type::den;
-    };
-
-  template<typename _R1, typename _R2>
-    constexpr intmax_t __ratio_multiply<_R1, _R2>::num;
-
-  template<typename _R1, typename _R2>
-    constexpr intmax_t __ratio_multiply<_R1, _R2>::den;
-
-  /// ratio_multiply
-  template<typename _R1, typename _R2>
-    using ratio_multiply = typename __ratio_multiply<_R1, _R2>::type;
-
-  template<typename _R1, typename _R2>
-    struct __ratio_divide
-    {
-      static_assert(_R2::num != 0, "division by 0");
-
-      typedef typename __ratio_multiply<
-        _R1,
-        ratio<_R2::den, _R2::num>>::type type;
-
-      static constexpr intmax_t num = type::num;
-      static constexpr intmax_t den = type::den;
-    };
-
-  template<typename _R1, typename _R2>
-    constexpr intmax_t __ratio_divide<_R1, _R2>::num;
-
-  template<typename _R1, typename _R2>
-    constexpr intmax_t __ratio_divide<_R1, _R2>::den;
-
-  /// ratio_divide
-  template<typename _R1, typename _R2>
-    using ratio_divide = typename __ratio_divide<_R1, _R2>::type;
-
-  /// ratio_equal
-  template<typename _R1, typename _R2>
-    struct ratio_equal
-    : integral_constant<bool, _R1::num == _R2::num && _R1::den == _R2::den>
-    { };
-  
-  /// ratio_not_equal
-  template<typename _R1, typename _R2>
-    struct ratio_not_equal
-    : integral_constant<bool, !ratio_equal<_R1, _R2>::value>
-    { };
-
-  // Both numbers are positive.
-  template<typename _R1, typename _R2,
-           typename _Left = __big_mul<_R1::num,_R2::den>,
-           typename _Right = __big_mul<_R2::num,_R1::den> >
-    struct __ratio_less_impl_1
-    : integral_constant<bool, __big_less<_Left::__hi, _Left::__lo,
-           _Right::__hi, _Right::__lo>::value>
-    { }; 
-
-  template<typename _R1, typename _R2,
-	   bool = (_R1::num == 0 || _R2::num == 0
-		   || (__static_sign<_R1::num>::value
-		       != __static_sign<_R2::num>::value)),
-	   bool = (__static_sign<_R1::num>::value == -1
-		   && __static_sign<_R2::num>::value == -1)>
-    struct __ratio_less_impl
-    : __ratio_less_impl_1<_R1, _R2>::type
-    { };
-
-  template<typename _R1, typename _R2>
-    struct __ratio_less_impl<_R1, _R2, true, false>
-    : integral_constant<bool, _R1::num < _R2::num>
-    { };
-
-  template<typename _R1, typename _R2>
-    struct __ratio_less_impl<_R1, _R2, false, true>
-    : __ratio_less_impl_1<ratio<-_R2::num, _R2::den>,
-           ratio<-_R1::num, _R1::den> >::type
-    { };
-
-  /// ratio_less
-  template<typename _R1, typename _R2>
-    struct ratio_less
-    : __ratio_less_impl<_R1, _R2>::type
-    { };
-    
-  /// ratio_less_equal
-  template<typename _R1, typename _R2>
-    struct ratio_less_equal
-    : integral_constant<bool, !ratio_less<_R2, _R1>::value>
-    { };
-  
-  /// ratio_greater
-  template<typename _R1, typename _R2>
-    struct ratio_greater
-    : integral_constant<bool, ratio_less<_R2, _R1>::value>
-    { };
-
-  /// ratio_greater_equal
-  template<typename _R1, typename _R2>
-    struct ratio_greater_equal
-    : integral_constant<bool, !ratio_less<_R1, _R2>::value>
-    { };
-
-  template<typename _R1, typename _R2,
-      bool = (_R1::num >= 0),
-      bool = (_R2::num >= 0),
-      bool = ratio_less<ratio<__static_abs<_R1::num>::value, _R1::den>,
-        ratio<__static_abs<_R2::num>::value, _R2::den> >::value>
-    struct __ratio_add_impl
-    {
-    private:
-      typedef typename __ratio_add_impl<
-        ratio<-_R1::num, _R1::den>,
-        ratio<-_R2::num, _R2::den> >::type __t;
-    public:
-      typedef ratio<-__t::num, __t::den> type;
-    };
-
-  // True addition of nonnegative numbers.
-  template<typename _R1, typename _R2, bool __b>
-    struct __ratio_add_impl<_R1, _R2, true, true, __b>
-    {
-    private:
-      static constexpr uintmax_t __g = __static_gcd<_R1::den, _R2::den>::value;
-      static constexpr uintmax_t __d2 = _R2::den / __g;
-      typedef __big_mul<_R1::den, __d2> __d;
-      typedef __big_mul<_R1::num, _R2::den / __g> __x;
-      typedef __big_mul<_R2::num, _R1::den / __g> __y;
-      typedef __big_add<__x::__hi, __x::__lo, __y::__hi, __y::__lo> __n;
-      static_assert(__n::__hi >= __x::__hi, "Internal library error");
-      typedef __big_div<__n::__hi, __n::__lo, __g> __ng;
-      static constexpr uintmax_t __g2 = __static_gcd<__ng::__rem, __g>::value;
-      typedef __big_div<__n::__hi, __n::__lo, __g2> __n_final;
-      static_assert(__n_final::__rem == 0, "Internal library error");
-      static_assert(__n_final::__quot_hi == 0 &&
-        __n_final::__quot_lo <= __INTMAX_MAX__, "overflow in addition");
-      typedef __big_mul<_R1::den / __g2, __d2> __d_final;
-      static_assert(__d_final::__hi == 0 &&
-        __d_final::__lo <= __INTMAX_MAX__, "overflow in addition");
-    public:
-      typedef ratio<__n_final::__quot_lo, __d_final::__lo> type;
-    };
-
-  template<typename _R1, typename _R2>
-    struct __ratio_add_impl<_R1, _R2, false, true, true>
-    : __ratio_add_impl<_R2, _R1>
-    { };
-
-  // True subtraction of nonnegative numbers yielding a nonnegative result.
-  template<typename _R1, typename _R2>
-    struct __ratio_add_impl<_R1, _R2, true, false, false>
-    {
-    private:
-      static constexpr uintmax_t __g = __static_gcd<_R1::den, _R2::den>::value;
-      static constexpr uintmax_t __d2 = _R2::den / __g;
-      typedef __big_mul<_R1::den, __d2> __d;
-      typedef __big_mul<_R1::num, _R2::den / __g> __x;
-      typedef __big_mul<-_R2::num, _R1::den / __g> __y;
-      typedef __big_sub<__x::__hi, __x::__lo, __y::__hi, __y::__lo> __n;
-      typedef __big_div<__n::__hi, __n::__lo, __g> __ng;
-      static constexpr uintmax_t __g2 = __static_gcd<__ng::__rem, __g>::value;
-      typedef __big_div<__n::__hi, __n::__lo, __g2> __n_final;
-      static_assert(__n_final::__rem == 0, "Internal library error");
-      static_assert(__n_final::__quot_hi == 0 &&
-        __n_final::__quot_lo <= __INTMAX_MAX__, "overflow in addition");
-      typedef __big_mul<_R1::den / __g2, __d2> __d_final;
-      static_assert(__d_final::__hi == 0 &&
-        __d_final::__lo <= __INTMAX_MAX__, "overflow in addition");
-    public:
-      typedef ratio<__n_final::__quot_lo, __d_final::__lo> type;
-    };
-
-  template<typename _R1, typename _R2>
-    struct __ratio_add
-    {
-      typedef typename __ratio_add_impl<_R1, _R2>::type type;
-      static constexpr intmax_t num = type::num;
-      static constexpr intmax_t den = type::den;
-    };
-
-  template<typename _R1, typename _R2>
-    constexpr intmax_t __ratio_add<_R1, _R2>::num;
-
-  template<typename _R1, typename _R2>
-    constexpr intmax_t __ratio_add<_R1, _R2>::den;
-
-  /// ratio_add
-  template<typename _R1, typename _R2>
-    using ratio_add = typename __ratio_add<_R1, _R2>::type;
-
-  template<typename _R1, typename _R2>
-    struct __ratio_subtract
-    {
-      typedef typename __ratio_add<
-        _R1,
-        ratio<-_R2::num, _R2::den>>::type type;
-
-      static constexpr intmax_t num = type::num;
-      static constexpr intmax_t den = type::den;
-    };
-
-  template<typename _R1, typename _R2>
-    constexpr intmax_t __ratio_subtract<_R1, _R2>::num;
-
-  template<typename _R1, typename _R2>
-    constexpr intmax_t __ratio_subtract<_R1, _R2>::den;
-
-  /// ratio_subtract
-  template<typename _R1, typename _R2>
-    using ratio_subtract = typename __ratio_subtract<_R1, _R2>::type;
-
-
-  typedef ratio<1,       1000000000000000000> atto;
-  typedef ratio<1,          1000000000000000> femto;
-  typedef ratio<1,             1000000000000> pico;
-  typedef ratio<1,                1000000000> nano;
-  typedef ratio<1,                   1000000> micro;
-  typedef ratio<1,                      1000> milli;
-  typedef ratio<1,                       100> centi;
-  typedef ratio<1,                        10> deci;
-  typedef ratio<                       10, 1> deca;
-  typedef ratio<                      100, 1> hecto;
-  typedef ratio<                     1000, 1> kilo;
-  typedef ratio<                  1000000, 1> mega;
-  typedef ratio<               1000000000, 1> giga;
-  typedef ratio<            1000000000000, 1> tera;
-  typedef ratio<         1000000000000000, 1> peta;
-  typedef ratio<      1000000000000000000, 1> exa;
-
-  // @} group ratio
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif //_GLIBCXX_USE_C99_STDINT_TR1
-
-#endif // C++11
-
-#endif //_GLIBCXX_RATIO
diff --git a/openflow/usr/include/c++/5/regex b/openflow/usr/include/c++/5/regex
deleted file mode 100644
index 3dff372..0000000
--- a/openflow/usr/include/c++/5/regex
+++ /dev/null
@@ -1,66 +0,0 @@
-// <regex> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/regex
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_REGEX
-#define _GLIBCXX_REGEX 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <algorithm>
-#include <bitset>
-#include <functional>
-#ifdef _GLIBCXX_DEBUG
-# include <iosfwd>
-#endif
-#include <iterator>
-#include <locale>
-#include <memory>
-#include <sstream>
-#include <stack>
-#include <stdexcept>
-#include <string>
-#include <utility>
-#include <vector>
-#include <map>
-#include <cstring>
-
-#include <bits/regex_constants.h>
-#include <bits/regex_error.h>
-#include <bits/regex_automaton.h>
-#include <bits/regex_scanner.h>
-#include <bits/regex_compiler.h>
-#include <bits/regex.h>
-#include <bits/regex_executor.h>
-
-#endif // C++11
-
-#endif // _GLIBCXX_REGEX
diff --git a/openflow/usr/include/c++/5/scoped_allocator b/openflow/usr/include/c++/5/scoped_allocator
deleted file mode 100644
index d163edd..0000000
--- a/openflow/usr/include/c++/5/scoped_allocator
+++ /dev/null
@@ -1,473 +0,0 @@
-// <scoped_allocator> -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/scoped_allocator
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _SCOPED_ALLOCATOR
-#define _SCOPED_ALLOCATOR 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <utility>
-#include <tuple>
-#include <bits/alloc_traits.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<template<typename> class _Pred, typename... _Allocs>
-    struct __any_of;
-
-  template<template<typename> class _Pred, typename _Alloc, typename... _Allocs>
-    struct __any_of<_Pred, _Alloc, _Allocs...>
-    : __or_<_Pred<_Alloc>, __any_of<_Pred, _Allocs...>>
-    { };
-
-  template<template<typename> class _Pred, typename _Alloc>
-    struct __any_of<_Pred, _Alloc>
-    : _Pred<_Alloc>
-    { };
-
-  /**
-   * @addtogroup allocators
-   * @{
-   */
-
-  template<typename _Alloc>
-    struct __propagate_on_copy
-    : allocator_traits<_Alloc>::propagate_on_container_copy_assignment
-    { };
-  template<typename _Alloc>
-    struct __propagate_on_move
-    : allocator_traits<_Alloc>::propagate_on_container_move_assignment
-    { };
-  template<typename _Alloc>
-    struct __propagate_on_swap
-    : allocator_traits<_Alloc>::propagate_on_container_swap
-    { };
-
-
-  template<typename _Alloc>
-    inline auto
-    __do_outermost(_Alloc& __a, _Alloc*) -> decltype(__a.outer_allocator())
-    { return __a.outer_allocator(); }
-
-  template<typename _Alloc>
-    inline _Alloc&
-    __do_outermost(_Alloc& __a, ...)
-    { return __a; }
-
-  // TODO: make recursive (see note in 20.12.4/1)
-  template<typename _Alloc>
-    inline auto
-    __outermost(_Alloc& __a) -> decltype(__do_outermost(__a, &__a))
-    { return __do_outermost(__a, &__a); }
-
-  template<typename _OuterAlloc, typename... _InnerAllocs>
-    class scoped_allocator_adaptor;
-
-  template<typename...> 
-    struct __inner_type_impl;
-
-  template<typename _Outer>
-    struct __inner_type_impl<_Outer>
-    {
-      typedef scoped_allocator_adaptor<_Outer> __type;
-
-      __inner_type_impl() = default;
-      __inner_type_impl(const __inner_type_impl&) = default;
-      __inner_type_impl(__inner_type_impl&&) = default;
-      __inner_type_impl& operator=(const __inner_type_impl&) = default;
-      __inner_type_impl& operator=(__inner_type_impl&&) = default;
-      
-      template<typename _Alloc>
-      __inner_type_impl(const __inner_type_impl<_Alloc>& __other)
-      { }
-      
-      template<typename _Alloc>
-      __inner_type_impl(__inner_type_impl<_Alloc>&& __other)
-      { }
-      
-      __type& 
-      _M_get(__type* __p) noexcept { return *__p; }
-
-      const __type& 
-      _M_get(const __type* __p) const noexcept { return *__p; }
-      
-      tuple<> 
-      _M_tie() const noexcept { return tuple<>(); }
-      
-      bool 
-      operator==(const __inner_type_impl&) const noexcept
-      { return true; }
-    };
-
-  template<typename _Outer, typename _InnerHead, typename... _InnerTail>
-    struct __inner_type_impl<_Outer, _InnerHead, _InnerTail...>
-    {
-      typedef scoped_allocator_adaptor<_InnerHead, _InnerTail...> __type;
-      
-      __inner_type_impl() = default;
-      __inner_type_impl(const __inner_type_impl&) = default;
-      __inner_type_impl(__inner_type_impl&&) = default;
-      __inner_type_impl& operator=(const __inner_type_impl&) = default;
-      __inner_type_impl& operator=(__inner_type_impl&&) = default;
-      
-      template<typename... _Allocs>
-      __inner_type_impl(const __inner_type_impl<_Allocs...>& __other)
-      : _M_inner(__other._M_inner) { }
-      
-      template<typename... _Allocs>
-      __inner_type_impl(__inner_type_impl<_Allocs...>&& __other)
-      : _M_inner(std::move(__other._M_inner)) { }
-
-    template<typename... _Args>
-      explicit
-      __inner_type_impl(_Args&&... __args)
-      : _M_inner(std::forward<_Args>(__args)...) { }
-
-      __type& 
-      _M_get(void*) noexcept { return _M_inner; }
-      
-      const __type& 
-      _M_get(const void*) const noexcept { return _M_inner; }
-      
-      tuple<const _InnerHead&, const _InnerTail&...> 
-      _M_tie() const noexcept
-      { return _M_inner._M_tie(); }
-      
-      bool 
-      operator==(const __inner_type_impl& __other) const noexcept
-      { return _M_inner == __other._M_inner; }
-      
-    private:
-      template<typename...> friend class __inner_type_impl;
-      template<typename, typename...> friend class scoped_allocator_adaptor;
-      
-      __type _M_inner;
-    };
-
-  /// Primary class template.
-  template<typename _OuterAlloc, typename... _InnerAllocs>
-    class scoped_allocator_adaptor
-    : public _OuterAlloc
-    {
-      typedef allocator_traits<_OuterAlloc> __traits;
-
-      typedef __inner_type_impl<_OuterAlloc, _InnerAllocs...> __inner_type;
-      __inner_type _M_inner;
-
-      template<typename _Outer, typename... _Inner>
-        friend class scoped_allocator_adaptor;
-
-      template<typename...>
-        friend class __inner_type_impl;
-
-      tuple<const _OuterAlloc&, const _InnerAllocs&...>
-      _M_tie() const noexcept
-      { return std::tuple_cat(std::tie(outer_allocator()), _M_inner._M_tie()); }
-
-      template<typename _Alloc>
-	using __outermost_type = typename
-	  std::decay<decltype(__outermost(std::declval<_Alloc&>()))>::type;
-
-      template<typename _Alloc>
-	using __outermost_alloc_traits
-	  = allocator_traits<__outermost_type<_Alloc>>;
-      
-      template<typename _Tp, typename... _Args>
-        void 
-        _M_construct(__uses_alloc0, _Tp* __p, _Args&&... __args)
-        {
-	  typedef __outermost_alloc_traits<scoped_allocator_adaptor> _O_traits;
-	  _O_traits::construct(__outermost(*this), __p,
-			       std::forward<_Args>(__args)...);
-        }
-
-      typedef __uses_alloc1<typename __inner_type::__type> __uses_alloc1_;
-      typedef __uses_alloc2<typename __inner_type::__type> __uses_alloc2_;
-
-      template<typename _Tp, typename... _Args>
-        void 
-        _M_construct(__uses_alloc1_, _Tp* __p, _Args&&... __args)
-        {
-	  typedef __outermost_alloc_traits<scoped_allocator_adaptor> _O_traits;
-	  _O_traits::construct(__outermost(*this), __p,
-			       allocator_arg, inner_allocator(),
-			       std::forward<_Args>(__args)...);
-        }
-
-      template<typename _Tp, typename... _Args>
-        void 
-        _M_construct(__uses_alloc2_, _Tp* __p, _Args&&... __args)
-        {
-	  typedef __outermost_alloc_traits<scoped_allocator_adaptor> _O_traits;
-	  _O_traits::construct(__outermost(*this), __p,
-			       std::forward<_Args>(__args)...,
-			       inner_allocator());
-        }
-
-      template<typename _Alloc>
-        static _Alloc
-        _S_select_on_copy(const _Alloc& __a)
-        {
-          typedef allocator_traits<_Alloc> __a_traits;
-          return __a_traits::select_on_container_copy_construction(__a);
-        }
-
-      template<std::size_t... _Indices>
-        scoped_allocator_adaptor(tuple<const _OuterAlloc&,
-                                       const _InnerAllocs&...> __refs,
-                                 _Index_tuple<_Indices...>)
-        : _OuterAlloc(_S_select_on_copy(std::get<0>(__refs))),
-          _M_inner(_S_select_on_copy(std::get<_Indices+1>(__refs))...)
-        { }
-
-    public:
-      typedef _OuterAlloc                       outer_allocator_type;
-      typedef typename __inner_type::__type     inner_allocator_type;
-
-      typedef typename __traits::value_type             value_type;
-      typedef typename __traits::size_type              size_type;
-      typedef typename __traits::difference_type        difference_type;
-      typedef typename __traits::pointer                pointer;
-      typedef typename __traits::const_pointer          const_pointer;
-      typedef typename __traits::void_pointer           void_pointer;
-      typedef typename __traits::const_void_pointer     const_void_pointer;
-
-      typedef typename conditional<
-        __any_of<__propagate_on_copy, _OuterAlloc, _InnerAllocs...>::value,
-        true_type, false_type>::type propagate_on_container_copy_assignment;
-      typedef typename conditional<
-        __any_of<__propagate_on_move, _OuterAlloc, _InnerAllocs...>::value,
-        true_type, false_type>::type propagate_on_container_move_assignment;
-      typedef typename conditional<
-        __any_of<__propagate_on_swap, _OuterAlloc, _InnerAllocs...>::value,
-        true_type, false_type>::type propagate_on_container_swap;
-
-      template <class _Tp>
-        struct rebind
-        {
-          typedef scoped_allocator_adaptor<
-            typename __traits::template rebind_alloc<_Tp>,
-            _InnerAllocs...> other;
-        };
-
-      scoped_allocator_adaptor() : _OuterAlloc(), _M_inner() { }
-
-      template<typename _Outer2>
-        scoped_allocator_adaptor(_Outer2&& __outer,
-                                 const _InnerAllocs&... __inner)
-        : _OuterAlloc(std::forward<_Outer2>(__outer)),
-          _M_inner(__inner...)
-        { }
-
-      scoped_allocator_adaptor(const scoped_allocator_adaptor& __other)
-      : _OuterAlloc(__other.outer_allocator()),
-	_M_inner(__other._M_inner)
-      { }
-
-      scoped_allocator_adaptor(scoped_allocator_adaptor&& __other)
-      : _OuterAlloc(std::move(__other.outer_allocator())),
-	_M_inner(std::move(__other._M_inner))
-      { }
-
-      template<typename _Outer2>
-        scoped_allocator_adaptor(
-            const scoped_allocator_adaptor<_Outer2, _InnerAllocs...>& __other)
-        : _OuterAlloc(__other.outer_allocator()),
-          _M_inner(__other._M_inner)
-        { }
-
-      template<typename _Outer2>
-        scoped_allocator_adaptor(
-            scoped_allocator_adaptor<_Outer2, _InnerAllocs...>&& __other)
-        : _OuterAlloc(std::move(__other.outer_allocator())),
-          _M_inner(std::move(__other._M_inner))
-        { }
-
-      scoped_allocator_adaptor&
-      operator=(const scoped_allocator_adaptor&) = default;
-
-      scoped_allocator_adaptor&
-      operator=(scoped_allocator_adaptor&&) = default;
-
-      inner_allocator_type& inner_allocator() noexcept
-      { return _M_inner._M_get(this); }
-
-      const inner_allocator_type& inner_allocator() const noexcept
-      { return _M_inner._M_get(this); }
-
-      outer_allocator_type& outer_allocator() noexcept
-      { return static_cast<_OuterAlloc&>(*this); }
-
-      const outer_allocator_type& outer_allocator() const noexcept
-      { return static_cast<const _OuterAlloc&>(*this); }
-
-      pointer allocate(size_type __n)
-      { return __traits::allocate(outer_allocator(), __n); }
-
-      pointer allocate(size_type __n, const_void_pointer __hint)
-      { return __traits::allocate(outer_allocator(), __n, __hint); }
-
-      void deallocate(pointer __p, size_type __n)
-      { return __traits::deallocate(outer_allocator(), __p, __n); }
-
-      size_type max_size() const
-      { return __traits::max_size(outer_allocator()); }
-
-      template<typename _Tp, typename... _Args>
-        void construct(_Tp* __p, _Args&&... __args)
-        {
-          auto& __inner = inner_allocator();
-          auto __use_tag
-            = __use_alloc<_Tp, inner_allocator_type, _Args...>(__inner);
-          _M_construct(__use_tag, __p, std::forward<_Args>(__args)...);
-        }
-
-      template<typename _T1, typename _T2, typename... _Args1,
-	       typename... _Args2>
-	void
-	construct(pair<_T1, _T2>* __p, piecewise_construct_t,
-		  tuple<_Args1...> __x, tuple<_Args2...> __y)
-	{
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 2203.  wrong argument types for piecewise construction
-	  auto& __inner = inner_allocator();
-	  auto __x_use_tag
-	    = __use_alloc<_T1, inner_allocator_type, _Args1...>(__inner);
-	  auto __y_use_tag
-	    = __use_alloc<_T2, inner_allocator_type, _Args2...>(__inner);
-	  typedef __outermost_alloc_traits<scoped_allocator_adaptor> _O_traits;
-	  _O_traits::construct(__outermost(*this), __p, piecewise_construct,
-			       _M_construct_p(__x_use_tag, __x),
-			       _M_construct_p(__y_use_tag, __y));
-	}
-
-      template<typename _T1, typename _T2>
-	void
-	construct(pair<_T1, _T2>* __p)
-	{ construct(__p, piecewise_construct, tuple<>(), tuple<>()); }
-
-      template<typename _T1, typename _T2, typename _Up, typename _Vp>
-	void
-	construct(pair<_T1, _T2>* __p, _Up&& __u, _Vp&& __v)
-	{
-	  construct(__p, piecewise_construct,
-		    std::forward_as_tuple(std::forward<_Up>(__u)),
-		    std::forward_as_tuple(std::forward<_Vp>(__v)));
-	}
-
-      template<typename _T1, typename _T2, typename _Up, typename _Vp>
-	void
-	construct(pair<_T1, _T2>* __p, const pair<_Up, _Vp>& __x)
-	{
-	  construct(__p, piecewise_construct,
-		    std::forward_as_tuple(__x.first),
-		    std::forward_as_tuple(__x.second));
-	}
-
-      template<typename _T1, typename _T2, typename _Up, typename _Vp>
-	void
-	construct(pair<_T1, _T2>* __p, pair<_Up, _Vp>&& __x)
-	{
-	  construct(__p, piecewise_construct,
-		    std::forward_as_tuple(std::forward<_Up>(__x.first)),
-		    std::forward_as_tuple(std::forward<_Vp>(__x.second)));
-	}
-
-      template<typename _Tp>
-        void destroy(_Tp* __p)
-        {
-	  typedef __outermost_alloc_traits<scoped_allocator_adaptor> _O_traits;
-	  _O_traits::destroy(__outermost(*this), __p);
-	}
-
-      scoped_allocator_adaptor
-      select_on_container_copy_construction() const
-      {
-        typedef typename _Build_index_tuple<sizeof...(_InnerAllocs)>::__type
-	    _Indices;
-        return scoped_allocator_adaptor(_M_tie(), _Indices());
-      }
-
-      template <typename _OutA1, typename _OutA2, typename... _InA>
-      friend bool
-      operator==(const scoped_allocator_adaptor<_OutA1, _InA...>& __a,
-                 const scoped_allocator_adaptor<_OutA2, _InA...>& __b) noexcept;
-
-    private:
-      template<typename _Tuple>
-	_Tuple&&
-	_M_construct_p(__uses_alloc0, _Tuple& __t)
-	{ return std::move(__t); }
-
-      template<typename... _Args>
-	std::tuple<allocator_arg_t, inner_allocator_type&, _Args...>
-	_M_construct_p(__uses_alloc1_, std::tuple<_Args...>& __t)
-	{
-	  typedef std::tuple<allocator_arg_t, inner_allocator_type&> _Tuple;
-	  return std::tuple_cat(_Tuple(allocator_arg, inner_allocator()),
-				std::move(__t));
-	}
-
-      template<typename... _Args>
-	std::tuple<_Args..., inner_allocator_type&>
-	_M_construct_p(__uses_alloc2_, std::tuple<_Args...>& __t)
-	{
-	  typedef std::tuple<inner_allocator_type&> _Tuple;
-	  return std::tuple_cat(std::move(__t), _Tuple(inner_allocator()));
-	}
-    };
-
-  template <typename _OutA1, typename _OutA2, typename... _InA>
-    inline bool
-    operator==(const scoped_allocator_adaptor<_OutA1, _InA...>& __a,
-               const scoped_allocator_adaptor<_OutA2, _InA...>& __b) noexcept
-    {
-      return __a.outer_allocator() == __b.outer_allocator()
-          && __a._M_inner == __b._M_inner;
-    }
-
-  template <typename _OutA1, typename _OutA2, typename... _InA>
-    inline bool
-    operator!=(const scoped_allocator_adaptor<_OutA1, _InA...>& __a,
-               const scoped_allocator_adaptor<_OutA2, _InA...>& __b) noexcept
-    { return !(__a == __b); }
-
-  /// @}
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // C++11
-
-#endif // _SCOPED_ALLOCATOR
diff --git a/openflow/usr/include/c++/5/set b/openflow/usr/include/c++/5/set
deleted file mode 100644
index 1340c6d..0000000
--- a/openflow/usr/include/c++/5/set
+++ /dev/null
@@ -1,73 +0,0 @@
-// <set> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/set
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_SET
-#define _GLIBCXX_SET 1
-
-#pragma GCC system_header
-
-#include <bits/stl_tree.h>
-#include <bits/stl_set.h>
-#include <bits/stl_multiset.h>
-#include <bits/range_access.h>
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/set>
-#endif
-
-#ifdef _GLIBCXX_PROFILE
-# include <profile/set>
-#endif
-
-#endif /* _GLIBCXX_SET */
diff --git a/openflow/usr/include/c++/5/shared_mutex b/openflow/usr/include/c++/5/shared_mutex
deleted file mode 100644
index 7b216a5..0000000
--- a/openflow/usr/include/c++/5/shared_mutex
+++ /dev/null
@@ -1,607 +0,0 @@
-// <shared_mutex> -*- C++ -*-
-
-// Copyright (C) 2013-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/shared_mutex
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_SHARED_MUTEX
-#define _GLIBCXX_SHARED_MUTEX 1
-
-#pragma GCC system_header
-
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
-
-#include <bits/c++config.h>
-#include <mutex>
-#include <condition_variable>
-#include <bits/functexcept.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @ingroup mutexes
-   * @{
-   */
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-#ifdef _GLIBCXX_HAS_GTHREADS
-
-#define __cpp_lib_shared_timed_mutex 201402
-
-  /// shared_timed_mutex
-  class shared_timed_mutex
-  {
-#if _GLIBCXX_USE_PTHREAD_RWLOCK_T && _GTHREAD_USE_MUTEX_TIMEDLOCK
-    typedef chrono::system_clock	__clock_t;
-
-#ifdef PTHREAD_RWLOCK_INITIALIZER
-    pthread_rwlock_t	_M_rwlock = PTHREAD_RWLOCK_INITIALIZER;
-
-  public:
-    shared_timed_mutex() = default;
-    ~shared_timed_mutex() = default;
-#else
-    pthread_rwlock_t	_M_rwlock;
-
-  public:
-    shared_timed_mutex()
-    {
-      int __ret = pthread_rwlock_init(&_M_rwlock, NULL);
-      if (__ret == ENOMEM)
-	__throw_bad_alloc();
-      else if (__ret == EAGAIN)
-	__throw_system_error(int(errc::resource_unavailable_try_again));
-      else if (__ret == EPERM)
-	__throw_system_error(int(errc::operation_not_permitted));
-      // Errors not handled: EBUSY, EINVAL
-      _GLIBCXX_DEBUG_ASSERT(__ret == 0);
-    }
-
-    ~shared_timed_mutex()
-    {
-      int __ret __attribute((__unused__)) = pthread_rwlock_destroy(&_M_rwlock);
-      // Errors not handled: EBUSY, EINVAL
-      _GLIBCXX_DEBUG_ASSERT(__ret == 0);
-    }
-#endif
-
-    shared_timed_mutex(const shared_timed_mutex&) = delete;
-    shared_timed_mutex& operator=(const shared_timed_mutex&) = delete;
-
-    // Exclusive ownership
-
-    void
-    lock()
-    {
-      int __ret = pthread_rwlock_wrlock(&_M_rwlock);
-      if (__ret == EDEADLK)
-	__throw_system_error(int(errc::resource_deadlock_would_occur));
-      // Errors not handled: EINVAL
-      _GLIBCXX_DEBUG_ASSERT(__ret == 0);
-    }
-
-    bool
-    try_lock()
-    {
-      int __ret = pthread_rwlock_trywrlock(&_M_rwlock);
-      if (__ret == EBUSY) return false;
-      // Errors not handled: EINVAL
-      _GLIBCXX_DEBUG_ASSERT(__ret == 0);
-      return true;
-    }
-
-    template<typename _Rep, typename _Period>
-      bool
-      try_lock_for(const chrono::duration<_Rep, _Period>& __rel_time)
-      {
-	return try_lock_until(__clock_t::now() + __rel_time);
-      }
-
-    template<typename _Duration>
-      bool
-      try_lock_until(const chrono::time_point<__clock_t, _Duration>& __atime)
-      {
-	auto __s = chrono::time_point_cast<chrono::seconds>(__atime);
-	auto __ns = chrono::duration_cast<chrono::nanoseconds>(__atime - __s);
-
-	__gthread_time_t __ts =
-	  {
-	    static_cast<std::time_t>(__s.time_since_epoch().count()),
-	    static_cast<long>(__ns.count())
-	  };
-
-	int __ret = pthread_rwlock_timedwrlock(&_M_rwlock, &__ts);
-	// On self-deadlock, we just fail to acquire the lock.  Technically,
-	// the program violated the precondition.
-	if (__ret == ETIMEDOUT || __ret == EDEADLK)
-	  return false;
-	// Errors not handled: EINVAL
-	_GLIBCXX_DEBUG_ASSERT(__ret == 0);
-	return true;
-      }
-
-    template<typename _Clock, typename _Duration>
-      bool
-      try_lock_until(const chrono::time_point<_Clock, _Duration>& __abs_time)
-      {
-	// DR 887 - Sync unknown clock to known clock.
-	const typename _Clock::time_point __c_entry = _Clock::now();
-	const __clock_t::time_point __s_entry = __clock_t::now();
-	const auto __delta = __abs_time - __c_entry;
-	const auto __s_atime = __s_entry + __delta;
-	return try_lock_until(__s_atime);
-      }
-
-    void
-    unlock()
-    {
-      int __ret __attribute((__unused__)) = pthread_rwlock_unlock(&_M_rwlock);
-      // Errors not handled: EPERM, EBUSY, EINVAL
-      _GLIBCXX_DEBUG_ASSERT(__ret == 0);
-    }
-
-    // Shared ownership
-
-    void
-    lock_shared()
-    {
-      int __ret;
-      // We retry if we exceeded the maximum number of read locks supported by
-      // the POSIX implementation; this can result in busy-waiting, but this
-      // is okay based on the current specification of forward progress
-      // guarantees by the standard.
-      do
-	__ret = pthread_rwlock_rdlock(&_M_rwlock);
-      while (__ret == EAGAIN);
-      if (__ret == EDEADLK)
-	__throw_system_error(int(errc::resource_deadlock_would_occur));
-      // Errors not handled: EINVAL
-      _GLIBCXX_DEBUG_ASSERT(__ret == 0);
-    }
-
-    bool
-    try_lock_shared()
-    {
-      int __ret = pthread_rwlock_tryrdlock(&_M_rwlock);
-      // If the maximum number of read locks has been exceeded, we just fail
-      // to acquire the lock.  Unlike for lock(), we are not allowed to throw
-      // an exception.
-      if (__ret == EBUSY || __ret == EAGAIN) return false;
-      // Errors not handled: EINVAL
-      _GLIBCXX_DEBUG_ASSERT(__ret == 0);
-      return true;
-    }
-
-    template<typename _Rep, typename _Period>
-      bool
-      try_lock_shared_for(const chrono::duration<_Rep, _Period>& __rel_time)
-      {
-	return try_lock_shared_until(__clock_t::now() + __rel_time);
-      }
-
-    template<typename _Duration>
-      bool
-      try_lock_shared_until(const chrono::time_point<__clock_t,
-			    _Duration>& __atime)
-      {
-	auto __s = chrono::time_point_cast<chrono::seconds>(__atime);
-	auto __ns = chrono::duration_cast<chrono::nanoseconds>(__atime - __s);
-
-	__gthread_time_t __ts =
-	  {
-	    static_cast<std::time_t>(__s.time_since_epoch().count()),
-	    static_cast<long>(__ns.count())
-	  };
-
-	int __ret;
-	// Unlike for lock(), we are not allowed to throw an exception so if
-	// the maximum number of read locks has been exceeded, or we would
-	// deadlock, we just try to acquire the lock again (and will time out
-	// eventually). 
-	// In cases where we would exceed the maximum number of read locks
-	// throughout the whole time until the timeout, we will fail to
-	// acquire the lock even if it would be logically free; however, this
-	// is allowed by the standard, and we made a "strong effort"
-	// (see C++14 30.4.1.4p26).
-	// For cases where the implementation detects a deadlock we
-	// intentionally block and timeout so that an early return isn't
-	// mistaken for a spurious failure, which might help users realise
-	// there is a deadlock.
-	do
-	  __ret = pthread_rwlock_timedrdlock(&_M_rwlock, &__ts);
-	while (__ret == EAGAIN || __ret == EDEADLK);
-	if (__ret == ETIMEDOUT)
-	  return false;
-	// Errors not handled: EINVAL
-	_GLIBCXX_DEBUG_ASSERT(__ret == 0);
-	return true;
-      }
-
-    template<typename _Clock, typename _Duration>
-      bool
-      try_lock_shared_until(const chrono::time_point<_Clock,
-			    _Duration>& __abs_time)
-      {
-	// DR 887 - Sync unknown clock to known clock.
-	const typename _Clock::time_point __c_entry = _Clock::now();
-	const __clock_t::time_point __s_entry = __clock_t::now();
-	const auto __delta = __abs_time - __c_entry;
-	const auto __s_atime = __s_entry + __delta;
-	return try_lock_shared_until(__s_atime);
-      }
-
-    void
-    unlock_shared()
-    {
-      unlock();
-    }
-
-#else // ! (_GLIBCXX_USE_PTHREAD_RWLOCK_T && _GTHREAD_USE_MUTEX_TIMEDLOCK)
-
-    // Must use the same clock as condition_variable
-    typedef chrono::system_clock	__clock_t;
-
-    // Based on Howard Hinnant's reference implementation from N2406.
-
-    // The high bit of _M_state is the write-entered flag which is set to
-    // indicate a writer has taken the lock or is queuing to take the lock.
-    // The remaining bits are the count of reader locks.
-    //
-    // To take a reader lock, block on gate1 while the write-entered flag is
-    // set or the maximum number of reader locks is held, then increment the
-    // reader lock count.
-    // To release, decrement the count, then if the write-entered flag is set
-    // and the count is zero then signal gate2 to wake a queued writer,
-    // otherwise if the maximum number of reader locks was held signal gate1
-    // to wake a reader.
-    //
-    // To take a writer lock, block on gate1 while the write-entered flag is
-    // set, then set the write-entered flag to start queueing, then block on
-    // gate2 while the number of reader locks is non-zero.
-    // To release, unset the write-entered flag and signal gate1 to wake all
-    // blocked readers and writers.
-    //
-    // This means that when no reader locks are held readers and writers get
-    // equal priority. When one or more reader locks is held a writer gets
-    // priority and no more reader locks can be taken while the writer is
-    // queued.
-
-    // Only locked when accessing _M_state or waiting on condition variables.
-    mutex		_M_mut;
-    // Used to block while write-entered is set or reader count at maximum.
-    condition_variable	_M_gate1;
-    // Used to block queued writers while reader count is non-zero.
-    condition_variable	_M_gate2;
-    // The write-entered flag and reader count.
-    unsigned		_M_state;
-
-    static constexpr unsigned _S_write_entered
-      = 1U << (sizeof(unsigned)*__CHAR_BIT__ - 1);
-    static constexpr unsigned _S_max_readers = ~_S_write_entered;
-
-    // Test whether the write-entered flag is set. _M_mut must be locked.
-    bool _M_write_entered() const { return _M_state & _S_write_entered; }
-
-    // The number of reader locks currently held. _M_mut must be locked.
-    unsigned _M_readers() const { return _M_state & _S_max_readers; }
-
-  public:
-    shared_timed_mutex() : _M_state(0) {}
-
-    ~shared_timed_mutex()
-    {
-      _GLIBCXX_DEBUG_ASSERT( _M_state == 0 );
-    }
-
-    shared_timed_mutex(const shared_timed_mutex&) = delete;
-    shared_timed_mutex& operator=(const shared_timed_mutex&) = delete;
-
-    // Exclusive ownership
-
-    void
-    lock()
-    {
-      unique_lock<mutex> __lk(_M_mut);
-      // Wait until we can set the write-entered flag.
-      _M_gate1.wait(__lk, [=]{ return !_M_write_entered(); });
-      _M_state |= _S_write_entered;
-      // Then wait until there are no more readers.
-      _M_gate2.wait(__lk, [=]{ return _M_readers() == 0; });
-    }
-
-    bool
-    try_lock()
-    {
-      unique_lock<mutex> __lk(_M_mut, try_to_lock);
-      if (__lk.owns_lock() && _M_state == 0)
-	{
-	  _M_state = _S_write_entered;
-	  return true;
-	}
-      return false;
-    }
-
-    template<typename _Rep, typename _Period>
-      bool
-      try_lock_for(const chrono::duration<_Rep, _Period>& __rel_time)
-      {
-	return try_lock_until(__clock_t::now() + __rel_time);
-      }
-
-    template<typename _Clock, typename _Duration>
-      bool
-      try_lock_until(const chrono::time_point<_Clock, _Duration>& __abs_time)
-      {
-	unique_lock<mutex> __lk(_M_mut);
-	if (!_M_gate1.wait_until(__lk, __abs_time,
-				 [=]{ return !_M_write_entered(); }))
-	  {
-	    return false;
-	  }
-	_M_state |= _S_write_entered;
-	if (!_M_gate2.wait_until(__lk, __abs_time,
-				 [=]{ return _M_readers() == 0; }))
-	  {
-	    _M_state ^= _S_write_entered;
-	    // Wake all threads blocked while the write-entered flag was set.
-	    _M_gate1.notify_all();
-	    return false;
-	  }
-	return true;
-      }
-
-    void
-    unlock()
-    {
-      lock_guard<mutex> __lk(_M_mut);
-      _GLIBCXX_DEBUG_ASSERT( _M_write_entered() );
-      _M_state = 0;
-      // call notify_all() while mutex is held so that another thread can't
-      // lock and unlock the mutex then destroy *this before we make the call.
-      _M_gate1.notify_all();
-    }
-
-    // Shared ownership
-
-    void
-    lock_shared()
-    {
-      unique_lock<mutex> __lk(_M_mut);
-      _M_gate1.wait(__lk, [=]{ return _M_state < _S_max_readers; });
-      ++_M_state;
-    }
-
-    bool
-    try_lock_shared()
-    {
-      unique_lock<mutex> __lk(_M_mut, try_to_lock);
-      if (!__lk.owns_lock())
-	return false;
-      if (_M_state < _S_max_readers)
-	{
-	  ++_M_state;
-	  return true;
-	}
-      return false;
-    }
-
-    template<typename _Rep, typename _Period>
-      bool
-      try_lock_shared_for(const chrono::duration<_Rep, _Period>& __rel_time)
-      {
-	return try_lock_shared_until(__clock_t::now() + __rel_time);
-      }
-
-    template <typename _Clock, typename _Duration>
-      bool
-      try_lock_shared_until(const chrono::time_point<_Clock,
-						     _Duration>& __abs_time)
-      {
-	unique_lock<mutex> __lk(_M_mut);
-	if (!_M_gate1.wait_until(__lk, __abs_time,
-				 [=]{ return _M_state < _S_max_readers; }))
-	  {
-	    return false;
-	  }
-	++_M_state;
-	return true;
-      }
-
-    void
-    unlock_shared()
-    {
-      lock_guard<mutex> __lk(_M_mut);
-      _GLIBCXX_DEBUG_ASSERT( _M_readers() > 0 );
-      auto __prev = _M_state--;
-      if (_M_write_entered())
-	{
-	  // Wake the queued writer if there are no more readers.
-	  if (_M_readers() == 0)
-	    _M_gate2.notify_one();
-	  // No need to notify gate1 because we give priority to the queued
-	  // writer, and that writer will eventually notify gate1 after it
-	  // clears the write-entered flag.
-	}
-      else
-	{
-	  // Wake any thread that was blocked on reader overflow.
-	  if (__prev == _S_max_readers)
-	    _M_gate1.notify_one();
-	}
-    }
-#endif // _GLIBCXX_USE_PTHREAD_RWLOCK_T && _GTHREAD_USE_MUTEX_TIMEDLOCK
-  };
-#endif // _GLIBCXX_HAS_GTHREADS
-
-  /// shared_lock
-  template<typename _Mutex>
-    class shared_lock
-    {
-    public:
-      typedef _Mutex mutex_type;
-
-      // Shared locking
-
-      shared_lock() noexcept : _M_pm(nullptr), _M_owns(false) { }
-
-      explicit
-      shared_lock(mutex_type& __m) : _M_pm(&__m), _M_owns(true)
-      { __m.lock_shared(); }
-
-      shared_lock(mutex_type& __m, defer_lock_t) noexcept
-      : _M_pm(&__m), _M_owns(false) { }
-
-      shared_lock(mutex_type& __m, try_to_lock_t)
-      : _M_pm(&__m), _M_owns(__m.try_lock_shared()) { }
-
-      shared_lock(mutex_type& __m, adopt_lock_t)
-      : _M_pm(&__m), _M_owns(true) { }
-
-      template<typename _Clock, typename _Duration>
-	shared_lock(mutex_type& __m,
-		    const chrono::time_point<_Clock, _Duration>& __abs_time)
-      : _M_pm(&__m), _M_owns(__m.try_lock_shared_until(__abs_time)) { }
-
-      template<typename _Rep, typename _Period>
-	shared_lock(mutex_type& __m,
-		    const chrono::duration<_Rep, _Period>& __rel_time)
-      : _M_pm(&__m), _M_owns(__m.try_lock_shared_for(__rel_time)) { }
-
-      ~shared_lock()
-      {
-	if (_M_owns)
-	  _M_pm->unlock_shared();
-      }
-
-      shared_lock(shared_lock const&) = delete;
-      shared_lock& operator=(shared_lock const&) = delete;
-
-      shared_lock(shared_lock&& __sl) noexcept : shared_lock()
-      { swap(__sl); }
-
-      shared_lock&
-      operator=(shared_lock&& __sl) noexcept
-      {
-	shared_lock(std::move(__sl)).swap(*this);
-	return *this;
-      }
-
-      void
-      lock()
-      {
-	_M_lockable();
-	_M_pm->lock_shared();
-	_M_owns = true;
-      }
-
-      bool
-      try_lock()
-      {
-	_M_lockable();
-	return _M_owns = _M_pm->try_lock_shared();
-      }
-
-      template<typename _Rep, typename _Period>
-	bool
-	try_lock_for(const chrono::duration<_Rep, _Period>& __rel_time)
-	{
-	  _M_lockable();
-	  return _M_owns = _M_pm->try_lock_shared_for(__rel_time);
-	}
-
-      template<typename _Clock, typename _Duration>
-	bool
-	try_lock_until(const chrono::time_point<_Clock, _Duration>& __abs_time)
-	{
-	  _M_lockable();
-	  return _M_owns = _M_pm->try_lock_shared_until(__abs_time);
-	}
-
-      void
-      unlock()
-      {
-	if (!_M_owns)
-	  __throw_system_error(int(errc::resource_deadlock_would_occur));
-	_M_pm->unlock_shared();
-	_M_owns = false;
-      }
-
-      // Setters
-
-      void
-      swap(shared_lock& __u) noexcept
-      {
-	std::swap(_M_pm, __u._M_pm);
-	std::swap(_M_owns, __u._M_owns);
-      }
-
-      mutex_type*
-      release() noexcept
-      {
-	_M_owns = false;
-	return std::exchange(_M_pm, nullptr);
-      }
-
-      // Getters
-
-      bool owns_lock() const noexcept { return _M_owns; }
-
-      explicit operator bool() const noexcept { return _M_owns; }
-
-      mutex_type* mutex() const noexcept { return _M_pm; }
-
-    private:
-      void
-      _M_lockable() const
-      {
-	if (_M_pm == nullptr)
-	  __throw_system_error(int(errc::operation_not_permitted));
-	if (_M_owns)
-	  __throw_system_error(int(errc::resource_deadlock_would_occur));
-      }
-
-      mutex_type*	_M_pm;
-      bool		_M_owns;
-    };
-
-  /// Swap specialization for shared_lock
-  template<typename _Mutex>
-    void
-    swap(shared_lock<_Mutex>& __x, shared_lock<_Mutex>& __y) noexcept
-    { __x.swap(__y); }
-
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
-
-  // @} group mutexes
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // C++14
-
-#endif // _GLIBCXX_SHARED_MUTEX
diff --git a/openflow/usr/include/c++/5/sstream b/openflow/usr/include/c++/5/sstream
deleted file mode 100644
index aa4a71a..0000000
--- a/openflow/usr/include/c++/5/sstream
+++ /dev/null
@@ -1,815 +0,0 @@
-// String based streams -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/sstream
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 14882: 27.7  String-based streams
-//
-
-#ifndef _GLIBCXX_SSTREAM
-#define _GLIBCXX_SSTREAM 1
-
-#pragma GCC system_header
-
-#include <istream>
-#include <ostream>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-
-  // [27.7.1] template class basic_stringbuf
-  /**
-   *  @brief  The actual work of input and output (for std::string).
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_CharT>.
-   *
-   *  This class associates either or both of its input and output sequences
-   *  with a sequence of characters, which can be initialized from, or made
-   *  available as, a @c std::basic_string.  (Paraphrased from [27.7.1]/1.)
-   *
-   *  For this class, open modes (of type @c ios_base::openmode) have
-   *  @c in set if the input sequence can be read, and @c out set if the
-   *  output sequence can be written.
-  */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    class basic_stringbuf : public basic_streambuf<_CharT, _Traits>
-    {
-      struct __xfer_bufptrs;
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      typedef basic_streambuf<char_type, traits_type>  	__streambuf_type;
-      typedef basic_string<char_type, _Traits, _Alloc> 	__string_type;
-      typedef typename __string_type::size_type		__size_type;
-
-    protected:
-      /// Place to stash in || out || in | out settings for current stringbuf.
-      ios_base::openmode 	_M_mode;
-
-      // Data Members:
-      __string_type 		_M_string;
-
-    public:
-      // Constructors:
-      /**
-       *  @brief  Starts with an empty string buffer.
-       *  @param  __mode  Whether the buffer can read, or write, or both.
-       *
-       *  The default constructor initializes the parent class using its
-       *  own default ctor.
-      */
-      explicit
-      basic_stringbuf(ios_base::openmode __mode = ios_base::in | ios_base::out)
-      : __streambuf_type(), _M_mode(__mode), _M_string()
-      { }
-
-      /**
-       *  @brief  Starts with an existing string buffer.
-       *  @param  __str  A string to copy as a starting buffer.
-       *  @param  __mode  Whether the buffer can read, or write, or both.
-       *
-       *  This constructor initializes the parent class using its
-       *  own default ctor.
-      */
-      explicit
-      basic_stringbuf(const __string_type& __str,
-		      ios_base::openmode __mode = ios_base::in | ios_base::out)
-      : __streambuf_type(), _M_mode(), _M_string(__str.data(), __str.size())
-      { _M_stringbuf_init(__mode); }
-
-#if __cplusplus >= 201103L
-      basic_stringbuf(const basic_stringbuf&) = delete;
-
-      basic_stringbuf(basic_stringbuf&& __rhs)
-      : basic_stringbuf(std::move(__rhs), __xfer_bufptrs(__rhs, this))
-      { __rhs._M_sync(const_cast<char_type*>(__rhs._M_string.data()), 0, 0); }
-
-      // 27.8.2.2 Assign and swap:
-
-      basic_stringbuf&
-      operator=(const basic_stringbuf&) = delete;
-
-      basic_stringbuf&
-      operator=(basic_stringbuf&& __rhs)
-      {
-	__xfer_bufptrs __st{__rhs, this};
-	const __streambuf_type& __base = __rhs;
-	__streambuf_type::operator=(__base);
-	this->pubimbue(__rhs.getloc());
-	_M_mode = __rhs._M_mode;
-	_M_string = std::move(__rhs._M_string);
-	__rhs._M_sync(const_cast<char_type*>(__rhs._M_string.data()), 0, 0);
-	return *this;
-      }
-
-      void
-      swap(basic_stringbuf& __rhs)
-      {
-	__xfer_bufptrs __l_st{*this, std::__addressof(__rhs)};
-	__xfer_bufptrs __r_st{__rhs, this};
-	__streambuf_type& __base = __rhs;
-	__streambuf_type::swap(__base);
-	__rhs.pubimbue(this->pubimbue(__rhs.getloc()));
-	std::swap(_M_mode, __rhs._M_mode);
-	std::swap(_M_string, __rhs._M_string);
-      }
-#endif
-
-      // Get and set:
-      /**
-       *  @brief  Copying out the string buffer.
-       *  @return  A copy of one of the underlying sequences.
-       *
-       *  <em>If the buffer is only created in input mode, the underlying
-       *  character sequence is equal to the input sequence; otherwise, it
-       *  is equal to the output sequence.</em> [27.7.1.2]/1
-      */
-      __string_type
-      str() const
-      {
-	__string_type __ret;
-	if (this->pptr())
-	  {
-	    // The current egptr() may not be the actual string end.
-	    if (this->pptr() > this->egptr())
-	      __ret = __string_type(this->pbase(), this->pptr());
-	    else
- 	      __ret = __string_type(this->pbase(), this->egptr());
-	  }
-	else
-	  __ret = _M_string;
-	return __ret;
-      }
-
-      /**
-       *  @brief  Setting a new buffer.
-       *  @param  __s  The string to use as a new sequence.
-       *
-       *  Deallocates any previous stored sequence, then copies @a s to
-       *  use as a new one.
-      */
-      void
-      str(const __string_type& __s)
-      {
-	// Cannot use _M_string = __s, since v3 strings are COW
-	// (not always true now but assign() always works).
-	_M_string.assign(__s.data(), __s.size());
-	_M_stringbuf_init(_M_mode);
-      }
-
-    protected:
-      // Common initialization code goes here.
-      void
-      _M_stringbuf_init(ios_base::openmode __mode)
-      {
-	_M_mode = __mode;
-	__size_type __len = 0;
-	if (_M_mode & (ios_base::ate | ios_base::app))
-	  __len = _M_string.size();
-	_M_sync(const_cast<char_type*>(_M_string.data()), 0, __len);
-      }
-
-      virtual streamsize
-      showmanyc()
-      { 
-	streamsize __ret = -1;
-	if (_M_mode & ios_base::in)
-	  {
-	    _M_update_egptr();
-	    __ret = this->egptr() - this->gptr();
-	  }
-	return __ret;
-      }
-
-      virtual int_type
-      underflow();
-
-      virtual int_type
-      pbackfail(int_type __c = traits_type::eof());
-
-      virtual int_type
-      overflow(int_type __c = traits_type::eof());
-
-      /**
-       *  @brief  Manipulates the buffer.
-       *  @param  __s  Pointer to a buffer area.
-       *  @param  __n  Size of @a __s.
-       *  @return  @c this
-       *
-       *  If no buffer has already been created, and both @a __s and @a __n are
-       *  non-zero, then @c __s is used as a buffer; see
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/streambufs.html#io.streambuf.buffering
-       *  for more.
-      */
-      virtual __streambuf_type*
-      setbuf(char_type* __s, streamsize __n)
-      {
-	if (__s && __n >= 0)
-	  {
-	    // This is implementation-defined behavior, and assumes
-	    // that an external char_type array of length __n exists
-	    // and has been pre-allocated. If this is not the case,
-	    // things will quickly blow up.
-	    
-	    // Step 1: Destroy the current internal array.
-	    _M_string.clear();
-	    
-	    // Step 2: Use the external array.
-	    _M_sync(__s, __n, 0);
-	  }
-	return this;
-      }
-
-      virtual pos_type
-      seekoff(off_type __off, ios_base::seekdir __way,
-	      ios_base::openmode __mode = ios_base::in | ios_base::out);
-
-      virtual pos_type
-      seekpos(pos_type __sp,
-	      ios_base::openmode __mode = ios_base::in | ios_base::out);
-
-      // Internal function for correctly updating the internal buffer
-      // for a particular _M_string, due to initialization or re-sizing
-      // of an existing _M_string.
-      void
-      _M_sync(char_type* __base, __size_type __i, __size_type __o);
-
-      // Internal function for correctly updating egptr() to the actual
-      // string end.
-      void
-      _M_update_egptr()
-      {
-	const bool __testin = _M_mode & ios_base::in;
-	if (this->pptr() && this->pptr() > this->egptr())
-	  {
-	    if (__testin)
-	      this->setg(this->eback(), this->gptr(), this->pptr());
-	    else
-	      this->setg(this->pptr(), this->pptr(), this->pptr());
-	  }
-      }
-
-      // Works around the issue with pbump, part of the protected
-      // interface of basic_streambuf, taking just an int.
-      void
-      _M_pbump(char_type* __pbeg, char_type* __pend, off_type __off);
-
-    private:
-#if __cplusplus >= 201103L
-#if _GLIBCXX_USE_CXX11_ABI
-      // This type captures the state of the gptr / pptr pointers as offsets
-      // so they can be restored in another object after moving the string.
-      struct __xfer_bufptrs
-      {
-	__xfer_bufptrs(const basic_stringbuf& __from, basic_stringbuf* __to)
-	: _M_to{__to}, _M_goff{-1, -1, -1}, _M_poff{-1, -1, -1}
-	{
-	  const _CharT* __str = __from._M_string.data();
-	  if (__from.eback())
-	    {
-	    _M_goff[0] = __from.eback() - __str;
-	    _M_goff[1] = __from.gptr() - __str;
-	    _M_goff[2] = __from.egptr() - __str;
-	    }
-	  if (__from.pbase())
-	    {
-	      _M_poff[0] = __from.pbase() - __str;
-	      _M_poff[1] = __from.pptr() - __from.pbase();
-	      _M_poff[2] = __from.epptr() - __str;
-	    }
-	}
-
-	~__xfer_bufptrs()
-	{
-	  char_type* __str = const_cast<char_type*>(_M_to->_M_string.data());
-	  if (_M_goff[0] != -1)
-	    _M_to->setg(__str+_M_goff[0], __str+_M_goff[1], __str+_M_goff[2]);
-	  if (_M_poff[0] != -1)
-	    _M_to->_M_pbump(__str+_M_poff[0], __str+_M_poff[2], _M_poff[1]);
-	}
-
-	basic_stringbuf* _M_to;
-	off_type _M_goff[3];
-	off_type _M_poff[3];
-      };
-#else
-      // This type does nothing when using Copy-On-Write strings.
-      struct __xfer_bufptrs
-      {
-	__xfer_bufptrs(const basic_stringbuf&, basic_stringbuf*) { }
-      };
-#endif
-
-      // The move constructor initializes an __xfer_bufptrs temporary then
-      // delegates to this constructor to performs moves during its lifetime.
-      basic_stringbuf(basic_stringbuf&& __rhs, __xfer_bufptrs&&)
-      : __streambuf_type(static_cast<const __streambuf_type&>(__rhs)),
-      _M_mode(__rhs._M_mode), _M_string(std::move(__rhs._M_string))
-      { }
-#endif
-    };
-
-
-  // [27.7.2] Template class basic_istringstream
-  /**
-   *  @brief  Controlling input for std::string.
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_CharT>.
-   *
-   *  This class supports reading from objects of type std::basic_string,
-   *  using the inherited functions from std::basic_istream.  To control
-   *  the associated sequence, an instance of std::basic_stringbuf is used,
-   *  which this page refers to as @c sb.
-  */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    class basic_istringstream : public basic_istream<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard types:
-      typedef basic_string<_CharT, _Traits, _Alloc> 	__string_type;
-      typedef basic_stringbuf<_CharT, _Traits, _Alloc> 	__stringbuf_type;
-      typedef basic_istream<char_type, traits_type>	__istream_type;
-
-    private:
-      __stringbuf_type	_M_stringbuf;
-
-    public:
-      // Constructors:
-      /**
-       *  @brief  Default constructor starts with an empty string buffer.
-       *  @param  __mode  Whether the buffer can read, or write, or both.
-       *
-       *  @c ios_base::in is automatically included in @a __mode.
-       *
-       *  Initializes @c sb using @c __mode|in, and passes @c &sb to the base
-       *  class initializer.  Does not allocate any buffer.
-       *
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-      */
-      explicit
-      basic_istringstream(ios_base::openmode __mode = ios_base::in)
-      : __istream_type(), _M_stringbuf(__mode | ios_base::in)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  Starts with an existing string buffer.
-       *  @param  __str  A string to copy as a starting buffer.
-       *  @param  __mode  Whether the buffer can read, or write, or both.
-       *
-       *  @c ios_base::in is automatically included in @a mode.
-       *
-       *  Initializes @c sb using @a str and @c mode|in, and passes @c &sb
-       *  to the base class initializer.
-       *
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-      */
-      explicit
-      basic_istringstream(const __string_type& __str,
-			  ios_base::openmode __mode = ios_base::in)
-      : __istream_type(), _M_stringbuf(__str, __mode | ios_base::in)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The buffer is deallocated by the stringbuf object, not the
-       *  formatting stream.
-      */
-      ~basic_istringstream()
-      { }
-
-#if __cplusplus >= 201103L
-      basic_istringstream(const basic_istringstream&) = delete;
-
-      basic_istringstream(basic_istringstream&& __rhs)
-      : __istream_type(std::move(__rhs)),
-      _M_stringbuf(std::move(__rhs._M_stringbuf))
-      { __istream_type::set_rdbuf(&_M_stringbuf); }
-
-      // 27.8.3.2 Assign and swap:
-
-      basic_istringstream&
-      operator=(const basic_istringstream&) = delete;
-
-      basic_istringstream&
-      operator=(basic_istringstream&& __rhs)
-      {
-	__istream_type::operator=(std::move(__rhs));
-	_M_stringbuf = std::move(__rhs._M_stringbuf);
-	return *this;
-      }
-
-      void
-      swap(basic_istringstream& __rhs)
-      {
-	__istream_type::swap(__rhs);
-	_M_stringbuf.swap(__rhs._M_stringbuf);
-      }
-#endif
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_stringbuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-      */
-      __stringbuf_type*
-      rdbuf() const
-      { return const_cast<__stringbuf_type*>(&_M_stringbuf); }
-
-      /**
-       *  @brief  Copying out the string buffer.
-       *  @return  @c rdbuf()->str()
-      */
-      __string_type
-      str() const
-      { return _M_stringbuf.str(); }
-
-      /**
-       *  @brief  Setting a new buffer.
-       *  @param  __s  The string to use as a new sequence.
-       *
-       *  Calls @c rdbuf()->str(s).
-      */
-      void
-      str(const __string_type& __s)
-      { _M_stringbuf.str(__s); }
-    };
-
-
-  // [27.7.3] Template class basic_ostringstream
-  /**
-   *  @brief  Controlling output for std::string.
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_CharT>.
-   *
-   *  This class supports writing to objects of type std::basic_string,
-   *  using the inherited functions from std::basic_ostream.  To control
-   *  the associated sequence, an instance of std::basic_stringbuf is used,
-   *  which this page refers to as @c sb.
-  */
-  template <typename _CharT, typename _Traits, typename _Alloc>
-    class basic_ostringstream : public basic_ostream<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard types:
-      typedef basic_string<_CharT, _Traits, _Alloc> 	__string_type;
-      typedef basic_stringbuf<_CharT, _Traits, _Alloc> 	__stringbuf_type;
-      typedef basic_ostream<char_type, traits_type>	__ostream_type;
-
-    private:
-      __stringbuf_type	_M_stringbuf;
-
-    public:
-      // Constructors/destructor:
-      /**
-       *  @brief  Default constructor starts with an empty string buffer.
-       *  @param  __mode  Whether the buffer can read, or write, or both.
-       *
-       *  @c ios_base::out is automatically included in @a mode.
-       *
-       *  Initializes @c sb using @c mode|out, and passes @c &sb to the base
-       *  class initializer.  Does not allocate any buffer.
-       *
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-      */
-      explicit
-      basic_ostringstream(ios_base::openmode __mode = ios_base::out)
-      : __ostream_type(), _M_stringbuf(__mode | ios_base::out)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  Starts with an existing string buffer.
-       *  @param  __str  A string to copy as a starting buffer.
-       *  @param  __mode  Whether the buffer can read, or write, or both.
-       *
-       *  @c ios_base::out is automatically included in @a mode.
-       *
-       *  Initializes @c sb using @a str and @c mode|out, and passes @c &sb
-       *  to the base class initializer.
-       *
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-      */
-      explicit
-      basic_ostringstream(const __string_type& __str,
-			  ios_base::openmode __mode = ios_base::out)
-      : __ostream_type(), _M_stringbuf(__str, __mode | ios_base::out)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The buffer is deallocated by the stringbuf object, not the
-       *  formatting stream.
-      */
-      ~basic_ostringstream()
-      { }
-
-#if __cplusplus >= 201103L
-      basic_ostringstream(const basic_ostringstream&) = delete;
-
-      basic_ostringstream(basic_ostringstream&& __rhs)
-      : __ostream_type(std::move(__rhs)),
-      _M_stringbuf(std::move(__rhs._M_stringbuf))
-      { __ostream_type::set_rdbuf(&_M_stringbuf); }
-
-      // 27.8.3.2 Assign and swap:
-
-      basic_ostringstream&
-      operator=(const basic_ostringstream&) = delete;
-
-      basic_ostringstream&
-      operator=(basic_ostringstream&& __rhs)
-      {
-	__ostream_type::operator=(std::move(__rhs));
-	_M_stringbuf = std::move(__rhs._M_stringbuf);
-	return *this;
-      }
-
-      void
-      swap(basic_ostringstream& __rhs)
-      {
-	__ostream_type::swap(__rhs);
-	_M_stringbuf.swap(__rhs._M_stringbuf);
-      }
-#endif
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_stringbuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-      */
-      __stringbuf_type*
-      rdbuf() const
-      { return const_cast<__stringbuf_type*>(&_M_stringbuf); }
-
-      /**
-       *  @brief  Copying out the string buffer.
-       *  @return  @c rdbuf()->str()
-      */
-      __string_type
-      str() const
-      { return _M_stringbuf.str(); }
-
-      /**
-       *  @brief  Setting a new buffer.
-       *  @param  __s  The string to use as a new sequence.
-       *
-       *  Calls @c rdbuf()->str(s).
-      */
-      void
-      str(const __string_type& __s)
-      { _M_stringbuf.str(__s); }
-    };
-
-
-  // [27.7.4] Template class basic_stringstream
-  /**
-   *  @brief  Controlling input and output for std::string.
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *  @tparam _Alloc  Allocator type, defaults to allocator<_CharT>.
-   *
-   *  This class supports reading from and writing to objects of type
-   *  std::basic_string, using the inherited functions from
-   *  std::basic_iostream.  To control the associated sequence, an instance
-   *  of std::basic_stringbuf is used, which this page refers to as @c sb.
-  */
-  template <typename _CharT, typename _Traits, typename _Alloc>
-    class basic_stringstream : public basic_iostream<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard Types:
-      typedef basic_string<_CharT, _Traits, _Alloc> 	__string_type;
-      typedef basic_stringbuf<_CharT, _Traits, _Alloc> 	__stringbuf_type;
-      typedef basic_iostream<char_type, traits_type>	__iostream_type;
-
-    private:
-      __stringbuf_type	_M_stringbuf;
-
-    public:
-      // Constructors/destructors
-      /**
-       *  @brief  Default constructor starts with an empty string buffer.
-       *  @param  __m  Whether the buffer can read, or write, or both.
-       *
-       *  Initializes @c sb using the mode from @c __m, and passes @c
-       *  &sb to the base class initializer.  Does not allocate any
-       *  buffer.
-       *
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-      */
-      explicit
-      basic_stringstream(ios_base::openmode __m = ios_base::out | ios_base::in)
-      : __iostream_type(), _M_stringbuf(__m)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  Starts with an existing string buffer.
-       *  @param  __str  A string to copy as a starting buffer.
-       *  @param  __m  Whether the buffer can read, or write, or both.
-       *
-       *  Initializes @c sb using @a __str and @c __m, and passes @c &sb
-       *  to the base class initializer.
-       *
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-      */
-      explicit
-      basic_stringstream(const __string_type& __str,
-			 ios_base::openmode __m = ios_base::out | ios_base::in)
-      : __iostream_type(), _M_stringbuf(__str, __m)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The buffer is deallocated by the stringbuf object, not the
-       *  formatting stream.
-      */
-      ~basic_stringstream()
-      { }
-
-#if __cplusplus >= 201103L
-      basic_stringstream(const basic_stringstream&) = delete;
-
-      basic_stringstream(basic_stringstream&& __rhs)
-      : __iostream_type(std::move(__rhs)),
-      _M_stringbuf(std::move(__rhs._M_stringbuf))
-      { __iostream_type::set_rdbuf(&_M_stringbuf); }
-
-      // 27.8.3.2 Assign and swap:
-
-      basic_stringstream&
-      operator=(const basic_stringstream&) = delete;
-
-      basic_stringstream&
-      operator=(basic_stringstream&& __rhs)
-      {
-	__iostream_type::operator=(std::move(__rhs));
-	_M_stringbuf = std::move(__rhs._M_stringbuf);
-	return *this;
-      }
-
-      void
-      swap(basic_stringstream& __rhs)
-      {
-	__iostream_type::swap(__rhs);
-	_M_stringbuf.swap(__rhs._M_stringbuf);
-      }
-#endif
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_stringbuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-      */
-      __stringbuf_type*
-      rdbuf() const
-      { return const_cast<__stringbuf_type*>(&_M_stringbuf); }
-
-      /**
-       *  @brief  Copying out the string buffer.
-       *  @return  @c rdbuf()->str()
-      */
-      __string_type
-      str() const
-      { return _M_stringbuf.str(); }
-
-      /**
-       *  @brief  Setting a new buffer.
-       *  @param  __s  The string to use as a new sequence.
-       *
-       *  Calls @c rdbuf()->str(s).
-      */
-      void
-      str(const __string_type& __s)
-      { _M_stringbuf.str(__s); }
-    };
-
-#if __cplusplus >= 201103L
-  /// Swap specialization for stringbufs.
-  template <class _CharT, class _Traits, class _Allocator>
-    inline void
-    swap(basic_stringbuf<_CharT, _Traits, _Allocator>& __x,
-	 basic_stringbuf<_CharT, _Traits, _Allocator>& __y)
-    { __x.swap(__y); }
-
-  /// Swap specialization for istringstreams.
-  template <class _CharT, class _Traits, class _Allocator>
-    inline void
-    swap(basic_istringstream<_CharT, _Traits, _Allocator>& __x,
-	 basic_istringstream<_CharT, _Traits, _Allocator>& __y)
-    { __x.swap(__y); }
-
-  /// Swap specialization for ostringstreams.
-  template <class _CharT, class _Traits, class _Allocator>
-    inline void
-    swap(basic_ostringstream<_CharT, _Traits, _Allocator>& __x,
-	 basic_ostringstream<_CharT, _Traits, _Allocator>& __y)
-    { __x.swap(__y); }
-
-  /// Swap specialization for stringstreams.
-  template <class _CharT, class _Traits, class _Allocator>
-    inline void
-    swap(basic_stringstream<_CharT, _Traits, _Allocator>& __x,
-	 basic_stringstream<_CharT, _Traits, _Allocator>& __y)
-    { __x.swap(__y); }
-#endif
-
-_GLIBCXX_END_NAMESPACE_CXX11
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#include <bits/sstream.tcc>
-
-#endif /* _GLIBCXX_SSTREAM */
diff --git a/openflow/usr/include/c++/5/stack b/openflow/usr/include/c++/5/stack
deleted file mode 100644
index 2bb24cb..0000000
--- a/openflow/usr/include/c++/5/stack
+++ /dev/null
@@ -1,63 +0,0 @@
-// <stack> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/stack
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_STACK
-#define _GLIBCXX_STACK 1
-
-#pragma GCC system_header
-
-#include <deque>
-#include <bits/stl_stack.h>
-
-#endif /* _GLIBCXX_STACK */
diff --git a/openflow/usr/include/c++/5/stdexcept b/openflow/usr/include/c++/5/stdexcept
deleted file mode 100644
index 2428919..0000000
--- a/openflow/usr/include/c++/5/stdexcept
+++ /dev/null
@@ -1,257 +0,0 @@
-// Standard exception classes  -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/stdexcept
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 19.1  Exception classes
-//
-
-#ifndef _GLIBCXX_STDEXCEPT
-#define _GLIBCXX_STDEXCEPT 1
-
-#pragma GCC system_header
-
-#include <exception>
-#include <string>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if _GLIBCXX_USE_DUAL_ABI
-#if _GLIBCXX_USE_CXX11_ABI
-  // Emulates an old COW string when the new std::string is in use.
-  struct __cow_string
-  {
-    union {
-      const char* _M_p;
-      char _M_bytes[sizeof(const char*)];
-    };
-
-    __cow_string();
-    __cow_string(const std::string&);
-    __cow_string(const char*, size_t);
-    __cow_string(const __cow_string&) _GLIBCXX_USE_NOEXCEPT;
-    __cow_string& operator=(const __cow_string&) _GLIBCXX_USE_NOEXCEPT;
-    ~__cow_string();
-#if __cplusplus >= 201103L
-    __cow_string(__cow_string&&) noexcept;
-    __cow_string& operator=(__cow_string&&) noexcept;
-#endif
-  };
-
-  typedef basic_string<char> __sso_string;
-#else // _GLIBCXX_USE_CXX11_ABI
-  typedef basic_string<char> __cow_string;
-
-  // Emulates a new SSO string when the old std::string is in use.
-  struct __sso_string
-  {
-    struct __str
-    {
-      const char* _M_p;
-      size_t _M_string_length;
-      char _M_local_buf[16];
-    };
-
-    union {
-      __str _M_s;
-      char _M_bytes[sizeof(__str)];
-    };
-
-    __sso_string() _GLIBCXX_USE_NOEXCEPT;
-    __sso_string(const std::string&);
-    __sso_string(const char*, size_t);
-    __sso_string(const __sso_string&);
-    __sso_string& operator=(const __sso_string&);
-    ~__sso_string();
-#if __cplusplus >= 201103L
-    __sso_string(__sso_string&&) noexcept;
-    __sso_string& operator=(__sso_string&&) noexcept;
-#endif
-  };
-#endif // _GLIBCXX_USE_CXX11_ABI
-#else  // _GLIBCXX_USE_DUAL_ABI
-  typedef basic_string<char> __sso_string;
-  typedef basic_string<char> __cow_string;
-#endif
-
-  /**
-   * @addtogroup exceptions
-   * @{
-   */
-
-  /** Logic errors represent problems in the internal logic of a program;
-   *  in theory, these are preventable, and even detectable before the
-   *  program runs (e.g., violations of class invariants).
-   *  @brief One of two subclasses of exception.
-   */
-  class logic_error : public exception 
-  {
-    __cow_string _M_msg;
-
-  public:
-    /** Takes a character string describing the error.  */
-    explicit 
-    logic_error(const string& __arg);
-
-#if __cplusplus >= 201103L
-    explicit
-    logic_error(const char*);
-#endif
-
-#if _GLIBCXX_USE_CXX11_ABI || _GLIBCXX_DEFINE_STDEXCEPT_COPY_OPS
-    logic_error(const logic_error&) _GLIBCXX_USE_NOEXCEPT;
-    logic_error& operator=(const logic_error&) _GLIBCXX_USE_NOEXCEPT;
-#endif
-
-    virtual ~logic_error() _GLIBCXX_USE_NOEXCEPT;
-
-    /** Returns a C-style character string describing the general cause of
-     *  the current error (the same string passed to the ctor).  */
-    virtual const char* 
-    what() const _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /** Thrown by the library, or by you, to report domain errors (domain in
-   *  the mathematical sense).  */
-  class domain_error : public logic_error 
-  {
-  public:
-    explicit domain_error(const string& __arg);
-#if __cplusplus >= 201103L
-    explicit domain_error(const char*);
-#endif
-    virtual ~domain_error() _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /** Thrown to report invalid arguments to functions.  */
-  class invalid_argument : public logic_error 
-  {
-  public:
-    explicit invalid_argument(const string& __arg);
-#if __cplusplus >= 201103L
-    explicit invalid_argument(const char*);
-#endif
-    virtual ~invalid_argument() _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /** Thrown when an object is constructed that would exceed its maximum
-   *  permitted size (e.g., a basic_string instance).  */
-  class length_error : public logic_error 
-  {
-  public:
-    explicit length_error(const string& __arg);
-#if __cplusplus >= 201103L
-    explicit length_error(const char*);
-#endif
-    virtual ~length_error() _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /** This represents an argument whose value is not within the expected
-   *  range (e.g., boundary checks in basic_string).  */
-  class out_of_range : public logic_error 
-  {
-  public:
-    explicit out_of_range(const string& __arg);
-#if __cplusplus >= 201103L
-    explicit out_of_range(const char*);
-#endif
-    virtual ~out_of_range() _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /** Runtime errors represent problems outside the scope of a program;
-   *  they cannot be easily predicted and can generally only be caught as
-   *  the program executes.
-   *  @brief One of two subclasses of exception.
-   */
-  class runtime_error : public exception 
-  {
-    __cow_string _M_msg;
-
-  public:
-    /** Takes a character string describing the error.  */
-    explicit 
-    runtime_error(const string& __arg);
-
-#if __cplusplus >= 201103L
-    explicit
-    runtime_error(const char*);
-#endif
-
-#if _GLIBCXX_USE_CXX11_ABI || _GLIBCXX_DEFINE_STDEXCEPT_COPY_OPS
-    runtime_error(const runtime_error&) _GLIBCXX_USE_NOEXCEPT;
-    runtime_error& operator=(const runtime_error&) _GLIBCXX_USE_NOEXCEPT;
-#endif
-
-    virtual ~runtime_error() _GLIBCXX_USE_NOEXCEPT;
-
-    /** Returns a C-style character string describing the general cause of
-     *  the current error (the same string passed to the ctor).  */
-    virtual const char* 
-    what() const _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /** Thrown to indicate range errors in internal computations.  */
-  class range_error : public runtime_error 
-  {
-  public:
-    explicit range_error(const string& __arg);
-#if __cplusplus >= 201103L
-    explicit range_error(const char*);
-#endif
-    virtual ~range_error() _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /** Thrown to indicate arithmetic overflow.  */
-  class overflow_error : public runtime_error 
-  {
-  public:
-    explicit overflow_error(const string& __arg);
-#if __cplusplus >= 201103L
-    explicit overflow_error(const char*);
-#endif
-    virtual ~overflow_error() _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /** Thrown to indicate arithmetic underflow.  */
-  class underflow_error : public runtime_error 
-  {
-  public:
-    explicit underflow_error(const string& __arg);
-#if __cplusplus >= 201103L
-    explicit underflow_error(const char*);
-#endif
-    virtual ~underflow_error() _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  // @} group exceptions
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _GLIBCXX_STDEXCEPT */
diff --git a/openflow/usr/include/c++/5/streambuf b/openflow/usr/include/c++/5/streambuf
deleted file mode 100644
index fbdf484..0000000
--- a/openflow/usr/include/c++/5/streambuf
+++ /dev/null
@@ -1,852 +0,0 @@
-// Stream buffer classes -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/streambuf
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 14882: 27.5  Stream buffers
-//
-
-#ifndef _GLIBXX_STREAMBUF
-#define _GLIBXX_STREAMBUF 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <iosfwd>
-#include <bits/localefwd.h>
-#include <bits/ios_base.h>
-#include <bits/cpp_type_traits.h>
-#include <ext/type_traits.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _CharT, typename _Traits>
-    streamsize
-    __copy_streambufs_eof(basic_streambuf<_CharT, _Traits>*,
-			  basic_streambuf<_CharT, _Traits>*, bool&);
-
-  /**
-   *  @brief  The actual work of input and output (interface).
-   *  @ingroup io
-   *
-   *  @tparam _CharT  Type of character stream.
-   *  @tparam _Traits  Traits for character type, defaults to
-   *                   char_traits<_CharT>.
-   *
-   *  This is a base class.  Derived stream buffers each control a
-   *  pair of character sequences:  one for input, and one for output.
-   *
-   *  Section [27.5.1] of the standard describes the requirements and
-   *  behavior of stream buffer classes.  That section (three paragraphs)
-   *  is reproduced here, for simplicity and accuracy.
-   *
-   *  -# Stream buffers can impose various constraints on the sequences
-   *     they control.  Some constraints are:
-   *     - The controlled input sequence can be not readable.
-   *     - The controlled output sequence can be not writable.
-   *     - The controlled sequences can be associated with the contents of
-   *       other representations for character sequences, such as external
-   *       files.
-   *     - The controlled sequences can support operations @e directly to or
-   *       from associated sequences.
-   *     - The controlled sequences can impose limitations on how the
-   *       program can read characters from a sequence, write characters to
-   *       a sequence, put characters back into an input sequence, or alter
-   *       the stream position.
-   *     .
-   *  -# Each sequence is characterized by three pointers which, if non-null,
-   *     all point into the same @c charT array object.  The array object
-   *     represents, at any moment, a (sub)sequence of characters from the
-   *     sequence.  Operations performed on a sequence alter the values
-   *     stored in these pointers, perform reads and writes directly to or
-   *     from associated sequences, and alter <em>the stream position</em> and
-   *     conversion state as needed to maintain this subsequence relationship.
-   *     The three pointers are:
-   *     - the <em>beginning pointer</em>, or lowest element address in the
-   *       array (called @e xbeg here);
-   *     - the <em>next pointer</em>, or next element address that is a
-   *       current candidate for reading or writing (called @e xnext here);
-   *     - the <em>end pointer</em>, or first element address beyond the
-   *       end of the array (called @e xend here).
-   *     .
-   *  -# The following semantic constraints shall always apply for any set
-   *     of three pointers for a sequence, using the pointer names given
-   *     immediately above:
-   *     - If @e xnext is not a null pointer, then @e xbeg and @e xend shall
-   *       also be non-null pointers into the same @c charT array, as
-   *       described above; otherwise, @e xbeg and @e xend shall also be null.
-   *     - If @e xnext is not a null pointer and @e xnext < @e xend for an
-   *       output sequence, then a <em>write position</em> is available.
-   *       In this case, @e *xnext shall be assignable as the next element
-   *       to write (to put, or to store a character value, into the sequence).
-   *     - If @e xnext is not a null pointer and @e xbeg < @e xnext for an
-   *       input sequence, then a <em>putback position</em> is available.
-   *       In this case, @e xnext[-1] shall have a defined value and is the
-   *       next (preceding) element to store a character that is put back
-   *       into the input sequence.
-   *     - If @e xnext is not a null pointer and @e xnext< @e xend for an
-   *       input sequence, then a <em>read position</em> is available.
-   *       In this case, @e *xnext shall have a defined value and is the
-   *       next element to read (to get, or to obtain a character value,
-   *       from the sequence).
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_streambuf
-    {
-    public:
-      //@{
-      /**
-       *  These are standard types.  They permit a standardized way of
-       *  referring to names of (or names dependent on) the template
-       *  parameters, which are specific to the implementation.
-      */
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-      //@}
-
-      //@{
-      /// This is a non-standard type.
-      typedef basic_streambuf<char_type, traits_type>  	__streambuf_type;
-      //@}
-
-      friend class basic_ios<char_type, traits_type>;
-      friend class basic_istream<char_type, traits_type>;
-      friend class basic_ostream<char_type, traits_type>;
-      friend class istreambuf_iterator<char_type, traits_type>;
-      friend class ostreambuf_iterator<char_type, traits_type>;
-
-      friend streamsize
-      __copy_streambufs_eof<>(basic_streambuf*, basic_streambuf*, bool&);
-
-      template<bool _IsMove, typename _CharT2>
-        friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value,
-					       _CharT2*>::__type
-        __copy_move_a2(istreambuf_iterator<_CharT2>,
-		       istreambuf_iterator<_CharT2>, _CharT2*);
-
-      template<typename _CharT2>
-        friend typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value,
-				  istreambuf_iterator<_CharT2> >::__type
-        find(istreambuf_iterator<_CharT2>, istreambuf_iterator<_CharT2>,
-	     const _CharT2&);
-
-      template<typename _CharT2, typename _Traits2>
-        friend basic_istream<_CharT2, _Traits2>&
-        operator>>(basic_istream<_CharT2, _Traits2>&, _CharT2*);
-
-      template<typename _CharT2, typename _Traits2, typename _Alloc>
-        friend basic_istream<_CharT2, _Traits2>&
-        operator>>(basic_istream<_CharT2, _Traits2>&,
-		   basic_string<_CharT2, _Traits2, _Alloc>&);
-
-      template<typename _CharT2, typename _Traits2, typename _Alloc>
-        friend basic_istream<_CharT2, _Traits2>&
-        getline(basic_istream<_CharT2, _Traits2>&,
-		basic_string<_CharT2, _Traits2, _Alloc>&, _CharT2);
-
-    protected:
-      /*
-       *  This is based on _IO_FILE, just reordered to be more consistent,
-       *  and is intended to be the most minimal abstraction for an
-       *  internal buffer.
-       *  -  get == input == read
-       *  -  put == output == write
-      */
-      char_type* 		_M_in_beg;     ///< Start of get area.
-      char_type* 		_M_in_cur;     ///< Current read area.
-      char_type* 		_M_in_end;     ///< End of get area.
-      char_type* 		_M_out_beg;    ///< Start of put area.
-      char_type* 		_M_out_cur;    ///< Current put area.
-      char_type* 		_M_out_end;    ///< End of put area.
-
-      /// Current locale setting.
-      locale 			_M_buf_locale;
-
-  public:
-      /// Destructor deallocates no buffer space.
-      virtual
-      ~basic_streambuf()
-      { }
-
-      // [27.5.2.2.1] locales
-      /**
-       *  @brief  Entry point for imbue().
-       *  @param  __loc  The new locale.
-       *  @return  The previous locale.
-       *
-       *  Calls the derived imbue(__loc).
-      */
-      locale
-      pubimbue(const locale& __loc)
-      {
-	locale __tmp(this->getloc());
-	this->imbue(__loc);
-	_M_buf_locale = __loc;
-	return __tmp;
-      }
-
-      /**
-       *  @brief  Locale access.
-       *  @return  The current locale in effect.
-       *
-       *  If pubimbue(loc) has been called, then the most recent @c loc
-       *  is returned.  Otherwise the global locale in effect at the time
-       *  of construction is returned.
-      */
-      locale
-      getloc() const
-      { return _M_buf_locale; }
-
-      // [27.5.2.2.2] buffer management and positioning
-      //@{
-      /**
-       *  @brief  Entry points for derived buffer functions.
-       *
-       *  The public versions of @c pubfoo dispatch to the protected
-       *  derived @c foo member functions, passing the arguments (if any)
-       *  and returning the result unchanged.
-      */
-      basic_streambuf*
-      pubsetbuf(char_type* __s, streamsize __n)
-      { return this->setbuf(__s, __n); }
-
-      /**
-       *  @brief  Alters the stream position.
-       *  @param  __off  Offset.
-       *  @param  __way  Value for ios_base::seekdir.
-       *  @param  __mode Value for ios_base::openmode.
-       *
-       *  Calls virtual seekoff function.
-      */
-      pos_type
-      pubseekoff(off_type __off, ios_base::seekdir __way,
-		 ios_base::openmode __mode = ios_base::in | ios_base::out)
-      { return this->seekoff(__off, __way, __mode); }
-
-      /**
-       *  @brief  Alters the stream position.
-       *  @param  __sp  Position
-       *  @param  __mode Value for ios_base::openmode.
-       *
-       *  Calls virtual seekpos function.
-      */
-      pos_type
-      pubseekpos(pos_type __sp,
-		 ios_base::openmode __mode = ios_base::in | ios_base::out)
-      { return this->seekpos(__sp, __mode); }
-
-      /**
-       *  @brief  Calls virtual sync function.
-      */
-      int
-      pubsync() { return this->sync(); }
-      //@}
-
-      // [27.5.2.2.3] get area
-      /**
-       *  @brief  Looking ahead into the stream.
-       *  @return  The number of characters available.
-       *
-       *  If a read position is available, returns the number of characters
-       *  available for reading before the buffer must be refilled.
-       *  Otherwise returns the derived @c showmanyc().
-      */
-      streamsize
-      in_avail()
-      {
-	const streamsize __ret = this->egptr() - this->gptr();
-	return __ret ? __ret : this->showmanyc();
-      }
-
-      /**
-       *  @brief  Getting the next character.
-       *  @return  The next character, or eof.
-       *
-       *  Calls @c sbumpc(), and if that function returns
-       *  @c traits::eof(), so does this function.  Otherwise, @c sgetc().
-      */
-      int_type
-      snextc()
-      {
-	int_type __ret = traits_type::eof();
-	if (__builtin_expect(!traits_type::eq_int_type(this->sbumpc(),
-						       __ret), true))
-	  __ret = this->sgetc();
-	return __ret;
-      }
-
-      /**
-       *  @brief  Getting the next character.
-       *  @return  The next character, or eof.
-       *
-       *  If the input read position is available, returns that character
-       *  and increments the read pointer, otherwise calls and returns
-       *  @c uflow().
-      */
-      int_type
-      sbumpc()
-      {
-	int_type __ret;
-	if (__builtin_expect(this->gptr() < this->egptr(), true))
-	  {
-	    __ret = traits_type::to_int_type(*this->gptr());
-	    this->gbump(1);
-	  }
-	else
-	  __ret = this->uflow();
-	return __ret;
-      }
-
-      /**
-       *  @brief  Getting the next character.
-       *  @return  The next character, or eof.
-       *
-       *  If the input read position is available, returns that character,
-       *  otherwise calls and returns @c underflow().  Does not move the
-       *  read position after fetching the character.
-      */
-      int_type
-      sgetc()
-      {
-	int_type __ret;
-	if (__builtin_expect(this->gptr() < this->egptr(), true))
-	  __ret = traits_type::to_int_type(*this->gptr());
-	else
-	  __ret = this->underflow();
-	return __ret;
-      }
-
-      /**
-       *  @brief  Entry point for xsgetn.
-       *  @param  __s  A buffer area.
-       *  @param  __n  A count.
-       *
-       *  Returns xsgetn(__s,__n).  The effect is to fill @a __s[0] through
-       *  @a __s[__n-1] with characters from the input sequence, if possible.
-      */
-      streamsize
-      sgetn(char_type* __s, streamsize __n)
-      { return this->xsgetn(__s, __n); }
-
-      // [27.5.2.2.4] putback
-      /**
-       *  @brief  Pushing characters back into the input stream.
-       *  @param  __c  The character to push back.
-       *  @return  The previous character, if possible.
-       *
-       *  Similar to sungetc(), but @a __c is pushed onto the stream
-       *  instead of <em>the previous character.</em> If successful,
-       *  the next character fetched from the input stream will be @a
-       *  __c.
-      */
-      int_type
-      sputbackc(char_type __c)
-      {
-	int_type __ret;
-	const bool __testpos = this->eback() < this->gptr();
-	if (__builtin_expect(!__testpos ||
-			     !traits_type::eq(__c, this->gptr()[-1]), false))
-	  __ret = this->pbackfail(traits_type::to_int_type(__c));
-	else
-	  {
-	    this->gbump(-1);
-	    __ret = traits_type::to_int_type(*this->gptr());
-	  }
-	return __ret;
-      }
-
-      /**
-       *  @brief  Moving backwards in the input stream.
-       *  @return  The previous character, if possible.
-       *
-       *  If a putback position is available, this function decrements
-       *  the input pointer and returns that character.  Otherwise,
-       *  calls and returns pbackfail().  The effect is to @a unget
-       *  the last character @a gotten.
-      */
-      int_type
-      sungetc()
-      {
-	int_type __ret;
-	if (__builtin_expect(this->eback() < this->gptr(), true))
-	  {
-	    this->gbump(-1);
-	    __ret = traits_type::to_int_type(*this->gptr());
-	  }
-	else
-	  __ret = this->pbackfail();
-	return __ret;
-      }
-
-      // [27.5.2.2.5] put area
-      /**
-       *  @brief  Entry point for all single-character output functions.
-       *  @param  __c  A character to output.
-       *  @return  @a __c, if possible.
-       *
-       *  One of two public output functions.
-       *
-       *  If a write position is available for the output sequence (i.e.,
-       *  the buffer is not full), stores @a __c in that position, increments
-       *  the position, and returns @c traits::to_int_type(__c).  If a write
-       *  position is not available, returns @c overflow(__c).
-      */
-      int_type
-      sputc(char_type __c)
-      {
-	int_type __ret;
-	if (__builtin_expect(this->pptr() < this->epptr(), true))
-	  {
-	    *this->pptr() = __c;
-	    this->pbump(1);
-	    __ret = traits_type::to_int_type(__c);
-	  }
-	else
-	  __ret = this->overflow(traits_type::to_int_type(__c));
-	return __ret;
-      }
-
-      /**
-       *  @brief  Entry point for all single-character output functions.
-       *  @param  __s  A buffer read area.
-       *  @param  __n  A count.
-       *
-       *  One of two public output functions.
-       *
-       *
-       *  Returns xsputn(__s,__n).  The effect is to write @a __s[0] through
-       *  @a __s[__n-1] to the output sequence, if possible.
-      */
-      streamsize
-      sputn(const char_type* __s, streamsize __n)
-      { return this->xsputn(__s, __n); }
-
-    protected:
-      /**
-       *  @brief  Base constructor.
-       *
-       *  Only called from derived constructors, and sets up all the
-       *  buffer data to zero, including the pointers described in the
-       *  basic_streambuf class description.  Note that, as a result,
-       *  - the class starts with no read nor write positions available,
-       *  - this is not an error
-      */
-      basic_streambuf()
-      : _M_in_beg(0), _M_in_cur(0), _M_in_end(0),
-      _M_out_beg(0), _M_out_cur(0), _M_out_end(0),
-      _M_buf_locale(locale())
-      { }
-
-      // [27.5.2.3.1] get area access
-      //@{
-      /**
-       *  @brief  Access to the get area.
-       *
-       *  These functions are only available to other protected functions,
-       *  including derived classes.
-       *
-       *  - eback() returns the beginning pointer for the input sequence
-       *  - gptr() returns the next pointer for the input sequence
-       *  - egptr() returns the end pointer for the input sequence
-      */
-      char_type*
-      eback() const { return _M_in_beg; }
-
-      char_type*
-      gptr()  const { return _M_in_cur;  }
-
-      char_type*
-      egptr() const { return _M_in_end; }
-      //@}
-
-      /**
-       *  @brief  Moving the read position.
-       *  @param  __n  The delta by which to move.
-       *
-       *  This just advances the read position without returning any data.
-      */
-      void
-      gbump(int __n) { _M_in_cur += __n; }
-
-      /**
-       *  @brief  Setting the three read area pointers.
-       *  @param  __gbeg  A pointer.
-       *  @param  __gnext  A pointer.
-       *  @param  __gend  A pointer.
-       *  @post  @a __gbeg == @c eback(), @a __gnext == @c gptr(), and
-       *         @a __gend == @c egptr()
-      */
-      void
-      setg(char_type* __gbeg, char_type* __gnext, char_type* __gend)
-      {
-	_M_in_beg = __gbeg;
-	_M_in_cur = __gnext;
-	_M_in_end = __gend;
-      }
-
-      // [27.5.2.3.2] put area access
-      //@{
-      /**
-       *  @brief  Access to the put area.
-       *
-       *  These functions are only available to other protected functions,
-       *  including derived classes.
-       *
-       *  - pbase() returns the beginning pointer for the output sequence
-       *  - pptr() returns the next pointer for the output sequence
-       *  - epptr() returns the end pointer for the output sequence
-      */
-      char_type*
-      pbase() const { return _M_out_beg; }
-
-      char_type*
-      pptr() const { return _M_out_cur; }
-
-      char_type*
-      epptr() const { return _M_out_end; }
-      //@}
-
-      /**
-       *  @brief  Moving the write position.
-       *  @param  __n  The delta by which to move.
-       *
-       *  This just advances the write position without returning any data.
-      */
-      void
-      pbump(int __n) { _M_out_cur += __n; }
-
-      /**
-       *  @brief  Setting the three write area pointers.
-       *  @param  __pbeg  A pointer.
-       *  @param  __pend  A pointer.
-       *  @post  @a __pbeg == @c pbase(), @a __pbeg == @c pptr(), and
-       *         @a __pend == @c epptr()
-      */
-      void
-      setp(char_type* __pbeg, char_type* __pend)
-      {
-	_M_out_beg = _M_out_cur = __pbeg;
-	_M_out_end = __pend;
-      }
-
-      // [27.5.2.4] virtual functions
-      // [27.5.2.4.1] locales
-      /**
-       *  @brief  Changes translations.
-       *  @param  __loc  A new locale.
-       *
-       *  Translations done during I/O which depend on the current
-       *  locale are changed by this call.  The standard adds,
-       *  <em>Between invocations of this function a class derived
-       *  from streambuf can safely cache results of calls to locale
-       *  functions and to members of facets so obtained.</em>
-       *
-       *  @note  Base class version does nothing.
-      */
-      virtual void
-      imbue(const locale& __loc)
-      { }
-
-      // [27.5.2.4.2] buffer management and positioning
-      /**
-       *  @brief  Manipulates the buffer.
-       *
-       *  Each derived class provides its own appropriate behavior.  See
-       *  the next-to-last paragraph of
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/streambufs.html#io.streambuf.buffering
-       *  for more on this function.
-       *
-       *  @note  Base class version does nothing, returns @c this.
-      */
-      virtual basic_streambuf<char_type,_Traits>*
-      setbuf(char_type*, streamsize)
-      {	return this; }
-
-      /**
-       *  @brief  Alters the stream positions.
-       *
-       *  Each derived class provides its own appropriate behavior.
-       *  @note  Base class version does nothing, returns a @c pos_type
-       *         that represents an invalid stream position.
-      */
-      virtual pos_type
-      seekoff(off_type, ios_base::seekdir,
-	      ios_base::openmode /*__mode*/ = ios_base::in | ios_base::out)
-      { return pos_type(off_type(-1)); }
-
-      /**
-       *  @brief  Alters the stream positions.
-       *
-       *  Each derived class provides its own appropriate behavior.
-       *  @note  Base class version does nothing, returns a @c pos_type
-       *         that represents an invalid stream position.
-      */
-      virtual pos_type
-      seekpos(pos_type,
-	      ios_base::openmode /*__mode*/ = ios_base::in | ios_base::out)
-      { return pos_type(off_type(-1)); }
-
-      /**
-       *  @brief  Synchronizes the buffer arrays with the controlled sequences.
-       *  @return  -1 on failure.
-       *
-       *  Each derived class provides its own appropriate behavior,
-       *  including the definition of @a failure.
-       *  @note  Base class version does nothing, returns zero.
-      */
-      virtual int
-      sync() { return 0; }
-
-      // [27.5.2.4.3] get area
-      /**
-       *  @brief  Investigating the data available.
-       *  @return  An estimate of the number of characters available in the
-       *           input sequence, or -1.
-       *
-       *  <em>If it returns a positive value, then successive calls to
-       *  @c underflow() will not return @c traits::eof() until at
-       *  least that number of characters have been supplied.  If @c
-       *  showmanyc() returns -1, then calls to @c underflow() or @c
-       *  uflow() will fail.</em> [27.5.2.4.3]/1
-       *
-       *  @note  Base class version does nothing, returns zero.
-       *  @note  The standard adds that <em>the intention is not only that the
-       *         calls [to underflow or uflow] will not return @c eof() but
-       *         that they will return immediately.</em>
-       *  @note  The standard adds that <em>the morphemes of @c showmanyc are
-       *         @b es-how-many-see, not @b show-manic.</em>
-      */
-      virtual streamsize
-      showmanyc() { return 0; }
-
-      /**
-       *  @brief  Multiple character extraction.
-       *  @param  __s  A buffer area.
-       *  @param  __n  Maximum number of characters to assign.
-       *  @return  The number of characters assigned.
-       *
-       *  Fills @a __s[0] through @a __s[__n-1] with characters from the input
-       *  sequence, as if by @c sbumpc().  Stops when either @a __n characters
-       *  have been copied, or when @c traits::eof() would be copied.
-       *
-       *  It is expected that derived classes provide a more efficient
-       *  implementation by overriding this definition.
-      */
-      virtual streamsize
-      xsgetn(char_type* __s, streamsize __n);
-
-      /**
-       *  @brief  Fetches more data from the controlled sequence.
-       *  @return  The first character from the <em>pending sequence</em>.
-       *
-       *  Informally, this function is called when the input buffer is
-       *  exhausted (or does not exist, as buffering need not actually be
-       *  done).  If a buffer exists, it is @a refilled.  In either case, the
-       *  next available character is returned, or @c traits::eof() to
-       *  indicate a null pending sequence.
-       *
-       *  For a formal definition of the pending sequence, see a good text
-       *  such as Langer & Kreft, or [27.5.2.4.3]/7-14.
-       *
-       *  A functioning input streambuf can be created by overriding only
-       *  this function (no buffer area will be used).  For an example, see
-       *  https://gcc.gnu.org/onlinedocs/libstdc++/manual/streambufs.html
-       *
-       *  @note  Base class version does nothing, returns eof().
-      */
-      virtual int_type
-      underflow()
-      { return traits_type::eof(); }
-
-      /**
-       *  @brief  Fetches more data from the controlled sequence.
-       *  @return  The first character from the <em>pending sequence</em>.
-       *
-       *  Informally, this function does the same thing as @c underflow(),
-       *  and in fact is required to call that function.  It also returns
-       *  the new character, like @c underflow() does.  However, this
-       *  function also moves the read position forward by one.
-      */
-      virtual int_type
-      uflow()
-      {
-	int_type __ret = traits_type::eof();
-	const bool __testeof = traits_type::eq_int_type(this->underflow(),
-							__ret);
-	if (!__testeof)
-	  {
-	    __ret = traits_type::to_int_type(*this->gptr());
-	    this->gbump(1);
-	  }
-	return __ret;
-      }
-
-      // [27.5.2.4.4] putback
-      /**
-       *  @brief  Tries to back up the input sequence.
-       *  @param  __c  The character to be inserted back into the sequence.
-       *  @return  eof() on failure, <em>some other value</em> on success
-       *  @post  The constraints of @c gptr(), @c eback(), and @c pptr()
-       *         are the same as for @c underflow().
-       *
-       *  @note  Base class version does nothing, returns eof().
-      */
-      virtual int_type
-      pbackfail(int_type __c  = traits_type::eof())
-      { return traits_type::eof(); }
-
-      // Put area:
-      /**
-       *  @brief  Multiple character insertion.
-       *  @param  __s  A buffer area.
-       *  @param  __n  Maximum number of characters to write.
-       *  @return  The number of characters written.
-       *
-       *  Writes @a __s[0] through @a __s[__n-1] to the output sequence, as if
-       *  by @c sputc().  Stops when either @a n characters have been
-       *  copied, or when @c sputc() would return @c traits::eof().
-       *
-       *  It is expected that derived classes provide a more efficient
-       *  implementation by overriding this definition.
-      */
-      virtual streamsize
-      xsputn(const char_type* __s, streamsize __n);
-
-      /**
-       *  @brief  Consumes data from the buffer; writes to the
-       *          controlled sequence.
-       *  @param  __c  An additional character to consume.
-       *  @return  eof() to indicate failure, something else (usually
-       *           @a __c, or not_eof())
-       *
-       *  Informally, this function is called when the output buffer
-       *  is full (or does not exist, as buffering need not actually
-       *  be done).  If a buffer exists, it is @a consumed, with
-       *  <em>some effect</em> on the controlled sequence.
-       *  (Typically, the buffer is written out to the sequence
-       *  verbatim.)  In either case, the character @a c is also
-       *  written out, if @a __c is not @c eof().
-       *
-       *  For a formal definition of this function, see a good text
-       *  such as Langer & Kreft, or [27.5.2.4.5]/3-7.
-       *
-       *  A functioning output streambuf can be created by overriding only
-       *  this function (no buffer area will be used).
-       *
-       *  @note  Base class version does nothing, returns eof().
-      */
-      virtual int_type
-      overflow(int_type __c  = traits_type::eof())
-      { return traits_type::eof(); }
-
-#if _GLIBCXX_USE_DEPRECATED
-    // Annex D.6
-    public:
-      /**
-       *  @brief  Tosses a character.
-       *
-       *  Advances the read pointer, ignoring the character that would have
-       *  been read.
-       *
-       *  See http://gcc.gnu.org/ml/libstdc++/2002-05/msg00168.html
-       */
-      void
-      stossc()
-      {
-	if (this->gptr() < this->egptr())
-	  this->gbump(1);
-	else
-	  this->uflow();
-      }
-#endif
-
-      // Also used by specializations for char and wchar_t in src.
-      void
-      __safe_gbump(streamsize __n) { _M_in_cur += __n; }
-
-      void
-      __safe_pbump(streamsize __n) { _M_out_cur += __n; }
-
-#if __cplusplus < 201103L
-    private:
-#else
-    protected:
-#endif
-      basic_streambuf(const basic_streambuf&);
-
-      basic_streambuf&
-      operator=(const basic_streambuf&);
-
-#if __cplusplus >= 201103L
-      void
-      swap(basic_streambuf& __sb)
-      {
-	std::swap(_M_in_beg, __sb._M_in_beg);
-	std::swap(_M_in_cur, __sb._M_in_cur);
-	std::swap(_M_in_end, __sb._M_in_end);
-	std::swap(_M_out_beg, __sb._M_out_beg);
-	std::swap(_M_out_cur, __sb._M_out_cur);
-	std::swap(_M_out_end, __sb._M_out_end);
-	std::swap(_M_buf_locale, __sb._M_buf_locale);
-      }
-#endif
-    };
-
-#if __cplusplus >= 201103L
-  template<typename _CharT, typename _Traits>
-    std::basic_streambuf<_CharT, _Traits>::
-    basic_streambuf(const basic_streambuf&) = default;
-
-  template<typename _CharT, typename _Traits>
-    std::basic_streambuf<_CharT, _Traits>&
-    std::basic_streambuf<_CharT, _Traits>::
-    operator=(const basic_streambuf&) = default;
-#endif
-
-  // Explicit specialization declarations, defined in src/streambuf.cc.
-  template<>
-    streamsize
-    __copy_streambufs_eof(basic_streambuf<char>* __sbin,
-			  basic_streambuf<char>* __sbout, bool& __ineof);
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    streamsize
-    __copy_streambufs_eof(basic_streambuf<wchar_t>* __sbin,
-			  basic_streambuf<wchar_t>* __sbout, bool& __ineof);
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#include <bits/streambuf.tcc>
-
-#endif /* _GLIBCXX_STREAMBUF */
diff --git a/openflow/usr/include/c++/5/string b/openflow/usr/include/c++/5/string
deleted file mode 100644
index 2ed281d..0000000
--- a/openflow/usr/include/c++/5/string
+++ /dev/null
@@ -1,55 +0,0 @@
-// Components for manipulating sequences of characters -*- C++ -*-
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/string
- *  This is a Standard C++ Library header.
- */
-
-//
-// ISO C++ 14882: 21  Strings library
-//
-
-#ifndef _GLIBCXX_STRING
-#define _GLIBCXX_STRING	1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stringfwd.h>
-#include <bits/char_traits.h>  // NB: In turn includes stl_algobase.h
-#include <bits/allocator.h>
-#include <bits/cpp_type_traits.h>
-#include <bits/localefwd.h>    // For operators >>, <<, and getline.
-#include <bits/ostream_insert.h>
-#include <bits/stl_iterator_base_types.h>
-#include <bits/stl_iterator_base_funcs.h>
-#include <bits/stl_iterator.h>
-#include <bits/stl_function.h> // For less
-#include <ext/numeric_traits.h> 
-#include <bits/stl_algobase.h> 
-#include <bits/range_access.h>
-#include <bits/basic_string.h>
-#include <bits/basic_string.tcc> 
-
-#endif /* _GLIBCXX_STRING */
diff --git a/openflow/usr/include/c++/5/sun/awt/CausedFocusEvent.h b/openflow/usr/include/c++/5/sun/awt/CausedFocusEvent.h
deleted file mode 100644
index b6575e7..0000000
--- a/openflow/usr/include/c++/5/sun/awt/CausedFocusEvent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_awt_CausedFocusEvent__
-#define __sun_awt_CausedFocusEvent__
-
-#pragma interface
-
-#include <java/awt/event/FocusEvent.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-    }
-  }
-  namespace sun
-  {
-    namespace awt
-    {
-        class CausedFocusEvent;
-        class CausedFocusEvent$Cause;
-    }
-  }
-}
-
-class sun::awt::CausedFocusEvent : public ::java::awt::event::FocusEvent
-{
-
-public:
-  CausedFocusEvent(::java::awt::Component *, jint, jboolean, ::java::awt::Component *, ::sun::awt::CausedFocusEvent$Cause *);
-  virtual ::sun::awt::CausedFocusEvent$Cause * getCause();
-private:
-  ::sun::awt::CausedFocusEvent$Cause * __attribute__((aligned(__alignof__( ::java::awt::event::FocusEvent)))) cause;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_awt_CausedFocusEvent__
diff --git a/openflow/usr/include/c++/5/sun/misc/Service.h b/openflow/usr/include/c++/5/sun/misc/Service.h
deleted file mode 100644
index e698fed..0000000
--- a/openflow/usr/include/c++/5/sun/misc/Service.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_misc_Service__
-#define __sun_misc_Service__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Service;
-    }
-  }
-}
-
-class sun::misc::Service : public ::java::lang::Object
-{
-
-public:
-  Service();
-  static ::java::util::Iterator * providers(::java::lang::Class *, ::java::lang::ClassLoader *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_misc_Service__
diff --git a/openflow/usr/include/c++/5/sun/misc/ServiceConfigurationError.h b/openflow/usr/include/c++/5/sun/misc/ServiceConfigurationError.h
deleted file mode 100644
index aee51b3..0000000
--- a/openflow/usr/include/c++/5/sun/misc/ServiceConfigurationError.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_misc_ServiceConfigurationError__
-#define __sun_misc_ServiceConfigurationError__
-
-#pragma interface
-
-#include <java/lang/Error.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class ServiceConfigurationError;
-    }
-  }
-}
-
-class sun::misc::ServiceConfigurationError : public ::java::lang::Error
-{
-
-public:
-  ServiceConfigurationError();
-  ServiceConfigurationError(::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_misc_ServiceConfigurationError__
diff --git a/openflow/usr/include/c++/5/sun/misc/Unsafe.h b/openflow/usr/include/c++/5/sun/misc/Unsafe.h
deleted file mode 100644
index d50c3e0..0000000
--- a/openflow/usr/include/c++/5/sun/misc/Unsafe.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_misc_Unsafe__
-#define __sun_misc_Unsafe__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace misc
-    {
-        class Unsafe;
-    }
-  }
-}
-
-class sun::misc::Unsafe : public ::java::lang::Object
-{
-
-  Unsafe();
-public:
-  static ::sun::misc::Unsafe * getUnsafe();
-  virtual jlong objectFieldOffset(::java::lang::reflect::Field *);
-  virtual jboolean compareAndSwapInt(::java::lang::Object *, jlong, jint, jint);
-  virtual jboolean compareAndSwapLong(::java::lang::Object *, jlong, jlong, jlong);
-  virtual jboolean compareAndSwapObject(::java::lang::Object *, jlong, ::java::lang::Object *, ::java::lang::Object *);
-  virtual void putOrderedInt(::java::lang::Object *, jlong, jint);
-  virtual void putOrderedLong(::java::lang::Object *, jlong, jlong);
-  virtual void putOrderedObject(::java::lang::Object *, jlong, ::java::lang::Object *);
-  virtual void putIntVolatile(::java::lang::Object *, jlong, jint);
-  virtual jint getIntVolatile(::java::lang::Object *, jlong);
-  virtual void putLongVolatile(::java::lang::Object *, jlong, jlong);
-  virtual void putLong(::java::lang::Object *, jlong, jlong);
-  virtual jlong getLongVolatile(::java::lang::Object *, jlong);
-  virtual jlong getLong(::java::lang::Object *, jlong);
-  virtual void putObjectVolatile(::java::lang::Object *, jlong, ::java::lang::Object *);
-  virtual void putObject(::java::lang::Object *, jlong, ::java::lang::Object *);
-  virtual ::java::lang::Object * getObjectVolatile(::java::lang::Object *, jlong);
-  virtual jint arrayBaseOffset(::java::lang::Class *);
-  virtual jint arrayIndexScale(::java::lang::Class *);
-  virtual void unpark(::java::lang::Thread *);
-  virtual void park(jboolean, jlong);
-private:
-  static ::sun::misc::Unsafe * unsafe;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_misc_Unsafe__
diff --git a/openflow/usr/include/c++/5/sun/reflect/Reflection.h b/openflow/usr/include/c++/5/sun/reflect/Reflection.h
deleted file mode 100644
index 7f3c82f..0000000
--- a/openflow/usr/include/c++/5/sun/reflect/Reflection.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_Reflection__
-#define __sun_reflect_Reflection__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-        class Reflection;
-    }
-  }
-}
-
-class sun::reflect::Reflection : public ::java::lang::Object
-{
-
-public:
-  Reflection();
-  static ::java::lang::Class * getCallerClass(jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_Reflection__
diff --git a/openflow/usr/include/c++/5/sun/reflect/annotation/AnnotationInvocationHandler.h b/openflow/usr/include/c++/5/sun/reflect/annotation/AnnotationInvocationHandler.h
deleted file mode 100644
index 356c8a0..0000000
--- a/openflow/usr/include/c++/5/sun/reflect/annotation/AnnotationInvocationHandler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_AnnotationInvocationHandler__
-#define __sun_reflect_annotation_AnnotationInvocationHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class AnnotationInvocationHandler;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::AnnotationInvocationHandler : public ::java::lang::Object
-{
-
-public:
-  AnnotationInvocationHandler(::java::lang::Class *, ::java::util::Map *);
-  static ::java::lang::annotation::Annotation * create(::java::lang::Class *, ::java::util::Map *);
-  jboolean equals(::java::lang::Object *, ::java::lang::Object *);
-private:
-  static jboolean deepEquals(::java::lang::Object *, ::java::lang::Object *);
-  static jint deepHashCode(::java::lang::Object *);
-public:
-  jint hashCode();
-private:
-  static ::java::lang::String * deepToString(::java::lang::Object *);
-public:
-  ::java::lang::String * toString();
-private:
-  static ::java::lang::Class * getBoxedReturnType(::java::lang::reflect::Method *);
-  ::java::lang::Object * coerce(::java::lang::Object *, ::java::lang::Class *);
-public:
-  ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *);
-private:
-  static const jlong serialVersionUID = 6182022883658399397LL;
-  ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
-  ::java::util::Map * memberValues;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_AnnotationInvocationHandler__
diff --git a/openflow/usr/include/c++/5/sun/reflect/annotation/AnnotationParser.h b/openflow/usr/include/c++/5/sun/reflect/annotation/AnnotationParser.h
deleted file mode 100644
index d5ca973..0000000
--- a/openflow/usr/include/c++/5/sun/reflect/annotation/AnnotationParser.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_AnnotationParser__
-#define __sun_reflect_annotation_AnnotationParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class AnnotationParser;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::AnnotationParser : public ::java::lang::Object
-{
-
-public:
-  AnnotationParser();
-  static ::java::lang::annotation::Annotation * annotationForMap(::java::lang::Class *, ::java::util::Map *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_AnnotationParser__
diff --git a/openflow/usr/include/c++/5/sun/reflect/annotation/AnnotationType.h b/openflow/usr/include/c++/5/sun/reflect/annotation/AnnotationType.h
deleted file mode 100644
index 3d21e0f..0000000
--- a/openflow/usr/include/c++/5/sun/reflect/annotation/AnnotationType.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_AnnotationType__
-#define __sun_reflect_annotation_AnnotationType__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class AnnotationType;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::AnnotationType : public ::java::lang::Object
-{
-
-public:
-  AnnotationType();
-  static ::java::lang::Class * invocationHandlerReturnType(::java::lang::Class *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_AnnotationType__
diff --git a/openflow/usr/include/c++/5/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.h b/openflow/usr/include/c++/5/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.h
deleted file mode 100644
index 63d853b..0000000
--- a/openflow/usr/include/c++/5/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_EnumConstantNotPresentExceptionProxy__
-#define __sun_reflect_annotation_EnumConstantNotPresentExceptionProxy__
-
-#pragma interface
-
-#include <sun/reflect/annotation/ExceptionProxy.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class EnumConstantNotPresentExceptionProxy;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::EnumConstantNotPresentExceptionProxy : public ::sun::reflect::annotation::ExceptionProxy
-{
-
-public:
-  EnumConstantNotPresentExceptionProxy(::java::lang::Class *, ::java::lang::String *);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_EnumConstantNotPresentExceptionProxy__
diff --git a/openflow/usr/include/c++/5/sun/reflect/annotation/ExceptionProxy.h b/openflow/usr/include/c++/5/sun/reflect/annotation/ExceptionProxy.h
deleted file mode 100644
index ca6a3cd..0000000
--- a/openflow/usr/include/c++/5/sun/reflect/annotation/ExceptionProxy.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_annotation_ExceptionProxy__
-#define __sun_reflect_annotation_ExceptionProxy__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace annotation
-      {
-          class ExceptionProxy;
-      }
-    }
-  }
-}
-
-class sun::reflect::annotation::ExceptionProxy : public ::java::lang::Object
-{
-
-public:
-  ExceptionProxy();
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_annotation_ExceptionProxy__
diff --git a/openflow/usr/include/c++/5/sun/reflect/misc/ReflectUtil.h b/openflow/usr/include/c++/5/sun/reflect/misc/ReflectUtil.h
deleted file mode 100644
index 91c0b64..0000000
--- a/openflow/usr/include/c++/5/sun/reflect/misc/ReflectUtil.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __sun_reflect_misc_ReflectUtil__
-#define __sun_reflect_misc_ReflectUtil__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace sun
-  {
-    namespace reflect
-    {
-      namespace misc
-      {
-          class ReflectUtil;
-          class ReflectUtil$MustBeNull;
-      }
-    }
-  }
-}
-
-class sun::reflect::misc::ReflectUtil : public ::java::lang::Object
-{
-
-public:
-  ReflectUtil();
-  static void checkPackageAccess(::java::lang::Class *);
-  static void ensureMemberAccess(::java::lang::Class *, ::java::lang::Class *, ::sun::reflect::misc::ReflectUtil$MustBeNull *, jint);
-  static ::java::lang::Class class$;
-};
-
-#endif // __sun_reflect_misc_ReflectUtil__
diff --git a/openflow/usr/include/c++/5/system_error b/openflow/usr/include/c++/5/system_error
deleted file mode 100644
index 92f8af9..0000000
--- a/openflow/usr/include/c++/5/system_error
+++ /dev/null
@@ -1,397 +0,0 @@
-// <system_error> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/system_error
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_SYSTEM_ERROR
-#define _GLIBCXX_SYSTEM_ERROR 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <bits/c++config.h>
-#include <bits/error_constants.h>
-#include <iosfwd>
-#include <stdexcept>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  class error_code;
-  class error_condition;
-  class system_error;
-
-  /// is_error_code_enum
-  template<typename _Tp>
-    struct is_error_code_enum : public false_type { };
-
-  /// is_error_condition_enum
-  template<typename _Tp>
-    struct is_error_condition_enum : public false_type { };
-
-  template<> 
-    struct is_error_condition_enum<errc>
-    : public true_type { };
-
-  inline namespace _V2 {
-
-  /// error_category
-  class error_category
-  {
-  public:
-    constexpr error_category() noexcept = default;
-
-    virtual ~error_category();
-
-    error_category(const error_category&) = delete;
-    error_category& operator=(const error_category&) = delete;
-
-    virtual const char* 
-    name() const noexcept = 0;
-
-    // We need two different virtual functions here, one returning a
-    // COW string and one returning an SSO string. Their positions in the
-    // vtable must be consistent for dynamic dispatch to work, but which one
-    // the name "message()" finds depends on which ABI the caller is using.
-#if _GLIBCXX_USE_CXX11_ABI
-  private:
-    _GLIBCXX_DEFAULT_ABI_TAG
-    virtual __cow_string
-    _M_message(int) const;
-
-  public:
-    _GLIBCXX_DEFAULT_ABI_TAG
-    virtual string
-    message(int) const = 0;
-#else
-    virtual string 
-    message(int) const = 0;
-
-  private:
-    virtual __sso_string
-    _M_message(int) const;
-#endif
-
-  public:
-    virtual error_condition
-    default_error_condition(int __i) const noexcept;
-
-    virtual bool 
-    equivalent(int __i, const error_condition& __cond) const noexcept;
-
-    virtual bool 
-    equivalent(const error_code& __code, int __i) const noexcept;
-
-    bool 
-    operator<(const error_category& __other) const noexcept
-    { return less<const error_category*>()(this, &__other); }
-
-    bool 
-    operator==(const error_category& __other) const noexcept
-    { return this == &__other; }
-
-    bool 
-    operator!=(const error_category& __other) const noexcept
-    { return this != &__other; }
-  };
-
-  // DR 890.
-  _GLIBCXX_CONST const error_category& system_category() noexcept;
-  _GLIBCXX_CONST const error_category& generic_category() noexcept;
-
-  } // end inline namespace
-
-  error_code make_error_code(errc) noexcept;
-
-  template<typename _Tp>
-    struct hash;
-
-  /// error_code
-  // Implementation-specific error identification
-  struct error_code
-  {
-    error_code() noexcept
-    : _M_value(0), _M_cat(&system_category()) { }
-
-    error_code(int __v, const error_category& __cat) noexcept
-    : _M_value(__v), _M_cat(&__cat) { }
-
-    template<typename _ErrorCodeEnum, typename = typename
-	     enable_if<is_error_code_enum<_ErrorCodeEnum>::value>::type>
-      error_code(_ErrorCodeEnum __e) noexcept
-      { *this = make_error_code(__e); }
-
-    void 
-    assign(int __v, const error_category& __cat) noexcept
-    {
-      _M_value = __v;
-      _M_cat = &__cat; 
-    }
-
-    void 
-    clear() noexcept
-    { assign(0, system_category()); }
-
-    // DR 804.
-    template<typename _ErrorCodeEnum>
-      typename enable_if<is_error_code_enum<_ErrorCodeEnum>::value,
-			 error_code&>::type
-      operator=(_ErrorCodeEnum __e) noexcept
-      { return *this = make_error_code(__e); }
-
-    int
-    value() const noexcept { return _M_value; }
-      
-    const error_category&  
-    category() const noexcept { return *_M_cat; }
-
-    error_condition 
-    default_error_condition() const noexcept;
-
-    _GLIBCXX_DEFAULT_ABI_TAG
-    string 
-    message() const
-    { return category().message(value()); }
-
-    explicit operator bool() const noexcept
-    { return _M_value != 0 ? true : false; }
-
-    // DR 804.
-  private:
-    friend class hash<error_code>;
-
-    int            		_M_value;
-    const error_category* 	_M_cat;
-  };
-
-  // 19.4.2.6 non-member functions
-  inline error_code
-  make_error_code(errc __e) noexcept
-  { return error_code(static_cast<int>(__e), generic_category()); }
-
-  inline bool
-  operator<(const error_code& __lhs, const error_code& __rhs) noexcept
-  { 
-    return (__lhs.category() < __rhs.category()
-	    || (__lhs.category() == __rhs.category()
-		&& __lhs.value() < __rhs.value()));
-  }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const error_code& __e)
-    { return (__os << __e.category().name() << ':' << __e.value()); }
-
-  error_condition make_error_condition(errc) noexcept;
-
-  /// error_condition
-  // Portable error identification
-  struct error_condition 
-  {
-    error_condition() noexcept
-    : _M_value(0), _M_cat(&generic_category()) { }
-
-    error_condition(int __v, const error_category& __cat) noexcept
-    : _M_value(__v), _M_cat(&__cat) { }
-
-    template<typename _ErrorConditionEnum, typename = typename
-	 enable_if<is_error_condition_enum<_ErrorConditionEnum>::value>::type>
-      error_condition(_ErrorConditionEnum __e) noexcept
-      { *this = make_error_condition(__e); }
-
-    void
-    assign(int __v, const error_category& __cat) noexcept
-    {
-      _M_value = __v;
-      _M_cat = &__cat;
-    }
-
-    // DR 804.
-    template<typename _ErrorConditionEnum>
-      typename enable_if<is_error_condition_enum
-			 <_ErrorConditionEnum>::value, error_condition&>::type
-      operator=(_ErrorConditionEnum __e) noexcept
-      { return *this = make_error_condition(__e); }
-
-    void 
-    clear() noexcept
-    { assign(0, generic_category()); }
-
-    // 19.4.3.4 observers
-    int
-    value() const noexcept { return _M_value; }
-
-    const error_category&
-    category() const noexcept { return *_M_cat; }
-
-    _GLIBCXX_DEFAULT_ABI_TAG
-    string 
-    message() const
-    { return category().message(value()); }
-
-    explicit operator bool() const noexcept
-    { return _M_value != 0 ? true : false; }
-
-    // DR 804.
-  private:
-    int 			_M_value;
-    const error_category* 	_M_cat;
-  };
-
-  // 19.4.3.6 non-member functions
-  inline error_condition
-  make_error_condition(errc __e) noexcept
-  { return error_condition(static_cast<int>(__e), generic_category()); }
-
-  inline bool 
-  operator<(const error_condition& __lhs,
-	    const error_condition& __rhs) noexcept
-  {
-    return (__lhs.category() < __rhs.category()
-	    || (__lhs.category() == __rhs.category()
-		&& __lhs.value() < __rhs.value()));
-  }
-
-  // 19.4.4 Comparison operators
-  inline bool
-  operator==(const error_code& __lhs, const error_code& __rhs) noexcept
-  { return (__lhs.category() == __rhs.category()
-	    && __lhs.value() == __rhs.value()); }
-
-  inline bool
-  operator==(const error_code& __lhs, const error_condition& __rhs) noexcept
-  {
-    return (__lhs.category().equivalent(__lhs.value(), __rhs)
-	    || __rhs.category().equivalent(__lhs, __rhs.value()));
-  }
-
-  inline bool
-  operator==(const error_condition& __lhs, const error_code& __rhs) noexcept
-  {
-    return (__rhs.category().equivalent(__rhs.value(), __lhs)
-	    || __lhs.category().equivalent(__rhs, __lhs.value()));
-  }
-
-  inline bool
-  operator==(const error_condition& __lhs,
-	     const error_condition& __rhs) noexcept
-  {
-    return (__lhs.category() == __rhs.category()
-	    && __lhs.value() == __rhs.value());
-  }
-
-  inline bool
-  operator!=(const error_code& __lhs, const error_code& __rhs) noexcept
-  { return !(__lhs == __rhs); }
-
-  inline bool
-  operator!=(const error_code& __lhs, const error_condition& __rhs) noexcept
-  { return !(__lhs == __rhs); }
-
-  inline bool
-  operator!=(const error_condition& __lhs, const error_code& __rhs) noexcept
-  { return !(__lhs == __rhs); }
-
-  inline bool
-  operator!=(const error_condition& __lhs,
-	     const error_condition& __rhs) noexcept
-  { return !(__lhs == __rhs); }
-
-
-  /** 
-   *  @brief Thrown to indicate error code of underlying system.
-   *
-   *  @ingroup exceptions
-   */
-  class system_error : public std::runtime_error
-  {
-  private:
-    error_code 	_M_code;
-
-  public:
-    system_error(error_code __ec = error_code())
-    : runtime_error(__ec.message()), _M_code(__ec) { }
-
-    system_error(error_code __ec, const string& __what)
-    : runtime_error(__what + ": " + __ec.message()), _M_code(__ec) { }
-
-    system_error(error_code __ec, const char* __what)
-    : runtime_error(__what + (": " + __ec.message())), _M_code(__ec) { }
-
-    system_error(int __v, const error_category& __ecat, const char* __what)
-    : system_error(error_code(__v, __ecat), __what) { }
-
-    system_error(int __v, const error_category& __ecat)
-    : runtime_error(error_code(__v, __ecat).message()),
-      _M_code(__v, __ecat) { }
-
-    system_error(int __v, const error_category& __ecat, const string& __what)
-    : runtime_error(__what + ": " + error_code(__v, __ecat).message()),
-      _M_code(__v, __ecat) { }
-
-    virtual ~system_error() noexcept;
-
-    const error_code& 
-    code() const noexcept { return _M_code; }
-  };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#ifndef _GLIBCXX_COMPATIBILITY_CXX0X
-
-#include <bits/functional_hash.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // DR 1182.
-  /// std::hash specialization for error_code.
-  template<>
-    struct hash<error_code>
-    : public __hash_base<size_t, error_code>
-    {
-      size_t
-      operator()(const error_code& __e) const noexcept
-      {
-	const size_t __tmp = std::_Hash_impl::hash(__e._M_value);
-	return std::_Hash_impl::__hash_combine(__e._M_cat, __tmp);
-      }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif // _GLIBCXX_COMPATIBILITY_CXX0X
-
-#endif // C++11
-
-#endif // _GLIBCXX_SYSTEM_ERROR
diff --git a/openflow/usr/include/c++/5/tgmath.h b/openflow/usr/include/c++/5/tgmath.h
deleted file mode 100644
index 2ce8f1e..0000000
--- a/openflow/usr/include/c++/5/tgmath.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*- compatibility header.
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tgmath.h
- *  This is a Standard C++ Library header.
- */
-
-#include <bits/c++config.h>
-
-#if __cplusplus >= 201103L
-# include <ctgmath>
-#else
-# if _GLIBCXX_HAVE_TGMATH_H
-#  include_next <tgmath.h>
-# endif
-#endif
-
-#ifndef _GLIBCXX_TGMATH_H
-#define _GLIBCXX_TGMATH_H 1
-
-#endif
diff --git a/openflow/usr/include/c++/5/thread b/openflow/usr/include/c++/5/thread
deleted file mode 100644
index ebbda62..0000000
--- a/openflow/usr/include/c++/5/thread
+++ /dev/null
@@ -1,319 +0,0 @@
-// <thread> -*- C++ -*-
-
-// Copyright (C) 2008-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/thread
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_THREAD
-#define _GLIBCXX_THREAD 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <chrono>
-#include <functional>
-#include <memory>
-#include <bits/functexcept.h>
-#include <bits/functional_hash.h>
-#include <bits/gthr.h>
-
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup threads Threads
-   * @ingroup concurrency
-   *
-   * Classes for thread support.
-   * @{
-   */
-
-  /// thread
-  class thread
-  {
-  public:
-    typedef __gthread_t			native_handle_type;
-    struct _Impl_base;
-    typedef shared_ptr<_Impl_base>	__shared_base_type;
-
-    /// thread::id
-    class id
-    {
-      native_handle_type	_M_thread;
-
-    public:
-      id() noexcept : _M_thread() { }
-
-      explicit
-      id(native_handle_type __id) : _M_thread(__id) { }
-
-    private:
-      friend class thread;
-      friend class hash<thread::id>;
-
-      friend bool
-      operator==(thread::id __x, thread::id __y) noexcept
-      { return __gthread_equal(__x._M_thread, __y._M_thread); }
-
-      friend bool
-      operator<(thread::id __x, thread::id __y) noexcept
-      { return __x._M_thread < __y._M_thread; }
-
-      template<class _CharT, class _Traits>
-	friend basic_ostream<_CharT, _Traits>&
-	operator<<(basic_ostream<_CharT, _Traits>& __out, thread::id __id);
-    };
-
-    // Simple base type that the templatized, derived class containing
-    // an arbitrary functor can be converted to and called.
-    struct _Impl_base
-    {
-      __shared_base_type	_M_this_ptr;
-
-      inline virtual ~_Impl_base();
-
-      virtual void _M_run() = 0;
-    };
-
-    template<typename _Callable>
-      struct _Impl : public _Impl_base
-      {
-	_Callable		_M_func;
-
-	_Impl(_Callable&& __f) : _M_func(std::forward<_Callable>(__f))
-	{ }
-
-	void
-	_M_run() { _M_func(); }
-      };
-
-  private:
-    id				_M_id;
-
-  public:
-    thread() noexcept = default;
-    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-    // 2097.  packaged_task constructors should be constrained
-    thread(thread&) = delete;
-    thread(const thread&) = delete;
-
-    thread(thread&& __t) noexcept
-    { swap(__t); }
-
-    template<typename _Callable, typename... _Args>
-      explicit 
-      thread(_Callable&& __f, _Args&&... __args)
-      {
-#ifdef GTHR_ACTIVE_PROXY
-	// Create a reference to pthread_create, not just the gthr weak symbol
-        _M_start_thread(_M_make_routine(std::__bind_simple(
-                std::forward<_Callable>(__f),
-                std::forward<_Args>(__args)...)),
-	    reinterpret_cast<void(*)()>(&pthread_create));
-#else
-        _M_start_thread(_M_make_routine(std::__bind_simple(
-                std::forward<_Callable>(__f),
-                std::forward<_Args>(__args)...)));
-#endif
-      }
-
-    ~thread()
-    {
-      if (joinable())
-	std::terminate();
-    }
-
-    thread& operator=(const thread&) = delete;
-
-    thread& operator=(thread&& __t) noexcept
-    {
-      if (joinable())
-	std::terminate();
-      swap(__t);
-      return *this;
-    }
-
-    void
-    swap(thread& __t) noexcept
-    { std::swap(_M_id, __t._M_id); }
-
-    bool
-    joinable() const noexcept
-    { return !(_M_id == id()); }
-
-    void
-    join();
-
-    void
-    detach();
-
-    thread::id
-    get_id() const noexcept
-    { return _M_id; }
-
-    /** @pre thread is joinable
-     */
-    native_handle_type
-    native_handle()
-    { return _M_id._M_thread; }
-
-    // Returns a value that hints at the number of hardware thread contexts.
-    static unsigned int
-    hardware_concurrency() noexcept;
-
-  private:
-    void
-    _M_start_thread(__shared_base_type, void (*)());
-
-    void
-    _M_start_thread(__shared_base_type);
-
-    template<typename _Callable>
-      shared_ptr<_Impl<_Callable>>
-      _M_make_routine(_Callable&& __f)
-      {
-	// Create and allocate full data structure, not base.
-	return std::make_shared<_Impl<_Callable>>(std::forward<_Callable>(__f));
-      }
-  };
-
-  inline thread::_Impl_base::~_Impl_base() = default;
-
-  inline void
-  swap(thread& __x, thread& __y) noexcept
-  { __x.swap(__y); }
-
-  inline bool
-  operator!=(thread::id __x, thread::id __y) noexcept
-  { return !(__x == __y); }
-
-  inline bool
-  operator<=(thread::id __x, thread::id __y) noexcept
-  { return !(__y < __x); }
-
-  inline bool
-  operator>(thread::id __x, thread::id __y) noexcept
-  { return __y < __x; }
-
-  inline bool
-  operator>=(thread::id __x, thread::id __y) noexcept
-  { return !(__x < __y); }
-
-  // DR 889.
-  /// std::hash specialization for thread::id.
-  template<>
-    struct hash<thread::id>
-    : public __hash_base<size_t, thread::id>
-    {
-      size_t
-      operator()(const thread::id& __id) const noexcept
-      { return std::_Hash_impl::hash(__id._M_thread); }
-    };
-
-  template<class _CharT, class _Traits>
-    inline basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, thread::id __id)
-    {
-      if (__id == thread::id())
-	return __out << "thread::id of a non-executing thread";
-      else
-	return __out << __id._M_thread;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-
-  /** @namespace std::this_thread
-   *  @brief ISO C++ 2011 entities sub-namespace for thread.
-   *  30.3.2 Namespace this_thread.
-   */
-  namespace this_thread
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /// get_id
-    inline thread::id
-    get_id() noexcept { return thread::id(__gthread_self()); }
-
-    /// yield
-    inline void
-    yield() noexcept
-    {
-#ifdef _GLIBCXX_USE_SCHED_YIELD
-      __gthread_yield();
-#endif
-    }
-
-    void
-    __sleep_for(chrono::seconds, chrono::nanoseconds);
-
-    /// sleep_for
-    template<typename _Rep, typename _Period>
-      inline void
-      sleep_for(const chrono::duration<_Rep, _Period>& __rtime)
-      {
-	if (__rtime <= __rtime.zero())
-	  return;
-	auto __s = chrono::duration_cast<chrono::seconds>(__rtime);
-	auto __ns = chrono::duration_cast<chrono::nanoseconds>(__rtime - __s);
-#ifdef _GLIBCXX_USE_NANOSLEEP
-	__gthread_time_t __ts =
-	  {
-	    static_cast<std::time_t>(__s.count()),
-	    static_cast<long>(__ns.count())
-	  };
-	::nanosleep(&__ts, 0);
-#else
-	__sleep_for(__s, __ns);
-#endif
-      }
-
-    /// sleep_until
-    template<typename _Clock, typename _Duration>
-      inline void
-      sleep_until(const chrono::time_point<_Clock, _Duration>& __atime)
-      {
-	auto __now = _Clock::now();
-	if (__now < __atime)
-	  sleep_for(__atime - __now);
-      }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  }
-
-  // @} group threads
-
-} // namespace
-
-#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
-
-#endif // C++11
-
-#endif // _GLIBCXX_THREAD
diff --git a/openflow/usr/include/c++/5/tr1/array b/openflow/usr/include/c++/5/tr1/array
deleted file mode 100644
index 86ae0e0..0000000
--- a/openflow/usr/include/c++/5/tr1/array
+++ /dev/null
@@ -1,251 +0,0 @@
-// class template array -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/array
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_ARRAY
-#define _GLIBCXX_TR1_ARRAY 1
-
-#pragma GCC system_header
-
-#include <bits/stl_algobase.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @brief A standard container for storing a fixed size sequence of elements.
-   *
-   *  @ingroup sequences
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>.
-   *
-   *  Sets support random access iterators.
-   *
-   *  @param  Tp  Type of element. Required to be a complete type.
-   *  @param  N  Number of elements.
-  */
-  template<typename _Tp, std::size_t _Nm>
-    struct array
-    {
-      typedef _Tp 	    			      value_type;
-      typedef value_type&                   	      reference;
-      typedef const value_type&             	      const_reference;
-      typedef value_type*          		      iterator;
-      typedef const value_type*			      const_iterator;
-      typedef std::size_t                    	      size_type;
-      typedef std::ptrdiff_t                   	      difference_type;
-      typedef std::reverse_iterator<iterator>	      reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>   const_reverse_iterator;
-
-      // Support for zero-sized arrays mandatory.
-      value_type _M_instance[_Nm ? _Nm : 1];
-
-      // No explicit construct/copy/destroy for aggregate type.
-
-      void
-      assign(const value_type& __u)
-      { std::fill_n(begin(), size(), __u); }
-
-      void
-      swap(array& __other)
-      { std::swap_ranges(begin(), end(), __other.begin()); }
-
-      // Iterators.
-      iterator
-      begin()
-      { return iterator(std::__addressof(_M_instance[0])); }
-
-      const_iterator
-      begin() const 
-      { return const_iterator(std::__addressof(_M_instance[0])); }
-
-      iterator
-      end()
-      { return iterator(std::__addressof(_M_instance[_Nm])); }
-
-      const_iterator
-      end() const
-      { return const_iterator(std::__addressof(_M_instance[_Nm])); }
-
-      reverse_iterator 
-      rbegin()
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator 
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator 
-      rend()
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator 
-      rend() const
-      { return const_reverse_iterator(begin()); }
-
-      // Capacity.
-      size_type 
-      size() const { return _Nm; }
-
-      size_type 
-      max_size() const { return _Nm; }
-
-      bool 
-      empty() const { return size() == 0; }
-
-      // Element access.
-      reference
-      operator[](size_type __n)
-      { return _M_instance[__n]; }
-
-      const_reference
-      operator[](size_type __n) const
-      { return _M_instance[__n]; }
-
-      reference
-      at(size_type __n)
-      {
-	if (__n >= _Nm)
-	  std::__throw_out_of_range(__N("array::at"));
-	return _M_instance[__n];
-      }
-
-      const_reference
-      at(size_type __n) const
-      {
-	if (__n >= _Nm)
-	  std::__throw_out_of_range(__N("array::at"));
-	return _M_instance[__n];
-      }
-
-      reference 
-      front()
-      { return *begin(); }
-
-      const_reference 
-      front() const
-      { return *begin(); }
-
-      reference 
-      back()
-      { return _Nm ? *(end() - 1) : *end(); }
-
-      const_reference 
-      back() const
-      { return _Nm ? *(end() - 1) : *end(); }
-
-      _Tp*
-      data()
-      { return std::__addressof(_M_instance[0]); }
-
-      const _Tp*
-      data() const
-      { return std::__addressof(_M_instance[0]); }
-    };
-
-  // Array comparisons.
-  template<typename _Tp, std::size_t _Nm>
-    inline bool 
-    operator==(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return std::equal(__one.begin(), __one.end(), __two.begin()); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator!=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one == __two); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator<(const array<_Tp, _Nm>& __a, const array<_Tp, _Nm>& __b)
-    { 
-      return std::lexicographical_compare(__a.begin(), __a.end(),
-					  __b.begin(), __b.end()); 
-    }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator>(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return __two < __one; }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator<=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one > __two); }
-
-  template<typename _Tp, std::size_t _Nm>
-    inline bool
-    operator>=(const array<_Tp, _Nm>& __one, const array<_Tp, _Nm>& __two)
-    { return !(__one < __two); }
-
-  // Specialized algorithms [6.2.2.2].
-  template<typename _Tp, std::size_t _Nm>
-    inline void
-    swap(array<_Tp, _Nm>& __one, array<_Tp, _Nm>& __two)
-    { __one.swap(__two); }
-
-  // Tuple interface to class template array [6.2.2.5].
-
-  /// tuple_size
-  template<typename _Tp> 
-    class tuple_size;
-
-  /// tuple_element
-  template<int _Int, typename _Tp>
-    class tuple_element;
-
-  template<typename _Tp, std::size_t _Nm>
-    struct tuple_size<array<_Tp, _Nm> >
-    { static const int value = _Nm; };
-
-  template<typename _Tp, std::size_t _Nm>
-    const int
-    tuple_size<array<_Tp, _Nm> >::value;  
-
-  template<int _Int, typename _Tp, std::size_t _Nm>
-    struct tuple_element<_Int, array<_Tp, _Nm> >
-    { typedef _Tp type; };
-
-  template<int _Int, typename _Tp, std::size_t _Nm>
-    inline _Tp&
-    get(array<_Tp, _Nm>& __arr)
-    { return __arr[_Int]; }
-
-  template<int _Int, typename _Tp, std::size_t _Nm>
-    inline const _Tp&
-    get(const array<_Tp, _Nm>& __arr)
-    { return __arr[_Int]; }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _GLIBCXX_TR1_ARRAY
diff --git a/openflow/usr/include/c++/5/tr1/bessel_function.tcc b/openflow/usr/include/c++/5/tr1/bessel_function.tcc
deleted file mode 100644
index 37f136b..0000000
--- a/openflow/usr/include/c++/5/tr1/bessel_function.tcc
+++ /dev/null
@@ -1,628 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/bessel_function.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland.
-//
-// References:
-//   (1) Handbook of Mathematical Functions,
-//       ed. Milton Abramowitz and Irene A. Stegun,
-//       Dover Publications,
-//       Section 9, pp. 355-434, Section 10 pp. 435-478
-//   (2) The Gnu Scientific Library, http://www.gnu.org/software/gsl
-//   (3) Numerical Recipes in C, by W. H. Press, S. A. Teukolsky,
-//       W. T. Vetterling, B. P. Flannery, Cambridge University Press (1992),
-//       2nd ed, pp. 240-245
-
-#ifndef _GLIBCXX_TR1_BESSEL_FUNCTION_TCC
-#define _GLIBCXX_TR1_BESSEL_FUNCTION_TCC 1
-
-#include "special_function_util.h"
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.2] Special functions
-
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     *   @brief Compute the gamma functions required by the Temme series
-     *          expansions of @f$ N_\nu(x) @f$ and @f$ K_\nu(x) @f$.
-     *   @f[
-     *     \Gamma_1 = \frac{1}{2\mu}
-     *                [\frac{1}{\Gamma(1 - \mu)} - \frac{1}{\Gamma(1 + \mu)}]
-     *   @f]
-     *   and
-     *   @f[
-     *     \Gamma_2 = \frac{1}{2}
-     *                [\frac{1}{\Gamma(1 - \mu)} + \frac{1}{\Gamma(1 + \mu)}]
-     *   @f]
-     *   where @f$ -1/2 <= \mu <= 1/2 @f$ is @f$ \mu = \nu - N @f$ and @f$ N @f$.
-     *   is the nearest integer to @f$ \nu @f$.
-     *   The values of \f$ \Gamma(1 + \mu) \f$ and \f$ \Gamma(1 - \mu) \f$
-     *   are returned as well.
-     * 
-     *   The accuracy requirements on this are exquisite.
-     *
-     *   @param __mu     The input parameter of the gamma functions.
-     *   @param __gam1   The output function \f$ \Gamma_1(\mu) \f$
-     *   @param __gam2   The output function \f$ \Gamma_2(\mu) \f$
-     *   @param __gampl  The output function \f$ \Gamma(1 + \mu) \f$
-     *   @param __gammi  The output function \f$ \Gamma(1 - \mu) \f$
-     */
-    template <typename _Tp>
-    void
-    __gamma_temme(_Tp __mu,
-                  _Tp & __gam1, _Tp & __gam2, _Tp & __gampl, _Tp & __gammi)
-    {
-#if _GLIBCXX_USE_C99_MATH_TR1
-      __gampl = _Tp(1) / std::tr1::tgamma(_Tp(1) + __mu);
-      __gammi = _Tp(1) / std::tr1::tgamma(_Tp(1) - __mu);
-#else
-      __gampl = _Tp(1) / __gamma(_Tp(1) + __mu);
-      __gammi = _Tp(1) / __gamma(_Tp(1) - __mu);
-#endif
-
-      if (std::abs(__mu) < std::numeric_limits<_Tp>::epsilon())
-        __gam1 = -_Tp(__numeric_constants<_Tp>::__gamma_e());
-      else
-        __gam1 = (__gammi - __gampl) / (_Tp(2) * __mu);
-
-      __gam2 = (__gammi + __gampl) / (_Tp(2));
-
-      return;
-    }
-
-
-    /**
-     *   @brief  Compute the Bessel @f$ J_\nu(x) @f$ and Neumann
-     *           @f$ N_\nu(x) @f$ functions and their first derivatives
-     *           @f$ J'_\nu(x) @f$ and @f$ N'_\nu(x) @f$ respectively.
-     *           These four functions are computed together for numerical
-     *           stability.
-     *
-     *   @param  __nu  The order of the Bessel functions.
-     *   @param  __x   The argument of the Bessel functions.
-     *   @param  __Jnu  The output Bessel function of the first kind.
-     *   @param  __Nnu  The output Neumann function (Bessel function of the second kind).
-     *   @param  __Jpnu  The output derivative of the Bessel function of the first kind.
-     *   @param  __Npnu  The output derivative of the Neumann function.
-     */
-    template <typename _Tp>
-    void
-    __bessel_jn(_Tp __nu, _Tp __x,
-                _Tp & __Jnu, _Tp & __Nnu, _Tp & __Jpnu, _Tp & __Npnu)
-    {
-      if (__x == _Tp(0))
-        {
-          if (__nu == _Tp(0))
-            {
-              __Jnu = _Tp(1);
-              __Jpnu = _Tp(0);
-            }
-          else if (__nu == _Tp(1))
-            {
-              __Jnu = _Tp(0);
-              __Jpnu = _Tp(0.5L);
-            }
-          else
-            {
-              __Jnu = _Tp(0);
-              __Jpnu = _Tp(0);
-            }
-          __Nnu = -std::numeric_limits<_Tp>::infinity();
-          __Npnu = std::numeric_limits<_Tp>::infinity();
-          return;
-        }
-
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      //  When the multiplier is N i.e.
-      //  fp_min = N * min()
-      //  Then J_0 and N_0 tank at x = 8 * N (J_0 = 0 and N_0 = nan)!
-      //const _Tp __fp_min = _Tp(20) * std::numeric_limits<_Tp>::min();
-      const _Tp __fp_min = std::sqrt(std::numeric_limits<_Tp>::min());
-      const int __max_iter = 15000;
-      const _Tp __x_min = _Tp(2);
-
-      const int __nl = (__x < __x_min
-                    ? static_cast<int>(__nu + _Tp(0.5L))
-                    : std::max(0, static_cast<int>(__nu - __x + _Tp(1.5L))));
-
-      const _Tp __mu = __nu - __nl;
-      const _Tp __mu2 = __mu * __mu;
-      const _Tp __xi = _Tp(1) / __x;
-      const _Tp __xi2 = _Tp(2) * __xi;
-      _Tp __w = __xi2 / __numeric_constants<_Tp>::__pi();
-      int __isign = 1;
-      _Tp __h = __nu * __xi;
-      if (__h < __fp_min)
-        __h = __fp_min;
-      _Tp __b = __xi2 * __nu;
-      _Tp __d = _Tp(0);
-      _Tp __c = __h;
-      int __i;
-      for (__i = 1; __i <= __max_iter; ++__i)
-        {
-          __b += __xi2;
-          __d = __b - __d;
-          if (std::abs(__d) < __fp_min)
-            __d = __fp_min;
-          __c = __b - _Tp(1) / __c;
-          if (std::abs(__c) < __fp_min)
-            __c = __fp_min;
-          __d = _Tp(1) / __d;
-          const _Tp __del = __c * __d;
-          __h *= __del;
-          if (__d < _Tp(0))
-            __isign = -__isign;
-          if (std::abs(__del - _Tp(1)) < __eps)
-            break;
-        }
-      if (__i > __max_iter)
-        std::__throw_runtime_error(__N("Argument x too large in __bessel_jn; "
-                                       "try asymptotic expansion."));
-      _Tp __Jnul = __isign * __fp_min;
-      _Tp __Jpnul = __h * __Jnul;
-      _Tp __Jnul1 = __Jnul;
-      _Tp __Jpnu1 = __Jpnul;
-      _Tp __fact = __nu * __xi;
-      for ( int __l = __nl; __l >= 1; --__l )
-        {
-          const _Tp __Jnutemp = __fact * __Jnul + __Jpnul;
-          __fact -= __xi;
-          __Jpnul = __fact * __Jnutemp - __Jnul;
-          __Jnul = __Jnutemp;
-        }
-      if (__Jnul == _Tp(0))
-        __Jnul = __eps;
-      _Tp __f= __Jpnul / __Jnul;
-      _Tp __Nmu, __Nnu1, __Npmu, __Jmu;
-      if (__x < __x_min)
-        {
-          const _Tp __x2 = __x / _Tp(2);
-          const _Tp __pimu = __numeric_constants<_Tp>::__pi() * __mu;
-          _Tp __fact = (std::abs(__pimu) < __eps
-                      ? _Tp(1) : __pimu / std::sin(__pimu));
-          _Tp __d = -std::log(__x2);
-          _Tp __e = __mu * __d;
-          _Tp __fact2 = (std::abs(__e) < __eps
-                       ? _Tp(1) : std::sinh(__e) / __e);
-          _Tp __gam1, __gam2, __gampl, __gammi;
-          __gamma_temme(__mu, __gam1, __gam2, __gampl, __gammi);
-          _Tp __ff = (_Tp(2) / __numeric_constants<_Tp>::__pi())
-                   * __fact * (__gam1 * std::cosh(__e) + __gam2 * __fact2 * __d);
-          __e = std::exp(__e);
-          _Tp __p = __e / (__numeric_constants<_Tp>::__pi() * __gampl);
-          _Tp __q = _Tp(1) / (__e * __numeric_constants<_Tp>::__pi() * __gammi);
-          const _Tp __pimu2 = __pimu / _Tp(2);
-          _Tp __fact3 = (std::abs(__pimu2) < __eps
-                       ? _Tp(1) : std::sin(__pimu2) / __pimu2 );
-          _Tp __r = __numeric_constants<_Tp>::__pi() * __pimu2 * __fact3 * __fact3;
-          _Tp __c = _Tp(1);
-          __d = -__x2 * __x2;
-          _Tp __sum = __ff + __r * __q;
-          _Tp __sum1 = __p;
-          for (__i = 1; __i <= __max_iter; ++__i)
-            {
-              __ff = (__i * __ff + __p + __q) / (__i * __i - __mu2);
-              __c *= __d / _Tp(__i);
-              __p /= _Tp(__i) - __mu;
-              __q /= _Tp(__i) + __mu;
-              const _Tp __del = __c * (__ff + __r * __q);
-              __sum += __del; 
-              const _Tp __del1 = __c * __p - __i * __del;
-              __sum1 += __del1;
-              if ( std::abs(__del) < __eps * (_Tp(1) + std::abs(__sum)) )
-                break;
-            }
-          if ( __i > __max_iter )
-            std::__throw_runtime_error(__N("Bessel y series failed to converge "
-                                           "in __bessel_jn."));
-          __Nmu = -__sum;
-          __Nnu1 = -__sum1 * __xi2;
-          __Npmu = __mu * __xi * __Nmu - __Nnu1;
-          __Jmu = __w / (__Npmu - __f * __Nmu);
-        }
-      else
-        {
-          _Tp __a = _Tp(0.25L) - __mu2;
-          _Tp __q = _Tp(1);
-          _Tp __p = -__xi / _Tp(2);
-          _Tp __br = _Tp(2) * __x;
-          _Tp __bi = _Tp(2);
-          _Tp __fact = __a * __xi / (__p * __p + __q * __q);
-          _Tp __cr = __br + __q * __fact;
-          _Tp __ci = __bi + __p * __fact;
-          _Tp __den = __br * __br + __bi * __bi;
-          _Tp __dr = __br / __den;
-          _Tp __di = -__bi / __den;
-          _Tp __dlr = __cr * __dr - __ci * __di;
-          _Tp __dli = __cr * __di + __ci * __dr;
-          _Tp __temp = __p * __dlr - __q * __dli;
-          __q = __p * __dli + __q * __dlr;
-          __p = __temp;
-          int __i;
-          for (__i = 2; __i <= __max_iter; ++__i)
-            {
-              __a += _Tp(2 * (__i - 1));
-              __bi += _Tp(2);
-              __dr = __a * __dr + __br;
-              __di = __a * __di + __bi;
-              if (std::abs(__dr) + std::abs(__di) < __fp_min)
-                __dr = __fp_min;
-              __fact = __a / (__cr * __cr + __ci * __ci);
-              __cr = __br + __cr * __fact;
-              __ci = __bi - __ci * __fact;
-              if (std::abs(__cr) + std::abs(__ci) < __fp_min)
-                __cr = __fp_min;
-              __den = __dr * __dr + __di * __di;
-              __dr /= __den;
-              __di /= -__den;
-              __dlr = __cr * __dr - __ci * __di;
-              __dli = __cr * __di + __ci * __dr;
-              __temp = __p * __dlr - __q * __dli;
-              __q = __p * __dli + __q * __dlr;
-              __p = __temp;
-              if (std::abs(__dlr - _Tp(1)) + std::abs(__dli) < __eps)
-                break;
-          }
-          if (__i > __max_iter)
-            std::__throw_runtime_error(__N("Lentz's method failed "
-                                           "in __bessel_jn."));
-          const _Tp __gam = (__p - __f) / __q;
-          __Jmu = std::sqrt(__w / ((__p - __f) * __gam + __q));
-#if _GLIBCXX_USE_C99_MATH_TR1
-          __Jmu = std::tr1::copysign(__Jmu, __Jnul);
-#else
-          if (__Jmu * __Jnul < _Tp(0))
-            __Jmu = -__Jmu;
-#endif
-          __Nmu = __gam * __Jmu;
-          __Npmu = (__p + __q / __gam) * __Nmu;
-          __Nnu1 = __mu * __xi * __Nmu - __Npmu;
-      }
-      __fact = __Jmu / __Jnul;
-      __Jnu = __fact * __Jnul1;
-      __Jpnu = __fact * __Jpnu1;
-      for (__i = 1; __i <= __nl; ++__i)
-        {
-          const _Tp __Nnutemp = (__mu + __i) * __xi2 * __Nnu1 - __Nmu;
-          __Nmu = __Nnu1;
-          __Nnu1 = __Nnutemp;
-        }
-      __Nnu = __Nmu;
-      __Npnu = __nu * __xi * __Nmu - __Nnu1;
-
-      return;
-    }
-
-
-    /**
-     *   @brief This routine computes the asymptotic cylindrical Bessel
-     *          and Neumann functions of order nu: \f$ J_{\nu} \f$,
-     *          \f$ N_{\nu} \f$.
-     *
-     *   References:
-     *    (1) Handbook of Mathematical Functions,
-     *        ed. Milton Abramowitz and Irene A. Stegun,
-     *        Dover Publications,
-     *        Section 9 p. 364, Equations 9.2.5-9.2.10
-     *
-     *   @param  __nu  The order of the Bessel functions.
-     *   @param  __x   The argument of the Bessel functions.
-     *   @param  __Jnu  The output Bessel function of the first kind.
-     *   @param  __Nnu  The output Neumann function (Bessel function of the second kind).
-     */
-    template <typename _Tp>
-    void
-    __cyl_bessel_jn_asymp(_Tp __nu, _Tp __x, _Tp & __Jnu, _Tp & __Nnu)
-    {
-      const _Tp __mu   = _Tp(4) * __nu * __nu;
-      const _Tp __mum1 = __mu - _Tp(1);
-      const _Tp __mum9 = __mu - _Tp(9);
-      const _Tp __mum25 = __mu - _Tp(25);
-      const _Tp __mum49 = __mu - _Tp(49);
-      const _Tp __xx = _Tp(64) * __x * __x;
-      const _Tp __P = _Tp(1) - __mum1 * __mum9 / (_Tp(2) * __xx)
-                    * (_Tp(1) - __mum25 * __mum49 / (_Tp(12) * __xx));
-      const _Tp __Q = __mum1 / (_Tp(8) * __x)
-                    * (_Tp(1) - __mum9 * __mum25 / (_Tp(6) * __xx));
-
-      const _Tp __chi = __x - (__nu + _Tp(0.5L))
-                            * __numeric_constants<_Tp>::__pi_2();
-      const _Tp __c = std::cos(__chi);
-      const _Tp __s = std::sin(__chi);
-
-      const _Tp __coef = std::sqrt(_Tp(2)
-                             / (__numeric_constants<_Tp>::__pi() * __x));
-      __Jnu = __coef * (__c * __P - __s * __Q);
-      __Nnu = __coef * (__s * __P + __c * __Q);
-
-      return;
-    }
-
-
-    /**
-     *   @brief This routine returns the cylindrical Bessel functions
-     *          of order \f$ \nu \f$: \f$ J_{\nu} \f$ or \f$ I_{\nu} \f$
-     *          by series expansion.
-     *
-     *   The modified cylindrical Bessel function is:
-     *   @f[
-     *    Z_{\nu}(x) = \sum_{k=0}^{\infty}
-     *              \frac{\sigma^k (x/2)^{\nu + 2k}}{k!\Gamma(\nu+k+1)}
-     *   @f]
-     *   where \f$ \sigma = +1 \f$ or\f$  -1 \f$ for
-     *   \f$ Z = I \f$ or \f$ J \f$ respectively.
-     * 
-     *   See Abramowitz & Stegun, 9.1.10
-     *       Abramowitz & Stegun, 9.6.7
-     *    (1) Handbook of Mathematical Functions,
-     *        ed. Milton Abramowitz and Irene A. Stegun,
-     *        Dover Publications,
-     *        Equation 9.1.10 p. 360 and Equation 9.6.10 p. 375
-     *
-     *   @param  __nu  The order of the Bessel function.
-     *   @param  __x   The argument of the Bessel function.
-     *   @param  __sgn  The sign of the alternate terms
-     *                  -1 for the Bessel function of the first kind.
-     *                  +1 for the modified Bessel function of the first kind.
-     *   @return  The output Bessel function.
-     */
-    template <typename _Tp>
-    _Tp
-    __cyl_bessel_ij_series(_Tp __nu, _Tp __x, _Tp __sgn,
-                           unsigned int __max_iter)
-    {
-      if (__x == _Tp(0))
-	return __nu == _Tp(0) ? _Tp(1) : _Tp(0);
-
-      const _Tp __x2 = __x / _Tp(2);
-      _Tp __fact = __nu * std::log(__x2);
-#if _GLIBCXX_USE_C99_MATH_TR1
-      __fact -= std::tr1::lgamma(__nu + _Tp(1));
-#else
-      __fact -= __log_gamma(__nu + _Tp(1));
-#endif
-      __fact = std::exp(__fact);
-      const _Tp __xx4 = __sgn * __x2 * __x2;
-      _Tp __Jn = _Tp(1);
-      _Tp __term = _Tp(1);
-
-      for (unsigned int __i = 1; __i < __max_iter; ++__i)
-        {
-          __term *= __xx4 / (_Tp(__i) * (__nu + _Tp(__i)));
-          __Jn += __term;
-          if (std::abs(__term / __Jn) < std::numeric_limits<_Tp>::epsilon())
-            break;
-        }
-
-      return __fact * __Jn;
-    }
-
-
-    /**
-     *   @brief  Return the Bessel function of order \f$ \nu \f$:
-     *           \f$ J_{\nu}(x) \f$.
-     *
-     *   The cylindrical Bessel function is:
-     *   @f[
-     *    J_{\nu}(x) = \sum_{k=0}^{\infty}
-     *              \frac{(-1)^k (x/2)^{\nu + 2k}}{k!\Gamma(\nu+k+1)}
-     *   @f]
-     *
-     *   @param  __nu  The order of the Bessel function.
-     *   @param  __x   The argument of the Bessel function.
-     *   @return  The output Bessel function.
-     */
-    template<typename _Tp>
-    _Tp
-    __cyl_bessel_j(_Tp __nu, _Tp __x)
-    {
-      if (__nu < _Tp(0) || __x < _Tp(0))
-        std::__throw_domain_error(__N("Bad argument "
-                                      "in __cyl_bessel_j."));
-      else if (__isnan(__nu) || __isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__x * __x < _Tp(10) * (__nu + _Tp(1)))
-        return __cyl_bessel_ij_series(__nu, __x, -_Tp(1), 200);
-      else if (__x > _Tp(1000))
-        {
-          _Tp __J_nu, __N_nu;
-          __cyl_bessel_jn_asymp(__nu, __x, __J_nu, __N_nu);
-          return __J_nu;
-        }
-      else
-        {
-          _Tp __J_nu, __N_nu, __Jp_nu, __Np_nu;
-          __bessel_jn(__nu, __x, __J_nu, __N_nu, __Jp_nu, __Np_nu);
-          return __J_nu;
-        }
-    }
-
-
-    /**
-     *   @brief  Return the Neumann function of order \f$ \nu \f$:
-     *           \f$ N_{\nu}(x) \f$.
-     *
-     *   The Neumann function is defined by:
-     *   @f[
-     *      N_{\nu}(x) = \frac{J_{\nu}(x) \cos \nu\pi - J_{-\nu}(x)}
-     *                        {\sin \nu\pi}
-     *   @f]
-     *   where for integral \f$ \nu = n \f$ a limit is taken:
-     *   \f$ lim_{\nu \to n} \f$.
-     *
-     *   @param  __nu  The order of the Neumann function.
-     *   @param  __x   The argument of the Neumann function.
-     *   @return  The output Neumann function.
-     */
-    template<typename _Tp>
-    _Tp
-    __cyl_neumann_n(_Tp __nu, _Tp __x)
-    {
-      if (__nu < _Tp(0) || __x < _Tp(0))
-        std::__throw_domain_error(__N("Bad argument "
-                                      "in __cyl_neumann_n."));
-      else if (__isnan(__nu) || __isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__x > _Tp(1000))
-        {
-          _Tp __J_nu, __N_nu;
-          __cyl_bessel_jn_asymp(__nu, __x, __J_nu, __N_nu);
-          return __N_nu;
-        }
-      else
-        {
-          _Tp __J_nu, __N_nu, __Jp_nu, __Np_nu;
-          __bessel_jn(__nu, __x, __J_nu, __N_nu, __Jp_nu, __Np_nu);
-          return __N_nu;
-        }
-    }
-
-
-    /**
-     *   @brief  Compute the spherical Bessel @f$ j_n(x) @f$
-     *           and Neumann @f$ n_n(x) @f$ functions and their first
-     *           derivatives @f$ j'_n(x) @f$ and @f$ n'_n(x) @f$
-     *           respectively.
-     *
-     *   @param  __n  The order of the spherical Bessel function.
-     *   @param  __x  The argument of the spherical Bessel function.
-     *   @param  __j_n  The output spherical Bessel function.
-     *   @param  __n_n  The output spherical Neumann function.
-     *   @param  __jp_n The output derivative of the spherical Bessel function.
-     *   @param  __np_n The output derivative of the spherical Neumann function.
-     */
-    template <typename _Tp>
-    void
-    __sph_bessel_jn(unsigned int __n, _Tp __x,
-                    _Tp & __j_n, _Tp & __n_n, _Tp & __jp_n, _Tp & __np_n)
-    {
-      const _Tp __nu = _Tp(__n) + _Tp(0.5L);
-
-      _Tp __J_nu, __N_nu, __Jp_nu, __Np_nu;
-      __bessel_jn(__nu, __x, __J_nu, __N_nu, __Jp_nu, __Np_nu);
-
-      const _Tp __factor = __numeric_constants<_Tp>::__sqrtpio2()
-                         / std::sqrt(__x);
-
-      __j_n = __factor * __J_nu;
-      __n_n = __factor * __N_nu;
-      __jp_n = __factor * __Jp_nu - __j_n / (_Tp(2) * __x);
-      __np_n = __factor * __Np_nu - __n_n / (_Tp(2) * __x);
-
-      return;
-    }
-
-
-    /**
-     *   @brief  Return the spherical Bessel function
-     *           @f$ j_n(x) @f$ of order n.
-     *
-     *   The spherical Bessel function is defined by:
-     *   @f[
-     *    j_n(x) = \left( \frac{\pi}{2x} \right) ^{1/2} J_{n+1/2}(x)
-     *   @f]
-     *
-     *   @param  __n  The order of the spherical Bessel function.
-     *   @param  __x  The argument of the spherical Bessel function.
-     *   @return  The output spherical Bessel function.
-     */
-    template <typename _Tp>
-    _Tp
-    __sph_bessel(unsigned int __n, _Tp __x)
-    {
-      if (__x < _Tp(0))
-        std::__throw_domain_error(__N("Bad argument "
-                                      "in __sph_bessel."));
-      else if (__isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__x == _Tp(0))
-        {
-          if (__n == 0)
-            return _Tp(1);
-          else
-            return _Tp(0);
-        }
-      else
-        {
-          _Tp __j_n, __n_n, __jp_n, __np_n;
-          __sph_bessel_jn(__n, __x, __j_n, __n_n, __jp_n, __np_n);
-          return __j_n;
-        }
-    }
-
-
-    /**
-     *   @brief  Return the spherical Neumann function
-     *           @f$ n_n(x) @f$.
-     *
-     *   The spherical Neumann function is defined by:
-     *   @f[
-     *    n_n(x) = \left( \frac{\pi}{2x} \right) ^{1/2} N_{n+1/2}(x)
-     *   @f]
-     *
-     *   @param  __n  The order of the spherical Neumann function.
-     *   @param  __x  The argument of the spherical Neumann function.
-     *   @return  The output spherical Neumann function.
-     */
-    template <typename _Tp>
-    _Tp
-    __sph_neumann(unsigned int __n, _Tp __x)
-    {
-      if (__x < _Tp(0))
-        std::__throw_domain_error(__N("Bad argument "
-                                      "in __sph_neumann."));
-      else if (__isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__x == _Tp(0))
-        return -std::numeric_limits<_Tp>::infinity();
-      else
-        {
-          _Tp __j_n, __n_n, __jp_n, __np_n;
-          __sph_bessel_jn(__n, __x, __j_n, __n_n, __jp_n, __np_n);
-          return __n_n;
-        }
-    }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_BESSEL_FUNCTION_TCC
diff --git a/openflow/usr/include/c++/5/tr1/beta_function.tcc b/openflow/usr/include/c++/5/tr1/beta_function.tcc
deleted file mode 100644
index dd1418e..0000000
--- a/openflow/usr/include/c++/5/tr1/beta_function.tcc
+++ /dev/null
@@ -1,197 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/beta_function.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland based on:
-//   (1) Handbook of Mathematical Functions,
-//       ed. Milton Abramowitz and Irene A. Stegun,
-//       Dover Publications,
-//       Section 6, pp. 253-266
-//   (2) The Gnu Scientific Library, http://www.gnu.org/software/gsl
-//   (3) Numerical Recipes in C, by W. H. Press, S. A. Teukolsky,
-//       W. T. Vetterling, B. P. Flannery, Cambridge University Press (1992),
-//       2nd ed, pp. 213-216
-//   (4) Gamma, Exploring Euler's Constant, Julian Havil,
-//       Princeton, 2003.
-
-#ifndef _GLIBCXX_TR1_BETA_FUNCTION_TCC
-#define _GLIBCXX_TR1_BETA_FUNCTION_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.2] Special functions
-
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     *   @brief  Return the beta function: \f$B(x,y)\f$.
-     * 
-     *   The beta function is defined by
-     *   @f[
-     *     B(x,y) = \frac{\Gamma(x)\Gamma(y)}{\Gamma(x+y)}
-     *   @f]
-     *
-     *   @param __x The first argument of the beta function.
-     *   @param __y The second argument of the beta function.
-     *   @return  The beta function.
-     */
-    template<typename _Tp>
-    _Tp
-    __beta_gamma(_Tp __x, _Tp __y)
-    {
-
-      _Tp __bet;
-#if _GLIBCXX_USE_C99_MATH_TR1
-      if (__x > __y)
-        {
-          __bet = std::tr1::tgamma(__x)
-                / std::tr1::tgamma(__x + __y);
-          __bet *= std::tr1::tgamma(__y);
-        }
-      else
-        {
-          __bet = std::tr1::tgamma(__y)
-                / std::tr1::tgamma(__x + __y);
-          __bet *= std::tr1::tgamma(__x);
-        }
-#else
-      if (__x > __y)
-        {
-          __bet = __gamma(__x) / __gamma(__x + __y);
-          __bet *= __gamma(__y);
-        }
-      else
-        {
-          __bet = __gamma(__y) / __gamma(__x + __y);
-          __bet *= __gamma(__x);
-        }
-#endif
-
-      return __bet;
-    }
-
-    /**
-     *   @brief  Return the beta function \f$B(x,y)\f$ using
-     *           the log gamma functions.
-     * 
-     *   The beta function is defined by
-     *   @f[
-     *     B(x,y) = \frac{\Gamma(x)\Gamma(y)}{\Gamma(x+y)}
-     *   @f]
-     *
-     *   @param __x The first argument of the beta function.
-     *   @param __y The second argument of the beta function.
-     *   @return  The beta function.
-     */
-    template<typename _Tp>
-    _Tp
-    __beta_lgamma(_Tp __x, _Tp __y)
-    {
-#if _GLIBCXX_USE_C99_MATH_TR1
-      _Tp __bet = std::tr1::lgamma(__x)
-                + std::tr1::lgamma(__y)
-                - std::tr1::lgamma(__x + __y);
-#else
-      _Tp __bet = __log_gamma(__x)
-                + __log_gamma(__y)
-                - __log_gamma(__x + __y);
-#endif
-      __bet = std::exp(__bet);
-      return __bet;
-    }
-
-
-    /**
-     *   @brief  Return the beta function \f$B(x,y)\f$ using
-     *           the product form.
-     * 
-     *   The beta function is defined by
-     *   @f[
-     *     B(x,y) = \frac{\Gamma(x)\Gamma(y)}{\Gamma(x+y)}
-     *   @f]
-     *
-     *   @param __x The first argument of the beta function.
-     *   @param __y The second argument of the beta function.
-     *   @return  The beta function.
-     */
-    template<typename _Tp>
-    _Tp
-    __beta_product(_Tp __x, _Tp __y)
-    {
-
-      _Tp __bet = (__x + __y) / (__x * __y);
-
-      unsigned int __max_iter = 1000000;
-      for (unsigned int __k = 1; __k < __max_iter; ++__k)
-        {
-          _Tp __term = (_Tp(1) + (__x + __y) / __k)
-                     / ((_Tp(1) + __x / __k) * (_Tp(1) + __y / __k));
-          __bet *= __term;
-        }
-
-      return __bet;
-    }
-
-
-    /**
-     *   @brief  Return the beta function \f$ B(x,y) \f$.
-     * 
-     *   The beta function is defined by
-     *   @f[
-     *     B(x,y) = \frac{\Gamma(x)\Gamma(y)}{\Gamma(x+y)}
-     *   @f]
-     *
-     *   @param __x The first argument of the beta function.
-     *   @param __y The second argument of the beta function.
-     *   @return  The beta function.
-     */
-    template<typename _Tp>
-    inline _Tp
-    __beta(_Tp __x, _Tp __y)
-    {
-      if (__isnan(__x) || __isnan(__y))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else
-        return __beta_lgamma(__x, __y);
-    }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_BETA_FUNCTION_TCC
diff --git a/openflow/usr/include/c++/5/tr1/ccomplex b/openflow/usr/include/c++/5/tr1/ccomplex
deleted file mode 100644
index b033ca3..0000000
--- a/openflow/usr/include/c++/5/tr1/ccomplex
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 ccomplex -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/ccomplex
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CCOMPLEX
-#define _GLIBCXX_TR1_CCOMPLEX 1
-
-#include <tr1/complex>
-
-#endif // _GLIBCXX_TR1_CCOMPLEX
diff --git a/openflow/usr/include/c++/5/tr1/cctype b/openflow/usr/include/c++/5/tr1/cctype
deleted file mode 100644
index eae5bab..0000000
--- a/openflow/usr/include/c++/5/tr1/cctype
+++ /dev/null
@@ -1,49 +0,0 @@
-// TR1 cctype -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cctype
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CCTYPE
-#define _GLIBCXX_TR1_CCTYPE 1
-
-#include <bits/c++config.h>
-#include <cctype>
-
-#ifdef _GLIBCXX_USE_C99_CTYPE_TR1
-
-#undef isblank
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  using ::isblank;
-}
-}
-
-#endif
-
-#endif // _GLIBCXX_TR1_CCTYPE
diff --git a/openflow/usr/include/c++/5/tr1/cfenv b/openflow/usr/include/c++/5/tr1/cfenv
deleted file mode 100644
index b8a071c..0000000
--- a/openflow/usr/include/c++/5/tr1/cfenv
+++ /dev/null
@@ -1,81 +0,0 @@
-// TR1 cfenv -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cfenv
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CFENV
-#define _GLIBCXX_TR1_CFENV 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-#if _GLIBCXX_HAVE_FENV_H
-# include <fenv.h>
-#endif
-
-#ifdef _GLIBCXX_USE_C99_FENV_TR1
-
-#undef feclearexcept
-#undef fegetexceptflag
-#undef feraiseexcept
-#undef fesetexceptflag
-#undef fetestexcept
-#undef fegetround
-#undef fesetround
-#undef fegetenv
-#undef feholdexcept
-#undef fesetenv
-#undef feupdateenv
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // types
-  using ::fenv_t;
-  using ::fexcept_t;
-
-  // functions
-  using ::feclearexcept;
-  using ::fegetexceptflag;
-  using ::feraiseexcept;
-  using ::fesetexceptflag;
-  using ::fetestexcept;
-
-  using ::fegetround;
-  using ::fesetround;
-
-  using ::fegetenv;
-  using ::feholdexcept;
-  using ::fesetenv;
-  using ::feupdateenv;
-}
-}
-
-#endif // _GLIBCXX_USE_C99_FENV_TR1
-
-#endif // _GLIBCXX_TR1_CFENV
diff --git a/openflow/usr/include/c++/5/tr1/cfloat b/openflow/usr/include/c++/5/tr1/cfloat
deleted file mode 100644
index 79cfe95..0000000
--- a/openflow/usr/include/c++/5/tr1/cfloat
+++ /dev/null
@@ -1,42 +0,0 @@
-// TR1 cfloat -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cfloat
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CFLOAT
-#define _GLIBCXX_TR1_CFLOAT 1
-
-#include <cfloat>
-
-#ifndef DECIMAL_DIG
-#define DECIMAL_DIG __DECIMAL_DIG__
-#endif
-
-#ifndef FLT_EVAL_METHOD
-#define FLT_EVAL_METHOD __FLT_EVAL_METHOD__
-#endif
-
-#endif //_GLIBCXX_TR1_CFLOAT 
diff --git a/openflow/usr/include/c++/5/tr1/cinttypes b/openflow/usr/include/c++/5/tr1/cinttypes
deleted file mode 100644
index b635c8b..0000000
--- a/openflow/usr/include/c++/5/tr1/cinttypes
+++ /dev/null
@@ -1,84 +0,0 @@
-// TR1 cinttypes -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cinttypes
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CINTTYPES
-#define _GLIBCXX_TR1_CINTTYPES 1
-
-#pragma GCC system_header
-
-#include <tr1/cstdint>
-
-// For 8.11.1/1 (see C99, Note 184)
-#if _GLIBCXX_HAVE_INTTYPES_H
-# ifndef __STDC_FORMAT_MACROS
-#  define _UNDEF__STDC_FORMAT_MACROS
-#  define __STDC_FORMAT_MACROS
-# endif
-# include <inttypes.h>
-# ifdef _UNDEF__STDC_FORMAT_MACROS
-#  undef __STDC_FORMAT_MACROS
-#  undef _UNDEF__STDC_FORMAT_MACROS
-# endif
-#endif
-
-#ifdef _GLIBCXX_USE_C99_INTTYPES_TR1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // types
-  using ::imaxdiv_t;
-
-  // functions
-  using ::imaxabs;
-
-  // May collide with _Longlong abs(_Longlong), and is not described
-  // anywhere outside the synopsis.  Likely, a defect.
-  //
-  // intmax_t abs(intmax_t)
-
-  using ::imaxdiv;
-
-  // Likewise, with lldiv_t div(_Longlong, _Longlong).
-  //
-  // imaxdiv_t div(intmax_t, intmax_t)
-
-  using ::strtoimax;
-  using ::strtoumax;
-
-#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_C99_INTTYPES_WCHAR_T_TR1
-  using ::wcstoimax;
-  using ::wcstoumax;
-#endif
-}
-}
-
-#endif // _GLIBCXX_USE_C99_INTTYPES_TR1
-
-#endif // _GLIBCXX_TR1_CINTTYPES
diff --git a/openflow/usr/include/c++/5/tr1/climits b/openflow/usr/include/c++/5/tr1/climits
deleted file mode 100644
index 52b16b7..0000000
--- a/openflow/usr/include/c++/5/tr1/climits
+++ /dev/null
@@ -1,46 +0,0 @@
-// TR1 climits -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/climits
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CLIMITS
-#define _GLIBCXX_TR1_CLIMITS 1
-
-#include <climits>
-
-#ifndef LLONG_MIN
-#define LLONG_MIN (-__LONG_LONG_MAX__ - 1)
-#endif
-
-#ifndef LLONG_MAX
-#define LLONG_MAX __LONG_LONG_MAX__
-#endif
-
-#ifndef ULLONG_MAX
-#define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1)
-#endif
-
-#endif // _GLIBCXX_TR1_CLIMITS
diff --git a/openflow/usr/include/c++/5/tr1/cmath b/openflow/usr/include/c++/5/tr1/cmath
deleted file mode 100644
index 181cc24..0000000
--- a/openflow/usr/include/c++/5/tr1/cmath
+++ /dev/null
@@ -1,1517 +0,0 @@
-// TR1 cmath -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cmath
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CMATH
-#define _GLIBCXX_TR1_CMATH 1
-
-#pragma GCC system_header
-
-#include <cmath>
-
-#ifdef _GLIBCXX_USE_C99_MATH_TR1
-
-#undef acosh
-#undef acoshf
-#undef acoshl
-#undef asinh
-#undef asinhf
-#undef asinhl
-#undef atanh
-#undef atanhf
-#undef atanhl
-#undef cbrt
-#undef cbrtf
-#undef cbrtl
-#undef copysign
-#undef copysignf
-#undef copysignl
-#undef erf
-#undef erff
-#undef erfl
-#undef erfc
-#undef erfcf
-#undef erfcl
-#undef exp2
-#undef exp2f
-#undef exp2l
-#undef expm1
-#undef expm1f
-#undef expm1l
-#undef fdim
-#undef fdimf
-#undef fdiml
-#undef fma
-#undef fmaf
-#undef fmal
-#undef fmax
-#undef fmaxf
-#undef fmaxl
-#undef fmin
-#undef fminf
-#undef fminl
-#undef hypot
-#undef hypotf
-#undef hypotl
-#undef ilogb
-#undef ilogbf
-#undef ilogbl
-#undef lgamma
-#undef lgammaf
-#undef lgammal
-#undef llrint
-#undef llrintf
-#undef llrintl
-#undef llround
-#undef llroundf
-#undef llroundl
-#undef log1p
-#undef log1pf
-#undef log1pl
-#undef log2
-#undef log2f
-#undef log2l
-#undef logb
-#undef logbf
-#undef logbl
-#undef lrint
-#undef lrintf
-#undef lrintl
-#undef lround
-#undef lroundf
-#undef lroundl
-#undef nan
-#undef nanf
-#undef nanl
-#undef nearbyint
-#undef nearbyintf
-#undef nearbyintl
-#undef nextafter
-#undef nextafterf
-#undef nextafterl
-#undef nexttoward
-#undef nexttowardf
-#undef nexttowardl
-#undef remainder
-#undef remainderf
-#undef remainderl
-#undef remquo
-#undef remquof
-#undef remquol
-#undef rint
-#undef rintf
-#undef rintl
-#undef round
-#undef roundf
-#undef roundl
-#undef scalbln
-#undef scalblnf
-#undef scalblnl
-#undef scalbn
-#undef scalbnf
-#undef scalbnl
-#undef tgamma
-#undef tgammaf
-#undef tgammal
-#undef trunc
-#undef truncf
-#undef truncl
-
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if _GLIBCXX_USE_C99_MATH_TR1
-
-  // types
-  using ::double_t;
-  using ::float_t;
-
-  // functions
-  using ::acosh;
-  using ::acoshf;
-  using ::acoshl;
-
-  using ::asinh;
-  using ::asinhf;
-  using ::asinhl;
-
-  using ::atanh;
-  using ::atanhf;
-  using ::atanhl;
-
-  using ::cbrt;
-  using ::cbrtf;
-  using ::cbrtl;
-
-  using ::copysign;
-  using ::copysignf;
-  using ::copysignl;
-
-  using ::erf;
-  using ::erff;
-  using ::erfl;
-
-  using ::erfc;
-  using ::erfcf;
-  using ::erfcl;
-
-  using ::exp2;
-  using ::exp2f;
-  using ::exp2l;
-
-  using ::expm1;
-  using ::expm1f;
-  using ::expm1l;
-
-  using ::fdim;
-  using ::fdimf;
-  using ::fdiml;
-
-  using ::fma;
-  using ::fmaf;
-  using ::fmal;
-
-  using ::fmax;
-  using ::fmaxf;
-  using ::fmaxl;
-
-  using ::fmin;
-  using ::fminf;
-  using ::fminl;
-
-  using ::hypot;
-  using ::hypotf;
-  using ::hypotl;
-
-  using ::ilogb;
-  using ::ilogbf;
-  using ::ilogbl;
-
-  using ::lgamma;
-  using ::lgammaf;
-  using ::lgammal;
-
-  using ::llrint;
-  using ::llrintf;
-  using ::llrintl;
-
-  using ::llround;
-  using ::llroundf;
-  using ::llroundl;
-
-  using ::log1p;
-  using ::log1pf;
-  using ::log1pl;
-
-  using ::log2;
-  using ::log2f;
-  using ::log2l;
-
-  using ::logb;
-  using ::logbf;
-  using ::logbl;
-
-  using ::lrint;
-  using ::lrintf;
-  using ::lrintl;
-
-  using ::lround;
-  using ::lroundf;
-  using ::lroundl;
-
-  using ::nan;
-  using ::nanf;
-  using ::nanl;
-
-  using ::nearbyint;
-  using ::nearbyintf;
-  using ::nearbyintl;
-
-  using ::nextafter;
-  using ::nextafterf;
-  using ::nextafterl;
-
-  using ::nexttoward;
-  using ::nexttowardf;
-  using ::nexttowardl;
-
-  using ::remainder;
-  using ::remainderf;
-  using ::remainderl;
-
-  using ::remquo;
-  using ::remquof;
-  using ::remquol;
-
-  using ::rint;
-  using ::rintf;
-  using ::rintl;
-
-  using ::round;
-  using ::roundf;
-  using ::roundl;
-
-  using ::scalbln;
-  using ::scalblnf;
-  using ::scalblnl;
-
-  using ::scalbn;
-  using ::scalbnf;
-  using ::scalbnl;
-
-  using ::tgamma;
-  using ::tgammaf;
-  using ::tgammal;
-
-  using ::trunc;
-  using ::truncf;
-  using ::truncl;
-
-#endif
-
-#if _GLIBCXX_USE_C99_MATH
-#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
-
-  /// Function template definitions [8.16.3].
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    fpclassify(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL,
-				  FP_SUBNORMAL, FP_ZERO, __type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isfinite(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isfinite(__type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isinf(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isinf(__type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isnan(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isnan(__type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isnormal(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isnormal(__type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    signbit(_Tp __f)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_signbit(__type(__f));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isgreater(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isgreater(__type(__f1), __type(__f2));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isgreaterequal(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isgreaterequal(__type(__f1), __type(__f2));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isless(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isless(__type(__f1), __type(__f2));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    islessequal(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_islessequal(__type(__f1), __type(__f2));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    islessgreater(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_islessgreater(__type(__f1), __type(__f2));
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
-					   int>::__type
-    isunordered(_Tp __f1, _Tp __f2)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __builtin_isunordered(__type(__f1), __type(__f2));
-    }
-
-#endif
-#endif
-
-#if _GLIBCXX_USE_C99_MATH_TR1
-
-  /// Additional overloads [8.16.4].
-  using std::acos;
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  acosh(float __x)
-  { return __builtin_acoshf(__x); }
-
-  inline long double
-  acosh(long double __x)
-  { return __builtin_acoshl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    acosh(_Tp __x)
-    { return __builtin_acosh(__x); }
-
-  using std::asin;
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  asinh(float __x)
-  { return __builtin_asinhf(__x); }
-
-  inline long double
-  asinh(long double __x)
-  { return __builtin_asinhl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    asinh(_Tp __x)
-    { return __builtin_asinh(__x); }
-
-  using std::atan;
-  using std::atan2;
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  atanh(float __x)
-  { return __builtin_atanhf(__x); }
-
-  inline long double
-  atanh(long double __x)
-  { return __builtin_atanhl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    atanh(_Tp __x)
-    { return __builtin_atanh(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  cbrt(float __x)
-  { return __builtin_cbrtf(__x); }
-
-  inline long double
-  cbrt(long double __x)
-  { return __builtin_cbrtl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    cbrt(_Tp __x)
-    { return __builtin_cbrt(__x); }
-
-  using std::ceil;
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  copysign(float __x, float __y)
-  { return __builtin_copysignf(__x, __y); }
-
-  inline long double
-  copysign(long double __x, long double __y)
-  { return __builtin_copysignl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    copysign(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return copysign(__type(__x), __type(__y));
-    }
-
-  using std::cos;
-  using std::cosh;  
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  erf(float __x)
-  { return __builtin_erff(__x); }
-
-  inline long double
-  erf(long double __x)
-  { return __builtin_erfl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    erf(_Tp __x)
-    { return __builtin_erf(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  erfc(float __x)
-  { return __builtin_erfcf(__x); }
-
-  inline long double
-  erfc(long double __x)
-  { return __builtin_erfcl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    erfc(_Tp __x)
-    { return __builtin_erfc(__x); }
-
-  using std::exp;
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  exp2(float __x)
-  { return __builtin_exp2f(__x); }
-
-  inline long double
-  exp2(long double __x)
-  { return __builtin_exp2l(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    exp2(_Tp __x)
-    { return __builtin_exp2(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  expm1(float __x)
-  { return __builtin_expm1f(__x); }
-
-  inline long double
-  expm1(long double __x)
-  { return __builtin_expm1l(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    expm1(_Tp __x)
-    { return __builtin_expm1(__x); }
-
-  // Note: we deal with fabs in a special way, because an using std::fabs
-  // would bring in also the overloads for complex types, which in C++0x
-  // mode have a different return type.
-  // With __CORRECT_ISO_CPP_MATH_H_PROTO, math.h imports std::fabs in the
-  // global namespace after the declarations of the float / double / long
-  // double overloads but before the std::complex overloads.
-  using ::fabs;
-
-#ifndef __CORRECT_ISO_CPP_MATH_H_PROTO
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  fabs(float __x)
-  { return __builtin_fabsf(__x); }
-
-  inline long double
-  fabs(long double __x)
-  { return __builtin_fabsl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    fabs(_Tp __x)
-    { return __builtin_fabs(__x); }
-#endif
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  fdim(float __x, float __y)
-  { return __builtin_fdimf(__x, __y); }
-
-  inline long double
-  fdim(long double __x, long double __y)
-  { return __builtin_fdiml(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    fdim(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return fdim(__type(__x), __type(__y));
-    }
-
-  using std::floor;
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  fma(float __x, float __y, float __z)
-  { return __builtin_fmaf(__x, __y, __z); }
-
-  inline long double
-  fma(long double __x, long double __y, long double __z)
-  { return __builtin_fmal(__x, __y, __z); }
-#endif
-
-  template<typename _Tp, typename _Up, typename _Vp>
-    inline typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type
-    fma(_Tp __x, _Up __y, _Vp __z)
-    {
-      typedef typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type __type;
-      return fma(__type(__x), __type(__y), __type(__z));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  fmax(float __x, float __y)
-  { return __builtin_fmaxf(__x, __y); }
-
-  inline long double
-  fmax(long double __x, long double __y)
-  { return __builtin_fmaxl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    fmax(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return fmax(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  fmin(float __x, float __y)
-  { return __builtin_fminf(__x, __y); }
-
-  inline long double
-  fmin(long double __x, long double __y)
-  { return __builtin_fminl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    fmin(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return fmin(__type(__x), __type(__y));
-    }
-
-  using std::fmod;
-  using std::frexp;
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  hypot(float __x, float __y)
-  { return __builtin_hypotf(__x, __y); }
-
-  inline long double
-  hypot(long double __x, long double __y)
-  { return __builtin_hypotl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    hypot(_Tp __y, _Up __x)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return hypot(__type(__y), __type(__x));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline int
-  ilogb(float __x)
-  { return __builtin_ilogbf(__x); }
-
-  inline int
-  ilogb(long double __x)
-  { return __builtin_ilogbl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   int>::__type
-    ilogb(_Tp __x)
-    { return __builtin_ilogb(__x); }
-
-  using std::ldexp;
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  lgamma(float __x)
-  { return __builtin_lgammaf(__x); }
-
-  inline long double
-  lgamma(long double __x)
-  { return __builtin_lgammal(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    lgamma(_Tp __x)
-    { return __builtin_lgamma(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline long long
-  llrint(float __x)
-  { return __builtin_llrintf(__x); }
-
-  inline long long
-  llrint(long double __x)
-  { return __builtin_llrintl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   long long>::__type
-    llrint(_Tp __x)
-    { return __builtin_llrint(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline long long
-  llround(float __x)
-  { return __builtin_llroundf(__x); }
-
-  inline long long
-  llround(long double __x)
-  { return __builtin_llroundl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   long long>::__type
-    llround(_Tp __x)
-    { return __builtin_llround(__x); }
-
-  using std::log;
-  using std::log10;
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  log1p(float __x)
-  { return __builtin_log1pf(__x); }
-
-  inline long double
-  log1p(long double __x)
-  { return __builtin_log1pl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    log1p(_Tp __x)
-    { return __builtin_log1p(__x); }
-
-  // DR 568.
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  log2(float __x)
-  { return __builtin_log2f(__x); }
-
-  inline long double
-  log2(long double __x)
-  { return __builtin_log2l(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    log2(_Tp __x)
-    { return __builtin_log2(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  logb(float __x)
-  { return __builtin_logbf(__x); }
-
-  inline long double
-  logb(long double __x)
-  { return __builtin_logbl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    logb(_Tp __x)
-    {
-      return __builtin_logb(__x);
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline long
-  lrint(float __x)
-  { return __builtin_lrintf(__x); }
-
-  inline long
-  lrint(long double __x)
-  { return __builtin_lrintl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   long>::__type
-    lrint(_Tp __x)
-    { return __builtin_lrint(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline long
-  lround(float __x)
-  { return __builtin_lroundf(__x); }
-
-  inline long
-  lround(long double __x)
-  { return __builtin_lroundl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   long>::__type
-    lround(_Tp __x)
-    { return __builtin_lround(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  nearbyint(float __x)
-  { return __builtin_nearbyintf(__x); }
-
-  inline long double
-  nearbyint(long double __x)
-  { return __builtin_nearbyintl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    nearbyint(_Tp __x)
-    { return __builtin_nearbyint(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  nextafter(float __x, float __y)
-  { return __builtin_nextafterf(__x, __y); }
-
-  inline long double
-  nextafter(long double __x, long double __y)
-  { return __builtin_nextafterl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    nextafter(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return nextafter(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  nexttoward(float __x, long double __y)
-  { return __builtin_nexttowardf(__x, __y); }
-
-  inline long double
-  nexttoward(long double __x, long double __y)
-  { return __builtin_nexttowardl(__x, __y); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    nexttoward(_Tp __x, long double __y)
-    { return __builtin_nexttoward(__x, __y); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  remainder(float __x, float __y)
-  { return __builtin_remainderf(__x, __y); }
-
-  inline long double
-  remainder(long double __x, long double __y)
-  { return __builtin_remainderl(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    remainder(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return remainder(__type(__x), __type(__y));
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  remquo(float __x, float __y, int* __pquo)
-  { return __builtin_remquof(__x, __y, __pquo); }
-
-  inline long double
-  remquo(long double __x, long double __y, int* __pquo)
-  { return __builtin_remquol(__x, __y, __pquo); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    remquo(_Tp __x, _Up __y, int* __pquo)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return remquo(__type(__x), __type(__y), __pquo);
-    }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  rint(float __x)
-  { return __builtin_rintf(__x); }
-
-  inline long double
-  rint(long double __x)
-  { return __builtin_rintl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    rint(_Tp __x)
-    { return __builtin_rint(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  round(float __x)
-  { return __builtin_roundf(__x); }
-
-  inline long double
-  round(long double __x)
-  { return __builtin_roundl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    round(_Tp __x)
-    { return __builtin_round(__x); }
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  scalbln(float __x, long __ex)
-  { return __builtin_scalblnf(__x, __ex); }
-
-  inline long double
-  scalbln(long double __x, long __ex)
-  { return __builtin_scalblnl(__x, __ex); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    scalbln(_Tp __x, long __ex)
-    { return __builtin_scalbln(__x, __ex); }
- 
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  scalbn(float __x, int __ex)
-  { return __builtin_scalbnf(__x, __ex); }
-
-  inline long double
-  scalbn(long double __x, int __ex)
-  { return __builtin_scalbnl(__x, __ex); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    scalbn(_Tp __x, int __ex)
-    { return __builtin_scalbn(__x, __ex); }
-
-  using std::sin;
-  using std::sinh;
-  using std::sqrt;
-  using std::tan;
-  using std::tanh;
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  tgamma(float __x)
-  { return __builtin_tgammaf(__x); }
-
-  inline long double
-  tgamma(long double __x)
-  { return __builtin_tgammal(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    tgamma(_Tp __x)
-    { return __builtin_tgamma(__x); }
- 
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  trunc(float __x)
-  { return __builtin_truncf(__x); }
-
-  inline long double
-  trunc(long double __x)
-  { return __builtin_truncl(__x); }
-#endif
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, 
-					   double>::__type
-    trunc(_Tp __x)
-    { return __builtin_trunc(__x); }
-
-#endif
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // DR 550. What should the return type of pow(float,int) be?
-  // NB: C++0x and TR1 != C++03.
-
-  // The std::tr1::pow(double, double) overload cannot be provided
-  // here, because it would clash with ::pow(double,double) declared
-  // in <math.h>, if <tr1/math.h> is included at the same time (raised
-  // by the fix of PR c++/54537). It is not possible either to use the
-  // using-declaration 'using ::pow;' here, because if the user code
-  // has a 'using std::pow;', it would bring the pow(*,int) averloads
-  // in the tr1 namespace, which is undesirable. Consequently, the
-  // solution is to forward std::tr1::pow(double,double) to
-  // std::pow(double,double) via the templatized version below. See
-  // the discussion about this issue here:
-  // http://gcc.gnu.org/ml/gcc-patches/2012-09/msg01278.html
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO
-  inline float
-  pow(float __x, float __y)
-  { return std::pow(__x, __y); }
-
-  inline long double
-  pow(long double __x, long double __y)
-  { return std::pow(__x, __y); }
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Up>::__type
-    pow(_Tp __x, _Up __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return std::pow(__type(__x), __type(__y));
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#include <bits/stl_algobase.h>
-#include <limits>
-#include <tr1/type_traits>
-
-#include <tr1/gamma.tcc>
-#include <tr1/bessel_function.tcc>
-#include <tr1/beta_function.tcc>
-#include <tr1/ell_integral.tcc>
-#include <tr1/exp_integral.tcc>
-#include <tr1/hypergeometric.tcc>
-#include <tr1/legendre_function.tcc>
-#include <tr1/modified_bessel_func.tcc>
-#include <tr1/poly_hermite.tcc>
-#include <tr1/poly_laguerre.tcc>
-#include <tr1/riemann_zeta.tcc>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup tr1_math_spec_func Mathematical Special Functions
-   * @ingroup numerics
-   *
-   * A collection of advanced mathematical special functions.
-   * @{
-   */
-
-  inline float
-  assoc_laguerref(unsigned int __n, unsigned int __m, float __x)
-  { return __detail::__assoc_laguerre<float>(__n, __m, __x); }
-
-  inline long double
-  assoc_laguerrel(unsigned int __n, unsigned int __m, long double __x)
-  {
-    return __detail::__assoc_laguerre<long double>(__n, __m, __x);
-  }
-
-  ///  5.2.1.1  Associated Laguerre polynomials.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    assoc_laguerre(unsigned int __n, unsigned int __m, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__assoc_laguerre<__type>(__n, __m, __x);
-    }
-
-  inline float
-  assoc_legendref(unsigned int __l, unsigned int __m, float __x)
-  { return __detail::__assoc_legendre_p<float>(__l, __m, __x); }
-
-  inline long double
-  assoc_legendrel(unsigned int __l, unsigned int __m, long double __x)
-  { return __detail::__assoc_legendre_p<long double>(__l, __m, __x); }
-
-  ///  5.2.1.2  Associated Legendre functions.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    assoc_legendre(unsigned int __l, unsigned int __m, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__assoc_legendre_p<__type>(__l, __m, __x);
-    }
-
-  inline float
-  betaf(float __x, float __y)
-  { return __detail::__beta<float>(__x, __y); }
-
-  inline long double
-  betal(long double __x, long double __y)
-  { return __detail::__beta<long double>(__x, __y); }
-
-  ///  5.2.1.3  Beta functions.
-  template<typename _Tpx, typename _Tpy>
-    inline typename __gnu_cxx::__promote_2<_Tpx, _Tpy>::__type
-    beta(_Tpx __x, _Tpy __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tpx, _Tpy>::__type __type;
-      return __detail::__beta<__type>(__x, __y);
-    }
-
-  inline float
-  comp_ellint_1f(float __k)
-  { return __detail::__comp_ellint_1<float>(__k); }
-
-  inline long double
-  comp_ellint_1l(long double __k)
-  { return __detail::__comp_ellint_1<long double>(__k); }
-
-  ///  5.2.1.4  Complete elliptic integrals of the first kind.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    comp_ellint_1(_Tp __k)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__comp_ellint_1<__type>(__k);
-    }
-
-  inline float
-  comp_ellint_2f(float __k)
-  { return __detail::__comp_ellint_2<float>(__k); }
-
-  inline long double
-  comp_ellint_2l(long double __k)
-  { return __detail::__comp_ellint_2<long double>(__k); }
-
-  ///  5.2.1.5  Complete elliptic integrals of the second kind.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    comp_ellint_2(_Tp __k)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__comp_ellint_2<__type>(__k);
-    }
-
-  inline float
-  comp_ellint_3f(float __k, float __nu)
-  { return __detail::__comp_ellint_3<float>(__k, __nu); }
-
-  inline long double
-  comp_ellint_3l(long double __k, long double __nu)
-  { return __detail::__comp_ellint_3<long double>(__k, __nu); }
-
-  ///  5.2.1.6  Complete elliptic integrals of the third kind.
-  template<typename _Tp, typename _Tpn>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Tpn>::__type
-    comp_ellint_3(_Tp __k, _Tpn __nu)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Tpn>::__type __type;
-      return __detail::__comp_ellint_3<__type>(__k, __nu);
-    }
-
-  inline float
-  conf_hypergf(float __a, float __c, float __x)
-  { return __detail::__conf_hyperg<float>(__a, __c, __x); }
-
-  inline long double
-  conf_hypergl(long double __a, long double __c, long double __x)
-  { return __detail::__conf_hyperg<long double>(__a, __c, __x); }
-
-  ///  5.2.1.7  Confluent hypergeometric functions.
-  template<typename _Tpa, typename _Tpc, typename _Tp>
-    inline typename __gnu_cxx::__promote_3<_Tpa, _Tpc, _Tp>::__type
-    conf_hyperg(_Tpa __a, _Tpc __c, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote_3<_Tpa, _Tpc, _Tp>::__type __type;
-      return __detail::__conf_hyperg<__type>(__a, __c, __x);
-    }
-
-  inline float
-  cyl_bessel_if(float __nu, float __x)
-  { return __detail::__cyl_bessel_i<float>(__nu, __x); }
-
-  inline long double
-  cyl_bessel_il(long double __nu, long double __x)
-  { return __detail::__cyl_bessel_i<long double>(__nu, __x); }
-
-  ///  5.2.1.8  Regular modified cylindrical Bessel functions.
-  template<typename _Tpnu, typename _Tp>
-    inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type
-    cyl_bessel_i(_Tpnu __nu, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type;
-      return __detail::__cyl_bessel_i<__type>(__nu, __x);
-    }
-
-  inline float
-  cyl_bessel_jf(float __nu, float __x)
-  { return __detail::__cyl_bessel_j<float>(__nu, __x); }
-
-  inline long double
-  cyl_bessel_jl(long double __nu, long double __x)
-  { return __detail::__cyl_bessel_j<long double>(__nu, __x); }
-
-  ///  5.2.1.9  Cylindrical Bessel functions (of the first kind).
-  template<typename _Tpnu, typename _Tp>
-    inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type
-    cyl_bessel_j(_Tpnu __nu, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type;
-      return __detail::__cyl_bessel_j<__type>(__nu, __x);
-    }
-
-  inline float
-  cyl_bessel_kf(float __nu, float __x)
-  { return __detail::__cyl_bessel_k<float>(__nu, __x); }
-
-  inline long double
-  cyl_bessel_kl(long double __nu, long double __x)
-  { return __detail::__cyl_bessel_k<long double>(__nu, __x); }
-
-  ///  5.2.1.10  Irregular modified cylindrical Bessel functions.
-  template<typename _Tpnu, typename _Tp>
-    inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type
-    cyl_bessel_k(_Tpnu __nu, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type;
-      return __detail::__cyl_bessel_k<__type>(__nu, __x);
-    }
-
-  inline float
-  cyl_neumannf(float __nu, float __x)
-  { return __detail::__cyl_neumann_n<float>(__nu, __x); }
-
-  inline long double
-  cyl_neumannl(long double __nu, long double __x)
-  { return __detail::__cyl_neumann_n<long double>(__nu, __x); }
-
-  ///  5.2.1.11  Cylindrical Neumann functions.
-  template<typename _Tpnu, typename _Tp>
-    inline typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type
-    cyl_neumann(_Tpnu __nu, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tpnu, _Tp>::__type __type;
-      return __detail::__cyl_neumann_n<__type>(__nu, __x);
-    }
-
-  inline float
-  ellint_1f(float __k, float __phi)
-  { return __detail::__ellint_1<float>(__k, __phi); }
-
-  inline long double
-  ellint_1l(long double __k, long double __phi)
-  { return __detail::__ellint_1<long double>(__k, __phi); }
-
-  ///  5.2.1.12  Incomplete elliptic integrals of the first kind.
-  template<typename _Tp, typename _Tpp>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type
-    ellint_1(_Tp __k, _Tpp __phi)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type __type;
-      return __detail::__ellint_1<__type>(__k, __phi);
-    }
-
-  inline float
-  ellint_2f(float __k, float __phi)
-  { return __detail::__ellint_2<float>(__k, __phi); }
-
-  inline long double
-  ellint_2l(long double __k, long double __phi)
-  { return __detail::__ellint_2<long double>(__k, __phi); }
-
-  ///  5.2.1.13  Incomplete elliptic integrals of the second kind.
-  template<typename _Tp, typename _Tpp>
-    inline typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type
-    ellint_2(_Tp __k, _Tpp __phi)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Tpp>::__type __type;
-      return __detail::__ellint_2<__type>(__k, __phi);
-    }
-
-  inline float
-  ellint_3f(float __k, float __nu, float __phi)
-  { return __detail::__ellint_3<float>(__k, __nu, __phi); }
-
-  inline long double
-  ellint_3l(long double __k, long double __nu, long double __phi)
-  { return __detail::__ellint_3<long double>(__k, __nu, __phi); }
-
-  ///  5.2.1.14  Incomplete elliptic integrals of the third kind.
-  template<typename _Tp, typename _Tpn, typename _Tpp>
-    inline typename __gnu_cxx::__promote_3<_Tp, _Tpn, _Tpp>::__type
-    ellint_3(_Tp __k, _Tpn __nu, _Tpp __phi)
-    {
-      typedef typename __gnu_cxx::__promote_3<_Tp, _Tpn, _Tpp>::__type __type;
-      return __detail::__ellint_3<__type>(__k, __nu, __phi);
-    }
-
-  inline float
-  expintf(float __x)
-  { return __detail::__expint<float>(__x); }
-
-  inline long double
-  expintl(long double __x)
-  { return __detail::__expint<long double>(__x); }
-
-  ///  5.2.1.15  Exponential integrals.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    expint(_Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__expint<__type>(__x);
-    }
-
-  inline float
-  hermitef(unsigned int __n, float __x)
-  { return __detail::__poly_hermite<float>(__n, __x); }
-
-  inline long double
-  hermitel(unsigned int __n, long double __x)
-  { return __detail::__poly_hermite<long double>(__n, __x); }
-
-  ///  5.2.1.16  Hermite polynomials.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    hermite(unsigned int __n, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__poly_hermite<__type>(__n, __x);
-    }
-
-  inline float
-  hypergf(float __a, float __b, float __c, float __x)
-  { return __detail::__hyperg<float>(__a, __b, __c, __x); }
-
-  inline long double
-  hypergl(long double __a, long double __b, long double __c, long double __x)
-  { return __detail::__hyperg<long double>(__a, __b, __c, __x); }
-
-  ///  5.2.1.17  Hypergeometric functions.
-  template<typename _Tpa, typename _Tpb, typename _Tpc, typename _Tp>
-    inline typename __gnu_cxx::__promote_4<_Tpa, _Tpb, _Tpc, _Tp>::__type
-    hyperg(_Tpa __a, _Tpb __b, _Tpc __c, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote_4<_Tpa, _Tpb, _Tpc, _Tp>::__type __type;
-      return __detail::__hyperg<__type>(__a, __b, __c, __x);
-    }
-
-  inline float
-  laguerref(unsigned int __n, float __x)
-  { return __detail::__laguerre<float>(__n, __x); }
-
-  inline long double
-  laguerrel(unsigned int __n, long double __x)
-  { return __detail::__laguerre<long double>(__n, __x); }
-
-  ///  5.2.1.18  Laguerre polynomials.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    laguerre(unsigned int __n, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__laguerre<__type>(__n, __x);
-    }
-
-  inline float
-  legendref(unsigned int __n, float __x)
-  { return __detail::__poly_legendre_p<float>(__n, __x); }
-
-  inline long double
-  legendrel(unsigned int __n, long double __x)
-  { return __detail::__poly_legendre_p<long double>(__n, __x); }
-
-  ///  5.2.1.19  Legendre polynomials.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    legendre(unsigned int __n, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__poly_legendre_p<__type>(__n, __x);
-    }
-
-  inline float
-  riemann_zetaf(float __x)
-  { return __detail::__riemann_zeta<float>(__x); }
-
-  inline long double
-  riemann_zetal(long double __x)
-  { return __detail::__riemann_zeta<long double>(__x); }
-
-  ///  5.2.1.20  Riemann zeta function.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    riemann_zeta(_Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__riemann_zeta<__type>(__x);
-    }
-
-  inline float
-  sph_besself(unsigned int __n, float __x)
-  { return __detail::__sph_bessel<float>(__n, __x); }
-
-  inline long double
-  sph_bessell(unsigned int __n, long double __x)
-  { return __detail::__sph_bessel<long double>(__n, __x); }
-
-  ///  5.2.1.21  Spherical Bessel functions.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    sph_bessel(unsigned int __n, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__sph_bessel<__type>(__n, __x);
-    }
-
-  inline float
-  sph_legendref(unsigned int __l, unsigned int __m, float __theta)
-  { return __detail::__sph_legendre<float>(__l, __m, __theta); }
-
-  inline long double
-  sph_legendrel(unsigned int __l, unsigned int __m, long double __theta)
-  { return __detail::__sph_legendre<long double>(__l, __m, __theta); }
-
-  ///  5.2.1.22  Spherical associated Legendre functions.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    sph_legendre(unsigned int __l, unsigned int __m, _Tp __theta)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__sph_legendre<__type>(__l, __m, __theta);
-    }
-
-  inline float
-  sph_neumannf(unsigned int __n, float __x)
-  { return __detail::__sph_neumann<float>(__n, __x); }
-
-  inline long double
-  sph_neumannl(unsigned int __n, long double __x)
-  { return __detail::__sph_neumann<long double>(__n, __x); }
-
-  ///  5.2.1.23  Spherical Neumann functions.
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    sph_neumann(unsigned int __n, _Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __detail::__sph_neumann<__type>(__n, __x);
-    }
-
-  /* @} */ // tr1_math_spec_func
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _GLIBCXX_TR1_CMATH
diff --git a/openflow/usr/include/c++/5/tr1/complex b/openflow/usr/include/c++/5/tr1/complex
deleted file mode 100644
index f4de867..0000000
--- a/openflow/usr/include/c++/5/tr1/complex
+++ /dev/null
@@ -1,418 +0,0 @@
-// TR1 complex -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/complex
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_COMPLEX
-#define _GLIBCXX_TR1_COMPLEX 1
-
-#pragma GCC system_header
-
-#include <complex>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup complex_numbers
-   * @{
-   */
-
-#if __cplusplus >= 201103L
-  using std::acos;
-  using std::asin;
-  using std::atan;
-#else
-  template<typename _Tp> std::complex<_Tp> acos(const std::complex<_Tp>&);
-  template<typename _Tp> std::complex<_Tp> asin(const std::complex<_Tp>&);
-  template<typename _Tp> std::complex<_Tp> atan(const std::complex<_Tp>&);
-#endif
-
-  template<typename _Tp> std::complex<_Tp> acosh(const std::complex<_Tp>&);
-  template<typename _Tp> std::complex<_Tp> asinh(const std::complex<_Tp>&);
-  template<typename _Tp> std::complex<_Tp> atanh(const std::complex<_Tp>&);
-
-  // The std::fabs return type in C++0x mode is different (just _Tp).
-  template<typename _Tp> std::complex<_Tp> fabs(const std::complex<_Tp>&);
-
-#if __cplusplus < 201103L
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    __complex_acos(const std::complex<_Tp>& __z)
-    {
-      const std::complex<_Tp> __t = std::tr1::asin(__z);
-      const _Tp __pi_2 = 1.5707963267948966192313216916397514L;
-      return std::complex<_Tp>(__pi_2 - __t.real(), -__t.imag());
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_acos(__complex__ float __z)
-  { return __builtin_cacosf(__z); }
-
-  inline __complex__ double
-  __complex_acos(__complex__ double __z)
-  { return __builtin_cacos(__z); }
-
-  inline __complex__ long double
-  __complex_acos(const __complex__ long double& __z)
-  { return __builtin_cacosl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    acos(const std::complex<_Tp>& __z)
-    { return __complex_acos(__z.__rep()); }
-#else
-  /// acos(__z) [8.1.2].
-  //  Effects:  Behaves the same as C99 function cacos, defined
-  //            in subclause 7.3.5.1.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    acos(const std::complex<_Tp>& __z)
-    { return __complex_acos(__z); }
-#endif
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    __complex_asin(const std::complex<_Tp>& __z)
-    {
-      std::complex<_Tp> __t(-__z.imag(), __z.real());
-      __t = std::tr1::asinh(__t);
-      return std::complex<_Tp>(__t.imag(), -__t.real());
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_asin(__complex__ float __z)
-  { return __builtin_casinf(__z); }
-
-  inline __complex__ double
-  __complex_asin(__complex__ double __z)
-  { return __builtin_casin(__z); }
-
-  inline __complex__ long double
-  __complex_asin(const __complex__ long double& __z)
-  { return __builtin_casinl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    asin(const std::complex<_Tp>& __z)
-    { return __complex_asin(__z.__rep()); }
-#else
-  /// asin(__z) [8.1.3].
-  //  Effects:  Behaves the same as C99 function casin, defined
-  //            in subclause 7.3.5.2.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    asin(const std::complex<_Tp>& __z)
-    { return __complex_asin(__z); }
-#endif
-  
-  template<typename _Tp>
-    std::complex<_Tp>
-    __complex_atan(const std::complex<_Tp>& __z)
-    {
-      const _Tp __r2 = __z.real() * __z.real();
-      const _Tp __x = _Tp(1.0) - __r2 - __z.imag() * __z.imag();
-
-      _Tp __num = __z.imag() + _Tp(1.0);
-      _Tp __den = __z.imag() - _Tp(1.0);
-
-      __num = __r2 + __num * __num;
-      __den = __r2 + __den * __den;
-
-      return std::complex<_Tp>(_Tp(0.5) * atan2(_Tp(2.0) * __z.real(), __x),
-			       _Tp(0.25) * log(__num / __den));
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_atan(__complex__ float __z)
-  { return __builtin_catanf(__z); }
-
-  inline __complex__ double
-  __complex_atan(__complex__ double __z)
-  { return __builtin_catan(__z); }
-
-  inline __complex__ long double
-  __complex_atan(const __complex__ long double& __z)
-  { return __builtin_catanl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    atan(const std::complex<_Tp>& __z)
-    { return __complex_atan(__z.__rep()); }
-#else
-  /// atan(__z) [8.1.4].
-  //  Effects:  Behaves the same as C99 function catan, defined
-  //            in subclause 7.3.5.3.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    atan(const std::complex<_Tp>& __z)
-    { return __complex_atan(__z); }
-#endif
-
-#endif // C++11
-
-  template<typename _Tp>
-    std::complex<_Tp>
-    __complex_acosh(const std::complex<_Tp>& __z)
-    {
-      // Kahan's formula.
-      return _Tp(2.0) * std::log(std::sqrt(_Tp(0.5) * (__z + _Tp(1.0)))
-				 + std::sqrt(_Tp(0.5) * (__z - _Tp(1.0))));
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_acosh(__complex__ float __z)
-  { return __builtin_cacoshf(__z); }
-
-  inline __complex__ double
-  __complex_acosh(__complex__ double __z)
-  { return __builtin_cacosh(__z); }
-
-  inline __complex__ long double
-  __complex_acosh(const __complex__ long double& __z)
-  { return __builtin_cacoshl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    acosh(const std::complex<_Tp>& __z)
-    { return __complex_acosh(__z.__rep()); }
-#else
-  /// acosh(__z) [8.1.5].
-  //  Effects:  Behaves the same as C99 function cacosh, defined
-  //            in subclause 7.3.6.1.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    acosh(const std::complex<_Tp>& __z)
-    { return __complex_acosh(__z); }
-#endif
-
-  template<typename _Tp>
-    std::complex<_Tp>
-    __complex_asinh(const std::complex<_Tp>& __z)
-    {
-      std::complex<_Tp> __t((__z.real() - __z.imag())
-			    * (__z.real() + __z.imag()) + _Tp(1.0),
-			    _Tp(2.0) * __z.real() * __z.imag());
-      __t = std::sqrt(__t);
-
-      return std::log(__t + __z);
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_asinh(__complex__ float __z)
-  { return __builtin_casinhf(__z); }
-
-  inline __complex__ double
-  __complex_asinh(__complex__ double __z)
-  { return __builtin_casinh(__z); }
-
-  inline __complex__ long double
-  __complex_asinh(const __complex__ long double& __z)
-  { return __builtin_casinhl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    asinh(const std::complex<_Tp>& __z)
-    { return __complex_asinh(__z.__rep()); }
-#else
-  /// asinh(__z) [8.1.6].
-  //  Effects:  Behaves the same as C99 function casin, defined
-  //            in subclause 7.3.6.2.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    asinh(const std::complex<_Tp>& __z)
-    { return __complex_asinh(__z); }
-#endif
-
-  template<typename _Tp>
-    std::complex<_Tp>
-    __complex_atanh(const std::complex<_Tp>& __z)
-    {
-      const _Tp __i2 = __z.imag() * __z.imag();
-      const _Tp __x = _Tp(1.0) - __i2 - __z.real() * __z.real();
-
-      _Tp __num = _Tp(1.0) + __z.real();
-      _Tp __den = _Tp(1.0) - __z.real();
-
-      __num = __i2 + __num * __num;
-      __den = __i2 + __den * __den;
-
-      return std::complex<_Tp>(_Tp(0.25) * (log(__num) - log(__den)),
-			       _Tp(0.5) * atan2(_Tp(2.0) * __z.imag(), __x));
-    }
-
-#if _GLIBCXX_USE_C99_COMPLEX_TR1
-  inline __complex__ float
-  __complex_atanh(__complex__ float __z)
-  { return __builtin_catanhf(__z); }
-
-  inline __complex__ double
-  __complex_atanh(__complex__ double __z)
-  { return __builtin_catanh(__z); }
-
-  inline __complex__ long double
-  __complex_atanh(const __complex__ long double& __z)
-  { return __builtin_catanhl(__z); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    atanh(const std::complex<_Tp>& __z)
-    { return __complex_atanh(__z.__rep()); }
-#else
-  /// atanh(__z) [8.1.7].
-  //  Effects:  Behaves the same as C99 function catanh, defined
-  //            in subclause 7.3.6.3.
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    atanh(const std::complex<_Tp>& __z)
-    { return __complex_atanh(__z); }
-#endif
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    /// fabs(__z) [8.1.8].
-    //  Effects:  Behaves the same as C99 function cabs, defined
-    //            in subclause 7.3.8.1.
-    fabs(const std::complex<_Tp>& __z)
-    { return std::abs(__z); }
-
-  /// Additional overloads [8.1.9].
-#if __cplusplus < 201103L
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    arg(_Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-#if (_GLIBCXX_USE_C99_MATH && !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC)
-      return std::signbit(__x) ? __type(3.1415926535897932384626433832795029L)
-	                       : __type();
-#else
-      return std::arg(std::complex<__type>(__x));
-#endif
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    imag(_Tp)
-    { return _Tp(); }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    norm(_Tp __x)
-    {
-      typedef typename __gnu_cxx::__promote<_Tp>::__type __type;
-      return __type(__x) * __type(__x);
-    }
-
-  template<typename _Tp>
-    inline typename __gnu_cxx::__promote<_Tp>::__type
-    real(_Tp __x)
-    { return __x; }
-
-#endif
-
-  template<typename _Tp, typename _Up>
-    inline std::complex<typename __gnu_cxx::__promote_2<_Tp, _Up>::__type>
-    pow(const std::complex<_Tp>& __x, const _Up& __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return std::pow(std::complex<__type>(__x), __type(__y));
-    }
-
-  template<typename _Tp, typename _Up>
-    inline std::complex<typename __gnu_cxx::__promote_2<_Tp, _Up>::__type>
-    pow(const _Tp& __x, const std::complex<_Up>& __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return std::pow(__type(__x), std::complex<__type>(__y));
-    }
-
-  template<typename _Tp, typename _Up>
-    inline std::complex<typename __gnu_cxx::__promote_2<_Tp, _Up>::__type>
-    pow(const std::complex<_Tp>& __x, const std::complex<_Up>& __y)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return std::pow(std::complex<__type>(__x),
-		      std::complex<__type>(__y));
-    }
-
-  using std::arg;
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    conj(const std::complex<_Tp>& __z)
-    { return std::conj(__z); }  
-
-  template<typename _Tp>
-    inline std::complex<typename __gnu_cxx::__promote<_Tp>::__type>
-    conj(_Tp __x)
-    { return __x; }
-
-  using std::imag;
-  using std::norm;
-  using std::polar;
-
-  template<typename _Tp, typename _Up>
-    inline std::complex<typename __gnu_cxx::__promote_2<_Tp, _Up>::__type>
-    polar(const _Tp& __rho, const _Up& __theta)
-    {
-      typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
-      return std::polar(__type(__rho), __type(__theta));
-    }
-
-  using std::real;
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    pow(const std::complex<_Tp>& __x, const _Tp& __y)
-    { return std::pow(__x, __y); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    pow(const _Tp& __x, const std::complex<_Tp>& __y)
-    { return std::pow(__x, __y); }
-
-  template<typename _Tp>
-    inline std::complex<_Tp>
-    pow(const std::complex<_Tp>& __x, const std::complex<_Tp>& __y)
-    { return std::pow(__x, __y); }
-
-// @} group complex_numbers
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _GLIBCXX_TR1_COMPLEX
diff --git a/openflow/usr/include/c++/5/tr1/complex.h b/openflow/usr/include/c++/5/tr1/complex.h
deleted file mode 100644
index 5c48837..0000000
--- a/openflow/usr/include/c++/5/tr1/complex.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 complex.h -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/complex.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_COMPLEX_H
-#define _GLIBCXX_TR1_COMPLEX_H 1
-
-#include <tr1/ccomplex>
-
-#endif // _GLIBCXX_TR1_COMPLEX_H
diff --git a/openflow/usr/include/c++/5/tr1/cstdarg b/openflow/usr/include/c++/5/tr1/cstdarg
deleted file mode 100644
index 983637d..0000000
--- a/openflow/usr/include/c++/5/tr1/cstdarg
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 cstdarg -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cstdarg
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CSTDARG
-#define _GLIBCXX_TR1_CSTDARG 1
-
-#include <cstdarg>
-
-#endif // _GLIBCXX_TR1_CSTDARG
diff --git a/openflow/usr/include/c++/5/tr1/cstdbool b/openflow/usr/include/c++/5/tr1/cstdbool
deleted file mode 100644
index ad8975a..0000000
--- a/openflow/usr/include/c++/5/tr1/cstdbool
+++ /dev/null
@@ -1,40 +0,0 @@
-// TR1 cstdbool -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cstdbool
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CSTDBOOL
-#define _GLIBCXX_TR1_CSTDBOOL 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-#if _GLIBCXX_HAVE_STDBOOL_H
-#include <stdbool.h>
-#endif
-
-#endif // _GLIBCXX_TR1_CSTDBOOL
diff --git a/openflow/usr/include/c++/5/tr1/cstdint b/openflow/usr/include/c++/5/tr1/cstdint
deleted file mode 100644
index d9927bd..0000000
--- a/openflow/usr/include/c++/5/tr1/cstdint
+++ /dev/null
@@ -1,104 +0,0 @@
-// TR1 cstdint -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cstdint
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CSTDINT
-#define _GLIBCXX_TR1_CSTDINT 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-// For 8.22.1/1 (see C99, Notes 219, 220, 222)
-# if _GLIBCXX_HAVE_STDINT_H
-#  ifndef __STDC_LIMIT_MACROS
-#   define _UNDEF__STDC_LIMIT_MACROS
-#   define __STDC_LIMIT_MACROS
-#  endif
-#  ifndef __STDC_CONSTANT_MACROS
-#   define _UNDEF__STDC_CONSTANT_MACROS
-#   define __STDC_CONSTANT_MACROS
-#  endif
-#  include <stdint.h>
-#  ifdef _UNDEF__STDC_LIMIT_MACROS
-#   undef __STDC_LIMIT_MACROS
-#   undef _UNDEF__STDC_LIMIT_MACROS
-#  endif
-#  ifdef _UNDEF__STDC_CONSTANT_MACROS
-#   undef __STDC_CONSTANT_MACROS
-#   undef _UNDEF__STDC_CONSTANT_MACROS
-#  endif
-# endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  using ::int8_t;
-  using ::int16_t;
-  using ::int32_t;
-  using ::int64_t;
-
-  using ::int_fast8_t;
-  using ::int_fast16_t;
-  using ::int_fast32_t;
-  using ::int_fast64_t;
-
-  using ::int_least8_t;
-  using ::int_least16_t;
-  using ::int_least32_t;
-  using ::int_least64_t;
-
-  using ::intmax_t;
-  using ::intptr_t;
-  
-  using ::uint8_t;
-  using ::uint16_t;
-  using ::uint32_t;
-  using ::uint64_t;
-
-  using ::uint_fast8_t;
-  using ::uint_fast16_t;
-  using ::uint_fast32_t;
-  using ::uint_fast64_t;
-
-  using ::uint_least8_t;
-  using ::uint_least16_t;
-  using ::uint_least32_t;
-  using ::uint_least64_t;
-
-  using ::uintmax_t;
-  using ::uintptr_t;
-}
-}
-
-#endif // _GLIBCXX_USE_C99_STDINT_TR1
-
-#endif // _GLIBCXX_TR1_CSTDINT
-
diff --git a/openflow/usr/include/c++/5/tr1/cstdio b/openflow/usr/include/c++/5/tr1/cstdio
deleted file mode 100644
index 7681823..0000000
--- a/openflow/usr/include/c++/5/tr1/cstdio
+++ /dev/null
@@ -1,53 +0,0 @@
-// TR1 cstdio -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cstdio
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CSTDIO
-#define _GLIBCXX_TR1_CSTDIO 1
-
-#pragma GCC system_header
-
-#include <cstdio>
-
-#if _GLIBCXX_USE_C99
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  using std::snprintf;
-  using std::vsnprintf;
-
-  using std::vfscanf;
-  using std::vscanf;
-  using std::vsscanf;
-}
-}
-
-#endif
-
-#endif // _GLIBCXX_TR1_CSTDIO
diff --git a/openflow/usr/include/c++/5/tr1/cstdlib b/openflow/usr/include/c++/5/tr1/cstdlib
deleted file mode 100644
index c3c65eb..0000000
--- a/openflow/usr/include/c++/5/tr1/cstdlib
+++ /dev/null
@@ -1,72 +0,0 @@
-// TR1 cstdlib -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cstdlib
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CSTDLIB
-#define _GLIBCXX_TR1_CSTDLIB 1
-
-#pragma GCC system_header
-
-#include <cstdlib>
-
-#if _GLIBCXX_HOSTED
-
-#if _GLIBCXX_USE_C99
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  // types
-  using std::lldiv_t;
-
-  // functions
-  using std::llabs;
-  using std::lldiv;
-#endif
-
-  using std::atoll;
-  using std::strtoll;
-  using std::strtoull;
-
-  using std::strtof;
-  using std::strtold;
-
-  // overloads
-  using std::abs;
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using std::div;
-#endif
-}
-}
-
-#endif // _GLIBCXX_USE_C99 
-
-#endif // _GLIBCXX_HOSTED
-
-#endif // _GLIBCXX_TR1_CSTDLIB
diff --git a/openflow/usr/include/c++/5/tr1/ctgmath b/openflow/usr/include/c++/5/tr1/ctgmath
deleted file mode 100644
index 3eecdd3..0000000
--- a/openflow/usr/include/c++/5/tr1/ctgmath
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 ctgmath -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/ctgmath
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CTGMATH
-#define _GLIBCXX_TR1_CTGMATH 1
-
-#include <tr1/cmath>
-
-#endif // _GLIBCXX_TR1_CTGMATH
diff --git a/openflow/usr/include/c++/5/tr1/ctime b/openflow/usr/include/c++/5/tr1/ctime
deleted file mode 100644
index 9df2752..0000000
--- a/openflow/usr/include/c++/5/tr1/ctime
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 ctime -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/ctime
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CTIME
-#define _GLIBCXX_TR1_CTIME 1
-
-#include <ctime>
-
-#endif // _GLIBCXX_TR1_CTIME
diff --git a/openflow/usr/include/c++/5/tr1/ctype.h b/openflow/usr/include/c++/5/tr1/ctype.h
deleted file mode 100644
index 55d0e64..0000000
--- a/openflow/usr/include/c++/5/tr1/ctype.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 ctype.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/ctype.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _TR1_CTYPE_H
-#define _TR1_CTYPE_H 1
-
-#include <tr1/cctype>
-
-#endif
diff --git a/openflow/usr/include/c++/5/tr1/cwchar b/openflow/usr/include/c++/5/tr1/cwchar
deleted file mode 100644
index 10772ee..0000000
--- a/openflow/usr/include/c++/5/tr1/cwchar
+++ /dev/null
@@ -1,65 +0,0 @@
-// TR1 cwchar -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cwchar
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CWCHAR
-#define _GLIBCXX_TR1_CWCHAR 1
-
-#pragma GCC system_header
-
-#include <cwchar>
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-#if _GLIBCXX_HAVE_WCSTOF
-  using std::wcstof;
-#endif
-#if _GLIBCXX_HAVE_VFWSCANF
-  using std::vfwscanf;
-#endif
-#if _GLIBCXX_HAVE_VSWSCANF
-  using std::vswscanf;
-#endif
-#if _GLIBCXX_HAVE_VWSCANF
-  using std::vwscanf;
-#endif
-
-#if _GLIBCXX_USE_C99
-  using std::wcstold;
-  using std::wcstoll;
-  using std::wcstoull;
-#endif
-}
-}
-
-#endif // _GLIBCXX_USE_WCHAR_T
-
-#endif // _GLIBCXX_TR1_CWCHAR
diff --git a/openflow/usr/include/c++/5/tr1/cwctype b/openflow/usr/include/c++/5/tr1/cwctype
deleted file mode 100644
index 8405261..0000000
--- a/openflow/usr/include/c++/5/tr1/cwctype
+++ /dev/null
@@ -1,50 +0,0 @@
-// TR1 cwctype -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/cwctype
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_CWCTYPE
-#define _GLIBCXX_TR1_CWCTYPE 1
-
-#pragma GCC system_header
-
-#include <cwctype>
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-#if _GLIBCXX_HAVE_ISWBLANK
-  using std::iswblank;
-#endif  
-}
-}
-
-#endif // _GLIBCXX_USE_WCHAR_T
-
-#endif // _GLIBCXX_TR1_CWCTYPE
diff --git a/openflow/usr/include/c++/5/tr1/ell_integral.tcc b/openflow/usr/include/c++/5/tr1/ell_integral.tcc
deleted file mode 100644
index c17f359..0000000
--- a/openflow/usr/include/c++/5/tr1/ell_integral.tcc
+++ /dev/null
@@ -1,750 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/ell_integral.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland based on:
-//   (1)  B. C. Carlson Numer. Math. 33, 1 (1979)
-//   (2)  B. C. Carlson, Special Functions of Applied Mathematics (1977)
-//   (3)  The Gnu Scientific Library, http://www.gnu.org/software/gsl
-//   (4)  Numerical Recipes in C, 2nd ed, by W. H. Press, S. A. Teukolsky,
-//        W. T. Vetterling, B. P. Flannery, Cambridge University Press
-//        (1992), pp. 261-269
-
-#ifndef _GLIBCXX_TR1_ELL_INTEGRAL_TCC
-#define _GLIBCXX_TR1_ELL_INTEGRAL_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.2] Special functions
-
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     *   @brief Return the Carlson elliptic function @f$ R_F(x,y,z) @f$
-     *          of the first kind.
-     * 
-     *   The Carlson elliptic function of the first kind is defined by:
-     *   @f[
-     *       R_F(x,y,z) = \frac{1}{2} \int_0^\infty
-     *                 \frac{dt}{(t + x)^{1/2}(t + y)^{1/2}(t + z)^{1/2}}
-     *   @f]
-     *
-     *   @param  __x  The first of three symmetric arguments.
-     *   @param  __y  The second of three symmetric arguments.
-     *   @param  __z  The third of three symmetric arguments.
-     *   @return  The Carlson elliptic function of the first kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __ellint_rf(_Tp __x, _Tp __y, _Tp __z)
-    {
-      const _Tp __min = std::numeric_limits<_Tp>::min();
-      const _Tp __max = std::numeric_limits<_Tp>::max();
-      const _Tp __lolim = _Tp(5) * __min;
-      const _Tp __uplim = __max / _Tp(5);
-
-      if (__x < _Tp(0) || __y < _Tp(0) || __z < _Tp(0))
-        std::__throw_domain_error(__N("Argument less than zero "
-                                      "in __ellint_rf."));
-      else if (__x + __y < __lolim || __x + __z < __lolim
-            || __y + __z < __lolim)
-        std::__throw_domain_error(__N("Argument too small in __ellint_rf"));
-      else
-        {
-          const _Tp __c0 = _Tp(1) / _Tp(4);
-          const _Tp __c1 = _Tp(1) / _Tp(24);
-          const _Tp __c2 = _Tp(1) / _Tp(10);
-          const _Tp __c3 = _Tp(3) / _Tp(44);
-          const _Tp __c4 = _Tp(1) / _Tp(14);
-
-          _Tp __xn = __x;
-          _Tp __yn = __y;
-          _Tp __zn = __z;
-
-          const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-          const _Tp __errtol = std::pow(__eps, _Tp(1) / _Tp(6));
-          _Tp __mu;
-          _Tp __xndev, __yndev, __zndev;
-
-          const unsigned int __max_iter = 100;
-          for (unsigned int __iter = 0; __iter < __max_iter; ++__iter)
-            {
-              __mu = (__xn + __yn + __zn) / _Tp(3);
-              __xndev = 2 - (__mu + __xn) / __mu;
-              __yndev = 2 - (__mu + __yn) / __mu;
-              __zndev = 2 - (__mu + __zn) / __mu;
-              _Tp __epsilon = std::max(std::abs(__xndev), std::abs(__yndev));
-              __epsilon = std::max(__epsilon, std::abs(__zndev));
-              if (__epsilon < __errtol)
-                break;
-              const _Tp __xnroot = std::sqrt(__xn);
-              const _Tp __ynroot = std::sqrt(__yn);
-              const _Tp __znroot = std::sqrt(__zn);
-              const _Tp __lambda = __xnroot * (__ynroot + __znroot)
-                                 + __ynroot * __znroot;
-              __xn = __c0 * (__xn + __lambda);
-              __yn = __c0 * (__yn + __lambda);
-              __zn = __c0 * (__zn + __lambda);
-            }
-
-          const _Tp __e2 = __xndev * __yndev - __zndev * __zndev;
-          const _Tp __e3 = __xndev * __yndev * __zndev;
-          const _Tp __s  = _Tp(1) + (__c1 * __e2 - __c2 - __c3 * __e3) * __e2
-                   + __c4 * __e3;
-
-          return __s / std::sqrt(__mu);
-        }
-    }
-
-
-    /**
-     *   @brief Return the complete elliptic integral of the first kind
-     *          @f$ K(k) @f$ by series expansion.
-     * 
-     *   The complete elliptic integral of the first kind is defined as
-     *   @f[
-     *     K(k) = F(k,\pi/2) = \int_0^{\pi/2}\frac{d\theta}
-     *                              {\sqrt{1 - k^2sin^2\theta}}
-     *   @f]
-     * 
-     *   This routine is not bad as long as |k| is somewhat smaller than 1
-     *   but is not is good as the Carlson elliptic integral formulation.
-     * 
-     *   @param  __k  The argument of the complete elliptic function.
-     *   @return  The complete elliptic function of the first kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __comp_ellint_1_series(_Tp __k)
-    {
-
-      const _Tp __kk = __k * __k;
-
-      _Tp __term = __kk / _Tp(4);
-      _Tp __sum = _Tp(1) + __term;
-
-      const unsigned int __max_iter = 1000;
-      for (unsigned int __i = 2; __i < __max_iter; ++__i)
-        {
-          __term *= (2 * __i - 1) * __kk / (2 * __i);
-          if (__term < std::numeric_limits<_Tp>::epsilon())
-            break;
-          __sum += __term;
-        }
-
-      return __numeric_constants<_Tp>::__pi_2() * __sum;
-    }
-
-
-    /**
-     *   @brief  Return the complete elliptic integral of the first kind
-     *           @f$ K(k) @f$ using the Carlson formulation.
-     * 
-     *   The complete elliptic integral of the first kind is defined as
-     *   @f[
-     *     K(k) = F(k,\pi/2) = \int_0^{\pi/2}\frac{d\theta}
-     *                                           {\sqrt{1 - k^2 sin^2\theta}}
-     *   @f]
-     *   where @f$ F(k,\phi) @f$ is the incomplete elliptic integral of the
-     *   first kind.
-     * 
-     *   @param  __k  The argument of the complete elliptic function.
-     *   @return  The complete elliptic function of the first kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __comp_ellint_1(_Tp __k)
-    {
-
-      if (__isnan(__k))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (std::abs(__k) >= _Tp(1))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else
-        return __ellint_rf(_Tp(0), _Tp(1) - __k * __k, _Tp(1));
-    }
-
-
-    /**
-     *   @brief  Return the incomplete elliptic integral of the first kind
-     *           @f$ F(k,\phi) @f$ using the Carlson formulation.
-     * 
-     *   The incomplete elliptic integral of the first kind is defined as
-     *   @f[
-     *     F(k,\phi) = \int_0^{\phi}\frac{d\theta}
-     *                                   {\sqrt{1 - k^2 sin^2\theta}}
-     *   @f]
-     * 
-     *   @param  __k  The argument of the elliptic function.
-     *   @param  __phi  The integral limit argument of the elliptic function.
-     *   @return  The elliptic function of the first kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __ellint_1(_Tp __k, _Tp __phi)
-    {
-
-      if (__isnan(__k) || __isnan(__phi))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (std::abs(__k) > _Tp(1))
-        std::__throw_domain_error(__N("Bad argument in __ellint_1."));
-      else
-        {
-          //  Reduce phi to -pi/2 < phi < +pi/2.
-          const int __n = std::floor(__phi / __numeric_constants<_Tp>::__pi()
-                                   + _Tp(0.5L));
-          const _Tp __phi_red = __phi
-                              - __n * __numeric_constants<_Tp>::__pi();
-
-          const _Tp __s = std::sin(__phi_red);
-          const _Tp __c = std::cos(__phi_red);
-
-          const _Tp __F = __s
-                        * __ellint_rf(__c * __c,
-                                _Tp(1) - __k * __k * __s * __s, _Tp(1));
-
-          if (__n == 0)
-            return __F;
-          else
-            return __F + _Tp(2) * __n * __comp_ellint_1(__k);
-        }
-    }
-
-
-    /**
-     *   @brief Return the complete elliptic integral of the second kind
-     *          @f$ E(k) @f$ by series expansion.
-     * 
-     *   The complete elliptic integral of the second kind is defined as
-     *   @f[
-     *     E(k,\pi/2) = \int_0^{\pi/2}\sqrt{1 - k^2 sin^2\theta}
-     *   @f]
-     * 
-     *   This routine is not bad as long as |k| is somewhat smaller than 1
-     *   but is not is good as the Carlson elliptic integral formulation.
-     * 
-     *   @param  __k  The argument of the complete elliptic function.
-     *   @return  The complete elliptic function of the second kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __comp_ellint_2_series(_Tp __k)
-    {
-
-      const _Tp __kk = __k * __k;
-
-      _Tp __term = __kk;
-      _Tp __sum = __term;
-
-      const unsigned int __max_iter = 1000;
-      for (unsigned int __i = 2; __i < __max_iter; ++__i)
-        {
-          const _Tp __i2m = 2 * __i - 1;
-          const _Tp __i2 = 2 * __i;
-          __term *= __i2m * __i2m * __kk / (__i2 * __i2);
-          if (__term < std::numeric_limits<_Tp>::epsilon())
-            break;
-          __sum += __term / __i2m;
-        }
-
-      return __numeric_constants<_Tp>::__pi_2() * (_Tp(1) - __sum);
-    }
-
-
-    /**
-     *   @brief  Return the Carlson elliptic function of the second kind
-     *           @f$ R_D(x,y,z) = R_J(x,y,z,z) @f$ where
-     *           @f$ R_J(x,y,z,p) @f$ is the Carlson elliptic function
-     *           of the third kind.
-     * 
-     *   The Carlson elliptic function of the second kind is defined by:
-     *   @f[
-     *       R_D(x,y,z) = \frac{3}{2} \int_0^\infty
-     *                 \frac{dt}{(t + x)^{1/2}(t + y)^{1/2}(t + z)^{3/2}}
-     *   @f]
-     *
-     *   Based on Carlson's algorithms:
-     *   -  B. C. Carlson Numer. Math. 33, 1 (1979)
-     *   -  B. C. Carlson, Special Functions of Applied Mathematics (1977)
-     *   -  Numerical Recipes in C, 2nd ed, pp. 261-269,
-     *      by Press, Teukolsky, Vetterling, Flannery (1992)
-     *
-     *   @param  __x  The first of two symmetric arguments.
-     *   @param  __y  The second of two symmetric arguments.
-     *   @param  __z  The third argument.
-     *   @return  The Carlson elliptic function of the second kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __ellint_rd(_Tp __x, _Tp __y, _Tp __z)
-    {
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      const _Tp __errtol = std::pow(__eps / _Tp(8), _Tp(1) / _Tp(6));
-      const _Tp __min = std::numeric_limits<_Tp>::min();
-      const _Tp __max = std::numeric_limits<_Tp>::max();
-      const _Tp __lolim = _Tp(2) / std::pow(__max, _Tp(2) / _Tp(3));
-      const _Tp __uplim = std::pow(_Tp(0.1L) * __errtol / __min, _Tp(2) / _Tp(3));
-
-      if (__x < _Tp(0) || __y < _Tp(0))
-        std::__throw_domain_error(__N("Argument less than zero "
-                                      "in __ellint_rd."));
-      else if (__x + __y < __lolim || __z < __lolim)
-        std::__throw_domain_error(__N("Argument too small "
-                                      "in __ellint_rd."));
-      else
-        {
-          const _Tp __c0 = _Tp(1) / _Tp(4);
-          const _Tp __c1 = _Tp(3) / _Tp(14);
-          const _Tp __c2 = _Tp(1) / _Tp(6);
-          const _Tp __c3 = _Tp(9) / _Tp(22);
-          const _Tp __c4 = _Tp(3) / _Tp(26);
-
-          _Tp __xn = __x;
-          _Tp __yn = __y;
-          _Tp __zn = __z;
-          _Tp __sigma = _Tp(0);
-          _Tp __power4 = _Tp(1);
-
-          _Tp __mu;
-          _Tp __xndev, __yndev, __zndev;
-
-          const unsigned int __max_iter = 100;
-          for (unsigned int __iter = 0; __iter < __max_iter; ++__iter)
-            {
-              __mu = (__xn + __yn + _Tp(3) * __zn) / _Tp(5);
-              __xndev = (__mu - __xn) / __mu;
-              __yndev = (__mu - __yn) / __mu;
-              __zndev = (__mu - __zn) / __mu;
-              _Tp __epsilon = std::max(std::abs(__xndev), std::abs(__yndev));
-              __epsilon = std::max(__epsilon, std::abs(__zndev));
-              if (__epsilon < __errtol)
-                break;
-              _Tp __xnroot = std::sqrt(__xn);
-              _Tp __ynroot = std::sqrt(__yn);
-              _Tp __znroot = std::sqrt(__zn);
-              _Tp __lambda = __xnroot * (__ynroot + __znroot)
-                           + __ynroot * __znroot;
-              __sigma += __power4 / (__znroot * (__zn + __lambda));
-              __power4 *= __c0;
-              __xn = __c0 * (__xn + __lambda);
-              __yn = __c0 * (__yn + __lambda);
-              __zn = __c0 * (__zn + __lambda);
-            }
-
-	  // Note: __ea is an SPU badname.
-          _Tp __eaa = __xndev * __yndev;
-          _Tp __eb = __zndev * __zndev;
-          _Tp __ec = __eaa - __eb;
-          _Tp __ed = __eaa - _Tp(6) * __eb;
-          _Tp __ef = __ed + __ec + __ec;
-          _Tp __s1 = __ed * (-__c1 + __c3 * __ed
-                                   / _Tp(3) - _Tp(3) * __c4 * __zndev * __ef
-                                   / _Tp(2));
-          _Tp __s2 = __zndev
-                   * (__c2 * __ef
-                    + __zndev * (-__c3 * __ec - __zndev * __c4 - __eaa));
-
-          return _Tp(3) * __sigma + __power4 * (_Tp(1) + __s1 + __s2)
-                                        / (__mu * std::sqrt(__mu));
-        }
-    }
-
-
-    /**
-     *   @brief  Return the complete elliptic integral of the second kind
-     *           @f$ E(k) @f$ using the Carlson formulation.
-     * 
-     *   The complete elliptic integral of the second kind is defined as
-     *   @f[
-     *     E(k,\pi/2) = \int_0^{\pi/2}\sqrt{1 - k^2 sin^2\theta}
-     *   @f]
-     * 
-     *   @param  __k  The argument of the complete elliptic function.
-     *   @return  The complete elliptic function of the second kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __comp_ellint_2(_Tp __k)
-    {
-
-      if (__isnan(__k))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (std::abs(__k) == 1)
-        return _Tp(1);
-      else if (std::abs(__k) > _Tp(1))
-        std::__throw_domain_error(__N("Bad argument in __comp_ellint_2."));
-      else
-        {
-          const _Tp __kk = __k * __k;
-
-          return __ellint_rf(_Tp(0), _Tp(1) - __kk, _Tp(1))
-               - __kk * __ellint_rd(_Tp(0), _Tp(1) - __kk, _Tp(1)) / _Tp(3);
-        }
-    }
-
-
-    /**
-     *   @brief  Return the incomplete elliptic integral of the second kind
-     *           @f$ E(k,\phi) @f$ using the Carlson formulation.
-     * 
-     *   The incomplete elliptic integral of the second kind is defined as
-     *   @f[
-     *     E(k,\phi) = \int_0^{\phi} \sqrt{1 - k^2 sin^2\theta}
-     *   @f]
-     * 
-     *   @param  __k  The argument of the elliptic function.
-     *   @param  __phi  The integral limit argument of the elliptic function.
-     *   @return  The elliptic function of the second kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __ellint_2(_Tp __k, _Tp __phi)
-    {
-
-      if (__isnan(__k) || __isnan(__phi))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (std::abs(__k) > _Tp(1))
-        std::__throw_domain_error(__N("Bad argument in __ellint_2."));
-      else
-        {
-          //  Reduce phi to -pi/2 < phi < +pi/2.
-          const int __n = std::floor(__phi / __numeric_constants<_Tp>::__pi()
-                                   + _Tp(0.5L));
-          const _Tp __phi_red = __phi
-                              - __n * __numeric_constants<_Tp>::__pi();
-
-          const _Tp __kk = __k * __k;
-          const _Tp __s = std::sin(__phi_red);
-          const _Tp __ss = __s * __s;
-          const _Tp __sss = __ss * __s;
-          const _Tp __c = std::cos(__phi_red);
-          const _Tp __cc = __c * __c;
-
-          const _Tp __E = __s
-                        * __ellint_rf(__cc, _Tp(1) - __kk * __ss, _Tp(1))
-                        - __kk * __sss
-                        * __ellint_rd(__cc, _Tp(1) - __kk * __ss, _Tp(1))
-                        / _Tp(3);
-
-          if (__n == 0)
-            return __E;
-          else
-            return __E + _Tp(2) * __n * __comp_ellint_2(__k);
-        }
-    }
-
-
-    /**
-     *   @brief  Return the Carlson elliptic function
-     *           @f$ R_C(x,y) = R_F(x,y,y) @f$ where @f$ R_F(x,y,z) @f$
-     *           is the Carlson elliptic function of the first kind.
-     * 
-     *   The Carlson elliptic function is defined by:
-     *   @f[
-     *       R_C(x,y) = \frac{1}{2} \int_0^\infty
-     *                 \frac{dt}{(t + x)^{1/2}(t + y)}
-     *   @f]
-     *
-     *   Based on Carlson's algorithms:
-     *   -  B. C. Carlson Numer. Math. 33, 1 (1979)
-     *   -  B. C. Carlson, Special Functions of Applied Mathematics (1977)
-     *   -  Numerical Recipes in C, 2nd ed, pp. 261-269,
-     *      by Press, Teukolsky, Vetterling, Flannery (1992)
-     *
-     *   @param  __x  The first argument.
-     *   @param  __y  The second argument.
-     *   @return  The Carlson elliptic function.
-     */
-    template<typename _Tp>
-    _Tp
-    __ellint_rc(_Tp __x, _Tp __y)
-    {
-      const _Tp __min = std::numeric_limits<_Tp>::min();
-      const _Tp __max = std::numeric_limits<_Tp>::max();
-      const _Tp __lolim = _Tp(5) * __min;
-      const _Tp __uplim = __max / _Tp(5);
-
-      if (__x < _Tp(0) || __y < _Tp(0) || __x + __y < __lolim)
-        std::__throw_domain_error(__N("Argument less than zero "
-                                      "in __ellint_rc."));
-      else
-        {
-          const _Tp __c0 = _Tp(1) / _Tp(4);
-          const _Tp __c1 = _Tp(1) / _Tp(7);
-          const _Tp __c2 = _Tp(9) / _Tp(22);
-          const _Tp __c3 = _Tp(3) / _Tp(10);
-          const _Tp __c4 = _Tp(3) / _Tp(8);
-
-          _Tp __xn = __x;
-          _Tp __yn = __y;
-
-          const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-          const _Tp __errtol = std::pow(__eps / _Tp(30), _Tp(1) / _Tp(6));
-          _Tp __mu;
-          _Tp __sn;
-
-          const unsigned int __max_iter = 100;
-          for (unsigned int __iter = 0; __iter < __max_iter; ++__iter)
-            {
-              __mu = (__xn + _Tp(2) * __yn) / _Tp(3);
-              __sn = (__yn + __mu) / __mu - _Tp(2);
-              if (std::abs(__sn) < __errtol)
-                break;
-              const _Tp __lambda = _Tp(2) * std::sqrt(__xn) * std::sqrt(__yn)
-                             + __yn;
-              __xn = __c0 * (__xn + __lambda);
-              __yn = __c0 * (__yn + __lambda);
-            }
-
-          _Tp __s = __sn * __sn
-                  * (__c3 + __sn*(__c1 + __sn * (__c4 + __sn * __c2)));
-
-          return (_Tp(1) + __s) / std::sqrt(__mu);
-        }
-    }
-
-
-    /**
-     *   @brief  Return the Carlson elliptic function @f$ R_J(x,y,z,p) @f$
-     *           of the third kind.
-     * 
-     *   The Carlson elliptic function of the third kind is defined by:
-     *   @f[
-     *       R_J(x,y,z,p) = \frac{3}{2} \int_0^\infty
-     *       \frac{dt}{(t + x)^{1/2}(t + y)^{1/2}(t + z)^{1/2}(t + p)}
-     *   @f]
-     *
-     *   Based on Carlson's algorithms:
-     *   -  B. C. Carlson Numer. Math. 33, 1 (1979)
-     *   -  B. C. Carlson, Special Functions of Applied Mathematics (1977)
-     *   -  Numerical Recipes in C, 2nd ed, pp. 261-269,
-     *      by Press, Teukolsky, Vetterling, Flannery (1992)
-     *
-     *   @param  __x  The first of three symmetric arguments.
-     *   @param  __y  The second of three symmetric arguments.
-     *   @param  __z  The third of three symmetric arguments.
-     *   @param  __p  The fourth argument.
-     *   @return  The Carlson elliptic function of the fourth kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __ellint_rj(_Tp __x, _Tp __y, _Tp __z, _Tp __p)
-    {
-      const _Tp __min = std::numeric_limits<_Tp>::min();
-      const _Tp __max = std::numeric_limits<_Tp>::max();
-      const _Tp __lolim = std::pow(_Tp(5) * __min, _Tp(1)/_Tp(3));
-      const _Tp __uplim = _Tp(0.3L)
-                        * std::pow(_Tp(0.2L) * __max, _Tp(1)/_Tp(3));
-
-      if (__x < _Tp(0) || __y < _Tp(0) || __z < _Tp(0))
-        std::__throw_domain_error(__N("Argument less than zero "
-                                      "in __ellint_rj."));
-      else if (__x + __y < __lolim || __x + __z < __lolim
-            || __y + __z < __lolim || __p < __lolim)
-        std::__throw_domain_error(__N("Argument too small "
-                                      "in __ellint_rj"));
-      else
-        {
-          const _Tp __c0 = _Tp(1) / _Tp(4);
-          const _Tp __c1 = _Tp(3) / _Tp(14);
-          const _Tp __c2 = _Tp(1) / _Tp(3);
-          const _Tp __c3 = _Tp(3) / _Tp(22);
-          const _Tp __c4 = _Tp(3) / _Tp(26);
-
-          _Tp __xn = __x;
-          _Tp __yn = __y;
-          _Tp __zn = __z;
-          _Tp __pn = __p;
-          _Tp __sigma = _Tp(0);
-          _Tp __power4 = _Tp(1);
-
-          const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-          const _Tp __errtol = std::pow(__eps / _Tp(8), _Tp(1) / _Tp(6));
-
-          _Tp __lambda, __mu;
-          _Tp __xndev, __yndev, __zndev, __pndev;
-
-          const unsigned int __max_iter = 100;
-          for (unsigned int __iter = 0; __iter < __max_iter; ++__iter)
-            {
-              __mu = (__xn + __yn + __zn + _Tp(2) * __pn) / _Tp(5);
-              __xndev = (__mu - __xn) / __mu;
-              __yndev = (__mu - __yn) / __mu;
-              __zndev = (__mu - __zn) / __mu;
-              __pndev = (__mu - __pn) / __mu;
-              _Tp __epsilon = std::max(std::abs(__xndev), std::abs(__yndev));
-              __epsilon = std::max(__epsilon, std::abs(__zndev));
-              __epsilon = std::max(__epsilon, std::abs(__pndev));
-              if (__epsilon < __errtol)
-                break;
-              const _Tp __xnroot = std::sqrt(__xn);
-              const _Tp __ynroot = std::sqrt(__yn);
-              const _Tp __znroot = std::sqrt(__zn);
-              const _Tp __lambda = __xnroot * (__ynroot + __znroot)
-                                 + __ynroot * __znroot;
-              const _Tp __alpha1 = __pn * (__xnroot + __ynroot + __znroot)
-                                + __xnroot * __ynroot * __znroot;
-              const _Tp __alpha2 = __alpha1 * __alpha1;
-              const _Tp __beta = __pn * (__pn + __lambda)
-                                      * (__pn + __lambda);
-              __sigma += __power4 * __ellint_rc(__alpha2, __beta);
-              __power4 *= __c0;
-              __xn = __c0 * (__xn + __lambda);
-              __yn = __c0 * (__yn + __lambda);
-              __zn = __c0 * (__zn + __lambda);
-              __pn = __c0 * (__pn + __lambda);
-            }
-
-	  // Note: __ea is an SPU badname.
-          _Tp __eaa = __xndev * (__yndev + __zndev) + __yndev * __zndev;
-          _Tp __eb = __xndev * __yndev * __zndev;
-          _Tp __ec = __pndev * __pndev;
-          _Tp __e2 = __eaa - _Tp(3) * __ec;
-          _Tp __e3 = __eb + _Tp(2) * __pndev * (__eaa - __ec);
-          _Tp __s1 = _Tp(1) + __e2 * (-__c1 + _Tp(3) * __c3 * __e2 / _Tp(4)
-                            - _Tp(3) * __c4 * __e3 / _Tp(2));
-          _Tp __s2 = __eb * (__c2 / _Tp(2)
-                   + __pndev * (-__c3 - __c3 + __pndev * __c4));
-          _Tp __s3 = __pndev * __eaa * (__c2 - __pndev * __c3)
-                   - __c2 * __pndev * __ec;
-
-          return _Tp(3) * __sigma + __power4 * (__s1 + __s2 + __s3)
-                                             / (__mu * std::sqrt(__mu));
-        }
-    }
-
-
-    /**
-     *   @brief Return the complete elliptic integral of the third kind
-     *          @f$ \Pi(k,\nu) = \Pi(k,\nu,\pi/2) @f$ using the
-     *          Carlson formulation.
-     * 
-     *   The complete elliptic integral of the third kind is defined as
-     *   @f[
-     *     \Pi(k,\nu) = \int_0^{\pi/2}
-     *                   \frac{d\theta}
-     *                 {(1 - \nu \sin^2\theta)\sqrt{1 - k^2 \sin^2\theta}}
-     *   @f]
-     * 
-     *   @param  __k  The argument of the elliptic function.
-     *   @param  __nu  The second argument of the elliptic function.
-     *   @return  The complete elliptic function of the third kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __comp_ellint_3(_Tp __k, _Tp __nu)
-    {
-
-      if (__isnan(__k) || __isnan(__nu))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__nu == _Tp(1))
-        return std::numeric_limits<_Tp>::infinity();
-      else if (std::abs(__k) > _Tp(1))
-        std::__throw_domain_error(__N("Bad argument in __comp_ellint_3."));
-      else
-        {
-          const _Tp __kk = __k * __k;
-
-          return __ellint_rf(_Tp(0), _Tp(1) - __kk, _Tp(1))
-               - __nu
-               * __ellint_rj(_Tp(0), _Tp(1) - __kk, _Tp(1), _Tp(1) + __nu)
-               / _Tp(3);
-        }
-    }
-
-
-    /**
-     *   @brief Return the incomplete elliptic integral of the third kind
-     *          @f$ \Pi(k,\nu,\phi) @f$ using the Carlson formulation.
-     * 
-     *   The incomplete elliptic integral of the third kind is defined as
-     *   @f[
-     *     \Pi(k,\nu,\phi) = \int_0^{\phi}
-     *                       \frac{d\theta}
-     *                            {(1 - \nu \sin^2\theta)
-     *                             \sqrt{1 - k^2 \sin^2\theta}}
-     *   @f]
-     * 
-     *   @param  __k  The argument of the elliptic function.
-     *   @param  __nu  The second argument of the elliptic function.
-     *   @param  __phi  The integral limit argument of the elliptic function.
-     *   @return  The elliptic function of the third kind.
-     */
-    template<typename _Tp>
-    _Tp
-    __ellint_3(_Tp __k, _Tp __nu, _Tp __phi)
-    {
-
-      if (__isnan(__k) || __isnan(__nu) || __isnan(__phi))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (std::abs(__k) > _Tp(1))
-        std::__throw_domain_error(__N("Bad argument in __ellint_3."));
-      else
-        {
-          //  Reduce phi to -pi/2 < phi < +pi/2.
-          const int __n = std::floor(__phi / __numeric_constants<_Tp>::__pi()
-                                   + _Tp(0.5L));
-          const _Tp __phi_red = __phi
-                              - __n * __numeric_constants<_Tp>::__pi();
-
-          const _Tp __kk = __k * __k;
-          const _Tp __s = std::sin(__phi_red);
-          const _Tp __ss = __s * __s;
-          const _Tp __sss = __ss * __s;
-          const _Tp __c = std::cos(__phi_red);
-          const _Tp __cc = __c * __c;
-
-          const _Tp __Pi = __s
-                         * __ellint_rf(__cc, _Tp(1) - __kk * __ss, _Tp(1))
-                         - __nu * __sss
-                         * __ellint_rj(__cc, _Tp(1) - __kk * __ss, _Tp(1),
-                                       _Tp(1) + __nu * __ss) / _Tp(3);
-
-          if (__n == 0)
-            return __Pi;
-          else
-            return __Pi + _Tp(2) * __n * __comp_ellint_3(__k, __nu);
-        }
-    }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_ELL_INTEGRAL_TCC
-
diff --git a/openflow/usr/include/c++/5/tr1/exp_integral.tcc b/openflow/usr/include/c++/5/tr1/exp_integral.tcc
deleted file mode 100644
index b327e7d..0000000
--- a/openflow/usr/include/c++/5/tr1/exp_integral.tcc
+++ /dev/null
@@ -1,526 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/exp_integral.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-//  Written by Edward Smith-Rowland based on:
-//
-//   (1) Handbook of Mathematical Functions,
-//       Ed. by Milton Abramowitz and Irene A. Stegun,
-//       Dover Publications, New-York, Section 5, pp. 228-251.
-//   (2) The Gnu Scientific Library, http://www.gnu.org/software/gsl
-//   (3) Numerical Recipes in C, by W. H. Press, S. A. Teukolsky,
-//       W. T. Vetterling, B. P. Flannery, Cambridge University Press (1992),
-//       2nd ed, pp. 222-225.
-//
-
-#ifndef _GLIBCXX_TR1_EXP_INTEGRAL_TCC
-#define _GLIBCXX_TR1_EXP_INTEGRAL_TCC 1
-
-#include "special_function_util.h"
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.2] Special functions
-
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    template<typename _Tp> _Tp __expint_E1(_Tp);
-
-    /**
-     *   @brief Return the exponential integral @f$ E_1(x) @f$
-     *          by series summation.  This should be good
-     *          for @f$ x < 1 @f$.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            E_1(x) = \int_{1}^{\infty} \frac{e^{-xt}}{t} dt
-     *          \f]
-     * 
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_E1_series(_Tp __x)
-    {
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      _Tp __term = _Tp(1);
-      _Tp __esum = _Tp(0);
-      _Tp __osum = _Tp(0);
-      const unsigned int __max_iter = 100;
-      for (unsigned int __i = 1; __i < __max_iter; ++__i)
-        {
-          __term *= - __x / __i;
-          if (std::abs(__term) < __eps)
-            break;
-          if (__term >= _Tp(0))
-            __esum += __term / __i;
-          else
-            __osum += __term / __i;
-        }
-
-      return - __esum - __osum
-             - __numeric_constants<_Tp>::__gamma_e() - std::log(__x);
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ E_1(x) @f$
-     *          by asymptotic expansion.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            E_1(x) = \int_{1}^\infty \frac{e^{-xt}}{t} dt
-     *          \f]
-     * 
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_E1_asymp(_Tp __x)
-    {
-      _Tp __term = _Tp(1);
-      _Tp __esum = _Tp(1);
-      _Tp __osum = _Tp(0);
-      const unsigned int __max_iter = 1000;
-      for (unsigned int __i = 1; __i < __max_iter; ++__i)
-        {
-          _Tp __prev = __term;
-          __term *= - __i / __x;
-          if (std::abs(__term) > std::abs(__prev))
-            break;
-          if (__term >= _Tp(0))
-            __esum += __term;
-          else
-            __osum += __term;
-        }
-
-      return std::exp(- __x) * (__esum + __osum) / __x;
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ E_n(x) @f$
-     *          by series summation.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            E_n(x) = \int_{1}^\infty \frac{e^{-xt}}{t^n} dt
-     *          \f]
-     * 
-     *   @param  __n  The order of the exponential integral function.
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_En_series(unsigned int __n, _Tp __x)
-    {
-      const unsigned int __max_iter = 100;
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      const int __nm1 = __n - 1;
-      _Tp __ans = (__nm1 != 0
-                ? _Tp(1) / __nm1 : -std::log(__x)
-                                   - __numeric_constants<_Tp>::__gamma_e());
-      _Tp __fact = _Tp(1);
-      for (int __i = 1; __i <= __max_iter; ++__i)
-        {
-          __fact *= -__x / _Tp(__i);
-          _Tp __del;
-          if ( __i != __nm1 )
-            __del = -__fact / _Tp(__i - __nm1);
-          else
-            {
-              _Tp __psi = -__numeric_constants<_Tp>::gamma_e();
-              for (int __ii = 1; __ii <= __nm1; ++__ii)
-                __psi += _Tp(1) / _Tp(__ii);
-              __del = __fact * (__psi - std::log(__x)); 
-            }
-          __ans += __del;
-          if (std::abs(__del) < __eps * std::abs(__ans))
-            return __ans;
-        }
-      std::__throw_runtime_error(__N("Series summation failed "
-                                     "in __expint_En_series."));
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ E_n(x) @f$
-     *          by continued fractions.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            E_n(x) = \int_{1}^\infty \frac{e^{-xt}}{t^n} dt
-     *          \f]
-     * 
-     *   @param  __n  The order of the exponential integral function.
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_En_cont_frac(unsigned int __n, _Tp __x)
-    {
-      const unsigned int __max_iter = 100;
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      const _Tp __fp_min = std::numeric_limits<_Tp>::min();
-      const int __nm1 = __n - 1;
-      _Tp __b = __x + _Tp(__n);
-      _Tp __c = _Tp(1) / __fp_min;
-      _Tp __d = _Tp(1) / __b;
-      _Tp __h = __d;
-      for ( unsigned int __i = 1; __i <= __max_iter; ++__i )
-        {
-          _Tp __a = -_Tp(__i * (__nm1 + __i));
-          __b += _Tp(2);
-          __d = _Tp(1) / (__a * __d + __b);
-          __c = __b + __a / __c;
-          const _Tp __del = __c * __d;
-          __h *= __del;
-          if (std::abs(__del - _Tp(1)) < __eps)
-            {
-              const _Tp __ans = __h * std::exp(-__x);
-              return __ans;
-            }
-        }
-      std::__throw_runtime_error(__N("Continued fraction failed "
-                                     "in __expint_En_cont_frac."));
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ E_n(x) @f$
-     *          by recursion.  Use upward recursion for @f$ x < n @f$
-     *          and downward recursion (Miller's algorithm) otherwise.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            E_n(x) = \int_{1}^\infty \frac{e^{-xt}}{t^n} dt
-     *          \f]
-     * 
-     *   @param  __n  The order of the exponential integral function.
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_En_recursion(unsigned int __n, _Tp __x)
-    {
-      _Tp __En;
-      _Tp __E1 = __expint_E1(__x);
-      if (__x < _Tp(__n))
-        {
-          //  Forward recursion is stable only for n < x.
-          __En = __E1;
-          for (unsigned int __j = 2; __j < __n; ++__j)
-            __En = (std::exp(-__x) - __x * __En) / _Tp(__j - 1);
-        }
-      else
-        {
-          //  Backward recursion is stable only for n >= x.
-          __En = _Tp(1);
-          const int __N = __n + 20;  //  TODO: Check this starting number.
-          _Tp __save = _Tp(0);
-          for (int __j = __N; __j > 0; --__j)
-            {
-              __En = (std::exp(-__x) - __j * __En) / __x;
-              if (__j == __n)
-                __save = __En;
-            }
-            _Tp __norm = __En / __E1;
-            __En /= __norm;
-        }
-
-      return __En;
-    }
-
-    /**
-     *   @brief Return the exponential integral @f$ Ei(x) @f$
-     *          by series summation.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            Ei(x) = -\int_{-x}^\infty \frac{e^t}{t} dt
-     *          \f]
-     * 
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_Ei_series(_Tp __x)
-    {
-      _Tp __term = _Tp(1);
-      _Tp __sum = _Tp(0);
-      const unsigned int __max_iter = 1000;
-      for (unsigned int __i = 1; __i < __max_iter; ++__i)
-        {
-          __term *= __x / __i;
-          __sum += __term / __i;
-          if (__term < std::numeric_limits<_Tp>::epsilon() * __sum)
-            break;
-        }
-
-      return __numeric_constants<_Tp>::__gamma_e() + __sum + std::log(__x);
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ Ei(x) @f$
-     *          by asymptotic expansion.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            Ei(x) = -\int_{-x}^\infty \frac{e^t}{t} dt
-     *          \f]
-     * 
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_Ei_asymp(_Tp __x)
-    {
-      _Tp __term = _Tp(1);
-      _Tp __sum = _Tp(1);
-      const unsigned int __max_iter = 1000;
-      for (unsigned int __i = 1; __i < __max_iter; ++__i)
-        {
-          _Tp __prev = __term;
-          __term *= __i / __x;
-          if (__term < std::numeric_limits<_Tp>::epsilon())
-            break;
-          if (__term >= __prev)
-            break;
-          __sum += __term;
-        }
-
-      return std::exp(__x) * __sum / __x;
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ Ei(x) @f$.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            Ei(x) = -\int_{-x}^\infty \frac{e^t}{t} dt
-     *          \f]
-     * 
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_Ei(_Tp __x)
-    {
-      if (__x < _Tp(0))
-        return -__expint_E1(-__x);
-      else if (__x < -std::log(std::numeric_limits<_Tp>::epsilon()))
-        return __expint_Ei_series(__x);
-      else
-        return __expint_Ei_asymp(__x);
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ E_1(x) @f$.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            E_1(x) = \int_{1}^\infty \frac{e^{-xt}}{t} dt
-     *          \f]
-     * 
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_E1(_Tp __x)
-    {
-      if (__x < _Tp(0))
-        return -__expint_Ei(-__x);
-      else if (__x < _Tp(1))
-        return __expint_E1_series(__x);
-      else if (__x < _Tp(100))  //  TODO: Find a good asymptotic switch point.
-        return __expint_En_cont_frac(1, __x);
-      else
-        return __expint_E1_asymp(__x);
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ E_n(x) @f$
-     *          for large argument.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            E_n(x) = \int_{1}^\infty \frac{e^{-xt}}{t^n} dt
-     *          \f]
-     * 
-     *   This is something of an extension.
-     * 
-     *   @param  __n  The order of the exponential integral function.
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_asymp(unsigned int __n, _Tp __x)
-    {
-      _Tp __term = _Tp(1);
-      _Tp __sum = _Tp(1);
-      for (unsigned int __i = 1; __i <= __n; ++__i)
-        {
-          _Tp __prev = __term;
-          __term *= -(__n - __i + 1) / __x;
-          if (std::abs(__term) > std::abs(__prev))
-            break;
-          __sum += __term;
-        }
-
-      return std::exp(-__x) * __sum / __x;
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ E_n(x) @f$
-     *          for large order.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            E_n(x) = \int_{1}^\infty \frac{e^{-xt}}{t^n} dt
-     *          \f]
-     *        
-     *   This is something of an extension.
-     * 
-     *   @param  __n  The order of the exponential integral function.
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint_large_n(unsigned int __n, _Tp __x)
-    {
-      const _Tp __xpn = __x + __n;
-      const _Tp __xpn2 = __xpn * __xpn;
-      _Tp __term = _Tp(1);
-      _Tp __sum = _Tp(1);
-      for (unsigned int __i = 1; __i <= __n; ++__i)
-        {
-          _Tp __prev = __term;
-          __term *= (__n - 2 * (__i - 1) * __x) / __xpn2;
-          if (std::abs(__term) < std::numeric_limits<_Tp>::epsilon())
-            break;
-          __sum += __term;
-        }
-
-      return std::exp(-__x) * __sum / __xpn;
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ E_n(x) @f$.
-     * 
-     *   The exponential integral is given by
-     *          \f[
-     *            E_n(x) = \int_{1}^\infty \frac{e^{-xt}}{t^n} dt
-     *          \f]
-     *   This is something of an extension.
-     * 
-     *   @param  __n  The order of the exponential integral function.
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    _Tp
-    __expint(unsigned int __n, _Tp __x)
-    {
-      //  Return NaN on NaN input.
-      if (__isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__n <= 1 && __x == _Tp(0))
-        return std::numeric_limits<_Tp>::infinity();
-      else
-        {
-          _Tp __E0 = std::exp(__x) / __x;
-          if (__n == 0)
-            return __E0;
-
-          _Tp __E1 = __expint_E1(__x);
-          if (__n == 1)
-            return __E1;
-
-          if (__x == _Tp(0))
-            return _Tp(1) / static_cast<_Tp>(__n - 1);
-
-          _Tp __En = __expint_En_recursion(__n, __x);
-
-          return __En;
-        }
-    }
-
-
-    /**
-     *   @brief Return the exponential integral @f$ Ei(x) @f$.
-     * 
-     *   The exponential integral is given by
-     *   \f[
-     *     Ei(x) = -\int_{-x}^\infty \frac{e^t}{t} dt
-     *   \f]
-     * 
-     *   @param  __x  The argument of the exponential integral function.
-     *   @return  The exponential integral.
-     */
-    template<typename _Tp>
-    inline _Tp
-    __expint(_Tp __x)
-    {
-      if (__isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else
-        return __expint_Ei(__x);
-    }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_EXP_INTEGRAL_TCC
diff --git a/openflow/usr/include/c++/5/tr1/fenv.h b/openflow/usr/include/c++/5/tr1/fenv.h
deleted file mode 100644
index a484f35..0000000
--- a/openflow/usr/include/c++/5/tr1/fenv.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 fenv.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/fenv.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _TR1_FENV_H
-#define _TR1_FENV_H 1
-
-#include <tr1/cfenv>
-
-#endif
diff --git a/openflow/usr/include/c++/5/tr1/float.h b/openflow/usr/include/c++/5/tr1/float.h
deleted file mode 100644
index 3bdce13..0000000
--- a/openflow/usr/include/c++/5/tr1/float.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 float.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/float.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _TR1_FLOAT_H
-#define _TR1_FLOAT_H 1
-
-#include <tr1/cfloat>
-
-#endif
diff --git a/openflow/usr/include/c++/5/tr1/functional b/openflow/usr/include/c++/5/tr1/functional
deleted file mode 100644
index 0ca8585..0000000
--- a/openflow/usr/include/c++/5/tr1/functional
+++ /dev/null
@@ -1,2308 +0,0 @@
-// TR1 functional header -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/functional
- *  This is a TR1 C++ Library header.
- */
-
-#ifndef _GLIBCXX_TR1_FUNCTIONAL
-#define _GLIBCXX_TR1_FUNCTIONAL 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stl_function.h>
-
-#include <typeinfo>
-#include <new>
-#include <tr1/tuple>
-#include <tr1/type_traits>
-#include <bits/stringfwd.h>
-#include <tr1/functional_hash.h>
-#include <ext/type_traits.h>
-#include <bits/move.h> // for std::__addressof
-#if __cplusplus >= 201103L
-#  include <type_traits> // for integral_constant, true_type, false_type
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-#if __cplusplus >= 201103L
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-  template<int> struct _Placeholder;
-  template<typename> class _Bind;
-  template<typename, typename> class _Bind_result;
-_GLIBCXX_END_NAMESPACE_VERSION
-#endif
-
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _MemberPointer>
-    class _Mem_fn;
-  template<typename _Tp, typename _Class>
-    _Mem_fn<_Tp _Class::*>
-    mem_fn(_Tp _Class::*);
-
-  /**
-   *  Actual implementation of _Has_result_type, which uses SFINAE to
-   *  determine if the type _Tp has a publicly-accessible member type
-   *  result_type.
-  */
-  template<typename _Tp>
-    class _Has_result_type_helper : __sfinae_types
-    {
-      template<typename _Up>
-        struct _Wrap_type
-	{ };
-
-      template<typename _Up>
-        static __one __test(_Wrap_type<typename _Up::result_type>*);
-
-      template<typename _Up>
-        static __two __test(...);
-
-    public:
-      static const bool value = sizeof(__test<_Tp>(0)) == 1;
-    };
-
-  template<typename _Tp>
-    struct _Has_result_type
-    : integral_constant<bool,
-	      _Has_result_type_helper<typename remove_cv<_Tp>::type>::value>
-    { };
-
-  /**
-   *  
-  */
-  /// If we have found a result_type, extract it.
-  template<bool _Has_result_type, typename _Functor>
-    struct _Maybe_get_result_type
-    { };
-
-  template<typename _Functor>
-    struct _Maybe_get_result_type<true, _Functor>
-    {
-      typedef typename _Functor::result_type result_type;
-    };
-
-  /**
-   *  Base class for any function object that has a weak result type, as
-   *  defined in 3.3/3 of TR1.
-  */
-  template<typename _Functor>
-    struct _Weak_result_type_impl
-    : _Maybe_get_result_type<_Has_result_type<_Functor>::value, _Functor>
-    {
-    };
-
-  /// Retrieve the result type for a function type.
-  template<typename _Res, typename... _ArgTypes> 
-    struct _Weak_result_type_impl<_Res(_ArgTypes...)>
-    {
-      typedef _Res result_type;
-    };
-
-  /// Retrieve the result type for a function reference.
-  template<typename _Res, typename... _ArgTypes> 
-    struct _Weak_result_type_impl<_Res(&)(_ArgTypes...)>
-    {
-      typedef _Res result_type;
-    };
-
-  /// Retrieve the result type for a function pointer.
-  template<typename _Res, typename... _ArgTypes> 
-    struct _Weak_result_type_impl<_Res(*)(_ArgTypes...)>
-    {
-      typedef _Res result_type;
-    };
-
-  /// Retrieve result type for a member function pointer. 
-  template<typename _Res, typename _Class, typename... _ArgTypes> 
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes...)>
-    {
-      typedef _Res result_type;
-    };
-
-  /// Retrieve result type for a const member function pointer. 
-  template<typename _Res, typename _Class, typename... _ArgTypes> 
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes...) const>
-    {
-      typedef _Res result_type;
-    };
-
-  /// Retrieve result type for a volatile member function pointer. 
-  template<typename _Res, typename _Class, typename... _ArgTypes> 
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes...) volatile>
-    {
-      typedef _Res result_type;
-    };
-
-  /// Retrieve result type for a const volatile member function pointer. 
-  template<typename _Res, typename _Class, typename... _ArgTypes> 
-    struct _Weak_result_type_impl<_Res (_Class::*)(_ArgTypes...)const volatile>
-    {
-      typedef _Res result_type;
-    };
-
-  /**
-   *  Strip top-level cv-qualifiers from the function object and let
-   *  _Weak_result_type_impl perform the real work.
-  */
-  template<typename _Functor>
-    struct _Weak_result_type
-    : _Weak_result_type_impl<typename remove_cv<_Functor>::type>
-    {
-    };
-
-  template<typename _Signature>
-    class result_of;
-
-  /**
-   *  Actual implementation of result_of. When _Has_result_type is
-   *  true, gets its result from _Weak_result_type. Otherwise, uses
-   *  the function object's member template result to extract the
-   *  result type.
-  */
-  template<bool _Has_result_type, typename _Signature>
-    struct _Result_of_impl;
-
-  // Handle member data pointers using _Mem_fn's logic
-  template<typename _Res, typename _Class, typename _T1>
-    struct _Result_of_impl<false, _Res _Class::*(_T1)>
-    {
-      typedef typename _Mem_fn<_Res _Class::*>
-                ::template _Result_type<_T1>::type type;
-    };
-
-  /**
-   * Determine whether we can determine a result type from @c Functor 
-   * alone.
-   */ 
-  template<typename _Functor, typename... _ArgTypes>
-    class result_of<_Functor(_ArgTypes...)>
-    : public _Result_of_impl<
-               _Has_result_type<_Weak_result_type<_Functor> >::value,
-               _Functor(_ArgTypes...)>
-    {
-    };
-
-  /// We already know the result type for @c Functor; use it.
-  template<typename _Functor, typename... _ArgTypes>
-    struct _Result_of_impl<true, _Functor(_ArgTypes...)>
-    {
-      typedef typename _Weak_result_type<_Functor>::result_type type;
-    };
-
-  /**
-   * We need to compute the result type for this invocation the hard 
-   * way.
-   */
-  template<typename _Functor, typename... _ArgTypes>
-    struct _Result_of_impl<false, _Functor(_ArgTypes...)>
-    {
-      typedef typename _Functor
-                ::template result<_Functor(_ArgTypes...)>::type type;
-    };
-
-  /**
-   * It is unsafe to access ::result when there are zero arguments, so we 
-   * return @c void instead.
-   */
-  template<typename _Functor>
-    struct _Result_of_impl<false, _Functor()>
-    {
-      typedef void type;
-    };
-
-  /// Determines if the type _Tp derives from unary_function.
-  template<typename _Tp>
-    struct _Derives_from_unary_function : __sfinae_types
-    {
-    private:
-      template<typename _T1, typename _Res>
-        static __one __test(const volatile unary_function<_T1, _Res>*);
-
-      // It's tempting to change "..." to const volatile void*, but
-      // that fails when _Tp is a function type.
-      static __two __test(...);
-
-    public:
-      static const bool value = sizeof(__test((_Tp*)0)) == 1;
-    };
-
-  /// Determines if the type _Tp derives from binary_function.
-  template<typename _Tp>
-    struct _Derives_from_binary_function : __sfinae_types
-    {
-    private:
-      template<typename _T1, typename _T2, typename _Res>
-        static __one __test(const volatile binary_function<_T1, _T2, _Res>*);
-
-      // It's tempting to change "..." to const volatile void*, but
-      // that fails when _Tp is a function type.
-      static __two __test(...);
-
-    public:
-      static const bool value = sizeof(__test((_Tp*)0)) == 1;
-    };
-
-  /// Turns a function type into a function pointer type
-  template<typename _Tp, bool _IsFunctionType = is_function<_Tp>::value>
-    struct _Function_to_function_pointer
-    {
-      typedef _Tp type;
-    };
-
-  template<typename _Tp>
-    struct _Function_to_function_pointer<_Tp, true>
-    {
-      typedef _Tp* type;
-    };
-
-  /**
-   * Invoke a function object, which may be either a member pointer or a
-   * function object. The first parameter will tell which.
-   */
-  template<typename _Functor, typename... _Args>
-    inline
-    typename __gnu_cxx::__enable_if<
-             (!is_member_pointer<_Functor>::value
-              && !is_function<_Functor>::value
-              && !is_function<typename remove_pointer<_Functor>::type>::value),
-             typename result_of<_Functor(_Args...)>::type
-           >::__type
-    __invoke(_Functor& __f, _Args&... __args)
-    {
-      return __f(__args...);
-    }
-
-  template<typename _Functor, typename... _Args>
-    inline
-    typename __gnu_cxx::__enable_if<
-             (is_member_pointer<_Functor>::value
-              && !is_function<_Functor>::value
-              && !is_function<typename remove_pointer<_Functor>::type>::value),
-             typename result_of<_Functor(_Args...)>::type
-           >::__type
-    __invoke(_Functor& __f, _Args&... __args)
-    {
-      return mem_fn(__f)(__args...);
-    }
-
-  // To pick up function references (that will become function pointers)
-  template<typename _Functor, typename... _Args>
-    inline
-    typename __gnu_cxx::__enable_if<
-             (is_pointer<_Functor>::value
-              && is_function<typename remove_pointer<_Functor>::type>::value),
-             typename result_of<_Functor(_Args...)>::type
-           >::__type
-    __invoke(_Functor __f, _Args&... __args)
-    {
-      return __f(__args...);
-    }
-
-  /**
-   *  Knowing which of unary_function and binary_function _Tp derives
-   *  from, derives from the same and ensures that reference_wrapper
-   *  will have a weak result type. See cases below.
-   */
-  template<bool _Unary, bool _Binary, typename _Tp>
-    struct _Reference_wrapper_base_impl;
-
-  // Not a unary_function or binary_function, so try a weak result type.
-  template<typename _Tp>
-    struct _Reference_wrapper_base_impl<false, false, _Tp>
-    : _Weak_result_type<_Tp>
-    { };
-
-  // unary_function but not binary_function
-  template<typename _Tp>
-    struct _Reference_wrapper_base_impl<true, false, _Tp>
-    : unary_function<typename _Tp::argument_type,
-		     typename _Tp::result_type>
-    { };
-
-  // binary_function but not unary_function
-  template<typename _Tp>
-    struct _Reference_wrapper_base_impl<false, true, _Tp>
-    : binary_function<typename _Tp::first_argument_type,
-		      typename _Tp::second_argument_type,
-		      typename _Tp::result_type>
-    { };
-
-  // Both unary_function and binary_function. Import result_type to
-  // avoid conflicts.
-   template<typename _Tp>
-    struct _Reference_wrapper_base_impl<true, true, _Tp>
-    : unary_function<typename _Tp::argument_type,
-		     typename _Tp::result_type>,
-      binary_function<typename _Tp::first_argument_type,
-		      typename _Tp::second_argument_type,
-		      typename _Tp::result_type>
-    {
-      typedef typename _Tp::result_type result_type;
-    };
-
-  /**
-   *  Derives from unary_function or binary_function when it
-   *  can. Specializations handle all of the easy cases. The primary
-   *  template determines what to do with a class type, which may
-   *  derive from both unary_function and binary_function.
-  */
-  template<typename _Tp>
-    struct _Reference_wrapper_base
-    : _Reference_wrapper_base_impl<
-      _Derives_from_unary_function<_Tp>::value,
-      _Derives_from_binary_function<_Tp>::value,
-      _Tp>
-    { };
-
-  // - a function type (unary)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res(_T1)>
-    : unary_function<_T1, _Res>
-    { };
-
-  // - a function type (binary)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res(_T1, _T2)>
-    : binary_function<_T1, _T2, _Res>
-    { };
-
-  // - a function pointer type (unary)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res(*)(_T1)>
-    : unary_function<_T1, _Res>
-    { };
-
-  // - a function pointer type (binary)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res(*)(_T1, _T2)>
-    : binary_function<_T1, _T2, _Res>
-    { };
-
-  // - a pointer to member function type (unary, no qualifiers)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res (_T1::*)()>
-    : unary_function<_T1*, _Res>
-    { };
-
-  // - a pointer to member function type (binary, no qualifiers)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res (_T1::*)(_T2)>
-    : binary_function<_T1*, _T2, _Res>
-    { };
-
-  // - a pointer to member function type (unary, const)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res (_T1::*)() const>
-    : unary_function<const _T1*, _Res>
-    { };
-
-  // - a pointer to member function type (binary, const)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res (_T1::*)(_T2) const>
-    : binary_function<const _T1*, _T2, _Res>
-    { };
-
-  // - a pointer to member function type (unary, volatile)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res (_T1::*)() volatile>
-    : unary_function<volatile _T1*, _Res>
-    { };
-
-  // - a pointer to member function type (binary, volatile)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res (_T1::*)(_T2) volatile>
-    : binary_function<volatile _T1*, _T2, _Res>
-    { };
-
-  // - a pointer to member function type (unary, const volatile)
-  template<typename _Res, typename _T1>
-    struct _Reference_wrapper_base<_Res (_T1::*)() const volatile>
-    : unary_function<const volatile _T1*, _Res>
-    { };
-
-  // - a pointer to member function type (binary, const volatile)
-  template<typename _Res, typename _T1, typename _T2>
-    struct _Reference_wrapper_base<_Res (_T1::*)(_T2) const volatile>
-    : binary_function<const volatile _T1*, _T2, _Res>
-    { };
-
-  /// reference_wrapper
-  template<typename _Tp>
-    class reference_wrapper
-    : public _Reference_wrapper_base<typename remove_cv<_Tp>::type>
-    {
-      // If _Tp is a function type, we can't form result_of<_Tp(...)>,
-      // so turn it into a function pointer type.
-      typedef typename _Function_to_function_pointer<_Tp>::type
-        _M_func_type;
-
-      _Tp* _M_data;
-    public:
-      typedef _Tp type;
-
-      explicit
-      reference_wrapper(_Tp& __indata)
-      : _M_data(std::__addressof(__indata))
-      { }
-
-      reference_wrapper(const reference_wrapper<_Tp>& __inref):
-      _M_data(__inref._M_data)
-      { }
-
-      reference_wrapper&
-      operator=(const reference_wrapper<_Tp>& __inref)
-      {
-        _M_data = __inref._M_data;
-        return *this;
-      }
-
-      operator _Tp&() const
-      { return this->get(); }
-
-      _Tp&
-      get() const
-      { return *_M_data; }
-
-      template<typename... _Args>
-        typename result_of<_M_func_type(_Args...)>::type
-        operator()(_Args&... __args) const
-        {
-	  return __invoke(get(), __args...);
-	}
-    };
-
-
-  // Denotes a reference should be taken to a variable.
-  template<typename _Tp>
-    inline reference_wrapper<_Tp>
-    ref(_Tp& __t)
-    { return reference_wrapper<_Tp>(__t); }
-
-  // Denotes a const reference should be taken to a variable.
-  template<typename _Tp>
-    inline reference_wrapper<const _Tp>
-    cref(const _Tp& __t)
-    { return reference_wrapper<const _Tp>(__t); }
-
-  template<typename _Tp>
-    inline reference_wrapper<_Tp>
-    ref(reference_wrapper<_Tp> __t)
-    { return ref(__t.get()); }
-
-  template<typename _Tp>
-    inline reference_wrapper<const _Tp>
-    cref(reference_wrapper<_Tp> __t)
-    { return cref(__t.get()); }
-
-  template<typename _Tp, bool>
-    struct _Mem_fn_const_or_non
-    {
-      typedef const _Tp& type;
-    };
-
-  template<typename _Tp>
-    struct _Mem_fn_const_or_non<_Tp, false>
-    {
-      typedef _Tp& type;
-    };
-
-  /**
-   * Derives from @c unary_function or @c binary_function, or perhaps
-   * nothing, depending on the number of arguments provided. The
-   * primary template is the basis case, which derives nothing.
-   */
-  template<typename _Res, typename... _ArgTypes> 
-    struct _Maybe_unary_or_binary_function { };
-
-  /// Derives from @c unary_function, as appropriate. 
-  template<typename _Res, typename _T1> 
-    struct _Maybe_unary_or_binary_function<_Res, _T1>
-    : std::unary_function<_T1, _Res> { };
-
-  /// Derives from @c binary_function, as appropriate. 
-  template<typename _Res, typename _T1, typename _T2> 
-    struct _Maybe_unary_or_binary_function<_Res, _T1, _T2>
-    : std::binary_function<_T1, _T2, _Res> { };
-
-  /// Implementation of @c mem_fn for member function pointers.
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    class _Mem_fn<_Res (_Class::*)(_ArgTypes...)>
-    : public _Maybe_unary_or_binary_function<_Res, _Class*, _ArgTypes...>
-    {
-      typedef _Res (_Class::*_Functor)(_ArgTypes...);
-
-      template<typename _Tp>
-        _Res
-        _M_call(_Tp& __object, const volatile _Class *, 
-                _ArgTypes... __args) const
-        { return (__object.*__pmf)(__args...); }
-
-      template<typename _Tp>
-        _Res
-        _M_call(_Tp& __ptr, const volatile void *, _ArgTypes... __args) const
-        { return ((*__ptr).*__pmf)(__args...); }
-
-    public:
-      typedef _Res result_type;
-
-      explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
-
-      // Handle objects
-      _Res
-      operator()(_Class& __object, _ArgTypes... __args) const
-      { return (__object.*__pmf)(__args...); }
-
-      // Handle pointers
-      _Res
-      operator()(_Class* __object, _ArgTypes... __args) const
-      { return (__object->*__pmf)(__args...); }
-
-      // Handle smart pointers, references and pointers to derived
-      template<typename _Tp>
-        _Res
-	operator()(_Tp& __object, _ArgTypes... __args) const
-        { return _M_call(__object, &__object, __args...); }
-
-    private:
-      _Functor __pmf;
-    };
-
-  /// Implementation of @c mem_fn for const member function pointers.
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    class _Mem_fn<_Res (_Class::*)(_ArgTypes...) const>
-    : public _Maybe_unary_or_binary_function<_Res, const _Class*, 
-					     _ArgTypes...>
-    {
-      typedef _Res (_Class::*_Functor)(_ArgTypes...) const;
-
-      template<typename _Tp>
-        _Res
-        _M_call(_Tp& __object, const volatile _Class *, 
-                _ArgTypes... __args) const
-        { return (__object.*__pmf)(__args...); }
-
-      template<typename _Tp>
-        _Res
-        _M_call(_Tp& __ptr, const volatile void *, _ArgTypes... __args) const
-        { return ((*__ptr).*__pmf)(__args...); }
-
-    public:
-      typedef _Res result_type;
-
-      explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
-
-      // Handle objects
-      _Res
-      operator()(const _Class& __object, _ArgTypes... __args) const
-      { return (__object.*__pmf)(__args...); }
-
-      // Handle pointers
-      _Res
-      operator()(const _Class* __object, _ArgTypes... __args) const
-      { return (__object->*__pmf)(__args...); }
-
-      // Handle smart pointers, references and pointers to derived
-      template<typename _Tp>
-        _Res operator()(_Tp& __object, _ArgTypes... __args) const
-        { return _M_call(__object, &__object, __args...); }
-
-    private:
-      _Functor __pmf;
-    };
-
-  /// Implementation of @c mem_fn for volatile member function pointers.
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    class _Mem_fn<_Res (_Class::*)(_ArgTypes...) volatile>
-    : public _Maybe_unary_or_binary_function<_Res, volatile _Class*, 
-					     _ArgTypes...>
-    {
-      typedef _Res (_Class::*_Functor)(_ArgTypes...) volatile;
-
-      template<typename _Tp>
-        _Res
-        _M_call(_Tp& __object, const volatile _Class *, 
-                _ArgTypes... __args) const
-        { return (__object.*__pmf)(__args...); }
-
-      template<typename _Tp>
-        _Res
-        _M_call(_Tp& __ptr, const volatile void *, _ArgTypes... __args) const
-        { return ((*__ptr).*__pmf)(__args...); }
-
-    public:
-      typedef _Res result_type;
-
-      explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
-
-      // Handle objects
-      _Res
-      operator()(volatile _Class& __object, _ArgTypes... __args) const
-      { return (__object.*__pmf)(__args...); }
-
-      // Handle pointers
-      _Res
-      operator()(volatile _Class* __object, _ArgTypes... __args) const
-      { return (__object->*__pmf)(__args...); }
-
-      // Handle smart pointers, references and pointers to derived
-      template<typename _Tp>
-        _Res
-	operator()(_Tp& __object, _ArgTypes... __args) const
-        { return _M_call(__object, &__object, __args...); }
-
-    private:
-      _Functor __pmf;
-    };
-
-  /// Implementation of @c mem_fn for const volatile member function pointers.
-  template<typename _Res, typename _Class, typename... _ArgTypes>
-    class _Mem_fn<_Res (_Class::*)(_ArgTypes...) const volatile>
-    : public _Maybe_unary_or_binary_function<_Res, const volatile _Class*, 
-					     _ArgTypes...>
-    {
-      typedef _Res (_Class::*_Functor)(_ArgTypes...) const volatile;
-
-      template<typename _Tp>
-        _Res
-        _M_call(_Tp& __object, const volatile _Class *, 
-                _ArgTypes... __args) const
-        { return (__object.*__pmf)(__args...); }
-
-      template<typename _Tp>
-        _Res
-        _M_call(_Tp& __ptr, const volatile void *, _ArgTypes... __args) const
-        { return ((*__ptr).*__pmf)(__args...); }
-
-    public:
-      typedef _Res result_type;
-
-      explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
-
-      // Handle objects
-      _Res 
-      operator()(const volatile _Class& __object, _ArgTypes... __args) const
-      { return (__object.*__pmf)(__args...); }
-
-      // Handle pointers
-      _Res 
-      operator()(const volatile _Class* __object, _ArgTypes... __args) const
-      { return (__object->*__pmf)(__args...); }
-
-      // Handle smart pointers, references and pointers to derived
-      template<typename _Tp>
-        _Res operator()(_Tp& __object, _ArgTypes... __args) const
-        { return _M_call(__object, &__object, __args...); }
-
-    private:
-      _Functor __pmf;
-    };
-
-
-  template<typename _Res, typename _Class>
-    class _Mem_fn<_Res _Class::*>
-    {
-      // This bit of genius is due to Peter Dimov, improved slightly by
-      // Douglas Gregor.
-      template<typename _Tp>
-        _Res&
-        _M_call(_Tp& __object, _Class *) const
-        { return __object.*__pm; }
-
-      template<typename _Tp, typename _Up>
-        _Res&
-        _M_call(_Tp& __object, _Up * const *) const
-        { return (*__object).*__pm; }
-
-      template<typename _Tp, typename _Up>
-        const _Res&
-        _M_call(_Tp& __object, const _Up * const *) const
-        { return (*__object).*__pm; }
-
-      template<typename _Tp>
-        const _Res&
-        _M_call(_Tp& __object, const _Class *) const
-        { return __object.*__pm; }
-
-      template<typename _Tp>
-        const _Res&
-        _M_call(_Tp& __ptr, const volatile void*) const
-        { return (*__ptr).*__pm; }
-
-      template<typename _Tp> static _Tp& __get_ref();
-
-      template<typename _Tp>
-        static __sfinae_types::__one __check_const(_Tp&, _Class*);
-      template<typename _Tp, typename _Up>
-        static __sfinae_types::__one __check_const(_Tp&, _Up * const *);
-      template<typename _Tp, typename _Up>
-        static __sfinae_types::__two __check_const(_Tp&, const _Up * const *);
-      template<typename _Tp>
-        static __sfinae_types::__two __check_const(_Tp&, const _Class*);
-      template<typename _Tp>
-        static __sfinae_types::__two __check_const(_Tp&, const volatile void*);
-
-    public:
-      template<typename _Tp>
-        struct _Result_type
-	: _Mem_fn_const_or_non<_Res,
-	  (sizeof(__sfinae_types::__two)
-	   == sizeof(__check_const<_Tp>(__get_ref<_Tp>(), (_Tp*)0)))>
-        { };
-
-      template<typename _Signature>
-        struct result;
-
-      template<typename _CVMem, typename _Tp>
-        struct result<_CVMem(_Tp)>
-	: public _Result_type<_Tp> { };
-
-      template<typename _CVMem, typename _Tp>
-        struct result<_CVMem(_Tp&)>
-	: public _Result_type<_Tp> { };
-
-      explicit
-      _Mem_fn(_Res _Class::*__pm) : __pm(__pm) { }
-
-      // Handle objects
-      _Res&
-      operator()(_Class& __object) const
-      { return __object.*__pm; }
-
-      const _Res&
-      operator()(const _Class& __object) const
-      { return __object.*__pm; }
-
-      // Handle pointers
-      _Res&
-      operator()(_Class* __object) const
-      { return __object->*__pm; }
-
-      const _Res&
-      operator()(const _Class* __object) const
-      { return __object->*__pm; }
-
-      // Handle smart pointers and derived
-      template<typename _Tp>
-        typename _Result_type<_Tp>::type
-        operator()(_Tp& __unknown) const
-        { return _M_call(__unknown, &__unknown); }
-
-    private:
-      _Res _Class::*__pm;
-    };
-
-  /**
-   *  @brief Returns a function object that forwards to the member
-   *  pointer @a pm.
-   */
-  template<typename _Tp, typename _Class>
-    inline _Mem_fn<_Tp _Class::*>
-    mem_fn(_Tp _Class::* __pm)
-    {
-      return _Mem_fn<_Tp _Class::*>(__pm);
-    }
-
-  /**
-   *  @brief Determines if the given type _Tp is a function object
-   *  should be treated as a subexpression when evaluating calls to
-   *  function objects returned by bind(). [TR1 3.6.1]
-   */
-  template<typename _Tp>
-    struct is_bind_expression
-    { static const bool value = false; };
-
-  template<typename _Tp>
-    const bool is_bind_expression<_Tp>::value;
-
-  /**
-   *  @brief Determines if the given type _Tp is a placeholder in a
-   *  bind() expression and, if so, which placeholder it is. [TR1 3.6.2]
-   */
-  template<typename _Tp>
-    struct is_placeholder
-    { static const int value = 0; };
-
-  template<typename _Tp>
-    const int is_placeholder<_Tp>::value;
-
-  /// The type of placeholder objects defined by libstdc++.
-  template<int _Num> struct _Placeholder { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-
-  /** @namespace std::tr1::placeholders
-   *  @brief Sub-namespace for tr1/functional.
-   */
-  namespace placeholders 
-  { 
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-    /*  Define a large number of placeholders. There is no way to
-     *  simplify this with variadic templates, because we're introducing
-     *  unique names for each.
-     */
-    namespace 
-    {
-      _Placeholder<1> _1;
-      _Placeholder<2> _2;
-      _Placeholder<3> _3;
-      _Placeholder<4> _4;
-      _Placeholder<5> _5;
-      _Placeholder<6> _6;
-      _Placeholder<7> _7;
-      _Placeholder<8> _8;
-      _Placeholder<9> _9;
-      _Placeholder<10> _10;
-      _Placeholder<11> _11;
-      _Placeholder<12> _12;
-      _Placeholder<13> _13;
-      _Placeholder<14> _14;
-      _Placeholder<15> _15;
-      _Placeholder<16> _16;
-      _Placeholder<17> _17;
-      _Placeholder<18> _18;
-      _Placeholder<19> _19;
-      _Placeholder<20> _20;
-      _Placeholder<21> _21;
-      _Placeholder<22> _22;
-      _Placeholder<23> _23;
-      _Placeholder<24> _24;
-      _Placeholder<25> _25;
-      _Placeholder<26> _26;
-      _Placeholder<27> _27;
-      _Placeholder<28> _28;
-      _Placeholder<29> _29;
-    } 
-  _GLIBCXX_END_NAMESPACE_VERSION
-  }
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-  /**
-   *  Partial specialization of is_placeholder that provides the placeholder
-   *  number for the placeholder objects defined by libstdc++.
-   */
-  template<int _Num>
-    struct is_placeholder<_Placeholder<_Num> >
-    { static const int value = _Num; };
-
-  template<int _Num>
-    const int is_placeholder<_Placeholder<_Num> >::value;
-
-#if __cplusplus >= 201103L
-  template<int _Num>
-    struct is_placeholder<std::_Placeholder<_Num>>
-    : std::integral_constant<int, _Num>
-    { };
-
-  template<int _Num>
-    struct is_placeholder<const std::_Placeholder<_Num>>
-    : std::integral_constant<int, _Num>
-    { };
-#endif
-
-  /**
-   * Stores a tuple of indices. Used by bind() to extract the elements
-   * in a tuple. 
-   */
-  template<int... _Indexes>
-    struct _Index_tuple { };
-
-  /// Builds an _Index_tuple<0, 1, 2, ..., _Num-1>.
-  template<std::size_t _Num, typename _Tuple = _Index_tuple<> >
-    struct _Build_index_tuple;
- 
-  template<std::size_t _Num, int... _Indexes> 
-    struct _Build_index_tuple<_Num, _Index_tuple<_Indexes...> >
-    : _Build_index_tuple<_Num - 1, 
-                         _Index_tuple<_Indexes..., sizeof...(_Indexes)> >
-    {
-    };
-
-  template<int... _Indexes>
-    struct _Build_index_tuple<0, _Index_tuple<_Indexes...> >
-    {
-      typedef _Index_tuple<_Indexes...> __type;
-    };
-
-  /** 
-   * Used by _Safe_tuple_element to indicate that there is no tuple
-   * element at this position.
-   */
-  struct _No_tuple_element;
-
-  /**
-   * Implementation helper for _Safe_tuple_element. This primary
-   * template handles the case where it is safe to use @c
-   * tuple_element.
-   */
-  template<int __i, typename _Tuple, bool _IsSafe>
-    struct _Safe_tuple_element_impl
-    : tuple_element<__i, _Tuple> { };
-
-  /**
-   * Implementation helper for _Safe_tuple_element. This partial
-   * specialization handles the case where it is not safe to use @c
-   * tuple_element. We just return @c _No_tuple_element.
-   */
-  template<int __i, typename _Tuple>
-    struct _Safe_tuple_element_impl<__i, _Tuple, false>
-    {
-      typedef _No_tuple_element type;
-    };
-
-  /**
-   * Like tuple_element, but returns @c _No_tuple_element when
-   * tuple_element would return an error.
-   */
- template<int __i, typename _Tuple>
-   struct _Safe_tuple_element
-   : _Safe_tuple_element_impl<__i, _Tuple, 
-                              (__i >= 0 && __i < tuple_size<_Tuple>::value)>
-   {
-   };
-
-  /**
-   *  Maps an argument to bind() into an actual argument to the bound
-   *  function object [TR1 3.6.3/5]. Only the first parameter should
-   *  be specified: the rest are used to determine among the various
-   *  implementations. Note that, although this class is a function
-   *  object, it isn't entirely normal because it takes only two
-   *  parameters regardless of the number of parameters passed to the
-   *  bind expression. The first parameter is the bound argument and
-   *  the second parameter is a tuple containing references to the
-   *  rest of the arguments.
-   */
-  template<typename _Arg,
-           bool _IsBindExp = is_bind_expression<_Arg>::value,
-           bool _IsPlaceholder = (is_placeholder<_Arg>::value > 0)>
-    class _Mu;
-
-  /**
-   *  If the argument is reference_wrapper<_Tp>, returns the
-   *  underlying reference. [TR1 3.6.3/5 bullet 1]
-   */
-  template<typename _Tp>
-    class _Mu<reference_wrapper<_Tp>, false, false>
-    {
-    public:
-      typedef _Tp& result_type;
-
-      /* Note: This won't actually work for const volatile
-       * reference_wrappers, because reference_wrapper::get() is const
-       * but not volatile-qualified. This might be a defect in the TR.
-       */
-      template<typename _CVRef, typename _Tuple>
-        result_type
-        operator()(_CVRef& __arg, const _Tuple&) const volatile
-        { return __arg.get(); }
-    };
-
-  /**
-   *  If the argument is a bind expression, we invoke the underlying
-   *  function object with the same cv-qualifiers as we are given and
-   *  pass along all of our arguments (unwrapped). [TR1 3.6.3/5 bullet 2]
-   */
-  template<typename _Arg>
-    class _Mu<_Arg, true, false>
-    {
-    public:
-      template<typename _Signature> class result;
-
-      // Determine the result type when we pass the arguments along. This
-      // involves passing along the cv-qualifiers placed on _Mu and
-      // unwrapping the argument bundle.
-      template<typename _CVMu, typename _CVArg, typename... _Args>
-        class result<_CVMu(_CVArg, tuple<_Args...>)>
-	: public result_of<_CVArg(_Args...)> { };
-
-      template<typename _CVArg, typename... _Args>
-        typename result_of<_CVArg(_Args...)>::type
-        operator()(_CVArg& __arg,
-		   const tuple<_Args...>& __tuple) const volatile
-        {
-	  // Construct an index tuple and forward to __call
-	  typedef typename _Build_index_tuple<sizeof...(_Args)>::__type
-	    _Indexes;
-	  return this->__call(__arg, __tuple, _Indexes());
-	}
-
-    private:
-      // Invokes the underlying function object __arg by unpacking all
-      // of the arguments in the tuple. 
-      template<typename _CVArg, typename... _Args, int... _Indexes>
-        typename result_of<_CVArg(_Args...)>::type
-        __call(_CVArg& __arg, const tuple<_Args...>& __tuple,
-	       const _Index_tuple<_Indexes...>&) const volatile
-        {
-	  return __arg(tr1::get<_Indexes>(__tuple)...);
-	}
-    };
-
-  /**
-   *  If the argument is a placeholder for the Nth argument, returns
-   *  a reference to the Nth argument to the bind function object.
-   *  [TR1 3.6.3/5 bullet 3]
-   */
-  template<typename _Arg>
-    class _Mu<_Arg, false, true>
-    {
-    public:
-      template<typename _Signature> class result;
-
-      template<typename _CVMu, typename _CVArg, typename _Tuple>
-        class result<_CVMu(_CVArg, _Tuple)>
-        {
-	  // Add a reference, if it hasn't already been done for us.
-	  // This allows us to be a little bit sloppy in constructing
-	  // the tuple that we pass to result_of<...>.
-	  typedef typename _Safe_tuple_element<(is_placeholder<_Arg>::value
-						- 1), _Tuple>::type
-	    __base_type;
-
-	public:
-	  typedef typename add_reference<__base_type>::type type;
-	};
-
-      template<typename _Tuple>
-        typename result<_Mu(_Arg, _Tuple)>::type
-        operator()(const volatile _Arg&, const _Tuple& __tuple) const volatile
-        {
-	  return ::std::tr1::get<(is_placeholder<_Arg>::value - 1)>(__tuple);
-	}
-    };
-
-  /**
-   *  If the argument is just a value, returns a reference to that
-   *  value. The cv-qualifiers on the reference are the same as the
-   *  cv-qualifiers on the _Mu object. [TR1 3.6.3/5 bullet 4]
-   */
-  template<typename _Arg>
-    class _Mu<_Arg, false, false>
-    {
-    public:
-      template<typename _Signature> struct result;
-
-      template<typename _CVMu, typename _CVArg, typename _Tuple>
-        struct result<_CVMu(_CVArg, _Tuple)>
-        {
-	  typedef typename add_reference<_CVArg>::type type;
-	};
-
-      // Pick up the cv-qualifiers of the argument
-      template<typename _CVArg, typename _Tuple>
-        _CVArg&
-        operator()(_CVArg& __arg, const _Tuple&) const volatile
-        { return __arg; }
-    };
-
-  /**
-   *  Maps member pointers into instances of _Mem_fn but leaves all
-   *  other function objects untouched. Used by tr1::bind(). The
-   *  primary template handles the non--member-pointer case.
-   */
-  template<typename _Tp>
-    struct _Maybe_wrap_member_pointer
-    {
-      typedef _Tp type;
-      
-      static const _Tp&
-      __do_wrap(const _Tp& __x)
-      { return __x; }
-    };
-
-  /**
-   *  Maps member pointers into instances of _Mem_fn but leaves all
-   *  other function objects untouched. Used by tr1::bind(). This
-   *  partial specialization handles the member pointer case.
-   */
-  template<typename _Tp, typename _Class>
-    struct _Maybe_wrap_member_pointer<_Tp _Class::*>
-    {
-      typedef _Mem_fn<_Tp _Class::*> type;
-      
-      static type
-      __do_wrap(_Tp _Class::* __pm)
-      { return type(__pm); }
-    };
-
-  /// Type of the function object returned from bind().
-  template<typename _Signature>
-    struct _Bind;
-
-   template<typename _Functor, typename... _Bound_args>
-    class _Bind<_Functor(_Bound_args...)>
-    : public _Weak_result_type<_Functor>
-    {
-      typedef _Bind __self_type;
-      typedef typename _Build_index_tuple<sizeof...(_Bound_args)>::__type 
-        _Bound_indexes;
-
-      _Functor _M_f;
-      tuple<_Bound_args...> _M_bound_args;
-
-      // Call unqualified
-      template<typename... _Args, int... _Indexes>
-        typename result_of<
-                   _Functor(typename result_of<_Mu<_Bound_args> 
-                            (_Bound_args, tuple<_Args...>)>::type...)
-                 >::type
-        __call(const tuple<_Args...>& __args, _Index_tuple<_Indexes...>)
-        {
-          return _M_f(_Mu<_Bound_args>()
-                      (tr1::get<_Indexes>(_M_bound_args), __args)...);
-        }
-
-      // Call as const
-      template<typename... _Args, int... _Indexes>
-        typename result_of<
-                   const _Functor(typename result_of<_Mu<_Bound_args> 
-                                    (const _Bound_args, tuple<_Args...>)
-                                  >::type...)>::type
-        __call(const tuple<_Args...>& __args, _Index_tuple<_Indexes...>) const
-        {
-          return _M_f(_Mu<_Bound_args>()
-                      (tr1::get<_Indexes>(_M_bound_args), __args)...);
-        }
-
-      // Call as volatile
-      template<typename... _Args, int... _Indexes>
-        typename result_of<
-                   volatile _Functor(typename result_of<_Mu<_Bound_args> 
-                                    (volatile _Bound_args, tuple<_Args...>)
-                                  >::type...)>::type
-        __call(const tuple<_Args...>& __args, 
-               _Index_tuple<_Indexes...>) volatile
-        {
-          return _M_f(_Mu<_Bound_args>()
-                      (tr1::get<_Indexes>(_M_bound_args), __args)...);
-        }
-
-      // Call as const volatile
-      template<typename... _Args, int... _Indexes>
-        typename result_of<
-                   const volatile _Functor(typename result_of<_Mu<_Bound_args> 
-                                    (const volatile _Bound_args, 
-                                     tuple<_Args...>)
-                                  >::type...)>::type
-        __call(const tuple<_Args...>& __args, 
-               _Index_tuple<_Indexes...>) const volatile
-        {
-          return _M_f(_Mu<_Bound_args>()
-                      (tr1::get<_Indexes>(_M_bound_args), __args)...);
-        }
-
-     public:
-      explicit _Bind(_Functor __f, _Bound_args... __bound_args)
-        : _M_f(__f), _M_bound_args(__bound_args...) { }
-
-      // Call unqualified
-      template<typename... _Args>
-        typename result_of<
-                   _Functor(typename result_of<_Mu<_Bound_args> 
-                            (_Bound_args, tuple<_Args...>)>::type...)
-                 >::type
-        operator()(_Args&... __args)
-        {
-          return this->__call(tr1::tie(__args...), _Bound_indexes());
-        }
-
-      // Call as const
-      template<typename... _Args>
-        typename result_of<
-                   const _Functor(typename result_of<_Mu<_Bound_args> 
-                            (const _Bound_args, tuple<_Args...>)>::type...)
-                 >::type
-        operator()(_Args&... __args) const
-        {
-          return this->__call(tr1::tie(__args...), _Bound_indexes());
-        }
-
-
-      // Call as volatile
-      template<typename... _Args>
-        typename result_of<
-                   volatile _Functor(typename result_of<_Mu<_Bound_args> 
-                            (volatile _Bound_args, tuple<_Args...>)>::type...)
-                 >::type
-        operator()(_Args&... __args) volatile
-        {
-          return this->__call(tr1::tie(__args...), _Bound_indexes());
-        }
-
-
-      // Call as const volatile
-      template<typename... _Args>
-        typename result_of<
-                   const volatile _Functor(typename result_of<_Mu<_Bound_args> 
-                            (const volatile _Bound_args, 
-                             tuple<_Args...>)>::type...)
-                 >::type
-        operator()(_Args&... __args) const volatile
-        {
-          return this->__call(tr1::tie(__args...), _Bound_indexes());
-        }
-    };
-
-  /// Type of the function object returned from bind<R>().
-  template<typename _Result, typename _Signature>
-    struct _Bind_result;
-
-  template<typename _Result, typename _Functor, typename... _Bound_args>
-    class _Bind_result<_Result, _Functor(_Bound_args...)>
-    {
-      typedef _Bind_result __self_type;
-      typedef typename _Build_index_tuple<sizeof...(_Bound_args)>::__type 
-        _Bound_indexes;
-
-      _Functor _M_f;
-      tuple<_Bound_args...> _M_bound_args;
-
-      // Call unqualified
-      template<typename... _Args, int... _Indexes>
-        _Result
-        __call(const tuple<_Args...>& __args, _Index_tuple<_Indexes...>)
-        {
-          return _M_f(_Mu<_Bound_args>()
-                      (tr1::get<_Indexes>(_M_bound_args), __args)...);
-        }
-
-      // Call as const
-      template<typename... _Args, int... _Indexes>
-        _Result
-        __call(const tuple<_Args...>& __args, _Index_tuple<_Indexes...>) const
-        {
-          return _M_f(_Mu<_Bound_args>()
-                      (tr1::get<_Indexes>(_M_bound_args), __args)...);
-        }
-
-      // Call as volatile
-      template<typename... _Args, int... _Indexes>
-        _Result
-        __call(const tuple<_Args...>& __args, 
-               _Index_tuple<_Indexes...>) volatile
-        {
-          return _M_f(_Mu<_Bound_args>()
-                      (tr1::get<_Indexes>(_M_bound_args), __args)...);
-        }
-
-      // Call as const volatile
-      template<typename... _Args, int... _Indexes>
-        _Result
-        __call(const tuple<_Args...>& __args, 
-               _Index_tuple<_Indexes...>) const volatile
-        {
-          return _M_f(_Mu<_Bound_args>()
-                      (tr1::get<_Indexes>(_M_bound_args), __args)...);
-        }
-
-    public:
-      typedef _Result result_type;
-
-      explicit
-      _Bind_result(_Functor __f, _Bound_args... __bound_args)
-      : _M_f(__f), _M_bound_args(__bound_args...) { }
-
-      // Call unqualified
-      template<typename... _Args>
-        result_type
-        operator()(_Args&... __args)
-        {
-          return this->__call(tr1::tie(__args...), _Bound_indexes());
-        }
-
-      // Call as const
-      template<typename... _Args>
-        result_type
-        operator()(_Args&... __args) const
-        {
-          return this->__call(tr1::tie(__args...), _Bound_indexes());
-        }
-
-      // Call as volatile
-      template<typename... _Args>
-        result_type
-        operator()(_Args&... __args) volatile
-        {
-          return this->__call(tr1::tie(__args...), _Bound_indexes());
-        }
-
-      // Call as const volatile
-      template<typename... _Args>
-        result_type
-        operator()(_Args&... __args) const volatile
-        {
-          return this->__call(tr1::tie(__args...), _Bound_indexes());
-        }
-    };
-
-  /// Class template _Bind is always a bind expression.
-  template<typename _Signature>
-    struct is_bind_expression<_Bind<_Signature> >
-    { static const bool value = true; };
-
-  template<typename _Signature>
-    const bool is_bind_expression<_Bind<_Signature> >::value;
-
-  /// Class template _Bind is always a bind expression.
-  template<typename _Signature>
-    struct is_bind_expression<const _Bind<_Signature> >
-    { static const bool value = true; };
-
-  template<typename _Signature>
-    const bool is_bind_expression<const _Bind<_Signature> >::value;
-
-  /// Class template _Bind is always a bind expression.
-  template<typename _Signature>
-    struct is_bind_expression<volatile _Bind<_Signature> >
-    { static const bool value = true; };
-
-  template<typename _Signature>
-    const bool is_bind_expression<volatile _Bind<_Signature> >::value;
-
-  /// Class template _Bind is always a bind expression.
-  template<typename _Signature>
-    struct is_bind_expression<const volatile _Bind<_Signature> >
-    { static const bool value = true; };
-
-  template<typename _Signature>
-    const bool is_bind_expression<const volatile _Bind<_Signature> >::value;
-
-  /// Class template _Bind_result is always a bind expression.
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<_Bind_result<_Result, _Signature> >
-    { static const bool value = true; };
-
-  template<typename _Result, typename _Signature>
-    const bool is_bind_expression<_Bind_result<_Result, _Signature> >::value;
-
-  /// Class template _Bind_result is always a bind expression.
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<const _Bind_result<_Result, _Signature> >
-    { static const bool value = true; };
-
-  template<typename _Result, typename _Signature>
-    const bool
-    is_bind_expression<const _Bind_result<_Result, _Signature> >::value;
-
-  /// Class template _Bind_result is always a bind expression.
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<volatile _Bind_result<_Result, _Signature> >
-    { static const bool value = true; };
-
-  template<typename _Result, typename _Signature>
-    const bool
-    is_bind_expression<volatile _Bind_result<_Result, _Signature> >::value;
-
-  /// Class template _Bind_result is always a bind expression.
-  template<typename _Result, typename _Signature>
-    struct
-    is_bind_expression<const volatile _Bind_result<_Result, _Signature> >
-    { static const bool value = true; };
-
-  template<typename _Result, typename _Signature>
-    const bool
-    is_bind_expression<const volatile _Bind_result<_Result,
-                                                   _Signature> >::value;
-
-#if __cplusplus >= 201103L
-  template<typename _Signature>
-    struct is_bind_expression<std::_Bind<_Signature>>
-    : true_type { };
-
-  template<typename _Signature>
-    struct is_bind_expression<const std::_Bind<_Signature>>
-    : true_type { };
-
-  template<typename _Signature>
-    struct is_bind_expression<volatile std::_Bind<_Signature>>
-    : true_type { };
-
-  template<typename _Signature>
-    struct is_bind_expression<const volatile std::_Bind<_Signature>>
-    : true_type { };
-
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<std::_Bind_result<_Result, _Signature>>
-    : true_type { };
-
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<const std::_Bind_result<_Result, _Signature>>
-    : true_type { };
-
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<volatile std::_Bind_result<_Result, _Signature>>
-    : true_type { };
-
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<const volatile std::_Bind_result<_Result,
-                                                               _Signature>>
-    : true_type { };
-#endif
-
-  /// bind
-  template<typename _Functor, typename... _ArgTypes>
-    inline
-    _Bind<typename _Maybe_wrap_member_pointer<_Functor>::type(_ArgTypes...)>
-    bind(_Functor __f, _ArgTypes... __args)
-    {
-      typedef _Maybe_wrap_member_pointer<_Functor> __maybe_type;
-      typedef typename __maybe_type::type __functor_type;
-      typedef _Bind<__functor_type(_ArgTypes...)> __result_type;
-      return __result_type(__maybe_type::__do_wrap(__f), __args...);
-    } 
-
-  template<typename _Result, typename _Functor, typename... _ArgTypes>
-    inline
-    _Bind_result<_Result,
-		 typename _Maybe_wrap_member_pointer<_Functor>::type
-                            (_ArgTypes...)>
-    bind(_Functor __f, _ArgTypes... __args)
-    {
-      typedef _Maybe_wrap_member_pointer<_Functor> __maybe_type;
-      typedef typename __maybe_type::type __functor_type;
-      typedef _Bind_result<_Result, __functor_type(_ArgTypes...)>
-	__result_type;
-      return __result_type(__maybe_type::__do_wrap(__f), __args...);
-    }
-
-  /**
-   *  @brief Exception class thrown when class template function's
-   *  operator() is called with an empty target.
-   *  @ingroup exceptions
-   */
-  class bad_function_call : public std::exception { };
-
-  /**
-   *  The integral constant expression 0 can be converted into a
-   *  pointer to this type. It is used by the function template to
-   *  accept NULL pointers.
-   */
-  struct _M_clear_type;
-
-  /**
-   *  Trait identifying @a location-invariant types, meaning that the
-   *  address of the object (or any of its members) will not escape.
-   *  Also implies a trivial copy constructor and assignment operator.
-   */
-  template<typename _Tp>
-    struct __is_location_invariant
-    : integral_constant<bool,
-                        (is_pointer<_Tp>::value
-                         || is_member_pointer<_Tp>::value)>
-    {
-    };
-
-  class _Undefined_class;
-
-  union _Nocopy_types
-  {
-    void*       _M_object;
-    const void* _M_const_object;
-    void (*_M_function_pointer)();
-    void (_Undefined_class::*_M_member_pointer)();
-  };
-
-  union _Any_data
-  {
-    void*       _M_access()       { return &_M_pod_data[0]; }
-    const void* _M_access() const { return &_M_pod_data[0]; }
-
-    template<typename _Tp>
-      _Tp&
-      _M_access()
-      { return *static_cast<_Tp*>(_M_access()); }
-
-    template<typename _Tp>
-      const _Tp&
-      _M_access() const
-      { return *static_cast<const _Tp*>(_M_access()); }
-
-    _Nocopy_types _M_unused;
-    char _M_pod_data[sizeof(_Nocopy_types)];
-  };
-
-  enum _Manager_operation
-  {
-    __get_type_info,
-    __get_functor_ptr,
-    __clone_functor,
-    __destroy_functor
-  };
-
-  // Simple type wrapper that helps avoid annoying const problems
-  // when casting between void pointers and pointers-to-pointers.
-  template<typename _Tp>
-    struct _Simple_type_wrapper
-    {
-      _Simple_type_wrapper(_Tp __value) : __value(__value) { }
-
-      _Tp __value;
-    };
-
-  template<typename _Tp>
-    struct __is_location_invariant<_Simple_type_wrapper<_Tp> >
-    : __is_location_invariant<_Tp>
-    {
-    };
-
-  // Converts a reference to a function object into a callable
-  // function object.
-  template<typename _Functor>
-    inline _Functor&
-    __callable_functor(_Functor& __f)
-    { return __f; }
-
-  template<typename _Member, typename _Class>
-    inline _Mem_fn<_Member _Class::*>
-    __callable_functor(_Member _Class::* &__p)
-    { return mem_fn(__p); }
-
-  template<typename _Member, typename _Class>
-    inline _Mem_fn<_Member _Class::*>
-    __callable_functor(_Member _Class::* const &__p)
-    { return mem_fn(__p); }
-
-  template<typename _Signature>
-    class function;
-
-  /// Base class of all polymorphic function object wrappers.
-  class _Function_base
-  {
-  public:
-    static const std::size_t _M_max_size = sizeof(_Nocopy_types);
-    static const std::size_t _M_max_align = __alignof__(_Nocopy_types);
-
-    template<typename _Functor>
-      class _Base_manager
-      {
-      protected:
-	static const bool __stored_locally =
-        (__is_location_invariant<_Functor>::value
-         && sizeof(_Functor) <= _M_max_size
-         && __alignof__(_Functor) <= _M_max_align
-         && (_M_max_align % __alignof__(_Functor) == 0));
-	
-	typedef integral_constant<bool, __stored_locally> _Local_storage;
-
-	// Retrieve a pointer to the function object
-	static _Functor*
-	_M_get_pointer(const _Any_data& __source)
-	{
-	  const _Functor* __ptr =
-	    __stored_locally? std::__addressof(__source._M_access<_Functor>())
-	    /* have stored a pointer */ : __source._M_access<_Functor*>();
-	  return const_cast<_Functor*>(__ptr);
-	}
-
-	// Clone a location-invariant function object that fits within
-	// an _Any_data structure.
-	static void
-	_M_clone(_Any_data& __dest, const _Any_data& __source, true_type)
-	{
-	  new (__dest._M_access()) _Functor(__source._M_access<_Functor>());
-	}
-
-	// Clone a function object that is not location-invariant or
-	// that cannot fit into an _Any_data structure.
-	static void
-	_M_clone(_Any_data& __dest, const _Any_data& __source, false_type)
-	{
-	  __dest._M_access<_Functor*>() =
-	    new _Functor(*__source._M_access<_Functor*>());
-	}
-
-	// Destroying a location-invariant object may still require
-	// destruction.
-	static void
-	_M_destroy(_Any_data& __victim, true_type)
-	{
-	  __victim._M_access<_Functor>().~_Functor();
-	}
-	
-	// Destroying an object located on the heap.
-	static void
-	_M_destroy(_Any_data& __victim, false_type)
-	{
-	  delete __victim._M_access<_Functor*>();
-	}
-	
-      public:
-	static bool
-	_M_manager(_Any_data& __dest, const _Any_data& __source,
-		   _Manager_operation __op)
-	{
-	  switch (__op)
-	    {
-#if __cpp_rtti
-	    case __get_type_info:
-	      __dest._M_access<const type_info*>() = &typeid(_Functor);
-	      break;
-#endif
-	    case __get_functor_ptr:
-	      __dest._M_access<_Functor*>() = _M_get_pointer(__source);
-	      break;
-	      
-	    case __clone_functor:
-	      _M_clone(__dest, __source, _Local_storage());
-	      break;
-
-	    case __destroy_functor:
-	      _M_destroy(__dest, _Local_storage());
-	      break;
-	    }
-	  return false;
-	}
-
-	static void
-	_M_init_functor(_Any_data& __functor, const _Functor& __f)
-	{ _M_init_functor(__functor, __f, _Local_storage()); }
-	
-	template<typename _Signature>
-	  static bool
-	  _M_not_empty_function(const function<_Signature>& __f)
-          { return static_cast<bool>(__f); }
-
-	template<typename _Tp>
-	  static bool
-	  _M_not_empty_function(const _Tp*& __fp)
-	  { return __fp; }
-
-	template<typename _Class, typename _Tp>
-	  static bool
-	  _M_not_empty_function(_Tp _Class::* const& __mp)
-	  { return __mp; }
-
-	template<typename _Tp>
-	  static bool
-	  _M_not_empty_function(const _Tp&)
-	  { return true; }
-
-      private:
-	static void
-	_M_init_functor(_Any_data& __functor, const _Functor& __f, true_type)
-	{ new (__functor._M_access()) _Functor(__f); }
-
-	static void
-	_M_init_functor(_Any_data& __functor, const _Functor& __f, false_type)
-	{ __functor._M_access<_Functor*>() = new _Functor(__f); }
-      };
-
-    template<typename _Functor>
-      class _Ref_manager : public _Base_manager<_Functor*>
-      {
-	typedef _Function_base::_Base_manager<_Functor*> _Base;
-
-    public:
-	static bool
-	_M_manager(_Any_data& __dest, const _Any_data& __source,
-		   _Manager_operation __op)
-	{
-	  switch (__op)
-	    {
-#if __cpp_rtti
-	    case __get_type_info:
-	      __dest._M_access<const type_info*>() = &typeid(_Functor);
-	      break;
-#endif
-	    case __get_functor_ptr:
-	      __dest._M_access<_Functor*>() = *_Base::_M_get_pointer(__source);
-	      return is_const<_Functor>::value;
-	      break;
-	      
-	    default:
-	      _Base::_M_manager(__dest, __source, __op);
-	    }
-	  return false;
-	}
-
-	static void
-	_M_init_functor(_Any_data& __functor, reference_wrapper<_Functor> __f)
-	{
-	  _Base::_M_init_functor(__functor, std::__addressof(__f.get()));
-	}
-      };
-
-    _Function_base() : _M_manager(0) { }
-    
-    ~_Function_base()
-    {
-      if (_M_manager)
-	_M_manager(_M_functor, _M_functor, __destroy_functor);
-    }
-
-
-    bool _M_empty() const { return !_M_manager; }
-
-    typedef bool (*_Manager_type)(_Any_data&, const _Any_data&,
-                                  _Manager_operation);
-
-    _Any_data     _M_functor;
-    _Manager_type _M_manager;
-  };
-
-  template<typename _Signature, typename _Functor>
-    class _Function_handler;
-
-  template<typename _Res, typename _Functor, typename... _ArgTypes>
-    class _Function_handler<_Res(_ArgTypes...), _Functor>
-    : public _Function_base::_Base_manager<_Functor>
-    {
-      typedef _Function_base::_Base_manager<_Functor> _Base;
-
-    public:
-      static _Res
-      _M_invoke(const _Any_data& __functor, _ArgTypes... __args)
-      {
-        return (*_Base::_M_get_pointer(__functor))(__args...);
-      }
-    };
-
-  template<typename _Functor, typename... _ArgTypes>
-    class _Function_handler<void(_ArgTypes...), _Functor>
-    : public _Function_base::_Base_manager<_Functor>
-    {
-      typedef _Function_base::_Base_manager<_Functor> _Base;
-
-     public:
-      static void
-      _M_invoke(const _Any_data& __functor, _ArgTypes... __args)
-      {
-        (*_Base::_M_get_pointer(__functor))(__args...);
-      }
-    };
-
-  template<typename _Res, typename _Functor, typename... _ArgTypes>
-    class _Function_handler<_Res(_ArgTypes...), reference_wrapper<_Functor> >
-    : public _Function_base::_Ref_manager<_Functor>
-    {
-      typedef _Function_base::_Ref_manager<_Functor> _Base;
-
-     public:
-      static _Res
-      _M_invoke(const _Any_data& __functor, _ArgTypes... __args)
-      {
-        return 
-          __callable_functor(**_Base::_M_get_pointer(__functor))(__args...);
-      }
-    };
-
-  template<typename _Functor, typename... _ArgTypes>
-    class _Function_handler<void(_ArgTypes...), reference_wrapper<_Functor> >
-    : public _Function_base::_Ref_manager<_Functor>
-    {
-      typedef _Function_base::_Ref_manager<_Functor> _Base;
-
-     public:
-      static void
-      _M_invoke(const _Any_data& __functor, _ArgTypes... __args)
-      {
-        __callable_functor(**_Base::_M_get_pointer(__functor))(__args...);
-      }
-    };
-
-  template<typename _Class, typename _Member, typename _Res, 
-           typename... _ArgTypes>
-    class _Function_handler<_Res(_ArgTypes...), _Member _Class::*>
-    : public _Function_handler<void(_ArgTypes...), _Member _Class::*>
-    {
-      typedef _Function_handler<void(_ArgTypes...), _Member _Class::*>
-        _Base;
-
-     public:
-      static _Res
-      _M_invoke(const _Any_data& __functor, _ArgTypes... __args)
-      {
-        return tr1::
-	  mem_fn(_Base::_M_get_pointer(__functor)->__value)(__args...);
-      }
-    };
-
-  template<typename _Class, typename _Member, typename... _ArgTypes>
-    class _Function_handler<void(_ArgTypes...), _Member _Class::*>
-    : public _Function_base::_Base_manager<
-                 _Simple_type_wrapper< _Member _Class::* > >
-    {
-      typedef _Member _Class::* _Functor;
-      typedef _Simple_type_wrapper<_Functor> _Wrapper;
-      typedef _Function_base::_Base_manager<_Wrapper> _Base;
-
-     public:
-      static bool
-      _M_manager(_Any_data& __dest, const _Any_data& __source,
-                 _Manager_operation __op)
-      {
-        switch (__op)
-	  {
-#if __cpp_rtti
-	  case __get_type_info:
-	    __dest._M_access<const type_info*>() = &typeid(_Functor);
-	    break;
-#endif	    
-	  case __get_functor_ptr:
-	    __dest._M_access<_Functor*>() =
-	      &_Base::_M_get_pointer(__source)->__value;
-	    break;
-	    
-	  default:
-	    _Base::_M_manager(__dest, __source, __op);
-	  }
-        return false;
-      }
-
-      static void
-      _M_invoke(const _Any_data& __functor, _ArgTypes... __args)
-      {
-	tr1::mem_fn(_Base::_M_get_pointer(__functor)->__value)(__args...);
-      }
-    };
-
-  /// class function
-  template<typename _Res, typename... _ArgTypes>
-    class function<_Res(_ArgTypes...)>
-    : public _Maybe_unary_or_binary_function<_Res, _ArgTypes...>,
-      private _Function_base
-    {
-#if __cplusplus < 201103L
-      /// This class is used to implement the safe_bool idiom.
-      struct _Hidden_type
-      {
-	_Hidden_type* _M_bool;
-      };
-
-      /// This typedef is used to implement the safe_bool idiom.
-      typedef _Hidden_type* _Hidden_type::* _Safe_bool;
-#endif
-
-      typedef _Res _Signature_type(_ArgTypes...);
-      
-      struct _Useless { };
-      
-    public:
-      typedef _Res result_type;
-      
-      // [3.7.2.1] construct/copy/destroy
-      
-      /**
-       *  @brief Default construct creates an empty function call wrapper.
-       *  @post @c !(bool)*this
-       */
-      function() : _Function_base() { }
-      
-      /**
-       *  @brief Default construct creates an empty function call wrapper.
-       *  @post @c !(bool)*this
-       */
-      function(_M_clear_type*) : _Function_base() { }
-      
-      /**
-       *  @brief %Function copy constructor.
-       *  @param x A %function object with identical call signature.
-       *  @post @c (bool)*this == (bool)x
-       *
-       *  The newly-created %function contains a copy of the target of @a
-       *  x (if it has one).
-       */
-      function(const function& __x);
-
-      /**
-       *  @brief Builds a %function that targets a copy of the incoming
-       *  function object.
-       *  @param f A %function object that is callable with parameters of
-       *  type @c T1, @c T2, ..., @c TN and returns a value convertible
-       *  to @c Res.
-       *
-       *  The newly-created %function object will target a copy of @a
-       *  f. If @a f is @c reference_wrapper<F>, then this function
-       *  object will contain a reference to the function object @c
-       *  f.get(). If @a f is a NULL function pointer or NULL
-       *  pointer-to-member, the newly-created object will be empty.
-       *
-       *  If @a f is a non-NULL function pointer or an object of type @c
-       *  reference_wrapper<F>, this function will not throw.
-       */
-      template<typename _Functor>
-        function(_Functor __f,
-                 typename __gnu_cxx::__enable_if<
-                           !is_integral<_Functor>::value, _Useless>::__type
-                   = _Useless());
-
-      /**
-       *  @brief %Function assignment operator.
-       *  @param x A %function with identical call signature.
-       *  @post @c (bool)*this == (bool)x
-       *  @returns @c *this
-       *
-       *  The target of @a x is copied to @c *this. If @a x has no
-       *  target, then @c *this will be empty.
-       *
-       *  If @a x targets a function pointer or a reference to a function
-       *  object, then this operation will not throw an %exception.
-       */
-      function&
-      operator=(const function& __x)
-      {
-        function(__x).swap(*this);
-        return *this;
-      }
-
-      /**
-       *  @brief %Function assignment to zero.
-       *  @post @c !(bool)*this
-       *  @returns @c *this
-       *
-       *  The target of @c *this is deallocated, leaving it empty.
-       */
-      function&
-      operator=(_M_clear_type*)
-      {
-        if (_M_manager)
-	  {
-	    _M_manager(_M_functor, _M_functor, __destroy_functor);
-	    _M_manager = 0;
-	    _M_invoker = 0;
-	  }
-        return *this;
-      }
-
-      /**
-       *  @brief %Function assignment to a new target.
-       *  @param f A %function object that is callable with parameters of
-       *  type @c T1, @c T2, ..., @c TN and returns a value convertible
-       *  to @c Res.
-       *  @return @c *this
-       *
-       *  This  %function object wrapper will target a copy of @a
-       *  f. If @a f is @c reference_wrapper<F>, then this function
-       *  object will contain a reference to the function object @c
-       *  f.get(). If @a f is a NULL function pointer or NULL
-       *  pointer-to-member, @c this object will be empty.
-       *
-       *  If @a f is a non-NULL function pointer or an object of type @c
-       *  reference_wrapper<F>, this function will not throw.
-       */
-      template<typename _Functor>
-        typename __gnu_cxx::__enable_if<!is_integral<_Functor>::value,
-	                                function&>::__type
-	operator=(_Functor __f)
-	{
-	  function(__f).swap(*this);
-	  return *this;
-	}
-
-      // [3.7.2.2] function modifiers
-      
-      /**
-       *  @brief Swap the targets of two %function objects.
-       *  @param f A %function with identical call signature.
-       *
-       *  Swap the targets of @c this function object and @a f. This
-       *  function will not throw an %exception.
-       */
-      void swap(function& __x)
-      {
-	std::swap(_M_functor, __x._M_functor);
-	std::swap(_M_manager, __x._M_manager);
-	std::swap(_M_invoker, __x._M_invoker);
-      }
-
-      // [3.7.2.3] function capacity
-
-      /**
-       *  @brief Determine if the %function wrapper has a target.
-       *
-       *  @return @c true when this %function object contains a target,
-       *  or @c false when it is empty.
-       *
-       *  This function will not throw an %exception.
-       */
-#if __cplusplus >= 201103L
-      explicit operator bool() const
-      { return !_M_empty(); }
-#else
-      operator _Safe_bool() const
-      {
-        if (_M_empty())
-	  return 0;
-	else
-	  return &_Hidden_type::_M_bool;
-      }
-#endif
-
-      // [3.7.2.4] function invocation
-
-      /**
-       *  @brief Invokes the function targeted by @c *this.
-       *  @returns the result of the target.
-       *  @throws bad_function_call when @c !(bool)*this
-       *
-       *  The function call operator invokes the target function object
-       *  stored by @c this.
-       */
-      _Res operator()(_ArgTypes... __args) const;
-
-#if __cpp_rtti
-      // [3.7.2.5] function target access
-      /**
-       *  @brief Determine the type of the target of this function object
-       *  wrapper.
-       *
-       *  @returns the type identifier of the target function object, or
-       *  @c typeid(void) if @c !(bool)*this.
-       *
-       *  This function will not throw an %exception.
-       */
-      const type_info& target_type() const;
-      
-      /**
-       *  @brief Access the stored target function object.
-       *
-       *  @return Returns a pointer to the stored target function object,
-       *  if @c typeid(Functor).equals(target_type()); otherwise, a NULL
-       *  pointer.
-       *
-       * This function will not throw an %exception.
-       */
-      template<typename _Functor>       _Functor* target();
-      
-      /// @overload
-      template<typename _Functor> const _Functor* target() const;
-#endif
-
-    private:
-      // [3.7.2.6] undefined operators
-      template<typename _Function>
-	void operator==(const function<_Function>&) const;
-      template<typename _Function>
-	void operator!=(const function<_Function>&) const;
-
-      typedef _Res (*_Invoker_type)(const _Any_data&, _ArgTypes...);
-      _Invoker_type _M_invoker;
-  };
-
-  template<typename _Res, typename... _ArgTypes>
-    function<_Res(_ArgTypes...)>::
-    function(const function& __x)
-    : _Function_base()
-    {
-      if (static_cast<bool>(__x))
-	{
-	  __x._M_manager(_M_functor, __x._M_functor, __clone_functor);
-	  _M_invoker = __x._M_invoker;
-	  _M_manager = __x._M_manager;
-	}
-    }
-
-  template<typename _Res, typename... _ArgTypes>
-    template<typename _Functor>
-      function<_Res(_ArgTypes...)>::
-      function(_Functor __f,
-	       typename __gnu_cxx::__enable_if<
-                       !is_integral<_Functor>::value, _Useless>::__type)
-      : _Function_base()
-      {
-	typedef _Function_handler<_Signature_type, _Functor> _My_handler;
-
-	if (_My_handler::_M_not_empty_function(__f))
-	  {
-	    _My_handler::_M_init_functor(_M_functor, __f);
-	    _M_invoker = &_My_handler::_M_invoke;
-	    _M_manager = &_My_handler::_M_manager;
-	  }
-      }
-
-  template<typename _Res, typename... _ArgTypes>
-    _Res
-    function<_Res(_ArgTypes...)>::
-    operator()(_ArgTypes... __args) const
-    {
-      if (_M_empty())
-	_GLIBCXX_THROW_OR_ABORT(bad_function_call());
-      return _M_invoker(_M_functor, __args...);
-    }
-
-#if __cpp_rtti
-  template<typename _Res, typename... _ArgTypes>
-    const type_info&
-    function<_Res(_ArgTypes...)>::
-    target_type() const
-    {
-      if (_M_manager)
-        {
-          _Any_data __typeinfo_result;
-          _M_manager(__typeinfo_result, _M_functor, __get_type_info);
-          return *__typeinfo_result._M_access<const type_info*>();
-        }
-      else
-	return typeid(void);
-    }
-
-  template<typename _Res, typename... _ArgTypes>
-    template<typename _Functor>
-      _Functor*
-      function<_Res(_ArgTypes...)>::
-      target()
-      {
-	if (typeid(_Functor) == target_type() && _M_manager)
-	  {
-	    _Any_data __ptr;
-	    if (_M_manager(__ptr, _M_functor, __get_functor_ptr)
-		&& !is_const<_Functor>::value)
-	      return 0;
-	    else
-	      return __ptr._M_access<_Functor*>();
-	  }
-	else
-	  return 0;
-      }
-
-  template<typename _Res, typename... _ArgTypes>
-    template<typename _Functor>
-      const _Functor*
-      function<_Res(_ArgTypes...)>::
-      target() const
-      {
-	if (typeid(_Functor) == target_type() && _M_manager)
-	  {
-	    _Any_data __ptr;
-	    _M_manager(__ptr, _M_functor, __get_functor_ptr);
-	    return __ptr._M_access<const _Functor*>();
-	  }
-	else
-	  return 0;
-      }
-#endif
-
-  // [3.7.2.7] null pointer comparisons
-
-  /**
-   *  @brief Compares a polymorphic function object wrapper against 0
-   *  (the NULL pointer).
-   *  @returns @c true if the wrapper has no target, @c false otherwise
-   *
-   *  This function will not throw an %exception.
-   */
-  template<typename _Signature>
-    inline bool
-    operator==(const function<_Signature>& __f, _M_clear_type*)
-    { return !static_cast<bool>(__f); }
-
-  /// @overload
-  template<typename _Signature>
-    inline bool
-    operator==(_M_clear_type*, const function<_Signature>& __f)
-    { return !static_cast<bool>(__f); }
-
-  /**
-   *  @brief Compares a polymorphic function object wrapper against 0
-   *  (the NULL pointer).
-   *  @returns @c false if the wrapper has no target, @c true otherwise
-   *
-   *  This function will not throw an %exception.
-   */
-  template<typename _Signature>
-    inline bool
-    operator!=(const function<_Signature>& __f, _M_clear_type*)
-    { return static_cast<bool>(__f); }
-
-  /// @overload
-  template<typename _Signature>
-    inline bool
-    operator!=(_M_clear_type*, const function<_Signature>& __f)
-    { return static_cast<bool>(__f); }
-
-  // [3.7.2.8] specialized algorithms
-
-  /**
-   *  @brief Swap the targets of two polymorphic function object wrappers.
-   *
-   *  This function will not throw an %exception.
-   */
-  template<typename _Signature>
-    inline void
-    swap(function<_Signature>& __x, function<_Signature>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-
-#if __cplusplus >= 201103L
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename> struct is_placeholder;
-
-  template<int _Num>
-    struct is_placeholder<tr1::_Placeholder<_Num>>
-    : integral_constant<int, _Num>
-    { };
-
-  template<int _Num>
-    struct is_placeholder<const tr1::_Placeholder<_Num>>
-    : integral_constant<int, _Num>
-    { };
-
-  template<typename> struct is_bind_expression;
-
-  template<typename _Signature>
-    struct is_bind_expression<tr1::_Bind<_Signature>>
-    : true_type { };
-
-  template<typename _Signature>
-    struct is_bind_expression<const tr1::_Bind<_Signature>>
-    : true_type { };
-
-  template<typename _Signature>
-    struct is_bind_expression<volatile tr1::_Bind<_Signature>>
-    : true_type { };
-
-  template<typename _Signature>
-    struct is_bind_expression<const volatile tr1::_Bind<_Signature>>
-    : true_type { };
-
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<tr1::_Bind_result<_Result, _Signature>>
-    : true_type { };
-
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<const tr1::_Bind_result<_Result, _Signature>>
-    : true_type { };
-
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<volatile tr1::_Bind_result<_Result, _Signature>>
-    : true_type { };
-
-  template<typename _Result, typename _Signature>
-    struct is_bind_expression<const volatile tr1::_Bind_result<_Result,
-                                                               _Signature>>
-    : true_type { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-#endif
-}
-
-#endif // _GLIBCXX_TR1_FUNCTIONAL
diff --git a/openflow/usr/include/c++/5/tr1/functional_hash.h b/openflow/usr/include/c++/5/tr1/functional_hash.h
deleted file mode 100644
index c642c18..0000000
--- a/openflow/usr/include/c++/5/tr1/functional_hash.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// TR1 functional_hash.h header -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/functional_hash.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/functional}
- */
-
-#ifndef _GLIBCXX_TR1_FUNCTIONAL_HASH_H
-#define _GLIBCXX_TR1_FUNCTIONAL_HASH_H 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /// Class template hash.
-  // Declaration of default hash functor std::tr1::hash.  The types for
-  // which std::tr1::hash<T> is well-defined is in clause 6.3.3. of the PDTR.
-  template<typename _Tp>
-    struct hash : public std::unary_function<_Tp, size_t>
-    {
-      size_t
-      operator()(_Tp __val) const;
-    };
-
-  /// Partial specializations for pointer types.
-  template<typename _Tp>
-    struct hash<_Tp*> : public std::unary_function<_Tp*, size_t>
-    {
-      size_t
-      operator()(_Tp* __p) const
-      { return reinterpret_cast<size_t>(__p); }
-    };
-
-  /// Explicit specializations for integer types.
-#define _TR1_hashtable_define_trivial_hash(_Tp) 	\
-  template<>						\
-    inline size_t					\
-    hash<_Tp>::operator()(_Tp __val) const		\
-    { return static_cast<size_t>(__val); }
-
-  _TR1_hashtable_define_trivial_hash(bool);
-  _TR1_hashtable_define_trivial_hash(char);
-  _TR1_hashtable_define_trivial_hash(signed char);
-  _TR1_hashtable_define_trivial_hash(unsigned char);
-  _TR1_hashtable_define_trivial_hash(wchar_t);
-  _TR1_hashtable_define_trivial_hash(short);
-  _TR1_hashtable_define_trivial_hash(int);
-  _TR1_hashtable_define_trivial_hash(long);
-  _TR1_hashtable_define_trivial_hash(long long);
-  _TR1_hashtable_define_trivial_hash(unsigned short);
-  _TR1_hashtable_define_trivial_hash(unsigned int);
-  _TR1_hashtable_define_trivial_hash(unsigned long);
-  _TR1_hashtable_define_trivial_hash(unsigned long long);
-
-#undef _TR1_hashtable_define_trivial_hash
-
-  // Fowler / Noll / Vo (FNV) Hash (type FNV-1a)
-  // (Used by the next specializations of std::tr1::hash.)
-
-  /// Dummy generic implementation (for sizeof(size_t) != 4, 8).
-  template<size_t>
-    struct _Fnv_hash_base
-    {
-      template<typename _Tp>
-        static size_t
-        hash(const _Tp* __ptr, size_t __clength)
-        {
-	  size_t __result = 0;
-	  const char* __cptr = reinterpret_cast<const char*>(__ptr);
-	  for (; __clength; --__clength)
-	    __result = (__result * 131) + *__cptr++;
-	  return __result;
-	}
-    };
-
-  template<>
-    struct _Fnv_hash_base<4>
-    {
-      template<typename _Tp>
-        static size_t
-        hash(const _Tp* __ptr, size_t __clength)
-        {
-	  size_t __result = static_cast<size_t>(2166136261UL);
-	  const char* __cptr = reinterpret_cast<const char*>(__ptr);
-	  for (; __clength; --__clength)
-	    {
-	      __result ^= static_cast<size_t>(*__cptr++);
-	      __result *= static_cast<size_t>(16777619UL);
-	    }
-	  return __result;
-	}
-    };
-  
-  template<>
-    struct _Fnv_hash_base<8>
-    {
-      template<typename _Tp>
-        static size_t
-        hash(const _Tp* __ptr, size_t __clength)
-        {
-	  size_t __result
-	    = static_cast<size_t>(14695981039346656037ULL);
-	  const char* __cptr = reinterpret_cast<const char*>(__ptr);
-	  for (; __clength; --__clength)
-	    {
-	      __result ^= static_cast<size_t>(*__cptr++);
-	      __result *= static_cast<size_t>(1099511628211ULL);
-	    }
-	  return __result;
-	}
-    };
-
-  struct _Fnv_hash
-  : public _Fnv_hash_base<sizeof(size_t)>
-  {
-    using _Fnv_hash_base<sizeof(size_t)>::hash;
-
-    template<typename _Tp>
-      static size_t
-      hash(const _Tp& __val)
-      { return hash(&__val, sizeof(__val)); }
-  };
-
-  /// Explicit specializations for float.
-  template<>
-    inline size_t
-    hash<float>::operator()(float __val) const
-    {
-      // 0 and -0 both hash to zero.
-      return __val != 0.0f ? std::tr1::_Fnv_hash::hash(__val) : 0;
-    }
-
-  /// Explicit specializations for double.
-  template<>
-    inline size_t
-    hash<double>::operator()(double __val) const
-    {
-      // 0 and -0 both hash to zero.
-      return __val != 0.0 ? std::tr1::_Fnv_hash::hash(__val) : 0;
-    }
-
-  /// Explicit specializations for long double.
-  template<>
-    _GLIBCXX_PURE size_t
-    hash<long double>::operator()(long double __val) const;
-
-  /// Explicit specialization of member operator for non-builtin types.
-  template<>
-    _GLIBCXX_PURE size_t
-    hash<string>::operator()(string) const;
-
-  template<>
-    _GLIBCXX_PURE size_t
-    hash<const string&>::operator()(const string&) const;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    _GLIBCXX_PURE size_t
-    hash<wstring>::operator()(wstring) const;
-
-  template<>
-    _GLIBCXX_PURE size_t
-    hash<const wstring&>::operator()(const wstring&) const;
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _GLIBCXX_TR1_FUNCTIONAL_HASH_H
diff --git a/openflow/usr/include/c++/5/tr1/gamma.tcc b/openflow/usr/include/c++/5/tr1/gamma.tcc
deleted file mode 100644
index 187e00d..0000000
--- a/openflow/usr/include/c++/5/tr1/gamma.tcc
+++ /dev/null
@@ -1,469 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/gamma.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland based on:
-//   (1) Handbook of Mathematical Functions,
-//       ed. Milton Abramowitz and Irene A. Stegun,
-//       Dover Publications,
-//       Section 6, pp. 253-266
-//   (2) The Gnu Scientific Library, http://www.gnu.org/software/gsl
-//   (3) Numerical Recipes in C, by W. H. Press, S. A. Teukolsky,
-//       W. T. Vetterling, B. P. Flannery, Cambridge University Press (1992),
-//       2nd ed, pp. 213-216
-//   (4) Gamma, Exploring Euler's Constant, Julian Havil,
-//       Princeton, 2003.
-
-#ifndef _GLIBCXX_TR1_GAMMA_TCC
-#define _GLIBCXX_TR1_GAMMA_TCC 1
-
-#include "special_function_util.h"
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     *   @brief This returns Bernoulli numbers from a table or by summation
-     *          for larger values.
-     *
-     *   Recursion is unstable.
-     *
-     *   @param __n the order n of the Bernoulli number.
-     *   @return  The Bernoulli number of order n.
-     */
-    template <typename _Tp>
-    _Tp
-    __bernoulli_series(unsigned int __n)
-    {
-
-      static const _Tp __num[28] = {
-        _Tp(1UL),                        -_Tp(1UL) / _Tp(2UL),
-        _Tp(1UL) / _Tp(6UL),             _Tp(0UL),
-        -_Tp(1UL) / _Tp(30UL),           _Tp(0UL),
-        _Tp(1UL) / _Tp(42UL),            _Tp(0UL),
-        -_Tp(1UL) / _Tp(30UL),           _Tp(0UL),
-        _Tp(5UL) / _Tp(66UL),            _Tp(0UL),
-        -_Tp(691UL) / _Tp(2730UL),       _Tp(0UL),
-        _Tp(7UL) / _Tp(6UL),             _Tp(0UL),
-        -_Tp(3617UL) / _Tp(510UL),       _Tp(0UL),
-        _Tp(43867UL) / _Tp(798UL),       _Tp(0UL),
-        -_Tp(174611) / _Tp(330UL),       _Tp(0UL),
-        _Tp(854513UL) / _Tp(138UL),      _Tp(0UL),
-        -_Tp(236364091UL) / _Tp(2730UL), _Tp(0UL),
-        _Tp(8553103UL) / _Tp(6UL),       _Tp(0UL)
-      };
-
-      if (__n == 0)
-        return _Tp(1);
-
-      if (__n == 1)
-        return -_Tp(1) / _Tp(2);
-
-      //  Take care of the rest of the odd ones.
-      if (__n % 2 == 1)
-        return _Tp(0);
-
-      //  Take care of some small evens that are painful for the series.
-      if (__n < 28)
-        return __num[__n];
-
-
-      _Tp __fact = _Tp(1);
-      if ((__n / 2) % 2 == 0)
-        __fact *= _Tp(-1);
-      for (unsigned int __k = 1; __k <= __n; ++__k)
-        __fact *= __k / (_Tp(2) * __numeric_constants<_Tp>::__pi());
-      __fact *= _Tp(2);
-
-      _Tp __sum = _Tp(0);
-      for (unsigned int __i = 1; __i < 1000; ++__i)
-        {
-          _Tp __term = std::pow(_Tp(__i), -_Tp(__n));
-          if (__term < std::numeric_limits<_Tp>::epsilon())
-            break;
-          __sum += __term;
-        }
-
-      return __fact * __sum;
-    }
-
-
-    /**
-     *   @brief This returns Bernoulli number \f$B_n\f$.
-     *
-     *   @param __n the order n of the Bernoulli number.
-     *   @return  The Bernoulli number of order n.
-     */
-    template<typename _Tp>
-    inline _Tp
-    __bernoulli(int __n)
-    { return __bernoulli_series<_Tp>(__n); }
-
-
-    /**
-     *   @brief Return \f$log(\Gamma(x))\f$ by asymptotic expansion
-     *          with Bernoulli number coefficients.  This is like
-     *          Sterling's approximation.
-     *
-     *   @param __x The argument of the log of the gamma function.
-     *   @return  The logarithm of the gamma function.
-     */
-    template<typename _Tp>
-    _Tp
-    __log_gamma_bernoulli(_Tp __x)
-    {
-      _Tp __lg = (__x - _Tp(0.5L)) * std::log(__x) - __x
-               + _Tp(0.5L) * std::log(_Tp(2)
-               * __numeric_constants<_Tp>::__pi());
-
-      const _Tp __xx = __x * __x;
-      _Tp __help = _Tp(1) / __x;
-      for ( unsigned int __i = 1; __i < 20; ++__i )
-        {
-          const _Tp __2i = _Tp(2 * __i);
-          __help /= __2i * (__2i - _Tp(1)) * __xx;
-          __lg += __bernoulli<_Tp>(2 * __i) * __help;
-        }
-
-      return __lg;
-    }
-
-
-    /**
-     *   @brief Return \f$log(\Gamma(x))\f$ by the Lanczos method.
-     *          This method dominates all others on the positive axis I think.
-     *
-     *   @param __x The argument of the log of the gamma function.
-     *   @return  The logarithm of the gamma function.
-     */
-    template<typename _Tp>
-    _Tp
-    __log_gamma_lanczos(_Tp __x)
-    {
-      const _Tp __xm1 = __x - _Tp(1);
-
-      static const _Tp __lanczos_cheb_7[9] = {
-       _Tp( 0.99999999999980993227684700473478L),
-       _Tp( 676.520368121885098567009190444019L),
-       _Tp(-1259.13921672240287047156078755283L),
-       _Tp( 771.3234287776530788486528258894L),
-       _Tp(-176.61502916214059906584551354L),
-       _Tp( 12.507343278686904814458936853L),
-       _Tp(-0.13857109526572011689554707L),
-       _Tp( 9.984369578019570859563e-6L),
-       _Tp( 1.50563273514931155834e-7L)
-      };
-
-      static const _Tp __LOGROOT2PI
-          = _Tp(0.9189385332046727417803297364056176L);
-
-      _Tp __sum = __lanczos_cheb_7[0];
-      for(unsigned int __k = 1; __k < 9; ++__k)
-        __sum += __lanczos_cheb_7[__k] / (__xm1 + __k);
-
-      const _Tp __term1 = (__xm1 + _Tp(0.5L))
-                        * std::log((__xm1 + _Tp(7.5L))
-                       / __numeric_constants<_Tp>::__euler());
-      const _Tp __term2 = __LOGROOT2PI + std::log(__sum);
-      const _Tp __result = __term1 + (__term2 - _Tp(7));
-
-      return __result;
-    }
-
-
-    /**
-     *   @brief Return \f$ log(|\Gamma(x)|) \f$.
-     *          This will return values even for \f$ x < 0 \f$.
-     *          To recover the sign of \f$ \Gamma(x) \f$ for
-     *          any argument use @a __log_gamma_sign.
-     *
-     *   @param __x The argument of the log of the gamma function.
-     *   @return  The logarithm of the gamma function.
-     */
-    template<typename _Tp>
-    _Tp
-    __log_gamma(_Tp __x)
-    {
-      if (__x > _Tp(0.5L))
-        return __log_gamma_lanczos(__x);
-      else
-        {
-          const _Tp __sin_fact
-                 = std::abs(std::sin(__numeric_constants<_Tp>::__pi() * __x));
-          if (__sin_fact == _Tp(0))
-            std::__throw_domain_error(__N("Argument is nonpositive integer "
-                                          "in __log_gamma"));
-          return __numeric_constants<_Tp>::__lnpi()
-                     - std::log(__sin_fact)
-                     - __log_gamma_lanczos(_Tp(1) - __x);
-        }
-    }
-
-
-    /**
-     *   @brief Return the sign of \f$ \Gamma(x) \f$.
-     *          At nonpositive integers zero is returned.
-     *
-     *   @param __x The argument of the gamma function.
-     *   @return  The sign of the gamma function.
-     */
-    template<typename _Tp>
-    _Tp
-    __log_gamma_sign(_Tp __x)
-    {
-      if (__x > _Tp(0))
-        return _Tp(1);
-      else
-        {
-          const _Tp __sin_fact
-                  = std::sin(__numeric_constants<_Tp>::__pi() * __x);
-          if (__sin_fact > _Tp(0))
-            return (1);
-          else if (__sin_fact < _Tp(0))
-            return -_Tp(1);
-          else
-            return _Tp(0);
-        }
-    }
-
-
-    /**
-     *   @brief Return the logarithm of the binomial coefficient.
-     *   The binomial coefficient is given by:
-     *   @f[
-     *   \left(  \right) = \frac{n!}{(n-k)! k!}
-     *   @f]
-     *
-     *   @param __n The first argument of the binomial coefficient.
-     *   @param __k The second argument of the binomial coefficient.
-     *   @return  The binomial coefficient.
-     */
-    template<typename _Tp>
-    _Tp
-    __log_bincoef(unsigned int __n, unsigned int __k)
-    {
-      //  Max e exponent before overflow.
-      static const _Tp __max_bincoeff
-                      = std::numeric_limits<_Tp>::max_exponent10
-                      * std::log(_Tp(10)) - _Tp(1);
-#if _GLIBCXX_USE_C99_MATH_TR1
-      _Tp __coeff =  std::tr1::lgamma(_Tp(1 + __n))
-                  - std::tr1::lgamma(_Tp(1 + __k))
-                  - std::tr1::lgamma(_Tp(1 + __n - __k));
-#else
-      _Tp __coeff =  __log_gamma(_Tp(1 + __n))
-                  - __log_gamma(_Tp(1 + __k))
-                  - __log_gamma(_Tp(1 + __n - __k));
-#endif
-    }
-
-
-    /**
-     *   @brief Return the binomial coefficient.
-     *   The binomial coefficient is given by:
-     *   @f[
-     *   \left(  \right) = \frac{n!}{(n-k)! k!}
-     *   @f]
-     *
-     *   @param __n The first argument of the binomial coefficient.
-     *   @param __k The second argument of the binomial coefficient.
-     *   @return  The binomial coefficient.
-     */
-    template<typename _Tp>
-    _Tp
-    __bincoef(unsigned int __n, unsigned int __k)
-    {
-      //  Max e exponent before overflow.
-      static const _Tp __max_bincoeff
-                      = std::numeric_limits<_Tp>::max_exponent10
-                      * std::log(_Tp(10)) - _Tp(1);
-
-      const _Tp __log_coeff = __log_bincoef<_Tp>(__n, __k);
-      if (__log_coeff > __max_bincoeff)
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else
-        return std::exp(__log_coeff);
-    }
-
-
-    /**
-     *   @brief Return \f$ \Gamma(x) \f$.
-     *
-     *   @param __x The argument of the gamma function.
-     *   @return  The gamma function.
-     */
-    template<typename _Tp>
-    inline _Tp
-    __gamma(_Tp __x)
-    { return std::exp(__log_gamma(__x)); }
-
-
-    /**
-     *   @brief  Return the digamma function by series expansion.
-     *   The digamma or @f$ \psi(x) @f$ function is defined by
-     *   @f[
-     *     \psi(x) = \frac{\Gamma'(x)}{\Gamma(x)}
-     *   @f]
-     *
-     *   The series is given by:
-     *   @f[
-     *     \psi(x) = -\gamma_E - \frac{1}{x}
-     *              \sum_{k=1}^{\infty} \frac{x}{k(x + k)}
-     *   @f]
-     */
-    template<typename _Tp>
-    _Tp
-    __psi_series(_Tp __x)
-    {
-      _Tp __sum = -__numeric_constants<_Tp>::__gamma_e() - _Tp(1) / __x;
-      const unsigned int __max_iter = 100000;
-      for (unsigned int __k = 1; __k < __max_iter; ++__k)
-        {
-          const _Tp __term = __x / (__k * (__k + __x));
-          __sum += __term;
-          if (std::abs(__term / __sum) < std::numeric_limits<_Tp>::epsilon())
-            break;
-        }
-      return __sum;
-    }
-
-
-    /**
-     *   @brief  Return the digamma function for large argument.
-     *   The digamma or @f$ \psi(x) @f$ function is defined by
-     *   @f[
-     *     \psi(x) = \frac{\Gamma'(x)}{\Gamma(x)}
-     *   @f]
-     *
-     *   The asymptotic series is given by:
-     *   @f[
-     *     \psi(x) = \ln(x) - \frac{1}{2x}
-     *             - \sum_{n=1}^{\infty} \frac{B_{2n}}{2 n x^{2n}}
-     *   @f]
-     */
-    template<typename _Tp>
-    _Tp
-    __psi_asymp(_Tp __x)
-    {
-      _Tp __sum = std::log(__x) - _Tp(0.5L) / __x;
-      const _Tp __xx = __x * __x;
-      _Tp __xp = __xx;
-      const unsigned int __max_iter = 100;
-      for (unsigned int __k = 1; __k < __max_iter; ++__k)
-        {
-          const _Tp __term = __bernoulli<_Tp>(2 * __k) / (2 * __k * __xp);
-          __sum -= __term;
-          if (std::abs(__term / __sum) < std::numeric_limits<_Tp>::epsilon())
-            break;
-          __xp *= __xx;
-        }
-      return __sum;
-    }
-
-
-    /**
-     *   @brief  Return the digamma function.
-     *   The digamma or @f$ \psi(x) @f$ function is defined by
-     *   @f[
-     *     \psi(x) = \frac{\Gamma'(x)}{\Gamma(x)}
-     *   @f]
-     *   For negative argument the reflection formula is used:
-     *   @f[
-     *     \psi(x) = \psi(1-x) - \pi \cot(\pi x)
-     *   @f]
-     */
-    template<typename _Tp>
-    _Tp
-    __psi(_Tp __x)
-    {
-      const int __n = static_cast<int>(__x + 0.5L);
-      const _Tp __eps = _Tp(4) * std::numeric_limits<_Tp>::epsilon();
-      if (__n <= 0 && std::abs(__x - _Tp(__n)) < __eps)
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__x < _Tp(0))
-        {
-          const _Tp __pi = __numeric_constants<_Tp>::__pi();
-          return __psi(_Tp(1) - __x)
-               - __pi * std::cos(__pi * __x) / std::sin(__pi * __x);
-        }
-      else if (__x > _Tp(100))
-        return __psi_asymp(__x);
-      else
-        return __psi_series(__x);
-    }
-
-
-    /**
-     *   @brief  Return the polygamma function @f$ \psi^{(n)}(x) @f$.
-     * 
-     *   The polygamma function is related to the Hurwitz zeta function:
-     *   @f[
-     *     \psi^{(n)}(x) = (-1)^{n+1} m! \zeta(m+1,x)
-     *   @f]
-     */
-    template<typename _Tp>
-    _Tp
-    __psi(unsigned int __n, _Tp __x)
-    {
-      if (__x <= _Tp(0))
-        std::__throw_domain_error(__N("Argument out of range "
-                                      "in __psi"));
-      else if (__n == 0)
-        return __psi(__x);
-      else
-        {
-          const _Tp __hzeta = __hurwitz_zeta(_Tp(__n + 1), __x);
-#if _GLIBCXX_USE_C99_MATH_TR1
-          const _Tp __ln_nfact = std::tr1::lgamma(_Tp(__n + 1));
-#else
-          const _Tp __ln_nfact = __log_gamma(_Tp(__n + 1));
-#endif
-          _Tp __result = std::exp(__ln_nfact) * __hzeta;
-          if (__n % 2 == 1)
-            __result = -__result;
-          return __result;
-        }
-    }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_GAMMA_TCC
-
diff --git a/openflow/usr/include/c++/5/tr1/hashtable.h b/openflow/usr/include/c++/5/tr1/hashtable.h
deleted file mode 100644
index c1a8269..0000000
--- a/openflow/usr/include/c++/5/tr1/hashtable.h
+++ /dev/null
@@ -1,1181 +0,0 @@
-// TR1 hashtable.h header -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/hashtable.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly.
- *  @headername{tr1/unordered_set, tr1/unordered_map}
- */
-
-#ifndef _GLIBCXX_TR1_HASHTABLE_H
-#define _GLIBCXX_TR1_HASHTABLE_H 1
-
-#pragma GCC system_header
-
-#include <tr1/hashtable_policy.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Class template _Hashtable, class definition.
-
-  // Meaning of class template _Hashtable's template parameters
-
-  // _Key and _Value: arbitrary CopyConstructible types.
-
-  // _Allocator: an allocator type ([lib.allocator.requirements]) whose
-  // value type is Value.  As a conforming extension, we allow for
-  // value type != Value.
-
-  // _ExtractKey: function object that takes a object of type Value
-  // and returns a value of type _Key.
-
-  // _Equal: function object that takes two objects of type k and returns
-  // a bool-like value that is true if the two objects are considered equal.
-
-  // _H1: the hash function.  A unary function object with argument type
-  // Key and result type size_t.  Return values should be distributed
-  // over the entire range [0, numeric_limits<size_t>:::max()].
-
-  // _H2: the range-hashing function (in the terminology of Tavori and
-  // Dreizin).  A binary function object whose argument types and result
-  // type are all size_t.  Given arguments r and N, the return value is
-  // in the range [0, N).
-
-  // _Hash: the ranged hash function (Tavori and Dreizin). A binary function
-  // whose argument types are _Key and size_t and whose result type is
-  // size_t.  Given arguments k and N, the return value is in the range
-  // [0, N).  Default: hash(k, N) = h2(h1(k), N).  If _Hash is anything other
-  // than the default, _H1 and _H2 are ignored.
-
-  // _RehashPolicy: Policy class with three members, all of which govern
-  // the bucket count. _M_next_bkt(n) returns a bucket count no smaller
-  // than n.  _M_bkt_for_elements(n) returns a bucket count appropriate
-  // for an element count of n.  _M_need_rehash(n_bkt, n_elt, n_ins)
-  // determines whether, if the current bucket count is n_bkt and the
-  // current element count is n_elt, we need to increase the bucket
-  // count.  If so, returns make_pair(true, n), where n is the new
-  // bucket count.  If not, returns make_pair(false, <anything>).
-
-  // ??? Right now it is hard-wired that the number of buckets never
-  // shrinks.  Should we allow _RehashPolicy to change that?
-
-  // __cache_hash_code: bool.  true if we store the value of the hash
-  // function along with the value.  This is a time-space tradeoff.
-  // Storing it may improve lookup speed by reducing the number of times
-  // we need to call the Equal function.
-
-  // __constant_iterators: bool.  true if iterator and const_iterator are
-  // both constant iterator types.  This is true for unordered_set and
-  // unordered_multiset, false for unordered_map and unordered_multimap.
-
-  // __unique_keys: bool.  true if the return value of _Hashtable::count(k)
-  // is always at most one, false if it may be an arbitrary number.  This
-  // true for unordered_set and unordered_map, false for unordered_multiset
-  // and unordered_multimap.
-
-  template<typename _Key, typename _Value, typename _Allocator,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   typename _RehashPolicy,
-	   bool __cache_hash_code,
-	   bool __constant_iterators,
-	   bool __unique_keys>
-    class _Hashtable
-    : public __detail::_Rehash_base<_RehashPolicy,
-				    _Hashtable<_Key, _Value, _Allocator,
-					       _ExtractKey,
-					       _Equal, _H1, _H2, _Hash,
-					       _RehashPolicy,
-					       __cache_hash_code,
-					       __constant_iterators,
-					       __unique_keys> >,
-      public __detail::_Hash_code_base<_Key, _Value, _ExtractKey, _Equal,
-				       _H1, _H2, _Hash, __cache_hash_code>,
-      public __detail::_Map_base<_Key, _Value, _ExtractKey, __unique_keys,
-				 _Hashtable<_Key, _Value, _Allocator,
-					    _ExtractKey,
-					    _Equal, _H1, _H2, _Hash,
-					    _RehashPolicy,
-					    __cache_hash_code,
-					    __constant_iterators,
-					    __unique_keys> >
-    {
-    public:
-      typedef _Allocator                                  allocator_type;
-      typedef _Value                                      value_type;
-      typedef _Key                                        key_type;
-      typedef _Equal                                      key_equal;
-      // mapped_type, if present, comes from _Map_base.
-      // hasher, if present, comes from _Hash_code_base.
-      typedef typename _Allocator::difference_type        difference_type;
-      typedef typename _Allocator::size_type              size_type;
-      typedef typename _Allocator::pointer                pointer;
-      typedef typename _Allocator::const_pointer          const_pointer;
-      typedef typename _Allocator::reference              reference;
-      typedef typename _Allocator::const_reference        const_reference;
-
-      typedef __detail::_Node_iterator<value_type, __constant_iterators,
-				       __cache_hash_code>
-							  local_iterator;
-      typedef __detail::_Node_const_iterator<value_type,
-					     __constant_iterators,
-					     __cache_hash_code>
-							  const_local_iterator;
-
-      typedef __detail::_Hashtable_iterator<value_type, __constant_iterators,
-					    __cache_hash_code>
-							  iterator;
-      typedef __detail::_Hashtable_const_iterator<value_type,
-						  __constant_iterators,
-						  __cache_hash_code>
-							  const_iterator;
-
-      template<typename _Key2, typename _Value2, typename _Ex2, bool __unique2,
-	       typename _Hashtable2>
-	friend struct __detail::_Map_base;
-
-    private:
-      typedef __detail::_Hash_node<_Value, __cache_hash_code> _Node;
-      typedef typename _Allocator::template rebind<_Node>::other
-							_Node_allocator_type;
-      typedef typename _Allocator::template rebind<_Node*>::other
-							_Bucket_allocator_type;
-
-      typedef typename _Allocator::template rebind<_Value>::other
-							_Value_allocator_type;
-
-      _Node_allocator_type   _M_node_allocator;
-      _Node**                _M_buckets;
-      size_type              _M_bucket_count;
-      size_type              _M_element_count;
-      _RehashPolicy          _M_rehash_policy;
-
-      _Node*
-      _M_allocate_node(const value_type& __v);
-
-      void
-      _M_deallocate_node(_Node* __n);
-
-      void
-      _M_deallocate_nodes(_Node**, size_type);
-
-      _Node**
-      _M_allocate_buckets(size_type __n);
-
-      void
-      _M_deallocate_buckets(_Node**, size_type __n);
-
-    public:
-      // Constructor, destructor, assignment, swap
-      _Hashtable(size_type __bucket_hint,
-		 const _H1&, const _H2&, const _Hash&,
-		 const _Equal&, const _ExtractKey&,
-		 const allocator_type&);
-
-      template<typename _InputIterator>
-	_Hashtable(_InputIterator __first, _InputIterator __last,
-		   size_type __bucket_hint,
-		   const _H1&, const _H2&, const _Hash&,
-		   const _Equal&, const _ExtractKey&,
-		   const allocator_type&);
-
-      _Hashtable(const _Hashtable&);
-
-      _Hashtable&
-      operator=(const _Hashtable&);
-
-      ~_Hashtable();
-
-      void swap(_Hashtable&);
-
-      // Basic container operations
-      iterator
-      begin()
-      {
-	iterator __i(_M_buckets);
-	if (!__i._M_cur_node)
-	  __i._M_incr_bucket();
-	return __i;
-      }
-
-      const_iterator
-      begin() const
-      {
-	const_iterator __i(_M_buckets);
-	if (!__i._M_cur_node)
-	  __i._M_incr_bucket();
-	return __i;
-      }
-
-      iterator
-      end()
-      { return iterator(_M_buckets + _M_bucket_count); }
-
-      const_iterator
-      end() const
-      { return const_iterator(_M_buckets + _M_bucket_count); }
-
-      size_type
-      size() const
-      { return _M_element_count; }
-
-      bool
-      empty() const
-      { return size() == 0; }
-
-      allocator_type
-      get_allocator() const
-      { return allocator_type(_M_node_allocator); }
-
-      _Value_allocator_type
-      _M_get_Value_allocator() const
-      { return _Value_allocator_type(_M_node_allocator); }
-
-      size_type
-      max_size() const
-      { return _M_node_allocator.max_size(); }
-
-      // Observers
-      key_equal
-      key_eq() const
-      { return this->_M_eq; }
-
-      // hash_function, if present, comes from _Hash_code_base.
-
-      // Bucket operations
-      size_type
-      bucket_count() const
-      { return _M_bucket_count; }
-
-      size_type
-      max_bucket_count() const
-      { return max_size(); }
-
-      size_type
-      bucket_size(size_type __n) const
-      { return std::distance(begin(__n), end(__n)); }
-
-      size_type
-      bucket(const key_type& __k) const
-      {
-	return this->_M_bucket_index(__k, this->_M_hash_code(__k),
-				     bucket_count());
-      }
-
-      local_iterator
-      begin(size_type __n)
-      { return local_iterator(_M_buckets[__n]); }
-
-      local_iterator
-      end(size_type)
-      { return local_iterator(0); }
-
-      const_local_iterator
-      begin(size_type __n) const
-      { return const_local_iterator(_M_buckets[__n]); }
-
-      const_local_iterator
-      end(size_type) const
-      { return const_local_iterator(0); }
-
-      float
-      load_factor() const
-      {
-	return static_cast<float>(size()) / static_cast<float>(bucket_count());
-      }
-
-      // max_load_factor, if present, comes from _Rehash_base.
-
-      // Generalization of max_load_factor.  Extension, not found in TR1.  Only
-      // useful if _RehashPolicy is something other than the default.
-      const _RehashPolicy&
-      __rehash_policy() const
-      { return _M_rehash_policy; }
-
-      void
-      __rehash_policy(const _RehashPolicy&);
-
-      // Lookup.
-      iterator
-      find(const key_type& __k);
-
-      const_iterator
-      find(const key_type& __k) const;
-
-      size_type
-      count(const key_type& __k) const;
-
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __k);
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __k) const;
-
-    private:			// Find, insert and erase helper functions
-      // ??? This dispatching is a workaround for the fact that we don't
-      // have partial specialization of member templates; it would be
-      // better to just specialize insert on __unique_keys.  There may be a
-      // cleaner workaround.
-      typedef typename __gnu_cxx::__conditional_type<__unique_keys,
-		       	    std::pair<iterator, bool>, iterator>::__type
-	_Insert_Return_Type;
-
-      typedef typename __gnu_cxx::__conditional_type<__unique_keys,
-					  std::_Select1st<_Insert_Return_Type>,
-				  	  std::_Identity<_Insert_Return_Type>
-				   >::__type
-	_Insert_Conv_Type;
-
-      _Node*
-      _M_find_node(_Node*, const key_type&,
-		   typename _Hashtable::_Hash_code_type) const;
-
-      iterator
-      _M_insert_bucket(const value_type&, size_type,
-		       typename _Hashtable::_Hash_code_type);
-
-      std::pair<iterator, bool>
-      _M_insert(const value_type&, std::tr1::true_type);
-
-      iterator
-      _M_insert(const value_type&, std::tr1::false_type);
-
-      void
-      _M_erase_node(_Node*, _Node**);
-
-    public:
-      // Insert and erase
-      _Insert_Return_Type
-      insert(const value_type& __v)
-      { return _M_insert(__v, std::tr1::integral_constant<bool,
-			 __unique_keys>()); }
-
-      iterator
-      insert(iterator, const value_type& __v)
-      { return iterator(_Insert_Conv_Type()(this->insert(__v))); }
-
-      const_iterator
-      insert(const_iterator, const value_type& __v)
-      { return const_iterator(_Insert_Conv_Type()(this->insert(__v))); }
-
-      template<typename _InputIterator>
-	void
-	insert(_InputIterator __first, _InputIterator __last);
-
-      iterator
-      erase(iterator);
-
-      const_iterator
-      erase(const_iterator);
-
-      size_type
-      erase(const key_type&);
-
-      iterator
-      erase(iterator, iterator);
-
-      const_iterator
-      erase(const_iterator, const_iterator);
-
-      void
-      clear();
-
-      // Set number of buckets to be appropriate for container of n element.
-      void rehash(size_type __n);
-
-    private:
-      // Unconditionally change size of bucket array to n.
-      void _M_rehash(size_type __n);
-    };
-
-
-  // Definitions of class template _Hashtable's out-of-line member functions.
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::_Node*
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _M_allocate_node(const value_type& __v)
-    {
-      _Node* __n = _M_node_allocator.allocate(1);
-      __try
-	{
-	  _M_get_Value_allocator().construct(&__n->_M_v, __v);
-	  __n->_M_next = 0;
-	  return __n;
-	}
-      __catch(...)
-	{
-	  _M_node_allocator.deallocate(__n, 1);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    void
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _M_deallocate_node(_Node* __n)
-    {
-      _M_get_Value_allocator().destroy(&__n->_M_v);
-      _M_node_allocator.deallocate(__n, 1);
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    void
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _M_deallocate_nodes(_Node** __array, size_type __n)
-    {
-      for (size_type __i = 0; __i < __n; ++__i)
-	{
-	  _Node* __p = __array[__i];
-	  while (__p)
-	    {
-	      _Node* __tmp = __p;
-	      __p = __p->_M_next;
-	      _M_deallocate_node(__tmp);
-	    }
-	  __array[__i] = 0;
-	}
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::_Node**
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _M_allocate_buckets(size_type __n)
-    {
-      _Bucket_allocator_type __alloc(_M_node_allocator);
-
-      // We allocate one extra bucket to hold a sentinel, an arbitrary
-      // non-null pointer.  Iterator increment relies on this.
-      _Node** __p = __alloc.allocate(__n + 1);
-      std::fill(__p, __p + __n, (_Node*) 0);
-      __p[__n] = reinterpret_cast<_Node*>(0x1000);
-      return __p;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    void
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _M_deallocate_buckets(_Node** __p, size_type __n)
-    {
-      _Bucket_allocator_type __alloc(_M_node_allocator);
-      __alloc.deallocate(__p, __n + 1);
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _Hashtable(size_type __bucket_hint,
-	       const _H1& __h1, const _H2& __h2, const _Hash& __h,
-	       const _Equal& __eq, const _ExtractKey& __exk,
-	       const allocator_type& __a)
-    : __detail::_Rehash_base<_RehashPolicy, _Hashtable>(),
-      __detail::_Hash_code_base<_Key, _Value, _ExtractKey, _Equal,
-				_H1, _H2, _Hash, __chc>(__exk, __eq,
-							__h1, __h2, __h),
-      __detail::_Map_base<_Key, _Value, _ExtractKey, __uk, _Hashtable>(),
-      _M_node_allocator(__a),
-      _M_bucket_count(0),
-      _M_element_count(0),
-      _M_rehash_policy()
-    {
-      _M_bucket_count = _M_rehash_policy._M_next_bkt(__bucket_hint);
-      _M_buckets = _M_allocate_buckets(_M_bucket_count);
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    template<typename _InputIterator>
-      _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-		 _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-      _Hashtable(_InputIterator __f, _InputIterator __l,
-		 size_type __bucket_hint,
-		 const _H1& __h1, const _H2& __h2, const _Hash& __h,
-		 const _Equal& __eq, const _ExtractKey& __exk,
-		 const allocator_type& __a)
-      : __detail::_Rehash_base<_RehashPolicy, _Hashtable>(),
-	__detail::_Hash_code_base<_Key, _Value, _ExtractKey, _Equal,
-				  _H1, _H2, _Hash, __chc>(__exk, __eq,
-							  __h1, __h2, __h),
-	__detail::_Map_base<_Key, _Value, _ExtractKey, __uk, _Hashtable>(),
-	_M_node_allocator(__a),
-	_M_bucket_count(0),
-	_M_element_count(0),
-	_M_rehash_policy()
-      {
-	_M_bucket_count = std::max(_M_rehash_policy._M_next_bkt(__bucket_hint),
-				   _M_rehash_policy.
-				   _M_bkt_for_elements(__detail::
-						       __distance_fw(__f,
-								     __l)));
-	_M_buckets = _M_allocate_buckets(_M_bucket_count);
-	__try
-	  {
-	    for (; __f != __l; ++__f)
-	      this->insert(*__f);
-	  }
-	__catch(...)
-	  {
-	    clear();
-	    _M_deallocate_buckets(_M_buckets, _M_bucket_count);
-	    __throw_exception_again;
-	  }
-      }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _Hashtable(const _Hashtable& __ht)
-    : __detail::_Rehash_base<_RehashPolicy, _Hashtable>(__ht),
-      __detail::_Hash_code_base<_Key, _Value, _ExtractKey, _Equal,
-				_H1, _H2, _Hash, __chc>(__ht),
-      __detail::_Map_base<_Key, _Value, _ExtractKey, __uk, _Hashtable>(__ht),
-      _M_node_allocator(__ht._M_node_allocator),
-      _M_bucket_count(__ht._M_bucket_count),
-      _M_element_count(__ht._M_element_count),
-      _M_rehash_policy(__ht._M_rehash_policy)
-    {
-      _M_buckets = _M_allocate_buckets(_M_bucket_count);
-      __try
-	{
-	  for (size_type __i = 0; __i < __ht._M_bucket_count; ++__i)
-	    {
-	      _Node* __n = __ht._M_buckets[__i];
-	      _Node** __tail = _M_buckets + __i;
-	      while (__n)
-		{
-		  *__tail = _M_allocate_node(__n->_M_v);
-		  this->_M_copy_code(*__tail, __n);
-		  __tail = &((*__tail)->_M_next);
-		  __n = __n->_M_next;
-		}
-	    }
-	}
-      __catch(...)
-	{
-	  clear();
-	  _M_deallocate_buckets(_M_buckets, _M_bucket_count);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>&
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    operator=(const _Hashtable& __ht)
-    {
-      _Hashtable __tmp(__ht);
-      this->swap(__tmp);
-      return *this;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    ~_Hashtable()
-    {
-      clear();
-      _M_deallocate_buckets(_M_buckets, _M_bucket_count);
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    void
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    swap(_Hashtable& __x)
-    {
-      // The only base class with member variables is hash_code_base.  We
-      // define _Hash_code_base::_M_swap because different specializations
-      // have different members.
-      __detail::_Hash_code_base<_Key, _Value, _ExtractKey, _Equal,
-	_H1, _H2, _Hash, __chc>::_M_swap(__x);
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 431. Swapping containers with unequal allocators.
-      std::__alloc_swap<_Node_allocator_type>::_S_do_it(_M_node_allocator,
-							__x._M_node_allocator);
-
-      std::swap(_M_rehash_policy, __x._M_rehash_policy);
-      std::swap(_M_buckets, __x._M_buckets);
-      std::swap(_M_bucket_count, __x._M_bucket_count);
-      std::swap(_M_element_count, __x._M_element_count);
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    void
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    __rehash_policy(const _RehashPolicy& __pol)
-    {
-      _M_rehash_policy = __pol;
-      size_type __n_bkt = __pol._M_bkt_for_elements(_M_element_count);
-      if (__n_bkt > _M_bucket_count)
-	_M_rehash(__n_bkt);
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::iterator
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    find(const key_type& __k)
-    {
-      typename _Hashtable::_Hash_code_type __code = this->_M_hash_code(__k);
-      std::size_t __n = this->_M_bucket_index(__k, __code, _M_bucket_count);
-      _Node* __p = _M_find_node(_M_buckets[__n], __k, __code);
-      return __p ? iterator(__p, _M_buckets + __n) : this->end();
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::const_iterator
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    find(const key_type& __k) const
-    {
-      typename _Hashtable::_Hash_code_type __code = this->_M_hash_code(__k);
-      std::size_t __n = this->_M_bucket_index(__k, __code, _M_bucket_count);
-      _Node* __p = _M_find_node(_M_buckets[__n], __k, __code);
-      return __p ? const_iterator(__p, _M_buckets + __n) : this->end();
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::size_type
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    count(const key_type& __k) const
-    {
-      typename _Hashtable::_Hash_code_type __code = this->_M_hash_code(__k);
-      std::size_t __n = this->_M_bucket_index(__k, __code, _M_bucket_count);
-      std::size_t __result = 0;
-      for (_Node* __p = _M_buckets[__n]; __p; __p = __p->_M_next)
-	if (this->_M_compare(__k, __code, __p))
-	  ++__result;
-      return __result;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    std::pair<typename _Hashtable<_Key, _Value, _Allocator,
-				  _ExtractKey, _Equal, _H1,
-				  _H2, _Hash, _RehashPolicy,
-				  __chc, __cit, __uk>::iterator,
-	      typename _Hashtable<_Key, _Value, _Allocator,
-				  _ExtractKey, _Equal, _H1,
-				  _H2, _Hash, _RehashPolicy,
-				  __chc, __cit, __uk>::iterator>
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    equal_range(const key_type& __k)
-    {
-      typename _Hashtable::_Hash_code_type __code = this->_M_hash_code(__k);
-      std::size_t __n = this->_M_bucket_index(__k, __code, _M_bucket_count);
-      _Node** __head = _M_buckets + __n;
-      _Node* __p = _M_find_node(*__head, __k, __code);
-
-      if (__p)
-	{
-	  _Node* __p1 = __p->_M_next;
-	  for (; __p1; __p1 = __p1->_M_next)
-	    if (!this->_M_compare(__k, __code, __p1))
-	      break;
-
-	  iterator __first(__p, __head);
-	  iterator __last(__p1, __head);
-	  if (!__p1)
-	    __last._M_incr_bucket();
-	  return std::make_pair(__first, __last);
-	}
-      else
-	return std::make_pair(this->end(), this->end());
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    std::pair<typename _Hashtable<_Key, _Value, _Allocator,
-				  _ExtractKey, _Equal, _H1,
-				  _H2, _Hash, _RehashPolicy,
-				  __chc, __cit, __uk>::const_iterator,
-	      typename _Hashtable<_Key, _Value, _Allocator,
-				  _ExtractKey, _Equal, _H1,
-				  _H2, _Hash, _RehashPolicy,
-				  __chc, __cit, __uk>::const_iterator>
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    equal_range(const key_type& __k) const
-    {
-      typename _Hashtable::_Hash_code_type __code = this->_M_hash_code(__k);
-      std::size_t __n = this->_M_bucket_index(__k, __code, _M_bucket_count);
-      _Node** __head = _M_buckets + __n;
-      _Node* __p = _M_find_node(*__head, __k, __code);
-
-      if (__p)
-	{
-	  _Node* __p1 = __p->_M_next;
-	  for (; __p1; __p1 = __p1->_M_next)
-	    if (!this->_M_compare(__k, __code, __p1))
-	      break;
-
-	  const_iterator __first(__p, __head);
-	  const_iterator __last(__p1, __head);
-	  if (!__p1)
-	    __last._M_incr_bucket();
-	  return std::make_pair(__first, __last);
-	}
-      else
-	return std::make_pair(this->end(), this->end());
-    }
-
-  // Find the node whose key compares equal to k, beginning the search
-  // at p (usually the head of a bucket).  Return zero if no node is found.
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey,
-			_Equal, _H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::_Node*
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _M_find_node(_Node* __p, const key_type& __k,
-		typename _Hashtable::_Hash_code_type __code) const
-    {
-      for (; __p; __p = __p->_M_next)
-	if (this->_M_compare(__k, __code, __p))
-	  return __p;
-      return 0;
-    }
-
-  // Insert v in bucket n (assumes no element with its key already present).
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::iterator
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _M_insert_bucket(const value_type& __v, size_type __n,
-		    typename _Hashtable::_Hash_code_type __code)
-    {
-      std::pair<bool, std::size_t> __do_rehash
-	= _M_rehash_policy._M_need_rehash(_M_bucket_count,
-					  _M_element_count, 1);
-
-      // Allocate the new node before doing the rehash so that we don't
-      // do a rehash if the allocation throws.
-      _Node* __new_node = _M_allocate_node(__v);
-
-      __try
-	{
-	  if (__do_rehash.first)
-	    {
-	      const key_type& __k = this->_M_extract(__v);
-	      __n = this->_M_bucket_index(__k, __code, __do_rehash.second);
-	      _M_rehash(__do_rehash.second);
-	    }
-
-	  __new_node->_M_next = _M_buckets[__n];
-	  this->_M_store_code(__new_node, __code);
-	  _M_buckets[__n] = __new_node;
-	  ++_M_element_count;
-	  return iterator(__new_node, _M_buckets + __n);
-	}
-      __catch(...)
-	{
-	  _M_deallocate_node(__new_node);
-	  __throw_exception_again;
-	}
-    }
-
-  // Insert v if no element with its key is already present.
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    std::pair<typename _Hashtable<_Key, _Value, _Allocator,
-				  _ExtractKey, _Equal, _H1,
-				  _H2, _Hash, _RehashPolicy,
-				  __chc, __cit, __uk>::iterator, bool>
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-  _M_insert(const value_type& __v, std::tr1::true_type)
-    {
-      const key_type& __k = this->_M_extract(__v);
-      typename _Hashtable::_Hash_code_type __code = this->_M_hash_code(__k);
-      size_type __n = this->_M_bucket_index(__k, __code, _M_bucket_count);
-
-      if (_Node* __p = _M_find_node(_M_buckets[__n], __k, __code))
-	return std::make_pair(iterator(__p, _M_buckets + __n), false);
-      return std::make_pair(_M_insert_bucket(__v, __n, __code), true);
-    }
-
-  // Insert v unconditionally.
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::iterator
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _M_insert(const value_type& __v, std::tr1::false_type)
-    {
-      std::pair<bool, std::size_t> __do_rehash
-	= _M_rehash_policy._M_need_rehash(_M_bucket_count,
-					  _M_element_count, 1);
-      if (__do_rehash.first)
-	_M_rehash(__do_rehash.second);
-
-      const key_type& __k = this->_M_extract(__v);
-      typename _Hashtable::_Hash_code_type __code = this->_M_hash_code(__k);
-      size_type __n = this->_M_bucket_index(__k, __code, _M_bucket_count);
-
-      // First find the node, avoid leaking new_node if compare throws.
-      _Node* __prev = _M_find_node(_M_buckets[__n], __k, __code);
-      _Node* __new_node = _M_allocate_node(__v);
-
-      if (__prev)
-	{
-	  __new_node->_M_next = __prev->_M_next;
-	  __prev->_M_next = __new_node;
-	}
-      else
-	{
-	  __new_node->_M_next = _M_buckets[__n];
-	  _M_buckets[__n] = __new_node;
-	}
-      this->_M_store_code(__new_node, __code);
-
-      ++_M_element_count;
-      return iterator(__new_node, _M_buckets + __n);
-    }
-
-  // For erase(iterator) and erase(const_iterator).
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    void
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _M_erase_node(_Node* __p, _Node** __b)
-    {
-      _Node* __cur = *__b;
-      if (__cur == __p)
-	*__b = __cur->_M_next;
-      else
-	{
-	  _Node* __next = __cur->_M_next;
-	  while (__next != __p)
-	    {
-	      __cur = __next;
-	      __next = __cur->_M_next;
-	    }
-	  __cur->_M_next = __next->_M_next;
-	}
-
-      _M_deallocate_node(__p);
-      --_M_element_count;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    template<typename _InputIterator>
-      void
-      _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-		 _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-      insert(_InputIterator __first, _InputIterator __last)
-      {
-	size_type __n_elt = __detail::__distance_fw(__first, __last);
-	std::pair<bool, std::size_t> __do_rehash
-	  = _M_rehash_policy._M_need_rehash(_M_bucket_count,
-					    _M_element_count, __n_elt);
-	if (__do_rehash.first)
-	  _M_rehash(__do_rehash.second);
-
-	for (; __first != __last; ++__first)
-	  this->insert(*__first);
-      }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::iterator
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    erase(iterator __it)
-    {
-      iterator __result = __it;
-      ++__result;
-      _M_erase_node(__it._M_cur_node, __it._M_cur_bucket);
-      return __result;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::const_iterator
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    erase(const_iterator __it)
-    {
-      const_iterator __result = __it;
-      ++__result;
-      _M_erase_node(__it._M_cur_node, __it._M_cur_bucket);
-      return __result;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::size_type
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    erase(const key_type& __k)
-    {
-      typename _Hashtable::_Hash_code_type __code = this->_M_hash_code(__k);
-      std::size_t __n = this->_M_bucket_index(__k, __code, _M_bucket_count);
-      size_type __result = 0;
-
-      _Node** __slot = _M_buckets + __n;
-      while (*__slot && !this->_M_compare(__k, __code, *__slot))
-	__slot = &((*__slot)->_M_next);
-
-      _Node** __saved_slot = 0;
-      while (*__slot && this->_M_compare(__k, __code, *__slot))
-	{
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 526. Is it undefined if a function in the standard changes
-	  // in parameters?
-	  if (&this->_M_extract((*__slot)->_M_v) != &__k)
-	    {
-	      _Node* __p = *__slot;
-	      *__slot = __p->_M_next;
-	      _M_deallocate_node(__p);
-	      --_M_element_count;
-	      ++__result;
-	    }
-	  else
-	    {
-	      __saved_slot = __slot;
-	      __slot = &((*__slot)->_M_next);
-	    }
-	}
-
-      if (__saved_slot)
-	{
-	  _Node* __p = *__saved_slot;
-	  *__saved_slot = __p->_M_next;
-	  _M_deallocate_node(__p);
-	  --_M_element_count;
-	  ++__result;
-	}
-
-      return __result;
-    }
-
-  // ??? This could be optimized by taking advantage of the bucket
-  // structure, but it's not clear that it's worth doing.  It probably
-  // wouldn't even be an optimization unless the load factor is large.
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::iterator
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    erase(iterator __first, iterator __last)
-    {
-      while (__first != __last)
-	__first = this->erase(__first);
-      return __last;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    typename _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-			_H1, _H2, _Hash, _RehashPolicy,
-			__chc, __cit, __uk>::const_iterator
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    erase(const_iterator __first, const_iterator __last)
-    {
-      while (__first != __last)
-	__first = this->erase(__first);
-      return __last;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    void
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    clear()
-    {
-      _M_deallocate_nodes(_M_buckets, _M_bucket_count);
-      _M_element_count = 0;
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    void
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    rehash(size_type __n)
-    {
-      _M_rehash(std::max(_M_rehash_policy._M_next_bkt(__n),
-			 _M_rehash_policy._M_bkt_for_elements(_M_element_count
-							      + 1)));
-    }
-
-  template<typename _Key, typename _Value,
-	   typename _Allocator, typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
-	   bool __chc, bool __cit, bool __uk>
-    void
-    _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
-	       _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
-    _M_rehash(size_type __n)
-    {
-      _Node** __new_array = _M_allocate_buckets(__n);
-      __try
-	{
-	  for (size_type __i = 0; __i < _M_bucket_count; ++__i)
-	    while (_Node* __p = _M_buckets[__i])
-	      {
-		std::size_t __new_index = this->_M_bucket_index(__p, __n);
-		_M_buckets[__i] = __p->_M_next;
-		__p->_M_next = __new_array[__new_index];
-		__new_array[__new_index] = __p;
-	      }
-	  _M_deallocate_buckets(_M_buckets, _M_bucket_count);
-	  _M_bucket_count = __n;
-	  _M_buckets = __new_array;
-	}
-      __catch(...)
-	{
-	  // A failure here means that a hash function threw an exception.
-	  // We can't restore the previous state without calling the hash
-	  // function again, so the only sensible recovery is to delete
-	  // everything.
-	  _M_deallocate_nodes(__new_array, __n);
-	  _M_deallocate_buckets(__new_array, __n);
-	  _M_deallocate_nodes(_M_buckets, _M_bucket_count);
-	  _M_element_count = 0;
-	  __throw_exception_again;
-	}
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace tr1
-} // namespace std
-
-#endif // _GLIBCXX_TR1_HASHTABLE_H
diff --git a/openflow/usr/include/c++/5/tr1/hashtable_policy.h b/openflow/usr/include/c++/5/tr1/hashtable_policy.h
deleted file mode 100644
index 0ad8cfd..0000000
--- a/openflow/usr/include/c++/5/tr1/hashtable_policy.h
+++ /dev/null
@@ -1,783 +0,0 @@
-// Internal policy header for TR1 unordered_set and unordered_map -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/hashtable_policy.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. 
- *  @headername{tr1/unordered_map, tr1/unordered_set}
- */
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{ 
-namespace tr1
-{
-namespace __detail
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Helper function: return distance(first, last) for forward
-  // iterators, or 0 for input iterators.
-  template<class _Iterator>
-    inline typename std::iterator_traits<_Iterator>::difference_type
-    __distance_fw(_Iterator __first, _Iterator __last,
-		  std::input_iterator_tag)
-    { return 0; }
-
-  template<class _Iterator>
-    inline typename std::iterator_traits<_Iterator>::difference_type
-    __distance_fw(_Iterator __first, _Iterator __last,
-		  std::forward_iterator_tag)
-    { return std::distance(__first, __last); }
-
-  template<class _Iterator>
-    inline typename std::iterator_traits<_Iterator>::difference_type
-    __distance_fw(_Iterator __first, _Iterator __last)
-    {
-      typedef typename std::iterator_traits<_Iterator>::iterator_category _Tag;
-      return __distance_fw(__first, __last, _Tag());
-    }
-
-  // Auxiliary types used for all instantiations of _Hashtable: nodes
-  // and iterators.
-  
-  // Nodes, used to wrap elements stored in the hash table.  A policy
-  // template parameter of class template _Hashtable controls whether
-  // nodes also store a hash code. In some cases (e.g. strings) this
-  // may be a performance win.
-  template<typename _Value, bool __cache_hash_code>
-    struct _Hash_node;
-
-  template<typename _Value>
-    struct _Hash_node<_Value, true>
-    {
-      _Value       _M_v;
-      std::size_t  _M_hash_code;
-      _Hash_node*  _M_next;
-    };
-
-  template<typename _Value>
-    struct _Hash_node<_Value, false>
-    {
-      _Value       _M_v;
-      _Hash_node*  _M_next;
-    };
-
-  // Local iterators, used to iterate within a bucket but not between
-  // buckets.
-  template<typename _Value, bool __cache>
-    struct _Node_iterator_base
-    {
-      _Node_iterator_base(_Hash_node<_Value, __cache>* __p)
-      : _M_cur(__p) { }
-      
-      void
-      _M_incr()
-      { _M_cur = _M_cur->_M_next; }
-
-      _Hash_node<_Value, __cache>*  _M_cur;
-    };
-
-  template<typename _Value, bool __cache>
-    inline bool
-    operator==(const _Node_iterator_base<_Value, __cache>& __x,
-	       const _Node_iterator_base<_Value, __cache>& __y)
-    { return __x._M_cur == __y._M_cur; }
-
-  template<typename _Value, bool __cache>
-    inline bool
-    operator!=(const _Node_iterator_base<_Value, __cache>& __x,
-	       const _Node_iterator_base<_Value, __cache>& __y)
-    { return __x._M_cur != __y._M_cur; }
-
-  template<typename _Value, bool __constant_iterators, bool __cache>
-    struct _Node_iterator
-    : public _Node_iterator_base<_Value, __cache>
-    {
-      typedef _Value                                   value_type;
-      typedef typename
-      __gnu_cxx::__conditional_type<__constant_iterators,
-				    const _Value*, _Value*>::__type
-                                                       pointer;
-      typedef typename
-      __gnu_cxx::__conditional_type<__constant_iterators,
-				    const _Value&, _Value&>::__type
-                                                       reference;
-      typedef std::ptrdiff_t                           difference_type;
-      typedef std::forward_iterator_tag                iterator_category;
-
-      _Node_iterator()
-      : _Node_iterator_base<_Value, __cache>(0) { }
-
-      explicit
-      _Node_iterator(_Hash_node<_Value, __cache>* __p)
-      : _Node_iterator_base<_Value, __cache>(__p) { }
-
-      reference
-      operator*() const
-      { return this->_M_cur->_M_v; }
-  
-      pointer
-      operator->() const
-      { return std::__addressof(this->_M_cur->_M_v); }
-
-      _Node_iterator&
-      operator++()
-      { 
-	this->_M_incr();
-	return *this; 
-      }
-  
-      _Node_iterator
-      operator++(int)
-      { 
-	_Node_iterator __tmp(*this);
-	this->_M_incr();
-	return __tmp;
-      }
-    };
-
-  template<typename _Value, bool __constant_iterators, bool __cache>
-    struct _Node_const_iterator
-    : public _Node_iterator_base<_Value, __cache>
-    {
-      typedef _Value                                   value_type;
-      typedef const _Value*                            pointer;
-      typedef const _Value&                            reference;
-      typedef std::ptrdiff_t                           difference_type;
-      typedef std::forward_iterator_tag                iterator_category;
-
-      _Node_const_iterator()
-      : _Node_iterator_base<_Value, __cache>(0) { }
-
-      explicit
-      _Node_const_iterator(_Hash_node<_Value, __cache>* __p)
-      : _Node_iterator_base<_Value, __cache>(__p) { }
-
-      _Node_const_iterator(const _Node_iterator<_Value, __constant_iterators,
-			   __cache>& __x)
-      : _Node_iterator_base<_Value, __cache>(__x._M_cur) { }
-
-      reference
-      operator*() const
-      { return this->_M_cur->_M_v; }
-  
-      pointer
-      operator->() const
-      { return std::__addressof(this->_M_cur->_M_v); }
-
-      _Node_const_iterator&
-      operator++()
-      { 
-	this->_M_incr();
-	return *this; 
-      }
-  
-      _Node_const_iterator
-      operator++(int)
-      { 
-	_Node_const_iterator __tmp(*this);
-	this->_M_incr();
-	return __tmp;
-      }
-    };
-
-  template<typename _Value, bool __cache>
-    struct _Hashtable_iterator_base
-    {
-      _Hashtable_iterator_base(_Hash_node<_Value, __cache>* __node,
-			       _Hash_node<_Value, __cache>** __bucket)
-      : _M_cur_node(__node), _M_cur_bucket(__bucket) { }
-
-      void
-      _M_incr()
-      {
-	_M_cur_node = _M_cur_node->_M_next;
-	if (!_M_cur_node)
-	  _M_incr_bucket();
-      }
-
-      void
-      _M_incr_bucket();
-
-      _Hash_node<_Value, __cache>*   _M_cur_node;
-      _Hash_node<_Value, __cache>**  _M_cur_bucket;
-    };
-
-  // Global iterators, used for arbitrary iteration within a hash
-  // table.  Larger and more expensive than local iterators.
-  template<typename _Value, bool __cache>
-    void
-    _Hashtable_iterator_base<_Value, __cache>::
-    _M_incr_bucket()
-    {
-      ++_M_cur_bucket;
-
-      // This loop requires the bucket array to have a non-null sentinel.
-      while (!*_M_cur_bucket)
-	++_M_cur_bucket;
-      _M_cur_node = *_M_cur_bucket;
-    }
-
-  template<typename _Value, bool __cache>
-    inline bool
-    operator==(const _Hashtable_iterator_base<_Value, __cache>& __x,
-	       const _Hashtable_iterator_base<_Value, __cache>& __y)
-    { return __x._M_cur_node == __y._M_cur_node; }
-
-  template<typename _Value, bool __cache>
-    inline bool
-    operator!=(const _Hashtable_iterator_base<_Value, __cache>& __x,
-	       const _Hashtable_iterator_base<_Value, __cache>& __y)
-    { return __x._M_cur_node != __y._M_cur_node; }
-
-  template<typename _Value, bool __constant_iterators, bool __cache>
-    struct _Hashtable_iterator
-    : public _Hashtable_iterator_base<_Value, __cache>
-    {
-      typedef _Value                                   value_type;
-      typedef typename
-      __gnu_cxx::__conditional_type<__constant_iterators,
-				    const _Value*, _Value*>::__type
-                                                       pointer;
-      typedef typename
-      __gnu_cxx::__conditional_type<__constant_iterators,
-				    const _Value&, _Value&>::__type
-                                                       reference;
-      typedef std::ptrdiff_t                           difference_type;
-      typedef std::forward_iterator_tag                iterator_category;
-
-      _Hashtable_iterator()
-      : _Hashtable_iterator_base<_Value, __cache>(0, 0) { }
-
-      _Hashtable_iterator(_Hash_node<_Value, __cache>* __p,
-			  _Hash_node<_Value, __cache>** __b)
-      : _Hashtable_iterator_base<_Value, __cache>(__p, __b) { }
-
-      explicit
-      _Hashtable_iterator(_Hash_node<_Value, __cache>** __b)
-      : _Hashtable_iterator_base<_Value, __cache>(*__b, __b) { }
-
-      reference
-      operator*() const
-      { return this->_M_cur_node->_M_v; }
-  
-      pointer
-      operator->() const
-      { return std::__addressof(this->_M_cur_node->_M_v); }
-
-      _Hashtable_iterator&
-      operator++()
-      { 
-	this->_M_incr();
-	return *this;
-      }
-  
-      _Hashtable_iterator
-      operator++(int)
-      { 
-	_Hashtable_iterator __tmp(*this);
-	this->_M_incr();
-	return __tmp;
-      }
-    };
-
-  template<typename _Value, bool __constant_iterators, bool __cache>
-    struct _Hashtable_const_iterator
-    : public _Hashtable_iterator_base<_Value, __cache>
-    {
-      typedef _Value                                   value_type;
-      typedef const _Value*                            pointer;
-      typedef const _Value&                            reference;
-      typedef std::ptrdiff_t                           difference_type;
-      typedef std::forward_iterator_tag                iterator_category;
-
-      _Hashtable_const_iterator()
-      : _Hashtable_iterator_base<_Value, __cache>(0, 0) { }
-
-      _Hashtable_const_iterator(_Hash_node<_Value, __cache>* __p,
-				_Hash_node<_Value, __cache>** __b)
-      : _Hashtable_iterator_base<_Value, __cache>(__p, __b) { }
-
-      explicit
-      _Hashtable_const_iterator(_Hash_node<_Value, __cache>** __b)
-      : _Hashtable_iterator_base<_Value, __cache>(*__b, __b) { }
-
-      _Hashtable_const_iterator(const _Hashtable_iterator<_Value,
-				__constant_iterators, __cache>& __x)
-      : _Hashtable_iterator_base<_Value, __cache>(__x._M_cur_node,
-						  __x._M_cur_bucket) { }
-
-      reference
-      operator*() const
-      { return this->_M_cur_node->_M_v; }
-  
-      pointer
-      operator->() const
-      { return std::__addressof(this->_M_cur_node->_M_v); }
-
-      _Hashtable_const_iterator&
-      operator++()
-      { 
-	this->_M_incr();
-	return *this;
-      }
-  
-      _Hashtable_const_iterator
-      operator++(int)
-      { 
-	_Hashtable_const_iterator __tmp(*this);
-	this->_M_incr();
-	return __tmp;
-      }
-    };
-
-
-  // Many of class template _Hashtable's template parameters are policy
-  // classes.  These are defaults for the policies.
-
-  // Default range hashing function: use division to fold a large number
-  // into the range [0, N).
-  struct _Mod_range_hashing
-  {
-    typedef std::size_t first_argument_type;
-    typedef std::size_t second_argument_type;
-    typedef std::size_t result_type;
-
-    result_type
-    operator()(first_argument_type __num, second_argument_type __den) const
-    { return __num % __den; }
-  };
-
-  // Default ranged hash function H.  In principle it should be a
-  // function object composed from objects of type H1 and H2 such that
-  // h(k, N) = h2(h1(k), N), but that would mean making extra copies of
-  // h1 and h2.  So instead we'll just use a tag to tell class template
-  // hashtable to do that composition.
-  struct _Default_ranged_hash { };
-
-  // Default value for rehash policy.  Bucket size is (usually) the
-  // smallest prime that keeps the load factor small enough.
-  struct _Prime_rehash_policy
-  {
-    _Prime_rehash_policy(float __z = 1.0)
-    : _M_max_load_factor(__z), _M_growth_factor(2.f), _M_next_resize(0) { }
-
-    float
-    max_load_factor() const
-    { return _M_max_load_factor; }      
-
-    // Return a bucket size no smaller than n.
-    std::size_t
-    _M_next_bkt(std::size_t __n) const;
-    
-    // Return a bucket count appropriate for n elements
-    std::size_t
-    _M_bkt_for_elements(std::size_t __n) const;
-    
-    // __n_bkt is current bucket count, __n_elt is current element count,
-    // and __n_ins is number of elements to be inserted.  Do we need to
-    // increase bucket count?  If so, return make_pair(true, n), where n
-    // is the new bucket count.  If not, return make_pair(false, 0).
-    std::pair<bool, std::size_t>
-    _M_need_rehash(std::size_t __n_bkt, std::size_t __n_elt,
-		   std::size_t __n_ins) const;
-
-    enum { _S_n_primes = sizeof(unsigned long) != 8 ? 256 : 256 + 48 };
-
-    float                _M_max_load_factor;
-    float                _M_growth_factor;
-    mutable std::size_t  _M_next_resize;
-  };
-
-  extern const unsigned long __prime_list[];
-
-  // XXX This is a hack.  There's no good reason for any of
-  // _Prime_rehash_policy's member functions to be inline.  
-
-  // Return a prime no smaller than n.
-  inline std::size_t
-  _Prime_rehash_policy::
-  _M_next_bkt(std::size_t __n) const
-  {
-    const unsigned long* __p = std::lower_bound(__prime_list, __prime_list
-						+ _S_n_primes, __n);
-    _M_next_resize = 
-      static_cast<std::size_t>(__builtin_ceil(*__p * _M_max_load_factor));
-    return *__p;
-  }
-
-  // Return the smallest prime p such that alpha p >= n, where alpha
-  // is the load factor.
-  inline std::size_t
-  _Prime_rehash_policy::
-  _M_bkt_for_elements(std::size_t __n) const
-  {
-    const float __min_bkts = __n / _M_max_load_factor;
-    const unsigned long* __p = std::lower_bound(__prime_list, __prime_list
-						+ _S_n_primes, __min_bkts);
-    _M_next_resize =
-      static_cast<std::size_t>(__builtin_ceil(*__p * _M_max_load_factor));
-    return *__p;
-  }
-
-  // Finds the smallest prime p such that alpha p > __n_elt + __n_ins.
-  // If p > __n_bkt, return make_pair(true, p); otherwise return
-  // make_pair(false, 0).  In principle this isn't very different from 
-  // _M_bkt_for_elements.
-
-  // The only tricky part is that we're caching the element count at
-  // which we need to rehash, so we don't have to do a floating-point
-  // multiply for every insertion.
-
-  inline std::pair<bool, std::size_t>
-  _Prime_rehash_policy::
-  _M_need_rehash(std::size_t __n_bkt, std::size_t __n_elt,
-		 std::size_t __n_ins) const
-  {
-    if (__n_elt + __n_ins > _M_next_resize)
-      {
-	float __min_bkts = ((float(__n_ins) + float(__n_elt))
-			    / _M_max_load_factor);
-	if (__min_bkts > __n_bkt)
-	  {
-	    __min_bkts = std::max(__min_bkts, _M_growth_factor * __n_bkt);
-	    const unsigned long* __p =
-	      std::lower_bound(__prime_list, __prime_list + _S_n_primes,
-			       __min_bkts);
-	    _M_next_resize = static_cast<std::size_t>
-	      (__builtin_ceil(*__p * _M_max_load_factor));
-	    return std::make_pair(true, *__p);
-	  }
-	else 
-	  {
-	    _M_next_resize = static_cast<std::size_t>
-	      (__builtin_ceil(__n_bkt * _M_max_load_factor));
-	    return std::make_pair(false, 0);
-	  }
-      }
-    else
-      return std::make_pair(false, 0);
-  }
-
-  // Base classes for std::tr1::_Hashtable.  We define these base
-  // classes because in some cases we want to do different things
-  // depending on the value of a policy class.  In some cases the
-  // policy class affects which member functions and nested typedefs
-  // are defined; we handle that by specializing base class templates.
-  // Several of the base class templates need to access other members
-  // of class template _Hashtable, so we use the "curiously recurring
-  // template pattern" for them.
-
-  // class template _Map_base.  If the hashtable has a value type of the
-  // form pair<T1, T2> and a key extraction policy that returns the
-  // first part of the pair, the hashtable gets a mapped_type typedef.
-  // If it satisfies those criteria and also has unique keys, then it
-  // also gets an operator[].  
-  template<typename _Key, typename _Value, typename _Ex, bool __unique,
-	   typename _Hashtable>
-    struct _Map_base { };
-	  
-  template<typename _Key, typename _Pair, typename _Hashtable>
-    struct _Map_base<_Key, _Pair, std::_Select1st<_Pair>, false, _Hashtable>
-    {
-      typedef typename _Pair::second_type mapped_type;
-    };
-
-  template<typename _Key, typename _Pair, typename _Hashtable>
-    struct _Map_base<_Key, _Pair, std::_Select1st<_Pair>, true, _Hashtable>
-    {
-      typedef typename _Pair::second_type mapped_type;
-      
-      mapped_type&
-      operator[](const _Key& __k);
-    };
-
-  template<typename _Key, typename _Pair, typename _Hashtable>
-    typename _Map_base<_Key, _Pair, std::_Select1st<_Pair>,
-		       true, _Hashtable>::mapped_type&
-    _Map_base<_Key, _Pair, std::_Select1st<_Pair>, true, _Hashtable>::
-    operator[](const _Key& __k)
-    {
-      _Hashtable* __h = static_cast<_Hashtable*>(this);
-      typename _Hashtable::_Hash_code_type __code = __h->_M_hash_code(__k);
-      std::size_t __n = __h->_M_bucket_index(__k, __code,
-					     __h->_M_bucket_count);
-
-      typename _Hashtable::_Node* __p =
-	__h->_M_find_node(__h->_M_buckets[__n], __k, __code);
-      if (!__p)
-	return __h->_M_insert_bucket(std::make_pair(__k, mapped_type()),
-				     __n, __code)->second;
-      return (__p->_M_v).second;
-    }
-
-  // class template _Rehash_base.  Give hashtable the max_load_factor
-  // functions iff the rehash policy is _Prime_rehash_policy.
-  template<typename _RehashPolicy, typename _Hashtable>
-    struct _Rehash_base { };
-
-  template<typename _Hashtable>
-    struct _Rehash_base<_Prime_rehash_policy, _Hashtable>
-    {
-      float
-      max_load_factor() const
-      {
-	const _Hashtable* __this = static_cast<const _Hashtable*>(this);
-	return __this->__rehash_policy().max_load_factor();
-      }
-
-      void
-      max_load_factor(float __z)
-      {
-	_Hashtable* __this = static_cast<_Hashtable*>(this);
-	__this->__rehash_policy(_Prime_rehash_policy(__z));
-      }
-    };
-
-  // Class template _Hash_code_base.  Encapsulates two policy issues that
-  // aren't quite orthogonal.
-  //   (1) the difference between using a ranged hash function and using
-  //       the combination of a hash function and a range-hashing function.
-  //       In the former case we don't have such things as hash codes, so
-  //       we have a dummy type as placeholder.
-  //   (2) Whether or not we cache hash codes.  Caching hash codes is
-  //       meaningless if we have a ranged hash function.
-  // We also put the key extraction and equality comparison function 
-  // objects here, for convenience.
-  
-  // Primary template: unused except as a hook for specializations.  
-  template<typename _Key, typename _Value,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash,
-	   bool __cache_hash_code>
-    struct _Hash_code_base;
-
-  // Specialization: ranged hash function, no caching hash codes.  H1
-  // and H2 are provided but ignored.  We define a dummy hash code type.
-  template<typename _Key, typename _Value,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash>
-    struct _Hash_code_base<_Key, _Value, _ExtractKey, _Equal, _H1, _H2,
-			   _Hash, false>
-    {
-    protected:
-      _Hash_code_base(const _ExtractKey& __ex, const _Equal& __eq,
-		      const _H1&, const _H2&, const _Hash& __h)
-      : _M_extract(__ex), _M_eq(__eq), _M_ranged_hash(__h) { }
-
-      typedef void* _Hash_code_type;
-  
-      _Hash_code_type
-      _M_hash_code(const _Key& __key) const
-      { return 0; }
-  
-      std::size_t
-      _M_bucket_index(const _Key& __k, _Hash_code_type,
-		      std::size_t __n) const
-      { return _M_ranged_hash(__k, __n); }
-
-      std::size_t
-      _M_bucket_index(const _Hash_node<_Value, false>* __p,
-		      std::size_t __n) const
-      { return _M_ranged_hash(_M_extract(__p->_M_v), __n); }
-  
-      bool
-      _M_compare(const _Key& __k, _Hash_code_type,
-		 _Hash_node<_Value, false>* __n) const
-      { return _M_eq(__k, _M_extract(__n->_M_v)); }
-
-      void
-      _M_store_code(_Hash_node<_Value, false>*, _Hash_code_type) const
-      { }
-
-      void
-      _M_copy_code(_Hash_node<_Value, false>*,
-		   const _Hash_node<_Value, false>*) const
-      { }
-      
-      void
-      _M_swap(_Hash_code_base& __x)
-      {
-	std::swap(_M_extract, __x._M_extract);
-	std::swap(_M_eq, __x._M_eq);
-	std::swap(_M_ranged_hash, __x._M_ranged_hash);
-      }
-
-    protected:
-      _ExtractKey  _M_extract;
-      _Equal       _M_eq;
-      _Hash        _M_ranged_hash;
-    };
-
-
-  // No specialization for ranged hash function while caching hash codes.
-  // That combination is meaningless, and trying to do it is an error.
-  
-  
-  // Specialization: ranged hash function, cache hash codes.  This
-  // combination is meaningless, so we provide only a declaration
-  // and no definition.  
-  template<typename _Key, typename _Value,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2, typename _Hash>
-    struct _Hash_code_base<_Key, _Value, _ExtractKey, _Equal, _H1, _H2,
-			   _Hash, true>;
-
-  // Specialization: hash function and range-hashing function, no
-  // caching of hash codes.  H is provided but ignored.  Provides
-  // typedef and accessor required by TR1.  
-  template<typename _Key, typename _Value,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2>
-    struct _Hash_code_base<_Key, _Value, _ExtractKey, _Equal, _H1, _H2,
-			   _Default_ranged_hash, false>
-    {
-      typedef _H1 hasher;
-
-      hasher
-      hash_function() const
-      { return _M_h1; }
-
-    protected:
-      _Hash_code_base(const _ExtractKey& __ex, const _Equal& __eq,
-		      const _H1& __h1, const _H2& __h2,
-		      const _Default_ranged_hash&)
-      : _M_extract(__ex), _M_eq(__eq), _M_h1(__h1), _M_h2(__h2) { }
-
-      typedef std::size_t _Hash_code_type;
-
-      _Hash_code_type
-      _M_hash_code(const _Key& __k) const
-      { return _M_h1(__k); }
-      
-      std::size_t
-      _M_bucket_index(const _Key&, _Hash_code_type __c,
-		      std::size_t __n) const
-      { return _M_h2(__c, __n); }
-
-      std::size_t
-      _M_bucket_index(const _Hash_node<_Value, false>* __p,
-		      std::size_t __n) const
-      { return _M_h2(_M_h1(_M_extract(__p->_M_v)), __n); }
-
-      bool
-      _M_compare(const _Key& __k, _Hash_code_type,
-		 _Hash_node<_Value, false>* __n) const
-      { return _M_eq(__k, _M_extract(__n->_M_v)); }
-
-      void
-      _M_store_code(_Hash_node<_Value, false>*, _Hash_code_type) const
-      { }
-
-      void
-      _M_copy_code(_Hash_node<_Value, false>*,
-		   const _Hash_node<_Value, false>*) const
-      { }
-
-      void
-      _M_swap(_Hash_code_base& __x)
-      {
-	std::swap(_M_extract, __x._M_extract);
-	std::swap(_M_eq, __x._M_eq);
-	std::swap(_M_h1, __x._M_h1);
-	std::swap(_M_h2, __x._M_h2);
-      }
-
-    protected:
-      _ExtractKey  _M_extract;
-      _Equal       _M_eq;
-      _H1          _M_h1;
-      _H2          _M_h2;
-    };
-
-  // Specialization: hash function and range-hashing function, 
-  // caching hash codes.  H is provided but ignored.  Provides
-  // typedef and accessor required by TR1.
-  template<typename _Key, typename _Value,
-	   typename _ExtractKey, typename _Equal,
-	   typename _H1, typename _H2>
-    struct _Hash_code_base<_Key, _Value, _ExtractKey, _Equal, _H1, _H2,
-			   _Default_ranged_hash, true>
-    {
-      typedef _H1 hasher;
-      
-      hasher
-      hash_function() const
-      { return _M_h1; }
-
-    protected:
-      _Hash_code_base(const _ExtractKey& __ex, const _Equal& __eq,
-		      const _H1& __h1, const _H2& __h2,
-		      const _Default_ranged_hash&)
-      : _M_extract(__ex), _M_eq(__eq), _M_h1(__h1), _M_h2(__h2) { }
-
-      typedef std::size_t _Hash_code_type;
-  
-      _Hash_code_type
-      _M_hash_code(const _Key& __k) const
-      { return _M_h1(__k); }
-  
-      std::size_t
-      _M_bucket_index(const _Key&, _Hash_code_type __c,
-		      std::size_t __n) const
-      { return _M_h2(__c, __n); }
-
-      std::size_t
-      _M_bucket_index(const _Hash_node<_Value, true>* __p,
-		      std::size_t __n) const
-      { return _M_h2(__p->_M_hash_code, __n); }
-
-      bool
-      _M_compare(const _Key& __k, _Hash_code_type __c,
-		 _Hash_node<_Value, true>* __n) const
-      { return __c == __n->_M_hash_code && _M_eq(__k, _M_extract(__n->_M_v)); }
-
-      void
-      _M_store_code(_Hash_node<_Value, true>* __n, _Hash_code_type __c) const
-      { __n->_M_hash_code = __c; }
-
-      void
-      _M_copy_code(_Hash_node<_Value, true>* __to,
-		   const _Hash_node<_Value, true>* __from) const
-      { __to->_M_hash_code = __from->_M_hash_code; }
-
-      void
-      _M_swap(_Hash_code_base& __x)
-      {
-	std::swap(_M_extract, __x._M_extract);
-	std::swap(_M_eq, __x._M_eq);
-	std::swap(_M_h1, __x._M_h1);
-	std::swap(_M_h2, __x._M_h2);
-      }
-      
-    protected:
-      _ExtractKey  _M_extract;
-      _Equal       _M_eq;
-      _H1          _M_h1;
-      _H2          _M_h2;
-    };
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __detail
-}
-}
diff --git a/openflow/usr/include/c++/5/tr1/hypergeometric.tcc b/openflow/usr/include/c++/5/tr1/hypergeometric.tcc
deleted file mode 100644
index f1a4021..0000000
--- a/openflow/usr/include/c++/5/tr1/hypergeometric.tcc
+++ /dev/null
@@ -1,775 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/hypergeometric.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland based:
-//   (1) Handbook of Mathematical Functions,
-//       ed. Milton Abramowitz and Irene A. Stegun,
-//       Dover Publications,
-//       Section 6, pp. 555-566
-//   (2) The Gnu Scientific Library, http://www.gnu.org/software/gsl
-
-#ifndef _GLIBCXX_TR1_HYPERGEOMETRIC_TCC
-#define _GLIBCXX_TR1_HYPERGEOMETRIC_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.2] Special functions
-
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     *   @brief This routine returns the confluent hypergeometric function
-     *          by series expansion.
-     * 
-     *   @f[
-     *     _1F_1(a;c;x) = \frac{\Gamma(c)}{\Gamma(a)}
-     *                      \sum_{n=0}^{\infty}
-     *                      \frac{\Gamma(a+n)}{\Gamma(c+n)}
-     *                      \frac{x^n}{n!}
-     *   @f]
-     * 
-     *   If a and b are integers and a < 0 and either b > 0 or b < a
-     *   then the series is a polynomial with a finite number of
-     *   terms.  If b is an integer and b <= 0 the confluent
-     *   hypergeometric function is undefined.
-     *
-     *   @param  __a  The "numerator" parameter.
-     *   @param  __c  The "denominator" parameter.
-     *   @param  __x  The argument of the confluent hypergeometric function.
-     *   @return  The confluent hypergeometric function.
-     */
-    template<typename _Tp>
-    _Tp
-    __conf_hyperg_series(_Tp __a, _Tp __c, _Tp __x)
-    {
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-
-      _Tp __term = _Tp(1);
-      _Tp __Fac = _Tp(1);
-      const unsigned int __max_iter = 100000;
-      unsigned int __i;
-      for (__i = 0; __i < __max_iter; ++__i)
-        {
-          __term *= (__a + _Tp(__i)) * __x
-                  / ((__c + _Tp(__i)) * _Tp(1 + __i));
-          if (std::abs(__term) < __eps)
-            {
-              break;
-            }
-          __Fac += __term;
-        }
-      if (__i == __max_iter)
-        std::__throw_runtime_error(__N("Series failed to converge "
-                                       "in __conf_hyperg_series."));
-
-      return __Fac;
-    }
-
-
-    /**
-     *  @brief  Return the hypogeometric function @f$ _2F_1(a,b;c;x) @f$
-     *          by an iterative procedure described in
-     *          Luke, Algorithms for the Computation of Mathematical Functions.
-     *
-     *  Like the case of the 2F1 rational approximations, these are 
-     *  probably guaranteed to converge for x < 0, barring gross    
-     *  numerical instability in the pre-asymptotic regime.         
-     */
-    template<typename _Tp>
-    _Tp
-    __conf_hyperg_luke(_Tp __a, _Tp __c, _Tp __xin)
-    {
-      const _Tp __big = std::pow(std::numeric_limits<_Tp>::max(), _Tp(0.16L));
-      const int __nmax = 20000;
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      const _Tp __x  = -__xin;
-      const _Tp __x3 = __x * __x * __x;
-      const _Tp __t0 = __a / __c;
-      const _Tp __t1 = (__a + _Tp(1)) / (_Tp(2) * __c);
-      const _Tp __t2 = (__a + _Tp(2)) / (_Tp(2) * (__c + _Tp(1)));
-      _Tp __F = _Tp(1);
-      _Tp __prec;
-
-      _Tp __Bnm3 = _Tp(1);
-      _Tp __Bnm2 = _Tp(1) + __t1 * __x;
-      _Tp __Bnm1 = _Tp(1) + __t2 * __x * (_Tp(1) + __t1 / _Tp(3) * __x);
-
-      _Tp __Anm3 = _Tp(1);
-      _Tp __Anm2 = __Bnm2 - __t0 * __x;
-      _Tp __Anm1 = __Bnm1 - __t0 * (_Tp(1) + __t2 * __x) * __x
-                 + __t0 * __t1 * (__c / (__c + _Tp(1))) * __x * __x;
-
-      int __n = 3;
-      while(1)
-        {
-          _Tp __npam1 = _Tp(__n - 1) + __a;
-          _Tp __npcm1 = _Tp(__n - 1) + __c;
-          _Tp __npam2 = _Tp(__n - 2) + __a;
-          _Tp __npcm2 = _Tp(__n - 2) + __c;
-          _Tp __tnm1  = _Tp(2 * __n - 1);
-          _Tp __tnm3  = _Tp(2 * __n - 3);
-          _Tp __tnm5  = _Tp(2 * __n - 5);
-          _Tp __F1 =  (_Tp(__n - 2) - __a) / (_Tp(2) * __tnm3 * __npcm1);
-          _Tp __F2 =  (_Tp(__n) + __a) * __npam1
-                   / (_Tp(4) * __tnm1 * __tnm3 * __npcm2 * __npcm1);
-          _Tp __F3 = -__npam2 * __npam1 * (_Tp(__n - 2) - __a)
-                   / (_Tp(8) * __tnm3 * __tnm3 * __tnm5
-                   * (_Tp(__n - 3) + __c) * __npcm2 * __npcm1);
-          _Tp __E  = -__npam1 * (_Tp(__n - 1) - __c)
-                   / (_Tp(2) * __tnm3 * __npcm2 * __npcm1);
-
-          _Tp __An = (_Tp(1) + __F1 * __x) * __Anm1
-                   + (__E + __F2 * __x) * __x * __Anm2 + __F3 * __x3 * __Anm3;
-          _Tp __Bn = (_Tp(1) + __F1 * __x) * __Bnm1
-                   + (__E + __F2 * __x) * __x * __Bnm2 + __F3 * __x3 * __Bnm3;
-          _Tp __r = __An / __Bn;
-
-          __prec = std::abs((__F - __r) / __F);
-          __F = __r;
-
-          if (__prec < __eps || __n > __nmax)
-            break;
-
-          if (std::abs(__An) > __big || std::abs(__Bn) > __big)
-            {
-              __An   /= __big;
-              __Bn   /= __big;
-              __Anm1 /= __big;
-              __Bnm1 /= __big;
-              __Anm2 /= __big;
-              __Bnm2 /= __big;
-              __Anm3 /= __big;
-              __Bnm3 /= __big;
-            }
-          else if (std::abs(__An) < _Tp(1) / __big
-                || std::abs(__Bn) < _Tp(1) / __big)
-            {
-              __An   *= __big;
-              __Bn   *= __big;
-              __Anm1 *= __big;
-              __Bnm1 *= __big;
-              __Anm2 *= __big;
-              __Bnm2 *= __big;
-              __Anm3 *= __big;
-              __Bnm3 *= __big;
-            }
-
-          ++__n;
-          __Bnm3 = __Bnm2;
-          __Bnm2 = __Bnm1;
-          __Bnm1 = __Bn;
-          __Anm3 = __Anm2;
-          __Anm2 = __Anm1;
-          __Anm1 = __An;
-        }
-
-      if (__n >= __nmax)
-        std::__throw_runtime_error(__N("Iteration failed to converge "
-                                       "in __conf_hyperg_luke."));
-
-      return __F;
-    }
-
-
-    /**
-     *   @brief  Return the confluent hypogeometric function
-     *           @f$ _1F_1(a;c;x) @f$.
-     * 
-     *   @todo  Handle b == nonpositive integer blowup - return NaN.
-     *
-     *   @param  __a  The @a numerator parameter.
-     *   @param  __c  The @a denominator parameter.
-     *   @param  __x  The argument of the confluent hypergeometric function.
-     *   @return  The confluent hypergeometric function.
-     */
-    template<typename _Tp>
-    _Tp
-    __conf_hyperg(_Tp __a, _Tp __c, _Tp __x)
-    {
-#if _GLIBCXX_USE_C99_MATH_TR1
-      const _Tp __c_nint = std::tr1::nearbyint(__c);
-#else
-      const _Tp __c_nint = static_cast<int>(__c + _Tp(0.5L));
-#endif
-      if (__isnan(__a) || __isnan(__c) || __isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__c_nint == __c && __c_nint <= 0)
-        return std::numeric_limits<_Tp>::infinity();
-      else if (__a == _Tp(0))
-        return _Tp(1);
-      else if (__c == __a)
-        return std::exp(__x);
-      else if (__x < _Tp(0))
-        return __conf_hyperg_luke(__a, __c, __x);
-      else
-        return __conf_hyperg_series(__a, __c, __x);
-    }
-
-
-    /**
-     *   @brief Return the hypogeometric function @f$ _2F_1(a,b;c;x) @f$
-     *   by series expansion.
-     * 
-     *   The hypogeometric function is defined by
-     *   @f[
-     *     _2F_1(a,b;c;x) = \frac{\Gamma(c)}{\Gamma(a)\Gamma(b)}
-     *                      \sum_{n=0}^{\infty}
-     *                      \frac{\Gamma(a+n)\Gamma(b+n)}{\Gamma(c+n)}
-     *                      \frac{x^n}{n!}
-     *   @f]
-     * 
-     *   This works and it's pretty fast.
-     *
-     *   @param  __a  The first @a numerator parameter.
-     *   @param  __a  The second @a numerator parameter.
-     *   @param  __c  The @a denominator parameter.
-     *   @param  __x  The argument of the confluent hypergeometric function.
-     *   @return  The confluent hypergeometric function.
-     */
-    template<typename _Tp>
-    _Tp
-    __hyperg_series(_Tp __a, _Tp __b, _Tp __c, _Tp __x)
-    {
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-
-      _Tp __term = _Tp(1);
-      _Tp __Fabc = _Tp(1);
-      const unsigned int __max_iter = 100000;
-      unsigned int __i;
-      for (__i = 0; __i < __max_iter; ++__i)
-        {
-          __term *= (__a + _Tp(__i)) * (__b + _Tp(__i)) * __x
-                  / ((__c + _Tp(__i)) * _Tp(1 + __i));
-          if (std::abs(__term) < __eps)
-            {
-              break;
-            }
-          __Fabc += __term;
-        }
-      if (__i == __max_iter)
-        std::__throw_runtime_error(__N("Series failed to converge "
-                                       "in __hyperg_series."));
-
-      return __Fabc;
-    }
-
-
-    /**
-     *   @brief  Return the hypogeometric function @f$ _2F_1(a,b;c;x) @f$
-     *           by an iterative procedure described in
-     *           Luke, Algorithms for the Computation of Mathematical Functions.
-     */
-    template<typename _Tp>
-    _Tp
-    __hyperg_luke(_Tp __a, _Tp __b, _Tp __c, _Tp __xin)
-    {
-      const _Tp __big = std::pow(std::numeric_limits<_Tp>::max(), _Tp(0.16L));
-      const int __nmax = 20000;
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      const _Tp __x  = -__xin;
-      const _Tp __x3 = __x * __x * __x;
-      const _Tp __t0 = __a * __b / __c;
-      const _Tp __t1 = (__a + _Tp(1)) * (__b + _Tp(1)) / (_Tp(2) * __c);
-      const _Tp __t2 = (__a + _Tp(2)) * (__b + _Tp(2))
-                     / (_Tp(2) * (__c + _Tp(1)));
-
-      _Tp __F = _Tp(1);
-
-      _Tp __Bnm3 = _Tp(1);
-      _Tp __Bnm2 = _Tp(1) + __t1 * __x;
-      _Tp __Bnm1 = _Tp(1) + __t2 * __x * (_Tp(1) + __t1 / _Tp(3) * __x);
-
-      _Tp __Anm3 = _Tp(1);
-      _Tp __Anm2 = __Bnm2 - __t0 * __x;
-      _Tp __Anm1 = __Bnm1 - __t0 * (_Tp(1) + __t2 * __x) * __x
-                 + __t0 * __t1 * (__c / (__c + _Tp(1))) * __x * __x;
-
-      int __n = 3;
-      while (1)
-        {
-          const _Tp __npam1 = _Tp(__n - 1) + __a;
-          const _Tp __npbm1 = _Tp(__n - 1) + __b;
-          const _Tp __npcm1 = _Tp(__n - 1) + __c;
-          const _Tp __npam2 = _Tp(__n - 2) + __a;
-          const _Tp __npbm2 = _Tp(__n - 2) + __b;
-          const _Tp __npcm2 = _Tp(__n - 2) + __c;
-          const _Tp __tnm1  = _Tp(2 * __n - 1);
-          const _Tp __tnm3  = _Tp(2 * __n - 3);
-          const _Tp __tnm5  = _Tp(2 * __n - 5);
-          const _Tp __n2 = __n * __n;
-          const _Tp __F1 = (_Tp(3) * __n2 + (__a + __b - _Tp(6)) * __n
-                         + _Tp(2) - __a * __b - _Tp(2) * (__a + __b))
-                         / (_Tp(2) * __tnm3 * __npcm1);
-          const _Tp __F2 = -(_Tp(3) * __n2 - (__a + __b + _Tp(6)) * __n
-                         + _Tp(2) - __a * __b) * __npam1 * __npbm1
-                         / (_Tp(4) * __tnm1 * __tnm3 * __npcm2 * __npcm1);
-          const _Tp __F3 = (__npam2 * __npam1 * __npbm2 * __npbm1
-                         * (_Tp(__n - 2) - __a) * (_Tp(__n - 2) - __b))
-                         / (_Tp(8) * __tnm3 * __tnm3 * __tnm5
-                         * (_Tp(__n - 3) + __c) * __npcm2 * __npcm1);
-          const _Tp __E  = -__npam1 * __npbm1 * (_Tp(__n - 1) - __c)
-                         / (_Tp(2) * __tnm3 * __npcm2 * __npcm1);
-
-          _Tp __An = (_Tp(1) + __F1 * __x) * __Anm1
-                   + (__E + __F2 * __x) * __x * __Anm2 + __F3 * __x3 * __Anm3;
-          _Tp __Bn = (_Tp(1) + __F1 * __x) * __Bnm1
-                   + (__E + __F2 * __x) * __x * __Bnm2 + __F3 * __x3 * __Bnm3;
-          const _Tp __r = __An / __Bn;
-
-          const _Tp __prec = std::abs((__F - __r) / __F);
-          __F = __r;
-
-          if (__prec < __eps || __n > __nmax)
-            break;
-
-          if (std::abs(__An) > __big || std::abs(__Bn) > __big)
-            {
-              __An   /= __big;
-              __Bn   /= __big;
-              __Anm1 /= __big;
-              __Bnm1 /= __big;
-              __Anm2 /= __big;
-              __Bnm2 /= __big;
-              __Anm3 /= __big;
-              __Bnm3 /= __big;
-            }
-          else if (std::abs(__An) < _Tp(1) / __big
-                || std::abs(__Bn) < _Tp(1) / __big)
-            {
-              __An   *= __big;
-              __Bn   *= __big;
-              __Anm1 *= __big;
-              __Bnm1 *= __big;
-              __Anm2 *= __big;
-              __Bnm2 *= __big;
-              __Anm3 *= __big;
-              __Bnm3 *= __big;
-            }
-
-          ++__n;
-          __Bnm3 = __Bnm2;
-          __Bnm2 = __Bnm1;
-          __Bnm1 = __Bn;
-          __Anm3 = __Anm2;
-          __Anm2 = __Anm1;
-          __Anm1 = __An;
-        }
-
-      if (__n >= __nmax)
-        std::__throw_runtime_error(__N("Iteration failed to converge "
-                                       "in __hyperg_luke."));
-
-      return __F;
-    }
-
-
-    /**
-     *  @brief  Return the hypogeometric function @f$ _2F_1(a,b;c;x) @f$ 
-     *  by the reflection formulae in Abramowitz & Stegun formula
-     *  15.3.6 for d = c - a - b not integral and formula 15.3.11 for
-     *  d = c - a - b integral.  This assumes a, b, c != negative
-     *  integer.
-     *
-     *   The hypogeometric function is defined by
-     *   @f[
-     *     _2F_1(a,b;c;x) = \frac{\Gamma(c)}{\Gamma(a)\Gamma(b)}
-     *                      \sum_{n=0}^{\infty}
-     *                      \frac{\Gamma(a+n)\Gamma(b+n)}{\Gamma(c+n)}
-     *                      \frac{x^n}{n!}
-     *   @f]
-     *
-     *   The reflection formula for nonintegral @f$ d = c - a - b @f$ is:
-     *   @f[
-     *     _2F_1(a,b;c;x) = \frac{\Gamma(c)\Gamma(d)}{\Gamma(c-a)\Gamma(c-b)}
-     *                            _2F_1(a,b;1-d;1-x)
-     *                    + \frac{\Gamma(c)\Gamma(-d)}{\Gamma(a)\Gamma(b)}
-     *                            _2F_1(c-a,c-b;1+d;1-x)
-     *   @f]
-     *
-     *   The reflection formula for integral @f$ m = c - a - b @f$ is:
-     *   @f[
-     *     _2F_1(a,b;a+b+m;x) = \frac{\Gamma(m)\Gamma(a+b+m)}{\Gamma(a+m)\Gamma(b+m)}
-     *                        \sum_{k=0}^{m-1} \frac{(m+a)_k(m+b)_k}{k!(1-m)_k}
-     *                      - 
-     *   @f]
-     */
-    template<typename _Tp>
-    _Tp
-    __hyperg_reflect(_Tp __a, _Tp __b, _Tp __c, _Tp __x)
-    {
-      const _Tp __d = __c - __a - __b;
-      const int __intd  = std::floor(__d + _Tp(0.5L));
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      const _Tp __toler = _Tp(1000) * __eps;
-      const _Tp __log_max = std::log(std::numeric_limits<_Tp>::max());
-      const bool __d_integer = (std::abs(__d - __intd) < __toler);
-
-      if (__d_integer)
-        {
-          const _Tp __ln_omx = std::log(_Tp(1) - __x);
-          const _Tp __ad = std::abs(__d);
-          _Tp __F1, __F2;
-
-          _Tp __d1, __d2;
-          if (__d >= _Tp(0))
-            {
-              __d1 = __d;
-              __d2 = _Tp(0);
-            }
-          else
-            {
-              __d1 = _Tp(0);
-              __d2 = __d;
-            }
-
-          const _Tp __lng_c = __log_gamma(__c);
-
-          //  Evaluate F1.
-          if (__ad < __eps)
-            {
-              //  d = c - a - b = 0.
-              __F1 = _Tp(0);
-            }
-          else
-            {
-
-              bool __ok_d1 = true;
-              _Tp __lng_ad, __lng_ad1, __lng_bd1;
-              __try
-                {
-                  __lng_ad = __log_gamma(__ad);
-                  __lng_ad1 = __log_gamma(__a + __d1);
-                  __lng_bd1 = __log_gamma(__b + __d1);
-                }
-              __catch(...)
-                {
-                  __ok_d1 = false;
-                }
-
-              if (__ok_d1)
-                {
-                  /* Gamma functions in the denominator are ok.
-                   * Proceed with evaluation.
-                   */
-                  _Tp __sum1 = _Tp(1);
-                  _Tp __term = _Tp(1);
-                  _Tp __ln_pre1 = __lng_ad + __lng_c + __d2 * __ln_omx
-                                - __lng_ad1 - __lng_bd1;
-
-                  /* Do F1 sum.
-                   */
-                  for (int __i = 1; __i < __ad; ++__i)
-                    {
-                      const int __j = __i - 1;
-                      __term *= (__a + __d2 + __j) * (__b + __d2 + __j)
-                              / (_Tp(1) + __d2 + __j) / __i * (_Tp(1) - __x);
-                      __sum1 += __term;
-                    }
-
-                  if (__ln_pre1 > __log_max)
-                    std::__throw_runtime_error(__N("Overflow of gamma functions"
-                                                   " in __hyperg_luke."));
-                  else
-                    __F1 = std::exp(__ln_pre1) * __sum1;
-                }
-              else
-                {
-                  //  Gamma functions in the denominator were not ok.
-                  //  So the F1 term is zero.
-                  __F1 = _Tp(0);
-                }
-            } // end F1 evaluation
-
-          // Evaluate F2.
-          bool __ok_d2 = true;
-          _Tp __lng_ad2, __lng_bd2;
-          __try
-            {
-              __lng_ad2 = __log_gamma(__a + __d2);
-              __lng_bd2 = __log_gamma(__b + __d2);
-            }
-          __catch(...)
-            {
-              __ok_d2 = false;
-            }
-
-          if (__ok_d2)
-            {
-              //  Gamma functions in the denominator are ok.
-              //  Proceed with evaluation.
-              const int __maxiter = 2000;
-              const _Tp __psi_1 = -__numeric_constants<_Tp>::__gamma_e();
-              const _Tp __psi_1pd = __psi(_Tp(1) + __ad);
-              const _Tp __psi_apd1 = __psi(__a + __d1);
-              const _Tp __psi_bpd1 = __psi(__b + __d1);
-
-              _Tp __psi_term = __psi_1 + __psi_1pd - __psi_apd1
-                             - __psi_bpd1 - __ln_omx;
-              _Tp __fact = _Tp(1);
-              _Tp __sum2 = __psi_term;
-              _Tp __ln_pre2 = __lng_c + __d1 * __ln_omx
-                            - __lng_ad2 - __lng_bd2;
-
-              // Do F2 sum.
-              int __j;
-              for (__j = 1; __j < __maxiter; ++__j)
-                {
-                  //  Values for psi functions use recurrence;
-                  //  Abramowitz & Stegun 6.3.5
-                  const _Tp __term1 = _Tp(1) / _Tp(__j)
-                                    + _Tp(1) / (__ad + __j);
-                  const _Tp __term2 = _Tp(1) / (__a + __d1 + _Tp(__j - 1))
-                                    + _Tp(1) / (__b + __d1 + _Tp(__j - 1));
-                  __psi_term += __term1 - __term2;
-                  __fact *= (__a + __d1 + _Tp(__j - 1))
-                          * (__b + __d1 + _Tp(__j - 1))
-                          / ((__ad + __j) * __j) * (_Tp(1) - __x);
-                  const _Tp __delta = __fact * __psi_term;
-                  __sum2 += __delta;
-                  if (std::abs(__delta) < __eps * std::abs(__sum2))
-                    break;
-                }
-              if (__j == __maxiter)
-                std::__throw_runtime_error(__N("Sum F2 failed to converge "
-                                               "in __hyperg_reflect"));
-
-              if (__sum2 == _Tp(0))
-                __F2 = _Tp(0);
-              else
-                __F2 = std::exp(__ln_pre2) * __sum2;
-            }
-          else
-            {
-              // Gamma functions in the denominator not ok.
-              // So the F2 term is zero.
-              __F2 = _Tp(0);
-            } // end F2 evaluation
-
-          const _Tp __sgn_2 = (__intd % 2 == 1 ? -_Tp(1) : _Tp(1));
-          const _Tp __F = __F1 + __sgn_2 * __F2;
-
-          return __F;
-        }
-      else
-        {
-          //  d = c - a - b not an integer.
-
-          //  These gamma functions appear in the denominator, so we
-          //  catch their harmless domain errors and set the terms to zero.
-          bool __ok1 = true;
-          _Tp __sgn_g1ca = _Tp(0), __ln_g1ca = _Tp(0);
-          _Tp __sgn_g1cb = _Tp(0), __ln_g1cb = _Tp(0);
-          __try
-            {
-              __sgn_g1ca = __log_gamma_sign(__c - __a);
-              __ln_g1ca = __log_gamma(__c - __a);
-              __sgn_g1cb = __log_gamma_sign(__c - __b);
-              __ln_g1cb = __log_gamma(__c - __b);
-            }
-          __catch(...)
-            {
-              __ok1 = false;
-            }
-
-          bool __ok2 = true;
-          _Tp __sgn_g2a = _Tp(0), __ln_g2a = _Tp(0);
-          _Tp __sgn_g2b = _Tp(0), __ln_g2b = _Tp(0);
-          __try
-            {
-              __sgn_g2a = __log_gamma_sign(__a);
-              __ln_g2a = __log_gamma(__a);
-              __sgn_g2b = __log_gamma_sign(__b);
-              __ln_g2b = __log_gamma(__b);
-            }
-          __catch(...)
-            {
-              __ok2 = false;
-            }
-
-          const _Tp __sgn_gc = __log_gamma_sign(__c);
-          const _Tp __ln_gc = __log_gamma(__c);
-          const _Tp __sgn_gd = __log_gamma_sign(__d);
-          const _Tp __ln_gd = __log_gamma(__d);
-          const _Tp __sgn_gmd = __log_gamma_sign(-__d);
-          const _Tp __ln_gmd = __log_gamma(-__d);
-
-          const _Tp __sgn1 = __sgn_gc * __sgn_gd  * __sgn_g1ca * __sgn_g1cb;
-          const _Tp __sgn2 = __sgn_gc * __sgn_gmd * __sgn_g2a  * __sgn_g2b;
-
-          _Tp __pre1, __pre2;
-          if (__ok1 && __ok2)
-            {
-              _Tp __ln_pre1 = __ln_gc + __ln_gd  - __ln_g1ca - __ln_g1cb;
-              _Tp __ln_pre2 = __ln_gc + __ln_gmd - __ln_g2a  - __ln_g2b
-                            + __d * std::log(_Tp(1) - __x);
-              if (__ln_pre1 < __log_max && __ln_pre2 < __log_max)
-                {
-                  __pre1 = std::exp(__ln_pre1);
-                  __pre2 = std::exp(__ln_pre2);
-                  __pre1 *= __sgn1;
-                  __pre2 *= __sgn2;
-                }
-              else
-                {
-                  std::__throw_runtime_error(__N("Overflow of gamma functions "
-                                                 "in __hyperg_reflect"));
-                }
-            }
-          else if (__ok1 && !__ok2)
-            {
-              _Tp __ln_pre1 = __ln_gc + __ln_gd - __ln_g1ca - __ln_g1cb;
-              if (__ln_pre1 < __log_max)
-                {
-                  __pre1 = std::exp(__ln_pre1);
-                  __pre1 *= __sgn1;
-                  __pre2 = _Tp(0);
-                }
-              else
-                {
-                  std::__throw_runtime_error(__N("Overflow of gamma functions "
-                                                 "in __hyperg_reflect"));
-                }
-            }
-          else if (!__ok1 && __ok2)
-            {
-              _Tp __ln_pre2 = __ln_gc + __ln_gmd - __ln_g2a - __ln_g2b
-                            + __d * std::log(_Tp(1) - __x);
-              if (__ln_pre2 < __log_max)
-                {
-                  __pre1 = _Tp(0);
-                  __pre2 = std::exp(__ln_pre2);
-                  __pre2 *= __sgn2;
-                }
-              else
-                {
-                  std::__throw_runtime_error(__N("Overflow of gamma functions "
-                                                 "in __hyperg_reflect"));
-                }
-            }
-          else
-            {
-              __pre1 = _Tp(0);
-              __pre2 = _Tp(0);
-              std::__throw_runtime_error(__N("Underflow of gamma functions "
-                                             "in __hyperg_reflect"));
-            }
-
-          const _Tp __F1 = __hyperg_series(__a, __b, _Tp(1) - __d,
-                                           _Tp(1) - __x);
-          const _Tp __F2 = __hyperg_series(__c - __a, __c - __b, _Tp(1) + __d,
-                                           _Tp(1) - __x);
-
-          const _Tp __F = __pre1 * __F1 + __pre2 * __F2;
-
-          return __F;
-        }
-    }
-
-
-    /**
-     *   @brief Return the hypogeometric function @f$ _2F_1(a,b;c;x) @f$.
-     *
-     *   The hypogeometric function is defined by
-     *   @f[
-     *     _2F_1(a,b;c;x) = \frac{\Gamma(c)}{\Gamma(a)\Gamma(b)}
-     *                      \sum_{n=0}^{\infty}
-     *                      \frac{\Gamma(a+n)\Gamma(b+n)}{\Gamma(c+n)}
-     *                      \frac{x^n}{n!}
-     *   @f]
-     *
-     *   @param  __a  The first @a numerator parameter.
-     *   @param  __a  The second @a numerator parameter.
-     *   @param  __c  The @a denominator parameter.
-     *   @param  __x  The argument of the confluent hypergeometric function.
-     *   @return  The confluent hypergeometric function.
-     */
-    template<typename _Tp>
-    _Tp
-    __hyperg(_Tp __a, _Tp __b, _Tp __c, _Tp __x)
-    {
-#if _GLIBCXX_USE_C99_MATH_TR1
-      const _Tp __a_nint = std::tr1::nearbyint(__a);
-      const _Tp __b_nint = std::tr1::nearbyint(__b);
-      const _Tp __c_nint = std::tr1::nearbyint(__c);
-#else
-      const _Tp __a_nint = static_cast<int>(__a + _Tp(0.5L));
-      const _Tp __b_nint = static_cast<int>(__b + _Tp(0.5L));
-      const _Tp __c_nint = static_cast<int>(__c + _Tp(0.5L));
-#endif
-      const _Tp __toler = _Tp(1000) * std::numeric_limits<_Tp>::epsilon();
-      if (std::abs(__x) >= _Tp(1))
-        std::__throw_domain_error(__N("Argument outside unit circle "
-                                      "in __hyperg."));
-      else if (__isnan(__a) || __isnan(__b)
-            || __isnan(__c) || __isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__c_nint == __c && __c_nint <= _Tp(0))
-        return std::numeric_limits<_Tp>::infinity();
-      else if (std::abs(__c - __b) < __toler || std::abs(__c - __a) < __toler)
-        return std::pow(_Tp(1) - __x, __c - __a - __b);
-      else if (__a >= _Tp(0) && __b >= _Tp(0) && __c >= _Tp(0)
-            && __x >= _Tp(0) && __x < _Tp(0.995L))
-        return __hyperg_series(__a, __b, __c, __x);
-      else if (std::abs(__a) < _Tp(10) && std::abs(__b) < _Tp(10))
-        {
-          //  For integer a and b the hypergeometric function is a
-          //  finite polynomial.
-          if (__a < _Tp(0)  &&  std::abs(__a - __a_nint) < __toler)
-            return __hyperg_series(__a_nint, __b, __c, __x);
-          else if (__b < _Tp(0)  &&  std::abs(__b - __b_nint) < __toler)
-            return __hyperg_series(__a, __b_nint, __c, __x);
-          else if (__x < -_Tp(0.25L))
-            return __hyperg_luke(__a, __b, __c, __x);
-          else if (__x < _Tp(0.5L))
-            return __hyperg_series(__a, __b, __c, __x);
-          else
-            if (std::abs(__c) > _Tp(10))
-              return __hyperg_series(__a, __b, __c, __x);
-            else
-              return __hyperg_reflect(__a, __b, __c, __x);
-        }
-      else
-        return __hyperg_luke(__a, __b, __c, __x);
-    }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_HYPERGEOMETRIC_TCC
diff --git a/openflow/usr/include/c++/5/tr1/inttypes.h b/openflow/usr/include/c++/5/tr1/inttypes.h
deleted file mode 100644
index 65429b8..0000000
--- a/openflow/usr/include/c++/5/tr1/inttypes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 inttypes.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/inttypes.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_INTTYPES_H
-#define _GLIBCXX_TR1_INTTYPES_H 1
-
-#include <tr1/cinttypes>
-
-#endif // _GLIBCXX_TR1_INTTYPES_H
diff --git a/openflow/usr/include/c++/5/tr1/legendre_function.tcc b/openflow/usr/include/c++/5/tr1/legendre_function.tcc
deleted file mode 100644
index 7db82e3..0000000
--- a/openflow/usr/include/c++/5/tr1/legendre_function.tcc
+++ /dev/null
@@ -1,303 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/legendre_function.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland based on:
-//   (1) Handbook of Mathematical Functions,
-//       ed. Milton Abramowitz and Irene A. Stegun,
-//       Dover Publications,
-//       Section 8, pp. 331-341
-//   (2) The Gnu Scientific Library, http://www.gnu.org/software/gsl
-//   (3) Numerical Recipes in C, by W. H. Press, S. A. Teukolsky,
-//       W. T. Vetterling, B. P. Flannery, Cambridge University Press (1992),
-//       2nd ed, pp. 252-254
-
-#ifndef _GLIBCXX_TR1_LEGENDRE_FUNCTION_TCC
-#define _GLIBCXX_TR1_LEGENDRE_FUNCTION_TCC 1
-
-#include "special_function_util.h"
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.2] Special functions
-
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     *   @brief  Return the Legendre polynomial by recursion on order
-     *           @f$ l @f$.
-     * 
-     *   The Legendre function of @f$ l @f$ and @f$ x @f$,
-     *   @f$ P_l(x) @f$, is defined by:
-     *   @f[
-     *     P_l(x) = \frac{1}{2^l l!}\frac{d^l}{dx^l}(x^2 - 1)^{l}
-     *   @f]
-     * 
-     *   @param  l  The order of the Legendre polynomial.  @f$l >= 0@f$.
-     *   @param  x  The argument of the Legendre polynomial.  @f$|x| <= 1@f$.
-     */
-    template<typename _Tp>
-    _Tp
-    __poly_legendre_p(unsigned int __l, _Tp __x)
-    {
-
-      if ((__x < _Tp(-1)) || (__x > _Tp(+1)))
-        std::__throw_domain_error(__N("Argument out of range"
-                                      " in __poly_legendre_p."));
-      else if (__isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__x == +_Tp(1))
-        return +_Tp(1);
-      else if (__x == -_Tp(1))
-        return (__l % 2 == 1 ? -_Tp(1) : +_Tp(1));
-      else
-        {
-          _Tp __p_lm2 = _Tp(1);
-          if (__l == 0)
-            return __p_lm2;
-
-          _Tp __p_lm1 = __x;
-          if (__l == 1)
-            return __p_lm1;
-
-          _Tp __p_l = 0;
-          for (unsigned int __ll = 2; __ll <= __l; ++__ll)
-            {
-              //  This arrangement is supposed to be better for roundoff
-              //  protection, Arfken, 2nd Ed, Eq 12.17a.
-              __p_l = _Tp(2) * __x * __p_lm1 - __p_lm2
-                    - (__x * __p_lm1 - __p_lm2) / _Tp(__ll);
-              __p_lm2 = __p_lm1;
-              __p_lm1 = __p_l;
-            }
-
-          return __p_l;
-        }
-    }
-
-
-    /**
-     *   @brief  Return the associated Legendre function by recursion
-     *           on @f$ l @f$.
-     * 
-     *   The associated Legendre function is derived from the Legendre function
-     *   @f$ P_l(x) @f$ by the Rodrigues formula:
-     *   @f[
-     *     P_l^m(x) = (1 - x^2)^{m/2}\frac{d^m}{dx^m}P_l(x)
-     *   @f]
-     * 
-     *   @param  l  The order of the associated Legendre function.
-     *              @f$ l >= 0 @f$.
-     *   @param  m  The order of the associated Legendre function.
-     *              @f$ m <= l @f$.
-     *   @param  x  The argument of the associated Legendre function.
-     *              @f$ |x| <= 1 @f$.
-     */
-    template<typename _Tp>
-    _Tp
-    __assoc_legendre_p(unsigned int __l, unsigned int __m, _Tp __x)
-    {
-
-      if (__x < _Tp(-1) || __x > _Tp(+1))
-        std::__throw_domain_error(__N("Argument out of range"
-                                      " in __assoc_legendre_p."));
-      else if (__m > __l)
-        std::__throw_domain_error(__N("Degree out of range"
-                                      " in __assoc_legendre_p."));
-      else if (__isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__m == 0)
-        return __poly_legendre_p(__l, __x);
-      else
-        {
-          _Tp __p_mm = _Tp(1);
-          if (__m > 0)
-            {
-              //  Two square roots seem more accurate more of the time
-              //  than just one.
-              _Tp __root = std::sqrt(_Tp(1) - __x) * std::sqrt(_Tp(1) + __x);
-              _Tp __fact = _Tp(1);
-              for (unsigned int __i = 1; __i <= __m; ++__i)
-                {
-                  __p_mm *= -__fact * __root;
-                  __fact += _Tp(2);
-                }
-            }
-          if (__l == __m)
-            return __p_mm;
-
-          _Tp __p_mp1m = _Tp(2 * __m + 1) * __x * __p_mm;
-          if (__l == __m + 1)
-            return __p_mp1m;
-
-          _Tp __p_lm2m = __p_mm;
-          _Tp __P_lm1m = __p_mp1m;
-          _Tp __p_lm = _Tp(0);
-          for (unsigned int __j = __m + 2; __j <= __l; ++__j)
-            {
-              __p_lm = (_Tp(2 * __j - 1) * __x * __P_lm1m
-                      - _Tp(__j + __m - 1) * __p_lm2m) / _Tp(__j - __m);
-              __p_lm2m = __P_lm1m;
-              __P_lm1m = __p_lm;
-            }
-
-          return __p_lm;
-        }
-    }
-
-
-    /**
-     *   @brief  Return the spherical associated Legendre function.
-     * 
-     *   The spherical associated Legendre function of @f$ l @f$, @f$ m @f$,
-     *   and @f$ \theta @f$ is defined as @f$ Y_l^m(\theta,0) @f$ where
-     *   @f[
-     *      Y_l^m(\theta,\phi) = (-1)^m[\frac{(2l+1)}{4\pi}
-     *                                  \frac{(l-m)!}{(l+m)!}]
-     *                     P_l^m(\cos\theta) \exp^{im\phi}
-     *   @f]
-     *   is the spherical harmonic function and @f$ P_l^m(x) @f$ is the
-     *   associated Legendre function.
-     * 
-     *   This function differs from the associated Legendre function by
-     *   argument (@f$x = \cos(\theta)@f$) and by a normalization factor
-     *   but this factor is rather large for large @f$ l @f$ and @f$ m @f$
-     *   and so this function is stable for larger differences of @f$ l @f$
-     *   and @f$ m @f$.
-     * 
-     *   @param  l  The order of the spherical associated Legendre function.
-     *              @f$ l >= 0 @f$.
-     *   @param  m  The order of the spherical associated Legendre function.
-     *              @f$ m <= l @f$.
-     *   @param  theta  The radian angle argument of the spherical associated
-     *                  Legendre function.
-     */
-    template <typename _Tp>
-    _Tp
-    __sph_legendre(unsigned int __l, unsigned int __m, _Tp __theta)
-    {
-      if (__isnan(__theta))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-
-      const _Tp __x = std::cos(__theta);
-
-      if (__l < __m)
-        {
-          std::__throw_domain_error(__N("Bad argument "
-                                        "in __sph_legendre."));
-        }
-      else if (__m == 0)
-        {
-          _Tp __P = __poly_legendre_p(__l, __x);
-          _Tp __fact = std::sqrt(_Tp(2 * __l + 1)
-                     / (_Tp(4) * __numeric_constants<_Tp>::__pi()));
-          __P *= __fact;
-          return __P;
-        }
-      else if (__x == _Tp(1) || __x == -_Tp(1))
-        {
-          //  m > 0 here
-          return _Tp(0);
-        }
-      else
-        {
-          // m > 0 and |x| < 1 here
-
-          // Starting value for recursion.
-          // Y_m^m(x) = sqrt( (2m+1)/(4pi m) gamma(m+1/2)/gamma(m) )
-          //             (-1)^m (1-x^2)^(m/2) / pi^(1/4)
-          const _Tp __sgn = ( __m % 2 == 1 ? -_Tp(1) : _Tp(1));
-          const _Tp __y_mp1m_factor = __x * std::sqrt(_Tp(2 * __m + 3));
-#if _GLIBCXX_USE_C99_MATH_TR1
-          const _Tp __lncirc = std::tr1::log1p(-__x * __x);
-#else
-          const _Tp __lncirc = std::log(_Tp(1) - __x * __x);
-#endif
-          //  Gamma(m+1/2) / Gamma(m)
-#if _GLIBCXX_USE_C99_MATH_TR1
-          const _Tp __lnpoch = std::tr1::lgamma(_Tp(__m + _Tp(0.5L)))
-                             - std::tr1::lgamma(_Tp(__m));
-#else
-          const _Tp __lnpoch = __log_gamma(_Tp(__m + _Tp(0.5L)))
-                             - __log_gamma(_Tp(__m));
-#endif
-          const _Tp __lnpre_val =
-                    -_Tp(0.25L) * __numeric_constants<_Tp>::__lnpi()
-                    + _Tp(0.5L) * (__lnpoch + __m * __lncirc);
-          _Tp __sr = std::sqrt((_Tp(2) + _Tp(1) / __m)
-                   / (_Tp(4) * __numeric_constants<_Tp>::__pi()));
-          _Tp __y_mm = __sgn * __sr * std::exp(__lnpre_val);
-          _Tp __y_mp1m = __y_mp1m_factor * __y_mm;
-
-          if (__l == __m)
-            {
-              return __y_mm;
-            }
-          else if (__l == __m + 1)
-            {
-              return __y_mp1m;
-            }
-          else
-            {
-              _Tp __y_lm = _Tp(0);
-
-              // Compute Y_l^m, l > m+1, upward recursion on l.
-              for ( int __ll = __m + 2; __ll <= __l; ++__ll)
-                {
-                  const _Tp __rat1 = _Tp(__ll - __m) / _Tp(__ll + __m);
-                  const _Tp __rat2 = _Tp(__ll - __m - 1) / _Tp(__ll + __m - 1);
-                  const _Tp __fact1 = std::sqrt(__rat1 * _Tp(2 * __ll + 1)
-                                                       * _Tp(2 * __ll - 1));
-                  const _Tp __fact2 = std::sqrt(__rat1 * __rat2 * _Tp(2 * __ll + 1)
-                                                                / _Tp(2 * __ll - 3));
-                  __y_lm = (__x * __y_mp1m * __fact1
-                         - (__ll + __m - 1) * __y_mm * __fact2) / _Tp(__ll - __m);
-                  __y_mm = __y_mp1m;
-                  __y_mp1m = __y_lm;
-                }
-
-              return __y_lm;
-            }
-        }
-    }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_LEGENDRE_FUNCTION_TCC
diff --git a/openflow/usr/include/c++/5/tr1/limits.h b/openflow/usr/include/c++/5/tr1/limits.h
deleted file mode 100644
index d3d7f60..0000000
--- a/openflow/usr/include/c++/5/tr1/limits.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 limits.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/limits.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _TR1_LIMITS_H
-#define _TR1_LIMITS_H 1
-
-#include <tr1/climits>
-
-#endif
diff --git a/openflow/usr/include/c++/5/tr1/math.h b/openflow/usr/include/c++/5/tr1/math.h
deleted file mode 100644
index 62c48a2..0000000
--- a/openflow/usr/include/c++/5/tr1/math.h
+++ /dev/null
@@ -1,186 +0,0 @@
-// TR1 math.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/math.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_MATH_H
-#define _GLIBCXX_TR1_MATH_H 1
-
-#include <tr1/cmath>
-
-#if _GLIBCXX_USE_C99_MATH_TR1
-
-using std::tr1::acos;
-using std::tr1::acosh;
-using std::tr1::asin;
-using std::tr1::asinh;
-using std::tr1::atan;
-using std::tr1::atan2;
-using std::tr1::atanh;
-using std::tr1::cbrt;
-using std::tr1::ceil;
-using std::tr1::copysign;
-using std::tr1::cos;
-using std::tr1::cosh;
-using std::tr1::erf;
-using std::tr1::erfc;
-using std::tr1::exp;
-using std::tr1::exp2;
-using std::tr1::expm1;
-using std::tr1::fabs;
-using std::tr1::fdim;
-using std::tr1::floor;
-using std::tr1::fma;
-using std::tr1::fmax;
-using std::tr1::fmin;
-using std::tr1::fmod;
-using std::tr1::frexp;
-using std::tr1::hypot;
-using std::tr1::ilogb;
-using std::tr1::ldexp;
-using std::tr1::lgamma;
-using std::tr1::llrint;
-using std::tr1::llround;
-using std::tr1::log;
-using std::tr1::log10;
-using std::tr1::log1p;
-using std::tr1::log2;
-using std::tr1::logb;
-using std::tr1::lrint;
-using std::tr1::lround;
-using std::tr1::nearbyint;
-using std::tr1::nextafter;
-using std::tr1::nexttoward;
-using std::tr1::pow;
-using std::tr1::remainder;
-using std::tr1::remquo;
-using std::tr1::rint;
-using std::tr1::round;
-using std::tr1::scalbln;
-using std::tr1::scalbn;
-using std::tr1::sin;
-using std::tr1::sinh;
-using std::tr1::sqrt;
-using std::tr1::tan;
-using std::tr1::tanh;
-using std::tr1::tgamma;
-using std::tr1::trunc;
-
-#endif
-
-using std::tr1::assoc_laguerref;
-using std::tr1::assoc_laguerre;
-using std::tr1::assoc_laguerrel;
-
-using std::tr1::assoc_legendref;
-using std::tr1::assoc_legendre;
-using std::tr1::assoc_legendrel;
-
-using std::tr1::betaf;
-using std::tr1::beta;
-using std::tr1::betal;
-
-using std::tr1::comp_ellint_1f;
-using std::tr1::comp_ellint_1;
-using std::tr1::comp_ellint_1l;
-
-using std::tr1::comp_ellint_2f;
-using std::tr1::comp_ellint_2;
-using std::tr1::comp_ellint_2l;
-
-using std::tr1::comp_ellint_3f;
-using std::tr1::comp_ellint_3;
-using std::tr1::comp_ellint_3l;
-
-using std::tr1::conf_hypergf;
-using std::tr1::conf_hyperg;
-using std::tr1::conf_hypergl;
-
-using std::tr1::cyl_bessel_if;
-using std::tr1::cyl_bessel_i;
-using std::tr1::cyl_bessel_il;
-
-using std::tr1::cyl_bessel_jf;
-using std::tr1::cyl_bessel_j;
-using std::tr1::cyl_bessel_jl;
-
-using std::tr1::cyl_bessel_kf;
-using std::tr1::cyl_bessel_k;
-using std::tr1::cyl_bessel_kl;
-
-using std::tr1::cyl_neumannf;
-using std::tr1::cyl_neumann;
-using std::tr1::cyl_neumannl;
-
-using std::tr1::ellint_1f;
-using std::tr1::ellint_1;
-using std::tr1::ellint_1l;
-
-using std::tr1::ellint_2f;
-using std::tr1::ellint_2;
-using std::tr1::ellint_2l;
-
-using std::tr1::ellint_3f;
-using std::tr1::ellint_3;
-using std::tr1::ellint_3l;
-
-using std::tr1::expintf;
-using std::tr1::expint;
-using std::tr1::expintl;
-
-using std::tr1::hermitef;
-using std::tr1::hermite;
-using std::tr1::hermitel;
-
-using std::tr1::hypergf;
-using std::tr1::hyperg;
-using std::tr1::hypergl;
-
-using std::tr1::laguerref;
-using std::tr1::laguerre;
-using std::tr1::laguerrel;
-
-using std::tr1::legendref;
-using std::tr1::legendre;
-using std::tr1::legendrel;
-
-using std::tr1::riemann_zetaf;
-using std::tr1::riemann_zeta;
-using std::tr1::riemann_zetal;
-
-using std::tr1::sph_besself;
-using std::tr1::sph_bessel;
-using std::tr1::sph_bessell;
-
-using std::tr1::sph_legendref;
-using std::tr1::sph_legendre;
-using std::tr1::sph_legendrel;
-
-using std::tr1::sph_neumannf;
-using std::tr1::sph_neumann;
-using std::tr1::sph_neumannl;
-
-#endif // _GLIBCXX_TR1_MATH_H
diff --git a/openflow/usr/include/c++/5/tr1/memory b/openflow/usr/include/c++/5/tr1/memory
deleted file mode 100644
index 274788b..0000000
--- a/openflow/usr/include/c++/5/tr1/memory
+++ /dev/null
@@ -1,52 +0,0 @@
-// <tr1/memory> -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- * @file tr1/memory
- * This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_MEMORY
-#define _GLIBCXX_TR1_MEMORY 1
-
-#pragma GCC system_header
-
-#if defined(_GLIBCXX_INCLUDE_AS_CXX11)
-#  error TR1 header cannot be included from C++11 header
-#endif
-
-#include <memory>
-#include <exception>        	// std::exception
-#include <typeinfo>         	// std::type_info in get_deleter
-#include <bits/stl_algobase.h>  // std::swap
-#include <iosfwd>           	// std::basic_ostream
-#include <ext/atomicity.h>
-#include <ext/concurrence.h>
-#include <bits/functexcept.h>
-#include <bits/stl_function.h> 	// std::less
-#include <debug/debug.h>
-#include <tr1/type_traits>
-#include <tr1/shared_ptr.h>
-
-#endif // _GLIBCXX_TR1_MEMORY
diff --git a/openflow/usr/include/c++/5/tr1/modified_bessel_func.tcc b/openflow/usr/include/c++/5/tr1/modified_bessel_func.tcc
deleted file mode 100644
index 215d464..0000000
--- a/openflow/usr/include/c++/5/tr1/modified_bessel_func.tcc
+++ /dev/null
@@ -1,434 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/modified_bessel_func.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland.
-//
-// References:
-//   (1) Handbook of Mathematical Functions,
-//       Ed. Milton Abramowitz and Irene A. Stegun,
-//       Dover Publications,
-//       Section 9, pp. 355-434, Section 10 pp. 435-478
-//   (2) The Gnu Scientific Library, http://www.gnu.org/software/gsl
-//   (3) Numerical Recipes in C, by W. H. Press, S. A. Teukolsky,
-//       W. T. Vetterling, B. P. Flannery, Cambridge University Press (1992),
-//       2nd ed, pp. 246-249.
-
-#ifndef _GLIBCXX_TR1_MODIFIED_BESSEL_FUNC_TCC
-#define _GLIBCXX_TR1_MODIFIED_BESSEL_FUNC_TCC 1
-
-#include "special_function_util.h"
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.2] Special functions
-
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     *   @brief  Compute the modified Bessel functions @f$ I_\nu(x) @f$ and
-     *           @f$ K_\nu(x) @f$ and their first derivatives
-     *           @f$ I'_\nu(x) @f$ and @f$ K'_\nu(x) @f$ respectively.
-     *           These four functions are computed together for numerical
-     *           stability.
-     *
-     *   @param  __nu  The order of the Bessel functions.
-     *   @param  __x   The argument of the Bessel functions.
-     *   @param  __Inu  The output regular modified Bessel function.
-     *   @param  __Knu  The output irregular modified Bessel function.
-     *   @param  __Ipnu  The output derivative of the regular
-     *                   modified Bessel function.
-     *   @param  __Kpnu  The output derivative of the irregular
-     *                   modified Bessel function.
-     */
-    template <typename _Tp>
-    void
-    __bessel_ik(_Tp __nu, _Tp __x,
-                _Tp & __Inu, _Tp & __Knu, _Tp & __Ipnu, _Tp & __Kpnu)
-    {
-      if (__x == _Tp(0))
-        {
-          if (__nu == _Tp(0))
-            {
-              __Inu = _Tp(1);
-              __Ipnu = _Tp(0);
-            }
-          else if (__nu == _Tp(1))
-            {
-              __Inu = _Tp(0);
-              __Ipnu = _Tp(0.5L);
-            }
-          else
-            {
-              __Inu = _Tp(0);
-              __Ipnu = _Tp(0);
-            }
-          __Knu = std::numeric_limits<_Tp>::infinity();
-          __Kpnu = -std::numeric_limits<_Tp>::infinity();
-          return;
-        }
-
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      const _Tp __fp_min = _Tp(10) * std::numeric_limits<_Tp>::epsilon();
-      const int __max_iter = 15000;
-      const _Tp __x_min = _Tp(2);
-
-      const int __nl = static_cast<int>(__nu + _Tp(0.5L));
-
-      const _Tp __mu = __nu - __nl;
-      const _Tp __mu2 = __mu * __mu;
-      const _Tp __xi = _Tp(1) / __x;
-      const _Tp __xi2 = _Tp(2) * __xi;
-      _Tp __h = __nu * __xi;
-      if ( __h < __fp_min )
-        __h = __fp_min;
-      _Tp __b = __xi2 * __nu;
-      _Tp __d = _Tp(0);
-      _Tp __c = __h;
-      int __i;
-      for ( __i = 1; __i <= __max_iter; ++__i )
-        {
-          __b += __xi2;
-          __d = _Tp(1) / (__b + __d);
-          __c = __b + _Tp(1) / __c;
-          const _Tp __del = __c * __d;
-          __h *= __del;
-          if (std::abs(__del - _Tp(1)) < __eps)
-            break;
-        }
-      if (__i > __max_iter)
-        std::__throw_runtime_error(__N("Argument x too large "
-                                       "in __bessel_ik; "
-                                       "try asymptotic expansion."));
-      _Tp __Inul = __fp_min;
-      _Tp __Ipnul = __h * __Inul;
-      _Tp __Inul1 = __Inul;
-      _Tp __Ipnu1 = __Ipnul;
-      _Tp __fact = __nu * __xi;
-      for (int __l = __nl; __l >= 1; --__l)
-        {
-          const _Tp __Inutemp = __fact * __Inul + __Ipnul;
-          __fact -= __xi;
-          __Ipnul = __fact * __Inutemp + __Inul;
-          __Inul = __Inutemp;
-        }
-      _Tp __f = __Ipnul / __Inul;
-      _Tp __Kmu, __Knu1;
-      if (__x < __x_min)
-        {
-          const _Tp __x2 = __x / _Tp(2);
-          const _Tp __pimu = __numeric_constants<_Tp>::__pi() * __mu;
-          const _Tp __fact = (std::abs(__pimu) < __eps
-                            ? _Tp(1) : __pimu / std::sin(__pimu));
-          _Tp __d = -std::log(__x2);
-          _Tp __e = __mu * __d;
-          const _Tp __fact2 = (std::abs(__e) < __eps
-                            ? _Tp(1) : std::sinh(__e) / __e);
-          _Tp __gam1, __gam2, __gampl, __gammi;
-          __gamma_temme(__mu, __gam1, __gam2, __gampl, __gammi);
-          _Tp __ff = __fact
-                   * (__gam1 * std::cosh(__e) + __gam2 * __fact2 * __d);
-          _Tp __sum = __ff;
-          __e = std::exp(__e);
-          _Tp __p = __e / (_Tp(2) * __gampl);
-          _Tp __q = _Tp(1) / (_Tp(2) * __e * __gammi);
-          _Tp __c = _Tp(1);
-          __d = __x2 * __x2;
-          _Tp __sum1 = __p;
-          int __i;
-          for (__i = 1; __i <= __max_iter; ++__i)
-            {
-              __ff = (__i * __ff + __p + __q) / (__i * __i - __mu2);
-              __c *= __d / __i;
-              __p /= __i - __mu;
-              __q /= __i + __mu;
-              const _Tp __del = __c * __ff;
-              __sum += __del; 
-              const _Tp __del1 = __c * (__p - __i * __ff);
-              __sum1 += __del1;
-              if (std::abs(__del) < __eps * std::abs(__sum))
-                break;
-            }
-          if (__i > __max_iter)
-            std::__throw_runtime_error(__N("Bessel k series failed to converge "
-                                           "in __bessel_ik."));
-          __Kmu = __sum;
-          __Knu1 = __sum1 * __xi2;
-        }
-      else
-        {
-          _Tp __b = _Tp(2) * (_Tp(1) + __x);
-          _Tp __d = _Tp(1) / __b;
-          _Tp __delh = __d;
-          _Tp __h = __delh;
-          _Tp __q1 = _Tp(0);
-          _Tp __q2 = _Tp(1);
-          _Tp __a1 = _Tp(0.25L) - __mu2;
-          _Tp __q = __c = __a1;
-          _Tp __a = -__a1;
-          _Tp __s = _Tp(1) + __q * __delh;
-          int __i;
-          for (__i = 2; __i <= __max_iter; ++__i)
-            {
-              __a -= 2 * (__i - 1);
-              __c = -__a * __c / __i;
-              const _Tp __qnew = (__q1 - __b * __q2) / __a;
-              __q1 = __q2;
-              __q2 = __qnew;
-              __q += __c * __qnew;
-              __b += _Tp(2);
-              __d = _Tp(1) / (__b + __a * __d);
-              __delh = (__b * __d - _Tp(1)) * __delh;
-              __h += __delh;
-              const _Tp __dels = __q * __delh;
-              __s += __dels;
-              if ( std::abs(__dels / __s) < __eps )
-                break;
-            }
-          if (__i > __max_iter)
-            std::__throw_runtime_error(__N("Steed's method failed "
-                                           "in __bessel_ik."));
-          __h = __a1 * __h;
-          __Kmu = std::sqrt(__numeric_constants<_Tp>::__pi() / (_Tp(2) * __x))
-                * std::exp(-__x) / __s;
-          __Knu1 = __Kmu * (__mu + __x + _Tp(0.5L) - __h) * __xi;
-        }
-
-      _Tp __Kpmu = __mu * __xi * __Kmu - __Knu1;
-      _Tp __Inumu = __xi / (__f * __Kmu - __Kpmu);
-      __Inu = __Inumu * __Inul1 / __Inul;
-      __Ipnu = __Inumu * __Ipnu1 / __Inul;
-      for ( __i = 1; __i <= __nl; ++__i )
-        {
-          const _Tp __Knutemp = (__mu + __i) * __xi2 * __Knu1 + __Kmu;
-          __Kmu = __Knu1;
-          __Knu1 = __Knutemp;
-        }
-      __Knu = __Kmu;
-      __Kpnu = __nu * __xi * __Kmu - __Knu1;
-  
-      return;
-    }
-
-
-    /**
-     *   @brief  Return the regular modified Bessel function of order
-     *           \f$ \nu \f$: \f$ I_{\nu}(x) \f$.
-     *
-     *   The regular modified cylindrical Bessel function is:
-     *   @f[
-     *    I_{\nu}(x) = \sum_{k=0}^{\infty}
-     *              \frac{(x/2)^{\nu + 2k}}{k!\Gamma(\nu+k+1)}
-     *   @f]
-     *
-     *   @param  __nu  The order of the regular modified Bessel function.
-     *   @param  __x   The argument of the regular modified Bessel function.
-     *   @return  The output regular modified Bessel function.
-     */
-    template<typename _Tp>
-    _Tp
-    __cyl_bessel_i(_Tp __nu, _Tp __x)
-    {
-      if (__nu < _Tp(0) || __x < _Tp(0))
-        std::__throw_domain_error(__N("Bad argument "
-                                      "in __cyl_bessel_i."));
-      else if (__isnan(__nu) || __isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__x * __x < _Tp(10) * (__nu + _Tp(1)))
-        return __cyl_bessel_ij_series(__nu, __x, +_Tp(1), 200);
-      else
-        {
-          _Tp __I_nu, __K_nu, __Ip_nu, __Kp_nu;
-          __bessel_ik(__nu, __x, __I_nu, __K_nu, __Ip_nu, __Kp_nu);
-          return __I_nu;
-        }
-    }
-
-
-    /**
-     *   @brief  Return the irregular modified Bessel function
-     *           \f$ K_{\nu}(x) \f$ of order \f$ \nu \f$.
-     *
-     *   The irregular modified Bessel function is defined by:
-     *   @f[
-     *      K_{\nu}(x) = \frac{\pi}{2}
-     *                   \frac{I_{-\nu}(x) - I_{\nu}(x)}{\sin \nu\pi}
-     *   @f]
-     *   where for integral \f$ \nu = n \f$ a limit is taken:
-     *   \f$ lim_{\nu \to n} \f$.
-     *
-     *   @param  __nu  The order of the irregular modified Bessel function.
-     *   @param  __x   The argument of the irregular modified Bessel function.
-     *   @return  The output irregular modified Bessel function.
-     */
-    template<typename _Tp>
-    _Tp
-    __cyl_bessel_k(_Tp __nu, _Tp __x)
-    {
-      if (__nu < _Tp(0) || __x < _Tp(0))
-        std::__throw_domain_error(__N("Bad argument "
-                                      "in __cyl_bessel_k."));
-      else if (__isnan(__nu) || __isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else
-        {
-          _Tp __I_nu, __K_nu, __Ip_nu, __Kp_nu;
-          __bessel_ik(__nu, __x, __I_nu, __K_nu, __Ip_nu, __Kp_nu);
-          return __K_nu;
-        }
-    }
-
-
-    /**
-     *   @brief  Compute the spherical modified Bessel functions
-     *           @f$ i_n(x) @f$ and @f$ k_n(x) @f$ and their first
-     *           derivatives @f$ i'_n(x) @f$ and @f$ k'_n(x) @f$
-     *           respectively.
-     *
-     *   @param  __n  The order of the modified spherical Bessel function.
-     *   @param  __x  The argument of the modified spherical Bessel function.
-     *   @param  __i_n  The output regular modified spherical Bessel function.
-     *   @param  __k_n  The output irregular modified spherical
-     *                  Bessel function.
-     *   @param  __ip_n  The output derivative of the regular modified
-     *                   spherical Bessel function.
-     *   @param  __kp_n  The output derivative of the irregular modified
-     *                   spherical Bessel function.
-     */
-    template <typename _Tp>
-    void
-    __sph_bessel_ik(unsigned int __n, _Tp __x,
-                    _Tp & __i_n, _Tp & __k_n, _Tp & __ip_n, _Tp & __kp_n)
-    {
-      const _Tp __nu = _Tp(__n) + _Tp(0.5L);
-
-      _Tp __I_nu, __Ip_nu, __K_nu, __Kp_nu;
-      __bessel_ik(__nu, __x, __I_nu, __K_nu, __Ip_nu, __Kp_nu);
-
-      const _Tp __factor = __numeric_constants<_Tp>::__sqrtpio2()
-                         / std::sqrt(__x);
-
-      __i_n = __factor * __I_nu;
-      __k_n = __factor * __K_nu;
-      __ip_n = __factor * __Ip_nu - __i_n / (_Tp(2) * __x);
-      __kp_n = __factor * __Kp_nu - __k_n / (_Tp(2) * __x);
-
-      return;
-    }
-
-
-    /**
-     *   @brief  Compute the Airy functions
-     *           @f$ Ai(x) @f$ and @f$ Bi(x) @f$ and their first
-     *           derivatives @f$ Ai'(x) @f$ and @f$ Bi(x) @f$
-     *           respectively.
-     *
-     *   @param  __x  The argument of the Airy functions.
-     *   @param  __Ai  The output Airy function of the first kind.
-     *   @param  __Bi  The output Airy function of the second kind.
-     *   @param  __Aip  The output derivative of the Airy function
-     *                  of the first kind.
-     *   @param  __Bip  The output derivative of the Airy function
-     *                  of the second kind.
-     */
-    template <typename _Tp>
-    void
-    __airy(_Tp __x, _Tp & __Ai, _Tp & __Bi, _Tp & __Aip, _Tp & __Bip)
-    {
-      const _Tp __absx = std::abs(__x);
-      const _Tp __rootx = std::sqrt(__absx);
-      const _Tp __z = _Tp(2) * __absx * __rootx / _Tp(3);
-
-      if (__x > _Tp(0))
-        {
-          _Tp __I_nu, __Ip_nu, __K_nu, __Kp_nu;
-
-          __bessel_ik(_Tp(1) / _Tp(3), __z, __I_nu, __K_nu, __Ip_nu, __Kp_nu);
-          __Ai = __rootx * __K_nu
-               / (__numeric_constants<_Tp>::__sqrt3()
-                * __numeric_constants<_Tp>::__pi());
-          __Bi = __rootx * (__K_nu / __numeric_constants<_Tp>::__pi()
-                 + _Tp(2) * __I_nu / __numeric_constants<_Tp>::__sqrt3());
-
-          __bessel_ik(_Tp(2) / _Tp(3), __z, __I_nu, __K_nu, __Ip_nu, __Kp_nu);
-          __Aip = -__x * __K_nu
-                / (__numeric_constants<_Tp>::__sqrt3()
-                 * __numeric_constants<_Tp>::__pi());
-          __Bip = __x * (__K_nu / __numeric_constants<_Tp>::__pi()
-                      + _Tp(2) * __I_nu
-                      / __numeric_constants<_Tp>::__sqrt3());
-        }
-      else if (__x < _Tp(0))
-        {
-          _Tp __J_nu, __Jp_nu, __N_nu, __Np_nu;
-
-          __bessel_jn(_Tp(1) / _Tp(3), __z, __J_nu, __N_nu, __Jp_nu, __Np_nu);
-          __Ai = __rootx * (__J_nu
-                    - __N_nu / __numeric_constants<_Tp>::__sqrt3()) / _Tp(2);
-          __Bi = -__rootx * (__N_nu
-                    + __J_nu / __numeric_constants<_Tp>::__sqrt3()) / _Tp(2);
-
-          __bessel_jn(_Tp(2) / _Tp(3), __z, __J_nu, __N_nu, __Jp_nu, __Np_nu);
-          __Aip = __absx * (__N_nu / __numeric_constants<_Tp>::__sqrt3()
-                          + __J_nu) / _Tp(2);
-          __Bip = __absx * (__J_nu / __numeric_constants<_Tp>::__sqrt3()
-                          - __N_nu) / _Tp(2);
-        }
-      else
-        {
-          //  Reference:
-          //    Abramowitz & Stegun, page 446 section 10.4.4 on Airy functions.
-          //  The number is Ai(0) = 3^{-2/3}/\Gamma(2/3).
-          __Ai = _Tp(0.35502805388781723926L);
-          __Bi = __Ai * __numeric_constants<_Tp>::__sqrt3();
-
-          //  Reference:
-          //    Abramowitz & Stegun, page 446 section 10.4.5 on Airy functions.
-          //  The number is Ai'(0) = -3^{-1/3}/\Gamma(1/3).
-          __Aip = -_Tp(0.25881940379280679840L);
-          __Bip = -__Aip * __numeric_constants<_Tp>::__sqrt3();
-        }
-
-      return;
-    }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_MODIFIED_BESSEL_FUNC_TCC
diff --git a/openflow/usr/include/c++/5/tr1/poly_hermite.tcc b/openflow/usr/include/c++/5/tr1/poly_hermite.tcc
deleted file mode 100644
index 4fb1a14..0000000
--- a/openflow/usr/include/c++/5/tr1/poly_hermite.tcc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/poly_hermite.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland based on:
-//   (1) Handbook of Mathematical Functions,
-//       Ed. Milton Abramowitz and Irene A. Stegun,
-//       Dover Publications, Section 22 pp. 773-802
-
-#ifndef _GLIBCXX_TR1_POLY_HERMITE_TCC
-#define _GLIBCXX_TR1_POLY_HERMITE_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.2] Special functions
-
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     *   @brief This routine returns the Hermite polynomial
-     *          of order n: \f$ H_n(x) \f$ by recursion on n.
-     * 
-     *   The Hermite polynomial is defined by:
-     *   @f[
-     *     H_n(x) = (-1)^n e^{x^2} \frac{d^n}{dx^n} e^{-x^2}
-     *   @f]
-     *
-     *   @param __n The order of the Hermite polynomial.
-     *   @param __x The argument of the Hermite polynomial.
-     *   @return The value of the Hermite polynomial of order n
-     *           and argument x.
-     */
-    template<typename _Tp>
-    _Tp
-    __poly_hermite_recursion(unsigned int __n, _Tp __x)
-    {
-      //  Compute H_0.
-      _Tp __H_0 = 1;
-      if (__n == 0)
-        return __H_0;
-
-      //  Compute H_1.
-      _Tp __H_1 = 2 * __x;
-      if (__n == 1)
-        return __H_1;
-
-      //  Compute H_n.
-      _Tp __H_n, __H_nm1, __H_nm2;
-      unsigned int __i;
-      for  (__H_nm2 = __H_0, __H_nm1 = __H_1, __i = 2; __i <= __n; ++__i)
-        {
-          __H_n = 2 * (__x * __H_nm1 - (__i - 1) * __H_nm2);
-          __H_nm2 = __H_nm1;
-          __H_nm1 = __H_n;
-        }
-
-      return __H_n;
-    }
-
-
-    /**
-     *   @brief This routine returns the Hermite polynomial
-     *          of order n: \f$ H_n(x) \f$.
-     * 
-     *   The Hermite polynomial is defined by:
-     *   @f[
-     *     H_n(x) = (-1)^n e^{x^2} \frac{d^n}{dx^n} e^{-x^2}
-     *   @f]
-     *
-     *   @param __n The order of the Hermite polynomial.
-     *   @param __x The argument of the Hermite polynomial.
-     *   @return The value of the Hermite polynomial of order n
-     *           and argument x.
-     */
-    template<typename _Tp>
-    inline _Tp
-    __poly_hermite(unsigned int __n, _Tp __x)
-    {
-      if (__isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else
-        return __poly_hermite_recursion(__n, __x);
-    }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_POLY_HERMITE_TCC
diff --git a/openflow/usr/include/c++/5/tr1/poly_laguerre.tcc b/openflow/usr/include/c++/5/tr1/poly_laguerre.tcc
deleted file mode 100644
index 16a4adb..0000000
--- a/openflow/usr/include/c++/5/tr1/poly_laguerre.tcc
+++ /dev/null
@@ -1,319 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/poly_laguerre.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland based on:
-//   (1) Handbook of Mathematical Functions,
-//       Ed. Milton Abramowitz and Irene A. Stegun,
-//       Dover Publications,
-//       Section 13, pp. 509-510, Section 22 pp. 773-802
-//   (2) The Gnu Scientific Library, http://www.gnu.org/software/gsl
-
-#ifndef _GLIBCXX_TR1_POLY_LAGUERRE_TCC
-#define _GLIBCXX_TR1_POLY_LAGUERRE_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.2] Special functions
-
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     *   @brief This routine returns the associated Laguerre polynomial 
-     *          of order @f$ n @f$, degree @f$ \alpha @f$ for large n.
-     *   Abramowitz & Stegun, 13.5.21
-     *
-     *   @param __n The order of the Laguerre function.
-     *   @param __alpha The degree of the Laguerre function.
-     *   @param __x The argument of the Laguerre function.
-     *   @return The value of the Laguerre function of order n,
-     *           degree @f$ \alpha @f$, and argument x.
-     *
-     *  This is from the GNU Scientific Library.
-     */
-    template<typename _Tpa, typename _Tp>
-    _Tp
-    __poly_laguerre_large_n(unsigned __n, _Tpa __alpha1, _Tp __x)
-    {
-      const _Tp __a = -_Tp(__n);
-      const _Tp __b = _Tp(__alpha1) + _Tp(1);
-      const _Tp __eta = _Tp(2) * __b - _Tp(4) * __a;
-      const _Tp __cos2th = __x / __eta;
-      const _Tp __sin2th = _Tp(1) - __cos2th;
-      const _Tp __th = std::acos(std::sqrt(__cos2th));
-      const _Tp __pre_h = __numeric_constants<_Tp>::__pi_2()
-                        * __numeric_constants<_Tp>::__pi_2()
-                        * __eta * __eta * __cos2th * __sin2th;
-
-#if _GLIBCXX_USE_C99_MATH_TR1
-      const _Tp __lg_b = std::tr1::lgamma(_Tp(__n) + __b);
-      const _Tp __lnfact = std::tr1::lgamma(_Tp(__n + 1));
-#else
-      const _Tp __lg_b = __log_gamma(_Tp(__n) + __b);
-      const _Tp __lnfact = __log_gamma(_Tp(__n + 1));
-#endif
-
-      _Tp __pre_term1 = _Tp(0.5L) * (_Tp(1) - __b)
-                      * std::log(_Tp(0.25L) * __x * __eta);
-      _Tp __pre_term2 = _Tp(0.25L) * std::log(__pre_h);
-      _Tp __lnpre = __lg_b - __lnfact + _Tp(0.5L) * __x
-                      + __pre_term1 - __pre_term2;
-      _Tp __ser_term1 = std::sin(__a * __numeric_constants<_Tp>::__pi());
-      _Tp __ser_term2 = std::sin(_Tp(0.25L) * __eta
-                              * (_Tp(2) * __th
-                               - std::sin(_Tp(2) * __th))
-                               + __numeric_constants<_Tp>::__pi_4());
-      _Tp __ser = __ser_term1 + __ser_term2;
-
-      return std::exp(__lnpre) * __ser;
-    }
-
-
-    /**
-     *  @brief  Evaluate the polynomial based on the confluent hypergeometric
-     *          function in a safe way, with no restriction on the arguments.
-     *
-     *   The associated Laguerre function is defined by
-     *   @f[
-     *       L_n^\alpha(x) = \frac{(\alpha + 1)_n}{n!}
-     *                       _1F_1(-n; \alpha + 1; x)
-     *   @f]
-     *   where @f$ (\alpha)_n @f$ is the Pochhammer symbol and
-     *   @f$ _1F_1(a; c; x) @f$ is the confluent hypergeometric function.
-     *
-     *  This function assumes x != 0.
-     *
-     *  This is from the GNU Scientific Library.
-     */
-    template<typename _Tpa, typename _Tp>
-    _Tp
-    __poly_laguerre_hyperg(unsigned int __n, _Tpa __alpha1, _Tp __x)
-    {
-      const _Tp __b = _Tp(__alpha1) + _Tp(1);
-      const _Tp __mx = -__x;
-      const _Tp __tc_sgn = (__x < _Tp(0) ? _Tp(1)
-                         : ((__n % 2 == 1) ? -_Tp(1) : _Tp(1)));
-      //  Get |x|^n/n!
-      _Tp __tc = _Tp(1);
-      const _Tp __ax = std::abs(__x);
-      for (unsigned int __k = 1; __k <= __n; ++__k)
-        __tc *= (__ax / __k);
-
-      _Tp __term = __tc * __tc_sgn;
-      _Tp __sum = __term;
-      for (int __k = int(__n) - 1; __k >= 0; --__k)
-        {
-          __term *= ((__b + _Tp(__k)) / _Tp(int(__n) - __k))
-                  * _Tp(__k + 1) / __mx;
-          __sum += __term;
-        }
-
-      return __sum;
-    }
-
-
-    /**
-     *   @brief This routine returns the associated Laguerre polynomial 
-     *          of order @f$ n @f$, degree @f$ \alpha @f$: @f$ L_n^\alpha(x) @f$
-     *          by recursion.
-     *
-     *   The associated Laguerre function is defined by
-     *   @f[
-     *       L_n^\alpha(x) = \frac{(\alpha + 1)_n}{n!}
-     *                       _1F_1(-n; \alpha + 1; x)
-     *   @f]
-     *   where @f$ (\alpha)_n @f$ is the Pochhammer symbol and
-     *   @f$ _1F_1(a; c; x) @f$ is the confluent hypergeometric function.
-     *
-     *   The associated Laguerre polynomial is defined for integral
-     *   @f$ \alpha = m @f$ by:
-     *   @f[
-     *       L_n^m(x) = (-1)^m \frac{d^m}{dx^m} L_{n + m}(x)
-     *   @f]
-     *   where the Laguerre polynomial is defined by:
-     *   @f[
-     *       L_n(x) = \frac{e^x}{n!} \frac{d^n}{dx^n} (x^ne^{-x})
-     *   @f]
-     *
-     *   @param __n The order of the Laguerre function.
-     *   @param __alpha The degree of the Laguerre function.
-     *   @param __x The argument of the Laguerre function.
-     *   @return The value of the Laguerre function of order n,
-     *           degree @f$ \alpha @f$, and argument x.
-     */
-    template<typename _Tpa, typename _Tp>
-    _Tp
-    __poly_laguerre_recursion(unsigned int __n, _Tpa __alpha1, _Tp __x)
-    {
-      //   Compute l_0.
-      _Tp __l_0 = _Tp(1);
-      if  (__n == 0)
-        return __l_0;
-
-      //  Compute l_1^alpha.
-      _Tp __l_1 = -__x + _Tp(1) + _Tp(__alpha1);
-      if  (__n == 1)
-        return __l_1;
-
-      //  Compute l_n^alpha by recursion on n.
-      _Tp __l_n2 = __l_0;
-      _Tp __l_n1 = __l_1;
-      _Tp __l_n = _Tp(0);
-      for  (unsigned int __nn = 2; __nn <= __n; ++__nn)
-        {
-            __l_n = (_Tp(2 * __nn - 1) + _Tp(__alpha1) - __x)
-                  * __l_n1 / _Tp(__nn)
-                  - (_Tp(__nn - 1) + _Tp(__alpha1)) * __l_n2 / _Tp(__nn);
-            __l_n2 = __l_n1;
-            __l_n1 = __l_n;
-        }
-
-      return __l_n;
-    }
-
-
-    /**
-     *   @brief This routine returns the associated Laguerre polynomial
-     *          of order n, degree @f$ \alpha @f$: @f$ L_n^alpha(x) @f$.
-     *
-     *   The associated Laguerre function is defined by
-     *   @f[
-     *       L_n^\alpha(x) = \frac{(\alpha + 1)_n}{n!}
-     *                       _1F_1(-n; \alpha + 1; x)
-     *   @f]
-     *   where @f$ (\alpha)_n @f$ is the Pochhammer symbol and
-     *   @f$ _1F_1(a; c; x) @f$ is the confluent hypergeometric function.
-     *
-     *   The associated Laguerre polynomial is defined for integral
-     *   @f$ \alpha = m @f$ by:
-     *   @f[
-     *       L_n^m(x) = (-1)^m \frac{d^m}{dx^m} L_{n + m}(x)
-     *   @f]
-     *   where the Laguerre polynomial is defined by:
-     *   @f[
-     *       L_n(x) = \frac{e^x}{n!} \frac{d^n}{dx^n} (x^ne^{-x})
-     *   @f]
-     *
-     *   @param __n The order of the Laguerre function.
-     *   @param __alpha The degree of the Laguerre function.
-     *   @param __x The argument of the Laguerre function.
-     *   @return The value of the Laguerre function of order n,
-     *           degree @f$ \alpha @f$, and argument x.
-     */
-    template<typename _Tpa, typename _Tp>
-    _Tp
-    __poly_laguerre(unsigned int __n, _Tpa __alpha1, _Tp __x)
-    {
-      if (__x < _Tp(0))
-        std::__throw_domain_error(__N("Negative argument "
-                                      "in __poly_laguerre."));
-      //  Return NaN on NaN input.
-      else if (__isnan(__x))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__n == 0)
-        return _Tp(1);
-      else if (__n == 1)
-        return _Tp(1) + _Tp(__alpha1) - __x;
-      else if (__x == _Tp(0))
-        {
-          _Tp __prod = _Tp(__alpha1) + _Tp(1);
-          for (unsigned int __k = 2; __k <= __n; ++__k)
-            __prod *= (_Tp(__alpha1) + _Tp(__k)) / _Tp(__k);
-          return __prod;
-        }
-      else if (__n > 10000000 && _Tp(__alpha1) > -_Tp(1)
-            && __x < _Tp(2) * (_Tp(__alpha1) + _Tp(1)) + _Tp(4 * __n))
-        return __poly_laguerre_large_n(__n, __alpha1, __x);
-      else if (_Tp(__alpha1) >= _Tp(0)
-           || (__x > _Tp(0) && _Tp(__alpha1) < -_Tp(__n + 1)))
-        return __poly_laguerre_recursion(__n, __alpha1, __x);
-      else
-        return __poly_laguerre_hyperg(__n, __alpha1, __x);
-    }
-
-
-    /**
-     *   @brief This routine returns the associated Laguerre polynomial
-     *          of order n, degree m: @f$ L_n^m(x) @f$.
-     *
-     *   The associated Laguerre polynomial is defined for integral
-     *   @f$ \alpha = m @f$ by:
-     *   @f[
-     *       L_n^m(x) = (-1)^m \frac{d^m}{dx^m} L_{n + m}(x)
-     *   @f]
-     *   where the Laguerre polynomial is defined by:
-     *   @f[
-     *       L_n(x) = \frac{e^x}{n!} \frac{d^n}{dx^n} (x^ne^{-x})
-     *   @f]
-     *
-     *   @param __n The order of the Laguerre polynomial.
-     *   @param __m The degree of the Laguerre polynomial.
-     *   @param __x The argument of the Laguerre polynomial.
-     *   @return The value of the associated Laguerre polynomial of order n,
-     *           degree m, and argument x.
-     */
-    template<typename _Tp>
-    inline _Tp
-    __assoc_laguerre(unsigned int __n, unsigned int __m, _Tp __x)
-    { return __poly_laguerre<unsigned int, _Tp>(__n, __m, __x); }
-
-
-    /**
-     *   @brief This routine returns the Laguerre polynomial
-     *          of order n: @f$ L_n(x) @f$.
-     *
-     *   The Laguerre polynomial is defined by:
-     *   @f[
-     *       L_n(x) = \frac{e^x}{n!} \frac{d^n}{dx^n} (x^ne^{-x})
-     *   @f]
-     *
-     *   @param __n The order of the Laguerre polynomial.
-     *   @param __x The argument of the Laguerre polynomial.
-     *   @return The value of the Laguerre polynomial of order n
-     *           and argument x.
-     */
-    template<typename _Tp>
-    inline _Tp
-    __laguerre(unsigned int __n, _Tp __x)
-    { return __poly_laguerre<unsigned int, _Tp>(__n, 0, __x); }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_POLY_LAGUERRE_TCC
diff --git a/openflow/usr/include/c++/5/tr1/random b/openflow/usr/include/c++/5/tr1/random
deleted file mode 100644
index 3b3b046..0000000
--- a/openflow/usr/include/c++/5/tr1/random
+++ /dev/null
@@ -1,50 +0,0 @@
-// random number generation -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- * @file tr1/random
- * This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_RANDOM
-#define _GLIBCXX_TR1_RANDOM 1
-
-#pragma GCC system_header
-
-#include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <string>
-#include <iosfwd>
-#include <limits>
-#include <ext/type_traits.h>
-#include <ext/numeric_traits.h>
-#include <bits/concept_check.h>
-#include <debug/debug.h>
-#include <tr1/type_traits>
-#include <tr1/cmath>
-#include <tr1/random.h>
-#include <tr1/random.tcc>
-
-#endif // _GLIBCXX_TR1_RANDOM
diff --git a/openflow/usr/include/c++/5/tr1/random.h b/openflow/usr/include/c++/5/tr1/random.h
deleted file mode 100644
index 4147847..0000000
--- a/openflow/usr/include/c++/5/tr1/random.h
+++ /dev/null
@@ -1,2417 +0,0 @@
-// random number generation -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- * @file tr1/random.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/random}
- */
-
-#ifndef _GLIBCXX_TR1_RANDOM_H
-#define _GLIBCXX_TR1_RANDOM_H 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.1] Random number generation
-
-  /**
-   * @addtogroup tr1_random Random Number Generation
-   * A facility for generating random numbers on selected distributions.
-   * @{
-   */
-
-  /*
-   * Implementation-space details.
-   */
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    template<typename _UIntType, int __w, 
-	     bool = __w < std::numeric_limits<_UIntType>::digits>
-      struct _Shift
-      { static const _UIntType __value = 0; };
-
-    template<typename _UIntType, int __w>
-      struct _Shift<_UIntType, __w, true>
-      { static const _UIntType __value = _UIntType(1) << __w; };
-
-    template<typename _Tp, _Tp __a, _Tp __c, _Tp __m, bool>
-      struct _Mod;
-
-    // Dispatch based on modulus value to prevent divide-by-zero compile-time
-    // errors when m == 0.
-    template<typename _Tp, _Tp __a, _Tp __c, _Tp __m>
-      inline _Tp
-      __mod(_Tp __x)
-      { return _Mod<_Tp, __a, __c, __m, __m == 0>::__calc(__x); }
-
-    typedef __gnu_cxx::__conditional_type<(sizeof(unsigned) == 4),
-		    unsigned, unsigned long>::__type _UInt32Type;
-
-    /*
-     * An adaptor class for converting the output of any Generator into
-     * the input for a specific Distribution.
-     */
-    template<typename _Engine, typename _Distribution>
-      struct _Adaptor
-      { 
-	typedef typename remove_reference<_Engine>::type _BEngine;
-	typedef typename _BEngine::result_type           _Engine_result_type;
-	typedef typename _Distribution::input_type       result_type;
-
-      public:
-	_Adaptor(const _Engine& __g)
-	: _M_g(__g) { }
-
-	result_type
-	min() const
-	{
-	  result_type __return_value;
-	  if (is_integral<_Engine_result_type>::value
-	      && is_integral<result_type>::value)
-	    __return_value = _M_g.min();
-	  else
-	    __return_value = result_type(0);
-	  return __return_value;
-	}
-
-	result_type
-	max() const
-	{
-	  result_type __return_value;
-	  if (is_integral<_Engine_result_type>::value
-	      && is_integral<result_type>::value)
-	    __return_value = _M_g.max();
-	  else if (!is_integral<result_type>::value)
-	    __return_value = result_type(1);
-	  else
-	    __return_value = std::numeric_limits<result_type>::max() - 1;
-	  return __return_value;
-	}
-
-	/*
-	 * Converts a value generated by the adapted random number generator
-	 * into a value in the input domain for the dependent random number
-	 * distribution.
-	 *
-	 * Because the type traits are compile time constants only the
-	 * appropriate clause of the if statements will actually be emitted
-	 * by the compiler.
-	 */
-	result_type
-	operator()()
-	{
-	  result_type __return_value;
-	  if (is_integral<_Engine_result_type>::value
-	      && is_integral<result_type>::value)
-	    __return_value = _M_g();
-	  else if (!is_integral<_Engine_result_type>::value
-		   && !is_integral<result_type>::value)
-	    __return_value = result_type(_M_g() - _M_g.min())
-	      / result_type(_M_g.max() - _M_g.min());
-	  else if (is_integral<_Engine_result_type>::value
-		   && !is_integral<result_type>::value)
-	    __return_value = result_type(_M_g() - _M_g.min())
-	      / result_type(_M_g.max() - _M_g.min() + result_type(1));
-	  else
-	    __return_value = (((_M_g() - _M_g.min()) 
-			       / (_M_g.max() - _M_g.min()))
-			      * std::numeric_limits<result_type>::max());
-	  return __return_value;
-	}
-
-      private:
-	_Engine _M_g;
-      };
-
-    // Specialization for _Engine*.
-    template<typename _Engine, typename _Distribution>
-      struct _Adaptor<_Engine*, _Distribution>
-      {
-	typedef typename _Engine::result_type      _Engine_result_type;
-	typedef typename _Distribution::input_type result_type;
-
-      public:
-	_Adaptor(_Engine* __g)
-	: _M_g(__g) { }
-
-	result_type
-	min() const
-	{
-	  result_type __return_value;
-	  if (is_integral<_Engine_result_type>::value
-	      && is_integral<result_type>::value)
-	    __return_value = _M_g->min();
-	  else
-	    __return_value = result_type(0);
-	  return __return_value;
-	}
-
-	result_type
-	max() const
-	{
-	  result_type __return_value;
-	  if (is_integral<_Engine_result_type>::value
-	      && is_integral<result_type>::value)
-	    __return_value = _M_g->max();
-	  else if (!is_integral<result_type>::value)
-	    __return_value = result_type(1);
-	  else
-	    __return_value = std::numeric_limits<result_type>::max() - 1;
-	  return __return_value;
-	}
-
-	result_type
-	operator()()
-	{
-	  result_type __return_value;
-	  if (is_integral<_Engine_result_type>::value
-	      && is_integral<result_type>::value)
-	    __return_value = (*_M_g)();
-	  else if (!is_integral<_Engine_result_type>::value
-		   && !is_integral<result_type>::value)
-	    __return_value = result_type((*_M_g)() - _M_g->min())
-	      / result_type(_M_g->max() - _M_g->min());
-	  else if (is_integral<_Engine_result_type>::value
-		   && !is_integral<result_type>::value)
-	    __return_value = result_type((*_M_g)() - _M_g->min())
-	      / result_type(_M_g->max() - _M_g->min() + result_type(1));
-	  else
-	    __return_value = ((((*_M_g)() - _M_g->min()) 
-			       / (_M_g->max() - _M_g->min()))
-			      * std::numeric_limits<result_type>::max());
-	  return __return_value;
-	}
-
-      private:
-	_Engine* _M_g;
-      };
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace __detail
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * Produces random numbers on a given distribution function using a
-   * non-uniform random number generation engine.
-   *
-   * @todo the engine_value_type needs to be studied more carefully.
-   */
-  template<typename _Engine, typename _Dist>
-    class variate_generator
-    {
-      // Concept requirements.
-      __glibcxx_class_requires(_Engine, _CopyConstructibleConcept)
-      //  __glibcxx_class_requires(_Engine, _EngineConcept)
-      //  __glibcxx_class_requires(_Dist, _EngineConcept)
-
-    public:
-      typedef _Engine                                engine_type;
-      typedef __detail::_Adaptor<_Engine, _Dist>     engine_value_type;
-      typedef _Dist                                  distribution_type;
-      typedef typename _Dist::result_type            result_type;
-
-      // tr1:5.1.1 table 5.1 requirement
-      typedef typename __gnu_cxx::__enable_if<
-	is_arithmetic<result_type>::value, result_type>::__type _IsValidType;
-
-      /**
-       * Constructs a variate generator with the uniform random number
-       * generator @p __eng for the random distribution @p __dist.
-       *
-       * @throws Any exceptions which may thrown by the copy constructors of
-       * the @p _Engine or @p _Dist objects.
-       */
-      variate_generator(engine_type __eng, distribution_type __dist)
-      : _M_engine(__eng), _M_dist(__dist) { }
-
-      /**
-       * Gets the next generated value on the distribution.
-       */
-      result_type
-      operator()()
-      { return _M_dist(_M_engine); }
-
-      /**
-       * WTF?
-       */
-      template<typename _Tp>
-        result_type
-        operator()(_Tp __value)
-        { return _M_dist(_M_engine, __value); }
-
-      /**
-       * Gets a reference to the underlying uniform random number generator
-       * object.
-       */
-      engine_value_type&
-      engine()
-      { return _M_engine; }
-
-      /**
-       * Gets a const reference to the underlying uniform random number
-       * generator object.
-       */
-      const engine_value_type&
-      engine() const
-      { return _M_engine; }
-
-      /**
-       * Gets a reference to the underlying random distribution.
-       */
-      distribution_type&
-      distribution()
-      { return _M_dist; }
-
-      /**
-       * Gets a const reference to the underlying random distribution.
-       */
-      const distribution_type&
-      distribution() const
-      { return _M_dist; }
-
-      /**
-       * Gets the closed lower bound of the distribution interval.
-       */
-      result_type
-      min() const
-      { return this->distribution().min(); }
-
-      /**
-       * Gets the closed upper bound of the distribution interval.
-       */
-      result_type
-      max() const
-      { return this->distribution().max(); }
-
-    private:
-      engine_value_type _M_engine;
-      distribution_type _M_dist;
-    };
-
-
-  /**
-   * @addtogroup tr1_random_generators Random Number Generators
-   * @ingroup tr1_random
-   *
-   * These classes define objects which provide random or pseudorandom
-   * numbers, either from a discrete or a continuous interval.  The
-   * random number generator supplied as a part of this library are
-   * all uniform random number generators which provide a sequence of
-   * random number uniformly distributed over their range.
-   *
-   * A number generator is a function object with an operator() that
-   * takes zero arguments and returns a number.
-   *
-   * A compliant random number generator must satisfy the following
-   * requirements.  <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Random Number Generator Requirements</caption>
-   * <tr><td>To be documented.</td></tr> </table>
-   * 
-   * @{
-   */
-
-  /**
-   * @brief A model of a linear congruential random number generator.
-   *
-   * A random number generator that produces pseudorandom numbers using the
-   * linear function @f$x_{i+1}\leftarrow(ax_{i} + c) \bmod m @f$.
-   *
-   * The template parameter @p _UIntType must be an unsigned integral type
-   * large enough to store values up to (__m-1). If the template parameter
-   * @p __m is 0, the modulus @p __m used is
-   * std::numeric_limits<_UIntType>::max() plus 1. Otherwise, the template
-   * parameters @p __a and @p __c must be less than @p __m.
-   *
-   * The size of the state is @f$ 1 @f$.
-   */
-  template<class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    class linear_congruential
-    {
-      __glibcxx_class_requires(_UIntType, _UnsignedIntegerConcept)
-      //  __glibcpp_class_requires(__a < __m && __c < __m)
-
-    public:
-      /** The type of the generated random value. */
-      typedef _UIntType result_type;
-
-      /** The multiplier. */
-      static const _UIntType multiplier = __a;
-      /** An increment. */
-      static const _UIntType increment = __c;
-      /** The modulus. */
-      static const _UIntType modulus = __m;
-
-      /**
-       * Constructs a %linear_congruential random number generator engine with
-       * seed @p __s.  The default seed value is 1.
-       *
-       * @param __s The initial seed value.
-       */
-      explicit
-      linear_congruential(unsigned long __x0 = 1)
-      { this->seed(__x0); }
-
-      /**
-       * Constructs a %linear_congruential random number generator engine
-       * seeded from the generator function @p __g.
-       *
-       * @param __g The seed generator function.
-       */
-      template<class _Gen>
-        linear_congruential(_Gen& __g)
-        { this->seed(__g); }
-
-      /**
-       * Reseeds the %linear_congruential random number generator engine
-       * sequence to the seed @g __s.
-       *
-       * @param __s The new seed.
-       */
-      void
-      seed(unsigned long __s = 1);
-
-      /**
-       * Reseeds the %linear_congruential random number generator engine
-       * sequence using values from the generator function @p __g.
-       *
-       * @param __g the seed generator function.
-       */
-      template<class _Gen>
-        void
-        seed(_Gen& __g)
-        { seed(__g, typename is_fundamental<_Gen>::type()); }
-
-      /**
-       * Gets the smallest possible value in the output range.
-       *
-       * The minimum depends on the @p __c parameter: if it is zero, the
-       * minimum generated must be > 0, otherwise 0 is allowed.
-       */
-      result_type
-      min() const
-      { return (__detail::__mod<_UIntType, 1, 0, __m>(__c) == 0) ? 1 : 0; }
-
-      /**
-       * Gets the largest possible value in the output range.
-       */
-      result_type
-      max() const
-      { return __m - 1; }
-
-      /**
-       * Gets the next random number in the sequence.
-       */
-      result_type
-      operator()();
-
-      /**
-       * Compares two linear congruential random number generator
-       * objects of the same type for equality.
-       *  
-       * @param __lhs A linear congruential random number generator object.
-       * @param __rhs Another linear congruential random number generator obj.
-       *
-       * @returns true if the two objects are equal, false otherwise.
-       */
-      friend bool
-      operator==(const linear_congruential& __lhs,
-		 const linear_congruential& __rhs)
-      { return __lhs._M_x == __rhs._M_x; }
-
-      /**
-       * Compares two linear congruential random number generator
-       * objects of the same type for inequality.
-       *
-       * @param __lhs A linear congruential random number generator object.
-       * @param __rhs Another linear congruential random number generator obj.
-       *
-       * @returns true if the two objects are not equal, false otherwise.
-       */
-      friend bool
-      operator!=(const linear_congruential& __lhs,
-		 const linear_congruential& __rhs)
-      { return !(__lhs == __rhs); }
-
-      /**
-       * Writes the textual representation of the state x(i) of x to @p __os.
-       *
-       * @param __os  The output stream.
-       * @param __lcr A % linear_congruential random number generator.
-       * @returns __os.
-       */
-      template<class _UIntType1, _UIntType1 __a1, _UIntType1 __c1,
-	       _UIntType1 __m1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const linear_congruential<_UIntType1, __a1, __c1,
-		   __m1>& __lcr);
-
-      /**
-       * Sets the state of the engine by reading its textual
-       * representation from @p __is.
-       *
-       * The textual representation must have been previously written using an
-       * output stream whose imbued locale and whose type's template
-       * specialization arguments _CharT and _Traits were the same as those of
-       * @p __is.
-       *
-       * @param __is  The input stream.
-       * @param __lcr A % linear_congruential random number generator.
-       * @returns __is.
-       */
-      template<class _UIntType1, _UIntType1 __a1, _UIntType1 __c1,
-	       _UIntType1 __m1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   linear_congruential<_UIntType1, __a1, __c1, __m1>& __lcr);
-
-    private:
-      template<class _Gen>
-        void
-        seed(_Gen& __g, true_type)
-        { return seed(static_cast<unsigned long>(__g)); }
-
-      template<class _Gen>
-        void
-        seed(_Gen& __g, false_type);
-
-      _UIntType _M_x;
-    };
-
-  /**
-   * The classic Minimum Standard rand0 of Lewis, Goodman, and Miller.
-   */
-  typedef linear_congruential<unsigned long, 16807, 0, 2147483647> minstd_rand0;
-
-  /**
-   * An alternative LCR (Lehmer Generator function) .
-   */
-  typedef linear_congruential<unsigned long, 48271, 0, 2147483647> minstd_rand;
-
-
-  /**
-   * A generalized feedback shift register discrete random number generator.
-   *
-   * This algorithm avoids multiplication and division and is designed to be
-   * friendly to a pipelined architecture.  If the parameters are chosen
-   * correctly, this generator will produce numbers with a very long period and
-   * fairly good apparent entropy, although still not cryptographically strong.
-   *
-   * The best way to use this generator is with the predefined mt19937 class.
-   *
-   * This algorithm was originally invented by Makoto Matsumoto and
-   * Takuji Nishimura.
-   *
-   * @var word_size   The number of bits in each element of the state vector.
-   * @var state_size  The degree of recursion.
-   * @var shift_size  The period parameter.
-   * @var mask_bits   The separation point bit index.
-   * @var parameter_a The last row of the twist matrix.
-   * @var output_u    The first right-shift tempering matrix parameter.
-   * @var output_s    The first left-shift tempering matrix parameter.
-   * @var output_b    The first left-shift tempering matrix mask.
-   * @var output_t    The second left-shift tempering matrix parameter.
-   * @var output_c    The second left-shift tempering matrix mask.
-   * @var output_l    The second right-shift tempering matrix parameter.
-   */
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s, _UIntType __b, int __t,
-	   _UIntType __c, int __l>
-    class mersenne_twister
-    {
-      __glibcxx_class_requires(_UIntType, _UnsignedIntegerConcept)
-
-    public:
-      // types
-      typedef _UIntType result_type;
-
-      // parameter values
-      static const int       word_size   = __w;
-      static const int       state_size  = __n;
-      static const int       shift_size  = __m;
-      static const int       mask_bits   = __r;
-      static const _UIntType parameter_a = __a;
-      static const int       output_u    = __u;
-      static const int       output_s    = __s;
-      static const _UIntType output_b    = __b;
-      static const int       output_t    = __t;
-      static const _UIntType output_c    = __c;
-      static const int       output_l    = __l;
-
-      // constructors and member function
-      mersenne_twister()
-      { seed(); }
-
-      explicit
-      mersenne_twister(unsigned long __value)
-      { seed(__value); }
-
-      template<class _Gen>
-        mersenne_twister(_Gen& __g)
-        { seed(__g); }
-
-      void
-      seed()
-      { seed(5489UL); }
-
-      void
-      seed(unsigned long __value);
-
-      template<class _Gen>
-        void
-        seed(_Gen& __g)
-        { seed(__g, typename is_fundamental<_Gen>::type()); }
-
-      result_type
-      min() const
-      { return 0; };
-
-      result_type
-      max() const
-      { return __detail::_Shift<_UIntType, __w>::__value - 1; }
-
-      result_type
-      operator()();
-
-      /**
-       * Compares two % mersenne_twister random number generator objects of
-       * the same type for equality.
-       *
-       * @param __lhs A % mersenne_twister random number generator object.
-       * @param __rhs Another % mersenne_twister random number generator
-       *              object.
-       *
-       * @returns true if the two objects are equal, false otherwise.
-       */
-      friend bool
-      operator==(const mersenne_twister& __lhs,
-		 const mersenne_twister& __rhs)
-      { return std::equal(__lhs._M_x, __lhs._M_x + state_size, __rhs._M_x); }
-
-      /**
-       * Compares two % mersenne_twister random number generator objects of
-       * the same type for inequality.
-       *
-       * @param __lhs A % mersenne_twister random number generator object.
-       * @param __rhs Another % mersenne_twister random number generator
-       *              object.
-       *
-       * @returns true if the two objects are not equal, false otherwise.
-       */
-      friend bool
-      operator!=(const mersenne_twister& __lhs,
-		 const mersenne_twister& __rhs)
-      { return !(__lhs == __rhs); }
-
-      /**
-       * Inserts the current state of a % mersenne_twister random number
-       * generator engine @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A % mersenne_twister random number generator engine.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<class _UIntType1, int __w1, int __n1, int __m1, int __r1,
-	       _UIntType1 __a1, int __u1, int __s1, _UIntType1 __b1, int __t1,
-	       _UIntType1 __c1, int __l1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const mersenne_twister<_UIntType1, __w1, __n1, __m1, __r1,
-		   __a1, __u1, __s1, __b1, __t1, __c1, __l1>& __x);
-
-      /**
-       * Extracts the current state of a % mersenne_twister random number
-       * generator engine @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A % mersenne_twister random number generator engine.
-       *
-       * @returns The input stream with the state of @p __x extracted or in
-       * an error state.
-       */
-      template<class _UIntType1, int __w1, int __n1, int __m1, int __r1,
-	       _UIntType1 __a1, int __u1, int __s1, _UIntType1 __b1, int __t1,
-	       _UIntType1 __c1, int __l1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   mersenne_twister<_UIntType1, __w1, __n1, __m1, __r1,
-		   __a1, __u1, __s1, __b1, __t1, __c1, __l1>& __x);
-
-    private:
-      template<class _Gen>
-        void
-        seed(_Gen& __g, true_type)
-        { return seed(static_cast<unsigned long>(__g)); }
-
-      template<class _Gen>
-        void
-        seed(_Gen& __g, false_type);
-
-      _UIntType _M_x[state_size];
-      int       _M_p;
-    };
-
-  /**
-   * The classic Mersenne Twister.
-   *
-   * Reference:
-   * M. Matsumoto and T. Nishimura, Mersenne Twister: A 623-Dimensionally
-   * Equidistributed Uniform Pseudo-Random Number Generator, ACM Transactions
-   * on Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.
-   */
-  typedef mersenne_twister<
-    unsigned long, 32, 624, 397, 31,
-    0x9908b0dful, 11, 7,
-    0x9d2c5680ul, 15,
-    0xefc60000ul, 18
-    > mt19937;
-
-
-  /**
-   * @brief The Marsaglia-Zaman generator.
-   * 
-   * This is a model of a Generalized Fibonacci discrete random number
-   * generator, sometimes referred to as the SWC generator.
-   *
-   * A discrete random number generator that produces pseudorandom
-   * numbers using @f$x_{i}\leftarrow(x_{i - s} - x_{i - r} -
-   * carry_{i-1}) \bmod m @f$.
-   *
-   * The size of the state is @f$ r @f$
-   * and the maximum period of the generator is @f$ m^r - m^s -1 @f$.
-   *
-   * N1688[4.13] says <em>the template parameter _IntType shall denote
-   * an integral type large enough to store values up to m</em>.
-   *
-   * @var _M_x     The state of the generator.  This is a ring buffer.
-   * @var _M_carry The carry.
-   * @var _M_p     Current index of x(i - r).
-   */
-  template<typename _IntType, _IntType __m, int __s, int __r>
-    class subtract_with_carry
-    {
-      __glibcxx_class_requires(_IntType, _IntegerConcept)
-
-    public:
-      /** The type of the generated random value. */
-      typedef _IntType result_type;
-      
-      // parameter values
-      static const _IntType modulus   = __m;
-      static const int      long_lag  = __r;
-      static const int      short_lag = __s;
-
-      /**
-       * Constructs a default-initialized % subtract_with_carry random number
-       * generator.
-       */
-      subtract_with_carry()
-      { this->seed(); }
-
-      /**
-       * Constructs an explicitly seeded % subtract_with_carry random number
-       * generator.
-       */
-      explicit
-      subtract_with_carry(unsigned long __value)
-      { this->seed(__value); }
-
-      /**
-       * Constructs a %subtract_with_carry random number generator engine
-       * seeded from the generator function @p __g.
-       *
-       * @param __g The seed generator function.
-       */
-      template<class _Gen>
-        subtract_with_carry(_Gen& __g)
-        { this->seed(__g); }
-
-      /**
-       * Seeds the initial state @f$ x_0 @f$ of the random number generator.
-       *
-       * N1688[4.19] modifies this as follows.  If @p __value == 0,
-       * sets value to 19780503.  In any case, with a linear
-       * congruential generator lcg(i) having parameters @f$ m_{lcg} =
-       * 2147483563, a_{lcg} = 40014, c_{lcg} = 0, and lcg(0) = value
-       * @f$, sets @f$ x_{-r} \dots x_{-1} @f$ to @f$ lcg(1) \bmod m
-       * \dots lcg(r) \bmod m @f$ respectively.  If @f$ x_{-1} = 0 @f$
-       * set carry to 1, otherwise sets carry to 0.
-       */
-      void
-      seed(unsigned long __value = 19780503);
-
-      /**
-       * Seeds the initial state @f$ x_0 @f$ of the % subtract_with_carry
-       * random number generator.
-       */
-      template<class _Gen>
-        void
-        seed(_Gen& __g)
-        { seed(__g, typename is_fundamental<_Gen>::type()); }
-
-      /**
-       * Gets the inclusive minimum value of the range of random integers
-       * returned by this generator.
-       */
-      result_type
-      min() const
-      { return 0; }
-
-      /**
-       * Gets the inclusive maximum value of the range of random integers
-       * returned by this generator.
-       */
-      result_type
-      max() const
-      { return this->modulus - 1; }
-
-      /**
-       * Gets the next random number in the sequence.
-       */
-      result_type
-      operator()();
-
-      /**
-       * Compares two % subtract_with_carry random number generator objects of
-       * the same type for equality.
-       *
-       * @param __lhs A % subtract_with_carry random number generator object.
-       * @param __rhs Another % subtract_with_carry random number generator
-       *              object.
-       *
-       * @returns true if the two objects are equal, false otherwise.
-       */
-      friend bool
-      operator==(const subtract_with_carry& __lhs,
-		 const subtract_with_carry& __rhs)
-      { return std::equal(__lhs._M_x, __lhs._M_x + long_lag, __rhs._M_x); }
-
-      /**
-       * Compares two % subtract_with_carry random number generator objects of
-       * the same type for inequality.
-       *
-       * @param __lhs A % subtract_with_carry random number generator object.
-       * @param __rhs Another % subtract_with_carry random number generator
-       *              object.
-       *
-       * @returns true if the two objects are not equal, false otherwise.
-       */
-      friend bool
-      operator!=(const subtract_with_carry& __lhs,
-		 const subtract_with_carry& __rhs)
-      { return !(__lhs == __rhs); }
-
-      /**
-       * Inserts the current state of a % subtract_with_carry random number
-       * generator engine @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A % subtract_with_carry random number generator engine.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _IntType1, _IntType1 __m1, int __s1, int __r1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const subtract_with_carry<_IntType1, __m1, __s1,
-		   __r1>& __x);
-
-      /**
-       * Extracts the current state of a % subtract_with_carry random number
-       * generator engine @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A % subtract_with_carry random number generator engine.
-       *
-       * @returns The input stream with the state of @p __x extracted or in
-       * an error state.
-       */
-      template<typename _IntType1, _IntType1 __m1, int __s1, int __r1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   subtract_with_carry<_IntType1, __m1, __s1, __r1>& __x);
-
-    private:
-      template<class _Gen>
-        void
-        seed(_Gen& __g, true_type)
-        { return seed(static_cast<unsigned long>(__g)); }
-
-      template<class _Gen>
-        void
-        seed(_Gen& __g, false_type);
-
-      typedef typename __gnu_cxx::__add_unsigned<_IntType>::__type _UIntType;
-
-      _UIntType  _M_x[long_lag];
-      _UIntType  _M_carry;
-      int        _M_p;
-    };
-
-
-  /**
-   * @brief The Marsaglia-Zaman generator (floats version).
-   *
-   * @var _M_x     The state of the generator.  This is a ring buffer.
-   * @var _M_carry The carry.
-   * @var _M_p     Current index of x(i - r).
-   * @var _M_npows Precomputed negative powers of 2.   
-   */
-  template<typename _RealType, int __w, int __s, int __r>
-    class subtract_with_carry_01
-    {
-    public:
-      /** The type of the generated random value. */
-      typedef _RealType result_type;
-      
-      // parameter values
-      static const int      word_size = __w;
-      static const int      long_lag  = __r;
-      static const int      short_lag = __s;
-
-      /**
-       * Constructs a default-initialized % subtract_with_carry_01 random
-       * number generator.
-       */
-      subtract_with_carry_01()
-      {
-	this->seed();
-	_M_initialize_npows();
-      }
-
-      /**
-       * Constructs an explicitly seeded % subtract_with_carry_01 random number
-       * generator.
-       */
-      explicit
-      subtract_with_carry_01(unsigned long __value)
-      {
-	this->seed(__value);
-	_M_initialize_npows();
-      }
-
-      /**
-       * Constructs a % subtract_with_carry_01 random number generator engine
-       * seeded from the generator function @p __g.
-       *
-       * @param __g The seed generator function.
-       */
-      template<class _Gen>
-        subtract_with_carry_01(_Gen& __g)
-        {
-	  this->seed(__g);
-	  _M_initialize_npows();	  
-	}
-
-      /**
-       * Seeds the initial state @f$ x_0 @f$ of the random number generator.
-       */
-      void
-      seed(unsigned long __value = 19780503);
-
-      /**
-       * Seeds the initial state @f$ x_0 @f$ of the % subtract_with_carry_01
-       * random number generator.
-       */
-      template<class _Gen>
-        void
-        seed(_Gen& __g)
-        { seed(__g, typename is_fundamental<_Gen>::type()); }
-
-      /**
-       * Gets the minimum value of the range of random floats
-       * returned by this generator.
-       */
-      result_type
-      min() const
-      { return 0.0; }
-
-      /**
-       * Gets the maximum value of the range of random floats
-       * returned by this generator.
-       */
-      result_type
-      max() const
-      { return 1.0; }
-
-      /**
-       * Gets the next random number in the sequence.
-       */
-      result_type
-      operator()();
-
-      /**
-       * Compares two % subtract_with_carry_01 random number generator objects
-       * of the same type for equality.
-       *
-       * @param __lhs A % subtract_with_carry_01 random number
-       *              generator object.
-       * @param __rhs Another % subtract_with_carry_01 random number generator
-       *              object.
-       *
-       * @returns true if the two objects are equal, false otherwise.
-       */
-      friend bool
-      operator==(const subtract_with_carry_01& __lhs,
-		 const subtract_with_carry_01& __rhs)
-      {
-	for (int __i = 0; __i < long_lag; ++__i)
-	  if (!std::equal(__lhs._M_x[__i], __lhs._M_x[__i] + __n,
-			  __rhs._M_x[__i]))
-	    return false;
-	return true;
-      }
-
-      /**
-       * Compares two % subtract_with_carry_01 random number generator objects
-       * of the same type for inequality.
-       *
-       * @param __lhs A % subtract_with_carry_01 random number
-       *              generator object.
-       *
-       * @param __rhs Another % subtract_with_carry_01 random number generator
-       *              object.
-       *
-       * @returns true if the two objects are not equal, false otherwise.
-       */
-      friend bool
-      operator!=(const subtract_with_carry_01& __lhs,
-		 const subtract_with_carry_01& __rhs)
-      { return !(__lhs == __rhs); }
-
-      /**
-       * Inserts the current state of a % subtract_with_carry_01 random number
-       * generator engine @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A % subtract_with_carry_01 random number generator engine.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, int __w1, int __s1, int __r1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const subtract_with_carry_01<_RealType1, __w1, __s1,
-		   __r1>& __x);
-
-      /**
-       * Extracts the current state of a % subtract_with_carry_01 random number
-       * generator engine @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A % subtract_with_carry_01 random number generator engine.
-       *
-       * @returns The input stream with the state of @p __x extracted or in
-       * an error state.
-       */
-      template<typename _RealType1, int __w1, int __s1, int __r1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   subtract_with_carry_01<_RealType1, __w1, __s1, __r1>& __x);
-
-    private:
-      template<class _Gen>
-        void
-        seed(_Gen& __g, true_type)
-        { return seed(static_cast<unsigned long>(__g)); }
-
-      template<class _Gen>
-        void
-        seed(_Gen& __g, false_type);
-
-      void
-      _M_initialize_npows();
-
-      static const int __n = (__w + 31) / 32;
-
-      typedef __detail::_UInt32Type _UInt32Type;
-      _UInt32Type  _M_x[long_lag][__n];
-      _RealType    _M_npows[__n];
-      _UInt32Type  _M_carry;
-      int          _M_p;
-    };
-
-  typedef subtract_with_carry_01<float, 24, 10, 24>   ranlux_base_01;
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 508. Bad parameters for ranlux64_base_01.
-  typedef subtract_with_carry_01<double, 48, 5, 12> ranlux64_base_01;  
-
-
-  /**
-   * Produces random numbers from some base engine by discarding blocks of
-   * data.
-   *
-   * 0 <= @p __r <= @p __p
-   */
-  template<class _UniformRandomNumberGenerator, int __p, int __r>
-    class discard_block
-    {
-      // __glibcxx_class_requires(typename base_type::result_type,
-      //                          ArithmeticTypeConcept)
-
-    public:
-      /** The type of the underlying generator engine. */
-      typedef _UniformRandomNumberGenerator   base_type;
-      /** The type of the generated random value. */
-      typedef typename base_type::result_type result_type;
-
-      // parameter values
-      static const int block_size = __p;
-      static const int used_block = __r;
-
-      /**
-       * Constructs a default %discard_block engine.
-       *
-       * The underlying engine is default constructed as well.
-       */
-      discard_block()
-      : _M_n(0) { }
-
-      /**
-       * Copy constructs a %discard_block engine.
-       *
-       * Copies an existing base class random number generator.
-       * @param rng An existing (base class) engine object.
-       */
-      explicit
-      discard_block(const base_type& __rng)
-      : _M_b(__rng), _M_n(0) { }
-
-      /**
-       * Seed constructs a %discard_block engine.
-       *
-       * Constructs the underlying generator engine seeded with @p __s.
-       * @param __s A seed value for the base class engine.
-       */
-      explicit
-      discard_block(unsigned long __s)
-      : _M_b(__s), _M_n(0) { }
-
-      /**
-       * Generator construct a %discard_block engine.
-       *
-       * @param __g A seed generator function.
-       */
-      template<class _Gen>
-        discard_block(_Gen& __g)
-	: _M_b(__g), _M_n(0) { }
-
-      /**
-       * Reseeds the %discard_block object with the default seed for the
-       * underlying base class generator engine.
-       */
-      void seed()
-      {
-	_M_b.seed();
-	_M_n = 0;
-      }
-
-      /**
-       * Reseeds the %discard_block object with the given seed generator
-       * function.
-       * @param __g A seed generator function.
-       */
-      template<class _Gen>
-        void seed(_Gen& __g)
-        {
-	  _M_b.seed(__g);
-	  _M_n = 0;
-	}
-
-      /**
-       * Gets a const reference to the underlying generator engine object.
-       */
-      const base_type&
-      base() const
-      { return _M_b; }
-
-      /**
-       * Gets the minimum value in the generated random number range.
-       */
-      result_type
-      min() const
-      { return _M_b.min(); }
-
-      /**
-       * Gets the maximum value in the generated random number range.
-       */
-      result_type
-      max() const
-      { return _M_b.max(); }
-
-      /**
-       * Gets the next value in the generated random number sequence.
-       */
-      result_type
-      operator()();
-
-      /**
-       * Compares two %discard_block random number generator objects of
-       * the same type for equality.
-       *
-       * @param __lhs A %discard_block random number generator object.
-       * @param __rhs Another %discard_block random number generator
-       *              object.
-       *
-       * @returns true if the two objects are equal, false otherwise.
-       */
-      friend bool
-      operator==(const discard_block& __lhs, const discard_block& __rhs)
-      { return (__lhs._M_b == __rhs._M_b) && (__lhs._M_n == __rhs._M_n); }
-
-      /**
-       * Compares two %discard_block random number generator objects of
-       * the same type for inequality.
-       *
-       * @param __lhs A %discard_block random number generator object.
-       * @param __rhs Another %discard_block random number generator
-       *              object.
-       *
-       * @returns true if the two objects are not equal, false otherwise.
-       */
-      friend bool
-      operator!=(const discard_block& __lhs, const discard_block& __rhs)
-      { return !(__lhs == __rhs); }
-
-      /**
-       * Inserts the current state of a %discard_block random number
-       * generator engine @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %discard_block random number generator engine.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<class _UniformRandomNumberGenerator1, int __p1, int __r1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const discard_block<_UniformRandomNumberGenerator1,
-		   __p1, __r1>& __x);
-
-      /**
-       * Extracts the current state of a % subtract_with_carry random number
-       * generator engine @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %discard_block random number generator engine.
-       *
-       * @returns The input stream with the state of @p __x extracted or in
-       * an error state.
-       */
-      template<class _UniformRandomNumberGenerator1, int __p1, int __r1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   discard_block<_UniformRandomNumberGenerator1,
-		   __p1, __r1>& __x);
-
-    private:
-      base_type _M_b;
-      int       _M_n;
-    };
-
-
-  /**
-   * James's luxury-level-3 integer adaptation of Luescher's generator.
-   */
-  typedef discard_block<
-    subtract_with_carry<unsigned long, (1UL << 24), 10, 24>,
-      223,
-      24
-      > ranlux3;
-
-  /**
-   * James's luxury-level-4 integer adaptation of Luescher's generator.
-   */
-  typedef discard_block<
-    subtract_with_carry<unsigned long, (1UL << 24), 10, 24>,
-      389,
-      24
-      > ranlux4;
-
-  typedef discard_block<
-    subtract_with_carry_01<float, 24, 10, 24>,
-      223,
-      24
-      > ranlux3_01;
-
-  typedef discard_block<
-    subtract_with_carry_01<float, 24, 10, 24>,
-      389,
-      24
-      > ranlux4_01;
-
-
-  /**
-   * A random number generator adaptor class that combines two random number
-   * generator engines into a single output sequence.
-   */
-  template<class _UniformRandomNumberGenerator1, int __s1,
-	   class _UniformRandomNumberGenerator2, int __s2>
-    class xor_combine
-    {
-      // __glibcxx_class_requires(typename _UniformRandomNumberGenerator1::
-      //                          result_type, ArithmeticTypeConcept)
-      // __glibcxx_class_requires(typename _UniformRandomNumberGenerator2::
-      //                          result_type, ArithmeticTypeConcept)
-
-    public:
-      /** The type of the first underlying generator engine. */
-      typedef _UniformRandomNumberGenerator1   base1_type;
-      /** The type of the second underlying generator engine. */
-      typedef _UniformRandomNumberGenerator2   base2_type;
-
-    private:
-      typedef typename base1_type::result_type _Result_type1;
-      typedef typename base2_type::result_type _Result_type2;
-
-    public:
-      /** The type of the generated random value. */
-      typedef typename __gnu_cxx::__conditional_type<(sizeof(_Result_type1)
-						      > sizeof(_Result_type2)),
-	_Result_type1, _Result_type2>::__type result_type;
-
-      // parameter values
-      static const int shift1 = __s1;
-      static const int shift2 = __s2;
-
-      // constructors and member function
-      xor_combine()
-      : _M_b1(), _M_b2()	
-      { _M_initialize_max(); }
-
-      xor_combine(const base1_type& __rng1, const base2_type& __rng2)
-      : _M_b1(__rng1), _M_b2(__rng2)
-      { _M_initialize_max(); }
-
-      xor_combine(unsigned long __s)
-      : _M_b1(__s), _M_b2(__s + 1)
-      { _M_initialize_max(); }
-
-      template<class _Gen>
-        xor_combine(_Gen& __g)
-	: _M_b1(__g), _M_b2(__g)
-        { _M_initialize_max(); }
-
-      void
-      seed()
-      {
-	_M_b1.seed();
-	_M_b2.seed();
-      }
-
-      template<class _Gen>
-        void
-        seed(_Gen& __g)
-        {
-	  _M_b1.seed(__g);
-	  _M_b2.seed(__g);
-	}
-
-      const base1_type&
-      base1() const
-      { return _M_b1; }
-
-      const base2_type&
-      base2() const
-      { return _M_b2; }
-
-      result_type
-      min() const
-      { return 0; }
-
-      result_type
-      max() const
-      { return _M_max; }
-
-      /**
-       * Gets the next random number in the sequence.
-       */
-      // NB: Not exactly the TR1 formula, per N2079 instead.
-      result_type
-      operator()()
-      {
-	return ((result_type(_M_b1() - _M_b1.min()) << shift1)
-		^ (result_type(_M_b2() - _M_b2.min()) << shift2));
-      }
-
-      /**
-       * Compares two %xor_combine random number generator objects of
-       * the same type for equality.
-       *
-       * @param __lhs A %xor_combine random number generator object.
-       * @param __rhs Another %xor_combine random number generator
-       *              object.
-       *
-       * @returns true if the two objects are equal, false otherwise.
-       */
-      friend bool
-      operator==(const xor_combine& __lhs, const xor_combine& __rhs)
-      {
-	return (__lhs.base1() == __rhs.base1())
-	        && (__lhs.base2() == __rhs.base2());
-      }
-
-      /**
-       * Compares two %xor_combine random number generator objects of
-       * the same type for inequality.
-       *
-       * @param __lhs A %xor_combine random number generator object.
-       * @param __rhs Another %xor_combine random number generator
-       *              object.
-       *
-       * @returns true if the two objects are not equal, false otherwise.
-       */
-      friend bool
-      operator!=(const xor_combine& __lhs, const xor_combine& __rhs)
-      { return !(__lhs == __rhs); }
-
-      /**
-       * Inserts the current state of a %xor_combine random number
-       * generator engine @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %xor_combine random number generator engine.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<class _UniformRandomNumberGenerator11, int __s11,
-	       class _UniformRandomNumberGenerator21, int __s21,
-	       typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const xor_combine<_UniformRandomNumberGenerator11, __s11,
-		   _UniformRandomNumberGenerator21, __s21>& __x);
-
-      /**
-       * Extracts the current state of a %xor_combine random number
-       * generator engine @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %xor_combine random number generator engine.
-       *
-       * @returns The input stream with the state of @p __x extracted or in
-       * an error state.
-       */
-      template<class _UniformRandomNumberGenerator11, int __s11,
-	       class _UniformRandomNumberGenerator21, int __s21,
-	       typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   xor_combine<_UniformRandomNumberGenerator11, __s11,
-		   _UniformRandomNumberGenerator21, __s21>& __x);
-
-    private:
-      void
-      _M_initialize_max();
-
-      result_type
-      _M_initialize_max_aux(result_type, result_type, int);
-
-      base1_type  _M_b1;
-      base2_type  _M_b2;
-      result_type _M_max;
-    };
-
-
-  /**
-   * A standard interface to a platform-specific non-deterministic
-   * random number generator (if any are available).
-   */
-  class random_device
-  {
-  public:
-    // types
-    typedef unsigned int result_type;
-
-    // constructors, destructors and member functions
-
-#ifdef _GLIBCXX_USE_RANDOM_TR1
-
-    explicit
-    random_device(const std::string& __token = "/dev/urandom")
-    {
-      if ((__token != "/dev/urandom" && __token != "/dev/random")
-	  || !(_M_file = std::fopen(__token.c_str(), "rb")))
-	std::__throw_runtime_error(__N("random_device::"
-				       "random_device(const std::string&)"));
-    }
-
-    ~random_device()
-    { std::fclose(_M_file); }
-
-#else
-
-    explicit
-    random_device(const std::string& __token = "mt19937")
-    : _M_mt(_M_strtoul(__token)) { }
-
-  private:
-    static unsigned long
-    _M_strtoul(const std::string& __str)
-    {
-      unsigned long __ret = 5489UL;
-      if (__str != "mt19937")
-	{
-	  const char* __nptr = __str.c_str();
-	  char* __endptr;
-	  __ret = std::strtoul(__nptr, &__endptr, 0);
-	  if (*__nptr == '\0' || *__endptr != '\0')
-	    std::__throw_runtime_error(__N("random_device::_M_strtoul"
-					   "(const std::string&)"));
-	}
-      return __ret;
-    }
-
-  public:
-
-#endif
-
-    result_type
-    min() const
-    { return std::numeric_limits<result_type>::min(); }
-
-    result_type
-    max() const
-    { return std::numeric_limits<result_type>::max(); }
-
-    double
-    entropy() const
-    { return 0.0; }
-
-    result_type
-    operator()()
-    {
-#ifdef _GLIBCXX_USE_RANDOM_TR1
-      result_type __ret;
-      std::fread(reinterpret_cast<void*>(&__ret), sizeof(result_type),
-		 1, _M_file);
-      return __ret;
-#else
-      return _M_mt();
-#endif
-    }
-
-  private:
-    random_device(const random_device&);
-    void operator=(const random_device&);
-
-#ifdef _GLIBCXX_USE_RANDOM_TR1
-    FILE*        _M_file;
-#else
-    mt19937      _M_mt;
-#endif
-  };
-
-  /* @} */ // group tr1_random_generators
-
-  /**
-   * @addtogroup tr1_random_distributions Random Number Distributions
-   * @ingroup tr1_random
-   * @{
-   */
-
-  /**
-   * @addtogroup tr1_random_distributions_discrete Discrete Distributions
-   * @ingroup tr1_random_distributions
-   * @{
-   */
-
-  /**
-   * @brief Uniform discrete distribution for random numbers.
-   * A discrete random distribution on the range @f$[min, max]@f$ with equal
-   * probability throughout the range.
-   */
-  template<typename _IntType = int>
-    class uniform_int
-    {
-      __glibcxx_class_requires(_IntType, _IntegerConcept)
- 
-    public:
-      /** The type of the parameters of the distribution. */
-      typedef _IntType input_type;
-      /** The type of the range of the distribution. */
-      typedef _IntType result_type;
-
-    public:
-      /**
-       * Constructs a uniform distribution object.
-       */
-      explicit
-      uniform_int(_IntType __min = 0, _IntType __max = 9)
-      : _M_min(__min), _M_max(__max)
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_min <= _M_max);
-      }
-
-      /**
-       * Gets the inclusive lower bound of the distribution range.
-       */
-      result_type
-      min() const
-      { return _M_min; }
-
-      /**
-       * Gets the inclusive upper bound of the distribution range.
-       */
-      result_type
-      max() const
-      { return _M_max; }
-
-      /**
-       * Resets the distribution state.
-       *
-       * Does nothing for the uniform integer distribution.
-       */
-      void
-      reset() { }
-
-      /**
-       * Gets a uniformly distributed random number in the range
-       * @f$(min, max)@f$.
-       */
-      template<typename _UniformRandomNumberGenerator>
-        result_type
-        operator()(_UniformRandomNumberGenerator& __urng)
-        {
-	  typedef typename _UniformRandomNumberGenerator::result_type
-	    _UResult_type;
-	  return _M_call(__urng, _M_min, _M_max,
-			 typename is_integral<_UResult_type>::type());
-	}
-
-      /**
-       * Gets a uniform random number in the range @f$[0, n)@f$.
-       *
-       * This function is aimed at use with std::random_shuffle.
-       */
-      template<typename _UniformRandomNumberGenerator>
-        result_type
-        operator()(_UniformRandomNumberGenerator& __urng, result_type __n)
-        {
-	  typedef typename _UniformRandomNumberGenerator::result_type
-	    _UResult_type;
-	  return _M_call(__urng, 0, __n - 1,
-			 typename is_integral<_UResult_type>::type());
-	}
-
-      /**
-       * Inserts a %uniform_int random number distribution @p __x into the
-       * output stream @p os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %uniform_int random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _IntType1, typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const uniform_int<_IntType1>& __x);
-
-      /**
-       * Extracts a %uniform_int random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %uniform_int random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _IntType1, typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   uniform_int<_IntType1>& __x);
-
-    private:
-      template<typename _UniformRandomNumberGenerator>
-        result_type
-        _M_call(_UniformRandomNumberGenerator& __urng,
-		result_type __min, result_type __max, true_type);
-
-      template<typename _UniformRandomNumberGenerator>
-        result_type
-        _M_call(_UniformRandomNumberGenerator& __urng,
-		result_type __min, result_type __max, false_type)
-        {
-	  return result_type((__urng() - __urng.min())
-			     / (__urng.max() - __urng.min())
-			     * (__max - __min + 1)) + __min;
-	}
-
-      _IntType _M_min;
-      _IntType _M_max;
-    };
-
-
-  /**
-   * @brief A Bernoulli random number distribution.
-   *
-   * Generates a sequence of true and false values with likelihood @f$ p @f$
-   * that true will come up and @f$ (1 - p) @f$ that false will appear.
-   */
-  class bernoulli_distribution
-  {
-  public:
-    typedef int  input_type;
-    typedef bool result_type;
-
-  public:
-    /**
-     * Constructs a Bernoulli distribution with likelihood @p p.
-     *
-     * @param __p  [IN]  The likelihood of a true result being returned.  Must
-     * be in the interval @f$ [0, 1] @f$.
-     */
-    explicit
-    bernoulli_distribution(double __p = 0.5)
-    : _M_p(__p)
-    { 
-      _GLIBCXX_DEBUG_ASSERT((_M_p >= 0.0) && (_M_p <= 1.0));
-    }
-
-    /**
-     * Gets the @p p parameter of the distribution.
-     */
-    double
-    p() const
-    { return _M_p; }
-
-    /**
-     * Resets the distribution state.
-     *
-     * Does nothing for a Bernoulli distribution.
-     */
-    void
-    reset() { }
-
-    /**
-     * Gets the next value in the Bernoullian sequence.
-     */
-    template<class _UniformRandomNumberGenerator>
-      result_type
-      operator()(_UniformRandomNumberGenerator& __urng)
-      {
-	if ((__urng() - __urng.min()) < _M_p * (__urng.max() - __urng.min()))
-	  return true;
-	return false;
-      }
-
-    /**
-     * Inserts a %bernoulli_distribution random number distribution
-     * @p __x into the output stream @p __os.
-     *
-     * @param __os An output stream.
-     * @param __x  A %bernoulli_distribution random number distribution.
-     *
-     * @returns The output stream with the state of @p __x inserted or in
-     * an error state.
-     */
-    template<typename _CharT, typename _Traits>
-      friend std::basic_ostream<_CharT, _Traits>&
-      operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		 const bernoulli_distribution& __x);
-
-    /**
-     * Extracts a %bernoulli_distribution random number distribution
-     * @p __x from the input stream @p __is.
-     *
-     * @param __is An input stream.
-     * @param __x  A %bernoulli_distribution random number generator engine.
-     *
-     * @returns The input stream with @p __x extracted or in an error state.
-     */
-    template<typename _CharT, typename _Traits>
-      friend std::basic_istream<_CharT, _Traits>&
-      operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		 bernoulli_distribution& __x)
-      { return __is >> __x._M_p; }
-
-  private:
-    double _M_p;
-  };
-
-
-  /**
-   * @brief A discrete geometric random number distribution.
-   *
-   * The formula for the geometric probability mass function is 
-   * @f$ p(i) = (1 - p)p^{i-1} @f$ where @f$ p @f$ is the parameter of the
-   * distribution.
-   */
-  template<typename _IntType = int, typename _RealType = double>
-    class geometric_distribution
-    {
-    public:
-      // types
-      typedef _RealType input_type;
-      typedef _IntType  result_type;
-
-      // constructors and member function
-      explicit
-      geometric_distribution(const _RealType& __p = _RealType(0.5))
-      : _M_p(__p)
-      {
-	_GLIBCXX_DEBUG_ASSERT((_M_p > 0.0) && (_M_p < 1.0));
-	_M_initialize();
-      }
-
-      /**
-       * Gets the distribution parameter @p p.
-       */
-      _RealType
-      p() const
-      { return _M_p; }
-
-      void
-      reset() { }
-
-      template<class _UniformRandomNumberGenerator>
-        result_type
-        operator()(_UniformRandomNumberGenerator& __urng);
-
-      /**
-       * Inserts a %geometric_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %geometric_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _IntType1, typename _RealType1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const geometric_distribution<_IntType1, _RealType1>& __x);
-
-      /**
-       * Extracts a %geometric_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %geometric_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   geometric_distribution& __x)
-        {
-	  __is >> __x._M_p;
-	  __x._M_initialize();
-	  return __is;
-	}
-
-    private:
-      void
-      _M_initialize()
-      { _M_log_p = std::log(_M_p); }
-
-      _RealType _M_p;
-      _RealType _M_log_p;
-    };
-
-
-  template<typename _RealType>
-    class normal_distribution;
-
-  /**
-   * @brief A discrete Poisson random number distribution.
-   *
-   * The formula for the Poisson probability mass function is
-   * @f$ p(i) = \frac{mean^i}{i!} e^{-mean} @f$ where @f$ mean @f$ is the
-   * parameter of the distribution.
-   */
-  template<typename _IntType = int, typename _RealType = double>
-    class poisson_distribution
-    {
-    public:
-      // types
-      typedef _RealType input_type;
-      typedef _IntType  result_type;
-
-      // constructors and member function
-      explicit
-      poisson_distribution(const _RealType& __mean = _RealType(1))
-      : _M_mean(__mean), _M_nd()
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_mean > 0.0);
-	_M_initialize();
-      }
-
-      /**
-       * Gets the distribution parameter @p mean.
-       */
-      _RealType
-      mean() const
-      { return _M_mean; }
-
-      void
-      reset()
-      { _M_nd.reset(); }
-
-      template<class _UniformRandomNumberGenerator>
-        result_type
-        operator()(_UniformRandomNumberGenerator& __urng);
-
-      /**
-       * Inserts a %poisson_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %poisson_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _IntType1, typename _RealType1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const poisson_distribution<_IntType1, _RealType1>& __x);
-
-      /**
-       * Extracts a %poisson_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %poisson_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _IntType1, typename _RealType1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   poisson_distribution<_IntType1, _RealType1>& __x);
-
-    private:
-      void
-      _M_initialize();
-
-      // NB: Unused when _GLIBCXX_USE_C99_MATH_TR1 is undefined.
-      normal_distribution<_RealType> _M_nd;
-
-      _RealType _M_mean;
-
-      // Hosts either log(mean) or the threshold of the simple method.
-      _RealType _M_lm_thr;
-#if _GLIBCXX_USE_C99_MATH_TR1
-      _RealType _M_lfm, _M_sm, _M_d, _M_scx, _M_1cx, _M_c2b, _M_cb;
-#endif
-    };
-
-
-  /**
-   * @brief A discrete binomial random number distribution.
-   *
-   * The formula for the binomial probability mass function is 
-   * @f$ p(i) = \binom{n}{i} p^i (1 - p)^{t - i} @f$ where @f$ t @f$
-   * and @f$ p @f$ are the parameters of the distribution.
-   */
-  template<typename _IntType = int, typename _RealType = double>
-    class binomial_distribution
-    {
-    public:
-      // types
-      typedef _RealType input_type;
-      typedef _IntType  result_type;
-
-      // constructors and member function
-      explicit
-      binomial_distribution(_IntType __t = 1,
-			    const _RealType& __p = _RealType(0.5))
-      : _M_t(__t), _M_p(__p), _M_nd()
-      {
-	_GLIBCXX_DEBUG_ASSERT((_M_t >= 0) && (_M_p >= 0.0) && (_M_p <= 1.0));
-	_M_initialize();
-      }
-
-      /**
-       * Gets the distribution @p t parameter.
-       */
-      _IntType
-      t() const
-      { return _M_t; }
-      
-      /**
-       * Gets the distribution @p p parameter.
-       */
-      _RealType
-      p() const
-      { return _M_p; }
-
-      void
-      reset()
-      { _M_nd.reset(); }
-
-      template<class _UniformRandomNumberGenerator>
-        result_type
-        operator()(_UniformRandomNumberGenerator& __urng);
-
-      /**
-       * Inserts a %binomial_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %binomial_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _IntType1, typename _RealType1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const binomial_distribution<_IntType1, _RealType1>& __x);
-
-      /**
-       * Extracts a %binomial_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %binomial_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _IntType1, typename _RealType1,
-	       typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   binomial_distribution<_IntType1, _RealType1>& __x);
-
-    private:
-      void
-      _M_initialize();
-
-      template<class _UniformRandomNumberGenerator>
-        result_type
-        _M_waiting(_UniformRandomNumberGenerator& __urng, _IntType __t);
-
-      // NB: Unused when _GLIBCXX_USE_C99_MATH_TR1 is undefined.
-      normal_distribution<_RealType> _M_nd;
-
-      _RealType _M_q;
-#if _GLIBCXX_USE_C99_MATH_TR1
-      _RealType _M_d1, _M_d2, _M_s1, _M_s2, _M_c,
-	        _M_a1, _M_a123, _M_s, _M_lf, _M_lp1p;
-#endif
-      _RealType _M_p;
-      _IntType  _M_t;
-
-      bool      _M_easy;
-    };
-
-  /* @} */ // group tr1_random_distributions_discrete
-
-  /**
-   * @addtogroup tr1_random_distributions_continuous Continuous Distributions
-   * @ingroup tr1_random_distributions
-   * @{
-   */
-
-  /**
-   * @brief Uniform continuous distribution for random numbers.
-   *
-   * A continuous random distribution on the range [min, max) with equal
-   * probability throughout the range.  The URNG should be real-valued and
-   * deliver number in the range [0, 1).
-   */
-  template<typename _RealType = double>
-    class uniform_real
-    {
-    public:
-      // types
-      typedef _RealType input_type;
-      typedef _RealType result_type;
-
-    public:
-      /**
-       * Constructs a uniform_real object.
-       *
-       * @param __min [IN]  The lower bound of the distribution.
-       * @param __max [IN]  The upper bound of the distribution.
-       */
-      explicit
-      uniform_real(_RealType __min = _RealType(0),
-		   _RealType __max = _RealType(1))
-      : _M_min(__min), _M_max(__max)
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_min <= _M_max);
-      }
-
-      result_type
-      min() const
-      { return _M_min; }
-
-      result_type
-      max() const
-      { return _M_max; }
-
-      void
-      reset() { }
-
-      template<class _UniformRandomNumberGenerator>
-        result_type
-        operator()(_UniformRandomNumberGenerator& __urng)
-        { return (__urng() * (_M_max - _M_min)) + _M_min; }
-
-      /**
-       * Inserts a %uniform_real random number distribution @p __x into the
-       * output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %uniform_real random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const uniform_real<_RealType1>& __x);
-
-      /**
-       * Extracts a %uniform_real random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %uniform_real random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   uniform_real<_RealType1>& __x);
-
-    private:
-      _RealType _M_min;
-      _RealType _M_max;
-    };
-
-
-  /**
-   * @brief An exponential continuous distribution for random numbers.
-   *
-   * The formula for the exponential probability mass function is 
-   * @f$ p(x) = \lambda e^{-\lambda x} @f$.
-   *
-   * <table border=1 cellpadding=10 cellspacing=0>
-   * <caption align=top>Distribution Statistics</caption>
-   * <tr><td>Mean</td><td>@f$ \frac{1}{\lambda} @f$</td></tr>
-   * <tr><td>Median</td><td>@f$ \frac{\ln 2}{\lambda} @f$</td></tr>
-   * <tr><td>Mode</td><td>@f$ zero @f$</td></tr>
-   * <tr><td>Range</td><td>@f$[0, \infty]@f$</td></tr>
-   * <tr><td>Standard Deviation</td><td>@f$ \frac{1}{\lambda} @f$</td></tr>
-   * </table>
-   */
-  template<typename _RealType = double>
-    class exponential_distribution
-    {
-    public:
-      // types
-      typedef _RealType input_type;
-      typedef _RealType result_type;
-
-    public:
-      /**
-       * Constructs an exponential distribution with inverse scale parameter
-       * @f$ \lambda @f$.
-       */
-      explicit
-      exponential_distribution(const result_type& __lambda = result_type(1))
-      : _M_lambda(__lambda)
-      { 
-	_GLIBCXX_DEBUG_ASSERT(_M_lambda > 0);
-      }
-
-      /**
-       * Gets the inverse scale parameter of the distribution.
-       */
-      _RealType
-      lambda() const
-      { return _M_lambda; }
-
-      /**
-       * Resets the distribution.
-       *
-       * Has no effect on exponential distributions.
-       */
-      void
-      reset() { }
-
-      template<class _UniformRandomNumberGenerator>
-        result_type
-        operator()(_UniformRandomNumberGenerator& __urng)
-        { return -std::log(__urng()) / _M_lambda; }
-
-      /**
-       * Inserts a %exponential_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %exponential_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const exponential_distribution<_RealType1>& __x);
-
-      /**
-       * Extracts a %exponential_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x A %exponential_distribution random number
-       *            generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   exponential_distribution& __x)
-        { return __is >> __x._M_lambda; }
-
-    private:
-      result_type _M_lambda;
-    };
-
-
-  /**
-   * @brief A normal continuous distribution for random numbers.
-   *
-   * The formula for the normal probability mass function is 
-   * @f$ p(x) = \frac{1}{\sigma \sqrt{2 \pi}} 
-   *            e^{- \frac{{x - mean}^ {2}}{2 \sigma ^ {2}} } @f$.
-   */
-  template<typename _RealType = double>
-    class normal_distribution
-    {
-    public:
-      // types
-      typedef _RealType input_type;
-      typedef _RealType result_type;
-
-    public:
-      /**
-       * Constructs a normal distribution with parameters @f$ mean @f$ and
-       * @f$ \sigma @f$.
-       */
-      explicit
-      normal_distribution(const result_type& __mean = result_type(0),
-			  const result_type& __sigma = result_type(1))
-      : _M_mean(__mean), _M_sigma(__sigma), _M_saved_available(false)
-      { 
-	_GLIBCXX_DEBUG_ASSERT(_M_sigma > 0);
-      }
-
-      /**
-       * Gets the mean of the distribution.
-       */
-      _RealType
-      mean() const
-      { return _M_mean; }
-
-      /**
-       * Gets the @f$ \sigma @f$ of the distribution.
-       */
-      _RealType
-      sigma() const
-      { return _M_sigma; }
-
-      /**
-       * Resets the distribution.
-       */
-      void
-      reset()
-      { _M_saved_available = false; }
-
-      template<class _UniformRandomNumberGenerator>
-        result_type
-        operator()(_UniformRandomNumberGenerator& __urng);
-
-      /**
-       * Inserts a %normal_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %normal_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const normal_distribution<_RealType1>& __x);
-
-      /**
-       * Extracts a %normal_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %normal_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   normal_distribution<_RealType1>& __x);
-
-    private:
-      result_type _M_mean;
-      result_type _M_sigma;
-      result_type _M_saved;
-      bool        _M_saved_available;     
-    };
-
-
-  /**
-   * @brief A gamma continuous distribution for random numbers.
-   *
-   * The formula for the gamma probability mass function is 
-   * @f$ p(x) = \frac{1}{\Gamma(\alpha)} x^{\alpha - 1} e^{-x} @f$.
-   */
-  template<typename _RealType = double>
-    class gamma_distribution
-    {
-    public:
-      // types
-      typedef _RealType input_type;
-      typedef _RealType result_type;
-
-    public:
-      /**
-       * Constructs a gamma distribution with parameters @f$ \alpha @f$.
-       */
-      explicit
-      gamma_distribution(const result_type& __alpha_val = result_type(1))
-      : _M_alpha(__alpha_val)
-      { 
-	_GLIBCXX_DEBUG_ASSERT(_M_alpha > 0);
-	_M_initialize();
-      }
-
-      /**
-       * Gets the @f$ \alpha @f$ of the distribution.
-       */
-      _RealType
-      alpha() const
-      { return _M_alpha; }
-
-      /**
-       * Resets the distribution.
-       */
-      void
-      reset() { }
-
-      template<class _UniformRandomNumberGenerator>
-        result_type
-        operator()(_UniformRandomNumberGenerator& __urng);
-
-      /**
-       * Inserts a %gamma_distribution random number distribution
-       * @p __x into the output stream @p __os.
-       *
-       * @param __os An output stream.
-       * @param __x  A %gamma_distribution random number distribution.
-       *
-       * @returns The output stream with the state of @p __x inserted or in
-       * an error state.
-       */
-      template<typename _RealType1, typename _CharT, typename _Traits>
-        friend std::basic_ostream<_CharT, _Traits>&
-        operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-		   const gamma_distribution<_RealType1>& __x);
-
-      /**
-       * Extracts a %gamma_distribution random number distribution
-       * @p __x from the input stream @p __is.
-       *
-       * @param __is An input stream.
-       * @param __x  A %gamma_distribution random number generator engine.
-       *
-       * @returns The input stream with @p __x extracted or in an error state.
-       */
-      template<typename _CharT, typename _Traits>
-        friend std::basic_istream<_CharT, _Traits>&
-        operator>>(std::basic_istream<_CharT, _Traits>& __is,
-		   gamma_distribution& __x)
-        {
-	  __is >> __x._M_alpha;
-	  __x._M_initialize();
-	  return __is;
-	}
-
-    private:
-      void
-      _M_initialize();
-
-      result_type _M_alpha;
-
-      // Hosts either lambda of GB or d of modified Vaduva's.
-      result_type _M_l_d;
-    };
-
-  /* @} */ // group tr1_random_distributions_continuous
-  /* @} */ // group tr1_random_distributions
-  /* @} */ // group tr1_random
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _GLIBCXX_TR1_RANDOM_H
diff --git a/openflow/usr/include/c++/5/tr1/random.tcc b/openflow/usr/include/c++/5/tr1/random.tcc
deleted file mode 100644
index a1589b6..0000000
--- a/openflow/usr/include/c++/5/tr1/random.tcc
+++ /dev/null
@@ -1,1721 +0,0 @@
-// random number generation (out of line) -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-
-/** @file tr1/random.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/random}
- */
-
-#ifndef _GLIBCXX_TR1_RANDOM_TCC
-#define _GLIBCXX_TR1_RANDOM_TCC 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  /*
-   * (Further) implementation-space details.
-   */
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    // General case for x = (ax + c) mod m -- use Schrage's algorithm to avoid
-    // integer overflow.
-    //
-    // Because a and c are compile-time integral constants the compiler kindly
-    // elides any unreachable paths.
-    //
-    // Preconditions:  a > 0, m > 0.
-    //
-    template<typename _Tp, _Tp __a, _Tp __c, _Tp __m, bool>
-      struct _Mod
-      {
-	static _Tp
-	__calc(_Tp __x)
-	{
-	  if (__a == 1)
-	    __x %= __m;
-	  else
-	    {
-	      static const _Tp __q = __m / __a;
-	      static const _Tp __r = __m % __a;
-	      
-	      _Tp __t1 = __a * (__x % __q);
-	      _Tp __t2 = __r * (__x / __q);
-	      if (__t1 >= __t2)
-		__x = __t1 - __t2;
-	      else
-		__x = __m - __t2 + __t1;
-	    }
-
-	  if (__c != 0)
-	    {
-	      const _Tp __d = __m - __x;
-	      if (__d > __c)
-		__x += __c;
-	      else
-		__x = __c - __d;
-	    }
-	  return __x;
-	}
-      };
-
-    // Special case for m == 0 -- use unsigned integer overflow as modulo
-    // operator.
-    template<typename _Tp, _Tp __a, _Tp __c, _Tp __m>
-      struct _Mod<_Tp, __a, __c, __m, true>
-      {
-	static _Tp
-	__calc(_Tp __x)
-	{ return __a * __x + __c; }
-      };
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace __detail
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    const _UIntType
-    linear_congruential<_UIntType, __a, __c, __m>::multiplier;
-
-  template<class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    const _UIntType
-    linear_congruential<_UIntType, __a, __c, __m>::increment;
-
-  template<class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    const _UIntType
-    linear_congruential<_UIntType, __a, __c, __m>::modulus;
-
-  /**
-   * Seeds the LCR with integral value @p __x0, adjusted so that the 
-   * ring identity is never a member of the convergence set.
-   */
-  template<class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    void
-    linear_congruential<_UIntType, __a, __c, __m>::
-    seed(unsigned long __x0)
-    {
-      if ((__detail::__mod<_UIntType, 1, 0, __m>(__c) == 0)
-	  && (__detail::__mod<_UIntType, 1, 0, __m>(__x0) == 0))
-	_M_x = __detail::__mod<_UIntType, 1, 0, __m>(1);
-      else
-	_M_x = __detail::__mod<_UIntType, 1, 0, __m>(__x0);
-    }
-
-  /**
-   * Seeds the LCR engine with a value generated by @p __g.
-   */
-  template<class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    template<class _Gen>
-      void
-      linear_congruential<_UIntType, __a, __c, __m>::
-      seed(_Gen& __g, false_type)
-      {
-	_UIntType __x0 = __g();
-	if ((__detail::__mod<_UIntType, 1, 0, __m>(__c) == 0)
-	    && (__detail::__mod<_UIntType, 1, 0, __m>(__x0) == 0))
-	  _M_x = __detail::__mod<_UIntType, 1, 0, __m>(1);
-	else
-	  _M_x = __detail::__mod<_UIntType, 1, 0, __m>(__x0);
-      }
-
-  /**
-   * Gets the next generated value in sequence.
-   */
-  template<class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    typename linear_congruential<_UIntType, __a, __c, __m>::result_type
-    linear_congruential<_UIntType, __a, __c, __m>::
-    operator()()
-    {
-      _M_x = __detail::__mod<_UIntType, __a, __c, __m>(_M_x);
-      return _M_x;
-    }
-
-  template<class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const linear_congruential<_UIntType, __a, __c, __m>& __lcr)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__os.widen(' '));
-
-      __os << __lcr._M_x;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       linear_congruential<_UIntType, __a, __c, __m>& __lcr)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec);
-
-      __is >> __lcr._M_x;
-
-      __is.flags(__flags);
-      return __is;
-    } 
-
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const int
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::word_size;
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const int
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::state_size;
-    
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const int
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::shift_size;
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const int
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::mask_bits;
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const _UIntType
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::parameter_a;
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const int
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::output_u;
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const int
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::output_s;
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const _UIntType
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::output_b;
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const int
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::output_t;
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const _UIntType
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::output_c;
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    const int
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::output_l;
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    void
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::
-    seed(unsigned long __value)
-    {
-      _M_x[0] = __detail::__mod<_UIntType, 1, 0,
-	__detail::_Shift<_UIntType, __w>::__value>(__value);
-
-      for (int __i = 1; __i < state_size; ++__i)
-	{
-	  _UIntType __x = _M_x[__i - 1];
-	  __x ^= __x >> (__w - 2);
-	  __x *= 1812433253ul;
-	  __x += __i;
-	  _M_x[__i] = __detail::__mod<_UIntType, 1, 0,
-	    __detail::_Shift<_UIntType, __w>::__value>(__x);	  
-	}
-      _M_p = state_size;
-    }
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    template<class _Gen>
-      void
-      mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		       __b, __t, __c, __l>::
-      seed(_Gen& __gen, false_type)
-      {
-	for (int __i = 0; __i < state_size; ++__i)
-	  _M_x[__i] = __detail::__mod<_UIntType, 1, 0,
-	    __detail::_Shift<_UIntType, __w>::__value>(__gen());
-	_M_p = state_size;
-      }
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s,
-	   _UIntType __b, int __t, _UIntType __c, int __l>
-    typename
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::result_type
-    mersenne_twister<_UIntType, __w, __n, __m, __r, __a, __u, __s,
-		     __b, __t, __c, __l>::
-    operator()()
-    {
-      // Reload the vector - cost is O(n) amortized over n calls.
-      if (_M_p >= state_size)
-	{
-	  const _UIntType __upper_mask = (~_UIntType()) << __r;
-	  const _UIntType __lower_mask = ~__upper_mask;
-
-	  for (int __k = 0; __k < (__n - __m); ++__k)
-	    {
-	      _UIntType __y = ((_M_x[__k] & __upper_mask)
-			       | (_M_x[__k + 1] & __lower_mask));
-	      _M_x[__k] = (_M_x[__k + __m] ^ (__y >> 1)
-			   ^ ((__y & 0x01) ? __a : 0));
-	    }
-
-	  for (int __k = (__n - __m); __k < (__n - 1); ++__k)
-	    {
-	      _UIntType __y = ((_M_x[__k] & __upper_mask)
-			       | (_M_x[__k + 1] & __lower_mask));
-	      _M_x[__k] = (_M_x[__k + (__m - __n)] ^ (__y >> 1)
-			   ^ ((__y & 0x01) ? __a : 0));
-	    }
-
-	  _UIntType __y = ((_M_x[__n - 1] & __upper_mask)
-			   | (_M_x[0] & __lower_mask));
-	  _M_x[__n - 1] = (_M_x[__m - 1] ^ (__y >> 1)
-			   ^ ((__y & 0x01) ? __a : 0));
-	  _M_p = 0;
-	}
-
-      // Calculate o(x(i)).
-      result_type __z = _M_x[_M_p++];
-      __z ^= (__z >> __u);
-      __z ^= (__z << __s) & __b;
-      __z ^= (__z << __t) & __c;
-      __z ^= (__z >> __l);
-
-      return __z;
-    }
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s, _UIntType __b, int __t,
-	   _UIntType __c, int __l,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const mersenne_twister<_UIntType, __w, __n, __m,
-	       __r, __a, __u, __s, __b, __t, __c, __l>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__space);
-
-      for (int __i = 0; __i < __n - 1; ++__i)
-	__os << __x._M_x[__i] << __space;
-      __os << __x._M_x[__n - 1];
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<class _UIntType, int __w, int __n, int __m, int __r,
-	   _UIntType __a, int __u, int __s, _UIntType __b, int __t,
-	   _UIntType __c, int __l,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       mersenne_twister<_UIntType, __w, __n, __m,
-	       __r, __a, __u, __s, __b, __t, __c, __l>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      for (int __i = 0; __i < __n; ++__i)
-	__is >> __x._M_x[__i];
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _IntType, _IntType __m, int __s, int __r>
-    const _IntType
-    subtract_with_carry<_IntType, __m, __s, __r>::modulus;
-
-  template<typename _IntType, _IntType __m, int __s, int __r>
-    const int
-    subtract_with_carry<_IntType, __m, __s, __r>::long_lag;
-
-  template<typename _IntType, _IntType __m, int __s, int __r>
-    const int
-    subtract_with_carry<_IntType, __m, __s, __r>::short_lag;
-
-  template<typename _IntType, _IntType __m, int __s, int __r>
-    void
-    subtract_with_carry<_IntType, __m, __s, __r>::
-    seed(unsigned long __value)
-    {
-      if (__value == 0)
-	__value = 19780503;
-
-      std::tr1::linear_congruential<unsigned long, 40014, 0, 2147483563>
-	__lcg(__value);
-
-      for (int __i = 0; __i < long_lag; ++__i)
-	_M_x[__i] = __detail::__mod<_UIntType, 1, 0, modulus>(__lcg());
-
-      _M_carry = (_M_x[long_lag - 1] == 0) ? 1 : 0;
-      _M_p = 0;
-    }
-
-  template<typename _IntType, _IntType __m, int __s, int __r>
-    template<class _Gen>
-      void
-      subtract_with_carry<_IntType, __m, __s, __r>::
-      seed(_Gen& __gen, false_type)
-      {
-	const int __n = (std::numeric_limits<_UIntType>::digits + 31) / 32;
-
-	for (int __i = 0; __i < long_lag; ++__i)
-	  {
-	    _UIntType __tmp = 0;
-	    _UIntType __factor = 1;
-	    for (int __j = 0; __j < __n; ++__j)
-	      {
-		__tmp += __detail::__mod<__detail::_UInt32Type, 1, 0, 0>
-		         (__gen()) * __factor;
-		__factor *= __detail::_Shift<_UIntType, 32>::__value;
-	      }
-	    _M_x[__i] = __detail::__mod<_UIntType, 1, 0, modulus>(__tmp);
-	  }
-	_M_carry = (_M_x[long_lag - 1] == 0) ? 1 : 0;
-	_M_p = 0;
-      }
-
-  template<typename _IntType, _IntType __m, int __s, int __r>
-    typename subtract_with_carry<_IntType, __m, __s, __r>::result_type
-    subtract_with_carry<_IntType, __m, __s, __r>::
-    operator()()
-    {
-      // Derive short lag index from current index.
-      int __ps = _M_p - short_lag;
-      if (__ps < 0)
-	__ps += long_lag;
-
-      // Calculate new x(i) without overflow or division.
-      // NB: Thanks to the requirements for _IntType, _M_x[_M_p] + _M_carry
-      // cannot overflow.
-      _UIntType __xi;
-      if (_M_x[__ps] >= _M_x[_M_p] + _M_carry)
-	{
-	  __xi = _M_x[__ps] - _M_x[_M_p] - _M_carry;
-	  _M_carry = 0;
-	}
-      else
-	{
-	  __xi = modulus - _M_x[_M_p] - _M_carry + _M_x[__ps];
-	  _M_carry = 1;
-	}
-      _M_x[_M_p] = __xi;
-
-      // Adjust current index to loop around in ring buffer.
-      if (++_M_p >= long_lag)
-	_M_p = 0;
-
-      return __xi;
-    }
-
-  template<typename _IntType, _IntType __m, int __s, int __r,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const subtract_with_carry<_IntType, __m, __s, __r>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__space);
-
-      for (int __i = 0; __i < __r; ++__i)
-	__os << __x._M_x[__i] << __space;
-      __os << __x._M_carry;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<typename _IntType, _IntType __m, int __s, int __r,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       subtract_with_carry<_IntType, __m, __s, __r>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      for (int __i = 0; __i < __r; ++__i)
-	__is >> __x._M_x[__i];
-      __is >> __x._M_carry;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType, int __w, int __s, int __r>
-    const int
-    subtract_with_carry_01<_RealType, __w, __s, __r>::word_size;
-
-  template<typename _RealType, int __w, int __s, int __r>
-    const int
-    subtract_with_carry_01<_RealType, __w, __s, __r>::long_lag;
-
-  template<typename _RealType, int __w, int __s, int __r>
-    const int
-    subtract_with_carry_01<_RealType, __w, __s, __r>::short_lag;
-
-  template<typename _RealType, int __w, int __s, int __r>
-    void
-    subtract_with_carry_01<_RealType, __w, __s, __r>::
-    _M_initialize_npows()
-    {
-      for (int __j = 0; __j < __n; ++__j)
-#if _GLIBCXX_USE_C99_MATH_TR1
-	_M_npows[__j] = std::tr1::ldexp(_RealType(1), -__w + __j * 32);
-#else
-        _M_npows[__j] = std::pow(_RealType(2), -__w + __j * 32);
-#endif
-    }
-
-  template<typename _RealType, int __w, int __s, int __r>
-    void
-    subtract_with_carry_01<_RealType, __w, __s, __r>::
-    seed(unsigned long __value)
-    {
-      if (__value == 0)
-	__value = 19780503;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 512. Seeding subtract_with_carry_01 from a single unsigned long.
-      std::tr1::linear_congruential<unsigned long, 40014, 0, 2147483563>
-	__lcg(__value);
-
-      this->seed(__lcg);
-    }
-
-  template<typename _RealType, int __w, int __s, int __r>
-    template<class _Gen>
-      void
-      subtract_with_carry_01<_RealType, __w, __s, __r>::
-      seed(_Gen& __gen, false_type)
-      {
-	for (int __i = 0; __i < long_lag; ++__i)
-	  {
-	    for (int __j = 0; __j < __n - 1; ++__j)
-	      _M_x[__i][__j] = __detail::__mod<_UInt32Type, 1, 0, 0>(__gen());
-	    _M_x[__i][__n - 1] = __detail::__mod<_UInt32Type, 1, 0,
-	      __detail::_Shift<_UInt32Type, __w % 32>::__value>(__gen());
-	  }
-
-	_M_carry = 1;
-	for (int __j = 0; __j < __n; ++__j)
-	  if (_M_x[long_lag - 1][__j] != 0)
-	    {
-	      _M_carry = 0;
-	      break;
-	    }
-
-	_M_p = 0;
-      }
-
-  template<typename _RealType, int __w, int __s, int __r>
-    typename subtract_with_carry_01<_RealType, __w, __s, __r>::result_type
-    subtract_with_carry_01<_RealType, __w, __s, __r>::
-    operator()()
-    {
-      // Derive short lag index from current index.
-      int __ps = _M_p - short_lag;
-      if (__ps < 0)
-	__ps += long_lag;
-
-      _UInt32Type __new_carry;
-      for (int __j = 0; __j < __n - 1; ++__j)
-	{
-	  if (_M_x[__ps][__j] > _M_x[_M_p][__j]
-	      || (_M_x[__ps][__j] == _M_x[_M_p][__j] && _M_carry == 0))
-	    __new_carry = 0;
-	  else
-	    __new_carry = 1;
-
-	  _M_x[_M_p][__j] = _M_x[__ps][__j] - _M_x[_M_p][__j] - _M_carry;
-	  _M_carry = __new_carry;
-	}
-
-      if (_M_x[__ps][__n - 1] > _M_x[_M_p][__n - 1]
-	  || (_M_x[__ps][__n - 1] == _M_x[_M_p][__n - 1] && _M_carry == 0))
-	__new_carry = 0;
-      else
-	__new_carry = 1;
-      
-      _M_x[_M_p][__n - 1] = __detail::__mod<_UInt32Type, 1, 0,
-	__detail::_Shift<_UInt32Type, __w % 32>::__value>
-	(_M_x[__ps][__n - 1] - _M_x[_M_p][__n - 1] - _M_carry);
-      _M_carry = __new_carry;
-
-      result_type __ret = 0.0;
-      for (int __j = 0; __j < __n; ++__j)
-	__ret += _M_x[_M_p][__j] * _M_npows[__j];
-
-      // Adjust current index to loop around in ring buffer.
-      if (++_M_p >= long_lag)
-	_M_p = 0;
-
-      return __ret;
-    }
-
-  template<typename _RealType, int __w, int __s, int __r,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const subtract_with_carry_01<_RealType, __w, __s, __r>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__space);
-
-      for (int __i = 0; __i < __r; ++__i)
-	for (int __j = 0; __j < __x.__n; ++__j)
-	  __os << __x._M_x[__i][__j] << __space;
-      __os << __x._M_carry;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<typename _RealType, int __w, int __s, int __r,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       subtract_with_carry_01<_RealType, __w, __s, __r>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      for (int __i = 0; __i < __r; ++__i)
-	for (int __j = 0; __j < __x.__n; ++__j)
-	  __is >> __x._M_x[__i][__j];
-      __is >> __x._M_carry;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-  template<class _UniformRandomNumberGenerator, int __p, int __r>
-    const int
-    discard_block<_UniformRandomNumberGenerator, __p, __r>::block_size;
-
-  template<class _UniformRandomNumberGenerator, int __p, int __r>
-    const int
-    discard_block<_UniformRandomNumberGenerator, __p, __r>::used_block;
-
-  template<class _UniformRandomNumberGenerator, int __p, int __r>
-    typename discard_block<_UniformRandomNumberGenerator,
-			   __p, __r>::result_type
-    discard_block<_UniformRandomNumberGenerator, __p, __r>::
-    operator()()
-    {
-      if (_M_n >= used_block)
-	{
-	  while (_M_n < block_size)
-	    {
-	      _M_b();
-	      ++_M_n;
-	    }
-	  _M_n = 0;
-	}
-      ++_M_n;
-      return _M_b();
-    }
-
-  template<class _UniformRandomNumberGenerator, int __p, int __r,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const discard_block<_UniformRandomNumberGenerator,
-	       __p, __r>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::dec | __ios_base::fixed
-		 | __ios_base::left);
-      __os.fill(__space);
-
-      __os << __x._M_b << __space << __x._M_n;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<class _UniformRandomNumberGenerator, int __p, int __r,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       discard_block<_UniformRandomNumberGenerator, __p, __r>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      __is >> __x._M_b >> __x._M_n;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<class _UniformRandomNumberGenerator1, int __s1,
-	   class _UniformRandomNumberGenerator2, int __s2>
-    const int
-    xor_combine<_UniformRandomNumberGenerator1, __s1,
-		_UniformRandomNumberGenerator2, __s2>::shift1;
-     
-  template<class _UniformRandomNumberGenerator1, int __s1,
-	   class _UniformRandomNumberGenerator2, int __s2>
-    const int
-    xor_combine<_UniformRandomNumberGenerator1, __s1,
-		_UniformRandomNumberGenerator2, __s2>::shift2;
-
-  template<class _UniformRandomNumberGenerator1, int __s1,
-	   class _UniformRandomNumberGenerator2, int __s2>
-    void
-    xor_combine<_UniformRandomNumberGenerator1, __s1,
-		_UniformRandomNumberGenerator2, __s2>::
-    _M_initialize_max()
-    {
-      const int __w = std::numeric_limits<result_type>::digits;
-
-      const result_type __m1 =
-	std::min(result_type(_M_b1.max() - _M_b1.min()),
-		 __detail::_Shift<result_type, __w - __s1>::__value - 1);
-
-      const result_type __m2 =
-	std::min(result_type(_M_b2.max() - _M_b2.min()),
-		 __detail::_Shift<result_type, __w - __s2>::__value - 1);
-
-      // NB: In TR1 s1 is not required to be >= s2.
-      if (__s1 < __s2)
-	_M_max = _M_initialize_max_aux(__m2, __m1, __s2 - __s1) << __s1;
-      else
-	_M_max = _M_initialize_max_aux(__m1, __m2, __s1 - __s2) << __s2;
-    }
-
-  template<class _UniformRandomNumberGenerator1, int __s1,
-	   class _UniformRandomNumberGenerator2, int __s2>
-    typename xor_combine<_UniformRandomNumberGenerator1, __s1,
-			 _UniformRandomNumberGenerator2, __s2>::result_type
-    xor_combine<_UniformRandomNumberGenerator1, __s1,
-		_UniformRandomNumberGenerator2, __s2>::
-    _M_initialize_max_aux(result_type __a, result_type __b, int __d)
-    {
-      const result_type __two2d = result_type(1) << __d;
-      const result_type __c = __a * __two2d;
-
-      if (__a == 0 || __b < __two2d)
-	return __c + __b;
-
-      const result_type __t = std::max(__c, __b);
-      const result_type __u = std::min(__c, __b);
-
-      result_type __ub = __u;
-      result_type __p;
-      for (__p = 0; __ub != 1; __ub >>= 1)
-	++__p;
-
-      const result_type __two2p = result_type(1) << __p;
-      const result_type __k = __t / __two2p;
-
-      if (__k & 1)
-	return (__k + 1) * __two2p - 1;
-
-      if (__c >= __b)
-	return (__k + 1) * __two2p + _M_initialize_max_aux((__t % __two2p)
-							   / __two2d,
-							   __u % __two2p, __d);
-      else
-	return (__k + 1) * __two2p + _M_initialize_max_aux((__u % __two2p)
-							   / __two2d,
-							   __t % __two2p, __d);
-    }
-
-  template<class _UniformRandomNumberGenerator1, int __s1,
-	   class _UniformRandomNumberGenerator2, int __s2,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const xor_combine<_UniformRandomNumberGenerator1, __s1,
-	       _UniformRandomNumberGenerator2, __s2>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::dec | __ios_base::fixed | __ios_base::left);
-      __os.fill(__space);
-
-      __os << __x.base1() << __space << __x.base2();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os; 
-    }
-
-  template<class _UniformRandomNumberGenerator1, int __s1,
-	   class _UniformRandomNumberGenerator2, int __s2,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       xor_combine<_UniformRandomNumberGenerator1, __s1,
-	       _UniformRandomNumberGenerator2, __s2>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::skipws);
-
-      __is >> __x._M_b1 >> __x._M_b2;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _IntType>
-    template<typename _UniformRandomNumberGenerator>
-      typename uniform_int<_IntType>::result_type
-      uniform_int<_IntType>::
-      _M_call(_UniformRandomNumberGenerator& __urng,
-	      result_type __min, result_type __max, true_type)
-      {
-	// XXX Must be fixed to work well for *arbitrary* __urng.max(),
-	// __urng.min(), __max, __min.  Currently works fine only in the
-	// most common case __urng.max() - __urng.min() >= __max - __min,
-	// with __urng.max() > __urng.min() >= 0.
-	typedef typename __gnu_cxx::__add_unsigned<typename
-	  _UniformRandomNumberGenerator::result_type>::__type __urntype;
-	typedef typename __gnu_cxx::__add_unsigned<result_type>::__type
-	                                                      __utype;
-	typedef typename __gnu_cxx::__conditional_type<(sizeof(__urntype)
-							> sizeof(__utype)),
-	  __urntype, __utype>::__type                         __uctype;
-
-	result_type __ret;
-
-	const __urntype __urnmin = __urng.min();
-	const __urntype __urnmax = __urng.max();
-	const __urntype __urnrange = __urnmax - __urnmin;
-	const __uctype __urange = __max - __min;
-	const __uctype __udenom = (__urnrange <= __urange
-				   ? 1 : __urnrange / (__urange + 1));
-	do
-	  __ret = (__urntype(__urng()) -  __urnmin) / __udenom;
-	while (__ret > __max - __min);
-
-	return __ret + __min;
-      }
-
-  template<typename _IntType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const uniform_int<_IntType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-
-      __os << __x.min() << __space << __x.max();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      return __os;
-    }
-
-  template<typename _IntType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       uniform_int<_IntType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      __is >> __x._M_min >> __x._M_max;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-  
-  template<typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const bernoulli_distribution& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__os.widen(' '));
-      __os.precision(__gnu_cxx::__numeric_traits<double>::__max_digits10);
-
-      __os << __x.p();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-
-  template<typename _IntType, typename _RealType>
-    template<class _UniformRandomNumberGenerator>
-      typename geometric_distribution<_IntType, _RealType>::result_type
-      geometric_distribution<_IntType, _RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng)
-      {
-	// About the epsilon thing see this thread:
-        // http://gcc.gnu.org/ml/gcc-patches/2006-10/msg00971.html
-	const _RealType __naf =
-	  (1 - std::numeric_limits<_RealType>::epsilon()) / 2;
-	// The largest _RealType convertible to _IntType.
-	const _RealType __thr =
-	  std::numeric_limits<_IntType>::max() + __naf;
-
-	_RealType __cand;
-	do
-	  __cand = std::ceil(std::log(__urng()) / _M_log_p);
-	while (__cand >= __thr);
-
-	return result_type(__cand + __naf);
-      }
-
-  template<typename _IntType, typename _RealType,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const geometric_distribution<_IntType, _RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__os.widen(' '));
-      __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
-
-      __os << __x.p();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-
-  template<typename _IntType, typename _RealType>
-    void
-    poisson_distribution<_IntType, _RealType>::
-    _M_initialize()
-    {
-#if _GLIBCXX_USE_C99_MATH_TR1
-      if (_M_mean >= 12)
-	{
-	  const _RealType __m = std::floor(_M_mean);
-	  _M_lm_thr = std::log(_M_mean);
-	  _M_lfm = std::tr1::lgamma(__m + 1);
-	  _M_sm = std::sqrt(__m);
-
-	  const _RealType __pi_4 = 0.7853981633974483096156608458198757L;
-	  const _RealType __dx = std::sqrt(2 * __m * std::log(32 * __m
-							      / __pi_4));
-	  _M_d = std::tr1::round(std::max(_RealType(6),
-					  std::min(__m, __dx)));
-	  const _RealType __cx = 2 * __m + _M_d;
-	  _M_scx = std::sqrt(__cx / 2);
-	  _M_1cx = 1 / __cx;
-
-	  _M_c2b = std::sqrt(__pi_4 * __cx) * std::exp(_M_1cx);
-	  _M_cb = 2 * __cx * std::exp(-_M_d * _M_1cx * (1 + _M_d / 2)) / _M_d;
-	}
-      else
-#endif
-	_M_lm_thr = std::exp(-_M_mean);
-      }
-
-  /**
-   * A rejection algorithm when mean >= 12 and a simple method based
-   * upon the multiplication of uniform random variates otherwise.
-   * NB: The former is available only if _GLIBCXX_USE_C99_MATH_TR1
-   * is defined.
-   *
-   * Reference:
-   * Devroye, L. Non-Uniform Random Variates Generation. Springer-Verlag,
-   * New York, 1986, Ch. X, Sects. 3.3 & 3.4 (+ Errata!).
-   */
-  template<typename _IntType, typename _RealType>
-    template<class _UniformRandomNumberGenerator>
-      typename poisson_distribution<_IntType, _RealType>::result_type
-      poisson_distribution<_IntType, _RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng)
-      {
-#if _GLIBCXX_USE_C99_MATH_TR1
-	if (_M_mean >= 12)
-	  {
-	    _RealType __x;
-
-	    // See comments above...
-	    const _RealType __naf =
-	      (1 - std::numeric_limits<_RealType>::epsilon()) / 2;
-	    const _RealType __thr =
-	      std::numeric_limits<_IntType>::max() + __naf;
-
-	    const _RealType __m = std::floor(_M_mean);
-	    // sqrt(pi / 2)
-	    const _RealType __spi_2 = 1.2533141373155002512078826424055226L;
-	    const _RealType __c1 = _M_sm * __spi_2;
-	    const _RealType __c2 = _M_c2b + __c1; 
-	    const _RealType __c3 = __c2 + 1;
-	    const _RealType __c4 = __c3 + 1;
-	    // e^(1 / 78)
-	    const _RealType __e178 = 1.0129030479320018583185514777512983L;
-	    const _RealType __c5 = __c4 + __e178;
-	    const _RealType __c = _M_cb + __c5;
-	    const _RealType __2cx = 2 * (2 * __m + _M_d);
-
-	    bool __reject = true;
-	    do
-	      {
-		const _RealType __u = __c * __urng();
-		const _RealType __e = -std::log(__urng());
-
-		_RealType __w = 0.0;
-		
-		if (__u <= __c1)
-		  {
-		    const _RealType __n = _M_nd(__urng);
-		    const _RealType __y = -std::abs(__n) * _M_sm - 1;
-		    __x = std::floor(__y);
-		    __w = -__n * __n / 2;
-		    if (__x < -__m)
-		      continue;
-		  }
-		else if (__u <= __c2)
-		  {
-		    const _RealType __n = _M_nd(__urng);
-		    const _RealType __y = 1 + std::abs(__n) * _M_scx;
-		    __x = std::ceil(__y);
-		    __w = __y * (2 - __y) * _M_1cx;
-		    if (__x > _M_d)
-		      continue;
-		  }
-		else if (__u <= __c3)
-		  // NB: This case not in the book, nor in the Errata,
-		  // but should be ok...
-		  __x = -1;
-		else if (__u <= __c4)
-		  __x = 0;
-		else if (__u <= __c5)
-		  __x = 1;
-		else
-		  {
-		    const _RealType __v = -std::log(__urng());
-		    const _RealType __y = _M_d + __v * __2cx / _M_d;
-		    __x = std::ceil(__y);
-		    __w = -_M_d * _M_1cx * (1 + __y / 2);
-		  }
-
-		__reject = (__w - __e - __x * _M_lm_thr
-			    > _M_lfm - std::tr1::lgamma(__x + __m + 1));
-
-		__reject |= __x + __m >= __thr;
-
-	      } while (__reject);
-
-	    return result_type(__x + __m + __naf);
-	  }
-	else
-#endif
-	  {
-	    _IntType     __x = 0;
-	    _RealType __prod = 1.0;
-
-	    do
-	      {
-		__prod *= __urng();
-		__x += 1;
-	      }
-	    while (__prod > _M_lm_thr);
-
-	    return __x - 1;
-	  }
-      }
-
-  template<typename _IntType, typename _RealType,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const poisson_distribution<_IntType, _RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
-
-      __os << __x.mean() << __space << __x._M_nd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _IntType, typename _RealType,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       poisson_distribution<_IntType, _RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::skipws);
-
-      __is >> __x._M_mean >> __x._M_nd;
-      __x._M_initialize();
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _IntType, typename _RealType>
-    void
-    binomial_distribution<_IntType, _RealType>::
-    _M_initialize()
-    {
-      const _RealType __p12 = _M_p <= 0.5 ? _M_p : 1.0 - _M_p;
-
-      _M_easy = true;
-
-#if _GLIBCXX_USE_C99_MATH_TR1
-      if (_M_t * __p12 >= 8)
-	{
-	  _M_easy = false;
-	  const _RealType __np = std::floor(_M_t * __p12);
-	  const _RealType __pa = __np / _M_t;
-	  const _RealType __1p = 1 - __pa;
-	  
-	  const _RealType __pi_4 = 0.7853981633974483096156608458198757L;
-	  const _RealType __d1x =
-	    std::sqrt(__np * __1p * std::log(32 * __np
-					     / (81 * __pi_4 * __1p)));
-	  _M_d1 = std::tr1::round(std::max(_RealType(1), __d1x));
-	  const _RealType __d2x =
-	    std::sqrt(__np * __1p * std::log(32 * _M_t * __1p
-					     / (__pi_4 * __pa)));
-	  _M_d2 = std::tr1::round(std::max(_RealType(1), __d2x));
-	  
-	  // sqrt(pi / 2)
-	  const _RealType __spi_2 = 1.2533141373155002512078826424055226L;
-	  _M_s1 = std::sqrt(__np * __1p) * (1 + _M_d1 / (4 * __np));
-	  _M_s2 = std::sqrt(__np * __1p) * (1 + _M_d2 / (4 * _M_t * __1p));
-	  _M_c = 2 * _M_d1 / __np;
-	  _M_a1 = std::exp(_M_c) * _M_s1 * __spi_2;
-	  const _RealType __a12 = _M_a1 + _M_s2 * __spi_2;
-	  const _RealType __s1s = _M_s1 * _M_s1;
-	  _M_a123 = __a12 + (std::exp(_M_d1 / (_M_t * __1p))
-			     * 2 * __s1s / _M_d1
-			     * std::exp(-_M_d1 * _M_d1 / (2 * __s1s)));
-	  const _RealType __s2s = _M_s2 * _M_s2;
-	  _M_s = (_M_a123 + 2 * __s2s / _M_d2
-		  * std::exp(-_M_d2 * _M_d2 / (2 * __s2s)));
-	  _M_lf = (std::tr1::lgamma(__np + 1)
-		   + std::tr1::lgamma(_M_t - __np + 1));
-	  _M_lp1p = std::log(__pa / __1p);
-
-	  _M_q = -std::log(1 - (__p12 - __pa) / __1p);
-	}
-      else
-#endif
-	_M_q = -std::log(1 - __p12);
-    }
-
-  template<typename _IntType, typename _RealType>
-    template<class _UniformRandomNumberGenerator>
-      typename binomial_distribution<_IntType, _RealType>::result_type
-      binomial_distribution<_IntType, _RealType>::
-      _M_waiting(_UniformRandomNumberGenerator& __urng, _IntType __t)
-      {
-	_IntType    __x = 0;
-	_RealType __sum = 0;
-
-	do
-	  {
-	    const _RealType __e = -std::log(__urng());
-	    __sum += __e / (__t - __x);
-	    __x += 1;
-	  }
-	while (__sum <= _M_q);
-
-	return __x - 1;
-      }
-
-  /**
-   * A rejection algorithm when t * p >= 8 and a simple waiting time
-   * method - the second in the referenced book - otherwise.
-   * NB: The former is available only if _GLIBCXX_USE_C99_MATH_TR1
-   * is defined.
-   *
-   * Reference:
-   * Devroye, L. Non-Uniform Random Variates Generation. Springer-Verlag,
-   * New York, 1986, Ch. X, Sect. 4 (+ Errata!).
-   */
-  template<typename _IntType, typename _RealType>
-    template<class _UniformRandomNumberGenerator>
-      typename binomial_distribution<_IntType, _RealType>::result_type
-      binomial_distribution<_IntType, _RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng)
-      {
-	result_type __ret;
-	const _RealType __p12 = _M_p <= 0.5 ? _M_p : 1.0 - _M_p;
-
-#if _GLIBCXX_USE_C99_MATH_TR1
-	if (!_M_easy)
-	  {
-	    _RealType __x;
-
-	    // See comments above...
-	    const _RealType __naf =
-	      (1 - std::numeric_limits<_RealType>::epsilon()) / 2;
-	    const _RealType __thr =
-	      std::numeric_limits<_IntType>::max() + __naf;
-
-	    const _RealType __np = std::floor(_M_t * __p12);
-	    const _RealType __pa = __np / _M_t;
-
-	    // sqrt(pi / 2)
-	    const _RealType __spi_2 = 1.2533141373155002512078826424055226L;
-	    const _RealType __a1 = _M_a1;
-	    const _RealType __a12 = __a1 + _M_s2 * __spi_2;
-	    const _RealType __a123 = _M_a123;
-	    const _RealType __s1s = _M_s1 * _M_s1;
-	    const _RealType __s2s = _M_s2 * _M_s2;
-
-	    bool __reject;
-	    do
-	      {
-		const _RealType __u = _M_s * __urng();
-
-		_RealType __v;
-
-		if (__u <= __a1)
-		  {
-		    const _RealType __n = _M_nd(__urng);
-		    const _RealType __y = _M_s1 * std::abs(__n);
-		    __reject = __y >= _M_d1;
-		    if (!__reject)
-		      {
-			const _RealType __e = -std::log(__urng());
-			__x = std::floor(__y);
-			__v = -__e - __n * __n / 2 + _M_c;
-		      }
-		  }
-		else if (__u <= __a12)
-		  {
-		    const _RealType __n = _M_nd(__urng);
-		    const _RealType __y = _M_s2 * std::abs(__n);
-		    __reject = __y >= _M_d2;
-		    if (!__reject)
-		      {
-			const _RealType __e = -std::log(__urng());
-			__x = std::floor(-__y);
-			__v = -__e - __n * __n / 2;
-		      }
-		  }
-		else if (__u <= __a123)
-		  {
-		    const _RealType __e1 = -std::log(__urng());		    
-		    const _RealType __e2 = -std::log(__urng());
-
-		    const _RealType __y = _M_d1 + 2 * __s1s * __e1 / _M_d1;
-		    __x = std::floor(__y);
-		    __v = (-__e2 + _M_d1 * (1 / (_M_t - __np)
-					    -__y / (2 * __s1s)));
-		    __reject = false;
-		  }
-		else
-		  {
-		    const _RealType __e1 = -std::log(__urng());		    
-		    const _RealType __e2 = -std::log(__urng());
-
-		    const _RealType __y = _M_d2 + 2 * __s2s * __e1 / _M_d2;
-		    __x = std::floor(-__y);
-		    __v = -__e2 - _M_d2 * __y / (2 * __s2s);
-		    __reject = false;
-		  }
-
-		__reject = __reject || __x < -__np || __x > _M_t - __np;
-		if (!__reject)
-		  {
-		    const _RealType __lfx =
-		      std::tr1::lgamma(__np + __x + 1)
-		      + std::tr1::lgamma(_M_t - (__np + __x) + 1);
-		    __reject = __v > _M_lf - __lfx + __x * _M_lp1p;
-		  }
-
-		__reject |= __x + __np >= __thr;
-	      }
-	    while (__reject);
-
-	    __x += __np + __naf;
-
-	    const _IntType __z = _M_waiting(__urng, _M_t - _IntType(__x)); 
-	    __ret = _IntType(__x) + __z;
-	  }
-	else
-#endif
-	  __ret = _M_waiting(__urng, _M_t);
-
-	if (__p12 != _M_p)
-	  __ret = _M_t - __ret;
-	return __ret;
-      }
-
-  template<typename _IntType, typename _RealType,
-	   typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const binomial_distribution<_IntType, _RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
-
-      __os << __x.t() << __space << __x.p() 
-	   << __space << __x._M_nd;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _IntType, typename _RealType,
-	   typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       binomial_distribution<_IntType, _RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      __is >> __x._M_t >> __x._M_p >> __x._M_nd;
-      __x._M_initialize();
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const uniform_real<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
-
-      __os << __x.min() << __space << __x.max();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       uniform_real<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::skipws);
-
-      __is >> __x._M_min >> __x._M_max;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const exponential_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__os.widen(' '));
-      __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
-
-      __os << __x.lambda();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-
-  /**
-   * Polar method due to Marsaglia.
-   *
-   * Devroye, L. Non-Uniform Random Variates Generation. Springer-Verlag,
-   * New York, 1986, Ch. V, Sect. 4.4.
-   */
-  template<typename _RealType>
-    template<class _UniformRandomNumberGenerator>
-      typename normal_distribution<_RealType>::result_type
-      normal_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng)
-      {
-	result_type __ret;
-
-	if (_M_saved_available)
-	  {
-	    _M_saved_available = false;
-	    __ret = _M_saved;
-	  }
-	else
-	  {
-	    result_type __x, __y, __r2;
-	    do
-	      {
-		__x = result_type(2.0) * __urng() - 1.0;
-		__y = result_type(2.0) * __urng() - 1.0;
-		__r2 = __x * __x + __y * __y;
-	      }
-	    while (__r2 > 1.0 || __r2 == 0.0);
-
-	    const result_type __mult = std::sqrt(-2 * std::log(__r2) / __r2);
-	    _M_saved = __x * __mult;
-	    _M_saved_available = true;
-	    __ret = __y * __mult;
-	  }
-	
-	__ret = __ret * _M_sigma + _M_mean;
-	return __ret;
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const normal_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      const _CharT __space = __os.widen(' ');
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__space);
-      __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
-
-      __os << __x._M_saved_available << __space
-	   << __x.mean() << __space
-	   << __x.sigma();
-      if (__x._M_saved_available)
-	__os << __space << __x._M_saved;
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       normal_distribution<_RealType>& __x)
-    {
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __is.flags();
-      __is.flags(__ios_base::dec | __ios_base::skipws);
-
-      __is >> __x._M_saved_available >> __x._M_mean
-	   >> __x._M_sigma;
-      if (__x._M_saved_available)
-	__is >> __x._M_saved;
-
-      __is.flags(__flags);
-      return __is;
-    }
-
-
-  template<typename _RealType>
-    void
-    gamma_distribution<_RealType>::
-    _M_initialize()
-    {
-      if (_M_alpha >= 1)
-	_M_l_d = std::sqrt(2 * _M_alpha - 1);
-      else
-	_M_l_d = (std::pow(_M_alpha, _M_alpha / (1 - _M_alpha))
-		  * (1 - _M_alpha));
-    }
-
-  /**
-   * Cheng's rejection algorithm GB for alpha >= 1 and a modification
-   * of Vaduva's rejection from Weibull algorithm due to Devroye for
-   * alpha < 1.
-   *
-   * References:
-   * Cheng, R. C. The Generation of Gamma Random Variables with Non-integral
-   * Shape Parameter. Applied Statistics, 26, 71-75, 1977.
-   *
-   * Vaduva, I. Computer Generation of Gamma Gandom Variables by Rejection
-   * and Composition Procedures. Math. Operationsforschung and Statistik,
-   * Series in Statistics, 8, 545-576, 1977.
-   *
-   * Devroye, L. Non-Uniform Random Variates Generation. Springer-Verlag,
-   * New York, 1986, Ch. IX, Sect. 3.4 (+ Errata!).
-   */
-  template<typename _RealType>
-    template<class _UniformRandomNumberGenerator>
-      typename gamma_distribution<_RealType>::result_type
-      gamma_distribution<_RealType>::
-      operator()(_UniformRandomNumberGenerator& __urng)
-      {
-	result_type __x;
-
-	bool __reject;
-	if (_M_alpha >= 1)
-	  {
-	    // alpha - log(4)
-	    const result_type __b = _M_alpha
-	      - result_type(1.3862943611198906188344642429163531L);
-	    const result_type __c = _M_alpha + _M_l_d;
-	    const result_type __1l = 1 / _M_l_d;
-
-	    // 1 + log(9 / 2)
-	    const result_type __k = 2.5040773967762740733732583523868748L;
-
-	    do
-	      {
-		const result_type __u = __urng();
-		const result_type __v = __urng();
-
-		const result_type __y = __1l * std::log(__v / (1 - __v));
-		__x = _M_alpha * std::exp(__y);
-
-		const result_type __z = __u * __v * __v;
-		const result_type __r = __b + __c * __y - __x;
-
-		__reject = __r < result_type(4.5) * __z - __k;
-		if (__reject)
-		  __reject = __r < std::log(__z);
-	      }
-	    while (__reject);
-	  }
-	else
-	  {
-	    const result_type __c = 1 / _M_alpha;
-
-	    do
-	      {
-		const result_type __z = -std::log(__urng());
-		const result_type __e = -std::log(__urng());
-
-		__x = std::pow(__z, __c);
-
-		__reject = __z + __e < _M_l_d + __x;
-	      }
-	    while (__reject);
-	  }
-
-	return __x;
-      }
-
-  template<typename _RealType, typename _CharT, typename _Traits>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const gamma_distribution<_RealType>& __x)
-    {
-      typedef std::basic_ostream<_CharT, _Traits>  __ostream_type;
-      typedef typename __ostream_type::ios_base    __ios_base;
-
-      const typename __ios_base::fmtflags __flags = __os.flags();
-      const _CharT __fill = __os.fill();
-      const std::streamsize __precision = __os.precision();
-      __os.flags(__ios_base::scientific | __ios_base::left);
-      __os.fill(__os.widen(' '));
-      __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
-
-      __os << __x.alpha();
-
-      __os.flags(__flags);
-      __os.fill(__fill);
-      __os.precision(__precision);
-      return __os;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif
diff --git a/openflow/usr/include/c++/5/tr1/regex b/openflow/usr/include/c++/5/tr1/regex
deleted file mode 100644
index 37a81ce..0000000
--- a/openflow/usr/include/c++/5/tr1/regex
+++ /dev/null
@@ -1,2730 +0,0 @@
-// class template regex -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/**
- * @file tr1/regex
- * @author Stephen M. Webb  <stephen.webb@bregmasoft.ca>
- * This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_REGEX
-#define _GLIBCXX_TR1_REGEX 1
-
-#pragma GCC system_header
-
-#include <algorithm>
-#include <bitset>
-#include <iterator>
-#include <locale>
-#include <stdexcept>
-#include <string>
-#include <vector>
-#include <utility>
-#include <sstream>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-/**
- * @defgroup tr1_regex Regular Expressions
- * A facility for performing regular expression pattern matching.
- */
- //@{
-
-/** @namespace std::regex_constants
- *  @brief ISO C++ 0x entities sub namespace for regex.
- */
-namespace regex_constants
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @name 5.1 Regular Expression Syntax Options
-   */
-  //@{
-  enum __syntax_option
-    {
-      _S_icase,
-      _S_nosubs,
-      _S_optimize,
-      _S_collate,
-      _S_ECMAScript,
-      _S_basic,
-      _S_extended,
-      _S_awk,
-      _S_grep,
-      _S_egrep,
-      _S_syntax_last
-    };
-
-  /**
-   * @brief This is a bitmask type indicating how to interpret the regex.
-   *
-   * The @c syntax_option_type is implementation defined but it is valid to
-   * perform bitwise operations on these values and expect the right thing to
-   * happen.
-   *
-   * A valid value of type syntax_option_type shall have exactly one of the
-   * elements @c ECMAScript, @c basic, @c extended, @c awk, @c grep, @c egrep
-   * %set.
-   */
-  typedef unsigned int syntax_option_type;
-
-  /** 
-   * Specifies that the matching of regular expressions against a character
-   * sequence shall be performed without regard to case.
-   */
-  static const syntax_option_type icase      = 1 << _S_icase;
-
-  /**
-   * Specifies that when a regular expression is matched against a character
-   * container sequence, no sub-expression matches are to be stored in the
-   * supplied match_results structure.
-   */
-  static const syntax_option_type nosubs     = 1 << _S_nosubs;
-
-  /**
-   * Specifies that the regular expression engine should pay more attention to
-   * the speed with which regular expressions are matched, and less to the
-   * speed with which regular expression objects are constructed. Otherwise
-   * it has no detectable effect on the program output.
-   */
-  static const syntax_option_type optimize   = 1 << _S_optimize;
-
-  /**
-   * Specifies that character ranges of the form [a-b] should be locale
-   * sensitive.
-   */
-  static const syntax_option_type collate    = 1 << _S_collate;
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by ECMAScript in ECMA-262 [Ecma International, ECMAScript
-   * Language Specification, Standard Ecma-262, third edition, 1999], as
-   * modified in tr1 section [7.13].  This grammar is similar to that defined
-   * in the PERL scripting language but extended with elements found in the
-   * POSIX regular expression grammar.
-   */
-  static const syntax_option_type ECMAScript = 1 << _S_ECMAScript;
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by POSIX basic regular expressions in IEEE Std 1003.1-2001,
-   * Portable Operating System Interface (POSIX), Base Definitions and
-   * Headers, Section 9, Regular Expressions [IEEE, Information Technology --
-   * Portable Operating System Interface (POSIX), IEEE Standard 1003.1-2001].
-   */
-  static const syntax_option_type basic      = 1 << _S_basic;
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by POSIX extended regular expressions in IEEE Std 1003.1-2001,
-   * Portable Operating System Interface (POSIX), Base Definitions and Headers,
-   * Section 9, Regular Expressions.
-   */
-  static const syntax_option_type extended   = 1 << _S_extended;
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by POSIX utility awk in IEEE Std 1003.1-2001.  This option is
-   * identical to syntax_option_type extended, except that C-style escape
-   * sequences are supported.  These sequences are: 
-   * \\\\, \\a, \\b, \\f, 
-   * \\n, \\r, \\t , \\v, 
-   * \\&apos;, &apos;, and \\ddd 
-   * (where ddd is one, two, or three octal digits).  
-   */
-  static const syntax_option_type awk        = 1 << _S_awk;
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by POSIX utility grep in IEEE Std 1003.1-2001.  This option is
-   * identical to syntax_option_type basic, except that newlines are treated
-   * as whitespace.
-   */
-  static const syntax_option_type grep       = 1 << _S_grep;
-
-  /**
-   * Specifies that the grammar recognized by the regular expression engine is
-   * that used by POSIX utility grep when given the -E option in
-   * IEEE Std 1003.1-2001.  This option is identical to syntax_option_type 
-   * extended, except that newlines are treated as whitespace.
-   */
-  static const syntax_option_type egrep      = 1 << _S_egrep;
-
-  //@}
-
-  /**
-   * @name 5.2 Matching Rules
-   *
-   * Matching a regular expression against a sequence of characters [first,
-   * last) proceeds according to the rules of the grammar specified for the
-   * regular expression object, modified according to the effects listed
-   * below for any bitmask elements set.
-   *
-   */
-  //@{
-
-  enum __match_flag
-    {
-      _S_not_bol,
-      _S_not_eol,
-      _S_not_bow,
-      _S_not_eow,
-      _S_any,
-      _S_not_null,
-      _S_continuous,
-      _S_prev_avail,
-      _S_sed,
-      _S_no_copy,
-      _S_first_only,
-      _S_match_flag_last
-    };
-
-  /**
-   * @brief This is a bitmask type indicating regex matching rules.
-   *
-   * The @c match_flag_type is implementation defined but it is valid to
-   * perform bitwise operations on these values and expect the right thing to
-   * happen.
-   */
-  typedef std::bitset<_S_match_flag_last> match_flag_type;
-
-  /**
-   * The default matching rules.
-   */
-  static const match_flag_type match_default     = 0;
-
-  /**
-   * The first character in the sequence [first, last) is treated as though it
-   * is not at the beginning of a line, so the character (^) in the regular
-   * expression shall not match [first, first).
-   */
-  static const match_flag_type match_not_bol     = 1 << _S_not_bol;
-
-  /**
-   * The last character in the sequence [first, last) is treated as though it
-   * is not at the end of a line, so the character ($) in the regular
-   * expression shall not match [last, last).
-   */
-  static const match_flag_type match_not_eol     = 1 << _S_not_eol;
-   
-  /**
-   * The expression \\b is not matched against the sub-sequence
-   * [first,first).
-   */
-  static const match_flag_type match_not_bow     = 1 << _S_not_bow;
-   
-  /**
-   * The expression \\b should not be matched against the sub-sequence
-   * [last,last).
-   */
-  static const match_flag_type match_not_eow     = 1 << _S_not_eow;
-   
-  /**
-   * If more than one match is possible then any match is an acceptable
-   * result.
-   */
-  static const match_flag_type match_any         = 1 << _S_any;
-   
-  /**
-   * The expression does not match an empty sequence.
-   */
-  static const match_flag_type match_not_null    = 1 << _S_not_null;
-   
-  /**
-   * The expression only matches a sub-sequence that begins at first .
-   */
-  static const match_flag_type match_continuous  = 1 << _S_continuous;
-   
-  /**
-   * --first is a valid iterator position.  When this flag is set then the
-   * flags match_not_bol and match_not_bow are ignored by the regular
-   * expression algorithms 7.11 and iterators 7.12.
-   */
-  static const match_flag_type match_prev_avail  = 1 << _S_prev_avail;
-
-  /**
-   * When a regular expression match is to be replaced by a new string, the
-   * new string is constructed using the rules used by the ECMAScript replace
-   * function in ECMA- 262 [Ecma International, ECMAScript Language
-   * Specification, Standard Ecma-262, third edition, 1999], part 15.5.4.11
-   * String.prototype.replace. In addition, during search and replace
-   * operations all non-overlapping occurrences of the regular expression
-   * are located and replaced, and sections of the input that did not match
-   * the expression are copied unchanged to the output string.
-   * 
-   * Format strings (from ECMA-262 [15.5.4.11]):
-   * @li $$  The dollar-sign itself ($)
-   * @li $&  The matched substring.
-   * @li $`  The portion of @a string that precedes the matched substring.
-   *         This would be match_results::prefix().
-   * @li $'  The portion of @a string that follows the matched substring.
-   *         This would be match_results::suffix().
-   * @li $n  The nth capture, where n is in [1,9] and $n is not followed by a
-   *         decimal digit.  If n <= match_results::size() and the nth capture
-   *         is undefined, use the empty string instead.  If n >
-   *         match_results::size(), the result is implementation-defined.
-   * @li $nn The nnth capture, where nn is a two-digit decimal number on
-   *         [01, 99].  If nn <= match_results::size() and the nth capture is
-   *         undefined, use the empty string instead. If
-   *         nn > match_results::size(), the result is implementation-defined.
-   */
-  static const match_flag_type format_default    = 0;
-
-  /**
-   * When a regular expression match is to be replaced by a new string, the
-   * new string is constructed using the rules used by the POSIX sed utility
-   * in IEEE Std 1003.1- 2001 [IEEE, Information Technology -- Portable
-   * Operating System Interface (POSIX), IEEE Standard 1003.1-2001].
-   */
-  static const match_flag_type format_sed        = 1 << _S_sed;
-
-  /**
-   * During a search and replace operation, sections of the character
-   * container sequence being searched that do not match the regular
-   * expression shall not be copied to the output string.
-   */
-  static const match_flag_type format_no_copy    = 1 << _S_no_copy;
-
-  /**
-   * When specified during a search and replace operation, only the first
-   * occurrence of the regular expression shall be replaced.
-   */
-  static const match_flag_type format_first_only = 1 << _S_first_only;
-
-  //@}
-
-  /**
-   * @name 5.3 Error Types
-   */
-  //@{
- 
-  enum error_type
-    {
-      _S_error_collate,
-      _S_error_ctype,
-      _S_error_escape,
-      _S_error_backref,
-      _S_error_brack,
-      _S_error_paren,
-      _S_error_brace,
-      _S_error_badbrace,
-      _S_error_range,
-      _S_error_space,
-      _S_error_badrepeat,
-      _S_error_complexity,
-      _S_error_stack,
-      _S_error_last
-    };
-
-  /** The expression contained an invalid collating element name. */
-  static const error_type error_collate(_S_error_collate);
-
-  /** The expression contained an invalid character class name. */
-  static const error_type error_ctype(_S_error_ctype);
-
-  /**
-   * The expression contained an invalid escaped character, or a trailing
-   * escape.
-   */
-  static const error_type error_escape(_S_error_escape);
-
-  /** The expression contained an invalid back reference. */
-  static const error_type error_backref(_S_error_backref);
-
-  /** The expression contained mismatched [ and ]. */
-  static const error_type error_brack(_S_error_brack);
-
-  /** The expression contained mismatched ( and ). */
-  static const error_type error_paren(_S_error_paren);
-
-  /** The expression contained mismatched { and } */
-  static const error_type error_brace(_S_error_brace);
-
-  /** The expression contained an invalid range in a {} expression. */
-  static const error_type error_badbrace(_S_error_badbrace);
-
-  /**
-   * The expression contained an invalid character range,
-   * such as [b-a] in most encodings.
-   */
-  static const error_type error_range(_S_error_range);
-
-  /**
-   * There was insufficient memory to convert the expression into a
-   * finite state machine.
-   */
-  static const error_type error_space(_S_error_space);
-
-  /**
-   * One of <em>*?+{</em> was not preceded by a valid regular expression.
-   */
-  static const error_type error_badrepeat(_S_error_badrepeat);
-
-  /**
-   * The complexity of an attempted match against a regular expression
-   * exceeded a pre-set level.
-   */
-  static const error_type error_complexity(_S_error_complexity);
-
-  /**
-   * There was insufficient memory to determine whether the
-   * regular expression could match the specified character sequence.
-   */
-  static const error_type error_stack(_S_error_stack);
-
-  //@}
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // [7.8] Class regex_error
-  /**
-   *  @brief A regular expression exception class.
-   *  @ingroup exceptions
-   *
-   *  The regular expression library throws objects of this class on error.
-   */
-  class regex_error
-  : public std::runtime_error
-  {
-  public:
-    /**
-     * @brief Constructs a regex_error object.
-     *
-     * @param ecode the regex error code.
-     */
-    explicit
-    regex_error(regex_constants::error_type __ecode)
-    : std::runtime_error("regex_error"), _M_code(__ecode)
-    { }
-
-    /**
-     * @brief Gets the regex error code.
-     *
-     * @returns the regex error code.
-     */
-    regex_constants::error_type
-    code() const
-    { return _M_code; }
-
-  protected:
-    regex_constants::error_type _M_code;
-  };
-
-  // [7.7] Class regex_traits
-  /**
-   * @brief Describes aspects of a regular expression.
-   *
-   * A regular expression traits class that satisfies the requirements of tr1
-   * section [7.2].
-   *
-   * The class %regex is parameterized around a set of related types and
-   * functions used to complete the definition of its semantics.  This class
-   * satisfies the requirements of such a traits class.
-   */
-  template<typename _Ch_type>
-    struct regex_traits
-    {
-    public:
-      typedef _Ch_type                     char_type;
-      typedef std::basic_string<char_type> string_type;
-      typedef std::locale                  locale_type;
-      typedef std::ctype_base::mask        char_class_type;
-
-    public:
-      /**
-       * @brief Constructs a default traits object.
-       */
-      regex_traits()
-      { }
-      
-      /**
-       * @brief Gives the length of a C-style string starting at @p __p.
-       *
-       * @param __p a pointer to the start of a character sequence.
-       *
-       * @returns the number of characters between @p *__p and the first
-       * default-initialized value of type @p char_type.  In other words, uses
-       * the C-string algorithm for determining the length of a sequence of
-       * characters.
-       */
-      static std::size_t
-      length(const char_type* __p)
-      { return string_type::traits_type::length(__p); }
-
-      /**
-       * @brief Performs the identity translation.
-       *
-       * @param c A character to the locale-specific character set.
-       *
-       * @returns c.
-       */
-      char_type
-      translate(char_type __c) const
-      { return __c; }
-      
-      /**
-       * @brief Translates a character into a case-insensitive equivalent.
-       *
-       * @param c A character to the locale-specific character set.
-       *
-       * @returns the locale-specific lower-case equivalent of c.
-       * @throws std::bad_cast if the imbued locale does not support the ctype
-       *         facet.
-       */
-      char_type
-      translate_nocase(char_type __c) const
-      {
-	using std::ctype;
-	using std::use_facet;
-	return use_facet<ctype<char_type> >(_M_locale).tolower(__c);
-      }
-      
-      /**
-       * @brief Gets a sort key for a character sequence.
-       *
-       * @param first beginning of the character sequence.
-       * @param last  one-past-the-end of the character sequence.
-       *
-       * Returns a sort key for the character sequence designated by the
-       * iterator range [F1, F2) such that if the character sequence [G1, G2)
-       * sorts before the character sequence [H1, H2) then
-       * v.transform(G1, G2) < v.transform(H1, H2).
-       *
-       * What this really does is provide a more efficient way to compare a
-       * string to multiple other strings in locales with fancy collation
-       * rules and equivalence classes.
-       *
-       * @returns a locale-specific sort key equivalent to the input range.
-       *
-       * @throws std::bad_cast if the current locale does not have a collate
-       *         facet.
-       */
-      template<typename _Fwd_iter>
-        string_type
-        transform(_Fwd_iter __first, _Fwd_iter __last) const
-        {
-	  using std::collate;
-	  using std::use_facet;
-	  const collate<_Ch_type>& __c(use_facet<
-				       collate<_Ch_type> >(_M_locale));
-	  string_type __s(__first, __last);
-	  return __c.transform(__s.data(), __s.data() + __s.size());
-	}
-
-      /**
-       * @brief Dunno.
-       *
-       * @param first beginning of the character sequence.
-       * @param last  one-past-the-end of the character sequence.
-       *
-       * Effects: if typeid(use_facet<collate<_Ch_type> >) ==
-       * typeid(collate_byname<_Ch_type>) and the form of the sort key
-       * returned by collate_byname<_Ch_type>::transform(first, last) is known
-       * and can be converted into a primary sort key then returns that key,
-       * otherwise returns an empty string. WTF??
-       *
-       * @todo Implement this function.
-       */
-      template<typename _Fwd_iter>
-        string_type
-        transform_primary(_Fwd_iter __first, _Fwd_iter __last) const;
-
-      /**
-       * @brief Gets a collation element by name.
-       *
-       * @param first beginning of the collation element name.
-       * @param last  one-past-the-end of the collation element name.
-       * 
-       * @returns a sequence of one or more characters that represents the
-       * collating element consisting of the character sequence designated by
-       * the iterator range [first, last). Returns an empty string if the
-       * character sequence is not a valid collating element.
-       *
-       * @todo Implement this function.
-       */
-      template<typename _Fwd_iter>
-        string_type
-        lookup_collatename(_Fwd_iter __first, _Fwd_iter __last) const;
-
-      /**
-       * @brief Maps one or more characters to a named character
-       *        classification.
-       *
-       * @param first beginning of the character sequence.
-       * @param last  one-past-the-end of the character sequence.
-       *
-       * @returns an unspecified value that represents the character
-       * classification named by the character sequence designated by the
-       * iterator range [first, last). The value returned shall be independent
-       * of the case of the characters in the character sequence. If the name
-       * is not recognized then returns a value that compares equal to 0.
-       *
-       * At least the following names (or their wide-character equivalent) are
-       * supported.
-       * - d
-       * - w
-       * - s
-       * - alnum
-       * - alpha
-       * - blank
-       * - cntrl
-       * - digit
-       * - graph
-       * - lower
-       * - print
-       * - punct
-       * - space
-       * - upper
-       * - xdigit
-       *
-       * @todo Implement this function.
-       */
-      template<typename _Fwd_iter>
-        char_class_type
-        lookup_classname(_Fwd_iter __first, _Fwd_iter __last) const;
-
-      /**
-       * @brief Determines if @p c is a member of an identified class.
-       *
-       * @param c a character.
-       * @param f a class type (as returned from lookup_classname).
-       *
-       * @returns true if the character @p c is a member of the classification
-       * represented by @p f, false otherwise.
-       *
-       * @throws std::bad_cast if the current locale does not have a ctype
-       *         facet.
-       */
-      bool
-      isctype(_Ch_type __c, char_class_type __f) const;
-
-      /**
-       * @brief Converts a digit to an int.
-       *
-       * @param ch    a character representing a digit.
-       * @param radix the radix if the numeric conversion (limited to 8, 10,
-       *              or 16).
-       * 
-       * @returns the value represented by the digit ch in base radix if the
-       * character ch is a valid digit in base radix; otherwise returns -1.
-       */
-      int
-      value(_Ch_type __ch, int __radix) const;
-      
-      /**
-       * @brief Imbues the regex_traits object with a copy of a new locale.
-       *
-       * @param loc A locale.
-       *
-       * @returns a copy of the previous locale in use by the regex_traits
-       *          object.
-       *
-       * @note Calling imbue with a different locale than the one currently in
-       *       use invalidates all cached data held by *this.
-       */
-      locale_type
-      imbue(locale_type __loc)
-      {
-	std::swap(_M_locale, __loc);
-	return __loc;
-      }
-      
-      /**
-       * @brief Gets a copy of the current locale in use by the regex_traits
-       * object.
-       */
-      locale_type
-      getloc() const
-      { return _M_locale; }
-      
-    protected:
-      locale_type _M_locale;
-    };
-
-  template<typename _Ch_type>
-    bool regex_traits<_Ch_type>::
-    isctype(_Ch_type __c, char_class_type __f) const
-    {
-      using std::ctype;
-      using std::use_facet;
-      const ctype<_Ch_type>& __ctype(use_facet<
-				     ctype<_Ch_type> >(_M_locale));
-      
-      if (__ctype.is(__c, __f))
-	return true;
-#if 0
-      // special case of underscore in [[:w:]]
-      if (__c == __ctype.widen('_'))
-	{
-	  const char* const __wb[] = "w";
-	  char_class_type __wt = this->lookup_classname(__wb,
-							__wb + sizeof(__wb));
-	  if (__f | __wt)
-	    return true;
-	}
-    
-      // special case of [[:space:]] in [[:blank:]]
-      if (__c == __ctype.isspace(__c))
-	{
-	  const char* const __bb[] = "blank";
-	  char_class_type __bt = this->lookup_classname(__bb,
-							__bb + sizeof(__bb));
-	  if (__f | __bt)
-	    return true;
-	}
-#endif
-      return false;
-    }
-
-  template<typename _Ch_type>
-    int regex_traits<_Ch_type>::
-    value(_Ch_type __ch, int __radix) const
-    {
-      std::basic_istringstream<_Ch_type> __is(string_type(1, __ch));
-      int __v;
-      if (__radix == 8)
-	__is >> std::oct;
-      else if (__radix == 16)
-	__is >> std::hex;
-      __is >> __v;
-      return __is.fail() ? -1 : __v;
-    }
-
-  // [7.8] Class basic_regex
-  /**
-   * Objects of specializations of this class represent regular expressions
-   * constructed from sequences of character type @p _Ch_type.
-   *
-   * Storage for the regular expression is allocated and deallocated as
-   * necessary by the member functions of this class.
-   */
-  template<typename _Ch_type, typename _Rx_traits = regex_traits<_Ch_type> >
-    class basic_regex
-    {
-    public:
-      // types:
-      typedef _Ch_type                              value_type;
-      typedef regex_constants::syntax_option_type flag_type;
-      typedef typename _Rx_traits::locale_type  locale_type;
-      typedef typename _Rx_traits::string_type  string_type;
-
-      /**
-       * @name Constants
-       * tr1 [7.8.1] std [28.8.1]
-       */
-      //@{
-      static const regex_constants::syntax_option_type icase
-        = regex_constants::icase;
-      static const regex_constants::syntax_option_type nosubs
-        = regex_constants::nosubs;
-      static const regex_constants::syntax_option_type optimize
-        = regex_constants::optimize;
-      static const regex_constants::syntax_option_type collate
-        = regex_constants::collate;
-      static const regex_constants::syntax_option_type ECMAScript
-        = regex_constants::ECMAScript;
-      static const regex_constants::syntax_option_type basic
-        = regex_constants::basic;
-      static const regex_constants::syntax_option_type extended
-        = regex_constants::extended;
-      static const regex_constants::syntax_option_type awk
-        = regex_constants::awk;
-      static const regex_constants::syntax_option_type grep
-        = regex_constants::grep;
-      static const regex_constants::syntax_option_type egrep
-        = regex_constants::egrep;
-      //@}
-
-      // [7.8.2] construct/copy/destroy
-      /**
-       * Constructs a basic regular expression that does not match any
-       * character sequence.
-       */
-      basic_regex()
-      : _M_flags(regex_constants::ECMAScript), _M_pattern(), _M_mark_count(0)
-      { _M_compile(); }
-
-      /**
-       * @brief Constructs a basic regular expression from the sequence
-       * [p, p + char_traits<_Ch_type>::length(p)) interpreted according to the
-       * flags in @p f.
-       *
-       * @param p A pointer to the start of a C-style null-terminated string
-       *          containing a regular expression.
-       * @param f Flags indicating the syntax rules and options.
-       *
-       * @throws regex_error if @p p is not a valid regular expression.
-       */
-      explicit
-      basic_regex(const _Ch_type* __p,
-		  flag_type __f = regex_constants::ECMAScript)
-      : _M_flags(__f), _M_pattern(__p), _M_mark_count(0)
-      { _M_compile(); }
-
-      /**
-       * @brief Constructs a basic regular expression from the sequence
-       * [p, p + len) interpreted according to the flags in @p f.
-       *
-       * @param p   A pointer to the start of a string containing a regular
-       *            expression.
-       * @param len The length of the string containing the regular expression.
-       * @param f   Flags indicating the syntax rules and options.
-       *
-       * @throws regex_error if @p p is not a valid regular expression.
-       */
-      basic_regex(const _Ch_type* __p, std::size_t __len, flag_type __f)
-      : _M_flags(__f) , _M_pattern(__p, __len), _M_mark_count(0)
-      { _M_compile(); }
-
-      /**
-       * @brief Copy-constructs a basic regular expression.
-       *
-       * @param rhs A @p regex object.
-     */
-      basic_regex(const basic_regex& __rhs)
-      : _M_flags(__rhs._M_flags), _M_pattern(__rhs._M_pattern),
-	_M_mark_count(__rhs._M_mark_count)
-      { _M_compile(); }
-
-      /**
-       * @brief Constructs a basic regular expression from the string
-       * @p s interpreted according to the flags in @p f.
-       *
-       * @param s A string containing a regular expression.
-       * @param f Flags indicating the syntax rules and options.
-       *
-       * @throws regex_error if @p s is not a valid regular expression.
-       */
-      template<typename _Ch_traits, typename _Ch_alloc>
-        explicit
-        basic_regex(const basic_string<_Ch_type, _Ch_traits, _Ch_alloc>& __s,
-		    flag_type __f = regex_constants::ECMAScript)
-	: _M_flags(__f), _M_pattern(__s.begin(), __s.end()), _M_mark_count(0)
-        { _M_compile(); }
-
-      /**
-       * @brief Constructs a basic regular expression from the range
-       * [first, last) interpreted according to the flags in @p f.
-       *
-       * @param first The start of a range containing a valid regular
-       *              expression.
-       * @param last  The end of a range containing a valid regular
-       *              expression.
-       * @param f     The format flags of the regular expression.
-       *
-       * @throws regex_error if @p [first, last) is not a valid regular
-       *         expression.
-       */
-      template<typename _InputIterator>
-        basic_regex(_InputIterator __first, _InputIterator __last, 
-		    flag_type __f = regex_constants::ECMAScript)
-	: _M_flags(__f), _M_pattern(__first, __last), _M_mark_count(0)
-        { _M_compile(); }
-
-#ifdef _GLIBCXX_INCLUDE_AS_CXX11
-      /**
-       * @brief Constructs a basic regular expression from an initializer list.
-       *
-       * @param l  The initializer list.
-       * @param f  The format flags of the regular expression.
-       *
-       * @throws regex_error if @p l is not a valid regular expression.
-       */
-      basic_regex(initializer_list<_Ch_type> __l,
-		  flag_type __f = regex_constants::ECMAScript)
-	: _M_flags(__f), _M_pattern(__l.begin(), __l.end()), _M_mark_count(0)
-        { _M_compile(); }
-#endif
-
-      /**
-       * @brief Destroys a basic regular expression.
-       */
-      ~basic_regex()
-      { }
-      
-      /**
-       * @brief Assigns one regular expression to another.
-       */
-      basic_regex&
-      operator=(const basic_regex& __rhs)
-      { return this->assign(__rhs); }
-
-      /**
-       * @brief Replaces a regular expression with a new one constructed from
-       * a C-style null-terminated string.
-       *
-       * @param A pointer to the start of a null-terminated C-style string
-       *        containing a regular expression.
-       */
-      basic_regex&
-      operator=(const _Ch_type* __p)
-      { return this->assign(__p, flags()); }
-      
-      /**
-       * @brief Replaces a regular expression with a new one constructed from
-       * a string.
-       *
-       * @param A pointer to a string containing a regular expression.
-       */
-      template<typename _Ch_typeraits, typename _Allocator>
-        basic_regex&
-        operator=(const basic_string<_Ch_type, _Ch_typeraits, _Allocator>& __s)
-        { return this->assign(__s, flags()); }
-
-      // [7.8.3] assign
-      /**
-       * @brief the real assignment operator.
-       *
-       * @param that Another regular expression object.
-       */
-      basic_regex&
-      assign(const basic_regex& __that)
-      {
-	basic_regex __tmp(__that);
-	this->swap(__tmp);
-	return *this;
-      }
-      
-      /**
-       * @brief Assigns a new regular expression to a regex object from a
-       * C-style null-terminated string containing a regular expression
-       * pattern.
-       *
-       * @param p     A pointer to a C-style null-terminated string containing
-       *              a regular expression pattern.
-       * @param flags Syntax option flags.
-       *
-       * @throws regex_error if p does not contain a valid regular expression
-       * pattern interpreted according to @p flags.  If regex_error is thrown,
-       * *this remains unchanged.
-       */
-      basic_regex&
-      assign(const _Ch_type* __p,
-	     flag_type __flags = regex_constants::ECMAScript)
-      { return this->assign(string_type(__p), __flags); }
-
-      /**
-       * @brief Assigns a new regular expression to a regex object from a
-       * C-style string containing a regular expression pattern.
-       *
-       * @param p     A pointer to a C-style string containing a
-       *              regular expression pattern.
-       * @param len   The length of the regular expression pattern string.
-       * @param flags Syntax option flags.
-       *
-       * @throws regex_error if p does not contain a valid regular expression
-       * pattern interpreted according to @p flags.  If regex_error is thrown,
-       * *this remains unchanged.
-       */
-      basic_regex&
-      assign(const _Ch_type* __p, std::size_t __len, flag_type __flags)
-      { return this->assign(string_type(__p, __len), __flags); }
-
-      /**
-       * @brief Assigns a new regular expression to a regex object from a 
-       * string containing a regular expression pattern.
-       *
-       * @param s     A string containing a regular expression pattern.
-       * @param flags Syntax option flags.
-       *
-       * @throws regex_error if p does not contain a valid regular expression
-       * pattern interpreted according to @p flags.  If regex_error is thrown,
-       * *this remains unchanged.
-       */
-      template<typename _Ch_typeraits, typename _Allocator>
-        basic_regex&
-        assign(const basic_string<_Ch_type, _Ch_typeraits, _Allocator>& __s,
-	       flag_type __f = regex_constants::ECMAScript)
-        { 
-	  basic_regex __tmp(__s, __f);
-	  this->swap(__tmp);
-	  return *this;
-	}
-
-      /**
-       * @brief Assigns a new regular expression to a regex object.
-       *
-       * @param first The start of a range containing a valid regular
-       *              expression.
-       * @param last  The end of a range containing a valid regular
-       *              expression.
-       * @param flags Syntax option flags.
-       *
-       * @throws regex_error if p does not contain a valid regular expression
-       * pattern interpreted according to @p flags.  If regex_error is thrown,
-       * the object remains unchanged.
-       */
-      template<typename _InputIterator>
-        basic_regex&
-        assign(_InputIterator __first, _InputIterator __last,
-	       flag_type __flags = regex_constants::ECMAScript)
-        { return this->assign(string_type(__first, __last), __flags); }
-
-#ifdef _GLIBCXX_INCLUDE_AS_CXX11
-      /**
-       * @brief Assigns a new regular expression to a regex object.
-       *
-       * @param l     An initializer list representing a regular expression.
-       * @param flags Syntax option flags.
-       *
-       * @throws regex_error if @p l does not contain a valid regular
-       * expression pattern interpreted according to @p flags.  If regex_error
-       * is thrown, the object remains unchanged.
-       */
-      basic_regex&
-      assign(initializer_list<_Ch_type> __l,
-	     flag_type __f = regex_constants::ECMAScript)
-      { return this->assign(__l.begin(), __l.end(), __f); }
-#endif
-
-      // [7.8.4] const operations
-      /**
-       * @brief Gets the number of marked subexpressions within the regular
-       * expression.
-       */
-      unsigned int
-      mark_count() const
-      { return _M_mark_count; }
-      
-      /**
-       * @brief Gets the flags used to construct the regular expression
-       * or in the last call to assign().
-       */
-      flag_type
-      flags() const
-      { return _M_flags; }
-      
-      // [7.8.5] locale
-      /**
-       * @brief Imbues the regular expression object with the given locale.
-       *
-       * @param loc A locale.
-       */
-      locale_type
-      imbue(locale_type __loc)
-      { return _M_traits.imbue(__loc); }
-      
-      /**
-       * @brief Gets the locale currently imbued in the regular expression
-       *        object.
-       */
-      locale_type
-      getloc() const
-      { return _M_traits.getloc(); }
-      
-      // [7.8.6] swap
-      /**
-       * @brief Swaps the contents of two regular expression objects.
-       *
-       * @param rhs Another regular expression object.
-       */
-      void
-      swap(basic_regex& __rhs)
-      {
-	std::swap(_M_flags,      __rhs._M_flags);
-	std::swap(_M_pattern,    __rhs._M_pattern);
-	std::swap(_M_mark_count, __rhs._M_mark_count);
-	std::swap(_M_traits,     __rhs._M_traits);
-      }
-      
-    private:
-      /**
-       * @brief Compiles a regular expression pattern into a NFA.
-       * @todo Implement this function.
-       */
-      void _M_compile();
-
-    protected:
-      flag_type    _M_flags;
-      string_type  _M_pattern;
-      unsigned int _M_mark_count;
-      _Rx_traits   _M_traits;
-    };
-  
-  /** @brief Standard regular expressions. */
-  typedef basic_regex<char>    regex;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /** @brief Standard wide-character regular expressions. */
-  typedef basic_regex<wchar_t> wregex;
-#endif
-
-
-  // [7.8.6] basic_regex swap
-  /**
-   * @brief Swaps the contents of two regular expression objects.
-   * @param lhs First regular expression.
-   * @param rhs Second regular expression.
-   */
-  template<typename _Ch_type, typename _Rx_traits>
-    inline void
-    swap(basic_regex<_Ch_type, _Rx_traits>& __lhs,
-	 basic_regex<_Ch_type, _Rx_traits>& __rhs)
-    { __lhs.swap(__rhs); }
-
-
-  // [7.9] Class template sub_match
-  /**
-   * A sequence of characters matched by a particular marked sub-expression.
-   *
-   * An object of this class is essentially a pair of iterators marking a
-   * matched subexpression within a regular expression pattern match. Such
-   * objects can be converted to and compared with std::basic_string objects
-   * of a similar base character type as the pattern matched by the regular
-   * expression.
-   *
-   * The iterators that make up the pair are the usual half-open interval
-   * referencing the actual original pattern matched.
-   */
-  template<typename _BiIter>
-    class sub_match : public std::pair<_BiIter, _BiIter>
-    {
-    public:
-      typedef typename iterator_traits<_BiIter>::value_type      value_type;
-      typedef typename iterator_traits<_BiIter>::difference_type
-                                                            difference_type;
-      typedef _BiIter                                              iterator;
-
-    public:
-      bool matched;
-      
-      /**
-       * Gets the length of the matching sequence.
-       */
-      difference_type
-      length() const
-      { return this->matched ? std::distance(this->first, this->second) : 0; }
-
-      /**
-       * @brief Gets the matching sequence as a string.
-       *
-       * @returns the matching sequence as a string.
-       *
-       * This is the implicit conversion operator.  It is identical to the
-       * str() member function except that it will want to pop up in
-       * unexpected places and cause a great deal of confusion and cursing
-       * from the unwary.
-       */
-      operator basic_string<value_type>() const
-      {
-	return this->matched
-	  ? std::basic_string<value_type>(this->first, this->second)
-	  : std::basic_string<value_type>();
-      }
-      
-      /**
-       * @brief Gets the matching sequence as a string.
-       *
-       * @returns the matching sequence as a string.
-       */
-      basic_string<value_type>
-      str() const
-      {
-	return this->matched
-	  ? std::basic_string<value_type>(this->first, this->second)
-	  : std::basic_string<value_type>();
-      }
-      
-      /**
-       * @brief Compares this and another matched sequence.
-       *
-       * @param s Another matched sequence to compare to this one.
-       *
-       * @retval <0 this matched sequence will collate before @p s.
-       * @retval =0 this matched sequence is equivalent to @p s.
-       * @retval <0 this matched sequence will collate after @p s.
-       */
-      int
-      compare(const sub_match& __s) const
-      { return this->str().compare(__s.str()); }
-
-      /**
-       * @brief Compares this sub_match to a string.
-       *
-       * @param s A string to compare to this sub_match.
-       *
-       * @retval <0 this matched sequence will collate before @p s.
-       * @retval =0 this matched sequence is equivalent to @p s.
-       * @retval <0 this matched sequence will collate after @p s.
-       */
-      int
-      compare(const basic_string<value_type>& __s) const
-      { return this->str().compare(__s); }
-      
-      /**
-       * @brief Compares this sub_match to a C-style string.
-       *
-       * @param s A C-style string to compare to this sub_match.
-       *
-       * @retval <0 this matched sequence will collate before @p s.
-       * @retval =0 this matched sequence is equivalent to @p s.
-       * @retval <0 this matched sequence will collate after @p s.
-       */
-      int
-      compare(const value_type* __s) const
-      { return this->str().compare(__s); }
-    };
-  
-  
-  /** @brief Standard regex submatch over a C-style null-terminated string. */
-  typedef sub_match<const char*>             csub_match;
-  /** @brief Standard regex submatch over a standard string. */
-  typedef sub_match<string::const_iterator>  ssub_match;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /** @brief Regex submatch over a C-style null-terminated wide string. */
-  typedef sub_match<const wchar_t*>          wcsub_match;
-  /** @brief Regex submatch over a standard wide string. */
-  typedef sub_match<wstring::const_iterator> wssub_match;
-#endif
-
-  // [7.9.2] sub_match non-member operators
-  
-  /**
-   * @brief Tests the equivalence of two regular expression submatches.
-   * @param lhs First regular expression submatch.
-   * @param rhs Second regular expression submatch.
-   * @returns true if @a lhs  is equivalent to @a rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator==(const sub_match<_BiIter>& __lhs,
-	       const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) == 0; }
-
-  /**
-   * @brief Tests the inequivalence of two regular expression submatches.
-   * @param lhs First regular expression submatch.
-   * @param rhs Second regular expression submatch.
-   * @returns true if @a lhs  is not equivalent to @a rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator!=(const sub_match<_BiIter>& __lhs,
-	       const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) != 0; }
-
-  /**
-   * @brief Tests the ordering of two regular expression submatches.
-   * @param lhs First regular expression submatch.
-   * @param rhs Second regular expression submatch.
-   * @returns true if @a lhs precedes @a rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator<(const sub_match<_BiIter>& __lhs,
-	      const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) < 0; }
-
-  /**
-   * @brief Tests the ordering of two regular expression submatches.
-   * @param lhs First regular expression submatch.
-   * @param rhs Second regular expression submatch.
-   * @returns true if @a lhs does not succeed @a rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator<=(const sub_match<_BiIter>& __lhs,
-	       const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) <= 0; }
-
-  /**
-   * @brief Tests the ordering of two regular expression submatches.
-   * @param lhs First regular expression submatch.
-   * @param rhs Second regular expression submatch.
-   * @returns true if @a lhs does not precede @a rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator>=(const sub_match<_BiIter>& __lhs,
-	       const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) >= 0; }
-
-  /**
-   * @brief Tests the ordering of two regular expression submatches.
-   * @param lhs First regular expression submatch.
-   * @param rhs Second regular expression submatch.
-   * @returns true if @a lhs succeeds @a rhs, false otherwise.
-   */
-  template<typename _BiIter>
-    inline bool
-    operator>(const sub_match<_BiIter>& __lhs,
-	      const sub_match<_BiIter>& __rhs)
-    { return __lhs.compare(__rhs) > 0; }
-
-  /**
-   * @brief Tests the equivalence of a string and a regular expression
-   *        submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs  is equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator==(const basic_string<
-	       typename iterator_traits<_Bi_iter>::value_type,
-	       _Ch_traits, _Ch_alloc>& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return __lhs == __rhs.str(); }
-
-  /**
-   * @brief Tests the inequivalence of a string and a regular expression
-   *        submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs  is not equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator!=(const basic_string<
-	       typename iterator_traits<_Bi_iter>::value_type,
-	       _Ch_traits, _Ch_alloc>& __lhs, const sub_match<_Bi_iter>& __rhs)
-    { return __lhs != __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs precedes @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator<(const basic_string<
-	      typename iterator_traits<_Bi_iter>::value_type,
-	      _Ch_traits, _Ch_alloc>& __lhs, const sub_match<_Bi_iter>& __rhs)
-     { return __lhs < __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs succeeds @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator>(const basic_string<
-	      typename iterator_traits<_Bi_iter>::value_type, 
-	      _Ch_traits, _Ch_alloc>& __lhs, const sub_match<_Bi_iter>& __rhs)
-    { return __lhs > __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs does not precede @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator>=(const basic_string<
-	       typename iterator_traits<_Bi_iter>::value_type,
-	       _Ch_traits, _Ch_alloc>& __lhs, const sub_match<_Bi_iter>& __rhs)
-    { return __lhs >= __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs does not succeed @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator<=(const basic_string<
-	       typename iterator_traits<_Bi_iter>::value_type,
-	       _Ch_traits, _Ch_alloc>& __lhs, const sub_match<_Bi_iter>& __rhs)
-    { return __lhs <= __rhs.str(); }
-
-  /**
-   * @brief Tests the equivalence of a regular expression submatch and a
-   *        string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs is equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator==(const sub_match<_Bi_iter>& __lhs,
-	       const basic_string<
-	       typename iterator_traits<_Bi_iter>::value_type,
-	       _Ch_traits, _Ch_alloc>& __rhs)
-    { return __lhs.str() == __rhs; }
-
-  /**
-   * @brief Tests the inequivalence of a regular expression submatch and a
-   *        string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs is not equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, typename _Ch_traits, typename _Ch_alloc>
-    inline bool
-    operator!=(const sub_match<_Bi_iter>& __lhs,
-	       const basic_string<
-	       typename iterator_traits<_Bi_iter>::value_type,
-	       _Ch_traits, _Ch_alloc>& __rhs)
-    { return __lhs.str() != __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs precedes @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, class _Ch_traits, class _Ch_alloc>
-    inline bool
-    operator<(const sub_match<_Bi_iter>& __lhs,
-	      const basic_string<
-	      typename iterator_traits<_Bi_iter>::value_type,
-	      _Ch_traits, _Ch_alloc>& __rhs)
-    { return __lhs.str() < __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs succeeds @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, class _Ch_traits, class _Ch_alloc>
-    inline bool
-    operator>(const sub_match<_Bi_iter>& __lhs,
-	      const basic_string<
-	      typename iterator_traits<_Bi_iter>::value_type,
-	      _Ch_traits, _Ch_alloc>& __rhs)
-    { return __lhs.str() > __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs does not precede @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, class _Ch_traits, class _Ch_alloc>
-    inline bool
-    operator>=(const sub_match<_Bi_iter>& __lhs,
-	       const basic_string<
-	       typename iterator_traits<_Bi_iter>::value_type,
-	       _Ch_traits, _Ch_alloc>& __rhs)
-    { return __lhs.str() >= __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs does not succeed @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter, class _Ch_traits, class _Ch_alloc>
-    inline bool
-    operator<=(const sub_match<_Bi_iter>& __lhs,
-	       const basic_string<
-	       typename iterator_traits<_Bi_iter>::value_type,
-	       _Ch_traits, _Ch_alloc>& __rhs)
-    { return __lhs.str() <= __rhs; }
-
-  /**
-   * @brief Tests the equivalence of a C string and a regular expression
-   *        submatch.
-   * @param lhs A C string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs  is equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator==(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return __lhs == __rhs.str(); }
-
-  /**
-   * @brief Tests the inequivalence of an iterator value and a regular
-   *        expression submatch.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs is not equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator!=(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return __lhs != __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs precedes @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	      const sub_match<_Bi_iter>& __rhs)
-    { return __lhs < __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs succeeds @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	      const sub_match<_Bi_iter>& __rhs)
-    { return __lhs > __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs does not precede @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>=(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return __lhs >= __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs does not succeed @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<=(typename iterator_traits<_Bi_iter>::value_type const* __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return __lhs <= __rhs.str(); }
-
-  /**
-   * @brief Tests the equivalence of a regular expression submatch and a
-   *        string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A pointer to a string?
-   * @returns true if @a lhs  is equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator==(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return __lhs.str() == __rhs; }
-
-  /**
-   * @brief Tests the inequivalence of a regular expression submatch and a
-   *        string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A pointer to a string.
-   * @returns true if @a lhs is not equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator!=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return __lhs.str() != __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs precedes @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<(const sub_match<_Bi_iter>& __lhs,
-	      typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return __lhs.str() < __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs succeeds @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>(const sub_match<_Bi_iter>& __lhs,
-	      typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return __lhs.str() > __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs does not precede @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return __lhs.str() >= __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A string.
-   * @returns true if @a lhs does not succeed @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const* __rhs)
-    { return __lhs.str() <= __rhs; }
-
-  /**
-   * @brief Tests the equivalence of a string and a regular expression
-   *        submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs is equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator==(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return __lhs == __rhs.str(); }
-
-  /**
-   * @brief Tests the inequivalence of a string and a regular expression
-   *        submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs is not equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator!=(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return __lhs != __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs precedes @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	      const sub_match<_Bi_iter>& __rhs)
-    { return __lhs < __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs succeeds @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	      const sub_match<_Bi_iter>& __rhs)
-    { return __lhs > __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs does not precede @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>=(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return __lhs >= __rhs.str(); }
-
-  /**
-   * @brief Tests the ordering of a string and a regular expression submatch.
-   * @param lhs A string.
-   * @param rhs A regular expression submatch.
-   * @returns true if @a lhs does not succeed @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<=(typename iterator_traits<_Bi_iter>::value_type const& __lhs,
-	       const sub_match<_Bi_iter>& __rhs)
-    { return __lhs <= __rhs.str(); }
-
-  /**
-   * @brief Tests the equivalence of a regular expression submatch and a
-   *        string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A const string reference.
-   * @returns true if @a lhs  is equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator==(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    { return __lhs.str() == __rhs; }
-
-  /**
-   * @brief Tests the inequivalence of a regular expression submatch and a
-   *        string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A const string reference.
-   * @returns true if @a lhs is not equivalent to @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator!=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    { return __lhs.str() != __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A const string reference.
-   * @returns true if @a lhs precedes @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<(const sub_match<_Bi_iter>& __lhs,
-	      typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    { return __lhs.str() < __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A const string reference.
-   * @returns true if @a lhs succeeds @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>(const sub_match<_Bi_iter>& __lhs,
-	      typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    { return __lhs.str() > __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A const string reference.
-   * @returns true if @a lhs does not precede @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator>=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    { return __lhs.str() >= __rhs; }
-
-  /**
-   * @brief Tests the ordering of a regular expression submatch and a string.
-   * @param lhs A regular expression submatch.
-   * @param rhs A const string reference.
-   * @returns true if @a lhs does not succeed @a rhs, false otherwise.
-   */
-  template<typename _Bi_iter>
-    inline bool
-    operator<=(const sub_match<_Bi_iter>& __lhs,
-	       typename iterator_traits<_Bi_iter>::value_type const& __rhs)
-    { return __lhs.str() <= __rhs; }
-
-  /**
-   * @brief Inserts a matched string into an output stream.
-   *
-   * @param os The output stream.
-   * @param m  A submatch string.
-   *
-   * @returns the output stream with the submatch string inserted.
-   */
-  template<typename _Ch_type, typename _Ch_traits, typename _Bi_iter>
-    inline
-    basic_ostream<_Ch_type, _Ch_traits>&
-    operator<<(basic_ostream<_Ch_type, _Ch_traits>& __os,
-	       const sub_match<_Bi_iter>& __m)
-    { return __os << __m.str(); }
-
-  // [7.10] Class template match_results
-  /**
-   * @brief The results of a match or search operation.
-   *
-   * A collection of character sequences representing the result of a regular
-   * expression match.  Storage for the collection is allocated and freed as
-   * necessary by the member functions of class template match_results.
-   *
-   * This class satisfies the Sequence requirements, with the exception that
-   * only the operations defined for a const-qualified Sequence are supported.
-   *
-   * The sub_match object stored at index 0 represents sub-expression 0, i.e.
-   * the whole match. In this case the sub_match member matched is always true.
-   * The sub_match object stored at index n denotes what matched the marked
-   * sub-expression n within the matched expression. If the sub-expression n
-   * participated in a regular expression match then the sub_match member
-   * matched evaluates to true, and members first and second denote the range
-   * of characters [first, second) which formed that match. Otherwise matched
-   * is false, and members first and second point to the end of the sequence
-   * that was searched.
-   *
-   * @nosubgrouping
-   */
-  template<typename _Bi_iter,
-	   typename _Allocator = allocator<sub_match<_Bi_iter> > >
-    class match_results
-    : private std::vector<std::tr1::sub_match<_Bi_iter>, _Allocator>
-    {
-    private:
-      typedef std::vector<std::tr1::sub_match<_Bi_iter>, _Allocator>
-                                                              _Base_type;
-
-    public:
-      /**
-       * @name 10.? Public Types
-       */
-      //@{
-      typedef sub_match<_Bi_iter>                             value_type;
-      typedef typename _Allocator::const_reference            const_reference;
-      typedef const_reference                                 reference;
-      typedef typename _Base_type::const_iterator             const_iterator;
-      typedef const_iterator                                  iterator;
-      typedef typename iterator_traits<_Bi_iter>::difference_type
-                                                              difference_type;
-      typedef typename _Allocator::size_type                  size_type;
-      typedef _Allocator                                      allocator_type;
-      typedef typename iterator_traits<_Bi_iter>::value_type  char_type;
-      typedef basic_string<char_type>                         string_type;
-      //@}
-  
-    public:
-      /**
-       * @name 10.1 Construction, Copying, and Destruction
-       */
-      //@{
-
-      /**
-       * @brief Constructs a default %match_results container.
-       * @post size() returns 0 and str() returns an empty string.
-       */
-      explicit
-      match_results(const _Allocator& __a = _Allocator())
-      : _Base_type(__a), _M_matched(false)
-      { }
-
-      /**
-       * @brief Copy constructs a %match_results.
-       */
-      match_results(const match_results& __rhs)
-      : _Base_type(__rhs), _M_matched(__rhs._M_matched),
-	_M_prefix(__rhs._M_prefix), _M_suffix(__rhs._M_suffix)
-      { }
-
-      /**
-       * @brief Assigns rhs to *this.
-       */
-      match_results&
-      operator=(const match_results& __rhs)
-      {
-	match_results __tmp(__rhs);
-	this->swap(__tmp);
-	return *this;
-      }
-
-      /**
-       * @brief Destroys a %match_results object.
-       */
-      ~match_results()
-      { }
-      
-      //@}
-
-      /**
-       * @name 10.2 Size
-       */
-      //@{
-
-      /**
-       * @brief Gets the number of matches and submatches.
-       *
-       * The number of matches for a given regular expression will be either 0
-       * if there was no match or mark_count() + 1 if a match was successful.
-       * Some matches may be empty.
-       *
-       * @returns the number of matches found.
-       */
-      size_type
-      size() const
-      { return _M_matched ? _Base_type::size() + 1 : 0; }
-      
-      //size_type
-      //max_size() const;
-      using _Base_type::max_size;
-
-      /**
-       * @brief Indicates if the %match_results contains no results.
-       * @retval true The %match_results object is empty.
-       * @retval false The %match_results object is not empty.
-       */
-      bool
-      empty() const
-      { return size() == 0; }
-      
-      //@}
-
-      /**
-       * @name 10.3 Element Access
-       */
-      //@{
-
-      /**
-       * @brief Gets the length of the indicated submatch.
-       * @param sub indicates the submatch.
-       *
-       * This function returns the length of the indicated submatch, or the
-       * length of the entire match if @p sub is zero (the default).
-       */
-      difference_type
-      length(size_type __sub = 0) const
-      { return _M_matched ? this->str(__sub).length() : 0; }
-
-      /**
-       * @brief Gets the offset of the beginning of the indicated submatch.
-       * @param sub indicates the submatch.
-       *
-       * This function returns the offset from the beginning of the target
-       * sequence to the beginning of the submatch, unless the value of @p sub
-       * is zero (the default), in which case this function returns the offset
-       * from the beginning of the target sequence to the beginning of the
-       * match.
-       */
-      difference_type
-      position(size_type __sub = 0) const
-      {
-	return _M_matched ? std::distance(this->prefix().first,
-					  (*this)[__sub].first) : 0;
-      }
-
-      /**
-       * @brief Gets the match or submatch converted to a string type.
-       * @param sub indicates the submatch.
-       *
-       * This function gets the submatch (or match, if @p sub is zero) extracted
-       * from the target range and converted to the associated string type.
-       */
-      string_type
-      str(size_type __sub = 0) const
-      { return _M_matched ? (*this)[__sub].str() : string_type(); }
-      
-      /**
-       * @brief Gets a %sub_match reference for the match or submatch.
-       * @param sub indicates the submatch.
-       *
-       * This function gets a reference to the indicated submatch, or the entire
-       * match if @p sub is zero.
-       *
-       * If @p sub >= size() then this function returns a %sub_match with a
-       * special value indicating no submatch.
-       */
-      const_reference
-      operator[](size_type __sub) const
-      { return _Base_type::operator[](__sub); }
-
-      /**
-       * @brief Gets a %sub_match representing the match prefix.
-       *
-       * This function gets a reference to a %sub_match object representing the
-       * part of the target range between the start of the target range and the
-       * start of the match.
-       */
-      const_reference
-      prefix() const
-      { return _M_prefix; }
-
-      /**
-       * @brief Gets a %sub_match representing the match suffix.
-       *
-       * This function gets a reference to a %sub_match object representing the
-       * part of the target range between the end of the match and the end of
-       * the target range.
-       */
-      const_reference
-      suffix() const
-      { return _M_suffix; }
-
-      /**
-       * @brief Gets an iterator to the start of the %sub_match collection.
-       */
-      const_iterator
-      begin() const
-      { return _Base_type::begin(); }
-      
-#ifdef _GLIBCXX_INCLUDE_AS_CXX11
-      /**
-       * @brief Gets an iterator to the start of the %sub_match collection.
-       */
-      const_iterator
-      cbegin() const
-      { return _Base_type::begin(); }
-#endif
-
-      /**
-       * @brief Gets an iterator to one-past-the-end of the collection.
-       */
-      const_iterator
-      end() const
-      { return _Base_type::end(); }
-      
-#ifdef _GLIBCXX_INCLUDE_AS_CXX11
-      /**
-       * @brief Gets an iterator to one-past-the-end of the collection.
-       */
-      const_iterator
-      cend() const
-      { return _Base_type::end(); }
-#endif
-
-      //@}
-
-      /**
-       * @name 10.4 Formatting
-       *
-       * These functions perform formatted substitution of the matched
-       * character sequences into their target.  The format specifiers
-       * and escape sequences accepted by these functions are
-       * determined by their @p flags parameter as documented above.
-       */
-       //@{
-
-      /**
-       * @todo Implement this function.
-       */
-      template<typename _Out_iter>
-        _Out_iter
-        format(_Out_iter __out, const string_type& __fmt,
-	       regex_constants::match_flag_type __flags
-	       = regex_constants::format_default) const;
-
-      /**
-       * @todo Implement this function.
-       */
-      string_type
-      format(const string_type& __fmt,
-	     regex_constants::match_flag_type __flags
-	     = regex_constants::format_default) const;
-
-      //@} 
-
-      /**
-       * @name 10.5 Allocator
-       */
-      //@{ 
-
-      /**
-       * @brief Gets a copy of the allocator.
-       */
-      //allocator_type
-      //get_allocator() const;
-      using _Base_type::get_allocator;
-      
-      //@} 
-
-      /**
-       * @name 10.6 Swap
-       */
-       //@{ 
-
-      /**
-       * @brief Swaps the contents of two match_results.
-       */
-      void
-      swap(match_results& __that)
-      {
-	_Base_type::swap(__that);
-	std::swap(_M_matched, __that._M_matched);
-	std::swap(_M_prefix,  __that._M_prefix);
-	std::swap(_M_suffix,  __that._M_suffix);
-      }
-      //@} 
-      
-    private:
-      bool       _M_matched;
-      value_type _M_prefix;
-      value_type _M_suffix;
-    };
-  
-  typedef match_results<const char*>             cmatch;
-  typedef match_results<string::const_iterator>  smatch;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  typedef match_results<const wchar_t*>          wcmatch;
-  typedef match_results<wstring::const_iterator> wsmatch;
-#endif
-
-  // match_results comparisons
-  /**
-   * @brief Compares two match_results for equality.
-   * @returns true if the two objects refer to the same match,
-   * false otherwise.
-   * @todo Implement this function.
-   */
-  template<typename _Bi_iter, typename _Allocator>
-    inline bool
-    operator==(const match_results<_Bi_iter, _Allocator>& __m1,
-	       const match_results<_Bi_iter, _Allocator>& __m2);
-
-  /**
-   * @brief Compares two match_results for inequality.
-   * @returns true if the two objects do not refer to the same match,
-   * false otherwise.
-   */
-  template<typename _Bi_iter, class _Allocator>
-    inline bool
-    operator!=(const match_results<_Bi_iter, _Allocator>& __m1,
-	       const match_results<_Bi_iter, _Allocator>& __m2)
-    { return !(__m1 == __m2); }
-
-  // [7.10.6] match_results swap
-  /**
-   * @brief Swaps two match results.
-   * @param lhs A match result.
-   * @param rhs A match result.
-   *
-   * The contents of the two match_results objects are swapped.
-   */
-  template<typename _Bi_iter, typename _Allocator>
-    inline void
-    swap(match_results<_Bi_iter, _Allocator>& __lhs,
-	 match_results<_Bi_iter, _Allocator>& __rhs)
-    { __lhs.swap(__rhs); }
-
-  // [7.11.2] Function template regex_match
-  /**
-   * @name Matching, Searching, and Replacing
-   */
-  //@{
-
-  /**
-   * @brief Determines if there is a match between the regular expression @p e
-   * and all of the character sequence [first, last).
-   *
-   * @param first Beginning of the character sequence to match.
-   * @param last  One-past-the-end of the character sequence to match.
-   * @param m     The match results.
-   * @param re    The regular expression.
-   * @param flags Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   *
-   * @todo Implement this function.
-   */
-  template<typename _Bi_iter, typename _Allocator,
-	   typename _Ch_type, typename _Rx_traits>
-    bool
-    regex_match(_Bi_iter __first, _Bi_iter __last,
-		match_results<_Bi_iter, _Allocator>& __m,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __flags
-		= regex_constants::match_default);
-
-  /**
-   * @brief Indicates if there is a match between the regular expression @p e
-   * and all of the character sequence [first, last).
-   *
-   * @param first Beginning of the character sequence to match.
-   * @param last  One-past-the-end of the character sequence to match.
-   * @param re    The regular expression.
-   * @param flags Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Bi_iter, typename _Ch_type, typename _Rx_traits>
-    bool
-    regex_match(_Bi_iter __first, _Bi_iter __last,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __flags
-		= regex_constants::match_default)
-    { 
-      match_results<_Bi_iter> __what;
-      return regex_match(__first, __last, __what, __re, __flags);
-    }
-
-  /**
-   * @brief Determines if there is a match between the regular expression @p e
-   * and a C-style null-terminated string.
-   *
-   * @param s  The C-style null-terminated string to match.
-   * @param m  The match results.
-   * @param re The regular expression.
-   * @param f  Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_type, typename _Allocator, typename _Rx_traits>
-    inline bool
-    regex_match(const _Ch_type* __s,
-		match_results<const _Ch_type*, _Allocator>& __m,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __f
-		= regex_constants::match_default)
-    { return regex_match(__s, __s + _Rx_traits::length(__s), __m, __re, __f); }
-
-  /**
-   * @brief Determines if there is a match between the regular expression @p e
-   * and a string.
-   *
-   * @param s     The string to match.
-   * @param m     The match results.
-   * @param re    The regular expression.
-   * @param flags Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_traits, typename _Ch_alloc,
-	   typename _Allocator, typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_match(const basic_string<_Ch_type, _Ch_traits, _Ch_alloc>& __s,
-		match_results<typename basic_string<_Ch_type, 
-		_Ch_traits, _Ch_alloc>::const_iterator, _Allocator>& __m,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __flags
-		= regex_constants::match_default)
-    { return regex_match(__s.begin(), __s.end(), __m, __re, __flags); }
-
-  /**
-   * @brief Indicates if there is a match between the regular expression @p e
-   * and a C-style null-terminated string.
-   *
-   * @param s  The C-style null-terminated string to match.
-   * @param re The regular expression.
-   * @param f  Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_type, class _Rx_traits>
-    inline bool
-    regex_match(const _Ch_type* __s,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __f
-		= regex_constants::match_default)
-    { return regex_match(__s, __s + _Rx_traits::length(__s), __re, __f); }
-
-  /**
-   * @brief Indicates if there is a match between the regular expression @p e
-   * and a string.
-   *
-   * @param s     [IN] The string to match.
-   * @param re    [IN] The regular expression.
-   * @param flags [IN] Controls how the regular expression is matched.
-   *
-   * @retval true  A match exists.
-   * @retval false Otherwise.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_traits, typename _Str_allocator,
-	   typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_match(const basic_string<_Ch_type, _Ch_traits, _Str_allocator>& __s,
-		const basic_regex<_Ch_type, _Rx_traits>& __re,
-		regex_constants::match_flag_type __flags
-		= regex_constants::match_default)
-    { return regex_match(__s.begin(), __s.end(), __re, __flags); }
-
-  // [7.11.3] Function template regex_search
-  /**
-   * Searches for a regular expression within a range.
-   * @param first [IN]  The start of the string to search.
-   * @param last  [IN]  One-past-the-end of the string to search.
-   * @param m     [OUT] The match results.
-   * @param re    [IN]  The regular expression to search for.
-   * @param flags [IN]  Search policy flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string, the content of %m is
-   *               undefined.
-   *
-   * @throws an exception of type regex_error.
-   *
-   * @todo Implement this function.
-   */
-  template<typename _Bi_iter, typename _Allocator,
-	   typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_search(_Bi_iter __first, _Bi_iter __last,
-		 match_results<_Bi_iter, _Allocator>& __m,
-		 const basic_regex<_Ch_type, _Rx_traits>& __re,
-		 regex_constants::match_flag_type __flags
-		 = regex_constants::match_default);
-
-  /**
-   * Searches for a regular expression within a range.
-   * @param first [IN]  The start of the string to search.
-   * @param last  [IN]  One-past-the-end of the string to search.
-   * @param re    [IN]  The regular expression to search for.
-   * @param flags [IN]  Search policy flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string.
-   * @doctodo
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Bi_iter, typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_search(_Bi_iter __first, _Bi_iter __last,
-		 const basic_regex<_Ch_type, _Rx_traits>& __re,
-		 regex_constants::match_flag_type __flags
-		 = regex_constants::match_default)
-    {
-      match_results<_Bi_iter> __what;
-      return regex_search(__first, __last, __what, __re, __flags);
-    }
-
-  /**
-   * @brief Searches for a regular expression within a C-string.
-   * @param s [IN]  A C-string to search for the regex.
-   * @param m [OUT] The set of regex matches.
-   * @param e [IN]  The regex to search for in @p s.
-   * @param f [IN]  The search flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string, the content of %m is
-   *               undefined.
-   * @doctodo
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_type, class _Allocator, class _Rx_traits>
-    inline bool
-    regex_search(const _Ch_type* __s,
-		 match_results<const _Ch_type*, _Allocator>& __m,
-		 const basic_regex<_Ch_type, _Rx_traits>& __e,
-		 regex_constants::match_flag_type __f
-		 = regex_constants::match_default)
-    { return regex_search(__s, __s + _Rx_traits::length(__s), __m, __e, __f); }
-
-  /**
-   * @brief Searches for a regular expression within a C-string.
-   * @param s [IN]  The C-string to search.
-   * @param e [IN]  The regular expression to search for.
-   * @param f [IN]  Search policy flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string.
-   * @doctodo
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_search(const _Ch_type* __s,
-		 const basic_regex<_Ch_type, _Rx_traits>& __e,
-		 regex_constants::match_flag_type __f
-		 = regex_constants::match_default)
-    { return regex_search(__s, __s + _Rx_traits::length(__s), __e, __f); }
-
-  /**
-   * @brief Searches for a regular expression within a string.
-   * @param s     [IN]  The string to search.
-   * @param e     [IN]  The regular expression to search for.
-   * @param flags [IN]  Search policy flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string.
-   * @doctodo
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_traits, typename _String_allocator,
-	   typename _Ch_type, typename _Rx_traits>
-    inline bool
-    regex_search(const basic_string<_Ch_type, _Ch_traits,
-		 _String_allocator>& __s,
-		 const basic_regex<_Ch_type, _Rx_traits>& __e,
-		 regex_constants::match_flag_type __flags
-		 = regex_constants::match_default)
-    { return regex_search(__s.begin(), __s.end(), __e, __flags); }
-
-  /**
-   * @brief Searches for a regular expression within a string.
-   * @param s [IN]  A C++ string to search for the regex.
-   * @param m [OUT] The set of regex matches.
-   * @param e [IN]  The regex to search for in @p s.
-   * @param f [IN]  The search flags.
-   * @retval true  A match was found within the string.
-   * @retval false No match was found within the string, the content of %m is
-   *               undefined.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Ch_traits, typename _Ch_alloc,
-	   typename _Allocator, typename _Ch_type,
-	   typename _Rx_traits>
-    inline bool
-    regex_search(const basic_string<_Ch_type, _Ch_traits, _Ch_alloc>& __s,
-		 match_results<typename basic_string<_Ch_type,
-		 _Ch_traits, _Ch_alloc>::const_iterator, _Allocator>& __m,
-		 const basic_regex<_Ch_type, _Rx_traits>& __e,
-		 regex_constants::match_flag_type __f
-		 = regex_constants::match_default)
-    { return regex_search(__s.begin(), __s.end(), __m, __e, __f); }
-
-  // tr1 [7.11.4] std [28.11.4] Function template regex_replace
-  /**
-   * @doctodo
-   * @param out
-   * @param first
-   * @param last
-   * @param e
-   * @param fmt
-   * @param flags
-   *
-   * @returns out
-   * @throws an exception of type regex_error.
-   *
-   * @todo Implement this function.
-   */
-  template<typename _Out_iter, typename _Bi_iter,
-	   typename _Rx_traits, typename _Ch_type>
-    inline _Out_iter
-    regex_replace(_Out_iter __out, _Bi_iter __first, _Bi_iter __last,
-		  const basic_regex<_Ch_type, _Rx_traits>& __e,
-		  const basic_string<_Ch_type>& __fmt,
-		  regex_constants::match_flag_type __flags
-		  = regex_constants::match_default);
-
-  /**
-   * @doctodo
-   * @param s
-   * @param e
-   * @param fmt
-   * @param flags
-   *
-   * @returns a copy of string @p s with replacements.
-   *
-   * @throws an exception of type regex_error.
-   */
-  template<typename _Rx_traits, typename _Ch_type>
-    inline basic_string<_Ch_type>
-    regex_replace(const basic_string<_Ch_type>& __s,
-		  const basic_regex<_Ch_type, _Rx_traits>& __e,
-		  const basic_string<_Ch_type>& __fmt,
-		  regex_constants::match_flag_type __flags
-		  = regex_constants::match_default)
-    {
-      std::string __result;
-      regex_replace(std::back_inserter(__result),
-		    __s.begin(), __s.end(), __e, __fmt, __flags);
-      return __result;
-    }
-
-  //@}
-
-  // tr1 [7.12.1] std [28.12] Class template regex_iterator
-  /**
-   * An iterator adaptor that will provide repeated calls of regex_search over 
-   * a range until no more matches remain.
-   */
-  template<typename _Bi_iter,
-	   typename _Ch_type = typename iterator_traits<_Bi_iter>::value_type,
-	   typename _Rx_traits = regex_traits<_Ch_type> >
-    class regex_iterator
-    {
-    public:
-      typedef basic_regex<_Ch_type, _Rx_traits>  regex_type;
-      typedef match_results<_Bi_iter>            value_type;
-      typedef std::ptrdiff_t                     difference_type;
-      typedef const value_type*                  pointer;
-      typedef const value_type&                  reference;
-      typedef std::forward_iterator_tag          iterator_category;
-
-    public:
-      /**
-       * @brief Provides a singular iterator, useful for indicating
-       * one-past-the-end of a range.
-       * @todo Implement this function.
-       * @doctodo
-       */
-      regex_iterator();
-      
-      /**
-       * Constructs a %regex_iterator...
-       * @param a  [IN] The start of a text range to search.
-       * @param b  [IN] One-past-the-end of the text range to search.
-       * @param re [IN] The regular expression to match.
-       * @param m  [IN] Policy flags for match rules.
-       * @todo Implement this function.
-       * @doctodo
-       */
-      regex_iterator(_Bi_iter __a, _Bi_iter __b, const regex_type& __re,
-		     regex_constants::match_flag_type __m
-		     = regex_constants::match_default);
-
-      /**
-       * Copy constructs a %regex_iterator.
-       * @todo Implement this function.
-       * @doctodo
-       */
-      regex_iterator(const regex_iterator& __rhs);
-      
-      /**
-       * @todo Implement this function.
-       * @doctodo
-       */
-      regex_iterator&
-      operator=(const regex_iterator& __rhs);
-      
-      /**
-       * @todo Implement this function.
-       * @doctodo
-       */
-      bool
-      operator==(const regex_iterator& __rhs);
-      
-      /**
-       * @todo Implement this function.
-       * @doctodo
-       */
-      bool
-      operator!=(const regex_iterator& __rhs);
-      
-      /**
-       * @todo Implement this function.
-       * @doctodo
-       */
-      const value_type&
-      operator*();
-      
-      /**
-       * @todo Implement this function.
-       * @doctodo
-       */
-      const value_type*
-      operator->();
-      
-      /**
-       * @todo Implement this function.
-       * @doctodo
-       */
-      regex_iterator&
-      operator++();
-      
-      /**
-       * @todo Implement this function.
-       * @doctodo
-       */
-      regex_iterator
-      operator++(int);
-      
-    private:
-      // these members are shown for exposition only:
-      _Bi_iter                         begin;
-      _Bi_iter                         end;
-      const regex_type*                pregex;
-      regex_constants::match_flag_type flags;
-      match_results<_Bi_iter>          match;
-    };
-  
-  typedef regex_iterator<const char*>             cregex_iterator;
-  typedef regex_iterator<string::const_iterator>  sregex_iterator;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  typedef regex_iterator<const wchar_t*>          wcregex_iterator;
-  typedef regex_iterator<wstring::const_iterator> wsregex_iterator;
-#endif
-
-  // [7.12.2] Class template regex_token_iterator
-  /**
-   * Iterates over submatches in a range (or @a splits a text string).
-   *
-   * The purpose of this iterator is to enumerate all, or all specified,
-   * matches of a regular expression within a text range.  The dereferenced
-   * value of an iterator of this class is a std::tr1::sub_match object.
-   */
-  template<typename _Bi_iter,
-	   typename _Ch_type = typename iterator_traits<_Bi_iter>::value_type,
-	   typename _Rx_traits = regex_traits<_Ch_type> >
-    class regex_token_iterator
-    {
-    public:
-      typedef basic_regex<_Ch_type, _Rx_traits> regex_type;
-      typedef sub_match<_Bi_iter>               value_type;
-      typedef std::ptrdiff_t                    difference_type;
-      typedef const value_type*                 pointer;
-      typedef const value_type&                 reference;
-      typedef std::forward_iterator_tag         iterator_category;
-      
-    public:
-      /**
-       * @brief Default constructs a %regex_token_iterator.
-       * @todo Implement this function.
-       * 
-       * A default-constructed %regex_token_iterator is a singular iterator
-       * that will compare equal to the one-past-the-end value for any
-       * iterator of the same type.
-       */
-      regex_token_iterator();
-      
-      /**
-       * Constructs a %regex_token_iterator...
-       * @param a          [IN] The start of the text to search.
-       * @param b          [IN] One-past-the-end of the text to search.
-       * @param re         [IN] The regular expression to search for.
-       * @param submatch   [IN] Which submatch to return.  There are some
-       *                        special values for this parameter:
-       *                        - -1 each enumerated subexpression does NOT
-       *                          match the regular expression (aka field
-       *                          splitting)
-       *                        - 0 the entire string matching the
-       *                          subexpression is returned for each match
-       *                          within the text.
-       *                        - >0 enumerates only the indicated
-       *                          subexpression from a match within the text.
-       * @param m          [IN] Policy flags for match rules.
-       *
-       * @todo Implement this function.
-       * @doctodo
-       */
-      regex_token_iterator(_Bi_iter __a, _Bi_iter __b, const regex_type& __re,
-			   int __submatch = 0,
-			   regex_constants::match_flag_type __m
-			   = regex_constants::match_default);
-
-      /**
-       * Constructs a %regex_token_iterator...
-       * @param a          [IN] The start of the text to search.
-       * @param b          [IN] One-past-the-end of the text to search.
-       * @param re         [IN] The regular expression to search for.
-       * @param submatches [IN] A list of subexpressions to return for each
-       *                        regular expression match within the text.
-       * @param m          [IN] Policy flags for match rules.
-       *
-       * @todo Implement this function.
-       * @doctodo
-       */
-      regex_token_iterator(_Bi_iter __a, _Bi_iter __b,
-			   const regex_type& __re,
-			   const std::vector<int>& __submatches,
-			   regex_constants::match_flag_type __m
-			     = regex_constants::match_default);
-
-      /**
-       * Constructs a %regex_token_iterator...
-       * @param a          [IN] The start of the text to search.
-       * @param b          [IN] One-past-the-end of the text to search.
-       * @param re         [IN] The regular expression to search for.
-       * @param submatches [IN] A list of subexpressions to return for each
-       *                        regular expression match within the text.
-       * @param m          [IN] Policy flags for match rules.
-       
-       * @todo Implement this function.
-       * @doctodo
-       */
-      template<std::size_t _Nm>
-        regex_token_iterator(_Bi_iter __a, _Bi_iter __b,
-			     const regex_type& __re,
-			     const int (&__submatches)[_Nm],
-			     regex_constants::match_flag_type __m
-			     = regex_constants::match_default);
-
-      /**
-       * @brief Copy constructs a %regex_token_iterator.
-       * @param rhs [IN] A %regex_token_iterator to copy.
-       * @todo Implement this function.
-       */
-      regex_token_iterator(const regex_token_iterator& __rhs);
-      
-      /**
-       * @brief Assigns a %regex_token_iterator to another.
-       * @param rhs [IN] A %regex_token_iterator to copy.
-       * @todo Implement this function.
-       */
-      regex_token_iterator&
-      operator=(const regex_token_iterator& __rhs);
-      
-      /**
-       * @brief Compares a %regex_token_iterator to another for equality.
-       * @todo Implement this function.
-       */
-      bool
-      operator==(const regex_token_iterator& __rhs);
-      
-      /**
-       * @brief Compares a %regex_token_iterator to another for inequality.
-       * @todo Implement this function.
-       */
-      bool
-      operator!=(const regex_token_iterator& __rhs);
-      
-      /**
-       * @brief Dereferences a %regex_token_iterator.
-       * @todo Implement this function.
-       */
-      const value_type&
-      operator*();
-      
-      /**
-       * @brief Selects a %regex_token_iterator member.
-       * @todo Implement this function.
-       */
-      const value_type*
-      operator->();
-      
-      /**
-       * @brief Increments a %regex_token_iterator.
-       * @todo Implement this function.
-       */
-      regex_token_iterator&
-      operator++();
-      
-      /**
-       * @brief Postincrements a %regex_token_iterator.
-       * @todo Implement this function.
-       */
-      regex_token_iterator
-      operator++(int);
-      
-    private: // data members for exposition only:
-      typedef regex_iterator<_Bi_iter, _Ch_type, _Rx_traits> position_iterator;
-
-      position_iterator __position;
-      const value_type* __result;
-      value_type        __suffix;
-      std::size_t       __n;
-      std::vector<int>  __subs;
-    };
-
-  /** @brief Token iterator for C-style NULL-terminated strings. */
-  typedef regex_token_iterator<const char*>             cregex_token_iterator;
-  /** @brief Token iterator for standard strings. */
-  typedef regex_token_iterator<string::const_iterator>  sregex_token_iterator;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /** @brief Token iterator for C-style NULL-terminated wide strings. */
-  typedef regex_token_iterator<const wchar_t*>          wcregex_token_iterator;
-  /** @brief Token iterator for standard wide-character strings. */
-  typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
-#endif
-  
-  //@}
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _GLIBCXX_TR1_REGEX
diff --git a/openflow/usr/include/c++/5/tr1/riemann_zeta.tcc b/openflow/usr/include/c++/5/tr1/riemann_zeta.tcc
deleted file mode 100644
index 19def70..0000000
--- a/openflow/usr/include/c++/5/tr1/riemann_zeta.tcc
+++ /dev/null
@@ -1,433 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/riemann_zeta.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland based on:
-//   (1) Handbook of Mathematical Functions,
-//       Ed. by Milton Abramowitz and Irene A. Stegun,
-//       Dover Publications, New-York, Section 5, pp. 807-808.
-//   (2) The Gnu Scientific Library, http://www.gnu.org/software/gsl
-//   (3) Gamma, Exploring Euler's Constant, Julian Havil,
-//       Princeton, 2003.
-
-#ifndef _GLIBCXX_TR1_RIEMANN_ZETA_TCC
-#define _GLIBCXX_TR1_RIEMANN_ZETA_TCC 1
-
-#include "special_function_util.h"
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  // [5.2] Special functions
-
-  // Implementation-space details.
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /**
-     *   @brief  Compute the Riemann zeta function @f$ \zeta(s) @f$
-     *           by summation for s > 1.
-     * 
-     *   The Riemann zeta function is defined by:
-     *    \f[
-     *      \zeta(s) = \sum_{k=1}^{\infty} \frac{1}{k^{s}} for s > 1
-     *    \f]
-     *   For s < 1 use the reflection formula:
-     *    \f[
-     *      \zeta(s) = 2^s \pi^{s-1} \Gamma(1-s) \zeta(1-s)
-     *    \f]
-     */
-    template<typename _Tp>
-    _Tp
-    __riemann_zeta_sum(_Tp __s)
-    {
-      //  A user shouldn't get to this.
-      if (__s < _Tp(1))
-        std::__throw_domain_error(__N("Bad argument in zeta sum."));
-
-      const unsigned int max_iter = 10000;
-      _Tp __zeta = _Tp(0);
-      for (unsigned int __k = 1; __k < max_iter; ++__k)
-        {
-          _Tp __term = std::pow(static_cast<_Tp>(__k), -__s);
-          if (__term < std::numeric_limits<_Tp>::epsilon())
-            {
-              break;
-            }
-          __zeta += __term;
-        }
-
-      return __zeta;
-    }
-
-
-    /**
-     *   @brief  Evaluate the Riemann zeta function @f$ \zeta(s) @f$
-     *           by an alternate series for s > 0.
-     * 
-     *   The Riemann zeta function is defined by:
-     *    \f[
-     *      \zeta(s) = \sum_{k=1}^{\infty} \frac{1}{k^{s}} for s > 1
-     *    \f]
-     *   For s < 1 use the reflection formula:
-     *    \f[
-     *      \zeta(s) = 2^s \pi^{s-1} \Gamma(1-s) \zeta(1-s)
-     *    \f]
-     */
-    template<typename _Tp>
-    _Tp
-    __riemann_zeta_alt(_Tp __s)
-    {
-      _Tp __sgn = _Tp(1);
-      _Tp __zeta = _Tp(0);
-      for (unsigned int __i = 1; __i < 10000000; ++__i)
-        {
-          _Tp __term = __sgn / std::pow(__i, __s);
-          if (std::abs(__term) < std::numeric_limits<_Tp>::epsilon())
-            break;
-          __zeta += __term;
-          __sgn *= _Tp(-1);
-        }
-      __zeta /= _Tp(1) - std::pow(_Tp(2), _Tp(1) - __s);
-
-      return __zeta;
-    }
-
-
-    /**
-     *   @brief  Evaluate the Riemann zeta function by series for all s != 1.
-     *           Convergence is great until largish negative numbers.
-     *           Then the convergence of the > 0 sum gets better.
-     *
-     *   The series is:
-     *    \f[
-     *      \zeta(s) = \frac{1}{1-2^{1-s}}
-     *                 \sum_{n=0}^{\infty} \frac{1}{2^{n+1}}
-     *                 \sum_{k=0}^{n} (-1)^k \frac{n!}{(n-k)!k!} (k+1)^{-s}
-     *    \f]
-     *   Havil 2003, p. 206.
-     *
-     *   The Riemann zeta function is defined by:
-     *    \f[
-     *      \zeta(s) = \sum_{k=1}^{\infty} \frac{1}{k^{s}} for s > 1
-     *    \f]
-     *   For s < 1 use the reflection formula:
-     *    \f[
-     *      \zeta(s) = 2^s \pi^{s-1} \Gamma(1-s) \zeta(1-s)
-     *    \f]
-     */
-    template<typename _Tp>
-    _Tp
-    __riemann_zeta_glob(_Tp __s)
-    {
-      _Tp __zeta = _Tp(0);
-
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      //  Max e exponent before overflow.
-      const _Tp __max_bincoeff = std::numeric_limits<_Tp>::max_exponent10
-                               * std::log(_Tp(10)) - _Tp(1);
-
-      //  This series works until the binomial coefficient blows up
-      //  so use reflection.
-      if (__s < _Tp(0))
-        {
-#if _GLIBCXX_USE_C99_MATH_TR1
-          if (std::tr1::fmod(__s,_Tp(2)) == _Tp(0))
-            return _Tp(0);
-          else
-#endif
-            {
-              _Tp __zeta = __riemann_zeta_glob(_Tp(1) - __s);
-              __zeta *= std::pow(_Tp(2)
-                     * __numeric_constants<_Tp>::__pi(), __s)
-                     * std::sin(__numeric_constants<_Tp>::__pi_2() * __s)
-#if _GLIBCXX_USE_C99_MATH_TR1
-                     * std::exp(std::tr1::lgamma(_Tp(1) - __s))
-#else
-                     * std::exp(__log_gamma(_Tp(1) - __s))
-#endif
-                     / __numeric_constants<_Tp>::__pi();
-              return __zeta;
-            }
-        }
-
-      _Tp __num = _Tp(0.5L);
-      const unsigned int __maxit = 10000;
-      for (unsigned int __i = 0; __i < __maxit; ++__i)
-        {
-          bool __punt = false;
-          _Tp __sgn = _Tp(1);
-          _Tp __term = _Tp(0);
-          for (unsigned int __j = 0; __j <= __i; ++__j)
-            {
-#if _GLIBCXX_USE_C99_MATH_TR1
-              _Tp __bincoeff =  std::tr1::lgamma(_Tp(1 + __i))
-                              - std::tr1::lgamma(_Tp(1 + __j))
-                              - std::tr1::lgamma(_Tp(1 + __i - __j));
-#else
-              _Tp __bincoeff =  __log_gamma(_Tp(1 + __i))
-                              - __log_gamma(_Tp(1 + __j))
-                              - __log_gamma(_Tp(1 + __i - __j));
-#endif
-              if (__bincoeff > __max_bincoeff)
-                {
-                  //  This only gets hit for x << 0.
-                  __punt = true;
-                  break;
-                }
-              __bincoeff = std::exp(__bincoeff);
-              __term += __sgn * __bincoeff * std::pow(_Tp(1 + __j), -__s);
-              __sgn *= _Tp(-1);
-            }
-          if (__punt)
-            break;
-          __term *= __num;
-          __zeta += __term;
-          if (std::abs(__term/__zeta) < __eps)
-            break;
-          __num *= _Tp(0.5L);
-        }
-
-      __zeta /= _Tp(1) - std::pow(_Tp(2), _Tp(1) - __s);
-
-      return __zeta;
-    }
-
-
-    /**
-     *   @brief  Compute the Riemann zeta function @f$ \zeta(s) @f$
-     *           using the product over prime factors.
-     *    \f[
-     *      \zeta(s) = \Pi_{i=1}^\infty \frac{1}{1 - p_i^{-s}}
-     *    \f]
-     *    where @f$ {p_i} @f$ are the prime numbers.
-     * 
-     *   The Riemann zeta function is defined by:
-     *    \f[
-     *      \zeta(s) = \sum_{k=1}^{\infty} \frac{1}{k^{s}} for s > 1
-     *    \f]
-     *   For s < 1 use the reflection formula:
-     *    \f[
-     *      \zeta(s) = 2^s \pi^{s-1} \Gamma(1-s) \zeta(1-s)
-     *    \f]
-     */
-    template<typename _Tp>
-    _Tp
-    __riemann_zeta_product(_Tp __s)
-    {
-      static const _Tp __prime[] = {
-        _Tp(2), _Tp(3), _Tp(5), _Tp(7), _Tp(11), _Tp(13), _Tp(17), _Tp(19),
-        _Tp(23), _Tp(29), _Tp(31), _Tp(37), _Tp(41), _Tp(43), _Tp(47),
-        _Tp(53), _Tp(59), _Tp(61), _Tp(67), _Tp(71), _Tp(73), _Tp(79),
-        _Tp(83), _Tp(89), _Tp(97), _Tp(101), _Tp(103), _Tp(107), _Tp(109)
-      };
-      static const unsigned int __num_primes = sizeof(__prime) / sizeof(_Tp);
-
-      _Tp __zeta = _Tp(1);
-      for (unsigned int __i = 0; __i < __num_primes; ++__i)
-        {
-          const _Tp __fact = _Tp(1) - std::pow(__prime[__i], -__s);
-          __zeta *= __fact;
-          if (_Tp(1) - __fact < std::numeric_limits<_Tp>::epsilon())
-            break;
-        }
-
-      __zeta = _Tp(1) / __zeta;
-
-      return __zeta;
-    }
-
-
-    /**
-     *   @brief  Return the Riemann zeta function @f$ \zeta(s) @f$.
-     * 
-     *   The Riemann zeta function is defined by:
-     *    \f[
-     *      \zeta(s) = \sum_{k=1}^{\infty} k^{-s} for s > 1
-     *                 \frac{(2\pi)^s}{pi} sin(\frac{\pi s}{2})
-     *                 \Gamma (1 - s) \zeta (1 - s) for s < 1
-     *    \f]
-     *   For s < 1 use the reflection formula:
-     *    \f[
-     *      \zeta(s) = 2^s \pi^{s-1} \Gamma(1-s) \zeta(1-s)
-     *    \f]
-     */
-    template<typename _Tp>
-    _Tp
-    __riemann_zeta(_Tp __s)
-    {
-      if (__isnan(__s))
-        return std::numeric_limits<_Tp>::quiet_NaN();
-      else if (__s == _Tp(1))
-        return std::numeric_limits<_Tp>::infinity();
-      else if (__s < -_Tp(19))
-        {
-          _Tp __zeta = __riemann_zeta_product(_Tp(1) - __s);
-          __zeta *= std::pow(_Tp(2) * __numeric_constants<_Tp>::__pi(), __s)
-                 * std::sin(__numeric_constants<_Tp>::__pi_2() * __s)
-#if _GLIBCXX_USE_C99_MATH_TR1
-                 * std::exp(std::tr1::lgamma(_Tp(1) - __s))
-#else
-                 * std::exp(__log_gamma(_Tp(1) - __s))
-#endif
-                 / __numeric_constants<_Tp>::__pi();
-          return __zeta;
-        }
-      else if (__s < _Tp(20))
-        {
-          //  Global double sum or McLaurin?
-          bool __glob = true;
-          if (__glob)
-            return __riemann_zeta_glob(__s);
-          else
-            {
-              if (__s > _Tp(1))
-                return __riemann_zeta_sum(__s);
-              else
-                {
-                  _Tp __zeta = std::pow(_Tp(2)
-                                * __numeric_constants<_Tp>::__pi(), __s)
-                         * std::sin(__numeric_constants<_Tp>::__pi_2() * __s)
-#if _GLIBCXX_USE_C99_MATH_TR1
-                             * std::tr1::tgamma(_Tp(1) - __s)
-#else
-                             * std::exp(__log_gamma(_Tp(1) - __s))
-#endif
-                             * __riemann_zeta_sum(_Tp(1) - __s);
-                  return __zeta;
-                }
-            }
-        }
-      else
-        return __riemann_zeta_product(__s);
-    }
-
-
-    /**
-     *   @brief  Return the Hurwitz zeta function @f$ \zeta(x,s) @f$
-     *           for all s != 1 and x > -1.
-     * 
-     *   The Hurwitz zeta function is defined by:
-     *   @f[
-     *     \zeta(x,s) = \sum_{n=0}^{\infty} \frac{1}{(n + x)^s}
-     *   @f]
-     *   The Riemann zeta function is a special case:
-     *   @f[
-     *     \zeta(s) = \zeta(1,s)
-     *   @f]
-     * 
-     *   This functions uses the double sum that converges for s != 1
-     *   and x > -1:
-     *   @f[
-     *     \zeta(x,s) = \frac{1}{s-1}
-     *                \sum_{n=0}^{\infty} \frac{1}{n + 1}
-     *                \sum_{k=0}^{n} (-1)^k \frac{n!}{(n-k)!k!} (x+k)^{-s}
-     *   @f]
-     */
-    template<typename _Tp>
-    _Tp
-    __hurwitz_zeta_glob(_Tp __a, _Tp __s)
-    {
-      _Tp __zeta = _Tp(0);
-
-      const _Tp __eps = std::numeric_limits<_Tp>::epsilon();
-      //  Max e exponent before overflow.
-      const _Tp __max_bincoeff = std::numeric_limits<_Tp>::max_exponent10
-                               * std::log(_Tp(10)) - _Tp(1);
-
-      const unsigned int __maxit = 10000;
-      for (unsigned int __i = 0; __i < __maxit; ++__i)
-        {
-          bool __punt = false;
-          _Tp __sgn = _Tp(1);
-          _Tp __term = _Tp(0);
-          for (unsigned int __j = 0; __j <= __i; ++__j)
-            {
-#if _GLIBCXX_USE_C99_MATH_TR1
-              _Tp __bincoeff =  std::tr1::lgamma(_Tp(1 + __i))
-                              - std::tr1::lgamma(_Tp(1 + __j))
-                              - std::tr1::lgamma(_Tp(1 + __i - __j));
-#else
-              _Tp __bincoeff =  __log_gamma(_Tp(1 + __i))
-                              - __log_gamma(_Tp(1 + __j))
-                              - __log_gamma(_Tp(1 + __i - __j));
-#endif
-              if (__bincoeff > __max_bincoeff)
-                {
-                  //  This only gets hit for x << 0.
-                  __punt = true;
-                  break;
-                }
-              __bincoeff = std::exp(__bincoeff);
-              __term += __sgn * __bincoeff * std::pow(_Tp(__a + __j), -__s);
-              __sgn *= _Tp(-1);
-            }
-          if (__punt)
-            break;
-          __term /= _Tp(__i + 1);
-          if (std::abs(__term / __zeta) < __eps)
-            break;
-          __zeta += __term;
-        }
-
-      __zeta /= __s - _Tp(1);
-
-      return __zeta;
-    }
-
-
-    /**
-     *   @brief  Return the Hurwitz zeta function @f$ \zeta(x,s) @f$
-     *           for all s != 1 and x > -1.
-     * 
-     *   The Hurwitz zeta function is defined by:
-     *   @f[
-     *     \zeta(x,s) = \sum_{n=0}^{\infty} \frac{1}{(n + x)^s}
-     *   @f]
-     *   The Riemann zeta function is a special case:
-     *   @f[
-     *     \zeta(s) = \zeta(1,s)
-     *   @f]
-     */
-    template<typename _Tp>
-    inline _Tp
-    __hurwitz_zeta(_Tp __a, _Tp __s)
-    { return __hurwitz_zeta_glob(__a, __s); }
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace std::tr1::__detail
-}
-}
-
-#endif // _GLIBCXX_TR1_RIEMANN_ZETA_TCC
diff --git a/openflow/usr/include/c++/5/tr1/shared_ptr.h b/openflow/usr/include/c++/5/tr1/shared_ptr.h
deleted file mode 100644
index ebb9d36..0000000
--- a/openflow/usr/include/c++/5/tr1/shared_ptr.h
+++ /dev/null
@@ -1,1172 +0,0 @@
-// <tr1/shared_ptr.h> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-//  shared_count.hpp
-//  Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
-
-//  shared_ptr.hpp
-//  Copyright (C) 1998, 1999 Greg Colvin and Beman Dawes.
-//  Copyright (C) 2001, 2002, 2003 Peter Dimov
-
-//  weak_ptr.hpp
-//  Copyright (C) 2001, 2002, 2003 Peter Dimov
-
-//  enable_shared_from_this.hpp
-//  Copyright (C) 2002 Peter Dimov
-
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// GCC Note:  based on version 1.32.0 of the Boost library.
-
-/** @file tr1/shared_ptr.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/memory}
- */
-
-#ifndef _TR1_SHARED_PTR_H
-#define _TR1_SHARED_PTR_H 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
- /**
-   *  @brief  Exception possibly thrown by @c shared_ptr.
-   *  @ingroup exceptions
-   */
-  class bad_weak_ptr : public std::exception
-  {
-  public:
-    virtual char const*
-    what() const throw()
-    { return "tr1::bad_weak_ptr"; }
-  };
-
-  // Substitute for bad_weak_ptr object in the case of -fno-exceptions.
-  inline void
-  __throw_bad_weak_ptr()
-  { _GLIBCXX_THROW_OR_ABORT(bad_weak_ptr()); }
-
-  using __gnu_cxx::_Lock_policy;
-  using __gnu_cxx::__default_lock_policy;
-  using __gnu_cxx::_S_single;
-  using __gnu_cxx::_S_mutex;
-  using __gnu_cxx::_S_atomic;
-
-  // Empty helper class except when the template argument is _S_mutex.
-  template<_Lock_policy _Lp>
-    class _Mutex_base
-    {
-    protected:
-      // The atomic policy uses fully-fenced builtins, single doesn't care.
-      enum { _S_need_barriers = 0 };
-    };
-
-  template<>
-    class _Mutex_base<_S_mutex>
-    : public __gnu_cxx::__mutex
-    {
-    protected:
-      // This policy is used when atomic builtins are not available.
-      // The replacement atomic operations might not have the necessary
-      // memory barriers.
-      enum { _S_need_barriers = 1 };
-    };
-
-  template<_Lock_policy _Lp = __default_lock_policy>
-    class _Sp_counted_base
-    : public _Mutex_base<_Lp>
-    {
-    public:  
-      _Sp_counted_base()
-      : _M_use_count(1), _M_weak_count(1) { }
-      
-      virtual
-      ~_Sp_counted_base() // nothrow 
-      { }
-  
-      // Called when _M_use_count drops to zero, to release the resources
-      // managed by *this.
-      virtual void
-      _M_dispose() = 0; // nothrow
-      
-      // Called when _M_weak_count drops to zero.
-      virtual void
-      _M_destroy() // nothrow
-      { delete this; }
-      
-      virtual void*
-      _M_get_deleter(const std::type_info&) = 0;
-
-      void
-      _M_add_ref_copy()
-      { __gnu_cxx::__atomic_add_dispatch(&_M_use_count, 1); }
-  
-      void
-      _M_add_ref_lock();
-      
-      void
-      _M_release() // nothrow
-      {
-        // Be race-detector-friendly.  For more info see bits/c++config.
-        _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_use_count);
-	if (__gnu_cxx::__exchange_and_add_dispatch(&_M_use_count, -1) == 1)
-	  {
-            _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&_M_use_count);
-	    _M_dispose();
-	    // There must be a memory barrier between dispose() and destroy()
-	    // to ensure that the effects of dispose() are observed in the
-	    // thread that runs destroy().
-	    // See http://gcc.gnu.org/ml/libstdc++/2005-11/msg00136.html
-	    if (_Mutex_base<_Lp>::_S_need_barriers)
-	      {
-	        _GLIBCXX_READ_MEM_BARRIER;
-	        _GLIBCXX_WRITE_MEM_BARRIER;
-	      }
-
-            // Be race-detector-friendly.  For more info see bits/c++config.
-            _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_weak_count);
-	    if (__gnu_cxx::__exchange_and_add_dispatch(&_M_weak_count,
-						       -1) == 1)
-              {
-                _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&_M_weak_count);
-	        _M_destroy();
-              }
-	  }
-      }
-  
-      void
-      _M_weak_add_ref() // nothrow
-      { __gnu_cxx::__atomic_add_dispatch(&_M_weak_count, 1); }
-
-      void
-      _M_weak_release() // nothrow
-      {
-        // Be race-detector-friendly. For more info see bits/c++config.
-        _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_weak_count);
-	if (__gnu_cxx::__exchange_and_add_dispatch(&_M_weak_count, -1) == 1)
-	  {
-            _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(&_M_weak_count);
-	    if (_Mutex_base<_Lp>::_S_need_barriers)
-	      {
-	        // See _M_release(),
-	        // destroy() must observe results of dispose()
-	        _GLIBCXX_READ_MEM_BARRIER;
-	        _GLIBCXX_WRITE_MEM_BARRIER;
-	      }
-	    _M_destroy();
-	  }
-      }
-  
-      long
-      _M_get_use_count() const // nothrow
-      {
-        // No memory barrier is used here so there is no synchronization
-        // with other threads.
-        return const_cast<const volatile _Atomic_word&>(_M_use_count);
-      }
-
-    private:  
-      _Sp_counted_base(_Sp_counted_base const&);
-      _Sp_counted_base& operator=(_Sp_counted_base const&);
-
-      _Atomic_word  _M_use_count;     // #shared
-      _Atomic_word  _M_weak_count;    // #weak + (#shared != 0)
-    };
-
-  template<>
-    inline void
-    _Sp_counted_base<_S_single>::
-    _M_add_ref_lock()
-    {
-      if (__gnu_cxx::__exchange_and_add_dispatch(&_M_use_count, 1) == 0)
-	{
-	  _M_use_count = 0;
-	  __throw_bad_weak_ptr();
-	}
-    }
-
-  template<>
-    inline void
-    _Sp_counted_base<_S_mutex>::
-    _M_add_ref_lock()
-    {
-      __gnu_cxx::__scoped_lock sentry(*this);
-      if (__gnu_cxx::__exchange_and_add_dispatch(&_M_use_count, 1) == 0)
-	{
-	  _M_use_count = 0;
-	  __throw_bad_weak_ptr();
-	}
-    }
-
-  template<> 
-    inline void
-    _Sp_counted_base<_S_atomic>::
-    _M_add_ref_lock()
-    {
-      // Perform lock-free add-if-not-zero operation.
-      _Atomic_word __count = _M_use_count;
-      do
-	{
-	  if (__count == 0)
-	    __throw_bad_weak_ptr();
-	  // Replace the current counter value with the old value + 1, as
-	  // long as it's not changed meanwhile. 
-	}
-      while (!__atomic_compare_exchange_n(&_M_use_count, &__count, __count + 1,
-					  true, __ATOMIC_ACQ_REL, 
-					  __ATOMIC_RELAXED));
-     }
-
-  template<typename _Ptr, typename _Deleter, _Lock_policy _Lp>
-    class _Sp_counted_base_impl
-    : public _Sp_counted_base<_Lp>
-    {
-    public:
-      // Precondition: __d(__p) must not throw.
-      _Sp_counted_base_impl(_Ptr __p, _Deleter __d)
-      : _M_ptr(__p), _M_del(__d) { }
-    
-      virtual void
-      _M_dispose() // nothrow
-      { _M_del(_M_ptr); }
-      
-      virtual void*
-      _M_get_deleter(const std::type_info& __ti)
-      {
-#if __cpp_rtti
-        return __ti == typeid(_Deleter) ? &_M_del : 0;
-#else
-        return 0;
-#endif
-      }
-      
-    private:
-      _Sp_counted_base_impl(const _Sp_counted_base_impl&);
-      _Sp_counted_base_impl& operator=(const _Sp_counted_base_impl&);
-      
-      _Ptr      _M_ptr;  // copy constructor must not throw
-      _Deleter  _M_del;  // copy constructor must not throw
-    };
-
-  template<_Lock_policy _Lp = __default_lock_policy>
-    class __weak_count;
-
-  template<typename _Tp>
-    struct _Sp_deleter
-    {
-      typedef void result_type;
-      typedef _Tp* argument_type;
-      void operator()(_Tp* __p) const { delete __p; }
-    };
-
-  template<_Lock_policy _Lp = __default_lock_policy>
-    class __shared_count
-    {
-    public: 
-      __shared_count()
-      : _M_pi(0) // nothrow
-      { }
-  
-      template<typename _Ptr>
-        __shared_count(_Ptr __p) : _M_pi(0)
-        {
-	  __try
-	    {
-	      typedef typename std::tr1::remove_pointer<_Ptr>::type _Tp;
-	      _M_pi = new _Sp_counted_base_impl<_Ptr, _Sp_deleter<_Tp>, _Lp>(
-	          __p, _Sp_deleter<_Tp>());
-	    }
-	  __catch(...)
-	    {
-	      delete __p;
-	      __throw_exception_again;
-	    }
-	}
-
-      template<typename _Ptr, typename _Deleter>
-        __shared_count(_Ptr __p, _Deleter __d) : _M_pi(0)
-        {
-	  __try
-	    {
-	      _M_pi = new _Sp_counted_base_impl<_Ptr, _Deleter, _Lp>(__p, __d);
-	    }
-	  __catch(...)
-	    {
-	      __d(__p); // Call _Deleter on __p.
-	      __throw_exception_again;
-	    }
-	}
-
-      // Special case for auto_ptr<_Tp> to provide the strong guarantee.
-      template<typename _Tp>
-        explicit
-        __shared_count(std::auto_ptr<_Tp>& __r)
-	: _M_pi(new _Sp_counted_base_impl<_Tp*,
-		_Sp_deleter<_Tp>, _Lp >(__r.get(), _Sp_deleter<_Tp>()))
-        { __r.release(); }
-
-      // Throw bad_weak_ptr when __r._M_get_use_count() == 0.
-      explicit
-      __shared_count(const __weak_count<_Lp>& __r);
-  
-      ~__shared_count() // nothrow
-      {
-	if (_M_pi != 0)
-	  _M_pi->_M_release();
-      }
-      
-      __shared_count(const __shared_count& __r)
-      : _M_pi(__r._M_pi) // nothrow
-      {
-	if (_M_pi != 0)
-	  _M_pi->_M_add_ref_copy();
-      }
-  
-      __shared_count&
-      operator=(const __shared_count& __r) // nothrow
-      {
-	_Sp_counted_base<_Lp>* __tmp = __r._M_pi;
-	if (__tmp != _M_pi)
-	  {
-	    if (__tmp != 0)
-	      __tmp->_M_add_ref_copy();
-	    if (_M_pi != 0)
-	      _M_pi->_M_release();
-	    _M_pi = __tmp;
-	  }
-	return *this;
-      }
-  
-      void
-      _M_swap(__shared_count& __r) // nothrow
-      {
-	_Sp_counted_base<_Lp>* __tmp = __r._M_pi;
-	__r._M_pi = _M_pi;
-	_M_pi = __tmp;
-      }
-  
-      long
-      _M_get_use_count() const // nothrow
-      { return _M_pi != 0 ? _M_pi->_M_get_use_count() : 0; }
-
-      bool
-      _M_unique() const // nothrow
-      { return this->_M_get_use_count() == 1; }
-      
-      friend inline bool
-      operator==(const __shared_count& __a, const __shared_count& __b)
-      { return __a._M_pi == __b._M_pi; }
-  
-      friend inline bool
-      operator<(const __shared_count& __a, const __shared_count& __b)
-      { return std::less<_Sp_counted_base<_Lp>*>()(__a._M_pi, __b._M_pi); }
-  
-      void*
-      _M_get_deleter(const std::type_info& __ti) const
-      { return _M_pi ? _M_pi->_M_get_deleter(__ti) : 0; }
-
-    private:
-      friend class __weak_count<_Lp>;
-
-      _Sp_counted_base<_Lp>*  _M_pi;
-    };
-
-
-  template<_Lock_policy _Lp>
-    class __weak_count
-    {
-    public:
-      __weak_count()
-      : _M_pi(0) // nothrow
-      { }
-  
-      __weak_count(const __shared_count<_Lp>& __r)
-      : _M_pi(__r._M_pi) // nothrow
-      {
-	if (_M_pi != 0)
-	  _M_pi->_M_weak_add_ref();
-      }
-      
-      __weak_count(const __weak_count<_Lp>& __r)
-      : _M_pi(__r._M_pi) // nothrow
-      {
-	if (_M_pi != 0)
-	  _M_pi->_M_weak_add_ref();
-      }
-      
-      ~__weak_count() // nothrow
-      {
-	if (_M_pi != 0)
-	  _M_pi->_M_weak_release();
-      }
-      
-      __weak_count<_Lp>&
-      operator=(const __shared_count<_Lp>& __r) // nothrow
-      {
-	_Sp_counted_base<_Lp>* __tmp = __r._M_pi;
-	if (__tmp != 0)
-	  __tmp->_M_weak_add_ref();
-	if (_M_pi != 0)
-	  _M_pi->_M_weak_release();
-	_M_pi = __tmp;  
-	return *this;
-      }
-      
-      __weak_count<_Lp>&
-      operator=(const __weak_count<_Lp>& __r) // nothrow
-      {
-	_Sp_counted_base<_Lp>* __tmp = __r._M_pi;
-	if (__tmp != 0)
-	  __tmp->_M_weak_add_ref();
-	if (_M_pi != 0)
-	  _M_pi->_M_weak_release();
-	_M_pi = __tmp;
-	return *this;
-      }
-
-      void
-      _M_swap(__weak_count<_Lp>& __r) // nothrow
-      {
-	_Sp_counted_base<_Lp>* __tmp = __r._M_pi;
-	__r._M_pi = _M_pi;
-	_M_pi = __tmp;
-      }
-  
-      long
-      _M_get_use_count() const // nothrow
-      { return _M_pi != 0 ? _M_pi->_M_get_use_count() : 0; }
-
-      friend inline bool
-      operator==(const __weak_count<_Lp>& __a, const __weak_count<_Lp>& __b)
-      { return __a._M_pi == __b._M_pi; }
-      
-      friend inline bool
-      operator<(const __weak_count<_Lp>& __a, const __weak_count<_Lp>& __b)
-      { return std::less<_Sp_counted_base<_Lp>*>()(__a._M_pi, __b._M_pi); }
-
-    private:
-      friend class __shared_count<_Lp>;
-
-      _Sp_counted_base<_Lp>*  _M_pi;
-    };
-
-  // now that __weak_count is defined we can define this constructor:
-  template<_Lock_policy _Lp>
-    inline
-    __shared_count<_Lp>::
-    __shared_count(const __weak_count<_Lp>& __r)
-    : _M_pi(__r._M_pi)
-    {
-      if (_M_pi != 0)
-	_M_pi->_M_add_ref_lock();
-      else
-	__throw_bad_weak_ptr();
-    }
-
-  // Forward declarations.
-  template<typename _Tp, _Lock_policy _Lp = __default_lock_policy>
-    class __shared_ptr;
-  
-  template<typename _Tp, _Lock_policy _Lp = __default_lock_policy>
-    class __weak_ptr;
-
-  template<typename _Tp, _Lock_policy _Lp = __default_lock_policy>
-    class __enable_shared_from_this;
-
-  template<typename _Tp>
-    class shared_ptr;
-  
-  template<typename _Tp>
-    class weak_ptr;
-
-  template<typename _Tp>
-    class enable_shared_from_this;
-
-  // Support for enable_shared_from_this.
-
-  // Friend of __enable_shared_from_this.
-  template<_Lock_policy _Lp, typename _Tp1, typename _Tp2>
-    void
-    __enable_shared_from_this_helper(const __shared_count<_Lp>&,
-				     const __enable_shared_from_this<_Tp1,
-				     _Lp>*, const _Tp2*);
-
-  // Friend of enable_shared_from_this.
-  template<typename _Tp1, typename _Tp2>
-    void
-    __enable_shared_from_this_helper(const __shared_count<>&,
-				     const enable_shared_from_this<_Tp1>*,
-				     const _Tp2*);
-
-  template<_Lock_policy _Lp>
-    inline void
-    __enable_shared_from_this_helper(const __shared_count<_Lp>&, ...)
-    { }
-
-
-  struct __static_cast_tag { };
-  struct __const_cast_tag { };
-  struct __dynamic_cast_tag { };
-
-  // A smart pointer with reference-counted copy semantics.  The
-  // object pointed to is deleted when the last shared_ptr pointing to
-  // it is destroyed or reset.
-  template<typename _Tp, _Lock_policy _Lp>
-    class __shared_ptr
-    {
-    public:
-      typedef _Tp   element_type;
-      
-      __shared_ptr()
-      : _M_ptr(0), _M_refcount() // never throws
-      { }
-
-      template<typename _Tp1>
-        explicit
-        __shared_ptr(_Tp1* __p)
-	: _M_ptr(__p), _M_refcount(__p)
-        {
-	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-	  typedef int _IsComplete[sizeof(_Tp1)];
-	  __enable_shared_from_this_helper(_M_refcount, __p, __p);
-	}
-
-      template<typename _Tp1, typename _Deleter>
-        __shared_ptr(_Tp1* __p, _Deleter __d)
-        : _M_ptr(__p), _M_refcount(__p, __d)
-        {
-	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-	  // TODO requires _Deleter CopyConstructible and __d(__p) well-formed
-	  __enable_shared_from_this_helper(_M_refcount, __p, __p);
-	}
-      
-      //  generated copy constructor, assignment, destructor are fine.
-      
-      template<typename _Tp1>
-        __shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r)
-	: _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) // never throws
-        { __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>) }
-
-      template<typename _Tp1>
-        explicit
-        __shared_ptr(const __weak_ptr<_Tp1, _Lp>& __r)
-	: _M_refcount(__r._M_refcount) // may throw
-        {
-	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-	  // It is now safe to copy __r._M_ptr, as _M_refcount(__r._M_refcount)
-	  // did not throw.
-	  _M_ptr = __r._M_ptr;
-	}
-
-#if (__cplusplus < 201103L) || _GLIBCXX_USE_DEPRECATED
-      // Postcondition: use_count() == 1 and __r.get() == 0
-      template<typename _Tp1>
-        explicit
-        __shared_ptr(std::auto_ptr<_Tp1>& __r)
-	: _M_ptr(__r.get()), _M_refcount()
-        { // TODO requries delete __r.release() well-formed
-	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-	  typedef int _IsComplete[sizeof(_Tp1)];
-	  _Tp1* __tmp = __r.get();
-	  _M_refcount = __shared_count<_Lp>(__r);
-	  __enable_shared_from_this_helper(_M_refcount, __tmp, __tmp);
-	}
-
-#endif
-
-      template<typename _Tp1>
-        __shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r, __static_cast_tag)
-	: _M_ptr(static_cast<element_type*>(__r._M_ptr)),
-	  _M_refcount(__r._M_refcount)
-        { }
-
-      template<typename _Tp1>
-        __shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r, __const_cast_tag)
-	: _M_ptr(const_cast<element_type*>(__r._M_ptr)),
-	  _M_refcount(__r._M_refcount)
-        { }
-
-      template<typename _Tp1>
-        __shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r, __dynamic_cast_tag)
-	: _M_ptr(dynamic_cast<element_type*>(__r._M_ptr)),
-	  _M_refcount(__r._M_refcount)
-        {
-	  if (_M_ptr == 0) // need to allocate new counter -- the cast failed
-	    _M_refcount = __shared_count<_Lp>();
-	}
-
-      template<typename _Tp1>
-        __shared_ptr&
-        operator=(const __shared_ptr<_Tp1, _Lp>& __r) // never throws
-        {
-	  _M_ptr = __r._M_ptr;
-	  _M_refcount = __r._M_refcount; // __shared_count::op= doesn't throw
-	  return *this;
-	}
-
-#if (__cplusplus < 201103L) || _GLIBCXX_USE_DEPRECATED
-      template<typename _Tp1>
-        __shared_ptr&
-        operator=(std::auto_ptr<_Tp1>& __r)
-        {
-	  __shared_ptr(__r).swap(*this);
-	  return *this;
-	}
-#endif
-
-      void
-      reset() // never throws
-      { __shared_ptr().swap(*this); }
-
-      template<typename _Tp1>
-        void
-        reset(_Tp1* __p) // _Tp1 must be complete.
-        {
-	  // Catch self-reset errors.
-	  _GLIBCXX_DEBUG_ASSERT(__p == 0 || __p != _M_ptr); 
-	  __shared_ptr(__p).swap(*this);
-	}
-
-      template<typename _Tp1, typename _Deleter>
-        void
-        reset(_Tp1* __p, _Deleter __d)
-        { __shared_ptr(__p, __d).swap(*this); }
-
-      // Allow class instantiation when _Tp is [cv-qual] void.
-      typename std::tr1::add_reference<_Tp>::type
-      operator*() const // never throws
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_ptr != 0);
-	return *_M_ptr;
-      }
-
-      _Tp*
-      operator->() const // never throws
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_ptr != 0);
-	return _M_ptr;
-      }
-    
-      _Tp*
-      get() const // never throws
-      { return _M_ptr; }
-
-      // Implicit conversion to "bool"
-    private:
-      typedef _Tp* __shared_ptr::*__unspecified_bool_type;
-
-    public:
-      operator __unspecified_bool_type() const // never throws
-      { return _M_ptr == 0 ? 0 : &__shared_ptr::_M_ptr; }
-
-      bool
-      unique() const // never throws
-      { return _M_refcount._M_unique(); }
-
-      long
-      use_count() const // never throws
-      { return _M_refcount._M_get_use_count(); }
-
-      void
-      swap(__shared_ptr<_Tp, _Lp>& __other) // never throws
-      {
-	std::swap(_M_ptr, __other._M_ptr);
-	_M_refcount._M_swap(__other._M_refcount);
-      }
-
-    private:
-      void*
-      _M_get_deleter(const std::type_info& __ti) const
-      { return _M_refcount._M_get_deleter(__ti); }
-
-      template<typename _Tp1, _Lock_policy _Lp1>
-        bool
-        _M_less(const __shared_ptr<_Tp1, _Lp1>& __rhs) const
-        { return _M_refcount < __rhs._M_refcount; }
-
-      template<typename _Tp1, _Lock_policy _Lp1> friend class __shared_ptr;
-      template<typename _Tp1, _Lock_policy _Lp1> friend class __weak_ptr;
-
-      template<typename _Del, typename _Tp1, _Lock_policy _Lp1>
-        friend _Del* get_deleter(const __shared_ptr<_Tp1, _Lp1>&);
-
-      // Friends injected into enclosing namespace and found by ADL:
-      template<typename _Tp1>
-        friend inline bool
-        operator==(const __shared_ptr& __a, const __shared_ptr<_Tp1, _Lp>& __b)
-        { return __a.get() == __b.get(); }
-
-      template<typename _Tp1>
-        friend inline bool
-        operator!=(const __shared_ptr& __a, const __shared_ptr<_Tp1, _Lp>& __b)
-        { return __a.get() != __b.get(); }
-
-      template<typename _Tp1>
-        friend inline bool
-        operator<(const __shared_ptr& __a, const __shared_ptr<_Tp1, _Lp>& __b)
-        { return __a._M_less(__b); }
-
-      _Tp*         	   _M_ptr;         // Contained pointer.
-      __shared_count<_Lp>  _M_refcount;    // Reference counter.
-    };
-
-  // 2.2.3.8 shared_ptr specialized algorithms.
-  template<typename _Tp, _Lock_policy _Lp>
-    inline void
-    swap(__shared_ptr<_Tp, _Lp>& __a, __shared_ptr<_Tp, _Lp>& __b)
-    { __a.swap(__b); }
-
-  // 2.2.3.9 shared_ptr casts
-  /*  The seemingly equivalent
-   *           shared_ptr<_Tp, _Lp>(static_cast<_Tp*>(__r.get()))
-   *  will eventually result in undefined behaviour,
-   *  attempting to delete the same object twice.
-   */
-  template<typename _Tp, typename _Tp1, _Lock_policy _Lp>
-    inline __shared_ptr<_Tp, _Lp>
-    static_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r)
-    { return __shared_ptr<_Tp, _Lp>(__r, __static_cast_tag()); }
-
-  /*  The seemingly equivalent
-   *           shared_ptr<_Tp, _Lp>(const_cast<_Tp*>(__r.get()))
-   *  will eventually result in undefined behaviour,
-   *  attempting to delete the same object twice.
-   */
-  template<typename _Tp, typename _Tp1, _Lock_policy _Lp>
-    inline __shared_ptr<_Tp, _Lp>
-    const_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r)
-    { return __shared_ptr<_Tp, _Lp>(__r, __const_cast_tag()); }
-
-  /*  The seemingly equivalent
-   *           shared_ptr<_Tp, _Lp>(dynamic_cast<_Tp*>(__r.get()))
-   *  will eventually result in undefined behaviour,
-   *  attempting to delete the same object twice.
-   */
-  template<typename _Tp, typename _Tp1, _Lock_policy _Lp>
-    inline __shared_ptr<_Tp, _Lp>
-    dynamic_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r)
-    { return __shared_ptr<_Tp, _Lp>(__r, __dynamic_cast_tag()); }
-
-  // 2.2.3.7 shared_ptr I/O
-  template<typename _Ch, typename _Tr, typename _Tp, _Lock_policy _Lp>
-    std::basic_ostream<_Ch, _Tr>&
-    operator<<(std::basic_ostream<_Ch, _Tr>& __os, 
-	       const __shared_ptr<_Tp, _Lp>& __p)
-    {
-      __os << __p.get();
-      return __os;
-    }
-
-  // 2.2.3.10 shared_ptr get_deleter (experimental)
-  template<typename _Del, typename _Tp, _Lock_policy _Lp>
-    inline _Del*
-    get_deleter(const __shared_ptr<_Tp, _Lp>& __p)
-    {
-#if __cpp_rtti
-      return static_cast<_Del*>(__p._M_get_deleter(typeid(_Del)));
-#else
-      return 0;
-#endif
-    }
-
-
-  template<typename _Tp, _Lock_policy _Lp>
-    class __weak_ptr
-    {
-    public:
-      typedef _Tp element_type;
-      
-      __weak_ptr()
-      : _M_ptr(0), _M_refcount() // never throws
-      { }
-
-      // Generated copy constructor, assignment, destructor are fine.
-      
-      // The "obvious" converting constructor implementation:
-      //
-      //  template<typename _Tp1>
-      //    __weak_ptr(const __weak_ptr<_Tp1, _Lp>& __r)
-      //    : _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) // never throws
-      //    { }
-      //
-      // has a serious problem.
-      //
-      //  __r._M_ptr may already have been invalidated. The _M_ptr(__r._M_ptr)
-      //  conversion may require access to *__r._M_ptr (virtual inheritance).
-      //
-      // It is not possible to avoid spurious access violations since
-      // in multithreaded programs __r._M_ptr may be invalidated at any point.
-      template<typename _Tp1>
-        __weak_ptr(const __weak_ptr<_Tp1, _Lp>& __r)
-	: _M_refcount(__r._M_refcount) // never throws
-        {
-	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-	  _M_ptr = __r.lock().get();
-	}
-
-      template<typename _Tp1>
-        __weak_ptr(const __shared_ptr<_Tp1, _Lp>& __r)
-	: _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) // never throws
-        { __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>) }
-
-      template<typename _Tp1>
-        __weak_ptr&
-        operator=(const __weak_ptr<_Tp1, _Lp>& __r) // never throws
-        {
-	  _M_ptr = __r.lock().get();
-	  _M_refcount = __r._M_refcount;
-	  return *this;
-	}
-      
-      template<typename _Tp1>
-        __weak_ptr&
-        operator=(const __shared_ptr<_Tp1, _Lp>& __r) // never throws
-        {
-	  _M_ptr = __r._M_ptr;
-	  _M_refcount = __r._M_refcount;
-	  return *this;
-	}
-
-      __shared_ptr<_Tp, _Lp>
-      lock() const // never throws
-      {
-#ifdef __GTHREADS
-	// Optimization: avoid throw overhead.
-	if (expired())
-	  return __shared_ptr<element_type, _Lp>();
-
-	__try
-	  {
-	    return __shared_ptr<element_type, _Lp>(*this);
-	  }
-	__catch(const bad_weak_ptr&)
-	  {
-	    // Q: How can we get here?
-	    // A: Another thread may have invalidated r after the
-	    //    use_count test above.
-	    return __shared_ptr<element_type, _Lp>();
-	  }
-	
-#else
-	// Optimization: avoid try/catch overhead when single threaded.
-	return expired() ? __shared_ptr<element_type, _Lp>()
-	                 : __shared_ptr<element_type, _Lp>(*this);
-
-#endif
-      } // XXX MT
-
-      long
-      use_count() const // never throws
-      { return _M_refcount._M_get_use_count(); }
-
-      bool
-      expired() const // never throws
-      { return _M_refcount._M_get_use_count() == 0; }
-      
-      void
-      reset() // never throws
-      { __weak_ptr().swap(*this); }
-
-      void
-      swap(__weak_ptr& __s) // never throws
-      {
-	std::swap(_M_ptr, __s._M_ptr);
-	_M_refcount._M_swap(__s._M_refcount);
-      }
-
-    private:
-      // Used by __enable_shared_from_this.
-      void
-      _M_assign(_Tp* __ptr, const __shared_count<_Lp>& __refcount)
-      {
-	_M_ptr = __ptr;
-	_M_refcount = __refcount;
-      }
-
-      template<typename _Tp1>
-        bool
-        _M_less(const __weak_ptr<_Tp1, _Lp>& __rhs) const
-        { return _M_refcount < __rhs._M_refcount; }
-
-      template<typename _Tp1, _Lock_policy _Lp1> friend class __shared_ptr;
-      template<typename _Tp1, _Lock_policy _Lp1> friend class __weak_ptr;
-      friend class __enable_shared_from_this<_Tp, _Lp>;
-      friend class enable_shared_from_this<_Tp>;
-
-      // Friend injected into namespace and found by ADL.
-      template<typename _Tp1>
-        friend inline bool
-        operator<(const __weak_ptr& __lhs, const __weak_ptr<_Tp1, _Lp>& __rhs)
-        { return __lhs._M_less(__rhs); }
-
-      _Tp*       	 _M_ptr;         // Contained pointer.
-      __weak_count<_Lp>  _M_refcount;    // Reference counter.
-    };
-
-  // 2.2.4.7 weak_ptr specialized algorithms.
-  template<typename _Tp, _Lock_policy _Lp>
-    inline void
-    swap(__weak_ptr<_Tp, _Lp>& __a, __weak_ptr<_Tp, _Lp>& __b)
-    { __a.swap(__b); }
-
-
-  template<typename _Tp, _Lock_policy _Lp>
-    class __enable_shared_from_this
-    {
-    protected:
-      __enable_shared_from_this() { }
-      
-      __enable_shared_from_this(const __enable_shared_from_this&) { }
-      
-      __enable_shared_from_this&
-      operator=(const __enable_shared_from_this&)
-      { return *this; }
-
-      ~__enable_shared_from_this() { }
-      
-    public:
-      __shared_ptr<_Tp, _Lp>
-      shared_from_this()
-      { return __shared_ptr<_Tp, _Lp>(this->_M_weak_this); }
-
-      __shared_ptr<const _Tp, _Lp>
-      shared_from_this() const
-      { return __shared_ptr<const _Tp, _Lp>(this->_M_weak_this); }
-
-    private:
-      template<typename _Tp1>
-        void
-        _M_weak_assign(_Tp1* __p, const __shared_count<_Lp>& __n) const
-        { _M_weak_this._M_assign(__p, __n); }
-
-      template<typename _Tp1>
-        friend void
-        __enable_shared_from_this_helper(const __shared_count<_Lp>& __pn,
-					 const __enable_shared_from_this* __pe,
-					 const _Tp1* __px)
-        {
-	  if (__pe != 0)
-	    __pe->_M_weak_assign(const_cast<_Tp1*>(__px), __pn);
-	}
-
-      mutable __weak_ptr<_Tp, _Lp>  _M_weak_this;
-    };
-
-
-  // The actual shared_ptr, with forwarding constructors and
-  // assignment operators.
-  template<typename _Tp>
-    class shared_ptr
-    : public __shared_ptr<_Tp>
-    {
-    public:
-      shared_ptr()
-      : __shared_ptr<_Tp>() { }
-
-      template<typename _Tp1>
-        explicit
-        shared_ptr(_Tp1* __p)
-	: __shared_ptr<_Tp>(__p) { }
-
-      template<typename _Tp1, typename _Deleter>
-        shared_ptr(_Tp1* __p, _Deleter __d)
-	: __shared_ptr<_Tp>(__p, __d) { }
-
-      template<typename _Tp1>
-        shared_ptr(const shared_ptr<_Tp1>& __r)
-	: __shared_ptr<_Tp>(__r) { }
-
-      template<typename _Tp1>
-        explicit
-        shared_ptr(const weak_ptr<_Tp1>& __r)
-	: __shared_ptr<_Tp>(__r) { }
-
-#if (__cplusplus < 201103L) || _GLIBCXX_USE_DEPRECATED
-      template<typename _Tp1>
-        explicit
-        shared_ptr(std::auto_ptr<_Tp1>& __r)
-	: __shared_ptr<_Tp>(__r) { }
-#endif
-
-      template<typename _Tp1>
-        shared_ptr(const shared_ptr<_Tp1>& __r, __static_cast_tag)
-	: __shared_ptr<_Tp>(__r, __static_cast_tag()) { }
-
-      template<typename _Tp1>
-        shared_ptr(const shared_ptr<_Tp1>& __r, __const_cast_tag)
-	: __shared_ptr<_Tp>(__r, __const_cast_tag()) { }
-
-      template<typename _Tp1>
-        shared_ptr(const shared_ptr<_Tp1>& __r, __dynamic_cast_tag)
-	: __shared_ptr<_Tp>(__r, __dynamic_cast_tag()) { }
-
-      template<typename _Tp1>
-        shared_ptr&
-        operator=(const shared_ptr<_Tp1>& __r) // never throws
-        {
-	  this->__shared_ptr<_Tp>::operator=(__r);
-	  return *this;
-	}
-
-#if (__cplusplus < 201103L) || _GLIBCXX_USE_DEPRECATED
-      template<typename _Tp1>
-        shared_ptr&
-        operator=(std::auto_ptr<_Tp1>& __r)
-        {
-	  this->__shared_ptr<_Tp>::operator=(__r);
-	  return *this;
-	}
-#endif
-    };
-
-  // 2.2.3.8 shared_ptr specialized algorithms.
-  template<typename _Tp>
-    inline void
-    swap(__shared_ptr<_Tp>& __a, __shared_ptr<_Tp>& __b)
-    { __a.swap(__b); }
-
-  template<typename _Tp, typename _Tp1>
-    inline shared_ptr<_Tp>
-    static_pointer_cast(const shared_ptr<_Tp1>& __r)
-    { return shared_ptr<_Tp>(__r, __static_cast_tag()); }
-
-  template<typename _Tp, typename _Tp1>
-    inline shared_ptr<_Tp>
-    const_pointer_cast(const shared_ptr<_Tp1>& __r)
-    { return shared_ptr<_Tp>(__r, __const_cast_tag()); }
-
-  template<typename _Tp, typename _Tp1>
-    inline shared_ptr<_Tp>
-    dynamic_pointer_cast(const shared_ptr<_Tp1>& __r)
-    { return shared_ptr<_Tp>(__r, __dynamic_cast_tag()); }
-
-
-  // The actual weak_ptr, with forwarding constructors and
-  // assignment operators.
-  template<typename _Tp>
-    class weak_ptr
-    : public __weak_ptr<_Tp>
-    {
-    public:
-      weak_ptr()
-      : __weak_ptr<_Tp>() { }
-      
-      template<typename _Tp1>
-        weak_ptr(const weak_ptr<_Tp1>& __r)
-	: __weak_ptr<_Tp>(__r) { }
-
-      template<typename _Tp1>
-        weak_ptr(const shared_ptr<_Tp1>& __r)
-	: __weak_ptr<_Tp>(__r) { }
-
-      template<typename _Tp1>
-        weak_ptr&
-        operator=(const weak_ptr<_Tp1>& __r) // never throws
-        {
-	  this->__weak_ptr<_Tp>::operator=(__r);
-	  return *this;
-	}
-
-      template<typename _Tp1>
-        weak_ptr&
-        operator=(const shared_ptr<_Tp1>& __r) // never throws
-        {
-	  this->__weak_ptr<_Tp>::operator=(__r);
-	  return *this;
-	}
-
-      shared_ptr<_Tp>
-      lock() const // never throws
-      {
-#ifdef __GTHREADS
-	if (this->expired())
-	  return shared_ptr<_Tp>();
-
-	__try
-	  {
-	    return shared_ptr<_Tp>(*this);
-	  }
-	__catch(const bad_weak_ptr&)
-	  {
-	    return shared_ptr<_Tp>();
-	  }
-#else
-	return this->expired() ? shared_ptr<_Tp>()
-	                       : shared_ptr<_Tp>(*this);
-#endif
-      }
-    };
-
-  template<typename _Tp>
-    class enable_shared_from_this
-    {
-    protected:
-      enable_shared_from_this() { }
-      
-      enable_shared_from_this(const enable_shared_from_this&) { }
-
-      enable_shared_from_this&
-      operator=(const enable_shared_from_this&)
-      { return *this; }
-
-      ~enable_shared_from_this() { }
-
-    public:
-      shared_ptr<_Tp>
-      shared_from_this()
-      { return shared_ptr<_Tp>(this->_M_weak_this); }
-
-      shared_ptr<const _Tp>
-      shared_from_this() const
-      { return shared_ptr<const _Tp>(this->_M_weak_this); }
-
-    private:
-      template<typename _Tp1>
-        void
-        _M_weak_assign(_Tp1* __p, const __shared_count<>& __n) const
-        { _M_weak_this._M_assign(__p, __n); }
-
-      template<typename _Tp1>
-        friend void
-        __enable_shared_from_this_helper(const __shared_count<>& __pn,
-					 const enable_shared_from_this* __pe,
-					 const _Tp1* __px)
-        {
-	  if (__pe != 0)
-	    __pe->_M_weak_assign(const_cast<_Tp1*>(__px), __pn);
-	}
-
-      mutable weak_ptr<_Tp>  _M_weak_this;
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _TR1_SHARED_PTR_H
diff --git a/openflow/usr/include/c++/5/tr1/special_function_util.h b/openflow/usr/include/c++/5/tr1/special_function_util.h
deleted file mode 100644
index 9b7cd65..0000000
--- a/openflow/usr/include/c++/5/tr1/special_function_util.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// Special functions -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/special_function_util.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/cmath}
- */
-
-//
-// ISO C++ 14882 TR1: 5.2  Special functions
-//
-
-// Written by Edward Smith-Rowland based on numerous mathematics books.
-
-#ifndef _GLIBCXX_TR1_SPECIAL_FUNCTION_UTIL_H
-#define _GLIBCXX_TR1_SPECIAL_FUNCTION_UTIL_H 1
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-  namespace __detail
-  {
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-    /// A class to encapsulate type dependent floating point
-    /// constants.  Not everything will be able to be expressed as
-    /// type logic.
-    template<typename _Tp>
-    struct __floating_point_constant
-    {
-      static const _Tp __value;
-    };
-
-
-    /// A structure for numeric constants.
-    template<typename _Tp>
-      struct __numeric_constants
-      {
-        ///  Constant @f$ \pi @f$.
-        static _Tp __pi() throw()
-        { return static_cast<_Tp>(3.1415926535897932384626433832795029L); }
-        ///  Constant @f$ \pi / 2 @f$.
-        static _Tp __pi_2() throw()
-        { return static_cast<_Tp>(1.5707963267948966192313216916397514L); }
-        ///  Constant @f$ \pi / 3 @f$.
-        static _Tp __pi_3() throw()
-        { return static_cast<_Tp>(1.0471975511965977461542144610931676L); }
-        ///  Constant @f$ \pi / 4 @f$.
-        static _Tp __pi_4() throw()
-        { return static_cast<_Tp>(0.7853981633974483096156608458198757L); }
-        ///  Constant @f$ 1 / \pi @f$.
-        static _Tp __1_pi() throw()
-        { return static_cast<_Tp>(0.3183098861837906715377675267450287L); }
-        ///  Constant @f$ 2 / \sqrt(\pi) @f$.
-        static _Tp __2_sqrtpi() throw()
-        { return static_cast<_Tp>(1.1283791670955125738961589031215452L); }
-        ///  Constant @f$ \sqrt(2) @f$.
-        static _Tp __sqrt2() throw()
-        { return static_cast<_Tp>(1.4142135623730950488016887242096981L); }
-        ///  Constant @f$ \sqrt(3) @f$.
-        static _Tp __sqrt3() throw()
-        { return static_cast<_Tp>(1.7320508075688772935274463415058723L); }
-        ///  Constant @f$ \sqrt(\pi/2) @f$.
-        static _Tp __sqrtpio2() throw()
-        { return static_cast<_Tp>(1.2533141373155002512078826424055226L); }
-        ///  Constant @f$ 1 / sqrt(2) @f$.
-        static _Tp __sqrt1_2() throw()
-        { return static_cast<_Tp>(0.7071067811865475244008443621048490L); }
-        ///  Constant @f$ \log(\pi) @f$.
-        static _Tp __lnpi() throw()
-        { return static_cast<_Tp>(1.1447298858494001741434273513530587L); }
-        ///  Constant Euler's constant @f$ \gamma_E @f$.
-        static _Tp __gamma_e() throw()
-        { return static_cast<_Tp>(0.5772156649015328606065120900824024L); }
-        ///  Constant Euler-Mascheroni @f$ e @f$
-        static _Tp __euler() throw()
-        { return static_cast<_Tp>(2.7182818284590452353602874713526625L); }
-      };
-
-
-#if _GLIBCXX_USE_C99_MATH && !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
-
-    /// This is a wrapper for the isnan function. Otherwise, for NaN,
-    /// all comparisons result in false. If/when we build a std::isnan
-    /// out of intrinsics, this will disappear completely in favor of
-    /// std::isnan.
-    template<typename _Tp>
-    inline bool __isnan(_Tp __x)
-    { return std::isnan(__x); }
-
-#else
-
-    template<typename _Tp>
-    inline bool __isnan(const _Tp __x)
-    { return __builtin_isnan(__x); }
-
-    template<>
-    inline bool __isnan<float>(float __x)
-    { return __builtin_isnanf(__x); }
-
-    template<>
-    inline bool __isnan<long double>(long double __x)
-    { return __builtin_isnanl(__x); }
-
-#endif
-
-  _GLIBCXX_END_NAMESPACE_VERSION
-  } // namespace __detail
-}
-}
-
-#endif // _GLIBCXX_TR1_SPECIAL_FUNCTION_UTIL_H
-
diff --git a/openflow/usr/include/c++/5/tr1/stdarg.h b/openflow/usr/include/c++/5/tr1/stdarg.h
deleted file mode 100644
index 75da1ca..0000000
--- a/openflow/usr/include/c++/5/tr1/stdarg.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 stdarg.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/stdarg.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _TR1_STDARG_H
-#define _TR1_STDARG_H 1
-
-#include <tr1/cstdarg>
-
-#endif
diff --git a/openflow/usr/include/c++/5/tr1/stdbool.h b/openflow/usr/include/c++/5/tr1/stdbool.h
deleted file mode 100644
index db94af6..0000000
--- a/openflow/usr/include/c++/5/tr1/stdbool.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 stdbool.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/stdbool.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _TR1_STDBOOL_H
-#define _TR1_STDBOOL_H 1
-
-#include <tr1/cstdbool>
-
-#endif
diff --git a/openflow/usr/include/c++/5/tr1/stdint.h b/openflow/usr/include/c++/5/tr1/stdint.h
deleted file mode 100644
index 20144eb..0000000
--- a/openflow/usr/include/c++/5/tr1/stdint.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 stdint.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/stdint.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _TR1_STDINT_H
-#define _TR1_STDINT_H 1
-
-#include <tr1/cstdint>
-
-#endif
diff --git a/openflow/usr/include/c++/5/tr1/stdio.h b/openflow/usr/include/c++/5/tr1/stdio.h
deleted file mode 100644
index f4662f5..0000000
--- a/openflow/usr/include/c++/5/tr1/stdio.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 stdio.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/stdio.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _TR1_STDIO_H
-#define _TR1_STDIO_H 1
-
-#include <tr1/cstdio>
-
-#endif
diff --git a/openflow/usr/include/c++/5/tr1/stdlib.h b/openflow/usr/include/c++/5/tr1/stdlib.h
deleted file mode 100644
index 310c7bc..0000000
--- a/openflow/usr/include/c++/5/tr1/stdlib.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// TR1 stdlib.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/stdlib.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_STDLIB_H
-#define _GLIBCXX_TR1_STDLIB_H 1
-
-#include <tr1/cstdlib>
-
-#if _GLIBCXX_HOSTED
-
-#if _GLIBCXX_USE_C99
-
-using std::tr1::atoll;
-using std::tr1::strtoll;
-using std::tr1::strtoull;
-
-using std::tr1::abs;
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-using std::tr1::div;
-#endif
-
-#endif
-
-#endif
-
-#endif // _GLIBCXX_TR1_STDLIB_H
-
diff --git a/openflow/usr/include/c++/5/tr1/tgmath.h b/openflow/usr/include/c++/5/tr1/tgmath.h
deleted file mode 100644
index 3128608..0000000
--- a/openflow/usr/include/c++/5/tr1/tgmath.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 tgmath.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/tgmath.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_TGMATH_H
-#define _GLIBCXX_TR1_TGMATH_H 1
-
-#include <tr1/ctgmath>
-
-#endif // _GLIBCXX_TR1_TGMATH_H
diff --git a/openflow/usr/include/c++/5/tr1/tuple b/openflow/usr/include/c++/5/tr1/tuple
deleted file mode 100644
index eab59df..0000000
--- a/openflow/usr/include/c++/5/tr1/tuple
+++ /dev/null
@@ -1,426 +0,0 @@
-// class template tuple -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/tuple
-*  This is a TR1 C++ Library header.
-*/
-
-// Chris Jefferson <chris@bubblescope.net>
-// Variadic Templates support by Douglas Gregor <doug.gregor@gmail.com>
-
-#ifndef _GLIBCXX_TR1_TUPLE
-#define _GLIBCXX_TR1_TUPLE 1
-
-#pragma GCC system_header
-
-#include <utility>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Adds a const reference to a non-reference type.
-  template<typename _Tp>
-    struct __add_c_ref
-    { typedef const _Tp& type; };
-
-  template<typename _Tp>
-    struct __add_c_ref<_Tp&>
-    { typedef _Tp& type; };
-
-  // Adds a reference to a non-reference type.
-  template<typename _Tp>
-    struct __add_ref
-    { typedef _Tp& type; };
-
-  template<typename _Tp>
-    struct __add_ref<_Tp&>
-    { typedef _Tp& type; };
-
-  /**
-   * Contains the actual implementation of the @c tuple template, stored
-   * as a recursive inheritance hierarchy from the first element (most
-   * derived class) to the last (least derived class). The @c Idx
-   * parameter gives the 0-based index of the element stored at this
-   * point in the hierarchy; we use it to implement a constant-time
-   * get() operation.
-   */
-  template<int _Idx, typename... _Elements>
-    struct _Tuple_impl; 
-
-  /**
-   * Zero-element tuple implementation. This is the basis case for the 
-   * inheritance recursion.
-   */
-  template<int _Idx>
-    struct _Tuple_impl<_Idx> { };
-
-  /**
-   * Recursive tuple implementation. Here we store the @c Head element
-   * and derive from a @c Tuple_impl containing the remaining elements
-   * (which contains the @c Tail).
-   */
-  template<int _Idx, typename _Head, typename... _Tail>
-    struct _Tuple_impl<_Idx, _Head, _Tail...>
-    : public _Tuple_impl<_Idx + 1, _Tail...>
-    {
-      typedef _Tuple_impl<_Idx + 1, _Tail...> _Inherited;
-      
-      _Head _M_head;
-      
-      _Inherited&       _M_tail()       { return *this; }
-      const _Inherited& _M_tail() const { return *this; }
-      
-      _Tuple_impl() : _Inherited(), _M_head() { }
-      
-      explicit 
-      _Tuple_impl(typename __add_c_ref<_Head>::type __head,
-		  typename __add_c_ref<_Tail>::type... __tail)
-      : _Inherited(__tail...), _M_head(__head) { }
-
-      template<typename... _UElements>
-      _Tuple_impl(const _Tuple_impl<_Idx, _UElements...>& __in)
-      : _Inherited(__in._M_tail()), _M_head(__in._M_head) { }
-
-      _Tuple_impl(const _Tuple_impl& __in)
-      : _Inherited(__in._M_tail()), _M_head(__in._M_head) { }
-     
-      template<typename... _UElements>
-        _Tuple_impl&
-        operator=(const _Tuple_impl<_Idx, _UElements...>& __in)
-        {
-	  _M_head = __in._M_head;
-	  _M_tail() = __in._M_tail();
-	  return *this;
-	}
-
-      _Tuple_impl&
-      operator=(const _Tuple_impl& __in)
-      {
-	_M_head = __in._M_head;
-	_M_tail() = __in._M_tail();
-	return *this;
-      }
-    };
-
-  template<typename... _Elements> 
-    class tuple : public _Tuple_impl<0, _Elements...>
-    {
-      typedef _Tuple_impl<0, _Elements...> _Inherited;
-
-    public:
-      tuple() : _Inherited() { }
-
-      explicit
-      tuple(typename __add_c_ref<_Elements>::type... __elements)
-      : _Inherited(__elements...) { }
-
-      template<typename... _UElements>
-        tuple(const tuple<_UElements...>& __in)
-	: _Inherited(__in) { }
-
-      tuple(const tuple& __in)
-      : _Inherited(__in) { }
-
-      template<typename... _UElements>
-        tuple&
-        operator=(const tuple<_UElements...>& __in)
-        {
-	  static_cast<_Inherited&>(*this) = __in;
-	  return *this;
-	}
-
-      tuple&
-      operator=(const tuple& __in)
-      {
-	static_cast<_Inherited&>(*this) = __in;
-	return *this;
-      }
-    };
-
-  template<> class tuple<> { };
-
-  // 2-element tuple, with construction and assignment from a pair.
-  template<typename _T1, typename _T2>
-    class tuple<_T1, _T2> : public _Tuple_impl<0, _T1, _T2>
-    {
-      typedef _Tuple_impl<0, _T1, _T2> _Inherited;
-
-    public:
-      tuple() : _Inherited() { }
-
-      explicit
-      tuple(typename __add_c_ref<_T1>::type __a1,
-	    typename __add_c_ref<_T2>::type __a2)
-      : _Inherited(__a1, __a2) { }
-
-      template<typename _U1, typename _U2>
-        tuple(const tuple<_U1, _U2>& __in)
-	: _Inherited(__in) { }
-
-      tuple(const tuple& __in)
-      : _Inherited(__in) { }
-
-      template<typename _U1, typename _U2>
-        tuple(const pair<_U1, _U2>& __in)
-	: _Inherited(_Tuple_impl<0, 
-		     typename __add_c_ref<_U1>::type,
-		     typename __add_c_ref<_U2>::type>(__in.first, 
-						      __in.second))
-        { }
-  
-      template<typename _U1, typename _U2>
-        tuple&
-        operator=(const tuple<_U1, _U2>& __in)
-        {
-	  static_cast<_Inherited&>(*this) = __in;
-	  return *this;
-	}
-
-      tuple&
-      operator=(const tuple& __in)
-      {
-	static_cast<_Inherited&>(*this) = __in;
-	return *this;
-      }
-
-      template<typename _U1, typename _U2>
-        tuple&
-        operator=(const pair<_U1, _U2>& __in)
-        {
-	  this->_M_head = __in.first;
-	  this->_M_tail()._M_head = __in.second;
-	  return *this;
-	}
-    };
-
-  
-  /// Gives the type of the ith element of a given tuple type.
-  template<int __i, typename _Tp>
-    struct tuple_element;
-
-  /**
-   * Recursive case for tuple_element: strip off the first element in
-   * the tuple and retrieve the (i-1)th element of the remaining tuple.
-   */
-  template<int __i, typename _Head, typename... _Tail>
-    struct tuple_element<__i, tuple<_Head, _Tail...> >
-    : tuple_element<__i - 1, tuple<_Tail...> > { };
-
-  /**
-   * Basis case for tuple_element: The first element is the one we're seeking.
-   */
-  template<typename _Head, typename... _Tail>
-    struct tuple_element<0, tuple<_Head, _Tail...> >
-    {
-      typedef _Head type;
-    };
-
-  /// Finds the size of a given tuple type.
-  template<typename _Tp>
-    struct tuple_size;
-
-  /// class tuple_size
-  template<typename... _Elements>
-    struct tuple_size<tuple<_Elements...> >
-    {
-      static const int value = sizeof...(_Elements);
-    };
-
-  template<typename... _Elements>
-    const int tuple_size<tuple<_Elements...> >::value;
-
-  template<int __i, typename _Head, typename... _Tail>
-    inline typename __add_ref<_Head>::type
-    __get_helper(_Tuple_impl<__i, _Head, _Tail...>& __t)
-    {
-      return __t._M_head;
-    }
-
-  template<int __i, typename _Head, typename... _Tail>
-    inline typename __add_c_ref<_Head>::type
-    __get_helper(const _Tuple_impl<__i, _Head, _Tail...>& __t)
-    {
-      return __t._M_head;
-    }
-
-  // Return a reference (const reference) to the ith element of a tuple.
-  // Any const or non-const ref elements are returned with their original type.
-  template<int __i, typename... _Elements>
-    inline typename __add_ref<
-                      typename tuple_element<__i, tuple<_Elements...> >::type
-                    >::type
-    get(tuple<_Elements...>& __t)
-    { 
-      return __get_helper<__i>(__t); 
-    }
-
-  template<int __i, typename... _Elements>
-    inline typename __add_c_ref<
-                      typename tuple_element<__i, tuple<_Elements...> >::type
-                    >::type
-    get(const tuple<_Elements...>& __t)
-    {
-      return __get_helper<__i>(__t);
-    }
-
-  // This class helps construct the various comparison operations on tuples
-  template<int __check_equal_size, int __i, int __j,
-	   typename _Tp, typename _Up>
-    struct __tuple_compare;
-
-  template<int __i, int __j, typename _Tp, typename _Up>
-    struct __tuple_compare<0, __i, __j, _Tp, _Up>
-    {
-      static bool __eq(const _Tp& __t, const _Up& __u)
-      {
-	return (get<__i>(__t) == get<__i>(__u) &&
-		__tuple_compare<0, __i+1, __j, _Tp, _Up>::__eq(__t, __u));
-      }
-     
-      static bool __less(const _Tp& __t, const _Up& __u)
-      {
-	return ((get<__i>(__t) < get<__i>(__u))
-		|| !(get<__i>(__u) < get<__i>(__t)) &&
-		__tuple_compare<0, __i+1, __j, _Tp, _Up>::__less(__t, __u));
-      }
-    };
-
-  template<int __i, typename _Tp, typename _Up>
-    struct __tuple_compare<0, __i, __i, _Tp, _Up>
-    {
-      static bool __eq(const _Tp&, const _Up&)
-      { return true; }
-     
-      static bool __less(const _Tp&, const _Up&)
-      { return false; }
-    };
-
-  template<typename... _TElements, typename... _UElements>
-    bool
-    operator==(const tuple<_TElements...>& __t,
-	       const tuple<_UElements...>& __u)
-    {
-      typedef tuple<_TElements...> _Tp;
-      typedef tuple<_UElements...> _Up;
-      return (__tuple_compare<tuple_size<_Tp>::value - tuple_size<_Up>::value,
-	      0, tuple_size<_Tp>::value, _Tp, _Up>::__eq(__t, __u));
-    }
-
-  template<typename... _TElements, typename... _UElements>
-    bool
-    operator<(const tuple<_TElements...>& __t,
-	      const tuple<_UElements...>& __u)
-    {
-      typedef tuple<_TElements...> _Tp;
-      typedef tuple<_UElements...> _Up;
-      return (__tuple_compare<tuple_size<_Tp>::value - tuple_size<_Up>::value,
-	      0, tuple_size<_Tp>::value, _Tp, _Up>::__less(__t, __u));
-    }
-
-  template<typename... _TElements, typename... _UElements>
-    inline bool
-    operator!=(const tuple<_TElements...>& __t,
-	       const tuple<_UElements...>& __u)
-    { return !(__t == __u); }
-
-  template<typename... _TElements, typename... _UElements>
-    inline bool
-    operator>(const tuple<_TElements...>& __t,
-	      const tuple<_UElements...>& __u)
-    { return __u < __t; }
-
-  template<typename... _TElements, typename... _UElements>
-    inline bool
-    operator<=(const tuple<_TElements...>& __t,
-	       const tuple<_UElements...>& __u)
-    { return !(__u < __t); }
-
-  template<typename... _TElements, typename... _UElements>
-    inline bool
-    operator>=(const tuple<_TElements...>& __t,
-	       const tuple<_UElements...>& __u)
-    { return !(__t < __u); }
-
-  template<typename _Tp>
-    class reference_wrapper;
-
-  // Helper which adds a reference to a type when given a reference_wrapper
-  template<typename _Tp>
-    struct __strip_reference_wrapper
-    {
-      typedef _Tp __type;
-    };
-
-  template<typename _Tp>
-    struct __strip_reference_wrapper<reference_wrapper<_Tp> >
-    {
-      typedef _Tp& __type;
-    };
-
-  template<typename _Tp>
-    struct __strip_reference_wrapper<const reference_wrapper<_Tp> >
-    {
-      typedef _Tp& __type;
-    };
-
-  template<typename... _Elements>
-    inline tuple<typename __strip_reference_wrapper<_Elements>::__type...>
-    make_tuple(_Elements... __args)
-    {
-      typedef tuple<typename __strip_reference_wrapper<_Elements>::__type...>
-        __result_type;
-      return __result_type(__args...);
-    }
-
-  template<typename... _Elements>
-    inline tuple<_Elements&...>
-    tie(_Elements&... __args)
-    {
-      return tuple<_Elements&...>(__args...);
-    }
-
-  // A class (and instance) which can be used in 'tie' when an element
-  // of a tuple is not required
-  struct _Swallow_assign
-  {
-    template<class _Tp>
-      _Swallow_assign&
-      operator=(const _Tp&)
-      { return *this; }
-  };
-
-  // TODO: Put this in some kind of shared file.
-  namespace
-  {
-    _Swallow_assign ignore;
-  }; // anonymous namespace
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _GLIBCXX_TR1_TUPLE
diff --git a/openflow/usr/include/c++/5/tr1/type_traits b/openflow/usr/include/c++/5/tr1/type_traits
deleted file mode 100644
index 638c856..0000000
--- a/openflow/usr/include/c++/5/tr1/type_traits
+++ /dev/null
@@ -1,687 +0,0 @@
-// TR1 type_traits -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/type_traits
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_TYPE_TRAITS
-#define _GLIBCXX_TR1_TYPE_TRAITS 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup metaprogramming
-   * @{
-   */
-
-  struct __sfinae_types
-  {
-    typedef char __one;
-    typedef struct { char __arr[2]; } __two;
-  };
-
-#define _DEFINE_SPEC_0_HELPER                          \
-  template<>
-
-#define _DEFINE_SPEC_1_HELPER                          \
-  template<typename _Tp>
-
-#define _DEFINE_SPEC_2_HELPER                          \
-  template<typename _Tp, typename _Cp>
-
-#define _DEFINE_SPEC(_Order, _Trait, _Type, _Value)    \
-  _DEFINE_SPEC_##_Order##_HELPER                       \
-    struct _Trait<_Type>                               \
-    : public integral_constant<bool, _Value> { };
-
-  // helper classes [4.3].
-
-  /// integral_constant
-  template<typename _Tp, _Tp __v>
-    struct integral_constant
-    {
-      static const _Tp                      value = __v;
-      typedef _Tp                           value_type;
-      typedef integral_constant<_Tp, __v>   type;
-    };
-  
-  /// typedef for true_type
-  typedef integral_constant<bool, true>     true_type;
-
-  /// typedef for false_type
-  typedef integral_constant<bool, false>    false_type;
-
-  template<typename _Tp, _Tp __v>
-    const _Tp integral_constant<_Tp, __v>::value;
-
-  /// remove_cv
-  template<typename>
-    struct remove_cv;
-
-  template<typename>
-    struct __is_void_helper
-    : public false_type { };
-  _DEFINE_SPEC(0, __is_void_helper, void, true)
-
-  // primary type categories [4.5.1].
-
-  /// is_void
-  template<typename _Tp>
-    struct is_void
-    : public integral_constant<bool, (__is_void_helper<typename
-				      remove_cv<_Tp>::type>::value)>
-    { };
-
-  template<typename>
-    struct __is_integral_helper
-    : public false_type { };
-  _DEFINE_SPEC(0, __is_integral_helper, bool, true)
-  _DEFINE_SPEC(0, __is_integral_helper, char, true)
-  _DEFINE_SPEC(0, __is_integral_helper, signed char, true)
-  _DEFINE_SPEC(0, __is_integral_helper, unsigned char, true)
-#ifdef _GLIBCXX_USE_WCHAR_T
-  _DEFINE_SPEC(0, __is_integral_helper, wchar_t, true)
-#endif
-  _DEFINE_SPEC(0, __is_integral_helper, short, true)
-  _DEFINE_SPEC(0, __is_integral_helper, unsigned short, true)
-  _DEFINE_SPEC(0, __is_integral_helper, int, true)
-  _DEFINE_SPEC(0, __is_integral_helper, unsigned int, true)
-  _DEFINE_SPEC(0, __is_integral_helper, long, true)
-  _DEFINE_SPEC(0, __is_integral_helper, unsigned long, true)
-  _DEFINE_SPEC(0, __is_integral_helper, long long, true)
-  _DEFINE_SPEC(0, __is_integral_helper, unsigned long long, true)
-
-  /// is_integral
-  template<typename _Tp>
-    struct is_integral
-    : public integral_constant<bool, (__is_integral_helper<typename
-				      remove_cv<_Tp>::type>::value)>
-    { };
-
-  template<typename>
-    struct __is_floating_point_helper
-    : public false_type { };
-  _DEFINE_SPEC(0, __is_floating_point_helper, float, true)
-  _DEFINE_SPEC(0, __is_floating_point_helper, double, true)
-  _DEFINE_SPEC(0, __is_floating_point_helper, long double, true)
-
-  /// is_floating_point
-  template<typename _Tp>
-    struct is_floating_point
-    : public integral_constant<bool, (__is_floating_point_helper<typename
-				      remove_cv<_Tp>::type>::value)>
-    { };
-
-  /// is_array
-  template<typename>
-    struct is_array
-    : public false_type { };
-
-  template<typename _Tp, std::size_t _Size>
-    struct is_array<_Tp[_Size]>
-    : public true_type { };
-
-  template<typename _Tp>
-    struct is_array<_Tp[]>
-    : public true_type { };
-
-  template<typename>
-    struct __is_pointer_helper
-    : public false_type { };
-  _DEFINE_SPEC(1, __is_pointer_helper, _Tp*, true)
-
-  /// is_pointer
-  template<typename _Tp>
-    struct is_pointer
-    : public integral_constant<bool, (__is_pointer_helper<typename
-				      remove_cv<_Tp>::type>::value)>
-    { };
-
-  /// is_reference
-  template<typename _Tp>
-    struct is_reference;
-
-  /// is_function
-  template<typename _Tp>
-    struct is_function;
-
-  template<typename>
-    struct __is_member_object_pointer_helper
-    : public false_type { };
-  _DEFINE_SPEC(2, __is_member_object_pointer_helper, _Tp _Cp::*,
-	       !is_function<_Tp>::value)
-
-  /// is_member_object_pointer
-  template<typename _Tp>
-    struct is_member_object_pointer
-    : public integral_constant<bool, (__is_member_object_pointer_helper<
-				      typename remove_cv<_Tp>::type>::value)>
-    { };
-
-  template<typename>
-    struct __is_member_function_pointer_helper
-    : public false_type { };
-  _DEFINE_SPEC(2, __is_member_function_pointer_helper, _Tp _Cp::*,
-	       is_function<_Tp>::value)
-
-  /// is_member_function_pointer
-  template<typename _Tp>
-    struct is_member_function_pointer
-    : public integral_constant<bool, (__is_member_function_pointer_helper<
-				      typename remove_cv<_Tp>::type>::value)>
-    { };
-
-  /// is_enum
-  template<typename _Tp>
-    struct is_enum
-    : public integral_constant<bool, __is_enum(_Tp)>
-    { };
-
-  /// is_union
-  template<typename _Tp>
-    struct is_union
-    : public integral_constant<bool, __is_union(_Tp)>
-    { };
-
-  /// is_class
-  template<typename _Tp>
-    struct is_class
-    : public integral_constant<bool, __is_class(_Tp)>
-    { };
-
-  /// is_function
-  template<typename>
-    struct is_function
-    : public false_type { };
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...)>
-    : public true_type { };
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......)>
-    : public true_type { };
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) const>
-    : public true_type { };
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) const>
-    : public true_type { };
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) volatile>
-    : public true_type { };
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) volatile>
-    : public true_type { };
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) const volatile>
-    : public true_type { };
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) const volatile>
-    : public true_type { };
-
-  // composite type traits [4.5.2].
-  
-  /// is_arithmetic
-  template<typename _Tp>
-    struct is_arithmetic
-    : public integral_constant<bool, (is_integral<_Tp>::value
-				      || is_floating_point<_Tp>::value)>
-    { };
-
-  /// is_fundamental
-  template<typename _Tp>
-    struct is_fundamental
-    : public integral_constant<bool, (is_arithmetic<_Tp>::value
-				      || is_void<_Tp>::value)>
-    { };
-
-  /// is_object
-  template<typename _Tp>
-    struct is_object
-    : public integral_constant<bool, !(is_function<_Tp>::value
-				       || is_reference<_Tp>::value
-				       || is_void<_Tp>::value)>
-    { };
-
-  /// is_member_pointer
-  template<typename _Tp>
-    struct is_member_pointer;
-
-  /// is_scalar
-  template<typename _Tp>
-    struct is_scalar
-    : public integral_constant<bool, (is_arithmetic<_Tp>::value
-				      || is_enum<_Tp>::value
-				      || is_pointer<_Tp>::value
-				      || is_member_pointer<_Tp>::value)>
-    { };
-
-  /// is_compound
-  template<typename _Tp>
-    struct is_compound
-    : public integral_constant<bool, !is_fundamental<_Tp>::value> { };
-
-  /// is_member_pointer
-  template<typename _Tp>
-    struct __is_member_pointer_helper
-    : public false_type { };
-  _DEFINE_SPEC(2, __is_member_pointer_helper, _Tp _Cp::*, true)
-
-  template<typename _Tp>
-  struct is_member_pointer
-    : public integral_constant<bool, (__is_member_pointer_helper<
-				      typename remove_cv<_Tp>::type>::value)>
-    { };
-
-  // type properties [4.5.3].
-  /// is_const
-  template<typename>
-    struct is_const
-    : public false_type { };
-
-  template<typename _Tp>
-    struct is_const<_Tp const>
-    : public true_type { };
-  
-  /// is_volatile
-  template<typename>
-    struct is_volatile
-    : public false_type { };
-
-  template<typename _Tp>
-    struct is_volatile<_Tp volatile>
-    : public true_type { };
-
-  /// is_empty
-  template<typename _Tp>
-    struct is_empty
-    : public integral_constant<bool, __is_empty(_Tp)>
-    { };
-
-  /// is_polymorphic
-  template<typename _Tp>
-    struct is_polymorphic
-    : public integral_constant<bool, __is_polymorphic(_Tp)>
-    { };
-
-  /// is_abstract
-  template<typename _Tp>
-    struct is_abstract
-    : public integral_constant<bool, __is_abstract(_Tp)>
-    { };
-
-  /// has_virtual_destructor
-  template<typename _Tp>
-    struct has_virtual_destructor
-    : public integral_constant<bool, __has_virtual_destructor(_Tp)>
-    { };
-
-  /// alignment_of
-  template<typename _Tp>
-    struct alignment_of
-    : public integral_constant<std::size_t, __alignof__(_Tp)> { };
-  
-  /// rank
-  template<typename>
-    struct rank
-    : public integral_constant<std::size_t, 0> { };
-   
-  template<typename _Tp, std::size_t _Size>
-    struct rank<_Tp[_Size]>
-    : public integral_constant<std::size_t, 1 + rank<_Tp>::value> { };
-
-  template<typename _Tp>
-    struct rank<_Tp[]>
-    : public integral_constant<std::size_t, 1 + rank<_Tp>::value> { };
-
-  /// extent
-  template<typename, unsigned _Uint = 0>
-    struct extent
-    : public integral_constant<std::size_t, 0> { };
-  
-  template<typename _Tp, unsigned _Uint, std::size_t _Size>
-    struct extent<_Tp[_Size], _Uint>
-    : public integral_constant<std::size_t,
-			       _Uint == 0 ? _Size : extent<_Tp,
-							   _Uint - 1>::value>
-    { };
-
-  template<typename _Tp, unsigned _Uint>
-    struct extent<_Tp[], _Uint>
-    : public integral_constant<std::size_t,
-			       _Uint == 0 ? 0 : extent<_Tp,
-						       _Uint - 1>::value>
-    { };
-
-  // relationships between types [4.6].
-
-  /// is_same
-  template<typename, typename>
-    struct is_same
-    : public false_type { };
-
-  template<typename _Tp>
-    struct is_same<_Tp, _Tp>
-    : public true_type { };
-
-  // const-volatile modifications [4.7.1].
-
-  /// remove_const
-  template<typename _Tp>
-    struct remove_const
-    { typedef _Tp     type; };
-
-  template<typename _Tp>
-    struct remove_const<_Tp const>
-    { typedef _Tp     type; };
-  
-  /// remove_volatile
-  template<typename _Tp>
-    struct remove_volatile
-    { typedef _Tp     type; };
-
-  template<typename _Tp>
-    struct remove_volatile<_Tp volatile>
-    { typedef _Tp     type; };
-  
-  /// remove_cv
-  template<typename _Tp>
-    struct remove_cv
-    {
-      typedef typename
-      remove_const<typename remove_volatile<_Tp>::type>::type     type;
-    };
-  
-  /// add_const
-  template<typename _Tp>
-    struct add_const
-    { typedef _Tp const     type; };
-   
-  /// add_volatile
-  template<typename _Tp>
-    struct add_volatile
-    { typedef _Tp volatile     type; };
-  
-  /// add_cv
-  template<typename _Tp>
-    struct add_cv
-    {
-      typedef typename
-      add_const<typename add_volatile<_Tp>::type>::type     type;
-    };
-
-  // array modifications [4.7.3].
-
-  /// remove_extent
-  template<typename _Tp>
-    struct remove_extent
-    { typedef _Tp     type; };
-
-  template<typename _Tp, std::size_t _Size>
-    struct remove_extent<_Tp[_Size]>
-    { typedef _Tp     type; };
-
-  template<typename _Tp>
-    struct remove_extent<_Tp[]>
-    { typedef _Tp     type; };
-
-  /// remove_all_extents
-  template<typename _Tp>
-    struct remove_all_extents
-    { typedef _Tp     type; };
-
-  template<typename _Tp, std::size_t _Size>
-    struct remove_all_extents<_Tp[_Size]>
-    { typedef typename remove_all_extents<_Tp>::type     type; };
-
-  template<typename _Tp>
-    struct remove_all_extents<_Tp[]>
-    { typedef typename remove_all_extents<_Tp>::type     type; };
-
-  // pointer modifications [4.7.4].
-
-  template<typename _Tp, typename>
-    struct __remove_pointer_helper
-    { typedef _Tp     type; };
-
-  template<typename _Tp, typename _Up>
-    struct __remove_pointer_helper<_Tp, _Up*>
-    { typedef _Up     type; };
-
-  /// remove_pointer
-  template<typename _Tp>
-    struct remove_pointer
-    : public __remove_pointer_helper<_Tp, typename remove_cv<_Tp>::type>
-    { };
-
-  template<typename>
-    struct remove_reference;
-
-  /// add_pointer
-  template<typename _Tp>
-    struct add_pointer
-    { typedef typename remove_reference<_Tp>::type*     type; };
-
-  template<typename>
-    struct is_reference
-    : public false_type { };
-
-  template<typename _Tp>
-    struct is_reference<_Tp&>
-    : public true_type { };
-
-  template<typename _Tp>
-    struct is_pod
-    : public integral_constant<bool, __is_pod(_Tp) || is_void<_Tp>::value>
-    { };
-
-  template<typename _Tp>
-    struct has_trivial_constructor
-    : public integral_constant<bool, is_pod<_Tp>::value>
-    { };
-
-  template<typename _Tp>
-    struct has_trivial_copy
-    : public integral_constant<bool, is_pod<_Tp>::value>
-    { };
-
-  template<typename _Tp>
-    struct has_trivial_assign
-    : public integral_constant<bool, is_pod<_Tp>::value>
-    { };
-
-  template<typename _Tp>
-    struct has_trivial_destructor
-    : public integral_constant<bool, is_pod<_Tp>::value>
-    { };
-
-  template<typename _Tp>
-    struct has_nothrow_constructor
-    : public integral_constant<bool, is_pod<_Tp>::value>
-    { };
-
-  template<typename _Tp>
-    struct has_nothrow_copy
-    : public integral_constant<bool, is_pod<_Tp>::value>
-    { };
-
-  template<typename _Tp>
-    struct has_nothrow_assign
-    : public integral_constant<bool, is_pod<_Tp>::value>
-    { };
-
-  template<typename>
-    struct __is_signed_helper
-    : public false_type { };
-  _DEFINE_SPEC(0, __is_signed_helper, signed char, true)
-  _DEFINE_SPEC(0, __is_signed_helper, short, true)
-  _DEFINE_SPEC(0, __is_signed_helper, int, true)
-  _DEFINE_SPEC(0, __is_signed_helper, long, true)
-  _DEFINE_SPEC(0, __is_signed_helper, long long, true)
-
-  template<typename _Tp>
-    struct is_signed
-    : public integral_constant<bool, (__is_signed_helper<typename
-				      remove_cv<_Tp>::type>::value)>
-    { };
-
-  template<typename>
-    struct __is_unsigned_helper
-    : public false_type { };
-  _DEFINE_SPEC(0, __is_unsigned_helper, unsigned char, true)
-  _DEFINE_SPEC(0, __is_unsigned_helper, unsigned short, true)
-  _DEFINE_SPEC(0, __is_unsigned_helper, unsigned int, true)
-  _DEFINE_SPEC(0, __is_unsigned_helper, unsigned long, true)
-  _DEFINE_SPEC(0, __is_unsigned_helper, unsigned long long, true)
-
-  template<typename _Tp>
-    struct is_unsigned
-    : public integral_constant<bool, (__is_unsigned_helper<typename
-				      remove_cv<_Tp>::type>::value)>
-    { };
-
-  template<typename _Base, typename _Derived>
-    struct __is_base_of_helper
-    {
-      typedef typename remove_cv<_Base>::type    _NoCv_Base;
-      typedef typename remove_cv<_Derived>::type _NoCv_Derived;
-      static const bool __value = (is_same<_Base, _Derived>::value
-				   || (__is_base_of(_Base, _Derived)
-				       && !is_same<_NoCv_Base,
-				                   _NoCv_Derived>::value));
-    };
- 
-  template<typename _Base, typename _Derived>
-    struct is_base_of
-    : public integral_constant<bool,
-			       __is_base_of_helper<_Base, _Derived>::__value>
-    { };
-
-  template<typename _From, typename _To>
-    struct __is_convertible_simple
-    : public __sfinae_types
-    {
-    private:
-      static __one __test(_To);
-      static __two __test(...);
-      static _From __makeFrom();
-    
-    public:
-      static const bool __value = sizeof(__test(__makeFrom())) == 1;
-    };
-
-  template<typename _Tp>
-    struct add_reference;
-
-  template<typename _Tp>
-    struct __is_int_or_cref
-    {
-      typedef typename remove_reference<_Tp>::type __rr_Tp;
-      static const bool __value = (is_integral<_Tp>::value
-				   || (is_integral<__rr_Tp>::value
-				       && is_const<__rr_Tp>::value
-				       && !is_volatile<__rr_Tp>::value));
-    };
-
-  template<typename _From, typename _To,
-	   bool = (is_void<_From>::value || is_void<_To>::value
-		   || is_function<_To>::value || is_array<_To>::value
-		   // This special case is here only to avoid warnings.	
-		   || (is_floating_point<typename
-		       remove_reference<_From>::type>::value
-		       && __is_int_or_cref<_To>::__value))>
-    struct __is_convertible_helper
-    {
-      // "An imaginary lvalue of type From...".
-      static const bool __value = (__is_convertible_simple<typename
-				   add_reference<_From>::type, _To>::__value);
-    };
-
-  template<typename _From, typename _To>
-    struct __is_convertible_helper<_From, _To, true>
-    { static const bool __value = (is_void<_To>::value
-				   || (__is_int_or_cref<_To>::__value
-				       && !is_void<_From>::value)); };
-
-  template<typename _From, typename _To>
-    struct is_convertible
-    : public integral_constant<bool,
-			       __is_convertible_helper<_From, _To>::__value>
-    { };
-
-  // reference modifications [4.7.2].
-  template<typename _Tp>
-    struct remove_reference
-    { typedef _Tp     type; };
-
-  template<typename _Tp>
-    struct remove_reference<_Tp&>
-    { typedef _Tp     type; };
-
-  // NB: Careful with reference to void.
-  template<typename _Tp, bool = (is_void<_Tp>::value
-				 || is_reference<_Tp>::value)>
-    struct __add_reference_helper
-    { typedef _Tp&    type; };
-
-  template<typename _Tp>
-    struct __add_reference_helper<_Tp, true>
-    { typedef _Tp     type; };
-
-  template<typename _Tp>
-    struct add_reference
-    : public __add_reference_helper<_Tp>
-    { };
-
-  // other transformations [4.8].
-  template<std::size_t _Len, std::size_t _Align>
-    struct aligned_storage
-    { 
-      union type
-      {
-	unsigned char __data[_Len];
-	struct __attribute__((__aligned__((_Align)))) { } __align; 
-      };
-    };
-
-#undef _DEFINE_SPEC_0_HELPER
-#undef _DEFINE_SPEC_1_HELPER
-#undef _DEFINE_SPEC_2_HELPER
-#undef _DEFINE_SPEC
-
-  /// @} group metaprogramming
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _GLIBCXX_TR1_TYPE_TRAITS
diff --git a/openflow/usr/include/c++/5/tr1/unordered_map b/openflow/usr/include/c++/5/tr1/unordered_map
deleted file mode 100644
index afe5dab..0000000
--- a/openflow/usr/include/c++/5/tr1/unordered_map
+++ /dev/null
@@ -1,44 +0,0 @@
-// TR1 unordered_map -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/unordered_map
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_UNORDERED_MAP
-#define _GLIBCXX_TR1_UNORDERED_MAP 1
-
-#pragma GCC system_header
-
-#include <utility>
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_function.h> // equal_to, _Identity, _Select1st
-#include <bits/stringfwd.h>
-#include <tr1/type_traits>
-#include <tr1/functional_hash.h>
-#include <tr1/hashtable.h>
-#include <tr1/unordered_map.h>
-
-#endif // _GLIBCXX_TR1_UNORDERED_MAP
diff --git a/openflow/usr/include/c++/5/tr1/unordered_map.h b/openflow/usr/include/c++/5/tr1/unordered_map.h
deleted file mode 100644
index c33a2dd..0000000
--- a/openflow/usr/include/c++/5/tr1/unordered_map.h
+++ /dev/null
@@ -1,278 +0,0 @@
-// TR1 unordered_map implementation -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/unordered_map.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/unordered_map}
- */
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // NB: When we get typedef templates these class definitions
-  // will be unnecessary.
-  template<class _Key, class _Tp,
-	   class _Hash = hash<_Key>,
-	   class _Pred = std::equal_to<_Key>,
-	   class _Alloc = std::allocator<std::pair<const _Key, _Tp> >,
-	   bool __cache_hash_code = false>
-    class __unordered_map
-    : public _Hashtable<_Key, std::pair<const _Key, _Tp>, _Alloc,
-			std::_Select1st<std::pair<const _Key, _Tp> >, _Pred,
-			_Hash, __detail::_Mod_range_hashing,
-			__detail::_Default_ranged_hash,
-			__detail::_Prime_rehash_policy,
-			__cache_hash_code, false, true>
-    {
-      typedef _Hashtable<_Key, std::pair<const _Key, _Tp>, _Alloc,
-			 std::_Select1st<std::pair<const _Key, _Tp> >, _Pred,
-			 _Hash, __detail::_Mod_range_hashing,
-			 __detail::_Default_ranged_hash,
-			 __detail::_Prime_rehash_policy,
-			 __cache_hash_code, false, true>
-	_Base;
-
-    public:
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::hasher          hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::allocator_type  allocator_type;
-
-      explicit
-      __unordered_map(size_type __n = 10,
-		      const hasher& __hf = hasher(),
-		      const key_equal& __eql = key_equal(),
-		      const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __detail::_Mod_range_hashing(),
-	      __detail::_Default_ranged_hash(),
-	      __eql, std::_Select1st<std::pair<const _Key, _Tp> >(), __a)
-      { }
-
-      template<typename _InputIterator>
-	__unordered_map(_InputIterator __f, _InputIterator __l,
-			size_type __n = 10,
-			const hasher& __hf = hasher(),
-			const key_equal& __eql = key_equal(),
-			const allocator_type& __a = allocator_type())
-	: _Base(__f, __l, __n, __hf, __detail::_Mod_range_hashing(),
-		__detail::_Default_ranged_hash(),
-		__eql, std::_Select1st<std::pair<const _Key, _Tp> >(), __a)
-	{ }
-    };
-
-  template<class _Key, class _Tp,
-	   class _Hash = hash<_Key>,
-	   class _Pred = std::equal_to<_Key>,
-	   class _Alloc = std::allocator<std::pair<const _Key, _Tp> >,
-	   bool __cache_hash_code = false>
-    class __unordered_multimap
-    : public _Hashtable<_Key, std::pair<const _Key, _Tp>,
-			_Alloc,
-			std::_Select1st<std::pair<const _Key, _Tp> >, _Pred,
-			_Hash, __detail::_Mod_range_hashing,
-			__detail::_Default_ranged_hash,
-			__detail::_Prime_rehash_policy,
-			__cache_hash_code, false, false>
-    {
-      typedef _Hashtable<_Key, std::pair<const _Key, _Tp>,
-			 _Alloc,
-			 std::_Select1st<std::pair<const _Key, _Tp> >, _Pred,
-			 _Hash, __detail::_Mod_range_hashing,
-			 __detail::_Default_ranged_hash,
-			 __detail::_Prime_rehash_policy,
-			 __cache_hash_code, false, false>
-	_Base;
-
-    public:
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::hasher          hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::allocator_type  allocator_type;
-
-      explicit
-      __unordered_multimap(size_type __n = 10,
-			   const hasher& __hf = hasher(),
-			   const key_equal& __eql = key_equal(),
-			   const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __detail::_Mod_range_hashing(),
-	      __detail::_Default_ranged_hash(),
-	      __eql, std::_Select1st<std::pair<const _Key, _Tp> >(), __a)
-      { }
-
-
-      template<typename _InputIterator>
-	__unordered_multimap(_InputIterator __f, _InputIterator __l,
-			     typename _Base::size_type __n = 0,
-			     const hasher& __hf = hasher(),
-			     const key_equal& __eql = key_equal(),
-			     const allocator_type& __a = allocator_type())
-	: _Base(__f, __l, __n, __hf, __detail::_Mod_range_hashing(),
-		__detail::_Default_ranged_hash(),
-		__eql, std::_Select1st<std::pair<const _Key, _Tp> >(), __a)
-	{ }
-    };
-
-  template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc,
-	   bool __cache_hash_code>
-    inline void
-    swap(__unordered_map<_Key, _Tp, _Hash, _Pred,
-	 _Alloc, __cache_hash_code>& __x,
-	 __unordered_map<_Key, _Tp, _Hash, _Pred,
-	 _Alloc, __cache_hash_code>& __y)
-    { __x.swap(__y); }
-
-  template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc,
-	   bool __cache_hash_code>
-    inline void
-    swap(__unordered_multimap<_Key, _Tp, _Hash, _Pred,
-	 _Alloc, __cache_hash_code>& __x,
-	 __unordered_multimap<_Key, _Tp, _Hash, _Pred,
-	 _Alloc, __cache_hash_code>& __y)
-    { __x.swap(__y); }
-
-
-  /**
-   *  @brief A standard container composed of unique keys (containing
-   *  at most one of each key value) that associates values of another type
-   *  with the keys.
-   *
-   *  @ingroup unordered_associative_containers
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, and
-   *  <a href="tables.html#xx">unordered associative container</a>
-   *
-   *  @param  Key  Type of key objects.
-   *  @param  Tp  Type of mapped objects.
-   *  @param  Hash  Hashing function object type, defaults to hash<Value>.
-   *  @param  Pred  Predicate function object type, defaults to equal_to<Value>.
-   *  @param  Alloc  Allocator type, defaults to allocator<Key>.
-   *
-   * The resulting value type of the container is std::pair<const Key, Tp>.
-   */
-  template<class _Key, class _Tp,
-	   class _Hash = hash<_Key>,
-	   class _Pred = std::equal_to<_Key>,
-	   class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-    class unordered_map
-    : public __unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>
-    {
-      typedef __unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>  _Base;
-
-    public:
-      typedef typename _Base::value_type      value_type;
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::hasher          hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::allocator_type  allocator_type;
-
-      explicit
-      unordered_map(size_type __n = 10,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_map(_InputIterator __f, _InputIterator __l,
-		      size_type __n = 10,
-		      const hasher& __hf = hasher(),
-		      const key_equal& __eql = key_equal(),
-		      const allocator_type& __a = allocator_type())
-	: _Base(__f, __l, __n, __hf, __eql, __a)
-	{ }
-    };
-
-  /**
-   *  @brief A standard container composed of equivalent keys
-   *  (possibly containing multiple of each key value) that associates
-   *  values of another type with the keys.
-   *
-   *  @ingroup unordered_associative_containers
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, and
-   *  <a href="tables.html#xx">unordered associative container</a>
-   *
-   *  @param  Key  Type of key objects.
-   *  @param  Tp  Type of mapped objects.
-   *  @param  Hash  Hashing function object type, defaults to hash<Value>.
-   *  @param  Pred  Predicate function object type, defaults to equal_to<Value>.
-   *  @param  Alloc  Allocator type, defaults to allocator<Key>.
-   *
-   * The resulting value type of the container is std::pair<const Key, Tp>.
-   */
-  template<class _Key, class _Tp,
-	   class _Hash = hash<_Key>,
-	   class _Pred = std::equal_to<_Key>,
-	   class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
-    class unordered_multimap
-    : public __unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>
-    {
-      typedef __unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>  _Base;
-
-    public:
-      typedef typename _Base::value_type      value_type;
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::hasher          hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::allocator_type  allocator_type;
-
-      explicit
-      unordered_multimap(size_type __n = 10,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a)
-      { }
-
-
-      template<typename _InputIterator>
-	unordered_multimap(_InputIterator __f, _InputIterator __l,
-			   typename _Base::size_type __n = 0,
-			   const hasher& __hf = hasher(),
-			   const key_equal& __eql = key_equal(),
-			   const allocator_type& __a = allocator_type())
-	: _Base(__f, __l, __n, __hf, __eql, __a)
-	{ }
-
-    };
-
-  template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    inline void
-    swap(unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	 unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    inline void
-    swap(unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-	 unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
diff --git a/openflow/usr/include/c++/5/tr1/unordered_set b/openflow/usr/include/c++/5/tr1/unordered_set
deleted file mode 100644
index 2a264c3..0000000
--- a/openflow/usr/include/c++/5/tr1/unordered_set
+++ /dev/null
@@ -1,44 +0,0 @@
-// TR1 unordered_set -*- C++ -*-
-
-// Copyright (C) 2005-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/unordered_set
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_UNORDERED_SET
-#define _GLIBCXX_TR1_UNORDERED_SET 1
-
-#pragma GCC system_header
-
-#include <utility>
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_function.h> // equal_to, _Identity, _Select1st
-#include <bits/stringfwd.h>
-#include <tr1/type_traits>
-#include <tr1/functional_hash.h>
-#include <tr1/hashtable.h>
-#include <tr1/unordered_set.h>
-
-#endif // _GLIBCXX_TR1_UNORDERED_SET
diff --git a/openflow/usr/include/c++/5/tr1/unordered_set.h b/openflow/usr/include/c++/5/tr1/unordered_set.h
deleted file mode 100644
index 68459f7..0000000
--- a/openflow/usr/include/c++/5/tr1/unordered_set.h
+++ /dev/null
@@ -1,267 +0,0 @@
-// TR1 unordered_set implementation -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/unordered_set.h
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr1/unordered_set}
- */
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // NB: When we get typedef templates these class definitions
-  // will be unnecessary.
-  template<class _Value,
-	   class _Hash = hash<_Value>,
-	   class _Pred = std::equal_to<_Value>,
-	   class _Alloc = std::allocator<_Value>,
-	   bool __cache_hash_code = false>
-    class __unordered_set
-    : public _Hashtable<_Value, _Value, _Alloc,
-			std::_Identity<_Value>, _Pred,
-			_Hash, __detail::_Mod_range_hashing,
-			__detail::_Default_ranged_hash,
-			__detail::_Prime_rehash_policy,
-			__cache_hash_code, true, true>
-    {
-      typedef _Hashtable<_Value, _Value, _Alloc,
-			 std::_Identity<_Value>, _Pred,
-			 _Hash, __detail::_Mod_range_hashing,
-			 __detail::_Default_ranged_hash,
-			 __detail::_Prime_rehash_policy,
-			 __cache_hash_code, true, true>
-	_Base;
-
-    public:
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::hasher          hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::allocator_type  allocator_type;
-
-      explicit
-      __unordered_set(size_type __n = 10,
-		      const hasher& __hf = hasher(),
-		      const key_equal& __eql = key_equal(),
-		      const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __detail::_Mod_range_hashing(),
-	      __detail::_Default_ranged_hash(), __eql,
-	      std::_Identity<_Value>(), __a)
-      { }
-
-      template<typename _InputIterator>
-	__unordered_set(_InputIterator __f, _InputIterator __l,
-			size_type __n = 10,
-			const hasher& __hf = hasher(),
-			const key_equal& __eql = key_equal(),
-			const allocator_type& __a = allocator_type())
-	: _Base(__f, __l, __n, __hf, __detail::_Mod_range_hashing(),
-		__detail::_Default_ranged_hash(), __eql,
-		std::_Identity<_Value>(), __a)
-	{ }
-    };
-
-  template<class _Value,
-	   class _Hash = hash<_Value>,
-	   class _Pred = std::equal_to<_Value>,
-	   class _Alloc = std::allocator<_Value>,
-	   bool __cache_hash_code = false>
-    class __unordered_multiset
-    : public _Hashtable<_Value, _Value, _Alloc,
-			std::_Identity<_Value>, _Pred,
-			_Hash, __detail::_Mod_range_hashing,
-			__detail::_Default_ranged_hash,
-			__detail::_Prime_rehash_policy,
-			__cache_hash_code, true, false>
-    {
-      typedef _Hashtable<_Value, _Value, _Alloc,
-			 std::_Identity<_Value>, _Pred,
-			 _Hash, __detail::_Mod_range_hashing,
-			 __detail::_Default_ranged_hash,
-			 __detail::_Prime_rehash_policy,
-			 __cache_hash_code, true, false>
-	_Base;
-
-    public:
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::hasher          hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::allocator_type  allocator_type;
-
-      explicit
-      __unordered_multiset(size_type __n = 10,
-			   const hasher& __hf = hasher(),
-			   const key_equal& __eql = key_equal(),
-			   const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __detail::_Mod_range_hashing(),
-	      __detail::_Default_ranged_hash(), __eql,
-	      std::_Identity<_Value>(), __a)
-      { }
-
-
-      template<typename _InputIterator>
-	__unordered_multiset(_InputIterator __f, _InputIterator __l,
-			     typename _Base::size_type __n = 0,
-			     const hasher& __hf = hasher(),
-			     const key_equal& __eql = key_equal(),
-			     const allocator_type& __a = allocator_type())
-	: _Base(__f, __l, __n, __hf, __detail::_Mod_range_hashing(),
-		__detail::_Default_ranged_hash(), __eql,
-		std::_Identity<_Value>(), __a)
-	{ }
-    };
-
-  template<class _Value, class _Hash, class _Pred, class _Alloc,
-	   bool __cache_hash_code>
-    inline void
-    swap(__unordered_set<_Value, _Hash, _Pred, _Alloc, __cache_hash_code>& __x,
-	 __unordered_set<_Value, _Hash, _Pred, _Alloc, __cache_hash_code>& __y)
-    { __x.swap(__y); }
-
-  template<class _Value, class _Hash, class _Pred, class _Alloc,
-	   bool __cache_hash_code>
-    inline void
-    swap(__unordered_multiset<_Value, _Hash, _Pred,
-	 _Alloc, __cache_hash_code>& __x,
-	 __unordered_multiset<_Value, _Hash, _Pred,
-	 _Alloc, __cache_hash_code>& __y)
-    { __x.swap(__y); }
-
-
-  /**
-   *  @brief A standard container composed of unique keys (containing
-   *  at most one of each key value) in which the elements' keys are
-   *  the elements themselves.
-   *
-   *  @ingroup unordered_associative_containers
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, and
-   *  <a href="tables.html#xx">unordered associative container</a>
-   *
-   *  @param  Value  Type of key objects.
-   *  @param  Hash  Hashing function object type, defaults to hash<Value>.
-   *  @param  Pred  Predicate function object type, defaults to equal_to<Value>.
-   *  @param  Alloc  Allocator type, defaults to allocator<Key>.
-   */
-  template<class _Value,
-	   class _Hash = hash<_Value>,
-	   class _Pred = std::equal_to<_Value>,
-	   class _Alloc = std::allocator<_Value> >
-    class unordered_set
-    : public __unordered_set<_Value, _Hash, _Pred, _Alloc>
-    {
-      typedef __unordered_set<_Value, _Hash, _Pred, _Alloc>  _Base;
-
-    public:
-      typedef typename _Base::value_type      value_type;
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::hasher          hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::allocator_type  allocator_type;
-
-      explicit
-      unordered_set(size_type __n = 10,
-		    const hasher& __hf = hasher(),
-		    const key_equal& __eql = key_equal(),
-		    const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a)
-      { }
-
-      template<typename _InputIterator>
-	unordered_set(_InputIterator __f, _InputIterator __l,
-		      size_type __n = 10,
-		      const hasher& __hf = hasher(),
-		      const key_equal& __eql = key_equal(),
-		      const allocator_type& __a = allocator_type())
-	: _Base(__f, __l, __n, __hf, __eql, __a)
-	{ }
-    };
-
-  /**
-   *  @brief A standard container composed of equivalent keys
-   *  (possibly containing multiple of each key value) in which the
-   *  elements' keys are the elements themselves.
-   *
-   *  @ingroup unordered_associative_containers
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, and
-   *  <a href="tables.html#xx">unordered associative container</a>
-   *
-   *  @param  Value  Type of key objects.
-   *  @param  Hash  Hashing function object type, defaults to hash<Value>.
-   *  @param  Pred  Predicate function object type, defaults to equal_to<Value>.
-   *  @param  Alloc  Allocator type, defaults to allocator<Key>.
-   */
-  template<class _Value,
-	   class _Hash = hash<_Value>,
-	   class _Pred = std::equal_to<_Value>,
-	   class _Alloc = std::allocator<_Value> >
-    class unordered_multiset
-    : public __unordered_multiset<_Value, _Hash, _Pred, _Alloc>
-    {
-      typedef __unordered_multiset<_Value, _Hash, _Pred, _Alloc>  _Base;
-
-    public:
-      typedef typename _Base::value_type      value_type;
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::hasher          hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::allocator_type  allocator_type;
-
-      explicit
-      unordered_multiset(size_type __n = 10,
-			 const hasher& __hf = hasher(),
-			 const key_equal& __eql = key_equal(),
-			 const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a)
-      { }
-
-
-      template<typename _InputIterator>
-	unordered_multiset(_InputIterator __f, _InputIterator __l,
-			   typename _Base::size_type __n = 0,
-			   const hasher& __hf = hasher(),
-			   const key_equal& __eql = key_equal(),
-			   const allocator_type& __a = allocator_type())
-	: _Base(__f, __l, __n, __hf, __eql, __a)
-	{ }
-    };
-
-  template<class _Value, class _Hash, class _Pred, class _Alloc>
-    inline void
-    swap(unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-	 unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<class _Value, class _Hash, class _Pred, class _Alloc>
-    inline void
-    swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-	 unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    { __x.swap(__y); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
diff --git a/openflow/usr/include/c++/5/tr1/utility b/openflow/usr/include/c++/5/tr1/utility
deleted file mode 100644
index 83f8c10..0000000
--- a/openflow/usr/include/c++/5/tr1/utility
+++ /dev/null
@@ -1,108 +0,0 @@
-// TR1 utility -*- C++ -*-
-
-// Copyright (C) 2004-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/utility
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_UTILITY
-#define _GLIBCXX_TR1_UTILITY 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stl_relops.h>
-#include <bits/stl_pair.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr1
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<class _Tp>
-    class tuple_size;
-
-  template<int _Int, class _Tp>
-    class tuple_element;
-
-   // Various functions which give std::pair a tuple-like interface.
-  template<class _Tp1, class _Tp2>
-    struct tuple_size<std::pair<_Tp1, _Tp2> >
-    { static const int value = 2; };
-
-  template<class _Tp1, class _Tp2>
-    const int
-    tuple_size<std::pair<_Tp1, _Tp2> >::value;
-
-  template<class _Tp1, class _Tp2>
-    struct tuple_element<0, std::pair<_Tp1, _Tp2> >
-    { typedef _Tp1 type; };
- 
-  template<class _Tp1, class _Tp2>
-    struct tuple_element<1, std::pair<_Tp1, _Tp2> >
-    { typedef _Tp2 type; };
-
-  template<int _Int>
-    struct __pair_get;
-
-  template<>
-    struct __pair_get<0>
-    {
-      template<typename _Tp1, typename _Tp2>
-      static _Tp1& __get(std::pair<_Tp1, _Tp2>& __pair)
-      { return __pair.first; }
-
-      template<typename _Tp1, typename _Tp2>
-      static const _Tp1& __const_get(const std::pair<_Tp1, _Tp2>& __pair)
-      { return __pair.first; }
-    };
-
-  template<>
-    struct __pair_get<1>
-    {
-      template<typename _Tp1, typename _Tp2>
-      static _Tp2& __get(std::pair<_Tp1, _Tp2>& __pair)
-      { return __pair.second; }
-
-      template<typename _Tp1, typename _Tp2>
-      static const _Tp2& __const_get(const std::pair<_Tp1, _Tp2>& __pair)
-      { return __pair.second; }
-    };
-
-  template<int _Int, class _Tp1, class _Tp2>
-    inline typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type&
-    get(std::pair<_Tp1, _Tp2>& __in)
-    { return __pair_get<_Int>::__get(__in); }
-
-  template<int _Int, class _Tp1, class _Tp2>
-    inline const typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type&
-    get(const std::pair<_Tp1, _Tp2>& __in)
-    { return __pair_get<_Int>::__const_get(__in); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _GLIBCXX_TR1_UTILITY
diff --git a/openflow/usr/include/c++/5/tr1/wchar.h b/openflow/usr/include/c++/5/tr1/wchar.h
deleted file mode 100644
index f62203c..0000000
--- a/openflow/usr/include/c++/5/tr1/wchar.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 wchar.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/wchar.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_WCHAR_H
-#define _GLIBCXX_TR1_WCHAR_H 1
-
-#include <tr1/cwchar>
-
-#endif // _GLIBCXX_TR1_WCHAR_H
diff --git a/openflow/usr/include/c++/5/tr1/wctype.h b/openflow/usr/include/c++/5/tr1/wctype.h
deleted file mode 100644
index 8e49c7d..0000000
--- a/openflow/usr/include/c++/5/tr1/wctype.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// TR1 wctype.h -*- C++ -*-
-
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr1/wctype.h
- *  This is a TR1 C++ Library header. 
- */
-
-#ifndef _GLIBCXX_TR1_WCTYPE_H
-#define _GLIBCXX_TR1_WCTYPE_H 1
-
-#include <tr1/cwctype>
-
-#endif // _GLIBCXX_TR1_WCTYPE_H
diff --git a/openflow/usr/include/c++/5/tr2/bool_set b/openflow/usr/include/c++/5/tr2/bool_set
deleted file mode 100644
index 08ff308..0000000
--- a/openflow/usr/include/c++/5/tr2/bool_set
+++ /dev/null
@@ -1,320 +0,0 @@
-// TR2 <bool_set> -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr2/bool_set
- *  This is a TR2 C++ Library header.
- */
-
-#ifndef _GLIBCXX_TR2_BOOL_SET
-#define _GLIBCXX_TR2_BOOL_SET 1
-
-#pragma GCC system_header
-
-#include <typeinfo>
-#include <iostream>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr2
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  bool_set
-   *
-   *  See N2136, Bool_set: multi-valued logic
-   *  by Hervé Brönnimann, Guillaume Melquiond, Sylvain Pion.
-   *
-   *  The implicit conversion to bool is slippery!  I may use the new
-   *  explicit conversion.  This has been specialized in the language
-   *  so that in contexts requiring a bool the conversion happens
-   *  implicitly.  Thus most objections should be eliminated.
-   */
-  class bool_set
-  {
-  public:
-
-    ///  Default constructor.
-    constexpr bool_set() : _M_b(_S_false) { }
-
-    ///  Constructor from bool.
-    constexpr bool_set(bool __t) : _M_b(_Bool_set_val(__t)) { }
-
-    // I'm not sure about this.
-    bool contains(bool_set __b) const
-    { return this->is_singleton() && this->equals(__b); }
-
-    ///  Return true if states are equal.
-    bool equals(bool_set __b) const
-    { return __b._M_b == _M_b; }
-
-    ///  Return true if this is empty.
-    bool is_emptyset() const
-    { return _M_b == _S_empty; }
-
-    ///  Return true if this is indeterminate.
-    bool is_indeterminate() const
-    { return _M_b == _S_indet; }
-
-    ///  Return true if this is false or true (normal boolean).
-    bool is_singleton() const
-    { return _M_b == _S_false || _M_b == _S_true_; }
-
-    ///  Conversion to bool.
-    //explicit
-    operator bool() const
-    {
-      if (! is_singleton())
-	throw std::bad_cast();
-      return _M_b;
-    }
-
-    ///
-    static bool_set indeterminate()
-    {
-      bool_set __b;
-      __b._M_b = _S_indet;
-      return __b;
-    }
-
-    ///
-    static bool_set emptyset()
-    {
-      bool_set __b;
-      __b._M_b = _S_empty;
-      return __b;
-    }
-
-    friend bool_set
-    operator!(bool_set __b)
-    { return __b._M_not(); }
-
-    friend bool_set
-    operator^(bool_set __s, bool_set __t)
-    { return __s._M_xor(__t); }
-
-    friend bool_set
-    operator|(bool_set __s, bool_set __t)
-    { return __s._M_or(__t); }
-
-    friend bool_set
-    operator&(bool_set __s, bool_set __t)
-    { return __s._M_and(__t); }
-
-    friend bool_set
-    operator==(bool_set __s, bool_set __t)
-    { return __s._M_eq(__t); }
-
-
-    //  These overloads replace the facet additions in the paper!
-
-    template<typename CharT, typename Traits>
-      friend std::basic_ostream<CharT, Traits>&
-      operator<<(std::basic_ostream<CharT, Traits>& __out, bool_set __b)
-      {
-	int __a = __b._M_b;
-	__out << __a;
-      }
-
-    template<typename CharT, typename Traits>
-      friend std::basic_istream<CharT, Traits>&
-      operator>>(std::basic_istream<CharT, Traits>& __in, bool_set& __b)
-      {
-	long __c;
-	__in >> __c;
-	if (__c >= _S_false && __c < _S_empty)
-	  __b._M_b = static_cast<_Bool_set_val>(__c);
-      }
-
-  private:
-
-    ///
-    enum _Bool_set_val: unsigned char
-    {
-      _S_false = 0,
-      _S_true_ = 1,
-      _S_indet = 2,
-      _S_empty = 3
-    };
-
-    ///  Bool set state.
-    _Bool_set_val _M_b;
-
-    ///
-    bool_set(_Bool_set_val __c) : _M_b(__c) { }
-
-    ///
-    bool_set _M_not() const
-    { return _S_not[this->_M_b]; }
-
-    ///
-    bool_set _M_xor(bool_set __b) const
-    { return _S_xor[this->_M_b][__b._M_b]; }
-
-    ///
-    bool_set _M_or(bool_set __b) const
-    { return _S_or[this->_M_b][__b._M_b]; }
-
-    ///
-    bool_set _M_and(bool_set __b) const
-    { return _S_and[this->_M_b][__b._M_b]; }
-
-    ///
-    bool_set _M_eq(bool_set __b) const
-    { return _S_eq[this->_M_b][__b._M_b]; }
-
-    ///
-    static _Bool_set_val _S_not[4];
-
-    ///
-    static _Bool_set_val _S_xor[4][4];
-
-    ///
-    static _Bool_set_val _S_or[4][4];
-
-    ///
-    static _Bool_set_val _S_and[4][4];
-
-    ///
-    static _Bool_set_val _S_eq[4][4];
-  };
-
-  //  20.2.3.2 bool_set values
-
-  inline bool
-  contains(bool_set __s, bool_set __t)
-  { return __s.contains(__t); }
-
-  inline bool
-  equals(bool_set __s, bool_set __t)
-  { return __s.equals(__t); }
-
-  inline bool
-  is_emptyset(bool_set __b)
-  { return __b.is_emptyset(); }
-
-  inline bool
-  is_indeterminate(bool_set __b)
-  { return __b.is_indeterminate(); }
-
-  inline bool
-  is_singleton(bool_set __b)
-  { return __b.is_singleton(); }
-
-  inline bool
-  certainly(bool_set __b)
-  { return ! __b.contains(false); }
-
-  inline bool
-  possibly(bool_set __b)
-  { return __b.contains(true); }
-
-
-  //  20.2.3.3 bool_set set operations
-
-  inline bool_set
-  set_union(bool __s, bool_set __t)
-  { return bool_set(__s) | __t; }
-
-  inline bool_set
-  set_union(bool_set __s, bool __t)
-  { return __s | bool_set(__t); }
-
-  inline bool_set
-  set_union(bool_set __s, bool_set __t)
-  { return __s | __t; }
-
-  inline bool_set
-  set_intersection(bool __s, bool_set __t)
-  { return bool_set(__s) & __t; }
-
-  inline bool_set
-  set_intersection(bool_set __s, bool __t)
-  { return __s & bool_set(__t); }
-
-  inline bool_set
-  set_intersection(bool_set __s, bool_set __t)
-  { return __s & __t; }
-
-  inline bool_set
-  set_complement(bool_set __b)
-  { return ! __b; }
-
-
-  //  20.2.3.4 bool_set logical operators
-
-  inline bool_set
-  operator^(bool __s, bool_set __t)
-  { return bool_set(__s) ^ __t; }
-
-  inline bool_set
-  operator^(bool_set __s, bool __t)
-  { return __s ^ bool_set(__t); }
-
-  inline bool_set
-  operator|(bool __s, bool_set __t)
-  { return bool_set(__s) | __t; }
-
-  inline bool_set
-  operator|(bool_set __s, bool __t)
-  { return __s | bool_set(__t); }
-
-  inline bool_set
-  operator&(bool __s, bool_set __t)
-  { return bool_set(__s) & __t; }
-
-  inline bool_set
-  operator&(bool_set __s, bool __t)
-  { return __s & bool_set(__t); }
-
-
-  //  20.2.3.5 bool_set relational operators
-
-  inline bool_set
-  operator==(bool __s, bool_set __t)
-  { return bool_set(__s) == __t; }
-
-  inline bool_set
-  operator==(bool_set __s, bool __t)
-  { return __s == bool_set(__t); }
-
-  inline bool_set
-  operator!=(bool __s, bool_set __t)
-  { return ! (__s == __t); }
-
-  inline bool_set
-  operator!=(bool_set __s, bool __t)
-  { return ! (__s == __t); }
-
-  inline bool_set
-  operator!=(bool_set __s, bool_set __t)
-  { return ! (__s == __t); }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#include <tr2/bool_set.tcc>
-
-#endif // _GLIBCXX_TR2_BOOL_SET
diff --git a/openflow/usr/include/c++/5/tr2/bool_set.tcc b/openflow/usr/include/c++/5/tr2/bool_set.tcc
deleted file mode 100644
index f627c27..0000000
--- a/openflow/usr/include/c++/5/tr2/bool_set.tcc
+++ /dev/null
@@ -1,277 +0,0 @@
-// TR2 <bool_set> support files -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr2/bool_set.tcc
- *  This is a TR2 C++ Library header.
- */
-
-#ifndef _GLIBCXX_TR2_BOOL_SET_TCC
-#define _GLIBCXX_TR2_BOOL_SET_TCC 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr2
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  bool_set::_Bool_set_val
-  bool_set::_S_not[4] =
-  { _S_true_, _S_false, _S_indet, _S_empty };
-
-  bool_set::_Bool_set_val
-  bool_set::_S_xor[4][4] =
-  { { _S_false, _S_true_, _S_indet, _S_empty },
-    { _S_true_, _S_false, _S_indet, _S_empty },
-    { _S_indet, _S_indet, _S_indet, _S_empty },
-    { _S_empty, _S_empty, _S_empty, _S_empty } };
-
-  bool_set::_Bool_set_val
-  bool_set::_S_or[4][4] =
-  { { _S_false, _S_true_, _S_indet, _S_empty },
-    { _S_true_, _S_true_, _S_true_, _S_empty },
-    { _S_indet, _S_true_, _S_indet, _S_empty },
-    { _S_empty, _S_empty, _S_empty, _S_empty } };
-
-  bool_set::_Bool_set_val
-  bool_set::_S_and[4][4] =
-  { { _S_false, _S_false, _S_false, _S_empty },
-    { _S_false, _S_true_, _S_indet, _S_empty },
-    { _S_false, _S_indet, _S_indet, _S_empty },
-    { _S_empty, _S_empty, _S_empty, _S_empty } };
-
-  bool_set::_Bool_set_val
-  bool_set::_S_eq[4][4] =
-  { { _S_true_, _S_false, _S_indet, _S_empty },
-    { _S_false, _S_true_, _S_indet, _S_empty },
-    { _S_indet, _S_indet, _S_indet, _S_empty },
-    { _S_empty, _S_empty, _S_empty, _S_empty } };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-//  I object to these things.
-//  The stuff in locale facets are for basic types.
-//  I think we could hack operator<< and operator>>.
-
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the bool @a v.  It does so by calling
-       *  num_get::do_get().
-       *
-       *  If ios_base::boolalpha is set, attempts to read
-       *  ctype<CharT>::truename() or ctype<CharT>::falsename().  Sets
-       *  @a v to true or false if successful.  Sets err to
-       *  ios_base::failbit if reading the string fails.  Sets err to
-       *  ios_base::eofbit if the stream is emptied.
-       *
-       *  If ios_base::boolalpha is not set, proceeds as with reading a long,
-       *  except if the value is 1, sets @a v to true, if the value is 0, sets
-       *  @a v to false, and otherwise set err to ios_base::failbit.
-       *
-       *  @param  in  Start of input stream.
-       *  @param  end  End of input stream.
-       *  @param  io  Source of locale and flags.
-       *  @param  err  Error flags to set.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after reading.
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, bool& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-       */
-/*
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-	   ios_base::iostate& __err, bool_set& __v) const
-    {
-      if (!(__io.flags() & ios_base::boolalpha))
-	{
-	  // Parse bool values as long.
-	  // NB: We can't just call do_get(long) here, as it might
-	  // refer to a derived class.
-	  long __l = -1;
-	  __beg = _M_extract_int(__beg, __end, __io, __err, __l);
-	  if (__c >= _S_false && __c < _S_empty)
-	    __b._M_b = static_cast<_Bool_set_val>(__c);
-	  else
-	    {
-	      // What should we do here?
-	      __v = true;
-	      __err = ios_base::failbit;
-	      if (__beg == __end)
-		__err |= ios_base::eofbit;
-	    }
-	}
-      else
-	{
-	  // Parse bool values as alphanumeric.
-	  typedef __numpunct_cache<_CharT>  __cache_type;
-	  __use_cache<__cache_type> __uc;
-	  const locale& __loc = __io._M_getloc();
-	  const __cache_type* __lc = __uc(__loc);
-
-	  bool __testf = true;
-	  bool __testt = true;
-	  bool __donef = __lc->_M_falsename_size == 0;
-	  bool __donet = __lc->_M_truename_size == 0;
-	  bool __testeof = false;
-	  size_t __n = 0;
-	  while (!__donef || !__donet)
-	    {
-	      if (__beg == __end)
-		{
-		  __testeof = true;
-		  break;
-		}
-
-	      const char_type __c = *__beg;
-
-	      if (!__donef)
-		__testf = __c == __lc->_M_falsename[__n];
-
-	      if (!__testf && __donet)
-		break;
-
-	      if (!__donet)
-		__testt = __c == __lc->_M_truename[__n];
-
-	      if (!__testt && __donef)
-		break;
-
-	      if (!__testt && !__testf)
-		break;
-
-	      ++__n;
-	      ++__beg;
-
-	      __donef = !__testf || __n >= __lc->_M_falsename_size;
-	      __donet = !__testt || __n >= __lc->_M_truename_size;
-	    }
-	  if (__testf && __n == __lc->_M_falsename_size && __n)
-	    {
-	      __v = false;
-	      if (__testt && __n == __lc->_M_truename_size)
-		__err = ios_base::failbit;
-	      else
-		__err = __testeof ? ios_base::eofbit : ios_base::goodbit;
-	    }
-	  else if (__testt && __n == __lc->_M_truename_size && __n)
-	    {
-	      __v = true;
-	      __err = __testeof ? ios_base::eofbit : ios_base::goodbit;
-	    }
-	  else
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 23. Num_get overflow result.
-	      __v = false;
-	      __err = ios_base::failbit;
-	      if (__testeof)
-		__err |= ios_base::eofbit;
-	    }
-	}
-      return __beg;
-    }
-*/
-
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  Formats the boolean @a v and inserts it into a stream.  It does so
-       *  by calling num_put::do_put().
-       *
-       *  If ios_base::boolalpha is set, writes ctype<CharT>::truename() or
-       *  ctype<CharT>::falsename().  Otherwise formats @a v as an int.
-       *
-       *  @param  s  Stream to write to.
-       *  @param  io  Source of locale and flags.
-       *  @param  fill  Char_type to use for filling.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after writing.
-      iter_type
-      put(iter_type __s, ios_base& __f, char_type __fill, bool __v) const
-      { return this->do_put(__s, __f, __fill, __v); }
-       */
-
-/*
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill, bool_set __v) const
-    {
-      const ios_base::fmtflags __flags = __io.flags();
-      if ((__flags & ios_base::boolalpha) == 0)
-	{
-	  const long __l = __v;
-	  __s = _M_insert_int(__s, __io, __fill, __l);
-	}
-      else
-	{
-	  typedef __numpunct_cache<_CharT> __cache_type;
-	  __use_cache<__cache_type> __uc;
-	  const locale& __loc = __io._M_getloc();
-	  const __cache_type* __lc = __uc(__loc);
-
-	  const _CharT* __name = __v ? __lc->_M_truename
-				     : __lc->_M_falsename;
-	  int __len = __v ? __lc->_M_truename_size
-			  : __lc->_M_falsename_size;
-
-	  const streamsize __w = __io.width();
-	  if (__w > static_cast<streamsize>(__len))
-	    {
-	      const streamsize __plen = __w - __len;
-	      _CharT* __ps
-		= static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							* __plen));
-
-	      char_traits<_CharT>::assign(__ps, __plen, __fill);
-	      __io.width(0);
-
-	      if ((__flags & ios_base::adjustfield) == ios_base::left)
-		{
-		  __s = std::__write(__s, __name, __len);
-		  __s = std::__write(__s, __ps, __plen);
-		}
-	      else
-		{
-		  __s = std::__write(__s, __ps, __plen);
-		  __s = std::__write(__s, __name, __len);
-		}
-	      return __s;
-	    }
-	  __io.width(0);
-	  __s = std::__write(__s, __name, __len);
-	}
-      return __s;
-    }
-*/
-
-#endif // _GLIBCXX_TR2_BOOL_SET_TCC
diff --git a/openflow/usr/include/c++/5/tr2/dynamic_bitset b/openflow/usr/include/c++/5/tr2/dynamic_bitset
deleted file mode 100644
index 77bddc3..0000000
--- a/openflow/usr/include/c++/5/tr2/dynamic_bitset
+++ /dev/null
@@ -1,1230 +0,0 @@
-// TR2 <dynamic_bitset> -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr2/dynamic_bitset
- *  This is a TR2 C++ Library header.
- */
-
-#ifndef _GLIBCXX_TR2_DYNAMIC_BITSET
-#define _GLIBCXX_TR2_DYNAMIC_BITSET 1
-
-#pragma GCC system_header
-
-#include <limits>
-#include <vector>
-#include <string>
-#include <memory> // For std::allocator
-#include <bits/functexcept.h>   // For invalid_argument, out_of_range,
-				// overflow_error
-#include <iosfwd>
-#include <bits/cxxabi_forced.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr2
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @defgroup dynamic_bitset Dynamic Bitset.
-   *  @ingroup extensions
-   *
-   *  @{
-   */
-
-  /**
-   *  Base class, general case.
-   *
-   *  See documentation for dynamic_bitset.
-   */
-  template<typename _WordT = unsigned long long,
-	   typename _Alloc = std::allocator<_WordT>>
-    struct __dynamic_bitset_base
-    {
-      static_assert(std::is_unsigned<_WordT>::value, "template argument "
-		    "_WordT not an unsigned integral type");
-
-      typedef _WordT block_type;
-      typedef _Alloc allocator_type;
-      typedef size_t size_type;
-
-      static const size_type _S_bits_per_block = __CHAR_BIT__ * sizeof(block_type);
-      static const size_type npos = static_cast<size_type>(-1);
-
-      /// 0 is the least significant word.
-      std::vector<block_type, allocator_type> _M_w;
-
-      explicit
-      __dynamic_bitset_base(const allocator_type& __alloc = allocator_type())
-      : _M_w(__alloc)
-      { }
-
-      explicit
-      __dynamic_bitset_base(__dynamic_bitset_base&& __b)
-      { this->_M_w.swap(__b._M_w); }
-
-      explicit
-      __dynamic_bitset_base(size_type __nbits, unsigned long long __val = 0ULL,
-			   const allocator_type& __alloc = allocator_type())
-      : _M_w(__nbits / _S_bits_per_block
-	     + (__nbits % _S_bits_per_block > 0),
-	     __val, __alloc)
-      {
-	unsigned long long __mask = ~static_cast<block_type>(0);
-	size_t __n = std::min(this->_M_w.size(),
-			      sizeof(unsigned long long) / sizeof(block_type));
-	for (size_t __i = 0; __i < __n; ++__i)
-	  {
-	    this->_M_w[__i] = (__val & __mask) >> (__i * _S_bits_per_block);
-	    __mask <<= _S_bits_per_block;
-	  }
-      }
-
-      void
-      _M_assign(const __dynamic_bitset_base& __b)
-      { this->_M_w = __b._M_w; }
-
-      void
-      _M_swap(__dynamic_bitset_base& __b)
-      { this->_M_w.swap(__b._M_w); }
-
-      void
-      _M_clear()
-      { this->_M_w.clear(); }
-
-      void
-      _M_resize(size_t __nbits, bool __value)
-      {
-	size_t __sz = __nbits / _S_bits_per_block;
-	if (__nbits % _S_bits_per_block > 0)
-	  ++__sz;
-	if (__sz != this->_M_w.size())
-	  {
-	    block_type __val = 0;
-	    if (__value)
-	      __val = std::numeric_limits<block_type>::max();
-	    this->_M_w.resize(__sz, __val);
-	  }
-      }
-
-      allocator_type
-      _M_get_allocator() const
-      { return this->_M_w.get_allocator(); }
-
-      static size_type
-      _S_whichword(size_type __pos) noexcept
-      { return __pos / _S_bits_per_block; }
-
-      static size_type
-      _S_whichbyte(size_type __pos) noexcept
-      { return (__pos % _S_bits_per_block) / __CHAR_BIT__; }
-
-      static size_type
-      _S_whichbit(size_type __pos) noexcept
-      { return __pos % _S_bits_per_block; }
-
-      static block_type
-      _S_maskbit(size_type __pos) noexcept
-      { return (static_cast<block_type>(1)) << _S_whichbit(__pos); }
-
-      block_type&
-      _M_getword(size_type __pos)
-      { return this->_M_w[_S_whichword(__pos)]; }
-
-      block_type
-      _M_getword(size_type __pos) const
-      { return this->_M_w[_S_whichword(__pos)]; }
-
-      block_type&
-      _M_hiword()
-      { return this->_M_w[_M_w.size() - 1]; }
-
-      block_type
-      _M_hiword() const
-      { return this->_M_w[_M_w.size() - 1]; }
-
-      void
-      _M_do_and(const __dynamic_bitset_base& __x)
-      {
-	if (__x._M_w.size() == this->_M_w.size())
-	  for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	    this->_M_w[__i] &= __x._M_w[__i];
-	else
-	  return;
-      }
-
-      void
-      _M_do_or(const __dynamic_bitset_base& __x)
-      {
-	if (__x._M_w.size() == this->_M_w.size())
-	  for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	    this->_M_w[__i] |= __x._M_w[__i];
-	else
-	  return;
-      }
-
-      void
-      _M_do_xor(const __dynamic_bitset_base& __x)
-      {
-	if (__x._M_w.size() == this->_M_w.size())
-	  for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	    this->_M_w[__i] ^= __x._M_w[__i];
-	else
-	  return;
-      }
-
-      void
-      _M_do_dif(const __dynamic_bitset_base& __x)
-      {
-	if (__x._M_w.size() == this->_M_w.size())
-	  for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	    this->_M_w[__i] &= ~__x._M_w[__i];
-	else
-	  return;
-      }
-
-      void
-      _M_do_left_shift(size_t __shift);
-
-      void
-      _M_do_right_shift(size_t __shift);
-
-      void
-      _M_do_flip()
-      {
-	for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	  this->_M_w[__i] = ~this->_M_w[__i];
-      }
-
-      void
-      _M_do_set()
-      {
-	for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	  this->_M_w[__i] = ~static_cast<block_type>(0);
-      }
-
-      void
-      _M_do_reset()
-      {
-	for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	  this->_M_w[__i] = static_cast<block_type>(0);
-      }
-
-      bool
-      _M_is_equal(const __dynamic_bitset_base& __x) const
-      {
-	if (__x._M_w.size() == this->_M_w.size())
-	  {
-	    for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	      if (this->_M_w[__i] != __x._M_w[__i])
-		return false;
-	    return true;
-	  }
-	else
-	  return false;
-      }
-
-      bool
-      _M_is_less(const __dynamic_bitset_base& __x) const
-      {
-	if (__x._M_w.size() == this->_M_w.size())
-	  {
-	    for (size_t __i = this->_M_w.size(); __i > 0; --__i)
-	      {
-		if (this->_M_w[__i-1] < __x._M_w[__i-1])
-		  return true;
-		else if (this->_M_w[__i-1] > __x._M_w[__i-1])
-		  return false;
-	      }
-	    return false;
-	  }
-	else
-	  return false;
-      }
-
-      size_t
-      _M_are_all_aux() const
-      {
-	for (size_t __i = 0; __i < this->_M_w.size() - 1; ++__i)
-	  if (_M_w[__i] != ~static_cast<block_type>(0))
-	    return 0;
-	return ((this->_M_w.size() - 1) * _S_bits_per_block
-		+ __builtin_popcountll(this->_M_hiword()));
-      }
-
-      bool
-      _M_is_any() const
-      {
-	for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	  if (this->_M_w[__i] != static_cast<block_type>(0))
-	    return true;
-	return false;
-      }
-
-      bool
-      _M_is_subset_of(const __dynamic_bitset_base& __b)
-      {
-	if (__b._M_w.size() == this->_M_w.size())
-	  {
-	    for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	      if (this->_M_w[__i] != (this->_M_w[__i] | __b._M_w[__i]))
-		return false;
-	    return true;
-	  }
-	else
-	  return false;
-      }
-
-      bool
-      _M_is_proper_subset_of(const __dynamic_bitset_base& __b) const
-      {
-	if (this->is_subset_of(__b))
-	  {
-	    if (*this == __b)
-	      return false;
-	    else
-	      return true;
-	  }
-	else
-	  return false;
-      }
-
-      size_t
-      _M_do_count() const
-      {
-	size_t __result = 0;
-	for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	  __result += __builtin_popcountll(this->_M_w[__i]);
-	return __result;
-      }
-
-      size_type
-      _M_size() const noexcept
-      { return this->_M_w.size(); }
-
-      unsigned long
-      _M_do_to_ulong() const;
-
-      unsigned long long
-      _M_do_to_ullong() const;
-
-      // find first "on" bit
-      size_type
-      _M_do_find_first(size_t __not_found) const;
-
-      // find the next "on" bit that follows "prev"
-      size_type
-      _M_do_find_next(size_t __prev, size_t __not_found) const;
-
-      // do append of block
-      void
-      _M_do_append_block(block_type __block, size_type __pos)
-      {
-	size_t __offset = __pos % _S_bits_per_block;
-	if (__offset == 0)
-	  this->_M_w.push_back(__block);
-	else
-	  {
-	    this->_M_hiword() |= (__block << __offset);
-	    this->_M_w.push_back(__block >> (_S_bits_per_block - __offset));
-	  }
-      }
-    };
-
-  /**
-   *  @brief  The %dynamic_bitset class represents a sequence of bits.
-   *
-   *  See N2050,
-   *  Proposal to Add a Dynamically Sizeable Bitset to the Standard Library.
-   *
-   *  In the general unoptimized case, storage is allocated in
-   *  word-sized blocks.  Let B be the number of bits in a word, then
-   *  (Nb+(B-1))/B words will be used for storage.  B - Nb%B bits are
-   *  unused.  (They are the high-order bits in the highest word.)  It
-   *  is a class invariant that those unused bits are always zero.
-   *
-   *  If you think of %dynamic_bitset as "a simple array of bits," be
-   *  aware that your mental picture is reversed: a %dynamic_bitset
-   *  behaves the same way as bits in integers do, with the bit at
-   *  index 0 in the "least significant / right-hand" position, and
-   *  the bit at index Nb-1 in the "most significant / left-hand"
-   *  position.  Thus, unlike other containers, a %dynamic_bitset's
-   *  index "counts from right to left," to put it very loosely.
-   *
-   *  This behavior is preserved when translating to and from strings.
-   *  For example, the first line of the following program probably
-   *  prints "b('a') is 0001100001" on a modern ASCII system.
-   *
-   *  @code
-   *     #include <dynamic_bitset>
-   *     #include <iostream>
-   *     #include <sstream>
-   *
-   *     using namespace std;
-   *
-   *     int main()
-   *     {
-   *         long         a = 'a';
-   *         dynamic_bitset<> b(a);
-   *
-   *         cout << "b('a') is " << b << endl;
-   *
-   *         ostringstream s;
-   *         s << b;
-   *         string  str = s.str();
-   *         cout << "index 3 in the string is " << str[3] << " but\n"
-   *              << "index 3 in the bitset is " << b[3] << endl;
-   *     }
-   *  @endcode
-   *
-   *  Most of the actual code isn't contained in %dynamic_bitset<>
-   *  itself, but in the base class __dynamic_bitset_base.  The base
-   *  class works with whole words, not with individual bits.  This
-   *  allows us to specialize __dynamic_bitset_base for the important
-   *  special case where the %dynamic_bitset is only a single word.
-   *
-   *  Extra confusion can result due to the fact that the storage for
-   *  __dynamic_bitset_base @e is a vector, and is indexed as such.  This is
-   *  carefully encapsulated.
-   */
-  template<typename _WordT = unsigned long long,
-	   typename _Alloc = std::allocator<_WordT>>
-    class dynamic_bitset
-    : private __dynamic_bitset_base<_WordT, _Alloc>
-    {
-      static_assert(std::is_unsigned<_WordT>::value, "template argument "
-		    "_WordT not an unsigned integral type");
-
-    public:
-
-      typedef __dynamic_bitset_base<_WordT, _Alloc> _Base;
-      typedef _WordT block_type;
-      typedef _Alloc allocator_type;
-      typedef size_t size_type;
-
-      static const size_type bits_per_block = __CHAR_BIT__ * sizeof(block_type);
-      // Use this: constexpr size_type std::numeric_limits<size_type>::max().
-      static const size_type npos = static_cast<size_type>(-1);
-
-    private:
-
-      //  Clear the unused bits in the uppermost word.
-      void
-      _M_do_sanitize()
-      {
-	size_type __shift = this->_M_Nb % bits_per_block;
-	if (__shift > 0)
-	  this->_M_hiword() &= ~((~static_cast<block_type>(0)) << __shift);
-      }
-
-      //  Set the unused bits in the uppermost word.
-      void
-      _M_do_fill()
-      {
-	size_type __shift = this->_M_Nb % bits_per_block;
-	if (__shift > 0)
-	  this->_M_hiword() |= ((~static_cast<block_type>(0)) << __shift);
-      }
-
-      /**
-       *  These versions of single-bit set, reset, flip, and test
-       *  do no range checking.
-       */
-      dynamic_bitset<_WordT, _Alloc>&
-      _M_unchecked_set(size_type __pos)
-      {
-	this->_M_getword(__pos) |= _Base::_S_maskbit(__pos);
-	return *this;
-      }
-
-      dynamic_bitset<_WordT, _Alloc>&
-      _M_unchecked_set(size_type __pos, int __val)
-      {
-	if (__val)
-	  this->_M_getword(__pos) |= _Base::_S_maskbit(__pos);
-	else
-	  this->_M_getword(__pos) &= ~_Base::_S_maskbit(__pos);
-	return *this;
-      }
-
-      dynamic_bitset<_WordT, _Alloc>&
-      _M_unchecked_reset(size_type __pos)
-      {
-	this->_M_getword(__pos) &= ~_Base::_S_maskbit(__pos);
-	return *this;
-      }
-
-      dynamic_bitset<_WordT, _Alloc>&
-      _M_unchecked_flip(size_type __pos)
-      {
-	this->_M_getword(__pos) ^= _Base::_S_maskbit(__pos);
-	return *this;
-      }
-
-      bool
-      _M_unchecked_test(size_type __pos) const
-      { return ((this->_M_getword(__pos) & _Base::_S_maskbit(__pos))
-		!= static_cast<_WordT>(0)); }
-
-      size_type _M_Nb;
-
-    public:
-      /**
-       *  This encapsulates the concept of a single bit.  An instance
-       *  of this class is a proxy for an actual bit; this way the
-       *  individual bit operations are done as faster word-size
-       *  bitwise instructions.
-       *
-       *  Most users will never need to use this class directly;
-       *  conversions to and from bool are automatic and should be
-       *  transparent.  Overloaded operators help to preserve the
-       *  illusion.
-       *
-       *  (On a typical system, this "bit %reference" is 64 times the
-       *  size of an actual bit.  Ha.)
-       */
-      class reference
-      {
-	friend class dynamic_bitset;
-
-	block_type *_M_wp;
-	size_type _M_bpos;
-
-	// left undefined
-	reference();
-
-      public:
-	reference(dynamic_bitset& __b, size_type __pos)
-	{
-	  this->_M_wp = &__b._M_getword(__pos);
-	  this->_M_bpos = _Base::_S_whichbit(__pos);
-	}
-
-	~reference()
-	{ }
-
-	// For b[i] = __x;
-	reference&
-	operator=(bool __x)
-	{
-	  if (__x)
-	    *this->_M_wp |= _Base::_S_maskbit(this->_M_bpos);
-	  else
-	    *this->_M_wp &= ~_Base::_S_maskbit(this->_M_bpos);
-	  return *this;
-	}
-
-	// For b[i] = b[__j];
-	reference&
-	operator=(const reference& __j)
-	{
-	  if ((*(__j._M_wp) & _Base::_S_maskbit(__j._M_bpos)))
-	    *this->_M_wp |= _Base::_S_maskbit(this->_M_bpos);
-	  else
-	    *this->_M_wp &= ~_Base::_S_maskbit(this->_M_bpos);
-	  return *this;
-	}
-
-	// Flips the bit
-	bool
-	operator~() const
-	{ return (*(_M_wp) & _Base::_S_maskbit(this->_M_bpos)) == 0; }
-
-	// For __x = b[i];
-	operator bool() const
-	{ return (*(this->_M_wp) & _Base::_S_maskbit(this->_M_bpos)) != 0; }
-
-	// For b[i].flip();
-	reference&
-	flip()
-	{
-	  *this->_M_wp ^= _Base::_S_maskbit(this->_M_bpos);
-	  return *this;
-	}
-      };
-
-      friend class reference;
-
-      typedef bool const_reference;
-
-      // 23.3.5.1 constructors:
-      /// All bits set to zero.
-      explicit
-      dynamic_bitset(const allocator_type& __alloc = allocator_type())
-      : _Base(__alloc), _M_Nb(0)
-      { }
-
-      /// Initial bits bitwise-copied from a single word (others set to zero).
-      explicit
-      dynamic_bitset(size_type __nbits, unsigned long long __val = 0ULL,
-		     const allocator_type& __alloc = allocator_type())
-      : _Base(__nbits, __val, __alloc),
-	_M_Nb(__nbits)
-      { }
-
-      dynamic_bitset(initializer_list<block_type> __il,
-		     const allocator_type& __alloc = allocator_type())
-      : _Base(__alloc), _M_Nb(0)
-      { this->append(__il); }
-
-      /**
-       *  @brief  Use a subset of a string.
-       *  @param  __str  A string of '0' and '1' characters.
-       *  @param  __pos  Index of the first character in @p __str to use.
-       *  @param  __n    The number of characters to copy.
-       *  @param  __zero The character to use for unset bits.
-       *  @param  __one  The character to use for set bits.
-       *  @param  __alloc An allocator.
-       *  @throw  std::out_of_range  If @p __pos is bigger the size of @p __str.
-       *  @throw  std::invalid_argument  If a character appears in the string
-       *                                 which is neither '0' nor '1'.
-       */
-      template<typename _CharT, typename _Traits, typename _Alloc1>
-	explicit
-	dynamic_bitset(const std::basic_string<_CharT, _Traits, _Alloc1>& __str,
-		       typename basic_string<_CharT,_Traits,_Alloc1>::size_type
-		       __pos = 0,
-		       typename basic_string<_CharT,_Traits,_Alloc1>::size_type
-		       __n = std::basic_string<_CharT, _Traits, _Alloc1>::npos,
-		       _CharT __zero = _CharT('0'), _CharT __one = _CharT('1'),
-		       const allocator_type& __alloc = allocator_type())
-	: _Base(__alloc),
-	  _M_Nb(0) // Watch for npos.
-	{
-	  if (__pos > __str.size())
-	    __throw_out_of_range(__N("dynamic_bitset::bitset initial position "
-				     "not valid"));
-
-	  // Watch for npos.
-	  this->_M_Nb = (__n > __str.size() ? __str.size() - __pos : __n);
-	  this->resize(this->_M_Nb);
-	  this->_M_copy_from_string(__str, __pos, __n,
-				    _CharT('0'), _CharT('1'));
-	}
-
-      /**
-       *  @brief  Construct from a string.
-       *  @param  __str  A string of '0' and '1' characters.
-       *  @param  __alloc An allocator.
-       *  @throw  std::invalid_argument  If a character appears in the string
-       *                                 which is neither '0' nor '1'.
-       */
-      explicit
-      dynamic_bitset(const char* __str,
-		     const allocator_type& __alloc = allocator_type())
-      : _Base(__alloc)
-      {
-	size_t __len = 0;
-	if (__str)
-	  while (__str[__len] != '\0')
-	    ++__len;
-	this->resize(__len);
-	this->_M_copy_from_ptr<char,std::char_traits<char>>
-		   (__str, __len, 0, __len, '0', '1');
-      }
-
-      /**
-       *  @brief  Copy constructor.
-       */
-      dynamic_bitset(const dynamic_bitset& __b)
-      : _Base(__b), _M_Nb(__b.size())
-      { }
-
-      /**
-       *  @brief  Move constructor.
-       */
-      dynamic_bitset(dynamic_bitset&& __b)
-      : _Base(std::forward<_Base>(__b)), _M_Nb(__b.size())
-      { }
-
-      /**
-       *  @brief  Swap with another bitset.
-       */
-      void
-      swap(dynamic_bitset& __b)
-      {
-	this->_M_swap(__b);
-	std::swap(this->_M_Nb, __b._M_Nb);
-      }
-
-      /**
-       *  @brief  Assignment.
-       */
-      dynamic_bitset&
-      operator=(const dynamic_bitset& __b)
-      {
-	if (&__b != this)
-	  {
-	    this->_M_assign(__b);
-	    this->_M_Nb = __b._M_Nb;
-	  }
-      }
-
-      /**
-       *  @brief  Move assignment.
-       */
-      dynamic_bitset&
-      operator=(dynamic_bitset&& __b)
-      {
-	this->swap(__b);
-	return *this;
-      }
-
-      /**
-       *  @brief  Return the allocator for the bitset.
-       */
-      allocator_type
-      get_allocator() const
-      { return this->_M_get_allocator(); }
-
-      /**
-       *  @brief  Resize the bitset.
-       */
-      void
-      resize(size_type __nbits, bool __value = false)
-      {
-	if (__value)
-	  this->_M_do_fill();
-	this->_M_resize(__nbits, __value);
-	this->_M_Nb = __nbits;
-	this->_M_do_sanitize();
-      }
-
-      /**
-       *  @brief  Clear the bitset.
-       */
-      void
-      clear()
-      {
-	this->_M_clear();
-	this->_M_Nb = 0;
-      }
-
-      /**
-       *  @brief  Push a bit onto the high end of the bitset.
-       */
-      void
-      push_back(bool __bit)
-      {
-	if (size_t __offset = this->size() % bits_per_block == 0)
-	  this->_M_do_append_block(block_type(0), this->_M_Nb);
-	++this->_M_Nb;
-	this->_M_unchecked_set(this->_M_Nb, __bit);
-      }
-
-      /**
-       *  @brief  Append a block.
-       */
-      void
-      append(block_type __block)
-      {
-	this->_M_do_append_block(__block, this->_M_Nb);
-	this->_M_Nb += bits_per_block;
-      }
-
-      /**
-       *  @brief
-       */
-      void
-      append(initializer_list<block_type> __il)
-      { this->append(__il.begin(), __il.end()); }
-
-      /**
-       *  @brief  Append an iterator range of blocks.
-       */
-      template <typename _BlockInputIterator>
-	void
-	append(_BlockInputIterator __first, _BlockInputIterator __last)
-	{
-	  for (; __first != __last; ++__first)
-	    this->append(*__first);
-	}
-
-      // 23.3.5.2 dynamic_bitset operations:
-      //@{
-      /**
-       *  @brief  Operations on dynamic_bitsets.
-       *  @param  __rhs  A same-sized dynamic_bitset.
-       *
-       *  These should be self-explanatory.
-       */
-      dynamic_bitset<_WordT, _Alloc>&
-      operator&=(const dynamic_bitset<_WordT, _Alloc>& __rhs)
-      {
-	this->_M_do_and(__rhs);
-	return *this;
-      }
-
-      dynamic_bitset<_WordT, _Alloc>&
-      operator&=(dynamic_bitset<_WordT, _Alloc>&& __rhs)
-      {
-	this->_M_do_and(std::move(__rhs));
-	return *this;
-      }
-
-      dynamic_bitset<_WordT, _Alloc>&
-      operator|=(const dynamic_bitset<_WordT, _Alloc>& __rhs)
-      {
-	this->_M_do_or(__rhs);
-	return *this;
-      }
-
-      dynamic_bitset<_WordT, _Alloc>&
-      operator^=(const dynamic_bitset<_WordT, _Alloc>& __rhs)
-      {
-	this->_M_do_xor(__rhs);
-	return *this;
-      }
-
-      dynamic_bitset<_WordT, _Alloc>&
-      operator-=(const dynamic_bitset<_WordT, _Alloc>& __rhs)
-      {
-	this->_M_do_dif(__rhs);
-	return *this;
-      }
-      //@}
-
-      //@{
-      /**
-       *  @brief  Operations on dynamic_bitsets.
-       *  @param  __pos The number of places to shift.
-       *
-       *  These should be self-explanatory.
-       */
-      dynamic_bitset<_WordT, _Alloc>&
-      operator<<=(size_type __pos)
-      {
-	if (__builtin_expect(__pos < this->_M_Nb, 1))
-	  {
-	    this->_M_do_left_shift(__pos);
-	    this->_M_do_sanitize();
-	  }
-	else
-	  this->_M_do_reset();
-	return *this;
-      }
-
-      dynamic_bitset<_WordT, _Alloc>&
-      operator>>=(size_type __pos)
-      {
-	if (__builtin_expect(__pos < this->_M_Nb, 1))
-	  {
-	    this->_M_do_right_shift(__pos);
-	    this->_M_do_sanitize();
-	  }
-	else
-	  this->_M_do_reset();
-	return *this;
-      }
-      //@}
-
-      // Set, reset, and flip.
-      /**
-       *  @brief Sets every bit to true.
-       */
-      dynamic_bitset<_WordT, _Alloc>&
-      set()
-      {
-	this->_M_do_set();
-	this->_M_do_sanitize();
-	return *this;
-      }
-
-      /**
-       *  @brief Sets a given bit to a particular value.
-       *  @param  __pos  The index of the bit.
-       *  @param  __val  Either true or false, defaults to true.
-       *  @throw  std::out_of_range  If @a __pos is bigger the size of the %set.
-       */
-      dynamic_bitset<_WordT, _Alloc>&
-      set(size_type __pos, bool __val = true)
-      {
-	if (__pos >= _M_Nb)
-	  __throw_out_of_range(__N("dynamic_bitset::set"));
-	return this->_M_unchecked_set(__pos, __val);
-      }
-
-      /**
-       *  @brief Sets every bit to false.
-       */
-      dynamic_bitset<_WordT, _Alloc>&
-      reset()
-      {
-	this->_M_do_reset();
-	return *this;
-      }
-
-      /**
-       *  @brief Sets a given bit to false.
-       *  @param  __pos  The index of the bit.
-       *  @throw  std::out_of_range  If @a __pos is bigger the size of the %set.
-       *
-       *  Same as writing @c set(__pos, false).
-       */
-      dynamic_bitset<_WordT, _Alloc>&
-      reset(size_type __pos)
-      {
-	if (__pos >= _M_Nb)
-	  __throw_out_of_range(__N("dynamic_bitset::reset"));
-	return this->_M_unchecked_reset(__pos);
-      }
-
-      /**
-       *  @brief Toggles every bit to its opposite value.
-       */
-      dynamic_bitset<_WordT, _Alloc>&
-      flip()
-      {
-	this->_M_do_flip();
-	this->_M_do_sanitize();
-	return *this;
-      }
-
-      /**
-       *  @brief Toggles a given bit to its opposite value.
-       *  @param  __pos  The index of the bit.
-       *  @throw  std::out_of_range  If @a __pos is bigger the size of the %set.
-       */
-      dynamic_bitset<_WordT, _Alloc>&
-      flip(size_type __pos)
-      {
-	if (__pos >= _M_Nb)
-	  __throw_out_of_range(__N("dynamic_bitset::flip"));
-	return this->_M_unchecked_flip(__pos);
-      }
-
-      /// See the no-argument flip().
-      dynamic_bitset<_WordT, _Alloc>
-      operator~() const
-      { return dynamic_bitset<_WordT, _Alloc>(*this).flip(); }
-
-      //@{
-      /**
-       *  @brief  Array-indexing support.
-       *  @param  __pos  Index into the %dynamic_bitset.
-       *  @return A bool for a 'const %dynamic_bitset'.  For non-const
-       *           bitsets, an instance of the reference proxy class.
-       *  @note These operators do no range checking and throw no
-       *         exceptions, as required by DR 11 to the standard.
-       */
-      reference
-      operator[](size_type __pos)
-      { return reference(*this,__pos); }
-
-      const_reference
-      operator[](size_type __pos) const
-      { return _M_unchecked_test(__pos); }
-      //@}
-
-      /**
-       *  @brief Returns a numerical interpretation of the %dynamic_bitset.
-       *  @return  The integral equivalent of the bits.
-       *  @throw  std::overflow_error  If there are too many bits to be
-       *                               represented in an @c unsigned @c long.
-       */
-      unsigned long
-      to_ulong() const
-      { return this->_M_do_to_ulong(); }
-
-      /**
-       *  @brief Returns a numerical interpretation of the %dynamic_bitset.
-       *  @return  The integral equivalent of the bits.
-       *  @throw  std::overflow_error  If there are too many bits to be
-       *                               represented in an @c unsigned @c long.
-       */
-      unsigned long long
-      to_ullong() const
-      { return this->_M_do_to_ullong(); }
-
-      /**
-       *  @brief Returns a character interpretation of the %dynamic_bitset.
-       *  @return  The string equivalent of the bits.
-       *
-       *  Note the ordering of the bits:  decreasing character positions
-       *  correspond to increasing bit positions (see the main class notes for
-       *  an example).
-       */
-      template<typename _CharT = char,
-	       typename _Traits = std::char_traits<_CharT>,
-	       typename _Alloc1 = std::allocator<_CharT>>
-	std::basic_string<_CharT, _Traits, _Alloc1>
-	to_string(_CharT __zero = _CharT('0'), _CharT __one = _CharT('1')) const
-	{
-	  std::basic_string<_CharT, _Traits, _Alloc1> __result;
-	  _M_copy_to_string(__result, __zero, __one);
-	  return __result;
-	}
-
-      // Helper functions for string operations.
-      template<typename _CharT, typename _Traits>
-	void
-	_M_copy_from_ptr(const _CharT*, size_t, size_t, size_t,
-			 _CharT, _CharT);
-
-      template<typename _CharT, typename _Traits, typename _Alloc1>
-	void
-	_M_copy_from_string(const std::basic_string<_CharT,
-			    _Traits, _Alloc1>& __str, size_t __pos, size_t __n,
-			    _CharT __zero = _CharT('0'),
-			    _CharT __one = _CharT('1'))
-	{ _M_copy_from_ptr<_CharT, _Traits>(__str.data(), __str.size(),
-					    __pos, __n, __zero, __one); }
-
-      template<typename _CharT, typename _Traits, typename _Alloc1>
-	void
-	_M_copy_to_string(std::basic_string<_CharT, _Traits, _Alloc1>& __str,
-			  _CharT __zero = _CharT('0'),
-			  _CharT __one = _CharT('1')) const;
-
-      /// Returns the number of bits which are set.
-      size_type
-      count() const noexcept
-      { return this->_M_do_count(); }
-
-      /// Returns the total number of bits.
-      size_type
-      size() const noexcept
-      { return this->_M_Nb; }
-
-      /// Returns the total number of blocks.
-      size_type
-      num_blocks() const noexcept
-      { return this->_M_size(); }
-
-      /// Returns true if the dynamic_bitset is empty.
-      bool
-      empty() const noexcept
-      { return (this->_M_Nb == 0); }
-
-      /// Returns the maximum size of a dynamic_bitset object having the same
-      /// type as *this.
-      /// The real answer is max() * bits_per_block but is likely to overflow.
-      constexpr size_type
-      max_size() noexcept
-      { return std::numeric_limits<block_type>::max(); }
-
-      /**
-       *  @brief Tests the value of a bit.
-       *  @param  __pos  The index of a bit.
-       *  @return  The value at @a __pos.
-       *  @throw  std::out_of_range  If @a __pos is bigger the size of the %set.
-       */
-      bool
-      test(size_type __pos) const
-      {
-	if (__pos >= _M_Nb)
-	  __throw_out_of_range(__N("dynamic_bitset::test"));
-	return _M_unchecked_test(__pos);
-      }
-
-      /**
-       *  @brief Tests whether all the bits are on.
-       *  @return  True if all the bits are set.
-       */
-      bool
-      all() const
-      { return this->_M_are_all_aux() == _M_Nb; }
-
-      /**
-       *  @brief Tests whether any of the bits are on.
-       *  @return  True if at least one bit is set.
-       */
-      bool
-      any() const
-      { return this->_M_is_any(); }
-
-      /**
-       *  @brief Tests whether any of the bits are on.
-       *  @return  True if none of the bits are set.
-       */
-      bool
-      none() const
-      { return !this->_M_is_any(); }
-
-      //@{
-      /// Self-explanatory.
-      dynamic_bitset<_WordT, _Alloc>
-      operator<<(size_type __pos) const
-      { return dynamic_bitset<_WordT, _Alloc>(*this) <<= __pos; }
-
-      dynamic_bitset<_WordT, _Alloc>
-      operator>>(size_type __pos) const
-      { return dynamic_bitset<_WordT, _Alloc>(*this) >>= __pos; }
-      //@}
-
-      /**
-       *  @brief  Finds the index of the first "on" bit.
-       *  @return  The index of the first bit set, or size() if not found.
-       *  @sa  find_next
-       */
-      size_type
-      find_first() const
-      { return this->_M_do_find_first(this->_M_Nb); }
-
-      /**
-       *  @brief  Finds the index of the next "on" bit after prev.
-       *  @return  The index of the next bit set, or size() if not found.
-       *  @param  __prev  Where to start searching.
-       *  @sa  find_first
-       */
-      size_type
-      find_next(size_t __prev) const
-      { return this->_M_do_find_next(__prev, this->_M_Nb); }
-
-      bool
-      is_subset_of(const dynamic_bitset& __b) const
-      { return this->_M_is_subset_of(__b); }
-
-      bool
-      is_proper_subset_of(const dynamic_bitset& __b) const
-      { return this->_M_is_proper_subset_of(__b); }
-
-      friend bool
-      operator==(const dynamic_bitset<_WordT, _Alloc>& __lhs,
-		 const dynamic_bitset<_WordT, _Alloc>& __rhs)
-      { return __lhs._M_is_equal(__rhs); }
-
-      friend bool
-      operator<(const dynamic_bitset<_WordT, _Alloc>& __lhs,
-		const dynamic_bitset<_WordT, _Alloc>& __rhs)
-      { return __lhs._M_is_less(__rhs); }
-    };
-
-  template<typename _WordT, typename _Alloc>
-    template<typename _CharT, typename _Traits, typename _Alloc1>
-      inline void
-      dynamic_bitset<_WordT, _Alloc>::
-      _M_copy_to_string(std::basic_string<_CharT, _Traits, _Alloc1>& __str,
-			_CharT __zero, _CharT __one) const
-      {
-	__str.assign(_M_Nb, __zero);
-	for (size_t __i = _M_Nb; __i > 0; --__i)
-	  if (_M_unchecked_test(__i - 1))
-	    _Traits::assign(__str[_M_Nb - __i], __one);
-      }
-
-
-  //@{
-  /// These comparisons for equality/inequality are, well, @e bitwise.
-
-  template<typename _WordT, typename _Alloc>
-    inline bool
-    operator!=(const dynamic_bitset<_WordT, _Alloc>& __lhs,
-	       const dynamic_bitset<_WordT, _Alloc>& __rhs)
-    { return !(__lhs == __rhs); }
-
-  template<typename _WordT, typename _Alloc>
-    inline bool
-    operator<=(const dynamic_bitset<_WordT, _Alloc>& __lhs,
-	       const dynamic_bitset<_WordT, _Alloc>& __rhs)
-    { return !(__lhs > __rhs); }
-
-  template<typename _WordT, typename _Alloc>
-    inline bool
-    operator>(const dynamic_bitset<_WordT, _Alloc>& __lhs,
-	      const dynamic_bitset<_WordT, _Alloc>& __rhs)
-    { return __rhs < __lhs; }
-
-  template<typename _WordT, typename _Alloc>
-    inline bool
-    operator>=(const dynamic_bitset<_WordT, _Alloc>& __lhs,
-	       const dynamic_bitset<_WordT, _Alloc>& __rhs)
-    { return !(__lhs < __rhs); }
-  //@}
-
-  // 23.3.5.3 bitset operations:
-  //@{
-  /**
-   *  @brief  Global bitwise operations on bitsets.
-   *  @param  __x  A bitset.
-   *  @param  __y  A bitset of the same size as @a __x.
-   *  @return  A new bitset.
-   *
-   *  These should be self-explanatory.
-   */
-  template<typename _WordT, typename _Alloc>
-    inline dynamic_bitset<_WordT, _Alloc>
-    operator&(const dynamic_bitset<_WordT, _Alloc>& __x,
-	      const dynamic_bitset<_WordT, _Alloc>& __y)
-    {
-      dynamic_bitset<_WordT, _Alloc> __result(__x);
-      __result &= __y;
-      return __result;
-    }
-
-  template<typename _WordT, typename _Alloc>
-    inline dynamic_bitset<_WordT, _Alloc>
-    operator|(const dynamic_bitset<_WordT, _Alloc>& __x,
-	      const dynamic_bitset<_WordT, _Alloc>& __y)
-    {
-      dynamic_bitset<_WordT, _Alloc> __result(__x);
-      __result |= __y;
-      return __result;
-    }
-
-  template <typename _WordT, typename _Alloc>
-    inline dynamic_bitset<_WordT, _Alloc>
-    operator^(const dynamic_bitset<_WordT, _Alloc>& __x,
-	      const dynamic_bitset<_WordT, _Alloc>& __y)
-    {
-      dynamic_bitset<_WordT, _Alloc> __result(__x);
-      __result ^= __y;
-      return __result;
-    }
-
-  template <typename _WordT, typename _Alloc>
-    inline dynamic_bitset<_WordT, _Alloc>
-    operator-(const dynamic_bitset<_WordT, _Alloc>& __x,
-	      const dynamic_bitset<_WordT, _Alloc>& __y)
-    {
-      dynamic_bitset<_WordT, _Alloc> __result(__x);
-      __result -= __y;
-      return __result;
-    }
-  //@}
-
-  /// Stream output operator for dynamic_bitset.
-  template <typename _CharT, typename _Traits,
-	    typename _WordT, typename _Alloc>
-    inline std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const dynamic_bitset<_WordT, _Alloc>& __x)
-    {
-      std::basic_string<_CharT, _Traits> __tmp;
-
-      const ctype<_CharT>& __ct = use_facet<ctype<_CharT>>(__os.getloc());
-      __x._M_copy_to_string(__tmp, __ct.widen('0'), __ct.widen('1'));
-      return __os << __tmp;
-    }
-  /**
-   *  @}
-   */
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // tr2
-} // std
-
-#include <tr2/dynamic_bitset.tcc>
-
-#endif /* _GLIBCXX_TR2_DYNAMIC_BITSET */
diff --git a/openflow/usr/include/c++/5/tr2/dynamic_bitset.tcc b/openflow/usr/include/c++/5/tr2/dynamic_bitset.tcc
deleted file mode 100644
index 6a5b2b5..0000000
--- a/openflow/usr/include/c++/5/tr2/dynamic_bitset.tcc
+++ /dev/null
@@ -1,280 +0,0 @@
-// TR2 <dynamic_bitset> -*- C++ -*-
-
-// Copyright (C) 2009-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr2/dynamic_bitset.tcc
- *  This is an internal header file, included by other library headers.
- *  Do not attempt to use it directly. @headername{tr2/dynamic_bitset}
- */
-
-#ifndef _GLIBCXX_TR2_DYNAMIC_BITSET_TCC
-#define _GLIBCXX_TR2_DYNAMIC_BITSET_TCC 1
-
-#pragma GCC system_header
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr2
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  // Definitions of non-inline functions from __dynamic_bitset_base.
-  template<typename _WordT, typename _Alloc>
-    void
-    __dynamic_bitset_base<_WordT, _Alloc>::_M_do_left_shift(size_t __shift)
-    {
-      if (__builtin_expect(__shift != 0, 1))
-	{
-	  const size_t __wshift = __shift / _S_bits_per_block;
-	  const size_t __offset = __shift % _S_bits_per_block;
-
-	  if (__offset == 0)
-	    for (size_t __n = this->_M_w.size() - 1; __n >= __wshift; --__n)
-	      this->_M_w[__n] = this->_M_w[__n - __wshift];
-	  else
-	    {
-	      const size_t __sub_offset = _S_bits_per_block - __offset;
-	      for (size_t __n = _M_w.size() - 1; __n > __wshift; --__n)
-		this->_M_w[__n] = ((this->_M_w[__n - __wshift] << __offset)
-			     | (this->_M_w[__n - __wshift - 1] >> __sub_offset));
-	      this->_M_w[__wshift] = this->_M_w[0] << __offset;
-	    }
-
-	  //// std::fill(this->_M_w.begin(), this->_M_w.begin() + __wshift,
-	  ////          static_cast<_WordT>(0));
-	}
-    }
-
-  template<typename _WordT, typename _Alloc>
-    void
-    __dynamic_bitset_base<_WordT, _Alloc>::_M_do_right_shift(size_t __shift)
-    {
-      if (__builtin_expect(__shift != 0, 1))
-	{
-	  const size_t __wshift = __shift / _S_bits_per_block;
-	  const size_t __offset = __shift % _S_bits_per_block;
-	  const size_t __limit = this->_M_w.size() - __wshift - 1;
-
-	  if (__offset == 0)
-	    for (size_t __n = 0; __n <= __limit; ++__n)
-	      this->_M_w[__n] = this->_M_w[__n + __wshift];
-	  else
-	    {
-	      const size_t __sub_offset = (_S_bits_per_block
-					   - __offset);
-	      for (size_t __n = 0; __n < __limit; ++__n)
-		this->_M_w[__n] = ((this->_M_w[__n + __wshift] >> __offset)
-			     | (this->_M_w[__n + __wshift + 1] << __sub_offset));
-	      this->_M_w[__limit] = this->_M_w[_M_w.size()-1] >> __offset;
-	    }
-
-	  ////std::fill(this->_M_w.begin() + __limit + 1, this->_M_w.end(),
-	  ////          static_cast<_WordT>(0));
-	}
-    }
-
-  template<typename _WordT, typename _Alloc>
-    unsigned long
-    __dynamic_bitset_base<_WordT, _Alloc>::_M_do_to_ulong() const
-    {
-      size_t __n = sizeof(unsigned long) / sizeof(block_type);
-      for (size_t __i = __n; __i < this->_M_w.size(); ++__i)
-	if (this->_M_w[__i])
-	  __throw_overflow_error(__N("__dynamic_bitset_base::_M_do_to_ulong"));
-      unsigned long __res = 0UL;
-      for (size_t __i = 0; __i < __n && __i < this->_M_w.size(); ++__i)
-	__res += this->_M_w[__i] << (__i * _S_bits_per_block);
-      return __res;
-    }
-
-  template<typename _WordT, typename _Alloc>
-    unsigned long long
-    __dynamic_bitset_base<_WordT, _Alloc>::_M_do_to_ullong() const
-    {
-      size_t __n = sizeof(unsigned long long) / sizeof(block_type);
-      for (size_t __i = __n; __i < this->_M_w.size(); ++__i)
-	if (this->_M_w[__i])
-	  __throw_overflow_error(__N("__dynamic_bitset_base::_M_do_to_ullong"));
-      unsigned long long __res = 0ULL;
-      for (size_t __i = 0; __i < __n && __i < this->_M_w.size(); ++__i)
-	__res += this->_M_w[__i] << (__i * _S_bits_per_block);
-      return __res;
-    }
-
-  template<typename _WordT, typename _Alloc>
-    size_t
-    __dynamic_bitset_base<_WordT, _Alloc>
-    ::_M_do_find_first(size_t __not_found) const
-    {
-      for (size_t __i = 0; __i < this->_M_w.size(); ++__i)
-	{
-	  _WordT __thisword = this->_M_w[__i];
-	  if (__thisword != static_cast<_WordT>(0))
-	    return (__i * _S_bits_per_block
-		    + __builtin_ctzll(__thisword));
-	}
-      // not found, so return an indication of failure.
-      return __not_found;
-    }
-
-  template<typename _WordT, typename _Alloc>
-    size_t
-    __dynamic_bitset_base<_WordT, _Alloc>
-    ::_M_do_find_next(size_t __prev, size_t __not_found) const
-    {
-      // make bound inclusive
-      ++__prev;
-
-      // check out of bounds
-      if (__prev >= this->_M_w.size() * _S_bits_per_block)
-	return __not_found;
-
-      // search first word
-      size_t __i = _S_whichword(__prev);
-      _WordT __thisword = this->_M_w[__i];
-
-      // mask off bits below bound
-      __thisword &= (~static_cast<_WordT>(0)) << _S_whichbit(__prev);
-
-      if (__thisword != static_cast<_WordT>(0))
-	return (__i * _S_bits_per_block
-		+ __builtin_ctzll(__thisword));
-
-      // check subsequent words
-      for (++__i; __i < this->_M_w.size(); ++__i)
-	{
-	  __thisword = this->_M_w[__i];
-	  if (__thisword != static_cast<_WordT>(0))
-	    return (__i * _S_bits_per_block
-		    + __builtin_ctzll(__thisword));
-	}
-      // not found, so return an indication of failure.
-      return __not_found;
-    } // end _M_do_find_next
-
-  // Definitions of non-inline member functions.
-  template<typename _WordT, typename _Alloc>
-    template<typename _CharT, typename _Traits>
-      void
-      dynamic_bitset<_WordT, _Alloc>::
-      _M_copy_from_ptr(const _CharT* __str, size_t __len,
-		       size_t __pos, size_t __n, _CharT __zero, _CharT __one)
-      {
-	reset();
-	const size_t __nbits = std::min(_M_Nb, std::min(__n, __len - __pos));
-	for (size_t __i = __nbits; __i > 0; --__i)
-	  {
-	    const _CharT __c = __str[__pos + __nbits - __i];
-	    if (_Traits::eq(__c, __zero))
-	      ;
-	    else if (_Traits::eq(__c, __one))
-	      _M_unchecked_set(__i - 1);
-	    else
-	      __throw_invalid_argument(__N("dynamic_bitset::_M_copy_from_ptr"));
-	  }
-      }
-
-  /**
-   *  @brief Stream input operator for dynamic_bitset.
-   *  @ingroup dynamic_bitset
-   *
-   *  Input will skip whitespace and only accept '0' and '1' characters.
-   *  The %dynamic_bitset will grow as necessary to hold the string of bits.
-   */
-  template<typename _CharT, typename _Traits,
-	   typename _WordT, typename _Alloc>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is,
-	       dynamic_bitset<_WordT, _Alloc>& __x)
-    {
-      typedef typename _Traits::char_type          char_type;
-      typedef std::basic_istream<_CharT, _Traits>  __istream_type;
-      typedef typename __istream_type::ios_base    __ios_base;
-
-      std::basic_string<_CharT, _Traits> __tmp;
-      __tmp.reserve(__x.size());
-
-      const char_type __zero = __is.widen('0');
-      const char_type __one = __is.widen('1');
-
-      typename __ios_base::iostate __state = __ios_base::goodbit;
-      typename __istream_type::sentry __sentry(__is);
-      if (__sentry)
-	{
-	  __try
-	    {
-	      while (1)
-		{
-		  static typename _Traits::int_type __eof = _Traits::eof();
-
-		  typename _Traits::int_type __c1 = __is.rdbuf()->sbumpc();
-		  if (_Traits::eq_int_type(__c1, __eof))
-		    {
-		      __state |= __ios_base::eofbit;
-		      break;
-		    }
-		  else
-		    {
-		      const char_type __c2 = _Traits::to_char_type(__c1);
-		      if (_Traits::eq(__c2, __zero))
-			__tmp.push_back(__zero);
-		      else if (_Traits::eq(__c2, __one))
-			__tmp.push_back(__one);
-		      else if (_Traits::
-			       eq_int_type(__is.rdbuf()->sputbackc(__c2),
-					   __eof))
-			{
-			  __state |= __ios_base::failbit;
-			  break;
-			}
-		      else
-			break;
-		    }
-		}
-	    }
-	  __catch(__cxxabiv1::__forced_unwind&)
-	    {
-	      __is._M_setstate(__ios_base::badbit);
-	      __throw_exception_again;
-	    }
-	  __catch(...)
-	    { __is._M_setstate(__ios_base::badbit); }
-	}
-
-      __x.resize(__tmp.size());
-
-      if (__tmp.empty() && __x.size())
-	__state |= __ios_base::failbit;
-      else
-	__x._M_copy_from_string(__tmp, static_cast<size_t>(0), __x.size(),
-				__zero, __one);
-      if (__state)
-	__is.setstate(__state);
-      return __is;
-    }
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // tr2
-} // std
-
-#endif /* _GLIBCXX_TR2_DYNAMIC_BITSET_TCC */
diff --git a/openflow/usr/include/c++/5/tr2/ratio b/openflow/usr/include/c++/5/tr2/ratio
deleted file mode 100644
index 801cdfb..0000000
--- a/openflow/usr/include/c++/5/tr2/ratio
+++ /dev/null
@@ -1,59 +0,0 @@
-// TR2 <ratio> -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr2/ratio
- *  This is a TR2 C++ Library header.
- */
-
-#include <ratio>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr2
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<intmax_t _Pn, size_t _Bit,
-	     bool = _Bit < static_cast<size_t>
-			  (std::numeric_limits<intmax_t>::digits)>
-    struct __safe_lshift
-    { static const intmax_t __value = 0; };
-
-    template<intmax_t _Pn, size_t _Bit>
-      struct __safe_lshift<_Pn, _Bit, true>
-      { static const intmax_t __value = _Pn << _Bit; };
-
-  /// Add binary prefixes (IEC 60027-2 A.2 and ISO/IEC 80000).
-  typedef ratio<__safe_lshift<1, 10>::__value, 1> kibi;
-  typedef ratio<__safe_lshift<1, 20>::__value, 1> mebi;
-  typedef ratio<__safe_lshift<1, 30>::__value, 1> gibi;
-  typedef ratio<__safe_lshift<1, 40>::__value, 1> tebi;
-  typedef ratio<__safe_lshift<1, 50>::__value, 1> pebi;
-  typedef ratio<__safe_lshift<1, 60>::__value, 1> exbi;
-  //typedef ratio<__safe_lshift<1, 70>::__value, 1> zebi;
-  //typedef ratio<__safe_lshift<1, 80>::__value, 1> yobi;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
diff --git a/openflow/usr/include/c++/5/tr2/type_traits b/openflow/usr/include/c++/5/tr2/type_traits
deleted file mode 100644
index 63a1355..0000000
--- a/openflow/usr/include/c++/5/tr2/type_traits
+++ /dev/null
@@ -1,106 +0,0 @@
-// TR2 <type_traits> -*- C++ -*-
-
-// Copyright (C) 2011-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file tr2/type_traits
- *  This is a TR2 C++ Library header.
- */
-
-#ifndef _GLIBCXX_TR2_TYPE_TRAITS
-#define _GLIBCXX_TR2_TYPE_TRAITS 1
-
-#pragma GCC system_header
-#include <type_traits>
-#include <bits/c++config.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-namespace tr2
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup metaprogramming
-   * @{
-   */
-
-  /**
-   *  See N2965: Type traits and base classes
-   *  by Michael Spertus
-   */
-
-  /**
-   *  Simple typelist. Compile-time list of types.
-   */
-  template<typename... _Elements>
-    struct __reflection_typelist;
-
-  /// Specialization for an empty typelist.
-  template<>
-    struct __reflection_typelist<>
-    {
-      typedef std::true_type					empty;
-    };
-
-  /// Partial specialization.
-  template<typename _First, typename... _Rest>
-    struct __reflection_typelist<_First, _Rest...>
-    {
-      typedef std::false_type					empty;
-
-      struct first
-      {
-	typedef _First						type;
-      };
-
-      struct rest
-      {
-	typedef __reflection_typelist<_Rest...>			type;
-      };
-    };
-
-  /// Sequence abstraction metafunctions for manipulating a typelist.
-
-
-
-  /// Enumerate all the base classes of a class. Form of a typelist.
-  template<typename _Tp>
-    struct bases
-    {
-      typedef __reflection_typelist<__bases(_Tp)...>		type;
-    };
-
-  /// Enumerate all the direct base classes of a class. Form of a typelist.
-  template<typename _Tp>
-    struct direct_bases
-    {
-      typedef __reflection_typelist<__direct_bases(_Tp)...>	type;
-    };
-
-  /// @} group metaprogramming
-
-_GLIBCXX_END_NAMESPACE_VERSION
-}
-}
-
-#endif // _GLIBCXX_TR2_TYPE_TRAITS
diff --git a/openflow/usr/include/c++/5/tuple b/openflow/usr/include/c++/5/tuple
deleted file mode 100644
index e500a76..0000000
--- a/openflow/usr/include/c++/5/tuple
+++ /dev/null
@@ -1,1182 +0,0 @@
-// <tuple> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/tuple
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_TUPLE
-#define _GLIBCXX_TUPLE 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <utility>
-#include <array>
-#include <bits/uses_allocator.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   *  @addtogroup utilities
-   *  @{
-   */
-
-  template<std::size_t _Idx, typename _Head, bool _IsEmptyNotFinal>
-    struct _Head_base;
-
-  template<std::size_t _Idx, typename _Head>
-    struct _Head_base<_Idx, _Head, true>
-    : public _Head
-    {
-      constexpr _Head_base()
-      : _Head() { }
-
-      constexpr _Head_base(const _Head& __h)
-      : _Head(__h) { }
-
-      constexpr _Head_base(const _Head_base&) = default;
-      constexpr _Head_base(_Head_base&&) = default;
-
-      template<typename _UHead>
-        constexpr _Head_base(_UHead&& __h)
-	: _Head(std::forward<_UHead>(__h)) { }
-
-      _Head_base(allocator_arg_t, __uses_alloc0)
-      : _Head() { }
-
-      template<typename _Alloc>
-	_Head_base(allocator_arg_t, __uses_alloc1<_Alloc> __a)
-	: _Head(allocator_arg, *__a._M_a) { }
-
-      template<typename _Alloc>
-	_Head_base(allocator_arg_t, __uses_alloc2<_Alloc> __a)
-	: _Head(*__a._M_a) { }
-
-      template<typename _UHead>
-	_Head_base(__uses_alloc0, _UHead&& __uhead)
-	: _Head(std::forward<_UHead>(__uhead)) { }
-
-      template<typename _Alloc, typename _UHead>
-	_Head_base(__uses_alloc1<_Alloc> __a, _UHead&& __uhead)
-	: _Head(allocator_arg, *__a._M_a, std::forward<_UHead>(__uhead)) { }
-
-      template<typename _Alloc, typename _UHead>
-	_Head_base(__uses_alloc2<_Alloc> __a, _UHead&& __uhead)
-	: _Head(std::forward<_UHead>(__uhead), *__a._M_a) { }
-
-      static constexpr _Head&
-      _M_head(_Head_base& __b) noexcept { return __b; }
-
-      static constexpr const _Head&
-      _M_head(const _Head_base& __b) noexcept { return __b; }
-    };
-
-  template<std::size_t _Idx, typename _Head>
-    struct _Head_base<_Idx, _Head, false>
-    {
-      constexpr _Head_base()
-      : _M_head_impl() { }
-
-      constexpr _Head_base(const _Head& __h)
-      : _M_head_impl(__h) { }
-
-      constexpr _Head_base(const _Head_base&) = default;
-      constexpr _Head_base(_Head_base&&) = default;
-
-      template<typename _UHead>
-        constexpr _Head_base(_UHead&& __h)
-	: _M_head_impl(std::forward<_UHead>(__h)) { }
-
-      _Head_base(allocator_arg_t, __uses_alloc0)
-      : _M_head_impl() { }
-
-      template<typename _Alloc>
-	_Head_base(allocator_arg_t, __uses_alloc1<_Alloc> __a)
-	: _M_head_impl(allocator_arg, *__a._M_a) { }
-
-      template<typename _Alloc>
-	_Head_base(allocator_arg_t, __uses_alloc2<_Alloc> __a)
-	: _M_head_impl(*__a._M_a) { }
-
-      template<typename _UHead>
-	_Head_base(__uses_alloc0, _UHead&& __uhead)
-	: _M_head_impl(std::forward<_UHead>(__uhead)) { }
-
-      template<typename _Alloc, typename _UHead>
-	_Head_base(__uses_alloc1<_Alloc> __a, _UHead&& __uhead)
-	: _M_head_impl(allocator_arg, *__a._M_a, std::forward<_UHead>(__uhead))
-	{ }
-
-      template<typename _Alloc, typename _UHead>
-	_Head_base(__uses_alloc2<_Alloc> __a, _UHead&& __uhead)
-	: _M_head_impl(std::forward<_UHead>(__uhead), *__a._M_a) { }
-
-      static constexpr _Head&
-      _M_head(_Head_base& __b) noexcept { return __b._M_head_impl; }
-
-      static constexpr const _Head&
-      _M_head(const _Head_base& __b) noexcept { return __b._M_head_impl; }
-
-      _Head _M_head_impl;
-    };
-
-  /**
-   * Contains the actual implementation of the @c tuple template, stored
-   * as a recursive inheritance hierarchy from the first element (most
-   * derived class) to the last (least derived class). The @c Idx
-   * parameter gives the 0-based index of the element stored at this
-   * point in the hierarchy; we use it to implement a constant-time
-   * get() operation.
-   */
-  template<std::size_t _Idx, typename... _Elements>
-    struct _Tuple_impl; 
-
-  template<typename _Tp>
-    struct __is_empty_non_tuple : is_empty<_Tp> { };
-
-  // Using EBO for elements that are tuples causes ambiguous base errors.
-  template<typename _El0, typename... _El>
-    struct __is_empty_non_tuple<tuple<_El0, _El...>> : false_type { };
-
-  // Use the Empty Base-class Optimization for empty, non-final types.
-  template<typename _Tp>
-    using __empty_not_final
-    = typename conditional<__is_final(_Tp), false_type,
-			   __is_empty_non_tuple<_Tp>>::type;
-
-  /**
-   * Recursive tuple implementation. Here we store the @c Head element
-   * and derive from a @c Tuple_impl containing the remaining elements
-   * (which contains the @c Tail).
-   */
-  template<std::size_t _Idx, typename _Head, typename... _Tail>
-    struct _Tuple_impl<_Idx, _Head, _Tail...>
-    : public _Tuple_impl<_Idx + 1, _Tail...>,
-      private _Head_base<_Idx, _Head, __empty_not_final<_Head>::value>
-    {
-      template<std::size_t, typename...> friend class _Tuple_impl;
-
-      typedef _Tuple_impl<_Idx + 1, _Tail...> _Inherited;
-      typedef _Head_base<_Idx, _Head, __empty_not_final<_Head>::value> _Base;
-
-      static constexpr _Head&  
-      _M_head(_Tuple_impl& __t) noexcept { return _Base::_M_head(__t); }
-
-      static constexpr const _Head&
-      _M_head(const _Tuple_impl& __t) noexcept { return _Base::_M_head(__t); }
-
-      static constexpr _Inherited&
-      _M_tail(_Tuple_impl& __t) noexcept { return __t; }
-
-      static constexpr const _Inherited&
-      _M_tail(const _Tuple_impl& __t) noexcept { return __t; }
-
-      constexpr _Tuple_impl()
-      : _Inherited(), _Base() { }
-
-      explicit 
-      constexpr _Tuple_impl(const _Head& __head, const _Tail&... __tail)
-      : _Inherited(__tail...), _Base(__head) { }
-
-      template<typename _UHead, typename... _UTail, typename = typename
-               enable_if<sizeof...(_Tail) == sizeof...(_UTail)>::type> 
-        explicit
-        constexpr _Tuple_impl(_UHead&& __head, _UTail&&... __tail)
-	: _Inherited(std::forward<_UTail>(__tail)...),
-	  _Base(std::forward<_UHead>(__head)) { }
-
-      constexpr _Tuple_impl(const _Tuple_impl&) = default;
-
-      constexpr
-      _Tuple_impl(_Tuple_impl&& __in)
-      noexcept(__and_<is_nothrow_move_constructible<_Head>,
-	              is_nothrow_move_constructible<_Inherited>>::value)
-      : _Inherited(std::move(_M_tail(__in))), 
-	_Base(std::forward<_Head>(_M_head(__in))) { }
-
-      template<typename... _UElements>
-        constexpr _Tuple_impl(const _Tuple_impl<_Idx, _UElements...>& __in)
-	: _Inherited(_Tuple_impl<_Idx, _UElements...>::_M_tail(__in)),
-	  _Base(_Tuple_impl<_Idx, _UElements...>::_M_head(__in)) { }
-
-      template<typename _UHead, typename... _UTails>
-        constexpr _Tuple_impl(_Tuple_impl<_Idx, _UHead, _UTails...>&& __in)
-	: _Inherited(std::move
-		     (_Tuple_impl<_Idx, _UHead, _UTails...>::_M_tail(__in))),
-	  _Base(std::forward<_UHead>
-		(_Tuple_impl<_Idx, _UHead, _UTails...>::_M_head(__in))) { }
-
-      template<typename _Alloc>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a)
-	: _Inherited(__tag, __a),
-          _Base(__tag, __use_alloc<_Head>(__a)) { }
-
-      template<typename _Alloc>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-		    const _Head& __head, const _Tail&... __tail)
-	: _Inherited(__tag, __a, __tail...),
-          _Base(__use_alloc<_Head, _Alloc, _Head>(__a), __head) { }
-
-      template<typename _Alloc, typename _UHead, typename... _UTail,
-               typename = typename enable_if<sizeof...(_Tail)
-					     == sizeof...(_UTail)>::type>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            _UHead&& __head, _UTail&&... __tail)
-	: _Inherited(__tag, __a, std::forward<_UTail>(__tail)...),
-          _Base(__use_alloc<_Head, _Alloc, _UHead>(__a),
-	        std::forward<_UHead>(__head)) { }
-
-      template<typename _Alloc>
-        _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            const _Tuple_impl& __in)
-	: _Inherited(__tag, __a, _M_tail(__in)), 
-          _Base(__use_alloc<_Head, _Alloc, _Head>(__a), _M_head(__in)) { }
-
-      template<typename _Alloc>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            _Tuple_impl&& __in)
-	: _Inherited(__tag, __a, std::move(_M_tail(__in))), 
-	  _Base(__use_alloc<_Head, _Alloc, _Head>(__a),
-	        std::forward<_Head>(_M_head(__in))) { }
-
-      template<typename _Alloc, typename... _UElements>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            const _Tuple_impl<_Idx, _UElements...>& __in)
-	: _Inherited(__tag, __a,
-		     _Tuple_impl<_Idx, _UElements...>::_M_tail(__in)),
-	  _Base(__use_alloc<_Head, _Alloc, _Head>(__a),
-		_Tuple_impl<_Idx, _UElements...>::_M_head(__in)) { }
-
-      template<typename _Alloc, typename _UHead, typename... _UTails>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            _Tuple_impl<_Idx, _UHead, _UTails...>&& __in)
-	: _Inherited(__tag, __a, std::move
-		     (_Tuple_impl<_Idx, _UHead, _UTails...>::_M_tail(__in))),
-	  _Base(__use_alloc<_Head, _Alloc, _UHead>(__a),
-                std::forward<_UHead>
-		(_Tuple_impl<_Idx, _UHead, _UTails...>::_M_head(__in))) { }
-
-      _Tuple_impl&
-      operator=(const _Tuple_impl& __in)
-      {
-	_M_head(*this) = _M_head(__in);
-	_M_tail(*this) = _M_tail(__in);
-	return *this;
-      }
-
-      _Tuple_impl&
-      operator=(_Tuple_impl&& __in)
-      noexcept(__and_<is_nothrow_move_assignable<_Head>,
-	              is_nothrow_move_assignable<_Inherited>>::value)
-      {
-	_M_head(*this) = std::forward<_Head>(_M_head(__in));
-	_M_tail(*this) = std::move(_M_tail(__in));
-	return *this;
-      }
-
-      template<typename... _UElements>
-        _Tuple_impl&
-        operator=(const _Tuple_impl<_Idx, _UElements...>& __in)
-        {
-	  _M_head(*this) = _Tuple_impl<_Idx, _UElements...>::_M_head(__in);
-	  _M_tail(*this) = _Tuple_impl<_Idx, _UElements...>::_M_tail(__in);
-	  return *this;
-	}
-
-      template<typename _UHead, typename... _UTails>
-        _Tuple_impl&
-        operator=(_Tuple_impl<_Idx, _UHead, _UTails...>&& __in)
-        {
-	  _M_head(*this) = std::forward<_UHead>
-	    (_Tuple_impl<_Idx, _UHead, _UTails...>::_M_head(__in));
-	  _M_tail(*this) = std::move
-	    (_Tuple_impl<_Idx, _UHead, _UTails...>::_M_tail(__in));
-	  return *this;
-	}
-
-    protected:
-      void
-      _M_swap(_Tuple_impl& __in)
-      noexcept(noexcept(swap(std::declval<_Head&>(),
-			     std::declval<_Head&>()))
-	       && noexcept(_M_tail(__in)._M_swap(_M_tail(__in))))
-      {
-	using std::swap;
-	swap(_M_head(*this), _M_head(__in));
-	_Inherited::_M_swap(_M_tail(__in));
-      }
-    };
-
-  // Basis case of inheritance recursion.
-  template<std::size_t _Idx, typename _Head>
-    struct _Tuple_impl<_Idx, _Head>
-    : private _Head_base<_Idx, _Head, __empty_not_final<_Head>::value>
-    {
-      template<std::size_t, typename...> friend class _Tuple_impl;
-
-      typedef _Head_base<_Idx, _Head, __empty_not_final<_Head>::value> _Base;
-
-      static constexpr _Head&
-      _M_head(_Tuple_impl& __t) noexcept { return _Base::_M_head(__t); }
-
-      static constexpr const _Head&
-      _M_head(const _Tuple_impl& __t) noexcept { return _Base::_M_head(__t); }
-
-      constexpr _Tuple_impl()
-      : _Base() { }
-
-      explicit
-      constexpr _Tuple_impl(const _Head& __head)
-      : _Base(__head) { }
-
-      template<typename _UHead>
-        explicit
-        constexpr _Tuple_impl(_UHead&& __head)
-	: _Base(std::forward<_UHead>(__head)) { }
-
-      constexpr _Tuple_impl(const _Tuple_impl&) = default;
-
-      constexpr
-      _Tuple_impl(_Tuple_impl&& __in)
-      noexcept(is_nothrow_move_constructible<_Head>::value)
-      : _Base(std::forward<_Head>(_M_head(__in))) { }
-
-      template<typename _UHead>
-        constexpr _Tuple_impl(const _Tuple_impl<_Idx, _UHead>& __in)
-	: _Base(_Tuple_impl<_Idx, _UHead>::_M_head(__in)) { }
-
-      template<typename _UHead>
-        constexpr _Tuple_impl(_Tuple_impl<_Idx, _UHead>&& __in)
-	: _Base(std::forward<_UHead>(_Tuple_impl<_Idx, _UHead>::_M_head(__in)))
-	{ }
-
-      template<typename _Alloc>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a)
-	: _Base(__tag, __use_alloc<_Head>(__a)) { }
-
-      template<typename _Alloc>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-		    const _Head& __head)
-	: _Base(__use_alloc<_Head, _Alloc, _Head>(__a), __head) { }
-
-      template<typename _Alloc, typename _UHead>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            _UHead&& __head)
-	: _Base(__use_alloc<_Head, _Alloc, _UHead>(__a),
-	        std::forward<_UHead>(__head)) { }
-
-      template<typename _Alloc>
-        _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            const _Tuple_impl& __in)
-	: _Base(__use_alloc<_Head, _Alloc, _Head>(__a), _M_head(__in)) { }
-
-      template<typename _Alloc>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            _Tuple_impl&& __in)
-	: _Base(__use_alloc<_Head, _Alloc, _Head>(__a),
-	        std::forward<_Head>(_M_head(__in))) { }
-
-      template<typename _Alloc, typename _UHead>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            const _Tuple_impl<_Idx, _UHead>& __in)
-	: _Base(__use_alloc<_Head, _Alloc, _Head>(__a),
-		_Tuple_impl<_Idx, _UHead>::_M_head(__in)) { }
-
-      template<typename _Alloc, typename _UHead>
-	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            _Tuple_impl<_Idx, _UHead>&& __in)
-	: _Base(__use_alloc<_Head, _Alloc, _UHead>(__a),
-                std::forward<_UHead>(_Tuple_impl<_Idx, _UHead>::_M_head(__in)))
-	{ }
-
-      _Tuple_impl&
-      operator=(const _Tuple_impl& __in)
-      {
-	_M_head(*this) = _M_head(__in);
-	return *this;
-      }
-
-      _Tuple_impl&
-      operator=(_Tuple_impl&& __in)
-      noexcept(is_nothrow_move_assignable<_Head>::value)
-      {
-	_M_head(*this) = std::forward<_Head>(_M_head(__in));
-	return *this;
-      }
-
-      template<typename _UHead>
-        _Tuple_impl&
-        operator=(const _Tuple_impl<_Idx, _UHead>& __in)
-        {
-	  _M_head(*this) = _Tuple_impl<_Idx, _UHead>::_M_head(__in);
-	  return *this;
-	}
-
-      template<typename _UHead>
-        _Tuple_impl&
-        operator=(_Tuple_impl<_Idx, _UHead>&& __in)
-        {
-	  _M_head(*this)
-	    = std::forward<_UHead>(_Tuple_impl<_Idx, _UHead>::_M_head(__in));
-	  return *this;
-	}
-
-    protected:
-      void
-      _M_swap(_Tuple_impl& __in)
-      noexcept(noexcept(swap(std::declval<_Head&>(), std::declval<_Head&>())))
-      {
-	using std::swap;
-	swap(_M_head(*this), _M_head(__in));
-      }
-    };
-
-  /// Primary class template, tuple
-  template<typename... _Elements> 
-    class tuple : public _Tuple_impl<0, _Elements...>
-    {
-      typedef _Tuple_impl<0, _Elements...> _Inherited;
-
-    public:
-      constexpr tuple()
-      : _Inherited() { }
-
-      explicit
-      constexpr tuple(const _Elements&... __elements)
-      : _Inherited(__elements...) { }
-
-      template<typename... _UElements, typename = typename
-        enable_if<__and_<is_convertible<_UElements,
-					_Elements>...>::value>::type>
-	explicit
-        constexpr tuple(_UElements&&... __elements)
-	: _Inherited(std::forward<_UElements>(__elements)...) {	}
-
-      constexpr tuple(const tuple&) = default;
-
-      constexpr tuple(tuple&&) = default; 
-
-      template<typename... _UElements, typename = typename
-        enable_if<__and_<is_convertible<const _UElements&,
-					_Elements>...>::value>::type>
-        constexpr tuple(const tuple<_UElements...>& __in)
-        : _Inherited(static_cast<const _Tuple_impl<0, _UElements...>&>(__in))
-        { }
-
-      template<typename... _UElements, typename = typename
-        enable_if<__and_<is_convertible<_UElements,
-					_Elements>...>::value>::type>
-        constexpr tuple(tuple<_UElements...>&& __in)
-        : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { }
-
-      // Allocator-extended constructors.
-
-      template<typename _Alloc>
-	tuple(allocator_arg_t __tag, const _Alloc& __a)
-	: _Inherited(__tag, __a) { }
-
-      template<typename _Alloc>
-	tuple(allocator_arg_t __tag, const _Alloc& __a,
-	      const _Elements&... __elements)
-	: _Inherited(__tag, __a, __elements...) { }
-
-      template<typename _Alloc, typename... _UElements, typename = typename
-	       enable_if<sizeof...(_UElements)
-			 == sizeof...(_Elements)>::type>
-	tuple(allocator_arg_t __tag, const _Alloc& __a,
-	      _UElements&&... __elements)
-	: _Inherited(__tag, __a, std::forward<_UElements>(__elements)...)
-       	{ }
-
-      template<typename _Alloc>
-	tuple(allocator_arg_t __tag, const _Alloc& __a, const tuple& __in)
-	: _Inherited(__tag, __a, static_cast<const _Inherited&>(__in)) { }
-
-      template<typename _Alloc>
-	tuple(allocator_arg_t __tag, const _Alloc& __a, tuple&& __in)
-	: _Inherited(__tag, __a, static_cast<_Inherited&&>(__in)) { }
-
-      template<typename _Alloc, typename... _UElements, typename = typename
-	       enable_if<sizeof...(_UElements)
-			 == sizeof...(_Elements)>::type>
-	tuple(allocator_arg_t __tag, const _Alloc& __a,
-	      const tuple<_UElements...>& __in)
-	: _Inherited(__tag, __a,
-	             static_cast<const _Tuple_impl<0, _UElements...>&>(__in))
-	{ }
-
-      template<typename _Alloc, typename... _UElements, typename = typename
-	       enable_if<sizeof...(_UElements)
-			 == sizeof...(_Elements)>::type>
-	tuple(allocator_arg_t __tag, const _Alloc& __a,
-	      tuple<_UElements...>&& __in)
-	: _Inherited(__tag, __a,
-	             static_cast<_Tuple_impl<0, _UElements...>&&>(__in))
-	{ }
-
-      tuple&
-      operator=(const tuple& __in)
-      {
-	static_cast<_Inherited&>(*this) = __in;
-	return *this;
-      }
-
-      tuple&
-      operator=(tuple&& __in)
-      noexcept(is_nothrow_move_assignable<_Inherited>::value)
-      {
-	static_cast<_Inherited&>(*this) = std::move(__in);
-	return *this;
-      }
-
-      template<typename... _UElements, typename = typename
-	       enable_if<sizeof...(_UElements)
-			 == sizeof...(_Elements)>::type>
-        tuple&
-        operator=(const tuple<_UElements...>& __in)
-        {
-	  static_cast<_Inherited&>(*this) = __in;
-	  return *this;
-	}
-
-      template<typename... _UElements, typename = typename
-	       enable_if<sizeof...(_UElements)
-			 == sizeof...(_Elements)>::type>
-        tuple&
-        operator=(tuple<_UElements...>&& __in)
-        {
-	  static_cast<_Inherited&>(*this) = std::move(__in);
-	  return *this;
-	}
-
-      void
-      swap(tuple& __in)
-      noexcept(noexcept(__in._M_swap(__in)))
-      { _Inherited::_M_swap(__in); }
-    };
-
-  // Explicit specialization, zero-element tuple.
-  template<>  
-    class tuple<>
-    {
-    public:
-      void swap(tuple&) noexcept { /* no-op */ }
-    };
-
-  /// Partial specialization, 2-element tuple.
-  /// Includes construction and assignment from a pair.
-  template<typename _T1, typename _T2>
-    class tuple<_T1, _T2> : public _Tuple_impl<0, _T1, _T2>
-    {
-      typedef _Tuple_impl<0, _T1, _T2> _Inherited;
-
-    public:
-      constexpr tuple()
-      : _Inherited() { }
-
-      explicit
-      constexpr tuple(const _T1& __a1, const _T2& __a2)
-      : _Inherited(__a1, __a2) { }
-
-      template<typename _U1, typename _U2, typename = typename
-	       enable_if<__and_<is_convertible<_U1, _T1>,
-				is_convertible<_U2, _T2>>::value>::type>
-        explicit
-        constexpr tuple(_U1&& __a1, _U2&& __a2)
-	: _Inherited(std::forward<_U1>(__a1), std::forward<_U2>(__a2)) { }
-
-      constexpr tuple(const tuple&) = default;
-
-      constexpr tuple(tuple&&) = default;
-
-      template<typename _U1, typename _U2, typename = typename
-	enable_if<__and_<is_convertible<const _U1&, _T1>,
-			 is_convertible<const _U2&, _T2>>::value>::type>
-        constexpr tuple(const tuple<_U1, _U2>& __in)
-	: _Inherited(static_cast<const _Tuple_impl<0, _U1, _U2>&>(__in)) { }
-
-      template<typename _U1, typename _U2, typename = typename
-	       enable_if<__and_<is_convertible<_U1, _T1>,
-				is_convertible<_U2, _T2>>::value>::type>
-        constexpr tuple(tuple<_U1, _U2>&& __in)
-	: _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) { }
-
-      template<typename _U1, typename _U2, typename = typename
-	enable_if<__and_<is_convertible<const _U1&, _T1>,
-			 is_convertible<const _U2&, _T2>>::value>::type>
-        constexpr tuple(const pair<_U1, _U2>& __in)
-	: _Inherited(__in.first, __in.second) { }
-
-      template<typename _U1, typename _U2, typename = typename
-	       enable_if<__and_<is_convertible<_U1, _T1>,
-				is_convertible<_U2, _T2>>::value>::type>
-        constexpr tuple(pair<_U1, _U2>&& __in)
-	: _Inherited(std::forward<_U1>(__in.first),
-		     std::forward<_U2>(__in.second)) { }
-
-      // Allocator-extended constructors.
-
-      template<typename _Alloc>
-	tuple(allocator_arg_t __tag, const _Alloc& __a)
-	: _Inherited(__tag, __a) { }
-
-      template<typename _Alloc>
-	tuple(allocator_arg_t __tag, const _Alloc& __a,
-	      const _T1& __a1, const _T2& __a2)
-	: _Inherited(__tag, __a, __a1, __a2) { }
-
-      template<typename _Alloc, typename _U1, typename _U2>
-	tuple(allocator_arg_t __tag, const _Alloc& __a, _U1&& __a1, _U2&& __a2)
-	: _Inherited(__tag, __a, std::forward<_U1>(__a1),
-	             std::forward<_U2>(__a2)) { }
-
-      template<typename _Alloc>
-	tuple(allocator_arg_t __tag, const _Alloc& __a, const tuple& __in)
-	: _Inherited(__tag, __a, static_cast<const _Inherited&>(__in)) { }
-
-      template<typename _Alloc>
-	tuple(allocator_arg_t __tag, const _Alloc& __a, tuple&& __in)
-	: _Inherited(__tag, __a, static_cast<_Inherited&&>(__in)) { }
-
-      template<typename _Alloc, typename _U1, typename _U2>
-	tuple(allocator_arg_t __tag, const _Alloc& __a,
-	      const tuple<_U1, _U2>& __in)
-	: _Inherited(__tag, __a,
-	             static_cast<const _Tuple_impl<0, _U1, _U2>&>(__in))
-	{ }
-
-      template<typename _Alloc, typename _U1, typename _U2>
-	tuple(allocator_arg_t __tag, const _Alloc& __a, tuple<_U1, _U2>&& __in)
-	: _Inherited(__tag, __a, static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in))
-	{ }
-
-      template<typename _Alloc, typename _U1, typename _U2>
-        tuple(allocator_arg_t __tag, const _Alloc& __a,
-	      const pair<_U1, _U2>& __in)
-	: _Inherited(__tag, __a, __in.first, __in.second) { }
-
-      template<typename _Alloc, typename _U1, typename _U2>
-        tuple(allocator_arg_t __tag, const _Alloc& __a, pair<_U1, _U2>&& __in)
-	: _Inherited(__tag, __a, std::forward<_U1>(__in.first),
-		     std::forward<_U2>(__in.second)) { }
-
-      tuple&
-      operator=(const tuple& __in)
-      {
-	static_cast<_Inherited&>(*this) = __in;
-	return *this;
-      }
-
-      tuple&
-      operator=(tuple&& __in)
-      noexcept(is_nothrow_move_assignable<_Inherited>::value)
-      {
-	static_cast<_Inherited&>(*this) = std::move(__in);
-	return *this;
-      }
-
-      template<typename _U1, typename _U2>
-        tuple&
-        operator=(const tuple<_U1, _U2>& __in)
-        {
-	  static_cast<_Inherited&>(*this) = __in;
-	  return *this;
-	}
-
-      template<typename _U1, typename _U2>
-        tuple&
-        operator=(tuple<_U1, _U2>&& __in)
-        {
-	  static_cast<_Inherited&>(*this) = std::move(__in);
-	  return *this;
-	}
-
-      template<typename _U1, typename _U2>
-        tuple&
-        operator=(const pair<_U1, _U2>& __in)
-        {
-	  this->_M_head(*this) = __in.first;
-	  this->_M_tail(*this)._M_head(*this) = __in.second;
-	  return *this;
-	}
-
-      template<typename _U1, typename _U2>
-        tuple&
-        operator=(pair<_U1, _U2>&& __in)
-        {
-	  this->_M_head(*this) = std::forward<_U1>(__in.first);
-	  this->_M_tail(*this)._M_head(*this) = std::forward<_U2>(__in.second);
-	  return *this;
-	}
-
-      void
-      swap(tuple& __in)
-      noexcept(noexcept(__in._M_swap(__in)))
-      { _Inherited::_M_swap(__in); }
-    };
-
-
-  /// Gives the type of the ith element of a given tuple type.
-  template<std::size_t __i, typename _Tp>
-    struct tuple_element;
-
-  /**
-   * Recursive case for tuple_element: strip off the first element in
-   * the tuple and retrieve the (i-1)th element of the remaining tuple.
-   */
-  template<std::size_t __i, typename _Head, typename... _Tail>
-    struct tuple_element<__i, tuple<_Head, _Tail...> >
-    : tuple_element<__i - 1, tuple<_Tail...> > { };
-
-  /**
-   * Basis case for tuple_element: The first element is the one we're seeking.
-   */
-  template<typename _Head, typename... _Tail>
-    struct tuple_element<0, tuple<_Head, _Tail...> >
-    {
-      typedef _Head type;
-    };
-
-  // Duplicate of C++14's tuple_element_t for internal use in C++11 mode
-  template<std::size_t __i, typename _Tp>
-    using __tuple_element_t = typename tuple_element<__i, _Tp>::type;
-
-  template<std::size_t __i, typename _Tp>
-    struct tuple_element<__i, const _Tp>
-    {
-      typedef typename add_const<__tuple_element_t<__i, _Tp>>::type type;
-    };
-
-  template<std::size_t __i, typename _Tp>
-    struct tuple_element<__i, volatile _Tp>
-    {
-      typedef typename add_volatile<__tuple_element_t<__i, _Tp>>::type type;
-    };
-
-  template<std::size_t __i, typename _Tp>
-    struct tuple_element<__i, const volatile _Tp>
-    {
-      typedef typename add_cv<__tuple_element_t<__i, _Tp>>::type type;
-    };
-
-#if __cplusplus > 201103L
-#define __cpp_lib_tuple_element_t 201402
-
-  template<std::size_t __i, typename _Tp>
-    using tuple_element_t = typename tuple_element<__i, _Tp>::type;
-#endif
-
-  /// Finds the size of a given tuple type.
-  template<typename _Tp>
-    struct tuple_size;
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 2313. tuple_size should always derive from integral_constant<size_t, N>
-  template<typename _Tp>
-    struct tuple_size<const _Tp>
-    : integral_constant<size_t, tuple_size<_Tp>::value> { };
-
-  template<typename _Tp>
-    struct tuple_size<volatile _Tp>
-    : integral_constant<size_t, tuple_size<_Tp>::value> { };
-
-  template<typename _Tp>
-    struct tuple_size<const volatile _Tp>
-    : integral_constant<size_t, tuple_size<_Tp>::value> { };
-
-  /// class tuple_size
-  template<typename... _Elements>
-    struct tuple_size<tuple<_Elements...>>
-    : public integral_constant<std::size_t, sizeof...(_Elements)> { };
-
-  template<std::size_t __i, typename _Head, typename... _Tail>
-    constexpr _Head&
-    __get_helper(_Tuple_impl<__i, _Head, _Tail...>& __t) noexcept
-    { return _Tuple_impl<__i, _Head, _Tail...>::_M_head(__t); }
-
-  template<std::size_t __i, typename _Head, typename... _Tail>
-    constexpr const _Head&
-    __get_helper(const _Tuple_impl<__i, _Head, _Tail...>& __t) noexcept
-    { return _Tuple_impl<__i, _Head, _Tail...>::_M_head(__t); }
-
-  /// Return a reference to the ith element of a tuple.
-  template<std::size_t __i, typename... _Elements>
-    constexpr __tuple_element_t<__i, tuple<_Elements...>>&
-    get(tuple<_Elements...>& __t) noexcept
-    { return std::__get_helper<__i>(__t); }
-
-  /// Return a const reference to the ith element of a const tuple.
-  template<std::size_t __i, typename... _Elements>
-    constexpr const __tuple_element_t<__i, tuple<_Elements...>>&
-    get(const tuple<_Elements...>& __t) noexcept
-    { return std::__get_helper<__i>(__t); }
-
-  /// Return an rvalue reference to the ith element of a tuple rvalue.
-  template<std::size_t __i, typename... _Elements>
-    constexpr __tuple_element_t<__i, tuple<_Elements...>>&&
-    get(tuple<_Elements...>&& __t) noexcept
-    {
-      typedef __tuple_element_t<__i, tuple<_Elements...>> __element_type;
-      return std::forward<__element_type&&>(std::get<__i>(__t));
-    }
-
-#if __cplusplus > 201103L
-
-#define __cpp_lib_tuples_by_type 201304
-
-  template<typename _Head, size_t __i, typename... _Tail>
-    constexpr _Head&
-    __get_helper2(_Tuple_impl<__i, _Head, _Tail...>& __t) noexcept
-    { return _Tuple_impl<__i, _Head, _Tail...>::_M_head(__t); }
-
-  template<typename _Head, size_t __i, typename... _Tail>
-    constexpr const _Head&
-    __get_helper2(const _Tuple_impl<__i, _Head, _Tail...>& __t) noexcept
-    { return _Tuple_impl<__i, _Head, _Tail...>::_M_head(__t); }
-
-  /// Return a reference to the unique element of type _Tp of a tuple.
-  template <typename _Tp, typename... _Types>
-    constexpr _Tp&
-    get(tuple<_Types...>& __t) noexcept
-    { return std::__get_helper2<_Tp>(__t); }
-
-  /// Return a reference to the unique element of type _Tp of a tuple rvalue.
-  template <typename _Tp, typename... _Types>
-    constexpr _Tp&&
-    get(tuple<_Types...>&& __t) noexcept
-    { return std::forward<_Tp&&>(std::__get_helper2<_Tp>(__t)); }
-
-  /// Return a const reference to the unique element of type _Tp of a tuple.
-  template <typename _Tp, typename... _Types>
-    constexpr const _Tp&
-    get(const tuple<_Types...>& __t) noexcept
-    { return std::__get_helper2<_Tp>(__t); }
-#endif
-
-  // This class performs the comparison operations on tuples
-  template<typename _Tp, typename _Up, size_t __i, size_t __size>
-    struct __tuple_compare
-    {
-      static constexpr bool
-      __eq(const _Tp& __t, const _Up& __u)
-      {
-	return bool(std::get<__i>(__t) == std::get<__i>(__u))
-	  && __tuple_compare<_Tp, _Up, __i + 1, __size>::__eq(__t, __u);
-      }
-   
-      static constexpr bool
-      __less(const _Tp& __t, const _Up& __u)
-      {
-	return bool(std::get<__i>(__t) < std::get<__i>(__u))
-	  || (!bool(std::get<__i>(__u) < std::get<__i>(__t))
-	      && __tuple_compare<_Tp, _Up, __i + 1, __size>::__less(__t, __u));
-      }
-    };
-
-  template<typename _Tp, typename _Up, size_t __size>
-    struct __tuple_compare<_Tp, _Up, __size, __size>
-    {
-      static constexpr bool
-      __eq(const _Tp&, const _Up&) { return true; }
-   
-      static constexpr bool
-      __less(const _Tp&, const _Up&) { return false; }
-    };
-
-  template<typename... _TElements, typename... _UElements>
-    constexpr bool
-    operator==(const tuple<_TElements...>& __t,
-	       const tuple<_UElements...>& __u)
-    {
-      static_assert(sizeof...(_TElements) == sizeof...(_UElements),
-	  "tuple objects can only be compared if they have equal sizes.");
-      using __compare = __tuple_compare<tuple<_TElements...>,
-					tuple<_UElements...>,
-					0, sizeof...(_TElements)>;
-      return __compare::__eq(__t, __u);
-    }
-
-  template<typename... _TElements, typename... _UElements>
-    constexpr bool
-    operator<(const tuple<_TElements...>& __t,
-	      const tuple<_UElements...>& __u)
-    {
-      static_assert(sizeof...(_TElements) == sizeof...(_UElements),
-	  "tuple objects can only be compared if they have equal sizes.");
-      using __compare = __tuple_compare<tuple<_TElements...>,
-					tuple<_UElements...>,
-					0, sizeof...(_TElements)>;
-      return __compare::__less(__t, __u);
-    }
-
-  template<typename... _TElements, typename... _UElements>
-    constexpr bool
-    operator!=(const tuple<_TElements...>& __t,
-	       const tuple<_UElements...>& __u)
-    { return !(__t == __u); }
-
-  template<typename... _TElements, typename... _UElements>
-    constexpr bool
-    operator>(const tuple<_TElements...>& __t,
-	      const tuple<_UElements...>& __u)
-    { return __u < __t; }
-
-  template<typename... _TElements, typename... _UElements>
-    constexpr bool
-    operator<=(const tuple<_TElements...>& __t,
-	       const tuple<_UElements...>& __u)
-    { return !(__u < __t); }
-
-  template<typename... _TElements, typename... _UElements>
-    constexpr bool
-    operator>=(const tuple<_TElements...>& __t,
-	       const tuple<_UElements...>& __u)
-    { return !(__t < __u); }
-
-  // NB: DR 705.
-  template<typename... _Elements>
-    constexpr tuple<typename __decay_and_strip<_Elements>::__type...>
-    make_tuple(_Elements&&... __args)
-    {
-      typedef tuple<typename __decay_and_strip<_Elements>::__type...>
-	__result_type;
-      return __result_type(std::forward<_Elements>(__args)...);
-    }
-
-  template<typename... _Elements>
-    tuple<_Elements&&...>
-    forward_as_tuple(_Elements&&... __args) noexcept
-    { return tuple<_Elements&&...>(std::forward<_Elements>(__args)...); }
-
-  template<typename>
-    struct __is_tuple_like_impl : false_type
-    { };
-
-  template<typename... _Tps>
-    struct __is_tuple_like_impl<tuple<_Tps...>> : true_type
-    { };
-
-  template<typename _T1, typename _T2>
-    struct __is_tuple_like_impl<pair<_T1, _T2>> : true_type
-    { };
-
-  template<typename _Tp, std::size_t _Nm>
-    struct __is_tuple_like_impl<array<_Tp, _Nm>> : true_type
-    { };
-
-  // Internal type trait that allows us to sfinae-protect tuple_cat.
-  template<typename _Tp>
-    struct __is_tuple_like
-    : public __is_tuple_like_impl<typename std::remove_cv
-            <typename std::remove_reference<_Tp>::type>::type>::type
-    { };
-
-  template<size_t, typename, typename, size_t>
-    struct __make_tuple_impl;
-
-  template<size_t _Idx, typename _Tuple, typename... _Tp, size_t _Nm>
-    struct __make_tuple_impl<_Idx, tuple<_Tp...>, _Tuple, _Nm>
-    : __make_tuple_impl<_Idx + 1,
-			tuple<_Tp..., __tuple_element_t<_Idx, _Tuple>>,
-			_Tuple, _Nm>
-    { };
-
-  template<std::size_t _Nm, typename _Tuple, typename... _Tp>
-    struct __make_tuple_impl<_Nm, tuple<_Tp...>, _Tuple, _Nm>
-    {
-      typedef tuple<_Tp...> __type;
-    };
-
-  template<typename _Tuple>
-    struct __do_make_tuple
-    : __make_tuple_impl<0, tuple<>, _Tuple, std::tuple_size<_Tuple>::value>
-    { };
-
-  // Returns the std::tuple equivalent of a tuple-like type.
-  template<typename _Tuple>
-    struct __make_tuple
-    : public __do_make_tuple<typename std::remove_cv
-            <typename std::remove_reference<_Tuple>::type>::type>
-    { };
-
-  // Combines several std::tuple's into a single one.
-  template<typename...>
-    struct __combine_tuples;
-
-  template<>
-    struct __combine_tuples<>
-    {
-      typedef tuple<> __type;
-    };
-
-  template<typename... _Ts>
-    struct __combine_tuples<tuple<_Ts...>>
-    {
-      typedef tuple<_Ts...> __type;
-    };
-
-  template<typename... _T1s, typename... _T2s, typename... _Rem>
-    struct __combine_tuples<tuple<_T1s...>, tuple<_T2s...>, _Rem...>
-    {
-      typedef typename __combine_tuples<tuple<_T1s..., _T2s...>,
-					_Rem...>::__type __type;
-    };
-
-  // Computes the result type of tuple_cat given a set of tuple-like types.
-  template<typename... _Tpls>
-    struct __tuple_cat_result
-    {
-      typedef typename __combine_tuples
-        <typename __make_tuple<_Tpls>::__type...>::__type __type;
-    };
-
-  // Helper to determine the index set for the first tuple-like
-  // type of a given set.
-  template<typename...>
-    struct __make_1st_indices;
-
-  template<>
-    struct __make_1st_indices<>
-    {
-      typedef std::_Index_tuple<> __type;
-    };
-
-  template<typename _Tp, typename... _Tpls>
-    struct __make_1st_indices<_Tp, _Tpls...>
-    {
-      typedef typename std::_Build_index_tuple<std::tuple_size<
-	typename std::remove_reference<_Tp>::type>::value>::__type __type;
-    };
-
-  // Performs the actual concatenation by step-wise expanding tuple-like
-  // objects into the elements,  which are finally forwarded into the
-  // result tuple.
-  template<typename _Ret, typename _Indices, typename... _Tpls>
-    struct __tuple_concater;
-
-  template<typename _Ret, std::size_t... _Is, typename _Tp, typename... _Tpls>
-    struct __tuple_concater<_Ret, std::_Index_tuple<_Is...>, _Tp, _Tpls...>
-    {
-      template<typename... _Us>
-        static constexpr _Ret
-        _S_do(_Tp&& __tp, _Tpls&&... __tps, _Us&&... __us)
-        {
-	  typedef typename __make_1st_indices<_Tpls...>::__type __idx;
-	  typedef __tuple_concater<_Ret, __idx, _Tpls...>      __next;
-	  return __next::_S_do(std::forward<_Tpls>(__tps)...,
-			       std::forward<_Us>(__us)...,
-			       std::get<_Is>(std::forward<_Tp>(__tp))...);
-	}
-    };
-
-  template<typename _Ret>
-    struct __tuple_concater<_Ret, std::_Index_tuple<>>
-    {
-      template<typename... _Us>
-	static constexpr _Ret
-	_S_do(_Us&&... __us)
-        {
-	  return _Ret(std::forward<_Us>(__us)...);
-	}
-    };
-
-  /// tuple_cat
-  template<typename... _Tpls, typename = typename
-           enable_if<__and_<__is_tuple_like<_Tpls>...>::value>::type>
-    constexpr auto
-    tuple_cat(_Tpls&&... __tpls)
-    -> typename __tuple_cat_result<_Tpls...>::__type
-    {
-      typedef typename __tuple_cat_result<_Tpls...>::__type __ret;
-      typedef typename __make_1st_indices<_Tpls...>::__type __idx;
-      typedef __tuple_concater<__ret, __idx, _Tpls...> __concater;
-      return __concater::_S_do(std::forward<_Tpls>(__tpls)...);
-    }
-
-  /// tie
-  template<typename... _Elements>
-    inline tuple<_Elements&...>
-    tie(_Elements&... __args) noexcept
-    { return tuple<_Elements&...>(__args...); }
-
-  /// swap
-  template<typename... _Elements>
-    inline void 
-    swap(tuple<_Elements...>& __x, tuple<_Elements...>& __y)
-    noexcept(noexcept(__x.swap(__y)))
-    { __x.swap(__y); }
-
-  // A class (and instance) which can be used in 'tie' when an element
-  // of a tuple is not required
-  struct _Swallow_assign
-  {
-    template<class _Tp>
-      const _Swallow_assign&
-      operator=(const _Tp&) const
-      { return *this; }
-  };
-
-  const _Swallow_assign ignore{};
-
-  /// Partial specialization for tuples
-  template<typename... _Types, typename _Alloc>
-    struct uses_allocator<tuple<_Types...>, _Alloc> : true_type { };
-
-  // See stl_pair.h...
-  template<class _T1, class _T2>
-    template<typename... _Args1, typename... _Args2>
-      inline
-      pair<_T1, _T2>::
-      pair(piecewise_construct_t,
-	   tuple<_Args1...> __first, tuple<_Args2...> __second)
-      : pair(__first, __second,
-	     typename _Build_index_tuple<sizeof...(_Args1)>::__type(),
-	     typename _Build_index_tuple<sizeof...(_Args2)>::__type())
-      { }
-
-  template<class _T1, class _T2>
-    template<typename... _Args1, std::size_t... _Indexes1,
-             typename... _Args2, std::size_t... _Indexes2>
-      inline
-      pair<_T1, _T2>::
-      pair(tuple<_Args1...>& __tuple1, tuple<_Args2...>& __tuple2,
-	   _Index_tuple<_Indexes1...>, _Index_tuple<_Indexes2...>)
-      : first(std::forward<_Args1>(std::get<_Indexes1>(__tuple1))...),
-        second(std::forward<_Args2>(std::get<_Indexes2>(__tuple2))...)
-      { }
-
-  /// @}
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif // C++11
-
-#endif // _GLIBCXX_TUPLE
diff --git a/openflow/usr/include/c++/5/type_traits b/openflow/usr/include/c++/5/type_traits
deleted file mode 100644
index 03e198a..0000000
--- a/openflow/usr/include/c++/5/type_traits
+++ /dev/null
@@ -1,2430 +0,0 @@
-// C++11 <type_traits> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/type_traits
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_TYPE_TRAITS
-#define _GLIBCXX_TYPE_TRAITS 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <bits/c++config.h>
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-# if defined (__UINT_LEAST16_TYPE__) && defined(__UINT_LEAST32_TYPE__)
-namespace std
-{
-  typedef __UINT_LEAST16_TYPE__ uint_least16_t;
-  typedef __UINT_LEAST32_TYPE__ uint_least32_t;
-}
-# else
-#  include <cstdint>
-# endif
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup metaprogramming Metaprogramming
-   * @ingroup utilities
-   *
-   * Template utilities for compile-time introspection and modification,
-   * including type classification traits, type property inspection traits
-   * and type transformation traits.
-   *
-   * @{
-   */
-
-  /// integral_constant
-  template<typename _Tp, _Tp __v>
-    struct integral_constant
-    {
-      static constexpr _Tp                  value = __v;
-      typedef _Tp                           value_type;
-      typedef integral_constant<_Tp, __v>   type;
-      constexpr operator value_type() const { return value; }
-#if __cplusplus > 201103L
-
-#define __cpp_lib_integral_constant_callable 201304
-
-      constexpr value_type operator()() const { return value; }
-#endif
-    };
-  
-  template<typename _Tp, _Tp __v>
-    constexpr _Tp integral_constant<_Tp, __v>::value;
-
-  /// The type used as a compile-time boolean with true value.
-  typedef integral_constant<bool, true>     true_type;
-
-  /// The type used as a compile-time boolean with false value.
-  typedef integral_constant<bool, false>    false_type;
-
-  template<bool __v>
-    using __bool_constant = integral_constant<bool, __v>;
-
-  // Meta programming helper types.
-
-  template<bool, typename, typename>
-    struct conditional;
-
-  template<typename...>
-    struct __or_;
-
-  template<>
-    struct __or_<>
-    : public false_type
-    { };
-
-  template<typename _B1>
-    struct __or_<_B1>
-    : public _B1
-    { };
-
-  template<typename _B1, typename _B2>
-    struct __or_<_B1, _B2>
-    : public conditional<_B1::value, _B1, _B2>::type
-    { };
-
-  template<typename _B1, typename _B2, typename _B3, typename... _Bn>
-    struct __or_<_B1, _B2, _B3, _Bn...>
-    : public conditional<_B1::value, _B1, __or_<_B2, _B3, _Bn...>>::type
-    { };
-
-  template<typename...>
-    struct __and_;
-
-  template<>
-    struct __and_<>
-    : public true_type
-    { };
-
-  template<typename _B1>
-    struct __and_<_B1>
-    : public _B1
-    { };
-
-  template<typename _B1, typename _B2>
-    struct __and_<_B1, _B2>
-    : public conditional<_B1::value, _B2, _B1>::type
-    { };
-
-  template<typename _B1, typename _B2, typename _B3, typename... _Bn>
-    struct __and_<_B1, _B2, _B3, _Bn...>
-    : public conditional<_B1::value, __and_<_B2, _B3, _Bn...>, _B1>::type
-    { };
-
-  template<typename _Pp>
-    struct __not_
-    : public integral_constant<bool, !_Pp::value>
-    { };
-
-  // For several sfinae-friendly trait implementations we transport both the
-  // result information (as the member type) and the failure information (no
-  // member type). This is very similar to std::enable_if, but we cannot use
-  // them, because we need to derive from them as an implementation detail.
-
-  template<typename _Tp>
-    struct __success_type
-    { typedef _Tp type; };
-
-  struct __failure_type
-  { };
-
-  // Primary type categories.
-
-  template<typename>
-    struct remove_cv;
-
-  template<typename>
-    struct __is_void_helper
-    : public false_type { };
-
-  template<>
-    struct __is_void_helper<void>
-    : public true_type { };
-
-  /// is_void
-  template<typename _Tp>
-    struct is_void
-    : public __is_void_helper<typename remove_cv<_Tp>::type>::type
-    { };
-
-  template<typename>
-    struct __is_integral_helper
-    : public false_type { };
-
-  template<>
-    struct __is_integral_helper<bool>
-    : public true_type { };
-  
-  template<>
-    struct __is_integral_helper<char>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<signed char>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<unsigned char>
-    : public true_type { };
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    struct __is_integral_helper<wchar_t>
-    : public true_type { };
-#endif
-
-  template<>
-    struct __is_integral_helper<char16_t>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<char32_t>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<short>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<unsigned short>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<int>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<unsigned int>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<long>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<unsigned long>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<long long>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<unsigned long long>
-    : public true_type { };
-
-  // Conditionalizing on __STRICT_ANSI__ here will break any port that
-  // uses one of these types for size_t.
-#if defined(__GLIBCXX_TYPE_INT_N_0)
-  template<>
-    struct __is_integral_helper<__GLIBCXX_TYPE_INT_N_0>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<unsigned __GLIBCXX_TYPE_INT_N_0>
-    : public true_type { };
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_1)
-  template<>
-    struct __is_integral_helper<__GLIBCXX_TYPE_INT_N_1>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<unsigned __GLIBCXX_TYPE_INT_N_1>
-    : public true_type { };
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_2)
-  template<>
-    struct __is_integral_helper<__GLIBCXX_TYPE_INT_N_2>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<unsigned __GLIBCXX_TYPE_INT_N_2>
-    : public true_type { };
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_3)
-  template<>
-    struct __is_integral_helper<__GLIBCXX_TYPE_INT_N_3>
-    : public true_type { };
-
-  template<>
-    struct __is_integral_helper<unsigned __GLIBCXX_TYPE_INT_N_3>
-    : public true_type { };
-#endif
-
-  /// is_integral
-  template<typename _Tp>
-    struct is_integral
-    : public __is_integral_helper<typename remove_cv<_Tp>::type>::type
-    { };
-
-  template<typename>
-    struct __is_floating_point_helper
-    : public false_type { };
-
-  template<>
-    struct __is_floating_point_helper<float>
-    : public true_type { };
-
-  template<>
-    struct __is_floating_point_helper<double>
-    : public true_type { };
-
-  template<>
-    struct __is_floating_point_helper<long double>
-    : public true_type { };
-
-#if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_FLOAT128)
-  template<>
-    struct __is_floating_point_helper<__float128>
-    : public true_type { };
-#endif
-
-  /// is_floating_point
-  template<typename _Tp>
-    struct is_floating_point
-    : public __is_floating_point_helper<typename remove_cv<_Tp>::type>::type
-    { };
-
-  /// is_array
-  template<typename>
-    struct is_array
-    : public false_type { };
-
-  template<typename _Tp, std::size_t _Size>
-    struct is_array<_Tp[_Size]>
-    : public true_type { };
-
-  template<typename _Tp>
-    struct is_array<_Tp[]>
-    : public true_type { };
-
-  template<typename>
-    struct __is_pointer_helper
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_pointer_helper<_Tp*>
-    : public true_type { };
-
-  /// is_pointer
-  template<typename _Tp>
-    struct is_pointer
-    : public __is_pointer_helper<typename remove_cv<_Tp>::type>::type
-    { };
-
-  /// is_lvalue_reference
-  template<typename>
-    struct is_lvalue_reference
-    : public false_type { };
-
-  template<typename _Tp>
-    struct is_lvalue_reference<_Tp&>
-    : public true_type { };
-
-  /// is_rvalue_reference
-  template<typename>
-    struct is_rvalue_reference
-    : public false_type { };
-
-  template<typename _Tp>
-    struct is_rvalue_reference<_Tp&&>
-    : public true_type { };
-
-  template<typename>
-    struct is_function;
-
-  template<typename>
-    struct __is_member_object_pointer_helper
-    : public false_type { };
-
-  template<typename _Tp, typename _Cp>
-    struct __is_member_object_pointer_helper<_Tp _Cp::*>
-    : public integral_constant<bool, !is_function<_Tp>::value> { };
-
-  /// is_member_object_pointer
-  template<typename _Tp>
-    struct is_member_object_pointer
-    : public __is_member_object_pointer_helper<
-				typename remove_cv<_Tp>::type>::type
-    { };
-
-  template<typename>
-    struct __is_member_function_pointer_helper
-    : public false_type { };
-
-  template<typename _Tp, typename _Cp>
-    struct __is_member_function_pointer_helper<_Tp _Cp::*>
-    : public integral_constant<bool, is_function<_Tp>::value> { };
-
-  /// is_member_function_pointer
-  template<typename _Tp>
-    struct is_member_function_pointer
-    : public __is_member_function_pointer_helper<
-				typename remove_cv<_Tp>::type>::type
-    { };
-
-  /// is_enum
-  template<typename _Tp>
-    struct is_enum
-    : public integral_constant<bool, __is_enum(_Tp)>
-    { };
-
-  /// is_union
-  template<typename _Tp>
-    struct is_union
-    : public integral_constant<bool, __is_union(_Tp)>
-    { };
-
-  /// is_class
-  template<typename _Tp>
-    struct is_class
-    : public integral_constant<bool, __is_class(_Tp)>
-    { };
-
-  /// is_function
-  template<typename>
-    struct is_function
-    : public false_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...)>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) &>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) &&>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......)>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) &>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) &&>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) const>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) const &>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) const &&>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) const>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) const &>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) const &&>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) volatile>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) volatile &>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) volatile &&>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) volatile>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) volatile &>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) volatile &&>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) const volatile>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) const volatile &>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes...) const volatile &&>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) const volatile>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) const volatile &>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct is_function<_Res(_ArgTypes......) const volatile &&>
-    : public true_type { };
-
-#define __cpp_lib_is_null_pointer 201309
-
-  template<typename>
-    struct __is_null_pointer_helper
-    : public false_type { };
-
-  template<>
-    struct __is_null_pointer_helper<std::nullptr_t>
-    : public true_type { };
-
-  /// is_null_pointer (LWG 2247).
-  template<typename _Tp>
-    struct is_null_pointer
-    : public __is_null_pointer_helper<typename remove_cv<_Tp>::type>::type
-    { };
-
-  /// __is_nullptr_t (extension).
-  template<typename _Tp>
-    struct __is_nullptr_t
-    : public is_null_pointer<_Tp>
-    { };
-
-  // Composite type categories.
-
-  /// is_reference
-  template<typename _Tp>
-    struct is_reference
-    : public __or_<is_lvalue_reference<_Tp>,
-                   is_rvalue_reference<_Tp>>::type
-    { };
-
-  /// is_arithmetic
-  template<typename _Tp>
-    struct is_arithmetic
-    : public __or_<is_integral<_Tp>, is_floating_point<_Tp>>::type
-    { };
-
-  /// is_fundamental
-  template<typename _Tp>
-    struct is_fundamental
-    : public __or_<is_arithmetic<_Tp>, is_void<_Tp>,
-		   is_null_pointer<_Tp>>::type
-    { };
-
-  /// is_object
-  template<typename _Tp>
-    struct is_object
-    : public __not_<__or_<is_function<_Tp>, is_reference<_Tp>,
-                          is_void<_Tp>>>::type
-    { };
-
-  template<typename>
-    struct is_member_pointer;
-
-  /// is_scalar
-  template<typename _Tp>
-    struct is_scalar
-    : public __or_<is_arithmetic<_Tp>, is_enum<_Tp>, is_pointer<_Tp>,
-                   is_member_pointer<_Tp>, is_null_pointer<_Tp>>::type
-    { };
-
-  /// is_compound
-  template<typename _Tp>
-    struct is_compound
-    : public integral_constant<bool, !is_fundamental<_Tp>::value> { };
-
-  template<typename _Tp>
-    struct __is_member_pointer_helper
-    : public false_type { };
-
-  template<typename _Tp, typename _Cp>
-    struct __is_member_pointer_helper<_Tp _Cp::*>
-    : public true_type { };
-
-  /// is_member_pointer
-  template<typename _Tp>
-    struct is_member_pointer
-    : public __is_member_pointer_helper<typename remove_cv<_Tp>::type>::type
-    { };
-
-  // Utility to detect referenceable types ([defns.referenceable]).
-
-  template<typename _Tp>
-    struct __is_referenceable
-    : public __or_<is_object<_Tp>, is_reference<_Tp>>::type
-    { };
-
-  template<typename _Res, typename... _Args>
-    struct __is_referenceable<_Res(_Args...)>
-    : public true_type
-    { };
-
-  template<typename _Res, typename... _Args>
-    struct __is_referenceable<_Res(_Args......)>
-    : public true_type
-    { };
-
-  // Type properties.
-
-  /// is_const
-  template<typename>
-    struct is_const
-    : public false_type { };
-
-  template<typename _Tp>
-    struct is_const<_Tp const>
-    : public true_type { };
-  
-  /// is_volatile
-  template<typename>
-    struct is_volatile
-    : public false_type { };
-
-  template<typename _Tp>
-    struct is_volatile<_Tp volatile>
-    : public true_type { };
-
-  /// is_trivial
-  template<typename _Tp>
-    struct is_trivial
-    : public integral_constant<bool, __is_trivial(_Tp)>
-    { };
-
-  // is_trivially_copyable
-  template<typename _Tp>
-    struct is_trivially_copyable
-    : public integral_constant<bool, __is_trivially_copyable(_Tp)>
-    { };
-
-  /// is_standard_layout
-  template<typename _Tp>
-    struct is_standard_layout
-    : public integral_constant<bool, __is_standard_layout(_Tp)>
-    { };
-
-  /// is_pod
-  // Could use is_standard_layout && is_trivial instead of the builtin.
-  template<typename _Tp>
-    struct is_pod
-    : public integral_constant<bool, __is_pod(_Tp)>
-    { };
-
-  /// is_literal_type
-  template<typename _Tp>
-    struct is_literal_type
-    : public integral_constant<bool, __is_literal_type(_Tp)>
-    { };
-
-  /// is_empty
-  template<typename _Tp>
-    struct is_empty
-    : public integral_constant<bool, __is_empty(_Tp)>
-    { };
-
-  /// is_polymorphic
-  template<typename _Tp>
-    struct is_polymorphic
-    : public integral_constant<bool, __is_polymorphic(_Tp)>
-    { };
-
-#if __cplusplus >= 201402L
-#define __cpp_lib_is_final 201402L
-  /// is_final
-  template<typename _Tp>
-    struct is_final
-    : public integral_constant<bool, __is_final(_Tp)>
-    { };
-#endif
-
-  /// is_abstract
-  template<typename _Tp>
-    struct is_abstract
-    : public integral_constant<bool, __is_abstract(_Tp)>
-    { };
-
-  template<typename _Tp,
-	   bool = is_arithmetic<_Tp>::value>
-    struct __is_signed_helper
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_signed_helper<_Tp, true>
-    : public integral_constant<bool, _Tp(-1) < _Tp(0)>
-    { };
-
-  /// is_signed
-  template<typename _Tp>
-    struct is_signed
-    : public __is_signed_helper<_Tp>::type
-    { };
-
-  /// is_unsigned
-  template<typename _Tp>
-    struct is_unsigned
-    : public __and_<is_arithmetic<_Tp>, __not_<is_signed<_Tp>>>::type
-    { };
-
-
-  // Destructible and constructible type properties.
-
-  template<typename>
-    struct add_rvalue_reference;
-
-  /**
-   *  @brief  Utility to simplify expressions used in unevaluated operands
-   *  @ingroup utilities
-   */
-  template<typename _Tp>
-    typename add_rvalue_reference<_Tp>::type declval() noexcept;
-
-  template<typename, unsigned = 0>
-    struct extent;
-
-  template<typename>
-    struct remove_all_extents;
-
-  template<typename _Tp>
-    struct __is_array_known_bounds
-    : public integral_constant<bool, (extent<_Tp>::value > 0)>
-    { };
-
-  template<typename _Tp>
-    struct __is_array_unknown_bounds
-    : public __and_<is_array<_Tp>, __not_<extent<_Tp>>>::type
-    { };
-    
-  // In N3290 is_destructible does not say anything about function
-  // types and abstract types, see LWG 2049. This implementation
-  // describes function types as non-destructible and all complete
-  // object types as destructible, iff the explicit destructor
-  // call expression is wellformed.
-  struct __do_is_destructible_impl
-  {
-    template<typename _Tp, typename = decltype(declval<_Tp&>().~_Tp())>
-      static true_type __test(int);
-
-    template<typename>
-      static false_type __test(...);
-  };
-
-  template<typename _Tp>
-    struct __is_destructible_impl
-    : public __do_is_destructible_impl
-    {
-      typedef decltype(__test<_Tp>(0)) type;
-    };
-
-  template<typename _Tp,
-           bool = __or_<is_void<_Tp>,
-                        __is_array_unknown_bounds<_Tp>,
-                        is_function<_Tp>>::value,
-           bool = __or_<is_reference<_Tp>, is_scalar<_Tp>>::value>
-    struct __is_destructible_safe;
-
-  template<typename _Tp>
-    struct __is_destructible_safe<_Tp, false, false>
-    : public __is_destructible_impl<typename
-               remove_all_extents<_Tp>::type>::type
-    { };
-
-  template<typename _Tp>
-    struct __is_destructible_safe<_Tp, true, false>
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_destructible_safe<_Tp, false, true>
-    : public true_type { };
-
-  /// is_destructible
-  template<typename _Tp>
-    struct is_destructible
-    : public __is_destructible_safe<_Tp>::type
-    { };
-
-  // is_nothrow_destructible requires that is_destructible is
-  // satisfied as well.  We realize that by mimicing the
-  // implementation of is_destructible but refer to noexcept(expr)
-  // instead of decltype(expr).
-  struct __do_is_nt_destructible_impl
-  {
-    template<typename _Tp>
-      static integral_constant<bool, noexcept(declval<_Tp&>().~_Tp())>
-        __test(int);
-
-    template<typename>
-      static false_type __test(...);
-  };
-
-  template<typename _Tp>
-    struct __is_nt_destructible_impl
-    : public __do_is_nt_destructible_impl
-    {
-      typedef decltype(__test<_Tp>(0)) type;
-    };
-
-  template<typename _Tp,
-           bool = __or_<is_void<_Tp>,
-                        __is_array_unknown_bounds<_Tp>,
-                        is_function<_Tp>>::value,
-           bool = __or_<is_reference<_Tp>, is_scalar<_Tp>>::value>
-    struct __is_nt_destructible_safe;
-
-  template<typename _Tp>
-    struct __is_nt_destructible_safe<_Tp, false, false>
-    : public __is_nt_destructible_impl<typename
-               remove_all_extents<_Tp>::type>::type
-    { };
-
-  template<typename _Tp>
-    struct __is_nt_destructible_safe<_Tp, true, false>
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_nt_destructible_safe<_Tp, false, true>
-    : public true_type { };
-
-  /// is_nothrow_destructible
-  template<typename _Tp>
-    struct is_nothrow_destructible
-    : public __is_nt_destructible_safe<_Tp>::type
-    { };
-
-  struct __do_is_default_constructible_impl
-  {
-    template<typename _Tp, typename = decltype(_Tp())>
-      static true_type __test(int);
-
-    template<typename>
-      static false_type __test(...);
-  };
-
-  template<typename _Tp>
-    struct __is_default_constructible_impl
-    : public __do_is_default_constructible_impl
-    {
-      typedef decltype(__test<_Tp>(0)) type;
-    };
-
-  template<typename _Tp>
-    struct __is_default_constructible_atom
-    : public __and_<__not_<is_void<_Tp>>,
-                    __is_default_constructible_impl<_Tp>>::type
-    { };
-
-  template<typename _Tp, bool = is_array<_Tp>::value>
-    struct __is_default_constructible_safe;
-
-  // The following technique is a workaround for a current core language
-  // restriction, which does not allow for array types to occur in 
-  // functional casts of the form T().  Complete arrays can be default-
-  // constructed, if the element type is default-constructible, but 
-  // arrays with unknown bounds are not.
-  template<typename _Tp>
-    struct __is_default_constructible_safe<_Tp, true>
-    : public __and_<__is_array_known_bounds<_Tp>,
-		    __is_default_constructible_atom<typename
-                      remove_all_extents<_Tp>::type>>::type
-    { };
-
-  template<typename _Tp>
-    struct __is_default_constructible_safe<_Tp, false>
-    : public __is_default_constructible_atom<_Tp>::type
-    { };
-
-  /// is_default_constructible
-  template<typename _Tp>
-    struct is_default_constructible
-    : public __is_default_constructible_safe<_Tp>::type
-    { };
-
-
-  // Implementation of is_constructible.
-
-  // The hardest part of this trait is the binary direct-initialization
-  // case, because we hit into a functional cast of the form T(arg).
-  // This implementation uses different strategies depending on the
-  // target type to reduce the test overhead as much as possible:
-  //
-  // a) For a reference target type, we use a static_cast expression 
-  //    modulo its extra cases.
-  //
-  // b) For a non-reference target type we use a ::new expression.
-  struct __do_is_static_castable_impl
-  {
-    template<typename _From, typename _To, typename
-             = decltype(static_cast<_To>(declval<_From>()))>
-      static true_type __test(int);
-
-    template<typename, typename>
-      static false_type __test(...);
-  };
-
-  template<typename _From, typename _To>
-    struct __is_static_castable_impl
-    : public __do_is_static_castable_impl
-    {
-      typedef decltype(__test<_From, _To>(0)) type;
-    };
-
-  template<typename _From, typename _To>
-    struct __is_static_castable_safe
-    : public __is_static_castable_impl<_From, _To>::type
-    { };
-
-  // __is_static_castable
-  template<typename _From, typename _To>
-    struct __is_static_castable
-    : public integral_constant<bool, (__is_static_castable_safe<
-				      _From, _To>::value)>
-    { };
-
-  // Implementation for non-reference types. To meet the proper
-  // variable definition semantics, we also need to test for
-  // is_destructible in this case.
-  // This form should be simplified by a single expression:
-  // ::delete ::new _Tp(declval<_Arg>()), see c++/51222.
-  struct __do_is_direct_constructible_impl
-  {
-    template<typename _Tp, typename _Arg, typename
-	     = decltype(::new _Tp(declval<_Arg>()))>
-      static true_type __test(int);
-
-    template<typename, typename>
-      static false_type __test(...);
-  };
-
-  template<typename _Tp, typename _Arg>
-    struct __is_direct_constructible_impl
-    : public __do_is_direct_constructible_impl
-    {
-      typedef decltype(__test<_Tp, _Arg>(0)) type;
-    };
-
-  template<typename _Tp, typename _Arg>
-    struct __is_direct_constructible_new_safe
-    : public __and_<is_destructible<_Tp>,
-                    __is_direct_constructible_impl<_Tp, _Arg>>::type
-    { };
-
-  template<typename, typename>
-    struct is_same;
-
-  template<typename, typename>
-    struct is_base_of;
-
-  template<typename>
-    struct remove_reference;
-
-  template<typename _From, typename _To, bool
-           = __not_<__or_<is_void<_From>, 
-                          is_function<_From>>>::value>
-    struct __is_base_to_derived_ref;
-
-  // Detect whether we have a downcast situation during
-  // reference binding.
-  template<typename _From, typename _To>
-    struct __is_base_to_derived_ref<_From, _To, true>
-    {
-      typedef typename remove_cv<typename remove_reference<_From
-        >::type>::type __src_t;
-      typedef typename remove_cv<typename remove_reference<_To
-        >::type>::type __dst_t;
-      typedef __and_<__not_<is_same<__src_t, __dst_t>>,
-		     is_base_of<__src_t, __dst_t>> type;
-      static constexpr bool value = type::value;
-    };
-
-  template<typename _From, typename _To>
-    struct __is_base_to_derived_ref<_From, _To, false>
-    : public false_type
-    { };
-
-  template<typename _From, typename _To, bool
-           = __and_<is_lvalue_reference<_From>,
-                    is_rvalue_reference<_To>>::value>
-    struct __is_lvalue_to_rvalue_ref;
-
-  // Detect whether we have an lvalue of non-function type
-  // bound to a reference-compatible rvalue-reference.
-  template<typename _From, typename _To>
-    struct __is_lvalue_to_rvalue_ref<_From, _To, true>
-    {
-      typedef typename remove_cv<typename remove_reference<
-        _From>::type>::type __src_t;
-      typedef typename remove_cv<typename remove_reference<
-        _To>::type>::type __dst_t;
-      typedef __and_<__not_<is_function<__src_t>>, 
-        __or_<is_same<__src_t, __dst_t>,
-		    is_base_of<__dst_t, __src_t>>> type;
-      static constexpr bool value = type::value;
-    };
-
-  template<typename _From, typename _To>
-    struct __is_lvalue_to_rvalue_ref<_From, _To, false>
-    : public false_type
-    { };
-
-  // Here we handle direct-initialization to a reference type as 
-  // equivalent to a static_cast modulo overshooting conversions.
-  // These are restricted to the following conversions:
-  //    a) A base class value to a derived class reference
-  //    b) An lvalue to an rvalue-reference of reference-compatible 
-  //       types that are not functions
-  template<typename _Tp, typename _Arg>
-    struct __is_direct_constructible_ref_cast
-    : public __and_<__is_static_castable<_Arg, _Tp>,
-                    __not_<__or_<__is_base_to_derived_ref<_Arg, _Tp>,
-                                 __is_lvalue_to_rvalue_ref<_Arg, _Tp>
-                   >>>::type
-    { };
-
-  template<typename _Tp, typename _Arg>
-    struct __is_direct_constructible_new
-    : public conditional<is_reference<_Tp>::value,
-			 __is_direct_constructible_ref_cast<_Tp, _Arg>,
-			 __is_direct_constructible_new_safe<_Tp, _Arg>
-			 >::type
-    { };
-
-  template<typename _Tp, typename _Arg>
-    struct __is_direct_constructible
-    : public __is_direct_constructible_new<_Tp, _Arg>::type
-    { };
-
-  // Since default-construction and binary direct-initialization have
-  // been handled separately, the implementation of the remaining
-  // n-ary construction cases is rather straightforward. We can use
-  // here a functional cast, because array types are excluded anyway
-  // and this form is never interpreted as a C cast.
-  struct __do_is_nary_constructible_impl
-  {
-    template<typename _Tp, typename... _Args, typename
-             = decltype(_Tp(declval<_Args>()...))>
-      static true_type __test(int);
-
-    template<typename, typename...>
-      static false_type __test(...);
-  };
-
-  template<typename _Tp, typename... _Args>
-    struct __is_nary_constructible_impl
-    : public __do_is_nary_constructible_impl
-    {
-      typedef decltype(__test<_Tp, _Args...>(0)) type;
-    };
-
-  template<typename _Tp, typename... _Args>
-    struct __is_nary_constructible
-    : public __is_nary_constructible_impl<_Tp, _Args...>::type
-    {
-      static_assert(sizeof...(_Args) > 1,
-                    "Only useful for > 1 arguments");
-    };
-
-  template<typename _Tp, typename... _Args>
-    struct __is_constructible_impl
-    : public __is_nary_constructible<_Tp, _Args...>
-    { };
-
-  template<typename _Tp, typename _Arg>
-    struct __is_constructible_impl<_Tp, _Arg>
-    : public __is_direct_constructible<_Tp, _Arg>
-    { };
-
-  template<typename _Tp>
-    struct __is_constructible_impl<_Tp>
-    : public is_default_constructible<_Tp>
-    { };
-
-  /// is_constructible
-  template<typename _Tp, typename... _Args>
-    struct is_constructible
-    : public __is_constructible_impl<_Tp, _Args...>::type
-    { };
-
-  template<typename _Tp, bool = __is_referenceable<_Tp>::value>
-    struct __is_copy_constructible_impl;
-
-  template<typename _Tp>
-    struct __is_copy_constructible_impl<_Tp, false>
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_copy_constructible_impl<_Tp, true>
-    : public is_constructible<_Tp, const _Tp&>
-    { };
-
-  /// is_copy_constructible
-  template<typename _Tp>
-    struct is_copy_constructible
-    : public __is_copy_constructible_impl<_Tp>
-    { };
-
-  template<typename _Tp, bool = __is_referenceable<_Tp>::value>
-    struct __is_move_constructible_impl;
-
-  template<typename _Tp>
-    struct __is_move_constructible_impl<_Tp, false>
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_move_constructible_impl<_Tp, true>
-    : public is_constructible<_Tp, _Tp&&>
-    { };
-
-  /// is_move_constructible
-  template<typename _Tp>
-    struct is_move_constructible
-    : public __is_move_constructible_impl<_Tp>
-    { };
-
-  template<typename _Tp>
-    struct __is_nt_default_constructible_atom
-    : public integral_constant<bool, noexcept(_Tp())>
-    { };
-
-  template<typename _Tp, bool = is_array<_Tp>::value>
-    struct __is_nt_default_constructible_impl;
-
-  template<typename _Tp>
-    struct __is_nt_default_constructible_impl<_Tp, true>
-    : public __and_<__is_array_known_bounds<_Tp>,
-		    __is_nt_default_constructible_atom<typename
-                      remove_all_extents<_Tp>::type>>::type
-    { };
-
-  template<typename _Tp>
-    struct __is_nt_default_constructible_impl<_Tp, false>
-    : public __is_nt_default_constructible_atom<_Tp>
-    { };
-
-  /// is_nothrow_default_constructible
-  template<typename _Tp>
-    struct is_nothrow_default_constructible
-    : public __and_<is_default_constructible<_Tp>,
-                    __is_nt_default_constructible_impl<_Tp>>::type
-    { };
-
-  template<typename _Tp, typename... _Args>
-    struct __is_nt_constructible_impl
-    : public integral_constant<bool, noexcept(_Tp(declval<_Args>()...))>
-    { };
-
-  template<typename _Tp, typename _Arg>
-    struct __is_nt_constructible_impl<_Tp, _Arg>
-    : public integral_constant<bool,
-                               noexcept(static_cast<_Tp>(declval<_Arg>()))>
-    { };
-
-  template<typename _Tp>
-    struct __is_nt_constructible_impl<_Tp>
-    : public is_nothrow_default_constructible<_Tp>
-    { };
-
-  /// is_nothrow_constructible
-  template<typename _Tp, typename... _Args>
-    struct is_nothrow_constructible
-    : public __and_<is_constructible<_Tp, _Args...>,
-		    __is_nt_constructible_impl<_Tp, _Args...>>::type
-    { };
-
-  template<typename _Tp, bool = __is_referenceable<_Tp>::value>
-    struct __is_nothrow_copy_constructible_impl;
-
-  template<typename _Tp>
-    struct __is_nothrow_copy_constructible_impl<_Tp, false>
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_nothrow_copy_constructible_impl<_Tp, true>
-    : public is_nothrow_constructible<_Tp, const _Tp&>
-    { };
-
-  /// is_nothrow_copy_constructible
-  template<typename _Tp>
-    struct is_nothrow_copy_constructible
-    : public __is_nothrow_copy_constructible_impl<_Tp>
-    { };
-
-  template<typename _Tp, bool = __is_referenceable<_Tp>::value>
-    struct __is_nothrow_move_constructible_impl;
-
-  template<typename _Tp>
-    struct __is_nothrow_move_constructible_impl<_Tp, false>
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_nothrow_move_constructible_impl<_Tp, true>
-    : public is_nothrow_constructible<_Tp, _Tp&&>
-    { };
-
-  /// is_nothrow_move_constructible
-  template<typename _Tp>
-    struct is_nothrow_move_constructible
-    : public __is_nothrow_move_constructible_impl<_Tp>
-    { };
-
-  template<typename _Tp, typename _Up>
-    class __is_assignable_helper
-    {
-      template<typename _Tp1, typename _Up1,
-	       typename = decltype(declval<_Tp1>() = declval<_Up1>())>
-	static true_type
-	__test(int);
-
-      template<typename, typename>
-	static false_type
-	__test(...);
-
-    public:
-      typedef decltype(__test<_Tp, _Up>(0)) type;
-    };
-
-  /// is_assignable
-  template<typename _Tp, typename _Up>
-    struct is_assignable
-      : public __is_assignable_helper<_Tp, _Up>::type
-    { };
-
-  template<typename _Tp, bool = __is_referenceable<_Tp>::value>
-    struct __is_copy_assignable_impl;
-
-  template<typename _Tp>
-    struct __is_copy_assignable_impl<_Tp, false>
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_copy_assignable_impl<_Tp, true>
-    : public is_assignable<_Tp&, const _Tp&>
-    { };
-
-  /// is_copy_assignable
-  template<typename _Tp>
-    struct is_copy_assignable
-    : public __is_copy_assignable_impl<_Tp>
-    { };
-
-  template<typename _Tp, bool = __is_referenceable<_Tp>::value>
-    struct __is_move_assignable_impl;
-
-  template<typename _Tp>
-    struct __is_move_assignable_impl<_Tp, false>
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_move_assignable_impl<_Tp, true>
-    : public is_assignable<_Tp&, _Tp&&>
-    { };
-
-  /// is_move_assignable
-  template<typename _Tp>
-    struct is_move_assignable
-    : public __is_move_assignable_impl<_Tp>
-    { };
-
-  template<typename _Tp, typename _Up>
-    struct __is_nt_assignable_impl
-    : public integral_constant<bool, noexcept(declval<_Tp>() = declval<_Up>())>
-    { };
-
-  /// is_nothrow_assignable
-  template<typename _Tp, typename _Up>
-    struct is_nothrow_assignable
-    : public __and_<is_assignable<_Tp, _Up>,
-		    __is_nt_assignable_impl<_Tp, _Up>>::type
-    { };
-
-  template<typename _Tp, bool = __is_referenceable<_Tp>::value>
-    struct __is_nt_copy_assignable_impl;
-
-  template<typename _Tp>
-    struct __is_nt_copy_assignable_impl<_Tp, false>
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_nt_copy_assignable_impl<_Tp, true>
-    : public is_nothrow_assignable<_Tp&, const _Tp&>
-    { };
-
-  /// is_nothrow_copy_assignable
-  template<typename _Tp>
-    struct is_nothrow_copy_assignable
-    : public __is_nt_copy_assignable_impl<_Tp>
-    { };
-
-  template<typename _Tp, bool = __is_referenceable<_Tp>::value>
-    struct __is_nt_move_assignable_impl;
-
-  template<typename _Tp>
-    struct __is_nt_move_assignable_impl<_Tp, false>
-    : public false_type { };
-
-  template<typename _Tp>
-    struct __is_nt_move_assignable_impl<_Tp, true>
-    : public is_nothrow_assignable<_Tp&, _Tp&&>
-    { };
-
-  /// is_nothrow_move_assignable
-  template<typename _Tp>
-    struct is_nothrow_move_assignable
-    : public __is_nt_move_assignable_impl<_Tp>
-    { };
-
-  /// is_trivially_constructible
-  template<typename _Tp, typename... _Args>
-    struct is_trivially_constructible
-    : public __and_<is_constructible<_Tp, _Args...>, integral_constant<bool,
-			__is_trivially_constructible(_Tp, _Args...)>>::type
-    { };
-  
-  /// is_trivially_default_constructible
-  template<typename _Tp>
-    struct is_trivially_default_constructible
-    : public is_trivially_constructible<_Tp>::type
-    { };
-
-  /// is_trivially_copy_constructible
-  template<typename _Tp>
-    struct is_trivially_copy_constructible
-    : public __and_<is_copy_constructible<_Tp>, 
-		    integral_constant<bool,
-			__is_trivially_constructible(_Tp, const _Tp&)>>::type
-    { };
-  
-  /// is_trivially_move_constructible
-  template<typename _Tp>
-    struct is_trivially_move_constructible
-    : public __and_<is_move_constructible<_Tp>, 
-		    integral_constant<bool,
-			__is_trivially_constructible(_Tp, _Tp&&)>>::type
-    { };
-
-  /// is_trivially_assignable
-  template<typename _Tp, typename _Up>
-    struct is_trivially_assignable
-    : public __and_<is_assignable<_Tp, _Up>, 
-		    integral_constant<bool,
-			__is_trivially_assignable(_Tp, _Up)>>::type
-    { };
-
-  /// is_trivially_copy_assignable
-  template<typename _Tp>
-    struct is_trivially_copy_assignable
-    : public __and_<is_copy_assignable<_Tp>, 
-		    integral_constant<bool,
-			__is_trivially_assignable(_Tp&, const _Tp&)>>::type
-    { };
-
-  /// is_trivially_move_assignable
-  template<typename _Tp>
-    struct is_trivially_move_assignable
-    : public __and_<is_move_assignable<_Tp>, 
-		    integral_constant<bool,
-			__is_trivially_assignable(_Tp&, _Tp&&)>>::type
-    { };
-
-  /// is_trivially_destructible
-  template<typename _Tp>
-    struct is_trivially_destructible
-    : public __and_<is_destructible<_Tp>, integral_constant<bool,
-			      __has_trivial_destructor(_Tp)>>::type
-    { };
-
-  /// has_trivial_default_constructor (temporary legacy)
-  template<typename _Tp>
-    struct has_trivial_default_constructor
-    : public integral_constant<bool, __has_trivial_constructor(_Tp)>
-    { } _GLIBCXX_DEPRECATED;
-
-  /// has_trivial_copy_constructor (temporary legacy)
-  template<typename _Tp>
-    struct has_trivial_copy_constructor
-    : public integral_constant<bool, __has_trivial_copy(_Tp)>
-    { } _GLIBCXX_DEPRECATED;
-
-  /// has_trivial_copy_assign (temporary legacy)
-  template<typename _Tp>
-    struct has_trivial_copy_assign
-    : public integral_constant<bool, __has_trivial_assign(_Tp)>
-    { } _GLIBCXX_DEPRECATED;
-
-  /// has_virtual_destructor
-  template<typename _Tp>
-    struct has_virtual_destructor
-    : public integral_constant<bool, __has_virtual_destructor(_Tp)>
-    { };
-
-  
-  // type property queries.
-
-  /// alignment_of
-  template<typename _Tp>
-    struct alignment_of
-    : public integral_constant<std::size_t, __alignof__(_Tp)> { };
-  
-  /// rank
-  template<typename>
-    struct rank
-    : public integral_constant<std::size_t, 0> { };
-   
-  template<typename _Tp, std::size_t _Size>
-    struct rank<_Tp[_Size]>
-    : public integral_constant<std::size_t, 1 + rank<_Tp>::value> { };
-
-  template<typename _Tp>
-    struct rank<_Tp[]>
-    : public integral_constant<std::size_t, 1 + rank<_Tp>::value> { };
-
-  /// extent
-  template<typename, unsigned _Uint>
-    struct extent
-    : public integral_constant<std::size_t, 0> { };
-  
-  template<typename _Tp, unsigned _Uint, std::size_t _Size>
-    struct extent<_Tp[_Size], _Uint>
-    : public integral_constant<std::size_t,
-			       _Uint == 0 ? _Size : extent<_Tp,
-							   _Uint - 1>::value>
-    { };
-
-  template<typename _Tp, unsigned _Uint>
-    struct extent<_Tp[], _Uint>
-    : public integral_constant<std::size_t,
-			       _Uint == 0 ? 0 : extent<_Tp,
-						       _Uint - 1>::value>
-    { };
-
-
-  // Type relations.
-
-  /// is_same
-  template<typename, typename>
-    struct is_same
-    : public false_type { };
-
-  template<typename _Tp>
-    struct is_same<_Tp, _Tp>
-    : public true_type { };
-
-  /// is_base_of
-  template<typename _Base, typename _Derived>
-    struct is_base_of
-    : public integral_constant<bool, __is_base_of(_Base, _Derived)>
-    { };
-
-  template<typename _From, typename _To,
-           bool = __or_<is_void<_From>, is_function<_To>,
-                        is_array<_To>>::value>
-    struct __is_convertible_helper
-    { typedef typename is_void<_To>::type type; };
-
-  template<typename _From, typename _To>
-    class __is_convertible_helper<_From, _To, false>
-    {
-       template<typename _To1>
-	static void __test_aux(_To1);
-
-      template<typename _From1, typename _To1,
-	       typename = decltype(__test_aux<_To1>(std::declval<_From1>()))>
-	static true_type
-	__test(int);
-
-      template<typename, typename>
-	static false_type
-	__test(...);
-
-    public:
-      typedef decltype(__test<_From, _To>(0)) type;
-    };
-
-
-  /// is_convertible
-  template<typename _From, typename _To>
-    struct is_convertible
-    : public __is_convertible_helper<_From, _To>::type
-    { };
-
-
-  // Const-volatile modifications.
-
-  /// remove_const
-  template<typename _Tp>
-    struct remove_const
-    { typedef _Tp     type; };
-
-  template<typename _Tp>
-    struct remove_const<_Tp const>
-    { typedef _Tp     type; };
-  
-  /// remove_volatile
-  template<typename _Tp>
-    struct remove_volatile
-    { typedef _Tp     type; };
-
-  template<typename _Tp>
-    struct remove_volatile<_Tp volatile>
-    { typedef _Tp     type; };
-  
-  /// remove_cv
-  template<typename _Tp>
-    struct remove_cv
-    {
-      typedef typename
-      remove_const<typename remove_volatile<_Tp>::type>::type     type;
-    };
-  
-  /// add_const
-  template<typename _Tp>
-    struct add_const
-    { typedef _Tp const     type; };
-   
-  /// add_volatile
-  template<typename _Tp>
-    struct add_volatile
-    { typedef _Tp volatile     type; };
-  
-  /// add_cv
-  template<typename _Tp>
-    struct add_cv
-    {
-      typedef typename
-      add_const<typename add_volatile<_Tp>::type>::type     type;
-    };
-
-#if __cplusplus > 201103L
-
-#define __cpp_lib_transformation_trait_aliases 201304
-
-  /// Alias template for remove_const
-  template<typename _Tp>
-    using remove_const_t = typename remove_const<_Tp>::type;
-
-  /// Alias template for remove_volatile
-  template<typename _Tp>
-    using remove_volatile_t = typename remove_volatile<_Tp>::type;
-
-  /// Alias template for remove_cv
-  template<typename _Tp>
-    using remove_cv_t = typename remove_cv<_Tp>::type;
-
-  /// Alias template for add_const
-  template<typename _Tp>
-    using add_const_t = typename add_const<_Tp>::type;
-
-  /// Alias template for add_volatile
-  template<typename _Tp>
-    using add_volatile_t = typename add_volatile<_Tp>::type;
-
-  /// Alias template for add_cv
-  template<typename _Tp>
-    using add_cv_t = typename add_cv<_Tp>::type;
-#endif
-
-  // Reference transformations.
-
-  /// remove_reference
-  template<typename _Tp>
-    struct remove_reference
-    { typedef _Tp   type; };
-
-  template<typename _Tp>
-    struct remove_reference<_Tp&>
-    { typedef _Tp   type; };
-
-  template<typename _Tp>
-    struct remove_reference<_Tp&&>
-    { typedef _Tp   type; };
-
-  template<typename _Tp, bool = __is_referenceable<_Tp>::value>
-    struct __add_lvalue_reference_helper
-    { typedef _Tp   type; };
-
-  template<typename _Tp>
-    struct __add_lvalue_reference_helper<_Tp, true>
-    { typedef _Tp&   type; };
-
-  /// add_lvalue_reference
-  template<typename _Tp>
-    struct add_lvalue_reference
-    : public __add_lvalue_reference_helper<_Tp>
-    { };
-
-  template<typename _Tp, bool = __is_referenceable<_Tp>::value>
-    struct __add_rvalue_reference_helper
-    { typedef _Tp   type; };
-
-  template<typename _Tp>
-    struct __add_rvalue_reference_helper<_Tp, true>
-    { typedef _Tp&&   type; };
-
-  /// add_rvalue_reference
-  template<typename _Tp>
-    struct add_rvalue_reference
-    : public __add_rvalue_reference_helper<_Tp>
-    { };
-
-#if __cplusplus > 201103L
-  /// Alias template for remove_reference
-  template<typename _Tp>
-    using remove_reference_t = typename remove_reference<_Tp>::type;
-
-  /// Alias template for add_lvalue_reference
-  template<typename _Tp>
-    using add_lvalue_reference_t = typename add_lvalue_reference<_Tp>::type;
-
-  /// Alias template for add_rvalue_reference
-  template<typename _Tp>
-    using add_rvalue_reference_t = typename add_rvalue_reference<_Tp>::type;
-#endif
-
-  // Sign modifications.
-
-  // Utility for constructing identically cv-qualified types.
-  template<typename _Unqualified, bool _IsConst, bool _IsVol>
-    struct __cv_selector;
-
-  template<typename _Unqualified>
-    struct __cv_selector<_Unqualified, false, false>
-    { typedef _Unqualified __type; };
-
-  template<typename _Unqualified>
-    struct __cv_selector<_Unqualified, false, true>
-    { typedef volatile _Unqualified __type; };
-
-  template<typename _Unqualified>
-    struct __cv_selector<_Unqualified, true, false>
-    { typedef const _Unqualified __type; };
-
-  template<typename _Unqualified>
-    struct __cv_selector<_Unqualified, true, true>
-    { typedef const volatile _Unqualified __type; };
-
-  template<typename _Qualified, typename _Unqualified,
-	   bool _IsConst = is_const<_Qualified>::value,
-	   bool _IsVol = is_volatile<_Qualified>::value>
-    class __match_cv_qualifiers
-    {
-      typedef __cv_selector<_Unqualified, _IsConst, _IsVol> __match;
-
-    public:
-      typedef typename __match::__type __type; 
-    };
-
-  // Utility for finding the unsigned versions of signed integral types.
-  template<typename _Tp>
-    struct __make_unsigned
-    { typedef _Tp __type; };
-
-  template<>
-    struct __make_unsigned<char>
-    { typedef unsigned char __type; };
-
-  template<>
-    struct __make_unsigned<signed char>
-    { typedef unsigned char __type; };
-
-  template<>
-    struct __make_unsigned<short>
-    { typedef unsigned short __type; };
-
-  template<>
-    struct __make_unsigned<int>
-    { typedef unsigned int __type; };
-
-  template<>
-    struct __make_unsigned<long>
-    { typedef unsigned long __type; };
-
-  template<>
-    struct __make_unsigned<long long>
-    { typedef unsigned long long __type; };
-
-#if defined(_GLIBCXX_USE_WCHAR_T) && !defined(__WCHAR_UNSIGNED__)
-  template<>
-    struct __make_unsigned<wchar_t> : __make_unsigned<__WCHAR_TYPE__>
-    { };
-#endif
-
-#if defined(__GLIBCXX_TYPE_INT_N_0)
-  template<>
-    struct __make_unsigned<__GLIBCXX_TYPE_INT_N_0>
-    { typedef unsigned __GLIBCXX_TYPE_INT_N_0 __type; };
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_1)
-  template<>
-    struct __make_unsigned<__GLIBCXX_TYPE_INT_N_1>
-    { typedef unsigned __GLIBCXX_TYPE_INT_N_1 __type; };
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_2)
-  template<>
-    struct __make_unsigned<__GLIBCXX_TYPE_INT_N_2>
-    { typedef unsigned __GLIBCXX_TYPE_INT_N_2 __type; };
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_3)
-  template<>
-    struct __make_unsigned<__GLIBCXX_TYPE_INT_N_3>
-    { typedef unsigned __GLIBCXX_TYPE_INT_N_3 __type; };
-#endif
-
-  // Select between integral and enum: not possible to be both.
-  template<typename _Tp, 
-	   bool _IsInt = is_integral<_Tp>::value,
-	   bool _IsEnum = is_enum<_Tp>::value>
-    class __make_unsigned_selector;
-
-  template<typename _Tp>
-    class __make_unsigned_selector<_Tp, true, false>
-    {
-      typedef __make_unsigned<typename remove_cv<_Tp>::type> __unsignedt;
-      typedef typename __unsignedt::__type __unsigned_type;
-      typedef __match_cv_qualifiers<_Tp, __unsigned_type> __cv_unsigned;
-
-    public:
-      typedef typename __cv_unsigned::__type __type;
-    };
-
-  template<typename _Tp>
-    class __make_unsigned_selector<_Tp, false, true>
-    {
-      // With -fshort-enums, an enum may be as small as a char.
-      typedef unsigned char __smallest;
-      static const bool __b0 = sizeof(_Tp) <= sizeof(__smallest);
-      static const bool __b1 = sizeof(_Tp) <= sizeof(unsigned short);
-      static const bool __b2 = sizeof(_Tp) <= sizeof(unsigned int);
-      typedef conditional<__b2, unsigned int, unsigned long> __cond2;
-      typedef typename __cond2::type __cond2_type;
-      typedef conditional<__b1, unsigned short, __cond2_type> __cond1;
-      typedef typename __cond1::type __cond1_type;
-
-    public:
-      typedef typename conditional<__b0, __smallest, __cond1_type>::type __type;
-    };
-
-  // Given an integral/enum type, return the corresponding unsigned
-  // integer type.
-  // Primary template.
-  /// make_unsigned
-  template<typename _Tp>
-    struct make_unsigned 
-    { typedef typename __make_unsigned_selector<_Tp>::__type type; };
-
-  // Integral, but don't define.
-  template<>
-    struct make_unsigned<bool>;
-
-
-  // Utility for finding the signed versions of unsigned integral types.
-  template<typename _Tp>
-    struct __make_signed
-    { typedef _Tp __type; };
-
-  template<>
-    struct __make_signed<char>
-    { typedef signed char __type; };
-
-  template<>
-    struct __make_signed<unsigned char>
-    { typedef signed char __type; };
-
-  template<>
-    struct __make_signed<unsigned short>
-    { typedef signed short __type; };
-
-  template<>
-    struct __make_signed<unsigned int>
-    { typedef signed int __type; };
-
-  template<>
-    struct __make_signed<unsigned long>
-    { typedef signed long __type; };
-
-  template<>
-    struct __make_signed<unsigned long long>
-    { typedef signed long long __type; };
-
-#if defined(_GLIBCXX_USE_WCHAR_T) && defined(__WCHAR_UNSIGNED__)
-  template<>
-    struct __make_signed<wchar_t> : __make_signed<__WCHAR_TYPE__>
-    { };
-#endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
-  template<>
-    struct __make_signed<char16_t> : __make_signed<uint_least16_t>
-    { };
-  template<>
-    struct __make_signed<char32_t> : __make_signed<uint_least32_t>
-    { };
-#endif
-
-#if defined(__GLIBCXX_TYPE_INT_N_0)
-  template<>
-    struct __make_signed<unsigned __GLIBCXX_TYPE_INT_N_0>
-    { typedef __GLIBCXX_TYPE_INT_N_0 __type; };
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_1)
-  template<>
-    struct __make_signed<unsigned __GLIBCXX_TYPE_INT_N_1>
-    { typedef __GLIBCXX_TYPE_INT_N_1 __type; };
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_2)
-  template<>
-    struct __make_signed<unsigned __GLIBCXX_TYPE_INT_N_2>
-    { typedef __GLIBCXX_TYPE_INT_N_2 __type; };
-#endif
-#if defined(__GLIBCXX_TYPE_INT_N_3)
-  template<>
-    struct __make_signed<unsigned __GLIBCXX_TYPE_INT_N_3>
-    { typedef __GLIBCXX_TYPE_INT_N_3 __type; };
-#endif
-
-  // Select between integral and enum: not possible to be both.
-  template<typename _Tp, 
-	   bool _IsInt = is_integral<_Tp>::value,
-	   bool _IsEnum = is_enum<_Tp>::value>
-    class __make_signed_selector;
-
-  template<typename _Tp>
-    class __make_signed_selector<_Tp, true, false>
-    {
-      typedef __make_signed<typename remove_cv<_Tp>::type> __signedt;
-      typedef typename __signedt::__type __signed_type;
-      typedef __match_cv_qualifiers<_Tp, __signed_type> __cv_signed;
-
-    public:
-      typedef typename __cv_signed::__type __type;
-    };
-
-  template<typename _Tp>
-    class __make_signed_selector<_Tp, false, true>
-    {
-      // With -fshort-enums, an enum may be as small as a char.
-      typedef signed char __smallest;
-      static const bool __b0 = sizeof(_Tp) <= sizeof(__smallest);
-      static const bool __b1 = sizeof(_Tp) <= sizeof(signed short);
-      static const bool __b2 = sizeof(_Tp) <= sizeof(signed int);
-      typedef conditional<__b2, signed int, signed long> __cond2;
-      typedef typename __cond2::type __cond2_type;
-      typedef conditional<__b1, signed short, __cond2_type> __cond1;
-      typedef typename __cond1::type __cond1_type;
-
-    public:
-      typedef typename conditional<__b0, __smallest, __cond1_type>::type __type;
-    };
-
-  // Given an integral/enum type, return the corresponding signed
-  // integer type.
-  // Primary template.
-  /// make_signed
-  template<typename _Tp>
-    struct make_signed 
-    { typedef typename __make_signed_selector<_Tp>::__type type; };
-
-  // Integral, but don't define.
-  template<>
-    struct make_signed<bool>;
-
-#if __cplusplus > 201103L
-  /// Alias template for make_signed
-  template<typename _Tp>
-    using make_signed_t = typename make_signed<_Tp>::type;
-
-  /// Alias template for make_unsigned
-  template<typename _Tp>
-    using make_unsigned_t = typename make_unsigned<_Tp>::type;
-#endif
-
-  // Array modifications.
-
-  /// remove_extent
-  template<typename _Tp>
-    struct remove_extent
-    { typedef _Tp     type; };
-
-  template<typename _Tp, std::size_t _Size>
-    struct remove_extent<_Tp[_Size]>
-    { typedef _Tp     type; };
-
-  template<typename _Tp>
-    struct remove_extent<_Tp[]>
-    { typedef _Tp     type; };
-
-  /// remove_all_extents
-  template<typename _Tp>
-    struct remove_all_extents
-    { typedef _Tp     type; };
-
-  template<typename _Tp, std::size_t _Size>
-    struct remove_all_extents<_Tp[_Size]>
-    { typedef typename remove_all_extents<_Tp>::type     type; };
-
-  template<typename _Tp>
-    struct remove_all_extents<_Tp[]>
-    { typedef typename remove_all_extents<_Tp>::type     type; };
-
-#if __cplusplus > 201103L
-  /// Alias template for remove_extent
-  template<typename _Tp>
-    using remove_extent_t = typename remove_extent<_Tp>::type;
-
-  /// Alias template for remove_all_extents
-  template<typename _Tp>
-    using remove_all_extents_t = typename remove_all_extents<_Tp>::type;
-#endif
-
-  // Pointer modifications.
-
-  template<typename _Tp, typename>
-    struct __remove_pointer_helper
-    { typedef _Tp     type; };
-
-  template<typename _Tp, typename _Up>
-    struct __remove_pointer_helper<_Tp, _Up*>
-    { typedef _Up     type; };
-
-  /// remove_pointer
-  template<typename _Tp>
-    struct remove_pointer
-    : public __remove_pointer_helper<_Tp, typename remove_cv<_Tp>::type>
-    { };
-
-  /// add_pointer
-  template<typename _Tp, bool = __or_<__is_referenceable<_Tp>,
-				      is_void<_Tp>>::value>
-    struct __add_pointer_helper
-    { typedef _Tp     type; };
-
-  template<typename _Tp>
-    struct __add_pointer_helper<_Tp, true>
-    { typedef typename remove_reference<_Tp>::type*     type; };
-
-  template<typename _Tp>
-    struct add_pointer 
-    : public __add_pointer_helper<_Tp>
-    { };
-
-#if __cplusplus > 201103L
-  /// Alias template for remove_pointer
-  template<typename _Tp>
-    using remove_pointer_t = typename remove_pointer<_Tp>::type;
-
-  /// Alias template for add_pointer
-  template<typename _Tp>
-    using add_pointer_t = typename add_pointer<_Tp>::type;
-#endif
-
-  template<std::size_t _Len>
-    struct __aligned_storage_msa
-    { 
-      union __type
-      {
-	unsigned char __data[_Len];
-	struct __attribute__((__aligned__)) { } __align; 
-      };
-    };
-
-  /**
-   *  @brief Alignment type.
-   *
-   *  The value of _Align is a default-alignment which shall be the
-   *  most stringent alignment requirement for any C++ object type
-   *  whose size is no greater than _Len (3.9). The member typedef
-   *  type shall be a POD type suitable for use as uninitialized
-   *  storage for any object whose size is at most _Len and whose
-   *  alignment is a divisor of _Align.
-  */
-  template<std::size_t _Len, std::size_t _Align =
-	   __alignof__(typename __aligned_storage_msa<_Len>::__type)>
-    struct aligned_storage
-    { 
-      union type
-      {
-	unsigned char __data[_Len];
-	struct __attribute__((__aligned__((_Align)))) { } __align; 
-      };
-    };
-
-  template <typename... _Types>
-    struct __strictest_alignment
-    {
-      static const size_t _S_alignment = 0;
-      static const size_t _S_size = 0;
-    };
-
-  template <typename _Tp, typename... _Types>
-    struct __strictest_alignment<_Tp, _Types...>
-    {
-      static const size_t _S_alignment =
-        alignof(_Tp) > __strictest_alignment<_Types...>::_S_alignment
-	? alignof(_Tp) : __strictest_alignment<_Types...>::_S_alignment;
-      static const size_t _S_size =
-        sizeof(_Tp) > __strictest_alignment<_Types...>::_S_size
-	? sizeof(_Tp) : __strictest_alignment<_Types...>::_S_size;
-    };
-
-  /**
-   *  @brief Provide aligned storage for types.
-   *
-   *  [meta.trans.other]
-   *
-   *  Provides aligned storage for any of the provided types of at
-   *  least size _Len.
-   *
-   *  @see aligned_storage
-   */
-  template <size_t _Len, typename... _Types>
-    struct aligned_union
-    {
-    private:
-      static_assert(sizeof...(_Types) != 0, "At least one type is required");
-
-      using __strictest = __strictest_alignment<_Types...>;
-      static const size_t _S_len = _Len > __strictest::_S_size
-	? _Len : __strictest::_S_size;
-    public:
-      /// The value of the strictest alignment of _Types.
-      static const size_t alignment_value = __strictest::_S_alignment;
-      /// The storage.
-      typedef typename aligned_storage<_S_len, alignment_value>::type type;
-    };
-
-  template <size_t _Len, typename... _Types>
-    const size_t aligned_union<_Len, _Types...>::alignment_value;
-
-  // Decay trait for arrays and functions, used for perfect forwarding
-  // in make_pair, make_tuple, etc.
-  template<typename _Up, 
-	   bool _IsArray = is_array<_Up>::value,
-	   bool _IsFunction = is_function<_Up>::value> 
-    struct __decay_selector;
-
-  // NB: DR 705.
-  template<typename _Up> 
-    struct __decay_selector<_Up, false, false>
-    { typedef typename remove_cv<_Up>::type __type; };
-
-  template<typename _Up> 
-    struct __decay_selector<_Up, true, false>
-    { typedef typename remove_extent<_Up>::type* __type; };
-
-  template<typename _Up> 
-    struct __decay_selector<_Up, false, true>
-    { typedef typename add_pointer<_Up>::type __type; };
-
-  /// decay
-  template<typename _Tp> 
-    class decay 
-    { 
-      typedef typename remove_reference<_Tp>::type __remove_type;
-
-    public:
-      typedef typename __decay_selector<__remove_type>::__type type;
-    };
-
-  template<typename _Tp>
-    class reference_wrapper;
-
-  // Helper which adds a reference to a type when given a reference_wrapper
-  template<typename _Tp>
-    struct __strip_reference_wrapper
-    {
-      typedef _Tp __type;
-    };
-
-  template<typename _Tp>
-    struct __strip_reference_wrapper<reference_wrapper<_Tp> >
-    {
-      typedef _Tp& __type;
-    };
-
-  template<typename _Tp>
-    struct __decay_and_strip
-    {
-      typedef typename __strip_reference_wrapper<
-	typename decay<_Tp>::type>::__type __type;
-    };
-
-
-  // Primary template.
-  /// Define a member typedef @c type only if a boolean constant is true.
-  template<bool, typename _Tp = void>
-    struct enable_if 
-    { };
-
-  // Partial specialization for true.
-  template<typename _Tp>
-    struct enable_if<true, _Tp>
-    { typedef _Tp type; };
-
-  template<typename... _Cond>
-    using _Require = typename enable_if<__and_<_Cond...>::value>::type;
-
-  // Primary template.
-  /// Define a member typedef @c type to one of two argument types.
-  template<bool _Cond, typename _Iftrue, typename _Iffalse>
-    struct conditional
-    { typedef _Iftrue type; };
-
-  // Partial specialization for false.
-  template<typename _Iftrue, typename _Iffalse>
-    struct conditional<false, _Iftrue, _Iffalse>
-    { typedef _Iffalse type; };
-
-  /// common_type
-  template<typename... _Tp>
-    struct common_type;
-
-  // Sfinae-friendly common_type implementation:
-
-  struct __do_common_type_impl
-  {
-    template<typename _Tp, typename _Up>
-      static __success_type<typename decay<decltype
-			    (true ? std::declval<_Tp>()
-			     : std::declval<_Up>())>::type> _S_test(int);
-
-    template<typename, typename>
-      static __failure_type _S_test(...);
-  };
-
-  template<typename _Tp, typename _Up>
-    struct __common_type_impl
-    : private __do_common_type_impl
-    {
-      typedef decltype(_S_test<_Tp, _Up>(0)) type;
-    };
-
-  struct __do_member_type_wrapper
-  {
-    template<typename _Tp>
-      static __success_type<typename _Tp::type> _S_test(int);
-
-    template<typename>
-      static __failure_type _S_test(...);
-  };
-
-  template<typename _Tp>
-    struct __member_type_wrapper
-    : private __do_member_type_wrapper
-    {
-      typedef decltype(_S_test<_Tp>(0)) type;
-    };
-
-  template<typename _CTp, typename... _Args>
-    struct __expanded_common_type_wrapper
-    {
-      typedef common_type<typename _CTp::type, _Args...> type;
-    };
-
-  template<typename... _Args>
-    struct __expanded_common_type_wrapper<__failure_type, _Args...>
-    { typedef __failure_type type; };
-
-  template<typename _Tp>
-    struct common_type<_Tp>
-    { typedef typename decay<_Tp>::type type; };
-
-  template<typename _Tp, typename _Up>
-    struct common_type<_Tp, _Up>
-    : public __common_type_impl<_Tp, _Up>::type
-    { };
-
-  template<typename _Tp, typename _Up, typename... _Vp>
-    struct common_type<_Tp, _Up, _Vp...>
-    : public __expanded_common_type_wrapper<typename __member_type_wrapper<
-               common_type<_Tp, _Up>>::type, _Vp...>::type
-    { };
-
-  /// The underlying type of an enum.
-  template<typename _Tp>
-    struct underlying_type
-    {
-      typedef __underlying_type(_Tp) type;
-    };
-
-  template<typename _Tp>
-    struct __declval_protector
-    {
-      static const bool __stop = false;
-      static typename add_rvalue_reference<_Tp>::type __delegate();
-    };
-
-  template<typename _Tp>
-    inline typename add_rvalue_reference<_Tp>::type
-    declval() noexcept
-    {
-      static_assert(__declval_protector<_Tp>::__stop,
-		    "declval() must not be used!");
-      return __declval_protector<_Tp>::__delegate();
-    }
-
-  /// result_of
-  template<typename _Signature>
-    class result_of;
-
-  // Sfinae-friendly result_of implementation:
-
-#define __cpp_lib_result_of_sfinae 201210
-
-  // [func.require] paragraph 1 bullet 1:
-  struct __result_of_memfun_ref_impl
-  {
-    template<typename _Fp, typename _Tp1, typename... _Args>
-      static __success_type<decltype(
-      (std::declval<_Tp1>().*std::declval<_Fp>())(std::declval<_Args>()...)
-      )> _S_test(int);
-
-    template<typename...>
-      static __failure_type _S_test(...);
-  };
-
-  template<typename _MemPtr, typename _Arg, typename... _Args>
-    struct __result_of_memfun_ref
-    : private __result_of_memfun_ref_impl
-    {
-      typedef decltype(_S_test<_MemPtr, _Arg, _Args...>(0)) type;
-    };
-
-  // [func.require] paragraph 1 bullet 2:
-  struct __result_of_memfun_deref_impl
-  {
-    template<typename _Fp, typename _Tp1, typename... _Args>
-      static __success_type<decltype(
-      ((*std::declval<_Tp1>()).*std::declval<_Fp>())(std::declval<_Args>()...)
-      )> _S_test(int);
-
-    template<typename...>
-      static __failure_type _S_test(...);
-  };
-
-  template<typename _MemPtr, typename _Arg, typename... _Args>
-    struct __result_of_memfun_deref
-    : private __result_of_memfun_deref_impl
-    {
-      typedef decltype(_S_test<_MemPtr, _Arg, _Args...>(0)) type;
-    };
-
-  // [func.require] paragraph 1 bullet 3:
-  struct __result_of_memobj_ref_impl
-  {
-    template<typename _Fp, typename _Tp1>
-      static __success_type<decltype(
-      std::declval<_Tp1>().*std::declval<_Fp>()
-      )> _S_test(int);
-
-    template<typename, typename>
-      static __failure_type _S_test(...);
-  };
-
-  template<typename _MemPtr, typename _Arg>
-    struct __result_of_memobj_ref
-    : private __result_of_memobj_ref_impl
-    {
-      typedef decltype(_S_test<_MemPtr, _Arg>(0)) type;
-    };
-
-  // [func.require] paragraph 1 bullet 4:
-  struct __result_of_memobj_deref_impl
-  {
-    template<typename _Fp, typename _Tp1>
-      static __success_type<decltype(
-      (*std::declval<_Tp1>()).*std::declval<_Fp>()
-      )> _S_test(int);
-
-    template<typename, typename>
-      static __failure_type _S_test(...);
-  };
-
-  template<typename _MemPtr, typename _Arg>
-    struct __result_of_memobj_deref
-    : private __result_of_memobj_deref_impl
-    {
-      typedef decltype(_S_test<_MemPtr, _Arg>(0)) type;
-    };
-
-  template<typename _MemPtr, typename _Arg>
-    struct __result_of_memobj;
-
-  template<typename _Res, typename _Class, typename _Arg>
-    struct __result_of_memobj<_Res _Class::*, _Arg>
-    {
-      typedef typename remove_cv<typename remove_reference<
-        _Arg>::type>::type _Argval;
-      typedef _Res _Class::* _MemPtr;
-      typedef typename conditional<__or_<is_same<_Argval, _Class>,
-        is_base_of<_Class, _Argval>>::value,
-        __result_of_memobj_ref<_MemPtr, _Arg>,
-        __result_of_memobj_deref<_MemPtr, _Arg>
-      >::type::type type;
-    };
-
-  template<typename _MemPtr, typename _Arg, typename... _Args>
-    struct __result_of_memfun;
-
-  template<typename _Res, typename _Class, typename _Arg, typename... _Args>
-    struct __result_of_memfun<_Res _Class::*, _Arg, _Args...>
-    {
-      typedef typename remove_cv<typename remove_reference<
-        _Arg>::type>::type _Argval;
-      typedef _Res _Class::* _MemPtr;
-      typedef typename conditional<__or_<is_same<_Argval, _Class>,
-        is_base_of<_Class, _Argval>>::value,
-        __result_of_memfun_ref<_MemPtr, _Arg, _Args...>,
-        __result_of_memfun_deref<_MemPtr, _Arg, _Args...>
-      >::type::type type;
-    };
-
-  template<bool, bool, typename _Functor, typename... _ArgTypes>
-    struct __result_of_impl
-    {
-      typedef __failure_type type;
-    };
-
-  template<typename _MemPtr, typename _Arg>
-    struct __result_of_impl<true, false, _MemPtr, _Arg>
-    : public __result_of_memobj<typename decay<_MemPtr>::type, _Arg>
-    { };
-
-  template<typename _MemPtr, typename _Arg, typename... _Args>
-    struct __result_of_impl<false, true, _MemPtr, _Arg, _Args...>
-    : public __result_of_memfun<typename decay<_MemPtr>::type, _Arg, _Args...>
-    { };
-
-  // [func.require] paragraph 1 bullet 5:
-  struct __result_of_other_impl
-  {
-    template<typename _Fn, typename... _Args>
-      static __success_type<decltype(
-      std::declval<_Fn>()(std::declval<_Args>()...)
-      )> _S_test(int);
-
-    template<typename...>
-      static __failure_type _S_test(...);
-  };
-
-  template<typename _Functor, typename... _ArgTypes>
-    struct __result_of_impl<false, false, _Functor, _ArgTypes...>
-    : private __result_of_other_impl
-    {
-      typedef decltype(_S_test<_Functor, _ArgTypes...>(0)) type;
-    };
-
-  template<typename _Functor, typename... _ArgTypes>
-    struct result_of<_Functor(_ArgTypes...)>
-    : public __result_of_impl<
-        is_member_object_pointer<
-          typename remove_reference<_Functor>::type
-        >::value,
-        is_member_function_pointer<
-          typename remove_reference<_Functor>::type
-        >::value,
-	    _Functor, _ArgTypes...
-      >::type
-    { };
-
-#if __cplusplus > 201103L
-  /// Alias template for aligned_storage
-  template<size_t _Len, size_t _Align =
-	    __alignof__(typename __aligned_storage_msa<_Len>::__type)>
-    using aligned_storage_t = typename aligned_storage<_Len, _Align>::type;
-
-  template <size_t _Len, typename... _Types>
-    using aligned_union_t = typename aligned_union<_Len, _Types...>::type;
-
-  /// Alias template for decay
-  template<typename _Tp>
-    using decay_t = typename decay<_Tp>::type;
-
-  /// Alias template for enable_if
-  template<bool _Cond, typename _Tp = void>
-    using enable_if_t = typename enable_if<_Cond, _Tp>::type;
-
-  /// Alias template for conditional
-  template<bool _Cond, typename _Iftrue, typename _Iffalse>
-    using conditional_t = typename conditional<_Cond, _Iftrue, _Iffalse>::type;
-
-  /// Alias template for common_type
-  template<typename... _Tp>
-    using common_type_t = typename common_type<_Tp...>::type;
-
-  /// Alias template for underlying_type
-  template<typename _Tp>
-    using underlying_type_t = typename underlying_type<_Tp>::type;
-
-  /// Alias template for result_of
-  template<typename _Tp>
-    using result_of_t = typename result_of<_Tp>::type;
-#endif
-
-  template<typename...> using __void_t = void;
-
-  /// @} group metaprogramming
-
-  /**
-   *  Use SFINAE to determine if the type _Tp has a publicly-accessible
-   *  member type _NTYPE.
-   */
-#define _GLIBCXX_HAS_NESTED_TYPE(_NTYPE)				\
-  template<typename _Tp, typename = __void_t<>>				\
-    struct __has_##_NTYPE						\
-    : false_type							\
-    { };								\
-  template<typename _Tp>						\
-    struct __has_##_NTYPE<_Tp, __void_t<typename _Tp::_NTYPE>>		\
-    : true_type								\
-    { };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif  // C++11
-
-#endif  // _GLIBCXX_TYPE_TRAITS
diff --git a/openflow/usr/include/c++/5/typeindex b/openflow/usr/include/c++/5/typeindex
deleted file mode 100644
index afb28dc..0000000
--- a/openflow/usr/include/c++/5/typeindex
+++ /dev/null
@@ -1,112 +0,0 @@
-// C++11 <typeindex> -*- C++ -*-
-
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/typeindex
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_TYPEINDEX
-#define _GLIBCXX_TYPEINDEX 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <typeinfo>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @brief Class type_index
-   * @ingroup utilities
-   *
-   *  The class type_index provides a simple wrapper for type_info
-   *  which can be used as an index type in associative containers
-   *  (23.6) and in unordered associative containers (23.7).
-   */
-  struct type_index
-  {
-    type_index(const type_info& __rhs) noexcept
-    : _M_target(&__rhs) { }
-
-    bool
-    operator==(const type_index& __rhs) const noexcept
-    { return *_M_target == *__rhs._M_target; }
-
-    bool
-    operator!=(const type_index& __rhs) const noexcept
-    { return *_M_target != *__rhs._M_target; }
-
-    bool
-    operator<(const type_index& __rhs) const noexcept
-    { return _M_target->before(*__rhs._M_target); }
-
-    bool
-    operator<=(const type_index& __rhs) const noexcept
-    { return !__rhs._M_target->before(*_M_target); }
-
-    bool
-    operator>(const type_index& __rhs) const noexcept
-    { return __rhs._M_target->before(*_M_target); }
-
-    bool
-    operator>=(const type_index& __rhs) const noexcept
-    { return !_M_target->before(*__rhs._M_target); }
-
-    size_t
-    hash_code() const noexcept
-    { return _M_target->hash_code(); }
-
-    const char*
-    name() const noexcept
-    { return _M_target->name(); }
-
-  private:
-    const type_info* _M_target;
-  };
-
-  template<typename _Tp> struct hash;
-
-  /// std::hash specialization for type_index.
-  template<>
-    struct hash<type_index>
-    {
-      typedef size_t        result_type;
-      typedef type_index  argument_type;
-
-      size_t
-      operator()(const type_index& __ti) const noexcept
-      { return __ti.hash_code(); }
-    };
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif  // C++11
-
-#endif  // _GLIBCXX_TYPEINDEX
diff --git a/openflow/usr/include/c++/5/typeinfo b/openflow/usr/include/c++/5/typeinfo
deleted file mode 100644
index f79d062..0000000
--- a/openflow/usr/include/c++/5/typeinfo
+++ /dev/null
@@ -1,222 +0,0 @@
-// RTTI support for -*- C++ -*-
-// Copyright (C) 1994-2015 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file typeinfo
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _TYPEINFO
-#define _TYPEINFO
-
-#pragma GCC system_header
-
-#include <exception>
-#if __cplusplus >= 201103L
-#include <bits/hash_bytes.h>
-#endif
-
-#pragma GCC visibility push(default)
-
-extern "C++" {
-
-namespace __cxxabiv1
-{
-  class __class_type_info;
-} // namespace __cxxabiv1
-
-// Determine whether typeinfo names for the same type are merged (in which
-// case comparison can just compare pointers) or not (in which case strings
-// must be compared), and whether comparison is to be implemented inline or
-// not.  We used to do inline pointer comparison by default if weak symbols
-// are available, but even with weak symbols sometimes names are not merged
-// when objects are loaded with RTLD_LOCAL, so now we always use strcmp by
-// default.  For ABI compatibility, we do the strcmp inline if weak symbols
-// are available, and out-of-line if not.  Out-of-line pointer comparison
-// is used where the object files are to be portable to multiple systems,
-// some of which may not be able to use pointer comparison, but the
-// particular system for which libstdc++ is being built can use pointer
-// comparison; in particular for most ARM EABI systems, where the ABI
-// specifies out-of-line comparison.  The compiler's target configuration
-// can override the defaults by defining __GXX_TYPEINFO_EQUALITY_INLINE to
-// 1 or 0 to indicate whether or not comparison is inline, and
-// __GXX_MERGED_TYPEINFO_NAMES to 1 or 0 to indicate whether or not pointer
-// comparison can be used.
-
-#ifndef __GXX_MERGED_TYPEINFO_NAMES
-// By default, typeinfo names are not merged.
-#define __GXX_MERGED_TYPEINFO_NAMES 0
-#endif
-
-// By default follow the old inline rules to avoid ABI changes.
-#ifndef __GXX_TYPEINFO_EQUALITY_INLINE
-  #if !__GXX_WEAK__
-    #define __GXX_TYPEINFO_EQUALITY_INLINE 0
-  #else
-    #define __GXX_TYPEINFO_EQUALITY_INLINE 1
-  #endif
-#endif
-
-namespace std
-{
-  /**
-   *  @brief  Part of RTTI.
-   *
-   *  The @c type_info class describes type information generated by
-   *  an implementation.
-  */
-  class type_info
-  {
-  public:
-    /** Destructor first. Being the first non-inline virtual function, this
-     *  controls in which translation unit the vtable is emitted. The
-     *  compiler makes use of that information to know where to emit
-     *  the runtime-mandated type_info structures in the new-abi.  */
-    virtual ~type_info();
-
-    /** Returns an @e implementation-defined byte string; this is not
-     *  portable between compilers!  */
-    const char* name() const _GLIBCXX_NOEXCEPT
-    { return __name[0] == '*' ? __name + 1 : __name; }
-
-#if !__GXX_TYPEINFO_EQUALITY_INLINE
-    // In old abi, or when weak symbols are not supported, there can
-    // be multiple instances of a type_info object for one
-    // type. Uniqueness must use the _name value, not object address.
-    bool before(const type_info& __arg) const _GLIBCXX_NOEXCEPT;
-    bool operator==(const type_info& __arg) const _GLIBCXX_NOEXCEPT;
-#else
-  #if !__GXX_MERGED_TYPEINFO_NAMES
-    /** Returns true if @c *this precedes @c __arg in the implementation's
-     *  collation order.  */
-    // Even with the new abi, on systems that support dlopen
-    // we can run into cases where type_info names aren't merged,
-    // so we still need to do string comparison.
-    bool before(const type_info& __arg) const _GLIBCXX_NOEXCEPT
-    { return (__name[0] == '*' && __arg.__name[0] == '*')
-	? __name < __arg.__name
-	: __builtin_strcmp (__name, __arg.__name) < 0; }
-
-    bool operator==(const type_info& __arg) const _GLIBCXX_NOEXCEPT
-    {
-      return ((__name == __arg.__name)
-	      || (__name[0] != '*' &&
-		  __builtin_strcmp (__name, __arg.__name) == 0));
-    }
-  #else
-    // On some targets we can rely on type_info's NTBS being unique,
-    // and therefore address comparisons are sufficient.
-    bool before(const type_info& __arg) const _GLIBCXX_NOEXCEPT
-    { return __name < __arg.__name; }
-
-    bool operator==(const type_info& __arg) const _GLIBCXX_NOEXCEPT
-    { return __name == __arg.__name; }
-  #endif
-#endif
-    bool operator!=(const type_info& __arg) const _GLIBCXX_NOEXCEPT
-    { return !operator==(__arg); }
-
-#if __cplusplus >= 201103L
-    size_t hash_code() const noexcept
-    {
-#  if !__GXX_MERGED_TYPEINFO_NAMES
-      return _Hash_bytes(name(), __builtin_strlen(name()),
-			 static_cast<size_t>(0xc70f6907UL));
-#  else
-      return reinterpret_cast<size_t>(__name);
-#  endif
-    }
-#endif // C++11
-
-    // Return true if this is a pointer type of some kind
-    virtual bool __is_pointer_p() const;
-
-    // Return true if this is a function type
-    virtual bool __is_function_p() const;
-
-    // Try and catch a thrown type. Store an adjusted pointer to the
-    // caught type in THR_OBJ. If THR_TYPE is not a pointer type, then
-    // THR_OBJ points to the thrown object. If THR_TYPE is a pointer
-    // type, then THR_OBJ is the pointer itself. OUTER indicates the
-    // number of outer pointers, and whether they were const
-    // qualified.
-    virtual bool __do_catch(const type_info *__thr_type, void **__thr_obj,
-			    unsigned __outer) const;
-
-    // Internally used during catch matching
-    virtual bool __do_upcast(const __cxxabiv1::__class_type_info *__target,
-			     void **__obj_ptr) const;
-
-  protected:
-    const char *__name;
-
-    explicit type_info(const char *__n): __name(__n) { }
-
-  private:
-    /// Assigning type_info is not supported.
-    type_info& operator=(const type_info&);
-    type_info(const type_info&);
-  };
-
-  /**
-   *  @brief  Thrown during incorrect typecasting.
-   *  @ingroup exceptions
-   *
-   *  If you attempt an invalid @c dynamic_cast expression, an instance of
-   *  this class (or something derived from this class) is thrown.  */
-  class bad_cast : public exception
-  {
-  public:
-    bad_cast() _GLIBCXX_USE_NOEXCEPT { }
-
-    // This declaration is not useless:
-    // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
-    virtual ~bad_cast() _GLIBCXX_USE_NOEXCEPT;
-
-    // See comment in eh_exception.cc.
-    virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
-  };
-
-  /**
-   *  @brief Thrown when a NULL pointer in a @c typeid expression is used.
-   *  @ingroup exceptions
-   */
-  class bad_typeid : public exception
-  {
-  public:
-    bad_typeid () _GLIBCXX_USE_NOEXCEPT { }
-
-    // This declaration is not useless:
-    // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
-    virtual ~bad_typeid() _GLIBCXX_USE_NOEXCEPT;
-
-    // See comment in eh_exception.cc.
-    virtual const char* what() const _GLIBCXX_USE_NOEXCEPT;
-  };
-} // namespace std
-
-} // extern "C++"
-
-#pragma GCC visibility pop
-
-#endif
diff --git a/openflow/usr/include/c++/5/unordered_map b/openflow/usr/include/c++/5/unordered_map
deleted file mode 100644
index 4489991..0000000
--- a/openflow/usr/include/c++/5/unordered_map
+++ /dev/null
@@ -1,61 +0,0 @@
-// <unordered_map> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/unordered_map
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_UNORDERED_MAP
-#define _GLIBCXX_UNORDERED_MAP 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <utility>
-#include <type_traits>
-#include <initializer_list>
-#include <tuple>
-#include <bits/allocator.h>
-#include <ext/alloc_traits.h>
-#include <ext/aligned_buffer.h>
-#include <bits/stl_function.h> // equal_to, _Identity, _Select1st
-#include <bits/functional_hash.h>
-#include <bits/hashtable.h>
-#include <bits/unordered_map.h>
-#include <bits/range_access.h>
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/unordered_map>
-#endif
-
-#ifdef _GLIBCXX_PROFILE
-# include <profile/unordered_map>
-#endif
-
-#endif // C++11
-
-#endif // _GLIBCXX_UNORDERED_MAP
diff --git a/openflow/usr/include/c++/5/unordered_set b/openflow/usr/include/c++/5/unordered_set
deleted file mode 100644
index 233af64..0000000
--- a/openflow/usr/include/c++/5/unordered_set
+++ /dev/null
@@ -1,60 +0,0 @@
-// <unordered_set> -*- C++ -*-
-
-// Copyright (C) 2007-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/unordered_set
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_UNORDERED_SET
-#define _GLIBCXX_UNORDERED_SET 1
-
-#pragma GCC system_header
-
-#if __cplusplus < 201103L
-# include <bits/c++0x_warning.h>
-#else
-
-#include <utility>
-#include <type_traits>
-#include <initializer_list>
-#include <tuple>
-#include <bits/allocator.h>
-#include <ext/alloc_traits.h>
-#include <ext/aligned_buffer.h>
-#include <bits/stl_function.h> // equal_to, _Identity, _Select1st
-#include <bits/functional_hash.h>
-#include <bits/hashtable.h>
-#include <bits/unordered_set.h>
-#include <bits/range_access.h>
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/unordered_set>
-#endif
-
-#ifdef _GLIBCXX_PROFILE
-# include <profile/unordered_set>
-#endif
-#endif // C++11
-
-#endif // _GLIBCXX_UNORDERED_SET
diff --git a/openflow/usr/include/c++/5/utility b/openflow/usr/include/c++/5/utility
deleted file mode 100644
index 1aac77c..0000000
--- a/openflow/usr/include/c++/5/utility
+++ /dev/null
@@ -1,272 +0,0 @@
-// <utility> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/utility
- *  This is a Standard C++ Library header. 
- */
-
-#ifndef _GLIBCXX_UTILITY
-#define _GLIBCXX_UTILITY 1
-
-#pragma GCC system_header
-
-/**
- * @defgroup utilities Utilities
- *
- * Components deemed generally useful. Includes pair, tuple,
- * forward/move helpers, ratio, function object, metaprogramming and
- * type traits, time, date, and memory functions.
- */
-
-#include <bits/c++config.h>
-#include <bits/stl_relops.h>
-#include <bits/stl_pair.h>
-
-#if __cplusplus >= 201103L
-
-#include <bits/move.h>
-#include <initializer_list>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<class _Tp>
-    class tuple_size;
-
-  template<std::size_t _Int, class _Tp>
-    class tuple_element;
-
-   // Various functions which give std::pair a tuple-like interface.
-
-  /// Partial specialization for std::pair
-  template<class _Tp1, class _Tp2>
-    struct tuple_size<std::pair<_Tp1, _Tp2>>
-    : public integral_constant<std::size_t, 2> { };
-
-  /// Partial specialization for std::pair
-  template<class _Tp1, class _Tp2>
-    struct tuple_element<0, std::pair<_Tp1, _Tp2>>
-    { typedef _Tp1 type; };
- 
-  /// Partial specialization for std::pair
-  template<class _Tp1, class _Tp2>
-    struct tuple_element<1, std::pair<_Tp1, _Tp2>>
-    { typedef _Tp2 type; };
-
-  template<std::size_t _Int>
-    struct __pair_get;
-
-  template<>
-    struct __pair_get<0>
-    {
-      template<typename _Tp1, typename _Tp2>
-        static constexpr _Tp1&
-        __get(std::pair<_Tp1, _Tp2>& __pair) noexcept
-        { return __pair.first; }
-
-      template<typename _Tp1, typename _Tp2>
-        static constexpr _Tp1&&
-        __move_get(std::pair<_Tp1, _Tp2>&& __pair) noexcept
-        { return std::forward<_Tp1>(__pair.first); }
-
-      template<typename _Tp1, typename _Tp2>
-        static constexpr const _Tp1&
-        __const_get(const std::pair<_Tp1, _Tp2>& __pair) noexcept
-        { return __pair.first; }
-    };
-
-  template<>
-    struct __pair_get<1>
-    {
-      template<typename _Tp1, typename _Tp2>
-        static constexpr _Tp2&
-        __get(std::pair<_Tp1, _Tp2>& __pair) noexcept
-        { return __pair.second; }
-
-      template<typename _Tp1, typename _Tp2>
-        static constexpr _Tp2&&
-        __move_get(std::pair<_Tp1, _Tp2>&& __pair) noexcept
-        { return std::forward<_Tp2>(__pair.second); }
-
-      template<typename _Tp1, typename _Tp2>
-        static constexpr const _Tp2&
-        __const_get(const std::pair<_Tp1, _Tp2>& __pair) noexcept
-        { return __pair.second; }
-    };
-
-  template<std::size_t _Int, class _Tp1, class _Tp2>
-    constexpr typename tuple_element<_Int, std::pair<_Tp1, _Tp2>>::type&
-    get(std::pair<_Tp1, _Tp2>& __in) noexcept
-    { return __pair_get<_Int>::__get(__in); }
-
-  template<std::size_t _Int, class _Tp1, class _Tp2>
-    constexpr typename tuple_element<_Int, std::pair<_Tp1, _Tp2>>::type&&
-    get(std::pair<_Tp1, _Tp2>&& __in) noexcept
-    { return __pair_get<_Int>::__move_get(std::move(__in)); }
-
-  template<std::size_t _Int, class _Tp1, class _Tp2>
-    constexpr const typename tuple_element<_Int, std::pair<_Tp1, _Tp2>>::type&
-    get(const std::pair<_Tp1, _Tp2>& __in) noexcept
-    { return __pair_get<_Int>::__const_get(__in); }
-
-#if __cplusplus > 201103L
-
-#define __cpp_lib_tuples_by_type 201304
-
-  template <typename _Tp, typename _Up>
-    constexpr _Tp&
-    get(pair<_Tp, _Up>& __p) noexcept
-    { return __p.first; }
-
-  template <typename _Tp, typename _Up>
-    constexpr const _Tp&
-    get(const pair<_Tp, _Up>& __p) noexcept
-    { return __p.first; }
-
-  template <typename _Tp, typename _Up>
-    constexpr _Tp&&
-    get(pair<_Tp, _Up>&& __p) noexcept
-    { return std::move(__p.first); }
-
-  template <typename _Tp, typename _Up>
-    constexpr _Tp&
-    get(pair<_Up, _Tp>& __p) noexcept
-    { return __p.second; }
-
-  template <typename _Tp, typename _Up>
-    constexpr const _Tp&
-    get(const pair<_Up, _Tp>& __p) noexcept
-    { return __p.second; }
-
-  template <typename _Tp, typename _Up>
-    constexpr _Tp&&
-    get(pair<_Up, _Tp>&& __p) noexcept
-    { return std::move(__p.second); }
-
-#define __cpp_lib_exchange_function 201304
-
-  /// Assign @p __new_val to @p __obj and return its previous value.
-  template <typename _Tp, typename _Up = _Tp>
-    inline _Tp
-    exchange(_Tp& __obj, _Up&& __new_val)
-    { return std::__exchange(__obj, std::forward<_Up>(__new_val)); }
-#endif
-
-  // Stores a tuple of indices.  Used by tuple and pair, and by bind() to
-  // extract the elements in a tuple.
-  template<size_t... _Indexes>
-    struct _Index_tuple
-    {
-      typedef _Index_tuple<_Indexes..., sizeof...(_Indexes)> __next;
-    };
-
-  // Builds an _Index_tuple<0, 1, 2, ..., _Num-1>.
-  template<size_t _Num>
-    struct _Build_index_tuple
-    {
-      typedef typename _Build_index_tuple<_Num - 1>::__type::__next __type;
-    };
-
-  template<>
-    struct _Build_index_tuple<0>
-    {
-      typedef _Index_tuple<> __type;
-    };
-
-#if __cplusplus > 201103L
-
-#define __cpp_lib_integer_sequence 201304
-
-  /// Class template integer_sequence
-  template<typename _Tp, _Tp... _Idx>
-    struct integer_sequence
-    {
-      typedef _Tp value_type;
-      static constexpr size_t size() { return sizeof...(_Idx); }
-    };
-
-  template<typename _Tp, _Tp _Num,
-	   typename _ISeq = typename _Build_index_tuple<_Num>::__type>
-    struct _Make_integer_sequence;
-
-  template<typename _Tp, _Tp _Num,  size_t... _Idx>
-    struct _Make_integer_sequence<_Tp, _Num, _Index_tuple<_Idx...>>
-    {
-      static_assert( _Num >= 0,
-		     "Cannot make integer sequence of negative length" );
-
-      typedef integer_sequence<_Tp, static_cast<_Tp>(_Idx)...> __type;
-    };
-
-  /// Alias template make_integer_sequence
-  template<typename _Tp, _Tp _Num>
-    using make_integer_sequence
-      = typename _Make_integer_sequence<_Tp, _Num>::__type;
-
-  /// Alias template index_sequence
-  template<size_t... _Idx>
-    using index_sequence = integer_sequence<size_t, _Idx...>;
-
-  /// Alias template make_index_sequence
-  template<size_t _Num>
-    using make_index_sequence = make_integer_sequence<size_t, _Num>;
-
-  /// Alias template index_sequence_for
-  template<typename... _Types>
-    using index_sequence_for = make_index_sequence<sizeof...(_Types)>;
-#endif
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif
-
-#endif /* _GLIBCXX_UTILITY */
diff --git a/openflow/usr/include/c++/5/valarray b/openflow/usr/include/c++/5/valarray
deleted file mode 100644
index 8275249..0000000
--- a/openflow/usr/include/c++/5/valarray
+++ /dev/null
@@ -1,1235 +0,0 @@
-// The template and inlines for the -*- C++ -*- valarray class.
-
-// Copyright (C) 1997-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/** @file include/valarray
- *  This is a Standard C++ Library header. 
- */
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-#ifndef _GLIBCXX_VALARRAY
-#define _GLIBCXX_VALARRAY 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <cmath>
-#include <algorithm>
-#include <debug/debug.h>
-#if __cplusplus >= 201103L
-#include <initializer_list>
-#endif
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<class _Clos, typename _Tp> 
-    class _Expr;
-
-  template<typename _Tp1, typename _Tp2> 
-    class _ValArray;    
-
-  template<class _Oper, template<class, class> class _Meta, class _Dom>
-    struct _UnClos;
-
-  template<class _Oper,
-        template<class, class> class _Meta1,
-        template<class, class> class _Meta2,
-        class _Dom1, class _Dom2> 
-    class _BinClos;
-
-  template<template<class, class> class _Meta, class _Dom> 
-    class _SClos;
-
-  template<template<class, class> class _Meta, class _Dom> 
-    class _GClos;
-    
-  template<template<class, class> class _Meta, class _Dom> 
-    class _IClos;
-    
-  template<template<class, class> class _Meta, class _Dom> 
-    class _ValFunClos;
-  
-  template<template<class, class> class _Meta, class _Dom> 
-    class _RefFunClos;
-
-  template<class _Tp> class valarray;   // An array of type _Tp
-  class slice;                          // BLAS-like slice out of an array
-  template<class _Tp> class slice_array;
-  class gslice;                         // generalized slice out of an array
-  template<class _Tp> class gslice_array;
-  template<class _Tp> class mask_array;     // masked array
-  template<class _Tp> class indirect_array; // indirected array
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#include <bits/valarray_array.h>
-#include <bits/valarray_before.h>
-  
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @defgroup numeric_arrays Numeric Arrays
-   * @ingroup numerics
-   *
-   * Classes and functions for representing and manipulating arrays of elements.
-   * @{
-   */
-
-  /**
-   *  @brief  Smart array designed to support numeric processing.
-   *
-   *  A valarray is an array that provides constraints intended to allow for
-   *  effective optimization of numeric array processing by reducing the
-   *  aliasing that can result from pointer representations.  It represents a
-   *  one-dimensional array from which different multidimensional subsets can
-   *  be accessed and modified.
-   *  
-   *  @tparam  _Tp  Type of object in the array.
-   */
-  template<class _Tp> 
-    class valarray
-    {
-      template<class _Op>
-	struct _UnaryOp 
-	{
-	  typedef typename __fun<_Op, _Tp>::result_type __rt;
-	  typedef _Expr<_UnClos<_Op, _ValArray, _Tp>, __rt> _Rt;
-	};
-    public:
-      typedef _Tp value_type;
-      
-	// _lib.valarray.cons_ construct/destroy:
-      ///  Construct an empty array.
-      valarray();
-
-      ///  Construct an array with @a n elements.
-      explicit valarray(size_t);
-
-      ///  Construct an array with @a n elements initialized to @a t.
-      valarray(const _Tp&, size_t);
-
-      ///  Construct an array initialized to the first @a n elements of @a t.
-      valarray(const _Tp* __restrict__, size_t);
-
-      ///  Copy constructor.
-      valarray(const valarray&);
-
-#if __cplusplus >= 201103L
-      ///  Move constructor.
-      valarray(valarray&&) noexcept;
-#endif
-
-      ///  Construct an array with the same size and values in @a sa.
-      valarray(const slice_array<_Tp>&);
-
-      ///  Construct an array with the same size and values in @a ga.
-      valarray(const gslice_array<_Tp>&);
-
-      ///  Construct an array with the same size and values in @a ma.
-      valarray(const mask_array<_Tp>&);
-
-      ///  Construct an array with the same size and values in @a ia.
-      valarray(const indirect_array<_Tp>&);
-
-#if __cplusplus >= 201103L
-      ///  Construct an array with an initializer_list of values.
-      valarray(initializer_list<_Tp>);
-#endif
-
-      template<class _Dom>
-	valarray(const _Expr<_Dom, _Tp>& __e);
-
-      ~valarray() _GLIBCXX_NOEXCEPT;
-
-      // _lib.valarray.assign_ assignment:
-      /**
-       *  @brief  Assign elements to an array.
-       *
-       *  Assign elements of array to values in @a v.
-       *
-       *  @param  __v  Valarray to get values from.
-       */
-      valarray<_Tp>& operator=(const valarray<_Tp>& __v);
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Move assign elements to an array.
-       *
-       *  Move assign elements of array to values in @a v.
-       *
-       *  @param  __v  Valarray to get values from.
-       */
-      valarray<_Tp>& operator=(valarray<_Tp>&& __v) noexcept;
-#endif
-
-      /**
-       *  @brief  Assign elements to a value.
-       *
-       *  Assign all elements of array to @a t.
-       *
-       *  @param  __t  Value for elements.
-       */
-      valarray<_Tp>& operator=(const _Tp& __t);
-
-      /**
-       *  @brief  Assign elements to an array subset.
-       *
-       *  Assign elements of array to values in @a sa.  Results are undefined
-       *  if @a sa does not have the same size as this array.
-       *
-       *  @param  __sa  Array slice to get values from.
-       */
-      valarray<_Tp>& operator=(const slice_array<_Tp>& __sa);
-
-      /**
-       *  @brief  Assign elements to an array subset.
-       *
-       *  Assign elements of array to values in @a ga.  Results are undefined
-       *  if @a ga does not have the same size as this array.
-       *
-       *  @param  __ga  Array slice to get values from.
-       */
-      valarray<_Tp>& operator=(const gslice_array<_Tp>& __ga);
-
-      /**
-       *  @brief  Assign elements to an array subset.
-       *
-       *  Assign elements of array to values in @a ma.  Results are undefined
-       *  if @a ma does not have the same size as this array.
-       *
-       *  @param  __ma  Array slice to get values from.
-       */
-      valarray<_Tp>& operator=(const mask_array<_Tp>& __ma);
-
-      /**
-       *  @brief  Assign elements to an array subset.
-       *
-       *  Assign elements of array to values in @a ia.  Results are undefined
-       *  if @a ia does not have the same size as this array.
-       *
-       *  @param  __ia  Array slice to get values from.
-       */
-      valarray<_Tp>& operator=(const indirect_array<_Tp>& __ia);
-
-#if __cplusplus >= 201103L
-      /**
-       *  @brief  Assign elements to an initializer_list.
-       *
-       *  Assign elements of array to values in @a __l.  Results are undefined
-       *  if @a __l does not have the same size as this array.
-       *
-       *  @param  __l  initializer_list to get values from.
-       */
-      valarray& operator=(initializer_list<_Tp> __l);
-#endif
-
-      template<class _Dom> valarray<_Tp>&
-	operator= (const _Expr<_Dom, _Tp>&);
-
-      // _lib.valarray.access_ element access:
-      /**
-       *  Return a reference to the i'th array element.  
-       *
-       *  @param  __i  Index of element to return.
-       *  @return  Reference to the i'th element.
-       */
-      _Tp&                operator[](size_t __i);
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 389. Const overload of valarray::operator[] returns by value.
-      const _Tp&          operator[](size_t) const;
-
-      // _lib.valarray.sub_ subset operations:
-      /**
-       *  @brief  Return an array subset.
-       *
-       *  Returns a new valarray containing the elements of the array
-       *  indicated by the slice argument.  The new valarray has the same size
-       *  as the input slice.  @see slice.
-       *
-       *  @param  __s  The source slice.
-       *  @return  New valarray containing elements in @a __s.
-       */
-      _Expr<_SClos<_ValArray, _Tp>, _Tp> operator[](slice __s) const;
-
-      /**
-       *  @brief  Return a reference to an array subset.
-       *
-       *  Returns a new valarray containing the elements of the array
-       *  indicated by the slice argument.  The new valarray has the same size
-       *  as the input slice.  @see slice.
-       *
-       *  @param  __s  The source slice.
-       *  @return  New valarray containing elements in @a __s.
-       */
-      slice_array<_Tp>    operator[](slice __s);
-
-      /**
-       *  @brief  Return an array subset.
-       *
-       *  Returns a slice_array referencing the elements of the array
-       *  indicated by the slice argument.  @see gslice.
-       *
-       *  @param  __s  The source slice.
-       *  @return  Slice_array referencing elements indicated by @a __s.
-       */
-      _Expr<_GClos<_ValArray, _Tp>, _Tp> operator[](const gslice& __s) const;
-
-      /**
-       *  @brief  Return a reference to an array subset.
-       *
-       *  Returns a new valarray containing the elements of the array
-       *  indicated by the gslice argument.  The new valarray has
-       *  the same size as the input gslice.  @see gslice.
-       *
-       *  @param  __s  The source gslice.
-       *  @return  New valarray containing elements in @a __s.
-       */
-      gslice_array<_Tp>   operator[](const gslice& __s);
-
-      /**
-       *  @brief  Return an array subset.
-       *
-       *  Returns a new valarray containing the elements of the array
-       *  indicated by the argument.  The input is a valarray of bool which
-       *  represents a bitmask indicating which elements should be copied into
-       *  the new valarray.  Each element of the array is added to the return
-       *  valarray if the corresponding element of the argument is true.
-       *
-       *  @param  __m  The valarray bitmask.
-       *  @return  New valarray containing elements indicated by @a __m.
-       */
-      valarray<_Tp>       operator[](const valarray<bool>& __m) const;
-
-      /**
-       *  @brief  Return a reference to an array subset.
-       *
-       *  Returns a new mask_array referencing the elements of the array
-       *  indicated by the argument.  The input is a valarray of bool which
-       *  represents a bitmask indicating which elements are part of the
-       *  subset.  Elements of the array are part of the subset if the
-       *  corresponding element of the argument is true.
-       *
-       *  @param  __m  The valarray bitmask.
-       *  @return  New valarray containing elements indicated by @a __m.
-       */
-      mask_array<_Tp>     operator[](const valarray<bool>& __m);
-
-      /**
-       *  @brief  Return an array subset.
-       *
-       *  Returns a new valarray containing the elements of the array
-       *  indicated by the argument.  The elements in the argument are
-       *  interpreted as the indices of elements of this valarray to copy to
-       *  the return valarray.
-       *
-       *  @param  __i  The valarray element index list.
-       *  @return  New valarray containing elements in @a __s.
-       */
-      _Expr<_IClos<_ValArray, _Tp>, _Tp>
-        operator[](const valarray<size_t>& __i) const;
-
-      /**
-       *  @brief  Return a reference to an array subset.
-       *
-       *  Returns an indirect_array referencing the elements of the array
-       *  indicated by the argument.  The elements in the argument are
-       *  interpreted as the indices of elements of this valarray to include
-       *  in the subset.  The returned indirect_array refers to these
-       *  elements.
-       *
-       *  @param  __i  The valarray element index list.
-       *  @return  Indirect_array referencing elements in @a __i.
-       */
-      indirect_array<_Tp> operator[](const valarray<size_t>& __i);
-
-      // _lib.valarray.unary_ unary operators:
-      ///  Return a new valarray by applying unary + to each element.
-      typename _UnaryOp<__unary_plus>::_Rt  operator+() const;
-
-      ///  Return a new valarray by applying unary - to each element.
-      typename _UnaryOp<__negate>::_Rt      operator-() const;
-
-      ///  Return a new valarray by applying unary ~ to each element.
-      typename _UnaryOp<__bitwise_not>::_Rt operator~() const;
-
-      ///  Return a new valarray by applying unary ! to each element.
-      typename _UnaryOp<__logical_not>::_Rt operator!() const;
-
-      // _lib.valarray.cassign_ computed assignment:
-      ///  Multiply each element of array by @a t.
-      valarray<_Tp>& operator*=(const _Tp&);
-
-      ///  Divide each element of array by @a t.
-      valarray<_Tp>& operator/=(const _Tp&);
-
-      ///  Set each element e of array to e % @a t.
-      valarray<_Tp>& operator%=(const _Tp&);
-
-      ///  Add @a t to each element of array.
-      valarray<_Tp>& operator+=(const _Tp&);
-
-      ///  Subtract @a t to each element of array.
-      valarray<_Tp>& operator-=(const _Tp&);
-
-      ///  Set each element e of array to e ^ @a t.
-      valarray<_Tp>& operator^=(const _Tp&);
-
-      ///  Set each element e of array to e & @a t.
-      valarray<_Tp>& operator&=(const _Tp&);
-
-      ///  Set each element e of array to e | @a t.
-      valarray<_Tp>& operator|=(const _Tp&);
-
-      ///  Left shift each element e of array by @a t bits.
-      valarray<_Tp>& operator<<=(const _Tp&);
-
-      ///  Right shift each element e of array by @a t bits.
-      valarray<_Tp>& operator>>=(const _Tp&);
-
-      ///  Multiply elements of array by corresponding elements of @a v.
-      valarray<_Tp>& operator*=(const valarray<_Tp>&);
-
-      ///  Divide elements of array by corresponding elements of @a v.
-      valarray<_Tp>& operator/=(const valarray<_Tp>&);
-
-      ///  Modulo elements of array by corresponding elements of @a v.
-      valarray<_Tp>& operator%=(const valarray<_Tp>&);
-
-      ///  Add corresponding elements of @a v to elements of array.
-      valarray<_Tp>& operator+=(const valarray<_Tp>&);
-
-      ///  Subtract corresponding elements of @a v from elements of array.
-      valarray<_Tp>& operator-=(const valarray<_Tp>&);
-
-      ///  Logical xor corresponding elements of @a v with elements of array.
-      valarray<_Tp>& operator^=(const valarray<_Tp>&);
-
-      ///  Logical or corresponding elements of @a v with elements of array.
-      valarray<_Tp>& operator|=(const valarray<_Tp>&);
-
-      ///  Logical and corresponding elements of @a v with elements of array.
-      valarray<_Tp>& operator&=(const valarray<_Tp>&);
-
-      ///  Left shift elements of array by corresponding elements of @a v.
-      valarray<_Tp>& operator<<=(const valarray<_Tp>&);
-
-      ///  Right shift elements of array by corresponding elements of @a v.
-      valarray<_Tp>& operator>>=(const valarray<_Tp>&);
-
-      template<class _Dom>
-	valarray<_Tp>& operator*=(const _Expr<_Dom, _Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator/=(const _Expr<_Dom, _Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator%=(const _Expr<_Dom, _Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator+=(const _Expr<_Dom, _Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator-=(const _Expr<_Dom, _Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator^=(const _Expr<_Dom, _Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator|=(const _Expr<_Dom, _Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator&=(const _Expr<_Dom, _Tp>&);
-      template<class _Dom>
-        valarray<_Tp>& operator<<=(const _Expr<_Dom, _Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator>>=(const _Expr<_Dom, _Tp>&);
-
-      // _lib.valarray.members_ member functions:
-#if __cplusplus >= 201103L
-      ///  Swap.
-      void swap(valarray<_Tp>& __v) noexcept;
-#endif
-
-      ///  Return the number of elements in array.
-      size_t size() const;
-
-      /**
-       *  @brief  Return the sum of all elements in the array.
-       *
-       *  Accumulates the sum of all elements into a Tp using +=.  The order
-       *  of adding the elements is unspecified.
-       */
-      _Tp    sum() const;
-
-      ///  Return the minimum element using operator<().
-      _Tp    min() const;	
-
-      ///  Return the maximum element using operator<().
-      _Tp    max() const;	
-
-      /**
-       *  @brief  Return a shifted array.
-       *
-       *  A new valarray is constructed as a copy of this array with elements
-       *  in shifted positions.  For an element with index i, the new position
-       *  is i - n.  The new valarray has the same size as the current one.
-       *  New elements without a value are set to 0.  Elements whose new
-       *  position is outside the bounds of the array are discarded.
-       *
-       *  Positive arguments shift toward index 0, discarding elements [0, n).
-       *  Negative arguments discard elements from the top of the array.
-       *
-       *  @param  __n  Number of element positions to shift.
-       *  @return  New valarray with elements in shifted positions.
-       */
-      valarray<_Tp> shift (int __n) const;
-
-      /**
-       *  @brief  Return a rotated array.
-       *
-       *  A new valarray is constructed as a copy of this array with elements
-       *  in shifted positions.  For an element with index i, the new position
-       *  is (i - n) % size().  The new valarray has the same size as the
-       *  current one.  Elements that are shifted beyond the array bounds are
-       *  shifted into the other end of the array.  No elements are lost.
-       *
-       *  Positive arguments shift toward index 0, wrapping around the top.
-       *  Negative arguments shift towards the top, wrapping around to 0.
-       *
-       *  @param  __n  Number of element positions to rotate.
-       *  @return  New valarray with elements in shifted positions.
-       */
-      valarray<_Tp> cshift(int __n) const;
-
-      /**
-       *  @brief  Apply a function to the array.
-       *
-       *  Returns a new valarray with elements assigned to the result of
-       *  applying func to the corresponding element of this array.  The new
-       *  array has the same size as this one.
-       *
-       *  @param  func  Function of Tp returning Tp to apply.
-       *  @return  New valarray with transformed elements.
-       */
-      _Expr<_ValFunClos<_ValArray, _Tp>, _Tp> apply(_Tp func(_Tp)) const;
-
-      /**
-       *  @brief  Apply a function to the array.
-       *
-       *  Returns a new valarray with elements assigned to the result of
-       *  applying func to the corresponding element of this array.  The new
-       *  array has the same size as this one.
-       *
-       *  @param  func  Function of const Tp& returning Tp to apply.
-       *  @return  New valarray with transformed elements.
-       */
-      _Expr<_RefFunClos<_ValArray, _Tp>, _Tp> apply(_Tp func(const _Tp&)) const;
-
-      /**
-       *  @brief  Resize array.
-       *
-       *  Resize this array to @a size and set all elements to @a c.  All
-       *  references and iterators are invalidated.
-       *
-       *  @param  __size  New array size.
-       *  @param  __c  New value for all elements.
-       */
-      void resize(size_t __size, _Tp __c = _Tp());
-
-    private:
-      size_t _M_size;
-      _Tp* __restrict__ _M_data;
-      
-      friend class _Array<_Tp>;
-    };
-  
-  template<typename _Tp>
-    inline const _Tp&
-    valarray<_Tp>::operator[](size_t __i) const
-    { 
-      __glibcxx_requires_subscript(__i);
-      return _M_data[__i];
-    }
-
-  template<typename _Tp>
-    inline _Tp&
-    valarray<_Tp>::operator[](size_t __i)
-    { 
-      __glibcxx_requires_subscript(__i);
-      return _M_data[__i];
-    }
-
-  // @} group numeric_arrays
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#include <bits/valarray_after.h>
-#include <bits/slice_array.h>
-#include <bits/gslice.h>
-#include <bits/gslice_array.h>
-#include <bits/mask_array.h>
-#include <bits/indirect_array.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  /**
-   * @addtogroup numeric_arrays
-   * @{
-   */
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray() : _M_size(0), _M_data(0) {}
-
-  template<typename _Tp>
-    inline 
-    valarray<_Tp>::valarray(size_t __n) 
-    : _M_size(__n), _M_data(__valarray_get_storage<_Tp>(__n))
-    { std::__valarray_default_construct(_M_data, _M_data + __n); }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const _Tp& __t, size_t __n)
-    : _M_size(__n), _M_data(__valarray_get_storage<_Tp>(__n))
-    { std::__valarray_fill_construct(_M_data, _M_data + __n, __t); }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const _Tp* __restrict__ __p, size_t __n)
-    : _M_size(__n), _M_data(__valarray_get_storage<_Tp>(__n))
-    { 
-      _GLIBCXX_DEBUG_ASSERT(__p != 0 || __n == 0);
-      std::__valarray_copy_construct(__p, __p + __n, _M_data); 
-    }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const valarray<_Tp>& __v)
-    : _M_size(__v._M_size), _M_data(__valarray_get_storage<_Tp>(__v._M_size))
-    { std::__valarray_copy_construct(__v._M_data, __v._M_data + _M_size,
-				     _M_data); }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(valarray<_Tp>&& __v) noexcept
-    : _M_size(__v._M_size), _M_data(__v._M_data)
-    {
-      __v._M_size = 0;
-      __v._M_data = 0;
-    }
-#endif
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const slice_array<_Tp>& __sa)
-    : _M_size(__sa._M_sz), _M_data(__valarray_get_storage<_Tp>(__sa._M_sz))
-    {
-      std::__valarray_copy_construct
-	(__sa._M_array, __sa._M_sz, __sa._M_stride, _Array<_Tp>(_M_data));
-    }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const gslice_array<_Tp>& __ga)
-    : _M_size(__ga._M_index.size()),
-      _M_data(__valarray_get_storage<_Tp>(_M_size))
-    {
-      std::__valarray_copy_construct
-	(__ga._M_array, _Array<size_t>(__ga._M_index),
-	 _Array<_Tp>(_M_data), _M_size);
-    }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const mask_array<_Tp>& __ma)
-    : _M_size(__ma._M_sz), _M_data(__valarray_get_storage<_Tp>(__ma._M_sz))
-    {
-      std::__valarray_copy_construct
-	(__ma._M_array, __ma._M_mask, _Array<_Tp>(_M_data), _M_size);
-    }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const indirect_array<_Tp>& __ia)
-    : _M_size(__ia._M_sz), _M_data(__valarray_get_storage<_Tp>(__ia._M_sz))
-    {
-      std::__valarray_copy_construct
-	(__ia._M_array, __ia._M_index, _Array<_Tp>(_M_data), _M_size);
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(initializer_list<_Tp> __l)
-    : _M_size(__l.size()), _M_data(__valarray_get_storage<_Tp>(__l.size()))
-    { std::__valarray_copy_construct(__l.begin(), __l.end(), _M_data); }
-#endif
-
-  template<typename _Tp> template<class _Dom>
-    inline
-    valarray<_Tp>::valarray(const _Expr<_Dom, _Tp>& __e)
-    : _M_size(__e.size()), _M_data(__valarray_get_storage<_Tp>(_M_size))
-    { std::__valarray_copy_construct(__e, _M_size, _Array<_Tp>(_M_data)); }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::~valarray() _GLIBCXX_NOEXCEPT
-    {
-      std::__valarray_destroy_elements(_M_data, _M_data + _M_size);
-      std::__valarray_release_memory(_M_data);
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const valarray<_Tp>& __v)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 630. arrays of valarray.
-      if (_M_size == __v._M_size)
-	std::__valarray_copy(__v._M_data, _M_size, _M_data);
-      else
-	{
-	  if (_M_data)
-	    {
-	      std::__valarray_destroy_elements(_M_data, _M_data + _M_size);
-	      std::__valarray_release_memory(_M_data);
-	    }
-	  _M_size = __v._M_size;
-	  _M_data = __valarray_get_storage<_Tp>(_M_size);
-	  std::__valarray_copy_construct(__v._M_data, __v._M_data + _M_size,
-					 _M_data);
-	}
-      return *this;
-    }
-
-#if __cplusplus >= 201103L
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(valarray<_Tp>&& __v) noexcept
-    {
-      if (_M_data)
-	{
-	  std::__valarray_destroy_elements(_M_data, _M_data + _M_size);
-	  std::__valarray_release_memory(_M_data);
-	}
-      _M_size = __v._M_size;
-      _M_data = __v._M_data;
-      __v._M_size = 0;
-      __v._M_data = 0;
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(initializer_list<_Tp> __l)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 630. arrays of valarray.
-      if (_M_size == __l.size())
-	std::__valarray_copy(__l.begin(), __l.size(), _M_data);
-      else
-	{
-	  if (_M_data)
-	    {
-	      std::__valarray_destroy_elements(_M_data, _M_data + _M_size);
-	      std::__valarray_release_memory(_M_data);
-	    }
-	  _M_size = __l.size();
-	  _M_data = __valarray_get_storage<_Tp>(_M_size);
-	  std::__valarray_copy_construct(__l.begin(), __l.begin() + _M_size,
-					 _M_data);
-	}
-      return *this;
-    }
-#endif
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const _Tp& __t)
-    {
-      std::__valarray_fill(_M_data, _M_size, __t);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const slice_array<_Tp>& __sa)
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __sa._M_sz);
-      std::__valarray_copy(__sa._M_array, __sa._M_sz,
-			   __sa._M_stride, _Array<_Tp>(_M_data));
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const gslice_array<_Tp>& __ga)
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __ga._M_index.size());
-      std::__valarray_copy(__ga._M_array, _Array<size_t>(__ga._M_index),
-			   _Array<_Tp>(_M_data), _M_size);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const mask_array<_Tp>& __ma)
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __ma._M_sz);
-      std::__valarray_copy(__ma._M_array, __ma._M_mask,
-			   _Array<_Tp>(_M_data), _M_size);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const indirect_array<_Tp>& __ia)
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __ia._M_sz);
-      std::__valarray_copy(__ia._M_array, __ia._M_index,
-			   _Array<_Tp>(_M_data), _M_size);
-      return *this;
-    }
-
-  template<typename _Tp> template<class _Dom>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 630. arrays of valarray.
-      if (_M_size == __e.size())
-	std::__valarray_copy(__e, _M_size, _Array<_Tp>(_M_data));
-      else
-	{
-	  if (_M_data)
-	    {
-	      std::__valarray_destroy_elements(_M_data, _M_data + _M_size);
-	      std::__valarray_release_memory(_M_data);
-	    }
-	  _M_size = __e.size();
-	  _M_data = __valarray_get_storage<_Tp>(_M_size);
-	  std::__valarray_copy_construct(__e, _M_size, _Array<_Tp>(_M_data));
-	}
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline _Expr<_SClos<_ValArray,_Tp>, _Tp>
-    valarray<_Tp>::operator[](slice __s) const
-    {
-      typedef _SClos<_ValArray,_Tp> _Closure;
-      return _Expr<_Closure, _Tp>(_Closure (_Array<_Tp>(_M_data), __s));
-    }
-
-  template<typename _Tp>
-    inline slice_array<_Tp>
-    valarray<_Tp>::operator[](slice __s)
-    { return slice_array<_Tp>(_Array<_Tp>(_M_data), __s); }
-
-  template<typename _Tp>
-    inline _Expr<_GClos<_ValArray,_Tp>, _Tp>
-    valarray<_Tp>::operator[](const gslice& __gs) const
-    {
-      typedef _GClos<_ValArray,_Tp> _Closure;
-      return _Expr<_Closure, _Tp>
-	(_Closure(_Array<_Tp>(_M_data), __gs._M_index->_M_index));
-    }
-
-  template<typename _Tp>
-    inline gslice_array<_Tp>
-    valarray<_Tp>::operator[](const gslice& __gs)
-    {
-      return gslice_array<_Tp>
-	(_Array<_Tp>(_M_data), __gs._M_index->_M_index);
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>
-    valarray<_Tp>::operator[](const valarray<bool>& __m) const
-    {
-      size_t __s = 0;
-      size_t __e = __m.size();
-      for (size_t __i=0; __i<__e; ++__i)
-	if (__m[__i]) ++__s;
-      return valarray<_Tp>(mask_array<_Tp>(_Array<_Tp>(_M_data), __s,
-					   _Array<bool> (__m)));
-    }
-
-  template<typename _Tp>
-    inline mask_array<_Tp>
-    valarray<_Tp>::operator[](const valarray<bool>& __m)
-    {
-      size_t __s = 0;
-      size_t __e = __m.size();
-      for (size_t __i=0; __i<__e; ++__i)
-	if (__m[__i]) ++__s;
-      return mask_array<_Tp>(_Array<_Tp>(_M_data), __s, _Array<bool>(__m));
-    }
-
-  template<typename _Tp>
-    inline _Expr<_IClos<_ValArray,_Tp>, _Tp>
-    valarray<_Tp>::operator[](const valarray<size_t>& __i) const
-    {
-      typedef _IClos<_ValArray,_Tp> _Closure;
-      return _Expr<_Closure, _Tp>(_Closure(*this, __i));
-    }
-
-  template<typename _Tp>
-    inline indirect_array<_Tp>
-    valarray<_Tp>::operator[](const valarray<size_t>& __i)
-    {
-      return indirect_array<_Tp>(_Array<_Tp>(_M_data), __i.size(),
-				 _Array<size_t>(__i));
-    }
-
-#if __cplusplus >= 201103L
-  template<class _Tp>
-    inline void
-    valarray<_Tp>::swap(valarray<_Tp>& __v) noexcept
-    {
-      std::swap(_M_size, __v._M_size);
-      std::swap(_M_data, __v._M_data);
-    }
-#endif
-
-  template<class _Tp>
-    inline size_t 
-    valarray<_Tp>::size() const
-    { return _M_size; }
-
-  template<class _Tp>
-    inline _Tp
-    valarray<_Tp>::sum() const
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size > 0);
-      return std::__valarray_sum(_M_data, _M_data + _M_size);
-    }
-
-  template<class _Tp>
-     inline valarray<_Tp>
-     valarray<_Tp>::shift(int __n) const
-     {
-       valarray<_Tp> __ret;
-
-       if (_M_size == 0)
-	 return __ret;
-
-       _Tp* __restrict__ __tmp_M_data =
-	 std::__valarray_get_storage<_Tp>(_M_size);
-
-       if (__n == 0)
-	 std::__valarray_copy_construct(_M_data,
-					_M_data + _M_size, __tmp_M_data);
-       else if (__n > 0)      // shift left
-	 {
-	   if (size_t(__n) > _M_size)
-	     __n = int(_M_size);
-
-	   std::__valarray_copy_construct(_M_data + __n,
-					  _M_data + _M_size, __tmp_M_data);
-	   std::__valarray_default_construct(__tmp_M_data + _M_size - __n,
-					     __tmp_M_data + _M_size);
-	 }
-       else                   // shift right
-	 {
-	   if (-size_t(__n) > _M_size)
-	     __n = -int(_M_size);
-
-	   std::__valarray_copy_construct(_M_data, _M_data + _M_size + __n,
-					  __tmp_M_data - __n);
-	   std::__valarray_default_construct(__tmp_M_data,
-					     __tmp_M_data - __n);
-	 }
-
-       __ret._M_size = _M_size;
-       __ret._M_data = __tmp_M_data;
-       return __ret;
-     }
-
-  template<class _Tp>
-     inline valarray<_Tp>
-     valarray<_Tp>::cshift(int __n) const
-     {
-       valarray<_Tp> __ret;
-
-       if (_M_size == 0)
-	 return __ret;
-
-       _Tp* __restrict__ __tmp_M_data =
-	 std::__valarray_get_storage<_Tp>(_M_size);
-
-       if (__n == 0)
-	 std::__valarray_copy_construct(_M_data,
-					_M_data + _M_size, __tmp_M_data);
-       else if (__n > 0)      // cshift left
-	 {
-	   if (size_t(__n) > _M_size)
-	     __n = int(__n % _M_size);
-
-	   std::__valarray_copy_construct(_M_data, _M_data + __n,
-					  __tmp_M_data + _M_size - __n);
-	   std::__valarray_copy_construct(_M_data + __n, _M_data + _M_size,
-					  __tmp_M_data);
-	 }
-       else                   // cshift right
-	 {
-	   if (-size_t(__n) > _M_size)
-	     __n = -int(-size_t(__n) % _M_size);
-
-	   std::__valarray_copy_construct(_M_data + _M_size + __n,
-					  _M_data + _M_size, __tmp_M_data);
-	   std::__valarray_copy_construct(_M_data, _M_data + _M_size + __n,
-					  __tmp_M_data - __n);
-	 }
-
-       __ret._M_size = _M_size;
-       __ret._M_data = __tmp_M_data;
-       return __ret;
-     }
-
-  template<class _Tp>
-    inline void
-    valarray<_Tp>::resize(size_t __n, _Tp __c)
-    {
-      // This complication is so to make valarray<valarray<T> > work
-      // even though it is not required by the standard.  Nobody should
-      // be saying valarray<valarray<T> > anyway.  See the specs.
-      std::__valarray_destroy_elements(_M_data, _M_data + _M_size);
-      if (_M_size != __n)
-	{
-	  std::__valarray_release_memory(_M_data);
-	  _M_size = __n;
-	  _M_data = __valarray_get_storage<_Tp>(__n);
-	}
-      std::__valarray_fill_construct(_M_data, _M_data + __n, __c);
-    }
-    
-  template<typename _Tp>
-    inline _Tp
-    valarray<_Tp>::min() const
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size > 0);
-      return *std::min_element(_M_data, _M_data + _M_size);
-    }
-
-  template<typename _Tp>
-    inline _Tp
-    valarray<_Tp>::max() const
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size > 0);
-      return *std::max_element(_M_data, _M_data + _M_size);
-    }
-  
-  template<class _Tp>
-    inline _Expr<_ValFunClos<_ValArray, _Tp>, _Tp>
-    valarray<_Tp>::apply(_Tp func(_Tp)) const
-    {
-      typedef _ValFunClos<_ValArray, _Tp> _Closure;
-      return _Expr<_Closure, _Tp>(_Closure(*this, func));
-    }
-
-  template<class _Tp>
-    inline _Expr<_RefFunClos<_ValArray, _Tp>, _Tp>
-    valarray<_Tp>::apply(_Tp func(const _Tp &)) const
-    {
-      typedef _RefFunClos<_ValArray, _Tp> _Closure;
-      return _Expr<_Closure, _Tp>(_Closure(*this, func));
-    }
-
-#define _DEFINE_VALARRAY_UNARY_OPERATOR(_Op, _Name)                     \
-  template<typename _Tp>						\
-    inline typename valarray<_Tp>::template _UnaryOp<_Name>::_Rt      	\
-    valarray<_Tp>::operator _Op() const					\
-    {									\
-      typedef _UnClos<_Name, _ValArray, _Tp> _Closure;	                \
-      typedef typename __fun<_Name, _Tp>::result_type _Rt;              \
-      return _Expr<_Closure, _Rt>(_Closure(*this));			\
-    }
-
-    _DEFINE_VALARRAY_UNARY_OPERATOR(+, __unary_plus)
-    _DEFINE_VALARRAY_UNARY_OPERATOR(-, __negate)
-    _DEFINE_VALARRAY_UNARY_OPERATOR(~, __bitwise_not)
-    _DEFINE_VALARRAY_UNARY_OPERATOR (!, __logical_not)
-
-#undef _DEFINE_VALARRAY_UNARY_OPERATOR
-
-#define _DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(_Op, _Name)               \
-  template<class _Tp>							\
-    inline valarray<_Tp>&						\
-    valarray<_Tp>::operator _Op##=(const _Tp &__t)			\
-    {									\
-      _Array_augmented_##_Name(_Array<_Tp>(_M_data), _M_size, __t);	\
-      return *this;							\
-    }									\
-									\
-  template<class _Tp>							\
-    inline valarray<_Tp>&						\
-    valarray<_Tp>::operator _Op##=(const valarray<_Tp> &__v)		\
-    {									\
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __v._M_size);                    \
-      _Array_augmented_##_Name(_Array<_Tp>(_M_data), _M_size, 		\
-			       _Array<_Tp>(__v._M_data));		\
-      return *this;							\
-    }
-
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(+, __plus)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(-, __minus)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(*, __multiplies)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(/, __divides)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(%, __modulus)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(^, __bitwise_xor)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(&, __bitwise_and)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(|, __bitwise_or)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(<<, __shift_left)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT
-
-#define _DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(_Op, _Name)          \
-  template<class _Tp> template<class _Dom>				\
-    inline valarray<_Tp>&						\
-    valarray<_Tp>::operator _Op##=(const _Expr<_Dom, _Tp>& __e)		\
-    {									\
-      _Array_augmented_##_Name(_Array<_Tp>(_M_data), __e, _M_size);	\
-      return *this;							\
-    }
-
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(+, __plus)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(-, __minus)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(*, __multiplies)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(/, __divides)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(%, __modulus)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(^, __bitwise_xor)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(&, __bitwise_and)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(|, __bitwise_or)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(<<, __shift_left)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT
-    
-
-#define _DEFINE_BINARY_OPERATOR(_Op, _Name)				\
-  template<typename _Tp>						\
-    inline _Expr<_BinClos<_Name, _ValArray, _ValArray, _Tp, _Tp>,       \
-                 typename __fun<_Name, _Tp>::result_type>               \
-    operator _Op(const valarray<_Tp>& __v, const valarray<_Tp>& __w)	\
-    {									\
-      _GLIBCXX_DEBUG_ASSERT(__v.size() == __w.size());                  \
-      typedef _BinClos<_Name, _ValArray, _ValArray, _Tp, _Tp> _Closure; \
-      typedef typename __fun<_Name, _Tp>::result_type _Rt;              \
-      return _Expr<_Closure, _Rt>(_Closure(__v, __w));                  \
-    }									\
-									\
-  template<typename _Tp>						\
-    inline _Expr<_BinClos<_Name, _ValArray,_Constant, _Tp, _Tp>,        \
-                 typename __fun<_Name, _Tp>::result_type>               \
-    operator _Op(const valarray<_Tp>& __v, const _Tp& __t)		\
-    {									\
-      typedef _BinClos<_Name, _ValArray, _Constant, _Tp, _Tp> _Closure;	\
-      typedef typename __fun<_Name, _Tp>::result_type _Rt;              \
-      return _Expr<_Closure, _Rt>(_Closure(__v, __t));	                \
-    }									\
-									\
-  template<typename _Tp>						\
-    inline _Expr<_BinClos<_Name, _Constant, _ValArray, _Tp, _Tp>,       \
-                 typename __fun<_Name, _Tp>::result_type>               \
-    operator _Op(const _Tp& __t, const valarray<_Tp>& __v)		\
-    {									\
-      typedef _BinClos<_Name, _Constant, _ValArray, _Tp, _Tp> _Closure; \
-      typedef typename __fun<_Name, _Tp>::result_type _Rt;              \
-      return _Expr<_Closure, _Rt>(_Closure(__t, __v));        	        \
-    }
-
-_DEFINE_BINARY_OPERATOR(+, __plus)
-_DEFINE_BINARY_OPERATOR(-, __minus)
-_DEFINE_BINARY_OPERATOR(*, __multiplies)
-_DEFINE_BINARY_OPERATOR(/, __divides)
-_DEFINE_BINARY_OPERATOR(%, __modulus)
-_DEFINE_BINARY_OPERATOR(^, __bitwise_xor)
-_DEFINE_BINARY_OPERATOR(&, __bitwise_and)
-_DEFINE_BINARY_OPERATOR(|, __bitwise_or)
-_DEFINE_BINARY_OPERATOR(<<, __shift_left)
-_DEFINE_BINARY_OPERATOR(>>, __shift_right)
-_DEFINE_BINARY_OPERATOR(&&, __logical_and)
-_DEFINE_BINARY_OPERATOR(||, __logical_or)
-_DEFINE_BINARY_OPERATOR(==, __equal_to)
-_DEFINE_BINARY_OPERATOR(!=, __not_equal_to)
-_DEFINE_BINARY_OPERATOR(<, __less)
-_DEFINE_BINARY_OPERATOR(>, __greater)
-_DEFINE_BINARY_OPERATOR(<=, __less_equal)
-_DEFINE_BINARY_OPERATOR(>=, __greater_equal)
-
-#undef _DEFINE_BINARY_OPERATOR
-
-#if __cplusplus >= 201103L
-  /**
-   *  @brief  Return an iterator pointing to the first element of
-   *          the valarray.
-   *  @param  __va  valarray.
-   */
-  template<class _Tp>
-    inline _Tp*
-    begin(valarray<_Tp>& __va)
-    { return std::__addressof(__va[0]); }
-
-  /**
-   *  @brief  Return an iterator pointing to the first element of
-   *          the const valarray.
-   *  @param  __va  valarray.
-   */
-  template<class _Tp>
-    inline const _Tp*
-    begin(const valarray<_Tp>& __va)
-    { return std::__addressof(__va[0]); }
-
-  /**
-   *  @brief  Return an iterator pointing to one past the last element of
-   *          the valarray.
-   *  @param  __va  valarray.
-   */
-  template<class _Tp>
-    inline _Tp*
-    end(valarray<_Tp>& __va)
-    { return std::__addressof(__va[0]) + __va.size(); }
-
-  /**
-   *  @brief  Return an iterator pointing to one past the last element of
-   *          the const valarray.
-   *  @param  __va  valarray.
-   */
-  template<class _Tp>
-    inline const _Tp*
-    end(const valarray<_Tp>& __va)
-    { return std::__addressof(__va[0]) + __va.size(); }
-#endif // C++11
-
-  // @} group numeric_arrays
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
-
-#endif /* _GLIBCXX_VALARRAY */
diff --git a/openflow/usr/include/c++/5/vector b/openflow/usr/include/c++/5/vector
deleted file mode 100644
index adab85b..0000000
--- a/openflow/usr/include/c++/5/vector
+++ /dev/null
@@ -1,81 +0,0 @@
-// <vector> -*- C++ -*-
-
-// Copyright (C) 2001-2015 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-// <http://www.gnu.org/licenses/>.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file include/vector
- *  This is a Standard C++ Library header.
- */
-
-#ifndef _GLIBCXX_VECTOR
-#define _GLIBCXX_VECTOR 1
-
-#pragma GCC system_header
-
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_vector.h>
-#include <bits/stl_bvector.h> 
-#include <bits/range_access.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/vector.tcc>
-#endif
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/vector>
-#endif
-
-#ifdef _GLIBCXX_PROFILE
-# include <profile/vector>
-#endif
-
-#endif /* _GLIBCXX_VECTOR */
-
diff --git a/openflow/usr/include/caml b/openflow/usr/include/caml
deleted file mode 120000
index 5406a89..0000000
--- a/openflow/usr/include/caml
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/ocaml/caml
\ No newline at end of file
diff --git a/openflow/usr/include/complex.h b/openflow/usr/include/complex.h
deleted file mode 100644
index 331975e..0000000
--- a/openflow/usr/include/complex.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99:  7.3 Complex arithmetic	<complex.h>
- */
-
-#ifndef _COMPLEX_H
-#define _COMPLEX_H	1
-
-#include <features.h>
-
-/* Get general and ISO C99 specific information.  */
-#include <bits/mathdef.h>
-
-__BEGIN_DECLS
-
-/* We might need to add support for more compilers here.  But since ISO
-   C99 is out hopefully all maintained compilers will soon provide the data
-   types `float complex' and `double complex'.  */
-#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (2, 97)
-# define _Complex __complex__
-#endif
-
-#define complex		_Complex
-
-/* Narrowest imaginary unit.  This depends on the floating-point
-   evaluation method.
-   XXX This probably has to go into a gcc related file.  */
-#define _Complex_I	(__extension__ 1.0iF)
-
-/* Another more descriptive name is `I'.
-   XXX Once we have the imaginary support switch this to _Imaginary_I.  */
-#undef I
-#define I _Complex_I
-
-#if defined __USE_ISOC11 && __GNUC_PREREQ (4, 7)
-/* Macros to expand into expression of specified complex type.  */
-# define CMPLX(x, y) __builtin_complex ((double) (x), (double) (y))
-# define CMPLXF(x, y) __builtin_complex ((float) (x), (float) (y))
-# define CMPLXL(x, y) __builtin_complex ((long double) (x), (long double) (y))
-#endif
-
-/* The file <bits/cmathcalls.h> contains the prototypes for all the
-   actual math functions.  These macros are used for those prototypes,
-   so we can easily declare each function as both `name' and `__name',
-   and can declare the float versions `namef' and `__namef'.  */
-
-#define __MATHCALL(function, args)	\
-  __MATHDECL (_Mdouble_complex_,function, args)
-#define __MATHDECL(type, function, args) \
-  __MATHDECL_1(type, function, args); \
-  __MATHDECL_1(type, __CONCAT(__,function), args)
-#define __MATHDECL_1(type, function, args) \
-  extern type __MATH_PRECNAME(function) args __THROW
-
-#define _Mdouble_ 		double
-#define __MATH_PRECNAME(name)	name
-#include <bits/cmathcalls.h>
-#undef	_Mdouble_
-#undef	__MATH_PRECNAME
-
-/* Now the float versions.  */
-#ifndef _Mfloat_
-# define _Mfloat_		float
-#endif
-#define _Mdouble_ 		_Mfloat_
-#define __MATH_PRECNAME(name)	name##f
-#include <bits/cmathcalls.h>
-#undef	_Mdouble_
-#undef	__MATH_PRECNAME
-
-/* And the long double versions.  It is non-critical to define them
-   here unconditionally since `long double' is required in ISO C99.  */
-#if !(defined __NO_LONG_DOUBLE_MATH && defined _LIBC)	\
-    || defined __LDBL_COMPAT
-# ifdef __LDBL_COMPAT
-#  undef __MATHDECL_1
-#  define __MATHDECL_1(type, function, args) \
-  extern type __REDIRECT_NTH(__MATH_PRECNAME(function), args, function)
-# endif
-
-# ifndef _Mlong_double_
-#  define _Mlong_double_	long double
-# endif
-# define _Mdouble_ 		_Mlong_double_
-# define __MATH_PRECNAME(name)	name##l
-# include <bits/cmathcalls.h>
-#endif
-#undef	_Mdouble_
-#undef	__MATH_PRECNAME
-#undef	__MATHDECL_1
-#undef	__MATHDECL
-#undef	__MATHCALL
-
-__END_DECLS
-
-#endif /* complex.h */
diff --git a/openflow/usr/include/cpio.h b/openflow/usr/include/cpio.h
deleted file mode 100644
index 9e712fe..0000000
--- a/openflow/usr/include/cpio.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Extended cpio format from POSIX.1.
-   This file is part of the GNU C Library.
-   Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   NOTE: The canonical source of this file is maintained with the GNU cpio.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _CPIO_H
-#define _CPIO_H 1
-
-/* A cpio archive consists of a sequence of files.
-   Each file has a 76 byte header,
-   a variable length, NUL terminated filename,
-   and variable length file data.
-   A header for a filename "TRAILER!!!" indicates the end of the archive.  */
-
-/* All the fields in the header are ISO 646 (approximately ASCII) strings
-   of octal numbers, left padded, not NUL terminated.
-
-   Field Name	Length in Bytes	Notes
-   c_magic	6		must be "070707"
-   c_dev	6
-   c_ino	6
-   c_mode	6		see below for value
-   c_uid	6
-   c_gid	6
-   c_nlink	6
-   c_rdev	6		only valid for chr and blk special files
-   c_mtime	11
-   c_namesize	6		count includes terminating NUL in pathname
-   c_filesize	11		must be 0 for FIFOs and directories  */
-
-/* Value for the field `c_magic'.  */
-#define MAGIC	"070707"
-
-/* Values for c_mode, OR'd together: */
-
-#define C_IRUSR		000400
-#define C_IWUSR		000200
-#define C_IXUSR		000100
-#define C_IRGRP		000040
-#define C_IWGRP		000020
-#define C_IXGRP		000010
-#define C_IROTH		000004
-#define C_IWOTH		000002
-#define C_IXOTH		000001
-
-#define C_ISUID		004000
-#define C_ISGID		002000
-#define C_ISVTX		001000
-
-#define C_ISBLK		060000
-#define C_ISCHR		020000
-#define C_ISDIR		040000
-#define C_ISFIFO	010000
-#define C_ISSOCK	0140000
-#define C_ISLNK		0120000
-#define C_ISCTG		0110000
-#define C_ISREG		0100000
-
-#endif /* cpio.h */
diff --git a/openflow/usr/include/crypt.h b/openflow/usr/include/crypt.h
deleted file mode 100644
index e29e1ef..0000000
--- a/openflow/usr/include/crypt.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * UFC-crypt: ultra fast crypt(3) implementation
- *
- * Copyright (C) 1991-2016 Free Software Foundation, Inc.
- *
- * The GNU C Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * The GNU C Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the GNU C Library; if not, see
- * <http://www.gnu.org/licenses/>.
- *
- * @(#)crypt.h	1.5 12/20/96
- *
- */
-
-#ifndef _CRYPT_H
-#define _CRYPT_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* Encrypt at most 8 characters from KEY using salt to perturb DES.  */
-extern char *crypt (const char *__key, const char *__salt)
-     __THROW __nonnull ((1, 2));
-
-/* Setup DES tables according KEY.  */
-extern void setkey (const char *__key) __THROW __nonnull ((1));
-
-/* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt
-   block in place.  */
-extern void encrypt (char *__glibc_block, int __edflag)
-     __THROW __nonnull ((1));
-
-#ifdef __USE_GNU
-/* Reentrant versions of the functions above.  The additional argument
-   points to a structure where the results are placed in.  */
-struct crypt_data
-  {
-    char keysched[16 * 8];
-    char sb0[32768];
-    char sb1[32768];
-    char sb2[32768];
-    char sb3[32768];
-    /* end-of-aligment-critical-data */
-    char crypt_3_buf[14];
-    char current_salt[2];
-    long int current_saltbits;
-    int  direction, initialized;
-  };
-
-extern char *crypt_r (const char *__key, const char *__salt,
-		      struct crypt_data * __restrict __data)
-     __THROW __nonnull ((1, 2, 3));
-
-extern void setkey_r (const char *__key,
-		      struct crypt_data * __restrict __data)
-     __THROW __nonnull ((1, 2));
-
-extern void encrypt_r (char *__glibc_block, int __edflag,
-		       struct crypt_data * __restrict __data)
-     __THROW __nonnull ((1, 3));
-#endif
-
-__END_DECLS
-
-#endif	/* crypt.h */
diff --git a/openflow/usr/include/ctype.h b/openflow/usr/include/ctype.h
deleted file mode 100644
index 6e2124a..0000000
--- a/openflow/usr/include/ctype.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard 7.4: Character handling	<ctype.h>
- */
-
-#ifndef	_CTYPE_H
-#define	_CTYPE_H	1
-
-#include <features.h>
-#include <bits/types.h>
-
-__BEGIN_DECLS
-
-#ifndef _ISbit
-/* These are all the characteristics of characters.
-   If there get to be more than 16 distinct characteristics,
-   many things must be changed that use `unsigned short int's.
-
-   The characteristics are stored always in network byte order (big
-   endian).  We define the bit value interpretations here dependent on the
-   machine's byte order.  */
-
-# include <endian.h>
-# if __BYTE_ORDER == __BIG_ENDIAN
-#  define _ISbit(bit)	(1 << (bit))
-# else /* __BYTE_ORDER == __LITTLE_ENDIAN */
-#  define _ISbit(bit)	((bit) < 8 ? ((1 << (bit)) << 8) : ((1 << (bit)) >> 8))
-# endif
-
-enum
-{
-  _ISupper = _ISbit (0),	/* UPPERCASE.  */
-  _ISlower = _ISbit (1),	/* lowercase.  */
-  _ISalpha = _ISbit (2),	/* Alphabetic.  */
-  _ISdigit = _ISbit (3),	/* Numeric.  */
-  _ISxdigit = _ISbit (4),	/* Hexadecimal numeric.  */
-  _ISspace = _ISbit (5),	/* Whitespace.  */
-  _ISprint = _ISbit (6),	/* Printing.  */
-  _ISgraph = _ISbit (7),	/* Graphical.  */
-  _ISblank = _ISbit (8),	/* Blank (usually SPC and TAB).  */
-  _IScntrl = _ISbit (9),	/* Control character.  */
-  _ISpunct = _ISbit (10),	/* Punctuation.  */
-  _ISalnum = _ISbit (11)	/* Alphanumeric.  */
-};
-#endif /* ! _ISbit  */
-
-/* These are defined in ctype-info.c.
-   The declarations here must match those in localeinfo.h.
-
-   In the thread-specific locale model (see `uselocale' in <locale.h>)
-   we cannot use global variables for these as was done in the past.
-   Instead, the following accessor functions return the address of
-   each variable, which is local to the current thread if multithreaded.
-
-   These point into arrays of 384, so they can be indexed by any `unsigned
-   char' value [0,255]; by EOF (-1); or by any `signed char' value
-   [-128,-1).  ISO C requires that the ctype functions work for `unsigned
-   char' values and for EOF; we also support negative `signed char' values
-   for broken old programs.  The case conversion arrays are of `int's
-   rather than `unsigned char's because tolower (EOF) must be EOF, which
-   doesn't fit into an `unsigned char'.  But today more important is that
-   the arrays are also used for multi-byte character sets.  */
-extern const unsigned short int **__ctype_b_loc (void)
-     __THROW __attribute__ ((__const__));
-extern const __int32_t **__ctype_tolower_loc (void)
-     __THROW __attribute__ ((__const__));
-extern const __int32_t **__ctype_toupper_loc (void)
-     __THROW __attribute__ ((__const__));
-
-
-#ifndef __cplusplus
-# define __isctype(c, type) \
-  ((*__ctype_b_loc ())[(int) (c)] & (unsigned short int) type)
-#elif defined __USE_EXTERN_INLINES
-# define __isctype_f(type) \
-  __extern_inline int							      \
-  is##type (int __c) __THROW						      \
-  {									      \
-    return (*__ctype_b_loc ())[(int) (__c)] & (unsigned short int) _IS##type; \
-  }
-#endif
-
-#define	__isascii(c)	(((c) & ~0x7f) == 0)	/* If C is a 7 bit value.  */
-#define	__toascii(c)	((c) & 0x7f)		/* Mask off high bits.  */
-
-#define	__exctype(name)	extern int name (int) __THROW
-
-__BEGIN_NAMESPACE_STD
-
-/* The following names are all functions:
-     int isCHARACTERISTIC(int c);
-   which return nonzero iff C has CHARACTERISTIC.
-   For the meaning of the characteristic names, see the `enum' above.  */
-__exctype (isalnum);
-__exctype (isalpha);
-__exctype (iscntrl);
-__exctype (isdigit);
-__exctype (islower);
-__exctype (isgraph);
-__exctype (isprint);
-__exctype (ispunct);
-__exctype (isspace);
-__exctype (isupper);
-__exctype (isxdigit);
-
-
-/* Return the lowercase version of C.  */
-extern int tolower (int __c) __THROW;
-
-/* Return the uppercase version of C.  */
-extern int toupper (int __c) __THROW;
-
-__END_NAMESPACE_STD
-
-
-/* ISO C99 introduced one new function.  */
-#ifdef	__USE_ISOC99
-__BEGIN_NAMESPACE_C99
-
-__exctype (isblank);
-
-__END_NAMESPACE_C99
-#endif
-
-#ifdef __USE_GNU
-/* Test C for a set of character classes according to MASK.  */
-extern int isctype (int __c, int __mask) __THROW;
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN
-
-/* Return nonzero iff C is in the ASCII set
-   (i.e., is no more than 7 bits wide).  */
-extern int isascii (int __c) __THROW;
-
-/* Return the part of C that is in the ASCII set
-   (i.e., the low-order 7 bits of C).  */
-extern int toascii (int __c) __THROW;
-
-/* These are the same as `toupper' and `tolower' except that they do not
-   check the argument for being in the range of a `char'.  */
-__exctype (_toupper);
-__exctype (_tolower);
-#endif /* Use X/Open or use misc.  */
-
-/* This code is needed for the optimized mapping functions.  */
-#define __tobody(c, f, a, args) \
-  (__extension__							      \
-   ({ int __res;							      \
-      if (sizeof (c) > 1)						      \
-	{								      \
-	  if (__builtin_constant_p (c))					      \
-	    {								      \
-	      int __c = (c);						      \
-	      __res = __c < -128 || __c > 255 ? __c : (a)[__c];		      \
-	    }								      \
-	  else								      \
-	    __res = f args;						      \
-	}								      \
-      else								      \
-	__res = (a)[(int) (c)];						      \
-      __res; }))
-
-#if !defined __NO_CTYPE
-# ifdef __isctype_f
-__isctype_f (alnum)
-__isctype_f (alpha)
-__isctype_f (cntrl)
-__isctype_f (digit)
-__isctype_f (lower)
-__isctype_f (graph)
-__isctype_f (print)
-__isctype_f (punct)
-__isctype_f (space)
-__isctype_f (upper)
-__isctype_f (xdigit)
-#  ifdef __USE_ISOC99
-__isctype_f (blank)
-#  endif
-# elif defined __isctype
-# define isalnum(c)	__isctype((c), _ISalnum)
-# define isalpha(c)	__isctype((c), _ISalpha)
-# define iscntrl(c)	__isctype((c), _IScntrl)
-# define isdigit(c)	__isctype((c), _ISdigit)
-# define islower(c)	__isctype((c), _ISlower)
-# define isgraph(c)	__isctype((c), _ISgraph)
-# define isprint(c)	__isctype((c), _ISprint)
-# define ispunct(c)	__isctype((c), _ISpunct)
-# define isspace(c)	__isctype((c), _ISspace)
-# define isupper(c)	__isctype((c), _ISupper)
-# define isxdigit(c)	__isctype((c), _ISxdigit)
-#  ifdef __USE_ISOC99
-#   define isblank(c)	__isctype((c), _ISblank)
-#  endif
-# endif
-
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (tolower (int __c))
-{
-  return __c >= -128 && __c < 256 ? (*__ctype_tolower_loc ())[__c] : __c;
-}
-
-__extern_inline int
-__NTH (toupper (int __c))
-{
-  return __c >= -128 && __c < 256 ? (*__ctype_toupper_loc ())[__c] : __c;
-}
-# endif
-
-# if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus
-#  define tolower(c)	__tobody (c, tolower, *__ctype_tolower_loc (), (c))
-#  define toupper(c)	__tobody (c, toupper, *__ctype_toupper_loc (), (c))
-# endif /* Optimizing gcc */
-
-# if defined __USE_MISC || defined __USE_XOPEN
-#  define isascii(c)	__isascii (c)
-#  define toascii(c)	__toascii (c)
-
-#  define _tolower(c)	((int) (*__ctype_tolower_loc ())[(int) (c)])
-#  define _toupper(c)	((int) (*__ctype_toupper_loc ())[(int) (c)])
-# endif
-
-#endif /* Not __NO_CTYPE.  */
-
-
-#ifdef __USE_XOPEN2K8
-/* The concept of one static locale per category is not very well
-   thought out.  Many applications will need to process its data using
-   information from several different locales.  Another application is
-   the implementation of the internationalization handling in the
-   upcoming ISO C++ standard library.  To support this another set of
-   the functions using locale data exist which have an additional
-   argument.
-
-   Attention: all these functions are *not* standardized in any form.
-   This is a proof-of-concept implementation.  */
-
-/* Structure for reentrant locale using functions.  This is an
-   (almost) opaque type for the user level programs.  */
-# include <xlocale.h>
-
-/* These definitions are similar to the ones above but all functions
-   take as an argument a handle for the locale which shall be used.  */
-#  define __isctype_l(c, type, locale) \
-  ((locale)->__ctype_b[(int) (c)] & (unsigned short int) type)
-
-# define __exctype_l(name) 						      \
-  extern int name (int, __locale_t) __THROW
-
-/* The following names are all functions:
-     int isCHARACTERISTIC(int c, locale_t *locale);
-   which return nonzero iff C has CHARACTERISTIC.
-   For the meaning of the characteristic names, see the `enum' above.  */
-__exctype_l (isalnum_l);
-__exctype_l (isalpha_l);
-__exctype_l (iscntrl_l);
-__exctype_l (isdigit_l);
-__exctype_l (islower_l);
-__exctype_l (isgraph_l);
-__exctype_l (isprint_l);
-__exctype_l (ispunct_l);
-__exctype_l (isspace_l);
-__exctype_l (isupper_l);
-__exctype_l (isxdigit_l);
-
-__exctype_l (isblank_l);
-
-
-/* Return the lowercase version of C in locale L.  */
-extern int __tolower_l (int __c, __locale_t __l) __THROW;
-extern int tolower_l (int __c, __locale_t __l) __THROW;
-
-/* Return the uppercase version of C.  */
-extern int __toupper_l (int __c, __locale_t __l) __THROW;
-extern int toupper_l (int __c, __locale_t __l) __THROW;
-
-# if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus
-#  define __tolower_l(c, locale) \
-  __tobody (c, __tolower_l, (locale)->__ctype_tolower, (c, locale))
-#  define __toupper_l(c, locale) \
-  __tobody (c, __toupper_l, (locale)->__ctype_toupper, (c, locale))
-#  define tolower_l(c, locale)	__tolower_l ((c), (locale))
-#  define toupper_l(c, locale)	__toupper_l ((c), (locale))
-# endif	/* Optimizing gcc */
-
-
-# ifndef __NO_CTYPE
-#  define __isalnum_l(c,l)	__isctype_l((c), _ISalnum, (l))
-#  define __isalpha_l(c,l)	__isctype_l((c), _ISalpha, (l))
-#  define __iscntrl_l(c,l)	__isctype_l((c), _IScntrl, (l))
-#  define __isdigit_l(c,l)	__isctype_l((c), _ISdigit, (l))
-#  define __islower_l(c,l)	__isctype_l((c), _ISlower, (l))
-#  define __isgraph_l(c,l)	__isctype_l((c), _ISgraph, (l))
-#  define __isprint_l(c,l)	__isctype_l((c), _ISprint, (l))
-#  define __ispunct_l(c,l)	__isctype_l((c), _ISpunct, (l))
-#  define __isspace_l(c,l)	__isctype_l((c), _ISspace, (l))
-#  define __isupper_l(c,l)	__isctype_l((c), _ISupper, (l))
-#  define __isxdigit_l(c,l)	__isctype_l((c), _ISxdigit, (l))
-
-#  define __isblank_l(c,l)	__isctype_l((c), _ISblank, (l))
-
-#  ifdef __USE_MISC
-#   define __isascii_l(c,l)	((l), __isascii (c))
-#   define __toascii_l(c,l)	((l), __toascii (c))
-#  endif
-
-#  define isalnum_l(c,l)	__isalnum_l ((c), (l))
-#  define isalpha_l(c,l)	__isalpha_l ((c), (l))
-#  define iscntrl_l(c,l)	__iscntrl_l ((c), (l))
-#  define isdigit_l(c,l)	__isdigit_l ((c), (l))
-#  define islower_l(c,l)	__islower_l ((c), (l))
-#  define isgraph_l(c,l)	__isgraph_l ((c), (l))
-#  define isprint_l(c,l)	__isprint_l ((c), (l))
-#  define ispunct_l(c,l)	__ispunct_l ((c), (l))
-#  define isspace_l(c,l)	__isspace_l ((c), (l))
-#  define isupper_l(c,l)	__isupper_l ((c), (l))
-#  define isxdigit_l(c,l)	__isxdigit_l ((c), (l))
-
-#  define isblank_l(c,l)	__isblank_l ((c), (l))
-
-#  ifdef __USE_MISC
-#   define isascii_l(c,l)	__isascii_l ((c), (l))
-#   define toascii_l(c,l)	__toascii_l ((c), (l))
-#  endif
-
-# endif /* Not __NO_CTYPE.  */
-
-#endif /* Use POSIX 2008.  */
-
-__END_DECLS
-
-#endif /* ctype.h  */
diff --git a/openflow/usr/include/curses.h b/openflow/usr/include/curses.h
deleted file mode 100644
index 71475ba..0000000
--- a/openflow/usr/include/curses.h
+++ /dev/null
@@ -1,1718 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- *     and: Thomas E. Dickey                        1996-on                 *
- ****************************************************************************/
-
-/* $Id: curses.h.in,v 1.243 2016/01/23 22:20:31 tom Exp $ */
-
-#ifndef __NCURSES_H
-#define __NCURSES_H
-
-#define CURSES 1
-#define CURSES_H 1
-
-/* These are defined only in curses.h, and are used for conditional compiles */
-#define NCURSES_VERSION_MAJOR 6
-#define NCURSES_VERSION_MINOR 0
-#define NCURSES_VERSION_PATCH 20160213
-
-/* This is defined in more than one ncurses header, for identification */
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "6.0"
-
-/*
- * Identify the mouse encoding version.
- */
-#define NCURSES_MOUSE_VERSION 1
-
-/*
- * Definitions to facilitate DLL's.
- */
-#include <ncurses_dll.h>
-
-#if 1
-#include <stdint.h>
-#endif
-
-/*
- * User-definable tweak to disable the include of <stdbool.h>.
- */
-#ifndef NCURSES_ENABLE_STDBOOL_H
-#define NCURSES_ENABLE_STDBOOL_H 1
-#endif
-
-/*
- * NCURSES_ATTR_T is used to quiet compiler warnings when building ncurses
- * configured using --disable-macros.
- */
-#ifndef NCURSES_ATTR_T
-#define NCURSES_ATTR_T int
-#endif
-
-/*
- * Expands to 'const' if ncurses is configured using --enable-const.  Note that
- * doing so makes it incompatible with other implementations of X/Open Curses.
- */
-#undef  NCURSES_CONST
-#define NCURSES_CONST const
-
-#undef NCURSES_INLINE
-#define NCURSES_INLINE inline
-
-/*
- * The internal type used for color values, and for color-pairs.  The latter
- * allows the curses library to enumerate the combinations of foreground and
- * background colors used by an application, and is normally the product of the
- * total foreground and background colors.
- *
- * X/Open uses "short" for both of these types, ultimately because they are
- * numbers from the terminal database, which uses 16-bit signed values.
- */
-#undef	NCURSES_COLOR_T
-#define	NCURSES_COLOR_T short
-
-#undef	NCURSES_PAIRS_T
-#define	NCURSES_PAIRS_T short
-
-/*
- * Definition used to make WINDOW and similar structs opaque.
- */
-#ifndef NCURSES_OPAQUE
-#define NCURSES_OPAQUE 0
-#endif
-
-/*
- * The reentrant code relies on the opaque setting, but adds features.
- */
-#ifndef NCURSES_REENTRANT
-#define NCURSES_REENTRANT 0
-#endif
-
-/*
- * Control whether bindings for interop support are added.
- */
-#undef	NCURSES_INTEROP_FUNCS
-#define	NCURSES_INTEROP_FUNCS 0
-
-/*
- * The internal type used for window dimensions.
- */
-#undef	NCURSES_SIZE_T
-#define	NCURSES_SIZE_T short
-
-/*
- * Control whether tparm() supports varargs or fixed-parameter list.
- */
-#undef NCURSES_TPARM_VARARGS
-#define NCURSES_TPARM_VARARGS 1
-
-/*
- * Control type used for tparm's arguments.  While X/Open equates long and
- * char* values, this is not always workable for 64-bit platforms.
- */
-#undef NCURSES_TPARM_ARG
-#define NCURSES_TPARM_ARG long
-
-/*
- * Control whether ncurses uses wcwidth() for checking width of line-drawing
- * characters.
- */
-#undef NCURSES_WCWIDTH_GRAPHICS
-#define NCURSES_WCWIDTH_GRAPHICS 1
-
-/*
- * NCURSES_CH_T is used in building the library, but not used otherwise in
- * this header file, since that would make the normal/wide-character versions
- * of the header incompatible.
- */
-#undef	NCURSES_CH_T
-#define NCURSES_CH_T chtype
-
-#if 0 && defined(_LP64)
-typedef unsigned chtype;
-typedef unsigned mmask_t;
-#else
-typedef unsigned long chtype;
-typedef unsigned long mmask_t;
-#endif
-
-/*
- * We need FILE, etc.  Include this before checking any feature symbols.
- */
-#include <stdio.h>
-
-/*
- * With XPG4, you must define _XOPEN_SOURCE_EXTENDED, it is redundant (or
- * conflicting) when _XOPEN_SOURCE is 500 or greater.  If NCURSES_WIDECHAR is
- * not already defined, e.g., if the platform relies upon nonstandard feature
- * test macros, define it at this point if the standard feature test macros
- * indicate that it should be defined.
- */
-#ifndef NCURSES_WIDECHAR
-#if defined(_XOPEN_SOURCE_EXTENDED) || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0 >= 500))
-#define NCURSES_WIDECHAR 1
-#else
-#define NCURSES_WIDECHAR 0
-#endif
-#endif /* NCURSES_WIDECHAR */
-
-#include <stdarg.h>	/* we need va_list */
-#if NCURSES_WIDECHAR
-#include <stddef.h>	/* we want wchar_t */
-#endif
-
-/* X/Open and SVr4 specify that curses implements 'bool'.  However, C++ may also
- * implement it.  If so, we must use the C++ compiler's type to avoid conflict
- * with other interfaces.
- *
- * A further complication is that <stdbool.h> may declare 'bool' to be a
- * different type, such as an enum which is not necessarily compatible with
- * C++.  If we have <stdbool.h>, make 'bool' a macro, so users may #undef it.
- * Otherwise, let it remain a typedef to avoid conflicts with other #define's.
- * In either case, make a typedef for NCURSES_BOOL which can be used if needed
- * from either C or C++.
- */
-
-#undef TRUE
-#define TRUE    1
-
-#undef FALSE
-#define FALSE   0
-
-typedef unsigned char NCURSES_BOOL;
-
-#if defined(__cplusplus)	/* __cplusplus, etc. */
-
-/* use the C++ compiler's bool type */
-#define NCURSES_BOOL bool
-
-#else			/* c89, c99, etc. */
-
-#if NCURSES_ENABLE_STDBOOL_H
-#include <stdbool.h>
-/* use whatever the C compiler decides bool really is */
-#define NCURSES_BOOL bool
-#else
-/* there is no predefined bool - use our own */
-#undef bool
-#define bool NCURSES_BOOL
-#endif
-
-#endif /* !__cplusplus, etc. */
-
-#ifdef __cplusplus
-extern "C" {
-#define NCURSES_CAST(type,value) static_cast<type>(value)
-#else
-#define NCURSES_CAST(type,value) (type)(value)
-#endif
-
-/*
- * X/Open attributes.  In the ncurses implementation, they are identical to the
- * A_ attributes.
- */
-#define WA_ATTRIBUTES	A_ATTRIBUTES
-#define WA_NORMAL	A_NORMAL
-#define WA_STANDOUT	A_STANDOUT
-#define WA_UNDERLINE	A_UNDERLINE
-#define WA_REVERSE	A_REVERSE
-#define WA_BLINK	A_BLINK
-#define WA_DIM		A_DIM
-#define WA_BOLD		A_BOLD
-#define WA_ALTCHARSET	A_ALTCHARSET
-#define WA_INVIS	A_INVIS
-#define WA_PROTECT	A_PROTECT
-#define WA_HORIZONTAL	A_HORIZONTAL
-#define WA_LEFT		A_LEFT
-#define WA_LOW		A_LOW
-#define WA_RIGHT	A_RIGHT
-#define WA_TOP		A_TOP
-#define WA_VERTICAL	A_VERTICAL
-
-#if 1
-#define WA_ITALIC	A_ITALIC	/* ncurses extension */
-#endif
-
-/* colors */
-#define COLOR_BLACK	0
-#define COLOR_RED	1
-#define COLOR_GREEN	2
-#define COLOR_YELLOW	3
-#define COLOR_BLUE	4
-#define COLOR_MAGENTA	5
-#define COLOR_CYAN	6
-#define COLOR_WHITE	7
-
-/* line graphics */
-
-#if 0 || NCURSES_REENTRANT
-NCURSES_WRAPPED_VAR(chtype*, acs_map);
-#define acs_map NCURSES_PUBLIC_VAR(acs_map())
-#else
-extern NCURSES_EXPORT_VAR(chtype) acs_map[];
-#endif
-
-#define NCURSES_ACS(c)	(acs_map[NCURSES_CAST(unsigned char,(c))])
-
-/* VT100 symbols begin here */
-#define ACS_ULCORNER	NCURSES_ACS('l') /* upper left corner */
-#define ACS_LLCORNER	NCURSES_ACS('m') /* lower left corner */
-#define ACS_URCORNER	NCURSES_ACS('k') /* upper right corner */
-#define ACS_LRCORNER	NCURSES_ACS('j') /* lower right corner */
-#define ACS_LTEE	NCURSES_ACS('t') /* tee pointing right */
-#define ACS_RTEE	NCURSES_ACS('u') /* tee pointing left */
-#define ACS_BTEE	NCURSES_ACS('v') /* tee pointing up */
-#define ACS_TTEE	NCURSES_ACS('w') /* tee pointing down */
-#define ACS_HLINE	NCURSES_ACS('q') /* horizontal line */
-#define ACS_VLINE	NCURSES_ACS('x') /* vertical line */
-#define ACS_PLUS	NCURSES_ACS('n') /* large plus or crossover */
-#define ACS_S1		NCURSES_ACS('o') /* scan line 1 */
-#define ACS_S9		NCURSES_ACS('s') /* scan line 9 */
-#define ACS_DIAMOND	NCURSES_ACS('`') /* diamond */
-#define ACS_CKBOARD	NCURSES_ACS('a') /* checker board (stipple) */
-#define ACS_DEGREE	NCURSES_ACS('f') /* degree symbol */
-#define ACS_PLMINUS	NCURSES_ACS('g') /* plus/minus */
-#define ACS_BULLET	NCURSES_ACS('~') /* bullet */
-/* Teletype 5410v1 symbols begin here */
-#define ACS_LARROW	NCURSES_ACS(',') /* arrow pointing left */
-#define ACS_RARROW	NCURSES_ACS('+') /* arrow pointing right */
-#define ACS_DARROW	NCURSES_ACS('.') /* arrow pointing down */
-#define ACS_UARROW	NCURSES_ACS('-') /* arrow pointing up */
-#define ACS_BOARD	NCURSES_ACS('h') /* board of squares */
-#define ACS_LANTERN	NCURSES_ACS('i') /* lantern symbol */
-#define ACS_BLOCK	NCURSES_ACS('0') /* solid square block */
-/*
- * These aren't documented, but a lot of System Vs have them anyway
- * (you can spot pprryyzz{{||}} in a lot of AT&T terminfo strings).
- * The ACS_names may not match AT&T's, our source didn't know them.
- */
-#define ACS_S3		NCURSES_ACS('p') /* scan line 3 */
-#define ACS_S7		NCURSES_ACS('r') /* scan line 7 */
-#define ACS_LEQUAL	NCURSES_ACS('y') /* less/equal */
-#define ACS_GEQUAL	NCURSES_ACS('z') /* greater/equal */
-#define ACS_PI		NCURSES_ACS('{') /* Pi */
-#define ACS_NEQUAL	NCURSES_ACS('|') /* not equal */
-#define ACS_STERLING	NCURSES_ACS('}') /* UK pound sign */
-
-/*
- * Line drawing ACS names are of the form ACS_trbl, where t is the top, r
- * is the right, b is the bottom, and l is the left.  t, r, b, and l might
- * be B (blank), S (single), D (double), or T (thick).  The subset defined
- * here only uses B and S.
- */
-#define ACS_BSSB	ACS_ULCORNER
-#define ACS_SSBB	ACS_LLCORNER
-#define ACS_BBSS	ACS_URCORNER
-#define ACS_SBBS	ACS_LRCORNER
-#define ACS_SBSS	ACS_RTEE
-#define ACS_SSSB	ACS_LTEE
-#define ACS_SSBS	ACS_BTEE
-#define ACS_BSSS	ACS_TTEE
-#define ACS_BSBS	ACS_HLINE
-#define ACS_SBSB	ACS_VLINE
-#define ACS_SSSS	ACS_PLUS
-
-#undef	ERR
-#define ERR     (-1)
-
-#undef	OK
-#define OK      (0)
-
-/* values for the _flags member */
-#define _SUBWIN         0x01	/* is this a sub-window? */
-#define _ENDLINE        0x02	/* is the window flush right? */
-#define _FULLWIN        0x04	/* is the window full-screen? */
-#define _SCROLLWIN      0x08	/* bottom edge is at screen bottom? */
-#define _ISPAD	        0x10	/* is this window a pad? */
-#define _HASMOVED       0x20	/* has cursor moved since last refresh? */
-#define _WRAPPED        0x40	/* cursor was just wrappped */
-
-/*
- * this value is used in the firstchar and lastchar fields to mark
- * unchanged lines
- */
-#define _NOCHANGE       -1
-
-/*
- * this value is used in the oldindex field to mark lines created by insertions
- * and scrolls.
- */
-#define _NEWINDEX	-1
-
-typedef struct screen  SCREEN;
-typedef struct _win_st WINDOW;
-
-typedef	chtype	attr_t;		/* ...must be at least as wide as chtype */
-
-#if NCURSES_WIDECHAR
-
-#if 0
-#ifdef mblen			/* libutf8.h defines it w/o undefining first */
-#undef mblen
-#endif
-#include <libutf8.h>
-#endif
-
-#if 0
-#include <wchar.h>		/* ...to get mbstate_t, etc. */
-#endif
-
-#if 0
-typedef unsigned short wchar_t;
-#endif
-
-#if 0
-typedef unsigned int wint_t;
-#endif
-
-/*
- * cchar_t stores an array of CCHARW_MAX wide characters.  The first is
- * normally a spacing character.  The others are non-spacing.  If those
- * (spacing and nonspacing) do not fill the array, a null L'\0' follows.
- * Otherwise, a null is assumed to follow when extracting via getcchar().
- */
-#define CCHARW_MAX	5
-typedef struct
-{
-    attr_t	attr;
-    wchar_t	chars[CCHARW_MAX];
-#if 0
-#undef NCURSES_EXT_COLORS
-#define NCURSES_EXT_COLORS 20160213
-    int		ext_color;	/* color pair, must be more than 16-bits */
-#endif
-}
-cchar_t;
-
-#endif /* NCURSES_WIDECHAR */
-
-#if !NCURSES_OPAQUE
-struct ldat;
-
-struct _win_st
-{
-	NCURSES_SIZE_T _cury, _curx; /* current cursor position */
-
-	/* window location and size */
-	NCURSES_SIZE_T _maxy, _maxx; /* maximums of x and y, NOT window size */
-	NCURSES_SIZE_T _begy, _begx; /* screen coords of upper-left-hand corner */
-
-	short   _flags;		/* window state flags */
-
-	/* attribute tracking */
-	attr_t  _attrs;		/* current attribute for non-space character */
-	chtype  _bkgd;		/* current background char/attribute pair */
-
-	/* option values set by user */
-	bool	_notimeout;	/* no time out on function-key entry? */
-	bool	_clear;		/* consider all data in the window invalid? */
-	bool	_leaveok;	/* OK to not reset cursor on exit? */
-	bool	_scroll;	/* OK to scroll this window? */
-	bool	_idlok;		/* OK to use insert/delete line? */
-	bool	_idcok;		/* OK to use insert/delete char? */
-	bool	_immed;		/* window in immed mode? (not yet used) */
-	bool	_sync;		/* window in sync mode? */
-	bool	_use_keypad;	/* process function keys into KEY_ symbols? */
-	int	_delay;		/* 0 = nodelay, <0 = blocking, >0 = delay */
-
-	struct ldat *_line;	/* the actual line data */
-
-	/* global screen state */
-	NCURSES_SIZE_T _regtop;	/* top line of scrolling region */
-	NCURSES_SIZE_T _regbottom; /* bottom line of scrolling region */
-
-	/* these are used only if this is a sub-window */
-	int	_parx;		/* x coordinate of this window in parent */
-	int	_pary;		/* y coordinate of this window in parent */
-	WINDOW	*_parent;	/* pointer to parent if a sub-window */
-
-	/* these are used only if this is a pad */
-	struct pdat
-	{
-	    NCURSES_SIZE_T _pad_y,      _pad_x;
-	    NCURSES_SIZE_T _pad_top,    _pad_left;
-	    NCURSES_SIZE_T _pad_bottom, _pad_right;
-	} _pad;
-
-	NCURSES_SIZE_T _yoffset; /* real begy is _begy + _yoffset */
-
-#if NCURSES_WIDECHAR
-	cchar_t  _bkgrnd;	/* current background char/attribute pair */
-#if 0
-	int	_color;		/* current color-pair for non-space character */
-#endif
-#endif
-};
-#endif /* NCURSES_OPAQUE */
-
-/*
- * This is an extension to support events...
- */
-#if 1
-#ifdef NCURSES_WGETCH_EVENTS
-#if !defined(__BEOS__) || defined(__HAIKU__)
-   /* Fix _nc_timed_wait() on BEOS... */
-#  define NCURSES_EVENT_VERSION	1
-#endif	/* !defined(__BEOS__) */
-
-/*
- * Bits to set in _nc_event.data.flags
- */
-#  define _NC_EVENT_TIMEOUT_MSEC	1
-#  define _NC_EVENT_FILE		2
-#  define _NC_EVENT_FILE_READABLE	2
-#  if 0					/* Not supported yet... */
-#    define _NC_EVENT_FILE_WRITABLE	4
-#    define _NC_EVENT_FILE_EXCEPTION	8
-#  endif
-
-typedef struct
-{
-    int type;
-    union
-    {
-	long timeout_msec;	/* _NC_EVENT_TIMEOUT_MSEC */
-	struct
-	{
-	    unsigned int flags;
-	    int fd;
-	    unsigned int result;
-	} fev;				/* _NC_EVENT_FILE */
-    } data;
-} _nc_event;
-
-typedef struct
-{
-    int count;
-    int result_flags;	/* _NC_EVENT_TIMEOUT_MSEC or _NC_EVENT_FILE_READABLE */
-    _nc_event *events[1];
-} _nc_eventlist;
-
-extern NCURSES_EXPORT(int) wgetch_events (WINDOW *, _nc_eventlist *);	/* experimental */
-extern NCURSES_EXPORT(int) wgetnstr_events (WINDOW *,char *,int,_nc_eventlist *);/* experimental */
-
-#endif /* NCURSES_WGETCH_EVENTS */
-#endif /* NCURSES_EXT_FUNCS */
-
-/*
- * GCC (and some other compilers) define '__attribute__'; we're using this
- * macro to alert the compiler to flag inconsistencies in printf/scanf-like
- * function calls.  Just in case '__attribute__' isn't defined, make a dummy.
- * Old versions of G++ do not accept it anyway, at least not consistently with
- * GCC.
- */
-#if !(defined(__GNUC__) || defined(__GNUG__) || defined(__attribute__))
-#define __attribute__(p) /* nothing */
-#endif
-
-/*
- * We cannot define these in ncurses_cfg.h, since they require parameters to be
- * passed (that is non-portable).  If you happen to be using gcc with warnings
- * enabled, define
- *	GCC_PRINTF
- *	GCC_SCANF
- * to improve checking of calls to printw(), etc.
- */
-#ifndef GCC_PRINTFLIKE
-#if defined(GCC_PRINTF) && !defined(printf)
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-#else
-#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
-#endif
-#endif
-
-#ifndef GCC_SCANFLIKE
-#if defined(GCC_SCANF) && !defined(scanf)
-#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
-#else
-#define GCC_SCANFLIKE(fmt,var)  /*nothing*/
-#endif
-#endif
-
-#ifndef	GCC_NORETURN
-#define	GCC_NORETURN /* nothing */
-#endif
-
-#ifndef	GCC_UNUSED
-#define	GCC_UNUSED /* nothing */
-#endif
-
-/*
- * Curses uses a helper function.  Define our type for this to simplify
- * extending it for the sp-funcs feature.
- */
-typedef int (*NCURSES_OUTC)(int);
-
-/*
- * Function prototypes.  This is the complete X/Open Curses list of required
- * functions.  Those marked `generated' will have sources generated from the
- * macro definitions later in this file, in order to satisfy XPG4.2
- * requirements.
- */
-
-extern NCURSES_EXPORT(int) addch (const chtype);			/* generated */
-extern NCURSES_EXPORT(int) addchnstr (const chtype *, int);		/* generated */
-extern NCURSES_EXPORT(int) addchstr (const chtype *);			/* generated */
-extern NCURSES_EXPORT(int) addnstr (const char *, int);			/* generated */
-extern NCURSES_EXPORT(int) addstr (const char *);			/* generated */
-extern NCURSES_EXPORT(int) attroff (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attron (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attrset (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attr_get (attr_t *, NCURSES_PAIRS_T *, void *);	/* generated */
-extern NCURSES_EXPORT(int) attr_off (attr_t, void *);			/* generated */
-extern NCURSES_EXPORT(int) attr_on (attr_t, void *);			/* generated */
-extern NCURSES_EXPORT(int) attr_set (attr_t, NCURSES_PAIRS_T, void *);		/* generated */
-extern NCURSES_EXPORT(int) baudrate (void);				/* implemented */
-extern NCURSES_EXPORT(int) beep  (void);				/* implemented */
-extern NCURSES_EXPORT(int) bkgd (chtype);				/* generated */
-extern NCURSES_EXPORT(void) bkgdset (chtype);				/* generated */
-extern NCURSES_EXPORT(int) border (chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* generated */
-extern NCURSES_EXPORT(int) box (WINDOW *, chtype, chtype);		/* generated */
-extern NCURSES_EXPORT(bool) can_change_color (void);			/* implemented */
-extern NCURSES_EXPORT(int) cbreak (void);				/* implemented */
-extern NCURSES_EXPORT(int) chgat (int, attr_t, NCURSES_PAIRS_T, const void *);	/* generated */
-extern NCURSES_EXPORT(int) clear (void);				/* generated */
-extern NCURSES_EXPORT(int) clearok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) clrtobot (void);				/* generated */
-extern NCURSES_EXPORT(int) clrtoeol (void);				/* generated */
-extern NCURSES_EXPORT(int) color_content (NCURSES_COLOR_T,NCURSES_COLOR_T*,NCURSES_COLOR_T*,NCURSES_COLOR_T*);	/* implemented */
-extern NCURSES_EXPORT(int) color_set (NCURSES_PAIRS_T,void*);			/* generated */
-extern NCURSES_EXPORT(int) COLOR_PAIR (int);				/* generated */
-extern NCURSES_EXPORT(int) copywin (const WINDOW*,WINDOW*,int,int,int,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) curs_set (int);				/* implemented */
-extern NCURSES_EXPORT(int) def_prog_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) def_shell_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) delay_output (int);				/* implemented */
-extern NCURSES_EXPORT(int) delch (void);				/* generated */
-extern NCURSES_EXPORT(void) delscreen (SCREEN *);			/* implemented */
-extern NCURSES_EXPORT(int) delwin (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) deleteln (void);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) derwin (WINDOW *,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) doupdate (void);				/* implemented */
-extern NCURSES_EXPORT(WINDOW *) dupwin (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) echo (void);					/* implemented */
-extern NCURSES_EXPORT(int) echochar (const chtype);			/* generated */
-extern NCURSES_EXPORT(int) erase (void);				/* generated */
-extern NCURSES_EXPORT(int) endwin (void);				/* implemented */
-extern NCURSES_EXPORT(char) erasechar (void);				/* implemented */
-extern NCURSES_EXPORT(void) filter (void);				/* implemented */
-extern NCURSES_EXPORT(int) flash (void);				/* implemented */
-extern NCURSES_EXPORT(int) flushinp (void);				/* implemented */
-extern NCURSES_EXPORT(chtype) getbkgd (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getch (void);				/* generated */
-extern NCURSES_EXPORT(int) getnstr (char *, int);			/* generated */
-extern NCURSES_EXPORT(int) getstr (char *);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) getwin (FILE *);			/* implemented */
-extern NCURSES_EXPORT(int) halfdelay (int);				/* implemented */
-extern NCURSES_EXPORT(bool) has_colors (void);				/* implemented */
-extern NCURSES_EXPORT(bool) has_ic (void);				/* implemented */
-extern NCURSES_EXPORT(bool) has_il (void);				/* implemented */
-extern NCURSES_EXPORT(int) hline (chtype, int);				/* generated */
-extern NCURSES_EXPORT(void) idcok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(int) idlok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(void) immedok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(chtype) inch (void);				/* generated */
-extern NCURSES_EXPORT(int) inchnstr (chtype *, int);			/* generated */
-extern NCURSES_EXPORT(int) inchstr (chtype *);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) initscr (void);				/* implemented */
-extern NCURSES_EXPORT(int) init_color (NCURSES_COLOR_T,NCURSES_COLOR_T,NCURSES_COLOR_T,NCURSES_COLOR_T);	/* implemented */
-extern NCURSES_EXPORT(int) init_pair (NCURSES_PAIRS_T,NCURSES_COLOR_T,NCURSES_COLOR_T);		/* implemented */
-extern NCURSES_EXPORT(int) innstr (char *, int);			/* generated */
-extern NCURSES_EXPORT(int) insch (chtype);				/* generated */
-extern NCURSES_EXPORT(int) insdelln (int);				/* generated */
-extern NCURSES_EXPORT(int) insertln (void);				/* generated */
-extern NCURSES_EXPORT(int) insnstr (const char *, int);			/* generated */
-extern NCURSES_EXPORT(int) insstr (const char *);			/* generated */
-extern NCURSES_EXPORT(int) instr (char *);				/* generated */
-extern NCURSES_EXPORT(int) intrflush (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(bool) isendwin (void);				/* implemented */
-extern NCURSES_EXPORT(bool) is_linetouched (WINDOW *,int);		/* implemented */
-extern NCURSES_EXPORT(bool) is_wintouched (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(NCURSES_CONST char *) keyname (int);		/* implemented */
-extern NCURSES_EXPORT(int) keypad (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(char) killchar (void);				/* implemented */
-extern NCURSES_EXPORT(int) leaveok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(char *) longname (void);				/* implemented */
-extern NCURSES_EXPORT(int) meta (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) move (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvaddch (int, int, const chtype);		/* generated */
-extern NCURSES_EXPORT(int) mvaddchnstr (int, int, const chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvaddchstr (int, int, const chtype *);	/* generated */
-extern NCURSES_EXPORT(int) mvaddnstr (int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvaddstr (int, int, const char *);		/* generated */
-extern NCURSES_EXPORT(int) mvchgat (int, int, int, attr_t, NCURSES_PAIRS_T, const void *);	/* generated */
-extern NCURSES_EXPORT(int) mvcur (int,int,int,int);			/* implemented */
-extern NCURSES_EXPORT(int) mvdelch (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvderwin (WINDOW *, int, int);		/* implemented */
-extern NCURSES_EXPORT(int) mvgetch (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvgetnstr (int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvgetstr (int, int, char *);			/* generated */
-extern NCURSES_EXPORT(int) mvhline (int, int, chtype, int);		/* generated */
-extern NCURSES_EXPORT(chtype) mvinch (int, int);			/* generated */
-extern NCURSES_EXPORT(int) mvinchnstr (int, int, chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvinchstr (int, int, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) mvinnstr (int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvinsch (int, int, chtype);			/* generated */
-extern NCURSES_EXPORT(int) mvinsnstr (int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvinsstr (int, int, const char *);		/* generated */
-extern NCURSES_EXPORT(int) mvinstr (int, int, char *);			/* generated */
-extern NCURSES_EXPORT(int) mvprintw (int,int, const char *,...)		/* implemented */
-		GCC_PRINTFLIKE(3,4);
-extern NCURSES_EXPORT(int) mvscanw (int,int, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(3,4);
-extern NCURSES_EXPORT(int) mvvline (int, int, chtype, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwaddch (WINDOW *, int, int, const chtype);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddchnstr (WINDOW *, int, int, const chtype *, int);/* generated */
-extern NCURSES_EXPORT(int) mvwaddchstr (WINDOW *, int, int, const chtype *);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddnstr (WINDOW *, int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddstr (WINDOW *, int, int, const char *);	/* generated */
-extern NCURSES_EXPORT(int) mvwchgat (WINDOW *, int, int, int, attr_t, NCURSES_PAIRS_T, const void *);/* generated */
-extern NCURSES_EXPORT(int) mvwdelch (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwgetch (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwgetnstr (WINDOW *, int, int, char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwgetstr (WINDOW *, int, int, char *);	/* generated */
-extern NCURSES_EXPORT(int) mvwhline (WINDOW *, int, int, chtype, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwin (WINDOW *,int,int);			/* implemented */
-extern NCURSES_EXPORT(chtype) mvwinch (WINDOW *, int, int);			/* generated */
-extern NCURSES_EXPORT(int) mvwinchnstr (WINDOW *, int, int, chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwinchstr (WINDOW *, int, int, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype);		/* generated */
-extern NCURSES_EXPORT(int) mvwinsnstr (WINDOW *, int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *);	/* generated */
-extern NCURSES_EXPORT(int) mvwinstr (WINDOW *, int, int, char *);		/* generated */
-extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...)	/* implemented */
-		GCC_PRINTFLIKE(4,5);
-extern NCURSES_EXPORT(int) mvwscanw (WINDOW *,int,int, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(4,5);
-extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int);	/* generated */
-extern NCURSES_EXPORT(int) napms (int);					/* implemented */
-extern NCURSES_EXPORT(WINDOW *) newpad (int,int);		       	/* implemented */
-extern NCURSES_EXPORT(SCREEN *) newterm (NCURSES_CONST char *,FILE *,FILE *);	/* implemented */
-extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);	       	/* implemented */
-extern NCURSES_EXPORT(int) nl (void);					/* implemented */
-extern NCURSES_EXPORT(int) nocbreak (void);				/* implemented */
-extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) noecho (void);				/* implemented */
-extern NCURSES_EXPORT(int) nonl (void);					/* implemented */
-extern NCURSES_EXPORT(void) noqiflush (void);				/* implemented */
-extern NCURSES_EXPORT(int) noraw (void);				/* implemented */
-extern NCURSES_EXPORT(int) notimeout (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) overlay (const WINDOW*,WINDOW *);		/* implemented */
-extern NCURSES_EXPORT(int) overwrite (const WINDOW*,WINDOW *);		/* implemented */
-extern NCURSES_EXPORT(int) pair_content (NCURSES_PAIRS_T,NCURSES_COLOR_T*,NCURSES_COLOR_T*);		/* implemented */
-extern NCURSES_EXPORT(int) PAIR_NUMBER (int);				/* generated */
-extern NCURSES_EXPORT(int) pechochar (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) pnoutrefresh (WINDOW*,int,int,int,int,int,int);/* implemented */
-extern NCURSES_EXPORT(int) prefresh (WINDOW *,int,int,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) printw (const char *,...)			/* implemented */
-		GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(int) putwin (WINDOW *, FILE *);			/* implemented */
-extern NCURSES_EXPORT(void) qiflush (void);				/* implemented */
-extern NCURSES_EXPORT(int) raw (void);					/* implemented */
-extern NCURSES_EXPORT(int) redrawwin (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) refresh (void);				/* generated */
-extern NCURSES_EXPORT(int) resetty (void);				/* implemented */
-extern NCURSES_EXPORT(int) reset_prog_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) reset_shell_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) ripoffline (int, int (*)(WINDOW *, int));	/* implemented */
-extern NCURSES_EXPORT(int) savetty (void);				/* implemented */
-extern NCURSES_EXPORT(int) scanw (NCURSES_CONST char *,...)		/* implemented */
-		GCC_SCANFLIKE(1,2);
-extern NCURSES_EXPORT(int) scr_dump (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scr_init (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scrl (int);					/* generated */
-extern NCURSES_EXPORT(int) scroll (WINDOW *);				/* generated */
-extern NCURSES_EXPORT(int) scrollok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) scr_restore (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scr_set (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) setscrreg (int,int);				/* generated */
-extern NCURSES_EXPORT(SCREEN *) set_term (SCREEN *);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attroff (const chtype);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_off (const attr_t, void *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) slk_attron (const chtype);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_on (attr_t,void*);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) slk_attrset (const chtype);			/* implemented */
-extern NCURSES_EXPORT(attr_t) slk_attr (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_set (const attr_t,NCURSES_PAIRS_T,void*);	/* implemented */
-extern NCURSES_EXPORT(int) slk_clear (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_color (NCURSES_PAIRS_T);				/* implemented */
-extern NCURSES_EXPORT(int) slk_init (int);				/* implemented */
-extern NCURSES_EXPORT(char *) slk_label (int);				/* implemented */
-extern NCURSES_EXPORT(int) slk_noutrefresh (void);			/* implemented */
-extern NCURSES_EXPORT(int) slk_refresh (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_restore (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_set (int,const char *,int);		/* implemented */
-extern NCURSES_EXPORT(int) slk_touch (void);	      	       		/* implemented */
-extern NCURSES_EXPORT(int) standout (void);				/* generated */
-extern NCURSES_EXPORT(int) standend (void);				/* generated */
-extern NCURSES_EXPORT(int) start_color (void);				/* implemented */
-extern NCURSES_EXPORT(WINDOW *) subpad (WINDOW *, int, int, int, int);	/* implemented */
-extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *, int, int, int, int);	/* implemented */
-extern NCURSES_EXPORT(int) syncok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(chtype) termattrs (void);				/* implemented */
-extern NCURSES_EXPORT(char *) termname (void);				/* implemented */
-extern NCURSES_EXPORT(void) timeout (int);				/* generated */
-extern NCURSES_EXPORT(int) touchline (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) touchwin (WINDOW *);				/* generated */
-extern NCURSES_EXPORT(int) typeahead (int);				/* implemented */
-extern NCURSES_EXPORT(int) ungetch (int);				/* implemented */
-extern NCURSES_EXPORT(int) untouchwin (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(void) use_env (bool);				/* implemented */
-extern NCURSES_EXPORT(void) use_tioctl (bool);				/* implemented */
-extern NCURSES_EXPORT(int) vidattr (chtype);				/* implemented */
-extern NCURSES_EXPORT(int) vidputs (chtype, NCURSES_OUTC);		/* implemented */
-extern NCURSES_EXPORT(int) vline (chtype, int);				/* generated */
-extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *,va_list);	/* implemented */
-extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *,va_list);	/* generated */
-extern NCURSES_EXPORT(int) vwscanw (WINDOW *, NCURSES_CONST char *,va_list);	/* implemented */
-extern NCURSES_EXPORT(int) vw_scanw (WINDOW *, NCURSES_CONST char *,va_list);	/* generated */
-extern NCURSES_EXPORT(int) waddch (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) waddchnstr (WINDOW *,const chtype *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddchstr (WINDOW *,const chtype *);		/* generated */
-extern NCURSES_EXPORT(int) waddnstr (WINDOW *,const char *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddstr (WINDOW *,const char *);		/* generated */
-extern NCURSES_EXPORT(int) wattron (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattroff (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattrset (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattr_get (WINDOW *, attr_t *, NCURSES_PAIRS_T *, void *);	/* generated */
-extern NCURSES_EXPORT(int) wattr_on (WINDOW *, attr_t, void *);		/* implemented */
-extern NCURSES_EXPORT(int) wattr_off (WINDOW *, attr_t, void *);	/* implemented */
-extern NCURSES_EXPORT(int) wattr_set (WINDOW *, attr_t, NCURSES_PAIRS_T, void *);	/* generated */
-extern NCURSES_EXPORT(int) wbkgd (WINDOW *, chtype);			/* implemented */
-extern NCURSES_EXPORT(void) wbkgdset (WINDOW *,chtype);			/* implemented */
-extern NCURSES_EXPORT(int) wborder (WINDOW *,chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* implemented */
-extern NCURSES_EXPORT(int) wchgat (WINDOW *, int, attr_t, NCURSES_PAIRS_T, const void *);/* implemented */
-extern NCURSES_EXPORT(int) wclear (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wclrtobot (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wclrtoeol (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wcolor_set (WINDOW*,NCURSES_PAIRS_T,void*);		/* implemented */
-extern NCURSES_EXPORT(void) wcursyncup (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wdelch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wdeleteln (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) wechochar (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) werase (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wgetch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wgetnstr (WINDOW *,char *,int);		/* implemented */
-extern NCURSES_EXPORT(int) wgetstr (WINDOW *, char *);			/* generated */
-extern NCURSES_EXPORT(int) whline (WINDOW *, chtype, int);		/* implemented */
-extern NCURSES_EXPORT(chtype) winch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) winchnstr (WINDOW *, chtype *, int);		/* implemented */
-extern NCURSES_EXPORT(int) winchstr (WINDOW *, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) winnstr (WINDOW *, char *, int);		/* implemented */
-extern NCURSES_EXPORT(int) winsch (WINDOW *, chtype);			/* implemented */
-extern NCURSES_EXPORT(int) winsdelln (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) winsertln (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) winsnstr (WINDOW *, const char *,int);	/* implemented */
-extern NCURSES_EXPORT(int) winsstr (WINDOW *, const char *);		/* generated */
-extern NCURSES_EXPORT(int) winstr (WINDOW *, char *);			/* generated */
-extern NCURSES_EXPORT(int) wmove (WINDOW *,int,int);			/* implemented */
-extern NCURSES_EXPORT(int) wnoutrefresh (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wprintw (WINDOW *, const char *,...)		/* implemented */
-		GCC_PRINTFLIKE(2,3);
-extern NCURSES_EXPORT(int) wredrawln (WINDOW *,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wrefresh (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wscanw (WINDOW *, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(2,3);
-extern NCURSES_EXPORT(int) wscrl (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) wsetscrreg (WINDOW *,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wstandout (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) wstandend (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(void) wsyncdown (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(void) wsyncup (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(void) wtimeout (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) wtouchln (WINDOW *,int,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wvline (WINDOW *,chtype,int);		/* implemented */
-
-/*
- * These are also declared in <term.h>:
- */
-extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(int) putp (const char *);				/* implemented */
-
-#if NCURSES_TPARM_VARARGS
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */
-#else
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG);	/* special */
-extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
-#endif
-
-extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */
-
-/*
- * These functions are not in X/Open, but we use them in macro definitions:
- */
-extern NCURSES_EXPORT(int) getattrs (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getcurx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getcury (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getbegx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getbegy (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getmaxx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getmaxy (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getparx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getpary (const WINDOW *);			/* generated */
-
-/*
- * vid_attr() was implemented originally based on a draft of X/Open curses.
- */
-#if !NCURSES_WIDECHAR
-#define vid_attr(a,pair,opts) vidattr(a)
-#endif
-
-/*
- * These functions are extensions - not in X/Open Curses.
- */
-#if 1
-#undef  NCURSES_EXT_FUNCS
-#define NCURSES_EXT_FUNCS 20160213
-typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
-typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
-extern NCURSES_EXPORT(bool) is_term_resized (int, int);
-extern NCURSES_EXPORT(char *) keybound (int, int);
-extern NCURSES_EXPORT(const char *) curses_version (void);
-extern NCURSES_EXPORT(int) assume_default_colors (int, int);
-extern NCURSES_EXPORT(int) define_key (const char *, int);
-extern NCURSES_EXPORT(int) get_escdelay (void);
-extern NCURSES_EXPORT(int) key_defined (const char *);
-extern NCURSES_EXPORT(int) keyok (int, bool);
-extern NCURSES_EXPORT(int) resize_term (int, int);
-extern NCURSES_EXPORT(int) resizeterm (int, int);
-extern NCURSES_EXPORT(int) set_escdelay (int);
-extern NCURSES_EXPORT(int) set_tabsize (int);
-extern NCURSES_EXPORT(int) use_default_colors (void);
-extern NCURSES_EXPORT(int) use_extended_names (bool);
-extern NCURSES_EXPORT(int) use_legacy_coding (int);
-extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_SCREEN_CB, void *);
-extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_WINDOW_CB, void *);
-extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
-extern NCURSES_EXPORT(void) nofilter(void);
-
-/*
- * These extensions provide access to information stored in the WINDOW even
- * when NCURSES_OPAQUE is set:
- */
-extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_pad (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_subwin (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(int) wgetdelay (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
-
-#else
-#define curses_version() NCURSES_VERSION
-#endif
-
-/*
- * Extra extension-functions, which pass a SCREEN pointer rather than using
- * a global variable SP.
- */
-#if 0
-#undef  NCURSES_SP_FUNCS
-#define NCURSES_SP_FUNCS 20160213
-#define NCURSES_SP_NAME(name) name##_sp
-
-/* Define the sp-funcs helper function */
-#define NCURSES_SP_OUTC NCURSES_SP_NAME(NCURSES_OUTC)
-typedef int (*NCURSES_SP_OUTC)(SCREEN*, int);
-
-extern NCURSES_EXPORT(SCREEN *) new_prescr (void); /* implemented:SP_FUNC */
-
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(baudrate) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(beep) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(can_change_color) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(cbreak) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(curs_set) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(color_content) (SCREEN*, NCURSES_PAIRS_T, NCURSES_COLOR_T*, NCURSES_COLOR_T*, NCURSES_COLOR_T*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_prog_mode) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_shell_mode) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(delay_output) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(doupdate) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(echo) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(endwin) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(char) NCURSES_SP_NAME(erasechar) (SCREEN*);/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(filter) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flash) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flushinp) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(getwin) (SCREEN*, FILE *);			/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(halfdelay) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_colors) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_ic) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_il) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_color) (SCREEN*, NCURSES_COLOR_T, NCURSES_COLOR_T, NCURSES_COLOR_T, NCURSES_COLOR_T); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_pair) (SCREEN*, NCURSES_PAIRS_T, NCURSES_COLOR_T, NCURSES_COLOR_T); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(intrflush) (SCREEN*, WINDOW*, bool);	/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(isendwin) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(NCURSES_CONST char *) NCURSES_SP_NAME(keyname) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(char) NCURSES_SP_NAME(killchar) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(longname) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mvcur) (SCREEN*, int, int, int, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(napms) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newpad) (SCREEN*, int, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(SCREEN *) NCURSES_SP_NAME(newterm) (SCREEN*, NCURSES_CONST char *, FILE *, FILE *); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newwin) (SCREEN*, int, int, int, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nl) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nocbreak) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noecho) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nonl) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(noqiflush) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noraw) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(pair_content) (SCREEN*, NCURSES_PAIRS_T, NCURSES_COLOR_T*, NCURSES_COLOR_T*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(qiflush) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(raw) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_prog_mode) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_shell_mode) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(resetty) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ripoffline) (SCREEN*, int, int (*)(WINDOW *, int));	/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(savetty) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_init) (SCREEN*, const char *); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_restore) (SCREEN*, const char *); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_set) (SCREEN*, const char *); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attroff) (SCREEN*, const chtype); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attron) (SCREEN*, const chtype); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attrset) (SCREEN*, const chtype); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(slk_attr) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attr_set) (SCREEN*, const attr_t, NCURSES_PAIRS_T, void*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_clear) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_color) (SCREEN*, NCURSES_PAIRS_T); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_init) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(slk_label) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_noutrefresh) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_refresh) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_restore) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_set) (SCREEN*, int, const char *, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_touch) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(start_color) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(chtype) NCURSES_SP_NAME(termattrs) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(termname) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(typeahead) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetch) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_env) (SCREEN*, bool); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_tioctl) (SCREEN*, bool); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidattr) (SCREEN*, chtype);	/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidputs) (SCREEN*, chtype, NCURSES_SP_OUTC); /* implemented:SP_FUNC */
-#if 1
-extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(assume_default_colors) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(is_term_resized) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(key_defined) (SCREEN*, const char *);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(keyok) (SCREEN*, int, bool);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(nofilter) (SCREEN*); /* implemented */	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(resize_term) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(resizeterm) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_escdelay) (SCREEN*, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_tabsize) (SCREEN*, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_default_colors) (SCREEN*);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);	/* implemented:EXT_SP_FUNC */
-#endif
-#else
-#undef  NCURSES_SP_FUNCS
-#define NCURSES_SP_FUNCS 0
-#define NCURSES_SP_NAME(name) name
-#define NCURSES_SP_OUTC NCURSES_OUTC
-#endif
-
-/* attributes */
-
-#define NCURSES_ATTR_SHIFT       8
-#define NCURSES_BITS(mask,shift) (NCURSES_CAST(chtype,(mask)) << ((shift) + NCURSES_ATTR_SHIFT))
-
-#define A_NORMAL	(1UL - 1UL)
-#define A_ATTRIBUTES	NCURSES_BITS(~(1UL - 1UL),0)
-#define A_CHARTEXT	(NCURSES_BITS(1UL,0) - 1UL)
-#define A_COLOR		NCURSES_BITS(((1UL) << 8) - 1UL,0)
-#define A_STANDOUT	NCURSES_BITS(1UL,8)
-#define A_UNDERLINE	NCURSES_BITS(1UL,9)
-#define A_REVERSE	NCURSES_BITS(1UL,10)
-#define A_BLINK		NCURSES_BITS(1UL,11)
-#define A_DIM		NCURSES_BITS(1UL,12)
-#define A_BOLD		NCURSES_BITS(1UL,13)
-#define A_ALTCHARSET	NCURSES_BITS(1UL,14)
-#define A_INVIS		NCURSES_BITS(1UL,15)
-#define A_PROTECT	NCURSES_BITS(1UL,16)
-#define A_HORIZONTAL	NCURSES_BITS(1UL,17)
-#define A_LEFT		NCURSES_BITS(1UL,18)
-#define A_LOW		NCURSES_BITS(1UL,19)
-#define A_RIGHT		NCURSES_BITS(1UL,20)
-#define A_TOP		NCURSES_BITS(1UL,21)
-#define A_VERTICAL	NCURSES_BITS(1UL,22)
-
-#if 1
-#define A_ITALIC	NCURSES_BITS(1UL,23)	/* ncurses extension */
-#endif
-
-/*
- * Most of the pseudo functions are macros that either provide compatibility
- * with older versions of curses, or provide inline functionality to improve
- * performance.
- */
-
-/*
- * These pseudo functions are always implemented as macros:
- */
-
-#define getyx(win,y,x)   	(y = getcury(win), x = getcurx(win))
-#define getbegyx(win,y,x)	(y = getbegy(win), x = getbegx(win))
-#define getmaxyx(win,y,x)	(y = getmaxy(win), x = getmaxx(win))
-#define getparyx(win,y,x)	(y = getpary(win), x = getparx(win))
-
-#define getsyx(y,x) do { if (newscr) { \
-			     if (is_leaveok(newscr)) \
-				(y) = (x) = -1; \
-			     else \
-				 getyx(newscr,(y), (x)); \
-			} \
-		    } while(0)
-
-#define setsyx(y,x) do { if (newscr) { \
-			    if ((y) == -1 && (x) == -1) \
-				leaveok(newscr, TRUE); \
-			    else { \
-				leaveok(newscr, FALSE); \
-				wmove(newscr, (y), (x)); \
-			    } \
-			} \
-		    } while(0)
-
-#ifndef NCURSES_NOMACROS
-
-/*
- * These miscellaneous pseudo functions are provided for compatibility:
- */
-
-#define wgetstr(w, s)		wgetnstr(w, s, -1)
-#define getnstr(s, n)		wgetnstr(stdscr, s, (n))
-
-#define setterm(term)		setupterm(term, 1, (int *)0)
-
-#define fixterm()		reset_prog_mode()
-#define resetterm()		reset_shell_mode()
-#define saveterm()		def_prog_mode()
-#define crmode()		cbreak()
-#define nocrmode()		nocbreak()
-#define gettmode()
-
-/* It seems older SYSV curses versions define these */
-#if !NCURSES_OPAQUE
-#define getattrs(win)		NCURSES_CAST(int, (win) ? (win)->_attrs : A_NORMAL)
-#define getcurx(win)		((win) ? (win)->_curx : ERR)
-#define getcury(win)		((win) ? (win)->_cury : ERR)
-#define getbegx(win)		((win) ? (win)->_begx : ERR)
-#define getbegy(win)		((win) ? (win)->_begy : ERR)
-#define getmaxx(win)		((win) ? ((win)->_maxx + 1) : ERR)
-#define getmaxy(win)		((win) ? ((win)->_maxy + 1) : ERR)
-#define getparx(win)		((win) ? (win)->_parx : ERR)
-#define getpary(win)		((win) ? (win)->_pary : ERR)
-#endif /* NCURSES_OPAQUE */
-
-#define wstandout(win)      	(wattrset(win,A_STANDOUT))
-#define wstandend(win)      	(wattrset(win,A_NORMAL))
-
-#define wattron(win,at)		wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
-#define wattroff(win,at)	wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
-
-#if !NCURSES_OPAQUE
-#if NCURSES_WIDECHAR && 0
-#define wattrset(win,at)	((win) \
-				  ? ((win)->_color = NCURSES_CAST(int, PAIR_NUMBER(at)), \
-                                     (win)->_attrs = NCURSES_CAST(attr_t, at), \
-                                     OK) \
-				  : ERR)
-#else
-#define wattrset(win,at)        ((win) \
-				  ? ((win)->_attrs = NCURSES_CAST(attr_t, at), \
-				     OK) \
-				  : ERR)
-#endif
-#endif /* NCURSES_OPAQUE */
-
-#define scroll(win)		wscrl(win,1)
-
-#define touchwin(win)		wtouchln((win), 0, getmaxy(win), 1)
-#define touchline(win, s, c)	wtouchln((win), s, c, 1)
-#define untouchwin(win)		wtouchln((win), 0, getmaxy(win), 0)
-
-#define box(win, v, h)		wborder(win, v, v, h, h, 0, 0, 0, 0)
-#define border(ls, rs, ts, bs, tl, tr, bl, br)	wborder(stdscr, ls, rs, ts, bs, tl, tr, bl, br)
-#define hline(ch, n)		whline(stdscr, ch, (n))
-#define vline(ch, n)		wvline(stdscr, ch, (n))
-
-#define winstr(w, s)		winnstr(w, s, -1)
-#define winchstr(w, s)		winchnstr(w, s, -1)
-#define winsstr(w, s)		winsnstr(w, s, -1)
-
-#if !NCURSES_OPAQUE
-#define redrawwin(win)		wredrawln(win, 0, ((win) ? (win)->_maxy+1 : -1))
-#endif /* NCURSES_OPAQUE */
-
-#define waddstr(win,str)	waddnstr(win,str,-1)
-#define waddchstr(win,str)	waddchnstr(win,str,-1)
-
-/*
- * These apply to the first 256 color pairs.
- */
-#define COLOR_PAIR(n)	NCURSES_BITS((n), 0)
-#define PAIR_NUMBER(a)	(NCURSES_CAST(int,((NCURSES_CAST(unsigned long,(a)) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
-
-/*
- * pseudo functions for standard screen
- */
-
-#define addch(ch)		waddch(stdscr,(ch))
-#define addchnstr(str,n)	waddchnstr(stdscr,(str),(n))
-#define addchstr(str)		waddchstr(stdscr,(str))
-#define addnstr(str,n)		waddnstr(stdscr,(str),(n))
-#define addstr(str)		waddnstr(stdscr,(str),-1)
-#define attr_get(ap,cp,o)	wattr_get(stdscr,(ap),(cp),(o))
-#define attr_off(a,o)		wattr_off(stdscr,(a),(o))
-#define attr_on(a,o)		wattr_on(stdscr,(a),(o))
-#define attr_set(a,c,o)		wattr_set(stdscr,(a),(c),(o))
-#define attroff(at)		wattroff(stdscr,(at))
-#define attron(at)		wattron(stdscr,(at))
-#define attrset(at)		wattrset(stdscr,(at))
-#define bkgd(ch)		wbkgd(stdscr,(ch))
-#define bkgdset(ch)		wbkgdset(stdscr,(ch))
-#define chgat(n,a,c,o)		wchgat(stdscr,(n),(a),(c),(o))
-#define clear()			wclear(stdscr)
-#define clrtobot()		wclrtobot(stdscr)
-#define clrtoeol()		wclrtoeol(stdscr)
-#define color_set(c,o)		wcolor_set(stdscr,(c),(o))
-#define delch()			wdelch(stdscr)
-#define deleteln()		winsdelln(stdscr,-1)
-#define echochar(c)		wechochar(stdscr,(c))
-#define erase()			werase(stdscr)
-#define getch()			wgetch(stdscr)
-#define getstr(str)		wgetstr(stdscr,(str))
-#define inch()			winch(stdscr)
-#define inchnstr(s,n)		winchnstr(stdscr,(s),(n))
-#define inchstr(s)		winchstr(stdscr,(s))
-#define innstr(s,n)		winnstr(stdscr,(s),(n))
-#define insch(c)		winsch(stdscr,(c))
-#define insdelln(n)		winsdelln(stdscr,(n))
-#define insertln()		winsdelln(stdscr,1)
-#define insnstr(s,n)		winsnstr(stdscr,(s),(n))
-#define insstr(s)		winsstr(stdscr,(s))
-#define instr(s)		winstr(stdscr,(s))
-#define move(y,x)		wmove(stdscr,(y),(x))
-#define refresh()		wrefresh(stdscr)
-#define scrl(n)			wscrl(stdscr,(n))
-#define setscrreg(t,b)		wsetscrreg(stdscr,(t),(b))
-#define standend()		wstandend(stdscr)
-#define standout()		wstandout(stdscr)
-#define timeout(delay)		wtimeout(stdscr,(delay))
-#define wdeleteln(win)		winsdelln(win,-1)
-#define winsertln(win)		winsdelln(win,1)
-
-/*
- * mv functions
- */
-
-#define mvwaddch(win,y,x,ch)		(wmove((win),(y),(x)) == ERR ? ERR : waddch((win),(ch)))
-#define mvwaddchnstr(win,y,x,str,n)	(wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),(n)))
-#define mvwaddchstr(win,y,x,str)	(wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),-1))
-#define mvwaddnstr(win,y,x,str,n)	(wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),(n)))
-#define mvwaddstr(win,y,x,str)		(wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),-1))
-#define mvwchgat(win,y,x,n,a,c,o)	(wmove((win),(y),(x)) == ERR ? ERR : wchgat((win),(n),(a),(c),(o)))
-#define mvwdelch(win,y,x)		(wmove((win),(y),(x)) == ERR ? ERR : wdelch(win))
-#define mvwgetch(win,y,x)		(wmove((win),(y),(x)) == ERR ? ERR : wgetch(win))
-#define mvwgetnstr(win,y,x,str,n)	(wmove((win),(y),(x)) == ERR ? ERR : wgetnstr((win),(str),(n)))
-#define mvwgetstr(win,y,x,str)		(wmove((win),(y),(x)) == ERR ? ERR : wgetstr((win),(str)))
-#define mvwhline(win,y,x,c,n)		(wmove((win),(y),(x)) == ERR ? ERR : whline((win),(c),(n)))
-#define mvwinch(win,y,x)		(wmove((win),(y),(x)) == ERR ? NCURSES_CAST(chtype, ERR) : winch(win))
-#define mvwinchnstr(win,y,x,s,n)	(wmove((win),(y),(x)) == ERR ? ERR : winchnstr((win),(s),(n)))
-#define mvwinchstr(win,y,x,s)		(wmove((win),(y),(x)) == ERR ? ERR : winchstr((win),(s)))
-#define mvwinnstr(win,y,x,s,n)		(wmove((win),(y),(x)) == ERR ? ERR : winnstr((win),(s),(n)))
-#define mvwinsch(win,y,x,c)		(wmove((win),(y),(x)) == ERR ? ERR : winsch((win),(c)))
-#define mvwinsnstr(win,y,x,s,n)		(wmove((win),(y),(x)) == ERR ? ERR : winsnstr((win),(s),(n)))
-#define mvwinsstr(win,y,x,s)		(wmove((win),(y),(x)) == ERR ? ERR : winsstr((win),(s)))
-#define mvwinstr(win,y,x,s)		(wmove((win),(y),(x)) == ERR ? ERR : winstr((win),(s)))
-#define mvwvline(win,y,x,c,n)		(wmove((win),(y),(x)) == ERR ? ERR : wvline((win),(c),(n)))
-
-#define mvaddch(y,x,ch)			mvwaddch(stdscr,(y),(x),(ch))
-#define mvaddchnstr(y,x,str,n)		mvwaddchnstr(stdscr,(y),(x),(str),(n))
-#define mvaddchstr(y,x,str)		mvwaddchstr(stdscr,(y),(x),(str))
-#define mvaddnstr(y,x,str,n)		mvwaddnstr(stdscr,(y),(x),(str),(n))
-#define mvaddstr(y,x,str)		mvwaddstr(stdscr,(y),(x),(str))
-#define mvchgat(y,x,n,a,c,o)		mvwchgat(stdscr,(y),(x),(n),(a),(c),(o))
-#define mvdelch(y,x)			mvwdelch(stdscr,(y),(x))
-#define mvgetch(y,x)			mvwgetch(stdscr,(y),(x))
-#define mvgetnstr(y,x,str,n)		mvwgetnstr(stdscr,(y),(x),(str),(n))
-#define mvgetstr(y,x,str)		mvwgetstr(stdscr,(y),(x),(str))
-#define mvhline(y,x,c,n)		mvwhline(stdscr,(y),(x),(c),(n))
-#define mvinch(y,x)			mvwinch(stdscr,(y),(x))
-#define mvinchnstr(y,x,s,n)		mvwinchnstr(stdscr,(y),(x),(s),(n))
-#define mvinchstr(y,x,s)		mvwinchstr(stdscr,(y),(x),(s))
-#define mvinnstr(y,x,s,n)		mvwinnstr(stdscr,(y),(x),(s),(n))
-#define mvinsch(y,x,c)			mvwinsch(stdscr,(y),(x),(c))
-#define mvinsnstr(y,x,s,n)		mvwinsnstr(stdscr,(y),(x),(s),(n))
-#define mvinsstr(y,x,s)			mvwinsstr(stdscr,(y),(x),(s))
-#define mvinstr(y,x,s)			mvwinstr(stdscr,(y),(x),(s))
-#define mvvline(y,x,c,n)		mvwvline(stdscr,(y),(x),(c),(n))
-
-/*
- * Some wide-character functions can be implemented without the extensions.
- */
-#if !NCURSES_OPAQUE
-#define getbkgd(win)                    ((win) ? ((win)->_bkgd) : 0)
-#endif /* NCURSES_OPAQUE */
-
-#define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
-#define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
-
-#if !NCURSES_OPAQUE
-#if NCURSES_WIDECHAR && 0
-#define wattr_set(win,a,p,opts)		(((win) \
-					  ? ((win)->_attrs = ((a) & ~A_COLOR), \
-					     (win)->_color = (p)) \
-					  : OK), \
-					 OK)
-#define wattr_get(win,a,p,opts)		((void)(((a) != (void *)0) ? (*(a) = (win) ? (win)->_attrs : 0) : OK), \
-					 (void)(((p) != (void *)0) ? (*(p) = (NCURSES_PAIRS_T) ((win) ? (win)->_color : 0)) : OK), \
-					 OK)
-#else
-#define wattr_set(win,a,p,opts)		(((win) \
-					  ? ((win)->_attrs = (((a) & ~A_COLOR) | (attr_t)COLOR_PAIR(p))) \
-					  : OK), \
-					 OK)
-#define wattr_get(win,a,p,opts)		((void)(((a) != (void *)0) ? (*(a) = (win) ? (win)->_attrs : 0) : OK), \
-					 (void)(((p) != (void *)0) ? (*(p) = (NCURSES_PAIRS_T) ((win) ? PAIR_NUMBER((win)->_attrs) : 0)) : OK), \
-					 OK)
-#endif
-#endif /* NCURSES_OPAQUE */
-
-/*
- * X/Open curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
- * varargs.h.  It adds new calls vw_printw/vw_scanw, which are supposed to
- * use POSIX stdarg.h.  The ncurses versions of vwprintw/vwscanw already
- * use stdarg.h, so...
- */
-#define vw_printw		vwprintw
-#define vw_scanw		vwscanw
-
-/*
- * Export fallback function for use in C++ binding.
- */
-#if !1
-#define vsscanf(a,b,c) _nc_vsscanf(a,b,c)
-NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
-#endif
-
-/*
- * These macros are extensions - not in X/Open Curses.
- */
-#if 1
-#if !NCURSES_OPAQUE
-#define is_cleared(win)		((win) ? (win)->_clear : FALSE)
-#define is_idcok(win)		((win) ? (win)->_idcok : FALSE)
-#define is_idlok(win)		((win) ? (win)->_idlok : FALSE)
-#define is_immedok(win)		((win) ? (win)->_immed : FALSE)
-#define is_keypad(win)		((win) ? (win)->_use_keypad : FALSE)
-#define is_leaveok(win)		((win) ? (win)->_leaveok : FALSE)
-#define is_nodelay(win)		((win) ? ((win)->_delay == 0) : FALSE)
-#define is_notimeout(win)	((win) ? (win)->_notimeout : FALSE)
-#define is_pad(win)		((win) ? ((win)->_flags & _ISPAD) != 0 : FALSE)
-#define is_scrollok(win)	((win) ? (win)->_scroll : FALSE)
-#define is_subwin(win)		((win) ? ((win)->_flags & _SUBWIN) != 0 : FALSE)
-#define is_syncok(win)		((win) ? (win)->_sync : FALSE)
-#define wgetdelay(win)		((win) ? (win)->_delay : 0)
-#define wgetparent(win)		((win) ? (win)->_parent : 0)
-#define wgetscrreg(win,t,b)	((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
-#endif
-#endif
-
-#endif /* NCURSES_NOMACROS */
-
-/*
- * Public variables.
- *
- * Notes:
- *	a. ESCDELAY was an undocumented feature under AIX curses.
- *	   It gives the ESC expire time in milliseconds.
- *	b. ttytype is needed for backward compatibility
- */
-#if NCURSES_REENTRANT
-
-NCURSES_WRAPPED_VAR(WINDOW *, curscr);
-NCURSES_WRAPPED_VAR(WINDOW *, newscr);
-NCURSES_WRAPPED_VAR(WINDOW *, stdscr);
-NCURSES_WRAPPED_VAR(char *, ttytype);
-NCURSES_WRAPPED_VAR(int, COLORS);
-NCURSES_WRAPPED_VAR(int, COLOR_PAIRS);
-NCURSES_WRAPPED_VAR(int, COLS);
-NCURSES_WRAPPED_VAR(int, ESCDELAY);
-NCURSES_WRAPPED_VAR(int, LINES);
-NCURSES_WRAPPED_VAR(int, TABSIZE);
-
-#define curscr      NCURSES_PUBLIC_VAR(curscr())
-#define newscr      NCURSES_PUBLIC_VAR(newscr())
-#define stdscr      NCURSES_PUBLIC_VAR(stdscr())
-#define ttytype     NCURSES_PUBLIC_VAR(ttytype())
-#define COLORS      NCURSES_PUBLIC_VAR(COLORS())
-#define COLOR_PAIRS NCURSES_PUBLIC_VAR(COLOR_PAIRS())
-#define COLS        NCURSES_PUBLIC_VAR(COLS())
-#define ESCDELAY    NCURSES_PUBLIC_VAR(ESCDELAY())
-#define LINES       NCURSES_PUBLIC_VAR(LINES())
-#define TABSIZE     NCURSES_PUBLIC_VAR(TABSIZE())
-
-#else
-
-extern NCURSES_EXPORT_VAR(WINDOW *) curscr;
-extern NCURSES_EXPORT_VAR(WINDOW *) newscr;
-extern NCURSES_EXPORT_VAR(WINDOW *) stdscr;
-extern NCURSES_EXPORT_VAR(char) ttytype[];
-extern NCURSES_EXPORT_VAR(int) COLORS;
-extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
-extern NCURSES_EXPORT_VAR(int) COLS;
-extern NCURSES_EXPORT_VAR(int) ESCDELAY;
-extern NCURSES_EXPORT_VAR(int) LINES;
-extern NCURSES_EXPORT_VAR(int) TABSIZE;
-
-#endif
-
-/*
- * Pseudo-character tokens outside ASCII range.  The curses wgetch() function
- * will return any given one of these only if the corresponding k- capability
- * is defined in your terminal's terminfo entry.
- *
- * Some keys (KEY_A1, etc) are arranged like this:
- *	a1     up    a3
- *	left   b2    right
- *	c1     down  c3
- *
- * A few key codes do not depend upon the terminfo entry.
- */
-#define KEY_CODE_YES	0400		/* A wchar_t contains a key code */
-#define KEY_MIN		0401		/* Minimum curses key */
-#define KEY_BREAK	0401		/* Break key (unreliable) */
-#define KEY_SRESET	0530		/* Soft (partial) reset (unreliable) */
-#define KEY_RESET	0531		/* Reset or hard reset (unreliable) */
-/*
- * These definitions were generated by ./MKkey_defs.sh ./Caps
- */
-#define KEY_DOWN	0402		/* down-arrow key */
-#define KEY_UP		0403		/* up-arrow key */
-#define KEY_LEFT	0404		/* left-arrow key */
-#define KEY_RIGHT	0405		/* right-arrow key */
-#define KEY_HOME	0406		/* home key */
-#define KEY_BACKSPACE	0407		/* backspace key */
-#define KEY_F0		0410		/* Function keys.  Space for 64 */
-#define KEY_F(n)	(KEY_F0+(n))	/* Value of function key n */
-#define KEY_DL		0510		/* delete-line key */
-#define KEY_IL		0511		/* insert-line key */
-#define KEY_DC		0512		/* delete-character key */
-#define KEY_IC		0513		/* insert-character key */
-#define KEY_EIC		0514		/* sent by rmir or smir in insert mode */
-#define KEY_CLEAR	0515		/* clear-screen or erase key */
-#define KEY_EOS		0516		/* clear-to-end-of-screen key */
-#define KEY_EOL		0517		/* clear-to-end-of-line key */
-#define KEY_SF		0520		/* scroll-forward key */
-#define KEY_SR		0521		/* scroll-backward key */
-#define KEY_NPAGE	0522		/* next-page key */
-#define KEY_PPAGE	0523		/* previous-page key */
-#define KEY_STAB	0524		/* set-tab key */
-#define KEY_CTAB	0525		/* clear-tab key */
-#define KEY_CATAB	0526		/* clear-all-tabs key */
-#define KEY_ENTER	0527		/* enter/send key */
-#define KEY_PRINT	0532		/* print key */
-#define KEY_LL		0533		/* lower-left key (home down) */
-#define KEY_A1		0534		/* upper left of keypad */
-#define KEY_A3		0535		/* upper right of keypad */
-#define KEY_B2		0536		/* center of keypad */
-#define KEY_C1		0537		/* lower left of keypad */
-#define KEY_C3		0540		/* lower right of keypad */
-#define KEY_BTAB	0541		/* back-tab key */
-#define KEY_BEG		0542		/* begin key */
-#define KEY_CANCEL	0543		/* cancel key */
-#define KEY_CLOSE	0544		/* close key */
-#define KEY_COMMAND	0545		/* command key */
-#define KEY_COPY	0546		/* copy key */
-#define KEY_CREATE	0547		/* create key */
-#define KEY_END		0550		/* end key */
-#define KEY_EXIT	0551		/* exit key */
-#define KEY_FIND	0552		/* find key */
-#define KEY_HELP	0553		/* help key */
-#define KEY_MARK	0554		/* mark key */
-#define KEY_MESSAGE	0555		/* message key */
-#define KEY_MOVE	0556		/* move key */
-#define KEY_NEXT	0557		/* next key */
-#define KEY_OPEN	0560		/* open key */
-#define KEY_OPTIONS	0561		/* options key */
-#define KEY_PREVIOUS	0562		/* previous key */
-#define KEY_REDO	0563		/* redo key */
-#define KEY_REFERENCE	0564		/* reference key */
-#define KEY_REFRESH	0565		/* refresh key */
-#define KEY_REPLACE	0566		/* replace key */
-#define KEY_RESTART	0567		/* restart key */
-#define KEY_RESUME	0570		/* resume key */
-#define KEY_SAVE	0571		/* save key */
-#define KEY_SBEG	0572		/* shifted begin key */
-#define KEY_SCANCEL	0573		/* shifted cancel key */
-#define KEY_SCOMMAND	0574		/* shifted command key */
-#define KEY_SCOPY	0575		/* shifted copy key */
-#define KEY_SCREATE	0576		/* shifted create key */
-#define KEY_SDC		0577		/* shifted delete-character key */
-#define KEY_SDL		0600		/* shifted delete-line key */
-#define KEY_SELECT	0601		/* select key */
-#define KEY_SEND	0602		/* shifted end key */
-#define KEY_SEOL	0603		/* shifted clear-to-end-of-line key */
-#define KEY_SEXIT	0604		/* shifted exit key */
-#define KEY_SFIND	0605		/* shifted find key */
-#define KEY_SHELP	0606		/* shifted help key */
-#define KEY_SHOME	0607		/* shifted home key */
-#define KEY_SIC		0610		/* shifted insert-character key */
-#define KEY_SLEFT	0611		/* shifted left-arrow key */
-#define KEY_SMESSAGE	0612		/* shifted message key */
-#define KEY_SMOVE	0613		/* shifted move key */
-#define KEY_SNEXT	0614		/* shifted next key */
-#define KEY_SOPTIONS	0615		/* shifted options key */
-#define KEY_SPREVIOUS	0616		/* shifted previous key */
-#define KEY_SPRINT	0617		/* shifted print key */
-#define KEY_SREDO	0620		/* shifted redo key */
-#define KEY_SREPLACE	0621		/* shifted replace key */
-#define KEY_SRIGHT	0622		/* shifted right-arrow key */
-#define KEY_SRSUME	0623		/* shifted resume key */
-#define KEY_SSAVE	0624		/* shifted save key */
-#define KEY_SSUSPEND	0625		/* shifted suspend key */
-#define KEY_SUNDO	0626		/* shifted undo key */
-#define KEY_SUSPEND	0627		/* suspend key */
-#define KEY_UNDO	0630		/* undo key */
-#define KEY_MOUSE	0631		/* Mouse event has occurred */
-#define KEY_RESIZE	0632		/* Terminal resize event */
-#define KEY_EVENT	0633		/* We were interrupted by an event */
-
-#define KEY_MAX		0777		/* Maximum key value is 0633 */
-/* $Id: curses.tail,v 1.23 2016/02/13 16:37:45 tom Exp $ */
-/*
- * vile:cmode:
- * This file is part of ncurses, designed to be appended after curses.h.in
- * (see that file for the relevant copyright).
- */
-
-/* mouse interface */
-
-#if NCURSES_MOUSE_VERSION > 1
-#define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 5))
-#else
-#define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 6))
-#endif
-
-#define	NCURSES_BUTTON_RELEASED	001L
-#define	NCURSES_BUTTON_PRESSED	002L
-#define	NCURSES_BUTTON_CLICKED	004L
-#define	NCURSES_DOUBLE_CLICKED	010L
-#define	NCURSES_TRIPLE_CLICKED	020L
-#define	NCURSES_RESERVED_EVENT	040L
-
-/* event masks */
-#define	BUTTON1_RELEASED	NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_RELEASED)
-#define	BUTTON1_PRESSED		NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_PRESSED)
-#define	BUTTON1_CLICKED		NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_CLICKED)
-#define	BUTTON1_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(1, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON1_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(1, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON2_RELEASED	NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_RELEASED)
-#define	BUTTON2_PRESSED		NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_PRESSED)
-#define	BUTTON2_CLICKED		NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_CLICKED)
-#define	BUTTON2_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(2, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON2_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(2, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON3_RELEASED	NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_RELEASED)
-#define	BUTTON3_PRESSED		NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_PRESSED)
-#define	BUTTON3_CLICKED		NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_CLICKED)
-#define	BUTTON3_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(3, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON3_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(3, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON4_RELEASED	NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_RELEASED)
-#define	BUTTON4_PRESSED		NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_PRESSED)
-#define	BUTTON4_CLICKED		NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_CLICKED)
-#define	BUTTON4_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(4, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON4_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(4, NCURSES_TRIPLE_CLICKED)
-
-/*
- * In 32 bits the version-1 scheme does not provide enough space for a 5th
- * button, unless we choose to change the ABI by omitting the reserved-events.
- */
-#if NCURSES_MOUSE_VERSION > 1
-
-#define	BUTTON5_RELEASED	NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_RELEASED)
-#define	BUTTON5_PRESSED		NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_PRESSED)
-#define	BUTTON5_CLICKED		NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_CLICKED)
-#define	BUTTON5_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(5, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON5_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(5, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON_CTRL		NCURSES_MOUSE_MASK(6, 0001L)
-#define	BUTTON_SHIFT		NCURSES_MOUSE_MASK(6, 0002L)
-#define	BUTTON_ALT		NCURSES_MOUSE_MASK(6, 0004L)
-#define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(6, 0010L)
-
-#else
-
-#define	BUTTON1_RESERVED_EVENT	NCURSES_MOUSE_MASK(1, NCURSES_RESERVED_EVENT)
-#define	BUTTON2_RESERVED_EVENT	NCURSES_MOUSE_MASK(2, NCURSES_RESERVED_EVENT)
-#define	BUTTON3_RESERVED_EVENT	NCURSES_MOUSE_MASK(3, NCURSES_RESERVED_EVENT)
-#define	BUTTON4_RESERVED_EVENT	NCURSES_MOUSE_MASK(4, NCURSES_RESERVED_EVENT)
-
-#define	BUTTON_CTRL		NCURSES_MOUSE_MASK(5, 0001L)
-#define	BUTTON_SHIFT		NCURSES_MOUSE_MASK(5, 0002L)
-#define	BUTTON_ALT		NCURSES_MOUSE_MASK(5, 0004L)
-#define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(5, 0010L)
-
-#endif
-
-#define	ALL_MOUSE_EVENTS	(REPORT_MOUSE_POSITION - 1)
-
-/* macros to extract single event-bits from masks */
-#define	BUTTON_RELEASE(e, x)		((e) & NCURSES_MOUSE_MASK(x, 001))
-#define	BUTTON_PRESS(e, x)		((e) & NCURSES_MOUSE_MASK(x, 002))
-#define	BUTTON_CLICK(e, x)		((e) & NCURSES_MOUSE_MASK(x, 004))
-#define	BUTTON_DOUBLE_CLICK(e, x)	((e) & NCURSES_MOUSE_MASK(x, 010))
-#define	BUTTON_TRIPLE_CLICK(e, x)	((e) & NCURSES_MOUSE_MASK(x, 020))
-#define	BUTTON_RESERVED_EVENT(e, x)	((e) & NCURSES_MOUSE_MASK(x, 040))
-
-typedef struct
-{
-    short id;		/* ID to distinguish multiple devices */
-    int x, y, z;	/* event coordinates (character-cell) */
-    mmask_t bstate;	/* button state bits */
-}
-MEVENT;
-
-extern NCURSES_EXPORT(bool)    has_mouse(void);
-extern NCURSES_EXPORT(int)     getmouse (MEVENT *);
-extern NCURSES_EXPORT(int)     ungetmouse (MEVENT *);
-extern NCURSES_EXPORT(mmask_t) mousemask (mmask_t, mmask_t *);
-extern NCURSES_EXPORT(bool)    wenclose (const WINDOW *, int, int);
-extern NCURSES_EXPORT(int)     mouseinterval (int);
-extern NCURSES_EXPORT(bool)    wmouse_trafo (const WINDOW*, int*, int*, bool);
-extern NCURSES_EXPORT(bool)    mouse_trafo (int*, int*, bool);              /* generated */
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(bool)    NCURSES_SP_NAME(has_mouse) (SCREEN*);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(getmouse) (SCREEN*, MEVENT *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(ungetmouse) (SCREEN*,MEVENT *);
-extern NCURSES_EXPORT(mmask_t) NCURSES_SP_NAME(mousemask) (SCREEN*, mmask_t, mmask_t *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(mouseinterval) (SCREEN*, int);
-#endif
-
-#ifndef NCURSES_NOMACROS
-#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
-#endif
-
-/* other non-XSI functions */
-
-extern NCURSES_EXPORT(int) mcprint (char *, int);	/* direct data to printer */
-extern NCURSES_EXPORT(int) has_key (int);		/* do we have given key? */
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(has_key) (SCREEN*, int);    /* do we have given key? */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mcprint) (SCREEN*, char *, int);	/* direct data to printer */
-#endif
-
-/* Debugging : use with libncurses_g.a */
-
-extern NCURSES_EXPORT(void) _tracef (const char *, ...) GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(char *) _traceattr (attr_t);
-extern NCURSES_EXPORT(char *) _traceattr2 (int, chtype);
-extern NCURSES_EXPORT(char *) _tracechar (int);
-extern NCURSES_EXPORT(char *) _tracechtype (chtype);
-extern NCURSES_EXPORT(char *) _tracechtype2 (int, chtype);
-#if NCURSES_WIDECHAR
-#define _tracech_t		_tracecchar_t
-extern NCURSES_EXPORT(char *) _tracecchar_t (const cchar_t *);
-#define _tracech_t2		_tracecchar_t2
-extern NCURSES_EXPORT(char *) _tracecchar_t2 (int, const cchar_t *);
-#else
-#define _tracech_t		_tracechtype
-#define _tracech_t2		_tracechtype2
-#endif
-extern NCURSES_EXPORT(void) trace (const unsigned int);
-
-/* trace masks */
-#define TRACE_DISABLE	0x0000	/* turn off tracing */
-#define TRACE_TIMES	0x0001	/* trace user and system times of updates */
-#define TRACE_TPUTS	0x0002	/* trace tputs calls */
-#define TRACE_UPDATE	0x0004	/* trace update actions, old & new screens */
-#define TRACE_MOVE	0x0008	/* trace cursor moves and scrolls */
-#define TRACE_CHARPUT	0x0010	/* trace all character outputs */
-#define TRACE_ORDINARY	0x001F	/* trace all update actions */
-#define TRACE_CALLS	0x0020	/* trace all curses calls */
-#define TRACE_VIRTPUT	0x0040	/* trace virtual character puts */
-#define TRACE_IEVENT	0x0080	/* trace low-level input processing */
-#define TRACE_BITS	0x0100	/* trace state of TTY control bits */
-#define TRACE_ICALLS	0x0200	/* trace internal/nested calls */
-#define TRACE_CCALLS	0x0400	/* trace per-character calls */
-#define TRACE_DATABASE	0x0800	/* trace read/write of terminfo/termcap data */
-#define TRACE_ATTRS	0x1000	/* trace attribute updates */
-
-#define TRACE_SHIFT	13	/* number of bits in the trace masks */
-#define TRACE_MAXIMUM	((1 << TRACE_SHIFT) - 1) /* maximum trace level */
-
-#if defined(TRACE) || defined(NCURSES_TEST)
-extern NCURSES_EXPORT_VAR(int) _nc_optimize_enable;		/* enable optimizations */
-extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
-#define OPTIMIZE_MVCUR		0x01	/* cursor movement optimization */
-#define OPTIMIZE_HASHMAP	0x02	/* diff hashing to detect scrolls */
-#define OPTIMIZE_SCROLL		0x04	/* scroll optimization */
-#define OPTIMIZE_ALL		0xff	/* enable all optimizations (dflt) */
-#endif
-
-#include <unctrl.h>
-
-#ifdef __cplusplus
-
-#ifndef NCURSES_NOMACROS
-
-/* these names conflict with STL */
-#undef box
-#undef clear
-#undef erase
-#undef move
-#undef refresh
-
-#endif /* NCURSES_NOMACROS */
-
-}
-#endif
-
-#endif /* __NCURSES_H */
diff --git a/openflow/usr/include/cursesapp.h b/openflow/usr/include/cursesapp.h
deleted file mode 100644
index e3cbc04..0000000
--- a/openflow/usr/include/cursesapp.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-// $Id: cursesapp.h,v 1.12 2011/09/17 22:12:10 tom Exp $
-
-#ifndef NCURSES_CURSESAPP_H_incl
-#define NCURSES_CURSESAPP_H_incl
-
-#include <cursslk.h>
-
-class NCURSES_IMPEXP NCursesApplication {
-public:
-  typedef struct _slk_link {          // This structure is used to maintain
-    struct _slk_link* prev;           // a stack of SLKs
-    Soft_Label_Key_Set* SLKs;
-  } SLK_Link;
-private:
-  static int rinit(NCursesWindow& w); // Internal Init function for title
-  static NCursesApplication* theApp;  // Global ref. to the application
-
-  static SLK_Link* slk_stack;
-
-protected:
-  static NCursesWindow* titleWindow;  // The Title Window (if any)
-
-  bool b_Colors;                      // Is this a color application?
-  NCursesWindow* Root_Window;         // This is the stdscr equiv.
-
-  // Initialization of attributes;
-  // Rewrite this in your derived class if you prefer other settings
-  virtual void init(bool bColors);
-
-  // The number of lines for the title window. Default is no title window
-  // You may rewrite this in your derived class
-  virtual int titlesize() const {
-    return 0;
-  }
-
-  // This method is called to put something into the title window initially
-  // You may rewrite this in your derived class
-  virtual void title() {
-  }
-
-  // The layout used for the Soft Label Keys. Default is to have no SLKs.
-  // You may rewrite this in your derived class
-  virtual Soft_Label_Key_Set::Label_Layout useSLKs() const {
-    return Soft_Label_Key_Set::None;
-  }
-
-  // This method is called to initialize the SLKs. Default is nothing.
-  // You may rewrite this in your derived class
-  virtual void init_labels(Soft_Label_Key_Set& S) const {
-    (void) S;
-  }
-
-  // Your derived class must implement this method. The return value must
-  // be the exit value of your application.
-  virtual int run() = 0;
-
-  // The constructor is protected, so you may use it in your derived
-  // class constructor. The argument tells whether or not you want colors.
-  NCursesApplication(bool wantColors = FALSE);
-
-  NCursesApplication& operator=(const NCursesApplication& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-    }
-    return *this;
-  }
-
-  NCursesApplication(const NCursesApplication& rhs)
-    : b_Colors(rhs.b_Colors),
-      Root_Window(rhs.Root_Window)
-  {
-  }
-
-public:
-  virtual ~NCursesApplication();
-
-  // Get a pointer to the current application object
-  static NCursesApplication* getApplication() {
-    return theApp;
-  }
-
-  // This method runs the application and returns its exit value
-  int operator()(void);
-
-  // Process the commandline arguments. The default implementation simply
-  // ignores them. Your derived class may rewrite this.
-  virtual void handleArgs(int argc, char* argv[]) {
-    (void) argc;
-    (void) argv;
-  }
-
-  // Does this application use colors?
-  inline bool useColors() const {
-    return b_Colors;
-  }
-
-  // Push the Key Set S onto the SLK Stack. S then becomes the current set
-  // of Soft Labelled Keys.
-  void push(Soft_Label_Key_Set& S);
-
-  // Throw away the current set of SLKs and make the previous one the
-  // new current set.
-  bool pop();
-
-  // Retrieve the current set of Soft Labelled Keys.
-  Soft_Label_Key_Set* top() const;
-
-  // Attributes to use for menu and forms foregrounds
-  virtual chtype foregrounds() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(1)) : A_BOLD;
-  }
-
-  // Attributes to use for menu and forms backgrounds
-  virtual chtype backgrounds() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(2)) : A_NORMAL;
-  }
-
-  // Attributes to use for inactive (menu) elements
-  virtual chtype inactives() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(3)|A_DIM) : A_DIM;
-  }
-
-  // Attributes to use for (form) labels and SLKs
-  virtual chtype labels() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(4)) : A_NORMAL;
-  }
-
-  // Attributes to use for form backgrounds
-  virtual chtype dialog_backgrounds() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(4)) : A_NORMAL;
-  }
-
-  // Attributes to use as default for (form) window backgrounds
-  virtual chtype window_backgrounds() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(5)) : A_NORMAL;
-  }
-
-  // Attributes to use for the title window
-  virtual chtype screen_titles() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(6)) : A_BOLD;
-  }
-
-};
- 
-#endif /* NCURSES_CURSESAPP_H_incl */
diff --git a/openflow/usr/include/cursesf.h b/openflow/usr/include/cursesf.h
deleted file mode 100644
index fe1f1aa..0000000
--- a/openflow/usr/include/cursesf.h
+++ /dev/null
@@ -1,969 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-// $Id: cursesf.h,v 1.32 2014/08/09 22:06:11 Adam.Jiang Exp $
-
-#ifndef NCURSES_CURSESF_H_incl
-#define NCURSES_CURSESF_H_incl 1
-
-#include <cursesp.h>
-
-#ifndef __EXT_QNX
-#include <string.h>
-#endif
-
-extern "C" {
-#  include <form.h>
-}
-//
-// -------------------------------------------------------------------------
-// The abstract base class for buitin and user defined Fieldtypes.
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP NCursesFormField; // forward declaration
-
-// Class to represent builtin field types as well as C++ written new
-// fieldtypes (see classes UserDefineFieldType...
-class NCURSES_IMPEXP NCursesFieldType
-{
-  friend class NCursesFormField;
-
-protected:
-  FIELDTYPE* fieldtype;
-
-  inline void OnError(int err) const THROW2(NCursesException const, NCursesFormException) {
-    if (err!=E_OK)
-      THROW(new NCursesFormException (err));
-  }
-
-  NCursesFieldType(FIELDTYPE *f) : fieldtype(f) {
-  }
-
-  virtual ~NCursesFieldType() {}
-
-  // Set the fields f fieldtype to this one.
-  virtual void set(NCursesFormField& f) = 0;
-
-public:
-  NCursesFieldType()
-    : fieldtype(STATIC_CAST(FIELDTYPE*)(0))
-  {
-  }
-
-  NCursesFieldType& operator=(const NCursesFieldType& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-    }
-    return *this;
-  }
-
-  NCursesFieldType(const NCursesFieldType& rhs)
-    : fieldtype(rhs.fieldtype)
-  {
-  }
-
-};
-
-//
-// -------------------------------------------------------------------------
-// The class representing a forms field, wrapping the lowlevel FIELD struct
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP NCursesFormField
-{
-  friend class NCursesForm;
-
-protected:
-  FIELD *field;		     // lowlevel structure
-  NCursesFieldType* ftype;   // Associated field type
-
-  // Error handler
-  inline void OnError (int err) const THROW2(NCursesException const, NCursesFormException) {
-    if (err != E_OK)
-      THROW(new NCursesFormException (err));
-  }
-
-public:
-  // Create a 'Null' field. Can be used to delimit a field list
-  NCursesFormField()
-    : field(STATIC_CAST(FIELD*)(0)),
-      ftype(STATIC_CAST(NCursesFieldType*)(0))
-  {
-  }
-
-  // Create a new field
-  NCursesFormField (int rows,
-		    int ncols,
-		    int first_row = 0,
-		    int first_col = 0,
-		    int offscreen_rows = 0,
-		    int additional_buffers = 0)
-    : field(0),
-      ftype(STATIC_CAST(NCursesFieldType*)(0))
-  {
-      field = ::new_field(rows, ncols, first_row, first_col,
-			  offscreen_rows, additional_buffers);
-      if (!field)
-	OnError(errno);
-  }
-
-  NCursesFormField& operator=(const NCursesFormField& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-    }
-    return *this;
-  }
-
-  NCursesFormField(const NCursesFormField& rhs)
-    : field(rhs.field), ftype(rhs.ftype)
-  {
-  }
-
-  virtual ~NCursesFormField ();
-
-  // Duplicate the field at a new position
-  inline NCursesFormField* dup(int first_row, int first_col)
-  {
-    NCursesFormField* f = new NCursesFormField();
-    if (!f)
-      OnError(E_SYSTEM_ERROR);
-    else {
-      f->ftype = ftype;
-      f->field = ::dup_field(field,first_row,first_col);
-      if (!f->field)
-	OnError(errno);
-    }
-    return f;
-  }
-
-  // Link the field to a new location
-  inline NCursesFormField* link(int first_row, int first_col) {
-    NCursesFormField* f = new NCursesFormField();
-    if (!f)
-      OnError(E_SYSTEM_ERROR);
-    else {
-      f->ftype = ftype;
-      f->field = ::link_field(field,first_row,first_col);
-      if (!f->field)
-	OnError(errno);
-    }
-    return f;
-  }
-
-  // Get the lowlevel field representation
-  inline FIELD* get_field() const {
-    return field;
-  }
-
-  // Retrieve info about the field
-  inline void info(int& rows, int& ncols,
-		   int& first_row, int& first_col,
-		   int& offscreen_rows, int& additional_buffers) const {
-    OnError(::field_info(field, &rows, &ncols,
-			 &first_row, &first_col,
-			 &offscreen_rows, &additional_buffers));
-  }
-
-  // Retrieve info about the fields dynamic properties.
-  inline void dynamic_info(int& dynamic_rows, int& dynamic_cols,
-			   int& max_growth) const {
-    OnError(::dynamic_field_info(field, &dynamic_rows, &dynamic_cols,
-				 &max_growth));
-  }
-
-  // For a dynamic field you may set the maximum growth limit.
-  // A zero means unlimited growth.
-  inline void set_maximum_growth(int growth = 0) {
-    OnError(::set_max_field(field,growth));
-  }
-
-  // Move the field to a new position
-  inline void move(int row, int col) {
-    OnError(::move_field(field,row,col));
-  }
-
-  // Mark the field to start a new page
-  inline void new_page(bool pageFlag = FALSE) {
-    OnError(::set_new_page(field,pageFlag));
-  }
-
-  // Retrieve whether or not the field starts a new page.
-  inline bool is_new_page() const {
-    return ::new_page(field);
-  }
-
-  // Set the justification for the field
-  inline void set_justification(int just) {
-    OnError(::set_field_just(field,just));
-  }
-
-  // Retrieve the fields justification
-  inline int justification() const {
-    return ::field_just(field);
-  }
-  // Set the foreground attribute for the field
-  inline void set_foreground(chtype foreground) {
-    OnError(::set_field_fore(field,foreground));
-  }
-
-  // Retrieve the fields foreground attribute
-  inline chtype fore() const {
-    return ::field_fore(field);
-  }
-
-  // Set the background attribute for the field
-  inline void set_background(chtype background) {
-    OnError(::set_field_back(field,background));
-  }
-
-  // Retrieve the fields background attribute
-  inline chtype back() const {
-    return ::field_back(field);
-  }
-
-  // Set the padding character for the field
-  inline void set_pad_character(int padding) {
-    OnError(::set_field_pad(field, padding));
-  }
-
-  // Retrieve the fields padding character
-  inline int pad() const {
-    return ::field_pad(field);
-  }
-
-  // Switch on the fields options
-  inline void options_on (Field_Options opts) {
-    OnError (::field_opts_on (field, opts));
-  }
-
-  // Switch off the fields options
-  inline void options_off (Field_Options opts) {
-    OnError (::field_opts_off (field, opts));
-  }
-
-  // Retrieve the fields options
-  inline Field_Options options () const {
-    return ::field_opts (field);
-  }
-
-  // Set the fields options
-  inline void set_options (Field_Options opts) {
-    OnError (::set_field_opts (field, opts));
-  }
-
-  // Mark the field as changed
-  inline void set_changed(bool changeFlag = TRUE) {
-    OnError(::set_field_status(field,changeFlag));
-  }
-
-  // Test whether or not the field is marked as changed
-  inline bool changed() const {
-    return ::field_status(field);
-  }
-
-  // Return the index of the field in the field array of a form
-  // or -1 if the field is not associated to a form
-  inline int (index)() const {
-    return ::field_index(field);
-  }
-
-  // Store a value in a fields buffer. The default buffer is nr. 0
-  inline void set_value(const char *val, int buffer = 0) {
-    OnError(::set_field_buffer(field,buffer,val));
-  }
-
-  // Retrieve the value of a fields buffer. The default buffer is nr. 0
-  inline char* value(int buffer = 0) const {
-    return ::field_buffer(field,buffer);
-  }
-
-  // Set the validation type of the field.
-  inline void set_fieldtype(NCursesFieldType& f) {
-    ftype = &f;
-    f.set(*this); // A good friend may do that...
-  }
-
-  // Retrieve the validation type of the field.
-  inline NCursesFieldType* fieldtype() const {
-    return ftype;
-  }
-
-};
-
-  // This are the built-in hook functions in this C++ binding. In C++ we use
-  // virtual member functions (see below On_..._Init and On_..._Termination)
-  // to provide this functionality in an object oriented manner.
-extern "C" {
-  void _nc_xx_frm_init(FORM *);
-  void _nc_xx_frm_term(FORM *);
-  void _nc_xx_fld_init(FORM *);
-  void _nc_xx_fld_term(FORM *);
-}
-
-//
-// -------------------------------------------------------------------------
-// The class representing a form, wrapping the lowlevel FORM struct
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP NCursesForm : public NCursesPanel
-{
-protected:
-  FORM* form;  // the lowlevel structure
-
-private:
-  NCursesWindow* sub;   // the subwindow object
-  bool b_sub_owner;     // is this our own subwindow?
-  bool b_framed;	// has the form a border?
-  bool b_autoDelete;    // Delete fields when deleting form?
-
-  NCursesFormField** my_fields; // The array of fields for this form
-
-  // This structure is used for the form's user data field to link the
-  // FORM* to the C++ object and to provide extra space for a user pointer.
-  typedef struct {
-    void*	       m_user;	    // the pointer for the user's data
-    const NCursesForm* m_back;      // backward pointer to C++ object
-    const FORM*	       m_owner;
-  } UserHook;
-
-  // Get the backward pointer to the C++ object from a FORM
-  static inline NCursesForm* getHook(const FORM *f) {
-    UserHook* hook = reinterpret_cast<UserHook*>(::form_userptr(f));
-    assert(hook != 0 && hook->m_owner==f);
-    return const_cast<NCursesForm*>(hook->m_back);
-  }
-
-  friend void _nc_xx_frm_init(FORM *);
-  friend void _nc_xx_frm_term(FORM *);
-  friend void _nc_xx_fld_init(FORM *);
-  friend void _nc_xx_fld_term(FORM *);
-
-  // Calculate FIELD* array for the menu
-  FIELD** mapFields(NCursesFormField* nfields[]);
-
-protected:
-  // internal routines
-  inline void set_user(void *user) {
-    UserHook* uptr = reinterpret_cast<UserHook*>(::form_userptr (form));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
-    uptr->m_user = user;
-  }
-
-  inline void *get_user() {
-    UserHook* uptr = reinterpret_cast<UserHook*>(::form_userptr (form));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
-    return uptr->m_user;
-  }
-
-  void InitForm (NCursesFormField* Fields[],
-		 bool with_frame,
-		 bool autoDeleteFields);
-
-  inline void OnError (int err) const THROW2(NCursesException const, NCursesFormException) {
-    if (err != E_OK)
-      THROW(new NCursesFormException (err));
-  }
-
-  // this wraps the form_driver call.
-  virtual int driver (int c) ;
-
-  // 'Internal' constructor, builds an object without association to a
-  // field array.
-  NCursesForm( int  nlines,
-	       int  ncols,
-	       int  begin_y = 0,
-	       int  begin_x = 0)
-    : NCursesPanel(nlines, ncols, begin_y, begin_x),
-      form (STATIC_CAST(FORM*)(0)),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_fields(0)
-  {
-  }
-
-public:
-  // Create form for the default panel.
-  NCursesForm (NCursesFormField* Fields[],
-	       bool with_frame=FALSE,	      // reserve space for a frame?
-	       bool autoDelete_Fields=FALSE)  // do automatic cleanup?
-    : NCursesPanel(),
-      form(0),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_fields(0)
-  {
-    InitForm(Fields, with_frame, autoDelete_Fields);
-  }
-
-  // Create a form in a panel with the given position and size.
-  NCursesForm (NCursesFormField* Fields[],
-	       int  nlines,
-	       int  ncols,
-	       int  begin_y,
-	       int  begin_x,
-	       bool with_frame=FALSE,	     // reserve space for a frame?
-	       bool autoDelete_Fields=FALSE) // do automatic cleanup?
-    : NCursesPanel(nlines, ncols, begin_y, begin_x),
-      form(0),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_fields(0)
-  {
-      InitForm(Fields, with_frame, autoDelete_Fields);
-  }
-
-  NCursesForm& operator=(const NCursesForm& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      NCursesPanel::operator=(rhs);
-    }
-    return *this;
-  }
-
-  NCursesForm(const NCursesForm& rhs)
-    : NCursesPanel(rhs),
-      form(rhs.form),
-      sub(rhs.sub),
-      b_sub_owner(rhs.b_sub_owner),
-      b_framed(rhs.b_framed),
-      b_autoDelete(rhs.b_autoDelete),
-      my_fields(rhs.my_fields)
-  {
-  }
-
-  virtual ~NCursesForm();
-
-  // Set the default attributes for the form
-  virtual void setDefaultAttributes();
-
-  // Retrieve current field of the form.
-  inline NCursesFormField* current_field() const {
-    return my_fields[::field_index(::current_field(form))];
-  }
-
-  // Set the forms subwindow
-  void setSubWindow(NCursesWindow& sub);
-
-  // Set these fields for the form
-  inline void setFields(NCursesFormField* Fields[]) {
-    OnError(::set_form_fields(form,mapFields(Fields)));
-  }
-
-  // Remove the form from the screen
-  inline void unpost (void) {
-    OnError (::unpost_form (form));
-  }
-
-  // Post the form to the screen if flag is true, unpost it otherwise
-  inline void post(bool flag = TRUE) {
-    OnError (flag ? ::post_form(form) : ::unpost_form (form));
-  }
-
-  // Decorations
-  inline void frame(const char *title=NULL, const char* btitle=NULL) {
-    if (b_framed)
-      NCursesPanel::frame(title,btitle);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  inline void boldframe(const char *title=NULL, const char* btitle=NULL) {
-    if (b_framed)
-      NCursesPanel::boldframe(title,btitle);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  inline void label(const char *topLabel, const char *bottomLabel) {
-    if (b_framed)
-      NCursesPanel::label(topLabel,bottomLabel);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  // -----
-  // Hooks
-  // -----
-
-  // Called after the form gets repositioned in its window.
-  // This is especially true if the form is posted.
-  virtual void On_Form_Init();
-
-  // Called before the form gets repositioned in its window.
-  // This is especially true if the form is unposted.
-  virtual void On_Form_Termination();
-
-  // Called after the field became the current field
-  virtual void On_Field_Init(NCursesFormField& field);
-
-  // Called before this field is left as current field.
-  virtual void On_Field_Termination(NCursesFormField& field);
-
-  // Calculate required window size for the form.
-  void scale(int& rows, int& ncols) const {
-    OnError(::scale_form(form,&rows,&ncols));
-  }
-
-  // Retrieve number of fields in the form.
-  int count() const {
-    return ::field_count(form);
-  }
-
-  // Make the page the current page of the form.
-  void set_page(int pageNum) {
-    OnError(::set_form_page(form, pageNum));
-  }
-
-  // Retrieve current page number
-  int page() const {
-    return ::form_page(form);
-  }
-
-  // Switch on the forms options
-  inline void options_on (Form_Options opts) {
-    OnError (::form_opts_on (form, opts));
-  }
-
-  // Switch off the forms options
-  inline void options_off (Form_Options opts) {
-    OnError (::form_opts_off (form, opts));
-  }
-
-  // Retrieve the forms options
-  inline Form_Options options () const {
-    return ::form_opts (form);
-  }
-
-  // Set the forms options
-  inline void set_options (Form_Options opts) {
-    OnError (::set_form_opts (form, opts));
-  }
-
-  // Are there more data in the current field after the data shown
-  inline bool data_ahead() const {
-    return ::data_ahead(form);
-  }
-
-  // Are there more data in the current field before the data shown
-  inline bool data_behind() const {
-    return ::data_behind(form);
-  }
-
-  // Position the cursor to the current field
-  inline void position_cursor () {
-    OnError (::pos_form_cursor (form));
-  }
-  // Set the current field
-  inline void set_current(NCursesFormField& F) {
-    OnError (::set_current_field(form, F.field));
-  }
-
-  // Provide a default key virtualization. Translate the keyboard
-  // code c into a form request code.
-  // The default implementation provides a hopefully straightforward
-  // mapping for the most common keystrokes and form requests.
-  virtual int virtualize(int c);
-
-  // Operators
-  inline NCursesFormField* operator[](int i) const {
-    if ( (i < 0) || (i >= ::field_count (form)) )
-      OnError (E_BAD_ARGUMENT);
-    return my_fields[i];
-  }
-
-  // Perform the menu's operation
-  // Return the field where you left the form.
-  virtual NCursesFormField* operator()(void);
-
-  // Exception handlers. The default is a Beep.
-  virtual void On_Request_Denied(int c) const;
-  virtual void On_Invalid_Field(int c) const;
-  virtual void On_Unknown_Command(int c) const;
-
-};
-
-//
-// -------------------------------------------------------------------------
-// This is the typical C++ typesafe way to allow to attach
-// user data to a field of a form. Its assumed that the user
-// data belongs to some class T. Use T as template argument
-// to create a UserField.
-// -------------------------------------------------------------------------
-template<class T> class NCURSES_IMPEXP NCursesUserField : public NCursesFormField
-{
-public:
-  NCursesUserField (int rows,
-		    int ncols,
-		    int first_row = 0,
-		    int first_col = 0,
-		    const T* p_UserData = STATIC_CAST(T*)(0),
-		    int offscreen_rows = 0,
-		    int additional_buffers = 0)
-    : NCursesFormField (rows, ncols,
-			first_row, first_col,
-			offscreen_rows, additional_buffers) {
-      if (field)
-	OnError(::set_field_userptr(field, STATIC_CAST(void *)(p_UserData)));
-  }
-
-  virtual ~NCursesUserField() {};
-
-  inline const T* UserData (void) const {
-    return reinterpret_cast<const T*>(::field_userptr (field));
-  }
-
-  inline virtual void setUserData(const T* p_UserData) {
-    if (field)
-      OnError (::set_field_userptr (field, STATIC_CAST(void *)(p_UserData)));
-  }
-};
-//
-// -------------------------------------------------------------------------
-// The same mechanism is used to attach user data to a form
-// -------------------------------------------------------------------------
-//
-template<class T> class NCURSES_IMPEXP NCursesUserForm : public NCursesForm
-{
-protected:
-  // 'Internal' constructor, builds an object without association to a
-  // field array.
-  NCursesUserForm( int  nlines,
-		   int  ncols,
-		   int  begin_y = 0,
-		   int  begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0))
-    : NCursesForm(nlines,ncols,begin_y,begin_x) {
-      if (form)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>
-				     (p_UserData)));
-  }
-
-public:
-  NCursesUserForm (NCursesFormField* Fields[],
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Fields=FALSE)
-    : NCursesForm (Fields, with_frame, autoDelete_Fields) {
-      if (form)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  };
-
-  NCursesUserForm (NCursesFormField* Fields[],
-		   int nlines,
-		   int ncols,
-		   int begin_y = 0,
-		   int begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Fields=FALSE)
-    : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
-		   with_frame, autoDelete_Fields) {
-      if (form)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>
-				     (p_UserData)));
-  };
-
-  virtual ~NCursesUserForm() {
-  };
-
-  inline T* UserData (void) {
-    return reinterpret_cast<T*>(get_user ());
-  };
-
-  inline virtual void setUserData (const T* p_UserData) {
-    if (form)
-      set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  }
-
-};
-//
-// -------------------------------------------------------------------------
-// Builtin Fieldtypes
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP Alpha_Field : public NCursesFieldType
-{
-private:
-  int min_field_width;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,min_field_width));
-  }
-
-public:
-  Alpha_Field(int width)
-    : NCursesFieldType(TYPE_ALPHA),
-      min_field_width(width) {
-  }
-};
-
-class NCURSES_IMPEXP Alphanumeric_Field : public NCursesFieldType
-{
-private:
-  int min_field_width;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,min_field_width));
-  }
-
-public:
-  Alphanumeric_Field(int width)
-    : NCursesFieldType(TYPE_ALNUM),
-      min_field_width(width) {
-  }
-};
-
-class NCURSES_IMPEXP Integer_Field : public NCursesFieldType
-{
-private:
-  int precision;
-  long lower_limit, upper_limit;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,
-			     precision,lower_limit,upper_limit));
-  }
-
-public:
-  Integer_Field(int prec, long low=0L, long high=0L)
-    : NCursesFieldType(TYPE_INTEGER),
-      precision(prec), lower_limit(low), upper_limit(high) {
-  }
-};
-
-class NCURSES_IMPEXP Numeric_Field : public NCursesFieldType
-{
-private:
-  int precision;
-  double lower_limit, upper_limit;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,
-			     precision,lower_limit,upper_limit));
-  }
-
-public:
-  Numeric_Field(int prec, double low=0.0, double high=0.0)
-    : NCursesFieldType(TYPE_NUMERIC),
-      precision(prec), lower_limit(low), upper_limit(high) {
-  }
-};
-
-class NCURSES_IMPEXP Regular_Expression_Field : public NCursesFieldType
-{
-private:
-  char* regex;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,regex));
-  }
-
-  void copy_regex(const char *source)
-  {
-    regex = new char[1 + ::strlen(source)];
-    (::strcpy)(regex, source);
-  }
-
-public:
-  Regular_Expression_Field(const char *expr)
-    : NCursesFieldType(TYPE_REGEXP),
-      regex(NULL)
-  {
-    copy_regex(expr);
-  }
-
-  Regular_Expression_Field& operator=(const Regular_Expression_Field& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      copy_regex(rhs.regex);
-      NCursesFieldType::operator=(rhs);
-    }
-    return *this;
-  }
-
-  Regular_Expression_Field(const Regular_Expression_Field& rhs)
-    : NCursesFieldType(rhs),
-      regex(NULL)
-  {
-    copy_regex(rhs.regex);
-  }
-
-  ~Regular_Expression_Field() {
-    delete[] regex;
-  }
-};
-
-class NCURSES_IMPEXP Enumeration_Field : public NCursesFieldType
-{
-private:
-  const char** list;
-  int case_sensitive;
-  int non_unique_matches;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,
-			     list,case_sensitive,non_unique_matches));
-  }
-public:
-  Enumeration_Field(const char* enums[],
-		    bool case_sens=FALSE,
-		    bool non_unique=FALSE)
-    : NCursesFieldType(TYPE_ENUM),
-      list(enums),
-      case_sensitive(case_sens ? -1 : 0),
-      non_unique_matches(non_unique ? -1 : 0) {
-  }
-
-  Enumeration_Field& operator=(const Enumeration_Field& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      NCursesFieldType::operator=(rhs);
-    }
-    return *this;
-  }
-
-  Enumeration_Field(const Enumeration_Field& rhs)
-    : NCursesFieldType(rhs),
-      list(rhs.list),
-      case_sensitive(rhs.case_sensitive),
-      non_unique_matches(rhs.non_unique_matches)
-  {
-  }
-};
-
-class NCURSES_IMPEXP IPV4_Address_Field : public NCursesFieldType
-{
-private:
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype));
-  }
-
-public:
-  IPV4_Address_Field() : NCursesFieldType(TYPE_IPV4) {
-  }
-};
-
-extern "C" {
-  bool _nc_xx_fld_fcheck(FIELD *, const void*);
-  bool _nc_xx_fld_ccheck(int c, const void *);
-  void* _nc_xx_fld_makearg(va_list*);
-}
-
-//
-// -------------------------------------------------------------------------
-// Abstract base class for User-Defined Fieldtypes
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP UserDefinedFieldType : public NCursesFieldType
-{
-  friend class UDF_Init; // Internal helper to set up statics
-private:
-  // For all C++ defined fieldtypes we need only one generic lowlevel
-  // FIELDTYPE* element.
-  static FIELDTYPE* generic_fieldtype;
-
-protected:
-  // This are the functions required by the low level libforms functions
-  // to construct a fieldtype.
-  friend bool _nc_xx_fld_fcheck(FIELD *, const void*);
-  friend bool _nc_xx_fld_ccheck(int c, const void *);
-  friend void* _nc_xx_fld_makearg(va_list*);
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,&f));
-  }
-
-protected:
-  // Redefine this function to do a field validation. The argument
-  // is a reference to the field you should validate.
-  virtual bool field_check(NCursesFormField& f) = 0;
-
-  // Redefine this function to do a character validation. The argument
-  // is the character to be validated.
-  virtual bool char_check (int c) = 0;
-
-public:
-  UserDefinedFieldType() : NCursesFieldType(generic_fieldtype) {
-  }
-};
-
-extern "C" {
-  bool _nc_xx_next_choice(FIELD*, const void *);
-  bool _nc_xx_prev_choice(FIELD*, const void *);
-}
-
-//
-// -------------------------------------------------------------------------
-// Abstract base class for User-Defined Fieldtypes with Choice functions
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP UserDefinedFieldType_With_Choice : public UserDefinedFieldType
-{
-  friend class UDF_Init; // Internal helper to set up statics
-private:
-  // For all C++ defined fieldtypes with choice functions we need only one
-  // generic lowlevel FIELDTYPE* element.
-  static FIELDTYPE* generic_fieldtype_with_choice;
-
-  // This are the functions required by the low level libforms functions
-  // to construct a fieldtype with choice functions.
-  friend bool _nc_xx_next_choice(FIELD*, const void *);
-  friend bool _nc_xx_prev_choice(FIELD*, const void *);
-
-protected:
-  // Redefine this function to do the retrieval of the next choice value.
-  // The argument is a reference to the field tobe examined.
-  virtual bool next    (NCursesFormField& f) = 0;
-
-  // Redefine this function to do the retrieval of the previous choice value.
-  // The argument is a reference to the field tobe examined.
-  virtual bool previous(NCursesFormField& f) = 0;
-
-public:
-  UserDefinedFieldType_With_Choice() {
-    fieldtype = generic_fieldtype_with_choice;
-  }
-};
-
-#endif /* NCURSES_CURSESF_H_incl */
diff --git a/openflow/usr/include/cursesm.h b/openflow/usr/include/cursesm.h
deleted file mode 100644
index f8f9665..0000000
--- a/openflow/usr/include/cursesm.h
+++ /dev/null
@@ -1,673 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-// $Id: cursesm.h,v 1.30 2014/08/09 22:06:18 Adam.Jiang Exp $
-
-#ifndef NCURSES_CURSESM_H_incl
-#define NCURSES_CURSESM_H_incl 1
-
-#include <cursesp.h>
-
-extern "C" {
-#  include <menu.h>
-}
-//
-// -------------------------------------------------------------------------
-// This wraps the ITEM type of <menu.h>
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP NCursesMenuItem
-{
-  friend class NCursesMenu;
-
-protected:
-  ITEM *item;
-
-  inline void OnError (int err) const THROW2(NCursesException const, NCursesMenuException) {
-    if (err != E_OK)
-      THROW(new NCursesMenuException (err));
-  }
-
-public:
-  NCursesMenuItem (const char* p_name     = NULL,
-		   const char* p_descript = NULL)
-    : item(0)
-  {
-    item = p_name ? ::new_item (p_name, p_descript) : STATIC_CAST(ITEM*)(0);
-    if (p_name && !item)
-      OnError (E_SYSTEM_ERROR);
-  }
-  // Create an item. If you pass both parameters as NULL, a delimiting
-  // item is constructed which can be used to terminate a list of
-  // NCursesMenu objects.
-
-  NCursesMenuItem& operator=(const NCursesMenuItem& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-    }
-    return *this;
-  }
-
-  NCursesMenuItem(const NCursesMenuItem& rhs)
-    : item(0)
-  {
-    (void) rhs;
-  }
-
-  virtual ~NCursesMenuItem ();
-  // Release the items memory
-
-  inline const char* name () const {
-    return ::item_name (item);
-  }
-  // Name of the item
-
-  inline const char* description () const {
-    return ::item_description (item);
-  }
-  // Description of the item
-
-  inline int (index) (void) const {
-    return ::item_index (item);
-  }
-  // Index of the item in an item array (or -1)
-
-  inline void options_on (Item_Options opts) {
-    OnError (::item_opts_on (item, opts));
-  }
-  // Switch on the items options
-
-  inline void options_off (Item_Options opts) {
-    OnError (::item_opts_off (item, opts));
-  }
-  // Switch off the item's option
-
-  inline Item_Options options () const {
-    return ::item_opts (item);
-  }
-  // Retrieve the items options
-
-  inline void set_options (Item_Options opts) {
-    OnError (::set_item_opts (item, opts));
-  }
-  // Set the items options
-
-  inline void set_value (bool f) {
-    OnError (::set_item_value (item,f));
-  }
-  // Set/Reset the items selection state
-
-  inline bool value () const {
-    return ::item_value (item);
-  }
-  // Retrieve the items selection state
-
-  inline bool visible () const {
-    return ::item_visible (item);
-  }
-  // Retrieve visibility of the item
-
-  virtual bool action();
-  // Perform an action associated with this item; you may use this in an
-  // user supplied driver for a menu; you may derive from this class and
-  // overload action() to supply items with different actions.
-  // If an action returns true, the menu will be exited. The default action
-  // is to do nothing.
-};
-
-// Prototype for an items callback function.
-typedef bool ITEMCALLBACK(NCursesMenuItem&);
-
-// If you don't like to create a child class for individual items to
-// overload action(), you may use this class and provide a callback
-// function pointer for items.
-class NCURSES_IMPEXP NCursesMenuCallbackItem : public NCursesMenuItem
-{
-private:
-  ITEMCALLBACK* p_fct;
-
-public:
-  NCursesMenuCallbackItem(ITEMCALLBACK* fct       = NULL,
-			  const char* p_name      = NULL,
-			  const char* p_descript  = NULL )
-    : NCursesMenuItem (p_name, p_descript),
-      p_fct (fct) {
-  }
-
-  NCursesMenuCallbackItem& operator=(const NCursesMenuCallbackItem& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-    }
-    return *this;
-  }
-
-  NCursesMenuCallbackItem(const NCursesMenuCallbackItem& rhs)
-    : NCursesMenuItem(rhs),
-      p_fct(0)
-  {
-  }
-
-  virtual ~NCursesMenuCallbackItem();
-
-  bool action();
-};
-
-  // This are the built-in hook functions in this C++ binding. In C++ we use
-  // virtual member functions (see below On_..._Init and On_..._Termination)
-  // to provide this functionality in an object oriented manner.
-extern "C" {
-  void _nc_xx_mnu_init(MENU *);
-  void _nc_xx_mnu_term(MENU *);
-  void _nc_xx_itm_init(MENU *);
-  void _nc_xx_itm_term(MENU *);
-}
-
-//
-// -------------------------------------------------------------------------
-// This wraps the MENU type of <menu.h>
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP NCursesMenu : public NCursesPanel
-{
-protected:
-  MENU *menu;
-
-private:
-  NCursesWindow* sub;   // the subwindow object
-  bool b_sub_owner;     // is this our own subwindow?
-  bool b_framed;        // has the menu a border?
-  bool b_autoDelete;    // Delete items when deleting menu?
-
-  NCursesMenuItem** my_items; // The array of items for this menu
-
-  // This structure is used for the menu's user data field to link the
-  // MENU* to the C++ object and to provide extra space for a user pointer.
-  typedef struct {
-    void*              m_user;      // the pointer for the user's data
-    const NCursesMenu* m_back;      // backward pointer to C++ object
-    const MENU*        m_owner;
-  } UserHook;
-
-  // Get the backward pointer to the C++ object from a MENU
-  static inline NCursesMenu* getHook(const MENU *m) {
-    UserHook* hook = STATIC_CAST(UserHook*)(::menu_userptr(m));
-    assert(hook != 0 && hook->m_owner==m);
-    return const_cast<NCursesMenu*>(hook->m_back);
-  }
-
-  friend void _nc_xx_mnu_init(MENU *);
-  friend void _nc_xx_mnu_term(MENU *);
-  friend void _nc_xx_itm_init(MENU *);
-  friend void _nc_xx_itm_term(MENU *);
-
-  // Calculate ITEM* array for the menu
-  ITEM** mapItems(NCursesMenuItem* nitems[]);
-
-protected:
-  // internal routines
-  inline void set_user(void *user) {
-    UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
-    uptr->m_user = user;
-  }
-
-  inline void *get_user() {
-    UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
-    return uptr->m_user;
-  }
-
-  void InitMenu (NCursesMenuItem* menu[],
-		 bool with_frame,
-		 bool autoDeleteItems);
-
-  inline void OnError (int err) const THROW2(NCursesException const, NCursesMenuException) {
-    if (err != E_OK)
-      THROW(new NCursesMenuException (this, err));
-  }
-
-  // this wraps the menu_driver call.
-  virtual int driver (int c) ;
-
-  // 'Internal' constructor to create a menu without association to
-  // an array of items.
-  NCursesMenu( int  nlines,
-	       int  ncols,
-	       int  begin_y = 0,
-	       int  begin_x = 0)
-    : NCursesPanel(nlines,ncols,begin_y,begin_x),
-      menu (STATIC_CAST(MENU*)(0)),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_items(0)
-  {
-  }
-
-public:
-  // Make a full window size menu
-  NCursesMenu (NCursesMenuItem* Items[],
-	       bool with_frame=FALSE,        // Reserve space for a frame?
-	       bool autoDelete_Items=FALSE)  // Autocleanup of Items?
-    : NCursesPanel(),
-      menu(0),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_items(0)
-  {
-      InitMenu(Items, with_frame, autoDelete_Items);
-  }
-
-  // Make a menu with a window of this size.
-  NCursesMenu (NCursesMenuItem* Items[],
-	       int  nlines,
-	       int  ncols,
-	       int  begin_y = 0,
-	       int  begin_x = 0,
-	       bool with_frame=FALSE,        // Reserve space for a frame?
-	       bool autoDelete_Items=FALSE)  // Autocleanup of Items?
-    : NCursesPanel(nlines, ncols, begin_y, begin_x),
-      menu(0),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_items(0)
-  {
-      InitMenu(Items, with_frame, autoDelete_Items);
-  }
-
-  NCursesMenu& operator=(const NCursesMenu& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      NCursesPanel::operator=(rhs);
-    }
-    return *this;
-  }
-
-  NCursesMenu(const NCursesMenu& rhs)
-    : NCursesPanel(rhs),
-      menu(rhs.menu),
-      sub(rhs.sub),
-      b_sub_owner(rhs.b_sub_owner),
-      b_framed(rhs.b_framed),
-      b_autoDelete(rhs.b_autoDelete),
-      my_items(rhs.my_items)
-  {
-  }
-
-  virtual ~NCursesMenu ();
-
-  // Retrieve the menus subwindow
-  inline NCursesWindow& subWindow() const {
-    assert(sub!=NULL);
-    return *sub;
-  }
-
-  // Set the menus subwindow
-  void setSubWindow(NCursesWindow& sub);
-
-  // Set these items for the menu
-  inline void setItems(NCursesMenuItem* Items[]) {
-    OnError(::set_menu_items(menu,mapItems(Items)));
-  }
-
-  // Remove the menu from the screen
-  inline void unpost (void) {
-    OnError (::unpost_menu (menu));
-  }
-
-  // Post the menu to the screen if flag is true, unpost it otherwise
-  inline void post(bool flag = TRUE) {
-    flag ? OnError (::post_menu(menu)) : OnError (::unpost_menu (menu));
-  }
-
-  // Get the numer of rows and columns for this menu
-  inline void scale (int& mrows, int& mcols) const  {
-    OnError (::scale_menu (menu, &mrows, &mcols));
-  }
-
-  // Set the format of this menu
-  inline void set_format(int mrows, int mcols) {
-    OnError (::set_menu_format(menu, mrows, mcols));
-  }
-
-  // Get the format of this menu
-  inline void menu_format(int& rows,int& ncols) {
-    ::menu_format(menu,&rows,&ncols);
-  }
-
-  // Items of the menu
-  inline NCursesMenuItem* items() const {
-    return *my_items;
-  }
-
-  // Get the number of items in this menu
-  inline int count() const {
-    return ::item_count(menu);
-  }
-
-  // Get the current item (i.e. the one the cursor is located)
-  inline NCursesMenuItem* current_item() const {
-    return my_items[::item_index(::current_item(menu))];
-  }
-
-  // Get the marker string
-  inline const char* mark() const {
-    return ::menu_mark(menu);
-  }
-
-  // Set the marker string
-  inline void set_mark(const char *marker) {
-    OnError (::set_menu_mark (menu, marker));
-  }
-
-  // Get the name of the request code c
-  inline static const char* request_name(int c) {
-    return ::menu_request_name(c);
-  }
-
-  // Get the current pattern
-  inline char* pattern() const {
-    return ::menu_pattern(menu);
-  }
-
-  // true if there is a pattern match, false otherwise.
-  bool set_pattern (const char *pat);
-
-  // set the default attributes for the menu
-  // i.e. set fore, back and grey attribute
-  virtual void setDefaultAttributes();
-
-  // Get the menus background attributes
-  inline chtype back() const {
-    return ::menu_back(menu);
-  }
-
-  // Get the menus foreground attributes
-  inline chtype fore() const {
-    return ::menu_fore(menu);
-  }
-
-  // Get the menus grey attributes (used for unselectable items)
-  inline chtype grey() const {
-    return ::menu_grey(menu);
-  }
-
-  // Set the menus background attributes
-  inline chtype set_background(chtype a) {
-    return ::set_menu_back(menu,a);
-  }
-
-  // Set the menus foreground attributes
-  inline chtype set_foreground(chtype a) {
-    return ::set_menu_fore(menu,a);
-  }
-
-  // Set the menus grey attributes (used for unselectable items)
-  inline chtype set_grey(chtype a) {
-    return ::set_menu_grey(menu,a);
-  }
-
-  inline void options_on (Menu_Options opts) {
-    OnError (::menu_opts_on (menu,opts));
-  }
-
-  inline void options_off(Menu_Options opts) {
-    OnError (::menu_opts_off(menu,opts));
-  }
-
-  inline Menu_Options options() const {
-    return ::menu_opts(menu);
-  }
-
-  inline void set_options (Menu_Options opts) {
-    OnError (::set_menu_opts (menu,opts));
-  }
-
-  inline int pad() const {
-    return ::menu_pad(menu);
-  }
-
-  inline void set_pad (int padch) {
-    OnError (::set_menu_pad (menu, padch));
-  }
-
-  // Position the cursor to the current item
-  inline void position_cursor () const {
-    OnError (::pos_menu_cursor (menu));
-  }
-
-  // Set the current item
-  inline void set_current(NCursesMenuItem& I) {
-    OnError (::set_current_item(menu, I.item));
-  }
-
-  // Get the current top row of the menu
-  inline int top_row (void) const {
-    return ::top_row (menu);
-  }
-
-  // Set the current top row of the menu
-  inline void set_top_row (int row) {
-    OnError (::set_top_row (menu, row));
-  }
-
-  // spacing control
-  // Set the spacing for the menu
-  inline void setSpacing(int spc_description,
-			 int spc_rows,
-			 int spc_columns) {
-    OnError(::set_menu_spacing(menu,
-			       spc_description,
-			       spc_rows,
-			       spc_columns));
-  }
-
-  // Get the spacing info for the menu
-  inline void Spacing(int& spc_description,
-		      int& spc_rows,
-		      int& spc_columns) const {
-    OnError(::menu_spacing(menu,
-			   &spc_description,
-			   &spc_rows,
-			   &spc_columns));
-  }
-
-  // Decorations
-  inline void frame(const char *title=NULL, const char* btitle=NULL) {
-    if (b_framed)
-      NCursesPanel::frame(title,btitle);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  inline void boldframe(const char *title=NULL, const char* btitle=NULL) {
-    if (b_framed)
-      NCursesPanel::boldframe(title,btitle);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  inline void label(const char *topLabel, const char *bottomLabel) {
-    if (b_framed)
-      NCursesPanel::label(topLabel,bottomLabel);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  // -----
-  // Hooks
-  // -----
-
-  // Called after the menu gets repositioned in its window.
-  // This is especially true if the menu is posted.
-  virtual void On_Menu_Init();
-
-  // Called before the menu gets repositioned in its window.
-  // This is especially true if the menu is unposted.
-  virtual void On_Menu_Termination();
-
-  // Called after the item became the current item
-  virtual void On_Item_Init(NCursesMenuItem& item);
-
-  // Called before this item is left as current item.
-  virtual void On_Item_Termination(NCursesMenuItem& item);
-
-  // Provide a default key virtualization. Translate the keyboard
-  // code c into a menu request code.
-  // The default implementation provides a hopefully straightforward
-  // mapping for the most common keystrokes and menu requests.
-  virtual int virtualize(int c);
-
-
-  // Operators
-  inline NCursesMenuItem* operator[](int i) const {
-    if ( (i < 0) || (i >= ::item_count (menu)) )
-      OnError (E_BAD_ARGUMENT);
-    return (my_items[i]);
-  }
-
-  // Perform the menu's operation
-  // Return the item where you left the selection mark for a single
-  // selection menu, or NULL for a multivalued menu.
-  virtual NCursesMenuItem* operator()(void);
-
-  // --------------------
-  // Exception handlers
-  // Called by operator()
-  // --------------------
-
-  // Called if the request is denied
-  virtual void On_Request_Denied(int c) const;
-
-  // Called if the item is not selectable
-  virtual void On_Not_Selectable(int c) const;
-
-  // Called if pattern doesn't match
-  virtual void On_No_Match(int c) const;
-
-  // Called if the command is unknown
-  virtual void On_Unknown_Command(int c) const;
-
-};
-//
-// -------------------------------------------------------------------------
-// This is the typical C++ typesafe way to allow to attach
-// user data to an item of a menu. Its assumed that the user
-// data belongs to some class T. Use T as template argument
-// to create a UserItem.
-// -------------------------------------------------------------------------
-//
-template<class T> class NCURSES_IMPEXP NCursesUserItem : public NCursesMenuItem
-{
-public:
-  NCursesUserItem (const char* p_name,
-		   const char* p_descript = NULL,
-		   const T* p_UserData    = STATIC_CAST(T*)(0))
-    : NCursesMenuItem (p_name, p_descript) {
-      if (item)
-	OnError (::set_item_userptr (item, const_cast<void *>(reinterpret_cast<const void*>(p_UserData))));
-  }
-
-  virtual ~NCursesUserItem() {}
-
-  inline const T* UserData (void) const {
-    return reinterpret_cast<const T*>(::item_userptr (item));
-  };
-
-  inline virtual void setUserData(const T* p_UserData) {
-    if (item)
-      OnError (::set_item_userptr (item, const_cast<void *>(reinterpret_cast<const void *>(p_UserData))));
-  }
-};
-//
-// -------------------------------------------------------------------------
-// The same mechanism is used to attach user data to a menu
-// -------------------------------------------------------------------------
-//
-template<class T> class NCURSES_IMPEXP NCursesUserMenu : public NCursesMenu
-{
-protected:
-  NCursesUserMenu( int  nlines,
-		   int  ncols,
-		   int  begin_y = 0,
-		   int  begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0))
-    : NCursesMenu(nlines,ncols,begin_y,begin_x) {
-      if (menu)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  }
-
-public:
-  NCursesUserMenu (NCursesMenuItem* Items[],
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Items=FALSE)
-    : NCursesMenu (Items, with_frame, autoDelete_Items) {
-      if (menu)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  };
-
-  NCursesUserMenu (NCursesMenuItem* Items[],
-		   int nlines,
-		   int ncols,
-		   int begin_y = 0,
-		   int begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE)
-    : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
-      if (menu)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  };
-
-  virtual ~NCursesUserMenu() {
-  };
-
-  inline T* UserData (void) {
-    return reinterpret_cast<T*>(get_user ());
-  };
-
-  inline virtual void setUserData (const T* p_UserData) {
-    if (menu)
-      set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  }
-};
-
-#endif /* NCURSES_CURSESM_H_incl */
diff --git a/openflow/usr/include/cursesp.h b/openflow/usr/include/cursesp.h
deleted file mode 100644
index 54b0d58..0000000
--- a/openflow/usr/include/cursesp.h
+++ /dev/null
@@ -1,269 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-#ifndef NCURSES_CURSESP_H_incl
-#define NCURSES_CURSESP_H_incl 1
-
-// $Id: cursesp.h,v 1.31 2014/08/09 22:06:26 Adam.Jiang Exp $
-
-#include <cursesw.h>
-
-extern "C" {
-#  include <panel.h>
-}
-
-class NCURSES_IMPEXP NCursesPanel
-  : public NCursesWindow
-{
-protected:
-  PANEL *p;
-  static NCursesPanel *dummy;
-
-private:
-  // This structure is used for the panel's user data field to link the
-  // PANEL* to the C++ object and to provide extra space for a user pointer.
-  typedef struct {
-    void*               m_user;      // the pointer for the user's data
-    const NCursesPanel* m_back;      // backward pointer to C++ object
-    const PANEL*        m_owner;     // the panel itself
-  } UserHook;
-
-  inline UserHook *UserPointer()
-  {
-    UserHook* uptr = reinterpret_cast<UserHook*>(
-                           const_cast<void *>(::panel_userptr (p)));
-    return uptr;
-  }
-
-  void init();                       // Initialize the panel object
-
-protected:
-  void set_user(void *user)
-  {
-    UserHook* uptr = UserPointer();
-    if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p) {
-      uptr->m_user = user;
-    }
-  }
-  // Set the user pointer of the panel.
-
-  void *get_user()
-  {
-    UserHook* uptr = UserPointer();
-    void *result = 0;
-    if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p)
-      result = uptr->m_user;
-    return result;
-  }
-
-  void OnError (int err) const THROW2(NCursesException const, NCursesPanelException)
-  {
-    if (err==ERR)
-      THROW(new NCursesPanelException (this, err));
-  }
-  // If err is equal to the curses error indicator ERR, an error handler
-  // is called.
-
-  // Get a keystroke. Default implementation calls getch()
-  virtual int getKey(void);
-
-public:
-  NCursesPanel(int nlines,
-	       int ncols,
-	       int begin_y = 0,
-	       int begin_x = 0)
-    : NCursesWindow(nlines,ncols,begin_y,begin_x), p(0)
-  {
-    init();
-  }
-  // Create a panel with this size starting at the requested position.
-
-  NCursesPanel()
-    : NCursesWindow(::stdscr), p(0)
-  {
-    init();
-  }
-  // This constructor creates the default Panel associated with the
-  // ::stdscr window
-
-  NCursesPanel& operator=(const NCursesPanel& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      NCursesWindow::operator=(rhs);
-    }
-    return *this;
-  }
-
-  NCursesPanel(const NCursesPanel& rhs)
-    : NCursesWindow(rhs),
-      p(rhs.p)
-  {
-  }
-
-  virtual ~NCursesPanel();
-
-  // basic manipulation
-  inline void hide()
-  {
-    OnError (::hide_panel(p));
-  }
-  // Hide the panel. It stays in the stack but becomes invisible.
-
-  inline void show()
-  {
-    OnError (::show_panel(p));
-  }
-  // Show the panel, i.e. make it visible.
-
-  inline void top()
-  {
-    OnError (::top_panel(p));
-  }
-  // Make this panel the top panel in the stack.
-
-  inline void bottom()
-  {
-    OnError (::bottom_panel(p));
-  }
-  // Make this panel the bottom panel in the stack.
-  // N.B.: The panel associated with ::stdscr is always on the bottom. So
-  // actually bottom() makes the panel the first above ::stdscr.
-
-  virtual int mvwin(int y, int x)
-  {
-    OnError(::move_panel(p, y, x));
-    return OK;
-  }
-
-  inline bool hidden() const
-  {
-    return (::panel_hidden (p) ? TRUE : FALSE);
-  }
-  // Return TRUE if the panel is hidden, FALSE otherwise.
-
-/* The functions panel_above() and panel_below() are not reflected in
-   the NCursesPanel class. The reason for this is, that we cannot
-   assume that a panel retrieved by those operations is one wrapped
-   by a C++ class. Although this situation might be handled, we also
-   need a reverse mapping from PANEL to NCursesPanel which needs some
-   redesign of the low level stuff. At the moment, we define them in the
-   interface but they will always produce an error. */
-  inline NCursesPanel& above() const
-  {
-    OnError(ERR);
-    return *dummy;
-  }
-
-  inline NCursesPanel& below() const
-  {
-    OnError(ERR);
-    return *dummy;
-  }
-
-  // Those two are rewrites of the corresponding virtual members of
-  // NCursesWindow
-  virtual int refresh();
-  // Propagate all panel changes to the virtual screen and update the
-  // physical screen.
-
-  virtual int noutrefresh();
-  // Propagate all panel changes to the virtual screen.
-
-  static void redraw();
-  // Redraw all panels.
-
-  // decorations
-  virtual void frame(const char* title=NULL,
-		     const char* btitle=NULL);
-  // Put a frame around the panel and put the title centered in the top line
-  // and btitle in the bottom line.
-
-  virtual void boldframe(const char* title=NULL,
-			 const char* btitle=NULL);
-  // Same as frame(), but use highlighted attributes.
-
-  virtual void label(const char* topLabel,
-		     const char* bottomLabel);
-  // Put the title centered in the top line and btitle in the bottom line.
-
-  virtual void centertext(int row,const char* label);
-  // Put the label text centered in the specified row.
-};
-
-/* We use templates to provide a typesafe mechanism to associate
- * user data with a panel. A NCursesUserPanel<T> is a panel
- * associated with some user data of type T.
- */
-template<class T> class NCursesUserPanel : public NCursesPanel
-{
-public:
-  NCursesUserPanel (int nlines,
-		    int ncols,
-		    int begin_y = 0,
-		    int begin_x = 0,
-		    const T* p_UserData = STATIC_CAST(T*)(0))
-    : NCursesPanel (nlines, ncols, begin_y, begin_x)
-  {
-      if (p)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>
-				     (p_UserData)));
-  };
-  // This creates an user panel of the requested size with associated
-  // user data pointed to by p_UserData.
-
-  NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(0)) : NCursesPanel()
-  {
-    if (p)
-      set_user(const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  };
-  // This creates an user panel associated with the ::stdscr and user data
-  // pointed to by p_UserData.
-
-  virtual ~NCursesUserPanel() {};
-
-  T* UserData (void)
-  {
-    return reinterpret_cast<T*>(get_user ());
-  };
-  // Retrieve the user data associated with the panel.
-
-  virtual void setUserData (const T* p_UserData)
-  {
-    if (p)
-      set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  }
-  // Associate the user panel with the user data pointed to by p_UserData.
-};
-
-#endif /* NCURSES_CURSESP_H_incl */
diff --git a/openflow/usr/include/cursesw.h b/openflow/usr/include/cursesw.h
deleted file mode 100644
index ca07b04..0000000
--- a/openflow/usr/include/cursesw.h
+++ /dev/null
@@ -1,1563 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-// vile:cppmode
-/****************************************************************************
- * Copyright (c) 1998-2011,2014 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-#ifndef NCURSES_CURSESW_H_incl
-#define NCURSES_CURSESW_H_incl 1
-
-// $Id: cursesw.h,v 1.50 2014/02/01 22:17:37 tom Exp $
-
-#include <etip.h>
-
-extern "C" {
-#  include   <curses.h>
-}
-
-/* SCO 3.2v4 curses.h includes term.h, which defines lines as a macro.
-   Undefine it here, because NCursesWindow uses lines as a method.  */
-#undef lines
-
-/* "Convert" macros to inlines. We'll define it as another symbol to avoid
- * conflict with library symbols.
- */
-#undef UNDEF
-#define UNDEF(name) CUR_ ##name
-
-#ifdef addch
-inline int UNDEF(addch)(chtype ch)  { return addch(ch); }
-#undef addch
-#define addch UNDEF(addch)
-#endif
-
-#ifdef addchstr
-inline int UNDEF(addchstr)(chtype *at) { return addchstr(at); }
-#undef addchstr
-#define addchstr UNDEF(addchstr)
-#endif
-
-#ifdef addnstr
-inline int UNDEF(addnstr)(const char *str, int n)
-{ return addnstr(str, n); }
-#undef addnstr
-#define addnstr UNDEF(addnstr)
-#endif
-
-#ifdef addstr
-inline int UNDEF(addstr)(const char * str)  { return addstr(str); }
-#undef addstr
-#define addstr UNDEF(addstr)
-#endif
-
-#ifdef attroff
-inline int UNDEF(attroff)(chtype at) { return attroff(at); }
-#undef attroff
-#define attroff UNDEF(attroff)
-#endif
-
-#ifdef attron
-inline int UNDEF(attron)(chtype at) { return attron(at); }
-#undef attron
-#define attron UNDEF(attron)
-#endif
-
-#ifdef attrset
-inline chtype UNDEF(attrset)(chtype at) { return attrset(at); }
-#undef attrset
-#define attrset UNDEF(attrset)
-#endif
-
-#ifdef bkgd
-inline int UNDEF(bkgd)(chtype ch) { return bkgd(ch); }
-#undef bkgd
-#define bkgd UNDEF(bkgd)
-#endif
-
-#ifdef bkgdset
-inline void UNDEF(bkgdset)(chtype ch) { bkgdset(ch); }
-#undef bkgdset
-#define bkgdset UNDEF(bkgdset)
-#endif
-
-#ifdef border
-inline int UNDEF(border)(chtype ls, chtype rs, chtype ts, chtype bs, chtype tl, chtype tr, chtype bl, chtype br)
-{ return border(ls, rs, ts, bs, tl, tr, bl, br); }
-#undef border
-#define border UNDEF(border)
-#endif
-
-#ifdef box
-inline int UNDEF(box)(WINDOW *win, int v, int h) { return box(win, v, h); }
-#undef box
-#define box UNDEF(box)
-#endif
-
-#ifdef chgat
-inline int UNDEF(chgat)(int n, attr_t attr, NCURSES_PAIRS_T color, const void *opts) {
-  return chgat(n, attr, color, opts); }
-#undef chgat
-#define chgat UNDEF(chgat)
-#endif
-
-#ifdef clear
-inline int UNDEF(clear)()  { return clear(); }
-#undef clear
-#define clear UNDEF(clear)
-#endif
-
-#ifdef clearok
-inline int UNDEF(clearok)(WINDOW* win, bool bf)  { return clearok(win, bf); }
-#undef clearok
-#define clearok UNDEF(clearok)
-#else
-extern "C" NCURSES_IMPEXP int NCURSES_API clearok(WINDOW*, bool);
-#endif
-
-#ifdef clrtobot
-inline int UNDEF(clrtobot)()  { return clrtobot(); }
-#undef clrtobot
-#define clrtobot UNDEF(clrtobot)
-#endif
-
-#ifdef clrtoeol
-inline int UNDEF(clrtoeol)()  { return clrtoeol(); }
-#undef clrtoeol
-#define clrtoeol UNDEF(clrtoeol)
-#endif
-
-#ifdef color_set
-inline chtype UNDEF(color_set)(NCURSES_PAIRS_T p, void* opts) { return color_set(p, opts); }
-#undef color_set
-#define color_set UNDEF(color_set)
-#endif
-
-#ifdef crmode
-inline int UNDEF(crmode)(void) { return crmode(); }
-#undef crmode
-#define crmode UNDEF(crmode)
-#endif
-
-#ifdef delch
-inline int UNDEF(delch)()  { return delch(); }
-#undef delch
-#define delch UNDEF(delch)
-#endif
-
-#ifdef deleteln
-inline int UNDEF(deleteln)()  { return deleteln(); }
-#undef deleteln
-#define deleteln UNDEF(deleteln)
-#endif
-
-#ifdef echochar
-inline int UNDEF(echochar)(chtype ch)  { return echochar(ch); }
-#undef echochar
-#define echochar UNDEF(echochar)
-#endif
-
-#ifdef erase
-inline int UNDEF(erase)()  { return erase(); }
-#undef erase
-#define erase UNDEF(erase)
-#endif
-
-#ifdef fixterm
-inline int UNDEF(fixterm)(void) { return fixterm(); }
-#undef fixterm
-#define fixterm UNDEF(fixterm)
-#endif
-
-#ifdef flushok
-inline int UNDEF(flushok)(WINDOW* _win, bool _bf)  {
-  return flushok(_win, _bf); }
-#undef flushok
-#define flushok UNDEF(flushok)
-#else
-#define _no_flushok
-#endif
-
-#ifdef getattrs
-inline int UNDEF(getattrs)(WINDOW *win) { return getattrs(win); }
-#undef getattrs
-#define getattrs UNDEF(getattrs)
-#endif
-
-#ifdef getbegyx
-inline void UNDEF(getbegyx)(WINDOW* win, int& y, int& x) { getbegyx(win, y, x); }
-#undef getbegyx
-#define getbegyx UNDEF(getbegyx)
-#endif
-
-#ifdef getbkgd
-inline chtype UNDEF(getbkgd)(const WINDOW *win) { return getbkgd(win); }
-#undef getbkgd
-#define getbkgd UNDEF(getbkgd)
-#endif
-
-#ifdef getch
-inline int UNDEF(getch)()  { return getch(); }
-#undef getch
-#define getch UNDEF(getch)
-#endif
-
-#ifdef getmaxyx
-inline void UNDEF(getmaxyx)(WINDOW* win, int& y, int& x) { getmaxyx(win, y, x); }
-#undef getmaxyx
-#define getmaxyx UNDEF(getmaxyx)
-#endif
-
-#ifdef getnstr
-inline int UNDEF(getnstr)(char *_str, int n)  { return getnstr(_str, n); }
-#undef getnstr
-#define getnstr UNDEF(getnstr)
-#endif
-
-#ifdef getparyx
-inline void UNDEF(getparyx)(WINDOW* win, int& y, int& x) { getparyx(win, y, x); }
-#undef getparyx
-#define getparyx UNDEF(getparyx)
-#endif
-
-#ifdef getstr
-inline int UNDEF(getstr)(char *_str)  { return getstr(_str); }
-#undef getstr
-#define getstr UNDEF(getstr)
-#endif
-
-#ifdef getyx
-inline void UNDEF(getyx)(const WINDOW* win, int& y, int& x) {
-  getyx(win, y, x); }
-#undef getyx
-#define getyx UNDEF(getyx)
-#endif
-
-#ifdef hline
-inline int UNDEF(hline)(chtype ch, int n) { return hline(ch, n); }
-#undef hline
-#define hline UNDEF(hline)
-#endif
-
-#ifdef inch
-inline chtype UNDEF(inch)()  { return inch(); }
-#undef inch
-#define inch UNDEF(inch)
-#endif
-
-#ifdef inchstr
-inline int UNDEF(inchstr)(chtype *str)  { return inchstr(str); }
-#undef inchstr
-#define inchstr UNDEF(inchstr)
-#endif
-
-#ifdef innstr
-inline int UNDEF(innstr)(char *_str, int n)  { return innstr(_str, n); }
-#undef innstr
-#define innstr UNDEF(innstr)
-#endif
-
-#ifdef insch
-inline int UNDEF(insch)(chtype c)  { return insch(c); }
-#undef insch
-#define insch UNDEF(insch)
-#endif
-
-#ifdef insdelln
-inline int UNDEF(insdelln)(int n)  { return insdelln(n); }
-#undef insdelln
-#define insdelln UNDEF(insdelln)
-#endif
-
-#ifdef insertln
-inline int UNDEF(insertln)()  { return insertln(); }
-#undef insertln
-#define insertln UNDEF(insertln)
-#endif
-
-#ifdef insnstr
-inline int UNDEF(insnstr)(const char *_str, int n)  {
-  return insnstr(_str, n); }
-#undef insnstr
-#define insnstr UNDEF(insnstr)
-#endif
-
-#ifdef insstr
-inline int UNDEF(insstr)(const char *_str)  {
-  return insstr(_str); }
-#undef insstr
-#define insstr UNDEF(insstr)
-#endif
-
-#ifdef instr
-inline int UNDEF(instr)(char *_str)  { return instr(_str); }
-#undef instr
-#define instr UNDEF(instr)
-#endif
-
-#ifdef intrflush
-inline void UNDEF(intrflush)(WINDOW *win, bool bf) { intrflush(); }
-#undef intrflush
-#define intrflush UNDEF(intrflush)
-#endif
-
-#ifdef leaveok
-inline int UNDEF(leaveok)(WINDOW* win, bool bf)  { return leaveok(win, bf); }
-#undef leaveok
-#define leaveok UNDEF(leaveok)
-#else
-extern "C" NCURSES_IMPEXP int NCURSES_API leaveok(WINDOW* win, bool bf);
-#endif
-
-#ifdef move
-inline int UNDEF(move)(int x, int y)  { return move(x, y); }
-#undef move
-#define move UNDEF(move)
-#endif
-
-#ifdef mvaddch
-inline int UNDEF(mvaddch)(int y, int x, chtype ch)
-{ return mvaddch(y, x, ch); }
-#undef mvaddch
-#define mvaddch UNDEF(mvaddch)
-#endif
-
-#ifdef mvaddnstr
-inline int UNDEF(mvaddnstr)(int y, int x, const char *str, int n)
-{ return mvaddnstr(y, x, str, n); }
-#undef mvaddnstr
-#define mvaddnstr UNDEF(mvaddnstr)
-#endif
-
-#ifdef mvaddstr
-inline int UNDEF(mvaddstr)(int y, int x, const char * str)
-{ return mvaddstr(y, x, str); }
-#undef mvaddstr
-#define mvaddstr UNDEF(mvaddstr)
-#endif
-
-#ifdef mvchgat
-inline int UNDEF(mvchgat)(int y, int x, int n,
-			  attr_t attr, NCURSES_PAIRS_T color, const void *opts) {
-  return mvchgat(y, x, n, attr, color, opts); }
-#undef mvchgat
-#define mvchgat UNDEF(mvchgat)
-#endif
-
-#ifdef mvdelch
-inline int UNDEF(mvdelch)(int y, int x) { return mvdelch(y, x);}
-#undef mvdelch
-#define mvdelch UNDEF(mvdelch)
-#endif
-
-#ifdef mvgetch
-inline int UNDEF(mvgetch)(int y, int x) { return mvgetch(y, x);}
-#undef mvgetch
-#define mvgetch UNDEF(mvgetch)
-#endif
-
-#ifdef mvgetnstr
-inline int UNDEF(mvgetnstr)(int y, int x, char *str, int n) {
-  return mvgetnstr(y, x, str, n);}
-#undef mvgetnstr
-#define mvgetnstr UNDEF(mvgetnstr)
-#endif
-
-#ifdef mvgetstr
-inline int UNDEF(mvgetstr)(int y, int x, char *str) {return mvgetstr(y, x, str);}
-#undef mvgetstr
-#define mvgetstr UNDEF(mvgetstr)
-#endif
-
-#ifdef mvinch
-inline chtype UNDEF(mvinch)(int y, int x) { return mvinch(y, x);}
-#undef mvinch
-#define mvinch UNDEF(mvinch)
-#endif
-
-#ifdef mvinnstr
-inline int UNDEF(mvinnstr)(int y, int x, char *_str, int n) {
-  return mvinnstr(y, x, _str, n); }
-#undef mvinnstr
-#define mvinnstr UNDEF(mvinnstr)
-#endif
-
-#ifdef mvinsch
-inline int UNDEF(mvinsch)(int y, int x, chtype c)
-{ return mvinsch(y, x, c); }
-#undef mvinsch
-#define mvinsch UNDEF(mvinsch)
-#endif
-
-#ifdef mvinsnstr
-inline int UNDEF(mvinsnstr)(int y, int x, const char *_str, int n) {
-  return mvinsnstr(y, x, _str, n); }
-#undef mvinsnstr
-#define mvinsnstr UNDEF(mvinsnstr)
-#endif
-
-#ifdef mvinsstr
-inline int UNDEF(mvinsstr)(int y, int x, const char *_str)  {
-  return mvinsstr(y, x, _str); }
-#undef mvinsstr
-#define mvinsstr UNDEF(mvinsstr)
-#endif
-
-#ifdef mvwaddch
-inline int UNDEF(mvwaddch)(WINDOW *win, int y, int x, const chtype ch)
-{ return mvwaddch(win, y, x, ch); }
-#undef mvwaddch
-#define mvwaddch UNDEF(mvwaddch)
-#endif
-
-#ifdef mvwaddchnstr
-inline int UNDEF(mvwaddchnstr)(WINDOW *win, int y, int x, const chtype *str, int n)
-{ return mvwaddchnstr(win, y, x, str, n); }
-#undef mvwaddchnstr
-#define mvwaddchnstr UNDEF(mvwaddchnstr)
-#endif
-
-#ifdef mvwaddchstr
-inline int UNDEF(mvwaddchstr)(WINDOW *win, int y, int x, const chtype *str)
-{ return mvwaddchstr(win, y, x, str); }
-#undef mvwaddchstr
-#define mvwaddchstr UNDEF(mvwaddchstr)
-#endif
-
-#ifdef mvwaddnstr
-inline int UNDEF(mvwaddnstr)(WINDOW *win, int y, int x, const char *str, int n)
-{ return mvwaddnstr(win, y, x, str, n); }
-#undef mvwaddnstr
-#define mvwaddnstr UNDEF(mvwaddnstr)
-#endif
-
-#ifdef mvwaddstr
-inline int UNDEF(mvwaddstr)(WINDOW *win, int y, int x, const char * str)
-{ return mvwaddstr(win, y, x, str); }
-#undef mvwaddstr
-#define mvwaddstr UNDEF(mvwaddstr)
-#endif
-
-#ifdef mvwchgat
-inline int UNDEF(mvwchgat)(WINDOW *win, int y, int x, int n,
-			   attr_t attr, NCURSES_PAIRS_T color, const void *opts) {
-  return mvwchgat(win, y, x, n, attr, color, opts); }
-#undef mvwchgat
-#define mvwchgat UNDEF(mvwchgat)
-#endif
-
-#ifdef mvwdelch
-inline int UNDEF(mvwdelch)(WINDOW *win, int y, int x)
-{ return mvwdelch(win, y, x); }
-#undef mvwdelch
-#define mvwdelch UNDEF(mvwdelch)
-#endif
-
-#ifdef mvwgetch
-inline int UNDEF(mvwgetch)(WINDOW *win, int y, int x) { return mvwgetch(win, y, x);}
-#undef mvwgetch
-#define mvwgetch UNDEF(mvwgetch)
-#endif
-
-#ifdef mvwgetnstr
-inline int UNDEF(mvwgetnstr)(WINDOW *win, int y, int x, char *str, int n)
-{return mvwgetnstr(win, y, x, str, n);}
-#undef mvwgetnstr
-#define mvwgetnstr UNDEF(mvwgetnstr)
-#endif
-
-#ifdef mvwgetstr
-inline int UNDEF(mvwgetstr)(WINDOW *win, int y, int x, char *str)
-{return mvwgetstr(win, y, x, str);}
-#undef mvwgetstr
-#define mvwgetstr UNDEF(mvwgetstr)
-#endif
-
-#ifdef mvwhline
-inline int UNDEF(mvwhline)(WINDOW *win, int y, int x, chtype c, int n) {
-  return mvwhline(win, y, x, c, n); }
-#undef mvwhline
-#define mvwhline UNDEF(mvwhline)
-#endif
-
-#ifdef mvwinch
-inline chtype UNDEF(mvwinch)(WINDOW *win, int y, int x) {
-  return mvwinch(win, y, x);}
-#undef mvwinch
-#define mvwinch UNDEF(mvwinch)
-#endif
-
-#ifdef mvwinchnstr
-inline int UNDEF(mvwinchnstr)(WINDOW *win, int y, int x, chtype *str, int n)  { return mvwinchnstr(win, y, x, str, n); }
-#undef mvwinchnstr
-#define mvwinchnstr UNDEF(mvwinchnstr)
-#endif
-
-#ifdef mvwinchstr
-inline int UNDEF(mvwinchstr)(WINDOW *win, int y, int x, chtype *str)  { return mvwinchstr(win, y, x, str); }
-#undef mvwinchstr
-#define mvwinchstr UNDEF(mvwinchstr)
-#endif
-
-#ifdef mvwinnstr
-inline int UNDEF(mvwinnstr)(WINDOW *win, int y, int x, char *_str, int n) {
-  return mvwinnstr(win, y, x, _str, n); }
-#undef mvwinnstr
-#define mvwinnstr UNDEF(mvwinnstr)
-#endif
-
-#ifdef mvwinsch
-inline int UNDEF(mvwinsch)(WINDOW *win, int y, int x, chtype c)
-{ return mvwinsch(win, y, x, c); }
-#undef mvwinsch
-#define mvwinsch UNDEF(mvwinsch)
-#endif
-
-#ifdef mvwinsnstr
-inline int UNDEF(mvwinsnstr)(WINDOW *w, int y, int x, const char *_str, int n) {
-  return mvwinsnstr(w, y, x, _str, n); }
-#undef mvwinsnstr
-#define mvwinsnstr UNDEF(mvwinsnstr)
-#endif
-
-#ifdef mvwinsstr
-inline int UNDEF(mvwinsstr)(WINDOW *w, int y, int x,  const char *_str)  {
-  return mvwinsstr(w, y, x, _str); }
-#undef mvwinsstr
-#define mvwinsstr UNDEF(mvwinsstr)
-#endif
-
-#ifdef mvwvline
-inline int UNDEF(mvwvline)(WINDOW *win, int y, int x, chtype c, int n) {
-  return mvwvline(win, y, x, c, n); }
-#undef mvwvline
-#define mvwvline UNDEF(mvwvline)
-#endif
-
-#ifdef napms
-inline void UNDEF(napms)(unsigned long x) { napms(x); }
-#undef napms
-#define napms UNDEF(napms)
-#endif
-
-#ifdef nocrmode
-inline int UNDEF(nocrmode)(void) { return nocrmode(); }
-#undef nocrmode
-#define nocrmode UNDEF(nocrmode)
-#endif
-
-#ifdef nodelay
-inline void UNDEF(nodelay)() { nodelay(); }
-#undef nodelay
-#define nodelay UNDEF(nodelay)
-#endif
-
-#ifdef redrawwin
-inline int UNDEF(redrawwin)(WINDOW *win)  { return redrawwin(win); }
-#undef redrawwin
-#define redrawwin UNDEF(redrawwin)
-#endif
-
-#ifdef refresh
-inline int UNDEF(refresh)()  { return refresh(); }
-#undef refresh
-#define refresh UNDEF(refresh)
-#endif
-
-#ifdef resetterm
-inline int UNDEF(resetterm)(void) { return resetterm(); }
-#undef resetterm
-#define resetterm UNDEF(resetterm)
-#endif
-
-#ifdef saveterm
-inline int UNDEF(saveterm)(void) { return saveterm(); }
-#undef saveterm
-#define saveterm UNDEF(saveterm)
-#endif
-
-#ifdef scrl
-inline int UNDEF(scrl)(int l) { return scrl(l); }
-#undef scrl
-#define scrl UNDEF(scrl)
-#endif
-
-#ifdef scroll
-inline int UNDEF(scroll)(WINDOW *win) { return scroll(win); }
-#undef scroll
-#define scroll UNDEF(scroll)
-#endif
-
-#ifdef scrollok
-inline int UNDEF(scrollok)(WINDOW* win, bool bf)  { return scrollok(win, bf); }
-#undef scrollok
-#define scrollok UNDEF(scrollok)
-#else
-#if	defined(__NCURSES_H)
-extern "C" NCURSES_IMPEXP int NCURSES_API scrollok(WINDOW*, bool);
-#else
-extern "C" NCURSES_IMPEXP int NCURSES_API scrollok(WINDOW*, char);
-#endif
-#endif
-
-#ifdef setscrreg
-inline int UNDEF(setscrreg)(int t, int b) { return setscrreg(t, b); }
-#undef setscrreg
-#define setscrreg UNDEF(setscrreg)
-#endif
-
-#ifdef standend
-inline int UNDEF(standend)()  { return standend(); }
-#undef standend
-#define standend UNDEF(standend)
-#endif
-
-#ifdef standout
-inline int UNDEF(standout)()  { return standout(); }
-#undef standout
-#define standout UNDEF(standout)
-#endif
-
-#ifdef subpad
-inline WINDOW *UNDEF(subpad)(WINDOW *p, int l, int c, int y, int x)
-{ return derwin(p, l, c, y, x); }
-#undef subpad
-#define subpad UNDEF(subpad)
-#endif
-
-#ifdef timeout
-inline void UNDEF(timeout)(int delay) { timeout(delay); }
-#undef timeout
-#define timeout UNDEF(timeout)
-#endif
-
-#ifdef touchline
-inline int UNDEF(touchline)(WINDOW *win, int s, int c)
-{ return touchline(win, s, c); }
-#undef touchline
-#define touchline UNDEF(touchline)
-#endif
-
-#ifdef touchwin
-inline int UNDEF(touchwin)(WINDOW *win) { return touchwin(win); }
-#undef touchwin
-#define touchwin UNDEF(touchwin)
-#endif
-
-#ifdef untouchwin
-inline int UNDEF(untouchwin)(WINDOW *win) { return untouchwin(win); }
-#undef untouchwin
-#define untouchwin UNDEF(untouchwin)
-#endif
-
-#ifdef vline
-inline int UNDEF(vline)(chtype ch, int n) { return vline(ch, n); }
-#undef vline
-#define vline UNDEF(vline)
-#endif
-
-#ifdef waddchstr
-inline int UNDEF(waddchstr)(WINDOW *win, chtype *at) { return waddchstr(win, at); }
-#undef waddchstr
-#define waddchstr UNDEF(waddchstr)
-#endif
-
-#ifdef waddstr
-inline int UNDEF(waddstr)(WINDOW *win, char *str) { return waddstr(win, str); }
-#undef waddstr
-#define waddstr UNDEF(waddstr)
-#endif
-
-#ifdef wattroff
-inline int UNDEF(wattroff)(WINDOW *win, int att) { return wattroff(win, att); }
-#undef wattroff
-#define wattroff UNDEF(wattroff)
-#endif
-
-#ifdef wattrset
-inline int UNDEF(wattrset)(WINDOW *win, int att) { return wattrset(win, att); }
-#undef wattrset
-#define wattrset UNDEF(wattrset)
-#endif
-
-#ifdef winch
-inline chtype UNDEF(winch)(const WINDOW* win) { return winch(win); }
-#undef winch
-#define winch UNDEF(winch)
-#endif
-
-#ifdef winchnstr
-inline int UNDEF(winchnstr)(WINDOW *win, chtype *str, int n)  { return winchnstr(win, str, n); }
-#undef winchnstr
-#define winchnstr UNDEF(winchnstr)
-#endif
-
-#ifdef winchstr
-inline int UNDEF(winchstr)(WINDOW *win, chtype *str)  { return winchstr(win, str); }
-#undef winchstr
-#define winchstr UNDEF(winchstr)
-#endif
-
-#ifdef winsstr
-inline int UNDEF(winsstr)(WINDOW *w, const char *_str)  {
-  return winsstr(w, _str); }
-#undef winsstr
-#define winsstr UNDEF(winsstr)
-#endif
-
-#ifdef wstandend
-inline int UNDEF(wstandend)(WINDOW *win)  { return wstandend(win); }
-#undef wstandend
-#define wstandend UNDEF(wstandend)
-#endif
-
-#ifdef wstandout
-inline int UNDEF(wstandout)(WINDOW *win)  { return wstandout(win); }
-#undef wstandout
-#define wstandout UNDEF(wstandout)
-#endif
-
-/*
- *
- * C++ class for windows.
- *
- */
-
-extern "C" int     _nc_ripoffline(int, int (*init)(WINDOW*, int));
-extern "C" int     _nc_xx_ripoff_init(WINDOW *, int);
-extern "C" int     _nc_has_mouse(void);
-
-class NCURSES_IMPEXP NCursesWindow
-{
-  friend class NCursesMenu;
-  friend class NCursesForm;
-
-private:
-  static bool    b_initialized;
-  static void    initialize();
-  void           constructing();
-  friend int     _nc_xx_ripoff_init(WINDOW *, int);
-
-  void           set_keyboard();
-
-  NCURSES_COLOR_T getcolor(int getback) const;
-  NCURSES_PAIRS_T getPair() const;
-
-  static int     setpalette(NCURSES_COLOR_T fore, NCURSES_COLOR_T back, NCURSES_PAIRS_T pair);
-  static int     colorInitialized;
-
-  // This private constructor is only used during the initialization
-  // of windows generated by ripoffline() calls.
-  NCursesWindow(WINDOW* win, int ncols);
-
-protected:
-  virtual void   err_handler(const char *) const THROWS(NCursesException);
-  // Signal an error with the given message text.
-
-  static long count;        // count of all active windows:
-  //   We rely on the c++ promise that
-  //   all otherwise uninitialized
-  //   static class vars are set to 0
-
-  WINDOW*        w;                // the curses WINDOW
-
-  bool           alloced;          // TRUE if we own the WINDOW
-
-  NCursesWindow* par;              // parent, if subwindow
-  NCursesWindow* subwins;          // head of subwindows list
-  NCursesWindow* sib;              // next subwindow of parent
-
-  void           kill_subwindows(); // disable all subwindows
-  // Destroy all subwindows.
-
-  /* Only for use by derived classes. They are then in charge to
-     fill the member variables correctly. */
-  NCursesWindow();
-
-public:
-  NCursesWindow(WINDOW* window);   // useful only for stdscr
-
-  NCursesWindow(int nlines,        // number of lines
-		int ncols,         // number of columns
-		int begin_y,       // line origin
-		int begin_x);      // col origin
-
-  NCursesWindow(NCursesWindow& par,// parent window
-		int nlines,        // number of lines
-		int ncols,         // number of columns
-		int begin_y,       // absolute or relative
-		int begin_x,       //   origins:
-		char absrel = 'a');// if `a', begin_y & begin_x are
-  // absolute screen pos, else if `r', they are relative to par origin
-
-  NCursesWindow(NCursesWindow& par,// parent window
-		bool do_box = TRUE);
-  // this is the very common case that we want to create the subwindow that
-  // is two lines and two columns smaller and begins at (1,1).
-  // We may automatically request the box around it.
-
-  NCursesWindow& operator=(const NCursesWindow& rhs)
-  {
-    if (this != &rhs)
-      *this = rhs;
-    return *this;
-  }
-
-  NCursesWindow(const NCursesWindow& rhs)
-    : w(rhs.w), alloced(rhs.alloced), par(rhs.par), subwins(rhs.subwins), sib(rhs.sib)
-  {
-  }
-
-  virtual ~NCursesWindow();
-
-  NCursesWindow Clone();
-  // Make an exact copy of the window.
-
-  // Initialization.
-  static void    useColors(void);
-  // Call this routine very early if you want to have colors.
-
-  static int ripoffline(int ripoff_lines,
-			int (*init)(NCursesWindow& win));
-  // This function is used to generate a window of ripped-of lines.
-  // If the argument is positive, lines are removed from the top, if it
-  // is negative lines are removed from the bottom. This enhances the
-  // lowlevel ripoffline() function because it uses the internal
-  // implementation that allows to remove more than just a single line.
-  // This function must be called before any other ncurses function. The
-  // creation of the window is deferred until ncurses gets initialized.
-  // The initialization function is then called.
-
-  // -------------------------------------------------------------------------
-  // terminal status
-  // -------------------------------------------------------------------------
-  int            lines() const { initialize(); return LINES; }
-  // Number of lines on terminal, *not* window
-
-  int            cols() const { initialize(); return COLS; }
-  // Number of cols  on terminal, *not* window
-
-  int            tabsize() const { initialize(); return TABSIZE; }
-  // Size of a tab on terminal, *not* window
-
-  static int     NumberOfColors();
-  // Number of available colors
-
-  int            colors() const { return NumberOfColors(); }
-  // Number of available colors
-
-  // -------------------------------------------------------------------------
-  // window status
-  // -------------------------------------------------------------------------
-  int            height() const { return maxy() + 1; }
-  // Number of lines in this window
-
-  int            width() const { return maxx() + 1; }
-  // Number of columns in this window
-
-  int            begx() const { return getbegx(w); }
-  // Column of top left corner relative to stdscr
-
-  int            begy() const { return getbegy(w); }
-  // Line of top left corner relative to stdscr
-
-  int            curx() const { return getcurx(w); }
-  // Column of top left corner relative to stdscr
-
-  int            cury() const { return getcury(w); }
-  // Line of top left corner relative to stdscr
-
-  int            maxx() const { return getmaxx(w) == ERR ? ERR : getmaxx(w)-1; }
-  // Largest x coord in window
-
-  int            maxy() const { return getmaxy(w) == ERR ? ERR : getmaxy(w)-1; }
-  // Largest y coord in window
-
-  NCURSES_PAIRS_T getcolor() const;
-  // Actual color pair
-
-  NCURSES_COLOR_T foreground() const { return getcolor(0); }
-  // Actual foreground color
-
-  NCURSES_COLOR_T background() const { return getcolor(1); }
-  // Actual background color
-
-  int            setpalette(NCURSES_COLOR_T fore, NCURSES_COLOR_T back);
-  // Set color palette entry
-
-  int            setcolor(NCURSES_PAIRS_T pair);
-  // Set actually used palette entry
-
-  // -------------------------------------------------------------------------
-  // window positioning
-  // -------------------------------------------------------------------------
-  virtual int    mvwin(int begin_y, int begin_x) {
-    return ::mvwin(w, begin_y, begin_x); }
-  // Move window to new position with the new position as top left corner.
-  // This is virtual because it is redefined in NCursesPanel.
-
-  // -------------------------------------------------------------------------
-  // coordinate positioning
-  // -------------------------------------------------------------------------
-  int            move(int y, int x) { return ::wmove(w, y, x); }
-  // Move cursor the this position
-
-  void           getyx(int& y, int& x) const { ::getyx(w, y, x); }
-  // Get current position of the cursor
-
-  void           getbegyx(int& y, int& x) const { ::getbegyx(w, y, x); }
-  // Get beginning of the window
-
-  void           getmaxyx(int& y, int& x) const { ::getmaxyx(w, y, x); }
-  // Get size of the window
-
-  void           getparyx(int& y, int& x) const { ::getparyx(w, y, x); }
-  // Get parent's beginning of the window
-
-  int            mvcur(int oldrow, int oldcol, int newrow, int newcol) const {
-    return ::mvcur(oldrow, oldcol, newrow, newcol); }
-  // Perform lowlevel cursor motion that takes effect immediately.
-
-  // -------------------------------------------------------------------------
-  // input
-  // -------------------------------------------------------------------------
-  int            getch() { return ::wgetch(w); }
-  // Get a keystroke from the window.
-
-  int            getch(int y, int x) { return ::mvwgetch(w, y, x); }
-  // Move cursor to position and get a keystroke from the window
-
-  int            getstr(char* str, int n=-1) {
-    return ::wgetnstr(w, str, n); }
-  // Read a series of characters into str until a newline or carriage return
-  // is received. Read at most n characters. If n is negative, the limit is
-  // ignored.
-
-  int            getstr(int y, int x, char* str, int n=-1) {
-    return ::mvwgetnstr(w, y, x, str, n); }
-  // Move the cursor to the requested position and then perform the getstr()
-  // as described above.
-
-  int            instr(char *s, int n=-1) { return ::winnstr(w, s, n); }
-  // Get a string of characters from the window into the buffer s. Retrieve
-  // at most n characters, if n is negative retrieve all characters up to the
-  // end of the current line. Attributes are stripped from the characters.
-
-  int            instr(int y, int x, char *s, int n=-1) {
-    return ::mvwinnstr(w, y, x, s, n); }
-  // Move the cursor to the requested position and then perform the instr()
-  // as described above.
-
-  int            scanw(const char* fmt, ...)
-    // Perform a scanw function from the window.
-#if __GNUG__ >= 2
-    __attribute__ ((format (scanf, 2, 3)));
-#else
-  ;
-#endif
-
-  int            scanw(const char*, va_list);
-    // Perform a scanw function from the window.
-
-  int            scanw(int y, int x, const char* fmt, ...)
-    // Move the cursor to the requested position and then perform a scanw
-    // from the window.
-#if __GNUG__ >= 2
-    __attribute__ ((format (scanf, 4, 5)));
-#else
-  ;
-#endif
-
-  int            scanw(int y, int x, const char* fmt, va_list);
-    // Move the cursor to the requested position and then perform a scanw
-    // from the window.
-
-  // -------------------------------------------------------------------------
-  // output
-  // -------------------------------------------------------------------------
-  int            addch(const chtype ch) { return ::waddch(w, ch); }
-  // Put attributed character to the window.
-
-  int            addch(int y, int x, const chtype ch) {
-    return ::mvwaddch(w, y, x, ch); }
-  // Move cursor to the requested position and then put attributed character
-  // to the window.
-
-  int            echochar(const chtype ch) { return ::wechochar(w, ch); }
-  // Put attributed character to the window and refresh it immediately.
-
-  int            addstr(const char* str, int n=-1) {
-    return ::waddnstr(w, str, n); }
-  // Write the string str to the window, stop writing if the terminating
-  // NUL or the limit n is reached. If n is negative, it is ignored.
-
-  int            addstr(int y, int x, const char * str, int n=-1) {
-    return ::mvwaddnstr(w, y, x, str, n); }
-  // Move the cursor to the requested position and then perform the addchstr
-  // as described above.
-
-  int            addchstr(const chtype* str, int n=-1) {
-    return ::waddchnstr(w, str, n); }
-  // Write the string str to the window, stop writing if the terminating
-  // NUL or the limit n is reached. If n is negative, it is ignored.
-
-  int            addchstr(int y, int x, const chtype * str, int n=-1) {
-    return ::mvwaddchnstr(w, y, x, str, n); }
-  // Move the cursor to the requested position and then perform the addchstr
-  // as described above.
-
-  int            printw(const char* fmt, ...)
-    // Do a formatted print to the window.
-#if (__GNUG__ >= 2) && !defined(printf)
-    __attribute__ ((format (printf, 2, 3)));
-#else
-  ;
-#endif
-
-  int            printw(int y, int x, const char * fmt, ...)
-    // Move the cursor and then do a formatted print to the window.
-#if (__GNUG__ >= 2) && !defined(printf)
-    __attribute__ ((format (printf, 4, 5)));
-#else
-  ;
-#endif
-
-  int            printw(const char* fmt, va_list args);
-    // Do a formatted print to the window.
-
-  int            printw(int y, int x, const char * fmt, va_list args);
-    // Move the cursor and then do a formatted print to the window.
-
-  chtype         inch() const { return ::winch(w); }
-  // Retrieve attributed character under the current cursor position.
-
-  chtype         inch(int y, int x) { return ::mvwinch(w, y, x); }
-  // Move cursor to requested position and then retrieve attributed character
-  // at this position.
-
-  int            inchstr(chtype* str, int n=-1) {
-    return ::winchnstr(w, str, n); }
-  // Read the string str from the window, stop reading if the terminating
-  // NUL or the limit n is reached. If n is negative, it is ignored.
-
-  int            inchstr(int y, int x, chtype * str, int n=-1) {
-    return ::mvwinchnstr(w, y, x, str, n); }
-  // Move the cursor to the requested position and then perform the inchstr
-  // as described above.
-
-  int            insch(chtype ch) { return ::winsch(w, ch); }
-  // Insert attributed character into the window before current cursor
-  // position.
-
-  int            insch(int y, int x, chtype ch) {
-    return ::mvwinsch(w, y, x, ch); }
-  // Move cursor to requested position and then insert the attributed
-  // character before that position.
-
-  int            insertln() { return ::winsdelln(w, 1); }
-  // Insert an empty line above the current line.
-
-  int            insdelln(int n=1) { return ::winsdelln(w, n); }
-  // If n>0 insert that many lines above the current line. If n<0 delete
-  // that many lines beginning with the current line.
-
-  int            insstr(const char *s, int n=-1) {
-    return ::winsnstr(w, s, n); }
-  // Insert the string into the window before the current cursor position.
-  // Insert stops at end of string or when the limit n is reached. If n is
-  // negative, it is ignored.
-
-  int            insstr(int y, int x, const char *s, int n=-1) {
-    return ::mvwinsnstr(w, y, x, s, n); }
-  // Move the cursor to the requested position and then perform the insstr()
-  // as described above.
-
-  int            attron (chtype at) { return ::wattron (w, at); }
-  // Switch on the window attributes;
-
-  int            attroff(chtype at) { return ::wattroff(w, static_cast<int>(at)); }
-  // Switch off the window attributes;
-
-  int            attrset(chtype at) { return ::wattrset(w, static_cast<int>(at)); }
-  // Set the window attributes;
-
-  chtype         attrget() { return ::getattrs(w); }
-  // Get the window attributes;
-
-  int            color_set(NCURSES_PAIRS_T color_pair_number, void* opts=NULL) {
-    return ::wcolor_set(w, color_pair_number, opts); }
-  // Set the window color attribute;
-
-  int            chgat(int n, attr_t attr, NCURSES_PAIRS_T color, const void *opts=NULL) {
-    return ::wchgat(w, n, attr, color, opts); }
-  // Change the attributes of the next n characters in the current line. If
-  // n is negative or greater than the number of remaining characters in the
-  // line, the attributes will be changed up to the end of the line.
-
-  int            chgat(int y, int x,
-		       int n, attr_t attr, NCURSES_PAIRS_T color, const void *opts=NULL) {
-    return ::mvwchgat(w, y, x, n, attr, color, opts); }
-  // Move the cursor to the requested position and then perform chgat() as
-  // described above.
-
-  // -------------------------------------------------------------------------
-  // background
-  // -------------------------------------------------------------------------
-  chtype         getbkgd() const { return ::getbkgd(w); }
-  // Get current background setting.
-
-  int            bkgd(const chtype ch) { return ::wbkgd(w, ch); }
-  // Set the background property and apply it to the window.
-
-  void           bkgdset(chtype ch) { ::wbkgdset(w, ch); }
-  // Set the background property.
-
-  // -------------------------------------------------------------------------
-  // borders
-  // -------------------------------------------------------------------------
-  int            box(chtype vert=0, chtype  hor=0) {
-    return ::wborder(w, vert, vert, hor, hor, 0, 0, 0, 0); }
-  // Draw a box around the window with the given vertical and horizontal
-  // drawing characters. If you specify a zero as character, curses will try
-  // to find a "nice" character.
-
-  int            border(chtype left=0, chtype right=0,
-			chtype top =0, chtype bottom=0,
-			chtype top_left =0, chtype top_right=0,
-			chtype bottom_left =0, chtype bottom_right=0) {
-    return ::wborder(w, left, right, top, bottom, top_left, top_right,
-		     bottom_left, bottom_right); }
-  // Draw a border around the window with the given characters for the
-  // various parts of the border. If you pass zero for a character, curses
-  // will try to find "nice" characters.
-
-  // -------------------------------------------------------------------------
-  // lines and boxes
-  // -------------------------------------------------------------------------
-  int            hline(int len, chtype ch=0) { return ::whline(w, ch, len); }
-  // Draw a horizontal line of len characters with the given character. If
-  // you pass zero for the character, curses will try to find a "nice" one.
-
-  int            hline(int y, int x, int len, chtype ch=0) {
-    return ::mvwhline(w, y, x, ch, len); }
-  // Move the cursor to the requested position and then draw a horizontal line.
-
-  int            vline(int len, chtype ch=0) { return ::wvline(w, ch, len); }
-  // Draw a vertical line of len characters with the given character. If
-  // you pass zero for the character, curses will try to find a "nice" one.
-
-  int            vline(int y, int x, int len, chtype ch=0) {
-    return ::mvwvline(w, y, x, ch, len); }
-  // Move the cursor to the requested position and then draw a vertical line.
-
-  // -------------------------------------------------------------------------
-  // erasure
-  // -------------------------------------------------------------------------
-  int            erase() { return ::werase(w); }
-  // Erase the window.
-
-  int            clear() { return ::wclear(w); }
-  // Clear the window.
-
-  int            clearok(bool bf) { return ::clearok(w, bf); }
-  // Set/Reset the clear flag. If set, the next refresh() will clear the
-  // screen.
-
-  int            clrtobot() { return ::wclrtobot(w); }
-  // Clear to the end of the window.
-
-  int            clrtoeol() { return ::wclrtoeol(w); }
-  // Clear to the end of the line.
-
-  int            delch() { return ::wdelch(w); }
-  // Delete character under the cursor.
-
-  int            delch(int y, int x) { return ::mvwdelch(w, y, x); }
-  // Move cursor to requested position and delete the character under the
-  // cursor.
-
-  int            deleteln() { return ::winsdelln(w, -1); }
-  // Delete the current line.
-
-  // -------------------------------------------------------------------------
-  // screen control
-  // -------------------------------------------------------------------------
-  int            scroll(int amount=1) { return ::wscrl(w, amount); }
-  // Scroll amount lines. If amount is positive, scroll up, otherwise
-  // scroll down.
-
-  int            scrollok(bool bf) { return ::scrollok(w, bf); }
-  // If bf is TRUE, window scrolls if cursor is moved off the bottom
-  // edge of the window or a scrolling region, otherwise the cursor is left
-  // at the bottom line.
-
-  int            setscrreg(int from, int to) {
-    return ::wsetscrreg(w, from, to); }
-  // Define a soft scrolling region.
-
-  int            idlok(bool bf) { return ::idlok(w, bf); }
-  // If bf is TRUE, use insert/delete line hardware support if possible.
-  // Otherwise do it in software.
-
-  void           idcok(bool bf) { ::idcok(w, bf); }
-  // If bf is TRUE, use insert/delete character hardware support if possible.
-  // Otherwise do it in software.
-
-  int            touchline(int s, int c) { return ::touchline(w, s, c); }
-  // Mark the given lines as modified.
-
-  int            touchwin()   { return ::wtouchln(w, 0, height(), 1); }
-  // Mark the whole window as modified.
-
-  int            untouchwin() { return ::wtouchln(w, 0, height(), 0); }
-  // Mark the whole window as unmodified.
-
-  int            touchln(int s, int cnt, bool changed=TRUE) {
-    return ::wtouchln(w, s, cnt, static_cast<int>(changed ? 1 : 0)); }
-  // Mark cnt lines beginning from line s as changed or unchanged, depending
-  // on the value of the changed flag.
-
-  bool           is_linetouched(int line) const {
-    return (::is_linetouched(w, line) ? TRUE:FALSE); }
-  // Return TRUE if line is marked as changed, FALSE otherwise
-
-  bool           is_wintouched() const {
-    return (::is_wintouched(w) ? TRUE:FALSE); }
-  // Return TRUE if window is marked as changed, FALSE otherwise
-
-  int            leaveok(bool bf) { return ::leaveok(w, bf); }
-  // If bf is TRUE, curses will leave the cursor after an update whereever
-  // it is after the update.
-
-  int            redrawln(int from, int n) { return ::wredrawln(w, from, n); }
-  // Redraw n lines starting from the requested line
-
-  int            redrawwin() { return ::wredrawln(w, 0, height()); }
-  // Redraw the whole window
-
-  int            doupdate()  { return ::doupdate(); }
-  // Do all outputs to make the physical screen looking like the virtual one
-
-  void           syncdown()  { ::wsyncdown(w); }
-  // Propagate the changes down to all descendant windows
-
-  void           syncup()    { ::wsyncup(w); }
-  // Propagate the changes up in the hierarchy
-
-  void           cursyncup() { ::wcursyncup(w); }
-  // Position the cursor in all ancestor windows corresponding to our setting
-
-  int            syncok(bool bf) { return ::syncok(w, bf); }
-  // If called with bf=TRUE, syncup() is called whenever the window is changed
-
-#ifndef _no_flushok
-  int            flushok(bool bf) { return ::flushok(w, bf); }
-#endif
-
-  void           immedok(bool bf) { ::immedok(w, bf); }
-  // If called with bf=TRUE, any change in the window will cause an
-  // automatic immediate refresh()
-
-  int            intrflush(bool bf) { return ::intrflush(w, bf); }
-
-  int            keypad(bool bf) { return ::keypad(w, bf); }
-  // If called with bf=TRUE, the application will interpret function keys.
-
-  int            nodelay(bool bf) { return ::nodelay(w, bf); }
-
-  int            meta(bool bf) { return ::meta(w, bf); }
-  // If called with bf=TRUE, keys may generate 8-Bit characters. Otherwise
-  // 7-Bit characters are generated.
-
-  int            standout() { return ::wstandout(w); }
-  // Enable "standout" attributes
-
-  int            standend() { return ::wstandend(w); }
-  // Disable "standout" attributes
-
-  // -------------------------------------------------------------------------
-  // The next two are virtual, because we redefine them in the
-  // NCursesPanel class.
-  // -------------------------------------------------------------------------
-  virtual int    refresh() { return ::wrefresh(w); }
-  // Propagate the changes in this window to the virtual screen and call
-  // doupdate(). This is redefined in NCursesPanel.
-
-  virtual int    noutrefresh() { return ::wnoutrefresh(w); }
-  // Propagate the changes in this window to the virtual screen. This is
-  // redefined in NCursesPanel.
-
-  // -------------------------------------------------------------------------
-  // multiple window control
-  // -------------------------------------------------------------------------
-  int            overlay(NCursesWindow& win) {
-    return ::overlay(w, win.w); }
-  // Overlay this window over win.
-
-  int            overwrite(NCursesWindow& win) {
-    return ::overwrite(w, win.w); }
-  // Overwrite win with this window.
-
-  int            copywin(NCursesWindow& win,
-			 int sminrow, int smincol,
-			 int dminrow, int dmincol,
-			 int dmaxrow, int dmaxcol, bool overlaywin=TRUE) {
-    return ::copywin(w, win.w, sminrow, smincol, dminrow, dmincol,
-		     dmaxrow, dmaxcol, static_cast<int>(overlaywin ? 1 : 0)); }
-  // Overlay or overwrite the rectangle in win given by dminrow,dmincol,
-  // dmaxrow,dmaxcol with the rectangle in this window beginning at
-  // sminrow,smincol.
-
-  // -------------------------------------------------------------------------
-  // Extended functions
-  // -------------------------------------------------------------------------
-#if defined(NCURSES_EXT_FUNCS) && (NCURSES_EXT_FUNCS != 0)
-  int            wresize(int newLines, int newColumns) {
-    return ::wresize(w, newLines, newColumns); }
-#endif
-
-  // -------------------------------------------------------------------------
-  // Mouse related
-  // -------------------------------------------------------------------------
-  bool has_mouse() const;
-  // Return TRUE if terminal supports a mouse, FALSE otherwise
-
-  // -------------------------------------------------------------------------
-  // traversal support
-  // -------------------------------------------------------------------------
-  NCursesWindow*  child() { return subwins; }
-  // Get the first child window.
-
-  NCursesWindow*  sibling() { return sib; }
-  // Get the next child of my parent.
-
-  NCursesWindow*  parent() { return par; }
-  // Get my parent.
-
-  bool isDescendant(NCursesWindow& win);
-  // Return TRUE if win is a descendant of this.
-};
-
-// -------------------------------------------------------------------------
-// We leave this here for compatibility reasons.
-// -------------------------------------------------------------------------
-class NCURSES_IMPEXP NCursesColorWindow : public NCursesWindow
-{
-public:
-  NCursesColorWindow(WINDOW* &window)   // useful only for stdscr
-    : NCursesWindow(window) {
-      useColors(); }
-
-  NCursesColorWindow(int nlines,        // number of lines
-		     int ncols,         // number of columns
-		     int begin_y,       // line origin
-		     int begin_x)       // col origin
-    : NCursesWindow(nlines, ncols, begin_y, begin_x) {
-      useColors(); }
-
-  NCursesColorWindow(NCursesWindow& parentWin,// parent window
-		     int nlines,        // number of lines
-		     int ncols,         // number of columns
-		     int begin_y,       // absolute or relative
-		     int begin_x,       //   origins:
-		     char absrel = 'a') // if `a', by & bx are
-    : NCursesWindow(parentWin,
-		    nlines, ncols,	// absolute screen pos,
-		    begin_y, begin_x,   // else if `r', they are
-		    absrel ) {          // relative to par origin
-      useColors(); }
-};
-
-// These enum definitions really belong inside the NCursesPad class, but only
-// recent compilers support that feature.
-
-  typedef enum {
-    REQ_PAD_REFRESH = KEY_MAX + 1,
-    REQ_PAD_UP,
-    REQ_PAD_DOWN,
-    REQ_PAD_LEFT,
-    REQ_PAD_RIGHT,
-    REQ_PAD_EXIT
-  } Pad_Request;
-
-  const Pad_Request PAD_LOW  = REQ_PAD_REFRESH;   // lowest  op-code
-  const Pad_Request PAD_HIGH = REQ_PAD_EXIT;      // highest op-code
-
-// -------------------------------------------------------------------------
-// Pad Support. We allow an association of a pad with a "real" window
-// through which the pad may be viewed.
-// -------------------------------------------------------------------------
-class NCURSES_IMPEXP NCursesPad : public NCursesWindow
-{
-private:
-  NCursesWindow* viewWin;       // the "viewport" window
-  NCursesWindow* viewSub;       // the "viewport" subwindow
-
-  int h_gridsize, v_gridsize;
-
-protected:
-  int min_row, min_col;         // top left row/col of the pads display area
-
-  NCursesWindow* Win(void) const {
-    // Get the window into which the pad should be copied (if any)
-    return (viewSub?viewSub:(viewWin?viewWin:0));
-  }
-
-  NCursesWindow* getWindow(void) const {
-    return viewWin;
-  }
-
-  NCursesWindow* getSubWindow(void) const {
-    return viewSub;
-  }
-
-  virtual int driver (int key);      // Virtualize keystroke key
-  // The driver translates the keystroke c into an Pad_Request
-
-  virtual void OnUnknownOperation(int pad_req) {
-    (void) pad_req;
-    ::beep();
-  }
-  // This is called if the driver returns an unknown op-code
-
-  virtual void OnNavigationError(int pad_req) {
-    (void) pad_req;
-    ::beep();
-  }
-  // This is called if a navigation request couldn't be satisfied
-
-  virtual void OnOperation(int pad_req) {
-    (void) pad_req;
-  };
-  // OnOperation is called if a Pad_Operation was executed and just before
-  // the refresh() operation is done.
-
-public:
-  NCursesPad(int nlines, int ncols);
-  // create a pad with the given size
-
-  NCursesPad& operator=(const NCursesPad& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      NCursesWindow::operator=(rhs);
-    }
-    return *this;
-  }
-
-  NCursesPad(const NCursesPad& rhs)
-    : NCursesWindow(rhs),
-      viewWin(rhs.viewWin),
-      viewSub(rhs.viewSub),
-      h_gridsize(rhs.h_gridsize),
-      v_gridsize(rhs.v_gridsize),
-      min_row(rhs.min_row),
-      min_col(rhs.min_col)
-  {
-  }
-
-  virtual ~NCursesPad() {}
-
-  int echochar(const chtype ch) { return ::pechochar(w, ch); }
-  // Put the attributed character onto the pad and immediately do a
-  // prefresh().
-
-  int refresh();
-  // If a viewport is defined the pad is displayed in this window, otherwise
-  // this is a noop.
-
-  int refresh(int pminrow, int pmincol,
-	      int sminrow, int smincol,
-	      int smaxrow, int smaxcol) {
-    return ::prefresh(w, pminrow, pmincol,
-		      sminrow, smincol, smaxrow, smaxcol);
-  }
-  // The coordinates sminrow,smincol,smaxrow,smaxcol describe a rectangle
-  // on the screen. <b>refresh</b> copies a rectangle of this size beginning
-  // with top left corner pminrow,pmincol onto the screen and calls doupdate().
-
-  int noutrefresh();
-  // If a viewport is defined the pad is displayed in this window, otherwise
-  // this is a noop.
-
-  int noutrefresh(int pminrow, int pmincol,
-		  int sminrow, int smincol,
-		  int smaxrow, int smaxcol) {
-    return ::pnoutrefresh(w, pminrow, pmincol,
-			  sminrow, smincol, smaxrow, smaxcol);
-  }
-  // Does the same as refresh() but without calling doupdate().
-
-  virtual void setWindow(NCursesWindow& view, int v_grid = 1, int h_grid = 1);
-  // Add the window "view" as viewing window to the pad.
-
-  virtual void setSubWindow(NCursesWindow& sub);
-  // Use the subwindow "sub" of the viewport window for the actual viewing.
-  // The full viewport window is usually used to provide some decorations
-  // like frames, titles etc.
-
-  virtual void operator() (void);
-  // Perform Pad's operation
-};
-
-// A FramedPad is constructed always with a viewport window. This viewport
-// will be framed (by a box() command) and the interior of the box is the
-// viewport subwindow. On the frame we display scrollbar sliders.
-class NCURSES_IMPEXP NCursesFramedPad : public NCursesPad
-{
-protected:
-  virtual void OnOperation(int pad_req);
-
-public:
-  NCursesFramedPad(NCursesWindow& win, int nlines, int ncols,
-		   int v_grid = 1, int h_grid = 1)
-    : NCursesPad(nlines, ncols) {
-    NCursesPad::setWindow(win, v_grid, h_grid);
-    NCursesPad::setSubWindow(*(new NCursesWindow(win)));
-  }
-  // Construct the FramedPad with the given Window win as viewport.
-
-  virtual ~NCursesFramedPad() {
-    delete getSubWindow();
-  }
-
-  void setWindow(NCursesWindow& view, int v_grid = 1, int h_grid = 1) {
-    (void) view;
-    (void) v_grid;
-    (void) h_grid;
-    err_handler("Operation not allowed");
-  }
-  // Disable this call; the viewport is already defined
-
-  void setSubWindow(NCursesWindow& sub) {
-    (void) sub;
-    err_handler("Operation not allowed");
-  }
-  // Disable this call; the viewport subwindow is already defined
-
-};
-
-#endif /* NCURSES_CURSESW_H_incl */
diff --git a/openflow/usr/include/cursslk.h b/openflow/usr/include/cursslk.h
deleted file mode 100644
index 091695e..0000000
--- a/openflow/usr/include/cursslk.h
+++ /dev/null
@@ -1,238 +0,0 @@
-// * this is for making emacs happy: -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-// $Id: cursslk.h,v 1.13 2005/05/28 21:58:18 tom Exp $
-
-#ifndef NCURSES_CURSSLK_H_incl
-#define NCURSES_CURSSLK_H_incl
-
-#include <cursesw.h>
-
-class NCURSES_IMPEXP Soft_Label_Key_Set {
-public:
-  // This inner class represents the attributes of a Soft Label Key (SLK)
-  class NCURSES_IMPEXP Soft_Label_Key {
-    friend class Soft_Label_Key_Set;
-  public:
-    typedef enum { Left=0, Center=1, Right=2 } Justification;
-
-  private:
-    char *label;           // The Text of the Label
-    Justification format;  // The Justification
-    int num;               // The number of the Label
-
-    Soft_Label_Key() : label(NULL), format(Left), num(-1) {
-    }
-
-    virtual ~Soft_Label_Key() {
-      delete[] label;
-    };
-
-  public:
-    // Set the text of the Label
-    Soft_Label_Key& operator=(char *text);
-
-    // Set the Justification of the Label
-    Soft_Label_Key& operator=(Justification just) {
-      format = just;
-      return *this;
-    }
-
-    // Retrieve the text of the label
-    inline char* operator()(void) const {
-      return label;
-    }
-
-    Soft_Label_Key& operator=(const Soft_Label_Key& rhs)
-    {
-      if (this != &rhs) {
-        *this = rhs;
-      }
-      return *this;
-    }
-
-    Soft_Label_Key(const Soft_Label_Key& rhs)
-      : label(NULL),
-        format(rhs.format),
-        num(rhs.num)
-    {
-      *this = rhs.label;
-    }
-  };
-
-public:
-  typedef enum {
-    None                = -1,
-    Three_Two_Three     = 0,
-    Four_Four           = 1,
-    PC_Style            = 2,
-    PC_Style_With_Index = 3
-  } Label_Layout;
-
-private:
-  static long NCURSES_IMPEXP count;               // Number of Key Sets
-  static Label_Layout NCURSES_IMPEXP  format;     // Layout of the Key Sets
-  static int  NCURSES_IMPEXP num_labels;          // Number Of Labels in Key Sets
-  bool NCURSES_IMPEXP b_attrInit;                 // Are attributes initialized
-
-  Soft_Label_Key *slk_array;       // The array of SLK's
-
-  // Init the Key Set
-  void init();
-
-  // Activate or Deactivate Label# i, Label counting starts with 1!
-  void activate_label(int i, bool bf=TRUE);
-
-  // Activate of Deactivate all Labels
-  void activate_labels(bool bf);
-
-protected:
-  inline void Error (const char* msg) const THROWS(NCursesException) {
-    THROW(new NCursesException (msg));
-  }
-
-  // Remove SLK's from screen
-  void clear() {
-    if (ERR==::slk_clear())
-      Error("slk_clear");
-  }
-
-  // Restore them
-  void restore() {
-    if (ERR==::slk_restore())
-      Error("slk_restore");
-  }
-
-public:
-
-  // Construct a Key Set, use the most comfortable layout as default.
-  // You must create a Soft_Label_Key_Set before you create any object of
-  // the NCursesWindow, NCursesPanel or derived classes. (Actually before
-  // ::initscr() is called).
-  Soft_Label_Key_Set(Label_Layout fmt);
-
-  // This constructor assumes, that you already constructed a Key Set
-  // with a layout by the constructor above. This layout will be reused.
-  NCURSES_IMPEXP Soft_Label_Key_Set();
-
-  Soft_Label_Key_Set& operator=(const Soft_Label_Key_Set& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      init();		// allocate a new slk_array[]
-    }
-    return *this;
-  }
-
-  Soft_Label_Key_Set(const Soft_Label_Key_Set& rhs)
-    : b_attrInit(rhs.b_attrInit),
-      slk_array(NULL)
-  {
-    init();		// allocate a new slk_array[]
-  }
-
-  virtual ~Soft_Label_Key_Set();
-
-  // Get Label# i. Label counting starts with 1!
-  NCURSES_IMPEXP Soft_Label_Key& operator[](int i);
-
-  // Retrieve number of Labels
-  inline int labels() const { return num_labels; }
-
-  // Refresh the SLK portion of the screen
-  inline void refresh() {
-    if (ERR==::slk_refresh())
-      Error("slk_refresh");
-  }
-
-  // Mark the SLK portion of the screen for refresh, defer actual refresh
-  // until next update call.
-  inline void noutrefresh() {
-    if (ERR==::slk_noutrefresh())
-      Error("slk_noutrefresh");
-  }
-
-  // Mark the whole SLK portion of the screen as modified
-  inline void touch() {
-    if (ERR==::slk_touch())
-      Error("slk_touch");
-  }
-
-  // Activate Label# i
-  inline void show(int i) {
-    activate_label(i,FALSE);
-    activate_label(i,TRUE);
-  }
-
-  // Hide Label# i
-  inline void hide(int i) {
-    activate_label(i,FALSE);
-  }
-
-  // Show all Labels
-  inline void show() {
-    activate_labels(FALSE);
-    activate_labels(TRUE);
-  }
-
-  // Hide all Labels
-  inline void hide() {
-    activate_labels(FALSE);
-  }
-
-  inline void attron(attr_t attrs) {
-    if (ERR==::slk_attron(attrs))
-      Error("slk_attron");
-  }
-
-  inline void attroff(attr_t attrs) {
-    if (ERR==::slk_attroff(attrs))
-      Error("slk_attroff");
-  }
-
-  inline void attrset(attr_t attrs) {
-    if (ERR==::slk_attrset(attrs))
-      Error("slk_attrset");
-  }
-
-  inline void color(short color_pair_number) {
-    if (ERR==::slk_color(color_pair_number))
-      Error("slk_color");
-  }
-
-  inline attr_t attr() const {
-    return ::slk_attr();
-  }
-};
-
-#endif /* NCURSES_CURSSLK_H_incl */
diff --git a/openflow/usr/include/dbm.h b/openflow/usr/include/dbm.h
deleted file mode 100644
index 9812d55..0000000
--- a/openflow/usr/include/dbm.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* dbm.h  -  The include file for dbm users.  */
-
-/*  This file is part of GDBM, the GNU data base manager, by Philip A. Nelson.
-    Copyright (C) 1990, 1991, 1993  Free Software Foundation, Inc.
-
-    GDBM is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    GDBM is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GDBM; see the file COPYING.  If not, write to
-    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    You may contact the author by:
-       e-mail:  phil@cs.wwu.edu
-      us-mail:  Philip A. Nelson
-                Computer Science Department
-                Western Washington University
-                Bellingham, WA 98226
-       
-*************************************************************************/
-
-/* The data and key structure.  This structure is defined for compatibility. */
-typedef struct {
-	char *dptr;
-	int   dsize;
-      } datum;
-
-
-/* These are the routines in dbm. */
-
-extern int	dbminit ();
-
-extern datum	fetch ();
-
-extern int	store ();
-
-extern int	delete ();
-
-extern int	delete ();
-
-extern datum	firstkey ();
-
-extern datum	nextkey ();
-
-extern int	dbmclose ();
diff --git a/openflow/usr/include/dialog.h b/openflow/usr/include/dialog.h
deleted file mode 100644
index 78edee9..0000000
--- a/openflow/usr/include/dialog.h
+++ /dev/null
@@ -1,916 +0,0 @@
-/*
- *  $Id: dialog.h,v 1.273 2016/02/06 16:22:42 tom Exp $
- *
- *  dialog.h -- common declarations for all dialog modules
- *
- *  Copyright 2000-2015,2016	Thomas E. Dickey
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License, version 2.1
- *  as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to
- *	Free Software Foundation, Inc.
- *	51 Franklin St., Fifth Floor
- *	Boston, MA 02110, USA.
- *
- *  An earlier version of this program lists as authors
- *	Savio Lam (lam836@cs.cuhk.hk)
- */
-
-#ifndef DIALOG_H_included
-#define DIALOG_H_included 1
-/* *INDENT-OFF* */
-
-#include <dlg_config.h>
-
-#ifdef __hpux
-#define __HP_CURSES_COMPAT	/* workaround for getattrs, etc. */
-#endif
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <signal.h>	/* fork() etc. */
-#include <math.h>	/* sqrt() */
-
-/* header conflict with Solaris xpg4 versus <sys/regset.h> */
-#if defined(ERR) && (ERR == 13)
-#undef ERR
-#endif
-
-#if defined(DLG_HAVE_NCURSESW_NCURSES_H)
-#include <ncursesw/ncurses.h>
-#elif defined(DLG_HAVE_NCURSES_NCURSES_H)
-#include <ncurses/ncurses.h>
-#elif defined(DLG_HAVE_NCURSES_CURSES_H)
-#include <ncurses/curses.h>
-#elif defined(DLG_HAVE_NCURSES_H)
-#include <ncurses.h>
-#else
-#include <curses.h>
-#if defined(DLG_HAVE_UNCTRL_H)
-#include <unctrl.h> /* most curses.h headers include this, some do not */
-#endif
-#endif
-
-/* Solaris xpg4 renames these */
-#ifndef KEY_MAX
-#ifdef __KEY_MAX
-#define KEY_MAX __KEY_MAX
-#endif
-#endif
-
-#ifndef KEY_MIN
-#ifdef __KEY_MIN
-#define KEY_MIN __KEY_MIN
-#endif
-#endif
-
-/* possible conflicts with <term.h> which may be included in <curses.h> */
-#ifdef color_names
-#undef color_names
-#endif
-
-#ifdef buttons
-#undef buttons
-#endif
-
-#ifdef DLG_ENABLE_NLS
-#include <libintl.h>
-#include <langinfo.h>
-#define _(s) dgettext(DLG_PACKAGE, s)
-#else
-#undef _
-#define _(s) s
-#endif
-
-#ifndef GCC_PRINTFLIKE
-#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
-#endif
-
-#ifndef GCC_NORETURN
-#define GCC_NORETURN /*nothing*/
-#endif
-
-#ifndef GCC_UNUSED
-#define GCC_UNUSED /*nothing*/
-#endif
-
-#ifndef DLG_HAVE_WGET_WCH
-#undef DLG_USE_WIDE_CURSES
-#endif
-
-/*
- * FIXME: a configure check would be useful
- */
-#ifdef __hpux
-#undef ACS_UARROW
-#undef ACS_DARROW
-#undef ACS_BLOCK
-#endif
-
-/*
- * Change these if you want
- */
-#define USE_SHADOW TRUE
-#define USE_COLORS TRUE
-
-#ifdef DLG_HAVE_COLOR
-#define SCOLS	(COLS - (dialog_state.use_shadow ? 2 : 0))
-#define SLINES	(LINES - (dialog_state.use_shadow ? 1 : 0))
-#else
-#define SCOLS	COLS
-#define SLINES	LINES
-#endif
-
-#define DLG_EXIT_ESC		255
-#define DLG_EXIT_UNKNOWN	-2	/* never return this (internal use) */
-#define DLG_EXIT_ERROR		-1	/* the shell sees this as 255 */
-#define DLG_EXIT_OK		0
-#define DLG_EXIT_CANCEL		1
-#define DLG_EXIT_HELP		2
-#define DLG_EXIT_EXTRA		3
-#define DLG_EXIT_ITEM_HELP	4	/* actually DLG_EXIT_HELP */
-
-#define DLG_CTRL(n)	((n) & 0x1f)	/* CTRL is preferred, but conflicts */
-
-#define CHR_HELP	DLG_CTRL('E')
-#define CHR_BACKSPACE	DLG_CTRL('H')
-#define CHR_REPAINT	DLG_CTRL('L')
-#define CHR_KILL	DLG_CTRL('U')
-#define CHR_LITERAL	DLG_CTRL('V')
-#define CHR_DELETE	127
-#define CHR_NEXT	DLG_CTRL('N')
-#define CHR_PREVIOUS	DLG_CTRL('P')
-#define CHR_TRACE	DLG_CTRL('T')
-
-#define ESC		27
-#define TAB		DLG_CTRL('I')
-
-#define MARGIN 1
-#define GUTTER 2
-#define SHADOW_ROWS 1
-#define SHADOW_COLS 2
-#define ARROWS_COL  5
-
-#define MAX_LEN 2048
-#define BUF_SIZE (10L*1024)
-
-#undef  MIN
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-
-#undef  MAX
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-
-#define DEFAULT_SEPARATE_STR "\t"
-#define DEFAULT_ASPECT_RATIO 9
-/* how many spaces is a tab long (default)? */
-#define TAB_LEN 8
-#define WTIMEOUT_VAL        10	/* minimum amount of time needed for curses */
-
-#ifndef A_CHARTEXT
-#define A_CHARTEXT 0xff
-#endif
-
-#define CharOf(ch)  ((ch) & 0xff)
-
-#ifndef ACS_ULCORNER
-#define ACS_ULCORNER '+'
-#endif
-#ifndef ACS_LLCORNER
-#define ACS_LLCORNER '+'
-#endif
-#ifndef ACS_URCORNER
-#define ACS_URCORNER '+'
-#endif
-#ifndef ACS_LRCORNER
-#define ACS_LRCORNER '+'
-#endif
-#ifndef ACS_HLINE
-#define ACS_HLINE '-'
-#endif
-#ifndef ACS_VLINE
-#define ACS_VLINE '|'
-#endif
-#ifndef ACS_LTEE
-#define ACS_LTEE '+'
-#endif
-#ifndef ACS_RTEE
-#define ACS_RTEE '+'
-#endif
-#ifndef ACS_UARROW
-#define ACS_UARROW '^'
-#endif
-#ifndef ACS_DARROW
-#define ACS_DARROW 'v'
-#endif
-#ifndef ACS_BLOCK
-#define ACS_BLOCK '#'
-#endif
-
-/* these definitions may work for antique versions of curses */
-#ifndef DLG_HAVE_GETBEGYX
-#undef  getbegyx
-#define getbegyx(win,y,x)	(y = (win)?(win)->_begy:ERR, x = (win)?(win)->_begx:ERR)
-#endif
-
-#ifndef DLG_HAVE_GETMAXYX
-#undef  getmaxyx
-#define getmaxyx(win,y,x)	(y = (win)?(win)->_maxy:ERR, x = (win)?(win)->_maxx:ERR)
-#endif
-
-#ifndef DLG_HAVE_GETPARYX
-#undef  getparyx
-#define getparyx(win,y,x)	(y = (win)?(win)->_pary:ERR, x = (win)?(win)->_parx:ERR)
-#endif
-
-#if !defined(DLG_HAVE_WGETPARENT) && defined(DLG_HAVE_WINDOW__PARENT)
-#undef  wgetparent
-#define wgetparent(win)		((win) ? (win)->_parent : 0)
-#endif
-
-#if !defined(DLG_HAVE_WSYNCUP)
-#undef wsyncup
-#define wsyncup(win) /* nothing */
-#endif
-
-#if !defined(DLG_HAVE_WCURSYNCUP)
-#undef wcursyncup
-#define wcursyncup(win) /* nothing */
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* these definitions may be needed for bleeding-edge curses implementations */
-#if !(defined(DLG_HAVE_GETBEGX) && defined(DLG_HAVE_GETBEGY))
-#undef getbegx
-#undef getbegy
-#define getbegx(win) dlg_getbegx(win)
-#define getbegy(win) dlg_getbegy(win)
-extern int dlg_getbegx(WINDOW * /*win*/);
-extern int dlg_getbegy(WINDOW * /*win*/);
-#endif
-
-#if !(defined(DLG_HAVE_GETCURX) && defined(DLG_HAVE_GETCURY))
-#undef getcurx
-#undef getcury
-#define getcurx(win) dlg_getcurx(win)
-#define getcury(win) dlg_getcury(win)
-extern int dlg_getcurx(WINDOW * /*win*/);
-extern int dlg_getcury(WINDOW * /*win*/);
-#endif
-
-#if !(defined(DLG_HAVE_GETMAXX) && defined(DLG_HAVE_GETMAXY))
-#undef getmaxx
-#undef getmaxy
-#define getmaxx(win) dlg_getmaxx(win)
-#define getmaxy(win) dlg_getmaxy(win)
-extern int dlg_getmaxx(WINDOW * /*win*/);
-extern int dlg_getmaxy(WINDOW * /*win*/);
-#endif
-
-#if !(defined(DLG_HAVE_GETPARX) && defined(DLG_HAVE_GETPARY))
-#undef getparx
-#undef getpary
-#define getparx(win) dlg_getparx(win)
-#define getpary(win) dlg_getpary(win)
-extern int dlg_getparx(WINDOW * /*win*/);
-extern int dlg_getpary(WINDOW * /*win*/);
-#endif
-
-#if !(defined(DLG_HAVE_WGETPARENT) && defined(DLG_HAVE_WINDOW__PARENT))
-#undef wgetparent
-#define wgetparent(win) dlg_wgetparent(win)
-extern WINDOW * dlg_wgetparent(WINDOW * /*win*/);
-#endif
-
-/*
- * This is a list of "old" names, which should be helpful in updating
- * applications that use libdialog.  Starting with 2003/11/26, all exported
- * symbols from libdialog have "dlg_" prefix, or "dialog_" prefix or "_dialog"
- * suffix (or suffix "_dialog", e.g., init_dialog).
- */
-#ifdef __DIALOG_OLD_NAMES__
-#define color_table                       dlg_color_table
-#define attr_clear(win,h,w,a)             dlg_attr_clear(win,h,w,a)
-#define auto_size(t,s,h,w,xl,mc)          dlg_auto_size(t,s,h,w,xl,mc)
-#define auto_sizefile(t,f,h,w,xl,mc)      dlg_auto_sizefile(t,f,h,w,xl,mc)
-#define beeping()                         dlg_beeping()
-#define box_x_ordinate(w)                 dlg_box_x_ordinate(w)
-#define box_y_ordinate(h)                 dlg_box_y_ordinate(h)
-#define calc_listh(h,lh,in)               dlg_calc_listh(h,lh,in)
-#define calc_listw(in,items,group)        dlg_calc_listw(in,items,group)
-#define color_setup()                     dlg_color_setup()
-#define create_rc(f)                      dlg_create_rc(f)
-#define ctl_size(h,w)                     dlg_ctl_size(h,w)
-#define del_window(win)                   dlg_del_window(win)
-#define dialog_clear()                    dlg_clear()
-#define draw_bottom_box(win)              dlg_draw_bottom_box(win)
-#define draw_box(win,y,x,h,w,xc,bc)       dlg_draw_box(win,y,x,h,w,xc,bc)
-#define draw_shadow(win,h,w,y,x)          dlg_draw_shadow(win,h,w,y,x)
-#define draw_title(win,t)                 dlg_draw_title(win,t)
-#define exiterr                           dlg_exiterr
-#define killall_bg(n)                     dlg_killall_bg(n)
-#define mouse_bigregion(y,x)              dlg_mouse_bigregion(y,x)
-#define mouse_free_regions()              dlg_mouse_free_regions()
-#define mouse_mkbigregion(y,x,h,w,n,ix,iy,m) dlg_mouse_mkbigregion(y,x,h,w,n,ix,iy,m)
-#define mouse_mkregion(y,x,h,w,n)         dlg_mouse_mkregion(y,x,h,w,n)
-#define mouse_region(y,x)                 dlg_mouse_region(y,x)
-#define mouse_setbase(x,y)                dlg_mouse_setbase(x,y)
-#define mouse_setcode(c)                  dlg_mouse_setcode(c)
-#define mouse_wgetch(w,c)                 dlg_mouse_wgetch(w,c)
-#define new_window(h,w,y,x)               dlg_new_window(h,w,y,x)
-#define parse_rc()                        dlg_parse_rc()
-#define print_autowrap(win,s,h,w)         dlg_print_autowrap(win,s,h,w)
-#define print_size(h,w)                   dlg_print_size(h,w)
-#define put_backtitle()                   dlg_put_backtitle()
-#define strclone(cprompt)                 dlg_strclone(cprompt)
-#define sub_window(win,h,w,y,x)           dlg_sub_window(win,h,w,y,x)
-#define tab_correct_str(s)                dlg_tab_correct_str(s)
-#endif
-
-/*
- * Attribute names
- */
-#define DIALOG_ATR(n)                 dlg_color_table[n].atr
-
-#define screen_attr                   DIALOG_ATR(0)
-#define shadow_attr                   DIALOG_ATR(1)
-#define dialog_attr                   DIALOG_ATR(2)
-#define title_attr                    DIALOG_ATR(3)
-#define border_attr                   DIALOG_ATR(4)
-#define button_active_attr            DIALOG_ATR(5)
-#define button_inactive_attr          DIALOG_ATR(6)
-#define button_key_active_attr        DIALOG_ATR(7)
-#define button_key_inactive_attr      DIALOG_ATR(8)
-#define button_label_active_attr      DIALOG_ATR(9)
-#define button_label_inactive_attr    DIALOG_ATR(10)
-#define inputbox_attr                 DIALOG_ATR(11)
-#define inputbox_border_attr          DIALOG_ATR(12)
-#define searchbox_attr                DIALOG_ATR(13)
-#define searchbox_title_attr          DIALOG_ATR(14)
-#define searchbox_border_attr         DIALOG_ATR(15)
-#define position_indicator_attr       DIALOG_ATR(16)
-#define menubox_attr                  DIALOG_ATR(17)
-#define menubox_border_attr           DIALOG_ATR(18)
-#define item_attr                     DIALOG_ATR(19)
-#define item_selected_attr            DIALOG_ATR(20)
-#define tag_attr                      DIALOG_ATR(21)
-#define tag_selected_attr             DIALOG_ATR(22)
-#define tag_key_attr                  DIALOG_ATR(23)
-#define tag_key_selected_attr         DIALOG_ATR(24)
-#define check_attr                    DIALOG_ATR(25)
-#define check_selected_attr           DIALOG_ATR(26)
-#define uarrow_attr                   DIALOG_ATR(27)
-#define darrow_attr                   DIALOG_ATR(28)
-#define itemhelp_attr                 DIALOG_ATR(29)
-#define form_active_text_attr         DIALOG_ATR(30)
-#define form_text_attr                DIALOG_ATR(31)
-#define form_item_readonly_attr       DIALOG_ATR(32)
-#define gauge_attr                    DIALOG_ATR(33)
-#define border2_attr                  DIALOG_ATR(34)
-#define inputbox_border2_attr         DIALOG_ATR(35)
-#define searchbox_border2_attr        DIALOG_ATR(36)
-#define menubox_border2_attr          DIALOG_ATR(37)
-
-#define DLGK_max (KEY_MAX + 256)
-
-/*
- * Callbacks are used to implement the "background" tailbox.
- */
-struct _dlg_callback;
-
-typedef void (*DIALOG_FREEBACK) (struct _dlg_callback * /* p */);
-
-typedef struct _dlg_callback {
-    struct _dlg_callback *next;
-    FILE *input;
-    WINDOW *win;
-    bool keep_bg;	/* keep in background, on exit */
-    bool bg_task;	/* true if this is background task */
-    bool (*handle_getc)(struct _dlg_callback *p, int ch, int fkey, int *result);
-    bool keep_win;	/* true to not erase window on exit */
-    /* data for dlg_add_callback_ref */
-    struct _dlg_callback **caller;
-    DIALOG_FREEBACK freeback;
-    /* 1.1-20110107 */
-    bool (*handle_input)(struct _dlg_callback *p);
-    bool input_ready;
-} DIALOG_CALLBACK;
-
-typedef struct _dlg_windows {
-    struct _dlg_windows *next;
-    WINDOW *normal;
-    WINDOW *shadow;
-} DIALOG_WINDOWS;
-
-/*
- * Global variables, which are initialized as needed
- */
-typedef struct {
-    DIALOG_CALLBACK *getc_callbacks;
-    DIALOG_CALLBACK *getc_redirect;
-    DIALOG_WINDOWS *all_windows;
-    DIALOG_WINDOWS *all_subwindows;
-    FILE *output;		/* option "--output-fd fd" */
-    FILE *pipe_input;		/* used for gauge widget */
-    FILE *screen_output;	/* newterm(), etc. */
-    bool screen_initialized;
-    bool use_colors;		/* use colors by default? */
-    bool use_scrollbar;		/* option "--scrollbar" */
-    bool use_shadow;		/* shadow dialog boxes by default? */
-    bool visit_items;		/* option "--visit-items" */
-    char *separate_str;		/* option "--separate-widget string" */
-    int aspect_ratio;		/* option "--aspect ratio" */
-    int output_count;		/* # of widgets that may have done output */
-    int tab_len;		/* option "--tab-len n" */
-    /* 1.0-20070227 */
-    FILE *input;		/* option "--input-fd fd" */
-#ifdef DLG_HAVE_DLG_TRACE
-    FILE *trace_output;		/* option "--trace file" */
-#endif
-    /* 1.1-20110106 */
-    bool no_mouse;		/* option "--no-mouse" */
-    int visit_cols;		/* option "--visit-items" */
-    /* 1.2-20130922 */
-    bool finish_string;		/* caching optimization for gauge */
-    /* 1.2-20150125 */
-    bool plain_buttons;		/* true to suppress button-label highlight */
-} DIALOG_STATE;
-
-extern DIALOG_STATE dialog_state;
-
-/*
- * Global variables, which dialog resets before each widget
- */
-typedef struct {
-    bool beep_after_signal;	/* option "--beep-after" */
-    bool beep_signal;		/* option "--beep" */
-    bool begin_set;		/* option "--begin y x" was used */
-    bool cant_kill;		/* option "--no-kill" */
-    bool colors;		/* option "--colors" */
-    bool cr_wrap;		/* option "--cr-wrap" */
-    bool defaultno;		/* option "--defaultno" */
-    bool dlg_clear_screen;	/* option "--clear" */
-    bool extra_button;		/* option "--extra-button" */
-    bool help_button;		/* option "--help-button" */
-    bool help_status;		/* option "--help-status" */
-    bool input_menu;		/* menu vs inputmenu widget */
-    bool insecure;		/* option "--insecure" */
-    bool item_help;		/* option "--item-help" */
-    bool keep_window;		/* option "--keep-window" */
-    bool nocancel;		/* option "--no-cancel" */
-    bool nocollapse;		/* option "--no-collapse" */
-    bool print_siz;		/* option "--print-size" */
-    bool separate_output;	/* option "--separate-output" */
-    bool single_quoted;		/* option "--single-quoted" */
-    bool size_err;		/* option "--size-err" */
-    bool tab_correct;		/* option "--tab-correct" */
-    bool trim_whitespace;	/* option "--trim" */
-    char *backtitle;		/* option "--backtitle backtitle" */
-    char *cancel_label;		/* option "--cancel-label string" */
-    char *default_item;		/* option "--default-item string" */
-    char *exit_label;		/* option "--exit-label string" */
-    char *extra_label;		/* option "--extra-label string" */
-    char *help_label;		/* option "--help-label string" */
-    char *input_result;
-    char *no_label;		/* option "--no-label string" */
-    char *ok_label;		/* option "--ok-label string" */
-    char *title;		/* option "--title title" */
-    char *yes_label;		/* option "--yes-label string" */
-    int begin_x;		/* option "--begin y x" (second value) */
-    int begin_y;		/* option "--begin y x" (first value) */
-    int max_input;		/* option "--max-input size" */
-    int scale_factor;		/* RESERVED */
-    int sleep_secs;		/* option "--sleep secs" */
-    int timeout_secs;		/* option "--timeout secs" */
-    unsigned input_length;	/* nonzero if input_result is allocated */
-    /* 1.0-20051207 */
-    unsigned formitem_type;	/* DIALOG_FORMITEM.type in dialog_form() */
-    /* 1.1-20070227 */
-    bool keep_tite;		/* option "--keep-tite" */
-    bool ascii_lines;		/* option "--ascii-lines" */
-    bool no_lines;		/* option "--no-lines" */
-    /* 1.1-20070930 */
-    bool nook;			/* option "--no-ok" */
-    /* 1.1-20080727 */
-    bool quoted;		/* option "--quoted" */
-    char *column_header;	/* RESERVED "--column-header" */
-    char *column_separator;	/* option "--column-separator" */
-    char *output_separator;	/* option "--output-separator" */
-    /* 1.1-20100118 */
-    char *date_format;		/* option "--date-format" */
-    char *time_format;		/* option "--time-format" */
-    /* 1.1-20110629 */
-    char *help_line;		/* option "--hline" */
-    char *help_file;		/* option "--hfile" */
-    bool in_helpfile;		/* flag to prevent recursion in --hfile */
-    bool no_nl_expand;		/* option "--no-nl-expand" */
-    /* 1.1-20120701 */
-    int default_button;		/* option "--default-button" (exit code) */
-    /* 1.1-20121218 */
-    bool no_tags;		/* option "--no-tags" */
-    bool no_items;		/* option "--no-items" */
-    /* 1.2-20130315 */
-    bool last_key;		/* option "--last-key" */
-    /* 1.2-20130902 */
-    bool help_tags;		/* option "--help-tags" */
-    /* 1.3-20160126 */
-    char *week_start;		/* option "--week-start" */
-    /* 1.3-20160206 */
-    bool iso_week;		/* option "--iso-week" */
-} DIALOG_VARS;
-
-#define USE_ITEM_HELP(s)        (dialog_vars.item_help && (s) != 0)
-
-/*
- * Some settings change the number of data items per row which dialog reads
- * from a script.
- */
-#define DLG__NO_ITEMS		(dialog_vars.no_items ? 0 : 1)
-#define DLG__ITEM_HELP          (dialog_vars.item_help ? 1 : 0)
-
-/*
- * These are the total number of data items per row used for each widget type.
- */
-#define CHECKBOX_TAGS           (2 + DLG__ITEM_HELP + DLG__NO_ITEMS)
-#define MENUBOX_TAGS            (1 + DLG__ITEM_HELP + DLG__NO_ITEMS)
-#define FORMBOX_TAGS            (8 + DLG__ITEM_HELP)
-#define MIXEDFORM_TAGS          (1 + FORMBOX_TAGS)
-#define MIXEDGAUGE_TAGS         2
-#define TREEVIEW_TAGS           (3 + DLG__ITEM_HELP + DLG__NO_ITEMS)
-
-extern DIALOG_VARS dialog_vars;
-
-#ifndef DLG_HAVE_TYPE_CHTYPE
-#define chtype long
-#endif
-
-#define UCH(ch)			((unsigned char)(ch))
-
-#define assert_ptr(ptr,msg) if ((ptr) == 0) dlg_exiterr("cannot allocate memory in " msg)
-
-#define dlg_malloc(t,n)    (t *) malloc((size_t)(n) * sizeof(t))
-#define dlg_calloc(t,n)    (t *) calloc((size_t)(n), sizeof(t))
-#define dlg_realloc(t,n,p) (t *) realloc((p), (n) * sizeof(t))
-
-/*
- * Table for attribute- and color-values.
- */
-typedef struct {
-    chtype atr;
-#ifdef DLG_HAVE_COLOR
-    int fg;
-    int bg;
-    int hilite;
-#endif
-#ifdef DLG_HAVE_RC_FILE
-    const char *name;
-    const char *comment;
-#endif
-} DIALOG_COLORS;
-
-extern DIALOG_COLORS dlg_color_table[];
-
-/*
- * Function prototypes
- */
-extern const char *dialog_version(void);
-
-/* widgets, each in separate files */
-extern int dialog_buildlist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, char ** /*items*/, int /*order_mode*/);
-extern int dialog_calendar(const char * /*title*/, const char * /*subtitle*/, int /*height*/, int /*width*/, int /*day*/, int /*month*/, int /*year*/);
-extern int dialog_checklist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, char ** /*items*/, int /*flag*/);
-extern int dialog_dselect(const char * /*title*/, const char * /*path*/, int /*height*/, int /*width*/);
-extern int dialog_editbox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/);
-extern int dialog_form(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*form_height*/, int /*item_no*/, char ** /*items*/);
-extern int dialog_fselect(const char * /*title*/, const char * /*path*/, int /*height*/, int /*width*/);
-extern int dialog_gauge(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*percent*/);
-extern int dialog_helpfile(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/);
-extern int dialog_inputbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, const char * /*init*/, const int /*password*/);
-extern int dialog_menu(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*menu_height*/, int /*item_no*/, char ** /*items*/);
-extern int dialog_mixedform(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*form_height*/, int /*item_no*/, char ** /*items*/);
-extern int dialog_mixedgauge(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*percent*/, int /*item_no*/, char ** /*items*/);
-extern int dialog_msgbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*pauseopt*/);
-extern int dialog_pause(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*seconds*/);
-extern int dialog_prgbox(const char * /*title*/, const char * /*cprompt*/, const char * /*command*/, int /*height*/, int /*width*/, int /*pauseopt*/);
-extern int dialog_progressbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/);
-extern int dialog_rangebox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/, int /*min_value*/, int /*max_value*/, int /*default_value*/);
-extern int dialog_tailbox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/, int /*bg_task*/);
-extern int dialog_textbox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/);
-extern int dialog_timebox(const char * /*title*/, const char * /*subtitle*/, int /*height*/, int /*width*/, int /*hour*/, int /*minute*/, int /*second*/);
-extern int dialog_treeview(const char * /*title*/, const char * /*subtitle*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, char ** /*items*/, int /*flag*/);
-extern int dialog_yesno(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/);
-
-/* some widgets have alternate entrypoints, to allow list manipulation */
-typedef struct {
-    char *name;
-    char *text;
-    char *help;
-    int state;
-} DIALOG_LISTITEM;
-
-typedef struct {
-    unsigned type;		/* the field type (0=input, 1=password) */
-    char *name;			/* the field label */
-    int name_len;		/* ...its length */
-    int name_y;			/* ...its y-ordinate */
-    int name_x;			/* ...its x-ordinate */
-    bool name_free;		/* ...true if .name can be freed */
-    char *text;			/* the field contents */
-    int text_len;		/* ...its length on the screen */
-    int text_y;			/* ...its y-ordinate */
-    int text_x;			/* ...its x-ordinate */
-    int text_flen;		/* ...its length on screen, or 0 if no input allowed */
-    int text_ilen;		/* ...its limit on amount to be entered */
-    bool text_free;		/* ...true if .text can be freed */
-    char *help;			/* help-message, if any */
-    bool help_free;		/* ...true if .help can be freed */
-} DIALOG_FORMITEM;
-
-typedef	int (DIALOG_INPUTMENU) (DIALOG_LISTITEM * /*items*/, int /*current*/, char * /*newtext*/);
-
-extern int dlg_checklist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, const char * /*states*/, int /*flag*/, int * /*current_item*/);
-extern int dlg_form(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*form_height*/, int /*item_no*/, DIALOG_FORMITEM * /*items*/, int * /*current_item*/);
-extern int dlg_menu(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*menu_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, int * /*current_item*/, DIALOG_INPUTMENU /*rename_menu*/);
-extern int dlg_progressbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*pauseopt*/, FILE * /* fp */);
-
-/* argv.c */
-extern char ** dlg_string_to_argv(char * /* blob */);
-extern int dlg_count_argv(char ** /* argv */);
-extern int dlg_eat_argv(int * /* argcp */, char *** /* argvp */, int /* start */, int /* count */);
-
-/* arrows.c */
-extern void dlg_draw_arrows(WINDOW * /*dialog*/, int /*top_arrow*/, int /*bottom_arrow*/, int /*x*/, int /*top*/, int /*bottom*/);
-extern void dlg_draw_arrows2(WINDOW * /*dialog*/, int /*top_arrow*/, int /*bottom_arrow*/, int /*x*/, int /*top*/, int /*bottom*/, chtype /*attr*/, chtype /*borderattr*/);
-extern void dlg_draw_helpline(WINDOW * /*dialog*/, bool /*decorations*/);
-extern void dlg_draw_scrollbar(WINDOW * /*dialog*/, long /* first_data */, long /* this_data */, long /* next_data */, long /* total_data */, int /* left */, int /* right */, int /*top*/, int /*bottom*/, chtype /*attr*/, chtype /*borderattr*/);
-
-/* buildlist.c */
-extern int dlg_buildlist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, const char * /*states*/, int /*order_mode*/, int * /*current_item*/);
-
-/* buttons.c */
-extern const char ** dlg_exit_label(void);
-extern const char ** dlg_ok_label(void);
-extern const char ** dlg_ok_labels(void);
-extern const char ** dlg_yes_labels(void);
-extern int dlg_button_count(const char ** /*labels*/);
-extern int dlg_button_to_char(const char * /*label*/);
-extern int dlg_button_x_step(const char ** /*labels*/, int /*limit*/, int * /*gap*/, int * /*margin*/, int * /*step*/);
-extern int dlg_char_to_button(int /*ch*/, const char ** /*labels*/);
-extern int dlg_exit_buttoncode(int /*button*/);
-extern int dlg_match_char(int /*ch*/, const char * /*string*/);
-extern int dlg_next_button(const char ** /*labels*/, int /*button*/);
-extern int dlg_next_ok_buttonindex(int /*current*/, int /*extra*/);
-extern int dlg_ok_buttoncode(int /*button*/);
-extern int dlg_prev_button(const char ** /*labels*/, int /*button*/);
-extern int dlg_prev_ok_buttonindex(int /*current*/, int /*extra*/);
-extern int dlg_yes_buttoncode(int /*button*/);
-extern void dlg_button_layout(const char ** /*labels*/, int * /*limit*/);
-extern void dlg_button_sizes(const char ** /*labels*/, int /*vertical*/, int * /*longest*/, int * /*length*/);
-extern void dlg_draw_buttons(WINDOW * /*win*/, int /*y*/, int /*x*/, const char ** /*labels*/, int /*selected*/, int /*vertical*/, int /*limit*/);
-
-/* columns.c */
-extern void dlg_align_columns(char ** /* target */, int  /* per_row */, int /* num_rows */);
-extern void dlg_free_columns(char ** /* target */, int  /* per_row */, int /* num_rows */);
-
-/* editbox.c */
-extern int dlg_editbox(const char * /*title*/, char *** /*list*/, int * /*rows*/, int /*height*/, int /*width*/);
-
-/* formbox.c */
-extern int dlg_default_formitem(DIALOG_FORMITEM * /*items*/);
-extern int dlg_ordinate(const char * /*s*/);
-extern void dlg_free_formitems(DIALOG_FORMITEM * /*items*/);
-
-/* guage.c */
-extern void * dlg_allocate_gauge(const char * /* title */, const char * /* cprompt */, int /* height */, int /* width */, int /* percent */);
-extern void * dlg_reallocate_gauge(void * /* objptr */, const char * /* title */, const char * /* cprompt */, int /* height */, int /* width */, int /* percent */);
-extern void dlg_free_gauge(void * /* objptr */);
-extern void dlg_update_gauge(void * /* objptr */, int /* percent */);
-
-/* inputstr.c */
-extern bool dlg_edit_string(char * /*string*/, int * /*offset*/, int /*key*/, int /*fkey*/, bool /*force*/);
-extern const int * dlg_index_columns(const char * /*string*/);
-extern const int * dlg_index_wchars(const char * /*string*/);
-extern int dlg_count_columns(const char * /*string*/);
-extern int dlg_count_wchars(const char * /*string*/);
-extern int dlg_edit_offset(char * /*string*/, int /*offset*/, int /*x_last*/);
-extern int dlg_find_index(const int * /*list*/, int  /*limit*/, int /*to_find*/);
-extern int dlg_limit_columns(const char * /*string*/, int /*limit*/, int /*offset*/);
-extern void dlg_finish_string(const char * /* string */);
-extern void dlg_show_string(WINDOW * /*win*/, const char * /*string*/, int /*offset*/, chtype /*attr*/, int /*y_base*/, int /*x_base*/, int /*x_last*/, bool /*hidden*/, bool /*force*/);
-
-/* menubox.c */
-extern int dlg_dummy_menutext(DIALOG_LISTITEM * /*items*/, int /*current*/, char * /*newtext*/);
-extern int dlg_renamed_menutext(DIALOG_LISTITEM * /*items*/, int /*current*/, char * /*newtext*/);
-
-/* prgbox.c */
-extern FILE * dlg_popen(const char * /*command */, const char * /*type */);
-
-/* rc.c */
-#ifdef DLG_HAVE_RC_FILE
-extern int dlg_parse_rc(void);
-extern void dlg_create_rc(const char * /*filename*/);
-#endif
-
-/* treeview.c */
-extern int dlg_treeview(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, const char * /*states*/, int * /*depths*/, int /*flag*/, int * /*current_item*/);
-
-/* ui_getc.c */
-extern int dlg_getc(WINDOW * /*win*/, int * /*fkey*/);
-extern int dlg_getc_callbacks(int /*ch*/, int /*fkey*/, int * /*result*/);
-extern int dlg_last_getc(void);
-extern void dlg_add_last_key(int /*mode*/);
-extern void dlg_add_callback(DIALOG_CALLBACK * /*p*/);
-extern void dlg_add_callback_ref(DIALOG_CALLBACK ** /*p*/, DIALOG_FREEBACK /* cleanup */);
-extern void dlg_flush_getc(void);
-extern void dlg_remove_callback(DIALOG_CALLBACK * /*p*/);
-extern void dlg_killall_bg(int *retval);
-
-/* util.c */
-extern WINDOW * dlg_new_modal_window(WINDOW * /*parent*/, int /*height*/, int /*width*/, int /*y*/, int /*x*/);
-extern WINDOW * dlg_new_window(int /*height*/, int /*width*/, int /*y*/, int /*x*/);
-extern WINDOW * dlg_sub_window(WINDOW * /*win*/, int /*height*/, int /*width*/, int /*y*/, int /*x*/);
-extern bool dlg_need_separator(void);
-extern char * dlg_set_result(const char * /*string*/);
-extern char * dlg_strclone(const char * /*cprompt*/);
-extern char * dlg_strempty(void);
-extern chtype dlg_asciibox(chtype /*ch*/);
-extern chtype dlg_boxchar(chtype /*ch*/);
-extern chtype dlg_get_attrs(WINDOW * /*win*/);
-extern const char * dlg_print_line(WINDOW * /*win*/, chtype * /*attr*/, const char * /*prompt*/, int /*lm*/, int /*rm*/, int * /*x*/);
-extern int dlg_box_x_ordinate(int /*width*/);
-extern int dlg_box_y_ordinate(int /*height*/);
-extern int dlg_calc_list_width(int /*item_no*/, DIALOG_LISTITEM * /*items*/);
-extern int dlg_calc_listw(int /*item_no*/, char ** /*items*/, int /*group*/);
-extern int dlg_check_scrolled(int /* key */, int /* last */, int /* page */, bool * /* show */, int * /* offset */);
-extern int dlg_count_real_columns(const char * /*text*/);
-extern int dlg_default_item(char ** /*items*/, int /*llen*/);
-extern int dlg_default_listitem(DIALOG_LISTITEM * /*items*/);
-extern int dlg_defaultno_button(void);
-extern int dlg_default_button(void);
-extern int dlg_max_input(int /*max_len*/);
-extern int dlg_print_scrolled(WINDOW * /* win */, const char * /* prompt */, int /* offset */, int /* height */, int /* width */, int /* pauseopt */);
-extern void dlg_add_help_formitem(int * /* result */, char ** /* tag */, DIALOG_FORMITEM * /* item */);
-extern void dlg_add_help_listitem(int * /* result */, char ** /* tag */, DIALOG_LISTITEM * /* item */);
-extern void dlg_add_quoted(char * /*string*/);
-extern void dlg_add_result(const char * /*string*/);
-extern void dlg_add_separator(void);
-extern void dlg_add_string(char * /*string*/);
-extern void dlg_attr_clear(WINDOW * /*win*/, int /*height*/, int /*width*/, chtype /*attr*/);
-extern void dlg_auto_size(const char * /*title*/, const char * /*prompt*/, int * /*height*/, int * /*width*/, int /*boxlines*/, int /*mincols*/);
-extern void dlg_auto_sizefile(const char * /*title*/, const char * /*file*/, int * /*height*/, int * /*width*/, int /*boxlines*/, int /*mincols*/);
-extern void dlg_beeping(void);
-extern void dlg_calc_listh(int * /*height*/, int * /*list_height*/, int /*item_no*/);
-extern void dlg_clear(void);
-extern void dlg_clr_result(void);
-extern void dlg_ctl_size(int /*height*/, int /*width*/);
-extern void dlg_del_window(WINDOW * /*win*/);
-extern void dlg_does_output(void);
-extern void dlg_draw_bottom_box(WINDOW * /*win*/);
-extern void dlg_draw_bottom_box2(WINDOW * /*win*/, chtype /*on_left*/, chtype /*on_right*/, chtype /*on_inside*/);
-extern void dlg_draw_box(WINDOW * /*win*/, int /*y*/, int /*x*/, int /*height*/, int /*width*/, chtype /*boxchar*/, chtype /*borderchar*/);
-extern void dlg_draw_box2(WINDOW * /*win*/, int /*y*/, int /*x*/, int /*height*/, int /*width*/, chtype /*boxchar*/, chtype /*borderchar*/, chtype /*borderchar2*/);
-extern void dlg_draw_title(WINDOW *win, const char *title);
-extern void dlg_exit(int /*code*/) GCC_NORETURN;
-extern void dlg_item_help(const char * /*txt*/);
-extern void dlg_print_autowrap(WINDOW * /*win*/, const char * /*prompt*/, int /*height*/, int /*width*/);
-extern void dlg_print_listitem(WINDOW * /*win*/, const char * /*text*/, int /*climit*/, bool /*first*/, int /*selected*/);
-extern void dlg_print_size(int /*height*/, int /*width*/);
-extern void dlg_print_text(WINDOW * /*win*/, const char * /*txt*/, int /*len*/, chtype * /*attr*/);
-extern void dlg_put_backtitle(void);
-extern void dlg_restore_vars(DIALOG_VARS * /* save */);
-extern void dlg_save_vars(DIALOG_VARS * /* save */);
-extern void dlg_set_focus(WINDOW * /*parent*/, WINDOW * /*win*/);
-extern void dlg_tab_correct_str(char * /*prompt*/);
-extern void dlg_trim_string(char * /*src*/);
-extern void end_dialog(void);
-extern void init_dialog(FILE * /*input*/, FILE * /*output*/);
-
-extern void dlg_exiterr(const char *, ...) GCC_NORETURN GCC_PRINTFLIKE(1,2);
-
-#ifdef DLG_HAVE_COLOR
-extern chtype dlg_color_pair(int /*foreground*/, int /*background*/);
-extern int dlg_color_count(void);
-extern void dlg_color_setup(void);
-extern void dlg_draw_shadow(WINDOW * /*win*/, int /*height*/, int /*width*/, int /*y*/, int /*x*/);
-#endif
-
-#ifdef DLG_HAVE_STRCASECMP
-#define dlg_strcmp(a,b) strcasecmp(a,b)
-#else
-extern int dlg_strcmp(const char * /*a*/, const char * /*b*/);
-#endif
-
-#ifdef DLG_HAVE_DLG_TRACE
-#define DLG_TRACE(params) dlg_trace_msg params
-extern void dlg_trace_msg(const char *fmt, ...) GCC_PRINTFLIKE(1,2);
-extern void dlg_trace_win(WINDOW * /*win*/);
-extern void dlg_trace_chr(int /*ch*/, int /*fkey*/);
-extern void dlg_trace(const char * /*fname*/);
-#else
-#define DLG_TRACE(params) /* nothing */
-#define dlg_trace_win(win) /* nothing */
-#define dlg_trace_chr(ch,fkey) /* nothing */
-#define dlg_trace(fname) /* nothing */
-#endif
-
-#ifdef KEY_RESIZE
-extern void dlg_move_window(WINDOW * /*win*/, int /*height*/, int /*width*/, int /*y*/, int /*x*/);
-#endif
-
-/*
- * Normally "enter" means "ok".  Use this macro to handle the explicit
- * check for DLGK_ENTER:
- */
-#define dlg_enter_buttoncode(code) (dialog_vars.nook ? DLG_EXIT_OK : dlg_ok_buttoncode(code))
-
-/*
- * The following stuff is needed for mouse support
- */
-typedef struct mseRegion {
-    int x, y, X, Y, code;
-    int mode, step_x, step_y;
-    struct mseRegion *next;
-} mseRegion;
-
-#if defined(NCURSES_MOUSE_VERSION)
-
-#define	mouse_open() mousemask(BUTTON1_PRESSED, (mmask_t *) 0)
-#define	mouse_close() mousemask(0, (mmask_t *) 0)
-
-extern mseRegion * dlg_mouse_mkregion (int /*y*/, int /*x*/, int /*height*/, int /*width*/, int /*code*/);
-extern void dlg_mouse_free_regions (void);
-extern void dlg_mouse_mkbigregion (int /*y*/, int /*x*/, int /*height*/, int /*width*/, int /*code*/, int /*step_x*/, int /*step_y*/, int /*mode*/);
-extern void dlg_mouse_setbase (int /*x*/, int /*y*/);
-extern void dlg_mouse_setcode (int /*code*/);
-
-#define USE_MOUSE 1
-
-#else
-
-#define	mouse_open() /*nothing*/
-#define	mouse_close() /*nothing*/
-#define dlg_mouse_free_regions() /* nothing */
-#define	dlg_mouse_mkregion(y, x, height, width, code) /*nothing*/
-#define	dlg_mouse_mkbigregion(y, x, height, width, code, step_x, step_y, mode) /*nothing*/
-#define	dlg_mouse_setbase(x, y) /*nothing*/
-#define	dlg_mouse_setcode(c) /*nothing*/
-
-#define USE_MOUSE 0
-
-#endif
-
-extern mseRegion *dlg_mouse_region (int /*y*/, int /*x*/);
-extern mseRegion *dlg_mouse_bigregion (int /*y*/, int /*x*/);
-extern int dlg_mouse_wgetch (WINDOW * /*win*/, int * /*fkey*/);
-extern int dlg_mouse_wgetch_nowait (WINDOW * /*win*/, int * /*fkey*/);
-
-#define mouse_mkbutton(y,x,len,code) dlg_mouse_mkregion(y,x,1,len,code);
-
-/*
- * This is the base for fictitious keys, which activate
- * the buttons.
- *
- * Mouse-generated keys are the following:
- *   -- the first 32 are used as numbers, in addition to '0'-'9'
- *   -- uppercase chars are used to invoke the button (M_EVENT + 'O')
- */
-#define M_EVENT (DLGK_max + 1)
-
-/*
- * The `flag' parameter in checklist is used to select between
- * radiolist and checklist
- */
-#define FLAG_CHECK 1
-#define FLAG_RADIO 0
-
-/*
- * This is used only for debugging (FIXME: should have a separate header).
- */
-#ifdef DLG_NO_LEAKS
-extern void _dlg_inputstr_leaks(void);
-#if defined(NCURSES_VERSION) && defined(DLG_HAVE__NC_FREE_AND_EXIT)
-extern void _nc_free_and_exit(int);	/* nc_alloc.h normally not installed */
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-/* *INDENT-ON* */
-
-#endif /* DIALOG_H_included */
diff --git a/openflow/usr/include/dirent.h b/openflow/usr/include/dirent.h
deleted file mode 100644
index 9a4b6bf..0000000
--- a/openflow/usr/include/dirent.h
+++ /dev/null
@@ -1,403 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 5.1.2 Directory Operations	<dirent.h>
- */
-
-#ifndef	_DIRENT_H
-#define	_DIRENT_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#include <bits/types.h>
-
-#ifdef __USE_XOPEN
-# ifndef __ino_t_defined
-#  ifndef __USE_FILE_OFFSET64
-typedef __ino_t ino_t;
-#  else
-typedef __ino64_t ino_t;
-#  endif
-#  define __ino_t_defined
-# endif
-# if defined __USE_LARGEFILE64 && !defined __ino64_t_defined
-typedef __ino64_t ino64_t;
-#  define __ino64_t_defined
-# endif
-#endif
-
-/* This file defines `struct dirent'.
-
-   It defines the macro `_DIRENT_HAVE_D_NAMLEN' iff there is a `d_namlen'
-   member that gives the length of `d_name'.
-
-   It defines the macro `_DIRENT_HAVE_D_RECLEN' iff there is a `d_reclen'
-   member that gives the size of the entire directory entry.
-
-   It defines the macro `_DIRENT_HAVE_D_OFF' iff there is a `d_off'
-   member that gives the file offset of the next directory entry.
-
-   It defines the macro `_DIRENT_HAVE_D_TYPE' iff there is a `d_type'
-   member that gives the type of the file.
- */
-
-#include <bits/dirent.h>
-
-#if defined __USE_MISC && !defined d_fileno
-# define d_ino	d_fileno		 /* Backward compatibility.  */
-#endif
-
-/* These macros extract size information from a `struct dirent *'.
-   They may evaluate their argument multiple times, so it must not
-   have side effects.  Each of these may involve a relatively costly
-   call to `strlen' on some systems, so these values should be cached.
-
-   _D_EXACT_NAMLEN (DP)	returns the length of DP->d_name, not including
-   its terminating null character.
-
-   _D_ALLOC_NAMLEN (DP)	returns a size at least (_D_EXACT_NAMLEN (DP) + 1);
-   that is, the allocation size needed to hold the DP->d_name string.
-   Use this macro when you don't need the exact length, just an upper bound.
-   This macro is less likely to require calling `strlen' than _D_EXACT_NAMLEN.
-   */
-
-#ifdef _DIRENT_HAVE_D_NAMLEN
-# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
-# define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN (d) + 1)
-#else
-# define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name))
-# ifdef _DIRENT_HAVE_D_RECLEN
-#  define _D_ALLOC_NAMLEN(d) (((char *) (d) + (d)->d_reclen) - &(d)->d_name[0])
-# else
-#  define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name : \
-			      _D_EXACT_NAMLEN (d) + 1)
-# endif
-#endif
-
-
-#ifdef __USE_MISC
-/* File types for `d_type'.  */
-enum
-  {
-    DT_UNKNOWN = 0,
-# define DT_UNKNOWN	DT_UNKNOWN
-    DT_FIFO = 1,
-# define DT_FIFO	DT_FIFO
-    DT_CHR = 2,
-# define DT_CHR		DT_CHR
-    DT_DIR = 4,
-# define DT_DIR		DT_DIR
-    DT_BLK = 6,
-# define DT_BLK		DT_BLK
-    DT_REG = 8,
-# define DT_REG		DT_REG
-    DT_LNK = 10,
-# define DT_LNK		DT_LNK
-    DT_SOCK = 12,
-# define DT_SOCK	DT_SOCK
-    DT_WHT = 14
-# define DT_WHT		DT_WHT
-  };
-
-/* Convert between stat structure types and directory types.  */
-# define IFTODT(mode)	(((mode) & 0170000) >> 12)
-# define DTTOIF(dirtype)	((dirtype) << 12)
-#endif
-
-
-/* This is the data type of directory stream objects.
-   The actual structure is opaque to users.  */
-typedef struct __dirstream DIR;
-
-/* Open a directory stream on NAME.
-   Return a DIR stream on the directory, or NULL if it could not be opened.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern DIR *opendir (const char *__name) __nonnull ((1));
-
-#ifdef __USE_XOPEN2K8
-/* Same as opendir, but open the stream on the file descriptor FD.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern DIR *fdopendir (int __fd);
-#endif
-
-/* Close the directory stream DIRP.
-   Return 0 if successful, -1 if not.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int closedir (DIR *__dirp) __nonnull ((1));
-
-/* Read a directory entry from DIRP.  Return a pointer to a `struct
-   dirent' describing the entry, or NULL for EOF or error.  The
-   storage returned may be overwritten by a later readdir call on the
-   same DIR stream.
-
-   If the Large File Support API is selected we have to use the
-   appropriate interface.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-#ifndef __USE_FILE_OFFSET64
-extern struct dirent *readdir (DIR *__dirp) __nonnull ((1));
-#else
-# ifdef __REDIRECT
-extern struct dirent *__REDIRECT (readdir, (DIR *__dirp), readdir64)
-     __nonnull ((1));
-# else
-#  define readdir readdir64
-# endif
-#endif
-
-#ifdef __USE_LARGEFILE64
-extern struct dirent64 *readdir64 (DIR *__dirp) __nonnull ((1));
-#endif
-
-#ifdef __USE_POSIX
-/* Reentrant version of `readdir'.  Return in RESULT a pointer to the
-   next entry.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-# ifndef __USE_FILE_OFFSET64
-extern int readdir_r (DIR *__restrict __dirp,
-		      struct dirent *__restrict __entry,
-		      struct dirent **__restrict __result)
-     __nonnull ((1, 2, 3));
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (readdir_r,
-		       (DIR *__restrict __dirp,
-			struct dirent *__restrict __entry,
-			struct dirent **__restrict __result),
-		       readdir64_r) __nonnull ((1, 2, 3));
-#  else
-#   define readdir_r readdir64_r
-#  endif
-# endif
-
-# ifdef __USE_LARGEFILE64
-extern int readdir64_r (DIR *__restrict __dirp,
-			struct dirent64 *__restrict __entry,
-			struct dirent64 **__restrict __result)
-     __nonnull ((1, 2, 3));
-# endif
-#endif	/* POSIX or misc */
-
-/* Rewind DIRP to the beginning of the directory.  */
-extern void rewinddir (DIR *__dirp) __THROW __nonnull ((1));
-
-#if defined __USE_MISC || defined __USE_XOPEN
-# include <bits/types.h>
-
-/* Seek to position POS on DIRP.  */
-extern void seekdir (DIR *__dirp, long int __pos) __THROW __nonnull ((1));
-
-/* Return the current position of DIRP.  */
-extern long int telldir (DIR *__dirp) __THROW __nonnull ((1));
-#endif
-
-#ifdef __USE_XOPEN2K8
-
-/* Return the file descriptor used by DIRP.  */
-extern int dirfd (DIR *__dirp) __THROW __nonnull ((1));
-
-# if defined __OPTIMIZE__ && defined _DIR_dirfd
-#  define dirfd(dirp)	_DIR_dirfd (dirp)
-# endif
-
-# ifdef __USE_MISC
-#  ifndef MAXNAMLEN
-/* Get the definitions of the POSIX.1 limits.  */
-#  include <bits/posix1_lim.h>
-
-/* `MAXNAMLEN' is the BSD name for what POSIX calls `NAME_MAX'.  */
-#   ifdef NAME_MAX
-#    define MAXNAMLEN	NAME_MAX
-#   else
-#    define MAXNAMLEN	255
-#   endif
-#  endif
-# endif
-
-# define __need_size_t
-# include <stddef.h>
-
-/* Scan the directory DIR, calling SELECTOR on each directory entry.
-   Entries for which SELECT returns nonzero are individually malloc'd,
-   sorted using qsort with CMP, and collected in a malloc'd array in
-   *NAMELIST.  Returns the number of entries selected, or -1 on error.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-# ifndef __USE_FILE_OFFSET64
-extern int scandir (const char *__restrict __dir,
-		    struct dirent ***__restrict __namelist,
-		    int (*__selector) (const struct dirent *),
-		    int (*__cmp) (const struct dirent **,
-				  const struct dirent **))
-     __nonnull ((1, 2));
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (scandir,
-		       (const char *__restrict __dir,
-			struct dirent ***__restrict __namelist,
-			int (*__selector) (const struct dirent *),
-			int (*__cmp) (const struct dirent **,
-				      const struct dirent **)),
-		       scandir64) __nonnull ((1, 2));
-#  else
-#   define scandir scandir64
-#  endif
-# endif
-
-# if defined __USE_GNU && defined __USE_LARGEFILE64
-/* This function is like `scandir' but it uses the 64bit dirent structure.
-   Please note that the CMP function must now work with struct dirent64 **.  */
-extern int scandir64 (const char *__restrict __dir,
-		      struct dirent64 ***__restrict __namelist,
-		      int (*__selector) (const struct dirent64 *),
-		      int (*__cmp) (const struct dirent64 **,
-				    const struct dirent64 **))
-     __nonnull ((1, 2));
-# endif
-
-# ifdef __USE_GNU
-/* Similar to `scandir' but a relative DIR name is interpreted relative
-   to the directory for which DFD is a descriptor.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-#  ifndef __USE_FILE_OFFSET64
-extern int scandirat (int __dfd, const char *__restrict __dir,
-		      struct dirent ***__restrict __namelist,
-		      int (*__selector) (const struct dirent *),
-		      int (*__cmp) (const struct dirent **,
-				    const struct dirent **))
-     __nonnull ((2, 3));
-#  else
-#   ifdef __REDIRECT
-extern int __REDIRECT (scandirat,
-		       (int __dfd, const char *__restrict __dir,
-			struct dirent ***__restrict __namelist,
-			int (*__selector) (const struct dirent *),
-			int (*__cmp) (const struct dirent **,
-				      const struct dirent **)),
-		       scandirat64) __nonnull ((2, 3));
-#   else
-#    define scandirat scandirat64
-#   endif
-#  endif
-
-/* This function is like `scandir' but it uses the 64bit dirent structure.
-   Please note that the CMP function must now work with struct dirent64 **.  */
-extern int scandirat64 (int __dfd, const char *__restrict __dir,
-			struct dirent64 ***__restrict __namelist,
-			int (*__selector) (const struct dirent64 *),
-			int (*__cmp) (const struct dirent64 **,
-				      const struct dirent64 **))
-     __nonnull ((2, 3));
-# endif
-
-/* Function to compare two `struct dirent's alphabetically.  */
-# ifndef __USE_FILE_OFFSET64
-extern int alphasort (const struct dirent **__e1,
-		      const struct dirent **__e2)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT_NTH (alphasort,
-			   (const struct dirent **__e1,
-			    const struct dirent **__e2),
-			   alphasort64) __attribute_pure__ __nonnull ((1, 2));
-#  else
-#   define alphasort alphasort64
-#  endif
-# endif
-
-# if defined __USE_GNU && defined __USE_LARGEFILE64
-extern int alphasort64 (const struct dirent64 **__e1,
-			const struct dirent64 **__e2)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-# endif
-#endif /* Use XPG7.  */
-
-
-#ifdef __USE_MISC
-/* Read directory entries from FD into BUF, reading at most NBYTES.
-   Reading starts at offset *BASEP, and *BASEP is updated with the new
-   position after reading.  Returns the number of bytes read; zero when at
-   end of directory; or -1 for errors.  */
-# ifndef __USE_FILE_OFFSET64
-extern __ssize_t getdirentries (int __fd, char *__restrict __buf,
-				size_t __nbytes,
-				__off_t *__restrict __basep)
-     __THROW __nonnull ((2, 4));
-# else
-#  ifdef __REDIRECT
-extern __ssize_t __REDIRECT_NTH (getdirentries,
-				 (int __fd, char *__restrict __buf,
-				  size_t __nbytes,
-				  __off64_t *__restrict __basep),
-				 getdirentries64) __nonnull ((2, 4));
-#  else
-#   define getdirentries getdirentries64
-#  endif
-# endif
-
-# ifdef __USE_LARGEFILE64
-extern __ssize_t getdirentries64 (int __fd, char *__restrict __buf,
-				  size_t __nbytes,
-				  __off64_t *__restrict __basep)
-     __THROW __nonnull ((2, 4));
-# endif
-#endif /* Use misc.  */
-
-#ifdef __USE_GNU
-/* Function to compare two `struct dirent's by name & version.  */
-# ifndef __USE_FILE_OFFSET64
-extern int versionsort (const struct dirent **__e1,
-			const struct dirent **__e2)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT_NTH (versionsort,
-			   (const struct dirent **__e1,
-			    const struct dirent **__e2),
-			   versionsort64)
-     __attribute_pure__ __nonnull ((1, 2));
-#  else
-#   define versionsort versionsort64
-#  endif
-# endif
-
-# ifdef __USE_LARGEFILE64
-extern int versionsort64 (const struct dirent64 **__e1,
-			  const struct dirent64 **__e2)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-# endif
-#endif /* Use GNU.  */
-
-__END_DECLS
-
-#endif /* dirent.h  */
diff --git a/openflow/usr/include/dlfcn.h b/openflow/usr/include/dlfcn.h
deleted file mode 100644
index 5d16dcd..0000000
--- a/openflow/usr/include/dlfcn.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* User functions for run-time dynamic loading.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_DLFCN_H
-#define	_DLFCN_H 1
-
-#include <features.h>
-#define __need_size_t
-#include <stddef.h>
-
-/* Collect various system dependent definitions and declarations.  */
-#include <bits/dlfcn.h>
-
-
-#ifdef __USE_GNU
-/* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT
-   the run-time address of the symbol called NAME in the next shared
-   object is returned.  The "next" relation is defined by the order
-   the shared objects were loaded.  */
-# define RTLD_NEXT	((void *) -1l)
-
-/* If the first argument to `dlsym' or `dlvsym' is set to RTLD_DEFAULT
-   the run-time address of the symbol called NAME in the global scope
-   is returned.  */
-# define RTLD_DEFAULT	((void *) 0)
-
-
-/* Type for namespace indeces.  */
-typedef long int Lmid_t;
-
-/* Special namespace ID values.  */
-# define LM_ID_BASE	0	/* Initial namespace.  */
-# define LM_ID_NEWLM	-1	/* For dlmopen: request new namespace.  */
-#endif
-
-
-__BEGIN_DECLS
-
-/* Open the shared object FILE and map it in; return a handle that can be
-   passed to `dlsym' to get symbol values from it.  */
-extern void *dlopen (const char *__file, int __mode) __THROWNL;
-
-/* Unmap and close a shared object opened by `dlopen'.
-   The handle cannot be used again after calling `dlclose'.  */
-extern int dlclose (void *__handle) __THROWNL __nonnull ((1));
-
-/* Find the run-time address in the shared object HANDLE refers to
-   of the symbol called NAME.  */
-extern void *dlsym (void *__restrict __handle,
-		    const char *__restrict __name) __THROW __nonnull ((2));
-
-#ifdef __USE_GNU
-/* Like `dlopen', but request object to be allocated in a new namespace.  */
-extern void *dlmopen (Lmid_t __nsid, const char *__file, int __mode) __THROWNL;
-
-/* Find the run-time address in the shared object HANDLE refers to
-   of the symbol called NAME with VERSION.  */
-extern void *dlvsym (void *__restrict __handle,
-		     const char *__restrict __name,
-		     const char *__restrict __version)
-     __THROW __nonnull ((2, 3));
-#endif
-
-/* When any of the above functions fails, call this function
-   to return a string describing the error.  Each call resets
-   the error string so that a following call returns null.  */
-extern char *dlerror (void) __THROW;
-
-
-#ifdef __USE_GNU
-/* Structure containing information about object searched using
-   `dladdr'.  */
-typedef struct
-{
-  const char *dli_fname;	/* File name of defining object.  */
-  void *dli_fbase;		/* Load address of that object.  */
-  const char *dli_sname;	/* Name of nearest symbol.  */
-  void *dli_saddr;		/* Exact value of nearest symbol.  */
-} Dl_info;
-
-/* Fill in *INFO with the following information about ADDRESS.
-   Returns 0 iff no shared object's segments contain that address.  */
-extern int dladdr (const void *__address, Dl_info *__info)
-     __THROW __nonnull ((2));
-
-/* Same as `dladdr', but additionally sets *EXTRA_INFO according to FLAGS.  */
-extern int dladdr1 (const void *__address, Dl_info *__info,
-		    void **__extra_info, int __flags) __THROW __nonnull ((2));
-
-/* These are the possible values for the FLAGS argument to `dladdr1'.
-   This indicates what extra information is stored at *EXTRA_INFO.
-   It may also be zero, in which case the EXTRA_INFO argument is not used.  */
-enum
-  {
-    /* Matching symbol table entry (const ElfNN_Sym *).  */
-    RTLD_DL_SYMENT = 1,
-
-    /* The object containing the address (struct link_map *).  */
-    RTLD_DL_LINKMAP = 2
-  };
-
-
-/* Get information about the shared object HANDLE refers to.
-   REQUEST is from among the values below, and determines the use of ARG.
-
-   On success, returns zero.  On failure, returns -1 and records an error
-   message to be fetched with `dlerror'.  */
-extern int dlinfo (void *__restrict __handle,
-		   int __request, void *__restrict __arg)
-     __THROW __nonnull ((1, 3));
-
-/* These are the possible values for the REQUEST argument to `dlinfo'.  */
-enum
-  {
-    /* Treat ARG as `lmid_t *'; store namespace ID for HANDLE there.  */
-    RTLD_DI_LMID = 1,
-
-    /* Treat ARG as `struct link_map **';
-       store the `struct link_map *' for HANDLE there.  */
-    RTLD_DI_LINKMAP = 2,
-
-    RTLD_DI_CONFIGADDR = 3,	/* Unsupported, defined by Solaris.  */
-
-    /* Treat ARG as `Dl_serinfo *' (see below), and fill in to describe the
-       directories that will be searched for dependencies of this object.
-       RTLD_DI_SERINFOSIZE fills in just the `dls_cnt' and `dls_size'
-       entries to indicate the size of the buffer that must be passed to
-       RTLD_DI_SERINFO to fill in the full information.  */
-    RTLD_DI_SERINFO = 4,
-    RTLD_DI_SERINFOSIZE = 5,
-
-    /* Treat ARG as `char *', and store there the directory name used to
-       expand $ORIGIN in this shared object's dependency file names.  */
-    RTLD_DI_ORIGIN = 6,
-
-    RTLD_DI_PROFILENAME = 7,	/* Unsupported, defined by Solaris.  */
-    RTLD_DI_PROFILEOUT = 8,	/* Unsupported, defined by Solaris.  */
-
-    /* Treat ARG as `size_t *', and store there the TLS module ID
-       of this object's PT_TLS segment, as used in TLS relocations;
-       store zero if this object does not define a PT_TLS segment.  */
-    RTLD_DI_TLS_MODID = 9,
-
-    /* Treat ARG as `void **', and store there a pointer to the calling
-       thread's TLS block corresponding to this object's PT_TLS segment.
-       Store a null pointer if this object does not define a PT_TLS
-       segment, or if the calling thread has not allocated a block for it.  */
-    RTLD_DI_TLS_DATA = 10,
-
-    RTLD_DI_MAX = 10
-  };
-
-
-/* This is the type of elements in `Dl_serinfo', below.
-   The `dls_name' member points to space in the buffer passed to `dlinfo'.  */
-typedef struct
-{
-  char *dls_name;		/* Name of library search path directory.  */
-  unsigned int dls_flags;	/* Indicates where this directory came from. */
-} Dl_serpath;
-
-/* This is the structure that must be passed (by reference) to `dlinfo' for
-   the RTLD_DI_SERINFO and RTLD_DI_SERINFOSIZE requests.  */
-typedef struct
-{
-  size_t dls_size;		/* Size in bytes of the whole buffer.  */
-  unsigned int dls_cnt;		/* Number of elements in `dls_serpath'.  */
-  Dl_serpath dls_serpath[1];	/* Actually longer, dls_cnt elements.  */
-} Dl_serinfo;
-#endif /* __USE_GNU */
-
-
-__END_DECLS
-
-#endif	/* dlfcn.h */
diff --git a/openflow/usr/include/dlg_colors.h b/openflow/usr/include/dlg_colors.h
deleted file mode 100644
index c047f72..0000000
--- a/openflow/usr/include/dlg_colors.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- *  $Id: dlg_colors.h,v 1.17 2011/10/14 21:19:59 tom Exp $
- *
- *  colors.h -- color attribute definitions
- *
- *  Copyright 2000-2007,2011	Thomas E. Dickey
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License, version 2.1
- *  as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to
- *	Free Software Foundation, Inc.
- *	51 Franklin St., Fifth Floor
- *	Boston, MA 02110, USA.
- *
- *  An earlier version of this program lists as authors
- *	Savio Lam (lam836@cs.cuhk.hk)
- */
-
-#ifndef COLORS_H_included
-#define COLORS_H_included 1
-
-#include <dialog.h>
-
-/*
- *   Default color definitions (DLGC means "Dialog Color")
- *
- *   DLGC_FG_xxx = foreground for "xxx"
- *   DLGC_BG_xxx = background for "xxx"
- *   DLGC_HL_xxx = highlight for "xxx"
- */
-#define DLGC_FG_SCREEN                 COLOR_CYAN
-#define DLGC_BG_SCREEN                 COLOR_BLUE
-#define DLGC_HL_SCREEN                 TRUE
-
-#define DLGC_FG_SHADOW                 COLOR_BLACK
-#define DLGC_BG_SHADOW                 COLOR_BLACK
-#define DLGC_HL_SHADOW                 TRUE
-
-#define DLGC_FG_DIALOG                 COLOR_BLACK
-#define DLGC_BG_DIALOG                 COLOR_WHITE
-#define DLGC_HL_DIALOG                 FALSE
-
-#define DLGC_FG_TITLE                  COLOR_BLUE
-#define DLGC_BG_TITLE                  COLOR_WHITE
-#define DLGC_HL_TITLE                  TRUE
-
-#define DLGC_FG_BORDER                 COLOR_WHITE
-#define DLGC_BG_BORDER                 COLOR_WHITE
-#define DLGC_HL_BORDER                 TRUE
-
-#define DLGC_FG_BORDER2                DLGC_FG_DIALOG
-#define DLGC_BG_BORDER2                DLGC_BG_DIALOG
-#define DLGC_HL_BORDER2                DLGC_HL_DIALOG
-
-#define DLGC_FG_BUTTON_ACTIVE          COLOR_WHITE
-#define DLGC_BG_BUTTON_ACTIVE          COLOR_BLUE
-#define DLGC_HL_BUTTON_ACTIVE          TRUE
-
-#define DLGC_FG_BUTTON_INACTIVE        COLOR_BLACK
-#define DLGC_BG_BUTTON_INACTIVE        COLOR_WHITE
-#define DLGC_HL_BUTTON_INACTIVE        FALSE
-
-#define DLGC_FG_BUTTON_KEY_ACTIVE      COLOR_WHITE
-#define DLGC_BG_BUTTON_KEY_ACTIVE      COLOR_BLUE
-#define DLGC_HL_BUTTON_KEY_ACTIVE      TRUE
-
-#define DLGC_FG_BUTTON_KEY_INACTIVE    COLOR_RED
-#define DLGC_BG_BUTTON_KEY_INACTIVE    COLOR_WHITE
-#define DLGC_HL_BUTTON_KEY_INACTIVE    FALSE
-
-#define DLGC_FG_BUTTON_LABEL_ACTIVE    COLOR_YELLOW
-#define DLGC_BG_BUTTON_LABEL_ACTIVE    COLOR_BLUE
-#define DLGC_HL_BUTTON_LABEL_ACTIVE    TRUE
-
-#define DLGC_FG_BUTTON_LABEL_INACTIVE  COLOR_BLACK
-#define DLGC_BG_BUTTON_LABEL_INACTIVE  COLOR_WHITE
-#define DLGC_HL_BUTTON_LABEL_INACTIVE  TRUE
-
-#define DLGC_FG_FORM_ITEM_READONLY     COLOR_CYAN
-#define DLGC_BG_FORM_ITEM_READONLY     COLOR_WHITE
-#define DLGC_HL_FORM_ITEM_READONLY     TRUE
-
-#define DLGC_FG_INPUTBOX               COLOR_BLACK
-#define DLGC_BG_INPUTBOX               COLOR_WHITE
-#define DLGC_HL_INPUTBOX               FALSE
-
-#define DLGC_FG_INPUTBOX_BORDER        COLOR_BLACK
-#define DLGC_BG_INPUTBOX_BORDER        COLOR_WHITE
-#define DLGC_HL_INPUTBOX_BORDER        FALSE
-
-#define DLGC_FG_INPUTBOX_BORDER2       DLGC_FG_INPUTBOX
-#define DLGC_BG_INPUTBOX_BORDER2       DLGC_BG_INPUTBOX
-#define DLGC_HL_INPUTBOX_BORDER2       DLGC_HL_INPUTBOX
-
-#define DLGC_FG_SEARCHBOX              COLOR_BLACK
-#define DLGC_BG_SEARCHBOX              COLOR_WHITE
-#define DLGC_HL_SEARCHBOX              FALSE
-
-#define DLGC_FG_SEARCHBOX_TITLE        COLOR_BLUE
-#define DLGC_BG_SEARCHBOX_TITLE        COLOR_WHITE
-#define DLGC_HL_SEARCHBOX_TITLE        TRUE
-
-#define DLGC_FG_SEARCHBOX_BORDER       COLOR_WHITE
-#define DLGC_BG_SEARCHBOX_BORDER       COLOR_WHITE
-#define DLGC_HL_SEARCHBOX_BORDER       TRUE
-
-#define DLGC_FG_SEARCHBOX_BORDER2      DLGC_FG_SEARCHBOX
-#define DLGC_BG_SEARCHBOX_BORDER2      DLGC_BG_SEARCHBOX
-#define DLGC_HL_SEARCHBOX_BORDER2      DLGC_HL_SEARCHBOX
-
-#define DLGC_FG_POSITION_INDICATOR     COLOR_BLUE
-#define DLGC_BG_POSITION_INDICATOR     COLOR_WHITE
-#define DLGC_HL_POSITION_INDICATOR     TRUE
-
-#define DLGC_FG_MENUBOX                COLOR_BLACK
-#define DLGC_BG_MENUBOX                COLOR_WHITE
-#define DLGC_HL_MENUBOX                FALSE
-
-#define DLGC_FG_MENUBOX_BORDER         COLOR_WHITE
-#define DLGC_BG_MENUBOX_BORDER         COLOR_WHITE
-#define DLGC_HL_MENUBOX_BORDER         TRUE
-
-#define DLGC_FG_MENUBOX_BORDER2        DLGC_FG_MENUBOX
-#define DLGC_BG_MENUBOX_BORDER2        DLGC_BG_MENUBOX
-#define DLGC_HL_MENUBOX_BORDER2        DLGC_HL_MENUBOX
-
-#define DLGC_FG_ITEM                   COLOR_BLACK
-#define DLGC_BG_ITEM                   COLOR_WHITE
-#define DLGC_HL_ITEM                   FALSE
-
-#define DLGC_FG_ITEM_SELECTED          COLOR_WHITE
-#define DLGC_BG_ITEM_SELECTED          COLOR_BLUE
-#define DLGC_HL_ITEM_SELECTED          TRUE
-
-#define DLGC_FG_TAG                    COLOR_BLUE
-#define DLGC_BG_TAG                    COLOR_WHITE
-#define DLGC_HL_TAG                    TRUE
-
-#define DLGC_FG_TAG_SELECTED           COLOR_YELLOW
-#define DLGC_BG_TAG_SELECTED           COLOR_BLUE
-#define DLGC_HL_TAG_SELECTED           TRUE
-
-#define DLGC_FG_TAG_KEY                COLOR_RED
-#define DLGC_BG_TAG_KEY                COLOR_WHITE
-#define DLGC_HL_TAG_KEY                FALSE
-
-#define DLGC_FG_TAG_KEY_SELECTED       COLOR_RED
-#define DLGC_BG_TAG_KEY_SELECTED       COLOR_BLUE
-#define DLGC_HL_TAG_KEY_SELECTED       TRUE
-
-#define DLGC_FG_CHECK                  COLOR_BLACK
-#define DLGC_BG_CHECK                  COLOR_WHITE
-#define DLGC_HL_CHECK                  FALSE
-
-#define DLGC_FG_CHECK_SELECTED         COLOR_WHITE
-#define DLGC_BG_CHECK_SELECTED         COLOR_BLUE
-#define DLGC_HL_CHECK_SELECTED         TRUE
-
-#define DLGC_FG_UARROW                 COLOR_GREEN
-#define DLGC_BG_UARROW                 COLOR_WHITE
-#define DLGC_HL_UARROW                 TRUE
-
-#define DLGC_FG_DARROW                 COLOR_GREEN
-#define DLGC_BG_DARROW                 COLOR_WHITE
-#define DLGC_HL_DARROW                 TRUE
-
-#define DLGC_FG_ITEMHELP               COLOR_WHITE
-#define DLGC_BG_ITEMHELP               COLOR_BLACK
-#define DLGC_HL_ITEMHELP               FALSE
-
-#define DLGC_FG_FORM_ACTIVE_TEXT       COLOR_WHITE
-#define DLGC_BG_FORM_ACTIVE_TEXT       COLOR_BLUE
-#define DLGC_HL_FORM_ACTIVE_TEXT       TRUE
-
-#define DLGC_FG_FORM_TEXT              COLOR_WHITE
-#define DLGC_BG_FORM_TEXT              COLOR_CYAN
-#define DLGC_HL_FORM_TEXT              TRUE
-
-#define DLGC_FG_GAUGE                  COLOR_BLUE
-#define DLGC_BG_GAUGE                  COLOR_WHITE
-#define DLGC_HL_GAUGE                  TRUE
-
-/* End of default color definitions */
-
-/*
- * Global variables
- */
-
-typedef struct {
-    const char *name;
-    int value;
-} color_names_st;
-
-#endif /* COLORS_H_included */
diff --git a/openflow/usr/include/dlg_config.h b/openflow/usr/include/dlg_config.h
deleted file mode 100644
index edeb40c..0000000
--- a/openflow/usr/include/dlg_config.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* dlg_config.h.  Generated automatically by configure.  */
-/*
- * The configure script expands this as a set of definitions
- */
-
-#define DLG_CURSES_WACS_ARRAY _nc_wacs
-#define DLG_CURSES_WACS_SYMBOLS 1
-#define DLG_DIALOG_PATCHDATE 20160209
-#define DLG_DIALOG_VERSION "1.3"
-#define DLG_ENABLE_NLS 1
-#define DLG_HAVE_ALLOCA 1
-#define DLG_HAVE_ALLOCA_H 1
-#define DLG_HAVE_ARGZ_H 1
-#define DLG_HAVE_BTOWC 1
-#define DLG_HAVE_COLOR 1
-#define DLG_HAVE_DCGETTEXT 1
-#define DLG_HAVE_DIRENT_H 1
-#define DLG_HAVE_DLG_FORMBOX 1
-#define DLG_HAVE_DLG_GAUGE 1
-#define DLG_HAVE_DLG_MIXEDFORM 1
-#define DLG_HAVE_DLG_TAILBOX 1
-#define DLG_HAVE_DLG_TRACE 1
-#define DLG_HAVE_FEOF_UNLOCKED 1
-#define DLG_HAVE_FGETS_UNLOCKED 1
-#define DLG_HAVE_FLUSHINP 1
-#define DLG_HAVE_FSEEKO 1
-#define DLG_HAVE_GETATTRS 1
-#define DLG_HAVE_GETBEGX 1
-#define DLG_HAVE_GETBEGY 1
-#define DLG_HAVE_GETBEGYX 1
-#define DLG_HAVE_GETCURX 1
-#define DLG_HAVE_GETCURY 1
-#define DLG_HAVE_GETCWD 1
-#define DLG_HAVE_GETEGID 1
-#define DLG_HAVE_GETEUID 1
-#define DLG_HAVE_GETGID 1
-#define DLG_HAVE_GETMAXX 1
-#define DLG_HAVE_GETMAXY 1
-#define DLG_HAVE_GETMAXYX 1
-#define DLG_HAVE_GETPAGESIZE 1
-#define DLG_HAVE_GETPARX 1
-#define DLG_HAVE_GETPARY 1
-#define DLG_HAVE_GETPARYX 1
-#define DLG_HAVE_GETTEXT 1
-#define DLG_HAVE_GETUID 1
-#define DLG_HAVE_ICONV 1
-#define DLG_HAVE_INTTYPES_H 1
-#define DLG_HAVE_LANGINFO_CODESET 1
-#define DLG_HAVE_LC_MESSAGES 1
-#define DLG_HAVE_LIBINTL_H 1
-#define DLG_HAVE_LIBNCURSESW 1
-#define DLG_HAVE_LIMITS_H 1
-#define DLG_HAVE_LOCALE_H 1
-#define DLG_HAVE_MALLOC_H 1
-#define DLG_HAVE_MBLEN 1
-#define DLG_HAVE_MBRLEN 1
-#define DLG_HAVE_MBRTOWC 1
-#define DLG_HAVE_MBSTATE_T 1
-#define DLG_HAVE_MBTOWC 1
-#define DLG_HAVE_MEMORY_H 1
-#define DLG_HAVE_MEMPCPY 1
-#define DLG_HAVE_MIXEDGAUGE 1
-#define DLG_HAVE_MKTIME 1
-#define DLG_HAVE_MMAP 1
-#define DLG_HAVE_MUNMAP 1
-#define DLG_HAVE_NCURSES_H 1
-#define DLG_HAVE_NL_LANGINFO_1STDAY 1
-#define DLG_HAVE_NL_TYPES_H 1
-#define DLG_HAVE_PUTENV 1
-#define DLG_HAVE_RC_FILE 1
-#define DLG_HAVE_SEARCH_H 1
-#define DLG_HAVE_SETENV 1
-#define DLG_HAVE_SETLOCALE 1
-#define DLG_HAVE_STDDEF_H 1
-#define DLG_HAVE_STDINT_H 1
-#define DLG_HAVE_STDLIB_H 1
-#define DLG_HAVE_STPCPY 1
-#define DLG_HAVE_STRCASECMP 1
-#define DLG_HAVE_STRCHR 1
-#define DLG_HAVE_STRDUP 1
-#define DLG_HAVE_STRFTIME 1
-#define DLG_HAVE_STRINGS_H 1
-#define DLG_HAVE_STRING_H 1
-#define DLG_HAVE_STRTOUL 1
-#define DLG_HAVE_SYS_PARAM_H 1
-#define DLG_HAVE_SYS_STAT_H 1
-#define DLG_HAVE_SYS_TYPES_H 1
-#define DLG_HAVE_SYS_WAIT_H 1
-#define DLG_HAVE_TERM_H 1
-#define DLG_HAVE_TSEARCH 1
-#define DLG_HAVE_TYPE_CHTYPE 1
-#define DLG_HAVE_UNCTRL_H 1
-#define DLG_HAVE_UNISTD_H 1
-#define DLG_HAVE_USE_DEFAULT_COLORS 1
-#define DLG_HAVE_WAITPID 1
-#define DLG_HAVE_WCHGAT 1
-#define DLG_HAVE_WCSRTOMBS 1
-#define DLG_HAVE_WCSTOMBS 1
-#define DLG_HAVE_WCTOB 1
-#define DLG_HAVE_WCTOMB 1
-#define DLG_HAVE_WCURSYNCUP 1
-#define DLG_HAVE_WGETPARENT 1
-#define DLG_HAVE_WGET_WCH 1
-#define DLG_HAVE_WHIPTAIL 1
-#define DLG_HAVE_WSYNCUP 1
-#define DLG_HAVE_XDIALOG 1
-#define DLG_HAVE_XDIALOG2 1
-#define DLG_HAVE__NC_FREE_AND_EXIT 1
-#define DLG_HAVE___ARGZ_COUNT 1
-#define DLG_HAVE___ARGZ_NEXT 1
-#define DLG_HAVE___ARGZ_STRINGIFY 1
-#define DLG_ICONV_CONST 
-#define DLG_MIXEDCASE_FILENAMES 1
-#define DLG_NCURSES 1
-#define DLG_NEED_WCHAR_H 1
-#define DLG_NLS_TEXTDOMAIN "dialog"
-#define DLG_PACKAGE "dialog"
-#define DLG_RETSIGTYPE void
-#define DLG_STDC_HEADERS 1
-#define DLG_SYSTEM_NAME "linux-gnueabihf"
-#define DLG_TIME_WITH_SYS_TIME 1
-#define DLG_TYPE_CHTYPE_IS_SCALAR 1
-#define DLG_USE_WIDE_CURSES 1
-#define DLG_WIDEC_CURSES 1
diff --git a/openflow/usr/include/dlg_keys.h b/openflow/usr/include/dlg_keys.h
deleted file mode 100644
index 5fb80d3..0000000
--- a/openflow/usr/include/dlg_keys.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *  $Id: dlg_keys.h,v 1.32 2012/12/21 21:54:30 tom Exp $
- *
- *  dlg_keys.h -- runtime binding support for dialog
- *
- *  Copyright 2005-2011,2012 Thomas E.  Dickey
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License, version 2.1
- *  as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to
- *	Free Software Foundation, Inc.
- *	51 Franklin St., Fifth Floor
- *	Boston, MA 02110, USA.
- */
-
-#ifndef DLG_KEYS_H_included
-#define DLG_KEYS_H_included 1
-/* *INDENT-OFF* */
-
-#include <dialog.h>
-
-#ifdef DLG_USE_WIDE_CURSES
-#include <wctype.h>
-#define dlg_toupper(ch) towupper((wint_t)ch)
-#define dlg_isupper(ch) iswupper((wint_t)ch)
-#else
-#define dlg_toupper(ch) (((ch) > 0 && (ch) <= 255) ? toupper(ch) : (ch))
-#define dlg_isupper(ch) (isalpha(ch) && isupper(ch))
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    int is_function_key;
-    int	curses_key;
-    int dialog_key;
-} DLG_KEYS_BINDING;
-
-#define DLG_KEYS_DATA(dialog, curses)  { (curses) >= KEY_MIN, curses, dialog }
-
-#define END_KEYS_BINDING { -1, 0, 0 }
-
-/*
- * Define dialog's internal function-keys past the range used by curses.
- */
-typedef enum {
-    DLGK_MIN = KEY_MAX + 1,
-    /* predefined buttons */
-    DLGK_OK,
-    DLGK_CANCEL,
-    DLGK_EXTRA,
-    DLGK_HELP,
-    DLGK_ESC,
-    /* moving from screen to screen (pages) */
-    DLGK_PAGE_FIRST,
-    DLGK_PAGE_LAST,
-    DLGK_PAGE_NEXT,
-    DLGK_PAGE_PREV,
-    /* moving within a list */
-    DLGK_ITEM_FIRST,
-    DLGK_ITEM_LAST,
-    DLGK_ITEM_NEXT,
-    DLGK_ITEM_PREV,
-    /* moving from field to field (or buttons) */
-    DLGK_FIELD_FIRST,
-    DLGK_FIELD_LAST,
-    DLGK_FIELD_NEXT,
-    DLGK_FIELD_PREV,
-    /* moving from form-field to form-field (or buttons) */
-    DLGK_FORM_FIRST,
-    DLGK_FORM_LAST,
-    DLGK_FORM_NEXT,
-    DLGK_FORM_PREV,
-    /* moving within a grid */
-    DLGK_GRID_UP,
-    DLGK_GRID_DOWN,
-    DLGK_GRID_LEFT,
-    DLGK_GRID_RIGHT,
-    /* delete */
-    DLGK_DELETE_LEFT,
-    DLGK_DELETE_RIGHT,
-    DLGK_DELETE_ALL,
-    /* special */
-    DLGK_ENTER,
-    DLGK_BEGIN,
-    DLGK_FINAL,
-    DLGK_SELECT,
-    DLGK_HELPFILE,
-    DLGK_TRACE
-} DLG_KEYS_ENUM;
-
-#define is_DLGK_MOUSE(code)	((code) >= M_EVENT)
-#define DLGK_MOUSE(code)	((code) + M_EVENT)
-
-#define HELPKEY_BINDINGS \
-	DLG_KEYS_DATA( DLGK_HELPFILE,	   CHR_HELP ), \
-	DLG_KEYS_DATA( DLGK_HELPFILE,	   KEY_F(1) ), \
-	DLG_KEYS_DATA( DLGK_HELPFILE,	   KEY_HELP )
-
-#define ENTERKEY_BINDINGS \
-	DLG_KEYS_DATA( DLGK_ENTER,	   '\n' ), \
-	DLG_KEYS_DATA( DLGK_ENTER,	   '\r' ), \
-	DLG_KEYS_DATA( DLGK_ENTER,	   KEY_ENTER )
-
-/* ^U == 21 */
-#define INPUTSTR_BINDINGS \
-	DLG_KEYS_DATA( DLGK_BEGIN,	   KEY_HOME ), \
-	DLG_KEYS_DATA( DLGK_DELETE_ALL,    CHR_KILL ), \
-	DLG_KEYS_DATA( DLGK_DELETE_LEFT,   CHR_BACKSPACE ), \
-	DLG_KEYS_DATA( DLGK_DELETE_LEFT,   KEY_BACKSPACE ), \
-	DLG_KEYS_DATA( DLGK_DELETE_RIGHT,  CHR_DELETE ), \
-	DLG_KEYS_DATA( DLGK_DELETE_RIGHT,  KEY_DC ), \
-	DLG_KEYS_DATA( DLGK_FINAL,	   KEY_END ), \
-	DLG_KEYS_DATA( DLGK_GRID_LEFT,	   KEY_LEFT ), \
-	DLG_KEYS_DATA( DLGK_GRID_RIGHT,	   KEY_RIGHT )
-
-#define SCROLL_FKEY_BINDINGS \
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	KEY_DOWN ), \
-	DLG_KEYS_DATA( DLGK_GRID_UP,	KEY_UP ), \
-	DLG_KEYS_DATA( DLGK_PAGE_FIRST,	KEY_HOME ), \
-	DLG_KEYS_DATA( DLGK_PAGE_LAST,	KEY_END ), \
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	KEY_NPAGE ), \
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	KEY_PPAGE )
-
-#define SCROLLKEY_BINDINGS \
-	SCROLL_FKEY_BINDINGS, \
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	'J' ), \
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	'j' ), \
-	DLG_KEYS_DATA( DLGK_GRID_UP,	'K' ), \
-	DLG_KEYS_DATA( DLGK_GRID_UP,	'k' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_FIRST,	'g' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_LAST,	'G' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	'F' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	'f' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	'B' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	'b' )
-
-#define TRAVERSE_BINDINGS \
-	DLG_KEYS_DATA( DLGK_ENTER,	' ' ), \
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	KEY_DOWN ), \
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ), \
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), \
-	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_UP ), \
-	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ), \
-	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT )
-
-extern int dlg_lookup_key(WINDOW * /*win*/, int /*curses_key*/, int * /*dialog_key*/);
-extern int dlg_result_key(int /*dialog_key*/, int /*fkey*/, int * /*resultp*/);
-extern void dlg_register_buttons(WINDOW * /*win*/, const char * /*name*/, const char ** /*buttons*/);
-extern void dlg_register_window(WINDOW * /*win*/, const char * /*name*/, DLG_KEYS_BINDING * /*binding*/);
-extern void dlg_unregister_window(WINDOW * /*win*/);
-
-#ifdef DLG_HAVE_RC_FILE
-extern int dlg_parse_bindkey(char * /*params*/);
-extern void dlg_dump_keys(FILE * /*fp*/);
-extern void dlg_dump_window_keys(FILE * /*fp*/, WINDOW * /*win*/);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-/* *INDENT-ON* */
-
-#endif /* DLG_KEYS_H_included */
diff --git a/openflow/usr/include/drm/drm.h b/openflow/usr/include/drm/drm.h
deleted file mode 100644
index e9b5762..0000000
--- a/openflow/usr/include/drm/drm.h
+++ /dev/null
@@ -1,875 +0,0 @@
-/**
- * \file drm.h
- * Header for the Direct Rendering Manager
- *
- * \author Rickard E. (Rik) Faith <faith@valinux.com>
- *
- * \par Acknowledgments:
- * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic \c cmpxchg.
- */
-
-/*
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _DRM_H_
-#define _DRM_H_
-
-#if defined(__KERNEL__) || defined(__linux__)
-
-#include <linux/types.h>
-#include <asm/ioctl.h>
-typedef unsigned int drm_handle_t;
-
-#else /* One of the BSDs */
-
-#include <sys/ioccom.h>
-#include <sys/types.h>
-typedef int8_t   __s8;
-typedef uint8_t  __u8;
-typedef int16_t  __s16;
-typedef uint16_t __u16;
-typedef int32_t  __s32;
-typedef uint32_t __u32;
-typedef int64_t  __s64;
-typedef uint64_t __u64;
-typedef unsigned long drm_handle_t;
-
-#endif
-
-#define DRM_NAME	"drm"	  /**< Name in kernel, /dev, and /proc */
-#define DRM_MIN_ORDER	5	  /**< At least 2^5 bytes = 32 bytes */
-#define DRM_MAX_ORDER	22	  /**< Up to 2^22 bytes = 4MB */
-#define DRM_RAM_PERCENT 10	  /**< How much system ram can we lock? */
-
-#define _DRM_LOCK_HELD	0x80000000U /**< Hardware lock is held */
-#define _DRM_LOCK_CONT	0x40000000U /**< Hardware lock is contended */
-#define _DRM_LOCK_IS_HELD(lock)	   ((lock) & _DRM_LOCK_HELD)
-#define _DRM_LOCK_IS_CONT(lock)	   ((lock) & _DRM_LOCK_CONT)
-#define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))
-
-typedef unsigned int drm_context_t;
-typedef unsigned int drm_drawable_t;
-typedef unsigned int drm_magic_t;
-
-/**
- * Cliprect.
- *
- * \warning: If you change this structure, make sure you change
- * XF86DRIClipRectRec in the server as well
- *
- * \note KW: Actually it's illegal to change either for
- * backwards-compatibility reasons.
- */
-struct drm_clip_rect {
-	unsigned short x1;
-	unsigned short y1;
-	unsigned short x2;
-	unsigned short y2;
-};
-
-/**
- * Drawable information.
- */
-struct drm_drawable_info {
-	unsigned int num_rects;
-	struct drm_clip_rect *rects;
-};
-
-/**
- * Texture region,
- */
-struct drm_tex_region {
-	unsigned char next;
-	unsigned char prev;
-	unsigned char in_use;
-	unsigned char padding;
-	unsigned int age;
-};
-
-/**
- * Hardware lock.
- *
- * The lock structure is a simple cache-line aligned integer.  To avoid
- * processor bus contention on a multiprocessor system, there should not be any
- * other data stored in the same cache line.
- */
-struct drm_hw_lock {
-	__volatile__ unsigned int lock;		/**< lock variable */
-	char padding[60];			/**< Pad to cache line */
-};
-
-/**
- * DRM_IOCTL_VERSION ioctl argument type.
- *
- * \sa drmGetVersion().
- */
-struct drm_version {
-	int version_major;	  /**< Major version */
-	int version_minor;	  /**< Minor version */
-	int version_patchlevel;	  /**< Patch level */
-	size_t name_len;	  /**< Length of name buffer */
-	char *name;	  /**< Name of driver */
-	size_t date_len;	  /**< Length of date buffer */
-	char *date;	  /**< User-space buffer to hold date */
-	size_t desc_len;	  /**< Length of desc buffer */
-	char *desc;	  /**< User-space buffer to hold desc */
-};
-
-/**
- * DRM_IOCTL_GET_UNIQUE ioctl argument type.
- *
- * \sa drmGetBusid() and drmSetBusId().
- */
-struct drm_unique {
-	size_t unique_len;	  /**< Length of unique */
-	char *unique;	  /**< Unique name for driver instantiation */
-};
-
-struct drm_list {
-	int count;		  /**< Length of user-space structures */
-	struct drm_version *version;
-};
-
-struct drm_block {
-	int unused;
-};
-
-/**
- * DRM_IOCTL_CONTROL ioctl argument type.
- *
- * \sa drmCtlInstHandler() and drmCtlUninstHandler().
- */
-struct drm_control {
-	enum {
-		DRM_ADD_COMMAND,
-		DRM_RM_COMMAND,
-		DRM_INST_HANDLER,
-		DRM_UNINST_HANDLER
-	} func;
-	int irq;
-};
-
-/**
- * Type of memory to map.
- */
-enum drm_map_type {
-	_DRM_FRAME_BUFFER = 0,	  /**< WC (no caching), no core dump */
-	_DRM_REGISTERS = 1,	  /**< no caching, no core dump */
-	_DRM_SHM = 2,		  /**< shared, cached */
-	_DRM_AGP = 3,		  /**< AGP/GART */
-	_DRM_SCATTER_GATHER = 4,  /**< Scatter/gather memory for PCI DMA */
-	_DRM_CONSISTENT = 5,	  /**< Consistent memory for PCI DMA */
-};
-
-/**
- * Memory mapping flags.
- */
-enum drm_map_flags {
-	_DRM_RESTRICTED = 0x01,	     /**< Cannot be mapped to user-virtual */
-	_DRM_READ_ONLY = 0x02,
-	_DRM_LOCKED = 0x04,	     /**< shared, cached, locked */
-	_DRM_KERNEL = 0x08,	     /**< kernel requires access */
-	_DRM_WRITE_COMBINING = 0x10, /**< use write-combining if available */
-	_DRM_CONTAINS_LOCK = 0x20,   /**< SHM page that contains lock */
-	_DRM_REMOVABLE = 0x40,	     /**< Removable mapping */
-	_DRM_DRIVER = 0x80	     /**< Managed by driver */
-};
-
-struct drm_ctx_priv_map {
-	unsigned int ctx_id;	 /**< Context requesting private mapping */
-	void *handle;		 /**< Handle of map */
-};
-
-/**
- * DRM_IOCTL_GET_MAP, DRM_IOCTL_ADD_MAP and DRM_IOCTL_RM_MAP ioctls
- * argument type.
- *
- * \sa drmAddMap().
- */
-struct drm_map {
-	unsigned long offset;	 /**< Requested physical address (0 for SAREA)*/
-	unsigned long size;	 /**< Requested physical size (bytes) */
-	enum drm_map_type type;	 /**< Type of memory to map */
-	enum drm_map_flags flags;	 /**< Flags */
-	void *handle;		 /**< User-space: "Handle" to pass to mmap() */
-				 /**< Kernel-space: kernel-virtual address */
-	int mtrr;		 /**< MTRR slot used */
-	/*   Private data */
-};
-
-/**
- * DRM_IOCTL_GET_CLIENT ioctl argument type.
- */
-struct drm_client {
-	int idx;		/**< Which client desired? */
-	int auth;		/**< Is client authenticated? */
-	unsigned long pid;	/**< Process ID */
-	unsigned long uid;	/**< User ID */
-	unsigned long magic;	/**< Magic */
-	unsigned long iocs;	/**< Ioctl count */
-};
-
-enum drm_stat_type {
-	_DRM_STAT_LOCK,
-	_DRM_STAT_OPENS,
-	_DRM_STAT_CLOSES,
-	_DRM_STAT_IOCTLS,
-	_DRM_STAT_LOCKS,
-	_DRM_STAT_UNLOCKS,
-	_DRM_STAT_VALUE,	/**< Generic value */
-	_DRM_STAT_BYTE,		/**< Generic byte counter (1024bytes/K) */
-	_DRM_STAT_COUNT,	/**< Generic non-byte counter (1000/k) */
-
-	_DRM_STAT_IRQ,		/**< IRQ */
-	_DRM_STAT_PRIMARY,	/**< Primary DMA bytes */
-	_DRM_STAT_SECONDARY,	/**< Secondary DMA bytes */
-	_DRM_STAT_DMA,		/**< DMA */
-	_DRM_STAT_SPECIAL,	/**< Special DMA (e.g., priority or polled) */
-	_DRM_STAT_MISSED	/**< Missed DMA opportunity */
-	    /* Add to the *END* of the list */
-};
-
-/**
- * DRM_IOCTL_GET_STATS ioctl argument type.
- */
-struct drm_stats {
-	unsigned long count;
-	struct {
-		unsigned long value;
-		enum drm_stat_type type;
-	} data[15];
-};
-
-/**
- * Hardware locking flags.
- */
-enum drm_lock_flags {
-	_DRM_LOCK_READY = 0x01,	     /**< Wait until hardware is ready for DMA */
-	_DRM_LOCK_QUIESCENT = 0x02,  /**< Wait until hardware quiescent */
-	_DRM_LOCK_FLUSH = 0x04,	     /**< Flush this context's DMA queue first */
-	_DRM_LOCK_FLUSH_ALL = 0x08,  /**< Flush all DMA queues first */
-	/* These *HALT* flags aren't supported yet
-	   -- they will be used to support the
-	   full-screen DGA-like mode. */
-	_DRM_HALT_ALL_QUEUES = 0x10, /**< Halt all current and future queues */
-	_DRM_HALT_CUR_QUEUES = 0x20  /**< Halt all current queues */
-};
-
-/**
- * DRM_IOCTL_LOCK, DRM_IOCTL_UNLOCK and DRM_IOCTL_FINISH ioctl argument type.
- *
- * \sa drmGetLock() and drmUnlock().
- */
-struct drm_lock {
-	int context;
-	enum drm_lock_flags flags;
-};
-
-/**
- * DMA flags
- *
- * \warning
- * These values \e must match xf86drm.h.
- *
- * \sa drm_dma.
- */
-enum drm_dma_flags {
-	/* Flags for DMA buffer dispatch */
-	_DRM_DMA_BLOCK = 0x01,	      /**<
-				       * Block until buffer dispatched.
-				       *
-				       * \note The buffer may not yet have
-				       * been processed by the hardware --
-				       * getting a hardware lock with the
-				       * hardware quiescent will ensure
-				       * that the buffer has been
-				       * processed.
-				       */
-	_DRM_DMA_WHILE_LOCKED = 0x02, /**< Dispatch while lock held */
-	_DRM_DMA_PRIORITY = 0x04,     /**< High priority dispatch */
-
-	/* Flags for DMA buffer request */
-	_DRM_DMA_WAIT = 0x10,	      /**< Wait for free buffers */
-	_DRM_DMA_SMALLER_OK = 0x20,   /**< Smaller-than-requested buffers OK */
-	_DRM_DMA_LARGER_OK = 0x40     /**< Larger-than-requested buffers OK */
-};
-
-/**
- * DRM_IOCTL_ADD_BUFS and DRM_IOCTL_MARK_BUFS ioctl argument type.
- *
- * \sa drmAddBufs().
- */
-struct drm_buf_desc {
-	int count;		 /**< Number of buffers of this size */
-	int size;		 /**< Size in bytes */
-	int low_mark;		 /**< Low water mark */
-	int high_mark;		 /**< High water mark */
-	enum {
-		_DRM_PAGE_ALIGN = 0x01,	/**< Align on page boundaries for DMA */
-		_DRM_AGP_BUFFER = 0x02,	/**< Buffer is in AGP space */
-		_DRM_SG_BUFFER = 0x04,	/**< Scatter/gather memory buffer */
-		_DRM_FB_BUFFER = 0x08,	/**< Buffer is in frame buffer */
-		_DRM_PCI_BUFFER_RO = 0x10 /**< Map PCI DMA buffer read-only */
-	} flags;
-	unsigned long agp_start; /**<
-				  * Start address of where the AGP buffers are
-				  * in the AGP aperture
-				  */
-};
-
-/**
- * DRM_IOCTL_INFO_BUFS ioctl argument type.
- */
-struct drm_buf_info {
-	int count;		/**< Entries in list */
-	struct drm_buf_desc *list;
-};
-
-/**
- * DRM_IOCTL_FREE_BUFS ioctl argument type.
- */
-struct drm_buf_free {
-	int count;
-	int *list;
-};
-
-/**
- * Buffer information
- *
- * \sa drm_buf_map.
- */
-struct drm_buf_pub {
-	int idx;		       /**< Index into the master buffer list */
-	int total;		       /**< Buffer size */
-	int used;		       /**< Amount of buffer in use (for DMA) */
-	void *address;	       /**< Address of buffer */
-};
-
-/**
- * DRM_IOCTL_MAP_BUFS ioctl argument type.
- */
-struct drm_buf_map {
-	int count;		/**< Length of the buffer list */
-	void *virtual;		/**< Mmap'd area in user-virtual */
-	struct drm_buf_pub *list;	/**< Buffer information */
-};
-
-/**
- * DRM_IOCTL_DMA ioctl argument type.
- *
- * Indices here refer to the offset into the buffer list in drm_buf_get.
- *
- * \sa drmDMA().
- */
-struct drm_dma {
-	int context;			  /**< Context handle */
-	int send_count;			  /**< Number of buffers to send */
-	int *send_indices;	  /**< List of handles to buffers */
-	int *send_sizes;		  /**< Lengths of data to send */
-	enum drm_dma_flags flags;	  /**< Flags */
-	int request_count;		  /**< Number of buffers requested */
-	int request_size;		  /**< Desired size for buffers */
-	int *request_indices;	  /**< Buffer information */
-	int *request_sizes;
-	int granted_count;		  /**< Number of buffers granted */
-};
-
-enum drm_ctx_flags {
-	_DRM_CONTEXT_PRESERVED = 0x01,
-	_DRM_CONTEXT_2DONLY = 0x02
-};
-
-/**
- * DRM_IOCTL_ADD_CTX ioctl argument type.
- *
- * \sa drmCreateContext() and drmDestroyContext().
- */
-struct drm_ctx {
-	drm_context_t handle;
-	enum drm_ctx_flags flags;
-};
-
-/**
- * DRM_IOCTL_RES_CTX ioctl argument type.
- */
-struct drm_ctx_res {
-	int count;
-	struct drm_ctx *contexts;
-};
-
-/**
- * DRM_IOCTL_ADD_DRAW and DRM_IOCTL_RM_DRAW ioctl argument type.
- */
-struct drm_draw {
-	drm_drawable_t handle;
-};
-
-/**
- * DRM_IOCTL_UPDATE_DRAW ioctl argument type.
- */
-typedef enum {
-	DRM_DRAWABLE_CLIPRECTS,
-} drm_drawable_info_type_t;
-
-struct drm_update_draw {
-	drm_drawable_t handle;
-	unsigned int type;
-	unsigned int num;
-	unsigned long long data;
-};
-
-/**
- * DRM_IOCTL_GET_MAGIC and DRM_IOCTL_AUTH_MAGIC ioctl argument type.
- */
-struct drm_auth {
-	drm_magic_t magic;
-};
-
-/**
- * DRM_IOCTL_IRQ_BUSID ioctl argument type.
- *
- * \sa drmGetInterruptFromBusID().
- */
-struct drm_irq_busid {
-	int irq;	/**< IRQ number */
-	int busnum;	/**< bus number */
-	int devnum;	/**< device number */
-	int funcnum;	/**< function number */
-};
-
-enum drm_vblank_seq_type {
-	_DRM_VBLANK_ABSOLUTE = 0x0,	/**< Wait for specific vblank sequence number */
-	_DRM_VBLANK_RELATIVE = 0x1,	/**< Wait for given number of vblanks */
-	/* bits 1-6 are reserved for high crtcs */
-	_DRM_VBLANK_HIGH_CRTC_MASK = 0x0000003e,
-	_DRM_VBLANK_EVENT = 0x4000000,   /**< Send event instead of blocking */
-	_DRM_VBLANK_FLIP = 0x8000000,   /**< Scheduled buffer swap should flip */
-	_DRM_VBLANK_NEXTONMISS = 0x10000000,	/**< If missed, wait for next vblank */
-	_DRM_VBLANK_SECONDARY = 0x20000000,	/**< Secondary display controller */
-	_DRM_VBLANK_SIGNAL = 0x40000000	/**< Send signal instead of blocking, unsupported */
-};
-#define _DRM_VBLANK_HIGH_CRTC_SHIFT 1
-
-#define _DRM_VBLANK_TYPES_MASK (_DRM_VBLANK_ABSOLUTE | _DRM_VBLANK_RELATIVE)
-#define _DRM_VBLANK_FLAGS_MASK (_DRM_VBLANK_EVENT | _DRM_VBLANK_SIGNAL | \
-				_DRM_VBLANK_SECONDARY | _DRM_VBLANK_NEXTONMISS)
-
-struct drm_wait_vblank_request {
-	enum drm_vblank_seq_type type;
-	unsigned int sequence;
-	unsigned long signal;
-};
-
-struct drm_wait_vblank_reply {
-	enum drm_vblank_seq_type type;
-	unsigned int sequence;
-	long tval_sec;
-	long tval_usec;
-};
-
-/**
- * DRM_IOCTL_WAIT_VBLANK ioctl argument type.
- *
- * \sa drmWaitVBlank().
- */
-union drm_wait_vblank {
-	struct drm_wait_vblank_request request;
-	struct drm_wait_vblank_reply reply;
-};
-
-#define _DRM_PRE_MODESET 1
-#define _DRM_POST_MODESET 2
-
-/**
- * DRM_IOCTL_MODESET_CTL ioctl argument type
- *
- * \sa drmModesetCtl().
- */
-struct drm_modeset_ctl {
-	__u32 crtc;
-	__u32 cmd;
-};
-
-/**
- * DRM_IOCTL_AGP_ENABLE ioctl argument type.
- *
- * \sa drmAgpEnable().
- */
-struct drm_agp_mode {
-	unsigned long mode;	/**< AGP mode */
-};
-
-/**
- * DRM_IOCTL_AGP_ALLOC and DRM_IOCTL_AGP_FREE ioctls argument type.
- *
- * \sa drmAgpAlloc() and drmAgpFree().
- */
-struct drm_agp_buffer {
-	unsigned long size;	/**< In bytes -- will round to page boundary */
-	unsigned long handle;	/**< Used for binding / unbinding */
-	unsigned long type;	/**< Type of memory to allocate */
-	unsigned long physical;	/**< Physical used by i810 */
-};
-
-/**
- * DRM_IOCTL_AGP_BIND and DRM_IOCTL_AGP_UNBIND ioctls argument type.
- *
- * \sa drmAgpBind() and drmAgpUnbind().
- */
-struct drm_agp_binding {
-	unsigned long handle;	/**< From drm_agp_buffer */
-	unsigned long offset;	/**< In bytes -- will round to page boundary */
-};
-
-/**
- * DRM_IOCTL_AGP_INFO ioctl argument type.
- *
- * \sa drmAgpVersionMajor(), drmAgpVersionMinor(), drmAgpGetMode(),
- * drmAgpBase(), drmAgpSize(), drmAgpMemoryUsed(), drmAgpMemoryAvail(),
- * drmAgpVendorId() and drmAgpDeviceId().
- */
-struct drm_agp_info {
-	int agp_version_major;
-	int agp_version_minor;
-	unsigned long mode;
-	unsigned long aperture_base;	/* physical address */
-	unsigned long aperture_size;	/* bytes */
-	unsigned long memory_allowed;	/* bytes */
-	unsigned long memory_used;
-
-	/* PCI information */
-	unsigned short id_vendor;
-	unsigned short id_device;
-};
-
-/**
- * DRM_IOCTL_SG_ALLOC ioctl argument type.
- */
-struct drm_scatter_gather {
-	unsigned long size;	/**< In bytes -- will round to page boundary */
-	unsigned long handle;	/**< Used for mapping / unmapping */
-};
-
-/**
- * DRM_IOCTL_SET_VERSION ioctl argument type.
- */
-struct drm_set_version {
-	int drm_di_major;
-	int drm_di_minor;
-	int drm_dd_major;
-	int drm_dd_minor;
-};
-
-/** DRM_IOCTL_GEM_CLOSE ioctl argument type */
-struct drm_gem_close {
-	/** Handle of the object to be closed. */
-	__u32 handle;
-	__u32 pad;
-};
-
-/** DRM_IOCTL_GEM_FLINK ioctl argument type */
-struct drm_gem_flink {
-	/** Handle for the object being named */
-	__u32 handle;
-
-	/** Returned global name */
-	__u32 name;
-};
-
-/** DRM_IOCTL_GEM_OPEN ioctl argument type */
-struct drm_gem_open {
-	/** Name of object being opened */
-	__u32 name;
-
-	/** Returned handle for the object */
-	__u32 handle;
-
-	/** Returned size of the object */
-	__u64 size;
-};
-
-#define DRM_CAP_DUMB_BUFFER		0x1
-#define DRM_CAP_VBLANK_HIGH_CRTC	0x2
-#define DRM_CAP_DUMB_PREFERRED_DEPTH	0x3
-#define DRM_CAP_DUMB_PREFER_SHADOW	0x4
-#define DRM_CAP_PRIME			0x5
-#define  DRM_PRIME_CAP_IMPORT		0x1
-#define  DRM_PRIME_CAP_EXPORT		0x2
-#define DRM_CAP_TIMESTAMP_MONOTONIC	0x6
-#define DRM_CAP_ASYNC_PAGE_FLIP		0x7
-/*
- * The CURSOR_WIDTH and CURSOR_HEIGHT capabilities return a valid widthxheight
- * combination for the hardware cursor. The intention is that a hardware
- * agnostic userspace can query a cursor plane size to use.
- *
- * Note that the cross-driver contract is to merely return a valid size;
- * drivers are free to attach another meaning on top, eg. i915 returns the
- * maximum plane size.
- */
-#define DRM_CAP_CURSOR_WIDTH		0x8
-#define DRM_CAP_CURSOR_HEIGHT		0x9
-#define DRM_CAP_ADDFB2_MODIFIERS	0x10
-
-/** DRM_IOCTL_GET_CAP ioctl argument type */
-struct drm_get_cap {
-	__u64 capability;
-	__u64 value;
-};
-
-/**
- * DRM_CLIENT_CAP_STEREO_3D
- *
- * if set to 1, the DRM core will expose the stereo 3D capabilities of the
- * monitor by advertising the supported 3D layouts in the flags of struct
- * drm_mode_modeinfo.
- */
-#define DRM_CLIENT_CAP_STEREO_3D	1
-
-/**
- * DRM_CLIENT_CAP_UNIVERSAL_PLANES
- *
- * If set to 1, the DRM core will expose all planes (overlay, primary, and
- * cursor) to userspace.
- */
-#define DRM_CLIENT_CAP_UNIVERSAL_PLANES  2
-
-/**
- * DRM_CLIENT_CAP_ATOMIC
- *
- * If set to 1, the DRM core will expose atomic properties to userspace
- */
-#define DRM_CLIENT_CAP_ATOMIC	3
-
-/** DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */
-struct drm_set_client_cap {
-	__u64 capability;
-	__u64 value;
-};
-
-#define DRM_CLOEXEC O_CLOEXEC
-struct drm_prime_handle {
-	__u32 handle;
-
-	/** Flags.. only applicable for handle->fd */
-	__u32 flags;
-
-	/** Returned dmabuf file descriptor */
-	__s32 fd;
-};
-
-#include <drm/drm_mode.h>
-
-#define DRM_IOCTL_BASE			'd'
-#define DRM_IO(nr)			_IO(DRM_IOCTL_BASE,nr)
-#define DRM_IOR(nr,type)		_IOR(DRM_IOCTL_BASE,nr,type)
-#define DRM_IOW(nr,type)		_IOW(DRM_IOCTL_BASE,nr,type)
-#define DRM_IOWR(nr,type)		_IOWR(DRM_IOCTL_BASE,nr,type)
-
-#define DRM_IOCTL_VERSION		DRM_IOWR(0x00, struct drm_version)
-#define DRM_IOCTL_GET_UNIQUE		DRM_IOWR(0x01, struct drm_unique)
-#define DRM_IOCTL_GET_MAGIC		DRM_IOR( 0x02, struct drm_auth)
-#define DRM_IOCTL_IRQ_BUSID		DRM_IOWR(0x03, struct drm_irq_busid)
-#define DRM_IOCTL_GET_MAP               DRM_IOWR(0x04, struct drm_map)
-#define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, struct drm_client)
-#define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, struct drm_stats)
-#define DRM_IOCTL_SET_VERSION		DRM_IOWR(0x07, struct drm_set_version)
-#define DRM_IOCTL_MODESET_CTL           DRM_IOW(0x08, struct drm_modeset_ctl)
-#define DRM_IOCTL_GEM_CLOSE		DRM_IOW (0x09, struct drm_gem_close)
-#define DRM_IOCTL_GEM_FLINK		DRM_IOWR(0x0a, struct drm_gem_flink)
-#define DRM_IOCTL_GEM_OPEN		DRM_IOWR(0x0b, struct drm_gem_open)
-#define DRM_IOCTL_GET_CAP		DRM_IOWR(0x0c, struct drm_get_cap)
-#define DRM_IOCTL_SET_CLIENT_CAP	DRM_IOW( 0x0d, struct drm_set_client_cap)
-
-#define DRM_IOCTL_SET_UNIQUE		DRM_IOW( 0x10, struct drm_unique)
-#define DRM_IOCTL_AUTH_MAGIC		DRM_IOW( 0x11, struct drm_auth)
-#define DRM_IOCTL_BLOCK			DRM_IOWR(0x12, struct drm_block)
-#define DRM_IOCTL_UNBLOCK		DRM_IOWR(0x13, struct drm_block)
-#define DRM_IOCTL_CONTROL		DRM_IOW( 0x14, struct drm_control)
-#define DRM_IOCTL_ADD_MAP		DRM_IOWR(0x15, struct drm_map)
-#define DRM_IOCTL_ADD_BUFS		DRM_IOWR(0x16, struct drm_buf_desc)
-#define DRM_IOCTL_MARK_BUFS		DRM_IOW( 0x17, struct drm_buf_desc)
-#define DRM_IOCTL_INFO_BUFS		DRM_IOWR(0x18, struct drm_buf_info)
-#define DRM_IOCTL_MAP_BUFS		DRM_IOWR(0x19, struct drm_buf_map)
-#define DRM_IOCTL_FREE_BUFS		DRM_IOW( 0x1a, struct drm_buf_free)
-
-#define DRM_IOCTL_RM_MAP		DRM_IOW( 0x1b, struct drm_map)
-
-#define DRM_IOCTL_SET_SAREA_CTX		DRM_IOW( 0x1c, struct drm_ctx_priv_map)
-#define DRM_IOCTL_GET_SAREA_CTX 	DRM_IOWR(0x1d, struct drm_ctx_priv_map)
-
-#define DRM_IOCTL_SET_MASTER            DRM_IO(0x1e)
-#define DRM_IOCTL_DROP_MASTER           DRM_IO(0x1f)
-
-#define DRM_IOCTL_ADD_CTX		DRM_IOWR(0x20, struct drm_ctx)
-#define DRM_IOCTL_RM_CTX		DRM_IOWR(0x21, struct drm_ctx)
-#define DRM_IOCTL_MOD_CTX		DRM_IOW( 0x22, struct drm_ctx)
-#define DRM_IOCTL_GET_CTX		DRM_IOWR(0x23, struct drm_ctx)
-#define DRM_IOCTL_SWITCH_CTX		DRM_IOW( 0x24, struct drm_ctx)
-#define DRM_IOCTL_NEW_CTX		DRM_IOW( 0x25, struct drm_ctx)
-#define DRM_IOCTL_RES_CTX		DRM_IOWR(0x26, struct drm_ctx_res)
-#define DRM_IOCTL_ADD_DRAW		DRM_IOWR(0x27, struct drm_draw)
-#define DRM_IOCTL_RM_DRAW		DRM_IOWR(0x28, struct drm_draw)
-#define DRM_IOCTL_DMA			DRM_IOWR(0x29, struct drm_dma)
-#define DRM_IOCTL_LOCK			DRM_IOW( 0x2a, struct drm_lock)
-#define DRM_IOCTL_UNLOCK		DRM_IOW( 0x2b, struct drm_lock)
-#define DRM_IOCTL_FINISH		DRM_IOW( 0x2c, struct drm_lock)
-
-#define DRM_IOCTL_PRIME_HANDLE_TO_FD    DRM_IOWR(0x2d, struct drm_prime_handle)
-#define DRM_IOCTL_PRIME_FD_TO_HANDLE    DRM_IOWR(0x2e, struct drm_prime_handle)
-
-#define DRM_IOCTL_AGP_ACQUIRE		DRM_IO(  0x30)
-#define DRM_IOCTL_AGP_RELEASE		DRM_IO(  0x31)
-#define DRM_IOCTL_AGP_ENABLE		DRM_IOW( 0x32, struct drm_agp_mode)
-#define DRM_IOCTL_AGP_INFO		DRM_IOR( 0x33, struct drm_agp_info)
-#define DRM_IOCTL_AGP_ALLOC		DRM_IOWR(0x34, struct drm_agp_buffer)
-#define DRM_IOCTL_AGP_FREE		DRM_IOW( 0x35, struct drm_agp_buffer)
-#define DRM_IOCTL_AGP_BIND		DRM_IOW( 0x36, struct drm_agp_binding)
-#define DRM_IOCTL_AGP_UNBIND		DRM_IOW( 0x37, struct drm_agp_binding)
-
-#define DRM_IOCTL_SG_ALLOC		DRM_IOWR(0x38, struct drm_scatter_gather)
-#define DRM_IOCTL_SG_FREE		DRM_IOW( 0x39, struct drm_scatter_gather)
-
-#define DRM_IOCTL_WAIT_VBLANK		DRM_IOWR(0x3a, union drm_wait_vblank)
-
-#define DRM_IOCTL_UPDATE_DRAW		DRM_IOW(0x3f, struct drm_update_draw)
-
-#define DRM_IOCTL_MODE_GETRESOURCES	DRM_IOWR(0xA0, struct drm_mode_card_res)
-#define DRM_IOCTL_MODE_GETCRTC		DRM_IOWR(0xA1, struct drm_mode_crtc)
-#define DRM_IOCTL_MODE_SETCRTC		DRM_IOWR(0xA2, struct drm_mode_crtc)
-#define DRM_IOCTL_MODE_CURSOR		DRM_IOWR(0xA3, struct drm_mode_cursor)
-#define DRM_IOCTL_MODE_GETGAMMA		DRM_IOWR(0xA4, struct drm_mode_crtc_lut)
-#define DRM_IOCTL_MODE_SETGAMMA		DRM_IOWR(0xA5, struct drm_mode_crtc_lut)
-#define DRM_IOCTL_MODE_GETENCODER	DRM_IOWR(0xA6, struct drm_mode_get_encoder)
-#define DRM_IOCTL_MODE_GETCONNECTOR	DRM_IOWR(0xA7, struct drm_mode_get_connector)
-#define DRM_IOCTL_MODE_ATTACHMODE	DRM_IOWR(0xA8, struct drm_mode_mode_cmd) /* deprecated (never worked) */
-#define DRM_IOCTL_MODE_DETACHMODE	DRM_IOWR(0xA9, struct drm_mode_mode_cmd) /* deprecated (never worked) */
-
-#define DRM_IOCTL_MODE_GETPROPERTY	DRM_IOWR(0xAA, struct drm_mode_get_property)
-#define DRM_IOCTL_MODE_SETPROPERTY	DRM_IOWR(0xAB, struct drm_mode_connector_set_property)
-#define DRM_IOCTL_MODE_GETPROPBLOB	DRM_IOWR(0xAC, struct drm_mode_get_blob)
-#define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
-#define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
-#define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
-#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip)
-#define DRM_IOCTL_MODE_DIRTYFB		DRM_IOWR(0xB1, struct drm_mode_fb_dirty_cmd)
-
-#define DRM_IOCTL_MODE_CREATE_DUMB DRM_IOWR(0xB2, struct drm_mode_create_dumb)
-#define DRM_IOCTL_MODE_MAP_DUMB    DRM_IOWR(0xB3, struct drm_mode_map_dumb)
-#define DRM_IOCTL_MODE_DESTROY_DUMB    DRM_IOWR(0xB4, struct drm_mode_destroy_dumb)
-#define DRM_IOCTL_MODE_GETPLANERESOURCES DRM_IOWR(0xB5, struct drm_mode_get_plane_res)
-#define DRM_IOCTL_MODE_GETPLANE	DRM_IOWR(0xB6, struct drm_mode_get_plane)
-#define DRM_IOCTL_MODE_SETPLANE	DRM_IOWR(0xB7, struct drm_mode_set_plane)
-#define DRM_IOCTL_MODE_ADDFB2		DRM_IOWR(0xB8, struct drm_mode_fb_cmd2)
-#define DRM_IOCTL_MODE_OBJ_GETPROPERTIES	DRM_IOWR(0xB9, struct drm_mode_obj_get_properties)
-#define DRM_IOCTL_MODE_OBJ_SETPROPERTY	DRM_IOWR(0xBA, struct drm_mode_obj_set_property)
-#define DRM_IOCTL_MODE_CURSOR2		DRM_IOWR(0xBB, struct drm_mode_cursor2)
-#define DRM_IOCTL_MODE_ATOMIC		DRM_IOWR(0xBC, struct drm_mode_atomic)
-#define DRM_IOCTL_MODE_CREATEPROPBLOB	DRM_IOWR(0xBD, struct drm_mode_create_blob)
-#define DRM_IOCTL_MODE_DESTROYPROPBLOB	DRM_IOWR(0xBE, struct drm_mode_destroy_blob)
-
-/**
- * Device specific ioctls should only be in their respective headers
- * The device specific ioctl range is from 0x40 to 0x9f.
- * Generic IOCTLS restart at 0xA0.
- *
- * \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and
- * drmCommandReadWrite().
- */
-#define DRM_COMMAND_BASE                0x40
-#define DRM_COMMAND_END			0xA0
-
-/**
- * Header for events written back to userspace on the drm fd.  The
- * type defines the type of event, the length specifies the total
- * length of the event (including the header), and user_data is
- * typically a 64 bit value passed with the ioctl that triggered the
- * event.  A read on the drm fd will always only return complete
- * events, that is, if for example the read buffer is 100 bytes, and
- * there are two 64 byte events pending, only one will be returned.
- *
- * Event types 0 - 0x7fffffff are generic drm events, 0x80000000 and
- * up are chipset specific.
- */
-struct drm_event {
-	__u32 type;
-	__u32 length;
-};
-
-#define DRM_EVENT_VBLANK 0x01
-#define DRM_EVENT_FLIP_COMPLETE 0x02
-
-struct drm_event_vblank {
-	struct drm_event base;
-	__u64 user_data;
-	__u32 tv_sec;
-	__u32 tv_usec;
-	__u32 sequence;
-	__u32 reserved;
-};
-
-/* typedef area */
-typedef struct drm_clip_rect drm_clip_rect_t;
-typedef struct drm_drawable_info drm_drawable_info_t;
-typedef struct drm_tex_region drm_tex_region_t;
-typedef struct drm_hw_lock drm_hw_lock_t;
-typedef struct drm_version drm_version_t;
-typedef struct drm_unique drm_unique_t;
-typedef struct drm_list drm_list_t;
-typedef struct drm_block drm_block_t;
-typedef struct drm_control drm_control_t;
-typedef enum drm_map_type drm_map_type_t;
-typedef enum drm_map_flags drm_map_flags_t;
-typedef struct drm_ctx_priv_map drm_ctx_priv_map_t;
-typedef struct drm_map drm_map_t;
-typedef struct drm_client drm_client_t;
-typedef enum drm_stat_type drm_stat_type_t;
-typedef struct drm_stats drm_stats_t;
-typedef enum drm_lock_flags drm_lock_flags_t;
-typedef struct drm_lock drm_lock_t;
-typedef enum drm_dma_flags drm_dma_flags_t;
-typedef struct drm_buf_desc drm_buf_desc_t;
-typedef struct drm_buf_info drm_buf_info_t;
-typedef struct drm_buf_free drm_buf_free_t;
-typedef struct drm_buf_pub drm_buf_pub_t;
-typedef struct drm_buf_map drm_buf_map_t;
-typedef struct drm_dma drm_dma_t;
-typedef union drm_wait_vblank drm_wait_vblank_t;
-typedef struct drm_agp_mode drm_agp_mode_t;
-typedef enum drm_ctx_flags drm_ctx_flags_t;
-typedef struct drm_ctx drm_ctx_t;
-typedef struct drm_ctx_res drm_ctx_res_t;
-typedef struct drm_draw drm_draw_t;
-typedef struct drm_update_draw drm_update_draw_t;
-typedef struct drm_auth drm_auth_t;
-typedef struct drm_irq_busid drm_irq_busid_t;
-typedef enum drm_vblank_seq_type drm_vblank_seq_type_t;
-
-typedef struct drm_agp_buffer drm_agp_buffer_t;
-typedef struct drm_agp_binding drm_agp_binding_t;
-typedef struct drm_agp_info drm_agp_info_t;
-typedef struct drm_scatter_gather drm_scatter_gather_t;
-typedef struct drm_set_version drm_set_version_t;
-
-#endif
diff --git a/openflow/usr/include/drm/drm_fourcc.h b/openflow/usr/include/drm/drm_fourcc.h
deleted file mode 100644
index 0b69a77..0000000
--- a/openflow/usr/include/drm/drm_fourcc.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright 2011 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef DRM_FOURCC_H
-#define DRM_FOURCC_H
-
-#include <linux/types.h>
-
-#define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \
-				 ((__u32)(c) << 16) | ((__u32)(d) << 24))
-
-#define DRM_FORMAT_BIG_ENDIAN (1<<31) /* format is big endian instead of little endian */
-
-/* color index */
-#define DRM_FORMAT_C8		fourcc_code('C', '8', ' ', ' ') /* [7:0] C */
-
-/* 8 bpp Red */
-#define DRM_FORMAT_R8		fourcc_code('R', '8', ' ', ' ') /* [7:0] R */
-
-/* 16 bpp RG */
-#define DRM_FORMAT_RG88		fourcc_code('R', 'G', '8', '8') /* [15:0] R:G 8:8 little endian */
-#define DRM_FORMAT_GR88		fourcc_code('G', 'R', '8', '8') /* [15:0] G:R 8:8 little endian */
-
-/* 8 bpp RGB */
-#define DRM_FORMAT_RGB332	fourcc_code('R', 'G', 'B', '8') /* [7:0] R:G:B 3:3:2 */
-#define DRM_FORMAT_BGR233	fourcc_code('B', 'G', 'R', '8') /* [7:0] B:G:R 2:3:3 */
-
-/* 16 bpp RGB */
-#define DRM_FORMAT_XRGB4444	fourcc_code('X', 'R', '1', '2') /* [15:0] x:R:G:B 4:4:4:4 little endian */
-#define DRM_FORMAT_XBGR4444	fourcc_code('X', 'B', '1', '2') /* [15:0] x:B:G:R 4:4:4:4 little endian */
-#define DRM_FORMAT_RGBX4444	fourcc_code('R', 'X', '1', '2') /* [15:0] R:G:B:x 4:4:4:4 little endian */
-#define DRM_FORMAT_BGRX4444	fourcc_code('B', 'X', '1', '2') /* [15:0] B:G:R:x 4:4:4:4 little endian */
-
-#define DRM_FORMAT_ARGB4444	fourcc_code('A', 'R', '1', '2') /* [15:0] A:R:G:B 4:4:4:4 little endian */
-#define DRM_FORMAT_ABGR4444	fourcc_code('A', 'B', '1', '2') /* [15:0] A:B:G:R 4:4:4:4 little endian */
-#define DRM_FORMAT_RGBA4444	fourcc_code('R', 'A', '1', '2') /* [15:0] R:G:B:A 4:4:4:4 little endian */
-#define DRM_FORMAT_BGRA4444	fourcc_code('B', 'A', '1', '2') /* [15:0] B:G:R:A 4:4:4:4 little endian */
-
-#define DRM_FORMAT_XRGB1555	fourcc_code('X', 'R', '1', '5') /* [15:0] x:R:G:B 1:5:5:5 little endian */
-#define DRM_FORMAT_XBGR1555	fourcc_code('X', 'B', '1', '5') /* [15:0] x:B:G:R 1:5:5:5 little endian */
-#define DRM_FORMAT_RGBX5551	fourcc_code('R', 'X', '1', '5') /* [15:0] R:G:B:x 5:5:5:1 little endian */
-#define DRM_FORMAT_BGRX5551	fourcc_code('B', 'X', '1', '5') /* [15:0] B:G:R:x 5:5:5:1 little endian */
-
-#define DRM_FORMAT_ARGB1555	fourcc_code('A', 'R', '1', '5') /* [15:0] A:R:G:B 1:5:5:5 little endian */
-#define DRM_FORMAT_ABGR1555	fourcc_code('A', 'B', '1', '5') /* [15:0] A:B:G:R 1:5:5:5 little endian */
-#define DRM_FORMAT_RGBA5551	fourcc_code('R', 'A', '1', '5') /* [15:0] R:G:B:A 5:5:5:1 little endian */
-#define DRM_FORMAT_BGRA5551	fourcc_code('B', 'A', '1', '5') /* [15:0] B:G:R:A 5:5:5:1 little endian */
-
-#define DRM_FORMAT_RGB565	fourcc_code('R', 'G', '1', '6') /* [15:0] R:G:B 5:6:5 little endian */
-#define DRM_FORMAT_BGR565	fourcc_code('B', 'G', '1', '6') /* [15:0] B:G:R 5:6:5 little endian */
-
-/* 24 bpp RGB */
-#define DRM_FORMAT_RGB888	fourcc_code('R', 'G', '2', '4') /* [23:0] R:G:B little endian */
-#define DRM_FORMAT_BGR888	fourcc_code('B', 'G', '2', '4') /* [23:0] B:G:R little endian */
-
-/* 32 bpp RGB */
-#define DRM_FORMAT_XRGB8888	fourcc_code('X', 'R', '2', '4') /* [31:0] x:R:G:B 8:8:8:8 little endian */
-#define DRM_FORMAT_XBGR8888	fourcc_code('X', 'B', '2', '4') /* [31:0] x:B:G:R 8:8:8:8 little endian */
-#define DRM_FORMAT_RGBX8888	fourcc_code('R', 'X', '2', '4') /* [31:0] R:G:B:x 8:8:8:8 little endian */
-#define DRM_FORMAT_BGRX8888	fourcc_code('B', 'X', '2', '4') /* [31:0] B:G:R:x 8:8:8:8 little endian */
-
-#define DRM_FORMAT_ARGB8888	fourcc_code('A', 'R', '2', '4') /* [31:0] A:R:G:B 8:8:8:8 little endian */
-#define DRM_FORMAT_ABGR8888	fourcc_code('A', 'B', '2', '4') /* [31:0] A:B:G:R 8:8:8:8 little endian */
-#define DRM_FORMAT_RGBA8888	fourcc_code('R', 'A', '2', '4') /* [31:0] R:G:B:A 8:8:8:8 little endian */
-#define DRM_FORMAT_BGRA8888	fourcc_code('B', 'A', '2', '4') /* [31:0] B:G:R:A 8:8:8:8 little endian */
-
-#define DRM_FORMAT_XRGB2101010	fourcc_code('X', 'R', '3', '0') /* [31:0] x:R:G:B 2:10:10:10 little endian */
-#define DRM_FORMAT_XBGR2101010	fourcc_code('X', 'B', '3', '0') /* [31:0] x:B:G:R 2:10:10:10 little endian */
-#define DRM_FORMAT_RGBX1010102	fourcc_code('R', 'X', '3', '0') /* [31:0] R:G:B:x 10:10:10:2 little endian */
-#define DRM_FORMAT_BGRX1010102	fourcc_code('B', 'X', '3', '0') /* [31:0] B:G:R:x 10:10:10:2 little endian */
-
-#define DRM_FORMAT_ARGB2101010	fourcc_code('A', 'R', '3', '0') /* [31:0] A:R:G:B 2:10:10:10 little endian */
-#define DRM_FORMAT_ABGR2101010	fourcc_code('A', 'B', '3', '0') /* [31:0] A:B:G:R 2:10:10:10 little endian */
-#define DRM_FORMAT_RGBA1010102	fourcc_code('R', 'A', '3', '0') /* [31:0] R:G:B:A 10:10:10:2 little endian */
-#define DRM_FORMAT_BGRA1010102	fourcc_code('B', 'A', '3', '0') /* [31:0] B:G:R:A 10:10:10:2 little endian */
-
-/* packed YCbCr */
-#define DRM_FORMAT_YUYV		fourcc_code('Y', 'U', 'Y', 'V') /* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */
-#define DRM_FORMAT_YVYU		fourcc_code('Y', 'V', 'Y', 'U') /* [31:0] Cb0:Y1:Cr0:Y0 8:8:8:8 little endian */
-#define DRM_FORMAT_UYVY		fourcc_code('U', 'Y', 'V', 'Y') /* [31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */
-#define DRM_FORMAT_VYUY		fourcc_code('V', 'Y', 'U', 'Y') /* [31:0] Y1:Cb0:Y0:Cr0 8:8:8:8 little endian */
-
-#define DRM_FORMAT_AYUV		fourcc_code('A', 'Y', 'U', 'V') /* [31:0] A:Y:Cb:Cr 8:8:8:8 little endian */
-
-/*
- * 2 plane YCbCr
- * index 0 = Y plane, [7:0] Y
- * index 1 = Cr:Cb plane, [15:0] Cr:Cb little endian
- * or
- * index 1 = Cb:Cr plane, [15:0] Cb:Cr little endian
- */
-#define DRM_FORMAT_NV12		fourcc_code('N', 'V', '1', '2') /* 2x2 subsampled Cr:Cb plane */
-#define DRM_FORMAT_NV21		fourcc_code('N', 'V', '2', '1') /* 2x2 subsampled Cb:Cr plane */
-#define DRM_FORMAT_NV16		fourcc_code('N', 'V', '1', '6') /* 2x1 subsampled Cr:Cb plane */
-#define DRM_FORMAT_NV61		fourcc_code('N', 'V', '6', '1') /* 2x1 subsampled Cb:Cr plane */
-#define DRM_FORMAT_NV24		fourcc_code('N', 'V', '2', '4') /* non-subsampled Cr:Cb plane */
-#define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
-
-/*
- * 3 plane YCbCr
- * index 0: Y plane, [7:0] Y
- * index 1: Cb plane, [7:0] Cb
- * index 2: Cr plane, [7:0] Cr
- * or
- * index 1: Cr plane, [7:0] Cr
- * index 2: Cb plane, [7:0] Cb
- */
-#define DRM_FORMAT_YUV410	fourcc_code('Y', 'U', 'V', '9') /* 4x4 subsampled Cb (1) and Cr (2) planes */
-#define DRM_FORMAT_YVU410	fourcc_code('Y', 'V', 'U', '9') /* 4x4 subsampled Cr (1) and Cb (2) planes */
-#define DRM_FORMAT_YUV411	fourcc_code('Y', 'U', '1', '1') /* 4x1 subsampled Cb (1) and Cr (2) planes */
-#define DRM_FORMAT_YVU411	fourcc_code('Y', 'V', '1', '1') /* 4x1 subsampled Cr (1) and Cb (2) planes */
-#define DRM_FORMAT_YUV420	fourcc_code('Y', 'U', '1', '2') /* 2x2 subsampled Cb (1) and Cr (2) planes */
-#define DRM_FORMAT_YVU420	fourcc_code('Y', 'V', '1', '2') /* 2x2 subsampled Cr (1) and Cb (2) planes */
-#define DRM_FORMAT_YUV422	fourcc_code('Y', 'U', '1', '6') /* 2x1 subsampled Cb (1) and Cr (2) planes */
-#define DRM_FORMAT_YVU422	fourcc_code('Y', 'V', '1', '6') /* 2x1 subsampled Cr (1) and Cb (2) planes */
-#define DRM_FORMAT_YUV444	fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */
-#define DRM_FORMAT_YVU444	fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */
-
-
-/*
- * Format Modifiers:
- *
- * Format modifiers describe, typically, a re-ordering or modification
- * of the data in a plane of an FB.  This can be used to express tiled/
- * swizzled formats, or compression, or a combination of the two.
- *
- * The upper 8 bits of the format modifier are a vendor-id as assigned
- * below.  The lower 56 bits are assigned as vendor sees fit.
- */
-
-/* Vendor Ids: */
-#define DRM_FORMAT_MOD_NONE           0
-#define DRM_FORMAT_MOD_VENDOR_INTEL   0x01
-#define DRM_FORMAT_MOD_VENDOR_AMD     0x02
-#define DRM_FORMAT_MOD_VENDOR_NV      0x03
-#define DRM_FORMAT_MOD_VENDOR_SAMSUNG 0x04
-#define DRM_FORMAT_MOD_VENDOR_QCOM    0x05
-/* add more to the end as needed */
-
-#define fourcc_mod_code(vendor, val) \
-	((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
-
-/*
- * Format Modifier tokens:
- *
- * When adding a new token please document the layout with a code comment,
- * similar to the fourcc codes above. drm_fourcc.h is considered the
- * authoritative source for all of these.
- */
-
-/* Intel framebuffer modifiers */
-
-/*
- * Intel X-tiling layout
- *
- * This is a tiled layout using 4Kb tiles (except on gen2 where the tiles 2Kb)
- * in row-major layout. Within the tile bytes are laid out row-major, with
- * a platform-dependent stride. On top of that the memory can apply
- * platform-depending swizzling of some higher address bits into bit6.
- *
- * This format is highly platforms specific and not useful for cross-driver
- * sharing. It exists since on a given platform it does uniquely identify the
- * layout in a simple way for i915-specific userspace.
- */
-#define I915_FORMAT_MOD_X_TILED	fourcc_mod_code(INTEL, 1)
-
-/*
- * Intel Y-tiling layout
- *
- * This is a tiled layout using 4Kb tiles (except on gen2 where the tiles 2Kb)
- * in row-major layout. Within the tile bytes are laid out in OWORD (16 bytes)
- * chunks column-major, with a platform-dependent height. On top of that the
- * memory can apply platform-depending swizzling of some higher address bits
- * into bit6.
- *
- * This format is highly platforms specific and not useful for cross-driver
- * sharing. It exists since on a given platform it does uniquely identify the
- * layout in a simple way for i915-specific userspace.
- */
-#define I915_FORMAT_MOD_Y_TILED	fourcc_mod_code(INTEL, 2)
-
-/*
- * Intel Yf-tiling layout
- *
- * This is a tiled layout using 4Kb tiles in row-major layout.
- * Within the tile pixels are laid out in 16 256 byte units / sub-tiles which
- * are arranged in four groups (two wide, two high) with column-major layout.
- * Each group therefore consits out of four 256 byte units, which are also laid
- * out as 2x2 column-major.
- * 256 byte units are made out of four 64 byte blocks of pixels, producing
- * either a square block or a 2:1 unit.
- * 64 byte blocks of pixels contain four pixel rows of 16 bytes, where the width
- * in pixel depends on the pixel depth.
- */
-#define I915_FORMAT_MOD_Yf_TILED fourcc_mod_code(INTEL, 3)
-
-/*
- * Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks
- *
- * Macroblocks are laid in a Z-shape, and each pixel data is following the
- * standard NV12 style.
- * As for NV12, an image is the result of two frame buffers: one for Y,
- * one for the interleaved Cb/Cr components (1/2 the height of the Y buffer).
- * Alignment requirements are (for each buffer):
- * - multiple of 128 pixels for the width
- * - multiple of  32 pixels for the height
- *
- * For more information: see http://linuxtv.org/downloads/v4l-dvb-apis/re32.html
- */
-#define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE	fourcc_mod_code(SAMSUNG, 1)
-
-#endif /* DRM_FOURCC_H */
diff --git a/openflow/usr/include/drm/drm_mode.h b/openflow/usr/include/drm/drm_mode.h
deleted file mode 100644
index 6c11ca4..0000000
--- a/openflow/usr/include/drm/drm_mode.h
+++ /dev/null
@@ -1,599 +0,0 @@
-/*
- * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
- * Copyright (c) 2007 Jakob Bornecrantz <wallbraker@gmail.com>
- * Copyright (c) 2008 Red Hat Inc.
- * Copyright (c) 2007-2008 Tungsten Graphics, Inc., Cedar Park, TX., USA
- * Copyright (c) 2007-2008 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#ifndef _DRM_MODE_H
-#define _DRM_MODE_H
-
-#include <linux/types.h>
-
-#define DRM_DISPLAY_INFO_LEN	32
-#define DRM_CONNECTOR_NAME_LEN	32
-#define DRM_DISPLAY_MODE_LEN	32
-#define DRM_PROP_NAME_LEN	32
-
-#define DRM_MODE_TYPE_BUILTIN	(1<<0)
-#define DRM_MODE_TYPE_CLOCK_C	((1<<1) | DRM_MODE_TYPE_BUILTIN)
-#define DRM_MODE_TYPE_CRTC_C	((1<<2) | DRM_MODE_TYPE_BUILTIN)
-#define DRM_MODE_TYPE_PREFERRED	(1<<3)
-#define DRM_MODE_TYPE_DEFAULT	(1<<4)
-#define DRM_MODE_TYPE_USERDEF	(1<<5)
-#define DRM_MODE_TYPE_DRIVER	(1<<6)
-
-/* Video mode flags */
-/* bit compatible with the xorg definitions. */
-#define DRM_MODE_FLAG_PHSYNC			(1<<0)
-#define DRM_MODE_FLAG_NHSYNC			(1<<1)
-#define DRM_MODE_FLAG_PVSYNC			(1<<2)
-#define DRM_MODE_FLAG_NVSYNC			(1<<3)
-#define DRM_MODE_FLAG_INTERLACE			(1<<4)
-#define DRM_MODE_FLAG_DBLSCAN			(1<<5)
-#define DRM_MODE_FLAG_CSYNC			(1<<6)
-#define DRM_MODE_FLAG_PCSYNC			(1<<7)
-#define DRM_MODE_FLAG_NCSYNC			(1<<8)
-#define DRM_MODE_FLAG_HSKEW			(1<<9) /* hskew provided */
-#define DRM_MODE_FLAG_BCAST			(1<<10)
-#define DRM_MODE_FLAG_PIXMUX			(1<<11)
-#define DRM_MODE_FLAG_DBLCLK			(1<<12)
-#define DRM_MODE_FLAG_CLKDIV2			(1<<13)
- /*
-  * When adding a new stereo mode don't forget to adjust DRM_MODE_FLAGS_3D_MAX
-  * (define not exposed to user space).
-  */
-#define DRM_MODE_FLAG_3D_MASK			(0x1f<<14)
-#define  DRM_MODE_FLAG_3D_NONE			(0<<14)
-#define  DRM_MODE_FLAG_3D_FRAME_PACKING		(1<<14)
-#define  DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE	(2<<14)
-#define  DRM_MODE_FLAG_3D_LINE_ALTERNATIVE	(3<<14)
-#define  DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL	(4<<14)
-#define  DRM_MODE_FLAG_3D_L_DEPTH		(5<<14)
-#define  DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH	(6<<14)
-#define  DRM_MODE_FLAG_3D_TOP_AND_BOTTOM	(7<<14)
-#define  DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF	(8<<14)
-
-
-/* DPMS flags */
-/* bit compatible with the xorg definitions. */
-#define DRM_MODE_DPMS_ON	0
-#define DRM_MODE_DPMS_STANDBY	1
-#define DRM_MODE_DPMS_SUSPEND	2
-#define DRM_MODE_DPMS_OFF	3
-
-/* Scaling mode options */
-#define DRM_MODE_SCALE_NONE		0 /* Unmodified timing (display or
-					     software can still scale) */
-#define DRM_MODE_SCALE_FULLSCREEN	1 /* Full screen, ignore aspect */
-#define DRM_MODE_SCALE_CENTER		2 /* Centered, no scaling */
-#define DRM_MODE_SCALE_ASPECT		3 /* Full screen, preserve aspect */
-
-/* Picture aspect ratio options */
-#define DRM_MODE_PICTURE_ASPECT_NONE	0
-#define DRM_MODE_PICTURE_ASPECT_4_3	1
-#define DRM_MODE_PICTURE_ASPECT_16_9	2
-
-/* Dithering mode options */
-#define DRM_MODE_DITHERING_OFF	0
-#define DRM_MODE_DITHERING_ON	1
-#define DRM_MODE_DITHERING_AUTO 2
-
-/* Dirty info options */
-#define DRM_MODE_DIRTY_OFF      0
-#define DRM_MODE_DIRTY_ON       1
-#define DRM_MODE_DIRTY_ANNOTATE 2
-
-struct drm_mode_modeinfo {
-	__u32 clock;
-	__u16 hdisplay;
-	__u16 hsync_start;
-	__u16 hsync_end;
-	__u16 htotal;
-	__u16 hskew;
-	__u16 vdisplay;
-	__u16 vsync_start;
-	__u16 vsync_end;
-	__u16 vtotal;
-	__u16 vscan;
-
-	__u32 vrefresh;
-
-	__u32 flags;
-	__u32 type;
-	char name[DRM_DISPLAY_MODE_LEN];
-};
-
-struct drm_mode_card_res {
-	__u64 fb_id_ptr;
-	__u64 crtc_id_ptr;
-	__u64 connector_id_ptr;
-	__u64 encoder_id_ptr;
-	__u32 count_fbs;
-	__u32 count_crtcs;
-	__u32 count_connectors;
-	__u32 count_encoders;
-	__u32 min_width;
-	__u32 max_width;
-	__u32 min_height;
-	__u32 max_height;
-};
-
-struct drm_mode_crtc {
-	__u64 set_connectors_ptr;
-	__u32 count_connectors;
-
-	__u32 crtc_id; /**< Id */
-	__u32 fb_id; /**< Id of framebuffer */
-
-	__u32 x; /**< x Position on the framebuffer */
-	__u32 y; /**< y Position on the framebuffer */
-
-	__u32 gamma_size;
-	__u32 mode_valid;
-	struct drm_mode_modeinfo mode;
-};
-
-#define DRM_MODE_PRESENT_TOP_FIELD	(1<<0)
-#define DRM_MODE_PRESENT_BOTTOM_FIELD	(1<<1)
-
-/* Planes blend with or override other bits on the CRTC */
-struct drm_mode_set_plane {
-	__u32 plane_id;
-	__u32 crtc_id;
-	__u32 fb_id; /* fb object contains surface format type */
-	__u32 flags; /* see above flags */
-
-	/* Signed dest location allows it to be partially off screen */
-	__s32 crtc_x;
-	__s32 crtc_y;
-	__u32 crtc_w;
-	__u32 crtc_h;
-
-	/* Source values are 16.16 fixed point */
-	__u32 src_x;
-	__u32 src_y;
-	__u32 src_h;
-	__u32 src_w;
-};
-
-struct drm_mode_get_plane {
-	__u32 plane_id;
-
-	__u32 crtc_id;
-	__u32 fb_id;
-
-	__u32 possible_crtcs;
-	__u32 gamma_size;
-
-	__u32 count_format_types;
-	__u64 format_type_ptr;
-};
-
-struct drm_mode_get_plane_res {
-	__u64 plane_id_ptr;
-	__u32 count_planes;
-};
-
-#define DRM_MODE_ENCODER_NONE	0
-#define DRM_MODE_ENCODER_DAC	1
-#define DRM_MODE_ENCODER_TMDS	2
-#define DRM_MODE_ENCODER_LVDS	3
-#define DRM_MODE_ENCODER_TVDAC	4
-#define DRM_MODE_ENCODER_VIRTUAL 5
-#define DRM_MODE_ENCODER_DSI	6
-#define DRM_MODE_ENCODER_DPMST	7
-
-struct drm_mode_get_encoder {
-	__u32 encoder_id;
-	__u32 encoder_type;
-
-	__u32 crtc_id; /**< Id of crtc */
-
-	__u32 possible_crtcs;
-	__u32 possible_clones;
-};
-
-/* This is for connectors with multiple signal types. */
-/* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */
-#define DRM_MODE_SUBCONNECTOR_Automatic	0
-#define DRM_MODE_SUBCONNECTOR_Unknown	0
-#define DRM_MODE_SUBCONNECTOR_DVID	3
-#define DRM_MODE_SUBCONNECTOR_DVIA	4
-#define DRM_MODE_SUBCONNECTOR_Composite	5
-#define DRM_MODE_SUBCONNECTOR_SVIDEO	6
-#define DRM_MODE_SUBCONNECTOR_Component	8
-#define DRM_MODE_SUBCONNECTOR_SCART	9
-
-#define DRM_MODE_CONNECTOR_Unknown	0
-#define DRM_MODE_CONNECTOR_VGA		1
-#define DRM_MODE_CONNECTOR_DVII		2
-#define DRM_MODE_CONNECTOR_DVID		3
-#define DRM_MODE_CONNECTOR_DVIA		4
-#define DRM_MODE_CONNECTOR_Composite	5
-#define DRM_MODE_CONNECTOR_SVIDEO	6
-#define DRM_MODE_CONNECTOR_LVDS		7
-#define DRM_MODE_CONNECTOR_Component	8
-#define DRM_MODE_CONNECTOR_9PinDIN	9
-#define DRM_MODE_CONNECTOR_DisplayPort	10
-#define DRM_MODE_CONNECTOR_HDMIA	11
-#define DRM_MODE_CONNECTOR_HDMIB	12
-#define DRM_MODE_CONNECTOR_TV		13
-#define DRM_MODE_CONNECTOR_eDP		14
-#define DRM_MODE_CONNECTOR_VIRTUAL      15
-#define DRM_MODE_CONNECTOR_DSI		16
-
-struct drm_mode_get_connector {
-
-	__u64 encoders_ptr;
-	__u64 modes_ptr;
-	__u64 props_ptr;
-	__u64 prop_values_ptr;
-
-	__u32 count_modes;
-	__u32 count_props;
-	__u32 count_encoders;
-
-	__u32 encoder_id; /**< Current Encoder */
-	__u32 connector_id; /**< Id */
-	__u32 connector_type;
-	__u32 connector_type_id;
-
-	__u32 connection;
-	__u32 mm_width;  /**< width in millimeters */
-	__u32 mm_height; /**< height in millimeters */
-	__u32 subpixel;
-
-	__u32 pad;
-};
-
-#define DRM_MODE_PROP_PENDING	(1<<0)
-#define DRM_MODE_PROP_RANGE	(1<<1)
-#define DRM_MODE_PROP_IMMUTABLE	(1<<2)
-#define DRM_MODE_PROP_ENUM	(1<<3) /* enumerated type with text strings */
-#define DRM_MODE_PROP_BLOB	(1<<4)
-#define DRM_MODE_PROP_BITMASK	(1<<5) /* bitmask of enumerated types */
-
-/* non-extended types: legacy bitmask, one bit per type: */
-#define DRM_MODE_PROP_LEGACY_TYPE  ( \
-		DRM_MODE_PROP_RANGE | \
-		DRM_MODE_PROP_ENUM | \
-		DRM_MODE_PROP_BLOB | \
-		DRM_MODE_PROP_BITMASK)
-
-/* extended-types: rather than continue to consume a bit per type,
- * grab a chunk of the bits to use as integer type id.
- */
-#define DRM_MODE_PROP_EXTENDED_TYPE	0x0000ffc0
-#define DRM_MODE_PROP_TYPE(n)		((n) << 6)
-#define DRM_MODE_PROP_OBJECT		DRM_MODE_PROP_TYPE(1)
-#define DRM_MODE_PROP_SIGNED_RANGE	DRM_MODE_PROP_TYPE(2)
-
-/* the PROP_ATOMIC flag is used to hide properties from userspace that
- * is not aware of atomic properties.  This is mostly to work around
- * older userspace (DDX drivers) that read/write each prop they find,
- * witout being aware that this could be triggering a lengthy modeset.
- */
-#define DRM_MODE_PROP_ATOMIC        0x80000000
-
-struct drm_mode_property_enum {
-	__u64 value;
-	char name[DRM_PROP_NAME_LEN];
-};
-
-struct drm_mode_get_property {
-	__u64 values_ptr; /* values and blob lengths */
-	__u64 enum_blob_ptr; /* enum and blob id ptrs */
-
-	__u32 prop_id;
-	__u32 flags;
-	char name[DRM_PROP_NAME_LEN];
-
-	__u32 count_values;
-	/* This is only used to count enum values, not blobs. The _blobs is
-	 * simply because of a historical reason, i.e. backwards compat. */
-	__u32 count_enum_blobs;
-};
-
-struct drm_mode_connector_set_property {
-	__u64 value;
-	__u32 prop_id;
-	__u32 connector_id;
-};
-
-struct drm_mode_obj_get_properties {
-	__u64 props_ptr;
-	__u64 prop_values_ptr;
-	__u32 count_props;
-	__u32 obj_id;
-	__u32 obj_type;
-};
-
-struct drm_mode_obj_set_property {
-	__u64 value;
-	__u32 prop_id;
-	__u32 obj_id;
-	__u32 obj_type;
-};
-
-struct drm_mode_get_blob {
-	__u32 blob_id;
-	__u32 length;
-	__u64 data;
-};
-
-struct drm_mode_fb_cmd {
-	__u32 fb_id;
-	__u32 width;
-	__u32 height;
-	__u32 pitch;
-	__u32 bpp;
-	__u32 depth;
-	/* driver specific handle */
-	__u32 handle;
-};
-
-#define DRM_MODE_FB_INTERLACED	(1<<0) /* for interlaced framebuffers */
-#define DRM_MODE_FB_MODIFIERS	(1<<1) /* enables ->modifer[] */
-
-struct drm_mode_fb_cmd2 {
-	__u32 fb_id;
-	__u32 width;
-	__u32 height;
-	__u32 pixel_format; /* fourcc code from drm_fourcc.h */
-	__u32 flags; /* see above flags */
-
-	/*
-	 * In case of planar formats, this ioctl allows up to 4
-	 * buffer objects with offsets and pitches per plane.
-	 * The pitch and offset order is dictated by the fourcc,
-	 * e.g. NV12 (http://fourcc.org/yuv.php#NV12) is described as:
-	 *
-	 *   YUV 4:2:0 image with a plane of 8 bit Y samples
-	 *   followed by an interleaved U/V plane containing
-	 *   8 bit 2x2 subsampled colour difference samples.
-	 *
-	 * So it would consist of Y as offsets[0] and UV as
-	 * offsets[1].  Note that offsets[0] will generally
-	 * be 0 (but this is not required).
-	 *
-	 * To accommodate tiled, compressed, etc formats, a per-plane
-	 * modifier can be specified.  The default value of zero
-	 * indicates "native" format as specified by the fourcc.
-	 * Vendor specific modifier token.  This allows, for example,
-	 * different tiling/swizzling pattern on different planes.
-	 * See discussion above of DRM_FORMAT_MOD_xxx.
-	 */
-	__u32 handles[4];
-	__u32 pitches[4]; /* pitch for each plane */
-	__u32 offsets[4]; /* offset of each plane */
-	__u64 modifier[4]; /* ie, tiling, compressed (per plane) */
-};
-
-#define DRM_MODE_FB_DIRTY_ANNOTATE_COPY 0x01
-#define DRM_MODE_FB_DIRTY_ANNOTATE_FILL 0x02
-#define DRM_MODE_FB_DIRTY_FLAGS         0x03
-
-#define DRM_MODE_FB_DIRTY_MAX_CLIPS     256
-
-/*
- * Mark a region of a framebuffer as dirty.
- *
- * Some hardware does not automatically update display contents
- * as a hardware or software draw to a framebuffer. This ioctl
- * allows userspace to tell the kernel and the hardware what
- * regions of the framebuffer have changed.
- *
- * The kernel or hardware is free to update more then just the
- * region specified by the clip rects. The kernel or hardware
- * may also delay and/or coalesce several calls to dirty into a
- * single update.
- *
- * Userspace may annotate the updates, the annotates are a
- * promise made by the caller that the change is either a copy
- * of pixels or a fill of a single color in the region specified.
- *
- * If the DRM_MODE_FB_DIRTY_ANNOTATE_COPY flag is given then
- * the number of updated regions are half of num_clips given,
- * where the clip rects are paired in src and dst. The width and
- * height of each one of the pairs must match.
- *
- * If the DRM_MODE_FB_DIRTY_ANNOTATE_FILL flag is given the caller
- * promises that the region specified of the clip rects is filled
- * completely with a single color as given in the color argument.
- */
-
-struct drm_mode_fb_dirty_cmd {
-	__u32 fb_id;
-	__u32 flags;
-	__u32 color;
-	__u32 num_clips;
-	__u64 clips_ptr;
-};
-
-struct drm_mode_mode_cmd {
-	__u32 connector_id;
-	struct drm_mode_modeinfo mode;
-};
-
-#define DRM_MODE_CURSOR_BO	0x01
-#define DRM_MODE_CURSOR_MOVE	0x02
-#define DRM_MODE_CURSOR_FLAGS	0x03
-
-/*
- * depending on the value in flags different members are used.
- *
- * CURSOR_BO uses
- *    crtc_id
- *    width
- *    height
- *    handle - if 0 turns the cursor off
- *
- * CURSOR_MOVE uses
- *    crtc_id
- *    x
- *    y
- */
-struct drm_mode_cursor {
-	__u32 flags;
-	__u32 crtc_id;
-	__s32 x;
-	__s32 y;
-	__u32 width;
-	__u32 height;
-	/* driver specific handle */
-	__u32 handle;
-};
-
-struct drm_mode_cursor2 {
-	__u32 flags;
-	__u32 crtc_id;
-	__s32 x;
-	__s32 y;
-	__u32 width;
-	__u32 height;
-	/* driver specific handle */
-	__u32 handle;
-	__s32 hot_x;
-	__s32 hot_y;
-};
-
-struct drm_mode_crtc_lut {
-	__u32 crtc_id;
-	__u32 gamma_size;
-
-	/* pointers to arrays */
-	__u64 red;
-	__u64 green;
-	__u64 blue;
-};
-
-#define DRM_MODE_PAGE_FLIP_EVENT 0x01
-#define DRM_MODE_PAGE_FLIP_ASYNC 0x02
-#define DRM_MODE_PAGE_FLIP_FLAGS (DRM_MODE_PAGE_FLIP_EVENT|DRM_MODE_PAGE_FLIP_ASYNC)
-
-/*
- * Request a page flip on the specified crtc.
- *
- * This ioctl will ask KMS to schedule a page flip for the specified
- * crtc.  Once any pending rendering targeting the specified fb (as of
- * ioctl time) has completed, the crtc will be reprogrammed to display
- * that fb after the next vertical refresh.  The ioctl returns
- * immediately, but subsequent rendering to the current fb will block
- * in the execbuffer ioctl until the page flip happens.  If a page
- * flip is already pending as the ioctl is called, EBUSY will be
- * returned.
- *
- * Flag DRM_MODE_PAGE_FLIP_EVENT requests that drm sends back a vblank
- * event (see drm.h: struct drm_event_vblank) when the page flip is
- * done.  The user_data field passed in with this ioctl will be
- * returned as the user_data field in the vblank event struct.
- *
- * Flag DRM_MODE_PAGE_FLIP_ASYNC requests that the flip happen
- * 'as soon as possible', meaning that it not delay waiting for vblank.
- * This may cause tearing on the screen.
- *
- * The reserved field must be zero until we figure out something
- * clever to use it for.
- */
-
-struct drm_mode_crtc_page_flip {
-	__u32 crtc_id;
-	__u32 fb_id;
-	__u32 flags;
-	__u32 reserved;
-	__u64 user_data;
-};
-
-/* create a dumb scanout buffer */
-struct drm_mode_create_dumb {
-	uint32_t height;
-	uint32_t width;
-	uint32_t bpp;
-	uint32_t flags;
-	/* handle, pitch, size will be returned */
-	uint32_t handle;
-	uint32_t pitch;
-	uint64_t size;
-};
-
-/* set up for mmap of a dumb scanout buffer */
-struct drm_mode_map_dumb {
-	/** Handle for the object being mapped. */
-	__u32 handle;
-	__u32 pad;
-	/**
-	 * Fake offset to use for subsequent mmap call
-	 *
-	 * This is a fixed-size type for 32/64 compatibility.
-	 */
-	__u64 offset;
-};
-
-struct drm_mode_destroy_dumb {
-	uint32_t handle;
-};
-
-/* page-flip flags are valid, plus: */
-#define DRM_MODE_ATOMIC_TEST_ONLY 0x0100
-#define DRM_MODE_ATOMIC_NONBLOCK  0x0200
-#define DRM_MODE_ATOMIC_ALLOW_MODESET 0x0400
-
-#define DRM_MODE_ATOMIC_FLAGS (\
-		DRM_MODE_PAGE_FLIP_EVENT |\
-		DRM_MODE_PAGE_FLIP_ASYNC |\
-		DRM_MODE_ATOMIC_TEST_ONLY |\
-		DRM_MODE_ATOMIC_NONBLOCK |\
-		DRM_MODE_ATOMIC_ALLOW_MODESET)
-
-struct drm_mode_atomic {
-	__u32 flags;
-	__u32 count_objs;
-	__u64 objs_ptr;
-	__u64 count_props_ptr;
-	__u64 props_ptr;
-	__u64 prop_values_ptr;
-	__u64 reserved;
-	__u64 user_data;
-};
-
-/**
- * Create a new 'blob' data property, copying length bytes from data pointer,
- * and returning new blob ID.
- */
-struct drm_mode_create_blob {
-	/** Pointer to data to copy. */
-	__u64 data;
-	/** Length of data to copy. */
-	__u32 length;
-	/** Return: new property ID. */
-	__u32 blob_id;
-};
-
-/**
- * Destroy a user-created blob property.
- */
-struct drm_mode_destroy_blob {
-	__u32 blob_id;
-};
-
-#endif
diff --git a/openflow/usr/include/drm/drm_sarea.h b/openflow/usr/include/drm/drm_sarea.h
deleted file mode 100644
index 8e7aa2c..0000000
--- a/openflow/usr/include/drm/drm_sarea.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * \file drm_sarea.h
- * \brief SAREA definitions
- *
- * \author Michel Dänzer <michel@daenzer.net>
- */
-
-/*
- * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _DRM_SAREA_H_
-#define _DRM_SAREA_H_
-
-#include <drm/drm.h>
-
-/* SAREA area needs to be at least a page */
-#if defined(__alpha__)
-#define SAREA_MAX                       0x2000U
-#elif defined(__mips__)
-#define SAREA_MAX                       0x4000U
-#elif defined(__ia64__)
-#define SAREA_MAX                       0x10000U	/* 64kB */
-#else
-/* Intel 830M driver needs at least 8k SAREA */
-#define SAREA_MAX                       0x2000U
-#endif
-
-/** Maximum number of drawables in the SAREA */
-#define SAREA_MAX_DRAWABLES		256
-
-#define SAREA_DRAWABLE_CLAIMED_ENTRY    0x80000000
-
-/** SAREA drawable */
-struct drm_sarea_drawable {
-	unsigned int stamp;
-	unsigned int flags;
-};
-
-/** SAREA frame */
-struct drm_sarea_frame {
-	unsigned int x;
-	unsigned int y;
-	unsigned int width;
-	unsigned int height;
-	unsigned int fullscreen;
-};
-
-/** SAREA */
-struct drm_sarea {
-    /** first thing is always the DRM locking structure */
-	struct drm_hw_lock lock;
-    /** \todo Use readers/writer lock for drm_sarea::drawable_lock */
-	struct drm_hw_lock drawable_lock;
-	struct drm_sarea_drawable drawableTable[SAREA_MAX_DRAWABLES];	/**< drawables */
-	struct drm_sarea_frame frame;	/**< frame */
-	drm_context_t dummy_context;
-};
-
-typedef struct drm_sarea_drawable drm_sarea_drawable_t;
-typedef struct drm_sarea_frame drm_sarea_frame_t;
-typedef struct drm_sarea drm_sarea_t;
-
-#endif				/* _DRM_SAREA_H_ */
diff --git a/openflow/usr/include/drm/exynos_drm.h b/openflow/usr/include/drm/exynos_drm.h
deleted file mode 100644
index 71f24f9..0000000
--- a/openflow/usr/include/drm/exynos_drm.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/* exynos_drm.h
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- * Authors:
- *	Inki Dae <inki.dae@samsung.com>
- *	Joonyoung Shim <jy0922.shim@samsung.com>
- *	Seung-Woo Kim <sw0312.kim@samsung.com>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-#ifndef _EXYNOS_DRM_H_
-#define _EXYNOS_DRM_H_
-
-#include <drm/drm.h>
-
-/**
- * User-desired buffer creation information structure.
- *
- * @size: user-desired memory allocation size.
- *	- this size value would be page-aligned internally.
- * @flags: user request for setting memory type or cache attributes.
- * @handle: returned a handle to created gem object.
- *	- this handle will be set by gem module of kernel side.
- */
-struct drm_exynos_gem_create {
-	uint64_t size;
-	unsigned int flags;
-	unsigned int handle;
-};
-
-/**
- * A structure to gem information.
- *
- * @handle: a handle to gem object created.
- * @flags: flag value including memory type and cache attribute and
- *	this value would be set by driver.
- * @size: size to memory region allocated by gem and this size would
- *	be set by driver.
- */
-struct drm_exynos_gem_info {
-	unsigned int handle;
-	unsigned int flags;
-	uint64_t size;
-};
-
-/**
- * A structure for user connection request of virtual display.
- *
- * @connection: indicate whether doing connetion or not by user.
- * @extensions: if this value is 1 then the vidi driver would need additional
- *	128bytes edid data.
- * @edid: the edid data pointer from user side.
- */
-struct drm_exynos_vidi_connection {
-	unsigned int connection;
-	unsigned int extensions;
-	uint64_t edid;
-};
-
-/* memory type definitions. */
-enum e_drm_exynos_gem_mem_type {
-	/* Physically Continuous memory and used as default. */
-	EXYNOS_BO_CONTIG	= 0 << 0,
-	/* Physically Non-Continuous memory. */
-	EXYNOS_BO_NONCONTIG	= 1 << 0,
-	/* non-cachable mapping and used as default. */
-	EXYNOS_BO_NONCACHABLE	= 0 << 1,
-	/* cachable mapping. */
-	EXYNOS_BO_CACHABLE	= 1 << 1,
-	/* write-combine mapping. */
-	EXYNOS_BO_WC		= 1 << 2,
-	EXYNOS_BO_MASK		= EXYNOS_BO_NONCONTIG | EXYNOS_BO_CACHABLE |
-					EXYNOS_BO_WC
-};
-
-struct drm_exynos_g2d_get_ver {
-	__u32	major;
-	__u32	minor;
-};
-
-struct drm_exynos_g2d_cmd {
-	__u32	offset;
-	__u32	data;
-};
-
-enum drm_exynos_g2d_buf_type {
-	G2D_BUF_USERPTR = 1 << 31,
-};
-
-enum drm_exynos_g2d_event_type {
-	G2D_EVENT_NOT,
-	G2D_EVENT_NONSTOP,
-	G2D_EVENT_STOP,		/* not yet */
-};
-
-struct drm_exynos_g2d_userptr {
-	unsigned long userptr;
-	unsigned long size;
-};
-
-struct drm_exynos_g2d_set_cmdlist {
-	__u64					cmd;
-	__u64					cmd_buf;
-	__u32					cmd_nr;
-	__u32					cmd_buf_nr;
-
-	/* for g2d event */
-	__u64					event_type;
-	__u64					user_data;
-};
-
-struct drm_exynos_g2d_exec {
-	__u64					async;
-};
-
-enum drm_exynos_ops_id {
-	EXYNOS_DRM_OPS_SRC,
-	EXYNOS_DRM_OPS_DST,
-	EXYNOS_DRM_OPS_MAX,
-};
-
-struct drm_exynos_sz {
-	__u32	hsize;
-	__u32	vsize;
-};
-
-struct drm_exynos_pos {
-	__u32	x;
-	__u32	y;
-	__u32	w;
-	__u32	h;
-};
-
-enum drm_exynos_flip {
-	EXYNOS_DRM_FLIP_NONE = (0 << 0),
-	EXYNOS_DRM_FLIP_VERTICAL = (1 << 0),
-	EXYNOS_DRM_FLIP_HORIZONTAL = (1 << 1),
-	EXYNOS_DRM_FLIP_BOTH = EXYNOS_DRM_FLIP_VERTICAL |
-			EXYNOS_DRM_FLIP_HORIZONTAL,
-};
-
-enum drm_exynos_degree {
-	EXYNOS_DRM_DEGREE_0,
-	EXYNOS_DRM_DEGREE_90,
-	EXYNOS_DRM_DEGREE_180,
-	EXYNOS_DRM_DEGREE_270,
-};
-
-enum drm_exynos_planer {
-	EXYNOS_DRM_PLANAR_Y,
-	EXYNOS_DRM_PLANAR_CB,
-	EXYNOS_DRM_PLANAR_CR,
-	EXYNOS_DRM_PLANAR_MAX,
-};
-
-/**
- * A structure for ipp supported property list.
- *
- * @version: version of this structure.
- * @ipp_id: id of ipp driver.
- * @count: count of ipp driver.
- * @writeback: flag of writeback supporting.
- * @flip: flag of flip supporting.
- * @degree: flag of degree information.
- * @csc: flag of csc supporting.
- * @crop: flag of crop supporting.
- * @scale: flag of scale supporting.
- * @refresh_min: min hz of refresh.
- * @refresh_max: max hz of refresh.
- * @crop_min: crop min resolution.
- * @crop_max: crop max resolution.
- * @scale_min: scale min resolution.
- * @scale_max: scale max resolution.
- */
-struct drm_exynos_ipp_prop_list {
-	__u32	version;
-	__u32	ipp_id;
-	__u32	count;
-	__u32	writeback;
-	__u32	flip;
-	__u32	degree;
-	__u32	csc;
-	__u32	crop;
-	__u32	scale;
-	__u32	refresh_min;
-	__u32	refresh_max;
-	__u32	reserved;
-	struct drm_exynos_sz	crop_min;
-	struct drm_exynos_sz	crop_max;
-	struct drm_exynos_sz	scale_min;
-	struct drm_exynos_sz	scale_max;
-};
-
-/**
- * A structure for ipp config.
- *
- * @ops_id: property of operation directions.
- * @flip: property of mirror, flip.
- * @degree: property of rotation degree.
- * @fmt: property of image format.
- * @sz: property of image size.
- * @pos: property of image position(src-cropped,dst-scaler).
- */
-struct drm_exynos_ipp_config {
-	enum drm_exynos_ops_id ops_id;
-	enum drm_exynos_flip	flip;
-	enum drm_exynos_degree	degree;
-	__u32	fmt;
-	struct drm_exynos_sz	sz;
-	struct drm_exynos_pos	pos;
-};
-
-enum drm_exynos_ipp_cmd {
-	IPP_CMD_NONE,
-	IPP_CMD_M2M,
-	IPP_CMD_WB,
-	IPP_CMD_OUTPUT,
-	IPP_CMD_MAX,
-};
-
-/**
- * A structure for ipp property.
- *
- * @config: source, destination config.
- * @cmd: definition of command.
- * @ipp_id: id of ipp driver.
- * @prop_id: id of property.
- * @refresh_rate: refresh rate.
- */
-struct drm_exynos_ipp_property {
-	struct drm_exynos_ipp_config config[EXYNOS_DRM_OPS_MAX];
-	enum drm_exynos_ipp_cmd	cmd;
-	__u32	ipp_id;
-	__u32	prop_id;
-	__u32	refresh_rate;
-};
-
-enum drm_exynos_ipp_buf_type {
-	IPP_BUF_ENQUEUE,
-	IPP_BUF_DEQUEUE,
-};
-
-/**
- * A structure for ipp buffer operations.
- *
- * @ops_id: operation directions.
- * @buf_type: definition of buffer.
- * @prop_id: id of property.
- * @buf_id: id of buffer.
- * @handle: Y, Cb, Cr each planar handle.
- * @user_data: user data.
- */
-struct drm_exynos_ipp_queue_buf {
-	enum drm_exynos_ops_id	ops_id;
-	enum drm_exynos_ipp_buf_type	buf_type;
-	__u32	prop_id;
-	__u32	buf_id;
-	__u32	handle[EXYNOS_DRM_PLANAR_MAX];
-	__u32	reserved;
-	__u64	user_data;
-};
-
-enum drm_exynos_ipp_ctrl {
-	IPP_CTRL_PLAY,
-	IPP_CTRL_STOP,
-	IPP_CTRL_PAUSE,
-	IPP_CTRL_RESUME,
-	IPP_CTRL_MAX,
-};
-
-/**
- * A structure for ipp start/stop operations.
- *
- * @prop_id: id of property.
- * @ctrl: definition of control.
- */
-struct drm_exynos_ipp_cmd_ctrl {
-	__u32	prop_id;
-	enum drm_exynos_ipp_ctrl	ctrl;
-};
-
-#define DRM_EXYNOS_GEM_CREATE		0x00
-/* Reserved 0x03 ~ 0x05 for exynos specific gem ioctl */
-#define DRM_EXYNOS_GEM_GET		0x04
-#define DRM_EXYNOS_VIDI_CONNECTION	0x07
-
-/* G2D */
-#define DRM_EXYNOS_G2D_GET_VER		0x20
-#define DRM_EXYNOS_G2D_SET_CMDLIST	0x21
-#define DRM_EXYNOS_G2D_EXEC		0x22
-
-/* IPP - Image Post Processing */
-#define DRM_EXYNOS_IPP_GET_PROPERTY	0x30
-#define DRM_EXYNOS_IPP_SET_PROPERTY	0x31
-#define DRM_EXYNOS_IPP_QUEUE_BUF	0x32
-#define DRM_EXYNOS_IPP_CMD_CTRL	0x33
-
-#define DRM_IOCTL_EXYNOS_GEM_CREATE		DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create)
-
-#define DRM_IOCTL_EXYNOS_GEM_GET	DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_EXYNOS_GEM_GET,	struct drm_exynos_gem_info)
-
-#define DRM_IOCTL_EXYNOS_VIDI_CONNECTION	DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_EXYNOS_VIDI_CONNECTION, struct drm_exynos_vidi_connection)
-
-#define DRM_IOCTL_EXYNOS_G2D_GET_VER		DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_EXYNOS_G2D_GET_VER, struct drm_exynos_g2d_get_ver)
-#define DRM_IOCTL_EXYNOS_G2D_SET_CMDLIST	DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_EXYNOS_G2D_SET_CMDLIST, struct drm_exynos_g2d_set_cmdlist)
-#define DRM_IOCTL_EXYNOS_G2D_EXEC		DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_EXYNOS_G2D_EXEC, struct drm_exynos_g2d_exec)
-
-#define DRM_IOCTL_EXYNOS_IPP_GET_PROPERTY	DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_EXYNOS_IPP_GET_PROPERTY, struct drm_exynos_ipp_prop_list)
-#define DRM_IOCTL_EXYNOS_IPP_SET_PROPERTY	DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_EXYNOS_IPP_SET_PROPERTY, struct drm_exynos_ipp_property)
-#define DRM_IOCTL_EXYNOS_IPP_QUEUE_BUF	DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_EXYNOS_IPP_QUEUE_BUF, struct drm_exynos_ipp_queue_buf)
-#define DRM_IOCTL_EXYNOS_IPP_CMD_CTRL		DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_EXYNOS_IPP_CMD_CTRL, struct drm_exynos_ipp_cmd_ctrl)
-
-/* EXYNOS specific events */
-#define DRM_EXYNOS_G2D_EVENT		0x80000000
-#define DRM_EXYNOS_IPP_EVENT		0x80000001
-
-struct drm_exynos_g2d_event {
-	struct drm_event	base;
-	__u64			user_data;
-	__u32			tv_sec;
-	__u32			tv_usec;
-	__u32			cmdlist_no;
-	__u32			reserved;
-};
-
-struct drm_exynos_ipp_event {
-	struct drm_event	base;
-	__u64			user_data;
-	__u32			tv_sec;
-	__u32			tv_usec;
-	__u32			prop_id;
-	__u32			reserved;
-	__u32			buf_id[EXYNOS_DRM_OPS_MAX];
-};
-
-#endif /* _EXYNOS_DRM_H_ */
diff --git a/openflow/usr/include/drm/i810_drm.h b/openflow/usr/include/drm/i810_drm.h
deleted file mode 100644
index 34736ef..0000000
--- a/openflow/usr/include/drm/i810_drm.h
+++ /dev/null
@@ -1,283 +0,0 @@
-#ifndef _I810_DRM_H_
-#define _I810_DRM_H_
-
-#include <drm/drm.h>
-
-/* WARNING: These defines must be the same as what the Xserver uses.
- * if you change them, you must change the defines in the Xserver.
- */
-
-#ifndef _I810_DEFINES_
-#define _I810_DEFINES_
-
-#define I810_DMA_BUF_ORDER		12
-#define I810_DMA_BUF_SZ 		(1<<I810_DMA_BUF_ORDER)
-#define I810_DMA_BUF_NR 		256
-#define I810_NR_SAREA_CLIPRECTS 	8
-
-/* Each region is a minimum of 64k, and there are at most 64 of them.
- */
-#define I810_NR_TEX_REGIONS 64
-#define I810_LOG_MIN_TEX_REGION_SIZE 16
-#endif
-
-#define I810_UPLOAD_TEX0IMAGE  0x1	/* handled clientside */
-#define I810_UPLOAD_TEX1IMAGE  0x2	/* handled clientside */
-#define I810_UPLOAD_CTX        0x4
-#define I810_UPLOAD_BUFFERS    0x8
-#define I810_UPLOAD_TEX0       0x10
-#define I810_UPLOAD_TEX1       0x20
-#define I810_UPLOAD_CLIPRECTS  0x40
-
-/* Indices into buf.Setup where various bits of state are mirrored per
- * context and per buffer.  These can be fired at the card as a unit,
- * or in a piecewise fashion as required.
- */
-
-/* Destbuffer state
- *    - backbuffer linear offset and pitch -- invarient in the current dri
- *    - zbuffer linear offset and pitch -- also invarient
- *    - drawing origin in back and depth buffers.
- *
- * Keep the depth/back buffer state here to accommodate private buffers
- * in the future.
- */
-#define I810_DESTREG_DI0  0	/* CMD_OP_DESTBUFFER_INFO (2 dwords) */
-#define I810_DESTREG_DI1  1
-#define I810_DESTREG_DV0  2	/* GFX_OP_DESTBUFFER_VARS (2 dwords) */
-#define I810_DESTREG_DV1  3
-#define I810_DESTREG_DR0  4	/* GFX_OP_DRAWRECT_INFO (4 dwords) */
-#define I810_DESTREG_DR1  5
-#define I810_DESTREG_DR2  6
-#define I810_DESTREG_DR3  7
-#define I810_DESTREG_DR4  8
-#define I810_DEST_SETUP_SIZE 10
-
-/* Context state
- */
-#define I810_CTXREG_CF0   0	/* GFX_OP_COLOR_FACTOR */
-#define I810_CTXREG_CF1   1
-#define I810_CTXREG_ST0   2	/* GFX_OP_STIPPLE */
-#define I810_CTXREG_ST1   3
-#define I810_CTXREG_VF    4	/* GFX_OP_VERTEX_FMT */
-#define I810_CTXREG_MT    5	/* GFX_OP_MAP_TEXELS */
-#define I810_CTXREG_MC0   6	/* GFX_OP_MAP_COLOR_STAGES - stage 0 */
-#define I810_CTXREG_MC1   7	/* GFX_OP_MAP_COLOR_STAGES - stage 1 */
-#define I810_CTXREG_MC2   8	/* GFX_OP_MAP_COLOR_STAGES - stage 2 */
-#define I810_CTXREG_MA0   9	/* GFX_OP_MAP_ALPHA_STAGES - stage 0 */
-#define I810_CTXREG_MA1   10	/* GFX_OP_MAP_ALPHA_STAGES - stage 1 */
-#define I810_CTXREG_MA2   11	/* GFX_OP_MAP_ALPHA_STAGES - stage 2 */
-#define I810_CTXREG_SDM   12	/* GFX_OP_SRC_DEST_MONO */
-#define I810_CTXREG_FOG   13	/* GFX_OP_FOG_COLOR */
-#define I810_CTXREG_B1    14	/* GFX_OP_BOOL_1 */
-#define I810_CTXREG_B2    15	/* GFX_OP_BOOL_2 */
-#define I810_CTXREG_LCS   16	/* GFX_OP_LINEWIDTH_CULL_SHADE_MODE */
-#define I810_CTXREG_PV    17	/* GFX_OP_PV_RULE -- Invarient! */
-#define I810_CTXREG_ZA    18	/* GFX_OP_ZBIAS_ALPHAFUNC */
-#define I810_CTXREG_AA    19	/* GFX_OP_ANTIALIAS */
-#define I810_CTX_SETUP_SIZE 20
-
-/* Texture state (per tex unit)
- */
-#define I810_TEXREG_MI0  0	/* GFX_OP_MAP_INFO (4 dwords) */
-#define I810_TEXREG_MI1  1
-#define I810_TEXREG_MI2  2
-#define I810_TEXREG_MI3  3
-#define I810_TEXREG_MF   4	/* GFX_OP_MAP_FILTER */
-#define I810_TEXREG_MLC  5	/* GFX_OP_MAP_LOD_CTL */
-#define I810_TEXREG_MLL  6	/* GFX_OP_MAP_LOD_LIMITS */
-#define I810_TEXREG_MCS  7	/* GFX_OP_MAP_COORD_SETS ??? */
-#define I810_TEX_SETUP_SIZE 8
-
-/* Flags for clear ioctl
- */
-#define I810_FRONT   0x1
-#define I810_BACK    0x2
-#define I810_DEPTH   0x4
-
-typedef enum _drm_i810_init_func {
-	I810_INIT_DMA = 0x01,
-	I810_CLEANUP_DMA = 0x02,
-	I810_INIT_DMA_1_4 = 0x03
-} drm_i810_init_func_t;
-
-/* This is the init structure after v1.2 */
-typedef struct _drm_i810_init {
-	drm_i810_init_func_t func;
-	unsigned int mmio_offset;
-	unsigned int buffers_offset;
-	int sarea_priv_offset;
-	unsigned int ring_start;
-	unsigned int ring_end;
-	unsigned int ring_size;
-	unsigned int front_offset;
-	unsigned int back_offset;
-	unsigned int depth_offset;
-	unsigned int overlay_offset;
-	unsigned int overlay_physical;
-	unsigned int w;
-	unsigned int h;
-	unsigned int pitch;
-	unsigned int pitch_bits;
-} drm_i810_init_t;
-
-/* This is the init structure prior to v1.2 */
-typedef struct _drm_i810_pre12_init {
-	drm_i810_init_func_t func;
-	unsigned int mmio_offset;
-	unsigned int buffers_offset;
-	int sarea_priv_offset;
-	unsigned int ring_start;
-	unsigned int ring_end;
-	unsigned int ring_size;
-	unsigned int front_offset;
-	unsigned int back_offset;
-	unsigned int depth_offset;
-	unsigned int w;
-	unsigned int h;
-	unsigned int pitch;
-	unsigned int pitch_bits;
-} drm_i810_pre12_init_t;
-
-/* Warning: If you change the SAREA structure you must change the Xserver
- * structure as well */
-
-typedef struct _drm_i810_tex_region {
-	unsigned char next, prev;	/* indices to form a circular LRU  */
-	unsigned char in_use;	/* owned by a client, or free? */
-	int age;		/* tracked by clients to update local LRU's */
-} drm_i810_tex_region_t;
-
-typedef struct _drm_i810_sarea {
-	unsigned int ContextState[I810_CTX_SETUP_SIZE];
-	unsigned int BufferState[I810_DEST_SETUP_SIZE];
-	unsigned int TexState[2][I810_TEX_SETUP_SIZE];
-	unsigned int dirty;
-
-	unsigned int nbox;
-	struct drm_clip_rect boxes[I810_NR_SAREA_CLIPRECTS];
-
-	/* Maintain an LRU of contiguous regions of texture space.  If
-	 * you think you own a region of texture memory, and it has an
-	 * age different to the one you set, then you are mistaken and
-	 * it has been stolen by another client.  If global texAge
-	 * hasn't changed, there is no need to walk the list.
-	 *
-	 * These regions can be used as a proxy for the fine-grained
-	 * texture information of other clients - by maintaining them
-	 * in the same lru which is used to age their own textures,
-	 * clients have an approximate lru for the whole of global
-	 * texture space, and can make informed decisions as to which
-	 * areas to kick out.  There is no need to choose whether to
-	 * kick out your own texture or someone else's - simply eject
-	 * them all in LRU order.
-	 */
-
-	drm_i810_tex_region_t texList[I810_NR_TEX_REGIONS + 1];
-	/* Last elt is sentinal */
-	int texAge;		/* last time texture was uploaded */
-	int last_enqueue;	/* last time a buffer was enqueued */
-	int last_dispatch;	/* age of the most recently dispatched buffer */
-	int last_quiescent;	/*  */
-	int ctxOwner;		/* last context to upload state */
-
-	int vertex_prim;
-
-	int pf_enabled;		/* is pageflipping allowed? */
-	int pf_active;
-	int pf_current_page;	/* which buffer is being displayed? */
-} drm_i810_sarea_t;
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the Xserver file (xf86drmMga.h)
- */
-
-/* i810 specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_I810_INIT		0x00
-#define DRM_I810_VERTEX		0x01
-#define DRM_I810_CLEAR		0x02
-#define DRM_I810_FLUSH		0x03
-#define DRM_I810_GETAGE		0x04
-#define DRM_I810_GETBUF		0x05
-#define DRM_I810_SWAP		0x06
-#define DRM_I810_COPY		0x07
-#define DRM_I810_DOCOPY		0x08
-#define DRM_I810_OV0INFO	0x09
-#define DRM_I810_FSTATUS	0x0a
-#define DRM_I810_OV0FLIP	0x0b
-#define DRM_I810_MC		0x0c
-#define DRM_I810_RSTATUS	0x0d
-#define DRM_I810_FLIP		0x0e
-
-#define DRM_IOCTL_I810_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I810_INIT, drm_i810_init_t)
-#define DRM_IOCTL_I810_VERTEX		DRM_IOW( DRM_COMMAND_BASE + DRM_I810_VERTEX, drm_i810_vertex_t)
-#define DRM_IOCTL_I810_CLEAR		DRM_IOW( DRM_COMMAND_BASE + DRM_I810_CLEAR, drm_i810_clear_t)
-#define DRM_IOCTL_I810_FLUSH		DRM_IO(  DRM_COMMAND_BASE + DRM_I810_FLUSH)
-#define DRM_IOCTL_I810_GETAGE		DRM_IO(  DRM_COMMAND_BASE + DRM_I810_GETAGE)
-#define DRM_IOCTL_I810_GETBUF		DRM_IOWR(DRM_COMMAND_BASE + DRM_I810_GETBUF, drm_i810_dma_t)
-#define DRM_IOCTL_I810_SWAP		DRM_IO(  DRM_COMMAND_BASE + DRM_I810_SWAP)
-#define DRM_IOCTL_I810_COPY		DRM_IOW( DRM_COMMAND_BASE + DRM_I810_COPY, drm_i810_copy_t)
-#define DRM_IOCTL_I810_DOCOPY		DRM_IO(  DRM_COMMAND_BASE + DRM_I810_DOCOPY)
-#define DRM_IOCTL_I810_OV0INFO		DRM_IOR( DRM_COMMAND_BASE + DRM_I810_OV0INFO, drm_i810_overlay_t)
-#define DRM_IOCTL_I810_FSTATUS		DRM_IO ( DRM_COMMAND_BASE + DRM_I810_FSTATUS)
-#define DRM_IOCTL_I810_OV0FLIP		DRM_IO ( DRM_COMMAND_BASE + DRM_I810_OV0FLIP)
-#define DRM_IOCTL_I810_MC		DRM_IOW( DRM_COMMAND_BASE + DRM_I810_MC, drm_i810_mc_t)
-#define DRM_IOCTL_I810_RSTATUS		DRM_IO ( DRM_COMMAND_BASE + DRM_I810_RSTATUS)
-#define DRM_IOCTL_I810_FLIP             DRM_IO ( DRM_COMMAND_BASE + DRM_I810_FLIP)
-
-typedef struct _drm_i810_clear {
-	int clear_color;
-	int clear_depth;
-	int flags;
-} drm_i810_clear_t;
-
-/* These may be placeholders if we have more cliprects than
- * I810_NR_SAREA_CLIPRECTS.  In that case, the client sets discard to
- * false, indicating that the buffer will be dispatched again with a
- * new set of cliprects.
- */
-typedef struct _drm_i810_vertex {
-	int idx;		/* buffer index */
-	int used;		/* nr bytes in use */
-	int discard;		/* client is finished with the buffer? */
-} drm_i810_vertex_t;
-
-typedef struct _drm_i810_copy_t {
-	int idx;		/* buffer index */
-	int used;		/* nr bytes in use */
-	void *address;		/* Address to copy from */
-} drm_i810_copy_t;
-
-#define PR_TRIANGLES         (0x0<<18)
-#define PR_TRISTRIP_0        (0x1<<18)
-#define PR_TRISTRIP_1        (0x2<<18)
-#define PR_TRIFAN            (0x3<<18)
-#define PR_POLYGON           (0x4<<18)
-#define PR_LINES             (0x5<<18)
-#define PR_LINESTRIP         (0x6<<18)
-#define PR_RECTS             (0x7<<18)
-#define PR_MASK              (0x7<<18)
-
-typedef struct drm_i810_dma {
-	void *virtual;
-	int request_idx;
-	int request_size;
-	int granted;
-} drm_i810_dma_t;
-
-typedef struct _drm_i810_overlay_t {
-	unsigned int offset;	/* Address of the Overlay Regs */
-	unsigned int physical;
-} drm_i810_overlay_t;
-
-typedef struct _drm_i810_mc {
-	int idx;		/* buffer index */
-	int used;		/* nr bytes in use */
-	int num_blocks;		/* number of GFXBlocks */
-	int *length;		/* List of lengths for GFXBlocks (FUTURE) */
-	unsigned int last_render;	/* Last Render Request */
-} drm_i810_mc_t;
-
-#endif				/* _I810_DRM_H_ */
diff --git a/openflow/usr/include/drm/i915_drm.h b/openflow/usr/include/drm/i915_drm.h
deleted file mode 100644
index 8f52f7b..0000000
--- a/openflow/usr/include/drm/i915_drm.h
+++ /dev/null
@@ -1,1142 +0,0 @@
-/*
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef _I915_DRM_H_
-#define _I915_DRM_H_
-
-#include <drm/drm.h>
-
-/* Please note that modifications to all structs defined here are
- * subject to backwards-compatibility constraints.
- */
-
-/**
- * DOC: uevents generated by i915 on it's device node
- *
- * I915_L3_PARITY_UEVENT - Generated when the driver receives a parity mismatch
- *	event from the gpu l3 cache. Additional information supplied is ROW,
- *	BANK, SUBBANK, SLICE of the affected cacheline. Userspace should keep
- *	track of these events and if a specific cache-line seems to have a
- *	persistent error remap it with the l3 remapping tool supplied in
- *	intel-gpu-tools.  The value supplied with the event is always 1.
- *
- * I915_ERROR_UEVENT - Generated upon error detection, currently only via
- *	hangcheck. The error detection event is a good indicator of when things
- *	began to go badly. The value supplied with the event is a 1 upon error
- *	detection, and a 0 upon reset completion, signifying no more error
- *	exists. NOTE: Disabling hangcheck or reset via module parameter will
- *	cause the related events to not be seen.
- *
- * I915_RESET_UEVENT - Event is generated just before an attempt to reset the
- *	the GPU. The value supplied with the event is always 1. NOTE: Disable
- *	reset via module parameter will cause this event to not be seen.
- */
-#define I915_L3_PARITY_UEVENT		"L3_PARITY_ERROR"
-#define I915_ERROR_UEVENT		"ERROR"
-#define I915_RESET_UEVENT		"RESET"
-
-/* Each region is a minimum of 16k, and there are at most 255 of them.
- */
-#define I915_NR_TEX_REGIONS 255	/* table size 2k - maximum due to use
-				 * of chars for next/prev indices */
-#define I915_LOG_MIN_TEX_REGION_SIZE 14
-
-typedef struct _drm_i915_init {
-	enum {
-		I915_INIT_DMA = 0x01,
-		I915_CLEANUP_DMA = 0x02,
-		I915_RESUME_DMA = 0x03
-	} func;
-	unsigned int mmio_offset;
-	int sarea_priv_offset;
-	unsigned int ring_start;
-	unsigned int ring_end;
-	unsigned int ring_size;
-	unsigned int front_offset;
-	unsigned int back_offset;
-	unsigned int depth_offset;
-	unsigned int w;
-	unsigned int h;
-	unsigned int pitch;
-	unsigned int pitch_bits;
-	unsigned int back_pitch;
-	unsigned int depth_pitch;
-	unsigned int cpp;
-	unsigned int chipset;
-} drm_i915_init_t;
-
-typedef struct _drm_i915_sarea {
-	struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
-	int last_upload;	/* last time texture was uploaded */
-	int last_enqueue;	/* last time a buffer was enqueued */
-	int last_dispatch;	/* age of the most recently dispatched buffer */
-	int ctxOwner;		/* last context to upload state */
-	int texAge;
-	int pf_enabled;		/* is pageflipping allowed? */
-	int pf_active;
-	int pf_current_page;	/* which buffer is being displayed? */
-	int perf_boxes;		/* performance boxes to be displayed */
-	int width, height;      /* screen size in pixels */
-
-	drm_handle_t front_handle;
-	int front_offset;
-	int front_size;
-
-	drm_handle_t back_handle;
-	int back_offset;
-	int back_size;
-
-	drm_handle_t depth_handle;
-	int depth_offset;
-	int depth_size;
-
-	drm_handle_t tex_handle;
-	int tex_offset;
-	int tex_size;
-	int log_tex_granularity;
-	int pitch;
-	int rotation;           /* 0, 90, 180 or 270 */
-	int rotated_offset;
-	int rotated_size;
-	int rotated_pitch;
-	int virtualX, virtualY;
-
-	unsigned int front_tiled;
-	unsigned int back_tiled;
-	unsigned int depth_tiled;
-	unsigned int rotated_tiled;
-	unsigned int rotated2_tiled;
-
-	int pipeA_x;
-	int pipeA_y;
-	int pipeA_w;
-	int pipeA_h;
-	int pipeB_x;
-	int pipeB_y;
-	int pipeB_w;
-	int pipeB_h;
-
-	/* fill out some space for old userspace triple buffer */
-	drm_handle_t unused_handle;
-	__u32 unused1, unused2, unused3;
-
-	/* buffer object handles for static buffers. May change
-	 * over the lifetime of the client.
-	 */
-	__u32 front_bo_handle;
-	__u32 back_bo_handle;
-	__u32 unused_bo_handle;
-	__u32 depth_bo_handle;
-
-} drm_i915_sarea_t;
-
-/* due to userspace building against these headers we need some compat here */
-#define planeA_x pipeA_x
-#define planeA_y pipeA_y
-#define planeA_w pipeA_w
-#define planeA_h pipeA_h
-#define planeB_x pipeB_x
-#define planeB_y pipeB_y
-#define planeB_w pipeB_w
-#define planeB_h pipeB_h
-
-/* Flags for perf_boxes
- */
-#define I915_BOX_RING_EMPTY    0x1
-#define I915_BOX_FLIP          0x2
-#define I915_BOX_WAIT          0x4
-#define I915_BOX_TEXTURE_LOAD  0x8
-#define I915_BOX_LOST_CONTEXT  0x10
-
-/*
- * i915 specific ioctls.
- *
- * The device specific ioctl range is [DRM_COMMAND_BASE, DRM_COMMAND_END) ie
- * [0x40, 0xa0) (a0 is excluded). The numbers below are defined as offset
- * against DRM_COMMAND_BASE and should be between [0x0, 0x60).
- */
-#define DRM_I915_INIT		0x00
-#define DRM_I915_FLUSH		0x01
-#define DRM_I915_FLIP		0x02
-#define DRM_I915_BATCHBUFFER	0x03
-#define DRM_I915_IRQ_EMIT	0x04
-#define DRM_I915_IRQ_WAIT	0x05
-#define DRM_I915_GETPARAM	0x06
-#define DRM_I915_SETPARAM	0x07
-#define DRM_I915_ALLOC		0x08
-#define DRM_I915_FREE		0x09
-#define DRM_I915_INIT_HEAP	0x0a
-#define DRM_I915_CMDBUFFER	0x0b
-#define DRM_I915_DESTROY_HEAP	0x0c
-#define DRM_I915_SET_VBLANK_PIPE	0x0d
-#define DRM_I915_GET_VBLANK_PIPE	0x0e
-#define DRM_I915_VBLANK_SWAP	0x0f
-#define DRM_I915_HWS_ADDR	0x11
-#define DRM_I915_GEM_INIT	0x13
-#define DRM_I915_GEM_EXECBUFFER	0x14
-#define DRM_I915_GEM_PIN	0x15
-#define DRM_I915_GEM_UNPIN	0x16
-#define DRM_I915_GEM_BUSY	0x17
-#define DRM_I915_GEM_THROTTLE	0x18
-#define DRM_I915_GEM_ENTERVT	0x19
-#define DRM_I915_GEM_LEAVEVT	0x1a
-#define DRM_I915_GEM_CREATE	0x1b
-#define DRM_I915_GEM_PREAD	0x1c
-#define DRM_I915_GEM_PWRITE	0x1d
-#define DRM_I915_GEM_MMAP	0x1e
-#define DRM_I915_GEM_SET_DOMAIN	0x1f
-#define DRM_I915_GEM_SW_FINISH	0x20
-#define DRM_I915_GEM_SET_TILING	0x21
-#define DRM_I915_GEM_GET_TILING	0x22
-#define DRM_I915_GEM_GET_APERTURE 0x23
-#define DRM_I915_GEM_MMAP_GTT	0x24
-#define DRM_I915_GET_PIPE_FROM_CRTC_ID	0x25
-#define DRM_I915_GEM_MADVISE	0x26
-#define DRM_I915_OVERLAY_PUT_IMAGE	0x27
-#define DRM_I915_OVERLAY_ATTRS	0x28
-#define DRM_I915_GEM_EXECBUFFER2	0x29
-#define DRM_I915_GET_SPRITE_COLORKEY	0x2a
-#define DRM_I915_SET_SPRITE_COLORKEY	0x2b
-#define DRM_I915_GEM_WAIT	0x2c
-#define DRM_I915_GEM_CONTEXT_CREATE	0x2d
-#define DRM_I915_GEM_CONTEXT_DESTROY	0x2e
-#define DRM_I915_GEM_SET_CACHING	0x2f
-#define DRM_I915_GEM_GET_CACHING	0x30
-#define DRM_I915_REG_READ		0x31
-#define DRM_I915_GET_RESET_STATS	0x32
-#define DRM_I915_GEM_USERPTR		0x33
-#define DRM_I915_GEM_CONTEXT_GETPARAM	0x34
-#define DRM_I915_GEM_CONTEXT_SETPARAM	0x35
-
-#define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
-#define DRM_IOCTL_I915_FLUSH		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
-#define DRM_IOCTL_I915_FLIP		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLIP)
-#define DRM_IOCTL_I915_BATCHBUFFER	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t)
-#define DRM_IOCTL_I915_IRQ_EMIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
-#define DRM_IOCTL_I915_IRQ_WAIT         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
-#define DRM_IOCTL_I915_GETPARAM         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GETPARAM, drm_i915_getparam_t)
-#define DRM_IOCTL_I915_SETPARAM         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SETPARAM, drm_i915_setparam_t)
-#define DRM_IOCTL_I915_ALLOC            DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_ALLOC, drm_i915_mem_alloc_t)
-#define DRM_IOCTL_I915_FREE             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FREE, drm_i915_mem_free_t)
-#define DRM_IOCTL_I915_INIT_HEAP        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT_HEAP, drm_i915_mem_init_heap_t)
-#define DRM_IOCTL_I915_CMDBUFFER	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_CMDBUFFER, drm_i915_cmdbuffer_t)
-#define DRM_IOCTL_I915_DESTROY_HEAP	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_DESTROY_HEAP, drm_i915_mem_destroy_heap_t)
-#define DRM_IOCTL_I915_SET_VBLANK_PIPE	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
-#define DRM_IOCTL_I915_GET_VBLANK_PIPE	DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
-#define DRM_IOCTL_I915_VBLANK_SWAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
-#define DRM_IOCTL_I915_HWS_ADDR		DRM_IOW(DRM_COMMAND_BASE + DRM_I915_HWS_ADDR, struct drm_i915_gem_init)
-#define DRM_IOCTL_I915_GEM_INIT		DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_INIT, struct drm_i915_gem_init)
-#define DRM_IOCTL_I915_GEM_EXECBUFFER	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER, struct drm_i915_gem_execbuffer)
-#define DRM_IOCTL_I915_GEM_EXECBUFFER2	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2, struct drm_i915_gem_execbuffer2)
-#define DRM_IOCTL_I915_GEM_PIN		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
-#define DRM_IOCTL_I915_GEM_UNPIN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
-#define DRM_IOCTL_I915_GEM_BUSY		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
-#define DRM_IOCTL_I915_GEM_SET_CACHING		DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHING, struct drm_i915_gem_caching)
-#define DRM_IOCTL_I915_GEM_GET_CACHING		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHING, struct drm_i915_gem_caching)
-#define DRM_IOCTL_I915_GEM_THROTTLE	DRM_IO ( DRM_COMMAND_BASE + DRM_I915_GEM_THROTTLE)
-#define DRM_IOCTL_I915_GEM_ENTERVT	DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_ENTERVT)
-#define DRM_IOCTL_I915_GEM_LEAVEVT	DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_LEAVEVT)
-#define DRM_IOCTL_I915_GEM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct drm_i915_gem_create)
-#define DRM_IOCTL_I915_GEM_PREAD	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PREAD, struct drm_i915_gem_pread)
-#define DRM_IOCTL_I915_GEM_PWRITE	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite)
-#define DRM_IOCTL_I915_GEM_MMAP		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap)
-#define DRM_IOCTL_I915_GEM_MMAP_GTT	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_gtt)
-#define DRM_IOCTL_I915_GEM_SET_DOMAIN	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SET_DOMAIN, struct drm_i915_gem_set_domain)
-#define DRM_IOCTL_I915_GEM_SW_FINISH	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish)
-#define DRM_IOCTL_I915_GEM_SET_TILING	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)
-#define DRM_IOCTL_I915_GEM_GET_TILING	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
-#define DRM_IOCTL_I915_GEM_GET_APERTURE	DRM_IOR  (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture)
-#define DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_PIPE_FROM_CRTC_ID, struct drm_i915_get_pipe_from_crtc_id)
-#define DRM_IOCTL_I915_GEM_MADVISE	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MADVISE, struct drm_i915_gem_madvise)
-#define DRM_IOCTL_I915_OVERLAY_PUT_IMAGE	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_OVERLAY_PUT_IMAGE, struct drm_intel_overlay_put_image)
-#define DRM_IOCTL_I915_OVERLAY_ATTRS	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs)
-#define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
-#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
-#define DRM_IOCTL_I915_GEM_WAIT		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait)
-#define DRM_IOCTL_I915_GEM_CONTEXT_CREATE	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create)
-#define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy)
-#define DRM_IOCTL_I915_REG_READ			DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_REG_READ, struct drm_i915_reg_read)
-#define DRM_IOCTL_I915_GET_RESET_STATS		DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GET_RESET_STATS, struct drm_i915_reset_stats)
-#define DRM_IOCTL_I915_GEM_USERPTR			DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_USERPTR, struct drm_i915_gem_userptr)
-#define DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_GETPARAM, struct drm_i915_gem_context_param)
-#define DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_SETPARAM, struct drm_i915_gem_context_param)
-
-/* Allow drivers to submit batchbuffers directly to hardware, relying
- * on the security mechanisms provided by hardware.
- */
-typedef struct drm_i915_batchbuffer {
-	int start;		/* agp offset */
-	int used;		/* nr bytes in use */
-	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
-	int DR4;		/* window origin for GFX_OP_DRAWRECT_INFO */
-	int num_cliprects;	/* mulitpass with multiple cliprects? */
-	struct drm_clip_rect *cliprects;	/* pointer to userspace cliprects */
-} drm_i915_batchbuffer_t;
-
-/* As above, but pass a pointer to userspace buffer which can be
- * validated by the kernel prior to sending to hardware.
- */
-typedef struct _drm_i915_cmdbuffer {
-	char *buf;	/* pointer to userspace command buffer */
-	int sz;			/* nr bytes in buf */
-	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
-	int DR4;		/* window origin for GFX_OP_DRAWRECT_INFO */
-	int num_cliprects;	/* mulitpass with multiple cliprects? */
-	struct drm_clip_rect *cliprects;	/* pointer to userspace cliprects */
-} drm_i915_cmdbuffer_t;
-
-/* Userspace can request & wait on irq's:
- */
-typedef struct drm_i915_irq_emit {
-	int *irq_seq;
-} drm_i915_irq_emit_t;
-
-typedef struct drm_i915_irq_wait {
-	int irq_seq;
-} drm_i915_irq_wait_t;
-
-/* Ioctl to query kernel params:
- */
-#define I915_PARAM_IRQ_ACTIVE            1
-#define I915_PARAM_ALLOW_BATCHBUFFER     2
-#define I915_PARAM_LAST_DISPATCH         3
-#define I915_PARAM_CHIPSET_ID            4
-#define I915_PARAM_HAS_GEM               5
-#define I915_PARAM_NUM_FENCES_AVAIL      6
-#define I915_PARAM_HAS_OVERLAY           7
-#define I915_PARAM_HAS_PAGEFLIPPING	 8
-#define I915_PARAM_HAS_EXECBUF2          9
-#define I915_PARAM_HAS_BSD		 10
-#define I915_PARAM_HAS_BLT		 11
-#define I915_PARAM_HAS_RELAXED_FENCING	 12
-#define I915_PARAM_HAS_COHERENT_RINGS	 13
-#define I915_PARAM_HAS_EXEC_CONSTANTS	 14
-#define I915_PARAM_HAS_RELAXED_DELTA	 15
-#define I915_PARAM_HAS_GEN7_SOL_RESET	 16
-#define I915_PARAM_HAS_LLC     	 	 17
-#define I915_PARAM_HAS_ALIASING_PPGTT	 18
-#define I915_PARAM_HAS_WAIT_TIMEOUT	 19
-#define I915_PARAM_HAS_SEMAPHORES	 20
-#define I915_PARAM_HAS_PRIME_VMAP_FLUSH	 21
-#define I915_PARAM_HAS_VEBOX		 22
-#define I915_PARAM_HAS_SECURE_BATCHES	 23
-#define I915_PARAM_HAS_PINNED_BATCHES	 24
-#define I915_PARAM_HAS_EXEC_NO_RELOC	 25
-#define I915_PARAM_HAS_EXEC_HANDLE_LUT   26
-#define I915_PARAM_HAS_WT     	 	 27
-#define I915_PARAM_CMD_PARSER_VERSION	 28
-#define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
-#define I915_PARAM_MMAP_VERSION          30
-#define I915_PARAM_HAS_BSD2		 31
-#define I915_PARAM_REVISION              32
-#define I915_PARAM_SUBSLICE_TOTAL	 33
-#define I915_PARAM_EU_TOTAL		 34
-#define I915_PARAM_HAS_GPU_RESET	 35
-#define I915_PARAM_HAS_RESOURCE_STREAMER 36
-#define I915_PARAM_HAS_EXEC_SOFTPIN     37
-
-typedef struct drm_i915_getparam {
-	__s32 param;
-	/*
-	 * WARNING: Using pointers instead of fixed-size u64 means we need to write
-	 * compat32 code. Don't repeat this mistake.
-	 */
-	int *value;
-} drm_i915_getparam_t;
-
-/* Ioctl to set kernel params:
- */
-#define I915_SETPARAM_USE_MI_BATCHBUFFER_START            1
-#define I915_SETPARAM_TEX_LRU_LOG_GRANULARITY             2
-#define I915_SETPARAM_ALLOW_BATCHBUFFER                   3
-#define I915_SETPARAM_NUM_USED_FENCES                     4
-
-typedef struct drm_i915_setparam {
-	int param;
-	int value;
-} drm_i915_setparam_t;
-
-/* A memory manager for regions of shared memory:
- */
-#define I915_MEM_REGION_AGP 1
-
-typedef struct drm_i915_mem_alloc {
-	int region;
-	int alignment;
-	int size;
-	int *region_offset;	/* offset from start of fb or agp */
-} drm_i915_mem_alloc_t;
-
-typedef struct drm_i915_mem_free {
-	int region;
-	int region_offset;
-} drm_i915_mem_free_t;
-
-typedef struct drm_i915_mem_init_heap {
-	int region;
-	int size;
-	int start;
-} drm_i915_mem_init_heap_t;
-
-/* Allow memory manager to be torn down and re-initialized (eg on
- * rotate):
- */
-typedef struct drm_i915_mem_destroy_heap {
-	int region;
-} drm_i915_mem_destroy_heap_t;
-
-/* Allow X server to configure which pipes to monitor for vblank signals
- */
-#define	DRM_I915_VBLANK_PIPE_A	1
-#define	DRM_I915_VBLANK_PIPE_B	2
-
-typedef struct drm_i915_vblank_pipe {
-	int pipe;
-} drm_i915_vblank_pipe_t;
-
-/* Schedule buffer swap at given vertical blank:
- */
-typedef struct drm_i915_vblank_swap {
-	drm_drawable_t drawable;
-	enum drm_vblank_seq_type seqtype;
-	unsigned int sequence;
-} drm_i915_vblank_swap_t;
-
-typedef struct drm_i915_hws_addr {
-	__u64 addr;
-} drm_i915_hws_addr_t;
-
-struct drm_i915_gem_init {
-	/**
-	 * Beginning offset in the GTT to be managed by the DRM memory
-	 * manager.
-	 */
-	__u64 gtt_start;
-	/**
-	 * Ending offset in the GTT to be managed by the DRM memory
-	 * manager.
-	 */
-	__u64 gtt_end;
-};
-
-struct drm_i915_gem_create {
-	/**
-	 * Requested size for the object.
-	 *
-	 * The (page-aligned) allocated size for the object will be returned.
-	 */
-	__u64 size;
-	/**
-	 * Returned handle for the object.
-	 *
-	 * Object handles are nonzero.
-	 */
-	__u32 handle;
-	__u32 pad;
-};
-
-struct drm_i915_gem_pread {
-	/** Handle for the object being read. */
-	__u32 handle;
-	__u32 pad;
-	/** Offset into the object to read from */
-	__u64 offset;
-	/** Length of data to read */
-	__u64 size;
-	/**
-	 * Pointer to write the data into.
-	 *
-	 * This is a fixed-size type for 32/64 compatibility.
-	 */
-	__u64 data_ptr;
-};
-
-struct drm_i915_gem_pwrite {
-	/** Handle for the object being written to. */
-	__u32 handle;
-	__u32 pad;
-	/** Offset into the object to write to */
-	__u64 offset;
-	/** Length of data to write */
-	__u64 size;
-	/**
-	 * Pointer to read the data from.
-	 *
-	 * This is a fixed-size type for 32/64 compatibility.
-	 */
-	__u64 data_ptr;
-};
-
-struct drm_i915_gem_mmap {
-	/** Handle for the object being mapped. */
-	__u32 handle;
-	__u32 pad;
-	/** Offset in the object to map. */
-	__u64 offset;
-	/**
-	 * Length of data to map.
-	 *
-	 * The value will be page-aligned.
-	 */
-	__u64 size;
-	/**
-	 * Returned pointer the data was mapped at.
-	 *
-	 * This is a fixed-size type for 32/64 compatibility.
-	 */
-	__u64 addr_ptr;
-
-	/**
-	 * Flags for extended behaviour.
-	 *
-	 * Added in version 2.
-	 */
-	__u64 flags;
-#define I915_MMAP_WC 0x1
-};
-
-struct drm_i915_gem_mmap_gtt {
-	/** Handle for the object being mapped. */
-	__u32 handle;
-	__u32 pad;
-	/**
-	 * Fake offset to use for subsequent mmap call
-	 *
-	 * This is a fixed-size type for 32/64 compatibility.
-	 */
-	__u64 offset;
-};
-
-struct drm_i915_gem_set_domain {
-	/** Handle for the object */
-	__u32 handle;
-
-	/** New read domains */
-	__u32 read_domains;
-
-	/** New write domain */
-	__u32 write_domain;
-};
-
-struct drm_i915_gem_sw_finish {
-	/** Handle for the object */
-	__u32 handle;
-};
-
-struct drm_i915_gem_relocation_entry {
-	/**
-	 * Handle of the buffer being pointed to by this relocation entry.
-	 *
-	 * It's appealing to make this be an index into the mm_validate_entry
-	 * list to refer to the buffer, but this allows the driver to create
-	 * a relocation list for state buffers and not re-write it per
-	 * exec using the buffer.
-	 */
-	__u32 target_handle;
-
-	/**
-	 * Value to be added to the offset of the target buffer to make up
-	 * the relocation entry.
-	 */
-	__u32 delta;
-
-	/** Offset in the buffer the relocation entry will be written into */
-	__u64 offset;
-
-	/**
-	 * Offset value of the target buffer that the relocation entry was last
-	 * written as.
-	 *
-	 * If the buffer has the same offset as last time, we can skip syncing
-	 * and writing the relocation.  This value is written back out by
-	 * the execbuffer ioctl when the relocation is written.
-	 */
-	__u64 presumed_offset;
-
-	/**
-	 * Target memory domains read by this operation.
-	 */
-	__u32 read_domains;
-
-	/**
-	 * Target memory domains written by this operation.
-	 *
-	 * Note that only one domain may be written by the whole
-	 * execbuffer operation, so that where there are conflicts,
-	 * the application will get -EINVAL back.
-	 */
-	__u32 write_domain;
-};
-
-/** @{
- * Intel memory domains
- *
- * Most of these just align with the various caches in
- * the system and are used to flush and invalidate as
- * objects end up cached in different domains.
- */
-/** CPU cache */
-#define I915_GEM_DOMAIN_CPU		0x00000001
-/** Render cache, used by 2D and 3D drawing */
-#define I915_GEM_DOMAIN_RENDER		0x00000002
-/** Sampler cache, used by texture engine */
-#define I915_GEM_DOMAIN_SAMPLER		0x00000004
-/** Command queue, used to load batch buffers */
-#define I915_GEM_DOMAIN_COMMAND		0x00000008
-/** Instruction cache, used by shader programs */
-#define I915_GEM_DOMAIN_INSTRUCTION	0x00000010
-/** Vertex address cache */
-#define I915_GEM_DOMAIN_VERTEX		0x00000020
-/** GTT domain - aperture and scanout */
-#define I915_GEM_DOMAIN_GTT		0x00000040
-/** @} */
-
-struct drm_i915_gem_exec_object {
-	/**
-	 * User's handle for a buffer to be bound into the GTT for this
-	 * operation.
-	 */
-	__u32 handle;
-
-	/** Number of relocations to be performed on this buffer */
-	__u32 relocation_count;
-	/**
-	 * Pointer to array of struct drm_i915_gem_relocation_entry containing
-	 * the relocations to be performed in this buffer.
-	 */
-	__u64 relocs_ptr;
-
-	/** Required alignment in graphics aperture */
-	__u64 alignment;
-
-	/**
-	 * Returned value of the updated offset of the object, for future
-	 * presumed_offset writes.
-	 */
-	__u64 offset;
-};
-
-struct drm_i915_gem_execbuffer {
-	/**
-	 * List of buffers to be validated with their relocations to be
-	 * performend on them.
-	 *
-	 * This is a pointer to an array of struct drm_i915_gem_validate_entry.
-	 *
-	 * These buffers must be listed in an order such that all relocations
-	 * a buffer is performing refer to buffers that have already appeared
-	 * in the validate list.
-	 */
-	__u64 buffers_ptr;
-	__u32 buffer_count;
-
-	/** Offset in the batchbuffer to start execution from. */
-	__u32 batch_start_offset;
-	/** Bytes used in batchbuffer from batch_start_offset */
-	__u32 batch_len;
-	__u32 DR1;
-	__u32 DR4;
-	__u32 num_cliprects;
-	/** This is a struct drm_clip_rect *cliprects */
-	__u64 cliprects_ptr;
-};
-
-struct drm_i915_gem_exec_object2 {
-	/**
-	 * User's handle for a buffer to be bound into the GTT for this
-	 * operation.
-	 */
-	__u32 handle;
-
-	/** Number of relocations to be performed on this buffer */
-	__u32 relocation_count;
-	/**
-	 * Pointer to array of struct drm_i915_gem_relocation_entry containing
-	 * the relocations to be performed in this buffer.
-	 */
-	__u64 relocs_ptr;
-
-	/** Required alignment in graphics aperture */
-	__u64 alignment;
-
-	/**
-	 * When the EXEC_OBJECT_PINNED flag is specified this is populated by
-	 * the user with the GTT offset at which this object will be pinned.
-	 * When the I915_EXEC_NO_RELOC flag is specified this must contain the
-	 * presumed_offset of the object.
-	 * During execbuffer2 the kernel populates it with the value of the
-	 * current GTT offset of the object, for future presumed_offset writes.
-	 */
-	__u64 offset;
-
-#define EXEC_OBJECT_NEEDS_FENCE (1<<0)
-#define EXEC_OBJECT_NEEDS_GTT	(1<<1)
-#define EXEC_OBJECT_WRITE	(1<<2)
-#define EXEC_OBJECT_SUPPORTS_48B_ADDRESS (1<<3)
-#define EXEC_OBJECT_PINNED     (1<<4)
-#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_PINNED<<1)
-	__u64 flags;
-
-	__u64 rsvd1;
-	__u64 rsvd2;
-};
-
-struct drm_i915_gem_execbuffer2 {
-	/**
-	 * List of gem_exec_object2 structs
-	 */
-	__u64 buffers_ptr;
-	__u32 buffer_count;
-
-	/** Offset in the batchbuffer to start execution from. */
-	__u32 batch_start_offset;
-	/** Bytes used in batchbuffer from batch_start_offset */
-	__u32 batch_len;
-	__u32 DR1;
-	__u32 DR4;
-	__u32 num_cliprects;
-	/** This is a struct drm_clip_rect *cliprects */
-	__u64 cliprects_ptr;
-#define I915_EXEC_RING_MASK              (7<<0)
-#define I915_EXEC_DEFAULT                (0<<0)
-#define I915_EXEC_RENDER                 (1<<0)
-#define I915_EXEC_BSD                    (2<<0)
-#define I915_EXEC_BLT                    (3<<0)
-#define I915_EXEC_VEBOX                  (4<<0)
-
-/* Used for switching the constants addressing mode on gen4+ RENDER ring.
- * Gen6+ only supports relative addressing to dynamic state (default) and
- * absolute addressing.
- *
- * These flags are ignored for the BSD and BLT rings.
- */
-#define I915_EXEC_CONSTANTS_MASK 	(3<<6)
-#define I915_EXEC_CONSTANTS_REL_GENERAL (0<<6) /* default */
-#define I915_EXEC_CONSTANTS_ABSOLUTE 	(1<<6)
-#define I915_EXEC_CONSTANTS_REL_SURFACE (2<<6) /* gen4/5 only */
-	__u64 flags;
-	__u64 rsvd1; /* now used for context info */
-	__u64 rsvd2;
-};
-
-/** Resets the SO write offset registers for transform feedback on gen7. */
-#define I915_EXEC_GEN7_SOL_RESET	(1<<8)
-
-/** Request a privileged ("secure") batch buffer. Note only available for
- * DRM_ROOT_ONLY | DRM_MASTER processes.
- */
-#define I915_EXEC_SECURE		(1<<9)
-
-/** Inform the kernel that the batch is and will always be pinned. This
- * negates the requirement for a workaround to be performed to avoid
- * an incoherent CS (such as can be found on 830/845). If this flag is
- * not passed, the kernel will endeavour to make sure the batch is
- * coherent with the CS before execution. If this flag is passed,
- * userspace assumes the responsibility for ensuring the same.
- */
-#define I915_EXEC_IS_PINNED		(1<<10)
-
-/** Provide a hint to the kernel that the command stream and auxiliary
- * state buffers already holds the correct presumed addresses and so the
- * relocation process may be skipped if no buffers need to be moved in
- * preparation for the execbuffer.
- */
-#define I915_EXEC_NO_RELOC		(1<<11)
-
-/** Use the reloc.handle as an index into the exec object array rather
- * than as the per-file handle.
- */
-#define I915_EXEC_HANDLE_LUT		(1<<12)
-
-/** Used for switching BSD rings on the platforms with two BSD rings */
-#define I915_EXEC_BSD_SHIFT     (13)
-#define I915_EXEC_BSD_MASK	(3 << I915_EXEC_BSD_SHIFT)
-/* default ping-pong mode */
-#define I915_EXEC_BSD_DEFAULT	(0 << I915_EXEC_BSD_SHIFT)
-#define I915_EXEC_BSD_RING1	(1 << I915_EXEC_BSD_SHIFT)
-#define I915_EXEC_BSD_RING2	(2 << I915_EXEC_BSD_SHIFT)
-
-/** Tell the kernel that the batchbuffer is processed by
- *  the resource streamer.
- */
-#define I915_EXEC_RESOURCE_STREAMER     (1<<15)
-
-#define __I915_EXEC_UNKNOWN_FLAGS -(I915_EXEC_RESOURCE_STREAMER<<1)
-
-#define I915_EXEC_CONTEXT_ID_MASK	(0xffffffff)
-#define i915_execbuffer2_set_context_id(eb2, context) \
-	(eb2).rsvd1 = context & I915_EXEC_CONTEXT_ID_MASK
-#define i915_execbuffer2_get_context_id(eb2) \
-	((eb2).rsvd1 & I915_EXEC_CONTEXT_ID_MASK)
-
-struct drm_i915_gem_pin {
-	/** Handle of the buffer to be pinned. */
-	__u32 handle;
-	__u32 pad;
-
-	/** alignment required within the aperture */
-	__u64 alignment;
-
-	/** Returned GTT offset of the buffer. */
-	__u64 offset;
-};
-
-struct drm_i915_gem_unpin {
-	/** Handle of the buffer to be unpinned. */
-	__u32 handle;
-	__u32 pad;
-};
-
-struct drm_i915_gem_busy {
-	/** Handle of the buffer to check for busy */
-	__u32 handle;
-
-	/** Return busy status (1 if busy, 0 if idle).
-	 * The high word is used to indicate on which rings the object
-	 * currently resides:
-	 *  16:31 - busy (r or r/w) rings (16 render, 17 bsd, 18 blt, etc)
-	 */
-	__u32 busy;
-};
-
-/**
- * I915_CACHING_NONE
- *
- * GPU access is not coherent with cpu caches. Default for machines without an
- * LLC.
- */
-#define I915_CACHING_NONE		0
-/**
- * I915_CACHING_CACHED
- *
- * GPU access is coherent with cpu caches and furthermore the data is cached in
- * last-level caches shared between cpu cores and the gpu GT. Default on
- * machines with HAS_LLC.
- */
-#define I915_CACHING_CACHED		1
-/**
- * I915_CACHING_DISPLAY
- *
- * Special GPU caching mode which is coherent with the scanout engines.
- * Transparently falls back to I915_CACHING_NONE on platforms where no special
- * cache mode (like write-through or gfdt flushing) is available. The kernel
- * automatically sets this mode when using a buffer as a scanout target.
- * Userspace can manually set this mode to avoid a costly stall and clflush in
- * the hotpath of drawing the first frame.
- */
-#define I915_CACHING_DISPLAY		2
-
-struct drm_i915_gem_caching {
-	/**
-	 * Handle of the buffer to set/get the caching level of. */
-	__u32 handle;
-
-	/**
-	 * Cacheing level to apply or return value
-	 *
-	 * bits0-15 are for generic caching control (i.e. the above defined
-	 * values). bits16-31 are reserved for platform-specific variations
-	 * (e.g. l3$ caching on gen7). */
-	__u32 caching;
-};
-
-#define I915_TILING_NONE	0
-#define I915_TILING_X		1
-#define I915_TILING_Y		2
-
-#define I915_BIT_6_SWIZZLE_NONE		0
-#define I915_BIT_6_SWIZZLE_9		1
-#define I915_BIT_6_SWIZZLE_9_10		2
-#define I915_BIT_6_SWIZZLE_9_11		3
-#define I915_BIT_6_SWIZZLE_9_10_11	4
-/* Not seen by userland */
-#define I915_BIT_6_SWIZZLE_UNKNOWN	5
-/* Seen by userland. */
-#define I915_BIT_6_SWIZZLE_9_17		6
-#define I915_BIT_6_SWIZZLE_9_10_17	7
-
-struct drm_i915_gem_set_tiling {
-	/** Handle of the buffer to have its tiling state updated */
-	__u32 handle;
-
-	/**
-	 * Tiling mode for the object (I915_TILING_NONE, I915_TILING_X,
-	 * I915_TILING_Y).
-	 *
-	 * This value is to be set on request, and will be updated by the
-	 * kernel on successful return with the actual chosen tiling layout.
-	 *
-	 * The tiling mode may be demoted to I915_TILING_NONE when the system
-	 * has bit 6 swizzling that can't be managed correctly by GEM.
-	 *
-	 * Buffer contents become undefined when changing tiling_mode.
-	 */
-	__u32 tiling_mode;
-
-	/**
-	 * Stride in bytes for the object when in I915_TILING_X or
-	 * I915_TILING_Y.
-	 */
-	__u32 stride;
-
-	/**
-	 * Returned address bit 6 swizzling required for CPU access through
-	 * mmap mapping.
-	 */
-	__u32 swizzle_mode;
-};
-
-struct drm_i915_gem_get_tiling {
-	/** Handle of the buffer to get tiling state for. */
-	__u32 handle;
-
-	/**
-	 * Current tiling mode for the object (I915_TILING_NONE, I915_TILING_X,
-	 * I915_TILING_Y).
-	 */
-	__u32 tiling_mode;
-
-	/**
-	 * Returned address bit 6 swizzling required for CPU access through
-	 * mmap mapping.
-	 */
-	__u32 swizzle_mode;
-
-	/**
-	 * Returned address bit 6 swizzling required for CPU access through
-	 * mmap mapping whilst bound.
-	 */
-	__u32 phys_swizzle_mode;
-};
-
-struct drm_i915_gem_get_aperture {
-	/** Total size of the aperture used by i915_gem_execbuffer, in bytes */
-	__u64 aper_size;
-
-	/**
-	 * Available space in the aperture used by i915_gem_execbuffer, in
-	 * bytes
-	 */
-	__u64 aper_available_size;
-};
-
-struct drm_i915_get_pipe_from_crtc_id {
-	/** ID of CRTC being requested **/
-	__u32 crtc_id;
-
-	/** pipe of requested CRTC **/
-	__u32 pipe;
-};
-
-#define I915_MADV_WILLNEED 0
-#define I915_MADV_DONTNEED 1
-#define __I915_MADV_PURGED 2 /* internal state */
-
-struct drm_i915_gem_madvise {
-	/** Handle of the buffer to change the backing store advice */
-	__u32 handle;
-
-	/* Advice: either the buffer will be needed again in the near future,
-	 *         or wont be and could be discarded under memory pressure.
-	 */
-	__u32 madv;
-
-	/** Whether the backing store still exists. */
-	__u32 retained;
-};
-
-/* flags */
-#define I915_OVERLAY_TYPE_MASK 		0xff
-#define I915_OVERLAY_YUV_PLANAR 	0x01
-#define I915_OVERLAY_YUV_PACKED 	0x02
-#define I915_OVERLAY_RGB		0x03
-
-#define I915_OVERLAY_DEPTH_MASK		0xff00
-#define I915_OVERLAY_RGB24		0x1000
-#define I915_OVERLAY_RGB16		0x2000
-#define I915_OVERLAY_RGB15		0x3000
-#define I915_OVERLAY_YUV422		0x0100
-#define I915_OVERLAY_YUV411		0x0200
-#define I915_OVERLAY_YUV420		0x0300
-#define I915_OVERLAY_YUV410		0x0400
-
-#define I915_OVERLAY_SWAP_MASK		0xff0000
-#define I915_OVERLAY_NO_SWAP		0x000000
-#define I915_OVERLAY_UV_SWAP		0x010000
-#define I915_OVERLAY_Y_SWAP		0x020000
-#define I915_OVERLAY_Y_AND_UV_SWAP	0x030000
-
-#define I915_OVERLAY_FLAGS_MASK		0xff000000
-#define I915_OVERLAY_ENABLE		0x01000000
-
-struct drm_intel_overlay_put_image {
-	/* various flags and src format description */
-	__u32 flags;
-	/* source picture description */
-	__u32 bo_handle;
-	/* stride values and offsets are in bytes, buffer relative */
-	__u16 stride_Y; /* stride for packed formats */
-	__u16 stride_UV;
-	__u32 offset_Y; /* offset for packet formats */
-	__u32 offset_U;
-	__u32 offset_V;
-	/* in pixels */
-	__u16 src_width;
-	__u16 src_height;
-	/* to compensate the scaling factors for partially covered surfaces */
-	__u16 src_scan_width;
-	__u16 src_scan_height;
-	/* output crtc description */
-	__u32 crtc_id;
-	__u16 dst_x;
-	__u16 dst_y;
-	__u16 dst_width;
-	__u16 dst_height;
-};
-
-/* flags */
-#define I915_OVERLAY_UPDATE_ATTRS	(1<<0)
-#define I915_OVERLAY_UPDATE_GAMMA	(1<<1)
-#define I915_OVERLAY_DISABLE_DEST_COLORKEY	(1<<2)
-struct drm_intel_overlay_attrs {
-	__u32 flags;
-	__u32 color_key;
-	__s32 brightness;
-	__u32 contrast;
-	__u32 saturation;
-	__u32 gamma0;
-	__u32 gamma1;
-	__u32 gamma2;
-	__u32 gamma3;
-	__u32 gamma4;
-	__u32 gamma5;
-};
-
-/*
- * Intel sprite handling
- *
- * Color keying works with a min/mask/max tuple.  Both source and destination
- * color keying is allowed.
- *
- * Source keying:
- * Sprite pixels within the min & max values, masked against the color channels
- * specified in the mask field, will be transparent.  All other pixels will
- * be displayed on top of the primary plane.  For RGB surfaces, only the min
- * and mask fields will be used; ranged compares are not allowed.
- *
- * Destination keying:
- * Primary plane pixels that match the min value, masked against the color
- * channels specified in the mask field, will be replaced by corresponding
- * pixels from the sprite plane.
- *
- * Note that source & destination keying are exclusive; only one can be
- * active on a given plane.
- */
-
-#define I915_SET_COLORKEY_NONE		(1<<0) /* disable color key matching */
-#define I915_SET_COLORKEY_DESTINATION	(1<<1)
-#define I915_SET_COLORKEY_SOURCE	(1<<2)
-struct drm_intel_sprite_colorkey {
-	__u32 plane_id;
-	__u32 min_value;
-	__u32 channel_mask;
-	__u32 max_value;
-	__u32 flags;
-};
-
-struct drm_i915_gem_wait {
-	/** Handle of BO we shall wait on */
-	__u32 bo_handle;
-	__u32 flags;
-	/** Number of nanoseconds to wait, Returns time remaining. */
-	__s64 timeout_ns;
-};
-
-struct drm_i915_gem_context_create {
-	/*  output: id of new context*/
-	__u32 ctx_id;
-	__u32 pad;
-};
-
-struct drm_i915_gem_context_destroy {
-	__u32 ctx_id;
-	__u32 pad;
-};
-
-struct drm_i915_reg_read {
-	__u64 offset;
-	__u64 val; /* Return value */
-};
-/* Known registers:
- *
- * Render engine timestamp - 0x2358 + 64bit - gen7+
- * - Note this register returns an invalid value if using the default
- *   single instruction 8byte read, in order to workaround that use
- *   offset (0x2538 | 1) instead.
- *
- */
-
-struct drm_i915_reset_stats {
-	__u32 ctx_id;
-	__u32 flags;
-
-	/* All resets since boot/module reload, for all contexts */
-	__u32 reset_count;
-
-	/* Number of batches lost when active in GPU, for this context */
-	__u32 batch_active;
-
-	/* Number of batches lost pending for execution, for this context */
-	__u32 batch_pending;
-
-	__u32 pad;
-};
-
-struct drm_i915_gem_userptr {
-	__u64 user_ptr;
-	__u64 user_size;
-	__u32 flags;
-#define I915_USERPTR_READ_ONLY 0x1
-#define I915_USERPTR_UNSYNCHRONIZED 0x80000000
-	/**
-	 * Returned handle for the object.
-	 *
-	 * Object handles are nonzero.
-	 */
-	__u32 handle;
-};
-
-struct drm_i915_gem_context_param {
-	__u32 ctx_id;
-	__u32 size;
-	__u64 param;
-#define I915_CONTEXT_PARAM_BAN_PERIOD	0x1
-#define I915_CONTEXT_PARAM_NO_ZEROMAP	0x2
-#define I915_CONTEXT_PARAM_GTT_SIZE	0x3
-	__u64 value;
-};
-
-#endif /* _I915_DRM_H_ */
diff --git a/openflow/usr/include/drm/mga_drm.h b/openflow/usr/include/drm/mga_drm.h
deleted file mode 100644
index ac95c62..0000000
--- a/openflow/usr/include/drm/mga_drm.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/* mga_drm.h -- Public header for the Matrox g200/g400 driver -*- linux-c -*-
- * Created: Tue Jan 25 01:50:01 1999 by jhartmann@precisioninsight.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Jeff Hartmann <jhartmann@valinux.com>
- *    Keith Whitwell <keith@tungstengraphics.com>
- *
- * Rewritten by:
- *    Gareth Hughes <gareth@valinux.com>
- */
-
-#ifndef __MGA_DRM_H__
-#define __MGA_DRM_H__
-
-#include <drm/drm.h>
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the Xserver file (mga_sarea.h)
- */
-
-#ifndef __MGA_SAREA_DEFINES__
-#define __MGA_SAREA_DEFINES__
-
-/* WARP pipe flags
- */
-#define MGA_F			0x1	/* fog */
-#define MGA_A			0x2	/* alpha */
-#define MGA_S			0x4	/* specular */
-#define MGA_T2			0x8	/* multitexture */
-
-#define MGA_WARP_TGZ		0
-#define MGA_WARP_TGZF		(MGA_F)
-#define MGA_WARP_TGZA		(MGA_A)
-#define MGA_WARP_TGZAF		(MGA_F|MGA_A)
-#define MGA_WARP_TGZS		(MGA_S)
-#define MGA_WARP_TGZSF		(MGA_S|MGA_F)
-#define MGA_WARP_TGZSA		(MGA_S|MGA_A)
-#define MGA_WARP_TGZSAF		(MGA_S|MGA_F|MGA_A)
-#define MGA_WARP_T2GZ		(MGA_T2)
-#define MGA_WARP_T2GZF		(MGA_T2|MGA_F)
-#define MGA_WARP_T2GZA		(MGA_T2|MGA_A)
-#define MGA_WARP_T2GZAF		(MGA_T2|MGA_A|MGA_F)
-#define MGA_WARP_T2GZS		(MGA_T2|MGA_S)
-#define MGA_WARP_T2GZSF		(MGA_T2|MGA_S|MGA_F)
-#define MGA_WARP_T2GZSA		(MGA_T2|MGA_S|MGA_A)
-#define MGA_WARP_T2GZSAF	(MGA_T2|MGA_S|MGA_F|MGA_A)
-
-#define MGA_MAX_G200_PIPES	8	/* no multitex */
-#define MGA_MAX_G400_PIPES	16
-#define MGA_MAX_WARP_PIPES	MGA_MAX_G400_PIPES
-#define MGA_WARP_UCODE_SIZE	32768	/* in bytes */
-
-#define MGA_CARD_TYPE_G200	1
-#define MGA_CARD_TYPE_G400	2
-#define MGA_CARD_TYPE_G450	3	/* not currently used */
-#define MGA_CARD_TYPE_G550	4
-
-#define MGA_FRONT		0x1
-#define MGA_BACK		0x2
-#define MGA_DEPTH		0x4
-
-/* What needs to be changed for the current vertex dma buffer?
- */
-#define MGA_UPLOAD_CONTEXT	0x1
-#define MGA_UPLOAD_TEX0		0x2
-#define MGA_UPLOAD_TEX1		0x4
-#define MGA_UPLOAD_PIPE		0x8
-#define MGA_UPLOAD_TEX0IMAGE	0x10	/* handled client-side */
-#define MGA_UPLOAD_TEX1IMAGE	0x20	/* handled client-side */
-#define MGA_UPLOAD_2D		0x40
-#define MGA_WAIT_AGE		0x80	/* handled client-side */
-#define MGA_UPLOAD_CLIPRECTS	0x100	/* handled client-side */
-#if 0
-#define MGA_DMA_FLUSH		0x200	/* set when someone gets the lock
-					   quiescent */
-#endif
-
-/* 32 buffers of 64k each, total 2 meg.
- */
-#define MGA_BUFFER_SIZE		(1 << 16)
-#define MGA_NUM_BUFFERS		128
-
-/* Keep these small for testing.
- */
-#define MGA_NR_SAREA_CLIPRECTS	8
-
-/* 2 heaps (1 for card, 1 for agp), each divided into up to 128
- * regions, subject to a minimum region size of (1<<16) == 64k.
- *
- * Clients may subdivide regions internally, but when sharing between
- * clients, the region size is the minimum granularity.
- */
-
-#define MGA_CARD_HEAP			0
-#define MGA_AGP_HEAP			1
-#define MGA_NR_TEX_HEAPS		2
-#define MGA_NR_TEX_REGIONS		16
-#define MGA_LOG_MIN_TEX_REGION_SIZE	16
-
-#define  DRM_MGA_IDLE_RETRY          2048
-
-#endif				/* __MGA_SAREA_DEFINES__ */
-
-/* Setup registers for 3D context
- */
-typedef struct {
-	unsigned int dstorg;
-	unsigned int maccess;
-	unsigned int plnwt;
-	unsigned int dwgctl;
-	unsigned int alphactrl;
-	unsigned int fogcolor;
-	unsigned int wflag;
-	unsigned int tdualstage0;
-	unsigned int tdualstage1;
-	unsigned int fcol;
-	unsigned int stencil;
-	unsigned int stencilctl;
-} drm_mga_context_regs_t;
-
-/* Setup registers for 2D, X server
- */
-typedef struct {
-	unsigned int pitch;
-} drm_mga_server_regs_t;
-
-/* Setup registers for each texture unit
- */
-typedef struct {
-	unsigned int texctl;
-	unsigned int texctl2;
-	unsigned int texfilter;
-	unsigned int texbordercol;
-	unsigned int texorg;
-	unsigned int texwidth;
-	unsigned int texheight;
-	unsigned int texorg1;
-	unsigned int texorg2;
-	unsigned int texorg3;
-	unsigned int texorg4;
-} drm_mga_texture_regs_t;
-
-/* General aging mechanism
- */
-typedef struct {
-	unsigned int head;	/* Position of head pointer          */
-	unsigned int wrap;	/* Primary DMA wrap count            */
-} drm_mga_age_t;
-
-typedef struct _drm_mga_sarea {
-	/* The channel for communication of state information to the kernel
-	 * on firing a vertex dma buffer.
-	 */
-	drm_mga_context_regs_t context_state;
-	drm_mga_server_regs_t server_state;
-	drm_mga_texture_regs_t tex_state[2];
-	unsigned int warp_pipe;
-	unsigned int dirty;
-	unsigned int vertsize;
-
-	/* The current cliprects, or a subset thereof.
-	 */
-	struct drm_clip_rect boxes[MGA_NR_SAREA_CLIPRECTS];
-	unsigned int nbox;
-
-	/* Information about the most recently used 3d drawable.  The
-	 * client fills in the req_* fields, the server fills in the
-	 * exported_ fields and puts the cliprects into boxes, above.
-	 *
-	 * The client clears the exported_drawable field before
-	 * clobbering the boxes data.
-	 */
-	unsigned int req_drawable;	/* the X drawable id */
-	unsigned int req_draw_buffer;	/* MGA_FRONT or MGA_BACK */
-
-	unsigned int exported_drawable;
-	unsigned int exported_index;
-	unsigned int exported_stamp;
-	unsigned int exported_buffers;
-	unsigned int exported_nfront;
-	unsigned int exported_nback;
-	int exported_back_x, exported_front_x, exported_w;
-	int exported_back_y, exported_front_y, exported_h;
-	struct drm_clip_rect exported_boxes[MGA_NR_SAREA_CLIPRECTS];
-
-	/* Counters for aging textures and for client-side throttling.
-	 */
-	unsigned int status[4];
-	unsigned int last_wrap;
-
-	drm_mga_age_t last_frame;
-	unsigned int last_enqueue;	/* last time a buffer was enqueued */
-	unsigned int last_dispatch;	/* age of the most recently dispatched buffer */
-	unsigned int last_quiescent;	/*  */
-
-	/* LRU lists for texture memory in agp space and on the card.
-	 */
-	struct drm_tex_region texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS + 1];
-	unsigned int texAge[MGA_NR_TEX_HEAPS];
-
-	/* Mechanism to validate card state.
-	 */
-	int ctxOwner;
-} drm_mga_sarea_t;
-
-/* MGA specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_MGA_INIT     0x00
-#define DRM_MGA_FLUSH    0x01
-#define DRM_MGA_RESET    0x02
-#define DRM_MGA_SWAP     0x03
-#define DRM_MGA_CLEAR    0x04
-#define DRM_MGA_VERTEX   0x05
-#define DRM_MGA_INDICES  0x06
-#define DRM_MGA_ILOAD    0x07
-#define DRM_MGA_BLIT     0x08
-#define DRM_MGA_GETPARAM 0x09
-
-/* 3.2:
- * ioctls for operating on fences.
- */
-#define DRM_MGA_SET_FENCE      0x0a
-#define DRM_MGA_WAIT_FENCE     0x0b
-#define DRM_MGA_DMA_BOOTSTRAP  0x0c
-
-#define DRM_IOCTL_MGA_INIT     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_INIT, drm_mga_init_t)
-#define DRM_IOCTL_MGA_FLUSH    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_FLUSH, struct drm_lock)
-#define DRM_IOCTL_MGA_RESET    DRM_IO(  DRM_COMMAND_BASE + DRM_MGA_RESET)
-#define DRM_IOCTL_MGA_SWAP     DRM_IO(  DRM_COMMAND_BASE + DRM_MGA_SWAP)
-#define DRM_IOCTL_MGA_CLEAR    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_CLEAR, drm_mga_clear_t)
-#define DRM_IOCTL_MGA_VERTEX   DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_VERTEX, drm_mga_vertex_t)
-#define DRM_IOCTL_MGA_INDICES  DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_INDICES, drm_mga_indices_t)
-#define DRM_IOCTL_MGA_ILOAD    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_ILOAD, drm_mga_iload_t)
-#define DRM_IOCTL_MGA_BLIT     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_BLIT, drm_mga_blit_t)
-#define DRM_IOCTL_MGA_GETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_GETPARAM, drm_mga_getparam_t)
-#define DRM_IOCTL_MGA_SET_FENCE     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_SET_FENCE, __u32)
-#define DRM_IOCTL_MGA_WAIT_FENCE    DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_WAIT_FENCE, __u32)
-#define DRM_IOCTL_MGA_DMA_BOOTSTRAP DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_DMA_BOOTSTRAP, drm_mga_dma_bootstrap_t)
-
-typedef struct _drm_mga_warp_index {
-	int installed;
-	unsigned long phys_addr;
-	int size;
-} drm_mga_warp_index_t;
-
-typedef struct drm_mga_init {
-	enum {
-		MGA_INIT_DMA = 0x01,
-		MGA_CLEANUP_DMA = 0x02
-	} func;
-
-	unsigned long sarea_priv_offset;
-
-	int chipset;
-	int sgram;
-
-	unsigned int maccess;
-
-	unsigned int fb_cpp;
-	unsigned int front_offset, front_pitch;
-	unsigned int back_offset, back_pitch;
-
-	unsigned int depth_cpp;
-	unsigned int depth_offset, depth_pitch;
-
-	unsigned int texture_offset[MGA_NR_TEX_HEAPS];
-	unsigned int texture_size[MGA_NR_TEX_HEAPS];
-
-	unsigned long fb_offset;
-	unsigned long mmio_offset;
-	unsigned long status_offset;
-	unsigned long warp_offset;
-	unsigned long primary_offset;
-	unsigned long buffers_offset;
-} drm_mga_init_t;
-
-typedef struct drm_mga_dma_bootstrap {
-	/**
-	 * \name AGP texture region
-	 *
-	 * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, these fields will
-	 * be filled in with the actual AGP texture settings.
-	 *
-	 * \warning
-	 * If these fields are non-zero, but dma_mga_dma_bootstrap::agp_mode
-	 * is zero, it means that PCI memory (most likely through the use of
-	 * an IOMMU) is being used for "AGP" textures.
-	 */
-	/*@{ */
-	unsigned long texture_handle; /**< Handle used to map AGP textures. */
-	__u32 texture_size;	      /**< Size of the AGP texture region. */
-	/*@} */
-
-	/**
-	 * Requested size of the primary DMA region.
-	 *
-	 * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
-	 * filled in with the actual AGP mode.  If AGP was not available
-	 */
-	__u32 primary_size;
-
-	/**
-	 * Requested number of secondary DMA buffers.
-	 *
-	 * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
-	 * filled in with the actual number of secondary DMA buffers
-	 * allocated.  Particularly when PCI DMA is used, this may be
-	 * (subtantially) less than the number requested.
-	 */
-	__u32 secondary_bin_count;
-
-	/**
-	 * Requested size of each secondary DMA buffer.
-	 *
-	 * While the kernel \b is free to reduce
-	 * dma_mga_dma_bootstrap::secondary_bin_count, it is \b not allowed
-	 * to reduce dma_mga_dma_bootstrap::secondary_bin_size.
-	 */
-	__u32 secondary_bin_size;
-
-	/**
-	 * Bit-wise mask of AGPSTAT2_* values.  Currently only \c AGPSTAT2_1X,
-	 * \c AGPSTAT2_2X, and \c AGPSTAT2_4X are supported.  If this value is
-	 * zero, it means that PCI DMA should be used, even if AGP is
-	 * possible.
-	 *
-	 * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
-	 * filled in with the actual AGP mode.  If AGP was not available
-	 * (i.e., PCI DMA was used), this value will be zero.
-	 */
-	__u32 agp_mode;
-
-	/**
-	 * Desired AGP GART size, measured in megabytes.
-	 */
-	__u8 agp_size;
-} drm_mga_dma_bootstrap_t;
-
-typedef struct drm_mga_clear {
-	unsigned int flags;
-	unsigned int clear_color;
-	unsigned int clear_depth;
-	unsigned int color_mask;
-	unsigned int depth_mask;
-} drm_mga_clear_t;
-
-typedef struct drm_mga_vertex {
-	int idx;		/* buffer to queue */
-	int used;		/* bytes in use */
-	int discard;		/* client finished with buffer?  */
-} drm_mga_vertex_t;
-
-typedef struct drm_mga_indices {
-	int idx;		/* buffer to queue */
-	unsigned int start;
-	unsigned int end;
-	int discard;		/* client finished with buffer?  */
-} drm_mga_indices_t;
-
-typedef struct drm_mga_iload {
-	int idx;
-	unsigned int dstorg;
-	unsigned int length;
-} drm_mga_iload_t;
-
-typedef struct _drm_mga_blit {
-	unsigned int planemask;
-	unsigned int srcorg;
-	unsigned int dstorg;
-	int src_pitch, dst_pitch;
-	int delta_sx, delta_sy;
-	int delta_dx, delta_dy;
-	int height, ydir;	/* flip image vertically */
-	int source_pitch, dest_pitch;
-} drm_mga_blit_t;
-
-/* 3.1: An ioctl to get parameters that aren't available to the 3d
- * client any other way.
- */
-#define MGA_PARAM_IRQ_NR            1
-
-/* 3.2: Query the actual card type.  The DDX only distinguishes between
- * G200 chips and non-G200 chips, which it calls G400.  It turns out that
- * there are some very sublte differences between the G4x0 chips and the G550
- * chips.  Using this parameter query, a client-side driver can detect the
- * difference between a G4x0 and a G550.
- */
-#define MGA_PARAM_CARD_TYPE         2
-
-typedef struct drm_mga_getparam {
-	int param;
-	void *value;
-} drm_mga_getparam_t;
-
-#endif
diff --git a/openflow/usr/include/drm/msm_drm.h b/openflow/usr/include/drm/msm_drm.h
deleted file mode 100644
index 3835169..0000000
--- a/openflow/usr/include/drm/msm_drm.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2013 Red Hat
- * Author: Rob Clark <robdclark@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __MSM_DRM_H__
-#define __MSM_DRM_H__
-
-#include <stddef.h>
-#include <drm/drm.h>
-
-/* Please note that modifications to all structs defined here are
- * subject to backwards-compatibility constraints:
- *  1) Do not use pointers, use __u64 instead for 32 bit / 64 bit
- *     user/kernel compatibility
- *  2) Keep fields aligned to their size
- *  3) Because of how drm_ioctl() works, we can add new fields at
- *     the end of an ioctl if some care is taken: drm_ioctl() will
- *     zero out the new fields at the tail of the ioctl, so a zero
- *     value should have a backwards compatible meaning.  And for
- *     output params, userspace won't see the newly added output
- *     fields.. so that has to be somehow ok.
- */
-
-#define MSM_PIPE_NONE        0x00
-#define MSM_PIPE_2D0         0x01
-#define MSM_PIPE_2D1         0x02
-#define MSM_PIPE_3D0         0x10
-
-/* timeouts are specified in clock-monotonic absolute times (to simplify
- * restarting interrupted ioctls).  The following struct is logically the
- * same as 'struct timespec' but 32/64b ABI safe.
- */
-struct drm_msm_timespec {
-	__s64 tv_sec;          /* seconds */
-	__s64 tv_nsec;         /* nanoseconds */
-};
-
-#define MSM_PARAM_GPU_ID     0x01
-#define MSM_PARAM_GMEM_SIZE  0x02
-#define MSM_PARAM_CHIP_ID    0x03
-
-struct drm_msm_param {
-	__u32 pipe;           /* in, MSM_PIPE_x */
-	__u32 param;          /* in, MSM_PARAM_x */
-	__u64 value;          /* out (get_param) or in (set_param) */
-};
-
-/*
- * GEM buffers:
- */
-
-#define MSM_BO_SCANOUT       0x00000001     /* scanout capable */
-#define MSM_BO_GPU_READONLY  0x00000002
-#define MSM_BO_CACHE_MASK    0x000f0000
-/* cache modes */
-#define MSM_BO_CACHED        0x00010000
-#define MSM_BO_WC            0x00020000
-#define MSM_BO_UNCACHED      0x00040000
-
-#define MSM_BO_FLAGS         (MSM_BO_SCANOUT | \
-                              MSM_BO_GPU_READONLY | \
-                              MSM_BO_CACHED | \
-                              MSM_BO_WC | \
-                              MSM_BO_UNCACHED)
-
-struct drm_msm_gem_new {
-	__u64 size;           /* in */
-	__u32 flags;          /* in, mask of MSM_BO_x */
-	__u32 handle;         /* out */
-};
-
-struct drm_msm_gem_info {
-	__u32 handle;         /* in */
-	__u32 pad;
-	__u64 offset;         /* out, offset to pass to mmap() */
-};
-
-#define MSM_PREP_READ        0x01
-#define MSM_PREP_WRITE       0x02
-#define MSM_PREP_NOSYNC      0x04
-
-#define MSM_PREP_FLAGS       (MSM_PREP_READ | MSM_PREP_WRITE | MSM_PREP_NOSYNC)
-
-struct drm_msm_gem_cpu_prep {
-	__u32 handle;         /* in */
-	__u32 op;             /* in, mask of MSM_PREP_x */
-	struct drm_msm_timespec timeout;   /* in */
-};
-
-struct drm_msm_gem_cpu_fini {
-	__u32 handle;         /* in */
-};
-
-/*
- * Cmdstream Submission:
- */
-
-/* The value written into the cmdstream is logically:
- *
- *   ((relocbuf->gpuaddr + reloc_offset) << shift) | or
- *
- * When we have GPU's w/ >32bit ptrs, it should be possible to deal
- * with this by emit'ing two reloc entries with appropriate shift
- * values.  Or a new MSM_SUBMIT_CMD_x type would also be an option.
- *
- * NOTE that reloc's must be sorted by order of increasing submit_offset,
- * otherwise EINVAL.
- */
-struct drm_msm_gem_submit_reloc {
-	__u32 submit_offset;  /* in, offset from submit_bo */
-	__u32 or;             /* in, value OR'd with result */
-	__s32  shift;          /* in, amount of left shift (can be negative) */
-	__u32 reloc_idx;      /* in, index of reloc_bo buffer */
-	__u64 reloc_offset;   /* in, offset from start of reloc_bo */
-};
-
-/* submit-types:
- *   BUF - this cmd buffer is executed normally.
- *   IB_TARGET_BUF - this cmd buffer is an IB target.  Reloc's are
- *      processed normally, but the kernel does not setup an IB to
- *      this buffer in the first-level ringbuffer
- *   CTX_RESTORE_BUF - only executed if there has been a GPU context
- *      switch since the last SUBMIT ioctl
- */
-#define MSM_SUBMIT_CMD_BUF             0x0001
-#define MSM_SUBMIT_CMD_IB_TARGET_BUF   0x0002
-#define MSM_SUBMIT_CMD_CTX_RESTORE_BUF 0x0003
-struct drm_msm_gem_submit_cmd {
-	__u32 type;           /* in, one of MSM_SUBMIT_CMD_x */
-	__u32 submit_idx;     /* in, index of submit_bo cmdstream buffer */
-	__u32 submit_offset;  /* in, offset into submit_bo */
-	__u32 size;           /* in, cmdstream size */
-	__u32 pad;
-	__u32 nr_relocs;      /* in, number of submit_reloc's */
-	__u64 relocs;  /* in, ptr to array of submit_reloc's */
-};
-
-/* Each buffer referenced elsewhere in the cmdstream submit (ie. the
- * cmdstream buffer(s) themselves or reloc entries) has one (and only
- * one) entry in the submit->bos[] table.
- *
- * As a optimization, the current buffer (gpu virtual address) can be
- * passed back through the 'presumed' field.  If on a subsequent reloc,
- * userspace passes back a 'presumed' address that is still valid,
- * then patching the cmdstream for this entry is skipped.  This can
- * avoid kernel needing to map/access the cmdstream bo in the common
- * case.
- */
-#define MSM_SUBMIT_BO_READ             0x0001
-#define MSM_SUBMIT_BO_WRITE            0x0002
-
-#define MSM_SUBMIT_BO_FLAGS            (MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE)
-
-struct drm_msm_gem_submit_bo {
-	__u32 flags;          /* in, mask of MSM_SUBMIT_BO_x */
-	__u32 handle;         /* in, GEM handle */
-	__u64 presumed;       /* in/out, presumed buffer address */
-};
-
-/* Each cmdstream submit consists of a table of buffers involved, and
- * one or more cmdstream buffers.  This allows for conditional execution
- * (context-restore), and IB buffers needed for per tile/bin draw cmds.
- */
-struct drm_msm_gem_submit {
-	__u32 pipe;           /* in, MSM_PIPE_x */
-	__u32 fence;          /* out */
-	__u32 nr_bos;         /* in, number of submit_bo's */
-	__u32 nr_cmds;        /* in, number of submit_cmd's */
-	__u64 bos;     /* in, ptr to array of submit_bo's */
-	__u64 cmds;    /* in, ptr to array of submit_cmd's */
-};
-
-/* The normal way to synchronize with the GPU is just to CPU_PREP on
- * a buffer if you need to access it from the CPU (other cmdstream
- * submission from same or other contexts, PAGE_FLIP ioctl, etc, all
- * handle the required synchronization under the hood).  This ioctl
- * mainly just exists as a way to implement the gallium pipe_fence
- * APIs without requiring a dummy bo to synchronize on.
- */
-struct drm_msm_wait_fence {
-	__u32 fence;          /* in */
-	__u32 pad;
-	struct drm_msm_timespec timeout;   /* in */
-};
-
-#define DRM_MSM_GET_PARAM              0x00
-/* placeholder:
-#define DRM_MSM_SET_PARAM              0x01
- */
-#define DRM_MSM_GEM_NEW                0x02
-#define DRM_MSM_GEM_INFO               0x03
-#define DRM_MSM_GEM_CPU_PREP           0x04
-#define DRM_MSM_GEM_CPU_FINI           0x05
-#define DRM_MSM_GEM_SUBMIT             0x06
-#define DRM_MSM_WAIT_FENCE             0x07
-#define DRM_MSM_NUM_IOCTLS             0x08
-
-#define DRM_IOCTL_MSM_GET_PARAM        DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GET_PARAM, struct drm_msm_param)
-#define DRM_IOCTL_MSM_GEM_NEW          DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_NEW, struct drm_msm_gem_new)
-#define DRM_IOCTL_MSM_GEM_INFO         DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_INFO, struct drm_msm_gem_info)
-#define DRM_IOCTL_MSM_GEM_CPU_PREP     DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_GEM_CPU_PREP, struct drm_msm_gem_cpu_prep)
-#define DRM_IOCTL_MSM_GEM_CPU_FINI     DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_GEM_CPU_FINI, struct drm_msm_gem_cpu_fini)
-#define DRM_IOCTL_MSM_GEM_SUBMIT       DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_SUBMIT, struct drm_msm_gem_submit)
-#define DRM_IOCTL_MSM_WAIT_FENCE       DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_WAIT_FENCE, struct drm_msm_wait_fence)
-
-#endif /* __MSM_DRM_H__ */
diff --git a/openflow/usr/include/drm/nouveau_drm.h b/openflow/usr/include/drm/nouveau_drm.h
deleted file mode 100644
index fd594cc..0000000
--- a/openflow/usr/include/drm/nouveau_drm.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2005 Stephane Marchesin.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __NOUVEAU_DRM_H__
-#define __NOUVEAU_DRM_H__
-
-#define DRM_NOUVEAU_EVENT_NVIF                                       0x80000000
-
-#define NOUVEAU_GEM_DOMAIN_CPU       (1 << 0)
-#define NOUVEAU_GEM_DOMAIN_VRAM      (1 << 1)
-#define NOUVEAU_GEM_DOMAIN_GART      (1 << 2)
-#define NOUVEAU_GEM_DOMAIN_MAPPABLE  (1 << 3)
-#define NOUVEAU_GEM_DOMAIN_COHERENT  (1 << 4)
-
-#define NOUVEAU_GEM_TILE_COMP        0x00030000 /* nv50-only */
-#define NOUVEAU_GEM_TILE_LAYOUT_MASK 0x0000ff00
-#define NOUVEAU_GEM_TILE_16BPP       0x00000001
-#define NOUVEAU_GEM_TILE_32BPP       0x00000002
-#define NOUVEAU_GEM_TILE_ZETA        0x00000004
-#define NOUVEAU_GEM_TILE_NONCONTIG   0x00000008
-
-struct drm_nouveau_gem_info {
-	uint32_t handle;
-	uint32_t domain;
-	uint64_t size;
-	uint64_t offset;
-	uint64_t map_handle;
-	uint32_t tile_mode;
-	uint32_t tile_flags;
-};
-
-struct drm_nouveau_gem_new {
-	struct drm_nouveau_gem_info info;
-	uint32_t channel_hint;
-	uint32_t align;
-};
-
-#define NOUVEAU_GEM_MAX_BUFFERS 1024
-struct drm_nouveau_gem_pushbuf_bo_presumed {
-	uint32_t valid;
-	uint32_t domain;
-	uint64_t offset;
-};
-
-struct drm_nouveau_gem_pushbuf_bo {
-	uint64_t user_priv;
-	uint32_t handle;
-	uint32_t read_domains;
-	uint32_t write_domains;
-	uint32_t valid_domains;
-	struct drm_nouveau_gem_pushbuf_bo_presumed presumed;
-};
-
-#define NOUVEAU_GEM_RELOC_LOW  (1 << 0)
-#define NOUVEAU_GEM_RELOC_HIGH (1 << 1)
-#define NOUVEAU_GEM_RELOC_OR   (1 << 2)
-#define NOUVEAU_GEM_MAX_RELOCS 1024
-struct drm_nouveau_gem_pushbuf_reloc {
-	uint32_t reloc_bo_index;
-	uint32_t reloc_bo_offset;
-	uint32_t bo_index;
-	uint32_t flags;
-	uint32_t data;
-	uint32_t vor;
-	uint32_t tor;
-};
-
-#define NOUVEAU_GEM_MAX_PUSH 512
-struct drm_nouveau_gem_pushbuf_push {
-	uint32_t bo_index;
-	uint32_t pad;
-	uint64_t offset;
-	uint64_t length;
-};
-
-struct drm_nouveau_gem_pushbuf {
-	uint32_t channel;
-	uint32_t nr_buffers;
-	uint64_t buffers;
-	uint32_t nr_relocs;
-	uint32_t nr_push;
-	uint64_t relocs;
-	uint64_t push;
-	uint32_t suffix0;
-	uint32_t suffix1;
-	uint64_t vram_available;
-	uint64_t gart_available;
-};
-
-#define NOUVEAU_GEM_CPU_PREP_NOWAIT                                  0x00000001
-#define NOUVEAU_GEM_CPU_PREP_WRITE                                   0x00000004
-struct drm_nouveau_gem_cpu_prep {
-	uint32_t handle;
-	uint32_t flags;
-};
-
-struct drm_nouveau_gem_cpu_fini {
-	uint32_t handle;
-};
-
-#define DRM_NOUVEAU_GETPARAM           0x00 /* deprecated */
-#define DRM_NOUVEAU_SETPARAM           0x01 /* deprecated */
-#define DRM_NOUVEAU_CHANNEL_ALLOC      0x02 /* deprecated */
-#define DRM_NOUVEAU_CHANNEL_FREE       0x03 /* deprecated */
-#define DRM_NOUVEAU_GROBJ_ALLOC        0x04 /* deprecated */
-#define DRM_NOUVEAU_NOTIFIEROBJ_ALLOC  0x05 /* deprecated */
-#define DRM_NOUVEAU_GPUOBJ_FREE        0x06 /* deprecated */
-#define DRM_NOUVEAU_NVIF               0x07
-#define DRM_NOUVEAU_GEM_NEW            0x40
-#define DRM_NOUVEAU_GEM_PUSHBUF        0x41
-#define DRM_NOUVEAU_GEM_CPU_PREP       0x42
-#define DRM_NOUVEAU_GEM_CPU_FINI       0x43
-#define DRM_NOUVEAU_GEM_INFO           0x44
-
-#define DRM_IOCTL_NOUVEAU_GEM_NEW            DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_GEM_NEW, struct drm_nouveau_gem_new)
-#define DRM_IOCTL_NOUVEAU_GEM_PUSHBUF        DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_GEM_PUSHBUF, struct drm_nouveau_gem_pushbuf)
-#define DRM_IOCTL_NOUVEAU_GEM_CPU_PREP       DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_GEM_CPU_PREP, struct drm_nouveau_gem_cpu_prep)
-#define DRM_IOCTL_NOUVEAU_GEM_CPU_FINI       DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_GEM_CPU_FINI, struct drm_nouveau_gem_cpu_fini)
-#define DRM_IOCTL_NOUVEAU_GEM_INFO           DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_GEM_INFO, struct drm_nouveau_gem_info)
-
-#endif /* __NOUVEAU_DRM_H__ */
diff --git a/openflow/usr/include/drm/qxl_drm.h b/openflow/usr/include/drm/qxl_drm.h
deleted file mode 100644
index 5d7de70..0000000
--- a/openflow/usr/include/drm/qxl_drm.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2013 Red Hat
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef QXL_DRM_H
-#define QXL_DRM_H
-
-#include <stddef.h>
-#include "drm/drm.h"
-
-/* Please note that modifications to all structs defined here are
- * subject to backwards-compatibility constraints.
- *
- * Do not use pointers, use uint64_t instead for 32 bit / 64 bit user/kernel
- * compatibility Keep fields aligned to their size
- */
-
-#define QXL_GEM_DOMAIN_CPU 0
-#define QXL_GEM_DOMAIN_VRAM 1
-#define QXL_GEM_DOMAIN_SURFACE 2
-
-#define DRM_QXL_ALLOC       0x00
-#define DRM_QXL_MAP         0x01
-#define DRM_QXL_EXECBUFFER  0x02
-#define DRM_QXL_UPDATE_AREA 0x03
-#define DRM_QXL_GETPARAM    0x04
-#define DRM_QXL_CLIENTCAP   0x05
-
-#define DRM_QXL_ALLOC_SURF  0x06
-
-struct drm_qxl_alloc {
-	uint32_t size;
-	uint32_t handle; /* 0 is an invalid handle */
-};
-
-struct drm_qxl_map {
-	uint64_t offset; /* use for mmap system call */
-	uint32_t handle;
-	uint32_t pad;
-};
-
-/*
- * dest is the bo we are writing the relocation into
- * src is bo we are relocating.
- * *(dest_handle.base_addr + dest_offset) = physical_address(src_handle.addr +
- * src_offset)
- */
-#define QXL_RELOC_TYPE_BO 1
-#define QXL_RELOC_TYPE_SURF 2
-
-struct drm_qxl_reloc {
-	uint64_t src_offset; /* offset into src_handle or src buffer */
-	uint64_t dst_offset; /* offset in dest handle */
-	uint32_t src_handle; /* dest handle to compute address from */
-	uint32_t dst_handle; /* 0 if to command buffer */
-	uint32_t reloc_type;
-	uint32_t pad;
-};
-
-struct drm_qxl_command {
-	uint64_t	 command; /* void* */
-	uint64_t	 relocs; /* struct drm_qxl_reloc* */
-	uint32_t		type;
-	uint32_t		command_size;
-	uint32_t		relocs_num;
-	uint32_t                pad;
-};
-
-/* XXX: call it drm_qxl_commands? */
-struct drm_qxl_execbuffer {
-	uint32_t		flags;		/* for future use */
-	uint32_t		commands_num;
-	uint64_t	 commands;	/* struct drm_qxl_command* */
-};
-
-struct drm_qxl_update_area {
-	uint32_t handle;
-	uint32_t top;
-	uint32_t left;
-	uint32_t bottom;
-	uint32_t right;
-	uint32_t pad;
-};
-
-#define QXL_PARAM_NUM_SURFACES 1 /* rom->n_surfaces */
-#define QXL_PARAM_MAX_RELOCS 2
-struct drm_qxl_getparam {
-	uint64_t param;
-	uint64_t value;
-};
-
-/* these are one bit values */
-struct drm_qxl_clientcap {
-	uint32_t index;
-	uint32_t pad;
-};
-
-struct drm_qxl_alloc_surf {
-	uint32_t format;
-	uint32_t width;
-	uint32_t height;
-	int32_t stride;
-	uint32_t handle;
-	uint32_t pad;
-};
-
-#define DRM_IOCTL_QXL_ALLOC \
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_QXL_ALLOC, struct drm_qxl_alloc)
-
-#define DRM_IOCTL_QXL_MAP \
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_QXL_MAP, struct drm_qxl_map)
-
-#define DRM_IOCTL_QXL_EXECBUFFER \
-	DRM_IOW(DRM_COMMAND_BASE + DRM_QXL_EXECBUFFER,\
-		struct drm_qxl_execbuffer)
-
-#define DRM_IOCTL_QXL_UPDATE_AREA \
-	DRM_IOW(DRM_COMMAND_BASE + DRM_QXL_UPDATE_AREA,\
-		struct drm_qxl_update_area)
-
-#define DRM_IOCTL_QXL_GETPARAM \
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_QXL_GETPARAM,\
-		struct drm_qxl_getparam)
-
-#define DRM_IOCTL_QXL_CLIENTCAP \
-	DRM_IOW(DRM_COMMAND_BASE + DRM_QXL_CLIENTCAP,\
-		struct drm_qxl_clientcap)
-
-#define DRM_IOCTL_QXL_ALLOC_SURF \
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_QXL_ALLOC_SURF,\
-		struct drm_qxl_alloc_surf)
-
-#endif
diff --git a/openflow/usr/include/drm/r128_drm.h b/openflow/usr/include/drm/r128_drm.h
deleted file mode 100644
index a68eacd..0000000
--- a/openflow/usr/include/drm/r128_drm.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
- * Created: Wed Apr  5 19:24:19 2000 by kevin@precisioninsight.com
- */
-/*
- * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Gareth Hughes <gareth@valinux.com>
- *    Kevin E. Martin <martin@valinux.com>
- */
-
-#ifndef __R128_DRM_H__
-#define __R128_DRM_H__
-
-#include <drm/drm.h>
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the X server file (r128_sarea.h)
- */
-#ifndef __R128_SAREA_DEFINES__
-#define __R128_SAREA_DEFINES__
-
-/* What needs to be changed for the current vertex buffer?
- */
-#define R128_UPLOAD_CONTEXT		0x001
-#define R128_UPLOAD_SETUP		0x002
-#define R128_UPLOAD_TEX0		0x004
-#define R128_UPLOAD_TEX1		0x008
-#define R128_UPLOAD_TEX0IMAGES		0x010
-#define R128_UPLOAD_TEX1IMAGES		0x020
-#define R128_UPLOAD_CORE		0x040
-#define R128_UPLOAD_MASKS		0x080
-#define R128_UPLOAD_WINDOW		0x100
-#define R128_UPLOAD_CLIPRECTS		0x200	/* handled client-side */
-#define R128_REQUIRE_QUIESCENCE		0x400
-#define R128_UPLOAD_ALL			0x7ff
-
-#define R128_FRONT			0x1
-#define R128_BACK			0x2
-#define R128_DEPTH			0x4
-
-/* Primitive types
- */
-#define R128_POINTS			0x1
-#define R128_LINES			0x2
-#define R128_LINE_STRIP			0x3
-#define R128_TRIANGLES			0x4
-#define R128_TRIANGLE_FAN		0x5
-#define R128_TRIANGLE_STRIP		0x6
-
-/* Vertex/indirect buffer size
- */
-#define R128_BUFFER_SIZE		16384
-
-/* Byte offsets for indirect buffer data
- */
-#define R128_INDEX_PRIM_OFFSET		20
-#define R128_HOSTDATA_BLIT_OFFSET	32
-
-/* Keep these small for testing.
- */
-#define R128_NR_SAREA_CLIPRECTS		12
-
-/* There are 2 heaps (local/AGP).  Each region within a heap is a
- *  minimum of 64k, and there are at most 64 of them per heap.
- */
-#define R128_LOCAL_TEX_HEAP		0
-#define R128_AGP_TEX_HEAP		1
-#define R128_NR_TEX_HEAPS		2
-#define R128_NR_TEX_REGIONS		64
-#define R128_LOG_TEX_GRANULARITY	16
-
-#define R128_NR_CONTEXT_REGS		12
-
-#define R128_MAX_TEXTURE_LEVELS		11
-#define R128_MAX_TEXTURE_UNITS		2
-
-#endif				/* __R128_SAREA_DEFINES__ */
-
-typedef struct {
-	/* Context state - can be written in one large chunk */
-	unsigned int dst_pitch_offset_c;
-	unsigned int dp_gui_master_cntl_c;
-	unsigned int sc_top_left_c;
-	unsigned int sc_bottom_right_c;
-	unsigned int z_offset_c;
-	unsigned int z_pitch_c;
-	unsigned int z_sten_cntl_c;
-	unsigned int tex_cntl_c;
-	unsigned int misc_3d_state_cntl_reg;
-	unsigned int texture_clr_cmp_clr_c;
-	unsigned int texture_clr_cmp_msk_c;
-	unsigned int fog_color_c;
-
-	/* Texture state */
-	unsigned int tex_size_pitch_c;
-	unsigned int constant_color_c;
-
-	/* Setup state */
-	unsigned int pm4_vc_fpu_setup;
-	unsigned int setup_cntl;
-
-	/* Mask state */
-	unsigned int dp_write_mask;
-	unsigned int sten_ref_mask_c;
-	unsigned int plane_3d_mask_c;
-
-	/* Window state */
-	unsigned int window_xy_offset;
-
-	/* Core state */
-	unsigned int scale_3d_cntl;
-} drm_r128_context_regs_t;
-
-/* Setup registers for each texture unit
- */
-typedef struct {
-	unsigned int tex_cntl;
-	unsigned int tex_combine_cntl;
-	unsigned int tex_size_pitch;
-	unsigned int tex_offset[R128_MAX_TEXTURE_LEVELS];
-	unsigned int tex_border_color;
-} drm_r128_texture_regs_t;
-
-typedef struct drm_r128_sarea {
-	/* The channel for communication of state information to the kernel
-	 * on firing a vertex buffer.
-	 */
-	drm_r128_context_regs_t context_state;
-	drm_r128_texture_regs_t tex_state[R128_MAX_TEXTURE_UNITS];
-	unsigned int dirty;
-	unsigned int vertsize;
-	unsigned int vc_format;
-
-	/* The current cliprects, or a subset thereof.
-	 */
-	struct drm_clip_rect boxes[R128_NR_SAREA_CLIPRECTS];
-	unsigned int nbox;
-
-	/* Counters for client-side throttling of rendering clients.
-	 */
-	unsigned int last_frame;
-	unsigned int last_dispatch;
-
-	struct drm_tex_region tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS + 1];
-	unsigned int tex_age[R128_NR_TEX_HEAPS];
-	int ctx_owner;
-	int pfAllowPageFlip;	/* number of 3d windows (0,1,2 or more) */
-	int pfCurrentPage;	/* which buffer is being displayed? */
-} drm_r128_sarea_t;
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the Xserver file (xf86drmR128.h)
- */
-
-/* Rage 128 specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_R128_INIT       0x00
-#define DRM_R128_CCE_START  0x01
-#define DRM_R128_CCE_STOP   0x02
-#define DRM_R128_CCE_RESET  0x03
-#define DRM_R128_CCE_IDLE   0x04
-/* 0x05 not used */
-#define DRM_R128_RESET      0x06
-#define DRM_R128_SWAP       0x07
-#define DRM_R128_CLEAR      0x08
-#define DRM_R128_VERTEX     0x09
-#define DRM_R128_INDICES    0x0a
-#define DRM_R128_BLIT       0x0b
-#define DRM_R128_DEPTH      0x0c
-#define DRM_R128_STIPPLE    0x0d
-/* 0x0e not used */
-#define DRM_R128_INDIRECT   0x0f
-#define DRM_R128_FULLSCREEN 0x10
-#define DRM_R128_CLEAR2     0x11
-#define DRM_R128_GETPARAM   0x12
-#define DRM_R128_FLIP       0x13
-
-#define DRM_IOCTL_R128_INIT       DRM_IOW( DRM_COMMAND_BASE + DRM_R128_INIT, drm_r128_init_t)
-#define DRM_IOCTL_R128_CCE_START  DRM_IO(  DRM_COMMAND_BASE + DRM_R128_CCE_START)
-#define DRM_IOCTL_R128_CCE_STOP   DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CCE_STOP, drm_r128_cce_stop_t)
-#define DRM_IOCTL_R128_CCE_RESET  DRM_IO(  DRM_COMMAND_BASE + DRM_R128_CCE_RESET)
-#define DRM_IOCTL_R128_CCE_IDLE   DRM_IO(  DRM_COMMAND_BASE + DRM_R128_CCE_IDLE)
-/* 0x05 not used */
-#define DRM_IOCTL_R128_RESET      DRM_IO(  DRM_COMMAND_BASE + DRM_R128_RESET)
-#define DRM_IOCTL_R128_SWAP       DRM_IO(  DRM_COMMAND_BASE + DRM_R128_SWAP)
-#define DRM_IOCTL_R128_CLEAR      DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CLEAR, drm_r128_clear_t)
-#define DRM_IOCTL_R128_VERTEX     DRM_IOW( DRM_COMMAND_BASE + DRM_R128_VERTEX, drm_r128_vertex_t)
-#define DRM_IOCTL_R128_INDICES    DRM_IOW( DRM_COMMAND_BASE + DRM_R128_INDICES, drm_r128_indices_t)
-#define DRM_IOCTL_R128_BLIT       DRM_IOW( DRM_COMMAND_BASE + DRM_R128_BLIT, drm_r128_blit_t)
-#define DRM_IOCTL_R128_DEPTH      DRM_IOW( DRM_COMMAND_BASE + DRM_R128_DEPTH, drm_r128_depth_t)
-#define DRM_IOCTL_R128_STIPPLE    DRM_IOW( DRM_COMMAND_BASE + DRM_R128_STIPPLE, drm_r128_stipple_t)
-/* 0x0e not used */
-#define DRM_IOCTL_R128_INDIRECT   DRM_IOWR(DRM_COMMAND_BASE + DRM_R128_INDIRECT, drm_r128_indirect_t)
-#define DRM_IOCTL_R128_FULLSCREEN DRM_IOW( DRM_COMMAND_BASE + DRM_R128_FULLSCREEN, drm_r128_fullscreen_t)
-#define DRM_IOCTL_R128_CLEAR2     DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CLEAR2, drm_r128_clear2_t)
-#define DRM_IOCTL_R128_GETPARAM   DRM_IOWR( DRM_COMMAND_BASE + DRM_R128_GETPARAM, drm_r128_getparam_t)
-#define DRM_IOCTL_R128_FLIP       DRM_IO(  DRM_COMMAND_BASE + DRM_R128_FLIP)
-
-typedef struct drm_r128_init {
-	enum {
-		R128_INIT_CCE = 0x01,
-		R128_CLEANUP_CCE = 0x02
-	} func;
-	unsigned long sarea_priv_offset;
-	int is_pci;
-	int cce_mode;
-	int cce_secure;
-	int ring_size;
-	int usec_timeout;
-
-	unsigned int fb_bpp;
-	unsigned int front_offset, front_pitch;
-	unsigned int back_offset, back_pitch;
-	unsigned int depth_bpp;
-	unsigned int depth_offset, depth_pitch;
-	unsigned int span_offset;
-
-	unsigned long fb_offset;
-	unsigned long mmio_offset;
-	unsigned long ring_offset;
-	unsigned long ring_rptr_offset;
-	unsigned long buffers_offset;
-	unsigned long agp_textures_offset;
-} drm_r128_init_t;
-
-typedef struct drm_r128_cce_stop {
-	int flush;
-	int idle;
-} drm_r128_cce_stop_t;
-
-typedef struct drm_r128_clear {
-	unsigned int flags;
-	unsigned int clear_color;
-	unsigned int clear_depth;
-	unsigned int color_mask;
-	unsigned int depth_mask;
-} drm_r128_clear_t;
-
-typedef struct drm_r128_vertex {
-	int prim;
-	int idx;		/* Index of vertex buffer */
-	int count;		/* Number of vertices in buffer */
-	int discard;		/* Client finished with buffer? */
-} drm_r128_vertex_t;
-
-typedef struct drm_r128_indices {
-	int prim;
-	int idx;
-	int start;
-	int end;
-	int discard;		/* Client finished with buffer? */
-} drm_r128_indices_t;
-
-typedef struct drm_r128_blit {
-	int idx;
-	int pitch;
-	int offset;
-	int format;
-	unsigned short x, y;
-	unsigned short width, height;
-} drm_r128_blit_t;
-
-typedef struct drm_r128_depth {
-	enum {
-		R128_WRITE_SPAN = 0x01,
-		R128_WRITE_PIXELS = 0x02,
-		R128_READ_SPAN = 0x03,
-		R128_READ_PIXELS = 0x04
-	} func;
-	int n;
-	int *x;
-	int *y;
-	unsigned int *buffer;
-	unsigned char *mask;
-} drm_r128_depth_t;
-
-typedef struct drm_r128_stipple {
-	unsigned int *mask;
-} drm_r128_stipple_t;
-
-typedef struct drm_r128_indirect {
-	int idx;
-	int start;
-	int end;
-	int discard;
-} drm_r128_indirect_t;
-
-typedef struct drm_r128_fullscreen {
-	enum {
-		R128_INIT_FULLSCREEN = 0x01,
-		R128_CLEANUP_FULLSCREEN = 0x02
-	} func;
-} drm_r128_fullscreen_t;
-
-/* 2.3: An ioctl to get parameters that aren't available to the 3d
- * client any other way.
- */
-#define R128_PARAM_IRQ_NR            1
-
-typedef struct drm_r128_getparam {
-	int param;
-	void *value;
-} drm_r128_getparam_t;
-
-#endif
diff --git a/openflow/usr/include/drm/radeon_drm.h b/openflow/usr/include/drm/radeon_drm.h
deleted file mode 100644
index 7244d5a..0000000
--- a/openflow/usr/include/drm/radeon_drm.h
+++ /dev/null
@@ -1,1070 +0,0 @@
-/* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*-
- *
- * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
- * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Kevin E. Martin <martin@valinux.com>
- *    Gareth Hughes <gareth@valinux.com>
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#ifndef __RADEON_DRM_H__
-#define __RADEON_DRM_H__
-
-#include "drm.h"
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the X server file (radeon_sarea.h)
- */
-#ifndef __RADEON_SAREA_DEFINES__
-#define __RADEON_SAREA_DEFINES__
-
-/* Old style state flags, required for sarea interface (1.1 and 1.2
- * clears) and 1.2 drm_vertex2 ioctl.
- */
-#define RADEON_UPLOAD_CONTEXT		0x00000001
-#define RADEON_UPLOAD_VERTFMT		0x00000002
-#define RADEON_UPLOAD_LINE		0x00000004
-#define RADEON_UPLOAD_BUMPMAP		0x00000008
-#define RADEON_UPLOAD_MASKS		0x00000010
-#define RADEON_UPLOAD_VIEWPORT		0x00000020
-#define RADEON_UPLOAD_SETUP		0x00000040
-#define RADEON_UPLOAD_TCL		0x00000080
-#define RADEON_UPLOAD_MISC		0x00000100
-#define RADEON_UPLOAD_TEX0		0x00000200
-#define RADEON_UPLOAD_TEX1		0x00000400
-#define RADEON_UPLOAD_TEX2		0x00000800
-#define RADEON_UPLOAD_TEX0IMAGES	0x00001000
-#define RADEON_UPLOAD_TEX1IMAGES	0x00002000
-#define RADEON_UPLOAD_TEX2IMAGES	0x00004000
-#define RADEON_UPLOAD_CLIPRECTS		0x00008000	/* handled client-side */
-#define RADEON_REQUIRE_QUIESCENCE	0x00010000
-#define RADEON_UPLOAD_ZBIAS		0x00020000	/* version 1.2 and newer */
-#define RADEON_UPLOAD_ALL		0x003effff
-#define RADEON_UPLOAD_CONTEXT_ALL       0x003e01ff
-
-/* New style per-packet identifiers for use in cmd_buffer ioctl with
- * the RADEON_EMIT_PACKET command.  Comments relate new packets to old
- * state bits and the packet size:
- */
-#define RADEON_EMIT_PP_MISC                         0	/* context/7 */
-#define RADEON_EMIT_PP_CNTL                         1	/* context/3 */
-#define RADEON_EMIT_RB3D_COLORPITCH                 2	/* context/1 */
-#define RADEON_EMIT_RE_LINE_PATTERN                 3	/* line/2 */
-#define RADEON_EMIT_SE_LINE_WIDTH                   4	/* line/1 */
-#define RADEON_EMIT_PP_LUM_MATRIX                   5	/* bumpmap/1 */
-#define RADEON_EMIT_PP_ROT_MATRIX_0                 6	/* bumpmap/2 */
-#define RADEON_EMIT_RB3D_STENCILREFMASK             7	/* masks/3 */
-#define RADEON_EMIT_SE_VPORT_XSCALE                 8	/* viewport/6 */
-#define RADEON_EMIT_SE_CNTL                         9	/* setup/2 */
-#define RADEON_EMIT_SE_CNTL_STATUS                  10	/* setup/1 */
-#define RADEON_EMIT_RE_MISC                         11	/* misc/1 */
-#define RADEON_EMIT_PP_TXFILTER_0                   12	/* tex0/6 */
-#define RADEON_EMIT_PP_BORDER_COLOR_0               13	/* tex0/1 */
-#define RADEON_EMIT_PP_TXFILTER_1                   14	/* tex1/6 */
-#define RADEON_EMIT_PP_BORDER_COLOR_1               15	/* tex1/1 */
-#define RADEON_EMIT_PP_TXFILTER_2                   16	/* tex2/6 */
-#define RADEON_EMIT_PP_BORDER_COLOR_2               17	/* tex2/1 */
-#define RADEON_EMIT_SE_ZBIAS_FACTOR                 18	/* zbias/2 */
-#define RADEON_EMIT_SE_TCL_OUTPUT_VTX_FMT           19	/* tcl/11 */
-#define RADEON_EMIT_SE_TCL_MATERIAL_EMMISSIVE_RED   20	/* material/17 */
-#define R200_EMIT_PP_TXCBLEND_0                     21	/* tex0/4 */
-#define R200_EMIT_PP_TXCBLEND_1                     22	/* tex1/4 */
-#define R200_EMIT_PP_TXCBLEND_2                     23	/* tex2/4 */
-#define R200_EMIT_PP_TXCBLEND_3                     24	/* tex3/4 */
-#define R200_EMIT_PP_TXCBLEND_4                     25	/* tex4/4 */
-#define R200_EMIT_PP_TXCBLEND_5                     26	/* tex5/4 */
-#define R200_EMIT_PP_TXCBLEND_6                     27	/* /4 */
-#define R200_EMIT_PP_TXCBLEND_7                     28	/* /4 */
-#define R200_EMIT_TCL_LIGHT_MODEL_CTL_0             29	/* tcl/7 */
-#define R200_EMIT_TFACTOR_0                         30	/* tf/7 */
-#define R200_EMIT_VTX_FMT_0                         31	/* vtx/5 */
-#define R200_EMIT_VAP_CTL                           32	/* vap/1 */
-#define R200_EMIT_MATRIX_SELECT_0                   33	/* msl/5 */
-#define R200_EMIT_TEX_PROC_CTL_2                    34	/* tcg/5 */
-#define R200_EMIT_TCL_UCP_VERT_BLEND_CTL            35	/* tcl/1 */
-#define R200_EMIT_PP_TXFILTER_0                     36	/* tex0/6 */
-#define R200_EMIT_PP_TXFILTER_1                     37	/* tex1/6 */
-#define R200_EMIT_PP_TXFILTER_2                     38	/* tex2/6 */
-#define R200_EMIT_PP_TXFILTER_3                     39	/* tex3/6 */
-#define R200_EMIT_PP_TXFILTER_4                     40	/* tex4/6 */
-#define R200_EMIT_PP_TXFILTER_5                     41	/* tex5/6 */
-#define R200_EMIT_PP_TXOFFSET_0                     42	/* tex0/1 */
-#define R200_EMIT_PP_TXOFFSET_1                     43	/* tex1/1 */
-#define R200_EMIT_PP_TXOFFSET_2                     44	/* tex2/1 */
-#define R200_EMIT_PP_TXOFFSET_3                     45	/* tex3/1 */
-#define R200_EMIT_PP_TXOFFSET_4                     46	/* tex4/1 */
-#define R200_EMIT_PP_TXOFFSET_5                     47	/* tex5/1 */
-#define R200_EMIT_VTE_CNTL                          48	/* vte/1 */
-#define R200_EMIT_OUTPUT_VTX_COMP_SEL               49	/* vtx/1 */
-#define R200_EMIT_PP_TAM_DEBUG3                     50	/* tam/1 */
-#define R200_EMIT_PP_CNTL_X                         51	/* cst/1 */
-#define R200_EMIT_RB3D_DEPTHXY_OFFSET               52	/* cst/1 */
-#define R200_EMIT_RE_AUX_SCISSOR_CNTL               53	/* cst/1 */
-#define R200_EMIT_RE_SCISSOR_TL_0                   54	/* cst/2 */
-#define R200_EMIT_RE_SCISSOR_TL_1                   55	/* cst/2 */
-#define R200_EMIT_RE_SCISSOR_TL_2                   56	/* cst/2 */
-#define R200_EMIT_SE_VAP_CNTL_STATUS                57	/* cst/1 */
-#define R200_EMIT_SE_VTX_STATE_CNTL                 58	/* cst/1 */
-#define R200_EMIT_RE_POINTSIZE                      59	/* cst/1 */
-#define R200_EMIT_TCL_INPUT_VTX_VECTOR_ADDR_0       60	/* cst/4 */
-#define R200_EMIT_PP_CUBIC_FACES_0                  61
-#define R200_EMIT_PP_CUBIC_OFFSETS_0                62
-#define R200_EMIT_PP_CUBIC_FACES_1                  63
-#define R200_EMIT_PP_CUBIC_OFFSETS_1                64
-#define R200_EMIT_PP_CUBIC_FACES_2                  65
-#define R200_EMIT_PP_CUBIC_OFFSETS_2                66
-#define R200_EMIT_PP_CUBIC_FACES_3                  67
-#define R200_EMIT_PP_CUBIC_OFFSETS_3                68
-#define R200_EMIT_PP_CUBIC_FACES_4                  69
-#define R200_EMIT_PP_CUBIC_OFFSETS_4                70
-#define R200_EMIT_PP_CUBIC_FACES_5                  71
-#define R200_EMIT_PP_CUBIC_OFFSETS_5                72
-#define RADEON_EMIT_PP_TEX_SIZE_0                   73
-#define RADEON_EMIT_PP_TEX_SIZE_1                   74
-#define RADEON_EMIT_PP_TEX_SIZE_2                   75
-#define R200_EMIT_RB3D_BLENDCOLOR                   76
-#define R200_EMIT_TCL_POINT_SPRITE_CNTL             77
-#define RADEON_EMIT_PP_CUBIC_FACES_0                78
-#define RADEON_EMIT_PP_CUBIC_OFFSETS_T0             79
-#define RADEON_EMIT_PP_CUBIC_FACES_1                80
-#define RADEON_EMIT_PP_CUBIC_OFFSETS_T1             81
-#define RADEON_EMIT_PP_CUBIC_FACES_2                82
-#define RADEON_EMIT_PP_CUBIC_OFFSETS_T2             83
-#define R200_EMIT_PP_TRI_PERF_CNTL                  84
-#define R200_EMIT_PP_AFS_0                          85
-#define R200_EMIT_PP_AFS_1                          86
-#define R200_EMIT_ATF_TFACTOR                       87
-#define R200_EMIT_PP_TXCTLALL_0                     88
-#define R200_EMIT_PP_TXCTLALL_1                     89
-#define R200_EMIT_PP_TXCTLALL_2                     90
-#define R200_EMIT_PP_TXCTLALL_3                     91
-#define R200_EMIT_PP_TXCTLALL_4                     92
-#define R200_EMIT_PP_TXCTLALL_5                     93
-#define R200_EMIT_VAP_PVS_CNTL                      94
-#define RADEON_MAX_STATE_PACKETS                    95
-
-/* Commands understood by cmd_buffer ioctl.  More can be added but
- * obviously these can't be removed or changed:
- */
-#define RADEON_CMD_PACKET      1	/* emit one of the register packets above */
-#define RADEON_CMD_SCALARS     2	/* emit scalar data */
-#define RADEON_CMD_VECTORS     3	/* emit vector data */
-#define RADEON_CMD_DMA_DISCARD 4	/* discard current dma buf */
-#define RADEON_CMD_PACKET3     5	/* emit hw packet */
-#define RADEON_CMD_PACKET3_CLIP 6	/* emit hw packet wrapped in cliprects */
-#define RADEON_CMD_SCALARS2     7	/* r200 stopgap */
-#define RADEON_CMD_WAIT         8	/* emit hw wait commands -- note:
-					 *  doesn't make the cpu wait, just
-					 *  the graphics hardware */
-#define RADEON_CMD_VECLINEAR	9       /* another r200 stopgap */
-
-typedef union {
-	int i;
-	struct {
-		unsigned char cmd_type, pad0, pad1, pad2;
-	} header;
-	struct {
-		unsigned char cmd_type, packet_id, pad0, pad1;
-	} packet;
-	struct {
-		unsigned char cmd_type, offset, stride, count;
-	} scalars;
-	struct {
-		unsigned char cmd_type, offset, stride, count;
-	} vectors;
-	struct {
-		unsigned char cmd_type, addr_lo, addr_hi, count;
-	} veclinear;
-	struct {
-		unsigned char cmd_type, buf_idx, pad0, pad1;
-	} dma;
-	struct {
-		unsigned char cmd_type, flags, pad0, pad1;
-	} wait;
-} drm_radeon_cmd_header_t;
-
-#define RADEON_WAIT_2D  0x1
-#define RADEON_WAIT_3D  0x2
-
-/* Allowed parameters for R300_CMD_PACKET3
- */
-#define R300_CMD_PACKET3_CLEAR		0
-#define R300_CMD_PACKET3_RAW		1
-
-/* Commands understood by cmd_buffer ioctl for R300.
- * The interface has not been stabilized, so some of these may be removed
- * and eventually reordered before stabilization.
- */
-#define R300_CMD_PACKET0		1
-#define R300_CMD_VPU			2	/* emit vertex program upload */
-#define R300_CMD_PACKET3		3	/* emit a packet3 */
-#define R300_CMD_END3D			4	/* emit sequence ending 3d rendering */
-#define R300_CMD_CP_DELAY		5
-#define R300_CMD_DMA_DISCARD		6
-#define R300_CMD_WAIT			7
-#	define R300_WAIT_2D		0x1
-#	define R300_WAIT_3D		0x2
-/* these two defines are DOING IT WRONG - however
- * we have userspace which relies on using these.
- * The wait interface is backwards compat new 
- * code should use the NEW_WAIT defines below
- * THESE ARE NOT BIT FIELDS
- */
-#	define R300_WAIT_2D_CLEAN	0x3
-#	define R300_WAIT_3D_CLEAN	0x4
-
-#	define R300_NEW_WAIT_2D_3D	0x3
-#	define R300_NEW_WAIT_2D_2D_CLEAN	0x4
-#	define R300_NEW_WAIT_3D_3D_CLEAN	0x6
-#	define R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN	0x8
-
-#define R300_CMD_SCRATCH		8
-#define R300_CMD_R500FP                 9
-
-typedef union {
-	unsigned int u;
-	struct {
-		unsigned char cmd_type, pad0, pad1, pad2;
-	} header;
-	struct {
-		unsigned char cmd_type, count, reglo, reghi;
-	} packet0;
-	struct {
-		unsigned char cmd_type, count, adrlo, adrhi;
-	} vpu;
-	struct {
-		unsigned char cmd_type, packet, pad0, pad1;
-	} packet3;
-	struct {
-		unsigned char cmd_type, packet;
-		unsigned short count;	/* amount of packet2 to emit */
-	} delay;
-	struct {
-		unsigned char cmd_type, buf_idx, pad0, pad1;
-	} dma;
-	struct {
-		unsigned char cmd_type, flags, pad0, pad1;
-	} wait;
-	struct {
-		unsigned char cmd_type, reg, n_bufs, flags;
-	} scratch;
-	struct {
-		unsigned char cmd_type, count, adrlo, adrhi_flags;
-	} r500fp;
-} drm_r300_cmd_header_t;
-
-#define RADEON_FRONT			0x1
-#define RADEON_BACK			0x2
-#define RADEON_DEPTH			0x4
-#define RADEON_STENCIL			0x8
-#define RADEON_CLEAR_FASTZ		0x80000000
-#define RADEON_USE_HIERZ		0x40000000
-#define RADEON_USE_COMP_ZBUF		0x20000000
-
-#define R500FP_CONSTANT_TYPE  (1 << 1)
-#define R500FP_CONSTANT_CLAMP (1 << 2)
-
-/* Primitive types
- */
-#define RADEON_POINTS			0x1
-#define RADEON_LINES			0x2
-#define RADEON_LINE_STRIP		0x3
-#define RADEON_TRIANGLES		0x4
-#define RADEON_TRIANGLE_FAN		0x5
-#define RADEON_TRIANGLE_STRIP		0x6
-
-/* Vertex/indirect buffer size
- */
-#define RADEON_BUFFER_SIZE		65536
-
-/* Byte offsets for indirect buffer data
- */
-#define RADEON_INDEX_PRIM_OFFSET	20
-
-#define RADEON_SCRATCH_REG_OFFSET	32
-
-#define R600_SCRATCH_REG_OFFSET         256
-
-#define RADEON_NR_SAREA_CLIPRECTS	12
-
-/* There are 2 heaps (local/GART).  Each region within a heap is a
- * minimum of 64k, and there are at most 64 of them per heap.
- */
-#define RADEON_LOCAL_TEX_HEAP		0
-#define RADEON_GART_TEX_HEAP		1
-#define RADEON_NR_TEX_HEAPS		2
-#define RADEON_NR_TEX_REGIONS		64
-#define RADEON_LOG_TEX_GRANULARITY	16
-
-#define RADEON_MAX_TEXTURE_LEVELS	12
-#define RADEON_MAX_TEXTURE_UNITS	3
-
-#define RADEON_MAX_SURFACES		8
-
-/* Blits have strict offset rules.  All blit offset must be aligned on
- * a 1K-byte boundary.
- */
-#define RADEON_OFFSET_SHIFT             10
-#define RADEON_OFFSET_ALIGN             (1 << RADEON_OFFSET_SHIFT)
-#define RADEON_OFFSET_MASK              (RADEON_OFFSET_ALIGN - 1)
-
-#endif				/* __RADEON_SAREA_DEFINES__ */
-
-typedef struct {
-	unsigned int red;
-	unsigned int green;
-	unsigned int blue;
-	unsigned int alpha;
-} radeon_color_regs_t;
-
-typedef struct {
-	/* Context state */
-	unsigned int pp_misc;	/* 0x1c14 */
-	unsigned int pp_fog_color;
-	unsigned int re_solid_color;
-	unsigned int rb3d_blendcntl;
-	unsigned int rb3d_depthoffset;
-	unsigned int rb3d_depthpitch;
-	unsigned int rb3d_zstencilcntl;
-
-	unsigned int pp_cntl;	/* 0x1c38 */
-	unsigned int rb3d_cntl;
-	unsigned int rb3d_coloroffset;
-	unsigned int re_width_height;
-	unsigned int rb3d_colorpitch;
-	unsigned int se_cntl;
-
-	/* Vertex format state */
-	unsigned int se_coord_fmt;	/* 0x1c50 */
-
-	/* Line state */
-	unsigned int re_line_pattern;	/* 0x1cd0 */
-	unsigned int re_line_state;
-
-	unsigned int se_line_width;	/* 0x1db8 */
-
-	/* Bumpmap state */
-	unsigned int pp_lum_matrix;	/* 0x1d00 */
-
-	unsigned int pp_rot_matrix_0;	/* 0x1d58 */
-	unsigned int pp_rot_matrix_1;
-
-	/* Mask state */
-	unsigned int rb3d_stencilrefmask;	/* 0x1d7c */
-	unsigned int rb3d_ropcntl;
-	unsigned int rb3d_planemask;
-
-	/* Viewport state */
-	unsigned int se_vport_xscale;	/* 0x1d98 */
-	unsigned int se_vport_xoffset;
-	unsigned int se_vport_yscale;
-	unsigned int se_vport_yoffset;
-	unsigned int se_vport_zscale;
-	unsigned int se_vport_zoffset;
-
-	/* Setup state */
-	unsigned int se_cntl_status;	/* 0x2140 */
-
-	/* Misc state */
-	unsigned int re_top_left;	/* 0x26c0 */
-	unsigned int re_misc;
-} drm_radeon_context_regs_t;
-
-typedef struct {
-	/* Zbias state */
-	unsigned int se_zbias_factor;	/* 0x1dac */
-	unsigned int se_zbias_constant;
-} drm_radeon_context2_regs_t;
-
-/* Setup registers for each texture unit
- */
-typedef struct {
-	unsigned int pp_txfilter;
-	unsigned int pp_txformat;
-	unsigned int pp_txoffset;
-	unsigned int pp_txcblend;
-	unsigned int pp_txablend;
-	unsigned int pp_tfactor;
-	unsigned int pp_border_color;
-} drm_radeon_texture_regs_t;
-
-typedef struct {
-	unsigned int start;
-	unsigned int finish;
-	unsigned int prim:8;
-	unsigned int stateidx:8;
-	unsigned int numverts:16;	/* overloaded as offset/64 for elt prims */
-	unsigned int vc_format;	/* vertex format */
-} drm_radeon_prim_t;
-
-typedef struct {
-	drm_radeon_context_regs_t context;
-	drm_radeon_texture_regs_t tex[RADEON_MAX_TEXTURE_UNITS];
-	drm_radeon_context2_regs_t context2;
-	unsigned int dirty;
-} drm_radeon_state_t;
-
-typedef struct {
-	/* The channel for communication of state information to the
-	 * kernel on firing a vertex buffer with either of the
-	 * obsoleted vertex/index ioctls.
-	 */
-	drm_radeon_context_regs_t context_state;
-	drm_radeon_texture_regs_t tex_state[RADEON_MAX_TEXTURE_UNITS];
-	unsigned int dirty;
-	unsigned int vertsize;
-	unsigned int vc_format;
-
-	/* The current cliprects, or a subset thereof.
-	 */
-	struct drm_clip_rect boxes[RADEON_NR_SAREA_CLIPRECTS];
-	unsigned int nbox;
-
-	/* Counters for client-side throttling of rendering clients.
-	 */
-	unsigned int last_frame;
-	unsigned int last_dispatch;
-	unsigned int last_clear;
-
-	struct drm_tex_region tex_list[RADEON_NR_TEX_HEAPS][RADEON_NR_TEX_REGIONS +
-						       1];
-	unsigned int tex_age[RADEON_NR_TEX_HEAPS];
-	int ctx_owner;
-	int pfState;		/* number of 3d windows (0,1,2ormore) */
-	int pfCurrentPage;	/* which buffer is being displayed? */
-	int crtc2_base;		/* CRTC2 frame offset */
-	int tiling_enabled;	/* set by drm, read by 2d + 3d clients */
-} drm_radeon_sarea_t;
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the Xserver file (xf86drmRadeon.h)
- *
- * KW: actually it's illegal to change any of this (backwards compatibility).
- */
-
-/* Radeon specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_RADEON_CP_INIT    0x00
-#define DRM_RADEON_CP_START   0x01
-#define DRM_RADEON_CP_STOP    0x02
-#define DRM_RADEON_CP_RESET   0x03
-#define DRM_RADEON_CP_IDLE    0x04
-#define DRM_RADEON_RESET      0x05
-#define DRM_RADEON_FULLSCREEN 0x06
-#define DRM_RADEON_SWAP       0x07
-#define DRM_RADEON_CLEAR      0x08
-#define DRM_RADEON_VERTEX     0x09
-#define DRM_RADEON_INDICES    0x0A
-#define DRM_RADEON_NOT_USED
-#define DRM_RADEON_STIPPLE    0x0C
-#define DRM_RADEON_INDIRECT   0x0D
-#define DRM_RADEON_TEXTURE    0x0E
-#define DRM_RADEON_VERTEX2    0x0F
-#define DRM_RADEON_CMDBUF     0x10
-#define DRM_RADEON_GETPARAM   0x11
-#define DRM_RADEON_FLIP       0x12
-#define DRM_RADEON_ALLOC      0x13
-#define DRM_RADEON_FREE       0x14
-#define DRM_RADEON_INIT_HEAP  0x15
-#define DRM_RADEON_IRQ_EMIT   0x16
-#define DRM_RADEON_IRQ_WAIT   0x17
-#define DRM_RADEON_CP_RESUME  0x18
-#define DRM_RADEON_SETPARAM   0x19
-#define DRM_RADEON_SURF_ALLOC 0x1a
-#define DRM_RADEON_SURF_FREE  0x1b
-/* KMS ioctl */
-#define DRM_RADEON_GEM_INFO		0x1c
-#define DRM_RADEON_GEM_CREATE		0x1d
-#define DRM_RADEON_GEM_MMAP		0x1e
-#define DRM_RADEON_GEM_PREAD		0x21
-#define DRM_RADEON_GEM_PWRITE		0x22
-#define DRM_RADEON_GEM_SET_DOMAIN	0x23
-#define DRM_RADEON_GEM_WAIT_IDLE	0x24
-#define DRM_RADEON_CS			0x26
-#define DRM_RADEON_INFO			0x27
-#define DRM_RADEON_GEM_SET_TILING	0x28
-#define DRM_RADEON_GEM_GET_TILING	0x29
-#define DRM_RADEON_GEM_BUSY		0x2a
-#define DRM_RADEON_GEM_VA		0x2b
-#define DRM_RADEON_GEM_OP		0x2c
-#define DRM_RADEON_GEM_USERPTR		0x2d
-
-#define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
-#define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
-#define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
-#define DRM_IOCTL_RADEON_CP_RESET   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_RESET)
-#define DRM_IOCTL_RADEON_CP_IDLE    DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_IDLE)
-#define DRM_IOCTL_RADEON_RESET      DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_RESET)
-#define DRM_IOCTL_RADEON_FULLSCREEN DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_FULLSCREEN, drm_radeon_fullscreen_t)
-#define DRM_IOCTL_RADEON_SWAP       DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_SWAP)
-#define DRM_IOCTL_RADEON_CLEAR      DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CLEAR, drm_radeon_clear_t)
-#define DRM_IOCTL_RADEON_VERTEX     DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_VERTEX, drm_radeon_vertex_t)
-#define DRM_IOCTL_RADEON_INDICES    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_INDICES, drm_radeon_indices_t)
-#define DRM_IOCTL_RADEON_STIPPLE    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_STIPPLE, drm_radeon_stipple_t)
-#define DRM_IOCTL_RADEON_INDIRECT   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_INDIRECT, drm_radeon_indirect_t)
-#define DRM_IOCTL_RADEON_TEXTURE    DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_TEXTURE, drm_radeon_texture_t)
-#define DRM_IOCTL_RADEON_VERTEX2    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_VERTEX2, drm_radeon_vertex2_t)
-#define DRM_IOCTL_RADEON_CMDBUF     DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CMDBUF, drm_radeon_cmd_buffer_t)
-#define DRM_IOCTL_RADEON_GETPARAM   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GETPARAM, drm_radeon_getparam_t)
-#define DRM_IOCTL_RADEON_FLIP       DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_FLIP)
-#define DRM_IOCTL_RADEON_ALLOC      DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_ALLOC, drm_radeon_mem_alloc_t)
-#define DRM_IOCTL_RADEON_FREE       DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_FREE, drm_radeon_mem_free_t)
-#define DRM_IOCTL_RADEON_INIT_HEAP  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_INIT_HEAP, drm_radeon_mem_init_heap_t)
-#define DRM_IOCTL_RADEON_IRQ_EMIT   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_IRQ_EMIT, drm_radeon_irq_emit_t)
-#define DRM_IOCTL_RADEON_IRQ_WAIT   DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_IRQ_WAIT, drm_radeon_irq_wait_t)
-#define DRM_IOCTL_RADEON_CP_RESUME  DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_RESUME)
-#define DRM_IOCTL_RADEON_SETPARAM   DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SETPARAM, drm_radeon_setparam_t)
-#define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
-#define DRM_IOCTL_RADEON_SURF_FREE  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
-/* KMS */
-#define DRM_IOCTL_RADEON_GEM_INFO	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_INFO, struct drm_radeon_gem_info)
-#define DRM_IOCTL_RADEON_GEM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_CREATE, struct drm_radeon_gem_create)
-#define DRM_IOCTL_RADEON_GEM_MMAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_MMAP, struct drm_radeon_gem_mmap)
-#define DRM_IOCTL_RADEON_GEM_PREAD	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PREAD, struct drm_radeon_gem_pread)
-#define DRM_IOCTL_RADEON_GEM_PWRITE	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
-#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
-#define DRM_IOCTL_RADEON_GEM_WAIT_IDLE	DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_IDLE, struct drm_radeon_gem_wait_idle)
-#define DRM_IOCTL_RADEON_CS		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
-#define DRM_IOCTL_RADEON_INFO		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_INFO, struct drm_radeon_info)
-#define DRM_IOCTL_RADEON_GEM_SET_TILING	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_TILING, struct drm_radeon_gem_set_tiling)
-#define DRM_IOCTL_RADEON_GEM_GET_TILING	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_GET_TILING, struct drm_radeon_gem_get_tiling)
-#define DRM_IOCTL_RADEON_GEM_BUSY	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_BUSY, struct drm_radeon_gem_busy)
-#define DRM_IOCTL_RADEON_GEM_VA		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_VA, struct drm_radeon_gem_va)
-#define DRM_IOCTL_RADEON_GEM_OP		DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_OP, struct drm_radeon_gem_op)
-#define DRM_IOCTL_RADEON_GEM_USERPTR	DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_USERPTR, struct drm_radeon_gem_userptr)
-
-typedef struct drm_radeon_init {
-	enum {
-		RADEON_INIT_CP = 0x01,
-		RADEON_CLEANUP_CP = 0x02,
-		RADEON_INIT_R200_CP = 0x03,
-		RADEON_INIT_R300_CP = 0x04,
-		RADEON_INIT_R600_CP = 0x05
-	} func;
-	unsigned long sarea_priv_offset;
-	int is_pci;
-	int cp_mode;
-	int gart_size;
-	int ring_size;
-	int usec_timeout;
-
-	unsigned int fb_bpp;
-	unsigned int front_offset, front_pitch;
-	unsigned int back_offset, back_pitch;
-	unsigned int depth_bpp;
-	unsigned int depth_offset, depth_pitch;
-
-	unsigned long fb_offset;
-	unsigned long mmio_offset;
-	unsigned long ring_offset;
-	unsigned long ring_rptr_offset;
-	unsigned long buffers_offset;
-	unsigned long gart_textures_offset;
-} drm_radeon_init_t;
-
-typedef struct drm_radeon_cp_stop {
-	int flush;
-	int idle;
-} drm_radeon_cp_stop_t;
-
-typedef struct drm_radeon_fullscreen {
-	enum {
-		RADEON_INIT_FULLSCREEN = 0x01,
-		RADEON_CLEANUP_FULLSCREEN = 0x02
-	} func;
-} drm_radeon_fullscreen_t;
-
-#define CLEAR_X1	0
-#define CLEAR_Y1	1
-#define CLEAR_X2	2
-#define CLEAR_Y2	3
-#define CLEAR_DEPTH	4
-
-typedef union drm_radeon_clear_rect {
-	float f[5];
-	unsigned int ui[5];
-} drm_radeon_clear_rect_t;
-
-typedef struct drm_radeon_clear {
-	unsigned int flags;
-	unsigned int clear_color;
-	unsigned int clear_depth;
-	unsigned int color_mask;
-	unsigned int depth_mask;	/* misnamed field:  should be stencil */
-	drm_radeon_clear_rect_t *depth_boxes;
-} drm_radeon_clear_t;
-
-typedef struct drm_radeon_vertex {
-	int prim;
-	int idx;		/* Index of vertex buffer */
-	int count;		/* Number of vertices in buffer */
-	int discard;		/* Client finished with buffer? */
-} drm_radeon_vertex_t;
-
-typedef struct drm_radeon_indices {
-	int prim;
-	int idx;
-	int start;
-	int end;
-	int discard;		/* Client finished with buffer? */
-} drm_radeon_indices_t;
-
-/* v1.2 - obsoletes drm_radeon_vertex and drm_radeon_indices
- *      - allows multiple primitives and state changes in a single ioctl
- *      - supports driver change to emit native primitives
- */
-typedef struct drm_radeon_vertex2 {
-	int idx;		/* Index of vertex buffer */
-	int discard;		/* Client finished with buffer? */
-	int nr_states;
-	drm_radeon_state_t *state;
-	int nr_prims;
-	drm_radeon_prim_t *prim;
-} drm_radeon_vertex2_t;
-
-/* v1.3 - obsoletes drm_radeon_vertex2
- *      - allows arbitrarily large cliprect list
- *      - allows updating of tcl packet, vector and scalar state
- *      - allows memory-efficient description of state updates
- *      - allows state to be emitted without a primitive
- *           (for clears, ctx switches)
- *      - allows more than one dma buffer to be referenced per ioctl
- *      - supports tcl driver
- *      - may be extended in future versions with new cmd types, packets
- */
-typedef struct drm_radeon_cmd_buffer {
-	int bufsz;
-	char *buf;
-	int nbox;
-	struct drm_clip_rect *boxes;
-} drm_radeon_cmd_buffer_t;
-
-typedef struct drm_radeon_tex_image {
-	unsigned int x, y;	/* Blit coordinates */
-	unsigned int width, height;
-	const void *data;
-} drm_radeon_tex_image_t;
-
-typedef struct drm_radeon_texture {
-	unsigned int offset;
-	int pitch;
-	int format;
-	int width;		/* Texture image coordinates */
-	int height;
-	drm_radeon_tex_image_t *image;
-} drm_radeon_texture_t;
-
-typedef struct drm_radeon_stipple {
-	unsigned int *mask;
-} drm_radeon_stipple_t;
-
-typedef struct drm_radeon_indirect {
-	int idx;
-	int start;
-	int end;
-	int discard;
-} drm_radeon_indirect_t;
-
-/* enum for card type parameters */
-#define RADEON_CARD_PCI 0
-#define RADEON_CARD_AGP 1
-#define RADEON_CARD_PCIE 2
-
-/* 1.3: An ioctl to get parameters that aren't available to the 3d
- * client any other way.
- */
-#define RADEON_PARAM_GART_BUFFER_OFFSET    1	/* card offset of 1st GART buffer */
-#define RADEON_PARAM_LAST_FRAME            2
-#define RADEON_PARAM_LAST_DISPATCH         3
-#define RADEON_PARAM_LAST_CLEAR            4
-/* Added with DRM version 1.6. */
-#define RADEON_PARAM_IRQ_NR                5
-#define RADEON_PARAM_GART_BASE             6	/* card offset of GART base */
-/* Added with DRM version 1.8. */
-#define RADEON_PARAM_REGISTER_HANDLE       7	/* for drmMap() */
-#define RADEON_PARAM_STATUS_HANDLE         8
-#define RADEON_PARAM_SAREA_HANDLE          9
-#define RADEON_PARAM_GART_TEX_HANDLE       10
-#define RADEON_PARAM_SCRATCH_OFFSET        11
-#define RADEON_PARAM_CARD_TYPE             12
-#define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
-#define RADEON_PARAM_FB_LOCATION           14   /* FB location */
-#define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
-#define RADEON_PARAM_DEVICE_ID             16
-#define RADEON_PARAM_NUM_Z_PIPES           17   /* num Z pipes */
-
-typedef struct drm_radeon_getparam {
-	int param;
-	void *value;
-} drm_radeon_getparam_t;
-
-/* 1.6: Set up a memory manager for regions of shared memory:
- */
-#define RADEON_MEM_REGION_GART 1
-#define RADEON_MEM_REGION_FB   2
-
-typedef struct drm_radeon_mem_alloc {
-	int region;
-	int alignment;
-	int size;
-	int *region_offset;	/* offset from start of fb or GART */
-} drm_radeon_mem_alloc_t;
-
-typedef struct drm_radeon_mem_free {
-	int region;
-	int region_offset;
-} drm_radeon_mem_free_t;
-
-typedef struct drm_radeon_mem_init_heap {
-	int region;
-	int size;
-	int start;
-} drm_radeon_mem_init_heap_t;
-
-/* 1.6: Userspace can request & wait on irq's:
- */
-typedef struct drm_radeon_irq_emit {
-	int *irq_seq;
-} drm_radeon_irq_emit_t;
-
-typedef struct drm_radeon_irq_wait {
-	int irq_seq;
-} drm_radeon_irq_wait_t;
-
-/* 1.10: Clients tell the DRM where they think the framebuffer is located in
- * the card's address space, via a new generic ioctl to set parameters
- */
-
-typedef struct drm_radeon_setparam {
-	unsigned int param;
-	__s64 value;
-} drm_radeon_setparam_t;
-
-#define RADEON_SETPARAM_FB_LOCATION    1	/* determined framebuffer location */
-#define RADEON_SETPARAM_SWITCH_TILING  2	/* enable/disable color tiling */
-#define RADEON_SETPARAM_PCIGART_LOCATION 3	/* PCI Gart Location */
-#define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
-#define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
-#define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
-/* 1.14: Clients can allocate/free a surface
- */
-typedef struct drm_radeon_surface_alloc {
-	unsigned int address;
-	unsigned int size;
-	unsigned int flags;
-} drm_radeon_surface_alloc_t;
-
-typedef struct drm_radeon_surface_free {
-	unsigned int address;
-} drm_radeon_surface_free_t;
-
-#define	DRM_RADEON_VBLANK_CRTC1		1
-#define	DRM_RADEON_VBLANK_CRTC2		2
-
-/*
- * Kernel modesetting world below.
- */
-#define RADEON_GEM_DOMAIN_CPU		0x1
-#define RADEON_GEM_DOMAIN_GTT		0x2
-#define RADEON_GEM_DOMAIN_VRAM		0x4
-
-struct drm_radeon_gem_info {
-	uint64_t	gart_size;
-	uint64_t	vram_size;
-	uint64_t	vram_visible;
-};
-
-#define RADEON_GEM_NO_BACKING_STORE	(1 << 0)
-#define RADEON_GEM_GTT_UC		(1 << 1)
-#define RADEON_GEM_GTT_WC		(1 << 2)
-/* BO is expected to be accessed by the CPU */
-#define RADEON_GEM_CPU_ACCESS		(1 << 3)
-/* CPU access is not expected to work for this BO */
-#define RADEON_GEM_NO_CPU_ACCESS	(1 << 4)
-
-struct drm_radeon_gem_create {
-	uint64_t	size;
-	uint64_t	alignment;
-	uint32_t	handle;
-	uint32_t	initial_domain;
-	uint32_t	flags;
-};
-
-/*
- * This is not a reliable API and you should expect it to fail for any
- * number of reasons and have fallback path that do not use userptr to
- * perform any operation.
- */
-#define RADEON_GEM_USERPTR_READONLY	(1 << 0)
-#define RADEON_GEM_USERPTR_ANONONLY	(1 << 1)
-#define RADEON_GEM_USERPTR_VALIDATE	(1 << 2)
-#define RADEON_GEM_USERPTR_REGISTER	(1 << 3)
-
-struct drm_radeon_gem_userptr {
-	uint64_t		addr;
-	uint64_t		size;
-	uint32_t		flags;
-	uint32_t		handle;
-};
-
-#define RADEON_TILING_MACRO				0x1
-#define RADEON_TILING_MICRO				0x2
-#define RADEON_TILING_SWAP_16BIT			0x4
-#define RADEON_TILING_SWAP_32BIT			0x8
-/* this object requires a surface when mapped - i.e. front buffer */
-#define RADEON_TILING_SURFACE				0x10
-#define RADEON_TILING_MICRO_SQUARE			0x20
-#define RADEON_TILING_EG_BANKW_SHIFT			8
-#define RADEON_TILING_EG_BANKW_MASK			0xf
-#define RADEON_TILING_EG_BANKH_SHIFT			12
-#define RADEON_TILING_EG_BANKH_MASK			0xf
-#define RADEON_TILING_EG_MACRO_TILE_ASPECT_SHIFT	16
-#define RADEON_TILING_EG_MACRO_TILE_ASPECT_MASK		0xf
-#define RADEON_TILING_EG_TILE_SPLIT_SHIFT		24
-#define RADEON_TILING_EG_TILE_SPLIT_MASK		0xf
-#define RADEON_TILING_EG_STENCIL_TILE_SPLIT_SHIFT	28
-#define RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK	0xf
-
-struct drm_radeon_gem_set_tiling {
-	uint32_t	handle;
-	uint32_t	tiling_flags;
-	uint32_t	pitch;
-};
-
-struct drm_radeon_gem_get_tiling {
-	uint32_t	handle;
-	uint32_t	tiling_flags;
-	uint32_t	pitch;
-};
-
-struct drm_radeon_gem_mmap {
-	uint32_t	handle;
-	uint32_t	pad;
-	uint64_t	offset;
-	uint64_t	size;
-	uint64_t	addr_ptr;
-};
-
-struct drm_radeon_gem_set_domain {
-	uint32_t	handle;
-	uint32_t	read_domains;
-	uint32_t	write_domain;
-};
-
-struct drm_radeon_gem_wait_idle {
-	uint32_t	handle;
-	uint32_t	pad;
-};
-
-struct drm_radeon_gem_busy {
-	uint32_t	handle;
-	uint32_t        domain;
-};
-
-struct drm_radeon_gem_pread {
-	/** Handle for the object being read. */
-	uint32_t handle;
-	uint32_t pad;
-	/** Offset into the object to read from */
-	uint64_t offset;
-	/** Length of data to read */
-	uint64_t size;
-	/** Pointer to write the data into. */
-	/* void *, but pointers are not 32/64 compatible */
-	uint64_t data_ptr;
-};
-
-struct drm_radeon_gem_pwrite {
-	/** Handle for the object being written to. */
-	uint32_t handle;
-	uint32_t pad;
-	/** Offset into the object to write to */
-	uint64_t offset;
-	/** Length of data to write */
-	uint64_t size;
-	/** Pointer to read the data from. */
-	/* void *, but pointers are not 32/64 compatible */
-	uint64_t data_ptr;
-};
-
-/* Sets or returns a value associated with a buffer. */
-struct drm_radeon_gem_op {
-	uint32_t	handle; /* buffer */
-	uint32_t	op;     /* RADEON_GEM_OP_* */
-	uint64_t	value;  /* input or return value */
-};
-
-#define RADEON_GEM_OP_GET_INITIAL_DOMAIN	0
-#define RADEON_GEM_OP_SET_INITIAL_DOMAIN	1
-
-#define RADEON_VA_MAP			1
-#define RADEON_VA_UNMAP			2
-
-#define RADEON_VA_RESULT_OK		0
-#define RADEON_VA_RESULT_ERROR		1
-#define RADEON_VA_RESULT_VA_EXIST	2
-
-#define RADEON_VM_PAGE_VALID		(1 << 0)
-#define RADEON_VM_PAGE_READABLE		(1 << 1)
-#define RADEON_VM_PAGE_WRITEABLE	(1 << 2)
-#define RADEON_VM_PAGE_SYSTEM		(1 << 3)
-#define RADEON_VM_PAGE_SNOOPED		(1 << 4)
-
-struct drm_radeon_gem_va {
-	uint32_t		handle;
-	uint32_t		operation;
-	uint32_t		vm_id;
-	uint32_t		flags;
-	uint64_t		offset;
-};
-
-#define RADEON_CHUNK_ID_RELOCS	0x01
-#define RADEON_CHUNK_ID_IB	0x02
-#define RADEON_CHUNK_ID_FLAGS	0x03
-#define RADEON_CHUNK_ID_CONST_IB	0x04
-
-/* The first dword of RADEON_CHUNK_ID_FLAGS is a uint32 of these flags: */
-#define RADEON_CS_KEEP_TILING_FLAGS 0x01
-#define RADEON_CS_USE_VM            0x02
-#define RADEON_CS_END_OF_FRAME      0x04 /* a hint from userspace which CS is the last one */
-/* The second dword of RADEON_CHUNK_ID_FLAGS is a uint32 that sets the ring type */
-#define RADEON_CS_RING_GFX          0
-#define RADEON_CS_RING_COMPUTE      1
-#define RADEON_CS_RING_DMA          2
-#define RADEON_CS_RING_UVD          3
-#define RADEON_CS_RING_VCE          4
-/* The third dword of RADEON_CHUNK_ID_FLAGS is a sint32 that sets the priority */
-/* 0 = normal, + = higher priority, - = lower priority */
-
-struct drm_radeon_cs_chunk {
-	uint32_t		chunk_id;
-	uint32_t		length_dw;
-	uint64_t		chunk_data;
-};
-
-/* drm_radeon_cs_reloc.flags */
-#define RADEON_RELOC_PRIO_MASK		(0xf << 0)
-
-struct drm_radeon_cs_reloc {
-	uint32_t		handle;
-	uint32_t		read_domains;
-	uint32_t		write_domain;
-	uint32_t		flags;
-};
-
-struct drm_radeon_cs {
-	uint32_t		num_chunks;
-	uint32_t		cs_id;
-	/* this points to uint64_t * which point to cs chunks */
-	uint64_t		chunks;
-	/* updates to the limits after this CS ioctl */
-	uint64_t		gart_limit;
-	uint64_t		vram_limit;
-};
-
-#define RADEON_INFO_DEVICE_ID		0x00
-#define RADEON_INFO_NUM_GB_PIPES	0x01
-#define RADEON_INFO_NUM_Z_PIPES 	0x02
-#define RADEON_INFO_ACCEL_WORKING	0x03
-#define RADEON_INFO_CRTC_FROM_ID	0x04
-#define RADEON_INFO_ACCEL_WORKING2	0x05
-#define RADEON_INFO_TILING_CONFIG	0x06
-#define RADEON_INFO_WANT_HYPERZ		0x07
-#define RADEON_INFO_WANT_CMASK		0x08 /* get access to CMASK on r300 */
-#define RADEON_INFO_CLOCK_CRYSTAL_FREQ	0x09 /* clock crystal frequency */
-#define RADEON_INFO_NUM_BACKENDS	0x0a /* DB/backends for r600+ - need for OQ */
-#define RADEON_INFO_NUM_TILE_PIPES	0x0b /* tile pipes for r600+ */
-#define RADEON_INFO_FUSION_GART_WORKING	0x0c /* fusion writes to GTT were broken before this */
-#define RADEON_INFO_BACKEND_MAP		0x0d /* pipe to backend map, needed by mesa */
-/* virtual address start, va < start are reserved by the kernel */
-#define RADEON_INFO_VA_START		0x0e
-/* maximum size of ib using the virtual memory cs */
-#define RADEON_INFO_IB_VM_MAX_SIZE	0x0f
-/* max pipes - needed for compute shaders */
-#define RADEON_INFO_MAX_PIPES		0x10
-/* timestamp for GL_ARB_timer_query (OpenGL), returns the current GPU clock */
-#define RADEON_INFO_TIMESTAMP		0x11
-/* max shader engines (SE) - needed for geometry shaders, etc. */
-#define RADEON_INFO_MAX_SE		0x12
-/* max SH per SE */
-#define RADEON_INFO_MAX_SH_PER_SE	0x13
-/* fast fb access is enabled */
-#define RADEON_INFO_FASTFB_WORKING	0x14
-/* query if a RADEON_CS_RING_* submission is supported */
-#define RADEON_INFO_RING_WORKING	0x15
-/* SI tile mode array */
-#define RADEON_INFO_SI_TILE_MODE_ARRAY	0x16
-/* query if CP DMA is supported on the compute ring */
-#define RADEON_INFO_SI_CP_DMA_COMPUTE	0x17
-/* CIK macrotile mode array */
-#define RADEON_INFO_CIK_MACROTILE_MODE_ARRAY	0x18
-/* query the number of render backends */
-#define RADEON_INFO_SI_BACKEND_ENABLED_MASK	0x19
-/* max engine clock - needed for OpenCL */
-#define RADEON_INFO_MAX_SCLK		0x1a
-/* version of VCE firmware */
-#define RADEON_INFO_VCE_FW_VERSION	0x1b
-/* version of VCE feedback */
-#define RADEON_INFO_VCE_FB_VERSION	0x1c
-#define RADEON_INFO_NUM_BYTES_MOVED	0x1d
-#define RADEON_INFO_VRAM_USAGE		0x1e
-#define RADEON_INFO_GTT_USAGE		0x1f
-#define RADEON_INFO_ACTIVE_CU_COUNT	0x20
-#define RADEON_INFO_CURRENT_GPU_TEMP	0x21
-#define RADEON_INFO_CURRENT_GPU_SCLK	0x22
-#define RADEON_INFO_CURRENT_GPU_MCLK	0x23
-#define RADEON_INFO_READ_REG		0x24
-#define RADEON_INFO_VA_UNMAP_WORKING	0x25
-#define RADEON_INFO_GPU_RESET_COUNTER	0x26
-
-struct drm_radeon_info {
-	uint32_t		request;
-	uint32_t		pad;
-	uint64_t		value;
-};
-
-/* Those correspond to the tile index to use, this is to explicitly state
- * the API that is implicitly defined by the tile mode array.
- */
-#define SI_TILE_MODE_COLOR_LINEAR_ALIGNED	8
-#define SI_TILE_MODE_COLOR_1D			13
-#define SI_TILE_MODE_COLOR_1D_SCANOUT		9
-#define SI_TILE_MODE_COLOR_2D_8BPP		14
-#define SI_TILE_MODE_COLOR_2D_16BPP		15
-#define SI_TILE_MODE_COLOR_2D_32BPP		16
-#define SI_TILE_MODE_COLOR_2D_64BPP		17
-#define SI_TILE_MODE_COLOR_2D_SCANOUT_16BPP	11
-#define SI_TILE_MODE_COLOR_2D_SCANOUT_32BPP	12
-#define SI_TILE_MODE_DEPTH_STENCIL_1D		4
-#define SI_TILE_MODE_DEPTH_STENCIL_2D		0
-#define SI_TILE_MODE_DEPTH_STENCIL_2D_2AA	3
-#define SI_TILE_MODE_DEPTH_STENCIL_2D_4AA	3
-#define SI_TILE_MODE_DEPTH_STENCIL_2D_8AA	2
-
-#define CIK_TILE_MODE_DEPTH_STENCIL_1D		5
-
-#endif
diff --git a/openflow/usr/include/drm/savage_drm.h b/openflow/usr/include/drm/savage_drm.h
deleted file mode 100644
index 1bb08b7..0000000
--- a/openflow/usr/include/drm/savage_drm.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* savage_drm.h -- Public header for the savage driver
- *
- * Copyright 2004  Felix Kuehling
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT. IN NO EVENT SHALL FELIX KUEHLING BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __SAVAGE_DRM_H__
-#define __SAVAGE_DRM_H__
-
-#include <drm/drm.h>
-
-#ifndef __SAVAGE_SAREA_DEFINES__
-#define __SAVAGE_SAREA_DEFINES__
-
-/* 2 heaps (1 for card, 1 for agp), each divided into up to 128
- * regions, subject to a minimum region size of (1<<16) == 64k.
- *
- * Clients may subdivide regions internally, but when sharing between
- * clients, the region size is the minimum granularity.
- */
-
-#define SAVAGE_CARD_HEAP		0
-#define SAVAGE_AGP_HEAP			1
-#define SAVAGE_NR_TEX_HEAPS		2
-#define SAVAGE_NR_TEX_REGIONS		16
-#define SAVAGE_LOG_MIN_TEX_REGION_SIZE	16
-
-#endif				/* __SAVAGE_SAREA_DEFINES__ */
-
-typedef struct _drm_savage_sarea {
-	/* LRU lists for texture memory in agp space and on the card.
-	 */
-	struct drm_tex_region texList[SAVAGE_NR_TEX_HEAPS][SAVAGE_NR_TEX_REGIONS +
-						      1];
-	unsigned int texAge[SAVAGE_NR_TEX_HEAPS];
-
-	/* Mechanism to validate card state.
-	 */
-	int ctxOwner;
-} drm_savage_sarea_t, *drm_savage_sarea_ptr;
-
-/* Savage-specific ioctls
- */
-#define DRM_SAVAGE_BCI_INIT		0x00
-#define DRM_SAVAGE_BCI_CMDBUF           0x01
-#define DRM_SAVAGE_BCI_EVENT_EMIT	0x02
-#define DRM_SAVAGE_BCI_EVENT_WAIT	0x03
-
-#define DRM_IOCTL_SAVAGE_BCI_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_INIT, drm_savage_init_t)
-#define DRM_IOCTL_SAVAGE_BCI_CMDBUF		DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_CMDBUF, drm_savage_cmdbuf_t)
-#define DRM_IOCTL_SAVAGE_BCI_EVENT_EMIT	DRM_IOWR(DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_EMIT, drm_savage_event_emit_t)
-#define DRM_IOCTL_SAVAGE_BCI_EVENT_WAIT	DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_WAIT, drm_savage_event_wait_t)
-
-#define SAVAGE_DMA_PCI	1
-#define SAVAGE_DMA_AGP	3
-typedef struct drm_savage_init {
-	enum {
-		SAVAGE_INIT_BCI = 1,
-		SAVAGE_CLEANUP_BCI = 2
-	} func;
-	unsigned int sarea_priv_offset;
-
-	/* some parameters */
-	unsigned int cob_size;
-	unsigned int bci_threshold_lo, bci_threshold_hi;
-	unsigned int dma_type;
-
-	/* frame buffer layout */
-	unsigned int fb_bpp;
-	unsigned int front_offset, front_pitch;
-	unsigned int back_offset, back_pitch;
-	unsigned int depth_bpp;
-	unsigned int depth_offset, depth_pitch;
-
-	/* local textures */
-	unsigned int texture_offset;
-	unsigned int texture_size;
-
-	/* physical locations of non-permanent maps */
-	unsigned long status_offset;
-	unsigned long buffers_offset;
-	unsigned long agp_textures_offset;
-	unsigned long cmd_dma_offset;
-} drm_savage_init_t;
-
-typedef union drm_savage_cmd_header drm_savage_cmd_header_t;
-typedef struct drm_savage_cmdbuf {
-	/* command buffer in client's address space */
-	drm_savage_cmd_header_t *cmd_addr;
-	unsigned int size;	/* size of the command buffer in 64bit units */
-
-	unsigned int dma_idx;	/* DMA buffer index to use */
-	int discard;		/* discard DMA buffer when done */
-	/* vertex buffer in client's address space */
-	unsigned int *vb_addr;
-	unsigned int vb_size;	/* size of client vertex buffer in bytes */
-	unsigned int vb_stride;	/* stride of vertices in 32bit words */
-	/* boxes in client's address space */
-	struct drm_clip_rect *box_addr;
-	unsigned int nbox;	/* number of clipping boxes */
-} drm_savage_cmdbuf_t;
-
-#define SAVAGE_WAIT_2D  0x1	/* wait for 2D idle before updating event tag */
-#define SAVAGE_WAIT_3D  0x2	/* wait for 3D idle before updating event tag */
-#define SAVAGE_WAIT_IRQ 0x4	/* emit or wait for IRQ, not implemented yet */
-typedef struct drm_savage_event {
-	unsigned int count;
-	unsigned int flags;
-} drm_savage_event_emit_t, drm_savage_event_wait_t;
-
-/* Commands for the cmdbuf ioctl
- */
-#define SAVAGE_CMD_STATE	0	/* a range of state registers */
-#define SAVAGE_CMD_DMA_PRIM	1	/* vertices from DMA buffer */
-#define SAVAGE_CMD_VB_PRIM	2	/* vertices from client vertex buffer */
-#define SAVAGE_CMD_DMA_IDX	3	/* indexed vertices from DMA buffer */
-#define SAVAGE_CMD_VB_IDX	4	/* indexed vertices client vertex buffer */
-#define SAVAGE_CMD_CLEAR	5	/* clear buffers */
-#define SAVAGE_CMD_SWAP		6	/* swap buffers */
-
-/* Primitive types
-*/
-#define SAVAGE_PRIM_TRILIST	0	/* triangle list */
-#define SAVAGE_PRIM_TRISTRIP	1	/* triangle strip */
-#define SAVAGE_PRIM_TRIFAN	2	/* triangle fan */
-#define SAVAGE_PRIM_TRILIST_201	3	/* reorder verts for correct flat
-					 * shading on s3d */
-
-/* Skip flags (vertex format)
- */
-#define SAVAGE_SKIP_Z		0x01
-#define SAVAGE_SKIP_W		0x02
-#define SAVAGE_SKIP_C0		0x04
-#define SAVAGE_SKIP_C1		0x08
-#define SAVAGE_SKIP_S0		0x10
-#define SAVAGE_SKIP_T0		0x20
-#define SAVAGE_SKIP_ST0		0x30
-#define SAVAGE_SKIP_S1		0x40
-#define SAVAGE_SKIP_T1		0x80
-#define SAVAGE_SKIP_ST1		0xc0
-#define SAVAGE_SKIP_ALL_S3D	0x3f
-#define SAVAGE_SKIP_ALL_S4	0xff
-
-/* Buffer names for clear command
- */
-#define SAVAGE_FRONT		0x1
-#define SAVAGE_BACK		0x2
-#define SAVAGE_DEPTH		0x4
-
-/* 64-bit command header
- */
-union drm_savage_cmd_header {
-	struct {
-		unsigned char cmd;	/* command */
-		unsigned char pad0;
-		unsigned short pad1;
-		unsigned short pad2;
-		unsigned short pad3;
-	} cmd;			/* generic */
-	struct {
-		unsigned char cmd;
-		unsigned char global;	/* need idle engine? */
-		unsigned short count;	/* number of consecutive registers */
-		unsigned short start;	/* first register */
-		unsigned short pad3;
-	} state;		/* SAVAGE_CMD_STATE */
-	struct {
-		unsigned char cmd;
-		unsigned char prim;	/* primitive type */
-		unsigned short skip;	/* vertex format (skip flags) */
-		unsigned short count;	/* number of vertices */
-		unsigned short start;	/* first vertex in DMA/vertex buffer */
-	} prim;			/* SAVAGE_CMD_DMA_PRIM, SAVAGE_CMD_VB_PRIM */
-	struct {
-		unsigned char cmd;
-		unsigned char prim;
-		unsigned short skip;
-		unsigned short count;	/* number of indices that follow */
-		unsigned short pad3;
-	} idx;			/* SAVAGE_CMD_DMA_IDX, SAVAGE_CMD_VB_IDX */
-	struct {
-		unsigned char cmd;
-		unsigned char pad0;
-		unsigned short pad1;
-		unsigned int flags;
-	} clear0;		/* SAVAGE_CMD_CLEAR */
-	struct {
-		unsigned int mask;
-		unsigned int value;
-	} clear1;		/* SAVAGE_CMD_CLEAR data */
-};
-
-#endif
diff --git a/openflow/usr/include/drm/sis_drm.h b/openflow/usr/include/drm/sis_drm.h
deleted file mode 100644
index 374858c..0000000
--- a/openflow/usr/include/drm/sis_drm.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* sis_drv.h -- Private header for sis driver -*- linux-c -*- */
-/*
- * Copyright 2005 Eric Anholt
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef __SIS_DRM_H__
-#define __SIS_DRM_H__
-
-/* SiS specific ioctls */
-#define NOT_USED_0_3
-#define DRM_SIS_FB_ALLOC	0x04
-#define DRM_SIS_FB_FREE	        0x05
-#define NOT_USED_6_12
-#define DRM_SIS_AGP_INIT	0x13
-#define DRM_SIS_AGP_ALLOC	0x14
-#define DRM_SIS_AGP_FREE	0x15
-#define DRM_SIS_FB_INIT	        0x16
-
-#define DRM_IOCTL_SIS_FB_ALLOC		DRM_IOWR(DRM_COMMAND_BASE + DRM_SIS_FB_ALLOC, drm_sis_mem_t)
-#define DRM_IOCTL_SIS_FB_FREE		DRM_IOW( DRM_COMMAND_BASE + DRM_SIS_FB_FREE, drm_sis_mem_t)
-#define DRM_IOCTL_SIS_AGP_INIT		DRM_IOWR(DRM_COMMAND_BASE + DRM_SIS_AGP_INIT, drm_sis_agp_t)
-#define DRM_IOCTL_SIS_AGP_ALLOC		DRM_IOWR(DRM_COMMAND_BASE + DRM_SIS_AGP_ALLOC, drm_sis_mem_t)
-#define DRM_IOCTL_SIS_AGP_FREE		DRM_IOW( DRM_COMMAND_BASE + DRM_SIS_AGP_FREE, drm_sis_mem_t)
-#define DRM_IOCTL_SIS_FB_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_SIS_FB_INIT, drm_sis_fb_t)
-/*
-#define DRM_IOCTL_SIS_FLIP		DRM_IOW( 0x48, drm_sis_flip_t)
-#define DRM_IOCTL_SIS_FLIP_INIT		DRM_IO(  0x49)
-#define DRM_IOCTL_SIS_FLIP_FINAL	DRM_IO(  0x50)
-*/
-
-typedef struct {
-	int context;
-	unsigned long offset;
-	unsigned long size;
-	unsigned long free;
-} drm_sis_mem_t;
-
-typedef struct {
-	unsigned long offset, size;
-} drm_sis_agp_t;
-
-typedef struct {
-	unsigned long offset, size;
-} drm_sis_fb_t;
-
-#endif				/* __SIS_DRM_H__ */
diff --git a/openflow/usr/include/drm/tegra_drm.h b/openflow/usr/include/drm/tegra_drm.h
deleted file mode 100644
index e55c816..0000000
--- a/openflow/usr/include/drm/tegra_drm.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2012-2013, NVIDIA CORPORATION.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _TEGRA_DRM_H_
-#define _TEGRA_DRM_H_
-
-#include <drm/drm.h>
-
-#define DRM_TEGRA_GEM_CREATE_TILED     (1 << 0)
-#define DRM_TEGRA_GEM_CREATE_BOTTOM_UP (1 << 1)
-
-struct drm_tegra_gem_create {
-	__u64 size;
-	__u32 flags;
-	__u32 handle;
-};
-
-struct drm_tegra_gem_mmap {
-	__u32 handle;
-	__u32 pad;
-	__u64 offset;
-};
-
-struct drm_tegra_syncpt_read {
-	__u32 id;
-	__u32 value;
-};
-
-struct drm_tegra_syncpt_incr {
-	__u32 id;
-	__u32 pad;
-};
-
-struct drm_tegra_syncpt_wait {
-	__u32 id;
-	__u32 thresh;
-	__u32 timeout;
-	__u32 value;
-};
-
-#define DRM_TEGRA_NO_TIMEOUT	(0xffffffff)
-
-struct drm_tegra_open_channel {
-	__u32 client;
-	__u32 pad;
-	__u64 context;
-};
-
-struct drm_tegra_close_channel {
-	__u64 context;
-};
-
-struct drm_tegra_get_syncpt {
-	__u64 context;
-	__u32 index;
-	__u32 id;
-};
-
-struct drm_tegra_get_syncpt_base {
-	__u64 context;
-	__u32 syncpt;
-	__u32 id;
-};
-
-struct drm_tegra_syncpt {
-	__u32 id;
-	__u32 incrs;
-};
-
-struct drm_tegra_cmdbuf {
-	__u32 handle;
-	__u32 offset;
-	__u32 words;
-	__u32 pad;
-};
-
-struct drm_tegra_reloc {
-	struct {
-		__u32 handle;
-		__u32 offset;
-	} cmdbuf;
-	struct {
-		__u32 handle;
-		__u32 offset;
-	} target;
-	__u32 shift;
-	__u32 pad;
-};
-
-struct drm_tegra_waitchk {
-	__u32 handle;
-	__u32 offset;
-	__u32 syncpt;
-	__u32 thresh;
-};
-
-struct drm_tegra_submit {
-	__u64 context;
-	__u32 num_syncpts;
-	__u32 num_cmdbufs;
-	__u32 num_relocs;
-	__u32 num_waitchks;
-	__u32 waitchk_mask;
-	__u32 timeout;
-	__u64 syncpts;
-	__u64 cmdbufs;
-	__u64 relocs;
-	__u64 waitchks;
-	__u32 fence;		/* Return value */
-
-	__u32 reserved[5];	/* future expansion */
-};
-
-#define DRM_TEGRA_GEM_TILING_MODE_PITCH 0
-#define DRM_TEGRA_GEM_TILING_MODE_TILED 1
-#define DRM_TEGRA_GEM_TILING_MODE_BLOCK 2
-
-struct drm_tegra_gem_set_tiling {
-	/* input */
-	__u32 handle;
-	__u32 mode;
-	__u32 value;
-	__u32 pad;
-};
-
-struct drm_tegra_gem_get_tiling {
-	/* input */
-	__u32 handle;
-	/* output */
-	__u32 mode;
-	__u32 value;
-	__u32 pad;
-};
-
-#define DRM_TEGRA_GEM_BOTTOM_UP		(1 << 0)
-#define DRM_TEGRA_GEM_FLAGS		(DRM_TEGRA_GEM_BOTTOM_UP)
-
-struct drm_tegra_gem_set_flags {
-	/* input */
-	__u32 handle;
-	/* output */
-	__u32 flags;
-};
-
-struct drm_tegra_gem_get_flags {
-	/* input */
-	__u32 handle;
-	/* output */
-	__u32 flags;
-};
-
-#define DRM_TEGRA_GEM_CREATE		0x00
-#define DRM_TEGRA_GEM_MMAP		0x01
-#define DRM_TEGRA_SYNCPT_READ		0x02
-#define DRM_TEGRA_SYNCPT_INCR		0x03
-#define DRM_TEGRA_SYNCPT_WAIT		0x04
-#define DRM_TEGRA_OPEN_CHANNEL		0x05
-#define DRM_TEGRA_CLOSE_CHANNEL		0x06
-#define DRM_TEGRA_GET_SYNCPT		0x07
-#define DRM_TEGRA_SUBMIT		0x08
-#define DRM_TEGRA_GET_SYNCPT_BASE	0x09
-#define DRM_TEGRA_GEM_SET_TILING	0x0a
-#define DRM_TEGRA_GEM_GET_TILING	0x0b
-#define DRM_TEGRA_GEM_SET_FLAGS		0x0c
-#define DRM_TEGRA_GEM_GET_FLAGS		0x0d
-
-#define DRM_IOCTL_TEGRA_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_CREATE, struct drm_tegra_gem_create)
-#define DRM_IOCTL_TEGRA_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_MMAP, struct drm_tegra_gem_mmap)
-#define DRM_IOCTL_TEGRA_SYNCPT_READ DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SYNCPT_READ, struct drm_tegra_syncpt_read)
-#define DRM_IOCTL_TEGRA_SYNCPT_INCR DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SYNCPT_INCR, struct drm_tegra_syncpt_incr)
-#define DRM_IOCTL_TEGRA_SYNCPT_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SYNCPT_WAIT, struct drm_tegra_syncpt_wait)
-#define DRM_IOCTL_TEGRA_OPEN_CHANNEL DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_OPEN_CHANNEL, struct drm_tegra_open_channel)
-#define DRM_IOCTL_TEGRA_CLOSE_CHANNEL DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_CLOSE_CHANNEL, struct drm_tegra_open_channel)
-#define DRM_IOCTL_TEGRA_GET_SYNCPT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GET_SYNCPT, struct drm_tegra_get_syncpt)
-#define DRM_IOCTL_TEGRA_SUBMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SUBMIT, struct drm_tegra_submit)
-#define DRM_IOCTL_TEGRA_GET_SYNCPT_BASE DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GET_SYNCPT_BASE, struct drm_tegra_get_syncpt_base)
-#define DRM_IOCTL_TEGRA_GEM_SET_TILING DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_SET_TILING, struct drm_tegra_gem_set_tiling)
-#define DRM_IOCTL_TEGRA_GEM_GET_TILING DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_GET_TILING, struct drm_tegra_gem_get_tiling)
-#define DRM_IOCTL_TEGRA_GEM_SET_FLAGS DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_SET_FLAGS, struct drm_tegra_gem_set_flags)
-#define DRM_IOCTL_TEGRA_GEM_GET_FLAGS DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_GET_FLAGS, struct drm_tegra_gem_get_flags)
-
-#endif
diff --git a/openflow/usr/include/drm/via_drm.h b/openflow/usr/include/drm/via_drm.h
deleted file mode 100644
index 20fbac0..0000000
--- a/openflow/usr/include/drm/via_drm.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-#ifndef _VIA_DRM_H_
-#define _VIA_DRM_H_
-
-#include <drm/drm.h>
-
-/* WARNING: These defines must be the same as what the Xserver uses.
- * if you change them, you must change the defines in the Xserver.
- */
-
-#ifndef _VIA_DEFINES_
-#define _VIA_DEFINES_
-
-#include "via_drmclient.h"
-
-#define VIA_NR_SAREA_CLIPRECTS		8
-#define VIA_NR_XVMC_PORTS               10
-#define VIA_NR_XVMC_LOCKS               5
-#define VIA_MAX_CACHELINE_SIZE          64
-#define XVMCLOCKPTR(saPriv,lockNo)					\
-	((__volatile__ struct drm_hw_lock *)(((((unsigned long) (saPriv)->XvMCLockArea) + \
-				      (VIA_MAX_CACHELINE_SIZE - 1)) &	\
-				     ~(VIA_MAX_CACHELINE_SIZE - 1)) +	\
-				    VIA_MAX_CACHELINE_SIZE*(lockNo)))
-
-/* Each region is a minimum of 64k, and there are at most 64 of them.
- */
-#define VIA_NR_TEX_REGIONS 64
-#define VIA_LOG_MIN_TEX_REGION_SIZE 16
-#endif
-
-#define VIA_UPLOAD_TEX0IMAGE  0x1	/* handled clientside */
-#define VIA_UPLOAD_TEX1IMAGE  0x2	/* handled clientside */
-#define VIA_UPLOAD_CTX        0x4
-#define VIA_UPLOAD_BUFFERS    0x8
-#define VIA_UPLOAD_TEX0       0x10
-#define VIA_UPLOAD_TEX1       0x20
-#define VIA_UPLOAD_CLIPRECTS  0x40
-#define VIA_UPLOAD_ALL        0xff
-
-/* VIA specific ioctls */
-#define DRM_VIA_ALLOCMEM	0x00
-#define DRM_VIA_FREEMEM	        0x01
-#define DRM_VIA_AGP_INIT	0x02
-#define DRM_VIA_FB_INIT	        0x03
-#define DRM_VIA_MAP_INIT	0x04
-#define DRM_VIA_DEC_FUTEX       0x05
-#define NOT_USED
-#define DRM_VIA_DMA_INIT	0x07
-#define DRM_VIA_CMDBUFFER	0x08
-#define DRM_VIA_FLUSH	        0x09
-#define DRM_VIA_PCICMD	        0x0a
-#define DRM_VIA_CMDBUF_SIZE	0x0b
-#define NOT_USED
-#define DRM_VIA_WAIT_IRQ        0x0d
-#define DRM_VIA_DMA_BLIT        0x0e
-#define DRM_VIA_BLIT_SYNC       0x0f
-
-#define DRM_IOCTL_VIA_ALLOCMEM	  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_ALLOCMEM, drm_via_mem_t)
-#define DRM_IOCTL_VIA_FREEMEM	  DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_FREEMEM, drm_via_mem_t)
-#define DRM_IOCTL_VIA_AGP_INIT	  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_AGP_INIT, drm_via_agp_t)
-#define DRM_IOCTL_VIA_FB_INIT	  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_FB_INIT, drm_via_fb_t)
-#define DRM_IOCTL_VIA_MAP_INIT	  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_MAP_INIT, drm_via_init_t)
-#define DRM_IOCTL_VIA_DEC_FUTEX   DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_DEC_FUTEX, drm_via_futex_t)
-#define DRM_IOCTL_VIA_DMA_INIT	  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_DMA_INIT, drm_via_dma_init_t)
-#define DRM_IOCTL_VIA_CMDBUFFER	  DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_CMDBUFFER, drm_via_cmdbuffer_t)
-#define DRM_IOCTL_VIA_FLUSH	  DRM_IO(  DRM_COMMAND_BASE + DRM_VIA_FLUSH)
-#define DRM_IOCTL_VIA_PCICMD	  DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_PCICMD, drm_via_cmdbuffer_t)
-#define DRM_IOCTL_VIA_CMDBUF_SIZE DRM_IOWR( DRM_COMMAND_BASE + DRM_VIA_CMDBUF_SIZE, \
-					    drm_via_cmdbuf_size_t)
-#define DRM_IOCTL_VIA_WAIT_IRQ    DRM_IOWR( DRM_COMMAND_BASE + DRM_VIA_WAIT_IRQ, drm_via_irqwait_t)
-#define DRM_IOCTL_VIA_DMA_BLIT    DRM_IOW(DRM_COMMAND_BASE + DRM_VIA_DMA_BLIT, drm_via_dmablit_t)
-#define DRM_IOCTL_VIA_BLIT_SYNC   DRM_IOW(DRM_COMMAND_BASE + DRM_VIA_BLIT_SYNC, drm_via_blitsync_t)
-
-/* Indices into buf.Setup where various bits of state are mirrored per
- * context and per buffer.  These can be fired at the card as a unit,
- * or in a piecewise fashion as required.
- */
-
-#define VIA_TEX_SETUP_SIZE 8
-
-/* Flags for clear ioctl
- */
-#define VIA_FRONT   0x1
-#define VIA_BACK    0x2
-#define VIA_DEPTH   0x4
-#define VIA_STENCIL 0x8
-#define VIA_MEM_VIDEO   0	/* matches drm constant */
-#define VIA_MEM_AGP     1	/* matches drm constant */
-#define VIA_MEM_SYSTEM  2
-#define VIA_MEM_MIXED   3
-#define VIA_MEM_UNKNOWN 4
-
-typedef struct {
-	__u32 offset;
-	__u32 size;
-} drm_via_agp_t;
-
-typedef struct {
-	__u32 offset;
-	__u32 size;
-} drm_via_fb_t;
-
-typedef struct {
-	__u32 context;
-	__u32 type;
-	__u32 size;
-	unsigned long index;
-	unsigned long offset;
-} drm_via_mem_t;
-
-typedef struct _drm_via_init {
-	enum {
-		VIA_INIT_MAP = 0x01,
-		VIA_CLEANUP_MAP = 0x02
-	} func;
-
-	unsigned long sarea_priv_offset;
-	unsigned long fb_offset;
-	unsigned long mmio_offset;
-	unsigned long agpAddr;
-} drm_via_init_t;
-
-typedef struct _drm_via_futex {
-	enum {
-		VIA_FUTEX_WAIT = 0x00,
-		VIA_FUTEX_WAKE = 0X01
-	} func;
-	__u32 ms;
-	__u32 lock;
-	__u32 val;
-} drm_via_futex_t;
-
-typedef struct _drm_via_dma_init {
-	enum {
-		VIA_INIT_DMA = 0x01,
-		VIA_CLEANUP_DMA = 0x02,
-		VIA_DMA_INITIALIZED = 0x03
-	} func;
-
-	unsigned long offset;
-	unsigned long size;
-	unsigned long reg_pause_addr;
-} drm_via_dma_init_t;
-
-typedef struct _drm_via_cmdbuffer {
-	char *buf;
-	unsigned long size;
-} drm_via_cmdbuffer_t;
-
-/* Warning: If you change the SAREA structure you must change the Xserver
- * structure as well */
-
-typedef struct _drm_via_tex_region {
-	unsigned char next, prev;	/* indices to form a circular LRU  */
-	unsigned char inUse;	/* owned by a client, or free? */
-	int age;		/* tracked by clients to update local LRU's */
-} drm_via_tex_region_t;
-
-typedef struct _drm_via_sarea {
-	unsigned int dirty;
-	unsigned int nbox;
-	struct drm_clip_rect boxes[VIA_NR_SAREA_CLIPRECTS];
-	drm_via_tex_region_t texList[VIA_NR_TEX_REGIONS + 1];
-	int texAge;		/* last time texture was uploaded */
-	int ctxOwner;		/* last context to upload state */
-	int vertexPrim;
-
-	/*
-	 * Below is for XvMC.
-	 * We want the lock integers alone on, and aligned to, a cache line.
-	 * Therefore this somewhat strange construct.
-	 */
-
-	char XvMCLockArea[VIA_MAX_CACHELINE_SIZE * (VIA_NR_XVMC_LOCKS + 1)];
-
-	unsigned int XvMCDisplaying[VIA_NR_XVMC_PORTS];
-	unsigned int XvMCSubPicOn[VIA_NR_XVMC_PORTS];
-	unsigned int XvMCCtxNoGrabbed;	/* Last context to hold decoder */
-
-	/* Used by the 3d driver only at this point, for pageflipping:
-	 */
-	unsigned int pfCurrentOffset;
-} drm_via_sarea_t;
-
-typedef struct _drm_via_cmdbuf_size {
-	enum {
-		VIA_CMDBUF_SPACE = 0x01,
-		VIA_CMDBUF_LAG = 0x02
-	} func;
-	int wait;
-	__u32 size;
-} drm_via_cmdbuf_size_t;
-
-typedef enum {
-	VIA_IRQ_ABSOLUTE = 0x0,
-	VIA_IRQ_RELATIVE = 0x1,
-	VIA_IRQ_SIGNAL = 0x10000000,
-	VIA_IRQ_FORCE_SEQUENCE = 0x20000000
-} via_irq_seq_type_t;
-
-#define VIA_IRQ_FLAGS_MASK 0xF0000000
-
-enum drm_via_irqs {
-	drm_via_irq_hqv0 = 0,
-	drm_via_irq_hqv1,
-	drm_via_irq_dma0_dd,
-	drm_via_irq_dma0_td,
-	drm_via_irq_dma1_dd,
-	drm_via_irq_dma1_td,
-	drm_via_irq_num
-};
-
-struct drm_via_wait_irq_request {
-	unsigned irq;
-	via_irq_seq_type_t type;
-	__u32 sequence;
-	__u32 signal;
-};
-
-typedef union drm_via_irqwait {
-	struct drm_via_wait_irq_request request;
-	struct drm_wait_vblank_reply reply;
-} drm_via_irqwait_t;
-
-typedef struct drm_via_blitsync {
-	__u32 sync_handle;
-	unsigned engine;
-} drm_via_blitsync_t;
-
-/* - * Below,"flags" is currently unused but will be used for possible future
- * extensions like kernel space bounce buffers for bad alignments and
- * blit engine busy-wait polling for better latency in the absence of
- * interrupts.
- */
-
-typedef struct drm_via_dmablit {
-	__u32 num_lines;
-	__u32 line_length;
-
-	__u32 fb_addr;
-	__u32 fb_stride;
-
-	unsigned char *mem_addr;
-	__u32 mem_stride;
-
-	__u32 flags;
-	int to_fb;
-
-	drm_via_blitsync_t sync;
-} drm_via_dmablit_t;
-
-#endif				/* _VIA_DRM_H_ */
diff --git a/openflow/usr/include/drm/virtgpu_drm.h b/openflow/usr/include/drm/virtgpu_drm.h
deleted file mode 100644
index fc9e2d6..0000000
--- a/openflow/usr/include/drm/virtgpu_drm.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright 2013 Red Hat
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef VIRTGPU_DRM_H
-#define VIRTGPU_DRM_H
-
-#include <stddef.h>
-#include "drm/drm.h"
-
-/* Please note that modifications to all structs defined here are
- * subject to backwards-compatibility constraints.
- *
- * Do not use pointers, use uint64_t instead for 32 bit / 64 bit user/kernel
- * compatibility Keep fields aligned to their size
- */
-
-#define DRM_VIRTGPU_MAP         0x01
-#define DRM_VIRTGPU_EXECBUFFER  0x02
-#define DRM_VIRTGPU_GETPARAM    0x03
-#define DRM_VIRTGPU_RESOURCE_CREATE 0x04
-#define DRM_VIRTGPU_RESOURCE_INFO     0x05
-#define DRM_VIRTGPU_TRANSFER_FROM_HOST 0x06
-#define DRM_VIRTGPU_TRANSFER_TO_HOST 0x07
-#define DRM_VIRTGPU_WAIT     0x08
-#define DRM_VIRTGPU_GET_CAPS  0x09
-
-struct drm_virtgpu_map {
-	uint64_t offset; /* use for mmap system call */
-	uint32_t handle;
-	uint32_t pad;
-};
-
-struct drm_virtgpu_execbuffer {
-	uint32_t		flags;		/* for future use */
-	uint32_t size;
-	uint64_t command; /* void* */
-	uint64_t bo_handles;
-	uint32_t num_bo_handles;
-	uint32_t pad;
-};
-
-#define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */
-
-struct drm_virtgpu_getparam {
-	uint64_t param;
-	uint64_t value;
-};
-
-/* NO_BO flags? NO resource flag? */
-/* resource flag for y_0_top */
-struct drm_virtgpu_resource_create {
-	uint32_t target;
-	uint32_t format;
-	uint32_t bind;
-	uint32_t width;
-	uint32_t height;
-	uint32_t depth;
-	uint32_t array_size;
-	uint32_t last_level;
-	uint32_t nr_samples;
-	uint32_t flags;
-	uint32_t bo_handle; /* if this is set - recreate a new resource attached to this bo ? */
-	uint32_t res_handle;  /* returned by kernel */
-	uint32_t size;        /* validate transfer in the host */
-	uint32_t stride;      /* validate transfer in the host */
-};
-
-struct drm_virtgpu_resource_info {
-	uint32_t bo_handle;
-	uint32_t res_handle;
-	uint32_t size;
-	uint32_t stride;
-};
-
-struct drm_virtgpu_3d_box {
-	uint32_t x;
-	uint32_t y;
-	uint32_t z;
-	uint32_t w;
-	uint32_t h;
-	uint32_t d;
-};
-
-struct drm_virtgpu_3d_transfer_to_host {
-	uint32_t bo_handle;
-	struct drm_virtgpu_3d_box box;
-	uint32_t level;
-	uint32_t offset;
-};
-
-struct drm_virtgpu_3d_transfer_from_host {
-	uint32_t bo_handle;
-	struct drm_virtgpu_3d_box box;
-	uint32_t level;
-	uint32_t offset;
-};
-
-#define VIRTGPU_WAIT_NOWAIT 1 /* like it */
-struct drm_virtgpu_3d_wait {
-	uint32_t handle; /* 0 is an invalid handle */
-	uint32_t flags;
-};
-
-struct drm_virtgpu_get_caps {
-	uint32_t cap_set_id;
-	uint32_t cap_set_ver;
-	uint64_t addr;
-	uint32_t size;
-	uint32_t pad;
-};
-
-#define DRM_IOCTL_VIRTGPU_MAP \
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_MAP, struct drm_virtgpu_map)
-
-#define DRM_IOCTL_VIRTGPU_EXECBUFFER \
-	DRM_IOW(DRM_COMMAND_BASE + DRM_VIRTGPU_EXECBUFFER,\
-		struct drm_virtgpu_execbuffer)
-
-#define DRM_IOCTL_VIRTGPU_GETPARAM \
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_GETPARAM,\
-		struct drm_virtgpu_getparam)
-
-#define DRM_IOCTL_VIRTGPU_RESOURCE_CREATE			\
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_RESOURCE_CREATE,	\
-		struct drm_virtgpu_resource_create)
-
-#define DRM_IOCTL_VIRTGPU_RESOURCE_INFO \
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_RESOURCE_INFO, \
-		 struct drm_virtgpu_resource_info)
-
-#define DRM_IOCTL_VIRTGPU_TRANSFER_FROM_HOST \
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_TRANSFER_FROM_HOST,	\
-		struct drm_virtgpu_3d_transfer_from_host)
-
-#define DRM_IOCTL_VIRTGPU_TRANSFER_TO_HOST \
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_TRANSFER_TO_HOST,	\
-		struct drm_virtgpu_3d_transfer_to_host)
-
-#define DRM_IOCTL_VIRTGPU_WAIT				\
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_WAIT,	\
-		struct drm_virtgpu_3d_wait)
-
-#define DRM_IOCTL_VIRTGPU_GET_CAPS \
-	DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_GET_CAPS, \
-	struct drm_virtgpu_get_caps)
-
-#endif
diff --git a/openflow/usr/include/drm/vmwgfx_drm.h b/openflow/usr/include/drm/vmwgfx_drm.h
deleted file mode 100644
index 5f38f39..0000000
--- a/openflow/usr/include/drm/vmwgfx_drm.h
+++ /dev/null
@@ -1,1090 +0,0 @@
-/**************************************************************************
- *
- * Copyright © 2009-2015 VMware, Inc., Palo Alto, CA., USA
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
-
-#ifndef __VMWGFX_DRM_H__
-#define __VMWGFX_DRM_H__
-
-#include <drm/drm.h>
-
-#define DRM_VMW_MAX_SURFACE_FACES 6
-#define DRM_VMW_MAX_MIP_LEVELS 24
-
-
-#define DRM_VMW_GET_PARAM            0
-#define DRM_VMW_ALLOC_DMABUF         1
-#define DRM_VMW_UNREF_DMABUF         2
-#define DRM_VMW_CURSOR_BYPASS        3
-/* guarded by DRM_VMW_PARAM_NUM_STREAMS != 0*/
-#define DRM_VMW_CONTROL_STREAM       4
-#define DRM_VMW_CLAIM_STREAM         5
-#define DRM_VMW_UNREF_STREAM         6
-/* guarded by DRM_VMW_PARAM_3D == 1 */
-#define DRM_VMW_CREATE_CONTEXT       7
-#define DRM_VMW_UNREF_CONTEXT        8
-#define DRM_VMW_CREATE_SURFACE       9
-#define DRM_VMW_UNREF_SURFACE        10
-#define DRM_VMW_REF_SURFACE          11
-#define DRM_VMW_EXECBUF              12
-#define DRM_VMW_GET_3D_CAP           13
-#define DRM_VMW_FENCE_WAIT           14
-#define DRM_VMW_FENCE_SIGNALED       15
-#define DRM_VMW_FENCE_UNREF          16
-#define DRM_VMW_FENCE_EVENT          17
-#define DRM_VMW_PRESENT              18
-#define DRM_VMW_PRESENT_READBACK     19
-#define DRM_VMW_UPDATE_LAYOUT        20
-#define DRM_VMW_CREATE_SHADER        21
-#define DRM_VMW_UNREF_SHADER         22
-#define DRM_VMW_GB_SURFACE_CREATE    23
-#define DRM_VMW_GB_SURFACE_REF       24
-#define DRM_VMW_SYNCCPU              25
-#define DRM_VMW_CREATE_EXTENDED_CONTEXT 26
-
-/*************************************************************************/
-/**
- * DRM_VMW_GET_PARAM - get device information.
- *
- * DRM_VMW_PARAM_FIFO_OFFSET:
- * Offset to use to map the first page of the FIFO read-only.
- * The fifo is mapped using the mmap() system call on the drm device.
- *
- * DRM_VMW_PARAM_OVERLAY_IOCTL:
- * Does the driver support the overlay ioctl.
- */
-
-#define DRM_VMW_PARAM_NUM_STREAMS      0
-#define DRM_VMW_PARAM_NUM_FREE_STREAMS 1
-#define DRM_VMW_PARAM_3D               2
-#define DRM_VMW_PARAM_HW_CAPS          3
-#define DRM_VMW_PARAM_FIFO_CAPS        4
-#define DRM_VMW_PARAM_MAX_FB_SIZE      5
-#define DRM_VMW_PARAM_FIFO_HW_VERSION  6
-#define DRM_VMW_PARAM_MAX_SURF_MEMORY  7
-#define DRM_VMW_PARAM_3D_CAPS_SIZE     8
-#define DRM_VMW_PARAM_MAX_MOB_MEMORY   9
-#define DRM_VMW_PARAM_MAX_MOB_SIZE     10
-#define DRM_VMW_PARAM_SCREEN_TARGET    11
-#define DRM_VMW_PARAM_DX               12
-
-/**
- * enum drm_vmw_handle_type - handle type for ref ioctls
- *
- */
-enum drm_vmw_handle_type {
-	DRM_VMW_HANDLE_LEGACY = 0,
-	DRM_VMW_HANDLE_PRIME = 1
-};
-
-/**
- * struct drm_vmw_getparam_arg
- *
- * @value: Returned value. //Out
- * @param: Parameter to query. //In.
- *
- * Argument to the DRM_VMW_GET_PARAM Ioctl.
- */
-
-struct drm_vmw_getparam_arg {
-	uint64_t value;
-	uint32_t param;
-	uint32_t pad64;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_CREATE_CONTEXT - Create a host context.
- *
- * Allocates a device unique context id, and queues a create context command
- * for the host. Does not wait for host completion.
- */
-
-/**
- * struct drm_vmw_context_arg
- *
- * @cid: Device unique context ID.
- *
- * Output argument to the DRM_VMW_CREATE_CONTEXT Ioctl.
- * Input argument to the DRM_VMW_UNREF_CONTEXT Ioctl.
- */
-
-struct drm_vmw_context_arg {
-	int32_t cid;
-	uint32_t pad64;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_UNREF_CONTEXT - Create a host context.
- *
- * Frees a global context id, and queues a destroy host command for the host.
- * Does not wait for host completion. The context ID can be used directly
- * in the command stream and shows up as the same context ID on the host.
- */
-
-/*************************************************************************/
-/**
- * DRM_VMW_CREATE_SURFACE - Create a host suface.
- *
- * Allocates a device unique surface id, and queues a create surface command
- * for the host. Does not wait for host completion. The surface ID can be
- * used directly in the command stream and shows up as the same surface
- * ID on the host.
- */
-
-/**
- * struct drm_wmv_surface_create_req
- *
- * @flags: Surface flags as understood by the host.
- * @format: Surface format as understood by the host.
- * @mip_levels: Number of mip levels for each face.
- * An unused face should have 0 encoded.
- * @size_addr: Address of a user-space array of sruct drm_vmw_size
- * cast to an uint64_t for 32-64 bit compatibility.
- * The size of the array should equal the total number of mipmap levels.
- * @shareable: Boolean whether other clients (as identified by file descriptors)
- * may reference this surface.
- * @scanout: Boolean whether the surface is intended to be used as a
- * scanout.
- *
- * Input data to the DRM_VMW_CREATE_SURFACE Ioctl.
- * Output data from the DRM_VMW_REF_SURFACE Ioctl.
- */
-
-struct drm_vmw_surface_create_req {
-	uint32_t flags;
-	uint32_t format;
-	uint32_t mip_levels[DRM_VMW_MAX_SURFACE_FACES];
-	uint64_t size_addr;
-	int32_t shareable;
-	int32_t scanout;
-};
-
-/**
- * struct drm_wmv_surface_arg
- *
- * @sid: Surface id of created surface or surface to destroy or reference.
- * @handle_type: Handle type for DRM_VMW_REF_SURFACE Ioctl.
- *
- * Output data from the DRM_VMW_CREATE_SURFACE Ioctl.
- * Input argument to the DRM_VMW_UNREF_SURFACE Ioctl.
- * Input argument to the DRM_VMW_REF_SURFACE Ioctl.
- */
-
-struct drm_vmw_surface_arg {
-	int32_t sid;
-	enum drm_vmw_handle_type handle_type;
-};
-
-/**
- * struct drm_vmw_size ioctl.
- *
- * @width - mip level width
- * @height - mip level height
- * @depth - mip level depth
- *
- * Description of a mip level.
- * Input data to the DRM_WMW_CREATE_SURFACE Ioctl.
- */
-
-struct drm_vmw_size {
-	uint32_t width;
-	uint32_t height;
-	uint32_t depth;
-	uint32_t pad64;
-};
-
-/**
- * union drm_vmw_surface_create_arg
- *
- * @rep: Output data as described above.
- * @req: Input data as described above.
- *
- * Argument to the DRM_VMW_CREATE_SURFACE Ioctl.
- */
-
-union drm_vmw_surface_create_arg {
-	struct drm_vmw_surface_arg rep;
-	struct drm_vmw_surface_create_req req;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_REF_SURFACE - Reference a host surface.
- *
- * Puts a reference on a host surface with a give sid, as previously
- * returned by the DRM_VMW_CREATE_SURFACE ioctl.
- * A reference will make sure the surface isn't destroyed while we hold
- * it and will allow the calling client to use the surface ID in the command
- * stream.
- *
- * On successful return, the Ioctl returns the surface information given
- * in the DRM_VMW_CREATE_SURFACE ioctl.
- */
-
-/**
- * union drm_vmw_surface_reference_arg
- *
- * @rep: Output data as described above.
- * @req: Input data as described above.
- *
- * Argument to the DRM_VMW_REF_SURFACE Ioctl.
- */
-
-union drm_vmw_surface_reference_arg {
-	struct drm_vmw_surface_create_req rep;
-	struct drm_vmw_surface_arg req;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_UNREF_SURFACE - Unreference a host surface.
- *
- * Clear a reference previously put on a host surface.
- * When all references are gone, including the one implicitly placed
- * on creation,
- * a destroy surface command will be queued for the host.
- * Does not wait for completion.
- */
-
-/*************************************************************************/
-/**
- * DRM_VMW_EXECBUF
- *
- * Submit a command buffer for execution on the host, and return a
- * fence seqno that when signaled, indicates that the command buffer has
- * executed.
- */
-
-/**
- * struct drm_vmw_execbuf_arg
- *
- * @commands: User-space address of a command buffer cast to an uint64_t.
- * @command-size: Size in bytes of the command buffer.
- * @throttle-us: Sleep until software is less than @throttle_us
- * microseconds ahead of hardware. The driver may round this value
- * to the nearest kernel tick.
- * @fence_rep: User-space address of a struct drm_vmw_fence_rep cast to an
- * uint64_t.
- * @version: Allows expanding the execbuf ioctl parameters without breaking
- * backwards compatibility, since user-space will always tell the kernel
- * which version it uses.
- * @flags: Execbuf flags. None currently.
- *
- * Argument to the DRM_VMW_EXECBUF Ioctl.
- */
-
-#define DRM_VMW_EXECBUF_VERSION 2
-
-struct drm_vmw_execbuf_arg {
-	uint64_t commands;
-	uint32_t command_size;
-	uint32_t throttle_us;
-	uint64_t fence_rep;
-	uint32_t version;
-	uint32_t flags;
-	uint32_t context_handle;
-	uint32_t pad64;
-};
-
-/**
- * struct drm_vmw_fence_rep
- *
- * @handle: Fence object handle for fence associated with a command submission.
- * @mask: Fence flags relevant for this fence object.
- * @seqno: Fence sequence number in fifo. A fence object with a lower
- * seqno will signal the EXEC flag before a fence object with a higher
- * seqno. This can be used by user-space to avoid kernel calls to determine
- * whether a fence has signaled the EXEC flag. Note that @seqno will
- * wrap at 32-bit.
- * @passed_seqno: The highest seqno number processed by the hardware
- * so far. This can be used to mark user-space fence objects as signaled, and
- * to determine whether a fence seqno might be stale.
- * @error: This member should've been set to -EFAULT on submission.
- * The following actions should be take on completion:
- * error == -EFAULT: Fence communication failed. The host is synchronized.
- * Use the last fence id read from the FIFO fence register.
- * error != 0 && error != -EFAULT:
- * Fence submission failed. The host is synchronized. Use the fence_seq member.
- * error == 0: All is OK, The host may not be synchronized.
- * Use the fence_seq member.
- *
- * Input / Output data to the DRM_VMW_EXECBUF Ioctl.
- */
-
-struct drm_vmw_fence_rep {
-	uint32_t handle;
-	uint32_t mask;
-	uint32_t seqno;
-	uint32_t passed_seqno;
-	uint32_t pad64;
-	int32_t error;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_ALLOC_DMABUF
- *
- * Allocate a DMA buffer that is visible also to the host.
- * NOTE: The buffer is
- * identified by a handle and an offset, which are private to the guest, but
- * useable in the command stream. The guest kernel may translate these
- * and patch up the command stream accordingly. In the future, the offset may
- * be zero at all times, or it may disappear from the interface before it is
- * fixed.
- *
- * The DMA buffer may stay user-space mapped in the guest at all times,
- * and is thus suitable for sub-allocation.
- *
- * DMA buffers are mapped using the mmap() syscall on the drm device.
- */
-
-/**
- * struct drm_vmw_alloc_dmabuf_req
- *
- * @size: Required minimum size of the buffer.
- *
- * Input data to the DRM_VMW_ALLOC_DMABUF Ioctl.
- */
-
-struct drm_vmw_alloc_dmabuf_req {
-	uint32_t size;
-	uint32_t pad64;
-};
-
-/**
- * struct drm_vmw_dmabuf_rep
- *
- * @map_handle: Offset to use in the mmap() call used to map the buffer.
- * @handle: Handle unique to this buffer. Used for unreferencing.
- * @cur_gmr_id: GMR id to use in the command stream when this buffer is
- * referenced. See not above.
- * @cur_gmr_offset: Offset to use in the command stream when this buffer is
- * referenced. See note above.
- *
- * Output data from the DRM_VMW_ALLOC_DMABUF Ioctl.
- */
-
-struct drm_vmw_dmabuf_rep {
-	uint64_t map_handle;
-	uint32_t handle;
-	uint32_t cur_gmr_id;
-	uint32_t cur_gmr_offset;
-	uint32_t pad64;
-};
-
-/**
- * union drm_vmw_dmabuf_arg
- *
- * @req: Input data as described above.
- * @rep: Output data as described above.
- *
- * Argument to the DRM_VMW_ALLOC_DMABUF Ioctl.
- */
-
-union drm_vmw_alloc_dmabuf_arg {
-	struct drm_vmw_alloc_dmabuf_req req;
-	struct drm_vmw_dmabuf_rep rep;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_UNREF_DMABUF - Free a DMA buffer.
- *
- */
-
-/**
- * struct drm_vmw_unref_dmabuf_arg
- *
- * @handle: Handle indicating what buffer to free. Obtained from the
- * DRM_VMW_ALLOC_DMABUF Ioctl.
- *
- * Argument to the DRM_VMW_UNREF_DMABUF Ioctl.
- */
-
-struct drm_vmw_unref_dmabuf_arg {
-	uint32_t handle;
-	uint32_t pad64;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_CONTROL_STREAM - Control overlays, aka streams.
- *
- * This IOCTL controls the overlay units of the svga device.
- * The SVGA overlay units does not work like regular hardware units in
- * that they do not automaticaly read back the contents of the given dma
- * buffer. But instead only read back for each call to this ioctl, and
- * at any point between this call being made and a following call that
- * either changes the buffer or disables the stream.
- */
-
-/**
- * struct drm_vmw_rect
- *
- * Defines a rectangle. Used in the overlay ioctl to define
- * source and destination rectangle.
- */
-
-struct drm_vmw_rect {
-	int32_t x;
-	int32_t y;
-	uint32_t w;
-	uint32_t h;
-};
-
-/**
- * struct drm_vmw_control_stream_arg
- *
- * @stream_id: Stearm to control
- * @enabled: If false all following arguments are ignored.
- * @handle: Handle to buffer for getting data from.
- * @format: Format of the overlay as understood by the host.
- * @width: Width of the overlay.
- * @height: Height of the overlay.
- * @size: Size of the overlay in bytes.
- * @pitch: Array of pitches, the two last are only used for YUV12 formats.
- * @offset: Offset from start of dma buffer to overlay.
- * @src: Source rect, must be within the defined area above.
- * @dst: Destination rect, x and y may be negative.
- *
- * Argument to the DRM_VMW_CONTROL_STREAM Ioctl.
- */
-
-struct drm_vmw_control_stream_arg {
-	uint32_t stream_id;
-	uint32_t enabled;
-
-	uint32_t flags;
-	uint32_t color_key;
-
-	uint32_t handle;
-	uint32_t offset;
-	int32_t format;
-	uint32_t size;
-	uint32_t width;
-	uint32_t height;
-	uint32_t pitch[3];
-
-	uint32_t pad64;
-	struct drm_vmw_rect src;
-	struct drm_vmw_rect dst;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_CURSOR_BYPASS - Give extra information about cursor bypass.
- *
- */
-
-#define DRM_VMW_CURSOR_BYPASS_ALL    (1 << 0)
-#define DRM_VMW_CURSOR_BYPASS_FLAGS       (1)
-
-/**
- * struct drm_vmw_cursor_bypass_arg
- *
- * @flags: Flags.
- * @crtc_id: Crtc id, only used if DMR_CURSOR_BYPASS_ALL isn't passed.
- * @xpos: X position of cursor.
- * @ypos: Y position of cursor.
- * @xhot: X hotspot.
- * @yhot: Y hotspot.
- *
- * Argument to the DRM_VMW_CURSOR_BYPASS Ioctl.
- */
-
-struct drm_vmw_cursor_bypass_arg {
-	uint32_t flags;
-	uint32_t crtc_id;
-	int32_t xpos;
-	int32_t ypos;
-	int32_t xhot;
-	int32_t yhot;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_CLAIM_STREAM - Claim a single stream.
- */
-
-/**
- * struct drm_vmw_context_arg
- *
- * @stream_id: Device unique context ID.
- *
- * Output argument to the DRM_VMW_CREATE_CONTEXT Ioctl.
- * Input argument to the DRM_VMW_UNREF_CONTEXT Ioctl.
- */
-
-struct drm_vmw_stream_arg {
-	uint32_t stream_id;
-	uint32_t pad64;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_UNREF_STREAM - Unclaim a stream.
- *
- * Return a single stream that was claimed by this process. Also makes
- * sure that the stream has been stopped.
- */
-
-/*************************************************************************/
-/**
- * DRM_VMW_GET_3D_CAP
- *
- * Read 3D capabilities from the FIFO
- *
- */
-
-/**
- * struct drm_vmw_get_3d_cap_arg
- *
- * @buffer: Pointer to a buffer for capability data, cast to an uint64_t
- * @size: Max size to copy
- *
- * Input argument to the DRM_VMW_GET_3D_CAP_IOCTL
- * ioctls.
- */
-
-struct drm_vmw_get_3d_cap_arg {
-	uint64_t buffer;
-	uint32_t max_size;
-	uint32_t pad64;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_FENCE_WAIT
- *
- * Waits for a fence object to signal. The wait is interruptible, so that
- * signals may be delivered during the interrupt. The wait may timeout,
- * in which case the calls returns -EBUSY. If the wait is restarted,
- * that is restarting without resetting @cookie_valid to zero,
- * the timeout is computed from the first call.
- *
- * The flags argument to the DRM_VMW_FENCE_WAIT ioctl indicates what to wait
- * on:
- * DRM_VMW_FENCE_FLAG_EXEC: All commands ahead of the fence in the command
- * stream
- * have executed.
- * DRM_VMW_FENCE_FLAG_QUERY: All query results resulting from query finish
- * commands
- * in the buffer given to the EXECBUF ioctl returning the fence object handle
- * are available to user-space.
- *
- * DRM_VMW_WAIT_OPTION_UNREF: If this wait option is given, and the
- * fenc wait ioctl returns 0, the fence object has been unreferenced after
- * the wait.
- */
-
-#define DRM_VMW_FENCE_FLAG_EXEC   (1 << 0)
-#define DRM_VMW_FENCE_FLAG_QUERY  (1 << 1)
-
-#define DRM_VMW_WAIT_OPTION_UNREF (1 << 0)
-
-/**
- * struct drm_vmw_fence_wait_arg
- *
- * @handle: Fence object handle as returned by the DRM_VMW_EXECBUF ioctl.
- * @cookie_valid: Must be reset to 0 on first call. Left alone on restart.
- * @kernel_cookie: Set to 0 on first call. Left alone on restart.
- * @timeout_us: Wait timeout in microseconds. 0 for indefinite timeout.
- * @lazy: Set to 1 if timing is not critical. Allow more than a kernel tick
- * before returning.
- * @flags: Fence flags to wait on.
- * @wait_options: Options that control the behaviour of the wait ioctl.
- *
- * Input argument to the DRM_VMW_FENCE_WAIT ioctl.
- */
-
-struct drm_vmw_fence_wait_arg {
-	uint32_t handle;
-	int32_t  cookie_valid;
-	uint64_t kernel_cookie;
-	uint64_t timeout_us;
-	int32_t lazy;
-	int32_t flags;
-	int32_t wait_options;
-	int32_t pad64;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_FENCE_SIGNALED
- *
- * Checks if a fence object is signaled..
- */
-
-/**
- * struct drm_vmw_fence_signaled_arg
- *
- * @handle: Fence object handle as returned by the DRM_VMW_EXECBUF ioctl.
- * @flags: Fence object flags input to DRM_VMW_FENCE_SIGNALED ioctl
- * @signaled: Out: Flags signaled.
- * @sequence: Out: Highest sequence passed so far. Can be used to signal the
- * EXEC flag of user-space fence objects.
- *
- * Input/Output argument to the DRM_VMW_FENCE_SIGNALED and DRM_VMW_FENCE_UNREF
- * ioctls.
- */
-
-struct drm_vmw_fence_signaled_arg {
-	 uint32_t handle;
-	 uint32_t flags;
-	 int32_t signaled;
-	 uint32_t passed_seqno;
-	 uint32_t signaled_flags;
-	 uint32_t pad64;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_FENCE_UNREF
- *
- * Unreferences a fence object, and causes it to be destroyed if there are no
- * other references to it.
- *
- */
-
-/**
- * struct drm_vmw_fence_arg
- *
- * @handle: Fence object handle as returned by the DRM_VMW_EXECBUF ioctl.
- *
- * Input/Output argument to the DRM_VMW_FENCE_UNREF ioctl..
- */
-
-struct drm_vmw_fence_arg {
-	 uint32_t handle;
-	 uint32_t pad64;
-};
-
-
-/*************************************************************************/
-/**
- * DRM_VMW_FENCE_EVENT
- *
- * Queues an event on a fence to be delivered on the drm character device
- * when the fence has signaled the DRM_VMW_FENCE_FLAG_EXEC flag.
- * Optionally the approximate time when the fence signaled is
- * given by the event.
- */
-
-/*
- * The event type
- */
-#define DRM_VMW_EVENT_FENCE_SIGNALED 0x80000000
-
-struct drm_vmw_event_fence {
-	struct drm_event base;
-	uint64_t user_data;
-	uint32_t tv_sec;
-	uint32_t tv_usec;
-};
-
-/*
- * Flags that may be given to the command.
- */
-/* Request fence signaled time on the event. */
-#define DRM_VMW_FE_FLAG_REQ_TIME (1 << 0)
-
-/**
- * struct drm_vmw_fence_event_arg
- *
- * @fence_rep: Pointer to fence_rep structure cast to uint64_t or 0 if
- * the fence is not supposed to be referenced by user-space.
- * @user_info: Info to be delivered with the event.
- * @handle: Attach the event to this fence only.
- * @flags: A set of flags as defined above.
- */
-struct drm_vmw_fence_event_arg {
-	uint64_t fence_rep;
-	uint64_t user_data;
-	uint32_t handle;
-	uint32_t flags;
-};
-
-
-/*************************************************************************/
-/**
- * DRM_VMW_PRESENT
- *
- * Executes an SVGA present on a given fb for a given surface. The surface
- * is placed on the framebuffer. Cliprects are given relative to the given
- * point (the point disignated by dest_{x|y}).
- *
- */
-
-/**
- * struct drm_vmw_present_arg
- * @fb_id: framebuffer id to present / read back from.
- * @sid: Surface id to present from.
- * @dest_x: X placement coordinate for surface.
- * @dest_y: Y placement coordinate for surface.
- * @clips_ptr: Pointer to an array of clip rects cast to an uint64_t.
- * @num_clips: Number of cliprects given relative to the framebuffer origin,
- * in the same coordinate space as the frame buffer.
- * @pad64: Unused 64-bit padding.
- *
- * Input argument to the DRM_VMW_PRESENT ioctl.
- */
-
-struct drm_vmw_present_arg {
-	uint32_t fb_id;
-	uint32_t sid;
-	int32_t dest_x;
-	int32_t dest_y;
-	uint64_t clips_ptr;
-	uint32_t num_clips;
-	uint32_t pad64;
-};
-
-
-/*************************************************************************/
-/**
- * DRM_VMW_PRESENT_READBACK
- *
- * Executes an SVGA present readback from a given fb to the dma buffer
- * currently bound as the fb. If there is no dma buffer bound to the fb,
- * an error will be returned.
- *
- */
-
-/**
- * struct drm_vmw_present_arg
- * @fb_id: fb_id to present / read back from.
- * @num_clips: Number of cliprects.
- * @clips_ptr: Pointer to an array of clip rects cast to an uint64_t.
- * @fence_rep: Pointer to a struct drm_vmw_fence_rep, cast to an uint64_t.
- * If this member is NULL, then the ioctl should not return a fence.
- */
-
-struct drm_vmw_present_readback_arg {
-	 uint32_t fb_id;
-	 uint32_t num_clips;
-	 uint64_t clips_ptr;
-	 uint64_t fence_rep;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_UPDATE_LAYOUT - Update layout
- *
- * Updates the preferred modes and connection status for connectors. The
- * command consists of one drm_vmw_update_layout_arg pointing to an array
- * of num_outputs drm_vmw_rect's.
- */
-
-/**
- * struct drm_vmw_update_layout_arg
- *
- * @num_outputs: number of active connectors
- * @rects: pointer to array of drm_vmw_rect cast to an uint64_t
- *
- * Input argument to the DRM_VMW_UPDATE_LAYOUT Ioctl.
- */
-struct drm_vmw_update_layout_arg {
-	uint32_t num_outputs;
-	uint32_t pad64;
-	uint64_t rects;
-};
-
-
-/*************************************************************************/
-/**
- * DRM_VMW_CREATE_SHADER - Create shader
- *
- * Creates a shader and optionally binds it to a dma buffer containing
- * the shader byte-code.
- */
-
-/**
- * enum drm_vmw_shader_type - Shader types
- */
-enum drm_vmw_shader_type {
-	drm_vmw_shader_type_vs = 0,
-	drm_vmw_shader_type_ps,
-};
-
-
-/**
- * struct drm_vmw_shader_create_arg
- *
- * @shader_type: Shader type of the shader to create.
- * @size: Size of the byte-code in bytes.
- * where the shader byte-code starts
- * @buffer_handle: Buffer handle identifying the buffer containing the
- * shader byte-code
- * @shader_handle: On successful completion contains a handle that
- * can be used to subsequently identify the shader.
- * @offset: Offset in bytes into the buffer given by @buffer_handle,
- *
- * Input / Output argument to the DRM_VMW_CREATE_SHADER Ioctl.
- */
-struct drm_vmw_shader_create_arg {
-	enum drm_vmw_shader_type shader_type;
-	uint32_t size;
-	uint32_t buffer_handle;
-	uint32_t shader_handle;
-	uint64_t offset;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_UNREF_SHADER - Unreferences a shader
- *
- * Destroys a user-space reference to a shader, optionally destroying
- * it.
- */
-
-/**
- * struct drm_vmw_shader_arg
- *
- * @handle: Handle identifying the shader to destroy.
- *
- * Input argument to the DRM_VMW_UNREF_SHADER ioctl.
- */
-struct drm_vmw_shader_arg {
-	uint32_t handle;
-	uint32_t pad64;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_GB_SURFACE_CREATE - Create a host guest-backed surface.
- *
- * Allocates a surface handle and queues a create surface command
- * for the host on the first use of the surface. The surface ID can
- * be used as the surface ID in commands referencing the surface.
- */
-
-/**
- * enum drm_vmw_surface_flags
- *
- * @drm_vmw_surface_flag_shareable:     Whether the surface is shareable
- * @drm_vmw_surface_flag_scanout:       Whether the surface is a scanout
- *                                      surface.
- * @drm_vmw_surface_flag_create_buffer: Create a backup buffer if none is
- *                                      given.
- */
-enum drm_vmw_surface_flags {
-	drm_vmw_surface_flag_shareable = (1 << 0),
-	drm_vmw_surface_flag_scanout = (1 << 1),
-	drm_vmw_surface_flag_create_buffer = (1 << 2)
-};
-
-/**
- * struct drm_vmw_gb_surface_create_req
- *
- * @svga3d_flags:     SVGA3d surface flags for the device.
- * @format:           SVGA3d format.
- * @mip_level:        Number of mip levels for all faces.
- * @drm_surface_flags Flags as described above.
- * @multisample_count Future use. Set to 0.
- * @autogen_filter    Future use. Set to 0.
- * @buffer_handle     Buffer handle of backup buffer. SVGA3D_INVALID_ID
- *                    if none.
- * @base_size         Size of the base mip level for all faces.
- * @array_size        Must be zero for non-DX hardware, and if non-zero
- *                    svga3d_flags must have proper bind flags setup.
- *
- * Input argument to the  DRM_VMW_GB_SURFACE_CREATE Ioctl.
- * Part of output argument for the DRM_VMW_GB_SURFACE_REF Ioctl.
- */
-struct drm_vmw_gb_surface_create_req {
-	uint32_t svga3d_flags;
-	uint32_t format;
-	uint32_t mip_levels;
-	enum drm_vmw_surface_flags drm_surface_flags;
-	uint32_t multisample_count;
-	uint32_t autogen_filter;
-	uint32_t buffer_handle;
-	uint32_t array_size;
-	struct drm_vmw_size base_size;
-};
-
-/**
- * struct drm_vmw_gb_surface_create_rep
- *
- * @handle:            Surface handle.
- * @backup_size:       Size of backup buffers for this surface.
- * @buffer_handle:     Handle of backup buffer. SVGA3D_INVALID_ID if none.
- * @buffer_size:       Actual size of the buffer identified by
- *                     @buffer_handle
- * @buffer_map_handle: Offset into device address space for the buffer
- *                     identified by @buffer_handle.
- *
- * Part of output argument for the DRM_VMW_GB_SURFACE_REF ioctl.
- * Output argument for the DRM_VMW_GB_SURFACE_CREATE ioctl.
- */
-struct drm_vmw_gb_surface_create_rep {
-	uint32_t handle;
-	uint32_t backup_size;
-	uint32_t buffer_handle;
-	uint32_t buffer_size;
-	uint64_t buffer_map_handle;
-};
-
-/**
- * union drm_vmw_gb_surface_create_arg
- *
- * @req: Input argument as described above.
- * @rep: Output argument as described above.
- *
- * Argument to the DRM_VMW_GB_SURFACE_CREATE ioctl.
- */
-union drm_vmw_gb_surface_create_arg {
-	struct drm_vmw_gb_surface_create_rep rep;
-	struct drm_vmw_gb_surface_create_req req;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_GB_SURFACE_REF - Reference a host surface.
- *
- * Puts a reference on a host surface with a given handle, as previously
- * returned by the DRM_VMW_GB_SURFACE_CREATE ioctl.
- * A reference will make sure the surface isn't destroyed while we hold
- * it and will allow the calling client to use the surface handle in
- * the command stream.
- *
- * On successful return, the Ioctl returns the surface information given
- * to and returned from the DRM_VMW_GB_SURFACE_CREATE ioctl.
- */
-
-/**
- * struct drm_vmw_gb_surface_reference_arg
- *
- * @creq: The data used as input when the surface was created, as described
- *        above at "struct drm_vmw_gb_surface_create_req"
- * @crep: Additional data output when the surface was created, as described
- *        above at "struct drm_vmw_gb_surface_create_rep"
- *
- * Output Argument to the DRM_VMW_GB_SURFACE_REF ioctl.
- */
-struct drm_vmw_gb_surface_ref_rep {
-	struct drm_vmw_gb_surface_create_req creq;
-	struct drm_vmw_gb_surface_create_rep crep;
-};
-
-/**
- * union drm_vmw_gb_surface_reference_arg
- *
- * @req: Input data as described above at "struct drm_vmw_surface_arg"
- * @rep: Output data as described above at "struct drm_vmw_gb_surface_ref_rep"
- *
- * Argument to the DRM_VMW_GB_SURFACE_REF Ioctl.
- */
-union drm_vmw_gb_surface_reference_arg {
-	struct drm_vmw_gb_surface_ref_rep rep;
-	struct drm_vmw_surface_arg req;
-};
-
-
-/*************************************************************************/
-/**
- * DRM_VMW_SYNCCPU - Sync a DMA buffer / MOB for CPU access.
- *
- * Idles any previously submitted GPU operations on the buffer and
- * by default blocks command submissions that reference the buffer.
- * If the file descriptor used to grab a blocking CPU sync is closed, the
- * cpu sync is released.
- * The flags argument indicates how the grab / release operation should be
- * performed:
- */
-
-/**
- * enum drm_vmw_synccpu_flags - Synccpu flags:
- *
- * @drm_vmw_synccpu_read: Sync for read. If sync is done for read only, it's a
- * hint to the kernel to allow command submissions that references the buffer
- * for read-only.
- * @drm_vmw_synccpu_write: Sync for write. Block all command submissions
- * referencing this buffer.
- * @drm_vmw_synccpu_dontblock: Dont wait for GPU idle, but rather return
- * -EBUSY should the buffer be busy.
- * @drm_vmw_synccpu_allow_cs: Allow command submission that touches the buffer
- * while the buffer is synced for CPU. This is similar to the GEM bo idle
- * behavior.
- */
-enum drm_vmw_synccpu_flags {
-	drm_vmw_synccpu_read = (1 << 0),
-	drm_vmw_synccpu_write = (1 << 1),
-	drm_vmw_synccpu_dontblock = (1 << 2),
-	drm_vmw_synccpu_allow_cs = (1 << 3)
-};
-
-/**
- * enum drm_vmw_synccpu_op - Synccpu operations:
- *
- * @drm_vmw_synccpu_grab:    Grab the buffer for CPU operations
- * @drm_vmw_synccpu_release: Release a previous grab.
- */
-enum drm_vmw_synccpu_op {
-	drm_vmw_synccpu_grab,
-	drm_vmw_synccpu_release
-};
-
-/**
- * struct drm_vmw_synccpu_arg
- *
- * @op:			     The synccpu operation as described above.
- * @handle:		     Handle identifying the buffer object.
- * @flags:		     Flags as described above.
- */
-struct drm_vmw_synccpu_arg {
-	enum drm_vmw_synccpu_op op;
-	enum drm_vmw_synccpu_flags flags;
-	uint32_t handle;
-	uint32_t pad64;
-};
-
-/*************************************************************************/
-/**
- * DRM_VMW_CREATE_EXTENDED_CONTEXT - Create a host context.
- *
- * Allocates a device unique context id, and queues a create context command
- * for the host. Does not wait for host completion.
- */
-enum drm_vmw_extended_context {
-	drm_vmw_context_legacy,
-	drm_vmw_context_dx
-};
-
-/**
- * union drm_vmw_extended_context_arg
- *
- * @req: Context type.
- * @rep: Context identifier.
- *
- * Argument to the DRM_VMW_CREATE_EXTENDED_CONTEXT Ioctl.
- */
-union drm_vmw_extended_context_arg {
-	enum drm_vmw_extended_context req;
-	struct drm_vmw_context_arg rep;
-};
-#endif
diff --git a/openflow/usr/include/elf.h b/openflow/usr/include/elf.h
deleted file mode 100644
index c5c9423..0000000
--- a/openflow/usr/include/elf.h
+++ /dev/null
@@ -1,3503 +0,0 @@
-/* This file defines standard ELF types, structures, and macros.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ELF_H
-#define	_ELF_H 1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* Standard ELF types.  */
-
-#include <stdint.h>
-
-/* Type for a 16-bit quantity.  */
-typedef uint16_t Elf32_Half;
-typedef uint16_t Elf64_Half;
-
-/* Types for signed and unsigned 32-bit quantities.  */
-typedef uint32_t Elf32_Word;
-typedef	int32_t  Elf32_Sword;
-typedef uint32_t Elf64_Word;
-typedef	int32_t  Elf64_Sword;
-
-/* Types for signed and unsigned 64-bit quantities.  */
-typedef uint64_t Elf32_Xword;
-typedef	int64_t  Elf32_Sxword;
-typedef uint64_t Elf64_Xword;
-typedef	int64_t  Elf64_Sxword;
-
-/* Type of addresses.  */
-typedef uint32_t Elf32_Addr;
-typedef uint64_t Elf64_Addr;
-
-/* Type of file offsets.  */
-typedef uint32_t Elf32_Off;
-typedef uint64_t Elf64_Off;
-
-/* Type for section indices, which are 16-bit quantities.  */
-typedef uint16_t Elf32_Section;
-typedef uint16_t Elf64_Section;
-
-/* Type for version symbol information.  */
-typedef Elf32_Half Elf32_Versym;
-typedef Elf64_Half Elf64_Versym;
-
-
-/* The ELF file header.  This appears at the start of every ELF file.  */
-
-#define EI_NIDENT (16)
-
-typedef struct
-{
-  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
-  Elf32_Half	e_type;			/* Object file type */
-  Elf32_Half	e_machine;		/* Architecture */
-  Elf32_Word	e_version;		/* Object file version */
-  Elf32_Addr	e_entry;		/* Entry point virtual address */
-  Elf32_Off	e_phoff;		/* Program header table file offset */
-  Elf32_Off	e_shoff;		/* Section header table file offset */
-  Elf32_Word	e_flags;		/* Processor-specific flags */
-  Elf32_Half	e_ehsize;		/* ELF header size in bytes */
-  Elf32_Half	e_phentsize;		/* Program header table entry size */
-  Elf32_Half	e_phnum;		/* Program header table entry count */
-  Elf32_Half	e_shentsize;		/* Section header table entry size */
-  Elf32_Half	e_shnum;		/* Section header table entry count */
-  Elf32_Half	e_shstrndx;		/* Section header string table index */
-} Elf32_Ehdr;
-
-typedef struct
-{
-  unsigned char	e_ident[EI_NIDENT];	/* Magic number and other info */
-  Elf64_Half	e_type;			/* Object file type */
-  Elf64_Half	e_machine;		/* Architecture */
-  Elf64_Word	e_version;		/* Object file version */
-  Elf64_Addr	e_entry;		/* Entry point virtual address */
-  Elf64_Off	e_phoff;		/* Program header table file offset */
-  Elf64_Off	e_shoff;		/* Section header table file offset */
-  Elf64_Word	e_flags;		/* Processor-specific flags */
-  Elf64_Half	e_ehsize;		/* ELF header size in bytes */
-  Elf64_Half	e_phentsize;		/* Program header table entry size */
-  Elf64_Half	e_phnum;		/* Program header table entry count */
-  Elf64_Half	e_shentsize;		/* Section header table entry size */
-  Elf64_Half	e_shnum;		/* Section header table entry count */
-  Elf64_Half	e_shstrndx;		/* Section header string table index */
-} Elf64_Ehdr;
-
-/* Fields in the e_ident array.  The EI_* macros are indices into the
-   array.  The macros under each EI_* macro are the values the byte
-   may have.  */
-
-#define EI_MAG0		0		/* File identification byte 0 index */
-#define ELFMAG0		0x7f		/* Magic number byte 0 */
-
-#define EI_MAG1		1		/* File identification byte 1 index */
-#define ELFMAG1		'E'		/* Magic number byte 1 */
-
-#define EI_MAG2		2		/* File identification byte 2 index */
-#define ELFMAG2		'L'		/* Magic number byte 2 */
-
-#define EI_MAG3		3		/* File identification byte 3 index */
-#define ELFMAG3		'F'		/* Magic number byte 3 */
-
-/* Conglomeration of the identification bytes, for easy testing as a word.  */
-#define	ELFMAG		"\177ELF"
-#define	SELFMAG		4
-
-#define EI_CLASS	4		/* File class byte index */
-#define ELFCLASSNONE	0		/* Invalid class */
-#define ELFCLASS32	1		/* 32-bit objects */
-#define ELFCLASS64	2		/* 64-bit objects */
-#define ELFCLASSNUM	3
-
-#define EI_DATA		5		/* Data encoding byte index */
-#define ELFDATANONE	0		/* Invalid data encoding */
-#define ELFDATA2LSB	1		/* 2's complement, little endian */
-#define ELFDATA2MSB	2		/* 2's complement, big endian */
-#define ELFDATANUM	3
-
-#define EI_VERSION	6		/* File version byte index */
-					/* Value must be EV_CURRENT */
-
-#define EI_OSABI	7		/* OS ABI identification */
-#define ELFOSABI_NONE		0	/* UNIX System V ABI */
-#define ELFOSABI_SYSV		0	/* Alias.  */
-#define ELFOSABI_HPUX		1	/* HP-UX */
-#define ELFOSABI_NETBSD		2	/* NetBSD.  */
-#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
-#define ELFOSABI_LINUX		ELFOSABI_GNU /* Compatibility alias.  */
-#define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
-#define ELFOSABI_AIX		7	/* IBM AIX.  */
-#define ELFOSABI_IRIX		8	/* SGI Irix.  */
-#define ELFOSABI_FREEBSD	9	/* FreeBSD.  */
-#define ELFOSABI_TRU64		10	/* Compaq TRU64 UNIX.  */
-#define ELFOSABI_MODESTO	11	/* Novell Modesto.  */
-#define ELFOSABI_OPENBSD	12	/* OpenBSD.  */
-#define ELFOSABI_ARM_AEABI	64	/* ARM EABI */
-#define ELFOSABI_ARM		97	/* ARM */
-#define ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
-
-#define EI_ABIVERSION	8		/* ABI version */
-
-#define EI_PAD		9		/* Byte index of padding bytes */
-
-/* Legal values for e_type (object file type).  */
-
-#define ET_NONE		0		/* No file type */
-#define ET_REL		1		/* Relocatable file */
-#define ET_EXEC		2		/* Executable file */
-#define ET_DYN		3		/* Shared object file */
-#define ET_CORE		4		/* Core file */
-#define	ET_NUM		5		/* Number of defined types */
-#define ET_LOOS		0xfe00		/* OS-specific range start */
-#define ET_HIOS		0xfeff		/* OS-specific range end */
-#define ET_LOPROC	0xff00		/* Processor-specific range start */
-#define ET_HIPROC	0xffff		/* Processor-specific range end */
-
-/* Legal values for e_machine (architecture).  */
-
-#define EM_NONE		 0		/* No machine */
-#define EM_M32		 1		/* AT&T WE 32100 */
-#define EM_SPARC	 2		/* SUN SPARC */
-#define EM_386		 3		/* Intel 80386 */
-#define EM_68K		 4		/* Motorola m68k family */
-#define EM_88K		 5		/* Motorola m88k family */
-#define EM_860		 7		/* Intel 80860 */
-#define EM_MIPS		 8		/* MIPS R3000 big-endian */
-#define EM_S370		 9		/* IBM System/370 */
-#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
-
-#define EM_PARISC	15		/* HPPA */
-#define EM_VPP500	17		/* Fujitsu VPP500 */
-#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
-#define EM_960		19		/* Intel 80960 */
-#define EM_PPC		20		/* PowerPC */
-#define EM_PPC64	21		/* PowerPC 64-bit */
-#define EM_S390		22		/* IBM S390 */
-
-#define EM_V800		36		/* NEC V800 series */
-#define EM_FR20		37		/* Fujitsu FR20 */
-#define EM_RH32		38		/* TRW RH-32 */
-#define EM_RCE		39		/* Motorola RCE */
-#define EM_ARM		40		/* ARM */
-#define EM_FAKE_ALPHA	41		/* Digital Alpha */
-#define EM_SH		42		/* Hitachi SH */
-#define EM_SPARCV9	43		/* SPARC v9 64-bit */
-#define EM_TRICORE	44		/* Siemens Tricore */
-#define EM_ARC		45		/* Argonaut RISC Core */
-#define EM_H8_300	46		/* Hitachi H8/300 */
-#define EM_H8_300H	47		/* Hitachi H8/300H */
-#define EM_H8S		48		/* Hitachi H8S */
-#define EM_H8_500	49		/* Hitachi H8/500 */
-#define EM_IA_64	50		/* Intel Merced */
-#define EM_MIPS_X	51		/* Stanford MIPS-X */
-#define EM_COLDFIRE	52		/* Motorola Coldfire */
-#define EM_68HC12	53		/* Motorola M68HC12 */
-#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
-#define EM_PCP		55		/* Siemens PCP */
-#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
-#define EM_NDR1		57		/* Denso NDR1 microprocessor */
-#define EM_STARCORE	58		/* Motorola Start*Core processor */
-#define EM_ME16		59		/* Toyota ME16 processor */
-#define EM_ST100	60		/* STMicroelectronic ST100 processor */
-#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
-#define EM_X86_64	62		/* AMD x86-64 architecture */
-#define EM_PDSP		63		/* Sony DSP Processor */
-
-#define EM_FX66		66		/* Siemens FX66 microcontroller */
-#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
-#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
-#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
-#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
-#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
-#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
-#define EM_SVX		73		/* Silicon Graphics SVx */
-#define EM_ST19		74		/* STMicroelectronics ST19 8 bit mc */
-#define EM_VAX		75		/* Digital VAX */
-#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
-#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
-#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
-#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
-#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
-#define EM_HUANY	81		/* Harvard University machine-independent object files */
-#define EM_PRISM	82		/* SiTera Prism */
-#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
-#define EM_FR30		84		/* Fujitsu FR30 */
-#define EM_D10V		85		/* Mitsubishi D10V */
-#define EM_D30V		86		/* Mitsubishi D30V */
-#define EM_V850		87		/* NEC v850 */
-#define EM_M32R		88		/* Mitsubishi M32R */
-#define EM_MN10300	89		/* Matsushita MN10300 */
-#define EM_MN10200	90		/* Matsushita MN10200 */
-#define EM_PJ		91		/* picoJava */
-#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
-#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
-#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
-#define EM_ALTERA_NIOS2 113		/* Altera Nios II */
-#define EM_AARCH64	183		/* ARM AARCH64 */
-#define EM_TILEPRO	188		/* Tilera TILEPro */
-#define EM_MICROBLAZE	189		/* Xilinx MicroBlaze */
-#define EM_TILEGX	191		/* Tilera TILE-Gx */
-#define EM_NUM		192
-
-/* If it is necessary to assign new unofficial EM_* values, please
-   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
-   chances of collision with official or non-GNU unofficial values.  */
-
-#define EM_ALPHA	0x9026
-
-/* Legal values for e_version (version).  */
-
-#define EV_NONE		0		/* Invalid ELF version */
-#define EV_CURRENT	1		/* Current version */
-#define EV_NUM		2
-
-/* Section header.  */
-
-typedef struct
-{
-  Elf32_Word	sh_name;		/* Section name (string tbl index) */
-  Elf32_Word	sh_type;		/* Section type */
-  Elf32_Word	sh_flags;		/* Section flags */
-  Elf32_Addr	sh_addr;		/* Section virtual addr at execution */
-  Elf32_Off	sh_offset;		/* Section file offset */
-  Elf32_Word	sh_size;		/* Section size in bytes */
-  Elf32_Word	sh_link;		/* Link to another section */
-  Elf32_Word	sh_info;		/* Additional section information */
-  Elf32_Word	sh_addralign;		/* Section alignment */
-  Elf32_Word	sh_entsize;		/* Entry size if section holds table */
-} Elf32_Shdr;
-
-typedef struct
-{
-  Elf64_Word	sh_name;		/* Section name (string tbl index) */
-  Elf64_Word	sh_type;		/* Section type */
-  Elf64_Xword	sh_flags;		/* Section flags */
-  Elf64_Addr	sh_addr;		/* Section virtual addr at execution */
-  Elf64_Off	sh_offset;		/* Section file offset */
-  Elf64_Xword	sh_size;		/* Section size in bytes */
-  Elf64_Word	sh_link;		/* Link to another section */
-  Elf64_Word	sh_info;		/* Additional section information */
-  Elf64_Xword	sh_addralign;		/* Section alignment */
-  Elf64_Xword	sh_entsize;		/* Entry size if section holds table */
-} Elf64_Shdr;
-
-/* Special section indices.  */
-
-#define SHN_UNDEF	0		/* Undefined section */
-#define SHN_LORESERVE	0xff00		/* Start of reserved indices */
-#define SHN_LOPROC	0xff00		/* Start of processor-specific */
-#define SHN_BEFORE	0xff00		/* Order section before all others
-					   (Solaris).  */
-#define SHN_AFTER	0xff01		/* Order section after all others
-					   (Solaris).  */
-#define SHN_HIPROC	0xff1f		/* End of processor-specific */
-#define SHN_LOOS	0xff20		/* Start of OS-specific */
-#define SHN_HIOS	0xff3f		/* End of OS-specific */
-#define SHN_ABS		0xfff1		/* Associated symbol is absolute */
-#define SHN_COMMON	0xfff2		/* Associated symbol is common */
-#define SHN_XINDEX	0xffff		/* Index is in extra table.  */
-#define SHN_HIRESERVE	0xffff		/* End of reserved indices */
-
-/* Legal values for sh_type (section type).  */
-
-#define SHT_NULL	  0		/* Section header table entry unused */
-#define SHT_PROGBITS	  1		/* Program data */
-#define SHT_SYMTAB	  2		/* Symbol table */
-#define SHT_STRTAB	  3		/* String table */
-#define SHT_RELA	  4		/* Relocation entries with addends */
-#define SHT_HASH	  5		/* Symbol hash table */
-#define SHT_DYNAMIC	  6		/* Dynamic linking information */
-#define SHT_NOTE	  7		/* Notes */
-#define SHT_NOBITS	  8		/* Program space with no data (bss) */
-#define SHT_REL		  9		/* Relocation entries, no addends */
-#define SHT_SHLIB	  10		/* Reserved */
-#define SHT_DYNSYM	  11		/* Dynamic linker symbol table */
-#define SHT_INIT_ARRAY	  14		/* Array of constructors */
-#define SHT_FINI_ARRAY	  15		/* Array of destructors */
-#define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
-#define SHT_GROUP	  17		/* Section group */
-#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
-#define	SHT_NUM		  19		/* Number of defined types.  */
-#define SHT_LOOS	  0x60000000	/* Start OS-specific.  */
-#define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes.  */
-#define SHT_GNU_HASH	  0x6ffffff6	/* GNU-style hash table.  */
-#define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
-#define SHT_CHECKSUM	  0x6ffffff8	/* Checksum for DSO content.  */
-#define SHT_LOSUNW	  0x6ffffffa	/* Sun-specific low bound.  */
-#define SHT_SUNW_move	  0x6ffffffa
-#define SHT_SUNW_COMDAT   0x6ffffffb
-#define SHT_SUNW_syminfo  0x6ffffffc
-#define SHT_GNU_verdef	  0x6ffffffd	/* Version definition section.  */
-#define SHT_GNU_verneed	  0x6ffffffe	/* Version needs section.  */
-#define SHT_GNU_versym	  0x6fffffff	/* Version symbol table.  */
-#define SHT_HISUNW	  0x6fffffff	/* Sun-specific high bound.  */
-#define SHT_HIOS	  0x6fffffff	/* End OS-specific type */
-#define SHT_LOPROC	  0x70000000	/* Start of processor-specific */
-#define SHT_HIPROC	  0x7fffffff	/* End of processor-specific */
-#define SHT_LOUSER	  0x80000000	/* Start of application-specific */
-#define SHT_HIUSER	  0x8fffffff	/* End of application-specific */
-
-/* Legal values for sh_flags (section flags).  */
-
-#define SHF_WRITE	     (1 << 0)	/* Writable */
-#define SHF_ALLOC	     (1 << 1)	/* Occupies memory during execution */
-#define SHF_EXECINSTR	     (1 << 2)	/* Executable */
-#define SHF_MERGE	     (1 << 4)	/* Might be merged */
-#define SHF_STRINGS	     (1 << 5)	/* Contains nul-terminated strings */
-#define SHF_INFO_LINK	     (1 << 6)	/* `sh_info' contains SHT index */
-#define SHF_LINK_ORDER	     (1 << 7)	/* Preserve order after combining */
-#define SHF_OS_NONCONFORMING (1 << 8)	/* Non-standard OS specific handling
-					   required */
-#define SHF_GROUP	     (1 << 9)	/* Section is member of a group.  */
-#define SHF_TLS		     (1 << 10)	/* Section hold thread-local data.  */
-#define SHF_COMPRESSED	     (1 << 11)	/* Section with compressed data. */
-#define SHF_MASKOS	     0x0ff00000	/* OS-specific.  */
-#define SHF_MASKPROC	     0xf0000000	/* Processor-specific */
-#define SHF_ORDERED	     (1 << 30)	/* Special ordering requirement
-					   (Solaris).  */
-#define SHF_EXCLUDE	     (1U << 31)	/* Section is excluded unless
-					   referenced or allocated (Solaris).*/
-
-/* Section compression header.  Used when SHF_COMPRESSED is set.  */
-
-typedef struct
-{
-  Elf32_Word	ch_type;	/* Compression format.  */
-  Elf32_Word	ch_size;	/* Uncompressed data size.  */
-  Elf32_Word	ch_addralign;	/* Uncompressed data alignment.  */
-} Elf32_Chdr;
-
-typedef struct
-{
-  Elf64_Word	ch_type;	/* Compression format.  */
-  Elf64_Word	ch_reserved;
-  Elf64_Xword	ch_size;	/* Uncompressed data size.  */
-  Elf64_Xword	ch_addralign;	/* Uncompressed data alignment.  */
-} Elf64_Chdr;
-
-/* Legal values for ch_type (compression algorithm).  */
-#define ELFCOMPRESS_ZLIB	1	   /* ZLIB/DEFLATE algorithm.  */
-#define ELFCOMPRESS_LOOS	0x60000000 /* Start of OS-specific.  */
-#define ELFCOMPRESS_HIOS	0x6fffffff /* End of OS-specific.  */
-#define ELFCOMPRESS_LOPROC	0x70000000 /* Start of processor-specific.  */
-#define ELFCOMPRESS_HIPROC	0x7fffffff /* End of processor-specific.  */
-
-/* Section group handling.  */
-#define GRP_COMDAT	0x1		/* Mark group as COMDAT.  */
-
-/* Symbol table entry.  */
-
-typedef struct
-{
-  Elf32_Word	st_name;		/* Symbol name (string tbl index) */
-  Elf32_Addr	st_value;		/* Symbol value */
-  Elf32_Word	st_size;		/* Symbol size */
-  unsigned char	st_info;		/* Symbol type and binding */
-  unsigned char	st_other;		/* Symbol visibility */
-  Elf32_Section	st_shndx;		/* Section index */
-} Elf32_Sym;
-
-typedef struct
-{
-  Elf64_Word	st_name;		/* Symbol name (string tbl index) */
-  unsigned char	st_info;		/* Symbol type and binding */
-  unsigned char st_other;		/* Symbol visibility */
-  Elf64_Section	st_shndx;		/* Section index */
-  Elf64_Addr	st_value;		/* Symbol value */
-  Elf64_Xword	st_size;		/* Symbol size */
-} Elf64_Sym;
-
-/* The syminfo section if available contains additional information about
-   every dynamic symbol.  */
-
-typedef struct
-{
-  Elf32_Half si_boundto;		/* Direct bindings, symbol bound to */
-  Elf32_Half si_flags;			/* Per symbol flags */
-} Elf32_Syminfo;
-
-typedef struct
-{
-  Elf64_Half si_boundto;		/* Direct bindings, symbol bound to */
-  Elf64_Half si_flags;			/* Per symbol flags */
-} Elf64_Syminfo;
-
-/* Possible values for si_boundto.  */
-#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
-#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
-#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
-
-/* Possible bitmasks for si_flags.  */
-#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
-#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
-#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
-#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy
-					   loaded */
-/* Syminfo version values.  */
-#define SYMINFO_NONE		0
-#define SYMINFO_CURRENT		1
-#define SYMINFO_NUM		2
-
-
-/* How to extract and insert information held in the st_info field.  */
-
-#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
-#define ELF32_ST_TYPE(val)		((val) & 0xf)
-#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
-
-/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
-#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
-#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
-#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
-
-/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
-
-#define STB_LOCAL	0		/* Local symbol */
-#define STB_GLOBAL	1		/* Global symbol */
-#define STB_WEAK	2		/* Weak symbol */
-#define	STB_NUM		3		/* Number of defined types.  */
-#define STB_LOOS	10		/* Start of OS-specific */
-#define STB_GNU_UNIQUE	10		/* Unique symbol.  */
-#define STB_HIOS	12		/* End of OS-specific */
-#define STB_LOPROC	13		/* Start of processor-specific */
-#define STB_HIPROC	15		/* End of processor-specific */
-
-/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-
-#define STT_NOTYPE	0		/* Symbol type is unspecified */
-#define STT_OBJECT	1		/* Symbol is a data object */
-#define STT_FUNC	2		/* Symbol is a code object */
-#define STT_SECTION	3		/* Symbol associated with a section */
-#define STT_FILE	4		/* Symbol's name is file name */
-#define STT_COMMON	5		/* Symbol is a common data object */
-#define STT_TLS		6		/* Symbol is thread-local data object*/
-#define	STT_NUM		7		/* Number of defined types.  */
-#define STT_LOOS	10		/* Start of OS-specific */
-#define STT_GNU_IFUNC	10		/* Symbol is indirect code object */
-#define STT_HIOS	12		/* End of OS-specific */
-#define STT_LOPROC	13		/* Start of processor-specific */
-#define STT_HIPROC	15		/* End of processor-specific */
-
-
-/* Symbol table indices are found in the hash buckets and chain table
-   of a symbol hash table section.  This special index value indicates
-   the end of a chain, meaning no further symbols are found in that bucket.  */
-
-#define STN_UNDEF	0		/* End of a chain.  */
-
-
-/* How to extract and insert information held in the st_other field.  */
-
-#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
-
-/* For ELF64 the definitions are the same.  */
-#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
-
-/* Symbol visibility specification encoded in the st_other field.  */
-#define STV_DEFAULT	0		/* Default symbol visibility rules */
-#define STV_INTERNAL	1		/* Processor specific hidden class */
-#define STV_HIDDEN	2		/* Sym unavailable in other modules */
-#define STV_PROTECTED	3		/* Not preemptible, not exported */
-
-
-/* Relocation table entry without addend (in section of type SHT_REL).  */
-
-typedef struct
-{
-  Elf32_Addr	r_offset;		/* Address */
-  Elf32_Word	r_info;			/* Relocation type and symbol index */
-} Elf32_Rel;
-
-/* I have seen two different definitions of the Elf64_Rel and
-   Elf64_Rela structures, so we'll leave them out until Novell (or
-   whoever) gets their act together.  */
-/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
-
-typedef struct
-{
-  Elf64_Addr	r_offset;		/* Address */
-  Elf64_Xword	r_info;			/* Relocation type and symbol index */
-} Elf64_Rel;
-
-/* Relocation table entry with addend (in section of type SHT_RELA).  */
-
-typedef struct
-{
-  Elf32_Addr	r_offset;		/* Address */
-  Elf32_Word	r_info;			/* Relocation type and symbol index */
-  Elf32_Sword	r_addend;		/* Addend */
-} Elf32_Rela;
-
-typedef struct
-{
-  Elf64_Addr	r_offset;		/* Address */
-  Elf64_Xword	r_info;			/* Relocation type and symbol index */
-  Elf64_Sxword	r_addend;		/* Addend */
-} Elf64_Rela;
-
-/* How to extract and insert information held in the r_info field.  */
-
-#define ELF32_R_SYM(val)		((val) >> 8)
-#define ELF32_R_TYPE(val)		((val) & 0xff)
-#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
-
-#define ELF64_R_SYM(i)			((i) >> 32)
-#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
-#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
-
-/* Program segment header.  */
-
-typedef struct
-{
-  Elf32_Word	p_type;			/* Segment type */
-  Elf32_Off	p_offset;		/* Segment file offset */
-  Elf32_Addr	p_vaddr;		/* Segment virtual address */
-  Elf32_Addr	p_paddr;		/* Segment physical address */
-  Elf32_Word	p_filesz;		/* Segment size in file */
-  Elf32_Word	p_memsz;		/* Segment size in memory */
-  Elf32_Word	p_flags;		/* Segment flags */
-  Elf32_Word	p_align;		/* Segment alignment */
-} Elf32_Phdr;
-
-typedef struct
-{
-  Elf64_Word	p_type;			/* Segment type */
-  Elf64_Word	p_flags;		/* Segment flags */
-  Elf64_Off	p_offset;		/* Segment file offset */
-  Elf64_Addr	p_vaddr;		/* Segment virtual address */
-  Elf64_Addr	p_paddr;		/* Segment physical address */
-  Elf64_Xword	p_filesz;		/* Segment size in file */
-  Elf64_Xword	p_memsz;		/* Segment size in memory */
-  Elf64_Xword	p_align;		/* Segment alignment */
-} Elf64_Phdr;
-
-/* Special value for e_phnum.  This indicates that the real number of
-   program headers is too large to fit into e_phnum.  Instead the real
-   value is in the field sh_info of section 0.  */
-
-#define PN_XNUM		0xffff
-
-/* Legal values for p_type (segment type).  */
-
-#define	PT_NULL		0		/* Program header table entry unused */
-#define PT_LOAD		1		/* Loadable program segment */
-#define PT_DYNAMIC	2		/* Dynamic linking information */
-#define PT_INTERP	3		/* Program interpreter */
-#define PT_NOTE		4		/* Auxiliary information */
-#define PT_SHLIB	5		/* Reserved */
-#define PT_PHDR		6		/* Entry for header table itself */
-#define PT_TLS		7		/* Thread-local storage segment */
-#define	PT_NUM		8		/* Number of defined types */
-#define PT_LOOS		0x60000000	/* Start of OS-specific */
-#define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
-#define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
-#define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-#define PT_LOSUNW	0x6ffffffa
-#define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
-#define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-#define PT_HISUNW	0x6fffffff
-#define PT_HIOS		0x6fffffff	/* End of OS-specific */
-#define PT_LOPROC	0x70000000	/* Start of processor-specific */
-#define PT_HIPROC	0x7fffffff	/* End of processor-specific */
-
-/* Legal values for p_flags (segment flags).  */
-
-#define PF_X		(1 << 0)	/* Segment is executable */
-#define PF_W		(1 << 1)	/* Segment is writable */
-#define PF_R		(1 << 2)	/* Segment is readable */
-#define PF_MASKOS	0x0ff00000	/* OS-specific */
-#define PF_MASKPROC	0xf0000000	/* Processor-specific */
-
-/* Legal values for note segment descriptor types for core files. */
-
-#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
-#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
-#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
-#define NT_PRXREG	4		/* Contains copy of prxregset struct */
-#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
-#define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
-#define NT_AUXV		6		/* Contains copy of auxv array */
-#define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
-#define NT_ASRS		8		/* Contains copy of asrset struct */
-#define NT_PSTATUS	10		/* Contains copy of pstatus struct */
-#define NT_PSINFO	13		/* Contains copy of psinfo struct */
-#define NT_PRCRED	14		/* Contains copy of prcred struct */
-#define NT_UTSNAME	15		/* Contains copy of utsname struct */
-#define NT_LWPSTATUS	16		/* Contains copy of lwpstatus struct */
-#define NT_LWPSINFO	17		/* Contains copy of lwpinfo struct */
-#define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
-#define NT_SIGINFO	0x53494749	/* Contains copy of siginfo_t,
-					   size might increase */
-#define NT_FILE		0x46494c45	/* Contains information about mapped
-					   files */
-#define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
-#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
-#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
-#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
-#define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
-#define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
-#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
-#define NT_S390_HIGH_GPRS	0x300	/* s390 upper register halves */
-#define NT_S390_TIMER	0x301		/* s390 timer register */
-#define NT_S390_TODCMP	0x302		/* s390 TOD clock comparator register */
-#define NT_S390_TODPREG	0x303		/* s390 TOD programmable register */
-#define NT_S390_CTRS	0x304		/* s390 control registers */
-#define NT_S390_PREFIX	0x305		/* s390 prefix register */
-#define NT_S390_LAST_BREAK	0x306	/* s390 breaking event address */
-#define NT_S390_SYSTEM_CALL	0x307	/* s390 system call restart data */
-#define NT_S390_TDB	0x308		/* s390 transaction diagnostic block */
-#define NT_ARM_VFP	0x400		/* ARM VFP/NEON registers */
-#define NT_ARM_TLS	0x401		/* ARM TLS register */
-#define NT_ARM_HW_BREAK	0x402		/* ARM hardware breakpoint registers */
-#define NT_ARM_HW_WATCH	0x403		/* ARM hardware watchpoint registers */
-
-/* Legal values for the note segment descriptor types for object files.  */
-
-#define NT_VERSION	1		/* Contains a version string.  */
-
-
-/* Dynamic section entry.  */
-
-typedef struct
-{
-  Elf32_Sword	d_tag;			/* Dynamic entry type */
-  union
-    {
-      Elf32_Word d_val;			/* Integer value */
-      Elf32_Addr d_ptr;			/* Address value */
-    } d_un;
-} Elf32_Dyn;
-
-typedef struct
-{
-  Elf64_Sxword	d_tag;			/* Dynamic entry type */
-  union
-    {
-      Elf64_Xword d_val;		/* Integer value */
-      Elf64_Addr d_ptr;			/* Address value */
-    } d_un;
-} Elf64_Dyn;
-
-/* Legal values for d_tag (dynamic entry type).  */
-
-#define DT_NULL		0		/* Marks end of dynamic section */
-#define DT_NEEDED	1		/* Name of needed library */
-#define DT_PLTRELSZ	2		/* Size in bytes of PLT relocs */
-#define DT_PLTGOT	3		/* Processor defined value */
-#define DT_HASH		4		/* Address of symbol hash table */
-#define DT_STRTAB	5		/* Address of string table */
-#define DT_SYMTAB	6		/* Address of symbol table */
-#define DT_RELA		7		/* Address of Rela relocs */
-#define DT_RELASZ	8		/* Total size of Rela relocs */
-#define DT_RELAENT	9		/* Size of one Rela reloc */
-#define DT_STRSZ	10		/* Size of string table */
-#define DT_SYMENT	11		/* Size of one symbol table entry */
-#define DT_INIT		12		/* Address of init function */
-#define DT_FINI		13		/* Address of termination function */
-#define DT_SONAME	14		/* Name of shared object */
-#define DT_RPATH	15		/* Library search path (deprecated) */
-#define DT_SYMBOLIC	16		/* Start symbol search here */
-#define DT_REL		17		/* Address of Rel relocs */
-#define DT_RELSZ	18		/* Total size of Rel relocs */
-#define DT_RELENT	19		/* Size of one Rel reloc */
-#define DT_PLTREL	20		/* Type of reloc in PLT */
-#define DT_DEBUG	21		/* For debugging; unspecified */
-#define DT_TEXTREL	22		/* Reloc might modify .text */
-#define DT_JMPREL	23		/* Address of PLT relocs */
-#define	DT_BIND_NOW	24		/* Process relocations of object */
-#define	DT_INIT_ARRAY	25		/* Array with addresses of init fct */
-#define	DT_FINI_ARRAY	26		/* Array with addresses of fini fct */
-#define	DT_INIT_ARRAYSZ	27		/* Size in bytes of DT_INIT_ARRAY */
-#define	DT_FINI_ARRAYSZ	28		/* Size in bytes of DT_FINI_ARRAY */
-#define DT_RUNPATH	29		/* Library search path */
-#define DT_FLAGS	30		/* Flags for the object being loaded */
-#define DT_ENCODING	32		/* Start of encoded range */
-#define DT_PREINIT_ARRAY 32		/* Array with addresses of preinit fct*/
-#define DT_PREINIT_ARRAYSZ 33		/* size in bytes of DT_PREINIT_ARRAY */
-#define	DT_NUM		34		/* Number used */
-#define DT_LOOS		0x6000000d	/* Start of OS-specific */
-#define DT_HIOS		0x6ffff000	/* End of OS-specific */
-#define DT_LOPROC	0x70000000	/* Start of processor-specific */
-#define DT_HIPROC	0x7fffffff	/* End of processor-specific */
-#define	DT_PROCNUM	DT_MIPS_NUM	/* Most used by any processor */
-
-/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
-   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
-   approach.  */
-#define DT_VALRNGLO	0x6ffffd00
-#define DT_GNU_PRELINKED 0x6ffffdf5	/* Prelinking timestamp */
-#define DT_GNU_CONFLICTSZ 0x6ffffdf6	/* Size of conflict section */
-#define DT_GNU_LIBLISTSZ 0x6ffffdf7	/* Size of library list */
-#define DT_CHECKSUM	0x6ffffdf8
-#define DT_PLTPADSZ	0x6ffffdf9
-#define DT_MOVEENT	0x6ffffdfa
-#define DT_MOVESZ	0x6ffffdfb
-#define DT_FEATURE_1	0x6ffffdfc	/* Feature selection (DTF_*).  */
-#define DT_POSFLAG_1	0x6ffffdfd	/* Flags for DT_* entries, effecting
-					   the following DT_* entry.  */
-#define DT_SYMINSZ	0x6ffffdfe	/* Size of syminfo table (in bytes) */
-#define DT_SYMINENT	0x6ffffdff	/* Entry size of syminfo */
-#define DT_VALRNGHI	0x6ffffdff
-#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))	/* Reverse order! */
-#define DT_VALNUM 12
-
-/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
-   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
-
-   If any adjustment is made to the ELF object after it has been
-   built these entries will need to be adjusted.  */
-#define DT_ADDRRNGLO	0x6ffffe00
-#define DT_GNU_HASH	0x6ffffef5	/* GNU-style hash table.  */
-#define DT_TLSDESC_PLT	0x6ffffef6
-#define DT_TLSDESC_GOT	0x6ffffef7
-#define DT_GNU_CONFLICT	0x6ffffef8	/* Start of conflict section */
-#define DT_GNU_LIBLIST	0x6ffffef9	/* Library list */
-#define DT_CONFIG	0x6ffffefa	/* Configuration information.  */
-#define DT_DEPAUDIT	0x6ffffefb	/* Dependency auditing.  */
-#define DT_AUDIT	0x6ffffefc	/* Object auditing.  */
-#define	DT_PLTPAD	0x6ffffefd	/* PLT padding.  */
-#define	DT_MOVETAB	0x6ffffefe	/* Move table.  */
-#define DT_SYMINFO	0x6ffffeff	/* Syminfo table.  */
-#define DT_ADDRRNGHI	0x6ffffeff
-#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))	/* Reverse order! */
-#define DT_ADDRNUM 11
-
-/* The versioning entry types.  The next are defined as part of the
-   GNU extension.  */
-#define DT_VERSYM	0x6ffffff0
-
-#define DT_RELACOUNT	0x6ffffff9
-#define DT_RELCOUNT	0x6ffffffa
-
-/* These were chosen by Sun.  */
-#define DT_FLAGS_1	0x6ffffffb	/* State flags, see DF_1_* below.  */
-#define	DT_VERDEF	0x6ffffffc	/* Address of version definition
-					   table */
-#define	DT_VERDEFNUM	0x6ffffffd	/* Number of version definitions */
-#define	DT_VERNEED	0x6ffffffe	/* Address of table with needed
-					   versions */
-#define	DT_VERNEEDNUM	0x6fffffff	/* Number of needed versions */
-#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))	/* Reverse order! */
-#define DT_VERSIONTAGNUM 16
-
-/* Sun added these machine-independent extensions in the "processor-specific"
-   range.  Be compatible.  */
-#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
-#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
-#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
-#define DT_EXTRANUM	3
-
-/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
-#define DF_ORIGIN	0x00000001	/* Object may use DF_ORIGIN */
-#define DF_SYMBOLIC	0x00000002	/* Symbol resolutions starts here */
-#define DF_TEXTREL	0x00000004	/* Object contains text relocations */
-#define DF_BIND_NOW	0x00000008	/* No lazy binding for this object */
-#define DF_STATIC_TLS	0x00000010	/* Module uses the static TLS model */
-
-/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
-   entry in the dynamic section.  */
-#define DF_1_NOW	0x00000001	/* Set RTLD_NOW for this object.  */
-#define DF_1_GLOBAL	0x00000002	/* Set RTLD_GLOBAL for this object.  */
-#define DF_1_GROUP	0x00000004	/* Set RTLD_GROUP for this object.  */
-#define DF_1_NODELETE	0x00000008	/* Set RTLD_NODELETE for this object.*/
-#define DF_1_LOADFLTR	0x00000010	/* Trigger filtee loading at runtime.*/
-#define DF_1_INITFIRST	0x00000020	/* Set RTLD_INITFIRST for this object*/
-#define DF_1_NOOPEN	0x00000040	/* Set RTLD_NOOPEN for this object.  */
-#define DF_1_ORIGIN	0x00000080	/* $ORIGIN must be handled.  */
-#define DF_1_DIRECT	0x00000100	/* Direct binding enabled.  */
-#define DF_1_TRANS	0x00000200
-#define DF_1_INTERPOSE	0x00000400	/* Object is used to interpose.  */
-#define DF_1_NODEFLIB	0x00000800	/* Ignore default lib search path.  */
-#define DF_1_NODUMP	0x00001000	/* Object can't be dldump'ed.  */
-#define DF_1_CONFALT	0x00002000	/* Configuration alternative created.*/
-#define DF_1_ENDFILTEE	0x00004000	/* Filtee terminates filters search. */
-#define	DF_1_DISPRELDNE	0x00008000	/* Disp reloc applied at build time. */
-#define	DF_1_DISPRELPND	0x00010000	/* Disp reloc applied at run-time.  */
-#define	DF_1_NODIRECT	0x00020000	/* Object has no-direct binding. */
-#define	DF_1_IGNMULDEF	0x00040000
-#define	DF_1_NOKSYMS	0x00080000
-#define	DF_1_NOHDR	0x00100000
-#define	DF_1_EDITED	0x00200000	/* Object is modified after built.  */
-#define	DF_1_NORELOC	0x00400000
-#define	DF_1_SYMINTPOSE	0x00800000	/* Object has individual interposers.  */
-#define	DF_1_GLOBAUDIT	0x01000000	/* Global auditing required.  */
-#define	DF_1_SINGLETON	0x02000000	/* Singleton symbols are used.  */
-
-/* Flags for the feature selection in DT_FEATURE_1.  */
-#define DTF_1_PARINIT	0x00000001
-#define DTF_1_CONFEXP	0x00000002
-
-/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
-#define DF_P1_LAZYLOAD	0x00000001	/* Lazyload following object.  */
-#define DF_P1_GROUPPERM	0x00000002	/* Symbols from next object are not
-					   generally available.  */
-
-/* Version definition sections.  */
-
-typedef struct
-{
-  Elf32_Half	vd_version;		/* Version revision */
-  Elf32_Half	vd_flags;		/* Version information */
-  Elf32_Half	vd_ndx;			/* Version Index */
-  Elf32_Half	vd_cnt;			/* Number of associated aux entries */
-  Elf32_Word	vd_hash;		/* Version name hash value */
-  Elf32_Word	vd_aux;			/* Offset in bytes to verdaux array */
-  Elf32_Word	vd_next;		/* Offset in bytes to next verdef
-					   entry */
-} Elf32_Verdef;
-
-typedef struct
-{
-  Elf64_Half	vd_version;		/* Version revision */
-  Elf64_Half	vd_flags;		/* Version information */
-  Elf64_Half	vd_ndx;			/* Version Index */
-  Elf64_Half	vd_cnt;			/* Number of associated aux entries */
-  Elf64_Word	vd_hash;		/* Version name hash value */
-  Elf64_Word	vd_aux;			/* Offset in bytes to verdaux array */
-  Elf64_Word	vd_next;		/* Offset in bytes to next verdef
-					   entry */
-} Elf64_Verdef;
-
-
-/* Legal values for vd_version (version revision).  */
-#define VER_DEF_NONE	0		/* No version */
-#define VER_DEF_CURRENT	1		/* Current version */
-#define VER_DEF_NUM	2		/* Given version number */
-
-/* Legal values for vd_flags (version information flags).  */
-#define VER_FLG_BASE	0x1		/* Version definition of file itself */
-#define VER_FLG_WEAK	0x2		/* Weak version identifier */
-
-/* Versym symbol index values.  */
-#define	VER_NDX_LOCAL		0	/* Symbol is local.  */
-#define	VER_NDX_GLOBAL		1	/* Symbol is global.  */
-#define	VER_NDX_LORESERVE	0xff00	/* Beginning of reserved entries.  */
-#define	VER_NDX_ELIMINATE	0xff01	/* Symbol is to be eliminated.  */
-
-/* Auxialiary version information.  */
-
-typedef struct
-{
-  Elf32_Word	vda_name;		/* Version or dependency names */
-  Elf32_Word	vda_next;		/* Offset in bytes to next verdaux
-					   entry */
-} Elf32_Verdaux;
-
-typedef struct
-{
-  Elf64_Word	vda_name;		/* Version or dependency names */
-  Elf64_Word	vda_next;		/* Offset in bytes to next verdaux
-					   entry */
-} Elf64_Verdaux;
-
-
-/* Version dependency section.  */
-
-typedef struct
-{
-  Elf32_Half	vn_version;		/* Version of structure */
-  Elf32_Half	vn_cnt;			/* Number of associated aux entries */
-  Elf32_Word	vn_file;		/* Offset of filename for this
-					   dependency */
-  Elf32_Word	vn_aux;			/* Offset in bytes to vernaux array */
-  Elf32_Word	vn_next;		/* Offset in bytes to next verneed
-					   entry */
-} Elf32_Verneed;
-
-typedef struct
-{
-  Elf64_Half	vn_version;		/* Version of structure */
-  Elf64_Half	vn_cnt;			/* Number of associated aux entries */
-  Elf64_Word	vn_file;		/* Offset of filename for this
-					   dependency */
-  Elf64_Word	vn_aux;			/* Offset in bytes to vernaux array */
-  Elf64_Word	vn_next;		/* Offset in bytes to next verneed
-					   entry */
-} Elf64_Verneed;
-
-
-/* Legal values for vn_version (version revision).  */
-#define VER_NEED_NONE	 0		/* No version */
-#define VER_NEED_CURRENT 1		/* Current version */
-#define VER_NEED_NUM	 2		/* Given version number */
-
-/* Auxiliary needed version information.  */
-
-typedef struct
-{
-  Elf32_Word	vna_hash;		/* Hash value of dependency name */
-  Elf32_Half	vna_flags;		/* Dependency specific information */
-  Elf32_Half	vna_other;		/* Unused */
-  Elf32_Word	vna_name;		/* Dependency name string offset */
-  Elf32_Word	vna_next;		/* Offset in bytes to next vernaux
-					   entry */
-} Elf32_Vernaux;
-
-typedef struct
-{
-  Elf64_Word	vna_hash;		/* Hash value of dependency name */
-  Elf64_Half	vna_flags;		/* Dependency specific information */
-  Elf64_Half	vna_other;		/* Unused */
-  Elf64_Word	vna_name;		/* Dependency name string offset */
-  Elf64_Word	vna_next;		/* Offset in bytes to next vernaux
-					   entry */
-} Elf64_Vernaux;
-
-
-/* Legal values for vna_flags.  */
-#define VER_FLG_WEAK	0x2		/* Weak version identifier */
-
-
-/* Auxiliary vector.  */
-
-/* This vector is normally only used by the program interpreter.  The
-   usual definition in an ABI supplement uses the name auxv_t.  The
-   vector is not usually defined in a standard <elf.h> file, but it
-   can't hurt.  We rename it to avoid conflicts.  The sizes of these
-   types are an arrangement between the exec server and the program
-   interpreter, so we don't fully specify them here.  */
-
-typedef struct
-{
-  uint32_t a_type;		/* Entry type */
-  union
-    {
-      uint32_t a_val;		/* Integer value */
-      /* We use to have pointer elements added here.  We cannot do that,
-	 though, since it does not work when using 32-bit definitions
-	 on 64-bit platforms and vice versa.  */
-    } a_un;
-} Elf32_auxv_t;
-
-typedef struct
-{
-  uint64_t a_type;		/* Entry type */
-  union
-    {
-      uint64_t a_val;		/* Integer value */
-      /* We use to have pointer elements added here.  We cannot do that,
-	 though, since it does not work when using 32-bit definitions
-	 on 64-bit platforms and vice versa.  */
-    } a_un;
-} Elf64_auxv_t;
-
-#include <bits/auxv.h>
-/* Note section contents.  Each entry in the note section begins with
-   a header of a fixed form.  */
-
-typedef struct
-{
-  Elf32_Word n_namesz;			/* Length of the note's name.  */
-  Elf32_Word n_descsz;			/* Length of the note's descriptor.  */
-  Elf32_Word n_type;			/* Type of the note.  */
-} Elf32_Nhdr;
-
-typedef struct
-{
-  Elf64_Word n_namesz;			/* Length of the note's name.  */
-  Elf64_Word n_descsz;			/* Length of the note's descriptor.  */
-  Elf64_Word n_type;			/* Type of the note.  */
-} Elf64_Nhdr;
-
-/* Known names of notes.  */
-
-/* Solaris entries in the note section have this name.  */
-#define ELF_NOTE_SOLARIS	"SUNW Solaris"
-
-/* Note entries for GNU systems have this name.  */
-#define ELF_NOTE_GNU		"GNU"
-
-
-/* Defined types of notes for Solaris.  */
-
-/* Value of descriptor (one word) is desired pagesize for the binary.  */
-#define ELF_NOTE_PAGESIZE_HINT	1
-
-
-/* Defined note types for GNU systems.  */
-
-/* ABI information.  The descriptor consists of words:
-   word 0: OS descriptor
-   word 1: major version of the ABI
-   word 2: minor version of the ABI
-   word 3: subminor version of the ABI
-*/
-#define NT_GNU_ABI_TAG	1
-#define ELF_NOTE_ABI	NT_GNU_ABI_TAG /* Old name.  */
-
-/* Known OSes.  These values can appear in word 0 of an
-   NT_GNU_ABI_TAG note section entry.  */
-#define ELF_NOTE_OS_LINUX	0
-#define ELF_NOTE_OS_GNU		1
-#define ELF_NOTE_OS_SOLARIS2	2
-#define ELF_NOTE_OS_FREEBSD	3
-
-/* Synthetic hwcap information.  The descriptor begins with two words:
-   word 0: number of entries
-   word 1: bitmask of enabled entries
-   Then follow variable-length entries, one byte followed by a
-   '\0'-terminated hwcap name string.  The byte gives the bit
-   number to test if enabled, (1U << bit) & bitmask.  */
-#define NT_GNU_HWCAP	2
-
-/* Build ID bits as generated by ld --build-id.
-   The descriptor consists of any nonzero number of bytes.  */
-#define NT_GNU_BUILD_ID	3
-
-/* Version note generated by GNU gold containing a version string.  */
-#define NT_GNU_GOLD_VERSION	4
-
-
-/* Move records.  */
-typedef struct
-{
-  Elf32_Xword m_value;		/* Symbol value.  */
-  Elf32_Word m_info;		/* Size and index.  */
-  Elf32_Word m_poffset;		/* Symbol offset.  */
-  Elf32_Half m_repeat;		/* Repeat count.  */
-  Elf32_Half m_stride;		/* Stride info.  */
-} Elf32_Move;
-
-typedef struct
-{
-  Elf64_Xword m_value;		/* Symbol value.  */
-  Elf64_Xword m_info;		/* Size and index.  */
-  Elf64_Xword m_poffset;	/* Symbol offset.  */
-  Elf64_Half m_repeat;		/* Repeat count.  */
-  Elf64_Half m_stride;		/* Stride info.  */
-} Elf64_Move;
-
-/* Macro to construct move records.  */
-#define ELF32_M_SYM(info)	((info) >> 8)
-#define ELF32_M_SIZE(info)	((unsigned char) (info))
-#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
-
-#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
-#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
-#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
-
-
-/* Motorola 68k specific definitions.  */
-
-/* Values for Elf32_Ehdr.e_flags.  */
-#define EF_CPU32	0x00810000
-
-/* m68k relocs.  */
-
-#define R_68K_NONE	0		/* No reloc */
-#define R_68K_32	1		/* Direct 32 bit  */
-#define R_68K_16	2		/* Direct 16 bit  */
-#define R_68K_8		3		/* Direct 8 bit  */
-#define R_68K_PC32	4		/* PC relative 32 bit */
-#define R_68K_PC16	5		/* PC relative 16 bit */
-#define R_68K_PC8	6		/* PC relative 8 bit */
-#define R_68K_GOT32	7		/* 32 bit PC relative GOT entry */
-#define R_68K_GOT16	8		/* 16 bit PC relative GOT entry */
-#define R_68K_GOT8	9		/* 8 bit PC relative GOT entry */
-#define R_68K_GOT32O	10		/* 32 bit GOT offset */
-#define R_68K_GOT16O	11		/* 16 bit GOT offset */
-#define R_68K_GOT8O	12		/* 8 bit GOT offset */
-#define R_68K_PLT32	13		/* 32 bit PC relative PLT address */
-#define R_68K_PLT16	14		/* 16 bit PC relative PLT address */
-#define R_68K_PLT8	15		/* 8 bit PC relative PLT address */
-#define R_68K_PLT32O	16		/* 32 bit PLT offset */
-#define R_68K_PLT16O	17		/* 16 bit PLT offset */
-#define R_68K_PLT8O	18		/* 8 bit PLT offset */
-#define R_68K_COPY	19		/* Copy symbol at runtime */
-#define R_68K_GLOB_DAT	20		/* Create GOT entry */
-#define R_68K_JMP_SLOT	21		/* Create PLT entry */
-#define R_68K_RELATIVE	22		/* Adjust by program base */
-#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
-#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
-#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
-#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
-#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
-#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
-#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
-#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
-#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
-#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
-#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
-#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
-#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
-					   static TLS block */
-#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
-					   static TLS block */
-#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
-					   static TLS block */
-#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
-#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
-#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
-/* Keep this the last entry.  */
-#define R_68K_NUM	43
-
-/* Intel 80386 specific definitions.  */
-
-/* i386 relocs.  */
-
-#define R_386_NONE	   0		/* No reloc */
-#define R_386_32	   1		/* Direct 32 bit  */
-#define R_386_PC32	   2		/* PC relative 32 bit */
-#define R_386_GOT32	   3		/* 32 bit GOT entry */
-#define R_386_PLT32	   4		/* 32 bit PLT address */
-#define R_386_COPY	   5		/* Copy symbol at runtime */
-#define R_386_GLOB_DAT	   6		/* Create GOT entry */
-#define R_386_JMP_SLOT	   7		/* Create PLT entry */
-#define R_386_RELATIVE	   8		/* Adjust by program base */
-#define R_386_GOTOFF	   9		/* 32 bit offset to GOT */
-#define R_386_GOTPC	   10		/* 32 bit PC relative offset to GOT */
-#define R_386_32PLT	   11
-#define R_386_TLS_TPOFF	   14		/* Offset in static TLS block */
-#define R_386_TLS_IE	   15		/* Address of GOT entry for static TLS
-					   block offset */
-#define R_386_TLS_GOTIE	   16		/* GOT entry for static TLS block
-					   offset */
-#define R_386_TLS_LE	   17		/* Offset relative to static TLS
-					   block */
-#define R_386_TLS_GD	   18		/* Direct 32 bit for GNU version of
-					   general dynamic thread local data */
-#define R_386_TLS_LDM	   19		/* Direct 32 bit for GNU version of
-					   local dynamic thread local data
-					   in LE code */
-#define R_386_16	   20
-#define R_386_PC16	   21
-#define R_386_8		   22
-#define R_386_PC8	   23
-#define R_386_TLS_GD_32	   24		/* Direct 32 bit for general dynamic
-					   thread local data */
-#define R_386_TLS_GD_PUSH  25		/* Tag for pushl in GD TLS code */
-#define R_386_TLS_GD_CALL  26		/* Relocation for call to
-					   __tls_get_addr() */
-#define R_386_TLS_GD_POP   27		/* Tag for popl in GD TLS code */
-#define R_386_TLS_LDM_32   28		/* Direct 32 bit for local dynamic
-					   thread local data in LE code */
-#define R_386_TLS_LDM_PUSH 29		/* Tag for pushl in LDM TLS code */
-#define R_386_TLS_LDM_CALL 30		/* Relocation for call to
-					   __tls_get_addr() in LDM code */
-#define R_386_TLS_LDM_POP  31		/* Tag for popl in LDM TLS code */
-#define R_386_TLS_LDO_32   32		/* Offset relative to TLS block */
-#define R_386_TLS_IE_32	   33		/* GOT entry for negated static TLS
-					   block offset */
-#define R_386_TLS_LE_32	   34		/* Negated offset relative to static
-					   TLS block */
-#define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
-#define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
-#define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
-#define R_386_SIZE32	   38 		/* 32-bit symbol size */
-#define R_386_TLS_GOTDESC  39		/* GOT offset for TLS descriptor.  */
-#define R_386_TLS_DESC_CALL 40		/* Marker of call through TLS
-					   descriptor for
-					   relaxation.  */
-#define R_386_TLS_DESC     41		/* TLS descriptor containing
-					   pointer to code and to
-					   argument, returning the TLS
-					   offset for the symbol.  */
-#define R_386_IRELATIVE	   42		/* Adjust indirectly by program base */
-/* Keep this the last entry.  */
-#define R_386_NUM	   43
-
-/* SUN SPARC specific definitions.  */
-
-/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-
-#define STT_SPARC_REGISTER	13	/* Global register reserved to app. */
-
-/* Values for Elf64_Ehdr.e_flags.  */
-
-#define EF_SPARCV9_MM		3
-#define EF_SPARCV9_TSO		0
-#define EF_SPARCV9_PSO		1
-#define EF_SPARCV9_RMO		2
-#define EF_SPARC_LEDATA		0x800000 /* little endian data */
-#define EF_SPARC_EXT_MASK	0xFFFF00
-#define EF_SPARC_32PLUS		0x000100 /* generic V8+ features */
-#define EF_SPARC_SUN_US1	0x000200 /* Sun UltraSPARC1 extensions */
-#define EF_SPARC_HAL_R1		0x000400 /* HAL R1 extensions */
-#define EF_SPARC_SUN_US3	0x000800 /* Sun UltraSPARCIII extensions */
-
-/* SPARC relocs.  */
-
-#define R_SPARC_NONE		0	/* No reloc */
-#define R_SPARC_8		1	/* Direct 8 bit */
-#define R_SPARC_16		2	/* Direct 16 bit */
-#define R_SPARC_32		3	/* Direct 32 bit */
-#define R_SPARC_DISP8		4	/* PC relative 8 bit */
-#define R_SPARC_DISP16		5	/* PC relative 16 bit */
-#define R_SPARC_DISP32		6	/* PC relative 32 bit */
-#define R_SPARC_WDISP30		7	/* PC relative 30 bit shifted */
-#define R_SPARC_WDISP22		8	/* PC relative 22 bit shifted */
-#define R_SPARC_HI22		9	/* High 22 bit */
-#define R_SPARC_22		10	/* Direct 22 bit */
-#define R_SPARC_13		11	/* Direct 13 bit */
-#define R_SPARC_LO10		12	/* Truncated 10 bit */
-#define R_SPARC_GOT10		13	/* Truncated 10 bit GOT entry */
-#define R_SPARC_GOT13		14	/* 13 bit GOT entry */
-#define R_SPARC_GOT22		15	/* 22 bit GOT entry shifted */
-#define R_SPARC_PC10		16	/* PC relative 10 bit truncated */
-#define R_SPARC_PC22		17	/* PC relative 22 bit shifted */
-#define R_SPARC_WPLT30		18	/* 30 bit PC relative PLT address */
-#define R_SPARC_COPY		19	/* Copy symbol at runtime */
-#define R_SPARC_GLOB_DAT	20	/* Create GOT entry */
-#define R_SPARC_JMP_SLOT	21	/* Create PLT entry */
-#define R_SPARC_RELATIVE	22	/* Adjust by program base */
-#define R_SPARC_UA32		23	/* Direct 32 bit unaligned */
-
-/* Additional Sparc64 relocs.  */
-
-#define R_SPARC_PLT32		24	/* Direct 32 bit ref to PLT entry */
-#define R_SPARC_HIPLT22		25	/* High 22 bit PLT entry */
-#define R_SPARC_LOPLT10		26	/* Truncated 10 bit PLT entry */
-#define R_SPARC_PCPLT32		27	/* PC rel 32 bit ref to PLT entry */
-#define R_SPARC_PCPLT22		28	/* PC rel high 22 bit PLT entry */
-#define R_SPARC_PCPLT10		29	/* PC rel trunc 10 bit PLT entry */
-#define R_SPARC_10		30	/* Direct 10 bit */
-#define R_SPARC_11		31	/* Direct 11 bit */
-#define R_SPARC_64		32	/* Direct 64 bit */
-#define R_SPARC_OLO10		33	/* 10bit with secondary 13bit addend */
-#define R_SPARC_HH22		34	/* Top 22 bits of direct 64 bit */
-#define R_SPARC_HM10		35	/* High middle 10 bits of ... */
-#define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
-#define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
-#define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
-#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
-#define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
-#define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
-#define R_SPARC_GLOB_JMP	42	/* was part of v9 ABI but was removed */
-#define R_SPARC_7		43	/* Direct 7 bit */
-#define R_SPARC_5		44	/* Direct 5 bit */
-#define R_SPARC_6		45	/* Direct 6 bit */
-#define R_SPARC_DISP64		46	/* PC relative 64 bit */
-#define R_SPARC_PLT64		47	/* Direct 64 bit ref to PLT entry */
-#define R_SPARC_HIX22		48	/* High 22 bit complemented */
-#define R_SPARC_LOX10		49	/* Truncated 11 bit complemented */
-#define R_SPARC_H44		50	/* Direct high 12 of 44 bit */
-#define R_SPARC_M44		51	/* Direct mid 22 of 44 bit */
-#define R_SPARC_L44		52	/* Direct low 10 of 44 bit */
-#define R_SPARC_REGISTER	53	/* Global register usage */
-#define R_SPARC_UA64		54	/* Direct 64 bit unaligned */
-#define R_SPARC_UA16		55	/* Direct 16 bit unaligned */
-#define R_SPARC_TLS_GD_HI22	56
-#define R_SPARC_TLS_GD_LO10	57
-#define R_SPARC_TLS_GD_ADD	58
-#define R_SPARC_TLS_GD_CALL	59
-#define R_SPARC_TLS_LDM_HI22	60
-#define R_SPARC_TLS_LDM_LO10	61
-#define R_SPARC_TLS_LDM_ADD	62
-#define R_SPARC_TLS_LDM_CALL	63
-#define R_SPARC_TLS_LDO_HIX22	64
-#define R_SPARC_TLS_LDO_LOX10	65
-#define R_SPARC_TLS_LDO_ADD	66
-#define R_SPARC_TLS_IE_HI22	67
-#define R_SPARC_TLS_IE_LO10	68
-#define R_SPARC_TLS_IE_LD	69
-#define R_SPARC_TLS_IE_LDX	70
-#define R_SPARC_TLS_IE_ADD	71
-#define R_SPARC_TLS_LE_HIX22	72
-#define R_SPARC_TLS_LE_LOX10	73
-#define R_SPARC_TLS_DTPMOD32	74
-#define R_SPARC_TLS_DTPMOD64	75
-#define R_SPARC_TLS_DTPOFF32	76
-#define R_SPARC_TLS_DTPOFF64	77
-#define R_SPARC_TLS_TPOFF32	78
-#define R_SPARC_TLS_TPOFF64	79
-#define R_SPARC_GOTDATA_HIX22	80
-#define R_SPARC_GOTDATA_LOX10	81
-#define R_SPARC_GOTDATA_OP_HIX22	82
-#define R_SPARC_GOTDATA_OP_LOX10	83
-#define R_SPARC_GOTDATA_OP	84
-#define R_SPARC_H34		85
-#define R_SPARC_SIZE32		86
-#define R_SPARC_SIZE64		87
-#define R_SPARC_WDISP10		88
-#define R_SPARC_JMP_IREL	248
-#define R_SPARC_IRELATIVE	249
-#define R_SPARC_GNU_VTINHERIT	250
-#define R_SPARC_GNU_VTENTRY	251
-#define R_SPARC_REV32		252
-/* Keep this the last entry.  */
-#define R_SPARC_NUM		253
-
-/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
-
-#define DT_SPARC_REGISTER	0x70000001
-#define DT_SPARC_NUM		2
-
-/* MIPS R3000 specific definitions.  */
-
-/* Legal values for e_flags field of Elf32_Ehdr.  */
-
-#define EF_MIPS_NOREORDER	1     /* A .noreorder directive was used.  */
-#define EF_MIPS_PIC		2     /* Contains PIC code.  */
-#define EF_MIPS_CPIC		4     /* Uses PIC calling sequence.  */
-#define EF_MIPS_XGOT		8
-#define EF_MIPS_64BIT_WHIRL	16
-#define EF_MIPS_ABI2		32
-#define EF_MIPS_ABI_ON32	64
-#define EF_MIPS_FP64		512  /* Uses FP64 (12 callee-saved).  */
-#define EF_MIPS_NAN2008	1024  /* Uses IEEE 754-2008 NaN encoding.  */
-#define EF_MIPS_ARCH		0xf0000000 /* MIPS architecture level.  */
-
-/* Legal values for MIPS architecture level.  */
-
-#define EF_MIPS_ARCH_1		0x00000000 /* -mips1 code.  */
-#define EF_MIPS_ARCH_2		0x10000000 /* -mips2 code.  */
-#define EF_MIPS_ARCH_3		0x20000000 /* -mips3 code.  */
-#define EF_MIPS_ARCH_4		0x30000000 /* -mips4 code.  */
-#define EF_MIPS_ARCH_5		0x40000000 /* -mips5 code.  */
-#define EF_MIPS_ARCH_32		0x50000000 /* MIPS32 code.  */
-#define EF_MIPS_ARCH_64		0x60000000 /* MIPS64 code.  */
-#define EF_MIPS_ARCH_32R2	0x70000000 /* MIPS32r2 code.  */
-#define EF_MIPS_ARCH_64R2	0x80000000 /* MIPS64r2 code.  */
-
-/* The following are unofficial names and should not be used.  */
-
-#define E_MIPS_ARCH_1		EF_MIPS_ARCH_1
-#define E_MIPS_ARCH_2		EF_MIPS_ARCH_2
-#define E_MIPS_ARCH_3		EF_MIPS_ARCH_3
-#define E_MIPS_ARCH_4		EF_MIPS_ARCH_4
-#define E_MIPS_ARCH_5		EF_MIPS_ARCH_5
-#define E_MIPS_ARCH_32		EF_MIPS_ARCH_32
-#define E_MIPS_ARCH_64		EF_MIPS_ARCH_64
-
-/* Special section indices.  */
-
-#define SHN_MIPS_ACOMMON	0xff00	/* Allocated common symbols.  */
-#define SHN_MIPS_TEXT		0xff01	/* Allocated test symbols.  */
-#define SHN_MIPS_DATA		0xff02	/* Allocated data symbols.  */
-#define SHN_MIPS_SCOMMON 	0xff03	/* Small common symbols.  */
-#define SHN_MIPS_SUNDEFINED	0xff04	/* Small undefined symbols.  */
-
-/* Legal values for sh_type field of Elf32_Shdr.  */
-
-#define SHT_MIPS_LIBLIST	0x70000000 /* Shared objects used in link.  */
-#define SHT_MIPS_MSYM		0x70000001
-#define SHT_MIPS_CONFLICT	0x70000002 /* Conflicting symbols.  */
-#define SHT_MIPS_GPTAB		0x70000003 /* Global data area sizes.  */
-#define SHT_MIPS_UCODE		0x70000004 /* Reserved for SGI/MIPS compilers */
-#define SHT_MIPS_DEBUG		0x70000005 /* MIPS ECOFF debugging info.  */
-#define SHT_MIPS_REGINFO	0x70000006 /* Register usage information.  */
-#define SHT_MIPS_PACKAGE	0x70000007
-#define SHT_MIPS_PACKSYM	0x70000008
-#define SHT_MIPS_RELD		0x70000009
-#define SHT_MIPS_IFACE		0x7000000b
-#define SHT_MIPS_CONTENT	0x7000000c
-#define SHT_MIPS_OPTIONS	0x7000000d /* Miscellaneous options.  */
-#define SHT_MIPS_SHDR		0x70000010
-#define SHT_MIPS_FDESC		0x70000011
-#define SHT_MIPS_EXTSYM		0x70000012
-#define SHT_MIPS_DENSE		0x70000013
-#define SHT_MIPS_PDESC		0x70000014
-#define SHT_MIPS_LOCSYM		0x70000015
-#define SHT_MIPS_AUXSYM		0x70000016
-#define SHT_MIPS_OPTSYM		0x70000017
-#define SHT_MIPS_LOCSTR		0x70000018
-#define SHT_MIPS_LINE		0x70000019
-#define SHT_MIPS_RFDESC		0x7000001a
-#define SHT_MIPS_DELTASYM	0x7000001b
-#define SHT_MIPS_DELTAINST	0x7000001c
-#define SHT_MIPS_DELTACLASS	0x7000001d
-#define SHT_MIPS_DWARF		0x7000001e /* DWARF debugging information.  */
-#define SHT_MIPS_DELTADECL	0x7000001f
-#define SHT_MIPS_SYMBOL_LIB	0x70000020
-#define SHT_MIPS_EVENTS		0x70000021 /* Event section.  */
-#define SHT_MIPS_TRANSLATE	0x70000022
-#define SHT_MIPS_PIXIE		0x70000023
-#define SHT_MIPS_XLATE		0x70000024
-#define SHT_MIPS_XLATE_DEBUG	0x70000025
-#define SHT_MIPS_WHIRL		0x70000026
-#define SHT_MIPS_EH_REGION	0x70000027
-#define SHT_MIPS_XLATE_OLD	0x70000028
-#define SHT_MIPS_PDR_EXCEPTION	0x70000029
-
-/* Legal values for sh_flags field of Elf32_Shdr.  */
-
-#define SHF_MIPS_GPREL		0x10000000 /* Must be in global data area.  */
-#define SHF_MIPS_MERGE		0x20000000
-#define SHF_MIPS_ADDR		0x40000000
-#define SHF_MIPS_STRINGS	0x80000000
-#define SHF_MIPS_NOSTRIP	0x08000000
-#define SHF_MIPS_LOCAL		0x04000000
-#define SHF_MIPS_NAMES		0x02000000
-#define SHF_MIPS_NODUPE		0x01000000
-
-
-/* Symbol tables.  */
-
-/* MIPS specific values for `st_other'.  */
-#define STO_MIPS_DEFAULT		0x0
-#define STO_MIPS_INTERNAL		0x1
-#define STO_MIPS_HIDDEN			0x2
-#define STO_MIPS_PROTECTED		0x3
-#define STO_MIPS_PLT			0x8
-#define STO_MIPS_SC_ALIGN_UNUSED	0xff
-
-/* MIPS specific values for `st_info'.  */
-#define STB_MIPS_SPLIT_COMMON		13
-
-/* Entries found in sections of type SHT_MIPS_GPTAB.  */
-
-typedef union
-{
-  struct
-    {
-      Elf32_Word gt_current_g_value;	/* -G value used for compilation.  */
-      Elf32_Word gt_unused;		/* Not used.  */
-    } gt_header;			/* First entry in section.  */
-  struct
-    {
-      Elf32_Word gt_g_value;		/* If this value were used for -G.  */
-      Elf32_Word gt_bytes;		/* This many bytes would be used.  */
-    } gt_entry;				/* Subsequent entries in section.  */
-} Elf32_gptab;
-
-/* Entry found in sections of type SHT_MIPS_REGINFO.  */
-
-typedef struct
-{
-  Elf32_Word ri_gprmask;		/* General registers used.  */
-  Elf32_Word ri_cprmask[4];		/* Coprocessor registers used.  */
-  Elf32_Sword ri_gp_value;		/* $gp register value.  */
-} Elf32_RegInfo;
-
-/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
-
-typedef struct
-{
-  unsigned char kind;		/* Determines interpretation of the
-				   variable part of descriptor.  */
-  unsigned char size;		/* Size of descriptor, including header.  */
-  Elf32_Section section;	/* Section header index of section affected,
-				   0 for global options.  */
-  Elf32_Word info;		/* Kind-specific information.  */
-} Elf_Options;
-
-/* Values for `kind' field in Elf_Options.  */
-
-#define ODK_NULL	0	/* Undefined.  */
-#define ODK_REGINFO	1	/* Register usage information.  */
-#define ODK_EXCEPTIONS	2	/* Exception processing options.  */
-#define ODK_PAD		3	/* Section padding options.  */
-#define ODK_HWPATCH	4	/* Hardware workarounds performed */
-#define ODK_FILL	5	/* record the fill value used by the linker. */
-#define ODK_TAGS	6	/* reserve space for desktop tools to write. */
-#define ODK_HWAND	7	/* HW workarounds.  'AND' bits when merging. */
-#define ODK_HWOR	8	/* HW workarounds.  'OR' bits when merging.  */
-
-/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
-
-#define OEX_FPU_MIN	0x1f	/* FPE's which MUST be enabled.  */
-#define OEX_FPU_MAX	0x1f00	/* FPE's which MAY be enabled.  */
-#define OEX_PAGE0	0x10000	/* page zero must be mapped.  */
-#define OEX_SMM		0x20000	/* Force sequential memory mode?  */
-#define OEX_FPDBUG	0x40000	/* Force floating point debug mode?  */
-#define OEX_PRECISEFP	OEX_FPDBUG
-#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults?  */
-
-#define OEX_FPU_INVAL	0x10
-#define OEX_FPU_DIV0	0x08
-#define OEX_FPU_OFLO	0x04
-#define OEX_FPU_UFLO	0x02
-#define OEX_FPU_INEX	0x01
-
-/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
-
-#define OHW_R4KEOP	0x1	/* R4000 end-of-page patch.  */
-#define OHW_R8KPFETCH	0x2	/* may need R8000 prefetch patch.  */
-#define OHW_R5KEOP	0x4	/* R5000 end-of-page patch.  */
-#define OHW_R5KCVTL	0x8	/* R5000 cvt.[ds].l bug.  clean=1.  */
-
-#define OPAD_PREFIX	0x1
-#define OPAD_POSTFIX	0x2
-#define OPAD_SYMBOL	0x4
-
-/* Entry found in `.options' section.  */
-
-typedef struct
-{
-  Elf32_Word hwp_flags1;	/* Extra flags.  */
-  Elf32_Word hwp_flags2;	/* Extra flags.  */
-} Elf_Options_Hw;
-
-/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
-
-#define OHWA0_R4KEOP_CHECKED	0x00000001
-#define OHWA1_R4KEOP_CLEAN	0x00000002
-
-/* MIPS relocs.  */
-
-#define R_MIPS_NONE		0	/* No reloc */
-#define R_MIPS_16		1	/* Direct 16 bit */
-#define R_MIPS_32		2	/* Direct 32 bit */
-#define R_MIPS_REL32		3	/* PC relative 32 bit */
-#define R_MIPS_26		4	/* Direct 26 bit shifted */
-#define R_MIPS_HI16		5	/* High 16 bit */
-#define R_MIPS_LO16		6	/* Low 16 bit */
-#define R_MIPS_GPREL16		7	/* GP relative 16 bit */
-#define R_MIPS_LITERAL		8	/* 16 bit literal entry */
-#define R_MIPS_GOT16		9	/* 16 bit GOT entry */
-#define R_MIPS_PC16		10	/* PC relative 16 bit */
-#define R_MIPS_CALL16		11	/* 16 bit GOT entry for function */
-#define R_MIPS_GPREL32		12	/* GP relative 32 bit */
-
-#define R_MIPS_SHIFT5		16
-#define R_MIPS_SHIFT6		17
-#define R_MIPS_64		18
-#define R_MIPS_GOT_DISP		19
-#define R_MIPS_GOT_PAGE		20
-#define R_MIPS_GOT_OFST		21
-#define R_MIPS_GOT_HI16		22
-#define R_MIPS_GOT_LO16		23
-#define R_MIPS_SUB		24
-#define R_MIPS_INSERT_A		25
-#define R_MIPS_INSERT_B		26
-#define R_MIPS_DELETE		27
-#define R_MIPS_HIGHER		28
-#define R_MIPS_HIGHEST		29
-#define R_MIPS_CALL_HI16	30
-#define R_MIPS_CALL_LO16	31
-#define R_MIPS_SCN_DISP		32
-#define R_MIPS_REL16		33
-#define R_MIPS_ADD_IMMEDIATE	34
-#define R_MIPS_PJUMP		35
-#define R_MIPS_RELGOT		36
-#define R_MIPS_JALR		37
-#define R_MIPS_TLS_DTPMOD32	38	/* Module number 32 bit */
-#define R_MIPS_TLS_DTPREL32	39	/* Module-relative offset 32 bit */
-#define R_MIPS_TLS_DTPMOD64	40	/* Module number 64 bit */
-#define R_MIPS_TLS_DTPREL64	41	/* Module-relative offset 64 bit */
-#define R_MIPS_TLS_GD		42	/* 16 bit GOT offset for GD */
-#define R_MIPS_TLS_LDM		43	/* 16 bit GOT offset for LDM */
-#define R_MIPS_TLS_DTPREL_HI16	44	/* Module-relative offset, high 16 bits */
-#define R_MIPS_TLS_DTPREL_LO16	45	/* Module-relative offset, low 16 bits */
-#define R_MIPS_TLS_GOTTPREL	46	/* 16 bit GOT offset for IE */
-#define R_MIPS_TLS_TPREL32	47	/* TP-relative offset, 32 bit */
-#define R_MIPS_TLS_TPREL64	48	/* TP-relative offset, 64 bit */
-#define R_MIPS_TLS_TPREL_HI16	49	/* TP-relative offset, high 16 bits */
-#define R_MIPS_TLS_TPREL_LO16	50	/* TP-relative offset, low 16 bits */
-#define R_MIPS_GLOB_DAT		51
-#define R_MIPS_COPY		126
-#define R_MIPS_JUMP_SLOT        127
-/* Keep this the last entry.  */
-#define R_MIPS_NUM		128
-
-/* Legal values for p_type field of Elf32_Phdr.  */
-
-#define PT_MIPS_REGINFO	  0x70000000	/* Register usage information. */
-#define PT_MIPS_RTPROC	  0x70000001	/* Runtime procedure table. */
-#define PT_MIPS_OPTIONS	  0x70000002
-#define PT_MIPS_ABIFLAGS  0x70000003	/* FP mode requirement. */
-
-/* Special program header types.  */
-
-#define PF_MIPS_LOCAL	0x10000000
-
-/* Legal values for d_tag field of Elf32_Dyn.  */
-
-#define DT_MIPS_RLD_VERSION  0x70000001	/* Runtime linker interface version */
-#define DT_MIPS_TIME_STAMP   0x70000002	/* Timestamp */
-#define DT_MIPS_ICHECKSUM    0x70000003	/* Checksum */
-#define DT_MIPS_IVERSION     0x70000004	/* Version string (string tbl index) */
-#define DT_MIPS_FLAGS	     0x70000005	/* Flags */
-#define DT_MIPS_BASE_ADDRESS 0x70000006	/* Base address */
-#define DT_MIPS_MSYM	     0x70000007
-#define DT_MIPS_CONFLICT     0x70000008	/* Address of CONFLICT section */
-#define DT_MIPS_LIBLIST	     0x70000009	/* Address of LIBLIST section */
-#define DT_MIPS_LOCAL_GOTNO  0x7000000a	/* Number of local GOT entries */
-#define DT_MIPS_CONFLICTNO   0x7000000b	/* Number of CONFLICT entries */
-#define DT_MIPS_LIBLISTNO    0x70000010	/* Number of LIBLIST entries */
-#define DT_MIPS_SYMTABNO     0x70000011	/* Number of DYNSYM entries */
-#define DT_MIPS_UNREFEXTNO   0x70000012	/* First external DYNSYM */
-#define DT_MIPS_GOTSYM	     0x70000013	/* First GOT entry in DYNSYM */
-#define DT_MIPS_HIPAGENO     0x70000014	/* Number of GOT page table entries */
-#define DT_MIPS_RLD_MAP	     0x70000016	/* Address of run time loader map.  */
-#define DT_MIPS_DELTA_CLASS  0x70000017	/* Delta C++ class definition.  */
-#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
-						DT_MIPS_DELTA_CLASS.  */
-#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
-#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
-						DT_MIPS_DELTA_INSTANCE.  */
-#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
-#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
-					     DT_MIPS_DELTA_RELOC.  */
-#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
-					   relocations refer to.  */
-#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
-					   DT_MIPS_DELTA_SYM.  */
-#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
-					     class declaration.  */
-#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
-						DT_MIPS_DELTA_CLASSSYM.  */
-#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
-#define DT_MIPS_PIXIE_INIT   0x70000023
-#define DT_MIPS_SYMBOL_LIB   0x70000024
-#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
-#define DT_MIPS_LOCAL_GOTIDX 0x70000026
-#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
-#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
-#define DT_MIPS_OPTIONS	     0x70000029 /* Address of .options.  */
-#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
-#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
-#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
-#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
-						    function stored in GOT.  */
-#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
-					   by rld on dlopen() calls.  */
-#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
-#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
-#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
-/* The address of .got.plt in an executable using the new non-PIC ABI.  */
-#define DT_MIPS_PLTGOT	     0x70000032
-/* The base of the PLT in an executable using the new non-PIC ABI if that
-   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
-   value.  */
-#define DT_MIPS_RWPLT        0x70000034
-/* An alternative description of the classic MIPS RLD_MAP that is usable
-   in a PIE as it stores a relative offset from the address of the tag
-   rather than an absolute address.  */
-#define DT_MIPS_RLD_MAP_REL  0x70000035
-#define DT_MIPS_NUM	     0x36
-
-/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
-
-#define RHF_NONE		   0		/* No flags */
-#define RHF_QUICKSTART		   (1 << 0)	/* Use quickstart */
-#define RHF_NOTPOT		   (1 << 1)	/* Hash size not power of 2 */
-#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)	/* Ignore LD_LIBRARY_PATH */
-#define RHF_NO_MOVE		   (1 << 3)
-#define RHF_SGI_ONLY		   (1 << 4)
-#define RHF_GUARANTEE_INIT	   (1 << 5)
-#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
-#define RHF_GUARANTEE_START_INIT   (1 << 7)
-#define RHF_PIXIE		   (1 << 8)
-#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
-#define RHF_REQUICKSTART	   (1 << 10)
-#define RHF_REQUICKSTARTED	   (1 << 11)
-#define RHF_CORD		   (1 << 12)
-#define RHF_NO_UNRES_UNDEF	   (1 << 13)
-#define RHF_RLD_ORDER_SAFE	   (1 << 14)
-
-/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
-
-typedef struct
-{
-  Elf32_Word l_name;		/* Name (string table index) */
-  Elf32_Word l_time_stamp;	/* Timestamp */
-  Elf32_Word l_checksum;	/* Checksum */
-  Elf32_Word l_version;		/* Interface version */
-  Elf32_Word l_flags;		/* Flags */
-} Elf32_Lib;
-
-typedef struct
-{
-  Elf64_Word l_name;		/* Name (string table index) */
-  Elf64_Word l_time_stamp;	/* Timestamp */
-  Elf64_Word l_checksum;	/* Checksum */
-  Elf64_Word l_version;		/* Interface version */
-  Elf64_Word l_flags;		/* Flags */
-} Elf64_Lib;
-
-
-/* Legal values for l_flags.  */
-
-#define LL_NONE		  0
-#define LL_EXACT_MATCH	  (1 << 0)	/* Require exact match */
-#define LL_IGNORE_INT_VER (1 << 1)	/* Ignore interface version */
-#define LL_REQUIRE_MINOR  (1 << 2)
-#define LL_EXPORTS	  (1 << 3)
-#define LL_DELAY_LOAD	  (1 << 4)
-#define LL_DELTA	  (1 << 5)
-
-/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
-
-typedef Elf32_Addr Elf32_Conflict;
-
-typedef struct
-{
-  /* Version of flags structure.  */
-  Elf32_Half version;
-  /* The level of the ISA: 1-5, 32, 64.  */
-  unsigned char isa_level;
-  /* The revision of ISA: 0 for MIPS V and below, 1-n otherwise.  */
-  unsigned char isa_rev;
-  /* The size of general purpose registers.  */
-  unsigned char gpr_size;
-  /* The size of co-processor 1 registers.  */
-  unsigned char cpr1_size;
-  /* The size of co-processor 2 registers.  */
-  unsigned char cpr2_size;
-  /* The floating-point ABI.  */
-  unsigned char fp_abi;
-  /* Processor-specific extension.  */
-  Elf32_Word isa_ext;
-  /* Mask of ASEs used.  */
-  Elf32_Word ases;
-  /* Mask of general flags.  */
-  Elf32_Word flags1;
-  Elf32_Word flags2;
-} Elf_MIPS_ABIFlags_v0;
-
-/* Values for the register size bytes of an abi flags structure.  */
-
-#define MIPS_AFL_REG_NONE	0x00	 /* No registers.  */
-#define MIPS_AFL_REG_32		0x01	 /* 32-bit registers.  */
-#define MIPS_AFL_REG_64		0x02	 /* 64-bit registers.  */
-#define MIPS_AFL_REG_128	0x03	 /* 128-bit registers.  */
-
-/* Masks for the ases word of an ABI flags structure.  */
-
-#define MIPS_AFL_ASE_DSP	0x00000001 /* DSP ASE.  */
-#define MIPS_AFL_ASE_DSPR2	0x00000002 /* DSP R2 ASE.  */
-#define MIPS_AFL_ASE_EVA	0x00000004 /* Enhanced VA Scheme.  */
-#define MIPS_AFL_ASE_MCU	0x00000008 /* MCU (MicroController) ASE.  */
-#define MIPS_AFL_ASE_MDMX	0x00000010 /* MDMX ASE.  */
-#define MIPS_AFL_ASE_MIPS3D	0x00000020 /* MIPS-3D ASE.  */
-#define MIPS_AFL_ASE_MT		0x00000040 /* MT ASE.  */
-#define MIPS_AFL_ASE_SMARTMIPS	0x00000080 /* SmartMIPS ASE.  */
-#define MIPS_AFL_ASE_VIRT	0x00000100 /* VZ ASE.  */
-#define MIPS_AFL_ASE_MSA	0x00000200 /* MSA ASE.  */
-#define MIPS_AFL_ASE_MIPS16	0x00000400 /* MIPS16 ASE.  */
-#define MIPS_AFL_ASE_MICROMIPS	0x00000800 /* MICROMIPS ASE.  */
-#define MIPS_AFL_ASE_XPA	0x00001000 /* XPA ASE.  */
-#define MIPS_AFL_ASE_MASK	0x00001fff /* All ASEs.  */
-
-/* Values for the isa_ext word of an ABI flags structure.  */
-
-#define MIPS_AFL_EXT_XLR	  1   /* RMI Xlr instruction.  */
-#define MIPS_AFL_EXT_OCTEON2	  2   /* Cavium Networks Octeon2.  */
-#define MIPS_AFL_EXT_OCTEONP	  3   /* Cavium Networks OcteonP.  */
-#define MIPS_AFL_EXT_LOONGSON_3A  4   /* Loongson 3A.  */
-#define MIPS_AFL_EXT_OCTEON	  5   /* Cavium Networks Octeon.  */
-#define MIPS_AFL_EXT_5900	  6   /* MIPS R5900 instruction.  */
-#define MIPS_AFL_EXT_4650	  7   /* MIPS R4650 instruction.  */
-#define MIPS_AFL_EXT_4010	  8   /* LSI R4010 instruction.  */
-#define MIPS_AFL_EXT_4100	  9   /* NEC VR4100 instruction.  */
-#define MIPS_AFL_EXT_3900	  10  /* Toshiba R3900 instruction.  */
-#define MIPS_AFL_EXT_10000	  11  /* MIPS R10000 instruction.  */
-#define MIPS_AFL_EXT_SB1	  12  /* Broadcom SB-1 instruction.  */
-#define MIPS_AFL_EXT_4111	  13  /* NEC VR4111/VR4181 instruction.  */
-#define MIPS_AFL_EXT_4120	  14  /* NEC VR4120 instruction.  */
-#define MIPS_AFL_EXT_5400	  15  /* NEC VR5400 instruction.  */
-#define MIPS_AFL_EXT_5500	  16  /* NEC VR5500 instruction.  */
-#define MIPS_AFL_EXT_LOONGSON_2E  17  /* ST Microelectronics Loongson 2E.  */
-#define MIPS_AFL_EXT_LOONGSON_2F  18  /* ST Microelectronics Loongson 2F.  */
-
-/* Masks for the flags1 word of an ABI flags structure.  */
-#define MIPS_AFL_FLAGS1_ODDSPREG  1  /* Uses odd single-precision registers.  */
-
-/* Object attribute values.  */
-enum
-{
-  /* Not tagged or not using any ABIs affected by the differences.  */
-  Val_GNU_MIPS_ABI_FP_ANY = 0,
-  /* Using hard-float -mdouble-float.  */
-  Val_GNU_MIPS_ABI_FP_DOUBLE = 1,
-  /* Using hard-float -msingle-float.  */
-  Val_GNU_MIPS_ABI_FP_SINGLE = 2,
-  /* Using soft-float.  */
-  Val_GNU_MIPS_ABI_FP_SOFT = 3,
-  /* Using -mips32r2 -mfp64.  */
-  Val_GNU_MIPS_ABI_FP_OLD_64 = 4,
-  /* Using -mfpxx.  */
-  Val_GNU_MIPS_ABI_FP_XX = 5,
-  /* Using -mips32r2 -mfp64.  */
-  Val_GNU_MIPS_ABI_FP_64 = 6,
-  /* Using -mips32r2 -mfp64 -mno-odd-spreg.  */
-  Val_GNU_MIPS_ABI_FP_64A = 7,
-  /* Maximum allocated FP ABI value.  */
-  Val_GNU_MIPS_ABI_FP_MAX = 7
-};
-
-/* HPPA specific definitions.  */
-
-/* Legal values for e_flags field of Elf32_Ehdr.  */
-
-#define EF_PARISC_TRAPNIL	0x00010000 /* Trap nil pointer dereference.  */
-#define EF_PARISC_EXT		0x00020000 /* Program uses arch. extensions. */
-#define EF_PARISC_LSB		0x00040000 /* Program expects little endian. */
-#define EF_PARISC_WIDE		0x00080000 /* Program expects wide mode.  */
-#define EF_PARISC_NO_KABP	0x00100000 /* No kernel assisted branch
-					      prediction.  */
-#define EF_PARISC_LAZYSWAP	0x00400000 /* Allow lazy swapping.  */
-#define EF_PARISC_ARCH		0x0000ffff /* Architecture version.  */
-
-/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
-
-#define EFA_PARISC_1_0		    0x020b /* PA-RISC 1.0 big-endian.  */
-#define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
-#define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
-
-/* Additional section indeces.  */
-
-#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
-					      symbols in ANSI C.  */
-#define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
-
-/* Legal values for sh_type field of Elf32_Shdr.  */
-
-#define SHT_PARISC_EXT		0x70000000 /* Contains product specific ext. */
-#define SHT_PARISC_UNWIND	0x70000001 /* Unwind information.  */
-#define SHT_PARISC_DOC		0x70000002 /* Debug info for optimized code. */
-
-/* Legal values for sh_flags field of Elf32_Shdr.  */
-
-#define SHF_PARISC_SHORT	0x20000000 /* Section with short addressing. */
-#define SHF_PARISC_HUGE		0x40000000 /* Section far from gp.  */
-#define SHF_PARISC_SBP		0x80000000 /* Static branch prediction code. */
-
-/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
-
-#define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
-
-#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
-#define STT_HP_STUB		(STT_LOOS + 0x2)
-
-/* HPPA relocs.  */
-
-#define R_PARISC_NONE		0	/* No reloc.  */
-#define R_PARISC_DIR32		1	/* Direct 32-bit reference.  */
-#define R_PARISC_DIR21L		2	/* Left 21 bits of eff. address.  */
-#define R_PARISC_DIR17R		3	/* Right 17 bits of eff. address.  */
-#define R_PARISC_DIR17F		4	/* 17 bits of eff. address.  */
-#define R_PARISC_DIR14R		6	/* Right 14 bits of eff. address.  */
-#define R_PARISC_PCREL32	9	/* 32-bit rel. address.  */
-#define R_PARISC_PCREL21L	10	/* Left 21 bits of rel. address.  */
-#define R_PARISC_PCREL17R	11	/* Right 17 bits of rel. address.  */
-#define R_PARISC_PCREL17F	12	/* 17 bits of rel. address.  */
-#define R_PARISC_PCREL14R	14	/* Right 14 bits of rel. address.  */
-#define R_PARISC_DPREL21L	18	/* Left 21 bits of rel. address.  */
-#define R_PARISC_DPREL14R	22	/* Right 14 bits of rel. address.  */
-#define R_PARISC_GPREL21L	26	/* GP-relative, left 21 bits.  */
-#define R_PARISC_GPREL14R	30	/* GP-relative, right 14 bits.  */
-#define R_PARISC_LTOFF21L	34	/* LT-relative, left 21 bits.  */
-#define R_PARISC_LTOFF14R	38	/* LT-relative, right 14 bits.  */
-#define R_PARISC_SECREL32	41	/* 32 bits section rel. address.  */
-#define R_PARISC_SEGBASE	48	/* No relocation, set segment base.  */
-#define R_PARISC_SEGREL32	49	/* 32 bits segment rel. address.  */
-#define R_PARISC_PLTOFF21L	50	/* PLT rel. address, left 21 bits.  */
-#define R_PARISC_PLTOFF14R	54	/* PLT rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF_FPTR32	57	/* 32 bits LT-rel. function pointer. */
-#define R_PARISC_LTOFF_FPTR21L	58	/* LT-rel. fct ptr, left 21 bits. */
-#define R_PARISC_LTOFF_FPTR14R	62	/* LT-rel. fct ptr, right 14 bits. */
-#define R_PARISC_FPTR64		64	/* 64 bits function address.  */
-#define R_PARISC_PLABEL32	65	/* 32 bits function address.  */
-#define R_PARISC_PLABEL21L	66	/* Left 21 bits of fdesc address.  */
-#define R_PARISC_PLABEL14R	70	/* Right 14 bits of fdesc address.  */
-#define R_PARISC_PCREL64	72	/* 64 bits PC-rel. address.  */
-#define R_PARISC_PCREL22F	74	/* 22 bits PC-rel. address.  */
-#define R_PARISC_PCREL14WR	75	/* PC-rel. address, right 14 bits.  */
-#define R_PARISC_PCREL14DR	76	/* PC rel. address, right 14 bits.  */
-#define R_PARISC_PCREL16F	77	/* 16 bits PC-rel. address.  */
-#define R_PARISC_PCREL16WF	78	/* 16 bits PC-rel. address.  */
-#define R_PARISC_PCREL16DF	79	/* 16 bits PC-rel. address.  */
-#define R_PARISC_DIR64		80	/* 64 bits of eff. address.  */
-#define R_PARISC_DIR14WR	83	/* 14 bits of eff. address.  */
-#define R_PARISC_DIR14DR	84	/* 14 bits of eff. address.  */
-#define R_PARISC_DIR16F		85	/* 16 bits of eff. address.  */
-#define R_PARISC_DIR16WF	86	/* 16 bits of eff. address.  */
-#define R_PARISC_DIR16DF	87	/* 16 bits of eff. address.  */
-#define R_PARISC_GPREL64	88	/* 64 bits of GP-rel. address.  */
-#define R_PARISC_GPREL14WR	91	/* GP-rel. address, right 14 bits.  */
-#define R_PARISC_GPREL14DR	92	/* GP-rel. address, right 14 bits.  */
-#define R_PARISC_GPREL16F	93	/* 16 bits GP-rel. address.  */
-#define R_PARISC_GPREL16WF	94	/* 16 bits GP-rel. address.  */
-#define R_PARISC_GPREL16DF	95	/* 16 bits GP-rel. address.  */
-#define R_PARISC_LTOFF64	96	/* 64 bits LT-rel. address.  */
-#define R_PARISC_LTOFF14WR	99	/* LT-rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF14DR	100	/* LT-rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF16F	101	/* 16 bits LT-rel. address.  */
-#define R_PARISC_LTOFF16WF	102	/* 16 bits LT-rel. address.  */
-#define R_PARISC_LTOFF16DF	103	/* 16 bits LT-rel. address.  */
-#define R_PARISC_SECREL64	104	/* 64 bits section rel. address.  */
-#define R_PARISC_SEGREL64	112	/* 64 bits segment rel. address.  */
-#define R_PARISC_PLTOFF14WR	115	/* PLT-rel. address, right 14 bits.  */
-#define R_PARISC_PLTOFF14DR	116	/* PLT-rel. address, right 14 bits.  */
-#define R_PARISC_PLTOFF16F	117	/* 16 bits LT-rel. address.  */
-#define R_PARISC_PLTOFF16WF	118	/* 16 bits PLT-rel. address.  */
-#define R_PARISC_PLTOFF16DF	119	/* 16 bits PLT-rel. address.  */
-#define R_PARISC_LTOFF_FPTR64	120	/* 64 bits LT-rel. function ptr.  */
-#define R_PARISC_LTOFF_FPTR14WR	123	/* LT-rel. fct. ptr., right 14 bits. */
-#define R_PARISC_LTOFF_FPTR14DR	124	/* LT-rel. fct. ptr., right 14 bits. */
-#define R_PARISC_LTOFF_FPTR16F	125	/* 16 bits LT-rel. function ptr.  */
-#define R_PARISC_LTOFF_FPTR16WF	126	/* 16 bits LT-rel. function ptr.  */
-#define R_PARISC_LTOFF_FPTR16DF	127	/* 16 bits LT-rel. function ptr.  */
-#define R_PARISC_LORESERVE	128
-#define R_PARISC_COPY		128	/* Copy relocation.  */
-#define R_PARISC_IPLT		129	/* Dynamic reloc, imported PLT */
-#define R_PARISC_EPLT		130	/* Dynamic reloc, exported PLT */
-#define R_PARISC_TPREL32	153	/* 32 bits TP-rel. address.  */
-#define R_PARISC_TPREL21L	154	/* TP-rel. address, left 21 bits.  */
-#define R_PARISC_TPREL14R	158	/* TP-rel. address, right 14 bits.  */
-#define R_PARISC_LTOFF_TP21L	162	/* LT-TP-rel. address, left 21 bits. */
-#define R_PARISC_LTOFF_TP14R	166	/* LT-TP-rel. address, right 14 bits.*/
-#define R_PARISC_LTOFF_TP14F	167	/* 14 bits LT-TP-rel. address.  */
-#define R_PARISC_TPREL64	216	/* 64 bits TP-rel. address.  */
-#define R_PARISC_TPREL14WR	219	/* TP-rel. address, right 14 bits.  */
-#define R_PARISC_TPREL14DR	220	/* TP-rel. address, right 14 bits.  */
-#define R_PARISC_TPREL16F	221	/* 16 bits TP-rel. address.  */
-#define R_PARISC_TPREL16WF	222	/* 16 bits TP-rel. address.  */
-#define R_PARISC_TPREL16DF	223	/* 16 bits TP-rel. address.  */
-#define R_PARISC_LTOFF_TP64	224	/* 64 bits LT-TP-rel. address.  */
-#define R_PARISC_LTOFF_TP14WR	227	/* LT-TP-rel. address, right 14 bits.*/
-#define R_PARISC_LTOFF_TP14DR	228	/* LT-TP-rel. address, right 14 bits.*/
-#define R_PARISC_LTOFF_TP16F	229	/* 16 bits LT-TP-rel. address.  */
-#define R_PARISC_LTOFF_TP16WF	230	/* 16 bits LT-TP-rel. address.  */
-#define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
-#define R_PARISC_GNU_VTENTRY	232
-#define R_PARISC_GNU_VTINHERIT	233
-#define R_PARISC_TLS_GD21L	234	/* GD 21-bit left.  */
-#define R_PARISC_TLS_GD14R	235	/* GD 14-bit right.  */
-#define R_PARISC_TLS_GDCALL	236	/* GD call to __t_g_a.  */
-#define R_PARISC_TLS_LDM21L	237	/* LD module 21-bit left.  */
-#define R_PARISC_TLS_LDM14R	238	/* LD module 14-bit right.  */
-#define R_PARISC_TLS_LDMCALL	239	/* LD module call to __t_g_a.  */
-#define R_PARISC_TLS_LDO21L	240	/* LD offset 21-bit left.  */
-#define R_PARISC_TLS_LDO14R	241	/* LD offset 14-bit right.  */
-#define R_PARISC_TLS_DTPMOD32	242	/* DTP module 32-bit.  */
-#define R_PARISC_TLS_DTPMOD64	243	/* DTP module 64-bit.  */
-#define R_PARISC_TLS_DTPOFF32	244	/* DTP offset 32-bit.  */
-#define R_PARISC_TLS_DTPOFF64	245	/* DTP offset 32-bit.  */
-#define R_PARISC_TLS_LE21L	R_PARISC_TPREL21L
-#define R_PARISC_TLS_LE14R	R_PARISC_TPREL14R
-#define R_PARISC_TLS_IE21L	R_PARISC_LTOFF_TP21L
-#define R_PARISC_TLS_IE14R	R_PARISC_LTOFF_TP14R
-#define R_PARISC_TLS_TPREL32	R_PARISC_TPREL32
-#define R_PARISC_TLS_TPREL64	R_PARISC_TPREL64
-#define R_PARISC_HIRESERVE	255
-
-/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
-
-#define PT_HP_TLS		(PT_LOOS + 0x0)
-#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
-#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
-#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
-#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
-#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
-#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
-#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
-#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
-#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
-#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
-#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
-#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
-#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
-#define PT_HP_STACK		(PT_LOOS + 0x14)
-
-#define PT_PARISC_ARCHEXT	0x70000000
-#define PT_PARISC_UNWIND	0x70000001
-
-/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
-
-#define PF_PARISC_SBP		0x08000000
-
-#define PF_HP_PAGE_SIZE		0x00100000
-#define PF_HP_FAR_SHARED	0x00200000
-#define PF_HP_NEAR_SHARED	0x00400000
-#define PF_HP_CODE		0x01000000
-#define PF_HP_MODIFY		0x02000000
-#define PF_HP_LAZYSWAP		0x04000000
-#define PF_HP_SBP		0x08000000
-
-
-/* Alpha specific definitions.  */
-
-/* Legal values for e_flags field of Elf64_Ehdr.  */
-
-#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
-#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
-
-/* Legal values for sh_type field of Elf64_Shdr.  */
-
-/* These two are primerily concerned with ECOFF debugging info.  */
-#define SHT_ALPHA_DEBUG		0x70000001
-#define SHT_ALPHA_REGINFO	0x70000002
-
-/* Legal values for sh_flags field of Elf64_Shdr.  */
-
-#define SHF_ALPHA_GPREL		0x10000000
-
-/* Legal values for st_other field of Elf64_Sym.  */
-#define STO_ALPHA_NOPV		0x80	/* No PV required.  */
-#define STO_ALPHA_STD_GPLOAD	0x88	/* PV only used for initial ldgp.  */
-
-/* Alpha relocs.  */
-
-#define R_ALPHA_NONE		0	/* No reloc */
-#define R_ALPHA_REFLONG		1	/* Direct 32 bit */
-#define R_ALPHA_REFQUAD		2	/* Direct 64 bit */
-#define R_ALPHA_GPREL32		3	/* GP relative 32 bit */
-#define R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
-#define R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
-#define R_ALPHA_GPDISP		6	/* Add displacement to GP */
-#define R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
-#define R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
-#define R_ALPHA_SREL16		9	/* PC relative 16 bit */
-#define R_ALPHA_SREL32		10	/* PC relative 32 bit */
-#define R_ALPHA_SREL64		11	/* PC relative 64 bit */
-#define R_ALPHA_GPRELHIGH	17	/* GP relative 32 bit, high 16 bits */
-#define R_ALPHA_GPRELLOW	18	/* GP relative 32 bit, low 16 bits */
-#define R_ALPHA_GPREL16		19	/* GP relative 16 bit */
-#define R_ALPHA_COPY		24	/* Copy symbol at runtime */
-#define R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
-#define R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
-#define R_ALPHA_RELATIVE	27	/* Adjust by program base */
-#define R_ALPHA_TLS_GD_HI	28
-#define R_ALPHA_TLSGD		29
-#define R_ALPHA_TLS_LDM		30
-#define R_ALPHA_DTPMOD64	31
-#define R_ALPHA_GOTDTPREL	32
-#define R_ALPHA_DTPREL64	33
-#define R_ALPHA_DTPRELHI	34
-#define R_ALPHA_DTPRELLO	35
-#define R_ALPHA_DTPREL16	36
-#define R_ALPHA_GOTTPREL	37
-#define R_ALPHA_TPREL64		38
-#define R_ALPHA_TPRELHI		39
-#define R_ALPHA_TPRELLO		40
-#define R_ALPHA_TPREL16		41
-/* Keep this the last entry.  */
-#define R_ALPHA_NUM		46
-
-/* Magic values of the LITUSE relocation addend.  */
-#define LITUSE_ALPHA_ADDR	0
-#define LITUSE_ALPHA_BASE	1
-#define LITUSE_ALPHA_BYTOFF	2
-#define LITUSE_ALPHA_JSR	3
-#define LITUSE_ALPHA_TLS_GD	4
-#define LITUSE_ALPHA_TLS_LDM	5
-
-/* Legal values for d_tag of Elf64_Dyn.  */
-#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
-#define DT_ALPHA_NUM		1
-
-/* PowerPC specific declarations */
-
-/* Values for Elf32/64_Ehdr.e_flags.  */
-#define EF_PPC_EMB		0x80000000	/* PowerPC embedded flag */
-
-/* Cygnus local bits below */
-#define EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag*/
-#define EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib
-						   flag */
-
-/* PowerPC relocations defined by the ABIs */
-#define R_PPC_NONE		0
-#define R_PPC_ADDR32		1	/* 32bit absolute address */
-#define R_PPC_ADDR24		2	/* 26bit address, 2 bits ignored.  */
-#define R_PPC_ADDR16		3	/* 16bit absolute address */
-#define R_PPC_ADDR16_LO		4	/* lower 16bit of absolute address */
-#define R_PPC_ADDR16_HI		5	/* high 16bit of absolute address */
-#define R_PPC_ADDR16_HA		6	/* adjusted high 16bit */
-#define R_PPC_ADDR14		7	/* 16bit address, 2 bits ignored */
-#define R_PPC_ADDR14_BRTAKEN	8
-#define R_PPC_ADDR14_BRNTAKEN	9
-#define R_PPC_REL24		10	/* PC relative 26 bit */
-#define R_PPC_REL14		11	/* PC relative 16 bit */
-#define R_PPC_REL14_BRTAKEN	12
-#define R_PPC_REL14_BRNTAKEN	13
-#define R_PPC_GOT16		14
-#define R_PPC_GOT16_LO		15
-#define R_PPC_GOT16_HI		16
-#define R_PPC_GOT16_HA		17
-#define R_PPC_PLTREL24		18
-#define R_PPC_COPY		19
-#define R_PPC_GLOB_DAT		20
-#define R_PPC_JMP_SLOT		21
-#define R_PPC_RELATIVE		22
-#define R_PPC_LOCAL24PC		23
-#define R_PPC_UADDR32		24
-#define R_PPC_UADDR16		25
-#define R_PPC_REL32		26
-#define R_PPC_PLT32		27
-#define R_PPC_PLTREL32		28
-#define R_PPC_PLT16_LO		29
-#define R_PPC_PLT16_HI		30
-#define R_PPC_PLT16_HA		31
-#define R_PPC_SDAREL16		32
-#define R_PPC_SECTOFF		33
-#define R_PPC_SECTOFF_LO	34
-#define R_PPC_SECTOFF_HI	35
-#define R_PPC_SECTOFF_HA	36
-
-/* PowerPC relocations defined for the TLS access ABI.  */
-#define R_PPC_TLS		67 /* none	(sym+add)@tls */
-#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
-#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
-#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
-#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
-#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
-#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
-#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
-#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
-#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
-#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
-#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
-#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
-#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
-#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
-#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
-#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
-#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
-#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
-#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
-#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
-#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
-#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
-#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
-#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
-#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
-#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
-#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
-#define R_PPC_TLSGD		95 /* none	(sym+add)@tlsgd */
-#define R_PPC_TLSLD		96 /* none	(sym+add)@tlsld */
-
-/* The remaining relocs are from the Embedded ELF ABI, and are not
-   in the SVR4 ELF ABI.  */
-#define R_PPC_EMB_NADDR32	101
-#define R_PPC_EMB_NADDR16	102
-#define R_PPC_EMB_NADDR16_LO	103
-#define R_PPC_EMB_NADDR16_HI	104
-#define R_PPC_EMB_NADDR16_HA	105
-#define R_PPC_EMB_SDAI16	106
-#define R_PPC_EMB_SDA2I16	107
-#define R_PPC_EMB_SDA2REL	108
-#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
-#define R_PPC_EMB_MRKREF	110
-#define R_PPC_EMB_RELSEC16	111
-#define R_PPC_EMB_RELST_LO	112
-#define R_PPC_EMB_RELST_HI	113
-#define R_PPC_EMB_RELST_HA	114
-#define R_PPC_EMB_BIT_FLD	115
-#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
-
-/* Diab tool relocations.  */
-#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
-#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
-#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
-#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
-#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
-#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
-
-/* GNU extension to support local ifunc.  */
-#define R_PPC_IRELATIVE		248
-
-/* GNU relocs used in PIC code sequences.  */
-#define R_PPC_REL16		249	/* half16   (sym+add-.) */
-#define R_PPC_REL16_LO		250	/* half16   (sym+add-.)@l */
-#define R_PPC_REL16_HI		251	/* half16   (sym+add-.)@h */
-#define R_PPC_REL16_HA		252	/* half16   (sym+add-.)@ha */
-
-/* This is a phony reloc to handle any old fashioned TOC16 references
-   that may still be in object files.  */
-#define R_PPC_TOC16		255
-
-/* PowerPC specific values for the Dyn d_tag field.  */
-#define DT_PPC_GOT		(DT_LOPROC + 0)
-#define DT_PPC_OPT		(DT_LOPROC + 1)
-#define DT_PPC_NUM		2
-
-/* PowerPC specific values for the DT_PPC_OPT Dyn entry.  */
-#define PPC_OPT_TLS		1
-
-/* PowerPC64 relocations defined by the ABIs */
-#define R_PPC64_NONE		R_PPC_NONE
-#define R_PPC64_ADDR32		R_PPC_ADDR32 /* 32bit absolute address */
-#define R_PPC64_ADDR24		R_PPC_ADDR24 /* 26bit address, word aligned */
-#define R_PPC64_ADDR16		R_PPC_ADDR16 /* 16bit absolute address */
-#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO	/* lower 16bits of address */
-#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI	/* high 16bits of address. */
-#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA /* adjusted high 16bits.  */
-#define R_PPC64_ADDR14		R_PPC_ADDR14 /* 16bit address, word aligned */
-#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
-#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
-#define R_PPC64_REL24		R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
-#define R_PPC64_REL14		R_PPC_REL14 /* PC relative 16 bit */
-#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
-#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
-#define R_PPC64_GOT16		R_PPC_GOT16
-#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
-#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
-#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
-
-#define R_PPC64_COPY		R_PPC_COPY
-#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
-#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
-#define R_PPC64_RELATIVE	R_PPC_RELATIVE
-
-#define R_PPC64_UADDR32		R_PPC_UADDR32
-#define R_PPC64_UADDR16		R_PPC_UADDR16
-#define R_PPC64_REL32		R_PPC_REL32
-#define R_PPC64_PLT32		R_PPC_PLT32
-#define R_PPC64_PLTREL32	R_PPC_PLTREL32
-#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
-#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
-#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
-
-#define R_PPC64_SECTOFF		R_PPC_SECTOFF
-#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
-#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
-#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
-#define R_PPC64_ADDR30		37 /* word30 (S + A - P) >> 2 */
-#define R_PPC64_ADDR64		38 /* doubleword64 S + A */
-#define R_PPC64_ADDR16_HIGHER	39 /* half16 #higher(S + A) */
-#define R_PPC64_ADDR16_HIGHERA	40 /* half16 #highera(S + A) */
-#define R_PPC64_ADDR16_HIGHEST	41 /* half16 #highest(S + A) */
-#define R_PPC64_ADDR16_HIGHESTA	42 /* half16 #highesta(S + A) */
-#define R_PPC64_UADDR64		43 /* doubleword64 S + A */
-#define R_PPC64_REL64		44 /* doubleword64 S + A - P */
-#define R_PPC64_PLT64		45 /* doubleword64 L + A */
-#define R_PPC64_PLTREL64	46 /* doubleword64 L + A - P */
-#define R_PPC64_TOC16		47 /* half16* S + A - .TOC */
-#define R_PPC64_TOC16_LO	48 /* half16 #lo(S + A - .TOC.) */
-#define R_PPC64_TOC16_HI	49 /* half16 #hi(S + A - .TOC.) */
-#define R_PPC64_TOC16_HA	50 /* half16 #ha(S + A - .TOC.) */
-#define R_PPC64_TOC		51 /* doubleword64 .TOC */
-#define R_PPC64_PLTGOT16	52 /* half16* M + A */
-#define R_PPC64_PLTGOT16_LO	53 /* half16 #lo(M + A) */
-#define R_PPC64_PLTGOT16_HI	54 /* half16 #hi(M + A) */
-#define R_PPC64_PLTGOT16_HA	55 /* half16 #ha(M + A) */
-
-#define R_PPC64_ADDR16_DS	56 /* half16ds* (S + A) >> 2 */
-#define R_PPC64_ADDR16_LO_DS	57 /* half16ds  #lo(S + A) >> 2 */
-#define R_PPC64_GOT16_DS	58 /* half16ds* (G + A) >> 2 */
-#define R_PPC64_GOT16_LO_DS	59 /* half16ds  #lo(G + A) >> 2 */
-#define R_PPC64_PLT16_LO_DS	60 /* half16ds  #lo(L + A) >> 2 */
-#define R_PPC64_SECTOFF_DS	61 /* half16ds* (R + A) >> 2 */
-#define R_PPC64_SECTOFF_LO_DS	62 /* half16ds  #lo(R + A) >> 2 */
-#define R_PPC64_TOC16_DS	63 /* half16ds* (S + A - .TOC.) >> 2 */
-#define R_PPC64_TOC16_LO_DS	64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
-#define R_PPC64_PLTGOT16_DS	65 /* half16ds* (M + A) >> 2 */
-#define R_PPC64_PLTGOT16_LO_DS	66 /* half16ds  #lo(M + A) >> 2 */
-
-/* PowerPC64 relocations defined for the TLS access ABI.  */
-#define R_PPC64_TLS		67 /* none	(sym+add)@tls */
-#define R_PPC64_DTPMOD64	68 /* doubleword64 (sym+add)@dtpmod */
-#define R_PPC64_TPREL16		69 /* half16*	(sym+add)@tprel */
-#define R_PPC64_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
-#define R_PPC64_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
-#define R_PPC64_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
-#define R_PPC64_TPREL64		73 /* doubleword64 (sym+add)@tprel */
-#define R_PPC64_DTPREL16	74 /* half16*	(sym+add)@dtprel */
-#define R_PPC64_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
-#define R_PPC64_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
-#define R_PPC64_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
-#define R_PPC64_DTPREL64	78 /* doubleword64 (sym+add)@dtprel */
-#define R_PPC64_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
-#define R_PPC64_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
-#define R_PPC64_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
-#define R_PPC64_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
-#define R_PPC64_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
-#define R_PPC64_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
-#define R_PPC64_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
-#define R_PPC64_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
-#define R_PPC64_GOT_TPREL16_DS	87 /* half16ds*	(sym+add)@got@tprel */
-#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
-#define R_PPC64_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
-#define R_PPC64_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
-#define R_PPC64_GOT_DTPREL16_DS	91 /* half16ds*	(sym+add)@got@dtprel */
-#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
-#define R_PPC64_GOT_DTPREL16_HI	93 /* half16	(sym+add)@got@dtprel@h */
-#define R_PPC64_GOT_DTPREL16_HA	94 /* half16	(sym+add)@got@dtprel@ha */
-#define R_PPC64_TPREL16_DS	95 /* half16ds*	(sym+add)@tprel */
-#define R_PPC64_TPREL16_LO_DS	96 /* half16ds	(sym+add)@tprel@l */
-#define R_PPC64_TPREL16_HIGHER	97 /* half16	(sym+add)@tprel@higher */
-#define R_PPC64_TPREL16_HIGHERA	98 /* half16	(sym+add)@tprel@highera */
-#define R_PPC64_TPREL16_HIGHEST	99 /* half16	(sym+add)@tprel@highest */
-#define R_PPC64_TPREL16_HIGHESTA 100 /* half16	(sym+add)@tprel@highesta */
-#define R_PPC64_DTPREL16_DS	101 /* half16ds* (sym+add)@dtprel */
-#define R_PPC64_DTPREL16_LO_DS	102 /* half16ds	(sym+add)@dtprel@l */
-#define R_PPC64_DTPREL16_HIGHER	103 /* half16	(sym+add)@dtprel@higher */
-#define R_PPC64_DTPREL16_HIGHERA 104 /* half16	(sym+add)@dtprel@highera */
-#define R_PPC64_DTPREL16_HIGHEST 105 /* half16	(sym+add)@dtprel@highest */
-#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16	(sym+add)@dtprel@highesta */
-#define R_PPC64_TLSGD		107 /* none	(sym+add)@tlsgd */
-#define R_PPC64_TLSLD		108 /* none	(sym+add)@tlsld */
-#define R_PPC64_TOCSAVE		109 /* none */
-
-/* Added when HA and HI relocs were changed to report overflows.  */
-#define R_PPC64_ADDR16_HIGH	110
-#define R_PPC64_ADDR16_HIGHA	111
-#define R_PPC64_TPREL16_HIGH	112
-#define R_PPC64_TPREL16_HIGHA	113
-#define R_PPC64_DTPREL16_HIGH	114
-#define R_PPC64_DTPREL16_HIGHA	115
-
-/* GNU extension to support local ifunc.  */
-#define R_PPC64_JMP_IREL	247
-#define R_PPC64_IRELATIVE	248
-#define R_PPC64_REL16		249	/* half16   (sym+add-.) */
-#define R_PPC64_REL16_LO	250	/* half16   (sym+add-.)@l */
-#define R_PPC64_REL16_HI	251	/* half16   (sym+add-.)@h */
-#define R_PPC64_REL16_HA	252	/* half16   (sym+add-.)@ha */
-
-/* e_flags bits specifying ABI.
-   1 for original function descriptor using ABI,
-   2 for revised ABI without function descriptors,
-   0 for unspecified or not using any features affected by the differences.  */
-#define EF_PPC64_ABI	3
-
-/* PowerPC64 specific values for the Dyn d_tag field.  */
-#define DT_PPC64_GLINK  (DT_LOPROC + 0)
-#define DT_PPC64_OPD	(DT_LOPROC + 1)
-#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
-#define DT_PPC64_OPT	(DT_LOPROC + 3)
-#define DT_PPC64_NUM    4
-
-/* PowerPC64 specific values for the DT_PPC64_OPT Dyn entry.  */
-#define PPC64_OPT_TLS		1
-#define PPC64_OPT_MULTI_TOC	2
-
-/* PowerPC64 specific values for the Elf64_Sym st_other field.  */
-#define STO_PPC64_LOCAL_BIT	5
-#define STO_PPC64_LOCAL_MASK	(7 << STO_PPC64_LOCAL_BIT)
-#define PPC64_LOCAL_ENTRY_OFFSET(other)				\
- (((1 << (((other) & STO_PPC64_LOCAL_MASK) >> STO_PPC64_LOCAL_BIT)) >> 2) << 2)
-
-
-/* ARM specific declarations */
-
-/* Processor specific flags for the ELF header e_flags field.  */
-#define EF_ARM_RELEXEC		0x01
-#define EF_ARM_HASENTRY		0x02
-#define EF_ARM_INTERWORK	0x04
-#define EF_ARM_APCS_26		0x08
-#define EF_ARM_APCS_FLOAT	0x10
-#define EF_ARM_PIC		0x20
-#define EF_ARM_ALIGN8		0x40 /* 8-bit structure alignment is in use */
-#define EF_ARM_NEW_ABI		0x80
-#define EF_ARM_OLD_ABI		0x100
-#define EF_ARM_SOFT_FLOAT	0x200
-#define EF_ARM_VFP_FLOAT	0x400
-#define EF_ARM_MAVERICK_FLOAT	0x800
-
-#define EF_ARM_ABI_FLOAT_SOFT	0x200   /* NB conflicts with EF_ARM_SOFT_FLOAT */
-#define EF_ARM_ABI_FLOAT_HARD	0x400   /* NB conflicts with EF_ARM_VFP_FLOAT */
-
-
-/* Other constants defined in the ARM ELF spec. version B-01.  */
-/* NB. These conflict with values defined above.  */
-#define EF_ARM_SYMSARESORTED	0x04
-#define EF_ARM_DYNSYMSUSESEGIDX	0x08
-#define EF_ARM_MAPSYMSFIRST	0x10
-#define EF_ARM_EABIMASK		0XFF000000
-
-/* Constants defined in AAELF.  */
-#define EF_ARM_BE8	    0x00800000
-#define EF_ARM_LE8	    0x00400000
-
-#define EF_ARM_EABI_VERSION(flags)	((flags) & EF_ARM_EABIMASK)
-#define EF_ARM_EABI_UNKNOWN	0x00000000
-#define EF_ARM_EABI_VER1	0x01000000
-#define EF_ARM_EABI_VER2	0x02000000
-#define EF_ARM_EABI_VER3	0x03000000
-#define EF_ARM_EABI_VER4	0x04000000
-#define EF_ARM_EABI_VER5	0x05000000
-
-/* Additional symbol types for Thumb.  */
-#define STT_ARM_TFUNC		STT_LOPROC /* A Thumb function.  */
-#define STT_ARM_16BIT		STT_HIPROC /* A Thumb label.  */
-
-/* ARM-specific values for sh_flags */
-#define SHF_ARM_ENTRYSECT	0x10000000 /* Section contains an entry point */
-#define SHF_ARM_COMDEF		0x80000000 /* Section may be multiply defined
-					      in the input to a link step.  */
-
-/* ARM-specific program header flags */
-#define PF_ARM_SB		0x10000000 /* Segment contains the location
-					      addressed by the static base. */
-#define PF_ARM_PI		0x20000000 /* Position-independent segment.  */
-#define PF_ARM_ABS		0x40000000 /* Absolute segment.  */
-
-/* Processor specific values for the Phdr p_type field.  */
-#define PT_ARM_EXIDX		(PT_LOPROC + 1)	/* ARM unwind segment.  */
-
-/* Processor specific values for the Shdr sh_type field.  */
-#define SHT_ARM_EXIDX		(SHT_LOPROC + 1) /* ARM unwind section.  */
-#define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2) /* Preemption details.  */
-#define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3) /* ARM attributes section.  */
-
-
-/* AArch64 relocs.  */
-
-#define R_AARCH64_NONE            0	/* No relocation.  */
-
-/* ILP32 AArch64 relocs.  */
-#define R_AARCH64_P32_ABS32		  1	/* Direct 32 bit.  */
-#define R_AARCH64_P32_COPY		180	/* Copy symbol at runtime.  */
-#define R_AARCH64_P32_GLOB_DAT		181	/* Create GOT entry.  */
-#define R_AARCH64_P32_JUMP_SLOT		182	/* Create PLT entry.  */
-#define R_AARCH64_P32_RELATIVE		183	/* Adjust by program base.  */
-#define R_AARCH64_P32_TLS_DTPMOD	184	/* Module number, 32 bit.  */
-#define R_AARCH64_P32_TLS_DTPREL	185	/* Module-relative offset, 32 bit.  */
-#define R_AARCH64_P32_TLS_TPREL		186	/* TP-relative offset, 32 bit.  */
-#define R_AARCH64_P32_TLSDESC		187	/* TLS Descriptor.  */
-#define R_AARCH64_P32_IRELATIVE		188	/* STT_GNU_IFUNC relocation. */
-
-/* LP64 AArch64 relocs.  */
-#define R_AARCH64_ABS64         257	/* Direct 64 bit. */
-#define R_AARCH64_ABS32         258	/* Direct 32 bit.  */
-#define R_AARCH64_ABS16		259	/* Direct 16-bit.  */
-#define R_AARCH64_PREL64	260	/* PC-relative 64-bit.	*/
-#define R_AARCH64_PREL32	261	/* PC-relative 32-bit.	*/
-#define R_AARCH64_PREL16	262	/* PC-relative 16-bit.	*/
-#define R_AARCH64_MOVW_UABS_G0	263	/* Dir. MOVZ imm. from bits 15:0.  */
-#define R_AARCH64_MOVW_UABS_G0_NC 264	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_UABS_G1	265	/* Dir. MOVZ imm. from bits 31:16.  */
-#define R_AARCH64_MOVW_UABS_G1_NC 266	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_UABS_G2	267	/* Dir. MOVZ imm. from bits 47:32.  */
-#define R_AARCH64_MOVW_UABS_G2_NC 268	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_UABS_G3	269	/* Dir. MOV{K,Z} imm. from 63:48.  */
-#define R_AARCH64_MOVW_SABS_G0	270	/* Dir. MOV{N,Z} imm. from 15:0.  */
-#define R_AARCH64_MOVW_SABS_G1	271	/* Dir. MOV{N,Z} imm. from 31:16.  */
-#define R_AARCH64_MOVW_SABS_G2	272	/* Dir. MOV{N,Z} imm. from 47:32.  */
-#define R_AARCH64_LD_PREL_LO19	273	/* PC-rel. LD imm. from bits 20:2.  */
-#define R_AARCH64_ADR_PREL_LO21	274	/* PC-rel. ADR imm. from bits 20:0.  */
-#define R_AARCH64_ADR_PREL_PG_HI21 275	/* Page-rel. ADRP imm. from 32:12.  */
-#define R_AARCH64_ADR_PREL_PG_HI21_NC 276 /* Likewise; no overflow check.  */
-#define R_AARCH64_ADD_ABS_LO12_NC 277	/* Dir. ADD imm. from bits 11:0.  */
-#define R_AARCH64_LDST8_ABS_LO12_NC 278	/* Likewise for LD/ST; no check. */
-#define R_AARCH64_TSTBR14	279	/* PC-rel. TBZ/TBNZ imm. from 15:2.  */
-#define R_AARCH64_CONDBR19	280	/* PC-rel. cond. br. imm. from 20:2. */
-#define R_AARCH64_JUMP26	282	/* PC-rel. B imm. from bits 27:2.  */
-#define R_AARCH64_CALL26	283	/* Likewise for CALL.  */
-#define R_AARCH64_LDST16_ABS_LO12_NC 284 /* Dir. ADD imm. from bits 11:1.  */
-#define R_AARCH64_LDST32_ABS_LO12_NC 285 /* Likewise for bits 11:2.  */
-#define R_AARCH64_LDST64_ABS_LO12_NC 286 /* Likewise for bits 11:3.  */
-#define R_AARCH64_MOVW_PREL_G0	287	/* PC-rel. MOV{N,Z} imm. from 15:0.  */
-#define R_AARCH64_MOVW_PREL_G0_NC 288	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_PREL_G1	289	/* PC-rel. MOV{N,Z} imm. from 31:16. */
-#define R_AARCH64_MOVW_PREL_G1_NC 290	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_PREL_G2	291	/* PC-rel. MOV{N,Z} imm. from 47:32. */
-#define R_AARCH64_MOVW_PREL_G2_NC 292	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_PREL_G3	293	/* PC-rel. MOV{N,Z} imm. from 63:48. */
-#define R_AARCH64_LDST128_ABS_LO12_NC 299 /* Dir. ADD imm. from bits 11:4.  */
-#define R_AARCH64_MOVW_GOTOFF_G0 300	/* GOT-rel. off. MOV{N,Z} imm. 15:0. */
-#define R_AARCH64_MOVW_GOTOFF_G0_NC 301	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_GOTOFF_G1 302	/* GOT-rel. o. MOV{N,Z} imm. 31:16.  */
-#define R_AARCH64_MOVW_GOTOFF_G1_NC 303	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_GOTOFF_G2 304	/* GOT-rel. o. MOV{N,Z} imm. 47:32.  */
-#define R_AARCH64_MOVW_GOTOFF_G2_NC 305	/* Likewise for MOVK; no check.  */
-#define R_AARCH64_MOVW_GOTOFF_G3 306	/* GOT-rel. o. MOV{N,Z} imm. 63:48.  */
-#define R_AARCH64_GOTREL64	307	/* GOT-relative 64-bit.  */
-#define R_AARCH64_GOTREL32	308	/* GOT-relative 32-bit.  */
-#define R_AARCH64_GOT_LD_PREL19	309	/* PC-rel. GOT off. load imm. 20:2.  */
-#define R_AARCH64_LD64_GOTOFF_LO15 310	/* GOT-rel. off. LD/ST imm. 14:3.  */
-#define R_AARCH64_ADR_GOT_PAGE	311	/* P-page-rel. GOT off. ADRP 32:12.  */
-#define R_AARCH64_LD64_GOT_LO12_NC 312	/* Dir. GOT off. LD/ST imm. 11:3.  */
-#define R_AARCH64_LD64_GOTPAGE_LO15 313	/* GOT-page-rel. GOT off. LD/ST 14:3 */
-#define R_AARCH64_TLSGD_ADR_PREL21 512	/* PC-relative ADR imm. 20:0.  */
-#define R_AARCH64_TLSGD_ADR_PAGE21 513	/* page-rel. ADRP imm. 32:12.  */
-#define R_AARCH64_TLSGD_ADD_LO12_NC 514	/* direct ADD imm. from 11:0.  */
-#define R_AARCH64_TLSGD_MOVW_G1	515	/* GOT-rel. MOV{N,Z} 31:16.  */
-#define R_AARCH64_TLSGD_MOVW_G0_NC 516	/* GOT-rel. MOVK imm. 15:0.  */
-#define R_AARCH64_TLSLD_ADR_PREL21 517	/* Like 512; local dynamic model.  */
-#define R_AARCH64_TLSLD_ADR_PAGE21 518	/* Like 513; local dynamic model.  */
-#define R_AARCH64_TLSLD_ADD_LO12_NC 519	/* Like 514; local dynamic model.  */
-#define R_AARCH64_TLSLD_MOVW_G1	520	/* Like 515; local dynamic model.  */
-#define R_AARCH64_TLSLD_MOVW_G0_NC 521	/* Like 516; local dynamic model.  */
-#define R_AARCH64_TLSLD_LD_PREL19 522	/* TLS PC-rel. load imm. 20:2.  */
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G2 523 /* TLS DTP-rel. MOV{N,Z} 47:32.  */
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G1 524 /* TLS DTP-rel. MOV{N,Z} 31:16.  */
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC 525 /* Likewise; MOVK; no check.  */
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G0 526 /* TLS DTP-rel. MOV{N,Z} 15:0.  */
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC 527 /* Likewise; MOVK; no check.  */
-#define R_AARCH64_TLSLD_ADD_DTPREL_HI12 528 /* DTP-rel. ADD imm. from 23:12. */
-#define R_AARCH64_TLSLD_ADD_DTPREL_LO12 529 /* DTP-rel. ADD imm. from 11:0.  */
-#define R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC 530 /* Likewise; no ovfl. check.  */
-#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12 531 /* DTP-rel. LD/ST imm. 11:0.  */
-#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC 532 /* Likewise; no check.  */
-#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12 533 /* DTP-rel. LD/ST imm. 11:1.  */
-#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC 534 /* Likewise; no check.  */
-#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12 535 /* DTP-rel. LD/ST imm. 11:2.  */
-#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC 536 /* Likewise; no check.  */
-#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12 537 /* DTP-rel. LD/ST imm. 11:3.  */
-#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC 538 /* Likewise; no check.  */
-#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G1 539 /* GOT-rel. MOV{N,Z} 31:16.  */
-#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC 540 /* GOT-rel. MOVK 15:0.  */
-#define R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 541 /* Page-rel. ADRP 32:12.  */
-#define R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC 542 /* Direct LD off. 11:3.  */
-#define R_AARCH64_TLSIE_LD_GOTTPREL_PREL19 543 /* PC-rel. load imm. 20:2.  */
-#define R_AARCH64_TLSLE_MOVW_TPREL_G2 544 /* TLS TP-rel. MOV{N,Z} 47:32.  */
-#define R_AARCH64_TLSLE_MOVW_TPREL_G1 545 /* TLS TP-rel. MOV{N,Z} 31:16.  */
-#define R_AARCH64_TLSLE_MOVW_TPREL_G1_NC 546 /* Likewise; MOVK; no check.  */
-#define R_AARCH64_TLSLE_MOVW_TPREL_G0 547 /* TLS TP-rel. MOV{N,Z} 15:0.  */
-#define R_AARCH64_TLSLE_MOVW_TPREL_G0_NC 548 /* Likewise; MOVK; no check.  */
-#define R_AARCH64_TLSLE_ADD_TPREL_HI12 549 /* TP-rel. ADD imm. 23:12.  */
-#define R_AARCH64_TLSLE_ADD_TPREL_LO12 550 /* TP-rel. ADD imm. 11:0.  */
-#define R_AARCH64_TLSLE_ADD_TPREL_LO12_NC 551 /* Likewise; no ovfl. check.  */
-#define R_AARCH64_TLSLE_LDST8_TPREL_LO12 552 /* TP-rel. LD/ST off. 11:0.  */
-#define R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC 553 /* Likewise; no ovfl. check. */
-#define R_AARCH64_TLSLE_LDST16_TPREL_LO12 554 /* TP-rel. LD/ST off. 11:1.  */
-#define R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC 555 /* Likewise; no check.  */
-#define R_AARCH64_TLSLE_LDST32_TPREL_LO12 556 /* TP-rel. LD/ST off. 11:2.  */
-#define R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC 557 /* Likewise; no check.  */
-#define R_AARCH64_TLSLE_LDST64_TPREL_LO12 558 /* TP-rel. LD/ST off. 11:3.  */
-#define R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC 559 /* Likewise; no check.  */
-#define R_AARCH64_TLSDESC_LD_PREL19 560	/* PC-rel. load immediate 20:2.  */
-#define R_AARCH64_TLSDESC_ADR_PREL21 561 /* PC-rel. ADR immediate 20:0.  */
-#define R_AARCH64_TLSDESC_ADR_PAGE21 562 /* Page-rel. ADRP imm. 32:12.  */
-#define R_AARCH64_TLSDESC_LD64_LO12 563	/* Direct LD off. from 11:3.  */
-#define R_AARCH64_TLSDESC_ADD_LO12 564	/* Direct ADD imm. from 11:0.  */
-#define R_AARCH64_TLSDESC_OFF_G1 565	/* GOT-rel. MOV{N,Z} imm. 31:16.  */
-#define R_AARCH64_TLSDESC_OFF_G0_NC 566	/* GOT-rel. MOVK imm. 15:0; no ck.  */
-#define R_AARCH64_TLSDESC_LDR	567	/* Relax LDR.  */
-#define R_AARCH64_TLSDESC_ADD	568	/* Relax ADD.  */
-#define R_AARCH64_TLSDESC_CALL	569	/* Relax BLR.  */
-#define R_AARCH64_TLSLE_LDST128_TPREL_LO12 570 /* TP-rel. LD/ST off. 11:4.  */
-#define R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC 571 /* Likewise; no check.  */
-#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12 572 /* DTP-rel. LD/ST imm. 11:4. */
-#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC 573 /* Likewise; no check.  */
-#define R_AARCH64_COPY         1024	/* Copy symbol at runtime.  */
-#define R_AARCH64_GLOB_DAT     1025	/* Create GOT entry.  */
-#define R_AARCH64_JUMP_SLOT    1026	/* Create PLT entry.  */
-#define R_AARCH64_RELATIVE     1027	/* Adjust by program base.  */
-#define R_AARCH64_TLS_DTPMOD   1028	/* Module number, 64 bit.  */
-#define R_AARCH64_TLS_DTPREL   1029	/* Module-relative offset, 64 bit.  */
-#define R_AARCH64_TLS_TPREL    1030	/* TP-relative offset, 64 bit.  */
-#define R_AARCH64_TLSDESC      1031	/* TLS Descriptor.  */
-#define R_AARCH64_IRELATIVE	1032	/* STT_GNU_IFUNC relocation.  */
-
-/* ARM relocs.  */
-
-#define R_ARM_NONE		0	/* No reloc */
-#define R_ARM_PC24		1	/* Deprecated PC relative 26
-					   bit branch.  */
-#define R_ARM_ABS32		2	/* Direct 32 bit  */
-#define R_ARM_REL32		3	/* PC relative 32 bit */
-#define R_ARM_PC13		4
-#define R_ARM_ABS16		5	/* Direct 16 bit */
-#define R_ARM_ABS12		6	/* Direct 12 bit */
-#define R_ARM_THM_ABS5		7	/* Direct & 0x7C (LDR, STR).  */
-#define R_ARM_ABS8		8	/* Direct 8 bit */
-#define R_ARM_SBREL32		9
-#define R_ARM_THM_PC22		10	/* PC relative 24 bit (Thumb32 BL).  */
-#define R_ARM_THM_PC8		11	/* PC relative & 0x3FC
-					   (Thumb16 LDR, ADD, ADR).  */
-#define R_ARM_AMP_VCALL9	12
-#define R_ARM_SWI24		13	/* Obsolete static relocation.  */
-#define R_ARM_TLS_DESC		13      /* Dynamic relocation.  */
-#define R_ARM_THM_SWI8		14	/* Reserved.  */
-#define R_ARM_XPC25		15	/* Reserved.  */
-#define R_ARM_THM_XPC22		16	/* Reserved.  */
-#define R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
-#define R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
-#define R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
-#define R_ARM_COPY		20	/* Copy symbol at runtime */
-#define R_ARM_GLOB_DAT		21	/* Create GOT entry */
-#define R_ARM_JUMP_SLOT		22	/* Create PLT entry */
-#define R_ARM_RELATIVE		23	/* Adjust by program base */
-#define R_ARM_GOTOFF		24	/* 32 bit offset to GOT */
-#define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
-#define R_ARM_GOT32		26	/* 32 bit GOT entry */
-#define R_ARM_PLT32		27	/* Deprecated, 32 bit PLT address.  */
-#define R_ARM_CALL		28	/* PC relative 24 bit (BL, BLX).  */
-#define R_ARM_JUMP24		29	/* PC relative 24 bit
-					   (B, BL<cond>).  */
-#define R_ARM_THM_JUMP24	30	/* PC relative 24 bit (Thumb32 B.W).  */
-#define R_ARM_BASE_ABS		31	/* Adjust by program base.  */
-#define R_ARM_ALU_PCREL_7_0	32	/* Obsolete.  */
-#define R_ARM_ALU_PCREL_15_8	33	/* Obsolete.  */
-#define R_ARM_ALU_PCREL_23_15	34	/* Obsolete.  */
-#define R_ARM_LDR_SBREL_11_0	35	/* Deprecated, prog. base relative.  */
-#define R_ARM_ALU_SBREL_19_12	36	/* Deprecated, prog. base relative.  */
-#define R_ARM_ALU_SBREL_27_20	37	/* Deprecated, prog. base relative.  */
-#define R_ARM_TARGET1		38
-#define R_ARM_SBREL31		39	/* Program base relative.  */
-#define R_ARM_V4BX		40
-#define R_ARM_TARGET2		41
-#define R_ARM_PREL31		42	/* 32 bit PC relative.  */
-#define R_ARM_MOVW_ABS_NC	43	/* Direct 16-bit (MOVW).  */
-#define R_ARM_MOVT_ABS		44	/* Direct high 16-bit (MOVT).  */
-#define R_ARM_MOVW_PREL_NC	45	/* PC relative 16-bit (MOVW).  */
-#define R_ARM_MOVT_PREL		46	/* PC relative (MOVT).  */
-#define R_ARM_THM_MOVW_ABS_NC	47	/* Direct 16 bit (Thumb32 MOVW).  */
-#define R_ARM_THM_MOVT_ABS	48	/* Direct high 16 bit
-					   (Thumb32 MOVT).  */
-#define R_ARM_THM_MOVW_PREL_NC	49	/* PC relative 16 bit
-					   (Thumb32 MOVW).  */
-#define R_ARM_THM_MOVT_PREL	50	/* PC relative high 16 bit
-					   (Thumb32 MOVT).  */
-#define R_ARM_THM_JUMP19	51	/* PC relative 20 bit
-					   (Thumb32 B<cond>.W).  */
-#define R_ARM_THM_JUMP6		52	/* PC relative X & 0x7E
-					   (Thumb16 CBZ, CBNZ).  */
-#define R_ARM_THM_ALU_PREL_11_0	53	/* PC relative 12 bit
-					   (Thumb32 ADR.W).  */
-#define R_ARM_THM_PC12		54	/* PC relative 12 bit
-					   (Thumb32 LDR{D,SB,H,SH}).  */
-#define R_ARM_ABS32_NOI		55	/* Direct 32-bit.  */
-#define R_ARM_REL32_NOI		56	/* PC relative 32-bit.  */
-#define R_ARM_ALU_PC_G0_NC	57	/* PC relative (ADD, SUB).  */
-#define R_ARM_ALU_PC_G0		58	/* PC relative (ADD, SUB).  */
-#define R_ARM_ALU_PC_G1_NC	59	/* PC relative (ADD, SUB).  */
-#define R_ARM_ALU_PC_G1		60	/* PC relative (ADD, SUB).  */
-#define R_ARM_ALU_PC_G2		61	/* PC relative (ADD, SUB).  */
-#define R_ARM_LDR_PC_G1		62	/* PC relative (LDR,STR,LDRB,STRB).  */
-#define R_ARM_LDR_PC_G2		63	/* PC relative (LDR,STR,LDRB,STRB).  */
-#define R_ARM_LDRS_PC_G0	64	/* PC relative (STR{D,H},
-					   LDR{D,SB,H,SH}).  */
-#define R_ARM_LDRS_PC_G1	65	/* PC relative (STR{D,H},
-					   LDR{D,SB,H,SH}).  */
-#define R_ARM_LDRS_PC_G2	66	/* PC relative (STR{D,H},
-					   LDR{D,SB,H,SH}).  */
-#define R_ARM_LDC_PC_G0		67	/* PC relative (LDC, STC).  */
-#define R_ARM_LDC_PC_G1		68	/* PC relative (LDC, STC).  */
-#define R_ARM_LDC_PC_G2		69	/* PC relative (LDC, STC).  */
-#define R_ARM_ALU_SB_G0_NC	70	/* Program base relative (ADD,SUB).  */
-#define R_ARM_ALU_SB_G0		71	/* Program base relative (ADD,SUB).  */
-#define R_ARM_ALU_SB_G1_NC	72	/* Program base relative (ADD,SUB).  */
-#define R_ARM_ALU_SB_G1		73	/* Program base relative (ADD,SUB).  */
-#define R_ARM_ALU_SB_G2		74	/* Program base relative (ADD,SUB).  */
-#define R_ARM_LDR_SB_G0		75	/* Program base relative (LDR,
-					   STR, LDRB, STRB).  */
-#define R_ARM_LDR_SB_G1		76	/* Program base relative
-					   (LDR, STR, LDRB, STRB).  */
-#define R_ARM_LDR_SB_G2		77	/* Program base relative
-					   (LDR, STR, LDRB, STRB).  */
-#define R_ARM_LDRS_SB_G0	78	/* Program base relative
-					   (LDR, STR, LDRB, STRB).  */
-#define R_ARM_LDRS_SB_G1	79	/* Program base relative
-					   (LDR, STR, LDRB, STRB).  */
-#define R_ARM_LDRS_SB_G2	80	/* Program base relative
-					   (LDR, STR, LDRB, STRB).  */
-#define R_ARM_LDC_SB_G0		81	/* Program base relative (LDC,STC).  */
-#define R_ARM_LDC_SB_G1		82	/* Program base relative (LDC,STC).  */
-#define R_ARM_LDC_SB_G2		83	/* Program base relative (LDC,STC).  */
-#define R_ARM_MOVW_BREL_NC	84	/* Program base relative 16
-					   bit (MOVW).  */
-#define R_ARM_MOVT_BREL		85	/* Program base relative high
-					   16 bit (MOVT).  */
-#define R_ARM_MOVW_BREL		86	/* Program base relative 16
-					   bit (MOVW).  */
-#define R_ARM_THM_MOVW_BREL_NC	87	/* Program base relative 16
-					   bit (Thumb32 MOVW).  */
-#define R_ARM_THM_MOVT_BREL	88	/* Program base relative high
-					   16 bit (Thumb32 MOVT).  */
-#define R_ARM_THM_MOVW_BREL	89	/* Program base relative 16
-					   bit (Thumb32 MOVW).  */
-#define R_ARM_TLS_GOTDESC	90
-#define R_ARM_TLS_CALL		91
-#define R_ARM_TLS_DESCSEQ	92	/* TLS relaxation.  */
-#define R_ARM_THM_TLS_CALL	93
-#define R_ARM_PLT32_ABS		94
-#define R_ARM_GOT_ABS		95	/* GOT entry.  */
-#define R_ARM_GOT_PREL		96	/* PC relative GOT entry.  */
-#define R_ARM_GOT_BREL12	97	/* GOT entry relative to GOT
-					   origin (LDR).  */
-#define R_ARM_GOTOFF12		98	/* 12 bit, GOT entry relative
-					   to GOT origin (LDR, STR).  */
-#define R_ARM_GOTRELAX		99
-#define R_ARM_GNU_VTENTRY	100
-#define R_ARM_GNU_VTINHERIT	101
-#define R_ARM_THM_PC11		102	/* PC relative & 0xFFE (Thumb16 B).  */
-#define R_ARM_THM_PC9		103	/* PC relative & 0x1FE
-					   (Thumb16 B/B<cond>).  */
-#define R_ARM_TLS_GD32		104	/* PC-rel 32 bit for global dynamic
-					   thread local data */
-#define R_ARM_TLS_LDM32		105	/* PC-rel 32 bit for local dynamic
-					   thread local data */
-#define R_ARM_TLS_LDO32		106	/* 32 bit offset relative to TLS
-					   block */
-#define R_ARM_TLS_IE32		107	/* PC-rel 32 bit for GOT entry of
-					   static TLS block offset */
-#define R_ARM_TLS_LE32		108	/* 32 bit offset relative to static
-					   TLS block */
-#define R_ARM_TLS_LDO12		109	/* 12 bit relative to TLS
-					   block (LDR, STR).  */
-#define R_ARM_TLS_LE12		110	/* 12 bit relative to static
-					   TLS block (LDR, STR).  */
-#define R_ARM_TLS_IE12GP	111	/* 12 bit GOT entry relative
-					   to GOT origin (LDR).  */
-#define R_ARM_ME_TOO		128	/* Obsolete.  */
-#define R_ARM_THM_TLS_DESCSEQ	129
-#define R_ARM_THM_TLS_DESCSEQ16	129
-#define R_ARM_THM_TLS_DESCSEQ32	130
-#define R_ARM_THM_GOT_BREL12	131	/* GOT entry relative to GOT
-					   origin, 12 bit (Thumb32 LDR).  */
-#define R_ARM_IRELATIVE		160
-#define R_ARM_RXPC25		249
-#define R_ARM_RSBREL32		250
-#define R_ARM_THM_RPC22		251
-#define R_ARM_RREL32		252
-#define R_ARM_RABS22		253
-#define R_ARM_RPC24		254
-#define R_ARM_RBASE		255
-/* Keep this the last entry.  */
-#define R_ARM_NUM		256
-
-/* IA-64 specific declarations.  */
-
-/* Processor specific flags for the Ehdr e_flags field.  */
-#define EF_IA_64_MASKOS		0x0000000f	/* os-specific flags */
-#define EF_IA_64_ABI64		0x00000010	/* 64-bit ABI */
-#define EF_IA_64_ARCH		0xff000000	/* arch. version mask */
-
-/* Processor specific values for the Phdr p_type field.  */
-#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
-#define PT_IA_64_UNWIND		(PT_LOPROC + 1)	/* ia64 unwind bits */
-#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
-#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
-#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
-
-/* Processor specific flags for the Phdr p_flags field.  */
-#define PF_IA_64_NORECOV	0x80000000	/* spec insns w/o recovery */
-
-/* Processor specific values for the Shdr sh_type field.  */
-#define SHT_IA_64_EXT		(SHT_LOPROC + 0) /* extension bits */
-#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1) /* unwind bits */
-
-/* Processor specific flags for the Shdr sh_flags field.  */
-#define SHF_IA_64_SHORT		0x10000000	/* section near gp */
-#define SHF_IA_64_NORECOV	0x20000000	/* spec insns w/o recovery */
-
-/* Processor specific values for the Dyn d_tag field.  */
-#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
-#define DT_IA_64_NUM		1
-
-/* IA-64 relocations.  */
-#define R_IA64_NONE		0x00	/* none */
-#define R_IA64_IMM14		0x21	/* symbol + addend, add imm14 */
-#define R_IA64_IMM22		0x22	/* symbol + addend, add imm22 */
-#define R_IA64_IMM64		0x23	/* symbol + addend, mov imm64 */
-#define R_IA64_DIR32MSB		0x24	/* symbol + addend, data4 MSB */
-#define R_IA64_DIR32LSB		0x25	/* symbol + addend, data4 LSB */
-#define R_IA64_DIR64MSB		0x26	/* symbol + addend, data8 MSB */
-#define R_IA64_DIR64LSB		0x27	/* symbol + addend, data8 LSB */
-#define R_IA64_GPREL22		0x2a	/* @gprel(sym + add), add imm22 */
-#define R_IA64_GPREL64I		0x2b	/* @gprel(sym + add), mov imm64 */
-#define R_IA64_GPREL32MSB	0x2c	/* @gprel(sym + add), data4 MSB */
-#define R_IA64_GPREL32LSB	0x2d	/* @gprel(sym + add), data4 LSB */
-#define R_IA64_GPREL64MSB	0x2e	/* @gprel(sym + add), data8 MSB */
-#define R_IA64_GPREL64LSB	0x2f	/* @gprel(sym + add), data8 LSB */
-#define R_IA64_LTOFF22		0x32	/* @ltoff(sym + add), add imm22 */
-#define R_IA64_LTOFF64I		0x33	/* @ltoff(sym + add), mov imm64 */
-#define R_IA64_PLTOFF22		0x3a	/* @pltoff(sym + add), add imm22 */
-#define R_IA64_PLTOFF64I	0x3b	/* @pltoff(sym + add), mov imm64 */
-#define R_IA64_PLTOFF64MSB	0x3e	/* @pltoff(sym + add), data8 MSB */
-#define R_IA64_PLTOFF64LSB	0x3f	/* @pltoff(sym + add), data8 LSB */
-#define R_IA64_FPTR64I		0x43	/* @fptr(sym + add), mov imm64 */
-#define R_IA64_FPTR32MSB	0x44	/* @fptr(sym + add), data4 MSB */
-#define R_IA64_FPTR32LSB	0x45	/* @fptr(sym + add), data4 LSB */
-#define R_IA64_FPTR64MSB	0x46	/* @fptr(sym + add), data8 MSB */
-#define R_IA64_FPTR64LSB	0x47	/* @fptr(sym + add), data8 LSB */
-#define R_IA64_PCREL60B		0x48	/* @pcrel(sym + add), brl */
-#define R_IA64_PCREL21B		0x49	/* @pcrel(sym + add), ptb, call */
-#define R_IA64_PCREL21M		0x4a	/* @pcrel(sym + add), chk.s */
-#define R_IA64_PCREL21F		0x4b	/* @pcrel(sym + add), fchkf */
-#define R_IA64_PCREL32MSB	0x4c	/* @pcrel(sym + add), data4 MSB */
-#define R_IA64_PCREL32LSB	0x4d	/* @pcrel(sym + add), data4 LSB */
-#define R_IA64_PCREL64MSB	0x4e	/* @pcrel(sym + add), data8 MSB */
-#define R_IA64_PCREL64LSB	0x4f	/* @pcrel(sym + add), data8 LSB */
-#define R_IA64_LTOFF_FPTR22	0x52	/* @ltoff(@fptr(s+a)), imm22 */
-#define R_IA64_LTOFF_FPTR64I	0x53	/* @ltoff(@fptr(s+a)), imm64 */
-#define R_IA64_LTOFF_FPTR32MSB	0x54	/* @ltoff(@fptr(s+a)), data4 MSB */
-#define R_IA64_LTOFF_FPTR32LSB	0x55	/* @ltoff(@fptr(s+a)), data4 LSB */
-#define R_IA64_LTOFF_FPTR64MSB	0x56	/* @ltoff(@fptr(s+a)), data8 MSB */
-#define R_IA64_LTOFF_FPTR64LSB	0x57	/* @ltoff(@fptr(s+a)), data8 LSB */
-#define R_IA64_SEGREL32MSB	0x5c	/* @segrel(sym + add), data4 MSB */
-#define R_IA64_SEGREL32LSB	0x5d	/* @segrel(sym + add), data4 LSB */
-#define R_IA64_SEGREL64MSB	0x5e	/* @segrel(sym + add), data8 MSB */
-#define R_IA64_SEGREL64LSB	0x5f	/* @segrel(sym + add), data8 LSB */
-#define R_IA64_SECREL32MSB	0x64	/* @secrel(sym + add), data4 MSB */
-#define R_IA64_SECREL32LSB	0x65	/* @secrel(sym + add), data4 LSB */
-#define R_IA64_SECREL64MSB	0x66	/* @secrel(sym + add), data8 MSB */
-#define R_IA64_SECREL64LSB	0x67	/* @secrel(sym + add), data8 LSB */
-#define R_IA64_REL32MSB		0x6c	/* data 4 + REL */
-#define R_IA64_REL32LSB		0x6d	/* data 4 + REL */
-#define R_IA64_REL64MSB		0x6e	/* data 8 + REL */
-#define R_IA64_REL64LSB		0x6f	/* data 8 + REL */
-#define R_IA64_LTV32MSB		0x74	/* symbol + addend, data4 MSB */
-#define R_IA64_LTV32LSB		0x75	/* symbol + addend, data4 LSB */
-#define R_IA64_LTV64MSB		0x76	/* symbol + addend, data8 MSB */
-#define R_IA64_LTV64LSB		0x77	/* symbol + addend, data8 LSB */
-#define R_IA64_PCREL21BI	0x79	/* @pcrel(sym + add), 21bit inst */
-#define R_IA64_PCREL22		0x7a	/* @pcrel(sym + add), 22bit inst */
-#define R_IA64_PCREL64I		0x7b	/* @pcrel(sym + add), 64bit inst */
-#define R_IA64_IPLTMSB		0x80	/* dynamic reloc, imported PLT, MSB */
-#define R_IA64_IPLTLSB		0x81	/* dynamic reloc, imported PLT, LSB */
-#define R_IA64_COPY		0x84	/* copy relocation */
-#define R_IA64_SUB		0x85	/* Addend and symbol difference */
-#define R_IA64_LTOFF22X		0x86	/* LTOFF22, relaxable.  */
-#define R_IA64_LDXMOV		0x87	/* Use of LTOFF22X.  */
-#define R_IA64_TPREL14		0x91	/* @tprel(sym + add), imm14 */
-#define R_IA64_TPREL22		0x92	/* @tprel(sym + add), imm22 */
-#define R_IA64_TPREL64I		0x93	/* @tprel(sym + add), imm64 */
-#define R_IA64_TPREL64MSB	0x96	/* @tprel(sym + add), data8 MSB */
-#define R_IA64_TPREL64LSB	0x97	/* @tprel(sym + add), data8 LSB */
-#define R_IA64_LTOFF_TPREL22	0x9a	/* @ltoff(@tprel(s+a)), imm2 */
-#define R_IA64_DTPMOD64MSB	0xa6	/* @dtpmod(sym + add), data8 MSB */
-#define R_IA64_DTPMOD64LSB	0xa7	/* @dtpmod(sym + add), data8 LSB */
-#define R_IA64_LTOFF_DTPMOD22	0xaa	/* @ltoff(@dtpmod(sym + add)), imm22 */
-#define R_IA64_DTPREL14		0xb1	/* @dtprel(sym + add), imm14 */
-#define R_IA64_DTPREL22		0xb2	/* @dtprel(sym + add), imm22 */
-#define R_IA64_DTPREL64I	0xb3	/* @dtprel(sym + add), imm64 */
-#define R_IA64_DTPREL32MSB	0xb4	/* @dtprel(sym + add), data4 MSB */
-#define R_IA64_DTPREL32LSB	0xb5	/* @dtprel(sym + add), data4 LSB */
-#define R_IA64_DTPREL64MSB	0xb6	/* @dtprel(sym + add), data8 MSB */
-#define R_IA64_DTPREL64LSB	0xb7	/* @dtprel(sym + add), data8 LSB */
-#define R_IA64_LTOFF_DTPREL22	0xba	/* @ltoff(@dtprel(s+a)), imm22 */
-
-/* SH specific declarations */
-
-/* Processor specific flags for the ELF header e_flags field.  */
-#define EF_SH_MACH_MASK		0x1f
-#define EF_SH_UNKNOWN		0x0
-#define EF_SH1			0x1
-#define EF_SH2			0x2
-#define EF_SH3			0x3
-#define EF_SH_DSP		0x4
-#define EF_SH3_DSP		0x5
-#define EF_SH4AL_DSP		0x6
-#define EF_SH3E			0x8
-#define EF_SH4			0x9
-#define EF_SH2E			0xb
-#define EF_SH4A			0xc
-#define EF_SH2A			0xd
-#define EF_SH4_NOFPU		0x10
-#define EF_SH4A_NOFPU		0x11
-#define EF_SH4_NOMMU_NOFPU	0x12
-#define EF_SH2A_NOFPU		0x13
-#define EF_SH3_NOMMU		0x14
-#define EF_SH2A_SH4_NOFPU	0x15
-#define EF_SH2A_SH3_NOFPU	0x16
-#define EF_SH2A_SH4		0x17
-#define EF_SH2A_SH3E		0x18
-
-/* SH relocs.  */
-#define	R_SH_NONE		0
-#define	R_SH_DIR32		1
-#define	R_SH_REL32		2
-#define	R_SH_DIR8WPN		3
-#define	R_SH_IND12W		4
-#define	R_SH_DIR8WPL		5
-#define	R_SH_DIR8WPZ		6
-#define	R_SH_DIR8BP		7
-#define	R_SH_DIR8W		8
-#define	R_SH_DIR8L		9
-#define	R_SH_SWITCH16		25
-#define	R_SH_SWITCH32		26
-#define	R_SH_USES		27
-#define	R_SH_COUNT		28
-#define	R_SH_ALIGN		29
-#define	R_SH_CODE		30
-#define	R_SH_DATA		31
-#define	R_SH_LABEL		32
-#define	R_SH_SWITCH8		33
-#define	R_SH_GNU_VTINHERIT	34
-#define	R_SH_GNU_VTENTRY	35
-#define	R_SH_TLS_GD_32		144
-#define	R_SH_TLS_LD_32		145
-#define	R_SH_TLS_LDO_32		146
-#define	R_SH_TLS_IE_32		147
-#define	R_SH_TLS_LE_32		148
-#define	R_SH_TLS_DTPMOD32	149
-#define	R_SH_TLS_DTPOFF32	150
-#define	R_SH_TLS_TPOFF32	151
-#define	R_SH_GOT32		160
-#define	R_SH_PLT32		161
-#define	R_SH_COPY		162
-#define	R_SH_GLOB_DAT		163
-#define	R_SH_JMP_SLOT		164
-#define	R_SH_RELATIVE		165
-#define	R_SH_GOTOFF		166
-#define	R_SH_GOTPC		167
-/* Keep this the last entry.  */
-#define	R_SH_NUM		256
-
-/* S/390 specific definitions.  */
-
-/* Valid values for the e_flags field.  */
-
-#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  */
-
-/* Additional s390 relocs */
-
-#define R_390_NONE		0	/* No reloc.  */
-#define R_390_8			1	/* Direct 8 bit.  */
-#define R_390_12		2	/* Direct 12 bit.  */
-#define R_390_16		3	/* Direct 16 bit.  */
-#define R_390_32		4	/* Direct 32 bit.  */
-#define R_390_PC32		5	/* PC relative 32 bit.	*/
-#define R_390_GOT12		6	/* 12 bit GOT offset.  */
-#define R_390_GOT32		7	/* 32 bit GOT offset.  */
-#define R_390_PLT32		8	/* 32 bit PC relative PLT address.  */
-#define R_390_COPY		9	/* Copy symbol at runtime.  */
-#define R_390_GLOB_DAT		10	/* Create GOT entry.  */
-#define R_390_JMP_SLOT		11	/* Create PLT entry.  */
-#define R_390_RELATIVE		12	/* Adjust by program base.  */
-#define R_390_GOTOFF32		13	/* 32 bit offset to GOT.	 */
-#define R_390_GOTPC		14	/* 32 bit PC relative offset to GOT.  */
-#define R_390_GOT16		15	/* 16 bit GOT offset.  */
-#define R_390_PC16		16	/* PC relative 16 bit.	*/
-#define R_390_PC16DBL		17	/* PC relative 16 bit shifted by 1.  */
-#define R_390_PLT16DBL		18	/* 16 bit PC rel. PLT shifted by 1.  */
-#define R_390_PC32DBL		19	/* PC relative 32 bit shifted by 1.  */
-#define R_390_PLT32DBL		20	/* 32 bit PC rel. PLT shifted by 1.  */
-#define R_390_GOTPCDBL		21	/* 32 bit PC rel. GOT shifted by 1.  */
-#define R_390_64		22	/* Direct 64 bit.  */
-#define R_390_PC64		23	/* PC relative 64 bit.	*/
-#define R_390_GOT64		24	/* 64 bit GOT offset.  */
-#define R_390_PLT64		25	/* 64 bit PC relative PLT address.  */
-#define R_390_GOTENT		26	/* 32 bit PC rel. to GOT entry >> 1. */
-#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
-#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
-#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
-#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
-#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
-#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
-#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
-#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
-#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
-#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
-#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
-#define R_390_TLS_GDCALL	38	/* Tag for function call in general
-					   dynamic TLS code. */
-#define R_390_TLS_LDCALL	39	/* Tag for function call in local
-					   dynamic TLS code. */
-#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
-					   thread local data.  */
-#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
-					  thread local data.  */
-#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
-					   block offset.  */
-#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
-					   block offset.  */
-#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
-					   block offset. */
-#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
-					   thread local data in LE code.  */
-#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
-					   thread local data in LE code.  */
-#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
-					   negated static TLS block offset.  */
-#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
-					   negated static TLS block offset.  */
-#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
-					   negated static TLS block offset.  */
-#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
-					   static TLS block.  */
-#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
-					   static TLS block.  */
-#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
-					   block.  */
-#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
-					   block.  */
-#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
-#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
-#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
-					   block.  */
-#define R_390_20		57	/* Direct 20 bit.  */
-#define R_390_GOT20		58	/* 20 bit GOT offset.  */
-#define R_390_GOTPLT20		59	/* 20 bit offset to jump slot.  */
-#define R_390_TLS_GOTIE20	60	/* 20 bit GOT offset for static TLS
-					   block offset.  */
-#define R_390_IRELATIVE         61      /* STT_GNU_IFUNC relocation.  */
-/* Keep this the last entry.  */
-#define R_390_NUM		62
-
-
-/* CRIS relocations.  */
-#define R_CRIS_NONE		0
-#define R_CRIS_8		1
-#define R_CRIS_16		2
-#define R_CRIS_32		3
-#define R_CRIS_8_PCREL		4
-#define R_CRIS_16_PCREL		5
-#define R_CRIS_32_PCREL		6
-#define R_CRIS_GNU_VTINHERIT	7
-#define R_CRIS_GNU_VTENTRY	8
-#define R_CRIS_COPY		9
-#define R_CRIS_GLOB_DAT		10
-#define R_CRIS_JUMP_SLOT	11
-#define R_CRIS_RELATIVE		12
-#define R_CRIS_16_GOT		13
-#define R_CRIS_32_GOT		14
-#define R_CRIS_16_GOTPLT	15
-#define R_CRIS_32_GOTPLT	16
-#define R_CRIS_32_GOTREL	17
-#define R_CRIS_32_PLT_GOTREL	18
-#define R_CRIS_32_PLT_PCREL	19
-
-#define R_CRIS_NUM		20
-
-
-/* AMD x86-64 relocations.  */
-#define R_X86_64_NONE		0	/* No reloc */
-#define R_X86_64_64		1	/* Direct 64 bit  */
-#define R_X86_64_PC32		2	/* PC relative 32 bit signed */
-#define R_X86_64_GOT32		3	/* 32 bit GOT entry */
-#define R_X86_64_PLT32		4	/* 32 bit PLT address */
-#define R_X86_64_COPY		5	/* Copy symbol at runtime */
-#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
-#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
-#define R_X86_64_RELATIVE	8	/* Adjust by program base */
-#define R_X86_64_GOTPCREL	9	/* 32 bit signed PC relative
-					   offset to GOT */
-#define R_X86_64_32		10	/* Direct 32 bit zero extended */
-#define R_X86_64_32S		11	/* Direct 32 bit sign extended */
-#define R_X86_64_16		12	/* Direct 16 bit zero extended */
-#define R_X86_64_PC16		13	/* 16 bit sign extended pc relative */
-#define R_X86_64_8		14	/* Direct 8 bit sign extended  */
-#define R_X86_64_PC8		15	/* 8 bit sign extended pc relative */
-#define R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
-#define R_X86_64_DTPOFF64	17	/* Offset in module's TLS block */
-#define R_X86_64_TPOFF64	18	/* Offset in initial TLS block */
-#define R_X86_64_TLSGD		19	/* 32 bit signed PC relative offset
-					   to two GOT entries for GD symbol */
-#define R_X86_64_TLSLD		20	/* 32 bit signed PC relative offset
-					   to two GOT entries for LD symbol */
-#define R_X86_64_DTPOFF32	21	/* Offset in TLS block */
-#define R_X86_64_GOTTPOFF	22	/* 32 bit signed PC relative offset
-					   to GOT entry for IE symbol */
-#define R_X86_64_TPOFF32	23	/* Offset in initial TLS block */
-#define R_X86_64_PC64		24	/* PC relative 64 bit */
-#define R_X86_64_GOTOFF64	25	/* 64 bit offset to GOT */
-#define R_X86_64_GOTPC32	26	/* 32 bit signed pc relative
-					   offset to GOT */
-#define R_X86_64_GOT64		27	/* 64-bit GOT entry offset */
-#define R_X86_64_GOTPCREL64	28	/* 64-bit PC relative offset
-					   to GOT entry */
-#define R_X86_64_GOTPC64	29	/* 64-bit PC relative offset to GOT */
-#define R_X86_64_GOTPLT64	30 	/* like GOT64, says PLT entry needed */
-#define R_X86_64_PLTOFF64	31	/* 64-bit GOT relative offset
-					   to PLT entry */
-#define R_X86_64_SIZE32		32	/* Size of symbol plus 32-bit addend */
-#define R_X86_64_SIZE64		33	/* Size of symbol plus 64-bit addend */
-#define R_X86_64_GOTPC32_TLSDESC 34	/* GOT offset for TLS descriptor.  */
-#define R_X86_64_TLSDESC_CALL   35	/* Marker for call through TLS
-					   descriptor.  */
-#define R_X86_64_TLSDESC        36	/* TLS descriptor.  */
-#define R_X86_64_IRELATIVE	37	/* Adjust indirectly by program base */
-#define R_X86_64_RELATIVE64	38	/* 64-bit adjust by program base */
-
-#define R_X86_64_NUM		39
-
-
-/* AM33 relocations.  */
-#define R_MN10300_NONE		0	/* No reloc.  */
-#define R_MN10300_32		1	/* Direct 32 bit.  */
-#define R_MN10300_16		2	/* Direct 16 bit.  */
-#define R_MN10300_8		3	/* Direct 8 bit.  */
-#define R_MN10300_PCREL32	4	/* PC-relative 32-bit.  */
-#define R_MN10300_PCREL16	5	/* PC-relative 16-bit signed.  */
-#define R_MN10300_PCREL8	6	/* PC-relative 8-bit signed.  */
-#define R_MN10300_GNU_VTINHERIT	7	/* Ancient C++ vtable garbage... */
-#define R_MN10300_GNU_VTENTRY	8	/* ... collection annotation.  */
-#define R_MN10300_24		9	/* Direct 24 bit.  */
-#define R_MN10300_GOTPC32	10	/* 32-bit PCrel offset to GOT.  */
-#define R_MN10300_GOTPC16	11	/* 16-bit PCrel offset to GOT.  */
-#define R_MN10300_GOTOFF32	12	/* 32-bit offset from GOT.  */
-#define R_MN10300_GOTOFF24	13	/* 24-bit offset from GOT.  */
-#define R_MN10300_GOTOFF16	14	/* 16-bit offset from GOT.  */
-#define R_MN10300_PLT32		15	/* 32-bit PCrel to PLT entry.  */
-#define R_MN10300_PLT16		16	/* 16-bit PCrel to PLT entry.  */
-#define R_MN10300_GOT32		17	/* 32-bit offset to GOT entry.  */
-#define R_MN10300_GOT24		18	/* 24-bit offset to GOT entry.  */
-#define R_MN10300_GOT16		19	/* 16-bit offset to GOT entry.  */
-#define R_MN10300_COPY		20	/* Copy symbol at runtime.  */
-#define R_MN10300_GLOB_DAT	21	/* Create GOT entry.  */
-#define R_MN10300_JMP_SLOT	22	/* Create PLT entry.  */
-#define R_MN10300_RELATIVE	23	/* Adjust by program base.  */
-#define R_MN10300_TLS_GD	24	/* 32-bit offset for global dynamic.  */
-#define R_MN10300_TLS_LD	25	/* 32-bit offset for local dynamic.  */
-#define R_MN10300_TLS_LDO	26	/* Module-relative offset.  */
-#define R_MN10300_TLS_GOTIE	27	/* GOT offset for static TLS block
-					   offset.  */
-#define R_MN10300_TLS_IE	28	/* GOT address for static TLS block
-					   offset.  */
-#define R_MN10300_TLS_LE	29	/* Offset relative to static TLS
-					   block.  */
-#define R_MN10300_TLS_DTPMOD	30	/* ID of module containing symbol.  */
-#define R_MN10300_TLS_DTPOFF	31	/* Offset in module TLS block.  */
-#define R_MN10300_TLS_TPOFF	32	/* Offset in static TLS block.  */
-#define R_MN10300_SYM_DIFF	33	/* Adjustment for next reloc as needed
-					   by linker relaxation.  */
-#define R_MN10300_ALIGN		34	/* Alignment requirement for linker
-					   relaxation.  */
-#define R_MN10300_NUM		35
-
-
-/* M32R relocs.  */
-#define R_M32R_NONE		0	/* No reloc. */
-#define R_M32R_16		1	/* Direct 16 bit. */
-#define R_M32R_32		2	/* Direct 32 bit. */
-#define R_M32R_24		3	/* Direct 24 bit. */
-#define R_M32R_10_PCREL		4	/* PC relative 10 bit shifted. */
-#define R_M32R_18_PCREL		5	/* PC relative 18 bit shifted. */
-#define R_M32R_26_PCREL		6	/* PC relative 26 bit shifted. */
-#define R_M32R_HI16_ULO		7	/* High 16 bit with unsigned low. */
-#define R_M32R_HI16_SLO		8	/* High 16 bit with signed low. */
-#define R_M32R_LO16		9	/* Low 16 bit. */
-#define R_M32R_SDA16		10	/* 16 bit offset in SDA. */
-#define R_M32R_GNU_VTINHERIT	11
-#define R_M32R_GNU_VTENTRY	12
-/* M32R relocs use SHT_RELA.  */
-#define R_M32R_16_RELA		33	/* Direct 16 bit. */
-#define R_M32R_32_RELA		34	/* Direct 32 bit. */
-#define R_M32R_24_RELA		35	/* Direct 24 bit. */
-#define R_M32R_10_PCREL_RELA	36	/* PC relative 10 bit shifted. */
-#define R_M32R_18_PCREL_RELA	37	/* PC relative 18 bit shifted. */
-#define R_M32R_26_PCREL_RELA	38	/* PC relative 26 bit shifted. */
-#define R_M32R_HI16_ULO_RELA	39	/* High 16 bit with unsigned low */
-#define R_M32R_HI16_SLO_RELA	40	/* High 16 bit with signed low */
-#define R_M32R_LO16_RELA	41	/* Low 16 bit */
-#define R_M32R_SDA16_RELA	42	/* 16 bit offset in SDA */
-#define R_M32R_RELA_GNU_VTINHERIT	43
-#define R_M32R_RELA_GNU_VTENTRY	44
-#define R_M32R_REL32		45	/* PC relative 32 bit.  */
-
-#define R_M32R_GOT24		48	/* 24 bit GOT entry */
-#define R_M32R_26_PLTREL	49	/* 26 bit PC relative to PLT shifted */
-#define R_M32R_COPY		50	/* Copy symbol at runtime */
-#define R_M32R_GLOB_DAT		51	/* Create GOT entry */
-#define R_M32R_JMP_SLOT		52	/* Create PLT entry */
-#define R_M32R_RELATIVE		53	/* Adjust by program base */
-#define R_M32R_GOTOFF		54	/* 24 bit offset to GOT */
-#define R_M32R_GOTPC24		55	/* 24 bit PC relative offset to GOT */
-#define R_M32R_GOT16_HI_ULO	56	/* High 16 bit GOT entry with unsigned
-					   low */
-#define R_M32R_GOT16_HI_SLO	57	/* High 16 bit GOT entry with signed
-					   low */
-#define R_M32R_GOT16_LO		58	/* Low 16 bit GOT entry */
-#define R_M32R_GOTPC_HI_ULO	59	/* High 16 bit PC relative offset to
-					   GOT with unsigned low */
-#define R_M32R_GOTPC_HI_SLO	60	/* High 16 bit PC relative offset to
-					   GOT with signed low */
-#define R_M32R_GOTPC_LO		61	/* Low 16 bit PC relative offset to
-					   GOT */
-#define R_M32R_GOTOFF_HI_ULO	62	/* High 16 bit offset to GOT
-					   with unsigned low */
-#define R_M32R_GOTOFF_HI_SLO	63	/* High 16 bit offset to GOT
-					   with signed low */
-#define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
-#define R_M32R_NUM		256	/* Keep this the last entry. */
-
-/* MicroBlaze relocations */
-#define R_MICROBLAZE_NONE		0	/* No reloc. */
-#define R_MICROBLAZE_32 		1	/* Direct 32 bit. */
-#define R_MICROBLAZE_32_PCREL		2	/* PC relative 32 bit. */
-#define R_MICROBLAZE_64_PCREL		3	/* PC relative 64 bit. */
-#define R_MICROBLAZE_32_PCREL_LO	4	/* Low 16 bits of PCREL32. */
-#define R_MICROBLAZE_64 		5	/* Direct 64 bit. */
-#define R_MICROBLAZE_32_LO		6	/* Low 16 bit. */
-#define R_MICROBLAZE_SRO32		7	/* Read-only small data area. */
-#define R_MICROBLAZE_SRW32		8	/* Read-write small data area. */
-#define R_MICROBLAZE_64_NONE		9	/* No reloc. */
-#define R_MICROBLAZE_32_SYM_OP_SYM	10	/* Symbol Op Symbol relocation. */
-#define R_MICROBLAZE_GNU_VTINHERIT	11	/* GNU C++ vtable hierarchy. */
-#define R_MICROBLAZE_GNU_VTENTRY	12	/* GNU C++ vtable member usage. */
-#define R_MICROBLAZE_GOTPC_64		13	/* PC-relative GOT offset.  */
-#define R_MICROBLAZE_GOT_64		14	/* GOT entry offset.  */
-#define R_MICROBLAZE_PLT_64		15	/* PLT offset (PC-relative).  */
-#define R_MICROBLAZE_REL		16	/* Adjust by program base.  */
-#define R_MICROBLAZE_JUMP_SLOT		17	/* Create PLT entry.  */
-#define R_MICROBLAZE_GLOB_DAT		18	/* Create GOT entry.  */
-#define R_MICROBLAZE_GOTOFF_64		19	/* 64 bit offset to GOT. */
-#define R_MICROBLAZE_GOTOFF_32		20	/* 32 bit offset to GOT. */
-#define R_MICROBLAZE_COPY		21	/* Runtime copy.  */
-#define R_MICROBLAZE_TLS		22	/* TLS Reloc. */
-#define R_MICROBLAZE_TLSGD		23	/* TLS General Dynamic. */
-#define R_MICROBLAZE_TLSLD		24	/* TLS Local Dynamic. */
-#define R_MICROBLAZE_TLSDTPMOD32	25	/* TLS Module ID. */
-#define R_MICROBLAZE_TLSDTPREL32	26	/* TLS Offset Within TLS Block. */
-#define R_MICROBLAZE_TLSDTPREL64	27	/* TLS Offset Within TLS Block. */
-#define R_MICROBLAZE_TLSGOTTPREL32	28	/* TLS Offset From Thread Pointer. */
-#define R_MICROBLAZE_TLSTPREL32 	29	/* TLS Offset From Thread Pointer. */
-
-/* Legal values for d_tag (dynamic entry type).  */
-#define DT_NIOS2_GP             0x70000002 /* Address of _gp.  */
-
-/* Nios II relocations.  */
-#define R_NIOS2_NONE		0	/* No reloc.  */
-#define R_NIOS2_S16		1	/* Direct signed 16 bit.  */
-#define R_NIOS2_U16		2	/* Direct unsigned 16 bit.  */
-#define R_NIOS2_PCREL16		3	/* PC relative 16 bit.  */
-#define R_NIOS2_CALL26		4	/* Direct call.  */
-#define R_NIOS2_IMM5		5	/* 5 bit constant expression.  */
-#define R_NIOS2_CACHE_OPX	6	/* 5 bit expression, shift 22.  */
-#define R_NIOS2_IMM6		7	/* 6 bit constant expression.  */
-#define R_NIOS2_IMM8		8	/* 8 bit constant expression.  */
-#define R_NIOS2_HI16		9	/* High 16 bit.  */
-#define R_NIOS2_LO16		10	/* Low 16 bit.  */
-#define R_NIOS2_HIADJ16		11	/* High 16 bit, adjusted.  */
-#define R_NIOS2_BFD_RELOC_32	12	/* 32 bit symbol value + addend.  */
-#define R_NIOS2_BFD_RELOC_16	13	/* 16 bit symbol value + addend.  */
-#define R_NIOS2_BFD_RELOC_8	14	/* 8 bit symbol value + addend.  */
-#define R_NIOS2_GPREL		15	/* 16 bit GP pointer offset.  */
-#define R_NIOS2_GNU_VTINHERIT	16	/* GNU C++ vtable hierarchy.  */
-#define R_NIOS2_GNU_VTENTRY	17	/* GNU C++ vtable member usage.  */
-#define R_NIOS2_UJMP		18	/* Unconditional branch.  */
-#define R_NIOS2_CJMP		19	/* Conditional branch.  */
-#define R_NIOS2_CALLR		20	/* Indirect call through register.  */
-#define R_NIOS2_ALIGN		21	/* Alignment requirement for
-					   linker relaxation.  */
-#define R_NIOS2_GOT16		22	/* 16 bit GOT entry.  */
-#define R_NIOS2_CALL16		23	/* 16 bit GOT entry for function.  */
-#define R_NIOS2_GOTOFF_LO	24	/* %lo of offset to GOT pointer.  */
-#define R_NIOS2_GOTOFF_HA	25	/* %hiadj of offset to GOT pointer.  */
-#define R_NIOS2_PCREL_LO	26	/* %lo of PC relative offset.  */
-#define R_NIOS2_PCREL_HA	27	/* %hiadj of PC relative offset.  */
-#define R_NIOS2_TLS_GD16	28	/* 16 bit GOT offset for TLS GD.  */
-#define R_NIOS2_TLS_LDM16	29	/* 16 bit GOT offset for TLS LDM.  */
-#define R_NIOS2_TLS_LDO16	30	/* 16 bit module relative offset.  */
-#define R_NIOS2_TLS_IE16	31	/* 16 bit GOT offset for TLS IE.  */
-#define R_NIOS2_TLS_LE16	32	/* 16 bit LE TP-relative offset.  */
-#define R_NIOS2_TLS_DTPMOD	33	/* Module number.  */
-#define R_NIOS2_TLS_DTPREL	34	/* Module-relative offset.  */
-#define R_NIOS2_TLS_TPREL	35	/* TP-relative offset.  */
-#define R_NIOS2_COPY		36	/* Copy symbol at runtime.  */
-#define R_NIOS2_GLOB_DAT	37	/* Create GOT entry.  */
-#define R_NIOS2_JUMP_SLOT	38	/* Create PLT entry.  */
-#define R_NIOS2_RELATIVE	39	/* Adjust by program base.  */
-#define R_NIOS2_GOTOFF		40	/* 16 bit offset to GOT pointer.  */
-#define R_NIOS2_CALL26_NOAT	41	/* Direct call in .noat section.  */
-#define R_NIOS2_GOT_LO		42	/* %lo() of GOT entry.  */
-#define R_NIOS2_GOT_HA		43	/* %hiadj() of GOT entry.  */
-#define R_NIOS2_CALL_LO		44	/* %lo() of function GOT entry.  */
-#define R_NIOS2_CALL_HA		45	/* %hiadj() of function GOT entry.  */
-
-/* TILEPro relocations.  */
-#define R_TILEPRO_NONE		0	/* No reloc */
-#define R_TILEPRO_32		1	/* Direct 32 bit */
-#define R_TILEPRO_16		2	/* Direct 16 bit */
-#define R_TILEPRO_8		3	/* Direct 8 bit */
-#define R_TILEPRO_32_PCREL	4	/* PC relative 32 bit */
-#define R_TILEPRO_16_PCREL	5	/* PC relative 16 bit */
-#define R_TILEPRO_8_PCREL	6	/* PC relative 8 bit */
-#define R_TILEPRO_LO16		7	/* Low 16 bit */
-#define R_TILEPRO_HI16		8	/* High 16 bit */
-#define R_TILEPRO_HA16		9	/* High 16 bit, adjusted */
-#define R_TILEPRO_COPY		10	/* Copy relocation */
-#define R_TILEPRO_GLOB_DAT	11	/* Create GOT entry */
-#define R_TILEPRO_JMP_SLOT	12	/* Create PLT entry */
-#define R_TILEPRO_RELATIVE	13	/* Adjust by program base */
-#define R_TILEPRO_BROFF_X1	14	/* X1 pipe branch offset */
-#define R_TILEPRO_JOFFLONG_X1	15	/* X1 pipe jump offset */
-#define R_TILEPRO_JOFFLONG_X1_PLT 16	/* X1 pipe jump offset to PLT */
-#define R_TILEPRO_IMM8_X0	17	/* X0 pipe 8-bit */
-#define R_TILEPRO_IMM8_Y0	18	/* Y0 pipe 8-bit */
-#define R_TILEPRO_IMM8_X1	19	/* X1 pipe 8-bit */
-#define R_TILEPRO_IMM8_Y1	20	/* Y1 pipe 8-bit */
-#define R_TILEPRO_MT_IMM15_X1	21	/* X1 pipe mtspr */
-#define R_TILEPRO_MF_IMM15_X1	22	/* X1 pipe mfspr */
-#define R_TILEPRO_IMM16_X0	23	/* X0 pipe 16-bit */
-#define R_TILEPRO_IMM16_X1	24	/* X1 pipe 16-bit */
-#define R_TILEPRO_IMM16_X0_LO	25	/* X0 pipe low 16-bit */
-#define R_TILEPRO_IMM16_X1_LO	26	/* X1 pipe low 16-bit */
-#define R_TILEPRO_IMM16_X0_HI	27	/* X0 pipe high 16-bit */
-#define R_TILEPRO_IMM16_X1_HI	28	/* X1 pipe high 16-bit */
-#define R_TILEPRO_IMM16_X0_HA	29	/* X0 pipe high 16-bit, adjusted */
-#define R_TILEPRO_IMM16_X1_HA	30	/* X1 pipe high 16-bit, adjusted */
-#define R_TILEPRO_IMM16_X0_PCREL 31	/* X0 pipe PC relative 16 bit */
-#define R_TILEPRO_IMM16_X1_PCREL 32	/* X1 pipe PC relative 16 bit */
-#define R_TILEPRO_IMM16_X0_LO_PCREL 33	/* X0 pipe PC relative low 16 bit */
-#define R_TILEPRO_IMM16_X1_LO_PCREL 34	/* X1 pipe PC relative low 16 bit */
-#define R_TILEPRO_IMM16_X0_HI_PCREL 35	/* X0 pipe PC relative high 16 bit */
-#define R_TILEPRO_IMM16_X1_HI_PCREL 36	/* X1 pipe PC relative high 16 bit */
-#define R_TILEPRO_IMM16_X0_HA_PCREL 37	/* X0 pipe PC relative ha() 16 bit */
-#define R_TILEPRO_IMM16_X1_HA_PCREL 38	/* X1 pipe PC relative ha() 16 bit */
-#define R_TILEPRO_IMM16_X0_GOT	39	/* X0 pipe 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X1_GOT	40	/* X1 pipe 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X0_GOT_LO 41	/* X0 pipe low 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X1_GOT_LO 42	/* X1 pipe low 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X0_GOT_HI 43	/* X0 pipe high 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X1_GOT_HI 44	/* X1 pipe high 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X0_GOT_HA 45	/* X0 pipe ha() 16-bit GOT offset */
-#define R_TILEPRO_IMM16_X1_GOT_HA 46	/* X1 pipe ha() 16-bit GOT offset */
-#define R_TILEPRO_MMSTART_X0	47	/* X0 pipe mm "start" */
-#define R_TILEPRO_MMEND_X0	48	/* X0 pipe mm "end" */
-#define R_TILEPRO_MMSTART_X1	49	/* X1 pipe mm "start" */
-#define R_TILEPRO_MMEND_X1	50	/* X1 pipe mm "end" */
-#define R_TILEPRO_SHAMT_X0	51	/* X0 pipe shift amount */
-#define R_TILEPRO_SHAMT_X1	52	/* X1 pipe shift amount */
-#define R_TILEPRO_SHAMT_Y0	53	/* Y0 pipe shift amount */
-#define R_TILEPRO_SHAMT_Y1	54	/* Y1 pipe shift amount */
-#define R_TILEPRO_DEST_IMM8_X1	55	/* X1 pipe destination 8-bit */
-/* Relocs 56-59 are currently not defined.  */
-#define R_TILEPRO_TLS_GD_CALL	60	/* "jal" for TLS GD */
-#define R_TILEPRO_IMM8_X0_TLS_GD_ADD 61	/* X0 pipe "addi" for TLS GD */
-#define R_TILEPRO_IMM8_X1_TLS_GD_ADD 62	/* X1 pipe "addi" for TLS GD */
-#define R_TILEPRO_IMM8_Y0_TLS_GD_ADD 63	/* Y0 pipe "addi" for TLS GD */
-#define R_TILEPRO_IMM8_Y1_TLS_GD_ADD 64	/* Y1 pipe "addi" for TLS GD */
-#define R_TILEPRO_TLS_IE_LOAD	65	/* "lw_tls" for TLS IE */
-#define R_TILEPRO_IMM16_X0_TLS_GD 66	/* X0 pipe 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X1_TLS_GD 67	/* X1 pipe 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X0_TLS_GD_LO 68	/* X0 pipe low 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X1_TLS_GD_LO 69	/* X1 pipe low 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X0_TLS_GD_HI 70	/* X0 pipe high 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X1_TLS_GD_HI 71	/* X1 pipe high 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X0_TLS_GD_HA 72	/* X0 pipe ha() 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X1_TLS_GD_HA 73	/* X1 pipe ha() 16-bit TLS GD offset */
-#define R_TILEPRO_IMM16_X0_TLS_IE 74	/* X0 pipe 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X1_TLS_IE 75	/* X1 pipe 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X0_TLS_IE_LO 76	/* X0 pipe low 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X1_TLS_IE_LO 77	/* X1 pipe low 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X0_TLS_IE_HI 78	/* X0 pipe high 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X1_TLS_IE_HI 79	/* X1 pipe high 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X0_TLS_IE_HA 80	/* X0 pipe ha() 16-bit TLS IE offset */
-#define R_TILEPRO_IMM16_X1_TLS_IE_HA 81	/* X1 pipe ha() 16-bit TLS IE offset */
-#define R_TILEPRO_TLS_DTPMOD32	82	/* ID of module containing symbol */
-#define R_TILEPRO_TLS_DTPOFF32	83	/* Offset in TLS block */
-#define R_TILEPRO_TLS_TPOFF32	84	/* Offset in static TLS block */
-#define R_TILEPRO_IMM16_X0_TLS_LE 85	/* X0 pipe 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X1_TLS_LE 86	/* X1 pipe 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X0_TLS_LE_LO 87	/* X0 pipe low 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X1_TLS_LE_LO 88	/* X1 pipe low 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X0_TLS_LE_HI 89	/* X0 pipe high 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X1_TLS_LE_HI 90	/* X1 pipe high 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X0_TLS_LE_HA 91	/* X0 pipe ha() 16-bit TLS LE offset */
-#define R_TILEPRO_IMM16_X1_TLS_LE_HA 92	/* X1 pipe ha() 16-bit TLS LE offset */
-
-#define R_TILEPRO_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
-#define R_TILEPRO_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
-
-#define R_TILEPRO_NUM		130
-
-
-/* TILE-Gx relocations.  */
-#define R_TILEGX_NONE		0	/* No reloc */
-#define R_TILEGX_64		1	/* Direct 64 bit */
-#define R_TILEGX_32		2	/* Direct 32 bit */
-#define R_TILEGX_16		3	/* Direct 16 bit */
-#define R_TILEGX_8		4	/* Direct 8 bit */
-#define R_TILEGX_64_PCREL	5	/* PC relative 64 bit */
-#define R_TILEGX_32_PCREL	6	/* PC relative 32 bit */
-#define R_TILEGX_16_PCREL	7	/* PC relative 16 bit */
-#define R_TILEGX_8_PCREL	8	/* PC relative 8 bit */
-#define R_TILEGX_HW0		9	/* hword 0 16-bit */
-#define R_TILEGX_HW1		10	/* hword 1 16-bit */
-#define R_TILEGX_HW2		11	/* hword 2 16-bit */
-#define R_TILEGX_HW3		12	/* hword 3 16-bit */
-#define R_TILEGX_HW0_LAST	13	/* last hword 0 16-bit */
-#define R_TILEGX_HW1_LAST	14	/* last hword 1 16-bit */
-#define R_TILEGX_HW2_LAST	15	/* last hword 2 16-bit */
-#define R_TILEGX_COPY		16	/* Copy relocation */
-#define R_TILEGX_GLOB_DAT	17	/* Create GOT entry */
-#define R_TILEGX_JMP_SLOT	18	/* Create PLT entry */
-#define R_TILEGX_RELATIVE	19	/* Adjust by program base */
-#define R_TILEGX_BROFF_X1	20	/* X1 pipe branch offset */
-#define R_TILEGX_JUMPOFF_X1	21	/* X1 pipe jump offset */
-#define R_TILEGX_JUMPOFF_X1_PLT	22	/* X1 pipe jump offset to PLT */
-#define R_TILEGX_IMM8_X0	23	/* X0 pipe 8-bit */
-#define R_TILEGX_IMM8_Y0	24	/* Y0 pipe 8-bit */
-#define R_TILEGX_IMM8_X1	25	/* X1 pipe 8-bit */
-#define R_TILEGX_IMM8_Y1	26	/* Y1 pipe 8-bit */
-#define R_TILEGX_DEST_IMM8_X1	27	/* X1 pipe destination 8-bit */
-#define R_TILEGX_MT_IMM14_X1	28	/* X1 pipe mtspr */
-#define R_TILEGX_MF_IMM14_X1	29	/* X1 pipe mfspr */
-#define R_TILEGX_MMSTART_X0	30	/* X0 pipe mm "start" */
-#define R_TILEGX_MMEND_X0	31	/* X0 pipe mm "end" */
-#define R_TILEGX_SHAMT_X0	32	/* X0 pipe shift amount */
-#define R_TILEGX_SHAMT_X1	33	/* X1 pipe shift amount */
-#define R_TILEGX_SHAMT_Y0	34	/* Y0 pipe shift amount */
-#define R_TILEGX_SHAMT_Y1	35	/* Y1 pipe shift amount */
-#define R_TILEGX_IMM16_X0_HW0	36	/* X0 pipe hword 0 */
-#define R_TILEGX_IMM16_X1_HW0	37	/* X1 pipe hword 0 */
-#define R_TILEGX_IMM16_X0_HW1	38	/* X0 pipe hword 1 */
-#define R_TILEGX_IMM16_X1_HW1	39	/* X1 pipe hword 1 */
-#define R_TILEGX_IMM16_X0_HW2	40	/* X0 pipe hword 2 */
-#define R_TILEGX_IMM16_X1_HW2	41	/* X1 pipe hword 2 */
-#define R_TILEGX_IMM16_X0_HW3	42	/* X0 pipe hword 3 */
-#define R_TILEGX_IMM16_X1_HW3	43	/* X1 pipe hword 3 */
-#define R_TILEGX_IMM16_X0_HW0_LAST 44	/* X0 pipe last hword 0 */
-#define R_TILEGX_IMM16_X1_HW0_LAST 45	/* X1 pipe last hword 0 */
-#define R_TILEGX_IMM16_X0_HW1_LAST 46	/* X0 pipe last hword 1 */
-#define R_TILEGX_IMM16_X1_HW1_LAST 47	/* X1 pipe last hword 1 */
-#define R_TILEGX_IMM16_X0_HW2_LAST 48	/* X0 pipe last hword 2 */
-#define R_TILEGX_IMM16_X1_HW2_LAST 49	/* X1 pipe last hword 2 */
-#define R_TILEGX_IMM16_X0_HW0_PCREL 50	/* X0 pipe PC relative hword 0 */
-#define R_TILEGX_IMM16_X1_HW0_PCREL 51	/* X1 pipe PC relative hword 0 */
-#define R_TILEGX_IMM16_X0_HW1_PCREL 52	/* X0 pipe PC relative hword 1 */
-#define R_TILEGX_IMM16_X1_HW1_PCREL 53	/* X1 pipe PC relative hword 1 */
-#define R_TILEGX_IMM16_X0_HW2_PCREL 54	/* X0 pipe PC relative hword 2 */
-#define R_TILEGX_IMM16_X1_HW2_PCREL 55	/* X1 pipe PC relative hword 2 */
-#define R_TILEGX_IMM16_X0_HW3_PCREL 56	/* X0 pipe PC relative hword 3 */
-#define R_TILEGX_IMM16_X1_HW3_PCREL 57	/* X1 pipe PC relative hword 3 */
-#define R_TILEGX_IMM16_X0_HW0_LAST_PCREL 58 /* X0 pipe PC-rel last hword 0 */
-#define R_TILEGX_IMM16_X1_HW0_LAST_PCREL 59 /* X1 pipe PC-rel last hword 0 */
-#define R_TILEGX_IMM16_X0_HW1_LAST_PCREL 60 /* X0 pipe PC-rel last hword 1 */
-#define R_TILEGX_IMM16_X1_HW1_LAST_PCREL 61 /* X1 pipe PC-rel last hword 1 */
-#define R_TILEGX_IMM16_X0_HW2_LAST_PCREL 62 /* X0 pipe PC-rel last hword 2 */
-#define R_TILEGX_IMM16_X1_HW2_LAST_PCREL 63 /* X1 pipe PC-rel last hword 2 */
-#define R_TILEGX_IMM16_X0_HW0_GOT 64	/* X0 pipe hword 0 GOT offset */
-#define R_TILEGX_IMM16_X1_HW0_GOT 65	/* X1 pipe hword 0 GOT offset */
-#define R_TILEGX_IMM16_X0_HW0_PLT_PCREL 66 /* X0 pipe PC-rel PLT hword 0 */
-#define R_TILEGX_IMM16_X1_HW0_PLT_PCREL 67 /* X1 pipe PC-rel PLT hword 0 */
-#define R_TILEGX_IMM16_X0_HW1_PLT_PCREL 68 /* X0 pipe PC-rel PLT hword 1 */
-#define R_TILEGX_IMM16_X1_HW1_PLT_PCREL 69 /* X1 pipe PC-rel PLT hword 1 */
-#define R_TILEGX_IMM16_X0_HW2_PLT_PCREL 70 /* X0 pipe PC-rel PLT hword 2 */
-#define R_TILEGX_IMM16_X1_HW2_PLT_PCREL 71 /* X1 pipe PC-rel PLT hword 2 */
-#define R_TILEGX_IMM16_X0_HW0_LAST_GOT 72 /* X0 pipe last hword 0 GOT offset */
-#define R_TILEGX_IMM16_X1_HW0_LAST_GOT 73 /* X1 pipe last hword 0 GOT offset */
-#define R_TILEGX_IMM16_X0_HW1_LAST_GOT 74 /* X0 pipe last hword 1 GOT offset */
-#define R_TILEGX_IMM16_X1_HW1_LAST_GOT 75 /* X1 pipe last hword 1 GOT offset */
-#define R_TILEGX_IMM16_X0_HW3_PLT_PCREL 76 /* X0 pipe PC-rel PLT hword 3 */
-#define R_TILEGX_IMM16_X1_HW3_PLT_PCREL 77 /* X1 pipe PC-rel PLT hword 3 */
-#define R_TILEGX_IMM16_X0_HW0_TLS_GD 78	/* X0 pipe hword 0 TLS GD offset */
-#define R_TILEGX_IMM16_X1_HW0_TLS_GD 79	/* X1 pipe hword 0 TLS GD offset */
-#define R_TILEGX_IMM16_X0_HW0_TLS_LE 80	/* X0 pipe hword 0 TLS LE offset */
-#define R_TILEGX_IMM16_X1_HW0_TLS_LE 81	/* X1 pipe hword 0 TLS LE offset */
-#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE 82 /* X0 pipe last hword 0 LE off */
-#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE 83 /* X1 pipe last hword 0 LE off */
-#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE 84 /* X0 pipe last hword 1 LE off */
-#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE 85 /* X1 pipe last hword 1 LE off */
-#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD 86 /* X0 pipe last hword 0 GD off */
-#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD 87 /* X1 pipe last hword 0 GD off */
-#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD 88 /* X0 pipe last hword 1 GD off */
-#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD 89 /* X1 pipe last hword 1 GD off */
-/* Relocs 90-91 are currently not defined.  */
-#define R_TILEGX_IMM16_X0_HW0_TLS_IE 92	/* X0 pipe hword 0 TLS IE offset */
-#define R_TILEGX_IMM16_X1_HW0_TLS_IE 93	/* X1 pipe hword 0 TLS IE offset */
-#define R_TILEGX_IMM16_X0_HW0_LAST_PLT_PCREL 94 /* X0 pipe PC-rel PLT last hword 0 */
-#define R_TILEGX_IMM16_X1_HW0_LAST_PLT_PCREL 95 /* X1 pipe PC-rel PLT last hword 0 */
-#define R_TILEGX_IMM16_X0_HW1_LAST_PLT_PCREL 96 /* X0 pipe PC-rel PLT last hword 1 */
-#define R_TILEGX_IMM16_X1_HW1_LAST_PLT_PCREL 97 /* X1 pipe PC-rel PLT last hword 1 */
-#define R_TILEGX_IMM16_X0_HW2_LAST_PLT_PCREL 98 /* X0 pipe PC-rel PLT last hword 2 */
-#define R_TILEGX_IMM16_X1_HW2_LAST_PLT_PCREL 99 /* X1 pipe PC-rel PLT last hword 2 */
-#define R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE 100 /* X0 pipe last hword 0 IE off */
-#define R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE 101 /* X1 pipe last hword 0 IE off */
-#define R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE 102 /* X0 pipe last hword 1 IE off */
-#define R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE 103 /* X1 pipe last hword 1 IE off */
-/* Relocs 104-105 are currently not defined.  */
-#define R_TILEGX_TLS_DTPMOD64	106	/* 64-bit ID of symbol's module */
-#define R_TILEGX_TLS_DTPOFF64	107	/* 64-bit offset in TLS block */
-#define R_TILEGX_TLS_TPOFF64	108	/* 64-bit offset in static TLS block */
-#define R_TILEGX_TLS_DTPMOD32	109	/* 32-bit ID of symbol's module */
-#define R_TILEGX_TLS_DTPOFF32	110	/* 32-bit offset in TLS block */
-#define R_TILEGX_TLS_TPOFF32	111	/* 32-bit offset in static TLS block */
-#define R_TILEGX_TLS_GD_CALL	112	/* "jal" for TLS GD */
-#define R_TILEGX_IMM8_X0_TLS_GD_ADD 113	/* X0 pipe "addi" for TLS GD */
-#define R_TILEGX_IMM8_X1_TLS_GD_ADD 114	/* X1 pipe "addi" for TLS GD */
-#define R_TILEGX_IMM8_Y0_TLS_GD_ADD 115	/* Y0 pipe "addi" for TLS GD */
-#define R_TILEGX_IMM8_Y1_TLS_GD_ADD 116	/* Y1 pipe "addi" for TLS GD */
-#define R_TILEGX_TLS_IE_LOAD	117	/* "ld_tls" for TLS IE */
-#define R_TILEGX_IMM8_X0_TLS_ADD 118	/* X0 pipe "addi" for TLS GD/IE */
-#define R_TILEGX_IMM8_X1_TLS_ADD 119	/* X1 pipe "addi" for TLS GD/IE */
-#define R_TILEGX_IMM8_Y0_TLS_ADD 120	/* Y0 pipe "addi" for TLS GD/IE */
-#define R_TILEGX_IMM8_Y1_TLS_ADD 121	/* Y1 pipe "addi" for TLS GD/IE */
-
-#define R_TILEGX_GNU_VTINHERIT	128	/* GNU C++ vtable hierarchy */
-#define R_TILEGX_GNU_VTENTRY	129	/* GNU C++ vtable member usage */
-
-#define R_TILEGX_NUM		130
-
-
-__END_DECLS
-
-#endif	/* elf.h */
diff --git a/openflow/usr/include/endian.h b/openflow/usr/include/endian.h
deleted file mode 100644
index b13ddaa..0000000
--- a/openflow/usr/include/endian.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_ENDIAN_H
-#define	_ENDIAN_H	1
-
-#include <features.h>
-
-/* Definitions for byte order, according to significance of bytes,
-   from low addresses to high addresses.  The value is what you get by
-   putting '4' in the most significant byte, '3' in the second most
-   significant byte, '2' in the second least significant byte, and '1'
-   in the least significant byte, and then writing down one digit for
-   each byte, starting with the byte at the lowest address at the left,
-   and proceeding to the byte with the highest address at the right.  */
-
-#define	__LITTLE_ENDIAN	1234
-#define	__BIG_ENDIAN	4321
-#define	__PDP_ENDIAN	3412
-
-/* This file defines `__BYTE_ORDER' for the particular machine.  */
-#include <bits/endian.h>
-
-/* Some machines may need to use a different endianness for floating point
-   values.  */
-#ifndef __FLOAT_WORD_ORDER
-# define __FLOAT_WORD_ORDER __BYTE_ORDER
-#endif
-
-#ifdef	__USE_MISC
-# define LITTLE_ENDIAN	__LITTLE_ENDIAN
-# define BIG_ENDIAN	__BIG_ENDIAN
-# define PDP_ENDIAN	__PDP_ENDIAN
-# define BYTE_ORDER	__BYTE_ORDER
-#endif
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-# define __LONG_LONG_PAIR(HI, LO) LO, HI
-#elif __BYTE_ORDER == __BIG_ENDIAN
-# define __LONG_LONG_PAIR(HI, LO) HI, LO
-#endif
-
-
-#if defined __USE_MISC && !defined __ASSEMBLER__
-/* Conversion interfaces.  */
-# include <bits/byteswap.h>
-
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define htobe16(x) __bswap_16 (x)
-#  define htole16(x) (x)
-#  define be16toh(x) __bswap_16 (x)
-#  define le16toh(x) (x)
-
-#  define htobe32(x) __bswap_32 (x)
-#  define htole32(x) (x)
-#  define be32toh(x) __bswap_32 (x)
-#  define le32toh(x) (x)
-
-#  define htobe64(x) __bswap_64 (x)
-#  define htole64(x) (x)
-#  define be64toh(x) __bswap_64 (x)
-#  define le64toh(x) (x)
-
-# else
-#  define htobe16(x) (x)
-#  define htole16(x) __bswap_16 (x)
-#  define be16toh(x) (x)
-#  define le16toh(x) __bswap_16 (x)
-
-#  define htobe32(x) (x)
-#  define htole32(x) __bswap_32 (x)
-#  define be32toh(x) (x)
-#  define le32toh(x) __bswap_32 (x)
-
-#  define htobe64(x) (x)
-#  define htole64(x) __bswap_64 (x)
-#  define be64toh(x) (x)
-#  define le64toh(x) __bswap_64 (x)
-# endif
-#endif
-
-#endif	/* endian.h */
diff --git a/openflow/usr/include/envz.h b/openflow/usr/include/envz.h
deleted file mode 100644
index 1f75f3d..0000000
--- a/openflow/usr/include/envz.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Routines for dealing with '\0' separated environment vectors
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ENVZ_H
-#define _ENVZ_H	1
-
-#include <features.h>
-
-#include <errno.h>
-
-/* Envz's are argz's too, and should be created etc., using the same
-   routines.  */
-#include <argz.h>
-
-__BEGIN_DECLS
-
-/* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none.  */
-extern char *envz_entry (const char *__restrict __envz, size_t __envz_len,
-			 const char *__restrict __name)
-     __THROW __attribute_pure__;
-
-/* Returns a pointer to the value portion of the entry in ENVZ for NAME, or 0
-   if there is none.  */
-extern char *envz_get (const char *__restrict __envz, size_t __envz_len,
-		       const char *__restrict __name)
-     __THROW __attribute_pure__;
-
-/* Adds an entry for NAME with value VALUE to ENVZ & ENVZ_LEN.  If an entry
-   with the same name already exists in ENVZ, it is removed.  If VALUE is
-   NULL, then the new entry will a special null one, for which envz_get will
-   return NULL, although envz_entry will still return an entry; this is handy
-   because when merging with another envz, the null entry can override an
-   entry in the other one.  Null entries can be removed with envz_strip ().  */
-extern error_t envz_add (char **__restrict __envz,
-			 size_t *__restrict __envz_len,
-			 const char *__restrict __name,
-			 const char *__restrict __value) __THROW;
-
-/* Adds each entry in ENVZ2 to ENVZ & ENVZ_LEN, as if with envz_add().  If
-   OVERRIDE is true, then values in ENVZ2 will supersede those with the same
-   name in ENV, otherwise not.  */
-extern error_t envz_merge (char **__restrict __envz,
-			   size_t *__restrict __envz_len,
-			   const char *__restrict __envz2,
-			   size_t __envz2_len, int __override) __THROW;
-
-/* Remove the entry for NAME from ENVZ & ENVZ_LEN, if any.  */
-extern void envz_remove (char **__restrict __envz,
-			 size_t *__restrict __envz_len,
-			 const char *__restrict __name) __THROW;
-
-/* Remove null entries.  */
-extern void envz_strip (char **__restrict __envz,
-			size_t *__restrict __envz_len) __THROW;
-
-__END_DECLS
-
-#endif /* envz.h */
diff --git a/openflow/usr/include/err.h b/openflow/usr/include/err.h
deleted file mode 100644
index b43fe68..0000000
--- a/openflow/usr/include/err.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* 4.4BSD utility functions for error messages.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_ERR_H
-#define	_ERR_H	1
-
-#include <features.h>
-
-#define	__need___va_list
-#include <stdarg.h>
-#ifndef	__GNUC_VA_LIST
-# define __gnuc_va_list	__ptr_t
-#endif
-
-__BEGIN_DECLS
-
-/* Print "program: ", FORMAT, ": ", the standard error string for errno,
-   and a newline, on stderr.  */
-extern void warn (const char *__format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
-extern void vwarn (const char *__format, __gnuc_va_list)
-     __attribute__ ((__format__ (__printf__, 1, 0)));
-
-/* Likewise, but without ": " and the standard error string.  */
-extern void warnx (const char *__format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
-extern void vwarnx (const char *__format, __gnuc_va_list)
-     __attribute__ ((__format__ (__printf__, 1, 0)));
-
-/* Likewise, and then exit with STATUS.  */
-extern void err (int __status, const char *__format, ...)
-     __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));
-extern void verr (int __status, const char *__format, __gnuc_va_list)
-     __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0)));
-extern void errx (int __status, const char *__format, ...)
-     __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));
-extern void verrx (int __status, const char *, __gnuc_va_list)
-     __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0)));
-
-__END_DECLS
-
-#endif	/* err.h */
diff --git a/openflow/usr/include/errno.h b/openflow/usr/include/errno.h
deleted file mode 100644
index 3357cbc..0000000
--- a/openflow/usr/include/errno.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.5 Errors	<errno.h>
- */
-
-#ifndef	_ERRNO_H
-
-/* The includer defined __need_Emath if he wants only the definitions
-   of EDOM and ERANGE, and not everything else.  */
-#ifndef	__need_Emath
-# define _ERRNO_H	1
-# include <features.h>
-#endif
-
-__BEGIN_DECLS
-
-/* Get the error number constants from the system-specific file.
-   This file will test __need_Emath and _ERRNO_H.  */
-#include <bits/errno.h>
-#undef	__need_Emath
-
-#ifdef	_ERRNO_H
-
-/* Declare the `errno' variable, unless it's defined as a macro by
-   bits/errno.h.  This is the case in GNU, where it is a per-thread
-   variable.  This redeclaration using the macro still works, but it
-   will be a function declaration without a prototype and may trigger
-   a -Wstrict-prototypes warning.  */
-#ifndef	errno
-extern int errno;
-#endif
-
-#ifdef __USE_GNU
-
-/* The full and simple forms of the name with which the program was
-   invoked.  These variables are set up automatically at startup based on
-   the value of ARGV[0] (this works only if you use GNU ld).  */
-extern char *program_invocation_name, *program_invocation_short_name;
-#endif /* __USE_GNU */
-#endif /* _ERRNO_H */
-
-__END_DECLS
-
-#endif /* _ERRNO_H */
-
-/* The Hurd <bits/errno.h> defines `error_t' as an enumerated type so
-   that printing `error_t' values in the debugger shows the names.  We
-   might need this definition sometimes even if this file was included
-   before.  */
-#if defined __USE_GNU || defined __need_error_t
-# ifndef __error_t_defined
-typedef int error_t;
-#  define __error_t_defined	1
-# endif
-# undef __need_error_t
-#endif
diff --git a/openflow/usr/include/error.h b/openflow/usr/include/error.h
deleted file mode 100644
index 32d84ee..0000000
--- a/openflow/usr/include/error.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Declaration for error-reporting function
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ERROR_H
-#define _ERROR_H 1
-
-#include <features.h>
-
-
-__BEGIN_DECLS
-
-/* Print a message with `fprintf (stderr, FORMAT, ...)';
-   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
-   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
-
-extern void error (int __status, int __errnum, const char *__format, ...)
-     __attribute__ ((__format__ (__printf__, 3, 4)));
-
-extern void error_at_line (int __status, int __errnum, const char *__fname,
-			   unsigned int __lineno, const char *__format, ...)
-     __attribute__ ((__format__ (__printf__, 5, 6)));
-
-/* If NULL, error will flush stdout, then print on stderr the program
-   name, a colon and a space.  Otherwise, error will call this
-   function without parameters instead.  */
-extern void (*error_print_progname) (void);
-
-/* This variable is incremented each time `error' is called.  */
-extern unsigned int error_message_count;
-
-/* Sometimes we want to have at most one error per line.  This
-   variable controls whether this mode is selected or not.  */
-extern int error_one_per_line;
-
-
-#if defined __extern_always_inline && defined __va_arg_pack
-# include <bits/error.h>
-#endif
-
-__END_DECLS
-
-#endif /* error.h */
diff --git a/openflow/usr/include/eti.h b/openflow/usr/include/eti.h
deleted file mode 100644
index baa6190..0000000
--- a/openflow/usr/include/eti.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author:  Juergen Pfeifer, 1995,1997                                    *
- ****************************************************************************/
-
-/* $Id: eti.h,v 1.8 2003/10/25 15:24:29 tom Exp $ */
-
-#ifndef NCURSES_ETI_H_incl
-#define NCURSES_ETI_H_incl 1
-
-#define	E_OK			(0)
-#define	E_SYSTEM_ERROR	 	(-1)
-#define	E_BAD_ARGUMENT	 	(-2)
-#define	E_POSTED	 	(-3)
-#define	E_CONNECTED	 	(-4)
-#define	E_BAD_STATE	 	(-5)
-#define	E_NO_ROOM	 	(-6)
-#define	E_NOT_POSTED		(-7)
-#define	E_UNKNOWN_COMMAND	(-8)
-#define	E_NO_MATCH		(-9)
-#define	E_NOT_SELECTABLE	(-10)
-#define	E_NOT_CONNECTED	        (-11)
-#define	E_REQUEST_DENIED	(-12)
-#define	E_INVALID_FIELD	        (-13)
-#define	E_CURRENT		(-14)
-
-#endif
diff --git a/openflow/usr/include/etip.h b/openflow/usr/include/etip.h
deleted file mode 100644
index 0f9bd27..0000000
--- a/openflow/usr/include/etip.h
+++ /dev/null
@@ -1,380 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-// $Id: etip.h.in,v 1.39 2012/12/29 21:50:44 tom Exp $
-
-#ifndef NCURSES_ETIP_H_incl
-#define NCURSES_ETIP_H_incl 1
-
-// These are substituted at configure/build time
-#ifndef HAVE_BUILTIN_H
-#define HAVE_BUILTIN_H 0
-#endif
-
-#ifndef HAVE_GXX_BUILTIN_H
-#define HAVE_GXX_BUILTIN_H 0
-#endif
-
-#ifndef HAVE_GPP_BUILTIN_H
-#define HAVE_GPP_BUILTIN_H 0
-#endif
-
-#ifndef HAVE_IOSTREAM
-#define HAVE_IOSTREAM 1
-#endif
-
-#ifndef HAVE_TYPEINFO
-#define HAVE_TYPEINFO 1
-#endif
-
-#ifndef HAVE_VALUES_H
-#define HAVE_VALUES_H 0
-#endif
-
-#ifndef ETIP_NEEDS_MATH_H
-#define ETIP_NEEDS_MATH_H 0
-#endif
-
-#ifndef ETIP_NEEDS_MATH_EXCEPTION
-#define ETIP_NEEDS_MATH_EXCEPTION 0
-#endif
-
-#ifndef CPP_HAS_PARAM_INIT
-#define CPP_HAS_PARAM_INIT 0
-#endif
-
-#ifndef CPP_HAS_STATIC_CAST
-#define CPP_HAS_STATIC_CAST 1
-#endif
-
-#ifndef IOSTREAM_NAMESPACE
-#define IOSTREAM_NAMESPACE 1
-#endif
-
-#ifdef __GNUG__
-#  if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8))
-#    if HAVE_TYPEINFO
-#      include <typeinfo>
-#    endif
-#  endif
-#endif
-
-#if defined(__GNUG__)
-#  if HAVE_BUILTIN_H || HAVE_GXX_BUILTIN_H || HAVE_GPP_BUILTIN_H
-#    if ETIP_NEEDS_MATH_H
-#      if ETIP_NEEDS_MATH_EXCEPTION
-#        undef exception
-#        define exception math_exception
-#      endif
-#      include <math.h>
-#    endif
-#    undef exception
-#    define exception builtin_exception
-#    if HAVE_GPP_BUILTIN_H
-#     include <gpp/builtin.h>
-#    elif HAVE_GXX_BUILTIN_H
-#     include <g++/builtin.h>
-#    else
-#     include <builtin.h>
-#    endif
-#    undef exception
-#  endif
-#elif defined (__SUNPRO_CC)
-#  include <generic.h>
-#endif
-
-#include <ncurses_dll.h>
-
-extern "C" {
-#if HAVE_VALUES_H
-#  include <values.h>
-#endif
-
-#include <assert.h>
-#include <eti.h>
-#include <errno.h>
-}
-
-// Language features
-#if CPP_HAS_PARAM_INIT
-#define NCURSES_PARAM_INIT(value) = value
-#else
-#define NCURSES_PARAM_INIT(value) /*nothing*/
-#endif
-
-#if CPP_HAS_STATIC_CAST
-#define STATIC_CAST(s) static_cast<s>
-#else
-#define STATIC_CAST(s) (s)
-#endif
-
-// Forward Declarations
-class NCURSES_IMPEXP NCursesPanel;
-class NCURSES_IMPEXP NCursesMenu;
-class NCURSES_IMPEXP NCursesForm;
-
-class NCURSES_IMPEXP NCursesException
-{
-public:
-  const char *message;
-  int errorno;
-
-  NCursesException (const char* msg, int err)
-    : message(msg), errorno (err)
-    {};
-
-  NCursesException (const char* msg)
-    : message(msg), errorno (E_SYSTEM_ERROR)
-    {};
-
-  NCursesException& operator=(const NCursesException& rhs)
-  {
-    errorno = rhs.errorno;
-    return *this;
-  }
-
-  NCursesException(const NCursesException& rhs)
-    : message(rhs.message), errorno(rhs.errorno)
-  {
-  }
-
-  virtual const char *classname() const {
-    return "NCursesWindow";
-  }
-
-  virtual ~NCursesException()
-  {
-  }
-};
-
-class NCURSES_IMPEXP NCursesPanelException : public NCursesException
-{
-public:
-  const NCursesPanel* p;
-
-  NCursesPanelException (const char *msg, int err) :
-    NCursesException (msg, err),
-    p (0)
-    {};
-
-  NCursesPanelException (const NCursesPanel* panel,
-			 const char *msg,
-			 int err) :
-    NCursesException (msg, err),
-    p (panel)
-    {};
-
-  NCursesPanelException (int err) :
-    NCursesException ("panel library error", err),
-    p (0)
-    {};
-
-  NCursesPanelException (const NCursesPanel* panel,
-			 int err) :
-    NCursesException ("panel library error", err),
-    p (panel)
-    {};
-
-  NCursesPanelException& operator=(const NCursesPanelException& rhs)
-  {
-    if (this != &rhs) {
-      NCursesException::operator=(rhs);
-      p = rhs.p;
-    }
-    return *this;
-  }
-
-  NCursesPanelException(const NCursesPanelException& rhs)
-    : NCursesException(rhs), p(rhs.p)
-  {
-  }
-
-  virtual const char *classname() const {
-    return "NCursesPanel";
-  }
-
-  virtual ~NCursesPanelException()
-  {
-  }
-};
-
-class NCURSES_IMPEXP NCursesMenuException : public NCursesException
-{
-public:
-  const NCursesMenu* m;
-
-  NCursesMenuException (const char *msg, int err) :
-    NCursesException (msg, err),
-    m (0)
-    {};
-
-  NCursesMenuException (const NCursesMenu* menu,
-			const char *msg,
-			int err) :
-    NCursesException (msg, err),
-    m (menu)
-    {};
-
-  NCursesMenuException (int err) :
-    NCursesException ("menu library error", err),
-    m (0)
-    {};
-
-  NCursesMenuException (const NCursesMenu* menu,
-			int err) :
-    NCursesException ("menu library error", err),
-    m (menu)
-    {};
-
-  NCursesMenuException& operator=(const NCursesMenuException& rhs)
-  {
-    if (this != &rhs) {
-      NCursesException::operator=(rhs);
-      m = rhs.m;
-    }
-    return *this;
-  }
-
-  NCursesMenuException(const NCursesMenuException& rhs)
-    : NCursesException(rhs), m(rhs.m)
-  {
-  }
-
-  virtual const char *classname() const {
-    return "NCursesMenu";
-  }
-
-  virtual ~NCursesMenuException()
-  {
-  }
-};
-
-class NCURSES_IMPEXP NCursesFormException : public NCursesException
-{
-public:
-  const NCursesForm* f;
-
-  NCursesFormException (const char *msg, int err) :
-    NCursesException (msg, err),
-    f (0)
-    {};
-
-  NCursesFormException (const NCursesForm* form,
-			const char *msg,
-			int err) :
-    NCursesException (msg, err),
-    f (form)
-    {};
-
-  NCursesFormException (int err) :
-    NCursesException ("form library error", err),
-    f (0)
-    {};
-
-  NCursesFormException (const NCursesForm* form,
-			int err) :
-    NCursesException ("form library error", err),
-    f (form)
-    {};
-
-  NCursesFormException& operator=(const NCursesFormException& rhs)
-  {
-    if (this != &rhs) {
-      NCursesException::operator=(rhs);
-      f = rhs.f;
-    }
-    return *this;
-  }
-
-  NCursesFormException(const NCursesFormException& rhs)
-    : NCursesException(rhs), f(rhs.f)
-  {
-  }
-
-  virtual const char *classname() const {
-    return "NCursesForm";
-  }
-
-  virtual ~NCursesFormException()
-  {
-  }
-};
-
-#if !((defined(__GNUG__) && defined(__EXCEPTIONS)) || defined(__SUNPRO_CC))
-#  if HAVE_IOSTREAM
-#     include <iostream>
-#     if IOSTREAM_NAMESPACE
-using std::cerr;
-using std::endl;
-#     endif
-#  else
-#     include <iostream.h>
-#  endif
-   extern "C" void exit(int);
-#endif
-
-inline void THROW(const NCursesException *e) {
-#if defined(__GNUG__) && defined(__EXCEPTIONS)
-#  if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8))
-      (*lib_error_handler)(e ? e->classname() : "", e ? e->message : "");
-#else
-#define CPP_HAS_TRY_CATCH 1
-#endif
-#elif defined(__SUNPRO_CC)
-#  if !defined(__SUNPRO_CC_COMPAT) || (__SUNPRO_CC_COMPAT < 5)
-  genericerror(1, ((e != 0) ? (char *)(e->message) : ""));
-#else
-#define CPP_HAS_TRY_CATCH 1
-#endif
-#else
-  if (e)
-    cerr << e->message << endl;
-  exit(0);
-#endif
-
-#ifndef CPP_HAS_TRY_CATCH
-#define CPP_HAS_TRY_CATCH 0
-#define NCURSES_CPP_TRY		/* nothing */
-#define NCURSES_CPP_CATCH(e)	if (false)
-#define THROWS(s)		/* nothing */
-#define THROW2(s,t)		/* nothing */
-#elif CPP_HAS_TRY_CATCH
-  throw *e;
-#define NCURSES_CPP_TRY		try
-#define NCURSES_CPP_CATCH(e)	catch(e)
-#define THROWS(s)		throw(s)
-#define THROW2(s,t)		throw(s,t)
-#endif
-}
-
-#endif /* NCURSES_ETIP_H_incl */
diff --git a/openflow/usr/include/execinfo.h b/openflow/usr/include/execinfo.h
deleted file mode 100644
index d47c9e6..0000000
--- a/openflow/usr/include/execinfo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _EXECINFO_H
-#define _EXECINFO_H 1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* Store up to SIZE return address of the current program state in
-   ARRAY and return the exact number of values stored.  */
-extern int backtrace (void **__array, int __size) __nonnull ((1));
-
-
-/* Return names of functions from the backtrace list in ARRAY in a newly
-   malloc()ed memory block.  */
-extern char **backtrace_symbols (void *const *__array, int __size)
-     __THROW __nonnull ((1));
-
-
-/* This function is similar to backtrace_symbols() but it writes the result
-   immediately to a file.  */
-extern void backtrace_symbols_fd (void *const *__array, int __size, int __fd)
-     __THROW __nonnull ((1));
-
-__END_DECLS
-
-#endif /* execinfo.h  */
diff --git a/openflow/usr/include/expat.h b/openflow/usr/include/expat.h
deleted file mode 100644
index 9a21680..0000000
--- a/openflow/usr/include/expat.h
+++ /dev/null
@@ -1,1047 +0,0 @@
-/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-   See the file COPYING for copying permission.
-*/
-
-#ifndef Expat_INCLUDED
-#define Expat_INCLUDED 1
-
-#ifdef __VMS
-/*      0        1         2         3      0        1         2         3
-        1234567890123456789012345678901     1234567890123456789012345678901 */
-#define XML_SetProcessingInstructionHandler XML_SetProcessingInstrHandler
-#define XML_SetUnparsedEntityDeclHandler    XML_SetUnparsedEntDeclHandler
-#define XML_SetStartNamespaceDeclHandler    XML_SetStartNamespcDeclHandler
-#define XML_SetExternalEntityRefHandlerArg  XML_SetExternalEntRefHandlerArg
-#endif
-
-#include <stdlib.h>
-#include "expat_external.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct XML_ParserStruct;
-typedef struct XML_ParserStruct *XML_Parser;
-
-/* Should this be defined using stdbool.h when C99 is available? */
-typedef unsigned char XML_Bool;
-#define XML_TRUE   ((XML_Bool) 1)
-#define XML_FALSE  ((XML_Bool) 0)
-
-/* The XML_Status enum gives the possible return values for several
-   API functions.  The preprocessor #defines are included so this
-   stanza can be added to code that still needs to support older
-   versions of Expat 1.95.x:
-
-   #ifndef XML_STATUS_OK
-   #define XML_STATUS_OK    1
-   #define XML_STATUS_ERROR 0
-   #endif
-
-   Otherwise, the #define hackery is quite ugly and would have been
-   dropped.
-*/
-enum XML_Status {
-  XML_STATUS_ERROR = 0,
-#define XML_STATUS_ERROR XML_STATUS_ERROR
-  XML_STATUS_OK = 1,
-#define XML_STATUS_OK XML_STATUS_OK
-  XML_STATUS_SUSPENDED = 2
-#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
-};
-
-enum XML_Error {
-  XML_ERROR_NONE,
-  XML_ERROR_NO_MEMORY,
-  XML_ERROR_SYNTAX,
-  XML_ERROR_NO_ELEMENTS,
-  XML_ERROR_INVALID_TOKEN,
-  XML_ERROR_UNCLOSED_TOKEN,
-  XML_ERROR_PARTIAL_CHAR,
-  XML_ERROR_TAG_MISMATCH,
-  XML_ERROR_DUPLICATE_ATTRIBUTE,
-  XML_ERROR_JUNK_AFTER_DOC_ELEMENT,
-  XML_ERROR_PARAM_ENTITY_REF,
-  XML_ERROR_UNDEFINED_ENTITY,
-  XML_ERROR_RECURSIVE_ENTITY_REF,
-  XML_ERROR_ASYNC_ENTITY,
-  XML_ERROR_BAD_CHAR_REF,
-  XML_ERROR_BINARY_ENTITY_REF,
-  XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF,
-  XML_ERROR_MISPLACED_XML_PI,
-  XML_ERROR_UNKNOWN_ENCODING,
-  XML_ERROR_INCORRECT_ENCODING,
-  XML_ERROR_UNCLOSED_CDATA_SECTION,
-  XML_ERROR_EXTERNAL_ENTITY_HANDLING,
-  XML_ERROR_NOT_STANDALONE,
-  XML_ERROR_UNEXPECTED_STATE,
-  XML_ERROR_ENTITY_DECLARED_IN_PE,
-  XML_ERROR_FEATURE_REQUIRES_XML_DTD,
-  XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING,
-  /* Added in 1.95.7. */
-  XML_ERROR_UNBOUND_PREFIX,
-  /* Added in 1.95.8. */
-  XML_ERROR_UNDECLARING_PREFIX,
-  XML_ERROR_INCOMPLETE_PE,
-  XML_ERROR_XML_DECL,
-  XML_ERROR_TEXT_DECL,
-  XML_ERROR_PUBLICID,
-  XML_ERROR_SUSPENDED,
-  XML_ERROR_NOT_SUSPENDED,
-  XML_ERROR_ABORTED,
-  XML_ERROR_FINISHED,
-  XML_ERROR_SUSPEND_PE,
-  /* Added in 2.0. */
-  XML_ERROR_RESERVED_PREFIX_XML,
-  XML_ERROR_RESERVED_PREFIX_XMLNS,
-  XML_ERROR_RESERVED_NAMESPACE_URI
-};
-
-enum XML_Content_Type {
-  XML_CTYPE_EMPTY = 1,
-  XML_CTYPE_ANY,
-  XML_CTYPE_MIXED,
-  XML_CTYPE_NAME,
-  XML_CTYPE_CHOICE,
-  XML_CTYPE_SEQ
-};
-
-enum XML_Content_Quant {
-  XML_CQUANT_NONE,
-  XML_CQUANT_OPT,
-  XML_CQUANT_REP,
-  XML_CQUANT_PLUS
-};
-
-/* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be
-   XML_CQUANT_NONE, and the other fields will be zero or NULL.
-   If type == XML_CTYPE_MIXED, then quant will be NONE or REP and
-   numchildren will contain number of elements that may be mixed in
-   and children point to an array of XML_Content cells that will be
-   all of XML_CTYPE_NAME type with no quantification.
-
-   If type == XML_CTYPE_NAME, then the name points to the name, and
-   the numchildren field will be zero and children will be NULL. The
-   quant fields indicates any quantifiers placed on the name.
-
-   CHOICE and SEQ will have name NULL, the number of children in
-   numchildren and children will point, recursively, to an array
-   of XML_Content cells.
-
-   The EMPTY, ANY, and MIXED types will only occur at top level.
-*/
-
-typedef struct XML_cp XML_Content;
-
-struct XML_cp {
-  enum XML_Content_Type         type;
-  enum XML_Content_Quant        quant;
-  XML_Char *                    name;
-  unsigned int                  numchildren;
-  XML_Content *                 children;
-};
-
-
-/* This is called for an element declaration. See above for
-   description of the model argument. It's the caller's responsibility
-   to free model when finished with it.
-*/
-typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData,
-                                                const XML_Char *name,
-                                                XML_Content *model);
-
-XMLPARSEAPI(void)
-XML_SetElementDeclHandler(XML_Parser parser,
-                          XML_ElementDeclHandler eldecl);
-
-/* The Attlist declaration handler is called for *each* attribute. So
-   a single Attlist declaration with multiple attributes declared will
-   generate multiple calls to this handler. The "default" parameter
-   may be NULL in the case of the "#IMPLIED" or "#REQUIRED"
-   keyword. The "isrequired" parameter will be true and the default
-   value will be NULL in the case of "#REQUIRED". If "isrequired" is
-   true and default is non-NULL, then this is a "#FIXED" default.
-*/
-typedef void (XMLCALL *XML_AttlistDeclHandler) (
-                                    void            *userData,
-                                    const XML_Char  *elname,
-                                    const XML_Char  *attname,
-                                    const XML_Char  *att_type,
-                                    const XML_Char  *dflt,
-                                    int              isrequired);
-
-XMLPARSEAPI(void)
-XML_SetAttlistDeclHandler(XML_Parser parser,
-                          XML_AttlistDeclHandler attdecl);
-
-/* The XML declaration handler is called for *both* XML declarations
-   and text declarations. The way to distinguish is that the version
-   parameter will be NULL for text declarations. The encoding
-   parameter may be NULL for XML declarations. The standalone
-   parameter will be -1, 0, or 1 indicating respectively that there
-   was no standalone parameter in the declaration, that it was given
-   as no, or that it was given as yes.
-*/
-typedef void (XMLCALL *XML_XmlDeclHandler) (void           *userData,
-                                            const XML_Char *version,
-                                            const XML_Char *encoding,
-                                            int             standalone);
-
-XMLPARSEAPI(void)
-XML_SetXmlDeclHandler(XML_Parser parser,
-                      XML_XmlDeclHandler xmldecl);
-
-
-typedef struct {
-  void *(*malloc_fcn)(size_t size);
-  void *(*realloc_fcn)(void *ptr, size_t size);
-  void (*free_fcn)(void *ptr);
-} XML_Memory_Handling_Suite;
-
-/* Constructs a new parser; encoding is the encoding specified by the
-   external protocol or NULL if there is none specified.
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ParserCreate(const XML_Char *encoding);
-
-/* Constructs a new parser and namespace processor.  Element type
-   names and attribute names that belong to a namespace will be
-   expanded; unprefixed attribute names are never expanded; unprefixed
-   element type names are expanded only if there is a default
-   namespace. The expanded name is the concatenation of the namespace
-   URI, the namespace separator character, and the local part of the
-   name.  If the namespace separator is '\0' then the namespace URI
-   and the local part will be concatenated without any separator.
-   It is a programming error to use the separator '\0' with namespace
-   triplets (see XML_SetReturnNSTriplet).
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
-
-
-/* Constructs a new parser using the memory management suite referred to
-   by memsuite. If memsuite is NULL, then use the standard library memory
-   suite. If namespaceSeparator is non-NULL it creates a parser with
-   namespace processing as described above. The character pointed at
-   will serve as the namespace separator.
-
-   All further memory operations used for the created parser will come from
-   the given suite.
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ParserCreate_MM(const XML_Char *encoding,
-                    const XML_Memory_Handling_Suite *memsuite,
-                    const XML_Char *namespaceSeparator);
-
-/* Prepare a parser object to be re-used.  This is particularly
-   valuable when memory allocation overhead is disproportionatly high,
-   such as when a large number of small documnents need to be parsed.
-   All handlers are cleared from the parser, except for the
-   unknownEncodingHandler. The parser's external state is re-initialized
-   except for the values of ns and ns_triplets.
-
-   Added in Expat 1.95.3.
-*/
-XMLPARSEAPI(XML_Bool)
-XML_ParserReset(XML_Parser parser, const XML_Char *encoding);
-
-/* atts is array of name/value pairs, terminated by 0;
-   names and values are 0 terminated.
-*/
-typedef void (XMLCALL *XML_StartElementHandler) (void *userData,
-                                                 const XML_Char *name,
-                                                 const XML_Char **atts);
-
-typedef void (XMLCALL *XML_EndElementHandler) (void *userData,
-                                               const XML_Char *name);
-
-
-/* s is not 0 terminated. */
-typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData,
-                                                  const XML_Char *s,
-                                                  int len);
-
-/* target and data are 0 terminated */
-typedef void (XMLCALL *XML_ProcessingInstructionHandler) (
-                                                void *userData,
-                                                const XML_Char *target,
-                                                const XML_Char *data);
-
-/* data is 0 terminated */
-typedef void (XMLCALL *XML_CommentHandler) (void *userData,
-                                            const XML_Char *data);
-
-typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData);
-typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData);
-
-/* This is called for any characters in the XML document for which
-   there is no applicable handler.  This includes both characters that
-   are part of markup which is of a kind that is not reported
-   (comments, markup declarations), or characters that are part of a
-   construct which could be reported but for which no handler has been
-   supplied. The characters are passed exactly as they were in the XML
-   document except that they will be encoded in UTF-8 or UTF-16.
-   Line boundaries are not normalized. Note that a byte order mark
-   character is not passed to the default handler. There are no
-   guarantees about how characters are divided between calls to the
-   default handler: for example, a comment might be split between
-   multiple calls.
-*/
-typedef void (XMLCALL *XML_DefaultHandler) (void *userData,
-                                            const XML_Char *s,
-                                            int len);
-
-/* This is called for the start of the DOCTYPE declaration, before
-   any DTD or internal subset is parsed.
-*/
-typedef void (XMLCALL *XML_StartDoctypeDeclHandler) (
-                                            void *userData,
-                                            const XML_Char *doctypeName,
-                                            const XML_Char *sysid,
-                                            const XML_Char *pubid,
-                                            int has_internal_subset);
-
-/* This is called for the start of the DOCTYPE declaration when the
-   closing > is encountered, but after processing any external
-   subset.
-*/
-typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
-
-/* This is called for entity declarations. The is_parameter_entity
-   argument will be non-zero if the entity is a parameter entity, zero
-   otherwise.
-
-   For internal entities (<!ENTITY foo "bar">), value will
-   be non-NULL and systemId, publicID, and notationName will be NULL.
-   The value string is NOT nul-terminated; the length is provided in
-   the value_length argument. Since it is legal to have zero-length
-   values, do not use this argument to test for internal entities.
-
-   For external entities, value will be NULL and systemId will be
-   non-NULL. The publicId argument will be NULL unless a public
-   identifier was provided. The notationName argument will have a
-   non-NULL value only for unparsed entity declarations.
-
-   Note that is_parameter_entity can't be changed to XML_Bool, since
-   that would break binary compatibility.
-*/
-typedef void (XMLCALL *XML_EntityDeclHandler) (
-                              void *userData,
-                              const XML_Char *entityName,
-                              int is_parameter_entity,
-                              const XML_Char *value,
-                              int value_length,
-                              const XML_Char *base,
-                              const XML_Char *systemId,
-                              const XML_Char *publicId,
-                              const XML_Char *notationName);
-
-XMLPARSEAPI(void)
-XML_SetEntityDeclHandler(XML_Parser parser,
-                         XML_EntityDeclHandler handler);
-
-/* OBSOLETE -- OBSOLETE -- OBSOLETE
-   This handler has been superceded by the EntityDeclHandler above.
-   It is provided here for backward compatibility.
-
-   This is called for a declaration of an unparsed (NDATA) entity.
-   The base argument is whatever was set by XML_SetBase. The
-   entityName, systemId and notationName arguments will never be
-   NULL. The other arguments may be.
-*/
-typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *entityName,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId,
-                                    const XML_Char *notationName);
-
-/* This is called for a declaration of notation.  The base argument is
-   whatever was set by XML_SetBase. The notationName will never be
-   NULL.  The other arguments can be.
-*/
-typedef void (XMLCALL *XML_NotationDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *notationName,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId);
-
-/* When namespace processing is enabled, these are called once for
-   each namespace declaration. The call to the start and end element
-   handlers occur between the calls to the start and end namespace
-   declaration handlers. For an xmlns attribute, prefix will be
-   NULL.  For an xmlns="" attribute, uri will be NULL.
-*/
-typedef void (XMLCALL *XML_StartNamespaceDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *prefix,
-                                    const XML_Char *uri);
-
-typedef void (XMLCALL *XML_EndNamespaceDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *prefix);
-
-/* This is called if the document is not standalone, that is, it has an
-   external subset or a reference to a parameter entity, but does not
-   have standalone="yes". If this handler returns XML_STATUS_ERROR,
-   then processing will not continue, and the parser will return a
-   XML_ERROR_NOT_STANDALONE error.
-   If parameter entity parsing is enabled, then in addition to the
-   conditions above this handler will only be called if the referenced
-   entity was actually read.
-*/
-typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData);
-
-/* This is called for a reference to an external parsed general
-   entity.  The referenced entity is not automatically parsed.  The
-   application can parse it immediately or later using
-   XML_ExternalEntityParserCreate.
-
-   The parser argument is the parser parsing the entity containing the
-   reference; it can be passed as the parser argument to
-   XML_ExternalEntityParserCreate.  The systemId argument is the
-   system identifier as specified in the entity declaration; it will
-   not be NULL.
-
-   The base argument is the system identifier that should be used as
-   the base for resolving systemId if systemId was relative; this is
-   set by XML_SetBase; it may be NULL.
-
-   The publicId argument is the public identifier as specified in the
-   entity declaration, or NULL if none was specified; the whitespace
-   in the public identifier will have been normalized as required by
-   the XML spec.
-
-   The context argument specifies the parsing context in the format
-   expected by the context argument to XML_ExternalEntityParserCreate;
-   context is valid only until the handler returns, so if the
-   referenced entity is to be parsed later, it must be copied.
-   context is NULL only when the entity is a parameter entity.
-
-   The handler should return XML_STATUS_ERROR if processing should not
-   continue because of a fatal error in the handling of the external
-   entity.  In this case the calling parser will return an
-   XML_ERROR_EXTERNAL_ENTITY_HANDLING error.
-
-   Note that unlike other handlers the first argument is the parser,
-   not userData.
-*/
-typedef int (XMLCALL *XML_ExternalEntityRefHandler) (
-                                    XML_Parser parser,
-                                    const XML_Char *context,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId);
-
-/* This is called in two situations:
-   1) An entity reference is encountered for which no declaration
-      has been read *and* this is not an error.
-   2) An internal entity reference is read, but not expanded, because
-      XML_SetDefaultHandler has been called.
-   Note: skipped parameter entities in declarations and skipped general
-         entities in attribute values cannot be reported, because
-         the event would be out of sync with the reporting of the
-         declarations or attribute values
-*/
-typedef void (XMLCALL *XML_SkippedEntityHandler) (
-                                    void *userData,
-                                    const XML_Char *entityName,
-                                    int is_parameter_entity);
-
-/* This structure is filled in by the XML_UnknownEncodingHandler to
-   provide information to the parser about encodings that are unknown
-   to the parser.
-
-   The map[b] member gives information about byte sequences whose
-   first byte is b.
-
-   If map[b] is c where c is >= 0, then b by itself encodes the
-   Unicode scalar value c.
-
-   If map[b] is -1, then the byte sequence is malformed.
-
-   If map[b] is -n, where n >= 2, then b is the first byte of an
-   n-byte sequence that encodes a single Unicode scalar value.
-
-   The data member will be passed as the first argument to the convert
-   function.
-
-   The convert function is used to convert multibyte sequences; s will
-   point to a n-byte sequence where map[(unsigned char)*s] == -n.  The
-   convert function must return the Unicode scalar value represented
-   by this byte sequence or -1 if the byte sequence is malformed.
-
-   The convert function may be NULL if the encoding is a single-byte
-   encoding, that is if map[b] >= -1 for all bytes b.
-
-   When the parser is finished with the encoding, then if release is
-   not NULL, it will call release passing it the data member; once
-   release has been called, the convert function will not be called
-   again.
-
-   Expat places certain restrictions on the encodings that are supported
-   using this mechanism.
-
-   1. Every ASCII character that can appear in a well-formed XML document,
-      other than the characters
-
-      $@\^`{}~
-
-      must be represented by a single byte, and that byte must be the
-      same byte that represents that character in ASCII.
-
-   2. No character may require more than 4 bytes to encode.
-
-   3. All characters encoded must have Unicode scalar values <=
-      0xFFFF, (i.e., characters that would be encoded by surrogates in
-      UTF-16 are  not allowed).  Note that this restriction doesn't
-      apply to the built-in support for UTF-8 and UTF-16.
-
-   4. No Unicode character may be encoded by more than one distinct
-      sequence of bytes.
-*/
-typedef struct {
-  int map[256];
-  void *data;
-  int (XMLCALL *convert)(void *data, const char *s);
-  void (XMLCALL *release)(void *data);
-} XML_Encoding;
-
-/* This is called for an encoding that is unknown to the parser.
-
-   The encodingHandlerData argument is that which was passed as the
-   second argument to XML_SetUnknownEncodingHandler.
-
-   The name argument gives the name of the encoding as specified in
-   the encoding declaration.
-
-   If the callback can provide information about the encoding, it must
-   fill in the XML_Encoding structure, and return XML_STATUS_OK.
-   Otherwise it must return XML_STATUS_ERROR.
-
-   If info does not describe a suitable encoding, then the parser will
-   return an XML_UNKNOWN_ENCODING error.
-*/
-typedef int (XMLCALL *XML_UnknownEncodingHandler) (
-                                    void *encodingHandlerData,
-                                    const XML_Char *name,
-                                    XML_Encoding *info);
-
-XMLPARSEAPI(void)
-XML_SetElementHandler(XML_Parser parser,
-                      XML_StartElementHandler start,
-                      XML_EndElementHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartElementHandler(XML_Parser parser,
-                           XML_StartElementHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetEndElementHandler(XML_Parser parser,
-                         XML_EndElementHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetCharacterDataHandler(XML_Parser parser,
-                            XML_CharacterDataHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetProcessingInstructionHandler(XML_Parser parser,
-                                    XML_ProcessingInstructionHandler handler);
-XMLPARSEAPI(void)
-XML_SetCommentHandler(XML_Parser parser,
-                      XML_CommentHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetCdataSectionHandler(XML_Parser parser,
-                           XML_StartCdataSectionHandler start,
-                           XML_EndCdataSectionHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartCdataSectionHandler(XML_Parser parser,
-                                XML_StartCdataSectionHandler start);
-
-XMLPARSEAPI(void)
-XML_SetEndCdataSectionHandler(XML_Parser parser,
-                              XML_EndCdataSectionHandler end);
-
-/* This sets the default handler and also inhibits expansion of
-   internal entities. These entity references will be passed to the
-   default handler, or to the skipped entity handler, if one is set.
-*/
-XMLPARSEAPI(void)
-XML_SetDefaultHandler(XML_Parser parser,
-                      XML_DefaultHandler handler);
-
-/* This sets the default handler but does not inhibit expansion of
-   internal entities.  The entity reference will not be passed to the
-   default handler.
-*/
-XMLPARSEAPI(void)
-XML_SetDefaultHandlerExpand(XML_Parser parser,
-                            XML_DefaultHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetDoctypeDeclHandler(XML_Parser parser,
-                          XML_StartDoctypeDeclHandler start,
-                          XML_EndDoctypeDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartDoctypeDeclHandler(XML_Parser parser,
-                               XML_StartDoctypeDeclHandler start);
-
-XMLPARSEAPI(void)
-XML_SetEndDoctypeDeclHandler(XML_Parser parser,
-                             XML_EndDoctypeDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
-                                 XML_UnparsedEntityDeclHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetNotationDeclHandler(XML_Parser parser,
-                           XML_NotationDeclHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetNamespaceDeclHandler(XML_Parser parser,
-                            XML_StartNamespaceDeclHandler start,
-                            XML_EndNamespaceDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartNamespaceDeclHandler(XML_Parser parser,
-                                 XML_StartNamespaceDeclHandler start);
-
-XMLPARSEAPI(void)
-XML_SetEndNamespaceDeclHandler(XML_Parser parser,
-                               XML_EndNamespaceDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetNotStandaloneHandler(XML_Parser parser,
-                            XML_NotStandaloneHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetExternalEntityRefHandler(XML_Parser parser,
-                                XML_ExternalEntityRefHandler handler);
-
-/* If a non-NULL value for arg is specified here, then it will be
-   passed as the first argument to the external entity ref handler
-   instead of the parser object.
-*/
-XMLPARSEAPI(void)
-XML_SetExternalEntityRefHandlerArg(XML_Parser parser,
-                                   void *arg);
-
-XMLPARSEAPI(void)
-XML_SetSkippedEntityHandler(XML_Parser parser,
-                            XML_SkippedEntityHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetUnknownEncodingHandler(XML_Parser parser,
-                              XML_UnknownEncodingHandler handler,
-                              void *encodingHandlerData);
-
-/* This can be called within a handler for a start element, end
-   element, processing instruction or character data.  It causes the
-   corresponding markup to be passed to the default handler.
-*/
-XMLPARSEAPI(void)
-XML_DefaultCurrent(XML_Parser parser);
-
-/* If do_nst is non-zero, and namespace processing is in effect, and
-   a name has a prefix (i.e. an explicit namespace qualifier) then
-   that name is returned as a triplet in a single string separated by
-   the separator character specified when the parser was created: URI
-   + sep + local_name + sep + prefix.
-
-   If do_nst is zero, then namespace information is returned in the
-   default manner (URI + sep + local_name) whether or not the name
-   has a prefix.
-
-   Note: Calling XML_SetReturnNSTriplet after XML_Parse or
-     XML_ParseBuffer has no effect.
-*/
-
-XMLPARSEAPI(void)
-XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
-
-/* This value is passed as the userData argument to callbacks. */
-XMLPARSEAPI(void)
-XML_SetUserData(XML_Parser parser, void *userData);
-
-/* Returns the last value set by XML_SetUserData or NULL. */
-#define XML_GetUserData(parser) (*(void **)(parser))
-
-/* This is equivalent to supplying an encoding argument to
-   XML_ParserCreate. On success XML_SetEncoding returns non-zero,
-   zero otherwise.
-   Note: Calling XML_SetEncoding after XML_Parse or XML_ParseBuffer
-     has no effect and returns XML_STATUS_ERROR.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
-
-/* If this function is called, then the parser will be passed as the
-   first argument to callbacks instead of userData.  The userData will
-   still be accessible using XML_GetUserData.
-*/
-XMLPARSEAPI(void)
-XML_UseParserAsHandlerArg(XML_Parser parser);
-
-/* If useDTD == XML_TRUE is passed to this function, then the parser
-   will assume that there is an external subset, even if none is
-   specified in the document. In such a case the parser will call the
-   externalEntityRefHandler with a value of NULL for the systemId
-   argument (the publicId and context arguments will be NULL as well).
-   Note: For the purpose of checking WFC: Entity Declared, passing
-     useDTD == XML_TRUE will make the parser behave as if the document
-     had a DTD with an external subset.
-   Note: If this function is called, then this must be done before
-     the first call to XML_Parse or XML_ParseBuffer, since it will
-     have no effect after that.  Returns
-     XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING.
-   Note: If the document does not have a DOCTYPE declaration at all,
-     then startDoctypeDeclHandler and endDoctypeDeclHandler will not
-     be called, despite an external subset being parsed.
-   Note: If XML_DTD is not defined when Expat is compiled, returns
-     XML_ERROR_FEATURE_REQUIRES_XML_DTD.
-*/
-XMLPARSEAPI(enum XML_Error)
-XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD);
-
-
-/* Sets the base to be used for resolving relative URIs in system
-   identifiers in declarations.  Resolving relative identifiers is
-   left to the application: this value will be passed through as the
-   base argument to the XML_ExternalEntityRefHandler,
-   XML_NotationDeclHandler and XML_UnparsedEntityDeclHandler. The base
-   argument will be copied.  Returns XML_STATUS_ERROR if out of memory,
-   XML_STATUS_OK otherwise.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_SetBase(XML_Parser parser, const XML_Char *base);
-
-XMLPARSEAPI(const XML_Char *)
-XML_GetBase(XML_Parser parser);
-
-/* Returns the number of the attribute/value pairs passed in last call
-   to the XML_StartElementHandler that were specified in the start-tag
-   rather than defaulted. Each attribute/value pair counts as 2; thus
-   this correspondds to an index into the atts array passed to the
-   XML_StartElementHandler.
-*/
-XMLPARSEAPI(int)
-XML_GetSpecifiedAttributeCount(XML_Parser parser);
-
-/* Returns the index of the ID attribute passed in the last call to
-   XML_StartElementHandler, or -1 if there is no ID attribute.  Each
-   attribute/value pair counts as 2; thus this correspondds to an
-   index into the atts array passed to the XML_StartElementHandler.
-*/
-XMLPARSEAPI(int)
-XML_GetIdAttributeIndex(XML_Parser parser);
-
-#ifdef XML_ATTR_INFO
-/* Source file byte offsets for the start and end of attribute names and values.
-   The value indices are exclusive of surrounding quotes; thus in a UTF-8 source
-   file an attribute value of "blah" will yield:
-   info->valueEnd - info->valueStart = 4 bytes.
-*/
-typedef struct {
-  XML_Index  nameStart;  /* Offset to beginning of the attribute name. */
-  XML_Index  nameEnd;    /* Offset after the attribute name's last byte. */
-  XML_Index  valueStart; /* Offset to beginning of the attribute value. */
-  XML_Index  valueEnd;   /* Offset after the attribute value's last byte. */
-} XML_AttrInfo;
-
-/* Returns an array of XML_AttrInfo structures for the attribute/value pairs
-   passed in last call to the XML_StartElementHandler that were specified
-   in the start-tag rather than defaulted. Each attribute/value pair counts
-   as 1; thus the number of entries in the array is
-   XML_GetSpecifiedAttributeCount(parser) / 2.
-*/
-XMLPARSEAPI(const XML_AttrInfo *)
-XML_GetAttributeInfo(XML_Parser parser);
-#endif
-
-/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
-   detected.  The last call to XML_Parse must have isFinal true; len
-   may be zero for this call (or any other).
-
-   Though the return values for these functions has always been
-   described as a Boolean value, the implementation, at least for the
-   1.95.x series, has always returned exactly one of the XML_Status
-   values.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
-
-XMLPARSEAPI(void *)
-XML_GetBuffer(XML_Parser parser, int len);
-
-XMLPARSEAPI(enum XML_Status)
-XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
-
-/* Stops parsing, causing XML_Parse() or XML_ParseBuffer() to return.
-   Must be called from within a call-back handler, except when aborting
-   (resumable = 0) an already suspended parser. Some call-backs may
-   still follow because they would otherwise get lost. Examples:
-   - endElementHandler() for empty elements when stopped in
-     startElementHandler(), 
-   - endNameSpaceDeclHandler() when stopped in endElementHandler(), 
-   and possibly others.
-
-   Can be called from most handlers, including DTD related call-backs,
-   except when parsing an external parameter entity and resumable != 0.
-   Returns XML_STATUS_OK when successful, XML_STATUS_ERROR otherwise.
-   Possible error codes: 
-   - XML_ERROR_SUSPENDED: when suspending an already suspended parser.
-   - XML_ERROR_FINISHED: when the parser has already finished.
-   - XML_ERROR_SUSPEND_PE: when suspending while parsing an external PE.
-
-   When resumable != 0 (true) then parsing is suspended, that is, 
-   XML_Parse() and XML_ParseBuffer() return XML_STATUS_SUSPENDED. 
-   Otherwise, parsing is aborted, that is, XML_Parse() and XML_ParseBuffer()
-   return XML_STATUS_ERROR with error code XML_ERROR_ABORTED.
-
-   *Note*:
-   This will be applied to the current parser instance only, that is, if
-   there is a parent parser then it will continue parsing when the
-   externalEntityRefHandler() returns. It is up to the implementation of
-   the externalEntityRefHandler() to call XML_StopParser() on the parent
-   parser (recursively), if one wants to stop parsing altogether.
-
-   When suspended, parsing can be resumed by calling XML_ResumeParser(). 
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_StopParser(XML_Parser parser, XML_Bool resumable);
-
-/* Resumes parsing after it has been suspended with XML_StopParser().
-   Must not be called from within a handler call-back. Returns same
-   status codes as XML_Parse() or XML_ParseBuffer().
-   Additional error code XML_ERROR_NOT_SUSPENDED possible.   
-
-   *Note*:
-   This must be called on the most deeply nested child parser instance
-   first, and on its parent parser only after the child parser has finished,
-   to be applied recursively until the document entity's parser is restarted.
-   That is, the parent parser will not resume by itself and it is up to the
-   application to call XML_ResumeParser() on it at the appropriate moment.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_ResumeParser(XML_Parser parser);
-
-enum XML_Parsing {
-  XML_INITIALIZED,
-  XML_PARSING,
-  XML_FINISHED,
-  XML_SUSPENDED
-};
-
-typedef struct {
-  enum XML_Parsing parsing;
-  XML_Bool finalBuffer;
-} XML_ParsingStatus;
-
-/* Returns status of parser with respect to being initialized, parsing,
-   finished, or suspended and processing the final buffer.
-   XXX XML_Parse() and XML_ParseBuffer() should return XML_ParsingStatus,
-   XXX with XML_FINISHED_OK or XML_FINISHED_ERROR replacing XML_FINISHED
-*/
-XMLPARSEAPI(void)
-XML_GetParsingStatus(XML_Parser parser, XML_ParsingStatus *status);
-
-/* Creates an XML_Parser object that can parse an external general
-   entity; context is a '\0'-terminated string specifying the parse
-   context; encoding is a '\0'-terminated string giving the name of
-   the externally specified encoding, or NULL if there is no
-   externally specified encoding.  The context string consists of a
-   sequence of tokens separated by formfeeds (\f); a token consisting
-   of a name specifies that the general entity of the name is open; a
-   token of the form prefix=uri specifies the namespace for a
-   particular prefix; a token of the form =uri specifies the default
-   namespace.  This can be called at any point after the first call to
-   an ExternalEntityRefHandler so longer as the parser has not yet
-   been freed.  The new parser is completely independent and may
-   safely be used in a separate thread.  The handlers and userData are
-   initialized from the parser argument.  Returns NULL if out of memory.
-   Otherwise returns a new XML_Parser object.
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ExternalEntityParserCreate(XML_Parser parser,
-                               const XML_Char *context,
-                               const XML_Char *encoding);
-
-enum XML_ParamEntityParsing {
-  XML_PARAM_ENTITY_PARSING_NEVER,
-  XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE,
-  XML_PARAM_ENTITY_PARSING_ALWAYS
-};
-
-/* Controls parsing of parameter entities (including the external DTD
-   subset). If parsing of parameter entities is enabled, then
-   references to external parameter entities (including the external
-   DTD subset) will be passed to the handler set with
-   XML_SetExternalEntityRefHandler.  The context passed will be 0.
-
-   Unlike external general entities, external parameter entities can
-   only be parsed synchronously.  If the external parameter entity is
-   to be parsed, it must be parsed during the call to the external
-   entity ref handler: the complete sequence of
-   XML_ExternalEntityParserCreate, XML_Parse/XML_ParseBuffer and
-   XML_ParserFree calls must be made during this call.  After
-   XML_ExternalEntityParserCreate has been called to create the parser
-   for the external parameter entity (context must be 0 for this
-   call), it is illegal to make any calls on the old parser until
-   XML_ParserFree has been called on the newly created parser.
-   If the library has been compiled without support for parameter
-   entity parsing (ie without XML_DTD being defined), then
-   XML_SetParamEntityParsing will return 0 if parsing of parameter
-   entities is requested; otherwise it will return non-zero.
-   Note: If XML_SetParamEntityParsing is called after XML_Parse or
-      XML_ParseBuffer, then it has no effect and will always return 0.
-*/
-XMLPARSEAPI(int)
-XML_SetParamEntityParsing(XML_Parser parser,
-                          enum XML_ParamEntityParsing parsing);
-
-/* Sets the hash salt to use for internal hash calculations.
-   Helps in preventing DoS attacks based on predicting hash
-   function behavior. This must be called before parsing is started.
-   Returns 1 if successful, 0 when called after parsing has started.
-*/
-XMLPARSEAPI(int)
-XML_SetHashSalt(XML_Parser parser,
-                unsigned long hash_salt);
-
-/* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then
-   XML_GetErrorCode returns information about the error.
-*/
-XMLPARSEAPI(enum XML_Error)
-XML_GetErrorCode(XML_Parser parser);
-
-/* These functions return information about the current parse
-   location.  They may be called from any callback called to report
-   some parse event; in this case the location is the location of the
-   first of the sequence of characters that generated the event.  When
-   called from callbacks generated by declarations in the document
-   prologue, the location identified isn't as neatly defined, but will
-   be within the relevant markup.  When called outside of the callback
-   functions, the position indicated will be just past the last parse
-   event (regardless of whether there was an associated callback).
-   
-   They may also be called after returning from a call to XML_Parse
-   or XML_ParseBuffer.  If the return value is XML_STATUS_ERROR then
-   the location is the location of the character at which the error
-   was detected; otherwise the location is the location of the last
-   parse event, as described above.
-*/
-XMLPARSEAPI(XML_Size) XML_GetCurrentLineNumber(XML_Parser parser);
-XMLPARSEAPI(XML_Size) XML_GetCurrentColumnNumber(XML_Parser parser);
-XMLPARSEAPI(XML_Index) XML_GetCurrentByteIndex(XML_Parser parser);
-
-/* Return the number of bytes in the current event.
-   Returns 0 if the event is in an internal entity.
-*/
-XMLPARSEAPI(int)
-XML_GetCurrentByteCount(XML_Parser parser);
-
-/* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets
-   the integer pointed to by offset to the offset within this buffer
-   of the current parse position, and sets the integer pointed to by size
-   to the size of this buffer (the number of input bytes). Otherwise
-   returns a NULL pointer. Also returns a NULL pointer if a parse isn't
-   active.
-
-   NOTE: The character pointer returned should not be used outside
-   the handler that makes the call.
-*/
-XMLPARSEAPI(const char *)
-XML_GetInputContext(XML_Parser parser,
-                    int *offset,
-                    int *size);
-
-/* For backwards compatibility with previous versions. */
-#define XML_GetErrorLineNumber   XML_GetCurrentLineNumber
-#define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
-#define XML_GetErrorByteIndex    XML_GetCurrentByteIndex
-
-/* Frees the content model passed to the element declaration handler */
-XMLPARSEAPI(void)
-XML_FreeContentModel(XML_Parser parser, XML_Content *model);
-
-/* Exposing the memory handling functions used in Expat */
-XMLPARSEAPI(void *)
-XML_MemMalloc(XML_Parser parser, size_t size);
-
-XMLPARSEAPI(void *)
-XML_MemRealloc(XML_Parser parser, void *ptr, size_t size);
-
-XMLPARSEAPI(void)
-XML_MemFree(XML_Parser parser, void *ptr);
-
-/* Frees memory used by the parser. */
-XMLPARSEAPI(void)
-XML_ParserFree(XML_Parser parser);
-
-/* Returns a string describing the error. */
-XMLPARSEAPI(const XML_LChar *)
-XML_ErrorString(enum XML_Error code);
-
-/* Return a string containing the version number of this expat */
-XMLPARSEAPI(const XML_LChar *)
-XML_ExpatVersion(void);
-
-typedef struct {
-  int major;
-  int minor;
-  int micro;
-} XML_Expat_Version;
-
-/* Return an XML_Expat_Version structure containing numeric version
-   number information for this version of expat.
-*/
-XMLPARSEAPI(XML_Expat_Version)
-XML_ExpatVersionInfo(void);
-
-/* Added in Expat 1.95.5. */
-enum XML_FeatureEnum {
-  XML_FEATURE_END = 0,
-  XML_FEATURE_UNICODE,
-  XML_FEATURE_UNICODE_WCHAR_T,
-  XML_FEATURE_DTD,
-  XML_FEATURE_CONTEXT_BYTES,
-  XML_FEATURE_MIN_SIZE,
-  XML_FEATURE_SIZEOF_XML_CHAR,
-  XML_FEATURE_SIZEOF_XML_LCHAR,
-  XML_FEATURE_NS,
-  XML_FEATURE_LARGE_SIZE,
-  XML_FEATURE_ATTR_INFO
-  /* Additional features must be added to the end of this enum. */
-};
-
-typedef struct {
-  enum XML_FeatureEnum  feature;
-  const XML_LChar       *name;
-  long int              value;
-} XML_Feature;
-
-XMLPARSEAPI(const XML_Feature *)
-XML_GetFeatureList(void);
-
-
-/* Expat follows the GNU/Linux convention of odd number minor version for
-   beta/development releases and even number minor version for stable
-   releases. Micro is bumped with each release, and set to 0 with each
-   change to major or minor version.
-*/
-#define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 1
-#define XML_MICRO_VERSION 0
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* not Expat_INCLUDED */
diff --git a/openflow/usr/include/expat_external.h b/openflow/usr/include/expat_external.h
deleted file mode 100644
index 2c03284..0000000
--- a/openflow/usr/include/expat_external.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-   See the file COPYING for copying permission.
-*/
-
-#ifndef Expat_External_INCLUDED
-#define Expat_External_INCLUDED 1
-
-/* External API definitions */
-
-#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
-#define XML_USE_MSC_EXTENSIONS 1
-#endif
-
-/* Expat tries very hard to make the API boundary very specifically
-   defined.  There are two macros defined to control this boundary;
-   each of these can be defined before including this header to
-   achieve some different behavior, but doing so it not recommended or
-   tested frequently.
-
-   XMLCALL    - The calling convention to use for all calls across the
-                "library boundary."  This will default to cdecl, and
-                try really hard to tell the compiler that's what we
-                want.
-
-   XMLIMPORT  - Whatever magic is needed to note that a function is
-                to be imported from a dynamically loaded library
-                (.dll, .so, or .sl, depending on your platform).
-
-   The XMLCALL macro was added in Expat 1.95.7.  The only one which is
-   expected to be directly useful in client code is XMLCALL.
-
-   Note that on at least some Unix versions, the Expat library must be
-   compiled with the cdecl calling convention as the default since
-   system headers may assume the cdecl convention.
-*/
-#ifndef XMLCALL
-#if defined(_MSC_VER)
-#define XMLCALL __cdecl
-#elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER)
-#define XMLCALL __attribute__((cdecl))
-#else
-/* For any platform which uses this definition and supports more than
-   one calling convention, we need to extend this definition to
-   declare the convention used on that platform, if it's possible to
-   do so.
-
-   If this is the case for your platform, please file a bug report
-   with information on how to identify your platform via the C
-   pre-processor and how to specify the same calling convention as the
-   platform's malloc() implementation.
-*/
-#define XMLCALL
-#endif
-#endif  /* not defined XMLCALL */
-
-
-#if !defined(XML_STATIC) && !defined(XMLIMPORT)
-#ifndef XML_BUILDING_EXPAT
-/* using Expat from an application */
-
-#ifdef XML_USE_MSC_EXTENSIONS
-#define XMLIMPORT __declspec(dllimport)
-#endif
-
-#endif
-#endif  /* not defined XML_STATIC */
-
-
-/* If we didn't define it above, define it away: */
-#ifndef XMLIMPORT
-#define XMLIMPORT
-#endif
-
-
-#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef XML_UNICODE_WCHAR_T
-#define XML_UNICODE
-#endif
-
-#ifdef XML_UNICODE     /* Information is UTF-16 encoded. */
-#ifdef XML_UNICODE_WCHAR_T
-typedef wchar_t XML_Char;
-typedef wchar_t XML_LChar;
-#else
-typedef unsigned short XML_Char;
-typedef char XML_LChar;
-#endif /* XML_UNICODE_WCHAR_T */
-#else                  /* Information is UTF-8 encoded. */
-typedef char XML_Char;
-typedef char XML_LChar;
-#endif /* XML_UNICODE */
-
-#ifdef XML_LARGE_SIZE  /* Use large integers for file/stream positions. */
-#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
-typedef __int64 XML_Index; 
-typedef unsigned __int64 XML_Size;
-#else
-typedef long long XML_Index;
-typedef unsigned long long XML_Size;
-#endif
-#else
-typedef long XML_Index;
-typedef unsigned long XML_Size;
-#endif /* XML_LARGE_SIZE */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* not Expat_External_INCLUDED */
diff --git a/openflow/usr/include/fast.h b/openflow/usr/include/fast.h
deleted file mode 100644
index 8eb365a..0000000
--- a/openflow/usr/include/fast.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/** *************************************************************************
- *  @file          fast.h
- *  @brief		FAST架构平台所有相关头文件定义
- * 
- *   此头文件包含了其他FAST相关的所有定义文件，如虚拟地址空间定义、数据类型定义
- *   数据结构定义、枚举类型定义和错误信息定义
- * 
- *  @date		2017/01/05 12:14:24 星期四
- *  @author		XDL(Copyright  2017  XuDongLai)
- *  @email		<XuDongLai0923@163.com>
- *  @version	0.2.0
- ****************************************************************************/
-/*
- * fast.h
- *
- * Copyright (C) 2017 - XuDongLai
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FAST_H__
-#define __FAST_H__
-#include <stdio.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <endian.h>
-#include <signal.h>
-#include <memory.h>
-#include <pthread.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <linux/if_ether.h>
-#include <linux/netlink.h>
-#include <netinet/in.h> /*IPv6 addr*/
-#include <sys/file.h>
-#include <sys/mman.h>
-
-
-
-/** 是否启动软件调试模式，不启用对硬件操作，对硬件寄存器读写进行屏蔽，仅做打印输出 */
-#define XDL_DEBUG 1   /**< 启用软件调试模式 */
-#undef XDL_DEBUG	/**< 不启用软件调试模式 */
-
-/** 硬件平台使用ZYNQ系列的定义，20180601开始使用*/
-#define OPENBOX_S4  1  /**< 硬件平台使用ZYNQ平台 */
-//#undef OPENBOX_S4 /**< 硬件平台不使用ZYNQ平台 */
-
-/** 硬件平台使用OpenBox-S28系列的定义，20180601开始使用*/
-#define OPENBOX_S28  1  /**< 硬件平台使用ZYNQ平台 */
-#undef OPENBOX_S28 /**< 硬件平台不使用ZYNQ平台 */
-
-
-/*FAST架构数据结构版本号1.0*/
-#define FAST_10 1
-#undef FAST_10
-/*FAST架构数据结构版本号2.0*/
-#define FAST_20 1
-//#undef FAST_20
-
-#define FAST_XOFP_UA_MODE 1 /*OpenFlow交换机采用FAST的UA架构方式运行*/
-#undef FAST_XOFP_UA_MODE
-
-/** 硬件查表模式是否使用BV查表，默认为顺序匹配查表 */
-#define LOOKUP_BV 1   /**< 硬件查表使用BV */
-#undef LOOKUP_BV	/**< 硬件查表不使用BV */
-
-
-#include "fast_type.h"
-#include "fast_struct.h"
-#include "fast_err.h"
-#include "fast_vaddr.h"
-#include "fast_version.h"
-#include "fast_sys_dev.h"
-
-/*---------------REG------------------*/
-u64 fast_reg_rd(u64 regaddr);/** 读硬件64位寄存器*/
-void fast_reg_wr(u64 regaddr,u64 regvalue);/** 写硬件64位寄存器*/
-
-/*---------------UA------------------*/
-int fast_ua_init(int mid,fast_ua_recv_callback callback);/** UA模块初始化*/
-void fast_ua_destroy(void);/** UA模块注销(销毁)*/
-int fast_ua_send(struct fast_packet *pkt,int pkt_len);/** UA发送报文功能函数*/
-void fast_ua_recv();/** UA启动报文接收线程(接收到报文后,回调用户注册函数)*/
-void fast_ua_hw_wr(u8 dmid,u32 addr,u32 value,u32 mask);
-u32 fast_ua_hw_rd(u8 dmid,u32 addr,u32 mask);
-
-/*--------------DEBUG----------------*/
-#ifdef FAST_KERNEL
-#define PFX "fastK->"
-#define EPFX "KERR-fast->"
-#define FAST_DBG(args...) printk(PFX args)
-#define FAST_ERR(args...) printk(EPFX args)
-#else
-#define PFX "fastU->"
-#define EPFX "UERR-fast->"
-#define FAST_DBG(args...) do{printf(PFX);printf(args);}while(0)
-#define FAST_ERR(args...) do{printf(EPFX);printf(args);exit(0);}while(0)
-#endif
-#endif//__FAST_H__
diff --git a/openflow/usr/include/fast_err.h b/openflow/usr/include/fast_err.h
deleted file mode 100644
index 943a469..0000000
--- a/openflow/usr/include/fast_err.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/** *************************************************************************
- *  @file          fast_err.h
- *  @brief		FAST平台的错误类型值定义
- * 
- *  @date	   2017/01/05 12:08:38 星期四
- *  @author		XDL(Copyright  2017  XuDongLai)
- *  @email		<XuDongLai0923@163.com>
- *  @version	0.2.0
- ****************************************************************************/
-/*
- * fast_err.h
- *
- * Copyright (C) 2017 - XuDongLai
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FAST_ERR_H__
-#define __FAST_ERR_H__
-
-/** 规则索引溢出错误 */
-#define E_RULE_INDEX_OVERFLOW 1
-/** UA创建NetLink SOCKET时出错 */
-#define E_UA_NLSK_CREATE 2
-/** UA绑定NetLink SOCKET时出错 */
-#define E_UA_NLSK_BIND 3
-/** UA注册时出错 */
-#define E_UA_NLSK_REG_ERR 4
-#endif//__FAST_ERR_H__
\ No newline at end of file
diff --git a/openflow/usr/include/fast_struct.h b/openflow/usr/include/fast_struct.h
deleted file mode 100644
index acd7a51..0000000
--- a/openflow/usr/include/fast_struct.h
+++ /dev/null
@@ -1,500 +0,0 @@
-/** *************************************************************************
- *  @file          fast_struct.h
- *  @brief		FAST平台的数据类型（结构）定义
- * 
- *  FAST平台主要的数据结构类型主要包括：枚举的消息类型、动作类型；报文数据结构、
- *  流表数据结构；回调函数类型等。
- * 
- *  @date		2017/04/09 12:25:57 星期日
- *  @author		XDL(Copyright  2017  XuDongLai)
- *  @email		<XuDongLai0923@163.com>
- *  @version	0.2.0
- ****************************************************************************/
-/*
- * fast_struct.h
- *
- * Copyright (C) 2017 - XuDongLai
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FAST_STRUCT_H__
-#define __FAST_STRUCT_H__
-
-#pragma pack(1)
-/*-------------------------NetMagic 08----------------------------------*/
-/** 
- * @brief NetMagic08的访问控制（NMAC）报文的报文类型枚举定义
- * 该枚举类型主要包括软件与NetMagic08之间的NMAC通信报
- * 文的所有类型
- */
-typedef enum{	
-	NM_CONN = 1,	/**< NMAC的连接报文*/	
-	NM_RELESE,		/**< NMAC的释放（关闭）报文*/
-	NM_REG_RD,		/**< NMAC的读请求报文*/	
-	NM_REG_WR,		/**< NMAC的写操作报文*/	
-	NM_RD_RPL,		/**< NMAC的读回应报文*/	
-	NM_WR_RPL,		/**< NMAC的写回应报文*/
-}NMAC_TYPE;
-
-
-/** 
- * @brief NetMagic08访问控制（NMAC）报文的头部结构定义
- */
-struct nm_head
-{
-	u8 count;			/**< @brief NMAC报文头的计数值，表示后面的读写操作包含多少个*/
-    u8 reserve8_A;	    /**< @brief 暂时保留不用*/
-    u16 seq;			/**< @brief NMAC报文头的序号，每发一个报文计数加1*/
-    u16 reserve16_B;	/**< @brief 报文计数值*/
-    u8 type;			/**< @brief NMAC报文头的类型，@see ::NMAC_TYPE*/
-    u8 parameter_1;		/**< @brief 报文计数值1*/
-	u8 parameter_2;		/**< @brief 报文计数值2*/
-    u8 reserve8_C;		/**< @brief 报文计数值*/
-};
-
-/** 
- * @brief NMAC报文的完整定义
- * 
- * NMAC报文由NMAC头、寄存器地址和寄存器值三部分组成。
- */
-struct nm_packet
-{	
-	struct nm_head nm;  /**< @brief NMAC报文头*/	
-	u64 regaddr;		/**< @brief 读或写的寄存器地址*/	
-	u64 regvalue;		/**< @brief 读回或写入的寄存器地址对应的值*/	
-};
-
-/*-------------------------NetMagic 08----------------------------------*/
-
-
-/*-------------------------UA----------------------------------*/
-//UA
-/** 
- * @brief UA注册的NetLink消息类型
- */
-#define FAST_UA_NETLINK 23
-/** 
- * @brief UA注册的NetLink消息长度
- */
-#define FAST_UA_REG_LEN 32
-/** 
- * @brief UA通信的NetLink消息最大长度
- */
-#define FAST_UA_PKT_MAX_LEN 2048
-
-/** 
- * @brief 支持UA注册的最大个数
- */
-#define UA_MAX_MID_CNT 256
-
-/** 
- * @brief UA模块与内核交互消息定义
- * 消息内型主要包括：注册、注销等类型
- */
-typedef enum {	
-	UA_REG = 21,	/**< UA注册*/	
-	UA_UNREG = 32,  /**< UA注销*/	
-	UA_OK = 26,		/**< UA操作成功*/
-	UA_ERR  = 37	/**< UA操作失败*/
-}UA_STATE;
-
-/*-------------------------UA----------------------------------*/
-/** 
- * @brief FAST平台硬件的ACTION动作类型枚举定义
- * 类型定义主要包括：硬件丢弃、设置报文进程号（队列号／端口号）、
- * 轮循分派到各个进程（队列／端口）、硬件端口输出、设置报文目的模块ID、
- * 设置RTP报文队列等
- */
-typedef enum{
-        ACTION_DROP = 0,		/**< 报文在硬件,由FPGA处理：丢弃报文*/
-        ACTION_SET_PID = 1,		/**< 报文送软件,由CPU处理：设置报文的处理线程ID号(处理线程数则驱动模块参数决定,默认从0开始,不能超过线程最大值)*/
-        ACTION_POLL = 2,		/**< 报文送软件,由CPU处理：将报文循环分派到处理线程(处理线程数则驱动模块参数决定,在指定线程数内循环派送)*/
-        ACTION_PORT = 3,		/**< 报文在硬件,由FPGA处理：从指定硬件物理端口输出报文*/
-        ACTION_SET_MID = 4,		/**< 报文送软件,由CPU处理：设置报文分派的模块ID号*/
-		ACTION_SET_QUEUE_RTP = 5,/**< 支持传媒RTP视频流的队列调度*/
-		ACTION_REPLACE_PROTO = 6,/**< 支持协议替换操作*/
-		ACTION_KEEP_RESOURCE = 7,/**< 支持流在端口转发时的资源预留*/
-}ACTION;
-
-/*-----------------------------------流表相关----------------------------------------------*/
-
-/** 
- * @brief FAST平台硬件流表中流的格式定义
- */
-struct fast_flow /*2017/06/01开始启用，支持IPv6*/
-{	
-	u8  dmac[ETH_ALEN];	/**< @brief Ethernet source address. */
-	u8  smac[ETH_ALEN];	/**< @brief Ethernet destination address. */
-	u16 tci;			/**< @brief 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */
-	u16 type;			/**< @brief Ethernet frame type. */
-	//eth-16;
-	
-	u8  proto;			/**< @brief IP protocol or lower 8 bits of ARP opcode. */
-	u8  tos;			/**< @brief IP ToS. */
-	u8  ttl;			/**< @brief IP TTL/hop limit. */
-	u8  port:6,			/**< @brief Input Port*/
-		frag:2;			/**< @brief One of OVS_FRAG_TYPE_*. */
-	//ip=16+4;
-	
-	union {
-		struct {			
-			u32 src;	/**< @brief IP source address. */
-			u32 dst;	/**< @brief IP destination address. */
-			//addr;
-			
-			union {
-				struct {
-					u16 sport;		/**< @brief TCP/UDP/SCTP source port. */
-					u16 dport;		/**< @brief TCP/UDP/SCTP destination port. */
-					u16 flags;		/**< @brief TCP flags. */
-				} tp;				/**< @brief IPv4的传输层端口与标志信息*/
-				struct {
-					u8 sha[ETH_ALEN];	/**< @brief ARP source hardware address. */
-					u8 tha[ETH_ALEN];	/**< @brief ARP target hardware address. */
-				} arp;					/**< @brief ARP的MAC地址信息*/
-			};							/**< @brief IPv4传输层信息与ARP信息共用体，二者互斥存在*/
-		} ipv4;							/**< @brief IPv4协议相关字段*/
-		struct {
-			struct in6_addr src;	/**< @brief IPv6 source address. */
-			struct in6_addr dst;	/**< @brief IPv6 destination address. */
-			//addr;
-			
-			u32 label;				/**< @brief IPv6 flow label. */
-			union {
-				struct {
-					u16 sport;		/**< @brief TCP/UDP/SCTP source port. */
-					u16 dport;		/**< @brief TCP/UDP/SCTP destination port. */
-					u16 flags;		/**< @brief TCP flags. */
-				} tp;				/**< @brief IPv6的传输层端口与标志信息*/
-				/*512位宽表项不够，暂不使用ND协议中的targetIP!!!为方便以后扩展，将其移至末尾*/
-#if 0
-				struct {					
-					u8 sll[ETH_ALEN];	/**< @brief ND source link layer address. */
-					u8 tll[ETH_ALEN];	/**< @brief ND target link layer address. */					
-					struct in6_xaddr target;	/**< @brief ND target address. */
-				} nd;
-#endif
-			};						/**< @brief IPv6传输层信息与ND信息共用体，二者互斥存在*/
-			u16 nil;
-		} ipv6;						/**< @brief IPv6协议相关字段*/
-	};
-}; 
-#if 0
-struct flow_old /*2017/06/01之前版本使用，硬件仅支持OF1.0，不支持IPv6等*/
-{
-	u8 dmac[6]; /* Ethernet destination address. */
-	u8 smac[6]; /* Ethernet source address. */
-	u32 tag; /* 北邮使用的TAG字段，4个字节. */
-/*16B,128b*/	
-	u16 type; /* Ethernet frame type. */
-	u8 tos; /* IP ToS (actually DSCP field, 6 bits). */
-	u8 proto; /* IP protocol or lower 8 bits of ARP opcode. */
-	u32 src; /* IP source address. */
-	u32 dst; /* IP destination address. */
-	u16 sport; /* TCP/UDP source port. */
-	u16 dport; /* TCP/UDP destination port. */
-/*32B,256b*/		
-	u16 port; /* Input switch port. */
-/*34B,272b*/
-	u8 pad[6];/*ADD align:2017/02/28 15:26 ADD*/
-	u64 cookie;/*ADD cookie:2017/02/28 15:26 ADD*/
-	u8 pad2[16];/*30->16:2017/02/28 15:26 ADD*/
-/*64B,512b*/
-/*----------------------RULE 512bit--------------------------*/
-}__attribute__((packed));
-struct um_metadata{
-#if defined(__LITTLE_ENDIAN) /*INTER*/	
-	u64 ts;				/*报文的接收时间戳*/
-	u64 seq:16,			/*报文接收的序号*/
-		reserve:12,		/*暂时保留未用*/
-		dstmid:8,		/*报文分派的目的模块编号*/
-		srcmid:8,		/*报文处理的源模块编号*/
-		len:12,			/*报文的总长度,表示为:UM数据结构大小+2字节IP对齐+完整以太网报文大小*/
-		inout:8;		/*报文的输入/输出端口号,接收时表示输入,发送时表示输出*/
-	u64 none[2];		/*用户自定义预留*/
-#elif defined(__BIG_ENDIAN)  /**/	
-	u64 seq:16,
-		reserve:12,
-		dstmid:8,
-		srcmid:8,
-		len:12,
-		inout:8;	
-	u64 ts;
-	u64 none[2];
-	#else
-#error	"Please fix <asm/byteorder.h>"
-#endif
-}__attribute__((packed));
-#endif
-
-/** 
- * @brief FAST平台硬件规则格式定义
- * FAST规则主要由流关键字、关键字对应掩码、优先级、规则有效位、规则对应动作等组成。
- * 其他字段主要在软件使用
- */
-struct fast_rule{
-	struct fast_flow key;		/**< @brief 规则内容存储结构 @see ::flow*/
-	struct fast_flow mask;		/**< @brief 规则掩码设置结构,与key一一对应 @see ::flow*/
-	u32 priority;			/**< @brief 规则的优先级设置*/
-	u32 valid;				/**< @brief 规则的有效标志设置,要删除一条规则只需要将此标记置0,并更新到硬件*/
-	u64 action;				/**< @brief 规则所对应的执行动作，动作由两部分组成，高4位为ACTION枚举类型，低28位不此类型对应的值 @see ::ACTION*/
-	/*此前数据必须要写入到硬件*/	
-	u32 flow_stats_len;		/**< @brief 流表信息长度*/
-	u64 *flow_stats_info;   /**< @brief 流表信息存储指针位置*/
-	u64 cookie;				/**< @brief 用来存储流的cookie信息，软件使用*/
-	u64 cookie_mask;		/**< @brief 用来存储流cookie的掩码信息，软件使用*/
-	u32 md5[4];				/**< @brief MD5值 @note 用来区分规则的唯一性，软件生成规则时即会判断是否规则重复*/	
-	u32 pad[18];			/**< @brief 总长256B，此为确保数据结构大小做的填充*/
-};
-/*保持硬件一条流表的完整长度为64B*4=256B长度*/
-/*-----------------------------------流表相关----------------------------------------------*/
-
-
-struct tsnflow /**/
-{	
-	u8  dmac[6];	/**< @brief Ethernet source address. */
-	u8  smac[6];	/**< @brief Ethernet destination address. */
-	u16 tci;			/**< @brief 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */
-	u16 type;			/**< @brief Ethernet frame type. */
-	//eth-16;
-	
-	u8  proto;			/**< @brief IP protocol or lower 8 bits of ARP opcode. */
-	u8  tos;			/**< @brief IP ToS. */
-	u8  ttl;			/**< @brief IP TTL/hop limit. */
-	u8  port:6,			/**< @brief Input Port*/
-		frag:2;			/**< @brief One of OVS_FRAG_TYPE_*. */
-	u32 sip;			//源IP地址
-	u32 dip;			//目的ip地址
-	u16 sport;			//源端口号
-	u16 dport;			//目的端口号
-};
-
-struct tsn_rule{
-	struct tsnflow key;		/**< @brief 规则内容存储结构 @see ::flow*/
-	struct tsnflow mask;		/**< @brief 规则掩码设置结构,与key一一对应 @see ::flow*/
-	u32 priority;			/**< @brief 规则的优先级设置*/
-	u32 valid;				/**< @brief 规则的有效标志设置,要删除一条规则只需要将此标记置0,并更新到硬件*/
-	u32 action;				/**< @brief 规则所对应的执行动作，动作由两部分组成，高4位为ACTION枚举类型，低28位不此类型对应的值 @see ::ACTION*/
-	/*此前数据必须要写入到硬件*/	
-	u32 flow_stats_len;		/**< @brief 流表信息长度*/
-	u64 *flow_stats_info;   /**< @brief 流表信息存储指针位置*/
-	u32 *tmp;				/*在S4系统中，上面变量指针大小为32*/
-	u64 cookie;				/**< @brief 用来存储流的cookie信息，软件使用*/
-	u64 cookie_mask;		/**< @brief 用来存储流cookie的掩码信息，软件使用*/
-	u32 md5[4];				/**< @brief MD5值 @note 用来区分规则的唯一性，软件生成规则时即会判断是否规则重复*/	
-	u32 pad[34];			/**< @brief 总长256B，此为确保数据结构大小做的填充*/
-};
-struct tsnflow_30
-{//40B
-	u8 pad[12];
-	u16	dport;
-	u16	sport;	
-	u32	dip;
-	u32	sip;
-	u8	inport;
-	u8	ip_proto;
-	u16	vlan_filed;
-	u16 eth_type;
-}__attribute__((packed));
-
-struct tsn_rule_30{
-	struct tsnflow_30 key;		/**< @brief 规则内容存储结构 @see ::flow*/
-	struct tsnflow_30 mask;		/**< @brief 规则掩码设置结构,与key一一对应 @see ::flow*/
-	u32 priority;			/**< @brief 规则的优先级设置*/
-	u32 valid;				/**< @brief 规则的有效标志设置,要删除一条规则只需要将此标记置0,并更新到硬件*/
-	u32 action;				/**< @brief 规则所对应的执行动作，动作由两部分组成，高4位为ACTION枚举类型，低28位不此类型对应的值 @see ::ACTION*/
-	/*此前数据必须要写入到硬件*/	
-	u32 flow_stats_len;		/**< @brief 流表信息长度*/
-	u64 *flow_stats_info;   /**< @brief 流表信息存储指针位置*/
-	u32 *tmp;				/*在S4系统中，上面变量指针大小为32*/
-	u64 cookie;				/**< @brief 用来存储流的cookie信息，软件使用*/
-	u64 cookie_mask;		/**< @brief 用来存储流cookie的掩码信息，软件使用*/
-	u32 md5[4];				/**< @brief MD5值 @note 用来区分规则的唯一性，软件生成规则时即会判断是否规则重复*/	
-	u32 pad[29];			/**< @brief 总长256B，此为确保数据结构大小做的填充*/
-};
-
-/*-----------------------------------BV新定义位宽104位，5元组查表-----------------------------------*/
-struct tuple5
-{
-	u32 sip;
-	u32 dip;
-	u16 sport;
-	u16 dport;
-	u16 pad0;
-	u8 pad1;
-	u8 proto;
-};
-struct row_bv
-{
-	struct tuple5 key;
-	struct tuple5 mask;	
-	u32 idx:5,		/**< 规则索引*/
-		valid:1,	/**< 规则有效位*/
-		pad:26;		/**< 暂时不用*/
-	u32 action;
-};
-/*-----------------------------------BV新定义位宽104位，5元组查表-----------------------------------*/
-
-/*-----------------------------------报文相关----------------------------------------------*/
-/** 
- * @brief UM模块数据格式定义
- */
-struct um_metadata{
-#if defined(__LITTLE_ENDIAN) /*INTER*/	
-#ifdef FAST_10
-	u64 ts:32,			/**< @brief 报文接收的时间戳 @note 如果用户需要使用表示更大的时间，建议存储在第二拍数据中（user[2]字段）*/
-		ts2:12,
-		flowID:14,		/**< @brief 流ID号*/
-		priority:3,		/**< @brief 报文优先级*/
-		discard:1,		/**< @brief 指示报文是否丢弃 @note 默认为0，表示不丢弃，置1时表示丢弃*/
-		pktdst:1,		/**< @brief 报文的输出目的方向 @note 0表示输出到网络端口，1表示输出到CPU*/
-		pktsrc:1;		/**< @brief 报文的输入源方向 @note 0表示网络端口输入，1表示从CPU输入*/
-	u64 outport:16,		/**< @brief 报文输出端口号 @note 以bitmap形式表示，1表示从0号端口输出；8表示从3号端口输出*/
-		seq:12,			/**< @brief 报文接收时的序列号 @note 每个端口独立维护一个编号*/
-		dstmid:8,		/**< @brief 报文下次处理的目的模块编号*/
-		srcmid:8,		/**< @brief 报文上次处理时的模块编号*/
-		len:12,			/**< @brief 报文长度 @note 最大可表示4095字节，但FAST平台报文缓存区最大为2048，完整以太网报文的MTU不要超过1500*/
-		inport:4,		/**< @brief 输入端口号 @note 取值：0——15，最多表示16个输入端口*/
-		ttl:4;			/**< @brief 报文通过模块的TTL值，每过一个处理模块减1*/
-#elif FAST_20
-	u64 ts:32,			/**< @brief 时间戳*/
-		reserve:17,		/**< @brief 保留*/
-		pktsrc:1,		/**< @brief 分组的来源，0为网络接口输入，1为CPU输入，此比特位在进入硬件时会交换到pkttype位置，保留位为18位*/
-		flowID:14;		/**< @brief 流ID*/
-	u64	seq:8,			/**< @brief 分组接收序列号*/
-		pst:8,			/**< @brief 标准协议类型（参考硬件定义）*/
-		dstmid:8,			/**< @brief 下一个处理分组的模块ID*/
-		srcmid:8,			/**< @brief 最近一次处理分组的模块ID*/
-		len:12,			/**< @brief 报文长度*/
-		discard:1,		/**< @brief 丢弃位*/
-		priority:3,		/**< @brief 分组优先级*/
-		outport:6,		/**< @brief 单播：分组输出端口ID，组播/泛洪：组播/泛洪表地址索引*/
-		outtype:2,		/**< @brief 输出类型，00：单播，01：组播，10：泛洪，11：从输入接口输出*/
-		inport:6,		/**< @brief 分组的输入端口号*/
-		pktdst:1,		/**< @brief 分组目的，0为网络接口输出，1为送CPU*/
-		pkttype:1;		/**< @brief 报文类型，0：数据报文，1：控制报文。硬件识别报文类别后，会将pktsrc位交换到此，恢复硬件数据格式*/		
-#endif
-	u64 user[2];		/**< @brief 用户自定义metadata数据格式与内容 @remarks 此字段由可用户改写，但需要保证数据大小严格限定在16字节*/
-#elif defined(__BIG_ENDIAN)  /**/	
-	#error	"(__BIG_ENDIAN)Please fix <asm/byteorder.h>"
-#else
-	#error	"Please fix <asm/byteorder.h>"
-#endif
-};
-
-/*FAST 2.0环形控制通路控制报文*/
-struct ctl_metadata
-{
-	u64 data:32,
-		mask:32;
-	u64 addr:32,
-		dstmid:8,
-		srcmid:8,
-		seq:12,
-		type:3,
-		pkttype:1;
-	u64 reserve;
-	u64 sessionID;
-};
-
-struct common_metadata
-{
-	u64 a;
-	u64 b:32,
-		c:31,
-		pkttype:1;
-	u64 d;
-	u64 e;
-};
-
-/**
- * @brief FAST架构完整报文格式定义
- * 
- * FAST平台报文由3部分级成
- * UM头 + 对齐标志 + 完整以太网报文
- * UM头共32节字，@see ::um_metadata
- * 对齐标志2字节，为对对齐IP地址填充使用
- * 完成以太网报文大小为1514字节，存储完整以太网报文内容
- */
-struct fast_packet
-{
-	union
-	{
-		struct um_metadata um;		/**< @brief UM模块数据格式定义 @see ::um_metadata */
-		struct ctl_metadata cm;		/**< 控制报文格式定义*/
-		struct common_metadata md;  /**< 公共控制信息，报文类型（0：数据，1：控制）*/
-	};
-#ifdef OPENBOX_S28
-	u16 flag;					/**< @brief 2字节对齐标志，主要是为了IP地址的对齐 @note 此标志在内核会用来标记是一个FAST类型报文，建议用户不使用些字段*/
-#endif
-	u8 data[1514];				/**< @brief 完整以太网报文数据，暂时不含CRC数据*/
-};
-
-/**
- * @brief UA与内核消息交互结构定义
- */
-struct fast_ua_kernel_msg
-{
-	int mid;			/**< @brief 提供相应的处理MID号 @note 软件模块MID号范围为：129-255*/
-	int pid;			/**< @brief 用户程序的PID，UA注册时，低层库函数自动获取当前进程号*/
-	UA_STATE state;		/**< @brief UA消息枚举状态 @see ::UA_STATE*/
-};
-
-/**
-* @brief UA模块用户回调函数类型定义
-*
-* @param pkt 表示接收到的报文，以指针方式传递
-* @warning 此指针数据为库函数底层循环使用变量，用户若要存储数据需要自己申请新空间并从此指针位置拷贝数据
-* @param pkt_len 表示此报文的有效长度 @note 此长度是指整个struct fast_packet的长度，取值为pkt->um.len
-*
-* @return 
-*/
-typedef int(*fast_ua_recv_callback)(struct fast_packet *pkt,int pkt_len);
-
-/* Header on all OpenFlow packets. */
-struct ofp_header{
-	uint8_t version; 		/* OFP_VERSION. */
-	uint8_t type; 			/* One of the OFPT_ constants. */
-	uint16_t length; 		/* Length including this ofp_header. */
-	uint32_t xid; 			/* Transaction id associated with this packet.
-							   Replies use the same id as was in the request
-							   to facilitate pairing. */
-}__attribute__((packed));
-
-
-struct ofp_buffer
-{
-        struct ofp_header header;
-        u8 data[0];
-
-}__attribute__((packed));
-
-
-enum opfmsg_hook_ret
-{
-	HANDLE = 0x1,
-	CONTINUE = 0x2
-};
-
-typedef int(*openflow_msg_callback)(struct ofp_buffer *ofpbuf,int len);
-/** 
- *  @brief IPv6地址定义
- */
-struct in6_xaddr
-{
-	u8 addr[16];		/**< @brief 存储IPv6地址的每个字节对象*/
-};
-
-/* Ensure that we can do comparisons as longs. */
-#endif //__FAST_STRUCT_H__
diff --git a/openflow/usr/include/fast_sys_dev.h b/openflow/usr/include/fast_sys_dev.h
deleted file mode 100644
index 92e74f4..0000000
--- a/openflow/usr/include/fast_sys_dev.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/***************************************************************************
- *            fast_sys_dev.h
- *
- *  2018/09/18 21:17:17 星期二
- *  Copyright  2018  XuDongLai
- *  <XuDongLai0923@163.com>
- ****************************************************************************/
-/*
- * fast_sys_dev.h
- *
- * Copyright (C) 2018 - XuDongLai
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FAST_SYS_DEV_H__
-#define __FAST_SYS_DEV_H__
-
-/*---------------REG------------------*/
-int fast_init_hw(u64 addr,u64 len);/** 硬件资源初始，NetMagic08则进行连接操作*/
-void fast_distroy_hw(void);/** 销毁硬件资源信息，NetMagic08则进行释放连接操作*/
-
-
-
-/*---------------RULE------------------*/
-void print_hw_rule(void);/** 打印硬件规则(通过寄存器读返回,并显示)*/
-void print_sw_rule(void);/** 打印软件缓存的规则*/
-void init_rule(u32 default_action);	   /** 初始化规则模块,需要输入默认动作2017/06/01修改*/
-int fast_add_rule(struct fast_rule *rule);/** 添加一条规则*/
-int fast_modify_rule(struct fast_rule *rule,int idx);/** 修改指定位置的规则,函数内部会同步到硬件*/
-int fast_del_rule(int idx);/** 删除一条规则,函数内部会同步到硬件*/
-int read_hw_rule(struct fast_rule *rule,int index);/** 从硬件读取一条指定的规则内容*/
-
-void set_rule_mac64(char *mac,u64 value);/** */
-void set_rule_mac_oxm(char *mac,char *oxm);/** OXM是网络序*/
-void set_rule_ipv6_oxm(char *ipv6,char *oxm);/** */
-void oxm2rule(char *dst,char *oxm,int len);/** */
-u32 fast_match_rule(struct fast_flow *key);
-void print_sw_rule_by_idx(int idx);
-void print_user_rule(struct fast_rule *rule);
-
-
-/**----UA库*/
-void print_pkt(struct fast_packet *pkt,int pkt_len);/** 打印FAST结构报文*/
-
-/*---------------Auto Measure System(AMS)------------------*/
-int fast_ams_alloc(void);/** 获取硬件测量权限 */
-void fast_ams_free(void);/** 释放测量权限  */
-int fast_ams_send(struct fast_packet *send_pkt[],u64 pkt_space_ts[],int count);/** 发送测量报文，报文数组，对应时间间隔数组 */
-void fast_ams_start(void);/** 启动硬件发送报文流程 */
-int fase_ams_check(void);/** 读硬件状态，判断此次测量是否有效 */
-int fast_ams_computer(struct fast_packet *recv_pkt[],u64 pkt_ts_result[],int count);/** 收到测量报文后，进行测量计算，结果存储在pkt_ts_result数组中 */
-
-
-/*---------------OpenFlow Protocol(OFP)------------------*/
-int ofp_init(int argc,char *argv[]);/** 初始化OFP通道*/
-void ofp_exit(void);/** 退出OFP通道*/
-void send_openflow_message(struct ofp_buffer *ofpmsg,int len);
-int openflow_hook_init(int mask,openflow_msg_callback callback);
-
-#endif //__FAST_SYS_DEV_H__
diff --git a/openflow/usr/include/fast_type.h b/openflow/usr/include/fast_type.h
deleted file mode 100644
index ac712fe..0000000
--- a/openflow/usr/include/fast_type.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/** *************************************************************************
- *  @file          fast_type.h
- *  @brief		FAST平台的数据类型定义
- * 
- *  FAST平台主要为网络数据处理平台，为方便用户直观了解数据大小，用了一种非常直观的
- *  方式来定义数据，如u8,u16,u32,u64，分别表示无符号的8位（1字节），16位（2字节），
- *  32位（4字节），64位（8字节）；s8,s16,s32,s64分别表示对应有符号数。
- * 
- *  @date	   2017/01/05 12:04:20 星期四
- *  @author		XDL(Copyright  2017  XuDongLai) 
- *  @email		<XuDongLai0923@163.com>
- *  @version	0.2.0
- *  
- ****************************************************************************/
-/*
- * fast_type.h
- *
- * Copyright (C) 2017 - XuDongLai
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FAST_TYPE_H__
-#define __FAST_TYPE_H__
-
-typedef char s8;				/**< 有符号的8位（1字节）数据定义*/
-typedef unsigned char u8;		/**< 无符号的8位（1字节）数据定义*/
-typedef short s16;				/**< 有符号的16位（2字节）数据定义*/
-typedef unsigned short u16;	/**< 无符号的16位（2字节）数据定义*/
-typedef int s32;				/**< 有符号的32位（4字节）数据定义*/
-typedef unsigned int u32;		/**< 无符号的32位（4字节）数据定义*/
-typedef long long s64;				/**< 有符号的64位（8字节）数据定义*/
-typedef unsigned long long u64;		/**< 无符号的64位（8字节）数据定义*/
-
-#endif //__FAST_TYPE_H__
diff --git a/openflow/usr/include/fast_vaddr.h b/openflow/usr/include/fast_vaddr.h
deleted file mode 100644
index e6563da..0000000
--- a/openflow/usr/include/fast_vaddr.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/** *************************************************************************
- *  @file          fast_vaddr.h
- *  @brief		FAST平台硬件虚拟地址空间定义
- * 
- *  FAST平台硬件的所有地址有一套规范的地址空间定义，根据功能需求进行地址分区管理
- *  其地址分区如下：\n
- *  
- *  @date		2017/01/05 13:31:40 星期四
- *  @author		XDL(Copyright  2017  XuDongLai)
- *  @email		<XuDongLai0923@163.com>
- *  @version	0.2.0
- ****************************************************************************/
-/*
- * fast_vaddr.h
- *
- * Copyright (C) 2017 - XuDongLai
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __FAST_VADDR_H__
-#define __FAST_VADDR_H__
-
-#ifdef OPENBOX_S4
-#include "openboxS4.h"
-#elif OPENBOX_S28
-#include "openboxS28.h"
-#elif NETMAGIC08
-#include "netmagic08.h"
-#elif XDL_DEBUG
-#include "xdl_debug.h"
-#else
-#error	"Please Select Platform(OPENBOX_S4/OPENBOX_S28/XDL_DEBUG)!"
-#include "xdl_debug.h"
-#endif
-
-/** 系统默认UA使用MID值定义*/
-#define FAST_DMID_PROTO_STACK   0x80	/**< 协议栈的MID值的定义,目的MID为0x80表示送到内核协议栈,大于0x80为软件模块，否则为硬件模块 */
-#define FAST_UA_DFT_L2SWITCH	0x81	/**< 系统发布版本中的2层交换工程使用*/
-#define FAST_UA_DFT_XOFP		0x82	/**< 系统发布版本中的OpenFlow交换机工程使用*/
-#define FAST_UA_DFT_AMS			0x83	/**< 系统发布版本中的AMS测量模块工程使用*/
-#define FAST_UA_DFT_L3ROUTE		0x84	/**< 系统发布版本中的3层路由工程使用*/
-#define FAST_UA_DFT_CTL_RW		0x85	/**< 系统发布版本中的控制通路测试工程使用*/
-#define FAST_UA_DFT_UA_FWD		0x86	/**< 系统发布版本中的UA示例转发与测试工程使用*/
-#define FAST_UA_DFT_HWROUTE		0x87	/**< 系统发布版本中的UA示例转发与测试工程使用*/
-
-
-#define SPEED_10        10
-#define SPEED_100       100
-#define SPEED_1000      1000
-#define SPEED_2500      2500
-#define SPEED_10000     10000
-
-/*AMS模块申明*/
-#define FAST_AMS_TX_TIME_H 0x8c000
-#define FAST_AMS_TX_TIME_L 0x8c004
-#define FAST_AMS_TX_STATUS 0x8c010
-#define FAST_AMS_TX_START  0x8c018
-
-#endif//__FAST_VADDR_H__
diff --git a/openflow/usr/include/fast_version.h b/openflow/usr/include/fast_version.h
deleted file mode 100644
index 50d8061..0000000
--- a/openflow/usr/include/fast_version.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/***************************************************************************
- *            fast_version.h
- *
- *  2018/09/18 17:47:43 星期二
- *  Copyright  2018  XuDongLai
- *  <XuDongLai0923@163.com>
- ****************************************************************************/
-/*
- * fast_version.h
- *
- * Copyright (C) 2018 - XuDongLai
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __FAST_VERSION_H__
-#define __FAST_VERSION_H__
-
-/*文档编写规范：
- *以该版本定义说明开始
- * 最后一行为该版本定义的最新版本号，并带有详细描述
- * 中间注释以前使用过的版本，并对历史版本做出详细描述
- */
-
-/** @brief 寄存器读写功能库的版本号定义 */
-/*标准的寄存器读写控制方法，读写接口均使用64位地址（如果是32位系统，则拆分为2次操作）*/
-#define LIBREG_VERSION "20180827"
-
-/** @brief openflow协议通道库的版本号定义 */
-/*该库包含了ofp协议通道相关功能，与控制器建立连接、交互状态与统计信息，支持流表配置等功能*/
-#define LIBOFP_VERSION "20180827"
-
-
-/** @brief 规则操作库的版本号定义 */
-/*基于FAST架构，参考openflow流表规范定义的一种硬件流表管理示例开发库*/
-#define LIBRULE_VERSION "20181015"
-
-/** @brief UA开发库的版本号定义 */
-/*基于FAST架构，提供用户应用（UA）的编程开发接口，支持收发硬件流水线报文，
- * 支持对硬件流水线模块进行管理配置（环形控制通路方式）
- */
-#define LIBUA_VERSION "20180827"
-
-/** @brief 自动测量系统库的版本号定义 */
-/*自动测量系统是UA编程开发的一个具体示例，配合硬件AMS流水线模块一起完成网络测量功能
- *硬件最大支持一次提交32个报文，并按照每个报文携带的具体时间进行发送，回环测试时还
- * 可以对每个报文进行统计，计算每个报文的传输时间等信息
- */
-#define LIBAMS_VERSION "20180827"
-
-
-/** @brief 二层交换应用的版本号定义 */
-#define L2SWITCH_VERSION "20180827"
-/** @brief OpenFlow通道应用的版本号定义 */
-#define XOF_VERSION "20180827"
-/** @brief 自动测量系统应用的版本号定义 */
-#define AMS_VERSION "20180827"
-
-
-/** @brief 寄存器读写应用的版本号定义 */
-#define REG_RW_VERSION "20180827"
-/** @brief 端口计数应用的版本号定义 */
-#define PORT_COUNTS_VERSION "20180827"
-/** @brief 二层交换应用的版本号定义 */
-#define CTL_RW_VERSION "20180830"
-/** @brief MEM_RW应用的版本号定义 */
-#define MEM_RW_VERSION "20180911"
-/** @brief 硬件规则读写应用的版本号定义 */
-#define RULE_RW_VERSION "20180827"
-/** @brief 端口状态应用的版本号定义 */
-#define PORT_STATUS_VERSION "20180918"
-/** @brief UM模块DEBUG应用的版本号定义 */
-#define DEBUG_VERSION "20180827"
-/** @brief VERSION应用的版本号定义 */
-#define VERSION_VERSION "20181010"
-/** @brief UA_FWD应用的版本号定义 */
-#define UA_FWD_VERSION "20181018"
-#endif //__FAST_VERSION_H__
\ No newline at end of file
diff --git a/openflow/usr/include/fcntl.h b/openflow/usr/include/fcntl.h
deleted file mode 100644
index 67752a1..0000000
--- a/openflow/usr/include/fcntl.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 6.5 File Control Operations	<fcntl.h>
- */
-
-#ifndef	_FCNTL_H
-#define	_FCNTL_H	1
-
-#include <features.h>
-
-/* This must be early so <bits/fcntl.h> can define types winningly.  */
-__BEGIN_DECLS
-
-/* Get __mode_t, __dev_t and __off_t  .*/
-#include <bits/types.h>
-
-/* Get the definitions of O_*, F_*, FD_*: all the
-   numbers and flag bits for `open', `fcntl', et al.  */
-#include <bits/fcntl.h>
-
-/* Detect if open needs mode as a third argument (or for openat as a fourth
-   argument).  */
-#ifdef __O_TMPFILE
-# define __OPEN_NEEDS_MODE(oflag) \
-  (((oflag) & O_CREAT) != 0 || ((oflag) & __O_TMPFILE) == __O_TMPFILE)
-#else
-# define __OPEN_NEEDS_MODE(oflag) (((oflag) & O_CREAT) != 0)
-#endif
-
-/* POSIX.1-2001 specifies that these types are defined by <fcntl.h>.
-   Earlier POSIX standards permitted any type ending in `_t' to be defined
-   by any POSIX header, so we don't conditionalize the definitions here.  */
-#ifndef __mode_t_defined
-typedef __mode_t mode_t;
-# define __mode_t_defined
-#endif
-
-#ifndef __off_t_defined
-# ifndef __USE_FILE_OFFSET64
-typedef __off_t off_t;
-# else
-typedef __off64_t off_t;
-# endif
-# define __off_t_defined
-#endif
-
-#if defined __USE_LARGEFILE64 && !defined __off64_t_defined
-typedef __off64_t off64_t;
-# define __off64_t_defined
-#endif
-
-#ifndef __pid_t_defined
-typedef __pid_t pid_t;
-# define __pid_t_defined
-#endif
-
-/* For XPG all symbols from <sys/stat.h> should also be available.  */
-#if defined __USE_XOPEN || defined __USE_XOPEN2K8
-# define __need_timespec
-# include <time.h>
-# include <bits/stat.h>
-
-# define S_IFMT		__S_IFMT
-# define S_IFDIR	__S_IFDIR
-# define S_IFCHR	__S_IFCHR
-# define S_IFBLK	__S_IFBLK
-# define S_IFREG	__S_IFREG
-# ifdef __S_IFIFO
-#  define S_IFIFO	__S_IFIFO
-# endif
-# ifdef __S_IFLNK
-#  define S_IFLNK	__S_IFLNK
-# endif
-# if (defined __USE_UNIX98 || defined __USE_XOPEN2K8) && defined __S_IFSOCK
-#  define S_IFSOCK	__S_IFSOCK
-# endif
-
-/* Protection bits.  */
-
-# define S_ISUID	__S_ISUID       /* Set user ID on execution.  */
-# define S_ISGID	__S_ISGID       /* Set group ID on execution.  */
-
-# if defined __USE_MISC || defined __USE_XOPEN
-/* Save swapped text after use (sticky bit).  This is pretty well obsolete.  */
-#  define S_ISVTX	__S_ISVTX
-# endif
-
-# define S_IRUSR	__S_IREAD       /* Read by owner.  */
-# define S_IWUSR	__S_IWRITE      /* Write by owner.  */
-# define S_IXUSR	__S_IEXEC       /* Execute by owner.  */
-/* Read, write, and execute by owner.  */
-# define S_IRWXU	(__S_IREAD|__S_IWRITE|__S_IEXEC)
-
-# define S_IRGRP	(S_IRUSR >> 3)  /* Read by group.  */
-# define S_IWGRP	(S_IWUSR >> 3)  /* Write by group.  */
-# define S_IXGRP	(S_IXUSR >> 3)  /* Execute by group.  */
-/* Read, write, and execute by group.  */
-# define S_IRWXG	(S_IRWXU >> 3)
-
-# define S_IROTH	(S_IRGRP >> 3)  /* Read by others.  */
-# define S_IWOTH	(S_IWGRP >> 3)  /* Write by others.  */
-# define S_IXOTH	(S_IXGRP >> 3)  /* Execute by others.  */
-/* Read, write, and execute by others.  */
-# define S_IRWXO	(S_IRWXG >> 3)
-#endif
-
-#ifdef	__USE_MISC
-# ifndef R_OK			/* Verbatim from <unistd.h>.  Ugh.  */
-/* Values for the second argument to access.
-   These may be OR'd together.  */
-#  define R_OK	4		/* Test for read permission.  */
-#  define W_OK	2		/* Test for write permission.  */
-#  define X_OK	1		/* Test for execute permission.  */
-#  define F_OK	0		/* Test for existence.  */
-# endif
-#endif /* Use misc.  */
-
-/* XPG wants the following symbols.   <stdio.h> has the same definitions.  */
-#if defined __USE_XOPEN || defined __USE_XOPEN2K8
-# define SEEK_SET	0	/* Seek from beginning of file.  */
-# define SEEK_CUR	1	/* Seek from current position.  */
-# define SEEK_END	2	/* Seek from end of file.  */
-#endif	/* XPG */
-
-/* Do the file control operation described by CMD on FD.
-   The remaining arguments are interpreted depending on CMD.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int fcntl (int __fd, int __cmd, ...);
-
-/* Open FILE and return a new file descriptor for it, or -1 on error.
-   OFLAG determines the type of access used.  If O_CREAT or O_TMPFILE is set
-   in OFLAG, the third argument is taken as a `mode_t', the mode of the
-   created file.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-#ifndef __USE_FILE_OFFSET64
-extern int open (const char *__file, int __oflag, ...) __nonnull ((1));
-#else
-# ifdef __REDIRECT
-extern int __REDIRECT (open, (const char *__file, int __oflag, ...), open64)
-     __nonnull ((1));
-# else
-#  define open open64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int open64 (const char *__file, int __oflag, ...) __nonnull ((1));
-#endif
-
-#ifdef __USE_ATFILE
-/* Similar to `open' but a relative path name is interpreted relative to
-   the directory for which FD is a descriptor.
-
-   NOTE: some other `openat' implementation support additional functionality
-   through this interface, especially using the O_XATTR flag.  This is not
-   yet supported here.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-# ifndef __USE_FILE_OFFSET64
-extern int openat (int __fd, const char *__file, int __oflag, ...)
-     __nonnull ((2));
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (openat, (int __fd, const char *__file, int __oflag,
-				...), openat64) __nonnull ((2));
-#  else
-#   define openat openat64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int openat64 (int __fd, const char *__file, int __oflag, ...)
-     __nonnull ((2));
-# endif
-#endif
-
-/* Create and open FILE, with mode MODE.  This takes an `int' MODE
-   argument because that is what `mode_t' will be widened to.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-#ifndef __USE_FILE_OFFSET64
-extern int creat (const char *__file, mode_t __mode) __nonnull ((1));
-#else
-# ifdef __REDIRECT
-extern int __REDIRECT (creat, (const char *__file, mode_t __mode),
-		       creat64) __nonnull ((1));
-# else
-#  define creat creat64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int creat64 (const char *__file, mode_t __mode) __nonnull ((1));
-#endif
-
-#if !defined F_LOCK && (defined __USE_MISC || (defined __USE_XOPEN_EXTENDED \
-					       && !defined __USE_POSIX))
-/* NOTE: These declarations also appear in <unistd.h>; be sure to keep both
-   files consistent.  Some systems have them there and some here, and some
-   software depends on the macros being defined without including both.  */
-
-/* `lockf' is a simpler interface to the locking facilities of `fcntl'.
-   LEN is always relative to the current file position.
-   The CMD argument is one of the following.  */
-
-# define F_ULOCK 0	/* Unlock a previously locked region.  */
-# define F_LOCK  1	/* Lock a region for exclusive use.  */
-# define F_TLOCK 2	/* Test and lock a region for exclusive use.  */
-# define F_TEST  3	/* Test a region for other processes locks.  */
-
-# ifndef __USE_FILE_OFFSET64
-extern int lockf (int __fd, int __cmd, off_t __len);
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (lockf, (int __fd, int __cmd, __off64_t __len), lockf64);
-#  else
-#   define lockf lockf64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int lockf64 (int __fd, int __cmd, off64_t __len);
-# endif
-#endif
-
-#ifdef __USE_XOPEN2K
-/* Advice the system about the expected behaviour of the application with
-   respect to the file associated with FD.  */
-# ifndef __USE_FILE_OFFSET64
-extern int posix_fadvise (int __fd, off_t __offset, off_t __len,
-			  int __advise) __THROW;
-# else
- # ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (posix_fadvise, (int __fd, __off64_t __offset,
-					   __off64_t __len, int __advise),
-			   posix_fadvise64);
-#  else
-#   define posix_fadvise posix_fadvise64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int posix_fadvise64 (int __fd, off64_t __offset, off64_t __len,
-			    int __advise) __THROW;
-# endif
-
-
-/* Reserve storage for the data of the file associated with FD.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-# ifndef __USE_FILE_OFFSET64
-extern int posix_fallocate (int __fd, off_t __offset, off_t __len);
-# else
- # ifdef __REDIRECT
-extern int __REDIRECT (posix_fallocate, (int __fd, __off64_t __offset,
-					 __off64_t __len),
-		       posix_fallocate64);
-#  else
-#   define posix_fallocate posix_fallocate64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int posix_fallocate64 (int __fd, off64_t __offset, off64_t __len);
-# endif
-#endif
-
-
-/* Define some inlines helping to catch common problems.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function \
-    && defined __va_arg_pack_len
-# include <bits/fcntl2.h>
-#endif
-
-__END_DECLS
-
-#endif /* fcntl.h  */
diff --git a/openflow/usr/include/features.h b/openflow/usr/include/features.h
deleted file mode 100644
index 1afe20c..0000000
--- a/openflow/usr/include/features.h
+++ /dev/null
@@ -1,394 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_FEATURES_H
-#define	_FEATURES_H	1
-
-/* These are defined by the user (or the compiler)
-   to specify the desired environment:
-
-   __STRICT_ANSI__	ISO Standard C.
-   _ISOC99_SOURCE	Extensions to ISO C89 from ISO C99.
-   _ISOC11_SOURCE	Extensions to ISO C99 from ISO C11.
-   _POSIX_SOURCE	IEEE Std 1003.1.
-   _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
-			if >=199309L, add IEEE Std 1003.1b-1993;
-			if >=199506L, add IEEE Std 1003.1c-1995;
-			if >=200112L, all of IEEE 1003.1-2004
-			if >=200809L, all of IEEE 1003.1-2008
-   _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
-			Single Unix conformance is wanted, to 600 for the
-			sixth revision, to 700 for the seventh revision.
-   _XOPEN_SOURCE_EXTENDED XPG things and X/Open Unix extensions.
-   _LARGEFILE_SOURCE	Some more functions for correct standard I/O.
-   _LARGEFILE64_SOURCE	Additional functionality from LFS for large files.
-   _FILE_OFFSET_BITS=N	Select default filesystem interface.
-   _ATFILE_SOURCE	Additional *at interfaces.
-   _GNU_SOURCE		All of the above, plus GNU extensions.
-   _DEFAULT_SOURCE	The default set of features (taking precedence over
-			__STRICT_ANSI__).
-   _REENTRANT		Select additionally reentrant object.
-   _THREAD_SAFE		Same as _REENTRANT, often used by other systems.
-   _FORTIFY_SOURCE	If set to numeric value > 0 additional security
-			measures are defined, according to level.
-
-   The `-ansi' switch to the GNU C compiler, and standards conformance
-   options such as `-std=c99', define __STRICT_ANSI__.  If none of
-   these are defined, or if _DEFAULT_SOURCE is defined, the default is
-   to have _POSIX_SOURCE set to one and _POSIX_C_SOURCE set to
-   200809L, as well as enabling miscellaneous functions from BSD and
-   SVID.  If more than one of these are defined, they accumulate.  For
-   example __STRICT_ANSI__, _POSIX_SOURCE and _POSIX_C_SOURCE together
-   give you ISO C, 1003.1, and 1003.2, but nothing else.
-
-   These are defined by this file and are used by the
-   header files to decide what to declare or define:
-
-   __USE_ISOC11		Define ISO C11 things.
-   __USE_ISOC99		Define ISO C99 things.
-   __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
-   __USE_POSIX		Define IEEE Std 1003.1 things.
-   __USE_POSIX2		Define IEEE Std 1003.2 things.
-   __USE_POSIX199309	Define IEEE Std 1003.1, and .1b things.
-   __USE_POSIX199506	Define IEEE Std 1003.1, .1b, .1c and .1i things.
-   __USE_XOPEN		Define XPG things.
-   __USE_XOPEN_EXTENDED	Define X/Open Unix things.
-   __USE_UNIX98		Define Single Unix V2 things.
-   __USE_XOPEN2K        Define XPG6 things.
-   __USE_XOPEN2KXSI     Define XPG6 XSI things.
-   __USE_XOPEN2K8       Define XPG7 things.
-   __USE_XOPEN2K8XSI    Define XPG7 XSI things.
-   __USE_LARGEFILE	Define correct standard I/O things.
-   __USE_LARGEFILE64	Define LFS things with separate names.
-   __USE_FILE_OFFSET64	Define 64bit interface as default.
-   __USE_MISC		Define things from 4.3BSD or System V Unix.
-   __USE_ATFILE		Define *at interfaces and AT_* constants for them.
-   __USE_GNU		Define GNU extensions.
-   __USE_REENTRANT	Define reentrant/thread-safe *_r functions.
-   __USE_FORTIFY_LEVEL	Additional security measures used, according to level.
-
-   The macros `__GNU_LIBRARY__', `__GLIBC__', and `__GLIBC_MINOR__' are
-   defined by this file unconditionally.  `__GNU_LIBRARY__' is provided
-   only for compatibility.  All new code should use the other symbols
-   to test for features.
-
-   All macros listed above as possibly being defined by this file are
-   explicitly undefined if they are not explicitly defined.
-   Feature-test macros that are not defined by the user or compiler
-   but are implied by the other feature-test macros defined (or by the
-   lack of any definitions) are defined by the file.  */
-
-
-/* Undefine everything, so we get a clean slate.  */
-#undef	__USE_ISOC11
-#undef	__USE_ISOC99
-#undef	__USE_ISOC95
-#undef	__USE_ISOCXX11
-#undef	__USE_POSIX
-#undef	__USE_POSIX2
-#undef	__USE_POSIX199309
-#undef	__USE_POSIX199506
-#undef	__USE_XOPEN
-#undef	__USE_XOPEN_EXTENDED
-#undef	__USE_UNIX98
-#undef	__USE_XOPEN2K
-#undef	__USE_XOPEN2KXSI
-#undef	__USE_XOPEN2K8
-#undef	__USE_XOPEN2K8XSI
-#undef	__USE_LARGEFILE
-#undef	__USE_LARGEFILE64
-#undef	__USE_FILE_OFFSET64
-#undef	__USE_MISC
-#undef	__USE_ATFILE
-#undef	__USE_GNU
-#undef	__USE_REENTRANT
-#undef	__USE_FORTIFY_LEVEL
-#undef	__KERNEL_STRICT_NAMES
-
-/* Suppress kernel-name space pollution unless user expressedly asks
-   for it.  */
-#ifndef _LOOSE_KERNEL_NAMES
-# define __KERNEL_STRICT_NAMES
-#endif
-
-/* Convenience macros to test the versions of glibc and gcc.
-   Use them like this:
-   #if __GNUC_PREREQ (2,8)
-   ... code requiring gcc 2.8 or later ...
-   #endif
-   Note - they won't work for gcc1 or glibc1, since the _MINOR macros
-   were not defined then.  */
-#if defined __GNUC__ && defined __GNUC_MINOR__
-# define __GNUC_PREREQ(maj, min) \
-	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#else
-# define __GNUC_PREREQ(maj, min) 0
-#endif
-
-/* _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for
-   _DEFAULT_SOURCE.  If _DEFAULT_SOURCE is present we do not
-   issue a warning; the expectation is that the source is being
-   transitioned to use the new macro.  */
-#if (defined _BSD_SOURCE || defined _SVID_SOURCE) \
-    && !defined _DEFAULT_SOURCE
-/* Don't #warn about _BSD_SOURCE || _SVID_SOURCE, as it breaks -Werror
-   and we don't have time to check/fix everything before vivid release
-# warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-*/
-# undef  _DEFAULT_SOURCE
-# define _DEFAULT_SOURCE	1
-#endif
-
-/* If _GNU_SOURCE was defined by the user, turn on all the other features.  */
-#ifdef _GNU_SOURCE
-# undef  _ISOC95_SOURCE
-# define _ISOC95_SOURCE	1
-# undef  _ISOC99_SOURCE
-# define _ISOC99_SOURCE	1
-# undef  _ISOC11_SOURCE
-# define _ISOC11_SOURCE	1
-# undef  _POSIX_SOURCE
-# define _POSIX_SOURCE	1
-# undef  _POSIX_C_SOURCE
-# define _POSIX_C_SOURCE	200809L
-# undef  _XOPEN_SOURCE
-# define _XOPEN_SOURCE	700
-# undef  _XOPEN_SOURCE_EXTENDED
-# define _XOPEN_SOURCE_EXTENDED	1
-# undef	 _LARGEFILE64_SOURCE
-# define _LARGEFILE64_SOURCE	1
-# undef  _DEFAULT_SOURCE
-# define _DEFAULT_SOURCE	1
-# undef  _ATFILE_SOURCE
-# define _ATFILE_SOURCE	1
-#endif
-
-/* If nothing (other than _GNU_SOURCE and _DEFAULT_SOURCE) is defined,
-   define _DEFAULT_SOURCE.  */
-#if (defined _DEFAULT_SOURCE					\
-     || (!defined __STRICT_ANSI__				\
-	 && !defined _ISOC99_SOURCE				\
-	 && !defined _POSIX_SOURCE && !defined _POSIX_C_SOURCE	\
-	 && !defined _XOPEN_SOURCE))
-# undef  _DEFAULT_SOURCE
-# define _DEFAULT_SOURCE	1
-#endif
-
-/* This is to enable the ISO C11 extension.  */
-#if (defined _ISOC11_SOURCE \
-     || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L))
-# define __USE_ISOC11	1
-#endif
-
-/* This is to enable the ISO C99 extension.  */
-#if (defined _ISOC99_SOURCE || defined _ISOC11_SOURCE \
-     || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
-# define __USE_ISOC99	1
-#endif
-
-/* This is to enable the ISO C90 Amendment 1:1995 extension.  */
-#if (defined _ISOC99_SOURCE || defined _ISOC11_SOURCE \
-     || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199409L))
-# define __USE_ISOC95	1
-#endif
-
-/* This is to enable compatibility for ISO C++11.
-
-   So far g++ does not provide a macro.  Check the temporary macro for
-   now, too.  */
-#if ((defined __cplusplus && __cplusplus >= 201103L)			      \
-     || defined __GXX_EXPERIMENTAL_CXX0X__)
-# define __USE_ISOCXX11	1
-#endif
-
-/* If none of the ANSI/POSIX macros are defined, or if _DEFAULT_SOURCE
-   is defined, use POSIX.1-2008 (or another version depending on
-   _XOPEN_SOURCE).  */
-#ifdef _DEFAULT_SOURCE
-# if !defined _POSIX_SOURCE && !defined _POSIX_C_SOURCE
-#  define __USE_POSIX_IMPLICITLY	1
-# endif
-# undef  _POSIX_SOURCE
-# define _POSIX_SOURCE	1
-# undef  _POSIX_C_SOURCE
-# define _POSIX_C_SOURCE	200809L
-#endif
-#if ((!defined __STRICT_ANSI__					\
-      || (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500))	\
-     && !defined _POSIX_SOURCE && !defined _POSIX_C_SOURCE)
-# define _POSIX_SOURCE	1
-# if defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 500
-#  define _POSIX_C_SOURCE	2
-# elif defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 600
-#  define _POSIX_C_SOURCE	199506L
-# elif defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 700
-#  define _POSIX_C_SOURCE	200112L
-# else
-#  define _POSIX_C_SOURCE	200809L
-# endif
-# define __USE_POSIX_IMPLICITLY	1
-#endif
-
-#if (defined _POSIX_SOURCE					\
-     || (defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 1)	\
-     || defined _XOPEN_SOURCE)
-# define __USE_POSIX	1
-#endif
-
-#if defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 2 || defined _XOPEN_SOURCE
-# define __USE_POSIX2	1
-#endif
-
-#if defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE - 0) >= 199309L
-# define __USE_POSIX199309	1
-#endif
-
-#if defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE - 0) >= 199506L
-# define __USE_POSIX199506	1
-#endif
-
-#if defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE - 0) >= 200112L
-# define __USE_XOPEN2K		1
-# undef __USE_ISOC95
-# define __USE_ISOC95		1
-# undef __USE_ISOC99
-# define __USE_ISOC99		1
-#endif
-
-#if defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE - 0) >= 200809L
-# define __USE_XOPEN2K8		1
-# undef  _ATFILE_SOURCE
-# define _ATFILE_SOURCE	1
-#endif
-
-#ifdef	_XOPEN_SOURCE
-# define __USE_XOPEN	1
-# if (_XOPEN_SOURCE - 0) >= 500
-#  define __USE_XOPEN_EXTENDED	1
-#  define __USE_UNIX98	1
-#  undef _LARGEFILE_SOURCE
-#  define _LARGEFILE_SOURCE	1
-#  if (_XOPEN_SOURCE - 0) >= 600
-#   if (_XOPEN_SOURCE - 0) >= 700
-#    define __USE_XOPEN2K8	1
-#    define __USE_XOPEN2K8XSI	1
-#   endif
-#   define __USE_XOPEN2K	1
-#   define __USE_XOPEN2KXSI	1
-#   undef __USE_ISOC95
-#   define __USE_ISOC95		1
-#   undef __USE_ISOC99
-#   define __USE_ISOC99		1
-#  endif
-# else
-#  ifdef _XOPEN_SOURCE_EXTENDED
-#   define __USE_XOPEN_EXTENDED	1
-#  endif
-# endif
-#endif
-
-#ifdef _LARGEFILE_SOURCE
-# define __USE_LARGEFILE	1
-#endif
-
-#ifdef _LARGEFILE64_SOURCE
-# define __USE_LARGEFILE64	1
-#endif
-
-#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64
-# define __USE_FILE_OFFSET64	1
-#endif
-
-#if defined _DEFAULT_SOURCE
-# define __USE_MISC	1
-#endif
-
-#ifdef	_ATFILE_SOURCE
-# define __USE_ATFILE	1
-#endif
-
-#ifdef	_GNU_SOURCE
-# define __USE_GNU	1
-#endif
-
-#if defined _REENTRANT || defined _THREAD_SAFE
-# define __USE_REENTRANT	1
-#endif
-
-#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
-    && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
-# if _FORTIFY_SOURCE > 1
-#  define __USE_FORTIFY_LEVEL 2
-# else
-#  define __USE_FORTIFY_LEVEL 1
-# endif
-#else
-# define __USE_FORTIFY_LEVEL 0
-#endif
-
-/* Get definitions of __STDC_* predefined macros, if the compiler has
-   not preincluded this header automatically.  */
-#include <stdc-predef.h>
-
-/* This macro indicates that the installed library is the GNU C Library.
-   For historic reasons the value now is 6 and this will stay from now
-   on.  The use of this variable is deprecated.  Use __GLIBC__ and
-   __GLIBC_MINOR__ now (see below) when you want to test for a specific
-   GNU C library version and use the values in <gnu/lib-names.h> to get
-   the sonames of the shared libraries.  */
-#undef  __GNU_LIBRARY__
-#define __GNU_LIBRARY__ 6
-
-/* Major and minor version number of the GNU C library package.  Use
-   these macros to test for features in specific releases.  */
-#define	__GLIBC__	2
-#define	__GLIBC_MINOR__	23
-
-#define __GLIBC_PREREQ(maj, min) \
-	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
-
-/* This is here only because every header file already includes this one.  */
-#ifndef __ASSEMBLER__
-# ifndef _SYS_CDEFS_H
-#  include <sys/cdefs.h>
-# endif
-
-/* If we don't have __REDIRECT, prototypes will be missing if
-   __USE_FILE_OFFSET64 but not __USE_LARGEFILE[64]. */
-# if defined __USE_FILE_OFFSET64 && !defined __REDIRECT
-#  define __USE_LARGEFILE	1
-#  define __USE_LARGEFILE64	1
-# endif
-
-#endif	/* !ASSEMBLER */
-
-/* Decide whether we can define 'extern inline' functions in headers.  */
-#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \
-    && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__ \
-    && defined __extern_inline
-# define __USE_EXTERN_INLINES	1
-#endif
-
-
-/* This is here only because every header file already includes this one.
-   Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
-   <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
-   that will always return failure (and set errno to ENOSYS).  */
-#include <gnu/stubs.h>
-
-
-#endif	/* features.h  */
diff --git a/openflow/usr/include/fenv.h b/openflow/usr/include/fenv.h
deleted file mode 100644
index 9a1e112..0000000
--- a/openflow/usr/include/fenv.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * ISO C99 7.6: Floating-point environment	<fenv.h>
- */
-
-#ifndef _FENV_H
-#define _FENV_H	1
-
-#include <features.h>
-
-/* Get the architecture dependend definitions.  The following definitions
-   are expected to be done:
-
-   fenv_t	type for object representing an entire floating-point
-		environment
-
-   FE_DFL_ENV	macro of type pointer to fenv_t to be used as the argument
-		to functions taking an argument of type fenv_t; in this
-		case the default environment will be used
-
-   fexcept_t	type for object representing the floating-point exception
-		flags including status associated with the flags
-
-   The following macros are defined iff the implementation supports this
-   kind of exception.
-   FE_INEXACT		inexact result
-   FE_DIVBYZERO		division by zero
-   FE_UNDERFLOW		result not representable due to underflow
-   FE_OVERFLOW		result not representable due to overflow
-   FE_INVALID		invalid operation
-
-   FE_ALL_EXCEPT	bitwise OR of all supported exceptions
-
-   The next macros are defined iff the appropriate rounding mode is
-   supported by the implementation.
-   FE_TONEAREST		round to nearest
-   FE_UPWARD		round toward +Inf
-   FE_DOWNWARD		round toward -Inf
-   FE_TOWARDZERO	round toward 0
-*/
-#include <bits/fenv.h>
-
-__BEGIN_DECLS
-
-/* Floating-point exception handling.  */
-
-/* Clear the supported exceptions represented by EXCEPTS.  */
-extern int feclearexcept (int __excepts) __THROW;
-
-/* Store implementation-defined representation of the exception flags
-   indicated by EXCEPTS in the object pointed to by FLAGP.  */
-extern int fegetexceptflag (fexcept_t *__flagp, int __excepts) __THROW;
-
-/* Raise the supported exceptions represented by EXCEPTS.  */
-extern int feraiseexcept (int __excepts) __THROW;
-
-/* Set complete status for exceptions indicated by EXCEPTS according to
-   the representation in the object pointed to by FLAGP.  */
-extern int fesetexceptflag (const fexcept_t *__flagp, int __excepts) __THROW;
-
-/* Determine which of subset of the exceptions specified by EXCEPTS are
-   currently set.  */
-extern int fetestexcept (int __excepts) __THROW;
-
-
-/* Rounding control.  */
-
-/* Get current rounding direction.  */
-extern int fegetround (void) __THROW __attribute_pure__;
-
-/* Establish the rounding direction represented by ROUND.  */
-extern int fesetround (int __rounding_direction) __THROW;
-
-
-/* Floating-point environment.  */
-
-/* Store the current floating-point environment in the object pointed
-   to by ENVP.  */
-extern int fegetenv (fenv_t *__envp) __THROW;
-
-/* Save the current environment in the object pointed to by ENVP, clear
-   exception flags and install a non-stop mode (if available) for all
-   exceptions.  */
-extern int feholdexcept (fenv_t *__envp) __THROW;
-
-/* Establish the floating-point environment represented by the object
-   pointed to by ENVP.  */
-extern int fesetenv (const fenv_t *__envp) __THROW;
-
-/* Save current exceptions in temporary storage, install environment
-   represented by object pointed to by ENVP and raise exceptions
-   according to saved exceptions.  */
-extern int feupdateenv (const fenv_t *__envp) __THROW;
-
-
-/* Include optimization.  */
-#ifdef __OPTIMIZE__
-# include <bits/fenvinline.h>
-#endif
-
-#ifdef __USE_GNU
-
-/* Enable individual exceptions.  Will not enable more exceptions than
-   EXCEPTS specifies.  Returns the previous enabled exceptions if all
-   exceptions are successfully set, otherwise returns -1.  */
-extern int feenableexcept (int __excepts) __THROW;
-
-/* Disable individual exceptions.  Will not disable more exceptions than
-   EXCEPTS specifies.  Returns the previous enabled exceptions if all
-   exceptions are successfully disabled, otherwise returns -1.  */
-extern int fedisableexcept (int __excepts) __THROW;
-
-/* Return enabled exceptions.  */
-extern int fegetexcept (void) __THROW;
-#endif
-
-__END_DECLS
-
-#endif /* fenv.h */
diff --git a/openflow/usr/include/fmtmsg.h b/openflow/usr/include/fmtmsg.h
deleted file mode 100644
index 8b42d10..0000000
--- a/openflow/usr/include/fmtmsg.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Message display handling.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __FMTMSG_H
-#define __FMTMSG_H	1
-
-#include <features.h>
-
-
-__BEGIN_DECLS
-
-/* Values to control `fmtmsg' function.  */
-enum
-{
-  MM_HARD = 0x001,	/* Source of the condition is hardware.  */
-#define MM_HARD MM_HARD
-  MM_SOFT = 0x002,	/* Source of the condition is software.  */
-#define MM_SOFT MM_SOFT
-  MM_FIRM = 0x004,	/* Source of the condition is firmware.  */
-#define MM_FIRM MM_FIRM
-  MM_APPL = 0x008,	/* Condition detected by application.  */
-#define MM_APPL MM_APPL
-  MM_UTIL = 0x010,	/* Condition detected by utility.  */
-#define MM_UTIL MM_UTIL
-  MM_OPSYS = 0x020,	/* Condition detected by operating system.  */
-#define MM_OPSYS MM_OPSYS
-  MM_RECOVER = 0x040,	/* Recoverable error.  */
-#define MM_RECOVER MM_RECOVER
-  MM_NRECOV = 0x080,	/* Non-recoverable error.  */
-#define MM_NRECOV MM_NRECOV
-  MM_PRINT = 0x100,	/* Display message in standard error.  */
-#define MM_PRINT MM_PRINT
-  MM_CONSOLE = 0x200	/* Display message on system console.  */
-#define MM_CONSOLE MM_CONSOLE
-};
-
-/* Values to be for SEVERITY parameter of `fmtmsg'.  */
-enum
-{
-  MM_NOSEV = 0,		/* No severity level provided for the message.  */
-#define MM_NOSEV MM_NOSEV
-  MM_HALT,		/* Error causing application to halt.  */
-#define MM_HALT MM_HALT
-  MM_ERROR,		/* Application has encountered a non-fatal fault.  */
-#define MM_ERROR MM_ERROR
-  MM_WARNING,		/* Application has detected unusual non-error
-			   condition.  */
-#define MM_WARNING MM_WARNING
-  MM_INFO		/* Informative message.  */
-#define MM_INFO MM_INFO
-};
-
-
-/* Macros which can be used as null values for the arguments of `fmtmsg'.  */
-#define MM_NULLLBL	((char *) 0)
-#define MM_NULLSEV	0
-#define MM_NULLMC	((long int) 0)
-#define MM_NULLTXT	((char *) 0)
-#define MM_NULLACT	((char *) 0)
-#define MM_NULLTAG	((char *) 0)
-
-
-/* Possible return values of `fmtmsg'.  */
-enum
-{
-  MM_NOTOK = -1,
-#define MM_NOTOK MM_NOTOK
-  MM_OK = 0,
-#define MM_OK MM_OK
-  MM_NOMSG = 1,
-#define MM_NOMSG MM_NOMSG
-  MM_NOCON = 4
-#define MM_NOCON MM_NOCON
-};
-
-
-/* Print message with given CLASSIFICATION, LABEL, SEVERITY, TEXT, ACTION
-   and TAG to console or standard error.  */
-extern int fmtmsg (long int __classification, const char *__label,
-		   int __severity, const char *__text,
-		   const char *__action, const char *__tag);
-
-#ifdef __USE_MISC
-/* Add or remove severity level.  */
-extern int addseverity (int __severity, const char *__string) __THROW;
-#endif
-
-__END_DECLS
-
-#endif /* fmtmsg.h */
diff --git a/openflow/usr/include/fnmatch.h b/openflow/usr/include/fnmatch.h
deleted file mode 100644
index fdfaf90..0000000
--- a/openflow/usr/include/fnmatch.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_FNMATCH_H
-#define	_FNMATCH_H	1
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* We #undef these before defining them because some losing systems
-   (HP-UX A.08.07 for example) define these in <unistd.h>.  */
-#undef	FNM_PATHNAME
-#undef	FNM_NOESCAPE
-#undef	FNM_PERIOD
-
-/* Bits set in the FLAGS argument to `fnmatch'.  */
-#define	FNM_PATHNAME	(1 << 0) /* No wildcard can ever match `/'.  */
-#define	FNM_NOESCAPE	(1 << 1) /* Backslashes don't quote special chars.  */
-#define	FNM_PERIOD	(1 << 2) /* Leading `.' is matched only explicitly.  */
-
-#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _GNU_SOURCE
-# define FNM_FILE_NAME	 FNM_PATHNAME	/* Preferred GNU name.  */
-# define FNM_LEADING_DIR (1 << 3)	/* Ignore `/...' after a match.  */
-# define FNM_CASEFOLD	 (1 << 4)	/* Compare without regard to case.  */
-# define FNM_EXTMATCH	 (1 << 5)	/* Use ksh-like extended matching. */
-#endif
-
-/* Value returned by `fnmatch' if STRING does not match PATTERN.  */
-#define	FNM_NOMATCH	1
-
-/* This value is returned if the implementation does not support
-   `fnmatch'.  Since this is not the case here it will never be
-   returned but the conformance test suites still require the symbol
-   to be defined.  */
-#ifdef _XOPEN_SOURCE
-# define FNM_NOSYS	(-1)
-#endif
-
-/* Match NAME against the filename pattern PATTERN,
-   returning zero if it matches, FNM_NOMATCH if not.  */
-extern int fnmatch (const char *__pattern, const char *__name, int __flags);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* fnmatch.h */
diff --git a/openflow/usr/include/form.h b/openflow/usr/include/form.h
deleted file mode 100644
index 05a7861..0000000
--- a/openflow/usr/include/form.h
+++ /dev/null
@@ -1,429 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author:  Juergen Pfeifer, 1995,1997                                    *
- ****************************************************************************/
-
-/* $Id: form.h,v 0.25 2015/11/28 20:13:39 Leon.Winter Exp $ */
-
-#ifndef FORM_H
-#define FORM_H
-/* *INDENT-OFF*/
-
-#include <curses.h>
-#include <eti.h>
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
-#ifndef FORM_PRIV_H
-typedef void *FIELD_CELL;
-#endif
-
-#ifndef NCURSES_FIELD_INTERNALS
-#define NCURSES_FIELD_INTERNALS /* nothing */
-#endif
-
-typedef int Form_Options;
-typedef int Field_Options;
-
-	/**********
-	*  _PAGE  *
-	**********/
-
-typedef struct {
-  short pmin;		/* index of first field on page			*/
-  short pmax;		/* index of last field on page			*/
-  short smin;		/* index of top leftmost field on page		*/
-  short smax;		/* index of bottom rightmost field on page	*/
-} _PAGE;
-
-	/**********
-	*  FIELD  *
-	**********/
-
-typedef struct fieldnode {
-  unsigned short	status;		/* flags			*/
-  short			rows;		/* size in rows			*/
-  short			cols;		/* size in cols			*/
-  short			frow;		/* first row			*/
-  short			fcol;		/* first col			*/
-  int			drows;		/* dynamic rows			*/
-  int			dcols;		/* dynamic cols			*/
-  int			maxgrow;	/* maximum field growth		*/
-  int			nrow;		/* off-screen rows		*/
-  short			nbuf;		/* additional buffers		*/
-  short			just;		/* justification		*/
-  short			page;		/* page on form			*/
-  short			index;		/* into form -> field		*/
-  int			pad;		/* pad character		*/
-  chtype		fore;		/* foreground attribute		*/
-  chtype		back;		/* background attribute		*/
-  Field_Options		opts;		/* options			*/
-  struct fieldnode *	snext;		/* sorted order pointer		*/
-  struct fieldnode *	sprev;		/* sorted order pointer		*/
-  struct fieldnode *	link;		/* linked field chain		*/
-  struct formnode *	form;		/* containing form		*/
-  struct typenode *	type;		/* field type			*/
-  void *		arg;		/* argument for type		*/
-  FIELD_CELL *		buf;		/* field buffers		*/
-  void *		usrptr;		/* user pointer			*/
-  /*
-   * The wide-character configuration requires extra information.  Because
-   * there are existing applications that manipulate the members of FIELD
-   * directly, we cannot make the struct opaque.  Offsets of members up to
-   * this point are the same in the narrow- and wide-character configuration.
-   * But note that the type of buf depends on the configuration, and is made
-   * opaque for that reason.
-   */
-  NCURSES_FIELD_INTERNALS
-} FIELD;
-
-
-	/*********
-	*  FORM  *
-	*********/
-
-typedef struct formnode {
-  unsigned short	status;	  	/* flags			*/
-  short			rows;		/* size in rows			*/
-  short			cols;		/* size in cols			*/
-  int			currow;		/* current row in field window	*/
-  int			curcol;		/* current col in field window	*/
-  int			toprow;		/* in scrollable field window	*/
-  int			begincol;	/* in horiz. scrollable field	*/
-  short			maxfield;	/* number of fields		*/
-  short			maxpage;	/* number of pages		*/
-  short			curpage;	/* index into page		*/
-  Form_Options		opts;		/* options			*/
-  WINDOW *		win;		/* window			*/
-  WINDOW *		sub;		/* subwindow			*/
-  WINDOW *		w;		/* window for current field	*/
-  FIELD **		field;		/* field [maxfield]		*/
-  FIELD *		current;	/* current field		*/
-  _PAGE *		page;		/* page [maxpage]		*/
-  void *		usrptr;		/* user pointer			*/
-
-  void			(*forminit)(struct formnode *);
-  void			(*formterm)(struct formnode *);
-  void			(*fieldinit)(struct formnode *);
-  void			(*fieldterm)(struct formnode *);
-
-} FORM;
-
-
-	/**************
-	*  FIELDTYPE  *
-	**************/
-
-typedef struct typenode {
-  unsigned short	status;			/* flags		    */
-  long			ref;			/* reference count	    */
-  struct typenode *	left;			/* ptr to operand for |     */
-  struct typenode *	right;			/* ptr to operand for |     */
-
-  void* (*makearg)(va_list *);			/* make fieldtype arg	    */
-  void* (*copyarg)(const void *);		/* copy fieldtype arg 	    */
-  void	(*freearg)(void *);			/* free fieldtype arg	    */
-
-#if NCURSES_INTEROP_FUNCS
-  union {
-    bool (*ofcheck)(FIELD *,const void *);	/* field validation	    */
-    bool (*gfcheck)(FORM*,FIELD *,const void*);	/* generic field validation */
-  } fieldcheck;
-  union {
-    bool (*occheck)(int,const void *);		/* character validation     */
-    bool (*gccheck)(int,FORM*,
-		    FIELD*,const void*);        /* generic char validation  */
-  } charcheck;
-  union {
-    bool (*onext)(FIELD *,const void *);        /* enumerate next value     */
-    bool (*gnext)(FORM*,FIELD*,const void*);    /* generic enumerate next   */
-  } enum_next;
-  union {
-    bool (*oprev)(FIELD *,const void *);	/* enumerate prev value     */
-    bool (*gprev)(FORM*,FIELD*,const void*);    /* generic enumerate prev   */
-  } enum_prev;
-  void* (*genericarg)(void*);                   /* Alternate Arg method     */
-#else
-  bool	(*fcheck)(FIELD *,const void *);	/* field validation	*/
-  bool	(*ccheck)(int,const void *);		/* character validation */
-
-  bool	(*next)(FIELD *,const void *);		/* enumerate next value */
-  bool	(*prev)(FIELD *,const void *);		/* enumerate prev value */
-#endif
-} FIELDTYPE;
-
-typedef void (*Form_Hook)(FORM *);
-
-	/***************************
-	*  miscellaneous #defines  *
-	***************************/
-
-/* field justification */
-#define NO_JUSTIFICATION	(0)
-#define JUSTIFY_LEFT		(1)
-#define JUSTIFY_CENTER		(2)
-#define JUSTIFY_RIGHT		(3)
-
-/* field options */
-#define O_VISIBLE		(0x0001U)
-#define O_ACTIVE		(0x0002U)
-#define O_PUBLIC		(0x0004U)
-#define O_EDIT			(0x0008U)
-#define O_WRAP			(0x0010U)
-#define O_BLANK			(0x0020U)
-#define O_AUTOSKIP		(0x0040U)
-#define O_NULLOK		(0x0080U)
-#define O_PASSOK		(0x0100U)
-#define O_STATIC		(0x0200U)
-#define O_DYNAMIC_JUSTIFY	(0x0400U)	/* ncurses extension	*/
-#define O_NO_LEFT_STRIP		(0x0800U)	/* ncurses extension	*/
-
-/* form options */
-#define O_NL_OVERLOAD		(0x0001U)
-#define O_BS_OVERLOAD		(0x0002U)
-
-/* form driver commands */
-#define REQ_NEXT_PAGE	 (KEY_MAX + 1)	/* move to next page		*/
-#define REQ_PREV_PAGE	 (KEY_MAX + 2)	/* move to previous page	*/
-#define REQ_FIRST_PAGE	 (KEY_MAX + 3)	/* move to first page		*/
-#define REQ_LAST_PAGE	 (KEY_MAX + 4)	/* move to last page		*/
-
-#define REQ_NEXT_FIELD	 (KEY_MAX + 5)	/* move to next field		*/
-#define REQ_PREV_FIELD	 (KEY_MAX + 6)	/* move to previous field	*/
-#define REQ_FIRST_FIELD	 (KEY_MAX + 7)	/* move to first field		*/
-#define REQ_LAST_FIELD	 (KEY_MAX + 8)	/* move to last field		*/
-#define REQ_SNEXT_FIELD	 (KEY_MAX + 9)	/* move to sorted next field	*/
-#define REQ_SPREV_FIELD	 (KEY_MAX + 10)	/* move to sorted prev field	*/
-#define REQ_SFIRST_FIELD (KEY_MAX + 11)	/* move to sorted first field	*/
-#define REQ_SLAST_FIELD	 (KEY_MAX + 12)	/* move to sorted last field	*/
-#define REQ_LEFT_FIELD	 (KEY_MAX + 13)	/* move to left to field	*/
-#define REQ_RIGHT_FIELD	 (KEY_MAX + 14)	/* move to right to field	*/
-#define REQ_UP_FIELD	 (KEY_MAX + 15)	/* move to up to field		*/
-#define REQ_DOWN_FIELD	 (KEY_MAX + 16)	/* move to down to field	*/
-
-#define REQ_NEXT_CHAR	 (KEY_MAX + 17)	/* move to next char in field	*/
-#define REQ_PREV_CHAR	 (KEY_MAX + 18)	/* move to prev char in field	*/
-#define REQ_NEXT_LINE	 (KEY_MAX + 19)	/* move to next line in field	*/
-#define REQ_PREV_LINE	 (KEY_MAX + 20)	/* move to prev line in field	*/
-#define REQ_NEXT_WORD	 (KEY_MAX + 21)	/* move to next word in field	*/
-#define REQ_PREV_WORD	 (KEY_MAX + 22)	/* move to prev word in field	*/
-#define REQ_BEG_FIELD	 (KEY_MAX + 23)	/* move to first char in field	*/
-#define REQ_END_FIELD	 (KEY_MAX + 24)	/* move after last char in fld	*/
-#define REQ_BEG_LINE	 (KEY_MAX + 25)	/* move to beginning of line	*/
-#define REQ_END_LINE	 (KEY_MAX + 26)	/* move after last char in line	*/
-#define REQ_LEFT_CHAR	 (KEY_MAX + 27)	/* move left in field		*/
-#define REQ_RIGHT_CHAR	 (KEY_MAX + 28)	/* move right in field		*/
-#define REQ_UP_CHAR	 (KEY_MAX + 29)	/* move up in field		*/
-#define REQ_DOWN_CHAR	 (KEY_MAX + 30)	/* move down in field		*/
-
-#define REQ_NEW_LINE	 (KEY_MAX + 31)	/* insert/overlay new line	*/
-#define REQ_INS_CHAR	 (KEY_MAX + 32)	/* insert blank char at cursor	*/
-#define REQ_INS_LINE	 (KEY_MAX + 33)	/* insert blank line at cursor	*/
-#define REQ_DEL_CHAR	 (KEY_MAX + 34)	/* delete char at cursor	*/
-#define REQ_DEL_PREV	 (KEY_MAX + 35)	/* delete char before cursor	*/
-#define REQ_DEL_LINE	 (KEY_MAX + 36)	/* delete line at cursor	*/
-#define REQ_DEL_WORD	 (KEY_MAX + 37)	/* delete word at cursor	*/
-#define REQ_CLR_EOL	 (KEY_MAX + 38)	/* clear to end of line		*/
-#define REQ_CLR_EOF	 (KEY_MAX + 39)	/* clear to end of field	*/
-#define REQ_CLR_FIELD	 (KEY_MAX + 40)	/* clear entire field		*/
-#define REQ_OVL_MODE	 (KEY_MAX + 41)	/* begin overlay mode		*/
-#define REQ_INS_MODE	 (KEY_MAX + 42)	/* begin insert mode		*/
-#define REQ_SCR_FLINE	 (KEY_MAX + 43)	/* scroll field forward a line	*/
-#define REQ_SCR_BLINE	 (KEY_MAX + 44)	/* scroll field backward a line	*/
-#define REQ_SCR_FPAGE	 (KEY_MAX + 45)	/* scroll field forward a page	*/
-#define REQ_SCR_BPAGE	 (KEY_MAX + 46)	/* scroll field backward a page	*/
-#define REQ_SCR_FHPAGE	 (KEY_MAX + 47) /* scroll field forward	 half page */
-#define REQ_SCR_BHPAGE	 (KEY_MAX + 48) /* scroll field backward half page */
-#define REQ_SCR_FCHAR	 (KEY_MAX + 49) /* horizontal scroll char	*/
-#define REQ_SCR_BCHAR	 (KEY_MAX + 50) /* horizontal scroll char	*/
-#define REQ_SCR_HFLINE	 (KEY_MAX + 51) /* horizontal scroll line	*/
-#define REQ_SCR_HBLINE	 (KEY_MAX + 52) /* horizontal scroll line	*/
-#define REQ_SCR_HFHALF	 (KEY_MAX + 53) /* horizontal scroll half line	*/
-#define REQ_SCR_HBHALF	 (KEY_MAX + 54) /* horizontal scroll half line	*/
-
-#define REQ_VALIDATION	 (KEY_MAX + 55)	/* validate field		*/
-#define REQ_NEXT_CHOICE	 (KEY_MAX + 56)	/* display next field choice	*/
-#define REQ_PREV_CHOICE	 (KEY_MAX + 57)	/* display prev field choice	*/
-
-#define MIN_FORM_COMMAND (KEY_MAX + 1)	/* used by form_driver		*/
-#define MAX_FORM_COMMAND (KEY_MAX + 57)	/* used by form_driver		*/
-
-#if defined(MAX_COMMAND)
-#  if (MAX_FORM_COMMAND > MAX_COMMAND)
-#    error Something is wrong -- MAX_FORM_COMMAND is greater than MAX_COMMAND
-#  elif (MAX_COMMAND != (KEY_MAX + 128))
-#    error Something is wrong -- MAX_COMMAND is already inconsistently defined.
-#  endif
-#else
-#  define MAX_COMMAND (KEY_MAX + 128)
-#endif
-
-	/*************************
-	*  standard field types  *
-	*************************/
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ALPHA;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ALNUM;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ENUM;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_INTEGER;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_NUMERIC;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_REGEXP;
-
-	/************************************
-	*  built-in additional field types  *
-	*  They are not defined in SVr4     *
-	************************************/
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_IPV4;      /* Internet IP Version 4 address */
-
-	/***********************
-	*  FIELDTYPE routines  *
-	***********************/
-extern NCURSES_EXPORT(FIELDTYPE *) new_fieldtype (
-		    bool (* const field_check)(FIELD *,const void *),
-		    bool (* const char_check)(int,const void *));
-extern NCURSES_EXPORT(FIELDTYPE *) link_fieldtype(
-		    FIELDTYPE *, FIELDTYPE *);
-
-extern NCURSES_EXPORT(int)	free_fieldtype (FIELDTYPE *);
-extern NCURSES_EXPORT(int)	set_fieldtype_arg (FIELDTYPE *,
-		    void * (* const make_arg)(va_list *),
-		    void * (* const copy_arg)(const void *),
-		    void (* const free_arg)(void *));
-extern NCURSES_EXPORT(int)	 set_fieldtype_choice (FIELDTYPE *,
-		    bool (* const next_choice)(FIELD *,const void *),
-	      	    bool (* const prev_choice)(FIELD *,const void *));
-
-	/*******************
-	*  FIELD routines  *
-	*******************/
-extern NCURSES_EXPORT(FIELD *)	new_field (int,int,int,int,int,int);
-extern NCURSES_EXPORT(FIELD *)	dup_field (FIELD *,int,int);
-extern NCURSES_EXPORT(FIELD *)	link_field (FIELD *,int,int);
-
-extern NCURSES_EXPORT(int)	free_field (FIELD *);
-extern NCURSES_EXPORT(int)	field_info (const FIELD *,int *,int *,int *,int *,int *,int *);
-extern NCURSES_EXPORT(int)	dynamic_field_info (const FIELD *,int *,int *,int *);
-extern NCURSES_EXPORT(int)	set_max_field ( FIELD *,int);
-extern NCURSES_EXPORT(int)	move_field (FIELD *,int,int);
-extern NCURSES_EXPORT(int)	set_field_type (FIELD *,FIELDTYPE *,...);
-extern NCURSES_EXPORT(int)	set_new_page (FIELD *,bool);
-extern NCURSES_EXPORT(int)	set_field_just (FIELD *,int);
-extern NCURSES_EXPORT(int)	field_just (const FIELD *);
-extern NCURSES_EXPORT(int)	set_field_fore (FIELD *,chtype);
-extern NCURSES_EXPORT(int)	set_field_back (FIELD *,chtype);
-extern NCURSES_EXPORT(int)	set_field_pad (FIELD *,int);
-extern NCURSES_EXPORT(int)	field_pad (const FIELD *);
-extern NCURSES_EXPORT(int)	set_field_buffer (FIELD *,int,const char *);
-extern NCURSES_EXPORT(int)	set_field_status (FIELD *,bool);
-extern NCURSES_EXPORT(int)	set_field_userptr (FIELD *, void *);
-extern NCURSES_EXPORT(int)	set_field_opts (FIELD *,Field_Options);
-extern NCURSES_EXPORT(int)	field_opts_on (FIELD *,Field_Options);
-extern NCURSES_EXPORT(int)	field_opts_off (FIELD *,Field_Options);
-
-extern NCURSES_EXPORT(chtype)	field_fore (const FIELD *);
-extern NCURSES_EXPORT(chtype)	field_back (const FIELD *);
-
-extern NCURSES_EXPORT(bool)	new_page (const FIELD *);
-extern NCURSES_EXPORT(bool)	field_status (const FIELD *);
-
-extern NCURSES_EXPORT(void *)	field_arg (const FIELD *);
-
-extern NCURSES_EXPORT(void *)	field_userptr (const FIELD *);
-
-extern NCURSES_EXPORT(FIELDTYPE *)	field_type (const FIELD *);
-
-extern NCURSES_EXPORT(char *)	field_buffer (const FIELD *,int);
-
-extern NCURSES_EXPORT(Field_Options)	field_opts (const FIELD *);
-
-	/******************
-	*  FORM routines  *
-	******************/
-
-extern NCURSES_EXPORT(FORM *)	new_form (FIELD **);
-
-extern NCURSES_EXPORT(FIELD **)	form_fields (const FORM *);
-extern NCURSES_EXPORT(FIELD *)	current_field (const FORM *);
-
-extern NCURSES_EXPORT(WINDOW *)	form_win (const FORM *);
-extern NCURSES_EXPORT(WINDOW *)	form_sub (const FORM *);
-
-extern NCURSES_EXPORT(Form_Hook)	form_init (const FORM *);
-extern NCURSES_EXPORT(Form_Hook)	form_term (const FORM *);
-extern NCURSES_EXPORT(Form_Hook)	field_init (const FORM *);
-extern NCURSES_EXPORT(Form_Hook)	field_term (const FORM *);
-
-extern NCURSES_EXPORT(int)	free_form (FORM *);
-extern NCURSES_EXPORT(int)	set_form_fields (FORM *,FIELD **);
-extern NCURSES_EXPORT(int)	field_count (const FORM *);
-extern NCURSES_EXPORT(int)	set_form_win (FORM *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_form_sub (FORM *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_current_field (FORM *,FIELD *);
-extern NCURSES_EXPORT(int)	field_index (const FIELD *);
-extern NCURSES_EXPORT(int)	set_form_page (FORM *,int);
-extern NCURSES_EXPORT(int)	form_page (const FORM *);
-extern NCURSES_EXPORT(int)	scale_form (const FORM *,int *,int *);
-extern NCURSES_EXPORT(int)	set_form_init (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	set_form_term (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	set_field_init (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	set_field_term (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	post_form (FORM *);
-extern NCURSES_EXPORT(int)	unpost_form (FORM *);
-extern NCURSES_EXPORT(int)	pos_form_cursor (FORM *);
-extern NCURSES_EXPORT(int)	form_driver (FORM *,int);
-# if NCURSES_WIDECHAR
-extern NCURSES_EXPORT(int)	form_driver_w (FORM *,int,wchar_t);
-# endif
-extern NCURSES_EXPORT(int)	set_form_userptr (FORM *,void *);
-extern NCURSES_EXPORT(int)	set_form_opts (FORM *,Form_Options);
-extern NCURSES_EXPORT(int)	form_opts_on (FORM *,Form_Options);
-extern NCURSES_EXPORT(int)	form_opts_off (FORM *,Form_Options);
-extern NCURSES_EXPORT(int)	form_request_by_name (const char *);
-
-extern NCURSES_EXPORT(const char *)	form_request_name (int);
-
-extern NCURSES_EXPORT(void *)	form_userptr (const FORM *);
-
-extern NCURSES_EXPORT(Form_Options)	form_opts (const FORM *);
-
-extern NCURSES_EXPORT(bool)	data_ahead (const FORM *);
-extern NCURSES_EXPORT(bool)	data_behind (const FORM *);
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(FORM *)	NCURSES_SP_NAME(new_form) (SCREEN*, FIELD **);
-#endif
-
-#ifdef __cplusplus
-  }
-#endif
-/* *INDENT-ON*/
-
-#endif /* FORM_H */
diff --git a/openflow/usr/include/fstab.h b/openflow/usr/include/fstab.h
deleted file mode 100644
index 9f17e1b..0000000
--- a/openflow/usr/include/fstab.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1980, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)fstab.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _FSTAB_H
-#define _FSTAB_H	1
-
-#include <features.h>
-
-/*
- * File system table, see fstab(5).
- *
- * Used by dump, mount, umount, swapon, fsck, df, ...
- *
- * For ufs fs_spec field is the block special name.  Programs that want to
- * use the character special name must create that name by prepending a 'r'
- * after the right most slash.  Quota files are always named "quotas", so
- * if type is "rq", then use concatenation of fs_file and "quotas" to locate
- * quota file.
- */
-#define	_PATH_FSTAB	"/etc/fstab"
-#define	FSTAB		"/etc/fstab"	/* deprecated */
-
-#define	FSTAB_RW	"rw"		/* read/write device */
-#define	FSTAB_RQ	"rq"		/* read/write with quotas */
-#define	FSTAB_RO	"ro"		/* read-only device */
-#define	FSTAB_SW	"sw"		/* swap device */
-#define	FSTAB_XX	"xx"		/* ignore totally */
-
-struct fstab
-  {
-    char *fs_spec;			/* block special device name */
-    char *fs_file;			/* file system path prefix */
-    char *fs_vfstype;			/* File system type, ufs, nfs */
-    char *fs_mntops;			/* Mount options ala -o */
-    const char *fs_type;		/* FSTAB_* from fs_mntops */
-    int	fs_freq;			/* dump frequency, in days */
-    int	fs_passno;			/* pass number on parallel dump */
-  };
-
-
-__BEGIN_DECLS
-
-extern struct fstab *getfsent (void) __THROW;
-extern struct fstab *getfsspec (const char *__name) __THROW;
-extern struct fstab *getfsfile (const char *__name) __THROW;
-extern int setfsent (void) __THROW;
-extern void endfsent (void) __THROW;
-
-__END_DECLS
-
-#endif /* fstab.h */
diff --git a/openflow/usr/include/fts.h b/openflow/usr/include/fts.h
deleted file mode 100644
index 127a0d2..0000000
--- a/openflow/usr/include/fts.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* File tree traversal functions declarations.
-   Copyright (C) 1994-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- */
-
-#ifndef	_FTS_H
-#define	_FTS_H 1
-
-#include <features.h>
-#include <sys/types.h>
-
-
-typedef struct {
-	struct _ftsent *fts_cur;	/* current node */
-	struct _ftsent *fts_child;	/* linked list of children */
-	struct _ftsent **fts_array;	/* sort array */
-	dev_t fts_dev;			/* starting device # */
-	char *fts_path;			/* path for this descent */
-	int fts_rfd;			/* fd for root */
-	int fts_pathlen;		/* sizeof(path) */
-	int fts_nitems;			/* elements in the sort array */
-	int (*fts_compar) (const void *, const void *); /* compare fn */
-
-#define	FTS_COMFOLLOW	0x0001		/* follow command line symlinks */
-#define	FTS_LOGICAL	0x0002		/* logical walk */
-#define	FTS_NOCHDIR	0x0004		/* don't change directories */
-#define	FTS_NOSTAT	0x0008		/* don't get stat info */
-#define	FTS_PHYSICAL	0x0010		/* physical walk */
-#define	FTS_SEEDOT	0x0020		/* return dot and dot-dot */
-#define	FTS_XDEV	0x0040		/* don't cross devices */
-#define FTS_WHITEOUT	0x0080		/* return whiteout information */
-#define	FTS_OPTIONMASK	0x00ff		/* valid user option mask */
-
-#define	FTS_NAMEONLY	0x0100		/* (private) child names only */
-#define	FTS_STOP	0x0200		/* (private) unrecoverable error */
-	int fts_options;		/* fts_open options, global flags */
-} FTS;
-
-#ifdef __USE_LARGEFILE64
-typedef struct {
-	struct _ftsent64 *fts_cur;	/* current node */
-	struct _ftsent64 *fts_child;	/* linked list of children */
-	struct _ftsent64 **fts_array;	/* sort array */
-	dev_t fts_dev;			/* starting device # */
-	char *fts_path;			/* path for this descent */
-	int fts_rfd;			/* fd for root */
-	int fts_pathlen;		/* sizeof(path) */
-	int fts_nitems;			/* elements in the sort array */
-	int (*fts_compar) (const void *, const void *); /* compare fn */
-	int fts_options;		/* fts_open options, global flags */
-} FTS64;
-#endif
-
-typedef struct _ftsent {
-	struct _ftsent *fts_cycle;	/* cycle node */
-	struct _ftsent *fts_parent;	/* parent directory */
-	struct _ftsent *fts_link;	/* next file in directory */
-	long fts_number;	        /* local numeric value */
-	void *fts_pointer;	        /* local address value */
-	char *fts_accpath;		/* access path */
-	char *fts_path;			/* root path */
-	int fts_errno;			/* errno for this node */
-	int fts_symfd;			/* fd for symlink */
-	u_short fts_pathlen;		/* strlen(fts_path) */
-	u_short fts_namelen;		/* strlen(fts_name) */
-
-	ino_t fts_ino;			/* inode */
-	dev_t fts_dev;			/* device */
-	nlink_t fts_nlink;		/* link count */
-
-#define	FTS_ROOTPARENTLEVEL	-1
-#define	FTS_ROOTLEVEL		 0
-	short fts_level;		/* depth (-1 to N) */
-
-#define	FTS_D		 1		/* preorder directory */
-#define	FTS_DC		 2		/* directory that causes cycles */
-#define	FTS_DEFAULT	 3		/* none of the above */
-#define	FTS_DNR		 4		/* unreadable directory */
-#define	FTS_DOT		 5		/* dot or dot-dot */
-#define	FTS_DP		 6		/* postorder directory */
-#define	FTS_ERR		 7		/* error; errno is set */
-#define	FTS_F		 8		/* regular file */
-#define	FTS_INIT	 9		/* initialized only */
-#define	FTS_NS		10		/* stat(2) failed */
-#define	FTS_NSOK	11		/* no stat(2) requested */
-#define	FTS_SL		12		/* symbolic link */
-#define	FTS_SLNONE	13		/* symbolic link without target */
-#define FTS_W		14		/* whiteout object */
-	u_short fts_info;		/* user flags for FTSENT structure */
-
-#define	FTS_DONTCHDIR	 0x01		/* don't chdir .. to the parent */
-#define	FTS_SYMFOLLOW	 0x02		/* followed a symlink to get here */
-	u_short fts_flags;		/* private flags for FTSENT structure */
-
-#define	FTS_AGAIN	 1		/* read node again */
-#define	FTS_FOLLOW	 2		/* follow symbolic link */
-#define	FTS_NOINSTR	 3		/* no instructions */
-#define	FTS_SKIP	 4		/* discard node */
-	u_short fts_instr;		/* fts_set() instructions */
-
-	struct stat *fts_statp;		/* stat(2) information */
-	char fts_name[1];		/* file name */
-} FTSENT;
-
-#ifdef __USE_LARGEFILE64
-typedef struct _ftsent64 {
-	struct _ftsent64 *fts_cycle;	/* cycle node */
-	struct _ftsent64 *fts_parent;	/* parent directory */
-	struct _ftsent64 *fts_link;	/* next file in directory */
-	long fts_number;	        /* local numeric value */
-	void *fts_pointer;	        /* local address value */
-	char *fts_accpath;		/* access path */
-	char *fts_path;			/* root path */
-	int fts_errno;			/* errno for this node */
-	int fts_symfd;			/* fd for symlink */
-	u_short fts_pathlen;		/* strlen(fts_path) */
-	u_short fts_namelen;		/* strlen(fts_name) */
-
-	ino64_t fts_ino;		/* inode */
-	dev_t fts_dev;			/* device */
-	nlink_t fts_nlink;		/* link count */
-
-	short fts_level;		/* depth (-1 to N) */
-
-	u_short fts_info;		/* user flags for FTSENT structure */
-
-	u_short fts_flags;		/* private flags for FTSENT structure */
-
-	u_short fts_instr;		/* fts_set() instructions */
-
-	struct stat64 *fts_statp;	/* stat(2) information */
-	char fts_name[1];		/* file name */
-} FTSENT64;
-#endif
-
-__BEGIN_DECLS
-#ifndef __USE_FILE_OFFSET64
-FTSENT	*fts_children (FTS *, int);
-int	 fts_close (FTS *);
-FTS	*fts_open (char * const *, int,
-		   int (*)(const FTSENT **, const FTSENT **));
-FTSENT	*fts_read (FTS *);
-int	 fts_set (FTS *, FTSENT *, int) __THROW;
-#else
-# ifdef __REDIRECT
-FTSENT	*__REDIRECT (fts_children, (FTS *, int), fts64_children);
-int	 __REDIRECT (fts_close, (FTS *), fts64_close);
-FTS	*__REDIRECT (fts_open, (char * const *, int,
-				int (*)(const FTSENT **, const FTSENT **)),
-		     fts64_open);
-FTSENT	*__REDIRECT (fts_read, (FTS *), fts64_read);
-int	 __REDIRECT (fts_set, (FTS *, FTSENT *, int), fts64_set) __THROW;
-# else
-#  define fts_children fts64_children
-#  define fts_close fts64_close
-#  define fts_open fts64_open
-#  define fts_read fts64_read
-#  define fts_set fts64_set
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-FTSENT64 *fts64_children (FTS64 *, int);
-int	  fts64_close (FTS64 *);
-FTS64	 *fts64_open (char * const *, int,
-		      int (*)(const FTSENT64 **, const FTSENT64 **));
-FTSENT64 *fts64_read (FTS64 *);
-int	 fts64_set (FTS64 *, FTSENT64 *, int) __THROW;
-#endif
-__END_DECLS
-
-#endif /* fts.h */
diff --git a/openflow/usr/include/ftw.h b/openflow/usr/include/ftw.h
deleted file mode 100644
index fd4bc36..0000000
--- a/openflow/usr/include/ftw.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/* Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	X/Open Portability Guide 4.2: ftw.h
- */
-
-#ifndef _FTW_H
-#define	_FTW_H	1
-
-#include <features.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-
-__BEGIN_DECLS
-
-/* Values for the FLAG argument to the user function passed to `ftw'
-   and 'nftw'.  */
-enum
-{
-  FTW_F,		/* Regular file.  */
-#define FTW_F	 FTW_F
-  FTW_D,		/* Directory.  */
-#define FTW_D	 FTW_D
-  FTW_DNR,		/* Unreadable directory.  */
-#define FTW_DNR	 FTW_DNR
-  FTW_NS,		/* Unstatable file.  */
-#define FTW_NS	 FTW_NS
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-
-  FTW_SL,		/* Symbolic link.  */
-# define FTW_SL	 FTW_SL
-#endif
-
-#ifdef __USE_XOPEN_EXTENDED
-/* These flags are only passed from the `nftw' function.  */
-  FTW_DP,		/* Directory, all subdirs have been visited. */
-# define FTW_DP	 FTW_DP
-  FTW_SLN		/* Symbolic link naming non-existing file.  */
-# define FTW_SLN FTW_SLN
-
-#endif	/* extended X/Open */
-};
-
-
-#ifdef __USE_XOPEN_EXTENDED
-/* Flags for fourth argument of `nftw'.  */
-enum
-{
-  FTW_PHYS = 1,		/* Perform physical walk, ignore symlinks.  */
-# define FTW_PHYS	FTW_PHYS
-  FTW_MOUNT = 2,	/* Report only files on same file system as the
-			   argument.  */
-# define FTW_MOUNT	FTW_MOUNT
-  FTW_CHDIR = 4,	/* Change to current directory while processing it.  */
-# define FTW_CHDIR	FTW_CHDIR
-  FTW_DEPTH = 8		/* Report files in directory before directory itself.*/
-# define FTW_DEPTH	FTW_DEPTH
-# ifdef __USE_GNU
-  ,
-  FTW_ACTIONRETVAL = 16	/* Assume callback to return FTW_* values instead of
-			   zero to continue and non-zero to terminate.  */
-#  define FTW_ACTIONRETVAL FTW_ACTIONRETVAL
-# endif
-};
-
-#ifdef __USE_GNU
-/* Return values from callback functions.  */
-enum
-{
-  FTW_CONTINUE = 0,	/* Continue with next sibling or for FTW_D with the
-			   first child.  */
-# define FTW_CONTINUE	FTW_CONTINUE
-  FTW_STOP = 1,		/* Return from `ftw' or `nftw' with FTW_STOP as return
-			   value.  */
-# define FTW_STOP	FTW_STOP
-  FTW_SKIP_SUBTREE = 2,	/* Only meaningful for FTW_D: Don't walk through the
-			   subtree, instead just continue with its next
-			   sibling. */
-# define FTW_SKIP_SUBTREE FTW_SKIP_SUBTREE
-  FTW_SKIP_SIBLINGS = 3,/* Continue with FTW_DP callback for current directory
-			    (if FTW_DEPTH) and then its siblings.  */
-# define FTW_SKIP_SIBLINGS FTW_SKIP_SIBLINGS
-};
-#endif
-
-/* Structure used for fourth argument to callback function for `nftw'.  */
-struct FTW
-  {
-    int base;
-    int level;
-  };
-#endif	/* extended X/Open */
-
-
-/* Convenient types for callback functions.  */
-typedef int (*__ftw_func_t) (const char *__filename,
-			     const struct stat *__status, int __flag);
-#ifdef __USE_LARGEFILE64
-typedef int (*__ftw64_func_t) (const char *__filename,
-			       const struct stat64 *__status, int __flag);
-#endif
-#ifdef __USE_XOPEN_EXTENDED
-typedef int (*__nftw_func_t) (const char *__filename,
-			      const struct stat *__status, int __flag,
-			      struct FTW *__info);
-# ifdef __USE_LARGEFILE64
-typedef int (*__nftw64_func_t) (const char *__filename,
-				const struct stat64 *__status,
-				int __flag, struct FTW *__info);
-# endif
-#endif
-
-/* Call a function on every element in a directory tree.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-#ifndef __USE_FILE_OFFSET64
-extern int ftw (const char *__dir, __ftw_func_t __func, int __descriptors)
-     __nonnull ((1, 2));
-#else
-# ifdef __REDIRECT
-extern int __REDIRECT (ftw, (const char *__dir, __ftw_func_t __func,
-			     int __descriptors), ftw64) __nonnull ((1, 2));
-# else
-#  define ftw ftw64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int ftw64 (const char *__dir, __ftw64_func_t __func,
-		  int __descriptors) __nonnull ((1, 2));
-#endif
-
-#ifdef __USE_XOPEN_EXTENDED
-/* Call a function on every element in a directory tree.  FLAG allows
-   to specify the behaviour more detailed.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-# ifndef __USE_FILE_OFFSET64
-extern int nftw (const char *__dir, __nftw_func_t __func, int __descriptors,
-		 int __flag) __nonnull ((1, 2));
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (nftw, (const char *__dir, __nftw_func_t __func,
-			      int __descriptors, int __flag), nftw64)
-     __nonnull ((1, 2));
-#  else
-#   define nftw nftw64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int nftw64 (const char *__dir, __nftw64_func_t __func,
-		   int __descriptors, int __flag) __nonnull ((1, 2));
-# endif
-#endif
-
-__END_DECLS
-
-#endif	/* ftw.h */
diff --git a/openflow/usr/include/gawkapi.h b/openflow/usr/include/gawkapi.h
deleted file mode 100644
index 2be5c80..0000000
--- a/openflow/usr/include/gawkapi.h
+++ /dev/null
@@ -1,926 +0,0 @@
-/*
- * gawkapi.h -- Definitions for use by extension functions calling into gawk.
- */
-
-/* 
- * Copyright (C) 2012-2015 the Free Software Foundation, Inc.
- * 
- * This file is part of GAWK, the GNU implementation of the
- * AWK Programming Language.
- * 
- * GAWK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * GAWK is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-/*
- * The following types and/or macros and/or functions are referenced
- * in this file.  For correct use, you must therefore include the
- * corresponding standard header file BEFORE including this file.
- *
- * FILE			- <stdio.h>
- * NULL			- <stddef.h>
- * memset(), memcpy()	- <string.h>
- * size_t		- <sys/types.h>
- * struct stat		- <sys/stat.h>
- *
- * Due to portability concerns, especially to systems that are not
- * fully standards-compliant, it is your responsibility to include
- * the correct files in the correct way. This requirement is necessary
- * in order to keep this file clean, instead of becoming a portability
- * hodge-podge as can be seen in the gawk source code.
- *
- * To pass reasonable integer values for ERRNO, you will also need to
- * include <errno.h>.
- */
-
-#ifndef _GAWK_API_H
-#define _GAWK_API_H
-
-/*
- * General introduction:
- *
- * This API purposely restricts itself to ISO C 90 features.  In particular, no
- * bool, no // comments, no use of the restrict keyword, or anything else,
- * in order to provide maximal portability.
- * 
- * Exception: the "inline" keyword is used below in the "constructor"
- * functions. If your compiler doesn't support it, you should either
- * -Dinline='' on your command line, or use the autotools and include a
- * config.h in your extensions.
- *
- * Additional important information:
- *
- * 1. ALL string values in awk_value_t objects need to come from api_malloc().
- * Gawk will handle releasing the storage if necessary.  This is slightly
- * awkward, in that you can't take an awk_value_t that you got from gawk
- * and reuse it directly, even for something that is conceptually pass
- * by value.
- *
- * 2. Due to gawk internals, after using sym_update() to install an array
- * into gawk, you have to retrieve the array cookie from the value
- * passed in to sym_update().  Like so:
- *
- *	new_array = create_array();
- *	val.val_type = AWK_ARRAY;
- *	val.array_cookie = new_array;
- *	sym_update("array", & val);	// install array in the symbol table
- *
- *	new_array = val.array_cookie;	// MUST DO THIS
- *
- *	// fill in new array with lots of subscripts and values
- *
- * Similarly, if installing a new array as a subarray of an existing
- * array, you must add the new array to its parent before adding any
- * elements to it.
- *
- * You must also retrieve the value of the array_cookie after the call
- * to set_element().
- *
- * Thus, the correct way to build an array is to work "top down".
- * Create the array, and immediately install it in gawk's symbol table
- * using sym_update(), or install it as an element in a previously
- * existing array using set_element().
- *
- * Thus the new array must ultimately be rooted in a global symbol. This is
- * necessary before installing any subarrays in it, due to gawk's
- * internal implementation.  Strictly speaking, this is required only
- * for arrays that will have subarrays as elements; however it is
- * a good idea to always do this.  This restriction may be relaxed
- * in a subsequent revision of the API.
- */
-
-/* Allow use in C++ code.  */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is used to keep extensions from modifying certain fields in some structs. */
-#ifdef GAWK
-#define awk_const
-#else
-#define awk_const const
-#endif
-
-typedef enum awk_bool {
-	awk_false = 0,
-	awk_true
-} awk_bool_t;	/* we don't use <stdbool.h> on purpose */
-
-/* The information about input files that input parsers need to know: */
-typedef struct awk_input {
-	const char *name;	/* filename */
-	int fd;			/* file descriptor */
-#define INVALID_HANDLE (-1)
-	void *opaque;           /* private data for input parsers */
-	/*
-	 * The get_record function is called to read the next record of data.
-	 *
-	 * It should return the length of the input record or EOF, and it
-	 * should set *out to point to the contents of $0. The rt_start
-	 * and rt_len arguments should be used to return RT to gawk.
-	 * If EOF is not returned, the parser must set *rt_len (and
-	 * *rt_start if *rt_len is non-zero).
-	 *
-	 * Note that gawk will make a copy of the record in *out, so the
-	 * parser is responsible for managing its own memory buffer.
-	 * Similarly, gawk will make its own copy of RT, so the parser
-	 * is also responsible for managing this memory.
-	 * 
-	 * It is guaranteed that errcode is a valid pointer, so there is
-	 * no need to test for a NULL value.  Gawk sets *errcode to 0,
-	 * so there is no need to set it unless an error occurs.
-	 *
-	 * If an error does occur, the function should return EOF and set
-	 * *errcode to a positive value.  In that case, if *errcode is greater
-	 * than zero, gawk will automatically update the ERRNO variable based
-	 * on the value of *errcode (e.g., setting *errcode = errno should do
-	 * the right thing).
-	 */
-	int (*get_record)(char **out, struct awk_input *iobuf, int *errcode,
-			char **rt_start, size_t *rt_len);
-
-	/*
-	 * No argument prototype on read_func to allow for older systems
-	 * whose headers are not up to date.
-	 */
-	ssize_t (*read_func)();
-
-	/*
-	 * The close_func is called to allow the parser to free private data.
-	 * Gawk itself will close the fd unless close_func first sets it to
-	 * INVALID_HANDLE.
-	 */
-	void (*close_func)(struct awk_input *iobuf);
-
-	/* put last, for alignment. bleah */
-	struct stat sbuf;       /* stat buf */
-							
-} awk_input_buf_t;
-
-typedef struct awk_input_parser {
-	const char *name;	/* name of parser */
-
-	/*
-	 * The can_take_file function should return non-zero if the parser
-	 * would like to parse this file.  It should not change any gawk
-	 * state!
-	 */
-	awk_bool_t (*can_take_file)(const awk_input_buf_t *iobuf);
-
-	/*
-	 * If this parser is selected, then take_control_of will be called.
-	 * It can assume that a previous call to can_take_file was successful,
-	 * and no gawk state has changed since that call.  It should populate
-	 * the awk_input_buf_t's get_record, close_func, and opaque values as needed.
-	 * It should return non-zero if successful.
-	 */
-	awk_bool_t (*take_control_of)(awk_input_buf_t *iobuf);
-
-	awk_const struct awk_input_parser *awk_const next;	/* for use by gawk */
-} awk_input_parser_t;
-
-/*
- * Similar for output wrapper.
- */
-
-/* First the data structure */
-typedef struct awk_output_buf {
-	const char *name;	/* name of output file */
-	const char *mode;	/* mode argument to fopen */
-	FILE *fp;		/* stdio file pointer */
-	awk_bool_t redirected;	/* true if a wrapper is active */
-	void *opaque;		/* for use by output wrapper */
-
-	/*
-	 * Replacement functions for I/O.  Just like the regular
-	 * versions but also take the opaque pointer argument.
-	 */
-	size_t (*gawk_fwrite)(const void *buf, size_t size, size_t count,
-				FILE *fp, void *opaque);
-	int (*gawk_fflush)(FILE *fp, void *opaque);
-	int (*gawk_ferror)(FILE *fp, void *opaque);
-	int (*gawk_fclose)(FILE *fp, void *opaque);
-} awk_output_buf_t;
-
-/* Next the output wrapper registered with gawk */
-typedef struct awk_output_wrapper {
-	const char *name;	/* name of the wrapper */
-
-	/*
-	 * The can_take_file function should return non-zero if the wrapper
-	 * would like to process this file.  It should not change any gawk
-	 * state!
-	 */
-	awk_bool_t (*can_take_file)(const awk_output_buf_t *outbuf);
-
-	/*
-	 * If this wrapper is selected, then take_control_of will be called.
-	 * It can assume that a previous call to can_take_file was successful,
-	 * and no gawk state has changed since that call.  It should populate
-	 * the awk_output_buf_t function pointers and opaque pointer as needed.
-	 * It should return non-zero if successful.
-	 */
-	awk_bool_t (*take_control_of)(awk_output_buf_t *outbuf);
-
-	awk_const struct awk_output_wrapper *awk_const next;  /* for use by gawk */
-} awk_output_wrapper_t;
-
-/* A two-way processor combines an input parser and an output wrapper. */
-typedef struct awk_two_way_processor {
-	const char *name;	/* name of the two-way processor */
-
-	/*
-	 * The can_take_file function should return non-zero if the two-way
-	 * processor would like to parse this file.  It should not change
-	 * any gawk state!
-	 */
-	awk_bool_t (*can_take_two_way)(const char *name);
-
-	/*
-	 * If this processor is selected, then take_control_of will be called.
-	 * It can assume that a previous call to can_take_file was successful,
-	 * and no gawk state has changed since that call.  It should populate
-	 * the awk_input_buf_t and awk_otuput_buf_t structures as needed.
-	 * It should return non-zero if successful.
-	 */
-	awk_bool_t (*take_control_of)(const char *name, awk_input_buf_t *inbuf,
-					awk_output_buf_t *outbuf);
-
-	awk_const struct awk_two_way_processor *awk_const next;  /* for use by gawk */
-} awk_two_way_processor_t;
-
-/* Current version of the API. */
-enum {
-	GAWK_API_MAJOR_VERSION = 1,
-	GAWK_API_MINOR_VERSION = 1
-};
-
-/* A number of typedefs related to different types of values. */
-
-/*
- * A mutable string. Gawk owns the memory pointed to if it supplied
- * the value. Otherwise, it takes ownership of the memory pointed to.
- *
- * The API deals exclusively with regular chars; these strings may
- * be multibyte encoded in the current locale's encoding and character
- * set. Gawk will convert internally to wide characters if necessary.
- */
-typedef struct awk_string {
-	char *str;	/* data */
-	size_t len;	/* length thereof, in chars */
-} awk_string_t;
-
-/* Arrays are represented as an opaque type. */
-typedef void *awk_array_t;
-
-/* Scalars can be represented as an opaque type. */
-typedef void *awk_scalar_t;
-
-/* Any value can be stored as a cookie. */
-typedef void *awk_value_cookie_t;
-
-/*
- * This tag defines the type of a value.
- *
- * Values are associated with regular variables and with array elements.
- * Since arrays can be multidimensional (as can regular variables)
- * it's valid to have a "value" that is actually an array.
- */
-typedef enum {
-	AWK_UNDEFINED,
-	AWK_NUMBER,
-	AWK_STRING,
-	AWK_ARRAY,
-	AWK_SCALAR,		/* opaque access to a variable */
-	AWK_VALUE_COOKIE	/* for updating a previously created value */
-} awk_valtype_t;
-
-/*
- * An awk value. The val_type tag indicates what
- * is in the union.
- */
-typedef struct awk_value {
-	awk_valtype_t	val_type;
-	union {
-		awk_string_t	s;
-		double		d;
-		awk_array_t	a;
-		awk_scalar_t	scl;
-		awk_value_cookie_t vc;
-	} u;
-#define str_value	u.s
-#define num_value	u.d
-#define array_cookie	u.a
-#define scalar_cookie	u.scl
-#define value_cookie	u.vc
-} awk_value_t;
-
-/*
- * A "flattened" array element. Gawk produces an array of these
- * inside the awk_flat_array_t.
- * ALL memory pointed to belongs to gawk. Individual elements may
- * be marked for deletion. New elements must be added individually,
- * one at a time, using the separate API for that purpose.
- */
-
-typedef struct awk_element {
-	/* convenience linked list pointer, not used by gawk */
-	struct awk_element *next;
-	enum {
-		AWK_ELEMENT_DEFAULT = 0,	/* set by gawk */
-		AWK_ELEMENT_DELETE = 1		/* set by extension if
-						   should be deleted */
-	} flags;
-	awk_value_t	index;			/* guaranteed to be a string! */
-	awk_value_t	value;
-} awk_element_t;
-
-/*
- * A "flattened" array. See the description above for how
- * to use the elements contained herein.
- */
-typedef struct awk_flat_array {
-	awk_const void *awk_const opaque1;	/* private data for use by gawk */
-	awk_const void *awk_const opaque2;	/* private data for use by gawk */
-	awk_const size_t count;			/* how many elements */
-	awk_element_t elements[1];		/* will be extended */
-} awk_flat_array_t;
-
-/*
- * A record describing an extension function. Upon being
- * loaded, the extension should pass in one of these to gawk for
- * each C function.
- *
- * Each called function must fill in the result with either a number
- * or string. Gawk takes ownership of any string memory.
- *
- * The called function must return the value of `result'.
- * This is for the convenience of the calling code inside gawk.
- *
- * Each extension function may decide what to do if the number of
- * arguments isn't what it expected.  Following awk functions, it
- * is likely OK to ignore extra arguments.
- */
-typedef struct awk_ext_func {
-	const char *name;
-	awk_value_t *(*function)(int num_actual_args, awk_value_t *result);
-	size_t num_expected_args;
-} awk_ext_func_t;
-
-typedef void *awk_ext_id_t;	/* opaque type for extension id */
-
-/*
- * The API into gawk. Lots of functions here. We hope that they are
- * logically organized.
- */
-typedef struct gawk_api {
-	/* First, data fields. */
-
-	/* These are what gawk thinks the API version is. */
-	awk_const int major_version;
-	awk_const int minor_version;
-
-	/*
-	 * These can change on the fly as things happen within gawk.
-	 * Currently only do_lint is prone to change, but we reserve
-	 * the right to allow the others to do so also.
-	 */
-#define DO_FLAGS_SIZE	6
-	awk_const int do_flags[DO_FLAGS_SIZE];
-/* Use these as indices into do_flags[] array to check the values */
-#define gawk_do_lint		0
-#define gawk_do_traditional	1
-#define gawk_do_profile		2
-#define gawk_do_sandbox		3
-#define gawk_do_debug		4
-#define gawk_do_mpfr		5
-
-	/* Next, registration functions: */
-
-	/* Add a function to the interpreter, returns true upon success */
-	awk_bool_t (*api_add_ext_func)(awk_ext_id_t id, const char *namespace,
-			const awk_ext_func_t *func);
-
-	/* Register an input parser; for opening files read-only */
-	void (*api_register_input_parser)(awk_ext_id_t id,
-					awk_input_parser_t *input_parser);
-
-	/* Register an output wrapper, for writing files */
-	void (*api_register_output_wrapper)(awk_ext_id_t id,
-					awk_output_wrapper_t *output_wrapper);
-
-	/* Register a processor for two way I/O */
-	void (*api_register_two_way_processor)(awk_ext_id_t id,
-				awk_two_way_processor_t *two_way_processor);
-
-	/*
-	 * Add an exit call back.
-	 *
-	 * arg0 is a private data pointer for use by the extension;
-	 * gawk saves it and passes it into the function pointed
-	 * to by funcp at exit.
-	 *
-	 * Exit callback functions are called in LIFO order.
-	 */
-	void (*api_awk_atexit)(awk_ext_id_t id,
-			void (*funcp)(void *data, int exit_status),
-			void *arg0);
-
-	/* Register a version string for this extension with gawk. */
-	void (*api_register_ext_version)(awk_ext_id_t id, const char *version);
-
-	/* Functions to print messages */
-	void (*api_fatal)(awk_ext_id_t id, const char *format, ...);
-	void (*api_warning)(awk_ext_id_t id, const char *format, ...);
-	void (*api_lintwarn)(awk_ext_id_t id, const char *format, ...);
-
-	/* Functions to update ERRNO */
-	void (*api_update_ERRNO_int)(awk_ext_id_t id, int errno_val);
-	void (*api_update_ERRNO_string)(awk_ext_id_t id, const char *string);
-	void (*api_unset_ERRNO)(awk_ext_id_t id);
-
-	/*
-	 * All of the functions that return a value from inside gawk
-	 * (get a parameter, get a global variable, get an array element)
-	 * behave in the same way.
-	 *
-	 * For a function parameter, the return is false if the argument
-	 * count is out of range, or if actual paramater does not match
-	 * what is specified in wanted. In that case,  result->val_type
-	 * will hold the actual type of what was passed.
-	 *
-	 * Similarly for symbol table access to variables and array elements,
-	 * the return is false if the actual variable or array element does
-	 * not match what was requested, and the result->val_type will hold
-	 * the actual type.
-
-	Table entry is type returned:
-
-
-	                        +-------------------------------------------------+
-	                        |                Type of Actual Value:            |
-	                        +------------+------------+-----------+-----------+
-	                        |   String   |   Number   | Array     | Undefined |
-	+-----------+-----------+------------+------------+-----------+-----------+
-	|           | String    |   String   |   String   | false     | false     |
-	|           |-----------+------------+------------+-----------+-----------+
-	|           | Number    | Number if  |   Number   | false     | false     |
-	|           |           | can be     |            |           |           |
-	|           |           | converted, |            |           |           |
-	|           |           | else false |            |           |           |
-	|           |-----------+------------+------------+-----------+-----------+
-	|   Type    | Array     |   false    |   false    | Array     | false     |
-	| Requested |-----------+------------+------------+-----------+-----------+
-	|           | Scalar    |   Scalar   |   Scalar   | false     | false     |
-	|           |-----------+------------+------------+-----------+-----------+
-	|           | Undefined |  String    |   Number   | Array     | Undefined |
-	|           |-----------+------------+------------+-----------+-----------+
-	|           | Value     |   false    |   false    | false     | false     |
-	|           | Cookie    |            |            |           |           |
-	+-----------+-----------+------------+------------+-----------+-----------+
-	*/
-
-	/* Functions to handle parameters passed to the extension. */
-
-	/*
-	 * Get the count'th paramater, zero-based.
-	 * Returns false if count is out of range, or if actual paramater
-	 * does not match what is specified in wanted. In that case,
-	 * result->val_type is as described above.
-	 */
-	awk_bool_t (*api_get_argument)(awk_ext_id_t id, size_t count,
-					  awk_valtype_t wanted,
-					  awk_value_t *result);
-
-	/*
-	 * Convert a paramter that was undefined into an array
-	 * (provide call-by-reference for arrays).  Returns false
-	 * if count is too big, or if the argument's type is
-	 * not undefined.
-	 */
-	awk_bool_t (*api_set_argument)(awk_ext_id_t id,
-					size_t count,
-					awk_array_t array);
-
-	/*
-	 * Symbol table access:
-	 * 	- Read-only access to special variables (NF, etc.)
-	 * 	- One special exception: PROCINFO.
-	 *	- Use sym_update() to change a value, including from UNDEFINED
-	 *	  to scalar or array. 
-	 */
-	/*
-	 * Lookup a variable, fill in value. No messing with the value
-	 * returned.
-	 * Returns false if the variable doesn't exist* or if the wrong type
-	 * was requested.  In the latter case, vaule->val_type will have
-	 * the real type, as described above.
-	 *
-	 * 	awk_value_t val;
-	 * 	if (! api->sym_lookup(id, name, wanted, & val))
-	 * 		error_code_here();
-	 *	else {
-	 *		// safe to use val
-	 *	}
-	 */
-	awk_bool_t (*api_sym_lookup)(awk_ext_id_t id,
-				const char *name,
-				awk_valtype_t wanted,
-				awk_value_t *result);
-
-	/*
-	 * Update a value. Adds it to the symbol table if not there.
-	 * Changing types (scalar <--> array) is not allowed.
-	 * In fact, using this to update an array is not allowed, either.
-	 * Such an attempt returns false.
-	 */
-	awk_bool_t (*api_sym_update)(awk_ext_id_t id,
-				const char *name,
-				awk_value_t *value);
-
-	/*
-	 * A ``scalar cookie'' is an opaque handle that provide access
-	 * to a global variable or array. It is an optimization that
-	 * avoids looking up variables in gawk's symbol table every time
-	 * access is needed.
-	 *
-	 * This function retrieves the current value of a scalar cookie.
-	 * Once you have obtained a scalar_cookie using sym_lookup, you can
-	 * use this function to get its value more efficiently.
-	 *
-	 * Return will be false if the value cannot be retrieved.
-	 *
-	 * Flow is thus
-	 *	awk_value_t val;
-	 * 	awk_scalar_t cookie;
-	 * 	api->sym_lookup(id, "variable", AWK_SCALAR, & val);	// get the cookie
-	 *	cookie = val.scalar_cookie;
-	 *	...
-	 *	api->sym_lookup_scalar(id, cookie, wanted, & val);	// get the value
-	 */
-	awk_bool_t (*api_sym_lookup_scalar)(awk_ext_id_t id,
-				awk_scalar_t cookie,
-				awk_valtype_t wanted,
-				awk_value_t *result);
-
-	/*
-	 * Update the value associated with a scalar cookie.
-	 * Flow is
-	 * 	sym_lookup with wanted == AWK_SCALAR
-	 * 	if returns false
-	 * 		sym_update with real initial value to install it
-	 * 		sym_lookup again with AWK_SCALAR
-	 *	else
-	 *		use the scalar cookie
-	 *
-	 * Return will be false if the new value is not one of
-	 * AWK_STRING or AWK_NUMBER.
-	 *
-	 * Here too, the built-in variables may not be updated.
-	 */
-	awk_bool_t (*api_sym_update_scalar)(awk_ext_id_t id,
-				awk_scalar_t cookie, awk_value_t *value);
-
-	/* Cached values */
-
-	/*
-	 * Create a cached string or numeric value for efficient later
-	 * assignment. This improves performance when you want to assign
-	 * the same value to one or more variables repeatedly.  Only
-	 * AWK_NUMBER and AWK_STRING values are allowed.  Any other type
-	 * is rejected.  We disallow AWK_UNDEFINED since that case would
-	 * result in inferior performance.
-	 */
-	awk_bool_t (*api_create_value)(awk_ext_id_t id, awk_value_t *value,
-		    awk_value_cookie_t *result);
-
-	/*
-	 * Release the memory associated with a cookie from api_create_value.
-	 * Please call this to free memory when the value is no longer needed.
-	 */
-	awk_bool_t (*api_release_value)(awk_ext_id_t id, awk_value_cookie_t vc);
-
-	/* Array management */
-
-	/*
-	 * Retrieve total number of elements in array.
-	 * Returns false if some kind of error.
-	 */
-	awk_bool_t (*api_get_element_count)(awk_ext_id_t id,
-			awk_array_t a_cookie, size_t *count);
-
-	/*
-	 * Return the value of an element - read only!
-	 * Use set_array_element() to change it.
-	 * Behavior for value and return is same as for api_get_argument
-	 * and sym_lookup.
-	 */
-	awk_bool_t (*api_get_array_element)(awk_ext_id_t id,
-			awk_array_t a_cookie,
-			const awk_value_t *const index,
-			awk_valtype_t wanted,
-			awk_value_t *result);
-
-	/*
-	 * Change (or create) element in existing array with
-	 * index and value.
-	 *
-	 * ARGV and ENVIRON may not be updated.
-	 */
-	awk_bool_t (*api_set_array_element)(awk_ext_id_t id, awk_array_t a_cookie,
-					const awk_value_t *const index,
-					const awk_value_t *const value);
-
-	/*
-	 * Remove the element with the given index.
-	 * Returns success if removed or false if element did not exist.
-	 */
-	awk_bool_t (*api_del_array_element)(awk_ext_id_t id,
-			awk_array_t a_cookie, const awk_value_t* const index);
-
-	/* Create a new array cookie to which elements may be added */
-	awk_array_t (*api_create_array)(awk_ext_id_t id);
-
-	/* Clear out an array */
-	awk_bool_t (*api_clear_array)(awk_ext_id_t id, awk_array_t a_cookie);
-
-	/* Flatten out an array so that it can be looped over easily. */
-	awk_bool_t (*api_flatten_array)(awk_ext_id_t id,
-			awk_array_t a_cookie,
-			awk_flat_array_t **data);
-
-	/* When done, delete any marked elements, release the memory. */
-	awk_bool_t (*api_release_flattened_array)(awk_ext_id_t id,
-			awk_array_t a_cookie,
-			awk_flat_array_t *data);
-
-	/*
-	 * Hooks to provide access to gawk's memory allocation functions.
-	 * This ensures that memory passed between gawk and the extension
-	 * is allocated and released by the same library.
-	 */
-	void *(*api_malloc)(size_t size);
-	void *(*api_calloc)(size_t nmemb, size_t size);
-	void *(*api_realloc)(void *ptr, size_t size);
-	void (*api_free)(void *ptr);
-} gawk_api_t;
-
-#ifndef GAWK	/* these are not for the gawk code itself! */
-/*
- * Use these if you want to define "global" variables named api
- * and ext_id to make the code a little easier to read.
- * See the sample boilerplate code, below.
- */
-#define do_lint		(api->do_flags[gawk_do_lint])
-#define do_traditional	(api->do_flags[gawk_do_traditional])
-#define do_profile	(api->do_flags[gawk_do_profile])
-#define do_sandbox	(api->do_flags[gawk_do_sandbox])
-#define do_debug	(api->do_flags[gawk_do_debug])
-#define do_mpfr		(api->do_flags[gawk_do_mpfr])
-
-#define get_argument(count, wanted, result) \
-	(api->api_get_argument(ext_id, count, wanted, result))
-#define set_argument(count, new_array) \
-	(api->api_set_argument(ext_id, count, new_array))
-
-#define fatal		api->api_fatal
-#define warning		api->api_warning
-#define lintwarn	api->api_lintwarn
-
-#define register_input_parser(parser)	(api->api_register_input_parser(ext_id, parser))
-#define register_output_wrapper(wrapper) (api->api_register_output_wrapper(ext_id, wrapper))
-#define register_two_way_processor(processor) \
-	(api->api_register_two_way_processor(ext_id, processor))
-
-#define update_ERRNO_int(e)	(api->api_update_ERRNO_int(ext_id, e))
-#define update_ERRNO_string(str) \
-	(api->api_update_ERRNO_string(ext_id, str))
-#define unset_ERRNO()	(api->api_unset_ERRNO(ext_id))
-
-#define add_ext_func(ns, func)	(api->api_add_ext_func(ext_id, ns, func))
-#define awk_atexit(funcp, arg0)	(api->api_awk_atexit(ext_id, funcp, arg0))
-
-#define sym_lookup(name, wanted, result) \
-	(api->api_sym_lookup(ext_id, name, wanted, result))
-#define sym_lookup_scalar(scalar_cookie, wanted, result) \
-	(api->api_sym_lookup_scalar(ext_id, scalar_cookie, wanted, result))
-#define sym_update(name, value) \
-	(api->api_sym_update(ext_id, name, value))
-#define sym_update_scalar(scalar_cookie, value) \
-	(api->api_sym_update_scalar)(ext_id, scalar_cookie, value)
-
-#define get_array_element(array, index, wanted, result) \
-	(api->api_get_array_element(ext_id, array, index, wanted, result))
-
-#define set_array_element(array, index, value) \
-	(api->api_set_array_element(ext_id, array, index, value))
-
-#define set_array_element_by_elem(array, elem) \
-	(api->api_set_array_element(ext_id, array, & (elem)->index, & (elem)->value))
-
-#define del_array_element(array, index) \
-	(api->api_del_array_element(ext_id, array, index))
-
-#define get_element_count(array, count_p) \
-	(api->api_get_element_count(ext_id, array, count_p))
-
-#define create_array()		(api->api_create_array(ext_id))
-
-#define clear_array(array)	(api->api_clear_array(ext_id, array))
-
-#define flatten_array(array, data) \
-	(api->api_flatten_array(ext_id, array, data))
-
-#define release_flattened_array(array, data) \
-	(api->api_release_flattened_array(ext_id, array, data))
-
-#define gawk_malloc(size)		(api->api_malloc(size))
-#define gawk_calloc(nmemb, size)	(api->api_calloc(nmemb, size))
-#define gawk_realloc(ptr, size)		(api->api_realloc(ptr, size))
-#define gawk_free(ptr)			(api->api_free(ptr))
-
-#define create_value(value, result) \
-	(api->api_create_value(ext_id, value,result))
-
-#define release_value(value) \
-	(api->api_release_value(ext_id, value))
-
-#define register_ext_version(version) \
-	(api->api_register_ext_version(ext_id, version))
-
-#define emalloc(pointer, type, size, message) \
-	do { \
-		if ((pointer = (type) gawk_malloc(size)) == 0) \
-			fatal(ext_id, "%s: malloc of %d bytes failed\n", message, size); \
-	} while(0)
-
-#define erealloc(pointer, type, size, message) \
-	do { \
-		if ((pointer = (type) gawk_realloc(pointer, size)) == 0) \
-			fatal(ext_id, "%s: realloc of %d bytes failed\n", message, size); \
-	} while(0)
-
-/* Constructor functions */
-
-/* r_make_string --- make a string value in result from the passed-in string */
-
-static inline awk_value_t *
-r_make_string(const gawk_api_t *api,	/* needed for emalloc */
-	      awk_ext_id_t *ext_id,	/* ditto */
-	      const char *string,
-	      size_t length,
-	      awk_bool_t duplicate,
-	      awk_value_t *result)
-{
-	char *cp = NULL;
-
-	memset(result, 0, sizeof(*result));
-
-	result->val_type = AWK_STRING;
-	result->str_value.len = length;
-
-	if (duplicate) {
-		emalloc(cp, char *, length + 2, "r_make_string");
-		memcpy(cp, string, length);
-		cp[length] = '\0';
-		result->str_value.str = cp;
-	} else {
-		result->str_value.str = (char *) string;
-	}
-
-	return result;
-}
-
-#define make_const_string(str, len, result)	r_make_string(api, ext_id, str, len, 1, result)
-#define make_malloced_string(str, len, result)	r_make_string(api, ext_id, str, len, 0, result)
-
-/* make_null_string --- make a null string value */
-
-static inline awk_value_t *
-make_null_string(awk_value_t *result)
-{
-	memset(result, 0, sizeof(*result));
-	result->val_type = AWK_UNDEFINED;
-
-	return result;
-}
-
-/* make_number --- make a number value in result */
-
-static inline awk_value_t *
-make_number(double num, awk_value_t *result)
-{
-	memset(result, 0, sizeof(*result));
-
-	result->val_type = AWK_NUMBER;
-	result->num_value = num;
-
-	return result;
-}
-
-/*
- * Each extension must define a function with this prototype:
- *
- *	int dl_load(gawk_api_t *api_p, awk_ext_id_t id)
- *
- * The return value should be zero on failure and non-zero on success.
- *
- * For the macros to work, the function should save api_p in a global
- * variable named 'api' and save id in a global variable named 'ext_id'.
- * In addition, a global function pointer named 'init_func' should be
- * defined and set to either NULL or an initialization function that
- * returns non-zero on success and zero upon failure.
- */
-
-extern int dl_load(const gawk_api_t *const api_p, awk_ext_id_t id);
-
-#if 0
-/* Boilerplate code: */
-int plugin_is_GPL_compatible;
-
-static gawk_api_t *const api;
-static awk_ext_id_t ext_id;
-static const char *ext_version = NULL; /* or ... = "some string" */
-
-static awk_ext_func_t func_table[] = {
-	{ "name", do_name, 1 },
-	/* ... */
-};
-
-/* EITHER: */
-
-static awk_bool_t (*init_func)(void) = NULL;
-
-/* OR: */
-
-static awk_bool_t
-init_my_extension(void)
-{
-	...
-}
-
-static awk_bool_t (*init_func)(void) = init_my_extension;
-
-dl_load_func(func_table, some_name, "name_space_in_quotes")
-#endif
-
-#define dl_load_func(func_table, extension, name_space) \
-int dl_load(const gawk_api_t *const api_p, awk_ext_id_t id)  \
-{ \
-	size_t i, j; \
-	int errors = 0; \
-\
-	api = api_p; \
-	ext_id = id; \
-\
-	if (api->major_version != GAWK_API_MAJOR_VERSION \
-	    || api->minor_version < GAWK_API_MINOR_VERSION) { \
-		fprintf(stderr, #extension ": version mismatch with gawk!\n"); \
-		fprintf(stderr, "\tmy version (%d, %d), gawk version (%d, %d)\n", \
-			GAWK_API_MAJOR_VERSION, GAWK_API_MINOR_VERSION, \
-			api->major_version, api->minor_version); \
-		exit(1); \
-	} \
-\
-	/* load functions */ \
-	for (i = 0, j = sizeof(func_table) / sizeof(func_table[0]); i < j; i++) { \
-		if (func_table[i].name == NULL) \
-			break; \
-		if (! add_ext_func(name_space, & func_table[i])) { \
-			warning(ext_id, #extension ": could not add %s\n", \
-					func_table[i].name); \
-			errors++; \
-		} \
-	} \
-\
-	if (init_func != NULL) { \
-		if (! init_func()) { \
-			warning(ext_id, #extension ": initialization function failed\n"); \
-			errors++; \
-		} \
-	} \
-\
-	if (ext_version != NULL) \
-		register_ext_version(ext_version); \
-\
-	return (errors == 0); \
-}
-
-#endif /* GAWK */
-
-#ifdef __cplusplus
-}
-#endif	/* C++ */
-
-#endif /* _GAWK_API_H */
diff --git a/openflow/usr/include/gconv.h b/openflow/usr/include/gconv.h
deleted file mode 100644
index 8d8ce58..0000000
--- a/openflow/usr/include/gconv.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* This header provides no interface for a user to the internals of
-   the gconv implementation in the libc.  Therefore there is no use
-   for these definitions beside for writing additional gconv modules.  */
-
-#ifndef _GCONV_H
-#define _GCONV_H	1
-
-#include <features.h>
-#define __need_mbstate_t
-#define __need_wint_t
-#include <wchar.h>
-#define __need_size_t
-#define __need_wchar_t
-#include <stddef.h>
-
-/* ISO 10646 value used to signal invalid value.  */
-#define __UNKNOWN_10646_CHAR	((wchar_t) 0xfffd)
-
-/* Error codes for gconv functions.  */
-enum
-{
-  __GCONV_OK = 0,
-  __GCONV_NOCONV,
-  __GCONV_NODB,
-  __GCONV_NOMEM,
-
-  __GCONV_EMPTY_INPUT,
-  __GCONV_FULL_OUTPUT,
-  __GCONV_ILLEGAL_INPUT,
-  __GCONV_INCOMPLETE_INPUT,
-
-  __GCONV_ILLEGAL_DESCRIPTOR,
-  __GCONV_INTERNAL_ERROR
-};
-
-
-/* Flags the `__gconv_open' function can set.  */
-enum
-{
-  __GCONV_IS_LAST = 0x0001,
-  __GCONV_IGNORE_ERRORS = 0x0002,
-  __GCONV_SWAP = 0x0004,
-  __GCONV_TRANSLIT = 0x0008
-};
-
-
-/* Forward declarations.  */
-struct __gconv_step;
-struct __gconv_step_data;
-struct __gconv_loaded_object;
-
-
-/* Type of a conversion function.  */
-typedef int (*__gconv_fct) (struct __gconv_step *, struct __gconv_step_data *,
-			    const unsigned char **, const unsigned char *,
-			    unsigned char **, size_t *, int, int);
-
-/* Type of a specialized conversion function for a single byte to INTERNAL.  */
-typedef wint_t (*__gconv_btowc_fct) (struct __gconv_step *, unsigned char);
-
-/* Constructor and destructor for local data for conversion step.  */
-typedef int (*__gconv_init_fct) (struct __gconv_step *);
-typedef void (*__gconv_end_fct) (struct __gconv_step *);
-
-
-/* Description of a conversion step.  */
-struct __gconv_step
-{
-  struct __gconv_loaded_object *__shlib_handle;
-  const char *__modname;
-
-  int __counter;
-
-  char *__from_name;
-  char *__to_name;
-
-  __gconv_fct __fct;
-  __gconv_btowc_fct __btowc_fct;
-  __gconv_init_fct __init_fct;
-  __gconv_end_fct __end_fct;
-
-  /* Information about the number of bytes needed or produced in this
-     step.  This helps optimizing the buffer sizes.  */
-  int __min_needed_from;
-  int __max_needed_from;
-  int __min_needed_to;
-  int __max_needed_to;
-
-  /* Flag whether this is a stateful encoding or not.  */
-  int __stateful;
-
-  void *__data;		/* Pointer to step-local data.  */
-};
-
-/* Additional data for steps in use of conversion descriptor.  This is
-   allocated by the `init' function.  */
-struct __gconv_step_data
-{
-  unsigned char *__outbuf;    /* Output buffer for this step.  */
-  unsigned char *__outbufend; /* Address of first byte after the output
-				 buffer.  */
-
-  /* Is this the last module in the chain.  */
-  int __flags;
-
-  /* Counter for number of invocations of the module function for this
-     descriptor.  */
-  int __invocation_counter;
-
-  /* Flag whether this is an internal use of the module (in the mb*towc*
-     and wc*tomb* functions) or regular with iconv(3).  */
-  int __internal_use;
-
-  __mbstate_t *__statep;
-  __mbstate_t __state;	/* This element must not be used directly by
-			   any module; always use STATEP!  */
-};
-
-
-/* Combine conversion step description with data.  */
-typedef struct __gconv_info
-{
-  size_t __nsteps;
-  struct __gconv_step *__steps;
-  __extension__ struct __gconv_step_data __data __flexarr;
-} *__gconv_t;
-
-/* Transliteration using the locale's data.  */
-extern int __gconv_transliterate (struct __gconv_step *step,
-				  struct __gconv_step_data *step_data,
-				  const unsigned char *inbufstart,
-				  const unsigned char **inbufp,
-				  const unsigned char *inbufend,
-				  unsigned char **outbufstart,
-				  size_t *irreversible);
-
-#endif /* gconv.h */
diff --git a/openflow/usr/include/gdbm-ndbm.h b/openflow/usr/include/gdbm-ndbm.h
deleted file mode 100644
index 0bca786..0000000
--- a/openflow/usr/include/gdbm-ndbm.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ndbm.h  -  The include file for ndbm users.  */
-
-/*  This file is part of GDBM, the GNU data base manager, by Philip A. Nelson.
-    Copyright (C) 1990, 1991, 1993  Free Software Foundation, Inc.
-
-    GDBM is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    GDBM is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GDBM; see the file COPYING.  If not, write to
-    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    You may contact the author by:
-       e-mail:  phil@cs.wwu.edu
-      us-mail:  Philip A. Nelson
-                Computer Science Department
-                Western Washington University
-                Bellingham, WA 98226
-       
-*************************************************************************/
-
-/* Parameters to dbm_store for simple insertion or replacement. */
-#define  DBM_INSERT  0
-#define  DBM_REPLACE 1
-
-
-/* The data and key structure.  This structure is defined for compatibility. */
-typedef struct {
-	char *dptr;
-	int   dsize;
-      } datum;
-
-
-/* The file information header. This is good enough for most applications. */
-typedef struct {int dummy[10];} DBM;
-
-
-/* These are the routines (with some macros defining them!) */
-
-extern DBM 	*dbm_open ();
-
-extern void	 dbm_close ();
-
-extern datum	 dbm_fetch ();
-
-extern int	 dbm_store ();
-
-extern int	 dbm_delete ();
-
-extern int	 dbm_delete ();
-
-extern datum	 dbm_firstkey ();
-
-extern datum	 dbm_nextkey ();
-
-#define		 dbm_error(dbf)  (0)
-
-#define		 dbm_clearerr(dbf)
-
-extern int	 dbm_dirfno ();
-
-extern int	 dbm_pagfno ();
-
-extern int	 dbm_rdonly ();
diff --git a/openflow/usr/include/gdbm.h b/openflow/usr/include/gdbm.h
deleted file mode 100644
index 8a88d06..0000000
--- a/openflow/usr/include/gdbm.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* gdbm.h  -  The include file for dbm users.  */
-
-/*  This file is part of GDBM, the GNU data base manager, by Philip A. Nelson.
-    Copyright (C) 1990, 1991, 1993  Free Software Foundation, Inc.
-
-    GDBM is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    GDBM is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GDBM; see the file COPYING.  If not, write to
-    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    You may contact the author by:
-       e-mail:  phil@cs.wwu.edu
-      us-mail:  Philip A. Nelson
-                Computer Science Department
-                Western Washington University
-                Bellingham, WA 98226
-       
-*************************************************************************/
-
-/* Protection for multiple includes. */
-#ifndef _GDBM_H_
-#define _GDBM_H_
-
-/* Parameters to gdbm_open for READERS, WRITERS, and WRITERS who
-   can create the database. */
-#define  GDBM_READER  0		/* A reader. */
-#define  GDBM_WRITER  1		/* A writer. */
-#define  GDBM_WRCREAT 2		/* A writer.  Create the db if needed. */
-#define  GDBM_NEWDB   3		/* A writer.  Always create a new db. */
-#define  GDBM_FAST    0x10	/* Write fast! => No fsyncs.  OBSOLETE. */
-#define  GDBM_SYNC    0x20	/* Sync operations to the disk. */
-#define  GDBM_NOLOCK  0x40	/* Don't do file locking operations. */
-
-/* Parameters to gdbm_store for simple insertion or replacement in the
-   case that the key is already in the database. */
-#define  GDBM_INSERT  0		/* Never replace old data with new. */
-#define  GDBM_REPLACE 1		/* Always replace old data with new. */
-
-/* Parameters to gdbm_setopt, specifing the type of operation to perform. */
-#define  GDBM_CACHESIZE 1       /* Set the cache size. */
-#define  GDBM_FASTMODE  2       /* Toggle fast mode.  OBSOLETE. */
-#define  GDBM_SYNCMODE	3	/* Turn on or off sync operations. */
-#define  GDBM_CENTFREE  4	/* Keep all free blocks in the header. */
-#define  GDBM_COALESCEBLKS 5	/* Attempt to coalesce free blocks. */
-
-/* The data and key structure.  This structure is defined for compatibility. */
-typedef struct {
-	char *dptr;
-	int   dsize;
-      } datum;
-
-
-/* The file information header. This is good enough for most applications. */
-typedef struct {int dummy[10];} *GDBM_FILE;
-
-/* Determine if the C(++) compiler requires complete function prototype  */
-#ifndef __P
-#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
-#define __P(x) x
-#else
-#define __P(x) ()
-#endif
-#endif
-
-/* External variable, the gdbm build release string. */
-extern char *gdbm_version;	
-
-
-/* GDBM C++ support */
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-/* These are the routines! */
-
-extern GDBM_FILE gdbm_open __P((char *, int, int, int, void (*)()));
-extern void gdbm_close __P((GDBM_FILE));
-extern int gdbm_store __P((GDBM_FILE, datum, datum, int));
-extern datum gdbm_fetch __P((GDBM_FILE, datum));
-extern int gdbm_delete __P((GDBM_FILE, datum));
-extern datum gdbm_firstkey __P((GDBM_FILE));
-extern datum gdbm_nextkey __P((GDBM_FILE, datum));
-extern int gdbm_reorganize __P((GDBM_FILE));
-extern void gdbm_sync __P((GDBM_FILE));
-extern int gdbm_exists __P((GDBM_FILE, datum));
-extern int gdbm_setopt __P((GDBM_FILE, int, int *, int));
-extern int gdbm_fdesc __P((GDBM_FILE));
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#define	GDBM_NO_ERROR		0
-#define	GDBM_MALLOC_ERROR	1
-#define	GDBM_BLOCK_SIZE_ERROR	2
-#define	GDBM_FILE_OPEN_ERROR	3
-#define	GDBM_FILE_WRITE_ERROR	4
-#define	GDBM_FILE_SEEK_ERROR	5
-#define	GDBM_FILE_READ_ERROR	6
-#define	GDBM_BAD_MAGIC_NUMBER	7
-#define	GDBM_EMPTY_DATABASE	8
-#define	GDBM_CANT_BE_READER	9
-#define	GDBM_CANT_BE_WRITER	10
-#define	GDBM_READER_CANT_DELETE	11
-#define	GDBM_READER_CANT_STORE	12
-#define	GDBM_READER_CANT_REORGANIZE	13
-#define	GDBM_UNKNOWN_UPDATE	14
-#define	GDBM_ITEM_NOT_FOUND	15
-#define	GDBM_REORGANIZE_FAILED	16
-#define	GDBM_CANNOT_REPLACE	17
-#define	GDBM_ILLEGAL_DATA	18
-#define	GDBM_OPT_ALREADY_SET	19
-#define	GDBM_OPT_ILLEGAL	20
-typedef int gdbm_error;		/* For compatibilities sake. */
-extern gdbm_error gdbm_errno;
-
-/* extra prototypes */
-
-/* GDBM C++ support */
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-extern char *gdbm_strerror __P((gdbm_error));
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/getopt.h b/openflow/usr/include/getopt.h
deleted file mode 100644
index fab340a..0000000
--- a/openflow/usr/include/getopt.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GETOPT_H
-
-#ifndef __need_getopt
-# define _GETOPT_H 1
-#endif
-
-/* If __GNU_LIBRARY__ is not already defined, either we are being used
-   standalone, or this is the first header included in the source file.
-   If we are being used with glibc, we need to include <features.h>, but
-   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
-   not defined, include <ctype.h>, which will pull in <features.h> for us
-   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
-   doesn't flood the namespace with stuff the way some other headers do.)  */
-#if !defined __GNU_LIBRARY__
-# include <ctype.h>
-#endif
-
-#ifndef __THROW
-# ifndef __GNUC_PREREQ
-#  define __GNUC_PREREQ(maj, min) (0)
-# endif
-# if defined __cplusplus && __GNUC_PREREQ (2,8)
-#  define __THROW	throw ()
-# else
-#  define __THROW
-# endif
-#endif
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int optopt;
-
-#ifndef __need_getopt
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument		(or 0) if the option does not take an argument,
-   required_argument	(or 1) if the option requires an argument,
-   optional_argument 	(or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct option
-{
-  const char *name;
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-# define no_argument		0
-# define required_argument	1
-# define optional_argument	2
-#endif	/* need getopt */
-
-
-/* Get definitions and prototypes for functions to process the
-   arguments in ARGV (ARGC of them, minus the program name) for
-   options given in OPTS.
-
-   Return the option character from OPTS just read.  Return -1 when
-   there are no more options.  For unrecognized options, or options
-   missing arguments, `optopt' is set to the option letter, and '?' is
-   returned.
-
-   The OPTS string is a list of characters which are recognized option
-   letters, optionally followed by colons, specifying that that letter
-   takes an argument, to be placed in `optarg'.
-
-   If a letter in OPTS is followed by two colons, its argument is
-   optional.  This behavior is specific to the GNU `getopt'.
-
-   The argument `--' causes premature termination of argument
-   scanning, explicitly telling `getopt' that there are no more
-   options.
-
-   If OPTS begins with `--', then non-option arguments are treated as
-   arguments to the option '\0'.  This behavior is specific to the GNU
-   `getopt'.  */
-
-#ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
-       __THROW;
-
-# if defined __need_getopt && defined __USE_POSIX2 \
-  && !defined __USE_POSIX_IMPLICITLY && !defined __USE_GNU
-/* The GNU getopt has more functionality than the standard version.  The
-   additional functionality can be disable at runtime.  This redirection
-   helps to also do this at runtime.  */
-#  ifdef __REDIRECT
-  extern int __REDIRECT_NTH (getopt, (int ___argc, char *const *___argv,
-				      const char *__shortopts),
-			     __posix_getopt);
-#  else
-extern int __posix_getopt (int ___argc, char *const *___argv,
-			   const char *__shortopts) __THROW;
-#   define getopt __posix_getopt
-#  endif
-# endif
-#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-#endif /* __GNU_LIBRARY__ */
-
-#ifndef __need_getopt
-extern int getopt_long (int ___argc, char *const *___argv,
-			const char *__shortopts,
-		        const struct option *__longopts, int *__longind)
-       __THROW;
-extern int getopt_long_only (int ___argc, char *const *___argv,
-			     const char *__shortopts,
-		             const struct option *__longopts, int *__longind)
-       __THROW;
-
-#endif
-
-#ifdef	__cplusplus
-}
-#endif
-
-/* Make sure we later can get all the definitions and declarations.  */
-#undef __need_getopt
-
-#endif /* getopt.h */
diff --git a/openflow/usr/include/gettext-po.h b/openflow/usr/include/gettext-po.h
deleted file mode 100644
index 62898d5..0000000
--- a/openflow/usr/include/gettext-po.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/* Public API for GNU gettext PO files - contained in libgettextpo.
-   Copyright (C) 2003-2008, 2010, 2015 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GETTEXT_PO_H
-#define _GETTEXT_PO_H 1
-
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* =========================== Meta Information ============================ */
-
-/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBGETTEXTPO_VERSION 0x001307
-extern int libgettextpo_version;
-
-/* ================================= Types ================================= */
-
-/* A po_file_t represents the contents of a PO file.  */
-typedef struct po_file *po_file_t;
-
-/* A po_message_iterator_t represents an iterator through a domain of a
-   PO file.  */
-typedef struct po_message_iterator *po_message_iterator_t;
-
-/* A po_message_t represents a message in a PO file.  */
-typedef struct po_message *po_message_t;
-
-/* A po_filepos_t represents a string's position within a source file.  */
-typedef struct po_filepos *po_filepos_t;
-
-/* A po_error_handler handles error situations.  */
-struct po_error_handler
-{
-  /* Signal an error.  The error message is built from FORMAT and the following
-     arguments.  ERRNUM, if nonzero, is an errno value.
-     Must increment the error_message_count variable declared in error.h.
-     Must not return if STATUS is nonzero.  */
-  void (*error) (int status, int errnum,
-                 const char *format, ...)
-#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3) && !__STRICT_ANSI__
-  __attribute__ ((__format__ (__printf__, 3, 4)))
-#endif
-  ;
-
-  /* Signal an error.  The error message is built from FORMAT and the following
-     arguments.  The error location is at FILENAME line LINENO. ERRNUM, if
-     nonzero, is an errno value.
-     Must increment the error_message_count variable declared in error.h.
-     Must not return if STATUS is nonzero.  */
-  void (*error_at_line) (int status, int errnum,
-                         const char *filename, unsigned int lineno,
-                         const char *format, ...)
-#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3) && !__STRICT_ANSI__
-  __attribute__ ((__format__ (__printf__, 5, 6)))
-#endif
-  ;
-
-  /* Signal a multiline warning.  The PREFIX applies to all lines of the
-     MESSAGE.  Free the PREFIX and MESSAGE when done.  */
-  void (*multiline_warning) (char *prefix, char *message);
-
-  /* Signal a multiline error.  The PREFIX applies to all lines of the
-     MESSAGE.  Free the PREFIX and MESSAGE when done.
-     Must increment the error_message_count variable declared in error.h if
-     PREFIX is non-NULL.  */
-  void (*multiline_error) (char *prefix, char *message);
-};
-typedef const struct po_error_handler *po_error_handler_t;
-
-/* A po_xerror_handler handles warnings, error and fatal error situations.  */
-#define PO_SEVERITY_WARNING     0 /* just a warning, tell the user */
-#define PO_SEVERITY_ERROR       1 /* an error, the operation cannot complete */
-#define PO_SEVERITY_FATAL_ERROR 2 /* an error, the operation must be aborted */
-struct po_xerror_handler
-{
-  /* Signal a problem of the given severity.
-     MESSAGE and/or FILENAME + LINENO indicate where the problem occurred.
-     If FILENAME is NULL, FILENAME and LINENO and COLUMN should be ignored.
-     If LINENO is (size_t)(-1), LINENO and COLUMN should be ignored.
-     If COLUMN is (size_t)(-1), it should be ignored.
-     MESSAGE_TEXT is the problem description (if MULTILINE_P is true,
-     multiple lines of text, each terminated with a newline, otherwise
-     usually a single line).
-     Must not return if SEVERITY is PO_SEVERITY_FATAL_ERROR.  */
-  void (*xerror) (int severity,
-                  po_message_t message,
-                  const char *filename, size_t lineno, size_t column,
-                  int multiline_p, const char *message_text);
-  /* Signal a problem that refers to two messages.
-     Similar to two calls to xerror.
-     If possible, a "..." can be appended to MESSAGE_TEXT1 and prepended to
-     MESSAGE_TEXT2.  */
-  void (*xerror2) (int severity,
-                   po_message_t message1,
-                   const char *filename1, size_t lineno1, size_t column1,
-                   int multiline_p1, const char *message_text1,
-                   po_message_t message2,
-                   const char *filename2, size_t lineno2, size_t column2,
-                   int multiline_p2, const char *message_text2);
-};
-typedef const struct po_xerror_handler *po_xerror_handler_t;
-
-/* Memory allocation:
-   The memory allocations performed by these functions use xmalloc(),
-   therefore will cause a program exit if memory is exhausted.
-   The memory allocated by po_file_read, and implicitly returned through
-   the po_message_* functions, lasts until freed with po_file_free.  */
-
-
-/* ============================= po_file_t API ============================= */
-
-/* Create an empty PO file representation in memory.  */
-extern po_file_t po_file_create (void);
-
-/* Read a PO file into memory.
-   Return its contents.  Upon failure, return NULL and set errno.  */
-#define po_file_read po_file_read_v3
-extern po_file_t po_file_read (const char *filename,
-                               po_xerror_handler_t handler);
-
-/* Write an in-memory PO file to a file.
-   Upon failure, return NULL and set errno.  */
-#define po_file_write po_file_write_v2
-extern po_file_t po_file_write (po_file_t file, const char *filename,
-                                po_xerror_handler_t handler);
-
-/* Free a PO file from memory.  */
-extern void po_file_free (po_file_t file);
-
-/* Return the names of the domains covered by a PO file in memory.  */
-extern const char * const * po_file_domains (po_file_t file);
-
-
-/* =========================== Header entry API ============================ */
-
-/* Return the header entry of a domain of a PO file in memory.
-   The domain NULL denotes the default domain.
-   Return NULL if there is no header entry.  */
-extern const char * po_file_domain_header (po_file_t file, const char *domain);
-
-/* Return the value of a field in a header entry.
-   The return value is either a freshly allocated string, to be freed by the
-   caller, or NULL.  */
-extern char * po_header_field (const char *header, const char *field);
-
-/* Return the header entry with a given field set to a given value.  The field
-   is added if necessary.
-   The return value is a freshly allocated string.  */
-extern char * po_header_set_field (const char *header, const char *field, const char *value);
-
-
-/* ======================= po_message_iterator_t API ======================= */
-
-/* Create an iterator for traversing a domain of a PO file in memory.
-   The domain NULL denotes the default domain.  */
-extern po_message_iterator_t po_message_iterator (po_file_t file, const char *domain);
-
-/* Free an iterator.  */
-extern void po_message_iterator_free (po_message_iterator_t iterator);
-
-/* Return the next message, and advance the iterator.
-   Return NULL at the end of the message list.  */
-extern po_message_t po_next_message (po_message_iterator_t iterator);
-
-/* Insert a message in a PO file in memory, in the domain and at the position
-   indicated by the iterator.  The iterator thereby advances past the freshly
-   inserted message.  */
-extern void po_message_insert (po_message_iterator_t iterator, po_message_t message);
-
-
-/* =========================== po_message_t API ============================ */
-
-/* Return a freshly constructed message.
-   To finish initializing the message, you must set the msgid and msgstr.  */
-extern po_message_t po_message_create (void);
-
-/* Return the context of a message, or NULL for a message not restricted to a
-   context.  */
-extern const char * po_message_msgctxt (po_message_t message);
-
-/* Change the context of a message. NULL means a message not restricted to a
-   context.  */
-extern void po_message_set_msgctxt (po_message_t message, const char *msgctxt);
-
-/* Return the msgid (untranslated English string) of a message.  */
-extern const char * po_message_msgid (po_message_t message);
-
-/* Change the msgid (untranslated English string) of a message.  */
-extern void po_message_set_msgid (po_message_t message, const char *msgid);
-
-/* Return the msgid_plural (untranslated English plural string) of a message,
-   or NULL for a message without plural.  */
-extern const char * po_message_msgid_plural (po_message_t message);
-
-/* Change the msgid_plural (untranslated English plural string) of a message.
-   NULL means a message without plural.  */
-extern void po_message_set_msgid_plural (po_message_t message, const char *msgid_plural);
-
-/* Return the msgstr (translation) of a message.
-   Return the empty string for an untranslated message.  */
-extern const char * po_message_msgstr (po_message_t message);
-
-/* Change the msgstr (translation) of a message.
-   Use an empty string to denote an untranslated message.  */
-extern void po_message_set_msgstr (po_message_t message, const char *msgstr);
-
-/* Return the msgstr[index] for a message with plural handling, or
-   NULL when the index is out of range or for a message without plural.  */
-extern const char * po_message_msgstr_plural (po_message_t message, int index);
-
-/* Change the msgstr[index] for a message with plural handling.
-   Use a NULL value at the end to reduce the number of plural forms.  */
-extern void po_message_set_msgstr_plural (po_message_t message, int index, const char *msgstr);
-
-/* Return the comments for a message.  */
-extern const char * po_message_comments (po_message_t message);
-
-/* Change the comments for a message.
-   comments should be a multiline string, ending in a newline, or empty.  */
-extern void po_message_set_comments (po_message_t message, const char *comments);
-
-/* Return the extracted comments for a message.  */
-extern const char * po_message_extracted_comments (po_message_t message);
-
-/* Change the extracted comments for a message.
-   comments should be a multiline string, ending in a newline, or empty.  */
-extern void po_message_set_extracted_comments (po_message_t message, const char *comments);
-
-/* Return the i-th file position for a message, or NULL if i is out of
-   range.  */
-extern po_filepos_t po_message_filepos (po_message_t message, int i);
-
-/* Remove the i-th file position from a message.
-   The indices of all following file positions for the message are decremented
-   by one.  */
-extern void po_message_remove_filepos (po_message_t message, int i);
-
-/* Add a file position to a message, if it is not already present for the
-   message.
-   file is the file name.
-   start_line is the line number where the string starts, or (size_t)(-1) if no
-   line number is available.  */
-extern void po_message_add_filepos (po_message_t message, const char *file, size_t start_line);
-
-/* Return the previous context of a message, or NULL for none.  */
-extern const char * po_message_prev_msgctxt (po_message_t message);
-
-/* Change the previous context of a message.  NULL is allowed.  */
-extern void po_message_set_prev_msgctxt (po_message_t message, const char *prev_msgctxt);
-
-/* Return the previous msgid (untranslated English string) of a message, or
-   NULL for none.  */
-extern const char * po_message_prev_msgid (po_message_t message);
-
-/* Change the previous msgid (untranslated English string) of a message.
-   NULL is allowed.  */
-extern void po_message_set_prev_msgid (po_message_t message, const char *prev_msgid);
-
-/* Return the previous msgid_plural (untranslated English plural string) of a
-   message, or NULL for none.  */
-extern const char * po_message_prev_msgid_plural (po_message_t message);
-
-/* Change the previous msgid_plural (untranslated English plural string) of a
-   message.  NULL is allowed.  */
-extern void po_message_set_prev_msgid_plural (po_message_t message, const char *prev_msgid_plural);
-
-/* Return true if the message is marked obsolete.  */
-extern int po_message_is_obsolete (po_message_t message);
-
-/* Change the obsolete mark of a message.  */
-extern void po_message_set_obsolete (po_message_t message, int obsolete);
-
-/* Return true if the message is marked fuzzy.  */
-extern int po_message_is_fuzzy (po_message_t message);
-
-/* Change the fuzzy mark of a message.  */
-extern void po_message_set_fuzzy (po_message_t message, int fuzzy);
-
-/* Return true if the message is marked as being a format string of the given
-   type (e.g. "c-format").  */
-extern int po_message_is_format (po_message_t message, const char *format_type);
-
-/* Change the format string mark for a given type of a message.  */
-extern void po_message_set_format (po_message_t message, const char *format_type, /*bool*/int value);
-
-/* If a numeric range of a message is set, return true and store the minimum
-   and maximum value in *MINP and *MAXP.  */
-extern int po_message_is_range (po_message_t message, int *minp, int *maxp);
-
-/* Change the numeric range of a message.  MIN and MAX must be non-negative,
-   with MIN < MAX.  Use MIN = MAX = -1 to remove the numeric range of a
-   message.  */
-extern void po_message_set_range (po_message_t message, int min, int max);
-
-
-/* =========================== po_filepos_t API ============================ */
-
-/* Return the file name.  */
-extern const char * po_filepos_file (po_filepos_t filepos);
-
-/* Return the line number where the string starts, or (size_t)(-1) if no line
-   number is available.  */
-extern size_t po_filepos_start_line (po_filepos_t filepos);
-
-
-/* ============================ Format type API ============================= */
-
-/* Return a NULL terminated array of the supported format types.  */
-extern const char * const * po_format_list (void);
-
-/* Return the pretty name associated with a format type.
-   For example, for "csharp-format", return "C#".
-   Return NULL if the argument is not a supported format type.  */
-extern const char * po_format_pretty_name (const char *format_type);
-
-
-/* ============================= Checking API ============================== */
-
-/* Test whether an entire file PO file is valid, like msgfmt does it.
-   If it is invalid, pass the reasons to the handler.  */
-extern void po_file_check_all (po_file_t file, po_xerror_handler_t handler);
-
-/* Test a single message, to be inserted in a PO file in memory, like msgfmt
-   does it.  If it is invalid, pass the reasons to the handler.  The iterator
-   is not modified by this call; it only specifies the file and the domain.  */
-extern void po_message_check_all (po_message_t message, po_message_iterator_t iterator, po_xerror_handler_t handler);
-
-/* Test whether the message translation is a valid format string if the message
-   is marked as being a format string.  If it is invalid, pass the reasons to
-   the handler.  */
-#define po_message_check_format po_message_check_format_v2
-extern void po_message_check_format (po_message_t message, po_xerror_handler_t handler);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GETTEXT_PO_H */
diff --git a/openflow/usr/include/glob.h b/openflow/usr/include/glob.h
deleted file mode 100644
index e4548f6..0000000
--- a/openflow/usr/include/glob.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_GLOB_H
-#define	_GLOB_H	1
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-/* We need `size_t' for the following definitions.  */
-#ifndef __size_t
-typedef __SIZE_TYPE__ __size_t;
-# if defined __USE_XOPEN || __USE_XOPEN2K8
-typedef __SIZE_TYPE__ size_t;
-# endif
-#else
-/* The GNU CC stddef.h version defines __size_t as empty.  We need a real
-   definition.  */
-# undef __size_t
-# define __size_t size_t
-#endif
-
-/* Bits set in the FLAGS argument to `glob'.  */
-#define	GLOB_ERR	(1 << 0)/* Return on read errors.  */
-#define	GLOB_MARK	(1 << 1)/* Append a slash to each name.  */
-#define	GLOB_NOSORT	(1 << 2)/* Don't sort the names.  */
-#define	GLOB_DOOFFS	(1 << 3)/* Insert PGLOB->gl_offs NULLs.  */
-#define	GLOB_NOCHECK	(1 << 4)/* If nothing matches, return the pattern.  */
-#define	GLOB_APPEND	(1 << 5)/* Append to results of a previous call.  */
-#define	GLOB_NOESCAPE	(1 << 6)/* Backslashes don't quote metacharacters.  */
-#define	GLOB_PERIOD	(1 << 7)/* Leading `.' can be matched by metachars.  */
-
-#if !defined __USE_POSIX2 || defined __USE_MISC
-# define GLOB_MAGCHAR	 (1 << 8)/* Set in gl_flags if any metachars seen.  */
-# define GLOB_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions.  */
-# define GLOB_BRACE	 (1 << 10)/* Expand "{a,b}" to "a" "b".  */
-# define GLOB_NOMAGIC	 (1 << 11)/* If no magic chars, return the pattern.  */
-# define GLOB_TILDE	 (1 << 12)/* Expand ~user and ~ to home directories. */
-# define GLOB_ONLYDIR	 (1 << 13)/* Match only directories.  */
-# define GLOB_TILDE_CHECK (1 << 14)/* Like GLOB_TILDE but return an error
-				      if the user name is not available.  */
-# define __GLOB_FLAGS	(GLOB_ERR|GLOB_MARK|GLOB_NOSORT|GLOB_DOOFFS| \
-			 GLOB_NOESCAPE|GLOB_NOCHECK|GLOB_APPEND|     \
-			 GLOB_PERIOD|GLOB_ALTDIRFUNC|GLOB_BRACE|     \
-			 GLOB_NOMAGIC|GLOB_TILDE|GLOB_ONLYDIR|GLOB_TILDE_CHECK)
-#else
-# define __GLOB_FLAGS	(GLOB_ERR|GLOB_MARK|GLOB_NOSORT|GLOB_DOOFFS| \
-			 GLOB_NOESCAPE|GLOB_NOCHECK|GLOB_APPEND|     \
-			 GLOB_PERIOD)
-#endif
-
-/* Error returns from `glob'.  */
-#define	GLOB_NOSPACE	1	/* Ran out of memory.  */
-#define	GLOB_ABORTED	2	/* Read error.  */
-#define	GLOB_NOMATCH	3	/* No matches found.  */
-#define GLOB_NOSYS	4	/* Not implemented.  */
-#ifdef __USE_GNU
-/* Previous versions of this file defined GLOB_ABEND instead of
-   GLOB_ABORTED.  Provide a compatibility definition here.  */
-# define GLOB_ABEND GLOB_ABORTED
-#endif
-
-/* Structure describing a globbing run.  */
-#ifdef __USE_GNU
-struct stat;
-#endif
-typedef struct
-  {
-    __size_t gl_pathc;		/* Count of paths matched by the pattern.  */
-    char **gl_pathv;		/* List of matched pathnames.  */
-    __size_t gl_offs;		/* Slots to reserve in `gl_pathv'.  */
-    int gl_flags;		/* Set to FLAGS, maybe | GLOB_MAGCHAR.  */
-
-    /* If the GLOB_ALTDIRFUNC flag is set, the following functions
-       are used instead of the normal file access functions.  */
-    void (*gl_closedir) (void *);
-#ifdef __USE_GNU
-    struct dirent *(*gl_readdir) (void *);
-#else
-    void *(*gl_readdir) (void *);
-#endif
-    void *(*gl_opendir) (const char *);
-#ifdef __USE_GNU
-    int (*gl_lstat) (const char *__restrict, struct stat *__restrict);
-    int (*gl_stat) (const char *__restrict, struct stat *__restrict);
-#else
-    int (*gl_lstat) (const char *__restrict, void *__restrict);
-    int (*gl_stat) (const char *__restrict, void *__restrict);
-#endif
-  } glob_t;
-
-#ifdef __USE_LARGEFILE64
-# ifdef __USE_GNU
-struct stat64;
-# endif
-typedef struct
-  {
-    __size_t gl_pathc;
-    char **gl_pathv;
-    __size_t gl_offs;
-    int gl_flags;
-
-    /* If the GLOB_ALTDIRFUNC flag is set, the following functions
-       are used instead of the normal file access functions.  */
-    void (*gl_closedir) (void *);
-# ifdef __USE_GNU
-    struct dirent64 *(*gl_readdir) (void *);
-# else
-    void *(*gl_readdir) (void *);
-# endif
-    void *(*gl_opendir) (const char *);
-# ifdef __USE_GNU
-    int (*gl_lstat) (const char *__restrict, struct stat64 *__restrict);
-    int (*gl_stat) (const char *__restrict, struct stat64 *__restrict);
-# else
-    int (*gl_lstat) (const char *__restrict, void *__restrict);
-    int (*gl_stat) (const char *__restrict, void *__restrict);
-# endif
-  } glob64_t;
-#endif
-
-/* Do glob searching for PATTERN, placing results in PGLOB.
-   The bits defined above may be set in FLAGS.
-   If a directory cannot be opened or read and ERRFUNC is not nil,
-   it is called with the pathname that caused the error, and the
-   `errno' value from the failing call; if it returns non-zero
-   `glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
-   If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
-   Otherwise, `glob' returns zero.  */
-#if !defined __USE_FILE_OFFSET64
-extern int glob (const char *__restrict __pattern, int __flags,
-		 int (*__errfunc) (const char *, int),
-		 glob_t *__restrict __pglob) __THROW;
-
-/* Free storage allocated in PGLOB by a previous `glob' call.  */
-extern void globfree (glob_t *__pglob) __THROW;
-#else
-extern int __REDIRECT_NTH (glob, (const char *__restrict __pattern,
-				  int __flags,
-				  int (*__errfunc) (const char *, int),
-				  glob_t *__restrict __pglob), glob64);
-
-extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64);
-#endif
-
-#ifdef __USE_LARGEFILE64
-extern int glob64 (const char *__restrict __pattern, int __flags,
-		   int (*__errfunc) (const char *, int),
-		   glob64_t *__restrict __pglob) __THROW;
-
-extern void globfree64 (glob64_t *__pglob) __THROW;
-#endif
-
-
-#ifdef __USE_GNU
-/* Return nonzero if PATTERN contains any metacharacters.
-   Metacharacters can be quoted with backslashes if QUOTE is nonzero.
-
-   This function is not part of the interface specified by POSIX.2
-   but several programs want to use it.  */
-extern int glob_pattern_p (const char *__pattern, int __quote) __THROW;
-#endif
-
-__END_DECLS
-
-#endif /* glob.h  */
diff --git a/openflow/usr/include/gnu-versions.h b/openflow/usr/include/gnu-versions.h
deleted file mode 100644
index 141a711..0000000
--- a/openflow/usr/include/gnu-versions.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Header with interface version macros for library pieces copied elsewhere.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GNU_VERSIONS_H
-#define	_GNU_VERSIONS_H	1
-
-/* This file exists to define these few macros.  Each specifies a version
-   number associated with the library interface of a piece of the C library
-   which is also distributed with other GNU packages.  These pieces are
-   both part of the GNU C library and also distributed with other GNU
-   packages so those packages may use their facilities on systems lacking
-   the GNU C library.  The source files for each piece surround all their
-   code with `#ifndef ELIDE_CODE' after defining it with this:
-
-   #define OBSTACK_INTERFACE_VERSION 1
-   #if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
-   #include <gnu-versions.h>
-   #if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
-   #define ELIDE_CODE
-   #endif
-   #endif
-
-   This allows those one to avoid compiling those files when part of a GNU
-   package not libc, on a system using a GNU C library that supports the
-   same interface.
-
-   Please preserve the format of the comments after each macro.  And
-   remember, if any of these versions change, the libc.so major version
-   number must change too (so avoid it)!  */
-
-#define _GNU_OBSTACK_INTERFACE_VERSION	1 /* vs malloc/obstack.c */
-#define _GNU_REGEX_INTERFACE_VERSION	1 /* vs posix/regex.c */
-#define _GNU_GLOB_INTERFACE_VERSION	1 /* vs posix/glob.c */
-#define _GNU_GETOPT_INTERFACE_VERSION	2 /* vs posix/getopt.c and
-					     posix/getopt1.c */
-
-#endif	/* gnu-versions.h */
diff --git a/openflow/usr/include/gnumake.h b/openflow/usr/include/gnumake.h
deleted file mode 100644
index fd0b3a4..0000000
--- a/openflow/usr/include/gnumake.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* External interfaces usable by dynamic objects loaded into GNU Make.
-   --THIS API IS A "TECHNOLOGY PREVIEW" ONLY.  IT IS NOT A STABLE INTERFACE--
-
-Copyright (C) 2013-2014 Free Software Foundation, Inc.
-This file is part of GNU Make.
-
-GNU Make is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation; either version 3 of the License, or (at your option) any later
-version.
-
-GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GNUMAKE_H_
-#define _GNUMAKE_H_
-
-/* Specify the location of elements read from makefiles.  */
-typedef struct
-  {
-    const char *filenm;
-    unsigned long lineno;
-  } gmk_floc;
-
-typedef char *(*gmk_func_ptr)(const char *nm, unsigned int argc, char **argv);
-
-#ifdef _WIN32
-# ifdef GMK_BUILDING_MAKE
-#  define GMK_EXPORT  __declspec(dllexport)
-# else
-#  define GMK_EXPORT  __declspec(dllimport)
-# endif
-#else
-# define GMK_EXPORT
-#endif
-
-/* Free memory returned by the gmk_expand() function.  */
-GMK_EXPORT void gmk_free (char *str);
-
-/* Allocate memory in GNU make's context.  */
-GMK_EXPORT char *gmk_alloc (unsigned int len);
-
-/* Run $(eval ...) on the provided string BUFFER.  */
-GMK_EXPORT void gmk_eval (const char *buffer, const gmk_floc *floc);
-
-/* Run GNU make expansion on the provided string STR.
-   Returns an allocated buffer that the caller must free with gmk_free().  */
-GMK_EXPORT char *gmk_expand (const char *str);
-
-/* Register a new GNU make function NAME (maximum of 255 chars long).
-   When the function is expanded in the makefile, FUNC will be invoked with
-   the appropriate arguments.
-
-   The return value of FUNC must be either NULL, in which case it expands to
-   the empty string, or a pointer to the result of the expansion in a string
-   created by gmk_alloc().  GNU make will free the memory when it's done.
-
-   MIN_ARGS is the minimum number of arguments the function requires.
-   MAX_ARGS is the maximum number of arguments (or 0 if there's no maximum).
-   MIN_ARGS and MAX_ARGS may not exceed 255.
-
-   The FLAGS value may be GMK_FUNC_DEFAULT, or one or more of the following
-   flags OR'd together:
-
-     GMK_FUNC_NOEXPAND: the arguments to the function will be not be expanded
-                        before FUNC is called.
-*/
-GMK_EXPORT void gmk_add_function (const char *name, gmk_func_ptr func,
-                                  unsigned int min_args, unsigned int max_args,
-                                  unsigned int flags);
-
-#define GMK_FUNC_DEFAULT    0x00
-#define GMK_FUNC_NOEXPAND   0x01
-
-#endif  /* _GNUMAKE_H_ */
diff --git a/openflow/usr/include/grp.h b/openflow/usr/include/grp.h
deleted file mode 100644
index e904ee2..0000000
--- a/openflow/usr/include/grp.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 9.2.1 Group Database Access	<grp.h>
- */
-
-#ifndef	_GRP_H
-#define	_GRP_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#include <bits/types.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-
-/* For the Single Unix specification we must define this type here.  */
-#if (defined __USE_XOPEN || defined __USE_XOPEN2K) && !defined __gid_t_defined
-typedef __gid_t gid_t;
-# define __gid_t_defined
-#endif
-
-/* The group structure.	 */
-struct group
-  {
-    char *gr_name;		/* Group name.	*/
-    char *gr_passwd;		/* Password.	*/
-    __gid_t gr_gid;		/* Group ID.	*/
-    char **gr_mem;		/* Member list.	*/
-  };
-
-
-#ifdef __USE_MISC
-# define __need_FILE
-# include <stdio.h>
-#endif
-
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-/* Rewind the group-file stream.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void setgrent (void);
-
-/* Close the group-file stream.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void endgrent (void);
-
-/* Read an entry from the group-file stream, opening it if necessary.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct group *getgrent (void);
-#endif
-
-#ifdef	__USE_MISC
-/* Read a group entry from STREAM.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct group *fgetgrent (FILE *__stream);
-#endif
-
-#ifdef __USE_GNU
-/* Write the given entry onto the given stream.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int putgrent (const struct group *__restrict __p,
-		     FILE *__restrict __f);
-#endif
-
-/* Search for an entry with a matching group ID.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct group *getgrgid (__gid_t __gid);
-
-/* Search for an entry with a matching group name.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct group *getgrnam (const char *__name);
-
-#ifdef __USE_POSIX
-
-# ifdef __USE_MISC
-/* Reasonable value for the buffer sized used in the reentrant
-   functions below.  But better use `sysconf'.  */
-#  define NSS_BUFLEN_GROUP	1024
-# endif
-
-/* Reentrant versions of some of the functions above.
-
-   PLEASE NOTE: the `getgrent_r' function is not (yet) standardized.
-   The interface may change in later versions of this library.  But
-   the interface is designed following the principals used for the
-   other reentrant functions so the chances are good this is what the
-   POSIX people would choose.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-
-# ifdef __USE_GNU
-extern int getgrent_r (struct group *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct group **__restrict __result);
-# endif
-
-/* Search for an entry with a matching group ID.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int getgrgid_r (__gid_t __gid, struct group *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct group **__restrict __result);
-
-/* Search for an entry with a matching group name.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int getgrnam_r (const char *__restrict __name,
-		       struct group *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct group **__restrict __result);
-
-# ifdef	__USE_MISC
-/* Read a group entry from STREAM.  This function is not standardized
-   an probably never will.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int fgetgrent_r (FILE *__restrict __stream,
-			struct group *__restrict __resultbuf,
-			char *__restrict __buffer, size_t __buflen,
-			struct group **__restrict __result);
-# endif
-
-#endif	/* POSIX or reentrant */
-
-
-#ifdef	__USE_MISC
-
-# define __need_size_t
-# include <stddef.h>
-
-/* Set the group set for the current user to GROUPS (N of them).  */
-extern int setgroups (size_t __n, const __gid_t *__groups) __THROW;
-
-/* Store at most *NGROUPS members of the group set for USER into
-   *GROUPS.  Also include GROUP.  The actual number of groups found is
-   returned in *NGROUPS.  Return -1 if the if *NGROUPS is too small.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int getgrouplist (const char *__user, __gid_t __group,
-			 __gid_t *__groups, int *__ngroups);
-
-/* Initialize the group set for the current user
-   by reading the group database and using all groups
-   of which USER is a member.  Also include GROUP.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int initgroups (const char *__user, __gid_t __group);
-
-#endif /* Use misc.  */
-
-__END_DECLS
-
-#endif /* grp.h  */
diff --git a/openflow/usr/include/gshadow.h b/openflow/usr/include/gshadow.h
deleted file mode 100644
index 2afd8bd..0000000
--- a/openflow/usr/include/gshadow.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Declaration of types and functions for shadow group suite.  */
-
-#ifndef _GSHADOW_H
-#define _GSHADOW_H	1
-
-#include <features.h>
-
-#include <paths.h>
-
-#define	__need_FILE
-#include <stdio.h>
-#define __need_size_t
-#include <stddef.h>
-
-/* Path to the user database files.  */
-#define	GSHADOW _PATH_GSHADOW
-
-
-__BEGIN_DECLS
-
-/* Structure of the group file.  */
-struct sgrp
-  {
-    char *sg_namp;		/* Group name.  */
-    char *sg_passwd;		/* Encrypted password.  */
-    char **sg_adm;		/* Group administrator list.  */
-    char **sg_mem;		/* Group member list.  */
-  };
-
-
-/* Open database for reading.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern void setsgent (void);
-
-/* Close database.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern void endsgent (void);
-
-/* Get next entry from database, perhaps after opening the file.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct sgrp *getsgent (void);
-
-/* Get shadow entry matching NAME.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct sgrp *getsgnam (const char *__name);
-
-/* Read shadow entry from STRING.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct sgrp *sgetsgent (const char *__string);
-
-/* Read next shadow entry from STREAM.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct sgrp *fgetsgent (FILE *__stream);
-
-/* Write line containing shadow password entry to stream.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int putsgent (const struct sgrp *__g, FILE *__stream);
-
-
-#ifdef __USE_MISC
-/* Reentrant versions of some of the functions above.
-
-   These functions are not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation they are cancellation points and
-   therefore not marked with __THROW.  */
-extern int getsgent_r (struct sgrp *__result_buf, char *__buffer,
-		       size_t __buflen, struct sgrp **__result);
-
-extern int getsgnam_r (const char *__name, struct sgrp *__result_buf,
-		       char *__buffer, size_t __buflen,
-		       struct sgrp **__result);
-
-extern int sgetsgent_r (const char *__string, struct sgrp *__result_buf,
-			char *__buffer, size_t __buflen,
-			struct sgrp **__result);
-
-extern int fgetsgent_r (FILE *__stream, struct sgrp *__result_buf,
-			char *__buffer, size_t __buflen,
-			struct sgrp **__result);
-#endif	/* misc */
-
-__END_DECLS
-
-#endif /* gshadow.h */
diff --git a/openflow/usr/include/iconv.h b/openflow/usr/include/iconv.h
deleted file mode 100644
index 0c95c98..0000000
--- a/openflow/usr/include/iconv.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ICONV_H
-#define _ICONV_H	1
-
-#include <features.h>
-#define __need_size_t
-#include <stddef.h>
-
-
-__BEGIN_DECLS
-
-/* Identifier for conversion method from one codeset to another.  */
-typedef void *iconv_t;
-
-
-/* Allocate descriptor for code conversion from codeset FROMCODE to
-   codeset TOCODE.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern iconv_t iconv_open (const char *__tocode, const char *__fromcode);
-
-/* Convert at most *INBYTESLEFT bytes from *INBUF according to the
-   code conversion algorithm specified by CD and place up to
-   *OUTBYTESLEFT bytes in buffer at *OUTBUF.  */
-extern size_t iconv (iconv_t __cd, char **__restrict __inbuf,
-		     size_t *__restrict __inbytesleft,
-		     char **__restrict __outbuf,
-		     size_t *__restrict __outbytesleft);
-
-/* Free resources allocated for descriptor CD for code conversion.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int iconv_close (iconv_t __cd);
-
-__END_DECLS
-
-#endif /* iconv.h */
diff --git a/openflow/usr/include/ifaddrs.h b/openflow/usr/include/ifaddrs.h
deleted file mode 100644
index cd8d209..0000000
--- a/openflow/usr/include/ifaddrs.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ifaddrs.h -- declarations for getting network interface addresses
-   Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _IFADDRS_H
-#define _IFADDRS_H	1
-
-#include <features.h>
-#include <sys/socket.h>
-
-__BEGIN_DECLS
-
-/* The `getifaddrs' function generates a linked list of these structures.
-   Each element of the list describes one network interface.  */
-struct ifaddrs
-{
-  struct ifaddrs *ifa_next;	/* Pointer to the next structure.  */
-
-  char *ifa_name;		/* Name of this network interface.  */
-  unsigned int ifa_flags;	/* Flags as from SIOCGIFFLAGS ioctl.  */
-
-  struct sockaddr *ifa_addr;	/* Network address of this interface.  */
-  struct sockaddr *ifa_netmask; /* Netmask of this interface.  */
-  union
-  {
-    /* At most one of the following two is valid.  If the IFF_BROADCAST
-       bit is set in `ifa_flags', then `ifa_broadaddr' is valid.  If the
-       IFF_POINTOPOINT bit is set, then `ifa_dstaddr' is valid.
-       It is never the case that both these bits are set at once.  */
-    struct sockaddr *ifu_broadaddr; /* Broadcast address of this interface. */
-    struct sockaddr *ifu_dstaddr; /* Point-to-point destination address.  */
-  } ifa_ifu;
-  /* These very same macros are defined by <net/if.h> for `struct ifaddr'.
-     So if they are defined already, the existing definitions will be fine.  */
-# ifndef ifa_broadaddr
-#  define ifa_broadaddr	ifa_ifu.ifu_broadaddr
-# endif
-# ifndef ifa_dstaddr
-#  define ifa_dstaddr	ifa_ifu.ifu_dstaddr
-# endif
-
-  void *ifa_data;		/* Address-specific data (may be unused).  */
-};
-
-
-/* Create a linked list of `struct ifaddrs' structures, one for each
-   network interface on the host machine.  If successful, store the
-   list in *IFAP and return 0.  On errors, return -1 and set `errno'.
-
-   The storage returned in *IFAP is allocated dynamically and can
-   only be properly freed by passing it to `freeifaddrs'.  */
-extern int getifaddrs (struct ifaddrs **__ifap) __THROW;
-
-/* Reclaim the storage allocated by a previous `getifaddrs' call.  */
-extern void freeifaddrs (struct ifaddrs *__ifa)  __THROW;
-
-__END_DECLS
-
-#endif /* ifaddrs.h */
diff --git a/openflow/usr/include/inttypes.h b/openflow/usr/include/inttypes.h
deleted file mode 100644
index 1207bf2..0000000
--- a/openflow/usr/include/inttypes.h
+++ /dev/null
@@ -1,434 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99: 7.8 Format conversion of integer types	<inttypes.h>
- */
-
-#ifndef _INTTYPES_H
-#define _INTTYPES_H	1
-
-#include <features.h>
-/* Get the type definitions.  */
-#include <stdint.h>
-
-/* Get a definition for wchar_t.  But we must not define wchar_t itself.  */
-#ifndef ____gwchar_t_defined
-# ifdef __cplusplus
-#  define __gwchar_t wchar_t
-# elif defined __WCHAR_TYPE__
-typedef __WCHAR_TYPE__ __gwchar_t;
-# else
-#  define __need_wchar_t
-#  include <stddef.h>
-typedef wchar_t __gwchar_t;
-# endif
-# define ____gwchar_t_defined	1
-#endif
-
-# if __WORDSIZE == 64
-#  define __PRI64_PREFIX	"l"
-#  define __PRIPTR_PREFIX	"l"
-# else
-#  define __PRI64_PREFIX	"ll"
-#  define __PRIPTR_PREFIX
-# endif
-
-/* Macros for printing format specifiers.  */
-
-/* Decimal notation.  */
-# define PRId8		"d"
-# define PRId16		"d"
-# define PRId32		"d"
-# define PRId64		__PRI64_PREFIX "d"
-
-# define PRIdLEAST8	"d"
-# define PRIdLEAST16	"d"
-# define PRIdLEAST32	"d"
-# define PRIdLEAST64	__PRI64_PREFIX "d"
-
-# define PRIdFAST8	"d"
-# define PRIdFAST16	__PRIPTR_PREFIX "d"
-# define PRIdFAST32	__PRIPTR_PREFIX "d"
-# define PRIdFAST64	__PRI64_PREFIX "d"
-
-
-# define PRIi8		"i"
-# define PRIi16		"i"
-# define PRIi32		"i"
-# define PRIi64		__PRI64_PREFIX "i"
-
-# define PRIiLEAST8	"i"
-# define PRIiLEAST16	"i"
-# define PRIiLEAST32	"i"
-# define PRIiLEAST64	__PRI64_PREFIX "i"
-
-# define PRIiFAST8	"i"
-# define PRIiFAST16	__PRIPTR_PREFIX "i"
-# define PRIiFAST32	__PRIPTR_PREFIX "i"
-# define PRIiFAST64	__PRI64_PREFIX "i"
-
-/* Octal notation.  */
-# define PRIo8		"o"
-# define PRIo16		"o"
-# define PRIo32		"o"
-# define PRIo64		__PRI64_PREFIX "o"
-
-# define PRIoLEAST8	"o"
-# define PRIoLEAST16	"o"
-# define PRIoLEAST32	"o"
-# define PRIoLEAST64	__PRI64_PREFIX "o"
-
-# define PRIoFAST8	"o"
-# define PRIoFAST16	__PRIPTR_PREFIX "o"
-# define PRIoFAST32	__PRIPTR_PREFIX "o"
-# define PRIoFAST64	__PRI64_PREFIX "o"
-
-/* Unsigned integers.  */
-# define PRIu8		"u"
-# define PRIu16		"u"
-# define PRIu32		"u"
-# define PRIu64		__PRI64_PREFIX "u"
-
-# define PRIuLEAST8	"u"
-# define PRIuLEAST16	"u"
-# define PRIuLEAST32	"u"
-# define PRIuLEAST64	__PRI64_PREFIX "u"
-
-# define PRIuFAST8	"u"
-# define PRIuFAST16	__PRIPTR_PREFIX "u"
-# define PRIuFAST32	__PRIPTR_PREFIX "u"
-# define PRIuFAST64	__PRI64_PREFIX "u"
-
-/* lowercase hexadecimal notation.  */
-# define PRIx8		"x"
-# define PRIx16		"x"
-# define PRIx32		"x"
-# define PRIx64		__PRI64_PREFIX "x"
-
-# define PRIxLEAST8	"x"
-# define PRIxLEAST16	"x"
-# define PRIxLEAST32	"x"
-# define PRIxLEAST64	__PRI64_PREFIX "x"
-
-# define PRIxFAST8	"x"
-# define PRIxFAST16	__PRIPTR_PREFIX "x"
-# define PRIxFAST32	__PRIPTR_PREFIX "x"
-# define PRIxFAST64	__PRI64_PREFIX "x"
-
-/* UPPERCASE hexadecimal notation.  */
-# define PRIX8		"X"
-# define PRIX16		"X"
-# define PRIX32		"X"
-# define PRIX64		__PRI64_PREFIX "X"
-
-# define PRIXLEAST8	"X"
-# define PRIXLEAST16	"X"
-# define PRIXLEAST32	"X"
-# define PRIXLEAST64	__PRI64_PREFIX "X"
-
-# define PRIXFAST8	"X"
-# define PRIXFAST16	__PRIPTR_PREFIX "X"
-# define PRIXFAST32	__PRIPTR_PREFIX "X"
-# define PRIXFAST64	__PRI64_PREFIX "X"
-
-
-/* Macros for printing `intmax_t' and `uintmax_t'.  */
-# define PRIdMAX	__PRI64_PREFIX "d"
-# define PRIiMAX	__PRI64_PREFIX "i"
-# define PRIoMAX	__PRI64_PREFIX "o"
-# define PRIuMAX	__PRI64_PREFIX "u"
-# define PRIxMAX	__PRI64_PREFIX "x"
-# define PRIXMAX	__PRI64_PREFIX "X"
-
-
-/* Macros for printing `intptr_t' and `uintptr_t'.  */
-# define PRIdPTR	__PRIPTR_PREFIX "d"
-# define PRIiPTR	__PRIPTR_PREFIX "i"
-# define PRIoPTR	__PRIPTR_PREFIX "o"
-# define PRIuPTR	__PRIPTR_PREFIX "u"
-# define PRIxPTR	__PRIPTR_PREFIX "x"
-# define PRIXPTR	__PRIPTR_PREFIX "X"
-
-
-/* Macros for scanning format specifiers.  */
-
-/* Signed decimal notation.  */
-# define SCNd8		"hhd"
-# define SCNd16		"hd"
-# define SCNd32		"d"
-# define SCNd64		__PRI64_PREFIX "d"
-
-# define SCNdLEAST8	"hhd"
-# define SCNdLEAST16	"hd"
-# define SCNdLEAST32	"d"
-# define SCNdLEAST64	__PRI64_PREFIX "d"
-
-# define SCNdFAST8	"hhd"
-# define SCNdFAST16	__PRIPTR_PREFIX "d"
-# define SCNdFAST32	__PRIPTR_PREFIX "d"
-# define SCNdFAST64	__PRI64_PREFIX "d"
-
-/* Signed decimal notation.  */
-# define SCNi8		"hhi"
-# define SCNi16		"hi"
-# define SCNi32		"i"
-# define SCNi64		__PRI64_PREFIX "i"
-
-# define SCNiLEAST8	"hhi"
-# define SCNiLEAST16	"hi"
-# define SCNiLEAST32	"i"
-# define SCNiLEAST64	__PRI64_PREFIX "i"
-
-# define SCNiFAST8	"hhi"
-# define SCNiFAST16	__PRIPTR_PREFIX "i"
-# define SCNiFAST32	__PRIPTR_PREFIX "i"
-# define SCNiFAST64	__PRI64_PREFIX "i"
-
-/* Unsigned decimal notation.  */
-# define SCNu8		"hhu"
-# define SCNu16		"hu"
-# define SCNu32		"u"
-# define SCNu64		__PRI64_PREFIX "u"
-
-# define SCNuLEAST8	"hhu"
-# define SCNuLEAST16	"hu"
-# define SCNuLEAST32	"u"
-# define SCNuLEAST64	__PRI64_PREFIX "u"
-
-# define SCNuFAST8	"hhu"
-# define SCNuFAST16	__PRIPTR_PREFIX "u"
-# define SCNuFAST32	__PRIPTR_PREFIX "u"
-# define SCNuFAST64	__PRI64_PREFIX "u"
-
-/* Octal notation.  */
-# define SCNo8		"hho"
-# define SCNo16		"ho"
-# define SCNo32		"o"
-# define SCNo64		__PRI64_PREFIX "o"
-
-# define SCNoLEAST8	"hho"
-# define SCNoLEAST16	"ho"
-# define SCNoLEAST32	"o"
-# define SCNoLEAST64	__PRI64_PREFIX "o"
-
-# define SCNoFAST8	"hho"
-# define SCNoFAST16	__PRIPTR_PREFIX "o"
-# define SCNoFAST32	__PRIPTR_PREFIX "o"
-# define SCNoFAST64	__PRI64_PREFIX "o"
-
-/* Hexadecimal notation.  */
-# define SCNx8		"hhx"
-# define SCNx16		"hx"
-# define SCNx32		"x"
-# define SCNx64		__PRI64_PREFIX "x"
-
-# define SCNxLEAST8	"hhx"
-# define SCNxLEAST16	"hx"
-# define SCNxLEAST32	"x"
-# define SCNxLEAST64	__PRI64_PREFIX "x"
-
-# define SCNxFAST8	"hhx"
-# define SCNxFAST16	__PRIPTR_PREFIX "x"
-# define SCNxFAST32	__PRIPTR_PREFIX "x"
-# define SCNxFAST64	__PRI64_PREFIX "x"
-
-
-/* Macros for scanning `intmax_t' and `uintmax_t'.  */
-# define SCNdMAX	__PRI64_PREFIX "d"
-# define SCNiMAX	__PRI64_PREFIX "i"
-# define SCNoMAX	__PRI64_PREFIX "o"
-# define SCNuMAX	__PRI64_PREFIX "u"
-# define SCNxMAX	__PRI64_PREFIX "x"
-
-/* Macros for scaning `intptr_t' and `uintptr_t'.  */
-# define SCNdPTR	__PRIPTR_PREFIX "d"
-# define SCNiPTR	__PRIPTR_PREFIX "i"
-# define SCNoPTR	__PRIPTR_PREFIX "o"
-# define SCNuPTR	__PRIPTR_PREFIX "u"
-# define SCNxPTR	__PRIPTR_PREFIX "x"
-
-
-__BEGIN_DECLS
-
-#if __WORDSIZE == 64
-
-/* We have to define the `uintmax_t' type using `ldiv_t'.  */
-typedef struct
-  {
-    long int quot;		/* Quotient.  */
-    long int rem;		/* Remainder.  */
-  } imaxdiv_t;
-
-#else
-
-/* We have to define the `uintmax_t' type using `lldiv_t'.  */
-typedef struct
-  {
-    __extension__ long long int quot;	/* Quotient.  */
-    __extension__ long long int rem;	/* Remainder.  */
-  } imaxdiv_t;
-
-#endif
-
-
-/* Compute absolute value of N.  */
-extern intmax_t imaxabs (intmax_t __n) __THROW __attribute__ ((__const__));
-
-/* Return the `imaxdiv_t' representation of the value of NUMER over DENOM. */
-extern imaxdiv_t imaxdiv (intmax_t __numer, intmax_t __denom)
-      __THROW __attribute__ ((__const__));
-
-/* Like `strtol' but convert to `intmax_t'.  */
-extern intmax_t strtoimax (const char *__restrict __nptr,
-			   char **__restrict __endptr, int __base) __THROW;
-
-/* Like `strtoul' but convert to `uintmax_t'.  */
-extern uintmax_t strtoumax (const char *__restrict __nptr,
-			    char ** __restrict __endptr, int __base) __THROW;
-
-/* Like `wcstol' but convert to `intmax_t'.  */
-extern intmax_t wcstoimax (const __gwchar_t *__restrict __nptr,
-			   __gwchar_t **__restrict __endptr, int __base)
-     __THROW;
-
-/* Like `wcstoul' but convert to `uintmax_t'.  */
-extern uintmax_t wcstoumax (const __gwchar_t *__restrict __nptr,
-			    __gwchar_t ** __restrict __endptr, int __base)
-     __THROW;
-
-#ifdef __USE_EXTERN_INLINES
-
-# if __WORDSIZE == 64
-
-extern long int __strtol_internal (const char *__restrict __nptr,
-				   char **__restrict __endptr,
-				   int __base, int __group)
-  __THROW __nonnull ((1)) __wur;
-/* Like `strtol' but convert to `intmax_t'.  */
-__extern_inline intmax_t
-__NTH (strtoimax (const char *__restrict nptr, char **__restrict endptr,
-		  int base))
-{
-  return __strtol_internal (nptr, endptr, base, 0);
-}
-
-extern unsigned long int __strtoul_internal (const char *__restrict __nptr,
-					     char ** __restrict __endptr,
-					     int __base, int __group)
-  __THROW __nonnull ((1)) __wur;
-/* Like `strtoul' but convert to `uintmax_t'.  */
-__extern_inline uintmax_t
-__NTH (strtoumax (const char *__restrict nptr, char **__restrict endptr,
-		  int base))
-{
-  return __strtoul_internal (nptr, endptr, base, 0);
-}
-
-extern long int __wcstol_internal (const __gwchar_t * __restrict __nptr,
-				   __gwchar_t **__restrict __endptr,
-				   int __base, int __group)
-  __THROW __nonnull ((1)) __wur;
-/* Like `wcstol' but convert to `intmax_t'.  */
-__extern_inline intmax_t
-__NTH (wcstoimax (const __gwchar_t *__restrict nptr,
-		  __gwchar_t **__restrict endptr, int base))
-{
-  return __wcstol_internal (nptr, endptr, base, 0);
-}
-
-extern unsigned long int __wcstoul_internal (const __gwchar_t *
-					     __restrict __nptr,
-					     __gwchar_t **
-					     __restrict __endptr,
-					     int __base, int __group)
-  __THROW __nonnull ((1)) __wur;
-/* Like `wcstoul' but convert to `uintmax_t'.  */
-__extern_inline uintmax_t
-__NTH (wcstoumax (const __gwchar_t *__restrict nptr,
-		  __gwchar_t **__restrict endptr, int base))
-{
-  return __wcstoul_internal (nptr, endptr, base, 0);
-}
-
-# else /* __WORDSIZE == 32 */
-
-__extension__
-extern long long int __strtoll_internal (const char *__restrict __nptr,
-					 char **__restrict __endptr,
-					 int __base, int __group)
-  __THROW __nonnull ((1)) __wur;
-/* Like `strtol' but convert to `intmax_t'.  */
-__extern_inline intmax_t
-__NTH (strtoimax (const char *__restrict nptr, char **__restrict endptr,
-		  int base))
-{
-  return __strtoll_internal (nptr, endptr, base, 0);
-}
-
-__extension__
-extern unsigned long long int __strtoull_internal (const char *
-						   __restrict __nptr,
-						   char **
-						   __restrict __endptr,
-						   int __base,
-						   int __group)
-  __THROW __nonnull ((1)) __wur;
-/* Like `strtoul' but convert to `uintmax_t'.  */
-__extern_inline uintmax_t
-__NTH (strtoumax (const char *__restrict nptr, char **__restrict endptr,
-		  int base))
-{
-  return __strtoull_internal (nptr, endptr, base, 0);
-}
-
-__extension__
-extern long long int __wcstoll_internal (const __gwchar_t *__restrict __nptr,
-					 __gwchar_t **__restrict __endptr,
-					 int __base, int __group)
-  __THROW __nonnull ((1)) __wur;
-/* Like `wcstol' but convert to `intmax_t'.  */
-__extern_inline intmax_t
-__NTH (wcstoimax (const __gwchar_t *__restrict nptr,
-		  __gwchar_t **__restrict endptr, int base))
-{
-  return __wcstoll_internal (nptr, endptr, base, 0);
-}
-
-
-__extension__
-extern unsigned long long int __wcstoull_internal (const __gwchar_t *
-						   __restrict __nptr,
-						   __gwchar_t **
-						   __restrict __endptr,
-						   int __base,
-						   int __group)
-  __THROW __nonnull ((1)) __wur;
-/* Like `wcstoul' but convert to `uintmax_t'.  */
-__extern_inline uintmax_t
-__NTH (wcstoumax (const __gwchar_t *__restrict nptr,
-		  __gwchar_t **__restrict endptr, int base))
-{
-  return __wcstoull_internal (nptr, endptr, base, 0);
-}
-
-# endif	/* __WORDSIZE == 32	*/
-#endif	/* Use extern inlines.  */
-
-__END_DECLS
-
-#endif /* inttypes.h */
diff --git a/openflow/usr/include/langinfo.h b/openflow/usr/include/langinfo.h
deleted file mode 100644
index 481e226..0000000
--- a/openflow/usr/include/langinfo.h
+++ /dev/null
@@ -1,599 +0,0 @@
-/* Access to locale-dependent parameters.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _LANGINFO_H
-#define	_LANGINFO_H 1
-
-/* Get the type definition.  */
-#include <nl_types.h>
-
-#include <bits/locale.h>	/* Define the __LC_* category names.  */
-
-
-__BEGIN_DECLS
-
-/* Construct an `nl_item' value for `nl_langinfo' from a locale category
-   (LC_*) and an item index within the category.  Some code may depend on
-   the item values within a category increasing monotonically with the
-   indices.  */
-#define _NL_ITEM(category, index)	(((category) << 16) | (index))
-
-/* Extract the category and item index from a constructed `nl_item' value.  */
-#define _NL_ITEM_CATEGORY(item)		((int) (item) >> 16)
-#define _NL_ITEM_INDEX(item)		((int) (item) & 0xffff)
-
-/* Enumeration of locale items that can be queried with `nl_langinfo'.  */
-enum
-{
-  /* LC_TIME category: date and time formatting.  */
-
-  /* Abbreviated days of the week. */
-  ABDAY_1 = _NL_ITEM (__LC_TIME, 0), /* Sun */
-#define ABDAY_1			ABDAY_1
-  ABDAY_2,
-#define ABDAY_2			ABDAY_2
-  ABDAY_3,
-#define ABDAY_3			ABDAY_3
-  ABDAY_4,
-#define ABDAY_4			ABDAY_4
-  ABDAY_5,
-#define ABDAY_5			ABDAY_5
-  ABDAY_6,
-#define ABDAY_6			ABDAY_6
-  ABDAY_7,
-#define ABDAY_7			ABDAY_7
-
-  /* Long-named days of the week. */
-  DAY_1,			/* Sunday */
-#define DAY_1			DAY_1
-  DAY_2,			/* Monday */
-#define DAY_2			DAY_2
-  DAY_3,			/* Tuesday */
-#define DAY_3			DAY_3
-  DAY_4,			/* Wednesday */
-#define DAY_4			DAY_4
-  DAY_5,			/* Thursday */
-#define DAY_5			DAY_5
-  DAY_6,			/* Friday */
-#define DAY_6			DAY_6
-  DAY_7,			/* Saturday */
-#define DAY_7			DAY_7
-
-  /* Abbreviated month names.  */
-  ABMON_1,			/* Jan */
-#define ABMON_1			ABMON_1
-  ABMON_2,
-#define ABMON_2			ABMON_2
-  ABMON_3,
-#define ABMON_3			ABMON_3
-  ABMON_4,
-#define ABMON_4			ABMON_4
-  ABMON_5,
-#define ABMON_5			ABMON_5
-  ABMON_6,
-#define ABMON_6			ABMON_6
-  ABMON_7,
-#define ABMON_7			ABMON_7
-  ABMON_8,
-#define ABMON_8			ABMON_8
-  ABMON_9,
-#define ABMON_9			ABMON_9
-  ABMON_10,
-#define ABMON_10		ABMON_10
-  ABMON_11,
-#define ABMON_11		ABMON_11
-  ABMON_12,
-#define ABMON_12		ABMON_12
-
-  /* Long month names.  */
-  MON_1,			/* January */
-#define MON_1			MON_1
-  MON_2,
-#define MON_2			MON_2
-  MON_3,
-#define MON_3			MON_3
-  MON_4,
-#define MON_4			MON_4
-  MON_5,
-#define MON_5			MON_5
-  MON_6,
-#define MON_6			MON_6
-  MON_7,
-#define MON_7			MON_7
-  MON_8,
-#define MON_8			MON_8
-  MON_9,
-#define MON_9			MON_9
-  MON_10,
-#define MON_10			MON_10
-  MON_11,
-#define MON_11			MON_11
-  MON_12,
-#define MON_12			MON_12
-
-  AM_STR,			/* Ante meridiem string.  */
-#define AM_STR			AM_STR
-  PM_STR,			/* Post meridiem string.  */
-#define PM_STR			PM_STR
-
-  D_T_FMT,			/* Date and time format for strftime.  */
-#define D_T_FMT			D_T_FMT
-  D_FMT,			/* Date format for strftime.  */
-#define D_FMT			D_FMT
-  T_FMT,			/* Time format for strftime.  */
-#define T_FMT			T_FMT
-  T_FMT_AMPM,			/* 12-hour time format for strftime.  */
-#define T_FMT_AMPM		T_FMT_AMPM
-
-  ERA,				/* Alternate era.  */
-#define ERA			ERA
-  __ERA_YEAR,			/* Year in alternate era format.  */
-#ifdef __USE_GNU
-# define ERA_YEAR		__ERA_YEAR
-#endif
-  ERA_D_FMT,			/* Date in alternate era format.  */
-#define ERA_D_FMT		ERA_D_FMT
-  ALT_DIGITS,			/* Alternate symbols for digits.  */
-#define ALT_DIGITS		ALT_DIGITS
-  ERA_D_T_FMT,			/* Date and time in alternate era format.  */
-#define ERA_D_T_FMT		ERA_D_T_FMT
-  ERA_T_FMT,			/* Time in alternate era format.  */
-#define ERA_T_FMT		ERA_T_FMT
-
-  _NL_TIME_ERA_NUM_ENTRIES,	/* Number entries in the era arrays.  */
-  _NL_TIME_ERA_ENTRIES,		/* Structure with era entries in usable form.*/
-
-  _NL_WABDAY_1,		/* Sun */
-  _NL_WABDAY_2,
-  _NL_WABDAY_3,
-  _NL_WABDAY_4,
-  _NL_WABDAY_5,
-  _NL_WABDAY_6,
-  _NL_WABDAY_7,
-
-  /* Long-named days of the week. */
-  _NL_WDAY_1,		/* Sunday */
-  _NL_WDAY_2,		/* Monday */
-  _NL_WDAY_3,		/* Tuesday */
-  _NL_WDAY_4,		/* Wednesday */
-  _NL_WDAY_5,		/* Thursday */
-  _NL_WDAY_6,		/* Friday */
-  _NL_WDAY_7,		/* Saturday */
-
-  /* Abbreviated month names.  */
-  _NL_WABMON_1,		/* Jan */
-  _NL_WABMON_2,
-  _NL_WABMON_3,
-  _NL_WABMON_4,
-  _NL_WABMON_5,
-  _NL_WABMON_6,
-  _NL_WABMON_7,
-  _NL_WABMON_8,
-  _NL_WABMON_9,
-  _NL_WABMON_10,
-  _NL_WABMON_11,
-  _NL_WABMON_12,
-
-  /* Long month names.  */
-  _NL_WMON_1,		/* January */
-  _NL_WMON_2,
-  _NL_WMON_3,
-  _NL_WMON_4,
-  _NL_WMON_5,
-  _NL_WMON_6,
-  _NL_WMON_7,
-  _NL_WMON_8,
-  _NL_WMON_9,
-  _NL_WMON_10,
-  _NL_WMON_11,
-  _NL_WMON_12,
-
-  _NL_WAM_STR,		/* Ante meridiem string.  */
-  _NL_WPM_STR,		/* Post meridiem string.  */
-
-  _NL_WD_T_FMT,		/* Date and time format for strftime.  */
-  _NL_WD_FMT,		/* Date format for strftime.  */
-  _NL_WT_FMT,		/* Time format for strftime.  */
-  _NL_WT_FMT_AMPM,	/* 12-hour time format for strftime.  */
-
-  _NL_WERA_YEAR,	/* Year in alternate era format.  */
-  _NL_WERA_D_FMT,	/* Date in alternate era format.  */
-  _NL_WALT_DIGITS,	/* Alternate symbols for digits.  */
-  _NL_WERA_D_T_FMT,	/* Date and time in alternate era format.  */
-  _NL_WERA_T_FMT,	/* Time in alternate era format.  */
-
-  _NL_TIME_WEEK_NDAYS,
-  _NL_TIME_WEEK_1STDAY,
-  _NL_TIME_WEEK_1STWEEK,
-  _NL_TIME_FIRST_WEEKDAY,
-  _NL_TIME_FIRST_WORKDAY,
-  _NL_TIME_CAL_DIRECTION,
-  _NL_TIME_TIMEZONE,
-
-  _DATE_FMT,		/* strftime format for date.  */
-#define _DATE_FMT	_DATE_FMT
-  _NL_W_DATE_FMT,
-
-  _NL_TIME_CODESET,
-
-  _NL_NUM_LC_TIME,	/* Number of indices in LC_TIME category.  */
-
-  /* LC_COLLATE category: text sorting.
-     This information is accessed by the strcoll and strxfrm functions.
-     These `nl_langinfo' names are used only internally.  */
-  _NL_COLLATE_NRULES = _NL_ITEM (__LC_COLLATE, 0),
-  _NL_COLLATE_RULESETS,
-  _NL_COLLATE_TABLEMB,
-  _NL_COLLATE_WEIGHTMB,
-  _NL_COLLATE_EXTRAMB,
-  _NL_COLLATE_INDIRECTMB,
-  _NL_COLLATE_GAP1,
-  _NL_COLLATE_GAP2,
-  _NL_COLLATE_GAP3,
-  _NL_COLLATE_TABLEWC,
-  _NL_COLLATE_WEIGHTWC,
-  _NL_COLLATE_EXTRAWC,
-  _NL_COLLATE_INDIRECTWC,
-  _NL_COLLATE_SYMB_HASH_SIZEMB,
-  _NL_COLLATE_SYMB_TABLEMB,
-  _NL_COLLATE_SYMB_EXTRAMB,
-  _NL_COLLATE_COLLSEQMB,
-  _NL_COLLATE_COLLSEQWC,
-  _NL_COLLATE_CODESET,
-  _NL_NUM_LC_COLLATE,
-
-  /* LC_CTYPE category: character classification.
-     This information is accessed by the functions in <ctype.h>.
-     These `nl_langinfo' names are used only internally.  */
-  _NL_CTYPE_CLASS = _NL_ITEM (__LC_CTYPE, 0),
-  _NL_CTYPE_TOUPPER,
-  _NL_CTYPE_GAP1,
-  _NL_CTYPE_TOLOWER,
-  _NL_CTYPE_GAP2,
-  _NL_CTYPE_CLASS32,
-  _NL_CTYPE_GAP3,
-  _NL_CTYPE_GAP4,
-  _NL_CTYPE_GAP5,
-  _NL_CTYPE_GAP6,
-  _NL_CTYPE_CLASS_NAMES,
-  _NL_CTYPE_MAP_NAMES,
-  _NL_CTYPE_WIDTH,
-  _NL_CTYPE_MB_CUR_MAX,
-  _NL_CTYPE_CODESET_NAME,
-  CODESET = _NL_CTYPE_CODESET_NAME,
-#define CODESET			CODESET
-  _NL_CTYPE_TOUPPER32,
-  _NL_CTYPE_TOLOWER32,
-  _NL_CTYPE_CLASS_OFFSET,
-  _NL_CTYPE_MAP_OFFSET,
-  _NL_CTYPE_INDIGITS_MB_LEN,
-  _NL_CTYPE_INDIGITS0_MB,
-  _NL_CTYPE_INDIGITS1_MB,
-  _NL_CTYPE_INDIGITS2_MB,
-  _NL_CTYPE_INDIGITS3_MB,
-  _NL_CTYPE_INDIGITS4_MB,
-  _NL_CTYPE_INDIGITS5_MB,
-  _NL_CTYPE_INDIGITS6_MB,
-  _NL_CTYPE_INDIGITS7_MB,
-  _NL_CTYPE_INDIGITS8_MB,
-  _NL_CTYPE_INDIGITS9_MB,
-  _NL_CTYPE_INDIGITS_WC_LEN,
-  _NL_CTYPE_INDIGITS0_WC,
-  _NL_CTYPE_INDIGITS1_WC,
-  _NL_CTYPE_INDIGITS2_WC,
-  _NL_CTYPE_INDIGITS3_WC,
-  _NL_CTYPE_INDIGITS4_WC,
-  _NL_CTYPE_INDIGITS5_WC,
-  _NL_CTYPE_INDIGITS6_WC,
-  _NL_CTYPE_INDIGITS7_WC,
-  _NL_CTYPE_INDIGITS8_WC,
-  _NL_CTYPE_INDIGITS9_WC,
-  _NL_CTYPE_OUTDIGIT0_MB,
-  _NL_CTYPE_OUTDIGIT1_MB,
-  _NL_CTYPE_OUTDIGIT2_MB,
-  _NL_CTYPE_OUTDIGIT3_MB,
-  _NL_CTYPE_OUTDIGIT4_MB,
-  _NL_CTYPE_OUTDIGIT5_MB,
-  _NL_CTYPE_OUTDIGIT6_MB,
-  _NL_CTYPE_OUTDIGIT7_MB,
-  _NL_CTYPE_OUTDIGIT8_MB,
-  _NL_CTYPE_OUTDIGIT9_MB,
-  _NL_CTYPE_OUTDIGIT0_WC,
-  _NL_CTYPE_OUTDIGIT1_WC,
-  _NL_CTYPE_OUTDIGIT2_WC,
-  _NL_CTYPE_OUTDIGIT3_WC,
-  _NL_CTYPE_OUTDIGIT4_WC,
-  _NL_CTYPE_OUTDIGIT5_WC,
-  _NL_CTYPE_OUTDIGIT6_WC,
-  _NL_CTYPE_OUTDIGIT7_WC,
-  _NL_CTYPE_OUTDIGIT8_WC,
-  _NL_CTYPE_OUTDIGIT9_WC,
-  _NL_CTYPE_TRANSLIT_TAB_SIZE,
-  _NL_CTYPE_TRANSLIT_FROM_IDX,
-  _NL_CTYPE_TRANSLIT_FROM_TBL,
-  _NL_CTYPE_TRANSLIT_TO_IDX,
-  _NL_CTYPE_TRANSLIT_TO_TBL,
-  _NL_CTYPE_TRANSLIT_DEFAULT_MISSING_LEN,
-  _NL_CTYPE_TRANSLIT_DEFAULT_MISSING,
-  _NL_CTYPE_TRANSLIT_IGNORE_LEN,
-  _NL_CTYPE_TRANSLIT_IGNORE,
-  _NL_CTYPE_MAP_TO_NONASCII,
-  _NL_CTYPE_NONASCII_CASE,
-  _NL_CTYPE_EXTRA_MAP_1,
-  _NL_CTYPE_EXTRA_MAP_2,
-  _NL_CTYPE_EXTRA_MAP_3,
-  _NL_CTYPE_EXTRA_MAP_4,
-  _NL_CTYPE_EXTRA_MAP_5,
-  _NL_CTYPE_EXTRA_MAP_6,
-  _NL_CTYPE_EXTRA_MAP_7,
-  _NL_CTYPE_EXTRA_MAP_8,
-  _NL_CTYPE_EXTRA_MAP_9,
-  _NL_CTYPE_EXTRA_MAP_10,
-  _NL_CTYPE_EXTRA_MAP_11,
-  _NL_CTYPE_EXTRA_MAP_12,
-  _NL_CTYPE_EXTRA_MAP_13,
-  _NL_CTYPE_EXTRA_MAP_14,
-  _NL_NUM_LC_CTYPE,
-
-  /* LC_MONETARY category: formatting of monetary quantities.
-     These items each correspond to a member of `struct lconv',
-     defined in <locale.h>.  */
-  __INT_CURR_SYMBOL = _NL_ITEM (__LC_MONETARY, 0),
-#ifdef __USE_GNU
-# define INT_CURR_SYMBOL	__INT_CURR_SYMBOL
-#endif
-  __CURRENCY_SYMBOL,
-#ifdef __USE_GNU
-# define CURRENCY_SYMBOL	__CURRENCY_SYMBOL
-#endif
-  __MON_DECIMAL_POINT,
-#ifdef __USE_GNU
-# define MON_DECIMAL_POINT	__MON_DECIMAL_POINT
-#endif
-  __MON_THOUSANDS_SEP,
-#ifdef __USE_GNU
-# define MON_THOUSANDS_SEP	__MON_THOUSANDS_SEP
-#endif
-  __MON_GROUPING,
-#ifdef __USE_GNU
-# define MON_GROUPING		__MON_GROUPING
-#endif
-  __POSITIVE_SIGN,
-#ifdef __USE_GNU
-# define POSITIVE_SIGN		__POSITIVE_SIGN
-#endif
-  __NEGATIVE_SIGN,
-#ifdef __USE_GNU
-# define NEGATIVE_SIGN		__NEGATIVE_SIGN
-#endif
-  __INT_FRAC_DIGITS,
-#ifdef __USE_GNU
-# define INT_FRAC_DIGITS	__INT_FRAC_DIGITS
-#endif
-  __FRAC_DIGITS,
-#ifdef __USE_GNU
-# define FRAC_DIGITS		__FRAC_DIGITS
-#endif
-  __P_CS_PRECEDES,
-#ifdef __USE_GNU
-# define P_CS_PRECEDES		__P_CS_PRECEDES
-#endif
-  __P_SEP_BY_SPACE,
-#ifdef __USE_GNU
-# define P_SEP_BY_SPACE		__P_SEP_BY_SPACE
-#endif
-  __N_CS_PRECEDES,
-#ifdef __USE_GNU
-# define N_CS_PRECEDES		__N_CS_PRECEDES
-#endif
-  __N_SEP_BY_SPACE,
-#ifdef __USE_GNU
-# define N_SEP_BY_SPACE		__N_SEP_BY_SPACE
-#endif
-  __P_SIGN_POSN,
-#ifdef __USE_GNU
-# define P_SIGN_POSN		__P_SIGN_POSN
-#endif
-  __N_SIGN_POSN,
-#ifdef __USE_GNU
-# define N_SIGN_POSN		__N_SIGN_POSN
-#endif
-  _NL_MONETARY_CRNCYSTR,
-#define CRNCYSTR		_NL_MONETARY_CRNCYSTR
-  __INT_P_CS_PRECEDES,
-#ifdef __USE_GNU
-# define INT_P_CS_PRECEDES	__INT_P_CS_PRECEDES
-#endif
-  __INT_P_SEP_BY_SPACE,
-#ifdef __USE_GNU
-# define INT_P_SEP_BY_SPACE	__INT_P_SEP_BY_SPACE
-#endif
-  __INT_N_CS_PRECEDES,
-#ifdef __USE_GNU
-# define INT_N_CS_PRECEDES	__INT_N_CS_PRECEDES
-#endif
-  __INT_N_SEP_BY_SPACE,
-#ifdef __USE_GNU
-# define INT_N_SEP_BY_SPACE	__INT_N_SEP_BY_SPACE
-#endif
-  __INT_P_SIGN_POSN,
-#ifdef __USE_GNU
-# define INT_P_SIGN_POSN	__INT_P_SIGN_POSN
-#endif
-  __INT_N_SIGN_POSN,
-#ifdef __USE_GNU
-# define INT_N_SIGN_POSN	__INT_N_SIGN_POSN
-#endif
-  _NL_MONETARY_DUO_INT_CURR_SYMBOL,
-  _NL_MONETARY_DUO_CURRENCY_SYMBOL,
-  _NL_MONETARY_DUO_INT_FRAC_DIGITS,
-  _NL_MONETARY_DUO_FRAC_DIGITS,
-  _NL_MONETARY_DUO_P_CS_PRECEDES,
-  _NL_MONETARY_DUO_P_SEP_BY_SPACE,
-  _NL_MONETARY_DUO_N_CS_PRECEDES,
-  _NL_MONETARY_DUO_N_SEP_BY_SPACE,
-  _NL_MONETARY_DUO_INT_P_CS_PRECEDES,
-  _NL_MONETARY_DUO_INT_P_SEP_BY_SPACE,
-  _NL_MONETARY_DUO_INT_N_CS_PRECEDES,
-  _NL_MONETARY_DUO_INT_N_SEP_BY_SPACE,
-  _NL_MONETARY_DUO_P_SIGN_POSN,
-  _NL_MONETARY_DUO_N_SIGN_POSN,
-  _NL_MONETARY_DUO_INT_P_SIGN_POSN,
-  _NL_MONETARY_DUO_INT_N_SIGN_POSN,
-  _NL_MONETARY_UNO_VALID_FROM,
-  _NL_MONETARY_UNO_VALID_TO,
-  _NL_MONETARY_DUO_VALID_FROM,
-  _NL_MONETARY_DUO_VALID_TO,
-  _NL_MONETARY_CONVERSION_RATE,
-  _NL_MONETARY_DECIMAL_POINT_WC,
-  _NL_MONETARY_THOUSANDS_SEP_WC,
-  _NL_MONETARY_CODESET,
-  _NL_NUM_LC_MONETARY,
-
-  /* LC_NUMERIC category: formatting of numbers.
-     These also correspond to members of `struct lconv'; see <locale.h>.  */
-  __DECIMAL_POINT = _NL_ITEM (__LC_NUMERIC, 0),
-#ifdef __USE_GNU
-# define DECIMAL_POINT		__DECIMAL_POINT
-#endif
-  RADIXCHAR = __DECIMAL_POINT,
-#define RADIXCHAR		RADIXCHAR
-  __THOUSANDS_SEP,
-#ifdef __USE_GNU
-# define THOUSANDS_SEP		__THOUSANDS_SEP
-#endif
-  THOUSEP = __THOUSANDS_SEP,
-#define THOUSEP			THOUSEP
-  __GROUPING,
-#ifdef __USE_GNU
-# define GROUPING		__GROUPING
-#endif
-  _NL_NUMERIC_DECIMAL_POINT_WC,
-  _NL_NUMERIC_THOUSANDS_SEP_WC,
-  _NL_NUMERIC_CODESET,
-  _NL_NUM_LC_NUMERIC,
-
-  __YESEXPR = _NL_ITEM (__LC_MESSAGES, 0), /* Regex matching ``yes'' input.  */
-#define YESEXPR			__YESEXPR
-  __NOEXPR,			/* Regex matching ``no'' input.  */
-#define NOEXPR			__NOEXPR
-  __YESSTR,			/* Output string for ``yes''.  */
-#if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
-# define YESSTR			__YESSTR
-#endif
-  __NOSTR,			/* Output string for ``no''.  */
-#if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
-# define NOSTR			__NOSTR
-#endif
-  _NL_MESSAGES_CODESET,
-  _NL_NUM_LC_MESSAGES,
-
-  _NL_PAPER_HEIGHT = _NL_ITEM (__LC_PAPER, 0),
-  _NL_PAPER_WIDTH,
-  _NL_PAPER_CODESET,
-  _NL_NUM_LC_PAPER,
-
-  _NL_NAME_NAME_FMT = _NL_ITEM (__LC_NAME, 0),
-  _NL_NAME_NAME_GEN,
-  _NL_NAME_NAME_MR,
-  _NL_NAME_NAME_MRS,
-  _NL_NAME_NAME_MISS,
-  _NL_NAME_NAME_MS,
-  _NL_NAME_CODESET,
-  _NL_NUM_LC_NAME,
-
-  _NL_ADDRESS_POSTAL_FMT = _NL_ITEM (__LC_ADDRESS, 0),
-  _NL_ADDRESS_COUNTRY_NAME,
-  _NL_ADDRESS_COUNTRY_POST,
-  _NL_ADDRESS_COUNTRY_AB2,
-  _NL_ADDRESS_COUNTRY_AB3,
-  _NL_ADDRESS_COUNTRY_CAR,
-  _NL_ADDRESS_COUNTRY_NUM,
-  _NL_ADDRESS_COUNTRY_ISBN,
-  _NL_ADDRESS_LANG_NAME,
-  _NL_ADDRESS_LANG_AB,
-  _NL_ADDRESS_LANG_TERM,
-  _NL_ADDRESS_LANG_LIB,
-  _NL_ADDRESS_CODESET,
-  _NL_NUM_LC_ADDRESS,
-
-  _NL_TELEPHONE_TEL_INT_FMT = _NL_ITEM (__LC_TELEPHONE, 0),
-  _NL_TELEPHONE_TEL_DOM_FMT,
-  _NL_TELEPHONE_INT_SELECT,
-  _NL_TELEPHONE_INT_PREFIX,
-  _NL_TELEPHONE_CODESET,
-  _NL_NUM_LC_TELEPHONE,
-
-  _NL_MEASUREMENT_MEASUREMENT = _NL_ITEM (__LC_MEASUREMENT, 0),
-  _NL_MEASUREMENT_CODESET,
-  _NL_NUM_LC_MEASUREMENT,
-
-  _NL_IDENTIFICATION_TITLE = _NL_ITEM (__LC_IDENTIFICATION, 0),
-  _NL_IDENTIFICATION_SOURCE,
-  _NL_IDENTIFICATION_ADDRESS,
-  _NL_IDENTIFICATION_CONTACT,
-  _NL_IDENTIFICATION_EMAIL,
-  _NL_IDENTIFICATION_TEL,
-  _NL_IDENTIFICATION_FAX,
-  _NL_IDENTIFICATION_LANGUAGE,
-  _NL_IDENTIFICATION_TERRITORY,
-  _NL_IDENTIFICATION_AUDIENCE,
-  _NL_IDENTIFICATION_APPLICATION,
-  _NL_IDENTIFICATION_ABBREVIATION,
-  _NL_IDENTIFICATION_REVISION,
-  _NL_IDENTIFICATION_DATE,
-  _NL_IDENTIFICATION_CATEGORY,
-  _NL_IDENTIFICATION_CODESET,
-  _NL_NUM_LC_IDENTIFICATION,
-
-  /* This marks the highest value used.  */
-  _NL_NUM
-};
-
-/* This macro produces an item you can pass to `nl_langinfo' or
-   `nl_langinfo_l' to get the name of the locale in use for CATEGORY.  */
-#define _NL_LOCALE_NAME(category)	_NL_ITEM ((category),		      \
-						  _NL_ITEM_INDEX (-1))
-#ifdef __USE_GNU
-# define NL_LOCALE_NAME(category)	_NL_LOCALE_NAME (category)
-#endif
-
-
-/* Return the current locale's value for ITEM.
-   If ITEM is invalid, an empty string is returned.
-
-   The string returned will not change until `setlocale' is called;
-   it is usually in read-only memory and cannot be modified.  */
-
-extern char *nl_langinfo (nl_item __item) __THROW;
-
-
-#ifdef	__USE_XOPEN2K
-/* This interface is for the extended locale model.  See <locale.h> for
-   more information.  */
-
-/* Get locale datatype definition.  */
-# include <xlocale.h>
-
-/* Just like nl_langinfo but get the information from the locale object L.  */
-extern char *nl_langinfo_l (nl_item __item, __locale_t __l);
-#endif
-
-__END_DECLS
-
-#endif	/* langinfo.h */
diff --git a/openflow/usr/include/lastlog.h b/openflow/usr/include/lastlog.h
deleted file mode 100644
index 8cc4254..0000000
--- a/openflow/usr/include/lastlog.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* This header file is used in 4.3BSD to define `struct lastlog',
-   which we define in <bits/utmp.h>.  */
-
-#include <utmp.h>
diff --git a/openflow/usr/include/libgen.h b/openflow/usr/include/libgen.h
deleted file mode 100644
index 38f4d19..0000000
--- a/openflow/usr/include/libgen.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _LIBGEN_H
-#define _LIBGEN_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* Return directory part of PATH or "." if none is available.  */
-extern char *dirname (char *__path) __THROW;
-
-/* Return final component of PATH.
-
-   This is the weird XPG version of this function.  It sometimes will
-   modify its argument.  Therefore we normally use the GNU version (in
-   <string.h>) and only if this header is included make the XPG
-   version available under the real name.  */
-extern char *__xpg_basename (char *__path) __THROW;
-#define basename	__xpg_basename
-
-__END_DECLS
-
-#endif /* libgen.h */
diff --git a/openflow/usr/include/libintl.h b/openflow/usr/include/libintl.h
deleted file mode 100644
index bdb6b38..0000000
--- a/openflow/usr/include/libintl.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   This file is derived from the file libgettext.h in the GNU gettext package.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#include <features.h>
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Provide information about the supported file formats.  Returns the
-   maximum minor revision number supported for a given major revision.  */
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-  ((major) == 0 ? 1 : -1)
-
-__BEGIN_DECLS
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext (const char *__msgid)
-     __THROW __attribute_format_arg__ (1);
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext (const char *__domainname, const char *__msgid)
-     __THROW __attribute_format_arg__ (2);
-extern char *__dgettext (const char *__domainname, const char *__msgid)
-     __THROW __attribute_format_arg__ (2);
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext (const char *__domainname,
-			const char *__msgid, int __category)
-     __THROW __attribute_format_arg__ (2);
-extern char *__dcgettext (const char *__domainname,
-			  const char *__msgid, int __category)
-     __THROW __attribute_format_arg__ (2);
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-extern char *ngettext (const char *__msgid1, const char *__msgid2,
-		       unsigned long int __n)
-     __THROW __attribute_format_arg__ (1) __attribute_format_arg__ (2);
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dngettext (const char *__domainname, const char *__msgid1,
-			const char *__msgid2, unsigned long int __n)
-     __THROW __attribute_format_arg__ (2) __attribute_format_arg__ (3);
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dcngettext (const char *__domainname, const char *__msgid1,
-			 const char *__msgid2, unsigned long int __n,
-			 int __category)
-     __THROW __attribute_format_arg__ (2) __attribute_format_arg__ (3);
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain (const char *__domainname) __THROW;
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain (const char *__domainname,
-			     const char *__dirname) __THROW;
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-extern char *bind_textdomain_codeset (const char *__domainname,
-				      const char *__codeset) __THROW;
-
-
-/* Optimized version of the function above.  */
-#if defined __OPTIMIZE__ && !defined __cplusplus
-
-/* We need NULL for `gettext'.  */
-# define __need_NULL
-# include <stddef.h>
-
-/* We need LC_MESSAGES for `dgettext'.  */
-# include <locale.h>
-
-/* These must be macros.  Inlined functions are useless because the
-   `__builtin_constant_p' predicate in dcgettext would always return
-   false.  */
-
-# define gettext(msgid) dgettext (NULL, msgid)
-
-# define dgettext(domainname, msgid) \
-  dcgettext (domainname, msgid, LC_MESSAGES)
-
-# define ngettext(msgid1, msgid2, n) dngettext (NULL, msgid1, msgid2, n)
-
-# define dngettext(domainname, msgid1, msgid2, n) \
-  dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES)
-
-#endif	/* Optimizing.  */
-
-__END_DECLS
-
-#endif /* libintl.h */
diff --git a/openflow/usr/include/libio.h b/openflow/usr/include/libio.h
deleted file mode 100644
index efd09f1..0000000
--- a/openflow/usr/include/libio.h
+++ /dev/null
@@ -1,524 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Per Bothner <bothner@cygnus.com>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.
-
-   As a special exception, if you link the code in this file with
-   files compiled with a GNU compiler to produce an executable,
-   that does not cause the resulting executable to be covered by
-   the GNU Lesser General Public License.  This exception does not
-   however invalidate any other reasons why the executable file
-   might be covered by the GNU Lesser General Public License.
-   This exception applies to code released by its copyright holders
-   in files containing the exception.  */
-
-#ifndef _IO_STDIO_H
-#define _IO_STDIO_H
-
-#include <_G_config.h>
-/* ALL of these should be defined in _G_config.h */
-#define _IO_fpos_t _G_fpos_t
-#define _IO_fpos64_t _G_fpos64_t
-#define _IO_size_t size_t
-#define _IO_ssize_t __ssize_t
-#define _IO_off_t __off_t
-#define _IO_off64_t __off64_t
-#define _IO_pid_t __pid_t
-#define _IO_uid_t __uid_t
-#define _IO_iconv_t _G_iconv_t
-#define _IO_HAVE_ST_BLKSIZE _G_HAVE_ST_BLKSIZE
-#define _IO_BUFSIZ _G_BUFSIZ
-#define _IO_va_list _G_va_list
-#define _IO_wint_t wint_t
-
-/* This define avoids name pollution if we're using GNU stdarg.h */
-#define __need___va_list
-#include <stdarg.h>
-#ifdef __GNUC_VA_LIST
-# undef _IO_va_list
-# define _IO_va_list __gnuc_va_list
-#endif /* __GNUC_VA_LIST */
-
-#ifndef __P
-# include <sys/cdefs.h>
-#endif /*!__P*/
-
-#define _IO_UNIFIED_JUMPTABLES 1
-
-#ifndef EOF
-# define EOF (-1)
-#endif
-#ifndef NULL
-# if defined __GNUG__ && \
-    (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8))
-#  define NULL (__null)
-# else
-#  if !defined(__cplusplus)
-#   define NULL ((void*)0)
-#  else
-#   define NULL (0)
-#  endif
-# endif
-#endif
-
-#define _IOS_INPUT	1
-#define _IOS_OUTPUT	2
-#define _IOS_ATEND	4
-#define _IOS_APPEND	8
-#define _IOS_TRUNC	16
-#define _IOS_NOCREATE	32
-#define _IOS_NOREPLACE	64
-#define _IOS_BIN	128
-
-/* Magic numbers and bits for the _flags field.
-   The magic numbers use the high-order bits of _flags;
-   the remaining bits are available for variable flags.
-   Note: The magic numbers must all be negative if stdio
-   emulation is desired. */
-
-#define _IO_MAGIC 0xFBAD0000 /* Magic number */
-#define _OLD_STDIO_MAGIC 0xFABC0000 /* Emulate old stdio. */
-#define _IO_MAGIC_MASK 0xFFFF0000
-#define _IO_USER_BUF 1 /* User owns buffer; don't delete it on close. */
-#define _IO_UNBUFFERED 2
-#define _IO_NO_READS 4 /* Reading not allowed */
-#define _IO_NO_WRITES 8 /* Writing not allowd */
-#define _IO_EOF_SEEN 0x10
-#define _IO_ERR_SEEN 0x20
-#define _IO_DELETE_DONT_CLOSE 0x40 /* Don't call close(_fileno) on cleanup. */
-#define _IO_LINKED 0x80 /* Set if linked (using _chain) to streambuf::_list_all.*/
-#define _IO_IN_BACKUP 0x100
-#define _IO_LINE_BUF 0x200
-#define _IO_TIED_PUT_GET 0x400 /* Set if put and get pointer logicly tied. */
-#define _IO_CURRENTLY_PUTTING 0x800
-#define _IO_IS_APPENDING 0x1000
-#define _IO_IS_FILEBUF 0x2000
-#define _IO_BAD_SEEN 0x4000
-#define _IO_USER_LOCK 0x8000
-
-#define _IO_FLAGS2_MMAP 1
-#define _IO_FLAGS2_NOTCANCEL 2
-#ifdef _LIBC
-# define _IO_FLAGS2_FORTIFY 4
-#endif
-#define _IO_FLAGS2_USER_WBUF 8
-#ifdef _LIBC
-# define _IO_FLAGS2_SCANF_STD 16
-# define _IO_FLAGS2_NOCLOSE 32
-# define _IO_FLAGS2_CLOEXEC 64
-#endif
-
-/* These are "formatting flags" matching the iostream fmtflags enum values. */
-#define _IO_SKIPWS 01
-#define _IO_LEFT 02
-#define _IO_RIGHT 04
-#define _IO_INTERNAL 010
-#define _IO_DEC 020
-#define _IO_OCT 040
-#define _IO_HEX 0100
-#define _IO_SHOWBASE 0200
-#define _IO_SHOWPOINT 0400
-#define _IO_UPPERCASE 01000
-#define _IO_SHOWPOS 02000
-#define _IO_SCIENTIFIC 04000
-#define _IO_FIXED 010000
-#define _IO_UNITBUF 020000
-#define _IO_STDIO 040000
-#define _IO_DONT_CLOSE 0100000
-#define _IO_BOOLALPHA 0200000
-
-
-struct _IO_jump_t;  struct _IO_FILE;
-
-/* Handle lock.  */
-#ifdef _IO_MTSAFE_IO
-/* _IO_lock_t defined in internal headers during the glibc build.  */
-#else
-typedef void _IO_lock_t;
-#endif
-
-
-/* A streammarker remembers a position in a buffer. */
-
-struct _IO_marker {
-  struct _IO_marker *_next;
-  struct _IO_FILE *_sbuf;
-  /* If _pos >= 0
- it points to _buf->Gbase()+_pos. FIXME comment */
-  /* if _pos < 0, it points to _buf->eBptr()+_pos. FIXME comment */
-  int _pos;
-#if 0
-    void set_streampos(streampos sp) { _spos = sp; }
-    void set_offset(int offset) { _pos = offset; _spos = (streampos)(-2); }
-  public:
-    streammarker(streambuf *sb);
-    ~streammarker();
-    int saving() { return  _spos == -2; }
-    int delta(streammarker&);
-    int delta();
-#endif
-};
-
-/* This is the structure from the libstdc++ codecvt class.  */
-enum __codecvt_result
-{
-  __codecvt_ok,
-  __codecvt_partial,
-  __codecvt_error,
-  __codecvt_noconv
-};
-
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-/* The order of the elements in the following struct must match the order
-   of the virtual functions in the libstdc++ codecvt class.  */
-struct _IO_codecvt
-{
-  void (*__codecvt_destr) (struct _IO_codecvt *);
-  enum __codecvt_result (*__codecvt_do_out) (struct _IO_codecvt *,
-					     __mbstate_t *,
-					     const wchar_t *,
-					     const wchar_t *,
-					     const wchar_t **, char *,
-					     char *, char **);
-  enum __codecvt_result (*__codecvt_do_unshift) (struct _IO_codecvt *,
-						 __mbstate_t *, char *,
-						 char *, char **);
-  enum __codecvt_result (*__codecvt_do_in) (struct _IO_codecvt *,
-					    __mbstate_t *,
-					    const char *, const char *,
-					    const char **, wchar_t *,
-					    wchar_t *, wchar_t **);
-  int (*__codecvt_do_encoding) (struct _IO_codecvt *);
-  int (*__codecvt_do_always_noconv) (struct _IO_codecvt *);
-  int (*__codecvt_do_length) (struct _IO_codecvt *, __mbstate_t *,
-			      const char *, const char *, _IO_size_t);
-  int (*__codecvt_do_max_length) (struct _IO_codecvt *);
-
-  _IO_iconv_t __cd_in;
-  _IO_iconv_t __cd_out;
-};
-
-/* Extra data for wide character streams.  */
-struct _IO_wide_data
-{
-  wchar_t *_IO_read_ptr;	/* Current read pointer */
-  wchar_t *_IO_read_end;	/* End of get area. */
-  wchar_t *_IO_read_base;	/* Start of putback+get area. */
-  wchar_t *_IO_write_base;	/* Start of put area. */
-  wchar_t *_IO_write_ptr;	/* Current put pointer. */
-  wchar_t *_IO_write_end;	/* End of put area. */
-  wchar_t *_IO_buf_base;	/* Start of reserve area. */
-  wchar_t *_IO_buf_end;		/* End of reserve area. */
-  /* The following fields are used to support backing up and undo. */
-  wchar_t *_IO_save_base;	/* Pointer to start of non-current get area. */
-  wchar_t *_IO_backup_base;	/* Pointer to first valid character of
-				   backup area */
-  wchar_t *_IO_save_end;	/* Pointer to end of non-current get area. */
-
-  __mbstate_t _IO_state;
-  __mbstate_t _IO_last_state;
-  struct _IO_codecvt _codecvt;
-
-  wchar_t _shortbuf[1];
-
-  const struct _IO_jump_t *_wide_vtable;
-};
-#endif
-
-struct _IO_FILE {
-  int _flags;		/* High-order word is _IO_MAGIC; rest is flags. */
-#define _IO_file_flags _flags
-
-  /* The following pointers correspond to the C++ streambuf protocol. */
-  /* Note:  Tk uses the _IO_read_ptr and _IO_read_end fields directly. */
-  char* _IO_read_ptr;	/* Current read pointer */
-  char* _IO_read_end;	/* End of get area. */
-  char* _IO_read_base;	/* Start of putback+get area. */
-  char* _IO_write_base;	/* Start of put area. */
-  char* _IO_write_ptr;	/* Current put pointer. */
-  char* _IO_write_end;	/* End of put area. */
-  char* _IO_buf_base;	/* Start of reserve area. */
-  char* _IO_buf_end;	/* End of reserve area. */
-  /* The following fields are used to support backing up and undo. */
-  char *_IO_save_base; /* Pointer to start of non-current get area. */
-  char *_IO_backup_base;  /* Pointer to first valid character of backup area */
-  char *_IO_save_end; /* Pointer to end of non-current get area. */
-
-  struct _IO_marker *_markers;
-
-  struct _IO_FILE *_chain;
-
-  int _fileno;
-#if 0
-  int _blksize;
-#else
-  int _flags2;
-#endif
-  _IO_off_t _old_offset; /* This used to be _offset but it's too small.  */
-
-#define __HAVE_COLUMN /* temporary */
-  /* 1+column number of pbase(); 0 is unknown. */
-  unsigned short _cur_column;
-  signed char _vtable_offset;
-  char _shortbuf[1];
-
-  /*  char* _save_gptr;  char* _save_egptr; */
-
-  _IO_lock_t *_lock;
-#ifdef _IO_USE_OLD_IO_FILE
-};
-
-struct _IO_FILE_complete
-{
-  struct _IO_FILE _file;
-#endif
-#if defined _G_IO_IO_FILE_VERSION && _G_IO_IO_FILE_VERSION == 0x20001
-  _IO_off64_t _offset;
-# if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-  /* Wide character stream stuff.  */
-  struct _IO_codecvt *_codecvt;
-  struct _IO_wide_data *_wide_data;
-  struct _IO_FILE *_freeres_list;
-  void *_freeres_buf;
-# else
-  void *__pad1;
-  void *__pad2;
-  void *__pad3;
-  void *__pad4;
-# endif
-  size_t __pad5;
-  int _mode;
-  /* Make sure we don't get into trouble again.  */
-  char _unused2[15 * sizeof (int) - 4 * sizeof (void *) - sizeof (size_t)];
-#endif
-};
-
-#ifndef __cplusplus
-typedef struct _IO_FILE _IO_FILE;
-#endif
-
-struct _IO_FILE_plus;
-
-extern struct _IO_FILE_plus _IO_2_1_stdin_;
-extern struct _IO_FILE_plus _IO_2_1_stdout_;
-extern struct _IO_FILE_plus _IO_2_1_stderr_;
-#ifndef _LIBC
-#define _IO_stdin ((_IO_FILE*)(&_IO_2_1_stdin_))
-#define _IO_stdout ((_IO_FILE*)(&_IO_2_1_stdout_))
-#define _IO_stderr ((_IO_FILE*)(&_IO_2_1_stderr_))
-#else
-extern _IO_FILE *_IO_stdin attribute_hidden;
-extern _IO_FILE *_IO_stdout attribute_hidden;
-extern _IO_FILE *_IO_stderr attribute_hidden;
-#endif
-
-
-/* Functions to do I/O and file management for a stream.  */
-
-/* Read NBYTES bytes from COOKIE into a buffer pointed to by BUF.
-   Return number of bytes read.  */
-typedef __ssize_t __io_read_fn (void *__cookie, char *__buf, size_t __nbytes);
-
-/* Write N bytes pointed to by BUF to COOKIE.  Write all N bytes
-   unless there is an error.  Return number of bytes written.  If
-   there is an error, return 0 and do not write anything.  If the file
-   has been opened for append (__mode.__append set), then set the file
-   pointer to the end of the file and then do the write; if not, just
-   write at the current file pointer.  */
-typedef __ssize_t __io_write_fn (void *__cookie, const char *__buf,
-				 size_t __n);
-
-/* Move COOKIE's file position to *POS bytes from the
-   beginning of the file (if W is SEEK_SET),
-   the current position (if W is SEEK_CUR),
-   or the end of the file (if W is SEEK_END).
-   Set *POS to the new file position.
-   Returns zero if successful, nonzero if not.  */
-typedef int __io_seek_fn (void *__cookie, _IO_off64_t *__pos, int __w);
-
-/* Close COOKIE.  */
-typedef int __io_close_fn (void *__cookie);
-
-
-#ifdef _GNU_SOURCE
-/* User-visible names for the above.  */
-typedef __io_read_fn cookie_read_function_t;
-typedef __io_write_fn cookie_write_function_t;
-typedef __io_seek_fn cookie_seek_function_t;
-typedef __io_close_fn cookie_close_function_t;
-
-/* The structure with the cookie function pointers.  */
-typedef struct
-{
-  __io_read_fn *read;		/* Read bytes.  */
-  __io_write_fn *write;		/* Write bytes.  */
-  __io_seek_fn *seek;		/* Seek/tell file position.  */
-  __io_close_fn *close;		/* Close file.  */
-} _IO_cookie_io_functions_t;
-typedef _IO_cookie_io_functions_t cookie_io_functions_t;
-
-struct _IO_cookie_file;
-
-/* Initialize one of those.  */
-extern void _IO_cookie_init (struct _IO_cookie_file *__cfile, int __read_write,
-			     void *__cookie, _IO_cookie_io_functions_t __fns);
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int __underflow (_IO_FILE *);
-extern int __uflow (_IO_FILE *);
-extern int __overflow (_IO_FILE *, int);
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-extern _IO_wint_t __wunderflow (_IO_FILE *);
-extern _IO_wint_t __wuflow (_IO_FILE *);
-extern _IO_wint_t __woverflow (_IO_FILE *, _IO_wint_t);
-#endif
-
-#if  __GNUC__ >= 3
-# define _IO_BE(expr, res) __builtin_expect ((expr), res)
-#else
-# define _IO_BE(expr, res) (expr)
-#endif
-
-#define _IO_getc_unlocked(_fp) \
-       (_IO_BE ((_fp)->_IO_read_ptr >= (_fp)->_IO_read_end, 0) \
-	? __uflow (_fp) : *(unsigned char *) (_fp)->_IO_read_ptr++)
-#define _IO_peekc_unlocked(_fp) \
-       (_IO_BE ((_fp)->_IO_read_ptr >= (_fp)->_IO_read_end, 0) \
-	  && __underflow (_fp) == EOF ? EOF \
-	: *(unsigned char *) (_fp)->_IO_read_ptr)
-#define _IO_putc_unlocked(_ch, _fp) \
-   (_IO_BE ((_fp)->_IO_write_ptr >= (_fp)->_IO_write_end, 0) \
-    ? __overflow (_fp, (unsigned char) (_ch)) \
-    : (unsigned char) (*(_fp)->_IO_write_ptr++ = (_ch)))
-
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-# define _IO_getwc_unlocked(_fp) \
-  (_IO_BE ((_fp)->_wide_data == NULL					\
-	   || ((_fp)->_wide_data->_IO_read_ptr				\
-	       >= (_fp)->_wide_data->_IO_read_end), 0)			\
-   ? __wuflow (_fp) : (_IO_wint_t) *(_fp)->_wide_data->_IO_read_ptr++)
-# define _IO_putwc_unlocked(_wch, _fp) \
-  (_IO_BE ((_fp)->_wide_data == NULL					\
-	   || ((_fp)->_wide_data->_IO_write_ptr				\
-	       >= (_fp)->_wide_data->_IO_write_end), 0)			\
-   ? __woverflow (_fp, _wch)						\
-   : (_IO_wint_t) (*(_fp)->_wide_data->_IO_write_ptr++ = (_wch)))
-#endif
-
-#define _IO_feof_unlocked(__fp) (((__fp)->_flags & _IO_EOF_SEEN) != 0)
-#define _IO_ferror_unlocked(__fp) (((__fp)->_flags & _IO_ERR_SEEN) != 0)
-
-extern int _IO_getc (_IO_FILE *__fp);
-extern int _IO_putc (int __c, _IO_FILE *__fp);
-extern int _IO_feof (_IO_FILE *__fp) __THROW;
-extern int _IO_ferror (_IO_FILE *__fp) __THROW;
-
-extern int _IO_peekc_locked (_IO_FILE *__fp);
-
-/* This one is for Emacs. */
-#define _IO_PENDING_OUTPUT_COUNT(_fp)	\
-	((_fp)->_IO_write_ptr - (_fp)->_IO_write_base)
-
-extern void _IO_flockfile (_IO_FILE *) __THROW;
-extern void _IO_funlockfile (_IO_FILE *) __THROW;
-extern int _IO_ftrylockfile (_IO_FILE *) __THROW;
-
-#ifdef _IO_MTSAFE_IO
-# define _IO_peekc(_fp) _IO_peekc_locked (_fp)
-# define _IO_flockfile(_fp) \
-  if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_flockfile (_fp)
-# define _IO_funlockfile(_fp) \
-  if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_funlockfile (_fp)
-#else
-# define _IO_peekc(_fp) _IO_peekc_unlocked (_fp)
-# define _IO_flockfile(_fp) /**/
-# define _IO_funlockfile(_fp) /**/
-# define _IO_ftrylockfile(_fp) /**/
-# define _IO_cleanup_region_start(_fct, _fp) /**/
-# define _IO_cleanup_region_end(_Doit) /**/
-#endif /* !_IO_MTSAFE_IO */
-
-extern int _IO_vfscanf (_IO_FILE * __restrict, const char * __restrict,
-			_IO_va_list, int *__restrict);
-extern int _IO_vfprintf (_IO_FILE *__restrict, const char *__restrict,
-			 _IO_va_list);
-extern _IO_ssize_t _IO_padn (_IO_FILE *, int, _IO_ssize_t);
-extern _IO_size_t _IO_sgetn (_IO_FILE *, void *, _IO_size_t);
-
-extern _IO_off64_t _IO_seekoff (_IO_FILE *, _IO_off64_t, int, int);
-extern _IO_off64_t _IO_seekpos (_IO_FILE *, _IO_off64_t, int);
-
-extern void _IO_free_backup_area (_IO_FILE *) __THROW;
-
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-extern _IO_wint_t _IO_getwc (_IO_FILE *__fp);
-extern _IO_wint_t _IO_putwc (wchar_t __wc, _IO_FILE *__fp);
-extern int _IO_fwide (_IO_FILE *__fp, int __mode) __THROW;
-# if __GNUC__ >= 2
-/* While compiling glibc we have to handle compatibility with very old
-   versions.  */
-#  if defined _LIBC && defined SHARED
-#   include <shlib-compat.h>
-#   if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
-#    define _IO_fwide_maybe_incompatible \
-  (__builtin_expect (&_IO_stdin_used == NULL, 0))
-extern const int _IO_stdin_used;
-weak_extern (_IO_stdin_used);
-#   endif
-#  endif
-#  ifndef _IO_fwide_maybe_incompatible
-#   define _IO_fwide_maybe_incompatible (0)
-#  endif
-/* A special optimized version of the function above.  It optimizes the
-   case of initializing an unoriented byte stream.  */
-#  define _IO_fwide(__fp, __mode) \
-  ({ int __result = (__mode);						      \
-     if (__result < 0 && ! _IO_fwide_maybe_incompatible)		      \
-       {								      \
-	 if ((__fp)->_mode == 0)					      \
-	   /* We know that all we have to do is to set the flag.  */	      \
-	   (__fp)->_mode = -1;						      \
-	 __result = (__fp)->_mode;					      \
-       }								      \
-     else if (__builtin_constant_p (__mode) && (__mode) == 0)		      \
-       __result = _IO_fwide_maybe_incompatible ? -1 : (__fp)->_mode;	      \
-     else								      \
-       __result = _IO_fwide (__fp, __result);				      \
-     __result; })
-# endif
-
-extern int _IO_vfwscanf (_IO_FILE * __restrict, const wchar_t * __restrict,
-			 _IO_va_list, int *__restrict);
-extern int _IO_vfwprintf (_IO_FILE *__restrict, const wchar_t *__restrict,
-			  _IO_va_list);
-extern _IO_ssize_t _IO_wpadn (_IO_FILE *, wint_t, _IO_ssize_t);
-extern void _IO_free_wbackup_area (_IO_FILE *) __THROW;
-#endif
-
-#ifdef __LDBL_COMPAT
-# include <bits/libio-ldbl.h>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _IO_STDIO_H */
diff --git a/openflow/usr/include/libltdl/lt_dlloader.h b/openflow/usr/include/libltdl/lt_dlloader.h
deleted file mode 100644
index 66cf047..0000000
--- a/openflow/usr/include/libltdl/lt_dlloader.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* lt_dlloader.h -- dynamic library loader interface
-
-   Copyright (C) 2004, 2007-2008, 2011-2015 Free Software Foundation,
-   Inc.
-   Written by Gary V. Vaughan, 2004
-
-   NOTE: The canonical source of this file is maintained with the
-   GNU Libtool package.  Report bugs to bug-libtool@gnu.org.
-
-GNU Libltdl is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU Libtool, you may include this file under the
-same distribution terms that you use for the rest of that program.
-
-GNU Libltdl is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
-copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
-or obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#if !defined LT_DLLOADER_H
-#define LT_DLLOADER_H 1
-
-#include <libltdl/lt_system.h>
-
-LT_BEGIN_C_DECLS
-
-typedef	void *	lt_dlloader;
-typedef void *	lt_module;
-typedef void *	lt_user_data;
-typedef struct lt__advise *	lt_dladvise;
-
-/* Function pointer types for module loader vtable entries:  */
-typedef lt_module   lt_module_open	(lt_user_data data,
-					 const char *filename,
-					 lt_dladvise advise);
-typedef int	    lt_module_close	(lt_user_data data,
-					 lt_module module);
-typedef void *	    lt_find_sym		(lt_user_data data, lt_module module,
-					 const char *symbolname);
-typedef int	    lt_dlloader_init	(lt_user_data data);
-typedef int	    lt_dlloader_exit	(lt_user_data data);
-
-/* Default priority is LT_DLLOADER_PREPEND if none is explicitly given.  */
-typedef enum {
-  LT_DLLOADER_PREPEND = 0, LT_DLLOADER_APPEND
-} lt_dlloader_priority;
-
-/* This structure defines a module loader, as populated by the get_vtable
-   entry point of each loader.  */
-typedef struct {
-  const char *		name;
-  const char *		sym_prefix;
-  lt_module_open *	module_open;
-  lt_module_close *	module_close;
-  lt_find_sym *		find_sym;
-  lt_dlloader_init *	dlloader_init;
-  lt_dlloader_exit *	dlloader_exit;
-  lt_user_data		dlloader_data;
-  lt_dlloader_priority	priority;
-} lt_dlvtable;
-
-LT_SCOPE int		lt_dlloader_add	   (const lt_dlvtable *vtable);
-LT_SCOPE lt_dlloader	lt_dlloader_next   (const lt_dlloader loader);
-
-LT_SCOPE lt_dlvtable *	lt_dlloader_remove	(const char *name);
-LT_SCOPE const lt_dlvtable *lt_dlloader_find	(const char *name);
-LT_SCOPE const lt_dlvtable *lt_dlloader_get	(lt_dlloader loader);
-
-
-/* Type of a function to get a loader's vtable:  */
-typedef  const lt_dlvtable *lt_get_vtable	(lt_user_data data);
-
-#ifdef LT_DEBUG_LOADERS
-LT_SCOPE void		lt_dlloader_dump	(void);
-#endif
-
-LT_END_C_DECLS
-
-#endif /*!defined LT_DLLOADER_H*/
diff --git a/openflow/usr/include/libltdl/lt_error.h b/openflow/usr/include/libltdl/lt_error.h
deleted file mode 100644
index 367c36b..0000000
--- a/openflow/usr/include/libltdl/lt_error.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* lt_error.h -- error propagation interface
-
-   Copyright (C) 1999-2001, 2004, 2007, 2011-2015 Free Software
-   Foundation, Inc.
-   Written by Thomas Tanner, 1999
-
-   NOTE: The canonical source of this file is maintained with the
-   GNU Libtool package.  Report bugs to bug-libtool@gnu.org.
-
-GNU Libltdl is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU Libtool, you may include this file under the
-same distribution terms that you use for the rest of that program.
-
-GNU Libltdl is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
-copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
-or obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-/* Only include this header file once. */
-#if !defined LT_ERROR_H
-#define LT_ERROR_H 1
-
-#include <libltdl/lt_system.h>
-
-LT_BEGIN_C_DECLS
-
-/* Defining error strings alongside their symbolic names in a macro in
-   this way allows us to expand the macro in different contexts with
-   confidence that the enumeration of symbolic names will map correctly
-   onto the table of error strings.  \0 is appended to the strings to
-   expilicitely initialize the string terminator. */
-#define lt_dlerror_table						\
-    LT_ERROR(UNKNOWN,		    "unknown error\0")			\
-    LT_ERROR(DLOPEN_NOT_SUPPORTED,  "dlopen support not available\0")	\
-    LT_ERROR(INVALID_LOADER,	    "invalid loader\0")			\
-    LT_ERROR(INIT_LOADER,	    "loader initialization failed\0")	\
-    LT_ERROR(REMOVE_LOADER,	    "loader removal failed\0")		\
-    LT_ERROR(FILE_NOT_FOUND,	    "file not found\0")			\
-    LT_ERROR(DEPLIB_NOT_FOUND,	    "dependency library not found\0")	\
-    LT_ERROR(NO_SYMBOLS,	    "no symbols defined\0")		\
-    LT_ERROR(CANNOT_OPEN,	    "can't open the module\0")		\
-    LT_ERROR(CANNOT_CLOSE,	    "can't close the module\0")		\
-    LT_ERROR(SYMBOL_NOT_FOUND,	    "symbol not found\0")		\
-    LT_ERROR(NO_MEMORY,		    "not enough memory\0")		\
-    LT_ERROR(INVALID_HANDLE,	    "invalid module handle\0")		\
-    LT_ERROR(BUFFER_OVERFLOW,	    "internal buffer overflow\0")	\
-    LT_ERROR(INVALID_ERRORCODE,	    "invalid errorcode\0")		\
-    LT_ERROR(SHUTDOWN,		    "library already shutdown\0")	\
-    LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module\0")	\
-    LT_ERROR(INVALID_MUTEX_ARGS,    "internal error (code withdrawn)\0")\
-    LT_ERROR(INVALID_POSITION,	    "invalid search path insert position\0")\
-    LT_ERROR(CONFLICTING_FLAGS,	    "symbol visibility can be global or local\0")
-
-/* Enumerate the symbolic error names. */
-enum {
-#define LT_ERROR(name, diagnostic)	LT_CONC(LT_ERROR_, name),
-	lt_dlerror_table
-#undef LT_ERROR
-
-	LT_ERROR_MAX
-};
-
-/* Should be max of the error string lengths above (plus one for C++) */
-#define LT_ERROR_LEN_MAX (41)
-
-/* These functions are only useful from inside custom module loaders. */
-LT_SCOPE int	lt_dladderror	(const char *diagnostic);
-LT_SCOPE int	lt_dlseterror	(int errorcode);
-
-
-LT_END_C_DECLS
-
-#endif /*!defined LT_ERROR_H*/
diff --git a/openflow/usr/include/libltdl/lt_system.h b/openflow/usr/include/libltdl/lt_system.h
deleted file mode 100644
index a9bc7ec..0000000
--- a/openflow/usr/include/libltdl/lt_system.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* lt_system.h -- system portability abstraction layer
-
-   Copyright (C) 2004, 2007, 2010-2015 Free Software Foundation, Inc.
-   Written by Gary V. Vaughan, 2004
-
-   NOTE: The canonical source of this file is maintained with the
-   GNU Libtool package.  Report bugs to bug-libtool@gnu.org.
-
-GNU Libltdl is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU Libtool, you may include this file under the
-same distribution terms that you use for the rest of that program.
-
-GNU Libltdl is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
-copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
-or obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#if !defined LT_SYSTEM_H
-#define LT_SYSTEM_H 1
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-/* Some systems do not define EXIT_*, even with STDC_HEADERS.  */
-#if !defined EXIT_SUCCESS
-# define EXIT_SUCCESS 0
-#endif
-#if !defined EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
-
-/* Just pick a big number... */
-#define LT_FILENAME_MAX 2048
-
-
-/* Saves on those hard to debug '\0' typos....  */
-#define LT_EOS_CHAR	'\0'
-
-/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations,
-   so that C++ compilers don't mangle their names.  Use LTDL_END_C_DECLS at
-   the end of C declarations. */
-#if defined __cplusplus
-# define LT_BEGIN_C_DECLS	extern "C" {
-# define LT_END_C_DECLS		}
-#else
-# define LT_BEGIN_C_DECLS	/* empty */
-# define LT_END_C_DECLS		/* empty */
-#endif
-
-/* LT_STMT_START/END are used to create macros that expand to a
-   a single compound statement in a portable way.  */
-#if defined  __GNUC__ && !defined  __STRICT_ANSI__ && !defined  __cplusplus
-#  define LT_STMT_START        (void)(
-#  define LT_STMT_END          )
-#else
-#  if (defined sun || defined __sun__)
-#    define LT_STMT_START      if (1)
-#    define LT_STMT_END        else (void)0
-#  else
-#    define LT_STMT_START      do
-#    define LT_STMT_END        while (0)
-#  endif
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-/* Canonicalise Windows and Cygwin recognition macros.
-   To match the values set by recent Cygwin compilers, make sure that if
-   __CYGWIN__ is defined (after canonicalisation), __WINDOWS__ is NOT!  */
-#if defined __CYGWIN32__ && !defined __CYGWIN__
-# define __CYGWIN__ __CYGWIN32__
-#endif
-#if defined __CYGWIN__
-# if defined __WINDOWS__
-#   undef __WINDOWS__
-# endif
-#elif defined _WIN32
-# define __WINDOWS__ _WIN32
-#elif defined WIN32
-# define __WINDOWS__ WIN32
-#endif
-#if defined __CYGWIN__ && defined __WINDOWS__
-# undef __WINDOWS__
-#endif
-
-
-/* DLL building support on win32 hosts;  mostly to workaround their
-   ridiculous implementation of data symbol exporting. */
-#if !defined LT_SCOPE
-#  if defined __WINDOWS__ || defined __CYGWIN__
-#    if defined DLL_EXPORT		/* defined by libtool (if required) */
-#      define LT_SCOPE	extern __declspec(dllexport)
-#    endif
-#    if defined LIBLTDL_DLL_IMPORT	/* define if linking with this dll */
-       /* note: cygwin/mingw compilers can rely instead on auto-import */
-#      define LT_SCOPE	extern __declspec(dllimport)
-#    endif
-#  endif
-#  if !defined LT_SCOPE			/* static linking or !__WINDOWS__ */
-#    define LT_SCOPE	extern
-#  endif
-#endif
-
-#if defined __WINDOWS__
-/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory
-   separator when it is set. */
-# define LT_DIRSEP_CHAR		'\\'
-# define LT_PATHSEP_CHAR	';'
-#else
-# define LT_PATHSEP_CHAR	':'
-#endif
-
-#if defined _MSC_VER /* Visual Studio */
-#  define R_OK 4
-#endif
-
-/* fopen() mode flags for reading a text file */
-#undef	LT_READTEXT_MODE
-#if defined __WINDOWS__ || defined __CYGWIN__
-#  define LT_READTEXT_MODE "rt"
-#else
-#  define LT_READTEXT_MODE "r"
-#endif
-
-/* The extra indirection to the LT__STR and LT__CONC macros is required so
-   that if the arguments to LT_STR() (or LT_CONC()) are themselves macros,
-   they will be expanded before being quoted.   */
-#ifndef LT_STR
-#  define LT__STR(arg)		#arg
-#  define LT_STR(arg)		LT__STR(arg)
-#endif
-
-#ifndef LT_CONC
-#  define LT__CONC(a, b)	a##b
-#  define LT_CONC(a, b)		LT__CONC(a, b)
-#endif
-#ifndef LT_CONC3
-#  define LT__CONC3(a, b, c)	a##b##c
-#  define LT_CONC3(a, b, c)	LT__CONC3(a, b, c)
-#endif
-
-#endif /*!defined LT_SYSTEM_H*/
diff --git a/openflow/usr/include/limits.h b/openflow/usr/include/limits.h
deleted file mode 100644
index 5add8fc..0000000
--- a/openflow/usr/include/limits.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.10/5.2.4.2.1 Sizes of integer types	<limits.h>
- */
-
-#ifndef _LIBC_LIMITS_H_
-#define _LIBC_LIMITS_H_	1
-
-#include <features.h>
-
-
-/* Maximum length of any multibyte character in any locale.
-   We define this value here since the gcc header does not define
-   the correct value.  */
-#define MB_LEN_MAX	16
-
-
-/* If we are not using GNU CC we have to define all the symbols ourself.
-   Otherwise use gcc's definitions (see below).  */
-#if !defined __GNUC__ || __GNUC__ < 2
-
-/* We only protect from multiple inclusion here, because all the other
-   #include's protect themselves, and in GCC 2 we may #include_next through
-   multiple copies of this file before we get to GCC's.  */
-# ifndef _LIMITS_H
-#  define _LIMITS_H	1
-
-#include <bits/wordsize.h>
-
-/* We don't have #include_next.
-   Define ANSI <limits.h> for standard 32-bit words.  */
-
-/* These assume 8-bit `char's, 16-bit `short int's,
-   and 32-bit `int's and `long int's.  */
-
-/* Number of bits in a `char'.	*/
-#  define CHAR_BIT	8
-
-/* Minimum and maximum values a `signed char' can hold.  */
-#  define SCHAR_MIN	(-128)
-#  define SCHAR_MAX	127
-
-/* Maximum value an `unsigned char' can hold.  (Minimum is 0.)  */
-#  define UCHAR_MAX	255
-
-/* Minimum and maximum values a `char' can hold.  */
-#  ifdef __CHAR_UNSIGNED__
-#   define CHAR_MIN	0
-#   define CHAR_MAX	UCHAR_MAX
-#  else
-#   define CHAR_MIN	SCHAR_MIN
-#   define CHAR_MAX	SCHAR_MAX
-#  endif
-
-/* Minimum and maximum values a `signed short int' can hold.  */
-#  define SHRT_MIN	(-32768)
-#  define SHRT_MAX	32767
-
-/* Maximum value an `unsigned short int' can hold.  (Minimum is 0.)  */
-#  define USHRT_MAX	65535
-
-/* Minimum and maximum values a `signed int' can hold.  */
-#  define INT_MIN	(-INT_MAX - 1)
-#  define INT_MAX	2147483647
-
-/* Maximum value an `unsigned int' can hold.  (Minimum is 0.)  */
-#  define UINT_MAX	4294967295U
-
-/* Minimum and maximum values a `signed long int' can hold.  */
-#  if __WORDSIZE == 64
-#   define LONG_MAX	9223372036854775807L
-#  else
-#   define LONG_MAX	2147483647L
-#  endif
-#  define LONG_MIN	(-LONG_MAX - 1L)
-
-/* Maximum value an `unsigned long int' can hold.  (Minimum is 0.)  */
-#  if __WORDSIZE == 64
-#   define ULONG_MAX	18446744073709551615UL
-#  else
-#   define ULONG_MAX	4294967295UL
-#  endif
-
-#  ifdef __USE_ISOC99
-
-/* Minimum and maximum values a `signed long long int' can hold.  */
-#   define LLONG_MAX	9223372036854775807LL
-#   define LLONG_MIN	(-LLONG_MAX - 1LL)
-
-/* Maximum value an `unsigned long long int' can hold.  (Minimum is 0.)  */
-#   define ULLONG_MAX	18446744073709551615ULL
-
-#  endif /* ISO C99 */
-
-# endif	/* limits.h  */
-#endif	/* GCC 2.  */
-
-#endif	/* !_LIBC_LIMITS_H_ */
-
- /* Get the compiler's limits.h, which defines almost all the ISO constants.
-
-    We put this #include_next outside the double inclusion check because
-    it should be possible to include this file more than once and still get
-    the definitions from gcc's header.  */
-#if defined __GNUC__ && !defined _GCC_LIMITS_H_
-/* `_GCC_LIMITS_H_' is what GCC's file defines.  */
-# include_next <limits.h>
-#endif
-
-/* The <limits.h> files in some gcc versions don't define LLONG_MIN,
-   LLONG_MAX, and ULLONG_MAX.  Instead only the values gcc defined for
-   ages are available.  */
-#if defined __USE_ISOC99 && defined __GNUC__
-# ifndef LLONG_MIN
-#  define LLONG_MIN	(-LLONG_MAX-1)
-# endif
-# ifndef LLONG_MAX
-#  define LLONG_MAX	__LONG_LONG_MAX__
-# endif
-# ifndef ULLONG_MAX
-#  define ULLONG_MAX	(LLONG_MAX * 2ULL + 1)
-# endif
-#endif
-
-#ifdef	__USE_POSIX
-/* POSIX adds things to <limits.h>.  */
-# include <bits/posix1_lim.h>
-#endif
-
-#ifdef	__USE_POSIX2
-# include <bits/posix2_lim.h>
-#endif
-
-#ifdef	__USE_XOPEN
-# include <bits/xopen_lim.h>
-#endif
diff --git a/openflow/usr/include/link.h b/openflow/usr/include/link.h
deleted file mode 100644
index f448141..0000000
--- a/openflow/usr/include/link.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Data structure for communication from the run-time dynamic linker for
-   loaded ELF shared objects.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_LINK_H
-#define	_LINK_H	1
-
-#include <features.h>
-#include <elf.h>
-#include <dlfcn.h>
-#include <sys/types.h>
-
-/* We use this macro to refer to ELF types independent of the native wordsize.
-   `ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'.  */
-#define ElfW(type)	_ElfW (Elf, __ELF_NATIVE_CLASS, type)
-#define _ElfW(e,w,t)	_ElfW_1 (e, w, _##t)
-#define _ElfW_1(e,w,t)	e##w##t
-
-#include <bits/elfclass.h>		/* Defines __ELF_NATIVE_CLASS.  */
-#include <bits/link.h>
-
-/* Rendezvous structure used by the run-time dynamic linker to communicate
-   details of shared object loading to the debugger.  If the executable's
-   dynamic section has a DT_DEBUG element, the run-time linker sets that
-   element's value to the address where this structure can be found.  */
-
-struct r_debug
-  {
-    int r_version;		/* Version number for this protocol.  */
-
-    struct link_map *r_map;	/* Head of the chain of loaded objects.  */
-
-    /* This is the address of a function internal to the run-time linker,
-       that will always be called when the linker begins to map in a
-       library or unmap it, and again when the mapping change is complete.
-       The debugger can set a breakpoint at this address if it wants to
-       notice shared object mapping changes.  */
-    ElfW(Addr) r_brk;
-    enum
-      {
-	/* This state value describes the mapping change taking place when
-	   the `r_brk' address is called.  */
-	RT_CONSISTENT,		/* Mapping change is complete.  */
-	RT_ADD,			/* Beginning to add a new object.  */
-	RT_DELETE		/* Beginning to remove an object mapping.  */
-      } r_state;
-
-    ElfW(Addr) r_ldbase;	/* Base address the linker is loaded at.  */
-  };
-
-/* This is the instance of that structure used by the dynamic linker.  */
-extern struct r_debug _r_debug;
-
-/* This symbol refers to the "dynamic structure" in the `.dynamic' section
-   of whatever module refers to `_DYNAMIC'.  So, to find its own
-   `struct r_debug', a program could do:
-     for (dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn)
-       if (dyn->d_tag == DT_DEBUG)
-	 r_debug = (struct r_debug *) dyn->d_un.d_ptr;
-   */
-extern ElfW(Dyn) _DYNAMIC[];
-
-/* Structure describing a loaded shared object.  The `l_next' and `l_prev'
-   members form a chain of all the shared objects loaded at startup.
-
-   These data structures exist in space used by the run-time dynamic linker;
-   modifying them may have disastrous results.  */
-
-struct link_map
-  {
-    /* These first few members are part of the protocol with the debugger.
-       This is the same format used in SVR4.  */
-
-    ElfW(Addr) l_addr;		/* Difference between the address in the ELF
-				   file and the addresses in memory.  */
-    char *l_name;		/* Absolute file name object was found in.  */
-    ElfW(Dyn) *l_ld;		/* Dynamic section of the shared object.  */
-    struct link_map *l_next, *l_prev; /* Chain of loaded objects.  */
-  };
-
-#ifdef __USE_GNU
-
-/* Version numbers for la_version handshake interface.  */
-#define LAV_CURRENT	1
-
-/* Activity types signaled through la_activity.  */
-enum
-  {
-    LA_ACT_CONSISTENT,		/* Link map consistent again.  */
-    LA_ACT_ADD,			/* New object will be added.  */
-    LA_ACT_DELETE		/* Objects will be removed.  */
-  };
-
-/* Values representing origin of name for dynamic loading.  */
-enum
-  {
-    LA_SER_ORIG = 0x01,		/* Original name.  */
-    LA_SER_LIBPATH = 0x02,	/* Directory from LD_LIBRARY_PATH.  */
-    LA_SER_RUNPATH = 0x04,	/* Directory from RPATH/RUNPATH.  */
-    LA_SER_CONFIG = 0x08,	/* Found through ldconfig.  */
-    LA_SER_DEFAULT = 0x40,	/* Default directory.  */
-    LA_SER_SECURE = 0x80	/* Unused.  */
-  };
-
-/* Values for la_objopen return value.  */
-enum
-  {
-    LA_FLG_BINDTO = 0x01,	/* Audit symbols bound to this object.  */
-    LA_FLG_BINDFROM = 0x02	/* Audit symbols bound from this object.  */
-  };
-
-/* Values for la_symbind flags parameter.  */
-enum
-  {
-    LA_SYMB_NOPLTENTER = 0x01,	/* la_pltenter will not be called.  */
-    LA_SYMB_NOPLTEXIT = 0x02,	/* la_pltexit will not be called.  */
-    LA_SYMB_STRUCTCALL = 0x04,	/* Return value is a structure.  */
-    LA_SYMB_DLSYM = 0x08,	/* Binding due to dlsym call.  */
-    LA_SYMB_ALTVALUE = 0x10	/* Value has been changed by a previous
-				   la_symbind call.  */
-  };
-
-struct dl_phdr_info
-  {
-    ElfW(Addr) dlpi_addr;
-    const char *dlpi_name;
-    const ElfW(Phdr) *dlpi_phdr;
-    ElfW(Half) dlpi_phnum;
-
-    /* Note: Following members were introduced after the first
-       version of this structure was available.  Check the SIZE
-       argument passed to the dl_iterate_phdr callback to determine
-       whether or not each later member is available.  */
-
-    /* Incremented when a new object may have been added.  */
-    __extension__ unsigned long long int dlpi_adds;
-    /* Incremented when an object may have been removed.  */
-    __extension__ unsigned long long int dlpi_subs;
-
-    /* If there is a PT_TLS segment, its module ID as used in
-       TLS relocations, else zero.  */
-    size_t dlpi_tls_modid;
-
-    /* The address of the calling thread's instance of this module's
-       PT_TLS segment, if it has one and it has been allocated
-       in the calling thread, otherwise a null pointer.  */
-    void *dlpi_tls_data;
-  };
-
-__BEGIN_DECLS
-
-extern int dl_iterate_phdr (int (*__callback) (struct dl_phdr_info *,
-					       size_t, void *),
-			    void *__data);
-
-
-/* Prototypes for the ld.so auditing interfaces.  These are not
-   defined anywhere in ld.so but instead have to be provided by the
-   auditing DSO.  */
-extern unsigned int la_version (unsigned int __version);
-extern void la_activity (uintptr_t *__cookie, unsigned int __flag);
-extern char *la_objsearch (const char *__name, uintptr_t *__cookie,
-			   unsigned int __flag);
-extern unsigned int la_objopen (struct link_map *__map, Lmid_t __lmid,
-				uintptr_t *__cookie);
-extern void la_preinit (uintptr_t *__cookie);
-extern uintptr_t la_symbind32 (Elf32_Sym *__sym, unsigned int __ndx,
-			       uintptr_t *__refcook, uintptr_t *__defcook,
-			       unsigned int *__flags, const char *__symname);
-extern uintptr_t la_symbind64 (Elf64_Sym *__sym, unsigned int __ndx,
-			       uintptr_t *__refcook, uintptr_t *__defcook,
-			       unsigned int *__flags, const char *__symname);
-extern unsigned int la_objclose (uintptr_t *__cookie);
-
-__END_DECLS
-
-#endif
-
-#endif /* link.h */
diff --git a/openflow/usr/include/linux/acct.h b/openflow/usr/include/linux/acct.h
deleted file mode 100644
index 19baf8a..0000000
--- a/openflow/usr/include/linux/acct.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  BSD Process Accounting for Linux - Definitions
- *
- *  Author: Marco van Wieringen (mvw@planets.elm.net)
- *
- *  This header file contains the definitions needed to implement
- *  BSD-style process accounting. The kernel accounting code and all
- *  user-level programs that try to do something useful with the
- *  process accounting log must include this file.
- *
- *  Copyright (C) 1995 - 1997 Marco van Wieringen - ELM Consultancy B.V.
- *
- */
-
-#ifndef _LINUX_ACCT_H
-#define _LINUX_ACCT_H
-
-#include <linux/types.h>
-
-#include <asm/param.h>
-#include <asm/byteorder.h>
-
-/* 
- *  comp_t is a 16-bit "floating" point number with a 3-bit base 8
- *  exponent and a 13-bit fraction.
- *  comp2_t is 24-bit with 5-bit base 2 exponent and 20 bit fraction
- *  (leading 1 not stored).
- *  See linux/kernel/acct.c for the specific encoding systems used.
- */
-
-typedef __u16	comp_t;
-typedef __u32	comp2_t;
-
-/*
- *   accounting file record
- *
- *   This structure contains all of the information written out to the
- *   process accounting file whenever a process exits.
- */
-
-#define ACCT_COMM	16
-
-struct acct
-{
-	char		ac_flag;		/* Flags */
-	char		ac_version;		/* Always set to ACCT_VERSION */
-	/* for binary compatibility back until 2.0 */
-	__u16		ac_uid16;		/* LSB of Real User ID */
-	__u16		ac_gid16;		/* LSB of Real Group ID */
-	__u16		ac_tty;			/* Control Terminal */
-	__u32		ac_btime;		/* Process Creation Time */
-	comp_t		ac_utime;		/* User Time */
-	comp_t		ac_stime;		/* System Time */
-	comp_t		ac_etime;		/* Elapsed Time */
-	comp_t		ac_mem;			/* Average Memory Usage */
-	comp_t		ac_io;			/* Chars Transferred */
-	comp_t		ac_rw;			/* Blocks Read or Written */
-	comp_t		ac_minflt;		/* Minor Pagefaults */
-	comp_t		ac_majflt;		/* Major Pagefaults */
-	comp_t		ac_swaps;		/* Number of Swaps */
-/* m68k had no padding here. */
-	__u16		ac_ahz;			/* AHZ */
-	__u32		ac_exitcode;		/* Exitcode */
-	char		ac_comm[ACCT_COMM + 1];	/* Command Name */
-	__u8		ac_etime_hi;		/* Elapsed Time MSB */
-	__u16		ac_etime_lo;		/* Elapsed Time LSB */
-	__u32		ac_uid;			/* Real User ID */
-	__u32		ac_gid;			/* Real Group ID */
-};
-
-struct acct_v3
-{
-	char		ac_flag;		/* Flags */
-	char		ac_version;		/* Always set to ACCT_VERSION */
-	__u16		ac_tty;			/* Control Terminal */
-	__u32		ac_exitcode;		/* Exitcode */
-	__u32		ac_uid;			/* Real User ID */
-	__u32		ac_gid;			/* Real Group ID */
-	__u32		ac_pid;			/* Process ID */
-	__u32		ac_ppid;		/* Parent Process ID */
-	__u32		ac_btime;		/* Process Creation Time */
-	float		ac_etime;		/* Elapsed Time */
-	comp_t		ac_utime;		/* User Time */
-	comp_t		ac_stime;		/* System Time */
-	comp_t		ac_mem;			/* Average Memory Usage */
-	comp_t		ac_io;			/* Chars Transferred */
-	comp_t		ac_rw;			/* Blocks Read or Written */
-	comp_t		ac_minflt;		/* Minor Pagefaults */
-	comp_t		ac_majflt;		/* Major Pagefaults */
-	comp_t		ac_swaps;		/* Number of Swaps */
-	char		ac_comm[ACCT_COMM];	/* Command Name */
-};
-
-/*
- *  accounting flags
- */
-				/* bit set when the process ... */
-#define AFORK		0x01	/* ... executed fork, but did not exec */
-#define ASU		0x02	/* ... used super-user privileges */
-#define ACOMPAT		0x04	/* ... used compatibility mode (VAX only not used) */
-#define ACORE		0x08	/* ... dumped core */
-#define AXSIG		0x10	/* ... was killed by a signal */
-
-#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
-#define ACCT_BYTEORDER	0x80	/* accounting file is big endian */
-#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
-#define ACCT_BYTEORDER	0x00	/* accounting file is little endian */
-#else
-#error unspecified endianness
-#endif
-
-#define ACCT_VERSION	2
-#define AHZ		(HZ)
-
-
-#endif /* _LINUX_ACCT_H */
diff --git a/openflow/usr/include/linux/adb.h b/openflow/usr/include/linux/adb.h
deleted file mode 100644
index 0815025..0000000
--- a/openflow/usr/include/linux/adb.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Definitions for ADB (Apple Desktop Bus) support.
- */
-#ifndef __ADB_H
-#define __ADB_H
-
-/* ADB commands */
-#define ADB_BUSRESET		0
-#define ADB_FLUSH(id)		(0x01 | ((id) << 4))
-#define ADB_WRITEREG(id, reg)	(0x08 | (reg) | ((id) << 4))
-#define ADB_READREG(id, reg)	(0x0C | (reg) | ((id) << 4))
-
-/* ADB default device IDs (upper 4 bits of ADB command byte) */
-#define ADB_DONGLE	1	/* "software execution control" devices */
-#define ADB_KEYBOARD	2
-#define ADB_MOUSE	3
-#define ADB_TABLET	4
-#define ADB_MODEM	5
-#define ADB_MISC	7	/* maybe a monitor */
-
-#define ADB_RET_OK	0
-#define ADB_RET_TIMEOUT	3
-
-/* The kind of ADB request. The controller may emulate some
-   or all of those CUDA/PMU packet kinds */
-#define ADB_PACKET	0
-#define CUDA_PACKET	1
-#define ERROR_PACKET	2
-#define TIMER_PACKET	3
-#define POWER_PACKET	4
-#define MACIIC_PACKET	5
-#define PMU_PACKET	6
-#define ADB_QUERY	7
-
-/* ADB queries */
-
-/* ADB_QUERY_GETDEVINFO
- * Query ADB slot for device presence
- * data[2] = id, rep[0] = orig addr, rep[1] = handler_id
- */
-#define ADB_QUERY_GETDEVINFO	1
-
-
-#endif /* __ADB_H */
diff --git a/openflow/usr/include/linux/adfs_fs.h b/openflow/usr/include/linux/adfs_fs.h
deleted file mode 100644
index 4f506dc..0000000
--- a/openflow/usr/include/linux/adfs_fs.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _ADFS_FS_H
-#define _ADFS_FS_H
-
-#include <linux/types.h>
-#include <linux/magic.h>
-
-/*
- * Disc Record at disc address 0xc00
- */
-struct adfs_discrecord {
-    __u8  log2secsize;
-    __u8  secspertrack;
-    __u8  heads;
-    __u8  density;
-    __u8  idlen;
-    __u8  log2bpmb;
-    __u8  skew;
-    __u8  bootoption;
-    __u8  lowsector;
-    __u8  nzones;
-    __le16 zone_spare;
-    __le32 root;
-    __le32 disc_size;
-    __le16 disc_id;
-    __u8  disc_name[10];
-    __le32 disc_type;
-    __le32 disc_size_high;
-    __u8  log2sharesize:4;
-    __u8  unused40:4;
-    __u8  big_flag:1;
-    __u8  unused41:1;
-    __u8  nzones_high;
-    __le32 format_version;
-    __le32 root_size;
-    __u8  unused52[60 - 52];
-};
-
-#define ADFS_DISCRECORD		(0xc00)
-#define ADFS_DR_OFFSET		(0x1c0)
-#define ADFS_DR_SIZE		 60
-#define ADFS_DR_SIZE_BITS	(ADFS_DR_SIZE << 3)
-
-
-#endif /* _ADFS_FS_H */
diff --git a/openflow/usr/include/linux/affs_hardblocks.h b/openflow/usr/include/linux/affs_hardblocks.h
deleted file mode 100644
index f1b948c..0000000
--- a/openflow/usr/include/linux/affs_hardblocks.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef	AFFS_HARDBLOCKS_H
-#define	AFFS_HARDBLOCKS_H
-
-#include <linux/types.h>
-
-/* Just the needed definitions for the RDB of an Amiga HD. */
-
-struct RigidDiskBlock {
-	__u32	rdb_ID;
-	__be32	rdb_SummedLongs;
-	__s32	rdb_ChkSum;
-	__u32	rdb_HostID;
-	__be32	rdb_BlockBytes;
-	__u32	rdb_Flags;
-	__u32	rdb_BadBlockList;
-	__be32	rdb_PartitionList;
-	__u32	rdb_FileSysHeaderList;
-	__u32	rdb_DriveInit;
-	__u32	rdb_Reserved1[6];
-	__u32	rdb_Cylinders;
-	__u32	rdb_Sectors;
-	__u32	rdb_Heads;
-	__u32	rdb_Interleave;
-	__u32	rdb_Park;
-	__u32	rdb_Reserved2[3];
-	__u32	rdb_WritePreComp;
-	__u32	rdb_ReducedWrite;
-	__u32	rdb_StepRate;
-	__u32	rdb_Reserved3[5];
-	__u32	rdb_RDBBlocksLo;
-	__u32	rdb_RDBBlocksHi;
-	__u32	rdb_LoCylinder;
-	__u32	rdb_HiCylinder;
-	__u32	rdb_CylBlocks;
-	__u32	rdb_AutoParkSeconds;
-	__u32	rdb_HighRDSKBlock;
-	__u32	rdb_Reserved4;
-	char	rdb_DiskVendor[8];
-	char	rdb_DiskProduct[16];
-	char	rdb_DiskRevision[4];
-	char	rdb_ControllerVendor[8];
-	char	rdb_ControllerProduct[16];
-	char	rdb_ControllerRevision[4];
-	__u32	rdb_Reserved5[10];
-};
-
-#define	IDNAME_RIGIDDISK	0x5244534B	/* "RDSK" */
-
-struct PartitionBlock {
-	__be32	pb_ID;
-	__be32	pb_SummedLongs;
-	__s32	pb_ChkSum;
-	__u32	pb_HostID;
-	__be32	pb_Next;
-	__u32	pb_Flags;
-	__u32	pb_Reserved1[2];
-	__u32	pb_DevFlags;
-	__u8	pb_DriveName[32];
-	__u32	pb_Reserved2[15];
-	__be32	pb_Environment[17];
-	__u32	pb_EReserved[15];
-};
-
-#define	IDNAME_PARTITION	0x50415254	/* "PART" */
-
-#define RDB_ALLOCATION_LIMIT	16
-
-#endif	/* AFFS_HARDBLOCKS_H */
diff --git a/openflow/usr/include/linux/agpgart.h b/openflow/usr/include/linux/agpgart.h
deleted file mode 100644
index 126eb8a..0000000
--- a/openflow/usr/include/linux/agpgart.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * AGPGART module version 0.99
- * Copyright (C) 1999 Jeff Hartmann
- * Copyright (C) 1999 Precision Insight, Inc.
- * Copyright (C) 1999 Xi Graphics, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef _AGP_H
-#define _AGP_H
-
-#define AGPIOC_BASE       'A'
-#define AGPIOC_INFO       _IOR (AGPIOC_BASE, 0, struct agp_info*)
-#define AGPIOC_ACQUIRE    _IO  (AGPIOC_BASE, 1)
-#define AGPIOC_RELEASE    _IO  (AGPIOC_BASE, 2)
-#define AGPIOC_SETUP      _IOW (AGPIOC_BASE, 3, struct agp_setup*)
-#define AGPIOC_RESERVE    _IOW (AGPIOC_BASE, 4, struct agp_region*)
-#define AGPIOC_PROTECT    _IOW (AGPIOC_BASE, 5, struct agp_region*)
-#define AGPIOC_ALLOCATE   _IOWR(AGPIOC_BASE, 6, struct agp_allocate*)
-#define AGPIOC_DEALLOCATE _IOW (AGPIOC_BASE, 7, int)
-#define AGPIOC_BIND       _IOW (AGPIOC_BASE, 8, struct agp_bind*)
-#define AGPIOC_UNBIND     _IOW (AGPIOC_BASE, 9, struct agp_unbind*)
-#define AGPIOC_CHIPSET_FLUSH _IO (AGPIOC_BASE, 10)
-
-#define AGP_DEVICE      "/dev/agpgart"
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#include <linux/types.h>
-
-struct agp_version {
-	__u16 major;
-	__u16 minor;
-};
-
-typedef struct _agp_info {
-	struct agp_version version;	/* version of the driver        */
-	__u32 bridge_id;	/* bridge vendor/device         */
-	__u32 agp_mode;		/* mode info of bridge          */
-	unsigned long aper_base;/* base of aperture             */
-	size_t aper_size;	/* size of aperture             */
-	size_t pg_total;	/* max pages (swap + system)    */
-	size_t pg_system;	/* max pages (system)           */
-	size_t pg_used;		/* current pages used           */
-} agp_info;
-
-typedef struct _agp_setup {
-	__u32 agp_mode;		/* mode info of bridge          */
-} agp_setup;
-
-/*
- * The "prot" down below needs still a "sleep" flag somehow ...
- */
-typedef struct _agp_segment {
-	__kernel_off_t pg_start;	/* starting page to populate    */
-	__kernel_size_t pg_count;	/* number of pages              */
-	int prot;			/* prot flags for mmap          */
-} agp_segment;
-
-typedef struct _agp_region {
-	__kernel_pid_t pid;		/* pid of process       */
-	__kernel_size_t seg_count;	/* number of segments   */
-	struct _agp_segment *seg_list;
-} agp_region;
-
-typedef struct _agp_allocate {
-	int key;		/* tag of allocation            */
-	__kernel_size_t pg_count;/* number of pages             */
-	__u32 type;		/* 0 == normal, other devspec   */
-   	__u32 physical;         /* device specific (some devices  
-				 * need a phys address of the     
-				 * actual page behind the gatt    
-				 * table)                        */
-} agp_allocate;
-
-typedef struct _agp_bind {
-	int key;		/* tag of allocation            */
-	__kernel_off_t pg_start;/* starting page to populate    */
-} agp_bind;
-
-typedef struct _agp_unbind {
-	int key;		/* tag of allocation            */
-	__u32 priority;		/* priority for paging out      */
-} agp_unbind;
-
-
-#endif /* _AGP_H */
diff --git a/openflow/usr/include/linux/aio_abi.h b/openflow/usr/include/linux/aio_abi.h
deleted file mode 100644
index bb2554f..0000000
--- a/openflow/usr/include/linux/aio_abi.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* include/linux/aio_abi.h
- *
- * Copyright 2000,2001,2002 Red Hat.
- *
- * Written by Benjamin LaHaise <bcrl@kvack.org>
- *
- * Distribute under the terms of the GPLv2 (see ../../COPYING) or under 
- * the following terms.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied.  Red Hat makes no representations about
- * the suitability of this software for any purpose.
- *
- * IN NO EVENT SHALL RED HAT BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
- * SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
- * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF RED HAT HAS BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * RED HAT DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
- * RED HAT HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
- * ENHANCEMENTS, OR MODIFICATIONS.
- */
-#ifndef __LINUX__AIO_ABI_H
-#define __LINUX__AIO_ABI_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-typedef __kernel_ulong_t aio_context_t;
-
-enum {
-	IOCB_CMD_PREAD = 0,
-	IOCB_CMD_PWRITE = 1,
-	IOCB_CMD_FSYNC = 2,
-	IOCB_CMD_FDSYNC = 3,
-	/* These two are experimental.
-	 * IOCB_CMD_PREADX = 4,
-	 * IOCB_CMD_POLL = 5,
-	 */
-	IOCB_CMD_NOOP = 6,
-	IOCB_CMD_PREADV = 7,
-	IOCB_CMD_PWRITEV = 8,
-};
-
-/*
- * Valid flags for the "aio_flags" member of the "struct iocb".
- *
- * IOCB_FLAG_RESFD - Set if the "aio_resfd" member of the "struct iocb"
- *                   is valid.
- */
-#define IOCB_FLAG_RESFD		(1 << 0)
-
-/* read() from /dev/aio returns these structures. */
-struct io_event {
-	__u64		data;		/* the data field from the iocb */
-	__u64		obj;		/* what iocb this event came from */
-	__s64		res;		/* result code for this event */
-	__s64		res2;		/* secondary result */
-};
-
-#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
-#define PADDED(x,y)	x, y
-#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
-#define PADDED(x,y)	y, x
-#else
-#error edit for your odd byteorder.
-#endif
-
-/*
- * we always use a 64bit off_t when communicating
- * with userland.  its up to libraries to do the
- * proper padding and aio_error abstraction
- */
-
-struct iocb {
-	/* these are internal to the kernel/libc. */
-	__u64	aio_data;	/* data to be returned in event's data */
-	__u32	PADDED(aio_key, aio_reserved1);
-				/* the kernel sets aio_key to the req # */
-
-	/* common fields */
-	__u16	aio_lio_opcode;	/* see IOCB_CMD_ above */
-	__s16	aio_reqprio;
-	__u32	aio_fildes;
-
-	__u64	aio_buf;
-	__u64	aio_nbytes;
-	__s64	aio_offset;
-
-	/* extra parameters */
-	__u64	aio_reserved2;	/* TODO: use this for a (struct sigevent *) */
-
-	/* flags for the "struct iocb" */
-	__u32	aio_flags;
-
-	/*
-	 * if the IOCB_FLAG_RESFD flag of "aio_flags" is set, this is an
-	 * eventfd to signal AIO readiness to
-	 */
-	__u32	aio_resfd;
-}; /* 64 bytes */
-
-#undef IFBIG
-#undef IFLITTLE
-
-#endif /* __LINUX__AIO_ABI_H */
-
diff --git a/openflow/usr/include/linux/am437x-vpfe.h b/openflow/usr/include/linux/am437x-vpfe.h
deleted file mode 100644
index d757743..0000000
--- a/openflow/usr/include/linux/am437x-vpfe.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2013 - 2014 Texas Instruments, Inc.
- *
- * Benoit Parrot <bparrot@ti.com>
- * Lad, Prabhakar <prabhakar.csengg@gmail.com>
- *
- * This program is free software; you may redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef AM437X_VPFE_USER_H
-#define AM437X_VPFE_USER_H
-
-#include <linux/videodev2.h>
-
-enum vpfe_ccdc_data_size {
-	VPFE_CCDC_DATA_16BITS = 0,
-	VPFE_CCDC_DATA_15BITS,
-	VPFE_CCDC_DATA_14BITS,
-	VPFE_CCDC_DATA_13BITS,
-	VPFE_CCDC_DATA_12BITS,
-	VPFE_CCDC_DATA_11BITS,
-	VPFE_CCDC_DATA_10BITS,
-	VPFE_CCDC_DATA_8BITS,
-};
-
-/* enum for No of pixel per line to be avg. in Black Clamping*/
-enum vpfe_ccdc_sample_length {
-	VPFE_CCDC_SAMPLE_1PIXELS = 0,
-	VPFE_CCDC_SAMPLE_2PIXELS,
-	VPFE_CCDC_SAMPLE_4PIXELS,
-	VPFE_CCDC_SAMPLE_8PIXELS,
-	VPFE_CCDC_SAMPLE_16PIXELS,
-};
-
-/* enum for No of lines in Black Clamping */
-enum vpfe_ccdc_sample_line {
-	VPFE_CCDC_SAMPLE_1LINES = 0,
-	VPFE_CCDC_SAMPLE_2LINES,
-	VPFE_CCDC_SAMPLE_4LINES,
-	VPFE_CCDC_SAMPLE_8LINES,
-	VPFE_CCDC_SAMPLE_16LINES,
-};
-
-/* enum for Alaw gamma width */
-enum vpfe_ccdc_gamma_width {
-	VPFE_CCDC_GAMMA_BITS_15_6 = 0,	/* use bits 15-6 for gamma */
-	VPFE_CCDC_GAMMA_BITS_14_5,
-	VPFE_CCDC_GAMMA_BITS_13_4,
-	VPFE_CCDC_GAMMA_BITS_12_3,
-	VPFE_CCDC_GAMMA_BITS_11_2,
-	VPFE_CCDC_GAMMA_BITS_10_1,
-	VPFE_CCDC_GAMMA_BITS_09_0,	/* use bits 9-0 for gamma */
-};
-
-/* structure for ALaw */
-struct vpfe_ccdc_a_law {
-	/* Enable/disable A-Law */
-	unsigned char enable;
-	/* Gamma Width Input */
-	enum vpfe_ccdc_gamma_width gamma_wd;
-};
-
-/* structure for Black Clamping */
-struct vpfe_ccdc_black_clamp {
-	unsigned char enable;
-	/* only if bClampEnable is TRUE */
-	enum vpfe_ccdc_sample_length sample_pixel;
-	/* only if bClampEnable is TRUE */
-	enum vpfe_ccdc_sample_line sample_ln;
-	/* only if bClampEnable is TRUE */
-	unsigned short start_pixel;
-	/* only if bClampEnable is TRUE */
-	unsigned short sgain;
-	/* only if bClampEnable is FALSE */
-	unsigned short dc_sub;
-};
-
-/* structure for Black Level Compensation */
-struct vpfe_ccdc_black_compensation {
-	/* Constant value to subtract from Red component */
-	char r;
-	/* Constant value to subtract from Gr component */
-	char gr;
-	/* Constant value to subtract from Blue component */
-	char b;
-	/* Constant value to subtract from Gb component */
-	char gb;
-};
-
-/* Structure for CCDC configuration parameters for raw capture mode passed
- * by application
- */
-struct vpfe_ccdc_config_params_raw {
-	/* data size value from 8 to 16 bits */
-	enum vpfe_ccdc_data_size data_sz;
-	/* Structure for Optional A-Law */
-	struct vpfe_ccdc_a_law alaw;
-	/* Structure for Optical Black Clamp */
-	struct vpfe_ccdc_black_clamp blk_clamp;
-	/* Structure for Black Compensation */
-	struct vpfe_ccdc_black_compensation blk_comp;
-};
-
-/*
- *  Private IOCTL
- * VIDIOC_AM437X_CCDC_CFG - Set CCDC configuration for raw capture
- * This is an experimental ioctl that will change in future kernels. So use
- * this ioctl with care !
- **/
-#define VIDIOC_AM437X_CCDC_CFG \
-	_IOW('V', BASE_VIDIOC_PRIVATE + 1, void *)
-
-#endif		/* AM437X_VPFE_USER_H */
diff --git a/openflow/usr/include/linux/android/binder.h b/openflow/usr/include/linux/android/binder.h
deleted file mode 100644
index bef9fd6..0000000
--- a/openflow/usr/include/linux/android/binder.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright (C) 2008 Google, Inc.
- *
- * Based on, but no longer compatible with, the original
- * OpenBinder.org binder driver interface, which is:
- *
- * Copyright (c) 2005 Palmsource, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef _LINUX_BINDER_H
-#define _LINUX_BINDER_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-#define B_PACK_CHARS(c1, c2, c3, c4) \
-	((((c1)<<24)) | (((c2)<<16)) | (((c3)<<8)) | (c4))
-#define B_TYPE_LARGE 0x85
-
-enum {
-	BINDER_TYPE_BINDER	= B_PACK_CHARS('s', 'b', '*', B_TYPE_LARGE),
-	BINDER_TYPE_WEAK_BINDER	= B_PACK_CHARS('w', 'b', '*', B_TYPE_LARGE),
-	BINDER_TYPE_HANDLE	= B_PACK_CHARS('s', 'h', '*', B_TYPE_LARGE),
-	BINDER_TYPE_WEAK_HANDLE	= B_PACK_CHARS('w', 'h', '*', B_TYPE_LARGE),
-	BINDER_TYPE_FD		= B_PACK_CHARS('f', 'd', '*', B_TYPE_LARGE),
-};
-
-enum {
-	FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff,
-	FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100,
-};
-
-#ifdef BINDER_IPC_32BIT
-typedef __u32 binder_size_t;
-typedef __u32 binder_uintptr_t;
-#else
-typedef __u64 binder_size_t;
-typedef __u64 binder_uintptr_t;
-#endif
-
-/*
- * This is the flattened representation of a Binder object for transfer
- * between processes.  The 'offsets' supplied as part of a binder transaction
- * contains offsets into the data where these structures occur.  The Binder
- * driver takes care of re-writing the structure type and data as it moves
- * between processes.
- */
-struct flat_binder_object {
-	/* 8 bytes for large_flat_header. */
-	__u32		type;
-	__u32		flags;
-
-	/* 8 bytes of data. */
-	union {
-		binder_uintptr_t	binder;	/* local object */
-		__u32			handle;	/* remote object */
-	};
-
-	/* extra data associated with local object */
-	binder_uintptr_t	cookie;
-};
-
-/*
- * On 64-bit platforms where user code may run in 32-bits the driver must
- * translate the buffer (and local binder) addresses appropriately.
- */
-
-struct binder_write_read {
-	binder_size_t		write_size;	/* bytes to write */
-	binder_size_t		write_consumed;	/* bytes consumed by driver */
-	binder_uintptr_t	write_buffer;
-	binder_size_t		read_size;	/* bytes to read */
-	binder_size_t		read_consumed;	/* bytes consumed by driver */
-	binder_uintptr_t	read_buffer;
-};
-
-/* Use with BINDER_VERSION, driver fills in fields. */
-struct binder_version {
-	/* driver protocol version -- increment with incompatible change */
-	__s32       protocol_version;
-};
-
-/* This is the current protocol version. */
-#ifdef BINDER_IPC_32BIT
-#define BINDER_CURRENT_PROTOCOL_VERSION 7
-#else
-#define BINDER_CURRENT_PROTOCOL_VERSION 8
-#endif
-
-#define BINDER_WRITE_READ		_IOWR('b', 1, struct binder_write_read)
-#define BINDER_SET_IDLE_TIMEOUT		_IOW('b', 3, __s64)
-#define BINDER_SET_MAX_THREADS		_IOW('b', 5, __u32)
-#define BINDER_SET_IDLE_PRIORITY	_IOW('b', 6, __s32)
-#define BINDER_SET_CONTEXT_MGR		_IOW('b', 7, __s32)
-#define BINDER_THREAD_EXIT		_IOW('b', 8, __s32)
-#define BINDER_VERSION			_IOWR('b', 9, struct binder_version)
-
-/*
- * NOTE: Two special error codes you should check for when calling
- * in to the driver are:
- *
- * EINTR -- The operation has been interupted.  This should be
- * handled by retrying the ioctl() until a different error code
- * is returned.
- *
- * ECONNREFUSED -- The driver is no longer accepting operations
- * from your process.  That is, the process is being destroyed.
- * You should handle this by exiting from your process.  Note
- * that once this error code is returned, all further calls to
- * the driver from any thread will return this same code.
- */
-
-enum transaction_flags {
-	TF_ONE_WAY	= 0x01,	/* this is a one-way call: async, no return */
-	TF_ROOT_OBJECT	= 0x04,	/* contents are the component's root object */
-	TF_STATUS_CODE	= 0x08,	/* contents are a 32-bit status code */
-	TF_ACCEPT_FDS	= 0x10,	/* allow replies with file descriptors */
-};
-
-struct binder_transaction_data {
-	/* The first two are only used for bcTRANSACTION and brTRANSACTION,
-	 * identifying the target and contents of the transaction.
-	 */
-	union {
-		/* target descriptor of command transaction */
-		__u32	handle;
-		/* target descriptor of return transaction */
-		binder_uintptr_t ptr;
-	} target;
-	binder_uintptr_t	cookie;	/* target object cookie */
-	__u32		code;		/* transaction command */
-
-	/* General information about the transaction. */
-	__u32	        flags;
-	pid_t		sender_pid;
-	uid_t		sender_euid;
-	binder_size_t	data_size;	/* number of bytes of data */
-	binder_size_t	offsets_size;	/* number of bytes of offsets */
-
-	/* If this transaction is inline, the data immediately
-	 * follows here; otherwise, it ends with a pointer to
-	 * the data buffer.
-	 */
-	union {
-		struct {
-			/* transaction data */
-			binder_uintptr_t	buffer;
-			/* offsets from buffer to flat_binder_object structs */
-			binder_uintptr_t	offsets;
-		} ptr;
-		__u8	buf[8];
-	} data;
-};
-
-struct binder_ptr_cookie {
-	binder_uintptr_t ptr;
-	binder_uintptr_t cookie;
-};
-
-struct binder_handle_cookie {
-	__u32 handle;
-	binder_uintptr_t cookie;
-} __attribute__((packed));
-
-struct binder_pri_desc {
-	__s32 priority;
-	__u32 desc;
-};
-
-struct binder_pri_ptr_cookie {
-	__s32 priority;
-	binder_uintptr_t ptr;
-	binder_uintptr_t cookie;
-};
-
-enum binder_driver_return_protocol {
-	BR_ERROR = _IOR('r', 0, __s32),
-	/*
-	 * int: error code
-	 */
-
-	BR_OK = _IO('r', 1),
-	/* No parameters! */
-
-	BR_TRANSACTION = _IOR('r', 2, struct binder_transaction_data),
-	BR_REPLY = _IOR('r', 3, struct binder_transaction_data),
-	/*
-	 * binder_transaction_data: the received command.
-	 */
-
-	BR_ACQUIRE_RESULT = _IOR('r', 4, __s32),
-	/*
-	 * not currently supported
-	 * int: 0 if the last bcATTEMPT_ACQUIRE was not successful.
-	 * Else the remote object has acquired a primary reference.
-	 */
-
-	BR_DEAD_REPLY = _IO('r', 5),
-	/*
-	 * The target of the last transaction (either a bcTRANSACTION or
-	 * a bcATTEMPT_ACQUIRE) is no longer with us.  No parameters.
-	 */
-
-	BR_TRANSACTION_COMPLETE = _IO('r', 6),
-	/*
-	 * No parameters... always refers to the last transaction requested
-	 * (including replies).  Note that this will be sent even for
-	 * asynchronous transactions.
-	 */
-
-	BR_INCREFS = _IOR('r', 7, struct binder_ptr_cookie),
-	BR_ACQUIRE = _IOR('r', 8, struct binder_ptr_cookie),
-	BR_RELEASE = _IOR('r', 9, struct binder_ptr_cookie),
-	BR_DECREFS = _IOR('r', 10, struct binder_ptr_cookie),
-	/*
-	 * void *:	ptr to binder
-	 * void *: cookie for binder
-	 */
-
-	BR_ATTEMPT_ACQUIRE = _IOR('r', 11, struct binder_pri_ptr_cookie),
-	/*
-	 * not currently supported
-	 * int:	priority
-	 * void *: ptr to binder
-	 * void *: cookie for binder
-	 */
-
-	BR_NOOP = _IO('r', 12),
-	/*
-	 * No parameters.  Do nothing and examine the next command.  It exists
-	 * primarily so that we can replace it with a BR_SPAWN_LOOPER command.
-	 */
-
-	BR_SPAWN_LOOPER = _IO('r', 13),
-	/*
-	 * No parameters.  The driver has determined that a process has no
-	 * threads waiting to service incoming transactions.  When a process
-	 * receives this command, it must spawn a new service thread and
-	 * register it via bcENTER_LOOPER.
-	 */
-
-	BR_FINISHED = _IO('r', 14),
-	/*
-	 * not currently supported
-	 * stop threadpool thread
-	 */
-
-	BR_DEAD_BINDER = _IOR('r', 15, binder_uintptr_t),
-	/*
-	 * void *: cookie
-	 */
-	BR_CLEAR_DEATH_NOTIFICATION_DONE = _IOR('r', 16, binder_uintptr_t),
-	/*
-	 * void *: cookie
-	 */
-
-	BR_FAILED_REPLY = _IO('r', 17),
-	/*
-	 * The the last transaction (either a bcTRANSACTION or
-	 * a bcATTEMPT_ACQUIRE) failed (e.g. out of memory).  No parameters.
-	 */
-};
-
-enum binder_driver_command_protocol {
-	BC_TRANSACTION = _IOW('c', 0, struct binder_transaction_data),
-	BC_REPLY = _IOW('c', 1, struct binder_transaction_data),
-	/*
-	 * binder_transaction_data: the sent command.
-	 */
-
-	BC_ACQUIRE_RESULT = _IOW('c', 2, __s32),
-	/*
-	 * not currently supported
-	 * int:  0 if the last BR_ATTEMPT_ACQUIRE was not successful.
-	 * Else you have acquired a primary reference on the object.
-	 */
-
-	BC_FREE_BUFFER = _IOW('c', 3, binder_uintptr_t),
-	/*
-	 * void *: ptr to transaction data received on a read
-	 */
-
-	BC_INCREFS = _IOW('c', 4, __u32),
-	BC_ACQUIRE = _IOW('c', 5, __u32),
-	BC_RELEASE = _IOW('c', 6, __u32),
-	BC_DECREFS = _IOW('c', 7, __u32),
-	/*
-	 * int:	descriptor
-	 */
-
-	BC_INCREFS_DONE = _IOW('c', 8, struct binder_ptr_cookie),
-	BC_ACQUIRE_DONE = _IOW('c', 9, struct binder_ptr_cookie),
-	/*
-	 * void *: ptr to binder
-	 * void *: cookie for binder
-	 */
-
-	BC_ATTEMPT_ACQUIRE = _IOW('c', 10, struct binder_pri_desc),
-	/*
-	 * not currently supported
-	 * int: priority
-	 * int: descriptor
-	 */
-
-	BC_REGISTER_LOOPER = _IO('c', 11),
-	/*
-	 * No parameters.
-	 * Register a spawned looper thread with the device.
-	 */
-
-	BC_ENTER_LOOPER = _IO('c', 12),
-	BC_EXIT_LOOPER = _IO('c', 13),
-	/*
-	 * No parameters.
-	 * These two commands are sent as an application-level thread
-	 * enters and exits the binder loop, respectively.  They are
-	 * used so the binder can have an accurate count of the number
-	 * of looping threads it has available.
-	 */
-
-	BC_REQUEST_DEATH_NOTIFICATION = _IOW('c', 14,
-						struct binder_handle_cookie),
-	/*
-	 * int: handle
-	 * void *: cookie
-	 */
-
-	BC_CLEAR_DEATH_NOTIFICATION = _IOW('c', 15,
-						struct binder_handle_cookie),
-	/*
-	 * int: handle
-	 * void *: cookie
-	 */
-
-	BC_DEAD_BINDER_DONE = _IOW('c', 16, binder_uintptr_t),
-	/*
-	 * void *: cookie
-	 */
-};
-
-#endif /* _LINUX_BINDER_H */
-
diff --git a/openflow/usr/include/linux/apm_bios.h b/openflow/usr/include/linux/apm_bios.h
deleted file mode 100644
index 7fbcc90..0000000
--- a/openflow/usr/include/linux/apm_bios.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Include file for the interface to an APM BIOS
- * Copyright 1994-2001 Stephen Rothwell (sfr@canb.auug.org.au)
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- */
-#ifndef _LINUX_APM_H
-#define _LINUX_APM_H
-
-
-#include <linux/types.h>
-
-typedef unsigned short	apm_event_t;
-typedef unsigned short	apm_eventinfo_t;
-
-struct apm_bios_info {
-	__u16	version;
-	__u16	cseg;
-	__u32	offset;
-	__u16	cseg_16;
-	__u16	dseg;
-	__u16	flags;
-	__u16	cseg_len;
-	__u16	cseg_16_len;
-	__u16	dseg_len;
-};
-
-
-/*
- * Power states
- */
-#define APM_STATE_READY		0x0000
-#define APM_STATE_STANDBY	0x0001
-#define APM_STATE_SUSPEND	0x0002
-#define APM_STATE_OFF		0x0003
-#define APM_STATE_BUSY		0x0004
-#define APM_STATE_REJECT	0x0005
-#define APM_STATE_OEM_SYS	0x0020
-#define APM_STATE_OEM_DEV	0x0040
-
-#define APM_STATE_DISABLE	0x0000
-#define APM_STATE_ENABLE	0x0001
-
-#define APM_STATE_DISENGAGE	0x0000
-#define APM_STATE_ENGAGE	0x0001
-
-/*
- * Events (results of Get PM Event)
- */
-#define APM_SYS_STANDBY		0x0001
-#define APM_SYS_SUSPEND		0x0002
-#define APM_NORMAL_RESUME	0x0003
-#define APM_CRITICAL_RESUME	0x0004
-#define APM_LOW_BATTERY		0x0005
-#define APM_POWER_STATUS_CHANGE	0x0006
-#define APM_UPDATE_TIME		0x0007
-#define APM_CRITICAL_SUSPEND	0x0008
-#define APM_USER_STANDBY	0x0009
-#define APM_USER_SUSPEND	0x000a
-#define APM_STANDBY_RESUME	0x000b
-#define APM_CAPABILITY_CHANGE	0x000c
-#define APM_USER_HIBERNATION	0x000d
-#define APM_HIBERNATION_RESUME	0x000e
-
-/*
- * Error codes
- */
-#define APM_SUCCESS		0x00
-#define APM_DISABLED		0x01
-#define APM_CONNECTED		0x02
-#define APM_NOT_CONNECTED	0x03
-#define APM_16_CONNECTED	0x05
-#define APM_16_UNSUPPORTED	0x06
-#define APM_32_CONNECTED	0x07
-#define APM_32_UNSUPPORTED	0x08
-#define APM_BAD_DEVICE		0x09
-#define APM_BAD_PARAM		0x0a
-#define APM_NOT_ENGAGED		0x0b
-#define APM_BAD_FUNCTION	0x0c
-#define APM_RESUME_DISABLED	0x0d
-#define APM_NO_ERROR		0x53
-#define APM_BAD_STATE		0x60
-#define APM_NO_EVENTS		0x80
-#define APM_NOT_PRESENT		0x86
-
-/*
- * APM Device IDs
- */
-#define APM_DEVICE_BIOS		0x0000
-#define APM_DEVICE_ALL		0x0001
-#define APM_DEVICE_DISPLAY	0x0100
-#define APM_DEVICE_STORAGE	0x0200
-#define APM_DEVICE_PARALLEL	0x0300
-#define APM_DEVICE_SERIAL	0x0400
-#define APM_DEVICE_NETWORK	0x0500
-#define APM_DEVICE_PCMCIA	0x0600
-#define APM_DEVICE_BATTERY	0x8000
-#define APM_DEVICE_OEM		0xe000
-#define APM_DEVICE_OLD_ALL	0xffff
-#define APM_DEVICE_CLASS	0x00ff
-#define APM_DEVICE_MASK		0xff00
-
-
-/*
- * Battery status
- */
-#define APM_MAX_BATTERIES	2
-
-/*
- * APM defined capability bit flags
- */
-#define APM_CAP_GLOBAL_STANDBY		0x0001
-#define APM_CAP_GLOBAL_SUSPEND		0x0002
-#define APM_CAP_RESUME_STANDBY_TIMER	0x0004 /* Timer resume from standby */
-#define APM_CAP_RESUME_SUSPEND_TIMER	0x0008 /* Timer resume from suspend */
-#define APM_CAP_RESUME_STANDBY_RING	0x0010 /* Resume on Ring fr standby */
-#define APM_CAP_RESUME_SUSPEND_RING	0x0020 /* Resume on Ring fr suspend */
-#define APM_CAP_RESUME_STANDBY_PCMCIA	0x0040 /* Resume on PCMCIA Ring	*/
-#define APM_CAP_RESUME_SUSPEND_PCMCIA	0x0080 /* Resume on PCMCIA Ring	*/
-
-/*
- * ioctl operations
- */
-#include <linux/ioctl.h>
-
-#define APM_IOC_STANDBY		_IO('A', 1)
-#define APM_IOC_SUSPEND		_IO('A', 2)
-
-#endif /* _LINUX_APM_H */
diff --git a/openflow/usr/include/linux/arcfb.h b/openflow/usr/include/linux/arcfb.h
deleted file mode 100644
index 721e765..0000000
--- a/openflow/usr/include/linux/arcfb.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __LINUX_ARCFB_H__
-#define __LINUX_ARCFB_H__
-
-#define FBIO_WAITEVENT		_IO('F', 0x88)
-#define FBIO_GETCONTROL2	_IOR('F', 0x89, size_t)
-
-#endif
-
diff --git a/openflow/usr/include/linux/atalk.h b/openflow/usr/include/linux/atalk.h
deleted file mode 100644
index 4e5eefe..0000000
--- a/openflow/usr/include/linux/atalk.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __LINUX_ATALK_H__
-#define __LINUX_ATALK_H__
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <linux/socket.h>
-
-/*
- * AppleTalk networking structures
- *
- * The following are directly referenced from the University Of Michigan
- * netatalk for compatibility reasons.
- */
-#define ATPORT_FIRST	1
-#define ATPORT_RESERVED	128
-#define ATPORT_LAST	254		/* 254 is only legal on localtalk */ 
-#define ATADDR_ANYNET	(__u16)0
-#define ATADDR_ANYNODE	(__u8)0
-#define ATADDR_ANYPORT  (__u8)0
-#define ATADDR_BCAST	(__u8)255
-#define DDP_MAXSZ	587
-#define DDP_MAXHOPS     15		/* 4 bits of hop counter */
-
-#define SIOCATALKDIFADDR       (SIOCPROTOPRIVATE + 0)
-
-struct atalk_addr {
-	__be16	s_net;
-	__u8	s_node;
-};
-
-struct sockaddr_at {
-	__kernel_sa_family_t sat_family;
-	__u8		  sat_port;
-	struct atalk_addr sat_addr;
-	char		  sat_zero[8];
-};
-
-struct atalk_netrange {
-	__u8	nr_phase;
-	__be16	nr_firstnet;
-	__be16	nr_lastnet;
-};
-
-#endif /* __LINUX_ATALK_H__ */
diff --git a/openflow/usr/include/linux/atm.h b/openflow/usr/include/linux/atm.h
deleted file mode 100644
index 08e27be..0000000
--- a/openflow/usr/include/linux/atm.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/* atm.h - general ATM declarations */
- 
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
- 
-
-/*
- * WARNING: User-space programs should not #include <linux/atm.h> directly.
- *          Instead, #include <atm.h>
- */
-
-#ifndef _LINUX_ATM_H
-#define _LINUX_ATM_H
-
-/*
- * BEGIN_xx and END_xx markers are used for automatic generation of
- * documentation. Do not change them.
- */
-
-
-#include <linux/atmapi.h>
-#include <linux/atmsap.h>
-#include <linux/atmioc.h>
-#include <linux/types.h>
-
-
-/* general ATM constants */
-#define ATM_CELL_SIZE		    53	/* ATM cell size incl. header */
-#define ATM_CELL_PAYLOAD	    48	/* ATM payload size */
-#define ATM_AAL0_SDU		    52	/* AAL0 SDU size */
-#define ATM_MAX_AAL34_PDU	 65535	/* maximum AAL3/4 PDU payload */
-#define ATM_AAL5_TRAILER	     8	/* AAL5 trailer size */
-#define ATM_MAX_AAL5_PDU	 65535	/* maximum AAL5 PDU payload */
-#define ATM_MAX_CDV		  9999	/* maximum (default) CDV */
-#define ATM_NOT_RSV_VCI		    32	/* first non-reserved VCI value */
-
-#define ATM_MAX_VPI		   255	/* maximum VPI at the UNI */
-#define ATM_MAX_VPI_NNI		  4096	/* maximum VPI at the NNI */
-#define ATM_MAX_VCI		 65535	/* maximum VCI */
-
-
-/* "protcol" values for the socket system call */
-#define ATM_NO_AAL	0		/* AAL not specified */
-#define ATM_AAL0	13		/* "raw" ATM cells */
-#define ATM_AAL1	1		/* AAL1 (CBR) */
-#define ATM_AAL2	2		/* AAL2 (VBR) */
-#define ATM_AAL34	3		/* AAL3/4 (data) */
-#define ATM_AAL5	5		/* AAL5 (data) */
-
-/*
- * socket option name coding functions
- *
- * Note that __SO_ENCODE and __SO_LEVEL are somewhat a hack since the
- * << 22 only reserves 9 bits for the level.  On some architectures
- * SOL_SOCKET is 0xFFFF, so that's a bit of a problem
- */
-
-#define __SO_ENCODE(l,n,t)	((((l) & 0x1FF) << 22) | ((n) << 16) | \
-				sizeof(t))
-#define __SO_LEVEL_MATCH(c,m)	(((c) >> 22) == ((m) & 0x1FF))
-#define __SO_NUMBER(c)		(((c) >> 16) & 0x3f)
-#define __SO_SIZE(c)		((c) & 0x3fff)
-
-/*
- * ATM layer
- */
-
-#define SO_SETCLP	__SO_ENCODE(SOL_ATM,0,int)
-			    /* set CLP bit value - TODO */
-#define SO_CIRANGE	__SO_ENCODE(SOL_ATM,1,struct atm_cirange)
-			    /* connection identifier range; socket must be
-			       bound or connected */
-#define SO_ATMQOS	__SO_ENCODE(SOL_ATM,2,struct atm_qos)
-			    /* Quality of Service setting */
-#define SO_ATMSAP	__SO_ENCODE(SOL_ATM,3,struct atm_sap)
-			    /* Service Access Point */
-#define SO_ATMPVC	__SO_ENCODE(SOL_ATM,4,struct sockaddr_atmpvc)
-			    /* "PVC" address (also for SVCs); get only */
-#define SO_MULTIPOINT	__SO_ENCODE(SOL_ATM, 5, int)
-			    /* make this vc a p2mp */
-
-
-/*
- * Note @@@: since the socket layers don't really distinguish the control and
- * the data plane but generally seems to be data plane-centric, any layer is
- * about equally wrong for the SAP. If you have a better idea about this,
- * please speak up ...
- */
-
-
-/* ATM cell header (for AAL0) */
-
-/* BEGIN_CH */
-#define ATM_HDR_GFC_MASK	0xf0000000
-#define ATM_HDR_GFC_SHIFT	28
-#define ATM_HDR_VPI_MASK	0x0ff00000
-#define ATM_HDR_VPI_SHIFT	20
-#define ATM_HDR_VCI_MASK	0x000ffff0
-#define ATM_HDR_VCI_SHIFT	4
-#define ATM_HDR_PTI_MASK	0x0000000e
-#define ATM_HDR_PTI_SHIFT	1
-#define ATM_HDR_CLP		0x00000001
-/* END_CH */
-
-
-/* PTI codings */
-
-/* BEGIN_PTI */
-#define ATM_PTI_US0	0  /* user data cell, congestion not exp, SDU-type 0 */
-#define ATM_PTI_US1	1  /* user data cell, congestion not exp, SDU-type 1 */
-#define ATM_PTI_UCES0	2  /* user data cell, cong. experienced, SDU-type 0 */
-#define ATM_PTI_UCES1	3  /* user data cell, cong. experienced, SDU-type 1 */
-#define ATM_PTI_SEGF5	4  /* segment OAM F5 flow related cell */
-#define ATM_PTI_E2EF5	5  /* end-to-end OAM F5 flow related cell */
-#define ATM_PTI_RSV_RM	6  /* reserved for traffic control/resource mgmt */
-#define ATM_PTI_RSV	7  /* reserved */
-/* END_PTI */
-
-
-/*
- * The following items should stay in linux/atm.h, which should be linked to
- * netatm/atm.h
- */
-
-/* Traffic description */
-
-#define ATM_NONE	0		/* no traffic */
-#define ATM_UBR		1
-#define ATM_CBR		2
-#define ATM_VBR		3
-#define ATM_ABR		4
-#define ATM_ANYCLASS	5		/* compatible with everything */
-
-#define ATM_MAX_PCR	-1		/* maximum available PCR */
-
-struct atm_trafprm {
-	unsigned char	traffic_class;	/* traffic class (ATM_UBR, ...) */
-	int		max_pcr;	/* maximum PCR in cells per second */
-	int		pcr;		/* desired PCR in cells per second */
-	int		min_pcr;	/* minimum PCR in cells per second */
-	int		max_cdv;	/* maximum CDV in microseconds */
-	int		max_sdu;	/* maximum SDU in bytes */
-        /* extra params for ABR */
-        unsigned int 	icr;         	/* Initial Cell Rate (24-bit) */
-        unsigned int	tbe;		/* Transient Buffer Exposure (24-bit) */ 
-        unsigned int 	frtt : 24;	/* Fixed Round Trip Time (24-bit) */
-        unsigned int 	rif  : 4;       /* Rate Increment Factor (4-bit) */
-        unsigned int 	rdf  : 4;       /* Rate Decrease Factor (4-bit) */
-        unsigned int nrm_pres  :1;      /* nrm present bit */
-        unsigned int trm_pres  :1;     	/* rm present bit */
-        unsigned int adtf_pres :1;     	/* adtf present bit */
-        unsigned int cdf_pres  :1;    	/* cdf present bit*/
-        unsigned int nrm       :3;     	/* Max # of Cells for each forward RM cell (3-bit) */
-        unsigned int trm       :3;    	/* Time between forward RM cells (3-bit) */    
-	unsigned int adtf      :10;     /* ACR Decrease Time Factor (10-bit) */
-	unsigned int cdf       :3;      /* Cutoff Decrease Factor (3-bit) */
-        unsigned int spare     :9;      /* spare bits */ 
-};
-
-struct atm_qos {
-	struct atm_trafprm txtp;	/* parameters in TX direction */
-	struct atm_trafprm rxtp __ATM_API_ALIGN;
-					/* parameters in RX direction */
-	unsigned char aal __ATM_API_ALIGN;
-};
-
-/* PVC addressing */
-
-#define ATM_ITF_ANY	-1		/* "magic" PVC address values */
-#define ATM_VPI_ANY	-1
-#define ATM_VCI_ANY	-1
-#define ATM_VPI_UNSPEC	-2
-#define ATM_VCI_UNSPEC	-2
-
-
-struct sockaddr_atmpvc {
-	unsigned short 	sap_family;	/* address family, AF_ATMPVC  */
-	struct {			/* PVC address */
-		short	itf;		/* ATM interface */
-		short	vpi;		/* VPI (only 8 bits at UNI) */
-		int	vci;		/* VCI (only 16 bits at UNI) */
-	} sap_addr __ATM_API_ALIGN;	/* PVC address */
-};
-
-/* SVC addressing */
-
-#define	ATM_ESA_LEN	20		/* ATM End System Address length */
-#define ATM_E164_LEN	12		/* maximum E.164 number length */
-
-#define ATM_AFI_DCC	0x39		/* DCC ATM Format */
-#define ATM_AFI_ICD	0x47		/* ICD ATM Format */
-#define ATM_AFI_E164	0x45		/* E.164 ATM Format */
-#define ATM_AFI_LOCAL	0x49		/* Local ATM Format */ 
-
-#define ATM_AFI_DCC_GROUP	0xBD	/* DCC ATM Group Format */
-#define ATM_AFI_ICD_GROUP	0xC5	/* ICD ATM Group Format */
-#define ATM_AFI_E164_GROUP	0xC3	/* E.164 ATM Group Format */
-#define ATM_AFI_LOCAL_GROUP	0xC7	/* Local ATM Group Format */
-
-#define ATM_LIJ_NONE	0		/* no leaf-initiated join */
-#define ATM_LIJ		1		/* request joining */
-#define ATM_LIJ_RPJ	2		/* set to root-prompted join */
-#define ATM_LIJ_NJ	3		/* set to network join */
-
-
-struct sockaddr_atmsvc {
-    unsigned short 	sas_family;	/* address family, AF_ATMSVC */
-    struct {				/* SVC address */
-        unsigned char	prv[ATM_ESA_LEN];/* private ATM address */
-        char		pub[ATM_E164_LEN+1]; /* public address (E.164) */
-    					/* unused addresses must be bzero'ed */
-	char		lij_type;	/* role in LIJ call; one of ATM_LIJ* */
-	__u32	lij_id;		/* LIJ call identifier */
-    } sas_addr __ATM_API_ALIGN;		/* SVC address */
-};
-
-
-static __inline__ int atmsvc_addr_in_use(struct sockaddr_atmsvc addr)
-{
-	return *addr.sas_addr.prv || *addr.sas_addr.pub;
-}
-
-
-static __inline__ int atmpvc_addr_in_use(struct sockaddr_atmpvc addr)
-{
-	return addr.sap_addr.itf || addr.sap_addr.vpi || addr.sap_addr.vci;
-}
-
-
-/*
- * Some stuff for linux/sockios.h
- */
-
-struct atmif_sioc {
-	int number;
-	int length;
-	void *arg;
-};
-
-
-typedef unsigned short atm_backend_t;
-#endif /* _LINUX_ATM_H */
diff --git a/openflow/usr/include/linux/atm_eni.h b/openflow/usr/include/linux/atm_eni.h
deleted file mode 100644
index 34f3179..0000000
--- a/openflow/usr/include/linux/atm_eni.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* atm_eni.h - Driver-specific declarations of the ENI driver (for use by
-	       driver-specific utilities) */
-
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
-
-
-#ifndef LINUX_ATM_ENI_H
-#define LINUX_ATM_ENI_H
-
-#include <linux/atmioc.h>
-
-
-struct eni_multipliers {
-	int tx,rx;	/* values are in percent and must be > 100 */
-};
-
-
-#define ENI_MEMDUMP     _IOW('a',ATMIOC_SARPRV,struct atmif_sioc)
-                                                /* printk memory map */
-#define ENI_SETMULT	_IOW('a',ATMIOC_SARPRV+7,struct atmif_sioc)
-						/* set buffer multipliers */
-
-#endif
diff --git a/openflow/usr/include/linux/atm_he.h b/openflow/usr/include/linux/atm_he.h
deleted file mode 100644
index 2a7713b..0000000
--- a/openflow/usr/include/linux/atm_he.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* atm_he.h */
-
-#ifndef LINUX_ATM_HE_H
-#define LINUX_ATM_HE_H
-
-#include <linux/atmioc.h>
-
-#define HE_GET_REG	_IOW('a', ATMIOC_SARPRV, struct atmif_sioc)
-
-#define HE_REGTYPE_PCI	1
-#define HE_REGTYPE_RCM	2
-#define HE_REGTYPE_TCM	3
-#define HE_REGTYPE_MBOX	4
-
-struct he_ioctl_reg {
-	unsigned addr, val;
-	char type;
-};
-
-#endif /* LINUX_ATM_HE_H */
diff --git a/openflow/usr/include/linux/atm_idt77105.h b/openflow/usr/include/linux/atm_idt77105.h
deleted file mode 100644
index 8b72400..0000000
--- a/openflow/usr/include/linux/atm_idt77105.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* atm_idt77105.h - Driver-specific declarations of the IDT77105 driver (for
- * use by driver-specific utilities) */
-
-/* Written 1999 by Greg Banks <gnb@linuxfan.com>. Copied from atm_suni.h. */
-
-
-#ifndef LINUX_ATM_IDT77105_H
-#define LINUX_ATM_IDT77105_H
-
-#include <linux/types.h>
-#include <linux/atmioc.h>
-#include <linux/atmdev.h>
-
-/*
- * Structure for IDT77105_GETSTAT and IDT77105_GETSTATZ ioctls.
- * Pointed to by `arg' in atmif_sioc.
- */
-struct idt77105_stats {
-        __u32 symbol_errors;  /* wire symbol errors */
-        __u32 tx_cells;       /* cells transmitted */
-        __u32 rx_cells;       /* cells received */
-        __u32 rx_hec_errors;  /* Header Error Check errors on receive */
-};
-
-#define IDT77105_GETSTAT	_IOW('a',ATMIOC_PHYPRV+2,struct atmif_sioc)	/* get stats */
-#define IDT77105_GETSTATZ	_IOW('a',ATMIOC_PHYPRV+3,struct atmif_sioc)	/* get stats and zero */
-
-#endif
diff --git a/openflow/usr/include/linux/atm_nicstar.h b/openflow/usr/include/linux/atm_nicstar.h
deleted file mode 100644
index 577b79f..0000000
--- a/openflow/usr/include/linux/atm_nicstar.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- *
- * atm_nicstar.h
- *
- * Driver-specific declarations for use by NICSTAR driver specific utils.
- *
- * Author: Rui Prior
- *
- * (C) INESC 1998
- *
- ******************************************************************************/
-
-
-#ifndef LINUX_ATM_NICSTAR_H
-#define LINUX_ATM_NICSTAR_H
-
-/* Note: non-kernel programs including this file must also include
- * sys/types.h for struct timeval
- */
-
-#include <linux/atmapi.h>
-#include <linux/atmioc.h>
-
-#define NS_GETPSTAT	_IOWR('a',ATMIOC_SARPRV+1,struct atmif_sioc)
-						/* get pool statistics */
-#define NS_SETBUFLEV	_IOW('a',ATMIOC_SARPRV+2,struct atmif_sioc)
-						/* set buffer level markers */
-#define NS_ADJBUFLEV	_IO('a',ATMIOC_SARPRV+3)
-						/* adjust buffer level */
-
-typedef struct buf_nr
-{
-   unsigned min;
-   unsigned init;
-   unsigned max;
-}buf_nr;
-
-
-typedef struct pool_levels
-{
-   int buftype;
-   int count;		/* (At least for now) only used in NS_GETPSTAT */
-   buf_nr level;
-} pool_levels;
-
-/* type must be one of the following: */
-#define NS_BUFTYPE_SMALL 1
-#define NS_BUFTYPE_LARGE 2
-#define NS_BUFTYPE_HUGE 3
-#define NS_BUFTYPE_IOVEC 4
-
-
-#endif /* LINUX_ATM_NICSTAR_H */
diff --git a/openflow/usr/include/linux/atm_tcp.h b/openflow/usr/include/linux/atm_tcp.h
deleted file mode 100644
index f3aa76a..0000000
--- a/openflow/usr/include/linux/atm_tcp.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* atm_tcp.h - Driver-specific declarations of the ATMTCP driver (for use by
-	       driver-specific utilities) */
-
-/* Written 1997-2000 by Werner Almesberger, EPFL LRC/ICA */
-
-
-#ifndef LINUX_ATM_TCP_H
-#define LINUX_ATM_TCP_H
-
-#include <linux/atmapi.h>
-#include <linux/atm.h>
-#include <linux/atmioc.h>
-#include <linux/types.h>
-
-
-/*
- * All values in struct atmtcp_hdr are in network byte order
- */
-
-struct atmtcp_hdr {
-	__u16	vpi;
-	__u16	vci;
-	__u32	length;		/* ... of data part */
-};
-
-/*
- * All values in struct atmtcp_command are in host byte order
- */
-
-#define ATMTCP_HDR_MAGIC	(~0)	/* this length indicates a command */
-#define ATMTCP_CTRL_OPEN	1	/* request/reply */
-#define ATMTCP_CTRL_CLOSE	2	/* request/reply */
-
-struct atmtcp_control {
-	struct atmtcp_hdr hdr;	/* must be first */
-	int type;		/* message type; both directions */
-	atm_kptr_t vcc;		/* both directions */
-	struct sockaddr_atmpvc addr; /* suggested value from kernel */
-	struct atm_qos	qos;	/* both directions */
-	int result;		/* to kernel only */
-} __ATM_API_ALIGN;
-
-/*
- * Field usage:
- * Messge type	dir.	hdr.v?i	type	addr	qos	vcc	result
- * -----------  ----	------- ----	----	---	---	------
- * OPEN		K->D	Y	Y	Y	Y	Y	0
- * OPEN		D->K	-	Y	Y	Y	Y	Y
- * CLOSE	K->D	-	-	Y	-	Y	0
- * CLOSE	D->K	-	-	-	-	Y	Y
- */
-
-#define SIOCSIFATMTCP	_IO('a',ATMIOC_ITF)	/* set ATMTCP mode */
-#define ATMTCP_CREATE	_IO('a',ATMIOC_ITF+14)	/* create persistent ATMTCP
-						   interface */
-#define ATMTCP_REMOVE	_IO('a',ATMIOC_ITF+15)	/* destroy persistent ATMTCP
-						   interface */
-
-
-
-#endif /* LINUX_ATM_TCP_H */
diff --git a/openflow/usr/include/linux/atm_zatm.h b/openflow/usr/include/linux/atm_zatm.h
deleted file mode 100644
index 9c9c6ad..0000000
--- a/openflow/usr/include/linux/atm_zatm.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* atm_zatm.h - Driver-specific declarations of the ZATM driver (for use by
-		driver-specific utilities) */
-
-/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
-
-
-#ifndef LINUX_ATM_ZATM_H
-#define LINUX_ATM_ZATM_H
-
-/*
- * Note: non-kernel programs including this file must also include
- * sys/types.h for struct timeval
- */
-
-#include <linux/atmapi.h>
-#include <linux/atmioc.h>
-
-#define ZATM_GETPOOL	_IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
-						/* get pool statistics */
-#define ZATM_GETPOOLZ	_IOW('a',ATMIOC_SARPRV+2,struct atmif_sioc)
-						/* get statistics and zero */
-#define ZATM_SETPOOL	_IOW('a',ATMIOC_SARPRV+3,struct atmif_sioc)
-						/* set pool parameters */
-
-struct zatm_pool_info {
-	int ref_count;			/* free buffer pool usage counters */
-	int low_water,high_water;	/* refill parameters */
-	int rqa_count,rqu_count;	/* queue condition counters */
-	int offset,next_off;		/* alignment optimizations: offset */
-	int next_cnt,next_thres;	/* repetition counter and threshold */
-};
-
-struct zatm_pool_req {
-	int pool_num;			/* pool number */
-	struct zatm_pool_info info;	/* actual information */
-};
-
-#define ZATM_OAM_POOL		0	/* free buffer pool for OAM cells */
-#define ZATM_AAL0_POOL		1	/* free buffer pool for AAL0 cells */
-#define ZATM_AAL5_POOL_BASE	2	/* first AAL5 free buffer pool */
-#define ZATM_LAST_POOL	ZATM_AAL5_POOL_BASE+10 /* max. 64 kB */
-
-#define ZATM_TIMER_HISTORY_SIZE	16	/* number of timer adjustments to
-					   record; must be 2^n */
-
-#endif
diff --git a/openflow/usr/include/linux/atmapi.h b/openflow/usr/include/linux/atmapi.h
deleted file mode 100644
index 8fe54d9..0000000
--- a/openflow/usr/include/linux/atmapi.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* atmapi.h - ATM API user space/kernel compatibility */
- 
-/* Written 1999,2000 by Werner Almesberger, EPFL ICA */
- 
-
-#ifndef _LINUX_ATMAPI_H
-#define _LINUX_ATMAPI_H
-
-#if defined(__sparc__) || defined(__ia64__)
-/* such alignment is not required on 32 bit sparcs, but we can't
-   figure that we are on a sparc64 while compiling user-space programs. */
-#define __ATM_API_ALIGN	__attribute__((aligned(8)))
-#else
-#define __ATM_API_ALIGN
-#endif
-
-
-/*
- * Opaque type for kernel pointers. Note that _ is never accessed. We need
- * the struct in order hide the array, so that we can make simple assignments
- * instead of being forced to use memcpy. It also improves error reporting for
- * code that still assumes that we're passing unsigned longs.
- *
- * Convention: NULL pointers are passed as a field of all zeroes.
- */
- 
-typedef struct { unsigned char _[8]; } __ATM_API_ALIGN atm_kptr_t;
-
-#endif
diff --git a/openflow/usr/include/linux/atmarp.h b/openflow/usr/include/linux/atmarp.h
deleted file mode 100644
index 231f4bd..0000000
--- a/openflow/usr/include/linux/atmarp.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* atmarp.h - ATM ARP protocol and kernel-demon interface definitions */
- 
-/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
- 
-
-#ifndef _LINUX_ATMARP_H
-#define _LINUX_ATMARP_H
-
-#include <linux/types.h>
-#include <linux/atmapi.h>
-#include <linux/atmioc.h>
-
-
-#define ATMARP_RETRY_DELAY 30		/* request next resolution or forget
-					   NAK after 30 sec - should go into
-					   atmclip.h */
-#define ATMARP_MAX_UNRES_PACKETS 5	/* queue that many packets while
-					   waiting for the resolver */
-
-
-#define ATMARPD_CTRL	_IO('a',ATMIOC_CLIP+1)	/* become atmarpd ctrl sock */
-#define ATMARP_MKIP	_IO('a',ATMIOC_CLIP+2)	/* attach socket to IP */
-#define ATMARP_SETENTRY	_IO('a',ATMIOC_CLIP+3)	/* fill or hide ARP entry */
-#define ATMARP_ENCAP	_IO('a',ATMIOC_CLIP+5)	/* change encapsulation */
-
-
-enum atmarp_ctrl_type {
-	act_invalid,		/* catch uninitialized structures */
-	act_need,		/* need address resolution */
-	act_up,			/* interface is coming up */
-	act_down,		/* interface is going down */
-	act_change		/* interface configuration has changed */
-};
-
-struct atmarp_ctrl {
-	enum atmarp_ctrl_type	type;	/* message type */
-	int			itf_num;/* interface number (if present) */
-	__be32			ip;	/* IP address (act_need only) */
-};
-
-#endif
diff --git a/openflow/usr/include/linux/atmbr2684.h b/openflow/usr/include/linux/atmbr2684.h
deleted file mode 100644
index fdb2629..0000000
--- a/openflow/usr/include/linux/atmbr2684.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef _LINUX_ATMBR2684_H
-#define _LINUX_ATMBR2684_H
-
-#include <linux/types.h>
-#include <linux/atm.h>
-#include <linux/if.h>		/* For IFNAMSIZ */
-
-/*
- * Type of media we're bridging (ethernet, token ring, etc)  Currently only
- * ethernet is supported
- */
-#define BR2684_MEDIA_ETHERNET	(0)	/* 802.3 */
-#define BR2684_MEDIA_802_4	(1)	/* 802.4 */
-#define BR2684_MEDIA_TR		(2)	/* 802.5 - token ring */
-#define BR2684_MEDIA_FDDI	(3)
-#define BR2684_MEDIA_802_6	(4)	/* 802.6 */
-
-					/* used only at device creation:  */
-#define BR2684_FLAG_ROUTED	(1<<16)	/* payload is routed, not bridged */
-
-/*
- * Is there FCS inbound on this VC?  This currently isn't supported.
- */
-#define BR2684_FCSIN_NO		(0)
-#define BR2684_FCSIN_IGNORE	(1)
-#define BR2684_FCSIN_VERIFY	(2)
-
-/*
- * Is there FCS outbound on this VC?  This currently isn't supported.
- */
-#define BR2684_FCSOUT_NO	(0)
-#define BR2684_FCSOUT_SENDZERO	(1)
-#define BR2684_FCSOUT_GENERATE	(2)
-
-/*
- * Does this VC include LLC encapsulation?
- */
-#define BR2684_ENCAPS_VC	(0)	/* VC-mux */
-#define BR2684_ENCAPS_LLC	(1)
-#define BR2684_ENCAPS_AUTODETECT (2)	/* Unsuported */
-
-/*
- * Is this VC bridged or routed?
- */
-
-#define BR2684_PAYLOAD_ROUTED   (0)
-#define BR2684_PAYLOAD_BRIDGED  (1)
-
-/*
- * This is for the ATM_NEWBACKENDIF call - these are like socket families:
- * the first element of the structure is the backend number and the rest
- * is per-backend specific
- */
-struct atm_newif_br2684 {
-	atm_backend_t backend_num;	/* ATM_BACKEND_BR2684 */
-	int media;		/* BR2684_MEDIA_*, flags in upper bits */
-	char ifname[IFNAMSIZ];
-	int mtu;
-};
-
-/*
- * This structure is used to specify a br2684 interface - either by a
- * positive integer (returned by ATM_NEWBACKENDIF) or the interfaces name
- */
-#define BR2684_FIND_BYNOTHING	(0)
-#define BR2684_FIND_BYNUM	(1)
-#define BR2684_FIND_BYIFNAME	(2)
-struct br2684_if_spec {
-	int method;		/* BR2684_FIND_* */
-	union {
-		char ifname[IFNAMSIZ];
-		int devnum;
-	} spec;
-};
-
-/*
- * This is for the ATM_SETBACKEND call - these are like socket families:
- * the first element of the structure is the backend number and the rest
- * is per-backend specific
- */
-struct atm_backend_br2684 {
-	atm_backend_t backend_num;	/* ATM_BACKEND_BR2684 */
-	struct br2684_if_spec ifspec;
-	int fcs_in;		/* BR2684_FCSIN_* */
-	int fcs_out;		/* BR2684_FCSOUT_* */
-	int fcs_auto;		/* 1: fcs_{in,out} disabled if no FCS rx'ed */
-	int encaps;		/* BR2684_ENCAPS_* */
-	int has_vpiid;		/* 1: use vpn_id - Unsupported */
-	__u8 vpn_id[7];
-	int send_padding;	/* unsupported */
-	int min_size;		/* we will pad smaller packets than this */
-};
-
-/*
- * The BR2684_SETFILT ioctl is an experimental mechanism for folks
- * terminating a large number of IP-only vcc's.  When netfilter allows
- * efficient per-if in/out filters, this support will be removed
- */
-struct br2684_filter {
-	__be32 prefix;		/* network byte order */
-	__be32 netmask;		/* 0 = disable filter */
-};
-
-struct br2684_filter_set {
-	struct br2684_if_spec ifspec;
-	struct br2684_filter filter;
-};
-
-enum br2684_payload {
-	p_routed = BR2684_PAYLOAD_ROUTED,
-	p_bridged = BR2684_PAYLOAD_BRIDGED,
-};
-
-#define BR2684_SETFILT	_IOW( 'a', ATMIOC_BACKEND + 0, \
-				struct br2684_filter_set)
-
-#endif /* _LINUX_ATMBR2684_H */
diff --git a/openflow/usr/include/linux/atmclip.h b/openflow/usr/include/linux/atmclip.h
deleted file mode 100644
index 02c94c4..0000000
--- a/openflow/usr/include/linux/atmclip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* atmclip.h - Classical IP over ATM */
- 
-/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
- 
-
-#ifndef LINUX_ATMCLIP_H
-#define LINUX_ATMCLIP_H
-
-#include <linux/sockios.h>
-#include <linux/atmioc.h>
-
-
-#define RFC1483LLC_LEN	8		/* LLC+OUI+PID = 8 */
-#define RFC1626_MTU	9180		/* RFC1626 default MTU */
-
-#define CLIP_DEFAULT_IDLETIMER 1200	/* 20 minutes, see RFC1755 */
-#define CLIP_CHECK_INTERVAL	 10	/* check every ten seconds */
-
-#define	SIOCMKCLIP	_IO('a',ATMIOC_CLIP)	/* create IP interface */
-
-#endif
diff --git a/openflow/usr/include/linux/atmdev.h b/openflow/usr/include/linux/atmdev.h
deleted file mode 100644
index 8faa8b9..0000000
--- a/openflow/usr/include/linux/atmdev.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* atmdev.h - ATM device driver declarations and various related items */
- 
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
- 
-
-#ifndef LINUX_ATMDEV_H
-#define LINUX_ATMDEV_H
-
-
-#include <linux/atmapi.h>
-#include <linux/atm.h>
-#include <linux/atmioc.h>
-
-
-#define ESI_LEN		6
-
-#define ATM_OC3_PCR	(155520000/270*260/8/53)
-			/* OC3 link rate:  155520000 bps
-			   SONET overhead: /270*260 (9 section, 1 path)
-			   bits per cell:  /8/53
-			   max cell rate:  353207.547 cells/sec */
-#define ATM_25_PCR	((25600000/8-8000)/54)
-			/* 25 Mbps ATM cell rate (59111) */
-#define ATM_OC12_PCR	(622080000/1080*1040/8/53)
-			/* OC12 link rate: 622080000 bps
-			   SONET overhead: /1080*1040
-			   bits per cell:  /8/53
-			   max cell rate:  1412830.188 cells/sec */
-#define ATM_DS3_PCR	(8000*12)
-			/* DS3: 12 cells in a 125 usec time slot */
-
-
-#define __AAL_STAT_ITEMS \
-    __HANDLE_ITEM(tx);			/* TX okay */ \
-    __HANDLE_ITEM(tx_err);		/* TX errors */ \
-    __HANDLE_ITEM(rx);			/* RX okay */ \
-    __HANDLE_ITEM(rx_err);		/* RX errors */ \
-    __HANDLE_ITEM(rx_drop);		/* RX out of memory */
-
-struct atm_aal_stats {
-#define __HANDLE_ITEM(i) int i
-	__AAL_STAT_ITEMS
-#undef __HANDLE_ITEM
-};
-
-
-struct atm_dev_stats {
-	struct atm_aal_stats aal0;
-	struct atm_aal_stats aal34;
-	struct atm_aal_stats aal5;
-} __ATM_API_ALIGN;
-
-
-#define ATM_GETLINKRATE	_IOW('a',ATMIOC_ITF+1,struct atmif_sioc)
-					/* get link rate */
-#define ATM_GETNAMES	_IOW('a',ATMIOC_ITF+3,struct atm_iobuf)
-					/* get interface names (numbers) */
-#define ATM_GETTYPE	_IOW('a',ATMIOC_ITF+4,struct atmif_sioc)
-					/* get interface type name */
-#define ATM_GETESI	_IOW('a',ATMIOC_ITF+5,struct atmif_sioc)
-					/* get interface ESI */
-#define ATM_GETADDR	_IOW('a',ATMIOC_ITF+6,struct atmif_sioc)
-					/* get itf's local ATM addr. list */
-#define ATM_RSTADDR	_IOW('a',ATMIOC_ITF+7,struct atmif_sioc)
-					/* reset itf's ATM address list */
-#define ATM_ADDADDR	_IOW('a',ATMIOC_ITF+8,struct atmif_sioc)
-					/* add a local ATM address */
-#define ATM_DELADDR	_IOW('a',ATMIOC_ITF+9,struct atmif_sioc)
-					/* remove a local ATM address */
-#define ATM_GETCIRANGE	_IOW('a',ATMIOC_ITF+10,struct atmif_sioc)
-					/* get connection identifier range */
-#define ATM_SETCIRANGE	_IOW('a',ATMIOC_ITF+11,struct atmif_sioc)
-					/* set connection identifier range */
-#define ATM_SETESI	_IOW('a',ATMIOC_ITF+12,struct atmif_sioc)
-					/* set interface ESI */
-#define ATM_SETESIF	_IOW('a',ATMIOC_ITF+13,struct atmif_sioc)
-					/* force interface ESI */
-#define ATM_ADDLECSADDR	_IOW('a', ATMIOC_ITF+14, struct atmif_sioc)
-					/* register a LECS address */
-#define ATM_DELLECSADDR	_IOW('a', ATMIOC_ITF+15, struct atmif_sioc)
-					/* unregister a LECS address */
-#define ATM_GETLECSADDR	_IOW('a', ATMIOC_ITF+16, struct atmif_sioc)
-					/* retrieve LECS address(es) */
-
-#define ATM_GETSTAT	_IOW('a',ATMIOC_SARCOM+0,struct atmif_sioc)
-					/* get AAL layer statistics */
-#define ATM_GETSTATZ	_IOW('a',ATMIOC_SARCOM+1,struct atmif_sioc)
-					/* get AAL layer statistics and zero */
-#define ATM_GETLOOP	_IOW('a',ATMIOC_SARCOM+2,struct atmif_sioc)
-					/* get loopback mode */
-#define ATM_SETLOOP	_IOW('a',ATMIOC_SARCOM+3,struct atmif_sioc)
-					/* set loopback mode */
-#define ATM_QUERYLOOP	_IOW('a',ATMIOC_SARCOM+4,struct atmif_sioc)
-					/* query supported loopback modes */
-#define ATM_SETSC	_IOW('a',ATMIOC_SPECIAL+1,int)
-					/* enable or disable single-copy */
-#define ATM_SETBACKEND	_IOW('a',ATMIOC_SPECIAL+2,atm_backend_t)
-					/* set backend handler */
-#define ATM_NEWBACKENDIF _IOW('a',ATMIOC_SPECIAL+3,atm_backend_t)
-					/* use backend to make new if */
-#define ATM_ADDPARTY  	_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
- 					/* add party to p2mp call */
-#ifdef CONFIG_COMPAT
-/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */
-#define COMPAT_ATM_ADDPARTY  	_IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf)
-#endif
-#define ATM_DROPPARTY 	_IOW('a', ATMIOC_SPECIAL+5,int)
-					/* drop party from p2mp call */
-
-/*
- * These are backend handkers that can be set via the ATM_SETBACKEND call
- * above.  In the future we may support dynamic loading of these - for now,
- * they're just being used to share the ATMIOC_BACKEND ioctls
- */
-#define ATM_BACKEND_RAW		0	
-#define ATM_BACKEND_PPP		1	/* PPPoATM - RFC2364 */
-#define ATM_BACKEND_BR2684	2	/* Bridged RFC1483/2684 */
-
-/* for ATM_GETTYPE */
-#define ATM_ITFTYP_LEN	8	/* maximum length of interface type name */
-
-/*
- * Loopback modes for ATM_{PHY,SAR}_{GET,SET}LOOP
- */
-
-/* Point of loopback				CPU-->SAR-->PHY-->line--> ... */
-#define __ATM_LM_NONE	0	/* no loop back     ^     ^     ^      ^      */
-#define __ATM_LM_AAL	1	/* loop back PDUs --'     |     |      |      */
-#define __ATM_LM_ATM	2	/* loop back ATM cells ---'     |      |      */
-/* RESERVED		4	loop back on PHY side  ---'		      */
-#define __ATM_LM_PHY	8	/* loop back bits (digital) ----'      |      */
-#define __ATM_LM_ANALOG 16	/* loop back the analog signal --------'      */
-
-/* Direction of loopback */
-#define __ATM_LM_MKLOC(n)	((n))	    /* Local (i.e. loop TX to RX) */
-#define __ATM_LM_MKRMT(n)	((n) << 8)  /* Remote (i.e. loop RX to TX) */
-
-#define __ATM_LM_XTLOC(n)	((n) & 0xff)
-#define __ATM_LM_XTRMT(n)	(((n) >> 8) & 0xff)
-
-#define ATM_LM_NONE	0	/* no loopback */
-
-#define ATM_LM_LOC_AAL	__ATM_LM_MKLOC(__ATM_LM_AAL)
-#define ATM_LM_LOC_ATM	__ATM_LM_MKLOC(__ATM_LM_ATM)
-#define ATM_LM_LOC_PHY	__ATM_LM_MKLOC(__ATM_LM_PHY)
-#define ATM_LM_LOC_ANALOG __ATM_LM_MKLOC(__ATM_LM_ANALOG)
-
-#define ATM_LM_RMT_AAL	__ATM_LM_MKRMT(__ATM_LM_AAL)
-#define ATM_LM_RMT_ATM	__ATM_LM_MKRMT(__ATM_LM_ATM)
-#define ATM_LM_RMT_PHY	__ATM_LM_MKRMT(__ATM_LM_PHY)
-#define ATM_LM_RMT_ANALOG __ATM_LM_MKRMT(__ATM_LM_ANALOG)
-
-/*
- * Note: ATM_LM_LOC_* and ATM_LM_RMT_* can be combined, provided that
- * __ATM_LM_XTLOC(x) <= __ATM_LM_XTRMT(x)
- */
-
-
-struct atm_iobuf {
-	int length;
-	void *buffer;
-};
-
-/* for ATM_GETCIRANGE / ATM_SETCIRANGE */
-
-#define ATM_CI_MAX      -1              /* use maximum range of VPI/VCI */
- 
-struct atm_cirange {
-	signed char	vpi_bits;	/* 1..8, ATM_CI_MAX (-1) for maximum */
-	signed char	vci_bits;	/* 1..16, ATM_CI_MAX (-1) for maximum */
-};
-
-/* for ATM_SETSC; actually taken from the ATM_VF number space */
-
-#define ATM_SC_RX	1024		/* enable RX single-copy */
-#define ATM_SC_TX	2048		/* enable TX single-copy */
-
-#define ATM_BACKLOG_DEFAULT 32 /* if we get more, we're likely to time out
-				  anyway */
-
-/* MF: change_qos (Modify) flags */
-
-#define ATM_MF_IMMED	 1	/* Block until change is effective */
-#define ATM_MF_INC_RSV	 2	/* Change reservation on increase */
-#define ATM_MF_INC_SHP	 4	/* Change shaping on increase */
-#define ATM_MF_DEC_RSV	 8	/* Change reservation on decrease */
-#define ATM_MF_DEC_SHP	16	/* Change shaping on decrease */
-#define ATM_MF_BWD	32	/* Set the backward direction parameters */
-
-#define ATM_MF_SET	(ATM_MF_INC_RSV | ATM_MF_INC_SHP | ATM_MF_DEC_RSV | \
-			  ATM_MF_DEC_SHP | ATM_MF_BWD)
-
-/*
- * ATM_VS_* are used to express VC state in a human-friendly way.
- */
-
-#define ATM_VS_IDLE	0	/* VC is not used */
-#define ATM_VS_CONNECTED 1	/* VC is connected */
-#define ATM_VS_CLOSING	2	/* VC is closing */
-#define ATM_VS_LISTEN	3	/* VC is listening for incoming setups */
-#define ATM_VS_INUSE	4	/* VC is in use (registered with atmsigd) */
-#define ATM_VS_BOUND	5	/* VC is bound */
-
-#define ATM_VS2TXT_MAP \
-    "IDLE", "CONNECTED", "CLOSING", "LISTEN", "INUSE", "BOUND"
-
-#define ATM_VF2TXT_MAP \
-    "ADDR",	"READY",	"PARTIAL",	"REGIS", \
-    "RELEASED", "HASQOS",	"LISTEN",	"META", \
-    "256",	"512",		"1024",		"2048", \
-    "SESSION",	"HASSAP",	"BOUND",	"CLOSE"
-
-
-
-#endif /* LINUX_ATMDEV_H */
diff --git a/openflow/usr/include/linux/atmioc.h b/openflow/usr/include/linux/atmioc.h
deleted file mode 100644
index 37f67aa..0000000
--- a/openflow/usr/include/linux/atmioc.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* atmioc.h - ranges for ATM-related ioctl numbers */
- 
-/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
-
-
-/*
- * See http://icawww1.epfl.ch/linux-atm/magic.html for the complete list of
- * "magic" ioctl numbers.
- */
-
-
-#ifndef _LINUX_ATMIOC_H
-#define _LINUX_ATMIOC_H
-
-#include <asm/ioctl.h>
-		/* everybody including atmioc.h will also need _IO{,R,W,WR} */
-
-#define ATMIOC_PHYCOM	  0x00 /* PHY device common ioctls, globally unique */
-#define ATMIOC_PHYCOM_END 0x0f
-#define ATMIOC_PHYTYP	  0x10 /* PHY dev type ioctls, unique per PHY type */
-#define ATMIOC_PHYTYP_END 0x2f
-#define ATMIOC_PHYPRV	  0x30 /* PHY dev private ioctls, unique per driver */
-#define ATMIOC_PHYPRV_END 0x4f
-#define ATMIOC_SARCOM	  0x50 /* SAR device common ioctls, globally unique */
-#define ATMIOC_SARCOM_END 0x50
-#define ATMIOC_SARPRV	  0x60 /* SAR dev private ioctls, unique per driver */
-#define ATMIOC_SARPRV_END 0x7f
-#define ATMIOC_ITF	  0x80 /* Interface ioctls, globally unique */
-#define ATMIOC_ITF_END	  0x8f
-#define ATMIOC_BACKEND	  0x90 /* ATM generic backend ioctls, u. per backend */
-#define ATMIOC_BACKEND_END 0xaf
-/* 0xb0-0xbf: Reserved for future use */
-#define ATMIOC_AREQUIPA	  0xc0 /* Application requested IP over ATM, glob. u. */
-#define ATMIOC_LANE	  0xd0 /* LAN Emulation, globally unique */
-#define ATMIOC_MPOA       0xd8 /* MPOA, globally unique */
-#define	ATMIOC_CLIP	  0xe0 /* Classical IP over ATM control, globally u. */
-#define	ATMIOC_CLIP_END	  0xef
-#define	ATMIOC_SPECIAL	  0xf0 /* Special-purpose controls, globally unique */
-#define	ATMIOC_SPECIAL_END 0xff
-
-#endif
diff --git a/openflow/usr/include/linux/atmlec.h b/openflow/usr/include/linux/atmlec.h
deleted file mode 100644
index 302791e..0000000
--- a/openflow/usr/include/linux/atmlec.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * ATM Lan Emulation Daemon driver interface
- *
- * Marko Kiiskila <mkiiskila@yahoo.com>
- */
-
-#ifndef _ATMLEC_H_
-#define _ATMLEC_H_
-
-#include <linux/atmapi.h>
-#include <linux/atmioc.h>
-#include <linux/atm.h>
-#include <linux/if_ether.h>
-#include <linux/types.h>
-
-/* ATM lec daemon control socket */
-#define ATMLEC_CTRL	_IO('a', ATMIOC_LANE)
-#define ATMLEC_DATA	_IO('a', ATMIOC_LANE+1)
-#define ATMLEC_MCAST	_IO('a', ATMIOC_LANE+2)
-
-/* Maximum number of LEC interfaces (tweakable) */
-#define MAX_LEC_ITF 48
-
-typedef enum {
-	l_set_mac_addr,
-	l_del_mac_addr,
-	l_svc_setup,
-	l_addr_delete,
-	l_topology_change,
-	l_flush_complete,
-	l_arp_update,
-	l_narp_req,		/* LANE2 mandates the use of this */
-	l_config,
-	l_flush_tran_id,
-	l_set_lecid,
-	l_arp_xmt,
-	l_rdesc_arp_xmt,
-	l_associate_req,
-	l_should_bridge		/* should we bridge this MAC? */
-} atmlec_msg_type;
-
-#define ATMLEC_MSG_TYPE_MAX l_should_bridge
-
-struct atmlec_config_msg {
-	unsigned int maximum_unknown_frame_count;
-	unsigned int max_unknown_frame_time;
-	unsigned short max_retry_count;
-	unsigned int aging_time;
-	unsigned int forward_delay_time;
-	unsigned int arp_response_time;
-	unsigned int flush_timeout;
-	unsigned int path_switching_delay;
-	unsigned int lane_version;	/* LANE2: 1 for LANEv1, 2 for LANEv2 */
-	int mtu;
-	int is_proxy;
-};
-
-struct atmlec_msg {
-	atmlec_msg_type type;
-	int sizeoftlvs;		/* LANE2: if != 0, tlvs follow */
-	union {
-		struct {
-			unsigned char mac_addr[ETH_ALEN];
-			unsigned char atm_addr[ATM_ESA_LEN];
-			unsigned int flag;	/*
-						 * Topology_change flag,
-						 * remoteflag, permanent flag,
-						 * lecid, transaction id
-						 */
-			unsigned int targetless_le_arp;	/* LANE2 */
-			unsigned int no_source_le_narp;	/* LANE2 */
-		} normal;
-		struct atmlec_config_msg config;
-		struct {
-			__u16 lec_id;				/* requestor lec_id  */
-			__u32 tran_id;				/* transaction id    */
-			unsigned char mac_addr[ETH_ALEN];	/* dst mac addr      */
-			unsigned char atm_addr[ATM_ESA_LEN];	/* reqestor ATM addr */
-		} proxy;	/*
-				 * For mapping LE_ARP requests to responses. Filled by
-				 * zeppelin, returned by kernel. Used only when proxying
-				 */
-	} content;
-} __ATM_API_ALIGN;
-
-struct atmlec_ioc {
-	int dev_num;
-	unsigned char atm_addr[ATM_ESA_LEN];
-	unsigned char receive;	/* 1= receive vcc, 0 = send vcc */
-};
-#endif /* _ATMLEC_H_ */
diff --git a/openflow/usr/include/linux/atmmpc.h b/openflow/usr/include/linux/atmmpc.h
deleted file mode 100644
index 2aba578..0000000
--- a/openflow/usr/include/linux/atmmpc.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef _ATMMPC_H_
-#define _ATMMPC_H_
-
-#include <linux/atmapi.h>
-#include <linux/atmioc.h>
-#include <linux/atm.h>
-#include <linux/types.h>
-
-#define ATMMPC_CTRL _IO('a', ATMIOC_MPOA)
-#define ATMMPC_DATA _IO('a', ATMIOC_MPOA+1)
-
-#define MPC_SOCKET_INGRESS 1
-#define MPC_SOCKET_EGRESS  2
-
-struct atmmpc_ioc {
-        int dev_num;
-        __be32 ipaddr;              /* the IP address of the shortcut    */
-        int type;                     /* ingress or egress                 */
-};
-
-typedef struct in_ctrl_info {
-        __u8   Last_NHRP_CIE_code;
-        __u8   Last_Q2931_cause_value;
-        __u8   eg_MPC_ATM_addr[ATM_ESA_LEN];
-        __be32  tag;
-        __be32  in_dst_ip;      /* IP address this ingress MPC sends packets to */
-        __u16  holding_time;
-        __u32  request_id;
-} in_ctrl_info;
-
-typedef struct eg_ctrl_info {
-        __u8   DLL_header[256];
-        __u8   DH_length;
-        __be32  cache_id;
-        __be32  tag;
-        __be32  mps_ip;
-        __be32  eg_dst_ip;      /* IP address to which ingress MPC sends packets */
-        __u8   in_MPC_data_ATM_addr[ATM_ESA_LEN];
-        __u16  holding_time;
-} eg_ctrl_info;
-
-struct mpc_parameters {
-        __u16 mpc_p1;   /* Shortcut-Setup Frame Count    */
-        __u16 mpc_p2;   /* Shortcut-Setup Frame Time     */
-        __u8 mpc_p3[8]; /* Flow-detection Protocols      */
-        __u16 mpc_p4;   /* MPC Initial Retry Time        */
-        __u16 mpc_p5;   /* MPC Retry Time Maximum        */
-        __u16 mpc_p6;   /* Hold Down Time                */
-} ;
-
-struct k_message {
-        __u16 type;
-        __be32 ip_mask;
-        __u8  MPS_ctrl[ATM_ESA_LEN];
-        union {
-                in_ctrl_info in_info;
-                eg_ctrl_info eg_info;
-                struct mpc_parameters params;
-        } content;
-        struct atm_qos qos;       
-} __ATM_API_ALIGN;
-
-struct llc_snap_hdr {
-	/* RFC 1483 LLC/SNAP encapsulation for routed IP PDUs */
-        __u8  dsap;    /* Destination Service Access Point (0xAA)     */
-        __u8  ssap;    /* Source Service Access Point      (0xAA)     */
-        __u8  ui;      /* Unnumbered Information           (0x03)     */
-        __u8  org[3];  /* Organizational identification    (0x000000) */
-        __u8  type[2]; /* Ether type (for IP)              (0x0800)   */
-};
-
-/* TLVs this MPC recognizes */
-#define TLV_MPOA_DEVICE_TYPE         0x00a03e2a  
-
-/* MPOA device types in MPOA Device Type TLV */
-#define NON_MPOA    0
-#define MPS         1
-#define MPC         2
-#define MPS_AND_MPC 3
-
-
-/* MPC parameter defaults */
-
-#define MPC_P1 10  /* Shortcut-Setup Frame Count  */ 
-#define MPC_P2 1   /* Shortcut-Setup Frame Time   */
-#define MPC_P3 0   /* Flow-detection Protocols    */
-#define MPC_P4 5   /* MPC Initial Retry Time      */
-#define MPC_P5 40  /* MPC Retry Time Maximum      */
-#define MPC_P6 160 /* Hold Down Time              */
-#define HOLDING_TIME_DEFAULT 1200 /* same as MPS-p7 */
-
-/* MPC constants */
-
-#define MPC_C1 2   /* Retry Time Multiplier       */
-#define MPC_C2 60  /* Initial Keep-Alive Lifetime */
-
-/* Message types - to MPOA daemon */
-
-#define SND_MPOA_RES_RQST    201
-#define SET_MPS_CTRL_ADDR    202
-#define SND_MPOA_RES_RTRY    203 /* Different type in a retry due to req id         */
-#define STOP_KEEP_ALIVE_SM   204
-#define EGRESS_ENTRY_REMOVED 205
-#define SND_EGRESS_PURGE     206
-#define DIE                  207 /* tell the daemon to exit()                       */
-#define DATA_PLANE_PURGE     208 /* Data plane purge because of egress cache hit miss or dead MPS */
-#define OPEN_INGRESS_SVC     209
-
-/* Message types - from MPOA daemon */
-
-#define MPOA_TRIGGER_RCVD     101
-#define MPOA_RES_REPLY_RCVD   102
-#define INGRESS_PURGE_RCVD    103
-#define EGRESS_PURGE_RCVD     104
-#define MPS_DEATH             105
-#define CACHE_IMPOS_RCVD      106
-#define SET_MPC_CTRL_ADDR     107 /* Our MPC's control ATM address   */
-#define SET_MPS_MAC_ADDR      108
-#define CLEAN_UP_AND_EXIT     109
-#define SET_MPC_PARAMS        110 /* MPC configuration parameters    */
-
-/* Message types - bidirectional */       
-
-#define RELOAD                301 /* kill -HUP the daemon for reload */
-
-#endif /* _ATMMPC_H_ */
diff --git a/openflow/usr/include/linux/atmppp.h b/openflow/usr/include/linux/atmppp.h
deleted file mode 100644
index 300dcce..0000000
--- a/openflow/usr/include/linux/atmppp.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* atmppp.h - RFC2364 PPPoATM */
-
-/* Written 2000 by Mitchell Blank Jr */
-
-#ifndef _LINUX_ATMPPP_H
-#define _LINUX_ATMPPP_H
-
-#include <linux/atm.h>
-
-#define PPPOATM_ENCAPS_AUTODETECT	(0)
-#define PPPOATM_ENCAPS_VC		(1)
-#define PPPOATM_ENCAPS_LLC		(2)
-
-/*
- * This is for the ATM_SETBACKEND call - these are like socket families:
- * the first element of the structure is the backend number and the rest
- * is per-backend specific
- */
-struct atm_backend_ppp {
-	atm_backend_t	backend_num;	/* ATM_BACKEND_PPP */
-	int		encaps;		/* PPPOATM_ENCAPS_* */
-};
-
-#endif	/* _LINUX_ATMPPP_H */
diff --git a/openflow/usr/include/linux/atmsap.h b/openflow/usr/include/linux/atmsap.h
deleted file mode 100644
index 799b104..0000000
--- a/openflow/usr/include/linux/atmsap.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* atmsap.h - ATM Service Access Point addressing definitions */
-
-/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
-
-
-#ifndef _LINUX_ATMSAP_H
-#define _LINUX_ATMSAP_H
-
-#include <linux/atmapi.h>
-
-/*
- * BEGIN_xx and END_xx markers are used for automatic generation of
- * documentation. Do not change them.
- */
-
-
-/*
- * Layer 2 protocol identifiers
- */
-
-/* BEGIN_L2 */
-#define ATM_L2_NONE	0	/* L2 not specified */
-#define ATM_L2_ISO1745  0x01	/* Basic mode ISO 1745 */
-#define ATM_L2_Q291	0x02	/* ITU-T Q.291 (Rec. I.441) */
-#define ATM_L2_X25_LL	0x06	/* ITU-T X.25, link layer */
-#define ATM_L2_X25_ML	0x07	/* ITU-T X.25, multilink */
-#define ATM_L2_LAPB	0x08	/* Extended LAPB, half-duplex (Rec. T.71) */
-#define ATM_L2_HDLC_ARM	0x09	/* HDLC ARM (ISO/IEC 4335) */
-#define ATM_L2_HDLC_NRM	0x0a	/* HDLC NRM (ISO/IEC 4335) */
-#define ATM_L2_HDLC_ABM	0x0b	/* HDLC ABM (ISO/IEC 4335) */
-#define ATM_L2_ISO8802	0x0c	/* LAN LLC (ISO/IEC 8802/2) */
-#define ATM_L2_X75	0x0d	/* ITU-T X.75, SLP */
-#define ATM_L2_Q922	0x0e	/* ITU-T Q.922 */
-#define ATM_L2_USER	0x10	/* user-specified */
-#define ATM_L2_ISO7776	0x11	/* ISO 7776 DTE-DTE */
-/* END_L2 */
-
-
-/*
- * Layer 3 protocol identifiers
- */
-
-/* BEGIN_L3 */
-#define ATM_L3_NONE	0	/* L3 not specified */
-#define ATM_L3_X25	0x06	/* ITU-T X.25, packet layer */
-#define ATM_L3_ISO8208	0x07	/* ISO/IEC 8208 */
-#define ATM_L3_X223	0x08	/* ITU-T X.223 | ISO/IEC 8878 */
-#define ATM_L3_ISO8473	0x09	/* ITU-T X.233 | ISO/IEC 8473 */
-#define ATM_L3_T70	0x0a	/* ITU-T T.70 minimum network layer */
-#define ATM_L3_TR9577	0x0b	/* ISO/IEC TR 9577 */
-#define ATM_L3_H310	0x0c	/* ITU-T Recommendation H.310 */
-#define ATM_L3_H321	0x0d	/* ITU-T Recommendation H.321 */
-#define ATM_L3_USER	0x10	/* user-specified */
-/* END_L3 */
-
-
-/*
- * High layer identifiers
- */
-
-/* BEGIN_HL */
-#define ATM_HL_NONE	0	/* HL not specified */
-#define ATM_HL_ISO	0x01	/* ISO */
-#define ATM_HL_USER	0x02	/* user-specific */
-#define ATM_HL_HLP	0x03	/* high layer profile - UNI 3.0 only */
-#define ATM_HL_VENDOR	0x04	/* vendor-specific application identifier */
-/* END_HL */
-
-
-/*
- * ITU-T coded mode of operation
- */
-
-/* BEGIN_IMD */
-#define ATM_IMD_NONE	 0	/* mode not specified */
-#define ATM_IMD_NORMAL	 1	/* normal mode of operation */
-#define ATM_IMD_EXTENDED 2	/* extended mode of operation */
-/* END_IMD */
-
-/*
- * H.310 code points
- */
-
-#define ATM_TT_NONE	0	/* terminal type not specified */
-#define ATM_TT_RX	1	/* receive only */
-#define ATM_TT_TX	2	/* send only */
-#define ATM_TT_RXTX	3	/* receive and send */
-
-#define ATM_MC_NONE	0	/* no multiplexing */
-#define ATM_MC_TS	1	/* transport stream (TS) */
-#define ATM_MC_TS_FEC	2	/* transport stream with forward error corr. */
-#define ATM_MC_PS	3	/* program stream (PS) */
-#define ATM_MC_PS_FEC	4	/* program stream with forward error corr. */
-#define ATM_MC_H221	5	/* ITU-T Rec. H.221 */
-
-/*
- * SAP structures
- */
-
-#define ATM_MAX_HLI	8	/* maximum high-layer information length */
-
-
-struct atm_blli {
-    unsigned char l2_proto;	/* layer 2 protocol */
-    union {
-	struct {
-	    unsigned char mode;	/* mode of operation (ATM_IMD_xxx), 0 if */
-				/* absent */
-	    unsigned char window; /* window size (k), 1-127 (0 to omit) */
-	} itu;			/* ITU-T encoding */
-	unsigned char user;	/* user-specified l2 information */
-    } l2;
-    unsigned char l3_proto;	/* layer 3 protocol */
-    union {
-	struct {
-	    unsigned char mode;	/* mode of operation (ATM_IMD_xxx), 0 if */
-				/* absent */
-	    unsigned char def_size; /* default packet size (log2), 4-12 (0 to */
-				    /* omit) */
-	    unsigned char window;/* packet window size, 1-127 (0 to omit) */
-	} itu;			/* ITU-T encoding */
-	unsigned char user;	/* user specified l3 information */
-	struct {		      /* if l3_proto = ATM_L3_H310 */
-	    unsigned char term_type;  /* terminal type */
-	    unsigned char fw_mpx_cap; /* forward multiplexing capability */
-				      /* only if term_type != ATM_TT_NONE */
-	    unsigned char bw_mpx_cap; /* backward multiplexing capability */
-				      /* only if term_type != ATM_TT_NONE */
-	} h310;
-	struct {		  /* if l3_proto = ATM_L3_TR9577 */
-	    unsigned char ipi;	  /* initial protocol id */
-	    unsigned char snap[5];/* IEEE 802.1 SNAP identifier */
-				  /* (only if ipi == NLPID_IEEE802_1_SNAP) */
-	} tr9577;
-    } l3;
-} __ATM_API_ALIGN;
-
-
-struct atm_bhli {
-    unsigned char hl_type;	/* high layer information type */
-    unsigned char hl_length;	/* length (only if hl_type == ATM_HL_USER || */
-				/* hl_type == ATM_HL_ISO) */
-    unsigned char hl_info[ATM_MAX_HLI];/* high layer information */
-};
-
-
-#define ATM_MAX_BLLI	3		/* maximum number of BLLI elements */
-
-
-struct atm_sap {
-	struct atm_bhli bhli;		/* local SAP, high-layer information */
-	struct atm_blli blli[ATM_MAX_BLLI] __ATM_API_ALIGN;
-					/* local SAP, low-layer info */
-};
-
-
-static __inline__ int blli_in_use(struct atm_blli blli)
-{
-	return blli.l2_proto || blli.l3_proto;
-}
-
-#endif
diff --git a/openflow/usr/include/linux/atmsvc.h b/openflow/usr/include/linux/atmsvc.h
deleted file mode 100644
index aa71583..0000000
--- a/openflow/usr/include/linux/atmsvc.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* atmsvc.h - ATM signaling kernel-demon interface definitions */
- 
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
- 
-
-#ifndef _LINUX_ATMSVC_H
-#define _LINUX_ATMSVC_H
-
-#include <linux/atmapi.h>
-#include <linux/atm.h>
-#include <linux/atmioc.h>
-
-
-#define ATMSIGD_CTRL _IO('a',ATMIOC_SPECIAL)
-				/* become ATM signaling demon control socket */
-
-enum atmsvc_msg_type { as_catch_null, as_bind, as_connect, as_accept, as_reject,
-		       as_listen, as_okay, as_error, as_indicate, as_close,
-		       as_itf_notify, as_modify, as_identify, as_terminate,
-		       as_addparty, as_dropparty };
-
-struct atmsvc_msg {
-	enum atmsvc_msg_type type;
-	atm_kptr_t vcc;
-	atm_kptr_t listen_vcc;		/* indicate */
-	int reply;			/* for okay and close:		   */
-					/*   < 0: error before active	   */
-					/*        (sigd has discarded ctx) */
-					/*   ==0: success		   */
-				        /*   > 0: error when active (still */
-					/*        need to close)	   */
-	struct sockaddr_atmpvc pvc;	/* indicate, okay (connect) */
-	struct sockaddr_atmsvc local;	/* local SVC address */
-	struct atm_qos qos;		/* QOS parameters */
-	struct atm_sap sap;		/* SAP */
-	unsigned int session;		/* for p2pm */
-	struct sockaddr_atmsvc svc;	/* SVC address */
-} __ATM_API_ALIGN;
-
-/*
- * Message contents: see ftp://icaftp.epfl.ch/pub/linux/atm/docs/isp-*.tar.gz
- */
-
-/*
- * Some policy stuff for atmsigd and for net/atm/svc.c. Both have to agree on
- * what PCR is used to request bandwidth from the device driver. net/atm/svc.c
- * tries to do better than that, but only if there's no routing decision (i.e.
- * if signaling only uses one ATM interface).
- */
-
-#define SELECT_TOP_PCR(tp) ((tp).pcr ? (tp).pcr : \
-  (tp).max_pcr && (tp).max_pcr != ATM_MAX_PCR ? (tp).max_pcr : \
-  (tp).min_pcr ? (tp).min_pcr : ATM_MAX_PCR)
-
-#endif
diff --git a/openflow/usr/include/linux/audit.h b/openflow/usr/include/linux/audit.h
deleted file mode 100644
index 8585daa..0000000
--- a/openflow/usr/include/linux/audit.h
+++ /dev/null
@@ -1,466 +0,0 @@
-/* audit.h -- Auditing support
- *
- * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Written by Rickard E. (Rik) Faith <faith@redhat.com>
- *
- */
-
-#ifndef _LINUX_AUDIT_H_
-#define _LINUX_AUDIT_H_
-
-#include <linux/types.h>
-#include <linux/elf-em.h>
-
-/* The netlink messages for the audit system is divided into blocks:
- * 1000 - 1099 are for commanding the audit system
- * 1100 - 1199 user space trusted application messages
- * 1200 - 1299 messages internal to the audit daemon
- * 1300 - 1399 audit event messages
- * 1400 - 1499 SE Linux use
- * 1500 - 1599 kernel LSPP events
- * 1600 - 1699 kernel crypto events
- * 1700 - 1799 kernel anomaly records
- * 1800 - 1899 kernel integrity events
- * 1900 - 1999 future kernel use
- * 2000 is for otherwise unclassified kernel audit messages (legacy)
- * 2001 - 2099 unused (kernel)
- * 2100 - 2199 user space anomaly records
- * 2200 - 2299 user space actions taken in response to anomalies
- * 2300 - 2399 user space generated LSPP events
- * 2400 - 2499 user space crypto events
- * 2500 - 2999 future user space (maybe integrity labels and related events)
- *
- * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are
- * exclusively user space. 1300-2099 is kernel --> user space 
- * communication.
- */
-#define AUDIT_GET		1000	/* Get status */
-#define AUDIT_SET		1001	/* Set status (enable/disable/auditd) */
-#define AUDIT_LIST		1002	/* List syscall rules -- deprecated */
-#define AUDIT_ADD		1003	/* Add syscall rule -- deprecated */
-#define AUDIT_DEL		1004	/* Delete syscall rule -- deprecated */
-#define AUDIT_USER		1005	/* Message from userspace -- deprecated */
-#define AUDIT_LOGIN		1006	/* Define the login id and information */
-#define AUDIT_WATCH_INS		1007	/* Insert file/dir watch entry */
-#define AUDIT_WATCH_REM		1008	/* Remove file/dir watch entry */
-#define AUDIT_WATCH_LIST	1009	/* List all file/dir watches */
-#define AUDIT_SIGNAL_INFO	1010	/* Get info about sender of signal to auditd */
-#define AUDIT_ADD_RULE		1011	/* Add syscall filtering rule */
-#define AUDIT_DEL_RULE		1012	/* Delete syscall filtering rule */
-#define AUDIT_LIST_RULES	1013	/* List syscall filtering rules */
-#define AUDIT_TRIM		1014	/* Trim junk from watched tree */
-#define AUDIT_MAKE_EQUIV	1015	/* Append to watched tree */
-#define AUDIT_TTY_GET		1016	/* Get TTY auditing status */
-#define AUDIT_TTY_SET		1017	/* Set TTY auditing status */
-#define AUDIT_SET_FEATURE	1018	/* Turn an audit feature on or off */
-#define AUDIT_GET_FEATURE	1019	/* Get which features are enabled */
-
-#define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages mostly uninteresting to kernel */
-#define AUDIT_USER_AVC		1107	/* We filter this differently */
-#define AUDIT_USER_TTY		1124	/* Non-ICANON TTY input meaning */
-#define AUDIT_LAST_USER_MSG	1199
-#define AUDIT_FIRST_USER_MSG2	2100	/* More user space messages */
-#define AUDIT_LAST_USER_MSG2	2999
- 
-#define AUDIT_DAEMON_START      1200    /* Daemon startup record */
-#define AUDIT_DAEMON_END        1201    /* Daemon normal stop record */
-#define AUDIT_DAEMON_ABORT      1202    /* Daemon error stop record */
-#define AUDIT_DAEMON_CONFIG     1203    /* Daemon config change */
-
-#define AUDIT_SYSCALL		1300	/* Syscall event */
-/* #define AUDIT_FS_WATCH	1301	 * Deprecated */
-#define AUDIT_PATH		1302	/* Filename path information */
-#define AUDIT_IPC		1303	/* IPC record */
-#define AUDIT_SOCKETCALL	1304	/* sys_socketcall arguments */
-#define AUDIT_CONFIG_CHANGE	1305	/* Audit system configuration change */
-#define AUDIT_SOCKADDR		1306	/* sockaddr copied as syscall arg */
-#define AUDIT_CWD		1307	/* Current working directory */
-#define AUDIT_EXECVE		1309	/* execve arguments */
-#define AUDIT_IPC_SET_PERM	1311	/* IPC new permissions record type */
-#define AUDIT_MQ_OPEN		1312	/* POSIX MQ open record type */
-#define AUDIT_MQ_SENDRECV	1313	/* POSIX MQ send/receive record type */
-#define AUDIT_MQ_NOTIFY		1314	/* POSIX MQ notify record type */
-#define AUDIT_MQ_GETSETATTR	1315	/* POSIX MQ get/set attribute record type */
-#define AUDIT_KERNEL_OTHER	1316	/* For use by 3rd party modules */
-#define AUDIT_FD_PAIR		1317    /* audit record for pipe/socketpair */
-#define AUDIT_OBJ_PID		1318	/* ptrace target */
-#define AUDIT_TTY		1319	/* Input on an administrative TTY */
-#define AUDIT_EOE		1320	/* End of multi-record event */
-#define AUDIT_BPRM_FCAPS	1321	/* Information about fcaps increasing perms */
-#define AUDIT_CAPSET		1322	/* Record showing argument to sys_capset */
-#define AUDIT_MMAP		1323	/* Record showing descriptor and flags in mmap */
-#define AUDIT_NETFILTER_PKT	1324	/* Packets traversing netfilter chains */
-#define AUDIT_NETFILTER_CFG	1325	/* Netfilter chain modifications */
-#define AUDIT_SECCOMP		1326	/* Secure Computing event */
-#define AUDIT_PROCTITLE		1327	/* Proctitle emit event */
-#define AUDIT_FEATURE_CHANGE	1328	/* audit log listing feature changes */
-
-#define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
-#define AUDIT_SELINUX_ERR	1401	/* Internal SE Linux Errors */
-#define AUDIT_AVC_PATH		1402	/* dentry, vfsmount pair from avc */
-#define AUDIT_MAC_POLICY_LOAD	1403	/* Policy file load */
-#define AUDIT_MAC_STATUS	1404	/* Changed enforcing,permissive,off */
-#define AUDIT_MAC_CONFIG_CHANGE	1405	/* Changes to booleans */
-#define AUDIT_MAC_UNLBL_ALLOW	1406	/* NetLabel: allow unlabeled traffic */
-#define AUDIT_MAC_CIPSOV4_ADD	1407	/* NetLabel: add CIPSOv4 DOI entry */
-#define AUDIT_MAC_CIPSOV4_DEL	1408	/* NetLabel: del CIPSOv4 DOI entry */
-#define AUDIT_MAC_MAP_ADD	1409	/* NetLabel: add LSM domain mapping */
-#define AUDIT_MAC_MAP_DEL	1410	/* NetLabel: del LSM domain mapping */
-#define AUDIT_MAC_IPSEC_ADDSA	1411	/* Not used */
-#define AUDIT_MAC_IPSEC_DELSA	1412	/* Not used  */
-#define AUDIT_MAC_IPSEC_ADDSPD	1413	/* Not used */
-#define AUDIT_MAC_IPSEC_DELSPD	1414	/* Not used */
-#define AUDIT_MAC_IPSEC_EVENT	1415	/* Audit an IPSec event */
-#define AUDIT_MAC_UNLBL_STCADD	1416	/* NetLabel: add a static label */
-#define AUDIT_MAC_UNLBL_STCDEL	1417	/* NetLabel: del a static label */
-
-#define AUDIT_FIRST_KERN_ANOM_MSG   1700
-#define AUDIT_LAST_KERN_ANOM_MSG    1799
-#define AUDIT_ANOM_PROMISCUOUS      1700 /* Device changed promiscuous mode */
-#define AUDIT_ANOM_ABEND            1701 /* Process ended abnormally */
-#define AUDIT_ANOM_LINK		    1702 /* Suspicious use of file links */
-#define AUDIT_INTEGRITY_DATA	    1800 /* Data integrity verification */
-#define AUDIT_INTEGRITY_METADATA    1801 /* Metadata integrity verification */
-#define AUDIT_INTEGRITY_STATUS	    1802 /* Integrity enable status */
-#define AUDIT_INTEGRITY_HASH	    1803 /* Integrity HASH type */
-#define AUDIT_INTEGRITY_PCR	    1804 /* PCR invalidation msgs */
-#define AUDIT_INTEGRITY_RULE	    1805 /* policy rule */
-
-#define AUDIT_KERNEL		2000	/* Asynchronous audit record. NOT A REQUEST. */
-
-/* Rule flags */
-#define AUDIT_FILTER_USER	0x00	/* Apply rule to user-generated messages */
-#define AUDIT_FILTER_TASK	0x01	/* Apply rule at task creation (not syscall) */
-#define AUDIT_FILTER_ENTRY	0x02	/* Apply rule at syscall entry */
-#define AUDIT_FILTER_WATCH	0x03	/* Apply rule to file system watches */
-#define AUDIT_FILTER_EXIT	0x04	/* Apply rule at syscall exit */
-#define AUDIT_FILTER_TYPE	0x05	/* Apply rule at audit_log_start */
-
-#define AUDIT_NR_FILTERS	6
-
-#define AUDIT_FILTER_PREPEND	0x10	/* Prepend to front of list */
-
-/* Rule actions */
-#define AUDIT_NEVER    0	/* Do not build context if rule matches */
-#define AUDIT_POSSIBLE 1	/* Build context if rule matches  */
-#define AUDIT_ALWAYS   2	/* Generate audit record if rule matches */
-
-/* Rule structure sizes -- if these change, different AUDIT_ADD and
- * AUDIT_LIST commands must be implemented. */
-#define AUDIT_MAX_FIELDS   64
-#define AUDIT_MAX_KEY_LEN  256
-#define AUDIT_BITMASK_SIZE 64
-#define AUDIT_WORD(nr) ((__u32)((nr)/32))
-#define AUDIT_BIT(nr)  (1 << ((nr) - AUDIT_WORD(nr)*32))
-
-#define AUDIT_SYSCALL_CLASSES 16
-#define AUDIT_CLASS_DIR_WRITE 0
-#define AUDIT_CLASS_DIR_WRITE_32 1
-#define AUDIT_CLASS_CHATTR 2
-#define AUDIT_CLASS_CHATTR_32 3
-#define AUDIT_CLASS_READ 4
-#define AUDIT_CLASS_READ_32 5
-#define AUDIT_CLASS_WRITE 6
-#define AUDIT_CLASS_WRITE_32 7
-#define AUDIT_CLASS_SIGNAL 8
-#define AUDIT_CLASS_SIGNAL_32 9
-
-/* This bitmask is used to validate user input.  It represents all bits that
- * are currently used in an audit field constant understood by the kernel.
- * If you are adding a new #define AUDIT_<whatever>, please ensure that
- * AUDIT_UNUSED_BITS is updated if need be. */
-#define AUDIT_UNUSED_BITS	0x07FFFC00
-
-/* AUDIT_FIELD_COMPARE rule list */
-#define AUDIT_COMPARE_UID_TO_OBJ_UID	1
-#define AUDIT_COMPARE_GID_TO_OBJ_GID	2
-#define AUDIT_COMPARE_EUID_TO_OBJ_UID	3
-#define AUDIT_COMPARE_EGID_TO_OBJ_GID	4
-#define AUDIT_COMPARE_AUID_TO_OBJ_UID	5
-#define AUDIT_COMPARE_SUID_TO_OBJ_UID	6
-#define AUDIT_COMPARE_SGID_TO_OBJ_GID	7
-#define AUDIT_COMPARE_FSUID_TO_OBJ_UID	8
-#define AUDIT_COMPARE_FSGID_TO_OBJ_GID	9
-
-#define AUDIT_COMPARE_UID_TO_AUID	10
-#define AUDIT_COMPARE_UID_TO_EUID	11
-#define AUDIT_COMPARE_UID_TO_FSUID	12
-#define AUDIT_COMPARE_UID_TO_SUID	13
-
-#define AUDIT_COMPARE_AUID_TO_FSUID	14
-#define AUDIT_COMPARE_AUID_TO_SUID	15
-#define AUDIT_COMPARE_AUID_TO_EUID	16
-
-#define AUDIT_COMPARE_EUID_TO_SUID	17
-#define AUDIT_COMPARE_EUID_TO_FSUID	18
-
-#define AUDIT_COMPARE_SUID_TO_FSUID	19
-
-#define AUDIT_COMPARE_GID_TO_EGID	20
-#define AUDIT_COMPARE_GID_TO_FSGID	21
-#define AUDIT_COMPARE_GID_TO_SGID	22
-
-#define AUDIT_COMPARE_EGID_TO_FSGID	23
-#define AUDIT_COMPARE_EGID_TO_SGID	24
-#define AUDIT_COMPARE_SGID_TO_FSGID	25
-
-#define AUDIT_MAX_FIELD_COMPARE		AUDIT_COMPARE_SGID_TO_FSGID
-
-/* Rule fields */
-				/* These are useful when checking the
-				 * task structure at task creation time
-				 * (AUDIT_PER_TASK).  */
-#define AUDIT_PID	0
-#define AUDIT_UID	1
-#define AUDIT_EUID	2
-#define AUDIT_SUID	3
-#define AUDIT_FSUID	4
-#define AUDIT_GID	5
-#define AUDIT_EGID	6
-#define AUDIT_SGID	7
-#define AUDIT_FSGID	8
-#define AUDIT_LOGINUID	9
-#define AUDIT_PERS	10
-#define AUDIT_ARCH	11
-#define AUDIT_MSGTYPE	12
-#define AUDIT_SUBJ_USER	13	/* security label user */
-#define AUDIT_SUBJ_ROLE	14	/* security label role */
-#define AUDIT_SUBJ_TYPE	15	/* security label type */
-#define AUDIT_SUBJ_SEN	16	/* security label sensitivity label */
-#define AUDIT_SUBJ_CLR	17	/* security label clearance label */
-#define AUDIT_PPID	18
-#define AUDIT_OBJ_USER	19
-#define AUDIT_OBJ_ROLE	20
-#define AUDIT_OBJ_TYPE	21
-#define AUDIT_OBJ_LEV_LOW	22
-#define AUDIT_OBJ_LEV_HIGH	23
-#define AUDIT_LOGINUID_SET	24
-
-				/* These are ONLY useful when checking
-				 * at syscall exit time (AUDIT_AT_EXIT). */
-#define AUDIT_DEVMAJOR	100
-#define AUDIT_DEVMINOR	101
-#define AUDIT_INODE	102
-#define AUDIT_EXIT	103
-#define AUDIT_SUCCESS   104	/* exit >= 0; value ignored */
-#define AUDIT_WATCH	105
-#define AUDIT_PERM	106
-#define AUDIT_DIR	107
-#define AUDIT_FILETYPE	108
-#define AUDIT_OBJ_UID	109
-#define AUDIT_OBJ_GID	110
-#define AUDIT_FIELD_COMPARE	111
-#define AUDIT_EXE	112
-
-#define AUDIT_ARG0      200
-#define AUDIT_ARG1      (AUDIT_ARG0+1)
-#define AUDIT_ARG2      (AUDIT_ARG0+2)
-#define AUDIT_ARG3      (AUDIT_ARG0+3)
-
-#define AUDIT_FILTERKEY	210
-
-#define AUDIT_NEGATE			0x80000000
-
-/* These are the supported operators.
- *	4  2  1  8
- *	=  >  <  ?
- *	----------
- *	0  0  0	 0	00	nonsense
- *	0  0  0	 1	08	&  bit mask
- *	0  0  1	 0	10	<
- *	0  1  0	 0	20	>
- *	0  1  1	 0	30	!=
- *	1  0  0	 0	40	=
- *	1  0  0	 1	48	&=  bit test
- *	1  0  1	 0	50	<=
- *	1  1  0	 0	60	>=
- *	1  1  1	 1	78	all operators
- */
-#define AUDIT_BIT_MASK			0x08000000
-#define AUDIT_LESS_THAN			0x10000000
-#define AUDIT_GREATER_THAN		0x20000000
-#define AUDIT_NOT_EQUAL			0x30000000
-#define AUDIT_EQUAL			0x40000000
-#define AUDIT_BIT_TEST			(AUDIT_BIT_MASK|AUDIT_EQUAL)
-#define AUDIT_LESS_THAN_OR_EQUAL	(AUDIT_LESS_THAN|AUDIT_EQUAL)
-#define AUDIT_GREATER_THAN_OR_EQUAL	(AUDIT_GREATER_THAN|AUDIT_EQUAL)
-#define AUDIT_OPERATORS			(AUDIT_EQUAL|AUDIT_NOT_EQUAL|AUDIT_BIT_MASK)
-
-enum {
-	Audit_equal,
-	Audit_not_equal,
-	Audit_bitmask,
-	Audit_bittest,
-	Audit_lt,
-	Audit_gt,
-	Audit_le,
-	Audit_ge,
-	Audit_bad
-};
-
-/* Status symbols */
-				/* Mask values */
-#define AUDIT_STATUS_ENABLED		0x0001
-#define AUDIT_STATUS_FAILURE		0x0002
-#define AUDIT_STATUS_PID		0x0004
-#define AUDIT_STATUS_RATE_LIMIT		0x0008
-#define AUDIT_STATUS_BACKLOG_LIMIT	0x0010
-#define AUDIT_STATUS_BACKLOG_WAIT_TIME	0x0020
-
-#define AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT	0x00000001
-#define AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME	0x00000002
-#define AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH	0x00000004
-#define AUDIT_FEATURE_BITMAP_ALL (AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | \
-				  AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME | \
-				  AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH)
-
-/* deprecated: AUDIT_VERSION_* */
-#define AUDIT_VERSION_LATEST 		AUDIT_FEATURE_BITMAP_ALL
-#define AUDIT_VERSION_BACKLOG_LIMIT	AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT
-#define AUDIT_VERSION_BACKLOG_WAIT_TIME	AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME
-
-				/* Failure-to-log actions */
-#define AUDIT_FAIL_SILENT	0
-#define AUDIT_FAIL_PRINTK	1
-#define AUDIT_FAIL_PANIC	2
-
-/*
- * These bits disambiguate different calling conventions that share an
- * ELF machine type, bitness, and endianness
- */
-#define __AUDIT_ARCH_CONVENTION_MASK 0x30000000
-#define __AUDIT_ARCH_CONVENTION_MIPS64_N32 0x20000000
-
-/* distinguish syscall tables */
-#define __AUDIT_ARCH_64BIT 0x80000000
-#define __AUDIT_ARCH_LE	   0x40000000
-
-#define AUDIT_ARCH_AARCH64	(EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_ALPHA	(EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_ARM		(EM_ARM|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_ARMEB	(EM_ARM)
-#define AUDIT_ARCH_CRIS		(EM_CRIS|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_FRV		(EM_FRV)
-#define AUDIT_ARCH_I386		(EM_386|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_IA64		(EM_IA_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_M32R		(EM_M32R)
-#define AUDIT_ARCH_M68K		(EM_68K)
-#define AUDIT_ARCH_MICROBLAZE	(EM_MICROBLAZE)
-#define AUDIT_ARCH_MIPS		(EM_MIPS)
-#define AUDIT_ARCH_MIPSEL	(EM_MIPS|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_MIPS64	(EM_MIPS|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_MIPS64N32	(EM_MIPS|__AUDIT_ARCH_64BIT|\
-				 __AUDIT_ARCH_CONVENTION_MIPS64_N32)
-#define AUDIT_ARCH_MIPSEL64	(EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_MIPSEL64N32	(EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE|\
-				 __AUDIT_ARCH_CONVENTION_MIPS64_N32)
-#define AUDIT_ARCH_OPENRISC	(EM_OPENRISC)
-#define AUDIT_ARCH_PARISC	(EM_PARISC)
-#define AUDIT_ARCH_PARISC64	(EM_PARISC|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_PPC		(EM_PPC)
-/* do not define AUDIT_ARCH_PPCLE since it is not supported by audit */
-#define AUDIT_ARCH_PPC64	(EM_PPC64|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_PPC64LE	(EM_PPC64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_S390		(EM_S390)
-#define AUDIT_ARCH_S390X	(EM_S390|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_SH		(EM_SH)
-#define AUDIT_ARCH_SHEL		(EM_SH|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_SH64		(EM_SH|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_SHEL64	(EM_SH|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_SPARC	(EM_SPARC)
-#define AUDIT_ARCH_SPARC64	(EM_SPARCV9|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_TILEGX	(EM_TILEGX|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_TILEGX32	(EM_TILEGX|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_TILEPRO	(EM_TILEPRO|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_X86_64	(EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-
-#define AUDIT_PERM_EXEC		1
-#define AUDIT_PERM_WRITE	2
-#define AUDIT_PERM_READ		4
-#define AUDIT_PERM_ATTR		8
-
-/* MAX_AUDIT_MESSAGE_LENGTH is set in audit:lib/libaudit.h as:
- * 8970 // PATH_MAX*2+CONTEXT_SIZE*2+11+256+1
- * max header+body+tailer: 44 + 29 + 32 + 262 + 7 + pad
- */
-#define AUDIT_MESSAGE_TEXT_MAX	8560
-
-/* Multicast Netlink socket groups (default up to 32) */
-enum audit_nlgrps {
-	AUDIT_NLGRP_NONE,	/* Group 0 not used */
-	AUDIT_NLGRP_READLOG,	/* "best effort" read only socket */
-	__AUDIT_NLGRP_MAX
-};
-#define AUDIT_NLGRP_MAX                (__AUDIT_NLGRP_MAX - 1)
-
-struct audit_status {
-	__u32		mask;		/* Bit mask for valid entries */
-	__u32		enabled;	/* 1 = enabled, 0 = disabled */
-	__u32		failure;	/* Failure-to-log action */
-	__u32		pid;		/* pid of auditd process */
-	__u32		rate_limit;	/* messages rate limit (per second) */
-	__u32		backlog_limit;	/* waiting messages limit */
-	__u32		lost;		/* messages lost */
-	__u32		backlog;	/* messages waiting in queue */
-	union {
-		__u32	version;	/* deprecated: audit api version num */
-		__u32	feature_bitmap;	/* bitmap of kernel audit features */
-	};
-	__u32		backlog_wait_time;/* message queue wait timeout */
-};
-
-struct audit_features {
-#define AUDIT_FEATURE_VERSION	1
-	__u32	vers;
-	__u32	mask;		/* which bits we are dealing with */
-	__u32	features;	/* which feature to enable/disable */
-	__u32	lock;		/* which features to lock */
-};
-
-#define AUDIT_FEATURE_ONLY_UNSET_LOGINUID	0
-#define AUDIT_FEATURE_LOGINUID_IMMUTABLE	1
-#define AUDIT_LAST_FEATURE			AUDIT_FEATURE_LOGINUID_IMMUTABLE
-
-#define audit_feature_valid(x)		((x) >= 0 && (x) <= AUDIT_LAST_FEATURE)
-#define AUDIT_FEATURE_TO_MASK(x)	(1 << ((x) & 31)) /* mask for __u32 */
-
-struct audit_tty_status {
-	__u32		enabled;	/* 1 = enabled, 0 = disabled */
-	__u32		log_passwd;	/* 1 = enabled, 0 = disabled */
-};
-
-#define AUDIT_UID_UNSET (unsigned int)-1
-
-/* audit_rule_data supports filter rules with both integer and string
- * fields.  It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
- * AUDIT_LIST_RULES requests.
- */
-struct audit_rule_data {
-	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
-	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
-	__u32		field_count;
-	__u32		mask[AUDIT_BITMASK_SIZE]; /* syscall(s) affected */
-	__u32		fields[AUDIT_MAX_FIELDS];
-	__u32		values[AUDIT_MAX_FIELDS];
-	__u32		fieldflags[AUDIT_MAX_FIELDS];
-	__u32		buflen;	/* total length of string fields */
-	char		buf[0];	/* string fields buffer */
-};
-
-#endif /* _LINUX_AUDIT_H_ */
diff --git a/openflow/usr/include/linux/aufs_type.h b/openflow/usr/include/linux/aufs_type.h
deleted file mode 100644
index 3fdc6ba..0000000
--- a/openflow/usr/include/linux/aufs_type.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright (C) 2005-2015 Junjiro R. Okajima
- *
- * This program, aufs is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __AUFS_TYPE_H__
-#define __AUFS_TYPE_H__
-
-#define AUFS_NAME	"aufs"
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <linux/limits.h>
-
-#define AUFS_VERSION	"4.x-rcN-20160111"
-
-/* todo? move this to linux-2.6.19/include/magic.h */
-#define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
-
-/* ---------------------------------------------------------------------- */
-
-#ifdef CONFIG_AUFS_BRANCH_MAX_127
-typedef int8_t aufs_bindex_t;
-#define AUFS_BRANCH_MAX 127
-#else
-typedef int16_t aufs_bindex_t;
-#ifdef CONFIG_AUFS_BRANCH_MAX_511
-#define AUFS_BRANCH_MAX 511
-#elif defined(CONFIG_AUFS_BRANCH_MAX_1023)
-#define AUFS_BRANCH_MAX 1023
-#elif defined(CONFIG_AUFS_BRANCH_MAX_32767)
-#define AUFS_BRANCH_MAX 32767
-#endif
-#endif
-
-
-/* ---------------------------------------------------------------------- */
-
-#define AUFS_FSTYPE		AUFS_NAME
-
-#define AUFS_ROOT_INO		2
-#define AUFS_FIRST_INO		11
-
-#define AUFS_WH_PFX		".wh."
-#define AUFS_WH_PFX_LEN		((int)sizeof(AUFS_WH_PFX) - 1)
-#define AUFS_WH_TMP_LEN		4
-/* a limit for rmdir/rename a dir and copyup */
-#define AUFS_MAX_NAMELEN	(NAME_MAX \
-				- AUFS_WH_PFX_LEN * 2	/* doubly whiteouted */\
-				- 1			/* dot */\
-				- AUFS_WH_TMP_LEN)	/* hex */
-#define AUFS_XINO_FNAME		"." AUFS_NAME ".xino"
-#define AUFS_XINO_DEFPATH	"/tmp/" AUFS_XINO_FNAME
-#define AUFS_XINO_DEF_SEC	30 /* seconds */
-#define AUFS_XINO_DEF_TRUNC	45 /* percentage */
-#define AUFS_DIRWH_DEF		3
-#define AUFS_RDCACHE_DEF	10 /* seconds */
-#define AUFS_RDCACHE_MAX	3600 /* seconds */
-#define AUFS_RDBLK_DEF		512 /* bytes */
-#define AUFS_RDHASH_DEF		32
-#define AUFS_WKQ_NAME		AUFS_NAME "d"
-#define AUFS_MFS_DEF_SEC	30 /* seconds */
-#define AUFS_MFS_MAX_SEC	3600 /* seconds */
-#define AUFS_FHSM_CACHE_DEF_SEC	30 /* seconds */
-#define AUFS_PLINK_WARN		50 /* number of plinks in a single bucket */
-
-/* pseudo-link maintenace under /proc */
-#define AUFS_PLINK_MAINT_NAME	"plink_maint"
-#define AUFS_PLINK_MAINT_DIR	"fs/" AUFS_NAME
-#define AUFS_PLINK_MAINT_PATH	AUFS_PLINK_MAINT_DIR "/" AUFS_PLINK_MAINT_NAME
-
-#define AUFS_DIROPQ_NAME	AUFS_WH_PFX ".opq" /* whiteouted doubly */
-#define AUFS_WH_DIROPQ		AUFS_WH_PFX AUFS_DIROPQ_NAME
-
-#define AUFS_BASE_NAME		AUFS_WH_PFX AUFS_NAME
-#define AUFS_PLINKDIR_NAME	AUFS_WH_PFX "plnk"
-#define AUFS_ORPHDIR_NAME	AUFS_WH_PFX "orph"
-
-/* doubly whiteouted */
-#define AUFS_WH_BASE		AUFS_WH_PFX AUFS_BASE_NAME
-#define AUFS_WH_PLINKDIR	AUFS_WH_PFX AUFS_PLINKDIR_NAME
-#define AUFS_WH_ORPHDIR		AUFS_WH_PFX AUFS_ORPHDIR_NAME
-
-/* branch permissions and attributes */
-#define AUFS_BRPERM_RW		"rw"
-#define AUFS_BRPERM_RO		"ro"
-#define AUFS_BRPERM_RR		"rr"
-#define AUFS_BRATTR_COO_REG	"coo_reg"
-#define AUFS_BRATTR_COO_ALL	"coo_all"
-#define AUFS_BRATTR_FHSM	"fhsm"
-#define AUFS_BRATTR_UNPIN	"unpin"
-#define AUFS_BRATTR_ICEX	"icex"
-#define AUFS_BRATTR_ICEX_SEC	"icexsec"
-#define AUFS_BRATTR_ICEX_SYS	"icexsys"
-#define AUFS_BRATTR_ICEX_TR	"icextr"
-#define AUFS_BRATTR_ICEX_USR	"icexusr"
-#define AUFS_BRATTR_ICEX_OTH	"icexoth"
-#define AUFS_BRRATTR_WH		"wh"
-#define AUFS_BRWATTR_NLWH	"nolwh"
-#define AUFS_BRWATTR_MOO	"moo"
-
-#define AuBrPerm_RW		1		/* writable, hardlinkable wh */
-#define AuBrPerm_RO		(1 << 1)	/* readonly */
-#define AuBrPerm_RR		(1 << 2)	/* natively readonly */
-#define AuBrPerm_Mask		(AuBrPerm_RW | AuBrPerm_RO | AuBrPerm_RR)
-
-#define AuBrAttr_COO_REG	(1 << 3)	/* copy-up on open */
-#define AuBrAttr_COO_ALL	(1 << 4)
-#define AuBrAttr_COO_Mask	(AuBrAttr_COO_REG | AuBrAttr_COO_ALL)
-
-#define AuBrAttr_FHSM		(1 << 5)	/* file-based hsm */
-#define AuBrAttr_UNPIN		(1 << 6)	/* rename-able top dir of
-						   branch. meaningless since
-						   linux-3.18-rc1 */
-
-/* ignore error in copying XATTR */
-#define AuBrAttr_ICEX_SEC	(1 << 7)
-#define AuBrAttr_ICEX_SYS	(1 << 8)
-#define AuBrAttr_ICEX_TR	(1 << 9)
-#define AuBrAttr_ICEX_USR	(1 << 10)
-#define AuBrAttr_ICEX_OTH	(1 << 11)
-#define AuBrAttr_ICEX		(AuBrAttr_ICEX_SEC	\
-				 | AuBrAttr_ICEX_SYS	\
-				 | AuBrAttr_ICEX_TR	\
-				 | AuBrAttr_ICEX_USR	\
-				 | AuBrAttr_ICEX_OTH)
-
-#define AuBrRAttr_WH		(1 << 12)	/* whiteout-able */
-#define AuBrRAttr_Mask		AuBrRAttr_WH
-
-#define AuBrWAttr_NoLinkWH	(1 << 13)	/* un-hardlinkable whiteouts */
-#define AuBrWAttr_MOO		(1 << 14)	/* move-up on open */
-#define AuBrWAttr_Mask		(AuBrWAttr_NoLinkWH | AuBrWAttr_MOO)
-
-#define AuBrAttr_CMOO_Mask	(AuBrAttr_COO_Mask | AuBrWAttr_MOO)
-
-/* #warning test userspace */
-
-/* the longest combination */
-/* AUFS_BRATTR_ICEX and AUFS_BRATTR_ICEX_TR don't affect here */
-#define AuBrPermStrSz	sizeof(AUFS_BRPERM_RW			\
-			       "+" AUFS_BRATTR_COO_REG		\
-			       "+" AUFS_BRATTR_FHSM		\
-			       "+" AUFS_BRATTR_UNPIN		\
-			       "+" AUFS_BRATTR_ICEX_SEC		\
-			       "+" AUFS_BRATTR_ICEX_SYS		\
-			       "+" AUFS_BRATTR_ICEX_USR		\
-			       "+" AUFS_BRATTR_ICEX_OTH		\
-			       "+" AUFS_BRWATTR_NLWH)
-
-typedef struct {
-	char a[AuBrPermStrSz];
-} au_br_perm_str_t;
-
-static __inline__ int au_br_writable(int brperm)
-{
-	return brperm & AuBrPerm_RW;
-}
-
-static __inline__ int au_br_whable(int brperm)
-{
-	return brperm & (AuBrPerm_RW | AuBrRAttr_WH);
-}
-
-static __inline__ int au_br_wh_linkable(int brperm)
-{
-	return !(brperm & AuBrWAttr_NoLinkWH);
-}
-
-static __inline__ int au_br_cmoo(int brperm)
-{
-	return brperm & AuBrAttr_CMOO_Mask;
-}
-
-static __inline__ int au_br_fhsm(int brperm)
-{
-	return brperm & AuBrAttr_FHSM;
-}
-
-/* ---------------------------------------------------------------------- */
-
-/* ioctl */
-enum {
-	/* readdir in userspace */
-	AuCtl_RDU,
-	AuCtl_RDU_INO,
-
-	AuCtl_WBR_FD,	/* pathconf wrapper */
-	AuCtl_IBUSY,	/* busy inode */
-	AuCtl_MVDOWN,	/* move-down */
-	AuCtl_BR,	/* info about branches */
-	AuCtl_FHSM_FD	/* connection for fhsm */
-};
-
-/* borrowed from linux/include/linux/kernel.h */
-#ifndef ALIGN
-#define ALIGN(x, a)		__ALIGN_MASK(x, (typeof(x))(a)-1)
-#define __ALIGN_MASK(x, mask)	(((x)+(mask))&~(mask))
-#endif
-
-/* borrowed from linux/include/linux/compiler-gcc3.h */
-#ifndef __aligned
-#define __aligned(x)			__attribute__((aligned(x)))
-#endif
-
-
-struct au_rdu_cookie {
-	uint64_t	h_pos;
-	int16_t		bindex;
-	uint8_t		flags;
-	uint8_t		pad;
-	uint32_t	generation;
-} __aligned(8);
-
-struct au_rdu_ent {
-	uint64_t	ino;
-	int16_t		bindex;
-	uint8_t		type;
-	uint8_t		nlen;
-	uint8_t		wh;
-	char		name[0];
-} __aligned(8);
-
-static __inline__ int au_rdu_len(int nlen)
-{
-	/* include the terminating NULL */
-	return ALIGN(sizeof(struct au_rdu_ent) + nlen + 1,
-		     sizeof(uint64_t));
-}
-
-union au_rdu_ent_ul {
-	struct au_rdu_ent *e;
-	uint64_t			ul;
-};
-
-enum {
-	AufsCtlRduV_SZ,
-	AufsCtlRduV_End
-};
-
-struct aufs_rdu {
-	/* input */
-	union {
-		uint64_t	sz;	/* AuCtl_RDU */
-		uint64_t	nent;	/* AuCtl_RDU_INO */
-	};
-	union au_rdu_ent_ul	ent;
-	uint16_t		verify[AufsCtlRduV_End];
-
-	/* input/output */
-	uint32_t		blk;
-
-	/* output */
-	union au_rdu_ent_ul	tail;
-	/* number of entries which were added in a single call */
-	uint64_t		rent;
-	uint8_t			full;
-	uint8_t			shwh;
-
-	struct au_rdu_cookie	cookie;
-} __aligned(8);
-
-/* ---------------------------------------------------------------------- */
-
-struct aufs_wbr_fd {
-	uint32_t	oflags;
-	int16_t		brid;
-} __aligned(8);
-
-/* ---------------------------------------------------------------------- */
-
-struct aufs_ibusy {
-	uint64_t	ino, h_ino;
-	int16_t		bindex;
-} __aligned(8);
-
-/* ---------------------------------------------------------------------- */
-
-/* error code for move-down */
-/* the actual message strings are implemented in aufs-util.git */
-enum {
-	EAU_MVDOWN_OPAQUE = 1,
-	EAU_MVDOWN_WHITEOUT,
-	EAU_MVDOWN_UPPER,
-	EAU_MVDOWN_BOTTOM,
-	EAU_MVDOWN_NOUPPER,
-	EAU_MVDOWN_NOLOWERBR,
-	EAU_Last
-};
-
-/* flags for move-down */
-#define AUFS_MVDOWN_DMSG	1
-#define AUFS_MVDOWN_OWLOWER	(1 << 1)	/* overwrite lower */
-#define AUFS_MVDOWN_KUPPER	(1 << 2)	/* keep upper */
-#define AUFS_MVDOWN_ROLOWER	(1 << 3)	/* do even if lower is RO */
-#define AUFS_MVDOWN_ROLOWER_R	(1 << 4)	/* did on lower RO */
-#define AUFS_MVDOWN_ROUPPER	(1 << 5)	/* do even if upper is RO */
-#define AUFS_MVDOWN_ROUPPER_R	(1 << 6)	/* did on upper RO */
-#define AUFS_MVDOWN_BRID_UPPER	(1 << 7)	/* upper brid */
-#define AUFS_MVDOWN_BRID_LOWER	(1 << 8)	/* lower brid */
-#define AUFS_MVDOWN_FHSM_LOWER	(1 << 9)	/* find fhsm attr for lower */
-#define AUFS_MVDOWN_STFS	(1 << 10)	/* req. stfs */
-#define AUFS_MVDOWN_STFS_FAILED	(1 << 11)	/* output: stfs is unusable */
-#define AUFS_MVDOWN_BOTTOM	(1 << 12)	/* output: no more lowers */
-
-/* index for move-down */
-enum {
-	AUFS_MVDOWN_UPPER,
-	AUFS_MVDOWN_LOWER,
-	AUFS_MVDOWN_NARRAY
-};
-
-/*
- * additional info of move-down
- * number of free blocks and inodes.
- * subset of struct kstatfs, but smaller and always 64bit.
- */
-struct aufs_stfs {
-	uint64_t	f_blocks;
-	uint64_t	f_bavail;
-	uint64_t	f_files;
-	uint64_t	f_ffree;
-};
-
-struct aufs_stbr {
-	int16_t			brid;	/* optional input */
-	int16_t			bindex;	/* output */
-	struct aufs_stfs	stfs;	/* output when AUFS_MVDOWN_STFS set */
-} __aligned(8);
-
-struct aufs_mvdown {
-	uint32_t		flags;			/* input/output */
-	struct aufs_stbr	stbr[AUFS_MVDOWN_NARRAY]; /* input/output */
-	int8_t			au_errno;		/* output */
-} __aligned(8);
-
-/* ---------------------------------------------------------------------- */
-
-union aufs_brinfo {
-	/* PATH_MAX may differ between kernel-space and user-space */
-	char	_spacer[4096];
-	struct {
-		int16_t	id;
-		int	perm;
-		char	path[0];
-	};
-} __aligned(8);
-
-/* ---------------------------------------------------------------------- */
-
-#define AuCtlType		'A'
-#define AUFS_CTL_RDU		_IOWR(AuCtlType, AuCtl_RDU, struct aufs_rdu)
-#define AUFS_CTL_RDU_INO	_IOWR(AuCtlType, AuCtl_RDU_INO, struct aufs_rdu)
-#define AUFS_CTL_WBR_FD		_IOW(AuCtlType, AuCtl_WBR_FD, \
-				     struct aufs_wbr_fd)
-#define AUFS_CTL_IBUSY		_IOWR(AuCtlType, AuCtl_IBUSY, struct aufs_ibusy)
-#define AUFS_CTL_MVDOWN		_IOWR(AuCtlType, AuCtl_MVDOWN, \
-				      struct aufs_mvdown)
-#define AUFS_CTL_BRINFO		_IOW(AuCtlType, AuCtl_BR, union aufs_brinfo)
-#define AUFS_CTL_FHSM_FD	_IOW(AuCtlType, AuCtl_FHSM_FD, int)
-
-#endif /* __AUFS_TYPE_H__ */
diff --git a/openflow/usr/include/linux/auto_fs.h b/openflow/usr/include/linux/auto_fs.h
deleted file mode 100644
index 556e409..0000000
--- a/openflow/usr/include/linux/auto_fs.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- linux-c -*- ------------------------------------------------------- *
- *   
- * linux/include/linux/auto_fs.h
- *
- *   Copyright 1997 Transmeta Corporation - All Rights Reserved
- *
- * This file is part of the Linux kernel and is made available under
- * the terms of the GNU General Public License, version 2, or at your
- * option, any later version, incorporated herein by reference.
- *
- * ----------------------------------------------------------------------- */
-
-
-#ifndef _LINUX_AUTO_FS_H
-#define _LINUX_AUTO_FS_H
-
-#include <linux/types.h>
-#include <sys/ioctl.h>
-
-
-/* This file describes autofs v3 */
-#define AUTOFS_PROTO_VERSION	3
-
-/* Range of protocol versions defined */
-#define AUTOFS_MAX_PROTO_VERSION	AUTOFS_PROTO_VERSION
-#define AUTOFS_MIN_PROTO_VERSION	AUTOFS_PROTO_VERSION
-
-/*
- * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed
- * back to the kernel via ioctl from userspace. On architectures where 32- and
- * 64-bit userspace binaries can be executed it's important that the size of
- * autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we
- * do not break the binary ABI interface by changing the structure size.
- */
-#if defined(__ia64__) || defined(__alpha__) /* pure 64bit architectures */
-typedef unsigned long autofs_wqt_t;
-#else
-typedef unsigned int autofs_wqt_t;
-#endif
-
-/* Packet types */
-#define autofs_ptype_missing	0	/* Missing entry (mount request) */
-#define autofs_ptype_expire	1	/* Expire entry (umount request) */
-
-struct autofs_packet_hdr {
-	int proto_version;		/* Protocol version */
-	int type;			/* Type of packet */
-};
-
-struct autofs_packet_missing {
-	struct autofs_packet_hdr hdr;
-        autofs_wqt_t wait_queue_token;
-	int len;
-	char name[NAME_MAX+1];
-};	
-
-/* v3 expire (via ioctl) */
-struct autofs_packet_expire {
-	struct autofs_packet_hdr hdr;
-	int len;
-	char name[NAME_MAX+1];
-};
-
-#define AUTOFS_IOC_READY      _IO(0x93,0x60)
-#define AUTOFS_IOC_FAIL       _IO(0x93,0x61)
-#define AUTOFS_IOC_CATATONIC  _IO(0x93,0x62)
-#define AUTOFS_IOC_PROTOVER   _IOR(0x93,0x63,int)
-#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93,0x64,compat_ulong_t)
-#define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93,0x64,unsigned long)
-#define AUTOFS_IOC_EXPIRE     _IOR(0x93,0x65,struct autofs_packet_expire)
-
-#endif /* _LINUX_AUTO_FS_H */
diff --git a/openflow/usr/include/linux/auto_fs4.h b/openflow/usr/include/linux/auto_fs4.h
deleted file mode 100644
index 674aa75..0000000
--- a/openflow/usr/include/linux/auto_fs4.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- c -*-
- * linux/include/linux/auto_fs4.h
- *
- * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org>
- *
- * This file is part of the Linux kernel and is made available under
- * the terms of the GNU General Public License, version 2, or at your
- * option, any later version, incorporated herein by reference.
- */
-
-#ifndef _LINUX_AUTO_FS4_H
-#define _LINUX_AUTO_FS4_H
-
-/* Include common v3 definitions */
-#include <linux/types.h>
-#include <linux/auto_fs.h>
-
-/* autofs v4 definitions */
-#undef AUTOFS_PROTO_VERSION
-#undef AUTOFS_MIN_PROTO_VERSION
-#undef AUTOFS_MAX_PROTO_VERSION
-
-#define AUTOFS_PROTO_VERSION		5
-#define AUTOFS_MIN_PROTO_VERSION	3
-#define AUTOFS_MAX_PROTO_VERSION	5
-
-#define AUTOFS_PROTO_SUBVERSION		2
-
-/* Mask for expire behaviour */
-#define AUTOFS_EXP_IMMEDIATE		1
-#define AUTOFS_EXP_LEAVES		2
-
-#define AUTOFS_TYPE_ANY			0U
-#define AUTOFS_TYPE_INDIRECT		1U
-#define AUTOFS_TYPE_DIRECT		2U
-#define AUTOFS_TYPE_OFFSET		4U
-
-static __inline__ void set_autofs_type_indirect(unsigned int *type)
-{
-	*type = AUTOFS_TYPE_INDIRECT;
-	return;
-}
-
-static __inline__ unsigned int autofs_type_indirect(unsigned int type)
-{
-	return (type == AUTOFS_TYPE_INDIRECT);
-}
-
-static __inline__ void set_autofs_type_direct(unsigned int *type)
-{
-	*type = AUTOFS_TYPE_DIRECT;
-	return;
-}
-
-static __inline__ unsigned int autofs_type_direct(unsigned int type)
-{
-	return (type == AUTOFS_TYPE_DIRECT);
-}
-
-static __inline__ void set_autofs_type_offset(unsigned int *type)
-{
-	*type = AUTOFS_TYPE_OFFSET;
-	return;
-}
-
-static __inline__ unsigned int autofs_type_offset(unsigned int type)
-{
-	return (type == AUTOFS_TYPE_OFFSET);
-}
-
-static __inline__ unsigned int autofs_type_trigger(unsigned int type)
-{
-	return (type == AUTOFS_TYPE_DIRECT || type == AUTOFS_TYPE_OFFSET);
-}
-
-/*
- * This isn't really a type as we use it to say "no type set" to
- * indicate we want to search for "any" mount in the
- * autofs_dev_ioctl_ismountpoint() device ioctl function.
- */
-static __inline__ void set_autofs_type_any(unsigned int *type)
-{
-	*type = AUTOFS_TYPE_ANY;
-	return;
-}
-
-static __inline__ unsigned int autofs_type_any(unsigned int type)
-{
-	return (type == AUTOFS_TYPE_ANY);
-}
-
-/* Daemon notification packet types */
-enum autofs_notify {
-	NFY_NONE,
-	NFY_MOUNT,
-	NFY_EXPIRE
-};
-
-/* Kernel protocol version 4 packet types */
-
-/* Expire entry (umount request) */
-#define autofs_ptype_expire_multi	2
-
-/* Kernel protocol version 5 packet types */
-
-/* Indirect mount missing and expire requests. */
-#define autofs_ptype_missing_indirect	3
-#define autofs_ptype_expire_indirect	4
-
-/* Direct mount missing and expire requests */
-#define autofs_ptype_missing_direct	5
-#define autofs_ptype_expire_direct	6
-
-/* v4 multi expire (via pipe) */
-struct autofs_packet_expire_multi {
-	struct autofs_packet_hdr hdr;
-        autofs_wqt_t wait_queue_token;
-	int len;
-	char name[NAME_MAX+1];
-};
-
-union autofs_packet_union {
-	struct autofs_packet_hdr hdr;
-	struct autofs_packet_missing missing;
-	struct autofs_packet_expire expire;
-	struct autofs_packet_expire_multi expire_multi;
-};
-
-/* autofs v5 common packet struct */
-struct autofs_v5_packet {
-	struct autofs_packet_hdr hdr;
-	autofs_wqt_t wait_queue_token;
-	__u32 dev;
-	__u64 ino;
-	__u32 uid;
-	__u32 gid;
-	__u32 pid;
-	__u32 tgid;
-	__u32 len;
-	char name[NAME_MAX+1];
-};
-
-typedef struct autofs_v5_packet autofs_packet_missing_indirect_t;
-typedef struct autofs_v5_packet autofs_packet_expire_indirect_t;
-typedef struct autofs_v5_packet autofs_packet_missing_direct_t;
-typedef struct autofs_v5_packet autofs_packet_expire_direct_t;
-
-union autofs_v5_packet_union {
-	struct autofs_packet_hdr hdr;
-	struct autofs_v5_packet v5_packet;
-	autofs_packet_missing_indirect_t missing_indirect;
-	autofs_packet_expire_indirect_t expire_indirect;
-	autofs_packet_missing_direct_t missing_direct;
-	autofs_packet_expire_direct_t expire_direct;
-};
-
-#define AUTOFS_IOC_EXPIRE_MULTI		_IOW(0x93,0x66,int)
-#define AUTOFS_IOC_EXPIRE_INDIRECT	AUTOFS_IOC_EXPIRE_MULTI
-#define AUTOFS_IOC_EXPIRE_DIRECT	AUTOFS_IOC_EXPIRE_MULTI
-#define AUTOFS_IOC_PROTOSUBVER		_IOR(0x93,0x67,int)
-#define AUTOFS_IOC_ASKUMOUNT		_IOR(0x93,0x70,int)
-
-
-#endif /* _LINUX_AUTO_FS4_H */
diff --git a/openflow/usr/include/linux/auxvec.h b/openflow/usr/include/linux/auxvec.h
deleted file mode 100644
index 4bad588..0000000
--- a/openflow/usr/include/linux/auxvec.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _LINUX_AUXVEC_H
-#define _LINUX_AUXVEC_H
-
-#include <asm/auxvec.h>
-
-/* Symbolic values for the entries in the auxiliary table
-   put on the initial stack */
-#define AT_NULL   0	/* end of vector */
-#define AT_IGNORE 1	/* entry should be ignored */
-#define AT_EXECFD 2	/* file descriptor of program */
-#define AT_PHDR   3	/* program headers for program */
-#define AT_PHENT  4	/* size of program header entry */
-#define AT_PHNUM  5	/* number of program headers */
-#define AT_PAGESZ 6	/* system page size */
-#define AT_BASE   7	/* base address of interpreter */
-#define AT_FLAGS  8	/* flags */
-#define AT_ENTRY  9	/* entry point of program */
-#define AT_NOTELF 10	/* program is not ELF */
-#define AT_UID    11	/* real uid */
-#define AT_EUID   12	/* effective uid */
-#define AT_GID    13	/* real gid */
-#define AT_EGID   14	/* effective gid */
-#define AT_PLATFORM 15  /* string identifying CPU for optimizations */
-#define AT_HWCAP  16    /* arch dependent hints at CPU capabilities */
-#define AT_CLKTCK 17	/* frequency at which times() increments */
-/* AT_* values 18 through 22 are reserved */
-#define AT_SECURE 23   /* secure mode boolean */
-#define AT_BASE_PLATFORM 24	/* string identifying real platform, may
-				 * differ from AT_PLATFORM. */
-#define AT_RANDOM 25	/* address of 16 random bytes */
-#define AT_HWCAP2 26	/* extension of AT_HWCAP */
-
-#define AT_EXECFN  31	/* filename of program */
-
-
-#endif /* _LINUX_AUXVEC_H */
diff --git a/openflow/usr/include/linux/ax25.h b/openflow/usr/include/linux/ax25.h
deleted file mode 100644
index 74c89a4..0000000
--- a/openflow/usr/include/linux/ax25.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * These are the public elements of the Linux kernel AX.25 code. A similar
- * file netrom.h exists for the NET/ROM protocol.
- */
-
-#ifndef	AX25_KERNEL_H
-#define	AX25_KERNEL_H
-
-#include <linux/socket.h>
-
-#define AX25_MTU	256
-#define AX25_MAX_DIGIS  8
-
-#define AX25_WINDOW	1
-#define AX25_T1		2
-#define AX25_N2		3
-#define AX25_T3		4
-#define AX25_T2		5
-#define	AX25_BACKOFF	6
-#define	AX25_EXTSEQ	7
-#define	AX25_PIDINCL	8
-#define AX25_IDLE	9
-#define AX25_PACLEN	10
-#define AX25_IAMDIGI	12
-
-#define AX25_KILL	99
-
-#define SIOCAX25GETUID		(SIOCPROTOPRIVATE+0)
-#define SIOCAX25ADDUID		(SIOCPROTOPRIVATE+1)
-#define SIOCAX25DELUID		(SIOCPROTOPRIVATE+2)
-#define SIOCAX25NOUID		(SIOCPROTOPRIVATE+3)
-#define SIOCAX25OPTRT		(SIOCPROTOPRIVATE+7)
-#define SIOCAX25CTLCON		(SIOCPROTOPRIVATE+8)
-#define SIOCAX25GETINFOOLD	(SIOCPROTOPRIVATE+9)
-#define SIOCAX25ADDFWD		(SIOCPROTOPRIVATE+10)
-#define SIOCAX25DELFWD		(SIOCPROTOPRIVATE+11)
-#define SIOCAX25DEVCTL          (SIOCPROTOPRIVATE+12)
-#define SIOCAX25GETINFO         (SIOCPROTOPRIVATE+13)
-
-#define AX25_SET_RT_IPMODE	2
-
-#define AX25_NOUID_DEFAULT	0
-#define AX25_NOUID_BLOCK	1
-
-typedef struct {
-	char		ax25_call[7];	/* 6 call + SSID (shifted ascii!) */
-} ax25_address;
-
-struct sockaddr_ax25 {
-	__kernel_sa_family_t sax25_family;
-	ax25_address	sax25_call;
-	int		sax25_ndigis;
-	/* Digipeater ax25_address sets follow */
-};
-
-#define sax25_uid	sax25_ndigis
-
-struct full_sockaddr_ax25 {
-	struct sockaddr_ax25 fsa_ax25;
-	ax25_address	fsa_digipeater[AX25_MAX_DIGIS];
-};
-
-struct ax25_routes_struct {
-	ax25_address	port_addr;
-	ax25_address	dest_addr;
-	unsigned char	digi_count;
-	ax25_address	digi_addr[AX25_MAX_DIGIS];
-};
-
-struct ax25_route_opt_struct {
-	ax25_address	port_addr;
-	ax25_address	dest_addr;
-	int		cmd;
-	int		arg;
-};
-
-struct ax25_ctl_struct {
-        ax25_address            port_addr;
-        ax25_address            source_addr;
-        ax25_address            dest_addr;
-        unsigned int            cmd;
-        unsigned long           arg;
-        unsigned char           digi_count;
-        ax25_address            digi_addr[AX25_MAX_DIGIS];
-};
-
-/* this will go away. Please do not export to user land */
-struct ax25_info_struct_deprecated {
-	unsigned int	n2, n2count;
-	unsigned int	t1, t1timer;
-	unsigned int	t2, t2timer;
-	unsigned int	t3, t3timer;
-	unsigned int	idle, idletimer;
-	unsigned int	state;
-	unsigned int	rcv_q, snd_q;
-};
-
-struct ax25_info_struct {
-	unsigned int	n2, n2count;
-	unsigned int	t1, t1timer;
-	unsigned int	t2, t2timer;
-	unsigned int	t3, t3timer;
-	unsigned int	idle, idletimer;
-	unsigned int	state;
-	unsigned int	rcv_q, snd_q;
-	unsigned int	vs, vr, va, vs_max;
-	unsigned int	paclen;
-	unsigned int	window;
-};
-
-struct ax25_fwd_struct {
-	ax25_address	port_from;
-	ax25_address	port_to;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/b1lli.h b/openflow/usr/include/linux/b1lli.h
deleted file mode 100644
index 713f712..0000000
--- a/openflow/usr/include/linux/b1lli.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $Id: b1lli.h,v 1.8.8.3 2001/09/23 22:25:05 kai Exp $
- *
- * ISDN lowlevel-module for AVM B1-card.
- *
- * Copyright 1996 by Carsten Paeth (calle@calle.in-berlin.de)
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#ifndef _B1LLI_H_
-#define _B1LLI_H_
-/*
- * struct for loading t4 file 
- */
-typedef struct avmb1_t4file {
-	int len;
-	unsigned char *data;
-} avmb1_t4file;
-
-typedef struct avmb1_loaddef {
-	int contr;
-	avmb1_t4file t4file;
-} avmb1_loaddef;
-
-typedef struct avmb1_loadandconfigdef {
-	int contr;
-	avmb1_t4file t4file;
-        avmb1_t4file t4config; 
-} avmb1_loadandconfigdef;
-
-typedef struct avmb1_resetdef {
-	int contr;
-} avmb1_resetdef;
-
-typedef struct avmb1_getdef {
-	int contr;
-	int cardtype;
-	int cardstate;
-} avmb1_getdef;
-
-/*
- * struct for adding new cards 
- */
-typedef struct avmb1_carddef {
-	int port;
-	int irq;
-} avmb1_carddef;
-
-#define AVM_CARDTYPE_B1		0
-#define AVM_CARDTYPE_T1		1
-#define AVM_CARDTYPE_M1		2
-#define AVM_CARDTYPE_M2		3
-
-typedef struct avmb1_extcarddef {
-	int port;
-	int irq;
-        int cardtype;
-        int cardnr;  /* for HEMA/T1 */
-} avmb1_extcarddef;
-
-#define	AVMB1_LOAD		0	/* load image to card */
-#define AVMB1_ADDCARD		1	/* add a new card - OBSOLETE */
-#define AVMB1_RESETCARD		2	/* reset a card */
-#define	AVMB1_LOAD_AND_CONFIG	3	/* load image and config to card */
-#define	AVMB1_ADDCARD_WITH_TYPE	4	/* add a new card, with cardtype */
-#define AVMB1_GET_CARDINFO	5	/* get cardtype */
-#define AVMB1_REMOVECARD	6	/* remove a card - OBSOLETE */
-
-#define	AVMB1_REGISTERCARD_IS_OBSOLETE
-
-#endif				/* _B1LLI_H_ */
diff --git a/openflow/usr/include/linux/baycom.h b/openflow/usr/include/linux/baycom.h
deleted file mode 100644
index 81249e0..0000000
--- a/openflow/usr/include/linux/baycom.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * The Linux BAYCOM driver for the Baycom serial 1200 baud modem
- * and the parallel 9600 baud modem
- * (C) 1997-1998 by Thomas Sailer, HB9JNX/AE4WA
- */
-
-#ifndef _BAYCOM_H
-#define _BAYCOM_H
-
-/* -------------------------------------------------------------------- */
-/*
- * structs for the IOCTL commands
- */
-
-struct baycom_debug_data {
-	unsigned long debug1;
-	unsigned long debug2;
-	long debug3;
-};
-
-struct baycom_ioctl {
-	int cmd;
-	union {
-		struct baycom_debug_data dbg;
-	} data;
-};
-
-/* -------------------------------------------------------------------- */
-
-/*
- * ioctl values change for baycom
- */
-#define BAYCOMCTL_GETDEBUG       0x92
-
-/* -------------------------------------------------------------------- */
-
-#endif /* _BAYCOM_H */
-
-/* --------------------------------------------------------------------- */
diff --git a/openflow/usr/include/linux/bcm933xx_hcs.h b/openflow/usr/include/linux/bcm933xx_hcs.h
deleted file mode 100644
index d228218..0000000
--- a/openflow/usr/include/linux/bcm933xx_hcs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Broadcom Cable Modem firmware format
- */
-
-#ifndef __BCM933XX_HCS_H
-#define __BCM933XX_HCS_H
-
-#include <linux/types.h>
-
-struct bcm_hcs {
-	__u16 magic;
-	__u16 control;
-	__u16 rev_maj;
-	__u16 rev_min;
-	__u32 build_date;
-	__u32 filelen;
-	__u32 ldaddress;
-	char filename[64];
-	__u16 hcs;
-	__u16 her_znaet_chto;
-	__u32 crc;
-};
-
-#endif /* __BCM933XX_HCS */
diff --git a/openflow/usr/include/linux/bfs_fs.h b/openflow/usr/include/linux/bfs_fs.h
deleted file mode 100644
index 1c0b355..0000000
--- a/openflow/usr/include/linux/bfs_fs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *	include/linux/bfs_fs.h - BFS data structures on disk.
- *	Copyright (C) 1999 Tigran Aivazian <tigran@veritas.com>
- */
-
-#ifndef _LINUX_BFS_FS_H
-#define _LINUX_BFS_FS_H
-
-#include <linux/types.h>
-
-#define BFS_BSIZE_BITS		9
-#define BFS_BSIZE		(1<<BFS_BSIZE_BITS)
-
-#define BFS_MAGIC		0x1BADFACE
-#define BFS_ROOT_INO		2
-#define BFS_INODES_PER_BLOCK	8
-
-/* SVR4 vnode type values (bfs_inode->i_vtype) */
-#define BFS_VDIR 2L
-#define BFS_VREG 1L
-
-/* BFS inode layout on disk */
-struct bfs_inode {
-	__le16 i_ino;
-	__u16 i_unused;
-	__le32 i_sblock;
-	__le32 i_eblock;
-	__le32 i_eoffset;
-	__le32 i_vtype;
-	__le32 i_mode;
-	__le32 i_uid;
-	__le32 i_gid;
-	__le32 i_nlink;
-	__le32 i_atime;
-	__le32 i_mtime;
-	__le32 i_ctime;
-	__u32 i_padding[4];
-};
-
-#define BFS_NAMELEN		14	
-#define BFS_DIRENT_SIZE		16
-#define BFS_DIRS_PER_BLOCK	32
-
-struct bfs_dirent {
-	__le16 ino;
-	char name[BFS_NAMELEN];
-};
-
-/* BFS superblock layout on disk */
-struct bfs_super_block {
-	__le32 s_magic;
-	__le32 s_start;
-	__le32 s_end;
-	__le32 s_from;
-	__le32 s_to;
-	__s32 s_bfrom;
-	__s32 s_bto;
-	char  s_fsname[6];
-	char  s_volume[6];
-	__u32 s_padding[118];
-};
-
-
-#define BFS_OFF2INO(offset) \
-        ((((offset) - BFS_BSIZE) / sizeof(struct bfs_inode)) + BFS_ROOT_INO)
-
-#define BFS_INO2OFF(ino) \
-	((__u32)(((ino) - BFS_ROOT_INO) * sizeof(struct bfs_inode)) + BFS_BSIZE)
-#define BFS_NZFILESIZE(ip) \
-        ((le32_to_cpu((ip)->i_eoffset) + 1) -  le32_to_cpu((ip)->i_sblock) * BFS_BSIZE)
-
-#define BFS_FILESIZE(ip) \
-        ((ip)->i_sblock == 0 ? 0 : BFS_NZFILESIZE(ip))
-
-#define BFS_FILEBLOCKS(ip) \
-        ((ip)->i_sblock == 0 ? 0 : (le32_to_cpu((ip)->i_eblock) + 1) -  le32_to_cpu((ip)->i_sblock))
-#define BFS_UNCLEAN(bfs_sb, sb)	\
-	((le32_to_cpu(bfs_sb->s_from) != -1) && (le32_to_cpu(bfs_sb->s_to) != -1) && !(sb->s_flags & MS_RDONLY))
-
-
-#endif	/* _LINUX_BFS_FS_H */
diff --git a/openflow/usr/include/linux/binfmts.h b/openflow/usr/include/linux/binfmts.h
deleted file mode 100644
index 6416794..0000000
--- a/openflow/usr/include/linux/binfmts.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _LINUX_BINFMTS_H
-#define _LINUX_BINFMTS_H
-
-#include <linux/capability.h>
-
-struct pt_regs;
-
-/*
- * These are the maximum length and maximum number of strings passed to the
- * execve() system call.  MAX_ARG_STRLEN is essentially random but serves to
- * prevent the kernel from being unduly impacted by misaddressed pointers.
- * MAX_ARG_STRINGS is chosen to fit in a signed 32-bit integer.
- */
-#define MAX_ARG_STRLEN (PAGE_SIZE * 32)
-#define MAX_ARG_STRINGS 0x7FFFFFFF
-
-/* sizeof(linux_binprm->buf) */
-#define BINPRM_BUF_SIZE 128
-
-#endif /* _LINUX_BINFMTS_H */
diff --git a/openflow/usr/include/linux/blkpg.h b/openflow/usr/include/linux/blkpg.h
deleted file mode 100644
index e39cc4e..0000000
--- a/openflow/usr/include/linux/blkpg.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __LINUX_BLKPG_H
-#define __LINUX_BLKPG_H
-
-/*
- * Partition table and disk geometry handling
- *
- * A single ioctl with lots of subfunctions:
- *
- * Device number stuff:
- *    get_whole_disk()		(given the device number of a partition,
- *                               find the device number of the encompassing disk)
- *    get_all_partitions()	(given the device number of a disk, return the
- *				 device numbers of all its known partitions)
- *
- * Partition stuff:
- *    add_partition()
- *    delete_partition()
- *    test_partition_in_use()	(also for test_disk_in_use)
- *
- * Geometry stuff:
- *    get_geometry()
- *    set_geometry()
- *    get_bios_drivedata()
- *
- * For today, only the partition stuff - aeb, 990515
- */
-
-#include <linux/ioctl.h>
-
-#define BLKPG      _IO(0x12,105)
-
-/* The argument structure */
-struct blkpg_ioctl_arg {
-        int op;
-        int flags;
-        int datalen;
-        void *data;
-};
-
-/* The subfunctions (for the op field) */
-#define BLKPG_ADD_PARTITION	1
-#define BLKPG_DEL_PARTITION	2
-#define BLKPG_RESIZE_PARTITION	3
-
-/* Sizes of name fields. Unused at present. */
-#define BLKPG_DEVNAMELTH	64
-#define BLKPG_VOLNAMELTH	64
-
-/* The data structure for ADD_PARTITION and DEL_PARTITION */
-struct blkpg_partition {
-	long long start;		/* starting offset in bytes */
-	long long length;		/* length in bytes */
-	int pno;			/* partition number */
-	char devname[BLKPG_DEVNAMELTH];	/* partition name, like sda5 or c0d1p2,
-					   to be used in kernel messages */
-	char volname[BLKPG_VOLNAMELTH];	/* volume label */
-};
-
-#endif /* __LINUX_BLKPG_H */
diff --git a/openflow/usr/include/linux/blktrace_api.h b/openflow/usr/include/linux/blktrace_api.h
deleted file mode 100644
index 8d00071..0000000
--- a/openflow/usr/include/linux/blktrace_api.h
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef BLKTRACE_H
-#define BLKTRACE_H
-
-#include <linux/types.h>
-
-/*
- * Trace categories
- */
-enum blktrace_cat {
-	BLK_TC_READ	= 1 << 0,	/* reads */
-	BLK_TC_WRITE	= 1 << 1,	/* writes */
-	BLK_TC_FLUSH	= 1 << 2,	/* flush */
-	BLK_TC_SYNC	= 1 << 3,	/* sync IO */
-	BLK_TC_SYNCIO	= BLK_TC_SYNC,
-	BLK_TC_QUEUE	= 1 << 4,	/* queueing/merging */
-	BLK_TC_REQUEUE	= 1 << 5,	/* requeueing */
-	BLK_TC_ISSUE	= 1 << 6,	/* issue */
-	BLK_TC_COMPLETE	= 1 << 7,	/* completions */
-	BLK_TC_FS	= 1 << 8,	/* fs requests */
-	BLK_TC_PC	= 1 << 9,	/* pc requests */
-	BLK_TC_NOTIFY	= 1 << 10,	/* special message */
-	BLK_TC_AHEAD	= 1 << 11,	/* readahead */
-	BLK_TC_META	= 1 << 12,	/* metadata */
-	BLK_TC_DISCARD	= 1 << 13,	/* discard requests */
-	BLK_TC_DRV_DATA	= 1 << 14,	/* binary per-driver data */
-	BLK_TC_FUA	= 1 << 15,	/* fua requests */
-
-	BLK_TC_END	= 1 << 15,	/* we've run out of bits! */
-};
-
-#define BLK_TC_SHIFT		(16)
-#define BLK_TC_ACT(act)		((act) << BLK_TC_SHIFT)
-
-/*
- * Basic trace actions
- */
-enum blktrace_act {
-	__BLK_TA_QUEUE = 1,		/* queued */
-	__BLK_TA_BACKMERGE,		/* back merged to existing rq */
-	__BLK_TA_FRONTMERGE,		/* front merge to existing rq */
-	__BLK_TA_GETRQ,			/* allocated new request */
-	__BLK_TA_SLEEPRQ,		/* sleeping on rq allocation */
-	__BLK_TA_REQUEUE,		/* request requeued */
-	__BLK_TA_ISSUE,			/* sent to driver */
-	__BLK_TA_COMPLETE,		/* completed by driver */
-	__BLK_TA_PLUG,			/* queue was plugged */
-	__BLK_TA_UNPLUG_IO,		/* queue was unplugged by io */
-	__BLK_TA_UNPLUG_TIMER,		/* queue was unplugged by timer */
-	__BLK_TA_INSERT,		/* insert request */
-	__BLK_TA_SPLIT,			/* bio was split */
-	__BLK_TA_BOUNCE,		/* bio was bounced */
-	__BLK_TA_REMAP,			/* bio was remapped */
-	__BLK_TA_ABORT,			/* request aborted */
-	__BLK_TA_DRV_DATA,		/* driver-specific binary data */
-};
-
-/*
- * Notify events.
- */
-enum blktrace_notify {
-	__BLK_TN_PROCESS = 0,		/* establish pid/name mapping */
-	__BLK_TN_TIMESTAMP,		/* include system clock */
-	__BLK_TN_MESSAGE,		/* Character string message */
-};
-
-
-/*
- * Trace actions in full. Additionally, read or write is masked
- */
-#define BLK_TA_QUEUE		(__BLK_TA_QUEUE | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_BACKMERGE	(__BLK_TA_BACKMERGE | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_FRONTMERGE	(__BLK_TA_FRONTMERGE | BLK_TC_ACT(BLK_TC_QUEUE))
-#define	BLK_TA_GETRQ		(__BLK_TA_GETRQ | BLK_TC_ACT(BLK_TC_QUEUE))
-#define	BLK_TA_SLEEPRQ		(__BLK_TA_SLEEPRQ | BLK_TC_ACT(BLK_TC_QUEUE))
-#define	BLK_TA_REQUEUE		(__BLK_TA_REQUEUE | BLK_TC_ACT(BLK_TC_REQUEUE))
-#define BLK_TA_ISSUE		(__BLK_TA_ISSUE | BLK_TC_ACT(BLK_TC_ISSUE))
-#define BLK_TA_COMPLETE		(__BLK_TA_COMPLETE| BLK_TC_ACT(BLK_TC_COMPLETE))
-#define BLK_TA_PLUG		(__BLK_TA_PLUG | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_UNPLUG_IO	(__BLK_TA_UNPLUG_IO | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_UNPLUG_TIMER	(__BLK_TA_UNPLUG_TIMER | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_INSERT		(__BLK_TA_INSERT | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_SPLIT		(__BLK_TA_SPLIT)
-#define BLK_TA_BOUNCE		(__BLK_TA_BOUNCE)
-#define BLK_TA_REMAP		(__BLK_TA_REMAP | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_ABORT		(__BLK_TA_ABORT | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_DRV_DATA	(__BLK_TA_DRV_DATA | BLK_TC_ACT(BLK_TC_DRV_DATA))
-
-#define BLK_TN_PROCESS		(__BLK_TN_PROCESS | BLK_TC_ACT(BLK_TC_NOTIFY))
-#define BLK_TN_TIMESTAMP	(__BLK_TN_TIMESTAMP | BLK_TC_ACT(BLK_TC_NOTIFY))
-#define BLK_TN_MESSAGE		(__BLK_TN_MESSAGE | BLK_TC_ACT(BLK_TC_NOTIFY))
-
-#define BLK_IO_TRACE_MAGIC	0x65617400
-#define BLK_IO_TRACE_VERSION	0x07
-
-/*
- * The trace itself
- */
-struct blk_io_trace {
-	__u32 magic;		/* MAGIC << 8 | version */
-	__u32 sequence;		/* event number */
-	__u64 time;		/* in microseconds */
-	__u64 sector;		/* disk offset */
-	__u32 bytes;		/* transfer length */
-	__u32 action;		/* what happened */
-	__u32 pid;		/* who did it */
-	__u32 device;		/* device number */
-	__u32 cpu;		/* on what cpu did it happen */
-	__u16 error;		/* completion error */
-	__u16 pdu_len;		/* length of data after this trace */
-};
-
-/*
- * The remap event
- */
-struct blk_io_trace_remap {
-	__be32 device_from;
-	__be32 device_to;
-	__be64 sector_from;
-};
-
-enum {
-	Blktrace_setup = 1,
-	Blktrace_running,
-	Blktrace_stopped,
-};
-
-#define BLKTRACE_BDEV_SIZE	32
-
-/*
- * User setup structure passed with BLKTRACESTART
- */
-struct blk_user_trace_setup {
-	char name[BLKTRACE_BDEV_SIZE];	/* output */
-	__u16 act_mask;			/* input */
-	__u32 buf_size;			/* input */
-	__u32 buf_nr;			/* input */
-	__u64 start_lba;
-	__u64 end_lba;
-	__u32 pid;
-};
-
-#endif /* BLKTRACE_H */
diff --git a/openflow/usr/include/linux/bpf.h b/openflow/usr/include/linux/bpf.h
deleted file mode 100644
index 2e2524d..0000000
--- a/openflow/usr/include/linux/bpf.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- */
-#ifndef __LINUX_BPF_H__
-#define __LINUX_BPF_H__
-
-#include <linux/types.h>
-#include <linux/bpf_common.h>
-
-/* Extended instruction set based on top of classic BPF */
-
-/* instruction classes */
-#define BPF_ALU64	0x07	/* alu mode in double word width */
-
-/* ld/ldx fields */
-#define BPF_DW		0x18	/* double word */
-#define BPF_XADD	0xc0	/* exclusive add */
-
-/* alu/jmp fields */
-#define BPF_MOV		0xb0	/* mov reg to reg */
-#define BPF_ARSH	0xc0	/* sign extending arithmetic shift right */
-
-/* change endianness of a register */
-#define BPF_END		0xd0	/* flags for endianness conversion: */
-#define BPF_TO_LE	0x00	/* convert to little-endian */
-#define BPF_TO_BE	0x08	/* convert to big-endian */
-#define BPF_FROM_LE	BPF_TO_LE
-#define BPF_FROM_BE	BPF_TO_BE
-
-#define BPF_JNE		0x50	/* jump != */
-#define BPF_JSGT	0x60	/* SGT is signed '>', GT in x86 */
-#define BPF_JSGE	0x70	/* SGE is signed '>=', GE in x86 */
-#define BPF_CALL	0x80	/* function call */
-#define BPF_EXIT	0x90	/* function return */
-
-/* Register numbers */
-enum {
-	BPF_REG_0 = 0,
-	BPF_REG_1,
-	BPF_REG_2,
-	BPF_REG_3,
-	BPF_REG_4,
-	BPF_REG_5,
-	BPF_REG_6,
-	BPF_REG_7,
-	BPF_REG_8,
-	BPF_REG_9,
-	BPF_REG_10,
-	__MAX_BPF_REG,
-};
-
-/* BPF has 10 general purpose 64-bit registers and stack frame. */
-#define MAX_BPF_REG	__MAX_BPF_REG
-
-struct bpf_insn {
-	__u8	code;		/* opcode */
-	__u8	dst_reg:4;	/* dest register */
-	__u8	src_reg:4;	/* source register */
-	__s16	off;		/* signed offset */
-	__s32	imm;		/* signed immediate constant */
-};
-
-/* BPF syscall commands, see bpf(2) man-page for details. */
-enum bpf_cmd {
-	BPF_MAP_CREATE,
-	BPF_MAP_LOOKUP_ELEM,
-	BPF_MAP_UPDATE_ELEM,
-	BPF_MAP_DELETE_ELEM,
-	BPF_MAP_GET_NEXT_KEY,
-	BPF_PROG_LOAD,
-	BPF_OBJ_PIN,
-	BPF_OBJ_GET,
-};
-
-enum bpf_map_type {
-	BPF_MAP_TYPE_UNSPEC,
-	BPF_MAP_TYPE_HASH,
-	BPF_MAP_TYPE_ARRAY,
-	BPF_MAP_TYPE_PROG_ARRAY,
-	BPF_MAP_TYPE_PERF_EVENT_ARRAY,
-};
-
-enum bpf_prog_type {
-	BPF_PROG_TYPE_UNSPEC,
-	BPF_PROG_TYPE_SOCKET_FILTER,
-	BPF_PROG_TYPE_KPROBE,
-	BPF_PROG_TYPE_SCHED_CLS,
-	BPF_PROG_TYPE_SCHED_ACT,
-};
-
-#define BPF_PSEUDO_MAP_FD	1
-
-/* flags for BPF_MAP_UPDATE_ELEM command */
-#define BPF_ANY		0 /* create new element or update existing */
-#define BPF_NOEXIST	1 /* create new element if it didn't exist */
-#define BPF_EXIST	2 /* update existing element */
-
-union bpf_attr {
-	struct { /* anonymous struct used by BPF_MAP_CREATE command */
-		__u32	map_type;	/* one of enum bpf_map_type */
-		__u32	key_size;	/* size of key in bytes */
-		__u32	value_size;	/* size of value in bytes */
-		__u32	max_entries;	/* max number of entries in a map */
-	};
-
-	struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
-		__u32		map_fd;
-		__aligned_u64	key;
-		union {
-			__aligned_u64 value;
-			__aligned_u64 next_key;
-		};
-		__u64		flags;
-	};
-
-	struct { /* anonymous struct used by BPF_PROG_LOAD command */
-		__u32		prog_type;	/* one of enum bpf_prog_type */
-		__u32		insn_cnt;
-		__aligned_u64	insns;
-		__aligned_u64	license;
-		__u32		log_level;	/* verbosity level of verifier */
-		__u32		log_size;	/* size of user buffer */
-		__aligned_u64	log_buf;	/* user supplied buffer */
-		__u32		kern_version;	/* checked when prog_type=kprobe */
-	};
-
-	struct { /* anonymous struct used by BPF_OBJ_* commands */
-		__aligned_u64	pathname;
-		__u32		bpf_fd;
-	};
-} __attribute__((aligned(8)));
-
-/* integer value in 'imm' field of BPF_CALL instruction selects which helper
- * function eBPF program intends to call
- */
-enum bpf_func_id {
-	BPF_FUNC_unspec,
-	BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */
-	BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */
-	BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */
-	BPF_FUNC_probe_read,      /* int bpf_probe_read(void *dst, int size, void *src) */
-	BPF_FUNC_ktime_get_ns,    /* u64 bpf_ktime_get_ns(void) */
-	BPF_FUNC_trace_printk,    /* int bpf_trace_printk(const char *fmt, int fmt_size, ...) */
-	BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */
-	BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */
-
-	/**
-	 * skb_store_bytes(skb, offset, from, len, flags) - store bytes into packet
-	 * @skb: pointer to skb
-	 * @offset: offset within packet from skb->mac_header
-	 * @from: pointer where to copy bytes from
-	 * @len: number of bytes to store into packet
-	 * @flags: bit 0 - if true, recompute skb->csum
-	 *         other bits - reserved
-	 * Return: 0 on success
-	 */
-	BPF_FUNC_skb_store_bytes,
-
-	/**
-	 * l3_csum_replace(skb, offset, from, to, flags) - recompute IP checksum
-	 * @skb: pointer to skb
-	 * @offset: offset within packet where IP checksum is located
-	 * @from: old value of header field
-	 * @to: new value of header field
-	 * @flags: bits 0-3 - size of header field
-	 *         other bits - reserved
-	 * Return: 0 on success
-	 */
-	BPF_FUNC_l3_csum_replace,
-
-	/**
-	 * l4_csum_replace(skb, offset, from, to, flags) - recompute TCP/UDP checksum
-	 * @skb: pointer to skb
-	 * @offset: offset within packet where TCP/UDP checksum is located
-	 * @from: old value of header field
-	 * @to: new value of header field
-	 * @flags: bits 0-3 - size of header field
-	 *         bit 4 - is pseudo header
-	 *         other bits - reserved
-	 * Return: 0 on success
-	 */
-	BPF_FUNC_l4_csum_replace,
-
-	/**
-	 * bpf_tail_call(ctx, prog_array_map, index) - jump into another BPF program
-	 * @ctx: context pointer passed to next program
-	 * @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY
-	 * @index: index inside array that selects specific program to run
-	 * Return: 0 on success
-	 */
-	BPF_FUNC_tail_call,
-
-	/**
-	 * bpf_clone_redirect(skb, ifindex, flags) - redirect to another netdev
-	 * @skb: pointer to skb
-	 * @ifindex: ifindex of the net device
-	 * @flags: bit 0 - if set, redirect to ingress instead of egress
-	 *         other bits - reserved
-	 * Return: 0 on success
-	 */
-	BPF_FUNC_clone_redirect,
-
-	/**
-	 * u64 bpf_get_current_pid_tgid(void)
-	 * Return: current->tgid << 32 | current->pid
-	 */
-	BPF_FUNC_get_current_pid_tgid,
-
-	/**
-	 * u64 bpf_get_current_uid_gid(void)
-	 * Return: current_gid << 32 | current_uid
-	 */
-	BPF_FUNC_get_current_uid_gid,
-
-	/**
-	 * bpf_get_current_comm(char *buf, int size_of_buf)
-	 * stores current->comm into buf
-	 * Return: 0 on success
-	 */
-	BPF_FUNC_get_current_comm,
-
-	/**
-	 * bpf_get_cgroup_classid(skb) - retrieve a proc's classid
-	 * @skb: pointer to skb
-	 * Return: classid if != 0
-	 */
-	BPF_FUNC_get_cgroup_classid,
-	BPF_FUNC_skb_vlan_push, /* bpf_skb_vlan_push(skb, vlan_proto, vlan_tci) */
-	BPF_FUNC_skb_vlan_pop,  /* bpf_skb_vlan_pop(skb) */
-
-	/**
-	 * bpf_skb_[gs]et_tunnel_key(skb, key, size, flags)
-	 * retrieve or populate tunnel metadata
-	 * @skb: pointer to skb
-	 * @key: pointer to 'struct bpf_tunnel_key'
-	 * @size: size of 'struct bpf_tunnel_key'
-	 * @flags: room for future extensions
-	 * Retrun: 0 on success
-	 */
-	BPF_FUNC_skb_get_tunnel_key,
-	BPF_FUNC_skb_set_tunnel_key,
-	BPF_FUNC_perf_event_read,	/* u64 bpf_perf_event_read(&map, index) */
-	/**
-	 * bpf_redirect(ifindex, flags) - redirect to another netdev
-	 * @ifindex: ifindex of the net device
-	 * @flags: bit 0 - if set, redirect to ingress instead of egress
-	 *         other bits - reserved
-	 * Return: TC_ACT_REDIRECT
-	 */
-	BPF_FUNC_redirect,
-
-	/**
-	 * bpf_get_route_realm(skb) - retrieve a dst's tclassid
-	 * @skb: pointer to skb
-	 * Return: realm if != 0
-	 */
-	BPF_FUNC_get_route_realm,
-
-	/**
-	 * bpf_perf_event_output(ctx, map, index, data, size) - output perf raw sample
-	 * @ctx: struct pt_regs*
-	 * @map: pointer to perf_event_array map
-	 * @index: index of event in the map
-	 * @data: data on stack to be output as raw data
-	 * @size: size of data
-	 * Return: 0 on success
-	 */
-	BPF_FUNC_perf_event_output,
-	__BPF_FUNC_MAX_ID,
-};
-
-/* user accessible mirror of in-kernel sk_buff.
- * new fields can only be added to the end of this structure
- */
-struct __sk_buff {
-	__u32 len;
-	__u32 pkt_type;
-	__u32 mark;
-	__u32 queue_mapping;
-	__u32 protocol;
-	__u32 vlan_present;
-	__u32 vlan_tci;
-	__u32 vlan_proto;
-	__u32 priority;
-	__u32 ingress_ifindex;
-	__u32 ifindex;
-	__u32 tc_index;
-	__u32 cb[5];
-	__u32 hash;
-	__u32 tc_classid;
-};
-
-struct bpf_tunnel_key {
-	__u32 tunnel_id;
-	__u32 remote_ipv4;
-};
-
-#endif /* __LINUX_BPF_H__ */
diff --git a/openflow/usr/include/linux/bpf_common.h b/openflow/usr/include/linux/bpf_common.h
deleted file mode 100644
index afe7433..0000000
--- a/openflow/usr/include/linux/bpf_common.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef __LINUX_BPF_COMMON_H__
-#define __LINUX_BPF_COMMON_H__
-
-/* Instruction classes */
-#define BPF_CLASS(code) ((code) & 0x07)
-#define		BPF_LD		0x00
-#define		BPF_LDX		0x01
-#define		BPF_ST		0x02
-#define		BPF_STX		0x03
-#define		BPF_ALU		0x04
-#define		BPF_JMP		0x05
-#define		BPF_RET		0x06
-#define		BPF_MISC        0x07
-
-/* ld/ldx fields */
-#define BPF_SIZE(code)  ((code) & 0x18)
-#define		BPF_W		0x00
-#define		BPF_H		0x08
-#define		BPF_B		0x10
-#define BPF_MODE(code)  ((code) & 0xe0)
-#define		BPF_IMM		0x00
-#define		BPF_ABS		0x20
-#define		BPF_IND		0x40
-#define		BPF_MEM		0x60
-#define		BPF_LEN		0x80
-#define		BPF_MSH		0xa0
-
-/* alu/jmp fields */
-#define BPF_OP(code)    ((code) & 0xf0)
-#define		BPF_ADD		0x00
-#define		BPF_SUB		0x10
-#define		BPF_MUL		0x20
-#define		BPF_DIV		0x30
-#define		BPF_OR		0x40
-#define		BPF_AND		0x50
-#define		BPF_LSH		0x60
-#define		BPF_RSH		0x70
-#define		BPF_NEG		0x80
-#define		BPF_MOD		0x90
-#define		BPF_XOR		0xa0
-
-#define		BPF_JA		0x00
-#define		BPF_JEQ		0x10
-#define		BPF_JGT		0x20
-#define		BPF_JGE		0x30
-#define		BPF_JSET        0x40
-#define BPF_SRC(code)   ((code) & 0x08)
-#define		BPF_K		0x00
-#define		BPF_X		0x08
-
-#ifndef BPF_MAXINSNS
-#define BPF_MAXINSNS 4096
-#endif
-
-#endif /* __LINUX_BPF_COMMON_H__ */
diff --git a/openflow/usr/include/linux/bpqether.h b/openflow/usr/include/linux/bpqether.h
deleted file mode 100644
index a6c35e1..0000000
--- a/openflow/usr/include/linux/bpqether.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef	__BPQETHER_H
-#define	__BPQETHER_H
-
-/*
- * 	Defines for the BPQETHER pseudo device driver
- */
-
-#ifndef __LINUX_IF_ETHER_H
-#include <linux/if_ether.h>
-#endif
-
-#define SIOCSBPQETHOPT		(SIOCDEVPRIVATE+0)	/* reserved */
-#define SIOCSBPQETHADDR		(SIOCDEVPRIVATE+1)
- 
-struct bpq_ethaddr {
-	unsigned char destination[ETH_ALEN];
-	unsigned char accept[ETH_ALEN];
-};
-
-/* 
- * For SIOCSBPQETHOPT - this is compatible with PI2/PacketTwin card drivers,
- * currently not implemented, though. If someone wants to hook a radio
- * to his Ethernet card he may find this useful. ;-)
- */
-
-#define SIOCGBPQETHPARAM	0x5000  /* get Level 1 parameters */
-#define SIOCSBPQETHPARAM	0x5001  /* set */
-
-struct bpq_req  {
-    int cmd;
-    int speed;			/* unused */
-    int clockmode;		/* unused */
-    int txdelay;
-    unsigned char persist;	/* unused */
-    int slotime;		/* unused */
-    int squeldelay;
-    int dmachan;		/* unused */
-    int irq;			/* unused */
-};
-
-#endif
diff --git a/openflow/usr/include/linux/bsg.h b/openflow/usr/include/linux/bsg.h
deleted file mode 100644
index 9d35c01..0000000
--- a/openflow/usr/include/linux/bsg.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef BSG_H
-#define BSG_H
-
-#include <linux/types.h>
-
-#define BSG_PROTOCOL_SCSI		0
-
-#define BSG_SUB_PROTOCOL_SCSI_CMD	0
-#define BSG_SUB_PROTOCOL_SCSI_TMF	1
-#define BSG_SUB_PROTOCOL_SCSI_TRANSPORT	2
-
-/*
- * For flag constants below:
- * sg.h sg_io_hdr also has bits defined for it's flags member. These
- * two flag values (0x10 and 0x20) have the same meaning in sg.h . For
- * bsg the BSG_FLAG_Q_AT_HEAD flag is ignored since it is the deafult.
- */
-#define BSG_FLAG_Q_AT_TAIL 0x10 /* default is Q_AT_HEAD */
-#define BSG_FLAG_Q_AT_HEAD 0x20
-
-struct sg_io_v4 {
-	__s32 guard;		/* [i] 'Q' to differentiate from v3 */
-	__u32 protocol;		/* [i] 0 -> SCSI , .... */
-	__u32 subprotocol;	/* [i] 0 -> SCSI command, 1 -> SCSI task
-				   management function, .... */
-
-	__u32 request_len;	/* [i] in bytes */
-	__u64 request;		/* [i], [*i] {SCSI: cdb} */
-	__u64 request_tag;	/* [i] {SCSI: task tag (only if flagged)} */
-	__u32 request_attr;	/* [i] {SCSI: task attribute} */
-	__u32 request_priority;	/* [i] {SCSI: task priority} */
-	__u32 request_extra;	/* [i] {spare, for padding} */
-	__u32 max_response_len;	/* [i] in bytes */
-	__u64 response;		/* [i], [*o] {SCSI: (auto)sense data} */
-
-        /* "dout_": data out (to device); "din_": data in (from device) */
-	__u32 dout_iovec_count;	/* [i] 0 -> "flat" dout transfer else
-				   dout_xfer points to array of iovec */
-	__u32 dout_xfer_len;	/* [i] bytes to be transferred to device */
-	__u32 din_iovec_count;	/* [i] 0 -> "flat" din transfer */
-	__u32 din_xfer_len;	/* [i] bytes to be transferred from device */
-	__u64 dout_xferp;	/* [i], [*i] */
-	__u64 din_xferp;	/* [i], [*o] */
-
-	__u32 timeout;		/* [i] units: millisecond */
-	__u32 flags;		/* [i] bit mask */
-	__u64 usr_ptr;		/* [i->o] unused internally */
-	__u32 spare_in;		/* [i] */
-
-	__u32 driver_status;	/* [o] 0 -> ok */
-	__u32 transport_status;	/* [o] 0 -> ok */
-	__u32 device_status;	/* [o] {SCSI: command completion status} */
-	__u32 retry_delay;	/* [o] {SCSI: status auxiliary information} */
-	__u32 info;		/* [o] additional information */
-	__u32 duration;		/* [o] time to complete, in milliseconds */
-	__u32 response_len;	/* [o] bytes of response actually written */
-	__s32 din_resid;	/* [o] din_xfer_len - actual_din_xfer_len */
-	__s32 dout_resid;	/* [o] dout_xfer_len - actual_dout_xfer_len */
-	__u64 generated_tag;	/* [o] {SCSI: transport generated task tag} */
-	__u32 spare_out;	/* [o] */
-
-	__u32 padding;
-};
-
-
-#endif /* BSG_H */
diff --git a/openflow/usr/include/linux/btrfs.h b/openflow/usr/include/linux/btrfs.h
deleted file mode 100644
index 02078f1..0000000
--- a/openflow/usr/include/linux/btrfs.h
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
- * Copyright (C) 2007 Oracle.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License v2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- */
-
-#ifndef _LINUX_BTRFS_H
-#define _LINUX_BTRFS_H
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-#define BTRFS_IOCTL_MAGIC 0x94
-#define BTRFS_VOL_NAME_MAX 255
-
-/* this should be 4k */
-#define BTRFS_PATH_NAME_MAX 4087
-struct btrfs_ioctl_vol_args {
-	__s64 fd;
-	char name[BTRFS_PATH_NAME_MAX + 1];
-};
-
-#define BTRFS_DEVICE_PATH_NAME_MAX 1024
-
-#define BTRFS_SUBVOL_CREATE_ASYNC	(1ULL << 0)
-#define BTRFS_SUBVOL_RDONLY		(1ULL << 1)
-#define BTRFS_SUBVOL_QGROUP_INHERIT	(1ULL << 2)
-#define BTRFS_FSID_SIZE 16
-#define BTRFS_UUID_SIZE 16
-#define BTRFS_UUID_UNPARSED_SIZE	37
-
-#define BTRFS_QGROUP_INHERIT_SET_LIMITS	(1ULL << 0)
-
-struct btrfs_qgroup_limit {
-	__u64	flags;
-	__u64	max_rfer;
-	__u64	max_excl;
-	__u64	rsv_rfer;
-	__u64	rsv_excl;
-};
-
-struct btrfs_qgroup_inherit {
-	__u64	flags;
-	__u64	num_qgroups;
-	__u64	num_ref_copies;
-	__u64	num_excl_copies;
-	struct btrfs_qgroup_limit lim;
-	__u64	qgroups[0];
-};
-
-struct btrfs_ioctl_qgroup_limit_args {
-	__u64	qgroupid;
-	struct btrfs_qgroup_limit lim;
-};
-
-#define BTRFS_SUBVOL_NAME_MAX 4039
-struct btrfs_ioctl_vol_args_v2 {
-	__s64 fd;
-	__u64 transid;
-	__u64 flags;
-	union {
-		struct {
-			__u64 size;
-			struct btrfs_qgroup_inherit *qgroup_inherit;
-		};
-		__u64 unused[4];
-	};
-	char name[BTRFS_SUBVOL_NAME_MAX + 1];
-};
-
-/*
- * structure to report errors and progress to userspace, either as a
- * result of a finished scrub, a canceled scrub or a progress inquiry
- */
-struct btrfs_scrub_progress {
-	__u64 data_extents_scrubbed;	/* # of data extents scrubbed */
-	__u64 tree_extents_scrubbed;	/* # of tree extents scrubbed */
-	__u64 data_bytes_scrubbed;	/* # of data bytes scrubbed */
-	__u64 tree_bytes_scrubbed;	/* # of tree bytes scrubbed */
-	__u64 read_errors;		/* # of read errors encountered (EIO) */
-	__u64 csum_errors;		/* # of failed csum checks */
-	__u64 verify_errors;		/* # of occurences, where the metadata
-					 * of a tree block did not match the
-					 * expected values, like generation or
-					 * logical */
-	__u64 no_csum;			/* # of 4k data block for which no csum
-					 * is present, probably the result of
-					 * data written with nodatasum */
-	__u64 csum_discards;		/* # of csum for which no data was found
-					 * in the extent tree. */
-	__u64 super_errors;		/* # of bad super blocks encountered */
-	__u64 malloc_errors;		/* # of internal kmalloc errors. These
-					 * will likely cause an incomplete
-					 * scrub */
-	__u64 uncorrectable_errors;	/* # of errors where either no intact
-					 * copy was found or the writeback
-					 * failed */
-	__u64 corrected_errors;		/* # of errors corrected */
-	__u64 last_physical;		/* last physical address scrubbed. In
-					 * case a scrub was aborted, this can
-					 * be used to restart the scrub */
-	__u64 unverified_errors;	/* # of occurences where a read for a
-					 * full (64k) bio failed, but the re-
-					 * check succeeded for each 4k piece.
-					 * Intermittent error. */
-};
-
-#define BTRFS_SCRUB_READONLY	1
-struct btrfs_ioctl_scrub_args {
-	__u64 devid;				/* in */
-	__u64 start;				/* in */
-	__u64 end;				/* in */
-	__u64 flags;				/* in */
-	struct btrfs_scrub_progress progress;	/* out */
-	/* pad to 1k */
-	__u64 unused[(1024-32-sizeof(struct btrfs_scrub_progress))/8];
-};
-
-#define BTRFS_IOCTL_DEV_REPLACE_CONT_READING_FROM_SRCDEV_MODE_ALWAYS	0
-#define BTRFS_IOCTL_DEV_REPLACE_CONT_READING_FROM_SRCDEV_MODE_AVOID	1
-struct btrfs_ioctl_dev_replace_start_params {
-	__u64 srcdevid;	/* in, if 0, use srcdev_name instead */
-	__u64 cont_reading_from_srcdev_mode;	/* in, see #define
-						 * above */
-	__u8 srcdev_name[BTRFS_DEVICE_PATH_NAME_MAX + 1];	/* in */
-	__u8 tgtdev_name[BTRFS_DEVICE_PATH_NAME_MAX + 1];	/* in */
-};
-
-#define BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED	0
-#define BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED		1
-#define BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED		2
-#define BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED		3
-#define BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED		4
-struct btrfs_ioctl_dev_replace_status_params {
-	__u64 replace_state;	/* out, see #define above */
-	__u64 progress_1000;	/* out, 0 <= x <= 1000 */
-	__u64 time_started;	/* out, seconds since 1-Jan-1970 */
-	__u64 time_stopped;	/* out, seconds since 1-Jan-1970 */
-	__u64 num_write_errors;	/* out */
-	__u64 num_uncorrectable_read_errors;	/* out */
-};
-
-#define BTRFS_IOCTL_DEV_REPLACE_CMD_START			0
-#define BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS			1
-#define BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL			2
-#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR			0
-#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED		1
-#define BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED		2
-#define BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS		3
-struct btrfs_ioctl_dev_replace_args {
-	__u64 cmd;	/* in */
-	__u64 result;	/* out */
-
-	union {
-		struct btrfs_ioctl_dev_replace_start_params start;
-		struct btrfs_ioctl_dev_replace_status_params status;
-	};	/* in/out */
-
-	__u64 spare[64];
-};
-
-struct btrfs_ioctl_dev_info_args {
-	__u64 devid;				/* in/out */
-	__u8 uuid[BTRFS_UUID_SIZE];		/* in/out */
-	__u64 bytes_used;			/* out */
-	__u64 total_bytes;			/* out */
-	__u64 unused[379];			/* pad to 4k */
-	__u8 path[BTRFS_DEVICE_PATH_NAME_MAX];	/* out */
-};
-
-struct btrfs_ioctl_fs_info_args {
-	__u64 max_id;				/* out */
-	__u64 num_devices;			/* out */
-	__u8 fsid[BTRFS_FSID_SIZE];		/* out */
-	__u32 nodesize;				/* out */
-	__u32 sectorsize;			/* out */
-	__u32 clone_alignment;			/* out */
-	__u32 reserved32;
-	__u64 reserved[122];			/* pad to 1k */
-};
-
-struct btrfs_ioctl_feature_flags {
-	__u64 compat_flags;
-	__u64 compat_ro_flags;
-	__u64 incompat_flags;
-};
-
-/* balance control ioctl modes */
-#define BTRFS_BALANCE_CTL_PAUSE		1
-#define BTRFS_BALANCE_CTL_CANCEL	2
-
-/*
- * this is packed, because it should be exactly the same as its disk
- * byte order counterpart (struct btrfs_disk_balance_args)
- */
-struct btrfs_balance_args {
-	__u64 profiles;
-	union {
-		__le64 usage;
-		struct {
-			__le32 usage_min;
-			__le32 usage_max;
-		};
-	};
-	__u64 devid;
-	__u64 pstart;
-	__u64 pend;
-	__u64 vstart;
-	__u64 vend;
-
-	__u64 target;
-
-	__u64 flags;
-
-	/*
-	 * BTRFS_BALANCE_ARGS_LIMIT with value 'limit'
-	 * BTRFS_BALANCE_ARGS_LIMIT_RANGE - the extend version can use minimum
-	 * and maximum
-	 */
-	union {
-		__u64 limit;		/* limit number of processed chunks */
-		struct {
-			__u32 limit_min;
-			__u32 limit_max;
-		};
-	};
-
-	/*
-	 * Process chunks that cross stripes_min..stripes_max devices,
-	 * BTRFS_BALANCE_ARGS_STRIPES_RANGE
-	 */
-	__le32 stripes_min;
-	__le32 stripes_max;
-
-	__u64 unused[6];
-} __attribute__ ((__packed__));
-
-/* report balance progress to userspace */
-struct btrfs_balance_progress {
-	__u64 expected;		/* estimated # of chunks that will be
-				 * relocated to fulfill the request */
-	__u64 considered;	/* # of chunks we have considered so far */
-	__u64 completed;	/* # of chunks relocated so far */
-};
-
-#define BTRFS_BALANCE_STATE_RUNNING	(1ULL << 0)
-#define BTRFS_BALANCE_STATE_PAUSE_REQ	(1ULL << 1)
-#define BTRFS_BALANCE_STATE_CANCEL_REQ	(1ULL << 2)
-
-struct btrfs_ioctl_balance_args {
-	__u64 flags;				/* in/out */
-	__u64 state;				/* out */
-
-	struct btrfs_balance_args data;		/* in/out */
-	struct btrfs_balance_args meta;		/* in/out */
-	struct btrfs_balance_args sys;		/* in/out */
-
-	struct btrfs_balance_progress stat;	/* out */
-
-	__u64 unused[72];			/* pad to 1k */
-};
-
-#define BTRFS_INO_LOOKUP_PATH_MAX 4080
-struct btrfs_ioctl_ino_lookup_args {
-	__u64 treeid;
-	__u64 objectid;
-	char name[BTRFS_INO_LOOKUP_PATH_MAX];
-};
-
-struct btrfs_ioctl_search_key {
-	/* which root are we searching.  0 is the tree of tree roots */
-	__u64 tree_id;
-
-	/* keys returned will be >= min and <= max */
-	__u64 min_objectid;
-	__u64 max_objectid;
-
-	/* keys returned will be >= min and <= max */
-	__u64 min_offset;
-	__u64 max_offset;
-
-	/* max and min transids to search for */
-	__u64 min_transid;
-	__u64 max_transid;
-
-	/* keys returned will be >= min and <= max */
-	__u32 min_type;
-	__u32 max_type;
-
-	/*
-	 * how many items did userland ask for, and how many are we
-	 * returning
-	 */
-	__u32 nr_items;
-
-	/* align to 64 bits */
-	__u32 unused;
-
-	/* some extra for later */
-	__u64 unused1;
-	__u64 unused2;
-	__u64 unused3;
-	__u64 unused4;
-};
-
-struct btrfs_ioctl_search_header {
-	__u64 transid;
-	__u64 objectid;
-	__u64 offset;
-	__u32 type;
-	__u32 len;
-};
-
-#define BTRFS_SEARCH_ARGS_BUFSIZE (4096 - sizeof(struct btrfs_ioctl_search_key))
-/*
- * the buf is an array of search headers where
- * each header is followed by the actual item
- * the type field is expanded to 32 bits for alignment
- */
-struct btrfs_ioctl_search_args {
-	struct btrfs_ioctl_search_key key;
-	char buf[BTRFS_SEARCH_ARGS_BUFSIZE];
-};
-
-struct btrfs_ioctl_search_args_v2 {
-	struct btrfs_ioctl_search_key key; /* in/out - search parameters */
-	__u64 buf_size;		   /* in - size of buffer
-					    * out - on EOVERFLOW: needed size
-					    *       to store item */
-	__u64 buf[0];                       /* out - found items */
-};
-
-struct btrfs_ioctl_clone_range_args {
-  __s64 src_fd;
-  __u64 src_offset, src_length;
-  __u64 dest_offset;
-};
-
-/* flags for the defrag range ioctl */
-#define BTRFS_DEFRAG_RANGE_COMPRESS 1
-#define BTRFS_DEFRAG_RANGE_START_IO 2
-
-#define BTRFS_SAME_DATA_DIFFERS	1
-/* For extent-same ioctl */
-struct btrfs_ioctl_same_extent_info {
-	__s64 fd;		/* in - destination file */
-	__u64 logical_offset;	/* in - start of extent in destination */
-	__u64 bytes_deduped;	/* out - total # of bytes we were able
-				 * to dedupe from this file */
-	/* status of this dedupe operation:
-	 * 0 if dedup succeeds
-	 * < 0 for error
-	 * == BTRFS_SAME_DATA_DIFFERS if data differs
-	 */
-	__s32 status;		/* out - see above description */
-	__u32 reserved;
-};
-
-struct btrfs_ioctl_same_args {
-	__u64 logical_offset;	/* in - start of extent in source */
-	__u64 length;		/* in - length of extent */
-	__u16 dest_count;	/* in - total elements in info array */
-	__u16 reserved1;
-	__u32 reserved2;
-	struct btrfs_ioctl_same_extent_info info[0];
-};
-
-struct btrfs_ioctl_space_info {
-	__u64 flags;
-	__u64 total_bytes;
-	__u64 used_bytes;
-};
-
-struct btrfs_ioctl_space_args {
-	__u64 space_slots;
-	__u64 total_spaces;
-	struct btrfs_ioctl_space_info spaces[0];
-};
-
-struct btrfs_data_container {
-	__u32	bytes_left;	/* out -- bytes not needed to deliver output */
-	__u32	bytes_missing;	/* out -- additional bytes needed for result */
-	__u32	elem_cnt;	/* out */
-	__u32	elem_missed;	/* out */
-	__u64	val[0];		/* out */
-};
-
-struct btrfs_ioctl_ino_path_args {
-	__u64				inum;		/* in */
-	__u64				size;		/* in */
-	__u64				reserved[4];
-	/* struct btrfs_data_container	*fspath;	   out */
-	__u64				fspath;		/* out */
-};
-
-struct btrfs_ioctl_logical_ino_args {
-	__u64				logical;	/* in */
-	__u64				size;		/* in */
-	__u64				reserved[4];
-	/* struct btrfs_data_container	*inodes;	out   */
-	__u64				inodes;
-};
-
-enum btrfs_dev_stat_values {
-	/* disk I/O failure stats */
-	BTRFS_DEV_STAT_WRITE_ERRS, /* EIO or EREMOTEIO from lower layers */
-	BTRFS_DEV_STAT_READ_ERRS, /* EIO or EREMOTEIO from lower layers */
-	BTRFS_DEV_STAT_FLUSH_ERRS, /* EIO or EREMOTEIO from lower layers */
-
-	/* stats for indirect indications for I/O failures */
-	BTRFS_DEV_STAT_CORRUPTION_ERRS, /* checksum error, bytenr error or
-					 * contents is illegal: this is an
-					 * indication that the block was damaged
-					 * during read or write, or written to
-					 * wrong location or read from wrong
-					 * location */
-	BTRFS_DEV_STAT_GENERATION_ERRS, /* an indication that blocks have not
-					 * been written */
-
-	BTRFS_DEV_STAT_VALUES_MAX
-};
-
-/* Reset statistics after reading; needs SYS_ADMIN capability */
-#define	BTRFS_DEV_STATS_RESET		(1ULL << 0)
-
-struct btrfs_ioctl_get_dev_stats {
-	__u64 devid;				/* in */
-	__u64 nr_items;				/* in/out */
-	__u64 flags;				/* in/out */
-
-	/* out values: */
-	__u64 values[BTRFS_DEV_STAT_VALUES_MAX];
-
-	__u64 unused[128 - 2 - BTRFS_DEV_STAT_VALUES_MAX]; /* pad to 1k */
-};
-
-#define BTRFS_QUOTA_CTL_ENABLE	1
-#define BTRFS_QUOTA_CTL_DISABLE	2
-#define BTRFS_QUOTA_CTL_RESCAN__NOTUSED	3
-struct btrfs_ioctl_quota_ctl_args {
-	__u64 cmd;
-	__u64 status;
-};
-
-struct btrfs_ioctl_quota_rescan_args {
-	__u64	flags;
-	__u64   progress;
-	__u64   reserved[6];
-};
-
-struct btrfs_ioctl_qgroup_assign_args {
-	__u64 assign;
-	__u64 src;
-	__u64 dst;
-};
-
-struct btrfs_ioctl_qgroup_create_args {
-	__u64 create;
-	__u64 qgroupid;
-};
-struct btrfs_ioctl_timespec {
-	__u64 sec;
-	__u32 nsec;
-};
-
-struct btrfs_ioctl_received_subvol_args {
-	char	uuid[BTRFS_UUID_SIZE];	/* in */
-	__u64	stransid;		/* in */
-	__u64	rtransid;		/* out */
-	struct btrfs_ioctl_timespec stime; /* in */
-	struct btrfs_ioctl_timespec rtime; /* out */
-	__u64	flags;			/* in */
-	__u64	reserved[16];		/* in */
-};
-
-/*
- * Caller doesn't want file data in the send stream, even if the
- * search of clone sources doesn't find an extent. UPDATE_EXTENT
- * commands will be sent instead of WRITE commands.
- */
-#define BTRFS_SEND_FLAG_NO_FILE_DATA		0x1
-
-/*
- * Do not add the leading stream header. Used when multiple snapshots
- * are sent back to back.
- */
-#define BTRFS_SEND_FLAG_OMIT_STREAM_HEADER	0x2
-
-/*
- * Omit the command at the end of the stream that indicated the end
- * of the stream. This option is used when multiple snapshots are
- * sent back to back.
- */
-#define BTRFS_SEND_FLAG_OMIT_END_CMD		0x4
-
-#define BTRFS_SEND_FLAG_MASK \
-	(BTRFS_SEND_FLAG_NO_FILE_DATA | \
-	 BTRFS_SEND_FLAG_OMIT_STREAM_HEADER | \
-	 BTRFS_SEND_FLAG_OMIT_END_CMD)
-
-struct btrfs_ioctl_send_args {
-	__s64 send_fd;			/* in */
-	__u64 clone_sources_count;	/* in */
-	__u64 *clone_sources;	/* in */
-	__u64 parent_root;		/* in */
-	__u64 flags;			/* in */
-	__u64 reserved[4];		/* in */
-};
-
-/* Error codes as returned by the kernel */
-enum btrfs_err_code {
-	BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET = 1,
-	BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET,
-	BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET,
-	BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET,
-	BTRFS_ERROR_DEV_TGT_REPLACE,
-	BTRFS_ERROR_DEV_MISSING_NOT_FOUND,
-	BTRFS_ERROR_DEV_ONLY_WRITABLE,
-	BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS
-};
-/* An error code to error string mapping for the kernel
-*  error codes
-*/
-static __inline__ char *btrfs_err_str(enum btrfs_err_code err_code)
-{
-	switch (err_code) {
-		case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET:
-			return "unable to go below two devices on raid1";
-		case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET:
-			return "unable to go below four devices on raid10";
-		case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET:
-			return "unable to go below two devices on raid5";
-		case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET:
-			return "unable to go below three devices on raid6";
-		case BTRFS_ERROR_DEV_TGT_REPLACE:
-			return "unable to remove the dev_replace target dev";
-		case BTRFS_ERROR_DEV_MISSING_NOT_FOUND:
-			return "no missing devices found to remove";
-		case BTRFS_ERROR_DEV_ONLY_WRITABLE:
-			return "unable to remove the only writeable device";
-		case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS:
-			return "add/delete/balance/replace/resize operation "\
-				"in progress";
-		default:
-			return NULL;
-	}
-}
-
-#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
-				   struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
-				   struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_RESIZE _IOW(BTRFS_IOCTL_MAGIC, 3, \
-				   struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \
-				   struct btrfs_ioctl_vol_args)
-/* trans start and trans end are dangerous, and only for
- * use by applications that know how to avoid the
- * resulting deadlocks
- */
-#define BTRFS_IOC_TRANS_START  _IO(BTRFS_IOCTL_MAGIC, 6)
-#define BTRFS_IOC_TRANS_END    _IO(BTRFS_IOCTL_MAGIC, 7)
-#define BTRFS_IOC_SYNC         _IO(BTRFS_IOCTL_MAGIC, 8)
-
-#define BTRFS_IOC_CLONE        _IOW(BTRFS_IOCTL_MAGIC, 9, int)
-#define BTRFS_IOC_ADD_DEV _IOW(BTRFS_IOCTL_MAGIC, 10, \
-				   struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_RM_DEV _IOW(BTRFS_IOCTL_MAGIC, 11, \
-				   struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_BALANCE _IOW(BTRFS_IOCTL_MAGIC, 12, \
-				   struct btrfs_ioctl_vol_args)
-
-#define BTRFS_IOC_CLONE_RANGE _IOW(BTRFS_IOCTL_MAGIC, 13, \
-				  struct btrfs_ioctl_clone_range_args)
-
-#define BTRFS_IOC_SUBVOL_CREATE _IOW(BTRFS_IOCTL_MAGIC, 14, \
-				   struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_SNAP_DESTROY _IOW(BTRFS_IOCTL_MAGIC, 15, \
-				struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_DEFRAG_RANGE _IOW(BTRFS_IOCTL_MAGIC, 16, \
-				struct btrfs_ioctl_defrag_range_args)
-#define BTRFS_IOC_TREE_SEARCH _IOWR(BTRFS_IOCTL_MAGIC, 17, \
-				   struct btrfs_ioctl_search_args)
-#define BTRFS_IOC_TREE_SEARCH_V2 _IOWR(BTRFS_IOCTL_MAGIC, 17, \
-					   struct btrfs_ioctl_search_args_v2)
-#define BTRFS_IOC_INO_LOOKUP _IOWR(BTRFS_IOCTL_MAGIC, 18, \
-				   struct btrfs_ioctl_ino_lookup_args)
-#define BTRFS_IOC_DEFAULT_SUBVOL _IOW(BTRFS_IOCTL_MAGIC, 19, __u64)
-#define BTRFS_IOC_SPACE_INFO _IOWR(BTRFS_IOCTL_MAGIC, 20, \
-				    struct btrfs_ioctl_space_args)
-#define BTRFS_IOC_START_SYNC _IOR(BTRFS_IOCTL_MAGIC, 24, __u64)
-#define BTRFS_IOC_WAIT_SYNC  _IOW(BTRFS_IOCTL_MAGIC, 22, __u64)
-#define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, \
-				   struct btrfs_ioctl_vol_args_v2)
-#define BTRFS_IOC_SUBVOL_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 24, \
-				   struct btrfs_ioctl_vol_args_v2)
-#define BTRFS_IOC_SUBVOL_GETFLAGS _IOR(BTRFS_IOCTL_MAGIC, 25, __u64)
-#define BTRFS_IOC_SUBVOL_SETFLAGS _IOW(BTRFS_IOCTL_MAGIC, 26, __u64)
-#define BTRFS_IOC_SCRUB _IOWR(BTRFS_IOCTL_MAGIC, 27, \
-			      struct btrfs_ioctl_scrub_args)
-#define BTRFS_IOC_SCRUB_CANCEL _IO(BTRFS_IOCTL_MAGIC, 28)
-#define BTRFS_IOC_SCRUB_PROGRESS _IOWR(BTRFS_IOCTL_MAGIC, 29, \
-				       struct btrfs_ioctl_scrub_args)
-#define BTRFS_IOC_DEV_INFO _IOWR(BTRFS_IOCTL_MAGIC, 30, \
-				 struct btrfs_ioctl_dev_info_args)
-#define BTRFS_IOC_FS_INFO _IOR(BTRFS_IOCTL_MAGIC, 31, \
-			       struct btrfs_ioctl_fs_info_args)
-#define BTRFS_IOC_BALANCE_V2 _IOWR(BTRFS_IOCTL_MAGIC, 32, \
-				   struct btrfs_ioctl_balance_args)
-#define BTRFS_IOC_BALANCE_CTL _IOW(BTRFS_IOCTL_MAGIC, 33, int)
-#define BTRFS_IOC_BALANCE_PROGRESS _IOR(BTRFS_IOCTL_MAGIC, 34, \
-					struct btrfs_ioctl_balance_args)
-#define BTRFS_IOC_INO_PATHS _IOWR(BTRFS_IOCTL_MAGIC, 35, \
-					struct btrfs_ioctl_ino_path_args)
-#define BTRFS_IOC_LOGICAL_INO _IOWR(BTRFS_IOCTL_MAGIC, 36, \
-					struct btrfs_ioctl_ino_path_args)
-#define BTRFS_IOC_SET_RECEIVED_SUBVOL _IOWR(BTRFS_IOCTL_MAGIC, 37, \
-				struct btrfs_ioctl_received_subvol_args)
-#define BTRFS_IOC_SEND _IOW(BTRFS_IOCTL_MAGIC, 38, struct btrfs_ioctl_send_args)
-#define BTRFS_IOC_DEVICES_READY _IOR(BTRFS_IOCTL_MAGIC, 39, \
-				     struct btrfs_ioctl_vol_args)
-#define BTRFS_IOC_QUOTA_CTL _IOWR(BTRFS_IOCTL_MAGIC, 40, \
-			       struct btrfs_ioctl_quota_ctl_args)
-#define BTRFS_IOC_QGROUP_ASSIGN _IOW(BTRFS_IOCTL_MAGIC, 41, \
-			       struct btrfs_ioctl_qgroup_assign_args)
-#define BTRFS_IOC_QGROUP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 42, \
-			       struct btrfs_ioctl_qgroup_create_args)
-#define BTRFS_IOC_QGROUP_LIMIT _IOR(BTRFS_IOCTL_MAGIC, 43, \
-			       struct btrfs_ioctl_qgroup_limit_args)
-#define BTRFS_IOC_QUOTA_RESCAN _IOW(BTRFS_IOCTL_MAGIC, 44, \
-			       struct btrfs_ioctl_quota_rescan_args)
-#define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \
-			       struct btrfs_ioctl_quota_rescan_args)
-#define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46)
-#define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \
-				   char[BTRFS_LABEL_SIZE])
-#define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \
-				   char[BTRFS_LABEL_SIZE])
-#define BTRFS_IOC_GET_DEV_STATS _IOWR(BTRFS_IOCTL_MAGIC, 52, \
-				      struct btrfs_ioctl_get_dev_stats)
-#define BTRFS_IOC_DEV_REPLACE _IOWR(BTRFS_IOCTL_MAGIC, 53, \
-				    struct btrfs_ioctl_dev_replace_args)
-#define BTRFS_IOC_FILE_EXTENT_SAME _IOWR(BTRFS_IOCTL_MAGIC, 54, \
-					 struct btrfs_ioctl_same_args)
-#define BTRFS_IOC_GET_FEATURES _IOR(BTRFS_IOCTL_MAGIC, 57, \
-				   struct btrfs_ioctl_feature_flags)
-#define BTRFS_IOC_SET_FEATURES _IOW(BTRFS_IOCTL_MAGIC, 57, \
-				   struct btrfs_ioctl_feature_flags[2])
-#define BTRFS_IOC_GET_SUPPORTED_FEATURES _IOR(BTRFS_IOCTL_MAGIC, 57, \
-				   struct btrfs_ioctl_feature_flags[3])
-
-#endif /* _LINUX_BTRFS_H */
diff --git a/openflow/usr/include/linux/byteorder/big_endian.h b/openflow/usr/include/linux/byteorder/big_endian.h
deleted file mode 100644
index a4ef98d..0000000
--- a/openflow/usr/include/linux/byteorder/big_endian.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef _LINUX_BYTEORDER_BIG_ENDIAN_H
-#define _LINUX_BYTEORDER_BIG_ENDIAN_H
-
-#ifndef __BIG_ENDIAN
-#define __BIG_ENDIAN 4321
-#endif
-#ifndef __BIG_ENDIAN_BITFIELD
-#define __BIG_ENDIAN_BITFIELD
-#endif
-
-#include <linux/types.h>
-#include <linux/swab.h>
-
-#define __constant_htonl(x) ((__be32)(__u32)(x))
-#define __constant_ntohl(x) ((__u32)(__be32)(x))
-#define __constant_htons(x) ((__be16)(__u16)(x))
-#define __constant_ntohs(x) ((__u16)(__be16)(x))
-#define __constant_cpu_to_le64(x) ((__le64)___constant_swab64((x)))
-#define __constant_le64_to_cpu(x) ___constant_swab64((__u64)(__le64)(x))
-#define __constant_cpu_to_le32(x) ((__le32)___constant_swab32((x)))
-#define __constant_le32_to_cpu(x) ___constant_swab32((__u32)(__le32)(x))
-#define __constant_cpu_to_le16(x) ((__le16)___constant_swab16((x)))
-#define __constant_le16_to_cpu(x) ___constant_swab16((__u16)(__le16)(x))
-#define __constant_cpu_to_be64(x) ((__be64)(__u64)(x))
-#define __constant_be64_to_cpu(x) ((__u64)(__be64)(x))
-#define __constant_cpu_to_be32(x) ((__be32)(__u32)(x))
-#define __constant_be32_to_cpu(x) ((__u32)(__be32)(x))
-#define __constant_cpu_to_be16(x) ((__be16)(__u16)(x))
-#define __constant_be16_to_cpu(x) ((__u16)(__be16)(x))
-#define __cpu_to_le64(x) ((__le64)__swab64((x)))
-#define __le64_to_cpu(x) __swab64((__u64)(__le64)(x))
-#define __cpu_to_le32(x) ((__le32)__swab32((x)))
-#define __le32_to_cpu(x) __swab32((__u32)(__le32)(x))
-#define __cpu_to_le16(x) ((__le16)__swab16((x)))
-#define __le16_to_cpu(x) __swab16((__u16)(__le16)(x))
-#define __cpu_to_be64(x) ((__be64)(__u64)(x))
-#define __be64_to_cpu(x) ((__u64)(__be64)(x))
-#define __cpu_to_be32(x) ((__be32)(__u32)(x))
-#define __be32_to_cpu(x) ((__u32)(__be32)(x))
-#define __cpu_to_be16(x) ((__be16)(__u16)(x))
-#define __be16_to_cpu(x) ((__u16)(__be16)(x))
-
-static __inline__ __le64 __cpu_to_le64p(const __u64 *p)
-{
-	return (__le64)__swab64p(p);
-}
-static __inline__ __u64 __le64_to_cpup(const __le64 *p)
-{
-	return __swab64p((__u64 *)p);
-}
-static __inline__ __le32 __cpu_to_le32p(const __u32 *p)
-{
-	return (__le32)__swab32p(p);
-}
-static __inline__ __u32 __le32_to_cpup(const __le32 *p)
-{
-	return __swab32p((__u32 *)p);
-}
-static __inline__ __le16 __cpu_to_le16p(const __u16 *p)
-{
-	return (__le16)__swab16p(p);
-}
-static __inline__ __u16 __le16_to_cpup(const __le16 *p)
-{
-	return __swab16p((__u16 *)p);
-}
-static __inline__ __be64 __cpu_to_be64p(const __u64 *p)
-{
-	return (__be64)*p;
-}
-static __inline__ __u64 __be64_to_cpup(const __be64 *p)
-{
-	return (__u64)*p;
-}
-static __inline__ __be32 __cpu_to_be32p(const __u32 *p)
-{
-	return (__be32)*p;
-}
-static __inline__ __u32 __be32_to_cpup(const __be32 *p)
-{
-	return (__u32)*p;
-}
-static __inline__ __be16 __cpu_to_be16p(const __u16 *p)
-{
-	return (__be16)*p;
-}
-static __inline__ __u16 __be16_to_cpup(const __be16 *p)
-{
-	return (__u16)*p;
-}
-#define __cpu_to_le64s(x) __swab64s((x))
-#define __le64_to_cpus(x) __swab64s((x))
-#define __cpu_to_le32s(x) __swab32s((x))
-#define __le32_to_cpus(x) __swab32s((x))
-#define __cpu_to_le16s(x) __swab16s((x))
-#define __le16_to_cpus(x) __swab16s((x))
-#define __cpu_to_be64s(x) do { (void)(x); } while (0)
-#define __be64_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_be32s(x) do { (void)(x); } while (0)
-#define __be32_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_be16s(x) do { (void)(x); } while (0)
-#define __be16_to_cpus(x) do { (void)(x); } while (0)
-
-
-#endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */
diff --git a/openflow/usr/include/linux/byteorder/little_endian.h b/openflow/usr/include/linux/byteorder/little_endian.h
deleted file mode 100644
index 74e8a15..0000000
--- a/openflow/usr/include/linux/byteorder/little_endian.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef _LINUX_BYTEORDER_LITTLE_ENDIAN_H
-#define _LINUX_BYTEORDER_LITTLE_ENDIAN_H
-
-#ifndef __LITTLE_ENDIAN
-#define __LITTLE_ENDIAN 1234
-#endif
-#ifndef __LITTLE_ENDIAN_BITFIELD
-#define __LITTLE_ENDIAN_BITFIELD
-#endif
-
-#include <linux/types.h>
-#include <linux/swab.h>
-
-#define __constant_htonl(x) ((__be32)___constant_swab32((x)))
-#define __constant_ntohl(x) ___constant_swab32((__be32)(x))
-#define __constant_htons(x) ((__be16)___constant_swab16((x)))
-#define __constant_ntohs(x) ___constant_swab16((__be16)(x))
-#define __constant_cpu_to_le64(x) ((__le64)(__u64)(x))
-#define __constant_le64_to_cpu(x) ((__u64)(__le64)(x))
-#define __constant_cpu_to_le32(x) ((__le32)(__u32)(x))
-#define __constant_le32_to_cpu(x) ((__u32)(__le32)(x))
-#define __constant_cpu_to_le16(x) ((__le16)(__u16)(x))
-#define __constant_le16_to_cpu(x) ((__u16)(__le16)(x))
-#define __constant_cpu_to_be64(x) ((__be64)___constant_swab64((x)))
-#define __constant_be64_to_cpu(x) ___constant_swab64((__u64)(__be64)(x))
-#define __constant_cpu_to_be32(x) ((__be32)___constant_swab32((x)))
-#define __constant_be32_to_cpu(x) ___constant_swab32((__u32)(__be32)(x))
-#define __constant_cpu_to_be16(x) ((__be16)___constant_swab16((x)))
-#define __constant_be16_to_cpu(x) ___constant_swab16((__u16)(__be16)(x))
-#define __cpu_to_le64(x) ((__le64)(__u64)(x))
-#define __le64_to_cpu(x) ((__u64)(__le64)(x))
-#define __cpu_to_le32(x) ((__le32)(__u32)(x))
-#define __le32_to_cpu(x) ((__u32)(__le32)(x))
-#define __cpu_to_le16(x) ((__le16)(__u16)(x))
-#define __le16_to_cpu(x) ((__u16)(__le16)(x))
-#define __cpu_to_be64(x) ((__be64)__swab64((x)))
-#define __be64_to_cpu(x) __swab64((__u64)(__be64)(x))
-#define __cpu_to_be32(x) ((__be32)__swab32((x)))
-#define __be32_to_cpu(x) __swab32((__u32)(__be32)(x))
-#define __cpu_to_be16(x) ((__be16)__swab16((x)))
-#define __be16_to_cpu(x) __swab16((__u16)(__be16)(x))
-
-static __inline__ __le64 __cpu_to_le64p(const __u64 *p)
-{
-	return (__le64)*p;
-}
-static __inline__ __u64 __le64_to_cpup(const __le64 *p)
-{
-	return (__u64)*p;
-}
-static __inline__ __le32 __cpu_to_le32p(const __u32 *p)
-{
-	return (__le32)*p;
-}
-static __inline__ __u32 __le32_to_cpup(const __le32 *p)
-{
-	return (__u32)*p;
-}
-static __inline__ __le16 __cpu_to_le16p(const __u16 *p)
-{
-	return (__le16)*p;
-}
-static __inline__ __u16 __le16_to_cpup(const __le16 *p)
-{
-	return (__u16)*p;
-}
-static __inline__ __be64 __cpu_to_be64p(const __u64 *p)
-{
-	return (__be64)__swab64p(p);
-}
-static __inline__ __u64 __be64_to_cpup(const __be64 *p)
-{
-	return __swab64p((__u64 *)p);
-}
-static __inline__ __be32 __cpu_to_be32p(const __u32 *p)
-{
-	return (__be32)__swab32p(p);
-}
-static __inline__ __u32 __be32_to_cpup(const __be32 *p)
-{
-	return __swab32p((__u32 *)p);
-}
-static __inline__ __be16 __cpu_to_be16p(const __u16 *p)
-{
-	return (__be16)__swab16p(p);
-}
-static __inline__ __u16 __be16_to_cpup(const __be16 *p)
-{
-	return __swab16p((__u16 *)p);
-}
-#define __cpu_to_le64s(x) do { (void)(x); } while (0)
-#define __le64_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_le32s(x) do { (void)(x); } while (0)
-#define __le32_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_le16s(x) do { (void)(x); } while (0)
-#define __le16_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_be64s(x) __swab64s((x))
-#define __be64_to_cpus(x) __swab64s((x))
-#define __cpu_to_be32s(x) __swab32s((x))
-#define __be32_to_cpus(x) __swab32s((x))
-#define __cpu_to_be16s(x) __swab16s((x))
-#define __be16_to_cpus(x) __swab16s((x))
-
-
-#endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */
diff --git a/openflow/usr/include/linux/caif/caif_socket.h b/openflow/usr/include/linux/caif/caif_socket.h
deleted file mode 100644
index 586e9f9..0000000
--- a/openflow/usr/include/linux/caif/caif_socket.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* linux/caif_socket.h
- * CAIF Definitions for CAIF socket and network layer
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	 Sjur Brendeland
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#ifndef _LINUX_CAIF_SOCKET_H
-#define _LINUX_CAIF_SOCKET_H
-
-#include <linux/types.h>
-#include <linux/socket.h>
-
-/**
- * enum caif_link_selector -    Physical Link Selection.
- * @CAIF_LINK_HIGH_BANDW:	Physical interface for high-bandwidth
- *				traffic.
- * @CAIF_LINK_LOW_LATENCY:	Physical interface for low-latency
- *				traffic.
- *
- * CAIF Link Layers can register their link properties.
- * This enum is used for choosing between CAIF Link Layers when
- * setting up CAIF Channels when multiple CAIF Link Layers exists.
- */
-enum caif_link_selector {
-	CAIF_LINK_HIGH_BANDW,
-	CAIF_LINK_LOW_LATENCY
-};
-
-/**
- * enum caif_channel_priority - CAIF channel priorities.
- *
- * @CAIF_PRIO_MIN:	Min priority for a channel.
- * @CAIF_PRIO_LOW:	Low-priority channel.
- * @CAIF_PRIO_NORMAL:	Normal/default priority level.
- * @CAIF_PRIO_HIGH:	High priority level
- * @CAIF_PRIO_MAX:	Max priority for channel
- *
- * Priority can be set on CAIF Channels in order to
- * prioritize between traffic on different CAIF Channels.
- * These priority levels are recommended, but the priority value
- * is not restricted to the values defined in this enum, any value
- * between CAIF_PRIO_MIN and CAIF_PRIO_MAX could be used.
- */
-enum caif_channel_priority {
-	CAIF_PRIO_MIN	 = 0x01,
-	CAIF_PRIO_LOW	 = 0x04,
-	CAIF_PRIO_NORMAL = 0x0f,
-	CAIF_PRIO_HIGH	 = 0x14,
-	CAIF_PRIO_MAX	 = 0x1F
-};
-
-/**
- * enum caif_protocol_type  -	CAIF Channel type.
- * @CAIFPROTO_AT:		Classic AT channel.
- * @CAIFPROTO_DATAGRAM:	Datagram channel.
- * @CAIFPROTO_DATAGRAM_LOOP:	Datagram loopback channel, used for testing.
- * @CAIFPROTO_UTIL:		Utility (Psock) channel.
- * @CAIFPROTO_RFM:		Remote File Manager
- * @CAIFPROTO_DEBUG:		Debug link
- *
- * This enum defines the CAIF Channel type to be used. This defines
- * the service to connect to on the modem.
- */
-enum caif_protocol_type {
-	CAIFPROTO_AT,
-	CAIFPROTO_DATAGRAM,
-	CAIFPROTO_DATAGRAM_LOOP,
-	CAIFPROTO_UTIL,
-	CAIFPROTO_RFM,
-	CAIFPROTO_DEBUG,
-	_CAIFPROTO_MAX
-};
-#define	CAIFPROTO_MAX _CAIFPROTO_MAX
-
-/**
- * enum caif_at_type - AT Service Endpoint
- * @CAIF_ATTYPE_PLAIN:	     Connects to a plain vanilla AT channel.
- */
-enum caif_at_type {
-	CAIF_ATTYPE_PLAIN = 2
-};
- /**
- * enum caif_debug_type - Content selection for debug connection
- * @CAIF_DEBUG_TRACE_INTERACTIVE: Connection will contain
- *				both trace and interactive debug.
- * @CAIF_DEBUG_TRACE:		Connection contains trace only.
- * @CAIF_DEBUG_INTERACTIVE:	Connection to interactive debug.
- */
-enum caif_debug_type {
-	CAIF_DEBUG_TRACE_INTERACTIVE = 0,
-	CAIF_DEBUG_TRACE,
-	CAIF_DEBUG_INTERACTIVE,
-};
-
-/**
- * enum caif_debug_service - Debug Service Endpoint
- * @CAIF_RADIO_DEBUG_SERVICE:	Debug service on the Radio sub-system
- * @CAIF_APP_DEBUG_SERVICE:	Debug for the applications sub-system
- */
-enum caif_debug_service {
-	CAIF_RADIO_DEBUG_SERVICE = 1,
-	CAIF_APP_DEBUG_SERVICE
-};
-
-/**
- * struct sockaddr_caif - the sockaddr structure for CAIF sockets.
- * @family:		     Address family number, must be AF_CAIF.
- * @u:			     Union of address data 'switched' by family.
- * :
- * @u.at:                    Applies when family = CAIFPROTO_AT.
- *
- * @u.at.type:               Type of AT link to set up (enum caif_at_type).
- *
- * @u.util:                  Applies when family = CAIFPROTO_UTIL
- *
- * @u.util.service:          Utility service name.
- *
- * @u.dgm:                   Applies when family = CAIFPROTO_DATAGRAM
- *
- * @u.dgm.connection_id:     Datagram connection id.
- *
- * @u.dgm.nsapi:             NSAPI of the PDP-Context.
- *
- * @u.rfm:                   Applies when family = CAIFPROTO_RFM
- *
- * @u.rfm.connection_id:     Connection ID for RFM.
- *
- * @u.rfm.volume:            Volume to mount.
- *
- * @u.dbg:		      Applies when family = CAIFPROTO_DEBUG.
- *
- * @u.dbg.type:			     Type of debug connection to set up
- *			      (caif_debug_type).
- *
- * @u.dbg.service:	      Service sub-system to connect (caif_debug_service
- * Description:
- * This structure holds the connect parameters used for setting up a
- * CAIF Channel. It defines the service to connect to on the modem.
- */
-struct sockaddr_caif {
-	__kernel_sa_family_t  family;
-	union {
-		struct {
-			__u8  type;		/* type: enum caif_at_type */
-		} at;				/* CAIFPROTO_AT */
-		struct {
-			char	  service[16];
-		} util;				/* CAIFPROTO_UTIL */
-		union {
-			__u32 connection_id;
-			__u8  nsapi;
-		} dgm;				/* CAIFPROTO_DATAGRAM(_LOOP)*/
-		struct {
-			__u32 connection_id;
-			char	  volume[16];
-		} rfm;				/* CAIFPROTO_RFM */
-		struct {
-			__u8  type;		/* type:enum caif_debug_type */
-			__u8  service;		/* service:caif_debug_service */
-		} dbg;				/* CAIFPROTO_DEBUG */
-	} u;
-};
-
-/**
- * enum caif_socket_opts - CAIF option values for getsockopt and setsockopt.
- *
- * @CAIFSO_LINK_SELECT:		Selector used if multiple CAIF Link layers are
- *				available. Either a high bandwidth
- *				link can be selected (CAIF_LINK_HIGH_BANDW) or
- *				or a low latency link (CAIF_LINK_LOW_LATENCY).
- *                              This option is of type __u32.
- *				Alternatively SO_BINDTODEVICE can be used.
- *
- * @CAIFSO_REQ_PARAM:		Used to set the request parameters for a
- *				utility channel. (maximum 256 bytes). This
- *				option must be set before connecting.
- *
- * @CAIFSO_RSP_PARAM:		Gets the response parameters for a utility
- *				channel. (maximum 256 bytes). This option
- *				is valid after a successful connect.
- *
- *
- * This enum defines the CAIF Socket options to be used on a socket
- * of type PF_CAIF.
- *
- */
-enum caif_socket_opts {
-	CAIFSO_LINK_SELECT	= 127,
-	CAIFSO_REQ_PARAM	= 128,
-	CAIFSO_RSP_PARAM	= 129,
-};
-
-#endif /* _LINUX_CAIF_SOCKET_H */
diff --git a/openflow/usr/include/linux/caif/if_caif.h b/openflow/usr/include/linux/caif/if_caif.h
deleted file mode 100644
index 7618aab..0000000
--- a/openflow/usr/include/linux/caif/if_caif.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#ifndef IF_CAIF_H_
-#define IF_CAIF_H_
-#include <linux/sockios.h>
-#include <linux/types.h>
-#include <linux/socket.h>
-
-/**
- * enum ifla_caif - CAIF NetlinkRT parameters.
- * @IFLA_CAIF_IPV4_CONNID:  Connection ID for IPv4 PDP Context.
- *			    The type of attribute is NLA_U32.
- * @IFLA_CAIF_IPV6_CONNID:  Connection ID for IPv6 PDP Context.
- *			    The type of attribute is NLA_U32.
- * @IFLA_CAIF_LOOPBACK:	    If different from zero, device is doing loopback
- *			    The type of attribute is NLA_U8.
- *
- * When using RT Netlink to create, destroy or configure a CAIF IP interface,
- * enum ifla_caif is used to specify the configuration attributes.
- */
-enum ifla_caif {
-	__IFLA_CAIF_UNSPEC,
-	IFLA_CAIF_IPV4_CONNID,
-	IFLA_CAIF_IPV6_CONNID,
-	IFLA_CAIF_LOOPBACK,
-	__IFLA_CAIF_MAX
-};
-#define	IFLA_CAIF_MAX (__IFLA_CAIF_MAX-1)
-
-#endif /*IF_CAIF_H_*/
diff --git a/openflow/usr/include/linux/can.h b/openflow/usr/include/linux/can.h
deleted file mode 100644
index 4af39b0..0000000
--- a/openflow/usr/include/linux/can.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * linux/can.h
- *
- * Definitions for CAN network layer (socket addr / CAN frame / CAN filter)
- *
- * Authors: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
- *          Urs Thuermann   <urs.thuermann@volkswagen.de>
- * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Volkswagen nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * Alternatively, provided that this notice is retained in full, this
- * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2, in which case the provisions of the
- * GPL apply INSTEAD OF those given above.
- *
- * The provided data structures and external interfaces from this code
- * are not restricted to be used by modules with a GPL compatible license.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-#ifndef _CAN_H
-#define _CAN_H
-
-#include <linux/types.h>
-#include <linux/socket.h>
-
-/* controller area network (CAN) kernel definitions */
-
-/* special address description flags for the CAN_ID */
-#define CAN_EFF_FLAG 0x80000000U /* EFF/SFF is set in the MSB */
-#define CAN_RTR_FLAG 0x40000000U /* remote transmission request */
-#define CAN_ERR_FLAG 0x20000000U /* error message frame */
-
-/* valid bits in CAN ID for frame formats */
-#define CAN_SFF_MASK 0x000007FFU /* standard frame format (SFF) */
-#define CAN_EFF_MASK 0x1FFFFFFFU /* extended frame format (EFF) */
-#define CAN_ERR_MASK 0x1FFFFFFFU /* omit EFF, RTR, ERR flags */
-
-/*
- * Controller Area Network Identifier structure
- *
- * bit 0-28	: CAN identifier (11/29 bit)
- * bit 29	: error message frame flag (0 = data frame, 1 = error message)
- * bit 30	: remote transmission request flag (1 = rtr frame)
- * bit 31	: frame format flag (0 = standard 11 bit, 1 = extended 29 bit)
- */
-typedef __u32 canid_t;
-
-#define CAN_SFF_ID_BITS		11
-#define CAN_EFF_ID_BITS		29
-
-/*
- * Controller Area Network Error Message Frame Mask structure
- *
- * bit 0-28	: error class mask (see include/linux/can/error.h)
- * bit 29-31	: set to zero
- */
-typedef __u32 can_err_mask_t;
-
-/* CAN payload length and DLC definitions according to ISO 11898-1 */
-#define CAN_MAX_DLC 8
-#define CAN_MAX_DLEN 8
-
-/* CAN FD payload length and DLC definitions according to ISO 11898-7 */
-#define CANFD_MAX_DLC 15
-#define CANFD_MAX_DLEN 64
-
-/**
- * struct can_frame - basic CAN frame structure
- * @can_id:  CAN ID of the frame and CAN_*_FLAG flags, see canid_t definition
- * @can_dlc: frame payload length in byte (0 .. 8) aka data length code
- *           N.B. the DLC field from ISO 11898-1 Chapter 8.4.2.3 has a 1:1
- *           mapping of the 'data length code' to the real payload length
- * @__pad:   padding
- * @__res0:  reserved / padding
- * @__res1:  reserved / padding
- * @data:    CAN frame payload (up to 8 byte)
- */
-struct can_frame {
-	canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
-	__u8    can_dlc; /* frame payload length in byte (0 .. CAN_MAX_DLEN) */
-	__u8    __pad;   /* padding */
-	__u8    __res0;  /* reserved / padding */
-	__u8    __res1;  /* reserved / padding */
-	__u8    data[CAN_MAX_DLEN] __attribute__((aligned(8)));
-};
-
-/*
- * defined bits for canfd_frame.flags
- *
- * The use of struct canfd_frame implies the Extended Data Length (EDL) bit to
- * be set in the CAN frame bitstream on the wire. The EDL bit switch turns
- * the CAN controllers bitstream processor into the CAN FD mode which creates
- * two new options within the CAN FD frame specification:
- *
- * Bit Rate Switch - to indicate a second bitrate is/was used for the payload
- * Error State Indicator - represents the error state of the transmitting node
- *
- * As the CANFD_ESI bit is internally generated by the transmitting CAN
- * controller only the CANFD_BRS bit is relevant for real CAN controllers when
- * building a CAN FD frame for transmission. Setting the CANFD_ESI bit can make
- * sense for virtual CAN interfaces to test applications with echoed frames.
- */
-#define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */
-#define CANFD_ESI 0x02 /* error state indicator of the transmitting node */
-
-/**
- * struct canfd_frame - CAN flexible data rate frame structure
- * @can_id: CAN ID of the frame and CAN_*_FLAG flags, see canid_t definition
- * @len:    frame payload length in byte (0 .. CANFD_MAX_DLEN)
- * @flags:  additional flags for CAN FD
- * @__res0: reserved / padding
- * @__res1: reserved / padding
- * @data:   CAN FD frame payload (up to CANFD_MAX_DLEN byte)
- */
-struct canfd_frame {
-	canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
-	__u8    len;     /* frame payload length in byte */
-	__u8    flags;   /* additional flags for CAN FD */
-	__u8    __res0;  /* reserved / padding */
-	__u8    __res1;  /* reserved / padding */
-	__u8    data[CANFD_MAX_DLEN] __attribute__((aligned(8)));
-};
-
-#define CAN_MTU		(sizeof(struct can_frame))
-#define CANFD_MTU	(sizeof(struct canfd_frame))
-
-/* particular protocols of the protocol family PF_CAN */
-#define CAN_RAW		1 /* RAW sockets */
-#define CAN_BCM		2 /* Broadcast Manager */
-#define CAN_TP16	3 /* VAG Transport Protocol v1.6 */
-#define CAN_TP20	4 /* VAG Transport Protocol v2.0 */
-#define CAN_MCNET	5 /* Bosch MCNet */
-#define CAN_ISOTP	6 /* ISO 15765-2 Transport Protocol */
-#define CAN_NPROTO	7
-
-#define SOL_CAN_BASE 100
-
-/**
- * struct sockaddr_can - the sockaddr structure for CAN sockets
- * @can_family:  address family number AF_CAN.
- * @can_ifindex: CAN network interface index.
- * @can_addr:    protocol specific address information
- */
-struct sockaddr_can {
-	__kernel_sa_family_t can_family;
-	int         can_ifindex;
-	union {
-		/* transport protocol class address information (e.g. ISOTP) */
-		struct { canid_t rx_id, tx_id; } tp;
-
-		/* reserved for future CAN protocols address information */
-	} can_addr;
-};
-
-/**
- * struct can_filter - CAN ID based filter in can_register().
- * @can_id:   relevant bits of CAN ID which are not masked out.
- * @can_mask: CAN mask (see description)
- *
- * Description:
- * A filter matches, when
- *
- *          <received_can_id> & mask == can_id & mask
- *
- * The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can
- * filter for error message frames (CAN_ERR_FLAG bit set in mask).
- */
-struct can_filter {
-	canid_t can_id;
-	canid_t can_mask;
-};
-
-#define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */
-
-#endif /* !_UAPI_CAN_H */
diff --git a/openflow/usr/include/linux/can/bcm.h b/openflow/usr/include/linux/can/bcm.h
deleted file mode 100644
index 9cc0d04..0000000
--- a/openflow/usr/include/linux/can/bcm.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * linux/can/bcm.h
- *
- * Definitions for CAN Broadcast Manager (BCM)
- *
- * Author: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
- * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Volkswagen nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * Alternatively, provided that this notice is retained in full, this
- * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2, in which case the provisions of the
- * GPL apply INSTEAD OF those given above.
- *
- * The provided data structures and external interfaces from this code
- * are not restricted to be used by modules with a GPL compatible license.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-#ifndef _CAN_BCM_H
-#define _CAN_BCM_H
-
-#include <linux/types.h>
-#include <linux/can.h>
-
-struct bcm_timeval {
-	long tv_sec;
-	long tv_usec;
-};
-
-/**
- * struct bcm_msg_head - head of messages to/from the broadcast manager
- * @opcode:    opcode, see enum below.
- * @flags:     special flags, see below.
- * @count:     number of frames to send before changing interval.
- * @ival1:     interval for the first @count frames.
- * @ival2:     interval for the following frames.
- * @can_id:    CAN ID of frames to be sent or received.
- * @nframes:   number of frames appended to the message head.
- * @frames:    array of CAN frames.
- */
-struct bcm_msg_head {
-	__u32 opcode;
-	__u32 flags;
-	__u32 count;
-	struct bcm_timeval ival1, ival2;
-	canid_t can_id;
-	__u32 nframes;
-	struct can_frame frames[0];
-};
-
-enum {
-	TX_SETUP = 1,	/* create (cyclic) transmission task */
-	TX_DELETE,	/* remove (cyclic) transmission task */
-	TX_READ,	/* read properties of (cyclic) transmission task */
-	TX_SEND,	/* send one CAN frame */
-	RX_SETUP,	/* create RX content filter subscription */
-	RX_DELETE,	/* remove RX content filter subscription */
-	RX_READ,	/* read properties of RX content filter subscription */
-	TX_STATUS,	/* reply to TX_READ request */
-	TX_EXPIRED,	/* notification on performed transmissions (count=0) */
-	RX_STATUS,	/* reply to RX_READ request */
-	RX_TIMEOUT,	/* cyclic message is absent */
-	RX_CHANGED	/* updated CAN frame (detected content change) */
-};
-
-#define SETTIMER            0x0001
-#define STARTTIMER          0x0002
-#define TX_COUNTEVT         0x0004
-#define TX_ANNOUNCE         0x0008
-#define TX_CP_CAN_ID        0x0010
-#define RX_FILTER_ID        0x0020
-#define RX_CHECK_DLC        0x0040
-#define RX_NO_AUTOTIMER     0x0080
-#define RX_ANNOUNCE_RESUME  0x0100
-#define TX_RESET_MULTI_IDX  0x0200
-#define RX_RTR_FRAME        0x0400
-
-#endif /* !_UAPI_CAN_BCM_H */
diff --git a/openflow/usr/include/linux/can/error.h b/openflow/usr/include/linux/can/error.h
deleted file mode 100644
index cfba785..0000000
--- a/openflow/usr/include/linux/can/error.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * linux/can/error.h
- *
- * Definitions of the CAN error messages to be filtered and passed to the user.
- *
- * Author: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
- * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Volkswagen nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * Alternatively, provided that this notice is retained in full, this
- * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2, in which case the provisions of the
- * GPL apply INSTEAD OF those given above.
- *
- * The provided data structures and external interfaces from this code
- * are not restricted to be used by modules with a GPL compatible license.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-#ifndef _CAN_ERROR_H
-#define _CAN_ERROR_H
-
-#define CAN_ERR_DLC 8 /* dlc for error message frames */
-
-/* error class (mask) in can_id */
-#define CAN_ERR_TX_TIMEOUT   0x00000001U /* TX timeout (by netdevice driver) */
-#define CAN_ERR_LOSTARB      0x00000002U /* lost arbitration    / data[0]    */
-#define CAN_ERR_CRTL         0x00000004U /* controller problems / data[1]    */
-#define CAN_ERR_PROT         0x00000008U /* protocol violations / data[2..3] */
-#define CAN_ERR_TRX          0x00000010U /* transceiver status  / data[4]    */
-#define CAN_ERR_ACK          0x00000020U /* received no ACK on transmission */
-#define CAN_ERR_BUSOFF       0x00000040U /* bus off */
-#define CAN_ERR_BUSERROR     0x00000080U /* bus error (may flood!) */
-#define CAN_ERR_RESTARTED    0x00000100U /* controller restarted */
-
-/* arbitration lost in bit ... / data[0] */
-#define CAN_ERR_LOSTARB_UNSPEC   0x00 /* unspecified */
-				      /* else bit number in bitstream */
-
-/* error status of CAN-controller / data[1] */
-#define CAN_ERR_CRTL_UNSPEC      0x00 /* unspecified */
-#define CAN_ERR_CRTL_RX_OVERFLOW 0x01 /* RX buffer overflow */
-#define CAN_ERR_CRTL_TX_OVERFLOW 0x02 /* TX buffer overflow */
-#define CAN_ERR_CRTL_RX_WARNING  0x04 /* reached warning level for RX errors */
-#define CAN_ERR_CRTL_TX_WARNING  0x08 /* reached warning level for TX errors */
-#define CAN_ERR_CRTL_RX_PASSIVE  0x10 /* reached error passive status RX */
-#define CAN_ERR_CRTL_TX_PASSIVE  0x20 /* reached error passive status TX */
-				      /* (at least one error counter exceeds */
-				      /* the protocol-defined level of 127)  */
-#define CAN_ERR_CRTL_ACTIVE      0x40 /* recovered to error active state */
-
-/* error in CAN protocol (type) / data[2] */
-#define CAN_ERR_PROT_UNSPEC      0x00 /* unspecified */
-#define CAN_ERR_PROT_BIT         0x01 /* single bit error */
-#define CAN_ERR_PROT_FORM        0x02 /* frame format error */
-#define CAN_ERR_PROT_STUFF       0x04 /* bit stuffing error */
-#define CAN_ERR_PROT_BIT0        0x08 /* unable to send dominant bit */
-#define CAN_ERR_PROT_BIT1        0x10 /* unable to send recessive bit */
-#define CAN_ERR_PROT_OVERLOAD    0x20 /* bus overload */
-#define CAN_ERR_PROT_ACTIVE      0x40 /* active error announcement */
-#define CAN_ERR_PROT_TX          0x80 /* error occurred on transmission */
-
-/* error in CAN protocol (location) / data[3] */
-#define CAN_ERR_PROT_LOC_UNSPEC  0x00 /* unspecified */
-#define CAN_ERR_PROT_LOC_SOF     0x03 /* start of frame */
-#define CAN_ERR_PROT_LOC_ID28_21 0x02 /* ID bits 28 - 21 (SFF: 10 - 3) */
-#define CAN_ERR_PROT_LOC_ID20_18 0x06 /* ID bits 20 - 18 (SFF: 2 - 0 )*/
-#define CAN_ERR_PROT_LOC_SRTR    0x04 /* substitute RTR (SFF: RTR) */
-#define CAN_ERR_PROT_LOC_IDE     0x05 /* identifier extension */
-#define CAN_ERR_PROT_LOC_ID17_13 0x07 /* ID bits 17-13 */
-#define CAN_ERR_PROT_LOC_ID12_05 0x0F /* ID bits 12-5 */
-#define CAN_ERR_PROT_LOC_ID04_00 0x0E /* ID bits 4-0 */
-#define CAN_ERR_PROT_LOC_RTR     0x0C /* RTR */
-#define CAN_ERR_PROT_LOC_RES1    0x0D /* reserved bit 1 */
-#define CAN_ERR_PROT_LOC_RES0    0x09 /* reserved bit 0 */
-#define CAN_ERR_PROT_LOC_DLC     0x0B /* data length code */
-#define CAN_ERR_PROT_LOC_DATA    0x0A /* data section */
-#define CAN_ERR_PROT_LOC_CRC_SEQ 0x08 /* CRC sequence */
-#define CAN_ERR_PROT_LOC_CRC_DEL 0x18 /* CRC delimiter */
-#define CAN_ERR_PROT_LOC_ACK     0x19 /* ACK slot */
-#define CAN_ERR_PROT_LOC_ACK_DEL 0x1B /* ACK delimiter */
-#define CAN_ERR_PROT_LOC_EOF     0x1A /* end of frame */
-#define CAN_ERR_PROT_LOC_INTERM  0x12 /* intermission */
-
-/* error status of CAN-transceiver / data[4] */
-/*                                             CANH CANL */
-#define CAN_ERR_TRX_UNSPEC             0x00 /* 0000 0000 */
-#define CAN_ERR_TRX_CANH_NO_WIRE       0x04 /* 0000 0100 */
-#define CAN_ERR_TRX_CANH_SHORT_TO_BAT  0x05 /* 0000 0101 */
-#define CAN_ERR_TRX_CANH_SHORT_TO_VCC  0x06 /* 0000 0110 */
-#define CAN_ERR_TRX_CANH_SHORT_TO_GND  0x07 /* 0000 0111 */
-#define CAN_ERR_TRX_CANL_NO_WIRE       0x40 /* 0100 0000 */
-#define CAN_ERR_TRX_CANL_SHORT_TO_BAT  0x50 /* 0101 0000 */
-#define CAN_ERR_TRX_CANL_SHORT_TO_VCC  0x60 /* 0110 0000 */
-#define CAN_ERR_TRX_CANL_SHORT_TO_GND  0x70 /* 0111 0000 */
-#define CAN_ERR_TRX_CANL_SHORT_TO_CANH 0x80 /* 1000 0000 */
-
-/* controller specific additional information / data[5..7] */
-
-#endif /* _CAN_ERROR_H */
diff --git a/openflow/usr/include/linux/can/gw.h b/openflow/usr/include/linux/can/gw.h
deleted file mode 100644
index 8b080e3..0000000
--- a/openflow/usr/include/linux/can/gw.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * linux/can/gw.h
- *
- * Definitions for CAN frame Gateway/Router/Bridge
- *
- * Author: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
- * Copyright (c) 2011 Volkswagen Group Electronic Research
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Volkswagen nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * Alternatively, provided that this notice is retained in full, this
- * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2, in which case the provisions of the
- * GPL apply INSTEAD OF those given above.
- *
- * The provided data structures and external interfaces from this code
- * are not restricted to be used by modules with a GPL compatible license.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-#ifndef _CAN_GW_H
-#define _CAN_GW_H
-
-#include <linux/types.h>
-#include <linux/can.h>
-
-struct rtcanmsg {
-	__u8  can_family;
-	__u8  gwtype;
-	__u16 flags;
-};
-
-/* CAN gateway types */
-enum {
-	CGW_TYPE_UNSPEC,
-	CGW_TYPE_CAN_CAN,	/* CAN->CAN routing */
-	__CGW_TYPE_MAX
-};
-
-#define CGW_TYPE_MAX (__CGW_TYPE_MAX - 1)
-
-/* CAN rtnetlink attribute definitions */
-enum {
-	CGW_UNSPEC,
-	CGW_MOD_AND,	/* CAN frame modification binary AND */
-	CGW_MOD_OR,	/* CAN frame modification binary OR */
-	CGW_MOD_XOR,	/* CAN frame modification binary XOR */
-	CGW_MOD_SET,	/* CAN frame modification set alternate values */
-	CGW_CS_XOR,	/* set data[] XOR checksum into data[index] */
-	CGW_CS_CRC8,	/* set data[] CRC8 checksum into data[index] */
-	CGW_HANDLED,	/* number of handled CAN frames */
-	CGW_DROPPED,	/* number of dropped CAN frames */
-	CGW_SRC_IF,	/* ifindex of source network interface */
-	CGW_DST_IF,	/* ifindex of destination network interface */
-	CGW_FILTER,	/* specify struct can_filter on source CAN device */
-	CGW_DELETED,	/* number of deleted CAN frames (see max_hops param) */
-	CGW_LIM_HOPS,	/* limit the number of hops of this specific rule */
-	CGW_MOD_UID,	/* user defined identifier for modification updates */
-	__CGW_MAX
-};
-
-#define CGW_MAX (__CGW_MAX - 1)
-
-#define CGW_FLAGS_CAN_ECHO 0x01
-#define CGW_FLAGS_CAN_SRC_TSTAMP 0x02
-#define CGW_FLAGS_CAN_IIF_TX_OK 0x04
-
-#define CGW_MOD_FUNCS 4 /* AND OR XOR SET */
-
-/* CAN frame elements that are affected by curr. 3 CAN frame modifications */
-#define CGW_MOD_ID	0x01
-#define CGW_MOD_DLC	0x02
-#define CGW_MOD_DATA	0x04
-
-#define CGW_FRAME_MODS 3 /* ID DLC DATA */
-
-#define MAX_MODFUNCTIONS (CGW_MOD_FUNCS * CGW_FRAME_MODS)
-
-struct cgw_frame_mod {
-	struct can_frame cf;
-	__u8 modtype;
-} __attribute__((packed));
-
-#define CGW_MODATTR_LEN sizeof(struct cgw_frame_mod)
-
-struct cgw_csum_xor {
-	__s8 from_idx;
-	__s8 to_idx;
-	__s8 result_idx;
-	__u8 init_xor_val;
-} __attribute__((packed));
-
-struct cgw_csum_crc8 {
-	__s8 from_idx;
-	__s8 to_idx;
-	__s8 result_idx;
-	__u8 init_crc_val;
-	__u8 final_xor_val;
-	__u8 crctab[256];
-	__u8 profile;
-	__u8 profile_data[20];
-} __attribute__((packed));
-
-/* length of checksum operation parameters. idx = index in CAN frame data[] */
-#define CGW_CS_XOR_LEN  sizeof(struct cgw_csum_xor)
-#define CGW_CS_CRC8_LEN  sizeof(struct cgw_csum_crc8)
-
-/* CRC8 profiles (compute CRC for additional data elements - see below) */
-enum {
-	CGW_CRC8PRF_UNSPEC,
-	CGW_CRC8PRF_1U8,	/* compute one additional u8 value */
-	CGW_CRC8PRF_16U8,	/* u8 value table indexed by data[1] & 0xF */
-	CGW_CRC8PRF_SFFID_XOR,	/* (can_id & 0xFF) ^ (can_id >> 8 & 0xFF) */
-	__CGW_CRC8PRF_MAX
-};
-
-#define CGW_CRC8PRF_MAX (__CGW_CRC8PRF_MAX - 1)
-
-/*
- * CAN rtnetlink attribute contents in detail
- *
- * CGW_XXX_IF (length 4 bytes):
- * Sets an interface index for source/destination network interfaces.
- * For the CAN->CAN gwtype the indices of _two_ CAN interfaces are mandatory.
- *
- * CGW_FILTER (length 8 bytes):
- * Sets a CAN receive filter for the gateway job specified by the
- * struct can_filter described in include/linux/can.h
- *
- * CGW_MOD_(AND|OR|XOR|SET) (length 17 bytes):
- * Specifies a modification that's done to a received CAN frame before it is
- * send out to the destination interface.
- *
- * <struct can_frame> data used as operator
- * <u8> affected CAN frame elements
- *
- * CGW_LIM_HOPS (length 1 byte):
- * Limit the number of hops of this specific rule. Usually the received CAN
- * frame can be processed as much as 'max_hops' times (which is given at module
- * load time of the can-gw module). This value is used to reduce the number of
- * possible hops for this gateway rule to a value smaller then max_hops.
- *
- * CGW_MOD_UID (length 4 bytes):
- * Optional non-zero user defined routing job identifier to alter existing
- * modification settings at runtime.
- *
- * CGW_CS_XOR (length 4 bytes):
- * Set a simple XOR checksum starting with an initial value into
- * data[result-idx] using data[start-idx] .. data[end-idx]
- *
- * The XOR checksum is calculated like this:
- *
- * xor = init_xor_val
- *
- * for (i = from_idx .. to_idx)
- *      xor ^= can_frame.data[i]
- *
- * can_frame.data[ result_idx ] = xor
- *
- * CGW_CS_CRC8 (length 282 bytes):
- * Set a CRC8 value into data[result-idx] using a given 256 byte CRC8 table,
- * a given initial value and a defined input data[start-idx] .. data[end-idx].
- * Finally the result value is XOR'ed with the final_xor_val.
- *
- * The CRC8 checksum is calculated like this:
- *
- * crc = init_crc_val
- *
- * for (i = from_idx .. to_idx)
- *      crc = crctab[ crc ^ can_frame.data[i] ]
- *
- * can_frame.data[ result_idx ] = crc ^ final_xor_val
- *
- * The calculated CRC may contain additional source data elements that can be
- * defined in the handling of 'checksum profiles' e.g. shown in AUTOSAR specs
- * like http://www.autosar.org/download/R4.0/AUTOSAR_SWS_E2ELibrary.pdf
- * E.g. the profile_data[] may contain additional u8 values (called DATA_IDs)
- * that are used depending on counter values inside the CAN frame data[].
- * So far only three profiles have been implemented for illustration.
- *
- * Remark: In general the attribute data is a linear buffer.
- *         Beware of sending unpacked or aligned structs!
- */
-
-#endif /* !_UAPI_CAN_GW_H */
diff --git a/openflow/usr/include/linux/can/netlink.h b/openflow/usr/include/linux/can/netlink.h
deleted file mode 100644
index 6d4ec2a..0000000
--- a/openflow/usr/include/linux/can/netlink.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * linux/can/netlink.h
- *
- * Definitions for the CAN netlink interface
- *
- * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the version 2 of the GNU General Public License
- * as published by the Free Software Foundation
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#ifndef _CAN_NETLINK_H
-#define _CAN_NETLINK_H
-
-#include <linux/types.h>
-
-/*
- * CAN bit-timing parameters
- *
- * For further information, please read chapter "8 BIT TIMING
- * REQUIREMENTS" of the "Bosch CAN Specification version 2.0"
- * at http://www.semiconductors.bosch.de/pdf/can2spec.pdf.
- */
-struct can_bittiming {
-	__u32 bitrate;		/* Bit-rate in bits/second */
-	__u32 sample_point;	/* Sample point in one-tenth of a percent */
-	__u32 tq;		/* Time quanta (TQ) in nanoseconds */
-	__u32 prop_seg;		/* Propagation segment in TQs */
-	__u32 phase_seg1;	/* Phase buffer segment 1 in TQs */
-	__u32 phase_seg2;	/* Phase buffer segment 2 in TQs */
-	__u32 sjw;		/* Synchronisation jump width in TQs */
-	__u32 brp;		/* Bit-rate prescaler */
-};
-
-/*
- * CAN harware-dependent bit-timing constant
- *
- * Used for calculating and checking bit-timing parameters
- */
-struct can_bittiming_const {
-	char name[16];		/* Name of the CAN controller hardware */
-	__u32 tseg1_min;	/* Time segement 1 = prop_seg + phase_seg1 */
-	__u32 tseg1_max;
-	__u32 tseg2_min;	/* Time segement 2 = phase_seg2 */
-	__u32 tseg2_max;
-	__u32 sjw_max;		/* Synchronisation jump width */
-	__u32 brp_min;		/* Bit-rate prescaler */
-	__u32 brp_max;
-	__u32 brp_inc;
-};
-
-/*
- * CAN clock parameters
- */
-struct can_clock {
-	__u32 freq;		/* CAN system clock frequency in Hz */
-};
-
-/*
- * CAN operational and error states
- */
-enum can_state {
-	CAN_STATE_ERROR_ACTIVE = 0,	/* RX/TX error count < 96 */
-	CAN_STATE_ERROR_WARNING,	/* RX/TX error count < 128 */
-	CAN_STATE_ERROR_PASSIVE,	/* RX/TX error count < 256 */
-	CAN_STATE_BUS_OFF,		/* RX/TX error count >= 256 */
-	CAN_STATE_STOPPED,		/* Device is stopped */
-	CAN_STATE_SLEEPING,		/* Device is sleeping */
-	CAN_STATE_MAX
-};
-
-/*
- * CAN bus error counters
- */
-struct can_berr_counter {
-	__u16 txerr;
-	__u16 rxerr;
-};
-
-/*
- * CAN controller mode
- */
-struct can_ctrlmode {
-	__u32 mask;
-	__u32 flags;
-};
-
-#define CAN_CTRLMODE_LOOPBACK		0x01	/* Loopback mode */
-#define CAN_CTRLMODE_LISTENONLY		0x02	/* Listen-only mode */
-#define CAN_CTRLMODE_3_SAMPLES		0x04	/* Triple sampling mode */
-#define CAN_CTRLMODE_ONE_SHOT		0x08	/* One-Shot mode */
-#define CAN_CTRLMODE_BERR_REPORTING	0x10	/* Bus-error reporting */
-#define CAN_CTRLMODE_FD			0x20	/* CAN FD mode */
-#define CAN_CTRLMODE_PRESUME_ACK	0x40	/* Ignore missing CAN ACKs */
-#define CAN_CTRLMODE_FD_NON_ISO		0x80	/* CAN FD in non-ISO mode */
-
-/*
- * CAN device statistics
- */
-struct can_device_stats {
-	__u32 bus_error;	/* Bus errors */
-	__u32 error_warning;	/* Changes to error warning state */
-	__u32 error_passive;	/* Changes to error passive state */
-	__u32 bus_off;		/* Changes to bus off state */
-	__u32 arbitration_lost; /* Arbitration lost errors */
-	__u32 restarts;		/* CAN controller re-starts */
-};
-
-/*
- * CAN netlink interface
- */
-enum {
-	IFLA_CAN_UNSPEC,
-	IFLA_CAN_BITTIMING,
-	IFLA_CAN_BITTIMING_CONST,
-	IFLA_CAN_CLOCK,
-	IFLA_CAN_STATE,
-	IFLA_CAN_CTRLMODE,
-	IFLA_CAN_RESTART_MS,
-	IFLA_CAN_RESTART,
-	IFLA_CAN_BERR_COUNTER,
-	IFLA_CAN_DATA_BITTIMING,
-	IFLA_CAN_DATA_BITTIMING_CONST,
-	__IFLA_CAN_MAX
-};
-
-#define IFLA_CAN_MAX	(__IFLA_CAN_MAX - 1)
-
-#endif /* !_UAPI_CAN_NETLINK_H */
diff --git a/openflow/usr/include/linux/can/raw.h b/openflow/usr/include/linux/can/raw.h
deleted file mode 100644
index 0e3bf9f..0000000
--- a/openflow/usr/include/linux/can/raw.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * linux/can/raw.h
- *
- * Definitions for raw CAN sockets
- *
- * Authors: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
- *          Urs Thuermann   <urs.thuermann@volkswagen.de>
- * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Volkswagen nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * Alternatively, provided that this notice is retained in full, this
- * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2, in which case the provisions of the
- * GPL apply INSTEAD OF those given above.
- *
- * The provided data structures and external interfaces from this code
- * are not restricted to be used by modules with a GPL compatible license.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-#ifndef _CAN_RAW_H
-#define _CAN_RAW_H
-
-#include <linux/can.h>
-
-#define SOL_CAN_RAW (SOL_CAN_BASE + CAN_RAW)
-
-/* for socket options affecting the socket (not the global system) */
-
-enum {
-	CAN_RAW_FILTER = 1,	/* set 0 .. n can_filter(s)          */
-	CAN_RAW_ERR_FILTER,	/* set filter for error frames       */
-	CAN_RAW_LOOPBACK,	/* local loopback (default:on)       */
-	CAN_RAW_RECV_OWN_MSGS,	/* receive my own msgs (default:off) */
-	CAN_RAW_FD_FRAMES,	/* allow CAN FD frames (default:off) */
-	CAN_RAW_JOIN_FILTERS,	/* all filters must match to trigger */
-};
-
-#endif /* !_UAPI_CAN_RAW_H */
diff --git a/openflow/usr/include/linux/capability.h b/openflow/usr/include/linux/capability.h
deleted file mode 100644
index b4020e9..0000000
--- a/openflow/usr/include/linux/capability.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * This is <linux/capability.h>
- *
- * Andrew G. Morgan <morgan@kernel.org>
- * Alexander Kjeldaas <astor@guardian.no>
- * with help from Aleph1, Roland Buresund and Andrew Main.
- *
- * See here for the libcap library ("POSIX draft" compliance):
- *
- * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
- */
-
-#ifndef _LINUX_CAPABILITY_H
-#define _LINUX_CAPABILITY_H
-
-#include <linux/types.h>
-
-struct task_struct;
-
-/* User-level do most of the mapping between kernel and user
-   capabilities based on the version tag given by the kernel. The
-   kernel might be somewhat backwards compatible, but don't bet on
-   it. */
-
-/* Note, cap_t, is defined by POSIX (draft) to be an "opaque" pointer to
-   a set of three capability sets.  The transposition of 3*the
-   following structure to such a composite is better handled in a user
-   library since the draft standard requires the use of malloc/free
-   etc.. */
-
-#define _LINUX_CAPABILITY_VERSION_1  0x19980330
-#define _LINUX_CAPABILITY_U32S_1     1
-
-#define _LINUX_CAPABILITY_VERSION_2  0x20071026  /* deprecated - use v3 */
-#define _LINUX_CAPABILITY_U32S_2     2
-
-#define _LINUX_CAPABILITY_VERSION_3  0x20080522
-#define _LINUX_CAPABILITY_U32S_3     2
-
-typedef struct __user_cap_header_struct {
-	__u32 version;
-	int pid;
-} *cap_user_header_t;
-
-typedef struct __user_cap_data_struct {
-        __u32 effective;
-        __u32 permitted;
-        __u32 inheritable;
-} *cap_user_data_t;
-
-
-#define VFS_CAP_REVISION_MASK	0xFF000000
-#define VFS_CAP_REVISION_SHIFT	24
-#define VFS_CAP_FLAGS_MASK	~VFS_CAP_REVISION_MASK
-#define VFS_CAP_FLAGS_EFFECTIVE	0x000001
-
-#define VFS_CAP_REVISION_1	0x01000000
-#define VFS_CAP_U32_1           1
-#define XATTR_CAPS_SZ_1         (sizeof(__le32)*(1 + 2*VFS_CAP_U32_1))
-
-#define VFS_CAP_REVISION_2	0x02000000
-#define VFS_CAP_U32_2           2
-#define XATTR_CAPS_SZ_2         (sizeof(__le32)*(1 + 2*VFS_CAP_U32_2))
-
-#define XATTR_CAPS_SZ           XATTR_CAPS_SZ_2
-#define VFS_CAP_U32             VFS_CAP_U32_2
-#define VFS_CAP_REVISION	VFS_CAP_REVISION_2
-
-struct vfs_cap_data {
-	__le32 magic_etc;            /* Little endian */
-	struct {
-		__le32 permitted;    /* Little endian */
-		__le32 inheritable;  /* Little endian */
-	} data[VFS_CAP_U32];
-};
-
-
-/*
- * Backwardly compatible definition for source code - trapped in a
- * 32-bit world. If you find you need this, please consider using
- * libcap to untrap yourself...
- */
-#define _LINUX_CAPABILITY_VERSION  _LINUX_CAPABILITY_VERSION_1
-#define _LINUX_CAPABILITY_U32S     _LINUX_CAPABILITY_U32S_1
-
-
-
-/**
- ** POSIX-draft defined capabilities.
- **/
-
-/* In a system with the [_POSIX_CHOWN_RESTRICTED] option defined, this
-   overrides the restriction of changing file ownership and group
-   ownership. */
-
-#define CAP_CHOWN            0
-
-/* Override all DAC access, including ACL execute access if
-   [_POSIX_ACL] is defined. Excluding DAC access covered by
-   CAP_LINUX_IMMUTABLE. */
-
-#define CAP_DAC_OVERRIDE     1
-
-/* Overrides all DAC restrictions regarding read and search on files
-   and directories, including ACL restrictions if [_POSIX_ACL] is
-   defined. Excluding DAC access covered by CAP_LINUX_IMMUTABLE. */
-
-#define CAP_DAC_READ_SEARCH  2
-
-/* Overrides all restrictions about allowed operations on files, where
-   file owner ID must be equal to the user ID, except where CAP_FSETID
-   is applicable. It doesn't override MAC and DAC restrictions. */
-
-#define CAP_FOWNER           3
-
-/* Overrides the following restrictions that the effective user ID
-   shall match the file owner ID when setting the S_ISUID and S_ISGID
-   bits on that file; that the effective group ID (or one of the
-   supplementary group IDs) shall match the file owner ID when setting
-   the S_ISGID bit on that file; that the S_ISUID and S_ISGID bits are
-   cleared on successful return from chown(2) (not implemented). */
-
-#define CAP_FSETID           4
-
-/* Overrides the restriction that the real or effective user ID of a
-   process sending a signal must match the real or effective user ID
-   of the process receiving the signal. */
-
-#define CAP_KILL             5
-
-/* Allows setgid(2) manipulation */
-/* Allows setgroups(2) */
-/* Allows forged gids on socket credentials passing. */
-
-#define CAP_SETGID           6
-
-/* Allows set*uid(2) manipulation (including fsuid). */
-/* Allows forged pids on socket credentials passing. */
-
-#define CAP_SETUID           7
-
-
-/**
- ** Linux-specific capabilities
- **/
-
-/* Without VFS support for capabilities:
- *   Transfer any capability in your permitted set to any pid,
- *   remove any capability in your permitted set from any pid
- * With VFS support for capabilities (neither of above, but)
- *   Add any capability from current's capability bounding set
- *       to the current process' inheritable set
- *   Allow taking bits out of capability bounding set
- *   Allow modification of the securebits for a process
- */
-
-#define CAP_SETPCAP          8
-
-/* Allow modification of S_IMMUTABLE and S_APPEND file attributes */
-
-#define CAP_LINUX_IMMUTABLE  9
-
-/* Allows binding to TCP/UDP sockets below 1024 */
-/* Allows binding to ATM VCIs below 32 */
-
-#define CAP_NET_BIND_SERVICE 10
-
-/* Allow broadcasting, listen to multicast */
-
-#define CAP_NET_BROADCAST    11
-
-/* Allow interface configuration */
-/* Allow administration of IP firewall, masquerading and accounting */
-/* Allow setting debug option on sockets */
-/* Allow modification of routing tables */
-/* Allow setting arbitrary process / process group ownership on
-   sockets */
-/* Allow binding to any address for transparent proxying (also via NET_RAW) */
-/* Allow setting TOS (type of service) */
-/* Allow setting promiscuous mode */
-/* Allow clearing driver statistics */
-/* Allow multicasting */
-/* Allow read/write of device-specific registers */
-/* Allow activation of ATM control sockets */
-
-#define CAP_NET_ADMIN        12
-
-/* Allow use of RAW sockets */
-/* Allow use of PACKET sockets */
-/* Allow binding to any address for transparent proxying (also via NET_ADMIN) */
-
-#define CAP_NET_RAW          13
-
-/* Allow locking of shared memory segments */
-/* Allow mlock and mlockall (which doesn't really have anything to do
-   with IPC) */
-
-#define CAP_IPC_LOCK         14
-
-/* Override IPC ownership checks */
-
-#define CAP_IPC_OWNER        15
-
-/* Insert and remove kernel modules - modify kernel without limit */
-#define CAP_SYS_MODULE       16
-
-/* Allow ioperm/iopl access */
-/* Allow sending USB messages to any device via /proc/bus/usb */
-
-#define CAP_SYS_RAWIO        17
-
-/* Allow use of chroot() */
-
-#define CAP_SYS_CHROOT       18
-
-/* Allow ptrace() of any process */
-
-#define CAP_SYS_PTRACE       19
-
-/* Allow configuration of process accounting */
-
-#define CAP_SYS_PACCT        20
-
-/* Allow configuration of the secure attention key */
-/* Allow administration of the random device */
-/* Allow examination and configuration of disk quotas */
-/* Allow setting the domainname */
-/* Allow setting the hostname */
-/* Allow calling bdflush() */
-/* Allow mount() and umount(), setting up new smb connection */
-/* Allow some autofs root ioctls */
-/* Allow nfsservctl */
-/* Allow VM86_REQUEST_IRQ */
-/* Allow to read/write pci config on alpha */
-/* Allow irix_prctl on mips (setstacksize) */
-/* Allow flushing all cache on m68k (sys_cacheflush) */
-/* Allow removing semaphores */
-/* Used instead of CAP_CHOWN to "chown" IPC message queues, semaphores
-   and shared memory */
-/* Allow locking/unlocking of shared memory segment */
-/* Allow turning swap on/off */
-/* Allow forged pids on socket credentials passing */
-/* Allow setting readahead and flushing buffers on block devices */
-/* Allow setting geometry in floppy driver */
-/* Allow turning DMA on/off in xd driver */
-/* Allow administration of md devices (mostly the above, but some
-   extra ioctls) */
-/* Allow tuning the ide driver */
-/* Allow access to the nvram device */
-/* Allow administration of apm_bios, serial and bttv (TV) device */
-/* Allow manufacturer commands in isdn CAPI support driver */
-/* Allow reading non-standardized portions of pci configuration space */
-/* Allow DDI debug ioctl on sbpcd driver */
-/* Allow setting up serial ports */
-/* Allow sending raw qic-117 commands */
-/* Allow enabling/disabling tagged queuing on SCSI controllers and sending
-   arbitrary SCSI commands */
-/* Allow setting encryption key on loopback filesystem */
-/* Allow setting zone reclaim policy */
-
-#define CAP_SYS_ADMIN        21
-
-/* Allow use of reboot() */
-
-#define CAP_SYS_BOOT         22
-
-/* Allow raising priority and setting priority on other (different
-   UID) processes */
-/* Allow use of FIFO and round-robin (realtime) scheduling on own
-   processes and setting the scheduling algorithm used by another
-   process. */
-/* Allow setting cpu affinity on other processes */
-
-#define CAP_SYS_NICE         23
-
-/* Override resource limits. Set resource limits. */
-/* Override quota limits. */
-/* Override reserved space on ext2 filesystem */
-/* Modify data journaling mode on ext3 filesystem (uses journaling
-   resources) */
-/* NOTE: ext2 honors fsuid when checking for resource overrides, so
-   you can override using fsuid too */
-/* Override size restrictions on IPC message queues */
-/* Allow more than 64hz interrupts from the real-time clock */
-/* Override max number of consoles on console allocation */
-/* Override max number of keymaps */
-
-#define CAP_SYS_RESOURCE     24
-
-/* Allow manipulation of system clock */
-/* Allow irix_stime on mips */
-/* Allow setting the real-time clock */
-
-#define CAP_SYS_TIME         25
-
-/* Allow configuration of tty devices */
-/* Allow vhangup() of tty */
-
-#define CAP_SYS_TTY_CONFIG   26
-
-/* Allow the privileged aspects of mknod() */
-
-#define CAP_MKNOD            27
-
-/* Allow taking of leases on files */
-
-#define CAP_LEASE            28
-
-/* Allow writing the audit log via unicast netlink socket */
-
-#define CAP_AUDIT_WRITE      29
-
-/* Allow configuration of audit via unicast netlink socket */
-
-#define CAP_AUDIT_CONTROL    30
-
-#define CAP_SETFCAP	     31
-
-/* Override MAC access.
-   The base kernel enforces no MAC policy.
-   An LSM may enforce a MAC policy, and if it does and it chooses
-   to implement capability based overrides of that policy, this is
-   the capability it should use to do so. */
-
-#define CAP_MAC_OVERRIDE     32
-
-/* Allow MAC configuration or state changes.
-   The base kernel requires no MAC configuration.
-   An LSM may enforce a MAC policy, and if it does and it chooses
-   to implement capability based checks on modifications to that
-   policy or the data required to maintain it, this is the
-   capability it should use to do so. */
-
-#define CAP_MAC_ADMIN        33
-
-/* Allow configuring the kernel's syslog (printk behaviour) */
-
-#define CAP_SYSLOG           34
-
-/* Allow triggering something that will wake the system */
-
-#define CAP_WAKE_ALARM            35
-
-/* Allow preventing system suspends */
-
-#define CAP_BLOCK_SUSPEND    36
-
-/* Allow reading the audit log via multicast netlink socket */
-
-#define CAP_AUDIT_READ		37
-
-
-#define CAP_LAST_CAP         CAP_AUDIT_READ
-
-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
-
-/*
- * Bit location of each capability (used by user-space library and kernel)
- */
-
-#define CAP_TO_INDEX(x)     ((x) >> 5)        /* 1 << 5 == bits in __u32 */
-#define CAP_TO_MASK(x)      (1 << ((x) & 31)) /* mask for indexed __u32 */
-
-
-#endif /* _LINUX_CAPABILITY_H */
diff --git a/openflow/usr/include/linux/capi.h b/openflow/usr/include/linux/capi.h
deleted file mode 100644
index 32717a9..0000000
--- a/openflow/usr/include/linux/capi.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* $Id: capi.h,v 1.4.6.1 2001/09/23 22:25:05 kai Exp $
- * 
- * CAPI 2.0 Interface for Linux
- * 
- * Copyright 1997 by Carsten Paeth (calle@calle.in-berlin.de)
- * 
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#ifndef __LINUX_CAPI_H__
-#define __LINUX_CAPI_H__
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-#include <linux/kernelcapi.h>
-
-/*
- * CAPI_REGISTER
- */
-
-typedef struct capi_register_params {	/* CAPI_REGISTER */
-	__u32 level3cnt;	/* No. of simulatneous user data connections */
-	__u32 datablkcnt;	/* No. of buffered data messages */
-	__u32 datablklen;	/* Size of buffered data messages */
-} capi_register_params;
-
-#define	CAPI_REGISTER	_IOW('C',0x01,struct capi_register_params)
-
-/*
- * CAPI_GET_MANUFACTURER
- */
-
-#define CAPI_MANUFACTURER_LEN		64
-
-#define	CAPI_GET_MANUFACTURER	_IOWR('C',0x06,int)	/* broken: wanted size 64 (CAPI_MANUFACTURER_LEN) */
-
-/*
- * CAPI_GET_VERSION
- */
-
-typedef struct capi_version {
-	__u32 majorversion;
-	__u32 minorversion;
-	__u32 majormanuversion;
-	__u32 minormanuversion;
-} capi_version;
-
-#define CAPI_GET_VERSION	_IOWR('C',0x07,struct capi_version)
-
-/*
- * CAPI_GET_SERIAL
- */
-
-#define CAPI_SERIAL_LEN		8
-#define CAPI_GET_SERIAL		_IOWR('C',0x08,int)	/* broken: wanted size 8 (CAPI_SERIAL_LEN) */
-
-/*
- * CAPI_GET_PROFILE
- */
-
-typedef struct capi_profile {
-	__u16 ncontroller;	/* number of installed controller */
-	__u16 nbchannel;	/* number of B-Channels */
-	__u32 goptions;		/* global options */
-	__u32 support1;		/* B1 protocols support */
-	__u32 support2;		/* B2 protocols support */
-	__u32 support3;		/* B3 protocols support */
-	__u32 reserved[6];	/* reserved */
-	__u32 manu[5];		/* manufacturer specific information */
-} capi_profile;
-
-#define CAPI_GET_PROFILE	_IOWR('C',0x09,struct capi_profile)
-
-typedef struct capi_manufacturer_cmd {
-	unsigned long cmd;
-	void *data;
-} capi_manufacturer_cmd;
-
-/*
- * CAPI_MANUFACTURER_CMD
- */
-
-#define CAPI_MANUFACTURER_CMD	_IOWR('C',0x20, struct capi_manufacturer_cmd)
-
-/*
- * CAPI_GET_ERRCODE
- * capi errcode is set, * if read, write, or ioctl returns EIO,
- * ioctl returns errcode directly, and in arg, if != 0
- */
-
-#define CAPI_GET_ERRCODE	_IOR('C',0x21, __u16)
-
-/*
- * CAPI_INSTALLED
- */
-#define CAPI_INSTALLED		_IOR('C',0x22, __u16)
-
-
-/*
- * member contr is input for
- * CAPI_GET_MANUFACTURER, CAPI_GET_VERSION, CAPI_GET_SERIAL
- * and CAPI_GET_PROFILE
- */
-typedef union capi_ioctl_struct {
-	__u32 contr;
-	capi_register_params rparams;
-	__u8 manufacturer[CAPI_MANUFACTURER_LEN];
-	capi_version version;
-	__u8 serial[CAPI_SERIAL_LEN];
-	capi_profile profile;
-	capi_manufacturer_cmd cmd;
-	__u16 errcode;
-} capi_ioctl_struct;
-
-/*
- * Middleware extension
- */
-
-#define CAPIFLAG_HIGHJACKING	0x0001
-
-#define CAPI_GET_FLAGS		_IOR('C',0x23, unsigned)
-#define CAPI_SET_FLAGS		_IOR('C',0x24, unsigned)
-#define CAPI_CLR_FLAGS		_IOR('C',0x25, unsigned)
-
-#define CAPI_NCCI_OPENCOUNT	_IOR('C',0x26, unsigned)
-
-#define CAPI_NCCI_GETUNIT	_IOR('C',0x27, unsigned)
-
-#endif				/* __LINUX_CAPI_H__ */
diff --git a/openflow/usr/include/linux/cciss_defs.h b/openflow/usr/include/linux/cciss_defs.h
deleted file mode 100644
index 316b670..0000000
--- a/openflow/usr/include/linux/cciss_defs.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#ifndef CCISS_DEFS_H
-#define CCISS_DEFS_H
-
-#include <linux/types.h>
-
-/* general boundary definitions */
-#define SENSEINFOBYTES          32 /* note that this value may vary
-				      between host implementations */
-
-/* Command Status value */
-#define CMD_SUCCESS             0x0000
-#define CMD_TARGET_STATUS       0x0001
-#define CMD_DATA_UNDERRUN       0x0002
-#define CMD_DATA_OVERRUN        0x0003
-#define CMD_INVALID             0x0004
-#define CMD_PROTOCOL_ERR        0x0005
-#define CMD_HARDWARE_ERR        0x0006
-#define CMD_CONNECTION_LOST     0x0007
-#define CMD_ABORTED             0x0008
-#define CMD_ABORT_FAILED        0x0009
-#define CMD_UNSOLICITED_ABORT   0x000A
-#define CMD_TIMEOUT             0x000B
-#define CMD_UNABORTABLE		0x000C
-
-/* transfer direction */
-#define XFER_NONE               0x00
-#define XFER_WRITE              0x01
-#define XFER_READ               0x02
-#define XFER_RSVD               0x03
-
-/* task attribute */
-#define ATTR_UNTAGGED           0x00
-#define ATTR_SIMPLE             0x04
-#define ATTR_HEADOFQUEUE        0x05
-#define ATTR_ORDERED            0x06
-#define ATTR_ACA                0x07
-
-/* cdb type */
-#define TYPE_CMD				0x00
-#define TYPE_MSG				0x01
-
-/* Type defs used in the following structs */
-#define BYTE __u8
-#define WORD __u16
-#define HWORD __u16
-#define DWORD __u32
-
-#define CISS_MAX_LUN	1024
-
-#define LEVEL2LUN   1 /* index into Target(x) structure, due to byte swapping */
-#define LEVEL3LUN   0
-
-#pragma pack(1)
-
-/* Command List Structure */
-typedef union _SCSI3Addr_struct {
-   struct {
-    BYTE Dev;
-    BYTE Bus:6;
-    BYTE Mode:2;        /* b00 */
-  } PeripDev;
-   struct {
-    BYTE DevLSB;
-    BYTE DevMSB:6;
-    BYTE Mode:2;        /* b01 */
-  } LogDev;
-   struct {
-    BYTE Dev:5;
-    BYTE Bus:3;
-    BYTE Targ:6;
-    BYTE Mode:2;        /* b10 */
-  } LogUnit;
-} SCSI3Addr_struct;
-
-typedef struct _PhysDevAddr_struct {
-  DWORD             TargetId:24;
-  DWORD             Bus:6;
-  DWORD             Mode:2;
-  SCSI3Addr_struct  Target[2]; /* 2 level target device addr */
-} PhysDevAddr_struct;
-
-typedef struct _LogDevAddr_struct {
-  DWORD            VolId:30;
-  DWORD            Mode:2;
-  BYTE             reserved[4];
-} LogDevAddr_struct;
-
-typedef union _LUNAddr_struct {
-  BYTE               LunAddrBytes[8];
-  SCSI3Addr_struct   SCSI3Lun[4];
-  PhysDevAddr_struct PhysDev;
-  LogDevAddr_struct  LogDev;
-} LUNAddr_struct;
-
-typedef struct _RequestBlock_struct {
-  BYTE   CDBLen;
-  struct {
-    BYTE Type:3;
-    BYTE Attribute:3;
-    BYTE Direction:2;
-  } Type;
-  HWORD  Timeout;
-  BYTE   CDB[16];
-} RequestBlock_struct;
-
-typedef union _MoreErrInfo_struct{
-  struct {
-    BYTE  Reserved[3];
-    BYTE  Type;
-    DWORD ErrorInfo;
-  } Common_Info;
-  struct{
-    BYTE  Reserved[2];
-    BYTE  offense_size; /* size of offending entry */
-    BYTE  offense_num;  /* byte # of offense 0-base */
-    DWORD offense_value;
-  } Invalid_Cmd;
-} MoreErrInfo_struct;
-typedef struct _ErrorInfo_struct {
-  BYTE               ScsiStatus;
-  BYTE               SenseLen;
-  HWORD              CommandStatus;
-  DWORD              ResidualCnt;
-  MoreErrInfo_struct MoreErrInfo;
-  BYTE               SenseInfo[SENSEINFOBYTES];
-} ErrorInfo_struct;
-
-#pragma pack()
-
-#endif /* CCISS_DEFS_H */
diff --git a/openflow/usr/include/linux/cciss_ioctl.h b/openflow/usr/include/linux/cciss_ioctl.h
deleted file mode 100644
index d85fd2b..0000000
--- a/openflow/usr/include/linux/cciss_ioctl.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef CCISS_IOCTLH
-#define CCISS_IOCTLH
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-#include <linux/cciss_defs.h>
-
-#define CCISS_IOC_MAGIC 'B'
-
-
-typedef struct _cciss_pci_info_struct
-{
-	unsigned char 	bus;
-	unsigned char 	dev_fn;
-	unsigned short	domain;
-	__u32 		board_id;
-} cciss_pci_info_struct; 
-
-typedef struct _cciss_coalint_struct
-{
-	__u32  delay;
-	__u32  count;
-} cciss_coalint_struct;
-
-typedef char NodeName_type[16];
-
-typedef __u32 Heartbeat_type;
-
-#define CISS_PARSCSIU2 	0x0001
-#define CISS_PARCSCIU3 	0x0002
-#define CISS_FIBRE1G	0x0100
-#define CISS_FIBRE2G	0x0200
-typedef __u32 BusTypes_type;
-
-typedef char FirmwareVer_type[4];
-typedef __u32 DriverVer_type;
-
-#define MAX_KMALLOC_SIZE 128000
-
-typedef struct _IOCTL_Command_struct {
-  LUNAddr_struct	   LUN_info;
-  RequestBlock_struct      Request;
-  ErrorInfo_struct  	   error_info; 
-  WORD			   buf_size;  /* size in bytes of the buf */
-  BYTE			   *buf;
-} IOCTL_Command_struct;
-
-typedef struct _BIG_IOCTL_Command_struct {
-  LUNAddr_struct	   LUN_info;
-  RequestBlock_struct      Request;
-  ErrorInfo_struct  	   error_info;
-  DWORD			   malloc_size; /* < MAX_KMALLOC_SIZE in cciss.c */
-  DWORD			   buf_size;    /* size in bytes of the buf */
-  				        /* < malloc_size * MAXSGENTRIES */
-  BYTE			   *buf;
-} BIG_IOCTL_Command_struct;
-
-typedef struct _LogvolInfo_struct{
-	__u32	LunID;
-	int	num_opens;  /* number of opens on the logical volume */
-	int	num_parts;  /* number of partitions configured on logvol */
-} LogvolInfo_struct;
-
-#define CCISS_GETPCIINFO _IOR(CCISS_IOC_MAGIC, 1, cciss_pci_info_struct)
-
-#define CCISS_GETINTINFO _IOR(CCISS_IOC_MAGIC, 2, cciss_coalint_struct)
-#define CCISS_SETINTINFO _IOW(CCISS_IOC_MAGIC, 3, cciss_coalint_struct)
-
-#define CCISS_GETNODENAME _IOR(CCISS_IOC_MAGIC, 4, NodeName_type)
-#define CCISS_SETNODENAME _IOW(CCISS_IOC_MAGIC, 5, NodeName_type)
-
-#define CCISS_GETHEARTBEAT _IOR(CCISS_IOC_MAGIC, 6, Heartbeat_type)
-#define CCISS_GETBUSTYPES  _IOR(CCISS_IOC_MAGIC, 7, BusTypes_type)
-#define CCISS_GETFIRMVER   _IOR(CCISS_IOC_MAGIC, 8, FirmwareVer_type)
-#define CCISS_GETDRIVVER   _IOR(CCISS_IOC_MAGIC, 9, DriverVer_type)
-#define CCISS_REVALIDVOLS  _IO(CCISS_IOC_MAGIC, 10)
-#define CCISS_PASSTHRU	   _IOWR(CCISS_IOC_MAGIC, 11, IOCTL_Command_struct)
-#define CCISS_DEREGDISK	   _IO(CCISS_IOC_MAGIC, 12)
-
-/* no longer used... use REGNEWD instead */ 
-#define CCISS_REGNEWDISK  _IOW(CCISS_IOC_MAGIC, 13, int)
-
-#define CCISS_REGNEWD	   _IO(CCISS_IOC_MAGIC, 14)
-#define CCISS_RESCANDISK   _IO(CCISS_IOC_MAGIC, 16)
-#define CCISS_GETLUNINFO   _IOR(CCISS_IOC_MAGIC, 17, LogvolInfo_struct)
-#define CCISS_BIG_PASSTHRU _IOWR(CCISS_IOC_MAGIC, 18, BIG_IOCTL_Command_struct)
-
-#endif /* CCISS_IOCTLH */
diff --git a/openflow/usr/include/linux/cdrom.h b/openflow/usr/include/linux/cdrom.h
deleted file mode 100644
index db59b9b..0000000
--- a/openflow/usr/include/linux/cdrom.h
+++ /dev/null
@@ -1,946 +0,0 @@
-/*
- * -- <linux/cdrom.h>
- * General header file for linux CD-ROM drivers 
- * Copyright (C) 1992         David Giller, rafetmad@oxy.edu
- *               1994, 1995   Eberhard Mönkeberg, emoenke@gwdg.de
- *               1996         David van Leeuwen, david@tm.tno.nl
- *               1997, 1998   Erik Andersen, andersee@debian.org
- *               1998-2002    Jens Axboe, axboe@suse.de
- */
- 
-#ifndef _LINUX_CDROM_H
-#define _LINUX_CDROM_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/*******************************************************
- * As of Linux 2.1.x, all Linux CD-ROM application programs will use this 
- * (and only this) include file.  It is my hope to provide Linux with
- * a uniform interface between software accessing CD-ROMs and the various 
- * device drivers that actually talk to the drives.  There may still be
- * 23 different kinds of strange CD-ROM drives, but at least there will 
- * now be one, and only one, Linux CD-ROM interface.
- *
- * Additionally, as of Linux 2.1.x, all Linux application programs 
- * should use the O_NONBLOCK option when opening a CD-ROM device 
- * for subsequent ioctl commands.  This allows for neat system errors 
- * like "No medium found" or "Wrong medium type" upon attempting to 
- * mount or play an empty slot, mount an audio disc, or play a data disc.
- * Generally, changing an application program to support O_NONBLOCK
- * is as easy as the following:
- *       -    drive = open("/dev/cdrom", O_RDONLY);
- *       +    drive = open("/dev/cdrom", O_RDONLY | O_NONBLOCK);
- * It is worth the small change.
- *
- *  Patches for many common CD programs (provided by David A. van Leeuwen)
- *  can be found at:  ftp://ftp.gwdg.de/pub/linux/cdrom/drivers/cm206/
- * 
- *******************************************************/
-
-/* When a driver supports a certain function, but the cdrom drive we are 
- * using doesn't, we will return the error EDRIVE_CANT_DO_THIS.  We will 
- * borrow the "Operation not supported" error from the network folks to 
- * accomplish this.  Maybe someday we will get a more targeted error code, 
- * but this will do for now... */
-#define EDRIVE_CANT_DO_THIS  EOPNOTSUPP
-
-/*******************************************************
- * The CD-ROM IOCTL commands  -- these should be supported by 
- * all the various cdrom drivers.  For the CD-ROM ioctls, we 
- * will commandeer byte 0x53, or 'S'.
- *******************************************************/
-#define CDROMPAUSE		0x5301 /* Pause Audio Operation */ 
-#define CDROMRESUME		0x5302 /* Resume paused Audio Operation */
-#define CDROMPLAYMSF		0x5303 /* Play Audio MSF (struct cdrom_msf) */
-#define CDROMPLAYTRKIND		0x5304 /* Play Audio Track/index 
-                                           (struct cdrom_ti) */
-#define CDROMREADTOCHDR		0x5305 /* Read TOC header 
-                                           (struct cdrom_tochdr) */
-#define CDROMREADTOCENTRY	0x5306 /* Read TOC entry 
-                                           (struct cdrom_tocentry) */
-#define CDROMSTOP		0x5307 /* Stop the cdrom drive */
-#define CDROMSTART		0x5308 /* Start the cdrom drive */
-#define CDROMEJECT		0x5309 /* Ejects the cdrom media */
-#define CDROMVOLCTRL		0x530a /* Control output volume 
-                                           (struct cdrom_volctrl) */
-#define CDROMSUBCHNL		0x530b /* Read subchannel data 
-                                           (struct cdrom_subchnl) */
-#define CDROMREADMODE2		0x530c /* Read CDROM mode 2 data (2336 Bytes) 
-                                           (struct cdrom_read) */
-#define CDROMREADMODE1		0x530d /* Read CDROM mode 1 data (2048 Bytes)
-                                           (struct cdrom_read) */
-#define CDROMREADAUDIO		0x530e /* (struct cdrom_read_audio) */
-#define CDROMEJECT_SW		0x530f /* enable(1)/disable(0) auto-ejecting */
-#define CDROMMULTISESSION	0x5310 /* Obtain the start-of-last-session 
-                                           address of multi session disks 
-                                           (struct cdrom_multisession) */
-#define CDROM_GET_MCN		0x5311 /* Obtain the "Universal Product Code" 
-                                           if available (struct cdrom_mcn) */
-#define CDROM_GET_UPC		CDROM_GET_MCN  /* This one is deprecated, 
-                                          but here anyway for compatibility */
-#define CDROMRESET		0x5312 /* hard-reset the drive */
-#define CDROMVOLREAD		0x5313 /* Get the drive's volume setting 
-                                          (struct cdrom_volctrl) */
-#define CDROMREADRAW		0x5314	/* read data in raw mode (2352 Bytes)
-                                           (struct cdrom_read) */
-/* 
- * These ioctls are used only used in aztcd.c and optcd.c
- */
-#define CDROMREADCOOKED		0x5315	/* read data in cooked mode */
-#define CDROMSEEK		0x5316  /* seek msf address */
-  
-/*
- * This ioctl is only used by the scsi-cd driver.  
-   It is for playing audio in logical block addressing mode.
- */
-#define CDROMPLAYBLK		0x5317	/* (struct cdrom_blk) */
-
-/* 
- * These ioctls are only used in optcd.c
- */
-#define CDROMREADALL		0x5318	/* read all 2646 bytes */
-
-/* 
- * These ioctls are (now) only in ide-cd.c for controlling 
- * drive spindown time.  They should be implemented in the
- * Uniform driver, via generic packet commands, GPCMD_MODE_SELECT_10,
- * GPCMD_MODE_SENSE_10 and the GPMODE_POWER_PAGE...
- *  -Erik
- */
-#define CDROMGETSPINDOWN        0x531d
-#define CDROMSETSPINDOWN        0x531e
-
-/* 
- * These ioctls are implemented through the uniform CD-ROM driver
- * They _will_ be adopted by all CD-ROM drivers, when all the CD-ROM
- * drivers are eventually ported to the uniform CD-ROM driver interface.
- */
-#define CDROMCLOSETRAY		0x5319	/* pendant of CDROMEJECT */
-#define CDROM_SET_OPTIONS	0x5320  /* Set behavior options */
-#define CDROM_CLEAR_OPTIONS	0x5321  /* Clear behavior options */
-#define CDROM_SELECT_SPEED	0x5322  /* Set the CD-ROM speed */
-#define CDROM_SELECT_DISC	0x5323  /* Select disc (for juke-boxes) */
-#define CDROM_MEDIA_CHANGED	0x5325  /* Check is media changed  */
-#define CDROM_DRIVE_STATUS	0x5326  /* Get tray position, etc. */
-#define CDROM_DISC_STATUS	0x5327  /* Get disc type, etc. */
-#define CDROM_CHANGER_NSLOTS    0x5328  /* Get number of slots */
-#define CDROM_LOCKDOOR		0x5329  /* lock or unlock door */
-#define CDROM_DEBUG		0x5330	/* Turn debug messages on/off */
-#define CDROM_GET_CAPABILITY	0x5331	/* get capabilities */
-
-/* Note that scsi/scsi_ioctl.h also uses 0x5382 - 0x5386.
- * Future CDROM ioctls should be kept below 0x537F
- */
-
-/* This ioctl is only used by sbpcd at the moment */
-#define CDROMAUDIOBUFSIZ        0x5382	/* set the audio buffer size */
-					/* conflict with SCSI_IOCTL_GET_IDLUN */
-
-/* DVD-ROM Specific ioctls */
-#define DVD_READ_STRUCT		0x5390  /* Read structure */
-#define DVD_WRITE_STRUCT	0x5391  /* Write structure */
-#define DVD_AUTH		0x5392  /* Authentication */
-
-#define CDROM_SEND_PACKET	0x5393	/* send a packet to the drive */
-#define CDROM_NEXT_WRITABLE	0x5394	/* get next writable block */
-#define CDROM_LAST_WRITTEN	0x5395	/* get last block written on disc */
-
-/*******************************************************
- * CDROM IOCTL structures
- *******************************************************/
-
-/* Address in MSF format */
-struct cdrom_msf0		
-{
-	__u8	minute;
-	__u8	second;
-	__u8	frame;
-};
-
-/* Address in either MSF or logical format */
-union cdrom_addr		
-{
-	struct cdrom_msf0	msf;
-	int			lba;
-};
-
-/* This struct is used by the CDROMPLAYMSF ioctl */ 
-struct cdrom_msf 
-{
-	__u8	cdmsf_min0;	/* start minute */
-	__u8	cdmsf_sec0;	/* start second */
-	__u8	cdmsf_frame0;	/* start frame */
-	__u8	cdmsf_min1;	/* end minute */
-	__u8	cdmsf_sec1;	/* end second */
-	__u8	cdmsf_frame1;	/* end frame */
-};
-
-/* This struct is used by the CDROMPLAYTRKIND ioctl */
-struct cdrom_ti 
-{
-	__u8	cdti_trk0;	/* start track */
-	__u8	cdti_ind0;	/* start index */
-	__u8	cdti_trk1;	/* end track */
-	__u8	cdti_ind1;	/* end index */
-};
-
-/* This struct is used by the CDROMREADTOCHDR ioctl */
-struct cdrom_tochdr 	
-{
-	__u8	cdth_trk0;	/* start track */
-	__u8	cdth_trk1;	/* end track */
-};
-
-/* This struct is used by the CDROMVOLCTRL and CDROMVOLREAD ioctls */
-struct cdrom_volctrl
-{
-	__u8	channel0;
-	__u8	channel1;
-	__u8	channel2;
-	__u8	channel3;
-};
-
-/* This struct is used by the CDROMSUBCHNL ioctl */
-struct cdrom_subchnl 
-{
-	__u8	cdsc_format;
-	__u8	cdsc_audiostatus;
-	__u8	cdsc_adr:	4;
-	__u8	cdsc_ctrl:	4;
-	__u8	cdsc_trk;
-	__u8	cdsc_ind;
-	union cdrom_addr cdsc_absaddr;
-	union cdrom_addr cdsc_reladdr;
-};
-
-
-/* This struct is used by the CDROMREADTOCENTRY ioctl */
-struct cdrom_tocentry 
-{
-	__u8	cdte_track;
-	__u8	cdte_adr	:4;
-	__u8	cdte_ctrl	:4;
-	__u8	cdte_format;
-	union cdrom_addr cdte_addr;
-	__u8	cdte_datamode;
-};
-
-/* This struct is used by the CDROMREADMODE1, and CDROMREADMODE2 ioctls */
-struct cdrom_read      
-{
-	int	cdread_lba;
-	char 	*cdread_bufaddr;
-	int	cdread_buflen;
-};
-
-/* This struct is used by the CDROMREADAUDIO ioctl */
-struct cdrom_read_audio
-{
-	union cdrom_addr addr; /* frame address */
-	__u8 addr_format;      /* CDROM_LBA or CDROM_MSF */
-	int nframes;           /* number of 2352-byte-frames to read at once */
-	__u8 *buf;      /* frame buffer (size: nframes*2352 bytes) */
-};
-
-/* This struct is used with the CDROMMULTISESSION ioctl */
-struct cdrom_multisession
-{
-	union cdrom_addr addr; /* frame address: start-of-last-session 
-	                           (not the new "frame 16"!).  Only valid
-	                           if the "xa_flag" is true. */
-	__u8 xa_flag;        /* 1: "is XA disk" */
-	__u8 addr_format;    /* CDROM_LBA or CDROM_MSF */
-};
-
-/* This struct is used with the CDROM_GET_MCN ioctl.  
- * Very few audio discs actually have Universal Product Code information, 
- * which should just be the Medium Catalog Number on the box.  Also note 
- * that the way the codeis written on CD is _not_ uniform across all discs!
- */  
-struct cdrom_mcn 
-{
-  __u8 medium_catalog_number[14]; /* 13 ASCII digits, null-terminated */
-};
-
-/* This is used by the CDROMPLAYBLK ioctl */
-struct cdrom_blk 
-{
-	unsigned from;
-	unsigned short len;
-};
-
-#define CDROM_PACKET_SIZE	12
-
-#define CGC_DATA_UNKNOWN	0
-#define CGC_DATA_WRITE		1
-#define CGC_DATA_READ		2
-#define CGC_DATA_NONE		3
-
-/* for CDROM_PACKET_COMMAND ioctl */
-struct cdrom_generic_command
-{
-	unsigned char 		cmd[CDROM_PACKET_SIZE];
-	unsigned char		*buffer;
-	unsigned int 		buflen;
-	int			stat;
-	struct request_sense	*sense;
-	unsigned char		data_direction;
-	int			quiet;
-	int			timeout;
-	void			*reserved[1];	/* unused, actually */
-};
-
-/*
- * A CD-ROM physical sector size is 2048, 2052, 2056, 2324, 2332, 2336, 
- * 2340, or 2352 bytes long.  
-
-*         Sector types of the standard CD-ROM data formats:
- *
- * format   sector type               user data size (bytes)
- * -----------------------------------------------------------------------------
- *   1     (Red Book)    CD-DA          2352    (CD_FRAMESIZE_RAW)
- *   2     (Yellow Book) Mode1 Form1    2048    (CD_FRAMESIZE)
- *   3     (Yellow Book) Mode1 Form2    2336    (CD_FRAMESIZE_RAW0)
- *   4     (Green Book)  Mode2 Form1    2048    (CD_FRAMESIZE)
- *   5     (Green Book)  Mode2 Form2    2328    (2324+4 spare bytes)
- *
- *
- *       The layout of the standard CD-ROM data formats:
- * -----------------------------------------------------------------------------
- * - audio (red):                  | audio_sample_bytes |
- *                                 |        2352        |
- *
- * - data (yellow, mode1):         | sync - head - data - EDC - zero - ECC |
- *                                 |  12  -   4  - 2048 -  4  -   8  - 276 |
- *
- * - data (yellow, mode2):         | sync - head - data |
- *                                 |  12  -   4  - 2336 |
- *
- * - XA data (green, mode2 form1): | sync - head - sub - data - EDC - ECC |
- *                                 |  12  -   4  -  8  - 2048 -  4  - 276 |
- *
- * - XA data (green, mode2 form2): | sync - head - sub - data - Spare |
- *                                 |  12  -   4  -  8  - 2324 -  4    |
- *
- */
-
-/* Some generally useful CD-ROM information -- mostly based on the above */
-#define CD_MINS              74 /* max. minutes per CD, not really a limit */
-#define CD_SECS              60 /* seconds per minute */
-#define CD_FRAMES            75 /* frames per second */
-#define CD_SYNC_SIZE         12 /* 12 sync bytes per raw data frame */
-#define CD_MSF_OFFSET       150 /* MSF numbering offset of first frame */
-#define CD_CHUNK_SIZE        24 /* lowest-level "data bytes piece" */
-#define CD_NUM_OF_CHUNKS     98 /* chunks per frame */
-#define CD_FRAMESIZE_SUB     96 /* subchannel data "frame" size */
-#define CD_HEAD_SIZE          4 /* header (address) bytes per raw data frame */
-#define CD_SUBHEAD_SIZE       8 /* subheader bytes per raw XA data frame */
-#define CD_EDC_SIZE           4 /* bytes EDC per most raw data frame types */
-#define CD_ZERO_SIZE          8 /* bytes zero per yellow book mode 1 frame */
-#define CD_ECC_SIZE         276 /* bytes ECC per most raw data frame types */
-#define CD_FRAMESIZE       2048 /* bytes per frame, "cooked" mode */
-#define CD_FRAMESIZE_RAW   2352 /* bytes per frame, "raw" mode */
-#define CD_FRAMESIZE_RAWER 2646 /* The maximum possible returned bytes */ 
-/* most drives don't deliver everything: */
-#define CD_FRAMESIZE_RAW1 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE) /*2340*/
-#define CD_FRAMESIZE_RAW0 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE) /*2336*/
-
-#define CD_XA_HEAD        (CD_HEAD_SIZE+CD_SUBHEAD_SIZE) /* "before data" part of raw XA frame */
-#define CD_XA_TAIL        (CD_EDC_SIZE+CD_ECC_SIZE) /* "after data" part of raw XA frame */
-#define CD_XA_SYNC_HEAD   (CD_SYNC_SIZE+CD_XA_HEAD) /* sync bytes + header of XA frame */
-
-/* CD-ROM address types (cdrom_tocentry.cdte_format) */
-#define	CDROM_LBA 0x01 /* "logical block": first frame is #0 */
-#define	CDROM_MSF 0x02 /* "minute-second-frame": binary, not bcd here! */
-
-/* bit to tell whether track is data or audio (cdrom_tocentry.cdte_ctrl) */
-#define	CDROM_DATA_TRACK	0x04
-
-/* The leadout track is always 0xAA, regardless of # of tracks on disc */
-#define	CDROM_LEADOUT		0xAA
-
-/* audio states (from SCSI-2, but seen with other drives, too) */
-#define	CDROM_AUDIO_INVALID	0x00	/* audio status not supported */
-#define	CDROM_AUDIO_PLAY	0x11	/* audio play operation in progress */
-#define	CDROM_AUDIO_PAUSED	0x12	/* audio play operation paused */
-#define	CDROM_AUDIO_COMPLETED	0x13	/* audio play successfully completed */
-#define	CDROM_AUDIO_ERROR	0x14	/* audio play stopped due to error */
-#define	CDROM_AUDIO_NO_STATUS	0x15	/* no current audio status to return */
-
-/* capability flags used with the uniform CD-ROM driver */ 
-#define CDC_CLOSE_TRAY		0x1     /* caddy systems _can't_ close */
-#define CDC_OPEN_TRAY		0x2     /* but _can_ eject.  */
-#define CDC_LOCK		0x4     /* disable manual eject */
-#define CDC_SELECT_SPEED 	0x8     /* programmable speed */
-#define CDC_SELECT_DISC		0x10    /* select disc from juke-box */
-#define CDC_MULTI_SESSION 	0x20    /* read sessions>1 */
-#define CDC_MCN			0x40    /* Medium Catalog Number */
-#define CDC_MEDIA_CHANGED 	0x80    /* media changed */
-#define CDC_PLAY_AUDIO		0x100   /* audio functions */
-#define CDC_RESET               0x200   /* hard reset device */
-#define CDC_DRIVE_STATUS        0x800   /* driver implements drive status */
-#define CDC_GENERIC_PACKET	0x1000	/* driver implements generic packets */
-#define CDC_CD_R		0x2000	/* drive is a CD-R */
-#define CDC_CD_RW		0x4000	/* drive is a CD-RW */
-#define CDC_DVD			0x8000	/* drive is a DVD */
-#define CDC_DVD_R		0x10000	/* drive can write DVD-R */
-#define CDC_DVD_RAM		0x20000	/* drive can write DVD-RAM */
-#define CDC_MO_DRIVE		0x40000 /* drive is an MO device */
-#define CDC_MRW			0x80000 /* drive can read MRW */
-#define CDC_MRW_W		0x100000 /* drive can write MRW */
-#define CDC_RAM			0x200000 /* ok to open for WRITE */
-
-/* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
-#define CDS_NO_INFO		0	/* if not implemented */
-#define CDS_NO_DISC		1
-#define CDS_TRAY_OPEN		2
-#define CDS_DRIVE_NOT_READY	3
-#define CDS_DISC_OK		4
-
-/* return values for the CDROM_DISC_STATUS ioctl */
-/* can also return CDS_NO_[INFO|DISC], from above */
-#define CDS_AUDIO		100
-#define CDS_DATA_1		101
-#define CDS_DATA_2		102
-#define CDS_XA_2_1		103
-#define CDS_XA_2_2		104
-#define CDS_MIXED		105
-
-/* User-configurable behavior options for the uniform CD-ROM driver */
-#define CDO_AUTO_CLOSE		0x1     /* close tray on first open() */
-#define CDO_AUTO_EJECT		0x2     /* open tray on last release() */
-#define CDO_USE_FFLAGS		0x4     /* use O_NONBLOCK information on open */
-#define CDO_LOCK		0x8     /* lock tray on open files */
-#define CDO_CHECK_TYPE		0x10    /* check type on open for data */
-
-/* Special codes used when specifying changer slots. */
-#define CDSL_NONE       	(INT_MAX-1)
-#define CDSL_CURRENT    	INT_MAX
-
-/* For partition based multisession access. IDE can handle 64 partitions
- * per drive - SCSI CD-ROM's use minors to differentiate between the
- * various drives, so we can't do multisessions the same way there.
- * Use the -o session=x option to mount on them.
- */
-#define CD_PART_MAX		64
-#define CD_PART_MASK		(CD_PART_MAX - 1)
-
-/*********************************************************************
- * Generic Packet commands, MMC commands, and such
- *********************************************************************/
-
- /* The generic packet command opcodes for CD/DVD Logical Units,
- * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
-#define GPCMD_BLANK			    0xa1
-#define GPCMD_CLOSE_TRACK		    0x5b
-#define GPCMD_FLUSH_CACHE		    0x35
-#define GPCMD_FORMAT_UNIT		    0x04
-#define GPCMD_GET_CONFIGURATION		    0x46
-#define GPCMD_GET_EVENT_STATUS_NOTIFICATION 0x4a
-#define GPCMD_GET_PERFORMANCE		    0xac
-#define GPCMD_INQUIRY			    0x12
-#define GPCMD_LOAD_UNLOAD		    0xa6
-#define GPCMD_MECHANISM_STATUS		    0xbd
-#define GPCMD_MODE_SELECT_10		    0x55
-#define GPCMD_MODE_SENSE_10		    0x5a
-#define GPCMD_PAUSE_RESUME		    0x4b
-#define GPCMD_PLAY_AUDIO_10		    0x45
-#define GPCMD_PLAY_AUDIO_MSF		    0x47
-#define GPCMD_PLAY_AUDIO_TI		    0x48
-#define GPCMD_PLAY_CD			    0xbc
-#define GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL  0x1e
-#define GPCMD_READ_10			    0x28
-#define GPCMD_READ_12			    0xa8
-#define GPCMD_READ_BUFFER		    0x3c
-#define GPCMD_READ_BUFFER_CAPACITY	    0x5c
-#define GPCMD_READ_CDVD_CAPACITY	    0x25
-#define GPCMD_READ_CD			    0xbe
-#define GPCMD_READ_CD_MSF		    0xb9
-#define GPCMD_READ_DISC_INFO		    0x51
-#define GPCMD_READ_DVD_STRUCTURE	    0xad
-#define GPCMD_READ_FORMAT_CAPACITIES	    0x23
-#define GPCMD_READ_HEADER		    0x44
-#define GPCMD_READ_TRACK_RZONE_INFO	    0x52
-#define GPCMD_READ_SUBCHANNEL		    0x42
-#define GPCMD_READ_TOC_PMA_ATIP		    0x43
-#define GPCMD_REPAIR_RZONE_TRACK	    0x58
-#define GPCMD_REPORT_KEY		    0xa4
-#define GPCMD_REQUEST_SENSE		    0x03
-#define GPCMD_RESERVE_RZONE_TRACK	    0x53
-#define GPCMD_SEND_CUE_SHEET		    0x5d
-#define GPCMD_SCAN			    0xba
-#define GPCMD_SEEK			    0x2b
-#define GPCMD_SEND_DVD_STRUCTURE	    0xbf
-#define GPCMD_SEND_EVENT		    0xa2
-#define GPCMD_SEND_KEY			    0xa3
-#define GPCMD_SEND_OPC			    0x54
-#define GPCMD_SET_READ_AHEAD		    0xa7
-#define GPCMD_SET_STREAMING		    0xb6
-#define GPCMD_START_STOP_UNIT		    0x1b
-#define GPCMD_STOP_PLAY_SCAN		    0x4e
-#define GPCMD_TEST_UNIT_READY		    0x00
-#define GPCMD_VERIFY_10			    0x2f
-#define GPCMD_WRITE_10			    0x2a
-#define GPCMD_WRITE_12			    0xaa
-#define GPCMD_WRITE_AND_VERIFY_10	    0x2e
-#define GPCMD_WRITE_BUFFER		    0x3b
-/* This is listed as optional in ATAPI 2.6, but is (curiously) 
- * missing from Mt. Fuji, Table 57.  It _is_ mentioned in Mt. Fuji
- * Table 377 as an MMC command for SCSi devices though...  Most ATAPI
- * drives support it. */
-#define GPCMD_SET_SPEED			    0xbb
-/* This seems to be a SCSI specific CD-ROM opcode 
- * to play data at track/index */
-#define GPCMD_PLAYAUDIO_TI		    0x48
-/*
- * From MS Media Status Notification Support Specification. For
- * older drives only.
- */
-#define GPCMD_GET_MEDIA_STATUS		    0xda
-
-/* Mode page codes for mode sense/set */
-#define GPMODE_VENDOR_PAGE		0x00
-#define GPMODE_R_W_ERROR_PAGE		0x01
-#define GPMODE_WRITE_PARMS_PAGE		0x05
-#define GPMODE_WCACHING_PAGE		0x08
-#define GPMODE_AUDIO_CTL_PAGE		0x0e
-#define GPMODE_POWER_PAGE		0x1a
-#define GPMODE_FAULT_FAIL_PAGE		0x1c
-#define GPMODE_TO_PROTECT_PAGE		0x1d
-#define GPMODE_CAPABILITIES_PAGE	0x2a
-#define GPMODE_ALL_PAGES		0x3f
-/* Not in Mt. Fuji, but in ATAPI 2.6 -- deprecated now in favor
- * of MODE_SENSE_POWER_PAGE */
-#define GPMODE_CDROM_PAGE		0x0d
-
-
-
-/* DVD struct types */
-#define DVD_STRUCT_PHYSICAL	0x00
-#define DVD_STRUCT_COPYRIGHT	0x01
-#define DVD_STRUCT_DISCKEY	0x02
-#define DVD_STRUCT_BCA		0x03
-#define DVD_STRUCT_MANUFACT	0x04
-
-struct dvd_layer {
-	__u8 book_version	: 4;
-	__u8 book_type		: 4;
-	__u8 min_rate		: 4;
-	__u8 disc_size		: 4;
-	__u8 layer_type		: 4;
-	__u8 track_path		: 1;
-	__u8 nlayers		: 2;
-	__u8 track_density	: 4;
-	__u8 linear_density	: 4;
-	__u8 bca		: 1;
-	__u32 start_sector;
-	__u32 end_sector;
-	__u32 end_sector_l0;
-};
-
-#define DVD_LAYERS	4
-
-struct dvd_physical {
-	__u8 type;
-	__u8 layer_num;
-	struct dvd_layer layer[DVD_LAYERS];
-};
-
-struct dvd_copyright {
-	__u8 type;
-
-	__u8 layer_num;
-	__u8 cpst;
-	__u8 rmi;
-};
-
-struct dvd_disckey {
-	__u8 type;
-
-	unsigned agid		: 2;
-	__u8 value[2048];
-};
-
-struct dvd_bca {
-	__u8 type;
-
-	int len;
-	__u8 value[188];
-};
-
-struct dvd_manufact {
-	__u8 type;
-
-	__u8 layer_num;
-	int len;
-	__u8 value[2048];
-};
-
-typedef union {
-	__u8 type;
-
-	struct dvd_physical	physical;
-	struct dvd_copyright	copyright;
-	struct dvd_disckey	disckey;
-	struct dvd_bca		bca;
-	struct dvd_manufact	manufact;
-} dvd_struct;
-
-/*
- * DVD authentication ioctl
- */
-
-/* Authentication states */
-#define DVD_LU_SEND_AGID	0
-#define DVD_HOST_SEND_CHALLENGE	1
-#define DVD_LU_SEND_KEY1	2
-#define DVD_LU_SEND_CHALLENGE	3
-#define DVD_HOST_SEND_KEY2	4
-
-/* Termination states */
-#define DVD_AUTH_ESTABLISHED	5
-#define DVD_AUTH_FAILURE	6
-
-/* Other functions */
-#define DVD_LU_SEND_TITLE_KEY	7
-#define DVD_LU_SEND_ASF		8
-#define DVD_INVALIDATE_AGID	9
-#define DVD_LU_SEND_RPC_STATE	10
-#define DVD_HOST_SEND_RPC_STATE	11
-
-/* State data */
-typedef __u8 dvd_key[5];		/* 40-bit value, MSB is first elem. */
-typedef __u8 dvd_challenge[10];	/* 80-bit value, MSB is first elem. */
-
-struct dvd_lu_send_agid {
-	__u8 type;
-	unsigned agid		: 2;
-};
-
-struct dvd_host_send_challenge {
-	__u8 type;
-	unsigned agid		: 2;
-
-	dvd_challenge chal;
-};
-
-struct dvd_send_key {
-	__u8 type;
-	unsigned agid		: 2;
-
-	dvd_key key;
-};
-
-struct dvd_lu_send_challenge {
-	__u8 type;
-	unsigned agid		: 2;
-
-	dvd_challenge chal;
-};
-
-#define DVD_CPM_NO_COPYRIGHT	0
-#define DVD_CPM_COPYRIGHTED	1
-
-#define DVD_CP_SEC_NONE		0
-#define DVD_CP_SEC_EXIST	1
-
-#define DVD_CGMS_UNRESTRICTED	0
-#define DVD_CGMS_SINGLE		2
-#define DVD_CGMS_RESTRICTED	3
-
-struct dvd_lu_send_title_key {
-	__u8 type;
-	unsigned agid		: 2;
-
-	dvd_key title_key;
-	int lba;
-	unsigned cpm		: 1;
-	unsigned cp_sec		: 1;
-	unsigned cgms		: 2;
-};
-
-struct dvd_lu_send_asf {
-	__u8 type;
-	unsigned agid		: 2;
-
-	unsigned asf		: 1;
-};
-
-struct dvd_host_send_rpcstate {
-	__u8 type;
-	__u8 pdrc;
-};
-
-struct dvd_lu_send_rpcstate {
-	__u8 type		: 2;
-	__u8 vra		: 3;
-	__u8 ucca		: 3;
-	__u8 region_mask;
-	__u8 rpc_scheme;
-};
-
-typedef union {
-	__u8 type;
-
-	struct dvd_lu_send_agid		lsa;
-	struct dvd_host_send_challenge	hsc;
-	struct dvd_send_key		lsk;
-	struct dvd_lu_send_challenge	lsc;
-	struct dvd_send_key		hsk;
-	struct dvd_lu_send_title_key	lstk;
-	struct dvd_lu_send_asf		lsasf;
-	struct dvd_host_send_rpcstate	hrpcs;
-	struct dvd_lu_send_rpcstate	lrpcs;
-} dvd_authinfo;
-
-struct request_sense {
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 valid		: 1;
-	__u8 error_code		: 7;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 error_code		: 7;
-	__u8 valid		: 1;
-#endif
-	__u8 segment_number;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 reserved1		: 2;
-	__u8 ili		: 1;
-	__u8 reserved2		: 1;
-	__u8 sense_key		: 4;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 sense_key		: 4;
-	__u8 reserved2		: 1;
-	__u8 ili		: 1;
-	__u8 reserved1		: 2;
-#endif
-	__u8 information[4];
-	__u8 add_sense_len;
-	__u8 command_info[4];
-	__u8 asc;
-	__u8 ascq;
-	__u8 fruc;
-	__u8 sks[3];
-	__u8 asb[46];
-};
-
-/*
- * feature profile
- */
-#define CDF_RWRT	0x0020	/* "Random Writable" */
-#define CDF_HWDM	0x0024	/* "Hardware Defect Management" */
-#define CDF_MRW 	0x0028
-
-/*
- * media status bits
- */
-#define CDM_MRW_NOTMRW			0
-#define CDM_MRW_BGFORMAT_INACTIVE	1
-#define CDM_MRW_BGFORMAT_ACTIVE		2
-#define CDM_MRW_BGFORMAT_COMPLETE	3
-
-/*
- * mrw address spaces
- */
-#define MRW_LBA_DMA			0
-#define MRW_LBA_GAA			1
-
-/*
- * mrw mode pages (first is deprecated) -- probed at init time and
- * cdi->mrw_mode_page is set
- */
-#define MRW_MODE_PC_PRE1		0x2c
-#define MRW_MODE_PC			0x03
-
-struct mrw_feature_desc {
-	__be16 feature_code;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 reserved1		: 2;
-	__u8 feature_version	: 4;
-	__u8 persistent		: 1;
-	__u8 curr		: 1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 curr		: 1;
-	__u8 persistent		: 1;
-	__u8 feature_version	: 4;
-	__u8 reserved1		: 2;
-#endif
-	__u8 add_len;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 reserved2		: 7;
-	__u8 write		: 1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 write		: 1;
-	__u8 reserved2		: 7;
-#endif
-	__u8 reserved3;
-	__u8 reserved4;
-	__u8 reserved5;
-};
-
-/* cf. mmc4r02g.pdf 5.3.10 Random Writable Feature (0020h) pg 197 of 635 */
-struct rwrt_feature_desc {
-	__be16 feature_code;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 reserved1		: 2;
-	__u8 feature_version	: 4;
-	__u8 persistent		: 1;
-	__u8 curr		: 1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 curr		: 1;
-	__u8 persistent		: 1;
-	__u8 feature_version	: 4;
-	__u8 reserved1		: 2;
-#endif
-	__u8 add_len;
-	__u32 last_lba;
-	__u32 block_size;
-	__u16 blocking;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 reserved2		: 7;
-	__u8 page_present	: 1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 page_present	: 1;
-	__u8 reserved2		: 7;
-#endif
-	__u8 reserved3;
-};
-
-typedef struct {
-	__be16 disc_information_length;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 reserved1			: 3;
-        __u8 erasable			: 1;
-        __u8 border_status		: 2;
-        __u8 disc_status		: 2;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 disc_status		: 2;
-        __u8 border_status		: 2;
-        __u8 erasable			: 1;
-	__u8 reserved1			: 3;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-	__u8 n_first_track;
-	__u8 n_sessions_lsb;
-	__u8 first_track_lsb;
-	__u8 last_track_lsb;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 did_v			: 1;
-        __u8 dbc_v			: 1;
-        __u8 uru			: 1;
-        __u8 reserved2			: 2;
-	__u8 dbit			: 1;
-	__u8 mrw_status			: 2;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 mrw_status			: 2;
-	__u8 dbit			: 1;
-        __u8 reserved2			: 2;
-        __u8 uru			: 1;
-        __u8 dbc_v			: 1;
-	__u8 did_v			: 1;
-#endif
-	__u8 disc_type;
-	__u8 n_sessions_msb;
-	__u8 first_track_msb;
-	__u8 last_track_msb;
-	__u32 disc_id;
-	__u32 lead_in;
-	__u32 lead_out;
-	__u8 disc_bar_code[8];
-	__u8 reserved3;
-	__u8 n_opc;
-} disc_information;
-
-typedef struct {
-	__be16 track_information_length;
-	__u8 track_lsb;
-	__u8 session_lsb;
-	__u8 reserved1;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 reserved2			: 2;
-        __u8 damage			: 1;
-        __u8 copy			: 1;
-        __u8 track_mode			: 4;
-	__u8 rt				: 1;
-	__u8 blank			: 1;
-	__u8 packet			: 1;
-	__u8 fp				: 1;
-	__u8 data_mode			: 4;
-	__u8 reserved3			: 6;
-	__u8 lra_v			: 1;
-	__u8 nwa_v			: 1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 track_mode			: 4;
-        __u8 copy			: 1;
-        __u8 damage			: 1;
-	__u8 reserved2			: 2;
-	__u8 data_mode			: 4;
-	__u8 fp				: 1;
-	__u8 packet			: 1;
-	__u8 blank			: 1;
-	__u8 rt				: 1;
-	__u8 nwa_v			: 1;
-	__u8 lra_v			: 1;
-	__u8 reserved3			: 6;
-#endif
-	__be32 track_start;
-	__be32 next_writable;
-	__be32 free_blocks;
-	__be32 fixed_packet_size;
-	__be32 track_size;
-	__be32 last_rec_address;
-} track_information;
-
-struct feature_header {
-	__u32 data_len;
-	__u8 reserved1;
-	__u8 reserved2;
-	__u16 curr_profile;
-};
-
-struct mode_page_header {
-	__be16 mode_data_length;
-	__u8 medium_type;
-	__u8 reserved1;
-	__u8 reserved2;
-	__u8 reserved3;
-	__be16 desc_length;
-};
-
-/* removable medium feature descriptor */
-struct rm_feature_desc {
-	__be16 feature_code;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 reserved1:2;
-	__u8 feature_version:4;
-	__u8 persistent:1;
-	__u8 curr:1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 curr:1;
-	__u8 persistent:1;
-	__u8 feature_version:4;
-	__u8 reserved1:2;
-#endif
-	__u8 add_len;
-#if defined(__BIG_ENDIAN_BITFIELD)
-	__u8 mech_type:3;
-	__u8 load:1;
-	__u8 eject:1;
-	__u8 pvnt_jmpr:1;
-	__u8 dbml:1;
-	__u8 lock:1;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 lock:1;
-	__u8 dbml:1;
-	__u8 pvnt_jmpr:1;
-	__u8 eject:1;
-	__u8 load:1;
-	__u8 mech_type:3;
-#endif
-	__u8 reserved2;
-	__u8 reserved3;
-	__u8 reserved4;
-};
-
-#endif /* _LINUX_CDROM_H */
diff --git a/openflow/usr/include/linux/cgroupstats.h b/openflow/usr/include/linux/cgroupstats.h
deleted file mode 100644
index 3753c33..0000000
--- a/openflow/usr/include/linux/cgroupstats.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* cgroupstats.h - exporting per-cgroup statistics
- *
- * Copyright IBM Corporation, 2007
- * Author Balbir Singh <balbir@linux.vnet.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2.1 of the GNU Lesser General Public License
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef _LINUX_CGROUPSTATS_H
-#define _LINUX_CGROUPSTATS_H
-
-#include <linux/types.h>
-#include <linux/taskstats.h>
-
-/*
- * Data shared between user space and kernel space on a per cgroup
- * basis. This data is shared using taskstats.
- *
- * Most of these states are derived by looking at the task->state value
- * For the nr_io_wait state, a flag in the delay accounting structure
- * indicates that the task is waiting on IO
- *
- * Each member is aligned to a 8 byte boundary.
- */
-struct cgroupstats {
-	__u64	nr_sleeping;		/* Number of tasks sleeping */
-	__u64	nr_running;		/* Number of tasks running */
-	__u64	nr_stopped;		/* Number of tasks in stopped state */
-	__u64	nr_uninterruptible;	/* Number of tasks in uninterruptible */
-					/* state */
-	__u64	nr_io_wait;		/* Number of tasks waiting on IO */
-};
-
-/*
- * Commands sent from userspace
- * Not versioned. New commands should only be inserted at the enum's end
- * prior to __CGROUPSTATS_CMD_MAX
- */
-
-enum {
-	CGROUPSTATS_CMD_UNSPEC = __TASKSTATS_CMD_MAX,	/* Reserved */
-	CGROUPSTATS_CMD_GET,		/* user->kernel request/get-response */
-	CGROUPSTATS_CMD_NEW,		/* kernel->user event */
-	__CGROUPSTATS_CMD_MAX,
-};
-
-#define CGROUPSTATS_CMD_MAX (__CGROUPSTATS_CMD_MAX - 1)
-
-enum {
-	CGROUPSTATS_TYPE_UNSPEC = 0,	/* Reserved */
-	CGROUPSTATS_TYPE_CGROUP_STATS,	/* contains name + stats */
-	__CGROUPSTATS_TYPE_MAX,
-};
-
-#define CGROUPSTATS_TYPE_MAX (__CGROUPSTATS_TYPE_MAX - 1)
-
-enum {
-	CGROUPSTATS_CMD_ATTR_UNSPEC = 0,
-	CGROUPSTATS_CMD_ATTR_FD,
-	__CGROUPSTATS_CMD_ATTR_MAX,
-};
-
-#define CGROUPSTATS_CMD_ATTR_MAX (__CGROUPSTATS_CMD_ATTR_MAX - 1)
-
-#endif /* _LINUX_CGROUPSTATS_H */
diff --git a/openflow/usr/include/linux/chio.h b/openflow/usr/include/linux/chio.h
deleted file mode 100644
index e97cd98..0000000
--- a/openflow/usr/include/linux/chio.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * ioctl interface for the scsi media changer driver
- */
-
-/* changer element types */
-#define CHET_MT   0	/* media transport element (robot) */
-#define CHET_ST   1	/* storage element (media slots) */
-#define CHET_IE   2	/* import/export element */
-#define CHET_DT   3	/* data transfer element (tape/cdrom/whatever) */
-#define CHET_V1   4	/* vendor specific #1 */
-#define CHET_V2   5	/* vendor specific #2 */
-#define CHET_V3   6	/* vendor specific #3 */
-#define CHET_V4   7	/* vendor specific #4 */
-
-
-/*
- * CHIOGPARAMS
- *    query changer properties
- *
- * CHIOVGPARAMS
- *    query vendor-specific element types
- *
- *    accessing elements works by specifing type and unit of the element.
- *    for example, storage elements are addressed with type = CHET_ST and
- *    unit = 0 .. cp_nslots-1
- *
- */
-struct changer_params {
-	int cp_curpicker;  /* current transport element */
-	int cp_npickers;   /* number of transport elements      (CHET_MT) */
-	int cp_nslots;     /* number of storage elements        (CHET_ST) */
-	int cp_nportals;   /* number of import/export elements  (CHET_IE) */
-	int cp_ndrives;    /* number of data transfer elements  (CHET_DT) */
-};
-struct changer_vendor_params {
-	int  cvp_n1;       /* number of vendor specific elems   (CHET_V1) */
-	char cvp_label1[16];
-	int  cvp_n2;       /* number of vendor specific elems   (CHET_V2) */
-	char cvp_label2[16];
-	int  cvp_n3;       /* number of vendor specific elems   (CHET_V3) */
-	char cvp_label3[16];
-	int  cvp_n4;       /* number of vendor specific elems   (CHET_V4) */
-	char cvp_label4[16];
-	int  reserved[8];
-};
-
-
-/*
- * CHIOMOVE
- *    move a medium from one element to another
- */
-struct changer_move {
-	int cm_fromtype;	/* type/unit of source element */
-	int cm_fromunit;	
-	int cm_totype;	/* type/unit of destination element */
-	int cm_tounit;
-	int cm_flags;
-};
-#define CM_INVERT   1   /* flag: rotate media (for double-sided like MOD) */
-
-
-/*
- * CHIOEXCHANGE
- *    move one medium from element #1 to element #2,
- *    and another one from element #2 to element #3.
- *    element #1 and #3 are allowed to be identical.
- */
-struct changer_exchange {
-	int ce_srctype;	    /* type/unit of element #1 */
-	int ce_srcunit;
-	int ce_fdsttype;    /* type/unit of element #2 */
-	int ce_fdstunit;
-	int ce_sdsttype;    /* type/unit of element #3 */
-	int ce_sdstunit;
-	int ce_flags;
-};
-#define CE_INVERT1   1
-#define CE_INVERT2   2
-
-
-/*
- * CHIOPOSITION
- *    move the transport element (robot arm) to a specific element.
- */
-struct changer_position {
-	int cp_type;
-	int cp_unit;
-	int cp_flags;
-};
-#define CP_INVERT   1
-
-
-/*
- * CHIOGSTATUS
- *    get element status for all elements of a specific type
- */
-struct changer_element_status {
-	int             ces_type;
-	unsigned char   *ces_data;
-};
-#define CESTATUS_FULL     0x01 /* full */
-#define CESTATUS_IMPEXP   0x02	/* media was imported (inserted by sysop) */
-#define CESTATUS_EXCEPT   0x04	/* error condition */
-#define CESTATUS_ACCESS   0x08	/* access allowed */
-#define CESTATUS_EXENAB   0x10	/* element can export media */
-#define CESTATUS_INENAB   0x20	/* element can import media */
-
-
-/*
- * CHIOGELEM
- *    get more detailed status information for a single element
- */
-struct changer_get_element {
-	int	cge_type;	 /* type/unit */
-	int	cge_unit;
-	int	cge_status;      /* status */
-	int     cge_errno;       /* errno */
-	int     cge_srctype;     /* source element of the last move/exchange */
-	int     cge_srcunit;
-	int     cge_id;          /* scsi id  (for data transfer elements) */
-	int     cge_lun;         /* scsi lun (for data transfer elements) */
-	char    cge_pvoltag[36]; /* primary volume tag */
-	char    cge_avoltag[36]; /* alternate volume tag */
-	int     cge_flags;
-};
-/* flags */
-#define CGE_ERRNO     0x01       /* errno available       */
-#define CGE_INVERT    0x02       /* media inverted        */
-#define CGE_SRC       0x04       /* media src available   */
-#define CGE_IDLUN     0x08       /* ID+LUN available      */
-#define CGE_PVOLTAG   0x10       /* primary volume tag available */
-#define CGE_AVOLTAG   0x20       /* alternate volume tag available */
-
-
-/*
- * CHIOSVOLTAG
- *    set volume tag
- */
-struct changer_set_voltag {
-	int	csv_type;	 /* type/unit */
-	int	csv_unit;
-	char    csv_voltag[36];  /* volume tag */
-	int     csv_flags;
-};
-#define CSV_PVOLTAG   0x01       /* primary volume tag */
-#define CSV_AVOLTAG   0x02       /* alternate volume tag */
-#define CSV_CLEARTAG  0x04       /* clear volume tag */
-
-/* ioctls */
-#define CHIOMOVE       _IOW('c', 1,struct changer_move)
-#define CHIOEXCHANGE   _IOW('c', 2,struct changer_exchange)
-#define CHIOPOSITION   _IOW('c', 3,struct changer_position)
-#define CHIOGPICKER    _IOR('c', 4,int)                        /* not impl. */
-#define CHIOSPICKER    _IOW('c', 5,int)                        /* not impl. */
-#define CHIOGPARAMS    _IOR('c', 6,struct changer_params)
-#define CHIOGSTATUS    _IOW('c', 8,struct changer_element_status)
-#define CHIOGELEM      _IOW('c',16,struct changer_get_element)
-#define CHIOINITELEM   _IO('c',17)
-#define CHIOSVOLTAG    _IOW('c',18,struct changer_set_voltag)
-#define CHIOGVPARAMS   _IOR('c',19,struct changer_vendor_params)
-
-/* ---------------------------------------------------------------------- */
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/openflow/usr/include/linux/cm4000_cs.h b/openflow/usr/include/linux/cm4000_cs.h
deleted file mode 100644
index f912e74..0000000
--- a/openflow/usr/include/linux/cm4000_cs.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef _CM4000_H_
-#define _CM4000_H_
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-#define	MAX_ATR			33
-
-#define	CM4000_MAX_DEV		4
-
-/* those two structures are passed via ioctl() from/to userspace.  They are
- * used by existing userspace programs, so I kepth the awkward "bIFSD" naming
- * not to break compilation of userspace apps. -HW */
-
-typedef struct atreq {
-	__s32 atr_len;
-	unsigned char atr[64];
-	__s32 power_act;
-	unsigned char bIFSD;
-	unsigned char bIFSC;
-} atreq_t;
-
-
-/* what is particularly stupid in the original driver is the arch-dependent
- * member sizes. This leads to CONFIG_COMPAT breakage, since 32bit userspace
- * will lay out the structure members differently than the 64bit kernel.
- *
- * I've changed "ptsreq.protocol" from "unsigned long" to "__u32".
- * On 32bit this will make no difference.  With 64bit kernels, it will make
- * 32bit apps work, too.
- */
-
-typedef struct ptsreq {
-	__u32 protocol; /*T=0: 2^0, T=1:  2^1*/
- 	unsigned char flags;
- 	unsigned char pts1;
- 	unsigned char pts2;
-	unsigned char pts3;
-} ptsreq_t;
-
-#define	CM_IOC_MAGIC		'c'
-#define	CM_IOC_MAXNR	        255
-
-#define	CM_IOCGSTATUS		_IOR (CM_IOC_MAGIC, 0, unsigned char *)
-#define	CM_IOCGATR		_IOWR(CM_IOC_MAGIC, 1, atreq_t *)
-#define	CM_IOCSPTS		_IOW (CM_IOC_MAGIC, 2, ptsreq_t *)
-#define	CM_IOCSRDR		_IO  (CM_IOC_MAGIC, 3)
-#define CM_IOCARDOFF            _IO  (CM_IOC_MAGIC, 4)
-
-#define CM_IOSDBGLVL            _IOW(CM_IOC_MAGIC, 250, int*)
-
-/* card and device states */
-#define	CM_CARD_INSERTED		0x01
-#define	CM_CARD_POWERED			0x02
-#define	CM_ATR_PRESENT			0x04
-#define	CM_ATR_VALID	 		0x08
-#define	CM_STATE_VALID			0x0f
-/* extra info only from CM4000 */
-#define	CM_NO_READER			0x10
-#define	CM_BAD_CARD			0x20
-
-
-#endif /* _CM4000_H_ */
diff --git a/openflow/usr/include/linux/cn_proc.h b/openflow/usr/include/linux/cn_proc.h
deleted file mode 100644
index bf22f5c..0000000
--- a/openflow/usr/include/linux/cn_proc.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * cn_proc.h - process events connector
- *
- * Copyright (C) Matt Helsley, IBM Corp. 2005
- * Based on cn_fork.h by Nguyen Anh Quynh and Guillaume Thouvenin
- * Copyright (C) 2005 Nguyen Anh Quynh <aquynh@gmail.com>
- * Copyright (C) 2005 Guillaume Thouvenin <guillaume.thouvenin@bull.net>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2.1 of the GNU Lesser General Public License
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef CN_PROC_H
-#define CN_PROC_H
-
-#include <linux/types.h>
-
-/*
- * Userspace sends this enum to register with the kernel that it is listening
- * for events on the connector.
- */
-enum proc_cn_mcast_op {
-	PROC_CN_MCAST_LISTEN = 1,
-	PROC_CN_MCAST_IGNORE = 2
-};
-
-/*
- * From the user's point of view, the process
- * ID is the thread group ID and thread ID is the internal
- * kernel "pid". So, fields are assigned as follow:
- *
- *  In user space     -  In  kernel space
- *
- * parent process ID  =  parent->tgid
- * parent thread  ID  =  parent->pid
- * child  process ID  =  child->tgid
- * child  thread  ID  =  child->pid
- */
-
-struct proc_event {
-	enum what {
-		/* Use successive bits so the enums can be used to record
-		 * sets of events as well
-		 */
-		PROC_EVENT_NONE = 0x00000000,
-		PROC_EVENT_FORK = 0x00000001,
-		PROC_EVENT_EXEC = 0x00000002,
-		PROC_EVENT_UID  = 0x00000004,
-		PROC_EVENT_GID  = 0x00000040,
-		PROC_EVENT_SID  = 0x00000080,
-		PROC_EVENT_PTRACE = 0x00000100,
-		PROC_EVENT_COMM = 0x00000200,
-		/* "next" should be 0x00000400 */
-		/* "last" is the last process event: exit,
-		 * while "next to last" is coredumping event */
-		PROC_EVENT_COREDUMP = 0x40000000,
-		PROC_EVENT_EXIT = 0x80000000
-	} what;
-	__u32 cpu;
-	__u64 __attribute__((aligned(8))) timestamp_ns;
-		/* Number of nano seconds since system boot */
-	union { /* must be last field of proc_event struct */
-		struct {
-			__u32 err;
-		} ack;
-
-		struct fork_proc_event {
-			__kernel_pid_t parent_pid;
-			__kernel_pid_t parent_tgid;
-			__kernel_pid_t child_pid;
-			__kernel_pid_t child_tgid;
-		} fork;
-
-		struct exec_proc_event {
-			__kernel_pid_t process_pid;
-			__kernel_pid_t process_tgid;
-		} exec;
-
-		struct id_proc_event {
-			__kernel_pid_t process_pid;
-			__kernel_pid_t process_tgid;
-			union {
-				__u32 ruid; /* task uid */
-				__u32 rgid; /* task gid */
-			} r;
-			union {
-				__u32 euid;
-				__u32 egid;
-			} e;
-		} id;
-
-		struct sid_proc_event {
-			__kernel_pid_t process_pid;
-			__kernel_pid_t process_tgid;
-		} sid;
-
-		struct ptrace_proc_event {
-			__kernel_pid_t process_pid;
-			__kernel_pid_t process_tgid;
-			__kernel_pid_t tracer_pid;
-			__kernel_pid_t tracer_tgid;
-		} ptrace;
-
-		struct comm_proc_event {
-			__kernel_pid_t process_pid;
-			__kernel_pid_t process_tgid;
-			char           comm[16];
-		} comm;
-
-		struct coredump_proc_event {
-			__kernel_pid_t process_pid;
-			__kernel_pid_t process_tgid;
-		} coredump;
-
-		struct exit_proc_event {
-			__kernel_pid_t process_pid;
-			__kernel_pid_t process_tgid;
-			__u32 exit_code, exit_signal;
-		} exit;
-
-	} event_data;
-};
-
-#endif /* CN_PROC_H */
diff --git a/openflow/usr/include/linux/coda.h b/openflow/usr/include/linux/coda.h
deleted file mode 100644
index a5e4b99..0000000
--- a/openflow/usr/include/linux/coda.h
+++ /dev/null
@@ -1,736 +0,0 @@
-/* 
-   You may distribute this file under either of the two licenses that
-   follow at your discretion.
-*/
-
-/* BLURB lgpl
-
-                           Coda File System
-                              Release 5
-
-          Copyright (c) 1987-1999 Carnegie Mellon University
-                  Additional copyrights listed below
-
-This code is distributed "AS IS" without warranty of any kind under
-the terms of the GNU Library General Public Licence Version 2, as
-shown in the file LICENSE, or under the license shown below. The
-technical and financial contributors to Coda are listed in the file
-CREDITS.
-
-                        Additional copyrights 
-*/
-
-/*
-
-            Coda: an Experimental Distributed File System
-                             Release 4.0
-
-          Copyright (c) 1987-1999 Carnegie Mellon University
-                         All Rights Reserved
-
-Permission  to  use, copy, modify and distribute this software and its
-documentation is hereby granted,  provided  that  both  the  copyright
-notice  and  this  permission  notice  appear  in  all  copies  of the
-software, derivative works or  modified  versions,  and  any  portions
-thereof, and that both notices appear in supporting documentation, and
-that credit is given to Carnegie Mellon University  in  all  documents
-and publicity pertaining to direct or indirect use of this code or its
-derivatives.
-
-CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
-SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
-FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
-DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
-RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
-ANY DERIVATIVE WORK.
-
-Carnegie  Mellon  encourages  users  of  this  software  to return any
-improvements or extensions that  they  make,  and  to  grant  Carnegie
-Mellon the rights to redistribute these changes without encumbrance.
-*/
-
-/*
- *
- * Based on cfs.h from Mach, but revamped for increased simplicity.
- * Linux modifications by 
- * Peter Braam, Aug 1996
- */
-
-#ifndef _CODA_HEADER_
-#define _CODA_HEADER_
-
-
-/* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */
-#if defined(__NetBSD__) || \
-  ((defined(DJGPP) || defined(__CYGWIN32__)) && !defined(KERNEL))
-#include <sys/types.h>
-#endif 
-
-#ifndef CODA_MAXSYMLINKS
-#define CODA_MAXSYMLINKS 10
-#endif
-
-#if defined(DJGPP) || defined(__CYGWIN32__)
-#ifdef KERNEL
-typedef unsigned long u_long;
-typedef unsigned int u_int;
-typedef unsigned short u_short;
-typedef u_long ino_t;
-typedef u_long dev_t;
-typedef void * caddr_t;
-#ifdef DOS
-typedef unsigned __int64 u_quad_t;
-#else 
-typedef unsigned long long u_quad_t;
-#endif
-
-#define __inline__
-
-struct timespec {
-        long       ts_sec;
-        long       ts_nsec;
-};
-#else  /* DJGPP but not KERNEL */
-#include <sys/time.h>
-typedef unsigned long long u_quad_t;
-#endif /* !KERNEL */
-#endif /* !DJGPP */
-
-
-#if defined(__linux__)
-#include <linux/time.h>
-#define cdev_t u_quad_t
-#if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2)
-#define _UQUAD_T_ 1
-typedef unsigned long long u_quad_t;
-#endif
-#else
-#define cdev_t dev_t
-#endif
-
-#ifdef __CYGWIN32__
-struct timespec {
-        time_t  tv_sec;         /* seconds */
-        long    tv_nsec;        /* nanoseconds */
-};
-#endif
-
-#ifndef __BIT_TYPES_DEFINED__
-#define __BIT_TYPES_DEFINED__
-typedef signed char	      int8_t;
-typedef unsigned char	    u_int8_t;
-typedef short		     int16_t;
-typedef unsigned short	   u_int16_t;
-typedef int		     int32_t;
-typedef unsigned int	   u_int32_t;
-#endif
-
-
-/*
- * Cfs constants
- */
-#define CODA_MAXNAMLEN   255
-#define CODA_MAXPATHLEN  1024
-#define CODA_MAXSYMLINK  10
-
-/* these are Coda's version of O_RDONLY etc combinations
- * to deal with VFS open modes
- */
-#define	C_O_READ	0x001
-#define	C_O_WRITE       0x002
-#define C_O_TRUNC       0x010
-#define C_O_EXCL	0x100
-#define C_O_CREAT	0x200
-
-/* these are to find mode bits in Venus */ 
-#define C_M_READ  00400
-#define C_M_WRITE 00200
-
-/* for access Venus will use */
-#define C_A_C_OK    8               /* Test for writing upon create.  */
-#define C_A_R_OK    4               /* Test for read permission.  */
-#define C_A_W_OK    2               /* Test for write permission.  */
-#define C_A_X_OK    1               /* Test for execute permission.  */
-#define C_A_F_OK    0               /* Test for existence.  */
-
-
-
-#ifndef _VENUS_DIRENT_T_
-#define _VENUS_DIRENT_T_ 1
-struct venus_dirent {
-        u_int32_t d_fileno;		/* file number of entry */
-        u_int16_t d_reclen;		/* length of this record */
-        u_int8_t  d_type;			/* file type, see below */
-        u_int8_t  d_namlen;		/* length of string in d_name */
-        char	  d_name[CODA_MAXNAMLEN + 1];/* name must be no longer than this */
-};
-#undef DIRSIZ
-#define DIRSIZ(dp)      ((sizeof (struct venus_dirent) - (CODA_MAXNAMLEN+1)) + \
-                         (((dp)->d_namlen+1 + 3) &~ 3))
-
-/*
- * File types
- */
-#define	CDT_UNKNOWN	 0
-#define	CDT_FIFO	 1
-#define	CDT_CHR		 2
-#define	CDT_DIR		 4
-#define	CDT_BLK		 6
-#define	CDT_REG		 8
-#define	CDT_LNK		10
-#define	CDT_SOCK	12
-#define	CDT_WHT		14
-
-/*
- * Convert between stat structure types and directory types.
- */
-#define	IFTOCDT(mode)	(((mode) & 0170000) >> 12)
-#define	CDTTOIF(dirtype)	((dirtype) << 12)
-
-#endif
-
-#ifndef _VUID_T_
-#define _VUID_T_
-typedef u_int32_t vuid_t;
-typedef u_int32_t vgid_t;
-#endif /*_VUID_T_ */
-
-struct CodaFid {
-	u_int32_t opaque[4];
-};
-
-#define coda_f2i(fid)\
-	(fid ? (fid->opaque[3] ^ (fid->opaque[2]<<10) ^ (fid->opaque[1]<<20) ^ fid->opaque[0]) : 0)
-
-#ifndef _VENUS_VATTR_T_
-#define _VENUS_VATTR_T_
-/*
- * Vnode types.  VNON means no type.
- */
-enum coda_vtype	{ C_VNON, C_VREG, C_VDIR, C_VBLK, C_VCHR, C_VLNK, C_VSOCK, C_VFIFO, C_VBAD };
-
-struct coda_vattr {
-	long     	va_type;	/* vnode type (for create) */
-	u_short		va_mode;	/* files access mode and type */
-	short		va_nlink;	/* number of references to file */
-	vuid_t		va_uid;		/* owner user id */
-	vgid_t		va_gid;		/* owner group id */
-	long		va_fileid;	/* file id */
-	u_quad_t	va_size;	/* file size in bytes */
-	long		va_blocksize;	/* blocksize preferred for i/o */
-	struct timespec	va_atime;	/* time of last access */
-	struct timespec	va_mtime;	/* time of last modification */
-	struct timespec	va_ctime;	/* time file changed */
-	u_long		va_gen;		/* generation number of file */
-	u_long		va_flags;	/* flags defined for file */
-	cdev_t	        va_rdev;	/* device special file represents */
-	u_quad_t	va_bytes;	/* bytes of disk space held by file */
-	u_quad_t	va_filerev;	/* file modification number */
-};
-
-#endif 
-
-/* structure used by CODA_STATFS for getting cache information from venus */
-struct coda_statfs {
-    int32_t f_blocks;
-    int32_t f_bfree;
-    int32_t f_bavail;
-    int32_t f_files;
-    int32_t f_ffree;
-};
-
-/*
- * Kernel <--> Venus communications.
- */
-
-#define CODA_ROOT	2
-#define CODA_OPEN_BY_FD	3
-#define CODA_OPEN	4
-#define CODA_CLOSE	5
-#define CODA_IOCTL	6
-#define CODA_GETATTR	7
-#define CODA_SETATTR	8
-#define CODA_ACCESS	9
-#define CODA_LOOKUP	10
-#define CODA_CREATE	11
-#define CODA_REMOVE	12
-#define CODA_LINK	13
-#define CODA_RENAME	14
-#define CODA_MKDIR	15
-#define CODA_RMDIR	16
-#define CODA_SYMLINK	18
-#define CODA_READLINK	19
-#define CODA_FSYNC	20
-#define CODA_VGET	22
-#define CODA_SIGNAL	23
-#define CODA_REPLACE	 24 /* DOWNCALL */
-#define CODA_FLUSH       25 /* DOWNCALL */
-#define CODA_PURGEUSER   26 /* DOWNCALL */
-#define CODA_ZAPFILE     27 /* DOWNCALL */
-#define CODA_ZAPDIR      28 /* DOWNCALL */
-#define CODA_PURGEFID    30 /* DOWNCALL */
-#define CODA_OPEN_BY_PATH 31
-#define CODA_RESOLVE     32
-#define CODA_REINTEGRATE 33
-#define CODA_STATFS	 34
-#define CODA_STORE	 35
-#define CODA_RELEASE	 36
-#define CODA_NCALLS 37
-
-#define DOWNCALL(opcode) (opcode >= CODA_REPLACE && opcode <= CODA_PURGEFID)
-
-#define VC_MAXDATASIZE	    8192
-#define VC_MAXMSGSIZE      sizeof(union inputArgs)+sizeof(union outputArgs) +\
-                            VC_MAXDATASIZE  
-
-#define CIOC_KERNEL_VERSION _IOWR('c', 10, size_t)
-
-#define CODA_KERNEL_VERSION 3 /* 128-bit file identifiers */
-
-/*
- *        Venus <-> Coda  RPC arguments
- */
-struct coda_in_hdr {
-    u_int32_t opcode;
-    u_int32_t unique;	    /* Keep multiple outstanding msgs distinct */
-    pid_t pid;
-    pid_t pgid;
-    vuid_t uid;
-};
-
-/* Really important that opcode and unique are 1st two fields! */
-struct coda_out_hdr {
-    u_int32_t opcode;
-    u_int32_t unique;	
-    u_int32_t result;
-};
-
-/* coda_root: NO_IN */
-struct coda_root_out {
-    struct coda_out_hdr oh;
-    struct CodaFid VFid;
-};
-
-struct coda_root_in {
-    struct coda_in_hdr in;
-};
-
-/* coda_open: */
-struct coda_open_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int	flags;
-};
-
-struct coda_open_out {
-    struct coda_out_hdr oh;
-    cdev_t	dev;
-    ino_t	inode;
-};
-
-
-/* coda_store: */
-struct coda_store_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int	flags;
-};
-
-struct coda_store_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_release: */
-struct coda_release_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int	flags;
-};
-
-struct coda_release_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_close: */
-struct coda_close_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int	flags;
-};
-
-struct coda_close_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_ioctl: */
-struct coda_ioctl_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int	cmd;
-    int	len;
-    int	rwflag;
-    char *data;			/* Place holder for data. */
-};
-
-struct coda_ioctl_out {
-    struct coda_out_hdr oh;
-    int	len;
-    caddr_t	data;		/* Place holder for data. */
-};
-
-
-/* coda_getattr: */
-struct coda_getattr_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-};
-
-struct coda_getattr_out {
-    struct coda_out_hdr oh;
-    struct coda_vattr attr;
-};
-
-
-/* coda_setattr: NO_OUT */
-struct coda_setattr_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    struct coda_vattr attr;
-};
-
-struct coda_setattr_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_access: NO_OUT */
-struct coda_access_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int	flags;
-};
-
-struct coda_access_out {
-    struct coda_out_hdr out;
-};
-
-
-/* lookup flags */
-#define CLU_CASE_SENSITIVE     0x01
-#define CLU_CASE_INSENSITIVE   0x02
-
-/* coda_lookup: */
-struct  coda_lookup_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int         name;		/* Place holder for data. */
-    int         flags;	
-};
-
-struct coda_lookup_out {
-    struct coda_out_hdr oh;
-    struct CodaFid VFid;
-    int	vtype;
-};
-
-
-/* coda_create: */
-struct coda_create_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    struct coda_vattr attr;
-    int excl;
-    int mode;
-    int 	name;		/* Place holder for data. */
-};
-
-struct coda_create_out {
-    struct coda_out_hdr oh;
-    struct CodaFid VFid;
-    struct coda_vattr attr;
-};
-
-
-/* coda_remove: NO_OUT */
-struct coda_remove_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int name;		/* Place holder for data. */
-};
-
-struct coda_remove_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_link: NO_OUT */
-struct coda_link_in {
-    struct coda_in_hdr ih;
-    struct CodaFid sourceFid;	/* cnode to link *to* */
-    struct CodaFid destFid;	/* Directory in which to place link */
-    int tname;		/* Place holder for data. */
-};
-
-struct coda_link_out {
-    struct coda_out_hdr out;
-};
-
-
-/* coda_rename: NO_OUT */
-struct coda_rename_in {
-    struct coda_in_hdr ih;
-    struct CodaFid sourceFid;
-    int 	srcname;
-    struct CodaFid destFid;
-    int 	destname;
-};
-
-struct coda_rename_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_mkdir: */
-struct coda_mkdir_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    struct coda_vattr attr;
-    int	   name;		/* Place holder for data. */
-};
-
-struct coda_mkdir_out {
-    struct coda_out_hdr oh;
-    struct CodaFid VFid;
-    struct coda_vattr attr;
-};
-
-
-/* coda_rmdir: NO_OUT */
-struct coda_rmdir_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int name;		/* Place holder for data. */
-};
-
-struct coda_rmdir_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_symlink: NO_OUT */
-struct coda_symlink_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;	/* Directory to put symlink in */
-    int srcname;
-    struct coda_vattr attr;
-    int tname;
-};
-
-struct coda_symlink_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_readlink: */
-struct coda_readlink_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-};
-
-struct coda_readlink_out {
-    struct coda_out_hdr oh;
-    int	count;
-    caddr_t	data;		/* Place holder for data. */
-};
-
-
-/* coda_fsync: NO_OUT */
-struct coda_fsync_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-};
-
-struct coda_fsync_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_vget: */
-struct coda_vget_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-};
-
-struct coda_vget_out {
-    struct coda_out_hdr oh;
-    struct CodaFid VFid;
-    int	vtype;
-};
-
-
-/* CODA_SIGNAL is out-of-band, doesn't need data. */
-/* CODA_INVALIDATE is a venus->kernel call */
-/* CODA_FLUSH is a venus->kernel call */
-
-/* coda_purgeuser: */
-/* CODA_PURGEUSER is a venus->kernel call */
-struct coda_purgeuser_out {
-    struct coda_out_hdr oh;
-    vuid_t uid;
-};
-
-/* coda_zapfile: */
-/* CODA_ZAPFILE is a venus->kernel call */
-struct coda_zapfile_out {  
-    struct coda_out_hdr oh;
-    struct CodaFid CodaFid;
-};
-
-/* coda_zapdir: */
-/* CODA_ZAPDIR is a venus->kernel call */	
-struct coda_zapdir_out {	  
-    struct coda_out_hdr oh;
-    struct CodaFid CodaFid;
-};
-
-/* coda_purgefid: */
-/* CODA_PURGEFID is a venus->kernel call */	
-struct coda_purgefid_out { 
-    struct coda_out_hdr oh;
-    struct CodaFid CodaFid;
-};
-
-/* coda_replace: */
-/* CODA_REPLACE is a venus->kernel call */	
-struct coda_replace_out { /* coda_replace is a venus->kernel call */
-    struct coda_out_hdr oh;
-    struct CodaFid NewFid;
-    struct CodaFid OldFid;
-};
-
-/* coda_open_by_fd: */
-struct coda_open_by_fd_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int        flags;
-};
-
-struct coda_open_by_fd_out {
-    struct coda_out_hdr oh;
-    int fd;
-
-};
-
-/* coda_open_by_path: */
-struct coda_open_by_path_in {
-    struct coda_in_hdr ih;
-    struct CodaFid VFid;
-    int	flags;
-};
-
-struct coda_open_by_path_out {
-    struct coda_out_hdr oh;
-	int path;
-};
-
-/* coda_statfs: NO_IN */
-struct coda_statfs_in {
-    struct coda_in_hdr in;
-};
-
-struct coda_statfs_out {
-    struct coda_out_hdr oh;
-    struct coda_statfs stat;
-};
-
-/* 
- * Occasionally, we don't cache the fid returned by CODA_LOOKUP. 
- * For instance, if the fid is inconsistent. 
- * This case is handled by setting the top bit of the type result parameter.
- */
-#define CODA_NOCACHE          0x80000000
-
-union inputArgs {
-    struct coda_in_hdr ih;		/* NB: every struct below begins with an ih */
-    struct coda_open_in coda_open;
-    struct coda_store_in coda_store;
-    struct coda_release_in coda_release;
-    struct coda_close_in coda_close;
-    struct coda_ioctl_in coda_ioctl;
-    struct coda_getattr_in coda_getattr;
-    struct coda_setattr_in coda_setattr;
-    struct coda_access_in coda_access;
-    struct coda_lookup_in coda_lookup;
-    struct coda_create_in coda_create;
-    struct coda_remove_in coda_remove;
-    struct coda_link_in coda_link;
-    struct coda_rename_in coda_rename;
-    struct coda_mkdir_in coda_mkdir;
-    struct coda_rmdir_in coda_rmdir;
-    struct coda_symlink_in coda_symlink;
-    struct coda_readlink_in coda_readlink;
-    struct coda_fsync_in coda_fsync;
-    struct coda_vget_in coda_vget;
-    struct coda_open_by_fd_in coda_open_by_fd;
-    struct coda_open_by_path_in coda_open_by_path;
-    struct coda_statfs_in coda_statfs;
-};
-
-union outputArgs {
-    struct coda_out_hdr oh;		/* NB: every struct below begins with an oh */
-    struct coda_root_out coda_root;
-    struct coda_open_out coda_open;
-    struct coda_ioctl_out coda_ioctl;
-    struct coda_getattr_out coda_getattr;
-    struct coda_lookup_out coda_lookup;
-    struct coda_create_out coda_create;
-    struct coda_mkdir_out coda_mkdir;
-    struct coda_readlink_out coda_readlink;
-    struct coda_vget_out coda_vget;
-    struct coda_purgeuser_out coda_purgeuser;
-    struct coda_zapfile_out coda_zapfile;
-    struct coda_zapdir_out coda_zapdir;
-    struct coda_purgefid_out coda_purgefid;
-    struct coda_replace_out coda_replace;
-    struct coda_open_by_fd_out coda_open_by_fd;
-    struct coda_open_by_path_out coda_open_by_path;
-    struct coda_statfs_out coda_statfs;
-};    
-
-union coda_downcalls {
-    /* CODA_INVALIDATE is a venus->kernel call */
-    /* CODA_FLUSH is a venus->kernel call */
-    struct coda_purgeuser_out purgeuser;
-    struct coda_zapfile_out zapfile;
-    struct coda_zapdir_out zapdir;
-    struct coda_purgefid_out purgefid;
-    struct coda_replace_out replace;
-};
-
-
-/*
- * Used for identifying usage of "Control" and pioctls
- */
-
-#define PIOCPARM_MASK 0x0000ffff
-struct ViceIoctl {
-        void *in;        /* Data to be transferred in */
-        void *out;       /* Data to be transferred out */
-        u_short in_size;        /* Size of input buffer <= 2K */
-        u_short out_size;       /* Maximum size of output buffer, <= 2K */
-};
-
-struct PioctlData {
-        const char *path;
-        int follow;
-        struct ViceIoctl vi;
-};
-
-#define CODA_CONTROL		".CONTROL"
-#define CODA_CONTROLLEN		8
-#define CTL_INO			-1
-
-/* Data passed to mount */
-
-#define CODA_MOUNT_VERSION 1
-
-struct coda_mount_data {
-	int		version;
-	int		fd;       /* Opened device */
-};
-
-#endif /* _CODA_HEADER_ */
diff --git a/openflow/usr/include/linux/coda_psdev.h b/openflow/usr/include/linux/coda_psdev.h
deleted file mode 100644
index 46e12d8..0000000
--- a/openflow/usr/include/linux/coda_psdev.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __CODA_PSDEV_H
-#define __CODA_PSDEV_H
-
-#include <linux/magic.h>
-
-#define CODA_PSDEV_MAJOR 67
-#define MAX_CODADEVS  5	   /* how many do we allow */
-
-
-/* messages between coda filesystem in kernel and Venus */
-struct upc_req {
-	struct list_head    uc_chain;
-	caddr_t	            uc_data;
-	u_short	            uc_flags;
-	u_short             uc_inSize;  /* Size is at most 5000 bytes */
-	u_short	            uc_outSize;
-	u_short	            uc_opcode;  /* copied from data to save lookup */
-	int		    uc_unique;
-	wait_queue_head_t   uc_sleep;   /* process' wait queue */
-};
-
-#define CODA_REQ_ASYNC  0x1
-#define CODA_REQ_READ   0x2
-#define CODA_REQ_WRITE  0x4
-#define CODA_REQ_ABORT  0x8
-
-#endif /* __CODA_PSDEV_H */
diff --git a/openflow/usr/include/linux/coff.h b/openflow/usr/include/linux/coff.h
deleted file mode 100644
index 6354a7f..0000000
--- a/openflow/usr/include/linux/coff.h
+++ /dev/null
@@ -1,351 +0,0 @@
-/* This file is derived from the GAS 2.1.4 assembler control file.
-   The GAS product is under the GNU General Public License, version 2 or later.
-   As such, this file is also under that license.
-
-   If the file format changes in the COFF object, this file should be
-   subsequently updated to reflect the changes.
-
-   The actual loader module only uses a few of these structures. The full
-   set is documented here because I received the full set. If you wish
-   more information about COFF, then O'Reilly has a very excellent book.
-*/
-
-#define  E_SYMNMLEN  8   /* Number of characters in a symbol name         */
-#define  E_FILNMLEN 14   /* Number of characters in a file name           */
-#define  E_DIMNUM    4   /* Number of array dimensions in auxiliary entry */
-
-/*
- * These defines are byte order independent. There is no alignment of fields
- * permitted in the structures. Therefore they are declared as characters
- * and the values loaded from the character positions. It also makes it
- * nice to have it "endian" independent.
- */
- 
-/* Load a short int from the following tables with little-endian formats */
-#define COFF_SHORT_L(ps) ((short)(((unsigned short)((unsigned char)ps[1])<<8)|\
-				  ((unsigned short)((unsigned char)ps[0]))))
-
-/* Load a long int from the following tables with little-endian formats */
-#define COFF_LONG_L(ps) (((long)(((unsigned long)((unsigned char)ps[3])<<24) |\
-				 ((unsigned long)((unsigned char)ps[2])<<16) |\
-				 ((unsigned long)((unsigned char)ps[1])<<8)  |\
-				 ((unsigned long)((unsigned char)ps[0])))))
- 
-/* Load a short int from the following tables with big-endian formats */
-#define COFF_SHORT_H(ps) ((short)(((unsigned short)((unsigned char)ps[0])<<8)|\
-				  ((unsigned short)((unsigned char)ps[1]))))
-
-/* Load a long int from the following tables with big-endian formats */
-#define COFF_LONG_H(ps) (((long)(((unsigned long)((unsigned char)ps[0])<<24) |\
-				 ((unsigned long)((unsigned char)ps[1])<<16) |\
-				 ((unsigned long)((unsigned char)ps[2])<<8)  |\
-				 ((unsigned long)((unsigned char)ps[3])))))
-
-/* These may be overridden later by brain dead implementations which generate
-   a big-endian header with little-endian data. In that case, generate a
-   replacement macro which tests a flag and uses either of the two above
-   as appropriate. */
-
-#define COFF_LONG(v)   COFF_LONG_L(v)
-#define COFF_SHORT(v)  COFF_SHORT_L(v)
-
-/*** coff information for Intel 386/486.  */
-
-/********************** FILE HEADER **********************/
-
-struct COFF_filehdr {
-	char f_magic[2];	/* magic number			*/
-	char f_nscns[2];	/* number of sections		*/
-	char f_timdat[4];	/* time & date stamp		*/
-	char f_symptr[4];	/* file pointer to symtab	*/
-	char f_nsyms[4];	/* number of symtab entries	*/
-	char f_opthdr[2];	/* sizeof(optional hdr)		*/
-	char f_flags[2];	/* flags			*/
-};
-
-/*
- *   Bits for f_flags:
- *
- *	F_RELFLG	relocation info stripped from file
- *	F_EXEC		file is executable  (i.e. no unresolved external
- *			references)
- *	F_LNNO		line numbers stripped from file
- *	F_LSYMS		local symbols stripped from file
- *	F_MINMAL	this is a minimal object file (".m") output of fextract
- *	F_UPDATE	this is a fully bound update file, output of ogen
- *	F_SWABD		this file has had its bytes swabbed (in names)
- *	F_AR16WR	this file has the byte ordering of an AR16WR
- *			(e.g. 11/70) machine
- *	F_AR32WR	this file has the byte ordering of an AR32WR machine
- *			(e.g. vax and iNTEL 386)
- *	F_AR32W		this file has the byte ordering of an AR32W machine
- *			(e.g. 3b,maxi)
- *	F_PATCH		file contains "patch" list in optional header
- *	F_NODF		(minimal file only) no decision functions for
- *			replaced functions
- */
-
-#define  COFF_F_RELFLG		0000001
-#define  COFF_F_EXEC		0000002
-#define  COFF_F_LNNO		0000004
-#define  COFF_F_LSYMS		0000010
-#define  COFF_F_MINMAL		0000020
-#define  COFF_F_UPDATE		0000040
-#define  COFF_F_SWABD		0000100
-#define  COFF_F_AR16WR		0000200
-#define  COFF_F_AR32WR		0000400
-#define  COFF_F_AR32W		0001000
-#define  COFF_F_PATCH		0002000
-#define  COFF_F_NODF		0002000
-
-#define	COFF_I386MAGIC	        0x14c   /* Linux's system    */
-
-#if 0   /* Perhaps, someday, these formats may be used.      */
-#define COFF_I386PTXMAGIC	0x154
-#define COFF_I386AIXMAGIC	0x175   /* IBM's AIX system  */
-#define COFF_I386BADMAG(x) ((COFF_SHORT((x).f_magic) != COFF_I386MAGIC) \
-			  && COFF_SHORT((x).f_magic) != COFF_I386PTXMAGIC \
-			  && COFF_SHORT((x).f_magic) != COFF_I386AIXMAGIC)
-#else
-#define COFF_I386BADMAG(x) (COFF_SHORT((x).f_magic) != COFF_I386MAGIC)
-#endif
-
-#define	COFF_FILHDR	struct COFF_filehdr
-#define	COFF_FILHSZ	sizeof(COFF_FILHDR)
-
-/********************** AOUT "OPTIONAL HEADER" **********************/
-
-/* Linux COFF must have this "optional" header. Standard COFF has no entry
-   location for the "entry" point. They normally would start with the first
-   location of the .text section. This is not a good idea for linux. So,
-   the use of this "optional" header is not optional. It is required.
-
-   Do not be tempted to assume that the size of the optional header is
-   a constant and simply index the next byte by the size of this structure.
-   Use the 'f_opthdr' field in the main coff header for the size of the
-   structure actually written to the file!!
-*/
-
-typedef struct 
-{
-  char 	magic[2];		/* type of file				 */
-  char	vstamp[2];		/* version stamp			 */
-  char	tsize[4];		/* text size in bytes, padded to FW bdry */
-  char	dsize[4];		/* initialized   data "   "		 */
-  char	bsize[4];		/* uninitialized data "   "		 */
-  char	entry[4];		/* entry pt.				 */
-  char 	text_start[4];		/* base of text used for this file       */
-  char 	data_start[4];		/* base of data used for this file       */
-}
-COFF_AOUTHDR;
-
-#define COFF_AOUTSZ (sizeof(COFF_AOUTHDR))
-
-#define COFF_STMAGIC	0401
-#define COFF_OMAGIC     0404
-#define COFF_JMAGIC     0407    /* dirty text and data image, can't share  */
-#define COFF_DMAGIC     0410    /* dirty text segment, data aligned        */
-#define COFF_ZMAGIC     0413    /* The proper magic number for executables  */
-#define COFF_SHMAGIC	0443	/* shared library header                   */
-
-/********************** SECTION HEADER **********************/
-
-struct COFF_scnhdr {
-  char		s_name[8];	/* section name			    */
-  char		s_paddr[4];	/* physical address, aliased s_nlib */
-  char		s_vaddr[4];	/* virtual address		    */
-  char		s_size[4];	/* section size			    */
-  char		s_scnptr[4];	/* file ptr to raw data for section */
-  char		s_relptr[4];	/* file ptr to relocation	    */
-  char		s_lnnoptr[4];	/* file ptr to line numbers	    */
-  char		s_nreloc[2];	/* number of relocation entries	    */
-  char		s_nlnno[2];	/* number of line number entries    */
-  char		s_flags[4];	/* flags			    */
-};
-
-#define	COFF_SCNHDR	struct COFF_scnhdr
-#define	COFF_SCNHSZ	sizeof(COFF_SCNHDR)
-
-/*
- * names of "special" sections
- */
-
-#define COFF_TEXT	".text"
-#define COFF_DATA	".data"
-#define COFF_BSS	".bss"
-#define COFF_COMMENT    ".comment"
-#define COFF_LIB        ".lib"
-
-#define COFF_SECT_TEXT  0      /* Section for instruction code             */
-#define COFF_SECT_DATA  1      /* Section for initialized globals          */
-#define COFF_SECT_BSS   2      /* Section for un-initialized globals       */
-#define COFF_SECT_REQD  3      /* Minimum number of sections for good file */
-
-#define COFF_STYP_REG     0x00 /* regular segment                          */
-#define COFF_STYP_DSECT   0x01 /* dummy segment                            */
-#define COFF_STYP_NOLOAD  0x02 /* no-load segment                          */
-#define COFF_STYP_GROUP   0x04 /* group segment                            */
-#define COFF_STYP_PAD     0x08 /* .pad segment                             */
-#define COFF_STYP_COPY    0x10 /* copy section                             */
-#define COFF_STYP_TEXT    0x20 /* .text segment                            */
-#define COFF_STYP_DATA    0x40 /* .data segment                            */
-#define COFF_STYP_BSS     0x80 /* .bss segment                             */
-#define COFF_STYP_INFO   0x200 /* .comment section                         */
-#define COFF_STYP_OVER   0x400 /* overlay section                          */
-#define COFF_STYP_LIB    0x800 /* library section                          */
-
-/*
- * Shared libraries have the following section header in the data field for
- * each library.
- */
-
-struct COFF_slib {
-  char		sl_entsz[4];	/* Size of this entry               */
-  char		sl_pathndx[4];	/* size of the header field         */
-};
-
-#define	COFF_SLIBHD	struct COFF_slib
-#define	COFF_SLIBSZ	sizeof(COFF_SLIBHD)
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-
-struct COFF_lineno {
-  union {
-    char l_symndx[4];	/* function name symbol index, iff l_lnno == 0*/
-    char l_paddr[4];	/* (physical) address of line number	*/
-  } l_addr;
-  char l_lnno[2];	/* line number		*/
-};
-
-#define	COFF_LINENO	struct COFF_lineno
-#define	COFF_LINESZ	6
-
-/********************** SYMBOLS **********************/
-
-#define COFF_E_SYMNMLEN	 8	/* # characters in a short symbol name	*/
-#define COFF_E_FILNMLEN	14	/* # characters in a file name		*/
-#define COFF_E_DIMNUM	 4	/* # array dimensions in auxiliary entry */
-
-/*
- *  All symbols and sections have the following definition
- */
-
-struct COFF_syment 
-{
-  union {
-    char e_name[E_SYMNMLEN];    /* Symbol name (first 8 characters) */
-    struct {
-      char e_zeroes[4];         /* Leading zeros */
-      char e_offset[4];         /* Offset if this is a header section */
-    } e;
-  } e;
-
-  char e_value[4];              /* Value (address) of the segment */
-  char e_scnum[2];              /* Section number */
-  char e_type[2];               /* Type of section */
-  char e_sclass[1];             /* Loader class */
-  char e_numaux[1];             /* Number of auxiliary entries which follow */
-};
-
-#define COFF_N_BTMASK	(0xf)   /* Mask for important class bits */
-#define COFF_N_TMASK	(0x30)  /* Mask for important type bits  */
-#define COFF_N_BTSHFT	(4)     /* # bits to shift class field   */
-#define COFF_N_TSHIFT	(2)     /* # bits to shift type field    */
-
-/*
- *  Auxiliary entries because the main table is too limiting.
- */
-  
-union COFF_auxent {
-
-/*
- *  Debugger information
- */
-
-  struct {
-    char x_tagndx[4];	        /* str, un, or enum tag indx */
-    union {
-      struct {
-	char  x_lnno[2];        /* declaration line number */
-	char  x_size[2];        /* str/union/array size */
-      } x_lnsz;
-      char x_fsize[4];	        /* size of function */
-    } x_misc;
-
-    union {
-      struct {		        /* if ISFCN, tag, or .bb */
-	char x_lnnoptr[4];	/* ptr to fcn line # */
-	char x_endndx[4];	/* entry ndx past block end */
-      } x_fcn;
-
-      struct {		        /* if ISARY, up to 4 dimen. */
-	char x_dimen[E_DIMNUM][2];
-      } x_ary;
-    } x_fcnary;
-
-    char x_tvndx[2];	/* tv index */
-  } x_sym;
-
-/*
- *   Source file names (debugger information)
- */
-
-  union {
-    char x_fname[E_FILNMLEN];
-    struct {
-      char x_zeroes[4];
-      char x_offset[4];
-    } x_n;
-  } x_file;
-
-/*
- *   Section information
- */
-
-  struct {
-    char x_scnlen[4];	/* section length */
-    char x_nreloc[2];	/* # relocation entries */
-    char x_nlinno[2];	/* # line numbers */
-  } x_scn;
-
-/*
- *   Transfer vector (branch table)
- */
-  
-  struct {
-    char x_tvfill[4];	/* tv fill value */
-    char x_tvlen[2];	/* length of .tv */
-    char x_tvran[2][2];	/* tv range */
-  } x_tv;		/* info about .tv section (in auxent of symbol .tv)) */
-};
-
-#define	COFF_SYMENT	struct COFF_syment
-#define	COFF_SYMESZ	18	
-#define	COFF_AUXENT	union COFF_auxent
-#define	COFF_AUXESZ	18
-
-#define COFF_ETEXT	"etext"
-
-/********************** RELOCATION DIRECTIVES **********************/
-
-struct COFF_reloc {
-  char r_vaddr[4];        /* Virtual address of item    */
-  char r_symndx[4];       /* Symbol index in the symtab */
-  char r_type[2];         /* Relocation type            */
-};
-
-#define COFF_RELOC struct COFF_reloc
-#define COFF_RELSZ 10
-
-#define COFF_DEF_DATA_SECTION_ALIGNMENT  4
-#define COFF_DEF_BSS_SECTION_ALIGNMENT   4
-#define COFF_DEF_TEXT_SECTION_ALIGNMENT  4
-
-/* For new sections we haven't heard of before */
-#define COFF_DEF_SECTION_ALIGNMENT       4
diff --git a/openflow/usr/include/linux/connector.h b/openflow/usr/include/linux/connector.h
deleted file mode 100644
index caf9468..0000000
--- a/openflow/usr/include/linux/connector.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 	connector.h
- * 
- * 2004-2005 Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __CONNECTOR_H
-#define __CONNECTOR_H
-
-#include <linux/types.h>
-
-/*
- * Process Events connector unique ids -- used for message routing
- */
-#define CN_IDX_PROC			0x1
-#define CN_VAL_PROC			0x1
-#define CN_IDX_CIFS			0x2
-#define CN_VAL_CIFS                     0x1
-#define CN_W1_IDX			0x3	/* w1 communication */
-#define CN_W1_VAL			0x1
-#define CN_IDX_V86D			0x4
-#define CN_VAL_V86D_UVESAFB		0x1
-#define CN_IDX_BB			0x5	/* BlackBoard, from the TSP GPL sampling framework */
-#define CN_DST_IDX			0x6
-#define CN_DST_VAL			0x1
-#define CN_IDX_DM			0x7	/* Device Mapper */
-#define CN_VAL_DM_USERSPACE_LOG		0x1
-#define CN_IDX_DRBD			0x8
-#define CN_VAL_DRBD			0x1
-#define CN_KVP_IDX			0x9	/* HyperV KVP */
-#define CN_KVP_VAL			0x1	/* queries from the kernel */
-#define CN_VSS_IDX			0xA     /* HyperV VSS */
-#define CN_VSS_VAL			0x1     /* queries from the kernel */
-
-
-#define CN_NETLINK_USERS		11	/* Highest index + 1 */
-
-/*
- * Maximum connector's message size.
- */
-#define CONNECTOR_MAX_MSG_SIZE		16384
-
-/*
- * idx and val are unique identifiers which 
- * are used for message routing and 
- * must be registered in connector.h for in-kernel usage.
- */
-
-struct cb_id {
-	__u32 idx;
-	__u32 val;
-};
-
-struct cn_msg {
-	struct cb_id id;
-
-	__u32 seq;
-	__u32 ack;
-
-	__u16 len;		/* Length of the following data */
-	__u16 flags;
-	__u8 data[0];
-};
-
-#endif /* __CONNECTOR_H */
diff --git a/openflow/usr/include/linux/const.h b/openflow/usr/include/linux/const.h
deleted file mode 100644
index c872bfd..0000000
--- a/openflow/usr/include/linux/const.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* const.h: Macros for dealing with constants.  */
-
-#ifndef _LINUX_CONST_H
-#define _LINUX_CONST_H
-
-/* Some constant macros are used in both assembler and
- * C code.  Therefore we cannot annotate them always with
- * 'UL' and other type specifiers unilaterally.  We
- * use the following macros to deal with this.
- *
- * Similarly, _AT() will cast an expression with a type in C, but
- * leave it unchanged in asm.
- */
-
-#ifdef __ASSEMBLY__
-#define _AC(X,Y)	X
-#define _AT(T,X)	X
-#else
-#define __AC(X,Y)	(X##Y)
-#define _AC(X,Y)	__AC(X,Y)
-#define _AT(T,X)	((T)(X))
-#endif
-
-#define _BITUL(x)	(_AC(1,UL) << (x))
-#define _BITULL(x)	(_AC(1,ULL) << (x))
-
-#endif /* !(_LINUX_CONST_H) */
diff --git a/openflow/usr/include/linux/cramfs_fs.h b/openflow/usr/include/linux/cramfs_fs.h
deleted file mode 100644
index 9cada1a..0000000
--- a/openflow/usr/include/linux/cramfs_fs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef __CRAMFS_H
-#define __CRAMFS_H
-
-#include <linux/types.h>
-#include <linux/magic.h>
-
-#define CRAMFS_SIGNATURE	"Compressed ROMFS"
-
-/*
- * Width of various bitfields in struct cramfs_inode.
- * Primarily used to generate warnings in mkcramfs.
- */
-#define CRAMFS_MODE_WIDTH 16
-#define CRAMFS_UID_WIDTH 16
-#define CRAMFS_SIZE_WIDTH 24
-#define CRAMFS_GID_WIDTH 8
-#define CRAMFS_NAMELEN_WIDTH 6
-#define CRAMFS_OFFSET_WIDTH 26
-
-/*
- * Since inode.namelen is a unsigned 6-bit number, the maximum cramfs
- * path length is 63 << 2 = 252.
- */
-#define CRAMFS_MAXPATHLEN (((1 << CRAMFS_NAMELEN_WIDTH) - 1) << 2)
-
-/*
- * Reasonably terse representation of the inode data.
- */
-struct cramfs_inode {
-	__u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
-	/* SIZE for device files is i_rdev */
-	__u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
-	/* NAMELEN is the length of the file name, divided by 4 and
-           rounded up.  (cramfs doesn't support hard links.) */
-	/* OFFSET: For symlinks and non-empty regular files, this
-	   contains the offset (divided by 4) of the file data in
-	   compressed form (starting with an array of block pointers;
-	   see README).  For non-empty directories it is the offset
-	   (divided by 4) of the inode of the first file in that
-	   directory.  For anything else, offset is zero. */
-	__u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
-};
-
-struct cramfs_info {
-	__u32 crc;
-	__u32 edition;
-	__u32 blocks;
-	__u32 files;
-};
-
-/*
- * Superblock information at the beginning of the FS.
- */
-struct cramfs_super {
-	__u32 magic;			/* 0x28cd3d45 - random number */
-	__u32 size;			/* length in bytes */
-	__u32 flags;			/* feature flags */
-	__u32 future;			/* reserved for future use */
-	__u8 signature[16];		/* "Compressed ROMFS" */
-	struct cramfs_info fsid;	/* unique filesystem info */
-	__u8 name[16];			/* user-defined name */
-	struct cramfs_inode root;	/* root inode data */
-};
-
-/*
- * Feature flags
- *
- * 0x00000000 - 0x000000ff: features that work for all past kernels
- * 0x00000100 - 0xffffffff: features that don't work for past kernels
- */
-#define CRAMFS_FLAG_FSID_VERSION_2	0x00000001	/* fsid version #2 */
-#define CRAMFS_FLAG_SORTED_DIRS		0x00000002	/* sorted dirs */
-#define CRAMFS_FLAG_HOLES		0x00000100	/* support for holes */
-#define CRAMFS_FLAG_WRONG_SIGNATURE	0x00000200	/* reserved */
-#define CRAMFS_FLAG_SHIFTED_ROOT_OFFSET	0x00000400	/* shifted root fs */
-
-/*
- * Valid values in super.flags.  Currently we refuse to mount
- * if (flags & ~CRAMFS_SUPPORTED_FLAGS).  Maybe that should be
- * changed to test super.future instead.
- */
-#define CRAMFS_SUPPORTED_FLAGS	( 0x000000ff \
-				| CRAMFS_FLAG_HOLES \
-				| CRAMFS_FLAG_WRONG_SIGNATURE \
-				| CRAMFS_FLAG_SHIFTED_ROOT_OFFSET )
-
-
-#endif /* __CRAMFS_H */
diff --git a/openflow/usr/include/linux/cuda.h b/openflow/usr/include/linux/cuda.h
deleted file mode 100644
index 83d9f93..0000000
--- a/openflow/usr/include/linux/cuda.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Definitions for talking to the CUDA.  The CUDA is a microcontroller
- * which controls the ADB, system power, RTC, and various other things.
- *
- * Copyright (C) 1996 Paul Mackerras.
- */
-
-#ifndef _LINUX_CUDA_H
-#define _LINUX_CUDA_H
-
-/* CUDA commands (2nd byte) */
-#define CUDA_WARM_START		0
-#define CUDA_AUTOPOLL		1
-#define CUDA_GET_6805_ADDR	2
-#define CUDA_GET_TIME		3
-#define CUDA_GET_PRAM		7
-#define CUDA_SET_6805_ADDR	8
-#define CUDA_SET_TIME		9
-#define CUDA_POWERDOWN		0xa
-#define CUDA_POWERUP_TIME	0xb
-#define CUDA_SET_PRAM		0xc
-#define CUDA_MS_RESET		0xd
-#define CUDA_SEND_DFAC		0xe
-#define CUDA_RESET_SYSTEM	0x11
-#define CUDA_SET_IPL		0x12
-#define CUDA_SET_AUTO_RATE	0x14
-#define CUDA_GET_AUTO_RATE	0x16
-#define CUDA_SET_DEVICE_LIST	0x19
-#define CUDA_GET_DEVICE_LIST	0x1a
-#define CUDA_GET_SET_IIC	0x22
-
-
-#endif /* _LINUX_CUDA_H */
diff --git a/openflow/usr/include/linux/cyclades.h b/openflow/usr/include/linux/cyclades.h
deleted file mode 100644
index 145e3c8..0000000
--- a/openflow/usr/include/linux/cyclades.h
+++ /dev/null
@@ -1,493 +0,0 @@
-/* $Revision: 3.0 $$Date: 1998/11/02 14:20:59 $
- * linux/include/linux/cyclades.h
- *
- * This file was initially written by
- * Randolph Bentson <bentson@grieg.seaslug.org> and is maintained by
- * Ivan Passos <ivan@cyclades.com>.
- *
- * This file contains the general definitions for the cyclades.c driver
- *$Log: cyclades.h,v $
- *Revision 3.1  2002/01/29 11:36:16  henrique
- *added throttle field on struct cyclades_port to indicate whether the
- *port is throttled or not
- *
- *Revision 3.1  2000/04/19 18:52:52  ivan
- *converted address fields to unsigned long and added fields for physical
- *addresses on cyclades_card structure;
- *
- *Revision 3.0  1998/11/02 14:20:59  ivan
- *added nports field on cyclades_card structure;
- *
- *Revision 2.5  1998/08/03 16:57:01  ivan
- *added cyclades_idle_stats structure;
- * 
- *Revision 2.4  1998/06/01 12:09:53  ivan
- *removed closing_wait2 from cyclades_port structure;
- *
- *Revision 2.3  1998/03/16 18:01:12  ivan
- *changes in the cyclades_port structure to get it closer to the 
- *standard serial port structure;
- *added constants for new ioctls;
- *
- *Revision 2.2  1998/02/17 16:50:00  ivan
- *changes in the cyclades_port structure (addition of shutdown_wait and 
- *chip_rev variables);
- *added constants for new ioctls and for CD1400 rev. numbers.
- *
- *Revision 2.1	1997/10/24 16:03:00  ivan
- *added rflow (which allows enabling the CD1400 special flow control 
- *feature) and rtsdtr_inv (which allows DTR/RTS pin inversion) to 
- *cyclades_port structure;
- *added Alpha support
- *
- *Revision 2.0  1997/06/30 10:30:00  ivan
- *added some new doorbell command constants related to IOCTLW and
- *UART error signaling
- *
- *Revision 1.8  1997/06/03 15:30:00  ivan
- *added constant ZFIRM_HLT
- *added constant CyPCI_Ze_win ( = 2 * Cy_PCI_Zwin)
- *
- *Revision 1.7  1997/03/26 10:30:00  daniel
- *new entries at the end of cyclades_port struct to reallocate
- *variables illegally allocated within card memory.
- *
- *Revision 1.6  1996/09/09 18:35:30  bentson
- *fold in changes for Cyclom-Z -- including structures for
- *communicating with board as well modest changes to original
- *structures to support new features.
- *
- *Revision 1.5  1995/11/13 21:13:31  bentson
- *changes suggested by Michael Chastain <mec@duracef.shout.net>
- *to support use of this file in non-kernel applications
- *
- *
- */
-
-#ifndef _LINUX_CYCLADES_H
-#define _LINUX_CYCLADES_H
-
-#include <linux/types.h>
-
-struct cyclades_monitor {
-        unsigned long           int_count;
-        unsigned long           char_count;
-        unsigned long           char_max;
-        unsigned long           char_last;
-};
-
-/*
- * These stats all reflect activity since the device was last initialized.
- * (i.e., since the port was opened with no other processes already having it
- * open)
- */
-struct cyclades_idle_stats {
-    __kernel_time_t in_use;	/* Time device has been in use (secs) */
-    __kernel_time_t recv_idle;	/* Time since last char received (secs) */
-    __kernel_time_t xmit_idle;	/* Time since last char transmitted (secs) */
-    unsigned long  recv_bytes;	/* Bytes received */
-    unsigned long  xmit_bytes;	/* Bytes transmitted */
-    unsigned long  overruns;	/* Input overruns */
-    unsigned long  frame_errs;	/* Input framing errors */
-    unsigned long  parity_errs;	/* Input parity errors */
-};
-
-#define CYCLADES_MAGIC  0x4359
-
-#define CYGETMON                0x435901
-#define CYGETTHRESH             0x435902
-#define CYSETTHRESH             0x435903
-#define CYGETDEFTHRESH          0x435904
-#define CYSETDEFTHRESH          0x435905
-#define CYGETTIMEOUT            0x435906
-#define CYSETTIMEOUT            0x435907
-#define CYGETDEFTIMEOUT         0x435908
-#define CYSETDEFTIMEOUT         0x435909
-#define CYSETRFLOW		0x43590a
-#define CYGETRFLOW		0x43590b
-#define CYSETRTSDTR_INV		0x43590c
-#define CYGETRTSDTR_INV		0x43590d
-#define CYZSETPOLLCYCLE		0x43590e
-#define CYZGETPOLLCYCLE		0x43590f
-#define CYGETCD1400VER		0x435910
-#define	CYSETWAIT		0x435912
-#define	CYGETWAIT		0x435913
-
-/*************** CYCLOM-Z ADDITIONS ***************/
-
-#define CZIOC           ('M' << 8)
-#define CZ_NBOARDS      (CZIOC|0xfa)
-#define CZ_BOOT_START   (CZIOC|0xfb)
-#define CZ_BOOT_DATA    (CZIOC|0xfc)
-#define CZ_BOOT_END     (CZIOC|0xfd)
-#define CZ_TEST         (CZIOC|0xfe)
-
-#define CZ_DEF_POLL	(HZ/25)
-
-#define MAX_BOARD       4       /* Max number of boards */
-#define MAX_DEV         256     /* Max number of ports total */
-#define	CYZ_MAX_SPEED	921600
-
-#define	CYZ_FIFO_SIZE	16
-
-#define CYZ_BOOT_NWORDS 0x100
-struct CYZ_BOOT_CTRL {
-        unsigned short  nboard;
-        int             status[MAX_BOARD];
-        int             nchannel[MAX_BOARD];
-        int             fw_rev[MAX_BOARD];
-        unsigned long   offset;
-        unsigned long   data[CYZ_BOOT_NWORDS];
-};
-
-
-#ifndef DP_WINDOW_SIZE
-/*
- *	Memory Window Sizes
- */
-
-#define	DP_WINDOW_SIZE		(0x00080000)	/* window size 512 Kb */
-#define	ZE_DP_WINDOW_SIZE	(0x00100000)	/* window size 1 Mb (Ze and
-						  8Zo V.2 */
-#define	CTRL_WINDOW_SIZE	(0x00000080)	/* runtime regs 128 bytes */
-
-/*
- *	CUSTOM_REG - Cyclom-Z/PCI Custom Registers Set. The driver
- *	normally will access only interested on the fpga_id, fpga_version,
- *	start_cpu and stop_cpu.
- */
-
-struct	CUSTOM_REG {
-	__u32	fpga_id;		/* FPGA Identification Register */
-	__u32	fpga_version;		/* FPGA Version Number Register */
-	__u32	cpu_start;		/* CPU start Register (write) */
-	__u32	cpu_stop;		/* CPU stop Register (write) */
-	__u32	misc_reg;		/* Miscellaneous Register */
-	__u32	idt_mode;		/* IDT mode Register */
-	__u32	uart_irq_status;	/* UART IRQ status Register */
-	__u32	clear_timer0_irq;	/* Clear timer interrupt Register */
-	__u32	clear_timer1_irq;	/* Clear timer interrupt Register */
-	__u32	clear_timer2_irq;	/* Clear timer interrupt Register */
-	__u32	test_register;		/* Test Register */
-	__u32	test_count;		/* Test Count Register */
-	__u32	timer_select;		/* Timer select register */
-	__u32	pr_uart_irq_status;	/* Prioritized UART IRQ stat Reg */
-	__u32	ram_wait_state;		/* RAM wait-state Register */
-	__u32	uart_wait_state;	/* UART wait-state Register */
-	__u32	timer_wait_state;	/* timer wait-state Register */
-	__u32	ack_wait_state;		/* ACK wait State Register */
-};
-
-/*
- *	RUNTIME_9060 - PLX PCI9060ES local configuration and shared runtime
- *	registers. This structure can be used to access the 9060 registers
- *	(memory mapped).
- */
-
-struct RUNTIME_9060 {
-	__u32	loc_addr_range;	/* 00h - Local Address Range */
-	__u32	loc_addr_base;	/* 04h - Local Address Base */
-	__u32	loc_arbitr;	/* 08h - Local Arbitration */
-	__u32	endian_descr;	/* 0Ch - Big/Little Endian Descriptor */
-	__u32	loc_rom_range;	/* 10h - Local ROM Range */
-	__u32	loc_rom_base;	/* 14h - Local ROM Base */
-	__u32	loc_bus_descr;	/* 18h - Local Bus descriptor */
-	__u32	loc_range_mst;	/* 1Ch - Local Range for Master to PCI */
-	__u32	loc_base_mst;	/* 20h - Local Base for Master PCI */
-	__u32	loc_range_io;	/* 24h - Local Range for Master IO */
-	__u32	pci_base_mst;	/* 28h - PCI Base for Master PCI */
-	__u32	pci_conf_io;	/* 2Ch - PCI configuration for Master IO */
-	__u32	filler1;	/* 30h */
-	__u32	filler2;	/* 34h */
-	__u32	filler3;	/* 38h */
-	__u32	filler4;	/* 3Ch */
-	__u32	mail_box_0;	/* 40h - Mail Box 0 */
-	__u32	mail_box_1;	/* 44h - Mail Box 1 */
-	__u32	mail_box_2;	/* 48h - Mail Box 2 */
-	__u32	mail_box_3;	/* 4Ch - Mail Box 3 */
-	__u32	filler5;	/* 50h */
-	__u32	filler6;	/* 54h */
-	__u32	filler7;	/* 58h */
-	__u32	filler8;	/* 5Ch */
-	__u32	pci_doorbell;	/* 60h - PCI to Local Doorbell */
-	__u32	loc_doorbell;	/* 64h - Local to PCI Doorbell */
-	__u32	intr_ctrl_stat;	/* 68h - Interrupt Control/Status */
-	__u32	init_ctrl;	/* 6Ch - EEPROM control, Init Control, etc */
-};
-
-/* Values for the Local Base Address re-map register */
-
-#define	WIN_RAM		0x00000001L	/* set the sliding window to RAM */
-#define	WIN_CREG	0x14000001L	/* set the window to custom Registers */
-
-/* Values timer select registers */
-
-#define	TIMER_BY_1M	0x00		/* clock divided by 1M */
-#define	TIMER_BY_256K	0x01		/* clock divided by 256k */
-#define	TIMER_BY_128K	0x02		/* clock divided by 128k */
-#define	TIMER_BY_32K	0x03		/* clock divided by 32k */
-
-/****************** ****************** *******************/
-#endif
-
-#ifndef ZFIRM_ID
-/* #include "zfwint.h" */
-/****************** ****************** *******************/
-/*
- *	This file contains the definitions for interfacing with the
- *	Cyclom-Z ZFIRM Firmware.
- */
-
-/* General Constant definitions */
-
-#define	MAX_CHAN	64		/* max number of channels per board */
-
-/* firmware id structure (set after boot) */
-
-#define ID_ADDRESS	0x00000180L	/* signature/pointer address */
-#define	ZFIRM_ID	0x5557465AL	/* ZFIRM/U signature */
-#define	ZFIRM_HLT	0x59505B5CL	/* ZFIRM needs external power supply */
-#define	ZFIRM_RST	0x56040674L	/* RST signal (due to FW reset) */
-
-#define	ZF_TINACT_DEF	1000		/* default inactivity timeout 
-					   (1000 ms) */
-#define	ZF_TINACT	ZF_TINACT_DEF
-
-struct	FIRM_ID {
-	__u32	signature;		/* ZFIRM/U signature */
-	__u32	zfwctrl_addr;		/* pointer to ZFW_CTRL structure */
-};
-
-/* Op. System id */
-
-#define	C_OS_LINUX	0x00000030	/* generic Linux system */
-
-/* channel op_mode */
-
-#define	C_CH_DISABLE	0x00000000	/* channel is disabled */
-#define	C_CH_TXENABLE	0x00000001	/* channel Tx enabled */
-#define	C_CH_RXENABLE	0x00000002	/* channel Rx enabled */
-#define	C_CH_ENABLE	0x00000003	/* channel Tx/Rx enabled */
-#define	C_CH_LOOPBACK	0x00000004	/* Loopback mode */
-
-/* comm_parity - parity */
-
-#define	C_PR_NONE	0x00000000	/* None */
-#define	C_PR_ODD	0x00000001	/* Odd */
-#define C_PR_EVEN	0x00000002	/* Even */
-#define C_PR_MARK	0x00000004	/* Mark */
-#define C_PR_SPACE	0x00000008	/* Space */
-#define C_PR_PARITY	0x000000ff
-
-#define	C_PR_DISCARD	0x00000100	/* discard char with frame/par error */
-#define C_PR_IGNORE	0x00000200	/* ignore frame/par error */
-
-/* comm_data_l - data length and stop bits */
-
-#define C_DL_CS5	0x00000001
-#define C_DL_CS6	0x00000002
-#define C_DL_CS7	0x00000004
-#define C_DL_CS8	0x00000008
-#define	C_DL_CS		0x0000000f
-#define C_DL_1STOP	0x00000010
-#define C_DL_15STOP	0x00000020
-#define C_DL_2STOP	0x00000040
-#define	C_DL_STOP	0x000000f0
-
-/* interrupt enabling/status */
-
-#define	C_IN_DISABLE	0x00000000	/* zero, disable interrupts */
-#define	C_IN_TXBEMPTY	0x00000001	/* tx buffer empty */
-#define	C_IN_TXLOWWM	0x00000002	/* tx buffer below LWM */
-#define	C_IN_RXHIWM	0x00000010	/* rx buffer above HWM */
-#define	C_IN_RXNNDT	0x00000020	/* rx no new data timeout */
-#define	C_IN_MDCD	0x00000100	/* modem DCD change */
-#define	C_IN_MDSR	0x00000200	/* modem DSR change */
-#define	C_IN_MRI	0x00000400	/* modem RI change */
-#define	C_IN_MCTS	0x00000800	/* modem CTS change */
-#define	C_IN_RXBRK	0x00001000	/* Break received */
-#define	C_IN_PR_ERROR	0x00002000	/* parity error */
-#define	C_IN_FR_ERROR	0x00004000	/* frame error */
-#define C_IN_OVR_ERROR  0x00008000      /* overrun error */
-#define C_IN_RXOFL	0x00010000      /* RX buffer overflow */
-#define C_IN_IOCTLW	0x00020000      /* I/O control w/ wait */
-#define C_IN_MRTS	0x00040000	/* modem RTS drop */
-#define C_IN_ICHAR	0x00080000
- 
-/* flow control */
-
-#define	C_FL_OXX	0x00000001	/* output Xon/Xoff flow control */
-#define	C_FL_IXX	0x00000002	/* output Xon/Xoff flow control */
-#define C_FL_OIXANY	0x00000004	/* output Xon/Xoff (any xon) */
-#define	C_FL_SWFLOW	0x0000000f
-
-/* flow status */
-
-#define	C_FS_TXIDLE	0x00000000	/* no Tx data in the buffer or UART */
-#define	C_FS_SENDING	0x00000001	/* UART is sending data */
-#define	C_FS_SWFLOW	0x00000002	/* Tx is stopped by received Xoff */
-
-/* rs_control/rs_status RS-232 signals */
-
-#define C_RS_PARAM	0x80000000	/* Indicates presence of parameter in 
-					   IOCTLM command */
-#define	C_RS_RTS	0x00000001	/* RTS */
-#define	C_RS_DTR	0x00000004	/* DTR */
-#define	C_RS_DCD	0x00000100	/* CD */
-#define	C_RS_DSR	0x00000200	/* DSR */
-#define	C_RS_RI		0x00000400	/* RI */
-#define	C_RS_CTS	0x00000800	/* CTS */
-
-/* commands Host <-> Board */
-
-#define	C_CM_RESET	0x01		/* reset/flush buffers */
-#define	C_CM_IOCTL	0x02		/* re-read CH_CTRL */
-#define	C_CM_IOCTLW	0x03		/* re-read CH_CTRL, intr when done */
-#define	C_CM_IOCTLM	0x04		/* RS-232 outputs change */
-#define	C_CM_SENDXOFF	0x10		/* send Xoff */
-#define	C_CM_SENDXON	0x11		/* send Xon */
-#define C_CM_CLFLOW	0x12		/* Clear flow control (resume) */
-#define	C_CM_SENDBRK	0x41		/* send break */
-#define	C_CM_INTBACK	0x42		/* Interrupt back */
-#define	C_CM_SET_BREAK	0x43		/* Tx break on */
-#define	C_CM_CLR_BREAK	0x44		/* Tx break off */
-#define	C_CM_CMD_DONE	0x45		/* Previous command done */
-#define C_CM_INTBACK2	0x46		/* Alternate Interrupt back */
-#define	C_CM_TINACT	0x51		/* set inactivity detection */
-#define	C_CM_IRQ_ENBL	0x52		/* enable generation of interrupts */
-#define	C_CM_IRQ_DSBL	0x53		/* disable generation of interrupts */
-#define	C_CM_ACK_ENBL	0x54		/* enable acknowledged interrupt mode */
-#define	C_CM_ACK_DSBL	0x55		/* disable acknowledged intr mode */
-#define	C_CM_FLUSH_RX	0x56		/* flushes Rx buffer */
-#define	C_CM_FLUSH_TX	0x57		/* flushes Tx buffer */
-#define C_CM_Q_ENABLE	0x58		/* enables queue access from the 
-					   driver */
-#define C_CM_Q_DISABLE  0x59            /* disables queue access from the 
-					   driver */
-
-#define	C_CM_TXBEMPTY	0x60		/* Tx buffer is empty */
-#define	C_CM_TXLOWWM	0x61		/* Tx buffer low water mark */
-#define	C_CM_RXHIWM	0x62		/* Rx buffer high water mark */
-#define	C_CM_RXNNDT	0x63		/* rx no new data timeout */
-#define	C_CM_TXFEMPTY	0x64
-#define	C_CM_ICHAR	0x65
-#define	C_CM_MDCD	0x70		/* modem DCD change */
-#define	C_CM_MDSR	0x71		/* modem DSR change */
-#define	C_CM_MRI	0x72		/* modem RI change */
-#define	C_CM_MCTS	0x73		/* modem CTS change */
-#define C_CM_MRTS	0x74		/* modem RTS drop */
-#define	C_CM_RXBRK	0x84		/* Break received */
-#define	C_CM_PR_ERROR	0x85		/* Parity error */
-#define	C_CM_FR_ERROR	0x86		/* Frame error */
-#define C_CM_OVR_ERROR  0x87            /* Overrun error */
-#define C_CM_RXOFL	0x88            /* RX buffer overflow */
-#define	C_CM_CMDERROR	0x90		/* command error */
-#define	C_CM_FATAL	0x91		/* fatal error */
-#define	C_CM_HW_RESET	0x92		/* reset board */
-
-/*
- *	CH_CTRL - This per port structure contains all parameters
- *	that control an specific port. It can be seen as the
- *	configuration registers of a "super-serial-controller".
- */
-
-struct CH_CTRL {
-	__u32	op_mode;	/* operation mode */
-	__u32	intr_enable;	/* interrupt masking */
-	__u32	sw_flow;	/* SW flow control */
-	__u32	flow_status;	/* output flow status */
-	__u32	comm_baud;	/* baud rate  - numerically specified */
-	__u32	comm_parity;	/* parity */
-	__u32	comm_data_l;	/* data length/stop */
-	__u32	comm_flags;	/* other flags */
-	__u32	hw_flow;	/* HW flow control */
-	__u32	rs_control;	/* RS-232 outputs */
-	__u32	rs_status;	/* RS-232 inputs */
-	__u32	flow_xon;	/* xon char */
-	__u32	flow_xoff;	/* xoff char */
-	__u32	hw_overflow;	/* hw overflow counter */
-	__u32	sw_overflow;	/* sw overflow counter */
-	__u32	comm_error;	/* frame/parity error counter */
-	__u32 ichar;
-	__u32 filler[7];
-};
-
-
-/*
- *	BUF_CTRL - This per channel structure contains
- *	all Tx and Rx buffer control for a given channel.
- */
-
-struct	BUF_CTRL	{
-	__u32	flag_dma;	/* buffers are in Host memory */
-	__u32	tx_bufaddr;	/* address of the tx buffer */
-	__u32	tx_bufsize;	/* tx buffer size */
-	__u32	tx_threshold;	/* tx low water mark */
-	__u32	tx_get;		/* tail index tx buf */
-	__u32	tx_put;		/* head index tx buf */
-	__u32	rx_bufaddr;	/* address of the rx buffer */
-	__u32	rx_bufsize;	/* rx buffer size */
-	__u32	rx_threshold;	/* rx high water mark */
-	__u32	rx_get;		/* tail index rx buf */
-	__u32	rx_put;		/* head index rx buf */
-	__u32	filler[5];	/* filler to align structures */
-};
-
-/*
- *	BOARD_CTRL - This per board structure contains all global 
- *	control fields related to the board.
- */
-
-struct BOARD_CTRL {
-
-	/* static info provided by the on-board CPU */
-	__u32	n_channel;	/* number of channels */
-	__u32	fw_version;	/* firmware version */
-
-	/* static info provided by the driver */
-	__u32	op_system;	/* op_system id */
-	__u32	dr_version;	/* driver version */
-
-	/* board control area */
-	__u32	inactivity;	/* inactivity control */
-
-	/* host to FW commands */
-	__u32	hcmd_channel;	/* channel number */
-	__u32	hcmd_param;	/* pointer to parameters */
-
-	/* FW to Host commands */
-	__u32	fwcmd_channel;	/* channel number */
-	__u32	fwcmd_param;	/* pointer to parameters */
-	__u32	zf_int_queue_addr; /* offset for INT_QUEUE structure */
-
-	/* filler so the structures are aligned */
-	__u32	filler[6];
-};
-
-/* Host Interrupt Queue */
-
-#define QUEUE_SIZE	(10*MAX_CHAN)
-
-struct	INT_QUEUE {
-	unsigned char	intr_code[QUEUE_SIZE];
-	unsigned long	channel[QUEUE_SIZE];
-	unsigned long	param[QUEUE_SIZE];
-	unsigned long	put;
-	unsigned long	get;
-};
-
-/*
- *	ZFW_CTRL - This is the data structure that includes all other
- *	data structures used by the Firmware.
- */
- 
-struct ZFW_CTRL {
-	struct BOARD_CTRL	board_ctrl;
-	struct CH_CTRL		ch_ctrl[MAX_CHAN];
-	struct BUF_CTRL		buf_ctrl[MAX_CHAN];
-};
-
-/****************** ****************** *******************/
-#endif
-
-#endif /* _LINUX_CYCLADES_H */
diff --git a/openflow/usr/include/linux/cycx_cfm.h b/openflow/usr/include/linux/cycx_cfm.h
deleted file mode 100644
index 032d26e..0000000
--- a/openflow/usr/include/linux/cycx_cfm.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-* cycx_cfm.h	Cyclom 2X WAN Link Driver.
-*		Definitions for the Cyclom 2X Firmware Module (CFM).
-*
-* Author:	Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-*
-* Copyright:	(c) 1998-2003 Arnaldo Carvalho de Melo
-*
-* Based on sdlasfm.h by Gene Kozin <74604.152@compuserve.com>
-*
-*		This program is free software; you can redistribute it and/or
-*		modify it under the terms of the GNU General Public License
-*		as published by the Free Software Foundation; either version
-*		2 of the License, or (at your option) any later version.
-* ============================================================================
-* 1998/08/08	acme		Initial version.
-*/
-#ifndef	_CYCX_CFM_H
-#define	_CYCX_CFM_H
-
-/* Defines */
-
-#define	CFM_VERSION	2
-#define	CFM_SIGNATURE	"CFM - Cyclades CYCX Firmware Module"
-
-/* min/max */
-#define	CFM_IMAGE_SIZE	0x20000	/* max size of CYCX code image file */
-#define	CFM_DESCR_LEN	256	/* max length of description string */
-#define	CFM_MAX_CYCX	1	/* max number of compatible adapters */
-#define	CFM_LOAD_BUFSZ	0x400	/* buffer size for reset code (buffer_load) */
-
-/* Firmware Commands */
-#define GEN_POWER_ON	0x1280
-
-#define GEN_SET_SEG	0x1401	/* boot segment setting. */
-#define GEN_BOOT_DAT	0x1402	/* boot data. */
-#define GEN_START	0x1403	/* board start. */
-#define GEN_DEFPAR	0x1404	/* buffer length for boot. */
-
-/* Adapter Types */
-#define CYCX_2X		2
-/* for now only the 2X is supported, no plans to support 8X or 16X */
-#define CYCX_8X		8
-#define CYCX_16X	16
-
-#define	CFID_X25_2X	5200
-
-/**
- *	struct cycx_fw_info - firmware module information.
- *	@codeid - firmware ID
- *	@version - firmware version number
- *	@adapter - compatible adapter types
- *	@memsize - minimum memory size
- *	@reserved - reserved
- *	@startoffs - entry point offset
- *	@winoffs - dual-port memory window offset
- *	@codeoffs - code load offset
- *	@codesize - code size
- *	@dataoffs - configuration data load offset
- *	@datasize - configuration data size
- */
-struct cycx_fw_info {
-	unsigned short	codeid;
-	unsigned short	version;
-	unsigned short	adapter[CFM_MAX_CYCX];
-	unsigned long	memsize;
-	unsigned short	reserved[2];
-	unsigned short	startoffs;
-	unsigned short	winoffs;
-	unsigned short	codeoffs;
-	unsigned long	codesize;
-	unsigned short	dataoffs;
-	unsigned long	datasize;
-};
-
-/**
- *	struct cycx_firmware - CYCX firmware file structure
- *	@signature - CFM file signature
- *	@version - file format version
- *	@checksum - info + image
- *	@reserved - reserved
- *	@descr - description string
- *	@info - firmware module info
- *	@image - code image (variable size)
- */
-struct cycx_firmware {
-	char		    signature[80];
-	unsigned short	    version;
-	unsigned short	    checksum;
-	unsigned short	    reserved[6];
-	char		    descr[CFM_DESCR_LEN];
-	struct cycx_fw_info info;
-	unsigned char	    image[0];
-};
-
-struct cycx_fw_header {
-	unsigned long  reset_size;
-	unsigned long  data_size;
-	unsigned long  code_size;
-};
-#endif	/* _CYCX_CFM_H */
diff --git a/openflow/usr/include/linux/dcbnl.h b/openflow/usr/include/linux/dcbnl.h
deleted file mode 100644
index 3ea470f..0000000
--- a/openflow/usr/include/linux/dcbnl.h
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * Copyright (c) 2008-2011, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307 USA.
- *
- * Author: Lucy Liu <lucy.liu@intel.com>
- */
-
-#ifndef __LINUX_DCBNL_H__
-#define __LINUX_DCBNL_H__
-
-#include <linux/types.h>
-
-/* IEEE 802.1Qaz std supported values */
-#define IEEE_8021QAZ_MAX_TCS	8
-
-#define IEEE_8021QAZ_TSA_STRICT		0
-#define IEEE_8021QAZ_TSA_CB_SHAPER	1
-#define IEEE_8021QAZ_TSA_ETS		2
-#define IEEE_8021QAZ_TSA_VENDOR		255
-
-/* This structure contains the IEEE 802.1Qaz ETS managed object
- *
- * @willing: willing bit in ETS configuration TLV
- * @ets_cap: indicates supported capacity of ets feature
- * @cbs: credit based shaper ets algorithm supported
- * @tc_tx_bw: tc tx bandwidth indexed by traffic class
- * @tc_rx_bw: tc rx bandwidth indexed by traffic class
- * @tc_tsa: TSA Assignment table, indexed by traffic class
- * @prio_tc: priority assignment table mapping 8021Qp to traffic class
- * @tc_reco_bw: recommended tc bandwidth indexed by traffic class for TLV
- * @tc_reco_tsa: recommended tc bandwidth indexed by traffic class for TLV
- * @reco_prio_tc: recommended tc tx bandwidth indexed by traffic class for TLV
- *
- * Recommended values are used to set fields in the ETS recommendation TLV
- * with hardware offloaded LLDP.
- *
- * ----
- *  TSA Assignment 8 bit identifiers
- *	0	strict priority
- *	1	credit-based shaper
- *	2	enhanced transmission selection
- *	3-254	reserved
- *	255	vendor specific
- */
-struct ieee_ets {
-	__u8	willing;
-	__u8	ets_cap;
-	__u8	cbs;
-	__u8	tc_tx_bw[IEEE_8021QAZ_MAX_TCS];
-	__u8	tc_rx_bw[IEEE_8021QAZ_MAX_TCS];
-	__u8	tc_tsa[IEEE_8021QAZ_MAX_TCS];
-	__u8	prio_tc[IEEE_8021QAZ_MAX_TCS];
-	__u8	tc_reco_bw[IEEE_8021QAZ_MAX_TCS];
-	__u8	tc_reco_tsa[IEEE_8021QAZ_MAX_TCS];
-	__u8	reco_prio_tc[IEEE_8021QAZ_MAX_TCS];
-};
-
-/* This structure contains rate limit extension to the IEEE 802.1Qaz ETS
- * managed object.
- * Values are 64 bits long and specified in Kbps to enable usage over both
- * slow and very fast networks.
- *
- * @tc_maxrate: maximal tc tx bandwidth indexed by traffic class
- */
-struct ieee_maxrate {
-	__u64	tc_maxrate[IEEE_8021QAZ_MAX_TCS];
-};
-
-enum dcbnl_cndd_states {
-	DCB_CNDD_RESET = 0,
-	DCB_CNDD_EDGE,
-	DCB_CNDD_INTERIOR,
-	DCB_CNDD_INTERIOR_READY,
-};
-
-/* This structure contains the IEEE 802.1Qau QCN managed object.
- *
- *@rpg_enable: enable QCN RP
- *@rppp_max_rps: maximum number of RPs allowed for this CNPV on this port
- *@rpg_time_reset: time between rate increases if no CNMs received.
- *		   given in u-seconds
- *@rpg_byte_reset: transmitted data between rate increases if no CNMs received.
- *		   given in Bytes
- *@rpg_threshold: The number of times rpByteStage or rpTimeStage can count
- *		   before RP rate control state machine advances states
- *@rpg_max_rate: the maxinun rate, in Mbits per second,
- *		 at which an RP can transmit
- *@rpg_ai_rate: The rate, in Mbits per second,
- *		used to increase rpTargetRate in the RPR_ACTIVE_INCREASE
- *@rpg_hai_rate: The rate, in Mbits per second,
- *		 used to increase rpTargetRate in the RPR_HYPER_INCREASE state
- *@rpg_gd: Upon CNM receive, flow rate is limited to (Fb/Gd)*CurrentRate.
- *	   rpgGd is given as log2(Gd), where Gd may only be powers of 2
- *@rpg_min_dec_fac: The minimum factor by which the current transmit rate
- *		    can be changed by reception of a CNM.
- *		    value is given as percentage (1-100)
- *@rpg_min_rate: The minimum value, in bits per second, for rate to limit
- *@cndd_state_machine: The state of the congestion notification domain
- *		       defense state machine, as defined by IEEE 802.3Qau
- *		       section 32.1.1. In the interior ready state,
- *		       the QCN capable hardware may add CN-TAG TLV to the
- *		       outgoing traffic, to specifically identify outgoing
- *		       flows.
- */
-
-struct ieee_qcn {
-	__u8 rpg_enable[IEEE_8021QAZ_MAX_TCS];
-	__u32 rppp_max_rps[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_time_reset[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_byte_reset[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_threshold[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_max_rate[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_ai_rate[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_hai_rate[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_gd[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_min_dec_fac[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_min_rate[IEEE_8021QAZ_MAX_TCS];
-	__u32 cndd_state_machine[IEEE_8021QAZ_MAX_TCS];
-};
-
-/* This structure contains the IEEE 802.1Qau QCN statistics.
- *
- *@rppp_rp_centiseconds: the number of RP-centiseconds accumulated
- *			 by RPs at this priority level on this Port
- *@rppp_created_rps: number of active RPs(flows) that react to CNMs
- */
-
-struct ieee_qcn_stats {
-	__u64 rppp_rp_centiseconds[IEEE_8021QAZ_MAX_TCS];
-	__u32 rppp_created_rps[IEEE_8021QAZ_MAX_TCS];
-};
-
-/* This structure contains the IEEE 802.1Qaz PFC managed object
- *
- * @pfc_cap: Indicates the number of traffic classes on the local device
- *	     that may simultaneously have PFC enabled.
- * @pfc_en: bitmap indicating pfc enabled traffic classes
- * @mbc: enable macsec bypass capability
- * @delay: the allowance made for a round-trip propagation delay of the
- *	   link in bits.
- * @requests: count of the sent pfc frames
- * @indications: count of the received pfc frames
- */
-struct ieee_pfc {
-	__u8	pfc_cap;
-	__u8	pfc_en;
-	__u8	mbc;
-	__u16	delay;
-	__u64	requests[IEEE_8021QAZ_MAX_TCS];
-	__u64	indications[IEEE_8021QAZ_MAX_TCS];
-};
-
-/* CEE DCBX std supported values */
-#define CEE_DCBX_MAX_PGS	8
-#define CEE_DCBX_MAX_PRIO	8
-
-/**
- * struct cee_pg - CEE Priority-Group managed object
- *
- * @willing: willing bit in the PG tlv
- * @error: error bit in the PG tlv
- * @pg_en: enable bit of the PG feature
- * @tcs_supported: number of traffic classes supported
- * @pg_bw: bandwidth percentage for each priority group
- * @prio_pg: priority to PG mapping indexed by priority
- */
-struct cee_pg {
-	__u8    willing;
-	__u8    error;
-	__u8    pg_en;
-	__u8    tcs_supported;
-	__u8    pg_bw[CEE_DCBX_MAX_PGS];
-	__u8    prio_pg[CEE_DCBX_MAX_PGS];
-};
-
-/**
- * struct cee_pfc - CEE PFC managed object
- *
- * @willing: willing bit in the PFC tlv
- * @error: error bit in the PFC tlv
- * @pfc_en: bitmap indicating pfc enabled traffic classes
- * @tcs_supported: number of traffic classes supported
- */
-struct cee_pfc {
-	__u8    willing;
-	__u8    error;
-	__u8    pfc_en;
-	__u8    tcs_supported;
-};
-
-/* IEEE 802.1Qaz std supported values */
-#define IEEE_8021QAZ_APP_SEL_ETHERTYPE	1
-#define IEEE_8021QAZ_APP_SEL_STREAM	2
-#define IEEE_8021QAZ_APP_SEL_DGRAM	3
-#define IEEE_8021QAZ_APP_SEL_ANY	4
-
-/* This structure contains the IEEE 802.1Qaz APP managed object. This
- * object is also used for the CEE std as well.
- *
- * @selector: protocol identifier type
- * @protocol: protocol of type indicated
- * @priority: 3-bit unsigned integer indicating priority for IEEE
- *            8-bit 802.1p user priority bitmap for CEE
- *
- * ----
- *  Selector field values for IEEE 802.1Qaz
- *	0	Reserved
- *	1	Ethertype
- *	2	Well known port number over TCP or SCTP
- *	3	Well known port number over UDP or DCCP
- *	4	Well known port number over TCP, SCTP, UDP, or DCCP
- *	5-7	Reserved
- *
- *  Selector field values for CEE
- *	0	Ethertype
- *	1	Well known port number over TCP or UDP
- *	2-3	Reserved
- */
-struct dcb_app {
-	__u8	selector;
-	__u8	priority;
-	__u16	protocol;
-};
-
-/**
- * struct dcb_peer_app_info - APP feature information sent by the peer
- *
- * @willing: willing bit in the peer APP tlv
- * @error: error bit in the peer APP tlv
- *
- * In addition to this information the full peer APP tlv also contains
- * a table of 'app_count' APP objects defined above.
- */
-struct dcb_peer_app_info {
-	__u8	willing;
-	__u8	error;
-};
-
-struct dcbmsg {
-	__u8               dcb_family;
-	__u8               cmd;
-	__u16              dcb_pad;
-};
-
-/**
- * enum dcbnl_commands - supported DCB commands
- *
- * @DCB_CMD_UNDEFINED: unspecified command to catch errors
- * @DCB_CMD_GSTATE: request the state of DCB in the device
- * @DCB_CMD_SSTATE: set the state of DCB in the device
- * @DCB_CMD_PGTX_GCFG: request the priority group configuration for Tx
- * @DCB_CMD_PGTX_SCFG: set the priority group configuration for Tx
- * @DCB_CMD_PGRX_GCFG: request the priority group configuration for Rx
- * @DCB_CMD_PGRX_SCFG: set the priority group configuration for Rx
- * @DCB_CMD_PFC_GCFG: request the priority flow control configuration
- * @DCB_CMD_PFC_SCFG: set the priority flow control configuration
- * @DCB_CMD_SET_ALL: apply all changes to the underlying device
- * @DCB_CMD_GPERM_HWADDR: get the permanent MAC address of the underlying
- *                        device.  Only useful when using bonding.
- * @DCB_CMD_GCAP: request the DCB capabilities of the device
- * @DCB_CMD_GNUMTCS: get the number of traffic classes currently supported
- * @DCB_CMD_SNUMTCS: set the number of traffic classes
- * @DCB_CMD_GBCN: set backward congestion notification configuration
- * @DCB_CMD_SBCN: get backward congestion notification configration.
- * @DCB_CMD_GAPP: get application protocol configuration
- * @DCB_CMD_SAPP: set application protocol configuration
- * @DCB_CMD_IEEE_SET: set IEEE 802.1Qaz configuration
- * @DCB_CMD_IEEE_GET: get IEEE 802.1Qaz configuration
- * @DCB_CMD_GDCBX: get DCBX engine configuration
- * @DCB_CMD_SDCBX: set DCBX engine configuration
- * @DCB_CMD_GFEATCFG: get DCBX features flags
- * @DCB_CMD_SFEATCFG: set DCBX features negotiation flags
- * @DCB_CMD_CEE_GET: get CEE aggregated configuration
- * @DCB_CMD_IEEE_DEL: delete IEEE 802.1Qaz configuration
- */
-enum dcbnl_commands {
-	DCB_CMD_UNDEFINED,
-
-	DCB_CMD_GSTATE,
-	DCB_CMD_SSTATE,
-
-	DCB_CMD_PGTX_GCFG,
-	DCB_CMD_PGTX_SCFG,
-	DCB_CMD_PGRX_GCFG,
-	DCB_CMD_PGRX_SCFG,
-
-	DCB_CMD_PFC_GCFG,
-	DCB_CMD_PFC_SCFG,
-
-	DCB_CMD_SET_ALL,
-
-	DCB_CMD_GPERM_HWADDR,
-
-	DCB_CMD_GCAP,
-
-	DCB_CMD_GNUMTCS,
-	DCB_CMD_SNUMTCS,
-
-	DCB_CMD_PFC_GSTATE,
-	DCB_CMD_PFC_SSTATE,
-
-	DCB_CMD_BCN_GCFG,
-	DCB_CMD_BCN_SCFG,
-
-	DCB_CMD_GAPP,
-	DCB_CMD_SAPP,
-
-	DCB_CMD_IEEE_SET,
-	DCB_CMD_IEEE_GET,
-
-	DCB_CMD_GDCBX,
-	DCB_CMD_SDCBX,
-
-	DCB_CMD_GFEATCFG,
-	DCB_CMD_SFEATCFG,
-
-	DCB_CMD_CEE_GET,
-	DCB_CMD_IEEE_DEL,
-
-	__DCB_CMD_ENUM_MAX,
-	DCB_CMD_MAX = __DCB_CMD_ENUM_MAX - 1,
-};
-
-/**
- * enum dcbnl_attrs - DCB top-level netlink attributes
- *
- * @DCB_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_ATTR_IFNAME: interface name of the underlying device (NLA_STRING)
- * @DCB_ATTR_STATE: enable state of DCB in the device (NLA_U8)
- * @DCB_ATTR_PFC_STATE: enable state of PFC in the device (NLA_U8)
- * @DCB_ATTR_PFC_CFG: priority flow control configuration (NLA_NESTED)
- * @DCB_ATTR_NUM_TC: number of traffic classes supported in the device (NLA_U8)
- * @DCB_ATTR_PG_CFG: priority group configuration (NLA_NESTED)
- * @DCB_ATTR_SET_ALL: bool to commit changes to hardware or not (NLA_U8)
- * @DCB_ATTR_PERM_HWADDR: MAC address of the physical device (NLA_NESTED)
- * @DCB_ATTR_CAP: DCB capabilities of the device (NLA_NESTED)
- * @DCB_ATTR_NUMTCS: number of traffic classes supported (NLA_NESTED)
- * @DCB_ATTR_BCN: backward congestion notification configuration (NLA_NESTED)
- * @DCB_ATTR_IEEE: IEEE 802.1Qaz supported attributes (NLA_NESTED)
- * @DCB_ATTR_DCBX: DCBX engine configuration in the device (NLA_U8)
- * @DCB_ATTR_FEATCFG: DCBX features flags (NLA_NESTED)
- * @DCB_ATTR_CEE: CEE std supported attributes (NLA_NESTED)
- */
-enum dcbnl_attrs {
-	DCB_ATTR_UNDEFINED,
-
-	DCB_ATTR_IFNAME,
-	DCB_ATTR_STATE,
-	DCB_ATTR_PFC_STATE,
-	DCB_ATTR_PFC_CFG,
-	DCB_ATTR_NUM_TC,
-	DCB_ATTR_PG_CFG,
-	DCB_ATTR_SET_ALL,
-	DCB_ATTR_PERM_HWADDR,
-	DCB_ATTR_CAP,
-	DCB_ATTR_NUMTCS,
-	DCB_ATTR_BCN,
-	DCB_ATTR_APP,
-
-	/* IEEE std attributes */
-	DCB_ATTR_IEEE,
-
-	DCB_ATTR_DCBX,
-	DCB_ATTR_FEATCFG,
-
-	/* CEE nested attributes */
-	DCB_ATTR_CEE,
-
-	__DCB_ATTR_ENUM_MAX,
-	DCB_ATTR_MAX = __DCB_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * enum ieee_attrs - IEEE 802.1Qaz get/set attributes
- *
- * @DCB_ATTR_IEEE_UNSPEC: unspecified
- * @DCB_ATTR_IEEE_ETS: negotiated ETS configuration
- * @DCB_ATTR_IEEE_PFC: negotiated PFC configuration
- * @DCB_ATTR_IEEE_APP_TABLE: negotiated APP configuration
- * @DCB_ATTR_IEEE_PEER_ETS: peer ETS configuration - get only
- * @DCB_ATTR_IEEE_PEER_PFC: peer PFC configuration - get only
- * @DCB_ATTR_IEEE_PEER_APP: peer APP tlv - get only
- */
-enum ieee_attrs {
-	DCB_ATTR_IEEE_UNSPEC,
-	DCB_ATTR_IEEE_ETS,
-	DCB_ATTR_IEEE_PFC,
-	DCB_ATTR_IEEE_APP_TABLE,
-	DCB_ATTR_IEEE_PEER_ETS,
-	DCB_ATTR_IEEE_PEER_PFC,
-	DCB_ATTR_IEEE_PEER_APP,
-	DCB_ATTR_IEEE_MAXRATE,
-	DCB_ATTR_IEEE_QCN,
-	DCB_ATTR_IEEE_QCN_STATS,
-	__DCB_ATTR_IEEE_MAX
-};
-#define DCB_ATTR_IEEE_MAX (__DCB_ATTR_IEEE_MAX - 1)
-
-enum ieee_attrs_app {
-	DCB_ATTR_IEEE_APP_UNSPEC,
-	DCB_ATTR_IEEE_APP,
-	__DCB_ATTR_IEEE_APP_MAX
-};
-#define DCB_ATTR_IEEE_APP_MAX (__DCB_ATTR_IEEE_APP_MAX - 1)
-
-/**
- * enum cee_attrs - CEE DCBX get attributes.
- *
- * @DCB_ATTR_CEE_UNSPEC: unspecified
- * @DCB_ATTR_CEE_PEER_PG: peer PG configuration - get only
- * @DCB_ATTR_CEE_PEER_PFC: peer PFC configuration - get only
- * @DCB_ATTR_CEE_PEER_APP_TABLE: peer APP tlv - get only
- * @DCB_ATTR_CEE_TX_PG: TX PG configuration (DCB_CMD_PGTX_GCFG)
- * @DCB_ATTR_CEE_RX_PG: RX PG configuration (DCB_CMD_PGRX_GCFG)
- * @DCB_ATTR_CEE_PFC: PFC configuration (DCB_CMD_PFC_GCFG)
- * @DCB_ATTR_CEE_APP_TABLE: APP configuration (multi DCB_CMD_GAPP)
- * @DCB_ATTR_CEE_FEAT: DCBX features flags (DCB_CMD_GFEATCFG)
- *
- * An aggregated collection of the cee std negotiated parameters.
- */
-enum cee_attrs {
-	DCB_ATTR_CEE_UNSPEC,
-	DCB_ATTR_CEE_PEER_PG,
-	DCB_ATTR_CEE_PEER_PFC,
-	DCB_ATTR_CEE_PEER_APP_TABLE,
-	DCB_ATTR_CEE_TX_PG,
-	DCB_ATTR_CEE_RX_PG,
-	DCB_ATTR_CEE_PFC,
-	DCB_ATTR_CEE_APP_TABLE,
-	DCB_ATTR_CEE_FEAT,
-	__DCB_ATTR_CEE_MAX
-};
-#define DCB_ATTR_CEE_MAX (__DCB_ATTR_CEE_MAX - 1)
-
-enum peer_app_attr {
-	DCB_ATTR_CEE_PEER_APP_UNSPEC,
-	DCB_ATTR_CEE_PEER_APP_INFO,
-	DCB_ATTR_CEE_PEER_APP,
-	__DCB_ATTR_CEE_PEER_APP_MAX
-};
-#define DCB_ATTR_CEE_PEER_APP_MAX (__DCB_ATTR_CEE_PEER_APP_MAX - 1)
-
-enum cee_attrs_app {
-	DCB_ATTR_CEE_APP_UNSPEC,
-	DCB_ATTR_CEE_APP,
-	__DCB_ATTR_CEE_APP_MAX
-};
-#define DCB_ATTR_CEE_APP_MAX (__DCB_ATTR_CEE_APP_MAX - 1)
-
-/**
- * enum dcbnl_pfc_attrs - DCB Priority Flow Control user priority nested attrs
- *
- * @DCB_PFC_UP_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_PFC_UP_ATTR_0: Priority Flow Control value for User Priority 0 (NLA_U8)
- * @DCB_PFC_UP_ATTR_1: Priority Flow Control value for User Priority 1 (NLA_U8)
- * @DCB_PFC_UP_ATTR_2: Priority Flow Control value for User Priority 2 (NLA_U8)
- * @DCB_PFC_UP_ATTR_3: Priority Flow Control value for User Priority 3 (NLA_U8)
- * @DCB_PFC_UP_ATTR_4: Priority Flow Control value for User Priority 4 (NLA_U8)
- * @DCB_PFC_UP_ATTR_5: Priority Flow Control value for User Priority 5 (NLA_U8)
- * @DCB_PFC_UP_ATTR_6: Priority Flow Control value for User Priority 6 (NLA_U8)
- * @DCB_PFC_UP_ATTR_7: Priority Flow Control value for User Priority 7 (NLA_U8)
- * @DCB_PFC_UP_ATTR_MAX: highest attribute number currently defined
- * @DCB_PFC_UP_ATTR_ALL: apply to all priority flow control attrs (NLA_FLAG)
- *
- */
-enum dcbnl_pfc_up_attrs {
-	DCB_PFC_UP_ATTR_UNDEFINED,
-
-	DCB_PFC_UP_ATTR_0,
-	DCB_PFC_UP_ATTR_1,
-	DCB_PFC_UP_ATTR_2,
-	DCB_PFC_UP_ATTR_3,
-	DCB_PFC_UP_ATTR_4,
-	DCB_PFC_UP_ATTR_5,
-	DCB_PFC_UP_ATTR_6,
-	DCB_PFC_UP_ATTR_7,
-	DCB_PFC_UP_ATTR_ALL,
-
-	__DCB_PFC_UP_ATTR_ENUM_MAX,
-	DCB_PFC_UP_ATTR_MAX = __DCB_PFC_UP_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * enum dcbnl_pg_attrs - DCB Priority Group attributes
- *
- * @DCB_PG_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_PG_ATTR_TC_0: Priority Group Traffic Class 0 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_1: Priority Group Traffic Class 1 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_2: Priority Group Traffic Class 2 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_3: Priority Group Traffic Class 3 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_4: Priority Group Traffic Class 4 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_5: Priority Group Traffic Class 5 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_6: Priority Group Traffic Class 6 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_7: Priority Group Traffic Class 7 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_MAX: highest attribute number currently defined
- * @DCB_PG_ATTR_TC_ALL: apply to all traffic classes (NLA_NESTED)
- * @DCB_PG_ATTR_BW_ID_0: Percent of link bandwidth for Priority Group 0 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_1: Percent of link bandwidth for Priority Group 1 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_2: Percent of link bandwidth for Priority Group 2 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_3: Percent of link bandwidth for Priority Group 3 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_4: Percent of link bandwidth for Priority Group 4 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_5: Percent of link bandwidth for Priority Group 5 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_6: Percent of link bandwidth for Priority Group 6 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_7: Percent of link bandwidth for Priority Group 7 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_MAX: highest attribute number currently defined
- * @DCB_PG_ATTR_BW_ID_ALL: apply to all priority groups (NLA_FLAG)
- *
- */
-enum dcbnl_pg_attrs {
-	DCB_PG_ATTR_UNDEFINED,
-
-	DCB_PG_ATTR_TC_0,
-	DCB_PG_ATTR_TC_1,
-	DCB_PG_ATTR_TC_2,
-	DCB_PG_ATTR_TC_3,
-	DCB_PG_ATTR_TC_4,
-	DCB_PG_ATTR_TC_5,
-	DCB_PG_ATTR_TC_6,
-	DCB_PG_ATTR_TC_7,
-	DCB_PG_ATTR_TC_MAX,
-	DCB_PG_ATTR_TC_ALL,
-
-	DCB_PG_ATTR_BW_ID_0,
-	DCB_PG_ATTR_BW_ID_1,
-	DCB_PG_ATTR_BW_ID_2,
-	DCB_PG_ATTR_BW_ID_3,
-	DCB_PG_ATTR_BW_ID_4,
-	DCB_PG_ATTR_BW_ID_5,
-	DCB_PG_ATTR_BW_ID_6,
-	DCB_PG_ATTR_BW_ID_7,
-	DCB_PG_ATTR_BW_ID_MAX,
-	DCB_PG_ATTR_BW_ID_ALL,
-
-	__DCB_PG_ATTR_ENUM_MAX,
-	DCB_PG_ATTR_MAX = __DCB_PG_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * enum dcbnl_tc_attrs - DCB Traffic Class attributes
- *
- * @DCB_TC_ATTR_PARAM_UNDEFINED: unspecified attribute to catch errors
- * @DCB_TC_ATTR_PARAM_PGID: (NLA_U8) Priority group the traffic class belongs to
- *                          Valid values are:  0-7
- * @DCB_TC_ATTR_PARAM_UP_MAPPING: (NLA_U8) Traffic class to user priority map
- *                                Some devices may not support changing the
- *                                user priority map of a TC.
- * @DCB_TC_ATTR_PARAM_STRICT_PRIO: (NLA_U8) Strict priority setting
- *                                 0 - none
- *                                 1 - group strict
- *                                 2 - link strict
- * @DCB_TC_ATTR_PARAM_BW_PCT: optional - (NLA_U8) If supported by the device and
- *                            not configured to use link strict priority,
- *                            this is the percentage of bandwidth of the
- *                            priority group this traffic class belongs to
- * @DCB_TC_ATTR_PARAM_ALL: (NLA_FLAG) all traffic class parameters
- *
- */
-enum dcbnl_tc_attrs {
-	DCB_TC_ATTR_PARAM_UNDEFINED,
-
-	DCB_TC_ATTR_PARAM_PGID,
-	DCB_TC_ATTR_PARAM_UP_MAPPING,
-	DCB_TC_ATTR_PARAM_STRICT_PRIO,
-	DCB_TC_ATTR_PARAM_BW_PCT,
-	DCB_TC_ATTR_PARAM_ALL,
-
-	__DCB_TC_ATTR_PARAM_ENUM_MAX,
-	DCB_TC_ATTR_PARAM_MAX = __DCB_TC_ATTR_PARAM_ENUM_MAX - 1,
-};
-
-/**
- * enum dcbnl_cap_attrs - DCB Capability attributes
- *
- * @DCB_CAP_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_CAP_ATTR_ALL: (NLA_FLAG) all capability parameters
- * @DCB_CAP_ATTR_PG: (NLA_U8) device supports Priority Groups
- * @DCB_CAP_ATTR_PFC: (NLA_U8) device supports Priority Flow Control
- * @DCB_CAP_ATTR_UP2TC: (NLA_U8) device supports user priority to
- *                               traffic class mapping
- * @DCB_CAP_ATTR_PG_TCS: (NLA_U8) bitmap where each bit represents a
- *                                number of traffic classes the device
- *                                can be configured to use for Priority Groups
- * @DCB_CAP_ATTR_PFC_TCS: (NLA_U8) bitmap where each bit represents a
- *                                 number of traffic classes the device can be
- *                                 configured to use for Priority Flow Control
- * @DCB_CAP_ATTR_GSP: (NLA_U8) device supports group strict priority
- * @DCB_CAP_ATTR_BCN: (NLA_U8) device supports Backwards Congestion
- *                             Notification
- * @DCB_CAP_ATTR_DCBX: (NLA_U8) device supports DCBX engine
- *
- */
-enum dcbnl_cap_attrs {
-	DCB_CAP_ATTR_UNDEFINED,
-	DCB_CAP_ATTR_ALL,
-	DCB_CAP_ATTR_PG,
-	DCB_CAP_ATTR_PFC,
-	DCB_CAP_ATTR_UP2TC,
-	DCB_CAP_ATTR_PG_TCS,
-	DCB_CAP_ATTR_PFC_TCS,
-	DCB_CAP_ATTR_GSP,
-	DCB_CAP_ATTR_BCN,
-	DCB_CAP_ATTR_DCBX,
-
-	__DCB_CAP_ATTR_ENUM_MAX,
-	DCB_CAP_ATTR_MAX = __DCB_CAP_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * DCBX capability flags
- *
- * @DCB_CAP_DCBX_HOST: DCBX negotiation is performed by the host LLDP agent.
- *                     'set' routines are used to configure the device with
- *                     the negotiated parameters
- *
- * @DCB_CAP_DCBX_LLD_MANAGED: DCBX negotiation is not performed in the host but
- *                            by another entity
- *                            'get' routines are used to retrieve the
- *                            negotiated parameters
- *                            'set' routines can be used to set the initial
- *                            negotiation configuration
- *
- * @DCB_CAP_DCBX_VER_CEE: for a non-host DCBX engine, indicates the engine
- *                        supports the CEE protocol flavor
- *
- * @DCB_CAP_DCBX_VER_IEEE: for a non-host DCBX engine, indicates the engine
- *                         supports the IEEE protocol flavor
- *
- * @DCB_CAP_DCBX_STATIC: for a non-host DCBX engine, indicates the engine
- *                       supports static configuration (i.e no actual
- *                       negotiation is performed negotiated parameters equal
- *                       the initial configuration)
- *
- */
-#define DCB_CAP_DCBX_HOST		0x01
-#define DCB_CAP_DCBX_LLD_MANAGED	0x02
-#define DCB_CAP_DCBX_VER_CEE		0x04
-#define DCB_CAP_DCBX_VER_IEEE		0x08
-#define DCB_CAP_DCBX_STATIC		0x10
-
-/**
- * enum dcbnl_numtcs_attrs - number of traffic classes
- *
- * @DCB_NUMTCS_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_NUMTCS_ATTR_ALL: (NLA_FLAG) all traffic class attributes
- * @DCB_NUMTCS_ATTR_PG: (NLA_U8) number of traffic classes used for
- *                               priority groups
- * @DCB_NUMTCS_ATTR_PFC: (NLA_U8) number of traffic classes which can
- *                                support priority flow control
- */
-enum dcbnl_numtcs_attrs {
-	DCB_NUMTCS_ATTR_UNDEFINED,
-	DCB_NUMTCS_ATTR_ALL,
-	DCB_NUMTCS_ATTR_PG,
-	DCB_NUMTCS_ATTR_PFC,
-
-	__DCB_NUMTCS_ATTR_ENUM_MAX,
-	DCB_NUMTCS_ATTR_MAX = __DCB_NUMTCS_ATTR_ENUM_MAX - 1,
-};
-
-enum dcbnl_bcn_attrs{
-	DCB_BCN_ATTR_UNDEFINED = 0,
-
-	DCB_BCN_ATTR_RP_0,
-	DCB_BCN_ATTR_RP_1,
-	DCB_BCN_ATTR_RP_2,
-	DCB_BCN_ATTR_RP_3,
-	DCB_BCN_ATTR_RP_4,
-	DCB_BCN_ATTR_RP_5,
-	DCB_BCN_ATTR_RP_6,
-	DCB_BCN_ATTR_RP_7,
-	DCB_BCN_ATTR_RP_ALL,
-
-	DCB_BCN_ATTR_BCNA_0,
-	DCB_BCN_ATTR_BCNA_1,
-	DCB_BCN_ATTR_ALPHA,
-	DCB_BCN_ATTR_BETA,
-	DCB_BCN_ATTR_GD,
-	DCB_BCN_ATTR_GI,
-	DCB_BCN_ATTR_TMAX,
-	DCB_BCN_ATTR_TD,
-	DCB_BCN_ATTR_RMIN,
-	DCB_BCN_ATTR_W,
-	DCB_BCN_ATTR_RD,
-	DCB_BCN_ATTR_RU,
-	DCB_BCN_ATTR_WRTT,
-	DCB_BCN_ATTR_RI,
-	DCB_BCN_ATTR_C,
-	DCB_BCN_ATTR_ALL,
-
-	__DCB_BCN_ATTR_ENUM_MAX,
-	DCB_BCN_ATTR_MAX = __DCB_BCN_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * enum dcb_general_attr_values - general DCB attribute values
- *
- * @DCB_ATTR_UNDEFINED: value used to indicate an attribute is not supported
- *
- */
-enum dcb_general_attr_values {
-	DCB_ATTR_VALUE_UNDEFINED = 0xff
-};
-
-#define DCB_APP_IDTYPE_ETHTYPE	0x00
-#define DCB_APP_IDTYPE_PORTNUM	0x01
-enum dcbnl_app_attrs {
-	DCB_APP_ATTR_UNDEFINED,
-
-	DCB_APP_ATTR_IDTYPE,
-	DCB_APP_ATTR_ID,
-	DCB_APP_ATTR_PRIORITY,
-
-	__DCB_APP_ATTR_ENUM_MAX,
-	DCB_APP_ATTR_MAX = __DCB_APP_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * enum dcbnl_featcfg_attrs - features conifiguration flags
- *
- * @DCB_FEATCFG_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_FEATCFG_ATTR_ALL: (NLA_FLAG) all features configuration attributes
- * @DCB_FEATCFG_ATTR_PG: (NLA_U8) configuration flags for priority groups
- * @DCB_FEATCFG_ATTR_PFC: (NLA_U8) configuration flags for priority
- *                                 flow control
- * @DCB_FEATCFG_ATTR_APP: (NLA_U8) configuration flags for application TLV
- *
- */
-#define DCB_FEATCFG_ERROR	0x01	/* error in feature resolution */
-#define DCB_FEATCFG_ENABLE	0x02	/* enable feature */
-#define DCB_FEATCFG_WILLING	0x04	/* feature is willing */
-#define DCB_FEATCFG_ADVERTISE	0x08	/* advertise feature */
-enum dcbnl_featcfg_attrs {
-	DCB_FEATCFG_ATTR_UNDEFINED,
-	DCB_FEATCFG_ATTR_ALL,
-	DCB_FEATCFG_ATTR_PG,
-	DCB_FEATCFG_ATTR_PFC,
-	DCB_FEATCFG_ATTR_APP,
-
-	__DCB_FEATCFG_ATTR_ENUM_MAX,
-	DCB_FEATCFG_ATTR_MAX = __DCB_FEATCFG_ATTR_ENUM_MAX - 1,
-};
-
-#endif /* __LINUX_DCBNL_H__ */
diff --git a/openflow/usr/include/linux/dccp.h b/openflow/usr/include/linux/dccp.h
deleted file mode 100644
index d0e2226..0000000
--- a/openflow/usr/include/linux/dccp.h
+++ /dev/null
@@ -1,237 +0,0 @@
-#ifndef _LINUX_DCCP_H
-#define _LINUX_DCCP_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/**
- * struct dccp_hdr - generic part of DCCP packet header
- *
- * @dccph_sport - Relevant port on the endpoint that sent this packet
- * @dccph_dport - Relevant port on the other endpoint
- * @dccph_doff - Data Offset from the start of the DCCP header, in 32-bit words
- * @dccph_ccval - Used by the HC-Sender CCID
- * @dccph_cscov - Parts of the packet that are covered by the Checksum field
- * @dccph_checksum - Internet checksum, depends on dccph_cscov
- * @dccph_x - 0 = 24 bit sequence number, 1 = 48
- * @dccph_type - packet type, see DCCP_PKT_ prefixed macros
- * @dccph_seq - sequence number high or low order 24 bits, depends on dccph_x
- */
-struct dccp_hdr {
-	__be16	dccph_sport,
-		dccph_dport;
-	__u8	dccph_doff;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8	dccph_cscov:4,
-		dccph_ccval:4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-	__u8	dccph_ccval:4,
-		dccph_cscov:4;
-#else
-#error  "Adjust your <asm/byteorder.h> defines"
-#endif
-	__sum16	dccph_checksum;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8	dccph_x:1,
-		dccph_type:4,
-		dccph_reserved:3;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-	__u8	dccph_reserved:3,
-		dccph_type:4,
-		dccph_x:1;
-#else
-#error  "Adjust your <asm/byteorder.h> defines"
-#endif
-	__u8	dccph_seq2;
-	__be16	dccph_seq;
-};
-
-/**
- * struct dccp_hdr_ext - the low bits of a 48 bit seq packet
- *
- * @dccph_seq_low - low 24 bits of a 48 bit seq packet
- */
-struct dccp_hdr_ext {
-	__be32	dccph_seq_low;
-};
-
-/**
- * struct dccp_hdr_request - Connection initiation request header
- *
- * @dccph_req_service - Service to which the client app wants to connect
- */
-struct dccp_hdr_request {
-	__be32	dccph_req_service;
-};
-/**
- * struct dccp_hdr_ack_bits - acknowledgment bits common to most packets
- *
- * @dccph_resp_ack_nr_high - 48 bit ack number high order bits, contains GSR
- * @dccph_resp_ack_nr_low - 48 bit ack number low order bits, contains GSR
- */
-struct dccp_hdr_ack_bits {
-	__be16	dccph_reserved1;
-	__be16	dccph_ack_nr_high;
-	__be32	dccph_ack_nr_low;
-};
-/**
- * struct dccp_hdr_response - Connection initiation response header
- *
- * @dccph_resp_ack - 48 bit Acknowledgment Number Subheader (5.3)
- * @dccph_resp_service - Echoes the Service Code on a received DCCP-Request
- */
-struct dccp_hdr_response {
-	struct dccp_hdr_ack_bits	dccph_resp_ack;
-	__be32				dccph_resp_service;
-};
-
-/**
- * struct dccp_hdr_reset - Unconditionally shut down a connection
- *
- * @dccph_reset_ack - 48 bit Acknowledgment Number Subheader (5.6)
- * @dccph_reset_code - one of %dccp_reset_codes
- * @dccph_reset_data - the Data 1 ... Data 3 fields from 5.6
- */
-struct dccp_hdr_reset {
-	struct dccp_hdr_ack_bits	dccph_reset_ack;
-	__u8				dccph_reset_code,
-					dccph_reset_data[3];
-};
-
-enum dccp_pkt_type {
-	DCCP_PKT_REQUEST = 0,
-	DCCP_PKT_RESPONSE,
-	DCCP_PKT_DATA,
-	DCCP_PKT_ACK,
-	DCCP_PKT_DATAACK,
-	DCCP_PKT_CLOSEREQ,
-	DCCP_PKT_CLOSE,
-	DCCP_PKT_RESET,
-	DCCP_PKT_SYNC,
-	DCCP_PKT_SYNCACK,
-	DCCP_PKT_INVALID,
-};
-
-#define DCCP_NR_PKT_TYPES DCCP_PKT_INVALID
-
-static __inline__ unsigned int dccp_packet_hdr_len(const __u8 type)
-{
-	if (type == DCCP_PKT_DATA)
-		return 0;
-	if (type == DCCP_PKT_DATAACK	||
-	    type == DCCP_PKT_ACK	||
-	    type == DCCP_PKT_SYNC	||
-	    type == DCCP_PKT_SYNCACK	||
-	    type == DCCP_PKT_CLOSE	||
-	    type == DCCP_PKT_CLOSEREQ)
-		return sizeof(struct dccp_hdr_ack_bits);
-	if (type == DCCP_PKT_REQUEST)
-		return sizeof(struct dccp_hdr_request);
-	if (type == DCCP_PKT_RESPONSE)
-		return sizeof(struct dccp_hdr_response);
-	return sizeof(struct dccp_hdr_reset);
-}
-enum dccp_reset_codes {
-	DCCP_RESET_CODE_UNSPECIFIED = 0,
-	DCCP_RESET_CODE_CLOSED,
-	DCCP_RESET_CODE_ABORTED,
-	DCCP_RESET_CODE_NO_CONNECTION,
-	DCCP_RESET_CODE_PACKET_ERROR,
-	DCCP_RESET_CODE_OPTION_ERROR,
-	DCCP_RESET_CODE_MANDATORY_ERROR,
-	DCCP_RESET_CODE_CONNECTION_REFUSED,
-	DCCP_RESET_CODE_BAD_SERVICE_CODE,
-	DCCP_RESET_CODE_TOO_BUSY,
-	DCCP_RESET_CODE_BAD_INIT_COOKIE,
-	DCCP_RESET_CODE_AGGRESSION_PENALTY,
-
-	DCCP_MAX_RESET_CODES		/* Leave at the end!  */
-};
-
-/* DCCP options */
-enum {
-	DCCPO_PADDING = 0,
-	DCCPO_MANDATORY = 1,
-	DCCPO_MIN_RESERVED = 3,
-	DCCPO_MAX_RESERVED = 31,
-	DCCPO_CHANGE_L = 32,
-	DCCPO_CONFIRM_L = 33,
-	DCCPO_CHANGE_R = 34,
-	DCCPO_CONFIRM_R = 35,
-	DCCPO_NDP_COUNT = 37,
-	DCCPO_ACK_VECTOR_0 = 38,
-	DCCPO_ACK_VECTOR_1 = 39,
-	DCCPO_TIMESTAMP = 41,
-	DCCPO_TIMESTAMP_ECHO = 42,
-	DCCPO_ELAPSED_TIME = 43,
-	DCCPO_MAX = 45,
-	DCCPO_MIN_RX_CCID_SPECIFIC = 128,	/* from sender to receiver */
-	DCCPO_MAX_RX_CCID_SPECIFIC = 191,
-	DCCPO_MIN_TX_CCID_SPECIFIC = 192,	/* from receiver to sender */
-	DCCPO_MAX_TX_CCID_SPECIFIC = 255,
-};
-/* maximum size of a single TLV-encoded DCCP option (sans type/len bytes) */
-#define DCCP_SINGLE_OPT_MAXLEN	253
-
-/* DCCP CCIDS */
-enum {
-	DCCPC_CCID2 = 2,
-	DCCPC_CCID3 = 3,
-};
-
-/* DCCP features (RFC 4340 section 6.4) */
-enum dccp_feature_numbers {
-	DCCPF_RESERVED = 0,
-	DCCPF_CCID = 1,
-	DCCPF_SHORT_SEQNOS = 2,
-	DCCPF_SEQUENCE_WINDOW = 3,
-	DCCPF_ECN_INCAPABLE = 4,
-	DCCPF_ACK_RATIO = 5,
-	DCCPF_SEND_ACK_VECTOR = 6,
-	DCCPF_SEND_NDP_COUNT = 7,
-	DCCPF_MIN_CSUM_COVER = 8,
-	DCCPF_DATA_CHECKSUM = 9,
-	/* 10-127 reserved */
-	DCCPF_MIN_CCID_SPECIFIC = 128,
-	DCCPF_SEND_LEV_RATE = 192,	/* RFC 4342, sec. 8.4 */
-	DCCPF_MAX_CCID_SPECIFIC = 255,
-};
-
-/* DCCP socket control message types for cmsg */
-enum dccp_cmsg_type {
-	DCCP_SCM_PRIORITY = 1,
-	DCCP_SCM_QPOLICY_MAX = 0xFFFF,
-	/* ^-- Up to here reserved exclusively for qpolicy parameters */
-	DCCP_SCM_MAX
-};
-
-/* DCCP priorities for outgoing/queued packets */
-enum dccp_packet_dequeueing_policy {
-	DCCPQ_POLICY_SIMPLE,
-	DCCPQ_POLICY_PRIO,
-	DCCPQ_POLICY_MAX
-};
-
-/* DCCP socket options */
-#define DCCP_SOCKOPT_PACKET_SIZE	1 /* XXX deprecated, without effect */
-#define DCCP_SOCKOPT_SERVICE		2
-#define DCCP_SOCKOPT_CHANGE_L		3
-#define DCCP_SOCKOPT_CHANGE_R		4
-#define DCCP_SOCKOPT_GET_CUR_MPS	5
-#define DCCP_SOCKOPT_SERVER_TIMEWAIT	6
-#define DCCP_SOCKOPT_SEND_CSCOV		10
-#define DCCP_SOCKOPT_RECV_CSCOV		11
-#define DCCP_SOCKOPT_AVAILABLE_CCIDS	12
-#define DCCP_SOCKOPT_CCID		13
-#define DCCP_SOCKOPT_TX_CCID		14
-#define DCCP_SOCKOPT_RX_CCID		15
-#define DCCP_SOCKOPT_QPOLICY_ID		16
-#define DCCP_SOCKOPT_QPOLICY_TXQLEN	17
-#define DCCP_SOCKOPT_CCID_RX_INFO	128
-#define DCCP_SOCKOPT_CCID_TX_INFO	192
-
-/* maximum number of services provided on the same listening port */
-#define DCCP_SERVICE_LIST_MAX_LEN      32
-
-
-#endif /* _LINUX_DCCP_H */
diff --git a/openflow/usr/include/linux/dlm.h b/openflow/usr/include/linux/dlm.h
deleted file mode 100644
index 6120d50..0000000
--- a/openflow/usr/include/linux/dlm.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/******************************************************************************
-*******************************************************************************
-**
-**  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004-2011 Red Hat, Inc.  All rights reserved.
-**
-**  This copyrighted material is made available to anyone wishing to use,
-**  modify, copy, or redistribute it subject to the terms and conditions
-**  of the GNU General Public License v.2.
-**
-*******************************************************************************
-******************************************************************************/
-
-#ifndef __DLM_DOT_H__
-#define __DLM_DOT_H__
-
-/*
- * Interface to Distributed Lock Manager (DLM)
- * routines and structures to use DLM lockspaces
- */
-
-/* Lock levels and flags are here */
-#include <linux/dlmconstants.h>
-#include <linux/types.h>
-
-typedef void dlm_lockspace_t;
-
-/*
- * Lock status block
- *
- * Use this structure to specify the contents of the lock value block.  For a
- * conversion request, this structure is used to specify the lock ID of the
- * lock.  DLM writes the status of the lock request and the lock ID assigned
- * to the request in the lock status block.
- *
- * sb_lkid: the returned lock ID.  It is set on new (non-conversion) requests.
- * It is available when dlm_lock returns.
- *
- * sb_lvbptr: saves or returns the contents of the lock's LVB according to rules
- * shown for the DLM_LKF_VALBLK flag.
- *
- * sb_flags: DLM_SBF_DEMOTED is returned if in the process of promoting a lock,
- * it was first demoted to NL to avoid conversion deadlock.
- * DLM_SBF_VALNOTVALID is returned if the resource's LVB is marked invalid.
- *
- * sb_status: the returned status of the lock request set prior to AST
- * execution.  Possible return values:
- *
- * 0 if lock request was successful
- * -EAGAIN if request would block and is flagged DLM_LKF_NOQUEUE
- * -DLM_EUNLOCK if unlock request was successful
- * -DLM_ECANCEL if a cancel completed successfully
- * -EDEADLK if a deadlock was detected
- * -ETIMEDOUT if the lock request was canceled due to a timeout
- */
-
-#define DLM_SBF_DEMOTED		0x01
-#define DLM_SBF_VALNOTVALID	0x02
-#define DLM_SBF_ALTMODE		0x04
-
-struct dlm_lksb {
-	int 	 sb_status;
-	__u32	 sb_lkid;
-	char 	 sb_flags;
-	char *	 sb_lvbptr;
-};
-
-/* dlm_new_lockspace() flags */
-
-#define DLM_LSFL_TIMEWARN	0x00000002
-#define DLM_LSFL_FS     	0x00000004
-#define DLM_LSFL_NEWEXCL     	0x00000008
-
-
-#endif /* __DLM_DOT_H__ */
diff --git a/openflow/usr/include/linux/dlm_device.h b/openflow/usr/include/linux/dlm_device.h
deleted file mode 100644
index 45f8101..0000000
--- a/openflow/usr/include/linux/dlm_device.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/******************************************************************************
-*******************************************************************************
-**
-**  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.
-**
-**  This copyrighted material is made available to anyone wishing to use,
-**  modify, copy, or redistribute it subject to the terms and conditions
-**  of the GNU General Public License v.2.
-**
-*******************************************************************************
-******************************************************************************/
-
-#ifndef _LINUX_DLM_DEVICE_H
-#define _LINUX_DLM_DEVICE_H
-
-/* This is the device interface for dlm, most users will use a library
- * interface.
- */
-
-#include <linux/dlm.h>
-#include <linux/types.h>
-
-#define DLM_USER_LVB_LEN	32
-
-/* Version of the device interface */
-#define DLM_DEVICE_VERSION_MAJOR 6
-#define DLM_DEVICE_VERSION_MINOR 0
-#define DLM_DEVICE_VERSION_PATCH 2
-
-/* struct passed to the lock write */
-struct dlm_lock_params {
-	__u8 mode;
-	__u8 namelen;
-	__u16 unused;
-	__u32 flags;
-	__u32 lkid;
-	__u32 parent;
-	__u64 xid;
-	__u64 timeout;
-	void *castparam;
-	void *castaddr;
-	void *bastparam;
-	void *bastaddr;
-	struct dlm_lksb *lksb;
-	char lvb[DLM_USER_LVB_LEN];
-	char name[0];
-};
-
-struct dlm_lspace_params {
-	__u32 flags;
-	__u32 minor;
-	char name[0];
-};
-
-struct dlm_purge_params {
-	__u32 nodeid;
-	__u32 pid;
-};
-
-struct dlm_write_request {
-	__u32 version[3];
-	__u8 cmd;
-	__u8 is64bit;
-	__u8 unused[2];
-
-	union  {
-		struct dlm_lock_params   lock;
-		struct dlm_lspace_params lspace;
-		struct dlm_purge_params  purge;
-	} i;
-};
-
-struct dlm_device_version {
-	__u32 version[3];
-};
-
-/* struct read from the "device" fd,
-   consists mainly of userspace pointers for the library to use */
-
-struct dlm_lock_result {
-	__u32 version[3];
-	__u32 length;
-	void * user_astaddr;
-	void * user_astparam;
-	struct dlm_lksb * user_lksb;
-	struct dlm_lksb lksb;
-	__u8 bast_mode;
-	__u8 unused[3];
-	/* Offsets may be zero if no data is present */
-	__u32 lvb_offset;
-};
-
-/* Commands passed to the device */
-#define DLM_USER_LOCK         1
-#define DLM_USER_UNLOCK       2
-#define DLM_USER_QUERY        3
-#define DLM_USER_CREATE_LOCKSPACE  4
-#define DLM_USER_REMOVE_LOCKSPACE  5
-#define DLM_USER_PURGE        6
-#define DLM_USER_DEADLOCK     7
-
-/* Lockspace flags */
-#define DLM_USER_LSFLG_AUTOFREE   1
-#define DLM_USER_LSFLG_FORCEFREE  2
-
-#endif
-
diff --git a/openflow/usr/include/linux/dlm_netlink.h b/openflow/usr/include/linux/dlm_netlink.h
deleted file mode 100644
index 647c8ef..0000000
--- a/openflow/usr/include/linux/dlm_netlink.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2007 Red Hat, Inc.  All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- */
-
-#ifndef _DLM_NETLINK_H
-#define _DLM_NETLINK_H
-
-#include <linux/types.h>
-
-enum {
-	DLM_STATUS_WAITING = 1,
-	DLM_STATUS_GRANTED = 2,
-	DLM_STATUS_CONVERT = 3,
-};
-
-#define DLM_LOCK_DATA_VERSION 1
-
-struct dlm_lock_data {
-	__u16 version;
-	__u32 lockspace_id;
-	int nodeid;
-	int ownpid;
-	__u32 id;
-	__u32 remid;
-	__u64 xid;
-	__s8 status;
-	__s8 grmode;
-	__s8 rqmode;
-	unsigned long timestamp;
-	int resource_namelen;
-	char resource_name[DLM_RESNAME_MAXLEN];
-};
-
-enum {
-	DLM_CMD_UNSPEC = 0,
-	DLM_CMD_HELLO,		/* user->kernel */
-	DLM_CMD_TIMEOUT,	/* kernel->user */
-	__DLM_CMD_MAX,
-};
-
-#define DLM_CMD_MAX (__DLM_CMD_MAX - 1)
-
-enum {
-	DLM_TYPE_UNSPEC = 0,
-	DLM_TYPE_LOCK,
-	__DLM_TYPE_MAX,
-};
-
-#define DLM_TYPE_MAX (__DLM_TYPE_MAX - 1)
-
-#define DLM_GENL_VERSION 0x1
-#define DLM_GENL_NAME "DLM"
-
-#endif /* _DLM_NETLINK_H */
diff --git a/openflow/usr/include/linux/dlm_plock.h b/openflow/usr/include/linux/dlm_plock.h
deleted file mode 100644
index 6403ea2..0000000
--- a/openflow/usr/include/linux/dlm_plock.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005-2008 Red Hat, Inc.  All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- */
-
-#ifndef __DLM_PLOCK_DOT_H__
-#define __DLM_PLOCK_DOT_H__
-
-#include <linux/types.h>
-
-#define DLM_PLOCK_MISC_NAME		"dlm_plock"
-
-#define DLM_PLOCK_VERSION_MAJOR	1
-#define DLM_PLOCK_VERSION_MINOR	2
-#define DLM_PLOCK_VERSION_PATCH	0
-
-enum {
-	DLM_PLOCK_OP_LOCK = 1,
-	DLM_PLOCK_OP_UNLOCK,
-	DLM_PLOCK_OP_GET,
-};
-
-#define DLM_PLOCK_FL_CLOSE 1
-
-struct dlm_plock_info {
-	__u32 version[3];
-	__u8 optype;
-	__u8 ex;
-	__u8 wait;
-	__u8 flags;
-	__u32 pid;
-	__s32 nodeid;
-	__s32 rv;
-	__u32 fsid;
-	__u64 number;
-	__u64 start;
-	__u64 end;
-	__u64 owner;
-};
-
-
-#endif /* __DLM_PLOCK_DOT_H__ */
diff --git a/openflow/usr/include/linux/dlmconstants.h b/openflow/usr/include/linux/dlmconstants.h
deleted file mode 100644
index 2857bdc..0000000
--- a/openflow/usr/include/linux/dlmconstants.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/******************************************************************************
-*******************************************************************************
-**
-**  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.
-**
-**  This copyrighted material is made available to anyone wishing to use,
-**  modify, copy, or redistribute it subject to the terms and conditions
-**  of the GNU General Public License v.2.
-**
-*******************************************************************************
-******************************************************************************/
-
-#ifndef __DLMCONSTANTS_DOT_H__
-#define __DLMCONSTANTS_DOT_H__
-
-/*
- * Constants used by DLM interface.
- */
-
-#define DLM_LOCKSPACE_LEN       64
-#define DLM_RESNAME_MAXLEN      64
-
-
-/*
- * Lock Modes
- */
-
-#define DLM_LOCK_IV		(-1)	/* invalid */
-#define DLM_LOCK_NL		0	/* null */
-#define DLM_LOCK_CR		1	/* concurrent read */
-#define DLM_LOCK_CW		2	/* concurrent write */
-#define DLM_LOCK_PR		3	/* protected read */
-#define DLM_LOCK_PW		4	/* protected write */
-#define DLM_LOCK_EX		5	/* exclusive */
-
-
-/*
- * Flags to dlm_lock
- *
- * DLM_LKF_NOQUEUE
- *
- * Do not queue the lock request on the wait queue if it cannot be granted
- * immediately.  If the lock cannot be granted because of this flag, DLM will
- * either return -EAGAIN from the dlm_lock call or will return 0 from
- * dlm_lock and -EAGAIN in the lock status block when the AST is executed.
- *
- * DLM_LKF_CANCEL
- *
- * Used to cancel a pending lock request or conversion.  A converting lock is
- * returned to its previously granted mode.
- *
- * DLM_LKF_CONVERT
- *
- * Indicates a lock conversion request.  For conversions the name and namelen
- * are ignored and the lock ID in the LKSB is used to identify the lock.
- *
- * DLM_LKF_VALBLK
- *
- * Requests DLM to return the current contents of the lock value block in the
- * lock status block.  When this flag is set in a lock conversion from PW or EX
- * modes, DLM assigns the value specified in the lock status block to the lock
- * value block of the lock resource.  The LVB is a DLM_LVB_LEN size array
- * containing application-specific information.
- *
- * DLM_LKF_QUECVT
- *
- * Force a conversion request to be queued, even if it is compatible with
- * the granted modes of other locks on the same resource.
- *
- * DLM_LKF_IVVALBLK
- *
- * Invalidate the lock value block.
- *
- * DLM_LKF_CONVDEADLK
- *
- * Allows the dlm to resolve conversion deadlocks internally by demoting the
- * granted mode of a converting lock to NL.  The DLM_SBF_DEMOTED flag is
- * returned for a conversion that's been effected by this.
- *
- * DLM_LKF_PERSISTENT
- *
- * Only relevant to locks originating in userspace.  A persistent lock will not
- * be removed if the process holding the lock exits.
- *
- * DLM_LKF_NODLCKWT
- *
- * Do not cancel the lock if it gets into conversion deadlock.
- * Exclude this lock from being monitored due to DLM_LSFL_TIMEWARN.
- *
- * DLM_LKF_NODLCKBLK
- *
- * net yet implemented
- *
- * DLM_LKF_EXPEDITE
- *
- * Used only with new requests for NL mode locks.  Tells the lock manager
- * to grant the lock, ignoring other locks in convert and wait queues.
- *
- * DLM_LKF_NOQUEUEBAST
- *
- * Send blocking AST's before returning -EAGAIN to the caller.  It is only
- * used along with the NOQUEUE flag.  Blocking AST's are not sent for failed
- * NOQUEUE requests otherwise.
- *
- * DLM_LKF_HEADQUE
- *
- * Add a lock to the head of the convert or wait queue rather than the tail.
- *
- * DLM_LKF_NOORDER
- *
- * Disregard the standard grant order rules and grant a lock as soon as it
- * is compatible with other granted locks.
- *
- * DLM_LKF_ORPHAN
- *
- * Acquire an orphan lock.
- *
- * DLM_LKF_ALTPR
- *
- * If the requested mode cannot be granted immediately, try to grant the lock
- * in PR mode instead.  If this alternate mode is granted instead of the
- * requested mode, DLM_SBF_ALTMODE is returned in the lksb.
- *
- * DLM_LKF_ALTCW
- *
- * The same as ALTPR, but the alternate mode is CW.
- *
- * DLM_LKF_FORCEUNLOCK
- *
- * Unlock the lock even if it is converting or waiting or has sublocks.
- * Only really for use by the userland device.c code.
- *
- */
-
-#define DLM_LKF_NOQUEUE		0x00000001
-#define DLM_LKF_CANCEL		0x00000002
-#define DLM_LKF_CONVERT		0x00000004
-#define DLM_LKF_VALBLK		0x00000008
-#define DLM_LKF_QUECVT		0x00000010
-#define DLM_LKF_IVVALBLK	0x00000020
-#define DLM_LKF_CONVDEADLK	0x00000040
-#define DLM_LKF_PERSISTENT	0x00000080
-#define DLM_LKF_NODLCKWT	0x00000100
-#define DLM_LKF_NODLCKBLK	0x00000200
-#define DLM_LKF_EXPEDITE	0x00000400
-#define DLM_LKF_NOQUEUEBAST	0x00000800
-#define DLM_LKF_HEADQUE		0x00001000
-#define DLM_LKF_NOORDER		0x00002000
-#define DLM_LKF_ORPHAN		0x00004000
-#define DLM_LKF_ALTPR		0x00008000
-#define DLM_LKF_ALTCW		0x00010000
-#define DLM_LKF_FORCEUNLOCK	0x00020000
-#define DLM_LKF_TIMEOUT		0x00040000
-
-/*
- * Some return codes that are not in errno.h
- */
-
-#define DLM_ECANCEL		0x10001
-#define DLM_EUNLOCK		0x10002
-
-#endif  /* __DLMCONSTANTS_DOT_H__ */
diff --git a/openflow/usr/include/linux/dm-ioctl.h b/openflow/usr/include/linux/dm-ioctl.h
deleted file mode 100644
index 30afd0a..0000000
--- a/openflow/usr/include/linux/dm-ioctl.h
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Copyright (C) 2001 - 2003 Sistina Software (UK) Limited.
- * Copyright (C) 2004 - 2009 Red Hat, Inc. All rights reserved.
- *
- * This file is released under the LGPL.
- */
-
-#ifndef _LINUX_DM_IOCTL_V4_H
-#define _LINUX_DM_IOCTL_V4_H
-
-#include <linux/types.h>
-
-#define DM_DIR "mapper"		/* Slashes not supported */
-#define DM_CONTROL_NODE "control"
-#define DM_MAX_TYPE_NAME 16
-#define DM_NAME_LEN 128
-#define DM_UUID_LEN 129
-
-/*
- * A traditional ioctl interface for the device mapper.
- *
- * Each device can have two tables associated with it, an
- * 'active' table which is the one currently used by io passing
- * through the device, and an 'inactive' one which is a table
- * that is being prepared as a replacement for the 'active' one.
- *
- * DM_VERSION:
- * Just get the version information for the ioctl interface.
- *
- * DM_REMOVE_ALL:
- * Remove all dm devices, destroy all tables.  Only really used
- * for debug.
- *
- * DM_LIST_DEVICES:
- * Get a list of all the dm device names.
- *
- * DM_DEV_CREATE:
- * Create a new device, neither the 'active' or 'inactive' table
- * slots will be filled.  The device will be in suspended state
- * after creation, however any io to the device will get errored
- * since it will be out-of-bounds.
- *
- * DM_DEV_REMOVE:
- * Remove a device, destroy any tables.
- *
- * DM_DEV_RENAME:
- * Rename a device or set its uuid if none was previously supplied.
- *
- * DM_SUSPEND:
- * This performs both suspend and resume, depending which flag is
- * passed in.
- * Suspend: This command will not return until all pending io to
- * the device has completed.  Further io will be deferred until
- * the device is resumed.
- * Resume: It is no longer an error to issue this command on an
- * unsuspended device.  If a table is present in the 'inactive'
- * slot, it will be moved to the active slot, then the old table
- * from the active slot will be _destroyed_.  Finally the device
- * is resumed.
- *
- * DM_DEV_STATUS:
- * Retrieves the status for the table in the 'active' slot.
- *
- * DM_DEV_WAIT:
- * Wait for a significant event to occur to the device.  This
- * could either be caused by an event triggered by one of the
- * targets of the table in the 'active' slot, or a table change.
- *
- * DM_TABLE_LOAD:
- * Load a table into the 'inactive' slot for the device.  The
- * device does _not_ need to be suspended prior to this command.
- *
- * DM_TABLE_CLEAR:
- * Destroy any table in the 'inactive' slot (ie. abort).
- *
- * DM_TABLE_DEPS:
- * Return a set of device dependencies for the 'active' table.
- *
- * DM_TABLE_STATUS:
- * Return the targets status for the 'active' table.
- *
- * DM_TARGET_MSG:
- * Pass a message string to the target at a specific offset of a device.
- *
- * DM_DEV_SET_GEOMETRY:
- * Set the geometry of a device by passing in a string in this format:
- *
- * "cylinders heads sectors_per_track start_sector"
- *
- * Beware that CHS geometry is nearly obsolete and only provided
- * for compatibility with dm devices that can be booted by a PC
- * BIOS.  See struct hd_geometry for range limits.  Also note that
- * the geometry is erased if the device size changes.
- */
-
-/*
- * All ioctl arguments consist of a single chunk of memory, with
- * this structure at the start.  If a uuid is specified any
- * lookup (eg. for a DM_INFO) will be done on that, *not* the
- * name.
- */
-struct dm_ioctl {
-	/*
-	 * The version number is made up of three parts:
-	 * major - no backward or forward compatibility,
-	 * minor - only backwards compatible,
-	 * patch - both backwards and forwards compatible.
-	 *
-	 * All clients of the ioctl interface should fill in the
-	 * version number of the interface that they were
-	 * compiled with.
-	 *
-	 * All recognised ioctl commands (ie. those that don't
-	 * return -ENOTTY) fill out this field, even if the
-	 * command failed.
-	 */
-	__u32 version[3];	/* in/out */
-	__u32 data_size;	/* total size of data passed in
-				 * including this struct */
-
-	__u32 data_start;	/* offset to start of data
-				 * relative to start of this struct */
-
-	__u32 target_count;	/* in/out */
-	__s32 open_count;	/* out */
-	__u32 flags;		/* in/out */
-
-	/*
-	 * event_nr holds either the event number (input and output) or the
-	 * udev cookie value (input only).
-	 * The DM_DEV_WAIT ioctl takes an event number as input.
-	 * The DM_SUSPEND, DM_DEV_REMOVE and DM_DEV_RENAME ioctls
-	 * use the field as a cookie to return in the DM_COOKIE
-	 * variable with the uevents they issue.
-	 * For output, the ioctls return the event number, not the cookie.
-	 */
-	__u32 event_nr;      	/* in/out */
-	__u32 padding;
-
-	__u64 dev;		/* in/out */
-
-	char name[DM_NAME_LEN];	/* device name */
-	char uuid[DM_UUID_LEN];	/* unique identifier for
-				 * the block device */
-	char data[7];		/* padding or data */
-};
-
-/*
- * Used to specify tables.  These structures appear after the
- * dm_ioctl.
- */
-struct dm_target_spec {
-	__u64 sector_start;
-	__u64 length;
-	__s32 status;		/* used when reading from kernel only */
-
-	/*
-	 * Location of the next dm_target_spec.
-	 * - When specifying targets on a DM_TABLE_LOAD command, this value is
-	 *   the number of bytes from the start of the "current" dm_target_spec
-	 *   to the start of the "next" dm_target_spec.
-	 * - When retrieving targets on a DM_TABLE_STATUS command, this value
-	 *   is the number of bytes from the start of the first dm_target_spec
-	 *   (that follows the dm_ioctl struct) to the start of the "next"
-	 *   dm_target_spec.
-	 */
-	__u32 next;
-
-	char target_type[DM_MAX_TYPE_NAME];
-
-	/*
-	 * Parameter string starts immediately after this object.
-	 * Be careful to add padding after string to ensure correct
-	 * alignment of subsequent dm_target_spec.
-	 */
-};
-
-/*
- * Used to retrieve the target dependencies.
- */
-struct dm_target_deps {
-	__u32 count;	/* Array size */
-	__u32 padding;	/* unused */
-	__u64 dev[0];	/* out */
-};
-
-/*
- * Used to get a list of all dm devices.
- */
-struct dm_name_list {
-	__u64 dev;
-	__u32 next;		/* offset to the next record from
-				   the _start_ of this */
-	char name[0];
-};
-
-/*
- * Used to retrieve the target versions
- */
-struct dm_target_versions {
-        __u32 next;
-        __u32 version[3];
-
-        char name[0];
-};
-
-/*
- * Used to pass message to a target
- */
-struct dm_target_msg {
-	__u64 sector;	/* Device sector */
-
-	char message[0];
-};
-
-/*
- * If you change this make sure you make the corresponding change
- * to dm-ioctl.c:lookup_ioctl()
- */
-enum {
-	/* Top level cmds */
-	DM_VERSION_CMD = 0,
-	DM_REMOVE_ALL_CMD,
-	DM_LIST_DEVICES_CMD,
-
-	/* device level cmds */
-	DM_DEV_CREATE_CMD,
-	DM_DEV_REMOVE_CMD,
-	DM_DEV_RENAME_CMD,
-	DM_DEV_SUSPEND_CMD,
-	DM_DEV_STATUS_CMD,
-	DM_DEV_WAIT_CMD,
-
-	/* Table level cmds */
-	DM_TABLE_LOAD_CMD,
-	DM_TABLE_CLEAR_CMD,
-	DM_TABLE_DEPS_CMD,
-	DM_TABLE_STATUS_CMD,
-
-	/* Added later */
-	DM_LIST_VERSIONS_CMD,
-	DM_TARGET_MSG_CMD,
-	DM_DEV_SET_GEOMETRY_CMD
-};
-
-#define DM_IOCTL 0xfd
-
-#define DM_VERSION       _IOWR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl)
-#define DM_REMOVE_ALL    _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, struct dm_ioctl)
-#define DM_LIST_DEVICES  _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, struct dm_ioctl)
-
-#define DM_DEV_CREATE    _IOWR(DM_IOCTL, DM_DEV_CREATE_CMD, struct dm_ioctl)
-#define DM_DEV_REMOVE    _IOWR(DM_IOCTL, DM_DEV_REMOVE_CMD, struct dm_ioctl)
-#define DM_DEV_RENAME    _IOWR(DM_IOCTL, DM_DEV_RENAME_CMD, struct dm_ioctl)
-#define DM_DEV_SUSPEND   _IOWR(DM_IOCTL, DM_DEV_SUSPEND_CMD, struct dm_ioctl)
-#define DM_DEV_STATUS    _IOWR(DM_IOCTL, DM_DEV_STATUS_CMD, struct dm_ioctl)
-#define DM_DEV_WAIT      _IOWR(DM_IOCTL, DM_DEV_WAIT_CMD, struct dm_ioctl)
-
-#define DM_TABLE_LOAD    _IOWR(DM_IOCTL, DM_TABLE_LOAD_CMD, struct dm_ioctl)
-#define DM_TABLE_CLEAR   _IOWR(DM_IOCTL, DM_TABLE_CLEAR_CMD, struct dm_ioctl)
-#define DM_TABLE_DEPS    _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, struct dm_ioctl)
-#define DM_TABLE_STATUS  _IOWR(DM_IOCTL, DM_TABLE_STATUS_CMD, struct dm_ioctl)
-
-#define DM_LIST_VERSIONS _IOWR(DM_IOCTL, DM_LIST_VERSIONS_CMD, struct dm_ioctl)
-
-#define DM_TARGET_MSG	 _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl)
-#define DM_DEV_SET_GEOMETRY	_IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
-
-#define DM_VERSION_MAJOR	4
-#define DM_VERSION_MINOR	34
-#define DM_VERSION_PATCHLEVEL	0
-#define DM_VERSION_EXTRA	"-ioctl (2015-10-28)"
-
-/* Status bits */
-#define DM_READONLY_FLAG	(1 << 0) /* In/Out */
-#define DM_SUSPEND_FLAG		(1 << 1) /* In/Out */
-#define DM_PERSISTENT_DEV_FLAG	(1 << 3) /* In */
-
-/*
- * Flag passed into ioctl STATUS command to get table information
- * rather than current status.
- */
-#define DM_STATUS_TABLE_FLAG	(1 << 4) /* In */
-
-/*
- * Flags that indicate whether a table is present in either of
- * the two table slots that a device has.
- */
-#define DM_ACTIVE_PRESENT_FLAG   (1 << 5) /* Out */
-#define DM_INACTIVE_PRESENT_FLAG (1 << 6) /* Out */
-
-/*
- * Indicates that the buffer passed in wasn't big enough for the
- * results.
- */
-#define DM_BUFFER_FULL_FLAG	(1 << 8) /* Out */
-
-/*
- * This flag is now ignored.
- */
-#define DM_SKIP_BDGET_FLAG	(1 << 9) /* In */
-
-/*
- * Set this to avoid attempting to freeze any filesystem when suspending.
- */
-#define DM_SKIP_LOCKFS_FLAG	(1 << 10) /* In */
-
-/*
- * Set this to suspend without flushing queued ios.
- * Also disables flushing uncommitted changes in the thin target before
- * generating statistics for DM_TABLE_STATUS and DM_DEV_WAIT.
- */
-#define DM_NOFLUSH_FLAG		(1 << 11) /* In */
-
-/*
- * If set, any table information returned will relate to the inactive
- * table instead of the live one.  Always check DM_INACTIVE_PRESENT_FLAG
- * is set before using the data returned.
- */
-#define DM_QUERY_INACTIVE_TABLE_FLAG	(1 << 12) /* In */
-
-/*
- * If set, a uevent was generated for which the caller may need to wait.
- */
-#define DM_UEVENT_GENERATED_FLAG	(1 << 13) /* Out */
-
-/*
- * If set, rename changes the uuid not the name.  Only permitted
- * if no uuid was previously supplied: an existing uuid cannot be changed.
- */
-#define DM_UUID_FLAG			(1 << 14) /* In */
-
-/*
- * If set, all buffers are wiped after use. Use when sending
- * or requesting sensitive data such as an encryption key.
- */
-#define DM_SECURE_DATA_FLAG		(1 << 15) /* In */
-
-/*
- * If set, a message generated output data.
- */
-#define DM_DATA_OUT_FLAG		(1 << 16) /* Out */
-
-/*
- * If set with DM_DEV_REMOVE or DM_REMOVE_ALL this indicates that if
- * the device cannot be removed immediately because it is still in use
- * it should instead be scheduled for removal when it gets closed.
- *
- * On return from DM_DEV_REMOVE, DM_DEV_STATUS or other ioctls, this
- * flag indicates that the device is scheduled to be removed when it
- * gets closed.
- */
-#define DM_DEFERRED_REMOVE		(1 << 17) /* In/Out */
-
-/*
- * If set, the device is suspended internally.
- */
-#define DM_INTERNAL_SUSPEND_FLAG	(1 << 18) /* Out */
-
-#endif				/* _LINUX_DM_IOCTL_H */
diff --git a/openflow/usr/include/linux/dm-log-userspace.h b/openflow/usr/include/linux/dm-log-userspace.h
deleted file mode 100644
index 0fa0d9e..0000000
--- a/openflow/usr/include/linux/dm-log-userspace.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * Copyright (C) 2006-2009 Red Hat, Inc.
- *
- * This file is released under the LGPL.
- */
-
-#ifndef __DM_LOG_USERSPACE_H__
-#define __DM_LOG_USERSPACE_H__
-
-#include <linux/dm-ioctl.h> /* For DM_UUID_LEN */
-
-/*
- * The device-mapper userspace log module consists of a kernel component and
- * a user-space component.  The kernel component implements the API defined
- * in dm-dirty-log.h.  Its purpose is simply to pass the parameters and
- * return values of those API functions between kernel and user-space.
- *
- * Below are defined the 'request_types' - DM_ULOG_CTR, DM_ULOG_DTR, etc.
- * These request types represent the different functions in the device-mapper
- * dirty log API.  Each of these is described in more detail below.
- *
- * The user-space program must listen for requests from the kernel (representing
- * the various API functions) and process them.
- *
- * User-space begins by setting up the communication link (error checking
- * removed for clarity):
- *	fd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
- *	addr.nl_family = AF_NETLINK;
- *	addr.nl_groups = CN_IDX_DM;
- *	addr.nl_pid = 0;
- *	r = bind(fd, (struct sockaddr *) &addr, sizeof(addr));
- *	opt = addr.nl_groups;
- *	setsockopt(fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, &opt, sizeof(opt));
- *
- * User-space will then wait to receive requests form the kernel, which it
- * will process as described below.  The requests are received in the form,
- * ((struct dm_ulog_request) + (additional data)).  Depending on the request
- * type, there may or may not be 'additional data'.  In the descriptions below,
- * you will see 'Payload-to-userspace' and 'Payload-to-kernel'.  The
- * 'Payload-to-userspace' is what the kernel sends in 'additional data' as
- * necessary parameters to complete the request.  The 'Payload-to-kernel' is
- * the 'additional data' returned to the kernel that contains the necessary
- * results of the request.  The 'data_size' field in the dm_ulog_request
- * structure denotes the availability and amount of payload data.
- */
-
-/*
- * DM_ULOG_CTR corresponds to (found in dm-dirty-log.h):
- * int (*ctr)(struct dm_dirty_log *log, struct dm_target *ti,
- *	      unsigned argc, char **argv);
- *
- * Payload-to-userspace:
- *	A single string containing all the argv arguments separated by ' 's
- * Payload-to-kernel:
- *	A NUL-terminated string that is the name of the device that is used
- *	as the backing store for the log data.  'dm_get_device' will be called
- *	on this device.  ('dm_put_device' will be called on this device
- *	automatically after calling DM_ULOG_DTR.)  If there is no device needed
- *	for log data, 'data_size' in the dm_ulog_request struct should be 0.
- *
- * The UUID contained in the dm_ulog_request structure is the reference that
- * will be used by all request types to a specific log.  The constructor must
- * record this association with the instance created.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field, filling the
- * data field with the log device if necessary, and setting 'data_size'
- * appropriately.
- */
-#define DM_ULOG_CTR                    1
-
-/*
- * DM_ULOG_DTR corresponds to (found in dm-dirty-log.h):
- * void (*dtr)(struct dm_dirty_log *log);
- *
- * Payload-to-userspace:
- *	A single string containing all the argv arguments separated by ' 's
- * Payload-to-kernel:
- *	None.  ('data_size' in the dm_ulog_request struct should be 0.)
- *
- * The UUID contained in the dm_ulog_request structure is all that is
- * necessary to identify the log instance being destroyed.  There is no
- * payload data.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and clearing
- * 'data_size' appropriately.
- */
-#define DM_ULOG_DTR                    2
-
-/*
- * DM_ULOG_PRESUSPEND corresponds to (found in dm-dirty-log.h):
- * int (*presuspend)(struct dm_dirty_log *log);
- *
- * Payload-to-userspace:
- *	None.
- * Payload-to-kernel:
- *	None.
- *
- * The UUID contained in the dm_ulog_request structure is all that is
- * necessary to identify the log instance being presuspended.  There is no
- * payload data.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and
- * 'data_size' appropriately.
- */
-#define DM_ULOG_PRESUSPEND             3
-
-/*
- * DM_ULOG_POSTSUSPEND corresponds to (found in dm-dirty-log.h):
- * int (*postsuspend)(struct dm_dirty_log *log);
- *
- * Payload-to-userspace:
- *	None.
- * Payload-to-kernel:
- *	None.
- *
- * The UUID contained in the dm_ulog_request structure is all that is
- * necessary to identify the log instance being postsuspended.  There is no
- * payload data.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and
- * 'data_size' appropriately.
- */
-#define DM_ULOG_POSTSUSPEND            4
-
-/*
- * DM_ULOG_RESUME corresponds to (found in dm-dirty-log.h):
- * int (*resume)(struct dm_dirty_log *log);
- *
- * Payload-to-userspace:
- *	None.
- * Payload-to-kernel:
- *	None.
- *
- * The UUID contained in the dm_ulog_request structure is all that is
- * necessary to identify the log instance being resumed.  There is no
- * payload data.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and
- * 'data_size' appropriately.
- */
-#define DM_ULOG_RESUME                 5
-
-/*
- * DM_ULOG_GET_REGION_SIZE corresponds to (found in dm-dirty-log.h):
- * uint32_t (*get_region_size)(struct dm_dirty_log *log);
- *
- * Payload-to-userspace:
- *	None.
- * Payload-to-kernel:
- *	uint64_t - contains the region size
- *
- * The region size is something that was determined at constructor time.
- * It is returned in the payload area and 'data_size' is set to
- * reflect this.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field appropriately.
- */
-#define DM_ULOG_GET_REGION_SIZE        6
-
-/*
- * DM_ULOG_IS_CLEAN corresponds to (found in dm-dirty-log.h):
- * int (*is_clean)(struct dm_dirty_log *log, region_t region);
- *
- * Payload-to-userspace:
- *	uint64_t - the region to get clean status on
- * Payload-to-kernel:
- *	int64_t  - 1 if clean, 0 otherwise
- *
- * Payload is sizeof(uint64_t) and contains the region for which the clean
- * status is being made.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - filling the payload with 0 (not clean) or
- * 1 (clean), setting 'data_size' and 'error' appropriately.
- */
-#define DM_ULOG_IS_CLEAN               7
-
-/*
- * DM_ULOG_IN_SYNC corresponds to (found in dm-dirty-log.h):
- * int (*in_sync)(struct dm_dirty_log *log, region_t region,
- *		  int can_block);
- *
- * Payload-to-userspace:
- *	uint64_t - the region to get sync status on
- * Payload-to-kernel:
- *	int64_t - 1 if in-sync, 0 otherwise
- *
- * Exactly the same as 'is_clean' above, except this time asking "has the
- * region been recovered?" vs. "is the region not being modified?"
- */
-#define DM_ULOG_IN_SYNC                8
-
-/*
- * DM_ULOG_FLUSH corresponds to (found in dm-dirty-log.h):
- * int (*flush)(struct dm_dirty_log *log);
- *
- * Payload-to-userspace:
- *	If the 'integrated_flush' directive is present in the constructor
- *	table, the payload is as same as DM_ULOG_MARK_REGION:
- *		uint64_t [] - region(s) to mark
- *	else
- *		None
- * Payload-to-kernel:
- *	None.
- *
- * If the 'integrated_flush' option was used during the creation of the
- * log, mark region requests are carried as payload in the flush request.
- * Piggybacking the mark requests in this way allows for fewer communications
- * between kernel and userspace.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and clearing
- * 'data_size' appropriately.
- */
-#define DM_ULOG_FLUSH                  9
-
-/*
- * DM_ULOG_MARK_REGION corresponds to (found in dm-dirty-log.h):
- * void (*mark_region)(struct dm_dirty_log *log, region_t region);
- *
- * Payload-to-userspace:
- *	uint64_t [] - region(s) to mark
- * Payload-to-kernel:
- *	None.
- *
- * Incoming payload contains the one or more regions to mark dirty.
- * The number of regions contained in the payload can be determined from
- * 'data_size/sizeof(uint64_t)'.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and clearing
- * 'data_size' appropriately.
- */
-#define DM_ULOG_MARK_REGION           10
-
-/*
- * DM_ULOG_CLEAR_REGION corresponds to (found in dm-dirty-log.h):
- * void (*clear_region)(struct dm_dirty_log *log, region_t region);
- *
- * Payload-to-userspace:
- *	uint64_t [] - region(s) to clear
- * Payload-to-kernel:
- *	None.
- *
- * Incoming payload contains the one or more regions to mark clean.
- * The number of regions contained in the payload can be determined from
- * 'data_size/sizeof(uint64_t)'.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and clearing
- * 'data_size' appropriately.
- */
-#define DM_ULOG_CLEAR_REGION          11
-
-/*
- * DM_ULOG_GET_RESYNC_WORK corresponds to (found in dm-dirty-log.h):
- * int (*get_resync_work)(struct dm_dirty_log *log, region_t *region);
- *
- * Payload-to-userspace:
- *	None.
- * Payload-to-kernel:
- *	{
- *		int64_t i; -- 1 if recovery necessary, 0 otherwise
- *		uint64_t r; -- The region to recover if i=1
- *	}
- * 'data_size' should be set appropriately.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field appropriately.
- */
-#define DM_ULOG_GET_RESYNC_WORK       12
-
-/*
- * DM_ULOG_SET_REGION_SYNC corresponds to (found in dm-dirty-log.h):
- * void (*set_region_sync)(struct dm_dirty_log *log,
- *			   region_t region, int in_sync);
- *
- * Payload-to-userspace:
- *	{
- *		uint64_t - region to set sync state on
- *		int64_t  - 0 if not-in-sync, 1 if in-sync
- *	}
- * Payload-to-kernel:
- *	None.
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and clearing
- * 'data_size' appropriately.
- */
-#define DM_ULOG_SET_REGION_SYNC       13
-
-/*
- * DM_ULOG_GET_SYNC_COUNT corresponds to (found in dm-dirty-log.h):
- * region_t (*get_sync_count)(struct dm_dirty_log *log);
- *
- * Payload-to-userspace:
- *	None.
- * Payload-to-kernel:
- *	uint64_t - the number of in-sync regions
- *
- * No incoming payload.  Kernel-bound payload contains the number of
- * regions that are in-sync (in a size_t).
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and
- * 'data_size' appropriately.
- */
-#define DM_ULOG_GET_SYNC_COUNT        14
-
-/*
- * DM_ULOG_STATUS_INFO corresponds to (found in dm-dirty-log.h):
- * int (*status)(struct dm_dirty_log *log, STATUSTYPE_INFO,
- *		 char *result, unsigned maxlen);
- *
- * Payload-to-userspace:
- *	None.
- * Payload-to-kernel:
- *	Character string containing STATUSTYPE_INFO
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and
- * 'data_size' appropriately.
- */
-#define DM_ULOG_STATUS_INFO           15
-
-/*
- * DM_ULOG_STATUS_TABLE corresponds to (found in dm-dirty-log.h):
- * int (*status)(struct dm_dirty_log *log, STATUSTYPE_TABLE,
- *		 char *result, unsigned maxlen);
- *
- * Payload-to-userspace:
- *	None.
- * Payload-to-kernel:
- *	Character string containing STATUSTYPE_TABLE
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and
- * 'data_size' appropriately.
- */
-#define DM_ULOG_STATUS_TABLE          16
-
-/*
- * DM_ULOG_IS_REMOTE_RECOVERING corresponds to (found in dm-dirty-log.h):
- * int (*is_remote_recovering)(struct dm_dirty_log *log, region_t region);
- *
- * Payload-to-userspace:
- *	uint64_t - region to determine recovery status on
- * Payload-to-kernel:
- *	{
- *		int64_t is_recovering;  -- 0 if no, 1 if yes
- *		uint64_t in_sync_hint;  -- lowest region still needing resync
- *	}
- *
- * When the request has been processed, user-space must return the
- * dm_ulog_request to the kernel - setting the 'error' field and
- * 'data_size' appropriately.
- */
-#define DM_ULOG_IS_REMOTE_RECOVERING  17
-
-/*
- * (DM_ULOG_REQUEST_MASK & request_type) to get the request type
- *
- * Payload-to-userspace:
- *	A single string containing all the argv arguments separated by ' 's
- * Payload-to-kernel:
- *	None.  ('data_size' in the dm_ulog_request struct should be 0.)
- *
- * We are reserving 8 bits of the 32-bit 'request_type' field for the
- * various request types above.  The remaining 24-bits are currently
- * set to zero and are reserved for future use and compatibility concerns.
- *
- * User-space should always use DM_ULOG_REQUEST_TYPE to acquire the
- * request type from the 'request_type' field to maintain forward compatibility.
- */
-#define DM_ULOG_REQUEST_MASK 0xFF
-#define DM_ULOG_REQUEST_TYPE(request_type) \
-	(DM_ULOG_REQUEST_MASK & (request_type))
-
-/*
- * DM_ULOG_REQUEST_VERSION is incremented when there is a
- * change to the way information is passed between kernel
- * and userspace.  This could be a structure change of
- * dm_ulog_request or a change in the way requests are
- * issued/handled.  Changes are outlined here:
- *	version 1:  Initial implementation
- *	version 2:  DM_ULOG_CTR allowed to return a string containing a
- *	            device name that is to be registered with DM via
- *	            'dm_get_device'.
- *	version 3:  DM_ULOG_FLUSH is capable of carrying payload for marking
- *		    regions.  This "integrated flush" reduces the number of
- *		    requests between the kernel and userspace by effectively
- *		    merging 'mark' and 'flush' requests.  A constructor table
- *		    argument ('integrated_flush') is required to turn this
- *		    feature on, so it is backwards compatible with older
- *		    userspace versions.
- */
-#define DM_ULOG_REQUEST_VERSION 3
-
-struct dm_ulog_request {
-	/*
-	 * The local unique identifier (luid) and the universally unique
-	 * identifier (uuid) are used to tie a request to a specific
-	 * mirror log.  A single machine log could probably make due with
-	 * just the 'luid', but a cluster-aware log must use the 'uuid' and
-	 * the 'luid'.  The uuid is what is required for node to node
-	 * communication concerning a particular log, but the 'luid' helps
-	 * differentiate between logs that are being swapped and have the
-	 * same 'uuid'.  (Think "live" and "inactive" device-mapper tables.)
-	 */
-	uint64_t luid;
-	char uuid[DM_UUID_LEN];
-	char padding[3];        /* Padding because DM_UUID_LEN = 129 */
-
-	uint32_t version;       /* See DM_ULOG_REQUEST_VERSION */
-	int32_t error;          /* Used to report back processing errors */
-
-	uint32_t seq;           /* Sequence number for request */
-	uint32_t request_type;  /* DM_ULOG_* defined above */
-	uint32_t data_size;     /* How much data (not including this struct) */
-
-	char data[0];
-};
-
-#endif /* __DM_LOG_USERSPACE_H__ */
diff --git a/openflow/usr/include/linux/dn.h b/openflow/usr/include/linux/dn.h
deleted file mode 100644
index 4295c74..0000000
--- a/openflow/usr/include/linux/dn.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef _LINUX_DN_H
-#define _LINUX_DN_H
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-#include <linux/if_ether.h>
-
-/*
-
-	DECnet Data Structures and Constants
-
-*/
-
-/* 
- * DNPROTO_NSP can't be the same as SOL_SOCKET, 
- * so increment each by one (compared to ULTRIX)
- */
-#define DNPROTO_NSP     2                       /* NSP protocol number       */
-#define DNPROTO_ROU     3                       /* Routing protocol number   */
-#define DNPROTO_NML     4                       /* Net mgt protocol number   */
-#define DNPROTO_EVL     5                       /* Evl protocol number (usr) */
-#define DNPROTO_EVR     6                       /* Evl protocol number (evl) */
-#define DNPROTO_NSPT    7                       /* NSP trace protocol number */
-
-
-#define DN_ADDL		2
-#define DN_MAXADDL	2 /* ULTRIX headers have 20 here, but pathworks has 2 */
-#define DN_MAXOPTL	16
-#define DN_MAXOBJL	16
-#define DN_MAXACCL	40
-#define DN_MAXALIASL	128
-#define DN_MAXNODEL	256
-#define DNBUFSIZE	65023
-
-/* 
- * SET/GET Socket options  - must match the DSO_ numbers below
- */
-#define SO_CONDATA      1
-#define SO_CONACCESS    2
-#define SO_PROXYUSR     3
-#define SO_LINKINFO     7
-
-#define DSO_CONDATA     1        /* Set/Get connect data                */
-#define DSO_DISDATA     10       /* Set/Get disconnect data             */
-#define DSO_CONACCESS   2        /* Set/Get connect access data         */
-#define DSO_ACCEPTMODE  4        /* Set/Get accept mode                 */
-#define DSO_CONACCEPT   5        /* Accept deferred connection          */
-#define DSO_CONREJECT   6        /* Reject deferred connection          */
-#define DSO_LINKINFO    7        /* Set/Get link information            */
-#define DSO_STREAM      8        /* Set socket type to stream           */
-#define DSO_SEQPACKET   9        /* Set socket type to sequenced packet */
-#define DSO_MAXWINDOW   11       /* Maximum window size allowed         */
-#define DSO_NODELAY	12       /* Turn off nagle                      */
-#define DSO_CORK        13       /* Wait for more data!                 */
-#define DSO_SERVICES	14       /* NSP Services field                  */
-#define DSO_INFO	15       /* NSP Info field                      */
-#define DSO_MAX         15       /* Maximum option number               */
-
-
-/* LINK States */
-#define LL_INACTIVE	0
-#define LL_CONNECTING	1
-#define LL_RUNNING	2
-#define LL_DISCONNECTING 3
-
-#define ACC_IMMED 0
-#define ACC_DEFER 1
-
-#define SDF_WILD        1                  /* Wild card object          */
-#define SDF_PROXY       2                  /* Addr eligible for proxy   */
-#define SDF_UICPROXY    4                  /* Use uic-based proxy       */
-
-/* Structures */
-
-
-struct dn_naddr {
-	__le16		a_len;
-	__u8 a_addr[DN_MAXADDL]; /* Two bytes little endian */
-};
-
-struct sockaddr_dn {
-	__u16		sdn_family;
-	__u8		sdn_flags;
-	__u8		sdn_objnum;
-	__le16		sdn_objnamel;
-	__u8		sdn_objname[DN_MAXOBJL];
-	struct   dn_naddr	sdn_add;
-};
-#define sdn_nodeaddrl   sdn_add.a_len   /* Node address length  */
-#define sdn_nodeaddr    sdn_add.a_addr  /* Node address         */
-
-
-
-/*
- * DECnet set/get DSO_CONDATA, DSO_DISDATA (optional data) structure
- */
-struct optdata_dn {
-        __le16  opt_status;     /* Extended status return */
-#define opt_sts opt_status
-        __le16  opt_optl;       /* Length of user data    */
-        __u8   opt_data[16];   /* User data              */
-};
-
-struct accessdata_dn {
-	__u8		acc_accl;
-	__u8		acc_acc[DN_MAXACCL];
-	__u8 		acc_passl;
-	__u8		acc_pass[DN_MAXACCL];
-	__u8 		acc_userl;
-	__u8		acc_user[DN_MAXACCL];
-};
-
-/*
- * DECnet logical link information structure
- */
-struct linkinfo_dn {
-        __u16  idn_segsize;    /* Segment size for link */
-        __u8   idn_linkstate;  /* Logical link state    */
-};
-
-/*
- * Ethernet address format (for DECnet)
- */
-union etheraddress {
-        __u8 dne_addr[ETH_ALEN];      /* Full ethernet address */
-  struct {
-                __u8 dne_hiord[4];    /* DECnet HIORD prefix   */
-                __u8 dne_nodeaddr[2]; /* DECnet node address   */
-  } dne_remote;
-};
-
-
-/*
- * DECnet physical socket address format
- */
-struct dn_addr {
-        __le16 dna_family;      /* AF_DECnet               */
-        union etheraddress dna_netaddr; /* DECnet ethernet address */
-};
-
-#define DECNET_IOCTL_BASE 0x89 /* PROTOPRIVATE range */
-
-#define SIOCSNETADDR  _IOW(DECNET_IOCTL_BASE, 0xe0, struct dn_naddr)
-#define SIOCGNETADDR  _IOR(DECNET_IOCTL_BASE, 0xe1, struct dn_naddr)
-#define OSIOCSNETADDR _IOW(DECNET_IOCTL_BASE, 0xe0, int)
-#define OSIOCGNETADDR _IOR(DECNET_IOCTL_BASE, 0xe1, int)
-
-#endif /* _LINUX_DN_H */
diff --git a/openflow/usr/include/linux/dqblk_xfs.h b/openflow/usr/include/linux/dqblk_xfs.h
deleted file mode 100644
index dcd75cc..0000000
--- a/openflow/usr/include/linux/dqblk_xfs.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 1995-2001,2004 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesset General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#ifndef _LINUX_DQBLK_XFS_H
-#define _LINUX_DQBLK_XFS_H
-
-#include <linux/types.h>
-
-/*
- * Disk quota - quotactl(2) commands for the XFS Quota Manager (XQM).
- */
-
-#define XQM_CMD(x)	(('X'<<8)+(x))	/* note: forms first QCMD argument */
-#define XQM_COMMAND(x)	(((x) & (0xff<<8)) == ('X'<<8))	/* test if for XFS */
-
-#define XQM_USRQUOTA	0	/* system call user quota type */
-#define XQM_GRPQUOTA	1	/* system call group quota type */
-#define XQM_PRJQUOTA	2	/* system call project quota type */
-#define XQM_MAXQUOTAS	3
-
-#define Q_XQUOTAON	XQM_CMD(1)	/* enable accounting/enforcement */
-#define Q_XQUOTAOFF	XQM_CMD(2)	/* disable accounting/enforcement */
-#define Q_XGETQUOTA	XQM_CMD(3)	/* get disk limits and usage */
-#define Q_XSETQLIM	XQM_CMD(4)	/* set disk limits */
-#define Q_XGETQSTAT	XQM_CMD(5)	/* get quota subsystem status */
-#define Q_XQUOTARM	XQM_CMD(6)	/* free disk space used by dquots */
-#define Q_XQUOTASYNC	XQM_CMD(7)	/* delalloc flush, updates dquots */
-#define Q_XGETQSTATV	XQM_CMD(8)	/* newer version of get quota */
-
-/*
- * fs_disk_quota structure:
- *
- * This contains the current quota information regarding a user/proj/group.
- * It is 64-bit aligned, and all the blk units are in BBs (Basic Blocks) of
- * 512 bytes.
- */
-#define FS_DQUOT_VERSION	1	/* fs_disk_quota.d_version */
-typedef struct fs_disk_quota {
-	__s8		d_version;	/* version of this structure */
-	__s8		d_flags;	/* FS_{USER,PROJ,GROUP}_QUOTA */
-	__u16		d_fieldmask;	/* field specifier */
-	__u32		d_id;		/* user, project, or group ID */
-	__u64		d_blk_hardlimit;/* absolute limit on disk blks */
-	__u64		d_blk_softlimit;/* preferred limit on disk blks */
-	__u64		d_ino_hardlimit;/* maximum # allocated inodes */
-	__u64		d_ino_softlimit;/* preferred inode limit */
-	__u64		d_bcount;	/* # disk blocks owned by the user */
-	__u64		d_icount;	/* # inodes owned by the user */
-	__s32		d_itimer;	/* zero if within inode limits */
-					/* if not, we refuse service */
-	__s32		d_btimer;	/* similar to above; for disk blocks */
-	__u16	  	d_iwarns;       /* # warnings issued wrt num inodes */
-	__u16	  	d_bwarns;       /* # warnings issued wrt disk blocks */
-	__s32		d_padding2;	/* padding2 - for future use */
-	__u64		d_rtb_hardlimit;/* absolute limit on realtime blks */
-	__u64		d_rtb_softlimit;/* preferred limit on RT disk blks */
-	__u64		d_rtbcount;	/* # realtime blocks owned */
-	__s32		d_rtbtimer;	/* similar to above; for RT disk blks */
-	__u16	  	d_rtbwarns;     /* # warnings issued wrt RT disk blks */
-	__s16		d_padding3;	/* padding3 - for future use */	
-	char		d_padding4[8];	/* yet more padding */
-} fs_disk_quota_t;
-
-/*
- * These fields are sent to Q_XSETQLIM to specify fields that need to change.
- */
-#define FS_DQ_ISOFT	(1<<0)
-#define FS_DQ_IHARD	(1<<1)
-#define FS_DQ_BSOFT	(1<<2)
-#define FS_DQ_BHARD 	(1<<3)
-#define FS_DQ_RTBSOFT	(1<<4)
-#define FS_DQ_RTBHARD	(1<<5)
-#define FS_DQ_LIMIT_MASK	(FS_DQ_ISOFT | FS_DQ_IHARD | FS_DQ_BSOFT | \
-				 FS_DQ_BHARD | FS_DQ_RTBSOFT | FS_DQ_RTBHARD)
-/*
- * These timers can only be set in super user's dquot. For others, timers are
- * automatically started and stopped. Superusers timer values set the limits
- * for the rest.  In case these values are zero, the DQ_{F,B}TIMELIMIT values
- * defined below are used. 
- * These values also apply only to the d_fieldmask field for Q_XSETQLIM.
- */
-#define FS_DQ_BTIMER	(1<<6)
-#define FS_DQ_ITIMER	(1<<7)
-#define FS_DQ_RTBTIMER 	(1<<8)
-#define FS_DQ_TIMER_MASK	(FS_DQ_BTIMER | FS_DQ_ITIMER | FS_DQ_RTBTIMER)
-
-/*
- * Warning counts are set in both super user's dquot and others. For others,
- * warnings are set/cleared by the administrators (or automatically by going
- * below the soft limit).  Superusers warning values set the warning limits
- * for the rest.  In case these values are zero, the DQ_{F,B}WARNLIMIT values
- * defined below are used. 
- * These values also apply only to the d_fieldmask field for Q_XSETQLIM.
- */
-#define FS_DQ_BWARNS	(1<<9)
-#define FS_DQ_IWARNS	(1<<10)
-#define FS_DQ_RTBWARNS	(1<<11)
-#define FS_DQ_WARNS_MASK	(FS_DQ_BWARNS | FS_DQ_IWARNS | FS_DQ_RTBWARNS)
-
-/*
- * Accounting values.  These can only be set for filesystem with
- * non-transactional quotas that require quotacheck(8) in userspace.
- */
-#define FS_DQ_BCOUNT		(1<<12)
-#define FS_DQ_ICOUNT		(1<<13)
-#define FS_DQ_RTBCOUNT		(1<<14)
-#define FS_DQ_ACCT_MASK		(FS_DQ_BCOUNT | FS_DQ_ICOUNT | FS_DQ_RTBCOUNT)
-
-/*
- * Various flags related to quotactl(2).
- */
-#define FS_QUOTA_UDQ_ACCT	(1<<0)  /* user quota accounting */
-#define FS_QUOTA_UDQ_ENFD	(1<<1)  /* user quota limits enforcement */
-#define FS_QUOTA_GDQ_ACCT	(1<<2)  /* group quota accounting */
-#define FS_QUOTA_GDQ_ENFD	(1<<3)  /* group quota limits enforcement */
-#define FS_QUOTA_PDQ_ACCT	(1<<4)  /* project quota accounting */
-#define FS_QUOTA_PDQ_ENFD	(1<<5)  /* project quota limits enforcement */
-
-#define FS_USER_QUOTA		(1<<0)	/* user quota type */
-#define FS_PROJ_QUOTA		(1<<1)	/* project quota type */
-#define FS_GROUP_QUOTA		(1<<2)	/* group quota type */
-
-/*
- * fs_quota_stat is the struct returned in Q_XGETQSTAT for a given file system.
- * Provides a centralized way to get meta information about the quota subsystem.
- * eg. space taken up for user and group quotas, number of dquots currently
- * incore.
- */
-#define FS_QSTAT_VERSION	1	/* fs_quota_stat.qs_version */
-
-/*
- * Some basic information about 'quota files'.
- */
-typedef struct fs_qfilestat {
-	__u64		qfs_ino;	/* inode number */
-	__u64		qfs_nblks;	/* number of BBs 512-byte-blks */
-	__u32		qfs_nextents;	/* number of extents */
-} fs_qfilestat_t;
-
-typedef struct fs_quota_stat {
-	__s8		qs_version;	/* version number for future changes */
-	__u16		qs_flags;	/* FS_QUOTA_{U,P,G}DQ_{ACCT,ENFD} */
-	__s8		qs_pad;		/* unused */
-	fs_qfilestat_t	qs_uquota;	/* user quota storage information */
-	fs_qfilestat_t	qs_gquota;	/* group quota storage information */
-	__u32		qs_incoredqs;	/* number of dquots incore */
-	__s32		qs_btimelimit;  /* limit for blks timer */	
-	__s32		qs_itimelimit;  /* limit for inodes timer */	
-	__s32		qs_rtbtimelimit;/* limit for rt blks timer */	
-	__u16		qs_bwarnlimit;	/* limit for num warnings */
-	__u16		qs_iwarnlimit;	/* limit for num warnings */
-} fs_quota_stat_t;
-
-/*
- * fs_quota_statv is used by Q_XGETQSTATV for a given file system. It provides
- * a centralized way to get meta information about the quota subsystem. eg.
- * space taken up for user, group, and project quotas, number of dquots
- * currently incore.
- *
- * This version has proper versioning support with appropriate padding for
- * future expansions, and ability to expand for future without creating any
- * backward compatibility issues.
- *
- * Q_XGETQSTATV uses the passed in value of the requested version via
- * fs_quota_statv.qs_version to determine the return data layout of
- * fs_quota_statv.  The kernel will fill the data fields relevant to that
- * version.
- *
- * If kernel does not support user space caller specified version, EINVAL will
- * be returned. User space caller can then reduce the version number and retry
- * the same command.
- */
-#define FS_QSTATV_VERSION1	1	/* fs_quota_statv.qs_version */
-/*
- * Some basic information about 'quota files' for Q_XGETQSTATV command
- */
-struct fs_qfilestatv {
-	__u64		qfs_ino;	/* inode number */
-	__u64		qfs_nblks;	/* number of BBs 512-byte-blks */
-	__u32		qfs_nextents;	/* number of extents */
-	__u32		qfs_pad;	/* pad for 8-byte alignment */
-};
-
-struct fs_quota_statv {
-	__s8			qs_version;	/* version for future changes */
-	__u8			qs_pad1;	/* pad for 16bit alignment */
-	__u16			qs_flags;	/* FS_QUOTA_.* flags */
-	__u32			qs_incoredqs;	/* number of dquots incore */
-	struct fs_qfilestatv	qs_uquota;	/* user quota information */
-	struct fs_qfilestatv	qs_gquota;	/* group quota information */
-	struct fs_qfilestatv	qs_pquota;	/* project quota information */
-	__s32			qs_btimelimit;  /* limit for blks timer */
-	__s32			qs_itimelimit;  /* limit for inodes timer */
-	__s32			qs_rtbtimelimit;/* limit for rt blks timer */
-	__u16			qs_bwarnlimit;	/* limit for num warnings */
-	__u16			qs_iwarnlimit;	/* limit for num warnings */
-	__u64			qs_pad2[8];	/* for future proofing */
-};
-
-#endif	/* _LINUX_DQBLK_XFS_H */
diff --git a/openflow/usr/include/linux/dvb/audio.h b/openflow/usr/include/linux/dvb/audio.h
deleted file mode 100644
index d47bccd..0000000
--- a/openflow/usr/include/linux/dvb/audio.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * audio.h
- *
- * Copyright (C) 2000 Ralph  Metzler <ralph@convergence.de>
- *                  & Marcus Metzler <marcus@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Lesser Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _DVBAUDIO_H_
-#define _DVBAUDIO_H_
-
-#include <linux/types.h>
-
-typedef enum {
-	AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */
-	AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */
-} audio_stream_source_t;
-
-
-typedef enum {
-	AUDIO_STOPPED,      /* Device is stopped */
-	AUDIO_PLAYING,      /* Device is currently playing */
-	AUDIO_PAUSED        /* Device is paused */
-} audio_play_state_t;
-
-
-typedef enum {
-	AUDIO_STEREO,
-	AUDIO_MONO_LEFT,
-	AUDIO_MONO_RIGHT,
-	AUDIO_MONO,
-	AUDIO_STEREO_SWAPPED
-} audio_channel_select_t;
-
-
-typedef struct audio_mixer {
-	unsigned int volume_left;
-	unsigned int volume_right;
-  // what else do we need? bass, pass-through, ...
-} audio_mixer_t;
-
-
-typedef struct audio_status {
-	int                    AV_sync_state;  /* sync audio and video? */
-	int                    mute_state;     /* audio is muted */
-	audio_play_state_t     play_state;     /* current playback state */
-	audio_stream_source_t  stream_source;  /* current stream source */
-	audio_channel_select_t channel_select; /* currently selected channel */
-	int                    bypass_mode;    /* pass on audio data to */
-	audio_mixer_t	       mixer_state;    /* current mixer state */
-} audio_status_t;                              /* separate decoder hardware */
-
-
-typedef
-struct audio_karaoke {  /* if Vocal1 or Vocal2 are non-zero, they get mixed  */
-	int vocal1;    /* into left and right t at 70% each */
-	int vocal2;    /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/
-	int melody;    /* mixed into the left channel and */
-		       /* Vocal2 into the right channel at 100% each. */
-		       /* if Melody is non-zero, the melody channel gets mixed*/
-} audio_karaoke_t;     /* into left and right  */
-
-
-typedef __u16 audio_attributes_t;
-/*   bits: descr. */
-/*   15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
-/*   12    multichannel extension */
-/*   11-10 audio type (0=not spec, 1=language included) */
-/*    9- 8 audio application mode (0=not spec, 1=karaoke, 2=surround) */
-/*    7- 6 Quantization / DRC (mpeg audio: 1=DRC exists)(lpcm: 0=16bit,  */
-/*    5- 4 Sample frequency fs (0=48kHz, 1=96kHz) */
-/*    2- 0 number of audio channels (n+1 channels) */
-
-
-/* for GET_CAPABILITIES and SET_FORMAT, the latter should only set one bit */
-#define AUDIO_CAP_DTS    1
-#define AUDIO_CAP_LPCM   2
-#define AUDIO_CAP_MP1    4
-#define AUDIO_CAP_MP2    8
-#define AUDIO_CAP_MP3   16
-#define AUDIO_CAP_AAC   32
-#define AUDIO_CAP_OGG   64
-#define AUDIO_CAP_SDDS 128
-#define AUDIO_CAP_AC3  256
-
-#define AUDIO_STOP                 _IO('o', 1)
-#define AUDIO_PLAY                 _IO('o', 2)
-#define AUDIO_PAUSE                _IO('o', 3)
-#define AUDIO_CONTINUE             _IO('o', 4)
-#define AUDIO_SELECT_SOURCE        _IO('o', 5)
-#define AUDIO_SET_MUTE             _IO('o', 6)
-#define AUDIO_SET_AV_SYNC          _IO('o', 7)
-#define AUDIO_SET_BYPASS_MODE      _IO('o', 8)
-#define AUDIO_CHANNEL_SELECT       _IO('o', 9)
-#define AUDIO_GET_STATUS           _IOR('o', 10, audio_status_t)
-
-#define AUDIO_GET_CAPABILITIES     _IOR('o', 11, unsigned int)
-#define AUDIO_CLEAR_BUFFER         _IO('o',  12)
-#define AUDIO_SET_ID               _IO('o', 13)
-#define AUDIO_SET_MIXER            _IOW('o', 14, audio_mixer_t)
-#define AUDIO_SET_STREAMTYPE       _IO('o', 15)
-#define AUDIO_SET_EXT_ID           _IO('o', 16)
-#define AUDIO_SET_ATTRIBUTES       _IOW('o', 17, audio_attributes_t)
-#define AUDIO_SET_KARAOKE          _IOW('o', 18, audio_karaoke_t)
-
-/**
- * AUDIO_GET_PTS
- *
- * Read the 33 bit presentation time stamp as defined
- * in ITU T-REC-H.222.0 / ISO/IEC 13818-1.
- *
- * The PTS should belong to the currently played
- * frame if possible, but may also be a value close to it
- * like the PTS of the last decoded frame or the last PTS
- * extracted by the PES parser.
- */
-#define AUDIO_GET_PTS              _IOR('o', 19, __u64)
-#define AUDIO_BILINGUAL_CHANNEL_SELECT _IO('o', 20)
-
-#endif /* _DVBAUDIO_H_ */
diff --git a/openflow/usr/include/linux/dvb/ca.h b/openflow/usr/include/linux/dvb/ca.h
deleted file mode 100644
index c18537f..0000000
--- a/openflow/usr/include/linux/dvb/ca.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * ca.h
- *
- * Copyright (C) 2000 Ralph  Metzler <ralph@convergence.de>
- *                  & Marcus Metzler <marcus@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Lesser Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _DVBCA_H_
-#define _DVBCA_H_
-
-/* slot interface types and info */
-
-typedef struct ca_slot_info {
-	int num;               /* slot number */
-
-	int type;              /* CA interface this slot supports */
-#define CA_CI            1     /* CI high level interface */
-#define CA_CI_LINK       2     /* CI link layer level interface */
-#define CA_CI_PHYS       4     /* CI physical layer level interface */
-#define CA_DESCR         8     /* built-in descrambler */
-#define CA_SC          128     /* simple smart card interface */
-
-	unsigned int flags;
-#define CA_CI_MODULE_PRESENT 1 /* module (or card) inserted */
-#define CA_CI_MODULE_READY   2
-} ca_slot_info_t;
-
-
-/* descrambler types and info */
-
-typedef struct ca_descr_info {
-	unsigned int num;          /* number of available descramblers (keys) */
-	unsigned int type;         /* type of supported scrambling system */
-#define CA_ECD           1
-#define CA_NDS           2
-#define CA_DSS           4
-} ca_descr_info_t;
-
-typedef struct ca_caps {
-	unsigned int slot_num;     /* total number of CA card and module slots */
-	unsigned int slot_type;    /* OR of all supported types */
-	unsigned int descr_num;    /* total number of descrambler slots (keys) */
-	unsigned int descr_type;   /* OR of all supported types */
-} ca_caps_t;
-
-/* a message to/from a CI-CAM */
-typedef struct ca_msg {
-	unsigned int index;
-	unsigned int type;
-	unsigned int length;
-	unsigned char msg[256];
-} ca_msg_t;
-
-typedef struct ca_descr {
-	unsigned int index;
-	unsigned int parity;	/* 0 == even, 1 == odd */
-	unsigned char cw[8];
-} ca_descr_t;
-
-typedef struct ca_pid {
-	unsigned int pid;
-	int index;		/* -1 == disable*/
-} ca_pid_t;
-
-#define CA_RESET          _IO('o', 128)
-#define CA_GET_CAP        _IOR('o', 129, ca_caps_t)
-#define CA_GET_SLOT_INFO  _IOR('o', 130, ca_slot_info_t)
-#define CA_GET_DESCR_INFO _IOR('o', 131, ca_descr_info_t)
-#define CA_GET_MSG        _IOR('o', 132, ca_msg_t)
-#define CA_SEND_MSG       _IOW('o', 133, ca_msg_t)
-#define CA_SET_DESCR      _IOW('o', 134, ca_descr_t)
-#define CA_SET_PID        _IOW('o', 135, ca_pid_t)
-
-#endif
diff --git a/openflow/usr/include/linux/dvb/dmx.h b/openflow/usr/include/linux/dvb/dmx.h
deleted file mode 100644
index 425a945..0000000
--- a/openflow/usr/include/linux/dvb/dmx.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * dmx.h
- *
- * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
- *                  & Ralph  Metzler <ralph@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _DVBDMX_H_
-#define _DVBDMX_H_
-
-#include <linux/types.h>
-#include <time.h>
-
-
-#define DMX_FILTER_SIZE 16
-
-enum dmx_output
-{
-	DMX_OUT_DECODER, /* Streaming directly to decoder. */
-	DMX_OUT_TAP,     /* Output going to a memory buffer */
-			 /* (to be retrieved via the read command).*/
-	DMX_OUT_TS_TAP,  /* Output multiplexed into a new TS  */
-			 /* (to be retrieved by reading from the */
-			 /* logical DVR device).                 */
-	DMX_OUT_TSDEMUX_TAP /* Like TS_TAP but retrieved from the DMX device */
-};
-
-typedef enum dmx_output dmx_output_t;
-
-typedef enum dmx_input
-{
-	DMX_IN_FRONTEND, /* Input from a front-end device.  */
-	DMX_IN_DVR       /* Input from the logical DVR device.  */
-} dmx_input_t;
-
-
-typedef enum dmx_ts_pes
-{
-	DMX_PES_AUDIO0,
-	DMX_PES_VIDEO0,
-	DMX_PES_TELETEXT0,
-	DMX_PES_SUBTITLE0,
-	DMX_PES_PCR0,
-
-	DMX_PES_AUDIO1,
-	DMX_PES_VIDEO1,
-	DMX_PES_TELETEXT1,
-	DMX_PES_SUBTITLE1,
-	DMX_PES_PCR1,
-
-	DMX_PES_AUDIO2,
-	DMX_PES_VIDEO2,
-	DMX_PES_TELETEXT2,
-	DMX_PES_SUBTITLE2,
-	DMX_PES_PCR2,
-
-	DMX_PES_AUDIO3,
-	DMX_PES_VIDEO3,
-	DMX_PES_TELETEXT3,
-	DMX_PES_SUBTITLE3,
-	DMX_PES_PCR3,
-
-	DMX_PES_OTHER
-} dmx_pes_type_t;
-
-#define DMX_PES_AUDIO    DMX_PES_AUDIO0
-#define DMX_PES_VIDEO    DMX_PES_VIDEO0
-#define DMX_PES_TELETEXT DMX_PES_TELETEXT0
-#define DMX_PES_SUBTITLE DMX_PES_SUBTITLE0
-#define DMX_PES_PCR      DMX_PES_PCR0
-
-
-typedef struct dmx_filter
-{
-	__u8  filter[DMX_FILTER_SIZE];
-	__u8  mask[DMX_FILTER_SIZE];
-	__u8  mode[DMX_FILTER_SIZE];
-} dmx_filter_t;
-
-
-struct dmx_sct_filter_params
-{
-	__u16          pid;
-	dmx_filter_t   filter;
-	__u32          timeout;
-	__u32          flags;
-#define DMX_CHECK_CRC       1
-#define DMX_ONESHOT         2
-#define DMX_IMMEDIATE_START 4
-#define DMX_KERNEL_CLIENT   0x8000
-};
-
-
-struct dmx_pes_filter_params
-{
-	__u16          pid;
-	dmx_input_t    input;
-	dmx_output_t   output;
-	dmx_pes_type_t pes_type;
-	__u32          flags;
-};
-
-typedef struct dmx_caps {
-	__u32 caps;
-	int num_decoders;
-} dmx_caps_t;
-
-typedef enum dmx_source {
-	DMX_SOURCE_FRONT0 = 0,
-	DMX_SOURCE_FRONT1,
-	DMX_SOURCE_FRONT2,
-	DMX_SOURCE_FRONT3,
-	DMX_SOURCE_DVR0   = 16,
-	DMX_SOURCE_DVR1,
-	DMX_SOURCE_DVR2,
-	DMX_SOURCE_DVR3
-} dmx_source_t;
-
-struct dmx_stc {
-	unsigned int num;	/* input : which STC? 0..N */
-	unsigned int base;	/* output: divisor for stc to get 90 kHz clock */
-	__u64 stc;		/* output: stc in 'base'*90 kHz units */
-};
-
-#define DMX_START                _IO('o', 41)
-#define DMX_STOP                 _IO('o', 42)
-#define DMX_SET_FILTER           _IOW('o', 43, struct dmx_sct_filter_params)
-#define DMX_SET_PES_FILTER       _IOW('o', 44, struct dmx_pes_filter_params)
-#define DMX_SET_BUFFER_SIZE      _IO('o', 45)
-#define DMX_GET_PES_PIDS         _IOR('o', 47, __u16[5])
-#define DMX_GET_CAPS             _IOR('o', 48, dmx_caps_t)
-#define DMX_SET_SOURCE           _IOW('o', 49, dmx_source_t)
-#define DMX_GET_STC              _IOWR('o', 50, struct dmx_stc)
-#define DMX_ADD_PID              _IOW('o', 51, __u16)
-#define DMX_REMOVE_PID           _IOW('o', 52, __u16)
-
-#endif /* _DVBDMX_H_ */
diff --git a/openflow/usr/include/linux/dvb/frontend.h b/openflow/usr/include/linux/dvb/frontend.h
deleted file mode 100644
index 0f65bd5..0000000
--- a/openflow/usr/include/linux/dvb/frontend.h
+++ /dev/null
@@ -1,600 +0,0 @@
-/*
- * frontend.h
- *
- * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
- *		    Ralph  Metzler <ralph@convergence.de>
- *		    Holger Waechtler <holger@convergence.de>
- *		    Andre Draszik <ad@convergence.de>
- *		    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _DVBFRONTEND_H_
-#define _DVBFRONTEND_H_
-
-#include <linux/types.h>
-
-enum fe_type {
-	FE_QPSK,
-	FE_QAM,
-	FE_OFDM,
-	FE_ATSC
-};
-
-enum fe_caps {
-	FE_IS_STUPID			= 0,
-	FE_CAN_INVERSION_AUTO		= 0x1,
-	FE_CAN_FEC_1_2			= 0x2,
-	FE_CAN_FEC_2_3			= 0x4,
-	FE_CAN_FEC_3_4			= 0x8,
-	FE_CAN_FEC_4_5			= 0x10,
-	FE_CAN_FEC_5_6			= 0x20,
-	FE_CAN_FEC_6_7			= 0x40,
-	FE_CAN_FEC_7_8			= 0x80,
-	FE_CAN_FEC_8_9			= 0x100,
-	FE_CAN_FEC_AUTO			= 0x200,
-	FE_CAN_QPSK			= 0x400,
-	FE_CAN_QAM_16			= 0x800,
-	FE_CAN_QAM_32			= 0x1000,
-	FE_CAN_QAM_64			= 0x2000,
-	FE_CAN_QAM_128			= 0x4000,
-	FE_CAN_QAM_256			= 0x8000,
-	FE_CAN_QAM_AUTO			= 0x10000,
-	FE_CAN_TRANSMISSION_MODE_AUTO	= 0x20000,
-	FE_CAN_BANDWIDTH_AUTO		= 0x40000,
-	FE_CAN_GUARD_INTERVAL_AUTO	= 0x80000,
-	FE_CAN_HIERARCHY_AUTO		= 0x100000,
-	FE_CAN_8VSB			= 0x200000,
-	FE_CAN_16VSB			= 0x400000,
-	FE_HAS_EXTENDED_CAPS		= 0x800000,   /* We need more bitspace for newer APIs, indicate this. */
-	FE_CAN_MULTISTREAM		= 0x4000000,  /* frontend supports multistream filtering */
-	FE_CAN_TURBO_FEC		= 0x8000000,  /* frontend supports "turbo fec modulation" */
-	FE_CAN_2G_MODULATION		= 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */
-	FE_NEEDS_BENDING		= 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */
-	FE_CAN_RECOVER			= 0x40000000, /* frontend can recover from a cable unplug automatically */
-	FE_CAN_MUTE_TS			= 0x80000000  /* frontend can stop spurious TS data output */
-};
-
-struct dvb_frontend_info {
-	char       name[128];
-	enum fe_type type;	/* DEPRECATED. Use DTV_ENUM_DELSYS instead */
-	__u32      frequency_min;
-	__u32      frequency_max;
-	__u32      frequency_stepsize;
-	__u32      frequency_tolerance;
-	__u32      symbol_rate_min;
-	__u32      symbol_rate_max;
-	__u32      symbol_rate_tolerance;	/* ppm */
-	__u32      notifier_delay;		/* DEPRECATED */
-	enum fe_caps caps;
-};
-
-
-/**
- *  Check out the DiSEqC bus spec available on http://www.eutelsat.org/ for
- *  the meaning of this struct...
- */
-struct dvb_diseqc_master_cmd {
-	__u8 msg [6];	/*  { framing, address, command, data [3] } */
-	__u8 msg_len;	/*  valid values are 3...6  */
-};
-
-struct dvb_diseqc_slave_reply {
-	__u8 msg [4];	/*  { framing, data [3] } */
-	__u8 msg_len;	/*  valid values are 0...4, 0 means no msg  */
-	int  timeout;	/*  return from ioctl after timeout ms with */
-};			/*  errorcode when no message was received  */
-
-enum fe_sec_voltage {
-	SEC_VOLTAGE_13,
-	SEC_VOLTAGE_18,
-	SEC_VOLTAGE_OFF
-};
-
-enum fe_sec_tone_mode {
-	SEC_TONE_ON,
-	SEC_TONE_OFF
-};
-
-enum fe_sec_mini_cmd {
-	SEC_MINI_A,
-	SEC_MINI_B
-};
-
-/**
- * enum fe_status - enumerates the possible frontend status
- * @FE_HAS_SIGNAL:	found something above the noise level
- * @FE_HAS_CARRIER:	found a DVB signal
- * @FE_HAS_VITERBI:	FEC is stable
- * @FE_HAS_SYNC:	found sync bytes
- * @FE_HAS_LOCK:	everything's working
- * @FE_TIMEDOUT:	no lock within the last ~2 seconds
- * @FE_REINIT:		frontend was reinitialized, application is recommended
- *			to reset DiSEqC, tone and parameters
- */
-enum fe_status {
-	FE_HAS_SIGNAL		= 0x01,
-	FE_HAS_CARRIER		= 0x02,
-	FE_HAS_VITERBI		= 0x04,
-	FE_HAS_SYNC		= 0x08,
-	FE_HAS_LOCK		= 0x10,
-	FE_TIMEDOUT		= 0x20,
-	FE_REINIT		= 0x40,
-};
-
-enum fe_spectral_inversion {
-	INVERSION_OFF,
-	INVERSION_ON,
-	INVERSION_AUTO
-};
-
-enum fe_code_rate {
-	FEC_NONE = 0,
-	FEC_1_2,
-	FEC_2_3,
-	FEC_3_4,
-	FEC_4_5,
-	FEC_5_6,
-	FEC_6_7,
-	FEC_7_8,
-	FEC_8_9,
-	FEC_AUTO,
-	FEC_3_5,
-	FEC_9_10,
-	FEC_2_5,
-};
-
-enum fe_modulation {
-	QPSK,
-	QAM_16,
-	QAM_32,
-	QAM_64,
-	QAM_128,
-	QAM_256,
-	QAM_AUTO,
-	VSB_8,
-	VSB_16,
-	PSK_8,
-	APSK_16,
-	APSK_32,
-	DQPSK,
-	QAM_4_NR,
-};
-
-enum fe_transmit_mode {
-	TRANSMISSION_MODE_2K,
-	TRANSMISSION_MODE_8K,
-	TRANSMISSION_MODE_AUTO,
-	TRANSMISSION_MODE_4K,
-	TRANSMISSION_MODE_1K,
-	TRANSMISSION_MODE_16K,
-	TRANSMISSION_MODE_32K,
-	TRANSMISSION_MODE_C1,
-	TRANSMISSION_MODE_C3780,
-};
-
-enum fe_guard_interval {
-	GUARD_INTERVAL_1_32,
-	GUARD_INTERVAL_1_16,
-	GUARD_INTERVAL_1_8,
-	GUARD_INTERVAL_1_4,
-	GUARD_INTERVAL_AUTO,
-	GUARD_INTERVAL_1_128,
-	GUARD_INTERVAL_19_128,
-	GUARD_INTERVAL_19_256,
-	GUARD_INTERVAL_PN420,
-	GUARD_INTERVAL_PN595,
-	GUARD_INTERVAL_PN945,
-};
-
-enum fe_hierarchy {
-	HIERARCHY_NONE,
-	HIERARCHY_1,
-	HIERARCHY_2,
-	HIERARCHY_4,
-	HIERARCHY_AUTO
-};
-
-enum fe_interleaving {
-	INTERLEAVING_NONE,
-	INTERLEAVING_AUTO,
-	INTERLEAVING_240,
-	INTERLEAVING_720,
-};
-
-/* S2API Commands */
-#define DTV_UNDEFINED		0
-#define DTV_TUNE		1
-#define DTV_CLEAR		2
-#define DTV_FREQUENCY		3
-#define DTV_MODULATION		4
-#define DTV_BANDWIDTH_HZ	5
-#define DTV_INVERSION		6
-#define DTV_DISEQC_MASTER	7
-#define DTV_SYMBOL_RATE		8
-#define DTV_INNER_FEC		9
-#define DTV_VOLTAGE		10
-#define DTV_TONE		11
-#define DTV_PILOT		12
-#define DTV_ROLLOFF		13
-#define DTV_DISEQC_SLAVE_REPLY	14
-
-/* Basic enumeration set for querying unlimited capabilities */
-#define DTV_FE_CAPABILITY_COUNT	15
-#define DTV_FE_CAPABILITY	16
-#define DTV_DELIVERY_SYSTEM	17
-
-/* ISDB-T and ISDB-Tsb */
-#define DTV_ISDBT_PARTIAL_RECEPTION	18
-#define DTV_ISDBT_SOUND_BROADCASTING	19
-
-#define DTV_ISDBT_SB_SUBCHANNEL_ID	20
-#define DTV_ISDBT_SB_SEGMENT_IDX	21
-#define DTV_ISDBT_SB_SEGMENT_COUNT	22
-
-#define DTV_ISDBT_LAYERA_FEC			23
-#define DTV_ISDBT_LAYERA_MODULATION		24
-#define DTV_ISDBT_LAYERA_SEGMENT_COUNT		25
-#define DTV_ISDBT_LAYERA_TIME_INTERLEAVING	26
-
-#define DTV_ISDBT_LAYERB_FEC			27
-#define DTV_ISDBT_LAYERB_MODULATION		28
-#define DTV_ISDBT_LAYERB_SEGMENT_COUNT		29
-#define DTV_ISDBT_LAYERB_TIME_INTERLEAVING	30
-
-#define DTV_ISDBT_LAYERC_FEC			31
-#define DTV_ISDBT_LAYERC_MODULATION		32
-#define DTV_ISDBT_LAYERC_SEGMENT_COUNT		33
-#define DTV_ISDBT_LAYERC_TIME_INTERLEAVING	34
-
-#define DTV_API_VERSION		35
-
-#define DTV_CODE_RATE_HP	36
-#define DTV_CODE_RATE_LP	37
-#define DTV_GUARD_INTERVAL	38
-#define DTV_TRANSMISSION_MODE	39
-#define DTV_HIERARCHY		40
-
-#define DTV_ISDBT_LAYER_ENABLED	41
-
-#define DTV_STREAM_ID		42
-#define DTV_ISDBS_TS_ID_LEGACY	DTV_STREAM_ID
-#define DTV_DVBT2_PLP_ID_LEGACY	43
-
-#define DTV_ENUM_DELSYS		44
-
-/* ATSC-MH */
-#define DTV_ATSCMH_FIC_VER		45
-#define DTV_ATSCMH_PARADE_ID		46
-#define DTV_ATSCMH_NOG			47
-#define DTV_ATSCMH_TNOG			48
-#define DTV_ATSCMH_SGN			49
-#define DTV_ATSCMH_PRC			50
-#define DTV_ATSCMH_RS_FRAME_MODE	51
-#define DTV_ATSCMH_RS_FRAME_ENSEMBLE	52
-#define DTV_ATSCMH_RS_CODE_MODE_PRI	53
-#define DTV_ATSCMH_RS_CODE_MODE_SEC	54
-#define DTV_ATSCMH_SCCC_BLOCK_MODE	55
-#define DTV_ATSCMH_SCCC_CODE_MODE_A	56
-#define DTV_ATSCMH_SCCC_CODE_MODE_B	57
-#define DTV_ATSCMH_SCCC_CODE_MODE_C	58
-#define DTV_ATSCMH_SCCC_CODE_MODE_D	59
-
-#define DTV_INTERLEAVING			60
-#define DTV_LNA					61
-
-/* Quality parameters */
-#define DTV_STAT_SIGNAL_STRENGTH	62
-#define DTV_STAT_CNR			63
-#define DTV_STAT_PRE_ERROR_BIT_COUNT	64
-#define DTV_STAT_PRE_TOTAL_BIT_COUNT	65
-#define DTV_STAT_POST_ERROR_BIT_COUNT	66
-#define DTV_STAT_POST_TOTAL_BIT_COUNT	67
-#define DTV_STAT_ERROR_BLOCK_COUNT	68
-#define DTV_STAT_TOTAL_BLOCK_COUNT	69
-
-#define DTV_MAX_COMMAND		DTV_STAT_TOTAL_BLOCK_COUNT
-
-enum fe_pilot {
-	PILOT_ON,
-	PILOT_OFF,
-	PILOT_AUTO,
-};
-
-enum fe_rolloff {
-	ROLLOFF_35, /* Implied value in DVB-S, default for DVB-S2 */
-	ROLLOFF_20,
-	ROLLOFF_25,
-	ROLLOFF_AUTO,
-};
-
-enum fe_delivery_system {
-	SYS_UNDEFINED,
-	SYS_DVBC_ANNEX_A,
-	SYS_DVBC_ANNEX_B,
-	SYS_DVBT,
-	SYS_DSS,
-	SYS_DVBS,
-	SYS_DVBS2,
-	SYS_DVBH,
-	SYS_ISDBT,
-	SYS_ISDBS,
-	SYS_ISDBC,
-	SYS_ATSC,
-	SYS_ATSCMH,
-	SYS_DTMB,
-	SYS_CMMB,
-	SYS_DAB,
-	SYS_DVBT2,
-	SYS_TURBO,
-	SYS_DVBC_ANNEX_C,
-};
-
-/* backward compatibility */
-#define SYS_DVBC_ANNEX_AC	SYS_DVBC_ANNEX_A
-#define SYS_DMBTH SYS_DTMB /* DMB-TH is legacy name, use DTMB instead */
-
-/* ATSC-MH */
-
-enum atscmh_sccc_block_mode {
-	ATSCMH_SCCC_BLK_SEP      = 0,
-	ATSCMH_SCCC_BLK_COMB     = 1,
-	ATSCMH_SCCC_BLK_RES      = 2,
-};
-
-enum atscmh_sccc_code_mode {
-	ATSCMH_SCCC_CODE_HLF     = 0,
-	ATSCMH_SCCC_CODE_QTR     = 1,
-	ATSCMH_SCCC_CODE_RES     = 2,
-};
-
-enum atscmh_rs_frame_ensemble {
-	ATSCMH_RSFRAME_ENS_PRI   = 0,
-	ATSCMH_RSFRAME_ENS_SEC   = 1,
-};
-
-enum atscmh_rs_frame_mode {
-	ATSCMH_RSFRAME_PRI_ONLY  = 0,
-	ATSCMH_RSFRAME_PRI_SEC   = 1,
-	ATSCMH_RSFRAME_RES       = 2,
-};
-
-enum atscmh_rs_code_mode {
-	ATSCMH_RSCODE_211_187    = 0,
-	ATSCMH_RSCODE_223_187    = 1,
-	ATSCMH_RSCODE_235_187    = 2,
-	ATSCMH_RSCODE_RES        = 3,
-};
-
-#define NO_STREAM_ID_FILTER	(~0U)
-#define LNA_AUTO                (~0U)
-
-struct dtv_cmds_h {
-	char	*name;		/* A display name for debugging purposes */
-
-	__u32	cmd;		/* A unique ID */
-
-	/* Flags */
-	__u32	set:1;		/* Either a set or get property */
-	__u32	buffer:1;	/* Does this property use the buffer? */
-	__u32	reserved:30;	/* Align */
-};
-
-/**
- * Scale types for the quality parameters.
- * @FE_SCALE_NOT_AVAILABLE: That QoS measure is not available. That
- *			    could indicate a temporary or a permanent
- *			    condition.
- * @FE_SCALE_DECIBEL: The scale is measured in 0.001 dB steps, typically
- *		  used on signal measures.
- * @FE_SCALE_RELATIVE: The scale is a relative percentual measure,
- *			ranging from 0 (0%) to 0xffff (100%).
- * @FE_SCALE_COUNTER: The scale counts the occurrence of an event, like
- *			bit error, block error, lapsed time.
- */
-enum fecap_scale_params {
-	FE_SCALE_NOT_AVAILABLE = 0,
-	FE_SCALE_DECIBEL,
-	FE_SCALE_RELATIVE,
-	FE_SCALE_COUNTER
-};
-
-/**
- * struct dtv_stats - Used for reading a DTV status property
- *
- * @value:	value of the measure. Should range from 0 to 0xffff;
- * @scale:	Filled with enum fecap_scale_params - the scale
- *		in usage for that parameter
- *
- * For most delivery systems, this will return a single value for each
- * parameter.
- * It should be noticed, however, that new OFDM delivery systems like
- * ISDB can use different modulation types for each group of carriers.
- * On such standards, up to 8 groups of statistics can be provided, one
- * for each carrier group (called "layer" on ISDB).
- * In order to be consistent with other delivery systems, the first
- * value refers to the entire set of carriers ("global").
- * dtv_status:scale should use the value FE_SCALE_NOT_AVAILABLE when
- * the value for the entire group of carriers or from one specific layer
- * is not provided by the hardware.
- * st.len should be filled with the latest filled status + 1.
- *
- * In other words, for ISDB, those values should be filled like:
- *	u.st.stat.svalue[0] = global statistics;
- *	u.st.stat.scale[0] = FE_SCALE_DECIBEL;
- *	u.st.stat.value[1] = layer A statistics;
- *	u.st.stat.scale[1] = FE_SCALE_NOT_AVAILABLE (if not available);
- *	u.st.stat.svalue[2] = layer B statistics;
- *	u.st.stat.scale[2] = FE_SCALE_DECIBEL;
- *	u.st.stat.svalue[3] = layer C statistics;
- *	u.st.stat.scale[3] = FE_SCALE_DECIBEL;
- *	u.st.len = 4;
- */
-struct dtv_stats {
-	__u8 scale;	/* enum fecap_scale_params type */
-	union {
-		__u64 uvalue;	/* for counters and relative scales */
-		__s64 svalue;	/* for 0.001 dB measures */
-	};
-} __attribute__ ((packed));
-
-
-#define MAX_DTV_STATS   4
-
-struct dtv_fe_stats {
-	__u8 len;
-	struct dtv_stats stat[MAX_DTV_STATS];
-} __attribute__ ((packed));
-
-struct dtv_property {
-	__u32 cmd;
-	__u32 reserved[3];
-	union {
-		__u32 data;
-		struct dtv_fe_stats st;
-		struct {
-			__u8 data[32];
-			__u32 len;
-			__u32 reserved1[3];
-			void *reserved2;
-		} buffer;
-	} u;
-	int result;
-} __attribute__ ((packed));
-
-/* num of properties cannot exceed DTV_IOCTL_MAX_MSGS per ioctl */
-#define DTV_IOCTL_MAX_MSGS 64
-
-struct dtv_properties {
-	__u32 num;
-	struct dtv_property *props;
-};
-
-
-/*
- * DEPRECATED: The DVBv3 ioctls, structs and enums should not be used on
- * newer programs, as it doesn't support the second generation of digital
- * TV standards, nor supports newer delivery systems.
- */
-
-enum fe_bandwidth {
-	BANDWIDTH_8_MHZ,
-	BANDWIDTH_7_MHZ,
-	BANDWIDTH_6_MHZ,
-	BANDWIDTH_AUTO,
-	BANDWIDTH_5_MHZ,
-	BANDWIDTH_10_MHZ,
-	BANDWIDTH_1_712_MHZ,
-};
-
-/* This is needed for legacy userspace support */
-typedef enum fe_sec_voltage fe_sec_voltage_t;
-typedef enum fe_caps fe_caps_t;
-typedef enum fe_type fe_type_t;
-typedef enum fe_sec_tone_mode fe_sec_tone_mode_t;
-typedef enum fe_sec_mini_cmd fe_sec_mini_cmd_t;
-typedef enum fe_status fe_status_t;
-typedef enum fe_spectral_inversion fe_spectral_inversion_t;
-typedef enum fe_code_rate fe_code_rate_t;
-typedef enum fe_modulation fe_modulation_t;
-typedef enum fe_transmit_mode fe_transmit_mode_t;
-typedef enum fe_bandwidth fe_bandwidth_t;
-typedef enum fe_guard_interval fe_guard_interval_t;
-typedef enum fe_hierarchy fe_hierarchy_t;
-typedef enum fe_pilot fe_pilot_t;
-typedef enum fe_rolloff fe_rolloff_t;
-typedef enum fe_delivery_system fe_delivery_system_t;
-
-struct dvb_qpsk_parameters {
-	__u32		symbol_rate;  /* symbol rate in Symbols per second */
-	fe_code_rate_t	fec_inner;    /* forward error correction (see above) */
-};
-
-struct dvb_qam_parameters {
-	__u32		symbol_rate; /* symbol rate in Symbols per second */
-	fe_code_rate_t	fec_inner;   /* forward error correction (see above) */
-	fe_modulation_t	modulation;  /* modulation type (see above) */
-};
-
-struct dvb_vsb_parameters {
-	fe_modulation_t	modulation;  /* modulation type (see above) */
-};
-
-struct dvb_ofdm_parameters {
-	fe_bandwidth_t      bandwidth;
-	fe_code_rate_t      code_rate_HP;  /* high priority stream code rate */
-	fe_code_rate_t      code_rate_LP;  /* low priority stream code rate */
-	fe_modulation_t     constellation; /* modulation type (see above) */
-	fe_transmit_mode_t  transmission_mode;
-	fe_guard_interval_t guard_interval;
-	fe_hierarchy_t      hierarchy_information;
-};
-
-struct dvb_frontend_parameters {
-	__u32 frequency;     /* (absolute) frequency in Hz for DVB-C/DVB-T/ATSC */
-			     /* intermediate frequency in kHz for DVB-S */
-	fe_spectral_inversion_t inversion;
-	union {
-		struct dvb_qpsk_parameters qpsk;	/* DVB-S */
-		struct dvb_qam_parameters  qam;		/* DVB-C */
-		struct dvb_ofdm_parameters ofdm;	/* DVB-T */
-		struct dvb_vsb_parameters vsb;		/* ATSC */
-	} u;
-};
-
-struct dvb_frontend_event {
-	fe_status_t status;
-	struct dvb_frontend_parameters parameters;
-};
-
-#define FE_SET_PROPERTY		   _IOW('o', 82, struct dtv_properties)
-#define FE_GET_PROPERTY		   _IOR('o', 83, struct dtv_properties)
-
-/**
- * When set, this flag will disable any zigzagging or other "normal" tuning
- * behaviour. Additionally, there will be no automatic monitoring of the lock
- * status, and hence no frontend events will be generated. If a frontend device
- * is closed, this flag will be automatically turned off when the device is
- * reopened read-write.
- */
-#define FE_TUNE_MODE_ONESHOT 0x01
-
-#define FE_GET_INFO		   _IOR('o', 61, struct dvb_frontend_info)
-
-#define FE_DISEQC_RESET_OVERLOAD   _IO('o', 62)
-#define FE_DISEQC_SEND_MASTER_CMD  _IOW('o', 63, struct dvb_diseqc_master_cmd)
-#define FE_DISEQC_RECV_SLAVE_REPLY _IOR('o', 64, struct dvb_diseqc_slave_reply)
-#define FE_DISEQC_SEND_BURST       _IO('o', 65)  /* fe_sec_mini_cmd_t */
-
-#define FE_SET_TONE		   _IO('o', 66)  /* fe_sec_tone_mode_t */
-#define FE_SET_VOLTAGE		   _IO('o', 67)  /* fe_sec_voltage_t */
-#define FE_ENABLE_HIGH_LNB_VOLTAGE _IO('o', 68)  /* int */
-
-#define FE_READ_STATUS		   _IOR('o', 69, fe_status_t)
-#define FE_READ_BER		   _IOR('o', 70, __u32)
-#define FE_READ_SIGNAL_STRENGTH    _IOR('o', 71, __u16)
-#define FE_READ_SNR		   _IOR('o', 72, __u16)
-#define FE_READ_UNCORRECTED_BLOCKS _IOR('o', 73, __u32)
-
-#define FE_SET_FRONTEND		   _IOW('o', 76, struct dvb_frontend_parameters)
-#define FE_GET_FRONTEND		   _IOR('o', 77, struct dvb_frontend_parameters)
-#define FE_SET_FRONTEND_TUNE_MODE  _IO('o', 81) /* unsigned int */
-#define FE_GET_EVENT		   _IOR('o', 78, struct dvb_frontend_event)
-
-#define FE_DISHNETWORK_SEND_LEGACY_CMD _IO('o', 80) /* unsigned int */
-
-#endif /*_DVBFRONTEND_H_*/
diff --git a/openflow/usr/include/linux/dvb/net.h b/openflow/usr/include/linux/dvb/net.h
deleted file mode 100644
index f451e7e..0000000
--- a/openflow/usr/include/linux/dvb/net.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * net.h
- *
- * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
- *                  & Ralph  Metzler <ralph@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _DVBNET_H_
-#define _DVBNET_H_
-
-#include <linux/types.h>
-
-struct dvb_net_if {
-	__u16 pid;
-	__u16 if_num;
-	__u8  feedtype;
-#define DVB_NET_FEEDTYPE_MPE 0	/* multi protocol encapsulation */
-#define DVB_NET_FEEDTYPE_ULE 1	/* ultra lightweight encapsulation */
-};
-
-
-#define NET_ADD_IF    _IOWR('o', 52, struct dvb_net_if)
-#define NET_REMOVE_IF _IO('o', 53)
-#define NET_GET_IF    _IOWR('o', 54, struct dvb_net_if)
-
-
-/* binary compatibility cruft: */
-struct __dvb_net_if_old {
-	__u16 pid;
-	__u16 if_num;
-};
-#define __NET_ADD_IF_OLD _IOWR('o', 52, struct __dvb_net_if_old)
-#define __NET_GET_IF_OLD _IOWR('o', 54, struct __dvb_net_if_old)
-
-
-#endif /*_DVBNET_H_*/
diff --git a/openflow/usr/include/linux/dvb/osd.h b/openflow/usr/include/linux/dvb/osd.h
deleted file mode 100644
index f28c7cb..0000000
--- a/openflow/usr/include/linux/dvb/osd.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * osd.h
- *
- * Copyright (C) 2001 Ralph  Metzler <ralph@convergence.de>
- *                  & Marcus Metzler <marcus@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Lesser Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _DVBOSD_H_
-#define _DVBOSD_H_
-
-
-
-typedef enum {
-  // All functions return -2 on "not open"
-  OSD_Close=1,    // ()
-  // Disables OSD and releases the buffers
-  // returns 0 on success
-  OSD_Open,       // (x0,y0,x1,y1,BitPerPixel[2/4/8](color&0x0F),mix[0..15](color&0xF0))
-  // Opens OSD with this size and bit depth
-  // returns 0 on success, -1 on DRAM allocation error, -2 on "already open"
-  OSD_Show,       // ()
-  // enables OSD mode
-  // returns 0 on success
-  OSD_Hide,       // ()
-  // disables OSD mode
-  // returns 0 on success
-  OSD_Clear,      // ()
-  // Sets all pixel to color 0
-  // returns 0 on success
-  OSD_Fill,       // (color)
-  // Sets all pixel to color <col>
-  // returns 0 on success
-  OSD_SetColor,   // (color,R{x0},G{y0},B{x1},opacity{y1})
-  // set palette entry <num> to <r,g,b>, <mix> and <trans> apply
-  // R,G,B: 0..255
-  // R=Red, G=Green, B=Blue
-  // opacity=0:      pixel opacity 0% (only video pixel shows)
-  // opacity=1..254: pixel opacity as specified in header
-  // opacity=255:    pixel opacity 100% (only OSD pixel shows)
-  // returns 0 on success, -1 on error
-  OSD_SetPalette, // (firstcolor{color},lastcolor{x0},data)
-  // Set a number of entries in the palette
-  // sets the entries "firstcolor" through "lastcolor" from the array "data"
-  // data has 4 byte for each color:
-  // R,G,B, and a opacity value: 0->transparent, 1..254->mix, 255->pixel
-  OSD_SetTrans,   // (transparency{color})
-  // Sets transparency of mixed pixel (0..15)
-  // returns 0 on success
-  OSD_SetPixel,   // (x0,y0,color)
-  // sets pixel <x>,<y> to color number <col>
-  // returns 0 on success, -1 on error
-  OSD_GetPixel,   // (x0,y0)
-  // returns color number of pixel <x>,<y>,  or -1
-  OSD_SetRow,     // (x0,y0,x1,data)
-  // fills pixels x0,y through  x1,y with the content of data[]
-  // returns 0 on success, -1 on clipping all pixel (no pixel drawn)
-  OSD_SetBlock,   // (x0,y0,x1,y1,increment{color},data)
-  // fills pixels x0,y0 through  x1,y1 with the content of data[]
-  // inc contains the width of one line in the data block,
-  // inc<=0 uses blockwidth as linewidth
-  // returns 0 on success, -1 on clipping all pixel
-  OSD_FillRow,    // (x0,y0,x1,color)
-  // fills pixels x0,y through  x1,y with the color <col>
-  // returns 0 on success, -1 on clipping all pixel
-  OSD_FillBlock,  // (x0,y0,x1,y1,color)
-  // fills pixels x0,y0 through  x1,y1 with the color <col>
-  // returns 0 on success, -1 on clipping all pixel
-  OSD_Line,       // (x0,y0,x1,y1,color)
-  // draw a line from x0,y0 to x1,y1 with the color <col>
-  // returns 0 on success
-  OSD_Query,      // (x0,y0,x1,y1,xasp{color}}), yasp=11
-  // fills parameters with the picture dimensions and the pixel aspect ratio
-  // returns 0 on success
-  OSD_Test,       // ()
-  // draws a test picture. for debugging purposes only
-  // returns 0 on success
-// TODO: remove "test" in final version
-  OSD_Text,       // (x0,y0,size,color,text)
-  OSD_SetWindow, //  (x0) set window with number 0<x0<8 as current
-  OSD_MoveWindow, //  move current window to (x0, y0)
-  OSD_OpenRaw,	// Open other types of OSD windows
-} OSD_Command;
-
-typedef struct osd_cmd_s {
-	OSD_Command cmd;
-	int x0;
-	int y0;
-	int x1;
-	int y1;
-	int color;
-	void *data;
-} osd_cmd_t;
-
-/* OSD_OpenRaw: set 'color' to desired window type */
-typedef enum {
-	OSD_BITMAP1,           /* 1 bit bitmap */
-	OSD_BITMAP2,           /* 2 bit bitmap */
-	OSD_BITMAP4,           /* 4 bit bitmap */
-	OSD_BITMAP8,           /* 8 bit bitmap */
-	OSD_BITMAP1HR,         /* 1 Bit bitmap half resolution */
-	OSD_BITMAP2HR,         /* 2 bit bitmap half resolution */
-	OSD_BITMAP4HR,         /* 4 bit bitmap half resolution */
-	OSD_BITMAP8HR,         /* 8 bit bitmap half resolution */
-	OSD_YCRCB422,          /* 4:2:2 YCRCB Graphic Display */
-	OSD_YCRCB444,          /* 4:4:4 YCRCB Graphic Display */
-	OSD_YCRCB444HR,        /* 4:4:4 YCRCB graphic half resolution */
-	OSD_VIDEOTSIZE,        /* True Size Normal MPEG Video Display */
-	OSD_VIDEOHSIZE,        /* MPEG Video Display Half Resolution */
-	OSD_VIDEOQSIZE,        /* MPEG Video Display Quarter Resolution */
-	OSD_VIDEODSIZE,        /* MPEG Video Display Double Resolution */
-	OSD_VIDEOTHSIZE,       /* True Size MPEG Video Display Half Resolution */
-	OSD_VIDEOTQSIZE,       /* True Size MPEG Video Display Quarter Resolution*/
-	OSD_VIDEOTDSIZE,       /* True Size MPEG Video Display Double Resolution */
-	OSD_VIDEONSIZE,        /* Full Size MPEG Video Display */
-	OSD_CURSOR             /* Cursor */
-} osd_raw_window_t;
-
-typedef struct osd_cap_s {
-	int  cmd;
-#define OSD_CAP_MEMSIZE         1  /* memory size */
-	long val;
-} osd_cap_t;
-
-
-#define OSD_SEND_CMD            _IOW('o', 160, osd_cmd_t)
-#define OSD_GET_CAPABILITY      _IOR('o', 161, osd_cap_t)
-
-#endif
diff --git a/openflow/usr/include/linux/dvb/version.h b/openflow/usr/include/linux/dvb/version.h
deleted file mode 100644
index e53e2ad..0000000
--- a/openflow/usr/include/linux/dvb/version.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * version.h
- *
- * Copyright (C) 2000 Holger Waechtler <holger@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _DVBVERSION_H_
-#define _DVBVERSION_H_
-
-#define DVB_API_VERSION 5
-#define DVB_API_VERSION_MINOR 10
-
-#endif /*_DVBVERSION_H_*/
diff --git a/openflow/usr/include/linux/dvb/video.h b/openflow/usr/include/linux/dvb/video.h
deleted file mode 100644
index 4bb276c..0000000
--- a/openflow/usr/include/linux/dvb/video.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * video.h
- *
- * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
- *                  & Ralph  Metzler <ralph@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _DVBVIDEO_H_
-#define _DVBVIDEO_H_
-
-#include <linux/types.h>
-#include <stdint.h>
-#include <time.h>
-
-typedef enum {
-	VIDEO_FORMAT_4_3,     /* Select 4:3 format */
-	VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
-	VIDEO_FORMAT_221_1    /* 2.21:1 */
-} video_format_t;
-
-
-typedef enum {
-	 VIDEO_SYSTEM_PAL,
-	 VIDEO_SYSTEM_NTSC,
-	 VIDEO_SYSTEM_PALN,
-	 VIDEO_SYSTEM_PALNc,
-	 VIDEO_SYSTEM_PALM,
-	 VIDEO_SYSTEM_NTSC60,
-	 VIDEO_SYSTEM_PAL60,
-	 VIDEO_SYSTEM_PALM60
-} video_system_t;
-
-
-typedef enum {
-	VIDEO_PAN_SCAN,       /* use pan and scan format */
-	VIDEO_LETTER_BOX,     /* use letterbox format */
-	VIDEO_CENTER_CUT_OUT  /* use center cut out format */
-} video_displayformat_t;
-
-typedef struct {
-	int w;
-	int h;
-	video_format_t aspect_ratio;
-} video_size_t;
-
-typedef enum {
-	VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
-	VIDEO_SOURCE_MEMORY /* If this source is selected, the stream
-			       comes from the user through the write
-			       system call */
-} video_stream_source_t;
-
-
-typedef enum {
-	VIDEO_STOPPED, /* Video is stopped */
-	VIDEO_PLAYING, /* Video is currently playing */
-	VIDEO_FREEZED  /* Video is freezed */
-} video_play_state_t;
-
-
-/* Decoder commands */
-#define VIDEO_CMD_PLAY        (0)
-#define VIDEO_CMD_STOP        (1)
-#define VIDEO_CMD_FREEZE      (2)
-#define VIDEO_CMD_CONTINUE    (3)
-
-/* Flags for VIDEO_CMD_FREEZE */
-#define VIDEO_CMD_FREEZE_TO_BLACK     	(1 << 0)
-
-/* Flags for VIDEO_CMD_STOP */
-#define VIDEO_CMD_STOP_TO_BLACK      	(1 << 0)
-#define VIDEO_CMD_STOP_IMMEDIATELY     	(1 << 1)
-
-/* Play input formats: */
-/* The decoder has no special format requirements */
-#define VIDEO_PLAY_FMT_NONE         (0)
-/* The decoder requires full GOPs */
-#define VIDEO_PLAY_FMT_GOP          (1)
-
-/* The structure must be zeroed before use by the application
-   This ensures it can be extended safely in the future. */
-struct video_command {
-	__u32 cmd;
-	__u32 flags;
-	union {
-		struct {
-			__u64 pts;
-		} stop;
-
-		struct {
-			/* 0 or 1000 specifies normal speed,
-			   1 specifies forward single stepping,
-			   -1 specifies backward single stepping,
-			   >1: playback at speed/1000 of the normal speed,
-			   <-1: reverse playback at (-speed/1000) of the normal speed. */
-			__s32 speed;
-			__u32 format;
-		} play;
-
-		struct {
-			__u32 data[16];
-		} raw;
-	};
-};
-
-/* FIELD_UNKNOWN can be used if the hardware does not know whether
-   the Vsync is for an odd, even or progressive (i.e. non-interlaced)
-   field. */
-#define VIDEO_VSYNC_FIELD_UNKNOWN  	(0)
-#define VIDEO_VSYNC_FIELD_ODD 		(1)
-#define VIDEO_VSYNC_FIELD_EVEN		(2)
-#define VIDEO_VSYNC_FIELD_PROGRESSIVE	(3)
-
-struct video_event {
-	__s32 type;
-#define VIDEO_EVENT_SIZE_CHANGED	1
-#define VIDEO_EVENT_FRAME_RATE_CHANGED	2
-#define VIDEO_EVENT_DECODER_STOPPED 	3
-#define VIDEO_EVENT_VSYNC 		4
-	__kernel_time_t timestamp;
-	union {
-		video_size_t size;
-		unsigned int frame_rate;	/* in frames per 1000sec */
-		unsigned char vsync_field;	/* unknown/odd/even/progressive */
-	} u;
-};
-
-
-struct video_status {
-	int                   video_blank;   /* blank video on freeze? */
-	video_play_state_t    play_state;    /* current state of playback */
-	video_stream_source_t stream_source; /* current source (demux/memory) */
-	video_format_t        video_format;  /* current aspect ratio of stream*/
-	video_displayformat_t display_format;/* selected cropping mode */
-};
-
-
-struct video_still_picture {
-	char *iFrame;        /* pointer to a single iframe in memory */
-	__s32 size;
-};
-
-
-typedef
-struct video_highlight {
-	int     active;      /*    1=show highlight, 0=hide highlight */
-	__u8    contrast1;   /*    7- 4  Pattern pixel contrast */
-			     /*    3- 0  Background pixel contrast */
-	__u8    contrast2;   /*    7- 4  Emphasis pixel-2 contrast */
-			     /*    3- 0  Emphasis pixel-1 contrast */
-	__u8    color1;      /*    7- 4  Pattern pixel color */
-			     /*    3- 0  Background pixel color */
-	__u8    color2;      /*    7- 4  Emphasis pixel-2 color */
-			     /*    3- 0  Emphasis pixel-1 color */
-	__u32    ypos;       /*   23-22  auto action mode */
-			     /*   21-12  start y */
-			     /*    9- 0  end y */
-	__u32    xpos;       /*   23-22  button color number */
-			     /*   21-12  start x */
-			     /*    9- 0  end x */
-} video_highlight_t;
-
-
-typedef struct video_spu {
-	int active;
-	int stream_id;
-} video_spu_t;
-
-
-typedef struct video_spu_palette {      /* SPU Palette information */
-	int length;
-	__u8 *palette;
-} video_spu_palette_t;
-
-
-typedef struct video_navi_pack {
-	int length;          /* 0 ... 1024 */
-	__u8 data[1024];
-} video_navi_pack_t;
-
-
-typedef __u16 video_attributes_t;
-/*   bits: descr. */
-/*   15-14 Video compression mode (0=MPEG-1, 1=MPEG-2) */
-/*   13-12 TV system (0=525/60, 1=625/50) */
-/*   11-10 Aspect ratio (0=4:3, 3=16:9) */
-/*    9- 8 permitted display mode on 4:3 monitor (0=both, 1=only pan-sca */
-/*    7    line 21-1 data present in GOP (1=yes, 0=no) */
-/*    6    line 21-2 data present in GOP (1=yes, 0=no) */
-/*    5- 3 source resolution (0=720x480/576, 1=704x480/576, 2=352x480/57 */
-/*    2    source letterboxed (1=yes, 0=no) */
-/*    0    film/camera mode (0=camera, 1=film (625/50 only)) */
-
-
-/* bit definitions for capabilities: */
-/* can the hardware decode MPEG1 and/or MPEG2? */
-#define VIDEO_CAP_MPEG1   1
-#define VIDEO_CAP_MPEG2   2
-/* can you send a system and/or program stream to video device?
-   (you still have to open the video and the audio device but only
-    send the stream to the video device) */
-#define VIDEO_CAP_SYS     4
-#define VIDEO_CAP_PROG    8
-/* can the driver also handle SPU, NAVI and CSS encoded data?
-   (CSS API is not present yet) */
-#define VIDEO_CAP_SPU    16
-#define VIDEO_CAP_NAVI   32
-#define VIDEO_CAP_CSS    64
-
-
-#define VIDEO_STOP                 _IO('o', 21)
-#define VIDEO_PLAY                 _IO('o', 22)
-#define VIDEO_FREEZE               _IO('o', 23)
-#define VIDEO_CONTINUE             _IO('o', 24)
-#define VIDEO_SELECT_SOURCE        _IO('o', 25)
-#define VIDEO_SET_BLANK            _IO('o', 26)
-#define VIDEO_GET_STATUS           _IOR('o', 27, struct video_status)
-#define VIDEO_GET_EVENT            _IOR('o', 28, struct video_event)
-#define VIDEO_SET_DISPLAY_FORMAT   _IO('o', 29)
-#define VIDEO_STILLPICTURE         _IOW('o', 30, struct video_still_picture)
-#define VIDEO_FAST_FORWARD         _IO('o', 31)
-#define VIDEO_SLOWMOTION           _IO('o', 32)
-#define VIDEO_GET_CAPABILITIES     _IOR('o', 33, unsigned int)
-#define VIDEO_CLEAR_BUFFER         _IO('o',  34)
-#define VIDEO_SET_ID               _IO('o', 35)
-#define VIDEO_SET_STREAMTYPE       _IO('o', 36)
-#define VIDEO_SET_FORMAT           _IO('o', 37)
-#define VIDEO_SET_SYSTEM           _IO('o', 38)
-#define VIDEO_SET_HIGHLIGHT        _IOW('o', 39, video_highlight_t)
-#define VIDEO_SET_SPU              _IOW('o', 50, video_spu_t)
-#define VIDEO_SET_SPU_PALETTE      _IOW('o', 51, video_spu_palette_t)
-#define VIDEO_GET_NAVI             _IOR('o', 52, video_navi_pack_t)
-#define VIDEO_SET_ATTRIBUTES       _IO('o', 53)
-#define VIDEO_GET_SIZE             _IOR('o', 55, video_size_t)
-#define VIDEO_GET_FRAME_RATE       _IOR('o', 56, unsigned int)
-
-/**
- * VIDEO_GET_PTS
- *
- * Read the 33 bit presentation time stamp as defined
- * in ITU T-REC-H.222.0 / ISO/IEC 13818-1.
- *
- * The PTS should belong to the currently played
- * frame if possible, but may also be a value close to it
- * like the PTS of the last decoded frame or the last PTS
- * extracted by the PES parser.
- */
-#define VIDEO_GET_PTS              _IOR('o', 57, __u64)
-
-/* Read the number of displayed frames since the decoder was started */
-#define VIDEO_GET_FRAME_COUNT  	   _IOR('o', 58, __u64)
-
-#define VIDEO_COMMAND     	   _IOWR('o', 59, struct video_command)
-#define VIDEO_TRY_COMMAND 	   _IOWR('o', 60, struct video_command)
-
-#endif /* _DVBVIDEO_H_ */
diff --git a/openflow/usr/include/linux/edd.h b/openflow/usr/include/linux/edd.h
deleted file mode 100644
index 190815d..0000000
--- a/openflow/usr/include/linux/edd.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * linux/include/linux/edd.h
- *  Copyright (C) 2002, 2003, 2004 Dell Inc.
- *  by Matt Domsch <Matt_Domsch@dell.com>
- *
- * structures and definitions for the int 13h, ax={41,48}h
- * BIOS Enhanced Disk Drive Services
- * This is based on the T13 group document D1572 Revision 0 (August 14 2002)
- * available at http://www.t13.org/docs2002/d1572r0.pdf.  It is
- * very similar to D1484 Revision 3 http://www.t13.org/docs2002/d1484r3.pdf
- *
- * In a nutshell, arch/{i386,x86_64}/boot/setup.S populates a scratch
- * table in the boot_params that contains a list of BIOS-enumerated
- * boot devices.
- * In arch/{i386,x86_64}/kernel/setup.c, this information is
- * transferred into the edd structure, and in drivers/firmware/edd.c, that
- * information is used to identify BIOS boot disk.  The code in setup.S
- * is very sensitive to the size of these structures.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License v2.0 as published by
- * the Free Software Foundation
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-#ifndef _LINUX_EDD_H
-#define _LINUX_EDD_H
-
-#include <linux/types.h>
-
-#define EDDNR 0x1e9		/* addr of number of edd_info structs at EDDBUF
-				   in boot_params - treat this as 1 byte  */
-#define EDDBUF	0xd00		/* addr of edd_info structs in boot_params */
-#define EDDMAXNR 6		/* number of edd_info structs starting at EDDBUF  */
-#define EDDEXTSIZE 8		/* change these if you muck with the structures */
-#define EDDPARMSIZE 74
-#define CHECKEXTENSIONSPRESENT 0x41
-#define GETDEVICEPARAMETERS 0x48
-#define LEGACYGETDEVICEPARAMETERS 0x08
-#define EDDMAGIC1 0x55AA
-#define EDDMAGIC2 0xAA55
-
-
-#define READ_SECTORS 0x02         /* int13 AH=0x02 is READ_SECTORS command */
-#define EDD_MBR_SIG_OFFSET 0x1B8  /* offset of signature in the MBR */
-#define EDD_MBR_SIG_BUF    0x290  /* addr in boot params */
-#define EDD_MBR_SIG_MAX 16        /* max number of signatures to store */
-#define EDD_MBR_SIG_NR_BUF 0x1ea  /* addr of number of MBR signtaures at EDD_MBR_SIG_BUF
-				     in boot_params - treat this as 1 byte  */
-
-#ifndef __ASSEMBLY__
-
-#define EDD_EXT_FIXED_DISK_ACCESS           (1 << 0)
-#define EDD_EXT_DEVICE_LOCKING_AND_EJECTING (1 << 1)
-#define EDD_EXT_ENHANCED_DISK_DRIVE_SUPPORT (1 << 2)
-#define EDD_EXT_64BIT_EXTENSIONS            (1 << 3)
-
-#define EDD_INFO_DMA_BOUNDARY_ERROR_TRANSPARENT (1 << 0)
-#define EDD_INFO_GEOMETRY_VALID                (1 << 1)
-#define EDD_INFO_REMOVABLE                     (1 << 2)
-#define EDD_INFO_WRITE_VERIFY                  (1 << 3)
-#define EDD_INFO_MEDIA_CHANGE_NOTIFICATION     (1 << 4)
-#define EDD_INFO_LOCKABLE                      (1 << 5)
-#define EDD_INFO_NO_MEDIA_PRESENT              (1 << 6)
-#define EDD_INFO_USE_INT13_FN50                (1 << 7)
-
-struct edd_device_params {
-	__u16 length;
-	__u16 info_flags;
-	__u32 num_default_cylinders;
-	__u32 num_default_heads;
-	__u32 sectors_per_track;
-	__u64 number_of_sectors;
-	__u16 bytes_per_sector;
-	__u32 dpte_ptr;		/* 0xFFFFFFFF for our purposes */
-	__u16 key;		/* = 0xBEDD */
-	__u8 device_path_info_length;	/* = 44 */
-	__u8 reserved2;
-	__u16 reserved3;
-	__u8 host_bus_type[4];
-	__u8 interface_type[8];
-	union {
-		struct {
-			__u16 base_address;
-			__u16 reserved1;
-			__u32 reserved2;
-		} __attribute__ ((packed)) isa;
-		struct {
-			__u8 bus;
-			__u8 slot;
-			__u8 function;
-			__u8 channel;
-			__u32 reserved;
-		} __attribute__ ((packed)) pci;
-		/* pcix is same as pci */
-		struct {
-			__u64 reserved;
-		} __attribute__ ((packed)) ibnd;
-		struct {
-			__u64 reserved;
-		} __attribute__ ((packed)) xprs;
-		struct {
-			__u64 reserved;
-		} __attribute__ ((packed)) htpt;
-		struct {
-			__u64 reserved;
-		} __attribute__ ((packed)) unknown;
-	} interface_path;
-	union {
-		struct {
-			__u8 device;
-			__u8 reserved1;
-			__u16 reserved2;
-			__u32 reserved3;
-			__u64 reserved4;
-		} __attribute__ ((packed)) ata;
-		struct {
-			__u8 device;
-			__u8 lun;
-			__u8 reserved1;
-			__u8 reserved2;
-			__u32 reserved3;
-			__u64 reserved4;
-		} __attribute__ ((packed)) atapi;
-		struct {
-			__u16 id;
-			__u64 lun;
-			__u16 reserved1;
-			__u32 reserved2;
-		} __attribute__ ((packed)) scsi;
-		struct {
-			__u64 serial_number;
-			__u64 reserved;
-		} __attribute__ ((packed)) usb;
-		struct {
-			__u64 eui;
-			__u64 reserved;
-		} __attribute__ ((packed)) i1394;
-		struct {
-			__u64 wwid;
-			__u64 lun;
-		} __attribute__ ((packed)) fibre;
-		struct {
-			__u64 identity_tag;
-			__u64 reserved;
-		} __attribute__ ((packed)) i2o;
-		struct {
-			__u32 array_number;
-			__u32 reserved1;
-			__u64 reserved2;
-		} __attribute__ ((packed)) raid;
-		struct {
-			__u8 device;
-			__u8 reserved1;
-			__u16 reserved2;
-			__u32 reserved3;
-			__u64 reserved4;
-		} __attribute__ ((packed)) sata;
-		struct {
-			__u64 reserved1;
-			__u64 reserved2;
-		} __attribute__ ((packed)) unknown;
-	} device_path;
-	__u8 reserved4;
-	__u8 checksum;
-} __attribute__ ((packed));
-
-struct edd_info {
-	__u8 device;
-	__u8 version;
-	__u16 interface_support;
-	__u16 legacy_max_cylinder;
-	__u8 legacy_max_head;
-	__u8 legacy_sectors_per_track;
-	struct edd_device_params params;
-} __attribute__ ((packed));
-
-struct edd {
-	unsigned int mbr_signature[EDD_MBR_SIG_MAX];
-	struct edd_info edd_info[EDDMAXNR];
-	unsigned char mbr_signature_nr;
-	unsigned char edd_info_nr;
-};
-
-#endif				/*!__ASSEMBLY__ */
-
-#endif /* _LINUX_EDD_H */
diff --git a/openflow/usr/include/linux/efs_fs_sb.h b/openflow/usr/include/linux/efs_fs_sb.h
deleted file mode 100644
index a01be90..0000000
--- a/openflow/usr/include/linux/efs_fs_sb.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * efs_fs_sb.h
- *
- * Copyright (c) 1999 Al Smith
- *
- * Portions derived from IRIX header files (c) 1988 Silicon Graphics
- */
-
-#ifndef __EFS_FS_SB_H__
-#define __EFS_FS_SB_H__
-
-#include <linux/types.h>
-#include <linux/magic.h>
-
-/* EFS superblock magic numbers */
-#define EFS_MAGIC	0x072959
-#define EFS_NEWMAGIC	0x07295a
-
-#define IS_EFS_MAGIC(x)	((x == EFS_MAGIC) || (x == EFS_NEWMAGIC))
-
-#define EFS_SUPER		1
-#define EFS_ROOTINODE		2
-
-/* efs superblock on disk */
-struct efs_super {
-	__be32		fs_size;        /* size of filesystem, in sectors */
-	__be32		fs_firstcg;     /* bb offset to first cg */
-	__be32		fs_cgfsize;     /* size of cylinder group in bb's */
-	__be16		fs_cgisize;     /* bb's of inodes per cylinder group */
-	__be16		fs_sectors;     /* sectors per track */
-	__be16		fs_heads;       /* heads per cylinder */
-	__be16		fs_ncg;         /* # of cylinder groups in filesystem */
-	__be16		fs_dirty;       /* fs needs to be fsck'd */
-	__be32		fs_time;        /* last super-block update */
-	__be32		fs_magic;       /* magic number */
-	char		fs_fname[6];    /* file system name */
-	char		fs_fpack[6];    /* file system pack name */
-	__be32		fs_bmsize;      /* size of bitmap in bytes */
-	__be32		fs_tfree;       /* total free data blocks */
-	__be32		fs_tinode;      /* total free inodes */
-	__be32		fs_bmblock;     /* bitmap location. */
-	__be32		fs_replsb;      /* Location of replicated superblock. */
-	__be32		fs_lastialloc;  /* last allocated inode */
-	char		fs_spare[20];   /* space for expansion - MUST BE ZERO */
-	__be32		fs_checksum;    /* checksum of volume portion of fs */
-};
-
-/* efs superblock information in memory */
-struct efs_sb_info {
-	__u32	fs_magic;	/* superblock magic number */
-	__u32	fs_start;	/* first block of filesystem */
-	__u32	first_block;	/* first data block in filesystem */
-	__u32	total_blocks;	/* total number of blocks in filesystem */
-	__u32	group_size;	/* # of blocks a group consists of */ 
-	__u32	data_free;	/* # of free data blocks */
-	__u32	inode_free;	/* # of free inodes */
-	__u16	inode_blocks;	/* # of blocks used for inodes in every grp */
-	__u16	total_groups;	/* # of groups */
-};
-
-#endif /* __EFS_FS_SB_H__ */
-
diff --git a/openflow/usr/include/linux/elf-em.h b/openflow/usr/include/linux/elf-em.h
deleted file mode 100644
index b56dfcf..0000000
--- a/openflow/usr/include/linux/elf-em.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef _LINUX_ELF_EM_H
-#define _LINUX_ELF_EM_H
-
-/* These constants define the various ELF target machines */
-#define EM_NONE		0
-#define EM_M32		1
-#define EM_SPARC	2
-#define EM_386		3
-#define EM_68K		4
-#define EM_88K		5
-#define EM_486		6	/* Perhaps disused */
-#define EM_860		7
-#define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */
-				/* Next two are historical and binaries and
-				   modules of these types will be rejected by
-				   Linux.  */
-#define EM_MIPS_RS3_LE	10	/* MIPS R3000 little-endian */
-#define EM_MIPS_RS4_BE	10	/* MIPS R4000 big-endian */
-
-#define EM_PARISC	15	/* HPPA */
-#define EM_SPARC32PLUS	18	/* Sun's "v8plus" */
-#define EM_PPC		20	/* PowerPC */
-#define EM_PPC64	21	 /* PowerPC64 */
-#define EM_SPU		23	/* Cell BE SPU */
-#define EM_ARM		40	/* ARM 32 bit */
-#define EM_SH		42	/* SuperH */
-#define EM_SPARCV9	43	/* SPARC v9 64-bit */
-#define EM_H8_300	46	/* Renesas H8/300 */
-#define EM_IA_64	50	/* HP/Intel IA-64 */
-#define EM_X86_64	62	/* AMD x86-64 */
-#define EM_S390		22	/* IBM S/390 */
-#define EM_CRIS		76	/* Axis Communications 32-bit embedded processor */
-#define EM_V850		87	/* NEC v850 */
-#define EM_M32R		88	/* Renesas M32R */
-#define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
-#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
-#define EM_BLACKFIN     106     /* ADI Blackfin Processor */
-#define EM_ALTERA_NIOS2	113	/* Altera Nios II soft-core processor */
-#define EM_TI_C6000	140	/* TI C6X DSPs */
-#define EM_AARCH64	183	/* ARM 64 bit */
-#define EM_TILEPRO	188	/* Tilera TILEPro */
-#define EM_MICROBLAZE	189	/* Xilinx MicroBlaze */
-#define EM_TILEGX	191	/* Tilera TILE-Gx */
-#define EM_FRV		0x5441	/* Fujitsu FR-V */
-#define EM_AVR32	0x18ad	/* Atmel AVR32 */
-
-/*
- * This is an interim value that we will use until the committee comes
- * up with a final number.
- */
-#define EM_ALPHA	0x9026
-
-/* Bogus old v850 magic number, used by old tools. */
-#define EM_CYGNUS_V850	0x9080
-/* Bogus old m32r magic number, used by old tools. */
-#define EM_CYGNUS_M32R	0x9041
-/* This is the old interim value for S/390 architecture */
-#define EM_S390_OLD	0xA390
-/* Also Panasonic/MEI MN10300, AM33 */
-#define EM_CYGNUS_MN10300 0xbeef
-
-
-#endif /* _LINUX_ELF_EM_H */
diff --git a/openflow/usr/include/linux/elf-fdpic.h b/openflow/usr/include/linux/elf-fdpic.h
deleted file mode 100644
index 5748a46..0000000
--- a/openflow/usr/include/linux/elf-fdpic.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* elf-fdpic.h: FDPIC ELF load map
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_ELF_FDPIC_H
-#define _LINUX_ELF_FDPIC_H
-
-#include <linux/elf.h>
-
-#define PT_GNU_STACK    (PT_LOOS + 0x474e551)
-
-/* segment mappings for ELF FDPIC libraries/executables/interpreters */
-struct elf32_fdpic_loadseg {
-	Elf32_Addr	addr;		/* core address to which mapped */
-	Elf32_Addr	p_vaddr;	/* VMA recorded in file */
-	Elf32_Word	p_memsz;	/* allocation size recorded in file */
-};
-
-struct elf32_fdpic_loadmap {
-	Elf32_Half	version;	/* version of these structures, just in case... */
-	Elf32_Half	nsegs;		/* number of segments */
-	struct elf32_fdpic_loadseg segs[];
-};
-
-#define ELF32_FDPIC_LOADMAP_VERSION	0x0000
-
-#endif /* _LINUX_ELF_FDPIC_H */
diff --git a/openflow/usr/include/linux/elf.h b/openflow/usr/include/linux/elf.h
deleted file mode 100644
index 988b53d..0000000
--- a/openflow/usr/include/linux/elf.h
+++ /dev/null
@@ -1,420 +0,0 @@
-#ifndef _LINUX_ELF_H
-#define _LINUX_ELF_H
-
-#include <linux/types.h>
-#include <linux/elf-em.h>
-
-/* 32-bit ELF base types. */
-typedef __u32	Elf32_Addr;
-typedef __u16	Elf32_Half;
-typedef __u32	Elf32_Off;
-typedef __s32	Elf32_Sword;
-typedef __u32	Elf32_Word;
-
-/* 64-bit ELF base types. */
-typedef __u64	Elf64_Addr;
-typedef __u16	Elf64_Half;
-typedef __s16	Elf64_SHalf;
-typedef __u64	Elf64_Off;
-typedef __s32	Elf64_Sword;
-typedef __u32	Elf64_Word;
-typedef __u64	Elf64_Xword;
-typedef __s64	Elf64_Sxword;
-
-/* These constants are for the segment types stored in the image headers */
-#define PT_NULL    0
-#define PT_LOAD    1
-#define PT_DYNAMIC 2
-#define PT_INTERP  3
-#define PT_NOTE    4
-#define PT_SHLIB   5
-#define PT_PHDR    6
-#define PT_TLS     7               /* Thread local storage segment */
-#define PT_LOOS    0x60000000      /* OS-specific */
-#define PT_HIOS    0x6fffffff      /* OS-specific */
-#define PT_LOPROC  0x70000000
-#define PT_HIPROC  0x7fffffff
-#define PT_GNU_EH_FRAME		0x6474e550
-
-#define PT_GNU_STACK	(PT_LOOS + 0x474e551)
-
-/*
- * Extended Numbering
- *
- * If the real number of program header table entries is larger than
- * or equal to PN_XNUM(0xffff), it is set to sh_info field of the
- * section header at index 0, and PN_XNUM is set to e_phnum
- * field. Otherwise, the section header at index 0 is zero
- * initialized, if it exists.
- *
- * Specifications are available in:
- *
- * - Oracle: Linker and Libraries.
- *   Part No: 817–1984–19, August 2011.
- *   http://docs.oracle.com/cd/E18752_01/pdf/817-1984.pdf
- *
- * - System V ABI AMD64 Architecture Processor Supplement
- *   Draft Version 0.99.4,
- *   January 13, 2010.
- *   http://www.cs.washington.edu/education/courses/cse351/12wi/supp-docs/abi.pdf
- */
-#define PN_XNUM 0xffff
-
-/* These constants define the different elf file types */
-#define ET_NONE   0
-#define ET_REL    1
-#define ET_EXEC   2
-#define ET_DYN    3
-#define ET_CORE   4
-#define ET_LOPROC 0xff00
-#define ET_HIPROC 0xffff
-
-/* This is the info that is needed to parse the dynamic section of the file */
-#define DT_NULL		0
-#define DT_NEEDED	1
-#define DT_PLTRELSZ	2
-#define DT_PLTGOT	3
-#define DT_HASH		4
-#define DT_STRTAB	5
-#define DT_SYMTAB	6
-#define DT_RELA		7
-#define DT_RELASZ	8
-#define DT_RELAENT	9
-#define DT_STRSZ	10
-#define DT_SYMENT	11
-#define DT_INIT		12
-#define DT_FINI		13
-#define DT_SONAME	14
-#define DT_RPATH 	15
-#define DT_SYMBOLIC	16
-#define DT_REL	        17
-#define DT_RELSZ	18
-#define DT_RELENT	19
-#define DT_PLTREL	20
-#define DT_DEBUG	21
-#define DT_TEXTREL	22
-#define DT_JMPREL	23
-#define DT_ENCODING	32
-#define OLD_DT_LOOS	0x60000000
-#define DT_LOOS		0x6000000d
-#define DT_HIOS		0x6ffff000
-#define DT_VALRNGLO	0x6ffffd00
-#define DT_VALRNGHI	0x6ffffdff
-#define DT_ADDRRNGLO	0x6ffffe00
-#define DT_ADDRRNGHI	0x6ffffeff
-#define DT_VERSYM	0x6ffffff0
-#define DT_RELACOUNT	0x6ffffff9
-#define DT_RELCOUNT	0x6ffffffa
-#define DT_FLAGS_1	0x6ffffffb
-#define DT_VERDEF	0x6ffffffc
-#define	DT_VERDEFNUM	0x6ffffffd
-#define DT_VERNEED	0x6ffffffe
-#define	DT_VERNEEDNUM	0x6fffffff
-#define OLD_DT_HIOS     0x6fffffff
-#define DT_LOPROC	0x70000000
-#define DT_HIPROC	0x7fffffff
-
-/* This info is needed when parsing the symbol table */
-#define STB_LOCAL  0
-#define STB_GLOBAL 1
-#define STB_WEAK   2
-
-#define STT_NOTYPE  0
-#define STT_OBJECT  1
-#define STT_FUNC    2
-#define STT_SECTION 3
-#define STT_FILE    4
-#define STT_COMMON  5
-#define STT_TLS     6
-
-#define ELF_ST_BIND(x)		((x) >> 4)
-#define ELF_ST_TYPE(x)		(((unsigned int) x) & 0xf)
-#define ELF32_ST_BIND(x)	ELF_ST_BIND(x)
-#define ELF32_ST_TYPE(x)	ELF_ST_TYPE(x)
-#define ELF64_ST_BIND(x)	ELF_ST_BIND(x)
-#define ELF64_ST_TYPE(x)	ELF_ST_TYPE(x)
-
-typedef struct dynamic{
-  Elf32_Sword d_tag;
-  union{
-    Elf32_Sword	d_val;
-    Elf32_Addr	d_ptr;
-  } d_un;
-} Elf32_Dyn;
-
-typedef struct {
-  Elf64_Sxword d_tag;		/* entry tag value */
-  union {
-    Elf64_Xword d_val;
-    Elf64_Addr d_ptr;
-  } d_un;
-} Elf64_Dyn;
-
-/* The following are used with relocations */
-#define ELF32_R_SYM(x) ((x) >> 8)
-#define ELF32_R_TYPE(x) ((x) & 0xff)
-
-#define ELF64_R_SYM(i)			((i) >> 32)
-#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
-
-typedef struct elf32_rel {
-  Elf32_Addr	r_offset;
-  Elf32_Word	r_info;
-} Elf32_Rel;
-
-typedef struct elf64_rel {
-  Elf64_Addr r_offset;	/* Location at which to apply the action */
-  Elf64_Xword r_info;	/* index and type of relocation */
-} Elf64_Rel;
-
-typedef struct elf32_rela{
-  Elf32_Addr	r_offset;
-  Elf32_Word	r_info;
-  Elf32_Sword	r_addend;
-} Elf32_Rela;
-
-typedef struct elf64_rela {
-  Elf64_Addr r_offset;	/* Location at which to apply the action */
-  Elf64_Xword r_info;	/* index and type of relocation */
-  Elf64_Sxword r_addend;	/* Constant addend used to compute value */
-} Elf64_Rela;
-
-typedef struct elf32_sym{
-  Elf32_Word	st_name;
-  Elf32_Addr	st_value;
-  Elf32_Word	st_size;
-  unsigned char	st_info;
-  unsigned char	st_other;
-  Elf32_Half	st_shndx;
-} Elf32_Sym;
-
-typedef struct elf64_sym {
-  Elf64_Word st_name;		/* Symbol name, index in string tbl */
-  unsigned char	st_info;	/* Type and binding attributes */
-  unsigned char	st_other;	/* No defined meaning, 0 */
-  Elf64_Half st_shndx;		/* Associated section index */
-  Elf64_Addr st_value;		/* Value of the symbol */
-  Elf64_Xword st_size;		/* Associated symbol size */
-} Elf64_Sym;
-
-
-#define EI_NIDENT	16
-
-typedef struct elf32_hdr{
-  unsigned char	e_ident[EI_NIDENT];
-  Elf32_Half	e_type;
-  Elf32_Half	e_machine;
-  Elf32_Word	e_version;
-  Elf32_Addr	e_entry;  /* Entry point */
-  Elf32_Off	e_phoff;
-  Elf32_Off	e_shoff;
-  Elf32_Word	e_flags;
-  Elf32_Half	e_ehsize;
-  Elf32_Half	e_phentsize;
-  Elf32_Half	e_phnum;
-  Elf32_Half	e_shentsize;
-  Elf32_Half	e_shnum;
-  Elf32_Half	e_shstrndx;
-} Elf32_Ehdr;
-
-typedef struct elf64_hdr {
-  unsigned char	e_ident[EI_NIDENT];	/* ELF "magic number" */
-  Elf64_Half e_type;
-  Elf64_Half e_machine;
-  Elf64_Word e_version;
-  Elf64_Addr e_entry;		/* Entry point virtual address */
-  Elf64_Off e_phoff;		/* Program header table file offset */
-  Elf64_Off e_shoff;		/* Section header table file offset */
-  Elf64_Word e_flags;
-  Elf64_Half e_ehsize;
-  Elf64_Half e_phentsize;
-  Elf64_Half e_phnum;
-  Elf64_Half e_shentsize;
-  Elf64_Half e_shnum;
-  Elf64_Half e_shstrndx;
-} Elf64_Ehdr;
-
-/* These constants define the permissions on sections in the program
-   header, p_flags. */
-#define PF_R		0x4
-#define PF_W		0x2
-#define PF_X		0x1
-
-typedef struct elf32_phdr{
-  Elf32_Word	p_type;
-  Elf32_Off	p_offset;
-  Elf32_Addr	p_vaddr;
-  Elf32_Addr	p_paddr;
-  Elf32_Word	p_filesz;
-  Elf32_Word	p_memsz;
-  Elf32_Word	p_flags;
-  Elf32_Word	p_align;
-} Elf32_Phdr;
-
-typedef struct elf64_phdr {
-  Elf64_Word p_type;
-  Elf64_Word p_flags;
-  Elf64_Off p_offset;		/* Segment file offset */
-  Elf64_Addr p_vaddr;		/* Segment virtual address */
-  Elf64_Addr p_paddr;		/* Segment physical address */
-  Elf64_Xword p_filesz;		/* Segment size in file */
-  Elf64_Xword p_memsz;		/* Segment size in memory */
-  Elf64_Xword p_align;		/* Segment alignment, file & memory */
-} Elf64_Phdr;
-
-/* sh_type */
-#define SHT_NULL	0
-#define SHT_PROGBITS	1
-#define SHT_SYMTAB	2
-#define SHT_STRTAB	3
-#define SHT_RELA	4
-#define SHT_HASH	5
-#define SHT_DYNAMIC	6
-#define SHT_NOTE	7
-#define SHT_NOBITS	8
-#define SHT_REL		9
-#define SHT_SHLIB	10
-#define SHT_DYNSYM	11
-#define SHT_NUM		12
-#define SHT_LOPROC	0x70000000
-#define SHT_HIPROC	0x7fffffff
-#define SHT_LOUSER	0x80000000
-#define SHT_HIUSER	0xffffffff
-
-/* sh_flags */
-#define SHF_WRITE	0x1
-#define SHF_ALLOC	0x2
-#define SHF_EXECINSTR	0x4
-#define SHF_MASKPROC	0xf0000000
-
-/* special section indexes */
-#define SHN_UNDEF	0
-#define SHN_LORESERVE	0xff00
-#define SHN_LOPROC	0xff00
-#define SHN_HIPROC	0xff1f
-#define SHN_ABS		0xfff1
-#define SHN_COMMON	0xfff2
-#define SHN_HIRESERVE	0xffff
- 
-typedef struct elf32_shdr {
-  Elf32_Word	sh_name;
-  Elf32_Word	sh_type;
-  Elf32_Word	sh_flags;
-  Elf32_Addr	sh_addr;
-  Elf32_Off	sh_offset;
-  Elf32_Word	sh_size;
-  Elf32_Word	sh_link;
-  Elf32_Word	sh_info;
-  Elf32_Word	sh_addralign;
-  Elf32_Word	sh_entsize;
-} Elf32_Shdr;
-
-typedef struct elf64_shdr {
-  Elf64_Word sh_name;		/* Section name, index in string tbl */
-  Elf64_Word sh_type;		/* Type of section */
-  Elf64_Xword sh_flags;		/* Miscellaneous section attributes */
-  Elf64_Addr sh_addr;		/* Section virtual addr at execution */
-  Elf64_Off sh_offset;		/* Section file offset */
-  Elf64_Xword sh_size;		/* Size of section in bytes */
-  Elf64_Word sh_link;		/* Index of another section */
-  Elf64_Word sh_info;		/* Additional section information */
-  Elf64_Xword sh_addralign;	/* Section alignment */
-  Elf64_Xword sh_entsize;	/* Entry size if section holds table */
-} Elf64_Shdr;
-
-#define	EI_MAG0		0		/* e_ident[] indexes */
-#define	EI_MAG1		1
-#define	EI_MAG2		2
-#define	EI_MAG3		3
-#define	EI_CLASS	4
-#define	EI_DATA		5
-#define	EI_VERSION	6
-#define	EI_OSABI	7
-#define	EI_PAD		8
-
-#define	ELFMAG0		0x7f		/* EI_MAG */
-#define	ELFMAG1		'E'
-#define	ELFMAG2		'L'
-#define	ELFMAG3		'F'
-#define	ELFMAG		"\177ELF"
-#define	SELFMAG		4
-
-#define	ELFCLASSNONE	0		/* EI_CLASS */
-#define	ELFCLASS32	1
-#define	ELFCLASS64	2
-#define	ELFCLASSNUM	3
-
-#define ELFDATANONE	0		/* e_ident[EI_DATA] */
-#define ELFDATA2LSB	1
-#define ELFDATA2MSB	2
-
-#define EV_NONE		0		/* e_version, EI_VERSION */
-#define EV_CURRENT	1
-#define EV_NUM		2
-
-#define ELFOSABI_NONE	0
-#define ELFOSABI_LINUX	3
-
-#ifndef ELF_OSABI
-#define ELF_OSABI ELFOSABI_NONE
-#endif
-
-/*
- * Notes used in ET_CORE. Architectures export some of the arch register sets
- * using the corresponding note types via the PTRACE_GETREGSET and
- * PTRACE_SETREGSET requests.
- */
-#define NT_PRSTATUS	1
-#define NT_PRFPREG	2
-#define NT_PRPSINFO	3
-#define NT_TASKSTRUCT	4
-#define NT_AUXV		6
-/*
- * Note to userspace developers: size of NT_SIGINFO note may increase
- * in the future to accomodate more fields, don't assume it is fixed!
- */
-#define NT_SIGINFO      0x53494749
-#define NT_FILE         0x46494c45
-#define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */
-#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
-#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
-#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
-#define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
-#define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
-#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
-#define NT_S390_HIGH_GPRS	0x300	/* s390 upper register halves */
-#define NT_S390_TIMER	0x301		/* s390 timer register */
-#define NT_S390_TODCMP	0x302		/* s390 TOD clock comparator register */
-#define NT_S390_TODPREG	0x303		/* s390 TOD programmable register */
-#define NT_S390_CTRS	0x304		/* s390 control registers */
-#define NT_S390_PREFIX	0x305		/* s390 prefix register */
-#define NT_S390_LAST_BREAK	0x306	/* s390 breaking event address */
-#define NT_S390_SYSTEM_CALL	0x307	/* s390 system call restart data */
-#define NT_S390_TDB	0x308		/* s390 transaction diagnostic block */
-#define NT_S390_VXRS_LOW	0x309	/* s390 vector registers 0-15 upper half */
-#define NT_S390_VXRS_HIGH	0x30a	/* s390 vector registers 16-31 */
-#define NT_ARM_VFP	0x400		/* ARM VFP/NEON registers */
-#define NT_ARM_TLS	0x401		/* ARM TLS register */
-#define NT_ARM_HW_BREAK	0x402		/* ARM hardware breakpoint registers */
-#define NT_ARM_HW_WATCH	0x403		/* ARM hardware watchpoint registers */
-#define NT_ARM_SYSTEM_CALL	0x404	/* ARM system call number */
-#define NT_METAG_CBUF	0x500		/* Metag catch buffer registers */
-#define NT_METAG_RPIPE	0x501		/* Metag read pipeline state */
-#define NT_METAG_TLS	0x502		/* Metag TLS pointer */
-
-
-/* Note header in a PT_NOTE section */
-typedef struct elf32_note {
-  Elf32_Word	n_namesz;	/* Name size */
-  Elf32_Word	n_descsz;	/* Content size */
-  Elf32_Word	n_type;		/* Content type */
-} Elf32_Nhdr;
-
-/* Note header in a PT_NOTE section */
-typedef struct elf64_note {
-  Elf64_Word n_namesz;	/* Name size */
-  Elf64_Word n_descsz;	/* Content size */
-  Elf64_Word n_type;	/* Content type */
-} Elf64_Nhdr;
-
-#endif /* _LINUX_ELF_H */
diff --git a/openflow/usr/include/linux/elfcore.h b/openflow/usr/include/linux/elfcore.h
deleted file mode 100644
index 9dd784c..0000000
--- a/openflow/usr/include/linux/elfcore.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef _LINUX_ELFCORE_H
-#define _LINUX_ELFCORE_H
-
-#include <linux/types.h>
-#include <linux/signal.h>
-#include <linux/time.h>
-#include <linux/ptrace.h>
-#include <linux/elf.h>
-#include <linux/fs.h>
-
-struct elf_siginfo
-{
-	int	si_signo;			/* signal number */
-	int	si_code;			/* extra code */
-	int	si_errno;			/* errno */
-};
-
-
-typedef elf_greg_t greg_t;
-typedef elf_gregset_t gregset_t;
-typedef elf_fpregset_t fpregset_t;
-typedef elf_fpxregset_t fpxregset_t;
-#define NGREG ELF_NGREG
-
-/*
- * Definitions to generate Intel SVR4-like core files.
- * These mostly have the same names as the SVR4 types with "elf_"
- * tacked on the front to prevent clashes with linux definitions,
- * and the typedef forms have been avoided.  This is mostly like
- * the SVR4 structure, but more Linuxy, with things that Linux does
- * not support and which gdb doesn't really use excluded.
- * Fields present but not used are marked with "XXX".
- */
-struct elf_prstatus
-{
-#if 0
-	long	pr_flags;	/* XXX Process flags */
-	short	pr_why;		/* XXX Reason for process halt */
-	short	pr_what;	/* XXX More detailed reason */
-#endif
-	struct elf_siginfo pr_info;	/* Info associated with signal */
-	short	pr_cursig;		/* Current signal */
-	unsigned long pr_sigpend;	/* Set of pending signals */
-	unsigned long pr_sighold;	/* Set of held signals */
-#if 0
-	struct sigaltstack pr_altstack;	/* Alternate stack info */
-	struct sigaction pr_action;	/* Signal action for current sig */
-#endif
-	pid_t	pr_pid;
-	pid_t	pr_ppid;
-	pid_t	pr_pgrp;
-	pid_t	pr_sid;
-	struct timeval pr_utime;	/* User time */
-	struct timeval pr_stime;	/* System time */
-	struct timeval pr_cutime;	/* Cumulative user time */
-	struct timeval pr_cstime;	/* Cumulative system time */
-#if 0
-	long	pr_instr;		/* Current instruction */
-#endif
-	elf_gregset_t pr_reg;	/* GP registers */
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-	/* When using FDPIC, the loadmap addresses need to be communicated
-	 * to GDB in order for GDB to do the necessary relocations.  The
-	 * fields (below) used to communicate this information are placed
-	 * immediately after ``pr_reg'', so that the loadmap addresses may
-	 * be viewed as part of the register set if so desired.
-	 */
-	unsigned long pr_exec_fdpic_loadmap;
-	unsigned long pr_interp_fdpic_loadmap;
-#endif
-	int pr_fpvalid;		/* True if math co-processor being used.  */
-};
-
-#define ELF_PRARGSZ	(80)	/* Number of chars for args */
-
-struct elf_prpsinfo
-{
-	char	pr_state;	/* numeric process state */
-	char	pr_sname;	/* char for pr_state */
-	char	pr_zomb;	/* zombie */
-	char	pr_nice;	/* nice val */
-	unsigned long pr_flag;	/* flags */
-	__kernel_uid_t	pr_uid;
-	__kernel_gid_t	pr_gid;
-	pid_t	pr_pid, pr_ppid, pr_pgrp, pr_sid;
-	/* Lots missing */
-	char	pr_fname[16];	/* filename of executable */
-	char	pr_psargs[ELF_PRARGSZ];	/* initial part of arg list */
-};
-
-typedef struct elf_prstatus prstatus_t;
-typedef struct elf_prpsinfo prpsinfo_t;
-#define PRARGSZ ELF_PRARGSZ 
-
-
-#endif /* _LINUX_ELFCORE_H */
diff --git a/openflow/usr/include/linux/errno.h b/openflow/usr/include/linux/errno.h
deleted file mode 100644
index 70f2bd3..0000000
--- a/openflow/usr/include/linux/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/errno.h>
diff --git a/openflow/usr/include/linux/errqueue.h b/openflow/usr/include/linux/errqueue.h
deleted file mode 100644
index 5575a6e..0000000
--- a/openflow/usr/include/linux/errqueue.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _LINUX_ERRQUEUE_H
-#define _LINUX_ERRQUEUE_H
-
-#include <linux/types.h>
-
-struct sock_extended_err {
-	__u32	ee_errno;	
-	__u8	ee_origin;
-	__u8	ee_type;
-	__u8	ee_code;
-	__u8	ee_pad;
-	__u32   ee_info;
-	__u32   ee_data;
-};
-
-#define SO_EE_ORIGIN_NONE	0
-#define SO_EE_ORIGIN_LOCAL	1
-#define SO_EE_ORIGIN_ICMP	2
-#define SO_EE_ORIGIN_ICMP6	3
-#define SO_EE_ORIGIN_TXSTATUS	4
-#define SO_EE_ORIGIN_TIMESTAMPING SO_EE_ORIGIN_TXSTATUS
-
-#define SO_EE_OFFENDER(ee)	((struct sockaddr*)((ee)+1))
-
-/**
- *	struct scm_timestamping - timestamps exposed through cmsg
- *
- *	The timestamping interfaces SO_TIMESTAMPING, MSG_TSTAMP_*
- *	communicate network timestamps by passing this struct in a cmsg with
- *	recvmsg(). See Documentation/networking/timestamping.txt for details.
- */
-struct scm_timestamping {
-	struct timespec ts[3];
-};
-
-/* The type of scm_timestamping, passed in sock_extended_err ee_info.
- * This defines the type of ts[0]. For SCM_TSTAMP_SND only, if ts[0]
- * is zero, then this is a hardware timestamp and recorded in ts[2].
- */
-enum {
-	SCM_TSTAMP_SND,		/* driver passed skb to NIC, or HW */
-	SCM_TSTAMP_SCHED,	/* data entered the packet scheduler */
-	SCM_TSTAMP_ACK,		/* data acknowledged by peer */
-};
-
-#endif /* _LINUX_ERRQUEUE_H */
diff --git a/openflow/usr/include/linux/ethtool.h b/openflow/usr/include/linux/ethtool.h
deleted file mode 100644
index a19dc5c..0000000
--- a/openflow/usr/include/linux/ethtool.h
+++ /dev/null
@@ -1,1441 +0,0 @@
-/*
- * ethtool.h: Defines for Linux ethtool.
- *
- * Copyright (C) 1998 David S. Miller (davem@redhat.com)
- * Copyright 2001 Jeff Garzik <jgarzik@pobox.com>
- * Portions Copyright 2001 Sun Microsystems (thockin@sun.com)
- * Portions Copyright 2002 Intel (eli.kupermann@intel.com,
- *                                christopher.leech@intel.com,
- *                                scott.feldman@intel.com)
- * Portions Copyright (C) Sun Microsystems 2008
- */
-
-#ifndef _LINUX_ETHTOOL_H
-#define _LINUX_ETHTOOL_H
-
-#include <linux/types.h>
-#include <linux/if_ether.h>
-
-/* All structures exposed to userland should be defined such that they
- * have the same layout for 32-bit and 64-bit userland.
- */
-
-/**
- * struct ethtool_cmd - link control and status
- * @cmd: Command number = %ETHTOOL_GSET or %ETHTOOL_SSET
- * @supported: Bitmask of %SUPPORTED_* flags for the link modes,
- *	physical connectors and other link features for which the
- *	interface supports autonegotiation or auto-detection.
- *	Read-only.
- * @advertising: Bitmask of %ADVERTISED_* flags for the link modes,
- *	physical connectors and other link features that are
- *	advertised through autonegotiation or enabled for
- *	auto-detection.
- * @speed: Low bits of the speed
- * @duplex: Duplex mode; one of %DUPLEX_*
- * @port: Physical connector type; one of %PORT_*
- * @phy_address: MDIO address of PHY (transceiver); 0 or 255 if not
- *	applicable.  For clause 45 PHYs this is the PRTAD.
- * @transceiver: Historically used to distinguish different possible
- *	PHY types, but not in a consistent way.  Deprecated.
- * @autoneg: Enable/disable autonegotiation and auto-detection;
- *	either %AUTONEG_DISABLE or %AUTONEG_ENABLE
- * @mdio_support: Bitmask of %ETH_MDIO_SUPPORTS_* flags for the MDIO
- *	protocols supported by the interface; 0 if unknown.
- *	Read-only.
- * @maxtxpkt: Historically used to report TX IRQ coalescing; now
- *	obsoleted by &struct ethtool_coalesce.  Read-only; deprecated.
- * @maxrxpkt: Historically used to report RX IRQ coalescing; now
- *	obsoleted by &struct ethtool_coalesce.  Read-only; deprecated.
- * @speed_hi: High bits of the speed
- * @eth_tp_mdix: Ethernet twisted-pair MDI(-X) status; one of
- *	%ETH_TP_MDI_*.  If the status is unknown or not applicable, the
- *	value will be %ETH_TP_MDI_INVALID.  Read-only.
- * @eth_tp_mdix_ctrl: Ethernet twisted pair MDI(-X) control; one of
- *	%ETH_TP_MDI_*.  If MDI(-X) control is not implemented, reads
- *	yield %ETH_TP_MDI_INVALID and writes may be ignored or rejected.
- *	When written successfully, the link should be renegotiated if
- *	necessary.
- * @lp_advertising: Bitmask of %ADVERTISED_* flags for the link modes
- *	and other link features that the link partner advertised
- *	through autonegotiation; 0 if unknown or not applicable.
- *	Read-only.
- *
- * The link speed in Mbps is split between @speed and @speed_hi.  Use
- * the ethtool_cmd_speed() and ethtool_cmd_speed_set() functions to
- * access it.
- *
- * If autonegotiation is disabled, the speed and @duplex represent the
- * fixed link mode and are writable if the driver supports multiple
- * link modes.  If it is enabled then they are read-only; if the link
- * is up they represent the negotiated link mode; if the link is down,
- * the speed is 0, %SPEED_UNKNOWN or the highest enabled speed and
- * @duplex is %DUPLEX_UNKNOWN or the best enabled duplex mode.
- *
- * Some hardware interfaces may have multiple PHYs and/or physical
- * connectors fitted or do not allow the driver to detect which are
- * fitted.  For these interfaces @port and/or @phy_address may be
- * writable, possibly dependent on @autoneg being %AUTONEG_DISABLE.
- * Otherwise, attempts to write different values may be ignored or
- * rejected.
- *
- * Users should assume that all fields not marked read-only are
- * writable and subject to validation by the driver.  They should use
- * %ETHTOOL_GSET to get the current values before making specific
- * changes and then applying them with %ETHTOOL_SSET.
- *
- * Drivers that implement set_settings() should validate all fields
- * other than @cmd that are not described as read-only or deprecated,
- * and must ignore all fields described as read-only.
- *
- * Deprecated fields should be ignored by both users and drivers.
- */
-struct ethtool_cmd {
-	__u32	cmd;
-	__u32	supported;
-	__u32	advertising;
-	__u16	speed;
-	__u8	duplex;
-	__u8	port;
-	__u8	phy_address;
-	__u8	transceiver;
-	__u8	autoneg;
-	__u8	mdio_support;
-	__u32	maxtxpkt;
-	__u32	maxrxpkt;
-	__u16	speed_hi;
-	__u8	eth_tp_mdix;
-	__u8	eth_tp_mdix_ctrl;
-	__u32	lp_advertising;
-	__u32	reserved[2];
-};
-
-static __inline__ void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
-					 __u32 speed)
-{
-
-	ep->speed = (__u16)speed;
-	ep->speed_hi = (__u16)(speed >> 16);
-}
-
-static __inline__ __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep)
-{
-	return (ep->speed_hi << 16) | ep->speed;
-}
-
-/* Device supports clause 22 register access to PHY or peripherals
- * using the interface defined in <linux/mii.h>.  This should not be
- * set if there are known to be no such peripherals present or if
- * the driver only emulates clause 22 registers for compatibility.
- */
-#define ETH_MDIO_SUPPORTS_C22	1
-
-/* Device supports clause 45 register access to PHY or peripherals
- * using the interface defined in <linux/mii.h> and <linux/mdio.h>.
- * This should not be set if there are known to be no such peripherals
- * present.
- */
-#define ETH_MDIO_SUPPORTS_C45	2
-
-#define ETHTOOL_FWVERS_LEN	32
-#define ETHTOOL_BUSINFO_LEN	32
-#define ETHTOOL_EROMVERS_LEN	32
-
-/**
- * struct ethtool_drvinfo - general driver and device information
- * @cmd: Command number = %ETHTOOL_GDRVINFO
- * @driver: Driver short name.  This should normally match the name
- *	in its bus driver structure (e.g. pci_driver::name).  Must
- *	not be an empty string.
- * @version: Driver version string; may be an empty string
- * @fw_version: Firmware version string; may be an empty string
- * @erom_version: Expansion ROM version string; may be an empty string
- * @bus_info: Device bus address.  This should match the dev_name()
- *	string for the underlying bus device, if there is one.  May be
- *	an empty string.
- * @n_priv_flags: Number of flags valid for %ETHTOOL_GPFLAGS and
- *	%ETHTOOL_SPFLAGS commands; also the number of strings in the
- *	%ETH_SS_PRIV_FLAGS set
- * @n_stats: Number of u64 statistics returned by the %ETHTOOL_GSTATS
- *	command; also the number of strings in the %ETH_SS_STATS set
- * @testinfo_len: Number of results returned by the %ETHTOOL_TEST
- *	command; also the number of strings in the %ETH_SS_TEST set
- * @eedump_len: Size of EEPROM accessible through the %ETHTOOL_GEEPROM
- *	and %ETHTOOL_SEEPROM commands, in bytes
- * @regdump_len: Size of register dump returned by the %ETHTOOL_GREGS
- *	command, in bytes
- *
- * Users can use the %ETHTOOL_GSSET_INFO command to get the number of
- * strings in any string set (from Linux 2.6.34).
- *
- * Drivers should set at most @driver, @version, @fw_version and
- * @bus_info in their get_drvinfo() implementation.  The ethtool
- * core fills in the other fields using other driver operations.
- */
-struct ethtool_drvinfo {
-	__u32	cmd;
-	char	driver[32];
-	char	version[32];
-	char	fw_version[ETHTOOL_FWVERS_LEN];
-	char	bus_info[ETHTOOL_BUSINFO_LEN];
-	char	erom_version[ETHTOOL_EROMVERS_LEN];
-	char	reserved2[12];
-	__u32	n_priv_flags;
-	__u32	n_stats;
-	__u32	testinfo_len;
-	__u32	eedump_len;
-	__u32	regdump_len;
-};
-
-#define SOPASS_MAX	6
-
-/**
- * struct ethtool_wolinfo - Wake-On-Lan configuration
- * @cmd: Command number = %ETHTOOL_GWOL or %ETHTOOL_SWOL
- * @supported: Bitmask of %WAKE_* flags for supported Wake-On-Lan modes.
- *	Read-only.
- * @wolopts: Bitmask of %WAKE_* flags for enabled Wake-On-Lan modes.
- * @sopass: SecureOn(tm) password; meaningful only if %WAKE_MAGICSECURE
- *	is set in @wolopts.
- */
-struct ethtool_wolinfo {
-	__u32	cmd;
-	__u32	supported;
-	__u32	wolopts;
-	__u8	sopass[SOPASS_MAX];
-};
-
-/* for passing single values */
-struct ethtool_value {
-	__u32	cmd;
-	__u32	data;
-};
-
-enum tunable_id {
-	ETHTOOL_ID_UNSPEC,
-	ETHTOOL_RX_COPYBREAK,
-	ETHTOOL_TX_COPYBREAK,
-	/*
-	 * Add your fresh new tubale attribute above and remember to update
-	 * tunable_strings[] in net/core/ethtool.c
-	 */
-	__ETHTOOL_TUNABLE_COUNT,
-};
-
-enum tunable_type_id {
-	ETHTOOL_TUNABLE_UNSPEC,
-	ETHTOOL_TUNABLE_U8,
-	ETHTOOL_TUNABLE_U16,
-	ETHTOOL_TUNABLE_U32,
-	ETHTOOL_TUNABLE_U64,
-	ETHTOOL_TUNABLE_STRING,
-	ETHTOOL_TUNABLE_S8,
-	ETHTOOL_TUNABLE_S16,
-	ETHTOOL_TUNABLE_S32,
-	ETHTOOL_TUNABLE_S64,
-};
-
-struct ethtool_tunable {
-	__u32	cmd;
-	__u32	id;
-	__u32	type_id;
-	__u32	len;
-	void	*data[0];
-};
-
-/**
- * struct ethtool_regs - hardware register dump
- * @cmd: Command number = %ETHTOOL_GREGS
- * @version: Dump format version.  This is driver-specific and may
- *	distinguish different chips/revisions.  Drivers must use new
- *	version numbers whenever the dump format changes in an
- *	incompatible way.
- * @len: On entry, the real length of @data.  On return, the number of
- *	bytes used.
- * @data: Buffer for the register dump
- *
- * Users should use %ETHTOOL_GDRVINFO to find the maximum length of
- * a register dump for the interface.  They must allocate the buffer
- * immediately following this structure.
- */
-struct ethtool_regs {
-	__u32	cmd;
-	__u32	version;
-	__u32	len;
-	__u8	data[0];
-};
-
-/**
- * struct ethtool_eeprom - EEPROM dump
- * @cmd: Command number = %ETHTOOL_GEEPROM, %ETHTOOL_GMODULEEEPROM or
- *	%ETHTOOL_SEEPROM
- * @magic: A 'magic cookie' value to guard against accidental changes.
- *	The value passed in to %ETHTOOL_SEEPROM must match the value
- *	returned by %ETHTOOL_GEEPROM for the same device.  This is
- *	unused when @cmd is %ETHTOOL_GMODULEEEPROM.
- * @offset: Offset within the EEPROM to begin reading/writing, in bytes
- * @len: On entry, number of bytes to read/write.  On successful
- *	return, number of bytes actually read/written.  In case of
- *	error, this may indicate at what point the error occurred.
- * @data: Buffer to read/write from
- *
- * Users may use %ETHTOOL_GDRVINFO or %ETHTOOL_GMODULEINFO to find
- * the length of an on-board or module EEPROM, respectively.  They
- * must allocate the buffer immediately following this structure.
- */
-struct ethtool_eeprom {
-	__u32	cmd;
-	__u32	magic;
-	__u32	offset;
-	__u32	len;
-	__u8	data[0];
-};
-
-/**
- * struct ethtool_eee - Energy Efficient Ethernet information
- * @cmd: ETHTOOL_{G,S}EEE
- * @supported: Mask of %SUPPORTED_* flags for the speed/duplex combinations
- *	for which there is EEE support.
- * @advertised: Mask of %ADVERTISED_* flags for the speed/duplex combinations
- *	advertised as eee capable.
- * @lp_advertised: Mask of %ADVERTISED_* flags for the speed/duplex
- *	combinations advertised by the link partner as eee capable.
- * @eee_active: Result of the eee auto negotiation.
- * @eee_enabled: EEE configured mode (enabled/disabled).
- * @tx_lpi_enabled: Whether the interface should assert its tx lpi, given
- *	that eee was negotiated.
- * @tx_lpi_timer: Time in microseconds the interface delays prior to asserting
- *	its tx lpi (after reaching 'idle' state). Effective only when eee
- *	was negotiated and tx_lpi_enabled was set.
- */
-struct ethtool_eee {
-	__u32	cmd;
-	__u32	supported;
-	__u32	advertised;
-	__u32	lp_advertised;
-	__u32	eee_active;
-	__u32	eee_enabled;
-	__u32	tx_lpi_enabled;
-	__u32	tx_lpi_timer;
-	__u32	reserved[2];
-};
-
-/**
- * struct ethtool_modinfo - plugin module eeprom information
- * @cmd: %ETHTOOL_GMODULEINFO
- * @type: Standard the module information conforms to %ETH_MODULE_SFF_xxxx
- * @eeprom_len: Length of the eeprom
- *
- * This structure is used to return the information to
- * properly size memory for a subsequent call to %ETHTOOL_GMODULEEEPROM.
- * The type code indicates the eeprom data format
- */
-struct ethtool_modinfo {
-	__u32   cmd;
-	__u32   type;
-	__u32   eeprom_len;
-	__u32   reserved[8];
-};
-
-/**
- * struct ethtool_coalesce - coalescing parameters for IRQs and stats updates
- * @cmd: ETHTOOL_{G,S}COALESCE
- * @rx_coalesce_usecs: How many usecs to delay an RX interrupt after
- *	a packet arrives.
- * @rx_max_coalesced_frames: Maximum number of packets to receive
- *	before an RX interrupt.
- * @rx_coalesce_usecs_irq: Same as @rx_coalesce_usecs, except that
- *	this value applies while an IRQ is being serviced by the host.
- * @rx_max_coalesced_frames_irq: Same as @rx_max_coalesced_frames,
- *	except that this value applies while an IRQ is being serviced
- *	by the host.
- * @tx_coalesce_usecs: How many usecs to delay a TX interrupt after
- *	a packet is sent.
- * @tx_max_coalesced_frames: Maximum number of packets to be sent
- *	before a TX interrupt.
- * @tx_coalesce_usecs_irq: Same as @tx_coalesce_usecs, except that
- *	this value applies while an IRQ is being serviced by the host.
- * @tx_max_coalesced_frames_irq: Same as @tx_max_coalesced_frames,
- *	except that this value applies while an IRQ is being serviced
- *	by the host.
- * @stats_block_coalesce_usecs: How many usecs to delay in-memory
- *	statistics block updates.  Some drivers do not have an
- *	in-memory statistic block, and in such cases this value is
- *	ignored.  This value must not be zero.
- * @use_adaptive_rx_coalesce: Enable adaptive RX coalescing.
- * @use_adaptive_tx_coalesce: Enable adaptive TX coalescing.
- * @pkt_rate_low: Threshold for low packet rate (packets per second).
- * @rx_coalesce_usecs_low: How many usecs to delay an RX interrupt after
- *	a packet arrives, when the packet rate is below @pkt_rate_low.
- * @rx_max_coalesced_frames_low: Maximum number of packets to be received
- *	before an RX interrupt, when the packet rate is below @pkt_rate_low.
- * @tx_coalesce_usecs_low: How many usecs to delay a TX interrupt after
- *	a packet is sent, when the packet rate is below @pkt_rate_low.
- * @tx_max_coalesced_frames_low: Maximum nuumber of packets to be sent before
- *	a TX interrupt, when the packet rate is below @pkt_rate_low.
- * @pkt_rate_high: Threshold for high packet rate (packets per second).
- * @rx_coalesce_usecs_high: How many usecs to delay an RX interrupt after
- *	a packet arrives, when the packet rate is above @pkt_rate_high.
- * @rx_max_coalesced_frames_high: Maximum number of packets to be received
- *	before an RX interrupt, when the packet rate is above @pkt_rate_high.
- * @tx_coalesce_usecs_high: How many usecs to delay a TX interrupt after
- *	a packet is sent, when the packet rate is above @pkt_rate_high.
- * @tx_max_coalesced_frames_high: Maximum number of packets to be sent before
- *	a TX interrupt, when the packet rate is above @pkt_rate_high.
- * @rate_sample_interval: How often to do adaptive coalescing packet rate
- *	sampling, measured in seconds.  Must not be zero.
- *
- * Each pair of (usecs, max_frames) fields specifies that interrupts
- * should be coalesced until
- *	(usecs > 0 && time_since_first_completion >= usecs) ||
- *	(max_frames > 0 && completed_frames >= max_frames)
- *
- * It is illegal to set both usecs and max_frames to zero as this
- * would cause interrupts to never be generated.  To disable
- * coalescing, set usecs = 0 and max_frames = 1.
- *
- * Some implementations ignore the value of max_frames and use the
- * condition time_since_first_completion >= usecs
- *
- * This is deprecated.  Drivers for hardware that does not support
- * counting completions should validate that max_frames == !rx_usecs.
- *
- * Adaptive RX/TX coalescing is an algorithm implemented by some
- * drivers to improve latency under low packet rates and improve
- * throughput under high packet rates.  Some drivers only implement
- * one of RX or TX adaptive coalescing.  Anything not implemented by
- * the driver causes these values to be silently ignored.
- *
- * When the packet rate is below @pkt_rate_high but above
- * @pkt_rate_low (both measured in packets per second) the
- * normal {rx,tx}_* coalescing parameters are used.
- */
-struct ethtool_coalesce {
-	__u32	cmd;
-	__u32	rx_coalesce_usecs;
-	__u32	rx_max_coalesced_frames;
-	__u32	rx_coalesce_usecs_irq;
-	__u32	rx_max_coalesced_frames_irq;
-	__u32	tx_coalesce_usecs;
-	__u32	tx_max_coalesced_frames;
-	__u32	tx_coalesce_usecs_irq;
-	__u32	tx_max_coalesced_frames_irq;
-	__u32	stats_block_coalesce_usecs;
-	__u32	use_adaptive_rx_coalesce;
-	__u32	use_adaptive_tx_coalesce;
-	__u32	pkt_rate_low;
-	__u32	rx_coalesce_usecs_low;
-	__u32	rx_max_coalesced_frames_low;
-	__u32	tx_coalesce_usecs_low;
-	__u32	tx_max_coalesced_frames_low;
-	__u32	pkt_rate_high;
-	__u32	rx_coalesce_usecs_high;
-	__u32	rx_max_coalesced_frames_high;
-	__u32	tx_coalesce_usecs_high;
-	__u32	tx_max_coalesced_frames_high;
-	__u32	rate_sample_interval;
-};
-
-/**
- * struct ethtool_ringparam - RX/TX ring parameters
- * @cmd: Command number = %ETHTOOL_GRINGPARAM or %ETHTOOL_SRINGPARAM
- * @rx_max_pending: Maximum supported number of pending entries per
- *	RX ring.  Read-only.
- * @rx_mini_max_pending: Maximum supported number of pending entries
- *	per RX mini ring.  Read-only.
- * @rx_jumbo_max_pending: Maximum supported number of pending entries
- *	per RX jumbo ring.  Read-only.
- * @tx_max_pending: Maximum supported number of pending entries per
- *	TX ring.  Read-only.
- * @rx_pending: Current maximum number of pending entries per RX ring
- * @rx_mini_pending: Current maximum number of pending entries per RX
- *	mini ring
- * @rx_jumbo_pending: Current maximum number of pending entries per RX
- *	jumbo ring
- * @tx_pending: Current maximum supported number of pending entries
- *	per TX ring
- *
- * If the interface does not have separate RX mini and/or jumbo rings,
- * @rx_mini_max_pending and/or @rx_jumbo_max_pending will be 0.
- *
- * There may also be driver-dependent minimum values for the number
- * of entries per ring.
- */
-struct ethtool_ringparam {
-	__u32	cmd;
-	__u32	rx_max_pending;
-	__u32	rx_mini_max_pending;
-	__u32	rx_jumbo_max_pending;
-	__u32	tx_max_pending;
-	__u32	rx_pending;
-	__u32	rx_mini_pending;
-	__u32	rx_jumbo_pending;
-	__u32	tx_pending;
-};
-
-/**
- * struct ethtool_channels - configuring number of network channel
- * @cmd: ETHTOOL_{G,S}CHANNELS
- * @max_rx: Read only. Maximum number of receive channel the driver support.
- * @max_tx: Read only. Maximum number of transmit channel the driver support.
- * @max_other: Read only. Maximum number of other channel the driver support.
- * @max_combined: Read only. Maximum number of combined channel the driver
- *	support. Set of queues RX, TX or other.
- * @rx_count: Valid values are in the range 1 to the max_rx.
- * @tx_count: Valid values are in the range 1 to the max_tx.
- * @other_count: Valid values are in the range 1 to the max_other.
- * @combined_count: Valid values are in the range 1 to the max_combined.
- *
- * This can be used to configure RX, TX and other channels.
- */
-
-struct ethtool_channels {
-	__u32	cmd;
-	__u32	max_rx;
-	__u32	max_tx;
-	__u32	max_other;
-	__u32	max_combined;
-	__u32	rx_count;
-	__u32	tx_count;
-	__u32	other_count;
-	__u32	combined_count;
-};
-
-/**
- * struct ethtool_pauseparam - Ethernet pause (flow control) parameters
- * @cmd: Command number = %ETHTOOL_GPAUSEPARAM or %ETHTOOL_SPAUSEPARAM
- * @autoneg: Flag to enable autonegotiation of pause frame use
- * @rx_pause: Flag to enable reception of pause frames
- * @tx_pause: Flag to enable transmission of pause frames
- *
- * Drivers should reject a non-zero setting of @autoneg when
- * autoneogotiation is disabled (or not supported) for the link.
- *
- * If the link is autonegotiated, drivers should use
- * mii_advertise_flowctrl() or similar code to set the advertised
- * pause frame capabilities based on the @rx_pause and @tx_pause flags,
- * even if @autoneg is zero.  They should also allow the advertised
- * pause frame capabilities to be controlled directly through the
- * advertising field of &struct ethtool_cmd.
- *
- * If @autoneg is non-zero, the MAC is configured to send and/or
- * receive pause frames according to the result of autonegotiation.
- * Otherwise, it is configured directly based on the @rx_pause and
- * @tx_pause flags.
- */
-struct ethtool_pauseparam {
-	__u32	cmd;
-	__u32	autoneg;
-	__u32	rx_pause;
-	__u32	tx_pause;
-};
-
-#define ETH_GSTRING_LEN		32
-
-/**
- * enum ethtool_stringset - string set ID
- * @ETH_SS_TEST: Self-test result names, for use with %ETHTOOL_TEST
- * @ETH_SS_STATS: Statistic names, for use with %ETHTOOL_GSTATS
- * @ETH_SS_PRIV_FLAGS: Driver private flag names, for use with
- *	%ETHTOOL_GPFLAGS and %ETHTOOL_SPFLAGS
- * @ETH_SS_NTUPLE_FILTERS: Previously used with %ETHTOOL_GRXNTUPLE;
- *	now deprecated
- * @ETH_SS_FEATURES: Device feature names
- * @ETH_SS_RSS_HASH_FUNCS: RSS hush function names
- */
-enum ethtool_stringset {
-	ETH_SS_TEST		= 0,
-	ETH_SS_STATS,
-	ETH_SS_PRIV_FLAGS,
-	ETH_SS_NTUPLE_FILTERS,
-	ETH_SS_FEATURES,
-	ETH_SS_RSS_HASH_FUNCS,
-	ETH_SS_TUNABLES,
-};
-
-/**
- * struct ethtool_gstrings - string set for data tagging
- * @cmd: Command number = %ETHTOOL_GSTRINGS
- * @string_set: String set ID; one of &enum ethtool_stringset
- * @len: On return, the number of strings in the string set
- * @data: Buffer for strings.  Each string is null-padded to a size of
- *	%ETH_GSTRING_LEN.
- *
- * Users must use %ETHTOOL_GSSET_INFO to find the number of strings in
- * the string set.  They must allocate a buffer of the appropriate
- * size immediately following this structure.
- */
-struct ethtool_gstrings {
-	__u32	cmd;
-	__u32	string_set;
-	__u32	len;
-	__u8	data[0];
-};
-
-/**
- * struct ethtool_sset_info - string set information
- * @cmd: Command number = %ETHTOOL_GSSET_INFO
- * @sset_mask: On entry, a bitmask of string sets to query, with bits
- *	numbered according to &enum ethtool_stringset.  On return, a
- *	bitmask of those string sets queried that are supported.
- * @data: Buffer for string set sizes.  On return, this contains the
- *	size of each string set that was queried and supported, in
- *	order of ID.
- *
- * Example: The user passes in @sset_mask = 0x7 (sets 0, 1, 2) and on
- * return @sset_mask == 0x6 (sets 1, 2).  Then @data[0] contains the
- * size of set 1 and @data[1] contains the size of set 2.
- *
- * Users must allocate a buffer of the appropriate size (4 * number of
- * sets queried) immediately following this structure.
- */
-struct ethtool_sset_info {
-	__u32	cmd;
-	__u32	reserved;
-	__u64	sset_mask;
-	__u32	data[0];
-};
-
-/**
- * enum ethtool_test_flags - flags definition of ethtool_test
- * @ETH_TEST_FL_OFFLINE: if set perform online and offline tests, otherwise
- *	only online tests.
- * @ETH_TEST_FL_FAILED: Driver set this flag if test fails.
- * @ETH_TEST_FL_EXTERNAL_LB: Application request to perform external loopback
- *	test.
- * @ETH_TEST_FL_EXTERNAL_LB_DONE: Driver performed the external loopback test
- */
-
-enum ethtool_test_flags {
-	ETH_TEST_FL_OFFLINE	= (1 << 0),
-	ETH_TEST_FL_FAILED	= (1 << 1),
-	ETH_TEST_FL_EXTERNAL_LB	= (1 << 2),
-	ETH_TEST_FL_EXTERNAL_LB_DONE	= (1 << 3),
-};
-
-/**
- * struct ethtool_test - device self-test invocation
- * @cmd: Command number = %ETHTOOL_TEST
- * @flags: A bitmask of flags from &enum ethtool_test_flags.  Some
- *	flags may be set by the user on entry; others may be set by
- *	the driver on return.
- * @len: On return, the number of test results
- * @data: Array of test results
- *
- * Users must use %ETHTOOL_GSSET_INFO or %ETHTOOL_GDRVINFO to find the
- * number of test results that will be returned.  They must allocate a
- * buffer of the appropriate size (8 * number of results) immediately
- * following this structure.
- */
-struct ethtool_test {
-	__u32	cmd;
-	__u32	flags;
-	__u32	reserved;
-	__u32	len;
-	__u64	data[0];
-};
-
-/**
- * struct ethtool_stats - device-specific statistics
- * @cmd: Command number = %ETHTOOL_GSTATS
- * @n_stats: On return, the number of statistics
- * @data: Array of statistics
- *
- * Users must use %ETHTOOL_GSSET_INFO or %ETHTOOL_GDRVINFO to find the
- * number of statistics that will be returned.  They must allocate a
- * buffer of the appropriate size (8 * number of statistics)
- * immediately following this structure.
- */
-struct ethtool_stats {
-	__u32	cmd;
-	__u32	n_stats;
-	__u64	data[0];
-};
-
-/**
- * struct ethtool_perm_addr - permanent hardware address
- * @cmd: Command number = %ETHTOOL_GPERMADDR
- * @size: On entry, the size of the buffer.  On return, the size of the
- *	address.  The command fails if the buffer is too small.
- * @data: Buffer for the address
- *
- * Users must allocate the buffer immediately following this structure.
- * A buffer size of %MAX_ADDR_LEN should be sufficient for any address
- * type.
- */
-struct ethtool_perm_addr {
-	__u32	cmd;
-	__u32	size;
-	__u8	data[0];
-};
-
-/* boolean flags controlling per-interface behavior characteristics.
- * When reading, the flag indicates whether or not a certain behavior
- * is enabled/present.  When writing, the flag indicates whether
- * or not the driver should turn on (set) or off (clear) a behavior.
- *
- * Some behaviors may read-only (unconditionally absent or present).
- * If such is the case, return EINVAL in the set-flags operation if the
- * flag differs from the read-only value.
- */
-enum ethtool_flags {
-	ETH_FLAG_TXVLAN		= (1 << 7),	/* TX VLAN offload enabled */
-	ETH_FLAG_RXVLAN		= (1 << 8),	/* RX VLAN offload enabled */
-	ETH_FLAG_LRO		= (1 << 15),	/* LRO is enabled */
-	ETH_FLAG_NTUPLE		= (1 << 27),	/* N-tuple filters enabled */
-	ETH_FLAG_RXHASH		= (1 << 28),
-};
-
-/* The following structures are for supporting RX network flow
- * classification and RX n-tuple configuration. Note, all multibyte
- * fields, e.g., ip4src, ip4dst, psrc, pdst, spi, etc. are expected to
- * be in network byte order.
- */
-
-/**
- * struct ethtool_tcpip4_spec - flow specification for TCP/IPv4 etc.
- * @ip4src: Source host
- * @ip4dst: Destination host
- * @psrc: Source port
- * @pdst: Destination port
- * @tos: Type-of-service
- *
- * This can be used to specify a TCP/IPv4, UDP/IPv4 or SCTP/IPv4 flow.
- */
-struct ethtool_tcpip4_spec {
-	__be32	ip4src;
-	__be32	ip4dst;
-	__be16	psrc;
-	__be16	pdst;
-	__u8    tos;
-};
-
-/**
- * struct ethtool_ah_espip4_spec - flow specification for IPsec/IPv4
- * @ip4src: Source host
- * @ip4dst: Destination host
- * @spi: Security parameters index
- * @tos: Type-of-service
- *
- * This can be used to specify an IPsec transport or tunnel over IPv4.
- */
-struct ethtool_ah_espip4_spec {
-	__be32	ip4src;
-	__be32	ip4dst;
-	__be32	spi;
-	__u8    tos;
-};
-
-#define	ETH_RX_NFC_IP4	1
-
-/**
- * struct ethtool_usrip4_spec - general flow specification for IPv4
- * @ip4src: Source host
- * @ip4dst: Destination host
- * @l4_4_bytes: First 4 bytes of transport (layer 4) header
- * @tos: Type-of-service
- * @ip_ver: Value must be %ETH_RX_NFC_IP4; mask must be 0
- * @proto: Transport protocol number; mask must be 0
- */
-struct ethtool_usrip4_spec {
-	__be32	ip4src;
-	__be32	ip4dst;
-	__be32	l4_4_bytes;
-	__u8    tos;
-	__u8    ip_ver;
-	__u8    proto;
-};
-
-union ethtool_flow_union {
-	struct ethtool_tcpip4_spec		tcp_ip4_spec;
-	struct ethtool_tcpip4_spec		udp_ip4_spec;
-	struct ethtool_tcpip4_spec		sctp_ip4_spec;
-	struct ethtool_ah_espip4_spec		ah_ip4_spec;
-	struct ethtool_ah_espip4_spec		esp_ip4_spec;
-	struct ethtool_usrip4_spec		usr_ip4_spec;
-	struct ethhdr				ether_spec;
-	__u8					hdata[52];
-};
-
-/**
- * struct ethtool_flow_ext - additional RX flow fields
- * @h_dest: destination MAC address
- * @vlan_etype: VLAN EtherType
- * @vlan_tci: VLAN tag control information
- * @data: user defined data
- *
- * Note, @vlan_etype, @vlan_tci, and @data are only valid if %FLOW_EXT
- * is set in &struct ethtool_rx_flow_spec @flow_type.
- * @h_dest is valid if %FLOW_MAC_EXT is set.
- */
-struct ethtool_flow_ext {
-	__u8		padding[2];
-	unsigned char	h_dest[ETH_ALEN];
-	__be16		vlan_etype;
-	__be16		vlan_tci;
-	__be32		data[2];
-};
-
-/**
- * struct ethtool_rx_flow_spec - classification rule for RX flows
- * @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW
- * @h_u: Flow fields to match (dependent on @flow_type)
- * @h_ext: Additional fields to match
- * @m_u: Masks for flow field bits to be matched
- * @m_ext: Masks for additional field bits to be matched
- *	Note, all additional fields must be ignored unless @flow_type
- *	includes the %FLOW_EXT or %FLOW_MAC_EXT flag
- *	(see &struct ethtool_flow_ext description).
- * @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC
- *	if packets should be discarded
- * @location: Location of rule in the table.  Locations must be
- *	numbered such that a flow matching multiple rules will be
- *	classified according to the first (lowest numbered) rule.
- */
-struct ethtool_rx_flow_spec {
-	__u32		flow_type;
-	union ethtool_flow_union h_u;
-	struct ethtool_flow_ext h_ext;
-	union ethtool_flow_union m_u;
-	struct ethtool_flow_ext m_ext;
-	__u64		ring_cookie;
-	__u32		location;
-};
-
-/* How rings are layed out when accessing virtual functions or
- * offloaded queues is device specific. To allow users to do flow
- * steering and specify these queues the ring cookie is partitioned
- * into a 32bit queue index with an 8 bit virtual function id.
- * This also leaves the 3bytes for further specifiers. It is possible
- * future devices may support more than 256 virtual functions if
- * devices start supporting PCIe w/ARI. However at the moment I
- * do not know of any devices that support this so I do not reserve
- * space for this at this time. If a future patch consumes the next
- * byte it should be aware of this possiblity.
- */
-#define ETHTOOL_RX_FLOW_SPEC_RING	0x00000000FFFFFFFFLL
-#define ETHTOOL_RX_FLOW_SPEC_RING_VF	0x000000FF00000000LL
-#define ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF 32
-static __inline__ __u64 ethtool_get_flow_spec_ring(__u64 ring_cookie)
-{
-	return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie;
-};
-
-static __inline__ __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie)
-{
-	return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >>
-				ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF;
-};
-
-/**
- * struct ethtool_rxnfc - command to get or set RX flow classification rules
- * @cmd: Specific command number - %ETHTOOL_GRXFH, %ETHTOOL_SRXFH,
- *	%ETHTOOL_GRXRINGS, %ETHTOOL_GRXCLSRLCNT, %ETHTOOL_GRXCLSRULE,
- *	%ETHTOOL_GRXCLSRLALL, %ETHTOOL_SRXCLSRLDEL or %ETHTOOL_SRXCLSRLINS
- * @flow_type: Type of flow to be affected, e.g. %TCP_V4_FLOW
- * @data: Command-dependent value
- * @fs: Flow classification rule
- * @rule_cnt: Number of rules to be affected
- * @rule_locs: Array of used rule locations
- *
- * For %ETHTOOL_GRXFH and %ETHTOOL_SRXFH, @data is a bitmask indicating
- * the fields included in the flow hash, e.g. %RXH_IP_SRC.  The following
- * structure fields must not be used.
- *
- * For %ETHTOOL_GRXRINGS, @data is set to the number of RX rings/queues
- * on return.
- *
- * For %ETHTOOL_GRXCLSRLCNT, @rule_cnt is set to the number of defined
- * rules on return.  If @data is non-zero on return then it is the
- * size of the rule table, plus the flag %RX_CLS_LOC_SPECIAL if the
- * driver supports any special location values.  If that flag is not
- * set in @data then special location values should not be used.
- *
- * For %ETHTOOL_GRXCLSRULE, @fs.@location specifies the location of an
- * existing rule on entry and @fs contains the rule on return.
- *
- * For %ETHTOOL_GRXCLSRLALL, @rule_cnt specifies the array size of the
- * user buffer for @rule_locs on entry.  On return, @data is the size
- * of the rule table, @rule_cnt is the number of defined rules, and
- * @rule_locs contains the locations of the defined rules.  Drivers
- * must use the second parameter to get_rxnfc() instead of @rule_locs.
- *
- * For %ETHTOOL_SRXCLSRLINS, @fs specifies the rule to add or update.
- * @fs.@location either specifies the location to use or is a special
- * location value with %RX_CLS_LOC_SPECIAL flag set.  On return,
- * @fs.@location is the actual rule location.
- *
- * For %ETHTOOL_SRXCLSRLDEL, @fs.@location specifies the location of an
- * existing rule on entry.
- *
- * A driver supporting the special location values for
- * %ETHTOOL_SRXCLSRLINS may add the rule at any suitable unused
- * location, and may remove a rule at a later location (lower
- * priority) that matches exactly the same set of flows.  The special
- * values are %RX_CLS_LOC_ANY, selecting any location;
- * %RX_CLS_LOC_FIRST, selecting the first suitable location (maximum
- * priority); and %RX_CLS_LOC_LAST, selecting the last suitable
- * location (minimum priority).  Additional special values may be
- * defined in future and drivers must return -%EINVAL for any
- * unrecognised value.
- */
-struct ethtool_rxnfc {
-	__u32				cmd;
-	__u32				flow_type;
-	__u64				data;
-	struct ethtool_rx_flow_spec	fs;
-	__u32				rule_cnt;
-	__u32				rule_locs[0];
-};
-
-
-/**
- * struct ethtool_rxfh_indir - command to get or set RX flow hash indirection
- * @cmd: Specific command number - %ETHTOOL_GRXFHINDIR or %ETHTOOL_SRXFHINDIR
- * @size: On entry, the array size of the user buffer, which may be zero.
- *	On return from %ETHTOOL_GRXFHINDIR, the array size of the hardware
- *	indirection table.
- * @ring_index: RX ring/queue index for each hash value
- *
- * For %ETHTOOL_GRXFHINDIR, a @size of zero means that only the size
- * should be returned.  For %ETHTOOL_SRXFHINDIR, a @size of zero means
- * the table should be reset to default values.  This last feature
- * is not supported by the original implementations.
- */
-struct ethtool_rxfh_indir {
-	__u32	cmd;
-	__u32	size;
-	__u32	ring_index[0];
-};
-
-/**
- * struct ethtool_rxfh - command to get/set RX flow hash indir or/and hash key.
- * @cmd: Specific command number - %ETHTOOL_GRSSH or %ETHTOOL_SRSSH
- * @rss_context: RSS context identifier.
- * @indir_size: On entry, the array size of the user buffer for the
- *	indirection table, which may be zero, or (for %ETHTOOL_SRSSH),
- *	%ETH_RXFH_INDIR_NO_CHANGE.  On return from %ETHTOOL_GRSSH,
- *	the array size of the hardware indirection table.
- * @key_size: On entry, the array size of the user buffer for the hash key,
- *	which may be zero.  On return from %ETHTOOL_GRSSH, the size of the
- *	hardware hash key.
- * @hfunc: Defines the current RSS hash function used by HW (or to be set to).
- *	Valid values are one of the %ETH_RSS_HASH_*.
- * @rsvd:	Reserved for future extensions.
- * @rss_config: RX ring/queue index for each hash value i.e., indirection table
- *	of @indir_size __u32 elements, followed by hash key of @key_size
- *	bytes.
- *
- * For %ETHTOOL_GRSSH, a @indir_size and key_size of zero means that only the
- * size should be returned.  For %ETHTOOL_SRSSH, an @indir_size of
- * %ETH_RXFH_INDIR_NO_CHANGE means that indir table setting is not requested
- * and a @indir_size of zero means the indir table should be reset to default
- * values. An hfunc of zero means that hash function setting is not requested.
- */
-struct ethtool_rxfh {
-	__u32   cmd;
-	__u32	rss_context;
-	__u32   indir_size;
-	__u32   key_size;
-	__u8	hfunc;
-	__u8	rsvd8[3];
-	__u32	rsvd32;
-	__u32   rss_config[0];
-};
-#define ETH_RXFH_INDIR_NO_CHANGE	0xffffffff
-
-/**
- * struct ethtool_rx_ntuple_flow_spec - specification for RX flow filter
- * @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW
- * @h_u: Flow field values to match (dependent on @flow_type)
- * @m_u: Masks for flow field value bits to be ignored
- * @vlan_tag: VLAN tag to match
- * @vlan_tag_mask: Mask for VLAN tag bits to be ignored
- * @data: Driver-dependent data to match
- * @data_mask: Mask for driver-dependent data bits to be ignored
- * @action: RX ring/queue index to deliver to (non-negative) or other action
- *	(negative, e.g. %ETHTOOL_RXNTUPLE_ACTION_DROP)
- *
- * For flow types %TCP_V4_FLOW, %UDP_V4_FLOW and %SCTP_V4_FLOW, where
- * a field value and mask are both zero this is treated as if all mask
- * bits are set i.e. the field is ignored.
- */
-struct ethtool_rx_ntuple_flow_spec {
-	__u32		 flow_type;
-	union {
-		struct ethtool_tcpip4_spec		tcp_ip4_spec;
-		struct ethtool_tcpip4_spec		udp_ip4_spec;
-		struct ethtool_tcpip4_spec		sctp_ip4_spec;
-		struct ethtool_ah_espip4_spec		ah_ip4_spec;
-		struct ethtool_ah_espip4_spec		esp_ip4_spec;
-		struct ethtool_usrip4_spec		usr_ip4_spec;
-		struct ethhdr				ether_spec;
-		__u8					hdata[72];
-	} h_u, m_u;
-
-	__u16	        vlan_tag;
-	__u16	        vlan_tag_mask;
-	__u64		data;
-	__u64		data_mask;
-
-	__s32		action;
-#define ETHTOOL_RXNTUPLE_ACTION_DROP	(-1)	/* drop packet */
-#define ETHTOOL_RXNTUPLE_ACTION_CLEAR	(-2)	/* clear filter */
-};
-
-/**
- * struct ethtool_rx_ntuple - command to set or clear RX flow filter
- * @cmd: Command number - %ETHTOOL_SRXNTUPLE
- * @fs: Flow filter specification
- */
-struct ethtool_rx_ntuple {
-	__u32					cmd;
-	struct ethtool_rx_ntuple_flow_spec	fs;
-};
-
-#define ETHTOOL_FLASH_MAX_FILENAME	128
-enum ethtool_flash_op_type {
-	ETHTOOL_FLASH_ALL_REGIONS	= 0,
-};
-
-/* for passing firmware flashing related parameters */
-struct ethtool_flash {
-	__u32	cmd;
-	__u32	region;
-	char	data[ETHTOOL_FLASH_MAX_FILENAME];
-};
-
-/**
- * struct ethtool_dump - used for retrieving, setting device dump
- * @cmd: Command number - %ETHTOOL_GET_DUMP_FLAG, %ETHTOOL_GET_DUMP_DATA, or
- * 	%ETHTOOL_SET_DUMP
- * @version: FW version of the dump, filled in by driver
- * @flag: driver dependent flag for dump setting, filled in by driver during
- *        get and filled in by ethtool for set operation.
- *        flag must be initialized by macro ETH_FW_DUMP_DISABLE value when
- *        firmware dump is disabled.
- * @len: length of dump data, used as the length of the user buffer on entry to
- * 	 %ETHTOOL_GET_DUMP_DATA and this is returned as dump length by driver
- * 	 for %ETHTOOL_GET_DUMP_FLAG command
- * @data: data collected for get dump data operation
- */
-struct ethtool_dump {
-	__u32	cmd;
-	__u32	version;
-	__u32	flag;
-	__u32	len;
-	__u8	data[0];
-};
-
-#define ETH_FW_DUMP_DISABLE 0
-
-/* for returning and changing feature sets */
-
-/**
- * struct ethtool_get_features_block - block with state of 32 features
- * @available: mask of changeable features
- * @requested: mask of features requested to be enabled if possible
- * @active: mask of currently enabled features
- * @never_changed: mask of features not changeable for any device
- */
-struct ethtool_get_features_block {
-	__u32	available;
-	__u32	requested;
-	__u32	active;
-	__u32	never_changed;
-};
-
-/**
- * struct ethtool_gfeatures - command to get state of device's features
- * @cmd: command number = %ETHTOOL_GFEATURES
- * @size: On entry, the number of elements in the features[] array;
- *	on return, the number of elements in features[] needed to hold
- *	all features
- * @features: state of features
- */
-struct ethtool_gfeatures {
-	__u32	cmd;
-	__u32	size;
-	struct ethtool_get_features_block features[0];
-};
-
-/**
- * struct ethtool_set_features_block - block with request for 32 features
- * @valid: mask of features to be changed
- * @requested: values of features to be changed
- */
-struct ethtool_set_features_block {
-	__u32	valid;
-	__u32	requested;
-};
-
-/**
- * struct ethtool_sfeatures - command to request change in device's features
- * @cmd: command number = %ETHTOOL_SFEATURES
- * @size: array size of the features[] array
- * @features: feature change masks
- */
-struct ethtool_sfeatures {
-	__u32	cmd;
-	__u32	size;
-	struct ethtool_set_features_block features[0];
-};
-
-/**
- * struct ethtool_ts_info - holds a device's timestamping and PHC association
- * @cmd: command number = %ETHTOOL_GET_TS_INFO
- * @so_timestamping: bit mask of the sum of the supported SO_TIMESTAMPING flags
- * @phc_index: device index of the associated PHC, or -1 if there is none
- * @tx_types: bit mask of the supported hwtstamp_tx_types enumeration values
- * @rx_filters: bit mask of the supported hwtstamp_rx_filters enumeration values
- *
- * The bits in the 'tx_types' and 'rx_filters' fields correspond to
- * the 'hwtstamp_tx_types' and 'hwtstamp_rx_filters' enumeration values,
- * respectively.  For example, if the device supports HWTSTAMP_TX_ON,
- * then (1 << HWTSTAMP_TX_ON) in 'tx_types' will be set.
- *
- * Drivers should only report the filters they actually support without
- * upscaling in the SIOCSHWTSTAMP ioctl. If the SIOCSHWSTAMP request for
- * HWTSTAMP_FILTER_V1_SYNC is supported by HWTSTAMP_FILTER_V1_EVENT, then the
- * driver should only report HWTSTAMP_FILTER_V1_EVENT in this op.
- */
-struct ethtool_ts_info {
-	__u32	cmd;
-	__u32	so_timestamping;
-	__s32	phc_index;
-	__u32	tx_types;
-	__u32	tx_reserved[3];
-	__u32	rx_filters;
-	__u32	rx_reserved[3];
-};
-
-/*
- * %ETHTOOL_SFEATURES changes features present in features[].valid to the
- * values of corresponding bits in features[].requested. Bits in .requested
- * not set in .valid or not changeable are ignored.
- *
- * Returns %EINVAL when .valid contains undefined or never-changeable bits
- * or size is not equal to required number of features words (32-bit blocks).
- * Returns >= 0 if request was completed; bits set in the value mean:
- *   %ETHTOOL_F_UNSUPPORTED - there were bits set in .valid that are not
- *	changeable (not present in %ETHTOOL_GFEATURES' features[].available)
- *	those bits were ignored.
- *   %ETHTOOL_F_WISH - some or all changes requested were recorded but the
- *      resulting state of bits masked by .valid is not equal to .requested.
- *      Probably there are other device-specific constraints on some features
- *      in the set. When %ETHTOOL_F_UNSUPPORTED is set, .valid is considered
- *      here as though ignored bits were cleared.
- *   %ETHTOOL_F_COMPAT - some or all changes requested were made by calling
- *      compatibility functions. Requested offload state cannot be properly
- *      managed by kernel.
- *
- * Meaning of bits in the masks are obtained by %ETHTOOL_GSSET_INFO (number of
- * bits in the arrays - always multiple of 32) and %ETHTOOL_GSTRINGS commands
- * for ETH_SS_FEATURES string set. First entry in the table corresponds to least
- * significant bit in features[0] fields. Empty strings mark undefined features.
- */
-enum ethtool_sfeatures_retval_bits {
-	ETHTOOL_F_UNSUPPORTED__BIT,
-	ETHTOOL_F_WISH__BIT,
-	ETHTOOL_F_COMPAT__BIT,
-};
-
-#define ETHTOOL_F_UNSUPPORTED   (1 << ETHTOOL_F_UNSUPPORTED__BIT)
-#define ETHTOOL_F_WISH          (1 << ETHTOOL_F_WISH__BIT)
-#define ETHTOOL_F_COMPAT        (1 << ETHTOOL_F_COMPAT__BIT)
-
-
-/* CMDs currently supported */
-#define ETHTOOL_GSET		0x00000001 /* Get settings. */
-#define ETHTOOL_SSET		0x00000002 /* Set settings. */
-#define ETHTOOL_GDRVINFO	0x00000003 /* Get driver info. */
-#define ETHTOOL_GREGS		0x00000004 /* Get NIC registers. */
-#define ETHTOOL_GWOL		0x00000005 /* Get wake-on-lan options. */
-#define ETHTOOL_SWOL		0x00000006 /* Set wake-on-lan options. */
-#define ETHTOOL_GMSGLVL		0x00000007 /* Get driver message level */
-#define ETHTOOL_SMSGLVL		0x00000008 /* Set driver msg level. */
-#define ETHTOOL_NWAY_RST	0x00000009 /* Restart autonegotiation. */
-/* Get link status for host, i.e. whether the interface *and* the
- * physical port (if there is one) are up (ethtool_value). */
-#define ETHTOOL_GLINK		0x0000000a
-#define ETHTOOL_GEEPROM		0x0000000b /* Get EEPROM data */
-#define ETHTOOL_SEEPROM		0x0000000c /* Set EEPROM data. */
-#define ETHTOOL_GCOALESCE	0x0000000e /* Get coalesce config */
-#define ETHTOOL_SCOALESCE	0x0000000f /* Set coalesce config. */
-#define ETHTOOL_GRINGPARAM	0x00000010 /* Get ring parameters */
-#define ETHTOOL_SRINGPARAM	0x00000011 /* Set ring parameters. */
-#define ETHTOOL_GPAUSEPARAM	0x00000012 /* Get pause parameters */
-#define ETHTOOL_SPAUSEPARAM	0x00000013 /* Set pause parameters. */
-#define ETHTOOL_GRXCSUM		0x00000014 /* Get RX hw csum enable (ethtool_value) */
-#define ETHTOOL_SRXCSUM		0x00000015 /* Set RX hw csum enable (ethtool_value) */
-#define ETHTOOL_GTXCSUM		0x00000016 /* Get TX hw csum enable (ethtool_value) */
-#define ETHTOOL_STXCSUM		0x00000017 /* Set TX hw csum enable (ethtool_value) */
-#define ETHTOOL_GSG		0x00000018 /* Get scatter-gather enable
-					    * (ethtool_value) */
-#define ETHTOOL_SSG		0x00000019 /* Set scatter-gather enable
-					    * (ethtool_value). */
-#define ETHTOOL_TEST		0x0000001a /* execute NIC self-test. */
-#define ETHTOOL_GSTRINGS	0x0000001b /* get specified string set */
-#define ETHTOOL_PHYS_ID		0x0000001c /* identify the NIC */
-#define ETHTOOL_GSTATS		0x0000001d /* get NIC-specific statistics */
-#define ETHTOOL_GTSO		0x0000001e /* Get TSO enable (ethtool_value) */
-#define ETHTOOL_STSO		0x0000001f /* Set TSO enable (ethtool_value) */
-#define ETHTOOL_GPERMADDR	0x00000020 /* Get permanent hardware address */
-#define ETHTOOL_GUFO		0x00000021 /* Get UFO enable (ethtool_value) */
-#define ETHTOOL_SUFO		0x00000022 /* Set UFO enable (ethtool_value) */
-#define ETHTOOL_GGSO		0x00000023 /* Get GSO enable (ethtool_value) */
-#define ETHTOOL_SGSO		0x00000024 /* Set GSO enable (ethtool_value) */
-#define ETHTOOL_GFLAGS		0x00000025 /* Get flags bitmap(ethtool_value) */
-#define ETHTOOL_SFLAGS		0x00000026 /* Set flags bitmap(ethtool_value) */
-#define ETHTOOL_GPFLAGS		0x00000027 /* Get driver-private flags bitmap */
-#define ETHTOOL_SPFLAGS		0x00000028 /* Set driver-private flags bitmap */
-
-#define ETHTOOL_GRXFH		0x00000029 /* Get RX flow hash configuration */
-#define ETHTOOL_SRXFH		0x0000002a /* Set RX flow hash configuration */
-#define ETHTOOL_GGRO		0x0000002b /* Get GRO enable (ethtool_value) */
-#define ETHTOOL_SGRO		0x0000002c /* Set GRO enable (ethtool_value) */
-#define ETHTOOL_GRXRINGS	0x0000002d /* Get RX rings available for LB */
-#define ETHTOOL_GRXCLSRLCNT	0x0000002e /* Get RX class rule count */
-#define ETHTOOL_GRXCLSRULE	0x0000002f /* Get RX classification rule */
-#define ETHTOOL_GRXCLSRLALL	0x00000030 /* Get all RX classification rule */
-#define ETHTOOL_SRXCLSRLDEL	0x00000031 /* Delete RX classification rule */
-#define ETHTOOL_SRXCLSRLINS	0x00000032 /* Insert RX classification rule */
-#define ETHTOOL_FLASHDEV	0x00000033 /* Flash firmware to device */
-#define ETHTOOL_RESET		0x00000034 /* Reset hardware */
-#define ETHTOOL_SRXNTUPLE	0x00000035 /* Add an n-tuple filter to device */
-#define ETHTOOL_GRXNTUPLE	0x00000036 /* deprecated */
-#define ETHTOOL_GSSET_INFO	0x00000037 /* Get string set info */
-#define ETHTOOL_GRXFHINDIR	0x00000038 /* Get RX flow hash indir'n table */
-#define ETHTOOL_SRXFHINDIR	0x00000039 /* Set RX flow hash indir'n table */
-
-#define ETHTOOL_GFEATURES	0x0000003a /* Get device offload settings */
-#define ETHTOOL_SFEATURES	0x0000003b /* Change device offload settings */
-#define ETHTOOL_GCHANNELS	0x0000003c /* Get no of channels */
-#define ETHTOOL_SCHANNELS	0x0000003d /* Set no of channels */
-#define ETHTOOL_SET_DUMP	0x0000003e /* Set dump settings */
-#define ETHTOOL_GET_DUMP_FLAG	0x0000003f /* Get dump settings */
-#define ETHTOOL_GET_DUMP_DATA	0x00000040 /* Get dump data */
-#define ETHTOOL_GET_TS_INFO	0x00000041 /* Get time stamping and PHC info */
-#define ETHTOOL_GMODULEINFO	0x00000042 /* Get plug-in module information */
-#define ETHTOOL_GMODULEEEPROM	0x00000043 /* Get plug-in module eeprom */
-#define ETHTOOL_GEEE		0x00000044 /* Get EEE settings */
-#define ETHTOOL_SEEE		0x00000045 /* Set EEE settings */
-
-#define ETHTOOL_GRSSH		0x00000046 /* Get RX flow hash configuration */
-#define ETHTOOL_SRSSH		0x00000047 /* Set RX flow hash configuration */
-#define ETHTOOL_GTUNABLE	0x00000048 /* Get tunable configuration */
-#define ETHTOOL_STUNABLE	0x00000049 /* Set tunable configuration */
-
-/* compatibility with older code */
-#define SPARC_ETH_GSET		ETHTOOL_GSET
-#define SPARC_ETH_SSET		ETHTOOL_SSET
-
-#define SUPPORTED_10baseT_Half		(1 << 0)
-#define SUPPORTED_10baseT_Full		(1 << 1)
-#define SUPPORTED_100baseT_Half		(1 << 2)
-#define SUPPORTED_100baseT_Full		(1 << 3)
-#define SUPPORTED_1000baseT_Half	(1 << 4)
-#define SUPPORTED_1000baseT_Full	(1 << 5)
-#define SUPPORTED_Autoneg		(1 << 6)
-#define SUPPORTED_TP			(1 << 7)
-#define SUPPORTED_AUI			(1 << 8)
-#define SUPPORTED_MII			(1 << 9)
-#define SUPPORTED_FIBRE			(1 << 10)
-#define SUPPORTED_BNC			(1 << 11)
-#define SUPPORTED_10000baseT_Full	(1 << 12)
-#define SUPPORTED_Pause			(1 << 13)
-#define SUPPORTED_Asym_Pause		(1 << 14)
-#define SUPPORTED_2500baseX_Full	(1 << 15)
-#define SUPPORTED_Backplane		(1 << 16)
-#define SUPPORTED_1000baseKX_Full	(1 << 17)
-#define SUPPORTED_10000baseKX4_Full	(1 << 18)
-#define SUPPORTED_10000baseKR_Full	(1 << 19)
-#define SUPPORTED_10000baseR_FEC	(1 << 20)
-#define SUPPORTED_20000baseMLD2_Full	(1 << 21)
-#define SUPPORTED_20000baseKR2_Full	(1 << 22)
-#define SUPPORTED_40000baseKR4_Full	(1 << 23)
-#define SUPPORTED_40000baseCR4_Full	(1 << 24)
-#define SUPPORTED_40000baseSR4_Full	(1 << 25)
-#define SUPPORTED_40000baseLR4_Full	(1 << 26)
-#define SUPPORTED_56000baseKR4_Full	(1 << 27)
-#define SUPPORTED_56000baseCR4_Full	(1 << 28)
-#define SUPPORTED_56000baseSR4_Full	(1 << 29)
-#define SUPPORTED_56000baseLR4_Full	(1 << 30)
-
-#define ADVERTISED_10baseT_Half		(1 << 0)
-#define ADVERTISED_10baseT_Full		(1 << 1)
-#define ADVERTISED_100baseT_Half	(1 << 2)
-#define ADVERTISED_100baseT_Full	(1 << 3)
-#define ADVERTISED_1000baseT_Half	(1 << 4)
-#define ADVERTISED_1000baseT_Full	(1 << 5)
-#define ADVERTISED_Autoneg		(1 << 6)
-#define ADVERTISED_TP			(1 << 7)
-#define ADVERTISED_AUI			(1 << 8)
-#define ADVERTISED_MII			(1 << 9)
-#define ADVERTISED_FIBRE		(1 << 10)
-#define ADVERTISED_BNC			(1 << 11)
-#define ADVERTISED_10000baseT_Full	(1 << 12)
-#define ADVERTISED_Pause		(1 << 13)
-#define ADVERTISED_Asym_Pause		(1 << 14)
-#define ADVERTISED_2500baseX_Full	(1 << 15)
-#define ADVERTISED_Backplane		(1 << 16)
-#define ADVERTISED_1000baseKX_Full	(1 << 17)
-#define ADVERTISED_10000baseKX4_Full	(1 << 18)
-#define ADVERTISED_10000baseKR_Full	(1 << 19)
-#define ADVERTISED_10000baseR_FEC	(1 << 20)
-#define ADVERTISED_20000baseMLD2_Full	(1 << 21)
-#define ADVERTISED_20000baseKR2_Full	(1 << 22)
-#define ADVERTISED_40000baseKR4_Full	(1 << 23)
-#define ADVERTISED_40000baseCR4_Full	(1 << 24)
-#define ADVERTISED_40000baseSR4_Full	(1 << 25)
-#define ADVERTISED_40000baseLR4_Full	(1 << 26)
-#define ADVERTISED_56000baseKR4_Full	(1 << 27)
-#define ADVERTISED_56000baseCR4_Full	(1 << 28)
-#define ADVERTISED_56000baseSR4_Full	(1 << 29)
-#define ADVERTISED_56000baseLR4_Full	(1 << 30)
-
-/* The following are all involved in forcing a particular link
- * mode for the device for setting things.  When getting the
- * devices settings, these indicate the current mode and whether
- * it was forced up into this mode or autonegotiated.
- */
-
-/* The forced speed, 10Mb, 100Mb, gigabit, [2.5|5|10|20|25|40|50|56|100]GbE. */
-#define SPEED_10		10
-#define SPEED_100		100
-#define SPEED_1000		1000
-#define SPEED_2500		2500
-#define SPEED_5000		5000
-#define SPEED_10000		10000
-#define SPEED_20000		20000
-#define SPEED_25000		25000
-#define SPEED_40000		40000
-#define SPEED_50000		50000
-#define SPEED_56000		56000
-#define SPEED_100000		100000
-
-#define SPEED_UNKNOWN		-1
-
-/* Duplex, half or full. */
-#define DUPLEX_HALF		0x00
-#define DUPLEX_FULL		0x01
-#define DUPLEX_UNKNOWN		0xff
-
-/* Which connector port. */
-#define PORT_TP			0x00
-#define PORT_AUI		0x01
-#define PORT_MII		0x02
-#define PORT_FIBRE		0x03
-#define PORT_BNC		0x04
-#define PORT_DA			0x05
-#define PORT_NONE		0xef
-#define PORT_OTHER		0xff
-
-/* Which transceiver to use. */
-#define XCVR_INTERNAL		0x00 /* PHY and MAC are in the same package */
-#define XCVR_EXTERNAL		0x01 /* PHY and MAC are in different packages */
-#define XCVR_DUMMY1		0x02
-#define XCVR_DUMMY2		0x03
-#define XCVR_DUMMY3		0x04
-
-/* Enable or disable autonegotiation. */
-#define AUTONEG_DISABLE		0x00
-#define AUTONEG_ENABLE		0x01
-
-/* MDI or MDI-X status/control - if MDI/MDI_X/AUTO is set then
- * the driver is required to renegotiate link
- */
-#define ETH_TP_MDI_INVALID	0x00 /* status: unknown; control: unsupported */
-#define ETH_TP_MDI		0x01 /* status: MDI;     control: force MDI */
-#define ETH_TP_MDI_X		0x02 /* status: MDI-X;   control: force MDI-X */
-#define ETH_TP_MDI_AUTO		0x03 /*                  control: auto-select */
-
-/* Wake-On-Lan options. */
-#define WAKE_PHY		(1 << 0)
-#define WAKE_UCAST		(1 << 1)
-#define WAKE_MCAST		(1 << 2)
-#define WAKE_BCAST		(1 << 3)
-#define WAKE_ARP		(1 << 4)
-#define WAKE_MAGIC		(1 << 5)
-#define WAKE_MAGICSECURE	(1 << 6) /* only meaningful if WAKE_MAGIC */
-
-/* L2-L4 network traffic flow types */
-#define	TCP_V4_FLOW	0x01	/* hash or spec (tcp_ip4_spec) */
-#define	UDP_V4_FLOW	0x02	/* hash or spec (udp_ip4_spec) */
-#define	SCTP_V4_FLOW	0x03	/* hash or spec (sctp_ip4_spec) */
-#define	AH_ESP_V4_FLOW	0x04	/* hash only */
-#define	TCP_V6_FLOW	0x05	/* hash only */
-#define	UDP_V6_FLOW	0x06	/* hash only */
-#define	SCTP_V6_FLOW	0x07	/* hash only */
-#define	AH_ESP_V6_FLOW	0x08	/* hash only */
-#define	AH_V4_FLOW	0x09	/* hash or spec (ah_ip4_spec) */
-#define	ESP_V4_FLOW	0x0a	/* hash or spec (esp_ip4_spec) */
-#define	AH_V6_FLOW	0x0b	/* hash only */
-#define	ESP_V6_FLOW	0x0c	/* hash only */
-#define	IP_USER_FLOW	0x0d	/* spec only (usr_ip4_spec) */
-#define	IPV4_FLOW	0x10	/* hash only */
-#define	IPV6_FLOW	0x11	/* hash only */
-#define	ETHER_FLOW	0x12	/* spec only (ether_spec) */
-/* Flag to enable additional fields in struct ethtool_rx_flow_spec */
-#define	FLOW_EXT	0x80000000
-#define	FLOW_MAC_EXT	0x40000000
-
-/* L3-L4 network traffic flow hash options */
-#define	RXH_L2DA	(1 << 1)
-#define	RXH_VLAN	(1 << 2)
-#define	RXH_L3_PROTO	(1 << 3)
-#define	RXH_IP_SRC	(1 << 4)
-#define	RXH_IP_DST	(1 << 5)
-#define	RXH_L4_B_0_1	(1 << 6) /* src port in case of TCP/UDP/SCTP */
-#define	RXH_L4_B_2_3	(1 << 7) /* dst port in case of TCP/UDP/SCTP */
-#define	RXH_DISCARD	(1 << 31)
-
-#define	RX_CLS_FLOW_DISC	0xffffffffffffffffULL
-
-/* Special RX classification rule insert location values */
-#define RX_CLS_LOC_SPECIAL	0x80000000	/* flag */
-#define RX_CLS_LOC_ANY		0xffffffff
-#define RX_CLS_LOC_FIRST	0xfffffffe
-#define RX_CLS_LOC_LAST		0xfffffffd
-
-/* EEPROM Standards for plug in modules */
-#define ETH_MODULE_SFF_8079		0x1
-#define ETH_MODULE_SFF_8079_LEN		256
-#define ETH_MODULE_SFF_8472		0x2
-#define ETH_MODULE_SFF_8472_LEN		512
-#define ETH_MODULE_SFF_8636		0x3
-#define ETH_MODULE_SFF_8636_LEN		256
-#define ETH_MODULE_SFF_8436		0x4
-#define ETH_MODULE_SFF_8436_LEN		256
-
-/* Reset flags */
-/* The reset() operation must clear the flags for the components which
- * were actually reset.  On successful return, the flags indicate the
- * components which were not reset, either because they do not exist
- * in the hardware or because they cannot be reset independently.  The
- * driver must never reset any components that were not requested.
- */
-enum ethtool_reset_flags {
-	/* These flags represent components dedicated to the interface
-	 * the command is addressed to.  Shift any flag left by
-	 * ETH_RESET_SHARED_SHIFT to reset a shared component of the
-	 * same type.
-	 */
-	ETH_RESET_MGMT		= 1 << 0,	/* Management processor */
-	ETH_RESET_IRQ		= 1 << 1,	/* Interrupt requester */
-	ETH_RESET_DMA		= 1 << 2,	/* DMA engine */
-	ETH_RESET_FILTER	= 1 << 3,	/* Filtering/flow direction */
-	ETH_RESET_OFFLOAD	= 1 << 4,	/* Protocol offload */
-	ETH_RESET_MAC		= 1 << 5,	/* Media access controller */
-	ETH_RESET_PHY		= 1 << 6,	/* Transceiver/PHY */
-	ETH_RESET_RAM		= 1 << 7,	/* RAM shared between
-						 * multiple components */
-
-	ETH_RESET_DEDICATED	= 0x0000ffff,	/* All components dedicated to
-						 * this interface */
-	ETH_RESET_ALL		= 0xffffffff,	/* All components used by this
-						 * interface, even if shared */
-};
-#define ETH_RESET_SHARED_SHIFT	16
-
-#endif /* _LINUX_ETHTOOL_H */
diff --git a/openflow/usr/include/linux/eventpoll.h b/openflow/usr/include/linux/eventpoll.h
deleted file mode 100644
index 8625342..0000000
--- a/openflow/usr/include/linux/eventpoll.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  include/linux/eventpoll.h ( Efficient event polling implementation )
- *  Copyright (C) 2001,...,2006	 Davide Libenzi
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Davide Libenzi <davidel@xmailserver.org>
- *
- */
-
-#ifndef _LINUX_EVENTPOLL_H
-#define _LINUX_EVENTPOLL_H
-
-/* For O_CLOEXEC */
-#include <linux/fcntl.h>
-#include <linux/types.h>
-
-/* Flags for epoll_create1.  */
-#define EPOLL_CLOEXEC O_CLOEXEC
-
-/* Valid opcodes to issue to sys_epoll_ctl() */
-#define EPOLL_CTL_ADD 1
-#define EPOLL_CTL_DEL 2
-#define EPOLL_CTL_MOD 3
-
-/*
- * Request the handling of system wakeup events so as to prevent system suspends
- * from happening while those events are being processed.
- *
- * Assuming neither EPOLLET nor EPOLLONESHOT is set, system suspends will not be
- * re-allowed until epoll_wait is called again after consuming the wakeup
- * event(s).
- *
- * Requires CAP_BLOCK_SUSPEND
- */
-#define EPOLLWAKEUP (1 << 29)
-
-/* Set the One Shot behaviour for the target file descriptor */
-#define EPOLLONESHOT (1 << 30)
-
-/* Set the Edge Triggered behaviour for the target file descriptor */
-#define EPOLLET (1 << 31)
-
-/* 
- * On x86-64 make the 64bit structure have the same alignment as the
- * 32bit structure. This makes 32bit emulation easier.
- *
- * UML/x86_64 needs the same packing as x86_64
- */
-#ifdef __x86_64__
-#define EPOLL_PACKED __attribute__((packed))
-#else
-#define EPOLL_PACKED
-#endif
-
-struct epoll_event {
-	__u32 events;
-	__u64 data;
-} EPOLL_PACKED;
-
-#ifdef CONFIG_PM_SLEEP
-static __inline__ void ep_take_care_of_epollwakeup(struct epoll_event *epev)
-{
-	if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND))
-		epev->events &= ~EPOLLWAKEUP;
-}
-#else
-static __inline__ void ep_take_care_of_epollwakeup(struct epoll_event *epev)
-{
-	epev->events &= ~EPOLLWAKEUP;
-}
-#endif
-#endif /* _LINUX_EVENTPOLL_H */
diff --git a/openflow/usr/include/linux/fadvise.h b/openflow/usr/include/linux/fadvise.h
deleted file mode 100644
index e8e7471..0000000
--- a/openflow/usr/include/linux/fadvise.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef FADVISE_H_INCLUDED
-#define FADVISE_H_INCLUDED
-
-#define POSIX_FADV_NORMAL	0 /* No further special treatment.  */
-#define POSIX_FADV_RANDOM	1 /* Expect random page references.  */
-#define POSIX_FADV_SEQUENTIAL	2 /* Expect sequential page references.  */
-#define POSIX_FADV_WILLNEED	3 /* Will need these pages.  */
-
-/*
- * The advise values for POSIX_FADV_DONTNEED and POSIX_ADV_NOREUSE
- * for s390-64 differ from the values for the rest of the world.
- */
-#if defined(__s390x__)
-#define POSIX_FADV_DONTNEED	6 /* Don't need these pages.  */
-#define POSIX_FADV_NOREUSE	7 /* Data will be accessed once.  */
-#else
-#define POSIX_FADV_DONTNEED	4 /* Don't need these pages.  */
-#define POSIX_FADV_NOREUSE	5 /* Data will be accessed once.  */
-#endif
-
-#endif	/* FADVISE_H_INCLUDED */
diff --git a/openflow/usr/include/linux/falloc.h b/openflow/usr/include/linux/falloc.h
deleted file mode 100644
index dce68de..0000000
--- a/openflow/usr/include/linux/falloc.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef _FALLOC_H_
-#define _FALLOC_H_
-
-#define FALLOC_FL_KEEP_SIZE	0x01 /* default is extend size */
-#define FALLOC_FL_PUNCH_HOLE	0x02 /* de-allocates range */
-#define FALLOC_FL_NO_HIDE_STALE	0x04 /* reserved codepoint */
-
-/*
- * FALLOC_FL_COLLAPSE_RANGE is used to remove a range of a file
- * without leaving a hole in the file. The contents of the file beyond
- * the range being removed is appended to the start offset of the range
- * being removed (i.e. the hole that was punched is "collapsed"),
- * resulting in a file layout that looks like the range that was
- * removed never existed. As such collapsing a range of a file changes
- * the size of the file, reducing it by the same length of the range
- * that has been removed by the operation.
- *
- * Different filesystems may implement different limitations on the
- * granularity of the operation. Most will limit operations to
- * filesystem block size boundaries, but this boundary may be larger or
- * smaller depending on the filesystem and/or the configuration of the
- * filesystem or file.
- *
- * Attempting to collapse a range that crosses the end of the file is
- * considered an illegal operation - just use ftruncate(2) if you need
- * to collapse a range that crosses EOF.
- */
-#define FALLOC_FL_COLLAPSE_RANGE	0x08
-
-/*
- * FALLOC_FL_ZERO_RANGE is used to convert a range of file to zeros preferably
- * without issuing data IO. Blocks should be preallocated for the regions that
- * span holes in the file, and the entire range is preferable converted to
- * unwritten extents - even though file system may choose to zero out the
- * extent or do whatever which will result in reading zeros from the range
- * while the range remains allocated for the file.
- *
- * This can be also used to preallocate blocks past EOF in the same way as
- * with fallocate. Flag FALLOC_FL_KEEP_SIZE should cause the inode
- * size to remain the same.
- */
-#define FALLOC_FL_ZERO_RANGE		0x10
-
-/*
- * FALLOC_FL_INSERT_RANGE is use to insert space within the file size without
- * overwriting any existing data. The contents of the file beyond offset are
- * shifted towards right by len bytes to create a hole.  As such, this
- * operation will increase the size of the file by len bytes.
- *
- * Different filesystems may implement different limitations on the granularity
- * of the operation. Most will limit operations to filesystem block size
- * boundaries, but this boundary may be larger or smaller depending on
- * the filesystem and/or the configuration of the filesystem or file.
- *
- * Attempting to insert space using this flag at OR beyond the end of
- * the file is considered an illegal operation - just use ftruncate(2) or
- * fallocate(2) with mode 0 for such type of operations.
- */
-#define FALLOC_FL_INSERT_RANGE		0x20
-
-#endif /* _FALLOC_H_ */
diff --git a/openflow/usr/include/linux/fanotify.h b/openflow/usr/include/linux/fanotify.h
deleted file mode 100644
index f780e5a..0000000
--- a/openflow/usr/include/linux/fanotify.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#ifndef _LINUX_FANOTIFY_H
-#define _LINUX_FANOTIFY_H
-
-#include <linux/types.h>
-
-/* the following events that user-space can register for */
-#define FAN_ACCESS		0x00000001	/* File was accessed */
-#define FAN_MODIFY		0x00000002	/* File was modified */
-#define FAN_CLOSE_WRITE		0x00000008	/* Writtable file closed */
-#define FAN_CLOSE_NOWRITE	0x00000010	/* Unwrittable file closed */
-#define FAN_OPEN		0x00000020	/* File was opened */
-
-#define FAN_Q_OVERFLOW		0x00004000	/* Event queued overflowed */
-
-#define FAN_OPEN_PERM		0x00010000	/* File open in perm check */
-#define FAN_ACCESS_PERM		0x00020000	/* File accessed in perm check */
-
-#define FAN_ONDIR		0x40000000	/* event occurred against dir */
-
-#define FAN_EVENT_ON_CHILD	0x08000000	/* interested in child events */
-
-/* helper events */
-#define FAN_CLOSE		(FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE) /* close */
-
-/* flags used for fanotify_init() */
-#define FAN_CLOEXEC		0x00000001
-#define FAN_NONBLOCK		0x00000002
-
-/* These are NOT bitwise flags.  Both bits are used togther.  */
-#define FAN_CLASS_NOTIF		0x00000000
-#define FAN_CLASS_CONTENT	0x00000004
-#define FAN_CLASS_PRE_CONTENT	0x00000008
-#define FAN_ALL_CLASS_BITS	(FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | \
-				 FAN_CLASS_PRE_CONTENT)
-
-#define FAN_UNLIMITED_QUEUE	0x00000010
-#define FAN_UNLIMITED_MARKS	0x00000020
-
-#define FAN_ALL_INIT_FLAGS	(FAN_CLOEXEC | FAN_NONBLOCK | \
-				 FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE |\
-				 FAN_UNLIMITED_MARKS)
-
-/* flags used for fanotify_modify_mark() */
-#define FAN_MARK_ADD		0x00000001
-#define FAN_MARK_REMOVE		0x00000002
-#define FAN_MARK_DONT_FOLLOW	0x00000004
-#define FAN_MARK_ONLYDIR	0x00000008
-#define FAN_MARK_MOUNT		0x00000010
-#define FAN_MARK_IGNORED_MASK	0x00000020
-#define FAN_MARK_IGNORED_SURV_MODIFY	0x00000040
-#define FAN_MARK_FLUSH		0x00000080
-
-#define FAN_ALL_MARK_FLAGS	(FAN_MARK_ADD |\
-				 FAN_MARK_REMOVE |\
-				 FAN_MARK_DONT_FOLLOW |\
-				 FAN_MARK_ONLYDIR |\
-				 FAN_MARK_MOUNT |\
-				 FAN_MARK_IGNORED_MASK |\
-				 FAN_MARK_IGNORED_SURV_MODIFY |\
-				 FAN_MARK_FLUSH)
-
-/*
- * All of the events - we build the list by hand so that we can add flags in
- * the future and not break backward compatibility.  Apps will get only the
- * events that they originally wanted.  Be sure to add new events here!
- */
-#define FAN_ALL_EVENTS (FAN_ACCESS |\
-			FAN_MODIFY |\
-			FAN_CLOSE |\
-			FAN_OPEN)
-
-/*
- * All events which require a permission response from userspace
- */
-#define FAN_ALL_PERM_EVENTS (FAN_OPEN_PERM |\
-			     FAN_ACCESS_PERM)
-
-#define FAN_ALL_OUTGOING_EVENTS	(FAN_ALL_EVENTS |\
-				 FAN_ALL_PERM_EVENTS |\
-				 FAN_Q_OVERFLOW)
-
-#define FANOTIFY_METADATA_VERSION	3
-
-struct fanotify_event_metadata {
-	__u32 event_len;
-	__u8 vers;
-	__u8 reserved;
-	__u16 metadata_len;
-	__aligned_u64 mask;
-	__s32 fd;
-	__s32 pid;
-};
-
-struct fanotify_response {
-	__s32 fd;
-	__u32 response;
-};
-
-/* Legit userspace responses to a _PERM event */
-#define FAN_ALLOW	0x01
-#define FAN_DENY	0x02
-/* No fd set in event */
-#define FAN_NOFD	-1
-
-/* Helper functions to deal with fanotify_event_metadata buffers */
-#define FAN_EVENT_METADATA_LEN (sizeof(struct fanotify_event_metadata))
-
-#define FAN_EVENT_NEXT(meta, len) ((len) -= (meta)->event_len, \
-				   (struct fanotify_event_metadata*)(((char *)(meta)) + \
-				   (meta)->event_len))
-
-#define FAN_EVENT_OK(meta, len)	((long)(len) >= (long)FAN_EVENT_METADATA_LEN && \
-				(long)(meta)->event_len >= (long)FAN_EVENT_METADATA_LEN && \
-				(long)(meta)->event_len <= (long)(len))
-
-#endif /* _LINUX_FANOTIFY_H */
diff --git a/openflow/usr/include/linux/fb.h b/openflow/usr/include/linux/fb.h
deleted file mode 100644
index 1b3b239..0000000
--- a/openflow/usr/include/linux/fb.h
+++ /dev/null
@@ -1,400 +0,0 @@
-#ifndef _LINUX_FB_H
-#define _LINUX_FB_H
-
-#include <linux/types.h>
-#include <linux/i2c.h>
-
-/* Definitions of frame buffers						*/
-
-#define FB_MAX			32	/* sufficient for now */
-
-/* ioctls
-   0x46 is 'F'								*/
-#define FBIOGET_VSCREENINFO	0x4600
-#define FBIOPUT_VSCREENINFO	0x4601
-#define FBIOGET_FSCREENINFO	0x4602
-#define FBIOGETCMAP		0x4604
-#define FBIOPUTCMAP		0x4605
-#define FBIOPAN_DISPLAY		0x4606
-#define FBIO_CURSOR            _IOWR('F', 0x08, struct fb_cursor)
-/* 0x4607-0x460B are defined below */
-/* #define FBIOGET_MONITORSPEC	0x460C */
-/* #define FBIOPUT_MONITORSPEC	0x460D */
-/* #define FBIOSWITCH_MONIBIT	0x460E */
-#define FBIOGET_CON2FBMAP	0x460F
-#define FBIOPUT_CON2FBMAP	0x4610
-#define FBIOBLANK		0x4611		/* arg: 0 or vesa level + 1 */
-#define FBIOGET_VBLANK		_IOR('F', 0x12, struct fb_vblank)
-#define FBIO_ALLOC              0x4613
-#define FBIO_FREE               0x4614
-#define FBIOGET_GLYPH           0x4615
-#define FBIOGET_HWCINFO         0x4616
-#define FBIOPUT_MODEINFO        0x4617
-#define FBIOGET_DISPINFO        0x4618
-#define FBIO_WAITFORVSYNC	_IOW('F', 0x20, __u32)
-
-#define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
-#define FB_TYPE_PLANES			1	/* Non interleaved planes */
-#define FB_TYPE_INTERLEAVED_PLANES	2	/* Interleaved planes	*/
-#define FB_TYPE_TEXT			3	/* Text/attributes	*/
-#define FB_TYPE_VGA_PLANES		4	/* EGA/VGA planes	*/
-#define FB_TYPE_FOURCC			5	/* Type identified by a V4L2 FOURCC */
-
-#define FB_AUX_TEXT_MDA		0	/* Monochrome text */
-#define FB_AUX_TEXT_CGA		1	/* CGA/EGA/VGA Color text */
-#define FB_AUX_TEXT_S3_MMIO	2	/* S3 MMIO fasttext */
-#define FB_AUX_TEXT_MGA_STEP16	3	/* MGA Millenium I: text, attr, 14 reserved bytes */
-#define FB_AUX_TEXT_MGA_STEP8	4	/* other MGAs:      text, attr,  6 reserved bytes */
-#define FB_AUX_TEXT_SVGA_GROUP	8	/* 8-15: SVGA tileblit compatible modes */
-#define FB_AUX_TEXT_SVGA_MASK	7	/* lower three bits says step */
-#define FB_AUX_TEXT_SVGA_STEP2	8	/* SVGA text mode:  text, attr */
-#define FB_AUX_TEXT_SVGA_STEP4	9	/* SVGA text mode:  text, attr,  2 reserved bytes */
-#define FB_AUX_TEXT_SVGA_STEP8	10	/* SVGA text mode:  text, attr,  6 reserved bytes */
-#define FB_AUX_TEXT_SVGA_STEP16	11	/* SVGA text mode:  text, attr, 14 reserved bytes */
-#define FB_AUX_TEXT_SVGA_LAST	15	/* reserved up to 15 */
-
-#define FB_AUX_VGA_PLANES_VGA4		0	/* 16 color planes (EGA/VGA) */
-#define FB_AUX_VGA_PLANES_CFB4		1	/* CFB4 in planes (VGA) */
-#define FB_AUX_VGA_PLANES_CFB8		2	/* CFB8 in planes (VGA) */
-
-#define FB_VISUAL_MONO01		0	/* Monochr. 1=Black 0=White */
-#define FB_VISUAL_MONO10		1	/* Monochr. 1=White 0=Black */
-#define FB_VISUAL_TRUECOLOR		2	/* True color	*/
-#define FB_VISUAL_PSEUDOCOLOR		3	/* Pseudo color (like atari) */
-#define FB_VISUAL_DIRECTCOLOR		4	/* Direct color */
-#define FB_VISUAL_STATIC_PSEUDOCOLOR	5	/* Pseudo color readonly */
-#define FB_VISUAL_FOURCC		6	/* Visual identified by a V4L2 FOURCC */
-
-#define FB_ACCEL_NONE		0	/* no hardware accelerator	*/
-#define FB_ACCEL_ATARIBLITT	1	/* Atari Blitter		*/
-#define FB_ACCEL_AMIGABLITT	2	/* Amiga Blitter                */
-#define FB_ACCEL_S3_TRIO64	3	/* Cybervision64 (S3 Trio64)    */
-#define FB_ACCEL_NCR_77C32BLT	4	/* RetinaZ3 (NCR 77C32BLT)      */
-#define FB_ACCEL_S3_VIRGE	5	/* Cybervision64/3D (S3 ViRGE)	*/
-#define FB_ACCEL_ATI_MACH64GX	6	/* ATI Mach 64GX family		*/
-#define FB_ACCEL_DEC_TGA	7	/* DEC 21030 TGA		*/
-#define FB_ACCEL_ATI_MACH64CT	8	/* ATI Mach 64CT family		*/
-#define FB_ACCEL_ATI_MACH64VT	9	/* ATI Mach 64CT family VT class */
-#define FB_ACCEL_ATI_MACH64GT	10	/* ATI Mach 64CT family GT class */
-#define FB_ACCEL_SUN_CREATOR	11	/* Sun Creator/Creator3D	*/
-#define FB_ACCEL_SUN_CGSIX	12	/* Sun cg6			*/
-#define FB_ACCEL_SUN_LEO	13	/* Sun leo/zx			*/
-#define FB_ACCEL_IMS_TWINTURBO	14	/* IMS Twin Turbo		*/
-#define FB_ACCEL_3DLABS_PERMEDIA2 15	/* 3Dlabs Permedia 2		*/
-#define FB_ACCEL_MATROX_MGA2064W 16	/* Matrox MGA2064W (Millenium)	*/
-#define FB_ACCEL_MATROX_MGA1064SG 17	/* Matrox MGA1064SG (Mystique)	*/
-#define FB_ACCEL_MATROX_MGA2164W 18	/* Matrox MGA2164W (Millenium II) */
-#define FB_ACCEL_MATROX_MGA2164W_AGP 19	/* Matrox MGA2164W (Millenium II) */
-#define FB_ACCEL_MATROX_MGAG100	20	/* Matrox G100 (Productiva G100) */
-#define FB_ACCEL_MATROX_MGAG200	21	/* Matrox G200 (Myst, Mill, ...) */
-#define FB_ACCEL_SUN_CG14	22	/* Sun cgfourteen		 */
-#define FB_ACCEL_SUN_BWTWO	23	/* Sun bwtwo			*/
-#define FB_ACCEL_SUN_CGTHREE	24	/* Sun cgthree			*/
-#define FB_ACCEL_SUN_TCX	25	/* Sun tcx			*/
-#define FB_ACCEL_MATROX_MGAG400	26	/* Matrox G400			*/
-#define FB_ACCEL_NV3		27	/* nVidia RIVA 128              */
-#define FB_ACCEL_NV4		28	/* nVidia RIVA TNT		*/
-#define FB_ACCEL_NV5		29	/* nVidia RIVA TNT2		*/
-#define FB_ACCEL_CT_6555x	30	/* C&T 6555x			*/
-#define FB_ACCEL_3DFX_BANSHEE	31	/* 3Dfx Banshee			*/
-#define FB_ACCEL_ATI_RAGE128	32	/* ATI Rage128 family		*/
-#define FB_ACCEL_IGS_CYBER2000	33	/* CyberPro 2000		*/
-#define FB_ACCEL_IGS_CYBER2010	34	/* CyberPro 2010		*/
-#define FB_ACCEL_IGS_CYBER5000	35	/* CyberPro 5000		*/
-#define FB_ACCEL_SIS_GLAMOUR    36	/* SiS 300/630/540              */
-#define FB_ACCEL_3DLABS_PERMEDIA3 37	/* 3Dlabs Permedia 3		*/
-#define FB_ACCEL_ATI_RADEON	38	/* ATI Radeon family		*/
-#define FB_ACCEL_I810           39      /* Intel 810/815                */
-#define FB_ACCEL_SIS_GLAMOUR_2  40	/* SiS 315, 650, 740		*/
-#define FB_ACCEL_SIS_XABRE      41	/* SiS 330 ("Xabre")		*/
-#define FB_ACCEL_I830           42      /* Intel 830M/845G/85x/865G     */
-#define FB_ACCEL_NV_10          43      /* nVidia Arch 10               */
-#define FB_ACCEL_NV_20          44      /* nVidia Arch 20               */
-#define FB_ACCEL_NV_30          45      /* nVidia Arch 30               */
-#define FB_ACCEL_NV_40          46      /* nVidia Arch 40               */
-#define FB_ACCEL_XGI_VOLARI_V	47	/* XGI Volari V3XT, V5, V8      */
-#define FB_ACCEL_XGI_VOLARI_Z	48	/* XGI Volari Z7                */
-#define FB_ACCEL_OMAP1610	49	/* TI OMAP16xx                  */
-#define FB_ACCEL_TRIDENT_TGUI	50	/* Trident TGUI			*/
-#define FB_ACCEL_TRIDENT_3DIMAGE 51	/* Trident 3DImage		*/
-#define FB_ACCEL_TRIDENT_BLADE3D 52	/* Trident Blade3D		*/
-#define FB_ACCEL_TRIDENT_BLADEXP 53	/* Trident BladeXP		*/
-#define FB_ACCEL_CIRRUS_ALPINE   53	/* Cirrus Logic 543x/544x/5480	*/
-#define FB_ACCEL_NEOMAGIC_NM2070 90	/* NeoMagic NM2070              */
-#define FB_ACCEL_NEOMAGIC_NM2090 91	/* NeoMagic NM2090              */
-#define FB_ACCEL_NEOMAGIC_NM2093 92	/* NeoMagic NM2093              */
-#define FB_ACCEL_NEOMAGIC_NM2097 93	/* NeoMagic NM2097              */
-#define FB_ACCEL_NEOMAGIC_NM2160 94	/* NeoMagic NM2160              */
-#define FB_ACCEL_NEOMAGIC_NM2200 95	/* NeoMagic NM2200              */
-#define FB_ACCEL_NEOMAGIC_NM2230 96	/* NeoMagic NM2230              */
-#define FB_ACCEL_NEOMAGIC_NM2360 97	/* NeoMagic NM2360              */
-#define FB_ACCEL_NEOMAGIC_NM2380 98	/* NeoMagic NM2380              */
-#define FB_ACCEL_PXA3XX		 99	/* PXA3xx			*/
-
-#define FB_ACCEL_SAVAGE4        0x80	/* S3 Savage4                   */
-#define FB_ACCEL_SAVAGE3D       0x81	/* S3 Savage3D                  */
-#define FB_ACCEL_SAVAGE3D_MV    0x82	/* S3 Savage3D-MV               */
-#define FB_ACCEL_SAVAGE2000     0x83	/* S3 Savage2000                */
-#define FB_ACCEL_SAVAGE_MX_MV   0x84	/* S3 Savage/MX-MV              */
-#define FB_ACCEL_SAVAGE_MX      0x85	/* S3 Savage/MX                 */
-#define FB_ACCEL_SAVAGE_IX_MV   0x86	/* S3 Savage/IX-MV              */
-#define FB_ACCEL_SAVAGE_IX      0x87	/* S3 Savage/IX                 */
-#define FB_ACCEL_PROSAVAGE_PM   0x88	/* S3 ProSavage PM133           */
-#define FB_ACCEL_PROSAVAGE_KM   0x89	/* S3 ProSavage KM133           */
-#define FB_ACCEL_S3TWISTER_P    0x8a	/* S3 Twister                   */
-#define FB_ACCEL_S3TWISTER_K    0x8b	/* S3 TwisterK                  */
-#define FB_ACCEL_SUPERSAVAGE    0x8c    /* S3 Supersavage               */
-#define FB_ACCEL_PROSAVAGE_DDR  0x8d	/* S3 ProSavage DDR             */
-#define FB_ACCEL_PROSAVAGE_DDRK 0x8e	/* S3 ProSavage DDR-K           */
-
-#define FB_ACCEL_PUV3_UNIGFX	0xa0	/* PKUnity-v3 Unigfx		*/
-
-#define FB_CAP_FOURCC		1	/* Device supports FOURCC-based formats */
-
-struct fb_fix_screeninfo {
-	char id[16];			/* identification string eg "TT Builtin" */
-	unsigned long smem_start;	/* Start of frame buffer mem */
-					/* (physical address) */
-	__u32 smem_len;			/* Length of frame buffer mem */
-	__u32 type;			/* see FB_TYPE_*		*/
-	__u32 type_aux;			/* Interleave for interleaved Planes */
-	__u32 visual;			/* see FB_VISUAL_*		*/ 
-	__u16 xpanstep;			/* zero if no hardware panning  */
-	__u16 ypanstep;			/* zero if no hardware panning  */
-	__u16 ywrapstep;		/* zero if no hardware ywrap    */
-	__u32 line_length;		/* length of a line in bytes    */
-	unsigned long mmio_start;	/* Start of Memory Mapped I/O   */
-					/* (physical address) */
-	__u32 mmio_len;			/* Length of Memory Mapped I/O  */
-	__u32 accel;			/* Indicate to driver which	*/
-					/*  specific chip/card we have	*/
-	__u16 capabilities;		/* see FB_CAP_*			*/
-	__u16 reserved[2];		/* Reserved for future compatibility */
-};
-
-/* Interpretation of offset for color fields: All offsets are from the right,
- * inside a "pixel" value, which is exactly 'bits_per_pixel' wide (means: you
- * can use the offset as right argument to <<). A pixel afterwards is a bit
- * stream and is written to video memory as that unmodified.
- *
- * For pseudocolor: offset and length should be the same for all color
- * components. Offset specifies the position of the least significant bit
- * of the pallette index in a pixel value. Length indicates the number
- * of available palette entries (i.e. # of entries = 1 << length).
- */
-struct fb_bitfield {
-	__u32 offset;			/* beginning of bitfield	*/
-	__u32 length;			/* length of bitfield		*/
-	__u32 msb_right;		/* != 0 : Most significant bit is */ 
-					/* right */ 
-};
-
-#define FB_NONSTD_HAM		1	/* Hold-And-Modify (HAM)        */
-#define FB_NONSTD_REV_PIX_IN_B	2	/* order of pixels in each byte is reversed */
-
-#define FB_ACTIVATE_NOW		0	/* set values immediately (or vbl)*/
-#define FB_ACTIVATE_NXTOPEN	1	/* activate on next open	*/
-#define FB_ACTIVATE_TEST	2	/* don't set, round up impossible */
-#define FB_ACTIVATE_MASK       15
-					/* values			*/
-#define FB_ACTIVATE_VBL	       16	/* activate values on next vbl  */
-#define FB_CHANGE_CMAP_VBL     32	/* change colormap on vbl	*/
-#define FB_ACTIVATE_ALL	       64	/* change all VCs on this fb	*/
-#define FB_ACTIVATE_FORCE     128	/* force apply even when no change*/
-#define FB_ACTIVATE_INV_MODE  256       /* invalidate videomode */
-
-#define FB_ACCELF_TEXT		1	/* (OBSOLETE) see fb_info.flags and vc_mode */
-
-#define FB_SYNC_HOR_HIGH_ACT	1	/* horizontal sync high active	*/
-#define FB_SYNC_VERT_HIGH_ACT	2	/* vertical sync high active	*/
-#define FB_SYNC_EXT		4	/* external sync		*/
-#define FB_SYNC_COMP_HIGH_ACT	8	/* composite sync high active   */
-#define FB_SYNC_BROADCAST	16	/* broadcast video timings      */
-					/* vtotal = 144d/288n/576i => PAL  */
-					/* vtotal = 121d/242n/484i => NTSC */
-#define FB_SYNC_ON_GREEN	32	/* sync on green */
-
-#define FB_VMODE_NONINTERLACED  0	/* non interlaced */
-#define FB_VMODE_INTERLACED	1	/* interlaced	*/
-#define FB_VMODE_DOUBLE		2	/* double scan */
-#define FB_VMODE_ODD_FLD_FIRST	4	/* interlaced: top line first */
-#define FB_VMODE_MASK		255
-
-#define FB_VMODE_YWRAP		256	/* ywrap instead of panning     */
-#define FB_VMODE_SMOOTH_XPAN	512	/* smooth xpan possible (internally used) */
-#define FB_VMODE_CONUPDATE	512	/* don't update x/yoffset	*/
-
-/*
- * Display rotation support
- */
-#define FB_ROTATE_UR      0
-#define FB_ROTATE_CW      1
-#define FB_ROTATE_UD      2
-#define FB_ROTATE_CCW     3
-
-#define PICOS2KHZ(a) (1000000000UL/(a))
-#define KHZ2PICOS(a) (1000000000UL/(a))
-
-struct fb_var_screeninfo {
-	__u32 xres;			/* visible resolution		*/
-	__u32 yres;
-	__u32 xres_virtual;		/* virtual resolution		*/
-	__u32 yres_virtual;
-	__u32 xoffset;			/* offset from virtual to visible */
-	__u32 yoffset;			/* resolution			*/
-
-	__u32 bits_per_pixel;		/* guess what			*/
-	__u32 grayscale;		/* 0 = color, 1 = grayscale,	*/
-					/* >1 = FOURCC			*/
-	struct fb_bitfield red;		/* bitfield in fb mem if true color, */
-	struct fb_bitfield green;	/* else only length is significant */
-	struct fb_bitfield blue;
-	struct fb_bitfield transp;	/* transparency			*/	
-
-	__u32 nonstd;			/* != 0 Non standard pixel format */
-
-	__u32 activate;			/* see FB_ACTIVATE_*		*/
-
-	__u32 height;			/* height of picture in mm    */
-	__u32 width;			/* width of picture in mm     */
-
-	__u32 accel_flags;		/* (OBSOLETE) see fb_info.flags */
-
-	/* Timing: All values in pixclocks, except pixclock (of course) */
-	__u32 pixclock;			/* pixel clock in ps (pico seconds) */
-	__u32 left_margin;		/* time from sync to picture	*/
-	__u32 right_margin;		/* time from picture to sync	*/
-	__u32 upper_margin;		/* time from sync to picture	*/
-	__u32 lower_margin;
-	__u32 hsync_len;		/* length of horizontal sync	*/
-	__u32 vsync_len;		/* length of vertical sync	*/
-	__u32 sync;			/* see FB_SYNC_*		*/
-	__u32 vmode;			/* see FB_VMODE_*		*/
-	__u32 rotate;			/* angle we rotate counter clockwise */
-	__u32 colorspace;		/* colorspace for FOURCC-based modes */
-	__u32 reserved[4];		/* Reserved for future compatibility */
-};
-
-struct fb_cmap {
-	__u32 start;			/* First entry	*/
-	__u32 len;			/* Number of entries */
-	__u16 *red;			/* Red values	*/
-	__u16 *green;
-	__u16 *blue;
-	__u16 *transp;			/* transparency, can be NULL */
-};
-
-struct fb_con2fbmap {
-	__u32 console;
-	__u32 framebuffer;
-};
-
-/* VESA Blanking Levels */
-#define VESA_NO_BLANKING        0
-#define VESA_VSYNC_SUSPEND      1
-#define VESA_HSYNC_SUSPEND      2
-#define VESA_POWERDOWN          3
-
-
-enum {
-	/* screen: unblanked, hsync: on,  vsync: on */
-	FB_BLANK_UNBLANK       = VESA_NO_BLANKING,
-
-	/* screen: blanked,   hsync: on,  vsync: on */
-	FB_BLANK_NORMAL        = VESA_NO_BLANKING + 1,
-
-	/* screen: blanked,   hsync: on,  vsync: off */
-	FB_BLANK_VSYNC_SUSPEND = VESA_VSYNC_SUSPEND + 1,
-
-	/* screen: blanked,   hsync: off, vsync: on */
-	FB_BLANK_HSYNC_SUSPEND = VESA_HSYNC_SUSPEND + 1,
-
-	/* screen: blanked,   hsync: off, vsync: off */
-	FB_BLANK_POWERDOWN     = VESA_POWERDOWN + 1
-};
-
-#define FB_VBLANK_VBLANKING	0x001	/* currently in a vertical blank */
-#define FB_VBLANK_HBLANKING	0x002	/* currently in a horizontal blank */
-#define FB_VBLANK_HAVE_VBLANK	0x004	/* vertical blanks can be detected */
-#define FB_VBLANK_HAVE_HBLANK	0x008	/* horizontal blanks can be detected */
-#define FB_VBLANK_HAVE_COUNT	0x010	/* global retrace counter is available */
-#define FB_VBLANK_HAVE_VCOUNT	0x020	/* the vcount field is valid */
-#define FB_VBLANK_HAVE_HCOUNT	0x040	/* the hcount field is valid */
-#define FB_VBLANK_VSYNCING	0x080	/* currently in a vsync */
-#define FB_VBLANK_HAVE_VSYNC	0x100	/* verical syncs can be detected */
-
-struct fb_vblank {
-	__u32 flags;			/* FB_VBLANK flags */
-	__u32 count;			/* counter of retraces since boot */
-	__u32 vcount;			/* current scanline position */
-	__u32 hcount;			/* current scandot position */
-	__u32 reserved[4];		/* reserved for future compatibility */
-};
-
-/* Internal HW accel */
-#define ROP_COPY 0
-#define ROP_XOR  1
-
-struct fb_copyarea {
-	__u32 dx;
-	__u32 dy;
-	__u32 width;
-	__u32 height;
-	__u32 sx;
-	__u32 sy;
-};
-
-struct fb_fillrect {
-	__u32 dx;	/* screen-relative */
-	__u32 dy;
-	__u32 width;
-	__u32 height;
-	__u32 color;
-	__u32 rop;
-};
-
-struct fb_image {
-	__u32 dx;		/* Where to place image */
-	__u32 dy;
-	__u32 width;		/* Size of image */
-	__u32 height;
-	__u32 fg_color;		/* Only used when a mono bitmap */
-	__u32 bg_color;
-	__u8  depth;		/* Depth of the image */
-	const char *data;	/* Pointer to image data */
-	struct fb_cmap cmap;	/* color map info */
-};
-
-/*
- * hardware cursor control
- */
-
-#define FB_CUR_SETIMAGE 0x01
-#define FB_CUR_SETPOS   0x02
-#define FB_CUR_SETHOT   0x04
-#define FB_CUR_SETCMAP  0x08
-#define FB_CUR_SETSHAPE 0x10
-#define FB_CUR_SETSIZE	0x20
-#define FB_CUR_SETALL   0xFF
-
-struct fbcurpos {
-	__u16 x, y;
-};
-
-struct fb_cursor {
-	__u16 set;		/* what to set */
-	__u16 enable;		/* cursor on/off */
-	__u16 rop;		/* bitop operation */
-	const char *mask;	/* cursor mask bits */
-	struct fbcurpos hot;	/* cursor hot spot */
-	struct fb_image	image;	/* Cursor image */
-};
-
-#ifdef CONFIG_FB_BACKLIGHT
-/* Settings for the generic backlight code */
-#define FB_BACKLIGHT_LEVELS	128
-#define FB_BACKLIGHT_MAX	0xFF
-#endif
-
-
-#endif /* _LINUX_FB_H */
diff --git a/openflow/usr/include/linux/fcntl.h b/openflow/usr/include/linux/fcntl.h
deleted file mode 100644
index 01379c5..0000000
--- a/openflow/usr/include/linux/fcntl.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef _LINUX_FCNTL_H
-#define _LINUX_FCNTL_H
-
-#include <asm/fcntl.h>
-
-#define F_SETLEASE	(F_LINUX_SPECIFIC_BASE + 0)
-#define F_GETLEASE	(F_LINUX_SPECIFIC_BASE + 1)
-
-/*
- * Cancel a blocking posix lock; internal use only until we expose an
- * asynchronous lock api to userspace:
- */
-#define F_CANCELLK	(F_LINUX_SPECIFIC_BASE + 5)
-
-/* Create a file descriptor with FD_CLOEXEC set. */
-#define F_DUPFD_CLOEXEC	(F_LINUX_SPECIFIC_BASE + 6)
-
-/*
- * Request nofications on a directory.
- * See below for events that may be notified.
- */
-#define F_NOTIFY	(F_LINUX_SPECIFIC_BASE+2)
-
-/*
- * Set and get of pipe page size array
- */
-#define F_SETPIPE_SZ	(F_LINUX_SPECIFIC_BASE + 7)
-#define F_GETPIPE_SZ	(F_LINUX_SPECIFIC_BASE + 8)
-
-/*
- * Set/Get seals
- */
-#define F_ADD_SEALS	(F_LINUX_SPECIFIC_BASE + 9)
-#define F_GET_SEALS	(F_LINUX_SPECIFIC_BASE + 10)
-
-/*
- * Types of seals
- */
-#define F_SEAL_SEAL	0x0001	/* prevent further seals from being set */
-#define F_SEAL_SHRINK	0x0002	/* prevent file from shrinking */
-#define F_SEAL_GROW	0x0004	/* prevent file from growing */
-#define F_SEAL_WRITE	0x0008	/* prevent writes */
-/* (1U << 31) is reserved for signed error codes */
-
-/*
- * Types of directory notifications that may be requested.
- */
-#define DN_ACCESS	0x00000001	/* File accessed */
-#define DN_MODIFY	0x00000002	/* File modified */
-#define DN_CREATE	0x00000004	/* File created */
-#define DN_DELETE	0x00000008	/* File removed */
-#define DN_RENAME	0x00000010	/* File renamed */
-#define DN_ATTRIB	0x00000020	/* File changed attibutes */
-#define DN_MULTISHOT	0x80000000	/* Don't remove notifier */
-
-#define AT_FDCWD		-100    /* Special value used to indicate
-                                           openat should use the current
-                                           working directory. */
-#define AT_SYMLINK_NOFOLLOW	0x100   /* Do not follow symbolic links.  */
-#define AT_REMOVEDIR		0x200   /* Remove directory instead of
-                                           unlinking file.  */
-#define AT_SYMLINK_FOLLOW	0x400   /* Follow symbolic links.  */
-#define AT_NO_AUTOMOUNT		0x800	/* Suppress terminal automount traversal */
-#define AT_EMPTY_PATH		0x1000	/* Allow empty relative pathname */
-
-
-#endif /* _LINUX_FCNTL_H */
diff --git a/openflow/usr/include/linux/fd.h b/openflow/usr/include/linux/fd.h
deleted file mode 100644
index 06975d7..0000000
--- a/openflow/usr/include/linux/fd.h
+++ /dev/null
@@ -1,383 +0,0 @@
-#ifndef _LINUX_FD_H
-#define _LINUX_FD_H
-
-#include <linux/ioctl.h>
-
-
-/* New file layout: Now the ioctl definitions immediately follow the
- * definitions of the structures that they use */
-
-/*
- * Geometry
- */
-struct floppy_struct {
-	unsigned int	size,		/* nr of sectors total */
-			sect,		/* sectors per track */
-			head,		/* nr of heads */
-			track,		/* nr of tracks */
-			stretch;	/* bit 0 !=0 means double track steps */
-					/* bit 1 != 0 means swap sides */
-					/* bits 2..9 give the first sector */
-					/*  number (the LSB is flipped) */
-#define FD_STRETCH 1
-#define FD_SWAPSIDES 2
-#define FD_ZEROBASED 4
-#define FD_SECTBASEMASK 0x3FC
-#define FD_MKSECTBASE(s) (((s) ^ 1) << 2)
-#define FD_SECTBASE(floppy) ((((floppy)->stretch & FD_SECTBASEMASK) >> 2) ^ 1)
-
-	unsigned char	gap,		/* gap1 size */
-
-			rate,		/* data rate. |= 0x40 for perpendicular */
-#define FD_2M 0x4
-#define FD_SIZECODEMASK 0x38
-#define FD_SIZECODE(floppy) (((((floppy)->rate&FD_SIZECODEMASK)>> 3)+ 2) %8)
-#define FD_SECTSIZE(floppy) ( (floppy)->rate & FD_2M ? \
-			     512 : 128 << FD_SIZECODE(floppy) )
-#define FD_PERP 0x40
-
-			spec1,		/* stepping rate, head unload time */
-			fmt_gap;	/* gap2 size */
-	const char	* name; /* used only for predefined formats */
-};
-
-
-/* commands needing write access have 0x40 set */
-/* commands needing super user access have 0x80 set */
-
-#define FDCLRPRM _IO(2, 0x41)
-/* clear user-defined parameters */
-
-#define FDSETPRM _IOW(2, 0x42, struct floppy_struct) 
-#define FDSETMEDIAPRM FDSETPRM
-/* set user-defined parameters for current media */
-
-#define FDDEFPRM _IOW(2, 0x43, struct floppy_struct) 
-#define FDGETPRM _IOR(2, 0x04, struct floppy_struct)
-#define FDDEFMEDIAPRM FDDEFPRM
-#define FDGETMEDIAPRM FDGETPRM
-/* set/get disk parameters */
-
-
-#define	FDMSGON  _IO(2,0x45)
-#define	FDMSGOFF _IO(2,0x46)
-/* issue/don't issue kernel messages on media type change */
-
-
-/* 
- * Formatting (obsolete)
- */
-#define FD_FILL_BYTE 0xF6 /* format fill byte. */
-
-struct format_descr {
-	unsigned int device,head,track;
-};
-
-#define FDFMTBEG _IO(2,0x47)
-/* begin formatting a disk */
-#define	FDFMTTRK _IOW(2,0x48, struct format_descr)
-/* format the specified track */
-#define FDFMTEND _IO(2,0x49)
-/* end formatting a disk */
-
-
-/*
- * Error thresholds
- */
-struct floppy_max_errors {
-	unsigned int
-	  abort,      /* number of errors to be reached before aborting */
-	  read_track, /* maximal number of errors permitted to read an
-		       * entire track at once */
-	  reset,      /* maximal number of errors before a reset is tried */
-	  recal,      /* maximal number of errors before a recalibrate is
-		       * tried */
-
-	  /*
-	   * Threshold for reporting FDC errors to the console.
-	   * Setting this to zero may flood your screen when using
-	   * ultra cheap floppies ;-)
-	   */
-	  reporting;
-
-};
-
-#define FDSETEMSGTRESH	_IO(2,0x4a)
-/* set fdc error reporting threshold */
-
-#define FDFLUSH  _IO(2,0x4b)
-/* flush buffers for media; either for verifying media, or for
- * handling a media change without closing the file descriptor */
-
-#define FDSETMAXERRS _IOW(2, 0x4c, struct floppy_max_errors)
-#define FDGETMAXERRS _IOR(2, 0x0e, struct floppy_max_errors)
-/* set/get abortion and read_track threshold. See also floppy_drive_params
- * structure */
-
-
-typedef char floppy_drive_name[16];
-#define FDGETDRVTYP _IOR(2, 0x0f, floppy_drive_name)
-/* get drive type: 5 1/4 or 3 1/2 */
-
-
-/*
- * Drive parameters (user modifiable)
- */
-struct floppy_drive_params {
-	signed char cmos;		/* CMOS type */
-	
-	/* Spec2 is (HLD<<1 | ND), where HLD is head load time (1=2ms, 2=4 ms 
-	 * etc) and ND is set means no DMA. Hardcoded to 6 (HLD=6ms, use DMA).
-	 */
-	unsigned long max_dtr;		/* Step rate, usec */
-	unsigned long hlt;     		/* Head load/settle time, msec */
-	unsigned long hut;     		/* Head unload time (remnant of 
-					 * 8" drives) */
-	unsigned long srt;     		/* Step rate, usec */
-
-	unsigned long spinup;		/* time needed for spinup (expressed
-					 * in jiffies) */
-	unsigned long spindown;		/* timeout needed for spindown */
-	unsigned char spindown_offset;	/* decides in which position the disk
-					 * will stop */
-	unsigned char select_delay;	/* delay to wait after select */
-	unsigned char rps;		/* rotations per second */
-	unsigned char tracks;		/* maximum number of tracks */
-	unsigned long timeout;		/* timeout for interrupt requests */
-	
-	unsigned char interleave_sect;	/* if there are more sectors, use 
-					 * interleave */
-	
-	struct floppy_max_errors max_errors;
-	
-	char flags;			/* various flags, including ftd_msg */
-/*
- * Announce successful media type detection and media information loss after
- * disk changes.
- * Also used to enable/disable printing of overrun warnings.
- */
-
-#define FTD_MSG 0x10
-#define FD_BROKEN_DCL 0x20
-#define FD_DEBUG 0x02
-#define FD_SILENT_DCL_CLEAR 0x4
-#define FD_INVERTED_DCL 0x80 /* must be 0x80, because of hardware 
-				considerations */
-
-	char read_track;		/* use readtrack during probing? */
-
-/*
- * Auto-detection. Each drive type has eight formats which are
- * used in succession to try to read the disk. If the FDC cannot lock onto
- * the disk, the next format is tried. This uses the variable 'probing'.
- */
-	short autodetect[8];		/* autodetected formats */
-	
-	int checkfreq; /* how often should the drive be checked for disk 
-			* changes */
-	int native_format; /* native format of this drive */
-};
-
-enum {
-	FD_NEED_TWADDLE_BIT,	/* more magic */
-	FD_VERIFY_BIT,		/* inquire for write protection */
-	FD_DISK_NEWCHANGE_BIT,	/* change detected, and no action undertaken yet
-				 * to clear media change status */
-	FD_UNUSED_BIT,
-	FD_DISK_CHANGED_BIT,	/* disk has been changed since last i/o */
-	FD_DISK_WRITABLE_BIT,	/* disk is writable */
-	FD_OPEN_SHOULD_FAIL_BIT
-};
-
-#define FDSETDRVPRM _IOW(2, 0x90, struct floppy_drive_params)
-#define FDGETDRVPRM _IOR(2, 0x11, struct floppy_drive_params)
-/* set/get drive parameters */
-
-
-/*
- * Current drive state (not directly modifiable by user, readonly)
- */
-struct floppy_drive_struct {
-	unsigned long flags;
-/* values for these flags */
-#define FD_NEED_TWADDLE (1 << FD_NEED_TWADDLE_BIT)
-#define FD_VERIFY (1 << FD_VERIFY_BIT)
-#define FD_DISK_NEWCHANGE (1 << FD_DISK_NEWCHANGE_BIT)
-#define FD_DISK_CHANGED (1 << FD_DISK_CHANGED_BIT)
-#define FD_DISK_WRITABLE (1 << FD_DISK_WRITABLE_BIT)
-
-	unsigned long spinup_date;
-	unsigned long select_date;
-	unsigned long first_read_date;
-	short probed_format;
-	short track; /* current track */
-	short maxblock; /* id of highest block read */
-	short maxtrack; /* id of highest half track read */
-	int generation; /* how many diskchanges? */
-
-/*
- * (User-provided) media information is _not_ discarded after a media change
- * if the corresponding keep_data flag is non-zero. Positive values are
- * decremented after each probe.
- */
-	int keep_data;
-	
-	/* Prevent "aliased" accesses. */
-	int fd_ref;
-	int fd_device;
-	unsigned long last_checked; /* when was the drive last checked for a disk 
-			   * change? */
-	
-	char *dmabuf;
-	int bufblocks;
-};
-
-#define FDGETDRVSTAT _IOR(2, 0x12, struct floppy_drive_struct)
-#define FDPOLLDRVSTAT _IOR(2, 0x13, struct floppy_drive_struct)
-/* get drive state: GET returns the cached state, POLL polls for new state */
-
-
-/*
- * reset FDC
- */
-enum reset_mode {
-	FD_RESET_IF_NEEDED,	/* reset only if the reset flags is set */
-	FD_RESET_IF_RAWCMD,	/* obsolete */
-	FD_RESET_ALWAYS		/* reset always */
-};
-#define FDRESET _IO(2, 0x54)
-
-
-/*
- * FDC state
- */
-struct floppy_fdc_state {	
-	int spec1;		/* spec1 value last used */
-	int spec2;		/* spec2 value last used */
-	int dtr;
-	unsigned char version;	/* FDC version code */
-	unsigned char dor;
-	unsigned long address;	/* io address */
-	unsigned int rawcmd:2;
-	unsigned int reset:1;
-	unsigned int need_configure:1;
-	unsigned int perp_mode:2;
-	unsigned int has_fifo:1;
-	unsigned int driver_version;	/* version code for floppy driver */
-#define FD_DRIVER_VERSION 0x100
-/* user programs using the floppy API should use floppy_fdc_state to
- * get the version number of the floppy driver that they are running
- * on. If this version number is bigger than the one compiled into the
- * user program (the FD_DRIVER_VERSION define), it should be prepared
- * to bigger structures
- */
-
-	unsigned char track[4];
-	/* Position of the heads of the 4 units attached to this FDC,
-	 * as stored on the FDC. In the future, the position as stored
-	 * on the FDC might not agree with the actual physical
-	 * position of these drive heads. By allowing such
-	 * disagreement, it will be possible to reset the FDC without
-	 * incurring the expensive cost of repositioning all heads.
-	 * Right now, these positions are hard wired to 0. */
-
-};
-
-#define FDGETFDCSTAT _IOR(2, 0x15, struct floppy_fdc_state)
-
-
-/*
- * Asynchronous Write error tracking
- */
-struct floppy_write_errors {
-	/* Write error logging.
-	 *
-	 * These fields can be cleared with the FDWERRORCLR ioctl.
-	 * Only writes that were attempted but failed due to a physical media
-	 * error are logged.  write(2) calls that fail and return an error code
-	 * to the user process are not counted.
-	 */
-
-	unsigned int write_errors;  /* number of physical write errors 
-				     * encountered */
-	
-	/* position of first and last write errors */
-	unsigned long first_error_sector;
-	int           first_error_generation;
-	unsigned long last_error_sector;
-	int           last_error_generation;
-	
-	unsigned int badness; /* highest retry count for a read or write 
-			       * operation */
-};
-
-#define FDWERRORCLR  _IO(2, 0x56)
-/* clear write error and badness information */
-#define FDWERRORGET  _IOR(2, 0x17, struct floppy_write_errors)
-/* get write error and badness information */
-
-
-/*
- * Raw commands
- */
-/* new interface flag: now we can do them in batches */
-#define FDHAVEBATCHEDRAWCMD
-
-struct floppy_raw_cmd {
-	unsigned int flags;
-#define FD_RAW_READ 1
-#define FD_RAW_WRITE 2
-#define FD_RAW_NO_MOTOR 4
-#define FD_RAW_DISK_CHANGE 4 /* out: disk change flag was set */
-#define FD_RAW_INTR 8    /* wait for an interrupt */
-#define FD_RAW_SPIN 0x10 /* spin up the disk for this command */
-#define FD_RAW_NO_MOTOR_AFTER 0x20 /* switch the motor off after command 
-				    * completion */
-#define FD_RAW_NEED_DISK 0x40  /* this command needs a disk to be present */
-#define FD_RAW_NEED_SEEK 0x80  /* this command uses an implied seek (soft) */
-
-/* more "in" flags */
-#define FD_RAW_MORE 0x100  /* more records follow */
-#define FD_RAW_STOP_IF_FAILURE 0x200 /* stop if we encounter a failure */
-#define FD_RAW_STOP_IF_SUCCESS 0x400 /* stop if command successful */
-#define FD_RAW_SOFTFAILURE 0x800 /* consider the return value for failure
-				  * detection too */
-
-/* more "out" flags */
-#define FD_RAW_FAILURE 0x10000 /* command sent to fdc, fdc returned error */
-#define FD_RAW_HARDFAILURE 0x20000 /* fdc had to be reset, or timed out */
-
-	void *data;
-	char *kernel_data; /* location of data buffer in the kernel */
-	struct floppy_raw_cmd *next; /* used for chaining of raw cmd's 
-				      * within the kernel */
-	long length; /* in: length of dma transfer. out: remaining bytes */
-	long phys_length; /* physical length, if different from dma length */
-	int buffer_length; /* length of allocated buffer */
-
-	unsigned char rate;
-	unsigned char cmd_count;
-	unsigned char cmd[16];
-	unsigned char reply_count;
-	unsigned char reply[16];
-	int track;
-	int resultcode;
-
-	int reserved1;
-	int reserved2;
-};
-
-#define FDRAWCMD _IO(2, 0x58)
-/* send a raw command to the fdc. Structure size not included, because of
- * batches */
-
-#define FDTWADDLE _IO(2, 0x59)
-/* flicker motor-on bit before reading a sector. Experimental */
-
-
-#define FDEJECT _IO(2, 0x5a)
-/* eject the disk */
-
-
-
-#endif /* _LINUX_FD_H */
diff --git a/openflow/usr/include/linux/fdreg.h b/openflow/usr/include/linux/fdreg.h
deleted file mode 100644
index 61ce641..0000000
--- a/openflow/usr/include/linux/fdreg.h
+++ /dev/null
@@ -1,137 +0,0 @@
-#ifndef _LINUX_FDREG_H
-#define _LINUX_FDREG_H
-/*
- * This file contains some defines for the floppy disk controller.
- * Various sources. Mostly "IBM Microcomputers: A Programmers
- * Handbook", Sanches and Canton.
- */
-
-#ifdef FDPATCHES
-#define FD_IOPORT fdc_state[fdc].address
-#else
-/* It would be a lot saner just to force fdc_state[fdc].address to always
-   be set ! FIXME */
-#define FD_IOPORT 0x3f0
-#endif
-
-/* Fd controller regs. S&C, about page 340 */
-#define FD_STATUS	(4 + FD_IOPORT )
-#define FD_DATA		(5 + FD_IOPORT )
-
-/* Digital Output Register */
-#define FD_DOR		(2 + FD_IOPORT )
-
-/* Digital Input Register (read) */
-#define FD_DIR		(7 + FD_IOPORT )
-
-/* Diskette Control Register (write)*/
-#define FD_DCR		(7 + FD_IOPORT )
-
-/* Bits of main status register */
-#define STATUS_BUSYMASK	0x0F		/* drive busy mask */
-#define STATUS_BUSY	0x10		/* FDC busy */
-#define STATUS_DMA	0x20		/* 0- DMA mode */
-#define STATUS_DIR	0x40		/* 0- cpu->fdc */
-#define STATUS_READY	0x80		/* Data reg ready */
-
-/* Bits of FD_ST0 */
-#define ST0_DS		0x03		/* drive select mask */
-#define ST0_HA		0x04		/* Head (Address) */
-#define ST0_NR		0x08		/* Not Ready */
-#define ST0_ECE		0x10		/* Equipment check error */
-#define ST0_SE		0x20		/* Seek end */
-#define ST0_INTR	0xC0		/* Interrupt code mask */
-
-/* Bits of FD_ST1 */
-#define ST1_MAM		0x01		/* Missing Address Mark */
-#define ST1_WP		0x02		/* Write Protect */
-#define ST1_ND		0x04		/* No Data - unreadable */
-#define ST1_OR		0x10		/* OverRun */
-#define ST1_CRC		0x20		/* CRC error in data or addr */
-#define ST1_EOC		0x80		/* End Of Cylinder */
-
-/* Bits of FD_ST2 */
-#define ST2_MAM		0x01		/* Missing Address Mark (again) */
-#define ST2_BC		0x02		/* Bad Cylinder */
-#define ST2_SNS		0x04		/* Scan Not Satisfied */
-#define ST2_SEH		0x08		/* Scan Equal Hit */
-#define ST2_WC		0x10		/* Wrong Cylinder */
-#define ST2_CRC		0x20		/* CRC error in data field */
-#define ST2_CM		0x40		/* Control Mark = deleted */
-
-/* Bits of FD_ST3 */
-#define ST3_HA		0x04		/* Head (Address) */
-#define ST3_DS		0x08		/* drive is double-sided */
-#define ST3_TZ		0x10		/* Track Zero signal (1=track 0) */
-#define ST3_RY		0x20		/* drive is ready */
-#define ST3_WP		0x40		/* Write Protect */
-#define ST3_FT		0x80		/* Drive Fault */
-
-/* Values for FD_COMMAND */
-#define FD_RECALIBRATE		0x07	/* move to track 0 */
-#define FD_SEEK			0x0F	/* seek track */
-#define FD_READ			0xE6	/* read with MT, MFM, SKip deleted */
-#define FD_WRITE		0xC5	/* write with MT, MFM */
-#define FD_SENSEI		0x08	/* Sense Interrupt Status */
-#define FD_SPECIFY		0x03	/* specify HUT etc */
-#define FD_FORMAT		0x4D	/* format one track */
-#define FD_VERSION		0x10	/* get version code */
-#define FD_CONFIGURE		0x13	/* configure FIFO operation */
-#define FD_PERPENDICULAR	0x12	/* perpendicular r/w mode */
-#define FD_GETSTATUS		0x04	/* read ST3 */
-#define FD_DUMPREGS		0x0E	/* dump the contents of the fdc regs */
-#define FD_READID		0xEA	/* prints the header of a sector */
-#define FD_UNLOCK		0x14	/* Fifo config unlock */
-#define FD_LOCK			0x94	/* Fifo config lock */
-#define FD_RSEEK_OUT		0x8f	/* seek out (i.e. to lower tracks) */
-#define FD_RSEEK_IN		0xcf	/* seek in (i.e. to higher tracks) */
-
-/* the following commands are new in the 82078. They are not used in the
- * floppy driver, except the first three. These commands may be useful for apps
- * which use the FDRAWCMD interface. For doc, get the 82078 spec sheets at
- * http://www.intel.com/design/archives/periphrl/docs/29046803.htm */
-
-#define FD_PARTID		0x18	/* part id ("extended" version cmd) */
-#define FD_SAVE			0x2e	/* save fdc regs for later restore */
-#define FD_DRIVESPEC		0x8e	/* drive specification: Access to the
-					 * 2 Mbps data transfer rate for tape
-					 * drives */
-
-#define FD_RESTORE		0x4e    /* later restore */
-#define FD_POWERDOWN		0x27	/* configure FDC's powersave features */
-#define FD_FORMAT_N_WRITE	0xef    /* format and write in one go. */
-#define FD_OPTION		0x33	/* ISO format (which is a clean way to
-					 * pack more sectors on a track) */
-
-/* DMA commands */
-#define DMA_READ	0x46
-#define DMA_WRITE	0x4A
-
-/* FDC version return types */
-#define FDC_NONE	0x00
-#define FDC_UNKNOWN	0x10	/* DO NOT USE THIS TYPE EXCEPT IF IDENTIFICATION
-				   FAILS EARLY */
-#define FDC_8272A	0x20	/* Intel 8272a, NEC 765 */
-#define FDC_765ED	0x30	/* Non-Intel 1MB-compatible FDC, can't detect */
-#define FDC_82072	0x40	/* Intel 82072; 8272a + FIFO + DUMPREGS */
-#define FDC_82072A	0x45	/* 82072A (on Sparcs) */
-#define FDC_82077_ORIG	0x51	/* Original version of 82077AA, sans LOCK */
-#define FDC_82077	0x52	/* 82077AA-1 */
-#define FDC_82078_UNKN	0x5f	/* Unknown 82078 variant */
-#define FDC_82078	0x60	/* 44pin 82078 or 64pin 82078SL */
-#define FDC_82078_1	0x61	/* 82078-1 (2Mbps fdc) */
-#define FDC_S82078B	0x62	/* S82078B (first seen on Adaptec AVA-2825 VLB
-				 * SCSI/EIDE/Floppy controller) */
-#define FDC_87306	0x63	/* National Semiconductor PC 87306 */
-
-/*
- * Beware: the fdc type list is roughly sorted by increasing features.
- * Presence of features is tested by comparing the FDC version id with the
- * "oldest" version that has the needed feature.
- * If during FDC detection, an obscure test fails late in the sequence, don't
- * assign FDC_UNKNOWN. Else the FDC will be treated as a dumb 8272a, or worse.
- * This is especially true if the tests are unneeded.
- */
-
-#define FD_RESET_DELAY 20
-#endif
diff --git a/openflow/usr/include/linux/fib_rules.h b/openflow/usr/include/linux/fib_rules.h
deleted file mode 100644
index 96161b8..0000000
--- a/openflow/usr/include/linux/fib_rules.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef __LINUX_FIB_RULES_H
-#define __LINUX_FIB_RULES_H
-
-#include <linux/types.h>
-#include <linux/rtnetlink.h>
-
-/* rule is permanent, and cannot be deleted */
-#define FIB_RULE_PERMANENT	0x00000001
-#define FIB_RULE_INVERT		0x00000002
-#define FIB_RULE_UNRESOLVED	0x00000004
-#define FIB_RULE_IIF_DETACHED	0x00000008
-#define FIB_RULE_DEV_DETACHED	FIB_RULE_IIF_DETACHED
-#define FIB_RULE_OIF_DETACHED	0x00000010
-
-/* try to find source address in routing lookups */
-#define FIB_RULE_FIND_SADDR	0x00010000
-
-struct fib_rule_hdr {
-	__u8		family;
-	__u8		dst_len;
-	__u8		src_len;
-	__u8		tos;
-
-	__u8		table;
-	__u8		res1;	/* reserved */
-	__u8		res2;	/* reserved */
-	__u8		action;
-
-	__u32		flags;
-};
-
-enum {
-	FRA_UNSPEC,
-	FRA_DST,	/* destination address */
-	FRA_SRC,	/* source address */
-	FRA_IIFNAME,	/* interface name */
-#define FRA_IFNAME	FRA_IIFNAME
-	FRA_GOTO,	/* target to jump to (FR_ACT_GOTO) */
-	FRA_UNUSED2,
-	FRA_PRIORITY,	/* priority/preference */
-	FRA_UNUSED3,
-	FRA_UNUSED4,
-	FRA_UNUSED5,
-	FRA_FWMARK,	/* mark */
-	FRA_FLOW,	/* flow/class id */
-	FRA_TUN_ID,
-	FRA_SUPPRESS_IFGROUP,
-	FRA_SUPPRESS_PREFIXLEN,
-	FRA_TABLE,	/* Extended table id */
-	FRA_FWMASK,	/* mask for netfilter mark */
-	FRA_OIFNAME,
-	__FRA_MAX
-};
-
-#define FRA_MAX (__FRA_MAX - 1)
-
-enum {
-	FR_ACT_UNSPEC,
-	FR_ACT_TO_TBL,		/* Pass to fixed table */
-	FR_ACT_GOTO,		/* Jump to another rule */
-	FR_ACT_NOP,		/* No operation */
-	FR_ACT_RES3,
-	FR_ACT_RES4,
-	FR_ACT_BLACKHOLE,	/* Drop without notification */
-	FR_ACT_UNREACHABLE,	/* Drop with ENETUNREACH */
-	FR_ACT_PROHIBIT,	/* Drop with EACCES */
-	__FR_ACT_MAX,
-};
-
-#define FR_ACT_MAX (__FR_ACT_MAX - 1)
-
-#endif
diff --git a/openflow/usr/include/linux/fiemap.h b/openflow/usr/include/linux/fiemap.h
deleted file mode 100644
index 0c51d61..0000000
--- a/openflow/usr/include/linux/fiemap.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * FS_IOC_FIEMAP ioctl infrastructure.
- *
- * Some portions copyright (C) 2007 Cluster File Systems, Inc
- *
- * Authors: Mark Fasheh <mfasheh@suse.com>
- *          Kalpak Shah <kalpak.shah@sun.com>
- *          Andreas Dilger <adilger@sun.com>
- */
-
-#ifndef _LINUX_FIEMAP_H
-#define _LINUX_FIEMAP_H
-
-#include <linux/types.h>
-
-struct fiemap_extent {
-	__u64 fe_logical;  /* logical offset in bytes for the start of
-			    * the extent from the beginning of the file */
-	__u64 fe_physical; /* physical offset in bytes for the start
-			    * of the extent from the beginning of the disk */
-	__u64 fe_length;   /* length in bytes for this extent */
-	__u64 fe_reserved64[2];
-	__u32 fe_flags;    /* FIEMAP_EXTENT_* flags for this extent */
-	__u32 fe_reserved[3];
-};
-
-struct fiemap {
-	__u64 fm_start;		/* logical offset (inclusive) at
-				 * which to start mapping (in) */
-	__u64 fm_length;	/* logical length of mapping which
-				 * userspace wants (in) */
-	__u32 fm_flags;		/* FIEMAP_FLAG_* flags for request (in/out) */
-	__u32 fm_mapped_extents;/* number of extents that were mapped (out) */
-	__u32 fm_extent_count;  /* size of fm_extents array (in) */
-	__u32 fm_reserved;
-	struct fiemap_extent fm_extents[0]; /* array of mapped extents (out) */
-};
-
-#define FIEMAP_MAX_OFFSET	(~0ULL)
-
-#define FIEMAP_FLAG_SYNC	0x00000001 /* sync file data before map */
-#define FIEMAP_FLAG_XATTR	0x00000002 /* map extended attribute tree */
-#define FIEMAP_FLAG_CACHE	0x00000004 /* request caching of the extents */
-
-#define FIEMAP_FLAGS_COMPAT	(FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR)
-
-#define FIEMAP_EXTENT_LAST		0x00000001 /* Last extent in file. */
-#define FIEMAP_EXTENT_UNKNOWN		0x00000002 /* Data location unknown. */
-#define FIEMAP_EXTENT_DELALLOC		0x00000004 /* Location still pending.
-						    * Sets EXTENT_UNKNOWN. */
-#define FIEMAP_EXTENT_ENCODED		0x00000008 /* Data can not be read
-						    * while fs is unmounted */
-#define FIEMAP_EXTENT_DATA_ENCRYPTED	0x00000080 /* Data is encrypted by fs.
-						    * Sets EXTENT_NO_BYPASS. */
-#define FIEMAP_EXTENT_NOT_ALIGNED	0x00000100 /* Extent offsets may not be
-						    * block aligned. */
-#define FIEMAP_EXTENT_DATA_INLINE	0x00000200 /* Data mixed with metadata.
-						    * Sets EXTENT_NOT_ALIGNED.*/
-#define FIEMAP_EXTENT_DATA_TAIL		0x00000400 /* Multiple files in block.
-						    * Sets EXTENT_NOT_ALIGNED.*/
-#define FIEMAP_EXTENT_UNWRITTEN		0x00000800 /* Space allocated, but
-						    * no data (i.e. zero). */
-#define FIEMAP_EXTENT_MERGED		0x00001000 /* File does not natively
-						    * support extents. Result
-						    * merged for efficiency. */
-#define FIEMAP_EXTENT_SHARED		0x00002000 /* Space shared with other
-						    * files. */
-
-#endif /* _LINUX_FIEMAP_H */
diff --git a/openflow/usr/include/linux/filter.h b/openflow/usr/include/linux/filter.h
deleted file mode 100644
index e4f2f74..0000000
--- a/openflow/usr/include/linux/filter.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Linux Socket Filter Data Structures
- */
-
-#ifndef __LINUX_FILTER_H__
-#define __LINUX_FILTER_H__
-
-
-#include <linux/types.h>
-#include <linux/bpf_common.h>
-
-/*
- * Current version of the filter code architecture.
- */
-#define BPF_MAJOR_VERSION 1
-#define BPF_MINOR_VERSION 1
-
-/*
- *	Try and keep these values and structures similar to BSD, especially
- *	the BPF code definitions which need to match so you can share filters
- */
- 
-struct sock_filter {	/* Filter block */
-	__u16	code;   /* Actual filter code */
-	__u8	jt;	/* Jump true */
-	__u8	jf;	/* Jump false */
-	__u32	k;      /* Generic multiuse field */
-};
-
-struct sock_fprog {	/* Required for SO_ATTACH_FILTER. */
-	unsigned short		len;	/* Number of filter blocks */
-	struct sock_filter *filter;
-};
-
-/* ret - BPF_K and BPF_X also apply */
-#define BPF_RVAL(code)  ((code) & 0x18)
-#define         BPF_A           0x10
-
-/* misc */
-#define BPF_MISCOP(code) ((code) & 0xf8)
-#define         BPF_TAX         0x00
-#define         BPF_TXA         0x80
-
-/*
- * Macros for filter block array initializers.
- */
-#ifndef BPF_STMT
-#define BPF_STMT(code, k) { (unsigned short)(code), 0, 0, k }
-#endif
-#ifndef BPF_JUMP
-#define BPF_JUMP(code, k, jt, jf) { (unsigned short)(code), jt, jf, k }
-#endif
-
-/*
- * Number of scratch memory words for: BPF_ST and BPF_STX
- */
-#define BPF_MEMWORDS 16
-
-/* RATIONALE. Negative offsets are invalid in BPF.
-   We use them to reference ancillary data.
-   Unlike introduction new instructions, it does not break
-   existing compilers/optimizers.
- */
-#define SKF_AD_OFF    (-0x1000)
-#define SKF_AD_PROTOCOL 0
-#define SKF_AD_PKTTYPE 	4
-#define SKF_AD_IFINDEX 	8
-#define SKF_AD_NLATTR	12
-#define SKF_AD_NLATTR_NEST	16
-#define SKF_AD_MARK 	20
-#define SKF_AD_QUEUE	24
-#define SKF_AD_HATYPE	28
-#define SKF_AD_RXHASH	32
-#define SKF_AD_CPU	36
-#define SKF_AD_ALU_XOR_X	40
-#define SKF_AD_VLAN_TAG	44
-#define SKF_AD_VLAN_TAG_PRESENT 48
-#define SKF_AD_PAY_OFFSET	52
-#define SKF_AD_RANDOM	56
-#define SKF_AD_VLAN_TPID	60
-#define SKF_AD_MAX	64
-
-#define SKF_NET_OFF	(-0x100000)
-#define SKF_LL_OFF	(-0x200000)
-
-#define BPF_NET_OFF	SKF_NET_OFF
-#define BPF_LL_OFF	SKF_LL_OFF
-
-#endif /* __LINUX_FILTER_H__ */
diff --git a/openflow/usr/include/linux/firewire-cdev.h b/openflow/usr/include/linux/firewire-cdev.h
deleted file mode 100644
index 1db453e..0000000
--- a/openflow/usr/include/linux/firewire-cdev.h
+++ /dev/null
@@ -1,1039 +0,0 @@
-/*
- * Char device interface.
- *
- * Copyright (C) 2005-2007  Kristian Hoegsberg <krh@bitplanet.net>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LINUX_FIREWIRE_CDEV_H
-#define _LINUX_FIREWIRE_CDEV_H
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-#include <linux/firewire-constants.h>
-
-/* available since kernel version 2.6.22 */
-#define FW_CDEV_EVENT_BUS_RESET				0x00
-#define FW_CDEV_EVENT_RESPONSE				0x01
-#define FW_CDEV_EVENT_REQUEST				0x02
-#define FW_CDEV_EVENT_ISO_INTERRUPT			0x03
-
-/* available since kernel version 2.6.30 */
-#define FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED		0x04
-#define FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED		0x05
-
-/* available since kernel version 2.6.36 */
-#define FW_CDEV_EVENT_REQUEST2				0x06
-#define FW_CDEV_EVENT_PHY_PACKET_SENT			0x07
-#define FW_CDEV_EVENT_PHY_PACKET_RECEIVED		0x08
-#define FW_CDEV_EVENT_ISO_INTERRUPT_MULTICHANNEL	0x09
-
-/**
- * struct fw_cdev_event_common - Common part of all fw_cdev_event_ types
- * @closure:	For arbitrary use by userspace
- * @type:	Discriminates the fw_cdev_event_ types
- *
- * This struct may be used to access generic members of all fw_cdev_event_
- * types regardless of the specific type.
- *
- * Data passed in the @closure field for a request will be returned in the
- * corresponding event.  It is big enough to hold a pointer on all platforms.
- * The ioctl used to set @closure depends on the @type of event.
- */
-struct fw_cdev_event_common {
-	__u64 closure;
-	__u32 type;
-};
-
-/**
- * struct fw_cdev_event_bus_reset - Sent when a bus reset occurred
- * @closure:	See &fw_cdev_event_common; set by %FW_CDEV_IOC_GET_INFO ioctl
- * @type:	See &fw_cdev_event_common; always %FW_CDEV_EVENT_BUS_RESET
- * @node_id:       New node ID of this node
- * @local_node_id: Node ID of the local node, i.e. of the controller
- * @bm_node_id:    Node ID of the bus manager
- * @irm_node_id:   Node ID of the iso resource manager
- * @root_node_id:  Node ID of the root node
- * @generation:    New bus generation
- *
- * This event is sent when the bus the device belongs to goes through a bus
- * reset.  It provides information about the new bus configuration, such as
- * new node ID for this device, new root ID, and others.
- *
- * If @bm_node_id is 0xffff right after bus reset it can be reread by an
- * %FW_CDEV_IOC_GET_INFO ioctl after bus manager selection was finished.
- * Kernels with ABI version < 4 do not set @bm_node_id.
- */
-struct fw_cdev_event_bus_reset {
-	__u64 closure;
-	__u32 type;
-	__u32 node_id;
-	__u32 local_node_id;
-	__u32 bm_node_id;
-	__u32 irm_node_id;
-	__u32 root_node_id;
-	__u32 generation;
-};
-
-/**
- * struct fw_cdev_event_response - Sent when a response packet was received
- * @closure:	See &fw_cdev_event_common; set by %FW_CDEV_IOC_SEND_REQUEST
- *		or %FW_CDEV_IOC_SEND_BROADCAST_REQUEST
- *		or %FW_CDEV_IOC_SEND_STREAM_PACKET ioctl
- * @type:	See &fw_cdev_event_common; always %FW_CDEV_EVENT_RESPONSE
- * @rcode:	Response code returned by the remote node
- * @length:	Data length, i.e. the response's payload size in bytes
- * @data:	Payload data, if any
- *
- * This event is sent when the stack receives a response to an outgoing request
- * sent by %FW_CDEV_IOC_SEND_REQUEST ioctl.  The payload data for responses
- * carrying data (read and lock responses) follows immediately and can be
- * accessed through the @data field.
- *
- * The event is also generated after conclusions of transactions that do not
- * involve response packets.  This includes unified write transactions,
- * broadcast write transactions, and transmission of asynchronous stream
- * packets.  @rcode indicates success or failure of such transmissions.
- */
-struct fw_cdev_event_response {
-	__u64 closure;
-	__u32 type;
-	__u32 rcode;
-	__u32 length;
-	__u32 data[0];
-};
-
-/**
- * struct fw_cdev_event_request - Old version of &fw_cdev_event_request2
- * @type:	See &fw_cdev_event_common; always %FW_CDEV_EVENT_REQUEST
- *
- * This event is sent instead of &fw_cdev_event_request2 if the kernel or
- * the client implements ABI version <= 3.  &fw_cdev_event_request lacks
- * essential information; use &fw_cdev_event_request2 instead.
- */
-struct fw_cdev_event_request {
-	__u64 closure;
-	__u32 type;
-	__u32 tcode;
-	__u64 offset;
-	__u32 handle;
-	__u32 length;
-	__u32 data[0];
-};
-
-/**
- * struct fw_cdev_event_request2 - Sent on incoming request to an address region
- * @closure:	See &fw_cdev_event_common; set by %FW_CDEV_IOC_ALLOCATE ioctl
- * @type:	See &fw_cdev_event_common; always %FW_CDEV_EVENT_REQUEST2
- * @tcode:	Transaction code of the incoming request
- * @offset:	The offset into the 48-bit per-node address space
- * @source_node_id: Sender node ID
- * @destination_node_id: Destination node ID
- * @card:	The index of the card from which the request came
- * @generation:	Bus generation in which the request is valid
- * @handle:	Reference to the kernel-side pending request
- * @length:	Data length, i.e. the request's payload size in bytes
- * @data:	Incoming data, if any
- *
- * This event is sent when the stack receives an incoming request to an address
- * region registered using the %FW_CDEV_IOC_ALLOCATE ioctl.  The request is
- * guaranteed to be completely contained in the specified region.  Userspace is
- * responsible for sending the response by %FW_CDEV_IOC_SEND_RESPONSE ioctl,
- * using the same @handle.
- *
- * The payload data for requests carrying data (write and lock requests)
- * follows immediately and can be accessed through the @data field.
- *
- * Unlike &fw_cdev_event_request, @tcode of lock requests is one of the
- * firewire-core specific %TCODE_LOCK_MASK_SWAP...%TCODE_LOCK_VENDOR_DEPENDENT,
- * i.e. encodes the extended transaction code.
- *
- * @card may differ from &fw_cdev_get_info.card because requests are received
- * from all cards of the Linux host.  @source_node_id, @destination_node_id, and
- * @generation pertain to that card.  Destination node ID and bus generation may
- * therefore differ from the corresponding fields of the last
- * &fw_cdev_event_bus_reset.
- *
- * @destination_node_id may also differ from the current node ID because of a
- * non-local bus ID part or in case of a broadcast write request.  Note, a
- * client must call an %FW_CDEV_IOC_SEND_RESPONSE ioctl even in case of a
- * broadcast write request; the kernel will then release the kernel-side pending
- * request but will not actually send a response packet.
- *
- * In case of a write request to FCP_REQUEST or FCP_RESPONSE, the kernel already
- * sent a write response immediately after the request was received; in this
- * case the client must still call an %FW_CDEV_IOC_SEND_RESPONSE ioctl to
- * release the kernel-side pending request, though another response won't be
- * sent.
- *
- * If the client subsequently needs to initiate requests to the sender node of
- * an &fw_cdev_event_request2, it needs to use a device file with matching
- * card index, node ID, and generation for outbound requests.
- */
-struct fw_cdev_event_request2 {
-	__u64 closure;
-	__u32 type;
-	__u32 tcode;
-	__u64 offset;
-	__u32 source_node_id;
-	__u32 destination_node_id;
-	__u32 card;
-	__u32 generation;
-	__u32 handle;
-	__u32 length;
-	__u32 data[0];
-};
-
-/**
- * struct fw_cdev_event_iso_interrupt - Sent when an iso packet was completed
- * @closure:	See &fw_cdev_event_common;
- *		set by %FW_CDEV_CREATE_ISO_CONTEXT ioctl
- * @type:	See &fw_cdev_event_common; always %FW_CDEV_EVENT_ISO_INTERRUPT
- * @cycle:	Cycle counter of the last completed packet
- * @header_length: Total length of following headers, in bytes
- * @header:	Stripped headers, if any
- *
- * This event is sent when the controller has completed an &fw_cdev_iso_packet
- * with the %FW_CDEV_ISO_INTERRUPT bit set, when explicitly requested with
- * %FW_CDEV_IOC_FLUSH_ISO, or when there have been so many completed packets
- * without the interrupt bit set that the kernel's internal buffer for @header
- * is about to overflow.  (In the last case, ABI versions < 5 drop header data
- * up to the next interrupt packet.)
- *
- * Isochronous transmit events (context type %FW_CDEV_ISO_CONTEXT_TRANSMIT):
- *
- * In version 3 and some implementations of version 2 of the ABI, &header_length
- * is a multiple of 4 and &header contains timestamps of all packets up until
- * the interrupt packet.  The format of the timestamps is as described below for
- * isochronous reception.  In version 1 of the ABI, &header_length was 0.
- *
- * Isochronous receive events (context type %FW_CDEV_ISO_CONTEXT_RECEIVE):
- *
- * The headers stripped of all packets up until and including the interrupt
- * packet are returned in the @header field.  The amount of header data per
- * packet is as specified at iso context creation by
- * &fw_cdev_create_iso_context.header_size.
- *
- * Hence, _interrupt.header_length / _context.header_size is the number of
- * packets received in this interrupt event.  The client can now iterate
- * through the mmap()'ed DMA buffer according to this number of packets and
- * to the buffer sizes as the client specified in &fw_cdev_queue_iso.
- *
- * Since version 2 of this ABI, the portion for each packet in _interrupt.header
- * consists of the 1394 isochronous packet header, followed by a timestamp
- * quadlet if &fw_cdev_create_iso_context.header_size > 4, followed by quadlets
- * from the packet payload if &fw_cdev_create_iso_context.header_size > 8.
- *
- * Format of 1394 iso packet header:  16 bits data_length, 2 bits tag, 6 bits
- * channel, 4 bits tcode, 4 bits sy, in big endian byte order.
- * data_length is the actual received size of the packet without the four
- * 1394 iso packet header bytes.
- *
- * Format of timestamp:  16 bits invalid, 3 bits cycleSeconds, 13 bits
- * cycleCount, in big endian byte order.
- *
- * In version 1 of the ABI, no timestamp quadlet was inserted; instead, payload
- * data followed directly after the 1394 is header if header_size > 4.
- * Behaviour of ver. 1 of this ABI is no longer available since ABI ver. 2.
- */
-struct fw_cdev_event_iso_interrupt {
-	__u64 closure;
-	__u32 type;
-	__u32 cycle;
-	__u32 header_length;
-	__u32 header[0];
-};
-
-/**
- * struct fw_cdev_event_iso_interrupt_mc - An iso buffer chunk was completed
- * @closure:	See &fw_cdev_event_common;
- *		set by %FW_CDEV_CREATE_ISO_CONTEXT ioctl
- * @type:	%FW_CDEV_EVENT_ISO_INTERRUPT_MULTICHANNEL
- * @completed:	Offset into the receive buffer; data before this offset is valid
- *
- * This event is sent in multichannel contexts (context type
- * %FW_CDEV_ISO_CONTEXT_RECEIVE_MULTICHANNEL) for &fw_cdev_iso_packet buffer
- * chunks that have been completely filled and that have the
- * %FW_CDEV_ISO_INTERRUPT bit set, or when explicitly requested with
- * %FW_CDEV_IOC_FLUSH_ISO.
- *
- * The buffer is continuously filled with the following data, per packet:
- *  - the 1394 iso packet header as described at &fw_cdev_event_iso_interrupt,
- *    but in little endian byte order,
- *  - packet payload (as many bytes as specified in the data_length field of
- *    the 1394 iso packet header) in big endian byte order,
- *  - 0...3 padding bytes as needed to align the following trailer quadlet,
- *  - trailer quadlet, containing the reception timestamp as described at
- *    &fw_cdev_event_iso_interrupt, but in little endian byte order.
- *
- * Hence the per-packet size is data_length (rounded up to a multiple of 4) + 8.
- * When processing the data, stop before a packet that would cross the
- * @completed offset.
- *
- * A packet near the end of a buffer chunk will typically spill over into the
- * next queued buffer chunk.  It is the responsibility of the client to check
- * for this condition, assemble a broken-up packet from its parts, and not to
- * re-queue any buffer chunks in which as yet unread packet parts reside.
- */
-struct fw_cdev_event_iso_interrupt_mc {
-	__u64 closure;
-	__u32 type;
-	__u32 completed;
-};
-
-/**
- * struct fw_cdev_event_iso_resource - Iso resources were allocated or freed
- * @closure:	See &fw_cdev_event_common;
- *		set by %FW_CDEV_IOC_(DE)ALLOCATE_ISO_RESOURCE(_ONCE) ioctl
- * @type:	%FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED or
- *		%FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED
- * @handle:	Reference by which an allocated resource can be deallocated
- * @channel:	Isochronous channel which was (de)allocated, if any
- * @bandwidth:	Bandwidth allocation units which were (de)allocated, if any
- *
- * An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED event is sent after an isochronous
- * resource was allocated at the IRM.  The client has to check @channel and
- * @bandwidth for whether the allocation actually succeeded.
- *
- * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event is sent after an isochronous
- * resource was deallocated at the IRM.  It is also sent when automatic
- * reallocation after a bus reset failed.
- *
- * @channel is <0 if no channel was (de)allocated or if reallocation failed.
- * @bandwidth is 0 if no bandwidth was (de)allocated or if reallocation failed.
- */
-struct fw_cdev_event_iso_resource {
-	__u64 closure;
-	__u32 type;
-	__u32 handle;
-	__s32 channel;
-	__s32 bandwidth;
-};
-
-/**
- * struct fw_cdev_event_phy_packet - A PHY packet was transmitted or received
- * @closure:	See &fw_cdev_event_common; set by %FW_CDEV_IOC_SEND_PHY_PACKET
- *		or %FW_CDEV_IOC_RECEIVE_PHY_PACKETS ioctl
- * @type:	%FW_CDEV_EVENT_PHY_PACKET_SENT or %..._RECEIVED
- * @rcode:	%RCODE_..., indicates success or failure of transmission
- * @length:	Data length in bytes
- * @data:	Incoming data
- *
- * If @type is %FW_CDEV_EVENT_PHY_PACKET_SENT, @length is 0 and @data empty,
- * except in case of a ping packet:  Then, @length is 4, and @data[0] is the
- * ping time in 49.152MHz clocks if @rcode is %RCODE_COMPLETE.
- *
- * If @type is %FW_CDEV_EVENT_PHY_PACKET_RECEIVED, @length is 8 and @data
- * consists of the two PHY packet quadlets, in host byte order.
- */
-struct fw_cdev_event_phy_packet {
-	__u64 closure;
-	__u32 type;
-	__u32 rcode;
-	__u32 length;
-	__u32 data[0];
-};
-
-/**
- * union fw_cdev_event - Convenience union of fw_cdev_event_ types
- * @common:		Valid for all types
- * @bus_reset:		Valid if @common.type == %FW_CDEV_EVENT_BUS_RESET
- * @response:		Valid if @common.type == %FW_CDEV_EVENT_RESPONSE
- * @request:		Valid if @common.type == %FW_CDEV_EVENT_REQUEST
- * @request2:		Valid if @common.type == %FW_CDEV_EVENT_REQUEST2
- * @iso_interrupt:	Valid if @common.type == %FW_CDEV_EVENT_ISO_INTERRUPT
- * @iso_interrupt_mc:	Valid if @common.type ==
- *				%FW_CDEV_EVENT_ISO_INTERRUPT_MULTICHANNEL
- * @iso_resource:	Valid if @common.type ==
- *				%FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED or
- *				%FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED
- * @phy_packet:		Valid if @common.type ==
- *				%FW_CDEV_EVENT_PHY_PACKET_SENT or
- *				%FW_CDEV_EVENT_PHY_PACKET_RECEIVED
- *
- * Convenience union for userspace use.  Events could be read(2) into an
- * appropriately aligned char buffer and then cast to this union for further
- * processing.  Note that for a request, response or iso_interrupt event,
- * the data[] or header[] may make the size of the full event larger than
- * sizeof(union fw_cdev_event).  Also note that if you attempt to read(2)
- * an event into a buffer that is not large enough for it, the data that does
- * not fit will be discarded so that the next read(2) will return a new event.
- */
-union fw_cdev_event {
-	struct fw_cdev_event_common		common;
-	struct fw_cdev_event_bus_reset		bus_reset;
-	struct fw_cdev_event_response		response;
-	struct fw_cdev_event_request		request;
-	struct fw_cdev_event_request2		request2;		/* added in 2.6.36 */
-	struct fw_cdev_event_iso_interrupt	iso_interrupt;
-	struct fw_cdev_event_iso_interrupt_mc	iso_interrupt_mc;	/* added in 2.6.36 */
-	struct fw_cdev_event_iso_resource	iso_resource;		/* added in 2.6.30 */
-	struct fw_cdev_event_phy_packet		phy_packet;		/* added in 2.6.36 */
-};
-
-/* available since kernel version 2.6.22 */
-#define FW_CDEV_IOC_GET_INFO           _IOWR('#', 0x00, struct fw_cdev_get_info)
-#define FW_CDEV_IOC_SEND_REQUEST        _IOW('#', 0x01, struct fw_cdev_send_request)
-#define FW_CDEV_IOC_ALLOCATE           _IOWR('#', 0x02, struct fw_cdev_allocate)
-#define FW_CDEV_IOC_DEALLOCATE          _IOW('#', 0x03, struct fw_cdev_deallocate)
-#define FW_CDEV_IOC_SEND_RESPONSE       _IOW('#', 0x04, struct fw_cdev_send_response)
-#define FW_CDEV_IOC_INITIATE_BUS_RESET  _IOW('#', 0x05, struct fw_cdev_initiate_bus_reset)
-#define FW_CDEV_IOC_ADD_DESCRIPTOR     _IOWR('#', 0x06, struct fw_cdev_add_descriptor)
-#define FW_CDEV_IOC_REMOVE_DESCRIPTOR   _IOW('#', 0x07, struct fw_cdev_remove_descriptor)
-#define FW_CDEV_IOC_CREATE_ISO_CONTEXT _IOWR('#', 0x08, struct fw_cdev_create_iso_context)
-#define FW_CDEV_IOC_QUEUE_ISO          _IOWR('#', 0x09, struct fw_cdev_queue_iso)
-#define FW_CDEV_IOC_START_ISO           _IOW('#', 0x0a, struct fw_cdev_start_iso)
-#define FW_CDEV_IOC_STOP_ISO            _IOW('#', 0x0b, struct fw_cdev_stop_iso)
-
-/* available since kernel version 2.6.24 */
-#define FW_CDEV_IOC_GET_CYCLE_TIMER     _IOR('#', 0x0c, struct fw_cdev_get_cycle_timer)
-
-/* available since kernel version 2.6.30 */
-#define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE       _IOWR('#', 0x0d, struct fw_cdev_allocate_iso_resource)
-#define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE      _IOW('#', 0x0e, struct fw_cdev_deallocate)
-#define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE   _IOW('#', 0x0f, struct fw_cdev_allocate_iso_resource)
-#define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE _IOW('#', 0x10, struct fw_cdev_allocate_iso_resource)
-#define FW_CDEV_IOC_GET_SPEED                     _IO('#', 0x11) /* returns speed code */
-#define FW_CDEV_IOC_SEND_BROADCAST_REQUEST       _IOW('#', 0x12, struct fw_cdev_send_request)
-#define FW_CDEV_IOC_SEND_STREAM_PACKET           _IOW('#', 0x13, struct fw_cdev_send_stream_packet)
-
-/* available since kernel version 2.6.34 */
-#define FW_CDEV_IOC_GET_CYCLE_TIMER2   _IOWR('#', 0x14, struct fw_cdev_get_cycle_timer2)
-
-/* available since kernel version 2.6.36 */
-#define FW_CDEV_IOC_SEND_PHY_PACKET    _IOWR('#', 0x15, struct fw_cdev_send_phy_packet)
-#define FW_CDEV_IOC_RECEIVE_PHY_PACKETS _IOW('#', 0x16, struct fw_cdev_receive_phy_packets)
-#define FW_CDEV_IOC_SET_ISO_CHANNELS    _IOW('#', 0x17, struct fw_cdev_set_iso_channels)
-
-/* available since kernel version 3.4 */
-#define FW_CDEV_IOC_FLUSH_ISO           _IOW('#', 0x18, struct fw_cdev_flush_iso)
-
-/*
- * ABI version history
- *  1  (2.6.22)  - initial version
- *     (2.6.24)  - added %FW_CDEV_IOC_GET_CYCLE_TIMER
- *  2  (2.6.30)  - changed &fw_cdev_event_iso_interrupt.header if
- *                 &fw_cdev_create_iso_context.header_size is 8 or more
- *               - added %FW_CDEV_IOC_*_ISO_RESOURCE*,
- *                 %FW_CDEV_IOC_GET_SPEED, %FW_CDEV_IOC_SEND_BROADCAST_REQUEST,
- *                 %FW_CDEV_IOC_SEND_STREAM_PACKET
- *     (2.6.32)  - added time stamp to xmit &fw_cdev_event_iso_interrupt
- *     (2.6.33)  - IR has always packet-per-buffer semantics now, not one of
- *                 dual-buffer or packet-per-buffer depending on hardware
- *               - shared use and auto-response for FCP registers
- *  3  (2.6.34)  - made &fw_cdev_get_cycle_timer reliable
- *               - added %FW_CDEV_IOC_GET_CYCLE_TIMER2
- *  4  (2.6.36)  - added %FW_CDEV_EVENT_REQUEST2, %FW_CDEV_EVENT_PHY_PACKET_*,
- *                 and &fw_cdev_allocate.region_end
- *               - implemented &fw_cdev_event_bus_reset.bm_node_id
- *               - added %FW_CDEV_IOC_SEND_PHY_PACKET, _RECEIVE_PHY_PACKETS
- *               - added %FW_CDEV_EVENT_ISO_INTERRUPT_MULTICHANNEL,
- *                 %FW_CDEV_ISO_CONTEXT_RECEIVE_MULTICHANNEL, and
- *                 %FW_CDEV_IOC_SET_ISO_CHANNELS
- *  5  (3.4)     - send %FW_CDEV_EVENT_ISO_INTERRUPT events when needed to
- *                 avoid dropping data
- *               - added %FW_CDEV_IOC_FLUSH_ISO
- */
-
-/**
- * struct fw_cdev_get_info - General purpose information ioctl
- * @version:	The version field is just a running serial number.  Both an
- *		input parameter (ABI version implemented by the client) and
- *		output parameter (ABI version implemented by the kernel).
- *		A client shall fill in the ABI @version for which the client
- *		was implemented.  This is necessary for forward compatibility.
- * @rom_length:	If @rom is non-zero, up to @rom_length bytes of Configuration
- *		ROM will be copied into that user space address.  In either
- *		case, @rom_length is updated with the actual length of the
- *		Configuration ROM.
- * @rom:	If non-zero, address of a buffer to be filled by a copy of the
- *		device's Configuration ROM
- * @bus_reset:	If non-zero, address of a buffer to be filled by a
- *		&struct fw_cdev_event_bus_reset with the current state
- *		of the bus.  This does not cause a bus reset to happen.
- * @bus_reset_closure: Value of &closure in this and subsequent bus reset events
- * @card:	The index of the card this device belongs to
- *
- * The %FW_CDEV_IOC_GET_INFO ioctl is usually the very first one which a client
- * performs right after it opened a /dev/fw* file.
- *
- * As a side effect, reception of %FW_CDEV_EVENT_BUS_RESET events to be read(2)
- * is started by this ioctl.
- */
-struct fw_cdev_get_info {
-	__u32 version;
-	__u32 rom_length;
-	__u64 rom;
-	__u64 bus_reset;
-	__u64 bus_reset_closure;
-	__u32 card;
-};
-
-/**
- * struct fw_cdev_send_request - Send an asynchronous request packet
- * @tcode:	Transaction code of the request
- * @length:	Length of outgoing payload, in bytes
- * @offset:	48-bit offset at destination node
- * @closure:	Passed back to userspace in the response event
- * @data:	Userspace pointer to payload
- * @generation:	The bus generation where packet is valid
- *
- * Send a request to the device.  This ioctl implements all outgoing requests.
- * Both quadlet and block request specify the payload as a pointer to the data
- * in the @data field.  Once the transaction completes, the kernel writes an
- * &fw_cdev_event_response event back.  The @closure field is passed back to
- * user space in the response event.
- */
-struct fw_cdev_send_request {
-	__u32 tcode;
-	__u32 length;
-	__u64 offset;
-	__u64 closure;
-	__u64 data;
-	__u32 generation;
-};
-
-/**
- * struct fw_cdev_send_response - Send an asynchronous response packet
- * @rcode:	Response code as determined by the userspace handler
- * @length:	Length of outgoing payload, in bytes
- * @data:	Userspace pointer to payload
- * @handle:	The handle from the &fw_cdev_event_request
- *
- * Send a response to an incoming request.  By setting up an address range using
- * the %FW_CDEV_IOC_ALLOCATE ioctl, userspace can listen for incoming requests.  An
- * incoming request will generate an %FW_CDEV_EVENT_REQUEST, and userspace must
- * send a reply using this ioctl.  The event has a handle to the kernel-side
- * pending transaction, which should be used with this ioctl.
- */
-struct fw_cdev_send_response {
-	__u32 rcode;
-	__u32 length;
-	__u64 data;
-	__u32 handle;
-};
-
-/**
- * struct fw_cdev_allocate - Allocate a CSR in an address range
- * @offset:	Start offset of the address range
- * @closure:	To be passed back to userspace in request events
- * @length:	Length of the CSR, in bytes
- * @handle:	Handle to the allocation, written by the kernel
- * @region_end:	First address above the address range (added in ABI v4, 2.6.36)
- *
- * Allocate an address range in the 48-bit address space on the local node
- * (the controller).  This allows userspace to listen for requests with an
- * offset within that address range.  Every time when the kernel receives a
- * request within the range, an &fw_cdev_event_request2 event will be emitted.
- * (If the kernel or the client implements ABI version <= 3, an
- * &fw_cdev_event_request will be generated instead.)
- *
- * The @closure field is passed back to userspace in these request events.
- * The @handle field is an out parameter, returning a handle to the allocated
- * range to be used for later deallocation of the range.
- *
- * The address range is allocated on all local nodes.  The address allocation
- * is exclusive except for the FCP command and response registers.  If an
- * exclusive address region is already in use, the ioctl fails with errno set
- * to %EBUSY.
- *
- * If kernel and client implement ABI version >= 4, the kernel looks up a free
- * spot of size @length inside [@offset..@region_end) and, if found, writes
- * the start address of the new CSR back in @offset.  I.e. @offset is an
- * in and out parameter.  If this automatic placement of a CSR in a bigger
- * address range is not desired, the client simply needs to set @region_end
- * = @offset + @length.
- *
- * If the kernel or the client implements ABI version <= 3, @region_end is
- * ignored and effectively assumed to be @offset + @length.
- *
- * @region_end is only present in a kernel header >= 2.6.36.  If necessary,
- * this can for example be tested by #ifdef FW_CDEV_EVENT_REQUEST2.
- */
-struct fw_cdev_allocate {
-	__u64 offset;
-	__u64 closure;
-	__u32 length;
-	__u32 handle;
-	__u64 region_end;	/* available since kernel version 2.6.36 */
-};
-
-/**
- * struct fw_cdev_deallocate - Free a CSR address range or isochronous resource
- * @handle:	Handle to the address range or iso resource, as returned by the
- *		kernel when the range or resource was allocated
- */
-struct fw_cdev_deallocate {
-	__u32 handle;
-};
-
-#define FW_CDEV_LONG_RESET	0
-#define FW_CDEV_SHORT_RESET	1
-
-/**
- * struct fw_cdev_initiate_bus_reset - Initiate a bus reset
- * @type:	%FW_CDEV_SHORT_RESET or %FW_CDEV_LONG_RESET
- *
- * Initiate a bus reset for the bus this device is on.  The bus reset can be
- * either the original (long) bus reset or the arbitrated (short) bus reset
- * introduced in 1394a-2000.
- *
- * The ioctl returns immediately.  A subsequent &fw_cdev_event_bus_reset
- * indicates when the reset actually happened.  Since ABI v4, this may be
- * considerably later than the ioctl because the kernel ensures a grace period
- * between subsequent bus resets as per IEEE 1394 bus management specification.
- */
-struct fw_cdev_initiate_bus_reset {
-	__u32 type;
-};
-
-/**
- * struct fw_cdev_add_descriptor - Add contents to the local node's config ROM
- * @immediate:	If non-zero, immediate key to insert before pointer
- * @key:	Upper 8 bits of root directory pointer
- * @data:	Userspace pointer to contents of descriptor block
- * @length:	Length of descriptor block data, in quadlets
- * @handle:	Handle to the descriptor, written by the kernel
- *
- * Add a descriptor block and optionally a preceding immediate key to the local
- * node's Configuration ROM.
- *
- * The @key field specifies the upper 8 bits of the descriptor root directory
- * pointer and the @data and @length fields specify the contents. The @key
- * should be of the form 0xXX000000. The offset part of the root directory entry
- * will be filled in by the kernel.
- *
- * If not 0, the @immediate field specifies an immediate key which will be
- * inserted before the root directory pointer.
- *
- * @immediate, @key, and @data array elements are CPU-endian quadlets.
- *
- * If successful, the kernel adds the descriptor and writes back a @handle to
- * the kernel-side object to be used for later removal of the descriptor block
- * and immediate key.  The kernel will also generate a bus reset to signal the
- * change of the Configuration ROM to other nodes.
- *
- * This ioctl affects the Configuration ROMs of all local nodes.
- * The ioctl only succeeds on device files which represent a local node.
- */
-struct fw_cdev_add_descriptor {
-	__u32 immediate;
-	__u32 key;
-	__u64 data;
-	__u32 length;
-	__u32 handle;
-};
-
-/**
- * struct fw_cdev_remove_descriptor - Remove contents from the Configuration ROM
- * @handle:	Handle to the descriptor, as returned by the kernel when the
- *		descriptor was added
- *
- * Remove a descriptor block and accompanying immediate key from the local
- * nodes' Configuration ROMs.  The kernel will also generate a bus reset to
- * signal the change of the Configuration ROM to other nodes.
- */
-struct fw_cdev_remove_descriptor {
-	__u32 handle;
-};
-
-#define FW_CDEV_ISO_CONTEXT_TRANSMIT			0
-#define FW_CDEV_ISO_CONTEXT_RECEIVE			1
-#define FW_CDEV_ISO_CONTEXT_RECEIVE_MULTICHANNEL	2 /* added in 2.6.36 */
-
-/**
- * struct fw_cdev_create_iso_context - Create a context for isochronous I/O
- * @type:	%FW_CDEV_ISO_CONTEXT_TRANSMIT or %FW_CDEV_ISO_CONTEXT_RECEIVE or
- *		%FW_CDEV_ISO_CONTEXT_RECEIVE_MULTICHANNEL
- * @header_size: Header size to strip in single-channel reception
- * @channel:	Channel to bind to in single-channel reception or transmission
- * @speed:	Transmission speed
- * @closure:	To be returned in &fw_cdev_event_iso_interrupt or
- *		&fw_cdev_event_iso_interrupt_multichannel
- * @handle:	Handle to context, written back by kernel
- *
- * Prior to sending or receiving isochronous I/O, a context must be created.
- * The context records information about the transmit or receive configuration
- * and typically maps to an underlying hardware resource.  A context is set up
- * for either sending or receiving.  It is bound to a specific isochronous
- * @channel.
- *
- * In case of multichannel reception, @header_size and @channel are ignored
- * and the channels are selected by %FW_CDEV_IOC_SET_ISO_CHANNELS.
- *
- * For %FW_CDEV_ISO_CONTEXT_RECEIVE contexts, @header_size must be at least 4
- * and must be a multiple of 4.  It is ignored in other context types.
- *
- * @speed is ignored in receive context types.
- *
- * If a context was successfully created, the kernel writes back a handle to the
- * context, which must be passed in for subsequent operations on that context.
- *
- * Limitations:
- * No more than one iso context can be created per fd.
- * The total number of contexts that all userspace and kernelspace drivers can
- * create on a card at a time is a hardware limit, typically 4 or 8 contexts per
- * direction, and of them at most one multichannel receive context.
- */
-struct fw_cdev_create_iso_context {
-	__u32 type;
-	__u32 header_size;
-	__u32 channel;
-	__u32 speed;
-	__u64 closure;
-	__u32 handle;
-};
-
-/**
- * struct fw_cdev_set_iso_channels - Select channels in multichannel reception
- * @channels:	Bitmask of channels to listen to
- * @handle:	Handle of the mutichannel receive context
- *
- * @channels is the bitwise or of 1ULL << n for each channel n to listen to.
- *
- * The ioctl fails with errno %EBUSY if there is already another receive context
- * on a channel in @channels.  In that case, the bitmask of all unoccupied
- * channels is returned in @channels.
- */
-struct fw_cdev_set_iso_channels {
-	__u64 channels;
-	__u32 handle;
-};
-
-#define FW_CDEV_ISO_PAYLOAD_LENGTH(v)	(v)
-#define FW_CDEV_ISO_INTERRUPT		(1 << 16)
-#define FW_CDEV_ISO_SKIP		(1 << 17)
-#define FW_CDEV_ISO_SYNC		(1 << 17)
-#define FW_CDEV_ISO_TAG(v)		((v) << 18)
-#define FW_CDEV_ISO_SY(v)		((v) << 20)
-#define FW_CDEV_ISO_HEADER_LENGTH(v)	((v) << 24)
-
-/**
- * struct fw_cdev_iso_packet - Isochronous packet
- * @control:	Contains the header length (8 uppermost bits),
- *		the sy field (4 bits), the tag field (2 bits), a sync flag
- *		or a skip flag (1 bit), an interrupt flag (1 bit), and the
- *		payload length (16 lowermost bits)
- * @header:	Header and payload in case of a transmit context.
- *
- * &struct fw_cdev_iso_packet is used to describe isochronous packet queues.
- * Use the FW_CDEV_ISO_ macros to fill in @control.
- * The @header array is empty in case of receive contexts.
- *
- * Context type %FW_CDEV_ISO_CONTEXT_TRANSMIT:
- *
- * @control.HEADER_LENGTH must be a multiple of 4.  It specifies the numbers of
- * bytes in @header that will be prepended to the packet's payload.  These bytes
- * are copied into the kernel and will not be accessed after the ioctl has
- * returned.
- *
- * The @control.SY and TAG fields are copied to the iso packet header.  These
- * fields are specified by IEEE 1394a and IEC 61883-1.
- *
- * The @control.SKIP flag specifies that no packet is to be sent in a frame.
- * When using this, all other fields except @control.INTERRUPT must be zero.
- *
- * When a packet with the @control.INTERRUPT flag set has been completed, an
- * &fw_cdev_event_iso_interrupt event will be sent.
- *
- * Context type %FW_CDEV_ISO_CONTEXT_RECEIVE:
- *
- * @control.HEADER_LENGTH must be a multiple of the context's header_size.
- * If the HEADER_LENGTH is larger than the context's header_size, multiple
- * packets are queued for this entry.
- *
- * The @control.SY and TAG fields are ignored.
- *
- * If the @control.SYNC flag is set, the context drops all packets until a
- * packet with a sy field is received which matches &fw_cdev_start_iso.sync.
- *
- * @control.PAYLOAD_LENGTH defines how many payload bytes can be received for
- * one packet (in addition to payload quadlets that have been defined as headers
- * and are stripped and returned in the &fw_cdev_event_iso_interrupt structure).
- * If more bytes are received, the additional bytes are dropped.  If less bytes
- * are received, the remaining bytes in this part of the payload buffer will not
- * be written to, not even by the next packet.  I.e., packets received in
- * consecutive frames will not necessarily be consecutive in memory.  If an
- * entry has queued multiple packets, the PAYLOAD_LENGTH is divided equally
- * among them.
- *
- * When a packet with the @control.INTERRUPT flag set has been completed, an
- * &fw_cdev_event_iso_interrupt event will be sent.  An entry that has queued
- * multiple receive packets is completed when its last packet is completed.
- *
- * Context type %FW_CDEV_ISO_CONTEXT_RECEIVE_MULTICHANNEL:
- *
- * Here, &fw_cdev_iso_packet would be more aptly named _iso_buffer_chunk since
- * it specifies a chunk of the mmap()'ed buffer, while the number and alignment
- * of packets to be placed into the buffer chunk is not known beforehand.
- *
- * @control.PAYLOAD_LENGTH is the size of the buffer chunk and specifies room
- * for header, payload, padding, and trailer bytes of one or more packets.
- * It must be a multiple of 4.
- *
- * @control.HEADER_LENGTH, TAG and SY are ignored.  SYNC is treated as described
- * for single-channel reception.
- *
- * When a buffer chunk with the @control.INTERRUPT flag set has been filled
- * entirely, an &fw_cdev_event_iso_interrupt_mc event will be sent.
- */
-struct fw_cdev_iso_packet {
-	__u32 control;
-	__u32 header[0];
-};
-
-/**
- * struct fw_cdev_queue_iso - Queue isochronous packets for I/O
- * @packets:	Userspace pointer to an array of &fw_cdev_iso_packet
- * @data:	Pointer into mmap()'ed payload buffer
- * @size:	Size of the @packets array, in bytes
- * @handle:	Isochronous context handle
- *
- * Queue a number of isochronous packets for reception or transmission.
- * This ioctl takes a pointer to an array of &fw_cdev_iso_packet structs,
- * which describe how to transmit from or receive into a contiguous region
- * of a mmap()'ed payload buffer.  As part of transmit packet descriptors,
- * a series of headers can be supplied, which will be prepended to the
- * payload during DMA.
- *
- * The kernel may or may not queue all packets, but will write back updated
- * values of the @packets, @data and @size fields, so the ioctl can be
- * resubmitted easily.
- *
- * In case of a multichannel receive context, @data must be quadlet-aligned
- * relative to the buffer start.
- */
-struct fw_cdev_queue_iso {
-	__u64 packets;
-	__u64 data;
-	__u32 size;
-	__u32 handle;
-};
-
-#define FW_CDEV_ISO_CONTEXT_MATCH_TAG0		 1
-#define FW_CDEV_ISO_CONTEXT_MATCH_TAG1		 2
-#define FW_CDEV_ISO_CONTEXT_MATCH_TAG2		 4
-#define FW_CDEV_ISO_CONTEXT_MATCH_TAG3		 8
-#define FW_CDEV_ISO_CONTEXT_MATCH_ALL_TAGS	15
-
-/**
- * struct fw_cdev_start_iso - Start an isochronous transmission or reception
- * @cycle:	Cycle in which to start I/O.  If @cycle is greater than or
- *		equal to 0, the I/O will start on that cycle.
- * @sync:	Determines the value to wait for for receive packets that have
- *		the %FW_CDEV_ISO_SYNC bit set
- * @tags:	Tag filter bit mask.  Only valid for isochronous reception.
- *		Determines the tag values for which packets will be accepted.
- *		Use FW_CDEV_ISO_CONTEXT_MATCH_ macros to set @tags.
- * @handle:	Isochronous context handle within which to transmit or receive
- */
-struct fw_cdev_start_iso {
-	__s32 cycle;
-	__u32 sync;
-	__u32 tags;
-	__u32 handle;
-};
-
-/**
- * struct fw_cdev_stop_iso - Stop an isochronous transmission or reception
- * @handle:	Handle of isochronous context to stop
- */
-struct fw_cdev_stop_iso {
-	__u32 handle;
-};
-
-/**
- * struct fw_cdev_flush_iso - flush completed iso packets
- * @handle:	handle of isochronous context to flush
- *
- * For %FW_CDEV_ISO_CONTEXT_TRANSMIT or %FW_CDEV_ISO_CONTEXT_RECEIVE contexts,
- * report any completed packets.
- *
- * For %FW_CDEV_ISO_CONTEXT_RECEIVE_MULTICHANNEL contexts, report the current
- * offset in the receive buffer, if it has changed; this is typically in the
- * middle of some buffer chunk.
- *
- * Any %FW_CDEV_EVENT_ISO_INTERRUPT or %FW_CDEV_EVENT_ISO_INTERRUPT_MULTICHANNEL
- * events generated by this ioctl are sent synchronously, i.e., are available
- * for reading from the file descriptor when this ioctl returns.
- */
-struct fw_cdev_flush_iso {
-	__u32 handle;
-};
-
-/**
- * struct fw_cdev_get_cycle_timer - read cycle timer register
- * @local_time:   system time, in microseconds since the Epoch
- * @cycle_timer:  Cycle Time register contents
- *
- * Same as %FW_CDEV_IOC_GET_CYCLE_TIMER2, but fixed to use %CLOCK_REALTIME
- * and only with microseconds resolution.
- *
- * In version 1 and 2 of the ABI, this ioctl returned unreliable (non-
- * monotonic) @cycle_timer values on certain controllers.
- */
-struct fw_cdev_get_cycle_timer {
-	__u64 local_time;
-	__u32 cycle_timer;
-};
-
-/**
- * struct fw_cdev_get_cycle_timer2 - read cycle timer register
- * @tv_sec:       system time, seconds
- * @tv_nsec:      system time, sub-seconds part in nanoseconds
- * @clk_id:       input parameter, clock from which to get the system time
- * @cycle_timer:  Cycle Time register contents
- *
- * The %FW_CDEV_IOC_GET_CYCLE_TIMER2 ioctl reads the isochronous cycle timer
- * and also the system clock.  This allows to correlate reception time of
- * isochronous packets with system time.
- *
- * @clk_id lets you choose a clock like with POSIX' clock_gettime function.
- * Supported @clk_id values are POSIX' %CLOCK_REALTIME and %CLOCK_MONOTONIC
- * and Linux' %CLOCK_MONOTONIC_RAW.
- *
- * @cycle_timer consists of 7 bits cycleSeconds, 13 bits cycleCount, and
- * 12 bits cycleOffset, in host byte order.  Cf. the Cycle Time register
- * per IEEE 1394 or Isochronous Cycle Timer register per OHCI-1394.
- */
-struct fw_cdev_get_cycle_timer2 {
-	__s64 tv_sec;
-	__s32 tv_nsec;
-	__s32 clk_id;
-	__u32 cycle_timer;
-};
-
-/**
- * struct fw_cdev_allocate_iso_resource - (De)allocate a channel or bandwidth
- * @closure:	Passed back to userspace in corresponding iso resource events
- * @channels:	Isochronous channels of which one is to be (de)allocated
- * @bandwidth:	Isochronous bandwidth units to be (de)allocated
- * @handle:	Handle to the allocation, written by the kernel (only valid in
- *		case of %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE ioctls)
- *
- * The %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE ioctl initiates allocation of an
- * isochronous channel and/or of isochronous bandwidth at the isochronous
- * resource manager (IRM).  Only one of the channels specified in @channels is
- * allocated.  An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED is sent after
- * communication with the IRM, indicating success or failure in the event data.
- * The kernel will automatically reallocate the resources after bus resets.
- * Should a reallocation fail, an %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event
- * will be sent.  The kernel will also automatically deallocate the resources
- * when the file descriptor is closed.
- *
- * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE ioctl can be used to initiate
- * deallocation of resources which were allocated as described above.
- * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation.
- *
- * The %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE ioctl is a variant of allocation
- * without automatic re- or deallocation.
- * An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED event concludes this operation,
- * indicating success or failure in its data.
- *
- * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE ioctl works like
- * %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE except that resources are freed
- * instead of allocated.
- * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation.
- *
- * To summarize, %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE allocates iso resources
- * for the lifetime of the fd or @handle.
- * In contrast, %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE allocates iso resources
- * for the duration of a bus generation.
- *
- * @channels is a host-endian bitfield with the least significant bit
- * representing channel 0 and the most significant bit representing channel 63:
- * 1ULL << c for each channel c that is a candidate for (de)allocation.
- *
- * @bandwidth is expressed in bandwidth allocation units, i.e. the time to send
- * one quadlet of data (payload or header data) at speed S1600.
- */
-struct fw_cdev_allocate_iso_resource {
-	__u64 closure;
-	__u64 channels;
-	__u32 bandwidth;
-	__u32 handle;
-};
-
-/**
- * struct fw_cdev_send_stream_packet - send an asynchronous stream packet
- * @length:	Length of outgoing payload, in bytes
- * @tag:	Data format tag
- * @channel:	Isochronous channel to transmit to
- * @sy:		Synchronization code
- * @closure:	Passed back to userspace in the response event
- * @data:	Userspace pointer to payload
- * @generation:	The bus generation where packet is valid
- * @speed:	Speed to transmit at
- *
- * The %FW_CDEV_IOC_SEND_STREAM_PACKET ioctl sends an asynchronous stream packet
- * to every device which is listening to the specified channel.  The kernel
- * writes an &fw_cdev_event_response event which indicates success or failure of
- * the transmission.
- */
-struct fw_cdev_send_stream_packet {
-	__u32 length;
-	__u32 tag;
-	__u32 channel;
-	__u32 sy;
-	__u64 closure;
-	__u64 data;
-	__u32 generation;
-	__u32 speed;
-};
-
-/**
- * struct fw_cdev_send_phy_packet - send a PHY packet
- * @closure:	Passed back to userspace in the PHY-packet-sent event
- * @data:	First and second quadlet of the PHY packet
- * @generation:	The bus generation where packet is valid
- *
- * The %FW_CDEV_IOC_SEND_PHY_PACKET ioctl sends a PHY packet to all nodes
- * on the same card as this device.  After transmission, an
- * %FW_CDEV_EVENT_PHY_PACKET_SENT event is generated.
- *
- * The payload @data[] shall be specified in host byte order.  Usually,
- * @data[1] needs to be the bitwise inverse of @data[0].  VersaPHY packets
- * are an exception to this rule.
- *
- * The ioctl is only permitted on device files which represent a local node.
- */
-struct fw_cdev_send_phy_packet {
-	__u64 closure;
-	__u32 data[2];
-	__u32 generation;
-};
-
-/**
- * struct fw_cdev_receive_phy_packets - start reception of PHY packets
- * @closure: Passed back to userspace in phy packet events
- *
- * This ioctl activates issuing of %FW_CDEV_EVENT_PHY_PACKET_RECEIVED due to
- * incoming PHY packets from any node on the same bus as the device.
- *
- * The ioctl is only permitted on device files which represent a local node.
- */
-struct fw_cdev_receive_phy_packets {
-	__u64 closure;
-};
-
-#define FW_CDEV_VERSION 3 /* Meaningless legacy macro; don't use it. */
-
-#endif /* _LINUX_FIREWIRE_CDEV_H */
diff --git a/openflow/usr/include/linux/firewire-constants.h b/openflow/usr/include/linux/firewire-constants.h
deleted file mode 100644
index 9b4bb5f..0000000
--- a/openflow/usr/include/linux/firewire-constants.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * IEEE 1394 constants.
- *
- * Copyright (C) 2005-2007  Kristian Hoegsberg <krh@bitplanet.net>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LINUX_FIREWIRE_CONSTANTS_H
-#define _LINUX_FIREWIRE_CONSTANTS_H
-
-#define TCODE_WRITE_QUADLET_REQUEST	0x0
-#define TCODE_WRITE_BLOCK_REQUEST	0x1
-#define TCODE_WRITE_RESPONSE		0x2
-#define TCODE_READ_QUADLET_REQUEST	0x4
-#define TCODE_READ_BLOCK_REQUEST	0x5
-#define TCODE_READ_QUADLET_RESPONSE	0x6
-#define TCODE_READ_BLOCK_RESPONSE	0x7
-#define TCODE_CYCLE_START		0x8
-#define TCODE_LOCK_REQUEST		0x9
-#define TCODE_STREAM_DATA		0xa
-#define TCODE_LOCK_RESPONSE		0xb
-
-#define EXTCODE_MASK_SWAP		0x1
-#define EXTCODE_COMPARE_SWAP		0x2
-#define EXTCODE_FETCH_ADD		0x3
-#define EXTCODE_LITTLE_ADD		0x4
-#define EXTCODE_BOUNDED_ADD		0x5
-#define EXTCODE_WRAP_ADD		0x6
-#define EXTCODE_VENDOR_DEPENDENT	0x7
-
-/* Linux firewire-core (Juju) specific tcodes */
-#define TCODE_LOCK_MASK_SWAP		(0x10 | EXTCODE_MASK_SWAP)
-#define TCODE_LOCK_COMPARE_SWAP		(0x10 | EXTCODE_COMPARE_SWAP)
-#define TCODE_LOCK_FETCH_ADD		(0x10 | EXTCODE_FETCH_ADD)
-#define TCODE_LOCK_LITTLE_ADD		(0x10 | EXTCODE_LITTLE_ADD)
-#define TCODE_LOCK_BOUNDED_ADD		(0x10 | EXTCODE_BOUNDED_ADD)
-#define TCODE_LOCK_WRAP_ADD		(0x10 | EXTCODE_WRAP_ADD)
-#define TCODE_LOCK_VENDOR_DEPENDENT	(0x10 | EXTCODE_VENDOR_DEPENDENT)
-
-#define RCODE_COMPLETE			0x0
-#define RCODE_CONFLICT_ERROR		0x4
-#define RCODE_DATA_ERROR		0x5
-#define RCODE_TYPE_ERROR		0x6
-#define RCODE_ADDRESS_ERROR		0x7
-
-/* Linux firewire-core (Juju) specific rcodes */
-#define RCODE_SEND_ERROR		0x10
-#define RCODE_CANCELLED			0x11
-#define RCODE_BUSY			0x12
-#define RCODE_GENERATION		0x13
-#define RCODE_NO_ACK			0x14
-
-#define SCODE_100			0x0
-#define SCODE_200			0x1
-#define SCODE_400			0x2
-#define SCODE_800			0x3
-#define SCODE_1600			0x4
-#define SCODE_3200			0x5
-#define SCODE_BETA			0x3
-
-#define ACK_COMPLETE			0x1
-#define ACK_PENDING			0x2
-#define ACK_BUSY_X			0x4
-#define ACK_BUSY_A			0x5
-#define ACK_BUSY_B			0x6
-#define ACK_DATA_ERROR			0xd
-#define ACK_TYPE_ERROR			0xe
-
-#define RETRY_1				0x00
-#define RETRY_X				0x01
-#define RETRY_A				0x02
-#define RETRY_B				0x03
-
-#endif /* _LINUX_FIREWIRE_CONSTANTS_H */
diff --git a/openflow/usr/include/linux/flat.h b/openflow/usr/include/linux/flat.h
deleted file mode 100644
index 8351bc7..0000000
--- a/openflow/usr/include/linux/flat.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2002-2003  David McCullough <davidm@snapgear.com>
- * Copyright (C) 1998       Kenneth Albanowski <kjahds@kjahds.com>
- *                          The Silver Hammer Group, Ltd.
- *
- * This file provides the definitions and structures needed to
- * support uClinux flat-format executables.
- */
-
-#ifndef _LINUX_FLAT_H
-#define _LINUX_FLAT_H
-
-
-#define	FLAT_VERSION			0x00000004L
-
-#ifdef CONFIG_BINFMT_SHARED_FLAT
-#define	MAX_SHARED_LIBS			(4)
-#else
-#define	MAX_SHARED_LIBS			(1)
-#endif
-
-/*
- * To make everything easier to port and manage cross platform
- * development,  all fields are in network byte order.
- */
-
-struct flat_hdr {
-	char magic[4];
-	unsigned long rev;          /* version (as above) */
-	unsigned long entry;        /* Offset of first executable instruction
-	                               with text segment from beginning of file */
-	unsigned long data_start;   /* Offset of data segment from beginning of
-	                               file */
-	unsigned long data_end;     /* Offset of end of data segment
-	                               from beginning of file */
-	unsigned long bss_end;      /* Offset of end of bss segment from beginning
-	                               of file */
-
-	/* (It is assumed that data_end through bss_end forms the bss segment.) */
-
-	unsigned long stack_size;   /* Size of stack, in bytes */
-	unsigned long reloc_start;  /* Offset of relocation records from
-	                               beginning of file */
-	unsigned long reloc_count;  /* Number of relocation records */
-	unsigned long flags;       
-	unsigned long build_date;   /* When the program/library was built */
-	unsigned long filler[5];    /* Reservered, set to zero */
-};
-
-#define FLAT_FLAG_RAM    0x0001 /* load program entirely into RAM */
-#define FLAT_FLAG_GOTPIC 0x0002 /* program is PIC with GOT */
-#define FLAT_FLAG_GZIP   0x0004 /* all but the header is compressed */
-#define FLAT_FLAG_GZDATA 0x0008 /* only data/relocs are compressed (for XIP) */
-#define FLAT_FLAG_KTRACE 0x0010 /* output useful kernel trace for debugging */
-
-
-
-#endif /* _LINUX_FLAT_H */
diff --git a/openflow/usr/include/linux/fou.h b/openflow/usr/include/linux/fou.h
deleted file mode 100644
index 744c323..0000000
--- a/openflow/usr/include/linux/fou.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* fou.h - FOU Interface */
-
-#ifndef _LINUX_FOU_H
-#define _LINUX_FOU_H
-
-/* NETLINK_GENERIC related info
- */
-#define FOU_GENL_NAME		"fou"
-#define FOU_GENL_VERSION	0x1
-
-enum {
-	FOU_ATTR_UNSPEC,
-	FOU_ATTR_PORT,				/* u16 */
-	FOU_ATTR_AF,				/* u8 */
-	FOU_ATTR_IPPROTO,			/* u8 */
-	FOU_ATTR_TYPE,				/* u8 */
-	FOU_ATTR_REMCSUM_NOPARTIAL,		/* flag */
-
-	__FOU_ATTR_MAX,
-};
-
-#define FOU_ATTR_MAX		(__FOU_ATTR_MAX - 1)
-
-enum {
-	FOU_CMD_UNSPEC,
-	FOU_CMD_ADD,
-	FOU_CMD_DEL,
-	FOU_CMD_GET,
-
-	__FOU_CMD_MAX,
-};
-
-enum {
-	FOU_ENCAP_UNSPEC,
-	FOU_ENCAP_DIRECT,
-	FOU_ENCAP_GUE,
-};
-
-#define FOU_CMD_MAX	(__FOU_CMD_MAX - 1)
-
-#endif /* _LINUX_FOU_H */
diff --git a/openflow/usr/include/linux/fs.h b/openflow/usr/include/linux/fs.h
deleted file mode 100644
index d75c7ec..0000000
--- a/openflow/usr/include/linux/fs.h
+++ /dev/null
@@ -1,211 +0,0 @@
-#ifndef _LINUX_FS_H
-#define _LINUX_FS_H
-
-/*
- * This file has definitions for some important file table
- * structures etc.
- */
-
-#include <linux/limits.h>
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-/*
- * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
- * the file limit at runtime and only root can increase the per-process
- * nr_file rlimit, so it's safe to set up a ridiculously high absolute
- * upper limit on files-per-process.
- *
- * Some programs (notably those using select()) may have to be 
- * recompiled to take full advantage of the new limits..  
- */
-
-/* Fixed constants first: */
-#undef NR_OPEN
-#define INR_OPEN_CUR 1024	/* Initial setting for nfile rlimits */
-#define INR_OPEN_MAX 4096	/* Hard limit for nfile rlimits */
-
-#define BLOCK_SIZE_BITS 10
-#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
-
-#define SEEK_SET	0	/* seek relative to beginning of file */
-#define SEEK_CUR	1	/* seek relative to current file position */
-#define SEEK_END	2	/* seek relative to end of file */
-#define SEEK_DATA	3	/* seek to the next data */
-#define SEEK_HOLE	4	/* seek to the next hole */
-#define SEEK_MAX	SEEK_HOLE
-
-#define RENAME_NOREPLACE	(1 << 0)	/* Don't overwrite target */
-#define RENAME_EXCHANGE		(1 << 1)	/* Exchange source and dest */
-#define RENAME_WHITEOUT		(1 << 2)	/* Whiteout source */
-
-struct fstrim_range {
-	__u64 start;
-	__u64 len;
-	__u64 minlen;
-};
-
-/* And dynamically-tunable limits and defaults: */
-struct files_stat_struct {
-	unsigned long nr_files;		/* read only */
-	unsigned long nr_free_files;	/* read only */
-	unsigned long max_files;		/* tunable */
-};
-
-struct inodes_stat_t {
-	long nr_inodes;
-	long nr_unused;
-	long dummy[5];		/* padding for sysctl ABI compatibility */
-};
-
-
-#define NR_FILE  8192	/* this can well be larger on a larger system */
-
-
-/*
- * These are the fs-independent mount-flags: up to 32 flags are supported
- */
-#define MS_RDONLY	 1	/* Mount read-only */
-#define MS_NOSUID	 2	/* Ignore suid and sgid bits */
-#define MS_NODEV	 4	/* Disallow access to device special files */
-#define MS_NOEXEC	 8	/* Disallow program execution */
-#define MS_SYNCHRONOUS	16	/* Writes are synced at once */
-#define MS_REMOUNT	32	/* Alter flags of a mounted FS */
-#define MS_MANDLOCK	64	/* Allow mandatory locks on an FS */
-#define MS_DIRSYNC	128	/* Directory modifications are synchronous */
-#define MS_NOATIME	1024	/* Do not update access times. */
-#define MS_NODIRATIME	2048	/* Do not update directory access times */
-#define MS_BIND		4096
-#define MS_MOVE		8192
-#define MS_REC		16384
-#define MS_VERBOSE	32768	/* War is peace. Verbosity is silence.
-				   MS_VERBOSE is deprecated. */
-#define MS_SILENT	32768
-#define MS_POSIXACL	(1<<16)	/* VFS does not apply the umask */
-#define MS_UNBINDABLE	(1<<17)	/* change to unbindable */
-#define MS_PRIVATE	(1<<18)	/* change to private */
-#define MS_SLAVE	(1<<19)	/* change to slave */
-#define MS_SHARED	(1<<20)	/* change to shared */
-#define MS_RELATIME	(1<<21)	/* Update atime relative to mtime/ctime. */
-#define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
-#define MS_I_VERSION	(1<<23) /* Update inode I_version field */
-#define MS_STRICTATIME	(1<<24) /* Always perform atime updates */
-#define MS_LAZYTIME	(1<<25) /* Update the on-disk [acm]times lazily */
-
-/* These sb flags are internal to the kernel */
-#define MS_NOSEC	(1<<28)
-#define MS_BORN		(1<<29)
-#define MS_ACTIVE	(1<<30)
-#define MS_NOUSER	(1<<31)
-
-/*
- * Superblock flags that can be altered by MS_REMOUNT
- */
-#define MS_RMT_MASK	(MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION|\
-			 MS_LAZYTIME)
-
-/*
- * Old magic mount flag and mask
- */
-#define MS_MGC_VAL 0xC0ED0000
-#define MS_MGC_MSK 0xffff0000
-
-/* the read-only stuff doesn't really belong here, but any other place is
-   probably as bad and I don't want to create yet another include file. */
-
-#define BLKROSET   _IO(0x12,93)	/* set device read-only (0 = read-write) */
-#define BLKROGET   _IO(0x12,94)	/* get read-only status (0 = read_write) */
-#define BLKRRPART  _IO(0x12,95)	/* re-read partition table */
-#define BLKGETSIZE _IO(0x12,96)	/* return device size /512 (long *arg) */
-#define BLKFLSBUF  _IO(0x12,97)	/* flush buffer cache */
-#define BLKRASET   _IO(0x12,98)	/* set read ahead for block device */
-#define BLKRAGET   _IO(0x12,99)	/* get current read ahead setting */
-#define BLKFRASET  _IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
-#define BLKFRAGET  _IO(0x12,101)/* get filesystem (mm/filemap.c) read-ahead */
-#define BLKSECTSET _IO(0x12,102)/* set max sectors per request (ll_rw_blk.c) */
-#define BLKSECTGET _IO(0x12,103)/* get max sectors per request (ll_rw_blk.c) */
-#define BLKSSZGET  _IO(0x12,104)/* get block device sector size */
-#if 0
-#define BLKPG      _IO(0x12,105)/* See blkpg.h */
-
-/* Some people are morons.  Do not use sizeof! */
-
-#define BLKELVGET  _IOR(0x12,106,size_t)/* elevator get */
-#define BLKELVSET  _IOW(0x12,107,size_t)/* elevator set */
-/* This was here just to show that the number is taken -
-   probably all these _IO(0x12,*) ioctls should be moved to blkpg.h. */
-#endif
-/* A jump here: 108-111 have been used for various private purposes. */
-#define BLKBSZGET  _IOR(0x12,112,size_t)
-#define BLKBSZSET  _IOW(0x12,113,size_t)
-#define BLKGETSIZE64 _IOR(0x12,114,size_t)	/* return device size in bytes (u64 *arg) */
-#define BLKTRACESETUP _IOWR(0x12,115,struct blk_user_trace_setup)
-#define BLKTRACESTART _IO(0x12,116)
-#define BLKTRACESTOP _IO(0x12,117)
-#define BLKTRACETEARDOWN _IO(0x12,118)
-#define BLKDISCARD _IO(0x12,119)
-#define BLKIOMIN _IO(0x12,120)
-#define BLKIOOPT _IO(0x12,121)
-#define BLKALIGNOFF _IO(0x12,122)
-#define BLKPBSZGET _IO(0x12,123)
-#define BLKDISCARDZEROES _IO(0x12,124)
-#define BLKSECDISCARD _IO(0x12,125)
-#define BLKROTATIONAL _IO(0x12,126)
-#define BLKZEROOUT _IO(0x12,127)
-
-#define BMAP_IOCTL 1		/* obsolete - kept for compatibility */
-#define FIBMAP	   _IO(0x00,1)	/* bmap access */
-#define FIGETBSZ   _IO(0x00,2)	/* get the block size used for bmap */
-#define FIFREEZE	_IOWR('X', 119, int)	/* Freeze */
-#define FITHAW		_IOWR('X', 120, int)	/* Thaw */
-#define FITRIM		_IOWR('X', 121, struct fstrim_range)	/* Trim */
-
-#define	FS_IOC_GETFLAGS			_IOR('f', 1, long)
-#define	FS_IOC_SETFLAGS			_IOW('f', 2, long)
-#define	FS_IOC_GETVERSION		_IOR('v', 1, long)
-#define	FS_IOC_SETVERSION		_IOW('v', 2, long)
-#define FS_IOC_FIEMAP			_IOWR('f', 11, struct fiemap)
-#define FS_IOC32_GETFLAGS		_IOR('f', 1, int)
-#define FS_IOC32_SETFLAGS		_IOW('f', 2, int)
-#define FS_IOC32_GETVERSION		_IOR('v', 1, int)
-#define FS_IOC32_SETVERSION		_IOW('v', 2, int)
-
-/*
- * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS)
- */
-#define	FS_SECRM_FL			0x00000001 /* Secure deletion */
-#define	FS_UNRM_FL			0x00000002 /* Undelete */
-#define	FS_COMPR_FL			0x00000004 /* Compress file */
-#define FS_SYNC_FL			0x00000008 /* Synchronous updates */
-#define FS_IMMUTABLE_FL			0x00000010 /* Immutable file */
-#define FS_APPEND_FL			0x00000020 /* writes to file may only append */
-#define FS_NODUMP_FL			0x00000040 /* do not dump file */
-#define FS_NOATIME_FL			0x00000080 /* do not update atime */
-/* Reserved for compression usage... */
-#define FS_DIRTY_FL			0x00000100
-#define FS_COMPRBLK_FL			0x00000200 /* One or more compressed clusters */
-#define FS_NOCOMP_FL			0x00000400 /* Don't compress */
-#define FS_ECOMPR_FL			0x00000800 /* Compression error */
-/* End compression flags --- maybe not all used */
-#define FS_BTREE_FL			0x00001000 /* btree format dir */
-#define FS_INDEX_FL			0x00001000 /* hash-indexed directory */
-#define FS_IMAGIC_FL			0x00002000 /* AFS directory */
-#define FS_JOURNAL_DATA_FL		0x00004000 /* Reserved for ext3 */
-#define FS_NOTAIL_FL			0x00008000 /* file tail should not be merged */
-#define FS_DIRSYNC_FL			0x00010000 /* dirsync behaviour (directories only) */
-#define FS_TOPDIR_FL			0x00020000 /* Top of directory hierarchies*/
-#define FS_EXTENT_FL			0x00080000 /* Extents */
-#define FS_DIRECTIO_FL			0x00100000 /* Use direct i/o */
-#define FS_NOCOW_FL			0x00800000 /* Do not cow file */
-#define FS_PROJINHERIT_FL		0x20000000 /* Create with parents projid */
-#define FS_RESERVED_FL			0x80000000 /* reserved for ext2 lib */
-
-#define FS_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
-#define FS_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
-
-
-#define SYNC_FILE_RANGE_WAIT_BEFORE	1
-#define SYNC_FILE_RANGE_WRITE		2
-#define SYNC_FILE_RANGE_WAIT_AFTER	4
-
-#endif /* _LINUX_FS_H */
diff --git a/openflow/usr/include/linux/fsl_hypervisor.h b/openflow/usr/include/linux/fsl_hypervisor.h
deleted file mode 100644
index 2f908de..0000000
--- a/openflow/usr/include/linux/fsl_hypervisor.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Freescale hypervisor ioctl and kernel interface
- *
- * Copyright (C) 2008-2011 Freescale Semiconductor, Inc.
- * Author: Timur Tabi <timur@freescale.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Freescale Semiconductor nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- *
- * ALTERNATIVELY, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") as published by the Free Software
- * Foundation, either version 2 of that License or (at your option) any
- * later version.
- *
- * This software is provided by Freescale Semiconductor "as is" and any
- * express or implied warranties, including, but not limited to, the implied
- * warranties of merchantability and fitness for a particular purpose are
- * disclaimed. In no event shall Freescale Semiconductor be liable for any
- * direct, indirect, incidental, special, exemplary, or consequential damages
- * (including, but not limited to, procurement of substitute goods or services;
- * loss of use, data, or profits; or business interruption) however caused and
- * on any theory of liability, whether in contract, strict liability, or tort
- * (including negligence or otherwise) arising in any way out of the use of this
- * software, even if advised of the possibility of such damage.
- *
- * This file is used by the Freescale hypervisor management driver.  It can
- * also be included by applications that need to communicate with the driver
- * via the ioctl interface.
- */
-
-#ifndef FSL_HYPERVISOR_H
-#define FSL_HYPERVISOR_H
-
-#include <linux/types.h>
-
-/**
- * struct fsl_hv_ioctl_restart - restart a partition
- * @ret: return error code from the hypervisor
- * @partition: the ID of the partition to restart, or -1 for the
- *             calling partition
- *
- * Used by FSL_HV_IOCTL_PARTITION_RESTART
- */
-struct fsl_hv_ioctl_restart {
-	__u32 ret;
-	__u32 partition;
-};
-
-/**
- * struct fsl_hv_ioctl_status - get a partition's status
- * @ret: return error code from the hypervisor
- * @partition: the ID of the partition to query, or -1 for the
- *             calling partition
- * @status: The returned status of the partition
- *
- * Used by FSL_HV_IOCTL_PARTITION_GET_STATUS
- *
- * Values of 'status':
- *    0 = Stopped
- *    1 = Running
- *    2 = Starting
- *    3 = Stopping
- */
-struct fsl_hv_ioctl_status {
-	__u32 ret;
-	__u32 partition;
-	__u32 status;
-};
-
-/**
- * struct fsl_hv_ioctl_start - start a partition
- * @ret: return error code from the hypervisor
- * @partition: the ID of the partition to control
- * @entry_point: The offset within the guest IMA to start execution
- * @load: If non-zero, reload the partition's images before starting
- *
- * Used by FSL_HV_IOCTL_PARTITION_START
- */
-struct fsl_hv_ioctl_start {
-	__u32 ret;
-	__u32 partition;
-	__u32 entry_point;
-	__u32 load;
-};
-
-/**
- * struct fsl_hv_ioctl_stop - stop a partition
- * @ret: return error code from the hypervisor
- * @partition: the ID of the partition to stop, or -1 for the calling
- *             partition
- *
- * Used by FSL_HV_IOCTL_PARTITION_STOP
- */
-struct fsl_hv_ioctl_stop {
-	__u32 ret;
-	__u32 partition;
-};
-
-/**
- * struct fsl_hv_ioctl_memcpy - copy memory between partitions
- * @ret: return error code from the hypervisor
- * @source: the partition ID of the source partition, or -1 for this
- *          partition
- * @target: the partition ID of the target partition, or -1 for this
- *          partition
- * @reserved: reserved, must be set to 0
- * @local_addr: user-space virtual address of a buffer in the local
- *              partition
- * @remote_addr: guest physical address of a buffer in the
- *           remote partition
- * @count: the number of bytes to copy.  Both the local and remote
- *         buffers must be at least 'count' bytes long
- *
- * Used by FSL_HV_IOCTL_MEMCPY
- *
- * The 'local' partition is the partition that calls this ioctl.  The
- * 'remote' partition is a different partition.  The data is copied from
- * the 'source' paritition' to the 'target' partition.
- *
- * The buffer in the remote partition must be guest physically
- * contiguous.
- *
- * This ioctl does not support copying memory between two remote
- * partitions or within the same partition, so either 'source' or
- * 'target' (but not both) must be -1.  In other words, either
- *
- *      source == local and target == remote
- * or
- *      source == remote and target == local
- */
-struct fsl_hv_ioctl_memcpy {
-	__u32 ret;
-	__u32 source;
-	__u32 target;
-	__u32 reserved;	/* padding to ensure local_vaddr is aligned */
-	__u64 local_vaddr;
-	__u64 remote_paddr;
-	__u64 count;
-};
-
-/**
- * struct fsl_hv_ioctl_doorbell - ring a doorbell
- * @ret: return error code from the hypervisor
- * @doorbell: the handle of the doorbell to ring doorbell
- *
- * Used by FSL_HV_IOCTL_DOORBELL
- */
-struct fsl_hv_ioctl_doorbell {
-	__u32 ret;
-	__u32 doorbell;
-};
-
-/**
- * struct fsl_hv_ioctl_prop - get/set a device tree property
- * @ret: return error code from the hypervisor
- * @handle: handle of partition whose tree to access
- * @path: virtual address of path name of node to access
- * @propname: virtual address of name of property to access
- * @propval: virtual address of property data buffer
- * @proplen: Size of property data buffer
- * @reserved: reserved, must be set to 0
- *
- * Used by FSL_HV_IOCTL_DOORBELL
- */
-struct fsl_hv_ioctl_prop {
-	__u32 ret;
-	__u32 handle;
-	__u64 path;
-	__u64 propname;
-	__u64 propval;
-	__u32 proplen;
-	__u32 reserved;	/* padding to ensure structure is aligned */
-};
-
-/* The ioctl type, documented in ioctl-number.txt */
-#define FSL_HV_IOCTL_TYPE	0xAF
-
-/* Restart another partition */
-#define FSL_HV_IOCTL_PARTITION_RESTART \
-	_IOWR(FSL_HV_IOCTL_TYPE, 1, struct fsl_hv_ioctl_restart)
-
-/* Get a partition's status */
-#define FSL_HV_IOCTL_PARTITION_GET_STATUS \
-	_IOWR(FSL_HV_IOCTL_TYPE, 2, struct fsl_hv_ioctl_status)
-
-/* Boot another partition */
-#define FSL_HV_IOCTL_PARTITION_START \
-	_IOWR(FSL_HV_IOCTL_TYPE, 3, struct fsl_hv_ioctl_start)
-
-/* Stop this or another partition */
-#define FSL_HV_IOCTL_PARTITION_STOP \
-	_IOWR(FSL_HV_IOCTL_TYPE, 4, struct fsl_hv_ioctl_stop)
-
-/* Copy data from one partition to another */
-#define FSL_HV_IOCTL_MEMCPY \
-	_IOWR(FSL_HV_IOCTL_TYPE, 5, struct fsl_hv_ioctl_memcpy)
-
-/* Ring a doorbell */
-#define FSL_HV_IOCTL_DOORBELL \
-	_IOWR(FSL_HV_IOCTL_TYPE, 6, struct fsl_hv_ioctl_doorbell)
-
-/* Get a property from another guest's device tree */
-#define FSL_HV_IOCTL_GETPROP \
-	_IOWR(FSL_HV_IOCTL_TYPE, 7, struct fsl_hv_ioctl_prop)
-
-/* Set a property in another guest's device tree */
-#define FSL_HV_IOCTL_SETPROP \
-	_IOWR(FSL_HV_IOCTL_TYPE, 8, struct fsl_hv_ioctl_prop)
-
-
-#endif /* FSL_HYPERVISOR_H */
diff --git a/openflow/usr/include/linux/fuse.h b/openflow/usr/include/linux/fuse.h
deleted file mode 100644
index 68c52e8..0000000
--- a/openflow/usr/include/linux/fuse.h
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
-    This file defines the kernel interface of FUSE
-    Copyright (C) 2001-2008  Miklos Szeredi <miklos@szeredi.hu>
-
-    This program can be distributed under the terms of the GNU GPL.
-    See the file COPYING.
-
-    This -- and only this -- header file may also be distributed under
-    the terms of the BSD Licence as follows:
-
-    Copyright (C) 2001-2007 Miklos Szeredi. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-*/
-
-/*
- * This file defines the kernel interface of FUSE
- *
- * Protocol changelog:
- *
- * 7.9:
- *  - new fuse_getattr_in input argument of GETATTR
- *  - add lk_flags in fuse_lk_in
- *  - add lock_owner field to fuse_setattr_in, fuse_read_in and fuse_write_in
- *  - add blksize field to fuse_attr
- *  - add file flags field to fuse_read_in and fuse_write_in
- *
- * 7.10
- *  - add nonseekable open flag
- *
- * 7.11
- *  - add IOCTL message
- *  - add unsolicited notification support
- *  - add POLL message and NOTIFY_POLL notification
- *
- * 7.12
- *  - add umask flag to input argument of open, mknod and mkdir
- *  - add notification messages for invalidation of inodes and
- *    directory entries
- *
- * 7.13
- *  - make max number of background requests and congestion threshold
- *    tunables
- *
- * 7.14
- *  - add splice support to fuse device
- *
- * 7.15
- *  - add store notify
- *  - add retrieve notify
- *
- * 7.16
- *  - add BATCH_FORGET request
- *  - FUSE_IOCTL_UNRESTRICTED shall now return with array of 'struct
- *    fuse_ioctl_iovec' instead of ambiguous 'struct iovec'
- *  - add FUSE_IOCTL_32BIT flag
- *
- * 7.17
- *  - add FUSE_FLOCK_LOCKS and FUSE_RELEASE_FLOCK_UNLOCK
- *
- * 7.18
- *  - add FUSE_IOCTL_DIR flag
- *  - add FUSE_NOTIFY_DELETE
- *
- * 7.19
- *  - add FUSE_FALLOCATE
- *
- * 7.20
- *  - add FUSE_AUTO_INVAL_DATA
- *
- * 7.21
- *  - add FUSE_READDIRPLUS
- *  - send the requested events in POLL request
- *
- * 7.22
- *  - add FUSE_ASYNC_DIO
- *
- * 7.23
- *  - add FUSE_WRITEBACK_CACHE
- *  - add time_gran to fuse_init_out
- *  - add reserved space to fuse_init_out
- *  - add FATTR_CTIME
- *  - add ctime and ctimensec to fuse_setattr_in
- *  - add FUSE_RENAME2 request
- *  - add FUSE_NO_OPEN_SUPPORT flag
- */
-
-#ifndef _LINUX_FUSE_H
-#define _LINUX_FUSE_H
-
-#include <stdint.h>
-
-/*
- * Version negotiation:
- *
- * Both the kernel and userspace send the version they support in the
- * INIT request and reply respectively.
- *
- * If the major versions match then both shall use the smallest
- * of the two minor versions for communication.
- *
- * If the kernel supports a larger major version, then userspace shall
- * reply with the major version it supports, ignore the rest of the
- * INIT message and expect a new INIT message from the kernel with a
- * matching major version.
- *
- * If the library supports a larger major version, then it shall fall
- * back to the major protocol version sent by the kernel for
- * communication and reply with that major version (and an arbitrary
- * supported minor version).
- */
-
-/** Version number of this interface */
-#define FUSE_KERNEL_VERSION 7
-
-/** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 23
-
-/** The node ID of the root inode */
-#define FUSE_ROOT_ID 1
-
-/* Make sure all structures are padded to 64bit boundary, so 32bit
-   userspace works under 64bit kernels */
-
-struct fuse_attr {
-	uint64_t	ino;
-	uint64_t	size;
-	uint64_t	blocks;
-	uint64_t	atime;
-	uint64_t	mtime;
-	uint64_t	ctime;
-	uint32_t	atimensec;
-	uint32_t	mtimensec;
-	uint32_t	ctimensec;
-	uint32_t	mode;
-	uint32_t	nlink;
-	uint32_t	uid;
-	uint32_t	gid;
-	uint32_t	rdev;
-	uint32_t	blksize;
-	uint32_t	padding;
-};
-
-struct fuse_kstatfs {
-	uint64_t	blocks;
-	uint64_t	bfree;
-	uint64_t	bavail;
-	uint64_t	files;
-	uint64_t	ffree;
-	uint32_t	bsize;
-	uint32_t	namelen;
-	uint32_t	frsize;
-	uint32_t	padding;
-	uint32_t	spare[6];
-};
-
-struct fuse_file_lock {
-	uint64_t	start;
-	uint64_t	end;
-	uint32_t	type;
-	uint32_t	pid; /* tgid */
-};
-
-/**
- * Bitmasks for fuse_setattr_in.valid
- */
-#define FATTR_MODE	(1 << 0)
-#define FATTR_UID	(1 << 1)
-#define FATTR_GID	(1 << 2)
-#define FATTR_SIZE	(1 << 3)
-#define FATTR_ATIME	(1 << 4)
-#define FATTR_MTIME	(1 << 5)
-#define FATTR_FH	(1 << 6)
-#define FATTR_ATIME_NOW	(1 << 7)
-#define FATTR_MTIME_NOW	(1 << 8)
-#define FATTR_LOCKOWNER	(1 << 9)
-#define FATTR_CTIME	(1 << 10)
-
-/**
- * Flags returned by the OPEN request
- *
- * FOPEN_DIRECT_IO: bypass page cache for this open file
- * FOPEN_KEEP_CACHE: don't invalidate the data cache on open
- * FOPEN_NONSEEKABLE: the file is not seekable
- */
-#define FOPEN_DIRECT_IO		(1 << 0)
-#define FOPEN_KEEP_CACHE	(1 << 1)
-#define FOPEN_NONSEEKABLE	(1 << 2)
-
-/**
- * INIT request/reply flags
- *
- * FUSE_ASYNC_READ: asynchronous read requests
- * FUSE_POSIX_LOCKS: remote locking for POSIX file locks
- * FUSE_FILE_OPS: kernel sends file handle for fstat, etc... (not yet supported)
- * FUSE_ATOMIC_O_TRUNC: handles the O_TRUNC open flag in the filesystem
- * FUSE_EXPORT_SUPPORT: filesystem handles lookups of "." and ".."
- * FUSE_BIG_WRITES: filesystem can handle write size larger than 4kB
- * FUSE_DONT_MASK: don't apply umask to file mode on create operations
- * FUSE_SPLICE_WRITE: kernel supports splice write on the device
- * FUSE_SPLICE_MOVE: kernel supports splice move on the device
- * FUSE_SPLICE_READ: kernel supports splice read on the device
- * FUSE_FLOCK_LOCKS: remote locking for BSD style file locks
- * FUSE_HAS_IOCTL_DIR: kernel supports ioctl on directories
- * FUSE_AUTO_INVAL_DATA: automatically invalidate cached pages
- * FUSE_DO_READDIRPLUS: do READDIRPLUS (READDIR+LOOKUP in one)
- * FUSE_READDIRPLUS_AUTO: adaptive readdirplus
- * FUSE_ASYNC_DIO: asynchronous direct I/O submission
- * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes
- * FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens
- */
-#define FUSE_ASYNC_READ		(1 << 0)
-#define FUSE_POSIX_LOCKS	(1 << 1)
-#define FUSE_FILE_OPS		(1 << 2)
-#define FUSE_ATOMIC_O_TRUNC	(1 << 3)
-#define FUSE_EXPORT_SUPPORT	(1 << 4)
-#define FUSE_BIG_WRITES		(1 << 5)
-#define FUSE_DONT_MASK		(1 << 6)
-#define FUSE_SPLICE_WRITE	(1 << 7)
-#define FUSE_SPLICE_MOVE	(1 << 8)
-#define FUSE_SPLICE_READ	(1 << 9)
-#define FUSE_FLOCK_LOCKS	(1 << 10)
-#define FUSE_HAS_IOCTL_DIR	(1 << 11)
-#define FUSE_AUTO_INVAL_DATA	(1 << 12)
-#define FUSE_DO_READDIRPLUS	(1 << 13)
-#define FUSE_READDIRPLUS_AUTO	(1 << 14)
-#define FUSE_ASYNC_DIO		(1 << 15)
-#define FUSE_WRITEBACK_CACHE	(1 << 16)
-#define FUSE_NO_OPEN_SUPPORT	(1 << 17)
-
-/**
- * CUSE INIT request/reply flags
- *
- * CUSE_UNRESTRICTED_IOCTL:  use unrestricted ioctl
- */
-#define CUSE_UNRESTRICTED_IOCTL	(1 << 0)
-
-/**
- * Release flags
- */
-#define FUSE_RELEASE_FLUSH	(1 << 0)
-#define FUSE_RELEASE_FLOCK_UNLOCK	(1 << 1)
-
-/**
- * Getattr flags
- */
-#define FUSE_GETATTR_FH		(1 << 0)
-
-/**
- * Lock flags
- */
-#define FUSE_LK_FLOCK		(1 << 0)
-
-/**
- * WRITE flags
- *
- * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed
- * FUSE_WRITE_LOCKOWNER: lock_owner field is valid
- */
-#define FUSE_WRITE_CACHE	(1 << 0)
-#define FUSE_WRITE_LOCKOWNER	(1 << 1)
-
-/**
- * Read flags
- */
-#define FUSE_READ_LOCKOWNER	(1 << 1)
-
-/**
- * Ioctl flags
- *
- * FUSE_IOCTL_COMPAT: 32bit compat ioctl on 64bit machine
- * FUSE_IOCTL_UNRESTRICTED: not restricted to well-formed ioctls, retry allowed
- * FUSE_IOCTL_RETRY: retry with new iovecs
- * FUSE_IOCTL_32BIT: 32bit ioctl
- * FUSE_IOCTL_DIR: is a directory
- *
- * FUSE_IOCTL_MAX_IOV: maximum of in_iovecs + out_iovecs
- */
-#define FUSE_IOCTL_COMPAT	(1 << 0)
-#define FUSE_IOCTL_UNRESTRICTED	(1 << 1)
-#define FUSE_IOCTL_RETRY	(1 << 2)
-#define FUSE_IOCTL_32BIT	(1 << 3)
-#define FUSE_IOCTL_DIR		(1 << 4)
-
-#define FUSE_IOCTL_MAX_IOV	256
-
-/**
- * Poll flags
- *
- * FUSE_POLL_SCHEDULE_NOTIFY: request poll notify
- */
-#define FUSE_POLL_SCHEDULE_NOTIFY (1 << 0)
-
-enum fuse_opcode {
-	FUSE_LOOKUP	   = 1,
-	FUSE_FORGET	   = 2,  /* no reply */
-	FUSE_GETATTR	   = 3,
-	FUSE_SETATTR	   = 4,
-	FUSE_READLINK	   = 5,
-	FUSE_SYMLINK	   = 6,
-	FUSE_MKNOD	   = 8,
-	FUSE_MKDIR	   = 9,
-	FUSE_UNLINK	   = 10,
-	FUSE_RMDIR	   = 11,
-	FUSE_RENAME	   = 12,
-	FUSE_LINK	   = 13,
-	FUSE_OPEN	   = 14,
-	FUSE_READ	   = 15,
-	FUSE_WRITE	   = 16,
-	FUSE_STATFS	   = 17,
-	FUSE_RELEASE       = 18,
-	FUSE_FSYNC         = 20,
-	FUSE_SETXATTR      = 21,
-	FUSE_GETXATTR      = 22,
-	FUSE_LISTXATTR     = 23,
-	FUSE_REMOVEXATTR   = 24,
-	FUSE_FLUSH         = 25,
-	FUSE_INIT          = 26,
-	FUSE_OPENDIR       = 27,
-	FUSE_READDIR       = 28,
-	FUSE_RELEASEDIR    = 29,
-	FUSE_FSYNCDIR      = 30,
-	FUSE_GETLK         = 31,
-	FUSE_SETLK         = 32,
-	FUSE_SETLKW        = 33,
-	FUSE_ACCESS        = 34,
-	FUSE_CREATE        = 35,
-	FUSE_INTERRUPT     = 36,
-	FUSE_BMAP          = 37,
-	FUSE_DESTROY       = 38,
-	FUSE_IOCTL         = 39,
-	FUSE_POLL          = 40,
-	FUSE_NOTIFY_REPLY  = 41,
-	FUSE_BATCH_FORGET  = 42,
-	FUSE_FALLOCATE     = 43,
-	FUSE_READDIRPLUS   = 44,
-	FUSE_RENAME2       = 45,
-
-	/* CUSE specific operations */
-	CUSE_INIT          = 4096,
-};
-
-enum fuse_notify_code {
-	FUSE_NOTIFY_POLL   = 1,
-	FUSE_NOTIFY_INVAL_INODE = 2,
-	FUSE_NOTIFY_INVAL_ENTRY = 3,
-	FUSE_NOTIFY_STORE = 4,
-	FUSE_NOTIFY_RETRIEVE = 5,
-	FUSE_NOTIFY_DELETE = 6,
-	FUSE_NOTIFY_CODE_MAX,
-};
-
-/* The read buffer is required to be at least 8k, but may be much larger */
-#define FUSE_MIN_READ_BUFFER 8192
-
-#define FUSE_COMPAT_ENTRY_OUT_SIZE 120
-
-struct fuse_entry_out {
-	uint64_t	nodeid;		/* Inode ID */
-	uint64_t	generation;	/* Inode generation: nodeid:gen must
-					   be unique for the fs's lifetime */
-	uint64_t	entry_valid;	/* Cache timeout for the name */
-	uint64_t	attr_valid;	/* Cache timeout for the attributes */
-	uint32_t	entry_valid_nsec;
-	uint32_t	attr_valid_nsec;
-	struct fuse_attr attr;
-};
-
-struct fuse_forget_in {
-	uint64_t	nlookup;
-};
-
-struct fuse_forget_one {
-	uint64_t	nodeid;
-	uint64_t	nlookup;
-};
-
-struct fuse_batch_forget_in {
-	uint32_t	count;
-	uint32_t	dummy;
-};
-
-struct fuse_getattr_in {
-	uint32_t	getattr_flags;
-	uint32_t	dummy;
-	uint64_t	fh;
-};
-
-#define FUSE_COMPAT_ATTR_OUT_SIZE 96
-
-struct fuse_attr_out {
-	uint64_t	attr_valid;	/* Cache timeout for the attributes */
-	uint32_t	attr_valid_nsec;
-	uint32_t	dummy;
-	struct fuse_attr attr;
-};
-
-#define FUSE_COMPAT_MKNOD_IN_SIZE 8
-
-struct fuse_mknod_in {
-	uint32_t	mode;
-	uint32_t	rdev;
-	uint32_t	umask;
-	uint32_t	padding;
-};
-
-struct fuse_mkdir_in {
-	uint32_t	mode;
-	uint32_t	umask;
-};
-
-struct fuse_rename_in {
-	uint64_t	newdir;
-};
-
-struct fuse_rename2_in {
-	uint64_t	newdir;
-	uint32_t	flags;
-	uint32_t	padding;
-};
-
-struct fuse_link_in {
-	uint64_t	oldnodeid;
-};
-
-struct fuse_setattr_in {
-	uint32_t	valid;
-	uint32_t	padding;
-	uint64_t	fh;
-	uint64_t	size;
-	uint64_t	lock_owner;
-	uint64_t	atime;
-	uint64_t	mtime;
-	uint64_t	ctime;
-	uint32_t	atimensec;
-	uint32_t	mtimensec;
-	uint32_t	ctimensec;
-	uint32_t	mode;
-	uint32_t	unused4;
-	uint32_t	uid;
-	uint32_t	gid;
-	uint32_t	unused5;
-};
-
-struct fuse_open_in {
-	uint32_t	flags;
-	uint32_t	unused;
-};
-
-struct fuse_create_in {
-	uint32_t	flags;
-	uint32_t	mode;
-	uint32_t	umask;
-	uint32_t	padding;
-};
-
-struct fuse_open_out {
-	uint64_t	fh;
-	uint32_t	open_flags;
-	uint32_t	padding;
-};
-
-struct fuse_release_in {
-	uint64_t	fh;
-	uint32_t	flags;
-	uint32_t	release_flags;
-	uint64_t	lock_owner;
-};
-
-struct fuse_flush_in {
-	uint64_t	fh;
-	uint32_t	unused;
-	uint32_t	padding;
-	uint64_t	lock_owner;
-};
-
-struct fuse_read_in {
-	uint64_t	fh;
-	uint64_t	offset;
-	uint32_t	size;
-	uint32_t	read_flags;
-	uint64_t	lock_owner;
-	uint32_t	flags;
-	uint32_t	padding;
-};
-
-#define FUSE_COMPAT_WRITE_IN_SIZE 24
-
-struct fuse_write_in {
-	uint64_t	fh;
-	uint64_t	offset;
-	uint32_t	size;
-	uint32_t	write_flags;
-	uint64_t	lock_owner;
-	uint32_t	flags;
-	uint32_t	padding;
-};
-
-struct fuse_write_out {
-	uint32_t	size;
-	uint32_t	padding;
-};
-
-#define FUSE_COMPAT_STATFS_SIZE 48
-
-struct fuse_statfs_out {
-	struct fuse_kstatfs st;
-};
-
-struct fuse_fsync_in {
-	uint64_t	fh;
-	uint32_t	fsync_flags;
-	uint32_t	padding;
-};
-
-struct fuse_setxattr_in {
-	uint32_t	size;
-	uint32_t	flags;
-};
-
-struct fuse_getxattr_in {
-	uint32_t	size;
-	uint32_t	padding;
-};
-
-struct fuse_getxattr_out {
-	uint32_t	size;
-	uint32_t	padding;
-};
-
-struct fuse_lk_in {
-	uint64_t	fh;
-	uint64_t	owner;
-	struct fuse_file_lock lk;
-	uint32_t	lk_flags;
-	uint32_t	padding;
-};
-
-struct fuse_lk_out {
-	struct fuse_file_lock lk;
-};
-
-struct fuse_access_in {
-	uint32_t	mask;
-	uint32_t	padding;
-};
-
-struct fuse_init_in {
-	uint32_t	major;
-	uint32_t	minor;
-	uint32_t	max_readahead;
-	uint32_t	flags;
-};
-
-#define FUSE_COMPAT_INIT_OUT_SIZE 8
-#define FUSE_COMPAT_22_INIT_OUT_SIZE 24
-
-struct fuse_init_out {
-	uint32_t	major;
-	uint32_t	minor;
-	uint32_t	max_readahead;
-	uint32_t	flags;
-	uint16_t	max_background;
-	uint16_t	congestion_threshold;
-	uint32_t	max_write;
-	uint32_t	time_gran;
-	uint32_t	unused[9];
-};
-
-#define CUSE_INIT_INFO_MAX 4096
-
-struct cuse_init_in {
-	uint32_t	major;
-	uint32_t	minor;
-	uint32_t	unused;
-	uint32_t	flags;
-};
-
-struct cuse_init_out {
-	uint32_t	major;
-	uint32_t	minor;
-	uint32_t	unused;
-	uint32_t	flags;
-	uint32_t	max_read;
-	uint32_t	max_write;
-	uint32_t	dev_major;		/* chardev major */
-	uint32_t	dev_minor;		/* chardev minor */
-	uint32_t	spare[10];
-};
-
-struct fuse_interrupt_in {
-	uint64_t	unique;
-};
-
-struct fuse_bmap_in {
-	uint64_t	block;
-	uint32_t	blocksize;
-	uint32_t	padding;
-};
-
-struct fuse_bmap_out {
-	uint64_t	block;
-};
-
-struct fuse_ioctl_in {
-	uint64_t	fh;
-	uint32_t	flags;
-	uint32_t	cmd;
-	uint64_t	arg;
-	uint32_t	in_size;
-	uint32_t	out_size;
-};
-
-struct fuse_ioctl_iovec {
-	uint64_t	base;
-	uint64_t	len;
-};
-
-struct fuse_ioctl_out {
-	int32_t		result;
-	uint32_t	flags;
-	uint32_t	in_iovs;
-	uint32_t	out_iovs;
-};
-
-struct fuse_poll_in {
-	uint64_t	fh;
-	uint64_t	kh;
-	uint32_t	flags;
-	uint32_t	events;
-};
-
-struct fuse_poll_out {
-	uint32_t	revents;
-	uint32_t	padding;
-};
-
-struct fuse_notify_poll_wakeup_out {
-	uint64_t	kh;
-};
-
-struct fuse_fallocate_in {
-	uint64_t	fh;
-	uint64_t	offset;
-	uint64_t	length;
-	uint32_t	mode;
-	uint32_t	padding;
-};
-
-struct fuse_in_header {
-	uint32_t	len;
-	uint32_t	opcode;
-	uint64_t	unique;
-	uint64_t	nodeid;
-	uint32_t	uid;
-	uint32_t	gid;
-	uint32_t	pid;
-	uint32_t	padding;
-};
-
-struct fuse_out_header {
-	uint32_t	len;
-	int32_t		error;
-	uint64_t	unique;
-};
-
-struct fuse_dirent {
-	uint64_t	ino;
-	uint64_t	off;
-	uint32_t	namelen;
-	uint32_t	type;
-	char name[];
-};
-
-#define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name)
-#define FUSE_DIRENT_ALIGN(x) \
-	(((x) + sizeof(uint64_t) - 1) & ~(sizeof(uint64_t) - 1))
-#define FUSE_DIRENT_SIZE(d) \
-	FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen)
-
-struct fuse_direntplus {
-	struct fuse_entry_out entry_out;
-	struct fuse_dirent dirent;
-};
-
-#define FUSE_NAME_OFFSET_DIRENTPLUS \
-	offsetof(struct fuse_direntplus, dirent.name)
-#define FUSE_DIRENTPLUS_SIZE(d) \
-	FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET_DIRENTPLUS + (d)->dirent.namelen)
-
-struct fuse_notify_inval_inode_out {
-	uint64_t	ino;
-	int64_t		off;
-	int64_t		len;
-};
-
-struct fuse_notify_inval_entry_out {
-	uint64_t	parent;
-	uint32_t	namelen;
-	uint32_t	padding;
-};
-
-struct fuse_notify_delete_out {
-	uint64_t	parent;
-	uint64_t	child;
-	uint32_t	namelen;
-	uint32_t	padding;
-};
-
-struct fuse_notify_store_out {
-	uint64_t	nodeid;
-	uint64_t	offset;
-	uint32_t	size;
-	uint32_t	padding;
-};
-
-struct fuse_notify_retrieve_out {
-	uint64_t	notify_unique;
-	uint64_t	nodeid;
-	uint64_t	offset;
-	uint32_t	size;
-	uint32_t	padding;
-};
-
-/* Matches the size of fuse_write_in */
-struct fuse_notify_retrieve_in {
-	uint64_t	dummy1;
-	uint64_t	offset;
-	uint32_t	size;
-	uint32_t	dummy2;
-	uint64_t	dummy3;
-	uint64_t	dummy4;
-};
-
-/* Device ioctls: */
-#define FUSE_DEV_IOC_CLONE	_IOR(229, 0, uint32_t)
-
-#endif /* _LINUX_FUSE_H */
diff --git a/openflow/usr/include/linux/futex.h b/openflow/usr/include/linux/futex.h
deleted file mode 100644
index 7a46ab9..0000000
--- a/openflow/usr/include/linux/futex.h
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef _LINUX_FUTEX_H
-#define _LINUX_FUTEX_H
-
-
-#include <linux/types.h>
-
-/* Second argument to futex syscall */
-
-
-#define FUTEX_WAIT		0
-#define FUTEX_WAKE		1
-#define FUTEX_FD		2
-#define FUTEX_REQUEUE		3
-#define FUTEX_CMP_REQUEUE	4
-#define FUTEX_WAKE_OP		5
-#define FUTEX_LOCK_PI		6
-#define FUTEX_UNLOCK_PI		7
-#define FUTEX_TRYLOCK_PI	8
-#define FUTEX_WAIT_BITSET	9
-#define FUTEX_WAKE_BITSET	10
-#define FUTEX_WAIT_REQUEUE_PI	11
-#define FUTEX_CMP_REQUEUE_PI	12
-
-#define FUTEX_PRIVATE_FLAG	128
-#define FUTEX_CLOCK_REALTIME	256
-#define FUTEX_CMD_MASK		~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME)
-
-#define FUTEX_WAIT_PRIVATE	(FUTEX_WAIT | FUTEX_PRIVATE_FLAG)
-#define FUTEX_WAKE_PRIVATE	(FUTEX_WAKE | FUTEX_PRIVATE_FLAG)
-#define FUTEX_REQUEUE_PRIVATE	(FUTEX_REQUEUE | FUTEX_PRIVATE_FLAG)
-#define FUTEX_CMP_REQUEUE_PRIVATE (FUTEX_CMP_REQUEUE | FUTEX_PRIVATE_FLAG)
-#define FUTEX_WAKE_OP_PRIVATE	(FUTEX_WAKE_OP | FUTEX_PRIVATE_FLAG)
-#define FUTEX_LOCK_PI_PRIVATE	(FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG)
-#define FUTEX_UNLOCK_PI_PRIVATE	(FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG)
-#define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)
-#define FUTEX_WAIT_BITSET_PRIVATE	(FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG)
-#define FUTEX_WAKE_BITSET_PRIVATE	(FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG)
-#define FUTEX_WAIT_REQUEUE_PI_PRIVATE	(FUTEX_WAIT_REQUEUE_PI | \
-					 FUTEX_PRIVATE_FLAG)
-#define FUTEX_CMP_REQUEUE_PI_PRIVATE	(FUTEX_CMP_REQUEUE_PI | \
-					 FUTEX_PRIVATE_FLAG)
-
-/*
- * Support for robust futexes: the kernel cleans up held futexes at
- * thread exit time.
- */
-
-/*
- * Per-lock list entry - embedded in user-space locks, somewhere close
- * to the futex field. (Note: user-space uses a double-linked list to
- * achieve O(1) list add and remove, but the kernel only needs to know
- * about the forward link)
- *
- * NOTE: this structure is part of the syscall ABI, and must not be
- * changed.
- */
-struct robust_list {
-	struct robust_list *next;
-};
-
-/*
- * Per-thread list head:
- *
- * NOTE: this structure is part of the syscall ABI, and must only be
- * changed if the change is first communicated with the glibc folks.
- * (When an incompatible change is done, we'll increase the structure
- *  size, which glibc will detect)
- */
-struct robust_list_head {
-	/*
-	 * The head of the list. Points back to itself if empty:
-	 */
-	struct robust_list list;
-
-	/*
-	 * This relative offset is set by user-space, it gives the kernel
-	 * the relative position of the futex field to examine. This way
-	 * we keep userspace flexible, to freely shape its data-structure,
-	 * without hardcoding any particular offset into the kernel:
-	 */
-	long futex_offset;
-
-	/*
-	 * The death of the thread may race with userspace setting
-	 * up a lock's links. So to handle this race, userspace first
-	 * sets this field to the address of the to-be-taken lock,
-	 * then does the lock acquire, and then adds itself to the
-	 * list, and then clears this field. Hence the kernel will
-	 * always have full knowledge of all locks that the thread
-	 * _might_ have taken. We check the owner TID in any case,
-	 * so only truly owned locks will be handled.
-	 */
-	struct robust_list *list_op_pending;
-};
-
-/*
- * Are there any waiters for this robust futex:
- */
-#define FUTEX_WAITERS		0x80000000
-
-/*
- * The kernel signals via this bit that a thread holding a futex
- * has exited without unlocking the futex. The kernel also does
- * a FUTEX_WAKE on such futexes, after setting the bit, to wake
- * up any possible waiters:
- */
-#define FUTEX_OWNER_DIED	0x40000000
-
-/*
- * The rest of the robust-futex field is for the TID:
- */
-#define FUTEX_TID_MASK		0x3fffffff
-
-/*
- * This limit protects against a deliberately circular list.
- * (Not worth introducing an rlimit for it)
- */
-#define ROBUST_LIST_LIMIT	2048
-
-/*
- * bitset with all bits set for the FUTEX_xxx_BITSET OPs to request a
- * match of any bit.
- */
-#define FUTEX_BITSET_MATCH_ANY	0xffffffff
-
-
-#define FUTEX_OP_SET		0	/* *(int *)UADDR2 = OPARG; */
-#define FUTEX_OP_ADD		1	/* *(int *)UADDR2 += OPARG; */
-#define FUTEX_OP_OR		2	/* *(int *)UADDR2 |= OPARG; */
-#define FUTEX_OP_ANDN		3	/* *(int *)UADDR2 &= ~OPARG; */
-#define FUTEX_OP_XOR		4	/* *(int *)UADDR2 ^= OPARG; */
-
-#define FUTEX_OP_OPARG_SHIFT	8	/* Use (1 << OPARG) instead of OPARG.  */
-
-#define FUTEX_OP_CMP_EQ		0	/* if (oldval == CMPARG) wake */
-#define FUTEX_OP_CMP_NE		1	/* if (oldval != CMPARG) wake */
-#define FUTEX_OP_CMP_LT		2	/* if (oldval < CMPARG) wake */
-#define FUTEX_OP_CMP_LE		3	/* if (oldval <= CMPARG) wake */
-#define FUTEX_OP_CMP_GT		4	/* if (oldval > CMPARG) wake */
-#define FUTEX_OP_CMP_GE		5	/* if (oldval >= CMPARG) wake */
-
-/* FUTEX_WAKE_OP will perform atomically
-   int oldval = *(int *)UADDR2;
-   *(int *)UADDR2 = oldval OP OPARG;
-   if (oldval CMP CMPARG)
-     wake UADDR2;  */
-
-#define FUTEX_OP(op, oparg, cmp, cmparg) \
-  (((op & 0xf) << 28) | ((cmp & 0xf) << 24)		\
-   | ((oparg & 0xfff) << 12) | (cmparg & 0xfff))
-
-#endif /* _LINUX_FUTEX_H */
diff --git a/openflow/usr/include/linux/gameport.h b/openflow/usr/include/linux/gameport.h
deleted file mode 100644
index 34246b7..0000000
--- a/openflow/usr/include/linux/gameport.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Copyright (c) 1999-2002 Vojtech Pavlik
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-#ifndef _GAMEPORT_H
-#define _GAMEPORT_H
-
-
-
-#define GAMEPORT_MODE_DISABLED		0
-#define GAMEPORT_MODE_RAW		1
-#define GAMEPORT_MODE_COOKED		2
-
-#define GAMEPORT_ID_VENDOR_ANALOG	0x0001
-#define GAMEPORT_ID_VENDOR_MADCATZ	0x0002
-#define GAMEPORT_ID_VENDOR_LOGITECH	0x0003
-#define GAMEPORT_ID_VENDOR_CREATIVE	0x0004
-#define GAMEPORT_ID_VENDOR_GENIUS	0x0005
-#define GAMEPORT_ID_VENDOR_INTERACT	0x0006
-#define GAMEPORT_ID_VENDOR_MICROSOFT	0x0007
-#define GAMEPORT_ID_VENDOR_THRUSTMASTER	0x0008
-#define GAMEPORT_ID_VENDOR_GRAVIS	0x0009
-#define GAMEPORT_ID_VENDOR_GUILLEMOT	0x000a
-
-#endif /* _GAMEPORT_H */
diff --git a/openflow/usr/include/linux/gen_stats.h b/openflow/usr/include/linux/gen_stats.h
deleted file mode 100644
index 6487317..0000000
--- a/openflow/usr/include/linux/gen_stats.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef __LINUX_GEN_STATS_H
-#define __LINUX_GEN_STATS_H
-
-#include <linux/types.h>
-
-enum {
-	TCA_STATS_UNSPEC,
-	TCA_STATS_BASIC,
-	TCA_STATS_RATE_EST,
-	TCA_STATS_QUEUE,
-	TCA_STATS_APP,
-	TCA_STATS_RATE_EST64,
-	__TCA_STATS_MAX,
-};
-#define TCA_STATS_MAX (__TCA_STATS_MAX - 1)
-
-/**
- * struct gnet_stats_basic - byte/packet throughput statistics
- * @bytes: number of seen bytes
- * @packets: number of seen packets
- */
-struct gnet_stats_basic {
-	__u64	bytes;
-	__u32	packets;
-};
-struct gnet_stats_basic_packed {
-	__u64	bytes;
-	__u32	packets;
-} __attribute__ ((packed));
-
-/**
- * struct gnet_stats_rate_est - rate estimator
- * @bps: current byte rate
- * @pps: current packet rate
- */
-struct gnet_stats_rate_est {
-	__u32	bps;
-	__u32	pps;
-};
-
-/**
- * struct gnet_stats_rate_est64 - rate estimator
- * @bps: current byte rate
- * @pps: current packet rate
- */
-struct gnet_stats_rate_est64 {
-	__u64	bps;
-	__u64	pps;
-};
-
-/**
- * struct gnet_stats_queue - queuing statistics
- * @qlen: queue length
- * @backlog: backlog size of queue
- * @drops: number of dropped packets
- * @requeues: number of requeues
- * @overlimits: number of enqueues over the limit
- */
-struct gnet_stats_queue {
-	__u32	qlen;
-	__u32	backlog;
-	__u32	drops;
-	__u32	requeues;
-	__u32	overlimits;
-};
-
-/**
- * struct gnet_estimator - rate estimator configuration
- * @interval: sampling period
- * @ewma_log: the log of measurement window weight
- */
-struct gnet_estimator {
-	signed char	interval;
-	unsigned char	ewma_log;
-};
-
-
-#endif /* __LINUX_GEN_STATS_H */
diff --git a/openflow/usr/include/linux/genetlink.h b/openflow/usr/include/linux/genetlink.h
deleted file mode 100644
index e792092..0000000
--- a/openflow/usr/include/linux/genetlink.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef __LINUX_GENERIC_NETLINK_H
-#define __LINUX_GENERIC_NETLINK_H
-
-#include <linux/types.h>
-#include <linux/netlink.h>
-
-#define GENL_NAMSIZ	16	/* length of family name */
-
-#define GENL_MIN_ID	NLMSG_MIN_TYPE
-#define GENL_MAX_ID	1023
-
-struct genlmsghdr {
-	__u8	cmd;
-	__u8	version;
-	__u16	reserved;
-};
-
-#define GENL_HDRLEN	NLMSG_ALIGN(sizeof(struct genlmsghdr))
-
-#define GENL_ADMIN_PERM		0x01
-#define GENL_CMD_CAP_DO		0x02
-#define GENL_CMD_CAP_DUMP	0x04
-#define GENL_CMD_CAP_HASPOL	0x08
-#define GENL_UNS_ADMIN_PERM	0x10
-
-/*
- * List of reserved static generic netlink identifiers:
- */
-#define GENL_ID_GENERATE	0
-#define GENL_ID_CTRL		NLMSG_MIN_TYPE
-#define GENL_ID_VFS_DQUOT	(NLMSG_MIN_TYPE + 1)
-#define GENL_ID_PMCRAID		(NLMSG_MIN_TYPE + 2)
-
-/**************************************************************************
- * Controller
- **************************************************************************/
-
-enum {
-	CTRL_CMD_UNSPEC,
-	CTRL_CMD_NEWFAMILY,
-	CTRL_CMD_DELFAMILY,
-	CTRL_CMD_GETFAMILY,
-	CTRL_CMD_NEWOPS,
-	CTRL_CMD_DELOPS,
-	CTRL_CMD_GETOPS,
-	CTRL_CMD_NEWMCAST_GRP,
-	CTRL_CMD_DELMCAST_GRP,
-	CTRL_CMD_GETMCAST_GRP, /* unused */
-	__CTRL_CMD_MAX,
-};
-
-#define CTRL_CMD_MAX (__CTRL_CMD_MAX - 1)
-
-enum {
-	CTRL_ATTR_UNSPEC,
-	CTRL_ATTR_FAMILY_ID,
-	CTRL_ATTR_FAMILY_NAME,
-	CTRL_ATTR_VERSION,
-	CTRL_ATTR_HDRSIZE,
-	CTRL_ATTR_MAXATTR,
-	CTRL_ATTR_OPS,
-	CTRL_ATTR_MCAST_GROUPS,
-	__CTRL_ATTR_MAX,
-};
-
-#define CTRL_ATTR_MAX (__CTRL_ATTR_MAX - 1)
-
-enum {
-	CTRL_ATTR_OP_UNSPEC,
-	CTRL_ATTR_OP_ID,
-	CTRL_ATTR_OP_FLAGS,
-	__CTRL_ATTR_OP_MAX,
-};
-
-#define CTRL_ATTR_OP_MAX (__CTRL_ATTR_OP_MAX - 1)
-
-enum {
-	CTRL_ATTR_MCAST_GRP_UNSPEC,
-	CTRL_ATTR_MCAST_GRP_NAME,
-	CTRL_ATTR_MCAST_GRP_ID,
-	__CTRL_ATTR_MCAST_GRP_MAX,
-};
-
-#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
-
-
-#endif /* __LINUX_GENERIC_NETLINK_H */
diff --git a/openflow/usr/include/linux/gfs2_ondisk.h b/openflow/usr/include/linux/gfs2_ondisk.h
deleted file mode 100644
index 792690a..0000000
--- a/openflow/usr/include/linux/gfs2_ondisk.h
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- */
-
-#ifndef __GFS2_ONDISK_DOT_H__
-#define __GFS2_ONDISK_DOT_H__
-
-#include <linux/types.h>
-
-#define GFS2_MAGIC		0x01161970
-#define GFS2_BASIC_BLOCK	512
-#define GFS2_BASIC_BLOCK_SHIFT	9
-
-/* Lock numbers of the LM_TYPE_NONDISK type */
-
-#define GFS2_MOUNT_LOCK		0
-#define GFS2_LIVE_LOCK		1
-#define GFS2_FREEZE_LOCK	2
-#define GFS2_RENAME_LOCK	3
-#define GFS2_CONTROL_LOCK	4
-#define GFS2_MOUNTED_LOCK	5
-
-/* Format numbers for various metadata types */
-
-#define GFS2_FORMAT_NONE	0
-#define GFS2_FORMAT_SB		100
-#define GFS2_FORMAT_RG		200
-#define GFS2_FORMAT_RB		300
-#define GFS2_FORMAT_DI		400
-#define GFS2_FORMAT_IN		500
-#define GFS2_FORMAT_LF		600
-#define GFS2_FORMAT_JD		700
-#define GFS2_FORMAT_LH		800
-#define GFS2_FORMAT_LD		900
-#define GFS2_FORMAT_LB		1000
-#define GFS2_FORMAT_EA		1600
-#define GFS2_FORMAT_ED		1700
-#define GFS2_FORMAT_QC		1400
-/* These are format numbers for entities contained in files */
-#define GFS2_FORMAT_RI		1100
-#define GFS2_FORMAT_DE		1200
-#define GFS2_FORMAT_QU		1500
-/* These are part of the superblock */
-#define GFS2_FORMAT_FS		1801
-#define GFS2_FORMAT_MULTI	1900
-
-/*
- * An on-disk inode number
- */
-
-struct gfs2_inum {
-	__be64 no_formal_ino;
-	__be64 no_addr;
-};
-
-/*
- * Generic metadata head structure
- * Every inplace buffer logged in the journal must start with this.
- */
-
-#define GFS2_METATYPE_NONE	0
-#define GFS2_METATYPE_SB	1
-#define GFS2_METATYPE_RG	2
-#define GFS2_METATYPE_RB	3
-#define GFS2_METATYPE_DI	4
-#define GFS2_METATYPE_IN	5
-#define GFS2_METATYPE_LF	6
-#define GFS2_METATYPE_JD	7
-#define GFS2_METATYPE_LH	8
-#define GFS2_METATYPE_LD	9
-#define GFS2_METATYPE_LB	12
-#define GFS2_METATYPE_EA	10
-#define GFS2_METATYPE_ED	11
-#define GFS2_METATYPE_QC	14
-
-struct gfs2_meta_header {
-	__be32 mh_magic;
-	__be32 mh_type;
-	__be64 __pad0;		/* Was generation number in gfs1 */
-	__be32 mh_format;
-	/* This union is to keep userspace happy */
-	union {
-		__be32 mh_jid;		/* Was incarnation number in gfs1 */
-		__be32 __pad1;
-	};
-};
-
-/*
- * super-block structure
- *
- * It's probably good if SIZEOF_SB <= GFS2_BASIC_BLOCK (512 bytes)
- *
- * Order is important, need to be able to read old superblocks to do on-disk
- * version upgrades.
- */
-
-/* Address of superblock in GFS2 basic blocks */
-#define GFS2_SB_ADDR		128
-
-/* The lock number for the superblock (must be zero) */
-#define GFS2_SB_LOCK		0
-
-/* Requirement:  GFS2_LOCKNAME_LEN % 8 == 0
-   Includes: the fencing zero at the end */
-#define GFS2_LOCKNAME_LEN	64
-
-struct gfs2_sb {
-	struct gfs2_meta_header sb_header;
-
-	__be32 sb_fs_format;
-	__be32 sb_multihost_format;
-	__u32  __pad0;	/* Was superblock flags in gfs1 */
-
-	__be32 sb_bsize;
-	__be32 sb_bsize_shift;
-	__u32 __pad1;	/* Was journal segment size in gfs1 */
-
-	struct gfs2_inum sb_master_dir; /* Was jindex dinode in gfs1 */
-	struct gfs2_inum __pad2; /* Was rindex dinode in gfs1 */
-	struct gfs2_inum sb_root_dir;
-
-	char sb_lockproto[GFS2_LOCKNAME_LEN];
-	char sb_locktable[GFS2_LOCKNAME_LEN];
-
-	struct gfs2_inum __pad3; /* Was quota inode in gfs1 */
-	struct gfs2_inum __pad4; /* Was licence inode in gfs1 */
-#define GFS2_HAS_UUID 1
-	__u8 sb_uuid[16]; /* The UUID, maybe 0 for backwards compat */
-};
-
-/*
- * resource index structure
- */
-
-struct gfs2_rindex {
-	__be64 ri_addr;	/* grp block disk address */
-	__be32 ri_length;	/* length of rgrp header in fs blocks */
-	__u32 __pad;
-
-	__be64 ri_data0;	/* first data location */
-	__be32 ri_data;	/* num of data blocks in rgrp */
-
-	__be32 ri_bitbytes;	/* number of bytes in data bitmaps */
-
-	__u8 ri_reserved[64];
-};
-
-/*
- * resource group header structure
- */
-
-/* Number of blocks per byte in rgrp */
-#define GFS2_NBBY		4
-#define GFS2_BIT_SIZE		2
-#define GFS2_BIT_MASK		0x00000003
-
-#define GFS2_BLKST_FREE		0
-#define GFS2_BLKST_USED		1
-#define GFS2_BLKST_UNLINKED	2
-#define GFS2_BLKST_DINODE	3
-
-#define GFS2_RGF_JOURNAL	0x00000001
-#define GFS2_RGF_METAONLY	0x00000002
-#define GFS2_RGF_DATAONLY	0x00000004
-#define GFS2_RGF_NOALLOC	0x00000008
-#define GFS2_RGF_TRIMMED	0x00000010
-
-struct gfs2_rgrp_lvb {
-	__be32 rl_magic;
-	__be32 rl_flags;
-	__be32 rl_free;
-	__be32 rl_dinodes;
-	__be64 rl_igeneration;
-	__be32 rl_unlinked;
-	__be32 __pad;
-};
-
-struct gfs2_rgrp {
-	struct gfs2_meta_header rg_header;
-
-	__be32 rg_flags;
-	__be32 rg_free;
-	__be32 rg_dinodes;
-	__be32 __pad;
-	__be64 rg_igeneration;
-
-	__u8 rg_reserved[80]; /* Several fields from gfs1 now reserved */
-};
-
-/*
- * quota structure
- */
-
-struct gfs2_quota {
-	__be64 qu_limit;
-	__be64 qu_warn;
-	__be64 qu_value;
-	__u8 qu_reserved[64];
-};
-
-/*
- * dinode structure
- */
-
-#define GFS2_MAX_META_HEIGHT	10
-#define GFS2_DIR_MAX_DEPTH	17
-
-#define DT2IF(dt) (((dt) << 12) & S_IFMT)
-#define IF2DT(sif) (((sif) & S_IFMT) >> 12)
-
-enum {
-	gfs2fl_Jdata		= 0,
-	gfs2fl_ExHash		= 1,
-	gfs2fl_Unused		= 2,
-	gfs2fl_EaIndirect	= 3,
-	gfs2fl_Directio		= 4,
-	gfs2fl_Immutable	= 5,
-	gfs2fl_AppendOnly	= 6,
-	gfs2fl_NoAtime		= 7,
-	gfs2fl_Sync		= 8,
-	gfs2fl_System		= 9,
-	gfs2fl_TopLevel		= 10,
-	gfs2fl_TruncInProg	= 29,
-	gfs2fl_InheritDirectio	= 30,
-	gfs2fl_InheritJdata	= 31,
-};
-
-/* Dinode flags */
-#define GFS2_DIF_JDATA			0x00000001
-#define GFS2_DIF_EXHASH			0x00000002
-#define GFS2_DIF_UNUSED			0x00000004  /* only in gfs1 */
-#define GFS2_DIF_EA_INDIRECT		0x00000008
-#define GFS2_DIF_DIRECTIO		0x00000010
-#define GFS2_DIF_IMMUTABLE		0x00000020
-#define GFS2_DIF_APPENDONLY		0x00000040
-#define GFS2_DIF_NOATIME		0x00000080
-#define GFS2_DIF_SYNC			0x00000100
-#define GFS2_DIF_SYSTEM			0x00000200 /* New in gfs2 */
-#define GFS2_DIF_TOPDIR			0x00000400 /* New in gfs2 */
-#define GFS2_DIF_TRUNC_IN_PROG		0x20000000 /* New in gfs2 */
-#define GFS2_DIF_INHERIT_DIRECTIO	0x40000000 /* only in gfs1 */
-#define GFS2_DIF_INHERIT_JDATA		0x80000000
-
-struct gfs2_dinode {
-	struct gfs2_meta_header di_header;
-
-	struct gfs2_inum di_num;
-
-	__be32 di_mode;	/* mode of file */
-	__be32 di_uid;	/* owner's user id */
-	__be32 di_gid;	/* owner's group id */
-	__be32 di_nlink;	/* number of links to this file */
-	__be64 di_size;	/* number of bytes in file */
-	__be64 di_blocks;	/* number of blocks in file */
-	__be64 di_atime;	/* time last accessed */
-	__be64 di_mtime;	/* time last modified */
-	__be64 di_ctime;	/* time last changed */
-	__be32 di_major;	/* device major number */
-	__be32 di_minor;	/* device minor number */
-
-	/* This section varies from gfs1. Padding added to align with
-         * remainder of dinode
-	 */
-	__be64 di_goal_meta;	/* rgrp to alloc from next */
-	__be64 di_goal_data;	/* data block goal */
-	__be64 di_generation;	/* generation number for NFS */
-
-	__be32 di_flags;	/* GFS2_DIF_... */
-	__be32 di_payload_format;  /* GFS2_FORMAT_... */
-	__u16 __pad1;	/* Was ditype in gfs1 */
-	__be16 di_height;	/* height of metadata */
-	__u32 __pad2;	/* Unused incarnation number from gfs1 */
-
-	/* These only apply to directories  */
-	__u16 __pad3;	/* Padding */
-	__be16 di_depth;	/* Number of bits in the table */
-	__be32 di_entries;	/* The number of entries in the directory */
-
-	struct gfs2_inum __pad4; /* Unused even in current gfs1 */
-
-	__be64 di_eattr;	/* extended attribute block number */
-	__be32 di_atime_nsec;   /* nsec portion of atime */
-	__be32 di_mtime_nsec;   /* nsec portion of mtime */
-	__be32 di_ctime_nsec;   /* nsec portion of ctime */
-
-	__u8 di_reserved[44];
-};
-
-/*
- * directory structure - many of these per directory file
- */
-
-#define GFS2_FNAMESIZE		255
-#define GFS2_DIRENT_SIZE(name_len) ((sizeof(struct gfs2_dirent) + (name_len) + 7) & ~7)
-
-struct gfs2_dirent {
-	struct gfs2_inum de_inum;
-	__be32 de_hash;
-	__be16 de_rec_len;
-	__be16 de_name_len;
-	__be16 de_type;
-	union {
-		__u8 __pad[14];
-		struct {
-			__be16 de_rahead;
-			__u8 pad2[12];
-		};
-	};
-};
-
-/*
- * Header of leaf directory nodes
- */
-
-struct gfs2_leaf {
-	struct gfs2_meta_header lf_header;
-
-	__be16 lf_depth;		/* Depth of leaf */
-	__be16 lf_entries;		/* Number of dirents in leaf */
-	__be32 lf_dirent_format;	/* Format of the dirents */
-	__be64 lf_next;			/* Next leaf, if overflow */
-
-	union {
-		__u8 lf_reserved[64];
-		struct {
-			__be64 lf_inode;	/* Dir inode number */
-			__be32 lf_dist;		/* Dist from inode on chain */
-			__be32 lf_nsec;		/* Last ins/del usecs */
-			__be64 lf_sec;		/* Last ins/del in secs */
-			__u8 lf_reserved2[40];
-		};
-	};
-};
-
-/*
- * Extended attribute header format
- *
- * This works in a similar way to dirents. There is a fixed size header
- * followed by a variable length section made up of the name and the
- * associated data. In the case of a "stuffed" entry, the value is
- * __inline__ directly after the name, the ea_num_ptrs entry will be
- * zero in that case. For non-"stuffed" entries, there will be
- * a set of pointers (aligned to 8 byte boundary) to the block(s)
- * containing the value.
- *
- * The blocks containing the values and the blocks containing the
- * extended attribute headers themselves all start with the common
- * metadata header. Each inode, if it has extended attributes, will
- * have either a single block containing the extended attribute headers
- * or a single indirect block pointing to blocks containing the
- * extended attribute headers.
- *
- * The maximum size of the data part of an extended attribute is 64k
- * so the number of blocks required depends upon block size. Since the
- * block size also determines the number of pointers in an indirect
- * block, its a fairly complicated calculation to work out the maximum
- * number of blocks that an inode may have relating to extended attributes.
- *
- */
-
-#define GFS2_EA_MAX_NAME_LEN	255
-#define GFS2_EA_MAX_DATA_LEN	65536
-
-#define GFS2_EATYPE_UNUSED	0
-#define GFS2_EATYPE_USR		1
-#define GFS2_EATYPE_SYS		2
-#define GFS2_EATYPE_SECURITY	3
-
-#define GFS2_EATYPE_LAST	3
-#define GFS2_EATYPE_VALID(x)	((x) <= GFS2_EATYPE_LAST)
-
-#define GFS2_EAFLAG_LAST	0x01	/* last ea in block */
-
-struct gfs2_ea_header {
-	__be32 ea_rec_len;
-	__be32 ea_data_len;
-	__u8 ea_name_len;	/* no NULL pointer after the string */
-	__u8 ea_type;		/* GFS2_EATYPE_... */
-	__u8 ea_flags;		/* GFS2_EAFLAG_... */
-	__u8 ea_num_ptrs;
-	__u32 __pad;
-};
-
-/*
- * Log header structure
- */
-
-#define GFS2_LOG_HEAD_UNMOUNT	0x00000001	/* log is clean */
-
-struct gfs2_log_header {
-	struct gfs2_meta_header lh_header;
-
-	__be64 lh_sequence;	/* Sequence number of this transaction */
-	__be32 lh_flags;	/* GFS2_LOG_HEAD_... */
-	__be32 lh_tail;		/* Block number of log tail */
-	__be32 lh_blkno;
-	__be32 lh_hash;
-};
-
-/*
- * Log type descriptor
- */
-
-#define GFS2_LOG_DESC_METADATA	300
-/* ld_data1 is the number of metadata blocks in the descriptor.
-   ld_data2 is unused. */
-
-#define GFS2_LOG_DESC_REVOKE	301
-/* ld_data1 is the number of revoke blocks in the descriptor.
-   ld_data2 is unused. */
-
-#define GFS2_LOG_DESC_JDATA	302
-/* ld_data1 is the number of data blocks in the descriptor.
-   ld_data2 is unused. */
-
-struct gfs2_log_descriptor {
-	struct gfs2_meta_header ld_header;
-
-	__be32 ld_type;		/* GFS2_LOG_DESC_... */
-	__be32 ld_length;	/* Number of buffers in this chunk */
-	__be32 ld_data1;	/* descriptor-specific field */
-	__be32 ld_data2;	/* descriptor-specific field */
-
-	__u8 ld_reserved[32];
-};
-
-/*
- * Inum Range
- * Describe a range of formal inode numbers allocated to
- * one machine to assign to inodes.
- */
-
-#define GFS2_INUM_QUANTUM	1048576
-
-struct gfs2_inum_range {
-	__be64 ir_start;
-	__be64 ir_length;
-};
-
-/*
- * Statfs change
- * Describes an change to the pool of free and allocated
- * blocks.
- */
-
-struct gfs2_statfs_change {
-	__be64 sc_total;
-	__be64 sc_free;
-	__be64 sc_dinodes;
-};
-
-/*
- * Quota change
- * Describes an allocation change for a particular
- * user or group.
- */
-
-#define GFS2_QCF_USER		0x00000001
-
-struct gfs2_quota_change {
-	__be64 qc_change;
-	__be32 qc_flags;	/* GFS2_QCF_... */
-	__be32 qc_id;
-};
-
-struct gfs2_quota_lvb {
-        __be32 qb_magic;
-        __u32 __pad;
-        __be64 qb_limit;      /* Hard limit of # blocks to alloc */
-        __be64 qb_warn;       /* Warn user when alloc is above this # */
-        __be64 qb_value;       /* Current # blocks allocated */
-};
-
-#endif /* __GFS2_ONDISK_DOT_H__ */
diff --git a/openflow/usr/include/linux/gigaset_dev.h b/openflow/usr/include/linux/gigaset_dev.h
deleted file mode 100644
index 258ba82..0000000
--- a/openflow/usr/include/linux/gigaset_dev.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * interface to user space for the gigaset driver
- *
- * Copyright (c) 2004 by Hansjoerg Lipp <hjlipp@web.de>
- *
- * =====================================================================
- *    This program is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU General Public License as
- *    published by the Free Software Foundation; either version 2 of
- *    the License, or (at your option) any later version.
- * =====================================================================
- */
-
-#ifndef GIGASET_INTERFACE_H
-#define GIGASET_INTERFACE_H
-
-#include <linux/ioctl.h>
-
-/* The magic IOCTL value for this interface. */
-#define GIGASET_IOCTL 0x47
-
-/* enable/disable device control via character device (lock out ISDN subsys) */
-#define GIGASET_REDIR    _IOWR(GIGASET_IOCTL, 0, int)
-
-/* enable adapter configuration mode (M10x only) */
-#define GIGASET_CONFIG   _IOWR(GIGASET_IOCTL, 1, int)
-
-/* set break characters (M105 only) */
-#define GIGASET_BRKCHARS _IOW(GIGASET_IOCTL, 2, unsigned char[6])
-
-/* get version information selected by arg[0] */
-#define GIGASET_VERSION  _IOWR(GIGASET_IOCTL, 3, unsigned[4])
-/* values for GIGASET_VERSION arg[0] */
-#define GIGVER_DRIVER 0		/* get driver version */
-#define GIGVER_COMPAT 1		/* get interface compatibility version */
-#define GIGVER_FWBASE 2		/* get base station firmware version */
-
-#endif
diff --git a/openflow/usr/include/linux/gsmmux.h b/openflow/usr/include/linux/gsmmux.h
deleted file mode 100644
index ab055d8..0000000
--- a/openflow/usr/include/linux/gsmmux.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _LINUX_GSMMUX_H
-#define _LINUX_GSMMUX_H
-
-#include <linux/if.h>
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-struct gsm_config
-{
-	unsigned int adaption;
-	unsigned int encapsulation;
-	unsigned int initiator;
-	unsigned int t1;
-	unsigned int t2;
-	unsigned int t3;
-	unsigned int n2;
-	unsigned int mru;
-	unsigned int mtu;
-	unsigned int k;
-	unsigned int i;
-	unsigned int unused[8];		/* Padding for expansion without
-					   breaking stuff */
-};
-
-#define GSMIOC_GETCONF		_IOR('G', 0, struct gsm_config)
-#define GSMIOC_SETCONF		_IOW('G', 1, struct gsm_config)
-
-struct gsm_netconfig {
-	unsigned int adaption;  /* Adaption to use in network mode */
-	unsigned short protocol;/* Protocol to use - only ETH_P_IP supported */
-	unsigned short unused2;
-	char if_name[IFNAMSIZ];	/* interface name format string */
-	__u8 unused[28];        /* For future use */
-};
-
-#define GSMIOC_ENABLE_NET      _IOW('G', 2, struct gsm_netconfig)
-#define GSMIOC_DISABLE_NET     _IO('G', 3)
-
-
-#endif
diff --git a/openflow/usr/include/linux/hdlc.h b/openflow/usr/include/linux/hdlc.h
deleted file mode 100644
index 89e484d..0000000
--- a/openflow/usr/include/linux/hdlc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Generic HDLC support routines for Linux
- *
- * Copyright (C) 1999-2005 Krzysztof Halasa <khc@pm.waw.pl>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- */
-
-#ifndef __HDLC_H
-#define __HDLC_H
-
-
-#define HDLC_MAX_MTU 1500	/* Ethernet 1500 bytes */
-#if 0
-#define HDLC_MAX_MRU (HDLC_MAX_MTU + 10 + 14 + 4) /* for ETH+VLAN over FR */
-#else
-#define HDLC_MAX_MRU 1600 /* as required for FR network */
-#endif
-
-
-#endif /* __HDLC_H */
diff --git a/openflow/usr/include/linux/hdlc/ioctl.h b/openflow/usr/include/linux/hdlc/ioctl.h
deleted file mode 100644
index 04bc027..0000000
--- a/openflow/usr/include/linux/hdlc/ioctl.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef __HDLC_IOCTL_H__
-#define __HDLC_IOCTL_H__
-
-
-#define GENERIC_HDLC_VERSION 4	/* For synchronization with sethdlc utility */
-
-#define CLOCK_DEFAULT   0	/* Default setting */
-#define CLOCK_EXT	1	/* External TX and RX clock - DTE */
-#define CLOCK_INT	2	/* Internal TX and RX clock - DCE */
-#define CLOCK_TXINT	3	/* Internal TX and external RX clock */
-#define CLOCK_TXFROMRX	4	/* TX clock derived from external RX clock */
-
-
-#define ENCODING_DEFAULT	0 /* Default setting */
-#define ENCODING_NRZ		1
-#define ENCODING_NRZI		2
-#define ENCODING_FM_MARK	3
-#define ENCODING_FM_SPACE	4
-#define ENCODING_MANCHESTER	5
-
-
-#define PARITY_DEFAULT		0 /* Default setting */
-#define PARITY_NONE		1 /* No parity */
-#define PARITY_CRC16_PR0	2 /* CRC16, initial value 0x0000 */
-#define PARITY_CRC16_PR1	3 /* CRC16, initial value 0xFFFF */
-#define PARITY_CRC16_PR0_CCITT	4 /* CRC16, initial 0x0000, ITU-T version */
-#define PARITY_CRC16_PR1_CCITT	5 /* CRC16, initial 0xFFFF, ITU-T version */
-#define PARITY_CRC32_PR0_CCITT	6 /* CRC32, initial value 0x00000000 */
-#define PARITY_CRC32_PR1_CCITT	7 /* CRC32, initial value 0xFFFFFFFF */
-
-#define LMI_DEFAULT		0 /* Default setting */
-#define LMI_NONE		1 /* No LMI, all PVCs are static */
-#define LMI_ANSI		2 /* ANSI Annex D */
-#define LMI_CCITT		3 /* ITU-T Annex A */
-#define LMI_CISCO		4 /* The "original" LMI, aka Gang of Four */
-
-#ifndef __ASSEMBLY__
-
-typedef struct {
-	unsigned int clock_rate; /* bits per second */
-	unsigned int clock_type; /* internal, external, TX-internal etc. */
-	unsigned short loopback;
-} sync_serial_settings;          /* V.35, V.24, X.21 */
-
-typedef struct {
-	unsigned int clock_rate; /* bits per second */
-	unsigned int clock_type; /* internal, external, TX-internal etc. */
-	unsigned short loopback;
-	unsigned int slot_map;
-} te1_settings;                  /* T1, E1 */
-
-typedef struct {
-	unsigned short encoding;
-	unsigned short parity;
-} raw_hdlc_proto;
-
-typedef struct {
-	unsigned int t391;
-	unsigned int t392;
-	unsigned int n391;
-	unsigned int n392;
-	unsigned int n393;
-	unsigned short lmi;
-	unsigned short dce; /* 1 for DCE (network side) operation */
-} fr_proto;
-
-typedef struct {
-	unsigned int dlci;
-} fr_proto_pvc;          /* for creating/deleting FR PVCs */
-
-typedef struct {
-	unsigned int dlci;
-	char master[IFNAMSIZ];	/* Name of master FRAD device */
-}fr_proto_pvc_info;		/* for returning PVC information only */
-
-typedef struct {
-    unsigned int interval;
-    unsigned int timeout;
-} cisco_proto;
-
-/* PPP doesn't need any info now - supply length = 0 to ioctl */
-
-#endif /* __ASSEMBLY__ */
-#endif /* __HDLC_IOCTL_H__ */
diff --git a/openflow/usr/include/linux/hdlcdrv.h b/openflow/usr/include/linux/hdlcdrv.h
deleted file mode 100644
index 422d965..0000000
--- a/openflow/usr/include/linux/hdlcdrv.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * hdlcdrv.h  -- HDLC packet radio network driver.
- * The Linux soundcard driver for 1200 baud and 9600 baud packet radio
- * (C) 1996-1998 by Thomas Sailer, HB9JNX/AE4WA
- */
-
-#ifndef _HDLCDRV_H
-#define _HDLCDRV_H
-
-/* -------------------------------------------------------------------- */
-/*
- * structs for the IOCTL commands
- */
-
-struct hdlcdrv_params {
-	int iobase;
-	int irq;
-	int dma;
-	int dma2;
-	int seriobase;
-	int pariobase;
-	int midiiobase;
-};	
-
-struct hdlcdrv_channel_params {
-	int tx_delay;  /* the transmitter keyup delay in 10ms units */
-	int tx_tail;   /* the transmitter keyoff delay in 10ms units */
-	int slottime;  /* the slottime in 10ms; usually 10 = 100ms */
-	int ppersist;  /* the p-persistence 0..255 */
-	int fulldup;   /* some driver do not support full duplex, setting */
-	               /* this just makes them send even if DCD is on */
-};	
-
-struct hdlcdrv_old_channel_state {
-  	int ptt;
-  	int dcd;
-  	int ptt_keyed;
-};
-
-struct hdlcdrv_channel_state {
- 	int ptt;
- 	int dcd;
- 	int ptt_keyed;
- 	unsigned long tx_packets;
- 	unsigned long tx_errors;
- 	unsigned long rx_packets;
- 	unsigned long rx_errors;
-};
-
-struct hdlcdrv_ioctl {
-	int cmd;
-	union {
-		struct hdlcdrv_params mp;
-		struct hdlcdrv_channel_params cp;
-		struct hdlcdrv_channel_state cs;
-		struct hdlcdrv_old_channel_state ocs;
-		unsigned int calibrate;
-		unsigned char bits;
-		char modename[128];
-		char drivername[32];
-	} data;
-};
-
-/* -------------------------------------------------------------------- */
-
-/*
- * ioctl values
- */
-#define HDLCDRVCTL_GETMODEMPAR       0
-#define HDLCDRVCTL_SETMODEMPAR       1
-#define HDLCDRVCTL_MODEMPARMASK      2  /* not handled by hdlcdrv */
-#define HDLCDRVCTL_GETCHANNELPAR    10
-#define HDLCDRVCTL_SETCHANNELPAR    11
-#define HDLCDRVCTL_OLDGETSTAT       20
-#define HDLCDRVCTL_CALIBRATE        21
-#define HDLCDRVCTL_GETSTAT          22
-
-/*
- * these are mainly for debugging purposes
- */
-#define HDLCDRVCTL_GETSAMPLES       30
-#define HDLCDRVCTL_GETBITS          31
-
-/*
- * not handled by hdlcdrv, but by its depending drivers
- */
-#define HDLCDRVCTL_GETMODE          40
-#define HDLCDRVCTL_SETMODE          41
-#define HDLCDRVCTL_MODELIST         42
-#define HDLCDRVCTL_DRIVERNAME       43
-
-/*
- * mask of needed modem parameters, returned by HDLCDRVCTL_MODEMPARMASK
- */
-#define HDLCDRV_PARMASK_IOBASE      (1<<0)
-#define HDLCDRV_PARMASK_IRQ         (1<<1)
-#define HDLCDRV_PARMASK_DMA         (1<<2)
-#define HDLCDRV_PARMASK_DMA2        (1<<3)
-#define HDLCDRV_PARMASK_SERIOBASE   (1<<4)
-#define HDLCDRV_PARMASK_PARIOBASE   (1<<5)
-#define HDLCDRV_PARMASK_MIDIIOBASE  (1<<6)
-
-/* -------------------------------------------------------------------- */
-
-
-/* -------------------------------------------------------------------- */
-
-#endif /* _HDLCDRV_H */
-
-/* -------------------------------------------------------------------- */
diff --git a/openflow/usr/include/linux/hdreg.h b/openflow/usr/include/linux/hdreg.h
deleted file mode 100644
index 774173f..0000000
--- a/openflow/usr/include/linux/hdreg.h
+++ /dev/null
@@ -1,642 +0,0 @@
-#ifndef _LINUX_HDREG_H
-#define _LINUX_HDREG_H
-
-#include <linux/types.h>
-
-/*
- * Command Header sizes for IOCTL commands
- */
-
-#define HDIO_DRIVE_CMD_HDR_SIZE		(4 * sizeof(__u8))
-#define HDIO_DRIVE_HOB_HDR_SIZE		(8 * sizeof(__u8))
-#define HDIO_DRIVE_TASK_HDR_SIZE	(8 * sizeof(__u8))
-
-#define IDE_DRIVE_TASK_NO_DATA		0
-#define IDE_DRIVE_TASK_INVALID		-1
-#define IDE_DRIVE_TASK_SET_XFER		1
-#define IDE_DRIVE_TASK_IN		2
-#define IDE_DRIVE_TASK_OUT		3
-#define IDE_DRIVE_TASK_RAW_WRITE	4
-
-/*
- * Define standard taskfile in/out register
- */
-#define IDE_TASKFILE_STD_IN_FLAGS	0xFE
-#define IDE_HOB_STD_IN_FLAGS		0x3C
-#define IDE_TASKFILE_STD_OUT_FLAGS	0xFE
-#define IDE_HOB_STD_OUT_FLAGS		0x3C
-
-typedef unsigned char task_ioreg_t;
-typedef unsigned long sata_ioreg_t;
-
-typedef union ide_reg_valid_s {
-	unsigned all				: 16;
-	struct {
-		unsigned data			: 1;
-		unsigned error_feature		: 1;
-		unsigned sector			: 1;
-		unsigned nsector		: 1;
-		unsigned lcyl			: 1;
-		unsigned hcyl			: 1;
-		unsigned select			: 1;
-		unsigned status_command		: 1;
-
-		unsigned data_hob		: 1;
-		unsigned error_feature_hob	: 1;
-		unsigned sector_hob		: 1;
-		unsigned nsector_hob		: 1;
-		unsigned lcyl_hob		: 1;
-		unsigned hcyl_hob		: 1;
-		unsigned select_hob		: 1;
-		unsigned control_hob		: 1;
-	} b;
-} ide_reg_valid_t;
-
-typedef struct ide_task_request_s {
-	__u8		io_ports[8];
-	__u8		hob_ports[8]; /* bytes 6 and 7 are unused */
-	ide_reg_valid_t	out_flags;
-	ide_reg_valid_t	in_flags;
-	int		data_phase;
-	int		req_cmd;
-	unsigned long	out_size;
-	unsigned long	in_size;
-} ide_task_request_t;
-
-typedef struct ide_ioctl_request_s {
-	ide_task_request_t	*task_request;
-	unsigned char		*out_buffer;
-	unsigned char		*in_buffer;
-} ide_ioctl_request_t;
-
-struct hd_drive_cmd_hdr {
-	__u8 command;
-	__u8 sector_number;
-	__u8 feature;
-	__u8 sector_count;
-};
-
-typedef struct hd_drive_task_hdr {
-	__u8 data;
-	__u8 feature;
-	__u8 sector_count;
-	__u8 sector_number;
-	__u8 low_cylinder;
-	__u8 high_cylinder;
-	__u8 device_head;
-	__u8 command;
-} task_struct_t;
-
-typedef struct hd_drive_hob_hdr {
-	__u8 data;
-	__u8 feature;
-	__u8 sector_count;
-	__u8 sector_number;
-	__u8 low_cylinder;
-	__u8 high_cylinder;
-	__u8 device_head;
-	__u8 control;
-} hob_struct_t;
-
-#define TASKFILE_NO_DATA		0x0000
-
-#define TASKFILE_IN			0x0001
-#define TASKFILE_MULTI_IN		0x0002
-
-#define TASKFILE_OUT			0x0004
-#define TASKFILE_MULTI_OUT		0x0008
-#define TASKFILE_IN_OUT			0x0010
-
-#define TASKFILE_IN_DMA			0x0020
-#define TASKFILE_OUT_DMA		0x0040
-#define TASKFILE_IN_DMAQ		0x0080
-#define TASKFILE_OUT_DMAQ		0x0100
-
-#define TASKFILE_P_IN			0x0200
-#define TASKFILE_P_OUT			0x0400
-#define TASKFILE_P_IN_DMA		0x0800
-#define TASKFILE_P_OUT_DMA		0x1000
-#define TASKFILE_P_IN_DMAQ		0x2000
-#define TASKFILE_P_OUT_DMAQ		0x4000
-#define TASKFILE_48			0x8000
-#define TASKFILE_INVALID		0x7fff
-
-/* ATA/ATAPI Commands pre T13 Spec */
-#define WIN_NOP				0x00
-/*
- *	0x01->0x02 Reserved
- */
-#define CFA_REQ_EXT_ERROR_CODE		0x03 /* CFA Request Extended Error Code */
-/*
- *	0x04->0x07 Reserved
- */
-#define WIN_SRST			0x08 /* ATAPI soft reset command */
-#define WIN_DEVICE_RESET		0x08
-/*
- *	0x09->0x0F Reserved
- */
-#define WIN_RECAL			0x10
-#define WIN_RESTORE			WIN_RECAL
-/*
- *	0x10->0x1F Reserved
- */
-#define WIN_READ			0x20 /* 28-Bit */
-#define WIN_READ_ONCE			0x21 /* 28-Bit without retries */
-#define WIN_READ_LONG			0x22 /* 28-Bit */
-#define WIN_READ_LONG_ONCE		0x23 /* 28-Bit without retries */
-#define WIN_READ_EXT			0x24 /* 48-Bit */
-#define WIN_READDMA_EXT			0x25 /* 48-Bit */
-#define WIN_READDMA_QUEUED_EXT		0x26 /* 48-Bit */
-#define WIN_READ_NATIVE_MAX_EXT		0x27 /* 48-Bit */
-/*
- *	0x28
- */
-#define WIN_MULTREAD_EXT		0x29 /* 48-Bit */
-/*
- *	0x2A->0x2F Reserved
- */
-#define WIN_WRITE			0x30 /* 28-Bit */
-#define WIN_WRITE_ONCE			0x31 /* 28-Bit without retries */
-#define WIN_WRITE_LONG			0x32 /* 28-Bit */
-#define WIN_WRITE_LONG_ONCE		0x33 /* 28-Bit without retries */
-#define WIN_WRITE_EXT			0x34 /* 48-Bit */
-#define WIN_WRITEDMA_EXT		0x35 /* 48-Bit */
-#define WIN_WRITEDMA_QUEUED_EXT		0x36 /* 48-Bit */
-#define WIN_SET_MAX_EXT			0x37 /* 48-Bit */
-#define CFA_WRITE_SECT_WO_ERASE		0x38 /* CFA Write Sectors without erase */
-#define WIN_MULTWRITE_EXT		0x39 /* 48-Bit */
-/*
- *	0x3A->0x3B Reserved
- */
-#define WIN_WRITE_VERIFY		0x3C /* 28-Bit */
-/*
- *	0x3D->0x3F Reserved
- */
-#define WIN_VERIFY			0x40 /* 28-Bit - Read Verify Sectors */
-#define WIN_VERIFY_ONCE			0x41 /* 28-Bit - without retries */
-#define WIN_VERIFY_EXT			0x42 /* 48-Bit */
-/*
- *	0x43->0x4F Reserved
- */
-#define WIN_FORMAT			0x50
-/*
- *	0x51->0x5F Reserved
- */
-#define WIN_INIT			0x60
-/*
- *	0x61->0x5F Reserved
- */
-#define WIN_SEEK			0x70 /* 0x70-0x7F Reserved */
-
-#define CFA_TRANSLATE_SECTOR		0x87 /* CFA Translate Sector */
-#define WIN_DIAGNOSE			0x90
-#define WIN_SPECIFY			0x91 /* set drive geometry translation */
-#define WIN_DOWNLOAD_MICROCODE		0x92
-#define WIN_STANDBYNOW2			0x94
-#define WIN_STANDBY2			0x96
-#define WIN_SETIDLE2			0x97
-#define WIN_CHECKPOWERMODE2		0x98
-#define WIN_SLEEPNOW2			0x99
-/*
- *	0x9A VENDOR
- */
-#define WIN_PACKETCMD			0xA0 /* Send a packet command. */
-#define WIN_PIDENTIFY			0xA1 /* identify ATAPI device	*/
-#define WIN_QUEUED_SERVICE		0xA2
-#define WIN_SMART			0xB0 /* self-monitoring and reporting */
-#define CFA_ERASE_SECTORS		0xC0
-#define WIN_MULTREAD			0xC4 /* read sectors using multiple mode*/
-#define WIN_MULTWRITE			0xC5 /* write sectors using multiple mode */
-#define WIN_SETMULT			0xC6 /* enable/disable multiple mode */
-#define WIN_READDMA_QUEUED		0xC7 /* read sectors using Queued DMA transfers */
-#define WIN_READDMA			0xC8 /* read sectors using DMA transfers */
-#define WIN_READDMA_ONCE		0xC9 /* 28-Bit - without retries */
-#define WIN_WRITEDMA			0xCA /* write sectors using DMA transfers */
-#define WIN_WRITEDMA_ONCE		0xCB /* 28-Bit - without retries */
-#define WIN_WRITEDMA_QUEUED		0xCC /* write sectors using Queued DMA transfers */
-#define CFA_WRITE_MULTI_WO_ERASE	0xCD /* CFA Write multiple without erase */
-#define WIN_GETMEDIASTATUS		0xDA
-#define WIN_ACKMEDIACHANGE		0xDB /* ATA-1, ATA-2 vendor */
-#define WIN_POSTBOOT			0xDC
-#define WIN_PREBOOT 			0xDD
-#define WIN_DOORLOCK			0xDE /* lock door on removable drives */
-#define WIN_DOORUNLOCK			0xDF /* unlock door on removable drives */
-#define WIN_STANDBYNOW1			0xE0
-#define WIN_IDLEIMMEDIATE		0xE1 /* force drive to become "ready" */
-#define WIN_STANDBY			0xE2 /* Set device in Standby Mode */
-#define WIN_SETIDLE1			0xE3
-#define WIN_READ_BUFFER			0xE4 /* force read only 1 sector */
-#define WIN_CHECKPOWERMODE1		0xE5
-#define WIN_SLEEPNOW1			0xE6
-#define WIN_FLUSH_CACHE			0xE7
-#define WIN_WRITE_BUFFER		0xE8 /* force write only 1 sector */
-#define WIN_WRITE_SAME			0xE9 /* read ata-2 to use */
-	/* SET_FEATURES 0x22 or 0xDD */
-#define WIN_FLUSH_CACHE_EXT		0xEA /* 48-Bit */
-#define WIN_IDENTIFY			0xEC /* ask drive to identify itself	*/
-#define WIN_MEDIAEJECT			0xED
-#define WIN_IDENTIFY_DMA		0xEE /* same as WIN_IDENTIFY, but DMA */
-#define WIN_SETFEATURES			0xEF /* set special drive features */
-#define EXABYTE_ENABLE_NEST		0xF0
-#define WIN_SECURITY_SET_PASS		0xF1
-#define WIN_SECURITY_UNLOCK		0xF2
-#define WIN_SECURITY_ERASE_PREPARE	0xF3
-#define WIN_SECURITY_ERASE_UNIT		0xF4
-#define WIN_SECURITY_FREEZE_LOCK	0xF5
-#define WIN_SECURITY_DISABLE		0xF6
-#define WIN_READ_NATIVE_MAX		0xF8 /* return the native maximum address */
-#define WIN_SET_MAX			0xF9
-#define DISABLE_SEAGATE			0xFB
-
-/* WIN_SMART sub-commands */
-
-#define SMART_READ_VALUES		0xD0
-#define SMART_READ_THRESHOLDS		0xD1
-#define SMART_AUTOSAVE			0xD2
-#define SMART_SAVE			0xD3
-#define SMART_IMMEDIATE_OFFLINE		0xD4
-#define SMART_READ_LOG_SECTOR		0xD5
-#define SMART_WRITE_LOG_SECTOR		0xD6
-#define SMART_WRITE_THRESHOLDS		0xD7
-#define SMART_ENABLE			0xD8
-#define SMART_DISABLE			0xD9
-#define SMART_STATUS			0xDA
-#define SMART_AUTO_OFFLINE		0xDB
-
-/* Password used in TF4 & TF5 executing SMART commands */
-
-#define SMART_LCYL_PASS			0x4F
-#define SMART_HCYL_PASS			0xC2
-
-/* WIN_SETFEATURES sub-commands */
-#define SETFEATURES_EN_8BIT	0x01	/* Enable 8-Bit Transfers */
-#define SETFEATURES_EN_WCACHE	0x02	/* Enable write cache */
-#define SETFEATURES_DIS_DEFECT	0x04	/* Disable Defect Management */
-#define SETFEATURES_EN_APM	0x05	/* Enable advanced power management */
-#define SETFEATURES_EN_SAME_R	0x22	/* for a region ATA-1 */
-#define SETFEATURES_DIS_MSN	0x31	/* Disable Media Status Notification */
-#define SETFEATURES_DIS_RETRY	0x33	/* Disable Retry */
-#define SETFEATURES_EN_AAM	0x42	/* Enable Automatic Acoustic Management */
-#define SETFEATURES_RW_LONG	0x44	/* Set Length of VS bytes */
-#define SETFEATURES_SET_CACHE	0x54	/* Set Cache segments to SC Reg. Val */
-#define SETFEATURES_DIS_RLA	0x55	/* Disable read look-ahead feature */
-#define SETFEATURES_EN_RI	0x5D	/* Enable release interrupt */
-#define SETFEATURES_EN_SI	0x5E	/* Enable SERVICE interrupt */
-#define SETFEATURES_DIS_RPOD	0x66	/* Disable reverting to power on defaults */
-#define SETFEATURES_DIS_ECC	0x77	/* Disable ECC byte count */
-#define SETFEATURES_DIS_8BIT	0x81	/* Disable 8-Bit Transfers */
-#define SETFEATURES_DIS_WCACHE	0x82	/* Disable write cache */
-#define SETFEATURES_EN_DEFECT	0x84	/* Enable Defect Management */
-#define SETFEATURES_DIS_APM	0x85	/* Disable advanced power management */
-#define SETFEATURES_EN_ECC	0x88	/* Enable ECC byte count */
-#define SETFEATURES_EN_MSN	0x95	/* Enable Media Status Notification */
-#define SETFEATURES_EN_RETRY	0x99	/* Enable Retry */
-#define SETFEATURES_EN_RLA	0xAA	/* Enable read look-ahead feature */
-#define SETFEATURES_PREFETCH	0xAB	/* Sets drive prefetch value */
-#define SETFEATURES_EN_REST	0xAC	/* ATA-1 */
-#define SETFEATURES_4B_RW_LONG	0xBB	/* Set Length of 4 bytes */
-#define SETFEATURES_DIS_AAM	0xC2	/* Disable Automatic Acoustic Management */
-#define SETFEATURES_EN_RPOD	0xCC	/* Enable reverting to power on defaults */
-#define SETFEATURES_DIS_RI	0xDD	/* Disable release interrupt ATAPI */
-#define SETFEATURES_EN_SAME_M	0xDD	/* for a entire device ATA-1 */
-#define SETFEATURES_DIS_SI	0xDE	/* Disable SERVICE interrupt ATAPI */
-
-/* WIN_SECURITY sub-commands */
-
-#define SECURITY_SET_PASSWORD		0xBA
-#define SECURITY_UNLOCK			0xBB
-#define SECURITY_ERASE_PREPARE		0xBC
-#define SECURITY_ERASE_UNIT		0xBD
-#define SECURITY_FREEZE_LOCK		0xBE
-#define SECURITY_DISABLE_PASSWORD	0xBF
-
-struct hd_geometry {
-      unsigned char heads;
-      unsigned char sectors;
-      unsigned short cylinders;
-      unsigned long start;
-};
-
-/* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x030n/0x031n */
-#define HDIO_GETGEO		0x0301	/* get device geometry */
-#define HDIO_GET_UNMASKINTR	0x0302	/* get current unmask setting */
-#define HDIO_GET_MULTCOUNT	0x0304	/* get current IDE blockmode setting */
-#define HDIO_GET_QDMA		0x0305	/* get use-qdma flag */
-
-#define HDIO_SET_XFER		0x0306  /* set transfer rate via proc */
-
-#define HDIO_OBSOLETE_IDENTITY	0x0307	/* OBSOLETE, DO NOT USE: returns 142 bytes */
-#define HDIO_GET_KEEPSETTINGS	0x0308	/* get keep-settings-on-reset flag */
-#define HDIO_GET_32BIT		0x0309	/* get current io_32bit setting */
-#define HDIO_GET_NOWERR		0x030a	/* get ignore-write-error flag */
-#define HDIO_GET_DMA		0x030b	/* get use-dma flag */
-#define HDIO_GET_NICE		0x030c	/* get nice flags */
-#define HDIO_GET_IDENTITY	0x030d	/* get IDE identification info */
-#define HDIO_GET_WCACHE		0x030e	/* get write cache mode on|off */
-#define HDIO_GET_ACOUSTIC	0x030f	/* get acoustic value */
-#define	HDIO_GET_ADDRESS	0x0310	/* */
-
-#define HDIO_GET_BUSSTATE	0x031a	/* get the bus state of the hwif */
-#define HDIO_TRISTATE_HWIF	0x031b	/* execute a channel tristate */
-#define HDIO_DRIVE_RESET	0x031c	/* execute a device reset */
-#define HDIO_DRIVE_TASKFILE	0x031d	/* execute raw taskfile */
-#define HDIO_DRIVE_TASK		0x031e	/* execute task and special drive command */
-#define HDIO_DRIVE_CMD		0x031f	/* execute a special drive command */
-#define HDIO_DRIVE_CMD_AEB	HDIO_DRIVE_TASK
-
-/* hd/ide ctl's that pass (arg) non-ptr values are numbered 0x032n/0x033n */
-#define HDIO_SET_MULTCOUNT	0x0321	/* change IDE blockmode */
-#define HDIO_SET_UNMASKINTR	0x0322	/* permit other irqs during I/O */
-#define HDIO_SET_KEEPSETTINGS	0x0323	/* keep ioctl settings on reset */
-#define HDIO_SET_32BIT		0x0324	/* change io_32bit flags */
-#define HDIO_SET_NOWERR		0x0325	/* change ignore-write-error flag */
-#define HDIO_SET_DMA		0x0326	/* change use-dma flag */
-#define HDIO_SET_PIO_MODE	0x0327	/* reconfig interface to new speed */
-#define HDIO_SCAN_HWIF		0x0328	/* register and (re)scan interface */
-#define HDIO_UNREGISTER_HWIF	0x032a  /* unregister interface */
-#define HDIO_SET_NICE		0x0329	/* set nice flags */
-#define HDIO_SET_WCACHE		0x032b	/* change write cache enable-disable */
-#define HDIO_SET_ACOUSTIC	0x032c	/* change acoustic behavior */
-#define HDIO_SET_BUSSTATE	0x032d	/* set the bus state of the hwif */
-#define HDIO_SET_QDMA		0x032e	/* change use-qdma flag */
-#define HDIO_SET_ADDRESS	0x032f	/* change lba addressing modes */
-
-/* bus states */
-enum {
-	BUSSTATE_OFF = 0,
-	BUSSTATE_ON,
-	BUSSTATE_TRISTATE
-};
-
-/* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x033n/0x033n */
-/* 0x330 is reserved - used to be HDIO_GETGEO_BIG */
-/* 0x331 is reserved - used to be HDIO_GETGEO_BIG_RAW */
-/* 0x338 is reserved - used to be HDIO_SET_IDE_SCSI */
-/* 0x339 is reserved - used to be HDIO_SET_SCSI_IDE */
-
-#define __NEW_HD_DRIVE_ID
-
-/*
- * Structure returned by HDIO_GET_IDENTITY, as per ANSI NCITS ATA6 rev.1b spec.
- *
- * If you change something here, please remember to update fix_driveid() in
- * ide/probe.c.
- */
-struct hd_driveid {
-	unsigned short	config;		/* lots of obsolete bit flags */
-	unsigned short	cyls;		/* Obsolete, "physical" cyls */
-	unsigned short	reserved2;	/* reserved (word 2) */
-	unsigned short	heads;		/* Obsolete, "physical" heads */
-	unsigned short	track_bytes;	/* unformatted bytes per track */
-	unsigned short	sector_bytes;	/* unformatted bytes per sector */
-	unsigned short	sectors;	/* Obsolete, "physical" sectors per track */
-	unsigned short	vendor0;	/* vendor unique */
-	unsigned short	vendor1;	/* vendor unique */
-	unsigned short	vendor2;	/* Retired vendor unique */
-	unsigned char	serial_no[20];	/* 0 = not_specified */
-	unsigned short	buf_type;	/* Retired */
-	unsigned short	buf_size;	/* Retired, 512 byte increments
-					 * 0 = not_specified
-					 */
-	unsigned short	ecc_bytes;	/* for r/w long cmds; 0 = not_specified */
-	unsigned char	fw_rev[8];	/* 0 = not_specified */
-	unsigned char	model[40];	/* 0 = not_specified */
-	unsigned char	max_multsect;	/* 0=not_implemented */
-	unsigned char	vendor3;	/* vendor unique */
-	unsigned short	dword_io;	/* 0=not_implemented; 1=implemented */
-	unsigned char	vendor4;	/* vendor unique */
-	unsigned char	capability;	/* (upper byte of word 49)
-					 *  3:	IORDYsup
-					 *  2:	IORDYsw
-					 *  1:	LBA
-					 *  0:	DMA
-					 */
-	unsigned short	reserved50;	/* reserved (word 50) */
-	unsigned char	vendor5;	/* Obsolete, vendor unique */
-	unsigned char	tPIO;		/* Obsolete, 0=slow, 1=medium, 2=fast */
-	unsigned char	vendor6;	/* Obsolete, vendor unique */
-	unsigned char	tDMA;		/* Obsolete, 0=slow, 1=medium, 2=fast */
-	unsigned short	field_valid;	/* (word 53)
-					 *  2:	ultra_ok	word  88
-					 *  1:	eide_ok		words 64-70
-					 *  0:	cur_ok		words 54-58
-					 */
-	unsigned short	cur_cyls;	/* Obsolete, logical cylinders */
-	unsigned short	cur_heads;	/* Obsolete, l heads */
-	unsigned short	cur_sectors;	/* Obsolete, l sectors per track */
-	unsigned short	cur_capacity0;	/* Obsolete, l total sectors on drive */
-	unsigned short	cur_capacity1;	/* Obsolete, (2 words, misaligned int)     */
-	unsigned char	multsect;	/* current multiple sector count */
-	unsigned char	multsect_valid;	/* when (bit0==1) multsect is ok */
-	unsigned int	lba_capacity;	/* Obsolete, total number of sectors */
-	unsigned short	dma_1word;	/* Obsolete, single-word dma info */
-	unsigned short	dma_mword;	/* multiple-word dma info */
-	unsigned short  eide_pio_modes; /* bits 0:mode3 1:mode4 */
-	unsigned short  eide_dma_min;	/* min mword dma cycle time (ns) */
-	unsigned short  eide_dma_time;	/* recommended mword dma cycle time (ns) */
-	unsigned short  eide_pio;       /* min cycle time (ns), no IORDY  */
-	unsigned short  eide_pio_iordy; /* min cycle time (ns), with IORDY */
-	unsigned short	words69_70[2];	/* reserved words 69-70
-					 * future command overlap and queuing
-					 */
-	unsigned short	words71_74[4];	/* reserved words 71-74
-					 * for IDENTIFY PACKET DEVICE command
-					 */
-	unsigned short  queue_depth;	/* (word 75)
-					 * 15:5	reserved
-					 *  4:0	Maximum queue depth -1
-					 */
-	unsigned short  words76_79[4];	/* reserved words 76-79 */
-	unsigned short  major_rev_num;	/* (word 80) */
-	unsigned short  minor_rev_num;	/* (word 81) */
-	unsigned short  command_set_1;	/* (word 82) supported
-					 * 15:	Obsolete
-					 * 14:	NOP command
-					 * 13:	READ_BUFFER
-					 * 12:	WRITE_BUFFER
-					 * 11:	Obsolete
-					 * 10:	Host Protected Area
-					 *  9:	DEVICE Reset
-					 *  8:	SERVICE Interrupt
-					 *  7:	Release Interrupt
-					 *  6:	look-ahead
-					 *  5:	write cache
-					 *  4:	PACKET Command
-					 *  3:	Power Management Feature Set
-					 *  2:	Removable Feature Set
-					 *  1:	Security Feature Set
-					 *  0:	SMART Feature Set
-					 */
-	unsigned short  command_set_2;	/* (word 83)
-					 * 15:	Shall be ZERO
-					 * 14:	Shall be ONE
-					 * 13:	FLUSH CACHE EXT
-					 * 12:	FLUSH CACHE
-					 * 11:	Device Configuration Overlay
-					 * 10:	48-bit Address Feature Set
-					 *  9:	Automatic Acoustic Management
-					 *  8:	SET MAX security
-					 *  7:	reserved 1407DT PARTIES
-					 *  6:	SetF sub-command Power-Up
-					 *  5:	Power-Up in Standby Feature Set
-					 *  4:	Removable Media Notification
-					 *  3:	APM Feature Set
-					 *  2:	CFA Feature Set
-					 *  1:	READ/WRITE DMA QUEUED
-					 *  0:	Download MicroCode
-					 */
-	unsigned short  cfsse;		/* (word 84)
-					 * cmd set-feature supported extensions
-					 * 15:	Shall be ZERO
-					 * 14:	Shall be ONE
-					 * 13:6	reserved
-					 *  5:	General Purpose Logging
-					 *  4:	Streaming Feature Set
-					 *  3:	Media Card Pass Through
-					 *  2:	Media Serial Number Valid
-					 *  1:	SMART selt-test supported
-					 *  0:	SMART error logging
-					 */
-	unsigned short  cfs_enable_1;	/* (word 85)
-					 * command set-feature enabled
-					 * 15:	Obsolete
-					 * 14:	NOP command
-					 * 13:	READ_BUFFER
-					 * 12:	WRITE_BUFFER
-					 * 11:	Obsolete
-					 * 10:	Host Protected Area
-					 *  9:	DEVICE Reset
-					 *  8:	SERVICE Interrupt
-					 *  7:	Release Interrupt
-					 *  6:	look-ahead
-					 *  5:	write cache
-					 *  4:	PACKET Command
-					 *  3:	Power Management Feature Set
-					 *  2:	Removable Feature Set
-					 *  1:	Security Feature Set
-					 *  0:	SMART Feature Set
-					 */
-	unsigned short  cfs_enable_2;	/* (word 86)
-					 * command set-feature enabled
-					 * 15:	Shall be ZERO
-					 * 14:	Shall be ONE
-					 * 13:	FLUSH CACHE EXT
-					 * 12:	FLUSH CACHE
-					 * 11:	Device Configuration Overlay
-					 * 10:	48-bit Address Feature Set
-					 *  9:	Automatic Acoustic Management
-					 *  8:	SET MAX security
-					 *  7:	reserved 1407DT PARTIES
-					 *  6:	SetF sub-command Power-Up
-					 *  5:	Power-Up in Standby Feature Set
-					 *  4:	Removable Media Notification
-					 *  3:	APM Feature Set
-					 *  2:	CFA Feature Set
-					 *  1:	READ/WRITE DMA QUEUED
-					 *  0:	Download MicroCode
-					 */
-	unsigned short  csf_default;	/* (word 87)
-					 * command set-feature default
-					 * 15:	Shall be ZERO
-					 * 14:	Shall be ONE
-					 * 13:6	reserved
-					 *  5:	General Purpose Logging enabled
-					 *  4:	Valid CONFIGURE STREAM executed
-					 *  3:	Media Card Pass Through enabled
-					 *  2:	Media Serial Number Valid
-					 *  1:	SMART selt-test supported
-					 *  0:	SMART error logging
-					 */
-	unsigned short  dma_ultra;	/* (word 88) */
-	unsigned short	trseuc;		/* time required for security erase */
-	unsigned short	trsEuc;		/* time required for enhanced erase */
-	unsigned short	CurAPMvalues;	/* current APM values */
-	unsigned short	mprc;		/* master password revision code */
-	unsigned short	hw_config;	/* hardware config (word 93)
-					 * 15:	Shall be ZERO
-					 * 14:	Shall be ONE
-					 * 13:
-					 * 12:
-					 * 11:
-					 * 10:
-					 *  9:
-					 *  8:
-					 *  7:
-					 *  6:
-					 *  5:
-					 *  4:
-					 *  3:
-					 *  2:
-					 *  1:
-					 *  0:	Shall be ONE
-					 */
-	unsigned short	acoustic;	/* (word 94)
-					 * 15:8	Vendor's recommended value
-					 *  7:0	current value
-					 */
-	unsigned short	msrqs;		/* min stream request size */
-	unsigned short	sxfert;		/* stream transfer time */
-	unsigned short	sal;		/* stream access latency */
-	unsigned int	spg;		/* stream performance granularity */
-	unsigned long long lba_capacity_2;/* 48-bit total number of sectors */
-	unsigned short	words104_125[22];/* reserved words 104-125 */
-	unsigned short	last_lun;	/* (word 126) */
-	unsigned short	word127;	/* (word 127) Feature Set
-					 * Removable Media Notification
-					 * 15:2	reserved
-					 *  1:0	00 = not supported
-					 *	01 = supported
-					 *	10 = reserved
-					 *	11 = reserved
-					 */
-	unsigned short	dlf;		/* (word 128)
-					 * device lock function
-					 * 15:9	reserved
-					 *  8	security level 1:max 0:high
-					 *  7:6	reserved
-					 *  5	enhanced erase
-					 *  4	expire
-					 *  3	frozen
-					 *  2	locked
-					 *  1	en/disabled
-					 *  0	capability
-					 */
-	unsigned short  csfo;		/*  (word 129)
-					 * current set features options
-					 * 15:4	reserved
-					 *  3:	auto reassign
-					 *  2:	reverting
-					 *  1:	read-look-ahead
-					 *  0:	write cache
-					 */
-	unsigned short	words130_155[26];/* reserved vendor words 130-155 */
-	unsigned short	word156;	/* reserved vendor word 156 */
-	unsigned short	words157_159[3];/* reserved vendor words 157-159 */
-	unsigned short	cfa_power;	/* (word 160) CFA Power Mode
-					 * 15 word 160 supported
-					 * 14 reserved
-					 * 13
-					 * 12
-					 * 11:0
-					 */
-	unsigned short	words161_175[15];/* Reserved for CFA */
-	unsigned short	words176_205[30];/* Current Media Serial Number */
-	unsigned short	words206_254[49];/* reserved words 206-254 */
-	unsigned short	integrity_word;	/* (word 255)
-					 * 15:8 Checksum
-					 *  7:0 Signature
-					 */
-};
-
-/*
- * IDE "nice" flags. These are used on a per drive basis to determine
- * when to be nice and give more bandwidth to the other devices which
- * share the same IDE bus.
- */
-#define IDE_NICE_DSC_OVERLAP	(0)	/* per the DSC overlap protocol */
-#define IDE_NICE_ATAPI_OVERLAP	(1)	/* not supported yet */
-#define IDE_NICE_1		(3)	/* when probably won't affect us much */
-#define IDE_NICE_0		(2)	/* when sure that it won't affect us */
-#define IDE_NICE_2		(4)	/* when we know it's on our expense */
-
-#endif	/* _LINUX_HDREG_H */
diff --git a/openflow/usr/include/linux/hid.h b/openflow/usr/include/linux/hid.h
deleted file mode 100644
index 2c23ba6..0000000
--- a/openflow/usr/include/linux/hid.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright (c) 1999 Andreas Gal
- *  Copyright (c) 2000-2001 Vojtech Pavlik
- *  Copyright (c) 2006-2007 Jiri Kosina
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
- */
-#ifndef __HID_H
-#define __HID_H
-
-
-
-/*
- * USB HID (Human Interface Device) interface class code
- */
-
-#define USB_INTERFACE_CLASS_HID		3
-
-/*
- * USB HID interface subclass and protocol codes
- */
-
-#define USB_INTERFACE_SUBCLASS_BOOT	1
-#define USB_INTERFACE_PROTOCOL_KEYBOARD	1
-#define USB_INTERFACE_PROTOCOL_MOUSE	2
-
-/*
- * HID class requests
- */
-
-#define HID_REQ_GET_REPORT		0x01
-#define HID_REQ_GET_IDLE		0x02
-#define HID_REQ_GET_PROTOCOL		0x03
-#define HID_REQ_SET_REPORT		0x09
-#define HID_REQ_SET_IDLE		0x0A
-#define HID_REQ_SET_PROTOCOL		0x0B
-
-/*
- * HID class descriptor types
- */
-
-#define HID_DT_HID			(USB_TYPE_CLASS | 0x01)
-#define HID_DT_REPORT			(USB_TYPE_CLASS | 0x02)
-#define HID_DT_PHYSICAL			(USB_TYPE_CLASS | 0x03)
-
-#define HID_MAX_DESCRIPTOR_SIZE		4096
-
-
-#endif /* __HID_H */
diff --git a/openflow/usr/include/linux/hiddev.h b/openflow/usr/include/linux/hiddev.h
deleted file mode 100644
index e24ca19..0000000
--- a/openflow/usr/include/linux/hiddev.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- *  Copyright (c) 1999-2000 Vojtech Pavlik
- *
- *  Sponsored by SuSE
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or 
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * 
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <vojtech@suse.cz>, or by paper mail:
- * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
- */
-#ifndef _HIDDEV_H
-#define _HIDDEV_H
-
-
-
-#include <linux/types.h>
-
-/*
- * The event structure itself
- */
-
-struct hiddev_event {
-	unsigned hid;
-	signed int value;
-};
-
-struct hiddev_devinfo {
-	__u32 bustype;
-	__u32 busnum;
-	__u32 devnum;
-	__u32 ifnum;
-	__s16 vendor;
-	__s16 product;
-	__s16 version;
-	__u32 num_applications;
-};
-
-struct hiddev_collection_info {
-	__u32 index;
-	__u32 type;
-	__u32 usage;
-	__u32 level;
-};
-
-#define HID_STRING_SIZE 256
-struct hiddev_string_descriptor {
-	__s32 index;
-	char value[HID_STRING_SIZE];
-};
-
-struct hiddev_report_info {
-	__u32 report_type;
-	__u32 report_id;
-	__u32 num_fields;
-};
-
-/* To do a GUSAGE/SUSAGE, fill in at least usage_code,  report_type and 
- * report_id.  Set report_id to REPORT_ID_UNKNOWN if the rest of the fields 
- * are unknown.  Otherwise use a usage_ref struct filled in from a previous 
- * successful GUSAGE call to save time.  To actually send a value to the
- * device, perform a SUSAGE first, followed by a SREPORT.  An INITREPORT or a
- * GREPORT isn't necessary for a GUSAGE to return valid data.
- */
-#define HID_REPORT_ID_UNKNOWN 0xffffffff
-#define HID_REPORT_ID_FIRST   0x00000100
-#define HID_REPORT_ID_NEXT    0x00000200
-#define HID_REPORT_ID_MASK    0x000000ff
-#define HID_REPORT_ID_MAX     0x000000ff
-
-#define HID_REPORT_TYPE_INPUT	1
-#define HID_REPORT_TYPE_OUTPUT	2
-#define HID_REPORT_TYPE_FEATURE	3
-#define HID_REPORT_TYPE_MIN     1
-#define HID_REPORT_TYPE_MAX     3
-
-struct hiddev_field_info {
-	__u32 report_type;
-	__u32 report_id;
-	__u32 field_index;
-	__u32 maxusage;
-	__u32 flags;
-	__u32 physical;		/* physical usage for this field */
-	__u32 logical;		/* logical usage for this field */
-	__u32 application;		/* application usage for this field */
-	__s32 logical_minimum;
-	__s32 logical_maximum;
-	__s32 physical_minimum;
-	__s32 physical_maximum;
-	__u32 unit_exponent;
-	__u32 unit;
-};
-
-/* Fill in report_type, report_id and field_index to get the information on a
- * field.
- */
-#define HID_FIELD_CONSTANT		0x001
-#define HID_FIELD_VARIABLE		0x002
-#define HID_FIELD_RELATIVE		0x004
-#define HID_FIELD_WRAP			0x008	
-#define HID_FIELD_NONLINEAR		0x010
-#define HID_FIELD_NO_PREFERRED		0x020
-#define HID_FIELD_NULL_STATE		0x040
-#define HID_FIELD_VOLATILE		0x080
-#define HID_FIELD_BUFFERED_BYTE		0x100
-
-struct hiddev_usage_ref {
-	__u32 report_type;
-	__u32 report_id;
-	__u32 field_index;
-	__u32 usage_index;
-	__u32 usage_code;
-	__s32 value;
-};
-
-/* hiddev_usage_ref_multi is used for sending multiple bytes to a control.
- * It really manifests itself as setting the value of consecutive usages */
-#define HID_MAX_MULTI_USAGES 1024
-struct hiddev_usage_ref_multi {
-	struct hiddev_usage_ref uref;
-	__u32 num_values;
-	__s32 values[HID_MAX_MULTI_USAGES];
-};
-
-/* FIELD_INDEX_NONE is returned in read() data from the kernel when flags
- * is set to (HIDDEV_FLAG_UREF | HIDDEV_FLAG_REPORT) and a new report has
- * been sent by the device 
- */
-#define HID_FIELD_INDEX_NONE 0xffffffff
-
-/*
- * Protocol version.
- */
-
-#define HID_VERSION		0x010004
-
-/*
- * IOCTLs (0x00 - 0x7f)
- */
-
-#define HIDIOCGVERSION		_IOR('H', 0x01, int)
-#define HIDIOCAPPLICATION	_IO('H', 0x02)
-#define HIDIOCGDEVINFO		_IOR('H', 0x03, struct hiddev_devinfo)
-#define HIDIOCGSTRING		_IOR('H', 0x04, struct hiddev_string_descriptor)
-#define HIDIOCINITREPORT	_IO('H', 0x05)
-#define HIDIOCGNAME(len)	_IOC(_IOC_READ, 'H', 0x06, len)
-#define HIDIOCGREPORT		_IOW('H', 0x07, struct hiddev_report_info)
-#define HIDIOCSREPORT		_IOW('H', 0x08, struct hiddev_report_info)
-#define HIDIOCGREPORTINFO	_IOWR('H', 0x09, struct hiddev_report_info)
-#define HIDIOCGFIELDINFO	_IOWR('H', 0x0A, struct hiddev_field_info)
-#define HIDIOCGUSAGE		_IOWR('H', 0x0B, struct hiddev_usage_ref)
-#define HIDIOCSUSAGE		_IOW('H', 0x0C, struct hiddev_usage_ref)
-#define HIDIOCGUCODE		_IOWR('H', 0x0D, struct hiddev_usage_ref)
-#define HIDIOCGFLAG		_IOR('H', 0x0E, int)
-#define HIDIOCSFLAG		_IOW('H', 0x0F, int)
-#define HIDIOCGCOLLECTIONINDEX	_IOW('H', 0x10, struct hiddev_usage_ref)
-#define HIDIOCGCOLLECTIONINFO	_IOWR('H', 0x11, struct hiddev_collection_info)
-#define HIDIOCGPHYS(len)	_IOC(_IOC_READ, 'H', 0x12, len)
-
-/* For writing/reading to multiple/consecutive usages */
-#define HIDIOCGUSAGES		_IOWR('H', 0x13, struct hiddev_usage_ref_multi)
-#define HIDIOCSUSAGES		_IOW('H', 0x14, struct hiddev_usage_ref_multi)
-
-/* 
- * Flags to be used in HIDIOCSFLAG
- */
-#define HIDDEV_FLAG_UREF	0x1
-#define HIDDEV_FLAG_REPORT	0x2
-#define HIDDEV_FLAGS		0x3
-
-/* To traverse the input report descriptor info for a HID device, perform the 
- * following:
- *
- * rinfo.report_type = HID_REPORT_TYPE_INPUT;
- * rinfo.report_id = HID_REPORT_ID_FIRST;
- * ret = ioctl(fd, HIDIOCGREPORTINFO, &rinfo);
- *
- * while (ret >= 0) {
- * 	for (i = 0; i < rinfo.num_fields; i++) {
- * 		finfo.report_type = rinfo.report_type;
- * 		finfo.report_id = rinfo.report_id;
- * 		finfo.field_index = i;
- * 		ioctl(fd, HIDIOCGFIELDINFO, &finfo);
- * 		for (j = 0; j < finfo.maxusage; j++) {
- * 			uref.report_type = rinfo.report_type;
- * 			uref.report_id = rinfo.report_id;
- * 			uref.field_index = i;
- * 			uref.usage_index = j;
- * 			ioctl(fd, HIDIOCGUCODE, &uref);
- * 			ioctl(fd, HIDIOCGUSAGE, &uref);
- * 		}
- * 	}
- * 	rinfo.report_id |= HID_REPORT_ID_NEXT;
- * 	ret = ioctl(fd, HIDIOCGREPORTINFO, &rinfo);
- * }
- */
-
-
-#endif /* _HIDDEV_H */
diff --git a/openflow/usr/include/linux/hidraw.h b/openflow/usr/include/linux/hidraw.h
deleted file mode 100644
index e781b0e..0000000
--- a/openflow/usr/include/linux/hidraw.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2007 Jiri Kosina
- */
-/*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef _HIDRAW_H
-#define _HIDRAW_H
-
-
-
-#include <linux/hid.h>
-#include <linux/types.h>
-
-struct hidraw_report_descriptor {
-	__u32 size;
-	__u8 value[HID_MAX_DESCRIPTOR_SIZE];
-};
-
-struct hidraw_devinfo {
-	__u32 bustype;
-	__s16 vendor;
-	__s16 product;
-};
-
-/* ioctl interface */
-#define HIDIOCGRDESCSIZE	_IOR('H', 0x01, int)
-#define HIDIOCGRDESC		_IOR('H', 0x02, struct hidraw_report_descriptor)
-#define HIDIOCGRAWINFO		_IOR('H', 0x03, struct hidraw_devinfo)
-#define HIDIOCGRAWNAME(len)     _IOC(_IOC_READ, 'H', 0x04, len)
-#define HIDIOCGRAWPHYS(len)     _IOC(_IOC_READ, 'H', 0x05, len)
-/* The first byte of SFEATURE and GFEATURE is the report number */
-#define HIDIOCSFEATURE(len)    _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len)
-#define HIDIOCGFEATURE(len)    _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len)
-
-#define HIDRAW_FIRST_MINOR 0
-#define HIDRAW_MAX_DEVICES 64
-/* number of reports to buffer */
-#define HIDRAW_BUFFER_SIZE 64
-
-
-/* kernel-only API declarations */
-
-#endif /* _HIDRAW_H */
diff --git a/openflow/usr/include/linux/hpet.h b/openflow/usr/include/linux/hpet.h
deleted file mode 100644
index 031f16f..0000000
--- a/openflow/usr/include/linux/hpet.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __HPET__
-#define __HPET__
-
-
-
-
-struct hpet_info {
-	unsigned long hi_ireqfreq;	/* Hz */
-	unsigned long hi_flags;	/* information */
-	unsigned short hi_hpet;
-	unsigned short hi_timer;
-};
-
-#define HPET_INFO_PERIODIC	0x0010	/* periodic-capable comparator */
-
-#define	HPET_IE_ON	_IO('h', 0x01)	/* interrupt on */
-#define	HPET_IE_OFF	_IO('h', 0x02)	/* interrupt off */
-#define	HPET_INFO	_IOR('h', 0x03, struct hpet_info)
-#define	HPET_EPI	_IO('h', 0x04)	/* enable periodic */
-#define	HPET_DPI	_IO('h', 0x05)	/* disable periodic */
-#define	HPET_IRQFREQ	_IOW('h', 0x6, unsigned long)	/* IRQFREQ usec */
-
-#define MAX_HPET_TBS	8		/* maximum hpet timer blocks */
-
-#endif /* __HPET__ */
diff --git a/openflow/usr/include/linux/hsi/cs-protocol.h b/openflow/usr/include/linux/hsi/cs-protocol.h
deleted file mode 100644
index f153d6e..0000000
--- a/openflow/usr/include/linux/hsi/cs-protocol.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * cmt-speech interface definitions
- *
- * Copyright (C) 2008,2009,2010 Nokia Corporation. All rights reserved.
- *
- * Contact: Kai Vehmanen <kai.vehmanen@nokia.com>
- * Original author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef _CS_PROTOCOL_H
-#define _CS_PROTOCOL_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-/* chardev parameters */
-#define CS_DEV_FILE_NAME		"/dev/cmt_speech"
-
-/* user-space API versioning */
-#define CS_IF_VERSION			2
-
-/* APE kernel <-> user space messages */
-#define CS_CMD_SHIFT			28
-#define CS_DOMAIN_SHIFT			24
-
-#define CS_CMD_MASK			0xff000000
-#define CS_PARAM_MASK			0xffffff
-
-#define CS_CMD(id, dom) \
-	(((id) << CS_CMD_SHIFT) | ((dom) << CS_DOMAIN_SHIFT))
-
-#define CS_ERROR			CS_CMD(1, 0)
-#define CS_RX_DATA_RECEIVED		CS_CMD(2, 0)
-#define CS_TX_DATA_READY		CS_CMD(3, 0)
-#define CS_TX_DATA_SENT			CS_CMD(4, 0)
-
-/* params to CS_ERROR indication */
-#define CS_ERR_PEER_RESET		0
-
-/* ioctl interface */
-
-/* parameters to CS_CONFIG_BUFS ioctl */
-#define CS_FEAT_TSTAMP_RX_CTRL		(1 << 0)
-#define CS_FEAT_ROLLING_RX_COUNTER	(2 << 0)
-
-/* parameters to CS_GET_STATE ioctl */
-#define CS_STATE_CLOSED			0
-#define CS_STATE_OPENED			1 /* resource allocated */
-#define CS_STATE_CONFIGURED		2 /* data path active */
-
-/* maximum number of TX/RX buffers */
-#define CS_MAX_BUFFERS_SHIFT		4
-#define CS_MAX_BUFFERS			(1 << CS_MAX_BUFFERS_SHIFT)
-
-/* Parameters for setting up the data buffers */
-struct cs_buffer_config {
-	__u32 rx_bufs;	/* number of RX buffer slots */
-	__u32 tx_bufs;	/* number of TX buffer slots */
-	__u32 buf_size;	/* bytes */
-	__u32 flags;	/* see CS_FEAT_* */
-	__u32 reserved[4];
-};
-
-/*
- * struct for monotonic timestamp taken when the
- * last control command was received
- */
-struct cs_timestamp {
-	__u32 tv_sec;  /* seconds */
-	__u32 tv_nsec; /* nanoseconds */
-};
-
-/*
- * Struct describing the layout and contents of the driver mmap area.
- * This information is meant as read-only information for the application.
- */
-struct cs_mmap_config_block {
-	__u32 reserved1;
-	__u32 buf_size;		/* 0=disabled, otherwise the transfer size */
-	__u32 rx_bufs;		/* # of RX buffers */
-	__u32 tx_bufs;		/* # of TX buffers */
-	__u32 reserved2;
-	/* array of offsets within the mmap area for each RX and TX buffer */
-	__u32 rx_offsets[CS_MAX_BUFFERS];
-	__u32 tx_offsets[CS_MAX_BUFFERS];
-	__u32 rx_ptr;
-	__u32 rx_ptr_boundary;
-	__u32 reserved3[2];
-	/* enabled with CS_FEAT_TSTAMP_RX_CTRL */
-	struct cs_timestamp tstamp_rx_ctrl;
-};
-
-#define CS_IO_MAGIC		'C'
-
-#define CS_IOW(num, dtype)	_IOW(CS_IO_MAGIC, num, dtype)
-#define CS_IOR(num, dtype)	_IOR(CS_IO_MAGIC, num, dtype)
-#define CS_IOWR(num, dtype)	_IOWR(CS_IO_MAGIC, num, dtype)
-#define CS_IO(num)		_IO(CS_IO_MAGIC, num)
-
-#define CS_GET_STATE		CS_IOR(21, unsigned int)
-#define CS_SET_WAKELINE		CS_IOW(23, unsigned int)
-#define CS_GET_IF_VERSION	CS_IOR(30, unsigned int)
-#define CS_CONFIG_BUFS		CS_IOW(31, struct cs_buffer_config)
-
-#endif /* _CS_PROTOCOL_H */
diff --git a/openflow/usr/include/linux/hsi/hsi_char.h b/openflow/usr/include/linux/hsi/hsi_char.h
deleted file mode 100644
index 76160b4..0000000
--- a/openflow/usr/include/linux/hsi/hsi_char.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Part of the HSI character device driver.
- *
- * Copyright (C) 2010 Nokia Corporation. All rights reserved.
- *
- * Contact: Andras Domokos <andras.domokos at nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-#ifndef __HSI_CHAR_H
-#define __HSI_CHAR_H
-
-#define HSI_CHAR_MAGIC		'k'
-#define HSC_IOW(num, dtype)	_IOW(HSI_CHAR_MAGIC, num, dtype)
-#define HSC_IOR(num, dtype)	_IOR(HSI_CHAR_MAGIC, num, dtype)
-#define HSC_IOWR(num, dtype)	_IOWR(HSI_CHAR_MAGIC, num, dtype)
-#define HSC_IO(num)		_IO(HSI_CHAR_MAGIC, num)
-
-#define HSC_RESET		HSC_IO(16)
-#define HSC_SET_PM		HSC_IO(17)
-#define HSC_SEND_BREAK		HSC_IO(18)
-#define HSC_SET_RX		HSC_IOW(19, struct hsc_rx_config)
-#define HSC_GET_RX		HSC_IOW(20, struct hsc_rx_config)
-#define HSC_SET_TX		HSC_IOW(21, struct hsc_tx_config)
-#define HSC_GET_TX		HSC_IOW(22, struct hsc_tx_config)
-
-#define HSC_PM_DISABLE		0
-#define HSC_PM_ENABLE		1
-
-#define HSC_MODE_STREAM		1
-#define HSC_MODE_FRAME		2
-#define HSC_FLOW_SYNC		0
-#define HSC_ARB_RR		0
-#define HSC_ARB_PRIO		1
-
-struct hsc_rx_config {
-	uint32_t mode;
-	uint32_t flow;
-	uint32_t channels;
-};
-
-struct hsc_tx_config {
-	uint32_t mode;
-	uint32_t channels;
-	uint32_t speed;
-	uint32_t arb_mode;
-};
-
-#endif /* __HSI_CHAR_H */
diff --git a/openflow/usr/include/linux/hsr_netlink.h b/openflow/usr/include/linux/hsr_netlink.h
deleted file mode 100644
index 2475cb8..0000000
--- a/openflow/usr/include/linux/hsr_netlink.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011-2013 Autronica Fire and Security AS
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * Author(s):
- *	2011-2013 Arvid Brodin, arvid.brodin@xdin.com
- */
-
-#ifndef __UAPI_HSR_NETLINK_H
-#define __UAPI_HSR_NETLINK_H
-
-/* Generic Netlink HSR family definition
- */
-
-/* attributes */
-enum {
-	HSR_A_UNSPEC,
-	HSR_A_NODE_ADDR,
-	HSR_A_IFINDEX,
-	HSR_A_IF1_AGE,
-	HSR_A_IF2_AGE,
-	HSR_A_NODE_ADDR_B,
-	HSR_A_IF1_SEQ,
-	HSR_A_IF2_SEQ,
-	HSR_A_IF1_IFINDEX,
-	HSR_A_IF2_IFINDEX,
-	HSR_A_ADDR_B_IFINDEX,
-	__HSR_A_MAX,
-};
-#define HSR_A_MAX (__HSR_A_MAX - 1)
-
-
-/* commands */
-enum {
-	HSR_C_UNSPEC,
-	HSR_C_RING_ERROR,
-	HSR_C_NODE_DOWN,
-	HSR_C_GET_NODE_STATUS,
-	HSR_C_SET_NODE_STATUS,
-	HSR_C_GET_NODE_LIST,
-	HSR_C_SET_NODE_LIST,
-	__HSR_C_MAX,
-};
-#define HSR_C_MAX (__HSR_C_MAX - 1)
-
-#endif /* __UAPI_HSR_NETLINK_H */
diff --git a/openflow/usr/include/linux/hw_breakpoint.h b/openflow/usr/include/linux/hw_breakpoint.h
deleted file mode 100644
index 32486ee..0000000
--- a/openflow/usr/include/linux/hw_breakpoint.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _LINUX_HW_BREAKPOINT_H
-#define _LINUX_HW_BREAKPOINT_H
-
-enum {
-	HW_BREAKPOINT_LEN_1 = 1,
-	HW_BREAKPOINT_LEN_2 = 2,
-	HW_BREAKPOINT_LEN_4 = 4,
-	HW_BREAKPOINT_LEN_8 = 8,
-};
-
-enum {
-	HW_BREAKPOINT_EMPTY	= 0,
-	HW_BREAKPOINT_R		= 1,
-	HW_BREAKPOINT_W		= 2,
-	HW_BREAKPOINT_RW	= HW_BREAKPOINT_R | HW_BREAKPOINT_W,
-	HW_BREAKPOINT_X		= 4,
-	HW_BREAKPOINT_INVALID   = HW_BREAKPOINT_RW | HW_BREAKPOINT_X,
-};
-
-enum bp_type_idx {
-	TYPE_INST 	= 0,
-#ifdef CONFIG_HAVE_MIXED_BREAKPOINTS_REGS
-	TYPE_DATA	= 0,
-#else
-	TYPE_DATA	= 1,
-#endif
-	TYPE_MAX
-};
-
-#endif /* _LINUX_HW_BREAKPOINT_H */
diff --git a/openflow/usr/include/linux/hyperv.h b/openflow/usr/include/linux/hyperv.h
deleted file mode 100644
index 0e8ad84..0000000
--- a/openflow/usr/include/linux/hyperv.h
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- *
- * Copyright (c) 2011, Microsoft Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307 USA.
- *
- * Authors:
- *   Haiyang Zhang <haiyangz@microsoft.com>
- *   Hank Janssen  <hjanssen@microsoft.com>
- *   K. Y. Srinivasan <kys@microsoft.com>
- *
- */
-
-#ifndef _HYPERV_H
-#define _HYPERV_H
-
-#include <linux/uuid.h>
-
-/*
- * Framework version for util services.
- */
-#define UTIL_FW_MINOR  0
-
-#define UTIL_WS2K8_FW_MAJOR  1
-#define UTIL_WS2K8_FW_VERSION     (UTIL_WS2K8_FW_MAJOR << 16 | UTIL_FW_MINOR)
-
-#define UTIL_FW_MAJOR  3
-#define UTIL_FW_VERSION     (UTIL_FW_MAJOR << 16 | UTIL_FW_MINOR)
-
-
-/*
- * Implementation of host controlled snapshot of the guest.
- */
-
-#define VSS_OP_REGISTER 128
-
-/*
-  Daemon code with full handshake support.
- */
-#define VSS_OP_REGISTER1 129
-
-enum hv_vss_op {
-	VSS_OP_CREATE = 0,
-	VSS_OP_DELETE,
-	VSS_OP_HOT_BACKUP,
-	VSS_OP_GET_DM_INFO,
-	VSS_OP_BU_COMPLETE,
-	/*
-	 * Following operations are only supported with IC version >= 5.0
-	 */
-	VSS_OP_FREEZE, /* Freeze the file systems in the VM */
-	VSS_OP_THAW, /* Unfreeze the file systems */
-	VSS_OP_AUTO_RECOVER,
-	VSS_OP_COUNT /* Number of operations, must be last */
-};
-
-
-/*
- * Header for all VSS messages.
- */
-struct hv_vss_hdr {
-	__u8 operation;
-	__u8 reserved[7];
-} __attribute__((packed));
-
-
-/*
- * Flag values for the hv_vss_check_feature. Linux supports only
- * one value.
- */
-#define VSS_HBU_NO_AUTO_RECOVERY	0x00000005
-
-struct hv_vss_check_feature {
-	__u32 flags;
-} __attribute__((packed));
-
-struct hv_vss_check_dm_info {
-	__u32 flags;
-} __attribute__((packed));
-
-struct hv_vss_msg {
-	union {
-		struct hv_vss_hdr vss_hdr;
-		int error;
-	};
-	union {
-		struct hv_vss_check_feature vss_cf;
-		struct hv_vss_check_dm_info dm_info;
-	};
-} __attribute__((packed));
-
-/*
- * Implementation of a host to guest copy facility.
- */
-
-#define FCOPY_VERSION_0 0
-#define FCOPY_VERSION_1 1
-#define FCOPY_CURRENT_VERSION FCOPY_VERSION_1
-#define W_MAX_PATH 260
-
-enum hv_fcopy_op {
-	START_FILE_COPY = 0,
-	WRITE_TO_FILE,
-	COMPLETE_FCOPY,
-	CANCEL_FCOPY,
-};
-
-struct hv_fcopy_hdr {
-	__u32 operation;
-	uuid_le service_id0; /* currently unused */
-	uuid_le service_id1; /* currently unused */
-} __attribute__((packed));
-
-#define OVER_WRITE	0x1
-#define CREATE_PATH	0x2
-
-struct hv_start_fcopy {
-	struct hv_fcopy_hdr hdr;
-	__u16 file_name[W_MAX_PATH];
-	__u16 path_name[W_MAX_PATH];
-	__u32 copy_flags;
-	__u64 file_size;
-} __attribute__((packed));
-
-/*
- * The file is chunked into fragments.
- */
-#define DATA_FRAGMENT	(6 * 1024)
-
-struct hv_do_fcopy {
-	struct hv_fcopy_hdr hdr;
-	__u32   pad;
-	__u64	offset;
-	__u32	size;
-	__u8	data[DATA_FRAGMENT];
-} __attribute__((packed));
-
-/*
- * An implementation of HyperV key value pair (KVP) functionality for Linux.
- *
- *
- * Copyright (C) 2010, Novell, Inc.
- * Author : K. Y. Srinivasan <ksrinivasan@novell.com>
- *
- */
-
-/*
- * Maximum value size - used for both key names and value data, and includes
- * any applicable NULL terminators.
- *
- * Note:  This limit is somewhat arbitrary, but falls easily within what is
- * supported for all native guests (back to Win 2000) and what is reasonable
- * for the IC KVP exchange functionality.  Note that Windows Me/98/95 are
- * limited to 255 character key names.
- *
- * MSDN recommends not storing data values larger than 2048 bytes in the
- * registry.
- *
- * Note:  This value is used in defining the KVP exchange message - this value
- * cannot be modified without affecting the message size and compatibility.
- */
-
-/*
- * bytes, including any null terminators
- */
-#define HV_KVP_EXCHANGE_MAX_VALUE_SIZE          (2048)
-
-
-/*
- * Maximum key size - the registry limit for the length of an entry name
- * is 256 characters, including the null terminator
- */
-
-#define HV_KVP_EXCHANGE_MAX_KEY_SIZE            (512)
-
-/*
- * In Linux, we implement the KVP functionality in two components:
- * 1) The kernel component which is packaged as part of the hv_utils driver
- * is responsible for communicating with the host and responsible for
- * implementing the host/guest protocol. 2) A user level daemon that is
- * responsible for data gathering.
- *
- * Host/Guest Protocol: The host iterates over an index and expects the guest
- * to assign a key name to the index and also return the value corresponding to
- * the key. The host will have atmost one KVP transaction outstanding at any
- * given point in time. The host side iteration stops when the guest returns
- * an error. Microsoft has specified the following mapping of key names to
- * host specified index:
- *
- *	Index		Key Name
- *	0		FullyQualifiedDomainName
- *	1		IntegrationServicesVersion
- *	2		NetworkAddressIPv4
- *	3		NetworkAddressIPv6
- *	4		OSBuildNumber
- *	5		OSName
- *	6		OSMajorVersion
- *	7		OSMinorVersion
- *	8		OSVersion
- *	9		ProcessorArchitecture
- *
- * The Windows host expects the Key Name and Key Value to be encoded in utf16.
- *
- * Guest Kernel/KVP Daemon Protocol: As noted earlier, we implement all of the
- * data gathering functionality in a user mode daemon. The user level daemon
- * is also responsible for binding the key name to the index as well. The
- * kernel and user-level daemon communicate using a connector channel.
- *
- * The user mode component first registers with the
- * the kernel component. Subsequently, the kernel component requests, data
- * for the specified keys. In response to this message the user mode component
- * fills in the value corresponding to the specified key. We overload the
- * sequence field in the cn_msg header to define our KVP message types.
- *
- *
- * The kernel component simply acts as a conduit for communication between the
- * Windows host and the user-level daemon. The kernel component passes up the
- * index received from the Host to the user-level daemon. If the index is
- * valid (supported), the corresponding key as well as its
- * value (both are strings) is returned. If the index is invalid
- * (not supported), a NULL key string is returned.
- */
-
-
-/*
- * Registry value types.
- */
-
-#define REG_SZ 1
-#define REG_U32 4
-#define REG_U64 8
-
-/*
- * As we look at expanding the KVP functionality to include
- * IP injection functionality, we need to maintain binary
- * compatibility with older daemons.
- *
- * The KVP opcodes are defined by the host and it was unfortunate
- * that I chose to treat the registration operation as part of the
- * KVP operations defined by the host.
- * Here is the level of compatibility
- * (between the user level daemon and the kernel KVP driver) that we
- * will implement:
- *
- * An older daemon will always be supported on a newer driver.
- * A given user level daemon will require a minimal version of the
- * kernel driver.
- * If we cannot handle the version differences, we will fail gracefully
- * (this can happen when we have a user level daemon that is more
- * advanced than the KVP driver.
- *
- * We will use values used in this handshake for determining if we have
- * workable user level daemon and the kernel driver. We begin by taking the
- * registration opcode out of the KVP opcode namespace. We will however,
- * maintain compatibility with the existing user-level daemon code.
- */
-
-/*
- * Daemon code not supporting IP injection (legacy daemon).
- */
-
-#define KVP_OP_REGISTER	4
-
-/*
- * Daemon code supporting IP injection.
- * The KVP opcode field is used to communicate the
- * registration information; so define a namespace that
- * will be distinct from the host defined KVP opcode.
- */
-
-#define KVP_OP_REGISTER1 100
-
-enum hv_kvp_exchg_op {
-	KVP_OP_GET = 0,
-	KVP_OP_SET,
-	KVP_OP_DELETE,
-	KVP_OP_ENUMERATE,
-	KVP_OP_GET_IP_INFO,
-	KVP_OP_SET_IP_INFO,
-	KVP_OP_COUNT /* Number of operations, must be last. */
-};
-
-enum hv_kvp_exchg_pool {
-	KVP_POOL_EXTERNAL = 0,
-	KVP_POOL_GUEST,
-	KVP_POOL_AUTO,
-	KVP_POOL_AUTO_EXTERNAL,
-	KVP_POOL_AUTO_INTERNAL,
-	KVP_POOL_COUNT /* Number of pools, must be last. */
-};
-
-/*
- * Some Hyper-V status codes.
- */
-
-#define HV_S_OK				0x00000000
-#define HV_E_FAIL			0x80004005
-#define HV_S_CONT			0x80070103
-#define HV_ERROR_NOT_SUPPORTED		0x80070032
-#define HV_ERROR_MACHINE_LOCKED		0x800704F7
-#define HV_ERROR_DEVICE_NOT_CONNECTED	0x8007048F
-#define HV_INVALIDARG			0x80070057
-#define HV_GUID_NOTFOUND		0x80041002
-#define HV_ERROR_ALREADY_EXISTS		0x80070050
-#define HV_ERROR_DISK_FULL		0x80070070
-
-#define ADDR_FAMILY_NONE	0x00
-#define ADDR_FAMILY_IPV4	0x01
-#define ADDR_FAMILY_IPV6	0x02
-
-#define MAX_ADAPTER_ID_SIZE	128
-#define MAX_IP_ADDR_SIZE	1024
-#define MAX_GATEWAY_SIZE	512
-
-
-struct hv_kvp_ipaddr_value {
-	__u16	adapter_id[MAX_ADAPTER_ID_SIZE];
-	__u8	addr_family;
-	__u8	dhcp_enabled;
-	__u16	ip_addr[MAX_IP_ADDR_SIZE];
-	__u16	sub_net[MAX_IP_ADDR_SIZE];
-	__u16	gate_way[MAX_GATEWAY_SIZE];
-	__u16	dns_addr[MAX_IP_ADDR_SIZE];
-} __attribute__((packed));
-
-
-struct hv_kvp_hdr {
-	__u8 operation;
-	__u8 pool;
-	__u16 pad;
-} __attribute__((packed));
-
-struct hv_kvp_exchg_msg_value {
-	__u32 value_type;
-	__u32 key_size;
-	__u32 value_size;
-	__u8 key[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
-	union {
-		__u8 value[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
-		__u32 value_u32;
-		__u64 value_u64;
-	};
-} __attribute__((packed));
-
-struct hv_kvp_msg_enumerate {
-	__u32 index;
-	struct hv_kvp_exchg_msg_value data;
-} __attribute__((packed));
-
-struct hv_kvp_msg_get {
-	struct hv_kvp_exchg_msg_value data;
-};
-
-struct hv_kvp_msg_set {
-	struct hv_kvp_exchg_msg_value data;
-};
-
-struct hv_kvp_msg_delete {
-	__u32 key_size;
-	__u8 key[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
-};
-
-struct hv_kvp_register {
-	__u8 version[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
-};
-
-struct hv_kvp_msg {
-	union {
-		struct hv_kvp_hdr	kvp_hdr;
-		int error;
-	};
-	union {
-		struct hv_kvp_msg_get		kvp_get;
-		struct hv_kvp_msg_set		kvp_set;
-		struct hv_kvp_msg_delete	kvp_delete;
-		struct hv_kvp_msg_enumerate	kvp_enum_data;
-		struct hv_kvp_ipaddr_value      kvp_ip_val;
-		struct hv_kvp_register		kvp_register;
-	} body;
-} __attribute__((packed));
-
-struct hv_kvp_ip_msg {
-	__u8 operation;
-	__u8 pool;
-	struct hv_kvp_ipaddr_value      kvp_ip_val;
-} __attribute__((packed));
-
-#endif /* _HYPERV_H */
diff --git a/openflow/usr/include/linux/hysdn_if.h b/openflow/usr/include/linux/hysdn_if.h
deleted file mode 100644
index 00236ae..0000000
--- a/openflow/usr/include/linux/hysdn_if.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $Id: hysdn_if.h,v 1.1.8.3 2001/09/23 22:25:05 kai Exp $
- *
- * Linux driver for HYSDN cards
- * ioctl definitions shared by hynetmgr and driver.
- *
- * Author    Werner Cornelius (werner@titro.de) for Hypercope GmbH
- * Copyright 1999 by Werner Cornelius (werner@titro.de)
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-/****************/
-/* error values */
-/****************/
-#define ERR_NONE             0 /* no error occurred */
-#define ERR_ALREADY_BOOT  1000 /* we are already booting */
-#define EPOF_BAD_MAGIC    1001 /* bad magic in POF header */
-#define ERR_BOARD_DPRAM   1002 /* board DPRAM failed */
-#define EPOF_INTERNAL     1003 /* internal POF handler error */
-#define EPOF_BAD_IMG_SIZE 1004 /* POF boot image size invalid */
-#define ERR_BOOTIMG_FAIL  1005 /* 1. stage boot image did not start */
-#define ERR_BOOTSEQ_FAIL  1006 /* 2. stage boot seq handshake timeout */
-#define ERR_POF_TIMEOUT   1007 /* timeout waiting for card pof ready */
-#define ERR_NOT_BOOTED    1008 /* operation only allowed when booted */
-#define ERR_CONF_LONG     1009 /* conf line is too long */ 
-#define ERR_INV_CHAN      1010 /* invalid channel number */ 
-#define ERR_ASYNC_TIME    1011 /* timeout sending async data */ 
-
-
-
-
diff --git a/openflow/usr/include/linux/i2c-dev.h b/openflow/usr/include/linux/i2c-dev.h
deleted file mode 100644
index bbb50e8..0000000
--- a/openflow/usr/include/linux/i2c-dev.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    i2c-dev.h - i2c-bus driver, char device interface
-
-    Copyright (C) 1995-97 Simon G. Vogl
-    Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA 02110-1301 USA.
-*/
-
-#ifndef _LINUX_I2C_DEV_H
-#define _LINUX_I2C_DEV_H
-
-#include <linux/types.h>
-
-
-/* /dev/i2c-X ioctl commands.  The ioctl's parameter is always an
- * unsigned long, except for:
- *	- I2C_FUNCS, takes pointer to an unsigned long
- *	- I2C_RDWR, takes pointer to struct i2c_rdwr_ioctl_data
- *	- I2C_SMBUS, takes pointer to struct i2c_smbus_ioctl_data
- */
-#define I2C_RETRIES	0x0701	/* number of times a device address should
-				   be polled when not acknowledging */
-#define I2C_TIMEOUT	0x0702	/* set timeout in units of 10 ms */
-
-/* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses
- * are NOT supported! (due to code brokenness)
- */
-#define I2C_SLAVE	0x0703	/* Use this slave address */
-#define I2C_SLAVE_FORCE	0x0706	/* Use this slave address, even if it
-				   is already in use by a driver! */
-#define I2C_TENBIT	0x0704	/* 0 for 7 bit addrs, != 0 for 10 bit */
-
-#define I2C_FUNCS	0x0705	/* Get the adapter functionality mask */
-
-#define I2C_RDWR	0x0707	/* Combined R/W transfer (one STOP only) */
-
-#define I2C_PEC		0x0708	/* != 0 to use PEC with SMBus */
-#define I2C_SMBUS	0x0720	/* SMBus transfer */
-
-
-/* This is the structure as used in the I2C_SMBUS ioctl call */
-struct i2c_smbus_ioctl_data {
-	__u8 read_write;
-	__u8 command;
-	__u32 size;
-	union i2c_smbus_data *data;
-};
-
-/* This is the structure as used in the I2C_RDWR ioctl call */
-struct i2c_rdwr_ioctl_data {
-	struct i2c_msg *msgs;	/* pointers to i2c_msgs */
-	__u32 nmsgs;			/* number of i2c_msgs */
-};
-
-#define  I2C_RDWR_IOCTL_MAX_MSGS	42
-/* Originally defined with a typo, keep it for compatibility */
-#define  I2C_RDRW_IOCTL_MAX_MSGS	I2C_RDWR_IOCTL_MAX_MSGS
-
-
-#endif /* _LINUX_I2C_DEV_H */
diff --git a/openflow/usr/include/linux/i2c.h b/openflow/usr/include/linux/i2c.h
deleted file mode 100644
index 3dec329..0000000
--- a/openflow/usr/include/linux/i2c.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ------------------------------------------------------------------------- */
-/*									     */
-/* i2c.h - definitions for the i2c-bus interface			     */
-/*									     */
-/* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-2000 Simon G. Vogl
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA 02110-1301 USA.							     */
-/* ------------------------------------------------------------------------- */
-
-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
-   Frodo Looijaard <frodol@dds.nl> */
-
-#ifndef _LINUX_I2C_H
-#define _LINUX_I2C_H
-
-#include <linux/types.h>
-
-/**
- * struct i2c_msg - an I2C transaction segment beginning with START
- * @addr: Slave address, either seven or ten bits.  When this is a ten
- *	bit address, I2C_M_TEN must be set in @flags and the adapter
- *	must support I2C_FUNC_10BIT_ADDR.
- * @flags: I2C_M_RD is handled by all adapters.  No other flags may be
- *	provided unless the adapter exported the relevant I2C_FUNC_*
- *	flags through i2c_check_functionality().
- * @len: Number of data bytes in @buf being read from or written to the
- *	I2C slave address.  For read transactions where I2C_M_RECV_LEN
- *	is set, the caller guarantees that this buffer can hold up to
- *	32 bytes in addition to the initial length byte sent by the
- *	slave (plus, if used, the SMBus PEC); and this value will be
- *	incremented by the number of block data bytes received.
- * @buf: The buffer into which data is read, or from which it's written.
- *
- * An i2c_msg is the low level representation of one segment of an I2C
- * transaction.  It is visible to drivers in the @i2c_transfer() procedure,
- * to userspace from i2c-dev, and to I2C adapter drivers through the
- * @i2c_adapter.@master_xfer() method.
- *
- * Except when I2C "protocol mangling" is used, all I2C adapters implement
- * the standard rules for I2C transactions.  Each transaction begins with a
- * START.  That is followed by the slave address, and a bit encoding read
- * versus write.  Then follow all the data bytes, possibly including a byte
- * with SMBus PEC.  The transfer terminates with a NAK, or when all those
- * bytes have been transferred and ACKed.  If this is the last message in a
- * group, it is followed by a STOP.  Otherwise it is followed by the next
- * @i2c_msg transaction segment, beginning with a (repeated) START.
- *
- * Alternatively, when the adapter supports I2C_FUNC_PROTOCOL_MANGLING then
- * passing certain @flags may have changed those standard protocol behaviors.
- * Those flags are only for use with broken/nonconforming slaves, and with
- * adapters which are known to support the specific mangling options they
- * need (one or more of IGNORE_NAK, NO_RD_ACK, NOSTART, and REV_DIR_ADDR).
- */
-struct i2c_msg {
-	__u16 addr;	/* slave address			*/
-	__u16 flags;
-#define I2C_M_TEN		0x0010	/* this is a ten bit chip address */
-#define I2C_M_RD		0x0001	/* read data, from slave to master */
-#define I2C_M_STOP		0x8000	/* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_NOSTART		0x4000	/* if I2C_FUNC_NOSTART */
-#define I2C_M_REV_DIR_ADDR	0x2000	/* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_IGNORE_NAK	0x1000	/* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_NO_RD_ACK		0x0800	/* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_RECV_LEN		0x0400	/* length will be first received byte */
-	__u16 len;		/* msg length				*/
-	__u8 *buf;		/* pointer to msg data			*/
-};
-
-/* To determine what functionality is present */
-
-#define I2C_FUNC_I2C			0x00000001
-#define I2C_FUNC_10BIT_ADDR		0x00000002
-#define I2C_FUNC_PROTOCOL_MANGLING	0x00000004 /* I2C_M_IGNORE_NAK etc. */
-#define I2C_FUNC_SMBUS_PEC		0x00000008
-#define I2C_FUNC_NOSTART		0x00000010 /* I2C_M_NOSTART */
-#define I2C_FUNC_SLAVE			0x00000020
-#define I2C_FUNC_SMBUS_BLOCK_PROC_CALL	0x00008000 /* SMBus 2.0 */
-#define I2C_FUNC_SMBUS_QUICK		0x00010000
-#define I2C_FUNC_SMBUS_READ_BYTE	0x00020000
-#define I2C_FUNC_SMBUS_WRITE_BYTE	0x00040000
-#define I2C_FUNC_SMBUS_READ_BYTE_DATA	0x00080000
-#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA	0x00100000
-#define I2C_FUNC_SMBUS_READ_WORD_DATA	0x00200000
-#define I2C_FUNC_SMBUS_WRITE_WORD_DATA	0x00400000
-#define I2C_FUNC_SMBUS_PROC_CALL	0x00800000
-#define I2C_FUNC_SMBUS_READ_BLOCK_DATA	0x01000000
-#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000
-#define I2C_FUNC_SMBUS_READ_I2C_BLOCK	0x04000000 /* I2C-like block xfer  */
-#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK	0x08000000 /* w/ 1-byte reg. addr. */
-
-#define I2C_FUNC_SMBUS_BYTE		(I2C_FUNC_SMBUS_READ_BYTE | \
-					 I2C_FUNC_SMBUS_WRITE_BYTE)
-#define I2C_FUNC_SMBUS_BYTE_DATA	(I2C_FUNC_SMBUS_READ_BYTE_DATA | \
-					 I2C_FUNC_SMBUS_WRITE_BYTE_DATA)
-#define I2C_FUNC_SMBUS_WORD_DATA	(I2C_FUNC_SMBUS_READ_WORD_DATA | \
-					 I2C_FUNC_SMBUS_WRITE_WORD_DATA)
-#define I2C_FUNC_SMBUS_BLOCK_DATA	(I2C_FUNC_SMBUS_READ_BLOCK_DATA | \
-					 I2C_FUNC_SMBUS_WRITE_BLOCK_DATA)
-#define I2C_FUNC_SMBUS_I2C_BLOCK	(I2C_FUNC_SMBUS_READ_I2C_BLOCK | \
-					 I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)
-
-#define I2C_FUNC_SMBUS_EMUL		(I2C_FUNC_SMBUS_QUICK | \
-					 I2C_FUNC_SMBUS_BYTE | \
-					 I2C_FUNC_SMBUS_BYTE_DATA | \
-					 I2C_FUNC_SMBUS_WORD_DATA | \
-					 I2C_FUNC_SMBUS_PROC_CALL | \
-					 I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | \
-					 I2C_FUNC_SMBUS_I2C_BLOCK | \
-					 I2C_FUNC_SMBUS_PEC)
-
-/*
- * Data for SMBus Messages
- */
-#define I2C_SMBUS_BLOCK_MAX	32	/* As specified in SMBus standard */
-union i2c_smbus_data {
-	__u8 byte;
-	__u16 word;
-	__u8 block[I2C_SMBUS_BLOCK_MAX + 2]; /* block[0] is used for length */
-			       /* and one more for user-space compatibility */
-};
-
-/* i2c_smbus_xfer read or write markers */
-#define I2C_SMBUS_READ	1
-#define I2C_SMBUS_WRITE	0
-
-/* SMBus transaction types (size parameter in the above functions)
-   Note: these no longer correspond to the (arbitrary) PIIX4 internal codes! */
-#define I2C_SMBUS_QUICK		    0
-#define I2C_SMBUS_BYTE		    1
-#define I2C_SMBUS_BYTE_DATA	    2
-#define I2C_SMBUS_WORD_DATA	    3
-#define I2C_SMBUS_PROC_CALL	    4
-#define I2C_SMBUS_BLOCK_DATA	    5
-#define I2C_SMBUS_I2C_BLOCK_BROKEN  6
-#define I2C_SMBUS_BLOCK_PROC_CALL   7		/* SMBus 2.0 */
-#define I2C_SMBUS_I2C_BLOCK_DATA    8
-
-#endif /* _LINUX_I2C_H */
diff --git a/openflow/usr/include/linux/i2o-dev.h b/openflow/usr/include/linux/i2o-dev.h
deleted file mode 100644
index 4fb30a4..0000000
--- a/openflow/usr/include/linux/i2o-dev.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * I2O user space accessible structures/APIs
- *
- * (c) Copyright 1999, 2000 Red Hat Software
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- *************************************************************************
- *
- * This header file defines the I2O APIs that are available to both
- * the kernel and user level applications.  Kernel specific structures
- * are defined in i2o_osm. OSMs should include _only_ i2o_osm.h which
- * automatically includes this file.
- *
- */
-
-#ifndef _I2O_DEV_H
-#define _I2O_DEV_H
-
-/* How many controllers are we allowing */
-#define MAX_I2O_CONTROLLERS	32
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-/*
- * I2O Control IOCTLs and structures
- */
-#define I2O_MAGIC_NUMBER	'i'
-#define I2OGETIOPS		_IOR(I2O_MAGIC_NUMBER,0,__u8[MAX_I2O_CONTROLLERS])
-#define I2OHRTGET		_IOWR(I2O_MAGIC_NUMBER,1,struct i2o_cmd_hrtlct)
-#define I2OLCTGET		_IOWR(I2O_MAGIC_NUMBER,2,struct i2o_cmd_hrtlct)
-#define I2OPARMSET		_IOWR(I2O_MAGIC_NUMBER,3,struct i2o_cmd_psetget)
-#define I2OPARMGET		_IOWR(I2O_MAGIC_NUMBER,4,struct i2o_cmd_psetget)
-#define I2OSWDL 		_IOWR(I2O_MAGIC_NUMBER,5,struct i2o_sw_xfer)
-#define I2OSWUL 		_IOWR(I2O_MAGIC_NUMBER,6,struct i2o_sw_xfer)
-#define I2OSWDEL		_IOWR(I2O_MAGIC_NUMBER,7,struct i2o_sw_xfer)
-#define I2OVALIDATE		_IOR(I2O_MAGIC_NUMBER,8,__u32)
-#define I2OHTML 		_IOWR(I2O_MAGIC_NUMBER,9,struct i2o_html)
-#define I2OEVTREG		_IOW(I2O_MAGIC_NUMBER,10,struct i2o_evt_id)
-#define I2OEVTGET		_IOR(I2O_MAGIC_NUMBER,11,struct i2o_evt_info)
-#define I2OPASSTHRU		_IOR(I2O_MAGIC_NUMBER,12,struct i2o_cmd_passthru)
-#define I2OPASSTHRU32		_IOR(I2O_MAGIC_NUMBER,12,struct i2o_cmd_passthru32)
-
-struct i2o_cmd_passthru32 {
-	unsigned int iop;	/* IOP unit number */
-	__u32 msg;		/* message */
-};
-
-struct i2o_cmd_passthru {
-	unsigned int iop;	/* IOP unit number */
-	void *msg;	/* message */
-};
-
-struct i2o_cmd_hrtlct {
-	unsigned int iop;	/* IOP unit number */
-	void *resbuf;	/* Buffer for result */
-	unsigned int *reslen;	/* Buffer length in bytes */
-};
-
-struct i2o_cmd_psetget {
-	unsigned int iop;	/* IOP unit number */
-	unsigned int tid;	/* Target device TID */
-	void *opbuf;	/* Operation List buffer */
-	unsigned int oplen;	/* Operation List buffer length in bytes */
-	void *resbuf;	/* Result List buffer */
-	unsigned int *reslen;	/* Result List buffer length in bytes */
-};
-
-struct i2o_sw_xfer {
-	unsigned int iop;	/* IOP unit number */
-	unsigned char flags;	/* Flags field */
-	unsigned char sw_type;	/* Software type */
-	unsigned int sw_id;	/* Software ID */
-	void *buf;	/* Pointer to software buffer */
-	unsigned int *swlen;	/* Length of software data */
-	unsigned int *maxfrag;	/* Maximum fragment count */
-	unsigned int *curfrag;	/* Current fragment count */
-};
-
-struct i2o_html {
-	unsigned int iop;	/* IOP unit number */
-	unsigned int tid;	/* Target device ID */
-	unsigned int page;	/* HTML page */
-	void *resbuf;	/* Buffer for reply HTML page */
-	unsigned int *reslen;	/* Length in bytes of reply buffer */
-	void *qbuf;	/* Pointer to HTTP query string */
-	unsigned int qlen;	/* Length in bytes of query string buffer */
-};
-
-#define I2O_EVT_Q_LEN 32
-
-struct i2o_evt_id {
-	unsigned int iop;
-	unsigned int tid;
-	unsigned int evt_mask;
-};
-
-/* Event data size = frame size - message header + evt indicator */
-#define I2O_EVT_DATA_SIZE 88
-
-struct i2o_evt_info {
-	struct i2o_evt_id id;
-	unsigned char evt_data[I2O_EVT_DATA_SIZE];
-	unsigned int data_size;
-};
-
-struct i2o_evt_get {
-	struct i2o_evt_info info;
-	int pending;
-	int lost;
-};
-
-typedef struct i2o_sg_io_hdr {
-	unsigned int flags;	/* see I2O_DPT_SG_IO_FLAGS */
-} i2o_sg_io_hdr_t;
-
-/**************************************************************************
- * HRT related constants and structures
- **************************************************************************/
-#define I2O_BUS_LOCAL	0
-#define I2O_BUS_ISA	1
-#define I2O_BUS_EISA	2
-/* was  I2O_BUS_MCA	3 */
-#define I2O_BUS_PCI	4
-#define I2O_BUS_PCMCIA	5
-#define I2O_BUS_NUBUS	6
-#define I2O_BUS_CARDBUS 7
-#define I2O_BUS_UNKNOWN 0x80
-
-typedef struct _i2o_pci_bus {
-	__u8 PciFunctionNumber;
-	__u8 PciDeviceNumber;
-	__u8 PciBusNumber;
-	__u8 reserved;
-	__u16 PciVendorID;
-	__u16 PciDeviceID;
-} i2o_pci_bus;
-
-typedef struct _i2o_local_bus {
-	__u16 LbBaseIOPort;
-	__u16 reserved;
-	__u32 LbBaseMemoryAddress;
-} i2o_local_bus;
-
-typedef struct _i2o_isa_bus {
-	__u16 IsaBaseIOPort;
-	__u8 CSN;
-	__u8 reserved;
-	__u32 IsaBaseMemoryAddress;
-} i2o_isa_bus;
-
-typedef struct _i2o_eisa_bus_info {
-	__u16 EisaBaseIOPort;
-	__u8 reserved;
-	__u8 EisaSlotNumber;
-	__u32 EisaBaseMemoryAddress;
-} i2o_eisa_bus;
-
-typedef struct _i2o_mca_bus {
-	__u16 McaBaseIOPort;
-	__u8 reserved;
-	__u8 McaSlotNumber;
-	__u32 McaBaseMemoryAddress;
-} i2o_mca_bus;
-
-typedef struct _i2o_other_bus {
-	__u16 BaseIOPort;
-	__u16 reserved;
-	__u32 BaseMemoryAddress;
-} i2o_other_bus;
-
-typedef struct _i2o_hrt_entry {
-	__u32 adapter_id;
-	__u32 parent_tid:12;
-	__u32 state:4;
-	__u32 bus_num:8;
-	__u32 bus_type:8;
-	union {
-		i2o_pci_bus pci_bus;
-		i2o_local_bus local_bus;
-		i2o_isa_bus isa_bus;
-		i2o_eisa_bus eisa_bus;
-		i2o_mca_bus mca_bus;
-		i2o_other_bus other_bus;
-	} bus;
-} i2o_hrt_entry;
-
-typedef struct _i2o_hrt {
-	__u16 num_entries;
-	__u8 entry_len;
-	__u8 hrt_version;
-	__u32 change_ind;
-	i2o_hrt_entry hrt_entry[1];
-} i2o_hrt;
-
-typedef struct _i2o_lct_entry {
-	__u32 entry_size:16;
-	__u32 tid:12;
-	__u32 reserved:4;
-	__u32 change_ind;
-	__u32 device_flags;
-	__u32 class_id:12;
-	__u32 version:4;
-	__u32 vendor_id:16;
-	__u32 sub_class;
-	__u32 user_tid:12;
-	__u32 parent_tid:12;
-	__u32 bios_info:8;
-	__u8 identity_tag[8];
-	__u32 event_capabilities;
-} i2o_lct_entry;
-
-typedef struct _i2o_lct {
-	__u32 table_size:16;
-	__u32 boot_tid:12;
-	__u32 lct_ver:4;
-	__u32 iop_flags;
-	__u32 change_ind;
-	i2o_lct_entry lct_entry[1];
-} i2o_lct;
-
-typedef struct _i2o_status_block {
-	__u16 org_id;
-	__u16 reserved;
-	__u16 iop_id:12;
-	__u16 reserved1:4;
-	__u16 host_unit_id;
-	__u16 segment_number:12;
-	__u16 i2o_version:4;
-	__u8 iop_state;
-	__u8 msg_type;
-	__u16 inbound_frame_size;
-	__u8 init_code;
-	__u8 reserved2;
-	__u32 max_inbound_frames;
-	__u32 cur_inbound_frames;
-	__u32 max_outbound_frames;
-	char product_id[24];
-	__u32 expected_lct_size;
-	__u32 iop_capabilities;
-	__u32 desired_mem_size;
-	__u32 current_mem_size;
-	__u32 current_mem_base;
-	__u32 desired_io_size;
-	__u32 current_io_size;
-	__u32 current_io_base;
-	__u32 reserved3:24;
-	__u32 cmd_status:8;
-} i2o_status_block;
-
-/* Event indicator mask flags */
-#define I2O_EVT_IND_STATE_CHANGE		0x80000000
-#define I2O_EVT_IND_GENERAL_WARNING		0x40000000
-#define I2O_EVT_IND_CONFIGURATION_FLAG		0x20000000
-#define I2O_EVT_IND_LOCK_RELEASE		0x10000000
-#define I2O_EVT_IND_CAPABILITY_CHANGE		0x08000000
-#define I2O_EVT_IND_DEVICE_RESET		0x04000000
-#define I2O_EVT_IND_EVT_MASK_MODIFIED		0x02000000
-#define I2O_EVT_IND_FIELD_MODIFIED		0x01000000
-#define I2O_EVT_IND_VENDOR_EVT			0x00800000
-#define I2O_EVT_IND_DEVICE_STATE		0x00400000
-
-/* Executive event indicitors */
-#define I2O_EVT_IND_EXEC_RESOURCE_LIMITS	0x00000001
-#define I2O_EVT_IND_EXEC_CONNECTION_FAIL	0x00000002
-#define I2O_EVT_IND_EXEC_ADAPTER_FAULT		0x00000004
-#define I2O_EVT_IND_EXEC_POWER_FAIL		0x00000008
-#define I2O_EVT_IND_EXEC_RESET_PENDING		0x00000010
-#define I2O_EVT_IND_EXEC_RESET_IMMINENT 	0x00000020
-#define I2O_EVT_IND_EXEC_HW_FAIL		0x00000040
-#define I2O_EVT_IND_EXEC_XCT_CHANGE		0x00000080
-#define I2O_EVT_IND_EXEC_NEW_LCT_ENTRY		0x00000100
-#define I2O_EVT_IND_EXEC_MODIFIED_LCT		0x00000200
-#define I2O_EVT_IND_EXEC_DDM_AVAILABILITY	0x00000400
-
-/* Random Block Storage Event Indicators */
-#define I2O_EVT_IND_BSA_VOLUME_LOAD		0x00000001
-#define I2O_EVT_IND_BSA_VOLUME_UNLOAD		0x00000002
-#define I2O_EVT_IND_BSA_VOLUME_UNLOAD_REQ	0x00000004
-#define I2O_EVT_IND_BSA_CAPACITY_CHANGE 	0x00000008
-#define I2O_EVT_IND_BSA_SCSI_SMART		0x00000010
-
-/* Event data for generic events */
-#define I2O_EVT_STATE_CHANGE_NORMAL		0x00
-#define I2O_EVT_STATE_CHANGE_SUSPENDED		0x01
-#define I2O_EVT_STATE_CHANGE_RESTART		0x02
-#define I2O_EVT_STATE_CHANGE_NA_RECOVER 	0x03
-#define I2O_EVT_STATE_CHANGE_NA_NO_RECOVER	0x04
-#define I2O_EVT_STATE_CHANGE_QUIESCE_REQUEST	0x05
-#define I2O_EVT_STATE_CHANGE_FAILED		0x10
-#define I2O_EVT_STATE_CHANGE_FAULTED		0x11
-
-#define I2O_EVT_GEN_WARNING_NORMAL		0x00
-#define I2O_EVT_GEN_WARNING_ERROR_THRESHOLD	0x01
-#define I2O_EVT_GEN_WARNING_MEDIA_FAULT 	0x02
-
-#define I2O_EVT_CAPABILITY_OTHER		0x01
-#define I2O_EVT_CAPABILITY_CHANGED		0x02
-
-#define I2O_EVT_SENSOR_STATE_CHANGED		0x01
-
-/*
- *	I2O classes / subclasses
- */
-
-/*  Class ID and Code Assignments
- *  (LCT.ClassID.Version field)
- */
-#define I2O_CLASS_VERSION_10			0x00
-#define I2O_CLASS_VERSION_11			0x01
-
-/*  Class code names
- *  (from v1.5 Table 6-1 Class Code Assignments.)
- */
-
-#define I2O_CLASS_EXECUTIVE			0x000
-#define I2O_CLASS_DDM				0x001
-#define I2O_CLASS_RANDOM_BLOCK_STORAGE		0x010
-#define I2O_CLASS_SEQUENTIAL_STORAGE		0x011
-#define I2O_CLASS_LAN				0x020
-#define I2O_CLASS_WAN				0x030
-#define I2O_CLASS_FIBRE_CHANNEL_PORT		0x040
-#define I2O_CLASS_FIBRE_CHANNEL_PERIPHERAL	0x041
-#define I2O_CLASS_SCSI_PERIPHERAL		0x051
-#define I2O_CLASS_ATE_PORT			0x060
-#define I2O_CLASS_ATE_PERIPHERAL		0x061
-#define I2O_CLASS_FLOPPY_CONTROLLER		0x070
-#define I2O_CLASS_FLOPPY_DEVICE 		0x071
-#define I2O_CLASS_BUS_ADAPTER			0x080
-#define I2O_CLASS_PEER_TRANSPORT_AGENT		0x090
-#define I2O_CLASS_PEER_TRANSPORT		0x091
-#define	I2O_CLASS_END				0xfff
-
-/*
- *  Rest of 0x092 - 0x09f reserved for peer-to-peer classes
- */
-
-#define I2O_CLASS_MATCH_ANYCLASS		0xffffffff
-
-/*
- *  Subclasses
- */
-
-#define I2O_SUBCLASS_i960			0x001
-#define I2O_SUBCLASS_HDM			0x020
-#define I2O_SUBCLASS_ISM			0x021
-
-/* Operation functions */
-
-#define I2O_PARAMS_FIELD_GET			0x0001
-#define I2O_PARAMS_LIST_GET			0x0002
-#define I2O_PARAMS_MORE_GET			0x0003
-#define I2O_PARAMS_SIZE_GET			0x0004
-#define I2O_PARAMS_TABLE_GET			0x0005
-#define I2O_PARAMS_FIELD_SET			0x0006
-#define I2O_PARAMS_LIST_SET			0x0007
-#define I2O_PARAMS_ROW_ADD			0x0008
-#define I2O_PARAMS_ROW_DELETE			0x0009
-#define I2O_PARAMS_TABLE_CLEAR			0x000A
-
-/*
- * I2O serial number conventions / formats
- * (circa v1.5)
- */
-
-#define I2O_SNFORMAT_UNKNOWN			0
-#define I2O_SNFORMAT_BINARY			1
-#define I2O_SNFORMAT_ASCII			2
-#define I2O_SNFORMAT_UNICODE			3
-#define I2O_SNFORMAT_LAN48_MAC			4
-#define I2O_SNFORMAT_WAN			5
-
-/*
- * Plus new in v2.0 (Yellowstone pdf doc)
- */
-
-#define I2O_SNFORMAT_LAN64_MAC			6
-#define I2O_SNFORMAT_DDM			7
-#define I2O_SNFORMAT_IEEE_REG64 		8
-#define I2O_SNFORMAT_IEEE_REG128		9
-#define I2O_SNFORMAT_UNKNOWN2			0xff
-
-/*
- *	I2O Get Status State values
- */
-
-#define ADAPTER_STATE_INITIALIZING		0x01
-#define ADAPTER_STATE_RESET			0x02
-#define ADAPTER_STATE_HOLD			0x04
-#define ADAPTER_STATE_READY			0x05
-#define ADAPTER_STATE_OPERATIONAL		0x08
-#define ADAPTER_STATE_FAILED			0x10
-#define ADAPTER_STATE_FAULTED			0x11
-
-/*
- *	Software module types
- */
-#define I2O_SOFTWARE_MODULE_IRTOS		0x11
-#define I2O_SOFTWARE_MODULE_IOP_PRIVATE		0x22
-#define I2O_SOFTWARE_MODULE_IOP_CONFIG		0x23
-
-/*
- *	Vendors
- */
-#define I2O_VENDOR_DPT				0x001b
-
-/*
- * DPT / Adaptec specific values for i2o_sg_io_hdr flags.
- */
-#define I2O_DPT_SG_FLAG_INTERPRET		0x00010000
-#define I2O_DPT_SG_FLAG_PHYSICAL		0x00020000
-
-#define I2O_DPT_FLASH_FRAG_SIZE			0x10000
-#define I2O_DPT_FLASH_READ			0x0101
-#define I2O_DPT_FLASH_WRITE			0x0102
-
-#endif				/* _I2O_DEV_H */
diff --git a/openflow/usr/include/linux/i8k.h b/openflow/usr/include/linux/i8k.h
deleted file mode 100644
index 133d02f..0000000
--- a/openflow/usr/include/linux/i8k.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * i8k.h -- Linux driver for accessing the SMM BIOS on Dell laptops
- *
- * Copyright (C) 2001  Massimo Dal Zotto <dz@debian.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- */
-
-#ifndef _LINUX_I8K_H
-#define _LINUX_I8K_H
-
-#define I8K_PROC		"/proc/i8k"
-#define I8K_PROC_FMT		"1.0"
-
-#define I8K_BIOS_VERSION	_IOR ('i', 0x80, int)	/* broken: meant 4 bytes */
-#define I8K_MACHINE_ID		_IOR ('i', 0x81, int)	/* broken: meant 16 bytes */
-#define I8K_POWER_STATUS	_IOR ('i', 0x82, size_t)
-#define I8K_FN_STATUS		_IOR ('i', 0x83, size_t)
-#define I8K_GET_TEMP		_IOR ('i', 0x84, size_t)
-#define I8K_GET_SPEED		_IOWR('i', 0x85, size_t)
-#define I8K_GET_FAN		_IOWR('i', 0x86, size_t)
-#define I8K_SET_FAN		_IOWR('i', 0x87, size_t)
-
-#define I8K_FAN_LEFT		1
-#define I8K_FAN_RIGHT		0
-#define I8K_FAN_OFF		0
-#define I8K_FAN_LOW		1
-#define I8K_FAN_HIGH		2
-#define I8K_FAN_TURBO		3
-#define I8K_FAN_MAX		I8K_FAN_TURBO
-
-#define I8K_VOL_UP		1
-#define I8K_VOL_DOWN		2
-#define I8K_VOL_MUTE		4
-
-#define I8K_AC			1
-#define I8K_BATTERY		0
-
-#endif
diff --git a/openflow/usr/include/linux/icmp.h b/openflow/usr/include/linux/icmp.h
deleted file mode 100644
index ab58cee..0000000
--- a/openflow/usr/include/linux/icmp.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Definitions for the ICMP protocol.
- *
- * Version:	@(#)icmp.h	1.0.3	04/28/93
- *
- * Author:	Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_ICMP_H
-#define _LINUX_ICMP_H
-
-#include <linux/types.h>
-
-#define ICMP_ECHOREPLY		0	/* Echo Reply			*/
-#define ICMP_DEST_UNREACH	3	/* Destination Unreachable	*/
-#define ICMP_SOURCE_QUENCH	4	/* Source Quench		*/
-#define ICMP_REDIRECT		5	/* Redirect (change route)	*/
-#define ICMP_ECHO		8	/* Echo Request			*/
-#define ICMP_TIME_EXCEEDED	11	/* Time Exceeded		*/
-#define ICMP_PARAMETERPROB	12	/* Parameter Problem		*/
-#define ICMP_TIMESTAMP		13	/* Timestamp Request		*/
-#define ICMP_TIMESTAMPREPLY	14	/* Timestamp Reply		*/
-#define ICMP_INFO_REQUEST	15	/* Information Request		*/
-#define ICMP_INFO_REPLY		16	/* Information Reply		*/
-#define ICMP_ADDRESS		17	/* Address Mask Request		*/
-#define ICMP_ADDRESSREPLY	18	/* Address Mask Reply		*/
-#define NR_ICMP_TYPES		18
-
-
-/* Codes for UNREACH. */
-#define ICMP_NET_UNREACH	0	/* Network Unreachable		*/
-#define ICMP_HOST_UNREACH	1	/* Host Unreachable		*/
-#define ICMP_PROT_UNREACH	2	/* Protocol Unreachable		*/
-#define ICMP_PORT_UNREACH	3	/* Port Unreachable		*/
-#define ICMP_FRAG_NEEDED	4	/* Fragmentation Needed/DF set	*/
-#define ICMP_SR_FAILED		5	/* Source Route failed		*/
-#define ICMP_NET_UNKNOWN	6
-#define ICMP_HOST_UNKNOWN	7
-#define ICMP_HOST_ISOLATED	8
-#define ICMP_NET_ANO		9
-#define ICMP_HOST_ANO		10
-#define ICMP_NET_UNR_TOS	11
-#define ICMP_HOST_UNR_TOS	12
-#define ICMP_PKT_FILTERED	13	/* Packet filtered */
-#define ICMP_PREC_VIOLATION	14	/* Precedence violation */
-#define ICMP_PREC_CUTOFF	15	/* Precedence cut off */
-#define NR_ICMP_UNREACH		15	/* instead of hardcoding immediate value */
-
-/* Codes for REDIRECT. */
-#define ICMP_REDIR_NET		0	/* Redirect Net			*/
-#define ICMP_REDIR_HOST		1	/* Redirect Host		*/
-#define ICMP_REDIR_NETTOS	2	/* Redirect Net for TOS		*/
-#define ICMP_REDIR_HOSTTOS	3	/* Redirect Host for TOS	*/
-
-/* Codes for TIME_EXCEEDED. */
-#define ICMP_EXC_TTL		0	/* TTL count exceeded		*/
-#define ICMP_EXC_FRAGTIME	1	/* Fragment Reass time exceeded	*/
-
-
-struct icmphdr {
-  __u8		type;
-  __u8		code;
-  __sum16	checksum;
-  union {
-	struct {
-		__be16	id;
-		__be16	sequence;
-	} echo;
-	__be32	gateway;
-	struct {
-		__be16	__unused;
-		__be16	mtu;
-	} frag;
-  } un;
-};
-
-
-/*
- *	constants for (set|get)sockopt
- */
-
-#define ICMP_FILTER			1
-
-struct icmp_filter {
-	__u32		data;
-};
-
-
-#endif /* _LINUX_ICMP_H */
diff --git a/openflow/usr/include/linux/icmpv6.h b/openflow/usr/include/linux/icmpv6.h
deleted file mode 100644
index a2e839e..0000000
--- a/openflow/usr/include/linux/icmpv6.h
+++ /dev/null
@@ -1,166 +0,0 @@
-#ifndef _LINUX_ICMPV6_H
-#define _LINUX_ICMPV6_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-struct icmp6hdr {
-
-	__u8		icmp6_type;
-	__u8		icmp6_code;
-	__sum16		icmp6_cksum;
-
-
-	union {
-		__be32			un_data32[1];
-		__be16			un_data16[2];
-		__u8			un_data8[4];
-
-		struct icmpv6_echo {
-			__be16		identifier;
-			__be16		sequence;
-		} u_echo;
-
-                struct icmpv6_nd_advt {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-                        __u32		reserved:5,
-                        		override:1,
-                        		solicited:1,
-                        		router:1,
-					reserved2:24;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-                        __u32		router:1,
-					solicited:1,
-                        		override:1,
-                        		reserved:29;
-#else
-#error	"Please fix <asm/byteorder.h>"
-#endif						
-                } u_nd_advt;
-
-                struct icmpv6_nd_ra {
-			__u8		hop_limit;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-			__u8		reserved:3,
-					router_pref:2,
-					home_agent:1,
-					other:1,
-					managed:1;
-
-#elif defined(__BIG_ENDIAN_BITFIELD)
-			__u8		managed:1,
-					other:1,
-					home_agent:1,
-					router_pref:2,
-					reserved:3;
-#else
-#error	"Please fix <asm/byteorder.h>"
-#endif
-			__be16		rt_lifetime;
-                } u_nd_ra;
-
-	} icmp6_dataun;
-
-#define icmp6_identifier	icmp6_dataun.u_echo.identifier
-#define icmp6_sequence		icmp6_dataun.u_echo.sequence
-#define icmp6_pointer		icmp6_dataun.un_data32[0]
-#define icmp6_mtu		icmp6_dataun.un_data32[0]
-#define icmp6_unused		icmp6_dataun.un_data32[0]
-#define icmp6_maxdelay		icmp6_dataun.un_data16[0]
-#define icmp6_router		icmp6_dataun.u_nd_advt.router
-#define icmp6_solicited		icmp6_dataun.u_nd_advt.solicited
-#define icmp6_override		icmp6_dataun.u_nd_advt.override
-#define icmp6_ndiscreserved	icmp6_dataun.u_nd_advt.reserved
-#define icmp6_hop_limit		icmp6_dataun.u_nd_ra.hop_limit
-#define icmp6_addrconf_managed	icmp6_dataun.u_nd_ra.managed
-#define icmp6_addrconf_other	icmp6_dataun.u_nd_ra.other
-#define icmp6_rt_lifetime	icmp6_dataun.u_nd_ra.rt_lifetime
-#define icmp6_router_pref	icmp6_dataun.u_nd_ra.router_pref
-};
-
-
-#define ICMPV6_ROUTER_PREF_LOW		0x3
-#define ICMPV6_ROUTER_PREF_MEDIUM	0x0
-#define ICMPV6_ROUTER_PREF_HIGH		0x1
-#define ICMPV6_ROUTER_PREF_INVALID	0x2
-
-#define ICMPV6_DEST_UNREACH		1
-#define ICMPV6_PKT_TOOBIG		2
-#define ICMPV6_TIME_EXCEED		3
-#define ICMPV6_PARAMPROB		4
-
-#define ICMPV6_INFOMSG_MASK		0x80
-
-#define ICMPV6_ECHO_REQUEST		128
-#define ICMPV6_ECHO_REPLY		129
-#define ICMPV6_MGM_QUERY		130
-#define ICMPV6_MGM_REPORT       	131
-#define ICMPV6_MGM_REDUCTION    	132
-
-#define ICMPV6_NI_QUERY			139
-#define ICMPV6_NI_REPLY			140
-
-#define ICMPV6_MLD2_REPORT		143
-
-#define ICMPV6_DHAAD_REQUEST		144
-#define ICMPV6_DHAAD_REPLY		145
-#define ICMPV6_MOBILE_PREFIX_SOL	146
-#define ICMPV6_MOBILE_PREFIX_ADV	147
-
-/*
- *	Codes for Destination Unreachable
- */
-#define ICMPV6_NOROUTE			0
-#define ICMPV6_ADM_PROHIBITED		1
-#define ICMPV6_NOT_NEIGHBOUR		2
-#define ICMPV6_ADDR_UNREACH		3
-#define ICMPV6_PORT_UNREACH		4
-#define ICMPV6_POLICY_FAIL		5
-#define ICMPV6_REJECT_ROUTE		6
-
-/*
- *	Codes for Time Exceeded
- */
-#define ICMPV6_EXC_HOPLIMIT		0
-#define ICMPV6_EXC_FRAGTIME		1
-
-/*
- *	Codes for Parameter Problem
- */
-#define ICMPV6_HDR_FIELD		0
-#define ICMPV6_UNK_NEXTHDR		1
-#define ICMPV6_UNK_OPTION		2
-
-/*
- *	constants for (set|get)sockopt
- */
-
-#define ICMPV6_FILTER			1
-
-/*
- *	ICMPV6 filter
- */
-
-#define ICMPV6_FILTER_BLOCK		1
-#define ICMPV6_FILTER_PASS		2
-#define ICMPV6_FILTER_BLOCKOTHERS	3
-#define ICMPV6_FILTER_PASSONLY		4
-
-struct icmp6_filter {
-	__u32		data[8];
-};
-
-/*
- *	Definitions for MLDv2
- */
-#define MLD2_MODE_IS_INCLUDE	1
-#define MLD2_MODE_IS_EXCLUDE	2
-#define MLD2_CHANGE_TO_INCLUDE	3
-#define MLD2_CHANGE_TO_EXCLUDE	4
-#define MLD2_ALLOW_NEW_SOURCES	5
-#define MLD2_BLOCK_OLD_SOURCES	6
-
-#define MLD2_ALL_MCR_INIT { { { 0xff,0x02,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } } }
-
-
-#endif /* _LINUX_ICMPV6_H */
diff --git a/openflow/usr/include/linux/if.h b/openflow/usr/include/linux/if.h
deleted file mode 100644
index a55a9e0..0000000
--- a/openflow/usr/include/linux/if.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Global definitions for the INET interface module.
- *
- * Version:	@(#)if.h	1.0.2	04/18/93
- *
- * Authors:	Original taken from Berkeley UNIX 4.3, (c) UCB 1982-1988
- *		Ross Biro
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_IF_H
-#define _LINUX_IF_H
-
-#include <linux/types.h>		/* for "__kernel_caddr_t" et al	*/
-#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-		/* for "__user" et al           */
-
-#define	IFNAMSIZ	16
-#define	IFALIASZ	256
-#include <linux/hdlc/ioctl.h>
-
-/**
- * enum net_device_flags - &struct net_device flags
- *
- * These are the &struct net_device flags, they can be set by drivers, the
- * kernel and some can be triggered by userspace. Userspace can query and
- * set these flags using userspace utilities but there is also a sysfs
- * entry available for all dev flags which can be queried and set. These flags
- * are shared for all types of net_devices. The sysfs entries are available
- * via /sys/class/net/<dev>/flags. Flags which can be toggled through sysfs
- * are annotated below, note that only a few flags can be toggled and some
- * other flags are always always preserved from the original net_device flags
- * even if you try to set them via sysfs. Flags which are always preserved
- * are kept under the flag grouping @IFF_VOLATILE. Flags which are __volatile__
- * are annotated below as such.
- *
- * You should have a pretty good reason to be extending these flags.
- *
- * @IFF_UP: interface is up. Can be toggled through sysfs.
- * @IFF_BROADCAST: broadcast address valid. Volatile.
- * @IFF_DEBUG: turn on debugging. Can be toggled through sysfs.
- * @IFF_LOOPBACK: is a loopback net. Volatile.
- * @IFF_POINTOPOINT: interface is has p-p link. Volatile.
- * @IFF_NOTRAILERS: avoid use of trailers. Can be toggled through sysfs.
- *	Volatile.
- * @IFF_RUNNING: interface RFC2863 OPER_UP. Volatile.
- * @IFF_NOARP: no ARP protocol. Can be toggled through sysfs. Volatile.
- * @IFF_PROMISC: receive all packets. Can be toggled through sysfs.
- * @IFF_ALLMULTI: receive all multicast packets. Can be toggled through
- *	sysfs.
- * @IFF_MASTER: master of a load balancer. Volatile.
- * @IFF_SLAVE: slave of a load balancer. Volatile.
- * @IFF_MULTICAST: Supports multicast. Can be toggled through sysfs.
- * @IFF_PORTSEL: can set media type. Can be toggled through sysfs.
- * @IFF_AUTOMEDIA: auto media select active. Can be toggled through sysfs.
- * @IFF_DYNAMIC: dialup device with changing addresses. Can be toggled
- *	through sysfs.
- * @IFF_LOWER_UP: driver signals L1 up. Volatile.
- * @IFF_DORMANT: driver signals dormant. Volatile.
- * @IFF_ECHO: echo sent packets. Volatile.
- */
-enum net_device_flags {
-	IFF_UP				= 1<<0,  /* sysfs */
-	IFF_BROADCAST			= 1<<1,  /* __volatile__ */
-	IFF_DEBUG			= 1<<2,  /* sysfs */
-	IFF_LOOPBACK			= 1<<3,  /* __volatile__ */
-	IFF_POINTOPOINT			= 1<<4,  /* __volatile__ */
-	IFF_NOTRAILERS			= 1<<5,  /* sysfs */
-	IFF_RUNNING			= 1<<6,  /* __volatile__ */
-	IFF_NOARP			= 1<<7,  /* sysfs */
-	IFF_PROMISC			= 1<<8,  /* sysfs */
-	IFF_ALLMULTI			= 1<<9,  /* sysfs */
-	IFF_MASTER			= 1<<10, /* __volatile__ */
-	IFF_SLAVE			= 1<<11, /* __volatile__ */
-	IFF_MULTICAST			= 1<<12, /* sysfs */
-	IFF_PORTSEL			= 1<<13, /* sysfs */
-	IFF_AUTOMEDIA			= 1<<14, /* sysfs */
-	IFF_DYNAMIC			= 1<<15, /* sysfs */
-	IFF_LOWER_UP			= 1<<16, /* __volatile__ */
-	IFF_DORMANT			= 1<<17, /* __volatile__ */
-	IFF_ECHO			= 1<<18, /* __volatile__ */
-};
-
-#define IFF_UP				IFF_UP
-#define IFF_BROADCAST			IFF_BROADCAST
-#define IFF_DEBUG			IFF_DEBUG
-#define IFF_LOOPBACK			IFF_LOOPBACK
-#define IFF_POINTOPOINT			IFF_POINTOPOINT
-#define IFF_NOTRAILERS			IFF_NOTRAILERS
-#define IFF_RUNNING			IFF_RUNNING
-#define IFF_NOARP			IFF_NOARP
-#define IFF_PROMISC			IFF_PROMISC
-#define IFF_ALLMULTI			IFF_ALLMULTI
-#define IFF_MASTER			IFF_MASTER
-#define IFF_SLAVE			IFF_SLAVE
-#define IFF_MULTICAST			IFF_MULTICAST
-#define IFF_PORTSEL			IFF_PORTSEL
-#define IFF_AUTOMEDIA			IFF_AUTOMEDIA
-#define IFF_DYNAMIC			IFF_DYNAMIC
-#define IFF_LOWER_UP			IFF_LOWER_UP
-#define IFF_DORMANT			IFF_DORMANT
-#define IFF_ECHO			IFF_ECHO
-
-#define IFF_VOLATILE	(IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\
-		IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
-
-#define IF_GET_IFACE	0x0001		/* for querying only */
-#define IF_GET_PROTO	0x0002
-
-/* For definitions see hdlc.h */
-#define IF_IFACE_V35	0x1000		/* V.35 serial interface	*/
-#define IF_IFACE_V24	0x1001		/* V.24 serial interface	*/
-#define IF_IFACE_X21	0x1002		/* X.21 serial interface	*/
-#define IF_IFACE_T1	0x1003		/* T1 telco serial interface	*/
-#define IF_IFACE_E1	0x1004		/* E1 telco serial interface	*/
-#define IF_IFACE_SYNC_SERIAL 0x1005	/* can't be set by software	*/
-#define IF_IFACE_X21D   0x1006          /* X.21 Dual Clocking (FarSite) */
-
-/* For definitions see hdlc.h */
-#define IF_PROTO_HDLC	0x2000		/* raw HDLC protocol		*/
-#define IF_PROTO_PPP	0x2001		/* PPP protocol			*/
-#define IF_PROTO_CISCO	0x2002		/* Cisco HDLC protocol		*/
-#define IF_PROTO_FR	0x2003		/* Frame Relay protocol		*/
-#define IF_PROTO_FR_ADD_PVC 0x2004	/*    Create FR PVC		*/
-#define IF_PROTO_FR_DEL_PVC 0x2005	/*    Delete FR PVC		*/
-#define IF_PROTO_X25	0x2006		/* X.25				*/
-#define IF_PROTO_HDLC_ETH 0x2007	/* raw HDLC, Ethernet emulation	*/
-#define IF_PROTO_FR_ADD_ETH_PVC 0x2008	/*  Create FR Ethernet-bridged PVC */
-#define IF_PROTO_FR_DEL_ETH_PVC 0x2009	/*  Delete FR Ethernet-bridged PVC */
-#define IF_PROTO_FR_PVC	0x200A		/* for reading PVC status	*/
-#define IF_PROTO_FR_ETH_PVC 0x200B
-#define IF_PROTO_RAW    0x200C          /* RAW Socket                   */
-
-/* RFC 2863 operational status */
-enum {
-	IF_OPER_UNKNOWN,
-	IF_OPER_NOTPRESENT,
-	IF_OPER_DOWN,
-	IF_OPER_LOWERLAYERDOWN,
-	IF_OPER_TESTING,
-	IF_OPER_DORMANT,
-	IF_OPER_UP,
-};
-
-/* link modes */
-enum {
-	IF_LINK_MODE_DEFAULT,
-	IF_LINK_MODE_DORMANT,	/* limit upward transition to dormant */
-};
-
-/*
- *	Device mapping structure. I'd just gone off and designed a 
- *	beautiful scheme using only loadable modules with arguments
- *	for driver options and along come the PCMCIA people 8)
- *
- *	Ah well. The get() side of this is good for WDSETUP, and it'll
- *	be handy for debugging things. The set side is fine for now and
- *	being very small might be worth keeping for clean configuration.
- */
-
-struct ifmap {
-	unsigned long mem_start;
-	unsigned long mem_end;
-	unsigned short base_addr; 
-	unsigned char irq;
-	unsigned char dma;
-	unsigned char port;
-	/* 3 bytes spare */
-};
-
-struct if_settings {
-	unsigned int type;	/* Type of physical device or protocol */
-	unsigned int size;	/* Size of the data allocated by the caller */
-	union {
-		/* {atm/eth/dsl}_settings anyone ? */
-		raw_hdlc_proto		*raw_hdlc;
-		cisco_proto		*cisco;
-		fr_proto		*fr;
-		fr_proto_pvc		*fr_pvc;
-		fr_proto_pvc_info	*fr_pvc_info;
-
-		/* interface settings */
-		sync_serial_settings	*sync;
-		te1_settings		*te1;
-	} ifs_ifsu;
-};
-
-/*
- * Interface request structure used for socket
- * ioctl's.  All interface ioctl's must have parameter
- * definitions which begin with ifr_name.  The
- * remainder may be interface specific.
- */
-
-struct ifreq {
-#define IFHWADDRLEN	6
-	union
-	{
-		char	ifrn_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	} ifr_ifrn;
-	
-	union {
-		struct	sockaddr ifru_addr;
-		struct	sockaddr ifru_dstaddr;
-		struct	sockaddr ifru_broadaddr;
-		struct	sockaddr ifru_netmask;
-		struct  sockaddr ifru_hwaddr;
-		short	ifru_flags;
-		int	ifru_ivalue;
-		int	ifru_mtu;
-		struct  ifmap ifru_map;
-		char	ifru_slave[IFNAMSIZ];	/* Just fits the size */
-		char	ifru_newname[IFNAMSIZ];
-		void *	ifru_data;
-		struct	if_settings ifru_settings;
-	} ifr_ifru;
-};
-
-#define ifr_name	ifr_ifrn.ifrn_name	/* interface name 	*/
-#define ifr_hwaddr	ifr_ifru.ifru_hwaddr	/* MAC address 		*/
-#define	ifr_addr	ifr_ifru.ifru_addr	/* address		*/
-#define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-p lnk	*/
-#define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address	*/
-#define	ifr_netmask	ifr_ifru.ifru_netmask	/* interface net mask	*/
-#define	ifr_flags	ifr_ifru.ifru_flags	/* flags		*/
-#define	ifr_metric	ifr_ifru.ifru_ivalue	/* metric		*/
-#define	ifr_mtu		ifr_ifru.ifru_mtu	/* mtu			*/
-#define ifr_map		ifr_ifru.ifru_map	/* device map		*/
-#define ifr_slave	ifr_ifru.ifru_slave	/* slave device		*/
-#define	ifr_data	ifr_ifru.ifru_data	/* for use by interface	*/
-#define ifr_ifindex	ifr_ifru.ifru_ivalue	/* interface index	*/
-#define ifr_bandwidth	ifr_ifru.ifru_ivalue    /* link bandwidth	*/
-#define ifr_qlen	ifr_ifru.ifru_ivalue	/* Queue length 	*/
-#define ifr_newname	ifr_ifru.ifru_newname	/* New name		*/
-#define ifr_settings	ifr_ifru.ifru_settings	/* Device/proto settings*/
-
-/*
- * Structure used in SIOCGIFCONF request.
- * Used to retrieve interface configuration
- * for machine (useful for programs which
- * must know all networks accessible).
- */
-
-struct ifconf  {
-	int	ifc_len;			/* size of buffer	*/
-	union {
-		char *ifcu_buf;
-		struct ifreq *ifcu_req;
-	} ifc_ifcu;
-};
-#define	ifc_buf	ifc_ifcu.ifcu_buf		/* buffer address	*/
-#define	ifc_req	ifc_ifcu.ifcu_req		/* array of structures	*/
-
-#endif /* _LINUX_IF_H */
diff --git a/openflow/usr/include/linux/if_addr.h b/openflow/usr/include/linux/if_addr.h
deleted file mode 100644
index 26f0ecf..0000000
--- a/openflow/usr/include/linux/if_addr.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef __LINUX_IF_ADDR_H
-#define __LINUX_IF_ADDR_H
-
-#include <linux/types.h>
-#include <linux/netlink.h>
-
-struct ifaddrmsg {
-	__u8		ifa_family;
-	__u8		ifa_prefixlen;	/* The prefix length		*/
-	__u8		ifa_flags;	/* Flags			*/
-	__u8		ifa_scope;	/* Address scope		*/
-	__u32		ifa_index;	/* Link index			*/
-};
-
-/*
- * Important comment:
- * IFA_ADDRESS is prefix address, rather than local interface address.
- * It makes no difference for normally configured broadcast interfaces,
- * but for point-to-point IFA_ADDRESS is DESTINATION address,
- * local address is supplied in IFA_LOCAL attribute.
- *
- * IFA_FLAGS is a u32 attribute that extends the u8 field ifa_flags.
- * If present, the value from struct ifaddrmsg will be ignored.
- */
-enum {
-	IFA_UNSPEC,
-	IFA_ADDRESS,
-	IFA_LOCAL,
-	IFA_LABEL,
-	IFA_BROADCAST,
-	IFA_ANYCAST,
-	IFA_CACHEINFO,
-	IFA_MULTICAST,
-	IFA_FLAGS,
-	__IFA_MAX,
-};
-
-#define IFA_MAX (__IFA_MAX - 1)
-
-/* ifa_flags */
-#define IFA_F_SECONDARY		0x01
-#define IFA_F_TEMPORARY		IFA_F_SECONDARY
-
-#define	IFA_F_NODAD		0x02
-#define IFA_F_OPTIMISTIC	0x04
-#define IFA_F_DADFAILED		0x08
-#define	IFA_F_HOMEADDRESS	0x10
-#define IFA_F_DEPRECATED	0x20
-#define IFA_F_TENTATIVE		0x40
-#define IFA_F_PERMANENT		0x80
-#define IFA_F_MANAGETEMPADDR	0x100
-#define IFA_F_NOPREFIXROUTE	0x200
-#define IFA_F_MCAUTOJOIN	0x400
-#define IFA_F_STABLE_PRIVACY	0x800
-
-struct ifa_cacheinfo {
-	__u32	ifa_prefered;
-	__u32	ifa_valid;
-	__u32	cstamp; /* created timestamp, hundredths of seconds */
-	__u32	tstamp; /* updated timestamp, hundredths of seconds */
-};
-
-/* backwards compatibility for userspace */
-#define IFA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
-#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
-
-#endif
diff --git a/openflow/usr/include/linux/if_addrlabel.h b/openflow/usr/include/linux/if_addrlabel.h
deleted file mode 100644
index 54580c2..0000000
--- a/openflow/usr/include/linux/if_addrlabel.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * if_addrlabel.h - netlink interface for address labels
- *
- * Copyright (C)2007 USAGI/WIDE Project,  All Rights Reserved.
- *
- * Authors:
- *	YOSHIFUJI Hideaki @ USAGI/WIDE <yoshfuji@linux-ipv6.org>
- */
-
-#ifndef __LINUX_IF_ADDRLABEL_H
-#define __LINUX_IF_ADDRLABEL_H
-
-#include <linux/types.h>
-
-struct ifaddrlblmsg {
-	__u8		ifal_family;		/* Address family */
-	__u8		__ifal_reserved;	/* Reserved */
-	__u8		ifal_prefixlen;		/* Prefix length */
-	__u8		ifal_flags;		/* Flags */
-	__u32		ifal_index;		/* Link index */
-	__u32		ifal_seq;		/* sequence number */
-};
-
-enum {
-	IFAL_ADDRESS = 1,
-	IFAL_LABEL = 2,
-	__IFAL_MAX
-};
-
-#define IFAL_MAX	(__IFAL_MAX - 1)
-
-#endif
diff --git a/openflow/usr/include/linux/if_alg.h b/openflow/usr/include/linux/if_alg.h
deleted file mode 100644
index f2acd2f..0000000
--- a/openflow/usr/include/linux/if_alg.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * if_alg: User-space algorithm interface
- *
- * Copyright (c) 2010 Herbert Xu <herbert@gondor.apana.org.au>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- */
-
-#ifndef _LINUX_IF_ALG_H
-#define _LINUX_IF_ALG_H
-
-#include <linux/types.h>
-
-struct sockaddr_alg {
-	__u16	salg_family;
-	__u8	salg_type[14];
-	__u32	salg_feat;
-	__u32	salg_mask;
-	__u8	salg_name[64];
-};
-
-struct af_alg_iv {
-	__u32	ivlen;
-	__u8	iv[0];
-};
-
-/* Socket options */
-#define ALG_SET_KEY			1
-#define ALG_SET_IV			2
-#define ALG_SET_OP			3
-#define ALG_SET_AEAD_ASSOCLEN		4
-#define ALG_SET_AEAD_AUTHSIZE		5
-
-/* Operations */
-#define ALG_OP_DECRYPT			0
-#define ALG_OP_ENCRYPT			1
-
-#endif	/* _LINUX_IF_ALG_H */
diff --git a/openflow/usr/include/linux/if_arcnet.h b/openflow/usr/include/linux/if_arcnet.h
deleted file mode 100644
index cfb642f..0000000
--- a/openflow/usr/include/linux/if_arcnet.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * INET         An implementation of the TCP/IP protocol suite for the LINUX
- *              operating system.  INET is implemented using the  BSD Socket
- *              interface as the means of communication with the user level.
- *
- *              Global definitions for the ARCnet interface.
- *
- * Authors:     David Woodhouse and Avery Pennarun
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_IF_ARCNET_H
-#define _LINUX_IF_ARCNET_H
-
-#include <linux/types.h>
-#include <linux/if_ether.h>
-
-/*
- *    These are the defined ARCnet Protocol ID's.
- */
-
-/* CAP mode */
-/* No macro but uses 1-8 */
-
-/* RFC1201 Protocol ID's */
-#define ARC_P_IP		212	/* 0xD4 */
-#define ARC_P_IPV6		196	/* 0xC4: RFC2497 */
-#define ARC_P_ARP		213	/* 0xD5 */
-#define ARC_P_RARP		214	/* 0xD6 */
-#define ARC_P_IPX		250	/* 0xFA */
-#define ARC_P_NOVELL_EC		236	/* 0xEC */
-
-/* Old RFC1051 Protocol ID's */
-#define ARC_P_IP_RFC1051	240	/* 0xF0 */
-#define ARC_P_ARP_RFC1051	241	/* 0xF1 */
-
-/* MS LanMan/WfWg "NDIS" encapsulation */
-#define ARC_P_ETHER		232	/* 0xE8 */
-
-/* Unsupported/indirectly supported protocols */
-#define ARC_P_DATAPOINT_BOOT	0	/* very old Datapoint equipment */
-#define ARC_P_DATAPOINT_MOUNT	1
-#define ARC_P_POWERLAN_BEACON	8	/* Probably ATA-Netbios related */
-#define ARC_P_POWERLAN_BEACON2	243	/* 0xF3 */
-#define ARC_P_LANSOFT		251	/* 0xFB - what is this? */
-#define ARC_P_ATALK		0xDD
-
-/* Hardware address length */
-#define ARCNET_ALEN	1
-
-/*
- * The RFC1201-specific components of an arcnet packet header.
- */
-struct arc_rfc1201 {
-	__u8  proto;		/* protocol ID field - varies		*/
-	__u8  split_flag;	/* for use with split packets		*/
-	__be16   sequence;	/* sequence number			*/
-	__u8  payload[0];	/* space remaining in packet (504 bytes)*/
-};
-#define RFC1201_HDR_SIZE 4
-
-/*
- * The RFC1051-specific components.
- */
-struct arc_rfc1051 {
-	__u8 proto;		/* ARC_P_RFC1051_ARP/RFC1051_IP	*/
-	__u8 payload[0];	/* 507 bytes			*/
-};
-#define RFC1051_HDR_SIZE 1
-
-/*
- * The ethernet-encap-specific components.  We have a real ethernet header
- * and some data.
- */
-struct arc_eth_encap {
-	__u8 proto;		/* Always ARC_P_ETHER			*/
-	struct ethhdr eth;	/* standard ethernet header (yuck!)	*/
-	__u8 payload[0];	/* 493 bytes				*/
-};
-#define ETH_ENCAP_HDR_SIZE 14
-
-struct arc_cap {
-	__u8 proto;
-	__u8 cookie[sizeof(int)];
-				/* Actually NOT sent over the network */
-	union {
-		__u8 ack;
-		__u8 raw[0];	/* 507 bytes */
-	} mes;
-};
-
-/*
- * The data needed by the actual arcnet hardware.
- *
- * Now, in the real arcnet hardware, the third and fourth bytes are the
- * 'offset' specification instead of the length, and the soft data is at
- * the _end_ of the 512-byte buffer.  We hide this complexity inside the
- * driver.
- */
-struct arc_hardware {
-	__u8 source;		/* source ARCnet - filled in automagically */
-	__u8 dest;		/* destination ARCnet - 0 for broadcast    */
-	__u8 offset[2];		/* offset bytes (some weird semantics)     */
-};
-#define ARC_HDR_SIZE 4
-
-/*
- * This is an ARCnet frame header, as seen by the kernel (and userspace,
- * when you do a raw packet capture).
- */
-struct archdr {
-	/* hardware requirements */
-	struct arc_hardware hard;
-
-	/* arcnet encapsulation-specific bits */
-	union {
-		struct arc_rfc1201   rfc1201;
-		struct arc_rfc1051   rfc1051;
-		struct arc_eth_encap eth_encap;
-		struct arc_cap       cap;
-		__u8 raw[0];	/* 508 bytes				*/
-	} soft;
-};
-
-#endif				/* _LINUX_IF_ARCNET_H */
diff --git a/openflow/usr/include/linux/if_arp.h b/openflow/usr/include/linux/if_arp.h
deleted file mode 100644
index d001bdb..0000000
--- a/openflow/usr/include/linux/if_arp.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Global definitions for the ARP (RFC 826) protocol.
- *
- * Version:	@(#)if_arp.h	1.0.1	04/16/93
- *
- * Authors:	Original taken from Berkeley UNIX 4.3, (c) UCB 1986-1988
- *		Portions taken from the KA9Q/NOS (v2.00m PA0GRI) source.
- *		Ross Biro
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *		Florian La Roche,
- *		Jonathan Layes <layes@loran.com>
- *		Arnaldo Carvalho de Melo <acme@conectiva.com.br> ARPHRD_HWX25
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_IF_ARP_H
-#define _LINUX_IF_ARP_H
-
-#include <linux/netdevice.h>
-
-/* ARP protocol HARDWARE identifiers. */
-#define ARPHRD_NETROM	0		/* from KA9Q: NET/ROM pseudo	*/
-#define ARPHRD_ETHER 	1		/* Ethernet 10Mbps		*/
-#define	ARPHRD_EETHER	2		/* Experimental Ethernet	*/
-#define	ARPHRD_AX25	3		/* AX.25 Level 2		*/
-#define	ARPHRD_PRONET	4		/* PROnet token ring		*/
-#define	ARPHRD_CHAOS	5		/* Chaosnet			*/
-#define	ARPHRD_IEEE802	6		/* IEEE 802.2 Ethernet/TR/TB	*/
-#define	ARPHRD_ARCNET	7		/* ARCnet			*/
-#define	ARPHRD_APPLETLK	8		/* APPLEtalk			*/
-#define ARPHRD_DLCI	15		/* Frame Relay DLCI		*/
-#define ARPHRD_ATM	19		/* ATM 				*/
-#define ARPHRD_METRICOM	23		/* Metricom STRIP (new IANA id)	*/
-#define	ARPHRD_IEEE1394	24		/* IEEE 1394 IPv4 - RFC 2734	*/
-#define ARPHRD_EUI64	27		/* EUI-64                       */
-#define ARPHRD_INFINIBAND 32		/* InfiniBand			*/
-
-/* Dummy types for non ARP hardware */
-#define ARPHRD_SLIP	256
-#define ARPHRD_CSLIP	257
-#define ARPHRD_SLIP6	258
-#define ARPHRD_CSLIP6	259
-#define ARPHRD_RSRVD	260		/* Notional KISS type 		*/
-#define ARPHRD_ADAPT	264
-#define ARPHRD_ROSE	270
-#define ARPHRD_X25	271		/* CCITT X.25			*/
-#define ARPHRD_HWX25	272		/* Boards with X.25 in firmware	*/
-#define ARPHRD_CAN	280		/* Controller Area Network      */
-#define ARPHRD_PPP	512
-#define ARPHRD_CISCO	513		/* Cisco HDLC	 		*/
-#define ARPHRD_HDLC	ARPHRD_CISCO
-#define ARPHRD_LAPB	516		/* LAPB				*/
-#define ARPHRD_DDCMP    517		/* Digital's DDCMP protocol     */
-#define ARPHRD_RAWHDLC	518		/* Raw HDLC			*/
-
-#define ARPHRD_TUNNEL	768		/* IPIP tunnel			*/
-#define ARPHRD_TUNNEL6	769		/* IP6IP6 tunnel       		*/
-#define ARPHRD_FRAD	770             /* Frame Relay Access Device    */
-#define ARPHRD_SKIP	771		/* SKIP vif			*/
-#define ARPHRD_LOOPBACK	772		/* Loopback device		*/
-#define ARPHRD_LOCALTLK 773		/* Localtalk device		*/
-#define ARPHRD_FDDI	774		/* Fiber Distributed Data Interface */
-#define ARPHRD_BIF      775             /* AP1000 BIF                   */
-#define ARPHRD_SIT	776		/* sit0 device - IPv6-in-IPv4	*/
-#define ARPHRD_IPDDP	777		/* IP over DDP tunneller	*/
-#define ARPHRD_IPGRE	778		/* GRE over IP			*/
-#define ARPHRD_PIMREG	779		/* PIMSM register interface	*/
-#define ARPHRD_HIPPI	780		/* High Performance Parallel Interface */
-#define ARPHRD_ASH	781		/* Nexus 64Mbps Ash		*/
-#define ARPHRD_ECONET	782		/* Acorn Econet			*/
-#define ARPHRD_IRDA 	783		/* Linux-IrDA			*/
-/* ARP works differently on different FC media .. so  */
-#define ARPHRD_FCPP	784		/* Point to point fibrechannel	*/
-#define ARPHRD_FCAL	785		/* Fibrechannel arbitrated loop */
-#define ARPHRD_FCPL	786		/* Fibrechannel public loop	*/
-#define ARPHRD_FCFABRIC	787		/* Fibrechannel fabric		*/
-	/* 787->799 reserved for fibrechannel media types */
-#define ARPHRD_IEEE802_TR 800		/* Magic type ident for TR	*/
-#define ARPHRD_IEEE80211 801		/* IEEE 802.11			*/
-#define ARPHRD_IEEE80211_PRISM 802	/* IEEE 802.11 + Prism2 header  */
-#define ARPHRD_IEEE80211_RADIOTAP 803	/* IEEE 802.11 + radiotap header */
-#define ARPHRD_IEEE802154	  804
-#define ARPHRD_IEEE802154_MONITOR 805	/* IEEE 802.15.4 network monitor */
-
-#define ARPHRD_PHONET	820		/* PhoNet media type		*/
-#define ARPHRD_PHONET_PIPE 821		/* PhoNet pipe header		*/
-#define ARPHRD_CAIF	822		/* CAIF media type		*/
-#define ARPHRD_IP6GRE	823		/* GRE over IPv6		*/
-#define ARPHRD_NETLINK	824		/* Netlink header		*/
-#define ARPHRD_6LOWPAN	825		/* IPv6 over LoWPAN             */
-
-#define ARPHRD_VOID	  0xFFFF	/* Void type, nothing is known */
-#define ARPHRD_NONE	  0xFFFE	/* zero header length */
-
-/* ARP protocol opcodes. */
-#define	ARPOP_REQUEST	1		/* ARP request			*/
-#define	ARPOP_REPLY	2		/* ARP reply			*/
-#define	ARPOP_RREQUEST	3		/* RARP request			*/
-#define	ARPOP_RREPLY	4		/* RARP reply			*/
-#define	ARPOP_InREQUEST	8		/* InARP request		*/
-#define	ARPOP_InREPLY	9		/* InARP reply			*/
-#define	ARPOP_NAK	10		/* (ATM)ARP NAK			*/
-
-
-/* ARP ioctl request. */
-struct arpreq {
-  struct sockaddr	arp_pa;		/* protocol address		*/
-  struct sockaddr	arp_ha;		/* hardware address		*/
-  int			arp_flags;	/* flags			*/
-  struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */
-  char			arp_dev[16];
-};
-
-struct arpreq_old {
-  struct sockaddr	arp_pa;		/* protocol address		*/
-  struct sockaddr	arp_ha;		/* hardware address		*/
-  int			arp_flags;	/* flags			*/
-  struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */
-};
-
-/* ARP Flag values. */
-#define ATF_COM		0x02		/* completed entry (ha valid)	*/
-#define	ATF_PERM	0x04		/* permanent entry		*/
-#define	ATF_PUBL	0x08		/* publish entry		*/
-#define	ATF_USETRAILERS	0x10		/* has requested trailers	*/
-#define ATF_NETMASK     0x20            /* want to use a netmask (only
-					   for proxy entries) */
-#define ATF_DONTPUB	0x40		/* don't answer this addresses	*/
-
-/*
- *	This structure defines an ethernet arp header.
- */
-
-struct arphdr {
-	__be16		ar_hrd;		/* format of hardware address	*/
-	__be16		ar_pro;		/* format of protocol address	*/
-	unsigned char	ar_hln;		/* length of hardware address	*/
-	unsigned char	ar_pln;		/* length of protocol address	*/
-	__be16		ar_op;		/* ARP opcode (command)		*/
-
-#if 0
-	 /*
-	  *	 Ethernet looks like this : This bit is variable sized however...
-	  */
-	unsigned char		ar_sha[ETH_ALEN];	/* sender hardware address	*/
-	unsigned char		ar_sip[4];		/* sender IP address		*/
-	unsigned char		ar_tha[ETH_ALEN];	/* target hardware address	*/
-	unsigned char		ar_tip[4];		/* target IP address		*/
-#endif
-
-};
-
-
-#endif /* _LINUX_IF_ARP_H */
diff --git a/openflow/usr/include/linux/if_bonding.h b/openflow/usr/include/linux/if_bonding.h
deleted file mode 100644
index 9635a62..0000000
--- a/openflow/usr/include/linux/if_bonding.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Bond several ethernet interfaces into a Cisco, running 'Etherchannel'.
- *
- *
- * Portions are (c) Copyright 1995 Simon "Guru Aleph-Null" Janes
- * NCM: Network and Communications Management, Inc.
- *
- * BUT, I'm the one who modified it for ethernet, so:
- * (c) Copyright 1999, Thomas Davis, tadavis@lbl.gov
- *
- *	This software may be used and distributed according to the terms
- *	of the GNU Public License, incorporated herein by reference.
- *
- * 2003/03/18 - Amir Noam <amir.noam at intel dot com>
- *	- Added support for getting slave's speed and duplex via ethtool.
- *	  Needed for 802.3ad and other future modes.
- *
- * 2003/03/18 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *		Shmulik Hen <shmulik.hen at intel dot com>
- *	- Enable support of modes that need to use the unique mac address of
- *	  each slave.
- *
- * 2003/03/18 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *		Amir Noam <amir.noam at intel dot com>
- *	- Moved driver's private data types to bonding.h
- *
- * 2003/03/18 - Amir Noam <amir.noam at intel dot com>,
- *		Tsippy Mendelson <tsippy.mendelson at intel dot com> and
- *		Shmulik Hen <shmulik.hen at intel dot com>
- *	- Added support for IEEE 802.3ad Dynamic link aggregation mode.
- *
- * 2003/05/01 - Amir Noam <amir.noam at intel dot com>
- *	- Added ABI version control to restore compatibility between
- *	  new/old ifenslave and new/old bonding.
- *
- * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
- *	- Code cleanup and style changes
- *
- * 2005/05/05 - Jason Gabler <jygabler at lbl dot gov>
- *      - added definitions for various XOR hashing policies
- */
-
-#ifndef _LINUX_IF_BONDING_H
-#define _LINUX_IF_BONDING_H
-
-#include <linux/if.h>
-#include <linux/types.h>
-#include <linux/if_ether.h>
-
-/* userland - kernel ABI version (2003/05/08) */
-#define BOND_ABI_VERSION 2
-
-/*
- * We can remove these ioctl definitions in 2.5.  People should use the
- * SIOC*** versions of them instead
- */
-#define BOND_ENSLAVE_OLD		(SIOCDEVPRIVATE)
-#define BOND_RELEASE_OLD		(SIOCDEVPRIVATE + 1)
-#define BOND_SETHWADDR_OLD		(SIOCDEVPRIVATE + 2)
-#define BOND_SLAVE_INFO_QUERY_OLD	(SIOCDEVPRIVATE + 11)
-#define BOND_INFO_QUERY_OLD		(SIOCDEVPRIVATE + 12)
-#define BOND_CHANGE_ACTIVE_OLD		(SIOCDEVPRIVATE + 13)
-
-#define BOND_CHECK_MII_STATUS	(SIOCGMIIPHY)
-
-#define BOND_MODE_ROUNDROBIN	0
-#define BOND_MODE_ACTIVEBACKUP	1
-#define BOND_MODE_XOR		2
-#define BOND_MODE_BROADCAST	3
-#define BOND_MODE_8023AD        4
-#define BOND_MODE_TLB           5
-#define BOND_MODE_ALB		6 /* TLB + RLB (receive load balancing) */
-
-/* each slave's link has 4 states */
-#define BOND_LINK_UP    0           /* link is up and running */
-#define BOND_LINK_FAIL  1           /* link has just gone down */
-#define BOND_LINK_DOWN  2           /* link has been down for too long time */
-#define BOND_LINK_BACK  3           /* link is going back */
-
-/* each slave has several states */
-#define BOND_STATE_ACTIVE       0   /* link is active */
-#define BOND_STATE_BACKUP       1   /* link is backup */
-
-#define BOND_DEFAULT_MAX_BONDS  1   /* Default maximum number of devices to support */
-
-#define BOND_DEFAULT_TX_QUEUES 16   /* Default number of tx queues per device */
-
-#define BOND_DEFAULT_RESEND_IGMP	1 /* Default number of IGMP membership reports */
-
-/* hashing types */
-#define BOND_XMIT_POLICY_LAYER2		0 /* layer 2 (MAC only), default */
-#define BOND_XMIT_POLICY_LAYER34	1 /* layer 3+4 (IP ^ (TCP || UDP)) */
-#define BOND_XMIT_POLICY_LAYER23	2 /* layer 2+3 (IP ^ MAC) */
-#define BOND_XMIT_POLICY_ENCAP23	3 /* encapsulated layer 2+3 */
-#define BOND_XMIT_POLICY_ENCAP34	4 /* encapsulated layer 3+4 */
-
-typedef struct ifbond {
-	__s32 bond_mode;
-	__s32 num_slaves;
-	__s32 miimon;
-} ifbond;
-
-typedef struct ifslave {
-	__s32 slave_id; /* Used as an IN param to the BOND_SLAVE_INFO_QUERY ioctl */
-	char slave_name[IFNAMSIZ];
-	__s8 link;
-	__s8 state;
-	__u32  link_failure_count;
-} ifslave;
-
-struct ad_info {
-	__u16 aggregator_id;
-	__u16 ports;
-	__u16 actor_key;
-	__u16 partner_key;
-	__u8 partner_system[ETH_ALEN];
-};
-
-#endif /* _LINUX_IF_BONDING_H */
-
-/*
- * Local variables:
- *  version-control: t
- *  kept-new-versions: 5
- *  c-indent-level: 8
- *  c-basic-offset: 8
- *  tab-width: 8
- * End:
- */
-
diff --git a/openflow/usr/include/linux/if_bridge.h b/openflow/usr/include/linux/if_bridge.h
deleted file mode 100644
index ee197a3..0000000
--- a/openflow/usr/include/linux/if_bridge.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *	Linux ethernet bridge
- *
- *	Authors:
- *	Lennert Buytenhek		<buytenh@gnu.org>
- *
- *	This program is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU General Public License
- *	as published by the Free Software Foundation; either version
- *	2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_IF_BRIDGE_H
-#define _LINUX_IF_BRIDGE_H
-
-#include <linux/types.h>
-#include <linux/if_ether.h>
-#include <linux/in6.h>
-
-#define SYSFS_BRIDGE_ATTR	"bridge"
-#define SYSFS_BRIDGE_FDB	"brforward"
-#define SYSFS_BRIDGE_PORT_SUBDIR "brif"
-#define SYSFS_BRIDGE_PORT_ATTR	"brport"
-#define SYSFS_BRIDGE_PORT_LINK	"bridge"
-
-#define BRCTL_VERSION 1
-
-#define BRCTL_GET_VERSION 0
-#define BRCTL_GET_BRIDGES 1
-#define BRCTL_ADD_BRIDGE 2
-#define BRCTL_DEL_BRIDGE 3
-#define BRCTL_ADD_IF 4
-#define BRCTL_DEL_IF 5
-#define BRCTL_GET_BRIDGE_INFO 6
-#define BRCTL_GET_PORT_LIST 7
-#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8
-#define BRCTL_SET_BRIDGE_HELLO_TIME 9
-#define BRCTL_SET_BRIDGE_MAX_AGE 10
-#define BRCTL_SET_AGEING_TIME 11
-#define BRCTL_SET_GC_INTERVAL 12
-#define BRCTL_GET_PORT_INFO 13
-#define BRCTL_SET_BRIDGE_STP_STATE 14
-#define BRCTL_SET_BRIDGE_PRIORITY 15
-#define BRCTL_SET_PORT_PRIORITY 16
-#define BRCTL_SET_PATH_COST 17
-#define BRCTL_GET_FDB_ENTRIES 18
-
-#define BR_STATE_DISABLED 0
-#define BR_STATE_LISTENING 1
-#define BR_STATE_LEARNING 2
-#define BR_STATE_FORWARDING 3
-#define BR_STATE_BLOCKING 4
-
-struct __bridge_info {
-	__u64 designated_root;
-	__u64 bridge_id;
-	__u32 root_path_cost;
-	__u32 max_age;
-	__u32 hello_time;
-	__u32 forward_delay;
-	__u32 bridge_max_age;
-	__u32 bridge_hello_time;
-	__u32 bridge_forward_delay;
-	__u8 topology_change;
-	__u8 topology_change_detected;
-	__u8 root_port;
-	__u8 stp_enabled;
-	__u32 ageing_time;
-	__u32 gc_interval;
-	__u32 hello_timer_value;
-	__u32 tcn_timer_value;
-	__u32 topology_change_timer_value;
-	__u32 gc_timer_value;
-};
-
-struct __port_info {
-	__u64 designated_root;
-	__u64 designated_bridge;
-	__u16 port_id;
-	__u16 designated_port;
-	__u32 path_cost;
-	__u32 designated_cost;
-	__u8 state;
-	__u8 top_change_ack;
-	__u8 config_pending;
-	__u8 unused0;
-	__u32 message_age_timer_value;
-	__u32 forward_delay_timer_value;
-	__u32 hold_timer_value;
-};
-
-struct __fdb_entry {
-	__u8 mac_addr[ETH_ALEN];
-	__u8 port_no;
-	__u8 is_local;
-	__u32 ageing_timer_value;
-	__u8 port_hi;
-	__u8 pad0;
-	__u16 unused;
-};
-
-/* Bridge Flags */
-#define BRIDGE_FLAGS_MASTER	1	/* Bridge command to/from master */
-#define BRIDGE_FLAGS_SELF	2	/* Bridge command to/from lowerdev */
-
-#define BRIDGE_MODE_VEB		0	/* Default loopback mode */
-#define BRIDGE_MODE_VEPA	1	/* 802.1Qbg defined VEPA mode */
-#define BRIDGE_MODE_UNDEF	0xFFFF  /* mode undefined */
-
-/* Bridge management nested attributes
- * [IFLA_AF_SPEC] = {
- *     [IFLA_BRIDGE_FLAGS]
- *     [IFLA_BRIDGE_MODE]
- *     [IFLA_BRIDGE_VLAN_INFO]
- * }
- */
-enum {
-	IFLA_BRIDGE_FLAGS,
-	IFLA_BRIDGE_MODE,
-	IFLA_BRIDGE_VLAN_INFO,
-	__IFLA_BRIDGE_MAX,
-};
-#define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1)
-
-#define BRIDGE_VLAN_INFO_MASTER	(1<<0)	/* Operate on Bridge device as well */
-#define BRIDGE_VLAN_INFO_PVID	(1<<1)	/* VLAN is PVID, ingress untagged */
-#define BRIDGE_VLAN_INFO_UNTAGGED	(1<<2)	/* VLAN egresses untagged */
-#define BRIDGE_VLAN_INFO_RANGE_BEGIN	(1<<3) /* VLAN is start of vlan range */
-#define BRIDGE_VLAN_INFO_RANGE_END	(1<<4) /* VLAN is end of vlan range */
-#define BRIDGE_VLAN_INFO_BRENTRY	(1<<5) /* Global bridge VLAN entry */
-
-struct bridge_vlan_info {
-	__u16 flags;
-	__u16 vid;
-};
-
-/* Bridge multicast database attributes
- * [MDBA_MDB] = {
- *     [MDBA_MDB_ENTRY] = {
- *         [MDBA_MDB_ENTRY_INFO]
- *     }
- * }
- * [MDBA_ROUTER] = {
- *    [MDBA_ROUTER_PORT]
- * }
- */
-enum {
-	MDBA_UNSPEC,
-	MDBA_MDB,
-	MDBA_ROUTER,
-	__MDBA_MAX,
-};
-#define MDBA_MAX (__MDBA_MAX - 1)
-
-enum {
-	MDBA_MDB_UNSPEC,
-	MDBA_MDB_ENTRY,
-	__MDBA_MDB_MAX,
-};
-#define MDBA_MDB_MAX (__MDBA_MDB_MAX - 1)
-
-enum {
-	MDBA_MDB_ENTRY_UNSPEC,
-	MDBA_MDB_ENTRY_INFO,
-	__MDBA_MDB_ENTRY_MAX,
-};
-#define MDBA_MDB_ENTRY_MAX (__MDBA_MDB_ENTRY_MAX - 1)
-
-enum {
-	MDBA_ROUTER_UNSPEC,
-	MDBA_ROUTER_PORT,
-	__MDBA_ROUTER_MAX,
-};
-#define MDBA_ROUTER_MAX (__MDBA_ROUTER_MAX - 1)
-
-struct br_port_msg {
-	__u8  family;
-	__u32 ifindex;
-};
-
-struct br_mdb_entry {
-	__u32 ifindex;
-#define MDB_TEMPORARY 0
-#define MDB_PERMANENT 1
-	__u8 state;
-	__u16 vid;
-	struct {
-		union {
-			__be32	ip4;
-			struct in6_addr ip6;
-		} u;
-		__be16		proto;
-	} addr;
-};
-
-enum {
-	MDBA_SET_ENTRY_UNSPEC,
-	MDBA_SET_ENTRY,
-	__MDBA_SET_ENTRY_MAX,
-};
-#define MDBA_SET_ENTRY_MAX (__MDBA_SET_ENTRY_MAX - 1)
-
-#endif /* _LINUX_IF_BRIDGE_H */
diff --git a/openflow/usr/include/linux/if_cablemodem.h b/openflow/usr/include/linux/if_cablemodem.h
deleted file mode 100644
index ee6b3c4..0000000
--- a/openflow/usr/include/linux/if_cablemodem.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _LINUX_CABLEMODEM_H_
-#define _LINUX_CABLEMODEM_H_
-/*
- *		Author: Franco Venturi <fventuri@mediaone.net>
- *		Copyright 1998 Franco Venturi
- *
- *		This program is free software; you can redistribute it
- *		and/or  modify it under  the terms of  the GNU General
- *		Public  License as  published  by  the  Free  Software
- *		Foundation;  either  version 2 of the License, or  (at
- *		your option) any later version.
- */
-
-/* some useful defines for sb1000.c e cmconfig.c - fv */
-#define SIOCGCMSTATS		(SIOCDEVPRIVATE+0)	/* get cable modem stats */
-#define SIOCGCMFIRMWARE		(SIOCDEVPRIVATE+1)	/* get cm firmware version */
-#define SIOCGCMFREQUENCY	(SIOCDEVPRIVATE+2)	/* get cable modem frequency */
-#define SIOCSCMFREQUENCY	(SIOCDEVPRIVATE+3)	/* set cable modem frequency */
-#define SIOCGCMPIDS			(SIOCDEVPRIVATE+4)	/* get cable modem PIDs */
-#define SIOCSCMPIDS			(SIOCDEVPRIVATE+5)	/* set cable modem PIDs */
-
-#endif
diff --git a/openflow/usr/include/linux/if_eql.h b/openflow/usr/include/linux/if_eql.h
deleted file mode 100644
index 3b489be..0000000
--- a/openflow/usr/include/linux/if_eql.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Equalizer Load-balancer for serial network interfaces.
- *
- * (c) Copyright 1995 Simon "Guru Aleph-Null" Janes
- * NCM: Network and Communications Management, Inc.
- *
- *
- *	This software may be used and distributed according to the terms
- *	of the GNU General Public License, incorporated herein by reference.
- * 
- * The author may be reached as simon@ncm.com, or C/O
- *    NCM
- *    Attn: Simon Janes
- *    6803 Whittier Ave
- *    McLean VA 22101
- *    Phone: 1-703-847-0040 ext 103
- */
-
-#ifndef _LINUX_IF_EQL_H
-#define _LINUX_IF_EQL_H
-
-#define EQL_DEFAULT_SLAVE_PRIORITY 28800
-#define EQL_DEFAULT_MAX_SLAVES     4
-#define EQL_DEFAULT_MTU            576
-#define EQL_DEFAULT_RESCHED_IVAL   HZ
-
-#define EQL_ENSLAVE     (SIOCDEVPRIVATE)
-#define EQL_EMANCIPATE  (SIOCDEVPRIVATE + 1)
-
-#define EQL_GETSLAVECFG (SIOCDEVPRIVATE + 2)
-#define EQL_SETSLAVECFG (SIOCDEVPRIVATE + 3)
-
-#define EQL_GETMASTRCFG (SIOCDEVPRIVATE + 4)
-#define EQL_SETMASTRCFG (SIOCDEVPRIVATE + 5)
-
-
-typedef struct master_config {
-	char	master_name[16];
-	int	max_slaves;
-	int	min_slaves;
-} master_config_t;
-
-typedef struct slave_config {
-	char	slave_name[16];
-	long	priority;
-} slave_config_t;
-
-typedef struct slaving_request {
-	char	slave_name[16];
-	long	priority;
-} slaving_request_t;
-
-
-#endif /* _LINUX_IF_EQL_H */
diff --git a/openflow/usr/include/linux/if_ether.h b/openflow/usr/include/linux/if_ether.h
deleted file mode 100644
index bf278d6..0000000
--- a/openflow/usr/include/linux/if_ether.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Global definitions for the Ethernet IEEE 802.3 interface.
- *
- * Version:	@(#)if_ether.h	1.0.1a	02/08/94
- *
- * Author:	Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *		Donald Becker, <becker@super.org>
- *		Alan Cox, <alan@lxorguk.ukuu.org.uk>
- *		Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_IF_ETHER_H
-#define _LINUX_IF_ETHER_H
-
-#include <linux/types.h>
-
-/*
- *	IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble
- *	and FCS/CRC (frame check sequence).
- */
-
-#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-#define ETH_HLEN	14		/* Total octets in header.	 */
-#define ETH_ZLEN	60		/* Min. octets in frame sans FCS */
-#define ETH_DATA_LEN	1500		/* Max. octets in payload	 */
-#define ETH_FRAME_LEN	1514		/* Max. octets in frame sans FCS */
-#define ETH_FCS_LEN	4		/* Octets in the FCS		 */
-
-/*
- *	These are the defined Ethernet Protocol ID's.
- */
-
-#define ETH_P_LOOP	0x0060		/* Ethernet Loopback packet	*/
-#define ETH_P_PUP	0x0200		/* Xerox PUP packet		*/
-#define ETH_P_PUPAT	0x0201		/* Xerox PUP Addr Trans packet	*/
-#define ETH_P_TSN	0x22F0		/* TSN (IEEE 1722) packet	*/
-#define ETH_P_IP	0x0800		/* Internet Protocol packet	*/
-#define ETH_P_X25	0x0805		/* CCITT X.25			*/
-#define ETH_P_ARP	0x0806		/* Address Resolution packet	*/
-#define	ETH_P_BPQ	0x08FF		/* G8BPQ AX.25 Ethernet Packet	[ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_IEEEPUP	0x0a00		/* Xerox IEEE802.3 PUP packet */
-#define ETH_P_IEEEPUPAT	0x0a01		/* Xerox IEEE802.3 PUP Addr Trans packet */
-#define ETH_P_BATMAN	0x4305		/* B.A.T.M.A.N.-Advanced packet [ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_DEC       0x6000          /* DEC Assigned proto           */
-#define ETH_P_DNA_DL    0x6001          /* DEC DNA Dump/Load            */
-#define ETH_P_DNA_RC    0x6002          /* DEC DNA Remote Console       */
-#define ETH_P_DNA_RT    0x6003          /* DEC DNA Routing              */
-#define ETH_P_LAT       0x6004          /* DEC LAT                      */
-#define ETH_P_DIAG      0x6005          /* DEC Diagnostics              */
-#define ETH_P_CUST      0x6006          /* DEC Customer use             */
-#define ETH_P_SCA       0x6007          /* DEC Systems Comms Arch       */
-#define ETH_P_TEB	0x6558		/* Trans Ether Bridging		*/
-#define ETH_P_RARP      0x8035		/* Reverse Addr Res packet	*/
-#define ETH_P_ATALK	0x809B		/* Appletalk DDP		*/
-#define ETH_P_AARP	0x80F3		/* Appletalk AARP		*/
-#define ETH_P_8021Q	0x8100          /* 802.1Q VLAN Extended Header  */
-#define ETH_P_IPX	0x8137		/* IPX over DIX			*/
-#define ETH_P_IPV6	0x86DD		/* IPv6 over bluebook		*/
-#define ETH_P_PAUSE	0x8808		/* IEEE Pause frames. See 802.3 31B */
-#define ETH_P_SLOW	0x8809		/* Slow Protocol. See 802.3ad 43B */
-#define ETH_P_WCCP	0x883E		/* Web-cache coordination protocol
-					 * defined in draft-wilson-wrec-wccp-v2-00.txt */
-#define ETH_P_MPLS_UC	0x8847		/* MPLS Unicast traffic		*/
-#define ETH_P_MPLS_MC	0x8848		/* MPLS Multicast traffic	*/
-#define ETH_P_ATMMPOA	0x884c		/* MultiProtocol Over ATM	*/
-#define ETH_P_PPP_DISC	0x8863		/* PPPoE discovery messages     */
-#define ETH_P_PPP_SES	0x8864		/* PPPoE session messages	*/
-#define ETH_P_LINK_CTL	0x886c		/* HPNA, wlan link local tunnel */
-#define ETH_P_ATMFATE	0x8884		/* Frame-based ATM Transport
-					 * over Ethernet
-					 */
-#define ETH_P_PAE	0x888E		/* Port Access Entity (IEEE 802.1X) */
-#define ETH_P_AOE	0x88A2		/* ATA over Ethernet		*/
-#define ETH_P_8021AD	0x88A8          /* 802.1ad Service VLAN		*/
-#define ETH_P_802_EX1	0x88B5		/* 802.1 Local Experimental 1.  */
-#define ETH_P_TIPC	0x88CA		/* TIPC 			*/
-#define ETH_P_8021AH	0x88E7          /* 802.1ah Backbone Service Tag */
-#define ETH_P_MVRP	0x88F5          /* 802.1Q MVRP                  */
-#define ETH_P_1588	0x88F7		/* IEEE 1588 Timesync */
-#define ETH_P_PRP	0x88FB		/* IEC 62439-3 PRP/HSRv0	*/
-#define ETH_P_FCOE	0x8906		/* Fibre Channel over Ethernet  */
-#define ETH_P_TDLS	0x890D          /* TDLS */
-#define ETH_P_FIP	0x8914		/* FCoE Initialization Protocol */
-#define ETH_P_80221	0x8917		/* IEEE 802.21 Media Independent Handover Protocol */
-#define ETH_P_LOOPBACK	0x9000		/* Ethernet loopback packet, per IEEE 802.3 */
-#define ETH_P_QINQ1	0x9100		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_QINQ2	0x9200		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_QINQ3	0x9300		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_EDSA	0xDADA		/* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
-#define ETH_P_AF_IUCV   0xFBFB		/* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
-
-#define ETH_P_802_3_MIN	0x0600		/* If the value in the ethernet type is less than this value
-					 * then the frame is Ethernet II. Else it is 802.3 */
-
-/*
- *	Non DIX types. Won't clash for 1500 types.
- */
-
-#define ETH_P_802_3	0x0001		/* Dummy type for 802.3 frames  */
-#define ETH_P_AX25	0x0002		/* Dummy protocol id for AX.25  */
-#define ETH_P_ALL	0x0003		/* Every packet (be careful!!!) */
-#define ETH_P_802_2	0x0004		/* 802.2 frames 		*/
-#define ETH_P_SNAP	0x0005		/* Internal only		*/
-#define ETH_P_DDCMP     0x0006          /* DEC DDCMP: Internal only     */
-#define ETH_P_WAN_PPP   0x0007          /* Dummy type for WAN PPP frames*/
-#define ETH_P_PPP_MP    0x0008          /* Dummy type for PPP MP frames */
-#define ETH_P_LOCALTALK 0x0009		/* Localtalk pseudo type 	*/
-#define ETH_P_CAN	0x000C		/* CAN: Controller Area Network */
-#define ETH_P_CANFD	0x000D		/* CANFD: CAN flexible data rate*/
-#define ETH_P_PPPTALK	0x0010		/* Dummy type for Atalk over PPP*/
-#define ETH_P_TR_802_2	0x0011		/* 802.2 frames 		*/
-#define ETH_P_MOBITEX	0x0015		/* Mobitex (kaz@cafe.net)	*/
-#define ETH_P_CONTROL	0x0016		/* Card specific control frames */
-#define ETH_P_IRDA	0x0017		/* Linux-IrDA			*/
-#define ETH_P_ECONET	0x0018		/* Acorn Econet			*/
-#define ETH_P_HDLC	0x0019		/* HDLC frames			*/
-#define ETH_P_ARCNET	0x001A		/* 1A for ArcNet :-)            */
-#define ETH_P_DSA	0x001B		/* Distributed Switch Arch.	*/
-#define ETH_P_TRAILER	0x001C		/* Trailer switch tagging	*/
-#define ETH_P_PHONET	0x00F5		/* Nokia Phonet frames          */
-#define ETH_P_IEEE802154 0x00F6		/* IEEE802.15.4 frame		*/
-#define ETH_P_CAIF	0x00F7		/* ST-Ericsson CAIF protocol	*/
-#define ETH_P_XDSA	0x00F8		/* Multiplexed DSA protocol	*/
-
-/*
- *	This is an Ethernet frame header.
- */
-
-struct ethhdr {
-	unsigned char	h_dest[ETH_ALEN];	/* destination eth addr	*/
-	unsigned char	h_source[ETH_ALEN];	/* source ether addr	*/
-	__be16		h_proto;		/* packet type ID field	*/
-} __attribute__((packed));
-
-
-#endif /* _LINUX_IF_ETHER_H */
diff --git a/openflow/usr/include/linux/if_fc.h b/openflow/usr/include/linux/if_fc.h
deleted file mode 100644
index 6ed7f1b..0000000
--- a/openflow/usr/include/linux/if_fc.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Global definitions for Fibre Channel.
- *
- * Version:	@(#)if_fc.h	0.0	11/20/98
- *
- * Author:	Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *		Donald Becker, <becker@super.org>
- *    Peter De Schrijver, <stud11@cc4.kuleuven.ac.be>
- *	  Vineet Abraham, <vma@iol.unh.edu>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_IF_FC_H
-#define _LINUX_IF_FC_H
-
-#include <linux/types.h>
-
-#define FC_ALEN	6		/* Octets in one ethernet addr	 */
-#define FC_HLEN   (sizeof(struct fch_hdr)+sizeof(struct fcllc))
-#define FC_ID_LEN 3		/* Octets in a Fibre Channel Address */
-
-/* LLC and SNAP constants */
-#define EXTENDED_SAP 0xAA
-#define UI_CMD       0x03
-
-/* This is NOT the Fibre Channel frame header. The FC frame header is
- *  constructed in the driver as the Tachyon needs certain fields in
- *  certains positions. So, it can't be generalized here.*/
-
-struct fch_hdr {
-	__u8  daddr[FC_ALEN];		/* destination address */
-	__u8  saddr[FC_ALEN];		/* source address */
-};
-
-/* This is a Fibre Channel LLC structure */
-struct fcllc {
-	__u8  dsap;			/* destination SAP */
-	__u8  ssap;			/* source SAP */
-	__u8  llc;			/* LLC control field */
-	__u8  protid[3];		/* protocol id */
-	__be16 ethertype;		/* ether type field */
-};
-
-#endif	/* _LINUX_IF_FC_H */
diff --git a/openflow/usr/include/linux/if_fddi.h b/openflow/usr/include/linux/if_fddi.h
deleted file mode 100644
index 6ec21e7..0000000
--- a/openflow/usr/include/linux/if_fddi.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Global definitions for the ANSI FDDI interface.
- *
- * Version:	@(#)if_fddi.h	1.0.2	Sep 29 2004
- *
- * Author:	Lawrence V. Stefani, <stefani@lkg.dec.com>
- *
- *		if_fddi.h is based on previous if_ether.h and if_tr.h work by
- *			Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *			Donald Becker, <becker@super.org>
- *			Alan Cox, <alan@lxorguk.ukuu.org.uk>
- *			Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
- *			Peter De Schrijver, <stud11@cc4.kuleuven.ac.be>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_IF_FDDI_H
-#define _LINUX_IF_FDDI_H
-
-#include <linux/types.h>
-
-/*
- *  Define max and min legal sizes.  The frame sizes do not include
- *  4 byte FCS/CRC (frame check sequence).
- */
-#define FDDI_K_ALEN		6	/* Octets in one FDDI address */
-#define FDDI_K_8022_HLEN	16	/* Total octets in 802.2 header */
-#define FDDI_K_SNAP_HLEN	21	/* Total octets in 802.2 SNAP header */
-#define FDDI_K_8022_ZLEN	16	/* Min octets in 802.2 frame sans
-					   FCS */
-#define FDDI_K_SNAP_ZLEN	21	/* Min octets in 802.2 SNAP frame sans
-					   FCS */
-#define FDDI_K_8022_DLEN	4475	/* Max octets in 802.2 payload */
-#define FDDI_K_SNAP_DLEN	4470	/* Max octets in 802.2 SNAP payload */
-#define FDDI_K_LLC_ZLEN		13	/* Min octets in LLC frame sans FCS */
-#define FDDI_K_LLC_LEN		4491	/* Max octets in LLC frame sans FCS */
-#define FDDI_K_OUI_LEN		3	/* Octets in OUI in 802.2 SNAP
-					   header */
-
-/* Define FDDI Frame Control (FC) Byte values */
-#define FDDI_FC_K_VOID			0x00
-#define FDDI_FC_K_NON_RESTRICTED_TOKEN	0x80
-#define FDDI_FC_K_RESTRICTED_TOKEN	0xC0
-#define FDDI_FC_K_SMT_MIN		0x41
-#define FDDI_FC_K_SMT_MAX		0x4F
-#define FDDI_FC_K_MAC_MIN		0xC1
-#define FDDI_FC_K_MAC_MAX		0xCF
-#define FDDI_FC_K_ASYNC_LLC_MIN		0x50
-#define FDDI_FC_K_ASYNC_LLC_DEF		0x54
-#define FDDI_FC_K_ASYNC_LLC_MAX		0x5F
-#define FDDI_FC_K_SYNC_LLC_MIN		0xD0
-#define FDDI_FC_K_SYNC_LLC_MAX		0xD7
-#define FDDI_FC_K_IMPLEMENTOR_MIN	0x60
-#define FDDI_FC_K_IMPLEMENTOR_MAX	0x6F
-#define FDDI_FC_K_RESERVED_MIN		0x70
-#define FDDI_FC_K_RESERVED_MAX		0x7F
-
-/* Define LLC and SNAP constants */
-#define FDDI_EXTENDED_SAP		0xAA
-#define FDDI_UI_CMD			0x03
-
-/* Define 802.2 Type 1 header */
-struct fddi_8022_1_hdr {
-	__u8	dsap;			/* destination service access point */
-	__u8	ssap;			/* source service access point */
-	__u8	ctrl;			/* control byte #1 */
-} __attribute__((packed));
-
-/* Define 802.2 Type 2 header */
-struct fddi_8022_2_hdr {
-	__u8	dsap;			/* destination service access point */
-	__u8	ssap;			/* source service access point */
-	__u8	ctrl_1;			/* control byte #1 */
-	__u8	ctrl_2;			/* control byte #2 */
-} __attribute__((packed));
-
-/* Define 802.2 SNAP header */
-struct fddi_snap_hdr {
-	__u8	dsap;			/* always 0xAA */
-	__u8	ssap;			/* always 0xAA */
-	__u8	ctrl;			/* always 0x03 */
-	__u8	oui[FDDI_K_OUI_LEN];	/* organizational universal id */
-	__be16	ethertype;		/* packet type ID field */
-} __attribute__((packed));
-
-/* Define FDDI LLC frame header */
-struct fddihdr {
-	__u8	fc;			/* frame control */
-	__u8	daddr[FDDI_K_ALEN];	/* destination address */
-	__u8	saddr[FDDI_K_ALEN];	/* source address */
-	union {
-		struct fddi_8022_1_hdr	llc_8022_1;
-		struct fddi_8022_2_hdr	llc_8022_2;
-		struct fddi_snap_hdr	llc_snap;
-	} hdr;
-} __attribute__((packed));
-
-
-#endif /* _LINUX_IF_FDDI_H */
diff --git a/openflow/usr/include/linux/if_frad.h b/openflow/usr/include/linux/if_frad.h
deleted file mode 100644
index 30361db..0000000
--- a/openflow/usr/include/linux/if_frad.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * DLCI/FRAD	Definitions for Frame Relay Access Devices.  DLCI devices are
- *		created for each DLCI associated with a FRAD.  The FRAD driver
- *		is not truly a network device, but the lower level device
- *		handler.  This allows other FRAD manufacturers to use the DLCI
- *		code, including its RFC1490 encapsulation alongside the current
- *		implementation for the Sangoma cards.
- *
- * Version:	@(#)if_ifrad.h	0.15	31 Mar 96
- *
- * Author:	Mike McLagan <mike.mclagan@linux.org>
- *
- * Changes:
- *		0.15	Mike McLagan	changed structure defs (packed)
- *					re-arranged flags
- *					added DLCI_RET vars
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-
-#ifndef _FRAD_H_
-#define _FRAD_H_
-
-#include <linux/if.h>
-
-/* Structures and constants associated with the DLCI device driver */
-
-struct dlci_add
-{
-   char  devname[IFNAMSIZ];
-   short dlci;
-};
-
-#define DLCI_GET_CONF	(SIOCDEVPRIVATE + 2)
-#define DLCI_SET_CONF	(SIOCDEVPRIVATE + 3)
-
-/* 
- * These are related to the Sangoma SDLA and should remain in order. 
- * Code within the SDLA module is based on the specifics of this 
- * structure.  Change at your own peril.
- */
-struct dlci_conf {
-   short flags;
-   short CIR_fwd;
-   short Bc_fwd;
-   short Be_fwd;
-   short CIR_bwd;
-   short Bc_bwd;
-   short Be_bwd; 
-
-/* these are part of the status read */
-   short Tc_fwd;
-   short Tc_bwd;
-   short Tf_max;
-   short Tb_max;
-
-/* add any new fields here above is a mirror of sdla_dlci_conf */
-};
-
-#define DLCI_GET_SLAVE	(SIOCDEVPRIVATE + 4)
-
-/* configuration flags for DLCI */
-#define DLCI_IGNORE_CIR_OUT	0x0001
-#define DLCI_ACCOUNT_CIR_IN	0x0002
-#define DLCI_BUFFER_IF		0x0008
-
-#define DLCI_VALID_FLAGS	0x000B
-
-/* defines for the actual Frame Relay hardware */
-#define FRAD_GET_CONF	(SIOCDEVPRIVATE)
-#define FRAD_SET_CONF	(SIOCDEVPRIVATE + 1)
-
-#define FRAD_LAST_IOCTL	FRAD_SET_CONF
-
-/*
- * Based on the setup for the Sangoma SDLA.  If changes are 
- * necessary to this structure, a routine will need to be 
- * added to that module to copy fields.
- */
-struct frad_conf 
-{
-   short station;
-   short flags;
-   short kbaud;
-   short clocking;
-   short mtu;
-   short T391;
-   short T392;
-   short N391;
-   short N392;
-   short N393;
-   short CIR_fwd;
-   short Bc_fwd;
-   short Be_fwd;
-   short CIR_bwd;
-   short Bc_bwd;
-   short Be_bwd;
-
-/* Add new fields here, above is a mirror of the sdla_conf */
-
-};
-
-#define FRAD_STATION_CPE	0x0000
-#define FRAD_STATION_NODE	0x0001
-
-#define FRAD_TX_IGNORE_CIR	0x0001
-#define FRAD_RX_ACCOUNT_CIR	0x0002
-#define FRAD_DROP_ABORTED	0x0004
-#define FRAD_BUFFERIF		0x0008
-#define FRAD_STATS		0x0010
-#define FRAD_MCI		0x0100
-#define FRAD_AUTODLCI		0x8000
-#define FRAD_VALID_FLAGS	0x811F
-
-#define FRAD_CLOCK_INT		0x0001
-#define FRAD_CLOCK_EXT		0x0000
-
-
-#endif /* _FRAD_H_ */
diff --git a/openflow/usr/include/linux/if_hippi.h b/openflow/usr/include/linux/if_hippi.h
deleted file mode 100644
index cdc049f..0000000
--- a/openflow/usr/include/linux/if_hippi.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Global definitions for the HIPPI interface.
- *
- * Version:	@(#)if_hippi.h	1.0.0	05/26/97
- *
- * Author:	Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *		Donald Becker, <becker@super.org>
- *		Alan Cox, <alan@lxorguk.ukuu.org.uk>
- *		Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
- *		Jes Sorensen, <Jes.Sorensen@cern.ch>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
- 
-#ifndef _LINUX_IF_HIPPI_H
-#define _LINUX_IF_HIPPI_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/*
- *	HIPPI magic constants.
- */
-
-#define HIPPI_ALEN	6		/* Bytes in one HIPPI hw-addr	   */
-#define HIPPI_HLEN	sizeof(struct hippi_hdr)
-#define HIPPI_ZLEN	0		/* Min. bytes in frame without FCS */
-#define HIPPI_DATA_LEN	65280		/* Max. bytes in payload	   */
-#define HIPPI_FRAME_LEN	(HIPPI_DATA_LEN + HIPPI_HLEN)
-					/* Max. bytes in frame without FCS */
-
-/*
- * Define LLC and SNAP constants.
- */
-#define HIPPI_EXTENDED_SAP	0xAA
-#define HIPPI_UI_CMD		0x03
-
-
-/*
- *	Do we need to list some sort of ID's here?
- */
-
-/*
- *	HIPPI statistics collection data. 
- */
- 
-struct hipnet_statistics {
-	int	rx_packets;		/* total packets received	*/
-	int	tx_packets;		/* total packets transmitted	*/
-	int	rx_errors;		/* bad packets received		*/
-	int	tx_errors;		/* packet transmit problems	*/
-	int	rx_dropped;		/* no space in linux buffers	*/
-	int	tx_dropped;		/* no space available in linux	*/
-
-	/* detailed rx_errors: */
-	int	rx_length_errors;
-	int	rx_over_errors;		/* receiver ring buff overflow	*/
-	int	rx_crc_errors;		/* recved pkt with crc error	*/
-	int	rx_frame_errors;	/* recv'd frame alignment error */
-	int	rx_fifo_errors;		/* recv'r fifo overrun		*/
-	int	rx_missed_errors;	/* receiver missed packet	*/
-
-	/* detailed tx_errors */
-	int	tx_aborted_errors;
-	int	tx_carrier_errors;
-	int	tx_fifo_errors;
-	int	tx_heartbeat_errors;
-	int	tx_window_errors;
-};
-
-
-struct hippi_fp_hdr {
-#if 0
-	__u8		ulp;				/* must contain 4 */
-#if defined (__BIG_ENDIAN_BITFIELD)
-	__u8		d1_data_present:1;		/* must be 1 */
-	__u8		start_d2_burst_boundary:1;	/* must be zero */
-	__u8		reserved:6;			/* must be zero */
-#if 0
-	__u16		reserved1:5;
-	__u16		d1_area_size:8;			/* must be 3 */
-	__u16		d2_offset:3;			/* must be zero */
-#endif
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8		reserved:6;			/* must be zero */
-	__u8	 	start_d2_burst_boundary:1;	/* must be zero */
-	__u8		d1_data_present:1;		/* must be 1 */
-#if 0
-	__u16		d2_offset:3;			/* must be zero */
-	__u16		d1_area_size:8;			/* must be 3 */
-	__u16		reserved1:5;			/* must be zero */
-#endif
-#else
-#error	"Please fix <asm/byteorder.h>"
-#endif
-#else
-	__be32		fixed;
-#endif
-	__be32		d2_size;
-} __attribute__((packed));
-
-struct hippi_le_hdr {
-#if defined (__BIG_ENDIAN_BITFIELD)
-	__u8		fc:3;
-	__u8		double_wide:1;
-	__u8		message_type:4;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8		message_type:4;
-	__u8		double_wide:1;
-	__u8		fc:3;
-#endif
-	__u8		dest_switch_addr[3];
-#if defined (__BIG_ENDIAN_BITFIELD)
-	__u8		dest_addr_type:4,
-			src_addr_type:4;
-#elif defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8		src_addr_type:4,
-			dest_addr_type:4;
-#endif
-	__u8		src_switch_addr[3];
-	__u16		reserved;
-	__u8		daddr[HIPPI_ALEN];
-	__u16		locally_administered;
-	__u8		saddr[HIPPI_ALEN];
-} __attribute__((packed));
-
-#define HIPPI_OUI_LEN	3
-/*
- * Looks like the dsap and ssap fields have been swapped by mistake in
- * RFC 2067 "IP over HIPPI".
- */
-struct hippi_snap_hdr {
-	__u8	dsap;			/* always 0xAA */
-	__u8	ssap;			/* always 0xAA */
-	__u8	ctrl;			/* always 0x03 */
-	__u8	oui[HIPPI_OUI_LEN];	/* organizational universal id (zero)*/
-	__be16	ethertype;		/* packet type ID field */
-} __attribute__((packed));
-
-struct hippi_hdr {
-	struct hippi_fp_hdr	fp;
-	struct hippi_le_hdr	le;
-	struct hippi_snap_hdr	snap;
-} __attribute__((packed));
-
-#endif	/* _LINUX_IF_HIPPI_H */
diff --git a/openflow/usr/include/linux/if_infiniband.h b/openflow/usr/include/linux/if_infiniband.h
deleted file mode 100644
index 7d95847..0000000
--- a/openflow/usr/include/linux/if_infiniband.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available at
- * <http://www.fsf.org/copyleft/gpl.html>, or the OpenIB.org BSD
- * license, available in the LICENSE.TXT file accompanying this
- * software.  These details are also available at
- * <http://www.openfabrics.org/software_license.htm>.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Copyright (c) 2004 Topspin Communications.  All rights reserved.
- *
- * $Id$
- */
-
-#ifndef _LINUX_IF_INFINIBAND_H
-#define _LINUX_IF_INFINIBAND_H
-
-#define INFINIBAND_ALEN		20	/* Octets in IPoIB HW addr	*/
-
-#endif /* _LINUX_IF_INFINIBAND_H */
diff --git a/openflow/usr/include/linux/if_link.h b/openflow/usr/include/linux/if_link.h
deleted file mode 100644
index f6284ee..0000000
--- a/openflow/usr/include/linux/if_link.h
+++ /dev/null
@@ -1,728 +0,0 @@
-#ifndef _LINUX_IF_LINK_H
-#define _LINUX_IF_LINK_H
-
-#include <linux/types.h>
-#include <linux/netlink.h>
-
-/* This struct should be in sync with struct rtnl_link_stats64 */
-struct rtnl_link_stats {
-	__u32	rx_packets;		/* total packets received	*/
-	__u32	tx_packets;		/* total packets transmitted	*/
-	__u32	rx_bytes;		/* total bytes received 	*/
-	__u32	tx_bytes;		/* total bytes transmitted	*/
-	__u32	rx_errors;		/* bad packets received		*/
-	__u32	tx_errors;		/* packet transmit problems	*/
-	__u32	rx_dropped;		/* no space in linux buffers	*/
-	__u32	tx_dropped;		/* no space available in linux	*/
-	__u32	multicast;		/* multicast packets received	*/
-	__u32	collisions;
-
-	/* detailed rx_errors: */
-	__u32	rx_length_errors;
-	__u32	rx_over_errors;		/* receiver ring buff overflow	*/
-	__u32	rx_crc_errors;		/* recved pkt with crc error	*/
-	__u32	rx_frame_errors;	/* recv'd frame alignment error */
-	__u32	rx_fifo_errors;		/* recv'r fifo overrun		*/
-	__u32	rx_missed_errors;	/* receiver missed packet	*/
-
-	/* detailed tx_errors */
-	__u32	tx_aborted_errors;
-	__u32	tx_carrier_errors;
-	__u32	tx_fifo_errors;
-	__u32	tx_heartbeat_errors;
-	__u32	tx_window_errors;
-
-	/* for cslip etc */
-	__u32	rx_compressed;
-	__u32	tx_compressed;
-};
-
-/* The main device statistics structure */
-struct rtnl_link_stats64 {
-	__u64	rx_packets;		/* total packets received	*/
-	__u64	tx_packets;		/* total packets transmitted	*/
-	__u64	rx_bytes;		/* total bytes received 	*/
-	__u64	tx_bytes;		/* total bytes transmitted	*/
-	__u64	rx_errors;		/* bad packets received		*/
-	__u64	tx_errors;		/* packet transmit problems	*/
-	__u64	rx_dropped;		/* no space in linux buffers	*/
-	__u64	tx_dropped;		/* no space available in linux	*/
-	__u64	multicast;		/* multicast packets received	*/
-	__u64	collisions;
-
-	/* detailed rx_errors: */
-	__u64	rx_length_errors;
-	__u64	rx_over_errors;		/* receiver ring buff overflow	*/
-	__u64	rx_crc_errors;		/* recved pkt with crc error	*/
-	__u64	rx_frame_errors;	/* recv'd frame alignment error */
-	__u64	rx_fifo_errors;		/* recv'r fifo overrun		*/
-	__u64	rx_missed_errors;	/* receiver missed packet	*/
-
-	/* detailed tx_errors */
-	__u64	tx_aborted_errors;
-	__u64	tx_carrier_errors;
-	__u64	tx_fifo_errors;
-	__u64	tx_heartbeat_errors;
-	__u64	tx_window_errors;
-
-	/* for cslip etc */
-	__u64	rx_compressed;
-	__u64	tx_compressed;
-};
-
-/* The struct should be in sync with struct ifmap */
-struct rtnl_link_ifmap {
-	__u64	mem_start;
-	__u64	mem_end;
-	__u64	base_addr;
-	__u16	irq;
-	__u8	dma;
-	__u8	port;
-};
-
-/*
- * IFLA_AF_SPEC
- *   Contains nested attributes for address family specific attributes.
- *   Each address family may create a attribute with the address family
- *   number as type and create its own attribute structure in it.
- *
- *   Example:
- *   [IFLA_AF_SPEC] = {
- *       [AF_INET] = {
- *           [IFLA_INET_CONF] = ...,
- *       },
- *       [AF_INET6] = {
- *           [IFLA_INET6_FLAGS] = ...,
- *           [IFLA_INET6_CONF] = ...,
- *       }
- *   }
- */
-
-enum {
-	IFLA_UNSPEC,
-	IFLA_ADDRESS,
-	IFLA_BROADCAST,
-	IFLA_IFNAME,
-	IFLA_MTU,
-	IFLA_LINK,
-	IFLA_QDISC,
-	IFLA_STATS,
-	IFLA_COST,
-#define IFLA_COST IFLA_COST
-	IFLA_PRIORITY,
-#define IFLA_PRIORITY IFLA_PRIORITY
-	IFLA_MASTER,
-#define IFLA_MASTER IFLA_MASTER
-	IFLA_WIRELESS,		/* Wireless Extension event - see wireless.h */
-#define IFLA_WIRELESS IFLA_WIRELESS
-	IFLA_PROTINFO,		/* Protocol specific information for a link */
-#define IFLA_PROTINFO IFLA_PROTINFO
-	IFLA_TXQLEN,
-#define IFLA_TXQLEN IFLA_TXQLEN
-	IFLA_MAP,
-#define IFLA_MAP IFLA_MAP
-	IFLA_WEIGHT,
-#define IFLA_WEIGHT IFLA_WEIGHT
-	IFLA_OPERSTATE,
-	IFLA_LINKMODE,
-	IFLA_LINKINFO,
-#define IFLA_LINKINFO IFLA_LINKINFO
-	IFLA_NET_NS_PID,
-	IFLA_IFALIAS,
-	IFLA_NUM_VF,		/* Number of VFs if device is SR-IOV PF */
-	IFLA_VFINFO_LIST,
-	IFLA_STATS64,
-	IFLA_VF_PORTS,
-	IFLA_PORT_SELF,
-	IFLA_AF_SPEC,
-	IFLA_GROUP,		/* Group the device belongs to */
-	IFLA_NET_NS_FD,
-	IFLA_EXT_MASK,		/* Extended info mask, VFs, etc */
-	IFLA_PROMISCUITY,	/* Promiscuity count: > 0 means acts PROMISC */
-#define IFLA_PROMISCUITY IFLA_PROMISCUITY
-	IFLA_NUM_TX_QUEUES,
-	IFLA_NUM_RX_QUEUES,
-	IFLA_CARRIER,
-	IFLA_PHYS_PORT_ID,
-	IFLA_CARRIER_CHANGES,
-	IFLA_PHYS_SWITCH_ID,
-	IFLA_LINK_NETNSID,
-	IFLA_PHYS_PORT_NAME,
-	IFLA_PROTO_DOWN,
-	__IFLA_MAX
-};
-
-
-#define IFLA_MAX (__IFLA_MAX - 1)
-
-/* backwards compatibility for userspace */
-#define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
-#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
-
-enum {
-	IFLA_INET_UNSPEC,
-	IFLA_INET_CONF,
-	__IFLA_INET_MAX,
-};
-
-#define IFLA_INET_MAX (__IFLA_INET_MAX - 1)
-
-/* ifi_flags.
-
-   IFF_* flags.
-
-   The only change is:
-   IFF_LOOPBACK, IFF_BROADCAST and IFF_POINTOPOINT are
-   more not changeable by user. They describe link media
-   characteristics and set by device driver.
-
-   Comments:
-   - Combination IFF_BROADCAST|IFF_POINTOPOINT is invalid
-   - If neither of these three flags are set;
-     the interface is NBMA.
-
-   - IFF_MULTICAST does not mean anything special:
-   multicasts can be used on all not-NBMA links.
-   IFF_MULTICAST means that this media uses special encapsulation
-   for multicast frames. Apparently, all IFF_POINTOPOINT and
-   IFF_BROADCAST devices are able to use multicasts too.
- */
-
-/* IFLA_LINK.
-   For usual devices it is equal ifi_index.
-   If it is a "virtual interface" (f.e. tunnel), ifi_link
-   can point to real physical interface (f.e. for bandwidth calculations),
-   or maybe 0, what means, that real media is unknown (usual
-   for IPIP tunnels, when route to endpoint is allowed to change)
- */
-
-/* Subtype attributes for IFLA_PROTINFO */
-enum {
-	IFLA_INET6_UNSPEC,
-	IFLA_INET6_FLAGS,	/* link flags			*/
-	IFLA_INET6_CONF,	/* sysctl parameters		*/
-	IFLA_INET6_STATS,	/* statistics			*/
-	IFLA_INET6_MCAST,	/* MC things. What of them?	*/
-	IFLA_INET6_CACHEINFO,	/* time values and max reasm size */
-	IFLA_INET6_ICMP6STATS,	/* statistics (icmpv6)		*/
-	IFLA_INET6_TOKEN,	/* device token			*/
-	IFLA_INET6_ADDR_GEN_MODE, /* implicit address generator mode */
-	__IFLA_INET6_MAX
-};
-
-#define IFLA_INET6_MAX	(__IFLA_INET6_MAX - 1)
-
-enum in6_addr_gen_mode {
-	IN6_ADDR_GEN_MODE_EUI64,
-	IN6_ADDR_GEN_MODE_NONE,
-	IN6_ADDR_GEN_MODE_STABLE_PRIVACY,
-};
-
-/* Bridge section */
-
-enum {
-	IFLA_BR_UNSPEC,
-	IFLA_BR_FORWARD_DELAY,
-	IFLA_BR_HELLO_TIME,
-	IFLA_BR_MAX_AGE,
-	IFLA_BR_AGEING_TIME,
-	IFLA_BR_STP_STATE,
-	IFLA_BR_PRIORITY,
-	IFLA_BR_VLAN_FILTERING,
-	IFLA_BR_VLAN_PROTOCOL,
-	IFLA_BR_GROUP_FWD_MASK,
-	IFLA_BR_ROOT_ID,
-	IFLA_BR_BRIDGE_ID,
-	IFLA_BR_ROOT_PORT,
-	IFLA_BR_ROOT_PATH_COST,
-	IFLA_BR_TOPOLOGY_CHANGE,
-	IFLA_BR_TOPOLOGY_CHANGE_DETECTED,
-	IFLA_BR_HELLO_TIMER,
-	IFLA_BR_TCN_TIMER,
-	IFLA_BR_TOPOLOGY_CHANGE_TIMER,
-	IFLA_BR_GC_TIMER,
-	IFLA_BR_GROUP_ADDR,
-	IFLA_BR_FDB_FLUSH,
-	IFLA_BR_MCAST_ROUTER,
-	IFLA_BR_MCAST_SNOOPING,
-	IFLA_BR_MCAST_QUERY_USE_IFADDR,
-	IFLA_BR_MCAST_QUERIER,
-	IFLA_BR_MCAST_HASH_ELASTICITY,
-	IFLA_BR_MCAST_HASH_MAX,
-	IFLA_BR_MCAST_LAST_MEMBER_CNT,
-	IFLA_BR_MCAST_STARTUP_QUERY_CNT,
-	IFLA_BR_MCAST_LAST_MEMBER_INTVL,
-	IFLA_BR_MCAST_MEMBERSHIP_INTVL,
-	IFLA_BR_MCAST_QUERIER_INTVL,
-	IFLA_BR_MCAST_QUERY_INTVL,
-	IFLA_BR_MCAST_QUERY_RESPONSE_INTVL,
-	IFLA_BR_MCAST_STARTUP_QUERY_INTVL,
-	IFLA_BR_NF_CALL_IPTABLES,
-	IFLA_BR_NF_CALL_IP6TABLES,
-	IFLA_BR_NF_CALL_ARPTABLES,
-	IFLA_BR_VLAN_DEFAULT_PVID,
-	__IFLA_BR_MAX,
-};
-
-#define IFLA_BR_MAX	(__IFLA_BR_MAX - 1)
-
-struct ifla_bridge_id {
-	__u8	prio[2];
-	__u8	addr[6]; /* ETH_ALEN */
-};
-
-enum {
-	BRIDGE_MODE_UNSPEC,
-	BRIDGE_MODE_HAIRPIN,
-};
-
-enum {
-	IFLA_BRPORT_UNSPEC,
-	IFLA_BRPORT_STATE,	/* Spanning tree state     */
-	IFLA_BRPORT_PRIORITY,	/* "             priority  */
-	IFLA_BRPORT_COST,	/* "             cost      */
-	IFLA_BRPORT_MODE,	/* mode (hairpin)          */
-	IFLA_BRPORT_GUARD,	/* bpdu guard              */
-	IFLA_BRPORT_PROTECT,	/* root port protection    */
-	IFLA_BRPORT_FAST_LEAVE,	/* multicast fast leave    */
-	IFLA_BRPORT_LEARNING,	/* mac learning */
-	IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
-	IFLA_BRPORT_PROXYARP,	/* proxy ARP */
-	IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */
-	IFLA_BRPORT_PROXYARP_WIFI, /* proxy ARP for Wi-Fi */
-	IFLA_BRPORT_ROOT_ID,	/* designated root */
-	IFLA_BRPORT_BRIDGE_ID,	/* designated bridge */
-	IFLA_BRPORT_DESIGNATED_PORT,
-	IFLA_BRPORT_DESIGNATED_COST,
-	IFLA_BRPORT_ID,
-	IFLA_BRPORT_NO,
-	IFLA_BRPORT_TOPOLOGY_CHANGE_ACK,
-	IFLA_BRPORT_CONFIG_PENDING,
-	IFLA_BRPORT_MESSAGE_AGE_TIMER,
-	IFLA_BRPORT_FORWARD_DELAY_TIMER,
-	IFLA_BRPORT_HOLD_TIMER,
-	IFLA_BRPORT_FLUSH,
-	IFLA_BRPORT_MULTICAST_ROUTER,
-	__IFLA_BRPORT_MAX
-};
-#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
-
-struct ifla_cacheinfo {
-	__u32	max_reasm_len;
-	__u32	tstamp;		/* ipv6InterfaceTable updated timestamp */
-	__u32	reachable_time;
-	__u32	retrans_time;
-};
-
-enum {
-	IFLA_INFO_UNSPEC,
-	IFLA_INFO_KIND,
-	IFLA_INFO_DATA,
-	IFLA_INFO_XSTATS,
-	IFLA_INFO_SLAVE_KIND,
-	IFLA_INFO_SLAVE_DATA,
-	__IFLA_INFO_MAX,
-};
-
-#define IFLA_INFO_MAX	(__IFLA_INFO_MAX - 1)
-
-/* VLAN section */
-
-enum {
-	IFLA_VLAN_UNSPEC,
-	IFLA_VLAN_ID,
-	IFLA_VLAN_FLAGS,
-	IFLA_VLAN_EGRESS_QOS,
-	IFLA_VLAN_INGRESS_QOS,
-	IFLA_VLAN_PROTOCOL,
-	__IFLA_VLAN_MAX,
-};
-
-#define IFLA_VLAN_MAX	(__IFLA_VLAN_MAX - 1)
-
-struct ifla_vlan_flags {
-	__u32	flags;
-	__u32	mask;
-};
-
-enum {
-	IFLA_VLAN_QOS_UNSPEC,
-	IFLA_VLAN_QOS_MAPPING,
-	__IFLA_VLAN_QOS_MAX
-};
-
-#define IFLA_VLAN_QOS_MAX	(__IFLA_VLAN_QOS_MAX - 1)
-
-struct ifla_vlan_qos_mapping {
-	__u32 from;
-	__u32 to;
-};
-
-/* MACVLAN section */
-enum {
-	IFLA_MACVLAN_UNSPEC,
-	IFLA_MACVLAN_MODE,
-	IFLA_MACVLAN_FLAGS,
-	IFLA_MACVLAN_MACADDR_MODE,
-	IFLA_MACVLAN_MACADDR,
-	IFLA_MACVLAN_MACADDR_DATA,
-	IFLA_MACVLAN_MACADDR_COUNT,
-	__IFLA_MACVLAN_MAX,
-};
-
-#define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1)
-
-enum macvlan_mode {
-	MACVLAN_MODE_PRIVATE = 1, /* don't talk to other macvlans */
-	MACVLAN_MODE_VEPA    = 2, /* talk to other ports through ext bridge */
-	MACVLAN_MODE_BRIDGE  = 4, /* talk to bridge ports directly */
-	MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */
-	MACVLAN_MODE_SOURCE  = 16,/* use source MAC address list to assign */
-};
-
-enum macvlan_macaddr_mode {
-	MACVLAN_MACADDR_ADD,
-	MACVLAN_MACADDR_DEL,
-	MACVLAN_MACADDR_FLUSH,
-	MACVLAN_MACADDR_SET,
-};
-
-#define MACVLAN_FLAG_NOPROMISC	1
-
-/* VRF section */
-enum {
-	IFLA_VRF_UNSPEC,
-	IFLA_VRF_TABLE,
-	__IFLA_VRF_MAX
-};
-
-#define IFLA_VRF_MAX (__IFLA_VRF_MAX - 1)
-
-/* IPVLAN section */
-enum {
-	IFLA_IPVLAN_UNSPEC,
-	IFLA_IPVLAN_MODE,
-	__IFLA_IPVLAN_MAX
-};
-
-#define IFLA_IPVLAN_MAX (__IFLA_IPVLAN_MAX - 1)
-
-enum ipvlan_mode {
-	IPVLAN_MODE_L2 = 0,
-	IPVLAN_MODE_L3,
-	IPVLAN_MODE_MAX
-};
-
-/* VXLAN section */
-enum {
-	IFLA_VXLAN_UNSPEC,
-	IFLA_VXLAN_ID,
-	IFLA_VXLAN_GROUP,	/* group or remote address */
-	IFLA_VXLAN_LINK,
-	IFLA_VXLAN_LOCAL,
-	IFLA_VXLAN_TTL,
-	IFLA_VXLAN_TOS,
-	IFLA_VXLAN_LEARNING,
-	IFLA_VXLAN_AGEING,
-	IFLA_VXLAN_LIMIT,
-	IFLA_VXLAN_PORT_RANGE,	/* source port */
-	IFLA_VXLAN_PROXY,
-	IFLA_VXLAN_RSC,
-	IFLA_VXLAN_L2MISS,
-	IFLA_VXLAN_L3MISS,
-	IFLA_VXLAN_PORT,	/* destination port */
-	IFLA_VXLAN_GROUP6,
-	IFLA_VXLAN_LOCAL6,
-	IFLA_VXLAN_UDP_CSUM,
-	IFLA_VXLAN_UDP_ZERO_CSUM6_TX,
-	IFLA_VXLAN_UDP_ZERO_CSUM6_RX,
-	IFLA_VXLAN_REMCSUM_TX,
-	IFLA_VXLAN_REMCSUM_RX,
-	IFLA_VXLAN_GBP,
-	IFLA_VXLAN_REMCSUM_NOPARTIAL,
-	IFLA_VXLAN_COLLECT_METADATA,
-	IFLA_VXLAN_FAN_MAP = 33,
-	__IFLA_VXLAN_MAX
-};
-#define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
-
-struct ifla_vxlan_port_range {
-	__be16	low;
-	__be16	high;
-};
-
-/* GENEVE section */
-enum {
-	IFLA_GENEVE_UNSPEC,
-	IFLA_GENEVE_ID,
-	IFLA_GENEVE_REMOTE,
-	IFLA_GENEVE_TTL,
-	IFLA_GENEVE_TOS,
-	IFLA_GENEVE_PORT,	/* destination port */
-	IFLA_GENEVE_COLLECT_METADATA,
-	IFLA_GENEVE_REMOTE6,
-	IFLA_GENEVE_UDP_CSUM,
-	IFLA_GENEVE_UDP_ZERO_CSUM6_TX,
-	IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
-	__IFLA_GENEVE_MAX
-};
-#define IFLA_GENEVE_MAX	(__IFLA_GENEVE_MAX - 1)
-
-/* Bonding section */
-
-enum {
-	IFLA_BOND_UNSPEC,
-	IFLA_BOND_MODE,
-	IFLA_BOND_ACTIVE_SLAVE,
-	IFLA_BOND_MIIMON,
-	IFLA_BOND_UPDELAY,
-	IFLA_BOND_DOWNDELAY,
-	IFLA_BOND_USE_CARRIER,
-	IFLA_BOND_ARP_INTERVAL,
-	IFLA_BOND_ARP_IP_TARGET,
-	IFLA_BOND_ARP_VALIDATE,
-	IFLA_BOND_ARP_ALL_TARGETS,
-	IFLA_BOND_PRIMARY,
-	IFLA_BOND_PRIMARY_RESELECT,
-	IFLA_BOND_FAIL_OVER_MAC,
-	IFLA_BOND_XMIT_HASH_POLICY,
-	IFLA_BOND_RESEND_IGMP,
-	IFLA_BOND_NUM_PEER_NOTIF,
-	IFLA_BOND_ALL_SLAVES_ACTIVE,
-	IFLA_BOND_MIN_LINKS,
-	IFLA_BOND_LP_INTERVAL,
-	IFLA_BOND_PACKETS_PER_SLAVE,
-	IFLA_BOND_AD_LACP_RATE,
-	IFLA_BOND_AD_SELECT,
-	IFLA_BOND_AD_INFO,
-	IFLA_BOND_AD_ACTOR_SYS_PRIO,
-	IFLA_BOND_AD_USER_PORT_KEY,
-	IFLA_BOND_AD_ACTOR_SYSTEM,
-	IFLA_BOND_TLB_DYNAMIC_LB,
-	__IFLA_BOND_MAX,
-};
-
-#define IFLA_BOND_MAX	(__IFLA_BOND_MAX - 1)
-
-enum {
-	IFLA_BOND_AD_INFO_UNSPEC,
-	IFLA_BOND_AD_INFO_AGGREGATOR,
-	IFLA_BOND_AD_INFO_NUM_PORTS,
-	IFLA_BOND_AD_INFO_ACTOR_KEY,
-	IFLA_BOND_AD_INFO_PARTNER_KEY,
-	IFLA_BOND_AD_INFO_PARTNER_MAC,
-	__IFLA_BOND_AD_INFO_MAX,
-};
-
-#define IFLA_BOND_AD_INFO_MAX	(__IFLA_BOND_AD_INFO_MAX - 1)
-
-enum {
-	IFLA_BOND_SLAVE_UNSPEC,
-	IFLA_BOND_SLAVE_STATE,
-	IFLA_BOND_SLAVE_MII_STATUS,
-	IFLA_BOND_SLAVE_LINK_FAILURE_COUNT,
-	IFLA_BOND_SLAVE_PERM_HWADDR,
-	IFLA_BOND_SLAVE_QUEUE_ID,
-	IFLA_BOND_SLAVE_AD_AGGREGATOR_ID,
-	IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE,
-	IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE,
-	__IFLA_BOND_SLAVE_MAX,
-};
-
-#define IFLA_BOND_SLAVE_MAX	(__IFLA_BOND_SLAVE_MAX - 1)
-
-/* SR-IOV virtual function management section */
-
-enum {
-	IFLA_VF_INFO_UNSPEC,
-	IFLA_VF_INFO,
-	__IFLA_VF_INFO_MAX,
-};
-
-#define IFLA_VF_INFO_MAX (__IFLA_VF_INFO_MAX - 1)
-
-enum {
-	IFLA_VF_UNSPEC,
-	IFLA_VF_MAC,		/* Hardware queue specific attributes */
-	IFLA_VF_VLAN,
-	IFLA_VF_TX_RATE,	/* Max TX Bandwidth Allocation */
-	IFLA_VF_SPOOFCHK,	/* Spoof Checking on/off switch */
-	IFLA_VF_LINK_STATE,	/* link state enable/disable/auto switch */
-	IFLA_VF_RATE,		/* Min and Max TX Bandwidth Allocation */
-	IFLA_VF_RSS_QUERY_EN,	/* RSS Redirection Table and Hash Key query
-				 * on/off switch
-				 */
-	IFLA_VF_STATS,		/* network device statistics */
-	IFLA_VF_TRUST,		/* Trust VF */
-	__IFLA_VF_MAX,
-};
-
-#define IFLA_VF_MAX (__IFLA_VF_MAX - 1)
-
-struct ifla_vf_mac {
-	__u32 vf;
-	__u8 mac[32]; /* MAX_ADDR_LEN */
-};
-
-struct ifla_vf_vlan {
-	__u32 vf;
-	__u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
-	__u32 qos;
-};
-
-struct ifla_vf_tx_rate {
-	__u32 vf;
-	__u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
-};
-
-struct ifla_vf_rate {
-	__u32 vf;
-	__u32 min_tx_rate; /* Min Bandwidth in Mbps */
-	__u32 max_tx_rate; /* Max Bandwidth in Mbps */
-};
-
-struct ifla_vf_spoofchk {
-	__u32 vf;
-	__u32 setting;
-};
-
-enum {
-	IFLA_VF_LINK_STATE_AUTO,	/* link state of the uplink */
-	IFLA_VF_LINK_STATE_ENABLE,	/* link always up */
-	IFLA_VF_LINK_STATE_DISABLE,	/* link always down */
-	__IFLA_VF_LINK_STATE_MAX,
-};
-
-struct ifla_vf_link_state {
-	__u32 vf;
-	__u32 link_state;
-};
-
-struct ifla_vf_rss_query_en {
-	__u32 vf;
-	__u32 setting;
-};
-
-enum {
-	IFLA_VF_STATS_RX_PACKETS,
-	IFLA_VF_STATS_TX_PACKETS,
-	IFLA_VF_STATS_RX_BYTES,
-	IFLA_VF_STATS_TX_BYTES,
-	IFLA_VF_STATS_BROADCAST,
-	IFLA_VF_STATS_MULTICAST,
-	__IFLA_VF_STATS_MAX,
-};
-
-#define IFLA_VF_STATS_MAX (__IFLA_VF_STATS_MAX - 1)
-
-struct ifla_vf_trust {
-	__u32 vf;
-	__u32 setting;
-};
-
-/* VF ports management section
- *
- *	Nested layout of set/get msg is:
- *
- *		[IFLA_NUM_VF]
- *		[IFLA_VF_PORTS]
- *			[IFLA_VF_PORT]
- *				[IFLA_PORT_*], ...
- *			[IFLA_VF_PORT]
- *				[IFLA_PORT_*], ...
- *			...
- *		[IFLA_PORT_SELF]
- *			[IFLA_PORT_*], ...
- */
-
-enum {
-	IFLA_VF_PORT_UNSPEC,
-	IFLA_VF_PORT,			/* nest */
-	__IFLA_VF_PORT_MAX,
-};
-
-#define IFLA_VF_PORT_MAX (__IFLA_VF_PORT_MAX - 1)
-
-enum {
-	IFLA_PORT_UNSPEC,
-	IFLA_PORT_VF,			/* __u32 */
-	IFLA_PORT_PROFILE,		/* string */
-	IFLA_PORT_VSI_TYPE,		/* 802.1Qbg (pre-)standard VDP */
-	IFLA_PORT_INSTANCE_UUID,	/* binary UUID */
-	IFLA_PORT_HOST_UUID,		/* binary UUID */
-	IFLA_PORT_REQUEST,		/* __u8 */
-	IFLA_PORT_RESPONSE,		/* __u16, output only */
-	__IFLA_PORT_MAX,
-};
-
-#define IFLA_PORT_MAX (__IFLA_PORT_MAX - 1)
-
-#define PORT_PROFILE_MAX	40
-#define PORT_UUID_MAX		16
-#define PORT_SELF_VF		-1
-
-enum {
-	PORT_REQUEST_PREASSOCIATE = 0,
-	PORT_REQUEST_PREASSOCIATE_RR,
-	PORT_REQUEST_ASSOCIATE,
-	PORT_REQUEST_DISASSOCIATE,
-};
-
-enum {
-	PORT_VDP_RESPONSE_SUCCESS = 0,
-	PORT_VDP_RESPONSE_INVALID_FORMAT,
-	PORT_VDP_RESPONSE_INSUFFICIENT_RESOURCES,
-	PORT_VDP_RESPONSE_UNUSED_VTID,
-	PORT_VDP_RESPONSE_VTID_VIOLATION,
-	PORT_VDP_RESPONSE_VTID_VERSION_VIOALTION,
-	PORT_VDP_RESPONSE_OUT_OF_SYNC,
-	/* 0x08-0xFF reserved for future VDP use */
-	PORT_PROFILE_RESPONSE_SUCCESS = 0x100,
-	PORT_PROFILE_RESPONSE_INPROGRESS,
-	PORT_PROFILE_RESPONSE_INVALID,
-	PORT_PROFILE_RESPONSE_BADSTATE,
-	PORT_PROFILE_RESPONSE_INSUFFICIENT_RESOURCES,
-	PORT_PROFILE_RESPONSE_ERROR,
-};
-
-struct ifla_port_vsi {
-	__u8 vsi_mgr_id;
-	__u8 vsi_type_id[3];
-	__u8 vsi_type_version;
-	__u8 pad[3];
-};
-
-
-/* IPoIB section */
-
-enum {
-	IFLA_IPOIB_UNSPEC,
-	IFLA_IPOIB_PKEY,
-	IFLA_IPOIB_MODE,
-	IFLA_IPOIB_UMCAST,
-	__IFLA_IPOIB_MAX
-};
-
-enum {
-	IPOIB_MODE_DATAGRAM  = 0, /* using unreliable datagram QPs */
-	IPOIB_MODE_CONNECTED = 1, /* using connected QPs */
-};
-
-#define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1)
-
-
-/* HSR section */
-
-enum {
-	IFLA_HSR_UNSPEC,
-	IFLA_HSR_SLAVE1,
-	IFLA_HSR_SLAVE2,
-	IFLA_HSR_MULTICAST_SPEC,	/* Last byte of supervision addr */
-	IFLA_HSR_SUPERVISION_ADDR,	/* Supervision frame multicast addr */
-	IFLA_HSR_SEQ_NR,
-	__IFLA_HSR_MAX,
-};
-
-#define IFLA_HSR_MAX (__IFLA_HSR_MAX - 1)
-
-#endif /* _LINUX_IF_LINK_H */
diff --git a/openflow/usr/include/linux/if_ltalk.h b/openflow/usr/include/linux/if_ltalk.h
deleted file mode 100644
index 1f83ba0..0000000
--- a/openflow/usr/include/linux/if_ltalk.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __LINUX_LTALK_H
-#define __LINUX_LTALK_H
-
-#define LTALK_HLEN		1
-#define LTALK_MTU		600
-#define LTALK_ALEN		1
-
-
-#endif /* __LINUX_LTALK_H */
diff --git a/openflow/usr/include/linux/if_packet.h b/openflow/usr/include/linux/if_packet.h
deleted file mode 100644
index 9e7edfd..0000000
--- a/openflow/usr/include/linux/if_packet.h
+++ /dev/null
@@ -1,301 +0,0 @@
-#ifndef __LINUX_IF_PACKET_H
-#define __LINUX_IF_PACKET_H
-
-#include <linux/types.h>
-
-struct sockaddr_pkt {
-	unsigned short spkt_family;
-	unsigned char spkt_device[14];
-	__be16 spkt_protocol;
-};
-
-struct sockaddr_ll {
-	unsigned short	sll_family;
-	__be16		sll_protocol;
-	int		sll_ifindex;
-	unsigned short	sll_hatype;
-	unsigned char	sll_pkttype;
-	unsigned char	sll_halen;
-	unsigned char	sll_addr[8];
-};
-
-/* Packet types */
-
-#define PACKET_HOST		0		/* To us		*/
-#define PACKET_BROADCAST	1		/* To all		*/
-#define PACKET_MULTICAST	2		/* To group		*/
-#define PACKET_OTHERHOST	3		/* To someone else 	*/
-#define PACKET_OUTGOING		4		/* Outgoing of any type */
-#define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
-#define PACKET_USER		6		/* To user space	*/
-#define PACKET_KERNEL		7		/* To kernel space	*/
-/* Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space */
-#define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-
-/* Packet socket options */
-
-#define PACKET_ADD_MEMBERSHIP		1
-#define PACKET_DROP_MEMBERSHIP		2
-#define PACKET_RECV_OUTPUT		3
-/* Value 4 is still used by obsolete turbo-packet. */
-#define PACKET_RX_RING			5
-#define PACKET_STATISTICS		6
-#define PACKET_COPY_THRESH		7
-#define PACKET_AUXDATA			8
-#define PACKET_ORIGDEV			9
-#define PACKET_VERSION			10
-#define PACKET_HDRLEN			11
-#define PACKET_RESERVE			12
-#define PACKET_TX_RING			13
-#define PACKET_LOSS			14
-#define PACKET_VNET_HDR			15
-#define PACKET_TX_TIMESTAMP		16
-#define PACKET_TIMESTAMP		17
-#define PACKET_FANOUT			18
-#define PACKET_TX_HAS_OFF		19
-#define PACKET_QDISC_BYPASS		20
-#define PACKET_ROLLOVER_STATS		21
-#define PACKET_FANOUT_DATA		22
-
-#define PACKET_FANOUT_HASH		0
-#define PACKET_FANOUT_LB		1
-#define PACKET_FANOUT_CPU		2
-#define PACKET_FANOUT_ROLLOVER		3
-#define PACKET_FANOUT_RND		4
-#define PACKET_FANOUT_QM		5
-#define PACKET_FANOUT_CBPF		6
-#define PACKET_FANOUT_EBPF		7
-#define PACKET_FANOUT_FLAG_ROLLOVER	0x1000
-#define PACKET_FANOUT_FLAG_DEFRAG	0x8000
-
-struct tpacket_stats {
-	unsigned int	tp_packets;
-	unsigned int	tp_drops;
-};
-
-struct tpacket_stats_v3 {
-	unsigned int	tp_packets;
-	unsigned int	tp_drops;
-	unsigned int	tp_freeze_q_cnt;
-};
-
-struct tpacket_rollover_stats {
-	__aligned_u64	tp_all;
-	__aligned_u64	tp_huge;
-	__aligned_u64	tp_failed;
-};
-
-union tpacket_stats_u {
-	struct tpacket_stats stats1;
-	struct tpacket_stats_v3 stats3;
-};
-
-struct tpacket_auxdata {
-	__u32		tp_status;
-	__u32		tp_len;
-	__u32		tp_snaplen;
-	__u16		tp_mac;
-	__u16		tp_net;
-	__u16		tp_vlan_tci;
-	__u16		tp_vlan_tpid;
-};
-
-/* Rx ring - header status */
-#define TP_STATUS_KERNEL		      0
-#define TP_STATUS_USER			(1 << 0)
-#define TP_STATUS_COPY			(1 << 1)
-#define TP_STATUS_LOSING		(1 << 2)
-#define TP_STATUS_CSUMNOTREADY		(1 << 3)
-#define TP_STATUS_VLAN_VALID		(1 << 4) /* auxdata has valid tp_vlan_tci */
-#define TP_STATUS_BLK_TMO		(1 << 5)
-#define TP_STATUS_VLAN_TPID_VALID	(1 << 6) /* auxdata has valid tp_vlan_tpid */
-#define TP_STATUS_CSUM_VALID		(1 << 7)
-
-/* Tx ring - header status */
-#define TP_STATUS_AVAILABLE	      0
-#define TP_STATUS_SEND_REQUEST	(1 << 0)
-#define TP_STATUS_SENDING	(1 << 1)
-#define TP_STATUS_WRONG_FORMAT	(1 << 2)
-
-/* Rx and Tx ring - header status */
-#define TP_STATUS_TS_SOFTWARE		(1 << 29)
-#define TP_STATUS_TS_SYS_HARDWARE	(1 << 30) /* deprecated, never set */
-#define TP_STATUS_TS_RAW_HARDWARE	(1 << 31)
-
-/* Rx ring - feature request bits */
-#define TP_FT_REQ_FILL_RXHASH	0x1
-
-struct tpacket_hdr {
-	unsigned long	tp_status;
-	unsigned int	tp_len;
-	unsigned int	tp_snaplen;
-	unsigned short	tp_mac;
-	unsigned short	tp_net;
-	unsigned int	tp_sec;
-	unsigned int	tp_usec;
-};
-
-#define TPACKET_ALIGNMENT	16
-#define TPACKET_ALIGN(x)	(((x)+TPACKET_ALIGNMENT-1)&~(TPACKET_ALIGNMENT-1))
-#define TPACKET_HDRLEN		(TPACKET_ALIGN(sizeof(struct tpacket_hdr)) + sizeof(struct sockaddr_ll))
-
-struct tpacket2_hdr {
-	__u32		tp_status;
-	__u32		tp_len;
-	__u32		tp_snaplen;
-	__u16		tp_mac;
-	__u16		tp_net;
-	__u32		tp_sec;
-	__u32		tp_nsec;
-	__u16		tp_vlan_tci;
-	__u16		tp_vlan_tpid;
-	__u8		tp_padding[4];
-};
-
-struct tpacket_hdr_variant1 {
-	__u32	tp_rxhash;
-	__u32	tp_vlan_tci;
-	__u16	tp_vlan_tpid;
-	__u16	tp_padding;
-};
-
-struct tpacket3_hdr {
-	__u32		tp_next_offset;
-	__u32		tp_sec;
-	__u32		tp_nsec;
-	__u32		tp_snaplen;
-	__u32		tp_len;
-	__u32		tp_status;
-	__u16		tp_mac;
-	__u16		tp_net;
-	/* pkt_hdr variants */
-	union {
-		struct tpacket_hdr_variant1 hv1;
-	};
-	__u8		tp_padding[8];
-};
-
-struct tpacket_bd_ts {
-	unsigned int ts_sec;
-	union {
-		unsigned int ts_usec;
-		unsigned int ts_nsec;
-	};
-};
-
-struct tpacket_hdr_v1 {
-	__u32	block_status;
-	__u32	num_pkts;
-	__u32	offset_to_first_pkt;
-
-	/* Number of valid bytes (including padding)
-	 * blk_len <= tp_block_size
-	 */
-	__u32	blk_len;
-
-	/*
-	 * Quite a few uses of sequence number:
-	 * 1. Make sure cache flush etc worked.
-	 *    Well, one can argue - why not use the increasing ts below?
-	 *    But look at 2. below first.
-	 * 2. When you pass around blocks to other user space decoders,
-	 *    you can see which blk[s] is[are] outstanding etc.
-	 * 3. Validate kernel code.
-	 */
-	__aligned_u64	seq_num;
-
-	/*
-	 * ts_last_pkt:
-	 *
-	 * Case 1.	Block has 'N'(N >=1) packets and TMO'd(timed out)
-	 *		ts_last_pkt == 'time-stamp of last packet' and NOT the
-	 *		time when the timer fired and the block was closed.
-	 *		By providing the ts of the last packet we can absolutely
-	 *		guarantee that time-stamp wise, the first packet in the
-	 *		next block will never precede the last packet of the
-	 *		previous block.
-	 * Case 2.	Block has zero packets and TMO'd
-	 *		ts_last_pkt = time when the timer fired and the block
-	 *		was closed.
-	 * Case 3.	Block has 'N' packets and NO TMO.
-	 *		ts_last_pkt = time-stamp of the last pkt in the block.
-	 *
-	 * ts_first_pkt:
-	 *		Is always the time-stamp when the block was opened.
-	 *		Case a)	ZERO packets
-	 *			No packets to deal with but atleast you know the
-	 *			time-interval of this block.
-	 *		Case b) Non-zero packets
-	 *			Use the ts of the first packet in the block.
-	 *
-	 */
-	struct tpacket_bd_ts	ts_first_pkt, ts_last_pkt;
-};
-
-union tpacket_bd_header_u {
-	struct tpacket_hdr_v1 bh1;
-};
-
-struct tpacket_block_desc {
-	__u32 version;
-	__u32 offset_to_priv;
-	union tpacket_bd_header_u hdr;
-};
-
-#define TPACKET2_HDRLEN		(TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll))
-#define TPACKET3_HDRLEN		(TPACKET_ALIGN(sizeof(struct tpacket3_hdr)) + sizeof(struct sockaddr_ll))
-
-enum tpacket_versions {
-	TPACKET_V1,
-	TPACKET_V2,
-	TPACKET_V3
-};
-
-/*
-   Frame structure:
-
-   - Start. Frame must be aligned to TPACKET_ALIGNMENT=16
-   - struct tpacket_hdr
-   - pad to TPACKET_ALIGNMENT=16
-   - struct sockaddr_ll
-   - Gap, chosen so that packet data (Start+tp_net) alignes to TPACKET_ALIGNMENT=16
-   - Start+tp_mac: [ Optional MAC header ]
-   - Start+tp_net: Packet data, aligned to TPACKET_ALIGNMENT=16.
-   - Pad to align to TPACKET_ALIGNMENT=16
- */
-
-struct tpacket_req {
-	unsigned int	tp_block_size;	/* Minimal size of contiguous block */
-	unsigned int	tp_block_nr;	/* Number of blocks */
-	unsigned int	tp_frame_size;	/* Size of frame */
-	unsigned int	tp_frame_nr;	/* Total number of frames */
-};
-
-struct tpacket_req3 {
-	unsigned int	tp_block_size;	/* Minimal size of contiguous block */
-	unsigned int	tp_block_nr;	/* Number of blocks */
-	unsigned int	tp_frame_size;	/* Size of frame */
-	unsigned int	tp_frame_nr;	/* Total number of frames */
-	unsigned int	tp_retire_blk_tov; /* timeout in msecs */
-	unsigned int	tp_sizeof_priv; /* offset to private data area */
-	unsigned int	tp_feature_req_word;
-};
-
-union tpacket_req_u {
-	struct tpacket_req	req;
-	struct tpacket_req3	req3;
-};
-
-struct packet_mreq {
-	int		mr_ifindex;
-	unsigned short	mr_type;
-	unsigned short	mr_alen;
-	unsigned char	mr_address[8];
-};
-
-#define PACKET_MR_MULTICAST	0
-#define PACKET_MR_PROMISC	1
-#define PACKET_MR_ALLMULTI	2
-#define PACKET_MR_UNICAST	3
-
-#endif
diff --git a/openflow/usr/include/linux/if_phonet.h b/openflow/usr/include/linux/if_phonet.h
deleted file mode 100644
index 63371bc..0000000
--- a/openflow/usr/include/linux/if_phonet.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * File: if_phonet.h
- *
- * Phonet interface kernel definitions
- *
- * Copyright (C) 2008 Nokia Corporation. All rights reserved.
- */
-#ifndef LINUX_IF_PHONET_H
-#define LINUX_IF_PHONET_H
-
-#define PHONET_MIN_MTU		6	/* pn_length = 0 */
-#define PHONET_MAX_MTU		65541	/* pn_length = 0xffff */
-#define PHONET_DEV_MTU		PHONET_MAX_MTU
-
-
-#endif /* LINUX_IF_PHONET_H */
diff --git a/openflow/usr/include/linux/if_plip.h b/openflow/usr/include/linux/if_plip.h
deleted file mode 100644
index 6298c7e..0000000
--- a/openflow/usr/include/linux/if_plip.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *	NET3	PLIP tuning facilities for the new Niibe PLIP.
- *
- *	This program is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU General Public License
- *	as published by the Free Software Foundation; either version
- *	2 of the License, or (at your option) any later version.
- *
- */
- 
-#ifndef _LINUX_IF_PLIP_H
-#define _LINUX_IF_PLIP_H
-
-#include <linux/sockios.h>
-
-#define	SIOCDEVPLIP	SIOCDEVPRIVATE
-
-struct plipconf {
-	unsigned short pcmd;
-	unsigned long  nibble;
-	unsigned long  trigger;
-};
-
-#define PLIP_GET_TIMEOUT	0x1
-#define PLIP_SET_TIMEOUT	0x2
-
-#endif
diff --git a/openflow/usr/include/linux/if_ppp.h b/openflow/usr/include/linux/if_ppp.h
deleted file mode 100644
index 9048fab..0000000
--- a/openflow/usr/include/linux/if_ppp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linux/ppp-ioctl.h>
diff --git a/openflow/usr/include/linux/if_pppol2tp.h b/openflow/usr/include/linux/if_pppol2tp.h
deleted file mode 100644
index 8e1221c..0000000
--- a/openflow/usr/include/linux/if_pppol2tp.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/***************************************************************************
- * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661)
- *
- * This file supplies definitions required by the PPP over L2TP driver
- * (l2tp_ppp.c).  All version information wrt this file is located in l2tp_ppp.c
- *
- * License:
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- */
-
-#ifndef __LINUX_IF_PPPOL2TP_H
-#define __LINUX_IF_PPPOL2TP_H
-
-#include <linux/types.h>
-
-
-/* Structure used to connect() the socket to a particular tunnel UDP
- * socket over IPv4.
- */
-struct pppol2tp_addr {
-	__kernel_pid_t	pid;		/* pid that owns the fd.
-					 * 0 => current */
-	int	fd;			/* FD of UDP socket to use */
-
-	struct sockaddr_in addr;	/* IP address and port to send to */
-
-	__u16 s_tunnel, s_session;	/* For matching incoming packets */
-	__u16 d_tunnel, d_session;	/* For sending outgoing packets */
-};
-
-/* Structure used to connect() the socket to a particular tunnel UDP
- * socket over IPv6.
- */
-struct pppol2tpin6_addr {
-	__kernel_pid_t	pid;		/* pid that owns the fd.
-					 * 0 => current */
-	int	fd;			/* FD of UDP socket to use */
-
-	__u16 s_tunnel, s_session;	/* For matching incoming packets */
-	__u16 d_tunnel, d_session;	/* For sending outgoing packets */
-
-	struct sockaddr_in6 addr;	/* IP address and port to send to */
-};
-
-/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
- * bits. So we need a different sockaddr structure.
- */
-struct pppol2tpv3_addr {
-	__kernel_pid_t	pid;		/* pid that owns the fd.
-					 * 0 => current */
-	int	fd;			/* FD of UDP or IP socket to use */
-
-	struct sockaddr_in addr;	/* IP address and port to send to */
-
-	__u32 s_tunnel, s_session;	/* For matching incoming packets */
-	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
-};
-
-struct pppol2tpv3in6_addr {
-	__kernel_pid_t	pid;		/* pid that owns the fd.
-					 * 0 => current */
-	int	fd;			/* FD of UDP or IP socket to use */
-
-	__u32 s_tunnel, s_session;	/* For matching incoming packets */
-	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
-
-	struct sockaddr_in6 addr;	/* IP address and port to send to */
-};
-
-/* Socket options:
- * DEBUG	- bitmask of debug message categories
- * SENDSEQ	- 0 => don't send packets with sequence numbers
- *		  1 => send packets with sequence numbers
- * RECVSEQ	- 0 => receive packet sequence numbers are optional
- *		  1 => drop receive packets without sequence numbers
- * LNSMODE	- 0 => act as LAC.
- *		  1 => act as LNS.
- * REORDERTO	- reorder timeout (in millisecs). If 0, don't try to reorder.
- */
-enum {
-	PPPOL2TP_SO_DEBUG	= 1,
-	PPPOL2TP_SO_RECVSEQ	= 2,
-	PPPOL2TP_SO_SENDSEQ	= 3,
-	PPPOL2TP_SO_LNSMODE	= 4,
-	PPPOL2TP_SO_REORDERTO	= 5,
-};
-
-/* Debug message categories for the DEBUG socket option */
-enum {
-	PPPOL2TP_MSG_DEBUG	= (1 << 0),	/* verbose debug (if
-						 * compiled in) */
-	PPPOL2TP_MSG_CONTROL	= (1 << 1),	/* userspace - kernel
-						 * interface */
-	PPPOL2TP_MSG_SEQ	= (1 << 2),	/* sequence numbers */
-	PPPOL2TP_MSG_DATA	= (1 << 3),	/* data packets */
-};
-
-
-
-#endif /* __LINUX_IF_PPPOL2TP_H */
diff --git a/openflow/usr/include/linux/if_pppox.h b/openflow/usr/include/linux/if_pppox.h
deleted file mode 100644
index acd0a2c..0000000
--- a/openflow/usr/include/linux/if_pppox.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/***************************************************************************
- * Linux PPP over X - Generic PPP transport layer sockets
- * Linux PPP over Ethernet (PPPoE) Socket Implementation (RFC 2516) 
- *
- * This file supplies definitions required by the PPP over Ethernet driver
- * (pppox.c).  All version information wrt this file is located in pppox.c
- *
- * License:
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- */
-
-#ifndef __LINUX_IF_PPPOX_H
-#define __LINUX_IF_PPPOX_H
-
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-#include <linux/socket.h>
-#include <linux/if_ether.h>
-#include <linux/if_pppol2tp.h>
-
-/* For user-space programs to pick up these definitions
- * which they wouldn't get otherwise without defining __KERNEL__
- */
-#ifndef AF_PPPOX
-#define AF_PPPOX	24
-#define PF_PPPOX	AF_PPPOX
-#endif /* !(AF_PPPOX) */
-
-/************************************************************************ 
- * PPPoE addressing definition 
- */ 
-typedef __be16 sid_t;
-struct pppoe_addr {
-	sid_t         sid;                    /* Session identifier */
-	unsigned char remote[ETH_ALEN];       /* Remote address */
-	char          dev[IFNAMSIZ];          /* Local device to use */
-}; 
- 
-/************************************************************************ 
- * PPTP addressing definition
- */
-struct pptp_addr {
-	__u16		call_id;
-	struct in_addr	sin_addr;
-};
-
-/************************************************************************
- * Protocols supported by AF_PPPOX
- */
-#define PX_PROTO_OE    0 /* Currently just PPPoE */
-#define PX_PROTO_OL2TP 1 /* Now L2TP also */
-#define PX_PROTO_PPTP  2
-#define PX_MAX_PROTO   3
-
-struct sockaddr_pppox {
-	__kernel_sa_family_t sa_family;       /* address family, AF_PPPOX */
-	unsigned int    sa_protocol;          /* protocol identifier */
-	union {
-		struct pppoe_addr  pppoe;
-		struct pptp_addr   pptp;
-	} sa_addr;
-} __attribute__((packed));
-
-/* The use of the above union isn't viable because the size of this
- * struct must stay fixed over time -- applications use sizeof(struct
- * sockaddr_pppox) to fill it. We use a protocol specific sockaddr
- * type instead.
- */
-struct sockaddr_pppol2tp {
-	__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
-	unsigned int    sa_protocol;    /* protocol identifier */
-	struct pppol2tp_addr pppol2tp;
-} __attribute__((packed));
-
-struct sockaddr_pppol2tpin6 {
-	__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
-	unsigned int    sa_protocol;    /* protocol identifier */
-	struct pppol2tpin6_addr pppol2tp;
-} __attribute__((packed));
-
-/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
- * bits. So we need a different sockaddr structure.
- */
-struct sockaddr_pppol2tpv3 {
-	__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
-	unsigned int    sa_protocol;    /* protocol identifier */
-	struct pppol2tpv3_addr pppol2tp;
-} __attribute__((packed));
-
-struct sockaddr_pppol2tpv3in6 {
-	__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
-	unsigned int    sa_protocol;    /* protocol identifier */
-	struct pppol2tpv3in6_addr pppol2tp;
-} __attribute__((packed));
-
-/*********************************************************************
- *
- * ioctl interface for defining forwarding of connections
- *
- ********************************************************************/
-
-#define PPPOEIOCSFWD	_IOW(0xB1 ,0, size_t)
-#define PPPOEIOCDFWD	_IO(0xB1 ,1)
-/*#define PPPOEIOCGFWD	_IOWR(0xB1,2, size_t)*/
-
-/* Codes to identify message types */
-#define PADI_CODE	0x09
-#define PADO_CODE	0x07
-#define PADR_CODE	0x19
-#define PADS_CODE	0x65
-#define PADT_CODE	0xa7
-struct pppoe_tag {
-	__be16 tag_type;
-	__be16 tag_len;
-	char tag_data[0];
-} __attribute__ ((packed));
-
-/* Tag identifiers */
-#define PTT_EOL		__cpu_to_be16(0x0000)
-#define PTT_SRV_NAME	__cpu_to_be16(0x0101)
-#define PTT_AC_NAME	__cpu_to_be16(0x0102)
-#define PTT_HOST_UNIQ	__cpu_to_be16(0x0103)
-#define PTT_AC_COOKIE	__cpu_to_be16(0x0104)
-#define PTT_VENDOR 	__cpu_to_be16(0x0105)
-#define PTT_RELAY_SID	__cpu_to_be16(0x0110)
-#define PTT_SRV_ERR     __cpu_to_be16(0x0201)
-#define PTT_SYS_ERR  	__cpu_to_be16(0x0202)
-#define PTT_GEN_ERR  	__cpu_to_be16(0x0203)
-
-struct pppoe_hdr {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 type : 4;
-	__u8 ver : 4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-	__u8 ver : 4;
-	__u8 type : 4;
-#else
-#error	"Please fix <asm/byteorder.h>"
-#endif
-	__u8 code;
-	__be16 sid;
-	__be16 length;
-	struct pppoe_tag tag[0];
-} __attribute__((packed));
-
-/* Length of entire PPPoE + PPP header */
-#define PPPOE_SES_HLEN	8
-
-
-#endif /* __LINUX_IF_PPPOX_H */
diff --git a/openflow/usr/include/linux/if_slip.h b/openflow/usr/include/linux/if_slip.h
deleted file mode 100644
index 1eb4e3a..0000000
--- a/openflow/usr/include/linux/if_slip.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *	Swansea University Computer Society	NET3
- *	
- *	This file declares the constants of special use with the SLIP/CSLIP/
- *	KISS TNC driver.
- */
- 
-#ifndef __LINUX_SLIP_H
-#define __LINUX_SLIP_H
-
-#define		SL_MODE_SLIP		0
-#define		SL_MODE_CSLIP		1
-#define 	SL_MODE_KISS		4
-
-#define		SL_OPT_SIXBIT		2
-#define		SL_OPT_ADAPTIVE		8
-
-/*
- *	VSV = ioctl for keepalive & outfill in SLIP driver 
- */
- 
-#define SIOCSKEEPALIVE	(SIOCDEVPRIVATE)		/* Set keepalive timeout in sec */
-#define SIOCGKEEPALIVE	(SIOCDEVPRIVATE+1)		/* Get keepalive timeout */
-#define SIOCSOUTFILL	(SIOCDEVPRIVATE+2)		/* Set outfill timeout */
-#define	SIOCGOUTFILL	(SIOCDEVPRIVATE+3)		/* Get outfill timeout */
-#define SIOCSLEASE	(SIOCDEVPRIVATE+4)		/* Set "leased" line type */
-#define	SIOCGLEASE	(SIOCDEVPRIVATE+5)		/* Get line type */
-
-
-#endif
diff --git a/openflow/usr/include/linux/if_team.h b/openflow/usr/include/linux/if_team.h
deleted file mode 100644
index cb92efa..0000000
--- a/openflow/usr/include/linux/if_team.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * include/linux/if_team.h - Network team device driver header
- * Copyright (c) 2011 Jiri Pirko <jpirko@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef _LINUX_IF_TEAM_H_
-#define _LINUX_IF_TEAM_H_
-
-
-#define TEAM_STRING_MAX_LEN 32
-
-/**********************************
- * NETLINK_GENERIC netlink family.
- **********************************/
-
-enum {
-	TEAM_CMD_NOOP,
-	TEAM_CMD_OPTIONS_SET,
-	TEAM_CMD_OPTIONS_GET,
-	TEAM_CMD_PORT_LIST_GET,
-
-	__TEAM_CMD_MAX,
-	TEAM_CMD_MAX = (__TEAM_CMD_MAX - 1),
-};
-
-enum {
-	TEAM_ATTR_UNSPEC,
-	TEAM_ATTR_TEAM_IFINDEX,		/* u32 */
-	TEAM_ATTR_LIST_OPTION,		/* nest */
-	TEAM_ATTR_LIST_PORT,		/* nest */
-
-	__TEAM_ATTR_MAX,
-	TEAM_ATTR_MAX = __TEAM_ATTR_MAX - 1,
-};
-
-/* Nested layout of get/set msg:
- *
- *	[TEAM_ATTR_LIST_OPTION]
- *		[TEAM_ATTR_ITEM_OPTION]
- *			[TEAM_ATTR_OPTION_*], ...
- *		[TEAM_ATTR_ITEM_OPTION]
- *			[TEAM_ATTR_OPTION_*], ...
- *		...
- *	[TEAM_ATTR_LIST_PORT]
- *		[TEAM_ATTR_ITEM_PORT]
- *			[TEAM_ATTR_PORT_*], ...
- *		[TEAM_ATTR_ITEM_PORT]
- *			[TEAM_ATTR_PORT_*], ...
- *		...
- */
-
-enum {
-	TEAM_ATTR_ITEM_OPTION_UNSPEC,
-	TEAM_ATTR_ITEM_OPTION,		/* nest */
-
-	__TEAM_ATTR_ITEM_OPTION_MAX,
-	TEAM_ATTR_ITEM_OPTION_MAX = __TEAM_ATTR_ITEM_OPTION_MAX - 1,
-};
-
-enum {
-	TEAM_ATTR_OPTION_UNSPEC,
-	TEAM_ATTR_OPTION_NAME,		/* string */
-	TEAM_ATTR_OPTION_CHANGED,	/* flag */
-	TEAM_ATTR_OPTION_TYPE,		/* u8 */
-	TEAM_ATTR_OPTION_DATA,		/* dynamic */
-	TEAM_ATTR_OPTION_REMOVED,	/* flag */
-	TEAM_ATTR_OPTION_PORT_IFINDEX,	/* u32 */ /* for per-port options */
-	TEAM_ATTR_OPTION_ARRAY_INDEX,	/* u32 */ /* for array options */
-
-	__TEAM_ATTR_OPTION_MAX,
-	TEAM_ATTR_OPTION_MAX = __TEAM_ATTR_OPTION_MAX - 1,
-};
-
-enum {
-	TEAM_ATTR_ITEM_PORT_UNSPEC,
-	TEAM_ATTR_ITEM_PORT,		/* nest */
-
-	__TEAM_ATTR_ITEM_PORT_MAX,
-	TEAM_ATTR_ITEM_PORT_MAX = __TEAM_ATTR_ITEM_PORT_MAX - 1,
-};
-
-enum {
-	TEAM_ATTR_PORT_UNSPEC,
-	TEAM_ATTR_PORT_IFINDEX,		/* u32 */
-	TEAM_ATTR_PORT_CHANGED,		/* flag */
-	TEAM_ATTR_PORT_LINKUP,		/* flag */
-	TEAM_ATTR_PORT_SPEED,		/* u32 */
-	TEAM_ATTR_PORT_DUPLEX,		/* u8 */
-	TEAM_ATTR_PORT_REMOVED,		/* flag */
-
-	__TEAM_ATTR_PORT_MAX,
-	TEAM_ATTR_PORT_MAX = __TEAM_ATTR_PORT_MAX - 1,
-};
-
-/*
- * NETLINK_GENERIC related info
- */
-#define TEAM_GENL_NAME "team"
-#define TEAM_GENL_VERSION 0x1
-#define TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME "change_event"
-
-#endif /* _LINUX_IF_TEAM_H_ */
diff --git a/openflow/usr/include/linux/if_tun.h b/openflow/usr/include/linux/if_tun.h
deleted file mode 100644
index d5ecb42..0000000
--- a/openflow/usr/include/linux/if_tun.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  Universal TUN/TAP device driver.
- *  Copyright (C) 1999-2000 Maxim Krasnyansky <max_mk@yahoo.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- */
-
-#ifndef __IF_TUN_H
-#define __IF_TUN_H
-
-#include <linux/types.h>
-#include <linux/if_ether.h>
-#include <linux/filter.h>
-
-/* Read queue size */
-#define TUN_READQ_SIZE	500
-/* TUN device type flags: deprecated. Use IFF_TUN/IFF_TAP instead. */
-#define TUN_TUN_DEV 	IFF_TUN
-#define TUN_TAP_DEV	IFF_TAP
-#define TUN_TYPE_MASK   0x000f
-
-/* Ioctl defines */
-#define TUNSETNOCSUM  _IOW('T', 200, int) 
-#define TUNSETDEBUG   _IOW('T', 201, int) 
-#define TUNSETIFF     _IOW('T', 202, int) 
-#define TUNSETPERSIST _IOW('T', 203, int) 
-#define TUNSETOWNER   _IOW('T', 204, int)
-#define TUNSETLINK    _IOW('T', 205, int)
-#define TUNSETGROUP   _IOW('T', 206, int)
-#define TUNGETFEATURES _IOR('T', 207, unsigned int)
-#define TUNSETOFFLOAD  _IOW('T', 208, unsigned int)
-#define TUNSETTXFILTER _IOW('T', 209, unsigned int)
-#define TUNGETIFF      _IOR('T', 210, unsigned int)
-#define TUNGETSNDBUF   _IOR('T', 211, int)
-#define TUNSETSNDBUF   _IOW('T', 212, int)
-#define TUNATTACHFILTER _IOW('T', 213, struct sock_fprog)
-#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
-#define TUNGETVNETHDRSZ _IOR('T', 215, int)
-#define TUNSETVNETHDRSZ _IOW('T', 216, int)
-#define TUNSETQUEUE  _IOW('T', 217, int)
-#define TUNSETIFINDEX	_IOW('T', 218, unsigned int)
-#define TUNGETFILTER _IOR('T', 219, struct sock_fprog)
-#define TUNSETVNETLE _IOW('T', 220, int)
-#define TUNGETVNETLE _IOR('T', 221, int)
-/* The TUNSETVNETBE and TUNGETVNETBE ioctls are for cross-endian support on
- * little-endian hosts. Not all kernel configurations support them, but all
- * configurations that support SET also support GET.
- */
-#define TUNSETVNETBE _IOW('T', 222, int)
-#define TUNGETVNETBE _IOR('T', 223, int)
-
-/* TUNSETIFF ifr flags */
-#define IFF_TUN		0x0001
-#define IFF_TAP		0x0002
-#define IFF_NO_PI	0x1000
-/* This flag has no real effect */
-#define IFF_ONE_QUEUE	0x2000
-#define IFF_VNET_HDR	0x4000
-#define IFF_TUN_EXCL	0x8000
-#define IFF_MULTI_QUEUE 0x0100
-#define IFF_ATTACH_QUEUE 0x0200
-#define IFF_DETACH_QUEUE 0x0400
-/* read-only flag */
-#define IFF_PERSIST	0x0800
-#define IFF_NOFILTER	0x1000
-
-/* Socket options */
-#define TUN_TX_TIMESTAMP 1
-
-/* Features for GSO (TUNSETOFFLOAD). */
-#define TUN_F_CSUM	0x01	/* You can hand me unchecksummed packets. */
-#define TUN_F_TSO4	0x02	/* I can handle TSO for IPv4 packets */
-#define TUN_F_TSO6	0x04	/* I can handle TSO for IPv6 packets */
-#define TUN_F_TSO_ECN	0x08	/* I can handle TSO with ECN bits. */
-#define TUN_F_UFO	0x10	/* I can handle UFO packets */
-
-/* Protocol info prepended to the packets (when IFF_NO_PI is not set) */
-#define TUN_PKT_STRIP	0x0001
-struct tun_pi {
-	__u16  flags;
-	__be16 proto;
-};
-
-/*
- * Filter spec (used for SETXXFILTER ioctls)
- * This stuff is applicable only to the TAP (Ethernet) devices.
- * If the count is zero the filter is disabled and the driver accepts
- * all packets (promisc mode).
- * If the filter is enabled in order to accept broadcast packets
- * broadcast addr must be explicitly included in the addr list.
- */
-#define TUN_FLT_ALLMULTI 0x0001 /* Accept all multicast packets */
-struct tun_filter {
-	__u16  flags; /* TUN_FLT_ flags see above */
-	__u16  count; /* Number of addresses */
-	__u8   addr[0][ETH_ALEN];
-};
-
-#endif /* __IF_TUN_H */
diff --git a/openflow/usr/include/linux/if_tunnel.h b/openflow/usr/include/linux/if_tunnel.h
deleted file mode 100644
index 081c33e..0000000
--- a/openflow/usr/include/linux/if_tunnel.h
+++ /dev/null
@@ -1,155 +0,0 @@
-#ifndef _IF_TUNNEL_H_
-#define _IF_TUNNEL_H_
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-
-#define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
-#define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
-#define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)
-#define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)
-#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)
-#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
-#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
-#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
-#define SIOCGET6RD      (SIOCDEVPRIVATE + 8)
-#define SIOCADD6RD      (SIOCDEVPRIVATE + 9)
-#define SIOCDEL6RD      (SIOCDEVPRIVATE + 10)
-#define SIOCCHG6RD      (SIOCDEVPRIVATE + 11)
-
-#define GRE_CSUM	__cpu_to_be16(0x8000)
-#define GRE_ROUTING	__cpu_to_be16(0x4000)
-#define GRE_KEY		__cpu_to_be16(0x2000)
-#define GRE_SEQ		__cpu_to_be16(0x1000)
-#define GRE_STRICT	__cpu_to_be16(0x0800)
-#define GRE_REC		__cpu_to_be16(0x0700)
-#define GRE_FLAGS	__cpu_to_be16(0x00F8)
-#define GRE_VERSION	__cpu_to_be16(0x0007)
-
-struct ip_tunnel_parm {
-	char			name[IFNAMSIZ];
-	int			link;
-	__be16			i_flags;
-	__be16			o_flags;
-	__be32			i_key;
-	__be32			o_key;
-	struct iphdr		iph;
-};
-
-enum {
-	IFLA_IPTUN_UNSPEC,
-	IFLA_IPTUN_LINK,
-	IFLA_IPTUN_LOCAL,
-	IFLA_IPTUN_REMOTE,
-	IFLA_IPTUN_TTL,
-	IFLA_IPTUN_TOS,
-	IFLA_IPTUN_ENCAP_LIMIT,
-	IFLA_IPTUN_FLOWINFO,
-	IFLA_IPTUN_FLAGS,
-	IFLA_IPTUN_PROTO,
-	IFLA_IPTUN_PMTUDISC,
-	IFLA_IPTUN_6RD_PREFIX,
-	IFLA_IPTUN_6RD_RELAY_PREFIX,
-	IFLA_IPTUN_6RD_PREFIXLEN,
-	IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
-	IFLA_IPTUN_ENCAP_TYPE,
-	IFLA_IPTUN_ENCAP_FLAGS,
-	IFLA_IPTUN_ENCAP_SPORT,
-	IFLA_IPTUN_ENCAP_DPORT,
-
-	__IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */
-	IFLA_IPTUN_FAN_MAP = 33,
-
-	__IFLA_IPTUN_MAX,
-};
-#define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
-
-enum tunnel_encap_types {
-	TUNNEL_ENCAP_NONE,
-	TUNNEL_ENCAP_FOU,
-	TUNNEL_ENCAP_GUE,
-};
-
-#define TUNNEL_ENCAP_FLAG_CSUM		(1<<0)
-#define TUNNEL_ENCAP_FLAG_CSUM6		(1<<1)
-#define TUNNEL_ENCAP_FLAG_REMCSUM	(1<<2)
-
-/* SIT-mode i_flags */
-#define	SIT_ISATAP	0x0001
-
-struct ip_tunnel_prl {
-	__be32			addr;
-	__u16			flags;
-	__u16			__reserved;
-	__u32			datalen;
-	__u32			__reserved2;
-	/* data follows */
-};
-
-/* PRL flags */
-#define	PRL_DEFAULT		0x0001
-
-struct ip_tunnel_6rd {
-	struct in6_addr		prefix;
-	__be32			relay_prefix;
-	__u16			prefixlen;
-	__u16			relay_prefixlen;
-};
-
-enum {
-	IFLA_GRE_UNSPEC,
-	IFLA_GRE_LINK,
-	IFLA_GRE_IFLAGS,
-	IFLA_GRE_OFLAGS,
-	IFLA_GRE_IKEY,
-	IFLA_GRE_OKEY,
-	IFLA_GRE_LOCAL,
-	IFLA_GRE_REMOTE,
-	IFLA_GRE_TTL,
-	IFLA_GRE_TOS,
-	IFLA_GRE_PMTUDISC,
-	IFLA_GRE_ENCAP_LIMIT,
-	IFLA_GRE_FLOWINFO,
-	IFLA_GRE_FLAGS,
-	IFLA_GRE_ENCAP_TYPE,
-	IFLA_GRE_ENCAP_FLAGS,
-	IFLA_GRE_ENCAP_SPORT,
-	IFLA_GRE_ENCAP_DPORT,
-	IFLA_GRE_COLLECT_METADATA,
-	__IFLA_GRE_MAX,
-};
-
-#define IFLA_GRE_MAX	(__IFLA_GRE_MAX - 1)
-
-/* VTI-mode i_flags */
-#define VTI_ISVTI ((__be16)0x0001)
-
-enum {
-	IFLA_VTI_UNSPEC,
-	IFLA_VTI_LINK,
-	IFLA_VTI_IKEY,
-	IFLA_VTI_OKEY,
-	IFLA_VTI_LOCAL,
-	IFLA_VTI_REMOTE,
-	__IFLA_VTI_MAX,
-};
-
-#define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
-
-enum {
-	IFLA_FAN_UNSPEC,
-	IFLA_FAN_MAPPING,
-	__IFLA_FAN_MAX,
-};
-
-#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
-
-struct ifla_fan_map {
-	__be32		underlay;
-	__be32		overlay;
-	__u16		underlay_prefix;
-	__u16		overlay_prefix;
-};
-
-#endif /* _IF_TUNNEL_H_ */
diff --git a/openflow/usr/include/linux/if_vlan.h b/openflow/usr/include/linux/if_vlan.h
deleted file mode 100644
index 24ae007..0000000
--- a/openflow/usr/include/linux/if_vlan.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * VLAN		An implementation of 802.1Q VLAN tagging.
- *
- * Authors:	Ben Greear <greearb@candelatech.com>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- */
-
-#ifndef _LINUX_IF_VLAN_H_
-#define _LINUX_IF_VLAN_H_
-
-
-/* VLAN IOCTLs are found in sockios.h */
-
-/* Passed in vlan_ioctl_args structure to determine behaviour. */
-enum vlan_ioctl_cmds {
-	ADD_VLAN_CMD,
-	DEL_VLAN_CMD,
-	SET_VLAN_INGRESS_PRIORITY_CMD,
-	SET_VLAN_EGRESS_PRIORITY_CMD,
-	GET_VLAN_INGRESS_PRIORITY_CMD,
-	GET_VLAN_EGRESS_PRIORITY_CMD,
-	SET_VLAN_NAME_TYPE_CMD,
-	SET_VLAN_FLAG_CMD,
-	GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
-	GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
-};
-
-enum vlan_flags {
-	VLAN_FLAG_REORDER_HDR	= 0x1,
-	VLAN_FLAG_GVRP		= 0x2,
-	VLAN_FLAG_LOOSE_BINDING	= 0x4,
-	VLAN_FLAG_MVRP		= 0x8,
-};
-
-enum vlan_name_types {
-	VLAN_NAME_TYPE_PLUS_VID, /* Name will look like:  vlan0005 */
-	VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like:  eth1.0005 */
-	VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like:  vlan5 */
-	VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like:  eth0.5 */
-	VLAN_NAME_TYPE_HIGHEST
-};
-
-struct vlan_ioctl_args {
-	int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
-	char device1[24];
-
-        union {
-		char device2[24];
-		int VID;
-		unsigned int skb_priority;
-		unsigned int name_type;
-		unsigned int bind_type;
-		unsigned int flag; /* Matches vlan_dev_priv flags */
-        } u;
-
-	short vlan_qos;   
-};
-
-#endif /* _LINUX_IF_VLAN_H_ */
diff --git a/openflow/usr/include/linux/if_x25.h b/openflow/usr/include/linux/if_x25.h
deleted file mode 100644
index 897765f..0000000
--- a/openflow/usr/include/linux/if_x25.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  Linux X.25 packet to device interface
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- */
-
-#ifndef _IF_X25_H
-#define _IF_X25_H
-
-#include <linux/types.h>
-
-/* Documentation/networking/x25-iface.txt */
-#define X25_IFACE_DATA		0x00
-#define X25_IFACE_CONNECT	0x01
-#define X25_IFACE_DISCONNECT	0x02
-#define X25_IFACE_PARAMS	0x03
-
-#endif /* _IF_X25_H */
diff --git a/openflow/usr/include/linux/igmp.h b/openflow/usr/include/linux/igmp.h
deleted file mode 100644
index 2ead5c5..0000000
--- a/openflow/usr/include/linux/igmp.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *	Linux NET3:	Internet Group Management Protocol  [IGMP]
- *
- *	Authors:
- *		Alan Cox <alan@lxorguk.ukuu.org.uk>
- *
- *	Extended to talk the BSD extended IGMP protocol of mrouted 3.6
- *
- *
- *	This program is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU General Public License
- *	as published by the Free Software Foundation; either version
- *	2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_IGMP_H
-#define _LINUX_IGMP_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/*
- *	IGMP protocol structures
- */
-
-/*
- *	Header in on cable format
- */
-
-struct igmphdr {
-	__u8 type;
-	__u8 code;		/* For newer IGMP */
-	__sum16 csum;
-	__be32 group;
-};
-
-/* V3 group record types [grec_type] */
-#define IGMPV3_MODE_IS_INCLUDE		1
-#define IGMPV3_MODE_IS_EXCLUDE		2
-#define IGMPV3_CHANGE_TO_INCLUDE	3
-#define IGMPV3_CHANGE_TO_EXCLUDE	4
-#define IGMPV3_ALLOW_NEW_SOURCES	5
-#define IGMPV3_BLOCK_OLD_SOURCES	6
-
-struct igmpv3_grec {
-	__u8	grec_type;
-	__u8	grec_auxwords;
-	__be16	grec_nsrcs;
-	__be32	grec_mca;
-	__be32	grec_src[0];
-};
-
-struct igmpv3_report {
-	__u8 type;
-	__u8 resv1;
-	__be16 csum;
-	__be16 resv2;
-	__be16 ngrec;
-	struct igmpv3_grec grec[0];
-};
-
-struct igmpv3_query {
-	__u8 type;
-	__u8 code;
-	__be16 csum;
-	__be32 group;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8 qrv:3,
-	     suppress:1,
-	     resv:4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-	__u8 resv:4,
-	     suppress:1,
-	     qrv:3;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-	__u8 qqic;
-	__be16 nsrcs;
-	__be32 srcs[0];
-};
-
-#define IGMP_HOST_MEMBERSHIP_QUERY	0x11	/* From RFC1112 */
-#define IGMP_HOST_MEMBERSHIP_REPORT	0x12	/* Ditto */
-#define IGMP_DVMRP			0x13	/* DVMRP routing */
-#define IGMP_PIM			0x14	/* PIM routing */
-#define IGMP_TRACE			0x15
-#define IGMPV2_HOST_MEMBERSHIP_REPORT	0x16	/* V2 version of 0x12 */
-#define IGMP_HOST_LEAVE_MESSAGE 	0x17
-#define IGMPV3_HOST_MEMBERSHIP_REPORT	0x22	/* V3 version of 0x12 */
-
-#define IGMP_MTRACE_RESP		0x1e
-#define IGMP_MTRACE			0x1f
-
-
-/*
- *	Use the BSD names for these for compatibility
- */
-
-#define IGMP_DELAYING_MEMBER		0x01
-#define IGMP_IDLE_MEMBER		0x02
-#define IGMP_LAZY_MEMBER		0x03
-#define IGMP_SLEEPING_MEMBER		0x04
-#define IGMP_AWAKENING_MEMBER		0x05
-
-#define IGMP_MINLEN			8
-
-#define IGMP_MAX_HOST_REPORT_DELAY	10	/* max delay for response to */
-						/* query (in seconds)	*/
-
-#define IGMP_TIMER_SCALE		10	/* denotes that the igmphdr->timer field */
-						/* specifies time in 10th of seconds	 */
-
-#define IGMP_AGE_THRESHOLD		400	/* If this host don't hear any IGMP V1	*/
-						/* message in this period of time,	*/
-						/* revert to IGMP v2 router.		*/
-
-#define IGMP_ALL_HOSTS		htonl(0xE0000001L)
-#define IGMP_ALL_ROUTER 	htonl(0xE0000002L)
-#define IGMPV3_ALL_MCR	 	htonl(0xE0000016L)
-#define IGMP_LOCAL_GROUP	htonl(0xE0000000L)
-#define IGMP_LOCAL_GROUP_MASK	htonl(0xFFFFFF00L)
-
-/*
- * struct for keeping the multicast list in
- */
-
-#endif /* _LINUX_IGMP_H */
diff --git a/openflow/usr/include/linux/iio/events.h b/openflow/usr/include/linux/iio/events.h
deleted file mode 100644
index edfcaf0..0000000
--- a/openflow/usr/include/linux/iio/events.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* The industrial I/O - event passing to userspace
- *
- * Copyright (c) 2008-2011 Jonathan Cameron
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-#ifndef _IIO_EVENTS_H_
-#define _IIO_EVENTS_H_
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-/**
- * struct iio_event_data - The actual event being pushed to userspace
- * @id:		event identifier
- * @timestamp:	best estimate of time of event occurrence (often from
- *		the interrupt handler)
- */
-struct iio_event_data {
-	__u64	id;
-	__s64	timestamp;
-};
-
-#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int)
-
-#define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)
-
-#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0x7F)
-
-#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)
-
-/* Event code number extraction depends on which type of event we have.
- * Perhaps review this function in the future*/
-#define IIO_EVENT_CODE_EXTRACT_CHAN(mask) ((__s16)(mask & 0xFFFF))
-#define IIO_EVENT_CODE_EXTRACT_CHAN2(mask) ((__s16)(((mask) >> 16) & 0xFFFF))
-
-#define IIO_EVENT_CODE_EXTRACT_MODIFIER(mask) ((mask >> 40) & 0xFF)
-#define IIO_EVENT_CODE_EXTRACT_DIFF(mask) (((mask) >> 55) & 0x1)
-
-#endif /* _IIO_EVENTS_H_ */
diff --git a/openflow/usr/include/linux/iio/types.h b/openflow/usr/include/linux/iio/types.h
deleted file mode 100644
index 4cf6dd2..0000000
--- a/openflow/usr/include/linux/iio/types.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* industrial I/O data types needed both in and out of kernel
- *
- * Copyright (c) 2008 Jonathan Cameron
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-
-#ifndef _IIO_TYPES_H_
-#define _IIO_TYPES_H_
-
-enum iio_chan_type {
-	IIO_VOLTAGE,
-	IIO_CURRENT,
-	IIO_POWER,
-	IIO_ACCEL,
-	IIO_ANGL_VEL,
-	IIO_MAGN,
-	IIO_LIGHT,
-	IIO_INTENSITY,
-	IIO_PROXIMITY,
-	IIO_TEMP,
-	IIO_INCLI,
-	IIO_ROT,
-	IIO_ANGL,
-	IIO_TIMESTAMP,
-	IIO_CAPACITANCE,
-	IIO_ALTVOLTAGE,
-	IIO_CCT,
-	IIO_PRESSURE,
-	IIO_HUMIDITYRELATIVE,
-	IIO_ACTIVITY,
-	IIO_STEPS,
-	IIO_ENERGY,
-	IIO_DISTANCE,
-	IIO_VELOCITY,
-	IIO_CONCENTRATION,
-	IIO_RESISTANCE,
-};
-
-enum iio_modifier {
-	IIO_NO_MOD,
-	IIO_MOD_X,
-	IIO_MOD_Y,
-	IIO_MOD_Z,
-	IIO_MOD_X_AND_Y,
-	IIO_MOD_X_AND_Z,
-	IIO_MOD_Y_AND_Z,
-	IIO_MOD_X_AND_Y_AND_Z,
-	IIO_MOD_X_OR_Y,
-	IIO_MOD_X_OR_Z,
-	IIO_MOD_Y_OR_Z,
-	IIO_MOD_X_OR_Y_OR_Z,
-	IIO_MOD_LIGHT_BOTH,
-	IIO_MOD_LIGHT_IR,
-	IIO_MOD_ROOT_SUM_SQUARED_X_Y,
-	IIO_MOD_SUM_SQUARED_X_Y_Z,
-	IIO_MOD_LIGHT_CLEAR,
-	IIO_MOD_LIGHT_RED,
-	IIO_MOD_LIGHT_GREEN,
-	IIO_MOD_LIGHT_BLUE,
-	IIO_MOD_QUATERNION,
-	IIO_MOD_TEMP_AMBIENT,
-	IIO_MOD_TEMP_OBJECT,
-	IIO_MOD_NORTH_MAGN,
-	IIO_MOD_NORTH_TRUE,
-	IIO_MOD_NORTH_MAGN_TILT_COMP,
-	IIO_MOD_NORTH_TRUE_TILT_COMP,
-	IIO_MOD_RUNNING,
-	IIO_MOD_JOGGING,
-	IIO_MOD_WALKING,
-	IIO_MOD_STILL,
-	IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z,
-	IIO_MOD_I,
-	IIO_MOD_Q,
-	IIO_MOD_CO2,
-	IIO_MOD_VOC,
-};
-
-enum iio_event_type {
-	IIO_EV_TYPE_THRESH,
-	IIO_EV_TYPE_MAG,
-	IIO_EV_TYPE_ROC,
-	IIO_EV_TYPE_THRESH_ADAPTIVE,
-	IIO_EV_TYPE_MAG_ADAPTIVE,
-	IIO_EV_TYPE_CHANGE,
-};
-
-enum iio_event_direction {
-	IIO_EV_DIR_EITHER,
-	IIO_EV_DIR_RISING,
-	IIO_EV_DIR_FALLING,
-	IIO_EV_DIR_NONE,
-};
-
-#endif /* _IIO_TYPES_H_ */
-
diff --git a/openflow/usr/include/linux/ila.h b/openflow/usr/include/linux/ila.h
deleted file mode 100644
index f08e8d7..0000000
--- a/openflow/usr/include/linux/ila.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ila.h - ILA Interface */
-
-#ifndef _LINUX_ILA_H
-#define _LINUX_ILA_H
-
-enum {
-	ILA_ATTR_UNSPEC,
-	ILA_ATTR_LOCATOR,			/* u64 */
-
-	__ILA_ATTR_MAX,
-};
-
-#define ILA_ATTR_MAX		(__ILA_ATTR_MAX - 1)
-
-#endif /* _LINUX_ILA_H */
diff --git a/openflow/usr/include/linux/in.h b/openflow/usr/include/linux/in.h
deleted file mode 100644
index 194b43b..0000000
--- a/openflow/usr/include/linux/in.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Definitions of the Internet Protocol.
- *
- * Version:	@(#)in.h	1.0.1	04/21/93
- *
- * Authors:	Original taken from the GNU Project <netinet/in.h> file.
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_IN_H
-#define _LINUX_IN_H
-
-#include <linux/types.h>
-#include <linux/libc-compat.h>
-#include <linux/socket.h>
-
-#if __UAPI_DEF_IN_IPPROTO
-/* Standard well-defined IP protocols.  */
-enum {
-  IPPROTO_IP = 0,		/* Dummy protocol for TCP		*/
-#define IPPROTO_IP		IPPROTO_IP
-  IPPROTO_ICMP = 1,		/* Internet Control Message Protocol	*/
-#define IPPROTO_ICMP		IPPROTO_ICMP
-  IPPROTO_IGMP = 2,		/* Internet Group Management Protocol	*/
-#define IPPROTO_IGMP		IPPROTO_IGMP
-  IPPROTO_IPIP = 4,		/* IPIP tunnels (older KA9Q tunnels use 94) */
-#define IPPROTO_IPIP		IPPROTO_IPIP
-  IPPROTO_TCP = 6,		/* Transmission Control Protocol	*/
-#define IPPROTO_TCP		IPPROTO_TCP
-  IPPROTO_EGP = 8,		/* Exterior Gateway Protocol		*/
-#define IPPROTO_EGP		IPPROTO_EGP
-  IPPROTO_PUP = 12,		/* PUP protocol				*/
-#define IPPROTO_PUP		IPPROTO_PUP
-  IPPROTO_UDP = 17,		/* User Datagram Protocol		*/
-#define IPPROTO_UDP		IPPROTO_UDP
-  IPPROTO_IDP = 22,		/* XNS IDP protocol			*/
-#define IPPROTO_IDP		IPPROTO_IDP
-  IPPROTO_TP = 29,		/* SO Transport Protocol Class 4	*/
-#define IPPROTO_TP		IPPROTO_TP
-  IPPROTO_DCCP = 33,		/* Datagram Congestion Control Protocol */
-#define IPPROTO_DCCP		IPPROTO_DCCP
-  IPPROTO_IPV6 = 41,		/* IPv6-in-IPv4 tunnelling		*/
-#define IPPROTO_IPV6		IPPROTO_IPV6
-  IPPROTO_RSVP = 46,		/* RSVP Protocol			*/
-#define IPPROTO_RSVP		IPPROTO_RSVP
-  IPPROTO_GRE = 47,		/* Cisco GRE tunnels (rfc 1701,1702)	*/
-#define IPPROTO_GRE		IPPROTO_GRE
-  IPPROTO_ESP = 50,		/* Encapsulation Security Payload protocol */
-#define IPPROTO_ESP		IPPROTO_ESP
-  IPPROTO_AH = 51,		/* Authentication Header protocol	*/
-#define IPPROTO_AH		IPPROTO_AH
-  IPPROTO_MTP = 92,		/* Multicast Transport Protocol		*/
-#define IPPROTO_MTP		IPPROTO_MTP
-  IPPROTO_BEETPH = 94,		/* IP option pseudo header for BEET	*/
-#define IPPROTO_BEETPH		IPPROTO_BEETPH
-  IPPROTO_ENCAP = 98,		/* Encapsulation Header			*/
-#define IPPROTO_ENCAP		IPPROTO_ENCAP
-  IPPROTO_PIM = 103,		/* Protocol Independent Multicast	*/
-#define IPPROTO_PIM		IPPROTO_PIM
-  IPPROTO_COMP = 108,		/* Compression Header Protocol		*/
-#define IPPROTO_COMP		IPPROTO_COMP
-  IPPROTO_SCTP = 132,		/* Stream Control Transport Protocol	*/
-#define IPPROTO_SCTP		IPPROTO_SCTP
-  IPPROTO_UDPLITE = 136,	/* UDP-Lite (RFC 3828)			*/
-#define IPPROTO_UDPLITE		IPPROTO_UDPLITE
-  IPPROTO_MPLS = 137,		/* MPLS in IP (RFC 4023)		*/
-#define IPPROTO_MPLS		IPPROTO_MPLS
-  IPPROTO_RAW = 255,		/* Raw IP packets			*/
-#define IPPROTO_RAW		IPPROTO_RAW
-  IPPROTO_MAX
-};
-#endif
-
-#if __UAPI_DEF_IN_ADDR
-/* Internet address. */
-struct in_addr {
-	__be32	s_addr;
-};
-#endif
-
-#define IP_TOS		1
-#define IP_TTL		2
-#define IP_HDRINCL	3
-#define IP_OPTIONS	4
-#define IP_ROUTER_ALERT	5
-#define IP_RECVOPTS	6
-#define IP_RETOPTS	7
-#define IP_PKTINFO	8
-#define IP_PKTOPTIONS	9
-#define IP_MTU_DISCOVER	10
-#define IP_RECVERR	11
-#define IP_RECVTTL	12
-#define	IP_RECVTOS	13
-#define IP_MTU		14
-#define IP_FREEBIND	15
-#define IP_IPSEC_POLICY	16
-#define IP_XFRM_POLICY	17
-#define IP_PASSSEC	18
-#define IP_TRANSPARENT	19
-
-/* BSD compatibility */
-#define IP_RECVRETOPTS	IP_RETOPTS
-
-/* TProxy original addresses */
-#define IP_ORIGDSTADDR       20
-#define IP_RECVORIGDSTADDR   IP_ORIGDSTADDR
-
-#define IP_MINTTL       21
-#define IP_NODEFRAG     22
-#define IP_CHECKSUM	23
-#define IP_BIND_ADDRESS_NO_PORT	24
-
-/* IP_MTU_DISCOVER values */
-#define IP_PMTUDISC_DONT		0	/* Never send DF frames */
-#define IP_PMTUDISC_WANT		1	/* Use per route hints	*/
-#define IP_PMTUDISC_DO			2	/* Always DF		*/
-#define IP_PMTUDISC_PROBE		3       /* Ignore dst pmtu      */
-/* Always use interface mtu (ignores dst pmtu) but don't set DF flag.
- * Also incoming ICMP frag_needed notifications will be ignored on
- * this socket to prevent accepting spoofed ones.
- */
-#define IP_PMTUDISC_INTERFACE		4
-/* weaker version of IP_PMTUDISC_INTERFACE, which allos packets to get
- * fragmented if they exeed the interface mtu
- */
-#define IP_PMTUDISC_OMIT		5
-
-#define IP_MULTICAST_IF			32
-#define IP_MULTICAST_TTL 		33
-#define IP_MULTICAST_LOOP 		34
-#define IP_ADD_MEMBERSHIP		35
-#define IP_DROP_MEMBERSHIP		36
-#define IP_UNBLOCK_SOURCE		37
-#define IP_BLOCK_SOURCE			38
-#define IP_ADD_SOURCE_MEMBERSHIP	39
-#define IP_DROP_SOURCE_MEMBERSHIP	40
-#define IP_MSFILTER			41
-#define MCAST_JOIN_GROUP		42
-#define MCAST_BLOCK_SOURCE		43
-#define MCAST_UNBLOCK_SOURCE		44
-#define MCAST_LEAVE_GROUP		45
-#define MCAST_JOIN_SOURCE_GROUP		46
-#define MCAST_LEAVE_SOURCE_GROUP	47
-#define MCAST_MSFILTER			48
-#define IP_MULTICAST_ALL		49
-#define IP_UNICAST_IF			50
-
-#define MCAST_EXCLUDE	0
-#define MCAST_INCLUDE	1
-
-/* These need to appear somewhere around here */
-#define IP_DEFAULT_MULTICAST_TTL        1
-#define IP_DEFAULT_MULTICAST_LOOP       1
-
-/* Request struct for multicast socket ops */
-
-#if __UAPI_DEF_IP_MREQ
-struct ip_mreq  {
-	struct in_addr imr_multiaddr;	/* IP multicast address of group */
-	struct in_addr imr_interface;	/* local IP address of interface */
-};
-
-struct ip_mreqn {
-	struct in_addr	imr_multiaddr;		/* IP multicast address of group */
-	struct in_addr	imr_address;		/* local IP address of interface */
-	int		imr_ifindex;		/* Interface index */
-};
-
-struct ip_mreq_source {
-	__be32		imr_multiaddr;
-	__be32		imr_interface;
-	__be32		imr_sourceaddr;
-};
-
-struct ip_msfilter {
-	__be32		imsf_multiaddr;
-	__be32		imsf_interface;
-	__u32		imsf_fmode;
-	__u32		imsf_numsrc;
-	__be32		imsf_slist[1];
-};
-
-#define IP_MSFILTER_SIZE(numsrc) \
-	(sizeof(struct ip_msfilter) - sizeof(__u32) \
-	+ (numsrc) * sizeof(__u32))
-
-struct group_req {
-	__u32				 gr_interface;	/* interface index */
-	struct __kernel_sockaddr_storage gr_group;	/* group address */
-};
-
-struct group_source_req {
-	__u32				 gsr_interface;	/* interface index */
-	struct __kernel_sockaddr_storage gsr_group;	/* group address */
-	struct __kernel_sockaddr_storage gsr_source;	/* source address */
-};
-
-struct group_filter {
-	__u32				 gf_interface;	/* interface index */
-	struct __kernel_sockaddr_storage gf_group;	/* multicast address */
-	__u32				 gf_fmode;	/* filter mode */
-	__u32				 gf_numsrc;	/* number of sources */
-	struct __kernel_sockaddr_storage gf_slist[1];	/* interface index */
-};
-
-#define GROUP_FILTER_SIZE(numsrc) \
-	(sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \
-	+ (numsrc) * sizeof(struct __kernel_sockaddr_storage))
-#endif
-
-#if __UAPI_DEF_IN_PKTINFO
-struct in_pktinfo {
-	int		ipi_ifindex;
-	struct in_addr	ipi_spec_dst;
-	struct in_addr	ipi_addr;
-};
-#endif
-
-/* Structure describing an Internet (IP) socket address. */
-#if  __UAPI_DEF_SOCKADDR_IN
-#define __SOCK_SIZE__	16		/* sizeof(struct sockaddr)	*/
-struct sockaddr_in {
-  __kernel_sa_family_t	sin_family;	/* Address family		*/
-  __be16		sin_port;	/* Port number			*/
-  struct in_addr	sin_addr;	/* Internet address		*/
-
-  /* Pad to size of `struct sockaddr'. */
-  unsigned char		__pad[__SOCK_SIZE__ - sizeof(short int) -
-			sizeof(unsigned short int) - sizeof(struct in_addr)];
-};
-#define sin_zero	__pad		/* for BSD UNIX comp. -FvK	*/
-#endif
-
-#if __UAPI_DEF_IN_CLASS
-/*
- * Definitions of the bits in an Internet address integer.
- * On subnets, host and network parts are found according
- * to the subnet mask, not these masks.
- */
-#define	IN_CLASSA(a)		((((long int) (a)) & 0x80000000) == 0)
-#define	IN_CLASSA_NET		0xff000000
-#define	IN_CLASSA_NSHIFT	24
-#define	IN_CLASSA_HOST		(0xffffffff & ~IN_CLASSA_NET)
-#define	IN_CLASSA_MAX		128
-
-#define	IN_CLASSB(a)		((((long int) (a)) & 0xc0000000) == 0x80000000)
-#define	IN_CLASSB_NET		0xffff0000
-#define	IN_CLASSB_NSHIFT	16
-#define	IN_CLASSB_HOST		(0xffffffff & ~IN_CLASSB_NET)
-#define	IN_CLASSB_MAX		65536
-
-#define	IN_CLASSC(a)		((((long int) (a)) & 0xe0000000) == 0xc0000000)
-#define	IN_CLASSC_NET		0xffffff00
-#define	IN_CLASSC_NSHIFT	8
-#define	IN_CLASSC_HOST		(0xffffffff & ~IN_CLASSC_NET)
-
-#define	IN_CLASSD(a)		((((long int) (a)) & 0xf0000000) == 0xe0000000)
-#define	IN_MULTICAST(a)		IN_CLASSD(a)
-#define IN_MULTICAST_NET	0xF0000000
-
-#define	IN_EXPERIMENTAL(a)	((((long int) (a)) & 0xf0000000) == 0xf0000000)
-#define	IN_BADCLASS(a)		IN_EXPERIMENTAL((a))
-
-/* Address to accept any incoming messages. */
-#define	INADDR_ANY		((unsigned long int) 0x00000000)
-
-/* Address to send to all hosts. */
-#define	INADDR_BROADCAST	((unsigned long int) 0xffffffff)
-
-/* Address indicating an error return. */
-#define	INADDR_NONE		((unsigned long int) 0xffffffff)
-
-/* Network number for local host loopback. */
-#define	IN_LOOPBACKNET		127
-
-/* Address to loopback in software to local host.  */
-#define	INADDR_LOOPBACK		0x7f000001	/* 127.0.0.1   */
-#define	IN_LOOPBACK(a)		((((long int) (a)) & 0xff000000) == 0x7f000000)
-
-/* Defines for Multicast INADDR */
-#define INADDR_UNSPEC_GROUP   	0xe0000000U	/* 224.0.0.0   */
-#define INADDR_ALLHOSTS_GROUP 	0xe0000001U	/* 224.0.0.1   */
-#define INADDR_ALLRTRS_GROUP    0xe0000002U	/* 224.0.0.2 */
-#define INADDR_MAX_LOCAL_GROUP  0xe00000ffU	/* 224.0.0.255 */
-#endif
-
-/* <asm/byteorder.h> contains the htonl type stuff.. */
-#include <asm/byteorder.h> 
-
-
-#endif /* _LINUX_IN_H */
diff --git a/openflow/usr/include/linux/in6.h b/openflow/usr/include/linux/in6.h
deleted file mode 100644
index 994f4c2..0000000
--- a/openflow/usr/include/linux/in6.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- *	Types and definitions for AF_INET6 
- *	Linux INET6 implementation 
- *
- *	Authors:
- *	Pedro Roque		<roque@di.fc.ul.pt>	
- *
- *	Sources:
- *	IPv6 Program Interfaces for BSD Systems
- *      <draft-ietf-ipngwg-bsd-api-05.txt>
- *
- *	Advanced Sockets API for IPv6
- *	<draft-stevens-advanced-api-00.txt>
- *
- *	This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_IN6_H
-#define _LINUX_IN6_H
-
-#include <linux/types.h>
-#include <linux/libc-compat.h>
-
-/*
- *	IPv6 address structure
- */
-
-#if __UAPI_DEF_IN6_ADDR
-struct in6_addr {
-	union {
-		__u8		u6_addr8[16];
-#if __UAPI_DEF_IN6_ADDR_ALT
-		__be16		u6_addr16[8];
-		__be32		u6_addr32[4];
-#endif
-	} in6_u;
-#define s6_addr			in6_u.u6_addr8
-#if __UAPI_DEF_IN6_ADDR_ALT
-#define s6_addr16		in6_u.u6_addr16
-#define s6_addr32		in6_u.u6_addr32
-#endif
-};
-#endif /* __UAPI_DEF_IN6_ADDR */
-
-#if __UAPI_DEF_SOCKADDR_IN6
-struct sockaddr_in6 {
-	unsigned short int	sin6_family;    /* AF_INET6 */
-	__be16			sin6_port;      /* Transport layer port # */
-	__be32			sin6_flowinfo;  /* IPv6 flow information */
-	struct in6_addr		sin6_addr;      /* IPv6 address */
-	__u32			sin6_scope_id;  /* scope id (new in RFC2553) */
-};
-#endif /* __UAPI_DEF_SOCKADDR_IN6 */
-
-#if __UAPI_DEF_IPV6_MREQ
-struct ipv6_mreq {
-	/* IPv6 multicast address of group */
-	struct in6_addr ipv6mr_multiaddr;
-
-	/* local IPv6 address of interface */
-	int		ipv6mr_ifindex;
-};
-#endif /* __UAPI_DEF_IVP6_MREQ */
-
-#define ipv6mr_acaddr	ipv6mr_multiaddr
-
-struct in6_flowlabel_req {
-	struct in6_addr	flr_dst;
-	__be32	flr_label;
-	__u8	flr_action;
-	__u8	flr_share;
-	__u16	flr_flags;
-	__u16 	flr_expires;
-	__u16	flr_linger;
-	__u32	__flr_pad;
-	/* Options in format of IPV6_PKTOPTIONS */
-};
-
-#define IPV6_FL_A_GET	0
-#define IPV6_FL_A_PUT	1
-#define IPV6_FL_A_RENEW	2
-
-#define IPV6_FL_F_CREATE	1
-#define IPV6_FL_F_EXCL		2
-#define IPV6_FL_F_REFLECT	4
-#define IPV6_FL_F_REMOTE	8
-
-#define IPV6_FL_S_NONE		0
-#define IPV6_FL_S_EXCL		1
-#define IPV6_FL_S_PROCESS	2
-#define IPV6_FL_S_USER		3
-#define IPV6_FL_S_ANY		255
-
-
-/*
- *	Bitmask constant declarations to help applications select out the 
- *	flow label and priority fields.
- *
- *	Note that this are in host byte order while the flowinfo field of
- *	sockaddr_in6 is in network byte order.
- */
-
-#define IPV6_FLOWINFO_FLOWLABEL		0x000fffff
-#define IPV6_FLOWINFO_PRIORITY		0x0ff00000
-
-/* These definitions are obsolete */
-#define IPV6_PRIORITY_UNCHARACTERIZED	0x0000
-#define IPV6_PRIORITY_FILLER		0x0100
-#define IPV6_PRIORITY_UNATTENDED	0x0200
-#define IPV6_PRIORITY_RESERVED1		0x0300
-#define IPV6_PRIORITY_BULK		0x0400
-#define IPV6_PRIORITY_RESERVED2		0x0500
-#define IPV6_PRIORITY_INTERACTIVE	0x0600
-#define IPV6_PRIORITY_CONTROL		0x0700
-#define IPV6_PRIORITY_8			0x0800
-#define IPV6_PRIORITY_9			0x0900
-#define IPV6_PRIORITY_10		0x0a00
-#define IPV6_PRIORITY_11		0x0b00
-#define IPV6_PRIORITY_12		0x0c00
-#define IPV6_PRIORITY_13		0x0d00
-#define IPV6_PRIORITY_14		0x0e00
-#define IPV6_PRIORITY_15		0x0f00
-
-/*
- *	IPV6 extension headers
- */
-#if __UAPI_DEF_IPPROTO_V6
-#define IPPROTO_HOPOPTS		0	/* IPv6 hop-by-hop options	*/
-#define IPPROTO_ROUTING		43	/* IPv6 routing header		*/
-#define IPPROTO_FRAGMENT	44	/* IPv6 fragmentation header	*/
-#define IPPROTO_ICMPV6		58	/* ICMPv6			*/
-#define IPPROTO_NONE		59	/* IPv6 no next header		*/
-#define IPPROTO_DSTOPTS		60	/* IPv6 destination options	*/
-#define IPPROTO_MH		135	/* IPv6 mobility header		*/
-#endif /* __UAPI_DEF_IPPROTO_V6 */
-
-/*
- *	IPv6 TLV options.
- */
-#define IPV6_TLV_PAD1		0
-#define IPV6_TLV_PADN		1
-#define IPV6_TLV_ROUTERALERT	5
-#define IPV6_TLV_JUMBO		194
-#define IPV6_TLV_HAO		201	/* home address option */
-
-/*
- *	IPV6 socket options
- */
-#if __UAPI_DEF_IPV6_OPTIONS
-#define IPV6_ADDRFORM		1
-#define IPV6_2292PKTINFO	2
-#define IPV6_2292HOPOPTS	3
-#define IPV6_2292DSTOPTS	4
-#define IPV6_2292RTHDR		5
-#define IPV6_2292PKTOPTIONS	6
-#define IPV6_CHECKSUM		7
-#define IPV6_2292HOPLIMIT	8
-#define IPV6_NEXTHOP		9
-#define IPV6_AUTHHDR		10	/* obsolete */
-#define IPV6_FLOWINFO		11
-
-#define IPV6_UNICAST_HOPS	16
-#define IPV6_MULTICAST_IF	17
-#define IPV6_MULTICAST_HOPS	18
-#define IPV6_MULTICAST_LOOP	19
-#define IPV6_ADD_MEMBERSHIP	20
-#define IPV6_DROP_MEMBERSHIP	21
-#define IPV6_ROUTER_ALERT	22
-#define IPV6_MTU_DISCOVER	23
-#define IPV6_MTU		24
-#define IPV6_RECVERR		25
-#define IPV6_V6ONLY		26
-#define IPV6_JOIN_ANYCAST	27
-#define IPV6_LEAVE_ANYCAST	28
-
-/* IPV6_MTU_DISCOVER values */
-#define IPV6_PMTUDISC_DONT		0
-#define IPV6_PMTUDISC_WANT		1
-#define IPV6_PMTUDISC_DO		2
-#define IPV6_PMTUDISC_PROBE		3
-/* same as IPV6_PMTUDISC_PROBE, provided for symetry with IPv4
- * also see comments on IP_PMTUDISC_INTERFACE
- */
-#define IPV6_PMTUDISC_INTERFACE		4
-/* weaker version of IPV6_PMTUDISC_INTERFACE, which allows packets to
- * get fragmented if they exceed the interface mtu
- */
-#define IPV6_PMTUDISC_OMIT		5
-
-/* Flowlabel */
-#define IPV6_FLOWLABEL_MGR	32
-#define IPV6_FLOWINFO_SEND	33
-
-#define IPV6_IPSEC_POLICY	34
-#define IPV6_XFRM_POLICY	35
-#endif
-
-/*
- * Multicast:
- * Following socket options are shared between IPv4 and IPv6.
- *
- * MCAST_JOIN_GROUP		42
- * MCAST_BLOCK_SOURCE		43
- * MCAST_UNBLOCK_SOURCE		44
- * MCAST_LEAVE_GROUP		45
- * MCAST_JOIN_SOURCE_GROUP	46
- * MCAST_LEAVE_SOURCE_GROUP	47
- * MCAST_MSFILTER		48
- */
-
-/*
- * Advanced API (RFC3542) (1)
- *
- * Note: IPV6_RECVRTHDRDSTOPTS does not exist. see net/ipv6/datagram.c.
- */
-
-#define IPV6_RECVPKTINFO	49
-#define IPV6_PKTINFO		50
-#define IPV6_RECVHOPLIMIT	51
-#define IPV6_HOPLIMIT		52
-#define IPV6_RECVHOPOPTS	53
-#define IPV6_HOPOPTS		54
-#define IPV6_RTHDRDSTOPTS	55
-#define IPV6_RECVRTHDR		56
-#define IPV6_RTHDR		57
-#define IPV6_RECVDSTOPTS	58
-#define IPV6_DSTOPTS		59
-#define IPV6_RECVPATHMTU	60
-#define IPV6_PATHMTU		61
-#define IPV6_DONTFRAG		62
-#if 0	/* not yet */
-#define IPV6_USE_MIN_MTU	63
-#endif
-
-/*
- * Netfilter (1)
- *
- * Following socket options are used in ip6_tables;
- * see include/linux/netfilter_ipv6/ip6_tables.h.
- *
- * IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO		64
- * IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES	65
- */
-
-/*
- * Advanced API (RFC3542) (2)
- */
-#define IPV6_RECVTCLASS		66
-#define IPV6_TCLASS		67
-
-/*
- * Netfilter (2)
- *
- * Following socket options are used in ip6_tables;
- * see include/linux/netfilter_ipv6/ip6_tables.h.
- *
- * IP6T_SO_GET_REVISION_MATCH	68
- * IP6T_SO_GET_REVISION_TARGET	69
- * IP6T_SO_ORIGINAL_DST		80
- */
-
-#define IPV6_AUTOFLOWLABEL	70
-/* RFC5014: Source address selection */
-#define IPV6_ADDR_PREFERENCES	72
-
-#define IPV6_PREFER_SRC_TMP		0x0001
-#define IPV6_PREFER_SRC_PUBLIC		0x0002
-#define IPV6_PREFER_SRC_PUBTMP_DEFAULT	0x0100
-#define IPV6_PREFER_SRC_COA		0x0004
-#define IPV6_PREFER_SRC_HOME		0x0400
-#define IPV6_PREFER_SRC_CGA		0x0008
-#define IPV6_PREFER_SRC_NONCGA		0x0800
-
-/* RFC5082: Generalized Ttl Security Mechanism */
-#define IPV6_MINHOPCOUNT		73
-
-#define IPV6_ORIGDSTADDR        74
-#define IPV6_RECVORIGDSTADDR    IPV6_ORIGDSTADDR
-#define IPV6_TRANSPARENT        75
-#define IPV6_UNICAST_IF         76
-
-/*
- * Multicast Routing:
- * see include/uapi/linux/mroute6.h.
- *
- * MRT6_BASE			200
- * ...
- * MRT6_MAX
- */
-#endif /* _LINUX_IN6_H */
diff --git a/openflow/usr/include/linux/in_route.h b/openflow/usr/include/linux/in_route.h
deleted file mode 100644
index b261b8c..0000000
--- a/openflow/usr/include/linux/in_route.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _LINUX_IN_ROUTE_H
-#define _LINUX_IN_ROUTE_H
-
-/* IPv4 routing cache flags */
-
-#define RTCF_DEAD	RTNH_F_DEAD
-#define RTCF_ONLINK	RTNH_F_ONLINK
-
-/* Obsolete flag. About to be deleted */
-#define RTCF_NOPMTUDISC RTM_F_NOPMTUDISC
-
-#define RTCF_NOTIFY	0x00010000
-#define RTCF_DIRECTDST	0x00020000 /* unused */
-#define RTCF_REDIRECTED	0x00040000
-#define RTCF_TPROXY	0x00080000 /* unused */
-
-#define RTCF_FAST	0x00200000 /* unused */
-#define RTCF_MASQ	0x00400000 /* unused */
-#define RTCF_SNAT	0x00800000 /* unused */
-#define RTCF_DOREDIRECT 0x01000000
-#define RTCF_DIRECTSRC	0x04000000
-#define RTCF_DNAT	0x08000000
-#define RTCF_BROADCAST	0x10000000
-#define RTCF_MULTICAST	0x20000000
-#define RTCF_REJECT	0x40000000 /* unused */
-#define RTCF_LOCAL	0x80000000
-
-#define RTCF_NAT	(RTCF_DNAT|RTCF_SNAT)
-
-#define RT_TOS(tos)	((tos)&IPTOS_TOS_MASK)
-
-#endif /* _LINUX_IN_ROUTE_H */
diff --git a/openflow/usr/include/linux/inet_diag.h b/openflow/usr/include/linux/inet_diag.h
deleted file mode 100644
index 1db4116..0000000
--- a/openflow/usr/include/linux/inet_diag.h
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef _INET_DIAG_H_
-#define _INET_DIAG_H_
-
-#include <linux/types.h>
-
-/* Just some random number */
-#define TCPDIAG_GETSOCK 18
-#define DCCPDIAG_GETSOCK 19
-
-#define INET_DIAG_GETSOCK_MAX 24
-
-/* Socket identity */
-struct inet_diag_sockid {
-	__be16	idiag_sport;
-	__be16	idiag_dport;
-	__be32	idiag_src[4];
-	__be32	idiag_dst[4];
-	__u32	idiag_if;
-	__u32	idiag_cookie[2];
-#define INET_DIAG_NOCOOKIE (~0U)
-};
-
-/* Request structure */
-
-struct inet_diag_req {
-	__u8	idiag_family;		/* Family of addresses. */
-	__u8	idiag_src_len;
-	__u8	idiag_dst_len;
-	__u8	idiag_ext;		/* Query extended information */
-
-	struct inet_diag_sockid id;
-
-	__u32	idiag_states;		/* States to dump */
-	__u32	idiag_dbs;		/* Tables to dump (NI) */
-};
-
-struct inet_diag_req_v2 {
-	__u8	sdiag_family;
-	__u8	sdiag_protocol;
-	__u8	idiag_ext;
-	__u8	pad;
-	__u32	idiag_states;
-	struct inet_diag_sockid id;
-};
-
-enum {
-	INET_DIAG_REQ_NONE,
-	INET_DIAG_REQ_BYTECODE,
-};
-
-#define INET_DIAG_REQ_MAX INET_DIAG_REQ_BYTECODE
-
-/* Bytecode is sequence of 4 byte commands followed by variable arguments.
- * All the commands identified by "code" are conditional jumps forward:
- * to offset cc+"yes" or to offset cc+"no". "yes" is supposed to be
- * length of the command and its arguments.
- */
- 
-struct inet_diag_bc_op {
-	unsigned char	code;
-	unsigned char	yes;
-	unsigned short	no;
-};
-
-enum {
-	INET_DIAG_BC_NOP,
-	INET_DIAG_BC_JMP,
-	INET_DIAG_BC_S_GE,
-	INET_DIAG_BC_S_LE,
-	INET_DIAG_BC_D_GE,
-	INET_DIAG_BC_D_LE,
-	INET_DIAG_BC_AUTO,
-	INET_DIAG_BC_S_COND,
-	INET_DIAG_BC_D_COND,
-};
-
-struct inet_diag_hostcond {
-	__u8	family;
-	__u8	prefix_len;
-	int	port;
-	__be32	addr[0];
-};
-
-/* Base info structure. It contains socket identity (addrs/ports/cookie)
- * and, alas, the information shown by netstat. */
-struct inet_diag_msg {
-	__u8	idiag_family;
-	__u8	idiag_state;
-	__u8	idiag_timer;
-	__u8	idiag_retrans;
-
-	struct inet_diag_sockid id;
-
-	__u32	idiag_expires;
-	__u32	idiag_rqueue;
-	__u32	idiag_wqueue;
-	__u32	idiag_uid;
-	__u32	idiag_inode;
-};
-
-/* Extensions */
-
-enum {
-	INET_DIAG_NONE,
-	INET_DIAG_MEMINFO,
-	INET_DIAG_INFO,
-	INET_DIAG_VEGASINFO,
-	INET_DIAG_CONG,
-	INET_DIAG_TOS,
-	INET_DIAG_TCLASS,
-	INET_DIAG_SKMEMINFO,
-	INET_DIAG_SHUTDOWN,
-	INET_DIAG_DCTCPINFO,
-	INET_DIAG_PROTOCOL,  /* response attribute only */
-	INET_DIAG_SKV6ONLY,
-};
-
-#define INET_DIAG_MAX INET_DIAG_SKV6ONLY
-
-/* INET_DIAG_MEM */
-
-struct inet_diag_meminfo {
-	__u32	idiag_rmem;
-	__u32	idiag_wmem;
-	__u32	idiag_fmem;
-	__u32	idiag_tmem;
-};
-
-/* INET_DIAG_VEGASINFO */
-
-struct tcpvegas_info {
-	__u32	tcpv_enabled;
-	__u32	tcpv_rttcnt;
-	__u32	tcpv_rtt;
-	__u32	tcpv_minrtt;
-};
-
-/* INET_DIAG_DCTCPINFO */
-
-struct tcp_dctcp_info {
-	__u16	dctcp_enabled;
-	__u16	dctcp_ce_state;
-	__u32	dctcp_alpha;
-	__u32	dctcp_ab_ecn;
-	__u32	dctcp_ab_tot;
-};
-
-union tcp_cc_info {
-	struct tcpvegas_info	vegas;
-	struct tcp_dctcp_info	dctcp;
-};
-#endif /* _INET_DIAG_H_ */
diff --git a/openflow/usr/include/linux/inotify.h b/openflow/usr/include/linux/inotify.h
deleted file mode 100644
index 44a1a27..0000000
--- a/openflow/usr/include/linux/inotify.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Inode based directory notification for Linux
- *
- * Copyright (C) 2005 John McCutchan
- */
-
-#ifndef _LINUX_INOTIFY_H
-#define _LINUX_INOTIFY_H
-
-/* For O_CLOEXEC and O_NONBLOCK */
-#include <linux/fcntl.h>
-#include <linux/types.h>
-
-/*
- * struct inotify_event - structure read from the inotify device for each event
- *
- * When you are watching a directory, you will receive the filename for events
- * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd.
- */
-struct inotify_event {
-	__s32		wd;		/* watch descriptor */
-	__u32		mask;		/* watch mask */
-	__u32		cookie;		/* cookie to synchronize two events */
-	__u32		len;		/* length (including nulls) of name */
-	char		name[0];	/* stub for possible name */
-};
-
-/* the following are legal, implemented events that user-space can watch for */
-#define IN_ACCESS		0x00000001	/* File was accessed */
-#define IN_MODIFY		0x00000002	/* File was modified */
-#define IN_ATTRIB		0x00000004	/* Metadata changed */
-#define IN_CLOSE_WRITE		0x00000008	/* Writtable file was closed */
-#define IN_CLOSE_NOWRITE	0x00000010	/* Unwrittable file closed */
-#define IN_OPEN			0x00000020	/* File was opened */
-#define IN_MOVED_FROM		0x00000040	/* File was moved from X */
-#define IN_MOVED_TO		0x00000080	/* File was moved to Y */
-#define IN_CREATE		0x00000100	/* Subfile was created */
-#define IN_DELETE		0x00000200	/* Subfile was deleted */
-#define IN_DELETE_SELF		0x00000400	/* Self was deleted */
-#define IN_MOVE_SELF		0x00000800	/* Self was moved */
-
-/* the following are legal events.  they are sent as needed to any watch */
-#define IN_UNMOUNT		0x00002000	/* Backing fs was unmounted */
-#define IN_Q_OVERFLOW		0x00004000	/* Event queued overflowed */
-#define IN_IGNORED		0x00008000	/* File was ignored */
-
-/* helper events */
-#define IN_CLOSE		(IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* close */
-#define IN_MOVE			(IN_MOVED_FROM | IN_MOVED_TO) /* moves */
-
-/* special flags */
-#define IN_ONLYDIR		0x01000000	/* only watch the path if it is a directory */
-#define IN_DONT_FOLLOW		0x02000000	/* don't follow a sym link */
-#define IN_EXCL_UNLINK		0x04000000	/* exclude events on unlinked objects */
-#define IN_MASK_ADD		0x20000000	/* add to the mask of an already existing watch */
-#define IN_ISDIR		0x40000000	/* event occurred against dir */
-#define IN_ONESHOT		0x80000000	/* only send event once */
-
-/*
- * All of the events - we build the list by hand so that we can add flags in
- * the future and not break backward compatibility.  Apps will get only the
- * events that they originally wanted.  Be sure to add new events here!
- */
-#define IN_ALL_EVENTS	(IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
-			 IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
-			 IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \
-			 IN_MOVE_SELF)
-
-/* Flags for sys_inotify_init1.  */
-#define IN_CLOEXEC O_CLOEXEC
-#define IN_NONBLOCK O_NONBLOCK
-
-
-#endif /* _LINUX_INOTIFY_H */
diff --git a/openflow/usr/include/linux/input-event-codes.h b/openflow/usr/include/linux/input-event-codes.h
deleted file mode 100644
index dcd34b4..0000000
--- a/openflow/usr/include/linux/input-event-codes.h
+++ /dev/null
@@ -1,805 +0,0 @@
-/*
- * Input event codes
- *
- *    *** IMPORTANT ***
- * This file is not only included from C-code but also from devicetree source
- * files. As such this file MUST only contain comments and defines.
- *
- * Copyright (c) 1999-2002 Vojtech Pavlik
- * Copyright (c) 2015 Hans de Goede <hdegoede@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-#ifndef _INPUT_EVENT_CODES_H
-#define _INPUT_EVENT_CODES_H
-
-/*
- * Device properties and quirks
- */
-
-#define INPUT_PROP_POINTER		0x00	/* needs a pointer */
-#define INPUT_PROP_DIRECT		0x01	/* direct input devices */
-#define INPUT_PROP_BUTTONPAD		0x02	/* has button(s) under pad */
-#define INPUT_PROP_SEMI_MT		0x03	/* touch rectangle only */
-#define INPUT_PROP_TOPBUTTONPAD		0x04	/* softbuttons at top of pad */
-#define INPUT_PROP_POINTING_STICK	0x05	/* is a pointing stick */
-#define INPUT_PROP_ACCELEROMETER	0x06	/* has accelerometer */
-
-#define INPUT_PROP_MAX			0x1f
-#define INPUT_PROP_CNT			(INPUT_PROP_MAX + 1)
-
-/*
- * Event types
- */
-
-#define EV_SYN			0x00
-#define EV_KEY			0x01
-#define EV_REL			0x02
-#define EV_ABS			0x03
-#define EV_MSC			0x04
-#define EV_SW			0x05
-#define EV_LED			0x11
-#define EV_SND			0x12
-#define EV_REP			0x14
-#define EV_FF			0x15
-#define EV_PWR			0x16
-#define EV_FF_STATUS		0x17
-#define EV_MAX			0x1f
-#define EV_CNT			(EV_MAX+1)
-
-/*
- * Synchronization events.
- */
-
-#define SYN_REPORT		0
-#define SYN_CONFIG		1
-#define SYN_MT_REPORT		2
-#define SYN_DROPPED		3
-#define SYN_MAX			0xf
-#define SYN_CNT			(SYN_MAX+1)
-
-/*
- * Keys and buttons
- *
- * Most of the keys/buttons are modeled after USB HUT 1.12
- * (see http://www.usb.org/developers/hidpage).
- * Abbreviations in the comments:
- * AC - Application Control
- * AL - Application Launch Button
- * SC - System Control
- */
-
-#define KEY_RESERVED		0
-#define KEY_ESC			1
-#define KEY_1			2
-#define KEY_2			3
-#define KEY_3			4
-#define KEY_4			5
-#define KEY_5			6
-#define KEY_6			7
-#define KEY_7			8
-#define KEY_8			9
-#define KEY_9			10
-#define KEY_0			11
-#define KEY_MINUS		12
-#define KEY_EQUAL		13
-#define KEY_BACKSPACE		14
-#define KEY_TAB			15
-#define KEY_Q			16
-#define KEY_W			17
-#define KEY_E			18
-#define KEY_R			19
-#define KEY_T			20
-#define KEY_Y			21
-#define KEY_U			22
-#define KEY_I			23
-#define KEY_O			24
-#define KEY_P			25
-#define KEY_LEFTBRACE		26
-#define KEY_RIGHTBRACE		27
-#define KEY_ENTER		28
-#define KEY_LEFTCTRL		29
-#define KEY_A			30
-#define KEY_S			31
-#define KEY_D			32
-#define KEY_F			33
-#define KEY_G			34
-#define KEY_H			35
-#define KEY_J			36
-#define KEY_K			37
-#define KEY_L			38
-#define KEY_SEMICOLON		39
-#define KEY_APOSTROPHE		40
-#define KEY_GRAVE		41
-#define KEY_LEFTSHIFT		42
-#define KEY_BACKSLASH		43
-#define KEY_Z			44
-#define KEY_X			45
-#define KEY_C			46
-#define KEY_V			47
-#define KEY_B			48
-#define KEY_N			49
-#define KEY_M			50
-#define KEY_COMMA		51
-#define KEY_DOT			52
-#define KEY_SLASH		53
-#define KEY_RIGHTSHIFT		54
-#define KEY_KPASTERISK		55
-#define KEY_LEFTALT		56
-#define KEY_SPACE		57
-#define KEY_CAPSLOCK		58
-#define KEY_F1			59
-#define KEY_F2			60
-#define KEY_F3			61
-#define KEY_F4			62
-#define KEY_F5			63
-#define KEY_F6			64
-#define KEY_F7			65
-#define KEY_F8			66
-#define KEY_F9			67
-#define KEY_F10			68
-#define KEY_NUMLOCK		69
-#define KEY_SCROLLLOCK		70
-#define KEY_KP7			71
-#define KEY_KP8			72
-#define KEY_KP9			73
-#define KEY_KPMINUS		74
-#define KEY_KP4			75
-#define KEY_KP5			76
-#define KEY_KP6			77
-#define KEY_KPPLUS		78
-#define KEY_KP1			79
-#define KEY_KP2			80
-#define KEY_KP3			81
-#define KEY_KP0			82
-#define KEY_KPDOT		83
-
-#define KEY_ZENKAKUHANKAKU	85
-#define KEY_102ND		86
-#define KEY_F11			87
-#define KEY_F12			88
-#define KEY_RO			89
-#define KEY_KATAKANA		90
-#define KEY_HIRAGANA		91
-#define KEY_HENKAN		92
-#define KEY_KATAKANAHIRAGANA	93
-#define KEY_MUHENKAN		94
-#define KEY_KPJPCOMMA		95
-#define KEY_KPENTER		96
-#define KEY_RIGHTCTRL		97
-#define KEY_KPSLASH		98
-#define KEY_SYSRQ		99
-#define KEY_RIGHTALT		100
-#define KEY_LINEFEED		101
-#define KEY_HOME		102
-#define KEY_UP			103
-#define KEY_PAGEUP		104
-#define KEY_LEFT		105
-#define KEY_RIGHT		106
-#define KEY_END			107
-#define KEY_DOWN		108
-#define KEY_PAGEDOWN		109
-#define KEY_INSERT		110
-#define KEY_DELETE		111
-#define KEY_MACRO		112
-#define KEY_MUTE		113
-#define KEY_VOLUMEDOWN		114
-#define KEY_VOLUMEUP		115
-#define KEY_POWER		116	/* SC System Power Down */
-#define KEY_KPEQUAL		117
-#define KEY_KPPLUSMINUS		118
-#define KEY_PAUSE		119
-#define KEY_SCALE		120	/* AL Compiz Scale (Expose) */
-
-#define KEY_KPCOMMA		121
-#define KEY_HANGEUL		122
-#define KEY_HANGUEL		KEY_HANGEUL
-#define KEY_HANJA		123
-#define KEY_YEN			124
-#define KEY_LEFTMETA		125
-#define KEY_RIGHTMETA		126
-#define KEY_COMPOSE		127
-
-#define KEY_STOP		128	/* AC Stop */
-#define KEY_AGAIN		129
-#define KEY_PROPS		130	/* AC Properties */
-#define KEY_UNDO		131	/* AC Undo */
-#define KEY_FRONT		132
-#define KEY_COPY		133	/* AC Copy */
-#define KEY_OPEN		134	/* AC Open */
-#define KEY_PASTE		135	/* AC Paste */
-#define KEY_FIND		136	/* AC Search */
-#define KEY_CUT			137	/* AC Cut */
-#define KEY_HELP		138	/* AL Integrated Help Center */
-#define KEY_MENU		139	/* Menu (show menu) */
-#define KEY_CALC		140	/* AL Calculator */
-#define KEY_SETUP		141
-#define KEY_SLEEP		142	/* SC System Sleep */
-#define KEY_WAKEUP		143	/* System Wake Up */
-#define KEY_FILE		144	/* AL Local Machine Browser */
-#define KEY_SENDFILE		145
-#define KEY_DELETEFILE		146
-#define KEY_XFER		147
-#define KEY_PROG1		148
-#define KEY_PROG2		149
-#define KEY_WWW			150	/* AL Internet Browser */
-#define KEY_MSDOS		151
-#define KEY_COFFEE		152	/* AL Terminal Lock/Screensaver */
-#define KEY_SCREENLOCK		KEY_COFFEE
-#define KEY_ROTATE_DISPLAY	153	/* Display orientation for e.g. tablets */
-#define KEY_DIRECTION		KEY_ROTATE_DISPLAY
-#define KEY_CYCLEWINDOWS	154
-#define KEY_MAIL		155
-#define KEY_BOOKMARKS		156	/* AC Bookmarks */
-#define KEY_COMPUTER		157
-#define KEY_BACK		158	/* AC Back */
-#define KEY_FORWARD		159	/* AC Forward */
-#define KEY_CLOSECD		160
-#define KEY_EJECTCD		161
-#define KEY_EJECTCLOSECD	162
-#define KEY_NEXTSONG		163
-#define KEY_PLAYPAUSE		164
-#define KEY_PREVIOUSSONG	165
-#define KEY_STOPCD		166
-#define KEY_RECORD		167
-#define KEY_REWIND		168
-#define KEY_PHONE		169	/* Media Select Telephone */
-#define KEY_ISO			170
-#define KEY_CONFIG		171	/* AL Consumer Control Configuration */
-#define KEY_HOMEPAGE		172	/* AC Home */
-#define KEY_REFRESH		173	/* AC Refresh */
-#define KEY_EXIT		174	/* AC Exit */
-#define KEY_MOVE		175
-#define KEY_EDIT		176
-#define KEY_SCROLLUP		177
-#define KEY_SCROLLDOWN		178
-#define KEY_KPLEFTPAREN		179
-#define KEY_KPRIGHTPAREN	180
-#define KEY_NEW			181	/* AC New */
-#define KEY_REDO		182	/* AC Redo/Repeat */
-
-#define KEY_F13			183
-#define KEY_F14			184
-#define KEY_F15			185
-#define KEY_F16			186
-#define KEY_F17			187
-#define KEY_F18			188
-#define KEY_F19			189
-#define KEY_F20			190
-#define KEY_F21			191
-#define KEY_F22			192
-#define KEY_F23			193
-#define KEY_F24			194
-
-#define KEY_PLAYCD		200
-#define KEY_PAUSECD		201
-#define KEY_PROG3		202
-#define KEY_PROG4		203
-#define KEY_DASHBOARD		204	/* AL Dashboard */
-#define KEY_SUSPEND		205
-#define KEY_CLOSE		206	/* AC Close */
-#define KEY_PLAY		207
-#define KEY_FASTFORWARD		208
-#define KEY_BASSBOOST		209
-#define KEY_PRINT		210	/* AC Print */
-#define KEY_HP			211
-#define KEY_CAMERA		212
-#define KEY_SOUND		213
-#define KEY_QUESTION		214
-#define KEY_EMAIL		215
-#define KEY_CHAT		216
-#define KEY_SEARCH		217
-#define KEY_CONNECT		218
-#define KEY_FINANCE		219	/* AL Checkbook/Finance */
-#define KEY_SPORT		220
-#define KEY_SHOP		221
-#define KEY_ALTERASE		222
-#define KEY_CANCEL		223	/* AC Cancel */
-#define KEY_BRIGHTNESSDOWN	224
-#define KEY_BRIGHTNESSUP	225
-#define KEY_MEDIA		226
-
-#define KEY_SWITCHVIDEOMODE	227	/* Cycle between available video
-					   outputs (Monitor/LCD/TV-out/etc) */
-#define KEY_KBDILLUMTOGGLE	228
-#define KEY_KBDILLUMDOWN	229
-#define KEY_KBDILLUMUP		230
-
-#define KEY_SEND		231	/* AC Send */
-#define KEY_REPLY		232	/* AC Reply */
-#define KEY_FORWARDMAIL		233	/* AC Forward Msg */
-#define KEY_SAVE		234	/* AC Save */
-#define KEY_DOCUMENTS		235
-
-#define KEY_BATTERY		236
-
-#define KEY_BLUETOOTH		237
-#define KEY_WLAN		238
-#define KEY_UWB			239
-
-#define KEY_UNKNOWN		240
-
-#define KEY_VIDEO_NEXT		241	/* drive next video source */
-#define KEY_VIDEO_PREV		242	/* drive previous video source */
-#define KEY_BRIGHTNESS_CYCLE	243	/* brightness up, after max is min */
-#define KEY_BRIGHTNESS_AUTO	244	/* Set Auto Brightness: manual
-					  brightness control is off,
-					  rely on ambient */
-#define KEY_BRIGHTNESS_ZERO	KEY_BRIGHTNESS_AUTO
-#define KEY_DISPLAY_OFF		245	/* display device to off state */
-
-#define KEY_WWAN		246	/* Wireless WAN (LTE, UMTS, GSM, etc.) */
-#define KEY_WIMAX		KEY_WWAN
-#define KEY_RFKILL		247	/* Key that controls all radios */
-
-#define KEY_MICMUTE		248	/* Mute / unmute the microphone */
-
-/* Code 255 is reserved for special needs of AT keyboard driver */
-
-#define BTN_MISC		0x100
-#define BTN_0			0x100
-#define BTN_1			0x101
-#define BTN_2			0x102
-#define BTN_3			0x103
-#define BTN_4			0x104
-#define BTN_5			0x105
-#define BTN_6			0x106
-#define BTN_7			0x107
-#define BTN_8			0x108
-#define BTN_9			0x109
-
-#define BTN_MOUSE		0x110
-#define BTN_LEFT		0x110
-#define BTN_RIGHT		0x111
-#define BTN_MIDDLE		0x112
-#define BTN_SIDE		0x113
-#define BTN_EXTRA		0x114
-#define BTN_FORWARD		0x115
-#define BTN_BACK		0x116
-#define BTN_TASK		0x117
-
-#define BTN_JOYSTICK		0x120
-#define BTN_TRIGGER		0x120
-#define BTN_THUMB		0x121
-#define BTN_THUMB2		0x122
-#define BTN_TOP			0x123
-#define BTN_TOP2		0x124
-#define BTN_PINKIE		0x125
-#define BTN_BASE		0x126
-#define BTN_BASE2		0x127
-#define BTN_BASE3		0x128
-#define BTN_BASE4		0x129
-#define BTN_BASE5		0x12a
-#define BTN_BASE6		0x12b
-#define BTN_DEAD		0x12f
-
-#define BTN_GAMEPAD		0x130
-#define BTN_SOUTH		0x130
-#define BTN_A			BTN_SOUTH
-#define BTN_EAST		0x131
-#define BTN_B			BTN_EAST
-#define BTN_C			0x132
-#define BTN_NORTH		0x133
-#define BTN_X			BTN_NORTH
-#define BTN_WEST		0x134
-#define BTN_Y			BTN_WEST
-#define BTN_Z			0x135
-#define BTN_TL			0x136
-#define BTN_TR			0x137
-#define BTN_TL2			0x138
-#define BTN_TR2			0x139
-#define BTN_SELECT		0x13a
-#define BTN_START		0x13b
-#define BTN_MODE		0x13c
-#define BTN_THUMBL		0x13d
-#define BTN_THUMBR		0x13e
-
-#define BTN_DIGI		0x140
-#define BTN_TOOL_PEN		0x140
-#define BTN_TOOL_RUBBER		0x141
-#define BTN_TOOL_BRUSH		0x142
-#define BTN_TOOL_PENCIL		0x143
-#define BTN_TOOL_AIRBRUSH	0x144
-#define BTN_TOOL_FINGER		0x145
-#define BTN_TOOL_MOUSE		0x146
-#define BTN_TOOL_LENS		0x147
-#define BTN_TOOL_QUINTTAP	0x148	/* Five fingers on trackpad */
-#define BTN_TOUCH		0x14a
-#define BTN_STYLUS		0x14b
-#define BTN_STYLUS2		0x14c
-#define BTN_TOOL_DOUBLETAP	0x14d
-#define BTN_TOOL_TRIPLETAP	0x14e
-#define BTN_TOOL_QUADTAP	0x14f	/* Four fingers on trackpad */
-
-#define BTN_WHEEL		0x150
-#define BTN_GEAR_DOWN		0x150
-#define BTN_GEAR_UP		0x151
-
-#define KEY_OK			0x160
-#define KEY_SELECT		0x161
-#define KEY_GOTO		0x162
-#define KEY_CLEAR		0x163
-#define KEY_POWER2		0x164
-#define KEY_OPTION		0x165
-#define KEY_INFO		0x166	/* AL OEM Features/Tips/Tutorial */
-#define KEY_TIME		0x167
-#define KEY_VENDOR		0x168
-#define KEY_ARCHIVE		0x169
-#define KEY_PROGRAM		0x16a	/* Media Select Program Guide */
-#define KEY_CHANNEL		0x16b
-#define KEY_FAVORITES		0x16c
-#define KEY_EPG			0x16d
-#define KEY_PVR			0x16e	/* Media Select Home */
-#define KEY_MHP			0x16f
-#define KEY_LANGUAGE		0x170
-#define KEY_TITLE		0x171
-#define KEY_SUBTITLE		0x172
-#define KEY_ANGLE		0x173
-#define KEY_ZOOM		0x174
-#define KEY_MODE		0x175
-#define KEY_KEYBOARD		0x176
-#define KEY_SCREEN		0x177
-#define KEY_PC			0x178	/* Media Select Computer */
-#define KEY_TV			0x179	/* Media Select TV */
-#define KEY_TV2			0x17a	/* Media Select Cable */
-#define KEY_VCR			0x17b	/* Media Select VCR */
-#define KEY_VCR2		0x17c	/* VCR Plus */
-#define KEY_SAT			0x17d	/* Media Select Satellite */
-#define KEY_SAT2		0x17e
-#define KEY_CD			0x17f	/* Media Select CD */
-#define KEY_TAPE		0x180	/* Media Select Tape */
-#define KEY_RADIO		0x181
-#define KEY_TUNER		0x182	/* Media Select Tuner */
-#define KEY_PLAYER		0x183
-#define KEY_TEXT		0x184
-#define KEY_DVD			0x185	/* Media Select DVD */
-#define KEY_AUX			0x186
-#define KEY_MP3			0x187
-#define KEY_AUDIO		0x188	/* AL Audio Browser */
-#define KEY_VIDEO		0x189	/* AL Movie Browser */
-#define KEY_DIRECTORY		0x18a
-#define KEY_LIST		0x18b
-#define KEY_MEMO		0x18c	/* Media Select Messages */
-#define KEY_CALENDAR		0x18d
-#define KEY_RED			0x18e
-#define KEY_GREEN		0x18f
-#define KEY_YELLOW		0x190
-#define KEY_BLUE		0x191
-#define KEY_CHANNELUP		0x192	/* Channel Increment */
-#define KEY_CHANNELDOWN		0x193	/* Channel Decrement */
-#define KEY_FIRST		0x194
-#define KEY_LAST		0x195	/* Recall Last */
-#define KEY_AB			0x196
-#define KEY_NEXT		0x197
-#define KEY_RESTART		0x198
-#define KEY_SLOW		0x199
-#define KEY_SHUFFLE		0x19a
-#define KEY_BREAK		0x19b
-#define KEY_PREVIOUS		0x19c
-#define KEY_DIGITS		0x19d
-#define KEY_TEEN		0x19e
-#define KEY_TWEN		0x19f
-#define KEY_VIDEOPHONE		0x1a0	/* Media Select Video Phone */
-#define KEY_GAMES		0x1a1	/* Media Select Games */
-#define KEY_ZOOMIN		0x1a2	/* AC Zoom In */
-#define KEY_ZOOMOUT		0x1a3	/* AC Zoom Out */
-#define KEY_ZOOMRESET		0x1a4	/* AC Zoom */
-#define KEY_WORDPROCESSOR	0x1a5	/* AL Word Processor */
-#define KEY_EDITOR		0x1a6	/* AL Text Editor */
-#define KEY_SPREADSHEET		0x1a7	/* AL Spreadsheet */
-#define KEY_GRAPHICSEDITOR	0x1a8	/* AL Graphics Editor */
-#define KEY_PRESENTATION	0x1a9	/* AL Presentation App */
-#define KEY_DATABASE		0x1aa	/* AL Database App */
-#define KEY_NEWS		0x1ab	/* AL Newsreader */
-#define KEY_VOICEMAIL		0x1ac	/* AL Voicemail */
-#define KEY_ADDRESSBOOK		0x1ad	/* AL Contacts/Address Book */
-#define KEY_MESSENGER		0x1ae	/* AL Instant Messaging */
-#define KEY_DISPLAYTOGGLE	0x1af	/* Turn display (LCD) on and off */
-#define KEY_BRIGHTNESS_TOGGLE	KEY_DISPLAYTOGGLE
-#define KEY_SPELLCHECK		0x1b0   /* AL Spell Check */
-#define KEY_LOGOFF		0x1b1   /* AL Logoff */
-
-#define KEY_DOLLAR		0x1b2
-#define KEY_EURO		0x1b3
-
-#define KEY_FRAMEBACK		0x1b4	/* Consumer - transport controls */
-#define KEY_FRAMEFORWARD	0x1b5
-#define KEY_CONTEXT_MENU	0x1b6	/* GenDesc - system context menu */
-#define KEY_MEDIA_REPEAT	0x1b7	/* Consumer - transport control */
-#define KEY_10CHANNELSUP	0x1b8	/* 10 channels up (10+) */
-#define KEY_10CHANNELSDOWN	0x1b9	/* 10 channels down (10-) */
-#define KEY_IMAGES		0x1ba	/* AL Image Browser */
-
-#define KEY_DEL_EOL		0x1c0
-#define KEY_DEL_EOS		0x1c1
-#define KEY_INS_LINE		0x1c2
-#define KEY_DEL_LINE		0x1c3
-
-#define KEY_FN			0x1d0
-#define KEY_FN_ESC		0x1d1
-#define KEY_FN_F1		0x1d2
-#define KEY_FN_F2		0x1d3
-#define KEY_FN_F3		0x1d4
-#define KEY_FN_F4		0x1d5
-#define KEY_FN_F5		0x1d6
-#define KEY_FN_F6		0x1d7
-#define KEY_FN_F7		0x1d8
-#define KEY_FN_F8		0x1d9
-#define KEY_FN_F9		0x1da
-#define KEY_FN_F10		0x1db
-#define KEY_FN_F11		0x1dc
-#define KEY_FN_F12		0x1dd
-#define KEY_FN_1		0x1de
-#define KEY_FN_2		0x1df
-#define KEY_FN_D		0x1e0
-#define KEY_FN_E		0x1e1
-#define KEY_FN_F		0x1e2
-#define KEY_FN_S		0x1e3
-#define KEY_FN_B		0x1e4
-
-#define KEY_BRL_DOT1		0x1f1
-#define KEY_BRL_DOT2		0x1f2
-#define KEY_BRL_DOT3		0x1f3
-#define KEY_BRL_DOT4		0x1f4
-#define KEY_BRL_DOT5		0x1f5
-#define KEY_BRL_DOT6		0x1f6
-#define KEY_BRL_DOT7		0x1f7
-#define KEY_BRL_DOT8		0x1f8
-#define KEY_BRL_DOT9		0x1f9
-#define KEY_BRL_DOT10		0x1fa
-
-#define KEY_NUMERIC_0		0x200	/* used by phones, remote controls, */
-#define KEY_NUMERIC_1		0x201	/* and other keypads */
-#define KEY_NUMERIC_2		0x202
-#define KEY_NUMERIC_3		0x203
-#define KEY_NUMERIC_4		0x204
-#define KEY_NUMERIC_5		0x205
-#define KEY_NUMERIC_6		0x206
-#define KEY_NUMERIC_7		0x207
-#define KEY_NUMERIC_8		0x208
-#define KEY_NUMERIC_9		0x209
-#define KEY_NUMERIC_STAR	0x20a
-#define KEY_NUMERIC_POUND	0x20b
-#define KEY_NUMERIC_A		0x20c	/* Phone key A - HUT Telephony 0xb9 */
-#define KEY_NUMERIC_B		0x20d
-#define KEY_NUMERIC_C		0x20e
-#define KEY_NUMERIC_D		0x20f
-
-#define KEY_CAMERA_FOCUS	0x210
-#define KEY_WPS_BUTTON		0x211	/* WiFi Protected Setup key */
-
-#define KEY_TOUCHPAD_TOGGLE	0x212	/* Request switch touchpad on or off */
-#define KEY_TOUCHPAD_ON		0x213
-#define KEY_TOUCHPAD_OFF	0x214
-
-#define KEY_CAMERA_ZOOMIN	0x215
-#define KEY_CAMERA_ZOOMOUT	0x216
-#define KEY_CAMERA_UP		0x217
-#define KEY_CAMERA_DOWN		0x218
-#define KEY_CAMERA_LEFT		0x219
-#define KEY_CAMERA_RIGHT	0x21a
-
-#define KEY_ATTENDANT_ON	0x21b
-#define KEY_ATTENDANT_OFF	0x21c
-#define KEY_ATTENDANT_TOGGLE	0x21d	/* Attendant call on or off */
-#define KEY_LIGHTS_TOGGLE	0x21e	/* Reading light on or off */
-
-#define BTN_DPAD_UP		0x220
-#define BTN_DPAD_DOWN		0x221
-#define BTN_DPAD_LEFT		0x222
-#define BTN_DPAD_RIGHT		0x223
-
-#define KEY_ALS_TOGGLE		0x230	/* Ambient light sensor */
-
-#define KEY_BUTTONCONFIG		0x240	/* AL Button Configuration */
-#define KEY_TASKMANAGER		0x241	/* AL Task/Project Manager */
-#define KEY_JOURNAL		0x242	/* AL Log/Journal/Timecard */
-#define KEY_CONTROLPANEL		0x243	/* AL Control Panel */
-#define KEY_APPSELECT		0x244	/* AL Select Task/Application */
-#define KEY_SCREENSAVER		0x245	/* AL Screen Saver */
-#define KEY_VOICECOMMAND		0x246	/* Listening Voice Command */
-
-#define KEY_BRIGHTNESS_MIN		0x250	/* Set Brightness to Minimum */
-#define KEY_BRIGHTNESS_MAX		0x251	/* Set Brightness to Maximum */
-
-#define KEY_KBDINPUTASSIST_PREV		0x260
-#define KEY_KBDINPUTASSIST_NEXT		0x261
-#define KEY_KBDINPUTASSIST_PREVGROUP		0x262
-#define KEY_KBDINPUTASSIST_NEXTGROUP		0x263
-#define KEY_KBDINPUTASSIST_ACCEPT		0x264
-#define KEY_KBDINPUTASSIST_CANCEL		0x265
-
-#define BTN_TRIGGER_HAPPY		0x2c0
-#define BTN_TRIGGER_HAPPY1		0x2c0
-#define BTN_TRIGGER_HAPPY2		0x2c1
-#define BTN_TRIGGER_HAPPY3		0x2c2
-#define BTN_TRIGGER_HAPPY4		0x2c3
-#define BTN_TRIGGER_HAPPY5		0x2c4
-#define BTN_TRIGGER_HAPPY6		0x2c5
-#define BTN_TRIGGER_HAPPY7		0x2c6
-#define BTN_TRIGGER_HAPPY8		0x2c7
-#define BTN_TRIGGER_HAPPY9		0x2c8
-#define BTN_TRIGGER_HAPPY10		0x2c9
-#define BTN_TRIGGER_HAPPY11		0x2ca
-#define BTN_TRIGGER_HAPPY12		0x2cb
-#define BTN_TRIGGER_HAPPY13		0x2cc
-#define BTN_TRIGGER_HAPPY14		0x2cd
-#define BTN_TRIGGER_HAPPY15		0x2ce
-#define BTN_TRIGGER_HAPPY16		0x2cf
-#define BTN_TRIGGER_HAPPY17		0x2d0
-#define BTN_TRIGGER_HAPPY18		0x2d1
-#define BTN_TRIGGER_HAPPY19		0x2d2
-#define BTN_TRIGGER_HAPPY20		0x2d3
-#define BTN_TRIGGER_HAPPY21		0x2d4
-#define BTN_TRIGGER_HAPPY22		0x2d5
-#define BTN_TRIGGER_HAPPY23		0x2d6
-#define BTN_TRIGGER_HAPPY24		0x2d7
-#define BTN_TRIGGER_HAPPY25		0x2d8
-#define BTN_TRIGGER_HAPPY26		0x2d9
-#define BTN_TRIGGER_HAPPY27		0x2da
-#define BTN_TRIGGER_HAPPY28		0x2db
-#define BTN_TRIGGER_HAPPY29		0x2dc
-#define BTN_TRIGGER_HAPPY30		0x2dd
-#define BTN_TRIGGER_HAPPY31		0x2de
-#define BTN_TRIGGER_HAPPY32		0x2df
-#define BTN_TRIGGER_HAPPY33		0x2e0
-#define BTN_TRIGGER_HAPPY34		0x2e1
-#define BTN_TRIGGER_HAPPY35		0x2e2
-#define BTN_TRIGGER_HAPPY36		0x2e3
-#define BTN_TRIGGER_HAPPY37		0x2e4
-#define BTN_TRIGGER_HAPPY38		0x2e5
-#define BTN_TRIGGER_HAPPY39		0x2e6
-#define BTN_TRIGGER_HAPPY40		0x2e7
-
-/* We avoid low common keys in module aliases so they don't get huge. */
-#define KEY_MIN_INTERESTING	KEY_MUTE
-#define KEY_MAX			0x2ff
-#define KEY_CNT			(KEY_MAX+1)
-
-/*
- * Relative axes
- */
-
-#define REL_X			0x00
-#define REL_Y			0x01
-#define REL_Z			0x02
-#define REL_RX			0x03
-#define REL_RY			0x04
-#define REL_RZ			0x05
-#define REL_HWHEEL		0x06
-#define REL_DIAL		0x07
-#define REL_WHEEL		0x08
-#define REL_MISC		0x09
-#define REL_MAX			0x0f
-#define REL_CNT			(REL_MAX+1)
-
-/*
- * Absolute axes
- */
-
-#define ABS_X			0x00
-#define ABS_Y			0x01
-#define ABS_Z			0x02
-#define ABS_RX			0x03
-#define ABS_RY			0x04
-#define ABS_RZ			0x05
-#define ABS_THROTTLE		0x06
-#define ABS_RUDDER		0x07
-#define ABS_WHEEL		0x08
-#define ABS_GAS			0x09
-#define ABS_BRAKE		0x0a
-#define ABS_HAT0X		0x10
-#define ABS_HAT0Y		0x11
-#define ABS_HAT1X		0x12
-#define ABS_HAT1Y		0x13
-#define ABS_HAT2X		0x14
-#define ABS_HAT2Y		0x15
-#define ABS_HAT3X		0x16
-#define ABS_HAT3Y		0x17
-#define ABS_PRESSURE		0x18
-#define ABS_DISTANCE		0x19
-#define ABS_TILT_X		0x1a
-#define ABS_TILT_Y		0x1b
-#define ABS_TOOL_WIDTH		0x1c
-
-#define ABS_VOLUME		0x20
-
-#define ABS_MISC		0x28
-
-#define ABS_MT_SLOT		0x2f	/* MT slot being modified */
-#define ABS_MT_TOUCH_MAJOR	0x30	/* Major axis of touching ellipse */
-#define ABS_MT_TOUCH_MINOR	0x31	/* Minor axis (omit if circular) */
-#define ABS_MT_WIDTH_MAJOR	0x32	/* Major axis of approaching ellipse */
-#define ABS_MT_WIDTH_MINOR	0x33	/* Minor axis (omit if circular) */
-#define ABS_MT_ORIENTATION	0x34	/* Ellipse orientation */
-#define ABS_MT_POSITION_X	0x35	/* Center X touch position */
-#define ABS_MT_POSITION_Y	0x36	/* Center Y touch position */
-#define ABS_MT_TOOL_TYPE	0x37	/* Type of touching device */
-#define ABS_MT_BLOB_ID		0x38	/* Group a set of packets as a blob */
-#define ABS_MT_TRACKING_ID	0x39	/* Unique ID of initiated contact */
-#define ABS_MT_PRESSURE		0x3a	/* Pressure on contact area */
-#define ABS_MT_DISTANCE		0x3b	/* Contact hover distance */
-#define ABS_MT_TOOL_X		0x3c	/* Center X tool position */
-#define ABS_MT_TOOL_Y		0x3d	/* Center Y tool position */
-
-
-#define ABS_MAX			0x3f
-#define ABS_CNT			(ABS_MAX+1)
-
-/*
- * Switch events
- */
-
-#define SW_LID			0x00  /* set = lid shut */
-#define SW_TABLET_MODE		0x01  /* set = tablet mode */
-#define SW_HEADPHONE_INSERT	0x02  /* set = inserted */
-#define SW_RFKILL_ALL		0x03  /* rfkill master switch, type "any"
-					 set = radio enabled */
-#define SW_RADIO		SW_RFKILL_ALL	/* deprecated */
-#define SW_MICROPHONE_INSERT	0x04  /* set = inserted */
-#define SW_DOCK			0x05  /* set = plugged into dock */
-#define SW_LINEOUT_INSERT	0x06  /* set = inserted */
-#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
-#define SW_VIDEOOUT_INSERT	0x08  /* set = inserted */
-#define SW_CAMERA_LENS_COVER	0x09  /* set = lens covered */
-#define SW_KEYPAD_SLIDE		0x0a  /* set = keypad slide out */
-#define SW_FRONT_PROXIMITY	0x0b  /* set = front proximity sensor active */
-#define SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
-#define SW_LINEIN_INSERT	0x0d  /* set = inserted */
-#define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
-#define SW_MAX			0x0f
-#define SW_CNT			(SW_MAX+1)
-
-/*
- * Misc events
- */
-
-#define MSC_SERIAL		0x00
-#define MSC_PULSELED		0x01
-#define MSC_GESTURE		0x02
-#define MSC_RAW			0x03
-#define MSC_SCAN		0x04
-#define MSC_TIMESTAMP		0x05
-#define MSC_MAX			0x07
-#define MSC_CNT			(MSC_MAX+1)
-
-/*
- * LEDs
- */
-
-#define LED_NUML		0x00
-#define LED_CAPSL		0x01
-#define LED_SCROLLL		0x02
-#define LED_COMPOSE		0x03
-#define LED_KANA		0x04
-#define LED_SLEEP		0x05
-#define LED_SUSPEND		0x06
-#define LED_MUTE		0x07
-#define LED_MISC		0x08
-#define LED_MAIL		0x09
-#define LED_CHARGING		0x0a
-#define LED_MAX			0x0f
-#define LED_CNT			(LED_MAX+1)
-
-/*
- * Autorepeat values
- */
-
-#define REP_DELAY		0x00
-#define REP_PERIOD		0x01
-#define REP_MAX			0x01
-#define REP_CNT			(REP_MAX+1)
-
-/*
- * Sounds
- */
-
-#define SND_CLICK		0x00
-#define SND_BELL		0x01
-#define SND_TONE		0x02
-#define SND_MAX			0x07
-#define SND_CNT			(SND_MAX+1)
-
-#endif
diff --git a/openflow/usr/include/linux/input.h b/openflow/usr/include/linux/input.h
deleted file mode 100644
index 577f4b6..0000000
--- a/openflow/usr/include/linux/input.h
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright (c) 1999-2002 Vojtech Pavlik
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-#ifndef _INPUT_H
-#define _INPUT_H
-
-
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <linux/types.h>
-
-#include "input-event-codes.h"
-
-/*
- * The event structure itself
- */
-
-struct input_event {
-	struct timeval time;
-	__u16 type;
-	__u16 code;
-	__s32 value;
-};
-
-/*
- * Protocol version.
- */
-
-#define EV_VERSION		0x010001
-
-/*
- * IOCTLs (0x00 - 0x7f)
- */
-
-struct input_id {
-	__u16 bustype;
-	__u16 vendor;
-	__u16 product;
-	__u16 version;
-};
-
-/**
- * struct input_absinfo - used by EVIOCGABS/EVIOCSABS ioctls
- * @value: latest reported value for the axis.
- * @minimum: specifies minimum value for the axis.
- * @maximum: specifies maximum value for the axis.
- * @fuzz: specifies fuzz value that is used to filter noise from
- *	the event stream.
- * @flat: values that are within this value will be discarded by
- *	joydev interface and reported as 0 instead.
- * @resolution: specifies resolution for the values reported for
- *	the axis.
- *
- * Note that input core does not clamp reported values to the
- * [minimum, maximum] limits, such task is left to userspace.
- *
- * Resolution for main axes (ABS_X, ABS_Y, ABS_Z) is reported in
- * units per millimeter (units/mm), resolution for rotational axes
- * (ABS_RX, ABS_RY, ABS_RZ) is reported in units per radian.
- */
-struct input_absinfo {
-	__s32 value;
-	__s32 minimum;
-	__s32 maximum;
-	__s32 fuzz;
-	__s32 flat;
-	__s32 resolution;
-};
-
-/**
- * struct input_keymap_entry - used by EVIOCGKEYCODE/EVIOCSKEYCODE ioctls
- * @scancode: scancode represented in machine-endian form.
- * @len: length of the scancode that resides in @scancode buffer.
- * @index: index in the keymap, may be used instead of scancode
- * @flags: allows to specify how kernel should handle the request. For
- *	example, setting INPUT_KEYMAP_BY_INDEX flag indicates that kernel
- *	should perform lookup in keymap by @index instead of @scancode
- * @keycode: key code assigned to this scancode
- *
- * The structure is used to retrieve and modify keymap data. Users have
- * option of performing lookup either by @scancode itself or by @index
- * in keymap entry. EVIOCGKEYCODE will also return scancode or index
- * (depending on which element was used to perform lookup).
- */
-struct input_keymap_entry {
-#define INPUT_KEYMAP_BY_INDEX	(1 << 0)
-	__u8  flags;
-	__u8  len;
-	__u16 index;
-	__u32 keycode;
-	__u8  scancode[32];
-};
-
-struct input_mask {
-	__u32 type;
-	__u32 codes_size;
-	__u64 codes_ptr;
-};
-
-#define EVIOCGVERSION		_IOR('E', 0x01, int)			/* get driver version */
-#define EVIOCGID		_IOR('E', 0x02, struct input_id)	/* get device ID */
-#define EVIOCGREP		_IOR('E', 0x03, unsigned int[2])	/* get repeat settings */
-#define EVIOCSREP		_IOW('E', 0x03, unsigned int[2])	/* set repeat settings */
-
-#define EVIOCGKEYCODE		_IOR('E', 0x04, unsigned int[2])        /* get keycode */
-#define EVIOCGKEYCODE_V2	_IOR('E', 0x04, struct input_keymap_entry)
-#define EVIOCSKEYCODE		_IOW('E', 0x04, unsigned int[2])        /* set keycode */
-#define EVIOCSKEYCODE_V2	_IOW('E', 0x04, struct input_keymap_entry)
-
-#define EVIOCGNAME(len)		_IOC(_IOC_READ, 'E', 0x06, len)		/* get device name */
-#define EVIOCGPHYS(len)		_IOC(_IOC_READ, 'E', 0x07, len)		/* get physical location */
-#define EVIOCGUNIQ(len)		_IOC(_IOC_READ, 'E', 0x08, len)		/* get unique identifier */
-#define EVIOCGPROP(len)		_IOC(_IOC_READ, 'E', 0x09, len)		/* get device properties */
-
-/**
- * EVIOCGMTSLOTS(len) - get MT slot values
- * @len: size of the data buffer in bytes
- *
- * The ioctl buffer argument should be binary equivalent to
- *
- * struct input_mt_request_layout {
- *	__u32 code;
- *	__s32 values[num_slots];
- * };
- *
- * where num_slots is the (arbitrary) number of MT slots to extract.
- *
- * The ioctl size argument (len) is the size of the buffer, which
- * should satisfy len = (num_slots + 1) * sizeof(__s32).  If len is
- * too small to fit all available slots, the first num_slots are
- * returned.
- *
- * Before the call, code is set to the wanted ABS_MT event type. On
- * return, values[] is filled with the slot values for the specified
- * ABS_MT code.
- *
- * If the request code is not an ABS_MT value, -EINVAL is returned.
- */
-#define EVIOCGMTSLOTS(len)	_IOC(_IOC_READ, 'E', 0x0a, len)
-
-#define EVIOCGKEY(len)		_IOC(_IOC_READ, 'E', 0x18, len)		/* get global key state */
-#define EVIOCGLED(len)		_IOC(_IOC_READ, 'E', 0x19, len)		/* get all LEDs */
-#define EVIOCGSND(len)		_IOC(_IOC_READ, 'E', 0x1a, len)		/* get all sounds status */
-#define EVIOCGSW(len)		_IOC(_IOC_READ, 'E', 0x1b, len)		/* get all switch states */
-
-#define EVIOCGBIT(ev,len)	_IOC(_IOC_READ, 'E', 0x20 + (ev), len)	/* get event bits */
-#define EVIOCGABS(abs)		_IOR('E', 0x40 + (abs), struct input_absinfo)	/* get abs value/limits */
-#define EVIOCSABS(abs)		_IOW('E', 0xc0 + (abs), struct input_absinfo)	/* set abs value/limits */
-
-#define EVIOCSFF		_IOW('E', 0x80, struct ff_effect)	/* send a force effect to a force feedback device */
-#define EVIOCRMFF		_IOW('E', 0x81, int)			/* Erase a force effect */
-#define EVIOCGEFFECTS		_IOR('E', 0x84, int)			/* Report number of effects playable at the same time */
-
-#define EVIOCGRAB		_IOW('E', 0x90, int)			/* Grab/Release device */
-#define EVIOCREVOKE		_IOW('E', 0x91, int)			/* Revoke device access */
-
-/**
- * EVIOCGMASK - Retrieve current event mask
- *
- * This ioctl allows user to retrieve the current event mask for specific
- * event type. The argument must be of type "struct input_mask" and
- * specifies the event type to query, the address of the receive buffer and
- * the size of the receive buffer.
- *
- * The event mask is a per-client mask that specifies which events are
- * forwarded to the client. Each event code is represented by a single bit
- * in the event mask. If the bit is set, the event is passed to the client
- * normally. Otherwise, the event is filtered and will never be queued on
- * the client's receive buffer.
- *
- * Event masks do not affect global state of the input device. They only
- * affect the file descriptor they are applied to.
- *
- * The default event mask for a client has all bits set, i.e. all events
- * are forwarded to the client. If the kernel is queried for an unknown
- * event type or if the receive buffer is larger than the number of
- * event codes known to the kernel, the kernel returns all zeroes for those
- * codes.
- *
- * At maximum, codes_size bytes are copied.
- *
- * This ioctl may fail with ENODEV in case the file is revoked, EFAULT
- * if the receive-buffer points to invalid memory, or EINVAL if the kernel
- * does not implement the ioctl.
- */
-#define EVIOCGMASK		_IOR('E', 0x92, struct input_mask)	/* Get event-masks */
-
-/**
- * EVIOCSMASK - Set event mask
- *
- * This ioctl is the counterpart to EVIOCGMASK. Instead of receiving the
- * current event mask, this changes the client's event mask for a specific
- * type.  See EVIOCGMASK for a description of event-masks and the
- * argument-type.
- *
- * This ioctl provides full forward compatibility. If the passed event type
- * is unknown to the kernel, or if the number of event codes specified in
- * the mask is bigger than what is known to the kernel, the ioctl is still
- * accepted and applied. However, any unknown codes are left untouched and
- * stay cleared. That means, the kernel always filters unknown codes
- * regardless of what the client requests.  If the new mask doesn't cover
- * all known event-codes, all remaining codes are automatically cleared and
- * thus filtered.
- *
- * This ioctl may fail with ENODEV in case the file is revoked. EFAULT is
- * returned if the receive-buffer points to invalid memory. EINVAL is returned
- * if the kernel does not implement the ioctl.
- */
-#define EVIOCSMASK		_IOW('E', 0x93, struct input_mask)	/* Set event-masks */
-
-#define EVIOCSCLOCKID		_IOW('E', 0xa0, int)			/* Set clockid to be used for timestamps */
-
-/*
- * IDs.
- */
-
-#define ID_BUS			0
-#define ID_VENDOR		1
-#define ID_PRODUCT		2
-#define ID_VERSION		3
-
-#define BUS_PCI			0x01
-#define BUS_ISAPNP		0x02
-#define BUS_USB			0x03
-#define BUS_HIL			0x04
-#define BUS_BLUETOOTH		0x05
-#define BUS_VIRTUAL		0x06
-
-#define BUS_ISA			0x10
-#define BUS_I8042		0x11
-#define BUS_XTKBD		0x12
-#define BUS_RS232		0x13
-#define BUS_GAMEPORT		0x14
-#define BUS_PARPORT		0x15
-#define BUS_AMIGA		0x16
-#define BUS_ADB			0x17
-#define BUS_I2C			0x18
-#define BUS_HOST		0x19
-#define BUS_GSC			0x1A
-#define BUS_ATARI		0x1B
-#define BUS_SPI			0x1C
-
-/*
- * MT_TOOL types
- */
-#define MT_TOOL_FINGER		0
-#define MT_TOOL_PEN		1
-#define MT_TOOL_PALM		2
-#define MT_TOOL_MAX		2
-
-/*
- * Values describing the status of a force-feedback effect
- */
-#define FF_STATUS_STOPPED	0x00
-#define FF_STATUS_PLAYING	0x01
-#define FF_STATUS_MAX		0x01
-
-/*
- * Structures used in ioctls to upload effects to a device
- * They are pieces of a bigger structure (called ff_effect)
- */
-
-/*
- * All duration values are expressed in ms. Values above 32767 ms (0x7fff)
- * should not be used and have unspecified results.
- */
-
-/**
- * struct ff_replay - defines scheduling of the force-feedback effect
- * @length: duration of the effect
- * @delay: delay before effect should start playing
- */
-struct ff_replay {
-	__u16 length;
-	__u16 delay;
-};
-
-/**
- * struct ff_trigger - defines what triggers the force-feedback effect
- * @button: number of the button triggering the effect
- * @interval: controls how soon the effect can be re-triggered
- */
-struct ff_trigger {
-	__u16 button;
-	__u16 interval;
-};
-
-/**
- * struct ff_envelope - generic force-feedback effect envelope
- * @attack_length: duration of the attack (ms)
- * @attack_level: level at the beginning of the attack
- * @fade_length: duration of fade (ms)
- * @fade_level: level at the end of fade
- *
- * The @attack_level and @fade_level are absolute values; when applying
- * envelope force-feedback core will convert to positive/negative
- * value based on polarity of the default level of the effect.
- * Valid range for the attack and fade levels is 0x0000 - 0x7fff
- */
-struct ff_envelope {
-	__u16 attack_length;
-	__u16 attack_level;
-	__u16 fade_length;
-	__u16 fade_level;
-};
-
-/**
- * struct ff_constant_effect - defines parameters of a constant force-feedback effect
- * @level: strength of the effect; may be negative
- * @envelope: envelope data
- */
-struct ff_constant_effect {
-	__s16 level;
-	struct ff_envelope envelope;
-};
-
-/**
- * struct ff_ramp_effect - defines parameters of a ramp force-feedback effect
- * @start_level: beginning strength of the effect; may be negative
- * @end_level: final strength of the effect; may be negative
- * @envelope: envelope data
- */
-struct ff_ramp_effect {
-	__s16 start_level;
-	__s16 end_level;
-	struct ff_envelope envelope;
-};
-
-/**
- * struct ff_condition_effect - defines a spring or friction force-feedback effect
- * @right_saturation: maximum level when joystick moved all way to the right
- * @left_saturation: same for the left side
- * @right_coeff: controls how fast the force grows when the joystick moves
- *	to the right
- * @left_coeff: same for the left side
- * @deadband: size of the dead zone, where no force is produced
- * @center: position of the dead zone
- */
-struct ff_condition_effect {
-	__u16 right_saturation;
-	__u16 left_saturation;
-
-	__s16 right_coeff;
-	__s16 left_coeff;
-
-	__u16 deadband;
-	__s16 center;
-};
-
-/**
- * struct ff_periodic_effect - defines parameters of a periodic force-feedback effect
- * @waveform: kind of the effect (wave)
- * @period: period of the wave (ms)
- * @magnitude: peak value
- * @offset: mean value of the wave (roughly)
- * @phase: 'horizontal' shift
- * @envelope: envelope data
- * @custom_len: number of samples (FF_CUSTOM only)
- * @custom_data: buffer of samples (FF_CUSTOM only)
- *
- * Known waveforms - FF_SQUARE, FF_TRIANGLE, FF_SINE, FF_SAW_UP,
- * FF_SAW_DOWN, FF_CUSTOM. The exact syntax FF_CUSTOM is undefined
- * for the time being as no driver supports it yet.
- *
- * Note: the data pointed by custom_data is copied by the driver.
- * You can therefore dispose of the memory after the upload/update.
- */
-struct ff_periodic_effect {
-	__u16 waveform;
-	__u16 period;
-	__s16 magnitude;
-	__s16 offset;
-	__u16 phase;
-
-	struct ff_envelope envelope;
-
-	__u32 custom_len;
-	__s16 *custom_data;
-};
-
-/**
- * struct ff_rumble_effect - defines parameters of a periodic force-feedback effect
- * @strong_magnitude: magnitude of the heavy motor
- * @weak_magnitude: magnitude of the light one
- *
- * Some rumble pads have two motors of different weight. Strong_magnitude
- * represents the magnitude of the vibration generated by the heavy one.
- */
-struct ff_rumble_effect {
-	__u16 strong_magnitude;
-	__u16 weak_magnitude;
-};
-
-/**
- * struct ff_effect - defines force feedback effect
- * @type: type of the effect (FF_CONSTANT, FF_PERIODIC, FF_RAMP, FF_SPRING,
- *	FF_FRICTION, FF_DAMPER, FF_RUMBLE, FF_INERTIA, or FF_CUSTOM)
- * @id: an unique id assigned to an effect
- * @direction: direction of the effect
- * @trigger: trigger conditions (struct ff_trigger)
- * @replay: scheduling of the effect (struct ff_replay)
- * @u: effect-specific structure (one of ff_constant_effect, ff_ramp_effect,
- *	ff_periodic_effect, ff_condition_effect, ff_rumble_effect) further
- *	defining effect parameters
- *
- * This structure is sent through ioctl from the application to the driver.
- * To create a new effect application should set its @id to -1; the kernel
- * will return assigned @id which can later be used to update or delete
- * this effect.
- *
- * Direction of the effect is encoded as follows:
- *	0 deg -> 0x0000 (down)
- *	90 deg -> 0x4000 (left)
- *	180 deg -> 0x8000 (up)
- *	270 deg -> 0xC000 (right)
- */
-struct ff_effect {
-	__u16 type;
-	__s16 id;
-	__u16 direction;
-	struct ff_trigger trigger;
-	struct ff_replay replay;
-
-	union {
-		struct ff_constant_effect constant;
-		struct ff_ramp_effect ramp;
-		struct ff_periodic_effect periodic;
-		struct ff_condition_effect condition[2]; /* One for each axis */
-		struct ff_rumble_effect rumble;
-	} u;
-};
-
-/*
- * Force feedback effect types
- */
-
-#define FF_RUMBLE	0x50
-#define FF_PERIODIC	0x51
-#define FF_CONSTANT	0x52
-#define FF_SPRING	0x53
-#define FF_FRICTION	0x54
-#define FF_DAMPER	0x55
-#define FF_INERTIA	0x56
-#define FF_RAMP		0x57
-
-#define FF_EFFECT_MIN	FF_RUMBLE
-#define FF_EFFECT_MAX	FF_RAMP
-
-/*
- * Force feedback periodic effect types
- */
-
-#define FF_SQUARE	0x58
-#define FF_TRIANGLE	0x59
-#define FF_SINE		0x5a
-#define FF_SAW_UP	0x5b
-#define FF_SAW_DOWN	0x5c
-#define FF_CUSTOM	0x5d
-
-#define FF_WAVEFORM_MIN	FF_SQUARE
-#define FF_WAVEFORM_MAX	FF_CUSTOM
-
-/*
- * Set ff device properties
- */
-
-#define FF_GAIN		0x60
-#define FF_AUTOCENTER	0x61
-
-/*
- * ff->playback(effect_id = FF_GAIN) is the first effect_id to
- * cause a collision with another ff method, in this case ff->set_gain().
- * Therefore the greatest safe value for effect_id is FF_GAIN - 1,
- * and thus the total number of effects should never exceed FF_GAIN.
- */
-#define FF_MAX_EFFECTS	FF_GAIN
-
-#define FF_MAX		0x7f
-#define FF_CNT		(FF_MAX+1)
-
-#endif /* _INPUT_H */
diff --git a/openflow/usr/include/linux/ioctl.h b/openflow/usr/include/linux/ioctl.h
deleted file mode 100644
index aa91eb3..0000000
--- a/openflow/usr/include/linux/ioctl.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _LINUX_IOCTL_H
-#define _LINUX_IOCTL_H
-
-#include <asm/ioctl.h>
-
-#endif /* _LINUX_IOCTL_H */
-
diff --git a/openflow/usr/include/linux/ip.h b/openflow/usr/include/linux/ip.h
deleted file mode 100644
index adf7c12..0000000
--- a/openflow/usr/include/linux/ip.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Definitions for the IP protocol.
- *
- * Version:	@(#)ip.h	1.0.2	04/28/93
- *
- * Authors:	Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_IP_H
-#define _LINUX_IP_H
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-#define IPTOS_TOS_MASK		0x1E
-#define IPTOS_TOS(tos)		((tos)&IPTOS_TOS_MASK)
-#define	IPTOS_LOWDELAY		0x10
-#define	IPTOS_THROUGHPUT	0x08
-#define	IPTOS_RELIABILITY	0x04
-#define	IPTOS_MINCOST		0x02
-
-#define IPTOS_PREC_MASK		0xE0
-#define IPTOS_PREC(tos)		((tos)&IPTOS_PREC_MASK)
-#define IPTOS_PREC_NETCONTROL           0xe0
-#define IPTOS_PREC_INTERNETCONTROL      0xc0
-#define IPTOS_PREC_CRITIC_ECP           0xa0
-#define IPTOS_PREC_FLASHOVERRIDE        0x80
-#define IPTOS_PREC_FLASH                0x60
-#define IPTOS_PREC_IMMEDIATE            0x40
-#define IPTOS_PREC_PRIORITY             0x20
-#define IPTOS_PREC_ROUTINE              0x00
-
-
-/* IP options */
-#define IPOPT_COPY		0x80
-#define IPOPT_CLASS_MASK	0x60
-#define IPOPT_NUMBER_MASK	0x1f
-
-#define	IPOPT_COPIED(o)		((o)&IPOPT_COPY)
-#define	IPOPT_CLASS(o)		((o)&IPOPT_CLASS_MASK)
-#define	IPOPT_NUMBER(o)		((o)&IPOPT_NUMBER_MASK)
-
-#define	IPOPT_CONTROL		0x00
-#define	IPOPT_RESERVED1		0x20
-#define	IPOPT_MEASUREMENT	0x40
-#define	IPOPT_RESERVED2		0x60
-
-#define IPOPT_END	(0 |IPOPT_CONTROL)
-#define IPOPT_NOOP	(1 |IPOPT_CONTROL)
-#define IPOPT_SEC	(2 |IPOPT_CONTROL|IPOPT_COPY)
-#define IPOPT_LSRR	(3 |IPOPT_CONTROL|IPOPT_COPY)
-#define IPOPT_TIMESTAMP	(4 |IPOPT_MEASUREMENT)
-#define IPOPT_CIPSO	(6 |IPOPT_CONTROL|IPOPT_COPY)
-#define IPOPT_RR	(7 |IPOPT_CONTROL)
-#define IPOPT_SID	(8 |IPOPT_CONTROL|IPOPT_COPY)
-#define IPOPT_SSRR	(9 |IPOPT_CONTROL|IPOPT_COPY)
-#define IPOPT_RA	(20|IPOPT_CONTROL|IPOPT_COPY)
-
-#define IPVERSION	4
-#define MAXTTL		255
-#define IPDEFTTL	64
-
-#define IPOPT_OPTVAL 0
-#define IPOPT_OLEN   1
-#define IPOPT_OFFSET 2
-#define IPOPT_MINOFF 4
-#define MAX_IPOPTLEN 40
-#define IPOPT_NOP IPOPT_NOOP
-#define IPOPT_EOL IPOPT_END
-#define IPOPT_TS  IPOPT_TIMESTAMP
-
-#define	IPOPT_TS_TSONLY		0		/* timestamps only */
-#define	IPOPT_TS_TSANDADDR	1		/* timestamps and addresses */
-#define	IPOPT_TS_PRESPEC	3		/* specified modules only */
-
-#define IPV4_BEET_PHMAXLEN 8
-
-struct iphdr {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8	ihl:4,
-		version:4;
-#elif defined (__BIG_ENDIAN_BITFIELD)
-	__u8	version:4,
-  		ihl:4;
-#else
-#error	"Please fix <asm/byteorder.h>"
-#endif
-	__u8	tos;
-	__be16	tot_len;
-	__be16	id;
-	__be16	frag_off;
-	__u8	ttl;
-	__u8	protocol;
-	__sum16	check;
-	__be32	saddr;
-	__be32	daddr;
-	/*The options start here. */
-};
-
-
-struct ip_auth_hdr {
-	__u8  nexthdr;
-	__u8  hdrlen;		/* This one is measured in 32 bit units! */
-	__be16 reserved;
-	__be32 spi;
-	__be32 seq_no;		/* Sequence number */
-	__u8  auth_data[0];	/* Variable len but >=4. Mind the 64 bit alignment! */
-};
-
-struct ip_esp_hdr {
-	__be32 spi;
-	__be32 seq_no;		/* Sequence number */
-	__u8  enc_data[0];	/* Variable len but >=8. Mind the 64 bit alignment! */
-};
-
-struct ip_comp_hdr {
-	__u8 nexthdr;
-	__u8 flags;
-	__be16 cpi;
-};
-
-struct ip_beet_phdr {
-	__u8 nexthdr;
-	__u8 hdrlen;
-	__u8 padlen;
-	__u8 reserved;
-};
-
-/* index values for the variables in ipv4_devconf */
-enum
-{
-	IPV4_DEVCONF_FORWARDING=1,
-	IPV4_DEVCONF_MC_FORWARDING,
-	IPV4_DEVCONF_PROXY_ARP,
-	IPV4_DEVCONF_ACCEPT_REDIRECTS,
-	IPV4_DEVCONF_SECURE_REDIRECTS,
-	IPV4_DEVCONF_SEND_REDIRECTS,
-	IPV4_DEVCONF_SHARED_MEDIA,
-	IPV4_DEVCONF_RP_FILTER,
-	IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE,
-	IPV4_DEVCONF_BOOTP_RELAY,
-	IPV4_DEVCONF_LOG_MARTIANS,
-	IPV4_DEVCONF_TAG,
-	IPV4_DEVCONF_ARPFILTER,
-	IPV4_DEVCONF_MEDIUM_ID,
-	IPV4_DEVCONF_NOXFRM,
-	IPV4_DEVCONF_NOPOLICY,
-	IPV4_DEVCONF_FORCE_IGMP_VERSION,
-	IPV4_DEVCONF_ARP_ANNOUNCE,
-	IPV4_DEVCONF_ARP_IGNORE,
-	IPV4_DEVCONF_PROMOTE_SECONDARIES,
-	IPV4_DEVCONF_ARP_ACCEPT,
-	IPV4_DEVCONF_ARP_NOTIFY,
-	IPV4_DEVCONF_ACCEPT_LOCAL,
-	IPV4_DEVCONF_SRC_VMARK,
-	IPV4_DEVCONF_PROXY_ARP_PVLAN,
-	IPV4_DEVCONF_ROUTE_LOCALNET,
-	IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL,
-	IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL,
-	IPV4_DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN,
-	__IPV4_DEVCONF_MAX
-};
-
-#define IPV4_DEVCONF_MAX (__IPV4_DEVCONF_MAX - 1)
-
-#endif /* _LINUX_IP_H */
diff --git a/openflow/usr/include/linux/ip6_tunnel.h b/openflow/usr/include/linux/ip6_tunnel.h
deleted file mode 100644
index 48af63c..0000000
--- a/openflow/usr/include/linux/ip6_tunnel.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _IP6_TUNNEL_H
-#define _IP6_TUNNEL_H
-
-#include <linux/types.h>
-
-#define IPV6_TLV_TNL_ENCAP_LIMIT 4
-#define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4
-
-/* don't add encapsulation limit if one isn't present in inner packet */
-#define IP6_TNL_F_IGN_ENCAP_LIMIT 0x1
-/* copy the traffic class field from the inner packet */
-#define IP6_TNL_F_USE_ORIG_TCLASS 0x2
-/* copy the flowlabel from the inner packet */
-#define IP6_TNL_F_USE_ORIG_FLOWLABEL 0x4
-/* being used for Mobile IPv6 */
-#define IP6_TNL_F_MIP6_DEV 0x8
-/* copy DSCP from the outer packet */
-#define IP6_TNL_F_RCV_DSCP_COPY 0x10
-/* copy fwmark from inner packet */
-#define IP6_TNL_F_USE_ORIG_FWMARK 0x20
-
-struct ip6_tnl_parm {
-	char name[IFNAMSIZ];	/* name of tunnel device */
-	int link;		/* ifindex of underlying L2 interface */
-	__u8 proto;		/* tunnel protocol */
-	__u8 encap_limit;	/* encapsulation limit for tunnel */
-	__u8 hop_limit;		/* hop limit for tunnel */
-	__be32 flowinfo;	/* traffic class and flowlabel for tunnel */
-	__u32 flags;		/* tunnel flags */
-	struct in6_addr laddr;	/* local tunnel end-point address */
-	struct in6_addr raddr;	/* remote tunnel end-point address */
-};
-
-struct ip6_tnl_parm2 {
-	char name[IFNAMSIZ];	/* name of tunnel device */
-	int link;		/* ifindex of underlying L2 interface */
-	__u8 proto;		/* tunnel protocol */
-	__u8 encap_limit;	/* encapsulation limit for tunnel */
-	__u8 hop_limit;		/* hop limit for tunnel */
-	__be32 flowinfo;	/* traffic class and flowlabel for tunnel */
-	__u32 flags;		/* tunnel flags */
-	struct in6_addr laddr;	/* local tunnel end-point address */
-	struct in6_addr raddr;	/* remote tunnel end-point address */
-
-	__be16			i_flags;
-	__be16			o_flags;
-	__be32			i_key;
-	__be32			o_key;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/ip_vs.h b/openflow/usr/include/linux/ip_vs.h
deleted file mode 100644
index 391395c..0000000
--- a/openflow/usr/include/linux/ip_vs.h
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- *      IP Virtual Server
- *      data structure and functionality definitions
- */
-
-#ifndef _IP_VS_H
-#define _IP_VS_H
-
-#include <linux/types.h>	/* For __beXX types in userland */
-
-#define IP_VS_VERSION_CODE	0x010201
-#define NVERSION(version)			\
-	(version >> 16) & 0xFF,			\
-	(version >> 8) & 0xFF,			\
-	version & 0xFF
-
-/*
- *      Virtual Service Flags
- */
-#define IP_VS_SVC_F_PERSISTENT	0x0001		/* persistent port */
-#define IP_VS_SVC_F_HASHED	0x0002		/* hashed entry */
-#define IP_VS_SVC_F_ONEPACKET	0x0004		/* one-packet scheduling */
-#define IP_VS_SVC_F_SCHED1	0x0008		/* scheduler flag 1 */
-#define IP_VS_SVC_F_SCHED2	0x0010		/* scheduler flag 2 */
-#define IP_VS_SVC_F_SCHED3	0x0020		/* scheduler flag 3 */
-
-#define IP_VS_SVC_F_SCHED_SH_FALLBACK	IP_VS_SVC_F_SCHED1 /* SH fallback */
-#define IP_VS_SVC_F_SCHED_SH_PORT	IP_VS_SVC_F_SCHED2 /* SH use port */
-
-/*
- *      Destination Server Flags
- */
-#define IP_VS_DEST_F_AVAILABLE	0x0001		/* server is available */
-#define IP_VS_DEST_F_OVERLOAD	0x0002		/* server is overloaded */
-
-/*
- *      IPVS sync daemon states
- */
-#define IP_VS_STATE_NONE	0x0000		/* daemon is stopped */
-#define IP_VS_STATE_MASTER	0x0001		/* started as master */
-#define IP_VS_STATE_BACKUP	0x0002		/* started as backup */
-
-/*
- *      IPVS socket options
- */
-#define IP_VS_BASE_CTL		(64+1024+64)		/* base */
-
-#define IP_VS_SO_SET_NONE	IP_VS_BASE_CTL		/* just peek */
-#define IP_VS_SO_SET_INSERT	(IP_VS_BASE_CTL+1)
-#define IP_VS_SO_SET_ADD	(IP_VS_BASE_CTL+2)
-#define IP_VS_SO_SET_EDIT	(IP_VS_BASE_CTL+3)
-#define IP_VS_SO_SET_DEL	(IP_VS_BASE_CTL+4)
-#define IP_VS_SO_SET_FLUSH	(IP_VS_BASE_CTL+5)
-#define IP_VS_SO_SET_LIST	(IP_VS_BASE_CTL+6)
-#define IP_VS_SO_SET_ADDDEST	(IP_VS_BASE_CTL+7)
-#define IP_VS_SO_SET_DELDEST	(IP_VS_BASE_CTL+8)
-#define IP_VS_SO_SET_EDITDEST	(IP_VS_BASE_CTL+9)
-#define IP_VS_SO_SET_TIMEOUT	(IP_VS_BASE_CTL+10)
-#define IP_VS_SO_SET_STARTDAEMON (IP_VS_BASE_CTL+11)
-#define IP_VS_SO_SET_STOPDAEMON (IP_VS_BASE_CTL+12)
-#define IP_VS_SO_SET_RESTORE    (IP_VS_BASE_CTL+13)
-#define IP_VS_SO_SET_SAVE       (IP_VS_BASE_CTL+14)
-#define IP_VS_SO_SET_ZERO	(IP_VS_BASE_CTL+15)
-#define IP_VS_SO_SET_MAX	IP_VS_SO_SET_ZERO
-
-#define IP_VS_SO_GET_VERSION	IP_VS_BASE_CTL
-#define IP_VS_SO_GET_INFO	(IP_VS_BASE_CTL+1)
-#define IP_VS_SO_GET_SERVICES	(IP_VS_BASE_CTL+2)
-#define IP_VS_SO_GET_SERVICE	(IP_VS_BASE_CTL+3)
-#define IP_VS_SO_GET_DESTS	(IP_VS_BASE_CTL+4)
-#define IP_VS_SO_GET_DEST	(IP_VS_BASE_CTL+5)	/* not used now */
-#define IP_VS_SO_GET_TIMEOUT	(IP_VS_BASE_CTL+6)
-#define IP_VS_SO_GET_DAEMON	(IP_VS_BASE_CTL+7)
-#define IP_VS_SO_GET_MAX	IP_VS_SO_GET_DAEMON
-
-
-/*
- *      IPVS Connection Flags
- *      Only flags 0..15 are sent to backup server
- */
-#define IP_VS_CONN_F_FWD_MASK	0x0007		/* mask for the fwd methods */
-#define IP_VS_CONN_F_MASQ	0x0000		/* masquerading/NAT */
-#define IP_VS_CONN_F_LOCALNODE	0x0001		/* local node */
-#define IP_VS_CONN_F_TUNNEL	0x0002		/* tunneling */
-#define IP_VS_CONN_F_DROUTE	0x0003		/* direct routing */
-#define IP_VS_CONN_F_BYPASS	0x0004		/* cache bypass */
-#define IP_VS_CONN_F_SYNC	0x0020		/* entry created by sync */
-#define IP_VS_CONN_F_HASHED	0x0040		/* hashed entry */
-#define IP_VS_CONN_F_NOOUTPUT	0x0080		/* no output packets */
-#define IP_VS_CONN_F_INACTIVE	0x0100		/* not established */
-#define IP_VS_CONN_F_OUT_SEQ	0x0200		/* must do output seq adjust */
-#define IP_VS_CONN_F_IN_SEQ	0x0400		/* must do input seq adjust */
-#define IP_VS_CONN_F_SEQ_MASK	0x0600		/* in/out sequence mask */
-#define IP_VS_CONN_F_NO_CPORT	0x0800		/* no client port set yet */
-#define IP_VS_CONN_F_TEMPLATE	0x1000		/* template, not connection */
-#define IP_VS_CONN_F_ONE_PACKET	0x2000		/* forward only one packet */
-
-/* Initial bits allowed in backup server */
-#define IP_VS_CONN_F_BACKUP_MASK (IP_VS_CONN_F_FWD_MASK | \
-				  IP_VS_CONN_F_NOOUTPUT | \
-				  IP_VS_CONN_F_INACTIVE | \
-				  IP_VS_CONN_F_SEQ_MASK | \
-				  IP_VS_CONN_F_NO_CPORT | \
-				  IP_VS_CONN_F_TEMPLATE \
-				 )
-
-/* Bits allowed to update in backup server */
-#define IP_VS_CONN_F_BACKUP_UPD_MASK (IP_VS_CONN_F_INACTIVE | \
-				      IP_VS_CONN_F_SEQ_MASK)
-
-/* Flags that are not sent to backup server start from bit 16 */
-#define IP_VS_CONN_F_NFCT	(1 << 16)	/* use netfilter conntrack */
-
-/* Connection flags from destination that can be changed by user space */
-#define IP_VS_CONN_F_DEST_MASK (IP_VS_CONN_F_FWD_MASK | \
-				IP_VS_CONN_F_ONE_PACKET | \
-				IP_VS_CONN_F_NFCT | \
-				0)
-
-#define IP_VS_SCHEDNAME_MAXLEN	16
-#define IP_VS_PENAME_MAXLEN	16
-#define IP_VS_IFNAME_MAXLEN	16
-
-#define IP_VS_PEDATA_MAXLEN     255
-
-/*
- *	The struct ip_vs_service_user and struct ip_vs_dest_user are
- *	used to set IPVS rules through setsockopt.
- */
-struct ip_vs_service_user {
-	/* virtual service addresses */
-	__u16		protocol;
-	__be32			addr;		/* virtual ip address */
-	__be16			port;
-	__u32		fwmark;		/* firwall mark of service */
-
-	/* virtual service options */
-	char			sched_name[IP_VS_SCHEDNAME_MAXLEN];
-	unsigned int		flags;		/* virtual service flags */
-	unsigned int		timeout;	/* persistent timeout in sec */
-	__be32			netmask;	/* persistent netmask */
-};
-
-
-struct ip_vs_dest_user {
-	/* destination server address */
-	__be32			addr;
-	__be16			port;
-
-	/* real server options */
-	unsigned int		conn_flags;	/* connection flags */
-	int			weight;		/* destination weight */
-
-	/* thresholds for active connections */
-	__u32		u_threshold;	/* upper threshold */
-	__u32		l_threshold;	/* lower threshold */
-};
-
-
-/*
- *	IPVS statistics object (for user space)
- */
-struct ip_vs_stats_user {
-	__u32                   conns;          /* connections scheduled */
-	__u32                   inpkts;         /* incoming packets */
-	__u32                   outpkts;        /* outgoing packets */
-	__u64                   inbytes;        /* incoming bytes */
-	__u64                   outbytes;       /* outgoing bytes */
-
-	__u32			cps;		/* current connection rate */
-	__u32			inpps;		/* current in packet rate */
-	__u32			outpps;		/* current out packet rate */
-	__u32			inbps;		/* current in byte rate */
-	__u32			outbps;		/* current out byte rate */
-};
-
-
-/* The argument to IP_VS_SO_GET_INFO */
-struct ip_vs_getinfo {
-	/* version number */
-	unsigned int		version;
-
-	/* size of connection hash table */
-	unsigned int		size;
-
-	/* number of virtual services */
-	unsigned int		num_services;
-};
-
-
-/* The argument to IP_VS_SO_GET_SERVICE */
-struct ip_vs_service_entry {
-	/* which service: user fills in these */
-	__u16		protocol;
-	__be32			addr;		/* virtual address */
-	__be16			port;
-	__u32		fwmark;		/* firwall mark of service */
-
-	/* service options */
-	char			sched_name[IP_VS_SCHEDNAME_MAXLEN];
-	unsigned int		flags;          /* virtual service flags */
-	unsigned int		timeout;	/* persistent timeout */
-	__be32			netmask;	/* persistent netmask */
-
-	/* number of real servers */
-	unsigned int		num_dests;
-
-	/* statistics */
-	struct ip_vs_stats_user stats;
-};
-
-
-struct ip_vs_dest_entry {
-	__be32			addr;		/* destination address */
-	__be16			port;
-	unsigned int		conn_flags;	/* connection flags */
-	int			weight;		/* destination weight */
-
-	__u32		u_threshold;	/* upper threshold */
-	__u32		l_threshold;	/* lower threshold */
-
-	__u32		activeconns;	/* active connections */
-	__u32		inactconns;	/* inactive connections */
-	__u32		persistconns;	/* persistent connections */
-
-	/* statistics */
-	struct ip_vs_stats_user stats;
-};
-
-
-/* The argument to IP_VS_SO_GET_DESTS */
-struct ip_vs_get_dests {
-	/* which service: user fills in these */
-	__u16		protocol;
-	__be32			addr;		/* virtual address */
-	__be16			port;
-	__u32		fwmark;		/* firwall mark of service */
-
-	/* number of real servers */
-	unsigned int		num_dests;
-
-	/* the real servers */
-	struct ip_vs_dest_entry	entrytable[0];
-};
-
-
-/* The argument to IP_VS_SO_GET_SERVICES */
-struct ip_vs_get_services {
-	/* number of virtual services */
-	unsigned int		num_services;
-
-	/* service table */
-	struct ip_vs_service_entry entrytable[0];
-};
-
-
-/* The argument to IP_VS_SO_GET_TIMEOUT */
-struct ip_vs_timeout_user {
-	int			tcp_timeout;
-	int			tcp_fin_timeout;
-	int			udp_timeout;
-};
-
-
-/* The argument to IP_VS_SO_GET_DAEMON */
-struct ip_vs_daemon_user {
-	/* sync daemon state (master/backup) */
-	int			state;
-
-	/* multicast interface name */
-	char			mcast_ifn[IP_VS_IFNAME_MAXLEN];
-
-	/* SyncID we belong to */
-	int			syncid;
-};
-
-/*
- *
- * IPVS Generic Netlink interface definitions
- *
- */
-
-/* Generic Netlink family info */
-
-#define IPVS_GENL_NAME		"IPVS"
-#define IPVS_GENL_VERSION	0x1
-
-struct ip_vs_flags {
-	__u32 flags;
-	__u32 mask;
-};
-
-/* Generic Netlink command attributes */
-enum {
-	IPVS_CMD_UNSPEC = 0,
-
-	IPVS_CMD_NEW_SERVICE,		/* add service */
-	IPVS_CMD_SET_SERVICE,		/* modify service */
-	IPVS_CMD_DEL_SERVICE,		/* delete service */
-	IPVS_CMD_GET_SERVICE,		/* get service info */
-
-	IPVS_CMD_NEW_DEST,		/* add destination */
-	IPVS_CMD_SET_DEST,		/* modify destination */
-	IPVS_CMD_DEL_DEST,		/* delete destination */
-	IPVS_CMD_GET_DEST,		/* get destination info */
-
-	IPVS_CMD_NEW_DAEMON,		/* start sync daemon */
-	IPVS_CMD_DEL_DAEMON,		/* stop sync daemon */
-	IPVS_CMD_GET_DAEMON,		/* get sync daemon status */
-
-	IPVS_CMD_SET_CONFIG,		/* set config settings */
-	IPVS_CMD_GET_CONFIG,		/* get config settings */
-
-	IPVS_CMD_SET_INFO,		/* only used in GET_INFO reply */
-	IPVS_CMD_GET_INFO,		/* get general IPVS info */
-
-	IPVS_CMD_ZERO,			/* zero all counters and stats */
-	IPVS_CMD_FLUSH,			/* flush services and dests */
-
-	__IPVS_CMD_MAX,
-};
-
-#define IPVS_CMD_MAX (__IPVS_CMD_MAX - 1)
-
-/* Attributes used in the first level of commands */
-enum {
-	IPVS_CMD_ATTR_UNSPEC = 0,
-	IPVS_CMD_ATTR_SERVICE,		/* nested service attribute */
-	IPVS_CMD_ATTR_DEST,		/* nested destination attribute */
-	IPVS_CMD_ATTR_DAEMON,		/* nested sync daemon attribute */
-	IPVS_CMD_ATTR_TIMEOUT_TCP,	/* TCP connection timeout */
-	IPVS_CMD_ATTR_TIMEOUT_TCP_FIN,	/* TCP FIN wait timeout */
-	IPVS_CMD_ATTR_TIMEOUT_UDP,	/* UDP timeout */
-	__IPVS_CMD_ATTR_MAX,
-};
-
-#define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1)
-
-/*
- * Attributes used to describe a service
- *
- * Used inside nested attribute IPVS_CMD_ATTR_SERVICE
- */
-enum {
-	IPVS_SVC_ATTR_UNSPEC = 0,
-	IPVS_SVC_ATTR_AF,		/* address family */
-	IPVS_SVC_ATTR_PROTOCOL,		/* virtual service protocol */
-	IPVS_SVC_ATTR_ADDR,		/* virtual service address */
-	IPVS_SVC_ATTR_PORT,		/* virtual service port */
-	IPVS_SVC_ATTR_FWMARK,		/* firewall mark of service */
-
-	IPVS_SVC_ATTR_SCHED_NAME,	/* name of scheduler */
-	IPVS_SVC_ATTR_FLAGS,		/* virtual service flags */
-	IPVS_SVC_ATTR_TIMEOUT,		/* persistent timeout */
-	IPVS_SVC_ATTR_NETMASK,		/* persistent netmask */
-
-	IPVS_SVC_ATTR_STATS,		/* nested attribute for service stats */
-
-	IPVS_SVC_ATTR_PE_NAME,		/* name of ct retriever */
-
-	IPVS_SVC_ATTR_STATS64,		/* nested attribute for service stats */
-
-	__IPVS_SVC_ATTR_MAX,
-};
-
-#define IPVS_SVC_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1)
-
-/*
- * Attributes used to describe a destination (real server)
- *
- * Used inside nested attribute IPVS_CMD_ATTR_DEST
- */
-enum {
-	IPVS_DEST_ATTR_UNSPEC = 0,
-	IPVS_DEST_ATTR_ADDR,		/* real server address */
-	IPVS_DEST_ATTR_PORT,		/* real server port */
-
-	IPVS_DEST_ATTR_FWD_METHOD,	/* forwarding method */
-	IPVS_DEST_ATTR_WEIGHT,		/* destination weight */
-
-	IPVS_DEST_ATTR_U_THRESH,	/* upper threshold */
-	IPVS_DEST_ATTR_L_THRESH,	/* lower threshold */
-
-	IPVS_DEST_ATTR_ACTIVE_CONNS,	/* active connections */
-	IPVS_DEST_ATTR_INACT_CONNS,	/* inactive connections */
-	IPVS_DEST_ATTR_PERSIST_CONNS,	/* persistent connections */
-
-	IPVS_DEST_ATTR_STATS,		/* nested attribute for dest stats */
-
-	IPVS_DEST_ATTR_ADDR_FAMILY,	/* Address family of address */
-
-	IPVS_DEST_ATTR_STATS64,		/* nested attribute for dest stats */
-
-	__IPVS_DEST_ATTR_MAX,
-};
-
-#define IPVS_DEST_ATTR_MAX (__IPVS_DEST_ATTR_MAX - 1)
-
-/*
- * Attributes describing a sync daemon
- *
- * Used inside nested attribute IPVS_CMD_ATTR_DAEMON
- */
-enum {
-	IPVS_DAEMON_ATTR_UNSPEC = 0,
-	IPVS_DAEMON_ATTR_STATE,		/* sync daemon state (master/backup) */
-	IPVS_DAEMON_ATTR_MCAST_IFN,	/* multicast interface name */
-	IPVS_DAEMON_ATTR_SYNC_ID,	/* SyncID we belong to */
-	IPVS_DAEMON_ATTR_SYNC_MAXLEN,	/* UDP Payload Size */
-	IPVS_DAEMON_ATTR_MCAST_GROUP,	/* IPv4 Multicast Address */
-	IPVS_DAEMON_ATTR_MCAST_GROUP6,	/* IPv6 Multicast Address */
-	IPVS_DAEMON_ATTR_MCAST_PORT,	/* Multicast Port (base) */
-	IPVS_DAEMON_ATTR_MCAST_TTL,	/* Multicast TTL */
-	__IPVS_DAEMON_ATTR_MAX,
-};
-
-#define IPVS_DAEMON_ATTR_MAX (__IPVS_DAEMON_ATTR_MAX - 1)
-
-/*
- * Attributes used to describe service or destination entry statistics
- *
- * Used inside nested attributes IPVS_SVC_ATTR_STATS, IPVS_DEST_ATTR_STATS,
- * IPVS_SVC_ATTR_STATS64 and IPVS_DEST_ATTR_STATS64.
- */
-enum {
-	IPVS_STATS_ATTR_UNSPEC = 0,
-	IPVS_STATS_ATTR_CONNS,		/* connections scheduled */
-	IPVS_STATS_ATTR_INPKTS,		/* incoming packets */
-	IPVS_STATS_ATTR_OUTPKTS,	/* outgoing packets */
-	IPVS_STATS_ATTR_INBYTES,	/* incoming bytes */
-	IPVS_STATS_ATTR_OUTBYTES,	/* outgoing bytes */
-
-	IPVS_STATS_ATTR_CPS,		/* current connection rate */
-	IPVS_STATS_ATTR_INPPS,		/* current in packet rate */
-	IPVS_STATS_ATTR_OUTPPS,		/* current out packet rate */
-	IPVS_STATS_ATTR_INBPS,		/* current in byte rate */
-	IPVS_STATS_ATTR_OUTBPS,		/* current out byte rate */
-	__IPVS_STATS_ATTR_MAX,
-};
-
-#define IPVS_STATS_ATTR_MAX (__IPVS_STATS_ATTR_MAX - 1)
-
-/* Attributes used in response to IPVS_CMD_GET_INFO command */
-enum {
-	IPVS_INFO_ATTR_UNSPEC = 0,
-	IPVS_INFO_ATTR_VERSION,		/* IPVS version number */
-	IPVS_INFO_ATTR_CONN_TAB_SIZE,	/* size of connection hash table */
-	__IPVS_INFO_ATTR_MAX,
-};
-
-#define IPVS_INFO_ATTR_MAX (__IPVS_INFO_ATTR_MAX - 1)
-
-#endif	/* _IP_VS_H */
diff --git a/openflow/usr/include/linux/ipc.h b/openflow/usr/include/linux/ipc.h
deleted file mode 100644
index 98a53a1..0000000
--- a/openflow/usr/include/linux/ipc.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef _LINUX_IPC_H
-#define _LINUX_IPC_H
-
-#include <linux/types.h>
-
-#define IPC_PRIVATE ((__kernel_key_t) 0)  
-
-/* Obsolete, used only for backwards compatibility and libc5 compiles */
-struct ipc_perm
-{
-	__kernel_key_t	key;
-	__kernel_uid_t	uid;
-	__kernel_gid_t	gid;
-	__kernel_uid_t	cuid;
-	__kernel_gid_t	cgid;
-	__kernel_mode_t	mode; 
-	unsigned short	seq;
-};
-
-/* Include the definition of ipc64_perm */
-#include <asm/ipcbuf.h>
-
-/* resource get request flags */
-#define IPC_CREAT  00001000   /* create if key is nonexistent */
-#define IPC_EXCL   00002000   /* fail if key exists */
-#define IPC_NOWAIT 00004000   /* return error on wait */
-
-/* these fields are used by the DIPC package so the kernel as standard
-   should avoid using them if possible */
-   
-#define IPC_DIPC 00010000  /* make it distributed */
-#define IPC_OWN  00020000  /* this machine is the DIPC owner */
-
-/* 
- * Control commands used with semctl, msgctl and shmctl 
- * see also specific commands in sem.h, msg.h and shm.h
- */
-#define IPC_RMID 0     /* remove resource */
-#define IPC_SET  1     /* set ipc_perm options */
-#define IPC_STAT 2     /* get ipc_perm options */
-#define IPC_INFO 3     /* see ipcs */
-
-/*
- * Version flags for semctl, msgctl, and shmctl commands
- * These are passed as bitflags or-ed with the actual command
- */
-#define IPC_OLD 0	/* Old version (no 32-bit UID support on many
-			   architectures) */
-#define IPC_64  0x0100  /* New version (support 32-bit UIDs, bigger
-			   message sizes, etc. */
-
-/*
- * These are used to wrap system calls.
- *
- * See architecture code for ugly details..
- */
-struct ipc_kludge {
-	struct msgbuf *msgp;
-	long msgtyp;
-};
-
-#define SEMOP		 1
-#define SEMGET		 2
-#define SEMCTL		 3
-#define SEMTIMEDOP	 4
-#define MSGSND		11
-#define MSGRCV		12
-#define MSGGET		13
-#define MSGCTL		14
-#define SHMAT		21
-#define SHMDT		22
-#define SHMGET		23
-#define SHMCTL		24
-
-/* Used by the DIPC package, try and avoid reusing it */
-#define DIPC            25
-
-#define IPCCALL(version,op)	((version)<<16 | (op))
-
-
-#endif /* _LINUX_IPC_H */
diff --git a/openflow/usr/include/linux/ipmi.h b/openflow/usr/include/linux/ipmi.h
deleted file mode 100644
index 9077549..0000000
--- a/openflow/usr/include/linux/ipmi.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * ipmi.h
- *
- * MontaVista IPMI interface
- *
- * Author: MontaVista Software, Inc.
- *         Corey Minyard <minyard@mvista.com>
- *         source@mvista.com
- *
- * Copyright 2002 MontaVista Software Inc.
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the
- *  Free Software Foundation; either version 2 of the License, or (at your
- *  option) any later version.
- *
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __LINUX_IPMI_H
-#define __LINUX_IPMI_H
-
-#include <linux/ipmi_msgdefs.h>
-
-
-/*
- * This file describes an interface to an IPMI driver.  You have to
- * have a fairly good understanding of IPMI to use this, so go read
- * the specs first before actually trying to do anything.
- *
- * With that said, this driver provides a multi-user interface to the
- * IPMI driver, and it allows multiple IPMI physical interfaces below
- * the driver.  The physical interfaces bind as a lower layer on the
- * driver.  They appear as interfaces to the application using this
- * interface.
- *
- * Multi-user means that multiple applications may use the driver,
- * send commands, receive responses, etc.  The driver keeps track of
- * commands the user sends and tracks the responses.  The responses
- * will go back to the application that send the command.  If the
- * response doesn't come back in time, the driver will return a
- * timeout error response to the application.  Asynchronous events
- * from the BMC event queue will go to all users bound to the driver.
- * The incoming event queue in the BMC will automatically be flushed
- * if it becomes full and it is queried once a second to see if
- * anything is in it.  Incoming commands to the driver will get
- * delivered as commands.
- */
-
-/*
- * This is an overlay for all the address types, so it's easy to
- * determine the actual address type.  This is kind of like addresses
- * work for sockets.
- */
-#define IPMI_MAX_ADDR_SIZE 32
-struct ipmi_addr {
-	 /* Try to take these from the "Channel Medium Type" table
-	    in section 6.5 of the IPMI 1.5 manual. */
-	int   addr_type;
-	short channel;
-	char  data[IPMI_MAX_ADDR_SIZE];
-};
-
-/*
- * When the address is not used, the type will be set to this value.
- * The channel is the BMC's channel number for the channel (usually
- * 0), or IPMC_BMC_CHANNEL if communicating directly with the BMC.
- */
-#define IPMI_SYSTEM_INTERFACE_ADDR_TYPE	0x0c
-struct ipmi_system_interface_addr {
-	int           addr_type;
-	short         channel;
-	unsigned char lun;
-};
-
-/* An IPMB Address. */
-#define IPMI_IPMB_ADDR_TYPE		0x01
-/* Used for broadcast get device id as described in section 17.9 of the
-   IPMI 1.5 manual. */
-#define IPMI_IPMB_BROADCAST_ADDR_TYPE	0x41
-struct ipmi_ipmb_addr {
-	int           addr_type;
-	short         channel;
-	unsigned char slave_addr;
-	unsigned char lun;
-};
-
-/*
- * A LAN Address.  This is an address to/from a LAN interface bridged
- * by the BMC, not an address actually out on the LAN.
- *
- * A conscious decision was made here to deviate slightly from the IPMI
- * spec.  We do not use rqSWID and rsSWID like it shows in the
- * message.  Instead, we use remote_SWID and local_SWID.  This means
- * that any message (a request or response) from another device will
- * always have exactly the same address.  If you didn't do this,
- * requests and responses from the same device would have different
- * addresses, and that's not too cool.
- *
- * In this address, the remote_SWID is always the SWID the remote
- * message came from, or the SWID we are sending the message to.
- * local_SWID is always our SWID.  Note that having our SWID in the
- * message is a little weird, but this is required.
- */
-#define IPMI_LAN_ADDR_TYPE		0x04
-struct ipmi_lan_addr {
-	int           addr_type;
-	short         channel;
-	unsigned char privilege;
-	unsigned char session_handle;
-	unsigned char remote_SWID;
-	unsigned char local_SWID;
-	unsigned char lun;
-};
-
-
-/*
- * Channel for talking directly with the BMC.  When using this
- * channel, This is for the system interface address type only.  FIXME
- * - is this right, or should we use -1?
- */
-#define IPMI_BMC_CHANNEL  0xf
-#define IPMI_NUM_CHANNELS 0x10
-
-/*
- * Used to signify an "all channel" bitmask.  This is more than the
- * actual number of channels because this is used in userland and
- * will cover us if the number of channels is extended.
- */
-#define IPMI_CHAN_ALL     (~0)
-
-
-/*
- * A raw IPMI message without any addressing.  This covers both
- * commands and responses.  The completion code is always the first
- * byte of data in the response (as the spec shows the messages laid
- * out).
- */
-struct ipmi_msg {
-	unsigned char  netfn;
-	unsigned char  cmd;
-	unsigned short data_len;
-	unsigned char  *data;
-};
-
-struct kernel_ipmi_msg {
-	unsigned char  netfn;
-	unsigned char  cmd;
-	unsigned short data_len;
-	unsigned char  *data;
-};
-
-/*
- * Various defines that are useful for IPMI applications.
- */
-#define IPMI_INVALID_CMD_COMPLETION_CODE	0xC1
-#define IPMI_TIMEOUT_COMPLETION_CODE		0xC3
-#define IPMI_UNKNOWN_ERR_COMPLETION_CODE	0xff
-
-
-/*
- * Receive types for messages coming from the receive interface.  This
- * is used for the receive in-kernel interface and in the receive
- * IOCTL.
- *
- * The "IPMI_RESPONSE_RESPNOSE_TYPE" is a little strange sounding, but
- * it allows you to get the message results when you send a response
- * message.
- */
-#define IPMI_RESPONSE_RECV_TYPE		1 /* A response to a command */
-#define IPMI_ASYNC_EVENT_RECV_TYPE	2 /* Something from the event queue */
-#define IPMI_CMD_RECV_TYPE		3 /* A command from somewhere else */
-#define IPMI_RESPONSE_RESPONSE_TYPE	4 /* The response for
-					      a sent response, giving any
-					      error status for sending the
-					      response.  When you send a
-					      response message, this will
-					      be returned. */
-#define IPMI_OEM_RECV_TYPE		5 /* The response for OEM Channels */
-
-/* Note that async events and received commands do not have a completion
-   code as the first byte of the incoming data, unlike a response. */
-
-
-/*
- * Modes for ipmi_set_maint_mode() and the userland IOCTL.  The AUTO
- * setting is the default and means it will be set on certain
- * commands.  Hard setting it on and off will override automatic
- * operation.
- */
-#define IPMI_MAINTENANCE_MODE_AUTO	0
-#define IPMI_MAINTENANCE_MODE_OFF	1
-#define IPMI_MAINTENANCE_MODE_ON	2
-
-
-
-/*
- * The userland interface
- */
-
-/*
- * The userland interface for the IPMI driver is a standard character
- * device, with each instance of an interface registered as a minor
- * number under the major character device.
- *
- * The read and write calls do not work, to get messages in and out
- * requires ioctl calls because of the complexity of the data.  select
- * and poll do work, so you can wait for input using the file
- * descriptor, you just can use read to get it.
- *
- * In general, you send a command down to the interface and receive
- * responses back.  You can use the msgid value to correlate commands
- * and responses, the driver will take care of figuring out which
- * incoming messages are for which command and find the proper msgid
- * value to report.  You will only receive reponses for commands you
- * send.  Asynchronous events, however, go to all open users, so you
- * must be ready to handle these (or ignore them if you don't care).
- *
- * The address type depends upon the channel type.  When talking
- * directly to the BMC (IPMC_BMC_CHANNEL), the address is ignored
- * (IPMI_UNUSED_ADDR_TYPE).  When talking to an IPMB channel, you must
- * supply a valid IPMB address with the addr_type set properly.
- *
- * When talking to normal channels, the driver takes care of the
- * details of formatting and sending messages on that channel.  You do
- * not, for instance, have to format a send command, you just send
- * whatever command you want to the channel, the driver will create
- * the send command, automatically issue receive command and get even
- * commands, and pass those up to the proper user.
- */
-
-
-/* The magic IOCTL value for this interface. */
-#define IPMI_IOC_MAGIC 'i'
-
-
-/* Messages sent to the interface are this format. */
-struct ipmi_req {
-	unsigned char *addr; /* Address to send the message to. */
-	unsigned int  addr_len;
-
-	long    msgid; /* The sequence number for the message.  This
-			  exact value will be reported back in the
-			  response to this request if it is a command.
-			  If it is a response, this will be used as
-			  the sequence value for the response.  */
-
-	struct ipmi_msg msg;
-};
-/*
- * Send a message to the interfaces.  error values are:
- *   - EFAULT - an address supplied was invalid.
- *   - EINVAL - The address supplied was not valid, or the command
- *              was not allowed.
- *   - EMSGSIZE - The message to was too large.
- *   - ENOMEM - Buffers could not be allocated for the command.
- */
-#define IPMICTL_SEND_COMMAND		_IOR(IPMI_IOC_MAGIC, 13,	\
-					     struct ipmi_req)
-
-/* Messages sent to the interface with timing parameters are this
-   format. */
-struct ipmi_req_settime {
-	struct ipmi_req req;
-
-	/* See ipmi_request_settime() above for details on these
-	   values. */
-	int          retries;
-	unsigned int retry_time_ms;
-};
-/*
- * Send a message to the interfaces with timing parameters.  error values
- * are:
- *   - EFAULT - an address supplied was invalid.
- *   - EINVAL - The address supplied was not valid, or the command
- *              was not allowed.
- *   - EMSGSIZE - The message to was too large.
- *   - ENOMEM - Buffers could not be allocated for the command.
- */
-#define IPMICTL_SEND_COMMAND_SETTIME	_IOR(IPMI_IOC_MAGIC, 21,	\
-					     struct ipmi_req_settime)
-
-/* Messages received from the interface are this format. */
-struct ipmi_recv {
-	int     recv_type; /* Is this a command, response or an
-			      asyncronous event. */
-
-	unsigned char *addr;    /* Address the message was from is put
-				   here.  The caller must supply the
-				   memory. */
-	unsigned int  addr_len; /* The size of the address buffer.
-				   The caller supplies the full buffer
-				   length, this value is updated to
-				   the actual message length when the
-				   message is received. */
-
-	long    msgid; /* The sequence number specified in the request
-			  if this is a response.  If this is a command,
-			  this will be the sequence number from the
-			  command. */
-
-	struct ipmi_msg msg; /* The data field must point to a buffer.
-				The data_size field must be set to the
-				size of the message buffer.  The
-				caller supplies the full buffer
-				length, this value is updated to the
-				actual message length when the message
-				is received. */
-};
-
-/*
- * Receive a message.  error values:
- *  - EAGAIN - no messages in the queue.
- *  - EFAULT - an address supplied was invalid.
- *  - EINVAL - The address supplied was not valid.
- *  - EMSGSIZE - The message to was too large to fit into the message buffer,
- *               the message will be left in the buffer. */
-#define IPMICTL_RECEIVE_MSG		_IOWR(IPMI_IOC_MAGIC, 12,	\
-					      struct ipmi_recv)
-
-/*
- * Like RECEIVE_MSG, but if the message won't fit in the buffer, it
- * will truncate the contents instead of leaving the data in the
- * buffer.
- */
-#define IPMICTL_RECEIVE_MSG_TRUNC	_IOWR(IPMI_IOC_MAGIC, 11,	\
-					      struct ipmi_recv)
-
-/* Register to get commands from other entities on this interface. */
-struct ipmi_cmdspec {
-	unsigned char netfn;
-	unsigned char cmd;
-};
-
-/*
- * Register to receive a specific command.  error values:
- *   - EFAULT - an address supplied was invalid.
- *   - EBUSY - The netfn/cmd supplied was already in use.
- *   - ENOMEM - could not allocate memory for the entry.
- */
-#define IPMICTL_REGISTER_FOR_CMD	_IOR(IPMI_IOC_MAGIC, 14,	\
-					     struct ipmi_cmdspec)
-/*
- * Unregister a regsitered command.  error values:
- *  - EFAULT - an address supplied was invalid.
- *  - ENOENT - The netfn/cmd was not found registered for this user.
- */
-#define IPMICTL_UNREGISTER_FOR_CMD	_IOR(IPMI_IOC_MAGIC, 15,	\
-					     struct ipmi_cmdspec)
-
-/*
- * Register to get commands from other entities on specific channels.
- * This way, you can only listen on specific channels, or have messages
- * from some channels go to one place and other channels to someplace
- * else.  The chans field is a bitmask, (1 << channel) for each channel.
- * It may be IPMI_CHAN_ALL for all channels.
- */
-struct ipmi_cmdspec_chans {
-	unsigned int netfn;
-	unsigned int cmd;
-	unsigned int chans;
-};
-
-/*
- * Register to receive a specific command on specific channels.  error values:
- *   - EFAULT - an address supplied was invalid.
- *   - EBUSY - One of the netfn/cmd/chans supplied was already in use.
- *   - ENOMEM - could not allocate memory for the entry.
- */
-#define IPMICTL_REGISTER_FOR_CMD_CHANS	_IOR(IPMI_IOC_MAGIC, 28,	\
-					     struct ipmi_cmdspec_chans)
-/*
- * Unregister some netfn/cmd/chans.  error values:
- *  - EFAULT - an address supplied was invalid.
- *  - ENOENT - None of the netfn/cmd/chans were found registered for this user.
- */
-#define IPMICTL_UNREGISTER_FOR_CMD_CHANS _IOR(IPMI_IOC_MAGIC, 29,	\
-					     struct ipmi_cmdspec_chans)
-
-/*
- * Set whether this interface receives events.  Note that the first
- * user registered for events will get all pending events for the
- * interface.  error values:
- *  - EFAULT - an address supplied was invalid.
- */
-#define IPMICTL_SET_GETS_EVENTS_CMD	_IOR(IPMI_IOC_MAGIC, 16, int)
-
-/*
- * Set and get the slave address and LUN that we will use for our
- * source messages.  Note that this affects the interface, not just
- * this user, so it will affect all users of this interface.  This is
- * so some initialization code can come in and do the OEM-specific
- * things it takes to determine your address (if not the BMC) and set
- * it for everyone else.  You should probably leave the LUN alone.
- */
-struct ipmi_channel_lun_address_set {
-	unsigned short channel;
-	unsigned char  value;
-};
-#define IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD \
-	_IOR(IPMI_IOC_MAGIC, 24, struct ipmi_channel_lun_address_set)
-#define IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD \
-	_IOR(IPMI_IOC_MAGIC, 25, struct ipmi_channel_lun_address_set)
-#define IPMICTL_SET_MY_CHANNEL_LUN_CMD \
-	_IOR(IPMI_IOC_MAGIC, 26, struct ipmi_channel_lun_address_set)
-#define IPMICTL_GET_MY_CHANNEL_LUN_CMD \
-	_IOR(IPMI_IOC_MAGIC, 27, struct ipmi_channel_lun_address_set)
-/* Legacy interfaces, these only set IPMB 0. */
-#define IPMICTL_SET_MY_ADDRESS_CMD	_IOR(IPMI_IOC_MAGIC, 17, unsigned int)
-#define IPMICTL_GET_MY_ADDRESS_CMD	_IOR(IPMI_IOC_MAGIC, 18, unsigned int)
-#define IPMICTL_SET_MY_LUN_CMD		_IOR(IPMI_IOC_MAGIC, 19, unsigned int)
-#define IPMICTL_GET_MY_LUN_CMD		_IOR(IPMI_IOC_MAGIC, 20, unsigned int)
-
-/*
- * Get/set the default timing values for an interface.  You shouldn't
- * generally mess with these.
- */
-struct ipmi_timing_parms {
-	int          retries;
-	unsigned int retry_time_ms;
-};
-#define IPMICTL_SET_TIMING_PARMS_CMD	_IOR(IPMI_IOC_MAGIC, 22, \
-					     struct ipmi_timing_parms)
-#define IPMICTL_GET_TIMING_PARMS_CMD	_IOR(IPMI_IOC_MAGIC, 23, \
-					     struct ipmi_timing_parms)
-
-/*
- * Set the maintenance mode.  See ipmi_set_maintenance_mode() above
- * for a description of what this does.
- */
-#define IPMICTL_GET_MAINTENANCE_MODE_CMD	_IOR(IPMI_IOC_MAGIC, 30, int)
-#define IPMICTL_SET_MAINTENANCE_MODE_CMD	_IOW(IPMI_IOC_MAGIC, 31, int)
-
-#endif /* __LINUX_IPMI_H */
diff --git a/openflow/usr/include/linux/ipmi_msgdefs.h b/openflow/usr/include/linux/ipmi_msgdefs.h
deleted file mode 100644
index df97e6e..0000000
--- a/openflow/usr/include/linux/ipmi_msgdefs.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * ipmi_smi.h
- *
- * MontaVista IPMI system management interface
- *
- * Author: MontaVista Software, Inc.
- *         Corey Minyard <minyard@mvista.com>
- *         source@mvista.com
- *
- * Copyright 2002 MontaVista Software Inc.
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the
- *  Free Software Foundation; either version 2 of the License, or (at your
- *  option) any later version.
- *
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __LINUX_IPMI_MSGDEFS_H
-#define __LINUX_IPMI_MSGDEFS_H
-
-/* Various definitions for IPMI messages used by almost everything in
-   the IPMI stack. */
-
-/* NetFNs and commands used inside the IPMI stack. */
-
-#define IPMI_NETFN_SENSOR_EVENT_REQUEST		0x04
-#define IPMI_NETFN_SENSOR_EVENT_RESPONSE	0x05
-#define IPMI_GET_EVENT_RECEIVER_CMD	0x01
-
-#define IPMI_NETFN_APP_REQUEST			0x06
-#define IPMI_NETFN_APP_RESPONSE			0x07
-#define IPMI_GET_DEVICE_ID_CMD		0x01
-#define IPMI_COLD_RESET_CMD		0x02
-#define IPMI_WARM_RESET_CMD		0x03
-#define IPMI_CLEAR_MSG_FLAGS_CMD	0x30
-#define IPMI_GET_DEVICE_GUID_CMD	0x08
-#define IPMI_GET_MSG_FLAGS_CMD		0x31
-#define IPMI_SEND_MSG_CMD		0x34
-#define IPMI_GET_MSG_CMD		0x33
-#define IPMI_SET_BMC_GLOBAL_ENABLES_CMD	0x2e
-#define IPMI_GET_BMC_GLOBAL_ENABLES_CMD	0x2f
-#define IPMI_READ_EVENT_MSG_BUFFER_CMD	0x35
-#define IPMI_GET_CHANNEL_INFO_CMD	0x42
-
-/* Bit for BMC global enables. */
-#define IPMI_BMC_RCV_MSG_INTR     0x01
-#define IPMI_BMC_EVT_MSG_INTR     0x02
-#define IPMI_BMC_EVT_MSG_BUFF     0x04
-#define IPMI_BMC_SYS_LOG          0x08
-
-#define IPMI_NETFN_STORAGE_REQUEST		0x0a
-#define IPMI_NETFN_STORAGE_RESPONSE		0x0b
-#define IPMI_ADD_SEL_ENTRY_CMD		0x44
-
-#define IPMI_NETFN_FIRMWARE_REQUEST		0x08
-#define IPMI_NETFN_FIRMWARE_RESPONSE		0x09
-
-/* The default slave address */
-#define IPMI_BMC_SLAVE_ADDR	0x20
-
-/* The BT interface on high-end HP systems supports up to 255 bytes in
- * one transfer.  Its "virtual" BMC supports some commands that are longer
- * than 128 bytes.  Use the full 256, plus NetFn/LUN, Cmd, cCode, plus
- * some overhead; it's not worth the effort to dynamically size this based
- * on the results of the "Get BT Capabilities" command. */
-#define IPMI_MAX_MSG_LENGTH	272	/* multiple of 16 */
-
-#define IPMI_CC_NO_ERROR		0x00
-#define IPMI_NODE_BUSY_ERR		0xc0
-#define IPMI_INVALID_COMMAND_ERR	0xc1
-#define IPMI_TIMEOUT_ERR		0xc3
-#define IPMI_ERR_MSG_TRUNCATED		0xc6
-#define IPMI_REQ_LEN_INVALID_ERR	0xc7
-#define IPMI_REQ_LEN_EXCEEDED_ERR	0xc8
-#define IPMI_NOT_IN_MY_STATE_ERR	0xd5	/* IPMI 2.0 */
-#define IPMI_LOST_ARBITRATION_ERR	0x81
-#define IPMI_BUS_ERR			0x82
-#define IPMI_NAK_ON_WRITE_ERR		0x83
-#define IPMI_ERR_UNSPECIFIED		0xff
-
-#define IPMI_CHANNEL_PROTOCOL_IPMB	1
-#define IPMI_CHANNEL_PROTOCOL_ICMB	2
-#define IPMI_CHANNEL_PROTOCOL_SMBUS	4
-#define IPMI_CHANNEL_PROTOCOL_KCS	5
-#define IPMI_CHANNEL_PROTOCOL_SMIC	6
-#define IPMI_CHANNEL_PROTOCOL_BT10	7
-#define IPMI_CHANNEL_PROTOCOL_BT15	8
-#define IPMI_CHANNEL_PROTOCOL_TMODE	9
-
-#define IPMI_CHANNEL_MEDIUM_IPMB	1
-#define IPMI_CHANNEL_MEDIUM_ICMB10	2
-#define IPMI_CHANNEL_MEDIUM_ICMB09	3
-#define IPMI_CHANNEL_MEDIUM_8023LAN	4
-#define IPMI_CHANNEL_MEDIUM_ASYNC	5
-#define IPMI_CHANNEL_MEDIUM_OTHER_LAN	6
-#define IPMI_CHANNEL_MEDIUM_PCI_SMBUS	7
-#define IPMI_CHANNEL_MEDIUM_SMBUS1	8
-#define IPMI_CHANNEL_MEDIUM_SMBUS2	9
-#define IPMI_CHANNEL_MEDIUM_USB1	10
-#define IPMI_CHANNEL_MEDIUM_USB2	11
-#define IPMI_CHANNEL_MEDIUM_SYSINTF	12
-#define IPMI_CHANNEL_MEDIUM_OEM_MIN	0x60
-#define IPMI_CHANNEL_MEDIUM_OEM_MAX	0x7f
-
-#endif /* __LINUX_IPMI_MSGDEFS_H */
diff --git a/openflow/usr/include/linux/ipsec.h b/openflow/usr/include/linux/ipsec.h
deleted file mode 100644
index d17a630..0000000
--- a/openflow/usr/include/linux/ipsec.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _LINUX_IPSEC_H
-#define _LINUX_IPSEC_H
-
-/* The definitions, required to talk to KAME racoon IKE. */
-
-#include <linux/pfkeyv2.h>
-
-#define IPSEC_PORT_ANY		0
-#define IPSEC_ULPROTO_ANY	255
-#define IPSEC_PROTO_ANY		255
-
-enum {
-	IPSEC_MODE_ANY		= 0,	/* We do not support this for SA */
-	IPSEC_MODE_TRANSPORT	= 1,
-	IPSEC_MODE_TUNNEL	= 2,
-	IPSEC_MODE_BEET         = 3
-};
-
-enum {
-	IPSEC_DIR_ANY		= 0,
-	IPSEC_DIR_INBOUND	= 1,
-	IPSEC_DIR_OUTBOUND	= 2,
-	IPSEC_DIR_FWD		= 3,	/* It is our own */
-	IPSEC_DIR_MAX		= 4,
-	IPSEC_DIR_INVALID	= 5
-};
-
-enum {
-	IPSEC_POLICY_DISCARD	= 0,
-	IPSEC_POLICY_NONE	= 1,
-	IPSEC_POLICY_IPSEC	= 2,
-	IPSEC_POLICY_ENTRUST	= 3,
-	IPSEC_POLICY_BYPASS	= 4
-};
-
-enum {
-	IPSEC_LEVEL_DEFAULT	= 0,
-	IPSEC_LEVEL_USE		= 1,
-	IPSEC_LEVEL_REQUIRE	= 2,
-	IPSEC_LEVEL_UNIQUE	= 3
-};
-
-#define IPSEC_MANUAL_REQID_MAX	0x3fff
-
-#define IPSEC_REPLAYWSIZE  32
-
-#endif	/* _LINUX_IPSEC_H */
diff --git a/openflow/usr/include/linux/ipv6.h b/openflow/usr/include/linux/ipv6.h
deleted file mode 100644
index 561e954..0000000
--- a/openflow/usr/include/linux/ipv6.h
+++ /dev/null
@@ -1,181 +0,0 @@
-#ifndef _IPV6_H
-#define _IPV6_H
-
-#include <linux/libc-compat.h>
-#include <linux/types.h>
-#include <linux/in6.h>
-#include <asm/byteorder.h>
-
-/* The latest drafts declared increase in minimal mtu up to 1280. */
-
-#define IPV6_MIN_MTU	1280
-
-/*
- *	Advanced API
- *	source interface/address selection, source routing, etc...
- *	*under construction*
- */
-
-#if __UAPI_DEF_IN6_PKTINFO
-struct in6_pktinfo {
-	struct in6_addr	ipi6_addr;
-	int		ipi6_ifindex;
-};
-#endif
-
-#if __UAPI_DEF_IP6_MTUINFO
-struct ip6_mtuinfo {
-	struct sockaddr_in6	ip6m_addr;
-	__u32			ip6m_mtu;
-};
-#endif
-
-struct in6_ifreq {
-	struct in6_addr	ifr6_addr;
-	__u32		ifr6_prefixlen;
-	int		ifr6_ifindex; 
-};
-
-#define IPV6_SRCRT_STRICT	0x01	/* Deprecated; will be removed */
-#define IPV6_SRCRT_TYPE_0	0	/* Deprecated; will be removed */
-#define IPV6_SRCRT_TYPE_2	2	/* IPv6 type 2 Routing Header	*/
-
-/*
- *	routing header
- */
-struct ipv6_rt_hdr {
-	__u8		nexthdr;
-	__u8		hdrlen;
-	__u8		type;
-	__u8		segments_left;
-
-	/*
-	 *	type specific data
-	 *	variable length field
-	 */
-};
-
-
-struct ipv6_opt_hdr {
-	__u8 		nexthdr;
-	__u8 		hdrlen;
-	/* 
-	 * TLV encoded option data follows.
-	 */
-} __attribute__((packed));	/* required for some archs */
-
-#define ipv6_destopt_hdr ipv6_opt_hdr
-#define ipv6_hopopt_hdr  ipv6_opt_hdr
-
-/* Router Alert option values (RFC2711) */
-#define IPV6_OPT_ROUTERALERT_MLD	0x0000	/* MLD(RFC2710) */
-
-/*
- *	routing header type 0 (used in cmsghdr struct)
- */
-
-struct rt0_hdr {
-	struct ipv6_rt_hdr	rt_hdr;
-	__u32			reserved;
-	struct in6_addr		addr[0];
-
-#define rt0_type		rt_hdr.type
-};
-
-/*
- *	routing header type 2
- */
-
-struct rt2_hdr {
-	struct ipv6_rt_hdr	rt_hdr;
-	__u32			reserved;
-	struct in6_addr		addr;
-
-#define rt2_type		rt_hdr.type
-};
-
-/*
- *	home address option in destination options header
- */
-
-struct ipv6_destopt_hao {
-	__u8			type;
-	__u8			length;
-	struct in6_addr		addr;
-} __attribute__((packed));
-
-/*
- *	IPv6 fixed header
- *
- *	BEWARE, it is incorrect. The first 4 bits of flow_lbl
- *	are glued to priority now, forming "class".
- */
-
-struct ipv6hdr {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u8			priority:4,
-				version:4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-	__u8			version:4,
-				priority:4;
-#else
-#error	"Please fix <asm/byteorder.h>"
-#endif
-	__u8			flow_lbl[3];
-
-	__be16			payload_len;
-	__u8			nexthdr;
-	__u8			hop_limit;
-
-	struct	in6_addr	saddr;
-	struct	in6_addr	daddr;
-};
-
-
-/* index values for the variables in ipv6_devconf */
-enum {
-	DEVCONF_FORWARDING = 0,
-	DEVCONF_HOPLIMIT,
-	DEVCONF_MTU6,
-	DEVCONF_ACCEPT_RA,
-	DEVCONF_ACCEPT_REDIRECTS,
-	DEVCONF_AUTOCONF,
-	DEVCONF_DAD_TRANSMITS,
-	DEVCONF_RTR_SOLICITS,
-	DEVCONF_RTR_SOLICIT_INTERVAL,
-	DEVCONF_RTR_SOLICIT_DELAY,
-	DEVCONF_USE_TEMPADDR,
-	DEVCONF_TEMP_VALID_LFT,
-	DEVCONF_TEMP_PREFERED_LFT,
-	DEVCONF_REGEN_MAX_RETRY,
-	DEVCONF_MAX_DESYNC_FACTOR,
-	DEVCONF_MAX_ADDRESSES,
-	DEVCONF_FORCE_MLD_VERSION,
-	DEVCONF_ACCEPT_RA_DEFRTR,
-	DEVCONF_ACCEPT_RA_PINFO,
-	DEVCONF_ACCEPT_RA_RTR_PREF,
-	DEVCONF_RTR_PROBE_INTERVAL,
-	DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,
-	DEVCONF_PROXY_NDP,
-	DEVCONF_OPTIMISTIC_DAD,
-	DEVCONF_ACCEPT_SOURCE_ROUTE,
-	DEVCONF_MC_FORWARDING,
-	DEVCONF_DISABLE_IPV6,
-	DEVCONF_ACCEPT_DAD,
-	DEVCONF_FORCE_TLLAO,
-	DEVCONF_NDISC_NOTIFY,
-	DEVCONF_MLDV1_UNSOLICITED_REPORT_INTERVAL,
-	DEVCONF_MLDV2_UNSOLICITED_REPORT_INTERVAL,
-	DEVCONF_SUPPRESS_FRAG_NDISC,
-	DEVCONF_ACCEPT_RA_FROM_LOCAL,
-	DEVCONF_USE_OPTIMISTIC,
-	DEVCONF_ACCEPT_RA_MTU,
-	DEVCONF_STABLE_SECRET,
-	DEVCONF_USE_OIF_ADDRS_ONLY,
-	DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT,
-	DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN,
-	DEVCONF_MAX
-};
-
-
-#endif /* _IPV6_H */
diff --git a/openflow/usr/include/linux/ipv6_route.h b/openflow/usr/include/linux/ipv6_route.h
deleted file mode 100644
index 091a466..0000000
--- a/openflow/usr/include/linux/ipv6_route.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *	Linux INET6 implementation 
- *
- *	Authors:
- *	Pedro Roque		<roque@di.fc.ul.pt>	
- *
- *	This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_IPV6_ROUTE_H
-#define _LINUX_IPV6_ROUTE_H
-
-#include <linux/types.h>
-
-#define RTF_DEFAULT	0x00010000	/* default - learned via ND	*/
-#define RTF_ALLONLINK	0x00020000	/* (deprecated and will be removed)
-					   fallback, no routers on link */
-#define RTF_ADDRCONF	0x00040000	/* addrconf route - RA		*/
-#define RTF_PREFIX_RT	0x00080000	/* A prefix only route - RA	*/
-#define RTF_ANYCAST	0x00100000	/* Anycast			*/
-
-#define RTF_NONEXTHOP	0x00200000	/* route with no nexthop	*/
-#define RTF_EXPIRES	0x00400000
-
-#define RTF_ROUTEINFO	0x00800000	/* route information - RA	*/
-
-#define RTF_CACHE	0x01000000	/* cache entry			*/
-#define RTF_FLOW	0x02000000	/* flow significant route	*/
-#define RTF_POLICY	0x04000000	/* policy route			*/
-
-#define RTF_PREF(pref)	((pref) << 27)
-#define RTF_PREF_MASK	0x18000000
-
-#define RTF_PCPU	0x40000000
-#define RTF_LOCAL	0x80000000
-
-
-struct in6_rtmsg {
-	struct in6_addr		rtmsg_dst;
-	struct in6_addr		rtmsg_src;
-	struct in6_addr		rtmsg_gateway;
-	__u32			rtmsg_type;
-	__u16			rtmsg_dst_len;
-	__u16			rtmsg_src_len;
-	__u32			rtmsg_metric;
-	unsigned long		rtmsg_info;
-        __u32			rtmsg_flags;
-	int			rtmsg_ifindex;
-};
-
-#define RTMSG_NEWDEVICE		0x11
-#define RTMSG_DELDEVICE		0x12
-#define RTMSG_NEWROUTE		0x21
-#define RTMSG_DELROUTE		0x22
-
-#define IP6_RT_PRIO_USER	1024
-#define IP6_RT_PRIO_ADDRCONF	256
-
-#endif /* _LINUX_IPV6_ROUTE_H */
diff --git a/openflow/usr/include/linux/ipx.h b/openflow/usr/include/linux/ipx.h
deleted file mode 100644
index 3d48014..0000000
--- a/openflow/usr/include/linux/ipx.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef _IPX_H_
-#define _IPX_H_
-#include <linux/types.h>
-#include <linux/sockios.h>
-#include <linux/socket.h>
-#define IPX_NODE_LEN	6
-#define IPX_MTU		576
-
-struct sockaddr_ipx {
-	__kernel_sa_family_t sipx_family;
-	__be16		sipx_port;
-	__be32		sipx_network;
-	unsigned char 	sipx_node[IPX_NODE_LEN];
-	__u8		sipx_type;
-	unsigned char	sipx_zero;	/* 16 byte fill */
-};
-
-/*
- * So we can fit the extra info for SIOCSIFADDR into the address nicely
- */
-#define sipx_special	sipx_port
-#define sipx_action	sipx_zero
-#define IPX_DLTITF	0
-#define IPX_CRTITF	1
-
-struct ipx_route_definition {
-	__be32        ipx_network;
-	__be32        ipx_router_network;
-	unsigned char ipx_router_node[IPX_NODE_LEN];
-};
-
-struct ipx_interface_definition {
-	__be32        ipx_network;
-	unsigned char ipx_device[16];
-	unsigned char ipx_dlink_type;
-#define IPX_FRAME_NONE		0
-#define IPX_FRAME_SNAP		1
-#define IPX_FRAME_8022		2
-#define IPX_FRAME_ETHERII	3
-#define IPX_FRAME_8023		4
-#define IPX_FRAME_TR_8022       5 /* obsolete */
-	unsigned char ipx_special;
-#define IPX_SPECIAL_NONE	0
-#define IPX_PRIMARY		1
-#define IPX_INTERNAL		2
-	unsigned char ipx_node[IPX_NODE_LEN];
-};
-	
-struct ipx_config_data {
-	unsigned char	ipxcfg_auto_select_primary;
-	unsigned char	ipxcfg_auto_create_interfaces;
-};
-
-/*
- * OLD Route Definition for backward compatibility.
- */
-
-struct ipx_route_def {
-	__be32		ipx_network;
-	__be32		ipx_router_network;
-#define IPX_ROUTE_NO_ROUTER	0
-	unsigned char	ipx_router_node[IPX_NODE_LEN];
-	unsigned char	ipx_device[16];
-	unsigned short	ipx_flags;
-#define IPX_RT_SNAP		8
-#define IPX_RT_8022		4
-#define IPX_RT_BLUEBOOK		2
-#define IPX_RT_ROUTED		1
-};
-
-#define SIOCAIPXITFCRT		(SIOCPROTOPRIVATE)
-#define SIOCAIPXPRISLT		(SIOCPROTOPRIVATE + 1)
-#define SIOCIPXCFGDATA		(SIOCPROTOPRIVATE + 2)
-#define SIOCIPXNCPCONN		(SIOCPROTOPRIVATE + 3)
-#endif /* _IPX_H_ */
diff --git a/openflow/usr/include/linux/irda.h b/openflow/usr/include/linux/irda.h
deleted file mode 100644
index a014c32..0000000
--- a/openflow/usr/include/linux/irda.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*********************************************************************
- *                
- * Filename:      irda.h
- * Version:       
- * Description:   
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Mon Mar  8 14:06:12 1999
- * Modified at:   Sat Dec 25 16:06:42 1999
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- * 
- *     Copyright (c) 1999 Dag Brattli, All Rights Reserved.
- *      
- *     This program is free software; you can redistribute it and/or 
- *     modify it under the terms of the GNU General Public License as 
- *     published by the Free Software Foundation; either version 2 of 
- *     the License, or (at your option) any later version.
- *  
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is 
- *     provided "AS-IS" and at no charge.
- *
- ********************************************************************/
-
-#ifndef KERNEL_IRDA_H
-#define KERNEL_IRDA_H
-
-#include <linux/types.h>
-#include <linux/socket.h>
-
-/* Note that this file is shared with user space. */
-
-/* Hint bit positions for first hint byte */
-#define HINT_PNP         0x01
-#define HINT_PDA         0x02
-#define HINT_COMPUTER    0x04
-#define HINT_PRINTER     0x08
-#define HINT_MODEM       0x10
-#define HINT_FAX         0x20
-#define HINT_LAN         0x40
-#define HINT_EXTENSION   0x80
-
-/* Hint bit positions for second hint byte (first extension byte) */
-#define HINT_TELEPHONY   0x01
-#define HINT_FILE_SERVER 0x02
-#define HINT_COMM        0x04
-#define HINT_MESSAGE     0x08
-#define HINT_HTTP        0x10
-#define HINT_OBEX        0x20
-
-/* IrLMP character code values */
-#define CS_ASCII         0x00
-#define	CS_ISO_8859_1    0x01
-#define	CS_ISO_8859_2    0x02
-#define	CS_ISO_8859_3    0x03
-#define	CS_ISO_8859_4    0x04
-#define	CS_ISO_8859_5    0x05
-#define	CS_ISO_8859_6    0x06
-#define	CS_ISO_8859_7    0x07
-#define	CS_ISO_8859_8    0x08
-#define	CS_ISO_8859_9    0x09
-#define CS_UNICODE       0xff
-
-/* These are the currently known dongles */
-typedef enum {
-	IRDA_TEKRAM_DONGLE       = 0,
-	IRDA_ESI_DONGLE          = 1,
-	IRDA_ACTISYS_DONGLE      = 2,
-	IRDA_ACTISYS_PLUS_DONGLE = 3,
-	IRDA_GIRBIL_DONGLE       = 4,
-	IRDA_LITELINK_DONGLE     = 5,
-	IRDA_AIRPORT_DONGLE      = 6,
-	IRDA_OLD_BELKIN_DONGLE   = 7,
-	IRDA_EP7211_IR           = 8,
-	IRDA_MCP2120_DONGLE      = 9,
-	IRDA_ACT200L_DONGLE      = 10,
-	IRDA_MA600_DONGLE        = 11,
-	IRDA_TOIM3232_DONGLE     = 12,
-	IRDA_EP7211_DONGLE       = 13,
-} IRDA_DONGLE;
-
-/* Protocol types to be used for SOCK_DGRAM */
-enum {
-	IRDAPROTO_UNITDATA = 0,
-	IRDAPROTO_ULTRA    = 1,
-	IRDAPROTO_MAX
-};
-
-#define SOL_IRLMP      266 /* Same as SOL_IRDA for now */
-#define SOL_IRTTP      266 /* Same as SOL_IRDA for now */
-
-#define IRLMP_ENUMDEVICES        1	/* Return discovery log */
-#define IRLMP_IAS_SET            2	/* Set an attribute in local IAS */
-#define IRLMP_IAS_QUERY          3	/* Query remote IAS for attribute */
-#define IRLMP_HINTS_SET          4	/* Set hint bits advertised */
-#define IRLMP_QOS_SET            5
-#define IRLMP_QOS_GET            6
-#define IRLMP_MAX_SDU_SIZE       7
-#define IRLMP_IAS_GET            8	/* Get an attribute from local IAS */
-#define IRLMP_IAS_DEL		 9	/* Remove attribute from local IAS */
-#define IRLMP_HINT_MASK_SET	10	/* Set discovery filter */
-#define IRLMP_WAITDEVICE	11	/* Wait for a new discovery */
-
-#define IRTTP_MAX_SDU_SIZE IRLMP_MAX_SDU_SIZE /* Compatibility */
-
-#define IAS_MAX_STRING         256	/* See IrLMP 1.1, 4.3.3.2 */
-#define IAS_MAX_OCTET_STRING  1024	/* See IrLMP 1.1, 4.3.3.2 */
-#define IAS_MAX_CLASSNAME       60	/* See IrLMP 1.1, 4.3.1 */
-#define IAS_MAX_ATTRIBNAME      60	/* See IrLMP 1.1, 4.3.3.1 */
-#define IAS_MAX_ATTRIBNUMBER   256	/* See IrLMP 1.1, 4.3.3.1 */
-/* For user space backward compatibility - may be fixed in kernel 2.5.X
- * Note : need 60+1 ('\0'), make it 64 for alignement - Jean II */
-#define IAS_EXPORT_CLASSNAME       64
-#define IAS_EXPORT_ATTRIBNAME     256
-
-/* Attribute type needed for struct irda_ias_set */
-#define IAS_MISSING 0
-#define IAS_INTEGER 1
-#define IAS_OCT_SEQ 2
-#define IAS_STRING  3
-
-#define LSAP_ANY              0xff
-
-struct sockaddr_irda {
-	__kernel_sa_family_t sir_family; /* AF_IRDA */
-	__u8        sir_lsap_sel; /* LSAP selector */
-	__u32       sir_addr;     /* Device address */
-	char        sir_name[25]; /* Usually <service>:IrDA:TinyTP */
-};
-
-struct irda_device_info {
-	__u32       saddr;    /* Address of local interface */
-	__u32       daddr;    /* Address of remote device */
-	char        info[22]; /* Description */
-	__u8        charset;  /* Charset used for description */
-	__u8        hints[2]; /* Hint bits */
-};
-
-struct irda_device_list {
-       __u32 len;
-       struct irda_device_info dev[1];
-};
-
-struct irda_ias_set {
-	char irda_class_name[IAS_EXPORT_CLASSNAME];
-	char irda_attrib_name[IAS_EXPORT_ATTRIBNAME];
-	unsigned int irda_attrib_type;
-	union {
-		unsigned int irda_attrib_int;
-		struct {
-			unsigned short len;
-			__u8 octet_seq[IAS_MAX_OCTET_STRING];
-		} irda_attrib_octet_seq;
-		struct {
-			__u8 len;
-			__u8 charset;
-			__u8 string[IAS_MAX_STRING];
-		} irda_attrib_string;
-	} attribute;
-	__u32       daddr;    /* Address of device (for some queries only) */
-};
-
-/* Some private IOCTL's (max 16) */
-#define SIOCSDONGLE    (SIOCDEVPRIVATE + 0)
-#define SIOCGDONGLE    (SIOCDEVPRIVATE + 1)
-#define SIOCSBANDWIDTH (SIOCDEVPRIVATE + 2)
-#define SIOCSMEDIABUSY (SIOCDEVPRIVATE + 3)
-#define SIOCGMEDIABUSY (SIOCDEVPRIVATE + 4)
-#define SIOCGRECEIVING (SIOCDEVPRIVATE + 5)
-#define SIOCSMODE      (SIOCDEVPRIVATE + 6)
-#define SIOCGMODE      (SIOCDEVPRIVATE + 7)
-#define SIOCSDTRRTS    (SIOCDEVPRIVATE + 8)
-#define SIOCGQOS       (SIOCDEVPRIVATE + 9)
-
-/* No reason to include <linux/if.h> just because of this one ;-) */
-#define IRNAMSIZ 16 
-
-/* IrDA quality of service information (must not exceed 16 bytes) */
-struct if_irda_qos {
-	unsigned long  baudrate;
-	unsigned short data_size;
-	unsigned short window_size;
-	unsigned short min_turn_time;
-	unsigned short max_turn_time;
-	unsigned char  add_bofs;
-	unsigned char  link_disc;
-};
-
-/* For setting RTS and DTR lines of a dongle */
-struct if_irda_line {
-	__u8 dtr;
-	__u8 rts;
-};
-
-/* IrDA interface configuration (data part must not exceed 16 bytes) */
-struct if_irda_req {
-	union {
-		char ifrn_name[IRNAMSIZ];  /* if name, e.g. "irda0" */
-	} ifr_ifrn;
-	
-	/* Data part */
-	union {
-		struct if_irda_line ifru_line;
-		struct if_irda_qos  ifru_qos;
-		unsigned short      ifru_flags;
-		unsigned int        ifru_receiving;
-		unsigned int        ifru_mode;
-		unsigned int        ifru_dongle;
-	} ifr_ifru;
-};
-
-#define ifr_baudrate  ifr_ifru.ifru_qos.baudrate
-#define ifr_receiving ifr_ifru.ifru_receiving 
-#define ifr_dongle    ifr_ifru.ifru_dongle
-#define ifr_mode      ifr_ifru.ifru_mode
-#define ifr_dtr       ifr_ifru.ifru_line.dtr
-#define ifr_rts       ifr_ifru.ifru_line.rts
-
-
-/* IrDA netlink definitions */
-#define IRDA_NL_NAME "irda"
-#define IRDA_NL_VERSION 1
-
-enum irda_nl_commands {
-	IRDA_NL_CMD_UNSPEC,
-	IRDA_NL_CMD_SET_MODE,
-	IRDA_NL_CMD_GET_MODE,
-
-	__IRDA_NL_CMD_AFTER_LAST
-};
-#define IRDA_NL_CMD_MAX (__IRDA_NL_CMD_AFTER_LAST - 1)
-
-enum nl80211_attrs {
-	IRDA_NL_ATTR_UNSPEC,
-	IRDA_NL_ATTR_IFNAME,
-	IRDA_NL_ATTR_MODE,
-
-	__IRDA_NL_ATTR_AFTER_LAST
-};
-#define IRDA_NL_ATTR_MAX (__IRDA_NL_ATTR_AFTER_LAST - 1)
-
-/* IrDA modes */
-#define IRDA_MODE_PRIMARY   0x1
-#define IRDA_MODE_SECONDARY 0x2
-#define IRDA_MODE_MONITOR   0x4
-
-#endif /* KERNEL_IRDA_H */
-
-
-
-
diff --git a/openflow/usr/include/linux/irqnr.h b/openflow/usr/include/linux/irqnr.h
deleted file mode 100644
index ae5704f..0000000
--- a/openflow/usr/include/linux/irqnr.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * There isn't anything here anymore, but the file must not be empty or patch
- * will delete it.
- */
diff --git a/openflow/usr/include/linux/isdn.h b/openflow/usr/include/linux/isdn.h
deleted file mode 100644
index 55c0a1e..0000000
--- a/openflow/usr/include/linux/isdn.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* $Id: isdn.h,v 1.125.2.3 2004/02/10 01:07:14 keil Exp $
- *
- * Main header for the Linux ISDN subsystem (linklevel).
- *
- * Copyright 1994,95,96 by Fritz Elfert (fritz@isdn4linux.de)
- * Copyright 1995,96    by Thinking Objects Software GmbH Wuerzburg
- * Copyright 1995,96    by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de)
- * 
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#ifndef __ISDN_H__
-#define __ISDN_H__
-
-#include <linux/ioctl.h>
-#include <linux/tty.h>
-
-#define ISDN_MAX_DRIVERS    32
-#define ISDN_MAX_CHANNELS   64
-
-/* New ioctl-codes */
-#define IIOCNETAIF  _IO('I',1)
-#define IIOCNETDIF  _IO('I',2)
-#define IIOCNETSCF  _IO('I',3)
-#define IIOCNETGCF  _IO('I',4)
-#define IIOCNETANM  _IO('I',5)
-#define IIOCNETDNM  _IO('I',6)
-#define IIOCNETGNM  _IO('I',7)
-#define IIOCGETSET  _IO('I',8) /* no longer supported */
-#define IIOCSETSET  _IO('I',9) /* no longer supported */
-#define IIOCSETVER  _IO('I',10)
-#define IIOCNETHUP  _IO('I',11)
-#define IIOCSETGST  _IO('I',12)
-#define IIOCSETBRJ  _IO('I',13)
-#define IIOCSIGPRF  _IO('I',14)
-#define IIOCGETPRF  _IO('I',15)
-#define IIOCSETPRF  _IO('I',16)
-#define IIOCGETMAP  _IO('I',17)
-#define IIOCSETMAP  _IO('I',18)
-#define IIOCNETASL  _IO('I',19)
-#define IIOCNETDIL  _IO('I',20)
-#define IIOCGETCPS  _IO('I',21)
-#define IIOCGETDVR  _IO('I',22)
-#define IIOCNETLCR  _IO('I',23) /* dwabc ioctl for LCR from isdnlog */
-#define IIOCNETDWRSET  _IO('I',24) /* dwabc ioctl to reset abc-values to default on a net-interface */
-
-#define IIOCNETALN  _IO('I',32)
-#define IIOCNETDLN  _IO('I',33)
-
-#define IIOCNETGPN  _IO('I',34)
-
-#define IIOCDBGVAR  _IO('I',127)
-
-#define IIOCDRVCTL  _IO('I',128)
-
-/* cisco hdlck device private ioctls */
-#define SIOCGKEEPPERIOD	(SIOCDEVPRIVATE + 0)
-#define SIOCSKEEPPERIOD	(SIOCDEVPRIVATE + 1)
-#define SIOCGDEBSERINT	(SIOCDEVPRIVATE + 2)
-#define SIOCSDEBSERINT	(SIOCDEVPRIVATE + 3)
-
-/* Packet encapsulations for net-interfaces */
-#define ISDN_NET_ENCAP_ETHER      0
-#define ISDN_NET_ENCAP_RAWIP      1
-#define ISDN_NET_ENCAP_IPTYP      2
-#define ISDN_NET_ENCAP_CISCOHDLC  3 /* Without SLARP and keepalive */
-#define ISDN_NET_ENCAP_SYNCPPP    4
-#define ISDN_NET_ENCAP_UIHDLC     5
-#define ISDN_NET_ENCAP_CISCOHDLCK 6 /* With SLARP and keepalive    */
-#define ISDN_NET_ENCAP_X25IFACE   7 /* Documentation/networking/x25-iface.txt */
-#define ISDN_NET_ENCAP_MAX_ENCAP  ISDN_NET_ENCAP_X25IFACE
-
-/* Facility which currently uses an ISDN-channel */
-#define ISDN_USAGE_NONE       0
-#define ISDN_USAGE_RAW        1
-#define ISDN_USAGE_MODEM      2
-#define ISDN_USAGE_NET        3
-#define ISDN_USAGE_VOICE      4
-#define ISDN_USAGE_FAX        5
-#define ISDN_USAGE_MASK       7 /* Mask to get plain usage */
-#define ISDN_USAGE_DISABLED  32 /* This bit is set, if channel is disabled */
-#define ISDN_USAGE_EXCLUSIVE 64 /* This bit is set, if channel is exclusive */
-#define ISDN_USAGE_OUTGOING 128 /* This bit is set, if channel is outgoing  */
-
-#define ISDN_MODEM_NUMREG    24        /* Number of Modem-Registers        */
-#define ISDN_LMSNLEN         255 /* Length of tty's Listen-MSN string */
-#define ISDN_CMSGLEN	     50	 /* Length of CONNECT-Message to add for Modem */
-
-#define ISDN_MSNLEN          32
-#define NET_DV 0x06  /* Data version for isdn_net_ioctl_cfg   */
-#define TTY_DV 0x06  /* Data version for iprofd etc.          */
-
-#define INF_DV 0x01  /* Data version for /dev/isdninfo        */
-
-typedef struct {
-  char drvid[25];
-  unsigned long arg;
-} isdn_ioctl_struct;
-
-typedef struct {
-  char name[10];
-  char phone[ISDN_MSNLEN];
-  int  outgoing;
-} isdn_net_ioctl_phone;
-
-typedef struct {
-  char name[10];     /* Name of interface                     */
-  char master[10];   /* Name of Master for Bundling           */
-  char slave[10];    /* Name of Slave for Bundling            */
-  char eaz[256];     /* EAZ/MSN                               */
-  char drvid[25];    /* DriverId for Bindings                 */
-  int  onhtime;      /* Hangup-Timeout                        */
-  int  charge;       /* Charge-Units                          */
-  int  l2_proto;     /* Layer-2 protocol                      */
-  int  l3_proto;     /* Layer-3 protocol                      */
-  int  p_encap;      /* Encapsulation                         */
-  int  exclusive;    /* Channel, if bound exclusive           */
-  int  dialmax;      /* Dial Retry-Counter                    */
-  int  slavedelay;   /* Delay until slave starts up           */
-  int  cbdelay;      /* Delay before Callback                 */
-  int  chargehup;    /* Flag: Charge-Hangup                   */
-  int  ihup;         /* Flag: Hangup-Timeout on incoming line */
-  int  secure;       /* Flag: Secure                          */
-  int  callback;     /* Flag: Callback                        */
-  int  cbhup;        /* Flag: Reject Call before Callback     */
-  int  pppbind;      /* ippp device for bindings              */
-  int  chargeint;    /* Use fixed charge interval length      */
-  int  triggercps;   /* BogoCPS needed for triggering slave   */
-  int  dialtimeout;  /* Dial-Timeout                          */
-  int  dialwait;     /* Time to wait after failed dial        */
-  int  dialmode;     /* Flag: off / on / auto                 */
-} isdn_net_ioctl_cfg;
-
-#define ISDN_NET_DIALMODE_MASK  0xC0    /* bits for status                */
-#define ISDN_NET_DM_OFF	        0x00    /* this interface is stopped      */
-#define ISDN_NET_DM_MANUAL	0x40    /* this interface is on (manual)  */
-#define ISDN_NET_DM_AUTO	0x80    /* this interface is autodial     */
-#define ISDN_NET_DIALMODE(x) ((&(x))->flags & ISDN_NET_DIALMODE_MASK)
-
-
-#endif /* __ISDN_H__ */
diff --git a/openflow/usr/include/linux/isdn/capicmd.h b/openflow/usr/include/linux/isdn/capicmd.h
deleted file mode 100644
index b58635f..0000000
--- a/openflow/usr/include/linux/isdn/capicmd.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* $Id: capicmd.h,v 1.2.6.2 2001/09/23 22:24:33 kai Exp $
- * 
- * CAPI 2.0 Interface for Linux
- * 
- * Copyright 1997 by Carsten Paeth <calle@calle.de>
- * 
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#ifndef __CAPICMD_H__
-#define __CAPICMD_H__
-
-#define CAPI_MSG_BASELEN		8
-#define CAPI_DATA_B3_REQ_LEN		(CAPI_MSG_BASELEN+4+4+2+2+2)
-#define CAPI_DATA_B3_RESP_LEN		(CAPI_MSG_BASELEN+4+2)
-
-/*----- CAPI commands -----*/
-#define CAPI_ALERT		    0x01
-#define CAPI_CONNECT		    0x02
-#define CAPI_CONNECT_ACTIVE	    0x03
-#define CAPI_CONNECT_B3_ACTIVE	    0x83
-#define CAPI_CONNECT_B3 	    0x82
-#define CAPI_CONNECT_B3_T90_ACTIVE  0x88
-#define CAPI_DATA_B3		    0x86
-#define CAPI_DISCONNECT_B3	    0x84
-#define CAPI_DISCONNECT 	    0x04
-#define CAPI_FACILITY		    0x80
-#define CAPI_INFO		    0x08
-#define CAPI_LISTEN		    0x05
-#define CAPI_MANUFACTURER	    0xff
-#define CAPI_RESET_B3		    0x87
-#define CAPI_SELECT_B_PROTOCOL	    0x41
-
-/*----- CAPI subcommands -----*/
-
-#define CAPI_REQ    0x80
-#define CAPI_CONF   0x81
-#define CAPI_IND    0x82
-#define CAPI_RESP   0x83
-
-/*----- CAPI combined commands -----*/
-
-#define CAPICMD(cmd,subcmd)	(((cmd)<<8)|(subcmd))
-
-#define CAPI_DISCONNECT_REQ		CAPICMD(CAPI_DISCONNECT,CAPI_REQ)
-#define CAPI_DISCONNECT_CONF		CAPICMD(CAPI_DISCONNECT,CAPI_CONF)
-#define CAPI_DISCONNECT_IND		CAPICMD(CAPI_DISCONNECT,CAPI_IND)
-#define CAPI_DISCONNECT_RESP		CAPICMD(CAPI_DISCONNECT,CAPI_RESP)
-
-#define CAPI_ALERT_REQ			CAPICMD(CAPI_ALERT,CAPI_REQ)
-#define CAPI_ALERT_CONF			CAPICMD(CAPI_ALERT,CAPI_CONF)
-
-#define CAPI_CONNECT_REQ		CAPICMD(CAPI_CONNECT,CAPI_REQ)
-#define CAPI_CONNECT_CONF		CAPICMD(CAPI_CONNECT,CAPI_CONF)
-#define CAPI_CONNECT_IND		CAPICMD(CAPI_CONNECT,CAPI_IND)
-#define CAPI_CONNECT_RESP		CAPICMD(CAPI_CONNECT,CAPI_RESP)
-
-#define CAPI_CONNECT_ACTIVE_REQ		CAPICMD(CAPI_CONNECT_ACTIVE,CAPI_REQ)
-#define CAPI_CONNECT_ACTIVE_CONF	CAPICMD(CAPI_CONNECT_ACTIVE,CAPI_CONF)
-#define CAPI_CONNECT_ACTIVE_IND		CAPICMD(CAPI_CONNECT_ACTIVE,CAPI_IND)
-#define CAPI_CONNECT_ACTIVE_RESP	CAPICMD(CAPI_CONNECT_ACTIVE,CAPI_RESP)
-
-#define CAPI_SELECT_B_PROTOCOL_REQ	CAPICMD(CAPI_SELECT_B_PROTOCOL,CAPI_REQ)
-#define CAPI_SELECT_B_PROTOCOL_CONF	CAPICMD(CAPI_SELECT_B_PROTOCOL,CAPI_CONF)
-
-#define CAPI_CONNECT_B3_ACTIVE_REQ	CAPICMD(CAPI_CONNECT_B3_ACTIVE,CAPI_REQ)
-#define CAPI_CONNECT_B3_ACTIVE_CONF	CAPICMD(CAPI_CONNECT_B3_ACTIVE,CAPI_CONF)
-#define CAPI_CONNECT_B3_ACTIVE_IND	CAPICMD(CAPI_CONNECT_B3_ACTIVE,CAPI_IND)
-#define CAPI_CONNECT_B3_ACTIVE_RESP	CAPICMD(CAPI_CONNECT_B3_ACTIVE,CAPI_RESP)
-
-#define CAPI_CONNECT_B3_REQ		CAPICMD(CAPI_CONNECT_B3,CAPI_REQ)
-#define CAPI_CONNECT_B3_CONF		CAPICMD(CAPI_CONNECT_B3,CAPI_CONF)
-#define CAPI_CONNECT_B3_IND		CAPICMD(CAPI_CONNECT_B3,CAPI_IND)
-#define CAPI_CONNECT_B3_RESP		CAPICMD(CAPI_CONNECT_B3,CAPI_RESP)
-
-
-#define CAPI_CONNECT_B3_T90_ACTIVE_IND	CAPICMD(CAPI_CONNECT_B3_T90_ACTIVE,CAPI_IND)
-#define CAPI_CONNECT_B3_T90_ACTIVE_RESP	CAPICMD(CAPI_CONNECT_B3_T90_ACTIVE,CAPI_RESP)
-
-#define CAPI_DATA_B3_REQ		CAPICMD(CAPI_DATA_B3,CAPI_REQ)
-#define CAPI_DATA_B3_CONF		CAPICMD(CAPI_DATA_B3,CAPI_CONF)
-#define CAPI_DATA_B3_IND		CAPICMD(CAPI_DATA_B3,CAPI_IND)
-#define CAPI_DATA_B3_RESP		CAPICMD(CAPI_DATA_B3,CAPI_RESP)
-
-#define CAPI_DISCONNECT_B3_REQ		CAPICMD(CAPI_DISCONNECT_B3,CAPI_REQ)
-#define CAPI_DISCONNECT_B3_CONF		CAPICMD(CAPI_DISCONNECT_B3,CAPI_CONF)
-#define CAPI_DISCONNECT_B3_IND		CAPICMD(CAPI_DISCONNECT_B3,CAPI_IND)
-#define CAPI_DISCONNECT_B3_RESP		CAPICMD(CAPI_DISCONNECT_B3,CAPI_RESP)
-
-#define CAPI_RESET_B3_REQ		CAPICMD(CAPI_RESET_B3,CAPI_REQ)
-#define CAPI_RESET_B3_CONF		CAPICMD(CAPI_RESET_B3,CAPI_CONF)
-#define CAPI_RESET_B3_IND		CAPICMD(CAPI_RESET_B3,CAPI_IND)
-#define CAPI_RESET_B3_RESP		CAPICMD(CAPI_RESET_B3,CAPI_RESP)
-
-#define CAPI_LISTEN_REQ			CAPICMD(CAPI_LISTEN,CAPI_REQ)
-#define CAPI_LISTEN_CONF		CAPICMD(CAPI_LISTEN,CAPI_CONF)
-
-#define CAPI_MANUFACTURER_REQ		CAPICMD(CAPI_MANUFACTURER,CAPI_REQ)
-#define CAPI_MANUFACTURER_CONF		CAPICMD(CAPI_MANUFACTURER,CAPI_CONF)
-#define CAPI_MANUFACTURER_IND		CAPICMD(CAPI_MANUFACTURER,CAPI_IND)
-#define CAPI_MANUFACTURER_RESP		CAPICMD(CAPI_MANUFACTURER,CAPI_RESP)
-
-#define CAPI_FACILITY_REQ		CAPICMD(CAPI_FACILITY,CAPI_REQ)
-#define CAPI_FACILITY_CONF		CAPICMD(CAPI_FACILITY,CAPI_CONF)
-#define CAPI_FACILITY_IND		CAPICMD(CAPI_FACILITY,CAPI_IND)
-#define CAPI_FACILITY_RESP		CAPICMD(CAPI_FACILITY,CAPI_RESP)
-
-#define CAPI_INFO_REQ			CAPICMD(CAPI_INFO,CAPI_REQ)
-#define CAPI_INFO_CONF			CAPICMD(CAPI_INFO,CAPI_CONF)
-#define CAPI_INFO_IND			CAPICMD(CAPI_INFO,CAPI_IND)
-#define CAPI_INFO_RESP			CAPICMD(CAPI_INFO,CAPI_RESP)
-
-#endif				/* __CAPICMD_H__ */
diff --git a/openflow/usr/include/linux/isdn_divertif.h b/openflow/usr/include/linux/isdn_divertif.h
deleted file mode 100644
index 67575ba..0000000
--- a/openflow/usr/include/linux/isdn_divertif.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $Id: isdn_divertif.h,v 1.4.6.1 2001/09/23 22:25:05 kai Exp $
- *
- * Header for the diversion supplementary interface for i4l.
- *
- * Author    Werner Cornelius (werner@titro.de)
- * Copyright by Werner Cornelius (werner@titro.de)
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#ifndef _LINUX_ISDN_DIVERTIF_H
-#define _LINUX_ISDN_DIVERTIF_H
-
-/***********************************************************/
-/* magic value is also used to control version information */
-/***********************************************************/
-#define DIVERT_IF_MAGIC 0x25873401
-#define DIVERT_CMD_REG  0x00  /* register command */
-#define DIVERT_CMD_REL  0x01  /* release command */
-#define DIVERT_NO_ERR   0x00  /* return value no error */
-#define DIVERT_CMD_ERR  0x01  /* invalid cmd */
-#define DIVERT_VER_ERR  0x02  /* magic/version invalid */
-#define DIVERT_REG_ERR  0x03  /* module already registered */
-#define DIVERT_REL_ERR  0x04  /* module not registered */
-#define DIVERT_REG_NAME isdn_register_divert
-
-
-#endif /* _LINUX_ISDN_DIVERTIF_H */
diff --git a/openflow/usr/include/linux/isdn_ppp.h b/openflow/usr/include/linux/isdn_ppp.h
deleted file mode 100644
index aabb015..0000000
--- a/openflow/usr/include/linux/isdn_ppp.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Linux ISDN subsystem, sync PPP, interface to ipppd
- *
- * Copyright 1994-1999  by Fritz Elfert (fritz@isdn4linux.de)
- * Copyright 1995,96    Thinking Objects Software GmbH Wuerzburg
- * Copyright 1995,96    by Michael Hipp (Michael.Hipp@student.uni-tuebingen.de)
- * Copyright 2000-2002  by Kai Germaschewski (kai@germaschewski.name)
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#ifndef _LINUX_ISDN_PPP_H
-#define _LINUX_ISDN_PPP_H
-
-#define CALLTYPE_INCOMING 0x1
-#define CALLTYPE_OUTGOING 0x2
-#define CALLTYPE_CALLBACK 0x4
-
-#define IPPP_VERSION    "2.2.0"
-
-struct pppcallinfo
-{
-  int calltype;
-  unsigned char local_num[64];
-  unsigned char remote_num[64];
-  int charge_units;
-};
-
-#define PPPIOCGCALLINFO _IOWR('t',128,struct pppcallinfo)
-#define PPPIOCBUNDLE   _IOW('t',129,int)
-#define PPPIOCGMPFLAGS _IOR('t',130,int)
-#define PPPIOCSMPFLAGS _IOW('t',131,int)
-#define PPPIOCSMPMTU   _IOW('t',132,int)
-#define PPPIOCSMPMRU   _IOW('t',133,int)
-#define PPPIOCGCOMPRESSORS _IOR('t',134,unsigned long [8])
-#define PPPIOCSCOMPRESSOR _IOW('t',135,int)
-#define PPPIOCGIFNAME      _IOR('t',136, char [IFNAMSIZ] )
-
-
-#define SC_MP_PROT       0x00000200
-#define SC_REJ_MP_PROT   0x00000400
-#define SC_OUT_SHORT_SEQ 0x00000800
-#define SC_IN_SHORT_SEQ  0x00004000
-
-#define SC_DECOMP_ON		0x01
-#define SC_COMP_ON		0x02
-#define SC_DECOMP_DISCARD	0x04
-#define SC_COMP_DISCARD		0x08
-#define SC_LINK_DECOMP_ON	0x10
-#define SC_LINK_COMP_ON		0x20
-#define SC_LINK_DECOMP_DISCARD	0x40
-#define SC_LINK_COMP_DISCARD	0x80
-
-#define ISDN_PPP_COMP_MAX_OPTIONS 16
-
-#define IPPP_COMP_FLAG_XMIT 0x1
-#define IPPP_COMP_FLAG_LINK 0x2
-
-struct isdn_ppp_comp_data {
-  int num;
-  unsigned char options[ISDN_PPP_COMP_MAX_OPTIONS];
-  int optlen;
-  int flags;
-};
-
-#endif /* _LINUX_ISDN_PPP_H */
diff --git a/openflow/usr/include/linux/isdnif.h b/openflow/usr/include/linux/isdnif.h
deleted file mode 100644
index 1db1b0b..0000000
--- a/openflow/usr/include/linux/isdnif.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $Id: isdnif.h,v 1.43.2.2 2004/01/12 23:08:35 keil Exp $
- *
- * Linux ISDN subsystem
- * Definition of the interface between the subsystem and its low-level drivers.
- *
- * Copyright 1994,95,96 by Fritz Elfert (fritz@isdn4linux.de)
- * Copyright 1995,96    Thinking Objects Software GmbH Wuerzburg
- * 
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#ifndef __ISDNIF_H__
-#define __ISDNIF_H__
-
-
-/*
- * Values for general protocol-selection
- */
-#define ISDN_PTYPE_UNKNOWN   0   /* Protocol undefined   */
-#define ISDN_PTYPE_1TR6      1   /* german 1TR6-protocol */
-#define ISDN_PTYPE_EURO      2   /* EDSS1-protocol       */
-#define ISDN_PTYPE_LEASED    3   /* for leased lines     */
-#define ISDN_PTYPE_NI1       4   /* US NI-1 protocol     */
-#define ISDN_PTYPE_MAX       7   /* Max. 8 Protocols     */
-
-/*
- * Values for Layer-2-protocol-selection
- */
-#define ISDN_PROTO_L2_X75I   0   /* X75/LAPB with I-Frames            */
-#define ISDN_PROTO_L2_X75UI  1   /* X75/LAPB with UI-Frames           */
-#define ISDN_PROTO_L2_X75BUI 2   /* X75/LAPB with UI-Frames           */
-#define ISDN_PROTO_L2_HDLC   3   /* HDLC                              */
-#define ISDN_PROTO_L2_TRANS  4   /* Transparent (Voice)               */
-#define ISDN_PROTO_L2_X25DTE 5   /* X25/LAPB DTE mode                 */
-#define ISDN_PROTO_L2_X25DCE 6   /* X25/LAPB DCE mode                 */
-#define ISDN_PROTO_L2_V11096 7   /* V.110 bitrate adaption 9600 Baud  */
-#define ISDN_PROTO_L2_V11019 8   /* V.110 bitrate adaption 19200 Baud */
-#define ISDN_PROTO_L2_V11038 9   /* V.110 bitrate adaption 38400 Baud */
-#define ISDN_PROTO_L2_MODEM  10  /* Analog Modem on Board */
-#define ISDN_PROTO_L2_FAX    11  /* Fax Group 2/3         */
-#define ISDN_PROTO_L2_HDLC_56K 12   /* HDLC 56k                          */
-#define ISDN_PROTO_L2_MAX    15  /* Max. 16 Protocols                 */
-
-/*
- * Values for Layer-3-protocol-selection
- */
-#define ISDN_PROTO_L3_TRANS	0	/* Transparent */
-#define ISDN_PROTO_L3_TRANSDSP	1	/* Transparent with DSP */
-#define ISDN_PROTO_L3_FCLASS2	2	/* Fax Group 2/3 CLASS 2 */
-#define ISDN_PROTO_L3_FCLASS1	3	/* Fax Group 2/3 CLASS 1 */
-#define ISDN_PROTO_L3_MAX	7	/* Max. 8 Protocols */
-
-
-#endif /* __ISDNIF_H__ */
diff --git a/openflow/usr/include/linux/iso_fs.h b/openflow/usr/include/linux/iso_fs.h
deleted file mode 100644
index 4688ac4..0000000
--- a/openflow/usr/include/linux/iso_fs.h
+++ /dev/null
@@ -1,165 +0,0 @@
-#ifndef _ISOFS_FS_H
-#define _ISOFS_FS_H
-
-#include <linux/types.h>
-#include <linux/magic.h>
-
-/*
- * The isofs filesystem constants/structures
- */
-
-/* This part borrowed from the bsd386 isofs */
-#define ISODCL(from, to) (to - from + 1)
-
-struct iso_volume_descriptor {
-	char type[ISODCL(1,1)]; /* 711 */
-	char id[ISODCL(2,6)];
-	char version[ISODCL(7,7)];
-	char data[ISODCL(8,2048)];
-};
-
-/* volume descriptor types */
-#define ISO_VD_PRIMARY 1
-#define ISO_VD_SUPPLEMENTARY 2
-#define ISO_VD_END 255
-
-#define ISO_STANDARD_ID "CD001"
-
-struct iso_primary_descriptor {
-	char type			[ISODCL (  1,   1)]; /* 711 */
-	char id				[ISODCL (  2,   6)];
-	char version			[ISODCL (  7,   7)]; /* 711 */
-	char unused1			[ISODCL (  8,   8)];
-	char system_id			[ISODCL (  9,  40)]; /* achars */
-	char volume_id			[ISODCL ( 41,  72)]; /* dchars */
-	char unused2			[ISODCL ( 73,  80)];
-	char volume_space_size		[ISODCL ( 81,  88)]; /* 733 */
-	char unused3			[ISODCL ( 89, 120)];
-	char volume_set_size		[ISODCL (121, 124)]; /* 723 */
-	char volume_sequence_number	[ISODCL (125, 128)]; /* 723 */
-	char logical_block_size		[ISODCL (129, 132)]; /* 723 */
-	char path_table_size		[ISODCL (133, 140)]; /* 733 */
-	char type_l_path_table		[ISODCL (141, 144)]; /* 731 */
-	char opt_type_l_path_table	[ISODCL (145, 148)]; /* 731 */
-	char type_m_path_table		[ISODCL (149, 152)]; /* 732 */
-	char opt_type_m_path_table	[ISODCL (153, 156)]; /* 732 */
-	char root_directory_record	[ISODCL (157, 190)]; /* 9.1 */
-	char volume_set_id		[ISODCL (191, 318)]; /* dchars */
-	char publisher_id		[ISODCL (319, 446)]; /* achars */
-	char preparer_id		[ISODCL (447, 574)]; /* achars */
-	char application_id		[ISODCL (575, 702)]; /* achars */
-	char copyright_file_id		[ISODCL (703, 739)]; /* 7.5 dchars */
-	char abstract_file_id		[ISODCL (740, 776)]; /* 7.5 dchars */
-	char bibliographic_file_id	[ISODCL (777, 813)]; /* 7.5 dchars */
-	char creation_date		[ISODCL (814, 830)]; /* 8.4.26.1 */
-	char modification_date		[ISODCL (831, 847)]; /* 8.4.26.1 */
-	char expiration_date		[ISODCL (848, 864)]; /* 8.4.26.1 */
-	char effective_date		[ISODCL (865, 881)]; /* 8.4.26.1 */
-	char file_structure_version	[ISODCL (882, 882)]; /* 711 */
-	char unused4			[ISODCL (883, 883)];
-	char application_data		[ISODCL (884, 1395)];
-	char unused5			[ISODCL (1396, 2048)];
-};
-
-/* Almost the same as the primary descriptor but two fields are specified */
-struct iso_supplementary_descriptor {
-	char type			[ISODCL (  1,   1)]; /* 711 */
-	char id				[ISODCL (  2,   6)];
-	char version			[ISODCL (  7,   7)]; /* 711 */
-	char flags			[ISODCL (  8,   8)]; /* 853 */
-	char system_id			[ISODCL (  9,  40)]; /* achars */
-	char volume_id			[ISODCL ( 41,  72)]; /* dchars */
-	char unused2			[ISODCL ( 73,  80)];
-	char volume_space_size		[ISODCL ( 81,  88)]; /* 733 */
-	char escape			[ISODCL ( 89, 120)]; /* 856 */
-	char volume_set_size		[ISODCL (121, 124)]; /* 723 */
-	char volume_sequence_number	[ISODCL (125, 128)]; /* 723 */
-	char logical_block_size		[ISODCL (129, 132)]; /* 723 */
-	char path_table_size		[ISODCL (133, 140)]; /* 733 */
-	char type_l_path_table		[ISODCL (141, 144)]; /* 731 */
-	char opt_type_l_path_table	[ISODCL (145, 148)]; /* 731 */
-	char type_m_path_table		[ISODCL (149, 152)]; /* 732 */
-	char opt_type_m_path_table	[ISODCL (153, 156)]; /* 732 */
-	char root_directory_record	[ISODCL (157, 190)]; /* 9.1 */
-	char volume_set_id		[ISODCL (191, 318)]; /* dchars */
-	char publisher_id		[ISODCL (319, 446)]; /* achars */
-	char preparer_id		[ISODCL (447, 574)]; /* achars */
-	char application_id		[ISODCL (575, 702)]; /* achars */
-	char copyright_file_id		[ISODCL (703, 739)]; /* 7.5 dchars */
-	char abstract_file_id		[ISODCL (740, 776)]; /* 7.5 dchars */
-	char bibliographic_file_id	[ISODCL (777, 813)]; /* 7.5 dchars */
-	char creation_date		[ISODCL (814, 830)]; /* 8.4.26.1 */
-	char modification_date		[ISODCL (831, 847)]; /* 8.4.26.1 */
-	char expiration_date		[ISODCL (848, 864)]; /* 8.4.26.1 */
-	char effective_date		[ISODCL (865, 881)]; /* 8.4.26.1 */
-	char file_structure_version	[ISODCL (882, 882)]; /* 711 */
-	char unused4			[ISODCL (883, 883)];
-	char application_data		[ISODCL (884, 1395)];
-	char unused5			[ISODCL (1396, 2048)];
-};
-
-
-#define HS_STANDARD_ID "CDROM"
-
-struct  hs_volume_descriptor {
-	char foo			[ISODCL (  1,   8)]; /* 733 */
-	char type			[ISODCL (  9,   9)]; /* 711 */
-	char id				[ISODCL ( 10,  14)];
-	char version			[ISODCL ( 15,  15)]; /* 711 */
-	char data[ISODCL(16,2048)];
-};
-
-
-struct hs_primary_descriptor {
-	char foo			[ISODCL (  1,   8)]; /* 733 */
-	char type			[ISODCL (  9,   9)]; /* 711 */
-	char id				[ISODCL ( 10,  14)];
-	char version			[ISODCL ( 15,  15)]; /* 711 */
-	char unused1			[ISODCL ( 16,  16)]; /* 711 */
-	char system_id			[ISODCL ( 17,  48)]; /* achars */
-	char volume_id			[ISODCL ( 49,  80)]; /* dchars */
-	char unused2			[ISODCL ( 81,  88)]; /* 733 */
-	char volume_space_size		[ISODCL ( 89,  96)]; /* 733 */
-	char unused3			[ISODCL ( 97, 128)]; /* 733 */
-	char volume_set_size		[ISODCL (129, 132)]; /* 723 */
-	char volume_sequence_number	[ISODCL (133, 136)]; /* 723 */
-	char logical_block_size		[ISODCL (137, 140)]; /* 723 */
-	char path_table_size		[ISODCL (141, 148)]; /* 733 */
-	char type_l_path_table		[ISODCL (149, 152)]; /* 731 */
-	char unused4			[ISODCL (153, 180)]; /* 733 */
-	char root_directory_record	[ISODCL (181, 214)]; /* 9.1 */
-};
-
-/* We use this to help us look up the parent inode numbers. */
-
-struct iso_path_table{
-	unsigned char  name_len[2];	/* 721 */
-	char extent[4];		/* 731 */
-	char  parent[2];	/* 721 */
-	char name[0];
-} __attribute__((packed));
-
-/* high sierra is identical to iso, except that the date is only 6 bytes, and
-   there is an extra reserved byte after the flags */
-
-struct iso_directory_record {
-	char length			[ISODCL (1, 1)]; /* 711 */
-	char ext_attr_length		[ISODCL (2, 2)]; /* 711 */
-	char extent			[ISODCL (3, 10)]; /* 733 */
-	char size			[ISODCL (11, 18)]; /* 733 */
-	char date			[ISODCL (19, 25)]; /* 7 by 711 */
-	char flags			[ISODCL (26, 26)];
-	char file_unit_size		[ISODCL (27, 27)]; /* 711 */
-	char interleave			[ISODCL (28, 28)]; /* 711 */
-	char volume_sequence_number	[ISODCL (29, 32)]; /* 723 */
-	unsigned char name_len		[ISODCL (33, 33)]; /* 711 */
-	char name			[0];
-} __attribute__((packed));
-
-#define ISOFS_BLOCK_BITS 11
-#define ISOFS_BLOCK_SIZE 2048
-
-#define ISOFS_BUFFER_SIZE(INODE) ((INODE)->i_sb->s_blocksize)
-#define ISOFS_BUFFER_BITS(INODE) ((INODE)->i_sb->s_blocksize_bits)
-
-#endif /* _ISOFS_FS_H */
diff --git a/openflow/usr/include/linux/ivtv.h b/openflow/usr/include/linux/ivtv.h
deleted file mode 100644
index 120e82c..0000000
--- a/openflow/usr/include/linux/ivtv.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Public ivtv API header
-    Copyright (C) 2003-2004  Kevin Thayer <nufan_wfk at yahoo.com>
-    Copyright (C) 2004-2007  Hans Verkuil <hverkuil@xs4all.nl>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __LINUX_IVTV_H__
-#define __LINUX_IVTV_H__
-
-
-#include <linux/types.h>
-#include <linux/videodev2.h>
-
-/* ivtv knows several distinct output modes: MPEG streaming,
-   YUV streaming, YUV updates through user DMA and the passthrough
-   mode.
-
-   In order to clearly tell the driver that we are in user DMA
-   YUV mode you need to call IVTV_IOC_DMA_FRAME with y_source == NULL
-   first (althrough if you don't then the first time
-   DMA_FRAME is called the mode switch is done automatically).
-
-   When you close the file handle the user DMA mode is exited again.
-
-   While in one mode, you cannot use another mode (EBUSY is returned).
-
-   All this means that if you want to change the YUV interlacing
-   for the user DMA YUV mode you first need to do call IVTV_IOC_DMA_FRAME
-   with y_source == NULL before you can set the correct format using
-   VIDIOC_S_FMT.
-
-   Eventually all this should be replaced with a proper V4L2 API,
-   but for now we have to do it this way. */
-
-struct ivtv_dma_frame {
-	enum v4l2_buf_type type; /* V4L2_BUF_TYPE_VIDEO_OUTPUT */
-	__u32 pixelformat;	 /* 0 == same as destination */
-	void *y_source;   /* if NULL and type == V4L2_BUF_TYPE_VIDEO_OUTPUT,
-				    then just switch to user DMA YUV output mode */
-	void *uv_source;  /* Unused for RGB pixelformats */
-	struct v4l2_rect src;
-	struct v4l2_rect dst;
-	__u32 src_width;
-	__u32 src_height;
-};
-
-#define IVTV_IOC_DMA_FRAME		_IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtv_dma_frame)
-
-/* Select the passthrough mode (if the argument is non-zero). In the passthrough
-   mode the output of the encoder is passed immediately into the decoder. */
-#define IVTV_IOC_PASSTHROUGH_MODE	_IOW ('V', BASE_VIDIOC_PRIVATE+1, int)
-
-/* Deprecated defines: applications should use the defines from videodev2.h */
-#define IVTV_SLICED_TYPE_TELETEXT_B     V4L2_MPEG_VBI_IVTV_TELETEXT_B
-#define IVTV_SLICED_TYPE_CAPTION_525    V4L2_MPEG_VBI_IVTV_CAPTION_525
-#define IVTV_SLICED_TYPE_WSS_625        V4L2_MPEG_VBI_IVTV_WSS_625
-#define IVTV_SLICED_TYPE_VPS            V4L2_MPEG_VBI_IVTV_VPS
-
-#endif /* _LINUX_IVTV_H */
diff --git a/openflow/usr/include/linux/ivtvfb.h b/openflow/usr/include/linux/ivtvfb.h
deleted file mode 100644
index 97eaf4e..0000000
--- a/openflow/usr/include/linux/ivtvfb.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    On Screen Display cx23415 Framebuffer driver
-
-    Copyright (C) 2006, 2007  Ian Armstrong <ian@iarmst.demon.co.uk>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __LINUX_IVTVFB_H__
-#define __LINUX_IVTVFB_H__
-
-
-#include <linux/types.h>
-
-/* Framebuffer external API */
-
-struct ivtvfb_dma_frame {
-	void *source;
-	unsigned long dest_offset;
-	int count;
-};
-
-#define IVTVFB_IOC_DMA_FRAME 	_IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
-
-#endif
diff --git a/openflow/usr/include/linux/ixjuser.h b/openflow/usr/include/linux/ixjuser.h
deleted file mode 100644
index 0b829f9..0000000
--- a/openflow/usr/include/linux/ixjuser.h
+++ /dev/null
@@ -1,720 +0,0 @@
-#ifndef __LINUX_IXJUSER_H
-#define __LINUX_IXJUSER_H
-
-/******************************************************************************
- *
- *    ixjuser.h
- *
- * Device Driver for Quicknet Technologies, Inc.'s Telephony cards
- * including the Internet PhoneJACK, Internet PhoneJACK Lite,
- * Internet PhoneJACK PCI, Internet LineJACK, Internet PhoneCARD and
- * SmartCABLE
- *
- *    (c) Copyright 1999-2001  Quicknet Technologies, Inc.
- *
- *    This program is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU General Public License
- *    as published by the Free Software Foundation; either version
- *    2 of the License, or (at your option) any later version.
- *
- * Author:          Ed Okerson, <eokerson@quicknet.net>
- *    
- * Contributors:    Greg Herlein, <gherlein@quicknet.net>
- *                  David W. Erhart, <derhart@quicknet.net>
- *                  John Sellers, <jsellers@quicknet.net>
- *                  Mike Preston, <mpreston@quicknet.net>
- *
- * More information about the hardware related to this driver can be found
- * at our website:    http://www.quicknet.net
- *
- * Fixes:
- *
- * IN NO EVENT SHALL QUICKNET TECHNOLOGIES, INC. BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF QUICKNET
- * TECHNOLOGIES, INC.HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * QUICKNET TECHNOLOGIES, INC. SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND QUICKNET TECHNOLOGIES, INC. HAS NO OBLIGATION 
- * TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- *****************************************************************************/
-
-#include <linux/telephony.h>
-
-
-/******************************************************************************
-*
-* IOCTL's used for the Quicknet Telephony Cards
-*
-* If you use the IXJCTL_TESTRAM command, the card must be power cycled to
-* reset the SRAM values before further use.
-*
-******************************************************************************/
-
-#define IXJCTL_DSP_RESET 		_IO  ('q', 0xC0)
-
-#define IXJCTL_RING                     PHONE_RING
-#define IXJCTL_HOOKSTATE                PHONE_HOOKSTATE
-#define IXJCTL_MAXRINGS			PHONE_MAXRINGS
-#define IXJCTL_RING_CADENCE		PHONE_RING_CADENCE
-#define IXJCTL_RING_START		PHONE_RING_START
-#define IXJCTL_RING_STOP		PHONE_RING_STOP
-
-#define IXJCTL_CARDTYPE			_IOR ('q', 0xC1, int)
-#define IXJCTL_SERIAL			_IOR ('q', 0xC2, int)
-#define IXJCTL_DSP_TYPE                 _IOR ('q', 0xC3, int)
-#define IXJCTL_DSP_VERSION              _IOR ('q', 0xC4, int)
-#define IXJCTL_VERSION              	_IOR ('q', 0xDA, char *)
-#define IXJCTL_DSP_IDLE			_IO  ('q', 0xC5)
-#define IXJCTL_TESTRAM			_IO  ('q', 0xC6)
-
-/******************************************************************************
-*
-* This group of IOCTLs deal with the record settings of the DSP
-*
-* The IXJCTL_REC_DEPTH command sets the internal buffer depth of the DSP.
-* Setting a lower depth reduces latency, but increases the demand of the
-* application to service the driver without frame loss.  The DSP has 480
-* bytes of physical buffer memory for the record channel so the true
-* maximum limit is determined by how many frames will fit in the buffer.
-*
-* 1 uncompressed (480 byte) 16-bit linear frame.
-* 2 uncompressed (240 byte) 8-bit A-law/mu-law frames.
-* 15 TrueSpeech 8.5 frames.
-* 20 TrueSpeech 6.3,5.3,4.8 or 4.1 frames.
-*
-* The default in the driver is currently set to 2 frames.
-*
-* The IXJCTL_REC_VOLUME and IXJCTL_PLAY_VOLUME commands both use a Q8
-* number as a parameter, 0x100 scales the signal by 1.0, 0x200 scales the
-* signal by 2.0, 0x80 scales the signal by 0.5.  No protection is given
-* against over-scaling, if the multiplication factor times the input
-* signal exceeds 16 bits, overflow distortion will occur.  The default
-* setting is 0x100 (1.0).
-*
-* The IXJCTL_REC_LEVEL returns the average signal level (not r.m.s.) on
-* the most recently recorded frame as a 16 bit value.
-******************************************************************************/
-
-#define IXJCTL_REC_CODEC                PHONE_REC_CODEC
-#define IXJCTL_REC_START                PHONE_REC_START
-#define IXJCTL_REC_STOP                 PHONE_REC_STOP
-#define IXJCTL_REC_DEPTH		PHONE_REC_DEPTH
-#define IXJCTL_FRAME			PHONE_FRAME
-#define IXJCTL_REC_VOLUME		PHONE_REC_VOLUME
-#define IXJCTL_REC_LEVEL		PHONE_REC_LEVEL
-
-typedef enum {
-	f300_640 = 4, f300_500, f1100, f350, f400, f480, f440, f620, f20_50,
-	f133_200, f300, f300_420, f330, f300_425, f330_440, f340, f350_400,
-	f350_440, f350_450, f360, f380_420, f392, f400_425, f400_440, f400_450,
-	f420, f425, f425_450, f425_475, f435, f440_450, f440_480, f445, f450,
-	f452, f475, f480_620, f494, f500, f520, f523, f525, f540_660, f587,
-	f590, f600, f660, f700, f740, f750, f750_1450, f770, f800, f816, f850,
-	f857_1645, f900, f900_1300, f935_1215, f941_1477, f942, f950, f950_1400,
-	f975, f1000, f1020, f1050, f1100_1750, f1140, f1200, f1209, f1330, f1336,
-	lf1366, f1380, f1400, f1477, f1600, f1633_1638, f1800, f1860
-} IXJ_FILTER_FREQ;
-
-typedef struct {
-	unsigned int filter;
-	IXJ_FILTER_FREQ freq;
-	char enable;
-} IXJ_FILTER;
-
-typedef struct {
-	char enable;
-	char en_filter;
-	unsigned int filter;
-	unsigned int on1;
-	unsigned int off1;
-	unsigned int on2;
-	unsigned int off2;
-	unsigned int on3;
-	unsigned int off3;
-} IXJ_FILTER_CADENCE;
-
-#define IXJCTL_SET_FILTER		_IOW ('q', 0xC7, IXJ_FILTER *)
-#define IXJCTL_SET_FILTER_RAW		_IOW ('q', 0xDD, IXJ_FILTER_RAW *)
-#define IXJCTL_GET_FILTER_HIST		_IOW ('q', 0xC8, int)
-#define IXJCTL_FILTER_CADENCE		_IOW ('q', 0xD6, IXJ_FILTER_CADENCE *)
-#define IXJCTL_PLAY_CID			_IO  ('q', 0xD7)
-/******************************************************************************
-*
-* This IOCTL allows you to reassign values in the tone index table.  The
-* tone table has 32 entries (0 - 31), but the driver only allows entries
-* 13 - 27 to be modified, entry 0 is reserved for silence and 1 - 12 are
-* the standard DTMF digits and 28 - 31 are the DTMF tones for A, B, C & D.
-* The positions used internally for Call Progress Tones are as follows:
-*    Dial Tone   - 25
-*    Ring Back   - 26
-*    Busy Signal - 27
-*
-* The freq values are calculated as:
-* freq = cos(2 * PI * frequency / 8000)
-*
-* The most commonly needed values are already calculated and listed in the
-* enum IXJ_TONE_FREQ.  Each tone index can have two frequencies with
-* different gains, if you are only using a single frequency set the unused
-* one to 0.
-*
-* The gain values range from 0 to 15 indicating +6dB to -24dB in 2dB
-* increments.
-*
-******************************************************************************/
-
-typedef enum {
-	hz20 = 0x7ffa,
-	hz50 = 0x7fe5,
-	hz133 = 0x7f4c,
-	hz200 = 0x7e6b,
-	hz261 = 0x7d50,		/* .63 C1  */
-	hz277 = 0x7cfa,		/* .18 CS1 */
-	hz293 = 0x7c9f,		/* .66 D1  */
-	hz300 = 0x7c75,
-	hz311 = 0x7c32,		/* .13 DS1 */
-	hz329 = 0x7bbf,		/* .63 E1  */
-	hz330 = 0x7bb8,
-	hz340 = 0x7b75,
-	hz349 = 0x7b37,		/* .23 F1  */
-	hz350 = 0x7b30,
-	hz360 = 0x7ae9,
-	hz369 = 0x7aa8,		/* .99 FS1 */
-	hz380 = 0x7a56,
-	hz392 = 0x79fa,		/* .00 G1  */
-	hz400 = 0x79bb,
-	hz415 = 0x7941,		/* .30 GS1 */
-	hz420 = 0x7918,
-	hz425 = 0x78ee,
-	hz435 = 0x7899,
-	hz440 = 0x786d,		/* .00 A1  */
-	hz445 = 0x7842,
-	hz450 = 0x7815,
-	hz452 = 0x7803,
-	hz466 = 0x7784,		/* .16 AS1 */
-	hz475 = 0x7731,
-	hz480 = 0x7701,
-	hz493 = 0x7685,		/* .88 B1  */
-	hz494 = 0x767b,
-	hz500 = 0x7640,
-	hz520 = 0x7578,
-	hz523 = 0x7559,		/* .25 C2  */
-	hz525 = 0x7544,
-	hz540 = 0x74a7,
-	hz554 = 0x7411,		/* .37 CS2 */
-	hz587 = 0x72a1,		/* .33 D2  */
-	hz590 = 0x727f,
-	hz600 = 0x720b,
-	hz620 = 0x711e,
-	hz622 = 0x7106,		/* .25 DS2 */
-	hz659 = 0x6f3b,		/* .26 E2  */
-	hz660 = 0x6f2e,
-	hz698 = 0x6d3d,		/* .46 F2  */
-	hz700 = 0x6d22,
-	hz739 = 0x6b09,		/* .99 FS2 */
-	hz740 = 0x6afa,
-	hz750 = 0x6a6c,
-	hz770 = 0x694b,
-	hz783 = 0x688b,		/* .99 G2  */
-	hz800 = 0x678d,
-	hz816 = 0x6698,
-	hz830 = 0x65bf,		/* .61 GS2 */
-	hz850 = 0x6484,
-	hz857 = 0x6414,
-	hz880 = 0x629f,		/* .00 A2  */
-	hz900 = 0x6154,
-	hz932 = 0x5f35,		/* .33 AS2 */
-	hz935 = 0x5f01,
-	hz941 = 0x5e9a,
-	hz942 = 0x5e88,
-	hz950 = 0x5dfd,
-	hz975 = 0x5c44,
-	hz1000 = 0x5a81,
-	hz1020 = 0x5912,
-	hz1050 = 0x56e2,
-	hz1100 = 0x5320,
-	hz1140 = 0x5007,
-	hz1200 = 0x4b3b,
-	hz1209 = 0x4a80,
-	hz1215 = 0x4a02,
-	hz1250 = 0x471c,
-	hz1300 = 0x42e0,
-	hz1330 = 0x4049,
-	hz1336 = 0x3fc4,
-	hz1366 = 0x3d22,
-	hz1380 = 0x3be4,
-	hz1400 = 0x3a1b,
-	hz1450 = 0x3596,
-	hz1477 = 0x331c,
-	hz1500 = 0x30fb,
-	hz1600 = 0x278d,
-	hz1633 = 0x2462,
-	hz1638 = 0x23e7,
-	hz1645 = 0x233a,
-	hz1750 = 0x18f8,
-	hz1800 = 0x1405,
-	hz1860 = 0xe0b,
-	hz2100 = 0xf5f6,
-	hz2130 = 0xf2f5,
-	hz2450 = 0xd3b3,
-	hz2750 = 0xb8e4
-} IXJ_FREQ;
-
-typedef enum {
-	C1 = hz261,
-	CS1 = hz277,
-	D1 = hz293,
-	DS1 = hz311,
-	E1 = hz329,
-	F1 = hz349,
-	FS1 = hz369,
-	G1 = hz392,
-	GS1 = hz415,
-	A1 = hz440,
-	AS1 = hz466,
-	B1 = hz493,
-	C2 = hz523,
-	CS2 = hz554,
-	D2 = hz587,
-	DS2 = hz622,
-	E2 = hz659,
-	F2 = hz698,
-	FS2 = hz739,
-	G2 = hz783,
-	GS2 = hz830,
-	A2 = hz880,
-	AS2 = hz932,
-} IXJ_NOTE;
-
-typedef struct {
-	int tone_index;
-	int freq0;
-	int gain0;
-	int freq1;
-	int gain1;
-} IXJ_TONE;
-
-#define IXJCTL_INIT_TONE		_IOW ('q', 0xC9, IXJ_TONE *)
-
-/******************************************************************************
-*
-* The IXJCTL_TONE_CADENCE ioctl defines tone sequences used for various
-* Call Progress Tones (CPT).  This is accomplished by setting up an array of
-* IXJ_CADENCE_ELEMENT structures that sequentially define the states of
-* the tone sequence.  The tone_on_time and tone_off time are in
-* 250 microsecond intervals.  A pointer to this array is passed to the
-* driver as the ce element of an IXJ_CADENCE structure.  The elements_used
-* must be set to the number of IXJ_CADENCE_ELEMENTS in the array.  The
-* termination variable defines what to do at the end of a cadence, the
-* options are to play the cadence once and stop, to repeat the last
-* element of the cadence indefinitely, or to repeat the entire cadence
-* indefinitely.  The ce variable is a pointer to the array of IXJ_TONE
-* structures.  If the freq0 variable is non-zero, the tone table contents
-* for the tone_index are updated to the frequencies and gains defined.  It
-* should be noted that DTMF tones cannot be reassigned, so if DTMF tone
-* table indexes are used in a cadence the frequency and gain variables will
-* be ignored.
-*
-* If the array elements contain frequency parameters the driver will
-* initialize the needed tone table elements and begin playing the tone,
-* there is no preset limit on the number of elements in the cadence.  If
-* there is more than one frequency used in the cadence, sequential elements
-* of different frequencies MUST use different tone table indexes.  Only one
-* cadence can be played at a time.  It is possible to build complex
-* cadences with multiple frequencies using 2 tone table indexes by
-* alternating between them.
-*
-******************************************************************************/
-
-typedef struct {
-	int index;
-	int tone_on_time;
-	int tone_off_time;
-	int freq0;
-	int gain0;
-	int freq1;
-	int gain1;
-} IXJ_CADENCE_ELEMENT;
-
-typedef enum {
-	PLAY_ONCE,
-	REPEAT_LAST_ELEMENT,
-	REPEAT_ALL
-} IXJ_CADENCE_TERM;
-
-typedef struct {
-	int elements_used;
-	IXJ_CADENCE_TERM termination;
-	IXJ_CADENCE_ELEMENT *ce;
-} IXJ_CADENCE;
-
-#define IXJCTL_TONE_CADENCE		_IOW ('q', 0xCA, IXJ_CADENCE *)
-/******************************************************************************
-*
-* This group of IOCTLs deal with the playback settings of the DSP
-*
-******************************************************************************/
-
-#define IXJCTL_PLAY_CODEC               PHONE_PLAY_CODEC
-#define IXJCTL_PLAY_START               PHONE_PLAY_START
-#define IXJCTL_PLAY_STOP                PHONE_PLAY_STOP
-#define IXJCTL_PLAY_DEPTH		PHONE_PLAY_DEPTH
-#define IXJCTL_PLAY_VOLUME		PHONE_PLAY_VOLUME
-#define IXJCTL_PLAY_LEVEL		PHONE_PLAY_LEVEL
-
-/******************************************************************************
-*
-* This group of IOCTLs deal with the Acoustic Echo Cancellation settings
-* of the DSP
-*
-* Issuing the IXJCTL_AEC_START command with a value of AEC_OFF has the
-* same effect as IXJCTL_AEC_STOP.  This is to simplify slider bar
-* controls.  IXJCTL_AEC_GET_LEVEL returns the current setting of the AEC.
-******************************************************************************/
-#define IXJCTL_AEC_START		_IOW ('q', 0xCB, int)
-#define IXJCTL_AEC_STOP			_IO  ('q', 0xCC)
-#define IXJCTL_AEC_GET_LEVEL		_IO  ('q', 0xCD)
-
-#define AEC_OFF   0
-#define AEC_LOW   1
-#define AEC_MED   2
-#define AEC_HIGH  3
-#define AEC_AUTO  4
-#define AEC_AGC   5
-/******************************************************************************
-*
-* Call Progress Tones, DTMF, etc.
-* IXJCTL_DTMF_OOB determines if DTMF signaling is sent as Out-Of-Band
-* only.  If you pass a 1, DTMF is suppressed from the audio stream.
-* Tone on and off times are in 250 microsecond intervals so
-* ioctl(ixj1, IXJCTL_SET_TONE_ON_TIME, 360);
-* will set the tone on time of board ixj1 to 360 * 250us = 90ms
-* the default values of tone on and off times is 840 or 210ms
-******************************************************************************/
-
-#define IXJCTL_DTMF_READY		PHONE_DTMF_READY
-#define IXJCTL_GET_DTMF                 PHONE_GET_DTMF
-#define IXJCTL_GET_DTMF_ASCII           PHONE_GET_DTMF_ASCII
-#define IXJCTL_DTMF_OOB			PHONE_DTMF_OOB
-#define IXJCTL_EXCEPTION		PHONE_EXCEPTION
-#define IXJCTL_PLAY_TONE		PHONE_PLAY_TONE
-#define IXJCTL_SET_TONE_ON_TIME		PHONE_SET_TONE_ON_TIME
-#define IXJCTL_SET_TONE_OFF_TIME	PHONE_SET_TONE_OFF_TIME
-#define IXJCTL_GET_TONE_ON_TIME		PHONE_GET_TONE_ON_TIME
-#define IXJCTL_GET_TONE_OFF_TIME	PHONE_GET_TONE_OFF_TIME
-#define IXJCTL_GET_TONE_STATE		PHONE_GET_TONE_STATE
-#define IXJCTL_BUSY			PHONE_BUSY
-#define IXJCTL_RINGBACK			PHONE_RINGBACK
-#define IXJCTL_DIALTONE			PHONE_DIALTONE
-#define IXJCTL_CPT_STOP			PHONE_CPT_STOP
-
-/******************************************************************************
-* LineJACK specific IOCTLs
-*
-* The lsb 4 bits of the LED argument represent the state of each of the 4
-* LED's on the LineJACK
-******************************************************************************/
-
-#define IXJCTL_SET_LED			_IOW ('q', 0xCE, int)
-#define IXJCTL_MIXER			_IOW ('q', 0xCF, int)
-
-/******************************************************************************
-* 
-* The master volume controls use attenuation with 32 levels from 0 to -62dB
-* with steps of 2dB each, the defines should be OR'ed together then sent
-* as the parameter to the mixer command to change the mixer settings.
-* 
-******************************************************************************/
-#define MIXER_MASTER_L		0x0000
-#define MIXER_MASTER_R		0x0100
-#define ATT00DB			0x00
-#define ATT02DB			0x01
-#define ATT04DB			0x02
-#define ATT06DB			0x03
-#define ATT08DB			0x04
-#define ATT10DB			0x05
-#define ATT12DB			0x06
-#define ATT14DB			0x07
-#define ATT16DB			0x08
-#define ATT18DB			0x09
-#define ATT20DB			0x0A
-#define ATT22DB			0x0B
-#define ATT24DB			0x0C
-#define ATT26DB			0x0D
-#define ATT28DB			0x0E
-#define ATT30DB			0x0F
-#define ATT32DB			0x10
-#define ATT34DB			0x11
-#define ATT36DB			0x12
-#define ATT38DB			0x13
-#define ATT40DB			0x14
-#define ATT42DB			0x15
-#define ATT44DB			0x16
-#define ATT46DB			0x17
-#define ATT48DB			0x18
-#define ATT50DB			0x19
-#define ATT52DB			0x1A
-#define ATT54DB			0x1B
-#define ATT56DB			0x1C
-#define ATT58DB			0x1D
-#define ATT60DB			0x1E
-#define ATT62DB			0x1F
-#define MASTER_MUTE		0x80
-
-/******************************************************************************
-* 
-* The input volume controls use gain with 32 levels from +12dB to -50dB
-* with steps of 2dB each, the defines should be OR'ed together then sent
-* as the parameter to the mixer command to change the mixer settings.
-* 
-******************************************************************************/
-#define MIXER_PORT_CD_L		0x0600
-#define MIXER_PORT_CD_R		0x0700
-#define MIXER_PORT_LINE_IN_L	0x0800
-#define MIXER_PORT_LINE_IN_R	0x0900
-#define MIXER_PORT_POTS_REC	0x0C00
-#define MIXER_PORT_MIC		0x0E00
-
-#define GAIN12DB		0x00
-#define GAIN10DB		0x01
-#define GAIN08DB		0x02
-#define GAIN06DB		0x03
-#define GAIN04DB		0x04
-#define GAIN02DB		0x05
-#define GAIN00DB		0x06
-#define GAIN_02DB		0x07
-#define GAIN_04DB		0x08
-#define GAIN_06DB		0x09
-#define GAIN_08DB		0x0A
-#define GAIN_10DB		0x0B
-#define GAIN_12DB		0x0C
-#define GAIN_14DB		0x0D
-#define GAIN_16DB		0x0E
-#define GAIN_18DB		0x0F
-#define GAIN_20DB		0x10
-#define GAIN_22DB		0x11
-#define GAIN_24DB		0x12
-#define GAIN_26DB		0x13
-#define GAIN_28DB		0x14
-#define GAIN_30DB		0x15
-#define GAIN_32DB		0x16
-#define GAIN_34DB		0x17
-#define GAIN_36DB		0x18
-#define GAIN_38DB		0x19
-#define GAIN_40DB		0x1A
-#define GAIN_42DB		0x1B
-#define GAIN_44DB		0x1C
-#define GAIN_46DB		0x1D
-#define GAIN_48DB		0x1E
-#define GAIN_50DB		0x1F
-#define INPUT_MUTE		0x80
-
-/******************************************************************************
-* 
-* The POTS volume control use attenuation with 8 levels from 0dB to -28dB
-* with steps of 4dB each, the defines should be OR'ed together then sent
-* as the parameter to the mixer command to change the mixer settings.
-* 
-******************************************************************************/
-#define MIXER_PORT_POTS_PLAY	0x0F00
-
-#define POTS_ATT_00DB		0x00
-#define POTS_ATT_04DB		0x01
-#define POTS_ATT_08DB		0x02
-#define POTS_ATT_12DB		0x03
-#define POTS_ATT_16DB		0x04
-#define POTS_ATT_20DB		0x05
-#define POTS_ATT_24DB		0x06
-#define POTS_ATT_28DB		0x07
-#define POTS_MUTE		0x80
-
-/******************************************************************************
-* 
-* The DAA controls the interface to the PSTN port.  The driver loads the
-* US coefficients by default, so if you live in a different country you
-* need to load the set for your countries phone system.
-* 
-******************************************************************************/
-#define IXJCTL_DAA_COEFF_SET		_IOW ('q', 0xD0, int)
-
-#define DAA_US 		1	/*PITA 8kHz */
-#define DAA_UK 		2	/*ISAR34 8kHz */
-#define DAA_FRANCE 	3	/* */
-#define DAA_GERMANY	4
-#define DAA_AUSTRALIA	5
-#define DAA_JAPAN	6
-
-/******************************************************************************
-* 
-* Use IXJCTL_PORT to set or query the port the card is set to.  If the
-* argument is set to PORT_QUERY, the return value of the ioctl will
-* indicate which port is currently in use, otherwise it will change the
-* port.
-* 
-******************************************************************************/
-#define IXJCTL_PORT			_IOW ('q', 0xD1, int)
-
-#define PORT_QUERY	0
-#define PORT_POTS	1
-#define PORT_PSTN	2
-#define PORT_SPEAKER	3
-#define PORT_HANDSET	4
-
-#define IXJCTL_PSTN_SET_STATE		PHONE_PSTN_SET_STATE
-#define IXJCTL_PSTN_GET_STATE		PHONE_PSTN_GET_STATE
-
-#define PSTN_ON_HOOK	0
-#define PSTN_RINGING	1
-#define PSTN_OFF_HOOK	2
-#define PSTN_PULSE_DIAL	3
-
-/******************************************************************************
-* 
-* The DAA Analog GAIN sets 2 parameters at one time, the receive gain (AGRR), 
-* and the transmit gain (AGX).  OR together the components and pass them
-* as the parameter to IXJCTL_DAA_AGAIN.  The default setting is both at 0dB.
-* 
-******************************************************************************/
-#define IXJCTL_DAA_AGAIN		_IOW ('q', 0xD2, int)
-
-#define AGRR00DB	0x00	/* Analog gain in receive direction 0dB */
-#define AGRR3_5DB	0x10	/* Analog gain in receive direction 3.5dB */
-#define AGRR06DB	0x30	/* Analog gain in receive direction 6dB */
-
-#define AGX00DB		0x00	/* Analog gain in transmit direction 0dB */
-#define AGX_6DB		0x04	/* Analog gain in transmit direction -6dB */
-#define AGX3_5DB	0x08	/* Analog gain in transmit direction 3.5dB */
-#define AGX_2_5B	0x0C	/* Analog gain in transmit direction -2.5dB */
-
-#define IXJCTL_PSTN_LINETEST		_IO  ('q', 0xD3)
-
-#define IXJCTL_CID			_IOR ('q', 0xD4, PHONE_CID *)
-#define IXJCTL_VMWI			_IOR ('q', 0xD8, int)
-#define IXJCTL_CIDCW			_IOW ('q', 0xD9, PHONE_CID *)
-/******************************************************************************
-* 
-* The wink duration is tunable with this ioctl.  The default wink duration  
-* is 320ms.  You do not need to use this ioctl if you do not require a
-* different wink duration.
-* 
-******************************************************************************/
-#define IXJCTL_WINK_DURATION		PHONE_WINK_DURATION
-
-/******************************************************************************
-* 
-* This ioctl will connect the POTS port to the PSTN port on the LineJACK
-* In order for this to work properly the port selection should be set to
-* the PSTN port with IXJCTL_PORT prior to calling this ioctl.  This will
-* enable conference calls between PSTN callers and network callers.
-* Passing a 1 to this ioctl enables the POTS<->PSTN connection while
-* passing a 0 turns it back off.
-* 
-******************************************************************************/
-#define IXJCTL_POTS_PSTN		_IOW ('q', 0xD5, int)
-
-/******************************************************************************
-*
-* IOCTLs added by request.
-*
-* IXJCTL_HZ sets the value your Linux kernel uses for HZ as defined in
-*           /usr/include/asm/param.h, this determines the fundamental
-*           frequency of the clock ticks on your Linux system.  The kernel
-*           must be rebuilt if you change this value, also all modules you
-*           use (except this one) must be recompiled.  The default value
-*           is 100, and you only need to use this IOCTL if you use some
-*           other value.
-*
-*
-* IXJCTL_RATE sets the number of times per second that the driver polls
-*             the DSP.  This value cannot be larger than HZ.  By
-*             increasing both of these values, you may be able to reduce
-*             latency because the max hang time that can exist between the
-*             driver and the DSP will be reduced.
-*
-******************************************************************************/
-
-#define IXJCTL_HZ                       _IOW ('q', 0xE0, int)
-#define IXJCTL_RATE                     _IOW ('q', 0xE1, int)
-#define IXJCTL_FRAMES_READ		_IOR ('q', 0xE2, unsigned long)
-#define IXJCTL_FRAMES_WRITTEN		_IOR ('q', 0xE3, unsigned long)
-#define IXJCTL_READ_WAIT		_IOR ('q', 0xE4, unsigned long)
-#define IXJCTL_WRITE_WAIT		_IOR ('q', 0xE5, unsigned long)
-#define IXJCTL_DRYBUFFER_READ		_IOR ('q', 0xE6, unsigned long)
-#define IXJCTL_DRYBUFFER_CLEAR		_IO  ('q', 0xE7)
-#define IXJCTL_DTMF_PRESCALE		_IOW ('q', 0xE8, int)
-
-/******************************************************************************
-*
-* This ioctl allows the user application to control what events the driver
-* will send signals for, and what signals it will send for which event.
-* By default, if signaling is enabled, all events will send SIGIO when
-* they occur.  To disable signals for an event set the signal to 0.
-*
-******************************************************************************/
-typedef enum {
-	SIG_DTMF_READY,
-	SIG_HOOKSTATE,
-	SIG_FLASH,
-	SIG_PSTN_RING,
-	SIG_CALLER_ID,
-	SIG_PSTN_WINK,
-	SIG_F0, SIG_F1, SIG_F2, SIG_F3,
-	SIG_FC0, SIG_FC1, SIG_FC2, SIG_FC3,
-	SIG_READ_READY = 33,
-	SIG_WRITE_READY = 34
-} IXJ_SIGEVENT;
-
-typedef struct {
-	unsigned int event;
-	int signal;
-} IXJ_SIGDEF;
-
-#define IXJCTL_SIGCTL			_IOW ('q', 0xE9, IXJ_SIGDEF *)
-
-/******************************************************************************
-*
-* These ioctls allow the user application to change the gain in the 
-* Smart Cable of the Internet Phone Card.  Sending -1 as a value will cause
-* return value to be the current setting.  Valid values to set are 0x00 - 0x1F
-*
-* 11111 = +12 dB
-* 10111 =   0 dB
-* 00000 = -34.5 dB
-*
-* IXJCTL_SC_RXG sets the Receive gain
-* IXJCTL_SC_TXG sets the Transmit gain
-*
-******************************************************************************/
-#define IXJCTL_SC_RXG			_IOW ('q', 0xEA, int)
-#define IXJCTL_SC_TXG			_IOW ('q', 0xEB, int)
-
-/******************************************************************************
-*
-* The intercom IOCTL's short the output from one card to the input of the
-* other and vice versa (actually done in the DSP read function).  It is only
-* necessary to execute the IOCTL on one card, but it is necessary to have
-* both devices open to be able to detect hook switch changes.  The record
-* codec and rate of each card must match the playback codec and rate of
-* the other card for this to work properly.
-*
-******************************************************************************/
-
-#define IXJCTL_INTERCOM_START 		_IOW ('q', 0xFD, int)
-#define IXJCTL_INTERCOM_STOP  		_IOW ('q', 0xFE, int)
-
-/******************************************************************************
- *
- * new structure for accessing raw filter information
- *
- ******************************************************************************/
-
-typedef struct {
-	unsigned int filter;
-	char enable;
-	unsigned int coeff[19];
-} IXJ_FILTER_RAW;
-
-#endif
diff --git a/openflow/usr/include/linux/jffs2.h b/openflow/usr/include/linux/jffs2.h
deleted file mode 100644
index a18b719..0000000
--- a/openflow/usr/include/linux/jffs2.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * JFFS2 -- Journalling Flash File System, Version 2.
- *
- * Copyright © 2001-2007 Red Hat, Inc.
- * Copyright © 2004-2010 David Woodhouse <dwmw2@infradead.org>
- *
- * Created by David Woodhouse <dwmw2@infradead.org>
- *
- * For licensing information, see the file 'LICENCE' in the
- * jffs2 directory.
- */
-
-#ifndef __LINUX_JFFS2_H__
-#define __LINUX_JFFS2_H__
-
-#include <linux/types.h>
-#include <linux/magic.h>
-
-/* You must include something which defines the C99 uintXX_t types. 
-   We don't do it from here because this file is used in too many
-   different environments. */
-
-/* Values we may expect to find in the 'magic' field */
-#define JFFS2_OLD_MAGIC_BITMASK 0x1984
-#define JFFS2_MAGIC_BITMASK 0x1985
-#define KSAMTIB_CIGAM_2SFFJ 0x8519 /* For detecting wrong-endian fs */
-#define JFFS2_EMPTY_BITMASK 0xffff
-#define JFFS2_DIRTY_BITMASK 0x0000
-
-/* Summary node MAGIC marker */
-#define JFFS2_SUM_MAGIC	0x02851885
-
-/* We only allow a single char for length, and 0xFF is empty flash so
-   we don't want it confused with a real length. Hence max 254.
-*/
-#define JFFS2_MAX_NAME_LEN 254
-
-/* How small can we sensibly write nodes? */
-#define JFFS2_MIN_DATA_LEN 128
-
-#define JFFS2_COMPR_NONE	0x00
-#define JFFS2_COMPR_ZERO	0x01
-#define JFFS2_COMPR_RTIME	0x02
-#define JFFS2_COMPR_RUBINMIPS	0x03
-#define JFFS2_COMPR_COPY	0x04
-#define JFFS2_COMPR_DYNRUBIN	0x05
-#define JFFS2_COMPR_ZLIB	0x06
-#define JFFS2_COMPR_LZO		0x07
-/* Compatibility flags. */
-#define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
-#define JFFS2_NODE_ACCURATE 0x2000
-/* INCOMPAT: Fail to mount the filesystem */
-#define JFFS2_FEATURE_INCOMPAT 0xc000
-/* ROCOMPAT: Mount read-only */
-#define JFFS2_FEATURE_ROCOMPAT 0x8000
-/* RWCOMPAT_COPY: Mount read/write, and copy the node when it's GC'd */
-#define JFFS2_FEATURE_RWCOMPAT_COPY 0x4000
-/* RWCOMPAT_DELETE: Mount read/write, and delete the node when it's GC'd */
-#define JFFS2_FEATURE_RWCOMPAT_DELETE 0x0000
-
-#define JFFS2_NODETYPE_DIRENT (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 1)
-#define JFFS2_NODETYPE_INODE (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 2)
-#define JFFS2_NODETYPE_CLEANMARKER (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3)
-#define JFFS2_NODETYPE_PADDING (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 4)
-
-#define JFFS2_NODETYPE_SUMMARY (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 6)
-
-#define JFFS2_NODETYPE_XATTR (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 8)
-#define JFFS2_NODETYPE_XREF (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 9)
-
-/* XATTR Related */
-#define JFFS2_XPREFIX_USER		1	/* for "user." */
-#define JFFS2_XPREFIX_SECURITY		2	/* for "security." */
-#define JFFS2_XPREFIX_ACL_ACCESS	3	/* for "system.posix_acl_access" */
-#define JFFS2_XPREFIX_ACL_DEFAULT	4	/* for "system.posix_acl_default" */
-#define JFFS2_XPREFIX_TRUSTED		5	/* for "trusted.*" */
-
-#define JFFS2_ACL_VERSION		0x0001
-
-// Maybe later...
-//#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3)
-//#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4)
-
-
-#define JFFS2_INO_FLAG_PREREAD	  1	/* Do read_inode() for this one at
-					   mount time, don't wait for it to
-					   happen later */
-#define JFFS2_INO_FLAG_USERCOMPR  2	/* User has requested a specific
-					   compression type */
-
-
-/* These can go once we've made sure we've caught all uses without
-   byteswapping */
-
-typedef struct {
-	__u32 v32;
-} __attribute__((packed)) jint32_t;
-
-typedef struct {
-	__u32 m;
-} __attribute__((packed)) jmode_t;
-
-typedef struct {
-	__u16 v16;
-} __attribute__((packed)) jint16_t;
-
-struct jffs2_unknown_node
-{
-	/* All start like this */
-	jint16_t magic;
-	jint16_t nodetype;
-	jint32_t totlen; /* So we can skip over nodes we don't grok */
-	jint32_t hdr_crc;
-};
-
-struct jffs2_raw_dirent
-{
-	jint16_t magic;
-	jint16_t nodetype;	/* == JFFS2_NODETYPE_DIRENT */
-	jint32_t totlen;
-	jint32_t hdr_crc;
-	jint32_t pino;
-	jint32_t version;
-	jint32_t ino; /* == zero for unlink */
-	jint32_t mctime;
-	__u8 nsize;
-	__u8 type;
-	__u8 unused[2];
-	jint32_t node_crc;
-	jint32_t name_crc;
-	__u8 name[0];
-};
-
-/* The JFFS2 raw inode structure: Used for storage on physical media.  */
-/* The uid, gid, atime, mtime and ctime members could be longer, but
-   are left like this for space efficiency. If and when people decide
-   they really need them extended, it's simple enough to add support for
-   a new type of raw node.
-*/
-struct jffs2_raw_inode
-{
-	jint16_t magic;      /* A constant magic number.  */
-	jint16_t nodetype;   /* == JFFS2_NODETYPE_INODE */
-	jint32_t totlen;     /* Total length of this node (inc data, etc.) */
-	jint32_t hdr_crc;
-	jint32_t ino;        /* Inode number.  */
-	jint32_t version;    /* Version number.  */
-	jmode_t mode;       /* The file's type or mode.  */
-	jint16_t uid;        /* The file's owner.  */
-	jint16_t gid;        /* The file's group.  */
-	jint32_t isize;      /* Total resultant size of this inode (used for truncations)  */
-	jint32_t atime;      /* Last access time.  */
-	jint32_t mtime;      /* Last modification time.  */
-	jint32_t ctime;      /* Change time.  */
-	jint32_t offset;     /* Where to begin to write.  */
-	jint32_t csize;      /* (Compressed) data size */
-	jint32_t dsize;	     /* Size of the node's data. (after decompression) */
-	__u8 compr;       /* Compression algorithm used */
-	__u8 usercompr;   /* Compression algorithm requested by the user */
-	jint16_t flags;	     /* See JFFS2_INO_FLAG_* */
-	jint32_t data_crc;   /* CRC for the (compressed) data.  */
-	jint32_t node_crc;   /* CRC for the raw inode (excluding data)  */
-	__u8 data[0];
-};
-
-struct jffs2_raw_xattr {
-	jint16_t magic;
-	jint16_t nodetype;	/* = JFFS2_NODETYPE_XATTR */
-	jint32_t totlen;
-	jint32_t hdr_crc;
-	jint32_t xid;		/* XATTR identifier number */
-	jint32_t version;
-	__u8 xprefix;
-	__u8 name_len;
-	jint16_t value_len;
-	jint32_t data_crc;
-	jint32_t node_crc;
-	__u8 data[0];
-} __attribute__((packed));
-
-struct jffs2_raw_xref
-{
-	jint16_t magic;
-	jint16_t nodetype;	/* = JFFS2_NODETYPE_XREF */
-	jint32_t totlen;
-	jint32_t hdr_crc;
-	jint32_t ino;		/* inode number */
-	jint32_t xid;		/* XATTR identifier number */
-	jint32_t xseqno;	/* xref sequential number */
-	jint32_t node_crc;
-} __attribute__((packed));
-
-struct jffs2_raw_summary
-{
-	jint16_t magic;
-	jint16_t nodetype; 	/* = JFFS2_NODETYPE_SUMMARY */
-	jint32_t totlen;
-	jint32_t hdr_crc;
-	jint32_t sum_num;	/* number of sum entries*/
-	jint32_t cln_mkr;	/* clean marker size, 0 = no cleanmarker */
-	jint32_t padded;	/* sum of the size of padding nodes */
-	jint32_t sum_crc;	/* summary information crc */
-	jint32_t node_crc; 	/* node crc */
-	jint32_t sum[0]; 	/* inode summary info */
-};
-
-union jffs2_node_union
-{
-	struct jffs2_raw_inode i;
-	struct jffs2_raw_dirent d;
-	struct jffs2_raw_xattr x;
-	struct jffs2_raw_xref r;
-	struct jffs2_raw_summary s;
-	struct jffs2_unknown_node u;
-};
-
-/* Data payload for device nodes. */
-union jffs2_device_node {
-	jint16_t old_id;
-	jint32_t new_id;
-};
-
-#endif /* __LINUX_JFFS2_H__ */
diff --git a/openflow/usr/include/linux/joystick.h b/openflow/usr/include/linux/joystick.h
deleted file mode 100644
index 141a6d5..0000000
--- a/openflow/usr/include/linux/joystick.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *  Copyright (C) 1996-2000 Vojtech Pavlik
- *
- *  Sponsored by SuSE
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or 
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * 
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <vojtech@suse.cz>, or by paper mail:
- * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
- */
-#ifndef _LINUX_JOYSTICK_H
-#define _LINUX_JOYSTICK_H
-
-
-
-#include <linux/types.h>
-#include <linux/input.h>
-
-/*
- * Version
- */
-
-#define JS_VERSION		0x020100
-
-/*
- * Types and constants for reading from /dev/js
- */
-
-#define JS_EVENT_BUTTON		0x01	/* button pressed/released */
-#define JS_EVENT_AXIS		0x02	/* joystick moved */
-#define JS_EVENT_INIT		0x80	/* initial state of device */
-
-struct js_event {
-	__u32 time;	/* event timestamp in milliseconds */
-	__s16 value;	/* value */
-	__u8 type;	/* event type */
-	__u8 number;	/* axis/button number */
-};
-
-/*
- * IOCTL commands for joystick driver
- */
-
-#define JSIOCGVERSION		_IOR('j', 0x01, __u32)				/* get driver version */
-
-#define JSIOCGAXES		_IOR('j', 0x11, __u8)				/* get number of axes */
-#define JSIOCGBUTTONS		_IOR('j', 0x12, __u8)				/* get number of buttons */
-#define JSIOCGNAME(len)		_IOC(_IOC_READ, 'j', 0x13, len)			/* get identifier string */
-
-#define JSIOCSCORR		_IOW('j', 0x21, struct js_corr)			/* set correction values */
-#define JSIOCGCORR		_IOR('j', 0x22, struct js_corr)			/* get correction values */
-
-#define JSIOCSAXMAP		_IOW('j', 0x31, __u8[ABS_CNT])			/* set axis mapping */
-#define JSIOCGAXMAP		_IOR('j', 0x32, __u8[ABS_CNT])			/* get axis mapping */
-#define JSIOCSBTNMAP		_IOW('j', 0x33, __u16[KEY_MAX - BTN_MISC + 1])	/* set button mapping */
-#define JSIOCGBTNMAP		_IOR('j', 0x34, __u16[KEY_MAX - BTN_MISC + 1])	/* get button mapping */
-
-/*
- * Types and constants for get/set correction
- */
-
-#define JS_CORR_NONE		0x00	/* returns raw values */
-#define JS_CORR_BROKEN		0x01	/* broken line */
-
-struct js_corr {
-	__s32 coef[8];
-	__s16 prec;
-	__u16 type;
-};
-
-/*
- * v0.x compatibility definitions
- */
-
-#define JS_RETURN		sizeof(struct JS_DATA_TYPE)
-#define JS_TRUE			1
-#define JS_FALSE		0
-#define JS_X_0			0x01
-#define JS_Y_0			0x02
-#define JS_X_1			0x04
-#define JS_Y_1			0x08
-#define JS_MAX			2
-
-#define JS_DEF_TIMEOUT		0x1300
-#define JS_DEF_CORR		0
-#define JS_DEF_TIMELIMIT	10L
-
-#define JS_SET_CAL		1
-#define JS_GET_CAL		2
-#define JS_SET_TIMEOUT		3
-#define JS_GET_TIMEOUT		4
-#define JS_SET_TIMELIMIT	5
-#define JS_GET_TIMELIMIT	6
-#define JS_GET_ALL		7
-#define JS_SET_ALL		8
-
-struct JS_DATA_TYPE {
-	__s32 buttons;
-	__s32 x;
-	__s32 y;
-};
-
-struct JS_DATA_SAVE_TYPE_32 {
-	__s32 JS_TIMEOUT;
-	__s32 BUSY;
-	__s32 JS_EXPIRETIME;
-	__s32 JS_TIMELIMIT;
-	struct JS_DATA_TYPE JS_SAVE;
-	struct JS_DATA_TYPE JS_CORR;
-};
-
-struct JS_DATA_SAVE_TYPE_64 {
-	__s32 JS_TIMEOUT;
-	__s32 BUSY;
-	__s64 JS_EXPIRETIME;
-	__s64 JS_TIMELIMIT;
-	struct JS_DATA_TYPE JS_SAVE;
-	struct JS_DATA_TYPE JS_CORR;
-};
-
-
-#endif /* _LINUX_JOYSTICK_H */
diff --git a/openflow/usr/include/linux/kcmp.h b/openflow/usr/include/linux/kcmp.h
deleted file mode 100644
index 2dcd1b3..0000000
--- a/openflow/usr/include/linux/kcmp.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _LINUX_KCMP_H
-#define _LINUX_KCMP_H
-
-/* Comparison type */
-enum kcmp_type {
-	KCMP_FILE,
-	KCMP_VM,
-	KCMP_FILES,
-	KCMP_FS,
-	KCMP_SIGHAND,
-	KCMP_IO,
-	KCMP_SYSVSEM,
-
-	KCMP_TYPES,
-};
-
-#endif /* _LINUX_KCMP_H */
diff --git a/openflow/usr/include/linux/kd.h b/openflow/usr/include/linux/kd.h
deleted file mode 100644
index dc37bfb..0000000
--- a/openflow/usr/include/linux/kd.h
+++ /dev/null
@@ -1,185 +0,0 @@
-#ifndef _LINUX_KD_H
-#define _LINUX_KD_H
-#include <linux/types.h>
-
-
-/* 0x4B is 'K', to avoid collision with termios and vt */
-
-#define GIO_FONT	0x4B60	/* gets font in expanded form */
-#define PIO_FONT	0x4B61	/* use font in expanded form */
-
-#define GIO_FONTX	0x4B6B	/* get font using struct consolefontdesc */
-#define PIO_FONTX	0x4B6C	/* set font using struct consolefontdesc */
-struct consolefontdesc {
-	unsigned short charcount;	/* characters in font (256 or 512) */
-	unsigned short charheight;	/* scan lines per character (1-32) */
-	char *chardata;		/* font data in expanded form */
-};
-
-#define PIO_FONTRESET   0x4B6D	/* reset to default font */
-
-#define GIO_CMAP	0x4B70	/* gets colour palette on VGA+ */
-#define PIO_CMAP	0x4B71	/* sets colour palette on VGA+ */
-
-#define KIOCSOUND	0x4B2F	/* start sound generation (0 for off) */
-#define KDMKTONE	0x4B30	/* generate tone */
-
-#define KDGETLED	0x4B31	/* return current led state */
-#define KDSETLED	0x4B32	/* set led state [lights, not flags] */
-#define 	LED_SCR		0x01	/* scroll lock led */
-#define 	LED_NUM		0x02	/* num lock led */
-#define 	LED_CAP		0x04	/* caps lock led */
-
-#define KDGKBTYPE	0x4B33	/* get keyboard type */
-#define 	KB_84		0x01
-#define 	KB_101		0x02 	/* this is what we always answer */
-#define 	KB_OTHER	0x03
-
-#define KDADDIO		0x4B34	/* add i/o port as valid */
-#define KDDELIO		0x4B35	/* del i/o port as valid */
-#define KDENABIO	0x4B36	/* enable i/o to video board */
-#define KDDISABIO	0x4B37	/* disable i/o to video board */
-
-#define KDSETMODE	0x4B3A	/* set text/graphics mode */
-#define		KD_TEXT		0x00
-#define		KD_GRAPHICS	0x01
-#define		KD_TEXT0	0x02	/* obsolete */
-#define		KD_TEXT1	0x03	/* obsolete */
-#define		KD_TRANSPARENT	0x04
-
-#define KDGETMODE	0x4B3B	/* get current mode */
-
-#define KDMAPDISP	0x4B3C	/* map display into address space */
-#define KDUNMAPDISP	0x4B3D	/* unmap display from address space */
-
-typedef char scrnmap_t;
-#define		E_TABSZ		256
-#define GIO_SCRNMAP	0x4B40	/* get screen mapping from kernel */
-#define PIO_SCRNMAP	0x4B41	/* put screen mapping table in kernel */
-#define GIO_UNISCRNMAP  0x4B69	/* get full Unicode screen mapping */
-#define PIO_UNISCRNMAP  0x4B6A  /* set full Unicode screen mapping */
-
-#define GIO_UNIMAP	0x4B66	/* get unicode-to-font mapping from kernel */
-struct unipair {
-	unsigned short unicode;
-	unsigned short fontpos;
-};
-struct unimapdesc {
-	unsigned short entry_ct;
-	struct unipair *entries;
-};
-#define PIO_UNIMAP	0x4B67	/* put unicode-to-font mapping in kernel */
-#define PIO_UNIMAPCLR	0x4B68	/* clear table, possibly advise hash algorithm */
-struct unimapinit {
-	unsigned short advised_hashsize;  /* 0 if no opinion */
-	unsigned short advised_hashstep;  /* 0 if no opinion */
-	unsigned short advised_hashlevel; /* 0 if no opinion */
-};
-
-#define UNI_DIRECT_BASE 0xF000	/* start of Direct Font Region */
-#define UNI_DIRECT_MASK 0x01FF	/* Direct Font Region bitmask */
-
-#define		K_RAW		0x00
-#define		K_XLATE		0x01
-#define		K_MEDIUMRAW	0x02
-#define		K_UNICODE	0x03
-#define		K_OFF		0x04
-#define KDGKBMODE	0x4B44	/* gets current keyboard mode */
-#define KDSKBMODE	0x4B45	/* sets current keyboard mode */
-
-#define		K_METABIT	0x03
-#define		K_ESCPREFIX	0x04
-#define KDGKBMETA	0x4B62	/* gets meta key handling mode */
-#define KDSKBMETA	0x4B63	/* sets meta key handling mode */
-
-#define		K_SCROLLLOCK	0x01
-#define		K_NUMLOCK	0x02
-#define		K_CAPSLOCK	0x04
-#define	KDGKBLED	0x4B64	/* get led flags (not lights) */
-#define	KDSKBLED	0x4B65	/* set led flags (not lights) */
-
-struct kbentry {
-	unsigned char kb_table;
-	unsigned char kb_index;
-	unsigned short kb_value;
-};
-#define		K_NORMTAB	0x00
-#define		K_SHIFTTAB	0x01
-#define		K_ALTTAB	0x02
-#define		K_ALTSHIFTTAB	0x03
-
-#define KDGKBENT	0x4B46	/* gets one entry in translation table */
-#define KDSKBENT	0x4B47	/* sets one entry in translation table */
-
-struct kbsentry {
-	unsigned char kb_func;
-	unsigned char kb_string[512];
-};
-#define KDGKBSENT	0x4B48	/* gets one function key string entry */
-#define KDSKBSENT	0x4B49	/* sets one function key string entry */
-
-struct kbdiacr {
-        unsigned char diacr, base, result;
-};
-struct kbdiacrs {
-        unsigned int kb_cnt;    /* number of entries in following array */
-	struct kbdiacr kbdiacr[256];    /* MAX_DIACR from keyboard.h */
-};
-#define KDGKBDIACR      0x4B4A  /* read kernel accent table */
-#define KDSKBDIACR      0x4B4B  /* write kernel accent table */
-
-struct kbdiacruc {
-	unsigned int diacr, base, result;
-};
-struct kbdiacrsuc {
-        unsigned int kb_cnt;    /* number of entries in following array */
-	struct kbdiacruc kbdiacruc[256];    /* MAX_DIACR from keyboard.h */
-};
-#define KDGKBDIACRUC    0x4BFA  /* read kernel accent table - UCS */
-#define KDSKBDIACRUC    0x4BFB  /* write kernel accent table - UCS */
-
-struct kbkeycode {
-	unsigned int scancode, keycode;
-};
-#define KDGETKEYCODE	0x4B4C	/* read kernel keycode table entry */
-#define KDSETKEYCODE	0x4B4D	/* write kernel keycode table entry */
-
-#define KDSIGACCEPT	0x4B4E	/* accept kbd generated signals */
-
-struct kbd_repeat {
-	int delay;	/* in msec; <= 0: don't change */
-	int period;	/* in msec; <= 0: don't change */
-			/* earlier this field was misnamed "rate" */
-};
-
-#define KDKBDREP        0x4B52  /* set keyboard delay/repeat rate;
-				 * actually used values are returned */
-
-#define KDFONTOP	0x4B72	/* font operations */
-
-struct console_font_op {
-	unsigned int op;	/* operation code KD_FONT_OP_* */
-	unsigned int flags;	/* KD_FONT_FLAG_* */
-	unsigned int width, height;	/* font size */
-	unsigned int charcount;
-	unsigned char *data;	/* font data with height fixed to 32 */
-};
-
-struct console_font {
-	unsigned int width, height;	/* font size */
-	unsigned int charcount;
-	unsigned char *data;	/* font data with height fixed to 32 */
-};
-
-#define KD_FONT_OP_SET		0	/* Set font */
-#define KD_FONT_OP_GET		1	/* Get font */
-#define KD_FONT_OP_SET_DEFAULT	2	/* Set font to default, data points to name / NULL */
-#define KD_FONT_OP_COPY		3	/* Copy from another console */
-
-#define KD_FONT_FLAG_DONT_RECALC 	1	/* Don't recalculate hw charcell size [compat] */
-
-/* note: 0x4B00-0x4B4E all have had a value at some time;
-   don't reuse for the time being */
-/* note: 0x4B60-0x4B6D, 0x4B70-0x4B72 used above */
-
-#endif /* _LINUX_KD_H */
diff --git a/openflow/usr/include/linux/kdev_t.h b/openflow/usr/include/linux/kdev_t.h
deleted file mode 100644
index 3f10017..0000000
--- a/openflow/usr/include/linux/kdev_t.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _LINUX_KDEV_T_H
-#define _LINUX_KDEV_T_H
-
-/*
-Some programs want their definitions of MAJOR and MINOR and MKDEV
-from the kernel sources. These must be the externally visible ones.
-*/
-#define MAJOR(dev)	((dev)>>8)
-#define MINOR(dev)	((dev) & 0xff)
-#define MKDEV(ma,mi)	((ma)<<8 | (mi))
-#endif /* _LINUX_KDEV_T_H */
diff --git a/openflow/usr/include/linux/kernel-page-flags.h b/openflow/usr/include/linux/kernel-page-flags.h
deleted file mode 100644
index a4c6e2c..0000000
--- a/openflow/usr/include/linux/kernel-page-flags.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef LINUX_KERNEL_PAGE_FLAGS_H
-#define LINUX_KERNEL_PAGE_FLAGS_H
-
-/*
- * Stable page flag bits exported to user space
- */
-
-#define KPF_LOCKED		0
-#define KPF_ERROR		1
-#define KPF_REFERENCED		2
-#define KPF_UPTODATE		3
-#define KPF_DIRTY		4
-#define KPF_LRU			5
-#define KPF_ACTIVE		6
-#define KPF_SLAB		7
-#define KPF_WRITEBACK		8
-#define KPF_RECLAIM		9
-#define KPF_BUDDY		10
-
-/* 11-20: new additions in 2.6.31 */
-#define KPF_MMAP		11
-#define KPF_ANON		12
-#define KPF_SWAPCACHE		13
-#define KPF_SWAPBACKED		14
-#define KPF_COMPOUND_HEAD	15
-#define KPF_COMPOUND_TAIL	16
-#define KPF_HUGE		17
-#define KPF_UNEVICTABLE		18
-#define KPF_HWPOISON		19
-#define KPF_NOPAGE		20
-
-#define KPF_KSM			21
-#define KPF_THP			22
-#define KPF_BALLOON		23
-#define KPF_ZERO_PAGE		24
-#define KPF_IDLE		25
-
-
-#endif /* LINUX_KERNEL_PAGE_FLAGS_H */
diff --git a/openflow/usr/include/linux/kernel.h b/openflow/usr/include/linux/kernel.h
deleted file mode 100644
index 642d1e9..0000000
--- a/openflow/usr/include/linux/kernel.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _LINUX_KERNEL_H
-#define _LINUX_KERNEL_H
-
-#include <linux/sysinfo.h>
-
-/*
- * 'kernel.h' contains some often-used function prototypes etc
- */
-#define __ALIGN_KERNEL(x, a)		__ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
-#define __ALIGN_KERNEL_MASK(x, mask)	(((x) + (mask)) & ~(mask))
-
-
-#endif /* _LINUX_KERNEL_H */
diff --git a/openflow/usr/include/linux/kernelcapi.h b/openflow/usr/include/linux/kernelcapi.h
deleted file mode 100644
index 7b6e7b1..0000000
--- a/openflow/usr/include/linux/kernelcapi.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * $Id: kernelcapi.h,v 1.8.6.2 2001/02/07 11:31:31 kai Exp $
- * 
- * Kernel CAPI 2.0 Interface for Linux
- * 
- * (c) Copyright 1997 by Carsten Paeth (calle@calle.in-berlin.de)
- * 
- */
-
-#ifndef __KERNELCAPI_H__
-#define __KERNELCAPI_H__
-
-#define CAPI_MAXAPPL	240	/* maximum number of applications  */
-#define CAPI_MAXCONTR	32	/* maximum number of controller    */
-#define CAPI_MAXDATAWINDOW	8
-
-
-typedef struct kcapi_flagdef {
-	int contr;
-	int flag;
-} kcapi_flagdef;
-
-typedef struct kcapi_carddef {
-	char		driver[32];
-	unsigned int	port;
-	unsigned	irq;
-	unsigned int	membase;
-	int		cardnr;
-} kcapi_carddef;
-
-/* new ioctls >= 10 */
-#define KCAPI_CMD_TRACE		10
-#define KCAPI_CMD_ADDCARD	11	/* OBSOLETE */
-
-/* 
- * flag > 2 => trace also data
- * flag & 1 => show trace
- */
-#define KCAPI_TRACE_OFF			0
-#define KCAPI_TRACE_SHORT_NO_DATA	1
-#define KCAPI_TRACE_FULL_NO_DATA	2
-#define KCAPI_TRACE_SHORT		3
-#define KCAPI_TRACE_FULL		4
-
-
-
-#endif /* __KERNELCAPI_H__ */
diff --git a/openflow/usr/include/linux/kexec.h b/openflow/usr/include/linux/kexec.h
deleted file mode 100644
index 99fcbf0..0000000
--- a/openflow/usr/include/linux/kexec.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef LINUX_KEXEC_H
-#define LINUX_KEXEC_H
-
-/* kexec system call -  It loads the new kernel to boot into.
- * kexec does not sync, or unmount filesystems so if you need
- * that to happen you need to do that yourself.
- */
-
-#include <linux/types.h>
-
-/* kexec flags for different usage scenarios */
-#define KEXEC_ON_CRASH		0x00000001
-#define KEXEC_PRESERVE_CONTEXT	0x00000002
-#define KEXEC_ARCH_MASK		0xffff0000
-
-/*
- * Kexec file load interface flags.
- * KEXEC_FILE_UNLOAD : Unload already loaded kexec/kdump image.
- * KEXEC_FILE_ON_CRASH : Load/unload operation belongs to kdump image.
- * KEXEC_FILE_NO_INITRAMFS : No initramfs is being loaded. Ignore the initrd
- *                           fd field.
- */
-#define KEXEC_FILE_UNLOAD	0x00000001
-#define KEXEC_FILE_ON_CRASH	0x00000002
-#define KEXEC_FILE_NO_INITRAMFS	0x00000004
-
-/* These values match the ELF architecture values.
- * Unless there is a good reason that should continue to be the case.
- */
-#define KEXEC_ARCH_DEFAULT ( 0 << 16)
-#define KEXEC_ARCH_386     ( 3 << 16)
-#define KEXEC_ARCH_68K     ( 4 << 16)
-#define KEXEC_ARCH_X86_64  (62 << 16)
-#define KEXEC_ARCH_PPC     (20 << 16)
-#define KEXEC_ARCH_PPC64   (21 << 16)
-#define KEXEC_ARCH_IA_64   (50 << 16)
-#define KEXEC_ARCH_ARM     (40 << 16)
-#define KEXEC_ARCH_S390    (22 << 16)
-#define KEXEC_ARCH_SH      (42 << 16)
-#define KEXEC_ARCH_MIPS_LE (10 << 16)
-#define KEXEC_ARCH_MIPS    ( 8 << 16)
-
-/* The artificial cap on the number of segments passed to kexec_load. */
-#define KEXEC_SEGMENT_MAX 16
-
-/*
- * This structure is used to hold the arguments that are used when
- * loading  kernel binaries.
- */
-struct kexec_segment {
-	const void *buf;
-	size_t bufsz;
-	const void *mem;
-	size_t memsz;
-};
-
-
-#endif /* LINUX_KEXEC_H */
diff --git a/openflow/usr/include/linux/keyboard.h b/openflow/usr/include/linux/keyboard.h
deleted file mode 100644
index b4be860..0000000
--- a/openflow/usr/include/linux/keyboard.h
+++ /dev/null
@@ -1,443 +0,0 @@
-#ifndef __LINUX_KEYBOARD_H
-#define __LINUX_KEYBOARD_H
-
-#include <linux/wait.h>
-
-#define KG_SHIFT	0
-#define KG_CTRL		2
-#define KG_ALT		3
-#define KG_ALTGR	1
-#define KG_SHIFTL	4
-#define KG_KANASHIFT	4
-#define KG_SHIFTR	5
-#define KG_CTRLL	6
-#define KG_CTRLR	7
-#define KG_CAPSSHIFT	8
-
-#define NR_SHIFT	9
-
-#define NR_KEYS		256
-#define MAX_NR_KEYMAPS	256
-/* This means 128Kb if all keymaps are allocated. Only the superuser
-	may increase the number of keymaps beyond MAX_NR_OF_USER_KEYMAPS. */
-#define MAX_NR_OF_USER_KEYMAPS 256 	/* should be at least 7 */
-
-
-#define MAX_NR_FUNC	256	/* max nr of strings assigned to keys */
-
-#define KT_LATIN	0	/* we depend on this being zero */
-#define KT_LETTER	11	/* symbol that can be acted upon by CapsLock */
-#define KT_FN		1
-#define KT_SPEC		2
-#define KT_PAD		3
-#define KT_DEAD		4
-#define KT_CONS		5
-#define KT_CUR		6
-#define KT_SHIFT	7
-#define KT_META		8
-#define KT_ASCII	9
-#define KT_LOCK		10
-#define KT_SLOCK	12
-#define KT_DEAD2	13
-#define KT_BRL		14
-
-#define K(t,v)		(((t)<<8)|(v))
-#define KTYP(x)		((x) >> 8)
-#define KVAL(x)		((x) & 0xff)
-
-#define K_F1		K(KT_FN,0)
-#define K_F2		K(KT_FN,1)
-#define K_F3		K(KT_FN,2)
-#define K_F4		K(KT_FN,3)
-#define K_F5		K(KT_FN,4)
-#define K_F6		K(KT_FN,5)
-#define K_F7		K(KT_FN,6)
-#define K_F8		K(KT_FN,7)
-#define K_F9		K(KT_FN,8)
-#define K_F10		K(KT_FN,9)
-#define K_F11		K(KT_FN,10)
-#define K_F12		K(KT_FN,11)
-#define K_F13		K(KT_FN,12)
-#define K_F14		K(KT_FN,13)
-#define K_F15		K(KT_FN,14)
-#define K_F16		K(KT_FN,15)
-#define K_F17		K(KT_FN,16)
-#define K_F18		K(KT_FN,17)
-#define K_F19		K(KT_FN,18)
-#define K_F20		K(KT_FN,19)
-#define K_FIND		K(KT_FN,20)
-#define K_INSERT	K(KT_FN,21)
-#define K_REMOVE	K(KT_FN,22)
-#define K_SELECT	K(KT_FN,23)
-#define K_PGUP		K(KT_FN,24) /* PGUP is a synonym for PRIOR */
-#define K_PGDN		K(KT_FN,25) /* PGDN is a synonym for NEXT */
-#define K_MACRO	 	K(KT_FN,26)
-#define K_HELP		K(KT_FN,27)
-#define K_DO		K(KT_FN,28)
-#define K_PAUSE	 	K(KT_FN,29)
-#define K_F21		K(KT_FN,30)
-#define K_F22		K(KT_FN,31)
-#define K_F23		K(KT_FN,32)
-#define K_F24		K(KT_FN,33)
-#define K_F25		K(KT_FN,34)
-#define K_F26		K(KT_FN,35)
-#define K_F27		K(KT_FN,36)
-#define K_F28		K(KT_FN,37)
-#define K_F29		K(KT_FN,38)
-#define K_F30		K(KT_FN,39)
-#define K_F31		K(KT_FN,40)
-#define K_F32		K(KT_FN,41)
-#define K_F33		K(KT_FN,42)
-#define K_F34		K(KT_FN,43)
-#define K_F35		K(KT_FN,44)
-#define K_F36		K(KT_FN,45)
-#define K_F37		K(KT_FN,46)
-#define K_F38		K(KT_FN,47)
-#define K_F39		K(KT_FN,48)
-#define K_F40		K(KT_FN,49)
-#define K_F41		K(KT_FN,50)
-#define K_F42		K(KT_FN,51)
-#define K_F43		K(KT_FN,52)
-#define K_F44		K(KT_FN,53)
-#define K_F45		K(KT_FN,54)
-#define K_F46		K(KT_FN,55)
-#define K_F47		K(KT_FN,56)
-#define K_F48		K(KT_FN,57)
-#define K_F49		K(KT_FN,58)
-#define K_F50		K(KT_FN,59)
-#define K_F51		K(KT_FN,60)
-#define K_F52		K(KT_FN,61)
-#define K_F53		K(KT_FN,62)
-#define K_F54		K(KT_FN,63)
-#define K_F55		K(KT_FN,64)
-#define K_F56		K(KT_FN,65)
-#define K_F57		K(KT_FN,66)
-#define K_F58		K(KT_FN,67)
-#define K_F59		K(KT_FN,68)
-#define K_F60		K(KT_FN,69)
-#define K_F61		K(KT_FN,70)
-#define K_F62		K(KT_FN,71)
-#define K_F63		K(KT_FN,72)
-#define K_F64		K(KT_FN,73)
-#define K_F65		K(KT_FN,74)
-#define K_F66		K(KT_FN,75)
-#define K_F67		K(KT_FN,76)
-#define K_F68		K(KT_FN,77)
-#define K_F69		K(KT_FN,78)
-#define K_F70		K(KT_FN,79)
-#define K_F71		K(KT_FN,80)
-#define K_F72		K(KT_FN,81)
-#define K_F73		K(KT_FN,82)
-#define K_F74		K(KT_FN,83)
-#define K_F75		K(KT_FN,84)
-#define K_F76		K(KT_FN,85)
-#define K_F77		K(KT_FN,86)
-#define K_F78		K(KT_FN,87)
-#define K_F79		K(KT_FN,88)
-#define K_F80		K(KT_FN,89)
-#define K_F81		K(KT_FN,90)
-#define K_F82		K(KT_FN,91)
-#define K_F83		K(KT_FN,92)
-#define K_F84		K(KT_FN,93)
-#define K_F85		K(KT_FN,94)
-#define K_F86		K(KT_FN,95)
-#define K_F87		K(KT_FN,96)
-#define K_F88		K(KT_FN,97)
-#define K_F89		K(KT_FN,98)
-#define K_F90		K(KT_FN,99)
-#define K_F91		K(KT_FN,100)
-#define K_F92		K(KT_FN,101)
-#define K_F93		K(KT_FN,102)
-#define K_F94		K(KT_FN,103)
-#define K_F95		K(KT_FN,104)
-#define K_F96		K(KT_FN,105)
-#define K_F97		K(KT_FN,106)
-#define K_F98		K(KT_FN,107)
-#define K_F99		K(KT_FN,108)
-#define K_F100		K(KT_FN,109)
-#define K_F101		K(KT_FN,110)
-#define K_F102		K(KT_FN,111)
-#define K_F103		K(KT_FN,112)
-#define K_F104		K(KT_FN,113)
-#define K_F105		K(KT_FN,114)
-#define K_F106		K(KT_FN,115)
-#define K_F107		K(KT_FN,116)
-#define K_F108		K(KT_FN,117)
-#define K_F109		K(KT_FN,118)
-#define K_F110		K(KT_FN,119)
-#define K_F111		K(KT_FN,120)
-#define K_F112		K(KT_FN,121)
-#define K_F113		K(KT_FN,122)
-#define K_F114		K(KT_FN,123)
-#define K_F115		K(KT_FN,124)
-#define K_F116		K(KT_FN,125)
-#define K_F117		K(KT_FN,126)
-#define K_F118		K(KT_FN,127)
-#define K_F119		K(KT_FN,128)
-#define K_F120		K(KT_FN,129)
-#define K_F121		K(KT_FN,130)
-#define K_F122		K(KT_FN,131)
-#define K_F123		K(KT_FN,132)
-#define K_F124		K(KT_FN,133)
-#define K_F125		K(KT_FN,134)
-#define K_F126		K(KT_FN,135)
-#define K_F127		K(KT_FN,136)
-#define K_F128		K(KT_FN,137)
-#define K_F129		K(KT_FN,138)
-#define K_F130		K(KT_FN,139)
-#define K_F131		K(KT_FN,140)
-#define K_F132		K(KT_FN,141)
-#define K_F133		K(KT_FN,142)
-#define K_F134		K(KT_FN,143)
-#define K_F135		K(KT_FN,144)
-#define K_F136		K(KT_FN,145)
-#define K_F137		K(KT_FN,146)
-#define K_F138		K(KT_FN,147)
-#define K_F139		K(KT_FN,148)
-#define K_F140		K(KT_FN,149)
-#define K_F141		K(KT_FN,150)
-#define K_F142		K(KT_FN,151)
-#define K_F143		K(KT_FN,152)
-#define K_F144		K(KT_FN,153)
-#define K_F145		K(KT_FN,154)
-#define K_F146		K(KT_FN,155)
-#define K_F147		K(KT_FN,156)
-#define K_F148		K(KT_FN,157)
-#define K_F149		K(KT_FN,158)
-#define K_F150		K(KT_FN,159)
-#define K_F151		K(KT_FN,160)
-#define K_F152		K(KT_FN,161)
-#define K_F153		K(KT_FN,162)
-#define K_F154		K(KT_FN,163)
-#define K_F155		K(KT_FN,164)
-#define K_F156		K(KT_FN,165)
-#define K_F157		K(KT_FN,166)
-#define K_F158		K(KT_FN,167)
-#define K_F159		K(KT_FN,168)
-#define K_F160		K(KT_FN,169)
-#define K_F161		K(KT_FN,170)
-#define K_F162		K(KT_FN,171)
-#define K_F163		K(KT_FN,172)
-#define K_F164		K(KT_FN,173)
-#define K_F165		K(KT_FN,174)
-#define K_F166		K(KT_FN,175)
-#define K_F167		K(KT_FN,176)
-#define K_F168		K(KT_FN,177)
-#define K_F169		K(KT_FN,178)
-#define K_F170		K(KT_FN,179)
-#define K_F171		K(KT_FN,180)
-#define K_F172		K(KT_FN,181)
-#define K_F173		K(KT_FN,182)
-#define K_F174		K(KT_FN,183)
-#define K_F175		K(KT_FN,184)
-#define K_F176		K(KT_FN,185)
-#define K_F177		K(KT_FN,186)
-#define K_F178		K(KT_FN,187)
-#define K_F179		K(KT_FN,188)
-#define K_F180		K(KT_FN,189)
-#define K_F181		K(KT_FN,190)
-#define K_F182		K(KT_FN,191)
-#define K_F183		K(KT_FN,192)
-#define K_F184		K(KT_FN,193)
-#define K_F185		K(KT_FN,194)
-#define K_F186		K(KT_FN,195)
-#define K_F187		K(KT_FN,196)
-#define K_F188		K(KT_FN,197)
-#define K_F189		K(KT_FN,198)
-#define K_F190		K(KT_FN,199)
-#define K_F191		K(KT_FN,200)
-#define K_F192		K(KT_FN,201)
-#define K_F193		K(KT_FN,202)
-#define K_F194		K(KT_FN,203)
-#define K_F195		K(KT_FN,204)
-#define K_F196		K(KT_FN,205)
-#define K_F197		K(KT_FN,206)
-#define K_F198		K(KT_FN,207)
-#define K_F199		K(KT_FN,208)
-#define K_F200		K(KT_FN,209)
-#define K_F201		K(KT_FN,210)
-#define K_F202		K(KT_FN,211)
-#define K_F203		K(KT_FN,212)
-#define K_F204		K(KT_FN,213)
-#define K_F205		K(KT_FN,214)
-#define K_F206		K(KT_FN,215)
-#define K_F207		K(KT_FN,216)
-#define K_F208		K(KT_FN,217)
-#define K_F209		K(KT_FN,218)
-#define K_F210		K(KT_FN,219)
-#define K_F211		K(KT_FN,220)
-#define K_F212		K(KT_FN,221)
-#define K_F213		K(KT_FN,222)
-#define K_F214		K(KT_FN,223)
-#define K_F215		K(KT_FN,224)
-#define K_F216		K(KT_FN,225)
-#define K_F217		K(KT_FN,226)
-#define K_F218		K(KT_FN,227)
-#define K_F219		K(KT_FN,228)
-#define K_F220		K(KT_FN,229)
-#define K_F221		K(KT_FN,230)
-#define K_F222		K(KT_FN,231)
-#define K_F223		K(KT_FN,232)
-#define K_F224		K(KT_FN,233)
-#define K_F225		K(KT_FN,234)
-#define K_F226		K(KT_FN,235)
-#define K_F227		K(KT_FN,236)
-#define K_F228		K(KT_FN,237)
-#define K_F229		K(KT_FN,238)
-#define K_F230		K(KT_FN,239)
-#define K_F231		K(KT_FN,240)
-#define K_F232		K(KT_FN,241)
-#define K_F233		K(KT_FN,242)
-#define K_F234		K(KT_FN,243)
-#define K_F235		K(KT_FN,244)
-#define K_F236		K(KT_FN,245)
-#define K_F237		K(KT_FN,246)
-#define K_F238		K(KT_FN,247)
-#define K_F239		K(KT_FN,248)
-#define K_F240		K(KT_FN,249)
-#define K_F241		K(KT_FN,250)
-#define K_F242		K(KT_FN,251)
-#define K_F243		K(KT_FN,252)
-#define K_F244		K(KT_FN,253)
-#define K_F245		K(KT_FN,254)
-#define K_UNDO		K(KT_FN,255)
-
-
-#define K_HOLE		K(KT_SPEC,0)
-#define K_ENTER		K(KT_SPEC,1)
-#define K_SH_REGS	K(KT_SPEC,2)
-#define K_SH_MEM	K(KT_SPEC,3)
-#define K_SH_STAT	K(KT_SPEC,4)
-#define K_BREAK		K(KT_SPEC,5)
-#define K_CONS		K(KT_SPEC,6)
-#define K_CAPS		K(KT_SPEC,7)
-#define K_NUM		K(KT_SPEC,8)
-#define K_HOLD		K(KT_SPEC,9)
-#define K_SCROLLFORW	K(KT_SPEC,10)
-#define K_SCROLLBACK	K(KT_SPEC,11)
-#define K_BOOT		K(KT_SPEC,12)
-#define K_CAPSON	K(KT_SPEC,13)
-#define K_COMPOSE	K(KT_SPEC,14)
-#define K_SAK		K(KT_SPEC,15)
-#define K_DECRCONSOLE	K(KT_SPEC,16)
-#define K_INCRCONSOLE	K(KT_SPEC,17)
-#define K_SPAWNCONSOLE	K(KT_SPEC,18)
-#define K_BARENUMLOCK	K(KT_SPEC,19)
-
-#define K_ALLOCATED	K(KT_SPEC,126) /* dynamically allocated keymap */
-#define K_NOSUCHMAP	K(KT_SPEC,127) /* returned by KDGKBENT */
-
-#define K_P0		K(KT_PAD,0)
-#define K_P1		K(KT_PAD,1)
-#define K_P2		K(KT_PAD,2)
-#define K_P3		K(KT_PAD,3)
-#define K_P4		K(KT_PAD,4)
-#define K_P5		K(KT_PAD,5)
-#define K_P6		K(KT_PAD,6)
-#define K_P7		K(KT_PAD,7)
-#define K_P8		K(KT_PAD,8)
-#define K_P9		K(KT_PAD,9)
-#define K_PPLUS		K(KT_PAD,10)	/* key-pad plus */
-#define K_PMINUS	K(KT_PAD,11)	/* key-pad minus */
-#define K_PSTAR		K(KT_PAD,12)	/* key-pad asterisk (star) */
-#define K_PSLASH	K(KT_PAD,13)	/* key-pad slash */
-#define K_PENTER	K(KT_PAD,14)	/* key-pad enter */
-#define K_PCOMMA	K(KT_PAD,15)	/* key-pad comma: kludge... */
-#define K_PDOT		K(KT_PAD,16)	/* key-pad dot (period): kludge... */
-#define K_PPLUSMINUS	K(KT_PAD,17)	/* key-pad plus/minus */
-#define K_PPARENL	K(KT_PAD,18)	/* key-pad left parenthesis */
-#define K_PPARENR	K(KT_PAD,19)	/* key-pad right parenthesis */
-
-#define NR_PAD		20
-
-#define K_DGRAVE	K(KT_DEAD,0)
-#define K_DACUTE	K(KT_DEAD,1)
-#define K_DCIRCM	K(KT_DEAD,2)
-#define K_DTILDE	K(KT_DEAD,3)
-#define K_DDIERE	K(KT_DEAD,4)
-#define K_DCEDIL	K(KT_DEAD,5)
-
-#define NR_DEAD		6
-
-#define K_DOWN		K(KT_CUR,0)
-#define K_LEFT		K(KT_CUR,1)
-#define K_RIGHT		K(KT_CUR,2)
-#define K_UP		K(KT_CUR,3)
-
-#define K_SHIFT		K(KT_SHIFT,KG_SHIFT)
-#define K_CTRL		K(KT_SHIFT,KG_CTRL)
-#define K_ALT		K(KT_SHIFT,KG_ALT)
-#define K_ALTGR		K(KT_SHIFT,KG_ALTGR)
-#define K_SHIFTL	K(KT_SHIFT,KG_SHIFTL)
-#define K_SHIFTR	K(KT_SHIFT,KG_SHIFTR)
-#define K_CTRLL	 	K(KT_SHIFT,KG_CTRLL)
-#define K_CTRLR	 	K(KT_SHIFT,KG_CTRLR)
-#define K_CAPSSHIFT	K(KT_SHIFT,KG_CAPSSHIFT)
-
-#define K_ASC0		K(KT_ASCII,0)
-#define K_ASC1		K(KT_ASCII,1)
-#define K_ASC2		K(KT_ASCII,2)
-#define K_ASC3		K(KT_ASCII,3)
-#define K_ASC4		K(KT_ASCII,4)
-#define K_ASC5		K(KT_ASCII,5)
-#define K_ASC6		K(KT_ASCII,6)
-#define K_ASC7		K(KT_ASCII,7)
-#define K_ASC8		K(KT_ASCII,8)
-#define K_ASC9		K(KT_ASCII,9)
-#define K_HEX0		K(KT_ASCII,10)
-#define K_HEX1		K(KT_ASCII,11)
-#define K_HEX2		K(KT_ASCII,12)
-#define K_HEX3		K(KT_ASCII,13)
-#define K_HEX4		K(KT_ASCII,14)
-#define K_HEX5		K(KT_ASCII,15)
-#define K_HEX6		K(KT_ASCII,16)
-#define K_HEX7		K(KT_ASCII,17)
-#define K_HEX8		K(KT_ASCII,18)
-#define K_HEX9		K(KT_ASCII,19)
-#define K_HEXa		K(KT_ASCII,20)
-#define K_HEXb		K(KT_ASCII,21)
-#define K_HEXc		K(KT_ASCII,22)
-#define K_HEXd		K(KT_ASCII,23)
-#define K_HEXe		K(KT_ASCII,24)
-#define K_HEXf		K(KT_ASCII,25)
-
-#define NR_ASCII	26
-
-#define K_SHIFTLOCK	K(KT_LOCK,KG_SHIFT)
-#define K_CTRLLOCK	K(KT_LOCK,KG_CTRL)
-#define K_ALTLOCK	K(KT_LOCK,KG_ALT)
-#define K_ALTGRLOCK	K(KT_LOCK,KG_ALTGR)
-#define K_SHIFTLLOCK	K(KT_LOCK,KG_SHIFTL)
-#define K_SHIFTRLOCK	K(KT_LOCK,KG_SHIFTR)
-#define K_CTRLLLOCK	K(KT_LOCK,KG_CTRLL)
-#define K_CTRLRLOCK	K(KT_LOCK,KG_CTRLR)
-#define K_CAPSSHIFTLOCK	K(KT_LOCK,KG_CAPSSHIFT)
-
-#define K_SHIFT_SLOCK	K(KT_SLOCK,KG_SHIFT)
-#define K_CTRL_SLOCK	K(KT_SLOCK,KG_CTRL)
-#define K_ALT_SLOCK	K(KT_SLOCK,KG_ALT)
-#define K_ALTGR_SLOCK	K(KT_SLOCK,KG_ALTGR)
-#define K_SHIFTL_SLOCK	K(KT_SLOCK,KG_SHIFTL)
-#define K_SHIFTR_SLOCK	K(KT_SLOCK,KG_SHIFTR)
-#define K_CTRLL_SLOCK	K(KT_SLOCK,KG_CTRLL)
-#define K_CTRLR_SLOCK	K(KT_SLOCK,KG_CTRLR)
-#define K_CAPSSHIFT_SLOCK	K(KT_SLOCK,KG_CAPSSHIFT)
-
-#define NR_LOCK		9
-
-#define K_BRL_BLANK     K(KT_BRL, 0)
-#define K_BRL_DOT1      K(KT_BRL, 1)
-#define K_BRL_DOT2      K(KT_BRL, 2)
-#define K_BRL_DOT3      K(KT_BRL, 3)
-#define K_BRL_DOT4      K(KT_BRL, 4)
-#define K_BRL_DOT5      K(KT_BRL, 5)
-#define K_BRL_DOT6      K(KT_BRL, 6)
-#define K_BRL_DOT7      K(KT_BRL, 7)
-#define K_BRL_DOT8      K(KT_BRL, 8)
-#define K_BRL_DOT9      K(KT_BRL, 9)
-#define K_BRL_DOT10     K(KT_BRL, 10)
-
-#define NR_BRL		11
-
-#define MAX_DIACR	256
-#endif /* __LINUX_KEYBOARD_H */
diff --git a/openflow/usr/include/linux/keyctl.h b/openflow/usr/include/linux/keyctl.h
deleted file mode 100644
index 840cb99..0000000
--- a/openflow/usr/include/linux/keyctl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* keyctl.h: keyctl command IDs
- *
- * Copyright (C) 2004, 2008 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_KEYCTL_H
-#define _LINUX_KEYCTL_H
-
-/* special process keyring shortcut IDs */
-#define KEY_SPEC_THREAD_KEYRING		-1	/* - key ID for thread-specific keyring */
-#define KEY_SPEC_PROCESS_KEYRING	-2	/* - key ID for process-specific keyring */
-#define KEY_SPEC_SESSION_KEYRING	-3	/* - key ID for session-specific keyring */
-#define KEY_SPEC_USER_KEYRING		-4	/* - key ID for UID-specific keyring */
-#define KEY_SPEC_USER_SESSION_KEYRING	-5	/* - key ID for UID-session keyring */
-#define KEY_SPEC_GROUP_KEYRING		-6	/* - key ID for GID-specific keyring */
-#define KEY_SPEC_REQKEY_AUTH_KEY	-7	/* - key ID for assumed request_key auth key */
-#define KEY_SPEC_REQUESTOR_KEYRING	-8	/* - key ID for request_key() dest keyring */
-
-/* request-key default keyrings */
-#define KEY_REQKEY_DEFL_NO_CHANGE		-1
-#define KEY_REQKEY_DEFL_DEFAULT			0
-#define KEY_REQKEY_DEFL_THREAD_KEYRING		1
-#define KEY_REQKEY_DEFL_PROCESS_KEYRING		2
-#define KEY_REQKEY_DEFL_SESSION_KEYRING		3
-#define KEY_REQKEY_DEFL_USER_KEYRING		4
-#define KEY_REQKEY_DEFL_USER_SESSION_KEYRING	5
-#define KEY_REQKEY_DEFL_GROUP_KEYRING		6
-#define KEY_REQKEY_DEFL_REQUESTOR_KEYRING	7
-
-/* keyctl commands */
-#define KEYCTL_GET_KEYRING_ID		0	/* ask for a keyring's ID */
-#define KEYCTL_JOIN_SESSION_KEYRING	1	/* join or start named session keyring */
-#define KEYCTL_UPDATE			2	/* update a key */
-#define KEYCTL_REVOKE			3	/* revoke a key */
-#define KEYCTL_CHOWN			4	/* set ownership of a key */
-#define KEYCTL_SETPERM			5	/* set perms on a key */
-#define KEYCTL_DESCRIBE			6	/* describe a key */
-#define KEYCTL_CLEAR			7	/* clear contents of a keyring */
-#define KEYCTL_LINK			8	/* link a key into a keyring */
-#define KEYCTL_UNLINK			9	/* unlink a key from a keyring */
-#define KEYCTL_SEARCH			10	/* search for a key in a keyring */
-#define KEYCTL_READ			11	/* read a key or keyring's contents */
-#define KEYCTL_INSTANTIATE		12	/* instantiate a partially constructed key */
-#define KEYCTL_NEGATE			13	/* negate a partially constructed key */
-#define KEYCTL_SET_REQKEY_KEYRING	14	/* set default request-key keyring */
-#define KEYCTL_SET_TIMEOUT		15	/* set key timeout */
-#define KEYCTL_ASSUME_AUTHORITY		16	/* assume request_key() authorisation */
-#define KEYCTL_GET_SECURITY		17	/* get key security label */
-#define KEYCTL_SESSION_TO_PARENT	18	/* apply session keyring to parent process */
-#define KEYCTL_REJECT			19	/* reject a partially constructed key */
-#define KEYCTL_INSTANTIATE_IOV		20	/* instantiate a partially constructed key */
-#define KEYCTL_INVALIDATE		21	/* invalidate a key */
-#define KEYCTL_GET_PERSISTENT		22	/* get a user's persistent keyring */
-
-#endif /*  _LINUX_KEYCTL_H */
diff --git a/openflow/usr/include/linux/kvm.h b/openflow/usr/include/linux/kvm.h
deleted file mode 100644
index dcc410e..0000000
--- a/openflow/usr/include/linux/kvm.h
+++ /dev/null
@@ -1,1272 +0,0 @@
-#ifndef __LINUX_KVM_H
-#define __LINUX_KVM_H
-
-/*
- * Userspace interface for /dev/kvm - kernel based virtual machine
- *
- * Note: you must update KVM_API_VERSION if you change this interface.
- */
-
-#include <linux/types.h>
-
-#include <linux/ioctl.h>
-#include <asm/kvm.h>
-
-#define KVM_API_VERSION 12
-
-/* *** Deprecated interfaces *** */
-
-#define KVM_TRC_SHIFT           16
-
-#define KVM_TRC_ENTRYEXIT       (1 << KVM_TRC_SHIFT)
-#define KVM_TRC_HANDLER         (1 << (KVM_TRC_SHIFT + 1))
-
-#define KVM_TRC_VMENTRY         (KVM_TRC_ENTRYEXIT + 0x01)
-#define KVM_TRC_VMEXIT          (KVM_TRC_ENTRYEXIT + 0x02)
-#define KVM_TRC_PAGE_FAULT      (KVM_TRC_HANDLER + 0x01)
-
-#define KVM_TRC_HEAD_SIZE       12
-#define KVM_TRC_CYCLE_SIZE      8
-#define KVM_TRC_EXTRA_MAX       7
-
-#define KVM_TRC_INJ_VIRQ         (KVM_TRC_HANDLER + 0x02)
-#define KVM_TRC_REDELIVER_EVT    (KVM_TRC_HANDLER + 0x03)
-#define KVM_TRC_PEND_INTR        (KVM_TRC_HANDLER + 0x04)
-#define KVM_TRC_IO_READ          (KVM_TRC_HANDLER + 0x05)
-#define KVM_TRC_IO_WRITE         (KVM_TRC_HANDLER + 0x06)
-#define KVM_TRC_CR_READ          (KVM_TRC_HANDLER + 0x07)
-#define KVM_TRC_CR_WRITE         (KVM_TRC_HANDLER + 0x08)
-#define KVM_TRC_DR_READ          (KVM_TRC_HANDLER + 0x09)
-#define KVM_TRC_DR_WRITE         (KVM_TRC_HANDLER + 0x0A)
-#define KVM_TRC_MSR_READ         (KVM_TRC_HANDLER + 0x0B)
-#define KVM_TRC_MSR_WRITE        (KVM_TRC_HANDLER + 0x0C)
-#define KVM_TRC_CPUID            (KVM_TRC_HANDLER + 0x0D)
-#define KVM_TRC_INTR             (KVM_TRC_HANDLER + 0x0E)
-#define KVM_TRC_NMI              (KVM_TRC_HANDLER + 0x0F)
-#define KVM_TRC_VMMCALL          (KVM_TRC_HANDLER + 0x10)
-#define KVM_TRC_HLT              (KVM_TRC_HANDLER + 0x11)
-#define KVM_TRC_CLTS             (KVM_TRC_HANDLER + 0x12)
-#define KVM_TRC_LMSW             (KVM_TRC_HANDLER + 0x13)
-#define KVM_TRC_APIC_ACCESS      (KVM_TRC_HANDLER + 0x14)
-#define KVM_TRC_TDP_FAULT        (KVM_TRC_HANDLER + 0x15)
-#define KVM_TRC_GTLB_WRITE       (KVM_TRC_HANDLER + 0x16)
-#define KVM_TRC_STLB_WRITE       (KVM_TRC_HANDLER + 0x17)
-#define KVM_TRC_STLB_INVAL       (KVM_TRC_HANDLER + 0x18)
-#define KVM_TRC_PPC_INSTR        (KVM_TRC_HANDLER + 0x19)
-
-struct kvm_user_trace_setup {
-	__u32 buf_size;
-	__u32 buf_nr;
-};
-
-#define __KVM_DEPRECATED_MAIN_W_0x06 \
-	_IOW(KVMIO, 0x06, struct kvm_user_trace_setup)
-#define __KVM_DEPRECATED_MAIN_0x07 _IO(KVMIO, 0x07)
-#define __KVM_DEPRECATED_MAIN_0x08 _IO(KVMIO, 0x08)
-
-#define __KVM_DEPRECATED_VM_R_0x70 _IOR(KVMIO, 0x70, struct kvm_assigned_irq)
-
-struct kvm_breakpoint {
-	__u32 enabled;
-	__u32 padding;
-	__u64 address;
-};
-
-struct kvm_debug_guest {
-	__u32 enabled;
-	__u32 pad;
-	struct kvm_breakpoint breakpoints[4];
-	__u32 singlestep;
-};
-
-#define __KVM_DEPRECATED_VCPU_W_0x87 _IOW(KVMIO, 0x87, struct kvm_debug_guest)
-
-/* *** End of deprecated interfaces *** */
-
-
-/* for KVM_CREATE_MEMORY_REGION */
-struct kvm_memory_region {
-	__u32 slot;
-	__u32 flags;
-	__u64 guest_phys_addr;
-	__u64 memory_size; /* bytes */
-};
-
-/* for KVM_SET_USER_MEMORY_REGION */
-struct kvm_userspace_memory_region {
-	__u32 slot;
-	__u32 flags;
-	__u64 guest_phys_addr;
-	__u64 memory_size; /* bytes */
-	__u64 userspace_addr; /* start of the userspace allocated memory */
-};
-
-/*
- * The bit 0 ~ bit 15 of kvm_memory_region::flags are visible for userspace,
- * other bits are reserved for kvm internal use which are defined in
- * include/linux/kvm_host.h.
- */
-#define KVM_MEM_LOG_DIRTY_PAGES	(1UL << 0)
-#define KVM_MEM_READONLY	(1UL << 1)
-
-/* for KVM_IRQ_LINE */
-struct kvm_irq_level {
-	/*
-	 * ACPI gsi notion of irq.
-	 * For IA-64 (APIC model) IOAPIC0: irq 0-23; IOAPIC1: irq 24-47..
-	 * For X86 (standard AT mode) PIC0/1: irq 0-15. IOAPIC0: 0-23..
-	 * For ARM: See Documentation/virtual/kvm/api.txt
-	 */
-	union {
-		__u32 irq;
-		__s32 status;
-	};
-	__u32 level;
-};
-
-
-struct kvm_irqchip {
-	__u32 chip_id;
-	__u32 pad;
-        union {
-		char dummy[512];  /* reserving space */
-#ifdef __KVM_HAVE_PIT
-		struct kvm_pic_state pic;
-#endif
-#ifdef __KVM_HAVE_IOAPIC
-		struct kvm_ioapic_state ioapic;
-#endif
-	} chip;
-};
-
-/* for KVM_CREATE_PIT2 */
-struct kvm_pit_config {
-	__u32 flags;
-	__u32 pad[15];
-};
-
-#define KVM_PIT_SPEAKER_DUMMY     1
-
-struct kvm_s390_skeys {
-	__u64 start_gfn;
-	__u64 count;
-	__u64 skeydata_addr;
-	__u32 flags;
-	__u32 reserved[9];
-};
-#define KVM_S390_GET_SKEYS_NONE   1
-#define KVM_S390_SKEYS_MAX        1048576
-
-#define KVM_EXIT_UNKNOWN          0
-#define KVM_EXIT_EXCEPTION        1
-#define KVM_EXIT_IO               2
-#define KVM_EXIT_HYPERCALL        3
-#define KVM_EXIT_DEBUG            4
-#define KVM_EXIT_HLT              5
-#define KVM_EXIT_MMIO             6
-#define KVM_EXIT_IRQ_WINDOW_OPEN  7
-#define KVM_EXIT_SHUTDOWN         8
-#define KVM_EXIT_FAIL_ENTRY       9
-#define KVM_EXIT_INTR             10
-#define KVM_EXIT_SET_TPR          11
-#define KVM_EXIT_TPR_ACCESS       12
-#define KVM_EXIT_S390_SIEIC       13
-#define KVM_EXIT_S390_RESET       14
-#define KVM_EXIT_DCR              15 /* deprecated */
-#define KVM_EXIT_NMI              16
-#define KVM_EXIT_INTERNAL_ERROR   17
-#define KVM_EXIT_OSI              18
-#define KVM_EXIT_PAPR_HCALL	  19
-#define KVM_EXIT_S390_UCONTROL	  20
-#define KVM_EXIT_WATCHDOG         21
-#define KVM_EXIT_S390_TSCH        22
-#define KVM_EXIT_EPR              23
-#define KVM_EXIT_SYSTEM_EVENT     24
-#define KVM_EXIT_S390_STSI        25
-#define KVM_EXIT_IOAPIC_EOI       26
-
-/* For KVM_EXIT_INTERNAL_ERROR */
-/* Emulate instruction failed. */
-#define KVM_INTERNAL_ERROR_EMULATION	1
-/* Encounter unexpected simultaneous exceptions. */
-#define KVM_INTERNAL_ERROR_SIMUL_EX	2
-/* Encounter unexpected vm-exit due to delivery event. */
-#define KVM_INTERNAL_ERROR_DELIVERY_EV	3
-
-/* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
-struct kvm_run {
-	/* in */
-	__u8 request_interrupt_window;
-	__u8 padding1[7];
-
-	/* out */
-	__u32 exit_reason;
-	__u8 ready_for_interrupt_injection;
-	__u8 if_flag;
-	__u16 flags;
-
-	/* in (pre_kvm_run), out (post_kvm_run) */
-	__u64 cr8;
-	__u64 apic_base;
-
-#ifdef __KVM_S390
-	/* the processor status word for s390 */
-	__u64 psw_mask; /* psw upper half */
-	__u64 psw_addr; /* psw lower half */
-#endif
-	union {
-		/* KVM_EXIT_UNKNOWN */
-		struct {
-			__u64 hardware_exit_reason;
-		} hw;
-		/* KVM_EXIT_FAIL_ENTRY */
-		struct {
-			__u64 hardware_entry_failure_reason;
-		} fail_entry;
-		/* KVM_EXIT_EXCEPTION */
-		struct {
-			__u32 exception;
-			__u32 error_code;
-		} ex;
-		/* KVM_EXIT_IO */
-		struct {
-#define KVM_EXIT_IO_IN  0
-#define KVM_EXIT_IO_OUT 1
-			__u8 direction;
-			__u8 size; /* bytes */
-			__u16 port;
-			__u32 count;
-			__u64 data_offset; /* relative to kvm_run start */
-		} io;
-		/* KVM_EXIT_DEBUG */
-		struct {
-			struct kvm_debug_exit_arch arch;
-		} debug;
-		/* KVM_EXIT_MMIO */
-		struct {
-			__u64 phys_addr;
-			__u8  data[8];
-			__u32 len;
-			__u8  is_write;
-		} mmio;
-		/* KVM_EXIT_HYPERCALL */
-		struct {
-			__u64 nr;
-			__u64 args[6];
-			__u64 ret;
-			__u32 longmode;
-			__u32 pad;
-		} hypercall;
-		/* KVM_EXIT_TPR_ACCESS */
-		struct {
-			__u64 rip;
-			__u32 is_write;
-			__u32 pad;
-		} tpr_access;
-		/* KVM_EXIT_S390_SIEIC */
-		struct {
-			__u8 icptcode;
-			__u16 ipa;
-			__u32 ipb;
-		} s390_sieic;
-		/* KVM_EXIT_S390_RESET */
-#define KVM_S390_RESET_POR       1
-#define KVM_S390_RESET_CLEAR     2
-#define KVM_S390_RESET_SUBSYSTEM 4
-#define KVM_S390_RESET_CPU_INIT  8
-#define KVM_S390_RESET_IPL       16
-		__u64 s390_reset_flags;
-		/* KVM_EXIT_S390_UCONTROL */
-		struct {
-			__u64 trans_exc_code;
-			__u32 pgm_code;
-		} s390_ucontrol;
-		/* KVM_EXIT_DCR (deprecated) */
-		struct {
-			__u32 dcrn;
-			__u32 data;
-			__u8  is_write;
-		} dcr;
-		/* KVM_EXIT_INTERNAL_ERROR */
-		struct {
-			__u32 suberror;
-			/* Available with KVM_CAP_INTERNAL_ERROR_DATA: */
-			__u32 ndata;
-			__u64 data[16];
-		} internal;
-		/* KVM_EXIT_OSI */
-		struct {
-			__u64 gprs[32];
-		} osi;
-		/* KVM_EXIT_PAPR_HCALL */
-		struct {
-			__u64 nr;
-			__u64 ret;
-			__u64 args[9];
-		} papr_hcall;
-		/* KVM_EXIT_S390_TSCH */
-		struct {
-			__u16 subchannel_id;
-			__u16 subchannel_nr;
-			__u32 io_int_parm;
-			__u32 io_int_word;
-			__u32 ipb;
-			__u8 dequeued;
-		} s390_tsch;
-		/* KVM_EXIT_EPR */
-		struct {
-			__u32 epr;
-		} epr;
-		/* KVM_EXIT_SYSTEM_EVENT */
-		struct {
-#define KVM_SYSTEM_EVENT_SHUTDOWN       1
-#define KVM_SYSTEM_EVENT_RESET          2
-#define KVM_SYSTEM_EVENT_CRASH          3
-			__u32 type;
-			__u64 flags;
-		} system_event;
-		/* KVM_EXIT_S390_STSI */
-		struct {
-			__u64 addr;
-			__u8 ar;
-			__u8 reserved;
-			__u8 fc;
-			__u8 sel1;
-			__u16 sel2;
-		} s390_stsi;
-		/* KVM_EXIT_IOAPIC_EOI */
-		struct {
-			__u8 vector;
-		} eoi;
-		/* Fix the size of the union. */
-		char padding[256];
-	};
-
-	/*
-	 * shared registers between kvm and userspace.
-	 * kvm_valid_regs specifies the register classes set by the host
-	 * kvm_dirty_regs specified the register classes dirtied by userspace
-	 * struct kvm_sync_regs is architecture specific, as well as the
-	 * bits for kvm_valid_regs and kvm_dirty_regs
-	 */
-	__u64 kvm_valid_regs;
-	__u64 kvm_dirty_regs;
-	union {
-		struct kvm_sync_regs regs;
-		char padding[2048];
-	} s;
-};
-
-/* for KVM_REGISTER_COALESCED_MMIO / KVM_UNREGISTER_COALESCED_MMIO */
-
-struct kvm_coalesced_mmio_zone {
-	__u64 addr;
-	__u32 size;
-	__u32 pad;
-};
-
-struct kvm_coalesced_mmio {
-	__u64 phys_addr;
-	__u32 len;
-	__u32 pad;
-	__u8  data[8];
-};
-
-struct kvm_coalesced_mmio_ring {
-	__u32 first, last;
-	struct kvm_coalesced_mmio coalesced_mmio[0];
-};
-
-#define KVM_COALESCED_MMIO_MAX \
-	((PAGE_SIZE - sizeof(struct kvm_coalesced_mmio_ring)) / \
-	 sizeof(struct kvm_coalesced_mmio))
-
-/* for KVM_TRANSLATE */
-struct kvm_translation {
-	/* in */
-	__u64 linear_address;
-
-	/* out */
-	__u64 physical_address;
-	__u8  valid;
-	__u8  writeable;
-	__u8  usermode;
-	__u8  pad[5];
-};
-
-/* for KVM_S390_MEM_OP */
-struct kvm_s390_mem_op {
-	/* in */
-	__u64 gaddr;		/* the guest address */
-	__u64 flags;		/* flags */
-	__u32 size;		/* amount of bytes */
-	__u32 op;		/* type of operation */
-	__u64 buf;		/* buffer in userspace */
-	__u8 ar;		/* the access register number */
-	__u8 reserved[31];	/* should be set to 0 */
-};
-/* types for kvm_s390_mem_op->op */
-#define KVM_S390_MEMOP_LOGICAL_READ	0
-#define KVM_S390_MEMOP_LOGICAL_WRITE	1
-/* flags for kvm_s390_mem_op->flags */
-#define KVM_S390_MEMOP_F_CHECK_ONLY		(1ULL << 0)
-#define KVM_S390_MEMOP_F_INJECT_EXCEPTION	(1ULL << 1)
-
-/* for KVM_INTERRUPT */
-struct kvm_interrupt {
-	/* in */
-	__u32 irq;
-};
-
-/* for KVM_GET_DIRTY_LOG */
-struct kvm_dirty_log {
-	__u32 slot;
-	__u32 padding1;
-	union {
-		void *dirty_bitmap; /* one bit per page */
-		__u64 padding2;
-	};
-};
-
-/* for KVM_SET_SIGNAL_MASK */
-struct kvm_signal_mask {
-	__u32 len;
-	__u8  sigset[0];
-};
-
-/* for KVM_TPR_ACCESS_REPORTING */
-struct kvm_tpr_access_ctl {
-	__u32 enabled;
-	__u32 flags;
-	__u32 reserved[8];
-};
-
-/* for KVM_SET_VAPIC_ADDR */
-struct kvm_vapic_addr {
-	__u64 vapic_addr;
-};
-
-/* for KVM_SET_MP_STATE */
-
-/* not all states are valid on all architectures */
-#define KVM_MP_STATE_RUNNABLE          0
-#define KVM_MP_STATE_UNINITIALIZED     1
-#define KVM_MP_STATE_INIT_RECEIVED     2
-#define KVM_MP_STATE_HALTED            3
-#define KVM_MP_STATE_SIPI_RECEIVED     4
-#define KVM_MP_STATE_STOPPED           5
-#define KVM_MP_STATE_CHECK_STOP        6
-#define KVM_MP_STATE_OPERATING         7
-#define KVM_MP_STATE_LOAD              8
-
-struct kvm_mp_state {
-	__u32 mp_state;
-};
-
-struct kvm_s390_psw {
-	__u64 mask;
-	__u64 addr;
-};
-
-/* valid values for type in kvm_s390_interrupt */
-#define KVM_S390_SIGP_STOP		0xfffe0000u
-#define KVM_S390_PROGRAM_INT		0xfffe0001u
-#define KVM_S390_SIGP_SET_PREFIX	0xfffe0002u
-#define KVM_S390_RESTART		0xfffe0003u
-#define KVM_S390_INT_PFAULT_INIT	0xfffe0004u
-#define KVM_S390_INT_PFAULT_DONE	0xfffe0005u
-#define KVM_S390_MCHK			0xfffe1000u
-#define KVM_S390_INT_CLOCK_COMP		0xffff1004u
-#define KVM_S390_INT_CPU_TIMER		0xffff1005u
-#define KVM_S390_INT_VIRTIO		0xffff2603u
-#define KVM_S390_INT_SERVICE		0xffff2401u
-#define KVM_S390_INT_EMERGENCY		0xffff1201u
-#define KVM_S390_INT_EXTERNAL_CALL	0xffff1202u
-/* Anything below 0xfffe0000u is taken by INT_IO */
-#define KVM_S390_INT_IO(ai,cssid,ssid,schid)   \
-	(((schid)) |			       \
-	 ((ssid) << 16) |		       \
-	 ((cssid) << 18) |		       \
-	 ((ai) << 26))
-#define KVM_S390_INT_IO_MIN		0x00000000u
-#define KVM_S390_INT_IO_MAX		0xfffdffffu
-#define KVM_S390_INT_IO_AI_MASK		0x04000000u
-
-
-struct kvm_s390_interrupt {
-	__u32 type;
-	__u32 parm;
-	__u64 parm64;
-};
-
-struct kvm_s390_io_info {
-	__u16 subchannel_id;
-	__u16 subchannel_nr;
-	__u32 io_int_parm;
-	__u32 io_int_word;
-};
-
-struct kvm_s390_ext_info {
-	__u32 ext_params;
-	__u32 pad;
-	__u64 ext_params2;
-};
-
-struct kvm_s390_pgm_info {
-	__u64 trans_exc_code;
-	__u64 mon_code;
-	__u64 per_address;
-	__u32 data_exc_code;
-	__u16 code;
-	__u16 mon_class_nr;
-	__u8 per_code;
-	__u8 per_atmid;
-	__u8 exc_access_id;
-	__u8 per_access_id;
-	__u8 op_access_id;
-	__u8 pad[3];
-};
-
-struct kvm_s390_prefix_info {
-	__u32 address;
-};
-
-struct kvm_s390_extcall_info {
-	__u16 code;
-};
-
-struct kvm_s390_emerg_info {
-	__u16 code;
-};
-
-#define KVM_S390_STOP_FLAG_STORE_STATUS	0x01
-struct kvm_s390_stop_info {
-	__u32 flags;
-};
-
-struct kvm_s390_mchk_info {
-	__u64 cr14;
-	__u64 mcic;
-	__u64 failing_storage_address;
-	__u32 ext_damage_code;
-	__u32 pad;
-	__u8 fixed_logout[16];
-};
-
-struct kvm_s390_irq {
-	__u64 type;
-	union {
-		struct kvm_s390_io_info io;
-		struct kvm_s390_ext_info ext;
-		struct kvm_s390_pgm_info pgm;
-		struct kvm_s390_emerg_info emerg;
-		struct kvm_s390_extcall_info extcall;
-		struct kvm_s390_prefix_info prefix;
-		struct kvm_s390_stop_info stop;
-		struct kvm_s390_mchk_info mchk;
-		char reserved[64];
-	} u;
-};
-
-struct kvm_s390_irq_state {
-	__u64 buf;
-	__u32 flags;
-	__u32 len;
-	__u32 reserved[4];
-};
-
-/* for KVM_SET_GUEST_DEBUG */
-
-#define KVM_GUESTDBG_ENABLE		0x00000001
-#define KVM_GUESTDBG_SINGLESTEP		0x00000002
-
-struct kvm_guest_debug {
-	__u32 control;
-	__u32 pad;
-	struct kvm_guest_debug_arch arch;
-};
-
-enum {
-	kvm_ioeventfd_flag_nr_datamatch,
-	kvm_ioeventfd_flag_nr_pio,
-	kvm_ioeventfd_flag_nr_deassign,
-	kvm_ioeventfd_flag_nr_virtio_ccw_notify,
-	kvm_ioeventfd_flag_nr_fast_mmio,
-	kvm_ioeventfd_flag_nr_max,
-};
-
-#define KVM_IOEVENTFD_FLAG_DATAMATCH (1 << kvm_ioeventfd_flag_nr_datamatch)
-#define KVM_IOEVENTFD_FLAG_PIO       (1 << kvm_ioeventfd_flag_nr_pio)
-#define KVM_IOEVENTFD_FLAG_DEASSIGN  (1 << kvm_ioeventfd_flag_nr_deassign)
-#define KVM_IOEVENTFD_FLAG_VIRTIO_CCW_NOTIFY \
-	(1 << kvm_ioeventfd_flag_nr_virtio_ccw_notify)
-
-#define KVM_IOEVENTFD_VALID_FLAG_MASK  ((1 << kvm_ioeventfd_flag_nr_max) - 1)
-
-struct kvm_ioeventfd {
-	__u64 datamatch;
-	__u64 addr;        /* legal pio/mmio address */
-	__u32 len;         /* 1, 2, 4, or 8 bytes; or 0 to ignore length */
-	__s32 fd;
-	__u32 flags;
-	__u8  pad[36];
-};
-
-/* for KVM_ENABLE_CAP */
-struct kvm_enable_cap {
-	/* in */
-	__u32 cap;
-	__u32 flags;
-	__u64 args[4];
-	__u8  pad[64];
-};
-
-/* for KVM_PPC_GET_PVINFO */
-struct kvm_ppc_pvinfo {
-	/* out */
-	__u32 flags;
-	__u32 hcall[4];
-	__u8  pad[108];
-};
-
-/* for KVM_PPC_GET_SMMU_INFO */
-#define KVM_PPC_PAGE_SIZES_MAX_SZ	8
-
-struct kvm_ppc_one_page_size {
-	__u32 page_shift;	/* Page shift (or 0) */
-	__u32 pte_enc;		/* Encoding in the HPTE (>>12) */
-};
-
-struct kvm_ppc_one_seg_page_size {
-	__u32 page_shift;	/* Base page shift of segment (or 0) */
-	__u32 slb_enc;		/* SLB encoding for BookS */
-	struct kvm_ppc_one_page_size enc[KVM_PPC_PAGE_SIZES_MAX_SZ];
-};
-
-#define KVM_PPC_PAGE_SIZES_REAL		0x00000001
-#define KVM_PPC_1T_SEGMENTS		0x00000002
-
-struct kvm_ppc_smmu_info {
-	__u64 flags;
-	__u32 slb_size;
-	__u32 pad;
-	struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ];
-};
-
-#define KVM_PPC_PVINFO_FLAGS_EV_IDLE   (1<<0)
-
-#define KVMIO 0xAE
-
-/* machine type bits, to be used as argument to KVM_CREATE_VM */
-#define KVM_VM_S390_UCONTROL	1
-
-/* on ppc, 0 indicate default, 1 should force HV and 2 PR */
-#define KVM_VM_PPC_HV 1
-#define KVM_VM_PPC_PR 2
-
-#define KVM_S390_SIE_PAGE_OFFSET 1
-
-/*
- * ioctls for /dev/kvm fds:
- */
-#define KVM_GET_API_VERSION       _IO(KVMIO,   0x00)
-#define KVM_CREATE_VM             _IO(KVMIO,   0x01) /* returns a VM fd */
-#define KVM_GET_MSR_INDEX_LIST    _IOWR(KVMIO, 0x02, struct kvm_msr_list)
-
-#define KVM_S390_ENABLE_SIE       _IO(KVMIO,   0x06)
-/*
- * Check if a kvm extension is available.  Argument is extension number,
- * return is 1 (yes) or 0 (no, sorry).
- */
-#define KVM_CHECK_EXTENSION       _IO(KVMIO,   0x03)
-/*
- * Get size for mmap(vcpu_fd)
- */
-#define KVM_GET_VCPU_MMAP_SIZE    _IO(KVMIO,   0x04) /* in bytes */
-#define KVM_GET_SUPPORTED_CPUID   _IOWR(KVMIO, 0x05, struct kvm_cpuid2)
-#define KVM_TRACE_ENABLE          __KVM_DEPRECATED_MAIN_W_0x06
-#define KVM_TRACE_PAUSE           __KVM_DEPRECATED_MAIN_0x07
-#define KVM_TRACE_DISABLE         __KVM_DEPRECATED_MAIN_0x08
-#define KVM_GET_EMULATED_CPUID	  _IOWR(KVMIO, 0x09, struct kvm_cpuid2)
-
-/*
- * Extension capability list.
- */
-#define KVM_CAP_IRQCHIP	  0
-#define KVM_CAP_HLT	  1
-#define KVM_CAP_MMU_SHADOW_CACHE_CONTROL 2
-#define KVM_CAP_USER_MEMORY 3
-#define KVM_CAP_SET_TSS_ADDR 4
-#define KVM_CAP_VAPIC 6
-#define KVM_CAP_EXT_CPUID 7
-#define KVM_CAP_CLOCKSOURCE 8
-#define KVM_CAP_NR_VCPUS 9       /* returns recommended max vcpus per vm */
-#define KVM_CAP_NR_MEMSLOTS 10   /* returns max memory slots per vm */
-#define KVM_CAP_PIT 11
-#define KVM_CAP_NOP_IO_DELAY 12
-#define KVM_CAP_PV_MMU 13
-#define KVM_CAP_MP_STATE 14
-#define KVM_CAP_COALESCED_MMIO 15
-#define KVM_CAP_SYNC_MMU 16  /* Changes to host mmap are reflected in guest */
-#define KVM_CAP_IOMMU 18
-/* Bug in KVM_SET_USER_MEMORY_REGION fixed: */
-#define KVM_CAP_DESTROY_MEMORY_REGION_WORKS 21
-#define KVM_CAP_USER_NMI 22
-#ifdef __KVM_HAVE_GUEST_DEBUG
-#define KVM_CAP_SET_GUEST_DEBUG 23
-#endif
-#ifdef __KVM_HAVE_PIT
-#define KVM_CAP_REINJECT_CONTROL 24
-#endif
-#define KVM_CAP_IRQ_ROUTING 25
-#define KVM_CAP_IRQ_INJECT_STATUS 26
-#define KVM_CAP_ASSIGN_DEV_IRQ 29
-/* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */
-#define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30
-#ifdef __KVM_HAVE_MCE
-#define KVM_CAP_MCE 31
-#endif
-#define KVM_CAP_IRQFD 32
-#ifdef __KVM_HAVE_PIT
-#define KVM_CAP_PIT2 33
-#endif
-#define KVM_CAP_SET_BOOT_CPU_ID 34
-#ifdef __KVM_HAVE_PIT_STATE2
-#define KVM_CAP_PIT_STATE2 35
-#endif
-#define KVM_CAP_IOEVENTFD 36
-#define KVM_CAP_SET_IDENTITY_MAP_ADDR 37
-#ifdef __KVM_HAVE_XEN_HVM
-#define KVM_CAP_XEN_HVM 38
-#endif
-#define KVM_CAP_ADJUST_CLOCK 39
-#define KVM_CAP_INTERNAL_ERROR_DATA 40
-#ifdef __KVM_HAVE_VCPU_EVENTS
-#define KVM_CAP_VCPU_EVENTS 41
-#endif
-#define KVM_CAP_S390_PSW 42
-#define KVM_CAP_PPC_SEGSTATE 43
-#define KVM_CAP_HYPERV 44
-#define KVM_CAP_HYPERV_VAPIC 45
-#define KVM_CAP_HYPERV_SPIN 46
-#define KVM_CAP_PCI_SEGMENT 47
-#define KVM_CAP_PPC_PAIRED_SINGLES 48
-#define KVM_CAP_INTR_SHADOW 49
-#ifdef __KVM_HAVE_DEBUGREGS
-#define KVM_CAP_DEBUGREGS 50
-#endif
-#define KVM_CAP_X86_ROBUST_SINGLESTEP 51
-#define KVM_CAP_PPC_OSI 52
-#define KVM_CAP_PPC_UNSET_IRQ 53
-#define KVM_CAP_ENABLE_CAP 54
-#ifdef __KVM_HAVE_XSAVE
-#define KVM_CAP_XSAVE 55
-#endif
-#ifdef __KVM_HAVE_XCRS
-#define KVM_CAP_XCRS 56
-#endif
-#define KVM_CAP_PPC_GET_PVINFO 57
-#define KVM_CAP_PPC_IRQ_LEVEL 58
-#define KVM_CAP_ASYNC_PF 59
-#define KVM_CAP_TSC_CONTROL 60
-#define KVM_CAP_GET_TSC_KHZ 61
-#define KVM_CAP_PPC_BOOKE_SREGS 62
-#define KVM_CAP_SPAPR_TCE 63
-#define KVM_CAP_PPC_SMT 64
-#define KVM_CAP_PPC_RMA	65
-#define KVM_CAP_MAX_VCPUS 66       /* returns max vcpus per vm */
-#define KVM_CAP_PPC_HIOR 67
-#define KVM_CAP_PPC_PAPR 68
-#define KVM_CAP_SW_TLB 69
-#define KVM_CAP_ONE_REG 70
-#define KVM_CAP_S390_GMAP 71
-#define KVM_CAP_TSC_DEADLINE_TIMER 72
-#define KVM_CAP_S390_UCONTROL 73
-#define KVM_CAP_SYNC_REGS 74
-#define KVM_CAP_PCI_2_3 75
-#define KVM_CAP_KVMCLOCK_CTRL 76
-#define KVM_CAP_SIGNAL_MSI 77
-#define KVM_CAP_PPC_GET_SMMU_INFO 78
-#define KVM_CAP_S390_COW 79
-#define KVM_CAP_PPC_ALLOC_HTAB 80
-#define KVM_CAP_READONLY_MEM 81
-#define KVM_CAP_IRQFD_RESAMPLE 82
-#define KVM_CAP_PPC_BOOKE_WATCHDOG 83
-#define KVM_CAP_PPC_HTAB_FD 84
-#define KVM_CAP_S390_CSS_SUPPORT 85
-#define KVM_CAP_PPC_EPR 86
-#define KVM_CAP_ARM_PSCI 87
-#define KVM_CAP_ARM_SET_DEVICE_ADDR 88
-#define KVM_CAP_DEVICE_CTRL 89
-#define KVM_CAP_IRQ_MPIC 90
-#define KVM_CAP_PPC_RTAS 91
-#define KVM_CAP_IRQ_XICS 92
-#define KVM_CAP_ARM_EL1_32BIT 93
-#define KVM_CAP_SPAPR_MULTITCE 94
-#define KVM_CAP_EXT_EMUL_CPUID 95
-#define KVM_CAP_HYPERV_TIME 96
-#define KVM_CAP_IOAPIC_POLARITY_IGNORED 97
-#define KVM_CAP_ENABLE_CAP_VM 98
-#define KVM_CAP_S390_IRQCHIP 99
-#define KVM_CAP_IOEVENTFD_NO_LENGTH 100
-#define KVM_CAP_VM_ATTRIBUTES 101
-#define KVM_CAP_ARM_PSCI_0_2 102
-#define KVM_CAP_PPC_FIXUP_HCALL 103
-#define KVM_CAP_PPC_ENABLE_HCALL 104
-#define KVM_CAP_CHECK_EXTENSION_VM 105
-#define KVM_CAP_S390_USER_SIGP 106
-#define KVM_CAP_S390_VECTOR_REGISTERS 107
-#define KVM_CAP_S390_MEM_OP 108
-#define KVM_CAP_S390_USER_STSI 109
-#define KVM_CAP_S390_SKEYS 110
-#define KVM_CAP_MIPS_FPU 111
-#define KVM_CAP_MIPS_MSA 112
-#define KVM_CAP_S390_INJECT_IRQ 113
-#define KVM_CAP_S390_IRQ_STATE 114
-#define KVM_CAP_PPC_HWRNG 115
-#define KVM_CAP_DISABLE_QUIRKS 116
-#define KVM_CAP_X86_SMM 117
-#define KVM_CAP_MULTI_ADDRESS_SPACE 118
-#define KVM_CAP_GUEST_DEBUG_HW_BPS 119
-#define KVM_CAP_GUEST_DEBUG_HW_WPS 120
-#define KVM_CAP_SPLIT_IRQCHIP 121
-#define KVM_CAP_IOEVENTFD_ANY_LENGTH 122
-
-#ifdef KVM_CAP_IRQ_ROUTING
-
-struct kvm_irq_routing_irqchip {
-	__u32 irqchip;
-	__u32 pin;
-};
-
-struct kvm_irq_routing_msi {
-	__u32 address_lo;
-	__u32 address_hi;
-	__u32 data;
-	__u32 pad;
-};
-
-struct kvm_irq_routing_s390_adapter {
-	__u64 ind_addr;
-	__u64 summary_addr;
-	__u64 ind_offset;
-	__u32 summary_offset;
-	__u32 adapter_id;
-};
-
-/* gsi routing entry types */
-#define KVM_IRQ_ROUTING_IRQCHIP 1
-#define KVM_IRQ_ROUTING_MSI 2
-#define KVM_IRQ_ROUTING_S390_ADAPTER 3
-
-struct kvm_irq_routing_entry {
-	__u32 gsi;
-	__u32 type;
-	__u32 flags;
-	__u32 pad;
-	union {
-		struct kvm_irq_routing_irqchip irqchip;
-		struct kvm_irq_routing_msi msi;
-		struct kvm_irq_routing_s390_adapter adapter;
-		__u32 pad[8];
-	} u;
-};
-
-struct kvm_irq_routing {
-	__u32 nr;
-	__u32 flags;
-	struct kvm_irq_routing_entry entries[0];
-};
-
-#endif
-
-#ifdef KVM_CAP_MCE
-/* x86 MCE */
-struct kvm_x86_mce {
-	__u64 status;
-	__u64 addr;
-	__u64 misc;
-	__u64 mcg_status;
-	__u8 bank;
-	__u8 pad1[7];
-	__u64 pad2[3];
-};
-#endif
-
-#ifdef KVM_CAP_XEN_HVM
-struct kvm_xen_hvm_config {
-	__u32 flags;
-	__u32 msr;
-	__u64 blob_addr_32;
-	__u64 blob_addr_64;
-	__u8 blob_size_32;
-	__u8 blob_size_64;
-	__u8 pad2[30];
-};
-#endif
-
-#define KVM_IRQFD_FLAG_DEASSIGN (1 << 0)
-/*
- * Available with KVM_CAP_IRQFD_RESAMPLE
- *
- * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies
- * the irqfd to operate in resampling mode for level triggered interrupt
- * emulation.  See Documentation/virtual/kvm/api.txt.
- */
-#define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)
-
-struct kvm_irqfd {
-	__u32 fd;
-	__u32 gsi;
-	__u32 flags;
-	__u32 resamplefd;
-	__u8  pad[16];
-};
-
-struct kvm_clock_data {
-	__u64 clock;
-	__u32 flags;
-	__u32 pad[9];
-};
-
-#define KVM_MMU_FSL_BOOKE_NOHV		0
-#define KVM_MMU_FSL_BOOKE_HV		1
-
-struct kvm_config_tlb {
-	__u64 params;
-	__u64 array;
-	__u32 mmu_type;
-	__u32 array_len;
-};
-
-struct kvm_dirty_tlb {
-	__u64 bitmap;
-	__u32 num_dirty;
-};
-
-/* Available with KVM_CAP_ONE_REG */
-
-#define KVM_REG_ARCH_MASK	0xff00000000000000ULL
-#define KVM_REG_GENERIC		0x0000000000000000ULL
-
-/*
- * Architecture specific registers are to be defined in arch headers and
- * ORed with the arch identifier.
- */
-#define KVM_REG_PPC		0x1000000000000000ULL
-#define KVM_REG_X86		0x2000000000000000ULL
-#define KVM_REG_IA64		0x3000000000000000ULL
-#define KVM_REG_ARM		0x4000000000000000ULL
-#define KVM_REG_S390		0x5000000000000000ULL
-#define KVM_REG_ARM64		0x6000000000000000ULL
-#define KVM_REG_MIPS		0x7000000000000000ULL
-
-#define KVM_REG_SIZE_SHIFT	52
-#define KVM_REG_SIZE_MASK	0x00f0000000000000ULL
-#define KVM_REG_SIZE_U8		0x0000000000000000ULL
-#define KVM_REG_SIZE_U16	0x0010000000000000ULL
-#define KVM_REG_SIZE_U32	0x0020000000000000ULL
-#define KVM_REG_SIZE_U64	0x0030000000000000ULL
-#define KVM_REG_SIZE_U128	0x0040000000000000ULL
-#define KVM_REG_SIZE_U256	0x0050000000000000ULL
-#define KVM_REG_SIZE_U512	0x0060000000000000ULL
-#define KVM_REG_SIZE_U1024	0x0070000000000000ULL
-
-struct kvm_reg_list {
-	__u64 n; /* number of regs */
-	__u64 reg[0];
-};
-
-struct kvm_one_reg {
-	__u64 id;
-	__u64 addr;
-};
-
-struct kvm_msi {
-	__u32 address_lo;
-	__u32 address_hi;
-	__u32 data;
-	__u32 flags;
-	__u8  pad[16];
-};
-
-struct kvm_arm_device_addr {
-	__u64 id;
-	__u64 addr;
-};
-
-/*
- * Device control API, available with KVM_CAP_DEVICE_CTRL
- */
-#define KVM_CREATE_DEVICE_TEST		1
-
-struct kvm_create_device {
-	__u32	type;	/* in: KVM_DEV_TYPE_xxx */
-	__u32	fd;	/* out: device handle */
-	__u32	flags;	/* in: KVM_CREATE_DEVICE_xxx */
-};
-
-struct kvm_device_attr {
-	__u32	flags;		/* no flags currently defined */
-	__u32	group;		/* device-defined */
-	__u64	attr;		/* group-defined */
-	__u64	addr;		/* userspace address of attr data */
-};
-
-#define  KVM_DEV_VFIO_GROUP			1
-#define   KVM_DEV_VFIO_GROUP_ADD			1
-#define   KVM_DEV_VFIO_GROUP_DEL			2
-
-enum kvm_device_type {
-	KVM_DEV_TYPE_FSL_MPIC_20	= 1,
-#define KVM_DEV_TYPE_FSL_MPIC_20	KVM_DEV_TYPE_FSL_MPIC_20
-	KVM_DEV_TYPE_FSL_MPIC_42,
-#define KVM_DEV_TYPE_FSL_MPIC_42	KVM_DEV_TYPE_FSL_MPIC_42
-	KVM_DEV_TYPE_XICS,
-#define KVM_DEV_TYPE_XICS		KVM_DEV_TYPE_XICS
-	KVM_DEV_TYPE_VFIO,
-#define KVM_DEV_TYPE_VFIO		KVM_DEV_TYPE_VFIO
-	KVM_DEV_TYPE_ARM_VGIC_V2,
-#define KVM_DEV_TYPE_ARM_VGIC_V2	KVM_DEV_TYPE_ARM_VGIC_V2
-	KVM_DEV_TYPE_FLIC,
-#define KVM_DEV_TYPE_FLIC		KVM_DEV_TYPE_FLIC
-	KVM_DEV_TYPE_ARM_VGIC_V3,
-#define KVM_DEV_TYPE_ARM_VGIC_V3	KVM_DEV_TYPE_ARM_VGIC_V3
-	KVM_DEV_TYPE_MAX,
-};
-
-/*
- * ioctls for VM fds
- */
-#define KVM_SET_MEMORY_REGION     _IOW(KVMIO,  0x40, struct kvm_memory_region)
-/*
- * KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns
- * a vcpu fd.
- */
-#define KVM_CREATE_VCPU           _IO(KVMIO,   0x41)
-#define KVM_GET_DIRTY_LOG         _IOW(KVMIO,  0x42, struct kvm_dirty_log)
-/* KVM_SET_MEMORY_ALIAS is obsolete: */
-#define KVM_SET_MEMORY_ALIAS      _IOW(KVMIO,  0x43, struct kvm_memory_alias)
-#define KVM_SET_NR_MMU_PAGES      _IO(KVMIO,   0x44)
-#define KVM_GET_NR_MMU_PAGES      _IO(KVMIO,   0x45)
-#define KVM_SET_USER_MEMORY_REGION _IOW(KVMIO, 0x46, \
-					struct kvm_userspace_memory_region)
-#define KVM_SET_TSS_ADDR          _IO(KVMIO,   0x47)
-#define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO,  0x48, __u64)
-
-/* enable ucontrol for s390 */
-struct kvm_s390_ucas_mapping {
-	__u64 user_addr;
-	__u64 vcpu_addr;
-	__u64 length;
-};
-#define KVM_S390_UCAS_MAP        _IOW(KVMIO, 0x50, struct kvm_s390_ucas_mapping)
-#define KVM_S390_UCAS_UNMAP      _IOW(KVMIO, 0x51, struct kvm_s390_ucas_mapping)
-#define KVM_S390_VCPU_FAULT	 _IOW(KVMIO, 0x52, unsigned long)
-
-/* Device model IOC */
-#define KVM_CREATE_IRQCHIP        _IO(KVMIO,   0x60)
-#define KVM_IRQ_LINE              _IOW(KVMIO,  0x61, struct kvm_irq_level)
-#define KVM_GET_IRQCHIP           _IOWR(KVMIO, 0x62, struct kvm_irqchip)
-#define KVM_SET_IRQCHIP           _IOR(KVMIO,  0x63, struct kvm_irqchip)
-#define KVM_CREATE_PIT            _IO(KVMIO,   0x64)
-#define KVM_GET_PIT               _IOWR(KVMIO, 0x65, struct kvm_pit_state)
-#define KVM_SET_PIT               _IOR(KVMIO,  0x66, struct kvm_pit_state)
-#define KVM_IRQ_LINE_STATUS       _IOWR(KVMIO, 0x67, struct kvm_irq_level)
-#define KVM_REGISTER_COALESCED_MMIO \
-			_IOW(KVMIO,  0x67, struct kvm_coalesced_mmio_zone)
-#define KVM_UNREGISTER_COALESCED_MMIO \
-			_IOW(KVMIO,  0x68, struct kvm_coalesced_mmio_zone)
-#define KVM_ASSIGN_PCI_DEVICE     _IOR(KVMIO,  0x69, \
-				       struct kvm_assigned_pci_dev)
-#define KVM_SET_GSI_ROUTING       _IOW(KVMIO,  0x6a, struct kvm_irq_routing)
-/* deprecated, replaced by KVM_ASSIGN_DEV_IRQ */
-#define KVM_ASSIGN_IRQ            __KVM_DEPRECATED_VM_R_0x70
-#define KVM_ASSIGN_DEV_IRQ        _IOW(KVMIO,  0x70, struct kvm_assigned_irq)
-#define KVM_REINJECT_CONTROL      _IO(KVMIO,   0x71)
-#define KVM_DEASSIGN_PCI_DEVICE   _IOW(KVMIO,  0x72, \
-				       struct kvm_assigned_pci_dev)
-#define KVM_ASSIGN_SET_MSIX_NR    _IOW(KVMIO,  0x73, \
-				       struct kvm_assigned_msix_nr)
-#define KVM_ASSIGN_SET_MSIX_ENTRY _IOW(KVMIO,  0x74, \
-				       struct kvm_assigned_msix_entry)
-#define KVM_DEASSIGN_DEV_IRQ      _IOW(KVMIO,  0x75, struct kvm_assigned_irq)
-#define KVM_IRQFD                 _IOW(KVMIO,  0x76, struct kvm_irqfd)
-#define KVM_CREATE_PIT2		  _IOW(KVMIO,  0x77, struct kvm_pit_config)
-#define KVM_SET_BOOT_CPU_ID       _IO(KVMIO,   0x78)
-#define KVM_IOEVENTFD             _IOW(KVMIO,  0x79, struct kvm_ioeventfd)
-#define KVM_XEN_HVM_CONFIG        _IOW(KVMIO,  0x7a, struct kvm_xen_hvm_config)
-#define KVM_SET_CLOCK             _IOW(KVMIO,  0x7b, struct kvm_clock_data)
-#define KVM_GET_CLOCK             _IOR(KVMIO,  0x7c, struct kvm_clock_data)
-/* Available with KVM_CAP_PIT_STATE2 */
-#define KVM_GET_PIT2              _IOR(KVMIO,  0x9f, struct kvm_pit_state2)
-#define KVM_SET_PIT2              _IOW(KVMIO,  0xa0, struct kvm_pit_state2)
-/* Available with KVM_CAP_PPC_GET_PVINFO */
-#define KVM_PPC_GET_PVINFO	  _IOW(KVMIO,  0xa1, struct kvm_ppc_pvinfo)
-/* Available with KVM_CAP_TSC_CONTROL */
-#define KVM_SET_TSC_KHZ           _IO(KVMIO,  0xa2)
-#define KVM_GET_TSC_KHZ           _IO(KVMIO,  0xa3)
-/* Available with KVM_CAP_PCI_2_3 */
-#define KVM_ASSIGN_SET_INTX_MASK  _IOW(KVMIO,  0xa4, \
-				       struct kvm_assigned_pci_dev)
-/* Available with KVM_CAP_SIGNAL_MSI */
-#define KVM_SIGNAL_MSI            _IOW(KVMIO,  0xa5, struct kvm_msi)
-/* Available with KVM_CAP_PPC_GET_SMMU_INFO */
-#define KVM_PPC_GET_SMMU_INFO	  _IOR(KVMIO,  0xa6, struct kvm_ppc_smmu_info)
-/* Available with KVM_CAP_PPC_ALLOC_HTAB */
-#define KVM_PPC_ALLOCATE_HTAB	  _IOWR(KVMIO, 0xa7, __u32)
-#define KVM_CREATE_SPAPR_TCE	  _IOW(KVMIO,  0xa8, struct kvm_create_spapr_tce)
-/* Available with KVM_CAP_RMA */
-#define KVM_ALLOCATE_RMA	  _IOR(KVMIO,  0xa9, struct kvm_allocate_rma)
-/* Available with KVM_CAP_PPC_HTAB_FD */
-#define KVM_PPC_GET_HTAB_FD	  _IOW(KVMIO,  0xaa, struct kvm_get_htab_fd)
-/* Available with KVM_CAP_ARM_SET_DEVICE_ADDR */
-#define KVM_ARM_SET_DEVICE_ADDR	  _IOW(KVMIO,  0xab, struct kvm_arm_device_addr)
-/* Available with KVM_CAP_PPC_RTAS */
-#define KVM_PPC_RTAS_DEFINE_TOKEN _IOW(KVMIO,  0xac, struct kvm_rtas_token_args)
-
-/* ioctl for vm fd */
-#define KVM_CREATE_DEVICE	  _IOWR(KVMIO,  0xe0, struct kvm_create_device)
-
-/* ioctls for fds returned by KVM_CREATE_DEVICE */
-#define KVM_SET_DEVICE_ATTR	  _IOW(KVMIO,  0xe1, struct kvm_device_attr)
-#define KVM_GET_DEVICE_ATTR	  _IOW(KVMIO,  0xe2, struct kvm_device_attr)
-#define KVM_HAS_DEVICE_ATTR	  _IOW(KVMIO,  0xe3, struct kvm_device_attr)
-
-/*
- * ioctls for vcpu fds
- */
-#define KVM_RUN                   _IO(KVMIO,   0x80)
-#define KVM_GET_REGS              _IOR(KVMIO,  0x81, struct kvm_regs)
-#define KVM_SET_REGS              _IOW(KVMIO,  0x82, struct kvm_regs)
-#define KVM_GET_SREGS             _IOR(KVMIO,  0x83, struct kvm_sregs)
-#define KVM_SET_SREGS             _IOW(KVMIO,  0x84, struct kvm_sregs)
-#define KVM_TRANSLATE             _IOWR(KVMIO, 0x85, struct kvm_translation)
-#define KVM_INTERRUPT             _IOW(KVMIO,  0x86, struct kvm_interrupt)
-/* KVM_DEBUG_GUEST is no longer supported, use KVM_SET_GUEST_DEBUG instead */
-#define KVM_DEBUG_GUEST           __KVM_DEPRECATED_VCPU_W_0x87
-#define KVM_GET_MSRS              _IOWR(KVMIO, 0x88, struct kvm_msrs)
-#define KVM_SET_MSRS              _IOW(KVMIO,  0x89, struct kvm_msrs)
-#define KVM_SET_CPUID             _IOW(KVMIO,  0x8a, struct kvm_cpuid)
-#define KVM_SET_SIGNAL_MASK       _IOW(KVMIO,  0x8b, struct kvm_signal_mask)
-#define KVM_GET_FPU               _IOR(KVMIO,  0x8c, struct kvm_fpu)
-#define KVM_SET_FPU               _IOW(KVMIO,  0x8d, struct kvm_fpu)
-#define KVM_GET_LAPIC             _IOR(KVMIO,  0x8e, struct kvm_lapic_state)
-#define KVM_SET_LAPIC             _IOW(KVMIO,  0x8f, struct kvm_lapic_state)
-#define KVM_SET_CPUID2            _IOW(KVMIO,  0x90, struct kvm_cpuid2)
-#define KVM_GET_CPUID2            _IOWR(KVMIO, 0x91, struct kvm_cpuid2)
-/* Available with KVM_CAP_VAPIC */
-#define KVM_TPR_ACCESS_REPORTING  _IOWR(KVMIO, 0x92, struct kvm_tpr_access_ctl)
-/* Available with KVM_CAP_VAPIC */
-#define KVM_SET_VAPIC_ADDR        _IOW(KVMIO,  0x93, struct kvm_vapic_addr)
-/* valid for virtual machine (for floating interrupt)_and_ vcpu */
-#define KVM_S390_INTERRUPT        _IOW(KVMIO,  0x94, struct kvm_s390_interrupt)
-/* store status for s390 */
-#define KVM_S390_STORE_STATUS_NOADDR    (-1ul)
-#define KVM_S390_STORE_STATUS_PREFIXED  (-2ul)
-#define KVM_S390_STORE_STATUS	  _IOW(KVMIO,  0x95, unsigned long)
-/* initial ipl psw for s390 */
-#define KVM_S390_SET_INITIAL_PSW  _IOW(KVMIO,  0x96, struct kvm_s390_psw)
-/* initial reset for s390 */
-#define KVM_S390_INITIAL_RESET    _IO(KVMIO,   0x97)
-#define KVM_GET_MP_STATE          _IOR(KVMIO,  0x98, struct kvm_mp_state)
-#define KVM_SET_MP_STATE          _IOW(KVMIO,  0x99, struct kvm_mp_state)
-/* Available with KVM_CAP_USER_NMI */
-#define KVM_NMI                   _IO(KVMIO,   0x9a)
-/* Available with KVM_CAP_SET_GUEST_DEBUG */
-#define KVM_SET_GUEST_DEBUG       _IOW(KVMIO,  0x9b, struct kvm_guest_debug)
-/* MCE for x86 */
-#define KVM_X86_SETUP_MCE         _IOW(KVMIO,  0x9c, __u64)
-#define KVM_X86_GET_MCE_CAP_SUPPORTED _IOR(KVMIO,  0x9d, __u64)
-#define KVM_X86_SET_MCE           _IOW(KVMIO,  0x9e, struct kvm_x86_mce)
-/* Available with KVM_CAP_VCPU_EVENTS */
-#define KVM_GET_VCPU_EVENTS       _IOR(KVMIO,  0x9f, struct kvm_vcpu_events)
-#define KVM_SET_VCPU_EVENTS       _IOW(KVMIO,  0xa0, struct kvm_vcpu_events)
-/* Available with KVM_CAP_DEBUGREGS */
-#define KVM_GET_DEBUGREGS         _IOR(KVMIO,  0xa1, struct kvm_debugregs)
-#define KVM_SET_DEBUGREGS         _IOW(KVMIO,  0xa2, struct kvm_debugregs)
-/*
- * vcpu version available with KVM_ENABLE_CAP
- * vm version available with KVM_CAP_ENABLE_CAP_VM
- */
-#define KVM_ENABLE_CAP            _IOW(KVMIO,  0xa3, struct kvm_enable_cap)
-/* Available with KVM_CAP_XSAVE */
-#define KVM_GET_XSAVE		  _IOR(KVMIO,  0xa4, struct kvm_xsave)
-#define KVM_SET_XSAVE		  _IOW(KVMIO,  0xa5, struct kvm_xsave)
-/* Available with KVM_CAP_XCRS */
-#define KVM_GET_XCRS		  _IOR(KVMIO,  0xa6, struct kvm_xcrs)
-#define KVM_SET_XCRS		  _IOW(KVMIO,  0xa7, struct kvm_xcrs)
-/* Available with KVM_CAP_SW_TLB */
-#define KVM_DIRTY_TLB		  _IOW(KVMIO,  0xaa, struct kvm_dirty_tlb)
-/* Available with KVM_CAP_ONE_REG */
-#define KVM_GET_ONE_REG		  _IOW(KVMIO,  0xab, struct kvm_one_reg)
-#define KVM_SET_ONE_REG		  _IOW(KVMIO,  0xac, struct kvm_one_reg)
-/* VM is being stopped by host */
-#define KVM_KVMCLOCK_CTRL	  _IO(KVMIO,   0xad)
-#define KVM_ARM_VCPU_INIT	  _IOW(KVMIO,  0xae, struct kvm_vcpu_init)
-#define KVM_ARM_PREFERRED_TARGET  _IOR(KVMIO,  0xaf, struct kvm_vcpu_init)
-#define KVM_GET_REG_LIST	  _IOWR(KVMIO, 0xb0, struct kvm_reg_list)
-/* Available with KVM_CAP_S390_MEM_OP */
-#define KVM_S390_MEM_OP		  _IOW(KVMIO,  0xb1, struct kvm_s390_mem_op)
-/* Available with KVM_CAP_S390_SKEYS */
-#define KVM_S390_GET_SKEYS      _IOW(KVMIO, 0xb2, struct kvm_s390_skeys)
-#define KVM_S390_SET_SKEYS      _IOW(KVMIO, 0xb3, struct kvm_s390_skeys)
-/* Available with KVM_CAP_S390_INJECT_IRQ */
-#define KVM_S390_IRQ              _IOW(KVMIO,  0xb4, struct kvm_s390_irq)
-/* Available with KVM_CAP_S390_IRQ_STATE */
-#define KVM_S390_SET_IRQ_STATE	  _IOW(KVMIO, 0xb5, struct kvm_s390_irq_state)
-#define KVM_S390_GET_IRQ_STATE	  _IOW(KVMIO, 0xb6, struct kvm_s390_irq_state)
-/* Available with KVM_CAP_X86_SMM */
-#define KVM_SMI                   _IO(KVMIO,   0xb7)
-
-#define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)
-#define KVM_DEV_ASSIGN_PCI_2_3		(1 << 1)
-#define KVM_DEV_ASSIGN_MASK_INTX	(1 << 2)
-
-struct kvm_assigned_pci_dev {
-	__u32 assigned_dev_id;
-	__u32 busnr;
-	__u32 devfn;
-	__u32 flags;
-	__u32 segnr;
-	union {
-		__u32 reserved[11];
-	};
-};
-
-#define KVM_DEV_IRQ_HOST_INTX    (1 << 0)
-#define KVM_DEV_IRQ_HOST_MSI     (1 << 1)
-#define KVM_DEV_IRQ_HOST_MSIX    (1 << 2)
-
-#define KVM_DEV_IRQ_GUEST_INTX   (1 << 8)
-#define KVM_DEV_IRQ_GUEST_MSI    (1 << 9)
-#define KVM_DEV_IRQ_GUEST_MSIX   (1 << 10)
-
-#define KVM_DEV_IRQ_HOST_MASK	 0x00ff
-#define KVM_DEV_IRQ_GUEST_MASK   0xff00
-
-struct kvm_assigned_irq {
-	__u32 assigned_dev_id;
-	__u32 host_irq; /* ignored (legacy field) */
-	__u32 guest_irq;
-	__u32 flags;
-	union {
-		__u32 reserved[12];
-	};
-};
-
-struct kvm_assigned_msix_nr {
-	__u32 assigned_dev_id;
-	__u16 entry_nr;
-	__u16 padding;
-};
-
-#define KVM_MAX_MSIX_PER_DEV		256
-struct kvm_assigned_msix_entry {
-	__u32 assigned_dev_id;
-	__u32 gsi;
-	__u16 entry; /* The index of entry in the MSI-X table */
-	__u16 padding[3];
-};
-
-#endif /* __LINUX_KVM_H */
diff --git a/openflow/usr/include/linux/kvm_para.h b/openflow/usr/include/linux/kvm_para.h
deleted file mode 100644
index e61661e..0000000
--- a/openflow/usr/include/linux/kvm_para.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __LINUX_KVM_PARA_H
-#define __LINUX_KVM_PARA_H
-
-/*
- * This header file provides a method for making a hypercall to the host
- * Architectures should define:
- * - kvm_hypercall0, kvm_hypercall1...
- * - kvm_arch_para_features
- * - kvm_para_available
- */
-
-/* Return values for hypercalls */
-#define KVM_ENOSYS		1000
-#define KVM_EFAULT		EFAULT
-#define KVM_E2BIG		E2BIG
-#define KVM_EPERM		EPERM
-
-#define KVM_HC_VAPIC_POLL_IRQ		1
-#define KVM_HC_MMU_OP			2
-#define KVM_HC_FEATURES			3
-#define KVM_HC_PPC_MAP_MAGIC_PAGE	4
-#define KVM_HC_KICK_CPU			5
-#define KVM_HC_MIPS_GET_CLOCK_FREQ	6
-#define KVM_HC_MIPS_EXIT_VM		7
-#define KVM_HC_MIPS_CONSOLE_OUTPUT	8
-
-/*
- * hypercalls use architecture specific
- */
-#include <asm/kvm_para.h>
-
-#endif /* __LINUX_KVM_PARA_H */
diff --git a/openflow/usr/include/linux/l2tp.h b/openflow/usr/include/linux/l2tp.h
deleted file mode 100644
index 5b0e36d..0000000
--- a/openflow/usr/include/linux/l2tp.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * L2TP-over-IP socket for L2TPv3.
- *
- * Author: James Chapman <jchapman@katalix.com>
- */
-
-#ifndef _LINUX_L2TP_H_
-#define _LINUX_L2TP_H_
-
-#include <linux/types.h>
-#include <linux/socket.h>
-#include <netinet/in.h>
-
-#define IPPROTO_L2TP		115
-
-/**
- * struct sockaddr_l2tpip - the sockaddr structure for L2TP-over-IP sockets
- * @l2tp_family:  address family number AF_L2TPIP.
- * @l2tp_addr:    protocol specific address information
- * @l2tp_conn_id: connection id of tunnel
- */
-#define __SOCK_SIZE__	16		/* sizeof(struct sockaddr)	*/
-struct sockaddr_l2tpip {
-	/* The first fields must match struct sockaddr_in */
-	__kernel_sa_family_t l2tp_family; /* AF_INET */
-	__be16		l2tp_unused;	/* INET port number (unused) */
-	struct in_addr	l2tp_addr;	/* Internet address */
-
-	__u32		l2tp_conn_id;	/* Connection ID of tunnel */
-
-	/* Pad to size of `struct sockaddr'. */
-	unsigned char	__pad[sizeof(struct sockaddr) -
-			      sizeof(__kernel_sa_family_t) -
-			      sizeof(__be16) - sizeof(struct in_addr) -
-			      sizeof(__u32)];
-};
-
-/**
- * struct sockaddr_l2tpip6 - the sockaddr structure for L2TP-over-IPv6 sockets
- * @l2tp_family:  address family number AF_L2TPIP.
- * @l2tp_addr:    protocol specific address information
- * @l2tp_conn_id: connection id of tunnel
- */
-struct sockaddr_l2tpip6 {
-	/* The first fields must match struct sockaddr_in6 */
-	__kernel_sa_family_t l2tp_family; /* AF_INET6 */
-	__be16		l2tp_unused;	/* INET port number (unused) */
-	__be32		l2tp_flowinfo;	/* IPv6 flow information */
-	struct in6_addr	l2tp_addr;	/* IPv6 address */
-	__u32		l2tp_scope_id;	/* scope id (new in RFC2553) */
-	__u32		l2tp_conn_id;	/* Connection ID of tunnel */
-};
-
-/*****************************************************************************
- *  NETLINK_GENERIC netlink family.
- *****************************************************************************/
-
-/*
- * Commands.
- * Valid TLVs of each command are:-
- * TUNNEL_CREATE	- CONN_ID, pw_type, netns, ifname, ipinfo, udpinfo, udpcsum, vlanid
- * TUNNEL_DELETE	- CONN_ID
- * TUNNEL_MODIFY	- CONN_ID, udpcsum
- * TUNNEL_GETSTATS	- CONN_ID, (stats)
- * TUNNEL_GET		- CONN_ID, (...)
- * SESSION_CREATE	- SESSION_ID, PW_TYPE, offset, data_seq, cookie, peer_cookie, offset, l2spec
- * SESSION_DELETE	- SESSION_ID
- * SESSION_MODIFY	- SESSION_ID, data_seq
- * SESSION_GET		- SESSION_ID, (...)
- * SESSION_GETSTATS	- SESSION_ID, (stats)
- *
- */
-enum {
-	L2TP_CMD_NOOP,
-	L2TP_CMD_TUNNEL_CREATE,
-	L2TP_CMD_TUNNEL_DELETE,
-	L2TP_CMD_TUNNEL_MODIFY,
-	L2TP_CMD_TUNNEL_GET,
-	L2TP_CMD_SESSION_CREATE,
-	L2TP_CMD_SESSION_DELETE,
-	L2TP_CMD_SESSION_MODIFY,
-	L2TP_CMD_SESSION_GET,
-	__L2TP_CMD_MAX,
-};
-
-#define L2TP_CMD_MAX			(__L2TP_CMD_MAX - 1)
-
-/*
- * ATTR types defined for L2TP
- */
-enum {
-	L2TP_ATTR_NONE,			/* no data */
-	L2TP_ATTR_PW_TYPE,		/* u16, enum l2tp_pwtype */
-	L2TP_ATTR_ENCAP_TYPE,		/* u16, enum l2tp_encap_type */
-	L2TP_ATTR_OFFSET,		/* u16 */
-	L2TP_ATTR_DATA_SEQ,		/* u16 */
-	L2TP_ATTR_L2SPEC_TYPE,		/* u8, enum l2tp_l2spec_type */
-	L2TP_ATTR_L2SPEC_LEN,		/* u8, enum l2tp_l2spec_type */
-	L2TP_ATTR_PROTO_VERSION,	/* u8 */
-	L2TP_ATTR_IFNAME,		/* string */
-	L2TP_ATTR_CONN_ID,		/* u32 */
-	L2TP_ATTR_PEER_CONN_ID,		/* u32 */
-	L2TP_ATTR_SESSION_ID,		/* u32 */
-	L2TP_ATTR_PEER_SESSION_ID,	/* u32 */
-	L2TP_ATTR_UDP_CSUM,		/* u8 */
-	L2TP_ATTR_VLAN_ID,		/* u16 */
-	L2TP_ATTR_COOKIE,		/* 0, 4 or 8 bytes */
-	L2TP_ATTR_PEER_COOKIE,		/* 0, 4 or 8 bytes */
-	L2TP_ATTR_DEBUG,		/* u32 */
-	L2TP_ATTR_RECV_SEQ,		/* u8 */
-	L2TP_ATTR_SEND_SEQ,		/* u8 */
-	L2TP_ATTR_LNS_MODE,		/* u8 */
-	L2TP_ATTR_USING_IPSEC,		/* u8 */
-	L2TP_ATTR_RECV_TIMEOUT,		/* msec */
-	L2TP_ATTR_FD,			/* int */
-	L2TP_ATTR_IP_SADDR,		/* u32 */
-	L2TP_ATTR_IP_DADDR,		/* u32 */
-	L2TP_ATTR_UDP_SPORT,		/* u16 */
-	L2TP_ATTR_UDP_DPORT,		/* u16 */
-	L2TP_ATTR_MTU,			/* u16 */
-	L2TP_ATTR_MRU,			/* u16 */
-	L2TP_ATTR_STATS,		/* nested */
-	L2TP_ATTR_IP6_SADDR,		/* struct in6_addr */
-	L2TP_ATTR_IP6_DADDR,		/* struct in6_addr */
-	L2TP_ATTR_UDP_ZERO_CSUM6_TX,	/* u8 */
-	L2TP_ATTR_UDP_ZERO_CSUM6_RX,	/* u8 */
-	__L2TP_ATTR_MAX,
-};
-
-#define L2TP_ATTR_MAX			(__L2TP_ATTR_MAX - 1)
-
-/* Nested in L2TP_ATTR_STATS */
-enum {
-	L2TP_ATTR_STATS_NONE,		/* no data */
-	L2TP_ATTR_TX_PACKETS,		/* u64 */
-	L2TP_ATTR_TX_BYTES,		/* u64 */
-	L2TP_ATTR_TX_ERRORS,		/* u64 */
-	L2TP_ATTR_RX_PACKETS,		/* u64 */
-	L2TP_ATTR_RX_BYTES,		/* u64 */
-	L2TP_ATTR_RX_SEQ_DISCARDS,	/* u64 */
-	L2TP_ATTR_RX_OOS_PACKETS,	/* u64 */
-	L2TP_ATTR_RX_ERRORS,		/* u64 */
-	__L2TP_ATTR_STATS_MAX,
-};
-
-#define L2TP_ATTR_STATS_MAX		(__L2TP_ATTR_STATS_MAX - 1)
-
-enum l2tp_pwtype {
-	L2TP_PWTYPE_NONE = 0x0000,
-	L2TP_PWTYPE_ETH_VLAN = 0x0004,
-	L2TP_PWTYPE_ETH = 0x0005,
-	L2TP_PWTYPE_PPP = 0x0007,
-	L2TP_PWTYPE_PPP_AC = 0x0008,
-	L2TP_PWTYPE_IP = 0x000b,
-	__L2TP_PWTYPE_MAX
-};
-
-enum l2tp_l2spec_type {
-	L2TP_L2SPECTYPE_NONE,
-	L2TP_L2SPECTYPE_DEFAULT,
-};
-
-enum l2tp_encap_type {
-	L2TP_ENCAPTYPE_UDP,
-	L2TP_ENCAPTYPE_IP,
-};
-
-enum l2tp_seqmode {
-	L2TP_SEQ_NONE = 0,
-	L2TP_SEQ_IP = 1,
-	L2TP_SEQ_ALL = 2,
-};
-
-/*
- * NETLINK_GENERIC related info
- */
-#define L2TP_GENL_NAME		"l2tp"
-#define L2TP_GENL_VERSION	0x1
-#define L2TP_GENL_MCGROUP       "l2tp"
-
-#endif /* _LINUX_L2TP_H_ */
diff --git a/openflow/usr/include/linux/libc-compat.h b/openflow/usr/include/linux/libc-compat.h
deleted file mode 100644
index 9bed5b6..0000000
--- a/openflow/usr/include/linux/libc-compat.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Compatibility interface for userspace libc header coordination:
- *
- * Define compatibility macros that are used to control the inclusion or
- * exclusion of UAPI structures and definitions in coordination with another
- * userspace C library.
- *
- * This header is intended to solve the problem of UAPI definitions that
- * conflict with userspace definitions. If a UAPI header has such conflicting
- * definitions then the solution is as follows:
- *
- * * Synchronize the UAPI header and the libc headers so either one can be
- *   used and such that the ABI is preserved. If this is not possible then
- *   no simple compatibility interface exists (you need to write translating
- *   wrappers and rename things) and you can't use this interface.
- *
- * Then follow this process:
- *
- * (a) Include libc-compat.h in the UAPI header.
- *      e.g. #include <linux/libc-compat.h>
- *     This include must be as early as possible.
- *
- * (b) In libc-compat.h add enough code to detect that the comflicting
- *     userspace libc header has been included first.
- *
- * (c) If the userspace libc header has been included first define a set of
- *     guard macros of the form __UAPI_DEF_FOO and set their values to 1, else
- *     set their values to 0.
- *
- * (d) Back in the UAPI header with the conflicting definitions, guard the
- *     definitions with:
- *     #if __UAPI_DEF_FOO
- *       ...
- *     #endif
- *
- * This fixes the situation where the linux headers are included *after* the
- * libc headers. To fix the problem with the inclusion in the other order the
- * userspace libc headers must be fixed like this:
- *
- * * For all definitions that conflict with kernel definitions wrap those
- *   defines in the following:
- *   #if !__UAPI_DEF_FOO
- *     ...
- *   #endif
- *
- * This prevents the redefinition of a construct already defined by the kernel.
- */
-#ifndef _LIBC_COMPAT_H
-#define _LIBC_COMPAT_H
-
-/* We have included glibc headers... */
-#if defined(__GLIBC__)
-
-/* Coordinate with glibc netinet/in.h header. */
-#if defined(_NETINET_IN_H)
-
-/* GLIBC headers included first so don't define anything
- * that would already be defined. */
-#define __UAPI_DEF_IN_ADDR		0
-#define __UAPI_DEF_IN_IPPROTO		0
-#define __UAPI_DEF_IN_PKTINFO		0
-#define __UAPI_DEF_IP_MREQ		0
-#define __UAPI_DEF_SOCKADDR_IN		0
-#define __UAPI_DEF_IN_CLASS		0
-
-#define __UAPI_DEF_IN6_ADDR		0
-/* The exception is the in6_addr macros which must be defined
- * if the glibc code didn't define them. This guard matches
- * the guard in glibc/inet/netinet/in.h which defines the
- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
-#if defined(__USE_MISC) || defined (__USE_GNU)
-#define __UAPI_DEF_IN6_ADDR_ALT		0
-#else
-#define __UAPI_DEF_IN6_ADDR_ALT		1
-#endif
-#define __UAPI_DEF_SOCKADDR_IN6		0
-#define __UAPI_DEF_IPV6_MREQ		0
-#define __UAPI_DEF_IPPROTO_V6		0
-#define __UAPI_DEF_IPV6_OPTIONS		0
-#define __UAPI_DEF_IN6_PKTINFO		0
-#define __UAPI_DEF_IP6_MTUINFO		0
-
-#else
-
-/* Linux headers included first, and we must define everything
- * we need. The expectation is that glibc will check the
- * __UAPI_DEF_* defines and adjust appropriately. */
-#define __UAPI_DEF_IN_ADDR		1
-#define __UAPI_DEF_IN_IPPROTO		1
-#define __UAPI_DEF_IN_PKTINFO		1
-#define __UAPI_DEF_IP_MREQ		1
-#define __UAPI_DEF_SOCKADDR_IN		1
-#define __UAPI_DEF_IN_CLASS		1
-
-#define __UAPI_DEF_IN6_ADDR		1
-/* We unconditionally define the in6_addr macros and glibc must
- * coordinate. */
-#define __UAPI_DEF_IN6_ADDR_ALT		1
-#define __UAPI_DEF_SOCKADDR_IN6		1
-#define __UAPI_DEF_IPV6_MREQ		1
-#define __UAPI_DEF_IPPROTO_V6		1
-#define __UAPI_DEF_IPV6_OPTIONS		1
-#define __UAPI_DEF_IN6_PKTINFO		1
-#define __UAPI_DEF_IP6_MTUINFO		1
-
-#endif /* _NETINET_IN_H */
-
-/* Definitions for xattr.h */
-#if defined(_SYS_XATTR_H)
-#define __UAPI_DEF_XATTR		0
-#else
-#define __UAPI_DEF_XATTR		1
-#endif
-
-/* If we did not see any headers from any supported C libraries,
- * or we are being included in the kernel, then define everything
- * that we need. */
-#else /* !defined(__GLIBC__) */
-
-/* Definitions for in.h */
-#define __UAPI_DEF_IN_ADDR		1
-#define __UAPI_DEF_IN_IPPROTO		1
-#define __UAPI_DEF_IN_PKTINFO		1
-#define __UAPI_DEF_IP_MREQ		1
-#define __UAPI_DEF_SOCKADDR_IN		1
-#define __UAPI_DEF_IN_CLASS		1
-
-/* Definitions for in6.h */
-#define __UAPI_DEF_IN6_ADDR		1
-#define __UAPI_DEF_IN6_ADDR_ALT		1
-#define __UAPI_DEF_SOCKADDR_IN6		1
-#define __UAPI_DEF_IPV6_MREQ		1
-#define __UAPI_DEF_IPPROTO_V6		1
-#define __UAPI_DEF_IPV6_OPTIONS		1
-#define __UAPI_DEF_IN6_PKTINFO		1
-#define __UAPI_DEF_IP6_MTUINFO		1
-
-/* Definitions for xattr.h */
-#define __UAPI_DEF_XATTR		1
-
-#endif /* __GLIBC__ */
-
-#endif /* _LIBC_COMPAT_H */
diff --git a/openflow/usr/include/linux/limits.h b/openflow/usr/include/linux/limits.h
deleted file mode 100644
index 2d0f941..0000000
--- a/openflow/usr/include/linux/limits.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _LINUX_LIMITS_H
-#define _LINUX_LIMITS_H
-
-#define NR_OPEN	        1024
-
-#define NGROUPS_MAX    65536	/* supplemental group IDs are available */
-#define ARG_MAX       131072	/* # bytes of args + environ for exec() */
-#define LINK_MAX         127	/* # links a file may have */
-#define MAX_CANON        255	/* size of the canonical input queue */
-#define MAX_INPUT        255	/* size of the type-ahead buffer */
-#define NAME_MAX         255	/* # chars in a file name */
-#define PATH_MAX        4096	/* # chars in a path name including nul */
-#define PIPE_BUF        4096	/* # bytes in atomic write to a pipe */
-#define XATTR_NAME_MAX   255	/* # chars in an extended attribute name */
-#define XATTR_SIZE_MAX 65536	/* size of an extended attribute value (64k) */
-#define XATTR_LIST_MAX 65536	/* size of extended attribute namelist (64k) */
-
-#define RTSIG_MAX	  32
-
-#endif
diff --git a/openflow/usr/include/linux/llc.h b/openflow/usr/include/linux/llc.h
deleted file mode 100644
index ff895d1..0000000
--- a/openflow/usr/include/linux/llc.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * IEEE 802.2 User Interface SAPs for Linux, data structures and indicators.
- *
- * Copyright (c) 2001 by Jay Schulist <jschlst@samba.org>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
- */
-#ifndef __LINUX_LLC_H
-#define __LINUX_LLC_H
-
-#include <linux/socket.h>
-
-#define __LLC_SOCK_SIZE__ 16	/* sizeof(sockaddr_llc), word align. */
-struct sockaddr_llc {
-	__kernel_sa_family_t sllc_family; /* AF_LLC */
-	__kernel_sa_family_t sllc_arphrd; /* ARPHRD_ETHER */
-	unsigned char   sllc_test;
-	unsigned char   sllc_xid;
-	unsigned char	sllc_ua;	/* UA data, only for SOCK_STREAM. */
-	unsigned char   sllc_sap;
-	unsigned char   sllc_mac[IFHWADDRLEN];
-	unsigned char   __pad[__LLC_SOCK_SIZE__ -
-			      sizeof(__kernel_sa_family_t) * 2 -
-			      sizeof(unsigned char) * 4 - IFHWADDRLEN];
-};
-
-/* sockopt definitions. */
-enum llc_sockopts {
-	LLC_OPT_UNKNOWN = 0,
-	LLC_OPT_RETRY,		/* max retrans attempts. */
-	LLC_OPT_SIZE,		/* max PDU size (octets). */
-	LLC_OPT_ACK_TMR_EXP,	/* ack expire time (secs). */
-	LLC_OPT_P_TMR_EXP,	/* pf cycle expire time (secs). */
-	LLC_OPT_REJ_TMR_EXP,	/* rej sent expire time (secs). */
-	LLC_OPT_BUSY_TMR_EXP,	/* busy state expire time (secs). */
-	LLC_OPT_TX_WIN,		/* tx window size. */
-	LLC_OPT_RX_WIN,		/* rx window size. */
-	LLC_OPT_PKTINFO,	/* ancillary packet information. */
-	LLC_OPT_MAX
-};
-
-#define LLC_OPT_MAX_RETRY	 100
-#define LLC_OPT_MAX_SIZE	4196
-#define LLC_OPT_MAX_WIN		 127
-#define LLC_OPT_MAX_ACK_TMR_EXP	  60
-#define LLC_OPT_MAX_P_TMR_EXP	  60
-#define LLC_OPT_MAX_REJ_TMR_EXP	  60
-#define LLC_OPT_MAX_BUSY_TMR_EXP  60
-
-/* LLC SAP types. */
-#define LLC_SAP_NULL	0x00		/* NULL SAP. 			*/
-#define LLC_SAP_LLC	0x02		/* LLC Sublayer Management. 	*/
-#define LLC_SAP_SNA	0x04		/* SNA Path Control. 		*/
-#define LLC_SAP_PNM	0x0E		/* Proway Network Management.	*/	
-#define LLC_SAP_IP	0x06		/* TCP/IP. 			*/
-#define LLC_SAP_BSPAN	0x42		/* Bridge Spanning Tree Proto	*/
-#define LLC_SAP_MMS	0x4E		/* Manufacturing Message Srv.	*/
-#define LLC_SAP_8208	0x7E		/* ISO 8208			*/
-#define LLC_SAP_3COM	0x80		/* 3COM. 			*/
-#define LLC_SAP_PRO	0x8E		/* Proway Active Station List	*/
-#define LLC_SAP_SNAP	0xAA		/* SNAP. 			*/
-#define LLC_SAP_BANYAN	0xBC		/* Banyan. 			*/
-#define LLC_SAP_IPX	0xE0		/* IPX/SPX. 			*/
-#define LLC_SAP_NETBEUI	0xF0		/* NetBEUI. 			*/
-#define LLC_SAP_LANMGR	0xF4		/* LanManager. 			*/
-#define LLC_SAP_IMPL	0xF8		/* IMPL				*/
-#define LLC_SAP_DISC	0xFC		/* Discovery			*/
-#define LLC_SAP_OSI	0xFE		/* OSI Network Layers. 		*/
-#define LLC_SAP_LAR	0xDC		/* LAN Address Resolution 	*/
-#define LLC_SAP_RM	0xD4		/* Resource Management 		*/
-#define LLC_SAP_GLOBAL	0xFF		/* Global SAP. 			*/
-
-struct llc_pktinfo {
-	int lpi_ifindex;
-	unsigned char lpi_sap;
-	unsigned char lpi_mac[IFHWADDRLEN];
-};
-
-#endif /* __LINUX_LLC_H */
diff --git a/openflow/usr/include/linux/loop.h b/openflow/usr/include/linux/loop.h
deleted file mode 100644
index 50b4ec8..0000000
--- a/openflow/usr/include/linux/loop.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * include/linux/loop.h
- *
- * Written by Theodore Ts'o, 3/29/93.
- *
- * Copyright 1993 by Theodore Ts'o.  Redistribution of this file is
- * permitted under the GNU General Public License.
- */
-#ifndef _LINUX_LOOP_H
-#define _LINUX_LOOP_H
-
-
-#define LO_NAME_SIZE	64
-#define LO_KEY_SIZE	32
-
-
-/*
- * Loop flags
- */
-enum {
-	LO_FLAGS_READ_ONLY	= 1,
-	LO_FLAGS_AUTOCLEAR	= 4,
-	LO_FLAGS_PARTSCAN	= 8,
-	LO_FLAGS_DIRECT_IO	= 16,
-};
-
-#include <asm/posix_types.h>	/* for __kernel_old_dev_t */
-#include <linux/types.h>	/* for __u64 */
-
-/* Backwards compatibility version */
-struct loop_info {
-	int		   lo_number;		/* ioctl r/o */
-	__kernel_old_dev_t lo_device; 		/* ioctl r/o */
-	unsigned long	   lo_inode; 		/* ioctl r/o */
-	__kernel_old_dev_t lo_rdevice; 		/* ioctl r/o */
-	int		   lo_offset;
-	int		   lo_encrypt_type;
-	int		   lo_encrypt_key_size; 	/* ioctl w/o */
-	int		   lo_flags;			/* ioctl r/o */
-	char		   lo_name[LO_NAME_SIZE];
-	unsigned char	   lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
-	unsigned long	   lo_init[2];
-	char		   reserved[4];
-};
-
-struct loop_info64 {
-	__u64		   lo_device;			/* ioctl r/o */
-	__u64		   lo_inode;			/* ioctl r/o */
-	__u64		   lo_rdevice;			/* ioctl r/o */
-	__u64		   lo_offset;
-	__u64		   lo_sizelimit;/* bytes, 0 == max available */
-	__u32		   lo_number;			/* ioctl r/o */
-	__u32		   lo_encrypt_type;
-	__u32		   lo_encrypt_key_size;		/* ioctl w/o */
-	__u32		   lo_flags;			/* ioctl r/o */
-	__u8		   lo_file_name[LO_NAME_SIZE];
-	__u8		   lo_crypt_name[LO_NAME_SIZE];
-	__u8		   lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
-	__u64		   lo_init[2];
-};
-
-/*
- * Loop filter types
- */
-
-#define LO_CRYPT_NONE		0
-#define LO_CRYPT_XOR		1
-#define LO_CRYPT_DES		2
-#define LO_CRYPT_FISH2		3    /* Twofish encryption */
-#define LO_CRYPT_BLOW		4
-#define LO_CRYPT_CAST128	5
-#define LO_CRYPT_IDEA		6
-#define LO_CRYPT_DUMMY		9
-#define LO_CRYPT_SKIPJACK	10
-#define LO_CRYPT_CRYPTOAPI	18
-#define MAX_LO_CRYPT		20
-
-/*
- * IOCTL commands --- we will commandeer 0x4C ('L')
- */
-
-#define LOOP_SET_FD		0x4C00
-#define LOOP_CLR_FD		0x4C01
-#define LOOP_SET_STATUS		0x4C02
-#define LOOP_GET_STATUS		0x4C03
-#define LOOP_SET_STATUS64	0x4C04
-#define LOOP_GET_STATUS64	0x4C05
-#define LOOP_CHANGE_FD		0x4C06
-#define LOOP_SET_CAPACITY	0x4C07
-#define LOOP_SET_DIRECT_IO	0x4C08
-
-/* /dev/loop-control interface */
-#define LOOP_CTL_ADD		0x4C80
-#define LOOP_CTL_REMOVE		0x4C81
-#define LOOP_CTL_GET_FREE	0x4C82
-#endif /* _LINUX_LOOP_H */
diff --git a/openflow/usr/include/linux/lp.h b/openflow/usr/include/linux/lp.h
deleted file mode 100644
index 3226e65..0000000
--- a/openflow/usr/include/linux/lp.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * usr/include/linux/lp.h c.1991-1992 James Wiegand
- * many modifications copyright (C) 1992 Michael K. Johnson
- * Interrupt support added 1993 Nigel Gamble
- * Removed 8255 status defines from inside __KERNEL__ Marcelo Tosatti 
- */
-#ifndef _LINUX_LP_H
-#define _LINUX_LP_H
-
-
-/*
- * Per POSIX guidelines, this module reserves the LP and lp prefixes
- * These are the lp_table[minor].flags flags...
- */
-#define LP_EXIST 0x0001
-#define LP_SELEC 0x0002
-#define LP_BUSY	 0x0004
-#define LP_BUSY_BIT_POS 2
-#define LP_OFFL	 0x0008
-#define LP_NOPA  0x0010
-#define LP_ERR   0x0020
-#define LP_ABORT 0x0040
-#define LP_CAREFUL 0x0080 /* obsoleted -arca */
-#define LP_ABORTOPEN 0x0100
-
-#define LP_TRUST_IRQ_  0x0200 /* obsolete */
-#define LP_NO_REVERSE  0x0400 /* No reverse mode available. */
-#define LP_DATA_AVAIL  0x0800 /* Data is available. */
-
-/* 
- * bit defines for 8255 status port
- * base + 1
- * accessed with LP_S(minor), which gets the byte...
- */
-#define LP_PBUSY	0x80  /* inverted input, active high */
-#define LP_PACK		0x40  /* unchanged input, active low */
-#define LP_POUTPA	0x20  /* unchanged input, active high */
-#define LP_PSELECD	0x10  /* unchanged input, active high */
-#define LP_PERRORP	0x08  /* unchanged input, active low */
-
-/* timeout for each character.  This is relative to bus cycles -- it
- * is the count in a busy loop.  THIS IS THE VALUE TO CHANGE if you
- * have extremely slow printing, or if the machine seems to slow down
- * a lot when you print.  If you have slow printing, increase this
- * number and recompile, and if your system gets bogged down, decrease
- * this number.  This can be changed with the tunelp(8) command as well.
- */
-
-#define LP_INIT_CHAR 1000
-
-/* The parallel port specs apparently say that there needs to be
- * a .5usec wait before and after the strobe.
- */
-
-#define LP_INIT_WAIT 1
-
-/* This is the amount of time that the driver waits for the printer to
- * catch up when the printer's buffer appears to be filled.  If you
- * want to tune this and have a fast printer (i.e. HPIIIP), decrease
- * this number, and if you have a slow printer, increase this number.
- * This is in hundredths of a second, the default 2 being .05 second.
- * Or use the tunelp(8) command, which is especially nice if you want
- * change back and forth between character and graphics printing, which
- * are wildly different...
- */
-
-#define LP_INIT_TIME 2
-
-/* IOCTL numbers */
-#define LPCHAR   0x0601  /* corresponds to LP_INIT_CHAR */
-#define LPTIME   0x0602  /* corresponds to LP_INIT_TIME */
-#define LPABORT  0x0604  /* call with TRUE arg to abort on error,
-			    FALSE to retry.  Default is retry.  */
-#define LPSETIRQ 0x0605  /* call with new IRQ number,
-			    or 0 for polling (no IRQ) */
-#define LPGETIRQ 0x0606  /* get the current IRQ number */
-#define LPWAIT   0x0608  /* corresponds to LP_INIT_WAIT */
-/* NOTE: LPCAREFUL is obsoleted and it' s always the default right now -arca */
-#define LPCAREFUL   0x0609  /* call with TRUE arg to require out-of-paper, off-
-			    line, and error indicators good on all writes,
-			    FALSE to ignore them.  Default is ignore. */
-#define LPABORTOPEN 0x060a  /* call with TRUE arg to abort open() on error,
-			    FALSE to ignore error.  Default is ignore.  */
-#define LPGETSTATUS 0x060b  /* return LP_S(minor) */
-#define LPRESET     0x060c  /* reset printer */
-#ifdef LP_STATS
-#define LPGETSTATS  0x060d  /* get statistics (struct lp_stats) */
-#endif
-#define LPGETFLAGS  0x060e  /* get status flags */
-#define LPSETTIMEOUT 0x060f /* set parport timeout */
-
-/* timeout for printk'ing a timeout, in jiffies (100ths of a second).
-   This is also used for re-checking error conditions if LP_ABORT is
-   not set.  This is the default behavior. */
-
-#define LP_TIMEOUT_INTERRUPT	(60 * HZ)
-#define LP_TIMEOUT_POLLED	(10 * HZ)
-
-
-#endif /* _LINUX_LP_H */
diff --git a/openflow/usr/include/linux/lwtunnel.h b/openflow/usr/include/linux/lwtunnel.h
deleted file mode 100644
index 1d2f4f6..0000000
--- a/openflow/usr/include/linux/lwtunnel.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _LWTUNNEL_H_
-#define _LWTUNNEL_H_
-
-#include <linux/types.h>
-
-enum lwtunnel_encap_types {
-	LWTUNNEL_ENCAP_NONE,
-	LWTUNNEL_ENCAP_MPLS,
-	LWTUNNEL_ENCAP_IP,
-	LWTUNNEL_ENCAP_ILA,
-	LWTUNNEL_ENCAP_IP6,
-	__LWTUNNEL_ENCAP_MAX,
-};
-
-#define LWTUNNEL_ENCAP_MAX (__LWTUNNEL_ENCAP_MAX - 1)
-
-enum lwtunnel_ip_t {
-	LWTUNNEL_IP_UNSPEC,
-	LWTUNNEL_IP_ID,
-	LWTUNNEL_IP_DST,
-	LWTUNNEL_IP_SRC,
-	LWTUNNEL_IP_TTL,
-	LWTUNNEL_IP_TOS,
-	LWTUNNEL_IP_FLAGS,
-	__LWTUNNEL_IP_MAX,
-};
-
-#define LWTUNNEL_IP_MAX (__LWTUNNEL_IP_MAX - 1)
-
-enum lwtunnel_ip6_t {
-	LWTUNNEL_IP6_UNSPEC,
-	LWTUNNEL_IP6_ID,
-	LWTUNNEL_IP6_DST,
-	LWTUNNEL_IP6_SRC,
-	LWTUNNEL_IP6_HOPLIMIT,
-	LWTUNNEL_IP6_TC,
-	LWTUNNEL_IP6_FLAGS,
-	__LWTUNNEL_IP6_MAX,
-};
-
-#define LWTUNNEL_IP6_MAX (__LWTUNNEL_IP6_MAX - 1)
-
-#endif /* _LWTUNNEL_H_ */
diff --git a/openflow/usr/include/linux/magic.h b/openflow/usr/include/linux/magic.h
deleted file mode 100644
index accb036..0000000
--- a/openflow/usr/include/linux/magic.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef __LINUX_MAGIC_H__
-#define __LINUX_MAGIC_H__
-
-#define ADFS_SUPER_MAGIC	0xadf5
-#define AFFS_SUPER_MAGIC	0xadff
-#define AFS_SUPER_MAGIC                0x5346414F
-#define AUTOFS_SUPER_MAGIC	0x0187
-#define CODA_SUPER_MAGIC	0x73757245
-#define CRAMFS_MAGIC		0x28cd3d45	/* some random number */
-#define CRAMFS_MAGIC_WEND	0x453dcd28	/* magic number with the wrong endianess */
-#define DEBUGFS_MAGIC          0x64626720
-#define SECURITYFS_MAGIC	0x73636673
-#define SELINUX_MAGIC		0xf97cff8c
-#define SMACK_MAGIC		0x43415d53	/* "SMAC" */
-#define RAMFS_MAGIC		0x858458f6	/* some random number */
-#define TMPFS_MAGIC		0x01021994
-#define HUGETLBFS_MAGIC 	0x958458f6	/* some random number */
-#define SQUASHFS_MAGIC		0x73717368
-#define ECRYPTFS_SUPER_MAGIC	0xf15f
-#define EFS_SUPER_MAGIC		0x414A53
-#define EXT2_SUPER_MAGIC	0xEF53
-#define EXT3_SUPER_MAGIC	0xEF53
-#define XENFS_SUPER_MAGIC	0xabba1974
-#define EXT4_SUPER_MAGIC	0xEF53
-#define BTRFS_SUPER_MAGIC	0x9123683E
-#define NILFS_SUPER_MAGIC	0x3434
-#define F2FS_SUPER_MAGIC	0xF2F52010
-#define HPFS_SUPER_MAGIC	0xf995e849
-#define ISOFS_SUPER_MAGIC	0x9660
-#define JFFS2_SUPER_MAGIC	0x72b6
-#define PSTOREFS_MAGIC		0x6165676C
-#define EFIVARFS_MAGIC		0xde5e81e4
-#define HOSTFS_SUPER_MAGIC	0x00c0ffee
-
-#define MINIX_SUPER_MAGIC	0x137F		/* minix v1 fs, 14 char names */
-#define MINIX_SUPER_MAGIC2	0x138F		/* minix v1 fs, 30 char names */
-#define MINIX2_SUPER_MAGIC	0x2468		/* minix v2 fs, 14 char names */
-#define MINIX2_SUPER_MAGIC2	0x2478		/* minix v2 fs, 30 char names */
-#define MINIX3_SUPER_MAGIC	0x4d5a		/* minix v3 fs, 60 char names */
-
-#define MSDOS_SUPER_MAGIC	0x4d44		/* MD */
-#define NCP_SUPER_MAGIC		0x564c		/* Guess, what 0x564c is :-) */
-#define NFS_SUPER_MAGIC		0x6969
-#define OPENPROM_SUPER_MAGIC	0x9fa1
-#define QNX4_SUPER_MAGIC	0x002f		/* qnx4 fs detection */
-#define QNX6_SUPER_MAGIC	0x68191122	/* qnx6 fs detection */
-
-#define REISERFS_SUPER_MAGIC	0x52654973	/* used by gcc */
-					/* used by file system utilities that
-	                                   look at the superblock, etc.  */
-#define REISERFS_SUPER_MAGIC_STRING	"ReIsErFs"
-#define REISER2FS_SUPER_MAGIC_STRING	"ReIsEr2Fs"
-#define REISER2FS_JR_SUPER_MAGIC_STRING	"ReIsEr3Fs"
-
-#define SMB_SUPER_MAGIC		0x517B
-#define CGROUP_SUPER_MAGIC	0x27e0eb
-
-
-#define STACK_END_MAGIC		0x57AC6E9D
-
-#define TRACEFS_MAGIC          0x74726163
-
-#define V9FS_MAGIC		0x01021997
-
-#define BDEVFS_MAGIC            0x62646576
-#define BINFMTFS_MAGIC          0x42494e4d
-#define DEVPTS_SUPER_MAGIC	0x1cd1
-#define FUTEXFS_SUPER_MAGIC	0xBAD1DEA
-#define PIPEFS_MAGIC            0x50495045
-#define PROC_SUPER_MAGIC	0x9fa0
-#define SOCKFS_MAGIC		0x534F434B
-#define SYSFS_MAGIC		0x62656572
-#define USBDEVICE_SUPER_MAGIC	0x9fa2
-#define MTD_INODE_FS_MAGIC      0x11307854
-#define ANON_INODE_FS_MAGIC	0x09041934
-#define BTRFS_TEST_MAGIC	0x73727279
-#define NSFS_MAGIC		0x6e736673
-#define BPF_FS_MAGIC		0xcafe4a11
-
-#endif /* __LINUX_MAGIC_H__ */
diff --git a/openflow/usr/include/linux/major.h b/openflow/usr/include/linux/major.h
deleted file mode 100644
index 620252e..0000000
--- a/openflow/usr/include/linux/major.h
+++ /dev/null
@@ -1,179 +0,0 @@
-#ifndef _LINUX_MAJOR_H
-#define _LINUX_MAJOR_H
-
-/*
- * This file has definitions for major device numbers.
- * For the device number assignments, see Documentation/devices.txt.
- */
-
-#define UNNAMED_MAJOR		0
-#define MEM_MAJOR		1
-#define RAMDISK_MAJOR		1
-#define FLOPPY_MAJOR		2
-#define PTY_MASTER_MAJOR	2
-#define IDE0_MAJOR		3
-#define HD_MAJOR		IDE0_MAJOR
-#define PTY_SLAVE_MAJOR		3
-#define TTY_MAJOR		4
-#define TTYAUX_MAJOR		5
-#define LP_MAJOR		6
-#define VCS_MAJOR		7
-#define LOOP_MAJOR		7
-#define SCSI_DISK0_MAJOR	8
-#define SCSI_TAPE_MAJOR		9
-#define MD_MAJOR		9
-#define MISC_MAJOR		10
-#define SCSI_CDROM_MAJOR	11
-#define MUX_MAJOR		11	/* PA-RISC only */
-#define XT_DISK_MAJOR		13
-#define INPUT_MAJOR		13
-#define SOUND_MAJOR		14
-#define CDU31A_CDROM_MAJOR	15
-#define JOYSTICK_MAJOR		15
-#define GOLDSTAR_CDROM_MAJOR	16
-#define OPTICS_CDROM_MAJOR	17
-#define SANYO_CDROM_MAJOR	18
-#define CYCLADES_MAJOR		19
-#define CYCLADESAUX_MAJOR	20
-#define MITSUMI_X_CDROM_MAJOR	20
-#define MFM_ACORN_MAJOR		21	/* ARM Linux /dev/mfm */
-#define SCSI_GENERIC_MAJOR	21
-#define IDE1_MAJOR		22
-#define DIGICU_MAJOR		22
-#define DIGI_MAJOR		23
-#define MITSUMI_CDROM_MAJOR	23
-#define CDU535_CDROM_MAJOR	24
-#define STL_SERIALMAJOR		24
-#define MATSUSHITA_CDROM_MAJOR	25
-#define STL_CALLOUTMAJOR	25
-#define MATSUSHITA_CDROM2_MAJOR	26
-#define QIC117_TAPE_MAJOR	27
-#define MATSUSHITA_CDROM3_MAJOR	27
-#define MATSUSHITA_CDROM4_MAJOR	28
-#define STL_SIOMEMMAJOR		28
-#define ACSI_MAJOR		28
-#define AZTECH_CDROM_MAJOR	29
-#define FB_MAJOR		29   /* /dev/fb* framebuffers */
-#define MTD_BLOCK_MAJOR		31
-#define CM206_CDROM_MAJOR	32
-#define IDE2_MAJOR		33
-#define IDE3_MAJOR		34
-#define Z8530_MAJOR		34
-#define XPRAM_MAJOR		35   /* Expanded storage on S/390: "slow ram"*/
-#define NETLINK_MAJOR		36
-#define PS2ESDI_MAJOR		36
-#define IDETAPE_MAJOR		37
-#define Z2RAM_MAJOR		37
-#define APBLOCK_MAJOR		38   /* AP1000 Block device */
-#define DDV_MAJOR		39   /* AP1000 DDV block device */
-#define NBD_MAJOR		43   /* Network block device	*/
-#define RISCOM8_NORMAL_MAJOR	48
-#define DAC960_MAJOR		48   /* 48..55 */
-#define RISCOM8_CALLOUT_MAJOR	49
-#define MKISS_MAJOR		55
-#define DSP56K_MAJOR		55   /* DSP56001 processor device */
-
-#define IDE4_MAJOR		56
-#define IDE5_MAJOR		57
-
-#define SCSI_DISK1_MAJOR	65
-#define SCSI_DISK2_MAJOR	66
-#define SCSI_DISK3_MAJOR	67
-#define SCSI_DISK4_MAJOR	68
-#define SCSI_DISK5_MAJOR	69
-#define SCSI_DISK6_MAJOR	70
-#define SCSI_DISK7_MAJOR	71
-
-#define COMPAQ_SMART2_MAJOR	72
-#define COMPAQ_SMART2_MAJOR1	73
-#define COMPAQ_SMART2_MAJOR2	74
-#define COMPAQ_SMART2_MAJOR3	75
-#define COMPAQ_SMART2_MAJOR4	76
-#define COMPAQ_SMART2_MAJOR5	77
-#define COMPAQ_SMART2_MAJOR6	78
-#define COMPAQ_SMART2_MAJOR7	79
-
-#define SPECIALIX_NORMAL_MAJOR	75
-#define SPECIALIX_CALLOUT_MAJOR	76
-
-#define AURORA_MAJOR		79
-
-#define I2O_MAJOR		80	/* 80->87 */
-
-#define SHMIQ_MAJOR		85   /* Linux/mips, SGI /dev/shmiq */
-#define SCSI_CHANGER_MAJOR      86
-
-#define IDE6_MAJOR		88
-#define IDE7_MAJOR		89
-#define IDE8_MAJOR		90
-#define MTD_CHAR_MAJOR		90
-#define IDE9_MAJOR		91
-
-#define DASD_MAJOR		94
-
-#define MDISK_MAJOR		95
-
-#define UBD_MAJOR		98
-
-#define PP_MAJOR		99
-#define JSFD_MAJOR		99
-
-#define PHONE_MAJOR		100
-
-#define COMPAQ_CISS_MAJOR	104
-#define COMPAQ_CISS_MAJOR1	105
-#define COMPAQ_CISS_MAJOR2      106
-#define COMPAQ_CISS_MAJOR3      107
-#define COMPAQ_CISS_MAJOR4      108
-#define COMPAQ_CISS_MAJOR5      109
-#define COMPAQ_CISS_MAJOR6      110
-#define COMPAQ_CISS_MAJOR7      111
-
-#define VIODASD_MAJOR		112
-#define VIOCD_MAJOR		113
-
-#define ATARAID_MAJOR		114
-
-#define SCSI_DISK8_MAJOR	128
-#define SCSI_DISK9_MAJOR	129
-#define SCSI_DISK10_MAJOR	130
-#define SCSI_DISK11_MAJOR	131
-#define SCSI_DISK12_MAJOR	132
-#define SCSI_DISK13_MAJOR	133
-#define SCSI_DISK14_MAJOR	134
-#define SCSI_DISK15_MAJOR	135
-
-#define UNIX98_PTY_MASTER_MAJOR	128
-#define UNIX98_PTY_MAJOR_COUNT	8
-#define UNIX98_PTY_SLAVE_MAJOR	(UNIX98_PTY_MASTER_MAJOR+UNIX98_PTY_MAJOR_COUNT)
-
-#define DRBD_MAJOR		147
-#define RTF_MAJOR		150
-#define RAW_MAJOR		162
-
-#define USB_ACM_MAJOR		166
-#define USB_ACM_AUX_MAJOR	167
-#define USB_CHAR_MAJOR		180
-
-#define MMC_BLOCK_MAJOR		179
-
-#define VXVM_MAJOR		199	/* VERITAS volume i/o driver    */
-#define VXSPEC_MAJOR		200	/* VERITAS volume config driver */
-#define VXDMP_MAJOR		201	/* VERITAS volume multipath driver */
-
-#define XENVBD_MAJOR		202	/* Xen virtual block device */
-
-#define MSR_MAJOR		202
-#define CPUID_MAJOR		203
-
-#define OSST_MAJOR		206	/* OnStream-SCx0 SCSI tape */
-
-#define IBM_TTY3270_MAJOR	227
-#define IBM_FS3270_MAJOR	228
-
-#define VIOTAPE_MAJOR		230
-
-#define BLOCK_EXT_MAJOR		259
-#define SCSI_OSD_MAJOR		260	/* open-osd's OSD scsi device */
-
-#endif
diff --git a/openflow/usr/include/linux/map_to_7segment.h b/openflow/usr/include/linux/map_to_7segment.h
deleted file mode 100644
index 12d62a5..0000000
--- a/openflow/usr/include/linux/map_to_7segment.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2005 Henk Vergonet <Henk.Vergonet@gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef MAP_TO_7SEGMENT_H
-#define MAP_TO_7SEGMENT_H
-
-/* This file provides translation primitives and tables for the conversion
- * of (ASCII) characters to a 7-segments notation.
- *
- * The 7 segment's wikipedia notation below is used as standard.
- * See: http://en.wikipedia.org/wiki/Seven_segment_display
- *
- * Notation:	+-a-+
- *		f   b
- *		+-g-+
- *		e   c
- *		+-d-+
- *
- * Usage:
- *
- *   Register a map variable, and fill it with a character set:
- *	static SEG7_DEFAULT_MAP(map_seg7);
- *
- *
- *   Then use for conversion:
- *	seg7 = map_to_seg7(&map_seg7, some_char);
- *	...
- *
- * In device drivers it is recommended, if required, to make the char map
- * accessible via the sysfs interface using the following scheme:
- *
- * static ssize_t show_map(struct device *dev, char *buf) {
- *	memcpy(buf, &map_seg7, sizeof(map_seg7));
- *	return sizeof(map_seg7);
- * }
- * static ssize_t store_map(struct device *dev, const char *buf, size_t cnt) {
- *	if(cnt != sizeof(map_seg7))
- *		return -EINVAL;
- *	memcpy(&map_seg7, buf, cnt);
- *	return cnt;
- * }
- * static DEVICE_ATTR(map_seg7, PERMS_RW, show_map, store_map);
- *
- * History:
- * 2005-05-31	RFC linux-kernel@vger.kernel.org
- */
-#include <linux/errno.h>
-
-
-#define BIT_SEG7_A		0
-#define BIT_SEG7_B		1
-#define BIT_SEG7_C		2
-#define BIT_SEG7_D		3
-#define BIT_SEG7_E		4
-#define BIT_SEG7_F		5
-#define BIT_SEG7_G		6
-#define BIT_SEG7_RESERVED	7
-
-struct seg7_conversion_map {
-	unsigned char	table[128];
-};
-
-static __inline__ int map_to_seg7(struct seg7_conversion_map *map, int c)
-{
-	return c >= 0 && c < sizeof(map->table) ? map->table[c] : -EINVAL;
-}
-
-#define SEG7_CONVERSION_MAP(_name, _map)	\
-	struct seg7_conversion_map _name = { .table = { _map } }
-
-/*
- * It is recommended to use a facility that allows user space to redefine
- * custom character sets for LCD devices. Please use a sysfs interface
- * as described above.
- */
-#define MAP_TO_SEG7_SYSFS_FILE	"map_seg7"
-
-/*******************************************************************************
- * ASCII conversion table
- ******************************************************************************/
-
-#define _SEG7(l,a,b,c,d,e,f,g)	\
-      (	a<<BIT_SEG7_A |	b<<BIT_SEG7_B |	c<<BIT_SEG7_C |	d<<BIT_SEG7_D |	\
-	e<<BIT_SEG7_E |	f<<BIT_SEG7_F |	g<<BIT_SEG7_G )
-
-#define _MAP_0_32_ASCII_SEG7_NON_PRINTABLE	\
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-
-#define _MAP_33_47_ASCII_SEG7_SYMBOL		\
- _SEG7('!',0,0,0,0,1,1,0), _SEG7('"',0,1,0,0,0,1,0), _SEG7('#',0,1,1,0,1,1,0),\
- _SEG7('$',1,0,1,1,0,1,1), _SEG7('%',0,0,1,0,0,1,0), _SEG7('&',1,0,1,1,1,1,1),\
- _SEG7('\'',0,0,0,0,0,1,0),_SEG7('(',1,0,0,1,1,1,0), _SEG7(')',1,1,1,1,0,0,0),\
- _SEG7('*',0,1,1,0,1,1,1), _SEG7('+',0,1,1,0,0,0,1), _SEG7(',',0,0,0,0,1,0,0),\
- _SEG7('-',0,0,0,0,0,0,1), _SEG7('.',0,0,0,0,1,0,0), _SEG7('/',0,1,0,0,1,0,1),
-
-#define _MAP_48_57_ASCII_SEG7_NUMERIC		\
- _SEG7('0',1,1,1,1,1,1,0), _SEG7('1',0,1,1,0,0,0,0), _SEG7('2',1,1,0,1,1,0,1),\
- _SEG7('3',1,1,1,1,0,0,1), _SEG7('4',0,1,1,0,0,1,1), _SEG7('5',1,0,1,1,0,1,1),\
- _SEG7('6',1,0,1,1,1,1,1), _SEG7('7',1,1,1,0,0,0,0), _SEG7('8',1,1,1,1,1,1,1),\
- _SEG7('9',1,1,1,1,0,1,1),
-
-#define _MAP_58_64_ASCII_SEG7_SYMBOL		\
- _SEG7(':',0,0,0,1,0,0,1), _SEG7(';',0,0,0,1,0,0,1), _SEG7('<',1,0,0,0,0,1,1),\
- _SEG7('=',0,0,0,1,0,0,1), _SEG7('>',1,1,0,0,0,0,1), _SEG7('?',1,1,1,0,0,1,0),\
- _SEG7('@',1,1,0,1,1,1,1),
-
-#define _MAP_65_90_ASCII_SEG7_ALPHA_UPPR	\
- _SEG7('A',1,1,1,0,1,1,1), _SEG7('B',1,1,1,1,1,1,1), _SEG7('C',1,0,0,1,1,1,0),\
- _SEG7('D',1,1,1,1,1,1,0), _SEG7('E',1,0,0,1,1,1,1), _SEG7('F',1,0,0,0,1,1,1),\
- _SEG7('G',1,1,1,1,0,1,1), _SEG7('H',0,1,1,0,1,1,1), _SEG7('I',0,1,1,0,0,0,0),\
- _SEG7('J',0,1,1,1,0,0,0), _SEG7('K',0,1,1,0,1,1,1), _SEG7('L',0,0,0,1,1,1,0),\
- _SEG7('M',1,1,1,0,1,1,0), _SEG7('N',1,1,1,0,1,1,0), _SEG7('O',1,1,1,1,1,1,0),\
- _SEG7('P',1,1,0,0,1,1,1), _SEG7('Q',1,1,1,1,1,1,0), _SEG7('R',1,1,1,0,1,1,1),\
- _SEG7('S',1,0,1,1,0,1,1), _SEG7('T',0,0,0,1,1,1,1), _SEG7('U',0,1,1,1,1,1,0),\
- _SEG7('V',0,1,1,1,1,1,0), _SEG7('W',0,1,1,1,1,1,1), _SEG7('X',0,1,1,0,1,1,1),\
- _SEG7('Y',0,1,1,0,0,1,1), _SEG7('Z',1,1,0,1,1,0,1),
-
-#define _MAP_91_96_ASCII_SEG7_SYMBOL		\
- _SEG7('[',1,0,0,1,1,1,0), _SEG7('\\',0,0,1,0,0,1,1),_SEG7(']',1,1,1,1,0,0,0),\
- _SEG7('^',1,1,0,0,0,1,0), _SEG7('_',0,0,0,1,0,0,0), _SEG7('`',0,1,0,0,0,0,0),
-
-#define _MAP_97_122_ASCII_SEG7_ALPHA_LOWER	\
- _SEG7('A',1,1,1,0,1,1,1), _SEG7('b',0,0,1,1,1,1,1), _SEG7('c',0,0,0,1,1,0,1),\
- _SEG7('d',0,1,1,1,1,0,1), _SEG7('E',1,0,0,1,1,1,1), _SEG7('F',1,0,0,0,1,1,1),\
- _SEG7('G',1,1,1,1,0,1,1), _SEG7('h',0,0,1,0,1,1,1), _SEG7('i',0,0,1,0,0,0,0),\
- _SEG7('j',0,0,1,1,0,0,0), _SEG7('k',0,0,1,0,1,1,1), _SEG7('L',0,0,0,1,1,1,0),\
- _SEG7('M',1,1,1,0,1,1,0), _SEG7('n',0,0,1,0,1,0,1), _SEG7('o',0,0,1,1,1,0,1),\
- _SEG7('P',1,1,0,0,1,1,1), _SEG7('q',1,1,1,0,0,1,1), _SEG7('r',0,0,0,0,1,0,1),\
- _SEG7('S',1,0,1,1,0,1,1), _SEG7('T',0,0,0,1,1,1,1), _SEG7('u',0,0,1,1,1,0,0),\
- _SEG7('v',0,0,1,1,1,0,0), _SEG7('W',0,1,1,1,1,1,1), _SEG7('X',0,1,1,0,1,1,1),\
- _SEG7('y',0,1,1,1,0,1,1), _SEG7('Z',1,1,0,1,1,0,1),
-
-#define _MAP_123_126_ASCII_SEG7_SYMBOL		\
- _SEG7('{',1,0,0,1,1,1,0), _SEG7('|',0,0,0,0,1,1,0), _SEG7('}',1,1,1,1,0,0,0),\
- _SEG7('~',1,0,0,0,0,0,0),
-
-/* Maps */
-
-/* This set tries to map as close as possible to the visible characteristics
- * of the ASCII symbol, lowercase and uppercase letters may differ in
- * presentation on the display.
- */
-#define MAP_ASCII7SEG_ALPHANUM			\
-	_MAP_0_32_ASCII_SEG7_NON_PRINTABLE	\
-	_MAP_33_47_ASCII_SEG7_SYMBOL		\
-	_MAP_48_57_ASCII_SEG7_NUMERIC		\
-	_MAP_58_64_ASCII_SEG7_SYMBOL		\
-	_MAP_65_90_ASCII_SEG7_ALPHA_UPPR	\
-	_MAP_91_96_ASCII_SEG7_SYMBOL		\
-	_MAP_97_122_ASCII_SEG7_ALPHA_LOWER	\
-	_MAP_123_126_ASCII_SEG7_SYMBOL
-
-/* This set tries to map as close as possible to the symbolic characteristics
- * of the ASCII character for maximum discrimination.
- * For now this means all alpha chars are in lower case representations.
- * (This for example facilitates the use of hex numbers with uppercase input.)
- */
-#define MAP_ASCII7SEG_ALPHANUM_LC			\
-	_MAP_0_32_ASCII_SEG7_NON_PRINTABLE	\
-	_MAP_33_47_ASCII_SEG7_SYMBOL		\
-	_MAP_48_57_ASCII_SEG7_NUMERIC		\
-	_MAP_58_64_ASCII_SEG7_SYMBOL		\
-	_MAP_97_122_ASCII_SEG7_ALPHA_LOWER	\
-	_MAP_91_96_ASCII_SEG7_SYMBOL		\
-	_MAP_97_122_ASCII_SEG7_ALPHA_LOWER	\
-	_MAP_123_126_ASCII_SEG7_SYMBOL
-
-#define SEG7_DEFAULT_MAP(_name)		\
-	SEG7_CONVERSION_MAP(_name,MAP_ASCII7SEG_ALPHANUM)
-
-#endif	/* MAP_TO_7SEGMENT_H */
-
diff --git a/openflow/usr/include/linux/matroxfb.h b/openflow/usr/include/linux/matroxfb.h
deleted file mode 100644
index 8c22a89..0000000
--- a/openflow/usr/include/linux/matroxfb.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef __LINUX_MATROXFB_H__
-#define __LINUX_MATROXFB_H__
-
-#include <asm/ioctl.h>
-#include <linux/types.h>
-#include <linux/videodev2.h>
-#include <linux/fb.h>
-
-struct matroxioc_output_mode {
-	__u32	output;		/* which output */
-#define MATROXFB_OUTPUT_PRIMARY		0x0000
-#define MATROXFB_OUTPUT_SECONDARY	0x0001
-#define MATROXFB_OUTPUT_DFP		0x0002
-	__u32	mode;		/* which mode */
-#define MATROXFB_OUTPUT_MODE_PAL	0x0001
-#define MATROXFB_OUTPUT_MODE_NTSC	0x0002
-#define MATROXFB_OUTPUT_MODE_MONITOR	0x0080
-};
-#define MATROXFB_SET_OUTPUT_MODE	_IOW('n',0xFA,size_t)
-#define MATROXFB_GET_OUTPUT_MODE	_IOWR('n',0xFA,size_t)
-
-/* bitfield */
-#define MATROXFB_OUTPUT_CONN_PRIMARY	(1 << MATROXFB_OUTPUT_PRIMARY)
-#define MATROXFB_OUTPUT_CONN_SECONDARY	(1 << MATROXFB_OUTPUT_SECONDARY)
-#define MATROXFB_OUTPUT_CONN_DFP	(1 << MATROXFB_OUTPUT_DFP)
-/* connect these outputs to this framebuffer */
-#define MATROXFB_SET_OUTPUT_CONNECTION	_IOW('n',0xF8,size_t)
-/* which outputs are connected to this framebuffer */
-#define MATROXFB_GET_OUTPUT_CONNECTION	_IOR('n',0xF8,size_t)
-/* which outputs are available for this framebuffer */
-#define MATROXFB_GET_AVAILABLE_OUTPUTS	_IOR('n',0xF9,size_t)
-/* which outputs exist on this framebuffer */
-#define MATROXFB_GET_ALL_OUTPUTS	_IOR('n',0xFB,size_t)
-
-enum matroxfb_ctrl_id {
-  MATROXFB_CID_TESTOUT	 = V4L2_CID_PRIVATE_BASE,
-  MATROXFB_CID_DEFLICKER,
-  MATROXFB_CID_LAST
-};
-
-#endif
-
diff --git a/openflow/usr/include/linux/mdio.h b/openflow/usr/include/linux/mdio.h
deleted file mode 100644
index 57672dd..0000000
--- a/openflow/usr/include/linux/mdio.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * linux/mdio.h: definitions for MDIO (clause 45) transceivers
- * Copyright 2006-2009 Solarflare Communications Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, incorporated herein by reference.
- */
-
-#ifndef __LINUX_MDIO_H__
-#define __LINUX_MDIO_H__
-
-#include <linux/types.h>
-#include <linux/mii.h>
-
-/* MDIO Manageable Devices (MMDs). */
-#define MDIO_MMD_PMAPMD		1	/* Physical Medium Attachment/
-					 * Physical Medium Dependent */
-#define MDIO_MMD_WIS		2	/* WAN Interface Sublayer */
-#define MDIO_MMD_PCS		3	/* Physical Coding Sublayer */
-#define MDIO_MMD_PHYXS		4	/* PHY Extender Sublayer */
-#define MDIO_MMD_DTEXS		5	/* DTE Extender Sublayer */
-#define MDIO_MMD_TC		6	/* Transmission Convergence */
-#define MDIO_MMD_AN		7	/* Auto-Negotiation */
-#define MDIO_MMD_C22EXT		29	/* Clause 22 extension */
-#define MDIO_MMD_VEND1		30	/* Vendor specific 1 */
-#define MDIO_MMD_VEND2		31	/* Vendor specific 2 */
-
-/* Generic MDIO registers. */
-#define MDIO_CTRL1		MII_BMCR
-#define MDIO_STAT1		MII_BMSR
-#define MDIO_DEVID1		MII_PHYSID1
-#define MDIO_DEVID2		MII_PHYSID2
-#define MDIO_SPEED		4	/* Speed ability */
-#define MDIO_DEVS1		5	/* Devices in package */
-#define MDIO_DEVS2		6
-#define MDIO_CTRL2		7	/* 10G control 2 */
-#define MDIO_STAT2		8	/* 10G status 2 */
-#define MDIO_PMA_TXDIS		9	/* 10G PMA/PMD transmit disable */
-#define MDIO_PMA_RXDET		10	/* 10G PMA/PMD receive signal detect */
-#define MDIO_PMA_EXTABLE	11	/* 10G PMA/PMD extended ability */
-#define MDIO_PKGID1		14	/* Package identifier */
-#define MDIO_PKGID2		15
-#define MDIO_AN_ADVERTISE	16	/* AN advertising (base page) */
-#define MDIO_AN_LPA		19	/* AN LP abilities (base page) */
-#define MDIO_PCS_EEE_ABLE	20	/* EEE Capability register */
-#define MDIO_PCS_EEE_WK_ERR	22	/* EEE wake error counter */
-#define MDIO_PHYXS_LNSTAT	24	/* PHY XGXS lane state */
-#define MDIO_AN_EEE_ADV		60	/* EEE advertisement */
-#define MDIO_AN_EEE_LPABLE	61	/* EEE link partner ability */
-
-/* Media-dependent registers. */
-#define MDIO_PMA_10GBT_SWAPPOL	130	/* 10GBASE-T pair swap & polarity */
-#define MDIO_PMA_10GBT_TXPWR	131	/* 10GBASE-T TX power control */
-#define MDIO_PMA_10GBT_SNR	133	/* 10GBASE-T SNR margin, lane A.
-					 * Lanes B-D are numbered 134-136. */
-#define MDIO_PMA_10GBR_FECABLE	170	/* 10GBASE-R FEC ability */
-#define MDIO_PCS_10GBX_STAT1	24	/* 10GBASE-X PCS status 1 */
-#define MDIO_PCS_10GBRT_STAT1	32	/* 10GBASE-R/-T PCS status 1 */
-#define MDIO_PCS_10GBRT_STAT2	33	/* 10GBASE-R/-T PCS status 2 */
-#define MDIO_AN_10GBT_CTRL	32	/* 10GBASE-T auto-negotiation control */
-#define MDIO_AN_10GBT_STAT	33	/* 10GBASE-T auto-negotiation status */
-
-/* LASI (Link Alarm Status Interrupt) registers, defined by XENPAK MSA. */
-#define MDIO_PMA_LASI_RXCTRL	0x9000	/* RX_ALARM control */
-#define MDIO_PMA_LASI_TXCTRL	0x9001	/* TX_ALARM control */
-#define MDIO_PMA_LASI_CTRL	0x9002	/* LASI control */
-#define MDIO_PMA_LASI_RXSTAT	0x9003	/* RX_ALARM status */
-#define MDIO_PMA_LASI_TXSTAT	0x9004	/* TX_ALARM status */
-#define MDIO_PMA_LASI_STAT	0x9005	/* LASI status */
-
-/* Control register 1. */
-/* Enable extended speed selection */
-#define MDIO_CTRL1_SPEEDSELEXT		(BMCR_SPEED1000 | BMCR_SPEED100)
-/* All speed selection bits */
-#define MDIO_CTRL1_SPEEDSEL		(MDIO_CTRL1_SPEEDSELEXT | 0x003c)
-#define MDIO_CTRL1_FULLDPLX		BMCR_FULLDPLX
-#define MDIO_CTRL1_LPOWER		BMCR_PDOWN
-#define MDIO_CTRL1_RESET		BMCR_RESET
-#define MDIO_PMA_CTRL1_LOOPBACK		0x0001
-#define MDIO_PMA_CTRL1_SPEED1000	BMCR_SPEED1000
-#define MDIO_PMA_CTRL1_SPEED100		BMCR_SPEED100
-#define MDIO_PCS_CTRL1_LOOPBACK		BMCR_LOOPBACK
-#define MDIO_PHYXS_CTRL1_LOOPBACK	BMCR_LOOPBACK
-#define MDIO_AN_CTRL1_RESTART		BMCR_ANRESTART
-#define MDIO_AN_CTRL1_ENABLE		BMCR_ANENABLE
-#define MDIO_AN_CTRL1_XNP		0x2000	/* Enable extended next page */
-#define MDIO_PCS_CTRL1_CLKSTOP_EN	0x400	/* Stop the clock during LPI */
-
-/* 10 Gb/s */
-#define MDIO_CTRL1_SPEED10G		(MDIO_CTRL1_SPEEDSELEXT | 0x00)
-/* 10PASS-TS/2BASE-TL */
-#define MDIO_CTRL1_SPEED10P2B		(MDIO_CTRL1_SPEEDSELEXT | 0x04)
-
-/* Status register 1. */
-#define MDIO_STAT1_LPOWERABLE		0x0002	/* Low-power ability */
-#define MDIO_STAT1_LSTATUS		BMSR_LSTATUS
-#define MDIO_STAT1_FAULT		0x0080	/* Fault */
-#define MDIO_AN_STAT1_LPABLE		0x0001	/* Link partner AN ability */
-#define MDIO_AN_STAT1_ABLE		BMSR_ANEGCAPABLE
-#define MDIO_AN_STAT1_RFAULT		BMSR_RFAULT
-#define MDIO_AN_STAT1_COMPLETE		BMSR_ANEGCOMPLETE
-#define MDIO_AN_STAT1_PAGE		0x0040	/* Page received */
-#define MDIO_AN_STAT1_XNP		0x0080	/* Extended next page status */
-
-/* Speed register. */
-#define MDIO_SPEED_10G			0x0001	/* 10G capable */
-#define MDIO_PMA_SPEED_2B		0x0002	/* 2BASE-TL capable */
-#define MDIO_PMA_SPEED_10P		0x0004	/* 10PASS-TS capable */
-#define MDIO_PMA_SPEED_1000		0x0010	/* 1000M capable */
-#define MDIO_PMA_SPEED_100		0x0020	/* 100M capable */
-#define MDIO_PMA_SPEED_10		0x0040	/* 10M capable */
-#define MDIO_PCS_SPEED_10P2B		0x0002	/* 10PASS-TS/2BASE-TL capable */
-
-/* Device present registers. */
-#define MDIO_DEVS_PRESENT(devad)	(1 << (devad))
-#define MDIO_DEVS_PMAPMD		MDIO_DEVS_PRESENT(MDIO_MMD_PMAPMD)
-#define MDIO_DEVS_WIS			MDIO_DEVS_PRESENT(MDIO_MMD_WIS)
-#define MDIO_DEVS_PCS			MDIO_DEVS_PRESENT(MDIO_MMD_PCS)
-#define MDIO_DEVS_PHYXS			MDIO_DEVS_PRESENT(MDIO_MMD_PHYXS)
-#define MDIO_DEVS_DTEXS			MDIO_DEVS_PRESENT(MDIO_MMD_DTEXS)
-#define MDIO_DEVS_TC			MDIO_DEVS_PRESENT(MDIO_MMD_TC)
-#define MDIO_DEVS_AN			MDIO_DEVS_PRESENT(MDIO_MMD_AN)
-#define MDIO_DEVS_C22EXT		MDIO_DEVS_PRESENT(MDIO_MMD_C22EXT)
-
-/* Control register 2. */
-#define MDIO_PMA_CTRL2_TYPE		0x000f	/* PMA/PMD type selection */
-#define MDIO_PMA_CTRL2_10GBCX4		0x0000	/* 10GBASE-CX4 type */
-#define MDIO_PMA_CTRL2_10GBEW		0x0001	/* 10GBASE-EW type */
-#define MDIO_PMA_CTRL2_10GBLW		0x0002	/* 10GBASE-LW type */
-#define MDIO_PMA_CTRL2_10GBSW		0x0003	/* 10GBASE-SW type */
-#define MDIO_PMA_CTRL2_10GBLX4		0x0004	/* 10GBASE-LX4 type */
-#define MDIO_PMA_CTRL2_10GBER		0x0005	/* 10GBASE-ER type */
-#define MDIO_PMA_CTRL2_10GBLR		0x0006	/* 10GBASE-LR type */
-#define MDIO_PMA_CTRL2_10GBSR		0x0007	/* 10GBASE-SR type */
-#define MDIO_PMA_CTRL2_10GBLRM		0x0008	/* 10GBASE-LRM type */
-#define MDIO_PMA_CTRL2_10GBT		0x0009	/* 10GBASE-T type */
-#define MDIO_PMA_CTRL2_10GBKX4		0x000a	/* 10GBASE-KX4 type */
-#define MDIO_PMA_CTRL2_10GBKR		0x000b	/* 10GBASE-KR type */
-#define MDIO_PMA_CTRL2_1000BT		0x000c	/* 1000BASE-T type */
-#define MDIO_PMA_CTRL2_1000BKX		0x000d	/* 1000BASE-KX type */
-#define MDIO_PMA_CTRL2_100BTX		0x000e	/* 100BASE-TX type */
-#define MDIO_PMA_CTRL2_10BT		0x000f	/* 10BASE-T type */
-#define MDIO_PCS_CTRL2_TYPE		0x0003	/* PCS type selection */
-#define MDIO_PCS_CTRL2_10GBR		0x0000	/* 10GBASE-R type */
-#define MDIO_PCS_CTRL2_10GBX		0x0001	/* 10GBASE-X type */
-#define MDIO_PCS_CTRL2_10GBW		0x0002	/* 10GBASE-W type */
-#define MDIO_PCS_CTRL2_10GBT		0x0003	/* 10GBASE-T type */
-
-/* Status register 2. */
-#define MDIO_STAT2_RXFAULT		0x0400	/* Receive fault */
-#define MDIO_STAT2_TXFAULT		0x0800	/* Transmit fault */
-#define MDIO_STAT2_DEVPRST		0xc000	/* Device present */
-#define MDIO_STAT2_DEVPRST_VAL		0x8000	/* Device present value */
-#define MDIO_PMA_STAT2_LBABLE		0x0001	/* PMA loopback ability */
-#define MDIO_PMA_STAT2_10GBEW		0x0002	/* 10GBASE-EW ability */
-#define MDIO_PMA_STAT2_10GBLW		0x0004	/* 10GBASE-LW ability */
-#define MDIO_PMA_STAT2_10GBSW		0x0008	/* 10GBASE-SW ability */
-#define MDIO_PMA_STAT2_10GBLX4		0x0010	/* 10GBASE-LX4 ability */
-#define MDIO_PMA_STAT2_10GBER		0x0020	/* 10GBASE-ER ability */
-#define MDIO_PMA_STAT2_10GBLR		0x0040	/* 10GBASE-LR ability */
-#define MDIO_PMA_STAT2_10GBSR		0x0080	/* 10GBASE-SR ability */
-#define MDIO_PMD_STAT2_TXDISAB		0x0100	/* PMD TX disable ability */
-#define MDIO_PMA_STAT2_EXTABLE		0x0200	/* Extended abilities */
-#define MDIO_PMA_STAT2_RXFLTABLE	0x1000	/* Receive fault ability */
-#define MDIO_PMA_STAT2_TXFLTABLE	0x2000	/* Transmit fault ability */
-#define MDIO_PCS_STAT2_10GBR		0x0001	/* 10GBASE-R capable */
-#define MDIO_PCS_STAT2_10GBX		0x0002	/* 10GBASE-X capable */
-#define MDIO_PCS_STAT2_10GBW		0x0004	/* 10GBASE-W capable */
-#define MDIO_PCS_STAT2_RXFLTABLE	0x1000	/* Receive fault ability */
-#define MDIO_PCS_STAT2_TXFLTABLE	0x2000	/* Transmit fault ability */
-
-/* Transmit disable register. */
-#define MDIO_PMD_TXDIS_GLOBAL		0x0001	/* Global PMD TX disable */
-#define MDIO_PMD_TXDIS_0		0x0002	/* PMD TX disable 0 */
-#define MDIO_PMD_TXDIS_1		0x0004	/* PMD TX disable 1 */
-#define MDIO_PMD_TXDIS_2		0x0008	/* PMD TX disable 2 */
-#define MDIO_PMD_TXDIS_3		0x0010	/* PMD TX disable 3 */
-
-/* Receive signal detect register. */
-#define MDIO_PMD_RXDET_GLOBAL		0x0001	/* Global PMD RX signal detect */
-#define MDIO_PMD_RXDET_0		0x0002	/* PMD RX signal detect 0 */
-#define MDIO_PMD_RXDET_1		0x0004	/* PMD RX signal detect 1 */
-#define MDIO_PMD_RXDET_2		0x0008	/* PMD RX signal detect 2 */
-#define MDIO_PMD_RXDET_3		0x0010	/* PMD RX signal detect 3 */
-
-/* Extended abilities register. */
-#define MDIO_PMA_EXTABLE_10GCX4		0x0001	/* 10GBASE-CX4 ability */
-#define MDIO_PMA_EXTABLE_10GBLRM	0x0002	/* 10GBASE-LRM ability */
-#define MDIO_PMA_EXTABLE_10GBT		0x0004	/* 10GBASE-T ability */
-#define MDIO_PMA_EXTABLE_10GBKX4	0x0008	/* 10GBASE-KX4 ability */
-#define MDIO_PMA_EXTABLE_10GBKR		0x0010	/* 10GBASE-KR ability */
-#define MDIO_PMA_EXTABLE_1000BT		0x0020	/* 1000BASE-T ability */
-#define MDIO_PMA_EXTABLE_1000BKX	0x0040	/* 1000BASE-KX ability */
-#define MDIO_PMA_EXTABLE_100BTX		0x0080	/* 100BASE-TX ability */
-#define MDIO_PMA_EXTABLE_10BT		0x0100	/* 10BASE-T ability */
-
-/* PHY XGXS lane state register. */
-#define MDIO_PHYXS_LNSTAT_SYNC0		0x0001
-#define MDIO_PHYXS_LNSTAT_SYNC1		0x0002
-#define MDIO_PHYXS_LNSTAT_SYNC2		0x0004
-#define MDIO_PHYXS_LNSTAT_SYNC3		0x0008
-#define MDIO_PHYXS_LNSTAT_ALIGN		0x1000
-
-/* PMA 10GBASE-T pair swap & polarity */
-#define MDIO_PMA_10GBT_SWAPPOL_ABNX	0x0001	/* Pair A/B uncrossed */
-#define MDIO_PMA_10GBT_SWAPPOL_CDNX	0x0002	/* Pair C/D uncrossed */
-#define MDIO_PMA_10GBT_SWAPPOL_AREV	0x0100	/* Pair A polarity reversed */
-#define MDIO_PMA_10GBT_SWAPPOL_BREV	0x0200	/* Pair B polarity reversed */
-#define MDIO_PMA_10GBT_SWAPPOL_CREV	0x0400	/* Pair C polarity reversed */
-#define MDIO_PMA_10GBT_SWAPPOL_DREV	0x0800	/* Pair D polarity reversed */
-
-/* PMA 10GBASE-T TX power register. */
-#define MDIO_PMA_10GBT_TXPWR_SHORT	0x0001	/* Short-reach mode */
-
-/* PMA 10GBASE-T SNR registers. */
-/* Value is SNR margin in dB, clamped to range [-127, 127], plus 0x8000. */
-#define MDIO_PMA_10GBT_SNR_BIAS		0x8000
-#define MDIO_PMA_10GBT_SNR_MAX		127
-
-/* PMA 10GBASE-R FEC ability register. */
-#define MDIO_PMA_10GBR_FECABLE_ABLE	0x0001	/* FEC ability */
-#define MDIO_PMA_10GBR_FECABLE_ERRABLE	0x0002	/* FEC error indic. ability */
-
-/* PCS 10GBASE-R/-T status register 1. */
-#define MDIO_PCS_10GBRT_STAT1_BLKLK	0x0001	/* Block lock attained */
-
-/* PCS 10GBASE-R/-T status register 2. */
-#define MDIO_PCS_10GBRT_STAT2_ERR	0x00ff
-#define MDIO_PCS_10GBRT_STAT2_BER	0x3f00
-
-/* AN 10GBASE-T control register. */
-#define MDIO_AN_10GBT_CTRL_ADV10G	0x1000	/* Advertise 10GBASE-T */
-
-/* AN 10GBASE-T status register. */
-#define MDIO_AN_10GBT_STAT_LPTRR	0x0200	/* LP training reset req. */
-#define MDIO_AN_10GBT_STAT_LPLTABLE	0x0400	/* LP loop timing ability */
-#define MDIO_AN_10GBT_STAT_LP10G	0x0800	/* LP is 10GBT capable */
-#define MDIO_AN_10GBT_STAT_REMOK	0x1000	/* Remote OK */
-#define MDIO_AN_10GBT_STAT_LOCOK	0x2000	/* Local OK */
-#define MDIO_AN_10GBT_STAT_MS		0x4000	/* Master/slave config */
-#define MDIO_AN_10GBT_STAT_MSFLT	0x8000	/* Master/slave config fault */
-
-/* EEE Supported/Advertisement/LP Advertisement registers.
- *
- * EEE capability Register (3.20), Advertisement (7.60) and
- * Link partner ability (7.61) registers have and can use the same identical
- * bit masks.
- */
-#define MDIO_AN_EEE_ADV_100TX	0x0002	/* Advertise 100TX EEE cap */
-#define MDIO_AN_EEE_ADV_1000T	0x0004	/* Advertise 1000T EEE cap */
-/* Note: the two defines above can be potentially used by the user-land
- * and cannot remove them now.
- * So, we define the new generic MDIO_EEE_100TX and MDIO_EEE_1000T macros
- * using the previous ones (that can be considered obsolete).
- */
-#define MDIO_EEE_100TX		MDIO_AN_EEE_ADV_100TX	/* 100TX EEE cap */
-#define MDIO_EEE_1000T		MDIO_AN_EEE_ADV_1000T	/* 1000T EEE cap */
-#define MDIO_EEE_10GT		0x0008	/* 10GT EEE cap */
-#define MDIO_EEE_1000KX		0x0010	/* 1000KX EEE cap */
-#define MDIO_EEE_10GKX4		0x0020	/* 10G KX4 EEE cap */
-#define MDIO_EEE_10GKR		0x0040	/* 10G KR EEE cap */
-
-/* LASI RX_ALARM control/status registers. */
-#define MDIO_PMA_LASI_RX_PHYXSLFLT	0x0001	/* PHY XS RX local fault */
-#define MDIO_PMA_LASI_RX_PCSLFLT	0x0008	/* PCS RX local fault */
-#define MDIO_PMA_LASI_RX_PMALFLT	0x0010	/* PMA/PMD RX local fault */
-#define MDIO_PMA_LASI_RX_OPTICPOWERFLT	0x0020	/* RX optical power fault */
-#define MDIO_PMA_LASI_RX_WISLFLT	0x0200	/* WIS local fault */
-
-/* LASI TX_ALARM control/status registers. */
-#define MDIO_PMA_LASI_TX_PHYXSLFLT	0x0001	/* PHY XS TX local fault */
-#define MDIO_PMA_LASI_TX_PCSLFLT	0x0008	/* PCS TX local fault */
-#define MDIO_PMA_LASI_TX_PMALFLT	0x0010	/* PMA/PMD TX local fault */
-#define MDIO_PMA_LASI_TX_LASERPOWERFLT	0x0080	/* Laser output power fault */
-#define MDIO_PMA_LASI_TX_LASERTEMPFLT	0x0100	/* Laser temperature fault */
-#define MDIO_PMA_LASI_TX_LASERBICURRFLT	0x0200	/* Laser bias current fault */
-
-/* LASI control/status registers. */
-#define MDIO_PMA_LASI_LSALARM		0x0001	/* LS_ALARM enable/status */
-#define MDIO_PMA_LASI_TXALARM		0x0002	/* TX_ALARM enable/status */
-#define MDIO_PMA_LASI_RXALARM		0x0004	/* RX_ALARM enable/status */
-
-/* Mapping between MDIO PRTAD/DEVAD and mii_ioctl_data::phy_id */
-
-#define MDIO_PHY_ID_C45			0x8000
-#define MDIO_PHY_ID_PRTAD		0x03e0
-#define MDIO_PHY_ID_DEVAD		0x001f
-#define MDIO_PHY_ID_C45_MASK						\
-	(MDIO_PHY_ID_C45 | MDIO_PHY_ID_PRTAD | MDIO_PHY_ID_DEVAD)
-
-static __inline__ __u16 mdio_phy_id_c45(int prtad, int devad)
-{
-	return MDIO_PHY_ID_C45 | (prtad << 5) | devad;
-}
-
-#endif /* __LINUX_MDIO_H__ */
diff --git a/openflow/usr/include/linux/media-bus-format.h b/openflow/usr/include/linux/media-bus-format.h
deleted file mode 100644
index 190d491..0000000
--- a/openflow/usr/include/linux/media-bus-format.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Media Bus API header
- *
- * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __LINUX_MEDIA_BUS_FORMAT_H
-#define __LINUX_MEDIA_BUS_FORMAT_H
-
-/*
- * These bus formats uniquely identify data formats on the data bus. Format 0
- * is reserved, MEDIA_BUS_FMT_FIXED shall be used by host-client pairs, where
- * the data format is fixed. Additionally, "2X8" means that one pixel is
- * transferred in two 8-bit samples, "BE" or "LE" specify in which order those
- * samples are transferred over the bus: "LE" means that the least significant
- * bits are transferred first, "BE" means that the most significant bits are
- * transferred first, and "PADHI" and "PADLO" define which bits - low or high,
- * in the incomplete high byte, are filled with padding bits.
- *
- * The bus formats are grouped by type, bus_width, bits per component, samples
- * per pixel and order of subsamples. Numerical values are sorted using generic
- * numerical sort order (8 thus comes before 10).
- *
- * As their value can't change when a new bus format is inserted in the
- * enumeration, the bus formats are explicitly given a numerical value. The next
- * free values for each category are listed below, update them when inserting
- * new pixel codes.
- */
-
-#define MEDIA_BUS_FMT_FIXED			0x0001
-
-/* RGB - next is	0x1018 */
-#define MEDIA_BUS_FMT_RGB444_1X12		0x1016
-#define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE	0x1001
-#define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE	0x1002
-#define MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE	0x1003
-#define MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE	0x1004
-#define MEDIA_BUS_FMT_RGB565_1X16		0x1017
-#define MEDIA_BUS_FMT_BGR565_2X8_BE		0x1005
-#define MEDIA_BUS_FMT_BGR565_2X8_LE		0x1006
-#define MEDIA_BUS_FMT_RGB565_2X8_BE		0x1007
-#define MEDIA_BUS_FMT_RGB565_2X8_LE		0x1008
-#define MEDIA_BUS_FMT_RGB666_1X18		0x1009
-#define MEDIA_BUS_FMT_RBG888_1X24		0x100e
-#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI	0x1015
-#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG		0x1010
-#define MEDIA_BUS_FMT_BGR888_1X24		0x1013
-#define MEDIA_BUS_FMT_GBR888_1X24		0x1014
-#define MEDIA_BUS_FMT_RGB888_1X24		0x100a
-#define MEDIA_BUS_FMT_RGB888_2X12_BE		0x100b
-#define MEDIA_BUS_FMT_RGB888_2X12_LE		0x100c
-#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG		0x1011
-#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA	0x1012
-#define MEDIA_BUS_FMT_ARGB8888_1X32		0x100d
-#define MEDIA_BUS_FMT_RGB888_1X32_PADHI		0x100f
-
-/* YUV (including grey) - next is	0x2026 */
-#define MEDIA_BUS_FMT_Y8_1X8			0x2001
-#define MEDIA_BUS_FMT_UV8_1X8			0x2015
-#define MEDIA_BUS_FMT_UYVY8_1_5X8		0x2002
-#define MEDIA_BUS_FMT_VYUY8_1_5X8		0x2003
-#define MEDIA_BUS_FMT_YUYV8_1_5X8		0x2004
-#define MEDIA_BUS_FMT_YVYU8_1_5X8		0x2005
-#define MEDIA_BUS_FMT_UYVY8_2X8			0x2006
-#define MEDIA_BUS_FMT_VYUY8_2X8			0x2007
-#define MEDIA_BUS_FMT_YUYV8_2X8			0x2008
-#define MEDIA_BUS_FMT_YVYU8_2X8			0x2009
-#define MEDIA_BUS_FMT_Y10_1X10			0x200a
-#define MEDIA_BUS_FMT_UYVY10_2X10		0x2018
-#define MEDIA_BUS_FMT_VYUY10_2X10		0x2019
-#define MEDIA_BUS_FMT_YUYV10_2X10		0x200b
-#define MEDIA_BUS_FMT_YVYU10_2X10		0x200c
-#define MEDIA_BUS_FMT_Y12_1X12			0x2013
-#define MEDIA_BUS_FMT_UYVY12_2X12		0x201c
-#define MEDIA_BUS_FMT_VYUY12_2X12		0x201d
-#define MEDIA_BUS_FMT_YUYV12_2X12		0x201e
-#define MEDIA_BUS_FMT_YVYU12_2X12		0x201f
-#define MEDIA_BUS_FMT_UYVY8_1X16		0x200f
-#define MEDIA_BUS_FMT_VYUY8_1X16		0x2010
-#define MEDIA_BUS_FMT_YUYV8_1X16		0x2011
-#define MEDIA_BUS_FMT_YVYU8_1X16		0x2012
-#define MEDIA_BUS_FMT_YDYUYDYV8_1X16		0x2014
-#define MEDIA_BUS_FMT_UYVY10_1X20		0x201a
-#define MEDIA_BUS_FMT_VYUY10_1X20		0x201b
-#define MEDIA_BUS_FMT_YUYV10_1X20		0x200d
-#define MEDIA_BUS_FMT_YVYU10_1X20		0x200e
-#define MEDIA_BUS_FMT_VUY8_1X24			0x2024
-#define MEDIA_BUS_FMT_YUV8_1X24			0x2025
-#define MEDIA_BUS_FMT_UYVY12_1X24		0x2020
-#define MEDIA_BUS_FMT_VYUY12_1X24		0x2021
-#define MEDIA_BUS_FMT_YUYV12_1X24		0x2022
-#define MEDIA_BUS_FMT_YVYU12_1X24		0x2023
-#define MEDIA_BUS_FMT_YUV10_1X30		0x2016
-#define MEDIA_BUS_FMT_AYUV8_1X32		0x2017
-
-/* Bayer - next is	0x3019 */
-#define MEDIA_BUS_FMT_SBGGR8_1X8		0x3001
-#define MEDIA_BUS_FMT_SGBRG8_1X8		0x3013
-#define MEDIA_BUS_FMT_SGRBG8_1X8		0x3002
-#define MEDIA_BUS_FMT_SRGGB8_1X8		0x3014
-#define MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8		0x3015
-#define MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8		0x3016
-#define MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8		0x3017
-#define MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8		0x3018
-#define MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8		0x300b
-#define MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8		0x300c
-#define MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8		0x3009
-#define MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8		0x300d
-#define MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE	0x3003
-#define MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE	0x3004
-#define MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE	0x3005
-#define MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE	0x3006
-#define MEDIA_BUS_FMT_SBGGR10_1X10		0x3007
-#define MEDIA_BUS_FMT_SGBRG10_1X10		0x300e
-#define MEDIA_BUS_FMT_SGRBG10_1X10		0x300a
-#define MEDIA_BUS_FMT_SRGGB10_1X10		0x300f
-#define MEDIA_BUS_FMT_SBGGR12_1X12		0x3008
-#define MEDIA_BUS_FMT_SGBRG12_1X12		0x3010
-#define MEDIA_BUS_FMT_SGRBG12_1X12		0x3011
-#define MEDIA_BUS_FMT_SRGGB12_1X12		0x3012
-
-/* JPEG compressed formats - next is	0x4002 */
-#define MEDIA_BUS_FMT_JPEG_1X8			0x4001
-
-/* Vendor specific formats - next is	0x5002 */
-
-/* S5C73M3 sensor specific interleaved UYVY and JPEG */
-#define MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8		0x5001
-
-/* HSV - next is	0x6002 */
-#define MEDIA_BUS_FMT_AHSV8888_1X32		0x6001
-
-#endif /* __LINUX_MEDIA_BUS_FORMAT_H */
diff --git a/openflow/usr/include/linux/media.h b/openflow/usr/include/linux/media.h
deleted file mode 100644
index 83ef6a2..0000000
--- a/openflow/usr/include/linux/media.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Multimedia device API
- *
- * Copyright (C) 2010 Nokia Corporation
- *
- * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- *	     Sakari Ailus <sakari.ailus@iki.fi>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __LINUX_MEDIA_H
-#define __LINUX_MEDIA_H
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-#include <linux/version.h>
-
-#define MEDIA_API_VERSION	KERNEL_VERSION(0, 1, 0)
-
-struct media_device_info {
-	char driver[16];
-	char model[32];
-	char serial[40];
-	char bus_info[32];
-	__u32 media_version;
-	__u32 hw_revision;
-	__u32 driver_version;
-	__u32 reserved[31];
-};
-
-#define MEDIA_ENT_ID_FLAG_NEXT		(1 << 31)
-
-#define MEDIA_ENT_TYPE_SHIFT		16
-#define MEDIA_ENT_TYPE_MASK		0x00ff0000
-#define MEDIA_ENT_SUBTYPE_MASK		0x0000ffff
-
-#define MEDIA_ENT_T_DEVNODE		(1 << MEDIA_ENT_TYPE_SHIFT)
-#define MEDIA_ENT_T_DEVNODE_V4L		(MEDIA_ENT_T_DEVNODE + 1)
-#define MEDIA_ENT_T_DEVNODE_FB		(MEDIA_ENT_T_DEVNODE + 2)
-#define MEDIA_ENT_T_DEVNODE_ALSA	(MEDIA_ENT_T_DEVNODE + 3)
-#define MEDIA_ENT_T_DEVNODE_DVB_FE	(MEDIA_ENT_T_DEVNODE + 4)
-#define MEDIA_ENT_T_DEVNODE_DVB_DEMUX	(MEDIA_ENT_T_DEVNODE + 5)
-#define MEDIA_ENT_T_DEVNODE_DVB_DVR	(MEDIA_ENT_T_DEVNODE + 6)
-#define MEDIA_ENT_T_DEVNODE_DVB_CA	(MEDIA_ENT_T_DEVNODE + 7)
-#define MEDIA_ENT_T_DEVNODE_DVB_NET	(MEDIA_ENT_T_DEVNODE + 8)
-
-/* Legacy symbol. Use it to avoid userspace compilation breakages */
-#define MEDIA_ENT_T_DEVNODE_DVB		MEDIA_ENT_T_DEVNODE_DVB_FE
-
-#define MEDIA_ENT_T_V4L2_SUBDEV		(2 << MEDIA_ENT_TYPE_SHIFT)
-#define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR	(MEDIA_ENT_T_V4L2_SUBDEV + 1)
-#define MEDIA_ENT_T_V4L2_SUBDEV_FLASH	(MEDIA_ENT_T_V4L2_SUBDEV + 2)
-#define MEDIA_ENT_T_V4L2_SUBDEV_LENS	(MEDIA_ENT_T_V4L2_SUBDEV + 3)
-/* A converter of analogue video to its digital representation. */
-#define MEDIA_ENT_T_V4L2_SUBDEV_DECODER	(MEDIA_ENT_T_V4L2_SUBDEV + 4)
-
-#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER	(MEDIA_ENT_T_V4L2_SUBDEV + 5)
-
-#define MEDIA_ENT_FL_DEFAULT		(1 << 0)
-
-struct media_entity_desc {
-	__u32 id;
-	char name[32];
-	__u32 type;
-	__u32 revision;
-	__u32 flags;
-	__u32 group_id;
-	__u16 pads;
-	__u16 links;
-
-	__u32 reserved[4];
-
-	union {
-		/* Node specifications */
-		struct {
-			__u32 major;
-			__u32 minor;
-		} dev;
-
-#if 1
-		/*
-		 * TODO: this shouldn't have been added without
-		 * actual drivers that use this. When the first real driver
-		 * appears that sets this information, special attention
-		 * should be given whether this information is 1) enough, and
-		 * 2) can deal with udev rules that rename devices. The struct
-		 * dev would not be sufficient for this since that does not
-		 * contain the subdevice information. In addition, struct dev
-		 * can only refer to a single device, and not to multiple (e.g.
-		 * pcm and mixer devices).
-		 *
-		 * So for now mark this as a to do.
-		 */
-		struct {
-			__u32 card;
-			__u32 device;
-			__u32 subdevice;
-		} alsa;
-#endif
-
-#if 1
-		/*
-		 * DEPRECATED: previous node specifications. Kept just to
-		 * avoid breaking compilation, but media_entity_desc.dev
-		 * should be used instead. In particular, alsa and dvb
-		 * fields below are wrong: for all devnodes, there should
-		 * be just major/minor inside the struct, as this is enough
-		 * to represent any devnode, no matter what type.
-		 */
-		struct {
-			__u32 major;
-			__u32 minor;
-		} v4l;
-		struct {
-			__u32 major;
-			__u32 minor;
-		} fb;
-		int dvb;
-#endif
-
-		/* Sub-device specifications */
-		/* Nothing needed yet */
-		__u8 raw[184];
-	};
-};
-
-#define MEDIA_PAD_FL_SINK		(1 << 0)
-#define MEDIA_PAD_FL_SOURCE		(1 << 1)
-#define MEDIA_PAD_FL_MUST_CONNECT	(1 << 2)
-
-struct media_pad_desc {
-	__u32 entity;		/* entity ID */
-	__u16 index;		/* pad index */
-	__u32 flags;		/* pad flags */
-	__u32 reserved[2];
-};
-
-#define MEDIA_LNK_FL_ENABLED		(1 << 0)
-#define MEDIA_LNK_FL_IMMUTABLE		(1 << 1)
-#define MEDIA_LNK_FL_DYNAMIC		(1 << 2)
-
-struct media_link_desc {
-	struct media_pad_desc source;
-	struct media_pad_desc sink;
-	__u32 flags;
-	__u32 reserved[2];
-};
-
-struct media_links_enum {
-	__u32 entity;
-	/* Should have enough room for pads elements */
-	struct media_pad_desc *pads;
-	/* Should have enough room for links elements */
-	struct media_link_desc *links;
-	__u32 reserved[4];
-};
-
-#define MEDIA_IOC_DEVICE_INFO		_IOWR('|', 0x00, struct media_device_info)
-#define MEDIA_IOC_ENUM_ENTITIES		_IOWR('|', 0x01, struct media_entity_desc)
-#define MEDIA_IOC_ENUM_LINKS		_IOWR('|', 0x02, struct media_links_enum)
-#define MEDIA_IOC_SETUP_LINK		_IOWR('|', 0x03, struct media_link_desc)
-
-#endif /* __LINUX_MEDIA_H */
diff --git a/openflow/usr/include/linux/mei.h b/openflow/usr/include/linux/mei.h
deleted file mode 100644
index 7c3b64f..0000000
--- a/openflow/usr/include/linux/mei.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/******************************************************************************
- * Intel Management Engine Interface (Intel MEI) Linux driver
- * Intel MEI Interface Header
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *	Intel Corporation.
- *	linux-mei@linux.intel.com
- *	http://www.intel.com
- *
- * BSD LICENSE
- *
- * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *****************************************************************************/
-
-#ifndef _LINUX_MEI_H
-#define _LINUX_MEI_H
-
-#include <linux/uuid.h>
-
-/*
- * This IOCTL is used to associate the current file descriptor with a
- * FW Client (given by UUID). This opens a communication channel
- * between a host client and a FW client. From this point every read and write
- * will communicate with the associated FW client.
- * Only in close() (file_operation release()) the communication between
- * the clients is disconnected
- *
- * The IOCTL argument is a struct with a union that contains
- * the input parameter and the output parameter for this IOCTL.
- *
- * The input parameter is UUID of the FW Client.
- * The output parameter is the properties of the FW client
- * (FW protocol version and max message size).
- *
- */
-#define IOCTL_MEI_CONNECT_CLIENT \
-	_IOWR('H' , 0x01, struct mei_connect_client_data)
-
-/*
- * Intel MEI client information struct
- */
-struct mei_client {
-	__u32 max_msg_length;
-	__u8 protocol_version;
-	__u8 reserved[3];
-};
-
-/*
- * IOCTL Connect Client Data structure
- */
-struct mei_connect_client_data {
-	union {
-		uuid_le in_client_uuid;
-		struct mei_client out_client_properties;
-	};
-};
-
-/**
- * DOC: set and unset event notification for a connected client
- *
- * The IOCTL argument is 1 for enabling event notification and 0 for
- * disabling the service
- * Return:  -EOPNOTSUPP if the devices doesn't support the feature
- */
-#define IOCTL_MEI_NOTIFY_SET _IOW('H', 0x02, __u32)
-
-/**
- * DOC: retrieve notification
- *
- * The IOCTL output argument is 1 if an event was is pending and 0 otherwise
- * the ioctl has to be called in order to acknowledge pending event
- *
- * Return:  -EOPNOTSUPP if the devices doesn't support the feature
- */
-#define IOCTL_MEI_NOTIFY_GET _IOR('H', 0x03, __u32)
-
-#endif /* _LINUX_MEI_H  */
diff --git a/openflow/usr/include/linux/membarrier.h b/openflow/usr/include/linux/membarrier.h
deleted file mode 100644
index 2af9dde..0000000
--- a/openflow/usr/include/linux/membarrier.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef _LINUX_MEMBARRIER_H
-#define _LINUX_MEMBARRIER_H
-
-/*
- * linux/membarrier.h
- *
- * membarrier system call API
- *
- * Copyright (c) 2010, 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * enum membarrier_cmd - membarrier system call command
- * @MEMBARRIER_CMD_QUERY:   Query the set of supported commands. It returns
- *                          a bitmask of valid commands.
- * @MEMBARRIER_CMD_SHARED:  Execute a memory barrier on all running threads.
- *                          Upon return from system call, the caller thread
- *                          is ensured that all running threads have passed
- *                          through a state where all memory accesses to
- *                          user-space addresses match program order between
- *                          entry to and return from the system call
- *                          (non-running threads are de facto in such a
- *                          state). This covers threads from all processes
- *                          running on the system. This command returns 0.
- *
- * Command to be passed to the membarrier system call. The commands need to
- * be a single bit each, except for MEMBARRIER_CMD_QUERY which is assigned to
- * the value 0.
- */
-enum membarrier_cmd {
-	MEMBARRIER_CMD_QUERY = 0,
-	MEMBARRIER_CMD_SHARED = (1 << 0),
-};
-
-#endif /* _LINUX_MEMBARRIER_H */
diff --git a/openflow/usr/include/linux/memfd.h b/openflow/usr/include/linux/memfd.h
deleted file mode 100644
index 6632b15..0000000
--- a/openflow/usr/include/linux/memfd.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _LINUX_MEMFD_H
-#define _LINUX_MEMFD_H
-
-/* flags for memfd_create(2) (unsigned int) */
-#define MFD_CLOEXEC		0x0001U
-#define MFD_ALLOW_SEALING	0x0002U
-
-#endif /* _LINUX_MEMFD_H */
diff --git a/openflow/usr/include/linux/mempolicy.h b/openflow/usr/include/linux/mempolicy.h
deleted file mode 100644
index de2651f..0000000
--- a/openflow/usr/include/linux/mempolicy.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * NUMA memory policies for Linux.
- * Copyright 2003,2004 Andi Kleen SuSE Labs
- */
-#ifndef _LINUX_MEMPOLICY_H
-#define _LINUX_MEMPOLICY_H
-
-#include <linux/errno.h>
-
-
-/*
- * Both the MPOL_* mempolicy mode and the MPOL_F_* optional mode flags are
- * passed by the user to either set_mempolicy() or mbind() in an 'int' actual.
- * The MPOL_MODE_FLAGS macro determines the legal set of optional mode flags.
- */
-
-/* Policies */
-enum {
-	MPOL_DEFAULT,
-	MPOL_PREFERRED,
-	MPOL_BIND,
-	MPOL_INTERLEAVE,
-	MPOL_LOCAL,
-	MPOL_MAX,	/* always last member of enum */
-};
-
-enum mpol_rebind_step {
-	MPOL_REBIND_ONCE,	/* do rebind work at once(not by two step) */
-	MPOL_REBIND_STEP1,	/* first step(set all the newly nodes) */
-	MPOL_REBIND_STEP2,	/* second step(clean all the disallowed nodes)*/
-	MPOL_REBIND_NSTEP,
-};
-
-/* Flags for set_mempolicy */
-#define MPOL_F_STATIC_NODES	(1 << 15)
-#define MPOL_F_RELATIVE_NODES	(1 << 14)
-
-/*
- * MPOL_MODE_FLAGS is the union of all possible optional mode flags passed to
- * either set_mempolicy() or mbind().
- */
-#define MPOL_MODE_FLAGS	(MPOL_F_STATIC_NODES | MPOL_F_RELATIVE_NODES)
-
-/* Flags for get_mempolicy */
-#define MPOL_F_NODE	(1<<0)	/* return next IL mode instead of node mask */
-#define MPOL_F_ADDR	(1<<1)	/* look up vma using address */
-#define MPOL_F_MEMS_ALLOWED (1<<2) /* return allowed memories */
-
-/* Flags for mbind */
-#define MPOL_MF_STRICT	(1<<0)	/* Verify existing pages in the mapping */
-#define MPOL_MF_MOVE	 (1<<1)	/* Move pages owned by this process to conform
-				   to policy */
-#define MPOL_MF_MOVE_ALL (1<<2)	/* Move every page to conform to policy */
-#define MPOL_MF_LAZY	 (1<<3)	/* Modifies '_MOVE:  lazy migrate on fault */
-#define MPOL_MF_INTERNAL (1<<4)	/* Internal flags start here */
-
-#define MPOL_MF_VALID	(MPOL_MF_STRICT   | 	\
-			 MPOL_MF_MOVE     | 	\
-			 MPOL_MF_MOVE_ALL)
-
-/*
- * Internal flags that share the struct mempolicy flags word with
- * "mode flags".  These flags are allocated from bit 0 up, as they
- * are never OR'ed into the mode in mempolicy API arguments.
- */
-#define MPOL_F_SHARED  (1 << 0)	/* identify shared policies */
-#define MPOL_F_LOCAL   (1 << 1)	/* preferred local allocation */
-#define MPOL_F_REBINDING (1 << 2)	/* identify policies in rebinding */
-#define MPOL_F_MOF	(1 << 3) /* this policy wants migrate on fault */
-#define MPOL_F_MORON	(1 << 4) /* Migrate On protnone Reference On Node */
-
-
-#endif /* _LINUX_MEMPOLICY_H */
diff --git a/openflow/usr/include/linux/meye.h b/openflow/usr/include/linux/meye.h
deleted file mode 100644
index 8ff50fe..0000000
--- a/openflow/usr/include/linux/meye.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Motion Eye video4linux driver for Sony Vaio PictureBook
- *
- * Copyright (C) 2001-2003 Stelian Pop <stelian@popies.net>
- *
- * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
- *
- * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
- *
- * Earlier work by Werner Almesberger, Paul `Rusty' Russell and Paul Mackerras.
- *
- * Some parts borrowed from various video4linux drivers, especially
- * bttv-driver.c and zoran.c, see original files for credits.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _MEYE_H_
-#define _MEYE_H_
-
-/****************************************************************************/
-/* Private API for handling mjpeg capture / playback.                       */
-/****************************************************************************/
-
-struct meye_params {
-	unsigned char subsample;
-	unsigned char quality;
-	unsigned char sharpness;
-	unsigned char agc;
-	unsigned char picture;
-	unsigned char framerate;
-};
-
-/* query the extended parameters */
-#define MEYEIOC_G_PARAMS	_IOR ('v', BASE_VIDIOC_PRIVATE+0, struct meye_params)
-/* set the extended parameters */
-#define MEYEIOC_S_PARAMS	_IOW ('v', BASE_VIDIOC_PRIVATE+1, struct meye_params)
-/* queue a buffer for mjpeg capture */
-#define MEYEIOC_QBUF_CAPT	_IOW ('v', BASE_VIDIOC_PRIVATE+2, int)
-/* sync a previously queued mjpeg buffer */
-#define MEYEIOC_SYNC		_IOWR('v', BASE_VIDIOC_PRIVATE+3, int)
-/* get a still uncompressed snapshot */
-#define MEYEIOC_STILLCAPT	_IO  ('v', BASE_VIDIOC_PRIVATE+4)
-/* get a jpeg compressed snapshot */
-#define MEYEIOC_STILLJCAPT	_IOR ('v', BASE_VIDIOC_PRIVATE+5, int)
-
-/* V4L2 private controls */
-#define V4L2_CID_MEYE_AGC		(V4L2_CID_USER_MEYE_BASE + 0)
-#define V4L2_CID_MEYE_PICTURE		(V4L2_CID_USER_MEYE_BASE + 1)
-#define V4L2_CID_MEYE_FRAMERATE		(V4L2_CID_USER_MEYE_BASE + 2)
-
-#endif
diff --git a/openflow/usr/include/linux/mic_common.h b/openflow/usr/include/linux/mic_common.h
deleted file mode 100644
index 667263a..0000000
--- a/openflow/usr/include/linux/mic_common.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Intel MIC Platform Software Stack (MPSS)
- *
- * Copyright(c) 2013 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
- * Intel MIC driver.
- *
- */
-#ifndef __MIC_COMMON_H_
-#define __MIC_COMMON_H_
-
-#include <linux/virtio_ring.h>
-
-#define __mic_align(a, x) (((a) + (x) - 1) & ~((x) - 1))
-
-/**
- * struct mic_device_desc: Virtio device information shared between the
- * virtio driver and userspace backend
- *
- * @type: Device type: console/network/disk etc.  Type 0/-1 terminates.
- * @num_vq: Number of virtqueues.
- * @feature_len: Number of bytes of feature bits.  Multiply by 2: one for
-   host features and one for guest acknowledgements.
- * @config_len: Number of bytes of the config array after virtqueues.
- * @status: A status byte, written by the Guest.
- * @config: Start of the following variable length config.
- */
-struct mic_device_desc {
-	__s8 type;
-	__u8 num_vq;
-	__u8 feature_len;
-	__u8 config_len;
-	__u8 status;
-	__le64 config[0];
-} __attribute__ ((aligned(8)));
-
-/**
- * struct mic_device_ctrl: Per virtio device information in the device page
- * used internally by the host and card side drivers.
- *
- * @vdev: Used for storing MIC vdev information by the guest.
- * @config_change: Set to 1 by host when a config change is requested.
- * @vdev_reset: Set to 1 by guest to indicate virtio device has been reset.
- * @guest_ack: Set to 1 by guest to ack a command.
- * @host_ack: Set to 1 by host to ack a command.
- * @used_address_updated: Set to 1 by guest when the used address should be
- * updated.
- * @c2h_vdev_db: The doorbell number to be used by guest. Set by host.
- * @h2c_vdev_db: The doorbell number to be used by host. Set by guest.
- */
-struct mic_device_ctrl {
-	__le64 vdev;
-	__u8 config_change;
-	__u8 vdev_reset;
-	__u8 guest_ack;
-	__u8 host_ack;
-	__u8 used_address_updated;
-	__s8 c2h_vdev_db;
-	__s8 h2c_vdev_db;
-} __attribute__ ((aligned(8)));
-
-/**
- * struct mic_bootparam: Virtio device independent information in device page
- *
- * @magic: A magic value used by the card to ensure it can see the host
- * @h2c_config_db: Host to Card Virtio config doorbell set by card
- * @node_id: Unique id of the node
- * @h2c_scif_db - Host to card SCIF doorbell set by card
- * @c2h_scif_db - Card to host SCIF doorbell set by host
- * @scif_host_dma_addr - SCIF host queue pair DMA address
- * @scif_card_dma_addr - SCIF card queue pair DMA address
- */
-struct mic_bootparam {
-	__le32 magic;
-	__s8 h2c_config_db;
-	__u8 node_id;
-	__u8 h2c_scif_db;
-	__u8 c2h_scif_db;
-	__u64 scif_host_dma_addr;
-	__u64 scif_card_dma_addr;
-} __attribute__ ((aligned(8)));
-
-/**
- * struct mic_device_page: High level representation of the device page
- *
- * @bootparam: The bootparam structure is used for sharing information and
- * status updates between MIC host and card drivers.
- * @desc: Array of MIC virtio device descriptors.
- */
-struct mic_device_page {
-	struct mic_bootparam bootparam;
-	struct mic_device_desc desc[0];
-};
-/**
- * struct mic_vqconfig: This is how we expect the device configuration field
- * for a virtqueue to be laid out in config space.
- *
- * @address: Guest/MIC physical address of the virtio ring
- * (avail and desc rings)
- * @used_address: Guest/MIC physical address of the used ring
- * @num: The number of entries in the virtio_ring
- */
-struct mic_vqconfig {
-	__le64 address;
-	__le64 used_address;
-	__le16 num;
-} __attribute__ ((aligned(8)));
-
-/*
- * The alignment to use between consumer and producer parts of vring.
- * This is pagesize for historical reasons.
- */
-#define MIC_VIRTIO_RING_ALIGN		4096
-
-#define MIC_MAX_VRINGS			4
-#define MIC_VRING_ENTRIES		128
-
-/*
- * Max vring entries (power of 2) to ensure desc and avail rings
- * fit in a single page
- */
-#define MIC_MAX_VRING_ENTRIES		128
-
-/**
- * Max size of the desc block in bytes: includes:
- *	- struct mic_device_desc
- *	- struct mic_vqconfig (num_vq of these)
- *	- host and guest features
- *	- virtio device config space
- */
-#define MIC_MAX_DESC_BLK_SIZE		256
-
-/**
- * struct _mic_vring_info - Host vring info exposed to userspace backend
- * for the avail index and magic for the card.
- *
- * @avail_idx: host avail idx
- * @magic: A magic debug cookie.
- */
-struct _mic_vring_info {
-	__u16 avail_idx;
-	__le32 magic;
-};
-
-/**
- * struct mic_vring - Vring information.
- *
- * @vr: The virtio ring.
- * @info: Host vring information exposed to the userspace backend for the
- * avail index and magic for the card.
- * @va: The va for the buffer allocated for vr and info.
- * @len: The length of the buffer required for allocating vr and info.
- */
-struct mic_vring {
-	struct vring vr;
-	struct _mic_vring_info *info;
-	void *va;
-	int len;
-};
-
-#define mic_aligned_desc_size(d) __mic_align(mic_desc_size(d), 8)
-
-#ifndef INTEL_MIC_CARD
-static __inline__ unsigned mic_desc_size(const struct mic_device_desc *desc)
-{
-	return sizeof(*desc) + desc->num_vq * sizeof(struct mic_vqconfig)
-		+ desc->feature_len * 2 + desc->config_len;
-}
-
-static __inline__ struct mic_vqconfig *
-mic_vq_config(const struct mic_device_desc *desc)
-{
-	return (struct mic_vqconfig *)(desc + 1);
-}
-
-static __inline__ __u8 *mic_vq_features(const struct mic_device_desc *desc)
-{
-	return (__u8 *)(mic_vq_config(desc) + desc->num_vq);
-}
-
-static __inline__ __u8 *mic_vq_configspace(const struct mic_device_desc *desc)
-{
-	return mic_vq_features(desc) + desc->feature_len * 2;
-}
-static __inline__ unsigned mic_total_desc_size(struct mic_device_desc *desc)
-{
-	return mic_aligned_desc_size(desc) + sizeof(struct mic_device_ctrl);
-}
-#endif
-
-/* Device page size */
-#define MIC_DP_SIZE 4096
-
-#define MIC_MAGIC 0xc0ffee00
-
-/**
- * enum mic_states - MIC states.
- */
-enum mic_states {
-	MIC_READY = 0,
-	MIC_BOOTING,
-	MIC_ONLINE,
-	MIC_SHUTTING_DOWN,
-	MIC_RESETTING,
-	MIC_RESET_FAILED,
-	MIC_LAST
-};
-
-/**
- * enum mic_status - MIC status reported by card after
- * a host or card initiated shutdown or a card crash.
- */
-enum mic_status {
-	MIC_NOP = 0,
-	MIC_CRASHED,
-	MIC_HALTED,
-	MIC_POWER_OFF,
-	MIC_RESTART,
-	MIC_STATUS_LAST
-};
-
-#endif
diff --git a/openflow/usr/include/linux/mic_ioctl.h b/openflow/usr/include/linux/mic_ioctl.h
deleted file mode 100644
index a0d7ce6..0000000
--- a/openflow/usr/include/linux/mic_ioctl.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Intel MIC Platform Software Stack (MPSS)
- *
- * Copyright(c) 2013 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
- * Intel MIC Host driver.
- *
- */
-#ifndef _MIC_IOCTL_H_
-#define _MIC_IOCTL_H_
-
-#include <linux/types.h>
-
-/*
- * mic_copy - MIC virtio descriptor copy.
- *
- * @iov: An array of IOVEC structures containing user space buffers.
- * @iovcnt: Number of IOVEC structures in iov.
- * @vr_idx: The vring index.
- * @update_used: A non zero value results in used index being updated.
- * @out_len: The aggregate of the total length written to or read from
- *	the virtio device.
- */
-struct mic_copy_desc {
-	struct iovec *iov;
-	__u32 iovcnt;
-	__u8 vr_idx;
-	__u8 update_used;
-	__u32 out_len;
-};
-
-/*
- * Add a new virtio device
- * The (struct mic_device_desc *) pointer points to a device page entry
- *	for the virtio device consisting of:
- *	- struct mic_device_desc
- *	- struct mic_vqconfig (num_vq of these)
- *	- host and guest features
- *	- virtio device config space
- * The total size referenced by the pointer should equal the size returned
- * by desc_size() in mic_common.h
- */
-#define MIC_VIRTIO_ADD_DEVICE _IOWR('s', 1, struct mic_device_desc *)
-
-/*
- * Copy the number of entries in the iovec and update the used index
- * if requested by the user.
- */
-#define MIC_VIRTIO_COPY_DESC	_IOWR('s', 2, struct mic_copy_desc *)
-
-/*
- * Notify virtio device of a config change
- * The (__u8 *) pointer points to config space values for the device
- * as they should be written into the device page. The total size
- * referenced by the pointer should equal the config_len field of struct
- * mic_device_desc.
- */
-#define MIC_VIRTIO_CONFIG_CHANGE _IOWR('s', 5, __u8 *)
-
-#endif
diff --git a/openflow/usr/include/linux/mii.h b/openflow/usr/include/linux/mii.h
deleted file mode 100644
index c75eea1..0000000
--- a/openflow/usr/include/linux/mii.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * linux/mii.h: definitions for MII-compatible transceivers
- * Originally drivers/net/sunhme.h.
- *
- * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com)
- */
-
-#ifndef __LINUX_MII_H__
-#define __LINUX_MII_H__
-
-#include <linux/types.h>
-#include <linux/ethtool.h>
-
-/* Generic MII registers. */
-#define MII_BMCR		0x00	/* Basic mode control register */
-#define MII_BMSR		0x01	/* Basic mode status register  */
-#define MII_PHYSID1		0x02	/* PHYS ID 1                   */
-#define MII_PHYSID2		0x03	/* PHYS ID 2                   */
-#define MII_ADVERTISE		0x04	/* Advertisement control reg   */
-#define MII_LPA			0x05	/* Link partner ability reg    */
-#define MII_EXPANSION		0x06	/* Expansion register          */
-#define MII_CTRL1000		0x09	/* 1000BASE-T control          */
-#define MII_STAT1000		0x0a	/* 1000BASE-T status           */
-#define	MII_MMD_CTRL		0x0d	/* MMD Access Control Register */
-#define	MII_MMD_DATA		0x0e	/* MMD Access Data Register */
-#define MII_ESTATUS		0x0f	/* Extended Status             */
-#define MII_DCOUNTER		0x12	/* Disconnect counter          */
-#define MII_FCSCOUNTER		0x13	/* False carrier counter       */
-#define MII_NWAYTEST		0x14	/* N-way auto-neg test reg     */
-#define MII_RERRCOUNTER		0x15	/* Receive error counter       */
-#define MII_SREVISION		0x16	/* Silicon revision            */
-#define MII_RESV1		0x17	/* Reserved...                 */
-#define MII_LBRERROR		0x18	/* Lpback, rx, bypass error    */
-#define MII_PHYADDR		0x19	/* PHY address                 */
-#define MII_RESV2		0x1a	/* Reserved...                 */
-#define MII_TPISTATUS		0x1b	/* TPI status for 10mbps       */
-#define MII_NCONFIG		0x1c	/* Network interface config    */
-
-/* Basic mode control register. */
-#define BMCR_RESV		0x003f	/* Unused...                   */
-#define BMCR_SPEED1000		0x0040	/* MSB of Speed (1000)         */
-#define BMCR_CTST		0x0080	/* Collision test              */
-#define BMCR_FULLDPLX		0x0100	/* Full duplex                 */
-#define BMCR_ANRESTART		0x0200	/* Auto negotiation restart    */
-#define BMCR_ISOLATE		0x0400	/* Isolate data paths from MII */
-#define BMCR_PDOWN		0x0800	/* Enable low power state      */
-#define BMCR_ANENABLE		0x1000	/* Enable auto negotiation     */
-#define BMCR_SPEED100		0x2000	/* Select 100Mbps              */
-#define BMCR_LOOPBACK		0x4000	/* TXD loopback bits           */
-#define BMCR_RESET		0x8000	/* Reset to default state      */
-
-/* Basic mode status register. */
-#define BMSR_ERCAP		0x0001	/* Ext-reg capability          */
-#define BMSR_JCD		0x0002	/* Jabber detected             */
-#define BMSR_LSTATUS		0x0004	/* Link status                 */
-#define BMSR_ANEGCAPABLE	0x0008	/* Able to do auto-negotiation */
-#define BMSR_RFAULT		0x0010	/* Remote fault detected       */
-#define BMSR_ANEGCOMPLETE	0x0020	/* Auto-negotiation complete   */
-#define BMSR_RESV		0x00c0	/* Unused...                   */
-#define BMSR_ESTATEN		0x0100	/* Extended Status in R15      */
-#define BMSR_100HALF2		0x0200	/* Can do 100BASE-T2 HDX       */
-#define BMSR_100FULL2		0x0400	/* Can do 100BASE-T2 FDX       */
-#define BMSR_10HALF		0x0800	/* Can do 10mbps, half-duplex  */
-#define BMSR_10FULL		0x1000	/* Can do 10mbps, full-duplex  */
-#define BMSR_100HALF		0x2000	/* Can do 100mbps, half-duplex */
-#define BMSR_100FULL		0x4000	/* Can do 100mbps, full-duplex */
-#define BMSR_100BASE4		0x8000	/* Can do 100mbps, 4k packets  */
-
-/* Advertisement control register. */
-#define ADVERTISE_SLCT		0x001f	/* Selector bits               */
-#define ADVERTISE_CSMA		0x0001	/* Only selector supported     */
-#define ADVERTISE_10HALF	0x0020	/* Try for 10mbps half-duplex  */
-#define ADVERTISE_1000XFULL	0x0020	/* Try for 1000BASE-X full-duplex */
-#define ADVERTISE_10FULL	0x0040	/* Try for 10mbps full-duplex  */
-#define ADVERTISE_1000XHALF	0x0040	/* Try for 1000BASE-X half-duplex */
-#define ADVERTISE_100HALF	0x0080	/* Try for 100mbps half-duplex */
-#define ADVERTISE_1000XPAUSE	0x0080	/* Try for 1000BASE-X pause    */
-#define ADVERTISE_100FULL	0x0100	/* Try for 100mbps full-duplex */
-#define ADVERTISE_1000XPSE_ASYM	0x0100	/* Try for 1000BASE-X asym pause */
-#define ADVERTISE_100BASE4	0x0200	/* Try for 100mbps 4k packets  */
-#define ADVERTISE_PAUSE_CAP	0x0400	/* Try for pause               */
-#define ADVERTISE_PAUSE_ASYM	0x0800	/* Try for asymetric pause     */
-#define ADVERTISE_RESV		0x1000	/* Unused...                   */
-#define ADVERTISE_RFAULT	0x2000	/* Say we can detect faults    */
-#define ADVERTISE_LPACK		0x4000	/* Ack link partners response  */
-#define ADVERTISE_NPAGE		0x8000	/* Next page bit               */
-
-#define ADVERTISE_FULL		(ADVERTISE_100FULL | ADVERTISE_10FULL | \
-				  ADVERTISE_CSMA)
-#define ADVERTISE_ALL		(ADVERTISE_10HALF | ADVERTISE_10FULL | \
-				  ADVERTISE_100HALF | ADVERTISE_100FULL)
-
-/* Link partner ability register. */
-#define LPA_SLCT		0x001f	/* Same as advertise selector  */
-#define LPA_10HALF		0x0020	/* Can do 10mbps half-duplex   */
-#define LPA_1000XFULL		0x0020	/* Can do 1000BASE-X full-duplex */
-#define LPA_10FULL		0x0040	/* Can do 10mbps full-duplex   */
-#define LPA_1000XHALF		0x0040	/* Can do 1000BASE-X half-duplex */
-#define LPA_100HALF		0x0080	/* Can do 100mbps half-duplex  */
-#define LPA_1000XPAUSE		0x0080	/* Can do 1000BASE-X pause     */
-#define LPA_100FULL		0x0100	/* Can do 100mbps full-duplex  */
-#define LPA_1000XPAUSE_ASYM	0x0100	/* Can do 1000BASE-X pause asym*/
-#define LPA_100BASE4		0x0200	/* Can do 100mbps 4k packets   */
-#define LPA_PAUSE_CAP		0x0400	/* Can pause                   */
-#define LPA_PAUSE_ASYM		0x0800	/* Can pause asymetrically     */
-#define LPA_RESV		0x1000	/* Unused...                   */
-#define LPA_RFAULT		0x2000	/* Link partner faulted        */
-#define LPA_LPACK		0x4000	/* Link partner acked us       */
-#define LPA_NPAGE		0x8000	/* Next page bit               */
-
-#define LPA_DUPLEX		(LPA_10FULL | LPA_100FULL)
-#define LPA_100			(LPA_100FULL | LPA_100HALF | LPA_100BASE4)
-
-/* Expansion register for auto-negotiation. */
-#define EXPANSION_NWAY		0x0001	/* Can do N-way auto-nego      */
-#define EXPANSION_LCWP		0x0002	/* Got new RX page code word   */
-#define EXPANSION_ENABLENPAGE	0x0004	/* This enables npage words    */
-#define EXPANSION_NPCAPABLE	0x0008	/* Link partner supports npage */
-#define EXPANSION_MFAULTS	0x0010	/* Multiple faults detected    */
-#define EXPANSION_RESV		0xffe0	/* Unused...                   */
-
-#define ESTATUS_1000_TFULL	0x2000	/* Can do 1000BT Full          */
-#define ESTATUS_1000_THALF	0x1000	/* Can do 1000BT Half          */
-
-/* N-way test register. */
-#define NWAYTEST_RESV1		0x00ff	/* Unused...                   */
-#define NWAYTEST_LOOPBACK	0x0100	/* Enable loopback for N-way   */
-#define NWAYTEST_RESV2		0xfe00	/* Unused...                   */
-
-/* 1000BASE-T Control register */
-#define ADVERTISE_1000FULL	0x0200  /* Advertise 1000BASE-T full duplex */
-#define ADVERTISE_1000HALF	0x0100  /* Advertise 1000BASE-T half duplex */
-#define CTL1000_AS_MASTER	0x0800
-#define CTL1000_ENABLE_MASTER	0x1000
-
-/* 1000BASE-T Status register */
-#define LPA_1000LOCALRXOK	0x2000	/* Link partner local receiver status */
-#define LPA_1000REMRXOK		0x1000	/* Link partner remote receiver status */
-#define LPA_1000FULL		0x0800	/* Link partner 1000BASE-T full duplex */
-#define LPA_1000HALF		0x0400	/* Link partner 1000BASE-T half duplex */
-
-/* Flow control flags */
-#define FLOW_CTRL_TX		0x01
-#define FLOW_CTRL_RX		0x02
-
-/* MMD Access Control register fields */
-#define MII_MMD_CTRL_DEVAD_MASK	0x1f	/* Mask MMD DEVAD*/
-#define MII_MMD_CTRL_ADDR	0x0000	/* Address */
-#define MII_MMD_CTRL_NOINCR	0x4000	/* no post increment */
-#define MII_MMD_CTRL_INCR_RDWT	0x8000	/* post increment on reads & writes */
-#define MII_MMD_CTRL_INCR_ON_WT	0xC000	/* post increment on writes only */
-
-/* This structure is used in all SIOCxMIIxxx ioctl calls */
-struct mii_ioctl_data {
-	__u16		phy_id;
-	__u16		reg_num;
-	__u16		val_in;
-	__u16		val_out;
-};
-
-#endif /* __LINUX_MII_H__ */
diff --git a/openflow/usr/include/linux/minix_fs.h b/openflow/usr/include/linux/minix_fs.h
deleted file mode 100644
index 13fe09e..0000000
--- a/openflow/usr/include/linux/minix_fs.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#ifndef _LINUX_MINIX_FS_H
-#define _LINUX_MINIX_FS_H
-
-#include <linux/types.h>
-#include <linux/magic.h>
-
-/*
- * The minix filesystem constants/structures
- */
-
-/*
- * Thanks to Kees J Bot for sending me the definitions of the new
- * minix filesystem (aka V2) with bigger inodes and 32-bit block
- * pointers.
- */
-
-#define MINIX_ROOT_INO 1
-
-/* Not the same as the bogus LINK_MAX in <linux/limits.h>. Oh well. */
-#define MINIX_LINK_MAX	250
-#define MINIX2_LINK_MAX	65530
-
-#define MINIX_I_MAP_SLOTS	8
-#define MINIX_Z_MAP_SLOTS	64
-#define MINIX_VALID_FS		0x0001		/* Clean fs. */
-#define MINIX_ERROR_FS		0x0002		/* fs has errors. */
-
-#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode)))
-
-/*
- * This is the original minix inode layout on disk.
- * Note the 8-bit gid and atime and ctime.
- */
-struct minix_inode {
-	__u16 i_mode;
-	__u16 i_uid;
-	__u32 i_size;
-	__u32 i_time;
-	__u8  i_gid;
-	__u8  i_nlinks;
-	__u16 i_zone[9];
-};
-
-/*
- * The new minix inode has all the time entries, as well as
- * long block numbers and a third indirect block (7+1+1+1
- * instead of 7+1+1). Also, some previously 8-bit values are
- * now 16-bit. The inode is now 64 bytes instead of 32.
- */
-struct minix2_inode {
-	__u16 i_mode;
-	__u16 i_nlinks;
-	__u16 i_uid;
-	__u16 i_gid;
-	__u32 i_size;
-	__u32 i_atime;
-	__u32 i_mtime;
-	__u32 i_ctime;
-	__u32 i_zone[10];
-};
-
-/*
- * minix super-block data on disk
- */
-struct minix_super_block {
-	__u16 s_ninodes;
-	__u16 s_nzones;
-	__u16 s_imap_blocks;
-	__u16 s_zmap_blocks;
-	__u16 s_firstdatazone;
-	__u16 s_log_zone_size;
-	__u32 s_max_size;
-	__u16 s_magic;
-	__u16 s_state;
-	__u32 s_zones;
-};
-
-/*
- * V3 minix super-block data on disk
- */
-struct minix3_super_block {
-	__u32 s_ninodes;
-	__u16 s_pad0;
-	__u16 s_imap_blocks;
-	__u16 s_zmap_blocks;
-	__u16 s_firstdatazone;
-	__u16 s_log_zone_size;
-	__u16 s_pad1;
-	__u32 s_max_size;
-	__u32 s_zones;
-	__u16 s_magic;
-	__u16 s_pad2;
-	__u16 s_blocksize;
-	__u8  s_disk_version;
-};
-
-struct minix_dir_entry {
-	__u16 inode;
-	char name[0];
-};
-
-struct minix3_dir_entry {
-	__u32 inode;
-	char name[0];
-};
-#endif
diff --git a/openflow/usr/include/linux/mman.h b/openflow/usr/include/linux/mman.h
deleted file mode 100644
index 36b3004..0000000
--- a/openflow/usr/include/linux/mman.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _LINUX_MMAN_H
-#define _LINUX_MMAN_H
-
-#include <asm/mman.h>
-
-#define MREMAP_MAYMOVE	1
-#define MREMAP_FIXED	2
-
-#define OVERCOMMIT_GUESS		0
-#define OVERCOMMIT_ALWAYS		1
-#define OVERCOMMIT_NEVER		2
-
-#endif /* _LINUX_MMAN_H */
diff --git a/openflow/usr/include/linux/mmc/ioctl.h b/openflow/usr/include/linux/mmc/ioctl.h
deleted file mode 100644
index 7e385b8..0000000
--- a/openflow/usr/include/linux/mmc/ioctl.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef LINUX_MMC_IOCTL_H
-#define LINUX_MMC_IOCTL_H
-
-#include <linux/types.h>
-
-struct mmc_ioc_cmd {
-	/* Implies direction of data.  true = write, false = read */
-	int write_flag;
-
-	/* Application-specific command.  true = precede with CMD55 */
-	int is_acmd;
-
-	__u32 opcode;
-	__u32 arg;
-	__u32 response[4];  /* CMD response */
-	unsigned int flags;
-	unsigned int blksz;
-	unsigned int blocks;
-
-	/*
-	 * Sleep at least postsleep_min_us useconds, and at most
-	 * postsleep_max_us useconds *after* issuing command.  Needed for
-	 * some read commands for which cards have no other way of indicating
-	 * they're ready for the next command (i.e. there is no equivalent of
-	 * a "busy" indicator for read operations).
-	 */
-	unsigned int postsleep_min_us;
-	unsigned int postsleep_max_us;
-
-	/*
-	 * Override driver-computed timeouts.  Note the difference in units!
-	 */
-	unsigned int data_timeout_ns;
-	unsigned int cmd_timeout_ms;
-
-	/*
-	 * For 64-bit machines, the next member, ``__u64 data_ptr``, wants to
-	 * be 8-byte aligned.  Make sure this struct is the same size when
-	 * built for 32-bit.
-	 */
-	__u32 __pad;
-
-	/* DAT buffer */
-	__u64 data_ptr;
-};
-#define mmc_ioc_cmd_set_data(ic, ptr) ic.data_ptr = (__u64)(unsigned long) ptr
-
-/**
- * struct mmc_ioc_multi_cmd - multi command information
- * @num_of_cmds: Number of commands to send. Must be equal to or less than
- *	MMC_IOC_MAX_CMDS.
- * @cmds: Array of commands with length equal to 'num_of_cmds'
- */
-struct mmc_ioc_multi_cmd {
-	__u64 num_of_cmds;
-	struct mmc_ioc_cmd cmds[0];
-};
-
-#define MMC_IOC_CMD _IOWR(MMC_BLOCK_MAJOR, 0, struct mmc_ioc_cmd)
-/*
- * MMC_IOC_MULTI_CMD: Used to send an array of MMC commands described by
- *	the structure mmc_ioc_multi_cmd. The MMC driver will issue all
- *	commands in array in sequence to card.
- */
-#define MMC_IOC_MULTI_CMD _IOWR(MMC_BLOCK_MAJOR, 1, struct mmc_ioc_multi_cmd)
-/*
- * Since this ioctl is only meant to enhance (and not replace) normal access
- * to the mmc bus device, an upper data transfer limit of MMC_IOC_MAX_BYTES
- * is enforced per ioctl call.  For larger data transfers, use the normal
- * block device operations.
- */
-#define MMC_IOC_MAX_BYTES  (512L * 256)
-#define MMC_IOC_MAX_CMDS    255
-#endif /* LINUX_MMC_IOCTL_H */
diff --git a/openflow/usr/include/linux/mmtimer.h b/openflow/usr/include/linux/mmtimer.h
deleted file mode 100644
index 884cabf..0000000
--- a/openflow/usr/include/linux/mmtimer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Intel Multimedia Timer device interface
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (c) 2001-2004 Silicon Graphics, Inc.  All rights reserved.
- *
- * This file should define an interface compatible with the IA-PC Multimedia
- * Timers Draft Specification (rev. 0.97) from Intel.  Note that some
- * hardware may not be able to safely export its registers to userspace,
- * so the ioctl interface should support all necessary functionality.
- *
- * 11/01/01 - jbarnes - initial revision
- * 9/10/04 - Christoph Lameter - remove interrupt support
- * 9/17/04 - jbarnes - remove test program, move some #defines to the driver
- */
-
-#ifndef _LINUX_MMTIMER_H
-#define _LINUX_MMTIMER_H
-
-/*
- * Breakdown of the ioctl's available.  An 'optional' next to the command
- * indicates that supporting this command is optional, while 'required'
- * commands must be implemented if conformance is desired.
- *
- * MMTIMER_GETOFFSET - optional
- *   Should return the offset (relative to the start of the page where the
- *   registers are mapped) for the counter in question.
- *
- * MMTIMER_GETRES - required
- *   The resolution of the clock in femto (10^-15) seconds
- *
- * MMTIMER_GETFREQ - required
- *   Frequency of the clock in Hz
- *
- * MMTIMER_GETBITS - required
- *   Number of bits in the clock's counter
- *
- * MMTIMER_MMAPAVAIL - required
- *   Returns nonzero if the registers can be mmap'd into userspace, 0 otherwise
- *
- * MMTIMER_GETCOUNTER - required
- *   Gets the current value in the counter
- */
-#define MMTIMER_IOCTL_BASE 'm'
-
-#define MMTIMER_GETOFFSET _IO(MMTIMER_IOCTL_BASE, 0)
-#define MMTIMER_GETRES _IOR(MMTIMER_IOCTL_BASE, 1, unsigned long)
-#define MMTIMER_GETFREQ _IOR(MMTIMER_IOCTL_BASE, 2, unsigned long)
-#define MMTIMER_GETBITS _IO(MMTIMER_IOCTL_BASE, 4)
-#define MMTIMER_MMAPAVAIL _IO(MMTIMER_IOCTL_BASE, 6)
-#define MMTIMER_GETCOUNTER _IOR(MMTIMER_IOCTL_BASE, 9, unsigned long)
-
-#endif /* _LINUX_MMTIMER_H */
diff --git a/openflow/usr/include/linux/mpls.h b/openflow/usr/include/linux/mpls.h
deleted file mode 100644
index a14b54b..0000000
--- a/openflow/usr/include/linux/mpls.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _MPLS_H
-#define _MPLS_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/* Reference: RFC 5462, RFC 3032
- *
- *  0                   1                   2                   3
- *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |                Label                  | TC  |S|       TTL     |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *	Label:  Label Value, 20 bits
- *	TC:     Traffic Class field, 3 bits
- *	S:      Bottom of Stack, 1 bit
- *	TTL:    Time to Live, 8 bits
- */
-
-struct mpls_label {
-	__be32 entry;
-};
-
-#define MPLS_LS_LABEL_MASK      0xFFFFF000
-#define MPLS_LS_LABEL_SHIFT     12
-#define MPLS_LS_TC_MASK         0x00000E00
-#define MPLS_LS_TC_SHIFT        9
-#define MPLS_LS_S_MASK          0x00000100
-#define MPLS_LS_S_SHIFT         8
-#define MPLS_LS_TTL_MASK        0x000000FF
-#define MPLS_LS_TTL_SHIFT       0
-
-/* Reserved labels */
-#define MPLS_LABEL_IPV4NULL		0 /* RFC3032 */
-#define MPLS_LABEL_RTALERT		1 /* RFC3032 */
-#define MPLS_LABEL_IPV6NULL		2 /* RFC3032 */
-#define MPLS_LABEL_IMPLNULL		3 /* RFC3032 */
-#define MPLS_LABEL_ENTROPY		7 /* RFC6790 */
-#define MPLS_LABEL_GAL			13 /* RFC5586 */
-#define MPLS_LABEL_OAMALERT		14 /* RFC3429 */
-#define MPLS_LABEL_EXTENSION		15 /* RFC7274 */
-
-#define MPLS_LABEL_FIRST_UNRESERVED	16 /* RFC3032 */
-
-#endif /* _MPLS_H */
diff --git a/openflow/usr/include/linux/mpls_iptunnel.h b/openflow/usr/include/linux/mpls_iptunnel.h
deleted file mode 100644
index 4132c3c..0000000
--- a/openflow/usr/include/linux/mpls_iptunnel.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *	mpls tunnel api
- *
- *	Authors:
- *		Roopa Prabhu <roopa@cumulusnetworks.com>
- *
- *	This program is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU General Public License
- *	as published by the Free Software Foundation; either version
- *	2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_MPLS_IPTUNNEL_H
-#define _LINUX_MPLS_IPTUNNEL_H
-
-/* MPLS tunnel attributes
- * [RTA_ENCAP] = {
- *     [MPLS_IPTUNNEL_DST]
- * }
- */
-enum {
-	MPLS_IPTUNNEL_UNSPEC,
-	MPLS_IPTUNNEL_DST,
-	__MPLS_IPTUNNEL_MAX,
-};
-#define MPLS_IPTUNNEL_MAX (__MPLS_IPTUNNEL_MAX - 1)
-
-#endif /* _LINUX_MPLS_IPTUNNEL_H */
diff --git a/openflow/usr/include/linux/mqueue.h b/openflow/usr/include/linux/mqueue.h
deleted file mode 100644
index d0a2b8e..0000000
--- a/openflow/usr/include/linux/mqueue.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (C) 2003 Krzysztof Benedyczak & Michal Wronski
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   It is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this software; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _LINUX_MQUEUE_H
-#define _LINUX_MQUEUE_H
-
-#define MQ_PRIO_MAX 	32768
-/* per-uid limit of kernel memory used by mqueue, in bytes */
-#define MQ_BYTES_MAX	819200
-
-struct mq_attr {
-	__kernel_long_t	mq_flags;	/* message queue flags			*/
-	__kernel_long_t	mq_maxmsg;	/* maximum number of messages		*/
-	__kernel_long_t	mq_msgsize;	/* maximum message size			*/
-	__kernel_long_t	mq_curmsgs;	/* number of messages currently queued	*/
-	__kernel_long_t	__reserved[4];	/* ignored for input, zeroed for output */
-};
-
-/*
- * SIGEV_THREAD implementation:
- * SIGEV_THREAD must be implemented in user space. If SIGEV_THREAD is passed
- * to mq_notify, then
- * - sigev_signo must be the file descriptor of an AF_NETLINK socket. It's not
- *   necessary that the socket is bound.
- * - sigev_value.sival_ptr must point to a cookie that is NOTIFY_COOKIE_LEN
- *   bytes long.
- * If the notification is triggered, then the cookie is sent to the netlink
- * socket. The last byte of the cookie is replaced with the NOTIFY_?? codes:
- * NOTIFY_WOKENUP if the notification got triggered, NOTIFY_REMOVED if it was
- * removed, either due to a close() on the message queue fd or due to a
- * mq_notify() that removed the notification.
- */
-#define NOTIFY_NONE	0
-#define NOTIFY_WOKENUP	1
-#define NOTIFY_REMOVED	2
-
-#define NOTIFY_COOKIE_LEN	32
-
-#endif
diff --git a/openflow/usr/include/linux/mroute.h b/openflow/usr/include/linux/mroute.h
deleted file mode 100644
index ef12aa4..0000000
--- a/openflow/usr/include/linux/mroute.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef __LINUX_MROUTE_H
-#define __LINUX_MROUTE_H
-
-#include <linux/sockios.h>
-#include <linux/types.h>
-
-/*
- *	Based on the MROUTING 3.5 defines primarily to keep
- *	source compatibility with BSD.
- *
- *	See the mrouted code for the original history.
- *
- *      Protocol Independent Multicast (PIM) data structures included
- *      Carlos Picoto (cap@di.fc.ul.pt)
- *
- */
-
-#define MRT_BASE	200
-#define MRT_INIT	(MRT_BASE)	/* Activate the kernel mroute code 	*/
-#define MRT_DONE	(MRT_BASE+1)	/* Shutdown the kernel mroute		*/
-#define MRT_ADD_VIF	(MRT_BASE+2)	/* Add a virtual interface		*/
-#define MRT_DEL_VIF	(MRT_BASE+3)	/* Delete a virtual interface		*/
-#define MRT_ADD_MFC	(MRT_BASE+4)	/* Add a multicast forwarding entry	*/
-#define MRT_DEL_MFC	(MRT_BASE+5)	/* Delete a multicast forwarding entry	*/
-#define MRT_VERSION	(MRT_BASE+6)	/* Get the kernel multicast version	*/
-#define MRT_ASSERT	(MRT_BASE+7)	/* Activate PIM assert mode		*/
-#define MRT_PIM		(MRT_BASE+8)	/* enable PIM code			*/
-#define MRT_TABLE	(MRT_BASE+9)	/* Specify mroute table ID		*/
-#define MRT_ADD_MFC_PROXY	(MRT_BASE+10)	/* Add a (*,*|G) mfc entry	*/
-#define MRT_DEL_MFC_PROXY	(MRT_BASE+11)	/* Del a (*,*|G) mfc entry	*/
-#define MRT_MAX		(MRT_BASE+11)
-
-#define SIOCGETVIFCNT	SIOCPROTOPRIVATE	/* IP protocol privates */
-#define SIOCGETSGCNT	(SIOCPROTOPRIVATE+1)
-#define SIOCGETRPF	(SIOCPROTOPRIVATE+2)
-
-#define MAXVIFS		32	
-typedef unsigned long vifbitmap_t;	/* User mode code depends on this lot */
-typedef unsigned short vifi_t;
-#define ALL_VIFS	((vifi_t)(-1))
-
-/*
- *	Same idea as select
- */
- 
-#define VIFM_SET(n,m)	((m)|=(1<<(n)))
-#define VIFM_CLR(n,m)	((m)&=~(1<<(n)))
-#define VIFM_ISSET(n,m)	((m)&(1<<(n)))
-#define VIFM_CLRALL(m)	((m)=0)
-#define VIFM_COPY(mfrom,mto)	((mto)=(mfrom))
-#define VIFM_SAME(m1,m2)	((m1)==(m2))
-
-/*
- *	Passed by mrouted for an MRT_ADD_VIF - again we use the
- *	mrouted 3.6 structures for compatibility
- */
- 
-struct vifctl {
-	vifi_t	vifc_vifi;		/* Index of VIF */
-	unsigned char vifc_flags;	/* VIFF_ flags */
-	unsigned char vifc_threshold;	/* ttl limit */
-	unsigned int vifc_rate_limit;	/* Rate limiter values (NI) */
-	union {
-		struct in_addr vifc_lcl_addr;     /* Local interface address */
-		int            vifc_lcl_ifindex;  /* Local interface index   */
-	};
-	struct in_addr vifc_rmt_addr;	/* IPIP tunnel addr */
-};
-
-#define VIFF_TUNNEL		0x1	/* IPIP tunnel */
-#define VIFF_SRCRT		0x2	/* NI */
-#define VIFF_REGISTER		0x4	/* register vif	*/
-#define VIFF_USE_IFINDEX	0x8	/* use vifc_lcl_ifindex instead of
-					   vifc_lcl_addr to find an interface */
-
-/*
- *	Cache manipulation structures for mrouted and PIMd
- */
- 
-struct mfcctl {
-	struct in_addr mfcc_origin;		/* Origin of mcast	*/
-	struct in_addr mfcc_mcastgrp;		/* Group in question	*/
-	vifi_t	mfcc_parent;			/* Where it arrived	*/
-	unsigned char mfcc_ttls[MAXVIFS];	/* Where it is going	*/
-	unsigned int mfcc_pkt_cnt;		/* pkt count for src-grp */
-	unsigned int mfcc_byte_cnt;
-	unsigned int mfcc_wrong_if;
-	int	     mfcc_expire;
-};
-
-/* 
- *	Group count retrieval for mrouted
- */
- 
-struct sioc_sg_req {
-	struct in_addr src;
-	struct in_addr grp;
-	unsigned long pktcnt;
-	unsigned long bytecnt;
-	unsigned long wrong_if;
-};
-
-/*
- *	To get vif packet counts
- */
-
-struct sioc_vif_req {
-	vifi_t	vifi;		/* Which iface */
-	unsigned long icount;	/* In packets */
-	unsigned long ocount;	/* Out packets */
-	unsigned long ibytes;	/* In bytes */
-	unsigned long obytes;	/* Out bytes */
-};
-
-/*
- *	This is the format the mroute daemon expects to see IGMP control
- *	data. Magically happens to be like an IP packet as per the original
- */
- 
-struct igmpmsg {
-	__u32 unused1,unused2;
-	unsigned char im_msgtype;		/* What is this */
-	unsigned char im_mbz;			/* Must be zero */
-	unsigned char im_vif;			/* Interface (this ought to be a vifi_t!) */
-	unsigned char unused3;
-	struct in_addr im_src,im_dst;
-};
-
-/*
- *	That's all usermode folks
- */
-
-
-
-#define MFC_ASSERT_THRESH (3*HZ)		/* Maximal freq. of asserts */
-
-/*
- *	Pseudo messages used by mrouted
- */
-
-#define IGMPMSG_NOCACHE		1		/* Kern cache fill request to mrouted */
-#define IGMPMSG_WRONGVIF	2		/* For PIM assert processing (unused) */
-#define IGMPMSG_WHOLEPKT	3		/* For PIM Register processing */
-
-
-#endif /* __LINUX_MROUTE_H */
diff --git a/openflow/usr/include/linux/mroute6.h b/openflow/usr/include/linux/mroute6.h
deleted file mode 100644
index 72bcfa9..0000000
--- a/openflow/usr/include/linux/mroute6.h
+++ /dev/null
@@ -1,138 +0,0 @@
-#ifndef __LINUX_MROUTE6_H
-#define __LINUX_MROUTE6_H
-
-#include <linux/types.h>
-#include <linux/sockios.h>
-
-/*
- *	Based on the MROUTING 3.5 defines primarily to keep
- *	source compatibility with BSD.
- *
- *	See the pim6sd code for the original history.
- *
- *      Protocol Independent Multicast (PIM) data structures included
- *      Carlos Picoto (cap@di.fc.ul.pt)
- *
- */
-
-#define MRT6_BASE	200
-#define MRT6_INIT	(MRT6_BASE)	/* Activate the kernel mroute code 	*/
-#define MRT6_DONE	(MRT6_BASE+1)	/* Shutdown the kernel mroute		*/
-#define MRT6_ADD_MIF	(MRT6_BASE+2)	/* Add a virtual interface		*/
-#define MRT6_DEL_MIF	(MRT6_BASE+3)	/* Delete a virtual interface		*/
-#define MRT6_ADD_MFC	(MRT6_BASE+4)	/* Add a multicast forwarding entry	*/
-#define MRT6_DEL_MFC	(MRT6_BASE+5)	/* Delete a multicast forwarding entry	*/
-#define MRT6_VERSION	(MRT6_BASE+6)	/* Get the kernel multicast version	*/
-#define MRT6_ASSERT	(MRT6_BASE+7)	/* Activate PIM assert mode		*/
-#define MRT6_PIM	(MRT6_BASE+8)	/* enable PIM code			*/
-#define MRT6_TABLE	(MRT6_BASE+9)	/* Specify mroute table ID		*/
-#define MRT6_ADD_MFC_PROXY	(MRT6_BASE+10)	/* Add a (*,*|G) mfc entry	*/
-#define MRT6_DEL_MFC_PROXY	(MRT6_BASE+11)	/* Del a (*,*|G) mfc entry	*/
-#define MRT6_MAX	(MRT6_BASE+11)
-
-#define SIOCGETMIFCNT_IN6	SIOCPROTOPRIVATE	/* IP protocol privates */
-#define SIOCGETSGCNT_IN6	(SIOCPROTOPRIVATE+1)
-#define SIOCGETRPF	(SIOCPROTOPRIVATE+2)
-
-#define MAXMIFS		32
-typedef unsigned long mifbitmap_t;	/* User mode code depends on this lot */
-typedef unsigned short mifi_t;
-#define ALL_MIFS	((mifi_t)(-1))
-
-#ifndef IF_SETSIZE
-#define IF_SETSIZE	256
-#endif
-
-typedef	__u32		if_mask;
-#define NIFBITS (sizeof(if_mask) * 8)        /* bits per mask */
-
-#if !defined(DIV_ROUND_UP)
-#define	DIV_ROUND_UP(x,y)	(((x) + ((y) - 1)) / (y))
-#endif
-
-typedef struct if_set {
-	if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];
-} if_set;
-
-#define IF_SET(n, p)    ((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))
-#define IF_CLR(n, p)    ((p)->ifs_bits[(n)/NIFBITS] &= ~(1 << ((n) % NIFBITS)))
-#define IF_ISSET(n, p)  ((p)->ifs_bits[(n)/NIFBITS] & (1 << ((n) % NIFBITS)))
-#define IF_COPY(f, t)   bcopy(f, t, sizeof(*(f)))
-#define IF_ZERO(p)      bzero(p, sizeof(*(p)))
-
-/*
- *	Passed by mrouted for an MRT_ADD_MIF - again we use the
- *	mrouted 3.6 structures for compatibility
- */
-
-struct mif6ctl {
-	mifi_t	mif6c_mifi;		/* Index of MIF */
-	unsigned char mif6c_flags;	/* MIFF_ flags */
-	unsigned char vifc_threshold;	/* ttl limit */
-	__u16	 mif6c_pifi;		/* the index of the physical IF */
-	unsigned int vifc_rate_limit;	/* Rate limiter values (NI) */
-};
-
-#define MIFF_REGISTER	0x1	/* register vif	*/
-
-/*
- *	Cache manipulation structures for mrouted and PIMd
- */
-
-struct mf6cctl {
-	struct sockaddr_in6 mf6cc_origin;		/* Origin of mcast	*/
-	struct sockaddr_in6 mf6cc_mcastgrp;		/* Group in question	*/
-	mifi_t	mf6cc_parent;			/* Where it arrived	*/
-	struct if_set mf6cc_ifset;		/* Where it is going */
-};
-
-/*
- *	Group count retrieval for pim6sd
- */
-
-struct sioc_sg_req6 {
-	struct sockaddr_in6 src;
-	struct sockaddr_in6 grp;
-	unsigned long pktcnt;
-	unsigned long bytecnt;
-	unsigned long wrong_if;
-};
-
-/*
- *	To get vif packet counts
- */
-
-struct sioc_mif_req6 {
-	mifi_t	mifi;		/* Which iface */
-	unsigned long icount;	/* In packets */
-	unsigned long ocount;	/* Out packets */
-	unsigned long ibytes;	/* In bytes */
-	unsigned long obytes;	/* Out bytes */
-};
-
-/*
- *	That's all usermode folks
- */
-
-
-
-/*
- * Structure used to communicate from kernel to multicast router.
- * We'll overlay the structure onto an MLD header (not an IPv6 heder like igmpmsg{}
- * used for IPv4 implementation). This is because this structure will be passed via an
- * IPv6 raw socket, on which an application will only receiver the payload i.e the data after
- * the IPv6 header and all the extension headers. (See section 3 of RFC 3542)
- */
-
-struct mrt6msg {
-#define MRT6MSG_NOCACHE		1
-#define MRT6MSG_WRONGMIF	2
-#define MRT6MSG_WHOLEPKT	3		/* used for use level encap */
-	__u8		im6_mbz;		/* must be zero		   */
-	__u8		im6_msgtype;		/* what type of message    */
-	__u16		im6_mif;		/* mif rec'd on		   */
-	__u32		im6_pad;		/* padding for 64 bit arch */
-	struct in6_addr	im6_src, im6_dst;
-};
-
-#endif /* __LINUX_MROUTE6_H */
diff --git a/openflow/usr/include/linux/msdos_fs.h b/openflow/usr/include/linux/msdos_fs.h
deleted file mode 100644
index 983d3a6..0000000
--- a/openflow/usr/include/linux/msdos_fs.h
+++ /dev/null
@@ -1,199 +0,0 @@
-#ifndef _LINUX_MSDOS_FS_H
-#define _LINUX_MSDOS_FS_H
-
-#include <linux/types.h>
-#include <linux/magic.h>
-#include <asm/byteorder.h>
-
-/*
- * The MS-DOS filesystem constants/structures
- */
-
-#define SECTOR_SIZE	512		/* sector size (bytes) */
-#define SECTOR_BITS	9		/* log2(SECTOR_SIZE) */
-#define MSDOS_DPB	(MSDOS_DPS)	/* dir entries per block */
-#define MSDOS_DPB_BITS	4		/* log2(MSDOS_DPB) */
-#define MSDOS_DPS	(SECTOR_SIZE / sizeof(struct msdos_dir_entry))
-#define MSDOS_DPS_BITS	4		/* log2(MSDOS_DPS) */
-#define MSDOS_LONGNAME	256		/* maximum name length */
-#define CF_LE_W(v)	le16_to_cpu(v)
-#define CF_LE_L(v)	le32_to_cpu(v)
-#define CT_LE_W(v)	cpu_to_le16(v)
-#define CT_LE_L(v)	cpu_to_le32(v)
-
-#define MSDOS_ROOT_INO	 1	/* The root inode number */
-#define MSDOS_FSINFO_INO 2	/* Used for managing the FSINFO block */
-
-#define MSDOS_DIR_BITS	5	/* log2(sizeof(struct msdos_dir_entry)) */
-
-/* directory limit */
-#define FAT_MAX_DIR_ENTRIES	(65536)
-#define FAT_MAX_DIR_SIZE	(FAT_MAX_DIR_ENTRIES << MSDOS_DIR_BITS)
-
-#define ATTR_NONE	0	/* no attribute bits */
-#define ATTR_RO		1	/* read-only */
-#define ATTR_HIDDEN	2	/* hidden */
-#define ATTR_SYS	4	/* system */
-#define ATTR_VOLUME	8	/* volume label */
-#define ATTR_DIR	16	/* directory */
-#define ATTR_ARCH	32	/* archived */
-
-/* attribute bits that are copied "as is" */
-#define ATTR_UNUSED	(ATTR_VOLUME | ATTR_ARCH | ATTR_SYS | ATTR_HIDDEN)
-/* bits that are used by the Windows 95/Windows NT extended FAT */
-#define ATTR_EXT	(ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME)
-
-#define CASE_LOWER_BASE	8	/* base is lower case */
-#define CASE_LOWER_EXT	16	/* extension is lower case */
-
-#define DELETED_FLAG	0xe5	/* marks file as deleted when in name[0] */
-#define IS_FREE(n)	(!*(n) || *(n) == DELETED_FLAG)
-
-#define FAT_LFN_LEN	255	/* maximum long name length */
-#define MSDOS_NAME	11	/* maximum name length */
-#define MSDOS_SLOTS	21	/* max # of slots for short and long names */
-#define MSDOS_DOT	".          "	/* ".", padded to MSDOS_NAME chars */
-#define MSDOS_DOTDOT	"..         "	/* "..", padded to MSDOS_NAME chars */
-
-#define FAT_FIRST_ENT(s, x)	((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : \
-	MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x))
-
-/* start of data cluster's entry (number of reserved clusters) */
-#define FAT_START_ENT	2
-
-/* maximum number of clusters */
-#define MAX_FAT12	0xFF4
-#define MAX_FAT16	0xFFF4
-#define MAX_FAT32	0x0FFFFFF6
-#define MAX_FAT(s)	(MSDOS_SB(s)->fat_bits == 32 ? MAX_FAT32 : \
-	MSDOS_SB(s)->fat_bits == 16 ? MAX_FAT16 : MAX_FAT12)
-
-/* bad cluster mark */
-#define BAD_FAT12	0xFF7
-#define BAD_FAT16	0xFFF7
-#define BAD_FAT32	0x0FFFFFF7
-
-/* standard EOF */
-#define EOF_FAT12	0xFFF
-#define EOF_FAT16	0xFFFF
-#define EOF_FAT32	0x0FFFFFFF
-
-#define FAT_ENT_FREE	(0)
-#define FAT_ENT_BAD	(BAD_FAT32)
-#define FAT_ENT_EOF	(EOF_FAT32)
-
-#define FAT_FSINFO_SIG1	0x41615252
-#define FAT_FSINFO_SIG2	0x61417272
-#define IS_FSINFO(x)	(le32_to_cpu((x)->signature1) == FAT_FSINFO_SIG1 \
-			 && le32_to_cpu((x)->signature2) == FAT_FSINFO_SIG2)
-
-#define FAT_STATE_DIRTY 0x01
-
-struct __fat_dirent {
-	long		d_ino;
-	__kernel_off_t	d_off;
-	unsigned short	d_reclen;
-	char		d_name[256]; /* We must not include limits.h! */
-};
-
-/*
- * ioctl commands
- */
-#define VFAT_IOCTL_READDIR_BOTH		_IOR('r', 1, struct __fat_dirent[2])
-#define VFAT_IOCTL_READDIR_SHORT	_IOR('r', 2, struct __fat_dirent[2])
-/* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */
-#define FAT_IOCTL_GET_ATTRIBUTES	_IOR('r', 0x10, __u32)
-#define FAT_IOCTL_SET_ATTRIBUTES	_IOW('r', 0x11, __u32)
-/*Android kernel has used 0x12, so we use 0x13*/
-#define FAT_IOCTL_GET_VOLUME_ID		_IOR('r', 0x13, __u32)
-
-struct fat_boot_sector {
-	__u8	ignored[3];	/* Boot strap short or near jump */
-	__u8	system_id[8];	/* Name - can be used to special case
-				   partition manager volumes */
-	__u8	sector_size[2];	/* bytes per logical sector */
-	__u8	sec_per_clus;	/* sectors/cluster */
-	__le16	reserved;	/* reserved sectors */
-	__u8	fats;		/* number of FATs */
-	__u8	dir_entries[2];	/* root directory entries */
-	__u8	sectors[2];	/* number of sectors */
-	__u8	media;		/* media code */
-	__le16	fat_length;	/* sectors/FAT */
-	__le16	secs_track;	/* sectors per track */
-	__le16	heads;		/* number of heads */
-	__le32	hidden;		/* hidden sectors (unused) */
-	__le32	total_sect;	/* number of sectors (if sectors == 0) */
-
-	union {
-		struct {
-			/*  Extended BPB Fields for FAT16 */
-			__u8	drive_number;	/* Physical drive number */
-			__u8	state;		/* undocumented, but used
-						   for mount state. */
-			__u8	signature;  /* extended boot signature */
-			__u8	vol_id[4];	/* volume ID */
-			__u8	vol_label[11];	/* volume label */
-			__u8	fs_type[8];		/* file system type */
-			/* other fields are not added here */
-		} fat16;
-
-		struct {
-			/* only used by FAT32 */
-			__le32	length;		/* sectors/FAT */
-			__le16	flags;		/* bit 8: fat mirroring,
-						   low 4: active fat */
-			__u8	version[2];	/* major, minor filesystem
-						   version */
-			__le32	root_cluster;	/* first cluster in
-						   root directory */
-			__le16	info_sector;	/* filesystem info sector */
-			__le16	backup_boot;	/* backup boot sector */
-			__le16	reserved2[6];	/* Unused */
-			/* Extended BPB Fields for FAT32 */
-			__u8	drive_number;   /* Physical drive number */
-			__u8    state;       	/* undocumented, but used
-						   for mount state. */
-			__u8	signature;  /* extended boot signature */
-			__u8	vol_id[4];	/* volume ID */
-			__u8	vol_label[11];	/* volume label */
-			__u8	fs_type[8];		/* file system type */
-			/* other fields are not added here */
-		} fat32;
-	};
-};
-
-struct fat_boot_fsinfo {
-	__le32   signature1;	/* 0x41615252L */
-	__le32   reserved1[120];	/* Nothing as far as I can tell */
-	__le32   signature2;	/* 0x61417272L */
-	__le32   free_clusters;	/* Free cluster count.  -1 if unknown */
-	__le32   next_cluster;	/* Most recently allocated cluster */
-	__le32   reserved2[4];
-};
-
-struct msdos_dir_entry {
-	__u8	name[MSDOS_NAME];/* name and extension */
-	__u8	attr;		/* attribute bits */
-	__u8    lcase;		/* Case for base and extension */
-	__u8	ctime_cs;	/* Creation time, centiseconds (0-199) */
-	__le16	ctime;		/* Creation time */
-	__le16	cdate;		/* Creation date */
-	__le16	adate;		/* Last access date */
-	__le16	starthi;	/* High 16 bits of cluster in FAT32 */
-	__le16	time,date,start;/* time, date and first cluster */
-	__le32	size;		/* file size (in bytes) */
-};
-
-/* Up to 13 characters of the name */
-struct msdos_dir_slot {
-	__u8    id;		/* sequence number for slot */
-	__u8    name0_4[10];	/* first 5 characters in name */
-	__u8    attr;		/* attribute byte */
-	__u8    reserved;	/* always 0 */
-	__u8    alias_checksum;	/* checksum for 8.3 alias */
-	__u8    name5_10[12];	/* 6 more characters in name */
-	__le16   start;		/* starting cluster number, 0 in long slots */
-	__u8    name11_12[4];	/* last 2 characters in name */
-};
-
-#endif /* _LINUX_MSDOS_FS_H */
diff --git a/openflow/usr/include/linux/msg.h b/openflow/usr/include/linux/msg.h
deleted file mode 100644
index 5844b04..0000000
--- a/openflow/usr/include/linux/msg.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef _LINUX_MSG_H
-#define _LINUX_MSG_H
-
-#include <linux/ipc.h>
-
-/* ipcs ctl commands */
-#define MSG_STAT 11
-#define MSG_INFO 12
-
-/* msgrcv options */
-#define MSG_NOERROR     010000  /* no error if message is too big */
-#define MSG_EXCEPT      020000  /* recv any msg except of specified type.*/
-#define MSG_COPY        040000  /* copy (not remove) all queue messages */
-
-/* Obsolete, used only for backwards compatibility and libc5 compiles */
-struct msqid_ds {
-	struct ipc_perm msg_perm;
-	struct msg *msg_first;		/* first message on queue,unused  */
-	struct msg *msg_last;		/* last message in queue,unused */
-	__kernel_time_t msg_stime;	/* last msgsnd time */
-	__kernel_time_t msg_rtime;	/* last msgrcv time */
-	__kernel_time_t msg_ctime;	/* last change time */
-	unsigned long  msg_lcbytes;	/* Reuse junk fields for 32 bit */
-	unsigned long  msg_lqbytes;	/* ditto */
-	unsigned short msg_cbytes;	/* current number of bytes on queue */
-	unsigned short msg_qnum;	/* number of messages in queue */
-	unsigned short msg_qbytes;	/* max number of bytes on queue */
-	__kernel_ipc_pid_t msg_lspid;	/* pid of last msgsnd */
-	__kernel_ipc_pid_t msg_lrpid;	/* last receive pid */
-};
-
-/* Include the definition of msqid64_ds */
-#include <asm/msgbuf.h>
-
-/* message buffer for msgsnd and msgrcv calls */
-struct msgbuf {
-	__kernel_long_t mtype;          /* type of message */
-	char mtext[1];                  /* message text */
-};
-
-/* buffer for msgctl calls IPC_INFO, MSG_INFO */
-struct msginfo {
-	int msgpool;
-	int msgmap; 
-	int msgmax; 
-	int msgmnb; 
-	int msgmni; 
-	int msgssz; 
-	int msgtql; 
-	unsigned short  msgseg; 
-};
-
-/*
- * MSGMNI, MSGMAX and MSGMNB are default values which can be
- * modified by sysctl.
- *
- * MSGMNI is the upper limit for the number of messages queues per
- * namespace.
- * It has been chosen to be as large possible without facilitating
- * scenarios where userspace causes overflows when adjusting the limits via
- * operations of the form retrieve current limit; add X; update limit".
- *
- * MSGMNB is the default size of a new message queue. Non-root tasks can
- * decrease the size with msgctl(IPC_SET), root tasks
- * (actually: CAP_SYS_RESOURCE) can both increase and decrease the queue
- * size. The optimal value is application dependent.
- * 16384 is used because it was always used (since 0.99.10)
- *
- * MAXMAX is the maximum size of an individual message, it's a global
- * (per-namespace) limit that applies for all message queues.
- * It's set to 1/2 of MSGMNB, to ensure that at least two messages fit into
- * the queue. This is also an arbitrary choice (since 2.6.0).
- */
-
-#define MSGMNI 32000   /* <= IPCMNI */     /* max # of msg queue identifiers */
-#define MSGMAX  8192   /* <= INT_MAX */   /* max size of message (bytes) */
-#define MSGMNB 16384   /* <= INT_MAX */   /* default max size of a message queue */
-
-/* unused */
-#define MSGPOOL (MSGMNI * MSGMNB / 1024) /* size in kbytes of message pool */
-#define MSGTQL  MSGMNB            /* number of system message headers */
-#define MSGMAP  MSGMNB            /* number of entries in message map */
-#define MSGSSZ  16                /* message segment size */
-#define __MSGSEG ((MSGPOOL * 1024) / MSGSSZ) /* max no. of segments */
-#define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff)
-
-
-#endif /* _LINUX_MSG_H */
diff --git a/openflow/usr/include/linux/mtio.h b/openflow/usr/include/linux/mtio.h
deleted file mode 100644
index 18543e2..0000000
--- a/openflow/usr/include/linux/mtio.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* 
- * linux/mtio.h header file for Linux. Written by H. Bergman
- *
- * Modified for special ioctls provided by zftape in September 1997
- * by C.-J. Heine.
- */
-
-#ifndef _LINUX_MTIO_H
-#define _LINUX_MTIO_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-/*
- * Structures and definitions for mag tape io control commands
- */
-
-/* structure for MTIOCTOP - mag tape op command */
-struct	mtop {
-	short	mt_op;		/* operations defined below */
-	int	mt_count;	/* how many of them */
-};
-
-/* Magnetic Tape operations [Not all operations supported by all drivers]: */
-#define MTRESET 0	/* +reset drive in case of problems */
-#define MTFSF	1	/* forward space over FileMark,
-			 * position at first record of next file 
-			 */
-#define MTBSF	2	/* backward space FileMark (position before FM) */
-#define MTFSR	3	/* forward space record */
-#define MTBSR	4	/* backward space record */
-#define MTWEOF	5	/* write an end-of-file record (mark) */
-#define MTREW	6	/* rewind */
-#define MTOFFL	7	/* rewind and put the drive offline (eject?) */
-#define MTNOP	8	/* no op, set status only (read with MTIOCGET) */
-#define MTRETEN 9	/* retension tape */
-#define MTBSFM	10	/* +backward space FileMark, position at FM */
-#define MTFSFM  11	/* +forward space FileMark, position at FM */
-#define MTEOM	12	/* goto end of recorded media (for appending files).
-			 * MTEOM positions after the last FM, ready for
-			 * appending another file.
-			 */
-#define MTERASE 13	/* erase tape -- be careful! */
-
-#define MTRAS1  14	/* run self test 1 (nondestructive) */
-#define MTRAS2	15	/* run self test 2 (destructive) */
-#define MTRAS3  16	/* reserved for self test 3 */
-
-#define MTSETBLK 20	/* set block length (SCSI) */
-#define MTSETDENSITY 21	/* set tape density (SCSI) */
-#define MTSEEK	22	/* seek to block (Tandberg, etc.) */
-#define MTTELL	23	/* tell block (Tandberg, etc.) */
-#define MTSETDRVBUFFER 24 /* set the drive buffering according to SCSI-2 */
-			/* ordinary buffered operation with code 1 */
-#define MTFSS	25	/* space forward over setmarks */
-#define MTBSS	26	/* space backward over setmarks */
-#define MTWSM	27	/* write setmarks */
-
-#define MTLOCK  28	/* lock the drive door */
-#define MTUNLOCK 29	/* unlock the drive door */
-#define MTLOAD  30	/* execute the SCSI load command */
-#define MTUNLOAD 31	/* execute the SCSI unload command */
-#define MTCOMPRESSION 32/* control compression with SCSI mode page 15 */
-#define MTSETPART 33	/* Change the active tape partition */
-#define MTMKPART  34	/* Format the tape with one or two partitions */
-#define MTWEOFI	35	/* write an end-of-file record (mark) in immediate mode */
-
-/* structure for MTIOCGET - mag tape get status command */
-
-struct	mtget {
-	long	mt_type;	/* type of magtape device */
-	long	mt_resid;	/* residual count: (not sure)
-				 *	number of bytes ignored, or
-				 *	number of files not skipped, or
-				 *	number of records not skipped.
-				 */
-	/* the following registers are device dependent */
-	long	mt_dsreg;	/* status register */
-	long	mt_gstat;	/* generic (device independent) status */
-	long	mt_erreg;	/* error register */
-	/* The next two fields are not always used */
-	__kernel_daddr_t mt_fileno;	/* number of current file on tape */
-	__kernel_daddr_t mt_blkno;	/* current block number */
-};
-
-
-
-/*
- * Constants for mt_type. Not all of these are supported,
- * and these are not all of the ones that are supported.
- */
-#define MT_ISUNKNOWN		0x01
-#define MT_ISQIC02		0x02	/* Generic QIC-02 tape streamer */
-#define MT_ISWT5150		0x03	/* Wangtek 5150EQ, QIC-150, QIC-02 */
-#define MT_ISARCHIVE_5945L2	0x04	/* Archive 5945L-2, QIC-24, QIC-02? */
-#define MT_ISCMSJ500		0x05	/* CMS Jumbo 500 (QIC-02?) */
-#define MT_ISTDC3610		0x06	/* Tandberg 6310, QIC-24 */
-#define MT_ISARCHIVE_VP60I	0x07	/* Archive VP60i, QIC-02 */
-#define MT_ISARCHIVE_2150L	0x08	/* Archive Viper 2150L */
-#define MT_ISARCHIVE_2060L	0x09	/* Archive Viper 2060L */
-#define MT_ISARCHIVESC499	0x0A	/* Archive SC-499 QIC-36 controller */
-#define MT_ISQIC02_ALL_FEATURES	0x0F	/* Generic QIC-02 with all features */
-#define MT_ISWT5099EEN24	0x11	/* Wangtek 5099-een24, 60MB, QIC-24 */
-#define MT_ISTEAC_MT2ST		0x12	/* Teac MT-2ST 155mb drive, Teac DC-1 card (Wangtek type) */
-#define MT_ISEVEREX_FT40A	0x32	/* Everex FT40A (QIC-40) */
-#define MT_ISDDS1		0x51	/* DDS device without partitions */
-#define MT_ISDDS2		0x52	/* DDS device with partitions */
-#define MT_ISONSTREAM_SC        0x61   /* OnStream SCSI tape drives (SC-x0)
-					  and SCSI emulated (DI, DP, USB) */
-#define MT_ISSCSI1		0x71	/* Generic ANSI SCSI-1 tape unit */
-#define MT_ISSCSI2		0x72	/* Generic ANSI SCSI-2 tape unit */
-
-/* QIC-40/80/3010/3020 ftape supported drives.
- * 20bit vendor ID + 0x800000 (see ftape-vendors.h)
- */
-#define MT_ISFTAPE_UNKNOWN	0x800000 /* obsolete */
-#define MT_ISFTAPE_FLAG	0x800000
-
-
-/* structure for MTIOCPOS - mag tape get position command */
-
-struct	mtpos {
-	long 	mt_blkno;	/* current block number */
-};
-
-
-/* mag tape io control commands */
-#define	MTIOCTOP	_IOW('m', 1, struct mtop)	/* do a mag tape op */
-#define	MTIOCGET	_IOR('m', 2, struct mtget)	/* get tape status */
-#define	MTIOCPOS	_IOR('m', 3, struct mtpos)	/* get tape position */
-
-
-/* Generic Mag Tape (device independent) status macros for examining
- * mt_gstat -- HP-UX compatible.
- * There is room for more generic status bits here, but I don't
- * know which of them are reserved. At least three or so should
- * be added to make this really useful.
- */
-#define GMT_EOF(x)              ((x) & 0x80000000)
-#define GMT_BOT(x)              ((x) & 0x40000000)
-#define GMT_EOT(x)              ((x) & 0x20000000)
-#define GMT_SM(x)               ((x) & 0x10000000)  /* DDS setmark */
-#define GMT_EOD(x)              ((x) & 0x08000000)  /* DDS EOD */
-#define GMT_WR_PROT(x)          ((x) & 0x04000000)
-/* #define GMT_ ? 		((x) & 0x02000000) */
-#define GMT_ONLINE(x)           ((x) & 0x01000000)
-#define GMT_D_6250(x)           ((x) & 0x00800000)
-#define GMT_D_1600(x)           ((x) & 0x00400000)
-#define GMT_D_800(x)            ((x) & 0x00200000)
-/* #define GMT_ ? 		((x) & 0x00100000) */
-/* #define GMT_ ? 		((x) & 0x00080000) */
-#define GMT_DR_OPEN(x)          ((x) & 0x00040000)  /* door open (no tape) */
-/* #define GMT_ ? 		((x) & 0x00020000) */
-#define GMT_IM_REP_EN(x)        ((x) & 0x00010000)  /* immediate report mode */
-#define GMT_CLN(x)              ((x) & 0x00008000)  /* cleaning requested */
-/* 15 generic status bits unused */
-
-
-/* SCSI-tape specific definitions */
-/* Bitfield shifts in the status  */
-#define MT_ST_BLKSIZE_SHIFT	0
-#define MT_ST_BLKSIZE_MASK	0xffffff
-#define MT_ST_DENSITY_SHIFT	24
-#define MT_ST_DENSITY_MASK	0xff000000
-
-#define MT_ST_SOFTERR_SHIFT	0
-#define MT_ST_SOFTERR_MASK	0xffff
-
-/* Bitfields for the MTSETDRVBUFFER ioctl */
-#define MT_ST_OPTIONS		0xf0000000
-#define MT_ST_BOOLEANS		0x10000000
-#define MT_ST_SETBOOLEANS	0x30000000
-#define MT_ST_CLEARBOOLEANS	0x40000000
-#define MT_ST_WRITE_THRESHOLD	0x20000000
-#define MT_ST_DEF_BLKSIZE	0x50000000
-#define MT_ST_DEF_OPTIONS	0x60000000
-#define MT_ST_TIMEOUTS		0x70000000
-#define MT_ST_SET_TIMEOUT	(MT_ST_TIMEOUTS | 0x000000)
-#define MT_ST_SET_LONG_TIMEOUT	(MT_ST_TIMEOUTS | 0x100000)
-#define MT_ST_SET_CLN		0x80000000
-
-#define MT_ST_BUFFER_WRITES	0x1
-#define MT_ST_ASYNC_WRITES	0x2
-#define MT_ST_READ_AHEAD	0x4
-#define MT_ST_DEBUGGING		0x8
-#define MT_ST_TWO_FM		0x10
-#define MT_ST_FAST_MTEOM	0x20
-#define MT_ST_AUTO_LOCK		0x40
-#define MT_ST_DEF_WRITES	0x80
-#define MT_ST_CAN_BSR		0x100
-#define MT_ST_NO_BLKLIMS	0x200
-#define MT_ST_CAN_PARTITIONS    0x400
-#define MT_ST_SCSI2LOGICAL      0x800
-#define MT_ST_SYSV              0x1000
-#define MT_ST_NOWAIT            0x2000
-#define MT_ST_SILI		0x4000
-#define MT_ST_NOWAIT_EOF	0x8000
-
-/* The mode parameters to be controlled. Parameter chosen with bits 20-28 */
-#define MT_ST_CLEAR_DEFAULT	0xfffff
-#define MT_ST_DEF_DENSITY	(MT_ST_DEF_OPTIONS | 0x100000)
-#define MT_ST_DEF_COMPRESSION	(MT_ST_DEF_OPTIONS | 0x200000)
-#define MT_ST_DEF_DRVBUFFER	(MT_ST_DEF_OPTIONS | 0x300000)
-
-/* The offset for the arguments for the special HP changer load command. */
-#define MT_ST_HPLOADER_OFFSET 10000
-
-#endif /* _LINUX_MTIO_H */
diff --git a/openflow/usr/include/linux/n_r3964.h b/openflow/usr/include/linux/n_r3964.h
deleted file mode 100644
index 168a0f9..0000000
--- a/openflow/usr/include/linux/n_r3964.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* r3964 linediscipline for linux
- *
- * -----------------------------------------------------------
- * Copyright by
- * Philips Automation Projects
- * Kassel (Germany)
- * -----------------------------------------------------------
- * This software may be used and distributed according to the terms of
- * the GNU General Public License, incorporated herein by reference.
- *
- * Author:
- * L. Haag
- *
- * $Log: r3964.h,v $
- * Revision 1.4  2005/12/21 19:54:24  Kurt Huwig <kurt huwig de>
- * Fixed HZ usage on 2.6 kernels
- * Removed unnecessary include
- *
- * Revision 1.3  2001/03/18 13:02:24  dwmw2
- * Fix timer usage, use spinlocks properly.
- *
- * Revision 1.2  2001/03/18 12:53:15  dwmw2
- * Merge changes in 2.4.2
- *
- * Revision 1.1.1.1  1998/10/13 16:43:14  dwmw2
- * This'll screw the version control
- *
- * Revision 1.6  1998/09/30 00:40:38  dwmw2
- * Updated to use kernel's N_R3964 if available
- *
- * Revision 1.4  1998/04/02 20:29:44  lhaag
- * select, blocking, ...
- *
- * Revision 1.3  1998/02/12 18:58:43  root
- * fixed some memory leaks
- * calculation of checksum characters
- *
- * Revision 1.2  1998/02/07 13:03:17  root
- * ioctl read_telegram
- *
- * Revision 1.1  1998/02/06 19:19:43  root
- * Initial revision
- *
- *
- */
-
-#ifndef __LINUX_N_R3964_H__
-#define __LINUX_N_R3964_H__
-
-/* line disciplines for r3964 protocol */
-
-
-/*
- * Ioctl-commands
- */
-
-#define R3964_ENABLE_SIGNALS      0x5301
-#define R3964_SETPRIORITY         0x5302
-#define R3964_USE_BCC             0x5303
-#define R3964_READ_TELEGRAM       0x5304
-
-/* Options for R3964_SETPRIORITY */
-#define R3964_MASTER   0
-#define R3964_SLAVE    1
-
-/* Options for R3964_ENABLE_SIGNALS */
-#define R3964_SIG_ACK   0x0001
-#define R3964_SIG_DATA  0x0002
-#define R3964_SIG_ALL   0x000f
-#define R3964_SIG_NONE  0x0000
-#define R3964_USE_SIGIO 0x1000
-
-/*
- * r3964 operation states:
- */
-
-/* types for msg_id: */
-enum {R3964_MSG_ACK=1, R3964_MSG_DATA };
-
-#define R3964_MAX_MSG_COUNT 32
-
-/* error codes for client messages */
-#define R3964_OK 0        /* no error. */
-#define R3964_TX_FAIL -1  /* transmission error, block NOT sent */
-#define R3964_OVERFLOW -2 /* msg queue overflow */
-
-/* the client gets this struct when calling read(fd,...): */
-struct r3964_client_message {
-	  int     msg_id;
-	  int     arg;
-	  int     error_code;
-};
-
-#define R3964_MTU      256
-
-
-
-#endif /* __LINUX_N_R3964_H__ */
diff --git a/openflow/usr/include/linux/nbd.h b/openflow/usr/include/linux/nbd.h
deleted file mode 100644
index c8cca35..0000000
--- a/openflow/usr/include/linux/nbd.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 1999 Copyright (C) Pavel Machek, pavel@ucw.cz. This code is GPL.
- * 1999/11/04 Copyright (C) 1999 VMware, Inc. (Regis "HPReg" Duchesne)
- *            Made nbd_end_request() use the io_request_lock
- * 2001 Copyright (C) Steven Whitehouse
- *            New nbd_end_request() for compatibility with new linux block
- *            layer code.
- * 2003/06/24 Louis D. Langholtz <ldl@aros.net>
- *            Removed unneeded blksize_bits field from nbd_device struct.
- *            Cleanup PARANOIA usage & code.
- * 2004/02/19 Paul Clements
- *            Removed PARANOIA, plus various cleanup and comments
- */
-
-#ifndef LINUX_NBD_H
-#define LINUX_NBD_H
-
-#include <linux/types.h>
-
-#define NBD_SET_SOCK	_IO( 0xab, 0 )
-#define NBD_SET_BLKSIZE	_IO( 0xab, 1 )
-#define NBD_SET_SIZE	_IO( 0xab, 2 )
-#define NBD_DO_IT	_IO( 0xab, 3 )
-#define NBD_CLEAR_SOCK	_IO( 0xab, 4 )
-#define NBD_CLEAR_QUE	_IO( 0xab, 5 )
-#define NBD_PRINT_DEBUG	_IO( 0xab, 6 )
-#define NBD_SET_SIZE_BLOCKS	_IO( 0xab, 7 )
-#define NBD_DISCONNECT  _IO( 0xab, 8 )
-#define NBD_SET_TIMEOUT _IO( 0xab, 9 )
-#define NBD_SET_FLAGS   _IO( 0xab, 10)
-
-enum {
-	NBD_CMD_READ = 0,
-	NBD_CMD_WRITE = 1,
-	NBD_CMD_DISC = 2,
-	NBD_CMD_FLUSH = 3,
-	NBD_CMD_TRIM = 4
-};
-
-/* values for flags field */
-#define NBD_FLAG_HAS_FLAGS    (1 << 0) /* nbd-server supports flags */
-#define NBD_FLAG_READ_ONLY    (1 << 1) /* device is read-only */
-#define NBD_FLAG_SEND_FLUSH   (1 << 2) /* can flush writeback cache */
-/* there is a gap here to match userspace */
-#define NBD_FLAG_SEND_TRIM    (1 << 5) /* send trim/discard */
-
-/* userspace doesn't need the nbd_device structure */
-
-/* These are sent over the network in the request/reply magic fields */
-
-#define NBD_REQUEST_MAGIC 0x25609513
-#define NBD_REPLY_MAGIC 0x67446698
-/* Do *not* use magics: 0x12560953 0x96744668. */
-
-/*
- * This is the packet used for communication between client and
- * server. All data are in network byte order.
- */
-struct nbd_request {
-	__be32 magic;
-	__be32 type;	/* == READ || == WRITE 	*/
-	char handle[8];
-	__be64 from;
-	__be32 len;
-} __attribute__((packed));
-
-/*
- * This is the reply packet that nbd-server sends back to the client after
- * it has completed an I/O request (or an error occurs).
- */
-struct nbd_reply {
-	__be32 magic;
-	__be32 error;		/* 0 = ok, else error	*/
-	char handle[8];		/* handle you got from request	*/
-};
-#endif /* LINUX_NBD_H */
diff --git a/openflow/usr/include/linux/ncp.h b/openflow/usr/include/linux/ncp.h
deleted file mode 100644
index 4482ad7..0000000
--- a/openflow/usr/include/linux/ncp.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- *  ncp.h
- *
- *  Copyright (C) 1995 by Volker Lendecke
- *  Modified for sparc by J.F. Chadima
- *  Modified for __constant_ntoh by Frank A. Vorstenbosch
- *
- */
-
-#ifndef _LINUX_NCP_H
-#define _LINUX_NCP_H
-
-#include <linux/types.h>
-
-#define NCP_PTYPE                (0x11)
-#define NCP_PORT                 (0x0451)
-
-#define NCP_ALLOC_SLOT_REQUEST   (0x1111)
-#define NCP_REQUEST              (0x2222)
-#define NCP_DEALLOC_SLOT_REQUEST (0x5555)
-
-struct ncp_request_header {
-	__u16 type;
-	__u8 sequence;
-	__u8 conn_low;
-	__u8 task;
-	__u8 conn_high;
-	__u8 function;
-	__u8 data[0];
-} __attribute__((packed));
-
-#define NCP_REPLY                (0x3333)
-#define NCP_WATCHDOG		 (0x3E3E)
-#define NCP_POSITIVE_ACK         (0x9999)
-
-struct ncp_reply_header {
-	__u16 type;
-	__u8 sequence;
-	__u8 conn_low;
-	__u8 task;
-	__u8 conn_high;
-	__u8 completion_code;
-	__u8 connection_state;
-	__u8 data[0];
-} __attribute__((packed));
-
-#define NCP_VOLNAME_LEN (16)
-#define NCP_NUMBER_OF_VOLUMES (256)
-struct ncp_volume_info {
-	__u32 total_blocks;
-	__u32 free_blocks;
-	__u32 purgeable_blocks;
-	__u32 not_yet_purgeable_blocks;
-	__u32 total_dir_entries;
-	__u32 available_dir_entries;
-	__u8 sectors_per_block;
-	char volume_name[NCP_VOLNAME_LEN + 1];
-};
-
-#define AR_READ      (cpu_to_le16(1))
-#define AR_WRITE     (cpu_to_le16(2))
-#define AR_EXCLUSIVE (cpu_to_le16(0x20))
-
-#define NCP_FILE_ID_LEN 6
-
-/* Defines for Name Spaces */
-#define NW_NS_DOS     0
-#define NW_NS_MAC     1
-#define NW_NS_NFS     2
-#define NW_NS_FTAM    3
-#define NW_NS_OS2     4
-
-/*  Defines for ReturnInformationMask */
-#define RIM_NAME	      (cpu_to_le32(1))
-#define RIM_SPACE_ALLOCATED   (cpu_to_le32(2))
-#define RIM_ATTRIBUTES	      (cpu_to_le32(4))
-#define RIM_DATA_SIZE	      (cpu_to_le32(8))
-#define RIM_TOTAL_SIZE	      (cpu_to_le32(0x10))
-#define RIM_EXT_ATTR_INFO     (cpu_to_le32(0x20))
-#define RIM_ARCHIVE	      (cpu_to_le32(0x40))
-#define RIM_MODIFY	      (cpu_to_le32(0x80))
-#define RIM_CREATION	      (cpu_to_le32(0x100))
-#define RIM_OWNING_NAMESPACE  (cpu_to_le32(0x200))
-#define RIM_DIRECTORY	      (cpu_to_le32(0x400))
-#define RIM_RIGHTS	      (cpu_to_le32(0x800))
-#define RIM_ALL 	      (cpu_to_le32(0xFFF))
-#define RIM_COMPRESSED_INFO   (cpu_to_le32(0x80000000))
-
-/* Defines for NSInfoBitMask */
-#define NSIBM_NFS_NAME		0x0001
-#define NSIBM_NFS_MODE		0x0002
-#define NSIBM_NFS_GID		0x0004
-#define NSIBM_NFS_NLINKS	0x0008
-#define NSIBM_NFS_RDEV		0x0010
-#define NSIBM_NFS_LINK		0x0020
-#define NSIBM_NFS_CREATED	0x0040
-#define NSIBM_NFS_UID		0x0080
-#define NSIBM_NFS_ACSFLAG	0x0100
-#define NSIBM_NFS_MYFLAG	0x0200
-
-/* open/create modes */
-#define OC_MODE_OPEN	  0x01
-#define OC_MODE_TRUNCATE  0x02
-#define OC_MODE_REPLACE   0x02
-#define OC_MODE_CREATE	  0x08
-
-/* open/create results */
-#define OC_ACTION_NONE	   0x00
-#define OC_ACTION_OPEN	   0x01
-#define OC_ACTION_CREATE   0x02
-#define OC_ACTION_TRUNCATE 0x04
-#define OC_ACTION_REPLACE  0x04
-
-/* access rights attributes */
-#ifndef AR_READ_ONLY
-#define AR_READ_ONLY	   0x0001
-#define AR_WRITE_ONLY	   0x0002
-#define AR_DENY_READ	   0x0004
-#define AR_DENY_WRITE	   0x0008
-#define AR_COMPATIBILITY   0x0010
-#define AR_WRITE_THROUGH   0x0040
-#define AR_OPEN_COMPRESSED 0x0100
-#endif
-
-struct nw_nfs_info {
-	__u32 mode;
-	__u32 rdev;
-};
-
-struct nw_info_struct {
-	__u32 spaceAlloc;
-	__le32 attributes;
-	__u16 flags;
-	__le32 dataStreamSize;
-	__le32 totalStreamSize;
-	__u16 numberOfStreams;
-	__le16 creationTime;
-	__le16 creationDate;
-	__u32 creatorID;
-	__le16 modifyTime;
-	__le16 modifyDate;
-	__u32 modifierID;
-	__le16 lastAccessDate;
-	__u16 archiveTime;
-	__u16 archiveDate;
-	__u32 archiverID;
-	__u16 inheritedRightsMask;
-	__le32 dirEntNum;
-	__le32 DosDirNum;
-	__u32 volNumber;
-	__u32 EADataSize;
-	__u32 EAKeyCount;
-	__u32 EAKeySize;
-	__u32 NSCreator;
-	__u8 nameLen;
-	__u8 entryName[256];
-	/* libncp may depend on there being nothing after entryName */
-} __attribute__((packed));
-
-/* modify mask - use with MODIFY_DOS_INFO structure */
-#define DM_ATTRIBUTES		  (cpu_to_le32(0x02))
-#define DM_CREATE_DATE		  (cpu_to_le32(0x04))
-#define DM_CREATE_TIME		  (cpu_to_le32(0x08))
-#define DM_CREATOR_ID		  (cpu_to_le32(0x10))
-#define DM_ARCHIVE_DATE 	  (cpu_to_le32(0x20))
-#define DM_ARCHIVE_TIME 	  (cpu_to_le32(0x40))
-#define DM_ARCHIVER_ID		  (cpu_to_le32(0x80))
-#define DM_MODIFY_DATE		  (cpu_to_le32(0x0100))
-#define DM_MODIFY_TIME		  (cpu_to_le32(0x0200))
-#define DM_MODIFIER_ID		  (cpu_to_le32(0x0400))
-#define DM_LAST_ACCESS_DATE	  (cpu_to_le32(0x0800))
-#define DM_INHERITED_RIGHTS_MASK  (cpu_to_le32(0x1000))
-#define DM_MAXIMUM_SPACE	  (cpu_to_le32(0x2000))
-
-struct nw_modify_dos_info {
-	__le32 attributes;
-	__le16 creationDate;
-	__le16 creationTime;
-	__u32 creatorID;
-	__le16 modifyDate;
-	__le16 modifyTime;
-	__u32 modifierID;
-	__u16 archiveDate;
-	__u16 archiveTime;
-	__u32 archiverID;
-	__le16 lastAccessDate;
-	__u16 inheritanceGrantMask;
-	__u16 inheritanceRevokeMask;
-	__u32 maximumSpace;
-} __attribute__((packed));
-
-struct nw_search_sequence {
-	__u8 volNumber;
-	__u32 dirBase;
-	__u32 sequence;
-} __attribute__((packed));
-
-#endif				/* _LINUX_NCP_H */
diff --git a/openflow/usr/include/linux/ncp_fs.h b/openflow/usr/include/linux/ncp_fs.h
deleted file mode 100644
index 9b84469..0000000
--- a/openflow/usr/include/linux/ncp_fs.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *  ncp_fs.h
- *
- *  Copyright (C) 1995, 1996 by Volker Lendecke
- *
- */
-
-#ifndef _LINUX_NCP_FS_H
-#define _LINUX_NCP_FS_H
-
-#include <linux/fs.h>
-#include <linux/in.h>
-#include <linux/types.h>
-#include <linux/magic.h>
-
-#include <linux/ipx.h>
-#include <linux/ncp_no.h>
-
-/*
- * ioctl commands
- */
-
-struct ncp_ioctl_request {
-	unsigned int function;
-	unsigned int size;
-	char *data;
-};
-
-struct ncp_fs_info {
-	int version;
-	struct sockaddr_ipx addr;
-	__kernel_uid_t mounted_uid;
-	int connection;		/* Connection number the server assigned us */
-	int buffer_size;	/* The negotiated buffer size, to be
-				   used for read/write requests! */
-
-	int volume_number;
-	__le32 directory_id;
-};
-
-struct ncp_fs_info_v2 {
-	int version;
-	unsigned long mounted_uid;
-	unsigned int connection;
-	unsigned int buffer_size;
-
-	unsigned int volume_number;
-	__le32 directory_id;
-
-	__u32 dummy1;
-	__u32 dummy2;
-	__u32 dummy3;
-};
-
-struct ncp_sign_init
-{
-	char sign_root[8];
-	char sign_last[16];
-};
-
-struct ncp_lock_ioctl
-{
-#define NCP_LOCK_LOG	0
-#define NCP_LOCK_SH	1
-#define NCP_LOCK_EX	2
-#define NCP_LOCK_CLEAR	256
-	int		cmd;
-	int		origin;
-	unsigned int	offset;
-	unsigned int	length;
-#define NCP_LOCK_DEFAULT_TIMEOUT	18
-#define NCP_LOCK_MAX_TIMEOUT		180
-	int		timeout;
-};
-
-struct ncp_setroot_ioctl
-{
-	int		volNumber;
-	int		namespace;
-	__le32		dirEntNum;
-};
-
-struct ncp_objectname_ioctl
-{
-#define NCP_AUTH_NONE	0x00
-#define NCP_AUTH_BIND	0x31
-#define NCP_AUTH_NDS	0x32
-	int		auth_type;
-	size_t		object_name_len;
-	void *	object_name;	/* a userspace data, in most cases user name */
-};
-
-struct ncp_privatedata_ioctl
-{
-	size_t		len;
-	void *	data;		/* ~1000 for NDS */
-};
-
-/* NLS charsets by ioctl */
-#define NCP_IOCSNAME_LEN 20
-struct ncp_nls_ioctl
-{
-	unsigned char codepage[NCP_IOCSNAME_LEN+1];
-	unsigned char iocharset[NCP_IOCSNAME_LEN+1];
-};
-
-#define	NCP_IOC_NCPREQUEST		_IOR('n', 1, struct ncp_ioctl_request)
-#define	NCP_IOC_GETMOUNTUID		_IOW('n', 2, __kernel_old_uid_t)
-#define NCP_IOC_GETMOUNTUID2		_IOW('n', 2, unsigned long)
-
-#define NCP_IOC_CONN_LOGGED_IN          _IO('n', 3)
-
-#define NCP_GET_FS_INFO_VERSION    (1)
-#define NCP_IOC_GET_FS_INFO             _IOWR('n', 4, struct ncp_fs_info)
-#define NCP_GET_FS_INFO_VERSION_V2 (2)
-#define NCP_IOC_GET_FS_INFO_V2		_IOWR('n', 4, struct ncp_fs_info_v2)
-
-#define NCP_IOC_SIGN_INIT		_IOR('n', 5, struct ncp_sign_init)
-#define NCP_IOC_SIGN_WANTED		_IOR('n', 6, int)
-#define NCP_IOC_SET_SIGN_WANTED		_IOW('n', 6, int)
-
-#define NCP_IOC_LOCKUNLOCK		_IOR('n', 7, struct ncp_lock_ioctl)
-
-#define NCP_IOC_GETROOT			_IOW('n', 8, struct ncp_setroot_ioctl)
-#define NCP_IOC_SETROOT			_IOR('n', 8, struct ncp_setroot_ioctl)
-
-#define NCP_IOC_GETOBJECTNAME		_IOWR('n', 9, struct ncp_objectname_ioctl)
-#define NCP_IOC_SETOBJECTNAME		_IOR('n', 9, struct ncp_objectname_ioctl)
-#define NCP_IOC_GETPRIVATEDATA		_IOWR('n', 10, struct ncp_privatedata_ioctl)
-#define NCP_IOC_SETPRIVATEDATA		_IOR('n', 10, struct ncp_privatedata_ioctl)
-
-#define NCP_IOC_GETCHARSETS		_IOWR('n', 11, struct ncp_nls_ioctl)
-#define NCP_IOC_SETCHARSETS		_IOR('n', 11, struct ncp_nls_ioctl)
-
-#define NCP_IOC_GETDENTRYTTL		_IOW('n', 12, __u32)
-#define NCP_IOC_SETDENTRYTTL		_IOR('n', 12, __u32)
-
-/*
- * The packet size to allocate. One page should be enough.
- */
-#define NCP_PACKET_SIZE 4070
-
-#define NCP_MAXPATHLEN 255
-#define NCP_MAXNAMELEN 14
-
-#endif				/* _LINUX_NCP_FS_H */
diff --git a/openflow/usr/include/linux/ncp_mount.h b/openflow/usr/include/linux/ncp_mount.h
deleted file mode 100644
index dfcbea2..0000000
--- a/openflow/usr/include/linux/ncp_mount.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  ncp_mount.h
- *
- *  Copyright (C) 1995, 1996 by Volker Lendecke
- *
- */
-
-#ifndef _LINUX_NCP_MOUNT_H
-#define _LINUX_NCP_MOUNT_H
-
-#include <linux/types.h>
-#include <linux/ncp.h>
-
-#define NCP_MOUNT_VERSION 3	/* Binary */
-
-/* Values for flags */
-#define NCP_MOUNT_SOFT		0x0001
-#define NCP_MOUNT_INTR		0x0002
-#define NCP_MOUNT_STRONG	0x0004	/* enable delete/rename of r/o files */
-#define NCP_MOUNT_NO_OS2	0x0008	/* do not use OS/2 (LONG) namespace */
-#define NCP_MOUNT_NO_NFS	0x0010	/* do not use NFS namespace */
-#define NCP_MOUNT_EXTRAS	0x0020
-#define NCP_MOUNT_SYMLINKS	0x0040	/* enable symlinks */
-#define NCP_MOUNT_NFS_EXTRAS	0x0080	/* Enable use of NFS NS meta-info */
-
-struct ncp_mount_data {
-	int version;
-	unsigned int ncp_fd;	/* The socket to the ncp port */
-	__kernel_uid_t mounted_uid;	/* Who may umount() this filesystem? */
-	__kernel_pid_t wdog_pid;		/* Who cares for our watchdog packets? */
-
-	unsigned char mounted_vol[NCP_VOLNAME_LEN + 1];
-	unsigned int time_out;	/* How long should I wait after
-				   sending a NCP request? */
-	unsigned int retry_count;	/* And how often should I retry? */
-	unsigned int flags;
-
-	__kernel_uid_t uid;
-	__kernel_gid_t gid;
-	__kernel_mode_t file_mode;
-	__kernel_mode_t dir_mode;
-};
-
-#define NCP_MOUNT_VERSION_V4	(4)	/* Binary or text */
-
-struct ncp_mount_data_v4 {
-	int version;
-	unsigned long flags;	/* NCP_MOUNT_* flags */
-	/* MIPS uses long __kernel_uid_t, but... */
-	/* we neever pass -1, so it is safe */
-	unsigned long mounted_uid;	/* Who may umount() this filesystem? */
-	/* MIPS uses long __kernel_pid_t */
-	long wdog_pid;		/* Who cares for our watchdog packets? */
-
-	unsigned int ncp_fd;	/* The socket to the ncp port */
-	unsigned int time_out;	/* How long should I wait after
-				   sending a NCP request? */
-	unsigned int retry_count;	/* And how often should I retry? */
-
-	/* MIPS uses long __kernel_uid_t... */
-	/* we never pass -1, so it is safe */
-	unsigned long uid;
-	unsigned long gid;
-	/* MIPS uses unsigned long __kernel_mode_t */
-	unsigned long file_mode;
-	unsigned long dir_mode;
-};
-
-#define NCP_MOUNT_VERSION_V5	(5)	/* Text only */
-
-#endif
diff --git a/openflow/usr/include/linux/ncp_no.h b/openflow/usr/include/linux/ncp_no.h
deleted file mode 100644
index cddaa48..0000000
--- a/openflow/usr/include/linux/ncp_no.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _NCP_NO
-#define _NCP_NO
-
-/* these define the attribute byte as seen by NCP */
-#define aRONLY			(__cpu_to_le32(1))
-#define aHIDDEN			(__cpu_to_le32(2))
-#define aSYSTEM			(__cpu_to_le32(4))
-#define aEXECUTE		(__cpu_to_le32(8))
-#define aDIR			(__cpu_to_le32(0x10))
-#define aARCH			(__cpu_to_le32(0x20))
-#define aSHARED			(__cpu_to_le32(0x80))
-#define aDONTSUBALLOCATE	(__cpu_to_le32(1L<<11))
-#define aTRANSACTIONAL		(__cpu_to_le32(1L<<12))
-#define aPURGE			(__cpu_to_le32(1L<<16))
-#define aRENAMEINHIBIT		(__cpu_to_le32(1L<<17))
-#define aDELETEINHIBIT		(__cpu_to_le32(1L<<18))
-#define aDONTCOMPRESS		(__cpu_to_le32(1L<<27))
-
-#endif /* _NCP_NO */
diff --git a/openflow/usr/include/linux/ndctl.h b/openflow/usr/include/linux/ndctl.h
deleted file mode 100644
index 076cc92..0000000
--- a/openflow/usr/include/linux/ndctl.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2014-2015, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
- * more details.
- */
-#ifndef __NDCTL_H__
-#define __NDCTL_H__
-
-#include <linux/types.h>
-
-struct nd_cmd_smart {
-	__u32 status;
-	__u8 data[128];
-} __attribute__((packed));
-
-struct nd_cmd_smart_threshold {
-	__u32 status;
-	__u8 data[8];
-} __attribute__((packed));
-
-struct nd_cmd_dimm_flags {
-	__u32 status;
-	__u32 flags;
-} __attribute__((packed));
-
-struct nd_cmd_get_config_size {
-	__u32 status;
-	__u32 config_size;
-	__u32 max_xfer;
-} __attribute__((packed));
-
-struct nd_cmd_get_config_data_hdr {
-	__u32 in_offset;
-	__u32 in_length;
-	__u32 status;
-	__u8 out_buf[0];
-} __attribute__((packed));
-
-struct nd_cmd_set_config_hdr {
-	__u32 in_offset;
-	__u32 in_length;
-	__u8 in_buf[0];
-} __attribute__((packed));
-
-struct nd_cmd_vendor_hdr {
-	__u32 opcode;
-	__u32 in_length;
-	__u8 in_buf[0];
-} __attribute__((packed));
-
-struct nd_cmd_vendor_tail {
-	__u32 status;
-	__u32 out_length;
-	__u8 out_buf[0];
-} __attribute__((packed));
-
-struct nd_cmd_ars_cap {
-	__u64 address;
-	__u64 length;
-	__u32 status;
-	__u32 max_ars_out;
-} __attribute__((packed));
-
-struct nd_cmd_ars_start {
-	__u64 address;
-	__u64 length;
-	__u16 type;
-	__u8 reserved[6];
-	__u32 status;
-} __attribute__((packed));
-
-struct nd_cmd_ars_status {
-	__u32 status;
-	__u32 out_length;
-	__u64 address;
-	__u64 length;
-	__u16 type;
-	__u32 num_records;
-	struct nd_ars_record {
-		__u32 handle;
-		__u32 flags;
-		__u64 err_address;
-		__u64 length;
-	} __attribute__((packed)) records[0];
-} __attribute__((packed));
-
-enum {
-	ND_CMD_IMPLEMENTED = 0,
-
-	/* bus commands */
-	ND_CMD_ARS_CAP = 1,
-	ND_CMD_ARS_START = 2,
-	ND_CMD_ARS_STATUS = 3,
-
-	/* per-dimm commands */
-	ND_CMD_SMART = 1,
-	ND_CMD_SMART_THRESHOLD = 2,
-	ND_CMD_DIMM_FLAGS = 3,
-	ND_CMD_GET_CONFIG_SIZE = 4,
-	ND_CMD_GET_CONFIG_DATA = 5,
-	ND_CMD_SET_CONFIG_DATA = 6,
-	ND_CMD_VENDOR_EFFECT_LOG_SIZE = 7,
-	ND_CMD_VENDOR_EFFECT_LOG = 8,
-	ND_CMD_VENDOR = 9,
-};
-
-enum {
-	ND_ARS_VOLATILE = 1,
-	ND_ARS_PERSISTENT = 2,
-};
-
-static __inline__ const char *nvdimm_bus_cmd_name(unsigned cmd)
-{
-	static const char * const names[] = {
-		[ND_CMD_ARS_CAP] = "ars_cap",
-		[ND_CMD_ARS_START] = "ars_start",
-		[ND_CMD_ARS_STATUS] = "ars_status",
-	};
-
-	if (cmd < ARRAY_SIZE(names) && names[cmd])
-		return names[cmd];
-	return "unknown";
-}
-
-static __inline__ const char *nvdimm_cmd_name(unsigned cmd)
-{
-	static const char * const names[] = {
-		[ND_CMD_SMART] = "smart",
-		[ND_CMD_SMART_THRESHOLD] = "smart_thresh",
-		[ND_CMD_DIMM_FLAGS] = "flags",
-		[ND_CMD_GET_CONFIG_SIZE] = "get_size",
-		[ND_CMD_GET_CONFIG_DATA] = "get_data",
-		[ND_CMD_SET_CONFIG_DATA] = "set_data",
-		[ND_CMD_VENDOR_EFFECT_LOG_SIZE] = "effect_size",
-		[ND_CMD_VENDOR_EFFECT_LOG] = "effect_log",
-		[ND_CMD_VENDOR] = "vendor",
-	};
-
-	if (cmd < ARRAY_SIZE(names) && names[cmd])
-		return names[cmd];
-	return "unknown";
-}
-
-#define ND_IOCTL 'N'
-
-#define ND_IOCTL_SMART			_IOWR(ND_IOCTL, ND_CMD_SMART,\
-					struct nd_cmd_smart)
-
-#define ND_IOCTL_SMART_THRESHOLD	_IOWR(ND_IOCTL, ND_CMD_SMART_THRESHOLD,\
-					struct nd_cmd_smart_threshold)
-
-#define ND_IOCTL_DIMM_FLAGS		_IOWR(ND_IOCTL, ND_CMD_DIMM_FLAGS,\
-					struct nd_cmd_dimm_flags)
-
-#define ND_IOCTL_GET_CONFIG_SIZE	_IOWR(ND_IOCTL, ND_CMD_GET_CONFIG_SIZE,\
-					struct nd_cmd_get_config_size)
-
-#define ND_IOCTL_GET_CONFIG_DATA	_IOWR(ND_IOCTL, ND_CMD_GET_CONFIG_DATA,\
-					struct nd_cmd_get_config_data_hdr)
-
-#define ND_IOCTL_SET_CONFIG_DATA	_IOWR(ND_IOCTL, ND_CMD_SET_CONFIG_DATA,\
-					struct nd_cmd_set_config_hdr)
-
-#define ND_IOCTL_VENDOR			_IOWR(ND_IOCTL, ND_CMD_VENDOR,\
-					struct nd_cmd_vendor_hdr)
-
-#define ND_IOCTL_ARS_CAP		_IOWR(ND_IOCTL, ND_CMD_ARS_CAP,\
-					struct nd_cmd_ars_cap)
-
-#define ND_IOCTL_ARS_START		_IOWR(ND_IOCTL, ND_CMD_ARS_START,\
-					struct nd_cmd_ars_start)
-
-#define ND_IOCTL_ARS_STATUS		_IOWR(ND_IOCTL, ND_CMD_ARS_STATUS,\
-					struct nd_cmd_ars_status)
-
-#define ND_DEVICE_DIMM 1            /* nd_dimm: container for "config data" */
-#define ND_DEVICE_REGION_PMEM 2     /* nd_region: (parent of PMEM namespaces) */
-#define ND_DEVICE_REGION_BLK 3      /* nd_region: (parent of BLK namespaces) */
-#define ND_DEVICE_NAMESPACE_IO 4    /* legacy persistent memory */
-#define ND_DEVICE_NAMESPACE_PMEM 5  /* PMEM namespace (may alias with BLK) */
-#define ND_DEVICE_NAMESPACE_BLK 6   /* BLK namespace (may alias with PMEM) */
-
-enum nd_driver_flags {
-	ND_DRIVER_DIMM            = 1 << ND_DEVICE_DIMM,
-	ND_DRIVER_REGION_PMEM     = 1 << ND_DEVICE_REGION_PMEM,
-	ND_DRIVER_REGION_BLK      = 1 << ND_DEVICE_REGION_BLK,
-	ND_DRIVER_NAMESPACE_IO    = 1 << ND_DEVICE_NAMESPACE_IO,
-	ND_DRIVER_NAMESPACE_PMEM  = 1 << ND_DEVICE_NAMESPACE_PMEM,
-	ND_DRIVER_NAMESPACE_BLK   = 1 << ND_DEVICE_NAMESPACE_BLK,
-};
-
-enum {
-	ND_MIN_NAMESPACE_SIZE = 0x00400000,
-};
-
-enum ars_masks {
-	ARS_STATUS_MASK = 0x0000FFFF,
-	ARS_EXT_STATUS_SHIFT = 16,
-};
-#endif /* __NDCTL_H__ */
diff --git a/openflow/usr/include/linux/neighbour.h b/openflow/usr/include/linux/neighbour.h
deleted file mode 100644
index 788655b..0000000
--- a/openflow/usr/include/linux/neighbour.h
+++ /dev/null
@@ -1,167 +0,0 @@
-#ifndef __LINUX_NEIGHBOUR_H
-#define __LINUX_NEIGHBOUR_H
-
-#include <linux/types.h>
-#include <linux/netlink.h>
-
-struct ndmsg {
-	__u8		ndm_family;
-	__u8		ndm_pad1;
-	__u16		ndm_pad2;
-	__s32		ndm_ifindex;
-	__u16		ndm_state;
-	__u8		ndm_flags;
-	__u8		ndm_type;
-};
-
-enum {
-	NDA_UNSPEC,
-	NDA_DST,
-	NDA_LLADDR,
-	NDA_CACHEINFO,
-	NDA_PROBES,
-	NDA_VLAN,
-	NDA_PORT,
-	NDA_VNI,
-	NDA_IFINDEX,
-	NDA_MASTER,
-	NDA_LINK_NETNSID,
-	__NDA_MAX
-};
-
-#define NDA_MAX (__NDA_MAX - 1)
-
-/*
- *	Neighbor Cache Entry Flags
- */
-
-#define NTF_USE		0x01
-#define NTF_SELF	0x02
-#define NTF_MASTER	0x04
-#define NTF_PROXY	0x08	/* == ATF_PUBL */
-#define NTF_EXT_LEARNED	0x10
-#define NTF_ROUTER	0x80
-
-/*
- *	Neighbor Cache Entry States.
- */
-
-#define NUD_INCOMPLETE	0x01
-#define NUD_REACHABLE	0x02
-#define NUD_STALE	0x04
-#define NUD_DELAY	0x08
-#define NUD_PROBE	0x10
-#define NUD_FAILED	0x20
-
-/* Dummy states */
-#define NUD_NOARP	0x40
-#define NUD_PERMANENT	0x80
-#define NUD_NONE	0x00
-
-/* NUD_NOARP & NUD_PERMANENT are pseudostates, they never change
-   and make no address resolution or NUD.
-   NUD_PERMANENT also cannot be deleted by garbage collectors.
- */
-
-struct nda_cacheinfo {
-	__u32		ndm_confirmed;
-	__u32		ndm_used;
-	__u32		ndm_updated;
-	__u32		ndm_refcnt;
-};
-
-/*****************************************************************
- *		Neighbour tables specific messages.
- *
- * To retrieve the neighbour tables send RTM_GETNEIGHTBL with the
- * NLM_F_DUMP flag set. Every neighbour table configuration is
- * spread over multiple messages to avoid running into message
- * size limits on systems with many interfaces. The first message
- * in the sequence transports all not device specific data such as
- * statistics, configuration, and the default parameter set.
- * This message is followed by 0..n messages carrying device
- * specific parameter sets.
- * Although the ordering should be sufficient, NDTA_NAME can be
- * used to identify sequences. The initial message can be identified
- * by checking for NDTA_CONFIG. The device specific messages do
- * not contain this TLV but have NDTPA_IFINDEX set to the
- * corresponding interface index.
- *
- * To change neighbour table attributes, send RTM_SETNEIGHTBL
- * with NDTA_NAME set. Changeable attribute include NDTA_THRESH[1-3],
- * NDTA_GC_INTERVAL, and all TLVs in NDTA_PARMS unless marked
- * otherwise. Device specific parameter sets can be changed by
- * setting NDTPA_IFINDEX to the interface index of the corresponding
- * device.
- ****/
-
-struct ndt_stats {
-	__u64		ndts_allocs;
-	__u64		ndts_destroys;
-	__u64		ndts_hash_grows;
-	__u64		ndts_res_failed;
-	__u64		ndts_lookups;
-	__u64		ndts_hits;
-	__u64		ndts_rcv_probes_mcast;
-	__u64		ndts_rcv_probes_ucast;
-	__u64		ndts_periodic_gc_runs;
-	__u64		ndts_forced_gc_runs;
-	__u64		ndts_table_fulls;
-};
-
-enum {
-	NDTPA_UNSPEC,
-	NDTPA_IFINDEX,			/* u32, unchangeable */
-	NDTPA_REFCNT,			/* u32, read-only */
-	NDTPA_REACHABLE_TIME,		/* u64, read-only, msecs */
-	NDTPA_BASE_REACHABLE_TIME,	/* u64, msecs */
-	NDTPA_RETRANS_TIME,		/* u64, msecs */
-	NDTPA_GC_STALETIME,		/* u64, msecs */
-	NDTPA_DELAY_PROBE_TIME,		/* u64, msecs */
-	NDTPA_QUEUE_LEN,		/* u32 */
-	NDTPA_APP_PROBES,		/* u32 */
-	NDTPA_UCAST_PROBES,		/* u32 */
-	NDTPA_MCAST_PROBES,		/* u32 */
-	NDTPA_ANYCAST_DELAY,		/* u64, msecs */
-	NDTPA_PROXY_DELAY,		/* u64, msecs */
-	NDTPA_PROXY_QLEN,		/* u32 */
-	NDTPA_LOCKTIME,			/* u64, msecs */
-	NDTPA_QUEUE_LENBYTES,		/* u32 */
-	NDTPA_MCAST_REPROBES,		/* u32 */
-	__NDTPA_MAX
-};
-#define NDTPA_MAX (__NDTPA_MAX - 1)
-
-struct ndtmsg {
-	__u8		ndtm_family;
-	__u8		ndtm_pad1;
-	__u16		ndtm_pad2;
-};
-
-struct ndt_config {
-	__u16		ndtc_key_len;
-	__u16		ndtc_entry_size;
-	__u32		ndtc_entries;
-	__u32		ndtc_last_flush;	/* delta to now in msecs */
-	__u32		ndtc_last_rand;		/* delta to now in msecs */
-	__u32		ndtc_hash_rnd;
-	__u32		ndtc_hash_mask;
-	__u32		ndtc_hash_chain_gc;
-	__u32		ndtc_proxy_qlen;
-};
-
-enum {
-	NDTA_UNSPEC,
-	NDTA_NAME,			/* char *, unchangeable */
-	NDTA_THRESH1,			/* u32 */
-	NDTA_THRESH2,			/* u32 */
-	NDTA_THRESH3,			/* u32 */
-	NDTA_CONFIG,			/* struct ndt_config, read-only */
-	NDTA_PARMS,			/* nested TLV NDTPA_* */
-	NDTA_STATS,			/* struct ndt_stats, read-only */
-	NDTA_GC_INTERVAL,		/* u64, msecs */
-	__NDTA_MAX
-};
-#define NDTA_MAX (__NDTA_MAX - 1)
-
-#endif
diff --git a/openflow/usr/include/linux/net.h b/openflow/usr/include/linux/net.h
deleted file mode 100644
index 24eaec3..0000000
--- a/openflow/usr/include/linux/net.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * NET		An implementation of the SOCKET network access protocol.
- *		This is the master header file for the Linux NET layer,
- *		or, in plain English: the networking handling part of the
- *		kernel.
- *
- * Version:	@(#)net.h	1.0.3	05/25/93
- *
- * Authors:	Orest Zborowski, <obz@Kodak.COM>
- *		Ross Biro
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_NET_H
-#define _LINUX_NET_H
-
-#include <linux/socket.h>
-#include <asm/socket.h>
-
-#define NPROTO		AF_MAX
-
-#define SYS_SOCKET	1		/* sys_socket(2)		*/
-#define SYS_BIND	2		/* sys_bind(2)			*/
-#define SYS_CONNECT	3		/* sys_connect(2)		*/
-#define SYS_LISTEN	4		/* sys_listen(2)		*/
-#define SYS_ACCEPT	5		/* sys_accept(2)		*/
-#define SYS_GETSOCKNAME	6		/* sys_getsockname(2)		*/
-#define SYS_GETPEERNAME	7		/* sys_getpeername(2)		*/
-#define SYS_SOCKETPAIR	8		/* sys_socketpair(2)		*/
-#define SYS_SEND	9		/* sys_send(2)			*/
-#define SYS_RECV	10		/* sys_recv(2)			*/
-#define SYS_SENDTO	11		/* sys_sendto(2)		*/
-#define SYS_RECVFROM	12		/* sys_recvfrom(2)		*/
-#define SYS_SHUTDOWN	13		/* sys_shutdown(2)		*/
-#define SYS_SETSOCKOPT	14		/* sys_setsockopt(2)		*/
-#define SYS_GETSOCKOPT	15		/* sys_getsockopt(2)		*/
-#define SYS_SENDMSG	16		/* sys_sendmsg(2)		*/
-#define SYS_RECVMSG	17		/* sys_recvmsg(2)		*/
-#define SYS_ACCEPT4	18		/* sys_accept4(2)		*/
-#define SYS_RECVMMSG	19		/* sys_recvmmsg(2)		*/
-#define SYS_SENDMMSG	20		/* sys_sendmmsg(2)		*/
-
-typedef enum {
-	SS_FREE = 0,			/* not allocated		*/
-	SS_UNCONNECTED,			/* unconnected to any socket	*/
-	SS_CONNECTING,			/* in process of connecting	*/
-	SS_CONNECTED,			/* connected to socket		*/
-	SS_DISCONNECTING		/* in process of disconnecting	*/
-} socket_state;
-
-#define __SO_ACCEPTCON	(1 << 16)	/* performed a listen		*/
-
-#endif /* _LINUX_NET_H */
diff --git a/openflow/usr/include/linux/net_dropmon.h b/openflow/usr/include/linux/net_dropmon.h
deleted file mode 100644
index 2a73946..0000000
--- a/openflow/usr/include/linux/net_dropmon.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef __NET_DROPMON_H
-#define __NET_DROPMON_H
-
-#include <linux/types.h>
-#include <linux/netlink.h>
-
-struct net_dm_drop_point {
-	__u8 pc[8];
-	__u32 count;
-};
-
-#define is_drop_point_hw(x) do {\
-	int ____i, ____j;\
-	for (____i = 0; ____i < 8; i ____i++)\
-		____j |= x[____i];\
-	____j;\
-} while (0)
-
-#define NET_DM_CFG_VERSION  0
-#define NET_DM_CFG_ALERT_COUNT  1
-#define NET_DM_CFG_ALERT_DELAY 2
-#define NET_DM_CFG_MAX 3
-
-struct net_dm_config_entry {
-	__u32 type;
-	__u64 data __attribute__((aligned(8)));
-};
-
-struct net_dm_config_msg {
-	__u32 entries;
-	struct net_dm_config_entry options[0];
-};
-
-struct net_dm_alert_msg {
-	__u32 entries;
-	struct net_dm_drop_point points[0];
-};
-
-struct net_dm_user_msg {
-	union {
-		struct net_dm_config_msg user;
-		struct net_dm_alert_msg alert;
-	} u;
-};
-
-
-/* These are the netlink message types for this protocol */
-
-enum {
-	NET_DM_CMD_UNSPEC = 0,
-	NET_DM_CMD_ALERT,
-	NET_DM_CMD_CONFIG,
-	NET_DM_CMD_START,
-	NET_DM_CMD_STOP,
-	_NET_DM_CMD_MAX,
-};
-
-#define NET_DM_CMD_MAX (_NET_DM_CMD_MAX - 1)
-
-/*
- * Our group identifiers
- */
-#define NET_DM_GRP_ALERT 1
-#endif
diff --git a/openflow/usr/include/linux/net_namespace.h b/openflow/usr/include/linux/net_namespace.h
deleted file mode 100644
index 9a92b7e..0000000
--- a/openflow/usr/include/linux/net_namespace.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (c) 2015 6WIND S.A.
- * Author: Nicolas Dichtel <nicolas.dichtel@6wind.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- */
-#ifndef _LINUX_NET_NAMESPACE_H_
-#define _LINUX_NET_NAMESPACE_H_
-
-/* Attributes of RTM_NEWNSID/RTM_GETNSID messages */
-enum {
-	NETNSA_NONE,
-#define NETNSA_NSID_NOT_ASSIGNED -1
-	NETNSA_NSID,
-	NETNSA_PID,
-	NETNSA_FD,
-	__NETNSA_MAX,
-};
-
-#define NETNSA_MAX		(__NETNSA_MAX - 1)
-
-#endif /* _LINUX_NET_NAMESPACE_H_ */
diff --git a/openflow/usr/include/linux/net_tstamp.h b/openflow/usr/include/linux/net_tstamp.h
deleted file mode 100644
index 6d1abea..0000000
--- a/openflow/usr/include/linux/net_tstamp.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Userspace API for hardware time stamping of network packets
- *
- * Copyright (C) 2008,2009 Intel Corporation
- * Author: Patrick Ohly <patrick.ohly@intel.com>
- *
- */
-
-#ifndef _NET_TIMESTAMPING_H
-#define _NET_TIMESTAMPING_H
-
-#include <linux/socket.h>   /* for SO_TIMESTAMPING */
-
-/* SO_TIMESTAMPING gets an integer bit field comprised of these values */
-enum {
-	SOF_TIMESTAMPING_TX_HARDWARE = (1<<0),
-	SOF_TIMESTAMPING_TX_SOFTWARE = (1<<1),
-	SOF_TIMESTAMPING_RX_HARDWARE = (1<<2),
-	SOF_TIMESTAMPING_RX_SOFTWARE = (1<<3),
-	SOF_TIMESTAMPING_SOFTWARE = (1<<4),
-	SOF_TIMESTAMPING_SYS_HARDWARE = (1<<5),
-	SOF_TIMESTAMPING_RAW_HARDWARE = (1<<6),
-	SOF_TIMESTAMPING_OPT_ID = (1<<7),
-	SOF_TIMESTAMPING_TX_SCHED = (1<<8),
-	SOF_TIMESTAMPING_TX_ACK = (1<<9),
-	SOF_TIMESTAMPING_OPT_CMSG = (1<<10),
-	SOF_TIMESTAMPING_OPT_TSONLY = (1<<11),
-
-	SOF_TIMESTAMPING_LAST = SOF_TIMESTAMPING_OPT_TSONLY,
-	SOF_TIMESTAMPING_MASK = (SOF_TIMESTAMPING_LAST - 1) |
-				 SOF_TIMESTAMPING_LAST
-};
-
-/**
- * struct hwtstamp_config - %SIOCGHWTSTAMP and %SIOCSHWTSTAMP parameter
- *
- * @flags:	no flags defined right now, must be zero for %SIOCSHWTSTAMP
- * @tx_type:	one of HWTSTAMP_TX_*
- * @rx_filter:	one of HWTSTAMP_FILTER_*
- *
- * %SIOCGHWTSTAMP and %SIOCSHWTSTAMP expect a &struct ifreq with a
- * ifr_data pointer to this structure.  For %SIOCSHWTSTAMP, if the
- * driver or hardware does not support the requested @rx_filter value,
- * the driver may use a more general filter mode.  In this case
- * @rx_filter will indicate the actual mode on return.
- */
-struct hwtstamp_config {
-	int flags;
-	int tx_type;
-	int rx_filter;
-};
-
-/* possible values for hwtstamp_config->tx_type */
-enum hwtstamp_tx_types {
-	/*
-	 * No outgoing packet will need hardware time stamping;
-	 * should a packet arrive which asks for it, no hardware
-	 * time stamping will be done.
-	 */
-	HWTSTAMP_TX_OFF,
-
-	/*
-	 * Enables hardware time stamping for outgoing packets;
-	 * the sender of the packet decides which are to be
-	 * time stamped by setting %SOF_TIMESTAMPING_TX_SOFTWARE
-	 * before sending the packet.
-	 */
-	HWTSTAMP_TX_ON,
-
-	/*
-	 * Enables time stamping for outgoing packets just as
-	 * HWTSTAMP_TX_ON does, but also enables time stamp insertion
-	 * directly into Sync packets. In this case, transmitted Sync
-	 * packets will not received a time stamp via the socket error
-	 * queue.
-	 */
-	HWTSTAMP_TX_ONESTEP_SYNC,
-};
-
-/* possible values for hwtstamp_config->rx_filter */
-enum hwtstamp_rx_filters {
-	/* time stamp no incoming packet at all */
-	HWTSTAMP_FILTER_NONE,
-
-	/* time stamp any incoming packet */
-	HWTSTAMP_FILTER_ALL,
-
-	/* return value: time stamp all packets requested plus some others */
-	HWTSTAMP_FILTER_SOME,
-
-	/* PTP v1, UDP, any kind of event packet */
-	HWTSTAMP_FILTER_PTP_V1_L4_EVENT,
-	/* PTP v1, UDP, Sync packet */
-	HWTSTAMP_FILTER_PTP_V1_L4_SYNC,
-	/* PTP v1, UDP, Delay_req packet */
-	HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ,
-	/* PTP v2, UDP, any kind of event packet */
-	HWTSTAMP_FILTER_PTP_V2_L4_EVENT,
-	/* PTP v2, UDP, Sync packet */
-	HWTSTAMP_FILTER_PTP_V2_L4_SYNC,
-	/* PTP v2, UDP, Delay_req packet */
-	HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ,
-
-	/* 802.AS1, Ethernet, any kind of event packet */
-	HWTSTAMP_FILTER_PTP_V2_L2_EVENT,
-	/* 802.AS1, Ethernet, Sync packet */
-	HWTSTAMP_FILTER_PTP_V2_L2_SYNC,
-	/* 802.AS1, Ethernet, Delay_req packet */
-	HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ,
-
-	/* PTP v2/802.AS1, any layer, any kind of event packet */
-	HWTSTAMP_FILTER_PTP_V2_EVENT,
-	/* PTP v2/802.AS1, any layer, Sync packet */
-	HWTSTAMP_FILTER_PTP_V2_SYNC,
-	/* PTP v2/802.AS1, any layer, Delay_req packet */
-	HWTSTAMP_FILTER_PTP_V2_DELAY_REQ,
-};
-
-#endif /* _NET_TIMESTAMPING_H */
diff --git a/openflow/usr/include/linux/netconf.h b/openflow/usr/include/linux/netconf.h
deleted file mode 100644
index 7210fe4..0000000
--- a/openflow/usr/include/linux/netconf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _LINUX_NETCONF_H_
-#define _LINUX_NETCONF_H_
-
-#include <linux/types.h>
-#include <linux/netlink.h>
-
-struct netconfmsg {
-	__u8	ncm_family;
-};
-
-enum {
-	NETCONFA_UNSPEC,
-	NETCONFA_IFINDEX,
-	NETCONFA_FORWARDING,
-	NETCONFA_RP_FILTER,
-	NETCONFA_MC_FORWARDING,
-	NETCONFA_PROXY_NEIGH,
-	NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,
-	__NETCONFA_MAX
-};
-#define NETCONFA_MAX	(__NETCONFA_MAX - 1)
-
-#define NETCONFA_IFINDEX_ALL		-1
-#define NETCONFA_IFINDEX_DEFAULT	-2
-
-#endif /* _LINUX_NETCONF_H_ */
diff --git a/openflow/usr/include/linux/netdevice.h b/openflow/usr/include/linux/netdevice.h
deleted file mode 100644
index 66fceb4..0000000
--- a/openflow/usr/include/linux/netdevice.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Definitions for the Interfaces handler.
- *
- * Version:	@(#)dev.h	1.0.10	08/12/93
- *
- * Authors:	Ross Biro
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *		Corey Minyard <wf-rch!minyard@relay.EU.net>
- *		Donald J. Becker, <becker@cesdis.gsfc.nasa.gov>
- *		Alan Cox, <alan@lxorguk.ukuu.org.uk>
- *		Bjorn Ekwall. <bj0rn@blox.se>
- *              Pekka Riikonen <priikone@poseidon.pspt.fi>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- *		Moved to /usr/include/linux for NET3
- */
-#ifndef _LINUX_NETDEVICE_H
-#define _LINUX_NETDEVICE_H
-
-#include <linux/if.h>
-#include <linux/if_ether.h>
-#include <linux/if_packet.h>
-#include <linux/if_link.h>
-
-
-#define MAX_ADDR_LEN	32		/* Largest hardware address length */
-
-/* Initial net device group. All devices belong to group 0 by default. */
-#define INIT_NETDEV_GROUP	0
-
-
-/* interface name assignment types (sysfs name_assign_type attribute) */
-#define NET_NAME_UNKNOWN	0	/* unknown origin (not exposed to userspace) */
-#define NET_NAME_ENUM		1	/* enumerated by kernel */
-#define NET_NAME_PREDICTABLE	2	/* predictably named by the kernel */
-#define NET_NAME_USER		3	/* provided by user-space */
-#define NET_NAME_RENAMED	4	/* renamed by user-space */
-
-/* Media selection options. */
-enum {
-        IF_PORT_UNKNOWN = 0,
-        IF_PORT_10BASE2,
-        IF_PORT_10BASET,
-        IF_PORT_AUI,
-        IF_PORT_100BASET,
-        IF_PORT_100BASETX,
-        IF_PORT_100BASEFX
-};
-
-/* hardware address assignment types */
-#define NET_ADDR_PERM		0	/* address is permanent (default) */
-#define NET_ADDR_RANDOM		1	/* address is generated randomly */
-#define NET_ADDR_STOLEN		2	/* address is stolen from other device */
-#define NET_ADDR_SET		3	/* address is set using
-					 * dev_set_mac_address() */
-
-#endif /* _LINUX_NETDEVICE_H */
diff --git a/openflow/usr/include/linux/netfilter.h b/openflow/usr/include/linux/netfilter.h
deleted file mode 100644
index b71b4c9..0000000
--- a/openflow/usr/include/linux/netfilter.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef __LINUX_NETFILTER_H
-#define __LINUX_NETFILTER_H
-
-#include <linux/types.h>
-
-#include <linux/sysctl.h>
-#include <linux/in.h>
-#include <linux/in6.h>
-
-/* Responses from hook functions. */
-#define NF_DROP 0
-#define NF_ACCEPT 1
-#define NF_STOLEN 2
-#define NF_QUEUE 3
-#define NF_REPEAT 4
-#define NF_STOP 5
-#define NF_MAX_VERDICT NF_STOP
-
-/* we overload the higher bits for encoding auxiliary data such as the queue
- * number or errno values. Not nice, but better than additional function
- * arguments. */
-#define NF_VERDICT_MASK 0x000000ff
-
-/* extra verdict flags have mask 0x0000ff00 */
-#define NF_VERDICT_FLAG_QUEUE_BYPASS	0x00008000
-
-/* queue number (NF_QUEUE) or errno (NF_DROP) */
-#define NF_VERDICT_QMASK 0xffff0000
-#define NF_VERDICT_QBITS 16
-
-#define NF_QUEUE_NR(x) ((((x) << 16) & NF_VERDICT_QMASK) | NF_QUEUE)
-
-#define NF_DROP_ERR(x) (((-x) << 16) | NF_DROP)
-
-/* only for userspace compatibility */
-/* Generic cache responses from hook functions.
-   <= 0x2000 is used for protocol-flags. */
-#define NFC_UNKNOWN 0x4000
-#define NFC_ALTERED 0x8000
-
-/* NF_VERDICT_BITS should be 8 now, but userspace might break if this changes */
-#define NF_VERDICT_BITS 16
-
-enum nf_inet_hooks {
-	NF_INET_PRE_ROUTING,
-	NF_INET_LOCAL_IN,
-	NF_INET_FORWARD,
-	NF_INET_LOCAL_OUT,
-	NF_INET_POST_ROUTING,
-	NF_INET_NUMHOOKS
-};
-
-enum nf_dev_hooks {
-	NF_NETDEV_INGRESS,
-	NF_NETDEV_NUMHOOKS
-};
-
-enum {
-	NFPROTO_UNSPEC =  0,
-	NFPROTO_INET   =  1,
-	NFPROTO_IPV4   =  2,
-	NFPROTO_ARP    =  3,
-	NFPROTO_NETDEV =  5,
-	NFPROTO_BRIDGE =  7,
-	NFPROTO_IPV6   = 10,
-	NFPROTO_DECNET = 12,
-	NFPROTO_NUMPROTO,
-};
-
-union nf_inet_addr {
-	__u32		all[4];
-	__be32		ip;
-	__be32		ip6[4];
-	struct in_addr	in;
-	struct in6_addr	in6;
-};
-
-#endif /* __LINUX_NETFILTER_H */
diff --git a/openflow/usr/include/linux/netfilter/ipset/ip_set.h b/openflow/usr/include/linux/netfilter/ipset/ip_set.h
deleted file mode 100644
index ec5af15..0000000
--- a/openflow/usr/include/linux/netfilter/ipset/ip_set.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
- *                         Patrick Schaaf <bof@bof.de>
- *                         Martin Josefsson <gandalf@wlug.westbo.se>
- * Copyright (C) 2003-2011 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef _IP_SET_H
-#define _IP_SET_H
-
-#include <linux/types.h>
-
-/* The protocol version */
-#define IPSET_PROTOCOL		6
-
-/* The max length of strings including NUL: set and type identifiers */
-#define IPSET_MAXNAMELEN	32
-
-/* The maximum permissible comment length we will accept over netlink */
-#define IPSET_MAX_COMMENT_SIZE	255
-
-/* Message types and commands */
-enum ipset_cmd {
-	IPSET_CMD_NONE,
-	IPSET_CMD_PROTOCOL,	/* 1: Return protocol version */
-	IPSET_CMD_CREATE,	/* 2: Create a new (empty) set */
-	IPSET_CMD_DESTROY,	/* 3: Destroy a (empty) set */
-	IPSET_CMD_FLUSH,	/* 4: Remove all elements from a set */
-	IPSET_CMD_RENAME,	/* 5: Rename a set */
-	IPSET_CMD_SWAP,		/* 6: Swap two sets */
-	IPSET_CMD_LIST,		/* 7: List sets */
-	IPSET_CMD_SAVE,		/* 8: Save sets */
-	IPSET_CMD_ADD,		/* 9: Add an element to a set */
-	IPSET_CMD_DEL,		/* 10: Delete an element from a set */
-	IPSET_CMD_TEST,		/* 11: Test an element in a set */
-	IPSET_CMD_HEADER,	/* 12: Get set header data only */
-	IPSET_CMD_TYPE,		/* 13: Get set type */
-	IPSET_MSG_MAX,		/* Netlink message commands */
-
-	/* Commands in userspace: */
-	IPSET_CMD_RESTORE = IPSET_MSG_MAX, /* 14: Enter restore mode */
-	IPSET_CMD_HELP,		/* 15: Get help */
-	IPSET_CMD_VERSION,	/* 16: Get program version */
-	IPSET_CMD_QUIT,		/* 17: Quit from interactive mode */
-
-	IPSET_CMD_MAX,
-
-	IPSET_CMD_COMMIT = IPSET_CMD_MAX, /* 18: Commit buffered commands */
-};
-
-/* Attributes at command level */
-enum {
-	IPSET_ATTR_UNSPEC,
-	IPSET_ATTR_PROTOCOL,	/* 1: Protocol version */
-	IPSET_ATTR_SETNAME,	/* 2: Name of the set */
-	IPSET_ATTR_TYPENAME,	/* 3: Typename */
-	IPSET_ATTR_SETNAME2 = IPSET_ATTR_TYPENAME, /* Setname at rename/swap */
-	IPSET_ATTR_REVISION,	/* 4: Settype revision */
-	IPSET_ATTR_FAMILY,	/* 5: Settype family */
-	IPSET_ATTR_FLAGS,	/* 6: Flags at command level */
-	IPSET_ATTR_DATA,	/* 7: Nested attributes */
-	IPSET_ATTR_ADT,		/* 8: Multiple data containers */
-	IPSET_ATTR_LINENO,	/* 9: Restore lineno */
-	IPSET_ATTR_PROTOCOL_MIN, /* 10: Minimal supported version number */
-	IPSET_ATTR_REVISION_MIN	= IPSET_ATTR_PROTOCOL_MIN, /* type rev min */
-	__IPSET_ATTR_CMD_MAX,
-};
-#define IPSET_ATTR_CMD_MAX	(__IPSET_ATTR_CMD_MAX - 1)
-
-/* CADT specific attributes */
-enum {
-	IPSET_ATTR_IP = IPSET_ATTR_UNSPEC + 1,
-	IPSET_ATTR_IP_FROM = IPSET_ATTR_IP,
-	IPSET_ATTR_IP_TO,	/* 2 */
-	IPSET_ATTR_CIDR,	/* 3 */
-	IPSET_ATTR_PORT,	/* 4 */
-	IPSET_ATTR_PORT_FROM = IPSET_ATTR_PORT,
-	IPSET_ATTR_PORT_TO,	/* 5 */
-	IPSET_ATTR_TIMEOUT,	/* 6 */
-	IPSET_ATTR_PROTO,	/* 7 */
-	IPSET_ATTR_CADT_FLAGS,	/* 8 */
-	IPSET_ATTR_CADT_LINENO = IPSET_ATTR_LINENO,	/* 9 */
-	IPSET_ATTR_MARK,	/* 10 */
-	IPSET_ATTR_MARKMASK,	/* 11 */
-	/* Reserve empty slots */
-	IPSET_ATTR_CADT_MAX = 16,
-	/* Create-only specific attributes */
-	IPSET_ATTR_GC,
-	IPSET_ATTR_HASHSIZE,
-	IPSET_ATTR_MAXELEM,
-	IPSET_ATTR_NETMASK,
-	IPSET_ATTR_PROBES,
-	IPSET_ATTR_RESIZE,
-	IPSET_ATTR_SIZE,
-	/* Kernel-only */
-	IPSET_ATTR_ELEMENTS,
-	IPSET_ATTR_REFERENCES,
-	IPSET_ATTR_MEMSIZE,
-
-	__IPSET_ATTR_CREATE_MAX,
-};
-#define IPSET_ATTR_CREATE_MAX	(__IPSET_ATTR_CREATE_MAX - 1)
-
-/* ADT specific attributes */
-enum {
-	IPSET_ATTR_ETHER = IPSET_ATTR_CADT_MAX + 1,
-	IPSET_ATTR_NAME,
-	IPSET_ATTR_NAMEREF,
-	IPSET_ATTR_IP2,
-	IPSET_ATTR_CIDR2,
-	IPSET_ATTR_IP2_TO,
-	IPSET_ATTR_IFACE,
-	IPSET_ATTR_BYTES,
-	IPSET_ATTR_PACKETS,
-	IPSET_ATTR_COMMENT,
-	IPSET_ATTR_SKBMARK,
-	IPSET_ATTR_SKBPRIO,
-	IPSET_ATTR_SKBQUEUE,
-	__IPSET_ATTR_ADT_MAX,
-};
-#define IPSET_ATTR_ADT_MAX	(__IPSET_ATTR_ADT_MAX - 1)
-
-/* IP specific attributes */
-enum {
-	IPSET_ATTR_IPADDR_IPV4 = IPSET_ATTR_UNSPEC + 1,
-	IPSET_ATTR_IPADDR_IPV6,
-	__IPSET_ATTR_IPADDR_MAX,
-};
-#define IPSET_ATTR_IPADDR_MAX	(__IPSET_ATTR_IPADDR_MAX - 1)
-
-/* Error codes */
-enum ipset_errno {
-	IPSET_ERR_PRIVATE = 4096,
-	IPSET_ERR_PROTOCOL,
-	IPSET_ERR_FIND_TYPE,
-	IPSET_ERR_MAX_SETS,
-	IPSET_ERR_BUSY,
-	IPSET_ERR_EXIST_SETNAME2,
-	IPSET_ERR_TYPE_MISMATCH,
-	IPSET_ERR_EXIST,
-	IPSET_ERR_INVALID_CIDR,
-	IPSET_ERR_INVALID_NETMASK,
-	IPSET_ERR_INVALID_FAMILY,
-	IPSET_ERR_TIMEOUT,
-	IPSET_ERR_REFERENCED,
-	IPSET_ERR_IPADDR_IPV4,
-	IPSET_ERR_IPADDR_IPV6,
-	IPSET_ERR_COUNTER,
-	IPSET_ERR_COMMENT,
-	IPSET_ERR_INVALID_MARKMASK,
-	IPSET_ERR_SKBINFO,
-
-	/* Type specific error codes */
-	IPSET_ERR_TYPE_SPECIFIC = 4352,
-};
-
-/* Flags at command level or match/target flags, lower half of cmdattrs*/
-enum ipset_cmd_flags {
-	IPSET_FLAG_BIT_EXIST	= 0,
-	IPSET_FLAG_EXIST	= (1 << IPSET_FLAG_BIT_EXIST),
-	IPSET_FLAG_BIT_LIST_SETNAME = 1,
-	IPSET_FLAG_LIST_SETNAME	= (1 << IPSET_FLAG_BIT_LIST_SETNAME),
-	IPSET_FLAG_BIT_LIST_HEADER = 2,
-	IPSET_FLAG_LIST_HEADER	= (1 << IPSET_FLAG_BIT_LIST_HEADER),
-	IPSET_FLAG_BIT_SKIP_COUNTER_UPDATE = 3,
-	IPSET_FLAG_SKIP_COUNTER_UPDATE =
-		(1 << IPSET_FLAG_BIT_SKIP_COUNTER_UPDATE),
-	IPSET_FLAG_BIT_SKIP_SUBCOUNTER_UPDATE = 4,
-	IPSET_FLAG_SKIP_SUBCOUNTER_UPDATE =
-		(1 << IPSET_FLAG_BIT_SKIP_SUBCOUNTER_UPDATE),
-	IPSET_FLAG_BIT_MATCH_COUNTERS = 5,
-	IPSET_FLAG_MATCH_COUNTERS = (1 << IPSET_FLAG_BIT_MATCH_COUNTERS),
-	IPSET_FLAG_BIT_RETURN_NOMATCH = 7,
-	IPSET_FLAG_RETURN_NOMATCH = (1 << IPSET_FLAG_BIT_RETURN_NOMATCH),
-	IPSET_FLAG_BIT_MAP_SKBMARK = 8,
-	IPSET_FLAG_MAP_SKBMARK = (1 << IPSET_FLAG_BIT_MAP_SKBMARK),
-	IPSET_FLAG_BIT_MAP_SKBPRIO = 9,
-	IPSET_FLAG_MAP_SKBPRIO = (1 << IPSET_FLAG_BIT_MAP_SKBPRIO),
-	IPSET_FLAG_BIT_MAP_SKBQUEUE = 10,
-	IPSET_FLAG_MAP_SKBQUEUE = (1 << IPSET_FLAG_BIT_MAP_SKBQUEUE),
-	IPSET_FLAG_CMD_MAX = 15,
-};
-
-/* Flags at CADT attribute level, upper half of cmdattrs */
-enum ipset_cadt_flags {
-	IPSET_FLAG_BIT_BEFORE	= 0,
-	IPSET_FLAG_BEFORE	= (1 << IPSET_FLAG_BIT_BEFORE),
-	IPSET_FLAG_BIT_PHYSDEV	= 1,
-	IPSET_FLAG_PHYSDEV	= (1 << IPSET_FLAG_BIT_PHYSDEV),
-	IPSET_FLAG_BIT_NOMATCH	= 2,
-	IPSET_FLAG_NOMATCH	= (1 << IPSET_FLAG_BIT_NOMATCH),
-	IPSET_FLAG_BIT_WITH_COUNTERS = 3,
-	IPSET_FLAG_WITH_COUNTERS = (1 << IPSET_FLAG_BIT_WITH_COUNTERS),
-	IPSET_FLAG_BIT_WITH_COMMENT = 4,
-	IPSET_FLAG_WITH_COMMENT = (1 << IPSET_FLAG_BIT_WITH_COMMENT),
-	IPSET_FLAG_BIT_WITH_FORCEADD = 5,
-	IPSET_FLAG_WITH_FORCEADD = (1 << IPSET_FLAG_BIT_WITH_FORCEADD),
-	IPSET_FLAG_BIT_WITH_SKBINFO = 6,
-	IPSET_FLAG_WITH_SKBINFO = (1 << IPSET_FLAG_BIT_WITH_SKBINFO),
-	IPSET_FLAG_CADT_MAX	= 15,
-};
-
-/* The flag bits which correspond to the non-extension create flags */
-enum ipset_create_flags {
-	IPSET_CREATE_FLAG_BIT_FORCEADD = 0,
-	IPSET_CREATE_FLAG_FORCEADD = (1 << IPSET_CREATE_FLAG_BIT_FORCEADD),
-	IPSET_CREATE_FLAG_BIT_MAX = 7,
-};
-
-/* Commands with settype-specific attributes */
-enum ipset_adt {
-	IPSET_ADD,
-	IPSET_DEL,
-	IPSET_TEST,
-	IPSET_ADT_MAX,
-	IPSET_CREATE = IPSET_ADT_MAX,
-	IPSET_CADT_MAX,
-};
-
-/* Sets are identified by an index in kernel space. Tweak with ip_set_id_t
- * and IPSET_INVALID_ID if you want to increase the max number of sets.
- */
-typedef __u16 ip_set_id_t;
-
-#define IPSET_INVALID_ID		65535
-
-enum ip_set_dim {
-	IPSET_DIM_ZERO = 0,
-	IPSET_DIM_ONE,
-	IPSET_DIM_TWO,
-	IPSET_DIM_THREE,
-	/* Max dimension in elements.
-	 * If changed, new revision of iptables match/target is required.
-	 */
-	IPSET_DIM_MAX = 6,
-	/* Backward compatibility: set match revision 2 */
-	IPSET_BIT_RETURN_NOMATCH = 7,
-};
-
-/* Option flags for kernel operations */
-enum ip_set_kopt {
-	IPSET_INV_MATCH = (1 << IPSET_DIM_ZERO),
-	IPSET_DIM_ONE_SRC = (1 << IPSET_DIM_ONE),
-	IPSET_DIM_TWO_SRC = (1 << IPSET_DIM_TWO),
-	IPSET_DIM_THREE_SRC = (1 << IPSET_DIM_THREE),
-	IPSET_RETURN_NOMATCH = (1 << IPSET_BIT_RETURN_NOMATCH),
-};
-
-enum {
-	IPSET_COUNTER_NONE = 0,
-	IPSET_COUNTER_EQ,
-	IPSET_COUNTER_NE,
-	IPSET_COUNTER_LT,
-	IPSET_COUNTER_GT,
-};
-
-/* Backward compatibility for set match v3 */
-struct ip_set_counter_match0 {
-	__u8 op;
-	__u64 value;
-};
-
-struct ip_set_counter_match {
-	__aligned_u64 value;
-	__u8 op;
-};
-
-/* Interface to iptables/ip6tables */
-
-#define SO_IP_SET		83
-
-union ip_set_name_index {
-	char name[IPSET_MAXNAMELEN];
-	ip_set_id_t index;
-};
-
-#define IP_SET_OP_GET_BYNAME	0x00000006	/* Get set index by name */
-struct ip_set_req_get_set {
-	unsigned int op;
-	unsigned int version;
-	union ip_set_name_index set;
-};
-
-#define IP_SET_OP_GET_BYINDEX	0x00000007	/* Get set name by index */
-/* Uses ip_set_req_get_set */
-
-#define IP_SET_OP_GET_FNAME	0x00000008	/* Get set index and family */
-struct ip_set_req_get_set_family {
-	unsigned int op;
-	unsigned int version;
-	unsigned int family;
-	union ip_set_name_index set;
-};
-
-#define IP_SET_OP_VERSION	0x00000100	/* Ask kernel version */
-struct ip_set_req_version {
-	unsigned int op;
-	unsigned int version;
-};
-
-#endif /* _IP_SET_H */
diff --git a/openflow/usr/include/linux/netfilter/ipset/ip_set_bitmap.h b/openflow/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
deleted file mode 100644
index 061a28e..0000000
--- a/openflow/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __IP_SET_BITMAP_H
-#define __IP_SET_BITMAP_H
-
-/* Bitmap type specific error codes */
-enum {
-	/* The element is out of the range of the set */
-	IPSET_ERR_BITMAP_RANGE = IPSET_ERR_TYPE_SPECIFIC,
-	/* The range exceeds the size limit of the set type */
-	IPSET_ERR_BITMAP_RANGE_SIZE,
-};
-
-
-#endif /* __IP_SET_BITMAP_H */
diff --git a/openflow/usr/include/linux/netfilter/ipset/ip_set_hash.h b/openflow/usr/include/linux/netfilter/ipset/ip_set_hash.h
deleted file mode 100644
index 34ac6ce..0000000
--- a/openflow/usr/include/linux/netfilter/ipset/ip_set_hash.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __IP_SET_HASH_H
-#define __IP_SET_HASH_H
-
-/* Hash type specific error codes */
-enum {
-	/* Hash is full */
-	IPSET_ERR_HASH_FULL = IPSET_ERR_TYPE_SPECIFIC,
-	/* Null-valued element */
-	IPSET_ERR_HASH_ELEM,
-	/* Invalid protocol */
-	IPSET_ERR_INVALID_PROTO,
-	/* Protocol missing but must be specified */
-	IPSET_ERR_MISSING_PROTO,
-	/* Range not supported */
-	IPSET_ERR_HASH_RANGE_UNSUPPORTED,
-	/* Invalid range */
-	IPSET_ERR_HASH_RANGE,
-};
-
-
-#endif /* __IP_SET_HASH_H */
diff --git a/openflow/usr/include/linux/netfilter/ipset/ip_set_list.h b/openflow/usr/include/linux/netfilter/ipset/ip_set_list.h
deleted file mode 100644
index 75e6175..0000000
--- a/openflow/usr/include/linux/netfilter/ipset/ip_set_list.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __IP_SET_LIST_H
-#define __IP_SET_LIST_H
-
-/* List type specific error codes */
-enum {
-	/* Set name to be added/deleted/tested does not exist. */
-	IPSET_ERR_NAME = IPSET_ERR_TYPE_SPECIFIC,
-	/* list:set type is not permitted to add */
-	IPSET_ERR_LOOP,
-	/* Missing reference set */
-	IPSET_ERR_BEFORE,
-	/* Reference set does not exist */
-	IPSET_ERR_NAMEREF,
-	/* Set is full */
-	IPSET_ERR_LIST_FULL,
-	/* Reference set is not added to the set */
-	IPSET_ERR_REF_EXIST,
-};
-
-
-#endif /* __IP_SET_LIST_H */
diff --git a/openflow/usr/include/linux/netfilter/nf_conntrack_common.h b/openflow/usr/include/linux/netfilter/nf_conntrack_common.h
deleted file mode 100644
index 10b51fc..0000000
--- a/openflow/usr/include/linux/netfilter/nf_conntrack_common.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef _NF_CONNTRACK_COMMON_H
-#define _NF_CONNTRACK_COMMON_H
-/* Connection state tracking for netfilter.  This is separated from,
-   but required by, the NAT layer; it can also be used by an iptables
-   extension. */
-enum ip_conntrack_info {
-	/* Part of an established connection (either direction). */
-	IP_CT_ESTABLISHED,
-
-	/* Like NEW, but related to an existing connection, or ICMP error
-	   (in either direction). */
-	IP_CT_RELATED,
-
-	/* Started a new connection to track (only
-           IP_CT_DIR_ORIGINAL); may be a retransmission. */
-	IP_CT_NEW,
-
-	/* >= this indicates reply direction */
-	IP_CT_IS_REPLY,
-
-	IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY,
-	IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY,
-	IP_CT_NEW_REPLY = IP_CT_NEW + IP_CT_IS_REPLY,	
-	/* Number of distinct IP_CT types (no NEW in reply dirn). */
-	IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1
-};
-
-#define NF_CT_STATE_INVALID_BIT			(1 << 0)
-#define NF_CT_STATE_BIT(ctinfo)			(1 << ((ctinfo) % IP_CT_IS_REPLY + 1))
-#define NF_CT_STATE_UNTRACKED_BIT		(1 << (IP_CT_NUMBER + 1))
-
-/* Bitset representing status of connection. */
-enum ip_conntrack_status {
-	/* It's an expected connection: bit 0 set.  This bit never changed */
-	IPS_EXPECTED_BIT = 0,
-	IPS_EXPECTED = (1 << IPS_EXPECTED_BIT),
-
-	/* We've seen packets both ways: bit 1 set.  Can be set, not unset. */
-	IPS_SEEN_REPLY_BIT = 1,
-	IPS_SEEN_REPLY = (1 << IPS_SEEN_REPLY_BIT),
-
-	/* Conntrack should never be early-expired. */
-	IPS_ASSURED_BIT = 2,
-	IPS_ASSURED = (1 << IPS_ASSURED_BIT),
-
-	/* Connection is confirmed: originating packet has left box */
-	IPS_CONFIRMED_BIT = 3,
-	IPS_CONFIRMED = (1 << IPS_CONFIRMED_BIT),
-
-	/* Connection needs src nat in orig dir.  This bit never changed. */
-	IPS_SRC_NAT_BIT = 4,
-	IPS_SRC_NAT = (1 << IPS_SRC_NAT_BIT),
-
-	/* Connection needs dst nat in orig dir.  This bit never changed. */
-	IPS_DST_NAT_BIT = 5,
-	IPS_DST_NAT = (1 << IPS_DST_NAT_BIT),
-
-	/* Both together. */
-	IPS_NAT_MASK = (IPS_DST_NAT | IPS_SRC_NAT),
-
-	/* Connection needs TCP sequence adjusted. */
-	IPS_SEQ_ADJUST_BIT = 6,
-	IPS_SEQ_ADJUST = (1 << IPS_SEQ_ADJUST_BIT),
-
-	/* NAT initialization bits. */
-	IPS_SRC_NAT_DONE_BIT = 7,
-	IPS_SRC_NAT_DONE = (1 << IPS_SRC_NAT_DONE_BIT),
-
-	IPS_DST_NAT_DONE_BIT = 8,
-	IPS_DST_NAT_DONE = (1 << IPS_DST_NAT_DONE_BIT),
-
-	/* Both together */
-	IPS_NAT_DONE_MASK = (IPS_DST_NAT_DONE | IPS_SRC_NAT_DONE),
-
-	/* Connection is dying (removed from lists), can not be unset. */
-	IPS_DYING_BIT = 9,
-	IPS_DYING = (1 << IPS_DYING_BIT),
-
-	/* Connection has fixed timeout. */
-	IPS_FIXED_TIMEOUT_BIT = 10,
-	IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT),
-
-	/* Conntrack is a template */
-	IPS_TEMPLATE_BIT = 11,
-	IPS_TEMPLATE = (1 << IPS_TEMPLATE_BIT),
-
-	/* Conntrack is a fake untracked entry */
-	IPS_UNTRACKED_BIT = 12,
-	IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT),
-
-	/* Conntrack got a helper explicitly attached via CT target. */
-	IPS_HELPER_BIT = 13,
-	IPS_HELPER = (1 << IPS_HELPER_BIT),
-};
-
-/* Connection tracking event types */
-enum ip_conntrack_events {
-	IPCT_NEW,		/* new conntrack */
-	IPCT_RELATED,		/* related conntrack */
-	IPCT_DESTROY,		/* destroyed conntrack */
-	IPCT_REPLY,		/* connection has seen two-way traffic */
-	IPCT_ASSURED,		/* connection status has changed to assured */
-	IPCT_PROTOINFO,		/* protocol information has changed */
-	IPCT_HELPER,		/* new helper has been set */
-	IPCT_MARK,		/* new mark has been set */
-	IPCT_SEQADJ,		/* sequence adjustment has changed */
-	IPCT_NATSEQADJ = IPCT_SEQADJ,
-	IPCT_SECMARK,		/* new security mark has been set */
-	IPCT_LABEL,		/* new connlabel has been set */
-};
-
-enum ip_conntrack_expect_events {
-	IPEXP_NEW,		/* new expectation */
-	IPEXP_DESTROY,		/* destroyed expectation */
-};
-
-/* expectation flags */
-#define NF_CT_EXPECT_PERMANENT		0x1
-#define NF_CT_EXPECT_INACTIVE		0x2
-#define NF_CT_EXPECT_USERSPACE		0x4
-
-
-#endif /* _NF_CONNTRACK_COMMON_H */
diff --git a/openflow/usr/include/linux/netfilter/nf_conntrack_ftp.h b/openflow/usr/include/linux/netfilter/nf_conntrack_ftp.h
deleted file mode 100644
index a222fac..0000000
--- a/openflow/usr/include/linux/netfilter/nf_conntrack_ftp.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _NF_CONNTRACK_FTP_H
-#define _NF_CONNTRACK_FTP_H
-/* FTP tracking. */
-
-/* This enum is exposed to userspace */
-enum nf_ct_ftp_type {
-	/* PORT command from client */
-	NF_CT_FTP_PORT,
-	/* PASV response from server */
-	NF_CT_FTP_PASV,
-	/* EPRT command from client */
-	NF_CT_FTP_EPRT,
-	/* EPSV response from server */
-	NF_CT_FTP_EPSV,
-};
-
-
-#endif /* _NF_CONNTRACK_FTP_H */
diff --git a/openflow/usr/include/linux/netfilter/nf_conntrack_sctp.h b/openflow/usr/include/linux/netfilter/nf_conntrack_sctp.h
deleted file mode 100644
index ed4e776..0000000
--- a/openflow/usr/include/linux/netfilter/nf_conntrack_sctp.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _NF_CONNTRACK_SCTP_H
-#define _NF_CONNTRACK_SCTP_H
-/* SCTP tracking. */
-
-#include <linux/netfilter/nf_conntrack_tuple_common.h>
-
-enum sctp_conntrack {
-	SCTP_CONNTRACK_NONE,
-	SCTP_CONNTRACK_CLOSED,
-	SCTP_CONNTRACK_COOKIE_WAIT,
-	SCTP_CONNTRACK_COOKIE_ECHOED,
-	SCTP_CONNTRACK_ESTABLISHED,
-	SCTP_CONNTRACK_SHUTDOWN_SENT,
-	SCTP_CONNTRACK_SHUTDOWN_RECD,
-	SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,
-	SCTP_CONNTRACK_HEARTBEAT_SENT,
-	SCTP_CONNTRACK_HEARTBEAT_ACKED,
-	SCTP_CONNTRACK_MAX
-};
-
-struct ip_ct_sctp {
-	enum sctp_conntrack state;
-
-	__be32 vtag[IP_CT_DIR_MAX];
-};
-
-#endif /* _NF_CONNTRACK_SCTP_H */
diff --git a/openflow/usr/include/linux/netfilter/nf_conntrack_tcp.h b/openflow/usr/include/linux/netfilter/nf_conntrack_tcp.h
deleted file mode 100644
index c3ffd0c..0000000
--- a/openflow/usr/include/linux/netfilter/nf_conntrack_tcp.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _NF_CONNTRACK_TCP_H
-#define _NF_CONNTRACK_TCP_H
-/* TCP tracking. */
-
-#include <linux/types.h>
-
-/* This is exposed to userspace (ctnetlink) */
-enum tcp_conntrack {
-	TCP_CONNTRACK_NONE,
-	TCP_CONNTRACK_SYN_SENT,
-	TCP_CONNTRACK_SYN_RECV,
-	TCP_CONNTRACK_ESTABLISHED,
-	TCP_CONNTRACK_FIN_WAIT,
-	TCP_CONNTRACK_CLOSE_WAIT,
-	TCP_CONNTRACK_LAST_ACK,
-	TCP_CONNTRACK_TIME_WAIT,
-	TCP_CONNTRACK_CLOSE,
-	TCP_CONNTRACK_LISTEN,	/* obsolete */
-#define TCP_CONNTRACK_SYN_SENT2	TCP_CONNTRACK_LISTEN
-	TCP_CONNTRACK_MAX,
-	TCP_CONNTRACK_IGNORE,
-	TCP_CONNTRACK_RETRANS,
-	TCP_CONNTRACK_UNACK,
-	TCP_CONNTRACK_TIMEOUT_MAX
-};
-
-/* Window scaling is advertised by the sender */
-#define IP_CT_TCP_FLAG_WINDOW_SCALE		0x01
-
-/* SACK is permitted by the sender */
-#define IP_CT_TCP_FLAG_SACK_PERM		0x02
-
-/* This sender sent FIN first */
-#define IP_CT_TCP_FLAG_CLOSE_INIT		0x04
-
-/* Be liberal in window checking */
-#define IP_CT_TCP_FLAG_BE_LIBERAL		0x08
-
-/* Has unacknowledged data */
-#define IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED	0x10
-
-/* The field td_maxack has been set */
-#define IP_CT_TCP_FLAG_MAXACK_SET		0x20
-
-/* Marks possibility for expected RFC5961 challenge ACK */
-#define IP_CT_EXP_CHALLENGE_ACK 		0x40
-
-struct nf_ct_tcp_flags {
-	__u8 flags;
-	__u8 mask;
-};
-
-
-#endif /* _NF_CONNTRACK_TCP_H */
diff --git a/openflow/usr/include/linux/netfilter/nf_conntrack_tuple_common.h b/openflow/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
deleted file mode 100644
index 2f6bbc5..0000000
--- a/openflow/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _NF_CONNTRACK_TUPLE_COMMON_H
-#define _NF_CONNTRACK_TUPLE_COMMON_H
-
-enum ip_conntrack_dir {
-	IP_CT_DIR_ORIGINAL,
-	IP_CT_DIR_REPLY,
-	IP_CT_DIR_MAX
-};
-
-/* The protocol-specific manipulable parts of the tuple: always in
- * network order
- */
-union nf_conntrack_man_proto {
-	/* Add other protocols here. */
-	__be16 all;
-
-	struct {
-		__be16 port;
-	} tcp;
-	struct {
-		__be16 port;
-	} udp;
-	struct {
-		__be16 id;
-	} icmp;
-	struct {
-		__be16 port;
-	} dccp;
-	struct {
-		__be16 port;
-	} sctp;
-	struct {
-		__be16 key;	/* GRE key is 32bit, PPtP only uses 16bit */
-	} gre;
-};
-
-#define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL)
-
-#endif /* _NF_CONNTRACK_TUPLE_COMMON_H */
diff --git a/openflow/usr/include/linux/netfilter/nf_nat.h b/openflow/usr/include/linux/netfilter/nf_nat.h
deleted file mode 100644
index 0880781..0000000
--- a/openflow/usr/include/linux/netfilter/nf_nat.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _NETFILTER_NF_NAT_H
-#define _NETFILTER_NF_NAT_H
-
-#include <linux/netfilter.h>
-#include <linux/netfilter/nf_conntrack_tuple_common.h>
-
-#define NF_NAT_RANGE_MAP_IPS			(1 << 0)
-#define NF_NAT_RANGE_PROTO_SPECIFIED		(1 << 1)
-#define NF_NAT_RANGE_PROTO_RANDOM		(1 << 2)
-#define NF_NAT_RANGE_PERSISTENT			(1 << 3)
-#define NF_NAT_RANGE_PROTO_RANDOM_FULLY		(1 << 4)
-
-#define NF_NAT_RANGE_PROTO_RANDOM_ALL		\
-	(NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PROTO_RANDOM_FULLY)
-
-#define NF_NAT_RANGE_MASK					\
-	(NF_NAT_RANGE_MAP_IPS | NF_NAT_RANGE_PROTO_SPECIFIED |	\
-	 NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PERSISTENT |	\
-	 NF_NAT_RANGE_PROTO_RANDOM_FULLY)
-
-struct nf_nat_ipv4_range {
-	unsigned int			flags;
-	__be32				min_ip;
-	__be32				max_ip;
-	union nf_conntrack_man_proto	min;
-	union nf_conntrack_man_proto	max;
-};
-
-struct nf_nat_ipv4_multi_range_compat {
-	unsigned int			rangesize;
-	struct nf_nat_ipv4_range	range[1];
-};
-
-struct nf_nat_range {
-	unsigned int			flags;
-	union nf_inet_addr		min_addr;
-	union nf_inet_addr		max_addr;
-	union nf_conntrack_man_proto	min_proto;
-	union nf_conntrack_man_proto	max_proto;
-};
-
-#endif /* _NETFILTER_NF_NAT_H */
diff --git a/openflow/usr/include/linux/netfilter/nf_tables.h b/openflow/usr/include/linux/netfilter/nf_tables.h
deleted file mode 100644
index d8c8a7c..0000000
--- a/openflow/usr/include/linux/netfilter/nf_tables.h
+++ /dev/null
@@ -1,973 +0,0 @@
-#ifndef _LINUX_NF_TABLES_H
-#define _LINUX_NF_TABLES_H
-
-#define NFT_TABLE_MAXNAMELEN	32
-#define NFT_CHAIN_MAXNAMELEN	32
-#define NFT_USERDATA_MAXLEN	256
-
-/**
- * enum nft_registers - nf_tables registers
- *
- * nf_tables used to have five registers: a verdict register and four data
- * registers of size 16. The data registers have been changed to 16 registers
- * of size 4. For compatibility reasons, the NFT_REG_[1-4] registers still
- * map to areas of size 16, the 4 byte registers are addressed using
- * NFT_REG32_00 - NFT_REG32_15.
- */
-enum nft_registers {
-	NFT_REG_VERDICT,
-	NFT_REG_1,
-	NFT_REG_2,
-	NFT_REG_3,
-	NFT_REG_4,
-	__NFT_REG_MAX,
-
-	NFT_REG32_00	= 8,
-	MFT_REG32_01,
-	NFT_REG32_02,
-	NFT_REG32_03,
-	NFT_REG32_04,
-	NFT_REG32_05,
-	NFT_REG32_06,
-	NFT_REG32_07,
-	NFT_REG32_08,
-	NFT_REG32_09,
-	NFT_REG32_10,
-	NFT_REG32_11,
-	NFT_REG32_12,
-	NFT_REG32_13,
-	NFT_REG32_14,
-	NFT_REG32_15,
-};
-#define NFT_REG_MAX	(__NFT_REG_MAX - 1)
-
-#define NFT_REG_SIZE	16
-#define NFT_REG32_SIZE	4
-
-/**
- * enum nft_verdicts - nf_tables internal verdicts
- *
- * @NFT_CONTINUE: continue evaluation of the current rule
- * @NFT_BREAK: terminate evaluation of the current rule
- * @NFT_JUMP: push the current chain on the jump stack and jump to a chain
- * @NFT_GOTO: jump to a chain without pushing the current chain on the jump stack
- * @NFT_RETURN: return to the topmost chain on the jump stack
- *
- * The nf_tables verdicts share their numeric space with the netfilter verdicts.
- */
-enum nft_verdicts {
-	NFT_CONTINUE	= -1,
-	NFT_BREAK	= -2,
-	NFT_JUMP	= -3,
-	NFT_GOTO	= -4,
-	NFT_RETURN	= -5,
-};
-
-/**
- * enum nf_tables_msg_types - nf_tables netlink message types
- *
- * @NFT_MSG_NEWTABLE: create a new table (enum nft_table_attributes)
- * @NFT_MSG_GETTABLE: get a table (enum nft_table_attributes)
- * @NFT_MSG_DELTABLE: delete a table (enum nft_table_attributes)
- * @NFT_MSG_NEWCHAIN: create a new chain (enum nft_chain_attributes)
- * @NFT_MSG_GETCHAIN: get a chain (enum nft_chain_attributes)
- * @NFT_MSG_DELCHAIN: delete a chain (enum nft_chain_attributes)
- * @NFT_MSG_NEWRULE: create a new rule (enum nft_rule_attributes)
- * @NFT_MSG_GETRULE: get a rule (enum nft_rule_attributes)
- * @NFT_MSG_DELRULE: delete a rule (enum nft_rule_attributes)
- * @NFT_MSG_NEWSET: create a new set (enum nft_set_attributes)
- * @NFT_MSG_GETSET: get a set (enum nft_set_attributes)
- * @NFT_MSG_DELSET: delete a set (enum nft_set_attributes)
- * @NFT_MSG_NEWSETELEM: create a new set element (enum nft_set_elem_attributes)
- * @NFT_MSG_GETSETELEM: get a set element (enum nft_set_elem_attributes)
- * @NFT_MSG_DELSETELEM: delete a set element (enum nft_set_elem_attributes)
- * @NFT_MSG_NEWGEN: announce a new generation, only for events (enum nft_gen_attributes)
- * @NFT_MSG_GETGEN: get the rule-set generation (enum nft_gen_attributes)
- */
-enum nf_tables_msg_types {
-	NFT_MSG_NEWTABLE,
-	NFT_MSG_GETTABLE,
-	NFT_MSG_DELTABLE,
-	NFT_MSG_NEWCHAIN,
-	NFT_MSG_GETCHAIN,
-	NFT_MSG_DELCHAIN,
-	NFT_MSG_NEWRULE,
-	NFT_MSG_GETRULE,
-	NFT_MSG_DELRULE,
-	NFT_MSG_NEWSET,
-	NFT_MSG_GETSET,
-	NFT_MSG_DELSET,
-	NFT_MSG_NEWSETELEM,
-	NFT_MSG_GETSETELEM,
-	NFT_MSG_DELSETELEM,
-	NFT_MSG_NEWGEN,
-	NFT_MSG_GETGEN,
-	NFT_MSG_MAX,
-};
-
-/**
- * enum nft_list_attributes - nf_tables generic list netlink attributes
- *
- * @NFTA_LIST_ELEM: list element (NLA_NESTED)
- */
-enum nft_list_attributes {
-	NFTA_LIST_UNPEC,
-	NFTA_LIST_ELEM,
-	__NFTA_LIST_MAX
-};
-#define NFTA_LIST_MAX		(__NFTA_LIST_MAX - 1)
-
-/**
- * enum nft_hook_attributes - nf_tables netfilter hook netlink attributes
- *
- * @NFTA_HOOK_HOOKNUM: netfilter hook number (NLA_U32)
- * @NFTA_HOOK_PRIORITY: netfilter hook priority (NLA_U32)
- * @NFTA_HOOK_DEV: netdevice name (NLA_STRING)
- */
-enum nft_hook_attributes {
-	NFTA_HOOK_UNSPEC,
-	NFTA_HOOK_HOOKNUM,
-	NFTA_HOOK_PRIORITY,
-	NFTA_HOOK_DEV,
-	__NFTA_HOOK_MAX
-};
-#define NFTA_HOOK_MAX		(__NFTA_HOOK_MAX - 1)
-
-/**
- * enum nft_table_flags - nf_tables table flags
- *
- * @NFT_TABLE_F_DORMANT: this table is not active
- */
-enum nft_table_flags {
-	NFT_TABLE_F_DORMANT	= 0x1,
-};
-
-/**
- * enum nft_table_attributes - nf_tables table netlink attributes
- *
- * @NFTA_TABLE_NAME: name of the table (NLA_STRING)
- * @NFTA_TABLE_FLAGS: bitmask of enum nft_table_flags (NLA_U32)
- * @NFTA_TABLE_USE: number of chains in this table (NLA_U32)
- */
-enum nft_table_attributes {
-	NFTA_TABLE_UNSPEC,
-	NFTA_TABLE_NAME,
-	NFTA_TABLE_FLAGS,
-	NFTA_TABLE_USE,
-	__NFTA_TABLE_MAX
-};
-#define NFTA_TABLE_MAX		(__NFTA_TABLE_MAX - 1)
-
-/**
- * enum nft_chain_attributes - nf_tables chain netlink attributes
- *
- * @NFTA_CHAIN_TABLE: name of the table containing the chain (NLA_STRING)
- * @NFTA_CHAIN_HANDLE: numeric handle of the chain (NLA_U64)
- * @NFTA_CHAIN_NAME: name of the chain (NLA_STRING)
- * @NFTA_CHAIN_HOOK: hook specification for basechains (NLA_NESTED: nft_hook_attributes)
- * @NFTA_CHAIN_POLICY: numeric policy of the chain (NLA_U32)
- * @NFTA_CHAIN_USE: number of references to this chain (NLA_U32)
- * @NFTA_CHAIN_TYPE: type name of the string (NLA_NUL_STRING)
- * @NFTA_CHAIN_COUNTERS: counter specification of the chain (NLA_NESTED: nft_counter_attributes)
- */
-enum nft_chain_attributes {
-	NFTA_CHAIN_UNSPEC,
-	NFTA_CHAIN_TABLE,
-	NFTA_CHAIN_HANDLE,
-	NFTA_CHAIN_NAME,
-	NFTA_CHAIN_HOOK,
-	NFTA_CHAIN_POLICY,
-	NFTA_CHAIN_USE,
-	NFTA_CHAIN_TYPE,
-	NFTA_CHAIN_COUNTERS,
-	__NFTA_CHAIN_MAX
-};
-#define NFTA_CHAIN_MAX		(__NFTA_CHAIN_MAX - 1)
-
-/**
- * enum nft_rule_attributes - nf_tables rule netlink attributes
- *
- * @NFTA_RULE_TABLE: name of the table containing the rule (NLA_STRING)
- * @NFTA_RULE_CHAIN: name of the chain containing the rule (NLA_STRING)
- * @NFTA_RULE_HANDLE: numeric handle of the rule (NLA_U64)
- * @NFTA_RULE_EXPRESSIONS: list of expressions (NLA_NESTED: nft_expr_attributes)
- * @NFTA_RULE_COMPAT: compatibility specifications of the rule (NLA_NESTED: nft_rule_compat_attributes)
- * @NFTA_RULE_POSITION: numeric handle of the previous rule (NLA_U64)
- * @NFTA_RULE_USERDATA: user data (NLA_BINARY, NFT_USERDATA_MAXLEN)
- */
-enum nft_rule_attributes {
-	NFTA_RULE_UNSPEC,
-	NFTA_RULE_TABLE,
-	NFTA_RULE_CHAIN,
-	NFTA_RULE_HANDLE,
-	NFTA_RULE_EXPRESSIONS,
-	NFTA_RULE_COMPAT,
-	NFTA_RULE_POSITION,
-	NFTA_RULE_USERDATA,
-	__NFTA_RULE_MAX
-};
-#define NFTA_RULE_MAX		(__NFTA_RULE_MAX - 1)
-
-/**
- * enum nft_rule_compat_flags - nf_tables rule compat flags
- *
- * @NFT_RULE_COMPAT_F_INV: invert the check result
- */
-enum nft_rule_compat_flags {
-	NFT_RULE_COMPAT_F_INV	= (1 << 1),
-	NFT_RULE_COMPAT_F_MASK	= NFT_RULE_COMPAT_F_INV,
-};
-
-/**
- * enum nft_rule_compat_attributes - nf_tables rule compat attributes
- *
- * @NFTA_RULE_COMPAT_PROTO: numerice value of handled protocol (NLA_U32)
- * @NFTA_RULE_COMPAT_FLAGS: bitmask of enum nft_rule_compat_flags (NLA_U32)
- */
-enum nft_rule_compat_attributes {
-	NFTA_RULE_COMPAT_UNSPEC,
-	NFTA_RULE_COMPAT_PROTO,
-	NFTA_RULE_COMPAT_FLAGS,
-	__NFTA_RULE_COMPAT_MAX
-};
-#define NFTA_RULE_COMPAT_MAX	(__NFTA_RULE_COMPAT_MAX - 1)
-
-/**
- * enum nft_set_flags - nf_tables set flags
- *
- * @NFT_SET_ANONYMOUS: name allocation, automatic cleanup on unlink
- * @NFT_SET_CONSTANT: set contents may not change while bound
- * @NFT_SET_INTERVAL: set contains intervals
- * @NFT_SET_MAP: set is used as a dictionary
- * @NFT_SET_TIMEOUT: set uses timeouts
- * @NFT_SET_EVAL: set contains expressions for evaluation
- */
-enum nft_set_flags {
-	NFT_SET_ANONYMOUS		= 0x1,
-	NFT_SET_CONSTANT		= 0x2,
-	NFT_SET_INTERVAL		= 0x4,
-	NFT_SET_MAP			= 0x8,
-	NFT_SET_TIMEOUT			= 0x10,
-	NFT_SET_EVAL			= 0x20,
-};
-
-/**
- * enum nft_set_policies - set selection policy
- *
- * @NFT_SET_POL_PERFORMANCE: prefer high performance over low memory use
- * @NFT_SET_POL_MEMORY: prefer low memory use over high performance
- */
-enum nft_set_policies {
-	NFT_SET_POL_PERFORMANCE,
-	NFT_SET_POL_MEMORY,
-};
-
-/**
- * enum nft_set_desc_attributes - set element description
- *
- * @NFTA_SET_DESC_SIZE: number of elements in set (NLA_U32)
- */
-enum nft_set_desc_attributes {
-	NFTA_SET_DESC_UNSPEC,
-	NFTA_SET_DESC_SIZE,
-	__NFTA_SET_DESC_MAX
-};
-#define NFTA_SET_DESC_MAX	(__NFTA_SET_DESC_MAX - 1)
-
-/**
- * enum nft_set_attributes - nf_tables set netlink attributes
- *
- * @NFTA_SET_TABLE: table name (NLA_STRING)
- * @NFTA_SET_NAME: set name (NLA_STRING)
- * @NFTA_SET_FLAGS: bitmask of enum nft_set_flags (NLA_U32)
- * @NFTA_SET_KEY_TYPE: key data type, informational purpose only (NLA_U32)
- * @NFTA_SET_KEY_LEN: key data length (NLA_U32)
- * @NFTA_SET_DATA_TYPE: mapping data type (NLA_U32)
- * @NFTA_SET_DATA_LEN: mapping data length (NLA_U32)
- * @NFTA_SET_POLICY: selection policy (NLA_U32)
- * @NFTA_SET_DESC: set description (NLA_NESTED)
- * @NFTA_SET_ID: uniquely identifies a set in a transaction (NLA_U32)
- * @NFTA_SET_TIMEOUT: default timeout value (NLA_U64)
- * @NFTA_SET_GC_INTERVAL: garbage collection interval (NLA_U32)
- */
-enum nft_set_attributes {
-	NFTA_SET_UNSPEC,
-	NFTA_SET_TABLE,
-	NFTA_SET_NAME,
-	NFTA_SET_FLAGS,
-	NFTA_SET_KEY_TYPE,
-	NFTA_SET_KEY_LEN,
-	NFTA_SET_DATA_TYPE,
-	NFTA_SET_DATA_LEN,
-	NFTA_SET_POLICY,
-	NFTA_SET_DESC,
-	NFTA_SET_ID,
-	NFTA_SET_TIMEOUT,
-	NFTA_SET_GC_INTERVAL,
-	__NFTA_SET_MAX
-};
-#define NFTA_SET_MAX		(__NFTA_SET_MAX - 1)
-
-/**
- * enum nft_set_elem_flags - nf_tables set element flags
- *
- * @NFT_SET_ELEM_INTERVAL_END: element ends the previous interval
- */
-enum nft_set_elem_flags {
-	NFT_SET_ELEM_INTERVAL_END	= 0x1,
-};
-
-/**
- * enum nft_set_elem_attributes - nf_tables set element netlink attributes
- *
- * @NFTA_SET_ELEM_KEY: key value (NLA_NESTED: nft_data)
- * @NFTA_SET_ELEM_DATA: data value of mapping (NLA_NESTED: nft_data_attributes)
- * @NFTA_SET_ELEM_FLAGS: bitmask of nft_set_elem_flags (NLA_U32)
- * @NFTA_SET_ELEM_TIMEOUT: timeout value (NLA_U64)
- * @NFTA_SET_ELEM_EXPIRATION: expiration time (NLA_U64)
- * @NFTA_SET_ELEM_USERDATA: user data (NLA_BINARY)
- * @NFTA_SET_ELEM_EXPR: expression (NLA_NESTED: nft_expr_attributes)
- */
-enum nft_set_elem_attributes {
-	NFTA_SET_ELEM_UNSPEC,
-	NFTA_SET_ELEM_KEY,
-	NFTA_SET_ELEM_DATA,
-	NFTA_SET_ELEM_FLAGS,
-	NFTA_SET_ELEM_TIMEOUT,
-	NFTA_SET_ELEM_EXPIRATION,
-	NFTA_SET_ELEM_USERDATA,
-	NFTA_SET_ELEM_EXPR,
-	__NFTA_SET_ELEM_MAX
-};
-#define NFTA_SET_ELEM_MAX	(__NFTA_SET_ELEM_MAX - 1)
-
-/**
- * enum nft_set_elem_list_attributes - nf_tables set element list netlink attributes
- *
- * @NFTA_SET_ELEM_LIST_TABLE: table of the set to be changed (NLA_STRING)
- * @NFTA_SET_ELEM_LIST_SET: name of the set to be changed (NLA_STRING)
- * @NFTA_SET_ELEM_LIST_ELEMENTS: list of set elements (NLA_NESTED: nft_set_elem_attributes)
- * @NFTA_SET_ELEM_LIST_SET_ID: uniquely identifies a set in a transaction (NLA_U32)
- */
-enum nft_set_elem_list_attributes {
-	NFTA_SET_ELEM_LIST_UNSPEC,
-	NFTA_SET_ELEM_LIST_TABLE,
-	NFTA_SET_ELEM_LIST_SET,
-	NFTA_SET_ELEM_LIST_ELEMENTS,
-	NFTA_SET_ELEM_LIST_SET_ID,
-	__NFTA_SET_ELEM_LIST_MAX
-};
-#define NFTA_SET_ELEM_LIST_MAX	(__NFTA_SET_ELEM_LIST_MAX - 1)
-
-/**
- * enum nft_data_types - nf_tables data types
- *
- * @NFT_DATA_VALUE: generic data
- * @NFT_DATA_VERDICT: netfilter verdict
- *
- * The type of data is usually determined by the kernel directly and is not
- * explicitly specified by userspace. The only difference are sets, where
- * userspace specifies the key and mapping data types.
- *
- * The values 0xffffff00-0xffffffff are reserved for internally used types.
- * The remaining range can be freely used by userspace to encode types, all
- * values are equivalent to NFT_DATA_VALUE.
- */
-enum nft_data_types {
-	NFT_DATA_VALUE,
-	NFT_DATA_VERDICT	= 0xffffff00U,
-};
-
-#define NFT_DATA_RESERVED_MASK	0xffffff00U
-
-/**
- * enum nft_data_attributes - nf_tables data netlink attributes
- *
- * @NFTA_DATA_VALUE: generic data (NLA_BINARY)
- * @NFTA_DATA_VERDICT: nf_tables verdict (NLA_NESTED: nft_verdict_attributes)
- */
-enum nft_data_attributes {
-	NFTA_DATA_UNSPEC,
-	NFTA_DATA_VALUE,
-	NFTA_DATA_VERDICT,
-	__NFTA_DATA_MAX
-};
-#define NFTA_DATA_MAX		(__NFTA_DATA_MAX - 1)
-
-/* Maximum length of a value */
-#define NFT_DATA_VALUE_MAXLEN	64
-
-/**
- * enum nft_verdict_attributes - nf_tables verdict netlink attributes
- *
- * @NFTA_VERDICT_CODE: nf_tables verdict (NLA_U32: enum nft_verdicts)
- * @NFTA_VERDICT_CHAIN: jump target chain name (NLA_STRING)
- */
-enum nft_verdict_attributes {
-	NFTA_VERDICT_UNSPEC,
-	NFTA_VERDICT_CODE,
-	NFTA_VERDICT_CHAIN,
-	__NFTA_VERDICT_MAX
-};
-#define NFTA_VERDICT_MAX	(__NFTA_VERDICT_MAX - 1)
-
-/**
- * enum nft_expr_attributes - nf_tables expression netlink attributes
- *
- * @NFTA_EXPR_NAME: name of the expression type (NLA_STRING)
- * @NFTA_EXPR_DATA: type specific data (NLA_NESTED)
- */
-enum nft_expr_attributes {
-	NFTA_EXPR_UNSPEC,
-	NFTA_EXPR_NAME,
-	NFTA_EXPR_DATA,
-	__NFTA_EXPR_MAX
-};
-#define NFTA_EXPR_MAX		(__NFTA_EXPR_MAX - 1)
-
-/**
- * enum nft_immediate_attributes - nf_tables immediate expression netlink attributes
- *
- * @NFTA_IMMEDIATE_DREG: destination register to load data into (NLA_U32)
- * @NFTA_IMMEDIATE_DATA: data to load (NLA_NESTED: nft_data_attributes)
- */
-enum nft_immediate_attributes {
-	NFTA_IMMEDIATE_UNSPEC,
-	NFTA_IMMEDIATE_DREG,
-	NFTA_IMMEDIATE_DATA,
-	__NFTA_IMMEDIATE_MAX
-};
-#define NFTA_IMMEDIATE_MAX	(__NFTA_IMMEDIATE_MAX - 1)
-
-/**
- * enum nft_bitwise_attributes - nf_tables bitwise expression netlink attributes
- *
- * @NFTA_BITWISE_SREG: source register (NLA_U32: nft_registers)
- * @NFTA_BITWISE_DREG: destination register (NLA_U32: nft_registers)
- * @NFTA_BITWISE_LEN: length of operands (NLA_U32)
- * @NFTA_BITWISE_MASK: mask value (NLA_NESTED: nft_data_attributes)
- * @NFTA_BITWISE_XOR: xor value (NLA_NESTED: nft_data_attributes)
- *
- * The bitwise expression performs the following operation:
- *
- * dreg = (sreg & mask) ^ xor
- *
- * which allow to express all bitwise operations:
- *
- * 		mask	xor
- * NOT:		1	1
- * OR:		0	x
- * XOR:		1	x
- * AND:		x	0
- */
-enum nft_bitwise_attributes {
-	NFTA_BITWISE_UNSPEC,
-	NFTA_BITWISE_SREG,
-	NFTA_BITWISE_DREG,
-	NFTA_BITWISE_LEN,
-	NFTA_BITWISE_MASK,
-	NFTA_BITWISE_XOR,
-	__NFTA_BITWISE_MAX
-};
-#define NFTA_BITWISE_MAX	(__NFTA_BITWISE_MAX - 1)
-
-/**
- * enum nft_byteorder_ops - nf_tables byteorder operators
- *
- * @NFT_BYTEORDER_NTOH: network to host operator
- * @NFT_BYTEORDER_HTON: host to network opertaor
- */
-enum nft_byteorder_ops {
-	NFT_BYTEORDER_NTOH,
-	NFT_BYTEORDER_HTON,
-};
-
-/**
- * enum nft_byteorder_attributes - nf_tables byteorder expression netlink attributes
- *
- * @NFTA_BYTEORDER_SREG: source register (NLA_U32: nft_registers)
- * @NFTA_BYTEORDER_DREG: destination register (NLA_U32: nft_registers)
- * @NFTA_BYTEORDER_OP: operator (NLA_U32: enum nft_byteorder_ops)
- * @NFTA_BYTEORDER_LEN: length of the data (NLA_U32)
- * @NFTA_BYTEORDER_SIZE: data size in bytes (NLA_U32: 2 or 4)
- */
-enum nft_byteorder_attributes {
-	NFTA_BYTEORDER_UNSPEC,
-	NFTA_BYTEORDER_SREG,
-	NFTA_BYTEORDER_DREG,
-	NFTA_BYTEORDER_OP,
-	NFTA_BYTEORDER_LEN,
-	NFTA_BYTEORDER_SIZE,
-	__NFTA_BYTEORDER_MAX
-};
-#define NFTA_BYTEORDER_MAX	(__NFTA_BYTEORDER_MAX - 1)
-
-/**
- * enum nft_cmp_ops - nf_tables relational operator
- *
- * @NFT_CMP_EQ: equal
- * @NFT_CMP_NEQ: not equal
- * @NFT_CMP_LT: less than
- * @NFT_CMP_LTE: less than or equal to
- * @NFT_CMP_GT: greater than
- * @NFT_CMP_GTE: greater than or equal to
- */
-enum nft_cmp_ops {
-	NFT_CMP_EQ,
-	NFT_CMP_NEQ,
-	NFT_CMP_LT,
-	NFT_CMP_LTE,
-	NFT_CMP_GT,
-	NFT_CMP_GTE,
-};
-
-/**
- * enum nft_cmp_attributes - nf_tables cmp expression netlink attributes
- *
- * @NFTA_CMP_SREG: source register of data to compare (NLA_U32: nft_registers)
- * @NFTA_CMP_OP: cmp operation (NLA_U32: nft_cmp_ops)
- * @NFTA_CMP_DATA: data to compare against (NLA_NESTED: nft_data_attributes)
- */
-enum nft_cmp_attributes {
-	NFTA_CMP_UNSPEC,
-	NFTA_CMP_SREG,
-	NFTA_CMP_OP,
-	NFTA_CMP_DATA,
-	__NFTA_CMP_MAX
-};
-#define NFTA_CMP_MAX		(__NFTA_CMP_MAX - 1)
-
-/**
- * enum nft_lookup_attributes - nf_tables set lookup expression netlink attributes
- *
- * @NFTA_LOOKUP_SET: name of the set where to look for (NLA_STRING)
- * @NFTA_LOOKUP_SREG: source register of the data to look for (NLA_U32: nft_registers)
- * @NFTA_LOOKUP_DREG: destination register (NLA_U32: nft_registers)
- * @NFTA_LOOKUP_SET_ID: uniquely identifies a set in a transaction (NLA_U32)
- */
-enum nft_lookup_attributes {
-	NFTA_LOOKUP_UNSPEC,
-	NFTA_LOOKUP_SET,
-	NFTA_LOOKUP_SREG,
-	NFTA_LOOKUP_DREG,
-	NFTA_LOOKUP_SET_ID,
-	__NFTA_LOOKUP_MAX
-};
-#define NFTA_LOOKUP_MAX		(__NFTA_LOOKUP_MAX - 1)
-
-enum nft_dynset_ops {
-	NFT_DYNSET_OP_ADD,
-	NFT_DYNSET_OP_UPDATE,
-};
-
-/**
- * enum nft_dynset_attributes - dynset expression attributes
- *
- * @NFTA_DYNSET_SET_NAME: name of set the to add data to (NLA_STRING)
- * @NFTA_DYNSET_SET_ID: uniquely identifier of the set in the transaction (NLA_U32)
- * @NFTA_DYNSET_OP: operation (NLA_U32)
- * @NFTA_DYNSET_SREG_KEY: source register of the key (NLA_U32)
- * @NFTA_DYNSET_SREG_DATA: source register of the data (NLA_U32)
- * @NFTA_DYNSET_TIMEOUT: timeout value for the new element (NLA_U64)
- * @NFTA_DYNSET_EXPR: expression (NLA_NESTED: nft_expr_attributes)
- */
-enum nft_dynset_attributes {
-	NFTA_DYNSET_UNSPEC,
-	NFTA_DYNSET_SET_NAME,
-	NFTA_DYNSET_SET_ID,
-	NFTA_DYNSET_OP,
-	NFTA_DYNSET_SREG_KEY,
-	NFTA_DYNSET_SREG_DATA,
-	NFTA_DYNSET_TIMEOUT,
-	NFTA_DYNSET_EXPR,
-	__NFTA_DYNSET_MAX,
-};
-#define NFTA_DYNSET_MAX		(__NFTA_DYNSET_MAX - 1)
-
-/**
- * enum nft_payload_bases - nf_tables payload expression offset bases
- *
- * @NFT_PAYLOAD_LL_HEADER: link layer header
- * @NFT_PAYLOAD_NETWORK_HEADER: network header
- * @NFT_PAYLOAD_TRANSPORT_HEADER: transport header
- */
-enum nft_payload_bases {
-	NFT_PAYLOAD_LL_HEADER,
-	NFT_PAYLOAD_NETWORK_HEADER,
-	NFT_PAYLOAD_TRANSPORT_HEADER,
-};
-
-/**
- * enum nft_payload_attributes - nf_tables payload expression netlink attributes
- *
- * @NFTA_PAYLOAD_DREG: destination register to load data into (NLA_U32: nft_registers)
- * @NFTA_PAYLOAD_BASE: payload base (NLA_U32: nft_payload_bases)
- * @NFTA_PAYLOAD_OFFSET: payload offset relative to base (NLA_U32)
- * @NFTA_PAYLOAD_LEN: payload length (NLA_U32)
- */
-enum nft_payload_attributes {
-	NFTA_PAYLOAD_UNSPEC,
-	NFTA_PAYLOAD_DREG,
-	NFTA_PAYLOAD_BASE,
-	NFTA_PAYLOAD_OFFSET,
-	NFTA_PAYLOAD_LEN,
-	__NFTA_PAYLOAD_MAX
-};
-#define NFTA_PAYLOAD_MAX	(__NFTA_PAYLOAD_MAX - 1)
-
-/**
- * enum nft_exthdr_attributes - nf_tables IPv6 extension header expression netlink attributes
- *
- * @NFTA_EXTHDR_DREG: destination register (NLA_U32: nft_registers)
- * @NFTA_EXTHDR_TYPE: extension header type (NLA_U8)
- * @NFTA_EXTHDR_OFFSET: extension header offset (NLA_U32)
- * @NFTA_EXTHDR_LEN: extension header length (NLA_U32)
- */
-enum nft_exthdr_attributes {
-	NFTA_EXTHDR_UNSPEC,
-	NFTA_EXTHDR_DREG,
-	NFTA_EXTHDR_TYPE,
-	NFTA_EXTHDR_OFFSET,
-	NFTA_EXTHDR_LEN,
-	__NFTA_EXTHDR_MAX
-};
-#define NFTA_EXTHDR_MAX		(__NFTA_EXTHDR_MAX - 1)
-
-/**
- * enum nft_meta_keys - nf_tables meta expression keys
- *
- * @NFT_META_LEN: packet length (skb->len)
- * @NFT_META_PROTOCOL: packet ethertype protocol (skb->protocol), invalid in OUTPUT
- * @NFT_META_PRIORITY: packet priority (skb->priority)
- * @NFT_META_MARK: packet mark (skb->mark)
- * @NFT_META_IIF: packet input interface index (dev->ifindex)
- * @NFT_META_OIF: packet output interface index (dev->ifindex)
- * @NFT_META_IIFNAME: packet input interface name (dev->name)
- * @NFT_META_OIFNAME: packet output interface name (dev->name)
- * @NFT_META_IIFTYPE: packet input interface type (dev->type)
- * @NFT_META_OIFTYPE: packet output interface type (dev->type)
- * @NFT_META_SKUID: originating socket UID (fsuid)
- * @NFT_META_SKGID: originating socket GID (fsgid)
- * @NFT_META_NFTRACE: packet nftrace bit
- * @NFT_META_RTCLASSID: realm value of packet's route (skb->dst->tclassid)
- * @NFT_META_SECMARK: packet secmark (skb->secmark)
- * @NFT_META_NFPROTO: netfilter protocol
- * @NFT_META_L4PROTO: layer 4 protocol number
- * @NFT_META_BRI_IIFNAME: packet input bridge interface name
- * @NFT_META_BRI_OIFNAME: packet output bridge interface name
- * @NFT_META_PKTTYPE: packet type (skb->pkt_type), special handling for loopback
- * @NFT_META_CPU: cpu id through smp_processor_id()
- * @NFT_META_IIFGROUP: packet input interface group
- * @NFT_META_OIFGROUP: packet output interface group
- * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid)
- */
-enum nft_meta_keys {
-	NFT_META_LEN,
-	NFT_META_PROTOCOL,
-	NFT_META_PRIORITY,
-	NFT_META_MARK,
-	NFT_META_IIF,
-	NFT_META_OIF,
-	NFT_META_IIFNAME,
-	NFT_META_OIFNAME,
-	NFT_META_IIFTYPE,
-	NFT_META_OIFTYPE,
-	NFT_META_SKUID,
-	NFT_META_SKGID,
-	NFT_META_NFTRACE,
-	NFT_META_RTCLASSID,
-	NFT_META_SECMARK,
-	NFT_META_NFPROTO,
-	NFT_META_L4PROTO,
-	NFT_META_BRI_IIFNAME,
-	NFT_META_BRI_OIFNAME,
-	NFT_META_PKTTYPE,
-	NFT_META_CPU,
-	NFT_META_IIFGROUP,
-	NFT_META_OIFGROUP,
-	NFT_META_CGROUP,
-};
-
-/**
- * enum nft_meta_attributes - nf_tables meta expression netlink attributes
- *
- * @NFTA_META_DREG: destination register (NLA_U32)
- * @NFTA_META_KEY: meta data item to load (NLA_U32: nft_meta_keys)
- * @NFTA_META_SREG: source register (NLA_U32)
- */
-enum nft_meta_attributes {
-	NFTA_META_UNSPEC,
-	NFTA_META_DREG,
-	NFTA_META_KEY,
-	NFTA_META_SREG,
-	__NFTA_META_MAX
-};
-#define NFTA_META_MAX		(__NFTA_META_MAX - 1)
-
-/**
- * enum nft_ct_keys - nf_tables ct expression keys
- *
- * @NFT_CT_STATE: conntrack state (bitmask of enum ip_conntrack_info)
- * @NFT_CT_DIRECTION: conntrack direction (enum ip_conntrack_dir)
- * @NFT_CT_STATUS: conntrack status (bitmask of enum ip_conntrack_status)
- * @NFT_CT_MARK: conntrack mark value
- * @NFT_CT_SECMARK: conntrack secmark value
- * @NFT_CT_EXPIRATION: relative conntrack expiration time in ms
- * @NFT_CT_HELPER: connection tracking helper assigned to conntrack
- * @NFT_CT_L3PROTOCOL: conntrack layer 3 protocol
- * @NFT_CT_SRC: conntrack layer 3 protocol source (IPv4/IPv6 address)
- * @NFT_CT_DST: conntrack layer 3 protocol destination (IPv4/IPv6 address)
- * @NFT_CT_PROTOCOL: conntrack layer 4 protocol
- * @NFT_CT_PROTO_SRC: conntrack layer 4 protocol source
- * @NFT_CT_PROTO_DST: conntrack layer 4 protocol destination
- */
-enum nft_ct_keys {
-	NFT_CT_STATE,
-	NFT_CT_DIRECTION,
-	NFT_CT_STATUS,
-	NFT_CT_MARK,
-	NFT_CT_SECMARK,
-	NFT_CT_EXPIRATION,
-	NFT_CT_HELPER,
-	NFT_CT_L3PROTOCOL,
-	NFT_CT_SRC,
-	NFT_CT_DST,
-	NFT_CT_PROTOCOL,
-	NFT_CT_PROTO_SRC,
-	NFT_CT_PROTO_DST,
-	NFT_CT_LABELS,
-};
-
-/**
- * enum nft_ct_attributes - nf_tables ct expression netlink attributes
- *
- * @NFTA_CT_DREG: destination register (NLA_U32)
- * @NFTA_CT_KEY: conntrack data item to load (NLA_U32: nft_ct_keys)
- * @NFTA_CT_DIRECTION: direction in case of directional keys (NLA_U8)
- * @NFTA_CT_SREG: source register (NLA_U32)
- */
-enum nft_ct_attributes {
-	NFTA_CT_UNSPEC,
-	NFTA_CT_DREG,
-	NFTA_CT_KEY,
-	NFTA_CT_DIRECTION,
-	NFTA_CT_SREG,
-	__NFTA_CT_MAX
-};
-#define NFTA_CT_MAX		(__NFTA_CT_MAX - 1)
-
-enum nft_limit_type {
-	NFT_LIMIT_PKTS,
-	NFT_LIMIT_PKT_BYTES
-};
-
-/**
- * enum nft_limit_attributes - nf_tables limit expression netlink attributes
- *
- * @NFTA_LIMIT_RATE: refill rate (NLA_U64)
- * @NFTA_LIMIT_UNIT: refill unit (NLA_U64)
- * @NFTA_LIMIT_BURST: burst (NLA_U32)
- * @NFTA_LIMIT_TYPE: type of limit (NLA_U32: enum nft_limit_type)
- */
-enum nft_limit_attributes {
-	NFTA_LIMIT_UNSPEC,
-	NFTA_LIMIT_RATE,
-	NFTA_LIMIT_UNIT,
-	NFTA_LIMIT_BURST,
-	NFTA_LIMIT_TYPE,
-	__NFTA_LIMIT_MAX
-};
-#define NFTA_LIMIT_MAX		(__NFTA_LIMIT_MAX - 1)
-
-/**
- * enum nft_counter_attributes - nf_tables counter expression netlink attributes
- *
- * @NFTA_COUNTER_BYTES: number of bytes (NLA_U64)
- * @NFTA_COUNTER_PACKETS: number of packets (NLA_U64)
- */
-enum nft_counter_attributes {
-	NFTA_COUNTER_UNSPEC,
-	NFTA_COUNTER_BYTES,
-	NFTA_COUNTER_PACKETS,
-	__NFTA_COUNTER_MAX
-};
-#define NFTA_COUNTER_MAX	(__NFTA_COUNTER_MAX - 1)
-
-/**
- * enum nft_log_attributes - nf_tables log expression netlink attributes
- *
- * @NFTA_LOG_GROUP: netlink group to send messages to (NLA_U32)
- * @NFTA_LOG_PREFIX: prefix to prepend to log messages (NLA_STRING)
- * @NFTA_LOG_SNAPLEN: length of payload to include in netlink message (NLA_U32)
- * @NFTA_LOG_QTHRESHOLD: queue threshold (NLA_U32)
- * @NFTA_LOG_LEVEL: log level (NLA_U32)
- * @NFTA_LOG_FLAGS: logging flags (NLA_U32)
- */
-enum nft_log_attributes {
-	NFTA_LOG_UNSPEC,
-	NFTA_LOG_GROUP,
-	NFTA_LOG_PREFIX,
-	NFTA_LOG_SNAPLEN,
-	NFTA_LOG_QTHRESHOLD,
-	NFTA_LOG_LEVEL,
-	NFTA_LOG_FLAGS,
-	__NFTA_LOG_MAX
-};
-#define NFTA_LOG_MAX		(__NFTA_LOG_MAX - 1)
-
-/**
- * enum nft_queue_attributes - nf_tables queue expression netlink attributes
- *
- * @NFTA_QUEUE_NUM: netlink queue to send messages to (NLA_U16)
- * @NFTA_QUEUE_TOTAL: number of queues to load balance packets on (NLA_U16)
- * @NFTA_QUEUE_FLAGS: various flags (NLA_U16)
- */
-enum nft_queue_attributes {
-	NFTA_QUEUE_UNSPEC,
-	NFTA_QUEUE_NUM,
-	NFTA_QUEUE_TOTAL,
-	NFTA_QUEUE_FLAGS,
-	__NFTA_QUEUE_MAX
-};
-#define NFTA_QUEUE_MAX		(__NFTA_QUEUE_MAX - 1)
-
-#define NFT_QUEUE_FLAG_BYPASS		0x01 /* for compatibility with v2 */
-#define NFT_QUEUE_FLAG_CPU_FANOUT	0x02 /* use current CPU (no hashing) */
-#define NFT_QUEUE_FLAG_MASK		0x03
-
-/**
- * enum nft_reject_types - nf_tables reject expression reject types
- *
- * @NFT_REJECT_ICMP_UNREACH: reject using ICMP unreachable
- * @NFT_REJECT_TCP_RST: reject using TCP RST
- * @NFT_REJECT_ICMPX_UNREACH: abstracted ICMP unreachable for bridge and inet
- */
-enum nft_reject_types {
-	NFT_REJECT_ICMP_UNREACH,
-	NFT_REJECT_TCP_RST,
-	NFT_REJECT_ICMPX_UNREACH,
-};
-
-/**
- * enum nft_reject_code - Generic reject codes for IPv4/IPv6
- *
- * @NFT_REJECT_ICMPX_NO_ROUTE: no route to host / network unreachable
- * @NFT_REJECT_ICMPX_PORT_UNREACH: port unreachable
- * @NFT_REJECT_ICMPX_HOST_UNREACH: host unreachable
- * @NFT_REJECT_ICMPX_ADMIN_PROHIBITED: administratively prohibited
- *
- * These codes are mapped to real ICMP and ICMPv6 codes.
- */
-enum nft_reject_inet_code {
-	NFT_REJECT_ICMPX_NO_ROUTE	= 0,
-	NFT_REJECT_ICMPX_PORT_UNREACH,
-	NFT_REJECT_ICMPX_HOST_UNREACH,
-	NFT_REJECT_ICMPX_ADMIN_PROHIBITED,
-	__NFT_REJECT_ICMPX_MAX
-};
-#define NFT_REJECT_ICMPX_MAX	(__NFT_REJECT_ICMPX_MAX - 1)
-
-/**
- * enum nft_reject_attributes - nf_tables reject expression netlink attributes
- *
- * @NFTA_REJECT_TYPE: packet type to use (NLA_U32: nft_reject_types)
- * @NFTA_REJECT_ICMP_CODE: ICMP code to use (NLA_U8)
- */
-enum nft_reject_attributes {
-	NFTA_REJECT_UNSPEC,
-	NFTA_REJECT_TYPE,
-	NFTA_REJECT_ICMP_CODE,
-	__NFTA_REJECT_MAX
-};
-#define NFTA_REJECT_MAX		(__NFTA_REJECT_MAX - 1)
-
-/**
- * enum nft_nat_types - nf_tables nat expression NAT types
- *
- * @NFT_NAT_SNAT: source NAT
- * @NFT_NAT_DNAT: destination NAT
- */
-enum nft_nat_types {
-	NFT_NAT_SNAT,
-	NFT_NAT_DNAT,
-};
-
-/**
- * enum nft_nat_attributes - nf_tables nat expression netlink attributes
- *
- * @NFTA_NAT_TYPE: NAT type (NLA_U32: nft_nat_types)
- * @NFTA_NAT_FAMILY: NAT family (NLA_U32)
- * @NFTA_NAT_REG_ADDR_MIN: source register of address range start (NLA_U32: nft_registers)
- * @NFTA_NAT_REG_ADDR_MAX: source register of address range end (NLA_U32: nft_registers)
- * @NFTA_NAT_REG_PROTO_MIN: source register of proto range start (NLA_U32: nft_registers)
- * @NFTA_NAT_REG_PROTO_MAX: source register of proto range end (NLA_U32: nft_registers)
- * @NFTA_NAT_FLAGS: NAT flags (see NF_NAT_RANGE_* in linux/netfilter/nf_nat.h) (NLA_U32)
- */
-enum nft_nat_attributes {
-	NFTA_NAT_UNSPEC,
-	NFTA_NAT_TYPE,
-	NFTA_NAT_FAMILY,
-	NFTA_NAT_REG_ADDR_MIN,
-	NFTA_NAT_REG_ADDR_MAX,
-	NFTA_NAT_REG_PROTO_MIN,
-	NFTA_NAT_REG_PROTO_MAX,
-	NFTA_NAT_FLAGS,
-	__NFTA_NAT_MAX
-};
-#define NFTA_NAT_MAX		(__NFTA_NAT_MAX - 1)
-
-/**
- * enum nft_masq_attributes - nf_tables masquerade expression attributes
- *
- * @NFTA_MASQ_FLAGS: NAT flags (see NF_NAT_RANGE_* in linux/netfilter/nf_nat.h) (NLA_U32)
- */
-enum nft_masq_attributes {
-	NFTA_MASQ_UNSPEC,
-	NFTA_MASQ_FLAGS,
-	__NFTA_MASQ_MAX
-};
-#define NFTA_MASQ_MAX		(__NFTA_MASQ_MAX - 1)
-
-/**
- * enum nft_redir_attributes - nf_tables redirect expression netlink attributes
- *
- * @NFTA_REDIR_REG_PROTO_MIN: source register of proto range start (NLA_U32: nft_registers)
- * @NFTA_REDIR_REG_PROTO_MAX: source register of proto range end (NLA_U32: nft_registers)
- * @NFTA_REDIR_FLAGS: NAT flags (see NF_NAT_RANGE_* in linux/netfilter/nf_nat.h) (NLA_U32)
- */
-enum nft_redir_attributes {
-	NFTA_REDIR_UNSPEC,
-	NFTA_REDIR_REG_PROTO_MIN,
-	NFTA_REDIR_REG_PROTO_MAX,
-	NFTA_REDIR_FLAGS,
-	__NFTA_REDIR_MAX
-};
-#define NFTA_REDIR_MAX		(__NFTA_REDIR_MAX - 1)
-
-/**
- * enum nft_dup_attributes - nf_tables dup expression netlink attributes
- *
- * @NFTA_DUP_SREG_ADDR: source register of address (NLA_U32: nft_registers)
- * @NFTA_DUP_SREG_DEV: source register of output interface (NLA_U32: nft_register)
- */
-enum nft_dup_attributes {
-	NFTA_DUP_UNSPEC,
-	NFTA_DUP_SREG_ADDR,
-	NFTA_DUP_SREG_DEV,
-	__NFTA_DUP_MAX
-};
-#define NFTA_DUP_MAX		(__NFTA_DUP_MAX - 1)
-
-/**
- * enum nft_gen_attributes - nf_tables ruleset generation attributes
- *
- * @NFTA_GEN_ID: Ruleset generation ID (NLA_U32)
- */
-enum nft_gen_attributes {
-	NFTA_GEN_UNSPEC,
-	NFTA_GEN_ID,
-	__NFTA_GEN_MAX
-};
-#define NFTA_GEN_MAX		(__NFTA_GEN_MAX - 1)
-
-#endif /* _LINUX_NF_TABLES_H */
diff --git a/openflow/usr/include/linux/netfilter/nf_tables_compat.h b/openflow/usr/include/linux/netfilter/nf_tables_compat.h
deleted file mode 100644
index 8310f5f..0000000
--- a/openflow/usr/include/linux/netfilter/nf_tables_compat.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _NFT_COMPAT_NFNETLINK_H_
-#define _NFT_COMPAT_NFNETLINK_H_
-
-enum nft_target_attributes {
-	NFTA_TARGET_UNSPEC,
-	NFTA_TARGET_NAME,
-	NFTA_TARGET_REV,
-	NFTA_TARGET_INFO,
-	__NFTA_TARGET_MAX
-};
-#define NFTA_TARGET_MAX		(__NFTA_TARGET_MAX - 1)
-
-enum nft_match_attributes {
-	NFTA_MATCH_UNSPEC,
-	NFTA_MATCH_NAME,
-	NFTA_MATCH_REV,
-	NFTA_MATCH_INFO,
-	__NFTA_MATCH_MAX
-};
-#define NFTA_MATCH_MAX		(__NFTA_MATCH_MAX - 1)
-
-#define NFT_COMPAT_NAME_MAX	32
-
-enum {
-	NFNL_MSG_COMPAT_GET,
-	NFNL_MSG_COMPAT_MAX
-};
-
-enum {
-	NFTA_COMPAT_UNSPEC = 0,
-	NFTA_COMPAT_NAME,
-	NFTA_COMPAT_REV,
-	NFTA_COMPAT_TYPE,
-	__NFTA_COMPAT_MAX,
-};
-#define NFTA_COMPAT_MAX (__NFTA_COMPAT_MAX - 1)
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter/nfnetlink.h b/openflow/usr/include/linux/netfilter/nfnetlink.h
deleted file mode 100644
index c755646..0000000
--- a/openflow/usr/include/linux/netfilter/nfnetlink.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _NFNETLINK_H
-#define _NFNETLINK_H
-#include <linux/types.h>
-#include <linux/netfilter/nfnetlink_compat.h>
-
-enum nfnetlink_groups {
-	NFNLGRP_NONE,
-#define NFNLGRP_NONE			NFNLGRP_NONE
-	NFNLGRP_CONNTRACK_NEW,
-#define NFNLGRP_CONNTRACK_NEW		NFNLGRP_CONNTRACK_NEW
-	NFNLGRP_CONNTRACK_UPDATE,
-#define NFNLGRP_CONNTRACK_UPDATE	NFNLGRP_CONNTRACK_UPDATE
-	NFNLGRP_CONNTRACK_DESTROY,
-#define NFNLGRP_CONNTRACK_DESTROY	NFNLGRP_CONNTRACK_DESTROY
-	NFNLGRP_CONNTRACK_EXP_NEW,
-#define	NFNLGRP_CONNTRACK_EXP_NEW	NFNLGRP_CONNTRACK_EXP_NEW
-	NFNLGRP_CONNTRACK_EXP_UPDATE,
-#define NFNLGRP_CONNTRACK_EXP_UPDATE	NFNLGRP_CONNTRACK_EXP_UPDATE
-	NFNLGRP_CONNTRACK_EXP_DESTROY,
-#define NFNLGRP_CONNTRACK_EXP_DESTROY	NFNLGRP_CONNTRACK_EXP_DESTROY
-	NFNLGRP_NFTABLES,
-#define NFNLGRP_NFTABLES                NFNLGRP_NFTABLES
-	NFNLGRP_ACCT_QUOTA,
-#define NFNLGRP_ACCT_QUOTA		NFNLGRP_ACCT_QUOTA
-	__NFNLGRP_MAX,
-};
-#define NFNLGRP_MAX	(__NFNLGRP_MAX - 1)
-
-/* General form of address family dependent message.
- */
-struct nfgenmsg {
-	__u8  nfgen_family;		/* AF_xxx */
-	__u8  version;		/* nfnetlink version */
-	__be16    res_id;		/* resource id */
-};
-
-#define NFNETLINK_V0	0
-
-/* netfilter netlink message types are split in two pieces:
- * 8 bit subsystem, 8bit operation.
- */
-
-#define NFNL_SUBSYS_ID(x)	((x & 0xff00) >> 8)
-#define NFNL_MSG_TYPE(x)	(x & 0x00ff)
-
-/* No enum here, otherwise __stringify() trick of MODULE_ALIAS_NFNL_SUBSYS()
- * won't work anymore */
-#define NFNL_SUBSYS_NONE 		0
-#define NFNL_SUBSYS_CTNETLINK		1
-#define NFNL_SUBSYS_CTNETLINK_EXP	2
-#define NFNL_SUBSYS_QUEUE		3
-#define NFNL_SUBSYS_ULOG		4
-#define NFNL_SUBSYS_OSF			5
-#define NFNL_SUBSYS_IPSET		6
-#define NFNL_SUBSYS_ACCT		7
-#define NFNL_SUBSYS_CTNETLINK_TIMEOUT	8
-#define NFNL_SUBSYS_CTHELPER		9
-#define NFNL_SUBSYS_NFTABLES		10
-#define NFNL_SUBSYS_NFT_COMPAT		11
-#define NFNL_SUBSYS_COUNT		12
-
-/* Reserved control nfnetlink messages */
-#define NFNL_MSG_BATCH_BEGIN		NLMSG_MIN_TYPE
-#define NFNL_MSG_BATCH_END		NLMSG_MIN_TYPE+1
-
-#endif /* _NFNETLINK_H */
diff --git a/openflow/usr/include/linux/netfilter/nfnetlink_acct.h b/openflow/usr/include/linux/netfilter/nfnetlink_acct.h
deleted file mode 100644
index 98b6286..0000000
--- a/openflow/usr/include/linux/netfilter/nfnetlink_acct.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _NFNL_ACCT_H_
-#define _NFNL_ACCT_H_
-
-#ifndef NFACCT_NAME_MAX
-#define NFACCT_NAME_MAX		32
-#endif
-
-enum nfnl_acct_msg_types {
-	NFNL_MSG_ACCT_NEW,
-	NFNL_MSG_ACCT_GET,
-	NFNL_MSG_ACCT_GET_CTRZERO,
-	NFNL_MSG_ACCT_DEL,
-	NFNL_MSG_ACCT_OVERQUOTA,
-	NFNL_MSG_ACCT_MAX
-};
-
-enum nfnl_acct_flags {
-	NFACCT_F_QUOTA_PKTS	= (1 << 0),
-	NFACCT_F_QUOTA_BYTES	= (1 << 1),
-	NFACCT_F_OVERQUOTA	= (1 << 2), /* can't be set from userspace */
-};
-
-enum nfnl_acct_type {
-	NFACCT_UNSPEC,
-	NFACCT_NAME,
-	NFACCT_PKTS,
-	NFACCT_BYTES,
-	NFACCT_USE,
-	NFACCT_FLAGS,
-	NFACCT_QUOTA,
-	NFACCT_FILTER,
-	__NFACCT_MAX
-};
-#define NFACCT_MAX (__NFACCT_MAX - 1)
-
-enum nfnl_attr_filter_type {
-	NFACCT_FILTER_UNSPEC,
-	NFACCT_FILTER_MASK,
-	NFACCT_FILTER_VALUE,
-	__NFACCT_FILTER_MAX
-};
-#define NFACCT_FILTER_MAX (__NFACCT_FILTER_MAX - 1)
-
-#endif /* _NFNL_ACCT_H_ */
diff --git a/openflow/usr/include/linux/netfilter/nfnetlink_compat.h b/openflow/usr/include/linux/netfilter/nfnetlink_compat.h
deleted file mode 100644
index 74b9e55..0000000
--- a/openflow/usr/include/linux/netfilter/nfnetlink_compat.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef _NFNETLINK_COMPAT_H
-#define _NFNETLINK_COMPAT_H
-
-#include <linux/types.h>
-
-/* Old nfnetlink macros for userspace */
-
-/* nfnetlink groups: Up to 32 maximum */
-#define NF_NETLINK_CONNTRACK_NEW 		0x00000001
-#define NF_NETLINK_CONNTRACK_UPDATE		0x00000002
-#define NF_NETLINK_CONNTRACK_DESTROY		0x00000004
-#define NF_NETLINK_CONNTRACK_EXP_NEW		0x00000008
-#define NF_NETLINK_CONNTRACK_EXP_UPDATE		0x00000010
-#define NF_NETLINK_CONNTRACK_EXP_DESTROY	0x00000020
-
-/* Generic structure for encapsulation optional netfilter information.
- * It is reminiscent of sockaddr, but with sa_family replaced
- * with attribute type.
- * ! This should someday be put somewhere generic as now rtnetlink and
- * ! nfnetlink use the same attributes methods. - J. Schulist.
- */
-
-struct nfattr {
-	__u16 nfa_len;
-	__u16 nfa_type;	/* we use 15 bits for the type, and the highest
-				 * bit to indicate whether the payload is nested */
-};
-
-/* FIXME: Apart from NFNL_NFA_NESTED shamelessly copy and pasted from
- * rtnetlink.h, it's time to put this in a generic file */
-
-#define NFNL_NFA_NEST	0x8000
-#define NFA_TYPE(attr) 	((attr)->nfa_type & 0x7fff)
-
-#define NFA_ALIGNTO     4
-#define NFA_ALIGN(len)	(((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1))
-#define NFA_OK(nfa,len)	((len) > 0 && (nfa)->nfa_len >= sizeof(struct nfattr) \
-	&& (nfa)->nfa_len <= (len))
-#define NFA_NEXT(nfa,attrlen)	((attrlen) -= NFA_ALIGN((nfa)->nfa_len), \
-	(struct nfattr *)(((char *)(nfa)) + NFA_ALIGN((nfa)->nfa_len)))
-#define NFA_LENGTH(len)	(NFA_ALIGN(sizeof(struct nfattr)) + (len))
-#define NFA_SPACE(len)	NFA_ALIGN(NFA_LENGTH(len))
-#define NFA_DATA(nfa)   ((void *)(((char *)(nfa)) + NFA_LENGTH(0)))
-#define NFA_PAYLOAD(nfa) ((int)((nfa)->nfa_len) - NFA_LENGTH(0))
-#define NFA_NEST(skb, type) \
-({	struct nfattr *__start = (struct nfattr *)skb_tail_pointer(skb); \
-	NFA_PUT(skb, (NFNL_NFA_NEST | type), 0, NULL); \
-	__start;  })
-#define NFA_NEST_END(skb, start) \
-({      (start)->nfa_len = skb_tail_pointer(skb) - (unsigned char *)(start); \
-        (skb)->len; })
-#define NFA_NEST_CANCEL(skb, start) \
-({      if (start) \
-                skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
-        -1; })
-
-#define NFM_NFA(n)      ((struct nfattr *)(((char *)(n)) \
-        + NLMSG_ALIGN(sizeof(struct nfgenmsg))))
-#define NFM_PAYLOAD(n)  NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg))
-
-#endif /* _NFNETLINK_COMPAT_H */
diff --git a/openflow/usr/include/linux/netfilter/nfnetlink_conntrack.h b/openflow/usr/include/linux/netfilter/nfnetlink_conntrack.h
deleted file mode 100644
index c1a4e14..0000000
--- a/openflow/usr/include/linux/netfilter/nfnetlink_conntrack.h
+++ /dev/null
@@ -1,264 +0,0 @@
-#ifndef _IPCONNTRACK_NETLINK_H
-#define _IPCONNTRACK_NETLINK_H
-#include <linux/netfilter/nfnetlink.h>
-
-enum cntl_msg_types {
-	IPCTNL_MSG_CT_NEW,
-	IPCTNL_MSG_CT_GET,
-	IPCTNL_MSG_CT_DELETE,
-	IPCTNL_MSG_CT_GET_CTRZERO,
-	IPCTNL_MSG_CT_GET_STATS_CPU,
-	IPCTNL_MSG_CT_GET_STATS,
-	IPCTNL_MSG_CT_GET_DYING,
-	IPCTNL_MSG_CT_GET_UNCONFIRMED,
-
-	IPCTNL_MSG_MAX
-};
-
-enum ctnl_exp_msg_types {
-	IPCTNL_MSG_EXP_NEW,
-	IPCTNL_MSG_EXP_GET,
-	IPCTNL_MSG_EXP_DELETE,
-	IPCTNL_MSG_EXP_GET_STATS_CPU,
-
-	IPCTNL_MSG_EXP_MAX
-};
-
-
-enum ctattr_type {
-	CTA_UNSPEC,
-	CTA_TUPLE_ORIG,
-	CTA_TUPLE_REPLY,
-	CTA_STATUS,
-	CTA_PROTOINFO,
-	CTA_HELP,
-	CTA_NAT_SRC,
-#define CTA_NAT	CTA_NAT_SRC	/* backwards compatibility */
-	CTA_TIMEOUT,
-	CTA_MARK,
-	CTA_COUNTERS_ORIG,
-	CTA_COUNTERS_REPLY,
-	CTA_USE,
-	CTA_ID,
-	CTA_NAT_DST,
-	CTA_TUPLE_MASTER,
-	CTA_SEQ_ADJ_ORIG,
-	CTA_NAT_SEQ_ADJ_ORIG	= CTA_SEQ_ADJ_ORIG,
-	CTA_SEQ_ADJ_REPLY,
-	CTA_NAT_SEQ_ADJ_REPLY	= CTA_SEQ_ADJ_REPLY,
-	CTA_SECMARK,		/* obsolete */
-	CTA_ZONE,
-	CTA_SECCTX,
-	CTA_TIMESTAMP,
-	CTA_MARK_MASK,
-	CTA_LABELS,
-	CTA_LABELS_MASK,
-	__CTA_MAX
-};
-#define CTA_MAX (__CTA_MAX - 1)
-
-enum ctattr_tuple {
-	CTA_TUPLE_UNSPEC,
-	CTA_TUPLE_IP,
-	CTA_TUPLE_PROTO,
-	CTA_TUPLE_ZONE,
-	__CTA_TUPLE_MAX
-};
-#define CTA_TUPLE_MAX (__CTA_TUPLE_MAX - 1)
-
-enum ctattr_ip {
-	CTA_IP_UNSPEC,
-	CTA_IP_V4_SRC,
-	CTA_IP_V4_DST,
-	CTA_IP_V6_SRC,
-	CTA_IP_V6_DST,
-	__CTA_IP_MAX
-};
-#define CTA_IP_MAX (__CTA_IP_MAX - 1)
-
-enum ctattr_l4proto {
-	CTA_PROTO_UNSPEC,
-	CTA_PROTO_NUM,
-	CTA_PROTO_SRC_PORT,
-	CTA_PROTO_DST_PORT,
-	CTA_PROTO_ICMP_ID,
-	CTA_PROTO_ICMP_TYPE,
-	CTA_PROTO_ICMP_CODE,
-	CTA_PROTO_ICMPV6_ID,
-	CTA_PROTO_ICMPV6_TYPE,
-	CTA_PROTO_ICMPV6_CODE,
-	__CTA_PROTO_MAX
-};
-#define CTA_PROTO_MAX (__CTA_PROTO_MAX - 1)
-
-enum ctattr_protoinfo {
-	CTA_PROTOINFO_UNSPEC,
-	CTA_PROTOINFO_TCP,
-	CTA_PROTOINFO_DCCP,
-	CTA_PROTOINFO_SCTP,
-	__CTA_PROTOINFO_MAX
-};
-#define CTA_PROTOINFO_MAX (__CTA_PROTOINFO_MAX - 1)
-
-enum ctattr_protoinfo_tcp {
-	CTA_PROTOINFO_TCP_UNSPEC,
-	CTA_PROTOINFO_TCP_STATE,
-	CTA_PROTOINFO_TCP_WSCALE_ORIGINAL,
-	CTA_PROTOINFO_TCP_WSCALE_REPLY,
-	CTA_PROTOINFO_TCP_FLAGS_ORIGINAL,
-	CTA_PROTOINFO_TCP_FLAGS_REPLY,
-	__CTA_PROTOINFO_TCP_MAX
-};
-#define CTA_PROTOINFO_TCP_MAX (__CTA_PROTOINFO_TCP_MAX - 1)
-
-enum ctattr_protoinfo_dccp {
-	CTA_PROTOINFO_DCCP_UNSPEC,
-	CTA_PROTOINFO_DCCP_STATE,
-	CTA_PROTOINFO_DCCP_ROLE,
-	CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ,
-	__CTA_PROTOINFO_DCCP_MAX,
-};
-#define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1)
-
-enum ctattr_protoinfo_sctp {
-	CTA_PROTOINFO_SCTP_UNSPEC,
-	CTA_PROTOINFO_SCTP_STATE,
-	CTA_PROTOINFO_SCTP_VTAG_ORIGINAL,
-	CTA_PROTOINFO_SCTP_VTAG_REPLY,
-	__CTA_PROTOINFO_SCTP_MAX
-};
-#define CTA_PROTOINFO_SCTP_MAX (__CTA_PROTOINFO_SCTP_MAX - 1)
-
-enum ctattr_counters {
-	CTA_COUNTERS_UNSPEC,
-	CTA_COUNTERS_PACKETS,		/* 64bit counters */
-	CTA_COUNTERS_BYTES,		/* 64bit counters */
-	CTA_COUNTERS32_PACKETS,		/* old 32bit counters, unused */
-	CTA_COUNTERS32_BYTES,		/* old 32bit counters, unused */
-	__CTA_COUNTERS_MAX
-};
-#define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1)
-
-enum ctattr_tstamp {
-	CTA_TIMESTAMP_UNSPEC,
-	CTA_TIMESTAMP_START,
-	CTA_TIMESTAMP_STOP,
-	__CTA_TIMESTAMP_MAX
-};
-#define CTA_TIMESTAMP_MAX (__CTA_TIMESTAMP_MAX - 1)
-
-enum ctattr_nat {
-	CTA_NAT_UNSPEC,
-	CTA_NAT_V4_MINIP,
-#define CTA_NAT_MINIP CTA_NAT_V4_MINIP
-	CTA_NAT_V4_MAXIP,
-#define CTA_NAT_MAXIP CTA_NAT_V4_MAXIP
-	CTA_NAT_PROTO,
-	CTA_NAT_V6_MINIP,
-	CTA_NAT_V6_MAXIP,
-	__CTA_NAT_MAX
-};
-#define CTA_NAT_MAX (__CTA_NAT_MAX - 1)
-
-enum ctattr_protonat {
-	CTA_PROTONAT_UNSPEC,
-	CTA_PROTONAT_PORT_MIN,
-	CTA_PROTONAT_PORT_MAX,
-	__CTA_PROTONAT_MAX
-};
-#define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1)
-
-enum ctattr_seqadj {
-	CTA_SEQADJ_UNSPEC,
-	CTA_SEQADJ_CORRECTION_POS,
-	CTA_SEQADJ_OFFSET_BEFORE,
-	CTA_SEQADJ_OFFSET_AFTER,
-	__CTA_SEQADJ_MAX
-};
-#define CTA_SEQADJ_MAX (__CTA_SEQADJ_MAX - 1)
-
-enum ctattr_natseq {
-	CTA_NAT_SEQ_UNSPEC,
-	CTA_NAT_SEQ_CORRECTION_POS,
-	CTA_NAT_SEQ_OFFSET_BEFORE,
-	CTA_NAT_SEQ_OFFSET_AFTER,
-	__CTA_NAT_SEQ_MAX
-};
-#define CTA_NAT_SEQ_MAX (__CTA_NAT_SEQ_MAX - 1)
-
-enum ctattr_expect {
-	CTA_EXPECT_UNSPEC,
-	CTA_EXPECT_MASTER,
-	CTA_EXPECT_TUPLE,
-	CTA_EXPECT_MASK,
-	CTA_EXPECT_TIMEOUT,
-	CTA_EXPECT_ID,
-	CTA_EXPECT_HELP_NAME,
-	CTA_EXPECT_ZONE,
-	CTA_EXPECT_FLAGS,
-	CTA_EXPECT_CLASS,
-	CTA_EXPECT_NAT,
-	CTA_EXPECT_FN,
-	__CTA_EXPECT_MAX
-};
-#define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1)
-
-enum ctattr_expect_nat {
-	CTA_EXPECT_NAT_UNSPEC,
-	CTA_EXPECT_NAT_DIR,
-	CTA_EXPECT_NAT_TUPLE,
-	__CTA_EXPECT_NAT_MAX
-};
-#define CTA_EXPECT_NAT_MAX (__CTA_EXPECT_NAT_MAX - 1)
-
-enum ctattr_help {
-	CTA_HELP_UNSPEC,
-	CTA_HELP_NAME,
-	CTA_HELP_INFO,
-	__CTA_HELP_MAX
-};
-#define CTA_HELP_MAX (__CTA_HELP_MAX - 1)
-
-enum ctattr_secctx {
-	CTA_SECCTX_UNSPEC,
-	CTA_SECCTX_NAME,
-	__CTA_SECCTX_MAX
-};
-#define CTA_SECCTX_MAX (__CTA_SECCTX_MAX - 1)
-
-enum ctattr_stats_cpu {
-	CTA_STATS_UNSPEC,
-	CTA_STATS_SEARCHED,
-	CTA_STATS_FOUND,
-	CTA_STATS_NEW,
-	CTA_STATS_INVALID,
-	CTA_STATS_IGNORE,
-	CTA_STATS_DELETE,
-	CTA_STATS_DELETE_LIST,
-	CTA_STATS_INSERT,
-	CTA_STATS_INSERT_FAILED,
-	CTA_STATS_DROP,
-	CTA_STATS_EARLY_DROP,
-	CTA_STATS_ERROR,
-	CTA_STATS_SEARCH_RESTART,
-	__CTA_STATS_MAX,
-};
-#define CTA_STATS_MAX (__CTA_STATS_MAX - 1)
-
-enum ctattr_stats_global {
-	CTA_STATS_GLOBAL_UNSPEC,
-	CTA_STATS_GLOBAL_ENTRIES,
-	__CTA_STATS_GLOBAL_MAX,
-};
-#define CTA_STATS_GLOBAL_MAX (__CTA_STATS_GLOBAL_MAX - 1)
-
-enum ctattr_expect_stats {
-	CTA_STATS_EXP_UNSPEC,
-	CTA_STATS_EXP_NEW,
-	CTA_STATS_EXP_CREATE,
-	CTA_STATS_EXP_DELETE,
-	__CTA_STATS_EXP_MAX,
-};
-#define CTA_STATS_EXP_MAX (__CTA_STATS_EXP_MAX - 1)
-
-#endif /* _IPCONNTRACK_NETLINK_H */
diff --git a/openflow/usr/include/linux/netfilter/nfnetlink_cthelper.h b/openflow/usr/include/linux/netfilter/nfnetlink_cthelper.h
deleted file mode 100644
index 33659f6..0000000
--- a/openflow/usr/include/linux/netfilter/nfnetlink_cthelper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef _NFNL_CTHELPER_H_
-#define _NFNL_CTHELPER_H_
-
-#define NFCT_HELPER_STATUS_DISABLED	0
-#define NFCT_HELPER_STATUS_ENABLED	1
-
-enum nfnl_acct_msg_types {
-	NFNL_MSG_CTHELPER_NEW,
-	NFNL_MSG_CTHELPER_GET,
-	NFNL_MSG_CTHELPER_DEL,
-	NFNL_MSG_CTHELPER_MAX
-};
-
-enum nfnl_cthelper_type {
-	NFCTH_UNSPEC,
-	NFCTH_NAME,
-	NFCTH_TUPLE,
-	NFCTH_QUEUE_NUM,
-	NFCTH_POLICY,
-	NFCTH_PRIV_DATA_LEN,
-	NFCTH_STATUS,
-	__NFCTH_MAX
-};
-#define NFCTH_MAX (__NFCTH_MAX - 1)
-
-enum nfnl_cthelper_policy_type {
-	NFCTH_POLICY_SET_UNSPEC,
-	NFCTH_POLICY_SET_NUM,
-	NFCTH_POLICY_SET,
-	NFCTH_POLICY_SET1	= NFCTH_POLICY_SET,
-	NFCTH_POLICY_SET2,
-	NFCTH_POLICY_SET3,
-	NFCTH_POLICY_SET4,
-	__NFCTH_POLICY_SET_MAX
-};
-#define NFCTH_POLICY_SET_MAX (__NFCTH_POLICY_SET_MAX - 1)
-
-enum nfnl_cthelper_pol_type {
-	NFCTH_POLICY_UNSPEC,
-	NFCTH_POLICY_NAME,
-	NFCTH_POLICY_EXPECT_MAX,
-	NFCTH_POLICY_EXPECT_TIMEOUT,
-	__NFCTH_POLICY_MAX
-};
-#define NFCTH_POLICY_MAX (__NFCTH_POLICY_MAX - 1)
-
-enum nfnl_cthelper_tuple_type {
-	NFCTH_TUPLE_UNSPEC,
-	NFCTH_TUPLE_L3PROTONUM,
-	NFCTH_TUPLE_L4PROTONUM,
-	__NFCTH_TUPLE_MAX,
-};
-#define NFCTH_TUPLE_MAX (__NFCTH_TUPLE_MAX - 1)
-
-#endif /* _NFNL_CTHELPER_H */
diff --git a/openflow/usr/include/linux/netfilter/nfnetlink_cttimeout.h b/openflow/usr/include/linux/netfilter/nfnetlink_cttimeout.h
deleted file mode 100644
index f2c10dc..0000000
--- a/openflow/usr/include/linux/netfilter/nfnetlink_cttimeout.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _CTTIMEOUT_NETLINK_H
-#define _CTTIMEOUT_NETLINK_H
-#include <linux/netfilter/nfnetlink.h>
-
-enum ctnl_timeout_msg_types {
-	IPCTNL_MSG_TIMEOUT_NEW,
-	IPCTNL_MSG_TIMEOUT_GET,
-	IPCTNL_MSG_TIMEOUT_DELETE,
-	IPCTNL_MSG_TIMEOUT_DEFAULT_SET,
-	IPCTNL_MSG_TIMEOUT_DEFAULT_GET,
-
-	IPCTNL_MSG_TIMEOUT_MAX
-};
-
-enum ctattr_timeout {
-	CTA_TIMEOUT_UNSPEC,
-	CTA_TIMEOUT_NAME,
-	CTA_TIMEOUT_L3PROTO,
-	CTA_TIMEOUT_L4PROTO,
-	CTA_TIMEOUT_DATA,
-	CTA_TIMEOUT_USE,
-	__CTA_TIMEOUT_MAX
-};
-#define CTA_TIMEOUT_MAX (__CTA_TIMEOUT_MAX - 1)
-
-enum ctattr_timeout_generic {
-	CTA_TIMEOUT_GENERIC_UNSPEC,
-	CTA_TIMEOUT_GENERIC_TIMEOUT,
-	__CTA_TIMEOUT_GENERIC_MAX
-};
-#define CTA_TIMEOUT_GENERIC_MAX (__CTA_TIMEOUT_GENERIC_MAX - 1)
-
-enum ctattr_timeout_tcp {
-	CTA_TIMEOUT_TCP_UNSPEC,
-	CTA_TIMEOUT_TCP_SYN_SENT,
-	CTA_TIMEOUT_TCP_SYN_RECV,
-	CTA_TIMEOUT_TCP_ESTABLISHED,
-	CTA_TIMEOUT_TCP_FIN_WAIT,
-	CTA_TIMEOUT_TCP_CLOSE_WAIT,
-	CTA_TIMEOUT_TCP_LAST_ACK,
-	CTA_TIMEOUT_TCP_TIME_WAIT,
-	CTA_TIMEOUT_TCP_CLOSE,
-	CTA_TIMEOUT_TCP_SYN_SENT2,
-	CTA_TIMEOUT_TCP_RETRANS,
-	CTA_TIMEOUT_TCP_UNACK,
-	__CTA_TIMEOUT_TCP_MAX
-};
-#define CTA_TIMEOUT_TCP_MAX (__CTA_TIMEOUT_TCP_MAX - 1)
-
-enum ctattr_timeout_udp {
-	CTA_TIMEOUT_UDP_UNSPEC,
-	CTA_TIMEOUT_UDP_UNREPLIED,
-	CTA_TIMEOUT_UDP_REPLIED,
-	__CTA_TIMEOUT_UDP_MAX
-};
-#define CTA_TIMEOUT_UDP_MAX (__CTA_TIMEOUT_UDP_MAX - 1)
-
-enum ctattr_timeout_udplite {
-	CTA_TIMEOUT_UDPLITE_UNSPEC,
-	CTA_TIMEOUT_UDPLITE_UNREPLIED,
-	CTA_TIMEOUT_UDPLITE_REPLIED,
-	__CTA_TIMEOUT_UDPLITE_MAX
-};
-#define CTA_TIMEOUT_UDPLITE_MAX (__CTA_TIMEOUT_UDPLITE_MAX - 1)
-
-enum ctattr_timeout_icmp {
-	CTA_TIMEOUT_ICMP_UNSPEC,
-	CTA_TIMEOUT_ICMP_TIMEOUT,
-	__CTA_TIMEOUT_ICMP_MAX
-};
-#define CTA_TIMEOUT_ICMP_MAX (__CTA_TIMEOUT_ICMP_MAX - 1)
-
-enum ctattr_timeout_dccp {
-	CTA_TIMEOUT_DCCP_UNSPEC,
-	CTA_TIMEOUT_DCCP_REQUEST,
-	CTA_TIMEOUT_DCCP_RESPOND,
-	CTA_TIMEOUT_DCCP_PARTOPEN,
-	CTA_TIMEOUT_DCCP_OPEN,
-	CTA_TIMEOUT_DCCP_CLOSEREQ,
-	CTA_TIMEOUT_DCCP_CLOSING,
-	CTA_TIMEOUT_DCCP_TIMEWAIT,
-	__CTA_TIMEOUT_DCCP_MAX
-};
-#define CTA_TIMEOUT_DCCP_MAX (__CTA_TIMEOUT_DCCP_MAX - 1)
-
-enum ctattr_timeout_sctp {
-	CTA_TIMEOUT_SCTP_UNSPEC,
-	CTA_TIMEOUT_SCTP_CLOSED,
-	CTA_TIMEOUT_SCTP_COOKIE_WAIT,
-	CTA_TIMEOUT_SCTP_COOKIE_ECHOED,
-	CTA_TIMEOUT_SCTP_ESTABLISHED,
-	CTA_TIMEOUT_SCTP_SHUTDOWN_SENT,
-	CTA_TIMEOUT_SCTP_SHUTDOWN_RECD,
-	CTA_TIMEOUT_SCTP_SHUTDOWN_ACK_SENT,
-	CTA_TIMEOUT_SCTP_HEARTBEAT_SENT,
-	CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED,
-	__CTA_TIMEOUT_SCTP_MAX
-};
-#define CTA_TIMEOUT_SCTP_MAX (__CTA_TIMEOUT_SCTP_MAX - 1)
-
-enum ctattr_timeout_icmpv6 {
-	CTA_TIMEOUT_ICMPV6_UNSPEC,
-	CTA_TIMEOUT_ICMPV6_TIMEOUT,
-	__CTA_TIMEOUT_ICMPV6_MAX
-};
-#define CTA_TIMEOUT_ICMPV6_MAX (__CTA_TIMEOUT_ICMPV6_MAX - 1)
-
-enum ctattr_timeout_gre {
-	CTA_TIMEOUT_GRE_UNSPEC,
-	CTA_TIMEOUT_GRE_UNREPLIED,
-	CTA_TIMEOUT_GRE_REPLIED,
-	__CTA_TIMEOUT_GRE_MAX
-};
-#define CTA_TIMEOUT_GRE_MAX (__CTA_TIMEOUT_GRE_MAX - 1)
-
-#define CTNL_TIMEOUT_NAME_MAX	32
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter/nfnetlink_log.h b/openflow/usr/include/linux/netfilter/nfnetlink_log.h
deleted file mode 100644
index fb21f0c..0000000
--- a/openflow/usr/include/linux/netfilter/nfnetlink_log.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef _NFNETLINK_LOG_H
-#define _NFNETLINK_LOG_H
-
-/* This file describes the netlink messages (i.e. 'protocol packets'),
- * and not any kind of function definitions.  It is shared between kernel and
- * userspace.  Don't put kernel specific stuff in here */
-
-#include <linux/types.h>
-#include <linux/netfilter/nfnetlink.h>
-
-enum nfulnl_msg_types {
-	NFULNL_MSG_PACKET,		/* packet from kernel to userspace */
-	NFULNL_MSG_CONFIG,		/* connect to a particular queue */
-
-	NFULNL_MSG_MAX
-};
-
-struct nfulnl_msg_packet_hdr {
-	__be16		hw_protocol;	/* hw protocol (network order) */
-	__u8	hook;		/* netfilter hook */
-	__u8	_pad;
-};
-
-struct nfulnl_msg_packet_hw {
-	__be16		hw_addrlen;
-	__u16	_pad;
-	__u8	hw_addr[8];
-};
-
-struct nfulnl_msg_packet_timestamp {
-	__aligned_be64	sec;
-	__aligned_be64	usec;
-};
-
-enum nfulnl_attr_type {
-	NFULA_UNSPEC,
-	NFULA_PACKET_HDR,
-	NFULA_MARK,			/* __u32 nfmark */
-	NFULA_TIMESTAMP,		/* nfulnl_msg_packet_timestamp */
-	NFULA_IFINDEX_INDEV,		/* __u32 ifindex */
-	NFULA_IFINDEX_OUTDEV,		/* __u32 ifindex */
-	NFULA_IFINDEX_PHYSINDEV,	/* __u32 ifindex */
-	NFULA_IFINDEX_PHYSOUTDEV,	/* __u32 ifindex */
-	NFULA_HWADDR,			/* nfulnl_msg_packet_hw */
-	NFULA_PAYLOAD,			/* opaque data payload */
-	NFULA_PREFIX,			/* string prefix */
-	NFULA_UID,			/* user id of socket */
-	NFULA_SEQ,			/* instance-local sequence number */
-	NFULA_SEQ_GLOBAL,		/* global sequence number */
-	NFULA_GID,			/* group id of socket */
-	NFULA_HWTYPE,			/* hardware type */
-	NFULA_HWHEADER,			/* hardware header */
-	NFULA_HWLEN,			/* hardware header length */
-	NFULA_CT,                       /* nf_conntrack_netlink.h */
-	NFULA_CT_INFO,                  /* enum ip_conntrack_info */
-
-	__NFULA_MAX
-};
-#define NFULA_MAX (__NFULA_MAX - 1)
-
-enum nfulnl_msg_config_cmds {
-	NFULNL_CFG_CMD_NONE,
-	NFULNL_CFG_CMD_BIND,
-	NFULNL_CFG_CMD_UNBIND,
-	NFULNL_CFG_CMD_PF_BIND,
-	NFULNL_CFG_CMD_PF_UNBIND,
-};
-
-struct nfulnl_msg_config_cmd {
-	__u8	command;	/* nfulnl_msg_config_cmds */
-} __attribute__ ((packed));
-
-struct nfulnl_msg_config_mode {
-	__be32		copy_range;
-	__u8	copy_mode;
-	__u8	_pad;
-} __attribute__ ((packed));
-
-enum nfulnl_attr_config {
-	NFULA_CFG_UNSPEC,
-	NFULA_CFG_CMD,			/* nfulnl_msg_config_cmd */
-	NFULA_CFG_MODE,			/* nfulnl_msg_config_mode */
-	NFULA_CFG_NLBUFSIZ,		/* __u32 buffer size */
-	NFULA_CFG_TIMEOUT,		/* __u32 in 1/100 s */
-	NFULA_CFG_QTHRESH,		/* __u32 */
-	NFULA_CFG_FLAGS,		/* __u16 */
-	__NFULA_CFG_MAX
-};
-#define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
-
-#define NFULNL_COPY_NONE	0x00
-#define NFULNL_COPY_META	0x01
-#define NFULNL_COPY_PACKET	0x02
-/* 0xff is reserved, don't use it for new copy modes. */
-
-#define NFULNL_CFG_F_SEQ	0x0001
-#define NFULNL_CFG_F_SEQ_GLOBAL	0x0002
-#define NFULNL_CFG_F_CONNTRACK	0x0004
-
-#endif /* _NFNETLINK_LOG_H */
diff --git a/openflow/usr/include/linux/netfilter/nfnetlink_queue.h b/openflow/usr/include/linux/netfilter/nfnetlink_queue.h
deleted file mode 100644
index b67a853..0000000
--- a/openflow/usr/include/linux/netfilter/nfnetlink_queue.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef _NFNETLINK_QUEUE_H
-#define _NFNETLINK_QUEUE_H
-
-#include <linux/types.h>
-#include <linux/netfilter/nfnetlink.h>
-
-enum nfqnl_msg_types {
-	NFQNL_MSG_PACKET,		/* packet from kernel to userspace */
-	NFQNL_MSG_VERDICT,		/* verdict from userspace to kernel */
-	NFQNL_MSG_CONFIG,		/* connect to a particular queue */
-	NFQNL_MSG_VERDICT_BATCH,	/* batchv from userspace to kernel */
-
-	NFQNL_MSG_MAX
-};
-
-struct nfqnl_msg_packet_hdr {
-	__be32		packet_id;	/* unique ID of packet in queue */
-	__be16		hw_protocol;	/* hw protocol (network order) */
-	__u8	hook;		/* netfilter hook */
-} __attribute__ ((packed));
-
-struct nfqnl_msg_packet_hw {
-	__be16		hw_addrlen;
-	__u16	_pad;
-	__u8	hw_addr[8];
-};
-
-struct nfqnl_msg_packet_timestamp {
-	__aligned_be64	sec;
-	__aligned_be64	usec;
-};
-
-enum nfqnl_attr_type {
-	NFQA_UNSPEC,
-	NFQA_PACKET_HDR,
-	NFQA_VERDICT_HDR,		/* nfqnl_msg_verdict_hrd */
-	NFQA_MARK,			/* __u32 nfmark */
-	NFQA_TIMESTAMP,			/* nfqnl_msg_packet_timestamp */
-	NFQA_IFINDEX_INDEV,		/* __u32 ifindex */
-	NFQA_IFINDEX_OUTDEV,		/* __u32 ifindex */
-	NFQA_IFINDEX_PHYSINDEV,		/* __u32 ifindex */
-	NFQA_IFINDEX_PHYSOUTDEV,	/* __u32 ifindex */
-	NFQA_HWADDR,			/* nfqnl_msg_packet_hw */
-	NFQA_PAYLOAD,			/* opaque data payload */
-	NFQA_CT,			/* nf_conntrack_netlink.h */
-	NFQA_CT_INFO,			/* enum ip_conntrack_info */
-	NFQA_CAP_LEN,			/* __u32 length of captured packet */
-	NFQA_SKB_INFO,			/* __u32 skb meta information */
-	NFQA_EXP,			/* nf_conntrack_netlink.h */
-	NFQA_UID,			/* __u32 sk uid */
-	NFQA_GID,			/* __u32 sk gid */
-	NFQA_SECCTX,			/* security context string */
-
-	__NFQA_MAX
-};
-#define NFQA_MAX (__NFQA_MAX - 1)
-
-struct nfqnl_msg_verdict_hdr {
-	__be32 verdict;
-	__be32 id;
-};
-
-
-enum nfqnl_msg_config_cmds {
-	NFQNL_CFG_CMD_NONE,
-	NFQNL_CFG_CMD_BIND,
-	NFQNL_CFG_CMD_UNBIND,
-	NFQNL_CFG_CMD_PF_BIND,
-	NFQNL_CFG_CMD_PF_UNBIND,
-};
-
-struct nfqnl_msg_config_cmd {
-	__u8	command;	/* nfqnl_msg_config_cmds */
-	__u8	_pad;
-	__be16		pf;		/* AF_xxx for PF_[UN]BIND */
-};
-
-enum nfqnl_config_mode {
-	NFQNL_COPY_NONE,
-	NFQNL_COPY_META,
-	NFQNL_COPY_PACKET,
-};
-
-struct nfqnl_msg_config_params {
-	__be32		copy_range;
-	__u8	copy_mode;	/* enum nfqnl_config_mode */
-} __attribute__ ((packed));
-
-
-enum nfqnl_attr_config {
-	NFQA_CFG_UNSPEC,
-	NFQA_CFG_CMD,			/* nfqnl_msg_config_cmd */
-	NFQA_CFG_PARAMS,		/* nfqnl_msg_config_params */
-	NFQA_CFG_QUEUE_MAXLEN,		/* __u32 */
-	NFQA_CFG_MASK,			/* identify which flags to change */
-	NFQA_CFG_FLAGS,			/* value of these flags (__u32) */
-	__NFQA_CFG_MAX
-};
-#define NFQA_CFG_MAX (__NFQA_CFG_MAX-1)
-
-/* Flags for NFQA_CFG_FLAGS */
-#define NFQA_CFG_F_FAIL_OPEN			(1 << 0)
-#define NFQA_CFG_F_CONNTRACK			(1 << 1)
-#define NFQA_CFG_F_GSO				(1 << 2)
-#define NFQA_CFG_F_UID_GID			(1 << 3)
-#define NFQA_CFG_F_SECCTX			(1 << 4)
-#define NFQA_CFG_F_MAX				(1 << 5)
-
-/* flags for NFQA_SKB_INFO */
-/* packet appears to have wrong checksums, but they are ok */
-#define NFQA_SKB_CSUMNOTREADY (1 << 0)
-/* packet is GSO (i.e., exceeds device mtu) */
-#define NFQA_SKB_GSO (1 << 1)
-/* csum not validated (incoming device doesn't support hw checksum, etc.) */
-#define NFQA_SKB_CSUM_NOTVERIFIED (1 << 2)
-
-#endif /* _NFNETLINK_QUEUE_H */
diff --git a/openflow/usr/include/linux/netfilter/x_tables.h b/openflow/usr/include/linux/netfilter/x_tables.h
deleted file mode 100644
index 4120970..0000000
--- a/openflow/usr/include/linux/netfilter/x_tables.h
+++ /dev/null
@@ -1,185 +0,0 @@
-#ifndef _X_TABLES_H
-#define _X_TABLES_H
-#include <linux/kernel.h>
-#include <linux/types.h>
-
-#define XT_FUNCTION_MAXNAMELEN 30
-#define XT_EXTENSION_MAXNAMELEN 29
-#define XT_TABLE_MAXNAMELEN 32
-
-struct xt_entry_match {
-	union {
-		struct {
-			__u16 match_size;
-
-			/* Used by userspace */
-			char name[XT_EXTENSION_MAXNAMELEN];
-			__u8 revision;
-		} user;
-		struct {
-			__u16 match_size;
-
-			/* Used inside the kernel */
-			struct xt_match *match;
-		} kernel;
-
-		/* Total length */
-		__u16 match_size;
-	} u;
-
-	unsigned char data[0];
-};
-
-struct xt_entry_target {
-	union {
-		struct {
-			__u16 target_size;
-
-			/* Used by userspace */
-			char name[XT_EXTENSION_MAXNAMELEN];
-			__u8 revision;
-		} user;
-		struct {
-			__u16 target_size;
-
-			/* Used inside the kernel */
-			struct xt_target *target;
-		} kernel;
-
-		/* Total length */
-		__u16 target_size;
-	} u;
-
-	unsigned char data[0];
-};
-
-#define XT_TARGET_INIT(__name, __size)					       \
-{									       \
-	.target.u.user = {						       \
-		.target_size	= XT_ALIGN(__size),			       \
-		.name		= __name,				       \
-	},								       \
-}
-
-struct xt_standard_target {
-	struct xt_entry_target target;
-	int verdict;
-};
-
-struct xt_error_target {
-	struct xt_entry_target target;
-	char errorname[XT_FUNCTION_MAXNAMELEN];
-};
-
-/* The argument to IPT_SO_GET_REVISION_*.  Returns highest revision
- * kernel supports, if >= revision. */
-struct xt_get_revision {
-	char name[XT_EXTENSION_MAXNAMELEN];
-	__u8 revision;
-};
-
-/* CONTINUE verdict for targets */
-#define XT_CONTINUE 0xFFFFFFFF
-
-/* For standard target */
-#define XT_RETURN (-NF_REPEAT - 1)
-
-/* this is a dummy structure to find out the alignment requirement for a struct
- * containing all the fundamental data types that are used in ipt_entry,
- * ip6t_entry and arpt_entry.  This sucks, and it is a hack.  It will be my
- * personal pleasure to remove it -HW
- */
-struct _xt_align {
-	__u8 u8;
-	__u16 u16;
-	__u32 u32;
-	__u64 u64;
-};
-
-#define XT_ALIGN(s) __ALIGN_KERNEL((s), __alignof__(struct _xt_align))
-
-/* Standard return verdict, or do jump. */
-#define XT_STANDARD_TARGET ""
-/* Error verdict. */
-#define XT_ERROR_TARGET "ERROR"
-
-#define SET_COUNTER(c,b,p) do { (c).bcnt = (b); (c).pcnt = (p); } while(0)
-#define ADD_COUNTER(c,b,p) do { (c).bcnt += (b); (c).pcnt += (p); } while(0)
-
-struct xt_counters {
-	__u64 pcnt, bcnt;			/* Packet and byte counters */
-};
-
-/* The argument to IPT_SO_ADD_COUNTERS. */
-struct xt_counters_info {
-	/* Which table. */
-	char name[XT_TABLE_MAXNAMELEN];
-
-	unsigned int num_counters;
-
-	/* The counters (actually `number' of these). */
-	struct xt_counters counters[0];
-};
-
-#define XT_INV_PROTO		0x40	/* Invert the sense of PROTO. */
-
-/* fn returns 0 to continue iteration */
-#define XT_MATCH_ITERATE(type, e, fn, args...)			\
-({								\
-	unsigned int __i;					\
-	int __ret = 0;						\
-	struct xt_entry_match *__m;				\
-								\
-	for (__i = sizeof(type);				\
-	     __i < (e)->target_offset;				\
-	     __i += __m->u.match_size) {			\
-		__m = (void *)e + __i;				\
-								\
-		__ret = fn(__m , ## args);			\
-		if (__ret != 0)					\
-			break;					\
-	}							\
-	__ret;							\
-})
-
-/* fn returns 0 to continue iteration */
-#define XT_ENTRY_ITERATE_CONTINUE(type, entries, size, n, fn, args...) \
-({								\
-	unsigned int __i, __n;					\
-	int __ret = 0;						\
-	type *__entry;						\
-								\
-	for (__i = 0, __n = 0; __i < (size);			\
-	     __i += __entry->next_offset, __n++) { 		\
-		__entry = (void *)(entries) + __i;		\
-		if (__n < n)					\
-			continue;				\
-								\
-		__ret = fn(__entry , ## args);			\
-		if (__ret != 0)					\
-			break;					\
-	}							\
-	__ret;							\
-})
-
-/* fn returns 0 to continue iteration */
-#define XT_ENTRY_ITERATE(type, entries, size, fn, args...) \
-	XT_ENTRY_ITERATE_CONTINUE(type, entries, size, 0, fn, args)
-
-
-/* pos is normally a struct ipt_entry/ip6t_entry/etc. */
-#define xt_entry_foreach(pos, ehead, esize) \
-	for ((pos) = (typeof(pos))(ehead); \
-	     (pos) < (typeof(pos))((char *)(ehead) + (esize)); \
-	     (pos) = (typeof(pos))((char *)(pos) + (pos)->next_offset))
-
-/* can only be xt_entry_match, so no use of typeof here */
-#define xt_ematch_foreach(pos, entry) \
-	for ((pos) = (struct xt_entry_match *)entry->elems; \
-	     (pos) < (struct xt_entry_match *)((char *)(entry) + \
-	             (entry)->target_offset); \
-	     (pos) = (struct xt_entry_match *)((char *)(pos) + \
-	             (pos)->u.match_size))
-
-
-#endif /* _X_TABLES_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_AUDIT.h b/openflow/usr/include/linux/netfilter/xt_AUDIT.h
deleted file mode 100644
index 38751d2..0000000
--- a/openflow/usr/include/linux/netfilter/xt_AUDIT.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Header file for iptables xt_AUDIT target
- *
- * (C) 2010-2011 Thomas Graf <tgraf@redhat.com>
- * (C) 2010-2011 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _XT_AUDIT_TARGET_H
-#define _XT_AUDIT_TARGET_H
-
-#include <linux/types.h>
-
-enum {
-	XT_AUDIT_TYPE_ACCEPT = 0,
-	XT_AUDIT_TYPE_DROP,
-	XT_AUDIT_TYPE_REJECT,
-	__XT_AUDIT_TYPE_MAX,
-};
-
-#define XT_AUDIT_TYPE_MAX (__XT_AUDIT_TYPE_MAX - 1)
-
-struct xt_audit_info {
-	__u8 type; /* XT_AUDIT_TYPE_* */
-};
-
-#endif /* _XT_AUDIT_TARGET_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_CHECKSUM.h b/openflow/usr/include/linux/netfilter/xt_CHECKSUM.h
deleted file mode 100644
index 9a2e466..0000000
--- a/openflow/usr/include/linux/netfilter/xt_CHECKSUM.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Header file for iptables ipt_CHECKSUM target
- *
- * (C) 2002 by Harald Welte <laforge@gnumonks.org>
- * (C) 2010 Red Hat Inc
- * Author: Michael S. Tsirkin <mst@redhat.com>
- *
- * This software is distributed under GNU GPL v2, 1991
-*/
-#ifndef _XT_CHECKSUM_TARGET_H
-#define _XT_CHECKSUM_TARGET_H
-
-#include <linux/types.h>
-
-#define XT_CHECKSUM_OP_FILL	0x01	/* fill in checksum in IP header */
-
-struct xt_CHECKSUM_info {
-	__u8 operation;	/* bitset of operations */
-};
-
-#endif /* _XT_CHECKSUM_TARGET_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_CLASSIFY.h b/openflow/usr/include/linux/netfilter/xt_CLASSIFY.h
deleted file mode 100644
index a813bf1..0000000
--- a/openflow/usr/include/linux/netfilter/xt_CLASSIFY.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _XT_CLASSIFY_H
-#define _XT_CLASSIFY_H
-
-#include <linux/types.h>
-
-struct xt_classify_target_info {
-	__u32 priority;
-};
-
-#endif /*_XT_CLASSIFY_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_CONNMARK.h b/openflow/usr/include/linux/netfilter/xt_CONNMARK.h
deleted file mode 100644
index 2f2e48e..0000000
--- a/openflow/usr/include/linux/netfilter/xt_CONNMARK.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _XT_CONNMARK_H_target
-#define _XT_CONNMARK_H_target
-
-#include <linux/netfilter/xt_connmark.h>
-
-#endif /*_XT_CONNMARK_H_target*/
diff --git a/openflow/usr/include/linux/netfilter/xt_CONNSECMARK.h b/openflow/usr/include/linux/netfilter/xt_CONNSECMARK.h
deleted file mode 100644
index b973ff8..0000000
--- a/openflow/usr/include/linux/netfilter/xt_CONNSECMARK.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _XT_CONNSECMARK_H_target
-#define _XT_CONNSECMARK_H_target
-
-#include <linux/types.h>
-
-enum {
-	CONNSECMARK_SAVE = 1,
-	CONNSECMARK_RESTORE,
-};
-
-struct xt_connsecmark_target_info {
-	__u8 mode;
-};
-
-#endif /*_XT_CONNSECMARK_H_target */
diff --git a/openflow/usr/include/linux/netfilter/xt_CT.h b/openflow/usr/include/linux/netfilter/xt_CT.h
deleted file mode 100644
index 9e52041..0000000
--- a/openflow/usr/include/linux/netfilter/xt_CT.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _XT_CT_H
-#define _XT_CT_H
-
-#include <linux/types.h>
-
-enum {
-	XT_CT_NOTRACK		= 1 << 0,
-	XT_CT_NOTRACK_ALIAS	= 1 << 1,
-	XT_CT_ZONE_DIR_ORIG	= 1 << 2,
-	XT_CT_ZONE_DIR_REPL	= 1 << 3,
-	XT_CT_ZONE_MARK		= 1 << 4,
-
-	XT_CT_MASK		= XT_CT_NOTRACK | XT_CT_NOTRACK_ALIAS |
-				  XT_CT_ZONE_DIR_ORIG | XT_CT_ZONE_DIR_REPL |
-				  XT_CT_ZONE_MARK,
-};
-
-struct xt_ct_target_info {
-	__u16 flags;
-	__u16 zone;
-	__u32 ct_events;
-	__u32 exp_events;
-	char helper[16];
-
-	/* Used internally by the kernel */
-	struct nf_conn	*ct __attribute__((aligned(8)));
-};
-
-struct xt_ct_target_info_v1 {
-	__u16 flags;
-	__u16 zone;
-	__u32 ct_events;
-	__u32 exp_events;
-	char helper[16];
-	char timeout[32];
-
-	/* Used internally by the kernel */
-	struct nf_conn	*ct __attribute__((aligned(8)));
-};
-
-#endif /* _XT_CT_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_DSCP.h b/openflow/usr/include/linux/netfilter/xt_DSCP.h
deleted file mode 100644
index 648e0b3..0000000
--- a/openflow/usr/include/linux/netfilter/xt_DSCP.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* x_tables module for setting the IPv4/IPv6 DSCP field
- *
- * (C) 2002 Harald Welte <laforge@gnumonks.org>
- * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
- * This software is distributed under GNU GPL v2, 1991
- *
- * See RFC2474 for a description of the DSCP field within the IP Header.
- *
- * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
-*/
-#ifndef _XT_DSCP_TARGET_H
-#define _XT_DSCP_TARGET_H
-#include <linux/netfilter/xt_dscp.h>
-#include <linux/types.h>
-
-/* target info */
-struct xt_DSCP_info {
-	__u8 dscp;
-};
-
-struct xt_tos_target_info {
-	__u8 tos_value;
-	__u8 tos_mask;
-};
-
-#endif /* _XT_DSCP_TARGET_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_HMARK.h b/openflow/usr/include/linux/netfilter/xt_HMARK.h
deleted file mode 100644
index 826fc58..0000000
--- a/openflow/usr/include/linux/netfilter/xt_HMARK.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef XT_HMARK_H_
-#define XT_HMARK_H_
-
-#include <linux/types.h>
-
-enum {
-	XT_HMARK_SADDR_MASK,
-	XT_HMARK_DADDR_MASK,
-	XT_HMARK_SPI,
-	XT_HMARK_SPI_MASK,
-	XT_HMARK_SPORT,
-	XT_HMARK_DPORT,
-	XT_HMARK_SPORT_MASK,
-	XT_HMARK_DPORT_MASK,
-	XT_HMARK_PROTO_MASK,
-	XT_HMARK_RND,
-	XT_HMARK_MODULUS,
-	XT_HMARK_OFFSET,
-	XT_HMARK_CT,
-	XT_HMARK_METHOD_L3,
-	XT_HMARK_METHOD_L3_4,
-};
-#define XT_HMARK_FLAG(flag)	(1 << flag)
-
-union hmark_ports {
-	struct {
-		__u16	src;
-		__u16	dst;
-	} p16;
-	struct {
-		__be16	src;
-		__be16	dst;
-	} b16;
-	__u32	v32;
-	__be32	b32;
-};
-
-struct xt_hmark_info {
-	union nf_inet_addr	src_mask;
-	union nf_inet_addr	dst_mask;
-	union hmark_ports	port_mask;
-	union hmark_ports	port_set;
-	__u32			flags;
-	__u16			proto_mask;
-	__u32			hashrnd;
-	__u32			hmodulus;
-	__u32			hoffset;	/* Mark offset to start from */
-};
-
-#endif /* XT_HMARK_H_ */
diff --git a/openflow/usr/include/linux/netfilter/xt_IDLETIMER.h b/openflow/usr/include/linux/netfilter/xt_IDLETIMER.h
deleted file mode 100644
index 208ae93..0000000
--- a/openflow/usr/include/linux/netfilter/xt_IDLETIMER.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * linux/include/linux/netfilter/xt_IDLETIMER.h
- *
- * Header file for Xtables timer target module.
- *
- * Copyright (C) 2004, 2010 Nokia Corporation
- * Written by Timo Teras <ext-timo.teras@nokia.com>
- *
- * Converted to x_tables and forward-ported to 2.6.34
- * by Luciano Coelho <luciano.coelho@nokia.com>
- *
- * Contact: Luciano Coelho <luciano.coelho@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef _XT_IDLETIMER_H
-#define _XT_IDLETIMER_H
-
-#include <linux/types.h>
-
-#define MAX_IDLETIMER_LABEL_SIZE 28
-
-struct idletimer_tg_info {
-	__u32 timeout;
-
-	char label[MAX_IDLETIMER_LABEL_SIZE];
-
-	/* for kernel module internal use only */
-	struct idletimer_tg *timer __attribute__((aligned(8)));
-};
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter/xt_LED.h b/openflow/usr/include/linux/netfilter/xt_LED.h
deleted file mode 100644
index f5509e7..0000000
--- a/openflow/usr/include/linux/netfilter/xt_LED.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _XT_LED_H
-#define _XT_LED_H
-
-#include <linux/types.h>
-
-struct xt_led_info {
-	char id[27];        /* Unique ID for this trigger in the LED class */
-	__u8 always_blink;  /* Blink even if the LED is already on */
-	__u32 delay;        /* Delay until LED is switched off after trigger */
-
-	/* Kernel data used in the module */
-	void *internal_data __attribute__((aligned(8)));
-};
-
-#endif /* _XT_LED_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_LOG.h b/openflow/usr/include/linux/netfilter/xt_LOG.h
deleted file mode 100644
index cac0790..0000000
--- a/openflow/usr/include/linux/netfilter/xt_LOG.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _XT_LOG_H
-#define _XT_LOG_H
-
-/* make sure not to change this without changing nf_log.h:NF_LOG_* (!) */
-#define XT_LOG_TCPSEQ		0x01	/* Log TCP sequence numbers */
-#define XT_LOG_TCPOPT		0x02	/* Log TCP options */
-#define XT_LOG_IPOPT		0x04	/* Log IP options */
-#define XT_LOG_UID		0x08	/* Log UID owning local socket */
-#define XT_LOG_NFLOG		0x10	/* Unsupported, don't reuse */
-#define XT_LOG_MACDECODE	0x20	/* Decode MAC header */
-#define XT_LOG_MASK		0x2f
-
-struct xt_log_info {
-	unsigned char level;
-	unsigned char logflags;
-	char prefix[30];
-};
-
-#endif /* _XT_LOG_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_MARK.h b/openflow/usr/include/linux/netfilter/xt_MARK.h
deleted file mode 100644
index 41c456d..0000000
--- a/openflow/usr/include/linux/netfilter/xt_MARK.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _XT_MARK_H_target
-#define _XT_MARK_H_target
-
-#include <linux/netfilter/xt_mark.h>
-
-#endif /*_XT_MARK_H_target */
diff --git a/openflow/usr/include/linux/netfilter/xt_NFLOG.h b/openflow/usr/include/linux/netfilter/xt_NFLOG.h
deleted file mode 100644
index 87b5831..0000000
--- a/openflow/usr/include/linux/netfilter/xt_NFLOG.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _XT_NFLOG_TARGET
-#define _XT_NFLOG_TARGET
-
-#include <linux/types.h>
-
-#define XT_NFLOG_DEFAULT_GROUP		0x1
-#define XT_NFLOG_DEFAULT_THRESHOLD	0
-
-#define XT_NFLOG_MASK			0x0
-
-struct xt_nflog_info {
-	__u32	len;
-	__u16	group;
-	__u16	threshold;
-	__u16	flags;
-	__u16	pad;
-	char		prefix[64];
-};
-
-#endif /* _XT_NFLOG_TARGET */
diff --git a/openflow/usr/include/linux/netfilter/xt_NFQUEUE.h b/openflow/usr/include/linux/netfilter/xt_NFQUEUE.h
deleted file mode 100644
index 8bb5fe6..0000000
--- a/openflow/usr/include/linux/netfilter/xt_NFQUEUE.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* iptables module for using NFQUEUE mechanism
- *
- * (C) 2005 Harald Welte <laforge@netfilter.org>
- *
- * This software is distributed under GNU GPL v2, 1991
- * 
-*/
-#ifndef _XT_NFQ_TARGET_H
-#define _XT_NFQ_TARGET_H
-
-#include <linux/types.h>
-
-/* target info */
-struct xt_NFQ_info {
-	__u16 queuenum;
-};
-
-struct xt_NFQ_info_v1 {
-	__u16 queuenum;
-	__u16 queues_total;
-};
-
-struct xt_NFQ_info_v2 {
-	__u16 queuenum;
-	__u16 queues_total;
-	__u16 bypass;
-};
-
-struct xt_NFQ_info_v3 {
-	__u16 queuenum;
-	__u16 queues_total;
-	__u16 flags;
-#define NFQ_FLAG_BYPASS		0x01 /* for compatibility with v2 */
-#define NFQ_FLAG_CPU_FANOUT	0x02 /* use current CPU (no hashing) */
-#define NFQ_FLAG_MASK		0x03
-};
-
-#endif /* _XT_NFQ_TARGET_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_RATEEST.h b/openflow/usr/include/linux/netfilter/xt_RATEEST.h
deleted file mode 100644
index 6605e20..0000000
--- a/openflow/usr/include/linux/netfilter/xt_RATEEST.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _XT_RATEEST_TARGET_H
-#define _XT_RATEEST_TARGET_H
-
-#include <linux/types.h>
-
-struct xt_rateest_target_info {
-	char			name[IFNAMSIZ];
-	__s8			interval;
-	__u8		ewma_log;
-
-	/* Used internally by the kernel */
-	struct xt_rateest	*est __attribute__((aligned(8)));
-};
-
-#endif /* _XT_RATEEST_TARGET_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_SECMARK.h b/openflow/usr/include/linux/netfilter/xt_SECMARK.h
deleted file mode 100644
index 989092b..0000000
--- a/openflow/usr/include/linux/netfilter/xt_SECMARK.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _XT_SECMARK_H_target
-#define _XT_SECMARK_H_target
-
-#include <linux/types.h>
-
-/*
- * This is intended for use by various security subsystems (but not
- * at the same time).
- *
- * 'mode' refers to the specific security subsystem which the
- * packets are being marked for.
- */
-#define SECMARK_MODE_SEL	0x01		/* SELinux */
-#define SECMARK_SECCTX_MAX	256
-
-struct xt_secmark_target_info {
-	__u8 mode;
-	__u32 secid;
-	char secctx[SECMARK_SECCTX_MAX];
-};
-
-#endif /*_XT_SECMARK_H_target */
diff --git a/openflow/usr/include/linux/netfilter/xt_TCPMSS.h b/openflow/usr/include/linux/netfilter/xt_TCPMSS.h
deleted file mode 100644
index 9a6960a..0000000
--- a/openflow/usr/include/linux/netfilter/xt_TCPMSS.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _XT_TCPMSS_H
-#define _XT_TCPMSS_H
-
-#include <linux/types.h>
-
-struct xt_tcpmss_info {
-	__u16 mss;
-};
-
-#define XT_TCPMSS_CLAMP_PMTU 0xffff
-
-#endif /* _XT_TCPMSS_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h b/openflow/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
deleted file mode 100644
index 7157318..0000000
--- a/openflow/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _XT_TCPOPTSTRIP_H
-#define _XT_TCPOPTSTRIP_H
-
-#include <linux/types.h>
-
-#define tcpoptstrip_set_bit(bmap, idx) \
-	(bmap[(idx) >> 5] |= 1U << (idx & 31))
-#define tcpoptstrip_test_bit(bmap, idx) \
-	(((1U << (idx & 31)) & bmap[(idx) >> 5]) != 0)
-
-struct xt_tcpoptstrip_target_info {
-	__u32 strip_bmap[8];
-};
-
-#endif /* _XT_TCPOPTSTRIP_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_TEE.h b/openflow/usr/include/linux/netfilter/xt_TEE.h
deleted file mode 100644
index 5c21d5c..0000000
--- a/openflow/usr/include/linux/netfilter/xt_TEE.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _XT_TEE_TARGET_H
-#define _XT_TEE_TARGET_H
-
-struct xt_tee_tginfo {
-	union nf_inet_addr gw;
-	char oif[16];
-
-	/* used internally by the kernel */
-	struct xt_tee_priv *priv __attribute__((aligned(8)));
-};
-
-#endif /* _XT_TEE_TARGET_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_TPROXY.h b/openflow/usr/include/linux/netfilter/xt_TPROXY.h
deleted file mode 100644
index 902043c..0000000
--- a/openflow/usr/include/linux/netfilter/xt_TPROXY.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _XT_TPROXY_H
-#define _XT_TPROXY_H
-
-#include <linux/types.h>
-
-/* TPROXY target is capable of marking the packet to perform
- * redirection. We can get rid of that whenever we get support for
- * mutliple targets in the same rule. */
-struct xt_tproxy_target_info {
-	__u32 mark_mask;
-	__u32 mark_value;
-	__be32 laddr;
-	__be16 lport;
-};
-
-struct xt_tproxy_target_info_v1 {
-	__u32 mark_mask;
-	__u32 mark_value;
-	union nf_inet_addr laddr;
-	__be16 lport;
-};
-
-#endif /* _XT_TPROXY_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_addrtype.h b/openflow/usr/include/linux/netfilter/xt_addrtype.h
deleted file mode 100644
index b156baa..0000000
--- a/openflow/usr/include/linux/netfilter/xt_addrtype.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _XT_ADDRTYPE_H
-#define _XT_ADDRTYPE_H
-
-#include <linux/types.h>
-
-enum {
-	XT_ADDRTYPE_INVERT_SOURCE	= 0x0001,
-	XT_ADDRTYPE_INVERT_DEST		= 0x0002,
-	XT_ADDRTYPE_LIMIT_IFACE_IN	= 0x0004,
-	XT_ADDRTYPE_LIMIT_IFACE_OUT	= 0x0008,
-};
-
-
-/* rtn_type enum values from rtnetlink.h, but shifted */
-enum {
-	XT_ADDRTYPE_UNSPEC = 1 << 0,
-	XT_ADDRTYPE_UNICAST = 1 << 1,	/* 1 << RTN_UNICAST */
-	XT_ADDRTYPE_LOCAL  = 1 << 2,	/* 1 << RTN_LOCAL, etc */
-	XT_ADDRTYPE_BROADCAST = 1 << 3,
-	XT_ADDRTYPE_ANYCAST = 1 << 4,
-	XT_ADDRTYPE_MULTICAST = 1 << 5,
-	XT_ADDRTYPE_BLACKHOLE = 1 << 6,
-	XT_ADDRTYPE_UNREACHABLE = 1 << 7,
-	XT_ADDRTYPE_PROHIBIT = 1 << 8,
-	XT_ADDRTYPE_THROW = 1 << 9,
-	XT_ADDRTYPE_NAT = 1 << 10,
-	XT_ADDRTYPE_XRESOLVE = 1 << 11,
-};
-
-struct xt_addrtype_info_v1 {
-	__u16	source;		/* source-type mask */
-	__u16	dest;		/* dest-type mask */
-	__u32	flags;
-};
-
-/* revision 0 */
-struct xt_addrtype_info {
-	__u16	source;		/* source-type mask */
-	__u16	dest;		/* dest-type mask */
-	__u32	invert_source;
-	__u32	invert_dest;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter/xt_bpf.h b/openflow/usr/include/linux/netfilter/xt_bpf.h
deleted file mode 100644
index 1fad2c2..0000000
--- a/openflow/usr/include/linux/netfilter/xt_bpf.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _XT_BPF_H
-#define _XT_BPF_H
-
-#include <linux/filter.h>
-#include <linux/types.h>
-
-#define XT_BPF_MAX_NUM_INSTR	64
-
-struct bpf_prog;
-
-struct xt_bpf_info {
-	__u16 bpf_program_num_elem;
-	struct sock_filter bpf_program[XT_BPF_MAX_NUM_INSTR];
-
-	/* only used in the kernel */
-	struct bpf_prog *filter __attribute__((aligned(8)));
-};
-
-#endif /*_XT_BPF_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_cgroup.h b/openflow/usr/include/linux/netfilter/xt_cgroup.h
deleted file mode 100644
index 943d3a0..0000000
--- a/openflow/usr/include/linux/netfilter/xt_cgroup.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _XT_CGROUP_H
-#define _XT_CGROUP_H
-
-#include <linux/types.h>
-
-struct xt_cgroup_info {
-	__u32 id;
-	__u32 invert;
-};
-
-#endif /* _XT_CGROUP_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_cluster.h b/openflow/usr/include/linux/netfilter/xt_cluster.h
deleted file mode 100644
index 9b883c8..0000000
--- a/openflow/usr/include/linux/netfilter/xt_cluster.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _XT_CLUSTER_MATCH_H
-#define _XT_CLUSTER_MATCH_H
-
-#include <linux/types.h>
-
-enum xt_cluster_flags {
-	XT_CLUSTER_F_INV	= (1 << 0)
-};
-
-struct xt_cluster_match_info {
-	__u32 total_nodes;
-	__u32 node_mask;
-	__u32 hash_seed;
-	__u32 flags;
-};
-
-#define XT_CLUSTER_NODES_MAX	32
-
-#endif /* _XT_CLUSTER_MATCH_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_comment.h b/openflow/usr/include/linux/netfilter/xt_comment.h
deleted file mode 100644
index 0ea5e79..0000000
--- a/openflow/usr/include/linux/netfilter/xt_comment.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _XT_COMMENT_H
-#define _XT_COMMENT_H
-
-#define XT_MAX_COMMENT_LEN 256
-
-struct xt_comment_info {
-	char comment[XT_MAX_COMMENT_LEN];
-};
-
-#endif /* XT_COMMENT_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_connbytes.h b/openflow/usr/include/linux/netfilter/xt_connbytes.h
deleted file mode 100644
index f1d6c15..0000000
--- a/openflow/usr/include/linux/netfilter/xt_connbytes.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _XT_CONNBYTES_H
-#define _XT_CONNBYTES_H
-
-#include <linux/types.h>
-
-enum xt_connbytes_what {
-	XT_CONNBYTES_PKTS,
-	XT_CONNBYTES_BYTES,
-	XT_CONNBYTES_AVGPKT,
-};
-
-enum xt_connbytes_direction {
-	XT_CONNBYTES_DIR_ORIGINAL,
-	XT_CONNBYTES_DIR_REPLY,
-	XT_CONNBYTES_DIR_BOTH,
-};
-
-struct xt_connbytes_info {
-	struct {
-		__aligned_u64 from;	/* count to be matched */
-		__aligned_u64 to;	/* count to be matched */
-	} count;
-	__u8 what;		/* ipt_connbytes_what */
-	__u8 direction;	/* ipt_connbytes_direction */
-};
-#endif
diff --git a/openflow/usr/include/linux/netfilter/xt_connlabel.h b/openflow/usr/include/linux/netfilter/xt_connlabel.h
deleted file mode 100644
index c4bc9ee..0000000
--- a/openflow/usr/include/linux/netfilter/xt_connlabel.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <linux/types.h>
-
-#define XT_CONNLABEL_MAXBIT 127
-enum xt_connlabel_mtopts {
-	XT_CONNLABEL_OP_INVERT = 1 << 0,
-	XT_CONNLABEL_OP_SET    = 1 << 1,
-};
-
-struct xt_connlabel_mtinfo {
-	__u16 bit;
-	__u16 options;
-};
diff --git a/openflow/usr/include/linux/netfilter/xt_connlimit.h b/openflow/usr/include/linux/netfilter/xt_connlimit.h
deleted file mode 100644
index cdcc117..0000000
--- a/openflow/usr/include/linux/netfilter/xt_connlimit.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _XT_CONNLIMIT_H
-#define _XT_CONNLIMIT_H
-
-#include <linux/types.h>
-#include <linux/netfilter.h>
-
-struct xt_connlimit_data;
-
-enum {
-	XT_CONNLIMIT_INVERT = 1 << 0,
-	XT_CONNLIMIT_DADDR  = 1 << 1,
-};
-
-struct xt_connlimit_info {
-	union {
-		union nf_inet_addr mask;
-		union {
-			__be32 v4_mask;
-			__be32 v6_mask[4];
-		};
-	};
-	unsigned int limit;
-	/* revision 1 */
-	__u32 flags;
-
-	/* Used internally by the kernel */
-	struct xt_connlimit_data *data __attribute__((aligned(8)));
-};
-
-#endif /* _XT_CONNLIMIT_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_connmark.h b/openflow/usr/include/linux/netfilter/xt_connmark.h
deleted file mode 100644
index efc17a8..0000000
--- a/openflow/usr/include/linux/netfilter/xt_connmark.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _XT_CONNMARK_H
-#define _XT_CONNMARK_H
-
-#include <linux/types.h>
-
-/* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com>
- * by Henrik Nordstrom <hno@marasystems.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-enum {
-	XT_CONNMARK_SET = 0,
-	XT_CONNMARK_SAVE,
-	XT_CONNMARK_RESTORE
-};
-
-struct xt_connmark_tginfo1 {
-	__u32 ctmark, ctmask, nfmask;
-	__u8 mode;
-};
-
-struct xt_connmark_mtinfo1 {
-	__u32 mark, mask;
-	__u8 invert;
-};
-
-#endif /*_XT_CONNMARK_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_conntrack.h b/openflow/usr/include/linux/netfilter/xt_conntrack.h
deleted file mode 100644
index e5bd308..0000000
--- a/openflow/usr/include/linux/netfilter/xt_conntrack.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Header file for kernel module to match connection tracking information.
- * GPL (C) 2001  Marc Boucher (marc@mbsi.ca).
- */
-
-#ifndef _XT_CONNTRACK_H
-#define _XT_CONNTRACK_H
-
-#include <linux/types.h>
-#include <linux/netfilter.h>
-#include <linux/netfilter/nf_conntrack_tuple_common.h>
-
-#define XT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1))
-#define XT_CONNTRACK_STATE_INVALID (1 << 0)
-
-#define XT_CONNTRACK_STATE_SNAT (1 << (IP_CT_NUMBER + 1))
-#define XT_CONNTRACK_STATE_DNAT (1 << (IP_CT_NUMBER + 2))
-#define XT_CONNTRACK_STATE_UNTRACKED (1 << (IP_CT_NUMBER + 3))
-
-/* flags, invflags: */
-enum {
-	XT_CONNTRACK_STATE        = 1 << 0,
-	XT_CONNTRACK_PROTO        = 1 << 1,
-	XT_CONNTRACK_ORIGSRC      = 1 << 2,
-	XT_CONNTRACK_ORIGDST      = 1 << 3,
-	XT_CONNTRACK_REPLSRC      = 1 << 4,
-	XT_CONNTRACK_REPLDST      = 1 << 5,
-	XT_CONNTRACK_STATUS       = 1 << 6,
-	XT_CONNTRACK_EXPIRES      = 1 << 7,
-	XT_CONNTRACK_ORIGSRC_PORT = 1 << 8,
-	XT_CONNTRACK_ORIGDST_PORT = 1 << 9,
-	XT_CONNTRACK_REPLSRC_PORT = 1 << 10,
-	XT_CONNTRACK_REPLDST_PORT = 1 << 11,
-	XT_CONNTRACK_DIRECTION    = 1 << 12,
-	XT_CONNTRACK_STATE_ALIAS  = 1 << 13,
-};
-
-struct xt_conntrack_mtinfo1 {
-	union nf_inet_addr origsrc_addr, origsrc_mask;
-	union nf_inet_addr origdst_addr, origdst_mask;
-	union nf_inet_addr replsrc_addr, replsrc_mask;
-	union nf_inet_addr repldst_addr, repldst_mask;
-	__u32 expires_min, expires_max;
-	__u16 l4proto;
-	__be16 origsrc_port, origdst_port;
-	__be16 replsrc_port, repldst_port;
-	__u16 match_flags, invert_flags;
-	__u8 state_mask, status_mask;
-};
-
-struct xt_conntrack_mtinfo2 {
-	union nf_inet_addr origsrc_addr, origsrc_mask;
-	union nf_inet_addr origdst_addr, origdst_mask;
-	union nf_inet_addr replsrc_addr, replsrc_mask;
-	union nf_inet_addr repldst_addr, repldst_mask;
-	__u32 expires_min, expires_max;
-	__u16 l4proto;
-	__be16 origsrc_port, origdst_port;
-	__be16 replsrc_port, repldst_port;
-	__u16 match_flags, invert_flags;
-	__u16 state_mask, status_mask;
-};
-
-struct xt_conntrack_mtinfo3 {
-	union nf_inet_addr origsrc_addr, origsrc_mask;
-	union nf_inet_addr origdst_addr, origdst_mask;
-	union nf_inet_addr replsrc_addr, replsrc_mask;
-	union nf_inet_addr repldst_addr, repldst_mask;
-	__u32 expires_min, expires_max;
-	__u16 l4proto;
-	__u16 origsrc_port, origdst_port;
-	__u16 replsrc_port, repldst_port;
-	__u16 match_flags, invert_flags;
-	__u16 state_mask, status_mask;
-	__u16 origsrc_port_high, origdst_port_high;
-	__u16 replsrc_port_high, repldst_port_high;
-};
-
-#endif /*_XT_CONNTRACK_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_cpu.h b/openflow/usr/include/linux/netfilter/xt_cpu.h
deleted file mode 100644
index 93c7f11..0000000
--- a/openflow/usr/include/linux/netfilter/xt_cpu.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _XT_CPU_H
-#define _XT_CPU_H
-
-#include <linux/types.h>
-
-struct xt_cpu_info {
-	__u32	cpu;
-	__u32	invert;
-};
-
-#endif /*_XT_CPU_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_dccp.h b/openflow/usr/include/linux/netfilter/xt_dccp.h
deleted file mode 100644
index a579e1b..0000000
--- a/openflow/usr/include/linux/netfilter/xt_dccp.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _XT_DCCP_H_
-#define _XT_DCCP_H_
-
-#include <linux/types.h>
-
-#define XT_DCCP_SRC_PORTS	        0x01
-#define XT_DCCP_DEST_PORTS	        0x02
-#define XT_DCCP_TYPE			0x04
-#define XT_DCCP_OPTION			0x08
-
-#define XT_DCCP_VALID_FLAGS		0x0f
-
-struct xt_dccp_info {
-	__u16 dpts[2];  /* Min, Max */
-	__u16 spts[2];  /* Min, Max */
-
-	__u16 flags;
-	__u16 invflags;
-
-	__u16 typemask;
-	__u8 option;
-};
-
-#endif /* _XT_DCCP_H_ */
-
diff --git a/openflow/usr/include/linux/netfilter/xt_devgroup.h b/openflow/usr/include/linux/netfilter/xt_devgroup.h
deleted file mode 100644
index 1babde0..0000000
--- a/openflow/usr/include/linux/netfilter/xt_devgroup.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _XT_DEVGROUP_H
-#define _XT_DEVGROUP_H
-
-#include <linux/types.h>
-
-enum xt_devgroup_flags {
-	XT_DEVGROUP_MATCH_SRC	= 0x1,
-	XT_DEVGROUP_INVERT_SRC	= 0x2,
-	XT_DEVGROUP_MATCH_DST	= 0x4,
-	XT_DEVGROUP_INVERT_DST	= 0x8,
-};
-
-struct xt_devgroup_info {
-	__u32	flags;
-	__u32	src_group;
-	__u32	src_mask;
-	__u32	dst_group;
-	__u32	dst_mask;
-};
-
-#endif /* _XT_DEVGROUP_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_dscp.h b/openflow/usr/include/linux/netfilter/xt_dscp.h
deleted file mode 100644
index 15f8932..0000000
--- a/openflow/usr/include/linux/netfilter/xt_dscp.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* x_tables module for matching the IPv4/IPv6 DSCP field
- *
- * (C) 2002 Harald Welte <laforge@gnumonks.org>
- * This software is distributed under GNU GPL v2, 1991
- *
- * See RFC2474 for a description of the DSCP field within the IP Header.
- *
- * xt_dscp.h,v 1.3 2002/08/05 19:00:21 laforge Exp
-*/
-#ifndef _XT_DSCP_H
-#define _XT_DSCP_H
-
-#include <linux/types.h>
-
-#define XT_DSCP_MASK	0xfc	/* 11111100 */
-#define XT_DSCP_SHIFT	2
-#define XT_DSCP_MAX	0x3f	/* 00111111 */
-
-/* match info */
-struct xt_dscp_info {
-	__u8 dscp;
-	__u8 invert;
-};
-
-struct xt_tos_match_info {
-	__u8 tos_mask;
-	__u8 tos_value;
-	__u8 invert;
-};
-
-#endif /* _XT_DSCP_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_ecn.h b/openflow/usr/include/linux/netfilter/xt_ecn.h
deleted file mode 100644
index 7158fca..0000000
--- a/openflow/usr/include/linux/netfilter/xt_ecn.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* iptables module for matching the ECN header in IPv4 and TCP header
- *
- * (C) 2002 Harald Welte <laforge@gnumonks.org>
- *
- * This software is distributed under GNU GPL v2, 1991
- * 
- * ipt_ecn.h,v 1.4 2002/08/05 19:39:00 laforge Exp
-*/
-#ifndef _XT_ECN_H
-#define _XT_ECN_H
-
-#include <linux/types.h>
-#include <linux/netfilter/xt_dscp.h>
-
-#define XT_ECN_IP_MASK	(~XT_DSCP_MASK)
-
-#define XT_ECN_OP_MATCH_IP	0x01
-#define XT_ECN_OP_MATCH_ECE	0x10
-#define XT_ECN_OP_MATCH_CWR	0x20
-
-#define XT_ECN_OP_MATCH_MASK	0xce
-
-/* match info */
-struct xt_ecn_info {
-	__u8 operation;
-	__u8 invert;
-	__u8 ip_ect;
-	union {
-		struct {
-			__u8 ect;
-		} tcp;
-	} proto;
-};
-
-#endif /* _XT_ECN_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_esp.h b/openflow/usr/include/linux/netfilter/xt_esp.h
deleted file mode 100644
index ee68824..0000000
--- a/openflow/usr/include/linux/netfilter/xt_esp.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _XT_ESP_H
-#define _XT_ESP_H
-
-#include <linux/types.h>
-
-struct xt_esp {
-	__u32 spis[2];	/* Security Parameter Index */
-	__u8  invflags;	/* Inverse flags */
-};
-
-/* Values for "invflags" field in struct xt_esp. */
-#define XT_ESP_INV_SPI	0x01	/* Invert the sense of spi. */
-#define XT_ESP_INV_MASK	0x01	/* All possible flags. */
-
-#endif /*_XT_ESP_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_hashlimit.h b/openflow/usr/include/linux/netfilter/xt_hashlimit.h
deleted file mode 100644
index 33511b7..0000000
--- a/openflow/usr/include/linux/netfilter/xt_hashlimit.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef _XT_HASHLIMIT_H
-#define _XT_HASHLIMIT_H
-
-#include <linux/types.h>
-
-/* timings are in milliseconds. */
-#define XT_HASHLIMIT_SCALE 10000
-/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
- * seconds, or one packet every 59 hours.
- */
-
-/* packet length accounting is done in 16-byte steps */
-#define XT_HASHLIMIT_BYTE_SHIFT 4
-
-/* details of this structure hidden by the implementation */
-struct xt_hashlimit_htable;
-
-enum {
-	XT_HASHLIMIT_HASH_DIP = 1 << 0,
-	XT_HASHLIMIT_HASH_DPT = 1 << 1,
-	XT_HASHLIMIT_HASH_SIP = 1 << 2,
-	XT_HASHLIMIT_HASH_SPT = 1 << 3,
-	XT_HASHLIMIT_INVERT   = 1 << 4,
-	XT_HASHLIMIT_BYTES    = 1 << 5,
-};
-
-struct hashlimit_cfg {
-	__u32 mode;	  /* bitmask of XT_HASHLIMIT_HASH_* */
-	__u32 avg;    /* Average secs between packets * scale */
-	__u32 burst;  /* Period multiplier for upper limit. */
-
-	/* user specified */
-	__u32 size;		/* how many buckets */
-	__u32 max;		/* max number of entries */
-	__u32 gc_interval;	/* gc interval */
-	__u32 expire;	/* when do entries expire? */
-};
-
-struct xt_hashlimit_info {
-	char name [IFNAMSIZ];		/* name */
-	struct hashlimit_cfg cfg;
-
-	/* Used internally by the kernel */
-	struct xt_hashlimit_htable *hinfo;
-	union {
-		void *ptr;
-		struct xt_hashlimit_info *master;
-	} u;
-};
-
-struct hashlimit_cfg1 {
-	__u32 mode;	  /* bitmask of XT_HASHLIMIT_HASH_* */
-	__u32 avg;    /* Average secs between packets * scale */
-	__u32 burst;  /* Period multiplier for upper limit. */
-
-	/* user specified */
-	__u32 size;		/* how many buckets */
-	__u32 max;		/* max number of entries */
-	__u32 gc_interval;	/* gc interval */
-	__u32 expire;	/* when do entries expire? */
-
-	__u8 srcmask, dstmask;
-};
-
-struct xt_hashlimit_mtinfo1 {
-	char name[IFNAMSIZ];
-	struct hashlimit_cfg1 cfg;
-
-	/* Used internally by the kernel */
-	struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));
-};
-
-#endif /* _XT_HASHLIMIT_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_helper.h b/openflow/usr/include/linux/netfilter/xt_helper.h
deleted file mode 100644
index 6b42763..0000000
--- a/openflow/usr/include/linux/netfilter/xt_helper.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _XT_HELPER_H
-#define _XT_HELPER_H
-
-struct xt_helper_info {
-	int invert;
-	char name[30];
-};
-#endif /* _XT_HELPER_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_ipcomp.h b/openflow/usr/include/linux/netfilter/xt_ipcomp.h
deleted file mode 100644
index 45c7e40..0000000
--- a/openflow/usr/include/linux/netfilter/xt_ipcomp.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _XT_IPCOMP_H
-#define _XT_IPCOMP_H
-
-#include <linux/types.h>
-
-struct xt_ipcomp {
-	__u32 spis[2];	/* Security Parameter Index */
-	__u8 invflags;	/* Inverse flags */
-	__u8 hdrres;	/* Test of the Reserved Filed */
-};
-
-/* Values for "invflags" field in struct xt_ipcomp. */
-#define XT_IPCOMP_INV_SPI	0x01	/* Invert the sense of spi. */
-#define XT_IPCOMP_INV_MASK	0x01	/* All possible flags. */
-
-#endif /*_XT_IPCOMP_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_iprange.h b/openflow/usr/include/linux/netfilter/xt_iprange.h
deleted file mode 100644
index 25fd7cf..0000000
--- a/openflow/usr/include/linux/netfilter/xt_iprange.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _LINUX_NETFILTER_XT_IPRANGE_H
-#define _LINUX_NETFILTER_XT_IPRANGE_H 1
-
-#include <linux/types.h>
-#include <linux/netfilter.h>
-
-enum {
-	IPRANGE_SRC     = 1 << 0,	/* match source IP address */
-	IPRANGE_DST     = 1 << 1,	/* match destination IP address */
-	IPRANGE_SRC_INV = 1 << 4,	/* negate the condition */
-	IPRANGE_DST_INV = 1 << 5,	/* -"- */
-};
-
-struct xt_iprange_mtinfo {
-	union nf_inet_addr src_min, src_max;
-	union nf_inet_addr dst_min, dst_max;
-	__u8 flags;
-};
-
-#endif /* _LINUX_NETFILTER_XT_IPRANGE_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_ipvs.h b/openflow/usr/include/linux/netfilter/xt_ipvs.h
deleted file mode 100644
index eff34ac..0000000
--- a/openflow/usr/include/linux/netfilter/xt_ipvs.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _XT_IPVS_H
-#define _XT_IPVS_H
-
-#include <linux/types.h>
-
-enum {
-	XT_IPVS_IPVS_PROPERTY =	1 << 0, /* all other options imply this one */
-	XT_IPVS_PROTO =		1 << 1,
-	XT_IPVS_VADDR =		1 << 2,
-	XT_IPVS_VPORT =		1 << 3,
-	XT_IPVS_DIR =		1 << 4,
-	XT_IPVS_METHOD =	1 << 5,
-	XT_IPVS_VPORTCTL =	1 << 6,
-	XT_IPVS_MASK =		(1 << 7) - 1,
-	XT_IPVS_ONCE_MASK =	XT_IPVS_MASK & ~XT_IPVS_IPVS_PROPERTY
-};
-
-struct xt_ipvs_mtinfo {
-	union nf_inet_addr	vaddr, vmask;
-	__be16			vport;
-	__u8			l4proto;
-	__u8			fwd_method;
-	__be16			vportctl;
-
-	__u8			invert;
-	__u8			bitmask;
-};
-
-#endif /* _XT_IPVS_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_l2tp.h b/openflow/usr/include/linux/netfilter/xt_l2tp.h
deleted file mode 100644
index 7dccfa0..0000000
--- a/openflow/usr/include/linux/netfilter/xt_l2tp.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _LINUX_NETFILTER_XT_L2TP_H
-#define _LINUX_NETFILTER_XT_L2TP_H
-
-#include <linux/types.h>
-
-enum xt_l2tp_type {
-	XT_L2TP_TYPE_CONTROL,
-	XT_L2TP_TYPE_DATA,
-};
-
-/* L2TP matching stuff */
-struct xt_l2tp_info {
-	__u32 tid;			/* tunnel id */
-	__u32 sid;			/* session id */
-	__u8 version;			/* L2TP protocol version */
-	__u8 type;			/* L2TP packet type */
-	__u8 flags;			/* which fields to match */
-};
-
-enum {
-	XT_L2TP_TID	= (1 << 0),	/* match L2TP tunnel id */
-	XT_L2TP_SID	= (1 << 1),	/* match L2TP session id */
-	XT_L2TP_VERSION	= (1 << 2),	/* match L2TP protocol version */
-	XT_L2TP_TYPE	= (1 << 3),	/* match L2TP packet type */
-};
-
-#endif /* _LINUX_NETFILTER_XT_L2TP_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_length.h b/openflow/usr/include/linux/netfilter/xt_length.h
deleted file mode 100644
index b82ed7c..0000000
--- a/openflow/usr/include/linux/netfilter/xt_length.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _XT_LENGTH_H
-#define _XT_LENGTH_H
-
-#include <linux/types.h>
-
-struct xt_length_info {
-    __u16	min, max;
-    __u8	invert;
-};
-
-#endif /*_XT_LENGTH_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_limit.h b/openflow/usr/include/linux/netfilter/xt_limit.h
deleted file mode 100644
index bb47fc4..0000000
--- a/openflow/usr/include/linux/netfilter/xt_limit.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _XT_RATE_H
-#define _XT_RATE_H
-
-#include <linux/types.h>
-
-/* timings are in milliseconds. */
-#define XT_LIMIT_SCALE 10000
-
-struct xt_limit_priv;
-
-/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
-   seconds, or one every 59 hours. */
-struct xt_rateinfo {
-	__u32 avg;    /* Average secs between packets * scale */
-	__u32 burst;  /* Period multiplier for upper limit. */
-
-	/* Used internally by the kernel */
-	unsigned long prev; /* moved to xt_limit_priv */
-	__u32 credit; /* moved to xt_limit_priv */
-	__u32 credit_cap, cost;
-
-	struct xt_limit_priv *master;
-};
-#endif /*_XT_RATE_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_mac.h b/openflow/usr/include/linux/netfilter/xt_mac.h
deleted file mode 100644
index b892cdc..0000000
--- a/openflow/usr/include/linux/netfilter/xt_mac.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _XT_MAC_H
-#define _XT_MAC_H
-
-struct xt_mac_info {
-    unsigned char srcaddr[ETH_ALEN];
-    int invert;
-};
-#endif /*_XT_MAC_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_mark.h b/openflow/usr/include/linux/netfilter/xt_mark.h
deleted file mode 100644
index ecadc40..0000000
--- a/openflow/usr/include/linux/netfilter/xt_mark.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _XT_MARK_H
-#define _XT_MARK_H
-
-#include <linux/types.h>
-
-struct xt_mark_tginfo2 {
-	__u32 mark, mask;
-};
-
-struct xt_mark_mtinfo1 {
-	__u32 mark, mask;
-	__u8 invert;
-};
-
-#endif /*_XT_MARK_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_multiport.h b/openflow/usr/include/linux/netfilter/xt_multiport.h
deleted file mode 100644
index 5b7e72d..0000000
--- a/openflow/usr/include/linux/netfilter/xt_multiport.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _XT_MULTIPORT_H
-#define _XT_MULTIPORT_H
-
-#include <linux/types.h>
-
-enum xt_multiport_flags {
-	XT_MULTIPORT_SOURCE,
-	XT_MULTIPORT_DESTINATION,
-	XT_MULTIPORT_EITHER
-};
-
-#define XT_MULTI_PORTS	15
-
-/* Must fit inside union xt_matchinfo: 16 bytes */
-struct xt_multiport {
-	__u8 flags;				/* Type of comparison */
-	__u8 count;				/* Number of ports */
-	__u16 ports[XT_MULTI_PORTS];	/* Ports */
-};
-
-struct xt_multiport_v1 {
-	__u8 flags;				/* Type of comparison */
-	__u8 count;				/* Number of ports */
-	__u16 ports[XT_MULTI_PORTS];	/* Ports */
-	__u8 pflags[XT_MULTI_PORTS];	/* Port flags */
-	__u8 invert;			/* Invert flag */
-};
-
-#endif /*_XT_MULTIPORT_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_nfacct.h b/openflow/usr/include/linux/netfilter/xt_nfacct.h
deleted file mode 100644
index 3e19c8a..0000000
--- a/openflow/usr/include/linux/netfilter/xt_nfacct.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _XT_NFACCT_MATCH_H
-#define _XT_NFACCT_MATCH_H
-
-#include <linux/netfilter/nfnetlink_acct.h>
-
-struct nf_acct;
-
-struct xt_nfacct_match_info {
-	char		name[NFACCT_NAME_MAX];
-	struct nf_acct	*nfacct;
-};
-
-#endif /* _XT_NFACCT_MATCH_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_osf.h b/openflow/usr/include/linux/netfilter/xt_osf.h
deleted file mode 100644
index 5d66cae..0000000
--- a/openflow/usr/include/linux/netfilter/xt_osf.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2003+ Evgeniy Polyakov <johnpol@2ka.mxt.ru>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _XT_OSF_H
-#define _XT_OSF_H
-
-#include <linux/types.h>
-
-#define MAXGENRELEN		32
-
-#define XT_OSF_GENRE		(1<<0)
-#define	XT_OSF_TTL		(1<<1)
-#define XT_OSF_LOG		(1<<2)
-#define XT_OSF_INVERT		(1<<3)
-
-#define XT_OSF_LOGLEVEL_ALL	0	/* log all matched fingerprints */
-#define XT_OSF_LOGLEVEL_FIRST	1	/* log only the first matced fingerprint */
-#define XT_OSF_LOGLEVEL_ALL_KNOWN	2 /* do not log unknown packets */
-
-#define XT_OSF_TTL_TRUE		0	/* True ip and fingerprint TTL comparison */
-#define XT_OSF_TTL_LESS		1	/* Check if ip TTL is less than fingerprint one */
-#define XT_OSF_TTL_NOCHECK	2	/* Do not compare ip and fingerprint TTL at all */
-
-struct xt_osf_info {
-	char			genre[MAXGENRELEN];
-	__u32			len;
-	__u32			flags;
-	__u32			loglevel;
-	__u32			ttl;
-};
-
-/*
- * Wildcard MSS (kind of).
- * It is used to implement a state machine for the different wildcard values
- * of the MSS and window sizes.
- */
-struct xt_osf_wc {
-	__u32			wc;
-	__u32			val;
-};
-
-/*
- * This struct represents IANA options
- * http://www.iana.org/assignments/tcp-parameters
- */
-struct xt_osf_opt {
-	__u16			kind, length;
-	struct xt_osf_wc	wc;
-};
-
-struct xt_osf_user_finger {
-	struct xt_osf_wc	wss;
-
-	__u8			ttl, df;
-	__u16			ss, mss;
-	__u16			opt_num;
-
-	char			genre[MAXGENRELEN];
-	char			version[MAXGENRELEN];
-	char			subtype[MAXGENRELEN];
-
-	/* MAX_IPOPTLEN is maximum if all options are NOPs or EOLs */
-	struct xt_osf_opt	opt[MAX_IPOPTLEN];
-};
-
-struct xt_osf_nlmsg {
-	struct xt_osf_user_finger	f;
-	struct iphdr		ip;
-	struct tcphdr		tcp;
-};
-
-/* Defines for IANA option kinds */
-
-enum iana_options {
-	OSFOPT_EOL = 0,		/* End of options */
-	OSFOPT_NOP, 		/* NOP */
-	OSFOPT_MSS, 		/* Maximum segment size */
-	OSFOPT_WSO, 		/* Window scale option */
-	OSFOPT_SACKP,		/* SACK permitted */
-	OSFOPT_SACK,		/* SACK */
-	OSFOPT_ECHO,
-	OSFOPT_ECHOREPLY,
-	OSFOPT_TS,		/* Timestamp option */
-	OSFOPT_POCP,		/* Partial Order Connection Permitted */
-	OSFOPT_POSP,		/* Partial Order Service Profile */
-
-	/* Others are not used in the current OSF */
-	OSFOPT_EMPTY = 255,
-};
-
-/*
- * Initial window size option state machine: multiple of mss, mtu or
- * plain numeric value. Can also be made as plain numeric value which
- * is not a multiple of specified value.
- */
-enum xt_osf_window_size_options {
-	OSF_WSS_PLAIN	= 0,
-	OSF_WSS_MSS,
-	OSF_WSS_MTU,
-	OSF_WSS_MODULO,
-	OSF_WSS_MAX,
-};
-
-/*
- * Add/remove fingerprint from the kernel.
- */
-enum xt_osf_msg_types {
-	OSF_MSG_ADD,
-	OSF_MSG_REMOVE,
-	OSF_MSG_MAX,
-};
-
-enum xt_osf_attr_type {
-	OSF_ATTR_UNSPEC,
-	OSF_ATTR_FINGER,
-	OSF_ATTR_MAX,
-};
-
-#endif				/* _XT_OSF_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_owner.h b/openflow/usr/include/linux/netfilter/xt_owner.h
deleted file mode 100644
index 2081761..0000000
--- a/openflow/usr/include/linux/netfilter/xt_owner.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _XT_OWNER_MATCH_H
-#define _XT_OWNER_MATCH_H
-
-#include <linux/types.h>
-
-enum {
-	XT_OWNER_UID    = 1 << 0,
-	XT_OWNER_GID    = 1 << 1,
-	XT_OWNER_SOCKET = 1 << 2,
-};
-
-struct xt_owner_match_info {
-	__u32 uid_min, uid_max;
-	__u32 gid_min, gid_max;
-	__u8 match, invert;
-};
-
-#endif /* _XT_OWNER_MATCH_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_physdev.h b/openflow/usr/include/linux/netfilter/xt_physdev.h
deleted file mode 100644
index 8ab7eb7..0000000
--- a/openflow/usr/include/linux/netfilter/xt_physdev.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _XT_PHYSDEV_H
-#define _XT_PHYSDEV_H
-
-#include <linux/types.h>
-
-
-#define XT_PHYSDEV_OP_IN		0x01
-#define XT_PHYSDEV_OP_OUT		0x02
-#define XT_PHYSDEV_OP_BRIDGED		0x04
-#define XT_PHYSDEV_OP_ISIN		0x08
-#define XT_PHYSDEV_OP_ISOUT		0x10
-#define XT_PHYSDEV_OP_MASK		(0x20 - 1)
-
-struct xt_physdev_info {
-	char physindev[IFNAMSIZ];
-	char in_mask[IFNAMSIZ];
-	char physoutdev[IFNAMSIZ];
-	char out_mask[IFNAMSIZ];
-	__u8 invert;
-	__u8 bitmask;
-};
-
-#endif /* _XT_PHYSDEV_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_pkttype.h b/openflow/usr/include/linux/netfilter/xt_pkttype.h
deleted file mode 100644
index f265cf5..0000000
--- a/openflow/usr/include/linux/netfilter/xt_pkttype.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _XT_PKTTYPE_H
-#define _XT_PKTTYPE_H
-
-struct xt_pkttype_info {
-	int	pkttype;
-	int	invert;
-};
-#endif /*_XT_PKTTYPE_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_policy.h b/openflow/usr/include/linux/netfilter/xt_policy.h
deleted file mode 100644
index d246eac..0000000
--- a/openflow/usr/include/linux/netfilter/xt_policy.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _XT_POLICY_H
-#define _XT_POLICY_H
-
-#include <linux/types.h>
-
-#define XT_POLICY_MAX_ELEM	4
-
-enum xt_policy_flags {
-	XT_POLICY_MATCH_IN	= 0x1,
-	XT_POLICY_MATCH_OUT	= 0x2,
-	XT_POLICY_MATCH_NONE	= 0x4,
-	XT_POLICY_MATCH_STRICT	= 0x8,
-};
-
-enum xt_policy_modes {
-	XT_POLICY_MODE_TRANSPORT,
-	XT_POLICY_MODE_TUNNEL
-};
-
-struct xt_policy_spec {
-	__u8	saddr:1,
-			daddr:1,
-			proto:1,
-			mode:1,
-			spi:1,
-			reqid:1;
-};
-
-union xt_policy_addr {
-	struct in_addr	a4;
-	struct in6_addr	a6;
-};
-
-struct xt_policy_elem {
-	union {
-		struct {
-			union xt_policy_addr saddr;
-			union xt_policy_addr smask;
-			union xt_policy_addr daddr;
-			union xt_policy_addr dmask;
-		};
-	};
-	__be32			spi;
-	__u32		reqid;
-	__u8		proto;
-	__u8		mode;
-
-	struct xt_policy_spec	match;
-	struct xt_policy_spec	invert;
-};
-
-struct xt_policy_info {
-	struct xt_policy_elem pol[XT_POLICY_MAX_ELEM];
-	__u16 flags;
-	__u16 len;
-};
-
-#endif /* _XT_POLICY_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_quota.h b/openflow/usr/include/linux/netfilter/xt_quota.h
deleted file mode 100644
index 9314723..0000000
--- a/openflow/usr/include/linux/netfilter/xt_quota.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _XT_QUOTA_H
-#define _XT_QUOTA_H
-
-#include <linux/types.h>
-
-enum xt_quota_flags {
-	XT_QUOTA_INVERT		= 0x1,
-};
-#define XT_QUOTA_MASK		0x1
-
-struct xt_quota_priv;
-
-struct xt_quota_info {
-	__u32 flags;
-	__u32 pad;
-	__aligned_u64 quota;
-
-	/* Used internally by the kernel */
-	struct xt_quota_priv	*master;
-};
-
-#endif /* _XT_QUOTA_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_rateest.h b/openflow/usr/include/linux/netfilter/xt_rateest.h
deleted file mode 100644
index d40a619..0000000
--- a/openflow/usr/include/linux/netfilter/xt_rateest.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _XT_RATEEST_MATCH_H
-#define _XT_RATEEST_MATCH_H
-
-#include <linux/types.h>
-
-enum xt_rateest_match_flags {
-	XT_RATEEST_MATCH_INVERT	= 1<<0,
-	XT_RATEEST_MATCH_ABS	= 1<<1,
-	XT_RATEEST_MATCH_REL	= 1<<2,
-	XT_RATEEST_MATCH_DELTA	= 1<<3,
-	XT_RATEEST_MATCH_BPS	= 1<<4,
-	XT_RATEEST_MATCH_PPS	= 1<<5,
-};
-
-enum xt_rateest_match_mode {
-	XT_RATEEST_MATCH_NONE,
-	XT_RATEEST_MATCH_EQ,
-	XT_RATEEST_MATCH_LT,
-	XT_RATEEST_MATCH_GT,
-};
-
-struct xt_rateest_match_info {
-	char			name1[IFNAMSIZ];
-	char			name2[IFNAMSIZ];
-	__u16		flags;
-	__u16		mode;
-	__u32		bps1;
-	__u32		pps1;
-	__u32		bps2;
-	__u32		pps2;
-
-	/* Used internally by the kernel */
-	struct xt_rateest	*est1 __attribute__((aligned(8)));
-	struct xt_rateest	*est2 __attribute__((aligned(8)));
-};
-
-#endif /* _XT_RATEEST_MATCH_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_realm.h b/openflow/usr/include/linux/netfilter/xt_realm.h
deleted file mode 100644
index d4a82ee..0000000
--- a/openflow/usr/include/linux/netfilter/xt_realm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _XT_REALM_H
-#define _XT_REALM_H
-
-#include <linux/types.h>
-
-struct xt_realm_info {
-	__u32 id;
-	__u32 mask;
-	__u8 invert;
-};
-
-#endif /* _XT_REALM_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_recent.h b/openflow/usr/include/linux/netfilter/xt_recent.h
deleted file mode 100644
index 6ef36c1..0000000
--- a/openflow/usr/include/linux/netfilter/xt_recent.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef _LINUX_NETFILTER_XT_RECENT_H
-#define _LINUX_NETFILTER_XT_RECENT_H 1
-
-#include <linux/types.h>
-
-enum {
-	XT_RECENT_CHECK    = 1 << 0,
-	XT_RECENT_SET      = 1 << 1,
-	XT_RECENT_UPDATE   = 1 << 2,
-	XT_RECENT_REMOVE   = 1 << 3,
-	XT_RECENT_TTL      = 1 << 4,
-	XT_RECENT_REAP     = 1 << 5,
-
-	XT_RECENT_SOURCE   = 0,
-	XT_RECENT_DEST     = 1,
-
-	XT_RECENT_NAME_LEN = 200,
-};
-
-/* Only allowed with --rcheck and --update */
-#define XT_RECENT_MODIFIERS (XT_RECENT_TTL|XT_RECENT_REAP)
-
-#define XT_RECENT_VALID_FLAGS (XT_RECENT_CHECK|XT_RECENT_SET|XT_RECENT_UPDATE|\
-			       XT_RECENT_REMOVE|XT_RECENT_TTL|XT_RECENT_REAP)
-
-struct xt_recent_mtinfo {
-	__u32 seconds;
-	__u32 hit_count;
-	__u8 check_set;
-	__u8 invert;
-	char name[XT_RECENT_NAME_LEN];
-	__u8 side;
-};
-
-struct xt_recent_mtinfo_v1 {
-	__u32 seconds;
-	__u32 hit_count;
-	__u8 check_set;
-	__u8 invert;
-	char name[XT_RECENT_NAME_LEN];
-	__u8 side;
-	union nf_inet_addr mask;
-};
-
-#endif /* _LINUX_NETFILTER_XT_RECENT_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_rpfilter.h b/openflow/usr/include/linux/netfilter/xt_rpfilter.h
deleted file mode 100644
index 672b605..0000000
--- a/openflow/usr/include/linux/netfilter/xt_rpfilter.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _XT_RPATH_H
-#define _XT_RPATH_H
-
-#include <linux/types.h>
-
-enum {
-	XT_RPFILTER_LOOSE = 1 << 0,
-	XT_RPFILTER_VALID_MARK = 1 << 1,
-	XT_RPFILTER_ACCEPT_LOCAL = 1 << 2,
-	XT_RPFILTER_INVERT = 1 << 3,
-};
-
-struct xt_rpfilter_info {
-	__u8 flags;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter/xt_sctp.h b/openflow/usr/include/linux/netfilter/xt_sctp.h
deleted file mode 100644
index a501e61..0000000
--- a/openflow/usr/include/linux/netfilter/xt_sctp.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef _XT_SCTP_H_
-#define _XT_SCTP_H_
-
-#include <linux/types.h>
-
-#define XT_SCTP_SRC_PORTS	        0x01
-#define XT_SCTP_DEST_PORTS	        0x02
-#define XT_SCTP_CHUNK_TYPES		0x04
-
-#define XT_SCTP_VALID_FLAGS		0x07
-
-struct xt_sctp_flag_info {
-	__u8 chunktype;
-	__u8 flag;
-	__u8 flag_mask;
-};
-
-#define XT_NUM_SCTP_FLAGS	4
-
-struct xt_sctp_info {
-	__u16 dpts[2];  /* Min, Max */
-	__u16 spts[2];  /* Min, Max */
-
-	__u32 chunkmap[256 / sizeof (__u32)];  /* Bit mask of chunks to be matched according to RFC 2960 */
-
-#define SCTP_CHUNK_MATCH_ANY   0x01  /* Match if any of the chunk types are present */
-#define SCTP_CHUNK_MATCH_ALL   0x02  /* Match if all of the chunk types are present */
-#define SCTP_CHUNK_MATCH_ONLY  0x04  /* Match if these are the only chunk types present */
-
-	__u32 chunk_match_type;
-	struct xt_sctp_flag_info flag_info[XT_NUM_SCTP_FLAGS];
-	int flag_count;
-
-	__u32 flags;
-	__u32 invflags;
-};
-
-#define bytes(type) (sizeof(type) * 8)
-
-#define SCTP_CHUNKMAP_SET(chunkmap, type) 		\
-	do { 						\
-		(chunkmap)[type / bytes(__u32)] |= 	\
-			1 << (type % bytes(__u32));	\
-	} while (0)
-
-#define SCTP_CHUNKMAP_CLEAR(chunkmap, type)		 	\
-	do {							\
-		(chunkmap)[type / bytes(__u32)] &= 		\
-			~(1 << (type % bytes(__u32)));	\
-	} while (0)
-
-#define SCTP_CHUNKMAP_IS_SET(chunkmap, type) 			\
-({								\
-	((chunkmap)[type / bytes (__u32)] & 		\
-		(1 << (type % bytes (__u32)))) ? 1: 0;	\
-})
-
-#define SCTP_CHUNKMAP_RESET(chunkmap) \
-	memset((chunkmap), 0, sizeof(chunkmap))
-
-#define SCTP_CHUNKMAP_SET_ALL(chunkmap) \
-	memset((chunkmap), ~0U, sizeof(chunkmap))
-
-#define SCTP_CHUNKMAP_COPY(destmap, srcmap) \
-	memcpy((destmap), (srcmap), sizeof(srcmap))
-
-#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \
-	__sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap))
-static __inline__ bool
-__sctp_chunkmap_is_clear(const __u32 *chunkmap, unsigned int n)
-{
-	unsigned int i;
-	for (i = 0; i < n; ++i)
-		if (chunkmap[i])
-			return false;
-	return true;
-}
-
-#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \
-	__sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap))
-static __inline__ bool
-__sctp_chunkmap_is_all_set(const __u32 *chunkmap, unsigned int n)
-{
-	unsigned int i;
-	for (i = 0; i < n; ++i)
-		if (chunkmap[i] != ~0U)
-			return false;
-	return true;
-}
-
-#endif /* _XT_SCTP_H_ */
-
diff --git a/openflow/usr/include/linux/netfilter/xt_set.h b/openflow/usr/include/linux/netfilter/xt_set.h
deleted file mode 100644
index d4e0234..0000000
--- a/openflow/usr/include/linux/netfilter/xt_set.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef _XT_SET_H
-#define _XT_SET_H
-
-#include <linux/types.h>
-#include <linux/netfilter/ipset/ip_set.h>
-
-/* Revision 0 interface: backward compatible with netfilter/iptables */
-
-/*
- * Option flags for kernel operations (xt_set_info_v0)
- */
-#define IPSET_SRC		0x01	/* Source match/add */
-#define IPSET_DST		0x02	/* Destination match/add */
-#define IPSET_MATCH_INV		0x04	/* Inverse matching */
-
-struct xt_set_info_v0 {
-	ip_set_id_t index;
-	union {
-		__u32 flags[IPSET_DIM_MAX + 1];
-		struct {
-			__u32 __flags[IPSET_DIM_MAX];
-			__u8 dim;
-			__u8 flags;
-		} compat;
-	} u;
-};
-
-/* match and target infos */
-struct xt_set_info_match_v0 {
-	struct xt_set_info_v0 match_set;
-};
-
-struct xt_set_info_target_v0 {
-	struct xt_set_info_v0 add_set;
-	struct xt_set_info_v0 del_set;
-};
-
-/* Revision 1  match and target */
-
-struct xt_set_info {
-	ip_set_id_t index;
-	__u8 dim;
-	__u8 flags;
-};
-
-/* match and target infos */
-struct xt_set_info_match_v1 {
-	struct xt_set_info match_set;
-};
-
-struct xt_set_info_target_v1 {
-	struct xt_set_info add_set;
-	struct xt_set_info del_set;
-};
-
-/* Revision 2 target */
-
-struct xt_set_info_target_v2 {
-	struct xt_set_info add_set;
-	struct xt_set_info del_set;
-	__u32 flags;
-	__u32 timeout;
-};
-
-/* Revision 3 match */
-
-struct xt_set_info_match_v3 {
-	struct xt_set_info match_set;
-	struct ip_set_counter_match0 packets;
-	struct ip_set_counter_match0 bytes;
-	__u32 flags;
-};
-
-/* Revision 3 target */
-
-struct xt_set_info_target_v3 {
-	struct xt_set_info add_set;
-	struct xt_set_info del_set;
-	struct xt_set_info map_set;
-	__u32 flags;
-	__u32 timeout;
-};
-
-/* Revision 4 match */
-
-struct xt_set_info_match_v4 {
-	struct xt_set_info match_set;
-	struct ip_set_counter_match packets;
-	struct ip_set_counter_match bytes;
-	__u32 flags;
-};
-
-#endif /*_XT_SET_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_socket.h b/openflow/usr/include/linux/netfilter/xt_socket.h
deleted file mode 100644
index 87644f8..0000000
--- a/openflow/usr/include/linux/netfilter/xt_socket.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _XT_SOCKET_H
-#define _XT_SOCKET_H
-
-#include <linux/types.h>
-
-enum {
-	XT_SOCKET_TRANSPARENT = 1 << 0,
-	XT_SOCKET_NOWILDCARD = 1 << 1,
-	XT_SOCKET_RESTORESKMARK = 1 << 2,
-};
-
-struct xt_socket_mtinfo1 {
-	__u8 flags;
-};
-#define XT_SOCKET_FLAGS_V1 XT_SOCKET_TRANSPARENT
-
-struct xt_socket_mtinfo2 {
-	__u8 flags;
-};
-#define XT_SOCKET_FLAGS_V2 (XT_SOCKET_TRANSPARENT | XT_SOCKET_NOWILDCARD)
-
-struct xt_socket_mtinfo3 {
-	__u8 flags;
-};
-#define XT_SOCKET_FLAGS_V3 (XT_SOCKET_TRANSPARENT \
-			   | XT_SOCKET_NOWILDCARD \
-			   | XT_SOCKET_RESTORESKMARK)
-
-#endif /* _XT_SOCKET_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_state.h b/openflow/usr/include/linux/netfilter/xt_state.h
deleted file mode 100644
index 7b32de8..0000000
--- a/openflow/usr/include/linux/netfilter/xt_state.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _XT_STATE_H
-#define _XT_STATE_H
-
-#define XT_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1))
-#define XT_STATE_INVALID (1 << 0)
-
-#define XT_STATE_UNTRACKED (1 << (IP_CT_NUMBER + 1))
-
-struct xt_state_info {
-	unsigned int statemask;
-};
-#endif /*_XT_STATE_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_statistic.h b/openflow/usr/include/linux/netfilter/xt_statistic.h
deleted file mode 100644
index 4e983ef..0000000
--- a/openflow/usr/include/linux/netfilter/xt_statistic.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _XT_STATISTIC_H
-#define _XT_STATISTIC_H
-
-#include <linux/types.h>
-
-enum xt_statistic_mode {
-	XT_STATISTIC_MODE_RANDOM,
-	XT_STATISTIC_MODE_NTH,
-	__XT_STATISTIC_MODE_MAX
-};
-#define XT_STATISTIC_MODE_MAX (__XT_STATISTIC_MODE_MAX - 1)
-
-enum xt_statistic_flags {
-	XT_STATISTIC_INVERT		= 0x1,
-};
-#define XT_STATISTIC_MASK		0x1
-
-struct xt_statistic_priv;
-
-struct xt_statistic_info {
-	__u16			mode;
-	__u16			flags;
-	union {
-		struct {
-			__u32	probability;
-		} random;
-		struct {
-			__u32	every;
-			__u32	packet;
-			__u32	count; /* unused */
-		} nth;
-	} u;
-	struct xt_statistic_priv *master __attribute__((aligned(8)));
-};
-
-#endif /* _XT_STATISTIC_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_string.h b/openflow/usr/include/linux/netfilter/xt_string.h
deleted file mode 100644
index 235347c..0000000
--- a/openflow/usr/include/linux/netfilter/xt_string.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _XT_STRING_H
-#define _XT_STRING_H
-
-#include <linux/types.h>
-
-#define XT_STRING_MAX_PATTERN_SIZE 128
-#define XT_STRING_MAX_ALGO_NAME_SIZE 16
-
-enum {
-	XT_STRING_FLAG_INVERT		= 0x01,
-	XT_STRING_FLAG_IGNORECASE	= 0x02
-};
-
-struct xt_string_info {
-	__u16 from_offset;
-	__u16 to_offset;
-	char	  algo[XT_STRING_MAX_ALGO_NAME_SIZE];
-	char 	  pattern[XT_STRING_MAX_PATTERN_SIZE];
-	__u8  patlen;
-	union {
-		struct {
-			__u8  invert;
-		} v0;
-
-		struct {
-			__u8  flags;
-		} v1;
-	} u;
-
-	/* Used internally by the kernel */
-	struct ts_config __attribute__((aligned(8))) *config;
-};
-
-#endif /*_XT_STRING_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_tcpmss.h b/openflow/usr/include/linux/netfilter/xt_tcpmss.h
deleted file mode 100644
index fbac56b..0000000
--- a/openflow/usr/include/linux/netfilter/xt_tcpmss.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _XT_TCPMSS_MATCH_H
-#define _XT_TCPMSS_MATCH_H
-
-#include <linux/types.h>
-
-struct xt_tcpmss_match_info {
-    __u16 mss_min, mss_max;
-    __u8 invert;
-};
-
-#endif /*_XT_TCPMSS_MATCH_H*/
diff --git a/openflow/usr/include/linux/netfilter/xt_tcpudp.h b/openflow/usr/include/linux/netfilter/xt_tcpudp.h
deleted file mode 100644
index 38aa7b3..0000000
--- a/openflow/usr/include/linux/netfilter/xt_tcpudp.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _XT_TCPUDP_H
-#define _XT_TCPUDP_H
-
-#include <linux/types.h>
-
-/* TCP matching stuff */
-struct xt_tcp {
-	__u16 spts[2];			/* Source port range. */
-	__u16 dpts[2];			/* Destination port range. */
-	__u8 option;			/* TCP Option iff non-zero*/
-	__u8 flg_mask;			/* TCP flags mask byte */
-	__u8 flg_cmp;			/* TCP flags compare byte */
-	__u8 invflags;			/* Inverse flags */
-};
-
-/* Values for "inv" field in struct ipt_tcp. */
-#define XT_TCP_INV_SRCPT	0x01	/* Invert the sense of source ports. */
-#define XT_TCP_INV_DSTPT	0x02	/* Invert the sense of dest ports. */
-#define XT_TCP_INV_FLAGS	0x04	/* Invert the sense of TCP flags. */
-#define XT_TCP_INV_OPTION	0x08	/* Invert the sense of option test. */
-#define XT_TCP_INV_MASK		0x0F	/* All possible flags. */
-
-/* UDP matching stuff */
-struct xt_udp {
-	__u16 spts[2];			/* Source port range. */
-	__u16 dpts[2];			/* Destination port range. */
-	__u8 invflags;			/* Inverse flags */
-};
-
-/* Values for "invflags" field in struct ipt_udp. */
-#define XT_UDP_INV_SRCPT	0x01	/* Invert the sense of source ports. */
-#define XT_UDP_INV_DSTPT	0x02	/* Invert the sense of dest ports. */
-#define XT_UDP_INV_MASK	0x03	/* All possible flags. */
-
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter/xt_time.h b/openflow/usr/include/linux/netfilter/xt_time.h
deleted file mode 100644
index 0958860..0000000
--- a/openflow/usr/include/linux/netfilter/xt_time.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _XT_TIME_H
-#define _XT_TIME_H 1
-
-#include <linux/types.h>
-
-struct xt_time_info {
-	__u32 date_start;
-	__u32 date_stop;
-	__u32 daytime_start;
-	__u32 daytime_stop;
-	__u32 monthdays_match;
-	__u8 weekdays_match;
-	__u8 flags;
-};
-
-enum {
-	/* Match against local time (instead of UTC) */
-	XT_TIME_LOCAL_TZ = 1 << 0,
-
-	/* treat timestart > timestop (e.g. 23:00-01:00) as single period */
-	XT_TIME_CONTIGUOUS = 1 << 1,
-
-	/* Shortcuts */
-	XT_TIME_ALL_MONTHDAYS = 0xFFFFFFFE,
-	XT_TIME_ALL_WEEKDAYS  = 0xFE,
-	XT_TIME_MIN_DAYTIME   = 0,
-	XT_TIME_MAX_DAYTIME   = 24 * 60 * 60 - 1,
-};
-
-#define XT_TIME_ALL_FLAGS (XT_TIME_LOCAL_TZ|XT_TIME_CONTIGUOUS)
-
-#endif /* _XT_TIME_H */
diff --git a/openflow/usr/include/linux/netfilter/xt_u32.h b/openflow/usr/include/linux/netfilter/xt_u32.h
deleted file mode 100644
index 04d1bfe..0000000
--- a/openflow/usr/include/linux/netfilter/xt_u32.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _XT_U32_H
-#define _XT_U32_H 1
-
-#include <linux/types.h>
-
-enum xt_u32_ops {
-	XT_U32_AND,
-	XT_U32_LEFTSH,
-	XT_U32_RIGHTSH,
-	XT_U32_AT,
-};
-
-struct xt_u32_location_element {
-	__u32 number;
-	__u8 nextop;
-};
-
-struct xt_u32_value_element {
-	__u32 min;
-	__u32 max;
-};
-
-/*
- * Any way to allow for an arbitrary number of elements?
- * For now, I settle with a limit of 10 each.
- */
-#define XT_U32_MAXSIZE 10
-
-struct xt_u32_test {
-	struct xt_u32_location_element location[XT_U32_MAXSIZE+1];
-	struct xt_u32_value_element value[XT_U32_MAXSIZE+1];
-	__u8 nnums;
-	__u8 nvalues;
-};
-
-struct xt_u32 {
-	struct xt_u32_test tests[XT_U32_MAXSIZE+1];
-	__u8 ntests;
-	__u8 invert;
-};
-
-#endif /* _XT_U32_H */
diff --git a/openflow/usr/include/linux/netfilter_arp.h b/openflow/usr/include/linux/netfilter_arp.h
deleted file mode 100644
index 92bc6dd..0000000
--- a/openflow/usr/include/linux/netfilter_arp.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __LINUX_ARP_NETFILTER_H
-#define __LINUX_ARP_NETFILTER_H
-
-/* ARP-specific defines for netfilter.
- * (C)2002 Rusty Russell IBM -- This code is GPL.
- */
-
-#include <linux/netfilter.h>
-
-/* There is no PF_ARP. */
-#define NF_ARP		0
-
-/* ARP Hooks */
-#define NF_ARP_IN	0
-#define NF_ARP_OUT	1
-#define NF_ARP_FORWARD	2
-#define NF_ARP_NUMHOOKS	3
-
-#endif /* __LINUX_ARP_NETFILTER_H */
diff --git a/openflow/usr/include/linux/netfilter_arp/arp_tables.h b/openflow/usr/include/linux/netfilter_arp/arp_tables.h
deleted file mode 100644
index bb1ec64..0000000
--- a/openflow/usr/include/linux/netfilter_arp/arp_tables.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 	Format of an ARP firewall descriptor
- *
- * 	src, tgt, src_mask, tgt_mask, arpop, arpop_mask are always stored in
- *	network byte order.
- * 	flags are stored in host byte order (of course).
- */
-
-#ifndef _ARPTABLES_H
-#define _ARPTABLES_H
-
-#include <linux/types.h>
-
-#include <linux/netfilter_arp.h>
-
-#include <linux/netfilter/x_tables.h>
-
-#define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
-#define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
-#define arpt_entry_target xt_entry_target
-#define arpt_standard_target xt_standard_target
-#define arpt_error_target xt_error_target
-#define ARPT_CONTINUE XT_CONTINUE
-#define ARPT_RETURN XT_RETURN
-#define arpt_counters_info xt_counters_info
-#define arpt_counters xt_counters
-#define ARPT_STANDARD_TARGET XT_STANDARD_TARGET
-#define ARPT_ERROR_TARGET XT_ERROR_TARGET
-#define ARPT_ENTRY_ITERATE(entries, size, fn, args...) \
-	XT_ENTRY_ITERATE(struct arpt_entry, entries, size, fn, ## args)
-
-#define ARPT_DEV_ADDR_LEN_MAX 16
-
-struct arpt_devaddr_info {
-	char addr[ARPT_DEV_ADDR_LEN_MAX];
-	char mask[ARPT_DEV_ADDR_LEN_MAX];
-};
-
-/* Yes, Virginia, you have to zero the padding. */
-struct arpt_arp {
-	/* Source and target IP addr */
-	struct in_addr src, tgt;
-	/* Mask for src and target IP addr */
-	struct in_addr smsk, tmsk;
-
-	/* Device hw address length, src+target device addresses */
-	__u8 arhln, arhln_mask;
-	struct arpt_devaddr_info src_devaddr;
-	struct arpt_devaddr_info tgt_devaddr;
-
-	/* ARP operation code. */
-	__be16 arpop, arpop_mask;
-
-	/* ARP hardware address and protocol address format. */
-	__be16 arhrd, arhrd_mask;
-	__be16 arpro, arpro_mask;
-
-	/* The protocol address length is only accepted if it is 4
-	 * so there is no use in offering a way to do filtering on it.
-	 */
-
-	char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
-	unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
-
-	/* Flags word */
-	__u8 flags;
-	/* Inverse flags */
-	__u16 invflags;
-};
-
-/* Values for "flag" field in struct arpt_ip (general arp structure).
- * No flags defined yet.
- */
-#define ARPT_F_MASK		0x00	/* All possible flag bits mask. */
-
-/* Values for "inv" field in struct arpt_arp. */
-#define ARPT_INV_VIA_IN		0x0001	/* Invert the sense of IN IFACE. */
-#define ARPT_INV_VIA_OUT	0x0002	/* Invert the sense of OUT IFACE */
-#define ARPT_INV_SRCIP		0x0004	/* Invert the sense of SRC IP. */
-#define ARPT_INV_TGTIP		0x0008	/* Invert the sense of TGT IP. */
-#define ARPT_INV_SRCDEVADDR	0x0010	/* Invert the sense of SRC DEV ADDR. */
-#define ARPT_INV_TGTDEVADDR	0x0020	/* Invert the sense of TGT DEV ADDR. */
-#define ARPT_INV_ARPOP		0x0040	/* Invert the sense of ARP OP. */
-#define ARPT_INV_ARPHRD		0x0080	/* Invert the sense of ARP HRD. */
-#define ARPT_INV_ARPPRO		0x0100	/* Invert the sense of ARP PRO. */
-#define ARPT_INV_ARPHLN		0x0200	/* Invert the sense of ARP HLN. */
-#define ARPT_INV_MASK		0x03FF	/* All possible flag bits mask. */
-
-/* This structure defines each of the firewall rules.  Consists of 3
-   parts which are 1) general ARP header stuff 2) match specific
-   stuff 3) the target to perform if the rule matches */
-struct arpt_entry
-{
-	struct arpt_arp arp;
-
-	/* Size of arpt_entry + matches */
-	__u16 target_offset;
-	/* Size of arpt_entry + matches + target */
-	__u16 next_offset;
-
-	/* Back pointer */
-	unsigned int comefrom;
-
-	/* Packet and byte counters. */
-	struct xt_counters counters;
-
-	/* The matches (if any), then the target. */
-	unsigned char elems[0];
-};
-
-/*
- * New IP firewall options for [gs]etsockopt at the RAW IP level.
- * Unlike BSD Linux inherits IP options so you don't have to use a raw
- * socket for this. Instead we check rights in the calls.
- *
- * ATTENTION: check linux/in.h before adding new number here.
- */
-#define ARPT_BASE_CTL		96
-
-#define ARPT_SO_SET_REPLACE		(ARPT_BASE_CTL)
-#define ARPT_SO_SET_ADD_COUNTERS	(ARPT_BASE_CTL + 1)
-#define ARPT_SO_SET_MAX			ARPT_SO_SET_ADD_COUNTERS
-
-#define ARPT_SO_GET_INFO		(ARPT_BASE_CTL)
-#define ARPT_SO_GET_ENTRIES		(ARPT_BASE_CTL + 1)
-/* #define ARPT_SO_GET_REVISION_MATCH	(APRT_BASE_CTL + 2) */
-#define ARPT_SO_GET_REVISION_TARGET	(ARPT_BASE_CTL + 3)
-#define ARPT_SO_GET_MAX			(ARPT_SO_GET_REVISION_TARGET)
-
-/* The argument to ARPT_SO_GET_INFO */
-struct arpt_getinfo {
-	/* Which table: caller fills this in. */
-	char name[XT_TABLE_MAXNAMELEN];
-
-	/* Kernel fills these in. */
-	/* Which hook entry points are valid: bitmask */
-	unsigned int valid_hooks;
-
-	/* Hook entry points: one per netfilter hook. */
-	unsigned int hook_entry[NF_ARP_NUMHOOKS];
-
-	/* Underflow points. */
-	unsigned int underflow[NF_ARP_NUMHOOKS];
-
-	/* Number of entries */
-	unsigned int num_entries;
-
-	/* Size of entries. */
-	unsigned int size;
-};
-
-/* The argument to ARPT_SO_SET_REPLACE. */
-struct arpt_replace {
-	/* Which table. */
-	char name[XT_TABLE_MAXNAMELEN];
-
-	/* Which hook entry points are valid: bitmask.  You can't
-           change this. */
-	unsigned int valid_hooks;
-
-	/* Number of entries */
-	unsigned int num_entries;
-
-	/* Total size of new entries */
-	unsigned int size;
-
-	/* Hook entry points. */
-	unsigned int hook_entry[NF_ARP_NUMHOOKS];
-
-	/* Underflow points. */
-	unsigned int underflow[NF_ARP_NUMHOOKS];
-
-	/* Information about old entries: */
-	/* Number of counters (must be equal to current number of entries). */
-	unsigned int num_counters;
-	/* The old entries' counters. */
-	struct xt_counters *counters;
-
-	/* The entries (hang off end: not really an array). */
-	struct arpt_entry entries[0];
-};
-
-/* The argument to ARPT_SO_GET_ENTRIES. */
-struct arpt_get_entries {
-	/* Which table: user fills this in. */
-	char name[XT_TABLE_MAXNAMELEN];
-
-	/* User fills this in: total entry size. */
-	unsigned int size;
-
-	/* The entries. */
-	struct arpt_entry entrytable[0];
-};
-
-/* Helper functions */
-static __inline__ struct xt_entry_target *arpt_get_target(struct arpt_entry *e)
-{
-	return (void *)e + e->target_offset;
-}
-
-/*
- *	Main firewall chains definitions and global var's definitions.
- */
-#endif /* _ARPTABLES_H */
diff --git a/openflow/usr/include/linux/netfilter_arp/arpt_mangle.h b/openflow/usr/include/linux/netfilter_arp/arpt_mangle.h
deleted file mode 100644
index 8c2b16a..0000000
--- a/openflow/usr/include/linux/netfilter_arp/arpt_mangle.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _ARPT_MANGLE_H
-#define _ARPT_MANGLE_H
-#include <linux/netfilter_arp/arp_tables.h>
-
-#define ARPT_MANGLE_ADDR_LEN_MAX sizeof(struct in_addr)
-struct arpt_mangle
-{
-	char src_devaddr[ARPT_DEV_ADDR_LEN_MAX];
-	char tgt_devaddr[ARPT_DEV_ADDR_LEN_MAX];
-	union {
-		struct in_addr src_ip;
-	} u_s;
-	union {
-		struct in_addr tgt_ip;
-	} u_t;
-	__u8 flags;
-	int target;
-};
-
-#define ARPT_MANGLE_SDEV 0x01
-#define ARPT_MANGLE_TDEV 0x02
-#define ARPT_MANGLE_SIP 0x04
-#define ARPT_MANGLE_TIP 0x08
-#define ARPT_MANGLE_MASK 0x0f
-
-#endif /* _ARPT_MANGLE_H */
diff --git a/openflow/usr/include/linux/netfilter_bridge.h b/openflow/usr/include/linux/netfilter_bridge.h
deleted file mode 100644
index c4dbfd9..0000000
--- a/openflow/usr/include/linux/netfilter_bridge.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __LINUX_BRIDGE_NETFILTER_H
-#define __LINUX_BRIDGE_NETFILTER_H
-
-/* bridge-specific defines for netfilter. 
- */
-
-#include <linux/netfilter.h>
-#include <linux/if_ether.h>
-#include <linux/if_vlan.h>
-#include <linux/if_pppox.h>
-
-/* Bridge Hooks */
-/* After promisc drops, checksum checks. */
-#define NF_BR_PRE_ROUTING	0
-/* If the packet is destined for this box. */
-#define NF_BR_LOCAL_IN		1
-/* If the packet is destined for another interface. */
-#define NF_BR_FORWARD		2
-/* Packets coming from a local process. */
-#define NF_BR_LOCAL_OUT		3
-/* Packets about to hit the wire. */
-#define NF_BR_POST_ROUTING	4
-/* Not really a hook, but used for the ebtables broute table */
-#define NF_BR_BROUTING		5
-#define NF_BR_NUMHOOKS		6
-
-#endif /* __LINUX_BRIDGE_NETFILTER_H */
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_802_3.h b/openflow/usr/include/linux/netfilter_bridge/ebt_802_3.h
deleted file mode 100644
index 70028c1..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_802_3.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_802_3_H
-#define __LINUX_BRIDGE_EBT_802_3_H
-
-#include <linux/types.h>
-#include <linux/if_ether.h>
-
-#define EBT_802_3_SAP 0x01
-#define EBT_802_3_TYPE 0x02
-
-#define EBT_802_3_MATCH "802_3"
-
-/*
- * If frame has DSAP/SSAP value 0xaa you must check the SNAP type
- * to discover what kind of packet we're carrying. 
- */
-#define CHECK_TYPE 0xaa
-
-/*
- * Control field may be one or two bytes.  If the first byte has
- * the value 0x03 then the entire length is one byte, otherwise it is two.
- * One byte controls are used in Unnumbered Information frames.
- * Two byte controls are used in Numbered Information frames.
- */
-#define IS_UI 0x03
-
-#define EBT_802_3_MASK (EBT_802_3_SAP | EBT_802_3_TYPE | EBT_802_3)
-
-/* ui has one byte ctrl, ni has two */
-struct hdr_ui {
-	__u8 dsap;
-	__u8 ssap;
-	__u8 ctrl;
-	__u8 orig[3];
-	__be16 type;
-};
-
-struct hdr_ni {
-	__u8 dsap;
-	__u8 ssap;
-	__be16 ctrl;
-	__u8  orig[3];
-	__be16 type;
-};
-
-struct ebt_802_3_hdr {
-	__u8  daddr[ETH_ALEN];
-	__u8  saddr[ETH_ALEN];
-	__be16 len;
-	union {
-		struct hdr_ui ui;
-		struct hdr_ni ni;
-	} llc;
-};
-
-
-struct ebt_802_3_info {
-	__u8  sap;
-	__be16 type;
-	__u8  bitmask;
-	__u8  invflags;
-};
-
-#endif /* __LINUX_BRIDGE_EBT_802_3_H */
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_among.h b/openflow/usr/include/linux/netfilter_bridge/ebt_among.h
deleted file mode 100644
index bd4e3ad..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_among.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_AMONG_H
-#define __LINUX_BRIDGE_EBT_AMONG_H
-
-#include <linux/types.h>
-
-#define EBT_AMONG_DST 0x01
-#define EBT_AMONG_SRC 0x02
-
-/* Grzegorz Borowiak <grzes@gnu.univ.gda.pl> 2003
- * 
- * Write-once-read-many hash table, used for checking if a given
- * MAC address belongs to a set or not and possibly for checking
- * if it is related with a given IPv4 address.
- *
- * The hash value of an address is its last byte.
- * 
- * In real-world ethernet addresses, values of the last byte are
- * evenly distributed and there is no need to consider other bytes.
- * It would only slow the routines down.
- *
- * For MAC address comparison speedup reasons, we introduce a trick.
- * MAC address is mapped onto an array of two 32-bit integers.
- * This pair of integers is compared with MAC addresses in the
- * hash table, which are stored also in form of pairs of integers
- * (in `cmp' array). This is quick as it requires only two elementary
- * number comparisons in worst case. Further, we take advantage of
- * fact that entropy of 3 last bytes of address is larger than entropy
- * of 3 first bytes. So first we compare 4 last bytes of addresses and
- * if they are the same we compare 2 first.
- *
- * Yes, it is a memory overhead, but in 2003 AD, who cares?
- */
-
-struct ebt_mac_wormhash_tuple {
-	__u32 cmp[2];
-	__be32 ip;
-};
-
-struct ebt_mac_wormhash {
-	int table[257];
-	int poolsize;
-	struct ebt_mac_wormhash_tuple pool[0];
-};
-
-#define ebt_mac_wormhash_size(x) ((x) ? sizeof(struct ebt_mac_wormhash) \
-		+ (x)->poolsize * sizeof(struct ebt_mac_wormhash_tuple) : 0)
-
-struct ebt_among_info {
-	int wh_dst_ofs;
-	int wh_src_ofs;
-	int bitmask;
-};
-
-#define EBT_AMONG_DST_NEG 0x1
-#define EBT_AMONG_SRC_NEG 0x2
-
-#define ebt_among_wh_dst(x) ((x)->wh_dst_ofs ? \
-	(struct ebt_mac_wormhash*)((char*)(x) + (x)->wh_dst_ofs) : NULL)
-#define ebt_among_wh_src(x) ((x)->wh_src_ofs ? \
-	(struct ebt_mac_wormhash*)((char*)(x) + (x)->wh_src_ofs) : NULL)
-
-#define EBT_AMONG_MATCH "among"
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_arp.h b/openflow/usr/include/linux/netfilter_bridge/ebt_arp.h
deleted file mode 100644
index 522f3e4..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_arp.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_ARP_H
-#define __LINUX_BRIDGE_EBT_ARP_H
-
-#include <linux/types.h>
-
-#define EBT_ARP_OPCODE 0x01
-#define EBT_ARP_HTYPE 0x02
-#define EBT_ARP_PTYPE 0x04
-#define EBT_ARP_SRC_IP 0x08
-#define EBT_ARP_DST_IP 0x10
-#define EBT_ARP_SRC_MAC 0x20
-#define EBT_ARP_DST_MAC 0x40
-#define EBT_ARP_GRAT 0x80
-#define EBT_ARP_MASK (EBT_ARP_OPCODE | EBT_ARP_HTYPE | EBT_ARP_PTYPE | \
-   EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC | \
-   EBT_ARP_GRAT)
-#define EBT_ARP_MATCH "arp"
-
-struct ebt_arp_info
-{
-	__be16 htype;
-	__be16 ptype;
-	__be16 opcode;
-	__be32 saddr;
-	__be32 smsk;
-	__be32 daddr;
-	__be32 dmsk;
-	unsigned char smaddr[ETH_ALEN];
-	unsigned char smmsk[ETH_ALEN];
-	unsigned char dmaddr[ETH_ALEN];
-	unsigned char dmmsk[ETH_ALEN];
-	__u8  bitmask;
-	__u8  invflags;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_arpreply.h b/openflow/usr/include/linux/netfilter_bridge/ebt_arpreply.h
deleted file mode 100644
index 7e77896..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_arpreply.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H
-#define __LINUX_BRIDGE_EBT_ARPREPLY_H
-
-struct ebt_arpreply_info {
-	unsigned char mac[ETH_ALEN];
-	int target;
-};
-#define EBT_ARPREPLY_TARGET "arpreply"
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_ip.h b/openflow/usr/include/linux/netfilter_bridge/ebt_ip.h
deleted file mode 100644
index c4bbc41..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_ip.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  ebt_ip
- *
- *	Authors:
- *	Bart De Schuymer <bart.de.schuymer@pandora.be>
- *
- *  April, 2002
- *
- *  Changes:
- *    added ip-sport and ip-dport
- *    Innominate Security Technologies AG <mhopf@innominate.com>
- *    September, 2002
- */
-
-#ifndef __LINUX_BRIDGE_EBT_IP_H
-#define __LINUX_BRIDGE_EBT_IP_H
-
-#include <linux/types.h>
-
-#define EBT_IP_SOURCE 0x01
-#define EBT_IP_DEST 0x02
-#define EBT_IP_TOS 0x04
-#define EBT_IP_PROTO 0x08
-#define EBT_IP_SPORT 0x10
-#define EBT_IP_DPORT 0x20
-#define EBT_IP_MASK (EBT_IP_SOURCE | EBT_IP_DEST | EBT_IP_TOS | EBT_IP_PROTO |\
- EBT_IP_SPORT | EBT_IP_DPORT )
-#define EBT_IP_MATCH "ip"
-
-/* the same values are used for the invflags */
-struct ebt_ip_info {
-	__be32 saddr;
-	__be32 daddr;
-	__be32 smsk;
-	__be32 dmsk;
-	__u8  tos;
-	__u8  protocol;
-	__u8  bitmask;
-	__u8  invflags;
-	__u16 sport[2];
-	__u16 dport[2];
-};
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_ip6.h b/openflow/usr/include/linux/netfilter_bridge/ebt_ip6.h
deleted file mode 100644
index 42b8896..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_ip6.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  ebt_ip6
- *
- *	Authors:
- * Kuo-Lang Tseng <kuo-lang.tseng@intel.com>
- * Manohar Castelino <manohar.r.castelino@intel.com>
- *
- *  Jan 11, 2008
- *
- */
-
-#ifndef __LINUX_BRIDGE_EBT_IP6_H
-#define __LINUX_BRIDGE_EBT_IP6_H
-
-#include <linux/types.h>
-
-#define EBT_IP6_SOURCE 0x01
-#define EBT_IP6_DEST 0x02
-#define EBT_IP6_TCLASS 0x04
-#define EBT_IP6_PROTO 0x08
-#define EBT_IP6_SPORT 0x10
-#define EBT_IP6_DPORT 0x20
-#define EBT_IP6_ICMP6 0x40
-
-#define EBT_IP6_MASK (EBT_IP6_SOURCE | EBT_IP6_DEST | EBT_IP6_TCLASS |\
-		      EBT_IP6_PROTO | EBT_IP6_SPORT | EBT_IP6_DPORT | \
-		      EBT_IP6_ICMP6)
-#define EBT_IP6_MATCH "ip6"
-
-/* the same values are used for the invflags */
-struct ebt_ip6_info {
-	struct in6_addr saddr;
-	struct in6_addr daddr;
-	struct in6_addr smsk;
-	struct in6_addr dmsk;
-	__u8  tclass;
-	__u8  protocol;
-	__u8  bitmask;
-	__u8  invflags;
-	union {
-		__u16 sport[2];
-		__u8 icmpv6_type[2];
-	};
-	union {
-		__u16 dport[2];
-		__u8 icmpv6_code[2];
-	};
-};
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_limit.h b/openflow/usr/include/linux/netfilter_bridge/ebt_limit.h
deleted file mode 100644
index 66d80b3..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_limit.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_LIMIT_H
-#define __LINUX_BRIDGE_EBT_LIMIT_H
-
-#include <linux/types.h>
-
-#define EBT_LIMIT_MATCH "limit"
-
-/* timings are in milliseconds. */
-#define EBT_LIMIT_SCALE 10000
-
-/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
-   seconds, or one every 59 hours. */
-
-struct ebt_limit_info {
-	__u32 avg;    /* Average secs between packets * scale */
-	__u32 burst;  /* Period multiplier for upper limit. */
-
-	/* Used internally by the kernel */
-	unsigned long prev;
-	__u32 credit;
-	__u32 credit_cap, cost;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_log.h b/openflow/usr/include/linux/netfilter_bridge/ebt_log.h
deleted file mode 100644
index 7e7f1d1..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_log.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_LOG_H
-#define __LINUX_BRIDGE_EBT_LOG_H
-
-#include <linux/types.h>
-
-#define EBT_LOG_IP 0x01 /* if the frame is made by ip, log the ip information */
-#define EBT_LOG_ARP 0x02
-#define EBT_LOG_NFLOG 0x04
-#define EBT_LOG_IP6 0x08
-#define EBT_LOG_MASK (EBT_LOG_IP | EBT_LOG_ARP | EBT_LOG_IP6)
-#define EBT_LOG_PREFIX_SIZE 30
-#define EBT_LOG_WATCHER "log"
-
-struct ebt_log_info {
-	__u8 loglevel;
-	__u8 prefix[EBT_LOG_PREFIX_SIZE];
-	__u32 bitmask;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_mark_m.h b/openflow/usr/include/linux/netfilter_bridge/ebt_mark_m.h
deleted file mode 100644
index 410f9e5..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_mark_m.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_MARK_M_H
-#define __LINUX_BRIDGE_EBT_MARK_M_H
-
-#include <linux/types.h>
-
-#define EBT_MARK_AND 0x01
-#define EBT_MARK_OR 0x02
-#define EBT_MARK_MASK (EBT_MARK_AND | EBT_MARK_OR)
-struct ebt_mark_m_info {
-	unsigned long mark, mask;
-	__u8 invert;
-	__u8 bitmask;
-};
-#define EBT_MARK_MATCH "mark_m"
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_mark_t.h b/openflow/usr/include/linux/netfilter_bridge/ebt_mark_t.h
deleted file mode 100644
index 7d5a268..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_mark_t.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_MARK_T_H
-#define __LINUX_BRIDGE_EBT_MARK_T_H
-
-/* The target member is reused for adding new actions, the
- * value of the real target is -1 to -NUM_STANDARD_TARGETS.
- * For backward compatibility, the 4 lsb (2 would be enough,
- * but let's play it safe) are kept to designate this target.
- * The remaining bits designate the action. By making the set
- * action 0xfffffff0, the result will look ok for older
- * versions. [September 2006] */
-#define MARK_SET_VALUE (0xfffffff0)
-#define MARK_OR_VALUE  (0xffffffe0)
-#define MARK_AND_VALUE (0xffffffd0)
-#define MARK_XOR_VALUE (0xffffffc0)
-
-struct ebt_mark_t_info {
-	unsigned long mark;
-	/* EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN */
-	int target;
-};
-#define EBT_MARK_TARGET "mark"
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_nat.h b/openflow/usr/include/linux/netfilter_bridge/ebt_nat.h
deleted file mode 100644
index 5e74e3b..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_nat.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_NAT_H
-#define __LINUX_BRIDGE_EBT_NAT_H
-
-#define NAT_ARP_BIT  (0x00000010)
-struct ebt_nat_info {
-	unsigned char mac[ETH_ALEN];
-	/* EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN */
-	int target;
-};
-#define EBT_SNAT_TARGET "snat"
-#define EBT_DNAT_TARGET "dnat"
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_nflog.h b/openflow/usr/include/linux/netfilter_bridge/ebt_nflog.h
deleted file mode 100644
index df829fc..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_nflog.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_NFLOG_H
-#define __LINUX_BRIDGE_EBT_NFLOG_H
-
-#include <linux/types.h>
-
-#define EBT_NFLOG_MASK 0x0
-
-#define EBT_NFLOG_PREFIX_SIZE 64
-#define EBT_NFLOG_WATCHER "nflog"
-
-#define EBT_NFLOG_DEFAULT_GROUP		0x1
-#define EBT_NFLOG_DEFAULT_THRESHOLD	1
-
-struct ebt_nflog_info {
-	__u32 len;
-	__u16 group;
-	__u16 threshold;
-	__u16 flags;
-	__u16 pad;
-	char prefix[EBT_NFLOG_PREFIX_SIZE];
-};
-
-#endif				/* __LINUX_BRIDGE_EBT_NFLOG_H */
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_pkttype.h b/openflow/usr/include/linux/netfilter_bridge/ebt_pkttype.h
deleted file mode 100644
index c241bad..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_pkttype.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H
-#define __LINUX_BRIDGE_EBT_PKTTYPE_H
-
-#include <linux/types.h>
-
-struct ebt_pkttype_info {
-	__u8 pkt_type;
-	__u8 invert;
-};
-#define EBT_PKTTYPE_MATCH "pkttype"
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_redirect.h b/openflow/usr/include/linux/netfilter_bridge/ebt_redirect.h
deleted file mode 100644
index dd9622c..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_redirect.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_REDIRECT_H
-#define __LINUX_BRIDGE_EBT_REDIRECT_H
-
-struct ebt_redirect_info {
-	/* EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN */
-	int target;
-};
-#define EBT_REDIRECT_TARGET "redirect"
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_stp.h b/openflow/usr/include/linux/netfilter_bridge/ebt_stp.h
deleted file mode 100644
index 1025b9f..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_stp.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_STP_H
-#define __LINUX_BRIDGE_EBT_STP_H
-
-#include <linux/types.h>
-
-#define EBT_STP_TYPE		0x0001
-
-#define EBT_STP_FLAGS		0x0002
-#define EBT_STP_ROOTPRIO	0x0004
-#define EBT_STP_ROOTADDR	0x0008
-#define EBT_STP_ROOTCOST	0x0010
-#define EBT_STP_SENDERPRIO	0x0020
-#define EBT_STP_SENDERADDR	0x0040
-#define EBT_STP_PORT		0x0080
-#define EBT_STP_MSGAGE		0x0100
-#define EBT_STP_MAXAGE		0x0200
-#define EBT_STP_HELLOTIME	0x0400
-#define EBT_STP_FWDD		0x0800
-
-#define EBT_STP_MASK		0x0fff
-#define EBT_STP_CONFIG_MASK	0x0ffe
-
-#define EBT_STP_MATCH "stp"
-
-struct ebt_stp_config_info {
-	__u8 flags;
-	__u16 root_priol, root_priou;
-	char root_addr[6], root_addrmsk[6];
-	__u32 root_costl, root_costu;
-	__u16 sender_priol, sender_priou;
-	char sender_addr[6], sender_addrmsk[6];
-	__u16 portl, portu;
-	__u16 msg_agel, msg_ageu;
-	__u16 max_agel, max_ageu;
-	__u16 hello_timel, hello_timeu;
-	__u16 forward_delayl, forward_delayu;
-};
-
-struct ebt_stp_info {
-	__u8 type;
-	struct ebt_stp_config_info config;
-	__u16 bitmask;
-	__u16 invflags;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebt_vlan.h b/openflow/usr/include/linux/netfilter_bridge/ebt_vlan.h
deleted file mode 100644
index 967d1d5..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebt_vlan.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __LINUX_BRIDGE_EBT_VLAN_H
-#define __LINUX_BRIDGE_EBT_VLAN_H
-
-#include <linux/types.h>
-
-#define EBT_VLAN_ID	0x01
-#define EBT_VLAN_PRIO	0x02
-#define EBT_VLAN_ENCAP	0x04
-#define EBT_VLAN_MASK (EBT_VLAN_ID | EBT_VLAN_PRIO | EBT_VLAN_ENCAP)
-#define EBT_VLAN_MATCH "vlan"
-
-struct ebt_vlan_info {
-	__u16 id;		/* VLAN ID {1-4095} */
-	__u8 prio;		/* VLAN User Priority {0-7} */
-	__be16 encap;		/* VLAN Encapsulated frame code {0-65535} */
-	__u8 bitmask;		/* Args bitmask bit 1=1 - ID arg,
-				   bit 2=1 User-Priority arg, bit 3=1 encap*/
-	__u8 invflags;		/* Inverse bitmask  bit 1=1 - inversed ID arg, 
-				   bit 2=1 - inversed Pirority arg */
-};
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_bridge/ebtables.h b/openflow/usr/include/linux/netfilter_bridge/ebtables.h
deleted file mode 100644
index 0524374..0000000
--- a/openflow/usr/include/linux/netfilter_bridge/ebtables.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- *  ebtables
- *
- *	Authors:
- *	Bart De Schuymer		<bdschuym@pandora.be>
- *
- *  ebtables.c,v 2.0, April, 2002
- *
- *  This code is strongly inspired by the iptables code which is
- *  Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
- */
-
-#ifndef __LINUX_BRIDGE_EFF_H
-#define __LINUX_BRIDGE_EFF_H
-#include <linux/netfilter_bridge.h>
-
-#define EBT_TABLE_MAXNAMELEN 32
-#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN
-#define EBT_FUNCTION_MAXNAMELEN EBT_TABLE_MAXNAMELEN
-
-/* verdicts >0 are "branches" */
-#define EBT_ACCEPT   -1
-#define EBT_DROP     -2
-#define EBT_CONTINUE -3
-#define EBT_RETURN   -4
-#define NUM_STANDARD_TARGETS   4
-/* ebtables target modules store the verdict inside an int. We can
- * reclaim a part of this int for backwards compatible extensions.
- * The 4 lsb are more than enough to store the verdict. */
-#define EBT_VERDICT_BITS 0x0000000F
-
-struct xt_match;
-struct xt_target;
-
-struct ebt_counter {
-	uint64_t pcnt;
-	uint64_t bcnt;
-};
-
-struct ebt_replace {
-	char name[EBT_TABLE_MAXNAMELEN];
-	unsigned int valid_hooks;
-	/* nr of rules in the table */
-	unsigned int nentries;
-	/* total size of the entries */
-	unsigned int entries_size;
-	/* start of the chains */
-	struct ebt_entries *hook_entry[NF_BR_NUMHOOKS];
-	/* nr of counters userspace expects back */
-	unsigned int num_counters;
-	/* where the kernel will put the old counters */
-	struct ebt_counter *counters;
-	char *entries;
-};
-
-struct ebt_replace_kernel {
-	char name[EBT_TABLE_MAXNAMELEN];
-	unsigned int valid_hooks;
-	/* nr of rules in the table */
-	unsigned int nentries;
-	/* total size of the entries */
-	unsigned int entries_size;
-	/* start of the chains */
-	struct ebt_entries *hook_entry[NF_BR_NUMHOOKS];
-	/* nr of counters userspace expects back */
-	unsigned int num_counters;
-	/* where the kernel will put the old counters */
-	struct ebt_counter *counters;
-	char *entries;
-};
-
-struct ebt_entries {
-	/* this field is always set to zero
-	 * See EBT_ENTRY_OR_ENTRIES.
-	 * Must be same size as ebt_entry.bitmask */
-	unsigned int distinguisher;
-	/* the chain name */
-	char name[EBT_CHAIN_MAXNAMELEN];
-	/* counter offset for this chain */
-	unsigned int counter_offset;
-	/* one standard (accept, drop, return) per hook */
-	int policy;
-	/* nr. of entries */
-	unsigned int nentries;
-	/* entry list */
-	char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
-};
-
-/* used for the bitmask of struct ebt_entry */
-
-/* This is a hack to make a difference between an ebt_entry struct and an
- * ebt_entries struct when traversing the entries from start to end.
- * Using this simplifies the code a lot, while still being able to use
- * ebt_entries.
- * Contrary, iptables doesn't use something like ebt_entries and therefore uses
- * different techniques for naming the policy and such. So, iptables doesn't
- * need a hack like this.
- */
-#define EBT_ENTRY_OR_ENTRIES 0x01
-/* these are the normal masks */
-#define EBT_NOPROTO 0x02
-#define EBT_802_3 0x04
-#define EBT_SOURCEMAC 0x08
-#define EBT_DESTMAC 0x10
-#define EBT_F_MASK (EBT_NOPROTO | EBT_802_3 | EBT_SOURCEMAC | EBT_DESTMAC \
-   | EBT_ENTRY_OR_ENTRIES)
-
-#define EBT_IPROTO 0x01
-#define EBT_IIN 0x02
-#define EBT_IOUT 0x04
-#define EBT_ISOURCE 0x8
-#define EBT_IDEST 0x10
-#define EBT_ILOGICALIN 0x20
-#define EBT_ILOGICALOUT 0x40
-#define EBT_INV_MASK (EBT_IPROTO | EBT_IIN | EBT_IOUT | EBT_ILOGICALIN \
-   | EBT_ILOGICALOUT | EBT_ISOURCE | EBT_IDEST)
-
-struct ebt_entry_match {
-	union {
-		char name[EBT_FUNCTION_MAXNAMELEN];
-		struct xt_match *match;
-	} u;
-	/* size of data */
-	unsigned int match_size;
-	unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
-};
-
-struct ebt_entry_watcher {
-	union {
-		char name[EBT_FUNCTION_MAXNAMELEN];
-		struct xt_target *watcher;
-	} u;
-	/* size of data */
-	unsigned int watcher_size;
-	unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
-};
-
-struct ebt_entry_target {
-	union {
-		char name[EBT_FUNCTION_MAXNAMELEN];
-		struct xt_target *target;
-	} u;
-	/* size of data */
-	unsigned int target_size;
-	unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
-};
-
-#define EBT_STANDARD_TARGET "standard"
-struct ebt_standard_target {
-	struct ebt_entry_target target;
-	int verdict;
-};
-
-/* one entry */
-struct ebt_entry {
-	/* this needs to be the first field */
-	unsigned int bitmask;
-	unsigned int invflags;
-	__be16 ethproto;
-	/* the physical in-dev */
-	char in[IFNAMSIZ];
-	/* the logical in-dev */
-	char logical_in[IFNAMSIZ];
-	/* the physical out-dev */
-	char out[IFNAMSIZ];
-	/* the logical out-dev */
-	char logical_out[IFNAMSIZ];
-	unsigned char sourcemac[ETH_ALEN];
-	unsigned char sourcemsk[ETH_ALEN];
-	unsigned char destmac[ETH_ALEN];
-	unsigned char destmsk[ETH_ALEN];
-	/* sizeof ebt_entry + matches */
-	unsigned int watchers_offset;
-	/* sizeof ebt_entry + matches + watchers */
-	unsigned int target_offset;
-	/* sizeof ebt_entry + matches + watchers + target */
-	unsigned int next_offset;
-	unsigned char elems[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
-};
-
-/* {g,s}etsockopt numbers */
-#define EBT_BASE_CTL            128
-
-#define EBT_SO_SET_ENTRIES      (EBT_BASE_CTL)
-#define EBT_SO_SET_COUNTERS     (EBT_SO_SET_ENTRIES+1)
-#define EBT_SO_SET_MAX          (EBT_SO_SET_COUNTERS+1)
-
-#define EBT_SO_GET_INFO         (EBT_BASE_CTL)
-#define EBT_SO_GET_ENTRIES      (EBT_SO_GET_INFO+1)
-#define EBT_SO_GET_INIT_INFO    (EBT_SO_GET_ENTRIES+1)
-#define EBT_SO_GET_INIT_ENTRIES (EBT_SO_GET_INIT_INFO+1)
-#define EBT_SO_GET_MAX          (EBT_SO_GET_INIT_ENTRIES+1)
-
-
-/* blatently stolen from ip_tables.h
- * fn returns 0 to continue iteration */
-#define EBT_MATCH_ITERATE(e, fn, args...)                   \
-({                                                          \
-	unsigned int __i;                                   \
-	int __ret = 0;                                      \
-	struct ebt_entry_match *__match;                    \
-	                                                    \
-	for (__i = sizeof(struct ebt_entry);                \
-	     __i < (e)->watchers_offset;                    \
-	     __i += __match->match_size +                   \
-	     sizeof(struct ebt_entry_match)) {              \
-		__match = (void *)(e) + __i;                \
-		                                            \
-		__ret = fn(__match , ## args);              \
-		if (__ret != 0)                             \
-			break;                              \
-	}                                                   \
-	if (__ret == 0) {                                   \
-		if (__i != (e)->watchers_offset)            \
-			__ret = -EINVAL;                    \
-	}                                                   \
-	__ret;                                              \
-})
-
-#define EBT_WATCHER_ITERATE(e, fn, args...)                 \
-({                                                          \
-	unsigned int __i;                                   \
-	int __ret = 0;                                      \
-	struct ebt_entry_watcher *__watcher;                \
-	                                                    \
-	for (__i = e->watchers_offset;                      \
-	     __i < (e)->target_offset;                      \
-	     __i += __watcher->watcher_size +               \
-	     sizeof(struct ebt_entry_watcher)) {            \
-		__watcher = (void *)(e) + __i;              \
-		                                            \
-		__ret = fn(__watcher , ## args);            \
-		if (__ret != 0)                             \
-			break;                              \
-	}                                                   \
-	if (__ret == 0) {                                   \
-		if (__i != (e)->target_offset)              \
-			__ret = -EINVAL;                    \
-	}                                                   \
-	__ret;                                              \
-})
-
-#define EBT_ENTRY_ITERATE(entries, size, fn, args...)       \
-({                                                          \
-	unsigned int __i;                                   \
-	int __ret = 0;                                      \
-	struct ebt_entry *__entry;                          \
-	                                                    \
-	for (__i = 0; __i < (size);) {                      \
-		__entry = (void *)(entries) + __i;          \
-		__ret = fn(__entry , ## args);              \
-		if (__ret != 0)                             \
-			break;                              \
-		if (__entry->bitmask != 0)                  \
-			__i += __entry->next_offset;        \
-		else                                        \
-			__i += sizeof(struct ebt_entries);  \
-	}                                                   \
-	if (__ret == 0) {                                   \
-		if (__i != (size))                          \
-			__ret = -EINVAL;                    \
-	}                                                   \
-	__ret;                                              \
-})
-
-#endif /* __LINUX_BRIDGE_EFF_H */
diff --git a/openflow/usr/include/linux/netfilter_decnet.h b/openflow/usr/include/linux/netfilter_decnet.h
deleted file mode 100644
index f1e80a9..0000000
--- a/openflow/usr/include/linux/netfilter_decnet.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef __LINUX_DECNET_NETFILTER_H
-#define __LINUX_DECNET_NETFILTER_H
-
-/* DECnet-specific defines for netfilter. 
- * This file (C) Steve Whitehouse 1999 derived from the
- * ipv4 netfilter header file which is
- * (C)1998 Rusty Russell -- This code is GPL.
- */
-
-#include <linux/netfilter.h>
-
-/* only for userspace compatibility */
-
-#include <limits.h> /* for INT_MIN, INT_MAX */
-
-/* IP Cache bits. */
-/* Src IP address. */
-#define NFC_DN_SRC		0x0001
-/* Dest IP address. */
-#define NFC_DN_DST		0x0002
-/* Input device. */
-#define NFC_DN_IF_IN		0x0004
-/* Output device. */
-#define NFC_DN_IF_OUT		0x0008
-
-/* DECnet Hooks */
-/* After promisc drops, checksum checks. */
-#define NF_DN_PRE_ROUTING	0
-/* If the packet is destined for this box. */
-#define NF_DN_LOCAL_IN		1
-/* If the packet is destined for another interface. */
-#define NF_DN_FORWARD		2
-/* Packets coming from a local process. */
-#define NF_DN_LOCAL_OUT		3
-/* Packets about to hit the wire. */
-#define NF_DN_POST_ROUTING	4
-/* Input Hello Packets */
-#define NF_DN_HELLO		5
-/* Input Routing Packets */
-#define NF_DN_ROUTE		6
-#define NF_DN_NUMHOOKS		7
-
-enum nf_dn_hook_priorities {
-	NF_DN_PRI_FIRST = INT_MIN,
-	NF_DN_PRI_CONNTRACK = -200,
-	NF_DN_PRI_MANGLE = -150,
-	NF_DN_PRI_NAT_DST = -100,
-	NF_DN_PRI_FILTER = 0,
-	NF_DN_PRI_NAT_SRC = 100,
-	NF_DN_PRI_DNRTMSG = 200,
-	NF_DN_PRI_LAST = INT_MAX,
-};
-
-struct nf_dn_rtmsg {
-	int nfdn_ifindex;
-};
-
-#define NFDN_RTMSG(r) ((unsigned char *)(r) + NLMSG_ALIGN(sizeof(struct nf_dn_rtmsg)))
-
-/* backwards compatibility for userspace */
-#define DNRMG_L1_GROUP 0x01
-#define DNRMG_L2_GROUP 0x02
-
-enum {
-	DNRNG_NLGRP_NONE,
-#define DNRNG_NLGRP_NONE	DNRNG_NLGRP_NONE
-	DNRNG_NLGRP_L1,
-#define DNRNG_NLGRP_L1		DNRNG_NLGRP_L1
-	DNRNG_NLGRP_L2,
-#define DNRNG_NLGRP_L2		DNRNG_NLGRP_L2
-	__DNRNG_NLGRP_MAX
-};
-#define DNRNG_NLGRP_MAX	(__DNRNG_NLGRP_MAX - 1)
-
-#endif /*__LINUX_DECNET_NETFILTER_H*/
diff --git a/openflow/usr/include/linux/netfilter_ipv4.h b/openflow/usr/include/linux/netfilter_ipv4.h
deleted file mode 100644
index a5f4dc7..0000000
--- a/openflow/usr/include/linux/netfilter_ipv4.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* IPv4-specific defines for netfilter. 
- * (C)1998 Rusty Russell -- This code is GPL.
- */
-#ifndef __LINUX_IP_NETFILTER_H
-#define __LINUX_IP_NETFILTER_H
-
-
-#include <linux/netfilter.h>
-
-/* only for userspace compatibility */
-
-#include <limits.h> /* for INT_MIN, INT_MAX */
-
-/* IP Cache bits. */
-/* Src IP address. */
-#define NFC_IP_SRC		0x0001
-/* Dest IP address. */
-#define NFC_IP_DST		0x0002
-/* Input device. */
-#define NFC_IP_IF_IN		0x0004
-/* Output device. */
-#define NFC_IP_IF_OUT		0x0008
-/* TOS. */
-#define NFC_IP_TOS		0x0010
-/* Protocol. */
-#define NFC_IP_PROTO		0x0020
-/* IP options. */
-#define NFC_IP_OPTIONS		0x0040
-/* Frag & flags. */
-#define NFC_IP_FRAG		0x0080
-
-/* Per-protocol information: only matters if proto match. */
-/* TCP flags. */
-#define NFC_IP_TCPFLAGS		0x0100
-/* Source port. */
-#define NFC_IP_SRC_PT		0x0200
-/* Dest port. */
-#define NFC_IP_DST_PT		0x0400
-/* Something else about the proto */
-#define NFC_IP_PROTO_UNKNOWN	0x2000
-
-/* IP Hooks */
-/* After promisc drops, checksum checks. */
-#define NF_IP_PRE_ROUTING	0
-/* If the packet is destined for this box. */
-#define NF_IP_LOCAL_IN		1
-/* If the packet is destined for another interface. */
-#define NF_IP_FORWARD		2
-/* Packets coming from a local process. */
-#define NF_IP_LOCAL_OUT		3
-/* Packets about to hit the wire. */
-#define NF_IP_POST_ROUTING	4
-#define NF_IP_NUMHOOKS		5
-
-enum nf_ip_hook_priorities {
-	NF_IP_PRI_FIRST = INT_MIN,
-	NF_IP_PRI_CONNTRACK_DEFRAG = -400,
-	NF_IP_PRI_RAW = -300,
-	NF_IP_PRI_SELINUX_FIRST = -225,
-	NF_IP_PRI_CONNTRACK = -200,
-	NF_IP_PRI_MANGLE = -150,
-	NF_IP_PRI_NAT_DST = -100,
-	NF_IP_PRI_FILTER = 0,
-	NF_IP_PRI_SECURITY = 50,
-	NF_IP_PRI_NAT_SRC = 100,
-	NF_IP_PRI_SELINUX_LAST = 225,
-	NF_IP_PRI_CONNTRACK_HELPER = 300,
-	NF_IP_PRI_CONNTRACK_CONFIRM = INT_MAX,
-	NF_IP_PRI_LAST = INT_MAX,
-};
-
-/* Arguments for setsockopt SOL_IP: */
-/* 2.0 firewalling went from 64 through 71 (and +256, +512, etc). */
-/* 2.2 firewalling (+ masq) went from 64 through 76 */
-/* 2.4 firewalling went 64 through 67. */
-#define SO_ORIGINAL_DST 80
-
-
-#endif /* __LINUX_IP_NETFILTER_H */
diff --git a/openflow/usr/include/linux/netfilter_ipv4/ip_tables.h b/openflow/usr/include/linux/netfilter_ipv4/ip_tables.h
deleted file mode 100644
index 38542b4..0000000
--- a/openflow/usr/include/linux/netfilter_ipv4/ip_tables.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * 25-Jul-1998 Major changes to allow for ip chain table
- *
- * 3-Jan-2000 Named tables to allow packet selection for different uses.
- */
-
-/*
- * 	Format of an IP firewall descriptor
- *
- * 	src, dst, src_mask, dst_mask are always stored in network byte order.
- * 	flags are stored in host byte order (of course).
- * 	Port numbers are stored in HOST byte order.
- */
-
-#ifndef _IPTABLES_H
-#define _IPTABLES_H
-
-#include <linux/types.h>
-
-#include <linux/netfilter_ipv4.h>
-
-#include <linux/netfilter/x_tables.h>
-
-#define IPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
-#define IPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
-#define ipt_match xt_match
-#define ipt_target xt_target
-#define ipt_table xt_table
-#define ipt_get_revision xt_get_revision
-#define ipt_entry_match xt_entry_match
-#define ipt_entry_target xt_entry_target
-#define ipt_standard_target xt_standard_target
-#define ipt_error_target xt_error_target
-#define ipt_counters xt_counters
-#define IPT_CONTINUE XT_CONTINUE
-#define IPT_RETURN XT_RETURN
-
-/* This group is older than old (iptables < v1.4.0-rc1~89) */
-#include <linux/netfilter/xt_tcpudp.h>
-#define ipt_udp xt_udp
-#define ipt_tcp xt_tcp
-#define IPT_TCP_INV_SRCPT	XT_TCP_INV_SRCPT
-#define IPT_TCP_INV_DSTPT	XT_TCP_INV_DSTPT
-#define IPT_TCP_INV_FLAGS	XT_TCP_INV_FLAGS
-#define IPT_TCP_INV_OPTION	XT_TCP_INV_OPTION
-#define IPT_TCP_INV_MASK	XT_TCP_INV_MASK
-#define IPT_UDP_INV_SRCPT	XT_UDP_INV_SRCPT
-#define IPT_UDP_INV_DSTPT	XT_UDP_INV_DSTPT
-#define IPT_UDP_INV_MASK	XT_UDP_INV_MASK
-
-/* The argument to IPT_SO_ADD_COUNTERS. */
-#define ipt_counters_info xt_counters_info
-/* Standard return verdict, or do jump. */
-#define IPT_STANDARD_TARGET XT_STANDARD_TARGET
-/* Error verdict. */
-#define IPT_ERROR_TARGET XT_ERROR_TARGET
-
-/* fn returns 0 to continue iteration */
-#define IPT_MATCH_ITERATE(e, fn, args...) \
-	XT_MATCH_ITERATE(struct ipt_entry, e, fn, ## args)
-
-/* fn returns 0 to continue iteration */
-#define IPT_ENTRY_ITERATE(entries, size, fn, args...) \
-	XT_ENTRY_ITERATE(struct ipt_entry, entries, size, fn, ## args)
-
-/* Yes, Virginia, you have to zero the padding. */
-struct ipt_ip {
-	/* Source and destination IP addr */
-	struct in_addr src, dst;
-	/* Mask for src and dest IP addr */
-	struct in_addr smsk, dmsk;
-	char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
-	unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
-
-	/* Protocol, 0 = ANY */
-	__u16 proto;
-
-	/* Flags word */
-	__u8 flags;
-	/* Inverse flags */
-	__u8 invflags;
-};
-
-/* Values for "flag" field in struct ipt_ip (general ip structure). */
-#define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
-#define IPT_F_GOTO		0x02	/* Set if jump is a goto */
-#define IPT_F_MASK		0x03	/* All possible flag bits mask. */
-
-/* Values for "inv" field in struct ipt_ip. */
-#define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
-#define IPT_INV_VIA_OUT		0x02	/* Invert the sense of OUT IFACE */
-#define IPT_INV_TOS		0x04	/* Invert the sense of TOS. */
-#define IPT_INV_SRCIP		0x08	/* Invert the sense of SRC IP. */
-#define IPT_INV_DSTIP		0x10	/* Invert the sense of DST OP. */
-#define IPT_INV_FRAG		0x20	/* Invert the sense of FRAG. */
-#define IPT_INV_PROTO		XT_INV_PROTO
-#define IPT_INV_MASK		0x7F	/* All possible flag bits mask. */
-
-/* This structure defines each of the firewall rules.  Consists of 3
-   parts which are 1) general IP header stuff 2) match specific
-   stuff 3) the target to perform if the rule matches */
-struct ipt_entry {
-	struct ipt_ip ip;
-
-	/* Mark with fields that we care about. */
-	unsigned int nfcache;
-
-	/* Size of ipt_entry + matches */
-	__u16 target_offset;
-	/* Size of ipt_entry + matches + target */
-	__u16 next_offset;
-
-	/* Back pointer */
-	unsigned int comefrom;
-
-	/* Packet and byte counters. */
-	struct xt_counters counters;
-
-	/* The matches (if any), then the target. */
-	unsigned char elems[0];
-};
-
-/*
- * New IP firewall options for [gs]etsockopt at the RAW IP level.
- * Unlike BSD Linux inherits IP options so you don't have to use a raw
- * socket for this. Instead we check rights in the calls.
- *
- * ATTENTION: check linux/in.h before adding new number here.
- */
-#define IPT_BASE_CTL		64
-
-#define IPT_SO_SET_REPLACE	(IPT_BASE_CTL)
-#define IPT_SO_SET_ADD_COUNTERS	(IPT_BASE_CTL + 1)
-#define IPT_SO_SET_MAX		IPT_SO_SET_ADD_COUNTERS
-
-#define IPT_SO_GET_INFO			(IPT_BASE_CTL)
-#define IPT_SO_GET_ENTRIES		(IPT_BASE_CTL + 1)
-#define IPT_SO_GET_REVISION_MATCH	(IPT_BASE_CTL + 2)
-#define IPT_SO_GET_REVISION_TARGET	(IPT_BASE_CTL + 3)
-#define IPT_SO_GET_MAX			IPT_SO_GET_REVISION_TARGET
-
-/* ICMP matching stuff */
-struct ipt_icmp {
-	__u8 type;				/* type to match */
-	__u8 code[2];				/* range of code */
-	__u8 invflags;				/* Inverse flags */
-};
-
-/* Values for "inv" field for struct ipt_icmp. */
-#define IPT_ICMP_INV	0x01	/* Invert the sense of type/code test */
-
-/* The argument to IPT_SO_GET_INFO */
-struct ipt_getinfo {
-	/* Which table: caller fills this in. */
-	char name[XT_TABLE_MAXNAMELEN];
-
-	/* Kernel fills these in. */
-	/* Which hook entry points are valid: bitmask */
-	unsigned int valid_hooks;
-
-	/* Hook entry points: one per netfilter hook. */
-	unsigned int hook_entry[NF_INET_NUMHOOKS];
-
-	/* Underflow points. */
-	unsigned int underflow[NF_INET_NUMHOOKS];
-
-	/* Number of entries */
-	unsigned int num_entries;
-
-	/* Size of entries. */
-	unsigned int size;
-};
-
-/* The argument to IPT_SO_SET_REPLACE. */
-struct ipt_replace {
-	/* Which table. */
-	char name[XT_TABLE_MAXNAMELEN];
-
-	/* Which hook entry points are valid: bitmask.  You can't
-           change this. */
-	unsigned int valid_hooks;
-
-	/* Number of entries */
-	unsigned int num_entries;
-
-	/* Total size of new entries */
-	unsigned int size;
-
-	/* Hook entry points. */
-	unsigned int hook_entry[NF_INET_NUMHOOKS];
-
-	/* Underflow points. */
-	unsigned int underflow[NF_INET_NUMHOOKS];
-
-	/* Information about old entries: */
-	/* Number of counters (must be equal to current number of entries). */
-	unsigned int num_counters;
-	/* The old entries' counters. */
-	struct xt_counters *counters;
-
-	/* The entries (hang off end: not really an array). */
-	struct ipt_entry entries[0];
-};
-
-/* The argument to IPT_SO_GET_ENTRIES. */
-struct ipt_get_entries {
-	/* Which table: user fills this in. */
-	char name[XT_TABLE_MAXNAMELEN];
-
-	/* User fills this in: total entry size. */
-	unsigned int size;
-
-	/* The entries. */
-	struct ipt_entry entrytable[0];
-};
-
-/* Helper functions */
-static __inline__ struct xt_entry_target *
-ipt_get_target(struct ipt_entry *e)
-{
-	return (void *)e + e->target_offset;
-}
-
-/*
- *	Main firewall chains definitions and global var's definitions.
- */
-#endif /* _IPTABLES_H */
diff --git a/openflow/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/openflow/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
deleted file mode 100644
index eac0f65..0000000
--- a/openflow/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _IPT_CLUSTERIP_H_target
-#define _IPT_CLUSTERIP_H_target
-
-#include <linux/types.h>
-#include <linux/if_ether.h>
-
-enum clusterip_hashmode {
-    CLUSTERIP_HASHMODE_SIP = 0,
-    CLUSTERIP_HASHMODE_SIP_SPT,
-    CLUSTERIP_HASHMODE_SIP_SPT_DPT,
-};
-
-#define CLUSTERIP_HASHMODE_MAX CLUSTERIP_HASHMODE_SIP_SPT_DPT
-
-#define CLUSTERIP_MAX_NODES 16
-
-#define CLUSTERIP_FLAG_NEW 0x00000001
-
-struct clusterip_config;
-
-struct ipt_clusterip_tgt_info {
-
-	__u32 flags;
-
-	/* only relevant for new ones */
-	__u8 clustermac[ETH_ALEN];
-	__u16 num_total_nodes;
-	__u16 num_local_nodes;
-	__u16 local_nodes[CLUSTERIP_MAX_NODES];
-	__u32 hash_mode;
-	__u32 hash_initval;
-
-	/* Used internally by the kernel */
-	struct clusterip_config *config;
-};
-
-#endif /*_IPT_CLUSTERIP_H_target*/
diff --git a/openflow/usr/include/linux/netfilter_ipv4/ipt_ECN.h b/openflow/usr/include/linux/netfilter_ipv4/ipt_ECN.h
deleted file mode 100644
index bb88d53..0000000
--- a/openflow/usr/include/linux/netfilter_ipv4/ipt_ECN.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Header file for iptables ipt_ECN target
- *
- * (C) 2002 by Harald Welte <laforge@gnumonks.org>
- *
- * This software is distributed under GNU GPL v2, 1991
- * 
- * ipt_ECN.h,v 1.3 2002/05/29 12:17:40 laforge Exp
-*/
-#ifndef _IPT_ECN_TARGET_H
-#define _IPT_ECN_TARGET_H
-
-#include <linux/types.h>
-#include <linux/netfilter/xt_DSCP.h>
-
-#define IPT_ECN_IP_MASK	(~XT_DSCP_MASK)
-
-#define IPT_ECN_OP_SET_IP	0x01	/* set ECN bits of IPv4 header */
-#define IPT_ECN_OP_SET_ECE	0x10	/* set ECE bit of TCP header */
-#define IPT_ECN_OP_SET_CWR	0x20	/* set CWR bit of TCP header */
-
-#define IPT_ECN_OP_MASK		0xce
-
-struct ipt_ECN_info {
-	__u8 operation;	/* bitset of operations */
-	__u8 ip_ect;	/* ECT codepoint of IPv4 header, pre-shifted */
-	union {
-		struct {
-			__u8 ece:1, cwr:1; /* TCP ECT bits */
-		} tcp;
-	} proto;
-};
-
-#endif /* _IPT_ECN_TARGET_H */
diff --git a/openflow/usr/include/linux/netfilter_ipv4/ipt_LOG.h b/openflow/usr/include/linux/netfilter_ipv4/ipt_LOG.h
deleted file mode 100644
index 5d81520..0000000
--- a/openflow/usr/include/linux/netfilter_ipv4/ipt_LOG.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _IPT_LOG_H
-#define _IPT_LOG_H
-
-#warning "Please update iptables, this file will be removed soon!"
-
-/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
-#define IPT_LOG_TCPSEQ		0x01	/* Log TCP sequence numbers */
-#define IPT_LOG_TCPOPT		0x02	/* Log TCP options */
-#define IPT_LOG_IPOPT		0x04	/* Log IP options */
-#define IPT_LOG_UID		0x08	/* Log UID owning local socket */
-#define IPT_LOG_NFLOG		0x10	/* Unsupported, don't reuse */
-#define IPT_LOG_MACDECODE	0x20	/* Decode MAC header */
-#define IPT_LOG_MASK		0x2f
-
-struct ipt_log_info {
-	unsigned char level;
-	unsigned char logflags;
-	char prefix[30];
-};
-
-#endif /*_IPT_LOG_H*/
diff --git a/openflow/usr/include/linux/netfilter_ipv4/ipt_REJECT.h b/openflow/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
deleted file mode 100644
index 4293a1a..0000000
--- a/openflow/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _IPT_REJECT_H
-#define _IPT_REJECT_H
-
-enum ipt_reject_with {
-	IPT_ICMP_NET_UNREACHABLE,
-	IPT_ICMP_HOST_UNREACHABLE,
-	IPT_ICMP_PROT_UNREACHABLE,
-	IPT_ICMP_PORT_UNREACHABLE,
-	IPT_ICMP_ECHOREPLY,
-	IPT_ICMP_NET_PROHIBITED,
-	IPT_ICMP_HOST_PROHIBITED,
-	IPT_TCP_RESET,
-	IPT_ICMP_ADMIN_PROHIBITED
-};
-
-struct ipt_reject_info {
-	enum ipt_reject_with with;      /* reject type */
-};
-
-#endif /*_IPT_REJECT_H*/
diff --git a/openflow/usr/include/linux/netfilter_ipv4/ipt_TTL.h b/openflow/usr/include/linux/netfilter_ipv4/ipt_TTL.h
deleted file mode 100644
index f6ac169..0000000
--- a/openflow/usr/include/linux/netfilter_ipv4/ipt_TTL.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* TTL modification module for IP tables
- * (C) 2000 by Harald Welte <laforge@netfilter.org> */
-
-#ifndef _IPT_TTL_H
-#define _IPT_TTL_H
-
-#include <linux/types.h>
-
-enum {
-	IPT_TTL_SET = 0,
-	IPT_TTL_INC,
-	IPT_TTL_DEC
-};
-
-#define IPT_TTL_MAXMODE	IPT_TTL_DEC
-
-struct ipt_TTL_info {
-	__u8	mode;
-	__u8	ttl;
-};
-
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_ipv4/ipt_ah.h b/openflow/usr/include/linux/netfilter_ipv4/ipt_ah.h
deleted file mode 100644
index 4e02bb0..0000000
--- a/openflow/usr/include/linux/netfilter_ipv4/ipt_ah.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _IPT_AH_H
-#define _IPT_AH_H
-
-#include <linux/types.h>
-
-struct ipt_ah {
-	__u32 spis[2];			/* Security Parameter Index */
-	__u8  invflags;			/* Inverse flags */
-};
-
-
-
-/* Values for "invflags" field in struct ipt_ah. */
-#define IPT_AH_INV_SPI		0x01	/* Invert the sense of spi. */
-#define IPT_AH_INV_MASK	0x01	/* All possible flags. */
-
-#endif /*_IPT_AH_H*/
diff --git a/openflow/usr/include/linux/netfilter_ipv4/ipt_ecn.h b/openflow/usr/include/linux/netfilter_ipv4/ipt_ecn.h
deleted file mode 100644
index 0e0c063..0000000
--- a/openflow/usr/include/linux/netfilter_ipv4/ipt_ecn.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _IPT_ECN_H
-#define _IPT_ECN_H
-
-#include <linux/netfilter/xt_ecn.h>
-#define ipt_ecn_info xt_ecn_info
-
-enum {
-	IPT_ECN_IP_MASK       = XT_ECN_IP_MASK,
-	IPT_ECN_OP_MATCH_IP   = XT_ECN_OP_MATCH_IP,
-	IPT_ECN_OP_MATCH_ECE  = XT_ECN_OP_MATCH_ECE,
-	IPT_ECN_OP_MATCH_CWR  = XT_ECN_OP_MATCH_CWR,
-	IPT_ECN_OP_MATCH_MASK = XT_ECN_OP_MATCH_MASK,
-};
-
-#endif /* IPT_ECN_H */
diff --git a/openflow/usr/include/linux/netfilter_ipv4/ipt_ttl.h b/openflow/usr/include/linux/netfilter_ipv4/ipt_ttl.h
deleted file mode 100644
index 37bee44..0000000
--- a/openflow/usr/include/linux/netfilter_ipv4/ipt_ttl.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* IP tables module for matching the value of the TTL
- * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
-
-#ifndef _IPT_TTL_H
-#define _IPT_TTL_H
-
-#include <linux/types.h>
-
-enum {
-	IPT_TTL_EQ = 0,		/* equals */
-	IPT_TTL_NE,		/* not equals */
-	IPT_TTL_LT,		/* less than */
-	IPT_TTL_GT,		/* greater than */
-};
-
-
-struct ipt_ttl_info {
-	__u8	mode;
-	__u8	ttl;
-};
-
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_ipv6.h b/openflow/usr/include/linux/netfilter_ipv6.h
deleted file mode 100644
index 8483d1d..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* IPv6-specific defines for netfilter. 
- * (C)1998 Rusty Russell -- This code is GPL.
- * (C)1999 David Jeffery
- *   this header was blatantly ripped from netfilter_ipv4.h 
- *   it's amazing what adding a bunch of 6s can do =8^)
- */
-#ifndef __LINUX_IP6_NETFILTER_H
-#define __LINUX_IP6_NETFILTER_H
-
-
-#include <linux/netfilter.h>
-
-/* only for userspace compatibility */
-
-#include <limits.h> /* for INT_MIN, INT_MAX */
-
-/* IP Cache bits. */
-/* Src IP address. */
-#define NFC_IP6_SRC              0x0001
-/* Dest IP address. */
-#define NFC_IP6_DST              0x0002
-/* Input device. */
-#define NFC_IP6_IF_IN            0x0004
-/* Output device. */
-#define NFC_IP6_IF_OUT           0x0008
-/* TOS. */
-#define NFC_IP6_TOS              0x0010
-/* Protocol. */
-#define NFC_IP6_PROTO            0x0020
-/* IP options. */
-#define NFC_IP6_OPTIONS          0x0040
-/* Frag & flags. */
-#define NFC_IP6_FRAG             0x0080
-
-
-/* Per-protocol information: only matters if proto match. */
-/* TCP flags. */
-#define NFC_IP6_TCPFLAGS         0x0100
-/* Source port. */
-#define NFC_IP6_SRC_PT           0x0200
-/* Dest port. */
-#define NFC_IP6_DST_PT           0x0400
-/* Something else about the proto */
-#define NFC_IP6_PROTO_UNKNOWN    0x2000
-
-/* IP6 Hooks */
-/* After promisc drops, checksum checks. */
-#define NF_IP6_PRE_ROUTING	0
-/* If the packet is destined for this box. */
-#define NF_IP6_LOCAL_IN		1
-/* If the packet is destined for another interface. */
-#define NF_IP6_FORWARD		2
-/* Packets coming from a local process. */
-#define NF_IP6_LOCAL_OUT		3
-/* Packets about to hit the wire. */
-#define NF_IP6_POST_ROUTING	4
-#define NF_IP6_NUMHOOKS		5
-
-
-enum nf_ip6_hook_priorities {
-	NF_IP6_PRI_FIRST = INT_MIN,
-	NF_IP6_PRI_CONNTRACK_DEFRAG = -400,
-	NF_IP6_PRI_RAW = -300,
-	NF_IP6_PRI_SELINUX_FIRST = -225,
-	NF_IP6_PRI_CONNTRACK = -200,
-	NF_IP6_PRI_MANGLE = -150,
-	NF_IP6_PRI_NAT_DST = -100,
-	NF_IP6_PRI_FILTER = 0,
-	NF_IP6_PRI_SECURITY = 50,
-	NF_IP6_PRI_NAT_SRC = 100,
-	NF_IP6_PRI_SELINUX_LAST = 225,
-	NF_IP6_PRI_CONNTRACK_HELPER = 300,
-	NF_IP6_PRI_LAST = INT_MAX,
-};
-
-
-#endif /* __LINUX_IP6_NETFILTER_H */
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6_tables.h b/openflow/usr/include/linux/netfilter_ipv6/ip6_tables.h
deleted file mode 100644
index 640a1d0..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6_tables.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * 25-Jul-1998 Major changes to allow for ip chain table
- *
- * 3-Jan-2000 Named tables to allow packet selection for different uses.
- */
-
-/*
- * 	Format of an IP6 firewall descriptor
- *
- * 	src, dst, src_mask, dst_mask are always stored in network byte order.
- * 	flags are stored in host byte order (of course).
- * 	Port numbers are stored in HOST byte order.
- */
-
-#ifndef _IP6_TABLES_H
-#define _IP6_TABLES_H
-
-#include <linux/types.h>
-
-#include <linux/netfilter_ipv6.h>
-
-#include <linux/netfilter/x_tables.h>
-
-#define IP6T_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
-#define IP6T_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
-#define ip6t_match xt_match
-#define ip6t_target xt_target
-#define ip6t_table xt_table
-#define ip6t_get_revision xt_get_revision
-#define ip6t_entry_match xt_entry_match
-#define ip6t_entry_target xt_entry_target
-#define ip6t_standard_target xt_standard_target
-#define ip6t_error_target xt_error_target
-#define ip6t_counters xt_counters
-#define IP6T_CONTINUE XT_CONTINUE
-#define IP6T_RETURN XT_RETURN
-
-/* Pre-iptables-1.4.0 */
-#include <linux/netfilter/xt_tcpudp.h>
-#define ip6t_tcp xt_tcp
-#define ip6t_udp xt_udp
-#define IP6T_TCP_INV_SRCPT	XT_TCP_INV_SRCPT
-#define IP6T_TCP_INV_DSTPT	XT_TCP_INV_DSTPT
-#define IP6T_TCP_INV_FLAGS	XT_TCP_INV_FLAGS
-#define IP6T_TCP_INV_OPTION	XT_TCP_INV_OPTION
-#define IP6T_TCP_INV_MASK	XT_TCP_INV_MASK
-#define IP6T_UDP_INV_SRCPT	XT_UDP_INV_SRCPT
-#define IP6T_UDP_INV_DSTPT	XT_UDP_INV_DSTPT
-#define IP6T_UDP_INV_MASK	XT_UDP_INV_MASK
-
-#define ip6t_counters_info xt_counters_info
-#define IP6T_STANDARD_TARGET XT_STANDARD_TARGET
-#define IP6T_ERROR_TARGET XT_ERROR_TARGET
-#define IP6T_MATCH_ITERATE(e, fn, args...) \
-	XT_MATCH_ITERATE(struct ip6t_entry, e, fn, ## args)
-#define IP6T_ENTRY_ITERATE(entries, size, fn, args...) \
-	XT_ENTRY_ITERATE(struct ip6t_entry, entries, size, fn, ## args)
-
-/* Yes, Virginia, you have to zero the padding. */
-struct ip6t_ip6 {
-	/* Source and destination IP6 addr */
-	struct in6_addr src, dst;		
-	/* Mask for src and dest IP6 addr */
-	struct in6_addr smsk, dmsk;
-	char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
-	unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
-
-	/* Upper protocol number
-	 * - The allowed value is 0 (any) or protocol number of last parsable
-	 *   header, which is 50 (ESP), 59 (No Next Header), 135 (MH), or
-	 *   the non IPv6 extension headers.
-	 * - The protocol numbers of IPv6 extension headers except of ESP and
-	 *   MH do not match any packets.
-	 * - You also need to set IP6T_FLAGS_PROTO to "flags" to check protocol.
-	 */
-	__u16 proto;
-	/* TOS to match iff flags & IP6T_F_TOS */
-	__u8 tos;
-
-	/* Flags word */
-	__u8 flags;
-	/* Inverse flags */
-	__u8 invflags;
-};
-
-/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
-#define IP6T_F_PROTO		0x01	/* Set if rule cares about upper 
-					   protocols */
-#define IP6T_F_TOS		0x02	/* Match the TOS. */
-#define IP6T_F_GOTO		0x04	/* Set if jump is a goto */
-#define IP6T_F_MASK		0x07	/* All possible flag bits mask. */
-
-/* Values for "inv" field in struct ip6t_ip6. */
-#define IP6T_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
-#define IP6T_INV_VIA_OUT		0x02	/* Invert the sense of OUT IFACE */
-#define IP6T_INV_TOS		0x04	/* Invert the sense of TOS. */
-#define IP6T_INV_SRCIP		0x08	/* Invert the sense of SRC IP. */
-#define IP6T_INV_DSTIP		0x10	/* Invert the sense of DST OP. */
-#define IP6T_INV_FRAG		0x20	/* Invert the sense of FRAG. */
-#define IP6T_INV_PROTO		XT_INV_PROTO
-#define IP6T_INV_MASK		0x7F	/* All possible flag bits mask. */
-
-/* This structure defines each of the firewall rules.  Consists of 3
-   parts which are 1) general IP header stuff 2) match specific
-   stuff 3) the target to perform if the rule matches */
-struct ip6t_entry {
-	struct ip6t_ip6 ipv6;
-
-	/* Mark with fields that we care about. */
-	unsigned int nfcache;
-
-	/* Size of ipt_entry + matches */
-	__u16 target_offset;
-	/* Size of ipt_entry + matches + target */
-	__u16 next_offset;
-
-	/* Back pointer */
-	unsigned int comefrom;
-
-	/* Packet and byte counters. */
-	struct xt_counters counters;
-
-	/* The matches (if any), then the target. */
-	unsigned char elems[0];
-};
-
-/* Standard entry */
-struct ip6t_standard {
-	struct ip6t_entry entry;
-	struct xt_standard_target target;
-};
-
-struct ip6t_error {
-	struct ip6t_entry entry;
-	struct xt_error_target target;
-};
-
-#define IP6T_ENTRY_INIT(__size)						       \
-{									       \
-	.target_offset	= sizeof(struct ip6t_entry),			       \
-	.next_offset	= (__size),					       \
-}
-
-#define IP6T_STANDARD_INIT(__verdict)					       \
-{									       \
-	.entry		= IP6T_ENTRY_INIT(sizeof(struct ip6t_standard)),       \
-	.target		= XT_TARGET_INIT(XT_STANDARD_TARGET,		       \
-					 sizeof(struct xt_standard_target)),   \
-	.target.verdict	= -(__verdict) - 1,				       \
-}
-
-#define IP6T_ERROR_INIT							       \
-{									       \
-	.entry		= IP6T_ENTRY_INIT(sizeof(struct ip6t_error)),	       \
-	.target		= XT_TARGET_INIT(XT_ERROR_TARGET,		       \
-					 sizeof(struct xt_error_target)),      \
-	.target.errorname = "ERROR",					       \
-}
-
-/*
- * New IP firewall options for [gs]etsockopt at the RAW IP level.
- * Unlike BSD Linux inherits IP options so you don't have to use
- * a raw socket for this. Instead we check rights in the calls.
- *
- * ATTENTION: check linux/in6.h before adding new number here.
- */
-#define IP6T_BASE_CTL			64
-
-#define IP6T_SO_SET_REPLACE		(IP6T_BASE_CTL)
-#define IP6T_SO_SET_ADD_COUNTERS	(IP6T_BASE_CTL + 1)
-#define IP6T_SO_SET_MAX			IP6T_SO_SET_ADD_COUNTERS
-
-#define IP6T_SO_GET_INFO		(IP6T_BASE_CTL)
-#define IP6T_SO_GET_ENTRIES		(IP6T_BASE_CTL + 1)
-#define IP6T_SO_GET_REVISION_MATCH	(IP6T_BASE_CTL + 4)
-#define IP6T_SO_GET_REVISION_TARGET	(IP6T_BASE_CTL + 5)
-#define IP6T_SO_GET_MAX			IP6T_SO_GET_REVISION_TARGET
-
-/* obtain original address if REDIRECT'd connection */
-#define IP6T_SO_ORIGINAL_DST            80
-
-/* ICMP matching stuff */
-struct ip6t_icmp {
-	__u8 type;				/* type to match */
-	__u8 code[2];				/* range of code */
-	__u8 invflags;				/* Inverse flags */
-};
-
-/* Values for "inv" field for struct ipt_icmp. */
-#define IP6T_ICMP_INV	0x01	/* Invert the sense of type/code test */
-
-/* The argument to IP6T_SO_GET_INFO */
-struct ip6t_getinfo {
-	/* Which table: caller fills this in. */
-	char name[XT_TABLE_MAXNAMELEN];
-
-	/* Kernel fills these in. */
-	/* Which hook entry points are valid: bitmask */
-	unsigned int valid_hooks;
-
-	/* Hook entry points: one per netfilter hook. */
-	unsigned int hook_entry[NF_INET_NUMHOOKS];
-
-	/* Underflow points. */
-	unsigned int underflow[NF_INET_NUMHOOKS];
-
-	/* Number of entries */
-	unsigned int num_entries;
-
-	/* Size of entries. */
-	unsigned int size;
-};
-
-/* The argument to IP6T_SO_SET_REPLACE. */
-struct ip6t_replace {
-	/* Which table. */
-	char name[XT_TABLE_MAXNAMELEN];
-
-	/* Which hook entry points are valid: bitmask.  You can't
-           change this. */
-	unsigned int valid_hooks;
-
-	/* Number of entries */
-	unsigned int num_entries;
-
-	/* Total size of new entries */
-	unsigned int size;
-
-	/* Hook entry points. */
-	unsigned int hook_entry[NF_INET_NUMHOOKS];
-
-	/* Underflow points. */
-	unsigned int underflow[NF_INET_NUMHOOKS];
-
-	/* Information about old entries: */
-	/* Number of counters (must be equal to current number of entries). */
-	unsigned int num_counters;
-	/* The old entries' counters. */
-	struct xt_counters *counters;
-
-	/* The entries (hang off end: not really an array). */
-	struct ip6t_entry entries[0];
-};
-
-/* The argument to IP6T_SO_GET_ENTRIES. */
-struct ip6t_get_entries {
-	/* Which table: user fills this in. */
-	char name[XT_TABLE_MAXNAMELEN];
-
-	/* User fills this in: total entry size. */
-	unsigned int size;
-
-	/* The entries. */
-	struct ip6t_entry entrytable[0];
-};
-
-/* Helper functions */
-static __inline__ struct xt_entry_target *
-ip6t_get_target(struct ip6t_entry *e)
-{
-	return (void *)e + e->target_offset;
-}
-
-/*
- *	Main firewall chains definitions and global var's definitions.
- */
-
-#endif /* _IP6_TABLES_H */
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_HL.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_HL.h
deleted file mode 100644
index ebd8ead..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_HL.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Hop Limit modification module for ip6tables
- * Maciej Soltysiak <solt@dns.toxicfilms.tv>
- * Based on HW's TTL module */
-
-#ifndef _IP6T_HL_H
-#define _IP6T_HL_H
-
-#include <linux/types.h>
-
-enum {
-	IP6T_HL_SET = 0,
-	IP6T_HL_INC,
-	IP6T_HL_DEC
-};
-
-#define IP6T_HL_MAXMODE	IP6T_HL_DEC
-
-struct ip6t_HL_info {
-	__u8	mode;
-	__u8	hop_limit;
-};
-
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_LOG.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
deleted file mode 100644
index 3dd0bc4..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _IP6T_LOG_H
-#define _IP6T_LOG_H
-
-#warning "Please update iptables, this file will be removed soon!"
-
-/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
-#define IP6T_LOG_TCPSEQ		0x01	/* Log TCP sequence numbers */
-#define IP6T_LOG_TCPOPT		0x02	/* Log TCP options */
-#define IP6T_LOG_IPOPT		0x04	/* Log IP options */
-#define IP6T_LOG_UID		0x08	/* Log UID owning local socket */
-#define IP6T_LOG_NFLOG		0x10	/* Unsupported, don't use */
-#define IP6T_LOG_MACDECODE	0x20	/* Decode MAC header */
-#define IP6T_LOG_MASK		0x2f
-
-struct ip6t_log_info {
-	unsigned char level;
-	unsigned char logflags;
-	char prefix[30];
-};
-
-#endif /*_IPT_LOG_H*/
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_NPT.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
deleted file mode 100644
index f763355..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __NETFILTER_IP6T_NPT
-#define __NETFILTER_IP6T_NPT
-
-#include <linux/types.h>
-#include <linux/netfilter.h>
-
-struct ip6t_npt_tginfo {
-	union nf_inet_addr	src_pfx;
-	union nf_inet_addr	dst_pfx;
-	__u8			src_pfx_len;
-	__u8			dst_pfx_len;
-	/* Used internally by the kernel */
-	__sum16			adjustment;
-};
-
-#endif /* __NETFILTER_IP6T_NPT */
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
deleted file mode 100644
index cd2e940..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _IP6T_REJECT_H
-#define _IP6T_REJECT_H
-
-#include <linux/types.h>
-
-enum ip6t_reject_with {
-	IP6T_ICMP6_NO_ROUTE,
-	IP6T_ICMP6_ADM_PROHIBITED,
-	IP6T_ICMP6_NOT_NEIGHBOUR,
-	IP6T_ICMP6_ADDR_UNREACH,
-	IP6T_ICMP6_PORT_UNREACH,
-	IP6T_ICMP6_ECHOREPLY,
-	IP6T_TCP_RESET,
-	IP6T_ICMP6_POLICY_FAIL,
-	IP6T_ICMP6_REJECT_ROUTE
-};
-
-struct ip6t_reject_info {
-	__u32	with;	/* reject type */
-};
-
-#endif /*_IP6T_REJECT_H*/
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_ah.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_ah.h
deleted file mode 100644
index 5da2b65..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_ah.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _IP6T_AH_H
-#define _IP6T_AH_H
-
-#include <linux/types.h>
-
-struct ip6t_ah {
-	__u32 spis[2];			/* Security Parameter Index */
-	__u32 hdrlen;			/* Header Length */
-	__u8  hdrres;			/* Test of the Reserved Filed */
-	__u8  invflags;			/* Inverse flags */
-};
-
-#define IP6T_AH_SPI 0x01
-#define IP6T_AH_LEN 0x02
-#define IP6T_AH_RES 0x04
-
-/* Values for "invflags" field in struct ip6t_ah. */
-#define IP6T_AH_INV_SPI		0x01	/* Invert the sense of spi. */
-#define IP6T_AH_INV_LEN		0x02	/* Invert the sense of length. */
-#define IP6T_AH_INV_MASK	0x03	/* All possible flags. */
-
-#endif /*_IP6T_AH_H*/
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_frag.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_frag.h
deleted file mode 100644
index dfd8bc2..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_frag.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _IP6T_FRAG_H
-#define _IP6T_FRAG_H
-
-#include <linux/types.h>
-
-struct ip6t_frag {
-	__u32 ids[2];			/* Identification range */
-	__u32 hdrlen;			/* Header Length */
-	__u8  flags;			/* Flags */
-	__u8  invflags;			/* Inverse flags */
-};
-
-#define IP6T_FRAG_IDS 		0x01
-#define IP6T_FRAG_LEN 		0x02
-#define IP6T_FRAG_RES 		0x04
-#define IP6T_FRAG_FST 		0x08
-#define IP6T_FRAG_MF  		0x10
-#define IP6T_FRAG_NMF  		0x20
-
-/* Values for "invflags" field in struct ip6t_frag. */
-#define IP6T_FRAG_INV_IDS	0x01	/* Invert the sense of ids. */
-#define IP6T_FRAG_INV_LEN	0x02	/* Invert the sense of length. */
-#define IP6T_FRAG_INV_MASK	0x03	/* All possible flags. */
-
-#endif /*_IP6T_FRAG_H*/
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_hl.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_hl.h
deleted file mode 100644
index 6e76dbc..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_hl.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ip6tables module for matching the Hop Limit value
- * Maciej Soltysiak <solt@dns.toxicfilms.tv>
- * Based on HW's ttl module */
-
-#ifndef _IP6T_HL_H
-#define _IP6T_HL_H
-
-#include <linux/types.h>
-
-enum {
-	IP6T_HL_EQ = 0,		/* equals */
-	IP6T_HL_NE,		/* not equals */
-	IP6T_HL_LT,		/* less than */
-	IP6T_HL_GT,		/* greater than */
-};
-
-
-struct ip6t_hl_info {
-	__u8	mode;
-	__u8	hop_limit;
-};
-
-
-#endif
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
deleted file mode 100644
index efae3a2..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ipv6header match - matches IPv6 packets based
-on whether they contain certain headers */
-
-/* Original idea: Brad Chapman 
- * Rewritten by: Andras Kis-Szabo <kisza@sch.bme.hu> */
-
-
-#ifndef __IPV6HEADER_H
-#define __IPV6HEADER_H
-
-#include <linux/types.h>
-
-struct ip6t_ipv6header_info {
-	__u8 matchflags;
-	__u8 invflags;
-	__u8 modeflag;
-};
-
-#define MASK_HOPOPTS    128
-#define MASK_DSTOPTS    64
-#define MASK_ROUTING    32
-#define MASK_FRAGMENT   16
-#define MASK_AH         8
-#define MASK_ESP        4
-#define MASK_NONE       2
-#define MASK_PROTO      1
-
-#endif /* __IPV6HEADER_H */
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_mh.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_mh.h
deleted file mode 100644
index a7729a5..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_mh.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _IP6T_MH_H
-#define _IP6T_MH_H
-
-#include <linux/types.h>
-
-/* MH matching stuff */
-struct ip6t_mh {
-	__u8 types[2];	/* MH type range */
-	__u8 invflags;	/* Inverse flags */
-};
-
-/* Values for "invflags" field in struct ip6t_mh. */
-#define IP6T_MH_INV_TYPE	0x01	/* Invert the sense of type. */
-#define IP6T_MH_INV_MASK	0x01	/* All possible flags. */
-
-#endif /*_IP6T_MH_H*/
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_opts.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_opts.h
deleted file mode 100644
index 17d419a..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_opts.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _IP6T_OPTS_H
-#define _IP6T_OPTS_H
-
-#include <linux/types.h>
-
-#define IP6T_OPTS_OPTSNR 16
-
-struct ip6t_opts {
-	__u32 hdrlen;			/* Header Length */
-	__u8 flags;				/*  */
-	__u8 invflags;			/* Inverse flags */
-	__u16 opts[IP6T_OPTS_OPTSNR];	/* opts */
-	__u8 optsnr;			/* Nr of OPts */
-};
-
-#define IP6T_OPTS_LEN 		0x01
-#define IP6T_OPTS_OPTS 		0x02
-#define IP6T_OPTS_NSTRICT	0x04
-
-/* Values for "invflags" field in struct ip6t_rt. */
-#define IP6T_OPTS_INV_LEN	0x01	/* Invert the sense of length. */
-#define IP6T_OPTS_INV_MASK	0x01	/* All possible flags. */
-
-#endif /*_IP6T_OPTS_H*/
diff --git a/openflow/usr/include/linux/netfilter_ipv6/ip6t_rt.h b/openflow/usr/include/linux/netfilter_ipv6/ip6t_rt.h
deleted file mode 100644
index 7605a5f..0000000
--- a/openflow/usr/include/linux/netfilter_ipv6/ip6t_rt.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _IP6T_RT_H
-#define _IP6T_RT_H
-
-#include <linux/types.h>
-/*#include <linux/in6.h>*/
-
-#define IP6T_RT_HOPS 16
-
-struct ip6t_rt {
-	__u32 rt_type;			/* Routing Type */
-	__u32 segsleft[2];			/* Segments Left */
-	__u32 hdrlen;			/* Header Length */
-	__u8  flags;			/*  */
-	__u8  invflags;			/* Inverse flags */
-	struct in6_addr addrs[IP6T_RT_HOPS];	/* Hops */
-	__u8 addrnr;			/* Nr of Addresses */
-};
-
-#define IP6T_RT_TYP 		0x01
-#define IP6T_RT_SGS 		0x02
-#define IP6T_RT_LEN 		0x04
-#define IP6T_RT_RES 		0x08
-#define IP6T_RT_FST_MASK	0x30
-#define IP6T_RT_FST 		0x10
-#define IP6T_RT_FST_NSTRICT	0x20
-
-/* Values for "invflags" field in struct ip6t_rt. */
-#define IP6T_RT_INV_TYP		0x01	/* Invert the sense of type. */
-#define IP6T_RT_INV_SGS		0x02	/* Invert the sense of Segments. */
-#define IP6T_RT_INV_LEN		0x04	/* Invert the sense of length. */
-#define IP6T_RT_INV_MASK	0x07	/* All possible flags. */
-
-#endif /*_IP6T_RT_H*/
diff --git a/openflow/usr/include/linux/netlink.h b/openflow/usr/include/linux/netlink.h
deleted file mode 100644
index 8a7ca5c..0000000
--- a/openflow/usr/include/linux/netlink.h
+++ /dev/null
@@ -1,189 +0,0 @@
-#ifndef __LINUX_NETLINK_H
-#define __LINUX_NETLINK_H
-
-#include <linux/kernel.h>
-#include <linux/socket.h> /* for __kernel_sa_family_t */
-#include <linux/types.h>
-
-#define NETLINK_ROUTE		0	/* Routing/device hook				*/
-#define NETLINK_UNUSED		1	/* Unused number				*/
-#define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/
-#define NETLINK_FIREWALL	3	/* Unused number, formerly ip_queue		*/
-#define NETLINK_SOCK_DIAG	4	/* socket monitoring				*/
-#define NETLINK_NFLOG		5	/* netfilter/iptables ULOG */
-#define NETLINK_XFRM		6	/* ipsec */
-#define NETLINK_SELINUX		7	/* SELinux event notifications */
-#define NETLINK_ISCSI		8	/* Open-iSCSI */
-#define NETLINK_AUDIT		9	/* auditing */
-#define NETLINK_FIB_LOOKUP	10	
-#define NETLINK_CONNECTOR	11
-#define NETLINK_NETFILTER	12	/* netfilter subsystem */
-#define NETLINK_IP6_FW		13
-#define NETLINK_DNRTMSG		14	/* DECnet routing messages */
-#define NETLINK_KOBJECT_UEVENT	15	/* Kernel messages to userspace */
-#define NETLINK_GENERIC		16
-/* leave room for NETLINK_DM (DM Events) */
-#define NETLINK_SCSITRANSPORT	18	/* SCSI Transports */
-#define NETLINK_ECRYPTFS	19
-#define NETLINK_RDMA		20
-#define NETLINK_CRYPTO		21	/* Crypto layer */
-
-#define NETLINK_INET_DIAG	NETLINK_SOCK_DIAG
-
-#define MAX_LINKS 32		
-
-struct sockaddr_nl {
-	__kernel_sa_family_t	nl_family;	/* AF_NETLINK	*/
-	unsigned short	nl_pad;		/* zero		*/
-	__u32		nl_pid;		/* port ID	*/
-       	__u32		nl_groups;	/* multicast groups mask */
-};
-
-struct nlmsghdr {
-	__u32		nlmsg_len;	/* Length of message including header */
-	__u16		nlmsg_type;	/* Message content */
-	__u16		nlmsg_flags;	/* Additional flags */
-	__u32		nlmsg_seq;	/* Sequence number */
-	__u32		nlmsg_pid;	/* Sending process port ID */
-};
-
-/* Flags values */
-
-#define NLM_F_REQUEST		1	/* It is request message. 	*/
-#define NLM_F_MULTI		2	/* Multipart message, terminated by NLMSG_DONE */
-#define NLM_F_ACK		4	/* Reply with ack, with zero or error code */
-#define NLM_F_ECHO		8	/* Echo this request 		*/
-#define NLM_F_DUMP_INTR		16	/* Dump was inconsistent due to sequence change */
-#define NLM_F_DUMP_FILTERED	32	/* Dump was filtered as requested */
-
-/* Modifiers to GET request */
-#define NLM_F_ROOT	0x100	/* specify tree	root	*/
-#define NLM_F_MATCH	0x200	/* return all matching	*/
-#define NLM_F_ATOMIC	0x400	/* atomic GET		*/
-#define NLM_F_DUMP	(NLM_F_ROOT|NLM_F_MATCH)
-
-/* Modifiers to NEW request */
-#define NLM_F_REPLACE	0x100	/* Override existing		*/
-#define NLM_F_EXCL	0x200	/* Do not touch, if it exists	*/
-#define NLM_F_CREATE	0x400	/* Create, if it does not exist	*/
-#define NLM_F_APPEND	0x800	/* Add to end of list		*/
-
-/*
-   4.4BSD ADD		NLM_F_CREATE|NLM_F_EXCL
-   4.4BSD CHANGE	NLM_F_REPLACE
-
-   True CHANGE		NLM_F_CREATE|NLM_F_REPLACE
-   Append		NLM_F_CREATE
-   Check		NLM_F_EXCL
- */
-
-#define NLMSG_ALIGNTO	4U
-#define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLMSG_ALIGNTO-1) )
-#define NLMSG_HDRLEN	 ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))
-#define NLMSG_LENGTH(len) ((len) + NLMSG_HDRLEN)
-#define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len))
-#define NLMSG_DATA(nlh)  ((void*)(((char*)nlh) + NLMSG_LENGTH(0)))
-#define NLMSG_NEXT(nlh,len)	 ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
-				  (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
-#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && \
-			   (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \
-			   (nlh)->nlmsg_len <= (len))
-#define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len)))
-
-#define NLMSG_NOOP		0x1	/* Nothing.		*/
-#define NLMSG_ERROR		0x2	/* Error		*/
-#define NLMSG_DONE		0x3	/* End of a dump	*/
-#define NLMSG_OVERRUN		0x4	/* Data lost		*/
-
-#define NLMSG_MIN_TYPE		0x10	/* < 0x10: reserved control messages */
-
-struct nlmsgerr {
-	int		error;
-	struct nlmsghdr msg;
-};
-
-#define NETLINK_ADD_MEMBERSHIP		1
-#define NETLINK_DROP_MEMBERSHIP		2
-#define NETLINK_PKTINFO			3
-#define NETLINK_BROADCAST_ERROR		4
-#define NETLINK_NO_ENOBUFS		5
-#define NETLINK_RX_RING			6
-#define NETLINK_TX_RING			7
-#define NETLINK_LISTEN_ALL_NSID		8
-#define NETLINK_LIST_MEMBERSHIPS	9
-#define NETLINK_CAP_ACK			10
-
-struct nl_pktinfo {
-	__u32	group;
-};
-
-struct nl_mmap_req {
-	unsigned int	nm_block_size;
-	unsigned int	nm_block_nr;
-	unsigned int	nm_frame_size;
-	unsigned int	nm_frame_nr;
-};
-
-struct nl_mmap_hdr {
-	unsigned int	nm_status;
-	unsigned int	nm_len;
-	__u32		nm_group;
-	/* credentials */
-	__u32		nm_pid;
-	__u32		nm_uid;
-	__u32		nm_gid;
-};
-
-enum nl_mmap_status {
-	NL_MMAP_STATUS_UNUSED,
-	NL_MMAP_STATUS_RESERVED,
-	NL_MMAP_STATUS_VALID,
-	NL_MMAP_STATUS_COPY,
-	NL_MMAP_STATUS_SKIP,
-};
-
-#define NL_MMAP_MSG_ALIGNMENT		NLMSG_ALIGNTO
-#define NL_MMAP_MSG_ALIGN(sz)		__ALIGN_KERNEL(sz, NL_MMAP_MSG_ALIGNMENT)
-#define NL_MMAP_HDRLEN			NL_MMAP_MSG_ALIGN(sizeof(struct nl_mmap_hdr))
-
-#define NET_MAJOR 36		/* Major 36 is reserved for networking 						*/
-
-enum {
-	NETLINK_UNCONNECTED = 0,
-	NETLINK_CONNECTED,
-};
-
-/*
- *  <------- NLA_HDRLEN ------> <-- NLA_ALIGN(payload)-->
- * +---------------------+- - -+- - - - - - - - - -+- - -+
- * |        Header       | Pad |     Payload       | Pad |
- * |   (struct nlattr)   | ing |                   | ing |
- * +---------------------+- - -+- - - - - - - - - -+- - -+
- *  <-------------- nlattr->nla_len -------------->
- */
-
-struct nlattr {
-	__u16           nla_len;
-	__u16           nla_type;
-};
-
-/*
- * nla_type (16 bits)
- * +---+---+-------------------------------+
- * | N | O | Attribute Type                |
- * +---+---+-------------------------------+
- * N := Carries nested attributes
- * O := Payload stored in network byte order
- *
- * Note: The N and O flag are mutually exclusive.
- */
-#define NLA_F_NESTED		(1 << 15)
-#define NLA_F_NET_BYTEORDER	(1 << 14)
-#define NLA_TYPE_MASK		~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
-
-#define NLA_ALIGNTO		4
-#define NLA_ALIGN(len)		(((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
-#define NLA_HDRLEN		((int) NLA_ALIGN(sizeof(struct nlattr)))
-
-
-#endif /* __LINUX_NETLINK_H */
diff --git a/openflow/usr/include/linux/netlink_diag.h b/openflow/usr/include/linux/netlink_diag.h
deleted file mode 100644
index f2159d3..0000000
--- a/openflow/usr/include/linux/netlink_diag.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef __NETLINK_DIAG_H__
-#define __NETLINK_DIAG_H__
-
-#include <linux/types.h>
-
-struct netlink_diag_req {
-	__u8	sdiag_family;
-	__u8	sdiag_protocol;
-	__u16	pad;
-	__u32	ndiag_ino;
-	__u32	ndiag_show;
-	__u32	ndiag_cookie[2];
-};
-
-struct netlink_diag_msg {
-	__u8	ndiag_family;
-	__u8	ndiag_type;
-	__u8	ndiag_protocol;
-	__u8	ndiag_state;
-
-	__u32	ndiag_portid;
-	__u32	ndiag_dst_portid;
-	__u32	ndiag_dst_group;
-	__u32	ndiag_ino;
-	__u32	ndiag_cookie[2];
-};
-
-struct netlink_diag_ring {
-	__u32	ndr_block_size;
-	__u32	ndr_block_nr;
-	__u32	ndr_frame_size;
-	__u32	ndr_frame_nr;
-};
-
-enum {
-	/* NETLINK_DIAG_NONE, standard nl API requires this attribute!  */
-	NETLINK_DIAG_MEMINFO,
-	NETLINK_DIAG_GROUPS,
-	NETLINK_DIAG_RX_RING,
-	NETLINK_DIAG_TX_RING,
-
-	__NETLINK_DIAG_MAX,
-};
-
-#define NETLINK_DIAG_MAX (__NETLINK_DIAG_MAX - 1)
-
-#define NDIAG_PROTO_ALL		((__u8) ~0)
-
-#define NDIAG_SHOW_MEMINFO	0x00000001 /* show memory info of a socket */
-#define NDIAG_SHOW_GROUPS	0x00000002 /* show groups of a netlink socket */
-#define NDIAG_SHOW_RING_CFG	0x00000004 /* show ring configuration */
-
-#endif
diff --git a/openflow/usr/include/linux/netrom.h b/openflow/usr/include/linux/netrom.h
deleted file mode 100644
index af7313c..0000000
--- a/openflow/usr/include/linux/netrom.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * These are the public elements of the Linux kernel NET/ROM implementation.
- * For kernel AX.25 see the file ax25.h. This file requires ax25.h for the
- * definition of the ax25_address structure.
- */
-
-#ifndef	NETROM_KERNEL_H
-#define	NETROM_KERNEL_H
-
-#include <linux/ax25.h>
-
-#define NETROM_MTU	236
-
-#define NETROM_T1	1
-#define NETROM_T2	2
-#define NETROM_N2	3
-#define	NETROM_T4	6
-#define	NETROM_IDLE	7
-
-#define	SIOCNRDECOBS		(SIOCPROTOPRIVATE+2)
-
-struct nr_route_struct {
-#define	NETROM_NEIGH	0
-#define	NETROM_NODE	1
-	int		type;
-	ax25_address	callsign;
-	char		device[16];
-	unsigned int	quality;
-	char		mnemonic[7];
-	ax25_address	neighbour;
-	unsigned int	obs_count;
-	unsigned int	ndigis;
-	ax25_address	digipeaters[AX25_MAX_DIGIS];
-};
-
-#endif
diff --git a/openflow/usr/include/linux/nfc.h b/openflow/usr/include/linux/nfc.h
deleted file mode 100644
index 399f39f..0000000
--- a/openflow/usr/include/linux/nfc.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (C) 2011 Instituto Nokia de Tecnologia
- *
- * Authors:
- *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
- *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef __LINUX_NFC_H
-#define __LINUX_NFC_H
-
-#include <linux/types.h>
-#include <linux/socket.h>
-
-#define NFC_GENL_NAME "nfc"
-#define NFC_GENL_VERSION 1
-
-#define NFC_GENL_MCAST_EVENT_NAME "events"
-
-/**
- * enum nfc_commands - supported nfc commands
- *
- * @NFC_CMD_UNSPEC: unspecified command
- *
- * @NFC_CMD_GET_DEVICE: request information about a device (requires
- *	%NFC_ATTR_DEVICE_INDEX) or dump request to get a list of all nfc devices
- * @NFC_CMD_DEV_UP: turn on the nfc device
- *	(requires %NFC_ATTR_DEVICE_INDEX)
- * @NFC_CMD_DEV_DOWN: turn off the nfc device
- *	(requires %NFC_ATTR_DEVICE_INDEX)
- * @NFC_CMD_START_POLL: start polling for targets using the given protocols
- *	(requires %NFC_ATTR_DEVICE_INDEX and %NFC_ATTR_PROTOCOLS)
- * @NFC_CMD_STOP_POLL: stop polling for targets (requires
- *	%NFC_ATTR_DEVICE_INDEX)
- * @NFC_CMD_GET_TARGET: dump all targets found by the previous poll (requires
- *	%NFC_ATTR_DEVICE_INDEX)
- * @NFC_EVENT_TARGETS_FOUND: event emitted when a new target is found
- *	(it sends %NFC_ATTR_DEVICE_INDEX)
- * @NFC_EVENT_DEVICE_ADDED: event emitted when a new device is registred
- *	(it sends %NFC_ATTR_DEVICE_NAME, %NFC_ATTR_DEVICE_INDEX and
- *	%NFC_ATTR_PROTOCOLS)
- * @NFC_EVENT_DEVICE_REMOVED: event emitted when a device is removed
- *	(it sends %NFC_ATTR_DEVICE_INDEX)
- * @NFC_EVENT_TM_ACTIVATED: event emitted when the adapter is activated in
- *      target mode.
- * @NFC_EVENT_DEVICE_DEACTIVATED: event emitted when the adapter is deactivated
- *      from target mode.
- * @NFC_CMD_LLC_GET_PARAMS: request LTO, RW, and MIUX parameters for a device
- * @NFC_CMD_LLC_SET_PARAMS: set one or more of LTO, RW, and MIUX parameters for
- *	a device. LTO must be set before the link is up otherwise -EINPROGRESS
- *	is returned. RW and MIUX can be set at anytime and will be passed in
- *	subsequent CONNECT and CC messages.
- *	If one of the passed parameters is wrong none is set and -EINVAL is
- *	returned.
- * @NFC_CMD_ENABLE_SE: Enable the physical link to a specific secure element.
- *	Once enabled a secure element will handle card emulation mode, i.e.
- *	starting a poll from a device which has a secure element enabled means
- *	we want to do SE based card emulation.
- * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.
- * @NFC_CMD_FW_DOWNLOAD: Request to Load/flash firmware, or event to inform
- *	that some firmware was loaded
- * @NFC_EVENT_SE_ADDED: Event emitted when a new secure element is discovered.
- *	This typically will be sent whenever a new NFC controller with either
- *	an embedded SE or an UICC one connected to it through SWP.
- * @NFC_EVENT_SE_REMOVED: Event emitted when a secure element is removed from
- *	the system, as a consequence of e.g. an NFC controller being unplugged.
- * @NFC_EVENT_SE_CONNECTIVITY: This event is emitted whenever a secure element
- *	is requesting connectivity access. For example a UICC SE may need to
- *	talk with a sleeping modem and will notify this need by sending this
- *	event. It is then up to userspace to decide if it will wake the modem
- *	up or not.
- * @NFC_EVENT_SE_TRANSACTION: This event is sent when an application running on
- *	a specific SE notifies us about the end of a transaction. The parameter
- *	for this event is the application ID (AID).
- * @NFC_CMD_GET_SE: Dump all discovered secure elements from an NFC controller.
- * @NFC_CMD_SE_IO: Send/Receive APDUs to/from the selected secure element.
- * @NFC_CMD_ACTIVATE_TARGET: Request NFC controller to reactivate target.
- * @NFC_CMD_VENDOR: Vendor specific command, to be implemented directly
- *	from the driver in order to support hardware specific operations.
- */
-enum nfc_commands {
-	NFC_CMD_UNSPEC,
-	NFC_CMD_GET_DEVICE,
-	NFC_CMD_DEV_UP,
-	NFC_CMD_DEV_DOWN,
-	NFC_CMD_DEP_LINK_UP,
-	NFC_CMD_DEP_LINK_DOWN,
-	NFC_CMD_START_POLL,
-	NFC_CMD_STOP_POLL,
-	NFC_CMD_GET_TARGET,
-	NFC_EVENT_TARGETS_FOUND,
-	NFC_EVENT_DEVICE_ADDED,
-	NFC_EVENT_DEVICE_REMOVED,
-	NFC_EVENT_TARGET_LOST,
-	NFC_EVENT_TM_ACTIVATED,
-	NFC_EVENT_TM_DEACTIVATED,
-	NFC_CMD_LLC_GET_PARAMS,
-	NFC_CMD_LLC_SET_PARAMS,
-	NFC_CMD_ENABLE_SE,
-	NFC_CMD_DISABLE_SE,
-	NFC_CMD_LLC_SDREQ,
-	NFC_EVENT_LLC_SDRES,
-	NFC_CMD_FW_DOWNLOAD,
-	NFC_EVENT_SE_ADDED,
-	NFC_EVENT_SE_REMOVED,
-	NFC_EVENT_SE_CONNECTIVITY,
-	NFC_EVENT_SE_TRANSACTION,
-	NFC_CMD_GET_SE,
-	NFC_CMD_SE_IO,
-	NFC_CMD_ACTIVATE_TARGET,
-	NFC_CMD_VENDOR,
-/* private: internal use only */
-	__NFC_CMD_AFTER_LAST
-};
-#define NFC_CMD_MAX (__NFC_CMD_AFTER_LAST - 1)
-
-/**
- * enum nfc_attrs - supported nfc attributes
- *
- * @NFC_ATTR_UNSPEC: unspecified attribute
- *
- * @NFC_ATTR_DEVICE_INDEX: index of nfc device
- * @NFC_ATTR_DEVICE_NAME: device name, max 8 chars
- * @NFC_ATTR_PROTOCOLS: nfc protocols - bitwise or-ed combination from
- *	NFC_PROTO_*_MASK constants
- * @NFC_ATTR_TARGET_INDEX: index of the nfc target
- * @NFC_ATTR_TARGET_SENS_RES: NFC-A targets extra information such as NFCID
- * @NFC_ATTR_TARGET_SEL_RES: NFC-A targets extra information (useful if the
- *	target is not NFC-Forum compliant)
- * @NFC_ATTR_TARGET_NFCID1: NFC-A targets identifier, max 10 bytes
- * @NFC_ATTR_TARGET_SENSB_RES: NFC-B targets extra information, max 12 bytes
- * @NFC_ATTR_TARGET_SENSF_RES: NFC-F targets extra information, max 18 bytes
- * @NFC_ATTR_COMM_MODE: Passive or active mode
- * @NFC_ATTR_RF_MODE: Initiator or target
- * @NFC_ATTR_IM_PROTOCOLS: Initiator mode protocols to poll for
- * @NFC_ATTR_TM_PROTOCOLS: Target mode protocols to listen for
- * @NFC_ATTR_LLC_PARAM_LTO: Link TimeOut parameter
- * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter
- * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter
- * @NFC_ATTR_SE: Available Secure Elements
- * @NFC_ATTR_FIRMWARE_NAME: Free format firmware version
- * @NFC_ATTR_SE_INDEX: Secure element index
- * @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED)
- * @NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS: Firmware download operation status
- * @NFC_ATTR_APDU: Secure element APDU
- * @NFC_ATTR_TARGET_ISO15693_DSFID: ISO 15693 Data Storage Format Identifier
- * @NFC_ATTR_TARGET_ISO15693_UID: ISO 15693 Unique Identifier
- * @NFC_ATTR_SE_PARAMS: Parameters data from an evt_transaction
- * @NFC_ATTR_VENDOR_ID: NFC manufacturer unique ID, typically an OUI
- * @NFC_ATTR_VENDOR_SUBCMD: Vendor specific sub command
- * @NFC_ATTR_VENDOR_DATA: Vendor specific data, to be optionally passed
- *	to a vendor specific command implementation
- */
-enum nfc_attrs {
-	NFC_ATTR_UNSPEC,
-	NFC_ATTR_DEVICE_INDEX,
-	NFC_ATTR_DEVICE_NAME,
-	NFC_ATTR_PROTOCOLS,
-	NFC_ATTR_TARGET_INDEX,
-	NFC_ATTR_TARGET_SENS_RES,
-	NFC_ATTR_TARGET_SEL_RES,
-	NFC_ATTR_TARGET_NFCID1,
-	NFC_ATTR_TARGET_SENSB_RES,
-	NFC_ATTR_TARGET_SENSF_RES,
-	NFC_ATTR_COMM_MODE,
-	NFC_ATTR_RF_MODE,
-	NFC_ATTR_DEVICE_POWERED,
-	NFC_ATTR_IM_PROTOCOLS,
-	NFC_ATTR_TM_PROTOCOLS,
-	NFC_ATTR_LLC_PARAM_LTO,
-	NFC_ATTR_LLC_PARAM_RW,
-	NFC_ATTR_LLC_PARAM_MIUX,
-	NFC_ATTR_SE,
-	NFC_ATTR_LLC_SDP,
-	NFC_ATTR_FIRMWARE_NAME,
-	NFC_ATTR_SE_INDEX,
-	NFC_ATTR_SE_TYPE,
-	NFC_ATTR_SE_AID,
-	NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS,
-	NFC_ATTR_SE_APDU,
-	NFC_ATTR_TARGET_ISO15693_DSFID,
-	NFC_ATTR_TARGET_ISO15693_UID,
-	NFC_ATTR_SE_PARAMS,
-	NFC_ATTR_VENDOR_ID,
-	NFC_ATTR_VENDOR_SUBCMD,
-	NFC_ATTR_VENDOR_DATA,
-/* private: internal use only */
-	__NFC_ATTR_AFTER_LAST
-};
-#define NFC_ATTR_MAX (__NFC_ATTR_AFTER_LAST - 1)
-
-enum nfc_sdp_attr {
-	NFC_SDP_ATTR_UNSPEC,
-	NFC_SDP_ATTR_URI,
-	NFC_SDP_ATTR_SAP,
-/* private: internal use only */
-	__NFC_SDP_ATTR_AFTER_LAST
-};
-#define NFC_SDP_ATTR_MAX (__NFC_SDP_ATTR_AFTER_LAST - 1)
-
-#define NFC_DEVICE_NAME_MAXSIZE		8
-#define NFC_NFCID1_MAXSIZE		10
-#define NFC_NFCID2_MAXSIZE		8
-#define NFC_NFCID3_MAXSIZE		10
-#define NFC_SENSB_RES_MAXSIZE		12
-#define NFC_SENSF_RES_MAXSIZE		18
-#define NFC_ATR_REQ_MAXSIZE		64
-#define NFC_ATR_RES_MAXSIZE		64
-#define NFC_ATR_REQ_GB_MAXSIZE		48
-#define NFC_ATR_RES_GB_MAXSIZE		47
-#define NFC_GB_MAXSIZE			48
-#define NFC_FIRMWARE_NAME_MAXSIZE	32
-#define NFC_ISO15693_UID_MAXSIZE	8
-
-/* NFC protocols */
-#define NFC_PROTO_JEWEL		1
-#define NFC_PROTO_MIFARE	2
-#define NFC_PROTO_FELICA	3
-#define NFC_PROTO_ISO14443	4
-#define NFC_PROTO_NFC_DEP	5
-#define NFC_PROTO_ISO14443_B	6
-#define NFC_PROTO_ISO15693	7
-
-#define NFC_PROTO_MAX		8
-
-/* NFC communication modes */
-#define NFC_COMM_ACTIVE  0
-#define NFC_COMM_PASSIVE 1
-
-/* NFC RF modes */
-#define NFC_RF_INITIATOR 0
-#define NFC_RF_TARGET    1
-#define NFC_RF_NONE      2
-
-/* NFC protocols masks used in bitsets */
-#define NFC_PROTO_JEWEL_MASK      (1 << NFC_PROTO_JEWEL)
-#define NFC_PROTO_MIFARE_MASK     (1 << NFC_PROTO_MIFARE)
-#define NFC_PROTO_FELICA_MASK	  (1 << NFC_PROTO_FELICA)
-#define NFC_PROTO_ISO14443_MASK	  (1 << NFC_PROTO_ISO14443)
-#define NFC_PROTO_NFC_DEP_MASK	  (1 << NFC_PROTO_NFC_DEP)
-#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
-#define NFC_PROTO_ISO15693_MASK	  (1 << NFC_PROTO_ISO15693)
-
-/* NFC Secure Elements */
-#define NFC_SE_UICC     0x1
-#define NFC_SE_EMBEDDED 0x2
-
-#define NFC_SE_DISABLED 0x0
-#define NFC_SE_ENABLED  0x1
-
-struct sockaddr_nfc {
-	sa_family_t sa_family;
-	__u32 dev_idx;
-	__u32 target_idx;
-	__u32 nfc_protocol;
-};
-
-#define NFC_LLCP_MAX_SERVICE_NAME 63
-struct sockaddr_nfc_llcp {
-	sa_family_t sa_family;
-	__u32 dev_idx;
-	__u32 target_idx;
-	__u32 nfc_protocol;
-	__u8 dsap; /* Destination SAP, if known */
-	__u8 ssap; /* Source SAP to be bound to */
-	char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */;
-	size_t service_name_len;
-};
-
-/* NFC socket protocols */
-#define NFC_SOCKPROTO_RAW	0
-#define NFC_SOCKPROTO_LLCP	1
-#define NFC_SOCKPROTO_MAX	2
-
-#define NFC_HEADER_SIZE 1
-
-/**
- * Pseudo-header info for raw socket packets
- * First byte is the adapter index
- * Second byte contains flags
- *  - 0x01 - Direction (0=RX, 1=TX)
- *  - 0x02-0x04 - Payload type (000=LLCP, 001=NCI, 010=HCI, 011=Digital,
- *                              100=Proprietary)
- *  - 0x05-0x80 - Reserved
- **/
-#define NFC_RAW_HEADER_SIZE	2
-#define NFC_DIRECTION_RX		0x00
-#define NFC_DIRECTION_TX		0x01
-
-#define RAW_PAYLOAD_LLCP 0
-#define RAW_PAYLOAD_NCI	1
-#define RAW_PAYLOAD_HCI	2
-#define RAW_PAYLOAD_DIGITAL	3
-#define RAW_PAYLOAD_PROPRIETARY	4
-
-/* socket option names */
-#define NFC_LLCP_RW		0
-#define NFC_LLCP_MIUX		1
-#define NFC_LLCP_REMOTE_MIU	2
-#define NFC_LLCP_REMOTE_LTO	3
-#define NFC_LLCP_REMOTE_RW	4
-
-#endif /*__LINUX_NFC_H */
diff --git a/openflow/usr/include/linux/nfs.h b/openflow/usr/include/linux/nfs.h
deleted file mode 100644
index 85a16dd..0000000
--- a/openflow/usr/include/linux/nfs.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * NFS protocol definitions
- *
- * This file contains constants mostly for Version 2 of the protocol,
- * but also has a couple of NFSv3 bits in (notably the error codes).
- */
-#ifndef _LINUX_NFS_H
-#define _LINUX_NFS_H
-
-#include <linux/types.h>
-
-#define NFS_PROGRAM	100003
-#define NFS_PORT	2049
-#define NFS_MAXDATA	8192
-#define NFS_MAXPATHLEN	1024
-#define NFS_MAXNAMLEN	255
-#define NFS_MAXGROUPS	16
-#define NFS_FHSIZE	32
-#define NFS_COOKIESIZE	4
-#define NFS_FIFO_DEV	(-1)
-#define NFSMODE_FMT	0170000
-#define NFSMODE_DIR	0040000
-#define NFSMODE_CHR	0020000
-#define NFSMODE_BLK	0060000
-#define NFSMODE_REG	0100000
-#define NFSMODE_LNK	0120000
-#define NFSMODE_SOCK	0140000
-#define NFSMODE_FIFO	0010000
-
-#define NFS_MNT_PROGRAM		100005
-#define NFS_MNT_VERSION		1
-#define NFS_MNT3_VERSION	3
-
-#define NFS_PIPE_DIRNAME "nfs"
-
-/*
- * NFS stats. The good thing with these values is that NFSv3 errors are
- * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which
- * no-one uses anyway), so we can happily mix code as long as we make sure
- * no NFSv3 errors are returned to NFSv2 clients.
- * Error codes that have a `--' in the v2 column are not part of the
- * standard, but seem to be widely used nevertheless.
- */
- enum nfs_stat {
-	NFS_OK = 0,			/* v2 v3 v4 */
-	NFSERR_PERM = 1,		/* v2 v3 v4 */
-	NFSERR_NOENT = 2,		/* v2 v3 v4 */
-	NFSERR_IO = 5,			/* v2 v3 v4 */
-	NFSERR_NXIO = 6,		/* v2 v3 v4 */
-	NFSERR_EAGAIN = 11,		/* v2 v3 */
-	NFSERR_ACCES = 13,		/* v2 v3 v4 */
-	NFSERR_EXIST = 17,		/* v2 v3 v4 */
-	NFSERR_XDEV = 18,		/*    v3 v4 */
-	NFSERR_NODEV = 19,		/* v2 v3 v4 */
-	NFSERR_NOTDIR = 20,		/* v2 v3 v4 */
-	NFSERR_ISDIR = 21,		/* v2 v3 v4 */
-	NFSERR_INVAL = 22,		/* v2 v3 v4 */
-	NFSERR_FBIG = 27,		/* v2 v3 v4 */
-	NFSERR_NOSPC = 28,		/* v2 v3 v4 */
-	NFSERR_ROFS = 30,		/* v2 v3 v4 */
-	NFSERR_MLINK = 31,		/*    v3 v4 */
-	NFSERR_OPNOTSUPP = 45,		/* v2 v3 */
-	NFSERR_NAMETOOLONG = 63,	/* v2 v3 v4 */
-	NFSERR_NOTEMPTY = 66,		/* v2 v3 v4 */
-	NFSERR_DQUOT = 69,		/* v2 v3 v4 */
-	NFSERR_STALE = 70,		/* v2 v3 v4 */
-	NFSERR_REMOTE = 71,		/* v2 v3 */
-	NFSERR_WFLUSH = 99,		/* v2    */
-	NFSERR_BADHANDLE = 10001,	/*    v3 v4 */
-	NFSERR_NOT_SYNC = 10002,	/*    v3 */
-	NFSERR_BAD_COOKIE = 10003,	/*    v3 v4 */
-	NFSERR_NOTSUPP = 10004,		/*    v3 v4 */
-	NFSERR_TOOSMALL = 10005,	/*    v3 v4 */
-	NFSERR_SERVERFAULT = 10006,	/*    v3 v4 */
-	NFSERR_BADTYPE = 10007,		/*    v3 v4 */
-	NFSERR_JUKEBOX = 10008,		/*    v3 v4 */
-	NFSERR_SAME = 10009,		/*       v4 */
-	NFSERR_DENIED = 10010,		/*       v4 */
-	NFSERR_EXPIRED = 10011,		/*       v4 */
-	NFSERR_LOCKED = 10012,		/*       v4 */
-	NFSERR_GRACE = 10013,		/*       v4 */
-	NFSERR_FHEXPIRED = 10014,	/*       v4 */
-	NFSERR_SHARE_DENIED = 10015,	/*       v4 */
-	NFSERR_WRONGSEC = 10016,	/*       v4 */
-	NFSERR_CLID_INUSE = 10017,	/*       v4 */
-	NFSERR_RESOURCE = 10018,	/*       v4 */
-	NFSERR_MOVED = 10019,		/*       v4 */
-	NFSERR_NOFILEHANDLE = 10020,	/*       v4 */
-	NFSERR_MINOR_VERS_MISMATCH = 10021,   /* v4 */
-	NFSERR_STALE_CLIENTID = 10022,	/*       v4 */
-	NFSERR_STALE_STATEID = 10023,   /*       v4 */
-	NFSERR_OLD_STATEID = 10024,     /*       v4 */
-	NFSERR_BAD_STATEID = 10025,     /*       v4 */  
-	NFSERR_BAD_SEQID = 10026,	/*       v4 */
-	NFSERR_NOT_SAME = 10027,	/*       v4 */
-	NFSERR_LOCK_RANGE = 10028,	/*       v4 */
-	NFSERR_SYMLINK = 10029,		/*       v4 */
-	NFSERR_RESTOREFH = 10030,	/*       v4 */
-	NFSERR_LEASE_MOVED = 10031,	/*       v4 */
-	NFSERR_ATTRNOTSUPP = 10032,	/*       v4 */
-	NFSERR_NO_GRACE = 10033,	/*       v4 */
-	NFSERR_RECLAIM_BAD = 10034,	/*       v4 */
-	NFSERR_RECLAIM_CONFLICT = 10035,/*       v4 */
-	NFSERR_BAD_XDR = 10036,		/*       v4 */
-	NFSERR_LOCKS_HELD = 10037,	/*       v4 */
-	NFSERR_OPENMODE = 10038,       /*       v4 */
-	NFSERR_BADOWNER = 10039,       /*       v4 */
-	NFSERR_BADCHAR = 10040,        /*       v4 */
-	NFSERR_BADNAME = 10041,        /*       v4 */
-	NFSERR_BAD_RANGE = 10042,      /*       v4 */
-	NFSERR_LOCK_NOTSUPP = 10043,   /*       v4 */
-	NFSERR_OP_ILLEGAL = 10044,     /*       v4 */
-	NFSERR_DEADLOCK = 10045,       /*       v4 */
-	NFSERR_FILE_OPEN = 10046,      /*       v4 */
-	NFSERR_ADMIN_REVOKED = 10047,  /*       v4 */
-	NFSERR_CB_PATH_DOWN = 10048,   /*       v4 */
-};
-
-/* NFSv2 file types - beware, these are not the same in NFSv3 */
-
-enum nfs_ftype {
-	NFNON = 0,
-	NFREG = 1,
-	NFDIR = 2,
-	NFBLK = 3,
-	NFCHR = 4,
-	NFLNK = 5,
-	NFSOCK = 6,
-	NFBAD = 7,
-	NFFIFO = 8
-};
-
-#endif /* _LINUX_NFS_H */
diff --git a/openflow/usr/include/linux/nfs2.h b/openflow/usr/include/linux/nfs2.h
deleted file mode 100644
index fde24b3..0000000
--- a/openflow/usr/include/linux/nfs2.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * NFS protocol definitions
- *
- * This file contains constants for Version 2 of the protocol.
- */
-#ifndef _LINUX_NFS2_H
-#define _LINUX_NFS2_H
-
-#define NFS2_PORT	2049
-#define NFS2_MAXDATA	8192
-#define NFS2_MAXPATHLEN	1024
-#define NFS2_MAXNAMLEN	255
-#define NFS2_MAXGROUPS	16
-#define NFS2_FHSIZE	32
-#define NFS2_COOKIESIZE	4
-#define NFS2_FIFO_DEV	(-1)
-#define NFS2MODE_FMT	0170000
-#define NFS2MODE_DIR	0040000
-#define NFS2MODE_CHR	0020000
-#define NFS2MODE_BLK	0060000
-#define NFS2MODE_REG	0100000
-#define NFS2MODE_LNK	0120000
-#define NFS2MODE_SOCK	0140000
-#define NFS2MODE_FIFO	0010000
-
-
-/* NFSv2 file types - beware, these are not the same in NFSv3 */
-enum nfs2_ftype {
-	NF2NON = 0,
-	NF2REG = 1,
-	NF2DIR = 2,
-	NF2BLK = 3,
-	NF2CHR = 4,
-	NF2LNK = 5,
-	NF2SOCK = 6,
-	NF2BAD = 7,
-	NF2FIFO = 8
-};
-
-struct nfs2_fh {
-	char			data[NFS2_FHSIZE];
-};
-
-/*
- * Procedure numbers for NFSv2
- */
-#define NFS2_VERSION		2
-#define NFSPROC_NULL		0
-#define NFSPROC_GETATTR		1
-#define NFSPROC_SETATTR		2
-#define NFSPROC_ROOT		3
-#define NFSPROC_LOOKUP		4
-#define NFSPROC_READLINK	5
-#define NFSPROC_READ		6
-#define NFSPROC_WRITECACHE	7
-#define NFSPROC_WRITE		8
-#define NFSPROC_CREATE		9
-#define NFSPROC_REMOVE		10
-#define NFSPROC_RENAME		11
-#define NFSPROC_LINK		12
-#define NFSPROC_SYMLINK		13
-#define NFSPROC_MKDIR		14
-#define NFSPROC_RMDIR		15
-#define NFSPROC_READDIR		16
-#define NFSPROC_STATFS		17
-
-#endif /* _LINUX_NFS2_H */
diff --git a/openflow/usr/include/linux/nfs3.h b/openflow/usr/include/linux/nfs3.h
deleted file mode 100644
index bacfe41..0000000
--- a/openflow/usr/include/linux/nfs3.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * NFSv3 protocol definitions
- */
-#ifndef _LINUX_NFS3_H
-#define _LINUX_NFS3_H
-
-#define NFS3_PORT		2049
-#define NFS3_MAXDATA		32768
-#define NFS3_MAXPATHLEN		PATH_MAX
-#define NFS3_MAXNAMLEN		NAME_MAX
-#define NFS3_MAXGROUPS		16
-#define NFS3_FHSIZE		64
-#define NFS3_COOKIESIZE		4
-#define NFS3_CREATEVERFSIZE	8
-#define NFS3_COOKIEVERFSIZE	8
-#define NFS3_WRITEVERFSIZE	8
-#define NFS3_FIFO_DEV		(-1)
-#define NFS3MODE_FMT		0170000
-#define NFS3MODE_DIR		0040000
-#define NFS3MODE_CHR		0020000
-#define NFS3MODE_BLK		0060000
-#define NFS3MODE_REG		0100000
-#define NFS3MODE_LNK		0120000
-#define NFS3MODE_SOCK		0140000
-#define NFS3MODE_FIFO		0010000
-
-/* Flags for access() call */
-#define NFS3_ACCESS_READ	0x0001
-#define NFS3_ACCESS_LOOKUP	0x0002
-#define NFS3_ACCESS_MODIFY	0x0004
-#define NFS3_ACCESS_EXTEND	0x0008
-#define NFS3_ACCESS_DELETE	0x0010
-#define NFS3_ACCESS_EXECUTE	0x0020
-#define NFS3_ACCESS_FULL	0x003f
-
-/* Flags for create mode */
-enum nfs3_createmode {
-	NFS3_CREATE_UNCHECKED = 0,
-	NFS3_CREATE_GUARDED = 1,
-	NFS3_CREATE_EXCLUSIVE = 2
-};
-
-/* NFSv3 file system properties */
-#define NFS3_FSF_LINK		0x0001
-#define NFS3_FSF_SYMLINK	0x0002
-#define NFS3_FSF_HOMOGENEOUS	0x0008
-#define NFS3_FSF_CANSETTIME	0x0010
-/* Some shorthands. See fs/nfsd/nfs3proc.c */
-#define NFS3_FSF_DEFAULT	0x001B
-#define NFS3_FSF_BILLYBOY	0x0018
-#define NFS3_FSF_READONLY	0x0008
-
-enum nfs3_ftype {
-	NF3NON  = 0,
-	NF3REG  = 1,
-	NF3DIR  = 2,
-	NF3BLK  = 3,
-	NF3CHR  = 4,
-	NF3LNK  = 5,
-	NF3SOCK = 6,
-	NF3FIFO = 7,	/* changed from NFSv2 (was 8) */
-	NF3BAD  = 8
-};
-
-struct nfs3_fh {
-	unsigned short size;
-	unsigned char  data[NFS3_FHSIZE];
-};
-
-#define NFS3_VERSION		3
-#define NFS3PROC_NULL		0
-#define NFS3PROC_GETATTR	1
-#define NFS3PROC_SETATTR	2
-#define NFS3PROC_LOOKUP		3
-#define NFS3PROC_ACCESS		4
-#define NFS3PROC_READLINK	5
-#define NFS3PROC_READ		6
-#define NFS3PROC_WRITE		7
-#define NFS3PROC_CREATE		8
-#define NFS3PROC_MKDIR		9
-#define NFS3PROC_SYMLINK	10
-#define NFS3PROC_MKNOD		11
-#define NFS3PROC_REMOVE		12
-#define NFS3PROC_RMDIR		13
-#define NFS3PROC_RENAME		14
-#define NFS3PROC_LINK		15
-#define NFS3PROC_READDIR	16
-#define NFS3PROC_READDIRPLUS	17
-#define NFS3PROC_FSSTAT		18
-#define NFS3PROC_FSINFO		19
-#define NFS3PROC_PATHCONF	20
-#define NFS3PROC_COMMIT		21
-
-#define NFS_MNT3_VERSION	3
- 
-
-#endif /* _LINUX_NFS3_H */
diff --git a/openflow/usr/include/linux/nfs4.h b/openflow/usr/include/linux/nfs4.h
deleted file mode 100644
index 5ab38ab..0000000
--- a/openflow/usr/include/linux/nfs4.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  include/linux/nfs4.h
- *
- *  NFSv4 protocol definitions.
- *
- *  Copyright (c) 2002 The Regents of the University of Michigan.
- *  All rights reserved.
- *
- *  Kendrick Smith <kmsmith@umich.edu>
- *  Andy Adamson   <andros@umich.edu>
- */
-
-#ifndef _LINUX_NFS4_H
-#define _LINUX_NFS4_H
-
-#include <linux/types.h>
-
-#define NFS4_BITMAP_SIZE	3
-#define NFS4_VERIFIER_SIZE	8
-#define NFS4_STATEID_SEQID_SIZE 4
-#define NFS4_STATEID_OTHER_SIZE 12
-#define NFS4_STATEID_SIZE	(NFS4_STATEID_SEQID_SIZE + NFS4_STATEID_OTHER_SIZE)
-#define NFS4_FHSIZE		128
-#define NFS4_MAXPATHLEN		PATH_MAX
-#define NFS4_MAXNAMLEN		NAME_MAX
-#define NFS4_OPAQUE_LIMIT	1024
-#define NFS4_MAX_SESSIONID_LEN	16
-
-#define NFS4_ACCESS_READ        0x0001
-#define NFS4_ACCESS_LOOKUP      0x0002
-#define NFS4_ACCESS_MODIFY      0x0004
-#define NFS4_ACCESS_EXTEND      0x0008
-#define NFS4_ACCESS_DELETE      0x0010
-#define NFS4_ACCESS_EXECUTE     0x0020
-
-#define NFS4_FH_PERSISTENT		0x0000
-#define NFS4_FH_NOEXPIRE_WITH_OPEN	0x0001
-#define NFS4_FH_VOLATILE_ANY		0x0002
-#define NFS4_FH_VOL_MIGRATION		0x0004
-#define NFS4_FH_VOL_RENAME		0x0008
-
-#define NFS4_OPEN_RESULT_CONFIRM 0x0002
-#define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x0004
-
-#define NFS4_SHARE_ACCESS_MASK	0x000F
-#define NFS4_SHARE_ACCESS_READ	0x0001
-#define NFS4_SHARE_ACCESS_WRITE	0x0002
-#define NFS4_SHARE_ACCESS_BOTH	0x0003
-#define NFS4_SHARE_DENY_READ	0x0001
-#define NFS4_SHARE_DENY_WRITE	0x0002
-#define NFS4_SHARE_DENY_BOTH	0x0003
-
-/* nfs41 */
-#define NFS4_SHARE_WANT_MASK		0xFF00
-#define NFS4_SHARE_WANT_NO_PREFERENCE	0x0000
-#define NFS4_SHARE_WANT_READ_DELEG	0x0100
-#define NFS4_SHARE_WANT_WRITE_DELEG	0x0200
-#define NFS4_SHARE_WANT_ANY_DELEG	0x0300
-#define NFS4_SHARE_WANT_NO_DELEG	0x0400
-#define NFS4_SHARE_WANT_CANCEL		0x0500
-
-#define NFS4_SHARE_WHEN_MASK		0xF0000
-#define NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL	0x10000
-#define NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED		0x20000
-
-#define NFS4_CDFC4_FORE	0x1
-#define NFS4_CDFC4_BACK 0x2
-#define NFS4_CDFC4_BOTH 0x3
-#define NFS4_CDFC4_FORE_OR_BOTH 0x3
-#define NFS4_CDFC4_BACK_OR_BOTH 0x7
-
-#define NFS4_CDFS4_FORE 0x1
-#define NFS4_CDFS4_BACK 0x2
-#define NFS4_CDFS4_BOTH 0x3
-
-#define NFS4_SET_TO_SERVER_TIME	0
-#define NFS4_SET_TO_CLIENT_TIME	1
-
-#define NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE 0
-#define NFS4_ACE_ACCESS_DENIED_ACE_TYPE  1
-#define NFS4_ACE_SYSTEM_AUDIT_ACE_TYPE   2
-#define NFS4_ACE_SYSTEM_ALARM_ACE_TYPE   3
-
-#define ACL4_SUPPORT_ALLOW_ACL 0x01
-#define ACL4_SUPPORT_DENY_ACL  0x02
-#define ACL4_SUPPORT_AUDIT_ACL 0x04
-#define ACL4_SUPPORT_ALARM_ACL 0x08
-
-#define NFS4_ACL_AUTO_INHERIT 0x00000001
-#define NFS4_ACL_PROTECTED    0x00000002
-#define NFS4_ACL_DEFAULTED    0x00000004
-
-#define NFS4_ACE_FILE_INHERIT_ACE             0x00000001
-#define NFS4_ACE_DIRECTORY_INHERIT_ACE        0x00000002
-#define NFS4_ACE_NO_PROPAGATE_INHERIT_ACE     0x00000004
-#define NFS4_ACE_INHERIT_ONLY_ACE             0x00000008
-#define NFS4_ACE_SUCCESSFUL_ACCESS_ACE_FLAG   0x00000010
-#define NFS4_ACE_FAILED_ACCESS_ACE_FLAG       0x00000020
-#define NFS4_ACE_IDENTIFIER_GROUP             0x00000040
-#define NFS4_ACE_INHERITED_ACE                0x00000080
-
-#define NFS4_ACE_READ_DATA                    0x00000001
-#define NFS4_ACE_LIST_DIRECTORY               0x00000001
-#define NFS4_ACE_WRITE_DATA                   0x00000002
-#define NFS4_ACE_ADD_FILE                     0x00000002
-#define NFS4_ACE_APPEND_DATA                  0x00000004
-#define NFS4_ACE_ADD_SUBDIRECTORY             0x00000004
-#define NFS4_ACE_READ_NAMED_ATTRS             0x00000008
-#define NFS4_ACE_WRITE_NAMED_ATTRS            0x00000010
-#define NFS4_ACE_EXECUTE                      0x00000020
-#define NFS4_ACE_DELETE_CHILD                 0x00000040
-#define NFS4_ACE_READ_ATTRIBUTES              0x00000080
-#define NFS4_ACE_WRITE_ATTRIBUTES             0x00000100
-#define NFS4_ACE_WRITE_RETENTION              0x00000200
-#define NFS4_ACE_WRITE_RETENTION_HOLD         0x00000400
-#define NFS4_ACE_DELETE                       0x00010000
-#define NFS4_ACE_READ_ACL                     0x00020000
-#define NFS4_ACE_WRITE_ACL                    0x00040000
-#define NFS4_ACE_WRITE_OWNER                  0x00080000
-#define NFS4_ACE_SYNCHRONIZE                  0x00100000
-#define NFS4_ACE_GENERIC_READ                 0x00120081
-#define NFS4_ACE_GENERIC_WRITE                0x00160106
-#define NFS4_ACE_GENERIC_EXECUTE              0x001200A0
-#define NFS4_ACE_MASK_ALL                     0x001F01FF
-
-#define EXCHGID4_FLAG_SUPP_MOVED_REFER		0x00000001
-#define EXCHGID4_FLAG_SUPP_MOVED_MIGR		0x00000002
-#define EXCHGID4_FLAG_BIND_PRINC_STATEID	0x00000100
-
-#define EXCHGID4_FLAG_USE_NON_PNFS		0x00010000
-#define EXCHGID4_FLAG_USE_PNFS_MDS		0x00020000
-#define EXCHGID4_FLAG_USE_PNFS_DS		0x00040000
-#define EXCHGID4_FLAG_MASK_PNFS			0x00070000
-
-#define EXCHGID4_FLAG_UPD_CONFIRMED_REC_A	0x40000000
-#define EXCHGID4_FLAG_CONFIRMED_R		0x80000000
-/*
- * Since the validity of these bits depends on whether
- * they're set in the argument or response, have separate
- * invalid flag masks for arg (_A) and resp (_R).
- */
-#define EXCHGID4_FLAG_MASK_A			0x40070103
-#define EXCHGID4_FLAG_MASK_R			0x80070103
-
-#define SEQ4_STATUS_CB_PATH_DOWN		0x00000001
-#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRING	0x00000002
-#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRED	0x00000004
-#define SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED	0x00000008
-#define SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED	0x00000010
-#define SEQ4_STATUS_ADMIN_STATE_REVOKED		0x00000020
-#define SEQ4_STATUS_RECALLABLE_STATE_REVOKED	0x00000040
-#define SEQ4_STATUS_LEASE_MOVED			0x00000080
-#define SEQ4_STATUS_RESTART_RECLAIM_NEEDED	0x00000100
-#define SEQ4_STATUS_CB_PATH_DOWN_SESSION	0x00000200
-#define SEQ4_STATUS_BACKCHANNEL_FAULT		0x00000400
-
-#define NFS4_SECINFO_STYLE4_CURRENT_FH	0
-#define NFS4_SECINFO_STYLE4_PARENT	1
-
-#define NFS4_MAX_UINT64	(~(__u64)0)
-
-/* An NFS4 sessions server must support at least NFS4_MAX_OPS operations.
- * If a compound requires more operations, adjust NFS4_MAX_OPS accordingly.
- */
-#define NFS4_MAX_OPS   8
-
-/* Our NFS4 client back channel server only wants the cb_sequene and the
- * actual operation per compound
- */
-#define NFS4_MAX_BACK_CHANNEL_OPS 2
-
-#endif /* _LINUX_NFS4_H */
-
-/*
- * Local variables:
- *  c-basic-offset: 8
- * End:
- */
diff --git a/openflow/usr/include/linux/nfs4_mount.h b/openflow/usr/include/linux/nfs4_mount.h
deleted file mode 100644
index f4ff32d..0000000
--- a/openflow/usr/include/linux/nfs4_mount.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef _LINUX_NFS4_MOUNT_H
-#define _LINUX_NFS4_MOUNT_H
-
-/*
- *  linux/include/linux/nfs4_mount.h
- *
- *  Copyright (C) 2002  Trond Myklebust
- *
- *  structure passed from user-space to kernel-space during an nfsv4 mount
- */
-
-/*
- * WARNING!  Do not delete or change the order of these fields.  If
- * a new field is required then add it to the end.  The version field
- * tracks which fields are present.  This will ensure some measure of
- * mount-to-kernel version compatibility.  Some of these aren't used yet
- * but here they are anyway.
- */
-#define NFS4_MOUNT_VERSION	1
-
-struct nfs_string {
-	unsigned int len;
-	const char * data;
-};
-
-struct nfs4_mount_data {
-	int version;				/* 1 */
-	int flags;				/* 1 */
-	int rsize;				/* 1 */
-	int wsize;				/* 1 */
-	int timeo;				/* 1 */
-	int retrans;				/* 1 */
-	int acregmin;				/* 1 */
-	int acregmax;				/* 1 */
-	int acdirmin;				/* 1 */
-	int acdirmax;				/* 1 */
-
-	/* see the definition of 'struct clientaddr4' in RFC3010 */
-	struct nfs_string client_addr;		/* 1 */
-
-	/* Mount path */
-	struct nfs_string mnt_path;		/* 1 */
-
-	/* Server details */
-	struct nfs_string hostname;		/* 1 */
-	/* Server IP address */
-	unsigned int host_addrlen;		/* 1 */
-	struct sockaddr * host_addr;	/* 1 */
-
-	/* Transport protocol to use */
-	int proto;				/* 1 */
-
-	/* Pseudo-flavours to use for authentication. See RFC2623 */
-	int auth_flavourlen;			/* 1 */
-	int *auth_flavours;		/* 1 */
-};
-
-/* bits in the flags field */
-/* Note: the fields that correspond to existing NFSv2/v3 mount options
- * 	 should mirror the values from include/linux/nfs_mount.h
- */
-
-#define NFS4_MOUNT_SOFT		0x0001	/* 1 */
-#define NFS4_MOUNT_INTR		0x0002	/* 1 */
-#define NFS4_MOUNT_NOCTO	0x0010	/* 1 */
-#define NFS4_MOUNT_NOAC		0x0020	/* 1 */
-#define NFS4_MOUNT_STRICTLOCK	0x1000	/* 1 */
-#define NFS4_MOUNT_UNSHARED	0x8000	/* 1 */
-#define NFS4_MOUNT_FLAGMASK	0x9033
-
-#endif
diff --git a/openflow/usr/include/linux/nfs_fs.h b/openflow/usr/include/linux/nfs_fs.h
deleted file mode 100644
index 99e509a..0000000
--- a/openflow/usr/include/linux/nfs_fs.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  linux/include/linux/nfs_fs.h
- *
- *  Copyright (C) 1992  Rick Sladkey
- *
- *  OS-specific nfs filesystem definitions and declarations
- */
-
-#ifndef _LINUX_NFS_FS_H
-#define _LINUX_NFS_FS_H
-
-#include <linux/magic.h>
-
-/* Default timeout values */
-#define NFS_DEF_UDP_TIMEO	(11)
-#define NFS_DEF_UDP_RETRANS	(3)
-#define NFS_DEF_TCP_TIMEO	(600)
-#define NFS_DEF_TCP_RETRANS	(2)
-
-#define NFS_MAX_UDP_TIMEOUT	(60*HZ)
-#define NFS_MAX_TCP_TIMEOUT	(600*HZ)
-
-#define NFS_DEF_ACREGMIN	(3)
-#define NFS_DEF_ACREGMAX	(60)
-#define NFS_DEF_ACDIRMIN	(30)
-#define NFS_DEF_ACDIRMAX	(60)
-
-/*
- * When flushing a cluster of dirty pages, there can be different
- * strategies:
- */
-#define FLUSH_SYNC		1	/* file being synced, or contention */
-#define FLUSH_STABLE		4	/* commit to stable storage */
-#define FLUSH_LOWPRI		8	/* low priority background flush */
-#define FLUSH_HIGHPRI		16	/* high priority memory reclaim flush */
-#define FLUSH_COND_STABLE	32	/* conditional stable write - only stable
-					 * if everything fits in one RPC */
-
-
-/*
- * NFS debug flags
- */
-#define NFSDBG_VFS		0x0001
-#define NFSDBG_DIRCACHE		0x0002
-#define NFSDBG_LOOKUPCACHE	0x0004
-#define NFSDBG_PAGECACHE	0x0008
-#define NFSDBG_PROC		0x0010
-#define NFSDBG_XDR		0x0020
-#define NFSDBG_FILE		0x0040
-#define NFSDBG_ROOT		0x0080
-#define NFSDBG_CALLBACK		0x0100
-#define NFSDBG_CLIENT		0x0200
-#define NFSDBG_MOUNT		0x0400
-#define NFSDBG_FSCACHE		0x0800
-#define NFSDBG_PNFS		0x1000
-#define NFSDBG_PNFS_LD		0x2000
-#define NFSDBG_STATE		0x4000
-#define NFSDBG_ALL		0xFFFF
-
-
-#endif /* _LINUX_NFS_FS_H */
diff --git a/openflow/usr/include/linux/nfs_idmap.h b/openflow/usr/include/linux/nfs_idmap.h
deleted file mode 100644
index 1296067..0000000
--- a/openflow/usr/include/linux/nfs_idmap.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * include/uapi/linux/nfs_idmap.h
- *
- *  UID and GID to name mapping for clients.
- *
- *  Copyright (c) 2002 The Regents of the University of Michigan.
- *  All rights reserved.
- *
- *  Marius Aamodt Eriksen <marius@umich.edu>
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the University nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef NFS_IDMAP_H
-#define NFS_IDMAP_H
-
-#include <linux/types.h>
-
-/* XXX from bits/utmp.h  */
-#define IDMAP_NAMESZ  128
-
-#define IDMAP_TYPE_USER  0
-#define IDMAP_TYPE_GROUP 1
-
-#define IDMAP_CONV_IDTONAME 0
-#define IDMAP_CONV_NAMETOID 1
-
-#define IDMAP_STATUS_INVALIDMSG 0x01
-#define IDMAP_STATUS_AGAIN      0x02
-#define IDMAP_STATUS_LOOKUPFAIL 0x04
-#define IDMAP_STATUS_SUCCESS    0x08
-
-struct idmap_msg {
-	__u8  im_type;
-	__u8  im_conv;
-	char  im_name[IDMAP_NAMESZ];
-	__u32 im_id;
-	__u8  im_status;
-};
-
-
-#endif /* NFS_IDMAP_H */
diff --git a/openflow/usr/include/linux/nfs_mount.h b/openflow/usr/include/linux/nfs_mount.h
deleted file mode 100644
index 64b0f22..0000000
--- a/openflow/usr/include/linux/nfs_mount.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef _LINUX_NFS_MOUNT_H
-#define _LINUX_NFS_MOUNT_H
-
-/*
- *  linux/include/linux/nfs_mount.h
- *
- *  Copyright (C) 1992  Rick Sladkey
- *
- *  structure passed from user-space to kernel-space during an nfs mount
- */
-#include <linux/in.h>
-#include <linux/nfs.h>
-#include <linux/nfs2.h>
-#include <linux/nfs3.h>
-
-/*
- * WARNING!  Do not delete or change the order of these fields.  If
- * a new field is required then add it to the end.  The version field
- * tracks which fields are present.  This will ensure some measure of
- * mount-to-kernel version compatibility.  Some of these aren't used yet
- * but here they are anyway.
- */
-#define NFS_MOUNT_VERSION	6
-#define NFS_MAX_CONTEXT_LEN	256
-
-struct nfs_mount_data {
-	int		version;		/* 1 */
-	int		fd;			/* 1 */
-	struct nfs2_fh	old_root;		/* 1 */
-	int		flags;			/* 1 */
-	int		rsize;			/* 1 */
-	int		wsize;			/* 1 */
-	int		timeo;			/* 1 */
-	int		retrans;		/* 1 */
-	int		acregmin;		/* 1 */
-	int		acregmax;		/* 1 */
-	int		acdirmin;		/* 1 */
-	int		acdirmax;		/* 1 */
-	struct sockaddr_in addr;		/* 1 */
-	char		hostname[NFS_MAXNAMLEN + 1];		/* 1 */
-	int		namlen;			/* 2 */
-	unsigned int	bsize;			/* 3 */
-	struct nfs3_fh	root;			/* 4 */
-	int		pseudoflavor;		/* 5 */
-	char		context[NFS_MAX_CONTEXT_LEN + 1];	/* 6 */
-};
-
-/* bits in the flags field visible to user space */
-
-#define NFS_MOUNT_SOFT		0x0001	/* 1 */
-#define NFS_MOUNT_INTR		0x0002	/* 1 */ /* now unused, but ABI */
-#define NFS_MOUNT_SECURE	0x0004	/* 1 */
-#define NFS_MOUNT_POSIX		0x0008	/* 1 */
-#define NFS_MOUNT_NOCTO		0x0010	/* 1 */
-#define NFS_MOUNT_NOAC		0x0020	/* 1 */
-#define NFS_MOUNT_TCP		0x0040	/* 2 */
-#define NFS_MOUNT_VER3		0x0080	/* 3 */
-#define NFS_MOUNT_KERBEROS	0x0100	/* 3 */
-#define NFS_MOUNT_NONLM		0x0200	/* 3 */
-#define NFS_MOUNT_BROKEN_SUID	0x0400	/* 4 */
-#define NFS_MOUNT_NOACL		0x0800	/* 4 */
-#define NFS_MOUNT_STRICTLOCK	0x1000	/* reserved for NFSv4 */
-#define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 non-text parsed mount data only */
-#define NFS_MOUNT_NORDIRPLUS	0x4000	/* 5 */
-#define NFS_MOUNT_UNSHARED	0x8000	/* 5 */
-#define NFS_MOUNT_FLAGMASK	0xFFFF
-
-/* The following are for internal use only */
-#define NFS_MOUNT_LOOKUP_CACHE_NONEG	0x10000
-#define NFS_MOUNT_LOOKUP_CACHE_NONE	0x20000
-#define NFS_MOUNT_NORESVPORT		0x40000
-#define NFS_MOUNT_LEGACY_INTERFACE	0x80000
-
-#define NFS_MOUNT_LOCAL_FLOCK	0x100000
-#define NFS_MOUNT_LOCAL_FCNTL	0x200000
-
-#endif
diff --git a/openflow/usr/include/linux/nfsacl.h b/openflow/usr/include/linux/nfsacl.h
deleted file mode 100644
index 67b3763..0000000
--- a/openflow/usr/include/linux/nfsacl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * File: linux/nfsacl.h
- *
- * (C) 2003 Andreas Gruenbacher <agruen@suse.de>
- */
-#ifndef __LINUX_NFSACL_H
-#define __LINUX_NFSACL_H
-
-#define NFS_ACL_PROGRAM	100227
-
-#define ACLPROC2_GETACL		1
-#define ACLPROC2_SETACL		2
-#define ACLPROC2_GETATTR	3
-#define ACLPROC2_ACCESS		4
-
-#define ACLPROC3_GETACL		1
-#define ACLPROC3_SETACL		2
-
-
-/* Flags for the getacl/setacl mode */
-#define NFS_ACL			0x0001
-#define NFS_ACLCNT		0x0002
-#define NFS_DFACL		0x0004
-#define NFS_DFACLCNT		0x0008
-#define NFS_ACL_MASK		0x000f
-
-/* Flag for Default ACL entries */
-#define NFS_ACL_DEFAULT		0x1000
-
-#endif /* __LINUX_NFSACL_H */
diff --git a/openflow/usr/include/linux/nfsd/cld.h b/openflow/usr/include/linux/nfsd/cld.h
deleted file mode 100644
index f14a9ab..0000000
--- a/openflow/usr/include/linux/nfsd/cld.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Upcall description for nfsdcld communication
- *
- * Copyright (c) 2012 Red Hat, Inc.
- * Author(s): Jeff Layton <jlayton@redhat.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _NFSD_CLD_H
-#define _NFSD_CLD_H
-
-/* latest upcall version available */
-#define CLD_UPCALL_VERSION 1
-
-/* defined by RFC3530 */
-#define NFS4_OPAQUE_LIMIT 1024
-
-enum cld_command {
-	Cld_Create,		/* create a record for this cm_id */
-	Cld_Remove,		/* remove record of this cm_id */
-	Cld_Check,		/* is this cm_id allowed? */
-	Cld_GraceDone,		/* grace period is complete */
-};
-
-/* representation of long-form NFSv4 client ID */
-struct cld_name {
-	uint16_t	cn_len;				/* length of cm_id */
-	unsigned char	cn_id[NFS4_OPAQUE_LIMIT];	/* client-provided */
-} __attribute__((packed));
-
-/* message struct for communication with userspace */
-struct cld_msg {
-	uint8_t		cm_vers;		/* upcall version */
-	uint8_t		cm_cmd;			/* upcall command */
-	int16_t		cm_status;		/* return code */
-	uint32_t	cm_xid;			/* transaction id */
-	union {
-		int64_t		cm_gracetime;	/* grace period start time */
-		struct cld_name	cm_name;
-	} __attribute__((packed)) cm_u;
-} __attribute__((packed));
-
-#endif /* !_NFSD_CLD_H */
diff --git a/openflow/usr/include/linux/nfsd/debug.h b/openflow/usr/include/linux/nfsd/debug.h
deleted file mode 100644
index 6b1f912..0000000
--- a/openflow/usr/include/linux/nfsd/debug.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * linux/include/linux/nfsd/debug.h
- *
- * Debugging-related stuff for nfsd
- *
- * Copyright (C) 1995 Olaf Kirch <okir@monad.swb.de>
- */
-
-#ifndef LINUX_NFSD_DEBUG_H
-#define LINUX_NFSD_DEBUG_H
-
-#include <linux/sunrpc/debug.h>
-
-/*
- * knfsd debug flags
- */
-#define NFSDDBG_SOCK		0x0001
-#define NFSDDBG_FH		0x0002
-#define NFSDDBG_EXPORT		0x0004
-#define NFSDDBG_SVC		0x0008
-#define NFSDDBG_PROC		0x0010
-#define NFSDDBG_FILEOP		0x0020
-#define NFSDDBG_AUTH		0x0040
-#define NFSDDBG_REPCACHE	0x0080
-#define NFSDDBG_XDR		0x0100
-#define NFSDDBG_LOCKD		0x0200
-#define NFSDDBG_PNFS		0x0400
-#define NFSDDBG_ALL		0x7FFF
-#define NFSDDBG_NOCHANGE	0xFFFF
-
-
-
-#endif /* LINUX_NFSD_DEBUG_H */
diff --git a/openflow/usr/include/linux/nfsd/export.h b/openflow/usr/include/linux/nfsd/export.h
deleted file mode 100644
index 407d25c..0000000
--- a/openflow/usr/include/linux/nfsd/export.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * include/linux/nfsd/export.h
- * 
- * Public declarations for NFS exports. The definitions for the
- * syscall interface are in nfsctl.h
- *
- * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
- */
-
-#ifndef NFSD_EXPORT_H
-#define NFSD_EXPORT_H
-
-# include <linux/types.h>
-
-/*
- * Important limits for the exports stuff.
- */
-#define NFSCLNT_IDMAX		1024
-#define NFSCLNT_ADDRMAX		16
-#define NFSCLNT_KEYMAX		32
-
-/*
- * Export flags.
- *
- * Please update the expflags[] array in fs/nfsd/export.c when adding
- * a new flag.
- */
-#define NFSEXP_READONLY		0x0001
-#define NFSEXP_INSECURE_PORT	0x0002
-#define NFSEXP_ROOTSQUASH	0x0004
-#define NFSEXP_ALLSQUASH	0x0008
-#define NFSEXP_ASYNC		0x0010
-#define NFSEXP_GATHERED_WRITES	0x0020
-#define NFSEXP_NOREADDIRPLUS    0x0040
-/* 80 100 currently unused */
-#define NFSEXP_NOHIDE		0x0200
-#define NFSEXP_NOSUBTREECHECK	0x0400
-#define	NFSEXP_NOAUTHNLM	0x0800		/* Don't authenticate NLM requests - just trust */
-#define NFSEXP_MSNFS		0x1000	/* do silly things that MS clients expect; no longer supported */
-#define NFSEXP_FSID		0x2000
-#define	NFSEXP_CROSSMOUNT	0x4000
-#define	NFSEXP_NOACL		0x8000	/* reserved for possible ACL related use */
-/*
- * The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4
- * clients, and only to the single directory that is the root of the
- * export; further lookup and readdir operations are treated as if every
- * subdirectory was a mountpoint, and ignored if they are not themselves
- * exported.  This is used by nfsd and mountd to construct the NFSv4
- * pseudofilesystem, which provides access only to paths leading to each
- * exported filesystem.
- */
-#define	NFSEXP_V4ROOT		0x10000
-#define NFSEXP_PNFS		0x20000
-
-/* All flags that we claim to support.  (Note we don't support NOACL.) */
-#define NFSEXP_ALLFLAGS		0x3FE7F
-
-/* The flags that may vary depending on security flavor: */
-#define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
-					| NFSEXP_ALLSQUASH \
-					| NFSEXP_INSECURE_PORT)
-
-
-#endif /* NFSD_EXPORT_H */
diff --git a/openflow/usr/include/linux/nfsd/nfsfh.h b/openflow/usr/include/linux/nfsd/nfsfh.h
deleted file mode 100644
index beb05e9..0000000
--- a/openflow/usr/include/linux/nfsd/nfsfh.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * This file describes the layout of the file handles as passed
- * over the wire.
- *
- * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
- */
-
-#ifndef _LINUX_NFSD_FH_H
-#define _LINUX_NFSD_FH_H
-
-#include <linux/types.h>
-#include <linux/nfs.h>
-#include <linux/nfs2.h>
-#include <linux/nfs3.h>
-#include <linux/nfs4.h>
-
-/*
- * This is the old "dentry style" Linux NFSv2 file handle.
- *
- * The xino and xdev fields are currently used to transport the
- * ino/dev of the exported inode.
- */
-struct nfs_fhbase_old {
-	__u32		fb_dcookie;	/* dentry cookie - always 0xfeebbaca */
-	__u32		fb_ino;		/* our inode number */
-	__u32		fb_dirino;	/* dir inode number, 0 for directories */
-	__u32		fb_dev;		/* our device */
-	__u32		fb_xdev;
-	__u32		fb_xino;
-	__u32		fb_generation;
-};
-
-/*
- * This is the new flexible, extensible style NFSv2/v3/v4 file handle.
- * by Neil Brown <neilb@cse.unsw.edu.au> - March 2000
- *
- * The file handle starts with a sequence of four-byte words.
- * The first word contains a version number (1) and three descriptor bytes
- * that tell how the remaining 3 variable length fields should be handled.
- * These three bytes are auth_type, fsid_type and fileid_type.
- *
- * All four-byte values are in host-byte-order.
- *
- * The auth_type field is deprecated and must be set to 0.
- *
- * The fsid_type identifies how the filesystem (or export point) is
- *    encoded.
- *  Current values:
- *     0  - 4 byte device id (ms-2-bytes major, ls-2-bytes minor), 4byte inode number
- *        NOTE: we cannot use the kdev_t device id value, because kdev_t.h
- *              says we mustn't.  We must break it up and reassemble.
- *     1  - 4 byte user specified identifier
- *     2  - 4 byte major, 4 byte minor, 4 byte inode number - DEPRECATED
- *     3  - 4 byte device id, encoded for user-space, 4 byte inode number
- *     4  - 4 byte inode number and 4 byte uuid
- *     5  - 8 byte uuid
- *     6  - 16 byte uuid
- *     7  - 8 byte inode number and 16 byte uuid
- *
- * The fileid_type identified how the file within the filesystem is encoded.
- *   The values for this field are filesystem specific, exccept that
- *   filesystems must not use the values '0' or '0xff'. 'See enum fid_type'
- *   in include/linux/exportfs.h for currently registered values.
- */
-struct nfs_fhbase_new {
-	__u8		fb_version;	/* == 1, even => nfs_fhbase_old */
-	__u8		fb_auth_type;
-	__u8		fb_fsid_type;
-	__u8		fb_fileid_type;
-	__u32		fb_auth[1];
-/*	__u32		fb_fsid[0]; floating */
-/*	__u32		fb_fileid[0]; floating */
-};
-
-struct knfsd_fh {
-	unsigned int	fh_size;	/* significant for NFSv3.
-					 * Points to the current size while building
-					 * a new file handle
-					 */
-	union {
-		struct nfs_fhbase_old	fh_old;
-		__u32			fh_pad[NFS4_FHSIZE/4];
-		struct nfs_fhbase_new	fh_new;
-	} fh_base;
-};
-
-#define ofh_dcookie		fh_base.fh_old.fb_dcookie
-#define ofh_ino			fh_base.fh_old.fb_ino
-#define ofh_dirino		fh_base.fh_old.fb_dirino
-#define ofh_dev			fh_base.fh_old.fb_dev
-#define ofh_xdev		fh_base.fh_old.fb_xdev
-#define ofh_xino		fh_base.fh_old.fb_xino
-#define ofh_generation		fh_base.fh_old.fb_generation
-
-#define	fh_version		fh_base.fh_new.fb_version
-#define	fh_fsid_type		fh_base.fh_new.fb_fsid_type
-#define	fh_auth_type		fh_base.fh_new.fb_auth_type
-#define	fh_fileid_type		fh_base.fh_new.fb_fileid_type
-#define	fh_fsid			fh_base.fh_new.fb_auth
-
-/* Do not use, provided for userspace compatiblity. */
-#define	fh_auth			fh_base.fh_new.fb_auth
-
-#endif /* _LINUX_NFSD_FH_H */
diff --git a/openflow/usr/include/linux/nfsd/stats.h b/openflow/usr/include/linux/nfsd/stats.h
deleted file mode 100644
index b7024e8..0000000
--- a/openflow/usr/include/linux/nfsd/stats.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * linux/include/linux/nfsd/stats.h
- *
- * Statistics for NFS server.
- *
- * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
- */
-
-#ifndef LINUX_NFSD_STATS_H
-#define LINUX_NFSD_STATS_H
-
-#include <linux/nfs4.h>
-
-/* thread usage wraps very million seconds (approx one fortnight) */
-#define	NFSD_USAGE_WRAP	(HZ*1000000)
-
-#endif /* LINUX_NFSD_STATS_H */
diff --git a/openflow/usr/include/linux/nl80211.h b/openflow/usr/include/linux/nl80211.h
deleted file mode 100644
index 1f0b4cf..0000000
--- a/openflow/usr/include/linux/nl80211.h
+++ /dev/null
@@ -1,4647 +0,0 @@
-#ifndef __LINUX_NL80211_H
-#define __LINUX_NL80211_H
-/*
- * 802.11 netlink interface public header
- *
- * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2008 Michael Wu <flamingice@sourmilk.net>
- * Copyright 2008 Luis Carlos Cobo <luisca@cozybit.com>
- * Copyright 2008 Michael Buesch <m@bues.ch>
- * Copyright 2008, 2009 Luis R. Rodriguez <lrodriguez@atheros.com>
- * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
- * Copyright 2008 Colin McCabe <colin@cozybit.com>
- * Copyright 2015	Intel Deutschland GmbH
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-/*
- * This header file defines the userspace API to the wireless stack. Please
- * be careful not to break things - i.e. don't move anything around or so
- * unless you can demonstrate that it breaks neither API nor ABI.
- *
- * Additions to the API should be accompanied by actual implementations in
- * an upstream driver, so that example implementations exist in case there
- * are ever concerns about the precise semantics of the API or changes are
- * needed, and to ensure that code for dead (no longer implemented) API
- * can actually be identified and removed.
- * Nonetheless, semantics should also be documented carefully in this file.
- */
-
-#include <linux/types.h>
-
-#define NL80211_GENL_NAME "nl80211"
-
-#define NL80211_MULTICAST_GROUP_CONFIG		"config"
-#define NL80211_MULTICAST_GROUP_SCAN		"scan"
-#define NL80211_MULTICAST_GROUP_REG		"regulatory"
-#define NL80211_MULTICAST_GROUP_MLME		"mlme"
-#define NL80211_MULTICAST_GROUP_VENDOR		"vendor"
-#define NL80211_MULTICAST_GROUP_TESTMODE	"testmode"
-
-/**
- * DOC: Station handling
- *
- * Stations are added per interface, but a special case exists with VLAN
- * interfaces. When a station is bound to an AP interface, it may be moved
- * into a VLAN identified by a VLAN interface index (%NL80211_ATTR_STA_VLAN).
- * The station is still assumed to belong to the AP interface it was added
- * to.
- *
- * Station handling varies per interface type and depending on the driver's
- * capabilities.
- *
- * For drivers supporting TDLS with external setup (WIPHY_FLAG_SUPPORTS_TDLS
- * and WIPHY_FLAG_TDLS_EXTERNAL_SETUP), the station lifetime is as follows:
- *  - a setup station entry is added, not yet authorized, without any rate
- *    or capability information, this just exists to avoid race conditions
- *  - when the TDLS setup is done, a single NL80211_CMD_SET_STATION is valid
- *    to add rate and capability information to the station and at the same
- *    time mark it authorized.
- *  - %NL80211_TDLS_ENABLE_LINK is then used
- *  - after this, the only valid operation is to remove it by tearing down
- *    the TDLS link (%NL80211_TDLS_DISABLE_LINK)
- *
- * TODO: need more info for other interface types
- */
-
-/**
- * DOC: Frame transmission/registration support
- *
- * Frame transmission and registration support exists to allow userspace
- * management entities such as wpa_supplicant react to management frames
- * that are not being handled by the kernel. This includes, for example,
- * certain classes of action frames that cannot be handled in the kernel
- * for various reasons.
- *
- * Frame registration is done on a per-interface basis and registrations
- * cannot be removed other than by closing the socket. It is possible to
- * specify a registration filter to register, for example, only for a
- * certain type of action frame. In particular with action frames, those
- * that userspace registers for will not be returned as unhandled by the
- * driver, so that the registered application has to take responsibility
- * for doing that.
- *
- * The type of frame that can be registered for is also dependent on the
- * driver and interface type. The frame types are advertised in wiphy
- * attributes so applications know what to expect.
- *
- * NOTE: When an interface changes type while registrations are active,
- *       these registrations are ignored until the interface type is
- *       changed again. This means that changing the interface type can
- *       lead to a situation that couldn't otherwise be produced, but
- *       any such registrations will be dormant in the sense that they
- *       will not be serviced, i.e. they will not receive any frames.
- *
- * Frame transmission allows userspace to send for example the required
- * responses to action frames. It is subject to some sanity checking,
- * but many frames can be transmitted. When a frame was transmitted, its
- * status is indicated to the sending socket.
- *
- * For more technical details, see the corresponding command descriptions
- * below.
- */
-
-/**
- * DOC: Virtual interface / concurrency capabilities
- *
- * Some devices are able to operate with virtual MACs, they can have
- * more than one virtual interface. The capability handling for this
- * is a bit complex though, as there may be a number of restrictions
- * on the types of concurrency that are supported.
- *
- * To start with, each device supports the interface types listed in
- * the %NL80211_ATTR_SUPPORTED_IFTYPES attribute, but by listing the
- * types there no concurrency is implied.
- *
- * Once concurrency is desired, more attributes must be observed:
- * To start with, since some interface types are purely managed in
- * software, like the AP-VLAN type in mac80211 for example, there's
- * an additional list of these, they can be added at any time and
- * are only restricted by some semantic restrictions (e.g. AP-VLAN
- * cannot be added without a corresponding AP interface). This list
- * is exported in the %NL80211_ATTR_SOFTWARE_IFTYPES attribute.
- *
- * Further, the list of supported combinations is exported. This is
- * in the %NL80211_ATTR_INTERFACE_COMBINATIONS attribute. Basically,
- * it exports a list of "groups", and at any point in time the
- * interfaces that are currently active must fall into any one of
- * the advertised groups. Within each group, there are restrictions
- * on the number of interfaces of different types that are supported
- * and also the number of different channels, along with potentially
- * some other restrictions. See &enum nl80211_if_combination_attrs.
- *
- * All together, these attributes define the concurrency of virtual
- * interfaces that a given device supports.
- */
-
-/**
- * DOC: packet coalesce support
- *
- * In most cases, host that receives IPv4 and IPv6 multicast/broadcast
- * packets does not do anything with these packets. Therefore the
- * reception of these unwanted packets causes unnecessary processing
- * and power consumption.
- *
- * Packet coalesce feature helps to reduce number of received interrupts
- * to host by buffering these packets in firmware/hardware for some
- * predefined time. Received interrupt will be generated when one of the
- * following events occur.
- * a) Expiration of hardware timer whose expiration time is set to maximum
- * coalescing delay of matching coalesce rule.
- * b) Coalescing buffer in hardware reaches it's limit.
- * c) Packet doesn't match any of the configured coalesce rules.
- *
- * User needs to configure following parameters for creating a coalesce
- * rule.
- * a) Maximum coalescing delay
- * b) List of packet patterns which needs to be matched
- * c) Condition for coalescence. pattern 'match' or 'no match'
- * Multiple such rules can be created.
- */
-
-/**
- * enum nl80211_commands - supported nl80211 commands
- *
- * @NL80211_CMD_UNSPEC: unspecified command to catch errors
- *
- * @NL80211_CMD_GET_WIPHY: request information about a wiphy or dump request
- *	to get a list of all present wiphys.
- * @NL80211_CMD_SET_WIPHY: set wiphy parameters, needs %NL80211_ATTR_WIPHY or
- *	%NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME,
- *	%NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ (and the
- *	attributes determining the channel width; this is used for setting
- *	monitor mode channel),  %NL80211_ATTR_WIPHY_RETRY_SHORT,
- *	%NL80211_ATTR_WIPHY_RETRY_LONG, %NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
- *	and/or %NL80211_ATTR_WIPHY_RTS_THRESHOLD.
- *	However, for setting the channel, see %NL80211_CMD_SET_CHANNEL
- *	instead, the support here is for backward compatibility only.
- * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
- *	or rename notification. Has attributes %NL80211_ATTR_WIPHY and
- *	%NL80211_ATTR_WIPHY_NAME.
- * @NL80211_CMD_DEL_WIPHY: Wiphy deleted. Has attributes
- *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME.
- *
- * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration;
- *	either a dump request for all interfaces or a specific get with a
- *	single %NL80211_ATTR_IFINDEX is supported.
- * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires
- *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE.
- * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response
- *	to %NL80211_CMD_GET_INTERFACE. Has %NL80211_ATTR_IFINDEX,
- *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_IFTYPE attributes. Can also
- *	be sent from userspace to request creation of a new virtual interface,
- *	then requires attributes %NL80211_ATTR_WIPHY, %NL80211_ATTR_IFTYPE and
- *	%NL80211_ATTR_IFNAME.
- * @NL80211_CMD_DEL_INTERFACE: Virtual interface was deleted, has attributes
- *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_WIPHY. Can also be sent from
- *	userspace to request deletion of a virtual interface, then requires
- *	attribute %NL80211_ATTR_IFINDEX.
- *
- * @NL80211_CMD_GET_KEY: Get sequence counter information for a key specified
- *	by %NL80211_ATTR_KEY_IDX and/or %NL80211_ATTR_MAC.
- * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT,
- *	%NL80211_ATTR_KEY_DEFAULT_MGMT, or %NL80211_ATTR_KEY_THRESHOLD.
- * @NL80211_CMD_NEW_KEY: add a key with given %NL80211_ATTR_KEY_DATA,
- *	%NL80211_ATTR_KEY_IDX, %NL80211_ATTR_MAC, %NL80211_ATTR_KEY_CIPHER,
- *	and %NL80211_ATTR_KEY_SEQ attributes.
- * @NL80211_CMD_DEL_KEY: delete a key identified by %NL80211_ATTR_KEY_IDX
- *	or %NL80211_ATTR_MAC.
- *
- * @NL80211_CMD_GET_BEACON: (not used)
- * @NL80211_CMD_SET_BEACON: change the beacon on an access point interface
- *	using the %NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL
- *	attributes. For drivers that generate the beacon and probe responses
- *	internally, the following attributes must be provided: %NL80211_ATTR_IE,
- *	%NL80211_ATTR_IE_PROBE_RESP and %NL80211_ATTR_IE_ASSOC_RESP.
- * @NL80211_CMD_START_AP: Start AP operation on an AP interface, parameters
- *	are like for %NL80211_CMD_SET_BEACON, and additionally parameters that
- *	do not change are used, these include %NL80211_ATTR_BEACON_INTERVAL,
- *	%NL80211_ATTR_DTIM_PERIOD, %NL80211_ATTR_SSID,
- *	%NL80211_ATTR_HIDDEN_SSID, %NL80211_ATTR_CIPHERS_PAIRWISE,
- *	%NL80211_ATTR_CIPHER_GROUP, %NL80211_ATTR_WPA_VERSIONS,
- *	%NL80211_ATTR_AKM_SUITES, %NL80211_ATTR_PRIVACY,
- *	%NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_INACTIVITY_TIMEOUT,
- *	%NL80211_ATTR_ACL_POLICY and %NL80211_ATTR_MAC_ADDRS.
- *	The channel to use can be set on the interface or be given using the
- *	%NL80211_ATTR_WIPHY_FREQ and the attributes determining channel width.
- * @NL80211_CMD_NEW_BEACON: old alias for %NL80211_CMD_START_AP
- * @NL80211_CMD_STOP_AP: Stop AP operation on the given interface
- * @NL80211_CMD_DEL_BEACON: old alias for %NL80211_CMD_STOP_AP
- *
- * @NL80211_CMD_GET_STATION: Get station attributes for station identified by
- *	%NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_SET_STATION: Set station attributes for station identified by
- *	%NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_NEW_STATION: Add a station with given attributes to the
- *	the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_DEL_STATION: Remove a station identified by %NL80211_ATTR_MAC
- *	or, if no MAC address given, all stations, on the interface identified
- *	by %NL80211_ATTR_IFINDEX. %NL80211_ATTR_MGMT_SUBTYPE and
- *	%NL80211_ATTR_REASON_CODE can optionally be used to specify which type
- *	of disconnection indication should be sent to the station
- *	(Deauthentication or Disassociation frame and reason code for that
- *	frame).
- *
- * @NL80211_CMD_GET_MPATH: Get mesh path attributes for mesh path to
- * 	destination %NL80211_ATTR_MAC on the interface identified by
- * 	%NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_SET_MPATH:  Set mesh path attributes for mesh path to
- * 	destination %NL80211_ATTR_MAC on the interface identified by
- * 	%NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_NEW_MPATH: Create a new mesh path for the destination given by
- *	%NL80211_ATTR_MAC via %NL80211_ATTR_MPATH_NEXT_HOP.
- * @NL80211_CMD_DEL_MPATH: Delete a mesh path to the destination given by
- *	%NL80211_ATTR_MAC.
- * @NL80211_CMD_NEW_PATH: Add a mesh path with given attributes to the
- *	the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_DEL_PATH: Remove a mesh path identified by %NL80211_ATTR_MAC
- *	or, if no MAC address given, all mesh paths, on the interface identified
- *	by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_SET_BSS: Set BSS attributes for BSS identified by
- *	%NL80211_ATTR_IFINDEX.
- *
- * @NL80211_CMD_GET_REG: ask the wireless core to send us its currently set
- *	regulatory domain. If %NL80211_ATTR_WIPHY is specified and the device
- *	has a private regulatory domain, it will be returned. Otherwise, the
- *	global regdomain will be returned.
- *	A device will have a private regulatory domain if it uses the
- *	regulatory_hint() API. Even when a private regdomain is used the channel
- *	information will still be mended according to further hints from
- *	the regulatory core to help with compliance. A dump version of this API
- *	is now available which will returns the global regdomain as well as
- *	all private regdomains of present wiphys (for those that have it).
- *	If a wiphy is self-managed (%NL80211_ATTR_WIPHY_SELF_MANAGED_REG), then
- *	its private regdomain is the only valid one for it. The regulatory
- *	core is not used to help with compliance in this case.
- * @NL80211_CMD_SET_REG: Set current regulatory domain. CRDA sends this command
- *	after being queried by the kernel. CRDA replies by sending a regulatory
- *	domain structure which consists of %NL80211_ATTR_REG_ALPHA set to our
- *	current alpha2 if it found a match. It also provides
- * 	NL80211_ATTR_REG_RULE_FLAGS, and a set of regulatory rules. Each
- * 	regulatory rule is a nested set of attributes  given by
- * 	%NL80211_ATTR_REG_RULE_FREQ_[START|END] and
- * 	%NL80211_ATTR_FREQ_RANGE_MAX_BW with an attached power rule given by
- * 	%NL80211_ATTR_REG_RULE_POWER_MAX_ANT_GAIN and
- * 	%NL80211_ATTR_REG_RULE_POWER_MAX_EIRP.
- * @NL80211_CMD_REQ_SET_REG: ask the wireless core to set the regulatory domain
- * 	to the specified ISO/IEC 3166-1 alpha2 country code. The core will
- * 	store this as a valid request and then query userspace for it.
- *
- * @NL80211_CMD_GET_MESH_CONFIG: Get mesh networking properties for the
- *	interface identified by %NL80211_ATTR_IFINDEX
- *
- * @NL80211_CMD_SET_MESH_CONFIG: Set mesh networking properties for the
- *      interface identified by %NL80211_ATTR_IFINDEX
- *
- * @NL80211_CMD_SET_MGMT_EXTRA_IE: Set extra IEs for management frames. The
- *	interface is identified with %NL80211_ATTR_IFINDEX and the management
- *	frame subtype with %NL80211_ATTR_MGMT_SUBTYPE. The extra IE data to be
- *	added to the end of the specified management frame is specified with
- *	%NL80211_ATTR_IE. If the command succeeds, the requested data will be
- *	added to all specified management frames generated by
- *	kernel/firmware/driver.
- *	Note: This command has been removed and it is only reserved at this
- *	point to avoid re-using existing command number. The functionality this
- *	command was planned for has been provided with cleaner design with the
- *	option to specify additional IEs in NL80211_CMD_TRIGGER_SCAN,
- *	NL80211_CMD_AUTHENTICATE, NL80211_CMD_ASSOCIATE,
- *	NL80211_CMD_DEAUTHENTICATE, and NL80211_CMD_DISASSOCIATE.
- *
- * @NL80211_CMD_GET_SCAN: get scan results
- * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
- *	%NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
- *	probe requests at CCK rate or not.
- * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
- *	NL80211_CMD_GET_SCAN and on the "scan" multicast group)
- * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
- *	partial scan results may be available
- *
- * @NL80211_CMD_START_SCHED_SCAN: start a scheduled scan at certain
- *	intervals and certain number of cycles, as specified by
- *	%NL80211_ATTR_SCHED_SCAN_PLANS. If %NL80211_ATTR_SCHED_SCAN_PLANS is
- *	not specified and only %NL80211_ATTR_SCHED_SCAN_INTERVAL is specified,
- *	scheduled scan will run in an infinite loop with the specified interval.
- *	These attributes are mutually exculsive,
- *	i.e. NL80211_ATTR_SCHED_SCAN_INTERVAL must not be passed if
- *	NL80211_ATTR_SCHED_SCAN_PLANS is defined.
- *	If for some reason scheduled scan is aborted by the driver, all scan
- *	plans are canceled (including scan plans that did not start yet).
- *	Like with normal scans, if SSIDs (%NL80211_ATTR_SCAN_SSIDS)
- *	are passed, they are used in the probe requests.  For
- *	broadcast, a broadcast SSID must be passed (ie. an empty
- *	string).  If no SSID is passed, no probe requests are sent and
- *	a passive scan is performed.  %NL80211_ATTR_SCAN_FREQUENCIES,
- *	if passed, define which channels should be scanned; if not
- *	passed, all channels allowed for the current regulatory domain
- *	are used.  Extra IEs can also be passed from the userspace by
- *	using the %NL80211_ATTR_IE attribute.  The first cycle of the
- *	scheduled scan can be delayed by %NL80211_ATTR_SCHED_SCAN_DELAY
- *	is supplied.
- * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan. Returns -ENOENT if
- *	scheduled scan is not running. The caller may assume that as soon
- *	as the call returns, it is safe to start a new scheduled scan again.
- * @NL80211_CMD_SCHED_SCAN_RESULTS: indicates that there are scheduled scan
- *	results available.
- * @NL80211_CMD_SCHED_SCAN_STOPPED: indicates that the scheduled scan has
- *	stopped.  The driver may issue this event at any time during a
- *	scheduled scan.  One reason for stopping the scan is if the hardware
- *	does not support starting an association or a normal scan while running
- *	a scheduled scan.  This event is also sent when the
- *	%NL80211_CMD_STOP_SCHED_SCAN command is received or when the interface
- *	is brought down while a scheduled scan was running.
- *
- * @NL80211_CMD_GET_SURVEY: get survey resuls, e.g. channel occupation
- *      or noise level
- * @NL80211_CMD_NEW_SURVEY_RESULTS: survey data notification (as a reply to
- *	NL80211_CMD_GET_SURVEY and on the "scan" multicast group)
- *
- * @NL80211_CMD_SET_PMKSA: Add a PMKSA cache entry, using %NL80211_ATTR_MAC
- *	(for the BSSID) and %NL80211_ATTR_PMKID.
- * @NL80211_CMD_DEL_PMKSA: Delete a PMKSA cache entry, using %NL80211_ATTR_MAC
- *	(for the BSSID) and %NL80211_ATTR_PMKID.
- * @NL80211_CMD_FLUSH_PMKSA: Flush all PMKSA cache entries.
- *
- * @NL80211_CMD_REG_CHANGE: indicates to userspace the regulatory domain
- * 	has been changed and provides details of the request information
- * 	that caused the change such as who initiated the regulatory request
- * 	(%NL80211_ATTR_REG_INITIATOR), the wiphy_idx
- * 	(%NL80211_ATTR_REG_ALPHA2) on which the request was made from if
- * 	the initiator was %NL80211_REGDOM_SET_BY_COUNTRY_IE or
- * 	%NL80211_REGDOM_SET_BY_DRIVER, the type of regulatory domain
- * 	set (%NL80211_ATTR_REG_TYPE), if the type of regulatory domain is
- * 	%NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on
- * 	to (%NL80211_ATTR_REG_ALPHA2).
- * @NL80211_CMD_REG_BEACON_HINT: indicates to userspace that an AP beacon
- * 	has been found while world roaming thus enabling active scan or
- * 	any mode of operation that initiates TX (beacons) on a channel
- * 	where we would not have been able to do either before. As an example
- * 	if you are world roaming (regulatory domain set to world or if your
- * 	driver is using a custom world roaming regulatory domain) and while
- * 	doing a passive scan on the 5 GHz band you find an AP there (if not
- * 	on a DFS channel) you will now be able to actively scan for that AP
- * 	or use AP mode on your card on that same channel. Note that this will
- * 	never be used for channels 1-11 on the 2 GHz band as they are always
- * 	enabled world wide. This beacon hint is only sent if your device had
- * 	either disabled active scanning or beaconing on a channel. We send to
- * 	userspace the wiphy on which we removed a restriction from
- * 	(%NL80211_ATTR_WIPHY) and the channel on which this occurred
- * 	before (%NL80211_ATTR_FREQ_BEFORE) and after (%NL80211_ATTR_FREQ_AFTER)
- * 	the beacon hint was processed.
- *
- * @NL80211_CMD_AUTHENTICATE: authentication request and notification.
- *	This command is used both as a command (request to authenticate) and
- *	as an event on the "mlme" multicast group indicating completion of the
- *	authentication process.
- *	When used as a command, %NL80211_ATTR_IFINDEX is used to identify the
- *	interface. %NL80211_ATTR_MAC is used to specify PeerSTAAddress (and
- *	BSSID in case of station mode). %NL80211_ATTR_SSID is used to specify
- *	the SSID (mainly for association, but is included in authentication
- *	request, too, to help BSS selection. %NL80211_ATTR_WIPHY_FREQ is used
- *	to specify the frequence of the channel in MHz. %NL80211_ATTR_AUTH_TYPE
- *	is used to specify the authentication type. %NL80211_ATTR_IE is used to
- *	define IEs (VendorSpecificInfo, but also including RSN IE and FT IEs)
- *	to be added to the frame.
- *	When used as an event, this reports reception of an Authentication
- *	frame in station and IBSS modes when the local MLME processed the
- *	frame, i.e., it was for the local STA and was received in correct
- *	state. This is similar to MLME-AUTHENTICATE.confirm primitive in the
- *	MLME SAP interface (kernel providing MLME, userspace SME). The
- *	included %NL80211_ATTR_FRAME attribute contains the management frame
- *	(including both the header and frame body, but not FCS). This event is
- *	also used to indicate if the authentication attempt timed out. In that
- *	case the %NL80211_ATTR_FRAME attribute is replaced with a
- *	%NL80211_ATTR_TIMED_OUT flag (and %NL80211_ATTR_MAC to indicate which
- *	pending authentication timed out).
- * @NL80211_CMD_ASSOCIATE: association request and notification; like
- *	NL80211_CMD_AUTHENTICATE but for Association and Reassociation
- *	(similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request,
- *	MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives).
- * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like
- *	NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to
- *	MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication
- *	primitives).
- * @NL80211_CMD_DISASSOCIATE: disassociation request and notification; like
- *	NL80211_CMD_AUTHENTICATE but for Disassociation frames (similar to
- *	MLME-DISASSOCIATE.request and MLME-DISASSOCIATE.indication primitives).
- *
- * @NL80211_CMD_MICHAEL_MIC_FAILURE: notification of a locally detected Michael
- *	MIC (part of TKIP) failure; sent on the "mlme" multicast group; the
- *	event includes %NL80211_ATTR_MAC to describe the source MAC address of
- *	the frame with invalid MIC, %NL80211_ATTR_KEY_TYPE to show the key
- *	type, %NL80211_ATTR_KEY_IDX to indicate the key identifier, and
- *	%NL80211_ATTR_KEY_SEQ to indicate the TSC value of the frame; this
- *	event matches with MLME-MICHAELMICFAILURE.indication() primitive
- *
- * @NL80211_CMD_JOIN_IBSS: Join a new IBSS -- given at least an SSID and a
- *	FREQ attribute (for the initial frequency if no peer can be found)
- *	and optionally a MAC (as BSSID) and FREQ_FIXED attribute if those
- *	should be fixed rather than automatically determined. Can only be
- *	executed on a network interface that is UP, and fixed BSSID/FREQ
- *	may be rejected. Another optional parameter is the beacon interval,
- *	given in the %NL80211_ATTR_BEACON_INTERVAL attribute, which if not
- *	given defaults to 100 TU (102.4ms).
- * @NL80211_CMD_LEAVE_IBSS: Leave the IBSS -- no special arguments, the IBSS is
- *	determined by the network interface.
- *
- * @NL80211_CMD_TESTMODE: testmode command, takes a wiphy (or ifindex) attribute
- *	to identify the device, and the TESTDATA blob attribute to pass through
- *	to the driver.
- *
- * @NL80211_CMD_CONNECT: connection request and notification; this command
- *	requests to connect to a specified network but without separating
- *	auth and assoc steps. For this, you need to specify the SSID in a
- *	%NL80211_ATTR_SSID attribute, and can optionally specify the association
- *	IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
- *	%NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
- *	%NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
- *	%NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, %NL80211_ATTR_MAC_HINT, and
- *	%NL80211_ATTR_WIPHY_FREQ_HINT.
- *	If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are
- *	restrictions on BSS selection, i.e., they effectively prevent roaming
- *	within the ESS. %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT
- *	can be included to provide a recommendation of the initial BSS while
- *	allowing the driver to roam to other BSSes within the ESS and also to
- *	ignore this recommendation if the indicated BSS is not ideal. Only one
- *	set of BSSID,frequency parameters is used (i.e., either the enforcing
- *	%NL80211_ATTR_MAC,%NL80211_ATTR_WIPHY_FREQ or the less strict
- *	%NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT).
- *	Background scan period can optionally be
- *	specified in %NL80211_ATTR_BG_SCAN_PERIOD,
- *	if not specified default background scan configuration
- *	in driver is used and if period value is 0, bg scan will be disabled.
- *	This attribute is ignored if driver does not support roam scan.
- *	It is also sent as an event, with the BSSID and response IEs when the
- *	connection is established or failed to be established. This can be
- *	determined by the STATUS_CODE attribute.
- * @NL80211_CMD_ROAM: request that the card roam (currently not implemented),
- *	sent as an event when the card/driver roamed by itself.
- * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
- *	userspace that a connection was dropped by the AP or due to other
- *	reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and
- *	%NL80211_ATTR_REASON_CODE attributes are used.
- *
- * @NL80211_CMD_SET_WIPHY_NETNS: Set a wiphy's netns. Note that all devices
- *	associated with this wiphy must be down and will follow.
- *
- * @NL80211_CMD_REMAIN_ON_CHANNEL: Request to remain awake on the specified
- *	channel for the specified amount of time. This can be used to do
- *	off-channel operations like transmit a Public Action frame and wait for
- *	a response while being associated to an AP on another channel.
- *	%NL80211_ATTR_IFINDEX is used to specify which interface (and thus
- *	radio) is used. %NL80211_ATTR_WIPHY_FREQ is used to specify the
- *	frequency for the operation.
- *	%NL80211_ATTR_DURATION is used to specify the duration in milliseconds
- *	to remain on the channel. This command is also used as an event to
- *	notify when the requested duration starts (it may take a while for the
- *	driver to schedule this time due to other concurrent needs for the
- *	radio).
- *	When called, this operation returns a cookie (%NL80211_ATTR_COOKIE)
- *	that will be included with any events pertaining to this request;
- *	the cookie is also used to cancel the request.
- * @NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL: This command can be used to cancel a
- *	pending remain-on-channel duration if the desired operation has been
- *	completed prior to expiration of the originally requested duration.
- *	%NL80211_ATTR_WIPHY or %NL80211_ATTR_IFINDEX is used to specify the
- *	radio. The %NL80211_ATTR_COOKIE attribute must be given as well to
- *	uniquely identify the request.
- *	This command is also used as an event to notify when a requested
- *	remain-on-channel duration has expired.
- *
- * @NL80211_CMD_SET_TX_BITRATE_MASK: Set the mask of rates to be used in TX
- *	rate selection. %NL80211_ATTR_IFINDEX is used to specify the interface
- *	and @NL80211_ATTR_TX_RATES the set of allowed rates.
- *
- * @NL80211_CMD_REGISTER_FRAME: Register for receiving certain mgmt frames
- *	(via @NL80211_CMD_FRAME) for processing in userspace. This command
- *	requires an interface index, a frame type attribute (optional for
- *	backward compatibility reasons, if not given assumes action frames)
- *	and a match attribute containing the first few bytes of the frame
- *	that should match, e.g. a single byte for only a category match or
- *	four bytes for vendor frames including the OUI. The registration
- *	cannot be dropped, but is removed automatically when the netlink
- *	socket is closed. Multiple registrations can be made.
- * @NL80211_CMD_REGISTER_ACTION: Alias for @NL80211_CMD_REGISTER_FRAME for
- *	backward compatibility
- * @NL80211_CMD_FRAME: Management frame TX request and RX notification. This
- *	command is used both as a request to transmit a management frame and
- *	as an event indicating reception of a frame that was not processed in
- *	kernel code, but is for us (i.e., which may need to be processed in a
- *	user space application). %NL80211_ATTR_FRAME is used to specify the
- *	frame contents (including header). %NL80211_ATTR_WIPHY_FREQ is used
- *	to indicate on which channel the frame is to be transmitted or was
- *	received. If this channel is not the current channel (remain-on-channel
- *	or the operational channel) the device will switch to the given channel
- *	and transmit the frame, optionally waiting for a response for the time
- *	specified using %NL80211_ATTR_DURATION. When called, this operation
- *	returns a cookie (%NL80211_ATTR_COOKIE) that will be included with the
- *	TX status event pertaining to the TX request.
- *	%NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
- *	management frames at CCK rate or not in 2GHz band.
- *	%NL80211_ATTR_CSA_C_OFFSETS_TX is an array of offsets to CSA
- *	counters which will be updated to the current value. This attribute
- *	is used during CSA period.
- * @NL80211_CMD_FRAME_WAIT_CANCEL: When an off-channel TX was requested, this
- *	command may be used with the corresponding cookie to cancel the wait
- *	time if it is known that it is no longer necessary.
- * @NL80211_CMD_ACTION: Alias for @NL80211_CMD_FRAME for backward compatibility.
- * @NL80211_CMD_FRAME_TX_STATUS: Report TX status of a management frame
- *	transmitted with %NL80211_CMD_FRAME. %NL80211_ATTR_COOKIE identifies
- *	the TX command and %NL80211_ATTR_FRAME includes the contents of the
- *	frame. %NL80211_ATTR_ACK flag is included if the recipient acknowledged
- *	the frame.
- * @NL80211_CMD_ACTION_TX_STATUS: Alias for @NL80211_CMD_FRAME_TX_STATUS for
- *	backward compatibility.
- *
- * @NL80211_CMD_SET_POWER_SAVE: Set powersave, using %NL80211_ATTR_PS_STATE
- * @NL80211_CMD_GET_POWER_SAVE: Get powersave status in %NL80211_ATTR_PS_STATE
- *
- * @NL80211_CMD_SET_CQM: Connection quality monitor configuration. This command
- *	is used to configure connection quality monitoring notification trigger
- *	levels.
- * @NL80211_CMD_NOTIFY_CQM: Connection quality monitor notification. This
- *	command is used as an event to indicate the that a trigger level was
- *	reached.
- * @NL80211_CMD_SET_CHANNEL: Set the channel (using %NL80211_ATTR_WIPHY_FREQ
- *	and the attributes determining channel width) the given interface
- *	(identifed by %NL80211_ATTR_IFINDEX) shall operate on.
- *	In case multiple channels are supported by the device, the mechanism
- *	with which it switches channels is implementation-defined.
- *	When a monitor interface is given, it can only switch channel while
- *	no other interfaces are operating to avoid disturbing the operation
- *	of any other interfaces, and other interfaces will again take
- *	precedence when they are used.
- *
- * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface.
- *
- * @NL80211_CMD_JOIN_MESH: Join a mesh. The mesh ID must be given, and initial
- *	mesh config parameters may be given.
- * @NL80211_CMD_LEAVE_MESH: Leave the mesh network -- no special arguments, the
- *	network is determined by the network interface.
- *
- * @NL80211_CMD_UNPROT_DEAUTHENTICATE: Unprotected deauthentication frame
- *	notification. This event is used to indicate that an unprotected
- *	deauthentication frame was dropped when MFP is in use.
- * @NL80211_CMD_UNPROT_DISASSOCIATE: Unprotected disassociation frame
- *	notification. This event is used to indicate that an unprotected
- *	disassociation frame was dropped when MFP is in use.
- *
- * @NL80211_CMD_NEW_PEER_CANDIDATE: Notification on the reception of a
- *      beacon or probe response from a compatible mesh peer.  This is only
- *      sent while no station information (sta_info) exists for the new peer
- *      candidate and when @NL80211_MESH_SETUP_USERSPACE_AUTH,
- *      @NL80211_MESH_SETUP_USERSPACE_AMPE, or
- *      @NL80211_MESH_SETUP_USERSPACE_MPM is set.  On reception of this
- *      notification, userspace may decide to create a new station
- *      (@NL80211_CMD_NEW_STATION).  To stop this notification from
- *      reoccurring, the userspace authentication daemon may want to create the
- *      new station with the AUTHENTICATED flag unset and maybe change it later
- *      depending on the authentication result.
- *
- * @NL80211_CMD_GET_WOWLAN: get Wake-on-Wireless-LAN (WoWLAN) settings.
- * @NL80211_CMD_SET_WOWLAN: set Wake-on-Wireless-LAN (WoWLAN) settings.
- *	Since wireless is more complex than wired ethernet, it supports
- *	various triggers. These triggers can be configured through this
- *	command with the %NL80211_ATTR_WOWLAN_TRIGGERS attribute. For
- *	more background information, see
- *	http://wireless.kernel.org/en/users/Documentation/WoWLAN.
- *	The @NL80211_CMD_SET_WOWLAN command can also be used as a notification
- *	from the driver reporting the wakeup reason. In this case, the
- *	@NL80211_ATTR_WOWLAN_TRIGGERS attribute will contain the reason
- *	for the wakeup, if it was caused by wireless. If it is not present
- *	in the wakeup notification, the wireless device didn't cause the
- *	wakeup but reports that it was woken up.
- *
- * @NL80211_CMD_SET_REKEY_OFFLOAD: This command is used give the driver
- *	the necessary information for supporting GTK rekey offload. This
- *	feature is typically used during WoWLAN. The configuration data
- *	is contained in %NL80211_ATTR_REKEY_DATA (which is nested and
- *	contains the data in sub-attributes). After rekeying happened,
- *	this command may also be sent by the driver as an MLME event to
- *	inform userspace of the new replay counter.
- *
- * @NL80211_CMD_PMKSA_CANDIDATE: This is used as an event to inform userspace
- *	of PMKSA caching dandidates.
- *
- * @NL80211_CMD_TDLS_OPER: Perform a high-level TDLS command (e.g. link setup).
- *	In addition, this can be used as an event to request userspace to take
- *	actions on TDLS links (set up a new link or tear down an existing one).
- *	In such events, %NL80211_ATTR_TDLS_OPERATION indicates the requested
- *	operation, %NL80211_ATTR_MAC contains the peer MAC address, and
- *	%NL80211_ATTR_REASON_CODE the reason code to be used (only with
- *	%NL80211_TDLS_TEARDOWN).
- * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame. The
- *	%NL80211_ATTR_TDLS_ACTION attribute determines the type of frame to be
- *	sent. Public Action codes (802.11-2012 8.1.5.1) will be sent as
- *	802.11 management frames, while TDLS action codes (802.11-2012
- *	8.5.13.1) will be encapsulated and sent as data frames. The currently
- *	supported Public Action code is %WLAN_PUB_ACTION_TDLS_DISCOVER_RES
- *	and the currently supported TDLS actions codes are given in
- *	&enum ieee80211_tdls_actioncode.
- *
- * @NL80211_CMD_UNEXPECTED_FRAME: Used by an application controlling an AP
- *	(or GO) interface (i.e. hostapd) to ask for unexpected frames to
- *	implement sending deauth to stations that send unexpected class 3
- *	frames. Also used as the event sent by the kernel when such a frame
- *	is received.
- *	For the event, the %NL80211_ATTR_MAC attribute carries the TA and
- *	other attributes like the interface index are present.
- *	If used as the command it must have an interface index and you can
- *	only unsubscribe from the event by closing the socket. Subscription
- *	is also for %NL80211_CMD_UNEXPECTED_4ADDR_FRAME events.
- *
- * @NL80211_CMD_UNEXPECTED_4ADDR_FRAME: Sent as an event indicating that the
- *	associated station identified by %NL80211_ATTR_MAC sent a 4addr frame
- *	and wasn't already in a 4-addr VLAN. The event will be sent similarly
- *	to the %NL80211_CMD_UNEXPECTED_FRAME event, to the same listener.
- *
- * @NL80211_CMD_PROBE_CLIENT: Probe an associated station on an AP interface
- *	by sending a null data frame to it and reporting when the frame is
- *	acknowleged. This is used to allow timing out inactive clients. Uses
- *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_MAC. The command returns a
- *	direct reply with an %NL80211_ATTR_COOKIE that is later used to match
- *	up the event with the request. The event includes the same data and
- *	has %NL80211_ATTR_ACK set if the frame was ACKed.
- *
- * @NL80211_CMD_REGISTER_BEACONS: Register this socket to receive beacons from
- *	other BSSes when any interfaces are in AP mode. This helps implement
- *	OLBC handling in hostapd. Beacons are reported in %NL80211_CMD_FRAME
- *	messages. Note that per PHY only one application may register.
- *
- * @NL80211_CMD_SET_NOACK_MAP: sets a bitmap for the individual TIDs whether
- *      No Acknowledgement Policy should be applied.
- *
- * @NL80211_CMD_CH_SWITCH_NOTIFY: An AP or GO may decide to switch channels
- *	independently of the userspace SME, send this event indicating
- *	%NL80211_ATTR_IFINDEX is now on %NL80211_ATTR_WIPHY_FREQ and the
- *	attributes determining channel width.  This indication may also be
- *	sent when a remotely-initiated switch (e.g., when a STA receives a CSA
- *	from the remote AP) is completed;
- *
- * @NL80211_CMD_CH_SWITCH_STARTED_NOTIFY: Notify that a channel switch
- *	has been started on an interface, regardless of the initiator
- *	(ie. whether it was requested from a remote device or
- *	initiated on our own).  It indicates that
- *	%NL80211_ATTR_IFINDEX will be on %NL80211_ATTR_WIPHY_FREQ
- *	after %NL80211_ATTR_CH_SWITCH_COUNT TBTT's.  The userspace may
- *	decide to react to this indication by requesting other
- *	interfaces to change channel as well.
- *
- * @NL80211_CMD_START_P2P_DEVICE: Start the given P2P Device, identified by
- *	its %NL80211_ATTR_WDEV identifier. It must have been created with
- *	%NL80211_CMD_NEW_INTERFACE previously. After it has been started, the
- *	P2P Device can be used for P2P operations, e.g. remain-on-channel and
- *	public action frame TX.
- * @NL80211_CMD_STOP_P2P_DEVICE: Stop the given P2P Device, identified by
- *	its %NL80211_ATTR_WDEV identifier.
- *
- * @NL80211_CMD_CONN_FAILED: connection request to an AP failed; used to
- *	notify userspace that AP has rejected the connection request from a
- *	station, due to particular reason. %NL80211_ATTR_CONN_FAILED_REASON
- *	is used for this.
- *
- * @NL80211_CMD_SET_MCAST_RATE: Change the rate used to send multicast frames
- *	for IBSS or MESH vif.
- *
- * @NL80211_CMD_SET_MAC_ACL: sets ACL for MAC address based access control.
- *	This is to be used with the drivers advertising the support of MAC
- *	address based access control. List of MAC addresses is passed in
- *	%NL80211_ATTR_MAC_ADDRS and ACL policy is passed in
- *	%NL80211_ATTR_ACL_POLICY. Driver will enable ACL with this list, if it
- *	is not already done. The new list will replace any existing list. Driver
- *	will clear its ACL when the list of MAC addresses passed is empty. This
- *	command is used in AP/P2P GO mode. Driver has to make sure to clear its
- *	ACL list during %NL80211_CMD_STOP_AP.
- *
- * @NL80211_CMD_RADAR_DETECT: Start a Channel availability check (CAC). Once
- *	a radar is detected or the channel availability scan (CAC) has finished
- *	or was aborted, or a radar was detected, usermode will be notified with
- *	this event. This command is also used to notify userspace about radars
- *	while operating on this channel.
- *	%NL80211_ATTR_RADAR_EVENT is used to inform about the type of the
- *	event.
- *
- * @NL80211_CMD_GET_PROTOCOL_FEATURES: Get global nl80211 protocol features,
- *	i.e. features for the nl80211 protocol rather than device features.
- *	Returns the features in the %NL80211_ATTR_PROTOCOL_FEATURES bitmap.
- *
- * @NL80211_CMD_UPDATE_FT_IES: Pass down the most up-to-date Fast Transition
- *	Information Element to the WLAN driver
- *
- * @NL80211_CMD_FT_EVENT: Send a Fast transition event from the WLAN driver
- *	to the supplicant. This will carry the target AP's MAC address along
- *	with the relevant Information Elements. This event is used to report
- *	received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE).
- *
- * @NL80211_CMD_CRIT_PROTOCOL_START: Indicates user-space will start running
- *	a critical protocol that needs more reliability in the connection to
- *	complete.
- *
- * @NL80211_CMD_CRIT_PROTOCOL_STOP: Indicates the connection reliability can
- *	return back to normal.
- *
- * @NL80211_CMD_GET_COALESCE: Get currently supported coalesce rules.
- * @NL80211_CMD_SET_COALESCE: Configure coalesce rules or clear existing rules.
- *
- * @NL80211_CMD_CHANNEL_SWITCH: Perform a channel switch by announcing the
- *	the new channel information (Channel Switch Announcement - CSA)
- *	in the beacon for some time (as defined in the
- *	%NL80211_ATTR_CH_SWITCH_COUNT parameter) and then change to the
- *	new channel. Userspace provides the new channel information (using
- *	%NL80211_ATTR_WIPHY_FREQ and the attributes determining channel
- *	width). %NL80211_ATTR_CH_SWITCH_BLOCK_TX may be supplied to inform
- *	other station that transmission must be blocked until the channel
- *	switch is complete.
- *
- * @NL80211_CMD_VENDOR: Vendor-specified command/event. The command is specified
- *	by the %NL80211_ATTR_VENDOR_ID attribute and a sub-command in
- *	%NL80211_ATTR_VENDOR_SUBCMD. Parameter(s) can be transported in
- *	%NL80211_ATTR_VENDOR_DATA.
- *	For feature advertisement, the %NL80211_ATTR_VENDOR_DATA attribute is
- *	used in the wiphy data as a nested attribute containing descriptions
- *	(&struct nl80211_vendor_cmd_info) of the supported vendor commands.
- *	This may also be sent as an event with the same attributes.
- *
- * @NL80211_CMD_SET_QOS_MAP: Set Interworking QoS mapping for IP DSCP values.
- *	The QoS mapping information is included in %NL80211_ATTR_QOS_MAP. If
- *	that attribute is not included, QoS mapping is disabled. Since this
- *	QoS mapping is relevant for IP packets, it is only valid during an
- *	association. This is cleared on disassociation and AP restart.
- *
- * @NL80211_CMD_ADD_TX_TS: Ask the kernel to add a traffic stream for the given
- *	%NL80211_ATTR_TSID and %NL80211_ATTR_MAC with %NL80211_ATTR_USER_PRIO
- *	and %NL80211_ATTR_ADMITTED_TIME parameters.
- *	Note that the action frame handshake with the AP shall be handled by
- *	userspace via the normal management RX/TX framework, this only sets
- *	up the TX TS in the driver/device.
- *	If the admitted time attribute is not added then the request just checks
- *	if a subsequent setup could be successful, the intent is to use this to
- *	avoid setting up a session with the AP when local restrictions would
- *	make that impossible. However, the subsequent "real" setup may still
- *	fail even if the check was successful.
- * @NL80211_CMD_DEL_TX_TS: Remove an existing TS with the %NL80211_ATTR_TSID
- *	and %NL80211_ATTR_MAC parameters. It isn't necessary to call this
- *	before removing a station entry entirely, or before disassociating
- *	or similar, cleanup will happen in the driver/device in this case.
- *
- * @NL80211_CMD_GET_MPP: Get mesh path attributes for mesh proxy path to
- *	destination %NL80211_ATTR_MAC on the interface identified by
- *	%NL80211_ATTR_IFINDEX.
- *
- * @NL80211_CMD_JOIN_OCB: Join the OCB network. The center frequency and
- *	bandwidth of a channel must be given.
- * @NL80211_CMD_LEAVE_OCB: Leave the OCB network -- no special arguments, the
- *	network is determined by the network interface.
- *
- * @NL80211_CMD_TDLS_CHANNEL_SWITCH: Start channel-switching with a TDLS peer,
- *	identified by the %NL80211_ATTR_MAC parameter. A target channel is
- *	provided via %NL80211_ATTR_WIPHY_FREQ and other attributes determining
- *	channel width/type. The target operating class is given via
- *	%NL80211_ATTR_OPER_CLASS.
- *	The driver is responsible for continually initiating channel-switching
- *	operations and returning to the base channel for communication with the
- *	AP.
- * @NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH: Stop channel-switching with a TDLS
- *	peer given by %NL80211_ATTR_MAC. Both peers must be on the base channel
- *	when this command completes.
- *
- * @NL80211_CMD_WIPHY_REG_CHANGE: Similar to %NL80211_CMD_REG_CHANGE, but used
- *	as an event to indicate changes for devices with wiphy-specific regdom
- *	management.
- *
- * @NL80211_CMD_MAX: highest used command number
- * @__NL80211_CMD_AFTER_LAST: internal use
- */
-enum nl80211_commands {
-/* don't change the order or add anything between, this is ABI! */
-	NL80211_CMD_UNSPEC,
-
-	NL80211_CMD_GET_WIPHY,		/* can dump */
-	NL80211_CMD_SET_WIPHY,
-	NL80211_CMD_NEW_WIPHY,
-	NL80211_CMD_DEL_WIPHY,
-
-	NL80211_CMD_GET_INTERFACE,	/* can dump */
-	NL80211_CMD_SET_INTERFACE,
-	NL80211_CMD_NEW_INTERFACE,
-	NL80211_CMD_DEL_INTERFACE,
-
-	NL80211_CMD_GET_KEY,
-	NL80211_CMD_SET_KEY,
-	NL80211_CMD_NEW_KEY,
-	NL80211_CMD_DEL_KEY,
-
-	NL80211_CMD_GET_BEACON,
-	NL80211_CMD_SET_BEACON,
-	NL80211_CMD_START_AP,
-	NL80211_CMD_NEW_BEACON = NL80211_CMD_START_AP,
-	NL80211_CMD_STOP_AP,
-	NL80211_CMD_DEL_BEACON = NL80211_CMD_STOP_AP,
-
-	NL80211_CMD_GET_STATION,
-	NL80211_CMD_SET_STATION,
-	NL80211_CMD_NEW_STATION,
-	NL80211_CMD_DEL_STATION,
-
-	NL80211_CMD_GET_MPATH,
-	NL80211_CMD_SET_MPATH,
-	NL80211_CMD_NEW_MPATH,
-	NL80211_CMD_DEL_MPATH,
-
-	NL80211_CMD_SET_BSS,
-
-	NL80211_CMD_SET_REG,
-	NL80211_CMD_REQ_SET_REG,
-
-	NL80211_CMD_GET_MESH_CONFIG,
-	NL80211_CMD_SET_MESH_CONFIG,
-
-	NL80211_CMD_SET_MGMT_EXTRA_IE /* reserved; not used */,
-
-	NL80211_CMD_GET_REG,
-
-	NL80211_CMD_GET_SCAN,
-	NL80211_CMD_TRIGGER_SCAN,
-	NL80211_CMD_NEW_SCAN_RESULTS,
-	NL80211_CMD_SCAN_ABORTED,
-
-	NL80211_CMD_REG_CHANGE,
-
-	NL80211_CMD_AUTHENTICATE,
-	NL80211_CMD_ASSOCIATE,
-	NL80211_CMD_DEAUTHENTICATE,
-	NL80211_CMD_DISASSOCIATE,
-
-	NL80211_CMD_MICHAEL_MIC_FAILURE,
-
-	NL80211_CMD_REG_BEACON_HINT,
-
-	NL80211_CMD_JOIN_IBSS,
-	NL80211_CMD_LEAVE_IBSS,
-
-	NL80211_CMD_TESTMODE,
-
-	NL80211_CMD_CONNECT,
-	NL80211_CMD_ROAM,
-	NL80211_CMD_DISCONNECT,
-
-	NL80211_CMD_SET_WIPHY_NETNS,
-
-	NL80211_CMD_GET_SURVEY,
-	NL80211_CMD_NEW_SURVEY_RESULTS,
-
-	NL80211_CMD_SET_PMKSA,
-	NL80211_CMD_DEL_PMKSA,
-	NL80211_CMD_FLUSH_PMKSA,
-
-	NL80211_CMD_REMAIN_ON_CHANNEL,
-	NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL,
-
-	NL80211_CMD_SET_TX_BITRATE_MASK,
-
-	NL80211_CMD_REGISTER_FRAME,
-	NL80211_CMD_REGISTER_ACTION = NL80211_CMD_REGISTER_FRAME,
-	NL80211_CMD_FRAME,
-	NL80211_CMD_ACTION = NL80211_CMD_FRAME,
-	NL80211_CMD_FRAME_TX_STATUS,
-	NL80211_CMD_ACTION_TX_STATUS = NL80211_CMD_FRAME_TX_STATUS,
-
-	NL80211_CMD_SET_POWER_SAVE,
-	NL80211_CMD_GET_POWER_SAVE,
-
-	NL80211_CMD_SET_CQM,
-	NL80211_CMD_NOTIFY_CQM,
-
-	NL80211_CMD_SET_CHANNEL,
-	NL80211_CMD_SET_WDS_PEER,
-
-	NL80211_CMD_FRAME_WAIT_CANCEL,
-
-	NL80211_CMD_JOIN_MESH,
-	NL80211_CMD_LEAVE_MESH,
-
-	NL80211_CMD_UNPROT_DEAUTHENTICATE,
-	NL80211_CMD_UNPROT_DISASSOCIATE,
-
-	NL80211_CMD_NEW_PEER_CANDIDATE,
-
-	NL80211_CMD_GET_WOWLAN,
-	NL80211_CMD_SET_WOWLAN,
-
-	NL80211_CMD_START_SCHED_SCAN,
-	NL80211_CMD_STOP_SCHED_SCAN,
-	NL80211_CMD_SCHED_SCAN_RESULTS,
-	NL80211_CMD_SCHED_SCAN_STOPPED,
-
-	NL80211_CMD_SET_REKEY_OFFLOAD,
-
-	NL80211_CMD_PMKSA_CANDIDATE,
-
-	NL80211_CMD_TDLS_OPER,
-	NL80211_CMD_TDLS_MGMT,
-
-	NL80211_CMD_UNEXPECTED_FRAME,
-
-	NL80211_CMD_PROBE_CLIENT,
-
-	NL80211_CMD_REGISTER_BEACONS,
-
-	NL80211_CMD_UNEXPECTED_4ADDR_FRAME,
-
-	NL80211_CMD_SET_NOACK_MAP,
-
-	NL80211_CMD_CH_SWITCH_NOTIFY,
-
-	NL80211_CMD_START_P2P_DEVICE,
-	NL80211_CMD_STOP_P2P_DEVICE,
-
-	NL80211_CMD_CONN_FAILED,
-
-	NL80211_CMD_SET_MCAST_RATE,
-
-	NL80211_CMD_SET_MAC_ACL,
-
-	NL80211_CMD_RADAR_DETECT,
-
-	NL80211_CMD_GET_PROTOCOL_FEATURES,
-
-	NL80211_CMD_UPDATE_FT_IES,
-	NL80211_CMD_FT_EVENT,
-
-	NL80211_CMD_CRIT_PROTOCOL_START,
-	NL80211_CMD_CRIT_PROTOCOL_STOP,
-
-	NL80211_CMD_GET_COALESCE,
-	NL80211_CMD_SET_COALESCE,
-
-	NL80211_CMD_CHANNEL_SWITCH,
-
-	NL80211_CMD_VENDOR,
-
-	NL80211_CMD_SET_QOS_MAP,
-
-	NL80211_CMD_ADD_TX_TS,
-	NL80211_CMD_DEL_TX_TS,
-
-	NL80211_CMD_GET_MPP,
-
-	NL80211_CMD_JOIN_OCB,
-	NL80211_CMD_LEAVE_OCB,
-
-	NL80211_CMD_CH_SWITCH_STARTED_NOTIFY,
-
-	NL80211_CMD_TDLS_CHANNEL_SWITCH,
-	NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH,
-
-	NL80211_CMD_WIPHY_REG_CHANGE,
-
-	/* add new commands above here */
-
-	/* used to define NL80211_CMD_MAX below */
-	__NL80211_CMD_AFTER_LAST,
-	NL80211_CMD_MAX = __NL80211_CMD_AFTER_LAST - 1
-};
-
-/*
- * Allow user space programs to use #ifdef on new commands by defining them
- * here
- */
-#define NL80211_CMD_SET_BSS NL80211_CMD_SET_BSS
-#define NL80211_CMD_SET_MGMT_EXTRA_IE NL80211_CMD_SET_MGMT_EXTRA_IE
-#define NL80211_CMD_REG_CHANGE NL80211_CMD_REG_CHANGE
-#define NL80211_CMD_AUTHENTICATE NL80211_CMD_AUTHENTICATE
-#define NL80211_CMD_ASSOCIATE NL80211_CMD_ASSOCIATE
-#define NL80211_CMD_DEAUTHENTICATE NL80211_CMD_DEAUTHENTICATE
-#define NL80211_CMD_DISASSOCIATE NL80211_CMD_DISASSOCIATE
-#define NL80211_CMD_REG_BEACON_HINT NL80211_CMD_REG_BEACON_HINT
-
-#define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS
-
-/* source-level API compatibility */
-#define NL80211_CMD_GET_MESH_PARAMS NL80211_CMD_GET_MESH_CONFIG
-#define NL80211_CMD_SET_MESH_PARAMS NL80211_CMD_SET_MESH_CONFIG
-#define NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE NL80211_MESH_SETUP_IE
-
-/**
- * enum nl80211_attrs - nl80211 netlink attributes
- *
- * @NL80211_ATTR_UNSPEC: unspecified attribute to catch errors
- *
- * @NL80211_ATTR_WIPHY: index of wiphy to operate on, cf.
- *	/sys/class/ieee80211/<phyname>/index
- * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
- * @NL80211_ATTR_WIPHY_TXQ_PARAMS: a nested array of TX queue parameters
- * @NL80211_ATTR_WIPHY_FREQ: frequency of the selected channel in MHz,
- *	defines the channel together with the (deprecated)
- *	%NL80211_ATTR_WIPHY_CHANNEL_TYPE attribute or the attributes
- *	%NL80211_ATTR_CHANNEL_WIDTH and if needed %NL80211_ATTR_CENTER_FREQ1
- *	and %NL80211_ATTR_CENTER_FREQ2
- * @NL80211_ATTR_CHANNEL_WIDTH: u32 attribute containing one of the values
- *	of &enum nl80211_chan_width, describing the channel width. See the
- *	documentation of the enum for more information.
- * @NL80211_ATTR_CENTER_FREQ1: Center frequency of the first part of the
- *	channel, used for anything but 20 MHz bandwidth
- * @NL80211_ATTR_CENTER_FREQ2: Center frequency of the second part of the
- *	channel, used only for 80+80 MHz bandwidth
- * @NL80211_ATTR_WIPHY_CHANNEL_TYPE: included with NL80211_ATTR_WIPHY_FREQ
- *	if HT20 or HT40 are to be used (i.e., HT disabled if not included):
- *	NL80211_CHAN_NO_HT = HT not allowed (i.e., same as not including
- *		this attribute)
- *	NL80211_CHAN_HT20 = HT20 only
- *	NL80211_CHAN_HT40MINUS = secondary channel is below the primary channel
- *	NL80211_CHAN_HT40PLUS = secondary channel is above the primary channel
- *	This attribute is now deprecated.
- * @NL80211_ATTR_WIPHY_RETRY_SHORT: TX retry limit for frames whose length is
- *	less than or equal to the RTS threshold; allowed range: 1..255;
- *	dot11ShortRetryLimit; u8
- * @NL80211_ATTR_WIPHY_RETRY_LONG: TX retry limit for frames whose length is
- *	greater than the RTS threshold; allowed range: 1..255;
- *	dot11ShortLongLimit; u8
- * @NL80211_ATTR_WIPHY_FRAG_THRESHOLD: fragmentation threshold, i.e., maximum
- *	length in octets for frames; allowed range: 256..8000, disable
- *	fragmentation with (u32)-1; dot11FragmentationThreshold; u32
- * @NL80211_ATTR_WIPHY_RTS_THRESHOLD: RTS threshold (TX frames with length
- *	larger than or equal to this use RTS/CTS handshake); allowed range:
- *	0..65536, disable with (u32)-1; dot11RTSThreshold; u32
- * @NL80211_ATTR_WIPHY_COVERAGE_CLASS: Coverage Class as defined by IEEE 802.11
- *	section 7.3.2.9; dot11CoverageClass; u8
- *
- * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
- * @NL80211_ATTR_IFNAME: network interface name
- * @NL80211_ATTR_IFTYPE: type of virtual interface, see &enum nl80211_iftype
- *
- * @NL80211_ATTR_WDEV: wireless device identifier, used for pseudo-devices
- *	that don't have a netdev (u64)
- *
- * @NL80211_ATTR_MAC: MAC address (various uses)
- *
- * @NL80211_ATTR_KEY_DATA: (temporal) key data; for TKIP this consists of
- *	16 bytes encryption key followed by 8 bytes each for TX and RX MIC
- *	keys
- * @NL80211_ATTR_KEY_IDX: key ID (u8, 0-3)
- * @NL80211_ATTR_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11
- *	section 7.3.2.25.1, e.g. 0x000FAC04)
- * @NL80211_ATTR_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
- *	CCMP keys, each six bytes in little endian
- * @NL80211_ATTR_KEY_DEFAULT: Flag attribute indicating the key is default key
- * @NL80211_ATTR_KEY_DEFAULT_MGMT: Flag attribute indicating the key is the
- *	default management key
- * @NL80211_ATTR_CIPHER_SUITES_PAIRWISE: For crypto settings for connect or
- *	other commands, indicates which pairwise cipher suites are used
- * @NL80211_ATTR_CIPHER_SUITE_GROUP: For crypto settings for connect or
- *	other commands, indicates which group cipher suite is used
- *
- * @NL80211_ATTR_BEACON_INTERVAL: beacon interval in TU
- * @NL80211_ATTR_DTIM_PERIOD: DTIM period for beaconing
- * @NL80211_ATTR_BEACON_HEAD: portion of the beacon before the TIM IE
- * @NL80211_ATTR_BEACON_TAIL: portion of the beacon after the TIM IE
- *
- * @NL80211_ATTR_STA_AID: Association ID for the station (u16)
- * @NL80211_ATTR_STA_FLAGS: flags, nested element with NLA_FLAG attributes of
- *	&enum nl80211_sta_flags (deprecated, use %NL80211_ATTR_STA_FLAGS2)
- * @NL80211_ATTR_STA_LISTEN_INTERVAL: listen interval as defined by
- *	IEEE 802.11 7.3.1.6 (u16).
- * @NL80211_ATTR_STA_SUPPORTED_RATES: supported rates, array of supported
- *	rates as defined by IEEE 802.11 7.3.2.2 but without the length
- *	restriction (at most %NL80211_MAX_SUPP_RATES).
- * @NL80211_ATTR_STA_VLAN: interface index of VLAN interface to move station
- *	to, or the AP interface the station was originally added to to.
- * @NL80211_ATTR_STA_INFO: information about a station, part of station info
- *	given for %NL80211_CMD_GET_STATION, nested attribute containing
- *	info as possible, see &enum nl80211_sta_info.
- *
- * @NL80211_ATTR_WIPHY_BANDS: Information about an operating bands,
- *	consisting of a nested array.
- *
- * @NL80211_ATTR_MESH_ID: mesh id (1-32 bytes).
- * @NL80211_ATTR_STA_PLINK_ACTION: action to perform on the mesh peer link
- *	(see &enum nl80211_plink_action).
- * @NL80211_ATTR_MPATH_NEXT_HOP: MAC address of the next hop for a mesh path.
- * @NL80211_ATTR_MPATH_INFO: information about a mesh_path, part of mesh path
- * 	info given for %NL80211_CMD_GET_MPATH, nested attribute described at
- *	&enum nl80211_mpath_info.
- *
- * @NL80211_ATTR_MNTR_FLAGS: flags, nested element with NLA_FLAG attributes of
- *      &enum nl80211_mntr_flags.
- *
- * @NL80211_ATTR_REG_ALPHA2: an ISO-3166-alpha2 country code for which the
- * 	current regulatory domain should be set to or is already set to.
- * 	For example, 'CR', for Costa Rica. This attribute is used by the kernel
- * 	to query the CRDA to retrieve one regulatory domain. This attribute can
- * 	also be used by userspace to query the kernel for the currently set
- * 	regulatory domain. We chose an alpha2 as that is also used by the
- * 	IEEE-802.11 country information element to identify a country.
- * 	Users can also simply ask the wireless core to set regulatory domain
- * 	to a specific alpha2.
- * @NL80211_ATTR_REG_RULES: a nested array of regulatory domain regulatory
- *	rules.
- *
- * @NL80211_ATTR_BSS_CTS_PROT: whether CTS protection is enabled (u8, 0 or 1)
- * @NL80211_ATTR_BSS_SHORT_PREAMBLE: whether short preamble is enabled
- *	(u8, 0 or 1)
- * @NL80211_ATTR_BSS_SHORT_SLOT_TIME: whether short slot time enabled
- *	(u8, 0 or 1)
- * @NL80211_ATTR_BSS_BASIC_RATES: basic rates, array of basic
- *	rates in format defined by IEEE 802.11 7.3.2.2 but without the length
- *	restriction (at most %NL80211_MAX_SUPP_RATES).
- *
- * @NL80211_ATTR_HT_CAPABILITY: HT Capability information element (from
- *	association request when used with NL80211_CMD_NEW_STATION)
- *
- * @NL80211_ATTR_SUPPORTED_IFTYPES: nested attribute containing all
- *	supported interface types, each a flag attribute with the number
- *	of the interface mode.
- *
- * @NL80211_ATTR_MGMT_SUBTYPE: Management frame subtype for
- *	%NL80211_CMD_SET_MGMT_EXTRA_IE.
- *
- * @NL80211_ATTR_IE: Information element(s) data (used, e.g., with
- *	%NL80211_CMD_SET_MGMT_EXTRA_IE).
- *
- * @NL80211_ATTR_MAX_NUM_SCAN_SSIDS: number of SSIDs you can scan with
- *	a single scan request, a wiphy attribute.
- * @NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS: number of SSIDs you can
- *	scan with a single scheduled scan request, a wiphy attribute.
- * @NL80211_ATTR_MAX_SCAN_IE_LEN: maximum length of information elements
- *	that can be added to a scan request
- * @NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN: maximum length of information
- *	elements that can be added to a scheduled scan request
- * @NL80211_ATTR_MAX_MATCH_SETS: maximum number of sets that can be
- *	used with @NL80211_ATTR_SCHED_SCAN_MATCH, a wiphy attribute.
- *
- * @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz)
- * @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive
- *	scanning and include a zero-length SSID (wildcard) for wildcard scan
- * @NL80211_ATTR_BSS: scan result BSS
- *
- * @NL80211_ATTR_REG_INITIATOR: indicates who requested the regulatory domain
- * 	currently in effect. This could be any of the %NL80211_REGDOM_SET_BY_*
- * @NL80211_ATTR_REG_TYPE: indicates the type of the regulatory domain currently
- * 	set. This can be one of the nl80211_reg_type (%NL80211_REGDOM_TYPE_*)
- *
- * @NL80211_ATTR_SUPPORTED_COMMANDS: wiphy attribute that specifies
- *	an array of command numbers (i.e. a mapping index to command number)
- *	that the driver for the given wiphy supports.
- *
- * @NL80211_ATTR_FRAME: frame data (binary attribute), including frame header
- *	and body, but not FCS; used, e.g., with NL80211_CMD_AUTHENTICATE and
- *	NL80211_CMD_ASSOCIATE events
- * @NL80211_ATTR_SSID: SSID (binary attribute, 0..32 octets)
- * @NL80211_ATTR_AUTH_TYPE: AuthenticationType, see &enum nl80211_auth_type,
- *	represented as a u32
- * @NL80211_ATTR_REASON_CODE: ReasonCode for %NL80211_CMD_DEAUTHENTICATE and
- *	%NL80211_CMD_DISASSOCIATE, u16
- *
- * @NL80211_ATTR_KEY_TYPE: Key Type, see &enum nl80211_key_type, represented as
- *	a u32
- *
- * @NL80211_ATTR_FREQ_BEFORE: A channel which has suffered a regulatory change
- * 	due to considerations from a beacon hint. This attribute reflects
- * 	the state of the channel _before_ the beacon hint processing. This
- * 	attributes consists of a nested attribute containing
- * 	NL80211_FREQUENCY_ATTR_*
- * @NL80211_ATTR_FREQ_AFTER: A channel which has suffered a regulatory change
- * 	due to considerations from a beacon hint. This attribute reflects
- * 	the state of the channel _after_ the beacon hint processing. This
- * 	attributes consists of a nested attribute containing
- * 	NL80211_FREQUENCY_ATTR_*
- *
- * @NL80211_ATTR_CIPHER_SUITES: a set of u32 values indicating the supported
- *	cipher suites
- *
- * @NL80211_ATTR_FREQ_FIXED: a flag indicating the IBSS should not try to look
- *	for other networks on different channels
- *
- * @NL80211_ATTR_TIMED_OUT: a flag indicating than an operation timed out; this
- *	is used, e.g., with %NL80211_CMD_AUTHENTICATE event
- *
- * @NL80211_ATTR_USE_MFP: Whether management frame protection (IEEE 802.11w) is
- *	used for the association (&enum nl80211_mfp, represented as a u32);
- *	this attribute can be used
- *	with %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests
- *
- * @NL80211_ATTR_STA_FLAGS2: Attribute containing a
- *	&struct nl80211_sta_flag_update.
- *
- * @NL80211_ATTR_CONTROL_PORT: A flag indicating whether user space controls
- *	IEEE 802.1X port, i.e., sets/clears %NL80211_STA_FLAG_AUTHORIZED, in
- *	station mode. If the flag is included in %NL80211_CMD_ASSOCIATE
- *	request, the driver will assume that the port is unauthorized until
- *	authorized by user space. Otherwise, port is marked authorized by
- *	default in station mode.
- * @NL80211_ATTR_CONTROL_PORT_ETHERTYPE: A 16-bit value indicating the
- *	ethertype that will be used for key negotiation. It can be
- *	specified with the associate and connect commands. If it is not
- *	specified, the value defaults to 0x888E (PAE, 802.1X). This
- *	attribute is also used as a flag in the wiphy information to
- *	indicate that protocols other than PAE are supported.
- * @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with
- *	%NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom
- *	ethertype frames used for key negotiation must not be encrypted.
- *
- * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
- *	We recommend using nested, driver-specific attributes within this.
- *
- * @NL80211_ATTR_DISCONNECTED_BY_AP: A flag indicating that the DISCONNECT
- *	event was due to the AP disconnecting the station, and not due to
- *	a local disconnect request.
- * @NL80211_ATTR_STATUS_CODE: StatusCode for the %NL80211_CMD_CONNECT
- *	event (u16)
- * @NL80211_ATTR_PRIVACY: Flag attribute, used with connect(), indicating
- *	that protected APs should be used. This is also used with NEW_BEACON to
- *	indicate that the BSS is to use protection.
- *
- * @NL80211_ATTR_CIPHERS_PAIRWISE: Used with CONNECT, ASSOCIATE, and NEW_BEACON
- *	to indicate which unicast key ciphers will be used with the connection
- *	(an array of u32).
- * @NL80211_ATTR_CIPHER_GROUP: Used with CONNECT, ASSOCIATE, and NEW_BEACON to
- *	indicate which group key cipher will be used with the connection (a
- *	u32).
- * @NL80211_ATTR_WPA_VERSIONS: Used with CONNECT, ASSOCIATE, and NEW_BEACON to
- *	indicate which WPA version(s) the AP we want to associate with is using
- *	(a u32 with flags from &enum nl80211_wpa_versions).
- * @NL80211_ATTR_AKM_SUITES: Used with CONNECT, ASSOCIATE, and NEW_BEACON to
- *	indicate which key management algorithm(s) to use (an array of u32).
- *
- * @NL80211_ATTR_REQ_IE: (Re)association request information elements as
- *	sent out by the card, for ROAM and successful CONNECT events.
- * @NL80211_ATTR_RESP_IE: (Re)association response information elements as
- *	sent by peer, for ROAM and successful CONNECT events.
- *
- * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE
- *	commands to specify using a reassociate frame
- *
- * @NL80211_ATTR_KEY: key information in a nested attribute with
- *	%NL80211_KEY_* sub-attributes
- * @NL80211_ATTR_KEYS: array of keys for static WEP keys for connect()
- *	and join_ibss(), key information is in a nested attribute each
- *	with %NL80211_KEY_* sub-attributes
- *
- * @NL80211_ATTR_PID: Process ID of a network namespace.
- *
- * @NL80211_ATTR_GENERATION: Used to indicate consistent snapshots for
- *	dumps. This number increases whenever the object list being
- *	dumped changes, and as such userspace can verify that it has
- *	obtained a complete and consistent snapshot by verifying that
- *	all dump messages contain the same generation number. If it
- *	changed then the list changed and the dump should be repeated
- *	completely from scratch.
- *
- * @NL80211_ATTR_4ADDR: Use 4-address frames on a virtual interface
- *
- * @NL80211_ATTR_SURVEY_INFO: survey information about a channel, part of
- *      the survey response for %NL80211_CMD_GET_SURVEY, nested attribute
- *      containing info as possible, see &enum survey_info.
- *
- * @NL80211_ATTR_PMKID: PMK material for PMKSA caching.
- * @NL80211_ATTR_MAX_NUM_PMKIDS: maximum number of PMKIDs a firmware can
- *	cache, a wiphy attribute.
- *
- * @NL80211_ATTR_DURATION: Duration of an operation in milliseconds, u32.
- * @NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION: Device attribute that
- *	specifies the maximum duration that can be requested with the
- *	remain-on-channel operation, in milliseconds, u32.
- *
- * @NL80211_ATTR_COOKIE: Generic 64-bit cookie to identify objects.
- *
- * @NL80211_ATTR_TX_RATES: Nested set of attributes
- *	(enum nl80211_tx_rate_attributes) describing TX rates per band. The
- *	enum nl80211_band value is used as the index (nla_type() of the nested
- *	data. If a band is not included, it will be configured to allow all
- *	rates based on negotiated supported rates information. This attribute
- *	is used with %NL80211_CMD_SET_TX_BITRATE_MASK.
- *
- * @NL80211_ATTR_FRAME_MATCH: A binary attribute which typically must contain
- *	at least one byte, currently used with @NL80211_CMD_REGISTER_FRAME.
- * @NL80211_ATTR_FRAME_TYPE: A u16 indicating the frame type/subtype for the
- *	@NL80211_CMD_REGISTER_FRAME command.
- * @NL80211_ATTR_TX_FRAME_TYPES: wiphy capability attribute, which is a
- *	nested attribute of %NL80211_ATTR_FRAME_TYPE attributes, containing
- *	information about which frame types can be transmitted with
- *	%NL80211_CMD_FRAME.
- * @NL80211_ATTR_RX_FRAME_TYPES: wiphy capability attribute, which is a
- *	nested attribute of %NL80211_ATTR_FRAME_TYPE attributes, containing
- *	information about which frame types can be registered for RX.
- *
- * @NL80211_ATTR_ACK: Flag attribute indicating that the frame was
- *	acknowledged by the recipient.
- *
- * @NL80211_ATTR_PS_STATE: powersave state, using &enum nl80211_ps_state values.
- *
- * @NL80211_ATTR_CQM: connection quality monitor configuration in a
- *	nested attribute with %NL80211_ATTR_CQM_* sub-attributes.
- *
- * @NL80211_ATTR_LOCAL_STATE_CHANGE: Flag attribute to indicate that a command
- *	is requesting a local authentication/association state change without
- *	invoking actual management frame exchange. This can be used with
- *	NL80211_CMD_AUTHENTICATE, NL80211_CMD_DEAUTHENTICATE,
- *	NL80211_CMD_DISASSOCIATE.
- *
- * @NL80211_ATTR_AP_ISOLATE: (AP mode) Do not forward traffic between stations
- *	connected to this BSS.
- *
- * @NL80211_ATTR_WIPHY_TX_POWER_SETTING: Transmit power setting type. See
- *      &enum nl80211_tx_power_setting for possible values.
- * @NL80211_ATTR_WIPHY_TX_POWER_LEVEL: Transmit power level in signed mBm units.
- *      This is used in association with @NL80211_ATTR_WIPHY_TX_POWER_SETTING
- *      for non-automatic settings.
- *
- * @NL80211_ATTR_SUPPORT_IBSS_RSN: The device supports IBSS RSN, which mostly
- *	means support for per-station GTKs.
- *
- * @NL80211_ATTR_WIPHY_ANTENNA_TX: Bitmap of allowed antennas for transmitting.
- *	This can be used to mask out antennas which are not attached or should
- *	not be used for transmitting. If an antenna is not selected in this
- *	bitmap the hardware is not allowed to transmit on this antenna.
- *
- *	Each bit represents one antenna, starting with antenna 1 at the first
- *	bit. Depending on which antennas are selected in the bitmap, 802.11n
- *	drivers can derive which chainmasks to use (if all antennas belonging to
- *	a particular chain are disabled this chain should be disabled) and if
- *	a chain has diversity antennas wether diversity should be used or not.
- *	HT capabilities (STBC, TX Beamforming, Antenna selection) can be
- *	derived from the available chains after applying the antenna mask.
- *	Non-802.11n drivers can derive wether to use diversity or not.
- *	Drivers may reject configurations or RX/TX mask combinations they cannot
- *	support by returning -EINVAL.
- *
- * @NL80211_ATTR_WIPHY_ANTENNA_RX: Bitmap of allowed antennas for receiving.
- *	This can be used to mask out antennas which are not attached or should
- *	not be used for receiving. If an antenna is not selected in this bitmap
- *	the hardware should not be configured to receive on this antenna.
- *	For a more detailed description see @NL80211_ATTR_WIPHY_ANTENNA_TX.
- *
- * @NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX: Bitmap of antennas which are available
- *	for configuration as TX antennas via the above parameters.
- *
- * @NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX: Bitmap of antennas which are available
- *	for configuration as RX antennas via the above parameters.
- *
- * @NL80211_ATTR_MCAST_RATE: Multicast tx rate (in 100 kbps) for IBSS
- *
- * @NL80211_ATTR_OFFCHANNEL_TX_OK: For management frame TX, the frame may be
- *	transmitted on another channel when the channel given doesn't match
- *	the current channel. If the current channel doesn't match and this
- *	flag isn't set, the frame will be rejected. This is also used as an
- *	nl80211 capability flag.
- *
- * @NL80211_ATTR_BSS_HT_OPMODE: HT operation mode (u16)
- *
- * @NL80211_ATTR_KEY_DEFAULT_TYPES: A nested attribute containing flags
- *	attributes, specifying what a key should be set as default as.
- *	See &enum nl80211_key_default_types.
- *
- * @NL80211_ATTR_MESH_SETUP: Optional mesh setup parameters.  These cannot be
- *	changed once the mesh is active.
- * @NL80211_ATTR_MESH_CONFIG: Mesh configuration parameters, a nested attribute
- *	containing attributes from &enum nl80211_meshconf_params.
- * @NL80211_ATTR_SUPPORT_MESH_AUTH: Currently, this means the underlying driver
- *	allows auth frames in a mesh to be passed to userspace for processing via
- *	the @NL80211_MESH_SETUP_USERSPACE_AUTH flag.
- * @NL80211_ATTR_STA_PLINK_STATE: The state of a mesh peer link as defined in
- *	&enum nl80211_plink_state. Used when userspace is driving the peer link
- *	management state machine.  @NL80211_MESH_SETUP_USERSPACE_AMPE or
- *	@NL80211_MESH_SETUP_USERSPACE_MPM must be enabled.
- *
- * @NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED: indicates, as part of the wiphy
- *	capabilities, the supported WoWLAN triggers
- * @NL80211_ATTR_WOWLAN_TRIGGERS: used by %NL80211_CMD_SET_WOWLAN to
- *	indicate which WoW triggers should be enabled. This is also
- *	used by %NL80211_CMD_GET_WOWLAN to get the currently enabled WoWLAN
- *	triggers.
- *
- * @NL80211_ATTR_SCHED_SCAN_INTERVAL: Interval between scheduled scan
- *	cycles, in msecs.
- *
- * @NL80211_ATTR_SCHED_SCAN_MATCH: Nested attribute with one or more
- *	sets of attributes to match during scheduled scans.  Only BSSs
- *	that match any of the sets will be reported.  These are
- *	pass-thru filter rules.
- *	For a match to succeed, the BSS must match all attributes of a
- *	set.  Since not every hardware supports matching all types of
- *	attributes, there is no guarantee that the reported BSSs are
- *	fully complying with the match sets and userspace needs to be
- *	able to ignore them by itself.
- *	Thus, the implementation is somewhat hardware-dependent, but
- *	this is only an optimization and the userspace application
- *	needs to handle all the non-filtered results anyway.
- *	If the match attributes don't make sense when combined with
- *	the values passed in @NL80211_ATTR_SCAN_SSIDS (eg. if an SSID
- *	is included in the probe request, but the match attributes
- *	will never let it go through), -EINVAL may be returned.
- *	If ommited, no filtering is done.
- *
- * @NL80211_ATTR_INTERFACE_COMBINATIONS: Nested attribute listing the supported
- *	interface combinations. In each nested item, it contains attributes
- *	defined in &enum nl80211_if_combination_attrs.
- * @NL80211_ATTR_SOFTWARE_IFTYPES: Nested attribute (just like
- *	%NL80211_ATTR_SUPPORTED_IFTYPES) containing the interface types that
- *	are managed in software: interfaces of these types aren't subject to
- *	any restrictions in their number or combinations.
- *
- * @NL80211_ATTR_REKEY_DATA: nested attribute containing the information
- *	necessary for GTK rekeying in the device, see &enum nl80211_rekey_data.
- *
- * @NL80211_ATTR_SCAN_SUPP_RATES: rates per to be advertised as supported in scan,
- *	nested array attribute containing an entry for each band, with the entry
- *	being a list of supported rates as defined by IEEE 802.11 7.3.2.2 but
- *	without the length restriction (at most %NL80211_MAX_SUPP_RATES).
- *
- * @NL80211_ATTR_HIDDEN_SSID: indicates whether SSID is to be hidden from Beacon
- *	and Probe Response (when response to wildcard Probe Request); see
- *	&enum nl80211_hidden_ssid, represented as a u32
- *
- * @NL80211_ATTR_IE_PROBE_RESP: Information element(s) for Probe Response frame.
- *	This is used with %NL80211_CMD_NEW_BEACON and %NL80211_CMD_SET_BEACON to
- *	provide extra IEs (e.g., WPS/P2P IE) into Probe Response frames when the
- *	driver (or firmware) replies to Probe Request frames.
- * @NL80211_ATTR_IE_ASSOC_RESP: Information element(s) for (Re)Association
- *	Response frames. This is used with %NL80211_CMD_NEW_BEACON and
- *	%NL80211_CMD_SET_BEACON to provide extra IEs (e.g., WPS/P2P IE) into
- *	(Re)Association Response frames when the driver (or firmware) replies to
- *	(Re)Association Request frames.
- *
- * @NL80211_ATTR_STA_WME: Nested attribute containing the wme configuration
- *	of the station, see &enum nl80211_sta_wme_attr.
- * @NL80211_ATTR_SUPPORT_AP_UAPSD: the device supports uapsd when working
- *	as AP.
- *
- * @NL80211_ATTR_ROAM_SUPPORT: Indicates whether the firmware is capable of
- *	roaming to another AP in the same ESS if the signal lever is low.
- *
- * @NL80211_ATTR_PMKSA_CANDIDATE: Nested attribute containing the PMKSA caching
- *	candidate information, see &enum nl80211_pmksa_candidate_attr.
- *
- * @NL80211_ATTR_TX_NO_CCK_RATE: Indicates whether to use CCK rate or not
- *	for management frames transmission. In order to avoid p2p probe/action
- *	frames are being transmitted at CCK rate in 2GHz band, the user space
- *	applications use this attribute.
- *	This attribute is used with %NL80211_CMD_TRIGGER_SCAN and
- *	%NL80211_CMD_FRAME commands.
- *
- * @NL80211_ATTR_TDLS_ACTION: Low level TDLS action code (e.g. link setup
- *	request, link setup confirm, link teardown, etc.). Values are
- *	described in the TDLS (802.11z) specification.
- * @NL80211_ATTR_TDLS_DIALOG_TOKEN: Non-zero token for uniquely identifying a
- *	TDLS conversation between two devices.
- * @NL80211_ATTR_TDLS_OPERATION: High level TDLS operation; see
- *	&enum nl80211_tdls_operation, represented as a u8.
- * @NL80211_ATTR_TDLS_SUPPORT: A flag indicating the device can operate
- *	as a TDLS peer sta.
- * @NL80211_ATTR_TDLS_EXTERNAL_SETUP: The TDLS discovery/setup and teardown
- *	procedures should be performed by sending TDLS packets via
- *	%NL80211_CMD_TDLS_MGMT. Otherwise %NL80211_CMD_TDLS_OPER should be
- *	used for asking the driver to perform a TDLS operation.
- *
- * @NL80211_ATTR_DEVICE_AP_SME: This u32 attribute may be listed for devices
- *	that have AP support to indicate that they have the AP SME integrated
- *	with support for the features listed in this attribute, see
- *	&enum nl80211_ap_sme_features.
- *
- * @NL80211_ATTR_DONT_WAIT_FOR_ACK: Used with %NL80211_CMD_FRAME, this tells
- *	the driver to not wait for an acknowledgement. Note that due to this,
- *	it will also not give a status callback nor return a cookie. This is
- *	mostly useful for probe responses to save airtime.
- *
- * @NL80211_ATTR_FEATURE_FLAGS: This u32 attribute contains flags from
- *	&enum nl80211_feature_flags and is advertised in wiphy information.
- * @NL80211_ATTR_PROBE_RESP_OFFLOAD: Indicates that the HW responds to probe
- *	requests while operating in AP-mode.
- *	This attribute holds a bitmap of the supported protocols for
- *	offloading (see &enum nl80211_probe_resp_offload_support_attr).
- *
- * @NL80211_ATTR_PROBE_RESP: Probe Response template data. Contains the entire
- *	probe-response frame. The DA field in the 802.11 header is zero-ed out,
- *	to be filled by the FW.
- * @NL80211_ATTR_DISABLE_HT:  Force HT capable interfaces to disable
- *      this feature.  Currently, only supported in mac80211 drivers.
- * @NL80211_ATTR_HT_CAPABILITY_MASK: Specify which bits of the
- *      ATTR_HT_CAPABILITY to which attention should be paid.
- *      Currently, only mac80211 NICs support this feature.
- *      The values that may be configured are:
- *       MCS rates, MAX-AMSDU, HT-20-40 and HT_CAP_SGI_40
- *       AMPDU density and AMPDU factor.
- *      All values are treated as suggestions and may be ignored
- *      by the driver as required.  The actual values may be seen in
- *      the station debugfs ht_caps file.
- *
- * @NL80211_ATTR_DFS_REGION: region for regulatory rules which this country
- *    abides to when initiating radiation on DFS channels. A country maps
- *    to one DFS region.
- *
- * @NL80211_ATTR_NOACK_MAP: This u16 bitmap contains the No Ack Policy of
- *      up to 16 TIDs.
- *
- * @NL80211_ATTR_INACTIVITY_TIMEOUT: timeout value in seconds, this can be
- *	used by the drivers which has MLME in firmware and does not have support
- *	to report per station tx/rx activity to free up the staion entry from
- *	the list. This needs to be used when the driver advertises the
- *	capability to timeout the stations.
- *
- * @NL80211_ATTR_RX_SIGNAL_DBM: signal strength in dBm (as a 32-bit int);
- *	this attribute is (depending on the driver capabilities) added to
- *	received frames indicated with %NL80211_CMD_FRAME.
- *
- * @NL80211_ATTR_BG_SCAN_PERIOD: Background scan period in seconds
- *      or 0 to disable background scan.
- *
- * @NL80211_ATTR_USER_REG_HINT_TYPE: type of regulatory hint passed from
- *	userspace. If unset it is assumed the hint comes directly from
- *	a user. If set code could specify exactly what type of source
- *	was used to provide the hint. For the different types of
- *	allowed user regulatory hints see nl80211_user_reg_hint_type.
- *
- * @NL80211_ATTR_CONN_FAILED_REASON: The reason for which AP has rejected
- *	the connection request from a station. nl80211_connect_failed_reason
- *	enum has different reasons of connection failure.
- *
- * @NL80211_ATTR_SAE_DATA: SAE elements in Authentication frames. This starts
- *	with the Authentication transaction sequence number field.
- *
- * @NL80211_ATTR_VHT_CAPABILITY: VHT Capability information element (from
- *	association request when used with NL80211_CMD_NEW_STATION)
- *
- * @NL80211_ATTR_SCAN_FLAGS: scan request control flags (u32)
- *
- * @NL80211_ATTR_P2P_CTWINDOW: P2P GO Client Traffic Window (u8), used with
- *	the START_AP and SET_BSS commands
- * @NL80211_ATTR_P2P_OPPPS: P2P GO opportunistic PS (u8), used with the
- *	START_AP and SET_BSS commands. This can have the values 0 or 1;
- *	if not given in START_AP 0 is assumed, if not given in SET_BSS
- *	no change is made.
- *
- * @NL80211_ATTR_LOCAL_MESH_POWER_MODE: local mesh STA link-specific power mode
- *	defined in &enum nl80211_mesh_power_mode.
- *
- * @NL80211_ATTR_ACL_POLICY: ACL policy, see &enum nl80211_acl_policy,
- *	carried in a u32 attribute
- *
- * @NL80211_ATTR_MAC_ADDRS: Array of nested MAC addresses, used for
- *	MAC ACL.
- *
- * @NL80211_ATTR_MAC_ACL_MAX: u32 attribute to advertise the maximum
- *	number of MAC addresses that a device can support for MAC
- *	ACL.
- *
- * @NL80211_ATTR_RADAR_EVENT: Type of radar event for notification to userspace,
- *	contains a value of enum nl80211_radar_event (u32).
- *
- * @NL80211_ATTR_EXT_CAPA: 802.11 extended capabilities that the kernel driver
- *	has and handles. The format is the same as the IE contents. See
- *	802.11-2012 8.4.2.29 for more information.
- * @NL80211_ATTR_EXT_CAPA_MASK: Extended capabilities that the kernel driver
- *	has set in the %NL80211_ATTR_EXT_CAPA value, for multibit fields.
- *
- * @NL80211_ATTR_STA_CAPABILITY: Station capabilities (u16) are advertised to
- *	the driver, e.g., to enable TDLS power save (PU-APSD).
- *
- * @NL80211_ATTR_STA_EXT_CAPABILITY: Station extended capabilities are
- *	advertised to the driver, e.g., to enable TDLS off channel operations
- *	and PU-APSD.
- *
- * @NL80211_ATTR_PROTOCOL_FEATURES: global nl80211 feature flags, see
- *	&enum nl80211_protocol_features, the attribute is a u32.
- *
- * @NL80211_ATTR_SPLIT_WIPHY_DUMP: flag attribute, userspace supports
- *	receiving the data for a single wiphy split across multiple
- *	messages, given with wiphy dump message
- *
- * @NL80211_ATTR_MDID: Mobility Domain Identifier
- *
- * @NL80211_ATTR_IE_RIC: Resource Information Container Information
- *	Element
- *
- * @NL80211_ATTR_CRIT_PROT_ID: critical protocol identifier requiring increased
- *	reliability, see &enum nl80211_crit_proto_id (u16).
- * @NL80211_ATTR_MAX_CRIT_PROT_DURATION: duration in milliseconds in which
- *      the connection should have increased reliability (u16).
- *
- * @NL80211_ATTR_PEER_AID: Association ID for the peer TDLS station (u16).
- *	This is similar to @NL80211_ATTR_STA_AID but with a difference of being
- *	allowed to be used with the first @NL80211_CMD_SET_STATION command to
- *	update a TDLS peer STA entry.
- *
- * @NL80211_ATTR_COALESCE_RULE: Coalesce rule information.
- *
- * @NL80211_ATTR_CH_SWITCH_COUNT: u32 attribute specifying the number of TBTT's
- *	until the channel switch event.
- * @NL80211_ATTR_CH_SWITCH_BLOCK_TX: flag attribute specifying that transmission
- *	must be blocked on the current channel (before the channel switch
- *	operation).
- * @NL80211_ATTR_CSA_IES: Nested set of attributes containing the IE information
- *	for the time while performing a channel switch.
- * @NL80211_ATTR_CSA_C_OFF_BEACON: An array of offsets (u16) to the channel
- *	switch counters in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
- * @NL80211_ATTR_CSA_C_OFF_PRESP: An array of offsets (u16) to the channel
- *	switch counters in the probe response (%NL80211_ATTR_PROBE_RESP).
- *
- * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32.
- *	As specified in the &enum nl80211_rxmgmt_flags.
- *
- * @NL80211_ATTR_STA_SUPPORTED_CHANNELS: array of supported channels.
- *
- * @NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES: array of supported
- *      supported operating classes.
- *
- * @NL80211_ATTR_HANDLE_DFS: A flag indicating whether user space
- *	controls DFS operation in IBSS mode. If the flag is included in
- *	%NL80211_CMD_JOIN_IBSS request, the driver will allow use of DFS
- *	channels and reports radar events to userspace. Userspace is required
- *	to react to radar events, e.g. initiate a channel switch or leave the
- *	IBSS network.
- *
- * @NL80211_ATTR_SUPPORT_5_MHZ: A flag indicating that the device supports
- *	5 MHz channel bandwidth.
- * @NL80211_ATTR_SUPPORT_10_MHZ: A flag indicating that the device supports
- *	10 MHz channel bandwidth.
- *
- * @NL80211_ATTR_OPMODE_NOTIF: Operating mode field from Operating Mode
- *	Notification Element based on association request when used with
- *	%NL80211_CMD_NEW_STATION; u8 attribute.
- *
- * @NL80211_ATTR_VENDOR_ID: The vendor ID, either a 24-bit OUI or, if
- *	%NL80211_VENDOR_ID_IS_LINUX is set, a special Linux ID (not used yet)
- * @NL80211_ATTR_VENDOR_SUBCMD: vendor sub-command
- * @NL80211_ATTR_VENDOR_DATA: data for the vendor command, if any; this
- *	attribute is also used for vendor command feature advertisement
- * @NL80211_ATTR_VENDOR_EVENTS: used for event list advertising in the wiphy
- *	info, containing a nested array of possible events
- *
- * @NL80211_ATTR_QOS_MAP: IP DSCP mapping for Interworking QoS mapping. This
- *	data is in the format defined for the payload of the QoS Map Set element
- *	in IEEE Std 802.11-2012, 8.4.2.97.
- *
- * @NL80211_ATTR_MAC_HINT: MAC address recommendation as initial BSS
- * @NL80211_ATTR_WIPHY_FREQ_HINT: frequency of the recommended initial BSS
- *
- * @NL80211_ATTR_MAX_AP_ASSOC_STA: Device attribute that indicates how many
- *	associated stations are supported in AP mode (including P2P GO); u32.
- *	Since drivers may not have a fixed limit on the maximum number (e.g.,
- *	other concurrent operations may affect this), drivers are allowed to
- *	advertise values that cannot always be met. In such cases, an attempt
- *	to add a new station entry with @NL80211_CMD_NEW_STATION may fail.
- *
- * @NL80211_ATTR_CSA_C_OFFSETS_TX: An array of csa counter offsets (u16) which
- *	should be updated when the frame is transmitted.
- * @NL80211_ATTR_MAX_CSA_COUNTERS: U8 attribute used to advertise the maximum
- *	supported number of csa counters.
- *
- * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32.
- *	As specified in the &enum nl80211_tdls_peer_capability.
- *
- * @NL80211_ATTR_SOCKET_OWNER: Flag attribute, if set during interface
- *	creation then the new interface will be owned by the netlink socket
- *	that created it and will be destroyed when the socket is closed.
- *	If set during scheduled scan start then the new scan req will be
- *	owned by the netlink socket that created it and the scheduled scan will
- *	be stopped when the socket is closed.
- *	If set during configuration of regulatory indoor operation then the
- *	regulatory indoor configuration would be owned by the netlink socket
- *	that configured the indoor setting, and the indoor operation would be
- *	cleared when the socket is closed.
- *
- * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
- *	the TDLS link initiator.
- *
- * @NL80211_ATTR_USE_RRM: flag for indicating whether the current connection
- *	shall support Radio Resource Measurements (11k). This attribute can be
- *	used with %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests.
- *	User space applications are expected to use this flag only if the
- *	underlying device supports these minimal RRM features:
- *		%NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES,
- *		%NL80211_FEATURE_QUIET,
- *	If this flag is used, driver must add the Power Capabilities IE to the
- *	association request. In addition, it must also set the RRM capability
- *	flag in the association request's Capability Info field.
- *
- * @NL80211_ATTR_WIPHY_DYN_ACK: flag attribute used to enable ACK timeout
- *	estimation algorithm (dynack). In order to activate dynack
- *	%NL80211_FEATURE_ACKTO_ESTIMATION feature flag must be set by lower
- *	drivers to indicate dynack capability. Dynack is automatically disabled
- *	setting valid value for coverage class.
- *
- * @NL80211_ATTR_TSID: a TSID value (u8 attribute)
- * @NL80211_ATTR_USER_PRIO: user priority value (u8 attribute)
- * @NL80211_ATTR_ADMITTED_TIME: admitted time in units of 32 microseconds
- *	(per second) (u16 attribute)
- *
- * @NL80211_ATTR_SMPS_MODE: SMPS mode to use (ap mode). see
- *	&enum nl80211_smps_mode.
- *
- * @NL80211_ATTR_OPER_CLASS: operating class
- *
- * @NL80211_ATTR_MAC_MASK: MAC address mask
- *
- * @NL80211_ATTR_WIPHY_SELF_MANAGED_REG: flag attribute indicating this device
- *	is self-managing its regulatory information and any regulatory domain
- *	obtained from it is coming from the device's wiphy and not the global
- *	cfg80211 regdomain.
- *
- * @NL80211_ATTR_EXT_FEATURES: extended feature flags contained in a byte
- *	array. The feature flags are identified by their bit index (see &enum
- *	nl80211_ext_feature_index). The bit index is ordered starting at the
- *	least-significant bit of the first byte in the array, ie. bit index 0
- *	is located at bit 0 of byte 0. bit index 25 would be located at bit 1
- *	of byte 3 (u8 array).
- *
- * @NL80211_ATTR_SURVEY_RADIO_STATS: Request overall radio statistics to be
- *	returned along with other survey data. If set, @NL80211_CMD_GET_SURVEY
- *	may return a survey entry without a channel indicating global radio
- *	statistics (only some values are valid and make sense.)
- *	For devices that don't return such an entry even then, the information
- *	should be contained in the result as the sum of the respective counters
- *	over all channels.
- *
- * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a
- *	scheduled scan (or a WoWLAN net-detect scan) is started, u32
- *	in seconds.
-
- * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
- *      is operating in an indoor environment.
- *
- * @NL80211_ATTR_MAX_NUM_SCHED_SCAN_PLANS: maximum number of scan plans for
- *	scheduled scan supported by the device (u32), a wiphy attribute.
- * @NL80211_ATTR_MAX_SCAN_PLAN_INTERVAL: maximum interval (in seconds) for
- *	a scan plan (u32), a wiphy attribute.
- * @NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS: maximum number of iterations in
- *	a scan plan (u32), a wiphy attribute.
- * @NL80211_ATTR_SCHED_SCAN_PLANS: a list of scan plans for scheduled scan.
- *	Each scan plan defines the number of scan iterations and the interval
- *	between scans. The last scan plan will always run infinitely,
- *	thus it must not specify the number of iterations, only the interval
- *	between scans. The scan plans are executed sequentially.
- *	Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
- *
- * @NUM_NL80211_ATTR: total number of nl80211_attrs available
- * @NL80211_ATTR_MAX: highest attribute number currently defined
- * @__NL80211_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_attrs {
-/* don't change the order or add anything between, this is ABI! */
-	NL80211_ATTR_UNSPEC,
-
-	NL80211_ATTR_WIPHY,
-	NL80211_ATTR_WIPHY_NAME,
-
-	NL80211_ATTR_IFINDEX,
-	NL80211_ATTR_IFNAME,
-	NL80211_ATTR_IFTYPE,
-
-	NL80211_ATTR_MAC,
-
-	NL80211_ATTR_KEY_DATA,
-	NL80211_ATTR_KEY_IDX,
-	NL80211_ATTR_KEY_CIPHER,
-	NL80211_ATTR_KEY_SEQ,
-	NL80211_ATTR_KEY_DEFAULT,
-
-	NL80211_ATTR_BEACON_INTERVAL,
-	NL80211_ATTR_DTIM_PERIOD,
-	NL80211_ATTR_BEACON_HEAD,
-	NL80211_ATTR_BEACON_TAIL,
-
-	NL80211_ATTR_STA_AID,
-	NL80211_ATTR_STA_FLAGS,
-	NL80211_ATTR_STA_LISTEN_INTERVAL,
-	NL80211_ATTR_STA_SUPPORTED_RATES,
-	NL80211_ATTR_STA_VLAN,
-	NL80211_ATTR_STA_INFO,
-
-	NL80211_ATTR_WIPHY_BANDS,
-
-	NL80211_ATTR_MNTR_FLAGS,
-
-	NL80211_ATTR_MESH_ID,
-	NL80211_ATTR_STA_PLINK_ACTION,
-	NL80211_ATTR_MPATH_NEXT_HOP,
-	NL80211_ATTR_MPATH_INFO,
-
-	NL80211_ATTR_BSS_CTS_PROT,
-	NL80211_ATTR_BSS_SHORT_PREAMBLE,
-	NL80211_ATTR_BSS_SHORT_SLOT_TIME,
-
-	NL80211_ATTR_HT_CAPABILITY,
-
-	NL80211_ATTR_SUPPORTED_IFTYPES,
-
-	NL80211_ATTR_REG_ALPHA2,
-	NL80211_ATTR_REG_RULES,
-
-	NL80211_ATTR_MESH_CONFIG,
-
-	NL80211_ATTR_BSS_BASIC_RATES,
-
-	NL80211_ATTR_WIPHY_TXQ_PARAMS,
-	NL80211_ATTR_WIPHY_FREQ,
-	NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-
-	NL80211_ATTR_KEY_DEFAULT_MGMT,
-
-	NL80211_ATTR_MGMT_SUBTYPE,
-	NL80211_ATTR_IE,
-
-	NL80211_ATTR_MAX_NUM_SCAN_SSIDS,
-
-	NL80211_ATTR_SCAN_FREQUENCIES,
-	NL80211_ATTR_SCAN_SSIDS,
-	NL80211_ATTR_GENERATION, /* replaces old SCAN_GENERATION */
-	NL80211_ATTR_BSS,
-
-	NL80211_ATTR_REG_INITIATOR,
-	NL80211_ATTR_REG_TYPE,
-
-	NL80211_ATTR_SUPPORTED_COMMANDS,
-
-	NL80211_ATTR_FRAME,
-	NL80211_ATTR_SSID,
-	NL80211_ATTR_AUTH_TYPE,
-	NL80211_ATTR_REASON_CODE,
-
-	NL80211_ATTR_KEY_TYPE,
-
-	NL80211_ATTR_MAX_SCAN_IE_LEN,
-	NL80211_ATTR_CIPHER_SUITES,
-
-	NL80211_ATTR_FREQ_BEFORE,
-	NL80211_ATTR_FREQ_AFTER,
-
-	NL80211_ATTR_FREQ_FIXED,
-
-
-	NL80211_ATTR_WIPHY_RETRY_SHORT,
-	NL80211_ATTR_WIPHY_RETRY_LONG,
-	NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
-	NL80211_ATTR_WIPHY_RTS_THRESHOLD,
-
-	NL80211_ATTR_TIMED_OUT,
-
-	NL80211_ATTR_USE_MFP,
-
-	NL80211_ATTR_STA_FLAGS2,
-
-	NL80211_ATTR_CONTROL_PORT,
-
-	NL80211_ATTR_TESTDATA,
-
-	NL80211_ATTR_PRIVACY,
-
-	NL80211_ATTR_DISCONNECTED_BY_AP,
-	NL80211_ATTR_STATUS_CODE,
-
-	NL80211_ATTR_CIPHER_SUITES_PAIRWISE,
-	NL80211_ATTR_CIPHER_SUITE_GROUP,
-	NL80211_ATTR_WPA_VERSIONS,
-	NL80211_ATTR_AKM_SUITES,
-
-	NL80211_ATTR_REQ_IE,
-	NL80211_ATTR_RESP_IE,
-
-	NL80211_ATTR_PREV_BSSID,
-
-	NL80211_ATTR_KEY,
-	NL80211_ATTR_KEYS,
-
-	NL80211_ATTR_PID,
-
-	NL80211_ATTR_4ADDR,
-
-	NL80211_ATTR_SURVEY_INFO,
-
-	NL80211_ATTR_PMKID,
-	NL80211_ATTR_MAX_NUM_PMKIDS,
-
-	NL80211_ATTR_DURATION,
-
-	NL80211_ATTR_COOKIE,
-
-	NL80211_ATTR_WIPHY_COVERAGE_CLASS,
-
-	NL80211_ATTR_TX_RATES,
-
-	NL80211_ATTR_FRAME_MATCH,
-
-	NL80211_ATTR_ACK,
-
-	NL80211_ATTR_PS_STATE,
-
-	NL80211_ATTR_CQM,
-
-	NL80211_ATTR_LOCAL_STATE_CHANGE,
-
-	NL80211_ATTR_AP_ISOLATE,
-
-	NL80211_ATTR_WIPHY_TX_POWER_SETTING,
-	NL80211_ATTR_WIPHY_TX_POWER_LEVEL,
-
-	NL80211_ATTR_TX_FRAME_TYPES,
-	NL80211_ATTR_RX_FRAME_TYPES,
-	NL80211_ATTR_FRAME_TYPE,
-
-	NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
-	NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,
-
-	NL80211_ATTR_SUPPORT_IBSS_RSN,
-
-	NL80211_ATTR_WIPHY_ANTENNA_TX,
-	NL80211_ATTR_WIPHY_ANTENNA_RX,
-
-	NL80211_ATTR_MCAST_RATE,
-
-	NL80211_ATTR_OFFCHANNEL_TX_OK,
-
-	NL80211_ATTR_BSS_HT_OPMODE,
-
-	NL80211_ATTR_KEY_DEFAULT_TYPES,
-
-	NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION,
-
-	NL80211_ATTR_MESH_SETUP,
-
-	NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX,
-	NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX,
-
-	NL80211_ATTR_SUPPORT_MESH_AUTH,
-	NL80211_ATTR_STA_PLINK_STATE,
-
-	NL80211_ATTR_WOWLAN_TRIGGERS,
-	NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED,
-
-	NL80211_ATTR_SCHED_SCAN_INTERVAL,
-
-	NL80211_ATTR_INTERFACE_COMBINATIONS,
-	NL80211_ATTR_SOFTWARE_IFTYPES,
-
-	NL80211_ATTR_REKEY_DATA,
-
-	NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS,
-	NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN,
-
-	NL80211_ATTR_SCAN_SUPP_RATES,
-
-	NL80211_ATTR_HIDDEN_SSID,
-
-	NL80211_ATTR_IE_PROBE_RESP,
-	NL80211_ATTR_IE_ASSOC_RESP,
-
-	NL80211_ATTR_STA_WME,
-	NL80211_ATTR_SUPPORT_AP_UAPSD,
-
-	NL80211_ATTR_ROAM_SUPPORT,
-
-	NL80211_ATTR_SCHED_SCAN_MATCH,
-	NL80211_ATTR_MAX_MATCH_SETS,
-
-	NL80211_ATTR_PMKSA_CANDIDATE,
-
-	NL80211_ATTR_TX_NO_CCK_RATE,
-
-	NL80211_ATTR_TDLS_ACTION,
-	NL80211_ATTR_TDLS_DIALOG_TOKEN,
-	NL80211_ATTR_TDLS_OPERATION,
-	NL80211_ATTR_TDLS_SUPPORT,
-	NL80211_ATTR_TDLS_EXTERNAL_SETUP,
-
-	NL80211_ATTR_DEVICE_AP_SME,
-
-	NL80211_ATTR_DONT_WAIT_FOR_ACK,
-
-	NL80211_ATTR_FEATURE_FLAGS,
-
-	NL80211_ATTR_PROBE_RESP_OFFLOAD,
-
-	NL80211_ATTR_PROBE_RESP,
-
-	NL80211_ATTR_DFS_REGION,
-
-	NL80211_ATTR_DISABLE_HT,
-	NL80211_ATTR_HT_CAPABILITY_MASK,
-
-	NL80211_ATTR_NOACK_MAP,
-
-	NL80211_ATTR_INACTIVITY_TIMEOUT,
-
-	NL80211_ATTR_RX_SIGNAL_DBM,
-
-	NL80211_ATTR_BG_SCAN_PERIOD,
-
-	NL80211_ATTR_WDEV,
-
-	NL80211_ATTR_USER_REG_HINT_TYPE,
-
-	NL80211_ATTR_CONN_FAILED_REASON,
-
-	NL80211_ATTR_SAE_DATA,
-
-	NL80211_ATTR_VHT_CAPABILITY,
-
-	NL80211_ATTR_SCAN_FLAGS,
-
-	NL80211_ATTR_CHANNEL_WIDTH,
-	NL80211_ATTR_CENTER_FREQ1,
-	NL80211_ATTR_CENTER_FREQ2,
-
-	NL80211_ATTR_P2P_CTWINDOW,
-	NL80211_ATTR_P2P_OPPPS,
-
-	NL80211_ATTR_LOCAL_MESH_POWER_MODE,
-
-	NL80211_ATTR_ACL_POLICY,
-
-	NL80211_ATTR_MAC_ADDRS,
-
-	NL80211_ATTR_MAC_ACL_MAX,
-
-	NL80211_ATTR_RADAR_EVENT,
-
-	NL80211_ATTR_EXT_CAPA,
-	NL80211_ATTR_EXT_CAPA_MASK,
-
-	NL80211_ATTR_STA_CAPABILITY,
-	NL80211_ATTR_STA_EXT_CAPABILITY,
-
-	NL80211_ATTR_PROTOCOL_FEATURES,
-	NL80211_ATTR_SPLIT_WIPHY_DUMP,
-
-	NL80211_ATTR_DISABLE_VHT,
-	NL80211_ATTR_VHT_CAPABILITY_MASK,
-
-	NL80211_ATTR_MDID,
-	NL80211_ATTR_IE_RIC,
-
-	NL80211_ATTR_CRIT_PROT_ID,
-	NL80211_ATTR_MAX_CRIT_PROT_DURATION,
-
-	NL80211_ATTR_PEER_AID,
-
-	NL80211_ATTR_COALESCE_RULE,
-
-	NL80211_ATTR_CH_SWITCH_COUNT,
-	NL80211_ATTR_CH_SWITCH_BLOCK_TX,
-	NL80211_ATTR_CSA_IES,
-	NL80211_ATTR_CSA_C_OFF_BEACON,
-	NL80211_ATTR_CSA_C_OFF_PRESP,
-
-	NL80211_ATTR_RXMGMT_FLAGS,
-
-	NL80211_ATTR_STA_SUPPORTED_CHANNELS,
-
-	NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES,
-
-	NL80211_ATTR_HANDLE_DFS,
-
-	NL80211_ATTR_SUPPORT_5_MHZ,
-	NL80211_ATTR_SUPPORT_10_MHZ,
-
-	NL80211_ATTR_OPMODE_NOTIF,
-
-	NL80211_ATTR_VENDOR_ID,
-	NL80211_ATTR_VENDOR_SUBCMD,
-	NL80211_ATTR_VENDOR_DATA,
-	NL80211_ATTR_VENDOR_EVENTS,
-
-	NL80211_ATTR_QOS_MAP,
-
-	NL80211_ATTR_MAC_HINT,
-	NL80211_ATTR_WIPHY_FREQ_HINT,
-
-	NL80211_ATTR_MAX_AP_ASSOC_STA,
-
-	NL80211_ATTR_TDLS_PEER_CAPABILITY,
-
-	NL80211_ATTR_SOCKET_OWNER,
-
-	NL80211_ATTR_CSA_C_OFFSETS_TX,
-	NL80211_ATTR_MAX_CSA_COUNTERS,
-
-	NL80211_ATTR_TDLS_INITIATOR,
-
-	NL80211_ATTR_USE_RRM,
-
-	NL80211_ATTR_WIPHY_DYN_ACK,
-
-	NL80211_ATTR_TSID,
-	NL80211_ATTR_USER_PRIO,
-	NL80211_ATTR_ADMITTED_TIME,
-
-	NL80211_ATTR_SMPS_MODE,
-
-	NL80211_ATTR_OPER_CLASS,
-
-	NL80211_ATTR_MAC_MASK,
-
-	NL80211_ATTR_WIPHY_SELF_MANAGED_REG,
-
-	NL80211_ATTR_EXT_FEATURES,
-
-	NL80211_ATTR_SURVEY_RADIO_STATS,
-
-	NL80211_ATTR_NETNS_FD,
-
-	NL80211_ATTR_SCHED_SCAN_DELAY,
-
-	NL80211_ATTR_REG_INDOOR,
-
-	NL80211_ATTR_MAX_NUM_SCHED_SCAN_PLANS,
-	NL80211_ATTR_MAX_SCAN_PLAN_INTERVAL,
-	NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
-	NL80211_ATTR_SCHED_SCAN_PLANS,
-
-	/* add attributes here, update the policy in nl80211.c */
-
-	__NL80211_ATTR_AFTER_LAST,
-	NUM_NL80211_ATTR = __NL80211_ATTR_AFTER_LAST,
-	NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
-};
-
-/* source-level API compatibility */
-#define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION
-#define	NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG
-#define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER
-
-/*
- * Allow user space programs to use #ifdef on new attributes by defining them
- * here
- */
-#define NL80211_CMD_CONNECT NL80211_CMD_CONNECT
-#define NL80211_ATTR_HT_CAPABILITY NL80211_ATTR_HT_CAPABILITY
-#define NL80211_ATTR_BSS_BASIC_RATES NL80211_ATTR_BSS_BASIC_RATES
-#define NL80211_ATTR_WIPHY_TXQ_PARAMS NL80211_ATTR_WIPHY_TXQ_PARAMS
-#define NL80211_ATTR_WIPHY_FREQ NL80211_ATTR_WIPHY_FREQ
-#define NL80211_ATTR_WIPHY_CHANNEL_TYPE NL80211_ATTR_WIPHY_CHANNEL_TYPE
-#define NL80211_ATTR_MGMT_SUBTYPE NL80211_ATTR_MGMT_SUBTYPE
-#define NL80211_ATTR_IE NL80211_ATTR_IE
-#define NL80211_ATTR_REG_INITIATOR NL80211_ATTR_REG_INITIATOR
-#define NL80211_ATTR_REG_TYPE NL80211_ATTR_REG_TYPE
-#define NL80211_ATTR_FRAME NL80211_ATTR_FRAME
-#define NL80211_ATTR_SSID NL80211_ATTR_SSID
-#define NL80211_ATTR_AUTH_TYPE NL80211_ATTR_AUTH_TYPE
-#define NL80211_ATTR_REASON_CODE NL80211_ATTR_REASON_CODE
-#define NL80211_ATTR_CIPHER_SUITES_PAIRWISE NL80211_ATTR_CIPHER_SUITES_PAIRWISE
-#define NL80211_ATTR_CIPHER_SUITE_GROUP NL80211_ATTR_CIPHER_SUITE_GROUP
-#define NL80211_ATTR_WPA_VERSIONS NL80211_ATTR_WPA_VERSIONS
-#define NL80211_ATTR_AKM_SUITES NL80211_ATTR_AKM_SUITES
-#define NL80211_ATTR_KEY NL80211_ATTR_KEY
-#define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
-#define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS
-
-#define NL80211_MAX_SUPP_RATES			32
-#define NL80211_MAX_SUPP_HT_RATES		77
-#define NL80211_MAX_SUPP_REG_RULES		64
-#define NL80211_TKIP_DATA_OFFSET_ENCR_KEY	0
-#define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY	16
-#define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY	24
-#define NL80211_HT_CAPABILITY_LEN		26
-#define NL80211_VHT_CAPABILITY_LEN		12
-
-#define NL80211_MAX_NR_CIPHER_SUITES		5
-#define NL80211_MAX_NR_AKM_SUITES		2
-
-#define NL80211_MIN_REMAIN_ON_CHANNEL_TIME	10
-
-/* default RSSI threshold for scan results if none specified. */
-#define NL80211_SCAN_RSSI_THOLD_OFF		-300
-
-#define NL80211_CQM_TXE_MAX_INTVL		1800
-
-/**
- * enum nl80211_iftype - (virtual) interface types
- *
- * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
- * @NL80211_IFTYPE_ADHOC: independent BSS member
- * @NL80211_IFTYPE_STATION: managed BSS member
- * @NL80211_IFTYPE_AP: access point
- * @NL80211_IFTYPE_AP_VLAN: VLAN interface for access points; VLAN interfaces
- *	are a bit special in that they must always be tied to a pre-existing
- *	AP type interface.
- * @NL80211_IFTYPE_WDS: wireless distribution interface
- * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames
- * @NL80211_IFTYPE_MESH_POINT: mesh point
- * @NL80211_IFTYPE_P2P_CLIENT: P2P client
- * @NL80211_IFTYPE_P2P_GO: P2P group owner
- * @NL80211_IFTYPE_P2P_DEVICE: P2P device interface type, this is not a netdev
- *	and therefore can't be created in the normal ways, use the
- *	%NL80211_CMD_START_P2P_DEVICE and %NL80211_CMD_STOP_P2P_DEVICE
- *	commands to create and destroy one
- * @NL80211_IF_TYPE_OCB: Outside Context of a BSS
- *	This mode corresponds to the MIB variable dot11OCBActivated=true
- * @NL80211_IFTYPE_MAX: highest interface type number currently defined
- * @NUM_NL80211_IFTYPES: number of defined interface types
- *
- * These values are used with the %NL80211_ATTR_IFTYPE
- * to set the type of an interface.
- *
- */
-enum nl80211_iftype {
-	NL80211_IFTYPE_UNSPECIFIED,
-	NL80211_IFTYPE_ADHOC,
-	NL80211_IFTYPE_STATION,
-	NL80211_IFTYPE_AP,
-	NL80211_IFTYPE_AP_VLAN,
-	NL80211_IFTYPE_WDS,
-	NL80211_IFTYPE_MONITOR,
-	NL80211_IFTYPE_MESH_POINT,
-	NL80211_IFTYPE_P2P_CLIENT,
-	NL80211_IFTYPE_P2P_GO,
-	NL80211_IFTYPE_P2P_DEVICE,
-	NL80211_IFTYPE_OCB,
-
-	/* keep last */
-	NUM_NL80211_IFTYPES,
-	NL80211_IFTYPE_MAX = NUM_NL80211_IFTYPES - 1
-};
-
-/**
- * enum nl80211_sta_flags - station flags
- *
- * Station flags. When a station is added to an AP interface, it is
- * assumed to be already associated (and hence authenticated.)
- *
- * @__NL80211_STA_FLAG_INVALID: attribute number 0 is reserved
- * @NL80211_STA_FLAG_AUTHORIZED: station is authorized (802.1X)
- * @NL80211_STA_FLAG_SHORT_PREAMBLE: station is capable of receiving frames
- *	with short barker preamble
- * @NL80211_STA_FLAG_WME: station is WME/QoS capable
- * @NL80211_STA_FLAG_MFP: station uses management frame protection
- * @NL80211_STA_FLAG_AUTHENTICATED: station is authenticated
- * @NL80211_STA_FLAG_TDLS_PEER: station is a TDLS peer -- this flag should
- *	only be used in managed mode (even in the flags mask). Note that the
- *	flag can't be changed, it is only valid while adding a station, and
- *	attempts to change it will silently be ignored (rather than rejected
- *	as errors.)
- * @NL80211_STA_FLAG_ASSOCIATED: station is associated; used with drivers
- *	that support %NL80211_FEATURE_FULL_AP_CLIENT_STATE to transition a
- *	previously added station into associated state
- * @NL80211_STA_FLAG_MAX: highest station flag number currently defined
- * @__NL80211_STA_FLAG_AFTER_LAST: internal use
- */
-enum nl80211_sta_flags {
-	__NL80211_STA_FLAG_INVALID,
-	NL80211_STA_FLAG_AUTHORIZED,
-	NL80211_STA_FLAG_SHORT_PREAMBLE,
-	NL80211_STA_FLAG_WME,
-	NL80211_STA_FLAG_MFP,
-	NL80211_STA_FLAG_AUTHENTICATED,
-	NL80211_STA_FLAG_TDLS_PEER,
-	NL80211_STA_FLAG_ASSOCIATED,
-
-	/* keep last */
-	__NL80211_STA_FLAG_AFTER_LAST,
-	NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
-};
-
-#define NL80211_STA_FLAG_MAX_OLD_API	NL80211_STA_FLAG_TDLS_PEER
-
-/**
- * struct nl80211_sta_flag_update - station flags mask/set
- * @mask: mask of station flags to set
- * @set: which values to set them to
- *
- * Both mask and set contain bits as per &enum nl80211_sta_flags.
- */
-struct nl80211_sta_flag_update {
-	__u32 mask;
-	__u32 set;
-} __attribute__((packed));
-
-/**
- * enum nl80211_rate_info - bitrate information
- *
- * These attribute types are used with %NL80211_STA_INFO_TXRATE
- * when getting information about the bitrate of a station.
- * There are 2 attributes for bitrate, a legacy one that represents
- * a 16-bit value, and new one that represents a 32-bit value.
- * If the rate value fits into 16 bit, both attributes are reported
- * with the same value. If the rate is too high to fit into 16 bits
- * (>6.5535Gbps) only 32-bit attribute is included.
- * User space tools encouraged to use the 32-bit attribute and fall
- * back to the 16-bit one for compatibility with older kernels.
- *
- * @__NL80211_RATE_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_RATE_INFO_BITRATE: total bitrate (u16, 100kbit/s)
- * @NL80211_RATE_INFO_MCS: mcs index for 802.11n (u8)
- * @NL80211_RATE_INFO_40_MHZ_WIDTH: 40 MHz dualchannel bitrate
- * @NL80211_RATE_INFO_SHORT_GI: 400ns guard interval
- * @NL80211_RATE_INFO_BITRATE32: total bitrate (u32, 100kbit/s)
- * @NL80211_RATE_INFO_MAX: highest rate_info number currently defined
- * @NL80211_RATE_INFO_VHT_MCS: MCS index for VHT (u8)
- * @NL80211_RATE_INFO_VHT_NSS: number of streams in VHT (u8)
- * @NL80211_RATE_INFO_80_MHZ_WIDTH: 80 MHz VHT rate
- * @NL80211_RATE_INFO_80P80_MHZ_WIDTH: unused - 80+80 is treated the
- *	same as 160 for purposes of the bitrates
- * @NL80211_RATE_INFO_160_MHZ_WIDTH: 160 MHz VHT rate
- * @NL80211_RATE_INFO_10_MHZ_WIDTH: 10 MHz width - note that this is
- *	a legacy rate and will be reported as the actual bitrate, i.e.
- *	half the base (20 MHz) rate
- * @NL80211_RATE_INFO_5_MHZ_WIDTH: 5 MHz width - note that this is
- *	a legacy rate and will be reported as the actual bitrate, i.e.
- *	a quarter of the base (20 MHz) rate
- * @__NL80211_RATE_INFO_AFTER_LAST: internal use
- */
-enum nl80211_rate_info {
-	__NL80211_RATE_INFO_INVALID,
-	NL80211_RATE_INFO_BITRATE,
-	NL80211_RATE_INFO_MCS,
-	NL80211_RATE_INFO_40_MHZ_WIDTH,
-	NL80211_RATE_INFO_SHORT_GI,
-	NL80211_RATE_INFO_BITRATE32,
-	NL80211_RATE_INFO_VHT_MCS,
-	NL80211_RATE_INFO_VHT_NSS,
-	NL80211_RATE_INFO_80_MHZ_WIDTH,
-	NL80211_RATE_INFO_80P80_MHZ_WIDTH,
-	NL80211_RATE_INFO_160_MHZ_WIDTH,
-	NL80211_RATE_INFO_10_MHZ_WIDTH,
-	NL80211_RATE_INFO_5_MHZ_WIDTH,
-
-	/* keep last */
-	__NL80211_RATE_INFO_AFTER_LAST,
-	NL80211_RATE_INFO_MAX = __NL80211_RATE_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_sta_bss_param - BSS information collected by STA
- *
- * These attribute types are used with %NL80211_STA_INFO_BSS_PARAM
- * when getting information about the bitrate of a station.
- *
- * @__NL80211_STA_BSS_PARAM_INVALID: attribute number 0 is reserved
- * @NL80211_STA_BSS_PARAM_CTS_PROT: whether CTS protection is enabled (flag)
- * @NL80211_STA_BSS_PARAM_SHORT_PREAMBLE:  whether short preamble is enabled
- *	(flag)
- * @NL80211_STA_BSS_PARAM_SHORT_SLOT_TIME:  whether short slot time is enabled
- *	(flag)
- * @NL80211_STA_BSS_PARAM_DTIM_PERIOD: DTIM period for beaconing (u8)
- * @NL80211_STA_BSS_PARAM_BEACON_INTERVAL: Beacon interval (u16)
- * @NL80211_STA_BSS_PARAM_MAX: highest sta_bss_param number currently defined
- * @__NL80211_STA_BSS_PARAM_AFTER_LAST: internal use
- */
-enum nl80211_sta_bss_param {
-	__NL80211_STA_BSS_PARAM_INVALID,
-	NL80211_STA_BSS_PARAM_CTS_PROT,
-	NL80211_STA_BSS_PARAM_SHORT_PREAMBLE,
-	NL80211_STA_BSS_PARAM_SHORT_SLOT_TIME,
-	NL80211_STA_BSS_PARAM_DTIM_PERIOD,
-	NL80211_STA_BSS_PARAM_BEACON_INTERVAL,
-
-	/* keep last */
-	__NL80211_STA_BSS_PARAM_AFTER_LAST,
-	NL80211_STA_BSS_PARAM_MAX = __NL80211_STA_BSS_PARAM_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_sta_info - station information
- *
- * These attribute types are used with %NL80211_ATTR_STA_INFO
- * when getting information about a station.
- *
- * @__NL80211_STA_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_STA_INFO_INACTIVE_TIME: time since last activity (u32, msecs)
- * @NL80211_STA_INFO_RX_BYTES: total received bytes (MPDU length)
- *	(u32, from this station)
- * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (MPDU length)
- *	(u32, to this station)
- * @NL80211_STA_INFO_RX_BYTES64: total received bytes (MPDU length)
- *	(u64, from this station)
- * @NL80211_STA_INFO_TX_BYTES64: total transmitted bytes (MPDU length)
- *	(u64, to this station)
- * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
- * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
- * 	containing info as possible, see &enum nl80211_rate_info
- * @NL80211_STA_INFO_RX_PACKETS: total received packet (MSDUs and MMPDUs)
- *	(u32, from this station)
- * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (MSDUs and MMPDUs)
- *	(u32, to this station)
- * @NL80211_STA_INFO_TX_RETRIES: total retries (MPDUs) (u32, to this station)
- * @NL80211_STA_INFO_TX_FAILED: total failed packets (MPDUs)
- *	(u32, to this station)
- * @NL80211_STA_INFO_SIGNAL_AVG: signal strength average (u8, dBm)
- * @NL80211_STA_INFO_LLID: the station's mesh LLID
- * @NL80211_STA_INFO_PLID: the station's mesh PLID
- * @NL80211_STA_INFO_PLINK_STATE: peer link state for the station
- *	(see %enum nl80211_plink_state)
- * @NL80211_STA_INFO_RX_BITRATE: last unicast data frame rx rate, nested
- *	attribute, like NL80211_STA_INFO_TX_BITRATE.
- * @NL80211_STA_INFO_BSS_PARAM: current station's view of BSS, nested attribute
- *     containing info as possible, see &enum nl80211_sta_bss_param
- * @NL80211_STA_INFO_CONNECTED_TIME: time since the station is last connected
- * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.
- * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)
- * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)
- * @NL80211_STA_INFO_LOCAL_PM: local mesh STA link-specific power mode
- * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
- * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
- *	non-peer STA
- * @NL80211_STA_INFO_CHAIN_SIGNAL: per-chain signal strength of last PPDU
- *	Contains a nested array of signal strength attributes (u8, dBm)
- * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average
- *	Same format as NL80211_STA_INFO_CHAIN_SIGNAL.
- * @NL80211_STA_EXPECTED_THROUGHPUT: expected throughput considering also the
- *	802.11 header (u32, kbps)
- * @NL80211_STA_INFO_RX_DROP_MISC: RX packets dropped for unspecified reasons
- *	(u64)
- * @NL80211_STA_INFO_BEACON_RX: number of beacons received from this peer (u64)
- * @NL80211_STA_INFO_BEACON_SIGNAL_AVG: signal strength average
- *	for beacons only (u8, dBm)
- * @NL80211_STA_INFO_TID_STATS: per-TID statistics (see &enum nl80211_tid_stats)
- *	This is a nested attribute where each the inner attribute number is the
- *	TID+1 and the special TID 16 (i.e. value 17) is used for non-QoS frames;
- *	each one of those is again nested with &enum nl80211_tid_stats
- *	attributes carrying the actual values.
- * @__NL80211_STA_INFO_AFTER_LAST: internal
- * @NL80211_STA_INFO_MAX: highest possible station info attribute
- */
-enum nl80211_sta_info {
-	__NL80211_STA_INFO_INVALID,
-	NL80211_STA_INFO_INACTIVE_TIME,
-	NL80211_STA_INFO_RX_BYTES,
-	NL80211_STA_INFO_TX_BYTES,
-	NL80211_STA_INFO_LLID,
-	NL80211_STA_INFO_PLID,
-	NL80211_STA_INFO_PLINK_STATE,
-	NL80211_STA_INFO_SIGNAL,
-	NL80211_STA_INFO_TX_BITRATE,
-	NL80211_STA_INFO_RX_PACKETS,
-	NL80211_STA_INFO_TX_PACKETS,
-	NL80211_STA_INFO_TX_RETRIES,
-	NL80211_STA_INFO_TX_FAILED,
-	NL80211_STA_INFO_SIGNAL_AVG,
-	NL80211_STA_INFO_RX_BITRATE,
-	NL80211_STA_INFO_BSS_PARAM,
-	NL80211_STA_INFO_CONNECTED_TIME,
-	NL80211_STA_INFO_STA_FLAGS,
-	NL80211_STA_INFO_BEACON_LOSS,
-	NL80211_STA_INFO_T_OFFSET,
-	NL80211_STA_INFO_LOCAL_PM,
-	NL80211_STA_INFO_PEER_PM,
-	NL80211_STA_INFO_NONPEER_PM,
-	NL80211_STA_INFO_RX_BYTES64,
-	NL80211_STA_INFO_TX_BYTES64,
-	NL80211_STA_INFO_CHAIN_SIGNAL,
-	NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
-	NL80211_STA_INFO_EXPECTED_THROUGHPUT,
-	NL80211_STA_INFO_RX_DROP_MISC,
-	NL80211_STA_INFO_BEACON_RX,
-	NL80211_STA_INFO_BEACON_SIGNAL_AVG,
-	NL80211_STA_INFO_TID_STATS,
-
-	/* keep last */
-	__NL80211_STA_INFO_AFTER_LAST,
-	NL80211_STA_INFO_MAX = __NL80211_STA_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_tid_stats - per TID statistics attributes
- * @__NL80211_TID_STATS_INVALID: attribute number 0 is reserved
- * @NL80211_TID_STATS_RX_MSDU: number of MSDUs received (u64)
- * @NL80211_TID_STATS_TX_MSDU: number of MSDUs transmitted (or
- *	attempted to transmit; u64)
- * @NL80211_TID_STATS_TX_MSDU_RETRIES: number of retries for
- *	transmitted MSDUs (not counting the first attempt; u64)
- * @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted
- *	MSDUs (u64)
- * @NUM_NL80211_TID_STATS: number of attributes here
- * @NL80211_TID_STATS_MAX: highest numbered attribute here
- */
-enum nl80211_tid_stats {
-	__NL80211_TID_STATS_INVALID,
-	NL80211_TID_STATS_RX_MSDU,
-	NL80211_TID_STATS_TX_MSDU,
-	NL80211_TID_STATS_TX_MSDU_RETRIES,
-	NL80211_TID_STATS_TX_MSDU_FAILED,
-
-	/* keep last */
-	NUM_NL80211_TID_STATS,
-	NL80211_TID_STATS_MAX = NUM_NL80211_TID_STATS - 1
-};
-
-/**
- * enum nl80211_mpath_flags - nl80211 mesh path flags
- *
- * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active
- * @NL80211_MPATH_FLAG_RESOLVING: the mesh path discovery process is running
- * @NL80211_MPATH_FLAG_SN_VALID: the mesh path contains a valid SN
- * @NL80211_MPATH_FLAG_FIXED: the mesh path has been manually set
- * @NL80211_MPATH_FLAG_RESOLVED: the mesh path discovery process succeeded
- */
-enum nl80211_mpath_flags {
-	NL80211_MPATH_FLAG_ACTIVE =	1<<0,
-	NL80211_MPATH_FLAG_RESOLVING =	1<<1,
-	NL80211_MPATH_FLAG_SN_VALID =	1<<2,
-	NL80211_MPATH_FLAG_FIXED =	1<<3,
-	NL80211_MPATH_FLAG_RESOLVED =	1<<4,
-};
-
-/**
- * enum nl80211_mpath_info - mesh path information
- *
- * These attribute types are used with %NL80211_ATTR_MPATH_INFO when getting
- * information about a mesh path.
- *
- * @__NL80211_MPATH_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_MPATH_INFO_FRAME_QLEN: number of queued frames for this destination
- * @NL80211_MPATH_INFO_SN: destination sequence number
- * @NL80211_MPATH_INFO_METRIC: metric (cost) of this mesh path
- * @NL80211_MPATH_INFO_EXPTIME: expiration time for the path, in msec from now
- * @NL80211_MPATH_INFO_FLAGS: mesh path flags, enumerated in
- * 	&enum nl80211_mpath_flags;
- * @NL80211_MPATH_INFO_DISCOVERY_TIMEOUT: total path discovery timeout, in msec
- * @NL80211_MPATH_INFO_DISCOVERY_RETRIES: mesh path discovery retries
- * @NL80211_MPATH_INFO_MAX: highest mesh path information attribute number
- *	currently defind
- * @__NL80211_MPATH_INFO_AFTER_LAST: internal use
- */
-enum nl80211_mpath_info {
-	__NL80211_MPATH_INFO_INVALID,
-	NL80211_MPATH_INFO_FRAME_QLEN,
-	NL80211_MPATH_INFO_SN,
-	NL80211_MPATH_INFO_METRIC,
-	NL80211_MPATH_INFO_EXPTIME,
-	NL80211_MPATH_INFO_FLAGS,
-	NL80211_MPATH_INFO_DISCOVERY_TIMEOUT,
-	NL80211_MPATH_INFO_DISCOVERY_RETRIES,
-
-	/* keep last */
-	__NL80211_MPATH_INFO_AFTER_LAST,
-	NL80211_MPATH_INFO_MAX = __NL80211_MPATH_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_band_attr - band attributes
- * @__NL80211_BAND_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_BAND_ATTR_FREQS: supported frequencies in this band,
- *	an array of nested frequency attributes
- * @NL80211_BAND_ATTR_RATES: supported bitrates in this band,
- *	an array of nested bitrate attributes
- * @NL80211_BAND_ATTR_HT_MCS_SET: 16-byte attribute containing the MCS set as
- *	defined in 802.11n
- * @NL80211_BAND_ATTR_HT_CAPA: HT capabilities, as in the HT information IE
- * @NL80211_BAND_ATTR_HT_AMPDU_FACTOR: A-MPDU factor, as in 11n
- * @NL80211_BAND_ATTR_HT_AMPDU_DENSITY: A-MPDU density, as in 11n
- * @NL80211_BAND_ATTR_VHT_MCS_SET: 32-byte attribute containing the MCS set as
- *	defined in 802.11ac
- * @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT information IE
- * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined
- * @__NL80211_BAND_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_band_attr {
-	__NL80211_BAND_ATTR_INVALID,
-	NL80211_BAND_ATTR_FREQS,
-	NL80211_BAND_ATTR_RATES,
-
-	NL80211_BAND_ATTR_HT_MCS_SET,
-	NL80211_BAND_ATTR_HT_CAPA,
-	NL80211_BAND_ATTR_HT_AMPDU_FACTOR,
-	NL80211_BAND_ATTR_HT_AMPDU_DENSITY,
-
-	NL80211_BAND_ATTR_VHT_MCS_SET,
-	NL80211_BAND_ATTR_VHT_CAPA,
-
-	/* keep last */
-	__NL80211_BAND_ATTR_AFTER_LAST,
-	NL80211_BAND_ATTR_MAX = __NL80211_BAND_ATTR_AFTER_LAST - 1
-};
-
-#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
-
-/**
- * enum nl80211_frequency_attr - frequency attributes
- * @__NL80211_FREQUENCY_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
- * @NL80211_FREQUENCY_ATTR_DISABLED: Channel is disabled in current
- *	regulatory domain.
- * @NL80211_FREQUENCY_ATTR_NO_IR: no mechanisms that initiate radiation
- * 	are permitted on this channel, this includes sending probe
- * 	requests, or modes of operation that require beaconing.
- * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory
- *	on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm
- *	(100 * dBm).
- * @NL80211_FREQUENCY_ATTR_DFS_STATE: current state for DFS
- *	(enum nl80211_dfs_state)
- * @NL80211_FREQUENCY_ATTR_DFS_TIME: time in miliseconds for how long
- *	this channel is in this DFS state.
- * @NL80211_FREQUENCY_ATTR_NO_HT40_MINUS: HT40- isn't possible with this
- *	channel as the control channel
- * @NL80211_FREQUENCY_ATTR_NO_HT40_PLUS: HT40+ isn't possible with this
- *	channel as the control channel
- * @NL80211_FREQUENCY_ATTR_NO_80MHZ: any 80 MHz channel using this channel
- *	as the primary or any of the secondary channels isn't possible,
- *	this includes 80+80 channels
- * @NL80211_FREQUENCY_ATTR_NO_160MHZ: any 160 MHz (but not 80+80) channel
- *	using this channel as the primary or any of the secondary channels
- *	isn't possible
- * @NL80211_FREQUENCY_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
- * @NL80211_FREQUENCY_ATTR_INDOOR_ONLY: Only indoor use is permitted on this
- *	channel. A channel that has the INDOOR_ONLY attribute can only be
- *	used when there is a clear assessment that the device is operating in
- *	an indoor surroundings, i.e., it is connected to AC power (and not
- *	through portable DC inverters) or is under the control of a master
- *	that is acting as an AP and is connected to AC power.
- * @NL80211_FREQUENCY_ATTR_IR_CONCURRENT: IR operation is allowed on this
- *	channel if it's connected concurrently to a BSS on the same channel on
- *	the 2 GHz band or to a channel in the same UNII band (on the 5 GHz
- *	band), and IEEE80211_CHAN_RADAR is not set. Instantiating a GO or TDLS
- *	off-channel on a channel that has the IR_CONCURRENT attribute set can be
- *	done when there is a clear assessment that the device is operating under
- *	the guidance of an authorized master, i.e., setting up a GO or TDLS
- *	off-channel while the device is also connected to an AP with DFS and
- *	radar detection on the UNII band (it is up to user-space, i.e.,
- *	wpa_supplicant to perform the required verifications). Using this
- *	attribute for IR is disallowed for master interfaces (IBSS, AP).
- * @NL80211_FREQUENCY_ATTR_NO_20MHZ: 20 MHz operation is not allowed
- *	on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_NO_10MHZ: 10 MHz operation is not allowed
- *	on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
- *	currently defined
- * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
- *
- * See https://apps.fcc.gov/eas/comments/GetPublishedDocument.html?id=327&tn=528122
- * for more information on the FCC description of the relaxations allowed
- * by NL80211_FREQUENCY_ATTR_INDOOR_ONLY and
- * NL80211_FREQUENCY_ATTR_IR_CONCURRENT.
- */
-enum nl80211_frequency_attr {
-	__NL80211_FREQUENCY_ATTR_INVALID,
-	NL80211_FREQUENCY_ATTR_FREQ,
-	NL80211_FREQUENCY_ATTR_DISABLED,
-	NL80211_FREQUENCY_ATTR_NO_IR,
-	__NL80211_FREQUENCY_ATTR_NO_IBSS,
-	NL80211_FREQUENCY_ATTR_RADAR,
-	NL80211_FREQUENCY_ATTR_MAX_TX_POWER,
-	NL80211_FREQUENCY_ATTR_DFS_STATE,
-	NL80211_FREQUENCY_ATTR_DFS_TIME,
-	NL80211_FREQUENCY_ATTR_NO_HT40_MINUS,
-	NL80211_FREQUENCY_ATTR_NO_HT40_PLUS,
-	NL80211_FREQUENCY_ATTR_NO_80MHZ,
-	NL80211_FREQUENCY_ATTR_NO_160MHZ,
-	NL80211_FREQUENCY_ATTR_DFS_CAC_TIME,
-	NL80211_FREQUENCY_ATTR_INDOOR_ONLY,
-	NL80211_FREQUENCY_ATTR_IR_CONCURRENT,
-	NL80211_FREQUENCY_ATTR_NO_20MHZ,
-	NL80211_FREQUENCY_ATTR_NO_10MHZ,
-
-	/* keep last */
-	__NL80211_FREQUENCY_ATTR_AFTER_LAST,
-	NL80211_FREQUENCY_ATTR_MAX = __NL80211_FREQUENCY_ATTR_AFTER_LAST - 1
-};
-
-#define NL80211_FREQUENCY_ATTR_MAX_TX_POWER NL80211_FREQUENCY_ATTR_MAX_TX_POWER
-#define NL80211_FREQUENCY_ATTR_PASSIVE_SCAN	NL80211_FREQUENCY_ATTR_NO_IR
-#define NL80211_FREQUENCY_ATTR_NO_IBSS		NL80211_FREQUENCY_ATTR_NO_IR
-#define NL80211_FREQUENCY_ATTR_NO_IR		NL80211_FREQUENCY_ATTR_NO_IR
-#define NL80211_FREQUENCY_ATTR_GO_CONCURRENT \
-					NL80211_FREQUENCY_ATTR_IR_CONCURRENT
-
-/**
- * enum nl80211_bitrate_attr - bitrate attributes
- * @__NL80211_BITRATE_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_BITRATE_ATTR_RATE: Bitrate in units of 100 kbps
- * @NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE: Short preamble supported
- *	in 2.4 GHz band.
- * @NL80211_BITRATE_ATTR_MAX: highest bitrate attribute number
- *	currently defined
- * @__NL80211_BITRATE_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_bitrate_attr {
-	__NL80211_BITRATE_ATTR_INVALID,
-	NL80211_BITRATE_ATTR_RATE,
-	NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE,
-
-	/* keep last */
-	__NL80211_BITRATE_ATTR_AFTER_LAST,
-	NL80211_BITRATE_ATTR_MAX = __NL80211_BITRATE_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_initiator - Indicates the initiator of a reg domain request
- * @NL80211_REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world
- * 	regulatory domain.
- * @NL80211_REGDOM_SET_BY_USER: User asked the wireless core to set the
- * 	regulatory domain.
- * @NL80211_REGDOM_SET_BY_DRIVER: a wireless drivers has hinted to the
- * 	wireless core it thinks its knows the regulatory domain we should be in.
- * @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an
- * 	802.11 country information element with regulatory information it
- * 	thinks we should consider. cfg80211 only processes the country
- *	code from the IE, and relies on the regulatory domain information
- *	structure passed by userspace (CRDA) from our wireless-regdb.
- *	If a channel is enabled but the country code indicates it should
- *	be disabled we disable the channel and re-enable it upon disassociation.
- */
-enum nl80211_reg_initiator {
-	NL80211_REGDOM_SET_BY_CORE,
-	NL80211_REGDOM_SET_BY_USER,
-	NL80211_REGDOM_SET_BY_DRIVER,
-	NL80211_REGDOM_SET_BY_COUNTRY_IE,
-};
-
-/**
- * enum nl80211_reg_type - specifies the type of regulatory domain
- * @NL80211_REGDOM_TYPE_COUNTRY: the regulatory domain set is one that pertains
- *	to a specific country. When this is set you can count on the
- *	ISO / IEC 3166 alpha2 country code being valid.
- * @NL80211_REGDOM_TYPE_WORLD: the regulatory set domain is the world regulatory
- * 	domain.
- * @NL80211_REGDOM_TYPE_CUSTOM_WORLD: the regulatory domain set is a custom
- * 	driver specific world regulatory domain. These do not apply system-wide
- * 	and are only applicable to the individual devices which have requested
- * 	them to be applied.
- * @NL80211_REGDOM_TYPE_INTERSECTION: the regulatory domain set is the product
- *	of an intersection between two regulatory domains -- the previously
- *	set regulatory domain on the system and the last accepted regulatory
- *	domain request to be processed.
- */
-enum nl80211_reg_type {
-	NL80211_REGDOM_TYPE_COUNTRY,
-	NL80211_REGDOM_TYPE_WORLD,
-	NL80211_REGDOM_TYPE_CUSTOM_WORLD,
-	NL80211_REGDOM_TYPE_INTERSECTION,
-};
-
-/**
- * enum nl80211_reg_rule_attr - regulatory rule attributes
- * @__NL80211_REG_RULE_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_ATTR_REG_RULE_FLAGS: a set of flags which specify additional
- * 	considerations for a given frequency range. These are the
- * 	&enum nl80211_reg_rule_flags.
- * @NL80211_ATTR_FREQ_RANGE_START: starting frequencry for the regulatory
- * 	rule in KHz. This is not a center of frequency but an actual regulatory
- * 	band edge.
- * @NL80211_ATTR_FREQ_RANGE_END: ending frequency for the regulatory rule
- * 	in KHz. This is not a center a frequency but an actual regulatory
- * 	band edge.
- * @NL80211_ATTR_FREQ_RANGE_MAX_BW: maximum allowed bandwidth for this
- *	frequency range, in KHz.
- * @NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN: the maximum allowed antenna gain
- * 	for a given frequency range. The value is in mBi (100 * dBi).
- * 	If you don't have one then don't send this.
- * @NL80211_ATTR_POWER_RULE_MAX_EIRP: the maximum allowed EIRP for
- * 	a given frequency range. The value is in mBm (100 * dBm).
- * @NL80211_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
- *	If not present or 0 default CAC time will be used.
- * @NL80211_REG_RULE_ATTR_MAX: highest regulatory rule attribute number
- *	currently defined
- * @__NL80211_REG_RULE_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_reg_rule_attr {
-	__NL80211_REG_RULE_ATTR_INVALID,
-	NL80211_ATTR_REG_RULE_FLAGS,
-
-	NL80211_ATTR_FREQ_RANGE_START,
-	NL80211_ATTR_FREQ_RANGE_END,
-	NL80211_ATTR_FREQ_RANGE_MAX_BW,
-
-	NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN,
-	NL80211_ATTR_POWER_RULE_MAX_EIRP,
-
-	NL80211_ATTR_DFS_CAC_TIME,
-
-	/* keep last */
-	__NL80211_REG_RULE_ATTR_AFTER_LAST,
-	NL80211_REG_RULE_ATTR_MAX = __NL80211_REG_RULE_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_sched_scan_match_attr - scheduled scan match attributes
- * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
- *	only report BSS with matching SSID.
- * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
- *	BSS in scan results. Filtering is turned off if not specified. Note that
- *	if this attribute is in a match set of its own, then it is treated as
- *	the default value for all matchsets with an SSID, rather than being a
- *	matchset of its own without an RSSI filter. This is due to problems with
- *	how this API was implemented in the past. Also, due to the same problem,
- *	the only way to create a matchset with only an RSSI filter (with this
- *	attribute) is if there's only a single matchset with the RSSI attribute.
- * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
- *	attribute number currently defined
- * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_sched_scan_match_attr {
-	__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID,
-
-	NL80211_SCHED_SCAN_MATCH_ATTR_SSID,
-	NL80211_SCHED_SCAN_MATCH_ATTR_RSSI,
-
-	/* keep last */
-	__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST,
-	NL80211_SCHED_SCAN_MATCH_ATTR_MAX =
-		__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST - 1
-};
-
-/* only for backward compatibility */
-#define NL80211_ATTR_SCHED_SCAN_MATCH_SSID NL80211_SCHED_SCAN_MATCH_ATTR_SSID
-
-/**
- * enum nl80211_reg_rule_flags - regulatory rule flags
- *
- * @NL80211_RRF_NO_OFDM: OFDM modulation not allowed
- * @NL80211_RRF_NO_CCK: CCK modulation not allowed
- * @NL80211_RRF_NO_INDOOR: indoor operation not allowed
- * @NL80211_RRF_NO_OUTDOOR: outdoor operation not allowed
- * @NL80211_RRF_DFS: DFS support is required to be used
- * @NL80211_RRF_PTP_ONLY: this is only for Point To Point links
- * @NL80211_RRF_PTMP_ONLY: this is only for Point To Multi Point links
- * @NL80211_RRF_NO_IR: no mechanisms that initiate radiation are allowed,
- * 	this includes probe requests or modes of operation that require
- * 	beaconing.
- * @NL80211_RRF_AUTO_BW: maximum available bandwidth should be calculated
- *	base on contiguous rules and wider channels will be allowed to cross
- *	multiple contiguous/overlapping frequency ranges.
- * @NL80211_RRF_IR_CONCURRENT: See &NL80211_FREQUENCY_ATTR_IR_CONCURRENT
- * @NL80211_RRF_NO_HT40MINUS: channels can't be used in HT40- operation
- * @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation
- * @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed
- * @NL80211_RRF_NO_160MHZ: 160MHz operation not allowed
- */
-enum nl80211_reg_rule_flags {
-	NL80211_RRF_NO_OFDM		= 1<<0,
-	NL80211_RRF_NO_CCK		= 1<<1,
-	NL80211_RRF_NO_INDOOR		= 1<<2,
-	NL80211_RRF_NO_OUTDOOR		= 1<<3,
-	NL80211_RRF_DFS			= 1<<4,
-	NL80211_RRF_PTP_ONLY		= 1<<5,
-	NL80211_RRF_PTMP_ONLY		= 1<<6,
-	NL80211_RRF_NO_IR		= 1<<7,
-	__NL80211_RRF_NO_IBSS		= 1<<8,
-	NL80211_RRF_AUTO_BW		= 1<<11,
-	NL80211_RRF_IR_CONCURRENT	= 1<<12,
-	NL80211_RRF_NO_HT40MINUS	= 1<<13,
-	NL80211_RRF_NO_HT40PLUS		= 1<<14,
-	NL80211_RRF_NO_80MHZ		= 1<<15,
-	NL80211_RRF_NO_160MHZ		= 1<<16,
-};
-
-#define NL80211_RRF_PASSIVE_SCAN	NL80211_RRF_NO_IR
-#define NL80211_RRF_NO_IBSS		NL80211_RRF_NO_IR
-#define NL80211_RRF_NO_IR		NL80211_RRF_NO_IR
-#define NL80211_RRF_NO_HT40		(NL80211_RRF_NO_HT40MINUS |\
-					 NL80211_RRF_NO_HT40PLUS)
-#define NL80211_RRF_GO_CONCURRENT	NL80211_RRF_IR_CONCURRENT
-
-/* For backport compatibility with older userspace */
-#define NL80211_RRF_NO_IR_ALL		(NL80211_RRF_NO_IR | __NL80211_RRF_NO_IBSS)
-
-/**
- * enum nl80211_dfs_regions - regulatory DFS regions
- *
- * @NL80211_DFS_UNSET: Country has no DFS master region specified
- * @NL80211_DFS_FCC: Country follows DFS master rules from FCC
- * @NL80211_DFS_ETSI: Country follows DFS master rules from ETSI
- * @NL80211_DFS_JP: Country follows DFS master rules from JP/MKK/Telec
- */
-enum nl80211_dfs_regions {
-	NL80211_DFS_UNSET	= 0,
-	NL80211_DFS_FCC		= 1,
-	NL80211_DFS_ETSI	= 2,
-	NL80211_DFS_JP		= 3,
-};
-
-/**
- * enum nl80211_user_reg_hint_type - type of user regulatory hint
- *
- * @NL80211_USER_REG_HINT_USER: a user sent the hint. This is always
- *	assumed if the attribute is not set.
- * @NL80211_USER_REG_HINT_CELL_BASE: the hint comes from a cellular
- *	base station. Device drivers that have been tested to work
- *	properly to support this type of hint can enable these hints
- *	by setting the NL80211_FEATURE_CELL_BASE_REG_HINTS feature
- *	capability on the struct wiphy. The wireless core will
- *	ignore all cell base station hints until at least one device
- *	present has been registered with the wireless core that
- *	has listed NL80211_FEATURE_CELL_BASE_REG_HINTS as a
- *	supported feature.
- * @NL80211_USER_REG_HINT_INDOOR: a user sent an hint indicating that the
- *	platform is operating in an indoor environment.
- */
-enum nl80211_user_reg_hint_type {
-	NL80211_USER_REG_HINT_USER	= 0,
-	NL80211_USER_REG_HINT_CELL_BASE = 1,
-	NL80211_USER_REG_HINT_INDOOR    = 2,
-};
-
-/**
- * enum nl80211_survey_info - survey information
- *
- * These attribute types are used with %NL80211_ATTR_SURVEY_INFO
- * when getting information about a survey.
- *
- * @__NL80211_SURVEY_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
- * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
- * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used
- * @NL80211_SURVEY_INFO_TIME: amount of time (in ms) that the radio
- *	was turned on (on channel or globally)
- * @NL80211_SURVEY_INFO_TIME_BUSY: amount of the time the primary
- *	channel was sensed busy (either due to activity or energy detect)
- * @NL80211_SURVEY_INFO_TIME_EXT_BUSY: amount of time the extension
- *	channel was sensed busy
- * @NL80211_SURVEY_INFO_TIME_RX: amount of time the radio spent
- *	receiving data (on channel or globally)
- * @NL80211_SURVEY_INFO_TIME_TX: amount of time the radio spent
- *	transmitting data (on channel or globally)
- * @NL80211_SURVEY_INFO_TIME_SCAN: time the radio spent for scan
- *	(on this channel or globally)
- * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
- *	currently defined
- * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
- */
-enum nl80211_survey_info {
-	__NL80211_SURVEY_INFO_INVALID,
-	NL80211_SURVEY_INFO_FREQUENCY,
-	NL80211_SURVEY_INFO_NOISE,
-	NL80211_SURVEY_INFO_IN_USE,
-	NL80211_SURVEY_INFO_TIME,
-	NL80211_SURVEY_INFO_TIME_BUSY,
-	NL80211_SURVEY_INFO_TIME_EXT_BUSY,
-	NL80211_SURVEY_INFO_TIME_RX,
-	NL80211_SURVEY_INFO_TIME_TX,
-	NL80211_SURVEY_INFO_TIME_SCAN,
-
-	/* keep last */
-	__NL80211_SURVEY_INFO_AFTER_LAST,
-	NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1
-};
-
-/* keep old names for compatibility */
-#define NL80211_SURVEY_INFO_CHANNEL_TIME		NL80211_SURVEY_INFO_TIME
-#define NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY		NL80211_SURVEY_INFO_TIME_BUSY
-#define NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY	NL80211_SURVEY_INFO_TIME_EXT_BUSY
-#define NL80211_SURVEY_INFO_CHANNEL_TIME_RX		NL80211_SURVEY_INFO_TIME_RX
-#define NL80211_SURVEY_INFO_CHANNEL_TIME_TX		NL80211_SURVEY_INFO_TIME_TX
-
-/**
- * enum nl80211_mntr_flags - monitor configuration flags
- *
- * Monitor configuration flags.
- *
- * @__NL80211_MNTR_FLAG_INVALID: reserved
- *
- * @NL80211_MNTR_FLAG_FCSFAIL: pass frames with bad FCS
- * @NL80211_MNTR_FLAG_PLCPFAIL: pass frames with bad PLCP
- * @NL80211_MNTR_FLAG_CONTROL: pass control frames
- * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering
- * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.
- *	overrides all other flags.
- * @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address
- *	and ACK incoming unicast packets.
- *
- * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use
- * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag
- */
-enum nl80211_mntr_flags {
-	__NL80211_MNTR_FLAG_INVALID,
-	NL80211_MNTR_FLAG_FCSFAIL,
-	NL80211_MNTR_FLAG_PLCPFAIL,
-	NL80211_MNTR_FLAG_CONTROL,
-	NL80211_MNTR_FLAG_OTHER_BSS,
-	NL80211_MNTR_FLAG_COOK_FRAMES,
-	NL80211_MNTR_FLAG_ACTIVE,
-
-	/* keep last */
-	__NL80211_MNTR_FLAG_AFTER_LAST,
-	NL80211_MNTR_FLAG_MAX = __NL80211_MNTR_FLAG_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_mesh_power_mode - mesh power save modes
- *
- * @NL80211_MESH_POWER_UNKNOWN: The mesh power mode of the mesh STA is
- *	not known or has not been set yet.
- * @NL80211_MESH_POWER_ACTIVE: Active mesh power mode. The mesh STA is
- *	in Awake state all the time.
- * @NL80211_MESH_POWER_LIGHT_SLEEP: Light sleep mode. The mesh STA will
- *	alternate between Active and Doze states, but will wake up for
- *	neighbor's beacons.
- * @NL80211_MESH_POWER_DEEP_SLEEP: Deep sleep mode. The mesh STA will
- *	alternate between Active and Doze states, but may not wake up
- *	for neighbor's beacons.
- *
- * @__NL80211_MESH_POWER_AFTER_LAST - internal use
- * @NL80211_MESH_POWER_MAX - highest possible power save level
- */
-
-enum nl80211_mesh_power_mode {
-	NL80211_MESH_POWER_UNKNOWN,
-	NL80211_MESH_POWER_ACTIVE,
-	NL80211_MESH_POWER_LIGHT_SLEEP,
-	NL80211_MESH_POWER_DEEP_SLEEP,
-
-	__NL80211_MESH_POWER_AFTER_LAST,
-	NL80211_MESH_POWER_MAX = __NL80211_MESH_POWER_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_meshconf_params - mesh configuration parameters
- *
- * Mesh configuration parameters. These can be changed while the mesh is
- * active.
- *
- * @__NL80211_MESHCONF_INVALID: internal use
- *
- * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in
- *	millisecond units, used by the Peer Link Open message
- *
- * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the initial confirm timeout, in
- *	millisecond units, used by the peer link management to close a peer link
- *
- * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in
- *	millisecond units
- *
- * @NL80211_MESHCONF_MAX_PEER_LINKS: maximum number of peer links allowed
- *	on this mesh interface
- *
- * @NL80211_MESHCONF_MAX_RETRIES: specifies the maximum number of peer link
- *	open retries that can be sent to establish a new peer link instance in a
- *	mesh
- *
- * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
- *	point.
- *
- * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically open
- *	peer links when we detect compatible mesh peers. Disabled if
- *	@NL80211_MESH_SETUP_USERSPACE_MPM or @NL80211_MESH_SETUP_USERSPACE_AMPE are
- *	set.
- *
- * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
- *	containing a PREQ that an MP can send to a particular destination (path
- *	target)
- *
- * @NL80211_MESHCONF_PATH_REFRESH_TIME: how frequently to refresh mesh paths
- *	(in milliseconds)
- *
- * @NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: minimum length of time to wait
- *	until giving up on a path discovery (in milliseconds)
- *
- * @NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT: The time (in TUs) for which mesh
- *	points receiving a PREQ shall consider the forwarding information from
- *	the root to be valid. (TU = time unit)
- *
- * @NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: The minimum interval of time (in
- *	TUs) during which an MP can send only one action frame containing a PREQ
- *	reference element
- *
- * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
- *	that it takes for an HWMP information element to propagate across the
- *	mesh
- *
- * @NL80211_MESHCONF_HWMP_ROOTMODE: whether root mode is enabled or not
- *
- * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a
- *	source mesh point for path selection elements.
- *
- * @NL80211_MESHCONF_HWMP_RANN_INTERVAL:  The interval of time (in TUs) between
- *	root announcements are transmitted.
- *
- * @NL80211_MESHCONF_GATE_ANNOUNCEMENTS: Advertise that this mesh station has
- *	access to a broader network beyond the MBSS.  This is done via Root
- *	Announcement frames.
- *
- * @NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL: The minimum interval of time (in
- *	TUs) during which a mesh STA can send only one Action frame containing a
- *	PERR element.
- *
- * @NL80211_MESHCONF_FORWARDING: set Mesh STA as forwarding or non-forwarding
- *	or forwarding entity (default is TRUE - forwarding entity)
- *
- * @NL80211_MESHCONF_RSSI_THRESHOLD: RSSI threshold in dBm. This specifies the
- *	threshold for average signal strength of candidate station to establish
- *	a peer link.
- *
- * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors
- *	to synchronize to for 11s default synchronization method
- *	(see 11C.12.2.2)
- *
- * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode.
- *
- * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
- *
- * @NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT: The time (in TUs) for
- *	which mesh STAs receiving a proactive PREQ shall consider the forwarding
- *	information to the root mesh STA to be valid.
- *
- * @NL80211_MESHCONF_HWMP_ROOT_INTERVAL: The interval of time (in TUs) between
- *	proactive PREQs are transmitted.
- *
- * @NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL: The minimum interval of time
- *	(in TUs) during which a mesh STA can send only one Action frame
- *	containing a PREQ element for root path confirmation.
- *
- * @NL80211_MESHCONF_POWER_MODE: Default mesh power mode for new peer links.
- *	type &enum nl80211_mesh_power_mode (u32)
- *
- * @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs)
- *
- * @NL80211_MESHCONF_PLINK_TIMEOUT: If no tx activity is seen from a STA we've
- *	established peering with for longer than this time (in seconds), then
- *	remove it from the STA's list of peers. You may set this to 0 to disable
- *	the removal of the STA. Default is 30 minutes.
- *
- * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_meshconf_params {
-	__NL80211_MESHCONF_INVALID,
-	NL80211_MESHCONF_RETRY_TIMEOUT,
-	NL80211_MESHCONF_CONFIRM_TIMEOUT,
-	NL80211_MESHCONF_HOLDING_TIMEOUT,
-	NL80211_MESHCONF_MAX_PEER_LINKS,
-	NL80211_MESHCONF_MAX_RETRIES,
-	NL80211_MESHCONF_TTL,
-	NL80211_MESHCONF_AUTO_OPEN_PLINKS,
-	NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
-	NL80211_MESHCONF_PATH_REFRESH_TIME,
-	NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
-	NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
-	NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
-	NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
-	NL80211_MESHCONF_HWMP_ROOTMODE,
-	NL80211_MESHCONF_ELEMENT_TTL,
-	NL80211_MESHCONF_HWMP_RANN_INTERVAL,
-	NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
-	NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
-	NL80211_MESHCONF_FORWARDING,
-	NL80211_MESHCONF_RSSI_THRESHOLD,
-	NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
-	NL80211_MESHCONF_HT_OPMODE,
-	NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
-	NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
-	NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
-	NL80211_MESHCONF_POWER_MODE,
-	NL80211_MESHCONF_AWAKE_WINDOW,
-	NL80211_MESHCONF_PLINK_TIMEOUT,
-
-	/* keep last */
-	__NL80211_MESHCONF_ATTR_AFTER_LAST,
-	NL80211_MESHCONF_ATTR_MAX = __NL80211_MESHCONF_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_mesh_setup_params - mesh setup parameters
- *
- * Mesh setup parameters.  These are used to start/join a mesh and cannot be
- * changed while the mesh is active.
- *
- * @__NL80211_MESH_SETUP_INVALID: Internal use
- *
- * @NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL: Enable this option to use a
- *	vendor specific path selection algorithm or disable it to use the
- *	default HWMP.
- *
- * @NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC: Enable this option to use a
- *	vendor specific path metric or disable it to use the default Airtime
- *	metric.
- *
- * @NL80211_MESH_SETUP_IE: Information elements for this mesh, for instance, a
- *	robust security network ie, or a vendor specific information element
- *	that vendors will use to identify the path selection methods and
- *	metrics in use.
- *
- * @NL80211_MESH_SETUP_USERSPACE_AUTH: Enable this option if an authentication
- *	daemon will be authenticating mesh candidates.
- *
- * @NL80211_MESH_SETUP_USERSPACE_AMPE: Enable this option if an authentication
- *	daemon will be securing peer link frames.  AMPE is a secured version of
- *	Mesh Peering Management (MPM) and is implemented with the assistance of
- *	a userspace daemon.  When this flag is set, the kernel will send peer
- *	management frames to a userspace daemon that will implement AMPE
- *	functionality (security capabilities selection, key confirmation, and
- *	key management).  When the flag is unset (default), the kernel can
- *	autonomously complete (unsecured) mesh peering without the need of a
- *	userspace daemon.
- *
- * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a
- *	vendor specific synchronization method or disable it to use the default
- *	neighbor offset synchronization
- *
- * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will
- *	implement an MPM which handles peer allocation and state.
- *
- * @NL80211_MESH_SETUP_AUTH_PROTOCOL: Inform the kernel of the authentication
- *	method (u8, as defined in IEEE 8.4.2.100.6, e.g. 0x1 for SAE).
- *	Default is no authentication method required.
- *
- * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
- *
- * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
- */
-enum nl80211_mesh_setup_params {
-	__NL80211_MESH_SETUP_INVALID,
-	NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL,
-	NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC,
-	NL80211_MESH_SETUP_IE,
-	NL80211_MESH_SETUP_USERSPACE_AUTH,
-	NL80211_MESH_SETUP_USERSPACE_AMPE,
-	NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,
-	NL80211_MESH_SETUP_USERSPACE_MPM,
-	NL80211_MESH_SETUP_AUTH_PROTOCOL,
-
-	/* keep last */
-	__NL80211_MESH_SETUP_ATTR_AFTER_LAST,
-	NL80211_MESH_SETUP_ATTR_MAX = __NL80211_MESH_SETUP_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_txq_attr - TX queue parameter attributes
- * @__NL80211_TXQ_ATTR_INVALID: Attribute number 0 is reserved
- * @NL80211_TXQ_ATTR_AC: AC identifier (NL80211_AC_*)
- * @NL80211_TXQ_ATTR_TXOP: Maximum burst time in units of 32 usecs, 0 meaning
- *	disabled
- * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form
- *	2^n-1 in the range 1..32767]
- * @NL80211_TXQ_ATTR_CWMAX: Maximum contention window [a value of the form
- *	2^n-1 in the range 1..32767]
- * @NL80211_TXQ_ATTR_AIFS: Arbitration interframe space [0..255]
- * @__NL80211_TXQ_ATTR_AFTER_LAST: Internal
- * @NL80211_TXQ_ATTR_MAX: Maximum TXQ attribute number
- */
-enum nl80211_txq_attr {
-	__NL80211_TXQ_ATTR_INVALID,
-	NL80211_TXQ_ATTR_AC,
-	NL80211_TXQ_ATTR_TXOP,
-	NL80211_TXQ_ATTR_CWMIN,
-	NL80211_TXQ_ATTR_CWMAX,
-	NL80211_TXQ_ATTR_AIFS,
-
-	/* keep last */
-	__NL80211_TXQ_ATTR_AFTER_LAST,
-	NL80211_TXQ_ATTR_MAX = __NL80211_TXQ_ATTR_AFTER_LAST - 1
-};
-
-enum nl80211_ac {
-	NL80211_AC_VO,
-	NL80211_AC_VI,
-	NL80211_AC_BE,
-	NL80211_AC_BK,
-	NL80211_NUM_ACS
-};
-
-/* backward compat */
-#define NL80211_TXQ_ATTR_QUEUE	NL80211_TXQ_ATTR_AC
-#define NL80211_TXQ_Q_VO	NL80211_AC_VO
-#define NL80211_TXQ_Q_VI	NL80211_AC_VI
-#define NL80211_TXQ_Q_BE	NL80211_AC_BE
-#define NL80211_TXQ_Q_BK	NL80211_AC_BK
-
-/**
- * enum nl80211_channel_type - channel type
- * @NL80211_CHAN_NO_HT: 20 MHz, non-HT channel
- * @NL80211_CHAN_HT20: 20 MHz HT channel
- * @NL80211_CHAN_HT40MINUS: HT40 channel, secondary channel
- *	below the control channel
- * @NL80211_CHAN_HT40PLUS: HT40 channel, secondary channel
- *	above the control channel
- */
-enum nl80211_channel_type {
-	NL80211_CHAN_NO_HT,
-	NL80211_CHAN_HT20,
-	NL80211_CHAN_HT40MINUS,
-	NL80211_CHAN_HT40PLUS
-};
-
-/**
- * enum nl80211_chan_width - channel width definitions
- *
- * These values are used with the %NL80211_ATTR_CHANNEL_WIDTH
- * attribute.
- *
- * @NL80211_CHAN_WIDTH_20_NOHT: 20 MHz, non-HT channel
- * @NL80211_CHAN_WIDTH_20: 20 MHz HT channel
- * @NL80211_CHAN_WIDTH_40: 40 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
- *	attribute must be provided as well
- * @NL80211_CHAN_WIDTH_80: 80 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
- *	attribute must be provided as well
- * @NL80211_CHAN_WIDTH_80P80: 80+80 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
- *	and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well
- * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
- *	attribute must be provided as well
- * @NL80211_CHAN_WIDTH_5: 5 MHz OFDM channel
- * @NL80211_CHAN_WIDTH_10: 10 MHz OFDM channel
- */
-enum nl80211_chan_width {
-	NL80211_CHAN_WIDTH_20_NOHT,
-	NL80211_CHAN_WIDTH_20,
-	NL80211_CHAN_WIDTH_40,
-	NL80211_CHAN_WIDTH_80,
-	NL80211_CHAN_WIDTH_80P80,
-	NL80211_CHAN_WIDTH_160,
-	NL80211_CHAN_WIDTH_5,
-	NL80211_CHAN_WIDTH_10,
-};
-
-/**
- * enum nl80211_bss_scan_width - control channel width for a BSS
- *
- * These values are used with the %NL80211_BSS_CHAN_WIDTH attribute.
- *
- * @NL80211_BSS_CHAN_WIDTH_20: control channel is 20 MHz wide or compatible
- * @NL80211_BSS_CHAN_WIDTH_10: control channel is 10 MHz wide
- * @NL80211_BSS_CHAN_WIDTH_5: control channel is 5 MHz wide
- */
-enum nl80211_bss_scan_width {
-	NL80211_BSS_CHAN_WIDTH_20,
-	NL80211_BSS_CHAN_WIDTH_10,
-	NL80211_BSS_CHAN_WIDTH_5,
-};
-
-/**
- * enum nl80211_bss - netlink attributes for a BSS
- *
- * @__NL80211_BSS_INVALID: invalid
- * @NL80211_BSS_BSSID: BSSID of the BSS (6 octets)
- * @NL80211_BSS_FREQUENCY: frequency in MHz (u32)
- * @NL80211_BSS_TSF: TSF of the received probe response/beacon (u64)
- *	(if @NL80211_BSS_PRESP_DATA is present then this is known to be
- *	from a probe response, otherwise it may be from the same beacon
- *	that the NL80211_BSS_BEACON_TSF will be from)
- * @NL80211_BSS_BEACON_INTERVAL: beacon interval of the (I)BSS (u16)
- * @NL80211_BSS_CAPABILITY: capability field (CPU order, u16)
- * @NL80211_BSS_INFORMATION_ELEMENTS: binary attribute containing the
- *	raw information elements from the probe response/beacon (bin);
- *	if the %NL80211_BSS_BEACON_IES attribute is present and the data is
- *	different then the IEs here are from a Probe Response frame; otherwise
- *	they are from a Beacon frame.
- *	However, if the driver does not indicate the source of the IEs, these
- *	IEs may be from either frame subtype.
- *	If present, the @NL80211_BSS_PRESP_DATA attribute indicates that the
- *	data here is known to be from a probe response, without any heuristics.
- * @NL80211_BSS_SIGNAL_MBM: signal strength of probe response/beacon
- *	in mBm (100 * dBm) (s32)
- * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon
- *	in unspecified units, scaled to 0..100 (u8)
- * @NL80211_BSS_STATUS: status, if this BSS is "used"
- * @NL80211_BSS_SEEN_MS_AGO: age of this BSS entry in ms
- * @NL80211_BSS_BEACON_IES: binary attribute containing the raw information
- *	elements from a Beacon frame (bin); not present if no Beacon frame has
- *	yet been received
- * @NL80211_BSS_CHAN_WIDTH: channel width of the control channel
- *	(u32, enum nl80211_bss_scan_width)
- * @NL80211_BSS_BEACON_TSF: TSF of the last received beacon (u64)
- *	(not present if no beacon frame has been received yet)
- * @NL80211_BSS_PRESP_DATA: the data in @NL80211_BSS_INFORMATION_ELEMENTS and
- *	@NL80211_BSS_TSF is known to be from a probe response (flag attribute)
- * @NL80211_BSS_LAST_SEEN_BOOTTIME: CLOCK_BOOTTIME timestamp when this entry
- *	was last updated by a received frame. The value is expected to be
- *	accurate to about 10ms. (u64, nanoseconds)
- * @__NL80211_BSS_AFTER_LAST: internal
- * @NL80211_BSS_MAX: highest BSS attribute
- */
-enum nl80211_bss {
-	__NL80211_BSS_INVALID,
-	NL80211_BSS_BSSID,
-	NL80211_BSS_FREQUENCY,
-	NL80211_BSS_TSF,
-	NL80211_BSS_BEACON_INTERVAL,
-	NL80211_BSS_CAPABILITY,
-	NL80211_BSS_INFORMATION_ELEMENTS,
-	NL80211_BSS_SIGNAL_MBM,
-	NL80211_BSS_SIGNAL_UNSPEC,
-	NL80211_BSS_STATUS,
-	NL80211_BSS_SEEN_MS_AGO,
-	NL80211_BSS_BEACON_IES,
-	NL80211_BSS_CHAN_WIDTH,
-	NL80211_BSS_BEACON_TSF,
-	NL80211_BSS_PRESP_DATA,
-	NL80211_BSS_LAST_SEEN_BOOTTIME,
-
-	/* keep last */
-	__NL80211_BSS_AFTER_LAST,
-	NL80211_BSS_MAX = __NL80211_BSS_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_bss_status - BSS "status"
- * @NL80211_BSS_STATUS_AUTHENTICATED: Authenticated with this BSS.
- *	Note that this is no longer used since cfg80211 no longer
- *	keeps track of whether or not authentication was done with
- *	a given BSS.
- * @NL80211_BSS_STATUS_ASSOCIATED: Associated with this BSS.
- * @NL80211_BSS_STATUS_IBSS_JOINED: Joined to this IBSS.
- *
- * The BSS status is a BSS attribute in scan dumps, which
- * indicates the status the interface has wrt. this BSS.
- */
-enum nl80211_bss_status {
-	NL80211_BSS_STATUS_AUTHENTICATED,
-	NL80211_BSS_STATUS_ASSOCIATED,
-	NL80211_BSS_STATUS_IBSS_JOINED,
-};
-
-/**
- * enum nl80211_auth_type - AuthenticationType
- *
- * @NL80211_AUTHTYPE_OPEN_SYSTEM: Open System authentication
- * @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only)
- * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
- * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
- * @NL80211_AUTHTYPE_SAE: Simultaneous authentication of equals
- * @__NL80211_AUTHTYPE_NUM: internal
- * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm
- * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by
- *	trying multiple times); this is invalid in netlink -- leave out
- *	the attribute for this on CONNECT commands.
- */
-enum nl80211_auth_type {
-	NL80211_AUTHTYPE_OPEN_SYSTEM,
-	NL80211_AUTHTYPE_SHARED_KEY,
-	NL80211_AUTHTYPE_FT,
-	NL80211_AUTHTYPE_NETWORK_EAP,
-	NL80211_AUTHTYPE_SAE,
-
-	/* keep last */
-	__NL80211_AUTHTYPE_NUM,
-	NL80211_AUTHTYPE_MAX = __NL80211_AUTHTYPE_NUM - 1,
-	NL80211_AUTHTYPE_AUTOMATIC
-};
-
-/**
- * enum nl80211_key_type - Key Type
- * @NL80211_KEYTYPE_GROUP: Group (broadcast/multicast) key
- * @NL80211_KEYTYPE_PAIRWISE: Pairwise (unicast/individual) key
- * @NL80211_KEYTYPE_PEERKEY: PeerKey (DLS)
- * @NUM_NL80211_KEYTYPES: number of defined key types
- */
-enum nl80211_key_type {
-	NL80211_KEYTYPE_GROUP,
-	NL80211_KEYTYPE_PAIRWISE,
-	NL80211_KEYTYPE_PEERKEY,
-
-	NUM_NL80211_KEYTYPES
-};
-
-/**
- * enum nl80211_mfp - Management frame protection state
- * @NL80211_MFP_NO: Management frame protection not used
- * @NL80211_MFP_REQUIRED: Management frame protection required
- */
-enum nl80211_mfp {
-	NL80211_MFP_NO,
-	NL80211_MFP_REQUIRED,
-};
-
-enum nl80211_wpa_versions {
-	NL80211_WPA_VERSION_1 = 1 << 0,
-	NL80211_WPA_VERSION_2 = 1 << 1,
-};
-
-/**
- * enum nl80211_key_default_types - key default types
- * @__NL80211_KEY_DEFAULT_TYPE_INVALID: invalid
- * @NL80211_KEY_DEFAULT_TYPE_UNICAST: key should be used as default
- *	unicast key
- * @NL80211_KEY_DEFAULT_TYPE_MULTICAST: key should be used as default
- *	multicast key
- * @NUM_NL80211_KEY_DEFAULT_TYPES: number of default types
- */
-enum nl80211_key_default_types {
-	__NL80211_KEY_DEFAULT_TYPE_INVALID,
-	NL80211_KEY_DEFAULT_TYPE_UNICAST,
-	NL80211_KEY_DEFAULT_TYPE_MULTICAST,
-
-	NUM_NL80211_KEY_DEFAULT_TYPES
-};
-
-/**
- * enum nl80211_key_attributes - key attributes
- * @__NL80211_KEY_INVALID: invalid
- * @NL80211_KEY_DATA: (temporal) key data; for TKIP this consists of
- *	16 bytes encryption key followed by 8 bytes each for TX and RX MIC
- *	keys
- * @NL80211_KEY_IDX: key ID (u8, 0-3)
- * @NL80211_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11
- *	section 7.3.2.25.1, e.g. 0x000FAC04)
- * @NL80211_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
- *	CCMP keys, each six bytes in little endian
- * @NL80211_KEY_DEFAULT: flag indicating default key
- * @NL80211_KEY_DEFAULT_MGMT: flag indicating default management key
- * @NL80211_KEY_TYPE: the key type from enum nl80211_key_type, if not
- *	specified the default depends on whether a MAC address was
- *	given with the command using the key or not (u32)
- * @NL80211_KEY_DEFAULT_TYPES: A nested attribute containing flags
- *	attributes, specifying what a key should be set as default as.
- *	See &enum nl80211_key_default_types.
- * @__NL80211_KEY_AFTER_LAST: internal
- * @NL80211_KEY_MAX: highest key attribute
- */
-enum nl80211_key_attributes {
-	__NL80211_KEY_INVALID,
-	NL80211_KEY_DATA,
-	NL80211_KEY_IDX,
-	NL80211_KEY_CIPHER,
-	NL80211_KEY_SEQ,
-	NL80211_KEY_DEFAULT,
-	NL80211_KEY_DEFAULT_MGMT,
-	NL80211_KEY_TYPE,
-	NL80211_KEY_DEFAULT_TYPES,
-
-	/* keep last */
-	__NL80211_KEY_AFTER_LAST,
-	NL80211_KEY_MAX = __NL80211_KEY_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_tx_rate_attributes - TX rate set attributes
- * @__NL80211_TXRATE_INVALID: invalid
- * @NL80211_TXRATE_LEGACY: Legacy (non-MCS) rates allowed for TX rate selection
- *	in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with
- *	1 = 500 kbps) but without the IE length restriction (at most
- *	%NL80211_MAX_SUPP_RATES in a single array).
- * @NL80211_TXRATE_HT: HT (MCS) rates allowed for TX rate selection
- *	in an array of MCS numbers.
- * @NL80211_TXRATE_VHT: VHT rates allowed for TX rate selection,
- *	see &struct nl80211_txrate_vht
- * @NL80211_TXRATE_GI: configure GI, see &enum nl80211_txrate_gi
- * @__NL80211_TXRATE_AFTER_LAST: internal
- * @NL80211_TXRATE_MAX: highest TX rate attribute
- */
-enum nl80211_tx_rate_attributes {
-	__NL80211_TXRATE_INVALID,
-	NL80211_TXRATE_LEGACY,
-	NL80211_TXRATE_HT,
-	NL80211_TXRATE_VHT,
-	NL80211_TXRATE_GI,
-
-	/* keep last */
-	__NL80211_TXRATE_AFTER_LAST,
-	NL80211_TXRATE_MAX = __NL80211_TXRATE_AFTER_LAST - 1
-};
-
-#define NL80211_TXRATE_MCS NL80211_TXRATE_HT
-#define NL80211_VHT_NSS_MAX		8
-
-/**
- * struct nl80211_txrate_vht - VHT MCS/NSS txrate bitmap
- * @mcs: MCS bitmap table for each NSS (array index 0 for 1 stream, etc.)
- */
-struct nl80211_txrate_vht {
-	__u16 mcs[NL80211_VHT_NSS_MAX];
-};
-
-enum nl80211_txrate_gi {
-	NL80211_TXRATE_DEFAULT_GI,
-	NL80211_TXRATE_FORCE_SGI,
-	NL80211_TXRATE_FORCE_LGI,
-};
-
-/**
- * enum nl80211_band - Frequency band
- * @NL80211_BAND_2GHZ: 2.4 GHz ISM band
- * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)
- * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz)
- */
-enum nl80211_band {
-	NL80211_BAND_2GHZ,
-	NL80211_BAND_5GHZ,
-	NL80211_BAND_60GHZ,
-};
-
-/**
- * enum nl80211_ps_state - powersave state
- * @NL80211_PS_DISABLED: powersave is disabled
- * @NL80211_PS_ENABLED: powersave is enabled
- */
-enum nl80211_ps_state {
-	NL80211_PS_DISABLED,
-	NL80211_PS_ENABLED,
-};
-
-/**
- * enum nl80211_attr_cqm - connection quality monitor attributes
- * @__NL80211_ATTR_CQM_INVALID: invalid
- * @NL80211_ATTR_CQM_RSSI_THOLD: RSSI threshold in dBm. This value specifies
- *	the threshold for the RSSI level at which an event will be sent. Zero
- *	to disable.
- * @NL80211_ATTR_CQM_RSSI_HYST: RSSI hysteresis in dBm. This value specifies
- *	the minimum amount the RSSI level must change after an event before a
- *	new event may be issued (to reduce effects of RSSI oscillation).
- * @NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT: RSSI threshold event
- * @NL80211_ATTR_CQM_PKT_LOSS_EVENT: a u32 value indicating that this many
- *	consecutive packets were not acknowledged by the peer
- * @NL80211_ATTR_CQM_TXE_RATE: TX error rate in %. Minimum % of TX failures
- *	during the given %NL80211_ATTR_CQM_TXE_INTVL before an
- *	%NL80211_CMD_NOTIFY_CQM with reported %NL80211_ATTR_CQM_TXE_RATE and
- *	%NL80211_ATTR_CQM_TXE_PKTS is generated.
- * @NL80211_ATTR_CQM_TXE_PKTS: number of attempted packets in a given
- *	%NL80211_ATTR_CQM_TXE_INTVL before %NL80211_ATTR_CQM_TXE_RATE is
- *	checked.
- * @NL80211_ATTR_CQM_TXE_INTVL: interval in seconds. Specifies the periodic
- *	interval in which %NL80211_ATTR_CQM_TXE_PKTS and
- *	%NL80211_ATTR_CQM_TXE_RATE must be satisfied before generating an
- *	%NL80211_CMD_NOTIFY_CQM. Set to 0 to turn off TX error reporting.
- * @NL80211_ATTR_CQM_BEACON_LOSS_EVENT: flag attribute that's set in a beacon
- *	loss event
- * @__NL80211_ATTR_CQM_AFTER_LAST: internal
- * @NL80211_ATTR_CQM_MAX: highest key attribute
- */
-enum nl80211_attr_cqm {
-	__NL80211_ATTR_CQM_INVALID,
-	NL80211_ATTR_CQM_RSSI_THOLD,
-	NL80211_ATTR_CQM_RSSI_HYST,
-	NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT,
-	NL80211_ATTR_CQM_PKT_LOSS_EVENT,
-	NL80211_ATTR_CQM_TXE_RATE,
-	NL80211_ATTR_CQM_TXE_PKTS,
-	NL80211_ATTR_CQM_TXE_INTVL,
-	NL80211_ATTR_CQM_BEACON_LOSS_EVENT,
-
-	/* keep last */
-	__NL80211_ATTR_CQM_AFTER_LAST,
-	NL80211_ATTR_CQM_MAX = __NL80211_ATTR_CQM_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_cqm_rssi_threshold_event - RSSI threshold event
- * @NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW: The RSSI level is lower than the
- *      configured threshold
- * @NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH: The RSSI is higher than the
- *      configured threshold
- * @NL80211_CQM_RSSI_BEACON_LOSS_EVENT: (reserved, never sent)
- */
-enum nl80211_cqm_rssi_threshold_event {
-	NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,
-	NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,
-	NL80211_CQM_RSSI_BEACON_LOSS_EVENT,
-};
-
-
-/**
- * enum nl80211_tx_power_setting - TX power adjustment
- * @NL80211_TX_POWER_AUTOMATIC: automatically determine transmit power
- * @NL80211_TX_POWER_LIMITED: limit TX power by the mBm parameter
- * @NL80211_TX_POWER_FIXED: fix TX power to the mBm parameter
- */
-enum nl80211_tx_power_setting {
-	NL80211_TX_POWER_AUTOMATIC,
-	NL80211_TX_POWER_LIMITED,
-	NL80211_TX_POWER_FIXED,
-};
-
-/**
- * enum nl80211_packet_pattern_attr - packet pattern attribute
- * @__NL80211_PKTPAT_INVALID: invalid number for nested attribute
- * @NL80211_PKTPAT_PATTERN: the pattern, values where the mask has
- *	a zero bit are ignored
- * @NL80211_PKTPAT_MASK: pattern mask, must be long enough to have
- *	a bit for each byte in the pattern. The lowest-order bit corresponds
- *	to the first byte of the pattern, but the bytes of the pattern are
- *	in a little-endian-like format, i.e. the 9th byte of the pattern
- *	corresponds to the lowest-order bit in the second byte of the mask.
- *	For example: The match 00:xx:00:00:xx:00:00:00:00:xx:xx:xx (where
- *	xx indicates "don't care") would be represented by a pattern of
- *	twelve zero bytes, and a mask of "0xed,0x01".
- *	Note that the pattern matching is done as though frames were not
- *	802.11 frames but 802.3 frames, i.e. the frame is fully unpacked
- *	first (including SNAP header unpacking) and then matched.
- * @NL80211_PKTPAT_OFFSET: packet offset, pattern is matched after
- *	these fixed number of bytes of received packet
- * @NUM_NL80211_PKTPAT: number of attributes
- * @MAX_NL80211_PKTPAT: max attribute number
- */
-enum nl80211_packet_pattern_attr {
-	__NL80211_PKTPAT_INVALID,
-	NL80211_PKTPAT_MASK,
-	NL80211_PKTPAT_PATTERN,
-	NL80211_PKTPAT_OFFSET,
-
-	NUM_NL80211_PKTPAT,
-	MAX_NL80211_PKTPAT = NUM_NL80211_PKTPAT - 1,
-};
-
-/**
- * struct nl80211_pattern_support - packet pattern support information
- * @max_patterns: maximum number of patterns supported
- * @min_pattern_len: minimum length of each pattern
- * @max_pattern_len: maximum length of each pattern
- * @max_pkt_offset: maximum Rx packet offset
- *
- * This struct is carried in %NL80211_WOWLAN_TRIG_PKT_PATTERN when
- * that is part of %NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED or in
- * %NL80211_ATTR_COALESCE_RULE_PKT_PATTERN when that is part of
- * %NL80211_ATTR_COALESCE_RULE in the capability information given
- * by the kernel to userspace.
- */
-struct nl80211_pattern_support {
-	__u32 max_patterns;
-	__u32 min_pattern_len;
-	__u32 max_pattern_len;
-	__u32 max_pkt_offset;
-} __attribute__((packed));
-
-/* only for backward compatibility */
-#define __NL80211_WOWLAN_PKTPAT_INVALID __NL80211_PKTPAT_INVALID
-#define NL80211_WOWLAN_PKTPAT_MASK NL80211_PKTPAT_MASK
-#define NL80211_WOWLAN_PKTPAT_PATTERN NL80211_PKTPAT_PATTERN
-#define NL80211_WOWLAN_PKTPAT_OFFSET NL80211_PKTPAT_OFFSET
-#define NUM_NL80211_WOWLAN_PKTPAT NUM_NL80211_PKTPAT
-#define MAX_NL80211_WOWLAN_PKTPAT MAX_NL80211_PKTPAT
-#define nl80211_wowlan_pattern_support nl80211_pattern_support
-
-/**
- * enum nl80211_wowlan_triggers - WoWLAN trigger definitions
- * @__NL80211_WOWLAN_TRIG_INVALID: invalid number for nested attributes
- * @NL80211_WOWLAN_TRIG_ANY: wake up on any activity, do not really put
- *	the chip into a special state -- works best with chips that have
- *	support for low-power operation already (flag)
- *	Note that this mode is incompatible with all of the others, if
- *	any others are even supported by the device.
- * @NL80211_WOWLAN_TRIG_DISCONNECT: wake up on disconnect, the way disconnect
- *	is detected is implementation-specific (flag)
- * @NL80211_WOWLAN_TRIG_MAGIC_PKT: wake up on magic packet (6x 0xff, followed
- *	by 16 repetitions of MAC addr, anywhere in payload) (flag)
- * @NL80211_WOWLAN_TRIG_PKT_PATTERN: wake up on the specified packet patterns
- *	which are passed in an array of nested attributes, each nested attribute
- *	defining a with attributes from &struct nl80211_wowlan_trig_pkt_pattern.
- *	Each pattern defines a wakeup packet. Packet offset is associated with
- *	each pattern which is used while matching the pattern. The matching is
- *	done on the MSDU, i.e. as though the packet was an 802.3 packet, so the
- *	pattern matching is done after the packet is converted to the MSDU.
- *
- *	In %NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED, it is a binary attribute
- *	carrying a &struct nl80211_pattern_support.
- *
- *	When reporting wakeup. it is a u32 attribute containing the 0-based
- *	index of the pattern that caused the wakeup, in the patterns passed
- *	to the kernel when configuring.
- * @NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED: Not a real trigger, and cannot be
- *	used when setting, used only to indicate that GTK rekeying is supported
- *	by the device (flag)
- * @NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE: wake up on GTK rekey failure (if
- *	done by the device) (flag)
- * @NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST: wake up on EAP Identity Request
- *	packet (flag)
- * @NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE: wake up on 4-way handshake (flag)
- * @NL80211_WOWLAN_TRIG_RFKILL_RELEASE: wake up when rfkill is released
- *	(on devices that have rfkill in the device) (flag)
- * @NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211: For wakeup reporting only, contains
- *	the 802.11 packet that caused the wakeup, e.g. a deauth frame. The frame
- *	may be truncated, the @NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211_LEN
- *	attribute contains the original length.
- * @NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211_LEN: Original length of the 802.11
- *	packet, may be bigger than the @NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211
- *	attribute if the packet was truncated somewhere.
- * @NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023: For wakeup reporting only, contains the
- *	802.11 packet that caused the wakeup, e.g. a magic packet. The frame may
- *	be truncated, the @NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023_LEN attribute
- *	contains the original length.
- * @NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023_LEN: Original length of the 802.3
- *	packet, may be bigger than the @NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023
- *	attribute if the packet was truncated somewhere.
- * @NL80211_WOWLAN_TRIG_TCP_CONNECTION: TCP connection wake, see DOC section
- *	"TCP connection wakeup" for more details. This is a nested attribute
- *	containing the exact information for establishing and keeping alive
- *	the TCP connection.
- * @NL80211_WOWLAN_TRIG_TCP_WAKEUP_MATCH: For wakeup reporting only, the
- *	wakeup packet was received on the TCP connection
- * @NL80211_WOWLAN_TRIG_WAKEUP_TCP_CONNLOST: For wakeup reporting only, the
- *	TCP connection was lost or failed to be established
- * @NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS: For wakeup reporting only,
- *	the TCP connection ran out of tokens to use for data to send to the
- *	service
- * @NL80211_WOWLAN_TRIG_NET_DETECT: wake up when a configured network
- *	is detected.  This is a nested attribute that contains the
- *	same attributes used with @NL80211_CMD_START_SCHED_SCAN.  It
- *	specifies how the scan is performed (e.g. the interval, the
- *	channels to scan and the initial delay) as well as the scan
- *	results that will trigger a wake (i.e. the matchsets).  This
- *	attribute is also sent in a response to
- *	@NL80211_CMD_GET_WIPHY, indicating the number of match sets
- *	supported by the driver (u32).
- * @NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS: nested attribute
- *	containing an array with information about what triggered the
- *	wake up.  If no elements are present in the array, it means
- *	that the information is not available.  If more than one
- *	element is present, it means that more than one match
- *	occurred.
- *	Each element in the array is a nested attribute that contains
- *	one optional %NL80211_ATTR_SSID attribute and one optional
- *	%NL80211_ATTR_SCAN_FREQUENCIES attribute.  At least one of
- *	these attributes must be present.  If
- *	%NL80211_ATTR_SCAN_FREQUENCIES contains more than one
- *	frequency, it means that the match occurred in more than one
- *	channel.
- * @NUM_NL80211_WOWLAN_TRIG: number of wake on wireless triggers
- * @MAX_NL80211_WOWLAN_TRIG: highest wowlan trigger attribute number
- *
- * These nested attributes are used to configure the wakeup triggers and
- * to report the wakeup reason(s).
- */
-enum nl80211_wowlan_triggers {
-	__NL80211_WOWLAN_TRIG_INVALID,
-	NL80211_WOWLAN_TRIG_ANY,
-	NL80211_WOWLAN_TRIG_DISCONNECT,
-	NL80211_WOWLAN_TRIG_MAGIC_PKT,
-	NL80211_WOWLAN_TRIG_PKT_PATTERN,
-	NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED,
-	NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE,
-	NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST,
-	NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE,
-	NL80211_WOWLAN_TRIG_RFKILL_RELEASE,
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211,
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211_LEN,
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023,
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023_LEN,
-	NL80211_WOWLAN_TRIG_TCP_CONNECTION,
-	NL80211_WOWLAN_TRIG_WAKEUP_TCP_MATCH,
-	NL80211_WOWLAN_TRIG_WAKEUP_TCP_CONNLOST,
-	NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS,
-	NL80211_WOWLAN_TRIG_NET_DETECT,
-	NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS,
-
-	/* keep last */
-	NUM_NL80211_WOWLAN_TRIG,
-	MAX_NL80211_WOWLAN_TRIG = NUM_NL80211_WOWLAN_TRIG - 1
-};
-
-/**
- * DOC: TCP connection wakeup
- *
- * Some devices can establish a TCP connection in order to be woken up by a
- * packet coming in from outside their network segment, or behind NAT. If
- * configured, the device will establish a TCP connection to the given
- * service, and periodically send data to that service. The first data
- * packet is usually transmitted after SYN/ACK, also ACKing the SYN/ACK.
- * The data packets can optionally include a (little endian) sequence
- * number (in the TCP payload!) that is generated by the device, and, also
- * optionally, a token from a list of tokens. This serves as a keep-alive
- * with the service, and for NATed connections, etc.
- *
- * During this keep-alive period, the server doesn't send any data to the
- * client. When receiving data, it is compared against the wakeup pattern
- * (and mask) and if it matches, the host is woken up. Similarly, if the
- * connection breaks or cannot be established to start with, the host is
- * also woken up.
- *
- * Developer's note: ARP offload is required for this, otherwise TCP
- * response packets might not go through correctly.
- */
-
-/**
- * struct nl80211_wowlan_tcp_data_seq - WoWLAN TCP data sequence
- * @start: starting value
- * @offset: offset of sequence number in packet
- * @len: length of the sequence value to write, 1 through 4
- *
- * Note: don't confuse with the TCP sequence number(s), this is for the
- * keepalive packet payload. The actual value is written into the packet
- * in little endian.
- */
-struct nl80211_wowlan_tcp_data_seq {
-	__u32 start, offset, len;
-};
-
-/**
- * struct nl80211_wowlan_tcp_data_token - WoWLAN TCP data token config
- * @offset: offset of token in packet
- * @len: length of each token
- * @token_stream: stream of data to be used for the tokens, the length must
- *	be a multiple of @len for this to make sense
- */
-struct nl80211_wowlan_tcp_data_token {
-	__u32 offset, len;
-	__u8 token_stream[];
-};
-
-/**
- * struct nl80211_wowlan_tcp_data_token_feature - data token features
- * @min_len: minimum token length
- * @max_len: maximum token length
- * @bufsize: total available token buffer size (max size of @token_stream)
- */
-struct nl80211_wowlan_tcp_data_token_feature {
-	__u32 min_len, max_len, bufsize;
-};
-
-/**
- * enum nl80211_wowlan_tcp_attrs - WoWLAN TCP connection parameters
- * @__NL80211_WOWLAN_TCP_INVALID: invalid number for nested attributes
- * @NL80211_WOWLAN_TCP_SRC_IPV4: source IPv4 address (in network byte order)
- * @NL80211_WOWLAN_TCP_DST_IPV4: destination IPv4 address
- *	(in network byte order)
- * @NL80211_WOWLAN_TCP_DST_MAC: destination MAC address, this is given because
- *	route lookup when configured might be invalid by the time we suspend,
- *	and doing a route lookup when suspending is no longer possible as it
- *	might require ARP querying.
- * @NL80211_WOWLAN_TCP_SRC_PORT: source port (u16); optional, if not given a
- *	socket and port will be allocated
- * @NL80211_WOWLAN_TCP_DST_PORT: destination port (u16)
- * @NL80211_WOWLAN_TCP_DATA_PAYLOAD: data packet payload, at least one byte.
- *	For feature advertising, a u32 attribute holding the maximum length
- *	of the data payload.
- * @NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ: data packet sequence configuration
- *	(if desired), a &struct nl80211_wowlan_tcp_data_seq. For feature
- *	advertising it is just a flag
- * @NL80211_WOWLAN_TCP_DATA_PAYLOAD_TOKEN: data packet token configuration,
- *	see &struct nl80211_wowlan_tcp_data_token and for advertising see
- *	&struct nl80211_wowlan_tcp_data_token_feature.
- * @NL80211_WOWLAN_TCP_DATA_INTERVAL: data interval in seconds, maximum
- *	interval in feature advertising (u32)
- * @NL80211_WOWLAN_TCP_WAKE_PAYLOAD: wake packet payload, for advertising a
- *	u32 attribute holding the maximum length
- * @NL80211_WOWLAN_TCP_WAKE_MASK: Wake packet payload mask, not used for
- *	feature advertising. The mask works like @NL80211_PKTPAT_MASK
- *	but on the TCP payload only.
- * @NUM_NL80211_WOWLAN_TCP: number of TCP attributes
- * @MAX_NL80211_WOWLAN_TCP: highest attribute number
- */
-enum nl80211_wowlan_tcp_attrs {
-	__NL80211_WOWLAN_TCP_INVALID,
-	NL80211_WOWLAN_TCP_SRC_IPV4,
-	NL80211_WOWLAN_TCP_DST_IPV4,
-	NL80211_WOWLAN_TCP_DST_MAC,
-	NL80211_WOWLAN_TCP_SRC_PORT,
-	NL80211_WOWLAN_TCP_DST_PORT,
-	NL80211_WOWLAN_TCP_DATA_PAYLOAD,
-	NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ,
-	NL80211_WOWLAN_TCP_DATA_PAYLOAD_TOKEN,
-	NL80211_WOWLAN_TCP_DATA_INTERVAL,
-	NL80211_WOWLAN_TCP_WAKE_PAYLOAD,
-	NL80211_WOWLAN_TCP_WAKE_MASK,
-
-	/* keep last */
-	NUM_NL80211_WOWLAN_TCP,
-	MAX_NL80211_WOWLAN_TCP = NUM_NL80211_WOWLAN_TCP - 1
-};
-
-/**
- * struct nl80211_coalesce_rule_support - coalesce rule support information
- * @max_rules: maximum number of rules supported
- * @pat: packet pattern support information
- * @max_delay: maximum supported coalescing delay in msecs
- *
- * This struct is carried in %NL80211_ATTR_COALESCE_RULE in the
- * capability information given by the kernel to userspace.
- */
-struct nl80211_coalesce_rule_support {
-	__u32 max_rules;
-	struct nl80211_pattern_support pat;
-	__u32 max_delay;
-} __attribute__((packed));
-
-/**
- * enum nl80211_attr_coalesce_rule - coalesce rule attribute
- * @__NL80211_COALESCE_RULE_INVALID: invalid number for nested attribute
- * @NL80211_ATTR_COALESCE_RULE_DELAY: delay in msecs used for packet coalescing
- * @NL80211_ATTR_COALESCE_RULE_CONDITION: condition for packet coalescence,
- *	see &enum nl80211_coalesce_condition.
- * @NL80211_ATTR_COALESCE_RULE_PKT_PATTERN: packet offset, pattern is matched
- *	after these fixed number of bytes of received packet
- * @NUM_NL80211_ATTR_COALESCE_RULE: number of attributes
- * @NL80211_ATTR_COALESCE_RULE_MAX: max attribute number
- */
-enum nl80211_attr_coalesce_rule {
-	__NL80211_COALESCE_RULE_INVALID,
-	NL80211_ATTR_COALESCE_RULE_DELAY,
-	NL80211_ATTR_COALESCE_RULE_CONDITION,
-	NL80211_ATTR_COALESCE_RULE_PKT_PATTERN,
-
-	/* keep last */
-	NUM_NL80211_ATTR_COALESCE_RULE,
-	NL80211_ATTR_COALESCE_RULE_MAX = NUM_NL80211_ATTR_COALESCE_RULE - 1
-};
-
-/**
- * enum nl80211_coalesce_condition - coalesce rule conditions
- * @NL80211_COALESCE_CONDITION_MATCH: coalaesce Rx packets when patterns
- *	in a rule are matched.
- * @NL80211_COALESCE_CONDITION_NO_MATCH: coalesce Rx packets when patterns
- *	in a rule are not matched.
- */
-enum nl80211_coalesce_condition {
-	NL80211_COALESCE_CONDITION_MATCH,
-	NL80211_COALESCE_CONDITION_NO_MATCH
-};
-
-/**
- * enum nl80211_iface_limit_attrs - limit attributes
- * @NL80211_IFACE_LIMIT_UNSPEC: (reserved)
- * @NL80211_IFACE_LIMIT_MAX: maximum number of interfaces that
- *	can be chosen from this set of interface types (u32)
- * @NL80211_IFACE_LIMIT_TYPES: nested attribute containing a
- *	flag attribute for each interface type in this set
- * @NUM_NL80211_IFACE_LIMIT: number of attributes
- * @MAX_NL80211_IFACE_LIMIT: highest attribute number
- */
-enum nl80211_iface_limit_attrs {
-	NL80211_IFACE_LIMIT_UNSPEC,
-	NL80211_IFACE_LIMIT_MAX,
-	NL80211_IFACE_LIMIT_TYPES,
-
-	/* keep last */
-	NUM_NL80211_IFACE_LIMIT,
-	MAX_NL80211_IFACE_LIMIT = NUM_NL80211_IFACE_LIMIT - 1
-};
-
-/**
- * enum nl80211_if_combination_attrs -- interface combination attributes
- *
- * @NL80211_IFACE_COMB_UNSPEC: (reserved)
- * @NL80211_IFACE_COMB_LIMITS: Nested attributes containing the limits
- *	for given interface types, see &enum nl80211_iface_limit_attrs.
- * @NL80211_IFACE_COMB_MAXNUM: u32 attribute giving the total number of
- *	interfaces that can be created in this group. This number doesn't
- *	apply to interfaces purely managed in software, which are listed
- *	in a separate attribute %NL80211_ATTR_INTERFACES_SOFTWARE.
- * @NL80211_IFACE_COMB_STA_AP_BI_MATCH: flag attribute specifying that
- *	beacon intervals within this group must be all the same even for
- *	infrastructure and AP/GO combinations, i.e. the GO(s) must adopt
- *	the infrastructure network's beacon interval.
- * @NL80211_IFACE_COMB_NUM_CHANNELS: u32 attribute specifying how many
- *	different channels may be used within this group.
- * @NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS: u32 attribute containing the bitmap
- *	of supported channel widths for radar detection.
- * @NL80211_IFACE_COMB_RADAR_DETECT_REGIONS: u32 attribute containing the bitmap
- *	of supported regulatory regions for radar detection.
- * @NUM_NL80211_IFACE_COMB: number of attributes
- * @MAX_NL80211_IFACE_COMB: highest attribute number
- *
- * Examples:
- *	limits = [ #{STA} <= 1, #{AP} <= 1 ], matching BI, channels = 1, max = 2
- *	=> allows an AP and a STA that must match BIs
- *
- *	numbers = [ #{AP, P2P-GO} <= 8 ], channels = 1, max = 8
- *	=> allows 8 of AP/GO
- *
- *	numbers = [ #{STA} <= 2 ], channels = 2, max = 2
- *	=> allows two STAs on different channels
- *
- *	numbers = [ #{STA} <= 1, #{P2P-client,P2P-GO} <= 3 ], max = 4
- *	=> allows a STA plus three P2P interfaces
- *
- * The list of these four possiblities could completely be contained
- * within the %NL80211_ATTR_INTERFACE_COMBINATIONS attribute to indicate
- * that any of these groups must match.
- *
- * "Combinations" of just a single interface will not be listed here,
- * a single interface of any valid interface type is assumed to always
- * be possible by itself. This means that implicitly, for each valid
- * interface type, the following group always exists:
- *	numbers = [ #{<type>} <= 1 ], channels = 1, max = 1
- */
-enum nl80211_if_combination_attrs {
-	NL80211_IFACE_COMB_UNSPEC,
-	NL80211_IFACE_COMB_LIMITS,
-	NL80211_IFACE_COMB_MAXNUM,
-	NL80211_IFACE_COMB_STA_AP_BI_MATCH,
-	NL80211_IFACE_COMB_NUM_CHANNELS,
-	NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
-	NL80211_IFACE_COMB_RADAR_DETECT_REGIONS,
-
-	/* keep last */
-	NUM_NL80211_IFACE_COMB,
-	MAX_NL80211_IFACE_COMB = NUM_NL80211_IFACE_COMB - 1
-};
-
-
-/**
- * enum nl80211_plink_state - state of a mesh peer link finite state machine
- *
- * @NL80211_PLINK_LISTEN: initial state, considered the implicit
- *	state of non existant mesh peer links
- * @NL80211_PLINK_OPN_SNT: mesh plink open frame has been sent to
- *	this mesh peer
- * @NL80211_PLINK_OPN_RCVD: mesh plink open frame has been received
- *	from this mesh peer
- * @NL80211_PLINK_CNF_RCVD: mesh plink confirm frame has been
- *	received from this mesh peer
- * @NL80211_PLINK_ESTAB: mesh peer link is established
- * @NL80211_PLINK_HOLDING: mesh peer link is being closed or cancelled
- * @NL80211_PLINK_BLOCKED: all frames transmitted from this mesh
- *	plink are discarded
- * @NUM_NL80211_PLINK_STATES: number of peer link states
- * @MAX_NL80211_PLINK_STATES: highest numerical value of plink states
- */
-enum nl80211_plink_state {
-	NL80211_PLINK_LISTEN,
-	NL80211_PLINK_OPN_SNT,
-	NL80211_PLINK_OPN_RCVD,
-	NL80211_PLINK_CNF_RCVD,
-	NL80211_PLINK_ESTAB,
-	NL80211_PLINK_HOLDING,
-	NL80211_PLINK_BLOCKED,
-
-	/* keep last */
-	NUM_NL80211_PLINK_STATES,
-	MAX_NL80211_PLINK_STATES = NUM_NL80211_PLINK_STATES - 1
-};
-
-/**
- * enum nl80211_plink_action - actions to perform in mesh peers
- *
- * @NL80211_PLINK_ACTION_NO_ACTION: perform no action
- * @NL80211_PLINK_ACTION_OPEN: start mesh peer link establishment
- * @NL80211_PLINK_ACTION_BLOCK: block traffic from this mesh peer
- * @NUM_NL80211_PLINK_ACTIONS: number of possible actions
- */
-enum plink_actions {
-	NL80211_PLINK_ACTION_NO_ACTION,
-	NL80211_PLINK_ACTION_OPEN,
-	NL80211_PLINK_ACTION_BLOCK,
-
-	NUM_NL80211_PLINK_ACTIONS,
-};
-
-
-#define NL80211_KCK_LEN			16
-#define NL80211_KEK_LEN			16
-#define NL80211_REPLAY_CTR_LEN		8
-
-/**
- * enum nl80211_rekey_data - attributes for GTK rekey offload
- * @__NL80211_REKEY_DATA_INVALID: invalid number for nested attributes
- * @NL80211_REKEY_DATA_KEK: key encryption key (binary)
- * @NL80211_REKEY_DATA_KCK: key confirmation key (binary)
- * @NL80211_REKEY_DATA_REPLAY_CTR: replay counter (binary)
- * @NUM_NL80211_REKEY_DATA: number of rekey attributes (internal)
- * @MAX_NL80211_REKEY_DATA: highest rekey attribute (internal)
- */
-enum nl80211_rekey_data {
-	__NL80211_REKEY_DATA_INVALID,
-	NL80211_REKEY_DATA_KEK,
-	NL80211_REKEY_DATA_KCK,
-	NL80211_REKEY_DATA_REPLAY_CTR,
-
-	/* keep last */
-	NUM_NL80211_REKEY_DATA,
-	MAX_NL80211_REKEY_DATA = NUM_NL80211_REKEY_DATA - 1
-};
-
-/**
- * enum nl80211_hidden_ssid - values for %NL80211_ATTR_HIDDEN_SSID
- * @NL80211_HIDDEN_SSID_NOT_IN_USE: do not hide SSID (i.e., broadcast it in
- *	Beacon frames)
- * @NL80211_HIDDEN_SSID_ZERO_LEN: hide SSID by using zero-length SSID element
- *	in Beacon frames
- * @NL80211_HIDDEN_SSID_ZERO_CONTENTS: hide SSID by using correct length of SSID
- *	element in Beacon frames but zero out each byte in the SSID
- */
-enum nl80211_hidden_ssid {
-	NL80211_HIDDEN_SSID_NOT_IN_USE,
-	NL80211_HIDDEN_SSID_ZERO_LEN,
-	NL80211_HIDDEN_SSID_ZERO_CONTENTS
-};
-
-/**
- * enum nl80211_sta_wme_attr - station WME attributes
- * @__NL80211_STA_WME_INVALID: invalid number for nested attribute
- * @NL80211_STA_WME_UAPSD_QUEUES: bitmap of uapsd queues. the format
- *	is the same as the AC bitmap in the QoS info field.
- * @NL80211_STA_WME_MAX_SP: max service period. the format is the same
- *	as the MAX_SP field in the QoS info field (but already shifted down).
- * @__NL80211_STA_WME_AFTER_LAST: internal
- * @NL80211_STA_WME_MAX: highest station WME attribute
- */
-enum nl80211_sta_wme_attr {
-	__NL80211_STA_WME_INVALID,
-	NL80211_STA_WME_UAPSD_QUEUES,
-	NL80211_STA_WME_MAX_SP,
-
-	/* keep last */
-	__NL80211_STA_WME_AFTER_LAST,
-	NL80211_STA_WME_MAX = __NL80211_STA_WME_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_pmksa_candidate_attr - attributes for PMKSA caching candidates
- * @__NL80211_PMKSA_CANDIDATE_INVALID: invalid number for nested attributes
- * @NL80211_PMKSA_CANDIDATE_INDEX: candidate index (u32; the smaller, the higher
- *	priority)
- * @NL80211_PMKSA_CANDIDATE_BSSID: candidate BSSID (6 octets)
- * @NL80211_PMKSA_CANDIDATE_PREAUTH: RSN pre-authentication supported (flag)
- * @NUM_NL80211_PMKSA_CANDIDATE: number of PMKSA caching candidate attributes
- *	(internal)
- * @MAX_NL80211_PMKSA_CANDIDATE: highest PMKSA caching candidate attribute
- *	(internal)
- */
-enum nl80211_pmksa_candidate_attr {
-	__NL80211_PMKSA_CANDIDATE_INVALID,
-	NL80211_PMKSA_CANDIDATE_INDEX,
-	NL80211_PMKSA_CANDIDATE_BSSID,
-	NL80211_PMKSA_CANDIDATE_PREAUTH,
-
-	/* keep last */
-	NUM_NL80211_PMKSA_CANDIDATE,
-	MAX_NL80211_PMKSA_CANDIDATE = NUM_NL80211_PMKSA_CANDIDATE - 1
-};
-
-/**
- * enum nl80211_tdls_operation - values for %NL80211_ATTR_TDLS_OPERATION
- * @NL80211_TDLS_DISCOVERY_REQ: Send a TDLS discovery request
- * @NL80211_TDLS_SETUP: Setup TDLS link
- * @NL80211_TDLS_TEARDOWN: Teardown a TDLS link which is already established
- * @NL80211_TDLS_ENABLE_LINK: Enable TDLS link
- * @NL80211_TDLS_DISABLE_LINK: Disable TDLS link
- */
-enum nl80211_tdls_operation {
-	NL80211_TDLS_DISCOVERY_REQ,
-	NL80211_TDLS_SETUP,
-	NL80211_TDLS_TEARDOWN,
-	NL80211_TDLS_ENABLE_LINK,
-	NL80211_TDLS_DISABLE_LINK,
-};
-
-/*
- * enum nl80211_ap_sme_features - device-integrated AP features
- * Reserved for future use, no bits are defined in
- * NL80211_ATTR_DEVICE_AP_SME yet.
-enum nl80211_ap_sme_features {
-};
- */
-
-/**
- * enum nl80211_feature_flags - device/driver features
- * @NL80211_FEATURE_SK_TX_STATUS: This driver supports reflecting back
- *	TX status to the socket error queue when requested with the
- *	socket option.
- * @NL80211_FEATURE_HT_IBSS: This driver supports IBSS with HT datarates.
- * @NL80211_FEATURE_INACTIVITY_TIMER: This driver takes care of freeing up
- *	the connected inactive stations in AP mode.
- * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested
- *	to work properly to suppport receiving regulatory hints from
- *	cellular base stations.
- * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: (no longer available, only
- *	here to reserve the value for API/ABI compatibility)
- * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of
- *	equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station
- *	mode
- * @NL80211_FEATURE_LOW_PRIORITY_SCAN: This driver supports low priority scan
- * @NL80211_FEATURE_SCAN_FLUSH: Scan flush is supported
- * @NL80211_FEATURE_AP_SCAN: Support scanning using an AP vif
- * @NL80211_FEATURE_VIF_TXPOWER: The driver supports per-vif TX power setting
- * @NL80211_FEATURE_NEED_OBSS_SCAN: The driver expects userspace to perform
- *	OBSS scans and generate 20/40 BSS coex reports. This flag is used only
- *	for drivers implementing the CONNECT API, for AUTH/ASSOC it is implied.
- * @NL80211_FEATURE_P2P_GO_CTWIN: P2P GO implementation supports CT Window
- *	setting
- * @NL80211_FEATURE_P2P_GO_OPPPS: P2P GO implementation supports opportunistic
- *	powersave
- * @NL80211_FEATURE_FULL_AP_CLIENT_STATE: The driver supports full state
- *	transitions for AP clients. Without this flag (and if the driver
- *	doesn't have the AP SME in the device) the driver supports adding
- *	stations only when they're associated and adds them in associated
- *	state (to later be transitioned into authorized), with this flag
- *	they should be added before even sending the authentication reply
- *	and then transitioned into authenticated, associated and authorized
- *	states using station flags.
- *	Note that even for drivers that support this, the default is to add
- *	stations in authenticated/associated state, so to add unauthenticated
- *	stations the authenticated/associated bits have to be set in the mask.
- * @NL80211_FEATURE_ADVERTISE_CHAN_LIMITS: cfg80211 advertises channel limits
- *	(HT40, VHT 80/160 MHz) if this flag is set
- * @NL80211_FEATURE_USERSPACE_MPM: This driver supports a userspace Mesh
- *	Peering Management entity which may be implemented by registering for
- *	beacons or NL80211_CMD_NEW_PEER_CANDIDATE events. The mesh beacon is
- *	still generated by the driver.
- * @NL80211_FEATURE_ACTIVE_MONITOR: This driver supports an active monitor
- *	interface. An active monitor interface behaves like a normal monitor
- *	interface, but gets added to the driver. It ensures that incoming
- *	unicast packets directed at the configured interface address get ACKed.
- * @NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE: This driver supports dynamic
- *	channel bandwidth change (e.g., HT 20 <-> 40 MHz channel) during the
- *	lifetime of a BSS.
- * @NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES: This device adds a DS Parameter
- *	Set IE to probe requests.
- * @NL80211_FEATURE_WFA_TPC_IE_IN_PROBES: This device adds a WFA TPC Report IE
- *	to probe requests.
- * @NL80211_FEATURE_QUIET: This device, in client mode, supports Quiet Period
- *	requests sent to it by an AP.
- * @NL80211_FEATURE_TX_POWER_INSERTION: This device is capable of inserting the
- *	current tx power value into the TPC Report IE in the spectrum
- *	management TPC Report action frame, and in the Radio Measurement Link
- *	Measurement Report action frame.
- * @NL80211_FEATURE_ACKTO_ESTIMATION: This driver supports dynamic ACK timeout
- *	estimation (dynack). %NL80211_ATTR_WIPHY_DYN_ACK flag attribute is used
- *	to enable dynack.
- * @NL80211_FEATURE_STATIC_SMPS: Device supports static spatial
- *	multiplexing powersave, ie. can turn off all but one chain
- *	even on HT connections that should be using more chains.
- * @NL80211_FEATURE_DYNAMIC_SMPS: Device supports dynamic spatial
- *	multiplexing powersave, ie. can turn off all but one chain
- *	and then wake the rest up as required after, for example,
- *	rts/cts handshake.
- * @NL80211_FEATURE_SUPPORTS_WMM_ADMISSION: the device supports setting up WMM
- *	TSPEC sessions (TID aka TSID 0-7) with the %NL80211_CMD_ADD_TX_TS
- *	command. Standard IEEE 802.11 TSPEC setup is not yet supported, it
- *	needs to be able to handle Block-Ack agreements and other things.
- * @NL80211_FEATURE_MAC_ON_CREATE: Device supports configuring
- *	the vif's MAC address upon creation.
- *	See 'macaddr' field in the vif_params (cfg80211.h).
- * @NL80211_FEATURE_TDLS_CHANNEL_SWITCH: Driver supports channel switching when
- *	operating as a TDLS peer.
- * @NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR: This device/driver supports using a
- *	random MAC address during scan (if the device is unassociated); the
- *	%NL80211_SCAN_FLAG_RANDOM_ADDR flag may be set for scans and the MAC
- *	address mask/value will be used.
- * @NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR: This device/driver supports
- *	using a random MAC address for every scan iteration during scheduled
- *	scan (while not associated), the %NL80211_SCAN_FLAG_RANDOM_ADDR may
- *	be set for scheduled scan and the MAC address mask/value will be used.
- * @NL80211_FEATURE_ND_RANDOM_MAC_ADDR: This device/driver supports using a
- *	random MAC address for every scan iteration during "net detect", i.e.
- *	scan in unassociated WoWLAN, the %NL80211_SCAN_FLAG_RANDOM_ADDR may
- *	be set for scheduled scan and the MAC address mask/value will be used.
- */
-enum nl80211_feature_flags {
-	NL80211_FEATURE_SK_TX_STATUS			= 1 << 0,
-	NL80211_FEATURE_HT_IBSS				= 1 << 1,
-	NL80211_FEATURE_INACTIVITY_TIMER		= 1 << 2,
-	NL80211_FEATURE_CELL_BASE_REG_HINTS		= 1 << 3,
-	NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL	= 1 << 4,
-	NL80211_FEATURE_SAE				= 1 << 5,
-	NL80211_FEATURE_LOW_PRIORITY_SCAN		= 1 << 6,
-	NL80211_FEATURE_SCAN_FLUSH			= 1 << 7,
-	NL80211_FEATURE_AP_SCAN				= 1 << 8,
-	NL80211_FEATURE_VIF_TXPOWER			= 1 << 9,
-	NL80211_FEATURE_NEED_OBSS_SCAN			= 1 << 10,
-	NL80211_FEATURE_P2P_GO_CTWIN			= 1 << 11,
-	NL80211_FEATURE_P2P_GO_OPPPS			= 1 << 12,
-	/* bit 13 is reserved */
-	NL80211_FEATURE_ADVERTISE_CHAN_LIMITS		= 1 << 14,
-	NL80211_FEATURE_FULL_AP_CLIENT_STATE		= 1 << 15,
-	NL80211_FEATURE_USERSPACE_MPM			= 1 << 16,
-	NL80211_FEATURE_ACTIVE_MONITOR			= 1 << 17,
-	NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE	= 1 << 18,
-	NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES	= 1 << 19,
-	NL80211_FEATURE_WFA_TPC_IE_IN_PROBES		= 1 << 20,
-	NL80211_FEATURE_QUIET				= 1 << 21,
-	NL80211_FEATURE_TX_POWER_INSERTION		= 1 << 22,
-	NL80211_FEATURE_ACKTO_ESTIMATION		= 1 << 23,
-	NL80211_FEATURE_STATIC_SMPS			= 1 << 24,
-	NL80211_FEATURE_DYNAMIC_SMPS			= 1 << 25,
-	NL80211_FEATURE_SUPPORTS_WMM_ADMISSION		= 1 << 26,
-	NL80211_FEATURE_MAC_ON_CREATE			= 1 << 27,
-	NL80211_FEATURE_TDLS_CHANNEL_SWITCH		= 1 << 28,
-	NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR		= 1 << 29,
-	NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR	= 1 << 30,
-	NL80211_FEATURE_ND_RANDOM_MAC_ADDR		= 1 << 31,
-};
-
-/**
- * enum nl80211_ext_feature_index - bit index of extended features.
- * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
- *
- * @NUM_NL80211_EXT_FEATURES: number of extended features.
- * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
- */
-enum nl80211_ext_feature_index {
-	NL80211_EXT_FEATURE_VHT_IBSS,
-
-	/* add new features before the definition below */
-	NUM_NL80211_EXT_FEATURES,
-	MAX_NL80211_EXT_FEATURES = NUM_NL80211_EXT_FEATURES - 1
-};
-
-/**
- * enum nl80211_probe_resp_offload_support_attr - optional supported
- *	protocols for probe-response offloading by the driver/FW.
- *	To be used with the %NL80211_ATTR_PROBE_RESP_OFFLOAD attribute.
- *	Each enum value represents a bit in the bitmap of supported
- *	protocols. Typically a subset of probe-requests belonging to a
- *	supported protocol will be excluded from offload and uploaded
- *	to the host.
- *
- * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS: Support for WPS ver. 1
- * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2: Support for WPS ver. 2
- * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P: Support for P2P
- * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U: Support for 802.11u
- */
-enum nl80211_probe_resp_offload_support_attr {
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS =	1<<0,
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 =	1<<1,
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P =	1<<2,
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U =	1<<3,
-};
-
-/**
- * enum nl80211_connect_failed_reason - connection request failed reasons
- * @NL80211_CONN_FAIL_MAX_CLIENTS: Maximum number of clients that can be
- *	handled by the AP is reached.
- * @NL80211_CONN_FAIL_BLOCKED_CLIENT: Connection request is rejected due to ACL.
- */
-enum nl80211_connect_failed_reason {
-	NL80211_CONN_FAIL_MAX_CLIENTS,
-	NL80211_CONN_FAIL_BLOCKED_CLIENT,
-};
-
-/**
- * enum nl80211_scan_flags -  scan request control flags
- *
- * Scan request control flags are used to control the handling
- * of NL80211_CMD_TRIGGER_SCAN and NL80211_CMD_START_SCHED_SCAN
- * requests.
- *
- * @NL80211_SCAN_FLAG_LOW_PRIORITY: scan request has low priority
- * @NL80211_SCAN_FLAG_FLUSH: flush cache before scanning
- * @NL80211_SCAN_FLAG_AP: force a scan even if the interface is configured
- *	as AP and the beaconing has already been configured. This attribute is
- *	dangerous because will destroy stations performance as a lot of frames
- *	will be lost while scanning off-channel, therefore it must be used only
- *	when really needed
- * @NL80211_SCAN_FLAG_RANDOM_ADDR: use a random MAC address for this scan (or
- *	for scheduled scan: a different one for every scan iteration). When the
- *	flag is set, depending on device capabilities the @NL80211_ATTR_MAC and
- *	@NL80211_ATTR_MAC_MASK attributes may also be given in which case only
- *	the masked bits will be preserved from the MAC address and the remainder
- *	randomised. If the attributes are not given full randomisation (46 bits,
- *	locally administered 1, multicast 0) is assumed.
- *	This flag must not be requested when the feature isn't supported, check
- *	the nl80211 feature flags for the device.
- */
-enum nl80211_scan_flags {
-	NL80211_SCAN_FLAG_LOW_PRIORITY			= 1<<0,
-	NL80211_SCAN_FLAG_FLUSH				= 1<<1,
-	NL80211_SCAN_FLAG_AP				= 1<<2,
-	NL80211_SCAN_FLAG_RANDOM_ADDR			= 1<<3,
-};
-
-/**
- * enum nl80211_acl_policy - access control policy
- *
- * Access control policy is applied on a MAC list set by
- * %NL80211_CMD_START_AP and %NL80211_CMD_SET_MAC_ACL, to
- * be used with %NL80211_ATTR_ACL_POLICY.
- *
- * @NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED: Deny stations which are
- *	listed in ACL, i.e. allow all the stations which are not listed
- *	in ACL to authenticate.
- * @NL80211_ACL_POLICY_DENY_UNLESS_LISTED: Allow the stations which are listed
- *	in ACL, i.e. deny all the stations which are not listed in ACL.
- */
-enum nl80211_acl_policy {
-	NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED,
-	NL80211_ACL_POLICY_DENY_UNLESS_LISTED,
-};
-
-/**
- * enum nl80211_smps_mode - SMPS mode
- *
- * Requested SMPS mode (for AP mode)
- *
- * @NL80211_SMPS_OFF: SMPS off (use all antennas).
- * @NL80211_SMPS_STATIC: static SMPS (use a single antenna)
- * @NL80211_SMPS_DYNAMIC: dynamic smps (start with a single antenna and
- *	turn on other antennas after CTS/RTS).
- */
-enum nl80211_smps_mode {
-	NL80211_SMPS_OFF,
-	NL80211_SMPS_STATIC,
-	NL80211_SMPS_DYNAMIC,
-
-	__NL80211_SMPS_AFTER_LAST,
-	NL80211_SMPS_MAX = __NL80211_SMPS_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_radar_event - type of radar event for DFS operation
- *
- * Type of event to be used with NL80211_ATTR_RADAR_EVENT to inform userspace
- * about detected radars or success of the channel available check (CAC)
- *
- * @NL80211_RADAR_DETECTED: A radar pattern has been detected. The channel is
- *	now unusable.
- * @NL80211_RADAR_CAC_FINISHED: Channel Availability Check has been finished,
- *	the channel is now available.
- * @NL80211_RADAR_CAC_ABORTED: Channel Availability Check has been aborted, no
- *	change to the channel status.
- * @NL80211_RADAR_NOP_FINISHED: The Non-Occupancy Period for this channel is
- *	over, channel becomes usable.
- */
-enum nl80211_radar_event {
-	NL80211_RADAR_DETECTED,
-	NL80211_RADAR_CAC_FINISHED,
-	NL80211_RADAR_CAC_ABORTED,
-	NL80211_RADAR_NOP_FINISHED,
-};
-
-/**
- * enum nl80211_dfs_state - DFS states for channels
- *
- * Channel states used by the DFS code.
- *
- * @NL80211_DFS_USABLE: The channel can be used, but channel availability
- *	check (CAC) must be performed before using it for AP or IBSS.
- * @NL80211_DFS_UNAVAILABLE: A radar has been detected on this channel, it
- *	is therefore marked as not available.
- * @NL80211_DFS_AVAILABLE: The channel has been CAC checked and is available.
- */
-enum nl80211_dfs_state {
-	NL80211_DFS_USABLE,
-	NL80211_DFS_UNAVAILABLE,
-	NL80211_DFS_AVAILABLE,
-};
-
-/**
- * enum enum nl80211_protocol_features - nl80211 protocol features
- * @NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP: nl80211 supports splitting
- *	wiphy dumps (if requested by the application with the attribute
- *	%NL80211_ATTR_SPLIT_WIPHY_DUMP. Also supported is filtering the
- *	wiphy dump by %NL80211_ATTR_WIPHY, %NL80211_ATTR_IFINDEX or
- *	%NL80211_ATTR_WDEV.
- */
-enum nl80211_protocol_features {
-	NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP =	1 << 0,
-};
-
-/**
- * enum nl80211_crit_proto_id - nl80211 critical protocol identifiers
- *
- * @NL80211_CRIT_PROTO_UNSPEC: protocol unspecified.
- * @NL80211_CRIT_PROTO_DHCP: BOOTP or DHCPv6 protocol.
- * @NL80211_CRIT_PROTO_EAPOL: EAPOL protocol.
- * @NL80211_CRIT_PROTO_APIPA: APIPA protocol.
- * @NUM_NL80211_CRIT_PROTO: must be kept last.
- */
-enum nl80211_crit_proto_id {
-	NL80211_CRIT_PROTO_UNSPEC,
-	NL80211_CRIT_PROTO_DHCP,
-	NL80211_CRIT_PROTO_EAPOL,
-	NL80211_CRIT_PROTO_APIPA,
-	/* add other protocols before this one */
-	NUM_NL80211_CRIT_PROTO
-};
-
-/* maximum duration for critical protocol measures */
-#define NL80211_CRIT_PROTO_MAX_DURATION		5000 /* msec */
-
-/**
- * enum nl80211_rxmgmt_flags - flags for received management frame.
- *
- * Used by cfg80211_rx_mgmt()
- *
- * @NL80211_RXMGMT_FLAG_ANSWERED: frame was answered by device/driver.
- */
-enum nl80211_rxmgmt_flags {
-	NL80211_RXMGMT_FLAG_ANSWERED = 1 << 0,
-};
-
-/*
- * If this flag is unset, the lower 24 bits are an OUI, if set
- * a Linux nl80211 vendor ID is used (no such IDs are allocated
- * yet, so that's not valid so far)
- */
-#define NL80211_VENDOR_ID_IS_LINUX	0x80000000
-
-/**
- * struct nl80211_vendor_cmd_info - vendor command data
- * @vendor_id: If the %NL80211_VENDOR_ID_IS_LINUX flag is clear, then the
- *	value is a 24-bit OUI; if it is set then a separately allocated ID
- *	may be used, but no such IDs are allocated yet. New IDs should be
- *	added to this file when needed.
- * @subcmd: sub-command ID for the command
- */
-struct nl80211_vendor_cmd_info {
-	__u32 vendor_id;
-	__u32 subcmd;
-};
-
-/**
- * enum nl80211_tdls_peer_capability - TDLS peer flags.
- *
- * Used by tdls_mgmt() to determine which conditional elements need
- * to be added to TDLS Setup frames.
- *
- * @NL80211_TDLS_PEER_HT: TDLS peer is HT capable.
- * @NL80211_TDLS_PEER_VHT: TDLS peer is VHT capable.
- * @NL80211_TDLS_PEER_WMM: TDLS peer is WMM capable.
- */
-enum nl80211_tdls_peer_capability {
-	NL80211_TDLS_PEER_HT = 1<<0,
-	NL80211_TDLS_PEER_VHT = 1<<1,
-	NL80211_TDLS_PEER_WMM = 1<<2,
-};
-
-/**
- * enum nl80211_sched_scan_plan - scanning plan for scheduled scan
- * @__NL80211_SCHED_SCAN_PLAN_INVALID: attribute number 0 is reserved
- * @NL80211_SCHED_SCAN_PLAN_INTERVAL: interval between scan iterations. In
- *	seconds (u32).
- * @NL80211_SCHED_SCAN_PLAN_ITERATIONS: number of scan iterations in this
- *	scan plan (u32). The last scan plan must not specify this attribute
- *	because it will run infinitely. A value of zero is invalid as it will
- *	make the scan plan meaningless.
- * @NL80211_SCHED_SCAN_PLAN_MAX: highest scheduled scan plan attribute number
- *	currently defined
- * @__NL80211_SCHED_SCAN_PLAN_AFTER_LAST: internal use
- */
-enum nl80211_sched_scan_plan {
-	__NL80211_SCHED_SCAN_PLAN_INVALID,
-	NL80211_SCHED_SCAN_PLAN_INTERVAL,
-	NL80211_SCHED_SCAN_PLAN_ITERATIONS,
-
-	/* keep last */
-	__NL80211_SCHED_SCAN_PLAN_AFTER_LAST,
-	NL80211_SCHED_SCAN_PLAN_MAX =
-		__NL80211_SCHED_SCAN_PLAN_AFTER_LAST - 1
-};
-
-#endif /* __LINUX_NL80211_H */
diff --git a/openflow/usr/include/linux/nubus.h b/openflow/usr/include/linux/nubus.h
deleted file mode 100644
index 60b03e4..0000000
--- a/openflow/usr/include/linux/nubus.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-  nubus.h: various definitions and prototypes for NuBus drivers to use.
-
-  Originally written by Alan Cox.
-
-  Hacked to death by C. Scott Ananian and David Huggins-Daines.
-  
-  Some of the constants in here are from the corresponding
-  NetBSD/OpenBSD header file, by Allen Briggs.  We figured out the
-  rest of them on our own. */
-
-#ifndef LINUX_NUBUS_H
-#define LINUX_NUBUS_H
-
-#include <linux/types.h>
-
-enum nubus_category {
-	NUBUS_CAT_BOARD          = 0x0001,
-	NUBUS_CAT_DISPLAY        = 0x0003,
-	NUBUS_CAT_NETWORK        = 0x0004,
-	NUBUS_CAT_COMMUNICATIONS = 0x0006,
-	NUBUS_CAT_FONT           = 0x0009,
-	NUBUS_CAT_CPU            = 0x000A,
-	/* For lack of a better name */
-	NUBUS_CAT_DUODOCK        = 0x0020
-};
-
-enum nubus_type_network {
-	NUBUS_TYPE_ETHERNET      = 0x0001,
-	NUBUS_TYPE_RS232         = 0x0002
-};
-
-enum nubus_type_display {
-	NUBUS_TYPE_VIDEO         = 0x0001
-};
-
-enum nubus_type_cpu {
-	NUBUS_TYPE_68020         = 0x0003,
-	NUBUS_TYPE_68030         = 0x0004,
-	NUBUS_TYPE_68040         = 0x0005
-};
-
-/* Known <Cat,Type,SW,HW> tuples: (according to TattleTech and Slots)
- *  68030 motherboards: <10,4,0,24>
- *  68040 motherboards: <10,5,0,24>
- *  DuoDock Plus: <32,1,1,2>
- *
- *  Toby Frame Buffer card: <3,1,1,1>
- *  RBV built-in video (IIci): <3,1,1,24>
- *  Valkyrie built-in video (Q630): <3,1,1,46>
- *  Macintosh Display Card: <3,1,1,25>
- *  Sonora built-in video (P460): <3,1,1,34>
- *  Jet framebuffer (DuoDock Plus): <3,1,1,41>
- *
- *  SONIC comm-slot/on-board and DuoDock Ethernet: <4,1,1,272>
- *  SONIC LC-PDS Ethernet (Dayna, but like Apple 16-bit, sort of): <4,1,1,271>
- *  Apple SONIC LC-PDS Ethernet ("Apple Ethernet LC Twisted-Pair Card"): <4,1,0,281>
- *  Sonic Systems Ethernet A-Series Card: <4,1,268,256>
- *  Asante MacCon NuBus-A: <4,1,260,256> (alpha-1.0,1.1 revision)
- *   ROM on the above card: <2,1,0,0>
- *  Cabletron ethernet card: <4,1,1,265>
- *  Farallon ethernet card: <4,1,268,256> (identical to Sonic Systems card)
- *  Kinetics EtherPort IIN: <4,1,259,262>
- *  API Engineering EtherRun_LCa PDS enet card: <4,1,282,256>
- *
- *  Add your devices to the list!  You can obtain the "Slots" utility
- *  from Apple's FTP site at:
- *  ftp://dev.apple.com/devworld/Tool_Chest/Devices_-_Hardware/NuBus_Slot_Manager/
- *
- *  Alternately, TattleTech can be found at any Info-Mac mirror site.  
- *  or from its distribution site: ftp://ftp.decismkr.com/dms
- */
-
-/* DrSW: Uniquely identifies the software interface to a board.  This
-   is usually the one you want to look at when writing a driver.  It's
-   not as useful as you think, though, because as we should know by
-   now (duh), "Apple Compatible" can mean a lot of things... */
-
-/* Add known DrSW values here */
-enum nubus_drsw {
-	/* NUBUS_CAT_DISPLAY */
-	NUBUS_DRSW_APPLE        = 0x0001,
-	NUBUS_DRSW_APPLE_HIRES  = 0x0013, /* MacII HiRes card driver */
-	
-	/* NUBUS_CAT_NETWORK */
-	NUBUS_DRSW_3COM         = 0x0000,
-	NUBUS_DRSW_CABLETRON    = 0x0001,
-	NUBUS_DRSW_SONIC_LC     = 0x0001,
-	NUBUS_DRSW_KINETICS     = 0x0103,
-	NUBUS_DRSW_ASANTE       = 0x0104,
-	NUBUS_DRSW_TECHWORKS    = 0x0109,
-	NUBUS_DRSW_DAYNA        = 0x010b,
-	NUBUS_DRSW_FARALLON     = 0x010c,
-	NUBUS_DRSW_APPLE_SN     = 0x010f,
-	NUBUS_DRSW_DAYNA2       = 0x0115,
-	NUBUS_DRSW_FOCUS        = 0x011a,
-	NUBUS_DRSW_ASANTE_CS    = 0x011d, /* use asante SMC9194 driver */
-	NUBUS_DRSW_DAYNA_LC     = 0x011e,
-
-	/* NUBUS_CAT_CPU */
-	NUBUS_DRSW_NONE         = 0x0000,
-};
-
-/* DrHW: Uniquely identifies the hardware interface to a board (or at
-   least, it should...  some video cards are known to incorrectly
-   identify themselves as Toby cards) */
-
-/* Add known DrHW values here */
-enum nubus_drhw {
-	/* NUBUS_CAT_DISPLAY */
-	NUBUS_DRHW_APPLE_TFB      = 0x0001, /* Toby frame buffer card */
-	NUBUS_DRHW_APPLE_WVC      = 0x0006, /* Apple Workstation Video Card */
-	NUBUS_DRHW_SIGMA_CLRMAX   = 0x0007, /* Sigma Design ColorMax */
-	NUBUS_DRHW_APPLE_SE30     = 0x0009, /* Apple SE/30 video */
-	NUBUS_DRHW_APPLE_HRVC     = 0x0013, /* Mac II High-Res Video Card */
-	NUBUS_DRHW_APPLE_PVC      = 0x0017, /* Mac II Portrait Video Card */
-	NUBUS_DRHW_APPLE_RBV1     = 0x0018, /* IIci RBV video */
-	NUBUS_DRHW_APPLE_MDC      = 0x0019, /* Macintosh Display Card */
-	NUBUS_DRHW_APPLE_SONORA   = 0x0022, /* Sonora built-in video */
-	NUBUS_DRHW_APPLE_24AC     = 0x002b, /* Mac 24AC Video Card */
-	NUBUS_DRHW_APPLE_VALKYRIE = 0x002e,
-	NUBUS_DRHW_APPLE_JET      = 0x0029, /* Jet framebuffer (DuoDock) */
-	NUBUS_DRHW_SMAC_GFX       = 0x0105, /* SuperMac GFX */
-	NUBUS_DRHW_RASTER_CB264   = 0x013B, /* RasterOps ColorBoard 264 */
-	NUBUS_DRHW_MICRON_XCEED   = 0x0146, /* Micron Exceed color */
-	NUBUS_DRHW_RDIUS_GSC      = 0x0153, /* Radius GS/C */
-	NUBUS_DRHW_SMAC_SPEC8     = 0x017B, /* SuperMac Spectrum/8 */
-	NUBUS_DRHW_SMAC_SPEC24    = 0x017C, /* SuperMac Spectrum/24 */
-	NUBUS_DRHW_RASTER_CB364   = 0x026F, /* RasterOps ColorBoard 364 */
-	NUBUS_DRHW_RDIUS_DCGX     = 0x027C, /* Radius DirectColor/GX */
-	NUBUS_DRHW_RDIUS_PC8      = 0x0291, /* Radius PrecisionColor 8 */
-	NUBUS_DRHW_LAPIS_PCS8     = 0x0292, /* Lapis ProColorServer 8 */
-	NUBUS_DRHW_RASTER_24XLI   = 0x02A0, /* RasterOps 8/24 XLi */
-	NUBUS_DRHW_RASTER_PBPGT   = 0x02A5, /* RasterOps PaintBoard Prism GT */
-	NUBUS_DRHW_EMACH_FSX      = 0x02AE, /* E-Machines Futura SX */
-	NUBUS_DRHW_RASTER_24XLTV  = 0x02B7, /* RasterOps 24XLTV */
-	NUBUS_DRHW_SMAC_THUND24   = 0x02CB, /* SuperMac Thunder/24 */
-	NUBUS_DRHW_SMAC_THUNDLGHT = 0x03D9, /* SuperMac ThunderLight */
-	NUBUS_DRHW_RDIUS_PC24XP   = 0x0406, /* Radius PrecisionColor 24Xp */
-	NUBUS_DRHW_RDIUS_PC24X    = 0x040A, /* Radius PrecisionColor 24X */
-	NUBUS_DRHW_RDIUS_PC8XJ    = 0x040B, /* Radius PrecisionColor 8XJ */
-	
-	/* NUBUS_CAT_NETWORK */
-	NUBUS_DRHW_INTERLAN       = 0x0100,
-	NUBUS_DRHW_SMC9194        = 0x0101,
-	NUBUS_DRHW_KINETICS       = 0x0106,
-	NUBUS_DRHW_CABLETRON      = 0x0109,
-	NUBUS_DRHW_ASANTE_LC      = 0x010f,
-	NUBUS_DRHW_SONIC          = 0x0110,
-	NUBUS_DRHW_TECHWORKS      = 0x0112,
-	NUBUS_DRHW_APPLE_SONIC_NB = 0x0118,
-	NUBUS_DRHW_APPLE_SONIC_LC = 0x0119,
-	NUBUS_DRHW_FOCUS          = 0x011c,
-	NUBUS_DRHW_SONNET         = 0x011d,
-};
-
-/* Resource IDs: These are the identifiers for the various weird and
-   wonderful tidbits of information that may or may not reside in the
-   NuBus ROM directory. */
-enum nubus_res_id {
-	NUBUS_RESID_TYPE         = 0x0001,
-	NUBUS_RESID_NAME         = 0x0002,
-	NUBUS_RESID_ICON         = 0x0003,
-	NUBUS_RESID_DRVRDIR      = 0x0004,
-	NUBUS_RESID_LOADREC      = 0x0005,
-	NUBUS_RESID_BOOTREC      = 0x0006,
-	NUBUS_RESID_FLAGS        = 0x0007,
-	NUBUS_RESID_HWDEVID      = 0x0008,
-	NUBUS_RESID_MINOR_BASEOS = 0x000a,
-	NUBUS_RESID_MINOR_LENGTH = 0x000b,
-	NUBUS_RESID_MAJOR_BASEOS = 0x000c,
-	NUBUS_RESID_MAJOR_LENGTH = 0x000d,
-	NUBUS_RESID_CICN         = 0x000f,
-	NUBUS_RESID_ICL8         = 0x0010,
-	NUBUS_RESID_ICL4         = 0x0011,
-};
-
-/* Category-specific resources. */
-enum nubus_board_res_id {
-	NUBUS_RESID_BOARDID      = 0x0020,
-	NUBUS_RESID_PRAMINITDATA = 0x0021,
-	NUBUS_RESID_PRIMARYINIT  = 0x0022,
-	NUBUS_RESID_TIMEOUTCONST = 0x0023,
-	NUBUS_RESID_VENDORINFO   = 0x0024,
-	NUBUS_RESID_BOARDFLAGS   = 0x0025,
-	NUBUS_RESID_SECONDINIT   = 0x0026,
-
-	/* Not sure why Apple put these next two in here */
-	NUBUS_RESID_VIDNAMES     = 0x0041,
-	NUBUS_RESID_VIDMODES     = 0x007e
-};
-
-/* Fields within the vendor info directory */
-enum nubus_vendor_res_id {
-	NUBUS_RESID_VEND_ID     = 0x0001,
-	NUBUS_RESID_VEND_SERIAL = 0x0002,
-	NUBUS_RESID_VEND_REV    = 0x0003,
-	NUBUS_RESID_VEND_PART   = 0x0004,
-	NUBUS_RESID_VEND_DATE   = 0x0005
-};
-
-enum nubus_net_res_id {
-	NUBUS_RESID_MAC_ADDRESS  = 0x0080
-};
-
-enum nubus_cpu_res_id {
-	NUBUS_RESID_MEMINFO      = 0x0081,
-	NUBUS_RESID_ROMINFO      = 0x0082
-};
-
-enum nubus_display_res_id {
-	NUBUS_RESID_GAMMADIR    = 0x0040,
-	NUBUS_RESID_FIRSTMODE   = 0x0080,
-	NUBUS_RESID_SECONDMODE  = 0x0081,
-	NUBUS_RESID_THIRDMODE   = 0x0082,
-	NUBUS_RESID_FOURTHMODE  = 0x0083,
-	NUBUS_RESID_FIFTHMODE   = 0x0084,
-	NUBUS_RESID_SIXTHMODE   = 0x0085
-};
-
-struct nubus_dir
-{
-	unsigned char *base;
-	unsigned char *ptr;
-	int done;
-	int mask;
-};
-
-struct nubus_dirent
-{
-	unsigned char *base;
-	unsigned char type;
-	__u32 data;	/* Actually 24bits used */
-	int mask;
-};
-
-
-/* We'd like to get rid of this eventually.  Only daynaport.c uses it now. */
-static __inline__ void *nubus_slot_addr(int slot)
-{
-	return (void *)(0xF0000000|(slot<<24));
-}
-
-#endif /* LINUX_NUBUS_H */
diff --git a/openflow/usr/include/linux/nvme_ioctl.h b/openflow/usr/include/linux/nvme_ioctl.h
deleted file mode 100644
index 9cea1ff..0000000
--- a/openflow/usr/include/linux/nvme_ioctl.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Definitions for the NVM Express ioctl interface
- * Copyright (c) 2011-2014, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-
-#ifndef _LINUX_NVME_IOCTL_H
-#define _LINUX_NVME_IOCTL_H
-
-#include <linux/types.h>
-
-struct nvme_user_io {
-	__u8	opcode;
-	__u8	flags;
-	__u16	control;
-	__u16	nblocks;
-	__u16	rsvd;
-	__u64	metadata;
-	__u64	addr;
-	__u64	slba;
-	__u32	dsmgmt;
-	__u32	reftag;
-	__u16	apptag;
-	__u16	appmask;
-};
-
-struct nvme_passthru_cmd {
-	__u8	opcode;
-	__u8	flags;
-	__u16	rsvd1;
-	__u32	nsid;
-	__u32	cdw2;
-	__u32	cdw3;
-	__u64	metadata;
-	__u64	addr;
-	__u32	metadata_len;
-	__u32	data_len;
-	__u32	cdw10;
-	__u32	cdw11;
-	__u32	cdw12;
-	__u32	cdw13;
-	__u32	cdw14;
-	__u32	cdw15;
-	__u32	timeout_ms;
-	__u32	result;
-};
-
-#define nvme_admin_cmd nvme_passthru_cmd
-
-#define NVME_IOCTL_ID		_IO('N', 0x40)
-#define NVME_IOCTL_ADMIN_CMD	_IOWR('N', 0x41, struct nvme_admin_cmd)
-#define NVME_IOCTL_SUBMIT_IO	_IOW('N', 0x42, struct nvme_user_io)
-#define NVME_IOCTL_IO_CMD	_IOWR('N', 0x43, struct nvme_passthru_cmd)
-#define NVME_IOCTL_RESET	_IO('N', 0x44)
-#define NVME_IOCTL_SUBSYS_RESET	_IO('N', 0x45)
-
-#endif /* _LINUX_NVME_IOCTL_H */
diff --git a/openflow/usr/include/linux/nvram.h b/openflow/usr/include/linux/nvram.h
deleted file mode 100644
index a05d28a..0000000
--- a/openflow/usr/include/linux/nvram.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _LINUX_NVRAM_H
-#define _LINUX_NVRAM_H
-
-#include <linux/ioctl.h>
-
-/* /dev/nvram ioctls */
-#define NVRAM_INIT	_IO('p', 0x40) /* initialize NVRAM and set checksum */
-#define NVRAM_SETCKS	_IO('p', 0x41) /* recalculate checksum */
-
-/* for all current systems, this is where NVRAM starts */
-#define NVRAM_FIRST_BYTE    14
-/* all these functions expect an NVRAM offset, not an absolute */
-#define NVRAM_OFFSET(x)   ((x)-NVRAM_FIRST_BYTE)
-
-
-#endif /* _LINUX_NVRAM_H */
diff --git a/openflow/usr/include/linux/omap3isp.h b/openflow/usr/include/linux/omap3isp.h
deleted file mode 100644
index cb3e8a5..0000000
--- a/openflow/usr/include/linux/omap3isp.h
+++ /dev/null
@@ -1,646 +0,0 @@
-/*
- * omap3isp.h
- *
- * TI OMAP3 ISP - User-space API
- *
- * Copyright (C) 2010 Nokia Corporation
- * Copyright (C) 2009 Texas Instruments, Inc.
- *
- * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- *	     Sakari Ailus <sakari.ailus@iki.fi>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef OMAP3_ISP_USER_H
-#define OMAP3_ISP_USER_H
-
-#include <linux/types.h>
-#include <linux/videodev2.h>
-
-/*
- * Private IOCTLs
- *
- * VIDIOC_OMAP3ISP_CCDC_CFG: Set CCDC configuration
- * VIDIOC_OMAP3ISP_PRV_CFG: Set preview engine configuration
- * VIDIOC_OMAP3ISP_AEWB_CFG: Set AEWB module configuration
- * VIDIOC_OMAP3ISP_HIST_CFG: Set histogram module configuration
- * VIDIOC_OMAP3ISP_AF_CFG: Set auto-focus module configuration
- * VIDIOC_OMAP3ISP_STAT_REQ: Read statistics (AEWB/AF/histogram) data
- * VIDIOC_OMAP3ISP_STAT_EN: Enable/disable a statistics module
- */
-
-#define VIDIOC_OMAP3ISP_CCDC_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct omap3isp_ccdc_update_config)
-#define VIDIOC_OMAP3ISP_PRV_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 2, struct omap3isp_prev_update_config)
-#define VIDIOC_OMAP3ISP_AEWB_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 3, struct omap3isp_h3a_aewb_config)
-#define VIDIOC_OMAP3ISP_HIST_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 4, struct omap3isp_hist_config)
-#define VIDIOC_OMAP3ISP_AF_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 5, struct omap3isp_h3a_af_config)
-#define VIDIOC_OMAP3ISP_STAT_REQ \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 6, struct omap3isp_stat_data)
-#define VIDIOC_OMAP3ISP_STAT_EN \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 7, unsigned long)
-
-/*
- * Events
- *
- * V4L2_EVENT_OMAP3ISP_AEWB: AEWB statistics data ready
- * V4L2_EVENT_OMAP3ISP_AF: AF statistics data ready
- * V4L2_EVENT_OMAP3ISP_HIST: Histogram statistics data ready
- */
-
-#define V4L2_EVENT_OMAP3ISP_CLASS	(V4L2_EVENT_PRIVATE_START | 0x100)
-#define V4L2_EVENT_OMAP3ISP_AEWB	(V4L2_EVENT_OMAP3ISP_CLASS | 0x1)
-#define V4L2_EVENT_OMAP3ISP_AF		(V4L2_EVENT_OMAP3ISP_CLASS | 0x2)
-#define V4L2_EVENT_OMAP3ISP_HIST	(V4L2_EVENT_OMAP3ISP_CLASS | 0x3)
-
-struct omap3isp_stat_event_status {
-	__u32 frame_number;
-	__u16 config_counter;
-	__u8 buf_err;
-};
-
-/* AE/AWB related structures and flags*/
-
-/* H3A Range Constants */
-#define OMAP3ISP_AEWB_MAX_SATURATION_LIM	1023
-#define OMAP3ISP_AEWB_MIN_WIN_H			2
-#define OMAP3ISP_AEWB_MAX_WIN_H			256
-#define OMAP3ISP_AEWB_MIN_WIN_W			6
-#define OMAP3ISP_AEWB_MAX_WIN_W			256
-#define OMAP3ISP_AEWB_MIN_WINVC			1
-#define OMAP3ISP_AEWB_MIN_WINHC			1
-#define OMAP3ISP_AEWB_MAX_WINVC			128
-#define OMAP3ISP_AEWB_MAX_WINHC			36
-#define OMAP3ISP_AEWB_MAX_WINSTART		4095
-#define OMAP3ISP_AEWB_MIN_SUB_INC		2
-#define OMAP3ISP_AEWB_MAX_SUB_INC		32
-#define OMAP3ISP_AEWB_MAX_BUF_SIZE		83600
-
-#define OMAP3ISP_AF_IIRSH_MIN			0
-#define OMAP3ISP_AF_IIRSH_MAX			4095
-#define OMAP3ISP_AF_PAXEL_HORIZONTAL_COUNT_MIN	1
-#define OMAP3ISP_AF_PAXEL_HORIZONTAL_COUNT_MAX	36
-#define OMAP3ISP_AF_PAXEL_VERTICAL_COUNT_MIN	1
-#define OMAP3ISP_AF_PAXEL_VERTICAL_COUNT_MAX	128
-#define OMAP3ISP_AF_PAXEL_INCREMENT_MIN		2
-#define OMAP3ISP_AF_PAXEL_INCREMENT_MAX		32
-#define OMAP3ISP_AF_PAXEL_HEIGHT_MIN		2
-#define OMAP3ISP_AF_PAXEL_HEIGHT_MAX		256
-#define OMAP3ISP_AF_PAXEL_WIDTH_MIN		16
-#define OMAP3ISP_AF_PAXEL_WIDTH_MAX		256
-#define OMAP3ISP_AF_PAXEL_HZSTART_MIN		1
-#define OMAP3ISP_AF_PAXEL_HZSTART_MAX		4095
-#define OMAP3ISP_AF_PAXEL_VTSTART_MIN		0
-#define OMAP3ISP_AF_PAXEL_VTSTART_MAX		4095
-#define OMAP3ISP_AF_THRESHOLD_MAX		255
-#define OMAP3ISP_AF_COEF_MAX			4095
-#define OMAP3ISP_AF_PAXEL_SIZE			48
-#define OMAP3ISP_AF_MAX_BUF_SIZE		221184
-
-/**
- * struct omap3isp_h3a_aewb_config - AE AWB configuration reset values
- * saturation_limit: Saturation limit.
- * @win_height: Window Height. Range 2 - 256, even values only.
- * @win_width: Window Width. Range 6 - 256, even values only.
- * @ver_win_count: Vertical Window Count. Range 1 - 128.
- * @hor_win_count: Horizontal Window Count. Range 1 - 36.
- * @ver_win_start: Vertical Window Start. Range 0 - 4095.
- * @hor_win_start: Horizontal Window Start. Range 0 - 4095.
- * @blk_ver_win_start: Black Vertical Windows Start. Range 0 - 4095.
- * @blk_win_height: Black Window Height. Range 2 - 256, even values only.
- * @subsample_ver_inc: Subsample Vertical points increment Range 2 - 32, even
- *                     values only.
- * @subsample_hor_inc: Subsample Horizontal points increment Range 2 - 32, even
- *                     values only.
- * @alaw_enable: AEW ALAW EN flag.
- */
-struct omap3isp_h3a_aewb_config {
-	/*
-	 * Common fields.
-	 * They should be the first ones and must be in the same order as in
-	 * ispstat_generic_config struct.
-	 */
-	__u32 buf_size;
-	__u16 config_counter;
-
-	/* Private fields */
-	__u16 saturation_limit;
-	__u16 win_height;
-	__u16 win_width;
-	__u16 ver_win_count;
-	__u16 hor_win_count;
-	__u16 ver_win_start;
-	__u16 hor_win_start;
-	__u16 blk_ver_win_start;
-	__u16 blk_win_height;
-	__u16 subsample_ver_inc;
-	__u16 subsample_hor_inc;
-	__u8 alaw_enable;
-};
-
-/**
- * struct omap3isp_stat_data - Statistic data sent to or received from user
- * @ts: Timestamp of returned framestats.
- * @buf: Pointer to pass to user.
- * @frame_number: Frame number of requested stats.
- * @cur_frame: Current frame number being processed.
- * @config_counter: Number of the configuration associated with the data.
- */
-struct omap3isp_stat_data {
-	struct timeval ts;
-	void *buf;
-	__u32 buf_size;
-	__u16 frame_number;
-	__u16 cur_frame;
-	__u16 config_counter;
-};
-
-
-/* Histogram related structs */
-
-/* Flags for number of bins */
-#define OMAP3ISP_HIST_BINS_32		0
-#define OMAP3ISP_HIST_BINS_64		1
-#define OMAP3ISP_HIST_BINS_128		2
-#define OMAP3ISP_HIST_BINS_256		3
-
-/* Number of bins * 4 colors * 4-bytes word */
-#define OMAP3ISP_HIST_MEM_SIZE_BINS(n)	((1 << ((n)+5))*4*4)
-
-#define OMAP3ISP_HIST_MEM_SIZE		1024
-#define OMAP3ISP_HIST_MIN_REGIONS	1
-#define OMAP3ISP_HIST_MAX_REGIONS	4
-#define OMAP3ISP_HIST_MAX_WB_GAIN	255
-#define OMAP3ISP_HIST_MIN_WB_GAIN	0
-#define OMAP3ISP_HIST_MAX_BIT_WIDTH	14
-#define OMAP3ISP_HIST_MIN_BIT_WIDTH	8
-#define OMAP3ISP_HIST_MAX_WG		4
-#define OMAP3ISP_HIST_MAX_BUF_SIZE	4096
-
-/* Source */
-#define OMAP3ISP_HIST_SOURCE_CCDC	0
-#define OMAP3ISP_HIST_SOURCE_MEM	1
-
-/* CFA pattern */
-#define OMAP3ISP_HIST_CFA_BAYER		0
-#define OMAP3ISP_HIST_CFA_FOVEONX3	1
-
-struct omap3isp_hist_region {
-	__u16 h_start;
-	__u16 h_end;
-	__u16 v_start;
-	__u16 v_end;
-};
-
-struct omap3isp_hist_config {
-	/*
-	 * Common fields.
-	 * They should be the first ones and must be in the same order as in
-	 * ispstat_generic_config struct.
-	 */
-	__u32 buf_size;
-	__u16 config_counter;
-
-	__u8 num_acc_frames;	/* Num of image frames to be processed and
-				   accumulated for each histogram frame */
-	__u16 hist_bins;	/* number of bins: 32, 64, 128, or 256 */
-	__u8 cfa;		/* BAYER or FOVEON X3 */
-	__u8 wg[OMAP3ISP_HIST_MAX_WG];	/* White Balance Gain */
-	__u8 num_regions;	/* number of regions to be configured */
-	struct omap3isp_hist_region region[OMAP3ISP_HIST_MAX_REGIONS];
-};
-
-/* Auto Focus related structs */
-
-#define OMAP3ISP_AF_NUM_COEF		11
-
-enum omap3isp_h3a_af_fvmode {
-	OMAP3ISP_AF_MODE_SUMMED = 0,
-	OMAP3ISP_AF_MODE_PEAK = 1
-};
-
-/* Red, Green, and blue pixel location in the AF windows */
-enum omap3isp_h3a_af_rgbpos {
-	OMAP3ISP_AF_GR_GB_BAYER = 0,	/* GR and GB as Bayer pattern */
-	OMAP3ISP_AF_RG_GB_BAYER = 1,	/* RG and GB as Bayer pattern */
-	OMAP3ISP_AF_GR_BG_BAYER = 2,	/* GR and BG as Bayer pattern */
-	OMAP3ISP_AF_RG_BG_BAYER = 3,	/* RG and BG as Bayer pattern */
-	OMAP3ISP_AF_GG_RB_CUSTOM = 4,	/* GG and RB as custom pattern */
-	OMAP3ISP_AF_RB_GG_CUSTOM = 5	/* RB and GG as custom pattern */
-};
-
-/* Contains the information regarding the Horizontal Median Filter */
-struct omap3isp_h3a_af_hmf {
-	__u8 enable;	/* Status of Horizontal Median Filter */
-	__u8 threshold;	/* Threshold Value for Horizontal Median Filter */
-};
-
-/* Contains the information regarding the IIR Filters */
-struct omap3isp_h3a_af_iir {
-	__u16 h_start;			/* IIR horizontal start */
-	__u16 coeff_set0[OMAP3ISP_AF_NUM_COEF];	/* Filter coefficient, set 0 */
-	__u16 coeff_set1[OMAP3ISP_AF_NUM_COEF];	/* Filter coefficient, set 1 */
-};
-
-/* Contains the information regarding the Paxels Structure in AF Engine */
-struct omap3isp_h3a_af_paxel {
-	__u16 h_start;	/* Horizontal Start Position */
-	__u16 v_start;	/* Vertical Start Position */
-	__u8 width;	/* Width of the Paxel */
-	__u8 height;	/* Height of the Paxel */
-	__u8 h_cnt;	/* Horizontal Count */
-	__u8 v_cnt;	/* vertical Count */
-	__u8 line_inc;	/* Line Increment */
-};
-
-/* Contains the parameters required for hardware set up of AF Engine */
-struct omap3isp_h3a_af_config {
-	/*
-	 * Common fields.
-	 * They should be the first ones and must be in the same order as in
-	 * ispstat_generic_config struct.
-	 */
-	__u32 buf_size;
-	__u16 config_counter;
-
-	struct omap3isp_h3a_af_hmf hmf;		/* HMF configurations */
-	struct omap3isp_h3a_af_iir iir;		/* IIR filter configurations */
-	struct omap3isp_h3a_af_paxel paxel;	/* Paxel parameters */
-	enum omap3isp_h3a_af_rgbpos rgb_pos;	/* RGB Positions */
-	enum omap3isp_h3a_af_fvmode fvmode;	/* Accumulator mode */
-	__u8 alaw_enable;			/* AF ALAW status */
-};
-
-/* ISP CCDC structs */
-
-/* Abstraction layer CCDC configurations */
-#define OMAP3ISP_CCDC_ALAW		(1 << 0)
-#define OMAP3ISP_CCDC_LPF		(1 << 1)
-#define OMAP3ISP_CCDC_BLCLAMP		(1 << 2)
-#define OMAP3ISP_CCDC_BCOMP		(1 << 3)
-#define OMAP3ISP_CCDC_FPC		(1 << 4)
-#define OMAP3ISP_CCDC_CULL		(1 << 5)
-#define OMAP3ISP_CCDC_CONFIG_LSC	(1 << 7)
-#define OMAP3ISP_CCDC_TBL_LSC		(1 << 8)
-
-#define OMAP3ISP_RGB_MAX		3
-
-/* Enumeration constants for Alaw input width */
-enum omap3isp_alaw_ipwidth {
-	OMAP3ISP_ALAW_BIT12_3 = 0x3,
-	OMAP3ISP_ALAW_BIT11_2 = 0x4,
-	OMAP3ISP_ALAW_BIT10_1 = 0x5,
-	OMAP3ISP_ALAW_BIT9_0 = 0x6
-};
-
-/**
- * struct omap3isp_ccdc_lsc_config - LSC configuration
- * @offset: Table Offset of the gain table.
- * @gain_mode_n: Vertical dimension of a paxel in LSC configuration.
- * @gain_mode_m: Horizontal dimension of a paxel in LSC configuration.
- * @gain_format: Gain table format.
- * @fmtsph: Start pixel horizontal from start of the HS sync pulse.
- * @fmtlnh: Number of pixels in horizontal direction to use for the data
- *          reformatter.
- * @fmtslv: Start line from start of VS sync pulse for the data reformatter.
- * @fmtlnv: Number of lines in vertical direction for the data reformatter.
- * @initial_x: X position, in pixels, of the first active pixel in reference
- *             to the first active paxel. Must be an even number.
- * @initial_y: Y position, in pixels, of the first active pixel in reference
- *             to the first active paxel. Must be an even number.
- * @size: Size of LSC gain table. Filled when loaded from userspace.
- */
-struct omap3isp_ccdc_lsc_config {
-	__u16 offset;
-	__u8 gain_mode_n;
-	__u8 gain_mode_m;
-	__u8 gain_format;
-	__u16 fmtsph;
-	__u16 fmtlnh;
-	__u16 fmtslv;
-	__u16 fmtlnv;
-	__u8 initial_x;
-	__u8 initial_y;
-	__u32 size;
-};
-
-/**
- * struct omap3isp_ccdc_bclamp - Optical & Digital black clamp subtract
- * @obgain: Optical black average gain.
- * @obstpixel: Start Pixel w.r.t. HS pulse in Optical black sample.
- * @oblines: Optical Black Sample lines.
- * @oblen: Optical Black Sample Length.
- * @dcsubval: Digital Black Clamp subtract value.
- */
-struct omap3isp_ccdc_bclamp {
-	__u8 obgain;
-	__u8 obstpixel;
-	__u8 oblines;
-	__u8 oblen;
-	__u16 dcsubval;
-};
-
-/**
- * struct omap3isp_ccdc_fpc - Faulty Pixels Correction
- * @fpnum: Number of faulty pixels to be corrected in the frame.
- * @fpcaddr: Memory address of the FPC Table
- */
-struct omap3isp_ccdc_fpc {
-	__u16 fpnum;
-	__u32 fpcaddr;
-};
-
-/**
- * struct omap3isp_ccdc_blcomp - Black Level Compensation parameters
- * @b_mg: B/Mg pixels. 2's complement. -128 to +127.
- * @gb_g: Gb/G pixels. 2's complement. -128 to +127.
- * @gr_cy: Gr/Cy pixels. 2's complement. -128 to +127.
- * @r_ye: R/Ye pixels. 2's complement. -128 to +127.
- */
-struct omap3isp_ccdc_blcomp {
-	__u8 b_mg;
-	__u8 gb_g;
-	__u8 gr_cy;
-	__u8 r_ye;
-};
-
-/**
- * omap3isp_ccdc_culling - Culling parameters
- * @v_pattern: Vertical culling pattern.
- * @h_odd: Horizontal Culling pattern for odd lines.
- * @h_even: Horizontal Culling pattern for even lines.
- */
-struct omap3isp_ccdc_culling {
-	__u8 v_pattern;
-	__u16 h_odd;
-	__u16 h_even;
-};
-
-/**
- * omap3isp_ccdc_update_config - CCDC configuration
- * @update: Specifies which CCDC registers should be updated.
- * @flag: Specifies which CCDC functions should be enabled.
- * @alawip: Enable/Disable A-Law compression.
- * @bclamp: Black clamp control register.
- * @blcomp: Black level compensation value for RGrGbB Pixels. 2's complement.
- * @fpc: Number of faulty pixels corrected in the frame, address of FPC table.
- * @cull: Cull control register.
- * @lsc: Pointer to LSC gain table.
- */
-struct omap3isp_ccdc_update_config {
-	__u16 update;
-	__u16 flag;
-	enum omap3isp_alaw_ipwidth alawip;
-	struct omap3isp_ccdc_bclamp *bclamp;
-	struct omap3isp_ccdc_blcomp *blcomp;
-	struct omap3isp_ccdc_fpc *fpc;
-	struct omap3isp_ccdc_lsc_config *lsc_cfg;
-	struct omap3isp_ccdc_culling *cull;
-	__u8 *lsc;
-};
-
-/* Preview configurations */
-#define OMAP3ISP_PREV_LUMAENH		(1 << 0)
-#define OMAP3ISP_PREV_INVALAW		(1 << 1)
-#define OMAP3ISP_PREV_HRZ_MED		(1 << 2)
-#define OMAP3ISP_PREV_CFA		(1 << 3)
-#define OMAP3ISP_PREV_CHROMA_SUPP	(1 << 4)
-#define OMAP3ISP_PREV_WB		(1 << 5)
-#define OMAP3ISP_PREV_BLKADJ		(1 << 6)
-#define OMAP3ISP_PREV_RGB2RGB		(1 << 7)
-#define OMAP3ISP_PREV_COLOR_CONV	(1 << 8)
-#define OMAP3ISP_PREV_YC_LIMIT		(1 << 9)
-#define OMAP3ISP_PREV_DEFECT_COR	(1 << 10)
-/* Bit 11 was OMAP3ISP_PREV_GAMMABYPASS, now merged with OMAP3ISP_PREV_GAMMA */
-#define OMAP3ISP_PREV_DRK_FRM_CAPTURE	(1 << 12)
-#define OMAP3ISP_PREV_DRK_FRM_SUBTRACT	(1 << 13)
-#define OMAP3ISP_PREV_LENS_SHADING	(1 << 14)
-#define OMAP3ISP_PREV_NF		(1 << 15)
-#define OMAP3ISP_PREV_GAMMA		(1 << 16)
-
-#define OMAP3ISP_PREV_NF_TBL_SIZE	64
-#define OMAP3ISP_PREV_CFA_TBL_SIZE	576
-#define OMAP3ISP_PREV_CFA_BLK_SIZE	(OMAP3ISP_PREV_CFA_TBL_SIZE / 4)
-#define OMAP3ISP_PREV_GAMMA_TBL_SIZE	1024
-#define OMAP3ISP_PREV_YENH_TBL_SIZE	128
-
-#define OMAP3ISP_PREV_DETECT_CORRECT_CHANNELS	4
-
-/**
- * struct omap3isp_prev_hmed - Horizontal Median Filter
- * @odddist: Distance between consecutive pixels of same color in the odd line.
- * @evendist: Distance between consecutive pixels of same color in the even
- *            line.
- * @thres: Horizontal median filter threshold.
- */
-struct omap3isp_prev_hmed {
-	__u8 odddist;
-	__u8 evendist;
-	__u8 thres;
-};
-
-/*
- * Enumeration for CFA Formats supported by preview
- */
-enum omap3isp_cfa_fmt {
-	OMAP3ISP_CFAFMT_BAYER,
-	OMAP3ISP_CFAFMT_SONYVGA,
-	OMAP3ISP_CFAFMT_RGBFOVEON,
-	OMAP3ISP_CFAFMT_DNSPL,
-	OMAP3ISP_CFAFMT_HONEYCOMB,
-	OMAP3ISP_CFAFMT_RRGGBBFOVEON
-};
-
-/**
- * struct omap3isp_prev_cfa - CFA Interpolation
- * @format: CFA Format Enum value supported by preview.
- * @gradthrs_vert: CFA Gradient Threshold - Vertical.
- * @gradthrs_horz: CFA Gradient Threshold - Horizontal.
- * @table: Pointer to the CFA table.
- */
-struct omap3isp_prev_cfa {
-	enum omap3isp_cfa_fmt format;
-	__u8 gradthrs_vert;
-	__u8 gradthrs_horz;
-	__u32 table[4][OMAP3ISP_PREV_CFA_BLK_SIZE];
-};
-
-/**
- * struct omap3isp_prev_csup - Chrominance Suppression
- * @gain: Gain.
- * @thres: Threshold.
- * @hypf_en: Flag to enable/disable the High Pass Filter.
- */
-struct omap3isp_prev_csup {
-	__u8 gain;
-	__u8 thres;
-	__u8 hypf_en;
-};
-
-/**
- * struct omap3isp_prev_wbal - White Balance
- * @dgain: Digital gain (U10Q8).
- * @coef3: White balance gain - COEF 3 (U8Q5).
- * @coef2: White balance gain - COEF 2 (U8Q5).
- * @coef1: White balance gain - COEF 1 (U8Q5).
- * @coef0: White balance gain - COEF 0 (U8Q5).
- */
-struct omap3isp_prev_wbal {
-	__u16 dgain;
-	__u8 coef3;
-	__u8 coef2;
-	__u8 coef1;
-	__u8 coef0;
-};
-
-/**
- * struct omap3isp_prev_blkadj - Black Level Adjustment
- * @red: Black level offset adjustment for Red in 2's complement format
- * @green: Black level offset adjustment for Green in 2's complement format
- * @blue: Black level offset adjustment for Blue in 2's complement format
- */
-struct omap3isp_prev_blkadj {
-	/*Black level offset adjustment for Red in 2's complement format */
-	__u8 red;
-	/*Black level offset adjustment for Green in 2's complement format */
-	__u8 green;
-	/* Black level offset adjustment for Blue in 2's complement format */
-	__u8 blue;
-};
-
-/**
- * struct omap3isp_prev_rgbtorgb - RGB to RGB Blending
- * @matrix: Blending values(S12Q8 format)
- *              [RR] [GR] [BR]
- *              [RG] [GG] [BG]
- *              [RB] [GB] [BB]
- * @offset: Blending offset value for R,G,B in 2's complement integer format.
- */
-struct omap3isp_prev_rgbtorgb {
-	__u16 matrix[OMAP3ISP_RGB_MAX][OMAP3ISP_RGB_MAX];
-	__u16 offset[OMAP3ISP_RGB_MAX];
-};
-
-/**
- * struct omap3isp_prev_csc - Color Space Conversion from RGB-YCbYCr
- * @matrix: Color space conversion coefficients(S10Q8)
- *              [CSCRY]  [CSCGY]  [CSCBY]
- *              [CSCRCB] [CSCGCB] [CSCBCB]
- *              [CSCRCR] [CSCGCR] [CSCBCR]
- * @offset: CSC offset values for Y offset, CB offset and CR offset respectively
- */
-struct omap3isp_prev_csc {
-	__u16 matrix[OMAP3ISP_RGB_MAX][OMAP3ISP_RGB_MAX];
-	__s16 offset[OMAP3ISP_RGB_MAX];
-};
-
-/**
- * struct omap3isp_prev_yclimit - Y, C Value Limit
- * @minC: Minimum C value
- * @maxC: Maximum C value
- * @minY: Minimum Y value
- * @maxY: Maximum Y value
- */
-struct omap3isp_prev_yclimit {
-	__u8 minC;
-	__u8 maxC;
-	__u8 minY;
-	__u8 maxY;
-};
-
-/**
- * struct omap3isp_prev_dcor - Defect correction
- * @couplet_mode_en: Flag to enable or disable the couplet dc Correction in NF
- * @detect_correct: Thresholds for correction bit 0:10 detect 16:25 correct
- */
-struct omap3isp_prev_dcor {
-	__u8 couplet_mode_en;
-	__u32 detect_correct[OMAP3ISP_PREV_DETECT_CORRECT_CHANNELS];
-};
-
-/**
- * struct omap3isp_prev_nf - Noise Filter
- * @spread: Spread value to be used in Noise Filter
- * @table: Pointer to the Noise Filter table
- */
-struct omap3isp_prev_nf {
-	__u8 spread;
-	__u32 table[OMAP3ISP_PREV_NF_TBL_SIZE];
-};
-
-/**
- * struct omap3isp_prev_gtables - Gamma correction tables
- * @red: Array for red gamma table.
- * @green: Array for green gamma table.
- * @blue: Array for blue gamma table.
- */
-struct omap3isp_prev_gtables {
-	__u32 red[OMAP3ISP_PREV_GAMMA_TBL_SIZE];
-	__u32 green[OMAP3ISP_PREV_GAMMA_TBL_SIZE];
-	__u32 blue[OMAP3ISP_PREV_GAMMA_TBL_SIZE];
-};
-
-/**
- * struct omap3isp_prev_luma - Luma enhancement
- * @table: Array for luma enhancement table.
- */
-struct omap3isp_prev_luma {
-	__u32 table[OMAP3ISP_PREV_YENH_TBL_SIZE];
-};
-
-/**
- * struct omap3isp_prev_update_config - Preview engine configuration (user)
- * @update: Specifies which ISP Preview registers should be updated.
- * @flag: Specifies which ISP Preview functions should be enabled.
- * @shading_shift: 3bit value of shift used in shading compensation.
- * @luma: Pointer to luma enhancement structure.
- * @hmed: Pointer to structure containing the odd and even distance.
- *        between the pixels in the image along with the filter threshold.
- * @cfa: Pointer to structure containing the CFA interpolation table, CFA.
- *       format in the image, vertical and horizontal gradient threshold.
- * @csup: Pointer to Structure for Chrominance Suppression coefficients.
- * @wbal: Pointer to structure for White Balance.
- * @blkadj: Pointer to structure for Black Adjustment.
- * @rgb2rgb: Pointer to structure for RGB to RGB Blending.
- * @csc: Pointer to structure for Color Space Conversion from RGB-YCbYCr.
- * @yclimit: Pointer to structure for Y, C Value Limit.
- * @dcor: Pointer to structure for defect correction.
- * @nf: Pointer to structure for Noise Filter
- * @gamma: Pointer to gamma structure.
- */
-struct omap3isp_prev_update_config {
-	__u32 update;
-	__u32 flag;
-	__u32 shading_shift;
-	struct omap3isp_prev_luma *luma;
-	struct omap3isp_prev_hmed *hmed;
-	struct omap3isp_prev_cfa *cfa;
-	struct omap3isp_prev_csup *csup;
-	struct omap3isp_prev_wbal *wbal;
-	struct omap3isp_prev_blkadj *blkadj;
-	struct omap3isp_prev_rgbtorgb *rgb2rgb;
-	struct omap3isp_prev_csc *csc;
-	struct omap3isp_prev_yclimit *yclimit;
-	struct omap3isp_prev_dcor *dcor;
-	struct omap3isp_prev_nf *nf;
-	struct omap3isp_prev_gtables *gamma;
-};
-
-#endif	/* OMAP3_ISP_USER_H */
diff --git a/openflow/usr/include/linux/omapfb.h b/openflow/usr/include/linux/omapfb.h
deleted file mode 100644
index 9563f61..0000000
--- a/openflow/usr/include/linux/omapfb.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * File: include/linux/omapfb.h
- *
- * Framebuffer driver for TI OMAP boards
- *
- * Copyright (C) 2004 Nokia Corporation
- * Author: Imre Deak <imre.deak@nokia.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef __LINUX_OMAPFB_H__
-#define __LINUX_OMAPFB_H__
-
-#include <linux/fb.h>
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-/* IOCTL commands. */
-
-#define OMAP_IOW(num, dtype)	_IOW('O', num, dtype)
-#define OMAP_IOR(num, dtype)	_IOR('O', num, dtype)
-#define OMAP_IOWR(num, dtype)	_IOWR('O', num, dtype)
-#define OMAP_IO(num)		_IO('O', num)
-
-#define OMAPFB_MIRROR		OMAP_IOW(31, int)
-#define OMAPFB_SYNC_GFX		OMAP_IO(37)
-#define OMAPFB_VSYNC		OMAP_IO(38)
-#define OMAPFB_SET_UPDATE_MODE	OMAP_IOW(40, int)
-#define OMAPFB_GET_CAPS		OMAP_IOR(42, struct omapfb_caps)
-#define OMAPFB_GET_UPDATE_MODE	OMAP_IOW(43, int)
-#define OMAPFB_LCD_TEST		OMAP_IOW(45, int)
-#define OMAPFB_CTRL_TEST	OMAP_IOW(46, int)
-#define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(47, struct omapfb_update_window_old)
-#define OMAPFB_SET_COLOR_KEY	OMAP_IOW(50, struct omapfb_color_key)
-#define OMAPFB_GET_COLOR_KEY	OMAP_IOW(51, struct omapfb_color_key)
-#define OMAPFB_SETUP_PLANE	OMAP_IOW(52, struct omapfb_plane_info)
-#define OMAPFB_QUERY_PLANE	OMAP_IOW(53, struct omapfb_plane_info)
-#define OMAPFB_UPDATE_WINDOW	OMAP_IOW(54, struct omapfb_update_window)
-#define OMAPFB_SETUP_MEM	OMAP_IOW(55, struct omapfb_mem_info)
-#define OMAPFB_QUERY_MEM	OMAP_IOW(56, struct omapfb_mem_info)
-#define OMAPFB_WAITFORVSYNC	OMAP_IO(57)
-#define OMAPFB_MEMORY_READ	OMAP_IOR(58, struct omapfb_memory_read)
-#define OMAPFB_GET_OVERLAY_COLORMODE OMAP_IOR(59, struct omapfb_ovl_colormode)
-#define OMAPFB_WAITFORGO	OMAP_IO(60)
-#define OMAPFB_GET_VRAM_INFO	OMAP_IOR(61, struct omapfb_vram_info)
-#define OMAPFB_SET_TEARSYNC	OMAP_IOW(62, struct omapfb_tearsync_info)
-#define OMAPFB_GET_DISPLAY_INFO	OMAP_IOR(63, struct omapfb_display_info)
-
-#define OMAPFB_CAPS_GENERIC_MASK	0x00000fff
-#define OMAPFB_CAPS_LCDC_MASK		0x00fff000
-#define OMAPFB_CAPS_PANEL_MASK		0xff000000
-
-#define OMAPFB_CAPS_MANUAL_UPDATE	0x00001000
-#define OMAPFB_CAPS_TEARSYNC		0x00002000
-#define OMAPFB_CAPS_PLANE_RELOCATE_MEM	0x00004000
-#define OMAPFB_CAPS_PLANE_SCALE		0x00008000
-#define OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE	0x00010000
-#define OMAPFB_CAPS_WINDOW_SCALE	0x00020000
-#define OMAPFB_CAPS_WINDOW_OVERLAY	0x00040000
-#define OMAPFB_CAPS_WINDOW_ROTATE	0x00080000
-#define OMAPFB_CAPS_SET_BACKLIGHT	0x01000000
-
-/* Values from DSP must map to lower 16-bits */
-#define OMAPFB_FORMAT_MASK		0x00ff
-#define OMAPFB_FORMAT_FLAG_DOUBLE	0x0100
-#define OMAPFB_FORMAT_FLAG_TEARSYNC	0x0200
-#define OMAPFB_FORMAT_FLAG_FORCE_VSYNC	0x0400
-#define OMAPFB_FORMAT_FLAG_ENABLE_OVERLAY	0x0800
-#define OMAPFB_FORMAT_FLAG_DISABLE_OVERLAY	0x1000
-
-#define OMAPFB_MEMTYPE_SDRAM		0
-#define OMAPFB_MEMTYPE_SRAM		1
-#define OMAPFB_MEMTYPE_MAX		1
-
-#define OMAPFB_MEM_IDX_ENABLED	0x80
-#define OMAPFB_MEM_IDX_MASK	0x7f
-
-enum omapfb_color_format {
-	OMAPFB_COLOR_RGB565 = 0,
-	OMAPFB_COLOR_YUV422,
-	OMAPFB_COLOR_YUV420,
-	OMAPFB_COLOR_CLUT_8BPP,
-	OMAPFB_COLOR_CLUT_4BPP,
-	OMAPFB_COLOR_CLUT_2BPP,
-	OMAPFB_COLOR_CLUT_1BPP,
-	OMAPFB_COLOR_RGB444,
-	OMAPFB_COLOR_YUY422,
-
-	OMAPFB_COLOR_ARGB16,
-	OMAPFB_COLOR_RGB24U,	/* RGB24, 32-bit container */
-	OMAPFB_COLOR_RGB24P,	/* RGB24, 24-bit container */
-	OMAPFB_COLOR_ARGB32,
-	OMAPFB_COLOR_RGBA32,
-	OMAPFB_COLOR_RGBX32,
-};
-
-struct omapfb_update_window {
-	__u32 x, y;
-	__u32 width, height;
-	__u32 format;
-	__u32 out_x, out_y;
-	__u32 out_width, out_height;
-	__u32 reserved[8];
-};
-
-struct omapfb_update_window_old {
-	__u32 x, y;
-	__u32 width, height;
-	__u32 format;
-};
-
-enum omapfb_plane {
-	OMAPFB_PLANE_GFX = 0,
-	OMAPFB_PLANE_VID1,
-	OMAPFB_PLANE_VID2,
-};
-
-enum omapfb_channel_out {
-	OMAPFB_CHANNEL_OUT_LCD = 0,
-	OMAPFB_CHANNEL_OUT_DIGIT,
-};
-
-struct omapfb_plane_info {
-	__u32 pos_x;
-	__u32 pos_y;
-	__u8  enabled;
-	__u8  channel_out;
-	__u8  mirror;
-	__u8  mem_idx;
-	__u32 out_width;
-	__u32 out_height;
-	__u32 reserved2[12];
-};
-
-struct omapfb_mem_info {
-	__u32 size;
-	__u8  type;
-	__u8  reserved[3];
-};
-
-struct omapfb_caps {
-	__u32 ctrl;
-	__u32 plane_color;
-	__u32 wnd_color;
-};
-
-enum omapfb_color_key_type {
-	OMAPFB_COLOR_KEY_DISABLED = 0,
-	OMAPFB_COLOR_KEY_GFX_DST,
-	OMAPFB_COLOR_KEY_VID_SRC,
-};
-
-struct omapfb_color_key {
-	__u8  channel_out;
-	__u32 background;
-	__u32 trans_key;
-	__u8  key_type;
-};
-
-enum omapfb_update_mode {
-	OMAPFB_UPDATE_DISABLED = 0,
-	OMAPFB_AUTO_UPDATE,
-	OMAPFB_MANUAL_UPDATE
-};
-
-struct omapfb_memory_read {
-	__u16 x;
-	__u16 y;
-	__u16 w;
-	__u16 h;
-	size_t buffer_size;
-	void *buffer;
-};
-
-struct omapfb_ovl_colormode {
-	__u8 overlay_idx;
-	__u8 mode_idx;
-	__u32 bits_per_pixel;
-	__u32 nonstd;
-	struct fb_bitfield red;
-	struct fb_bitfield green;
-	struct fb_bitfield blue;
-	struct fb_bitfield transp;
-};
-
-struct omapfb_vram_info {
-	__u32 total;
-	__u32 free;
-	__u32 largest_free_block;
-	__u32 reserved[5];
-};
-
-struct omapfb_tearsync_info {
-	__u8 enabled;
-	__u8 reserved1[3];
-	__u16 line;
-	__u16 reserved2;
-};
-
-struct omapfb_display_info {
-	__u16 xres;
-	__u16 yres;
-	__u32 width;	/* phys width of the display in micrometers */
-	__u32 height;	/* phys height of the display in micrometers */
-	__u32 reserved[5];
-};
-
-
-#endif /* __LINUX_OMAPFB_H__ */
diff --git a/openflow/usr/include/linux/oom.h b/openflow/usr/include/linux/oom.h
deleted file mode 100644
index ca6c46e..0000000
--- a/openflow/usr/include/linux/oom.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __INCLUDE_LINUX_OOM_H
-#define __INCLUDE_LINUX_OOM_H
-
-/*
- * /proc/<pid>/oom_score_adj set to OOM_SCORE_ADJ_MIN disables oom killing for
- * pid.
- */
-#define OOM_SCORE_ADJ_MIN	(-1000)
-#define OOM_SCORE_ADJ_MAX	1000
-
-/*
- * /proc/<pid>/oom_adj set to -17 protects from the oom killer for legacy
- * purposes.
- */
-#define OOM_DISABLE (-17)
-/* inclusive */
-#define OOM_ADJUST_MIN (-16)
-#define OOM_ADJUST_MAX 15
-
-#endif /* __INCLUDE_LINUX_OOM_H */
diff --git a/openflow/usr/include/linux/openvswitch.h b/openflow/usr/include/linux/openvswitch.h
deleted file mode 100644
index ede106e..0000000
--- a/openflow/usr/include/linux/openvswitch.h
+++ /dev/null
@@ -1,711 +0,0 @@
-
-/*
- * Copyright (c) 2007-2013 Nicira, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- */
-
-#ifndef __LINUX_OPENVSWITCH_H
-#define __LINUX_OPENVSWITCH_H 1
-
-#include <linux/types.h>
-#include <linux/if_ether.h>
-
-/**
- * struct ovs_header - header for OVS Generic Netlink messages.
- * @dp_ifindex: ifindex of local port for datapath (0 to make a request not
- * specific to a datapath).
- *
- * Attributes following the header are specific to a particular OVS Generic
- * Netlink family, but all of the OVS families use this header.
- */
-
-struct ovs_header {
-	int dp_ifindex;
-};
-
-/* Datapaths. */
-
-#define OVS_DATAPATH_FAMILY  "ovs_datapath"
-#define OVS_DATAPATH_MCGROUP "ovs_datapath"
-
-/* V2:
- *   - API users are expected to provide OVS_DP_ATTR_USER_FEATURES
- *     when creating the datapath.
- */
-#define OVS_DATAPATH_VERSION 2
-
-/* First OVS datapath version to support features */
-#define OVS_DP_VER_FEATURES 2
-
-enum ovs_datapath_cmd {
-	OVS_DP_CMD_UNSPEC,
-	OVS_DP_CMD_NEW,
-	OVS_DP_CMD_DEL,
-	OVS_DP_CMD_GET,
-	OVS_DP_CMD_SET
-};
-
-/**
- * enum ovs_datapath_attr - attributes for %OVS_DP_* commands.
- * @OVS_DP_ATTR_NAME: Name of the network device that serves as the "local
- * port".  This is the name of the network device whose dp_ifindex is given in
- * the &struct ovs_header.  Always present in notifications.  Required in
- * %OVS_DP_NEW requests.  May be used as an alternative to specifying
- * dp_ifindex in other requests (with a dp_ifindex of 0).
- * @OVS_DP_ATTR_UPCALL_PID: The Netlink socket in userspace that is initially
- * set on the datapath port (for OVS_ACTION_ATTR_MISS).  Only valid on
- * %OVS_DP_CMD_NEW requests. A value of zero indicates that upcalls should
- * not be sent.
- * @OVS_DP_ATTR_STATS: Statistics about packets that have passed through the
- * datapath.  Always present in notifications.
- * @OVS_DP_ATTR_MEGAFLOW_STATS: Statistics about mega flow masks usage for the
- * datapath. Always present in notifications.
- *
- * These attributes follow the &struct ovs_header within the Generic Netlink
- * payload for %OVS_DP_* commands.
- */
-enum ovs_datapath_attr {
-	OVS_DP_ATTR_UNSPEC,
-	OVS_DP_ATTR_NAME,		/* name of dp_ifindex netdev */
-	OVS_DP_ATTR_UPCALL_PID,		/* Netlink PID to receive upcalls */
-	OVS_DP_ATTR_STATS,		/* struct ovs_dp_stats */
-	OVS_DP_ATTR_MEGAFLOW_STATS,	/* struct ovs_dp_megaflow_stats */
-	OVS_DP_ATTR_USER_FEATURES,	/* OVS_DP_F_*  */
-	__OVS_DP_ATTR_MAX
-};
-
-#define OVS_DP_ATTR_MAX (__OVS_DP_ATTR_MAX - 1)
-
-struct ovs_dp_stats {
-	__u64 n_hit;             /* Number of flow table matches. */
-	__u64 n_missed;          /* Number of flow table misses. */
-	__u64 n_lost;            /* Number of misses not sent to userspace. */
-	__u64 n_flows;           /* Number of flows present */
-};
-
-struct ovs_dp_megaflow_stats {
-	__u64 n_mask_hit;	 /* Number of masks used for flow lookups. */
-	__u32 n_masks;		 /* Number of masks for the datapath. */
-	__u32 pad0;		 /* Pad for future expension. */
-	__u64 pad1;		 /* Pad for future expension. */
-	__u64 pad2;		 /* Pad for future expension. */
-};
-
-struct ovs_vport_stats {
-	__u64   rx_packets;		/* total packets received       */
-	__u64   tx_packets;		/* total packets transmitted    */
-	__u64   rx_bytes;		/* total bytes received         */
-	__u64   tx_bytes;		/* total bytes transmitted      */
-	__u64   rx_errors;		/* bad packets received         */
-	__u64   tx_errors;		/* packet transmit problems     */
-	__u64   rx_dropped;		/* no space in linux buffers    */
-	__u64   tx_dropped;		/* no space available in linux  */
-};
-
-/* Allow last Netlink attribute to be unaligned */
-#define OVS_DP_F_UNALIGNED	(1 << 0)
-
-/* Allow datapath to associate multiple Netlink PIDs to each vport */
-#define OVS_DP_F_VPORT_PIDS	(1 << 1)
-
-/* Fixed logical ports. */
-#define OVSP_LOCAL      ((__u32)0)
-
-/* Packet transfer. */
-
-#define OVS_PACKET_FAMILY "ovs_packet"
-#define OVS_PACKET_VERSION 0x1
-
-enum ovs_packet_cmd {
-	OVS_PACKET_CMD_UNSPEC,
-
-	/* Kernel-to-user notifications. */
-	OVS_PACKET_CMD_MISS,    /* Flow table miss. */
-	OVS_PACKET_CMD_ACTION,  /* OVS_ACTION_ATTR_USERSPACE action. */
-
-	/* Userspace commands. */
-	OVS_PACKET_CMD_EXECUTE  /* Apply actions to a packet. */
-};
-
-/**
- * enum ovs_packet_attr - attributes for %OVS_PACKET_* commands.
- * @OVS_PACKET_ATTR_PACKET: Present for all notifications.  Contains the entire
- * packet as received, from the start of the Ethernet header onward.  For
- * %OVS_PACKET_CMD_ACTION, %OVS_PACKET_ATTR_PACKET reflects changes made by
- * actions preceding %OVS_ACTION_ATTR_USERSPACE, but %OVS_PACKET_ATTR_KEY is
- * the flow key extracted from the packet as originally received.
- * @OVS_PACKET_ATTR_KEY: Present for all notifications.  Contains the flow key
- * extracted from the packet as nested %OVS_KEY_ATTR_* attributes.  This allows
- * userspace to adapt its flow setup strategy by comparing its notion of the
- * flow key against the kernel's.
- * @OVS_PACKET_ATTR_ACTIONS: Contains actions for the packet.  Used
- * for %OVS_PACKET_CMD_EXECUTE.  It has nested %OVS_ACTION_ATTR_* attributes.
- * Also used in upcall when %OVS_ACTION_ATTR_USERSPACE has optional
- * %OVS_USERSPACE_ATTR_ACTIONS attribute.
- * @OVS_PACKET_ATTR_USERDATA: Present for an %OVS_PACKET_CMD_ACTION
- * notification if the %OVS_ACTION_ATTR_USERSPACE action specified an
- * %OVS_USERSPACE_ATTR_USERDATA attribute, with the same length and content
- * specified there.
- * @OVS_PACKET_ATTR_EGRESS_TUN_KEY: Present for an %OVS_PACKET_CMD_ACTION
- * notification if the %OVS_ACTION_ATTR_USERSPACE action specified an
- * %OVS_USERSPACE_ATTR_EGRESS_TUN_PORT attribute, which is sent only if the
- * output port is actually a tunnel port. Contains the output tunnel key
- * extracted from the packet as nested %OVS_TUNNEL_KEY_ATTR_* attributes.
- * @OVS_PACKET_ATTR_MRU: Present for an %OVS_PACKET_CMD_ACTION and
- * %OVS_PACKET_ATTR_USERSPACE action specify the Maximum received fragment
- * size.
- *
- * These attributes follow the &struct ovs_header within the Generic Netlink
- * payload for %OVS_PACKET_* commands.
- */
-enum ovs_packet_attr {
-	OVS_PACKET_ATTR_UNSPEC,
-	OVS_PACKET_ATTR_PACKET,      /* Packet data. */
-	OVS_PACKET_ATTR_KEY,         /* Nested OVS_KEY_ATTR_* attributes. */
-	OVS_PACKET_ATTR_ACTIONS,     /* Nested OVS_ACTION_ATTR_* attributes. */
-	OVS_PACKET_ATTR_USERDATA,    /* OVS_ACTION_ATTR_USERSPACE arg. */
-	OVS_PACKET_ATTR_EGRESS_TUN_KEY,  /* Nested OVS_TUNNEL_KEY_ATTR_*
-					    attributes. */
-	OVS_PACKET_ATTR_UNUSED1,
-	OVS_PACKET_ATTR_UNUSED2,
-	OVS_PACKET_ATTR_PROBE,      /* Packet operation is a feature probe,
-				       error logging should be suppressed. */
-	OVS_PACKET_ATTR_MRU,	    /* Maximum received IP fragment size. */
-	__OVS_PACKET_ATTR_MAX
-};
-
-#define OVS_PACKET_ATTR_MAX (__OVS_PACKET_ATTR_MAX - 1)
-
-/* Virtual ports. */
-
-#define OVS_VPORT_FAMILY  "ovs_vport"
-#define OVS_VPORT_MCGROUP "ovs_vport"
-#define OVS_VPORT_VERSION 0x1
-
-enum ovs_vport_cmd {
-	OVS_VPORT_CMD_UNSPEC,
-	OVS_VPORT_CMD_NEW,
-	OVS_VPORT_CMD_DEL,
-	OVS_VPORT_CMD_GET,
-	OVS_VPORT_CMD_SET
-};
-
-enum ovs_vport_type {
-	OVS_VPORT_TYPE_UNSPEC,
-	OVS_VPORT_TYPE_NETDEV,   /* network device */
-	OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */
-	OVS_VPORT_TYPE_GRE,      /* GRE tunnel. */
-	OVS_VPORT_TYPE_VXLAN,	 /* VXLAN tunnel. */
-	OVS_VPORT_TYPE_GENEVE,	 /* Geneve tunnel. */
-	__OVS_VPORT_TYPE_MAX
-};
-
-#define OVS_VPORT_TYPE_MAX (__OVS_VPORT_TYPE_MAX - 1)
-
-/**
- * enum ovs_vport_attr - attributes for %OVS_VPORT_* commands.
- * @OVS_VPORT_ATTR_PORT_NO: 32-bit port number within datapath.
- * @OVS_VPORT_ATTR_TYPE: 32-bit %OVS_VPORT_TYPE_* constant describing the type
- * of vport.
- * @OVS_VPORT_ATTR_NAME: Name of vport.  For a vport based on a network device
- * this is the name of the network device.  Maximum length %IFNAMSIZ-1 bytes
- * plus a null terminator.
- * @OVS_VPORT_ATTR_OPTIONS: Vport-specific configuration information.
- * @OVS_VPORT_ATTR_UPCALL_PID: The array of Netlink socket pids in userspace
- * among which OVS_PACKET_CMD_MISS upcalls will be distributed for packets
- * received on this port.  If this is a single-element array of value 0,
- * upcalls should not be sent.
- * @OVS_VPORT_ATTR_STATS: A &struct ovs_vport_stats giving statistics for
- * packets sent or received through the vport.
- *
- * These attributes follow the &struct ovs_header within the Generic Netlink
- * payload for %OVS_VPORT_* commands.
- *
- * For %OVS_VPORT_CMD_NEW requests, the %OVS_VPORT_ATTR_TYPE and
- * %OVS_VPORT_ATTR_NAME attributes are required.  %OVS_VPORT_ATTR_PORT_NO is
- * optional; if not specified a free port number is automatically selected.
- * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type
- * of vport.
- *
- * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to
- * look up the vport to operate on; otherwise dp_idx from the &struct
- * ovs_header plus %OVS_VPORT_ATTR_PORT_NO determine the vport.
- */
-enum ovs_vport_attr {
-	OVS_VPORT_ATTR_UNSPEC,
-	OVS_VPORT_ATTR_PORT_NO,	/* u32 port number within datapath */
-	OVS_VPORT_ATTR_TYPE,	/* u32 OVS_VPORT_TYPE_* constant. */
-	OVS_VPORT_ATTR_NAME,	/* string name, up to IFNAMSIZ bytes long */
-	OVS_VPORT_ATTR_OPTIONS, /* nested attributes, varies by vport type */
-	OVS_VPORT_ATTR_UPCALL_PID, /* array of u32 Netlink socket PIDs for */
-				/* receiving upcalls */
-	OVS_VPORT_ATTR_STATS,	/* struct ovs_vport_stats */
-	__OVS_VPORT_ATTR_MAX
-};
-
-#define OVS_VPORT_ATTR_MAX (__OVS_VPORT_ATTR_MAX - 1)
-
-enum {
-	OVS_VXLAN_EXT_UNSPEC,
-	OVS_VXLAN_EXT_GBP,	/* Flag or __u32 */
-	__OVS_VXLAN_EXT_MAX,
-};
-
-#define OVS_VXLAN_EXT_MAX (__OVS_VXLAN_EXT_MAX - 1)
-
-
-/* OVS_VPORT_ATTR_OPTIONS attributes for tunnels.
- */
-enum {
-	OVS_TUNNEL_ATTR_UNSPEC,
-	OVS_TUNNEL_ATTR_DST_PORT, /* 16-bit UDP port, used by L4 tunnels. */
-	OVS_TUNNEL_ATTR_EXTENSION,
-	__OVS_TUNNEL_ATTR_MAX
-};
-
-#define OVS_TUNNEL_ATTR_MAX (__OVS_TUNNEL_ATTR_MAX - 1)
-
-/* Flows. */
-
-#define OVS_FLOW_FAMILY  "ovs_flow"
-#define OVS_FLOW_MCGROUP "ovs_flow"
-#define OVS_FLOW_VERSION 0x1
-
-enum ovs_flow_cmd {
-	OVS_FLOW_CMD_UNSPEC,
-	OVS_FLOW_CMD_NEW,
-	OVS_FLOW_CMD_DEL,
-	OVS_FLOW_CMD_GET,
-	OVS_FLOW_CMD_SET
-};
-
-struct ovs_flow_stats {
-	__u64 n_packets;         /* Number of matched packets. */
-	__u64 n_bytes;           /* Number of matched bytes. */
-};
-
-enum ovs_key_attr {
-	OVS_KEY_ATTR_UNSPEC,
-	OVS_KEY_ATTR_ENCAP,	/* Nested set of encapsulated attributes. */
-	OVS_KEY_ATTR_PRIORITY,  /* u32 skb->priority */
-	OVS_KEY_ATTR_IN_PORT,   /* u32 OVS dp port number */
-	OVS_KEY_ATTR_ETHERNET,  /* struct ovs_key_ethernet */
-	OVS_KEY_ATTR_VLAN,	/* be16 VLAN TCI */
-	OVS_KEY_ATTR_ETHERTYPE,	/* be16 Ethernet type */
-	OVS_KEY_ATTR_IPV4,      /* struct ovs_key_ipv4 */
-	OVS_KEY_ATTR_IPV6,      /* struct ovs_key_ipv6 */
-	OVS_KEY_ATTR_TCP,       /* struct ovs_key_tcp */
-	OVS_KEY_ATTR_UDP,       /* struct ovs_key_udp */
-	OVS_KEY_ATTR_ICMP,      /* struct ovs_key_icmp */
-	OVS_KEY_ATTR_ICMPV6,    /* struct ovs_key_icmpv6 */
-	OVS_KEY_ATTR_ARP,       /* struct ovs_key_arp */
-	OVS_KEY_ATTR_ND,        /* struct ovs_key_nd */
-	OVS_KEY_ATTR_SKB_MARK,  /* u32 skb mark */
-	OVS_KEY_ATTR_TUNNEL,    /* Nested set of ovs_tunnel attributes */
-	OVS_KEY_ATTR_SCTP,      /* struct ovs_key_sctp */
-	OVS_KEY_ATTR_TCP_FLAGS,	/* be16 TCP flags. */
-	OVS_KEY_ATTR_DP_HASH,      /* u32 hash value. Value 0 indicates the hash
-				   is not computed by the datapath. */
-	OVS_KEY_ATTR_RECIRC_ID, /* u32 recirc id */
-	OVS_KEY_ATTR_MPLS,      /* array of struct ovs_key_mpls.
-				 * The implementation may restrict
-				 * the accepted length of the array. */
-	OVS_KEY_ATTR_CT_STATE,	/* u32 bitmask of OVS_CS_F_* */
-	OVS_KEY_ATTR_CT_ZONE,	/* u16 connection tracking zone. */
-	OVS_KEY_ATTR_CT_MARK,	/* u32 connection tracking mark */
-	OVS_KEY_ATTR_CT_LABELS,	/* 16-octet connection tracking label */
-
-	__OVS_KEY_ATTR_MAX
-};
-
-#define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1)
-
-enum ovs_tunnel_key_attr {
-	OVS_TUNNEL_KEY_ATTR_ID,                 /* be64 Tunnel ID */
-	OVS_TUNNEL_KEY_ATTR_IPV4_SRC,           /* be32 src IP address. */
-	OVS_TUNNEL_KEY_ATTR_IPV4_DST,           /* be32 dst IP address. */
-	OVS_TUNNEL_KEY_ATTR_TOS,                /* u8 Tunnel IP ToS. */
-	OVS_TUNNEL_KEY_ATTR_TTL,                /* u8 Tunnel IP TTL. */
-	OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT,      /* No argument, set DF. */
-	OVS_TUNNEL_KEY_ATTR_CSUM,               /* No argument. CSUM packet. */
-	OVS_TUNNEL_KEY_ATTR_OAM,                /* No argument. OAM frame.  */
-	OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS,        /* Array of Geneve options. */
-	OVS_TUNNEL_KEY_ATTR_TP_SRC,		/* be16 src Transport Port. */
-	OVS_TUNNEL_KEY_ATTR_TP_DST,		/* be16 dst Transport Port. */
-	OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS,		/* Nested OVS_VXLAN_EXT_* */
-	OVS_TUNNEL_KEY_ATTR_IPV6_SRC,		/* struct in6_addr src IPv6 address. */
-	OVS_TUNNEL_KEY_ATTR_IPV6_DST,		/* struct in6_addr dst IPv6 address. */
-	__OVS_TUNNEL_KEY_ATTR_MAX
-};
-
-#define OVS_TUNNEL_KEY_ATTR_MAX (__OVS_TUNNEL_KEY_ATTR_MAX - 1)
-
-/**
- * enum ovs_frag_type - IPv4 and IPv6 fragment type
- * @OVS_FRAG_TYPE_NONE: Packet is not a fragment.
- * @OVS_FRAG_TYPE_FIRST: Packet is a fragment with offset 0.
- * @OVS_FRAG_TYPE_LATER: Packet is a fragment with nonzero offset.
- *
- * Used as the @ipv4_frag in &struct ovs_key_ipv4 and as @ipv6_frag &struct
- * ovs_key_ipv6.
- */
-enum ovs_frag_type {
-	OVS_FRAG_TYPE_NONE,
-	OVS_FRAG_TYPE_FIRST,
-	OVS_FRAG_TYPE_LATER,
-	__OVS_FRAG_TYPE_MAX
-};
-
-#define OVS_FRAG_TYPE_MAX (__OVS_FRAG_TYPE_MAX - 1)
-
-struct ovs_key_ethernet {
-	__u8	 eth_src[ETH_ALEN];
-	__u8	 eth_dst[ETH_ALEN];
-};
-
-struct ovs_key_mpls {
-	__be32 mpls_lse;
-};
-
-struct ovs_key_ipv4 {
-	__be32 ipv4_src;
-	__be32 ipv4_dst;
-	__u8   ipv4_proto;
-	__u8   ipv4_tos;
-	__u8   ipv4_ttl;
-	__u8   ipv4_frag;	/* One of OVS_FRAG_TYPE_*. */
-};
-
-struct ovs_key_ipv6 {
-	__be32 ipv6_src[4];
-	__be32 ipv6_dst[4];
-	__be32 ipv6_label;	/* 20-bits in least-significant bits. */
-	__u8   ipv6_proto;
-	__u8   ipv6_tclass;
-	__u8   ipv6_hlimit;
-	__u8   ipv6_frag;	/* One of OVS_FRAG_TYPE_*. */
-};
-
-struct ovs_key_tcp {
-	__be16 tcp_src;
-	__be16 tcp_dst;
-};
-
-struct ovs_key_udp {
-	__be16 udp_src;
-	__be16 udp_dst;
-};
-
-struct ovs_key_sctp {
-	__be16 sctp_src;
-	__be16 sctp_dst;
-};
-
-struct ovs_key_icmp {
-	__u8 icmp_type;
-	__u8 icmp_code;
-};
-
-struct ovs_key_icmpv6 {
-	__u8 icmpv6_type;
-	__u8 icmpv6_code;
-};
-
-struct ovs_key_arp {
-	__be32 arp_sip;
-	__be32 arp_tip;
-	__be16 arp_op;
-	__u8   arp_sha[ETH_ALEN];
-	__u8   arp_tha[ETH_ALEN];
-};
-
-struct ovs_key_nd {
-	__be32	nd_target[4];
-	__u8	nd_sll[ETH_ALEN];
-	__u8	nd_tll[ETH_ALEN];
-};
-
-#define OVS_CT_LABELS_LEN	16
-struct ovs_key_ct_labels {
-	__u8	ct_labels[OVS_CT_LABELS_LEN];
-};
-
-/* OVS_KEY_ATTR_CT_STATE flags */
-#define OVS_CS_F_NEW               0x01 /* Beginning of a new connection. */
-#define OVS_CS_F_ESTABLISHED       0x02 /* Part of an existing connection. */
-#define OVS_CS_F_RELATED           0x04 /* Related to an established
-					 * connection. */
-#define OVS_CS_F_REPLY_DIR         0x08 /* Flow is in the reply direction. */
-#define OVS_CS_F_INVALID           0x10 /* Could not track connection. */
-#define OVS_CS_F_TRACKED           0x20 /* Conntrack has occurred. */
-
-/**
- * enum ovs_flow_attr - attributes for %OVS_FLOW_* commands.
- * @OVS_FLOW_ATTR_KEY: Nested %OVS_KEY_ATTR_* attributes specifying the flow
- * key.  Always present in notifications.  Required for all requests (except
- * dumps).
- * @OVS_FLOW_ATTR_ACTIONS: Nested %OVS_ACTION_ATTR_* attributes specifying
- * the actions to take for packets that match the key.  Always present in
- * notifications.  Required for %OVS_FLOW_CMD_NEW requests, optional for
- * %OVS_FLOW_CMD_SET requests.  An %OVS_FLOW_CMD_SET without
- * %OVS_FLOW_ATTR_ACTIONS will not modify the actions.  To clear the actions,
- * an %OVS_FLOW_ATTR_ACTIONS without any nested attributes must be given.
- * @OVS_FLOW_ATTR_STATS: &struct ovs_flow_stats giving statistics for this
- * flow.  Present in notifications if the stats would be nonzero.  Ignored in
- * requests.
- * @OVS_FLOW_ATTR_TCP_FLAGS: An 8-bit value giving the OR'd value of all of the
- * TCP flags seen on packets in this flow.  Only present in notifications for
- * TCP flows, and only if it would be nonzero.  Ignored in requests.
- * @OVS_FLOW_ATTR_USED: A 64-bit integer giving the time, in milliseconds on
- * the system monotonic clock, at which a packet was last processed for this
- * flow.  Only present in notifications if a packet has been processed for this
- * flow.  Ignored in requests.
- * @OVS_FLOW_ATTR_CLEAR: If present in a %OVS_FLOW_CMD_SET request, clears the
- * last-used time, accumulated TCP flags, and statistics for this flow.
- * Otherwise ignored in requests.  Never present in notifications.
- * @OVS_FLOW_ATTR_MASK: Nested %OVS_KEY_ATTR_* attributes specifying the
- * mask bits for wildcarded flow match. Mask bit value '1' specifies exact
- * match with corresponding flow key bit, while mask bit value '0' specifies
- * a wildcarded match. Omitting attribute is treated as wildcarding all
- * corresponding fields. Optional for all requests. If not present,
- * all flow key bits are exact match bits.
- * @OVS_FLOW_ATTR_UFID: A value between 1-16 octets specifying a unique
- * identifier for the flow. Causes the flow to be indexed by this value rather
- * than the value of the %OVS_FLOW_ATTR_KEY attribute. Optional for all
- * requests. Present in notifications if the flow was created with this
- * attribute.
- * @OVS_FLOW_ATTR_UFID_FLAGS: A 32-bit value of OR'd %OVS_UFID_F_*
- * flags that provide alternative semantics for flow installation and
- * retrieval. Optional for all requests.
- *
- * These attributes follow the &struct ovs_header within the Generic Netlink
- * payload for %OVS_FLOW_* commands.
- */
-enum ovs_flow_attr {
-	OVS_FLOW_ATTR_UNSPEC,
-	OVS_FLOW_ATTR_KEY,       /* Sequence of OVS_KEY_ATTR_* attributes. */
-	OVS_FLOW_ATTR_ACTIONS,   /* Nested OVS_ACTION_ATTR_* attributes. */
-	OVS_FLOW_ATTR_STATS,     /* struct ovs_flow_stats. */
-	OVS_FLOW_ATTR_TCP_FLAGS, /* 8-bit OR'd TCP flags. */
-	OVS_FLOW_ATTR_USED,      /* u64 msecs last used in monotonic time. */
-	OVS_FLOW_ATTR_CLEAR,     /* Flag to clear stats, tcp_flags, used. */
-	OVS_FLOW_ATTR_MASK,      /* Sequence of OVS_KEY_ATTR_* attributes. */
-	OVS_FLOW_ATTR_PROBE,     /* Flow operation is a feature probe, error
-				  * logging should be suppressed. */
-	OVS_FLOW_ATTR_UFID,      /* Variable length unique flow identifier. */
-	OVS_FLOW_ATTR_UFID_FLAGS,/* u32 of OVS_UFID_F_*. */
-	__OVS_FLOW_ATTR_MAX
-};
-
-#define OVS_FLOW_ATTR_MAX (__OVS_FLOW_ATTR_MAX - 1)
-
-/**
- * Omit attributes for notifications.
- *
- * If a datapath request contains an %OVS_UFID_F_OMIT_* flag, then the datapath
- * may omit the corresponding %OVS_FLOW_ATTR_* from the response.
- */
-#define OVS_UFID_F_OMIT_KEY      (1 << 0)
-#define OVS_UFID_F_OMIT_MASK     (1 << 1)
-#define OVS_UFID_F_OMIT_ACTIONS  (1 << 2)
-
-/**
- * enum ovs_sample_attr - Attributes for %OVS_ACTION_ATTR_SAMPLE action.
- * @OVS_SAMPLE_ATTR_PROBABILITY: 32-bit fraction of packets to sample with
- * @OVS_ACTION_ATTR_SAMPLE.  A value of 0 samples no packets, a value of
- * %UINT32_MAX samples all packets and intermediate values sample intermediate
- * fractions of packets.
- * @OVS_SAMPLE_ATTR_ACTIONS: Set of actions to execute in sampling event.
- * Actions are passed as nested attributes.
- *
- * Executes the specified actions with the given probability on a per-packet
- * basis.
- */
-enum ovs_sample_attr {
-	OVS_SAMPLE_ATTR_UNSPEC,
-	OVS_SAMPLE_ATTR_PROBABILITY, /* u32 number */
-	OVS_SAMPLE_ATTR_ACTIONS,     /* Nested OVS_ACTION_ATTR_* attributes. */
-	__OVS_SAMPLE_ATTR_MAX,
-};
-
-#define OVS_SAMPLE_ATTR_MAX (__OVS_SAMPLE_ATTR_MAX - 1)
-
-/**
- * enum ovs_userspace_attr - Attributes for %OVS_ACTION_ATTR_USERSPACE action.
- * @OVS_USERSPACE_ATTR_PID: u32 Netlink PID to which the %OVS_PACKET_CMD_ACTION
- * message should be sent.  Required.
- * @OVS_USERSPACE_ATTR_USERDATA: If present, its variable-length argument is
- * copied to the %OVS_PACKET_CMD_ACTION message as %OVS_PACKET_ATTR_USERDATA.
- * @OVS_USERSPACE_ATTR_EGRESS_TUN_PORT: If present, u32 output port to get
- * tunnel info.
- * @OVS_USERSPACE_ATTR_ACTIONS: If present, send actions with upcall.
- */
-enum ovs_userspace_attr {
-	OVS_USERSPACE_ATTR_UNSPEC,
-	OVS_USERSPACE_ATTR_PID,	      /* u32 Netlink PID to receive upcalls. */
-	OVS_USERSPACE_ATTR_USERDATA,  /* Optional user-specified cookie. */
-	OVS_USERSPACE_ATTR_EGRESS_TUN_PORT,  /* Optional, u32 output port
-					      * to get tunnel info. */
-	OVS_USERSPACE_ATTR_ACTIONS,   /* Optional flag to get actions. */
-	__OVS_USERSPACE_ATTR_MAX
-};
-
-#define OVS_USERSPACE_ATTR_MAX (__OVS_USERSPACE_ATTR_MAX - 1)
-
-/**
- * struct ovs_action_push_mpls - %OVS_ACTION_ATTR_PUSH_MPLS action argument.
- * @mpls_lse: MPLS label stack entry to push.
- * @mpls_ethertype: Ethertype to set in the encapsulating ethernet frame.
- *
- * The only values @mpls_ethertype should ever be given are %ETH_P_MPLS_UC and
- * %ETH_P_MPLS_MC, indicating MPLS unicast or multicast. Other are rejected.
- */
-struct ovs_action_push_mpls {
-	__be32 mpls_lse;
-	__be16 mpls_ethertype; /* Either %ETH_P_MPLS_UC or %ETH_P_MPLS_MC */
-};
-
-/**
- * struct ovs_action_push_vlan - %OVS_ACTION_ATTR_PUSH_VLAN action argument.
- * @vlan_tpid: Tag protocol identifier (TPID) to push.
- * @vlan_tci: Tag control identifier (TCI) to push.  The CFI bit must be set
- * (but it will not be set in the 802.1Q header that is pushed).
- *
- * The @vlan_tpid value is typically %ETH_P_8021Q.  The only acceptable TPID
- * values are those that the kernel module also parses as 802.1Q headers, to
- * prevent %OVS_ACTION_ATTR_PUSH_VLAN followed by %OVS_ACTION_ATTR_POP_VLAN
- * from having surprising results.
- */
-struct ovs_action_push_vlan {
-	__be16 vlan_tpid;	/* 802.1Q TPID. */
-	__be16 vlan_tci;	/* 802.1Q TCI (VLAN ID and priority). */
-};
-
-/* Data path hash algorithm for computing Datapath hash.
- *
- * The algorithm type only specifies the fields in a flow
- * will be used as part of the hash. Each datapath is free
- * to use its own hash algorithm. The hash value will be
- * opaque to the user space daemon.
- */
-enum ovs_hash_alg {
-	OVS_HASH_ALG_L4,
-};
-
-/*
- * struct ovs_action_hash - %OVS_ACTION_ATTR_HASH action argument.
- * @hash_alg: Algorithm used to compute hash prior to recirculation.
- * @hash_basis: basis used for computing hash.
- */
-struct ovs_action_hash {
-	uint32_t  hash_alg;     /* One of ovs_hash_alg. */
-	uint32_t  hash_basis;
-};
-
-/**
- * enum ovs_ct_attr - Attributes for %OVS_ACTION_ATTR_CT action.
- * @OVS_CT_ATTR_COMMIT: If present, commits the connection to the conntrack
- * table. This allows future packets for the same connection to be identified
- * as 'established' or 'related'. The flow key for the current packet will
- * retain the pre-commit connection state.
- * @OVS_CT_ATTR_ZONE: u16 connection tracking zone.
- * @OVS_CT_ATTR_MARK: u32 value followed by u32 mask. For each bit set in the
- * mask, the corresponding bit in the value is copied to the connection
- * tracking mark field in the connection.
- * @OVS_CT_ATTR_LABELS: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_LEN
- * mask. For each bit set in the mask, the corresponding bit in the value is
- * copied to the connection tracking label field in the connection.
- * @OVS_CT_ATTR_HELPER: variable length string defining conntrack ALG.
- */
-enum ovs_ct_attr {
-	OVS_CT_ATTR_UNSPEC,
-	OVS_CT_ATTR_COMMIT,     /* No argument, commits connection. */
-	OVS_CT_ATTR_ZONE,       /* u16 zone id. */
-	OVS_CT_ATTR_MARK,       /* mark to associate with this connection. */
-	OVS_CT_ATTR_LABELS,     /* labels to associate with this connection. */
-	OVS_CT_ATTR_HELPER,     /* netlink helper to assist detection of
-				   related connections. */
-	__OVS_CT_ATTR_MAX
-};
-
-#define OVS_CT_ATTR_MAX (__OVS_CT_ATTR_MAX - 1)
-
-/**
- * enum ovs_action_attr - Action types.
- *
- * @OVS_ACTION_ATTR_OUTPUT: Output packet to port.
- * @OVS_ACTION_ATTR_USERSPACE: Send packet to userspace according to nested
- * %OVS_USERSPACE_ATTR_* attributes.
- * @OVS_ACTION_ATTR_SET: Replaces the contents of an existing header.  The
- * single nested %OVS_KEY_ATTR_* attribute specifies a header to modify and its
- * value.
- * @OVS_ACTION_ATTR_SET_MASKED: Replaces the contents of an existing header.  A
- * nested %OVS_KEY_ATTR_* attribute specifies a header to modify, its value,
- * and a mask.  For every bit set in the mask, the corresponding bit value
- * is copied from the value to the packet header field, rest of the bits are
- * left unchanged.  The non-masked value bits must be passed in as zeroes.
- * Masking is not supported for the %OVS_KEY_ATTR_TUNNEL attribute.
- * @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q header onto the
- * packet.
- * @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q header off the packet.
- * @OVS_ACTION_ATTR_SAMPLE: Probabilitically executes actions, as specified in
- * the nested %OVS_SAMPLE_ATTR_* attributes.
- * @OVS_ACTION_ATTR_PUSH_MPLS: Push a new MPLS label stack entry onto the
- * top of the packets MPLS label stack.  Set the ethertype of the
- * encapsulating frame to either %ETH_P_MPLS_UC or %ETH_P_MPLS_MC to
- * indicate the new packet contents.
- * @OVS_ACTION_ATTR_POP_MPLS: Pop an MPLS label stack entry off of the
- * packet's MPLS label stack.  Set the encapsulating frame's ethertype to
- * indicate the new packet contents. This could potentially still be
- * %ETH_P_MPLS if the resulting MPLS label stack is not empty.  If there
- * is no MPLS label stack, as determined by ethertype, no action is taken.
- * @OVS_ACTION_ATTR_CT: Track the connection. Populate the conntrack-related
- * entries in the flow key.
- *
- * Only a single header can be set with a single %OVS_ACTION_ATTR_SET.  Not all
- * fields within a header are modifiable, e.g. the IPv4 protocol and fragment
- * type may not be changed.
- *
- * @OVS_ACTION_ATTR_SET_TO_MASKED: Kernel internal masked set action translated
- * from the @OVS_ACTION_ATTR_SET.
- */
-
-enum ovs_action_attr {
-	OVS_ACTION_ATTR_UNSPEC,
-	OVS_ACTION_ATTR_OUTPUT,	      /* u32 port number. */
-	OVS_ACTION_ATTR_USERSPACE,    /* Nested OVS_USERSPACE_ATTR_*. */
-	OVS_ACTION_ATTR_SET,          /* One nested OVS_KEY_ATTR_*. */
-	OVS_ACTION_ATTR_PUSH_VLAN,    /* struct ovs_action_push_vlan. */
-	OVS_ACTION_ATTR_POP_VLAN,     /* No argument. */
-	OVS_ACTION_ATTR_SAMPLE,       /* Nested OVS_SAMPLE_ATTR_*. */
-	OVS_ACTION_ATTR_RECIRC,       /* u32 recirc_id. */
-	OVS_ACTION_ATTR_HASH,	      /* struct ovs_action_hash. */
-	OVS_ACTION_ATTR_PUSH_MPLS,    /* struct ovs_action_push_mpls. */
-	OVS_ACTION_ATTR_POP_MPLS,     /* __be16 ethertype. */
-	OVS_ACTION_ATTR_SET_MASKED,   /* One nested OVS_KEY_ATTR_* including
-				       * data immediately followed by a mask.
-				       * The data must be zero for the unmasked
-				       * bits. */
-	OVS_ACTION_ATTR_CT,           /* Nested OVS_CT_ATTR_* . */
-
-	__OVS_ACTION_ATTR_MAX,	      /* Nothing past this will be accepted
-				       * from userspace. */
-
-};
-
-#define OVS_ACTION_ATTR_MAX (__OVS_ACTION_ATTR_MAX - 1)
-
-#endif /* _LINUX_OPENVSWITCH_H */
diff --git a/openflow/usr/include/linux/packet_diag.h b/openflow/usr/include/linux/packet_diag.h
deleted file mode 100644
index d08c63f..0000000
--- a/openflow/usr/include/linux/packet_diag.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef __PACKET_DIAG_H__
-#define __PACKET_DIAG_H__
-
-#include <linux/types.h>
-
-struct packet_diag_req {
-	__u8	sdiag_family;
-	__u8	sdiag_protocol;
-	__u16	pad;
-	__u32	pdiag_ino;
-	__u32	pdiag_show;
-	__u32	pdiag_cookie[2];
-};
-
-#define PACKET_SHOW_INFO	0x00000001 /* Basic packet_sk information */
-#define PACKET_SHOW_MCLIST	0x00000002 /* A set of packet_diag_mclist-s */
-#define PACKET_SHOW_RING_CFG	0x00000004 /* Rings configuration parameters */
-#define PACKET_SHOW_FANOUT	0x00000008
-#define PACKET_SHOW_MEMINFO	0x00000010
-#define PACKET_SHOW_FILTER	0x00000020
-
-struct packet_diag_msg {
-	__u8	pdiag_family;
-	__u8	pdiag_type;
-	__u16	pdiag_num;
-
-	__u32	pdiag_ino;
-	__u32	pdiag_cookie[2];
-};
-
-enum {
-	/* PACKET_DIAG_NONE, standard nl API requires this attribute!  */
-	PACKET_DIAG_INFO,
-	PACKET_DIAG_MCLIST,
-	PACKET_DIAG_RX_RING,
-	PACKET_DIAG_TX_RING,
-	PACKET_DIAG_FANOUT,
-	PACKET_DIAG_UID,
-	PACKET_DIAG_MEMINFO,
-	PACKET_DIAG_FILTER,
-
-	__PACKET_DIAG_MAX,
-};
-
-#define PACKET_DIAG_MAX (__PACKET_DIAG_MAX - 1)
-
-struct packet_diag_info {
-	__u32	pdi_index;
-	__u32	pdi_version;
-	__u32	pdi_reserve;
-	__u32	pdi_copy_thresh;
-	__u32	pdi_tstamp;
-	__u32	pdi_flags;
-
-#define PDI_RUNNING	0x1
-#define PDI_AUXDATA	0x2
-#define PDI_ORIGDEV	0x4
-#define PDI_VNETHDR	0x8
-#define PDI_LOSS	0x10
-};
-
-struct packet_diag_mclist {
-	__u32	pdmc_index;
-	__u32	pdmc_count;
-	__u16	pdmc_type;
-	__u16	pdmc_alen;
-	__u8	pdmc_addr[MAX_ADDR_LEN];
-};
-
-struct packet_diag_ring {
-	__u32	pdr_block_size;
-	__u32	pdr_block_nr;
-	__u32	pdr_frame_size;
-	__u32	pdr_frame_nr;
-	__u32	pdr_retire_tmo;
-	__u32	pdr_sizeof_priv;
-	__u32	pdr_features;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/param.h b/openflow/usr/include/linux/param.h
deleted file mode 100644
index 092e92f..0000000
--- a/openflow/usr/include/linux/param.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _LINUX_PARAM_H
-#define _LINUX_PARAM_H
-
-#include <asm/param.h>
-
-#endif
diff --git a/openflow/usr/include/linux/parport.h b/openflow/usr/include/linux/parport.h
deleted file mode 100644
index 4cd4442..0000000
--- a/openflow/usr/include/linux/parport.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Any part of this program may be used in documents licensed under
- * the GNU Free Documentation License, Version 1.1 or any later version
- * published by the Free Software Foundation.
- */
-
-#ifndef _PARPORT_H_
-#define _PARPORT_H_
-
-/* Start off with user-visible constants */
-
-/* Maximum of 16 ports per machine */
-#define PARPORT_MAX  16
-
-/* Magic numbers */
-#define PARPORT_IRQ_NONE  -1
-#define PARPORT_DMA_NONE  -1
-#define PARPORT_IRQ_AUTO  -2
-#define PARPORT_DMA_AUTO  -2
-#define PARPORT_DMA_NOFIFO -3
-#define PARPORT_DISABLE   -2
-#define PARPORT_IRQ_PROBEONLY -3
-#define PARPORT_IOHI_AUTO -1
-
-#define PARPORT_CONTROL_STROBE    0x1
-#define PARPORT_CONTROL_AUTOFD    0x2
-#define PARPORT_CONTROL_INIT      0x4
-#define PARPORT_CONTROL_SELECT    0x8
-
-#define PARPORT_STATUS_ERROR      0x8
-#define PARPORT_STATUS_SELECT     0x10
-#define PARPORT_STATUS_PAPEROUT   0x20
-#define PARPORT_STATUS_ACK        0x40
-#define PARPORT_STATUS_BUSY       0x80
-
-/* Type classes for Plug-and-Play probe.  */
-typedef enum {
-	PARPORT_CLASS_LEGACY = 0,       /* Non-IEEE1284 device */
-	PARPORT_CLASS_PRINTER,
-	PARPORT_CLASS_MODEM,
-	PARPORT_CLASS_NET,
-	PARPORT_CLASS_HDC,              /* Hard disk controller */
-	PARPORT_CLASS_PCMCIA,
-	PARPORT_CLASS_MEDIA,            /* Multimedia device */
-	PARPORT_CLASS_FDC,              /* Floppy disk controller */
-	PARPORT_CLASS_PORTS,
-	PARPORT_CLASS_SCANNER,
-	PARPORT_CLASS_DIGCAM,
-	PARPORT_CLASS_OTHER,            /* Anything else */
-	PARPORT_CLASS_UNSPEC,           /* No CLS field in ID */
-	PARPORT_CLASS_SCSIADAPTER
-} parport_device_class;
-
-/* The "modes" entry in parport is a bit field representing the
-   capabilities of the hardware. */
-#define PARPORT_MODE_PCSPP	(1<<0) /* IBM PC registers available. */
-#define PARPORT_MODE_TRISTATE	(1<<1) /* Can tristate. */
-#define PARPORT_MODE_EPP	(1<<2) /* Hardware EPP. */
-#define PARPORT_MODE_ECP	(1<<3) /* Hardware ECP. */
-#define PARPORT_MODE_COMPAT	(1<<4) /* Hardware 'printer protocol'. */
-#define PARPORT_MODE_DMA	(1<<5) /* Hardware can DMA. */
-#define PARPORT_MODE_SAFEININT	(1<<6) /* SPP registers accessible in IRQ. */
-
-/* IEEE1284 modes: 
-   Nibble mode, byte mode, ECP, ECPRLE and EPP are their own
-   'extensibility request' values.  Others are special.
-   'Real' ECP modes must have the IEEE1284_MODE_ECP bit set.  */
-#define IEEE1284_MODE_NIBBLE             0
-#define IEEE1284_MODE_BYTE              (1<<0)
-#define IEEE1284_MODE_COMPAT            (1<<8)
-#define IEEE1284_MODE_BECP              (1<<9) /* Bounded ECP mode */
-#define IEEE1284_MODE_ECP               (1<<4)
-#define IEEE1284_MODE_ECPRLE            (IEEE1284_MODE_ECP | (1<<5))
-#define IEEE1284_MODE_ECPSWE            (1<<10) /* Software-emulated */
-#define IEEE1284_MODE_EPP               (1<<6)
-#define IEEE1284_MODE_EPPSL             (1<<11) /* EPP 1.7 */
-#define IEEE1284_MODE_EPPSWE            (1<<12) /* Software-emulated */
-#define IEEE1284_DEVICEID               (1<<2)  /* This is a flag */
-#define IEEE1284_EXT_LINK               (1<<14) /* This flag causes the
-						 * extensibility link to
-						 * be requested, using
-						 * bits 0-6. */
-
-/* For the benefit of parport_read/write, you can use these with
- * parport_negotiate to use address operations.  They have no effect
- * other than to make parport_read/write use address transfers. */
-#define IEEE1284_ADDR			(1<<13)	/* This is a flag */
-#define IEEE1284_DATA			 0	/* So is this */
-
-/* Flags for block transfer operations. */
-#define PARPORT_EPP_FAST		(1<<0) /* Unreliable counts. */
-#define PARPORT_W91284PIC		(1<<1) /* have a Warp9 w91284pic in the device */
-
-/* The rest is for the kernel only */
-#endif /* _PARPORT_H_ */
diff --git a/openflow/usr/include/linux/patchkey.h b/openflow/usr/include/linux/patchkey.h
deleted file mode 100644
index bb28430..0000000
--- a/openflow/usr/include/linux/patchkey.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * <linux/patchkey.h> -- definition of _PATCHKEY macro
- *
- * Copyright (C) 2005 Stuart Brady
- *
- * This exists because awe_voice.h defined its own _PATCHKEY and it wasn't
- * clear whether removing this would break anything in userspace.
- *
- * Do not include this file directly.  Please use <sys/soundcard.h> instead.
- * For kernel code, use <linux/soundcard.h>
- */
-
-#ifndef _LINUX_PATCHKEY_H_INDIRECT
-#error "patchkey.h included directly"
-#endif
-
-#ifndef _LINUX_PATCHKEY_H
-#define _LINUX_PATCHKEY_H
-
-/* Endian macros. */
-#  include <endian.h>
-
-#if defined(__BYTE_ORDER)
-#  if __BYTE_ORDER == __BIG_ENDIAN
-#    define _PATCHKEY(id) (0xfd00|id)
-#  elif __BYTE_ORDER == __LITTLE_ENDIAN
-#    define _PATCHKEY(id) ((id<<8)|0x00fd)
-#  else
-#    error "could not determine byte order"
-#  endif
-#endif
-
-#endif /* _LINUX_PATCHKEY_H */
diff --git a/openflow/usr/include/linux/pci.h b/openflow/usr/include/linux/pci.h
deleted file mode 100644
index a5bb5c7..0000000
--- a/openflow/usr/include/linux/pci.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *	pci.h
- *
- *	PCI defines and function prototypes
- *	Copyright 1994, Drew Eckhardt
- *	Copyright 1997--1999 Martin Mares <mj@ucw.cz>
- *
- *	For more information, please consult the following manuals (look at
- *	http://www.pcisig.com/ for how to get them):
- *
- *	PCI BIOS Specification
- *	PCI Local Bus Specification
- *	PCI to PCI Bridge Specification
- *	PCI System Design Guide
- */
-
-#ifndef LINUX_PCI_H
-#define LINUX_PCI_H
-
-#include <linux/pci_regs.h>	/* The pci register defines */
-
-/*
- * The PCI interface treats multi-function devices as independent
- * devices.  The slot/function address of each device is encoded
- * in a single byte as follows:
- *
- *	7:3 = slot
- *	2:0 = function
- */
-#define PCI_DEVFN(slot, func)	((((slot) & 0x1f) << 3) | ((func) & 0x07))
-#define PCI_SLOT(devfn)		(((devfn) >> 3) & 0x1f)
-#define PCI_FUNC(devfn)		((devfn) & 0x07)
-
-/* Ioctls for /proc/bus/pci/X/Y nodes. */
-#define PCIIOC_BASE		('P' << 24 | 'C' << 16 | 'I' << 8)
-#define PCIIOC_CONTROLLER	(PCIIOC_BASE | 0x00)	/* Get controller for PCI device. */
-#define PCIIOC_MMAP_IS_IO	(PCIIOC_BASE | 0x01)	/* Set mmap state to I/O space. */
-#define PCIIOC_MMAP_IS_MEM	(PCIIOC_BASE | 0x02)	/* Set mmap state to MEM space. */
-#define PCIIOC_WRITE_COMBINE	(PCIIOC_BASE | 0x03)	/* Enable/disable write-combining. */
-
-#endif /* LINUX_PCI_H */
diff --git a/openflow/usr/include/linux/pci_regs.h b/openflow/usr/include/linux/pci_regs.h
deleted file mode 100644
index 1becea8..0000000
--- a/openflow/usr/include/linux/pci_regs.h
+++ /dev/null
@@ -1,949 +0,0 @@
-/*
- *	pci_regs.h
- *
- *	PCI standard defines
- *	Copyright 1994, Drew Eckhardt
- *	Copyright 1997--1999 Martin Mares <mj@ucw.cz>
- *
- *	For more information, please consult the following manuals (look at
- *	http://www.pcisig.com/ for how to get them):
- *
- *	PCI BIOS Specification
- *	PCI Local Bus Specification
- *	PCI to PCI Bridge Specification
- *	PCI System Design Guide
- *
- *	For HyperTransport information, please consult the following manuals
- *	from http://www.hypertransport.org
- *
- *	The HyperTransport I/O Link Specification
- */
-
-#ifndef LINUX_PCI_REGS_H
-#define LINUX_PCI_REGS_H
-
-/*
- * Under PCI, each device has 256 bytes of configuration address space,
- * of which the first 64 bytes are standardized as follows:
- */
-#define PCI_STD_HEADER_SIZEOF	64
-#define PCI_VENDOR_ID		0x00	/* 16 bits */
-#define PCI_DEVICE_ID		0x02	/* 16 bits */
-#define PCI_COMMAND		0x04	/* 16 bits */
-#define  PCI_COMMAND_IO		0x1	/* Enable response in I/O space */
-#define  PCI_COMMAND_MEMORY	0x2	/* Enable response in Memory space */
-#define  PCI_COMMAND_MASTER	0x4	/* Enable bus mastering */
-#define  PCI_COMMAND_SPECIAL	0x8	/* Enable response to special cycles */
-#define  PCI_COMMAND_INVALIDATE	0x10	/* Use memory write and invalidate */
-#define  PCI_COMMAND_VGA_PALETTE 0x20	/* Enable palette snooping */
-#define  PCI_COMMAND_PARITY	0x40	/* Enable parity checking */
-#define  PCI_COMMAND_WAIT	0x80	/* Enable address/data stepping */
-#define  PCI_COMMAND_SERR	0x100	/* Enable SERR */
-#define  PCI_COMMAND_FAST_BACK	0x200	/* Enable back-to-back writes */
-#define  PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */
-
-#define PCI_STATUS		0x06	/* 16 bits */
-#define  PCI_STATUS_INTERRUPT	0x08	/* Interrupt status */
-#define  PCI_STATUS_CAP_LIST	0x10	/* Support Capability List */
-#define  PCI_STATUS_66MHZ	0x20	/* Support 66 MHz PCI 2.1 bus */
-#define  PCI_STATUS_UDF		0x40	/* Support User Definable Features [obsolete] */
-#define  PCI_STATUS_FAST_BACK	0x80	/* Accept fast-back to back */
-#define  PCI_STATUS_PARITY	0x100	/* Detected parity error */
-#define  PCI_STATUS_DEVSEL_MASK	0x600	/* DEVSEL timing */
-#define  PCI_STATUS_DEVSEL_FAST		0x000
-#define  PCI_STATUS_DEVSEL_MEDIUM	0x200
-#define  PCI_STATUS_DEVSEL_SLOW		0x400
-#define  PCI_STATUS_SIG_TARGET_ABORT	0x800 /* Set on target abort */
-#define  PCI_STATUS_REC_TARGET_ABORT	0x1000 /* Master ack of " */
-#define  PCI_STATUS_REC_MASTER_ABORT	0x2000 /* Set on master abort */
-#define  PCI_STATUS_SIG_SYSTEM_ERROR	0x4000 /* Set when we drive SERR */
-#define  PCI_STATUS_DETECTED_PARITY	0x8000 /* Set on parity error */
-
-#define PCI_CLASS_REVISION	0x08	/* High 24 bits are class, low 8 revision */
-#define PCI_REVISION_ID		0x08	/* Revision ID */
-#define PCI_CLASS_PROG		0x09	/* Reg. Level Programming Interface */
-#define PCI_CLASS_DEVICE	0x0a	/* Device class */
-
-#define PCI_CACHE_LINE_SIZE	0x0c	/* 8 bits */
-#define PCI_LATENCY_TIMER	0x0d	/* 8 bits */
-#define PCI_HEADER_TYPE		0x0e	/* 8 bits */
-#define  PCI_HEADER_TYPE_NORMAL		0
-#define  PCI_HEADER_TYPE_BRIDGE		1
-#define  PCI_HEADER_TYPE_CARDBUS	2
-
-#define PCI_BIST		0x0f	/* 8 bits */
-#define  PCI_BIST_CODE_MASK	0x0f	/* Return result */
-#define  PCI_BIST_START		0x40	/* 1 to start BIST, 2 secs or less */
-#define  PCI_BIST_CAPABLE	0x80	/* 1 if BIST capable */
-
-/*
- * Base addresses specify locations in memory or I/O space.
- * Decoded size can be determined by writing a value of
- * 0xffffffff to the register, and reading it back.  Only
- * 1 bits are decoded.
- */
-#define PCI_BASE_ADDRESS_0	0x10	/* 32 bits */
-#define PCI_BASE_ADDRESS_1	0x14	/* 32 bits [htype 0,1 only] */
-#define PCI_BASE_ADDRESS_2	0x18	/* 32 bits [htype 0 only] */
-#define PCI_BASE_ADDRESS_3	0x1c	/* 32 bits */
-#define PCI_BASE_ADDRESS_4	0x20	/* 32 bits */
-#define PCI_BASE_ADDRESS_5	0x24	/* 32 bits */
-#define  PCI_BASE_ADDRESS_SPACE		0x01	/* 0 = memory, 1 = I/O */
-#define  PCI_BASE_ADDRESS_SPACE_IO	0x01
-#define  PCI_BASE_ADDRESS_SPACE_MEMORY	0x00
-#define  PCI_BASE_ADDRESS_MEM_TYPE_MASK	0x06
-#define  PCI_BASE_ADDRESS_MEM_TYPE_32	0x00	/* 32 bit address */
-#define  PCI_BASE_ADDRESS_MEM_TYPE_1M	0x02	/* Below 1M [obsolete] */
-#define  PCI_BASE_ADDRESS_MEM_TYPE_64	0x04	/* 64 bit address */
-#define  PCI_BASE_ADDRESS_MEM_PREFETCH	0x08	/* prefetchable? */
-#define  PCI_BASE_ADDRESS_MEM_MASK	(~0x0fUL)
-#define  PCI_BASE_ADDRESS_IO_MASK	(~0x03UL)
-/* bit 1 is reserved if address_space = 1 */
-
-/* Header type 0 (normal devices) */
-#define PCI_CARDBUS_CIS		0x28
-#define PCI_SUBSYSTEM_VENDOR_ID	0x2c
-#define PCI_SUBSYSTEM_ID	0x2e
-#define PCI_ROM_ADDRESS		0x30	/* Bits 31..11 are address, 10..1 reserved */
-#define  PCI_ROM_ADDRESS_ENABLE	0x01
-#define PCI_ROM_ADDRESS_MASK	(~0x7ffUL)
-
-#define PCI_CAPABILITY_LIST	0x34	/* Offset of first capability list entry */
-
-/* 0x35-0x3b are reserved */
-#define PCI_INTERRUPT_LINE	0x3c	/* 8 bits */
-#define PCI_INTERRUPT_PIN	0x3d	/* 8 bits */
-#define PCI_MIN_GNT		0x3e	/* 8 bits */
-#define PCI_MAX_LAT		0x3f	/* 8 bits */
-
-/* Header type 1 (PCI-to-PCI bridges) */
-#define PCI_PRIMARY_BUS		0x18	/* Primary bus number */
-#define PCI_SECONDARY_BUS	0x19	/* Secondary bus number */
-#define PCI_SUBORDINATE_BUS	0x1a	/* Highest bus number behind the bridge */
-#define PCI_SEC_LATENCY_TIMER	0x1b	/* Latency timer for secondary interface */
-#define PCI_IO_BASE		0x1c	/* I/O range behind the bridge */
-#define PCI_IO_LIMIT		0x1d
-#define  PCI_IO_RANGE_TYPE_MASK	0x0fUL	/* I/O bridging type */
-#define  PCI_IO_RANGE_TYPE_16	0x00
-#define  PCI_IO_RANGE_TYPE_32	0x01
-#define  PCI_IO_RANGE_MASK	(~0x0fUL) /* Standard 4K I/O windows */
-#define  PCI_IO_1K_RANGE_MASK	(~0x03UL) /* Intel 1K I/O windows */
-#define PCI_SEC_STATUS		0x1e	/* Secondary status register, only bit 14 used */
-#define PCI_MEMORY_BASE		0x20	/* Memory range behind */
-#define PCI_MEMORY_LIMIT	0x22
-#define  PCI_MEMORY_RANGE_TYPE_MASK 0x0fUL
-#define  PCI_MEMORY_RANGE_MASK	(~0x0fUL)
-#define PCI_PREF_MEMORY_BASE	0x24	/* Prefetchable memory range behind */
-#define PCI_PREF_MEMORY_LIMIT	0x26
-#define  PCI_PREF_RANGE_TYPE_MASK 0x0fUL
-#define  PCI_PREF_RANGE_TYPE_32	0x00
-#define  PCI_PREF_RANGE_TYPE_64	0x01
-#define  PCI_PREF_RANGE_MASK	(~0x0fUL)
-#define PCI_PREF_BASE_UPPER32	0x28	/* Upper half of prefetchable memory range */
-#define PCI_PREF_LIMIT_UPPER32	0x2c
-#define PCI_IO_BASE_UPPER16	0x30	/* Upper half of I/O addresses */
-#define PCI_IO_LIMIT_UPPER16	0x32
-/* 0x34 same as for htype 0 */
-/* 0x35-0x3b is reserved */
-#define PCI_ROM_ADDRESS1	0x38	/* Same as PCI_ROM_ADDRESS, but for htype 1 */
-/* 0x3c-0x3d are same as for htype 0 */
-#define PCI_BRIDGE_CONTROL	0x3e
-#define  PCI_BRIDGE_CTL_PARITY	0x01	/* Enable parity detection on secondary interface */
-#define  PCI_BRIDGE_CTL_SERR	0x02	/* The same for SERR forwarding */
-#define  PCI_BRIDGE_CTL_ISA	0x04	/* Enable ISA mode */
-#define  PCI_BRIDGE_CTL_VGA	0x08	/* Forward VGA addresses */
-#define  PCI_BRIDGE_CTL_MASTER_ABORT	0x20  /* Report master aborts */
-#define  PCI_BRIDGE_CTL_BUS_RESET	0x40	/* Secondary bus reset */
-#define  PCI_BRIDGE_CTL_FAST_BACK	0x80	/* Fast Back2Back enabled on secondary interface */
-
-/* Header type 2 (CardBus bridges) */
-#define PCI_CB_CAPABILITY_LIST	0x14
-/* 0x15 reserved */
-#define PCI_CB_SEC_STATUS	0x16	/* Secondary status */
-#define PCI_CB_PRIMARY_BUS	0x18	/* PCI bus number */
-#define PCI_CB_CARD_BUS		0x19	/* CardBus bus number */
-#define PCI_CB_SUBORDINATE_BUS	0x1a	/* Subordinate bus number */
-#define PCI_CB_LATENCY_TIMER	0x1b	/* CardBus latency timer */
-#define PCI_CB_MEMORY_BASE_0	0x1c
-#define PCI_CB_MEMORY_LIMIT_0	0x20
-#define PCI_CB_MEMORY_BASE_1	0x24
-#define PCI_CB_MEMORY_LIMIT_1	0x28
-#define PCI_CB_IO_BASE_0	0x2c
-#define PCI_CB_IO_BASE_0_HI	0x2e
-#define PCI_CB_IO_LIMIT_0	0x30
-#define PCI_CB_IO_LIMIT_0_HI	0x32
-#define PCI_CB_IO_BASE_1	0x34
-#define PCI_CB_IO_BASE_1_HI	0x36
-#define PCI_CB_IO_LIMIT_1	0x38
-#define PCI_CB_IO_LIMIT_1_HI	0x3a
-#define  PCI_CB_IO_RANGE_MASK	(~0x03UL)
-/* 0x3c-0x3d are same as for htype 0 */
-#define PCI_CB_BRIDGE_CONTROL	0x3e
-#define  PCI_CB_BRIDGE_CTL_PARITY	0x01	/* Similar to standard bridge control register */
-#define  PCI_CB_BRIDGE_CTL_SERR		0x02
-#define  PCI_CB_BRIDGE_CTL_ISA		0x04
-#define  PCI_CB_BRIDGE_CTL_VGA		0x08
-#define  PCI_CB_BRIDGE_CTL_MASTER_ABORT	0x20
-#define  PCI_CB_BRIDGE_CTL_CB_RESET	0x40	/* CardBus reset */
-#define  PCI_CB_BRIDGE_CTL_16BIT_INT	0x80	/* Enable interrupt for 16-bit cards */
-#define  PCI_CB_BRIDGE_CTL_PREFETCH_MEM0 0x100	/* Prefetch enable for both memory regions */
-#define  PCI_CB_BRIDGE_CTL_PREFETCH_MEM1 0x200
-#define  PCI_CB_BRIDGE_CTL_POST_WRITES	0x400
-#define PCI_CB_SUBSYSTEM_VENDOR_ID	0x40
-#define PCI_CB_SUBSYSTEM_ID		0x42
-#define PCI_CB_LEGACY_MODE_BASE		0x44	/* 16-bit PC Card legacy mode base address (ExCa) */
-/* 0x48-0x7f reserved */
-
-/* Capability lists */
-
-#define PCI_CAP_LIST_ID		0	/* Capability ID */
-#define  PCI_CAP_ID_PM		0x01	/* Power Management */
-#define  PCI_CAP_ID_AGP		0x02	/* Accelerated Graphics Port */
-#define  PCI_CAP_ID_VPD		0x03	/* Vital Product Data */
-#define  PCI_CAP_ID_SLOTID	0x04	/* Slot Identification */
-#define  PCI_CAP_ID_MSI		0x05	/* Message Signalled Interrupts */
-#define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */
-#define  PCI_CAP_ID_PCIX	0x07	/* PCI-X */
-#define  PCI_CAP_ID_HT		0x08	/* HyperTransport */
-#define  PCI_CAP_ID_VNDR	0x09	/* Vendor-Specific */
-#define  PCI_CAP_ID_DBG		0x0A	/* Debug port */
-#define  PCI_CAP_ID_CCRC	0x0B	/* CompactPCI Central Resource Control */
-#define  PCI_CAP_ID_SHPC	0x0C	/* PCI Standard Hot-Plug Controller */
-#define  PCI_CAP_ID_SSVID	0x0D	/* Bridge subsystem vendor/device ID */
-#define  PCI_CAP_ID_AGP3	0x0E	/* AGP Target PCI-PCI bridge */
-#define  PCI_CAP_ID_SECDEV	0x0F	/* Secure Device */
-#define  PCI_CAP_ID_EXP		0x10	/* PCI Express */
-#define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
-#define  PCI_CAP_ID_SATA	0x12	/* SATA Data/Index Conf. */
-#define  PCI_CAP_ID_AF		0x13	/* PCI Advanced Features */
-#define  PCI_CAP_ID_EA		0x14	/* PCI Enhanced Allocation */
-#define  PCI_CAP_ID_MAX		PCI_CAP_ID_EA
-#define PCI_CAP_LIST_NEXT	1	/* Next capability in the list */
-#define PCI_CAP_FLAGS		2	/* Capability defined flags (16 bits) */
-#define PCI_CAP_SIZEOF		4
-
-/* Power Management Registers */
-
-#define PCI_PM_PMC		2	/* PM Capabilities Register */
-#define  PCI_PM_CAP_VER_MASK	0x0007	/* Version */
-#define  PCI_PM_CAP_PME_CLOCK	0x0008	/* PME clock required */
-#define  PCI_PM_CAP_RESERVED    0x0010  /* Reserved field */
-#define  PCI_PM_CAP_DSI		0x0020	/* Device specific initialization */
-#define  PCI_PM_CAP_AUX_POWER	0x01C0	/* Auxiliary power support mask */
-#define  PCI_PM_CAP_D1		0x0200	/* D1 power state support */
-#define  PCI_PM_CAP_D2		0x0400	/* D2 power state support */
-#define  PCI_PM_CAP_PME		0x0800	/* PME pin supported */
-#define  PCI_PM_CAP_PME_MASK	0xF800	/* PME Mask of all supported states */
-#define  PCI_PM_CAP_PME_D0	0x0800	/* PME# from D0 */
-#define  PCI_PM_CAP_PME_D1	0x1000	/* PME# from D1 */
-#define  PCI_PM_CAP_PME_D2	0x2000	/* PME# from D2 */
-#define  PCI_PM_CAP_PME_D3	0x4000	/* PME# from D3 (hot) */
-#define  PCI_PM_CAP_PME_D3cold	0x8000	/* PME# from D3 (cold) */
-#define  PCI_PM_CAP_PME_SHIFT	11	/* Start of the PME Mask in PMC */
-#define PCI_PM_CTRL		4	/* PM control and status register */
-#define  PCI_PM_CTRL_STATE_MASK	0x0003	/* Current power state (D0 to D3) */
-#define  PCI_PM_CTRL_NO_SOFT_RESET	0x0008	/* No reset for D3hot->D0 */
-#define  PCI_PM_CTRL_PME_ENABLE	0x0100	/* PME pin enable */
-#define  PCI_PM_CTRL_DATA_SEL_MASK	0x1e00	/* Data select (??) */
-#define  PCI_PM_CTRL_DATA_SCALE_MASK	0x6000	/* Data scale (??) */
-#define  PCI_PM_CTRL_PME_STATUS	0x8000	/* PME pin status */
-#define PCI_PM_PPB_EXTENSIONS	6	/* PPB support extensions (??) */
-#define  PCI_PM_PPB_B2_B3	0x40	/* Stop clock when in D3hot (??) */
-#define  PCI_PM_BPCC_ENABLE	0x80	/* Bus power/clock control enable (??) */
-#define PCI_PM_DATA_REGISTER	7	/* (??) */
-#define PCI_PM_SIZEOF		8
-
-/* AGP registers */
-
-#define PCI_AGP_VERSION		2	/* BCD version number */
-#define PCI_AGP_RFU		3	/* Rest of capability flags */
-#define PCI_AGP_STATUS		4	/* Status register */
-#define  PCI_AGP_STATUS_RQ_MASK	0xff000000	/* Maximum number of requests - 1 */
-#define  PCI_AGP_STATUS_SBA	0x0200	/* Sideband addressing supported */
-#define  PCI_AGP_STATUS_64BIT	0x0020	/* 64-bit addressing supported */
-#define  PCI_AGP_STATUS_FW	0x0010	/* FW transfers supported */
-#define  PCI_AGP_STATUS_RATE4	0x0004	/* 4x transfer rate supported */
-#define  PCI_AGP_STATUS_RATE2	0x0002	/* 2x transfer rate supported */
-#define  PCI_AGP_STATUS_RATE1	0x0001	/* 1x transfer rate supported */
-#define PCI_AGP_COMMAND		8	/* Control register */
-#define  PCI_AGP_COMMAND_RQ_MASK 0xff000000  /* Master: Maximum number of requests */
-#define  PCI_AGP_COMMAND_SBA	0x0200	/* Sideband addressing enabled */
-#define  PCI_AGP_COMMAND_AGP	0x0100	/* Allow processing of AGP transactions */
-#define  PCI_AGP_COMMAND_64BIT	0x0020	/* Allow processing of 64-bit addresses */
-#define  PCI_AGP_COMMAND_FW	0x0010	/* Force FW transfers */
-#define  PCI_AGP_COMMAND_RATE4	0x0004	/* Use 4x rate */
-#define  PCI_AGP_COMMAND_RATE2	0x0002	/* Use 2x rate */
-#define  PCI_AGP_COMMAND_RATE1	0x0001	/* Use 1x rate */
-#define PCI_AGP_SIZEOF		12
-
-/* Vital Product Data */
-
-#define PCI_VPD_ADDR		2	/* Address to access (15 bits!) */
-#define  PCI_VPD_ADDR_MASK	0x7fff	/* Address mask */
-#define  PCI_VPD_ADDR_F		0x8000	/* Write 0, 1 indicates completion */
-#define PCI_VPD_DATA		4	/* 32-bits of data returned here */
-#define PCI_CAP_VPD_SIZEOF	8
-
-/* Slot Identification */
-
-#define PCI_SID_ESR		2	/* Expansion Slot Register */
-#define  PCI_SID_ESR_NSLOTS	0x1f	/* Number of expansion slots available */
-#define  PCI_SID_ESR_FIC	0x20	/* First In Chassis Flag */
-#define PCI_SID_CHASSIS_NR	3	/* Chassis Number */
-
-/* Message Signalled Interrupts registers */
-
-#define PCI_MSI_FLAGS		2	/* Message Control */
-#define  PCI_MSI_FLAGS_ENABLE	0x0001	/* MSI feature enabled */
-#define  PCI_MSI_FLAGS_QMASK	0x000e	/* Maximum queue size available */
-#define  PCI_MSI_FLAGS_QSIZE	0x0070	/* Message queue size configured */
-#define  PCI_MSI_FLAGS_64BIT	0x0080	/* 64-bit addresses allowed */
-#define  PCI_MSI_FLAGS_MASKBIT	0x0100	/* Per-vector masking capable */
-#define PCI_MSI_RFU		3	/* Rest of capability flags */
-#define PCI_MSI_ADDRESS_LO	4	/* Lower 32 bits */
-#define PCI_MSI_ADDRESS_HI	8	/* Upper 32 bits (if PCI_MSI_FLAGS_64BIT set) */
-#define PCI_MSI_DATA_32		8	/* 16 bits of data for 32-bit devices */
-#define PCI_MSI_MASK_32		12	/* Mask bits register for 32-bit devices */
-#define PCI_MSI_PENDING_32	16	/* Pending intrs for 32-bit devices */
-#define PCI_MSI_DATA_64		12	/* 16 bits of data for 64-bit devices */
-#define PCI_MSI_MASK_64		16	/* Mask bits register for 64-bit devices */
-#define PCI_MSI_PENDING_64	20	/* Pending intrs for 64-bit devices */
-
-/* MSI-X registers */
-#define PCI_MSIX_FLAGS		2	/* Message Control */
-#define  PCI_MSIX_FLAGS_QSIZE	0x07FF	/* Table size */
-#define  PCI_MSIX_FLAGS_MASKALL	0x4000	/* Mask all vectors for this function */
-#define  PCI_MSIX_FLAGS_ENABLE	0x8000	/* MSI-X enable */
-#define PCI_MSIX_TABLE		4	/* Table offset */
-#define  PCI_MSIX_TABLE_BIR	0x00000007 /* BAR index */
-#define  PCI_MSIX_TABLE_OFFSET	0xfffffff8 /* Offset into specified BAR */
-#define PCI_MSIX_PBA		8	/* Pending Bit Array offset */
-#define  PCI_MSIX_PBA_BIR	0x00000007 /* BAR index */
-#define  PCI_MSIX_PBA_OFFSET	0xfffffff8 /* Offset into specified BAR */
-#define PCI_MSIX_FLAGS_BIRMASK	PCI_MSIX_PBA_BIR /* deprecated */
-#define PCI_CAP_MSIX_SIZEOF	12	/* size of MSIX registers */
-
-/* MSI-X Table entry format */
-#define PCI_MSIX_ENTRY_SIZE		16
-#define  PCI_MSIX_ENTRY_LOWER_ADDR	0
-#define  PCI_MSIX_ENTRY_UPPER_ADDR	4
-#define  PCI_MSIX_ENTRY_DATA		8
-#define  PCI_MSIX_ENTRY_VECTOR_CTRL	12
-#define   PCI_MSIX_ENTRY_CTRL_MASKBIT	1
-
-/* CompactPCI Hotswap Register */
-
-#define PCI_CHSWP_CSR		2	/* Control and Status Register */
-#define  PCI_CHSWP_DHA		0x01	/* Device Hiding Arm */
-#define  PCI_CHSWP_EIM		0x02	/* ENUM# Signal Mask */
-#define  PCI_CHSWP_PIE		0x04	/* Pending Insert or Extract */
-#define  PCI_CHSWP_LOO		0x08	/* LED On / Off */
-#define  PCI_CHSWP_PI		0x30	/* Programming Interface */
-#define  PCI_CHSWP_EXT		0x40	/* ENUM# status - extraction */
-#define  PCI_CHSWP_INS		0x80	/* ENUM# status - insertion */
-
-/* PCI Advanced Feature registers */
-
-#define PCI_AF_LENGTH		2
-#define PCI_AF_CAP		3
-#define  PCI_AF_CAP_TP		0x01
-#define  PCI_AF_CAP_FLR		0x02
-#define PCI_AF_CTRL		4
-#define  PCI_AF_CTRL_FLR	0x01
-#define PCI_AF_STATUS		5
-#define  PCI_AF_STATUS_TP	0x01
-#define PCI_CAP_AF_SIZEOF	6	/* size of AF registers */
-
-/* PCI Enhanced Allocation registers */
-
-#define PCI_EA_NUM_ENT		2	/* Number of Capability Entries */
-#define  PCI_EA_NUM_ENT_MASK	0x3f	/* Num Entries Mask */
-#define PCI_EA_FIRST_ENT	4	/* First EA Entry in List */
-#define PCI_EA_FIRST_ENT_BRIDGE	8	/* First EA Entry for Bridges */
-#define  PCI_EA_ES		0x00000007 /* Entry Size */
-#define  PCI_EA_BEI		0x000000f0 /* BAR Equivalent Indicator */
-/* 0-5 map to BARs 0-5 respectively */
-#define   PCI_EA_BEI_BAR0		0
-#define   PCI_EA_BEI_BAR5		5
-#define   PCI_EA_BEI_BRIDGE		6	/* Resource behind bridge */
-#define   PCI_EA_BEI_ENI		7	/* Equivalent Not Indicated */
-#define   PCI_EA_BEI_ROM		8	/* Expansion ROM */
-/* 9-14 map to VF BARs 0-5 respectively */
-#define   PCI_EA_BEI_VF_BAR0		9
-#define   PCI_EA_BEI_VF_BAR5		14
-#define   PCI_EA_BEI_RESERVED		15	/* Reserved - Treat like ENI */
-#define  PCI_EA_PP		0x0000ff00	/* Primary Properties */
-#define  PCI_EA_SP		0x00ff0000	/* Secondary Properties */
-#define   PCI_EA_P_MEM			0x00	/* Non-Prefetch Memory */
-#define   PCI_EA_P_MEM_PREFETCH		0x01	/* Prefetchable Memory */
-#define   PCI_EA_P_IO			0x02	/* I/O Space */
-#define   PCI_EA_P_VF_MEM_PREFETCH	0x03	/* VF Prefetchable Memory */
-#define   PCI_EA_P_VF_MEM		0x04	/* VF Non-Prefetch Memory */
-#define   PCI_EA_P_BRIDGE_MEM		0x05	/* Bridge Non-Prefetch Memory */
-#define   PCI_EA_P_BRIDGE_MEM_PREFETCH	0x06	/* Bridge Prefetchable Memory */
-#define   PCI_EA_P_BRIDGE_IO		0x07	/* Bridge I/O Space */
-/* 0x08-0xfc reserved */
-#define   PCI_EA_P_MEM_RESERVED		0xfd	/* Reserved Memory */
-#define   PCI_EA_P_IO_RESERVED		0xfe	/* Reserved I/O Space */
-#define   PCI_EA_P_UNAVAILABLE		0xff	/* Entry Unavailable */
-#define  PCI_EA_WRITABLE	0x40000000	/* Writable: 1 = RW, 0 = HwInit */
-#define  PCI_EA_ENABLE		0x80000000	/* Enable for this entry */
-#define PCI_EA_BASE		4		/* Base Address Offset */
-#define PCI_EA_MAX_OFFSET	8		/* MaxOffset (resource length) */
-/* bit 0 is reserved */
-#define  PCI_EA_IS_64		0x00000002	/* 64-bit field flag */
-#define  PCI_EA_FIELD_MASK	0xfffffffc	/* For Base & Max Offset */
-
-/* PCI-X registers (Type 0 (non-bridge) devices) */
-
-#define PCI_X_CMD		2	/* Modes & Features */
-#define  PCI_X_CMD_DPERR_E	0x0001	/* Data Parity Error Recovery Enable */
-#define  PCI_X_CMD_ERO		0x0002	/* Enable Relaxed Ordering */
-#define  PCI_X_CMD_READ_512	0x0000	/* 512 byte maximum read byte count */
-#define  PCI_X_CMD_READ_1K	0x0004	/* 1Kbyte maximum read byte count */
-#define  PCI_X_CMD_READ_2K	0x0008	/* 2Kbyte maximum read byte count */
-#define  PCI_X_CMD_READ_4K	0x000c	/* 4Kbyte maximum read byte count */
-#define  PCI_X_CMD_MAX_READ	0x000c	/* Max Memory Read Byte Count */
-				/* Max # of outstanding split transactions */
-#define  PCI_X_CMD_SPLIT_1	0x0000	/* Max 1 */
-#define  PCI_X_CMD_SPLIT_2	0x0010	/* Max 2 */
-#define  PCI_X_CMD_SPLIT_3	0x0020	/* Max 3 */
-#define  PCI_X_CMD_SPLIT_4	0x0030	/* Max 4 */
-#define  PCI_X_CMD_SPLIT_8	0x0040	/* Max 8 */
-#define  PCI_X_CMD_SPLIT_12	0x0050	/* Max 12 */
-#define  PCI_X_CMD_SPLIT_16	0x0060	/* Max 16 */
-#define  PCI_X_CMD_SPLIT_32	0x0070	/* Max 32 */
-#define  PCI_X_CMD_MAX_SPLIT	0x0070	/* Max Outstanding Split Transactions */
-#define  PCI_X_CMD_VERSION(x)	(((x) >> 12) & 3) /* Version */
-#define PCI_X_STATUS		4	/* PCI-X capabilities */
-#define  PCI_X_STATUS_DEVFN	0x000000ff	/* A copy of devfn */
-#define  PCI_X_STATUS_BUS	0x0000ff00	/* A copy of bus nr */
-#define  PCI_X_STATUS_64BIT	0x00010000	/* 64-bit device */
-#define  PCI_X_STATUS_133MHZ	0x00020000	/* 133 MHz capable */
-#define  PCI_X_STATUS_SPL_DISC	0x00040000	/* Split Completion Discarded */
-#define  PCI_X_STATUS_UNX_SPL	0x00080000	/* Unexpected Split Completion */
-#define  PCI_X_STATUS_COMPLEX	0x00100000	/* Device Complexity */
-#define  PCI_X_STATUS_MAX_READ	0x00600000	/* Designed Max Memory Read Count */
-#define  PCI_X_STATUS_MAX_SPLIT	0x03800000	/* Designed Max Outstanding Split Transactions */
-#define  PCI_X_STATUS_MAX_CUM	0x1c000000	/* Designed Max Cumulative Read Size */
-#define  PCI_X_STATUS_SPL_ERR	0x20000000	/* Rcvd Split Completion Error Msg */
-#define  PCI_X_STATUS_266MHZ	0x40000000	/* 266 MHz capable */
-#define  PCI_X_STATUS_533MHZ	0x80000000	/* 533 MHz capable */
-#define PCI_X_ECC_CSR		8	/* ECC control and status */
-#define PCI_CAP_PCIX_SIZEOF_V0	8	/* size of registers for Version 0 */
-#define PCI_CAP_PCIX_SIZEOF_V1	24	/* size for Version 1 */
-#define PCI_CAP_PCIX_SIZEOF_V2	PCI_CAP_PCIX_SIZEOF_V1	/* Same for v2 */
-
-/* PCI-X registers (Type 1 (bridge) devices) */
-
-#define PCI_X_BRIDGE_SSTATUS	2	/* Secondary Status */
-#define  PCI_X_SSTATUS_64BIT	0x0001	/* Secondary AD interface is 64 bits */
-#define  PCI_X_SSTATUS_133MHZ	0x0002	/* 133 MHz capable */
-#define  PCI_X_SSTATUS_FREQ	0x03c0	/* Secondary Bus Mode and Frequency */
-#define  PCI_X_SSTATUS_VERS	0x3000	/* PCI-X Capability Version */
-#define  PCI_X_SSTATUS_V1	0x1000	/* Mode 2, not Mode 1 */
-#define  PCI_X_SSTATUS_V2	0x2000	/* Mode 1 or Modes 1 and 2 */
-#define  PCI_X_SSTATUS_266MHZ	0x4000	/* 266 MHz capable */
-#define  PCI_X_SSTATUS_533MHZ	0x8000	/* 533 MHz capable */
-#define PCI_X_BRIDGE_STATUS	4	/* Bridge Status */
-
-/* PCI Bridge Subsystem ID registers */
-
-#define PCI_SSVID_VENDOR_ID     4	/* PCI Bridge subsystem vendor ID */
-#define PCI_SSVID_DEVICE_ID     6	/* PCI Bridge subsystem device ID */
-
-/* PCI Express capability registers */
-
-#define PCI_EXP_FLAGS		2	/* Capabilities register */
-#define PCI_EXP_FLAGS_VERS	0x000f	/* Capability version */
-#define PCI_EXP_FLAGS_TYPE	0x00f0	/* Device/Port type */
-#define  PCI_EXP_TYPE_ENDPOINT	0x0	/* Express Endpoint */
-#define  PCI_EXP_TYPE_LEG_END	0x1	/* Legacy Endpoint */
-#define  PCI_EXP_TYPE_ROOT_PORT 0x4	/* Root Port */
-#define  PCI_EXP_TYPE_UPSTREAM	0x5	/* Upstream Port */
-#define  PCI_EXP_TYPE_DOWNSTREAM 0x6	/* Downstream Port */
-#define  PCI_EXP_TYPE_PCI_BRIDGE 0x7	/* PCIe to PCI/PCI-X Bridge */
-#define  PCI_EXP_TYPE_PCIE_BRIDGE 0x8	/* PCI/PCI-X to PCIe Bridge */
-#define  PCI_EXP_TYPE_RC_END	0x9	/* Root Complex Integrated Endpoint */
-#define  PCI_EXP_TYPE_RC_EC	0xa	/* Root Complex Event Collector */
-#define PCI_EXP_FLAGS_SLOT	0x0100	/* Slot implemented */
-#define PCI_EXP_FLAGS_IRQ	0x3e00	/* Interrupt message number */
-#define PCI_EXP_DEVCAP		4	/* Device capabilities */
-#define  PCI_EXP_DEVCAP_PAYLOAD	0x00000007 /* Max_Payload_Size */
-#define  PCI_EXP_DEVCAP_PHANTOM	0x00000018 /* Phantom functions */
-#define  PCI_EXP_DEVCAP_EXT_TAG	0x00000020 /* Extended tags */
-#define  PCI_EXP_DEVCAP_L0S	0x000001c0 /* L0s Acceptable Latency */
-#define  PCI_EXP_DEVCAP_L1	0x00000e00 /* L1 Acceptable Latency */
-#define  PCI_EXP_DEVCAP_ATN_BUT	0x00001000 /* Attention Button Present */
-#define  PCI_EXP_DEVCAP_ATN_IND	0x00002000 /* Attention Indicator Present */
-#define  PCI_EXP_DEVCAP_PWR_IND	0x00004000 /* Power Indicator Present */
-#define  PCI_EXP_DEVCAP_RBER	0x00008000 /* Role-Based Error Reporting */
-#define  PCI_EXP_DEVCAP_PWR_VAL	0x03fc0000 /* Slot Power Limit Value */
-#define  PCI_EXP_DEVCAP_PWR_SCL	0x0c000000 /* Slot Power Limit Scale */
-#define  PCI_EXP_DEVCAP_FLR     0x10000000 /* Function Level Reset */
-#define PCI_EXP_DEVCTL		8	/* Device Control */
-#define  PCI_EXP_DEVCTL_CERE	0x0001	/* Correctable Error Reporting En. */
-#define  PCI_EXP_DEVCTL_NFERE	0x0002	/* Non-Fatal Error Reporting Enable */
-#define  PCI_EXP_DEVCTL_FERE	0x0004	/* Fatal Error Reporting Enable */
-#define  PCI_EXP_DEVCTL_URRE	0x0008	/* Unsupported Request Reporting En. */
-#define  PCI_EXP_DEVCTL_RELAX_EN 0x0010 /* Enable relaxed ordering */
-#define  PCI_EXP_DEVCTL_PAYLOAD	0x00e0	/* Max_Payload_Size */
-#define  PCI_EXP_DEVCTL_EXT_TAG	0x0100	/* Extended Tag Field Enable */
-#define  PCI_EXP_DEVCTL_PHANTOM	0x0200	/* Phantom Functions Enable */
-#define  PCI_EXP_DEVCTL_AUX_PME	0x0400	/* Auxiliary Power PM Enable */
-#define  PCI_EXP_DEVCTL_NOSNOOP_EN 0x0800  /* Enable No Snoop */
-#define  PCI_EXP_DEVCTL_READRQ	0x7000	/* Max_Read_Request_Size */
-#define  PCI_EXP_DEVCTL_READRQ_128B  0x0000 /* 128 Bytes */
-#define  PCI_EXP_DEVCTL_READRQ_256B  0x1000 /* 256 Bytes */
-#define  PCI_EXP_DEVCTL_READRQ_512B  0x2000 /* 512 Bytes */
-#define  PCI_EXP_DEVCTL_READRQ_1024B 0x3000 /* 1024 Bytes */
-#define  PCI_EXP_DEVCTL_BCR_FLR 0x8000  /* Bridge Configuration Retry / FLR */
-#define PCI_EXP_DEVSTA		10	/* Device Status */
-#define  PCI_EXP_DEVSTA_CED	0x0001	/* Correctable Error Detected */
-#define  PCI_EXP_DEVSTA_NFED	0x0002	/* Non-Fatal Error Detected */
-#define  PCI_EXP_DEVSTA_FED	0x0004	/* Fatal Error Detected */
-#define  PCI_EXP_DEVSTA_URD	0x0008	/* Unsupported Request Detected */
-#define  PCI_EXP_DEVSTA_AUXPD	0x0010	/* AUX Power Detected */
-#define  PCI_EXP_DEVSTA_TRPND	0x0020	/* Transactions Pending */
-#define PCI_EXP_LNKCAP		12	/* Link Capabilities */
-#define  PCI_EXP_LNKCAP_SLS	0x0000000f /* Supported Link Speeds */
-#define  PCI_EXP_LNKCAP_SLS_2_5GB 0x00000001 /* LNKCAP2 SLS Vector bit 0 */
-#define  PCI_EXP_LNKCAP_SLS_5_0GB 0x00000002 /* LNKCAP2 SLS Vector bit 1 */
-#define  PCI_EXP_LNKCAP_MLW	0x000003f0 /* Maximum Link Width */
-#define  PCI_EXP_LNKCAP_ASPMS	0x00000c00 /* ASPM Support */
-#define  PCI_EXP_LNKCAP_L0SEL	0x00007000 /* L0s Exit Latency */
-#define  PCI_EXP_LNKCAP_L1EL	0x00038000 /* L1 Exit Latency */
-#define  PCI_EXP_LNKCAP_CLKPM	0x00040000 /* Clock Power Management */
-#define  PCI_EXP_LNKCAP_SDERC	0x00080000 /* Surprise Down Error Reporting Capable */
-#define  PCI_EXP_LNKCAP_DLLLARC	0x00100000 /* Data Link Layer Link Active Reporting Capable */
-#define  PCI_EXP_LNKCAP_LBNC	0x00200000 /* Link Bandwidth Notification Capability */
-#define  PCI_EXP_LNKCAP_PN	0xff000000 /* Port Number */
-#define PCI_EXP_LNKCTL		16	/* Link Control */
-#define  PCI_EXP_LNKCTL_ASPMC	0x0003	/* ASPM Control */
-#define  PCI_EXP_LNKCTL_ASPM_L0S 0x0001	/* L0s Enable */
-#define  PCI_EXP_LNKCTL_ASPM_L1  0x0002	/* L1 Enable */
-#define  PCI_EXP_LNKCTL_RCB	0x0008	/* Read Completion Boundary */
-#define  PCI_EXP_LNKCTL_LD	0x0010	/* Link Disable */
-#define  PCI_EXP_LNKCTL_RL	0x0020	/* Retrain Link */
-#define  PCI_EXP_LNKCTL_CCC	0x0040	/* Common Clock Configuration */
-#define  PCI_EXP_LNKCTL_ES	0x0080	/* Extended Synch */
-#define  PCI_EXP_LNKCTL_CLKREQ_EN 0x0100 /* Enable clkreq */
-#define  PCI_EXP_LNKCTL_HAWD	0x0200	/* Hardware Autonomous Width Disable */
-#define  PCI_EXP_LNKCTL_LBMIE	0x0400	/* Link Bandwidth Management Interrupt Enable */
-#define  PCI_EXP_LNKCTL_LABIE	0x0800	/* Link Autonomous Bandwidth Interrupt Enable */
-#define PCI_EXP_LNKSTA		18	/* Link Status */
-#define  PCI_EXP_LNKSTA_CLS	0x000f	/* Current Link Speed */
-#define  PCI_EXP_LNKSTA_CLS_2_5GB 0x0001 /* Current Link Speed 2.5GT/s */
-#define  PCI_EXP_LNKSTA_CLS_5_0GB 0x0002 /* Current Link Speed 5.0GT/s */
-#define  PCI_EXP_LNKSTA_CLS_8_0GB 0x0003 /* Current Link Speed 8.0GT/s */
-#define  PCI_EXP_LNKSTA_NLW	0x03f0	/* Negotiated Link Width */
-#define  PCI_EXP_LNKSTA_NLW_X1	0x0010	/* Current Link Width x1 */
-#define  PCI_EXP_LNKSTA_NLW_X2	0x0020	/* Current Link Width x2 */
-#define  PCI_EXP_LNKSTA_NLW_X4	0x0040	/* Current Link Width x4 */
-#define  PCI_EXP_LNKSTA_NLW_X8	0x0080	/* Current Link Width x8 */
-#define  PCI_EXP_LNKSTA_NLW_SHIFT 4	/* start of NLW mask in link status */
-#define  PCI_EXP_LNKSTA_LT	0x0800	/* Link Training */
-#define  PCI_EXP_LNKSTA_SLC	0x1000	/* Slot Clock Configuration */
-#define  PCI_EXP_LNKSTA_DLLLA	0x2000	/* Data Link Layer Link Active */
-#define  PCI_EXP_LNKSTA_LBMS	0x4000	/* Link Bandwidth Management Status */
-#define  PCI_EXP_LNKSTA_LABS	0x8000	/* Link Autonomous Bandwidth Status */
-#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V1	20	/* v1 endpoints end here */
-#define PCI_EXP_SLTCAP		20	/* Slot Capabilities */
-#define  PCI_EXP_SLTCAP_ABP	0x00000001 /* Attention Button Present */
-#define  PCI_EXP_SLTCAP_PCP	0x00000002 /* Power Controller Present */
-#define  PCI_EXP_SLTCAP_MRLSP	0x00000004 /* MRL Sensor Present */
-#define  PCI_EXP_SLTCAP_AIP	0x00000008 /* Attention Indicator Present */
-#define  PCI_EXP_SLTCAP_PIP	0x00000010 /* Power Indicator Present */
-#define  PCI_EXP_SLTCAP_HPS	0x00000020 /* Hot-Plug Surprise */
-#define  PCI_EXP_SLTCAP_HPC	0x00000040 /* Hot-Plug Capable */
-#define  PCI_EXP_SLTCAP_SPLV	0x00007f80 /* Slot Power Limit Value */
-#define  PCI_EXP_SLTCAP_SPLS	0x00018000 /* Slot Power Limit Scale */
-#define  PCI_EXP_SLTCAP_EIP	0x00020000 /* Electromechanical Interlock Present */
-#define  PCI_EXP_SLTCAP_NCCS	0x00040000 /* No Command Completed Support */
-#define  PCI_EXP_SLTCAP_PSN	0xfff80000 /* Physical Slot Number */
-#define PCI_EXP_SLTCTL		24	/* Slot Control */
-#define  PCI_EXP_SLTCTL_ABPE	0x0001	/* Attention Button Pressed Enable */
-#define  PCI_EXP_SLTCTL_PFDE	0x0002	/* Power Fault Detected Enable */
-#define  PCI_EXP_SLTCTL_MRLSCE	0x0004	/* MRL Sensor Changed Enable */
-#define  PCI_EXP_SLTCTL_PDCE	0x0008	/* Presence Detect Changed Enable */
-#define  PCI_EXP_SLTCTL_CCIE	0x0010	/* Command Completed Interrupt Enable */
-#define  PCI_EXP_SLTCTL_HPIE	0x0020	/* Hot-Plug Interrupt Enable */
-#define  PCI_EXP_SLTCTL_AIC	0x00c0	/* Attention Indicator Control */
-#define  PCI_EXP_SLTCTL_ATTN_IND_ON    0x0040 /* Attention Indicator on */
-#define  PCI_EXP_SLTCTL_ATTN_IND_BLINK 0x0080 /* Attention Indicator blinking */
-#define  PCI_EXP_SLTCTL_ATTN_IND_OFF   0x00c0 /* Attention Indicator off */
-#define  PCI_EXP_SLTCTL_PIC	0x0300	/* Power Indicator Control */
-#define  PCI_EXP_SLTCTL_PWR_IND_ON     0x0100 /* Power Indicator on */
-#define  PCI_EXP_SLTCTL_PWR_IND_BLINK  0x0200 /* Power Indicator blinking */
-#define  PCI_EXP_SLTCTL_PWR_IND_OFF    0x0300 /* Power Indicator off */
-#define  PCI_EXP_SLTCTL_PCC	0x0400	/* Power Controller Control */
-#define  PCI_EXP_SLTCTL_PWR_ON         0x0000 /* Power On */
-#define  PCI_EXP_SLTCTL_PWR_OFF        0x0400 /* Power Off */
-#define  PCI_EXP_SLTCTL_EIC	0x0800	/* Electromechanical Interlock Control */
-#define  PCI_EXP_SLTCTL_DLLSCE	0x1000	/* Data Link Layer State Changed Enable */
-#define PCI_EXP_SLTSTA		26	/* Slot Status */
-#define  PCI_EXP_SLTSTA_ABP	0x0001	/* Attention Button Pressed */
-#define  PCI_EXP_SLTSTA_PFD	0x0002	/* Power Fault Detected */
-#define  PCI_EXP_SLTSTA_MRLSC	0x0004	/* MRL Sensor Changed */
-#define  PCI_EXP_SLTSTA_PDC	0x0008	/* Presence Detect Changed */
-#define  PCI_EXP_SLTSTA_CC	0x0010	/* Command Completed */
-#define  PCI_EXP_SLTSTA_MRLSS	0x0020	/* MRL Sensor State */
-#define  PCI_EXP_SLTSTA_PDS	0x0040	/* Presence Detect State */
-#define  PCI_EXP_SLTSTA_EIS	0x0080	/* Electromechanical Interlock Status */
-#define  PCI_EXP_SLTSTA_DLLSC	0x0100	/* Data Link Layer State Changed */
-#define PCI_EXP_RTCTL		28	/* Root Control */
-#define  PCI_EXP_RTCTL_SECEE	0x0001	/* System Error on Correctable Error */
-#define  PCI_EXP_RTCTL_SENFEE	0x0002	/* System Error on Non-Fatal Error */
-#define  PCI_EXP_RTCTL_SEFEE	0x0004	/* System Error on Fatal Error */
-#define  PCI_EXP_RTCTL_PMEIE	0x0008	/* PME Interrupt Enable */
-#define  PCI_EXP_RTCTL_CRSSVE	0x0010	/* CRS Software Visibility Enable */
-#define PCI_EXP_RTCAP		30	/* Root Capabilities */
-#define  PCI_EXP_RTCAP_CRSVIS	0x0001	/* CRS Software Visibility capability */
-#define PCI_EXP_RTSTA		32	/* Root Status */
-#define PCI_EXP_RTSTA_PME	0x00010000 /* PME status */
-#define PCI_EXP_RTSTA_PENDING	0x00020000 /* PME pending */
-/*
- * The Device Capabilities 2, Device Status 2, Device Control 2,
- * Link Capabilities 2, Link Status 2, Link Control 2,
- * Slot Capabilities 2, Slot Status 2, and Slot Control 2 registers
- * are only present on devices with PCIe Capability version 2.
- * Use pcie_capability_read_word() and similar interfaces to use them
- * safely.
- */
-#define PCI_EXP_DEVCAP2		36	/* Device Capabilities 2 */
-#define  PCI_EXP_DEVCAP2_ARI		0x00000020 /* Alternative Routing-ID */
-#define  PCI_EXP_DEVCAP2_LTR		0x00000800 /* Latency tolerance reporting */
-#define  PCI_EXP_DEVCAP2_OBFF_MASK	0x000c0000 /* OBFF support mechanism */
-#define  PCI_EXP_DEVCAP2_OBFF_MSG	0x00040000 /* New message signaling */
-#define  PCI_EXP_DEVCAP2_OBFF_WAKE	0x00080000 /* Re-use WAKE# for OBFF */
-#define PCI_EXP_DEVCTL2		40	/* Device Control 2 */
-#define  PCI_EXP_DEVCTL2_COMP_TIMEOUT	0x000f	/* Completion Timeout Value */
-#define  PCI_EXP_DEVCTL2_ARI		0x0020	/* Alternative Routing-ID */
-#define  PCI_EXP_DEVCTL2_IDO_REQ_EN	0x0100	/* Allow IDO for requests */
-#define  PCI_EXP_DEVCTL2_IDO_CMP_EN	0x0200	/* Allow IDO for completions */
-#define  PCI_EXP_DEVCTL2_LTR_EN		0x0400	/* Enable LTR mechanism */
-#define  PCI_EXP_DEVCTL2_OBFF_MSGA_EN	0x2000	/* Enable OBFF Message type A */
-#define  PCI_EXP_DEVCTL2_OBFF_MSGB_EN	0x4000	/* Enable OBFF Message type B */
-#define  PCI_EXP_DEVCTL2_OBFF_WAKE_EN	0x6000	/* OBFF using WAKE# signaling */
-#define PCI_EXP_DEVSTA2		42	/* Device Status 2 */
-#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2	44	/* v2 endpoints end here */
-#define PCI_EXP_LNKCAP2		44	/* Link Capabilities 2 */
-#define  PCI_EXP_LNKCAP2_SLS_2_5GB	0x00000002 /* Supported Speed 2.5GT/s */
-#define  PCI_EXP_LNKCAP2_SLS_5_0GB	0x00000004 /* Supported Speed 5.0GT/s */
-#define  PCI_EXP_LNKCAP2_SLS_8_0GB	0x00000008 /* Supported Speed 8.0GT/s */
-#define  PCI_EXP_LNKCAP2_CROSSLINK	0x00000100 /* Crosslink supported */
-#define PCI_EXP_LNKCTL2		48	/* Link Control 2 */
-#define PCI_EXP_LNKSTA2		50	/* Link Status 2 */
-#define PCI_EXP_SLTCAP2		52	/* Slot Capabilities 2 */
-#define PCI_EXP_SLTCTL2		56	/* Slot Control 2 */
-#define PCI_EXP_SLTSTA2		58	/* Slot Status 2 */
-
-/* Extended Capabilities (PCI-X 2.0 and Express) */
-#define PCI_EXT_CAP_ID(header)		(header & 0x0000ffff)
-#define PCI_EXT_CAP_VER(header)		((header >> 16) & 0xf)
-#define PCI_EXT_CAP_NEXT(header)	((header >> 20) & 0xffc)
-
-#define PCI_EXT_CAP_ID_ERR	0x01	/* Advanced Error Reporting */
-#define PCI_EXT_CAP_ID_VC	0x02	/* Virtual Channel Capability */
-#define PCI_EXT_CAP_ID_DSN	0x03	/* Device Serial Number */
-#define PCI_EXT_CAP_ID_PWR	0x04	/* Power Budgeting */
-#define PCI_EXT_CAP_ID_RCLD	0x05	/* Root Complex Link Declaration */
-#define PCI_EXT_CAP_ID_RCILC	0x06	/* Root Complex Internal Link Control */
-#define PCI_EXT_CAP_ID_RCEC	0x07	/* Root Complex Event Collector */
-#define PCI_EXT_CAP_ID_MFVC	0x08	/* Multi-Function VC Capability */
-#define PCI_EXT_CAP_ID_VC9	0x09	/* same as _VC */
-#define PCI_EXT_CAP_ID_RCRB	0x0A	/* Root Complex RB? */
-#define PCI_EXT_CAP_ID_VNDR	0x0B	/* Vendor-Specific */
-#define PCI_EXT_CAP_ID_CAC	0x0C	/* Config Access - obsolete */
-#define PCI_EXT_CAP_ID_ACS	0x0D	/* Access Control Services */
-#define PCI_EXT_CAP_ID_ARI	0x0E	/* Alternate Routing ID */
-#define PCI_EXT_CAP_ID_ATS	0x0F	/* Address Translation Services */
-#define PCI_EXT_CAP_ID_SRIOV	0x10	/* Single Root I/O Virtualization */
-#define PCI_EXT_CAP_ID_MRIOV	0x11	/* Multi Root I/O Virtualization */
-#define PCI_EXT_CAP_ID_MCAST	0x12	/* Multicast */
-#define PCI_EXT_CAP_ID_PRI	0x13	/* Page Request Interface */
-#define PCI_EXT_CAP_ID_AMD_XXX	0x14	/* Reserved for AMD */
-#define PCI_EXT_CAP_ID_REBAR	0x15	/* Resizable BAR */
-#define PCI_EXT_CAP_ID_DPA	0x16	/* Dynamic Power Allocation */
-#define PCI_EXT_CAP_ID_TPH	0x17	/* TPH Requester */
-#define PCI_EXT_CAP_ID_LTR	0x18	/* Latency Tolerance Reporting */
-#define PCI_EXT_CAP_ID_SECPCI	0x19	/* Secondary PCIe Capability */
-#define PCI_EXT_CAP_ID_PMUX	0x1A	/* Protocol Multiplexing */
-#define PCI_EXT_CAP_ID_PASID	0x1B	/* Process Address Space ID */
-#define PCI_EXT_CAP_ID_MAX	PCI_EXT_CAP_ID_PASID
-
-#define PCI_EXT_CAP_DSN_SIZEOF	12
-#define PCI_EXT_CAP_MCAST_ENDPOINT_SIZEOF 40
-
-/* Advanced Error Reporting */
-#define PCI_ERR_UNCOR_STATUS	4	/* Uncorrectable Error Status */
-#define  PCI_ERR_UNC_UND	0x00000001	/* Undefined */
-#define  PCI_ERR_UNC_DLP	0x00000010	/* Data Link Protocol */
-#define  PCI_ERR_UNC_SURPDN	0x00000020	/* Surprise Down */
-#define  PCI_ERR_UNC_POISON_TLP	0x00001000	/* Poisoned TLP */
-#define  PCI_ERR_UNC_FCP	0x00002000	/* Flow Control Protocol */
-#define  PCI_ERR_UNC_COMP_TIME	0x00004000	/* Completion Timeout */
-#define  PCI_ERR_UNC_COMP_ABORT	0x00008000	/* Completer Abort */
-#define  PCI_ERR_UNC_UNX_COMP	0x00010000	/* Unexpected Completion */
-#define  PCI_ERR_UNC_RX_OVER	0x00020000	/* Receiver Overflow */
-#define  PCI_ERR_UNC_MALF_TLP	0x00040000	/* Malformed TLP */
-#define  PCI_ERR_UNC_ECRC	0x00080000	/* ECRC Error Status */
-#define  PCI_ERR_UNC_UNSUP	0x00100000	/* Unsupported Request */
-#define  PCI_ERR_UNC_ACSV	0x00200000	/* ACS Violation */
-#define  PCI_ERR_UNC_INTN	0x00400000	/* internal error */
-#define  PCI_ERR_UNC_MCBTLP	0x00800000	/* MC blocked TLP */
-#define  PCI_ERR_UNC_ATOMEG	0x01000000	/* Atomic egress blocked */
-#define  PCI_ERR_UNC_TLPPRE	0x02000000	/* TLP prefix blocked */
-#define PCI_ERR_UNCOR_MASK	8	/* Uncorrectable Error Mask */
-	/* Same bits as above */
-#define PCI_ERR_UNCOR_SEVER	12	/* Uncorrectable Error Severity */
-	/* Same bits as above */
-#define PCI_ERR_COR_STATUS	16	/* Correctable Error Status */
-#define  PCI_ERR_COR_RCVR	0x00000001	/* Receiver Error Status */
-#define  PCI_ERR_COR_BAD_TLP	0x00000040	/* Bad TLP Status */
-#define  PCI_ERR_COR_BAD_DLLP	0x00000080	/* Bad DLLP Status */
-#define  PCI_ERR_COR_REP_ROLL	0x00000100	/* REPLAY_NUM Rollover */
-#define  PCI_ERR_COR_REP_TIMER	0x00001000	/* Replay Timer Timeout */
-#define  PCI_ERR_COR_ADV_NFAT	0x00002000	/* Advisory Non-Fatal */
-#define  PCI_ERR_COR_INTERNAL	0x00004000	/* Corrected Internal */
-#define  PCI_ERR_COR_LOG_OVER	0x00008000	/* Header Log Overflow */
-#define PCI_ERR_COR_MASK	20	/* Correctable Error Mask */
-	/* Same bits as above */
-#define PCI_ERR_CAP		24	/* Advanced Error Capabilities */
-#define  PCI_ERR_CAP_FEP(x)	((x) & 31)	/* First Error Pointer */
-#define  PCI_ERR_CAP_ECRC_GENC	0x00000020	/* ECRC Generation Capable */
-#define  PCI_ERR_CAP_ECRC_GENE	0x00000040	/* ECRC Generation Enable */
-#define  PCI_ERR_CAP_ECRC_CHKC	0x00000080	/* ECRC Check Capable */
-#define  PCI_ERR_CAP_ECRC_CHKE	0x00000100	/* ECRC Check Enable */
-#define PCI_ERR_HEADER_LOG	28	/* Header Log Register (16 bytes) */
-#define PCI_ERR_ROOT_COMMAND	44	/* Root Error Command */
-/* Correctable Err Reporting Enable */
-#define PCI_ERR_ROOT_CMD_COR_EN		0x00000001
-/* Non-fatal Err Reporting Enable */
-#define PCI_ERR_ROOT_CMD_NONFATAL_EN	0x00000002
-/* Fatal Err Reporting Enable */
-#define PCI_ERR_ROOT_CMD_FATAL_EN	0x00000004
-#define PCI_ERR_ROOT_STATUS	48
-#define PCI_ERR_ROOT_COR_RCV		0x00000001	/* ERR_COR Received */
-/* Multi ERR_COR Received */
-#define PCI_ERR_ROOT_MULTI_COR_RCV	0x00000002
-/* ERR_FATAL/NONFATAL Received */
-#define PCI_ERR_ROOT_UNCOR_RCV		0x00000004
-/* Multi ERR_FATAL/NONFATAL Received */
-#define PCI_ERR_ROOT_MULTI_UNCOR_RCV	0x00000008
-#define PCI_ERR_ROOT_FIRST_FATAL	0x00000010	/* First Fatal */
-#define PCI_ERR_ROOT_NONFATAL_RCV	0x00000020	/* Non-Fatal Received */
-#define PCI_ERR_ROOT_FATAL_RCV		0x00000040	/* Fatal Received */
-#define PCI_ERR_ROOT_ERR_SRC	52	/* Error Source Identification */
-
-/* Virtual Channel */
-#define PCI_VC_PORT_CAP1	4
-#define  PCI_VC_CAP1_EVCC	0x00000007	/* extended VC count */
-#define  PCI_VC_CAP1_LPEVCC	0x00000070	/* low prio extended VC count */
-#define  PCI_VC_CAP1_ARB_SIZE	0x00000c00
-#define PCI_VC_PORT_CAP2	8
-#define  PCI_VC_CAP2_32_PHASE		0x00000002
-#define  PCI_VC_CAP2_64_PHASE		0x00000004
-#define  PCI_VC_CAP2_128_PHASE		0x00000008
-#define  PCI_VC_CAP2_ARB_OFF		0xff000000
-#define PCI_VC_PORT_CTRL	12
-#define  PCI_VC_PORT_CTRL_LOAD_TABLE	0x00000001
-#define PCI_VC_PORT_STATUS	14
-#define  PCI_VC_PORT_STATUS_TABLE	0x00000001
-#define PCI_VC_RES_CAP		16
-#define  PCI_VC_RES_CAP_32_PHASE	0x00000002
-#define  PCI_VC_RES_CAP_64_PHASE	0x00000004
-#define  PCI_VC_RES_CAP_128_PHASE	0x00000008
-#define  PCI_VC_RES_CAP_128_PHASE_TB	0x00000010
-#define  PCI_VC_RES_CAP_256_PHASE	0x00000020
-#define  PCI_VC_RES_CAP_ARB_OFF		0xff000000
-#define PCI_VC_RES_CTRL		20
-#define  PCI_VC_RES_CTRL_LOAD_TABLE	0x00010000
-#define  PCI_VC_RES_CTRL_ARB_SELECT	0x000e0000
-#define  PCI_VC_RES_CTRL_ID		0x07000000
-#define  PCI_VC_RES_CTRL_ENABLE		0x80000000
-#define PCI_VC_RES_STATUS	26
-#define  PCI_VC_RES_STATUS_TABLE	0x00000001
-#define  PCI_VC_RES_STATUS_NEGO		0x00000002
-#define PCI_CAP_VC_BASE_SIZEOF		0x10
-#define PCI_CAP_VC_PER_VC_SIZEOF	0x0C
-
-/* Power Budgeting */
-#define PCI_PWR_DSR		4	/* Data Select Register */
-#define PCI_PWR_DATA		8	/* Data Register */
-#define  PCI_PWR_DATA_BASE(x)	((x) & 0xff)	    /* Base Power */
-#define  PCI_PWR_DATA_SCALE(x)	(((x) >> 8) & 3)    /* Data Scale */
-#define  PCI_PWR_DATA_PM_SUB(x)	(((x) >> 10) & 7)   /* PM Sub State */
-#define  PCI_PWR_DATA_PM_STATE(x) (((x) >> 13) & 3) /* PM State */
-#define  PCI_PWR_DATA_TYPE(x)	(((x) >> 15) & 7)   /* Type */
-#define  PCI_PWR_DATA_RAIL(x)	(((x) >> 18) & 7)   /* Power Rail */
-#define PCI_PWR_CAP		12	/* Capability */
-#define  PCI_PWR_CAP_BUDGET(x)	((x) & 1)	/* Included in system budget */
-#define PCI_EXT_CAP_PWR_SIZEOF	16
-
-/* Vendor-Specific (VSEC, PCI_EXT_CAP_ID_VNDR) */
-#define PCI_VNDR_HEADER		4	/* Vendor-Specific Header */
-#define  PCI_VNDR_HEADER_ID(x)	((x) & 0xffff)
-#define  PCI_VNDR_HEADER_REV(x)	(((x) >> 16) & 0xf)
-#define  PCI_VNDR_HEADER_LEN(x)	(((x) >> 20) & 0xfff)
-
-/*
- * HyperTransport sub capability types
- *
- * Unfortunately there are both 3 bit and 5 bit capability types defined
- * in the HT spec, catering for that is a little messy. You probably don't
- * want to use these directly, just use pci_find_ht_capability() and it
- * will do the right thing for you.
- */
-#define HT_3BIT_CAP_MASK	0xE0
-#define HT_CAPTYPE_SLAVE	0x00	/* Slave/Primary link configuration */
-#define HT_CAPTYPE_HOST		0x20	/* Host/Secondary link configuration */
-
-#define HT_5BIT_CAP_MASK	0xF8
-#define HT_CAPTYPE_IRQ		0x80	/* IRQ Configuration */
-#define HT_CAPTYPE_REMAPPING_40	0xA0	/* 40 bit address remapping */
-#define HT_CAPTYPE_REMAPPING_64 0xA2	/* 64 bit address remapping */
-#define HT_CAPTYPE_UNITID_CLUMP	0x90	/* Unit ID clumping */
-#define HT_CAPTYPE_EXTCONF	0x98	/* Extended Configuration Space Access */
-#define HT_CAPTYPE_MSI_MAPPING	0xA8	/* MSI Mapping Capability */
-#define  HT_MSI_FLAGS		0x02		/* Offset to flags */
-#define  HT_MSI_FLAGS_ENABLE	0x1		/* Mapping enable */
-#define  HT_MSI_FLAGS_FIXED	0x2		/* Fixed mapping only */
-#define  HT_MSI_FIXED_ADDR	0x00000000FEE00000ULL	/* Fixed addr */
-#define  HT_MSI_ADDR_LO		0x04		/* Offset to low addr bits */
-#define  HT_MSI_ADDR_LO_MASK	0xFFF00000	/* Low address bit mask */
-#define  HT_MSI_ADDR_HI		0x08		/* Offset to high addr bits */
-#define HT_CAPTYPE_DIRECT_ROUTE	0xB0	/* Direct routing configuration */
-#define HT_CAPTYPE_VCSET	0xB8	/* Virtual Channel configuration */
-#define HT_CAPTYPE_ERROR_RETRY	0xC0	/* Retry on error configuration */
-#define HT_CAPTYPE_GEN3		0xD0	/* Generation 3 HyperTransport configuration */
-#define HT_CAPTYPE_PM		0xE0	/* HyperTransport power management configuration */
-#define HT_CAP_SIZEOF_LONG	28	/* slave & primary */
-#define HT_CAP_SIZEOF_SHORT	24	/* host & secondary */
-
-/* Alternative Routing-ID Interpretation */
-#define PCI_ARI_CAP		0x04	/* ARI Capability Register */
-#define  PCI_ARI_CAP_MFVC	0x0001	/* MFVC Function Groups Capability */
-#define  PCI_ARI_CAP_ACS	0x0002	/* ACS Function Groups Capability */
-#define  PCI_ARI_CAP_NFN(x)	(((x) >> 8) & 0xff) /* Next Function Number */
-#define PCI_ARI_CTRL		0x06	/* ARI Control Register */
-#define  PCI_ARI_CTRL_MFVC	0x0001	/* MFVC Function Groups Enable */
-#define  PCI_ARI_CTRL_ACS	0x0002	/* ACS Function Groups Enable */
-#define  PCI_ARI_CTRL_FG(x)	(((x) >> 4) & 7) /* Function Group */
-#define PCI_EXT_CAP_ARI_SIZEOF	8
-
-/* Address Translation Service */
-#define PCI_ATS_CAP		0x04	/* ATS Capability Register */
-#define  PCI_ATS_CAP_QDEP(x)	((x) & 0x1f)	/* Invalidate Queue Depth */
-#define  PCI_ATS_MAX_QDEP	32	/* Max Invalidate Queue Depth */
-#define PCI_ATS_CTRL		0x06	/* ATS Control Register */
-#define  PCI_ATS_CTRL_ENABLE	0x8000	/* ATS Enable */
-#define  PCI_ATS_CTRL_STU(x)	((x) & 0x1f)	/* Smallest Translation Unit */
-#define  PCI_ATS_MIN_STU	12	/* shift of minimum STU block */
-#define PCI_EXT_CAP_ATS_SIZEOF	8
-
-/* Page Request Interface */
-#define PCI_PRI_CTRL		0x04	/* PRI control register */
-#define  PCI_PRI_CTRL_ENABLE	0x01	/* Enable */
-#define  PCI_PRI_CTRL_RESET	0x02	/* Reset */
-#define PCI_PRI_STATUS		0x06	/* PRI status register */
-#define  PCI_PRI_STATUS_RF	0x001	/* Response Failure */
-#define  PCI_PRI_STATUS_UPRGI	0x002	/* Unexpected PRG index */
-#define  PCI_PRI_STATUS_STOPPED	0x100	/* PRI Stopped */
-#define PCI_PRI_MAX_REQ		0x08	/* PRI max reqs supported */
-#define PCI_PRI_ALLOC_REQ	0x0c	/* PRI max reqs allowed */
-#define PCI_EXT_CAP_PRI_SIZEOF	16
-
-/* Process Address Space ID */
-#define PCI_PASID_CAP		0x04    /* PASID feature register */
-#define  PCI_PASID_CAP_EXEC	0x02	/* Exec permissions Supported */
-#define  PCI_PASID_CAP_PRIV	0x04	/* Privilege Mode Supported */
-#define PCI_PASID_CTRL		0x06    /* PASID control register */
-#define  PCI_PASID_CTRL_ENABLE	0x01	/* Enable bit */
-#define  PCI_PASID_CTRL_EXEC	0x02	/* Exec permissions Enable */
-#define  PCI_PASID_CTRL_PRIV	0x04	/* Privilege Mode Enable */
-#define PCI_EXT_CAP_PASID_SIZEOF	8
-
-/* Single Root I/O Virtualization */
-#define PCI_SRIOV_CAP		0x04	/* SR-IOV Capabilities */
-#define  PCI_SRIOV_CAP_VFM	0x01	/* VF Migration Capable */
-#define  PCI_SRIOV_CAP_INTR(x)	((x) >> 21) /* Interrupt Message Number */
-#define PCI_SRIOV_CTRL		0x08	/* SR-IOV Control */
-#define  PCI_SRIOV_CTRL_VFE	0x01	/* VF Enable */
-#define  PCI_SRIOV_CTRL_VFM	0x02	/* VF Migration Enable */
-#define  PCI_SRIOV_CTRL_INTR	0x04	/* VF Migration Interrupt Enable */
-#define  PCI_SRIOV_CTRL_MSE	0x08	/* VF Memory Space Enable */
-#define  PCI_SRIOV_CTRL_ARI	0x10	/* ARI Capable Hierarchy */
-#define PCI_SRIOV_STATUS	0x0a	/* SR-IOV Status */
-#define  PCI_SRIOV_STATUS_VFM	0x01	/* VF Migration Status */
-#define PCI_SRIOV_INITIAL_VF	0x0c	/* Initial VFs */
-#define PCI_SRIOV_TOTAL_VF	0x0e	/* Total VFs */
-#define PCI_SRIOV_NUM_VF	0x10	/* Number of VFs */
-#define PCI_SRIOV_FUNC_LINK	0x12	/* Function Dependency Link */
-#define PCI_SRIOV_VF_OFFSET	0x14	/* First VF Offset */
-#define PCI_SRIOV_VF_STRIDE	0x16	/* Following VF Stride */
-#define PCI_SRIOV_VF_DID	0x1a	/* VF Device ID */
-#define PCI_SRIOV_SUP_PGSIZE	0x1c	/* Supported Page Sizes */
-#define PCI_SRIOV_SYS_PGSIZE	0x20	/* System Page Size */
-#define PCI_SRIOV_BAR		0x24	/* VF BAR0 */
-#define  PCI_SRIOV_NUM_BARS	6	/* Number of VF BARs */
-#define PCI_SRIOV_VFM		0x3c	/* VF Migration State Array Offset*/
-#define  PCI_SRIOV_VFM_BIR(x)	((x) & 7)	/* State BIR */
-#define  PCI_SRIOV_VFM_OFFSET(x) ((x) & ~7)	/* State Offset */
-#define  PCI_SRIOV_VFM_UA	0x0	/* Inactive.Unavailable */
-#define  PCI_SRIOV_VFM_MI	0x1	/* Dormant.MigrateIn */
-#define  PCI_SRIOV_VFM_MO	0x2	/* Active.MigrateOut */
-#define  PCI_SRIOV_VFM_AV	0x3	/* Active.Available */
-#define PCI_EXT_CAP_SRIOV_SIZEOF 64
-
-#define PCI_LTR_MAX_SNOOP_LAT	0x4
-#define PCI_LTR_MAX_NOSNOOP_LAT	0x6
-#define  PCI_LTR_VALUE_MASK	0x000003ff
-#define  PCI_LTR_SCALE_MASK	0x00001c00
-#define  PCI_LTR_SCALE_SHIFT	10
-#define PCI_EXT_CAP_LTR_SIZEOF	8
-
-/* Access Control Service */
-#define PCI_ACS_CAP		0x04	/* ACS Capability Register */
-#define  PCI_ACS_SV		0x01	/* Source Validation */
-#define  PCI_ACS_TB		0x02	/* Translation Blocking */
-#define  PCI_ACS_RR		0x04	/* P2P Request Redirect */
-#define  PCI_ACS_CR		0x08	/* P2P Completion Redirect */
-#define  PCI_ACS_UF		0x10	/* Upstream Forwarding */
-#define  PCI_ACS_EC		0x20	/* P2P Egress Control */
-#define  PCI_ACS_DT		0x40	/* Direct Translated P2P */
-#define PCI_ACS_EGRESS_BITS	0x05	/* ACS Egress Control Vector Size */
-#define PCI_ACS_CTRL		0x06	/* ACS Control Register */
-#define PCI_ACS_EGRESS_CTL_V	0x08	/* ACS Egress Control Vector */
-
-#define PCI_VSEC_HDR		4	/* extended cap - vendor-specific */
-#define  PCI_VSEC_HDR_LEN_SHIFT	20	/* shift for length field */
-
-/* SATA capability */
-#define PCI_SATA_REGS		4	/* SATA REGs specifier */
-#define  PCI_SATA_REGS_MASK	0xF	/* location - BAR#/inline */
-#define  PCI_SATA_REGS_INLINE	0xF	/* REGS in config space */
-#define PCI_SATA_SIZEOF_SHORT	8
-#define PCI_SATA_SIZEOF_LONG	16
-
-/* Resizable BARs */
-#define PCI_REBAR_CTRL		8	/* control register */
-#define  PCI_REBAR_CTRL_NBAR_MASK	(7 << 5)	/* mask for # bars */
-#define  PCI_REBAR_CTRL_NBAR_SHIFT	5	/* shift for # bars */
-
-/* Dynamic Power Allocation */
-#define PCI_DPA_CAP		4	/* capability register */
-#define  PCI_DPA_CAP_SUBSTATE_MASK	0x1F	/* # substates - 1 */
-#define PCI_DPA_BASE_SIZEOF	16	/* size with 0 substates */
-
-/* TPH Requester */
-#define PCI_TPH_CAP		4	/* capability register */
-#define  PCI_TPH_CAP_LOC_MASK	0x600	/* location mask */
-#define   PCI_TPH_LOC_NONE	0x000	/* no location */
-#define   PCI_TPH_LOC_CAP	0x200	/* in capability */
-#define   PCI_TPH_LOC_MSIX	0x400	/* in MSI-X */
-#define PCI_TPH_CAP_ST_MASK	0x07FF0000	/* st table mask */
-#define PCI_TPH_CAP_ST_SHIFT	16	/* st table shift */
-#define PCI_TPH_BASE_SIZEOF	12	/* size with no st table */
-
-#endif /* LINUX_PCI_REGS_H */
diff --git a/openflow/usr/include/linux/perf_event.h b/openflow/usr/include/linux/perf_event.h
deleted file mode 100644
index 42b9195..0000000
--- a/openflow/usr/include/linux/perf_event.h
+++ /dev/null
@@ -1,970 +0,0 @@
-/*
- * Performance events:
- *
- *    Copyright (C) 2008-2009, Thomas Gleixner <tglx@linutronix.de>
- *    Copyright (C) 2008-2011, Red Hat, Inc., Ingo Molnar
- *    Copyright (C) 2008-2011, Red Hat, Inc., Peter Zijlstra
- *
- * Data type definitions, declarations, prototypes.
- *
- *    Started by: Thomas Gleixner and Ingo Molnar
- *
- * For licencing details see kernel-base/COPYING
- */
-#ifndef _LINUX_PERF_EVENT_H
-#define _LINUX_PERF_EVENT_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-#include <asm/byteorder.h>
-
-/*
- * User-space ABI bits:
- */
-
-/*
- * attr.type
- */
-enum perf_type_id {
-	PERF_TYPE_HARDWARE			= 0,
-	PERF_TYPE_SOFTWARE			= 1,
-	PERF_TYPE_TRACEPOINT			= 2,
-	PERF_TYPE_HW_CACHE			= 3,
-	PERF_TYPE_RAW				= 4,
-	PERF_TYPE_BREAKPOINT			= 5,
-
-	PERF_TYPE_MAX,				/* non-ABI */
-};
-
-/*
- * Generalized performance event event_id types, used by the
- * attr.event_id parameter of the sys_perf_event_open()
- * syscall:
- */
-enum perf_hw_id {
-	/*
-	 * Common hardware events, generalized by the kernel:
-	 */
-	PERF_COUNT_HW_CPU_CYCLES		= 0,
-	PERF_COUNT_HW_INSTRUCTIONS		= 1,
-	PERF_COUNT_HW_CACHE_REFERENCES		= 2,
-	PERF_COUNT_HW_CACHE_MISSES		= 3,
-	PERF_COUNT_HW_BRANCH_INSTRUCTIONS	= 4,
-	PERF_COUNT_HW_BRANCH_MISSES		= 5,
-	PERF_COUNT_HW_BUS_CYCLES		= 6,
-	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND	= 7,
-	PERF_COUNT_HW_STALLED_CYCLES_BACKEND	= 8,
-	PERF_COUNT_HW_REF_CPU_CYCLES		= 9,
-
-	PERF_COUNT_HW_MAX,			/* non-ABI */
-};
-
-/*
- * Generalized hardware cache events:
- *
- *       { L1-D, L1-I, LLC, ITLB, DTLB, BPU, NODE } x
- *       { read, write, prefetch } x
- *       { accesses, misses }
- */
-enum perf_hw_cache_id {
-	PERF_COUNT_HW_CACHE_L1D			= 0,
-	PERF_COUNT_HW_CACHE_L1I			= 1,
-	PERF_COUNT_HW_CACHE_LL			= 2,
-	PERF_COUNT_HW_CACHE_DTLB		= 3,
-	PERF_COUNT_HW_CACHE_ITLB		= 4,
-	PERF_COUNT_HW_CACHE_BPU			= 5,
-	PERF_COUNT_HW_CACHE_NODE		= 6,
-
-	PERF_COUNT_HW_CACHE_MAX,		/* non-ABI */
-};
-
-enum perf_hw_cache_op_id {
-	PERF_COUNT_HW_CACHE_OP_READ		= 0,
-	PERF_COUNT_HW_CACHE_OP_WRITE		= 1,
-	PERF_COUNT_HW_CACHE_OP_PREFETCH		= 2,
-
-	PERF_COUNT_HW_CACHE_OP_MAX,		/* non-ABI */
-};
-
-enum perf_hw_cache_op_result_id {
-	PERF_COUNT_HW_CACHE_RESULT_ACCESS	= 0,
-	PERF_COUNT_HW_CACHE_RESULT_MISS		= 1,
-
-	PERF_COUNT_HW_CACHE_RESULT_MAX,		/* non-ABI */
-};
-
-/*
- * Special "software" events provided by the kernel, even if the hardware
- * does not support performance events. These events measure various
- * physical and sw events of the kernel (and allow the profiling of them as
- * well):
- */
-enum perf_sw_ids {
-	PERF_COUNT_SW_CPU_CLOCK			= 0,
-	PERF_COUNT_SW_TASK_CLOCK		= 1,
-	PERF_COUNT_SW_PAGE_FAULTS		= 2,
-	PERF_COUNT_SW_CONTEXT_SWITCHES		= 3,
-	PERF_COUNT_SW_CPU_MIGRATIONS		= 4,
-	PERF_COUNT_SW_PAGE_FAULTS_MIN		= 5,
-	PERF_COUNT_SW_PAGE_FAULTS_MAJ		= 6,
-	PERF_COUNT_SW_ALIGNMENT_FAULTS		= 7,
-	PERF_COUNT_SW_EMULATION_FAULTS		= 8,
-	PERF_COUNT_SW_DUMMY			= 9,
-	PERF_COUNT_SW_BPF_OUTPUT		= 10,
-
-	PERF_COUNT_SW_MAX,			/* non-ABI */
-};
-
-/*
- * Bits that can be set in attr.sample_type to request information
- * in the overflow packets.
- */
-enum perf_event_sample_format {
-	PERF_SAMPLE_IP				= 1U << 0,
-	PERF_SAMPLE_TID				= 1U << 1,
-	PERF_SAMPLE_TIME			= 1U << 2,
-	PERF_SAMPLE_ADDR			= 1U << 3,
-	PERF_SAMPLE_READ			= 1U << 4,
-	PERF_SAMPLE_CALLCHAIN			= 1U << 5,
-	PERF_SAMPLE_ID				= 1U << 6,
-	PERF_SAMPLE_CPU				= 1U << 7,
-	PERF_SAMPLE_PERIOD			= 1U << 8,
-	PERF_SAMPLE_STREAM_ID			= 1U << 9,
-	PERF_SAMPLE_RAW				= 1U << 10,
-	PERF_SAMPLE_BRANCH_STACK		= 1U << 11,
-	PERF_SAMPLE_REGS_USER			= 1U << 12,
-	PERF_SAMPLE_STACK_USER			= 1U << 13,
-	PERF_SAMPLE_WEIGHT			= 1U << 14,
-	PERF_SAMPLE_DATA_SRC			= 1U << 15,
-	PERF_SAMPLE_IDENTIFIER			= 1U << 16,
-	PERF_SAMPLE_TRANSACTION			= 1U << 17,
-	PERF_SAMPLE_REGS_INTR			= 1U << 18,
-
-	PERF_SAMPLE_MAX = 1U << 19,		/* non-ABI */
-};
-
-/*
- * values to program into branch_sample_type when PERF_SAMPLE_BRANCH is set
- *
- * If the user does not pass priv level information via branch_sample_type,
- * the kernel uses the event's priv level. Branch and event priv levels do
- * not have to match. Branch priv level is checked for permissions.
- *
- * The branch types can be combined, however BRANCH_ANY covers all types
- * of branches and therefore it supersedes all the other types.
- */
-enum perf_branch_sample_type_shift {
-	PERF_SAMPLE_BRANCH_USER_SHIFT		= 0, /* user branches */
-	PERF_SAMPLE_BRANCH_KERNEL_SHIFT		= 1, /* kernel branches */
-	PERF_SAMPLE_BRANCH_HV_SHIFT		= 2, /* hypervisor branches */
-
-	PERF_SAMPLE_BRANCH_ANY_SHIFT		= 3, /* any branch types */
-	PERF_SAMPLE_BRANCH_ANY_CALL_SHIFT	= 4, /* any call branch */
-	PERF_SAMPLE_BRANCH_ANY_RETURN_SHIFT	= 5, /* any return branch */
-	PERF_SAMPLE_BRANCH_IND_CALL_SHIFT	= 6, /* indirect calls */
-	PERF_SAMPLE_BRANCH_ABORT_TX_SHIFT	= 7, /* transaction aborts */
-	PERF_SAMPLE_BRANCH_IN_TX_SHIFT		= 8, /* in transaction */
-	PERF_SAMPLE_BRANCH_NO_TX_SHIFT		= 9, /* not in transaction */
-	PERF_SAMPLE_BRANCH_COND_SHIFT		= 10, /* conditional branches */
-
-	PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT	= 11, /* call/ret stack */
-	PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT	= 12, /* indirect jumps */
-	PERF_SAMPLE_BRANCH_CALL_SHIFT		= 13, /* direct call */
-
-	PERF_SAMPLE_BRANCH_MAX_SHIFT		/* non-ABI */
-};
-
-enum perf_branch_sample_type {
-	PERF_SAMPLE_BRANCH_USER		= 1U << PERF_SAMPLE_BRANCH_USER_SHIFT,
-	PERF_SAMPLE_BRANCH_KERNEL	= 1U << PERF_SAMPLE_BRANCH_KERNEL_SHIFT,
-	PERF_SAMPLE_BRANCH_HV		= 1U << PERF_SAMPLE_BRANCH_HV_SHIFT,
-
-	PERF_SAMPLE_BRANCH_ANY		= 1U << PERF_SAMPLE_BRANCH_ANY_SHIFT,
-	PERF_SAMPLE_BRANCH_ANY_CALL	= 1U << PERF_SAMPLE_BRANCH_ANY_CALL_SHIFT,
-	PERF_SAMPLE_BRANCH_ANY_RETURN	= 1U << PERF_SAMPLE_BRANCH_ANY_RETURN_SHIFT,
-	PERF_SAMPLE_BRANCH_IND_CALL	= 1U << PERF_SAMPLE_BRANCH_IND_CALL_SHIFT,
-	PERF_SAMPLE_BRANCH_ABORT_TX	= 1U << PERF_SAMPLE_BRANCH_ABORT_TX_SHIFT,
-	PERF_SAMPLE_BRANCH_IN_TX	= 1U << PERF_SAMPLE_BRANCH_IN_TX_SHIFT,
-	PERF_SAMPLE_BRANCH_NO_TX	= 1U << PERF_SAMPLE_BRANCH_NO_TX_SHIFT,
-	PERF_SAMPLE_BRANCH_COND		= 1U << PERF_SAMPLE_BRANCH_COND_SHIFT,
-
-	PERF_SAMPLE_BRANCH_CALL_STACK	= 1U << PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT,
-	PERF_SAMPLE_BRANCH_IND_JUMP	= 1U << PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT,
-	PERF_SAMPLE_BRANCH_CALL		= 1U << PERF_SAMPLE_BRANCH_CALL_SHIFT,
-
-	PERF_SAMPLE_BRANCH_MAX		= 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
-};
-
-#define PERF_SAMPLE_BRANCH_PLM_ALL \
-	(PERF_SAMPLE_BRANCH_USER|\
-	 PERF_SAMPLE_BRANCH_KERNEL|\
-	 PERF_SAMPLE_BRANCH_HV)
-
-/*
- * Values to determine ABI of the registers dump.
- */
-enum perf_sample_regs_abi {
-	PERF_SAMPLE_REGS_ABI_NONE	= 0,
-	PERF_SAMPLE_REGS_ABI_32		= 1,
-	PERF_SAMPLE_REGS_ABI_64		= 2,
-};
-
-/*
- * Values for the memory transaction event qualifier, mostly for
- * abort events. Multiple bits can be set.
- */
-enum {
-	PERF_TXN_ELISION        = (1 << 0), /* From elision */
-	PERF_TXN_TRANSACTION    = (1 << 1), /* From transaction */
-	PERF_TXN_SYNC           = (1 << 2), /* Instruction is related */
-	PERF_TXN_ASYNC          = (1 << 3), /* Instruction not related */
-	PERF_TXN_RETRY          = (1 << 4), /* Retry possible */
-	PERF_TXN_CONFLICT       = (1 << 5), /* Conflict abort */
-	PERF_TXN_CAPACITY_WRITE = (1 << 6), /* Capacity write abort */
-	PERF_TXN_CAPACITY_READ  = (1 << 7), /* Capacity read abort */
-
-	PERF_TXN_MAX	        = (1 << 8), /* non-ABI */
-
-	/* bits 32..63 are reserved for the abort code */
-
-	PERF_TXN_ABORT_MASK  = (0xffffffffULL << 32),
-	PERF_TXN_ABORT_SHIFT = 32,
-};
-
-/*
- * The format of the data returned by read() on a perf event fd,
- * as specified by attr.read_format:
- *
- * struct read_format {
- *	{ u64		value;
- *	  { u64		time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED
- *	  { u64		time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING
- *	  { u64		id;           } && PERF_FORMAT_ID
- *	} && !PERF_FORMAT_GROUP
- *
- *	{ u64		nr;
- *	  { u64		time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED
- *	  { u64		time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING
- *	  { u64		value;
- *	    { u64	id;           } && PERF_FORMAT_ID
- *	  }		cntr[nr];
- *	} && PERF_FORMAT_GROUP
- * };
- */
-enum perf_event_read_format {
-	PERF_FORMAT_TOTAL_TIME_ENABLED		= 1U << 0,
-	PERF_FORMAT_TOTAL_TIME_RUNNING		= 1U << 1,
-	PERF_FORMAT_ID				= 1U << 2,
-	PERF_FORMAT_GROUP			= 1U << 3,
-
-	PERF_FORMAT_MAX = 1U << 4,		/* non-ABI */
-};
-
-#define PERF_ATTR_SIZE_VER0	64	/* sizeof first published struct */
-#define PERF_ATTR_SIZE_VER1	72	/* add: config2 */
-#define PERF_ATTR_SIZE_VER2	80	/* add: branch_sample_type */
-#define PERF_ATTR_SIZE_VER3	96	/* add: sample_regs_user */
-					/* add: sample_stack_user */
-#define PERF_ATTR_SIZE_VER4	104	/* add: sample_regs_intr */
-#define PERF_ATTR_SIZE_VER5	112	/* add: aux_watermark */
-
-/*
- * Hardware event_id to monitor via a performance monitoring event:
- */
-struct perf_event_attr {
-
-	/*
-	 * Major type: hardware/software/tracepoint/etc.
-	 */
-	__u32			type;
-
-	/*
-	 * Size of the attr structure, for fwd/bwd compat.
-	 */
-	__u32			size;
-
-	/*
-	 * Type specific configuration information.
-	 */
-	__u64			config;
-
-	union {
-		__u64		sample_period;
-		__u64		sample_freq;
-	};
-
-	__u64			sample_type;
-	__u64			read_format;
-
-	__u64			disabled       :  1, /* off by default        */
-				inherit	       :  1, /* children inherit it   */
-				pinned	       :  1, /* must always be on PMU */
-				exclusive      :  1, /* only group on PMU     */
-				exclude_user   :  1, /* don't count user      */
-				exclude_kernel :  1, /* ditto kernel          */
-				exclude_hv     :  1, /* ditto hypervisor      */
-				exclude_idle   :  1, /* don't count when idle */
-				mmap           :  1, /* include mmap data     */
-				comm	       :  1, /* include comm data     */
-				freq           :  1, /* use freq, not period  */
-				inherit_stat   :  1, /* per task counts       */
-				enable_on_exec :  1, /* next exec enables     */
-				task           :  1, /* trace fork/exit       */
-				watermark      :  1, /* wakeup_watermark      */
-				/*
-				 * precise_ip:
-				 *
-				 *  0 - SAMPLE_IP can have arbitrary skid
-				 *  1 - SAMPLE_IP must have constant skid
-				 *  2 - SAMPLE_IP requested to have 0 skid
-				 *  3 - SAMPLE_IP must have 0 skid
-				 *
-				 *  See also PERF_RECORD_MISC_EXACT_IP
-				 */
-				precise_ip     :  2, /* skid constraint       */
-				mmap_data      :  1, /* non-exec mmap data    */
-				sample_id_all  :  1, /* sample_type all events */
-
-				exclude_host   :  1, /* don't count in host   */
-				exclude_guest  :  1, /* don't count in guest  */
-
-				exclude_callchain_kernel : 1, /* exclude kernel callchains */
-				exclude_callchain_user   : 1, /* exclude user callchains */
-				mmap2          :  1, /* include mmap with inode data     */
-				comm_exec      :  1, /* flag comm events that are due to an exec */
-				use_clockid    :  1, /* use @clockid for time fields */
-				context_switch :  1, /* context switch data */
-				__reserved_1   : 37;
-
-	union {
-		__u32		wakeup_events;	  /* wakeup every n events */
-		__u32		wakeup_watermark; /* bytes before wakeup   */
-	};
-
-	__u32			bp_type;
-	union {
-		__u64		bp_addr;
-		__u64		config1; /* extension of config */
-	};
-	union {
-		__u64		bp_len;
-		__u64		config2; /* extension of config1 */
-	};
-	__u64	branch_sample_type; /* enum perf_branch_sample_type */
-
-	/*
-	 * Defines set of user regs to dump on samples.
-	 * See asm/perf_regs.h for details.
-	 */
-	__u64	sample_regs_user;
-
-	/*
-	 * Defines size of the user stack to dump on samples.
-	 */
-	__u32	sample_stack_user;
-
-	__s32	clockid;
-	/*
-	 * Defines set of regs to dump for each sample
-	 * state captured on:
-	 *  - precise = 0: PMU interrupt
-	 *  - precise > 0: sampled instruction
-	 *
-	 * See asm/perf_regs.h for details.
-	 */
-	__u64	sample_regs_intr;
-
-	/*
-	 * Wakeup watermark for AUX area
-	 */
-	__u32	aux_watermark;
-	__u32	__reserved_2;	/* align to __u64 */
-};
-
-#define perf_flags(attr)	(*(&(attr)->read_format + 1))
-
-/*
- * Ioctls that can be done on a perf event fd:
- */
-#define PERF_EVENT_IOC_ENABLE		_IO ('$', 0)
-#define PERF_EVENT_IOC_DISABLE		_IO ('$', 1)
-#define PERF_EVENT_IOC_REFRESH		_IO ('$', 2)
-#define PERF_EVENT_IOC_RESET		_IO ('$', 3)
-#define PERF_EVENT_IOC_PERIOD		_IOW('$', 4, __u64)
-#define PERF_EVENT_IOC_SET_OUTPUT	_IO ('$', 5)
-#define PERF_EVENT_IOC_SET_FILTER	_IOW('$', 6, char *)
-#define PERF_EVENT_IOC_ID		_IOR('$', 7, __u64 *)
-#define PERF_EVENT_IOC_SET_BPF		_IOW('$', 8, __u32)
-
-enum perf_event_ioc_flags {
-	PERF_IOC_FLAG_GROUP		= 1U << 0,
-};
-
-/*
- * Structure of the page that can be mapped via mmap
- */
-struct perf_event_mmap_page {
-	__u32	version;		/* version number of this structure */
-	__u32	compat_version;		/* lowest version this is compat with */
-
-	/*
-	 * Bits needed to read the hw events in user-space.
-	 *
-	 *   u32 seq, time_mult, time_shift, index, width;
-	 *   u64 count, enabled, running;
-	 *   u64 cyc, time_offset;
-	 *   s64 pmc = 0;
-	 *
-	 *   do {
-	 *     seq = pc->lock;
-	 *     barrier()
-	 *
-	 *     enabled = pc->time_enabled;
-	 *     running = pc->time_running;
-	 *
-	 *     if (pc->cap_usr_time && enabled != running) {
-	 *       cyc = rdtsc();
-	 *       time_offset = pc->time_offset;
-	 *       time_mult   = pc->time_mult;
-	 *       time_shift  = pc->time_shift;
-	 *     }
-	 *
-	 *     index = pc->index;
-	 *     count = pc->offset;
-	 *     if (pc->cap_user_rdpmc && index) {
-	 *       width = pc->pmc_width;
-	 *       pmc = rdpmc(index - 1);
-	 *     }
-	 *
-	 *     barrier();
-	 *   } while (pc->lock != seq);
-	 *
-	 * NOTE: for obvious reason this only works on self-monitoring
-	 *       processes.
-	 */
-	__u32	lock;			/* seqlock for synchronization */
-	__u32	index;			/* hardware event identifier */
-	__s64	offset;			/* add to hardware event value */
-	__u64	time_enabled;		/* time event active */
-	__u64	time_running;		/* time event on cpu */
-	union {
-		__u64	capabilities;
-		struct {
-			__u64	cap_bit0		: 1, /* Always 0, deprecated, see commit 860f085b74e9 */
-				cap_bit0_is_deprecated	: 1, /* Always 1, signals that bit 0 is zero */
-
-				cap_user_rdpmc		: 1, /* The RDPMC instruction can be used to read counts */
-				cap_user_time		: 1, /* The time_* fields are used */
-				cap_user_time_zero	: 1, /* The time_zero field is used */
-				cap_____res		: 59;
-		};
-	};
-
-	/*
-	 * If cap_user_rdpmc this field provides the bit-width of the value
-	 * read using the rdpmc() or equivalent instruction. This can be used
-	 * to sign extend the result like:
-	 *
-	 *   pmc <<= 64 - width;
-	 *   pmc >>= 64 - width; // signed shift right
-	 *   count += pmc;
-	 */
-	__u16	pmc_width;
-
-	/*
-	 * If cap_usr_time the below fields can be used to compute the time
-	 * delta since time_enabled (in ns) using rdtsc or similar.
-	 *
-	 *   u64 quot, rem;
-	 *   u64 delta;
-	 *
-	 *   quot = (cyc >> time_shift);
-	 *   rem = cyc & (((u64)1 << time_shift) - 1);
-	 *   delta = time_offset + quot * time_mult +
-	 *              ((rem * time_mult) >> time_shift);
-	 *
-	 * Where time_offset,time_mult,time_shift and cyc are read in the
-	 * seqcount loop described above. This delta can then be added to
-	 * enabled and possible running (if index), improving the scaling:
-	 *
-	 *   enabled += delta;
-	 *   if (index)
-	 *     running += delta;
-	 *
-	 *   quot = count / running;
-	 *   rem  = count % running;
-	 *   count = quot * enabled + (rem * enabled) / running;
-	 */
-	__u16	time_shift;
-	__u32	time_mult;
-	__u64	time_offset;
-	/*
-	 * If cap_usr_time_zero, the hardware clock (e.g. TSC) can be calculated
-	 * from sample timestamps.
-	 *
-	 *   time = timestamp - time_zero;
-	 *   quot = time / time_mult;
-	 *   rem  = time % time_mult;
-	 *   cyc = (quot << time_shift) + (rem << time_shift) / time_mult;
-	 *
-	 * And vice versa:
-	 *
-	 *   quot = cyc >> time_shift;
-	 *   rem  = cyc & (((u64)1 << time_shift) - 1);
-	 *   timestamp = time_zero + quot * time_mult +
-	 *               ((rem * time_mult) >> time_shift);
-	 */
-	__u64	time_zero;
-	__u32	size;			/* Header size up to __reserved[] fields. */
-
-		/*
-		 * Hole for extension of the self monitor capabilities
-		 */
-
-	__u8	__reserved[118*8+4];	/* align to 1k. */
-
-	/*
-	 * Control data for the mmap() data buffer.
-	 *
-	 * User-space reading the @data_head value should issue an smp_rmb(),
-	 * after reading this value.
-	 *
-	 * When the mapping is PROT_WRITE the @data_tail value should be
-	 * written by userspace to reflect the last read data, after issueing
-	 * an smp_mb() to separate the data read from the ->data_tail store.
-	 * In this case the kernel will not over-write unread data.
-	 *
-	 * See perf_output_put_handle() for the data ordering.
-	 *
-	 * data_{offset,size} indicate the location and size of the perf record
-	 * buffer within the mmapped area.
-	 */
-	__u64   data_head;		/* head in the data section */
-	__u64	data_tail;		/* user-space written tail */
-	__u64	data_offset;		/* where the buffer starts */
-	__u64	data_size;		/* data buffer size */
-
-	/*
-	 * AUX area is defined by aux_{offset,size} fields that should be set
-	 * by the userspace, so that
-	 *
-	 *   aux_offset >= data_offset + data_size
-	 *
-	 * prior to mmap()ing it. Size of the mmap()ed area should be aux_size.
-	 *
-	 * Ring buffer pointers aux_{head,tail} have the same semantics as
-	 * data_{head,tail} and same ordering rules apply.
-	 */
-	__u64	aux_head;
-	__u64	aux_tail;
-	__u64	aux_offset;
-	__u64	aux_size;
-};
-
-#define PERF_RECORD_MISC_CPUMODE_MASK		(7 << 0)
-#define PERF_RECORD_MISC_CPUMODE_UNKNOWN	(0 << 0)
-#define PERF_RECORD_MISC_KERNEL			(1 << 0)
-#define PERF_RECORD_MISC_USER			(2 << 0)
-#define PERF_RECORD_MISC_HYPERVISOR		(3 << 0)
-#define PERF_RECORD_MISC_GUEST_KERNEL		(4 << 0)
-#define PERF_RECORD_MISC_GUEST_USER		(5 << 0)
-
-/*
- * Indicates that /proc/PID/maps parsing are truncated by time out.
- */
-#define PERF_RECORD_MISC_PROC_MAP_PARSE_TIMEOUT	(1 << 12)
-/*
- * PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on
- * different events so can reuse the same bit position.
- * Ditto PERF_RECORD_MISC_SWITCH_OUT.
- */
-#define PERF_RECORD_MISC_MMAP_DATA		(1 << 13)
-#define PERF_RECORD_MISC_COMM_EXEC		(1 << 13)
-#define PERF_RECORD_MISC_SWITCH_OUT		(1 << 13)
-/*
- * Indicates that the content of PERF_SAMPLE_IP points to
- * the actual instruction that triggered the event. See also
- * perf_event_attr::precise_ip.
- */
-#define PERF_RECORD_MISC_EXACT_IP		(1 << 14)
-/*
- * Reserve the last bit to indicate some extended misc field
- */
-#define PERF_RECORD_MISC_EXT_RESERVED		(1 << 15)
-
-struct perf_event_header {
-	__u32	type;
-	__u16	misc;
-	__u16	size;
-};
-
-enum perf_event_type {
-
-	/*
-	 * If perf_event_attr.sample_id_all is set then all event types will
-	 * have the sample_type selected fields related to where/when
-	 * (identity) an event took place (TID, TIME, ID, STREAM_ID, CPU,
-	 * IDENTIFIER) described in PERF_RECORD_SAMPLE below, it will be stashed
-	 * just after the perf_event_header and the fields already present for
-	 * the existing fields, i.e. at the end of the payload. That way a newer
-	 * perf.data file will be supported by older perf tools, with these new
-	 * optional fields being ignored.
-	 *
-	 * struct sample_id {
-	 * 	{ u32			pid, tid; } && PERF_SAMPLE_TID
-	 * 	{ u64			time;     } && PERF_SAMPLE_TIME
-	 * 	{ u64			id;       } && PERF_SAMPLE_ID
-	 * 	{ u64			stream_id;} && PERF_SAMPLE_STREAM_ID
-	 * 	{ u32			cpu, res; } && PERF_SAMPLE_CPU
-	 *	{ u64			id;	  } && PERF_SAMPLE_IDENTIFIER
-	 * } && perf_event_attr::sample_id_all
-	 *
-	 * Note that PERF_SAMPLE_IDENTIFIER duplicates PERF_SAMPLE_ID.  The
-	 * advantage of PERF_SAMPLE_IDENTIFIER is that its position is fixed
-	 * relative to header.size.
-	 */
-
-	/*
-	 * The MMAP events record the PROT_EXEC mappings so that we can
-	 * correlate userspace IPs to code. They have the following structure:
-	 *
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *
-	 *	u32				pid, tid;
-	 *	u64				addr;
-	 *	u64				len;
-	 *	u64				pgoff;
-	 *	char				filename[];
-	 * 	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_MMAP			= 1,
-
-	/*
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *	u64				id;
-	 *	u64				lost;
-	 * 	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_LOST			= 2,
-
-	/*
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *
-	 *	u32				pid, tid;
-	 *	char				comm[];
-	 * 	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_COMM			= 3,
-
-	/*
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *	u32				pid, ppid;
-	 *	u32				tid, ptid;
-	 *	u64				time;
-	 * 	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_EXIT			= 4,
-
-	/*
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *	u64				time;
-	 *	u64				id;
-	 *	u64				stream_id;
-	 * 	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_THROTTLE			= 5,
-	PERF_RECORD_UNTHROTTLE			= 6,
-
-	/*
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *	u32				pid, ppid;
-	 *	u32				tid, ptid;
-	 *	u64				time;
-	 * 	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_FORK			= 7,
-
-	/*
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *	u32				pid, tid;
-	 *
-	 *	struct read_format		values;
-	 * 	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_READ			= 8,
-
-	/*
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *
-	 *	#
-	 *	# Note that PERF_SAMPLE_IDENTIFIER duplicates PERF_SAMPLE_ID.
-	 *	# The advantage of PERF_SAMPLE_IDENTIFIER is that its position
-	 *	# is fixed relative to header.
-	 *	#
-	 *
-	 *	{ u64			id;	  } && PERF_SAMPLE_IDENTIFIER
-	 *	{ u64			ip;	  } && PERF_SAMPLE_IP
-	 *	{ u32			pid, tid; } && PERF_SAMPLE_TID
-	 *	{ u64			time;     } && PERF_SAMPLE_TIME
-	 *	{ u64			addr;     } && PERF_SAMPLE_ADDR
-	 *	{ u64			id;	  } && PERF_SAMPLE_ID
-	 *	{ u64			stream_id;} && PERF_SAMPLE_STREAM_ID
-	 *	{ u32			cpu, res; } && PERF_SAMPLE_CPU
-	 *	{ u64			period;   } && PERF_SAMPLE_PERIOD
-	 *
-	 *	{ struct read_format	values;	  } && PERF_SAMPLE_READ
-	 *
-	 *	{ u64			nr,
-	 *	  u64			ips[nr];  } && PERF_SAMPLE_CALLCHAIN
-	 *
-	 *	#
-	 *	# The RAW record below is opaque data wrt the ABI
-	 *	#
-	 *	# That is, the ABI doesn't make any promises wrt to
-	 *	# the stability of its content, it may vary depending
-	 *	# on event, hardware, kernel version and phase of
-	 *	# the moon.
-	 *	#
-	 *	# In other words, PERF_SAMPLE_RAW contents are not an ABI.
-	 *	#
-	 *
-	 *	{ u32			size;
-	 *	  char                  data[size];}&& PERF_SAMPLE_RAW
-	 *
-	 *	{ u64                   nr;
-	 *        { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK
-	 *
-	 * 	{ u64			abi; # enum perf_sample_regs_abi
-	 * 	  u64			regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER
-	 *
-	 * 	{ u64			size;
-	 * 	  char			data[size];
-	 * 	  u64			dyn_size; } && PERF_SAMPLE_STACK_USER
-	 *
-	 *	{ u64			weight;   } && PERF_SAMPLE_WEIGHT
-	 *	{ u64			data_src; } && PERF_SAMPLE_DATA_SRC
-	 *	{ u64			transaction; } && PERF_SAMPLE_TRANSACTION
-	 *	{ u64			abi; # enum perf_sample_regs_abi
-	 *	  u64			regs[weight(mask)]; } && PERF_SAMPLE_REGS_INTR
-	 * };
-	 */
-	PERF_RECORD_SAMPLE			= 9,
-
-	/*
-	 * The MMAP2 records are an augmented version of MMAP, they add
-	 * maj, min, ino numbers to be used to uniquely identify each mapping
-	 *
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *
-	 *	u32				pid, tid;
-	 *	u64				addr;
-	 *	u64				len;
-	 *	u64				pgoff;
-	 *	u32				maj;
-	 *	u32				min;
-	 *	u64				ino;
-	 *	u64				ino_generation;
-	 *	u32				prot, flags;
-	 *	char				filename[];
-	 * 	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_MMAP2			= 10,
-
-	/*
-	 * Records that new data landed in the AUX buffer part.
-	 *
-	 * struct {
-	 * 	struct perf_event_header	header;
-	 *
-	 * 	u64				aux_offset;
-	 * 	u64				aux_size;
-	 *	u64				flags;
-	 * 	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_AUX				= 11,
-
-	/*
-	 * Indicates that instruction trace has started
-	 *
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *	u32				pid;
-	 *	u32				tid;
-	 * };
-	 */
-	PERF_RECORD_ITRACE_START		= 12,
-
-	/*
-	 * Records the dropped/lost sample number.
-	 *
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *
-	 *	u64				lost;
-	 *	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_LOST_SAMPLES		= 13,
-
-	/*
-	 * Records a context switch in or out (flagged by
-	 * PERF_RECORD_MISC_SWITCH_OUT). See also
-	 * PERF_RECORD_SWITCH_CPU_WIDE.
-	 *
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_SWITCH			= 14,
-
-	/*
-	 * CPU-wide version of PERF_RECORD_SWITCH with next_prev_pid and
-	 * next_prev_tid that are the next (switching out) or previous
-	 * (switching in) pid/tid.
-	 *
-	 * struct {
-	 *	struct perf_event_header	header;
-	 *	u32				next_prev_pid;
-	 *	u32				next_prev_tid;
-	 *	struct sample_id		sample_id;
-	 * };
-	 */
-	PERF_RECORD_SWITCH_CPU_WIDE		= 15,
-
-	PERF_RECORD_MAX,			/* non-ABI */
-};
-
-#define PERF_MAX_STACK_DEPTH		127
-
-enum perf_callchain_context {
-	PERF_CONTEXT_HV			= (__u64)-32,
-	PERF_CONTEXT_KERNEL		= (__u64)-128,
-	PERF_CONTEXT_USER		= (__u64)-512,
-
-	PERF_CONTEXT_GUEST		= (__u64)-2048,
-	PERF_CONTEXT_GUEST_KERNEL	= (__u64)-2176,
-	PERF_CONTEXT_GUEST_USER		= (__u64)-2560,
-
-	PERF_CONTEXT_MAX		= (__u64)-4095,
-};
-
-/**
- * PERF_RECORD_AUX::flags bits
- */
-#define PERF_AUX_FLAG_TRUNCATED		0x01	/* record was truncated to fit */
-#define PERF_AUX_FLAG_OVERWRITE		0x02	/* snapshot from overwrite mode */
-
-#define PERF_FLAG_FD_NO_GROUP		(1UL << 0)
-#define PERF_FLAG_FD_OUTPUT		(1UL << 1)
-#define PERF_FLAG_PID_CGROUP		(1UL << 2) /* pid=cgroup id, per-cpu mode only */
-#define PERF_FLAG_FD_CLOEXEC		(1UL << 3) /* O_CLOEXEC */
-
-union perf_mem_data_src {
-	__u64 val;
-	struct {
-		__u64   mem_op:5,	/* type of opcode */
-			mem_lvl:14,	/* memory hierarchy level */
-			mem_snoop:5,	/* snoop mode */
-			mem_lock:2,	/* lock instr */
-			mem_dtlb:7,	/* tlb access */
-			mem_rsvd:31;
-	};
-};
-
-/* type of opcode (load/store/prefetch,code) */
-#define PERF_MEM_OP_NA		0x01 /* not available */
-#define PERF_MEM_OP_LOAD	0x02 /* load instruction */
-#define PERF_MEM_OP_STORE	0x04 /* store instruction */
-#define PERF_MEM_OP_PFETCH	0x08 /* prefetch */
-#define PERF_MEM_OP_EXEC	0x10 /* code (execution) */
-#define PERF_MEM_OP_SHIFT	0
-
-/* memory hierarchy (memory level, hit or miss) */
-#define PERF_MEM_LVL_NA		0x01  /* not available */
-#define PERF_MEM_LVL_HIT	0x02  /* hit level */
-#define PERF_MEM_LVL_MISS	0x04  /* miss level  */
-#define PERF_MEM_LVL_L1		0x08  /* L1 */
-#define PERF_MEM_LVL_LFB	0x10  /* Line Fill Buffer */
-#define PERF_MEM_LVL_L2		0x20  /* L2 */
-#define PERF_MEM_LVL_L3		0x40  /* L3 */
-#define PERF_MEM_LVL_LOC_RAM	0x80  /* Local DRAM */
-#define PERF_MEM_LVL_REM_RAM1	0x100 /* Remote DRAM (1 hop) */
-#define PERF_MEM_LVL_REM_RAM2	0x200 /* Remote DRAM (2 hops) */
-#define PERF_MEM_LVL_REM_CCE1	0x400 /* Remote Cache (1 hop) */
-#define PERF_MEM_LVL_REM_CCE2	0x800 /* Remote Cache (2 hops) */
-#define PERF_MEM_LVL_IO		0x1000 /* I/O memory */
-#define PERF_MEM_LVL_UNC	0x2000 /* Uncached memory */
-#define PERF_MEM_LVL_SHIFT	5
-
-/* snoop mode */
-#define PERF_MEM_SNOOP_NA	0x01 /* not available */
-#define PERF_MEM_SNOOP_NONE	0x02 /* no snoop */
-#define PERF_MEM_SNOOP_HIT	0x04 /* snoop hit */
-#define PERF_MEM_SNOOP_MISS	0x08 /* snoop miss */
-#define PERF_MEM_SNOOP_HITM	0x10 /* snoop hit modified */
-#define PERF_MEM_SNOOP_SHIFT	19
-
-/* locked instruction */
-#define PERF_MEM_LOCK_NA	0x01 /* not available */
-#define PERF_MEM_LOCK_LOCKED	0x02 /* locked transaction */
-#define PERF_MEM_LOCK_SHIFT	24
-
-/* TLB access */
-#define PERF_MEM_TLB_NA		0x01 /* not available */
-#define PERF_MEM_TLB_HIT	0x02 /* hit level */
-#define PERF_MEM_TLB_MISS	0x04 /* miss level */
-#define PERF_MEM_TLB_L1		0x08 /* L1 */
-#define PERF_MEM_TLB_L2		0x10 /* L2 */
-#define PERF_MEM_TLB_WK		0x20 /* Hardware Walker*/
-#define PERF_MEM_TLB_OS		0x40 /* OS fault handler */
-#define PERF_MEM_TLB_SHIFT	26
-
-#define PERF_MEM_S(a, s) \
-	(((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
-
-/*
- * single taken branch record layout:
- *
- *      from: source instruction (may not always be a branch insn)
- *        to: branch target
- *   mispred: branch target was mispredicted
- * predicted: branch target was predicted
- *
- * support for mispred, predicted is optional. In case it
- * is not supported mispred = predicted = 0.
- *
- *     in_tx: running in a hardware transaction
- *     abort: aborting a hardware transaction
- *    cycles: cycles from last branch (or 0 if not supported)
- */
-struct perf_branch_entry {
-	__u64	from;
-	__u64	to;
-	__u64	mispred:1,  /* target mispredicted */
-		predicted:1,/* target predicted */
-		in_tx:1,    /* in transaction */
-		abort:1,    /* transaction abort */
-		cycles:16,  /* cycle count to last branch */
-		reserved:44;
-};
-
-#endif /* _LINUX_PERF_EVENT_H */
diff --git a/openflow/usr/include/linux/personality.h b/openflow/usr/include/linux/personality.h
deleted file mode 100644
index 9971703..0000000
--- a/openflow/usr/include/linux/personality.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef _LINUX_PERSONALITY_H
-#define _LINUX_PERSONALITY_H
-
-
-/*
- * Flags for bug emulation.
- *
- * These occupy the top three bytes.
- */
-enum {
-	UNAME26	=               0x0020000,
-	ADDR_NO_RANDOMIZE = 	0x0040000,	/* disable randomization of VA space */
-	FDPIC_FUNCPTRS =	0x0080000,	/* userspace function ptrs point to descriptors
-						 * (signal handling)
-						 */
-	MMAP_PAGE_ZERO =	0x0100000,
-	ADDR_COMPAT_LAYOUT =	0x0200000,
-	READ_IMPLIES_EXEC =	0x0400000,
-	ADDR_LIMIT_32BIT =	0x0800000,
-	SHORT_INODE =		0x1000000,
-	WHOLE_SECONDS =		0x2000000,
-	STICKY_TIMEOUTS	=	0x4000000,
-	ADDR_LIMIT_3GB = 	0x8000000,
-};
-
-/*
- * Security-relevant compatibility flags that must be
- * cleared upon setuid or setgid exec:
- */
-#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC  | \
-			    ADDR_NO_RANDOMIZE  | \
-			    ADDR_COMPAT_LAYOUT | \
-			    MMAP_PAGE_ZERO)
-
-/*
- * Personality types.
- *
- * These go in the low byte.  Avoid using the top bit, it will
- * conflict with error returns.
- */
-enum {
-	PER_LINUX =		0x0000,
-	PER_LINUX_32BIT =	0x0000 | ADDR_LIMIT_32BIT,
-	PER_LINUX_FDPIC =	0x0000 | FDPIC_FUNCPTRS,
-	PER_SVR4 =		0x0001 | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
-	PER_SVR3 =		0x0002 | STICKY_TIMEOUTS | SHORT_INODE,
-	PER_SCOSVR3 =		0x0003 | STICKY_TIMEOUTS |
-					 WHOLE_SECONDS | SHORT_INODE,
-	PER_OSR5 =		0x0003 | STICKY_TIMEOUTS | WHOLE_SECONDS,
-	PER_WYSEV386 =		0x0004 | STICKY_TIMEOUTS | SHORT_INODE,
-	PER_ISCR4 =		0x0005 | STICKY_TIMEOUTS,
-	PER_BSD =		0x0006,
-	PER_SUNOS =		0x0006 | STICKY_TIMEOUTS,
-	PER_XENIX =		0x0007 | STICKY_TIMEOUTS | SHORT_INODE,
-	PER_LINUX32 =		0x0008,
-	PER_LINUX32_3GB =	0x0008 | ADDR_LIMIT_3GB,
-	PER_IRIX32 =		0x0009 | STICKY_TIMEOUTS,/* IRIX5 32-bit */
-	PER_IRIXN32 =		0x000a | STICKY_TIMEOUTS,/* IRIX6 new 32-bit */
-	PER_IRIX64 =		0x000b | STICKY_TIMEOUTS,/* IRIX6 64-bit */
-	PER_RISCOS =		0x000c,
-	PER_SOLARIS =		0x000d | STICKY_TIMEOUTS,
-	PER_UW7 =		0x000e | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
-	PER_OSF4 =		0x000f,			 /* OSF/1 v4 */
-	PER_HPUX =		0x0010,
-	PER_MASK =		0x00ff,
-};
-
-
-#endif /* _LINUX_PERSONALITY_H */
diff --git a/openflow/usr/include/linux/pfkeyv2.h b/openflow/usr/include/linux/pfkeyv2.h
deleted file mode 100644
index ada7f01..0000000
--- a/openflow/usr/include/linux/pfkeyv2.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/* PF_KEY user interface, this is defined by rfc2367 so
- * do not make arbitrary modifications or else this header
- * file will not be compliant.
- */
-
-#ifndef _LINUX_PFKEY2_H
-#define _LINUX_PFKEY2_H
-
-#include <linux/types.h>
-
-#define PF_KEY_V2		2
-#define PFKEYV2_REVISION	199806L
-
-struct sadb_msg {
-	__u8		sadb_msg_version;
-	__u8		sadb_msg_type;
-	__u8		sadb_msg_errno;
-	__u8		sadb_msg_satype;
-	__u16	sadb_msg_len;
-	__u16	sadb_msg_reserved;
-	__u32	sadb_msg_seq;
-	__u32	sadb_msg_pid;
-} __attribute__((packed));
-/* sizeof(struct sadb_msg) == 16 */
-
-struct sadb_ext {
-	__u16	sadb_ext_len;
-	__u16	sadb_ext_type;
-} __attribute__((packed));
-/* sizeof(struct sadb_ext) == 4 */
-
-struct sadb_sa {
-	__u16	sadb_sa_len;
-	__u16	sadb_sa_exttype;
-	__be32		sadb_sa_spi;
-	__u8		sadb_sa_replay;
-	__u8		sadb_sa_state;
-	__u8		sadb_sa_auth;
-	__u8		sadb_sa_encrypt;
-	__u32	sadb_sa_flags;
-} __attribute__((packed));
-/* sizeof(struct sadb_sa) == 16 */
-
-struct sadb_lifetime {
-	__u16	sadb_lifetime_len;
-	__u16	sadb_lifetime_exttype;
-	__u32	sadb_lifetime_allocations;
-	__u64	sadb_lifetime_bytes;
-	__u64	sadb_lifetime_addtime;
-	__u64	sadb_lifetime_usetime;
-} __attribute__((packed));
-/* sizeof(struct sadb_lifetime) == 32 */
-
-struct sadb_address {
-	__u16	sadb_address_len;
-	__u16	sadb_address_exttype;
-	__u8		sadb_address_proto;
-	__u8		sadb_address_prefixlen;
-	__u16	sadb_address_reserved;
-} __attribute__((packed));
-/* sizeof(struct sadb_address) == 8 */
-
-struct sadb_key {
-	__u16	sadb_key_len;
-	__u16	sadb_key_exttype;
-	__u16	sadb_key_bits;
-	__u16	sadb_key_reserved;
-} __attribute__((packed));
-/* sizeof(struct sadb_key) == 8 */
-
-struct sadb_ident {
-	__u16	sadb_ident_len;
-	__u16	sadb_ident_exttype;
-	__u16	sadb_ident_type;
-	__u16	sadb_ident_reserved;
-	__u64	sadb_ident_id;
-} __attribute__((packed));
-/* sizeof(struct sadb_ident) == 16 */
-
-struct sadb_sens {
-	__u16	sadb_sens_len;
-	__u16	sadb_sens_exttype;
-	__u32	sadb_sens_dpd;
-	__u8		sadb_sens_sens_level;
-	__u8		sadb_sens_sens_len;
-	__u8		sadb_sens_integ_level;
-	__u8		sadb_sens_integ_len;
-	__u32	sadb_sens_reserved;
-} __attribute__((packed));
-/* sizeof(struct sadb_sens) == 16 */
-
-/* followed by:
-	__u64	sadb_sens_bitmap[sens_len];
-	__u64	sadb_integ_bitmap[integ_len];  */
-
-struct sadb_prop {
-	__u16	sadb_prop_len;
-	__u16	sadb_prop_exttype;
-	__u8		sadb_prop_replay;
-	__u8		sadb_prop_reserved[3];
-} __attribute__((packed));
-/* sizeof(struct sadb_prop) == 8 */
-
-/* followed by:
-	struct sadb_comb sadb_combs[(sadb_prop_len +
-		sizeof(__u64) - sizeof(struct sadb_prop)) /
-		sizeof(struct sadb_comb)]; */
-
-struct sadb_comb {
-	__u8		sadb_comb_auth;
-	__u8		sadb_comb_encrypt;
-	__u16	sadb_comb_flags;
-	__u16	sadb_comb_auth_minbits;
-	__u16	sadb_comb_auth_maxbits;
-	__u16	sadb_comb_encrypt_minbits;
-	__u16	sadb_comb_encrypt_maxbits;
-	__u32	sadb_comb_reserved;
-	__u32	sadb_comb_soft_allocations;
-	__u32	sadb_comb_hard_allocations;
-	__u64	sadb_comb_soft_bytes;
-	__u64	sadb_comb_hard_bytes;
-	__u64	sadb_comb_soft_addtime;
-	__u64	sadb_comb_hard_addtime;
-	__u64	sadb_comb_soft_usetime;
-	__u64	sadb_comb_hard_usetime;
-} __attribute__((packed));
-/* sizeof(struct sadb_comb) == 72 */
-
-struct sadb_supported {
-	__u16	sadb_supported_len;
-	__u16	sadb_supported_exttype;
-	__u32	sadb_supported_reserved;
-} __attribute__((packed));
-/* sizeof(struct sadb_supported) == 8 */
-
-/* followed by:
-	struct sadb_alg sadb_algs[(sadb_supported_len +
-		sizeof(__u64) - sizeof(struct sadb_supported)) /
-		sizeof(struct sadb_alg)]; */
-
-struct sadb_alg {
-	__u8		sadb_alg_id;
-	__u8		sadb_alg_ivlen;
-	__u16	sadb_alg_minbits;
-	__u16	sadb_alg_maxbits;
-	__u16	sadb_alg_reserved;
-} __attribute__((packed));
-/* sizeof(struct sadb_alg) == 8 */
-
-struct sadb_spirange {
-	__u16	sadb_spirange_len;
-	__u16	sadb_spirange_exttype;
-	__u32	sadb_spirange_min;
-	__u32	sadb_spirange_max;
-	__u32	sadb_spirange_reserved;
-} __attribute__((packed));
-/* sizeof(struct sadb_spirange) == 16 */
-
-struct sadb_x_kmprivate {
-	__u16	sadb_x_kmprivate_len;
-	__u16	sadb_x_kmprivate_exttype;
-	__u32	sadb_x_kmprivate_reserved;
-} __attribute__((packed));
-/* sizeof(struct sadb_x_kmprivate) == 8 */
-
-struct sadb_x_sa2 {
-	__u16	sadb_x_sa2_len;
-	__u16	sadb_x_sa2_exttype;
-	__u8		sadb_x_sa2_mode;
-	__u8		sadb_x_sa2_reserved1;
-	__u16	sadb_x_sa2_reserved2;
-	__u32	sadb_x_sa2_sequence;
-	__u32	sadb_x_sa2_reqid;
-} __attribute__((packed));
-/* sizeof(struct sadb_x_sa2) == 16 */
-
-struct sadb_x_policy {
-	__u16	sadb_x_policy_len;
-	__u16	sadb_x_policy_exttype;
-	__u16	sadb_x_policy_type;
-	__u8		sadb_x_policy_dir;
-	__u8		sadb_x_policy_reserved;
-	__u32	sadb_x_policy_id;
-	__u32	sadb_x_policy_priority;
-} __attribute__((packed));
-/* sizeof(struct sadb_x_policy) == 16 */
-
-struct sadb_x_ipsecrequest {
-	__u16	sadb_x_ipsecrequest_len;
-	__u16	sadb_x_ipsecrequest_proto;
-	__u8		sadb_x_ipsecrequest_mode;
-	__u8		sadb_x_ipsecrequest_level;
-	__u16	sadb_x_ipsecrequest_reserved1;
-	__u32	sadb_x_ipsecrequest_reqid;
-	__u32	sadb_x_ipsecrequest_reserved2;
-} __attribute__((packed));
-/* sizeof(struct sadb_x_ipsecrequest) == 16 */
-
-/* This defines the TYPE of Nat Traversal in use.  Currently only one
- * type of NAT-T is supported, draft-ietf-ipsec-udp-encaps-06
- */
-struct sadb_x_nat_t_type {
-	__u16	sadb_x_nat_t_type_len;
-	__u16	sadb_x_nat_t_type_exttype;
-	__u8		sadb_x_nat_t_type_type;
-	__u8		sadb_x_nat_t_type_reserved[3];
-} __attribute__((packed));
-/* sizeof(struct sadb_x_nat_t_type) == 8 */
-
-/* Pass a NAT Traversal port (Source or Dest port) */
-struct sadb_x_nat_t_port {
-	__u16	sadb_x_nat_t_port_len;
-	__u16	sadb_x_nat_t_port_exttype;
-	__be16		sadb_x_nat_t_port_port;
-	__u16	sadb_x_nat_t_port_reserved;
-} __attribute__((packed));
-/* sizeof(struct sadb_x_nat_t_port) == 8 */
-
-/* Generic LSM security context */
-struct sadb_x_sec_ctx {
-	__u16	sadb_x_sec_len;
-	__u16	sadb_x_sec_exttype;
-	__u8		sadb_x_ctx_alg;  /* LSMs: e.g., selinux == 1 */
-	__u8		sadb_x_ctx_doi;
-	__u16	sadb_x_ctx_len;
-} __attribute__((packed));
-/* sizeof(struct sadb_sec_ctx) = 8 */
-
-/* Used by MIGRATE to pass addresses IKE will use to perform
- * negotiation with the peer */
-struct sadb_x_kmaddress {
-	__u16	sadb_x_kmaddress_len;
-	__u16	sadb_x_kmaddress_exttype;
-	__u32	sadb_x_kmaddress_reserved;
-} __attribute__((packed));
-/* sizeof(struct sadb_x_kmaddress) == 8 */
-
-/* To specify the SA dump filter */
-struct sadb_x_filter {
-	__u16	sadb_x_filter_len;
-	__u16	sadb_x_filter_exttype;
-	__u32	sadb_x_filter_saddr[4];
-	__u32	sadb_x_filter_daddr[4];
-	__u16	sadb_x_filter_family;
-	__u8	sadb_x_filter_splen;
-	__u8	sadb_x_filter_dplen;
-} __attribute__((packed));
-/* sizeof(struct sadb_x_filter) == 40 */
-
-/* Message types */
-#define SADB_RESERVED		0
-#define SADB_GETSPI		1
-#define SADB_UPDATE		2
-#define SADB_ADD		3
-#define SADB_DELETE		4
-#define SADB_GET		5
-#define SADB_ACQUIRE		6
-#define SADB_REGISTER		7
-#define SADB_EXPIRE		8
-#define SADB_FLUSH		9
-#define SADB_DUMP		10
-#define SADB_X_PROMISC		11
-#define SADB_X_PCHANGE		12
-#define SADB_X_SPDUPDATE	13
-#define SADB_X_SPDADD		14
-#define SADB_X_SPDDELETE	15
-#define SADB_X_SPDGET		16
-#define SADB_X_SPDACQUIRE	17
-#define SADB_X_SPDDUMP		18
-#define SADB_X_SPDFLUSH		19
-#define SADB_X_SPDSETIDX	20
-#define SADB_X_SPDEXPIRE	21
-#define SADB_X_SPDDELETE2	22
-#define SADB_X_NAT_T_NEW_MAPPING	23
-#define SADB_X_MIGRATE		24
-#define SADB_MAX		24
-
-/* Security Association flags */
-#define SADB_SAFLAGS_PFS	1
-#define SADB_SAFLAGS_NOPMTUDISC	0x20000000
-#define SADB_SAFLAGS_DECAP_DSCP	0x40000000
-#define SADB_SAFLAGS_NOECN	0x80000000
-
-/* Security Association states */
-#define SADB_SASTATE_LARVAL	0
-#define SADB_SASTATE_MATURE	1
-#define SADB_SASTATE_DYING	2
-#define SADB_SASTATE_DEAD	3
-#define SADB_SASTATE_MAX	3
-
-/* Security Association types */
-#define SADB_SATYPE_UNSPEC	0
-#define SADB_SATYPE_AH		2
-#define SADB_SATYPE_ESP		3
-#define SADB_SATYPE_RSVP	5
-#define SADB_SATYPE_OSPFV2	6
-#define SADB_SATYPE_RIPV2	7
-#define SADB_SATYPE_MIP		8
-#define SADB_X_SATYPE_IPCOMP	9
-#define SADB_SATYPE_MAX		9
-
-/* Authentication algorithms */
-#define SADB_AALG_NONE			0
-#define SADB_AALG_MD5HMAC		2
-#define SADB_AALG_SHA1HMAC		3
-#define SADB_X_AALG_SHA2_256HMAC	5
-#define SADB_X_AALG_SHA2_384HMAC	6
-#define SADB_X_AALG_SHA2_512HMAC	7
-#define SADB_X_AALG_RIPEMD160HMAC	8
-#define SADB_X_AALG_AES_XCBC_MAC	9
-#define SADB_X_AALG_NULL		251	/* kame */
-#define SADB_AALG_MAX			251
-
-/* Encryption algorithms */
-#define SADB_EALG_NONE			0
-#define SADB_EALG_DESCBC		2
-#define SADB_EALG_3DESCBC		3
-#define SADB_X_EALG_CASTCBC		6
-#define SADB_X_EALG_BLOWFISHCBC		7
-#define SADB_EALG_NULL			11
-#define SADB_X_EALG_AESCBC		12
-#define SADB_X_EALG_AESCTR		13
-#define SADB_X_EALG_AES_CCM_ICV8	14
-#define SADB_X_EALG_AES_CCM_ICV12	15
-#define SADB_X_EALG_AES_CCM_ICV16	16
-#define SADB_X_EALG_AES_GCM_ICV8	18
-#define SADB_X_EALG_AES_GCM_ICV12	19
-#define SADB_X_EALG_AES_GCM_ICV16	20
-#define SADB_X_EALG_CAMELLIACBC		22
-#define SADB_X_EALG_NULL_AES_GMAC	23
-#define SADB_EALG_MAX                   253 /* last EALG */
-/* private allocations should use 249-255 (RFC2407) */
-#define SADB_X_EALG_SERPENTCBC  252     /* draft-ietf-ipsec-ciph-aes-cbc-00 */
-#define SADB_X_EALG_TWOFISHCBC  253     /* draft-ietf-ipsec-ciph-aes-cbc-00 */
-
-/* Compression algorithms */
-#define SADB_X_CALG_NONE		0
-#define SADB_X_CALG_OUI			1
-#define SADB_X_CALG_DEFLATE		2
-#define SADB_X_CALG_LZS			3
-#define SADB_X_CALG_LZJH		4
-#define SADB_X_CALG_MAX			4
-
-/* Extension Header values */
-#define SADB_EXT_RESERVED		0
-#define SADB_EXT_SA			1
-#define SADB_EXT_LIFETIME_CURRENT	2
-#define SADB_EXT_LIFETIME_HARD		3
-#define SADB_EXT_LIFETIME_SOFT		4
-#define SADB_EXT_ADDRESS_SRC		5
-#define SADB_EXT_ADDRESS_DST		6
-#define SADB_EXT_ADDRESS_PROXY		7
-#define SADB_EXT_KEY_AUTH		8
-#define SADB_EXT_KEY_ENCRYPT		9
-#define SADB_EXT_IDENTITY_SRC		10
-#define SADB_EXT_IDENTITY_DST		11
-#define SADB_EXT_SENSITIVITY		12
-#define SADB_EXT_PROPOSAL		13
-#define SADB_EXT_SUPPORTED_AUTH		14
-#define SADB_EXT_SUPPORTED_ENCRYPT	15
-#define SADB_EXT_SPIRANGE		16
-#define SADB_X_EXT_KMPRIVATE		17
-#define SADB_X_EXT_POLICY		18
-#define SADB_X_EXT_SA2			19
-/* The next four entries are for setting up NAT Traversal */
-#define SADB_X_EXT_NAT_T_TYPE		20
-#define SADB_X_EXT_NAT_T_SPORT		21
-#define SADB_X_EXT_NAT_T_DPORT		22
-#define SADB_X_EXT_NAT_T_OA		23
-#define SADB_X_EXT_SEC_CTX		24
-/* Used with MIGRATE to pass @ to IKE for negotiation */
-#define SADB_X_EXT_KMADDRESS		25
-#define SADB_X_EXT_FILTER		26
-#define SADB_EXT_MAX			26
-
-/* Identity Extension values */
-#define SADB_IDENTTYPE_RESERVED	0
-#define SADB_IDENTTYPE_PREFIX	1
-#define SADB_IDENTTYPE_FQDN	2
-#define SADB_IDENTTYPE_USERFQDN	3
-#define SADB_IDENTTYPE_MAX	3
-
-#endif /* !(_LINUX_PFKEY2_H) */
diff --git a/openflow/usr/include/linux/pg.h b/openflow/usr/include/linux/pg.h
deleted file mode 100644
index db994bb..0000000
--- a/openflow/usr/include/linux/pg.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* 	pg.h (c) 1998  Grant R. Guenther <grant@torque.net>
- 		       Under the terms of the GNU General Public License
-
-
-	pg.h defines the user interface to the generic ATAPI packet
-        command driver for parallel port ATAPI devices (pg). The
-	driver is loosely modelled after the generic SCSI driver, sg,
-	although the actual interface is different.
-
-	The pg driver provides a simple character device interface for
-        sending ATAPI commands to a device.  With the exception of the
-	ATAPI reset operation, all operations are performed by a pair
-        of read and write operations to the appropriate /dev/pgN device.
-	A write operation delivers a command and any outbound data in
-        a single buffer.  Normally, the write will succeed unless the
-        device is offline or malfunctioning, or there is already another
-	command pending.  If the write succeeds, it should be followed
-        immediately by a read operation, to obtain any returned data and
-        status information.  A read will fail if there is no operation
-        in progress.
-
-	As a special case, the device can be reset with a write operation,
-        and in this case, no following read is expected, or permitted.
-
-	There are no ioctl() operations.  Any single operation
-	may transfer at most PG_MAX_DATA bytes.  Note that the driver must
-        copy the data through an internal buffer.  In keeping with all
-	current ATAPI devices, command packets are assumed to be exactly
-	12 bytes in length.
-
-	To permit future changes to this interface, the headers in the
-	read and write buffers contain a single character "magic" flag.
-        Currently this flag must be the character "P".
-
-*/
-
-#define PG_MAGIC	'P'
-#define PG_RESET	'Z'
-#define PG_COMMAND	'C'
-
-#define PG_MAX_DATA	32768
-
-struct pg_write_hdr {
-
-	char	magic;		/* == PG_MAGIC */
-	char	func;		/* PG_RESET or PG_COMMAND */
-	int     dlen;		/* number of bytes expected to transfer */
-	int     timeout;	/* number of seconds before timeout */
-	char	packet[12];	/* packet command */
-
-};
-
-struct pg_read_hdr {
-
-	char	magic;		/* == PG_MAGIC */
-	char	scsi;		/* "scsi" status == sense key */
-	int	dlen;		/* size of device transfer request */
-	int     duration;	/* time in seconds command took */
-	char    pad[12];	/* not used */
-
-};
-
-/* end of pg.h */
diff --git a/openflow/usr/include/linux/phantom.h b/openflow/usr/include/linux/phantom.h
deleted file mode 100644
index 94dd664..0000000
--- a/openflow/usr/include/linux/phantom.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (C) 2005-2007 Jiri Slaby <jirislaby@gmail.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- */
-
-#ifndef __PHANTOM_H
-#define __PHANTOM_H
-
-#include <linux/types.h>
-
-/* PHN_(G/S)ET_REG param */
-struct phm_reg {
-	__u32 reg;
-	__u32 value;
-};
-
-/* PHN_(G/S)ET_REGS param */
-struct phm_regs {
-	__u32 count;
-	__u32 mask;
-	__u32 values[8];
-};
-
-#define PH_IOC_MAGIC		'p'
-#define PHN_GET_REG		_IOWR(PH_IOC_MAGIC, 0, struct phm_reg *)
-#define PHN_SET_REG		_IOW(PH_IOC_MAGIC, 1, struct phm_reg *)
-#define PHN_GET_REGS		_IOWR(PH_IOC_MAGIC, 2, struct phm_regs *)
-#define PHN_SET_REGS		_IOW(PH_IOC_MAGIC, 3, struct phm_regs *)
-/* this ioctl tells the driver, that the caller is not OpenHaptics and might
- * use improved registers update (no more phantom switchoffs when using
- * libphantom) */
-#define PHN_NOT_OH		_IO(PH_IOC_MAGIC, 4)
-#define PHN_GETREG		_IOWR(PH_IOC_MAGIC, 5, struct phm_reg)
-#define PHN_SETREG		_IOW(PH_IOC_MAGIC, 6, struct phm_reg)
-#define PHN_GETREGS		_IOWR(PH_IOC_MAGIC, 7, struct phm_regs)
-#define PHN_SETREGS		_IOW(PH_IOC_MAGIC, 8, struct phm_regs)
-
-#define PHN_CONTROL		0x6     /* control byte in iaddr space */
-#define PHN_CTL_AMP		0x1     /*   switch after torques change */
-#define PHN_CTL_BUT		0x2     /*   is button switched */
-#define PHN_CTL_IRQ		0x10    /*   is irq enabled */
-
-#define PHN_ZERO_FORCE		2048	/* zero torque on motor */
-
-#endif
diff --git a/openflow/usr/include/linux/phonet.h b/openflow/usr/include/linux/phonet.h
deleted file mode 100644
index 7d663d5..0000000
--- a/openflow/usr/include/linux/phonet.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * file phonet.h
- *
- * Phonet sockets kernel interface
- *
- * Copyright (C) 2008 Nokia Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef LINUX_PHONET_H
-#define LINUX_PHONET_H
-
-#include <linux/types.h>
-#include <linux/socket.h>
-
-/* Automatic protocol selection */
-#define PN_PROTO_TRANSPORT	0
-/* Phonet datagram socket */
-#define PN_PROTO_PHONET		1
-/* Phonet pipe */
-#define PN_PROTO_PIPE		2
-#define PHONET_NPROTO		3
-
-/* Socket options for SOL_PNPIPE level */
-#define PNPIPE_ENCAP		1
-#define PNPIPE_IFINDEX		2
-#define PNPIPE_HANDLE		3
-#define PNPIPE_INITSTATE	4
-
-#define PNADDR_ANY		0
-#define PNADDR_BROADCAST	0xFC
-#define PNPORT_RESOURCE_ROUTING	0
-
-/* Values for PNPIPE_ENCAP option */
-#define PNPIPE_ENCAP_NONE	0
-#define PNPIPE_ENCAP_IP		1
-
-/* ioctls */
-#define SIOCPNGETOBJECT		(SIOCPROTOPRIVATE + 0)
-#define SIOCPNENABLEPIPE	(SIOCPROTOPRIVATE + 13)
-#define SIOCPNADDRESOURCE	(SIOCPROTOPRIVATE + 14)
-#define SIOCPNDELRESOURCE	(SIOCPROTOPRIVATE + 15)
-
-/* Phonet protocol header */
-struct phonethdr {
-	__u8	pn_rdev;
-	__u8	pn_sdev;
-	__u8	pn_res;
-	__be16	pn_length;
-	__u8	pn_robj;
-	__u8	pn_sobj;
-} __attribute__((packed));
-
-/* Common Phonet payload header */
-struct phonetmsg {
-	__u8	pn_trans_id;	/* transaction ID */
-	__u8	pn_msg_id;	/* message type */
-	union {
-		struct {
-			__u8	pn_submsg_id;	/* message subtype */
-			__u8	pn_data[5];
-		} base;
-		struct {
-			__u16	pn_e_res_id;	/* extended resource ID */
-			__u8	pn_e_submsg_id;	/* message subtype */
-			__u8	pn_e_data[3];
-		} ext;
-	} pn_msg_u;
-};
-#define PN_COMMON_MESSAGE	0xF0
-#define PN_COMMGR		0x10
-#define PN_PREFIX		0xE0 /* resource for extended messages */
-#define pn_submsg_id		pn_msg_u.base.pn_submsg_id
-#define pn_e_submsg_id		pn_msg_u.ext.pn_e_submsg_id
-#define pn_e_res_id		pn_msg_u.ext.pn_e_res_id
-#define pn_data			pn_msg_u.base.pn_data
-#define pn_e_data		pn_msg_u.ext.pn_e_data
-
-/* data for unreachable errors */
-#define PN_COMM_SERVICE_NOT_IDENTIFIED_RESP	0x01
-#define PN_COMM_ISA_ENTITY_NOT_REACHABLE_RESP	0x14
-#define pn_orig_msg_id		pn_data[0]
-#define pn_status		pn_data[1]
-#define pn_e_orig_msg_id	pn_e_data[0]
-#define pn_e_status		pn_e_data[1]
-
-/* Phonet socket address structure */
-struct sockaddr_pn {
-	__kernel_sa_family_t spn_family;
-	__u8 spn_obj;
-	__u8 spn_dev;
-	__u8 spn_resource;
-	__u8 spn_zero[sizeof(struct sockaddr) - sizeof(__kernel_sa_family_t) - 3];
-} __attribute__((packed));
-
-/* Well known address */
-#define PN_DEV_PC	0x10
-
-static __inline__ __u16 pn_object(__u8 addr, __u16 port)
-{
-	return (addr << 8) | (port & 0x3ff);
-}
-
-static __inline__ __u8 pn_obj(__u16 handle)
-{
-	return handle & 0xff;
-}
-
-static __inline__ __u8 pn_dev(__u16 handle)
-{
-	return handle >> 8;
-}
-
-static __inline__ __u16 pn_port(__u16 handle)
-{
-	return handle & 0x3ff;
-}
-
-static __inline__ __u8 pn_addr(__u16 handle)
-{
-	return (handle >> 8) & 0xfc;
-}
-
-static __inline__ void pn_sockaddr_set_addr(struct sockaddr_pn *spn, __u8 addr)
-{
-	spn->spn_dev &= 0x03;
-	spn->spn_dev |= addr & 0xfc;
-}
-
-static __inline__ void pn_sockaddr_set_port(struct sockaddr_pn *spn, __u16 port)
-{
-	spn->spn_dev &= 0xfc;
-	spn->spn_dev |= (port >> 8) & 0x03;
-	spn->spn_obj = port & 0xff;
-}
-
-static __inline__ void pn_sockaddr_set_object(struct sockaddr_pn *spn,
-						__u16 handle)
-{
-	spn->spn_dev = pn_dev(handle);
-	spn->spn_obj = pn_obj(handle);
-}
-
-static __inline__ void pn_sockaddr_set_resource(struct sockaddr_pn *spn,
-						__u8 resource)
-{
-	spn->spn_resource = resource;
-}
-
-static __inline__ __u8 pn_sockaddr_get_addr(const struct sockaddr_pn *spn)
-{
-	return spn->spn_dev & 0xfc;
-}
-
-static __inline__ __u16 pn_sockaddr_get_port(const struct sockaddr_pn *spn)
-{
-	return ((spn->spn_dev & 0x03) << 8) | spn->spn_obj;
-}
-
-static __inline__ __u16 pn_sockaddr_get_object(const struct sockaddr_pn *spn)
-{
-	return pn_object(spn->spn_dev, spn->spn_obj);
-}
-
-static __inline__ __u8 pn_sockaddr_get_resource(const struct sockaddr_pn *spn)
-{
-	return spn->spn_resource;
-}
-
-/* Phonet device ioctl requests */
-
-#endif /* LINUX_PHONET_H */
diff --git a/openflow/usr/include/linux/pkt_cls.h b/openflow/usr/include/linux/pkt_cls.h
deleted file mode 100644
index a323146..0000000
--- a/openflow/usr/include/linux/pkt_cls.h
+++ /dev/null
@@ -1,448 +0,0 @@
-#ifndef __LINUX_PKT_CLS_H
-#define __LINUX_PKT_CLS_H
-
-#include <linux/types.h>
-#include <linux/pkt_sched.h>
-
-
-/* Action attributes */
-enum {
-	TCA_ACT_UNSPEC,
-	TCA_ACT_KIND,
-	TCA_ACT_OPTIONS,
-	TCA_ACT_INDEX,
-	TCA_ACT_STATS,
-	__TCA_ACT_MAX
-};
-
-#define TCA_ACT_MAX __TCA_ACT_MAX
-#define TCA_OLD_COMPAT (TCA_ACT_MAX+1)
-#define TCA_ACT_MAX_PRIO 32
-#define TCA_ACT_BIND	1
-#define TCA_ACT_NOBIND	0
-#define TCA_ACT_UNBIND	1
-#define TCA_ACT_NOUNBIND	0
-#define TCA_ACT_REPLACE		1
-#define TCA_ACT_NOREPLACE	0
-
-#define TC_ACT_UNSPEC	(-1)
-#define TC_ACT_OK		0
-#define TC_ACT_RECLASSIFY	1
-#define TC_ACT_SHOT		2
-#define TC_ACT_PIPE		3
-#define TC_ACT_STOLEN		4
-#define TC_ACT_QUEUED		5
-#define TC_ACT_REPEAT		6
-#define TC_ACT_REDIRECT		7
-#define TC_ACT_JUMP		0x10000000
-
-/* Action type identifiers*/
-enum {
-	TCA_ID_UNSPEC=0,
-	TCA_ID_POLICE=1,
-	/* other actions go here */
-	__TCA_ID_MAX=255
-};
-
-#define TCA_ID_MAX __TCA_ID_MAX
-
-struct tc_police {
-	__u32			index;
-	int			action;
-#define TC_POLICE_UNSPEC	TC_ACT_UNSPEC
-#define TC_POLICE_OK		TC_ACT_OK
-#define TC_POLICE_RECLASSIFY	TC_ACT_RECLASSIFY
-#define TC_POLICE_SHOT		TC_ACT_SHOT
-#define TC_POLICE_PIPE		TC_ACT_PIPE
-
-	__u32			limit;
-	__u32			burst;
-	__u32			mtu;
-	struct tc_ratespec	rate;
-	struct tc_ratespec	peakrate;
-	int 			refcnt;
-	int 			bindcnt;
-	__u32			capab;
-};
-
-struct tcf_t {
-	__u64   install;
-	__u64   lastuse;
-	__u64   expires;
-};
-
-struct tc_cnt {
-	int                   refcnt; 
-	int                   bindcnt;
-};
-
-#define tc_gen \
-	__u32                 index; \
-	__u32                 capab; \
-	int                   action; \
-	int                   refcnt; \
-	int                   bindcnt
-
-enum {
-	TCA_POLICE_UNSPEC,
-	TCA_POLICE_TBF,
-	TCA_POLICE_RATE,
-	TCA_POLICE_PEAKRATE,
-	TCA_POLICE_AVRATE,
-	TCA_POLICE_RESULT,
-	__TCA_POLICE_MAX
-#define TCA_POLICE_RESULT TCA_POLICE_RESULT
-};
-
-#define TCA_POLICE_MAX (__TCA_POLICE_MAX - 1)
-
-/* U32 filters */
-
-#define TC_U32_HTID(h) ((h)&0xFFF00000)
-#define TC_U32_USERHTID(h) (TC_U32_HTID(h)>>20)
-#define TC_U32_HASH(h) (((h)>>12)&0xFF)
-#define TC_U32_NODE(h) ((h)&0xFFF)
-#define TC_U32_KEY(h) ((h)&0xFFFFF)
-#define TC_U32_UNSPEC	0
-#define TC_U32_ROOT	(0xFFF00000)
-
-enum {
-	TCA_U32_UNSPEC,
-	TCA_U32_CLASSID,
-	TCA_U32_HASH,
-	TCA_U32_LINK,
-	TCA_U32_DIVISOR,
-	TCA_U32_SEL,
-	TCA_U32_POLICE,
-	TCA_U32_ACT,   
-	TCA_U32_INDEV,
-	TCA_U32_PCNT,
-	TCA_U32_MARK,
-	__TCA_U32_MAX
-};
-
-#define TCA_U32_MAX (__TCA_U32_MAX - 1)
-
-struct tc_u32_key {
-	__be32		mask;
-	__be32		val;
-	int		off;
-	int		offmask;
-};
-
-struct tc_u32_sel {
-	unsigned char		flags;
-	unsigned char		offshift;
-	unsigned char		nkeys;
-
-	__be16			offmask;
-	__u16			off;
-	short			offoff;
-
-	short			hoff;
-	__be32			hmask;
-	struct tc_u32_key	keys[0];
-};
-
-struct tc_u32_mark {
-	__u32		val;
-	__u32		mask;
-	__u32		success;
-};
-
-struct tc_u32_pcnt {
-	__u64 rcnt;
-	__u64 rhit;
-	__u64 kcnts[0];
-};
-
-/* Flags */
-
-#define TC_U32_TERMINAL		1
-#define TC_U32_OFFSET		2
-#define TC_U32_VAROFFSET	4
-#define TC_U32_EAT		8
-
-#define TC_U32_MAXDEPTH 8
-
-
-/* RSVP filter */
-
-enum {
-	TCA_RSVP_UNSPEC,
-	TCA_RSVP_CLASSID,
-	TCA_RSVP_DST,
-	TCA_RSVP_SRC,
-	TCA_RSVP_PINFO,
-	TCA_RSVP_POLICE,
-	TCA_RSVP_ACT,
-	__TCA_RSVP_MAX
-};
-
-#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
-
-struct tc_rsvp_gpi {
-	__u32	key;
-	__u32	mask;
-	int	offset;
-};
-
-struct tc_rsvp_pinfo {
-	struct tc_rsvp_gpi dpi;
-	struct tc_rsvp_gpi spi;
-	__u8	protocol;
-	__u8	tunnelid;
-	__u8	tunnelhdr;
-	__u8	pad;
-};
-
-/* ROUTE filter */
-
-enum {
-	TCA_ROUTE4_UNSPEC,
-	TCA_ROUTE4_CLASSID,
-	TCA_ROUTE4_TO,
-	TCA_ROUTE4_FROM,
-	TCA_ROUTE4_IIF,
-	TCA_ROUTE4_POLICE,
-	TCA_ROUTE4_ACT,
-	__TCA_ROUTE4_MAX
-};
-
-#define TCA_ROUTE4_MAX (__TCA_ROUTE4_MAX - 1)
-
-
-/* FW filter */
-
-enum {
-	TCA_FW_UNSPEC,
-	TCA_FW_CLASSID,
-	TCA_FW_POLICE,
-	TCA_FW_INDEV, /*  used by CONFIG_NET_CLS_IND */
-	TCA_FW_ACT, /* used by CONFIG_NET_CLS_ACT */
-	TCA_FW_MASK,
-	__TCA_FW_MAX
-};
-
-#define TCA_FW_MAX (__TCA_FW_MAX - 1)
-
-/* TC index filter */
-
-enum {
-	TCA_TCINDEX_UNSPEC,
-	TCA_TCINDEX_HASH,
-	TCA_TCINDEX_MASK,
-	TCA_TCINDEX_SHIFT,
-	TCA_TCINDEX_FALL_THROUGH,
-	TCA_TCINDEX_CLASSID,
-	TCA_TCINDEX_POLICE,
-	TCA_TCINDEX_ACT,
-	__TCA_TCINDEX_MAX
-};
-
-#define TCA_TCINDEX_MAX     (__TCA_TCINDEX_MAX - 1)
-
-/* Flow filter */
-
-enum {
-	FLOW_KEY_SRC,
-	FLOW_KEY_DST,
-	FLOW_KEY_PROTO,
-	FLOW_KEY_PROTO_SRC,
-	FLOW_KEY_PROTO_DST,
-	FLOW_KEY_IIF,
-	FLOW_KEY_PRIORITY,
-	FLOW_KEY_MARK,
-	FLOW_KEY_NFCT,
-	FLOW_KEY_NFCT_SRC,
-	FLOW_KEY_NFCT_DST,
-	FLOW_KEY_NFCT_PROTO_SRC,
-	FLOW_KEY_NFCT_PROTO_DST,
-	FLOW_KEY_RTCLASSID,
-	FLOW_KEY_SKUID,
-	FLOW_KEY_SKGID,
-	FLOW_KEY_VLAN_TAG,
-	FLOW_KEY_RXHASH,
-	__FLOW_KEY_MAX,
-};
-
-#define FLOW_KEY_MAX	(__FLOW_KEY_MAX - 1)
-
-enum {
-	FLOW_MODE_MAP,
-	FLOW_MODE_HASH,
-};
-
-enum {
-	TCA_FLOW_UNSPEC,
-	TCA_FLOW_KEYS,
-	TCA_FLOW_MODE,
-	TCA_FLOW_BASECLASS,
-	TCA_FLOW_RSHIFT,
-	TCA_FLOW_ADDEND,
-	TCA_FLOW_MASK,
-	TCA_FLOW_XOR,
-	TCA_FLOW_DIVISOR,
-	TCA_FLOW_ACT,
-	TCA_FLOW_POLICE,
-	TCA_FLOW_EMATCHES,
-	TCA_FLOW_PERTURB,
-	__TCA_FLOW_MAX
-};
-
-#define TCA_FLOW_MAX	(__TCA_FLOW_MAX - 1)
-
-/* Basic filter */
-
-enum {
-	TCA_BASIC_UNSPEC,
-	TCA_BASIC_CLASSID,
-	TCA_BASIC_EMATCHES,
-	TCA_BASIC_ACT,
-	TCA_BASIC_POLICE,
-	__TCA_BASIC_MAX
-};
-
-#define TCA_BASIC_MAX (__TCA_BASIC_MAX - 1)
-
-
-/* Cgroup classifier */
-
-enum {
-	TCA_CGROUP_UNSPEC,
-	TCA_CGROUP_ACT,
-	TCA_CGROUP_POLICE,
-	TCA_CGROUP_EMATCHES,
-	__TCA_CGROUP_MAX,
-};
-
-#define TCA_CGROUP_MAX (__TCA_CGROUP_MAX - 1)
-
-/* BPF classifier */
-
-#define TCA_BPF_FLAG_ACT_DIRECT		(1 << 0)
-
-enum {
-	TCA_BPF_UNSPEC,
-	TCA_BPF_ACT,
-	TCA_BPF_POLICE,
-	TCA_BPF_CLASSID,
-	TCA_BPF_OPS_LEN,
-	TCA_BPF_OPS,
-	TCA_BPF_FD,
-	TCA_BPF_NAME,
-	TCA_BPF_FLAGS,
-	__TCA_BPF_MAX,
-};
-
-#define TCA_BPF_MAX (__TCA_BPF_MAX - 1)
-
-/* Flower classifier */
-
-enum {
-	TCA_FLOWER_UNSPEC,
-	TCA_FLOWER_CLASSID,
-	TCA_FLOWER_INDEV,
-	TCA_FLOWER_ACT,
-	TCA_FLOWER_KEY_ETH_DST,		/* ETH_ALEN */
-	TCA_FLOWER_KEY_ETH_DST_MASK,	/* ETH_ALEN */
-	TCA_FLOWER_KEY_ETH_SRC,		/* ETH_ALEN */
-	TCA_FLOWER_KEY_ETH_SRC_MASK,	/* ETH_ALEN */
-	TCA_FLOWER_KEY_ETH_TYPE,	/* be16 */
-	TCA_FLOWER_KEY_IP_PROTO,	/* u8 */
-	TCA_FLOWER_KEY_IPV4_SRC,	/* be32 */
-	TCA_FLOWER_KEY_IPV4_SRC_MASK,	/* be32 */
-	TCA_FLOWER_KEY_IPV4_DST,	/* be32 */
-	TCA_FLOWER_KEY_IPV4_DST_MASK,	/* be32 */
-	TCA_FLOWER_KEY_IPV6_SRC,	/* struct in6_addr */
-	TCA_FLOWER_KEY_IPV6_SRC_MASK,	/* struct in6_addr */
-	TCA_FLOWER_KEY_IPV6_DST,	/* struct in6_addr */
-	TCA_FLOWER_KEY_IPV6_DST_MASK,	/* struct in6_addr */
-	TCA_FLOWER_KEY_TCP_SRC,		/* be16 */
-	TCA_FLOWER_KEY_TCP_DST,		/* be16 */
-	TCA_FLOWER_KEY_UDP_SRC,		/* be16 */
-	TCA_FLOWER_KEY_UDP_DST,		/* be16 */
-	__TCA_FLOWER_MAX,
-};
-
-#define TCA_FLOWER_MAX (__TCA_FLOWER_MAX - 1)
-
-/* Extended Matches */
-
-struct tcf_ematch_tree_hdr {
-	__u16		nmatches;
-	__u16		progid;
-};
-
-enum {
-	TCA_EMATCH_TREE_UNSPEC,
-	TCA_EMATCH_TREE_HDR,
-	TCA_EMATCH_TREE_LIST,
-	__TCA_EMATCH_TREE_MAX
-};
-#define TCA_EMATCH_TREE_MAX (__TCA_EMATCH_TREE_MAX - 1)
-
-struct tcf_ematch_hdr {
-	__u16		matchid;
-	__u16		kind;
-	__u16		flags;
-	__u16		pad; /* currently unused */
-};
-
-/*  0                   1
- *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 
- * +-----------------------+-+-+---+
- * |         Unused        |S|I| R |
- * +-----------------------+-+-+---+
- *
- * R(2) ::= relation to next ematch
- *          where: 0 0 END (last ematch)
- *                 0 1 AND
- *                 1 0 OR
- *                 1 1 Unused (invalid)
- * I(1) ::= invert result
- * S(1) ::= simple payload
- */
-#define TCF_EM_REL_END	0
-#define TCF_EM_REL_AND	(1<<0)
-#define TCF_EM_REL_OR	(1<<1)
-#define TCF_EM_INVERT	(1<<2)
-#define TCF_EM_SIMPLE	(1<<3)
-
-#define TCF_EM_REL_MASK	3
-#define TCF_EM_REL_VALID(v) (((v) & TCF_EM_REL_MASK) != TCF_EM_REL_MASK)
-
-enum {
-	TCF_LAYER_LINK,
-	TCF_LAYER_NETWORK,
-	TCF_LAYER_TRANSPORT,
-	__TCF_LAYER_MAX
-};
-#define TCF_LAYER_MAX (__TCF_LAYER_MAX - 1)
-
-/* Ematch type assignments
- *   1..32767		Reserved for ematches inside kernel tree
- *   32768..65535	Free to use, not reliable
- */
-#define	TCF_EM_CONTAINER	0
-#define	TCF_EM_CMP		1
-#define	TCF_EM_NBYTE		2
-#define	TCF_EM_U32		3
-#define	TCF_EM_META		4
-#define	TCF_EM_TEXT		5
-#define	TCF_EM_VLAN		6
-#define	TCF_EM_CANID		7
-#define	TCF_EM_IPSET		8
-#define	TCF_EM_MAX		8
-
-enum {
-	TCF_EM_PROG_TC
-};
-
-enum {
-	TCF_EM_OPND_EQ,
-	TCF_EM_OPND_GT,
-	TCF_EM_OPND_LT
-};
-
-#endif
diff --git a/openflow/usr/include/linux/pkt_sched.h b/openflow/usr/include/linux/pkt_sched.h
deleted file mode 100644
index 8d2530d..0000000
--- a/openflow/usr/include/linux/pkt_sched.h
+++ /dev/null
@@ -1,853 +0,0 @@
-#ifndef __LINUX_PKT_SCHED_H
-#define __LINUX_PKT_SCHED_H
-
-#include <linux/types.h>
-
-/* Logical priority bands not depending on specific packet scheduler.
-   Every scheduler will map them to real traffic classes, if it has
-   no more precise mechanism to classify packets.
-
-   These numbers have no special meaning, though their coincidence
-   with obsolete IPv6 values is not occasional :-). New IPv6 drafts
-   preferred full anarchy inspired by diffserv group.
-
-   Note: TC_PRIO_BESTEFFORT does not mean that it is the most unhappy
-   class, actually, as rule it will be handled with more care than
-   filler or even bulk.
- */
-
-#define TC_PRIO_BESTEFFORT		0
-#define TC_PRIO_FILLER			1
-#define TC_PRIO_BULK			2
-#define TC_PRIO_INTERACTIVE_BULK	4
-#define TC_PRIO_INTERACTIVE		6
-#define TC_PRIO_CONTROL			7
-
-#define TC_PRIO_MAX			15
-
-/* Generic queue statistics, available for all the elements.
-   Particular schedulers may have also their private records.
- */
-
-struct tc_stats {
-	__u64	bytes;			/* Number of enqueued bytes */
-	__u32	packets;		/* Number of enqueued packets	*/
-	__u32	drops;			/* Packets dropped because of lack of resources */
-	__u32	overlimits;		/* Number of throttle events when this
-					 * flow goes out of allocated bandwidth */
-	__u32	bps;			/* Current flow byte rate */
-	__u32	pps;			/* Current flow packet rate */
-	__u32	qlen;
-	__u32	backlog;
-};
-
-struct tc_estimator {
-	signed char	interval;
-	unsigned char	ewma_log;
-};
-
-/* "Handles"
-   ---------
-
-    All the traffic control objects have 32bit identifiers, or "handles".
-
-    They can be considered as opaque numbers from user API viewpoint,
-    but actually they always consist of two fields: major and
-    minor numbers, which are interpreted by kernel specially,
-    that may be used by applications, though not recommended.
-
-    F.e. qdisc handles always have minor number equal to zero,
-    classes (or flows) have major equal to parent qdisc major, and
-    minor uniquely identifying class inside qdisc.
-
-    Macros to manipulate handles:
- */
-
-#define TC_H_MAJ_MASK (0xFFFF0000U)
-#define TC_H_MIN_MASK (0x0000FFFFU)
-#define TC_H_MAJ(h) ((h)&TC_H_MAJ_MASK)
-#define TC_H_MIN(h) ((h)&TC_H_MIN_MASK)
-#define TC_H_MAKE(maj,min) (((maj)&TC_H_MAJ_MASK)|((min)&TC_H_MIN_MASK))
-
-#define TC_H_UNSPEC	(0U)
-#define TC_H_ROOT	(0xFFFFFFFFU)
-#define TC_H_INGRESS    (0xFFFFFFF1U)
-
-/* Need to corrospond to iproute2 tc/tc_core.h "enum link_layer" */
-enum tc_link_layer {
-	TC_LINKLAYER_UNAWARE, /* Indicate unaware old iproute2 util */
-	TC_LINKLAYER_ETHERNET,
-	TC_LINKLAYER_ATM,
-};
-#define TC_LINKLAYER_MASK 0x0F /* limit use to lower 4 bits */
-
-struct tc_ratespec {
-	unsigned char	cell_log;
-	__u8		linklayer; /* lower 4 bits */
-	unsigned short	overhead;
-	short		cell_align;
-	unsigned short	mpu;
-	__u32		rate;
-};
-
-#define TC_RTAB_SIZE	1024
-
-struct tc_sizespec {
-	unsigned char	cell_log;
-	unsigned char	size_log;
-	short		cell_align;
-	int		overhead;
-	unsigned int	linklayer;
-	unsigned int	mpu;
-	unsigned int	mtu;
-	unsigned int	tsize;
-};
-
-enum {
-	TCA_STAB_UNSPEC,
-	TCA_STAB_BASE,
-	TCA_STAB_DATA,
-	__TCA_STAB_MAX
-};
-
-#define TCA_STAB_MAX (__TCA_STAB_MAX - 1)
-
-/* FIFO section */
-
-struct tc_fifo_qopt {
-	__u32	limit;	/* Queue length: bytes for bfifo, packets for pfifo */
-};
-
-/* PRIO section */
-
-#define TCQ_PRIO_BANDS	16
-#define TCQ_MIN_PRIO_BANDS 2
-
-struct tc_prio_qopt {
-	int	bands;			/* Number of bands */
-	__u8	priomap[TC_PRIO_MAX+1];	/* Map: logical priority -> PRIO band */
-};
-
-/* MULTIQ section */
-
-struct tc_multiq_qopt {
-	__u16	bands;			/* Number of bands */
-	__u16	max_bands;		/* Maximum number of queues */
-};
-
-/* PLUG section */
-
-#define TCQ_PLUG_BUFFER                0
-#define TCQ_PLUG_RELEASE_ONE           1
-#define TCQ_PLUG_RELEASE_INDEFINITE    2
-#define TCQ_PLUG_LIMIT                 3
-
-struct tc_plug_qopt {
-	/* TCQ_PLUG_BUFFER: Inset a plug into the queue and
-	 *  buffer any incoming packets
-	 * TCQ_PLUG_RELEASE_ONE: Dequeue packets from queue head
-	 *   to beginning of the next plug.
-	 * TCQ_PLUG_RELEASE_INDEFINITE: Dequeue all packets from queue.
-	 *   Stop buffering packets until the next TCQ_PLUG_BUFFER
-	 *   command is received (just act as a pass-thru queue).
-	 * TCQ_PLUG_LIMIT: Increase/decrease queue size
-	 */
-	int             action;
-	__u32           limit;
-};
-
-/* TBF section */
-
-struct tc_tbf_qopt {
-	struct tc_ratespec rate;
-	struct tc_ratespec peakrate;
-	__u32		limit;
-	__u32		buffer;
-	__u32		mtu;
-};
-
-enum {
-	TCA_TBF_UNSPEC,
-	TCA_TBF_PARMS,
-	TCA_TBF_RTAB,
-	TCA_TBF_PTAB,
-	TCA_TBF_RATE64,
-	TCA_TBF_PRATE64,
-	TCA_TBF_BURST,
-	TCA_TBF_PBURST,
-	__TCA_TBF_MAX,
-};
-
-#define TCA_TBF_MAX (__TCA_TBF_MAX - 1)
-
-
-/* TEQL section */
-
-/* TEQL does not require any parameters */
-
-/* SFQ section */
-
-struct tc_sfq_qopt {
-	unsigned	quantum;	/* Bytes per round allocated to flow */
-	int		perturb_period;	/* Period of hash perturbation */
-	__u32		limit;		/* Maximal packets in queue */
-	unsigned	divisor;	/* Hash divisor  */
-	unsigned	flows;		/* Maximal number of flows  */
-};
-
-struct tc_sfqred_stats {
-	__u32           prob_drop;      /* Early drops, below max threshold */
-	__u32           forced_drop;	/* Early drops, after max threshold */
-	__u32           prob_mark;      /* Marked packets, below max threshold */
-	__u32           forced_mark;    /* Marked packets, after max threshold */
-	__u32           prob_mark_head; /* Marked packets, below max threshold */
-	__u32           forced_mark_head;/* Marked packets, after max threshold */
-};
-
-struct tc_sfq_qopt_v1 {
-	struct tc_sfq_qopt v0;
-	unsigned int	depth;		/* max number of packets per flow */
-	unsigned int	headdrop;
-/* SFQRED parameters */
-	__u32		limit;		/* HARD maximal flow queue length (bytes) */
-	__u32		qth_min;	/* Min average length threshold (bytes) */
-	__u32		qth_max;	/* Max average length threshold (bytes) */
-	unsigned char   Wlog;		/* log(W)		*/
-	unsigned char   Plog;		/* log(P_max/(qth_max-qth_min))	*/
-	unsigned char   Scell_log;	/* cell size for idle damping */
-	unsigned char	flags;
-	__u32		max_P;		/* probability, high resolution */
-/* SFQRED stats */
-	struct tc_sfqred_stats stats;
-};
-
-
-struct tc_sfq_xstats {
-	__s32		allot;
-};
-
-/* RED section */
-
-enum {
-	TCA_RED_UNSPEC,
-	TCA_RED_PARMS,
-	TCA_RED_STAB,
-	TCA_RED_MAX_P,
-	__TCA_RED_MAX,
-};
-
-#define TCA_RED_MAX (__TCA_RED_MAX - 1)
-
-struct tc_red_qopt {
-	__u32		limit;		/* HARD maximal queue length (bytes)	*/
-	__u32		qth_min;	/* Min average length threshold (bytes) */
-	__u32		qth_max;	/* Max average length threshold (bytes) */
-	unsigned char   Wlog;		/* log(W)		*/
-	unsigned char   Plog;		/* log(P_max/(qth_max-qth_min))	*/
-	unsigned char   Scell_log;	/* cell size for idle damping */
-	unsigned char	flags;
-#define TC_RED_ECN		1
-#define TC_RED_HARDDROP		2
-#define TC_RED_ADAPTATIVE	4
-};
-
-struct tc_red_xstats {
-	__u32           early;          /* Early drops */
-	__u32           pdrop;          /* Drops due to queue limits */
-	__u32           other;          /* Drops due to drop() calls */
-	__u32           marked;         /* Marked packets */
-};
-
-/* GRED section */
-
-#define MAX_DPs 16
-
-enum {
-       TCA_GRED_UNSPEC,
-       TCA_GRED_PARMS,
-       TCA_GRED_STAB,
-       TCA_GRED_DPS,
-       TCA_GRED_MAX_P,
-       TCA_GRED_LIMIT,
-       __TCA_GRED_MAX,
-};
-
-#define TCA_GRED_MAX (__TCA_GRED_MAX - 1)
-
-struct tc_gred_qopt {
-	__u32		limit;        /* HARD maximal queue length (bytes)    */
-	__u32		qth_min;      /* Min average length threshold (bytes) */
-	__u32		qth_max;      /* Max average length threshold (bytes) */
-	__u32		DP;           /* up to 2^32 DPs */
-	__u32		backlog;
-	__u32		qave;
-	__u32		forced;
-	__u32		early;
-	__u32		other;
-	__u32		pdrop;
-	__u8		Wlog;         /* log(W)               */
-	__u8		Plog;         /* log(P_max/(qth_max-qth_min)) */
-	__u8		Scell_log;    /* cell size for idle damping */
-	__u8		prio;         /* prio of this VQ */
-	__u32		packets;
-	__u32		bytesin;
-};
-
-/* gred setup */
-struct tc_gred_sopt {
-	__u32		DPs;
-	__u32		def_DP;
-	__u8		grio;
-	__u8		flags;
-	__u16		pad1;
-};
-
-/* CHOKe section */
-
-enum {
-	TCA_CHOKE_UNSPEC,
-	TCA_CHOKE_PARMS,
-	TCA_CHOKE_STAB,
-	TCA_CHOKE_MAX_P,
-	__TCA_CHOKE_MAX,
-};
-
-#define TCA_CHOKE_MAX (__TCA_CHOKE_MAX - 1)
-
-struct tc_choke_qopt {
-	__u32		limit;		/* Hard queue length (packets)	*/
-	__u32		qth_min;	/* Min average threshold (packets) */
-	__u32		qth_max;	/* Max average threshold (packets) */
-	unsigned char   Wlog;		/* log(W)		*/
-	unsigned char   Plog;		/* log(P_max/(qth_max-qth_min))	*/
-	unsigned char   Scell_log;	/* cell size for idle damping */
-	unsigned char	flags;		/* see RED flags */
-};
-
-struct tc_choke_xstats {
-	__u32		early;          /* Early drops */
-	__u32		pdrop;          /* Drops due to queue limits */
-	__u32		other;          /* Drops due to drop() calls */
-	__u32		marked;         /* Marked packets */
-	__u32		matched;	/* Drops due to flow match */
-};
-
-/* HTB section */
-#define TC_HTB_NUMPRIO		8
-#define TC_HTB_MAXDEPTH		8
-#define TC_HTB_PROTOVER		3 /* the same as HTB and TC's major */
-
-struct tc_htb_opt {
-	struct tc_ratespec 	rate;
-	struct tc_ratespec 	ceil;
-	__u32	buffer;
-	__u32	cbuffer;
-	__u32	quantum;
-	__u32	level;		/* out only */
-	__u32	prio;
-};
-struct tc_htb_glob {
-	__u32 version;		/* to match HTB/TC */
-    	__u32 rate2quantum;	/* bps->quantum divisor */
-    	__u32 defcls;		/* default class number */
-	__u32 debug;		/* debug flags */
-
-	/* stats */
-	__u32 direct_pkts; /* count of non shaped packets */
-};
-enum {
-	TCA_HTB_UNSPEC,
-	TCA_HTB_PARMS,
-	TCA_HTB_INIT,
-	TCA_HTB_CTAB,
-	TCA_HTB_RTAB,
-	TCA_HTB_DIRECT_QLEN,
-	TCA_HTB_RATE64,
-	TCA_HTB_CEIL64,
-	__TCA_HTB_MAX,
-};
-
-#define TCA_HTB_MAX (__TCA_HTB_MAX - 1)
-
-struct tc_htb_xstats {
-	__u32 lends;
-	__u32 borrows;
-	__u32 giants;	/* too big packets (rate will not be accurate) */
-	__u32 tokens;
-	__u32 ctokens;
-};
-
-/* HFSC section */
-
-struct tc_hfsc_qopt {
-	__u16	defcls;		/* default class */
-};
-
-struct tc_service_curve {
-	__u32	m1;		/* slope of the first segment in bps */
-	__u32	d;		/* x-projection of the first segment in us */
-	__u32	m2;		/* slope of the second segment in bps */
-};
-
-struct tc_hfsc_stats {
-	__u64	work;		/* total work done */
-	__u64	rtwork;		/* work done by real-time criteria */
-	__u32	period;		/* current period */
-	__u32	level;		/* class level in hierarchy */
-};
-
-enum {
-	TCA_HFSC_UNSPEC,
-	TCA_HFSC_RSC,
-	TCA_HFSC_FSC,
-	TCA_HFSC_USC,
-	__TCA_HFSC_MAX,
-};
-
-#define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)
-
-
-/* CBQ section */
-
-#define TC_CBQ_MAXPRIO		8
-#define TC_CBQ_MAXLEVEL		8
-#define TC_CBQ_DEF_EWMA		5
-
-struct tc_cbq_lssopt {
-	unsigned char	change;
-	unsigned char	flags;
-#define TCF_CBQ_LSS_BOUNDED	1
-#define TCF_CBQ_LSS_ISOLATED	2
-	unsigned char  	ewma_log;
-	unsigned char  	level;
-#define TCF_CBQ_LSS_FLAGS	1
-#define TCF_CBQ_LSS_EWMA	2
-#define TCF_CBQ_LSS_MAXIDLE	4
-#define TCF_CBQ_LSS_MINIDLE	8
-#define TCF_CBQ_LSS_OFFTIME	0x10
-#define TCF_CBQ_LSS_AVPKT	0x20
-	__u32		maxidle;
-	__u32		minidle;
-	__u32		offtime;
-	__u32		avpkt;
-};
-
-struct tc_cbq_wrropt {
-	unsigned char	flags;
-	unsigned char	priority;
-	unsigned char	cpriority;
-	unsigned char	__reserved;
-	__u32		allot;
-	__u32		weight;
-};
-
-struct tc_cbq_ovl {
-	unsigned char	strategy;
-#define	TC_CBQ_OVL_CLASSIC	0
-#define	TC_CBQ_OVL_DELAY	1
-#define	TC_CBQ_OVL_LOWPRIO	2
-#define	TC_CBQ_OVL_DROP		3
-#define	TC_CBQ_OVL_RCLASSIC	4
-	unsigned char	priority2;
-	__u16		pad;
-	__u32		penalty;
-};
-
-struct tc_cbq_police {
-	unsigned char	police;
-	unsigned char	__res1;
-	unsigned short	__res2;
-};
-
-struct tc_cbq_fopt {
-	__u32		split;
-	__u32		defmap;
-	__u32		defchange;
-};
-
-struct tc_cbq_xstats {
-	__u32		borrows;
-	__u32		overactions;
-	__s32		avgidle;
-	__s32		undertime;
-};
-
-enum {
-	TCA_CBQ_UNSPEC,
-	TCA_CBQ_LSSOPT,
-	TCA_CBQ_WRROPT,
-	TCA_CBQ_FOPT,
-	TCA_CBQ_OVL_STRATEGY,
-	TCA_CBQ_RATE,
-	TCA_CBQ_RTAB,
-	TCA_CBQ_POLICE,
-	__TCA_CBQ_MAX,
-};
-
-#define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)
-
-/* dsmark section */
-
-enum {
-	TCA_DSMARK_UNSPEC,
-	TCA_DSMARK_INDICES,
-	TCA_DSMARK_DEFAULT_INDEX,
-	TCA_DSMARK_SET_TC_INDEX,
-	TCA_DSMARK_MASK,
-	TCA_DSMARK_VALUE,
-	__TCA_DSMARK_MAX,
-};
-
-#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
-
-/* ATM  section */
-
-enum {
-	TCA_ATM_UNSPEC,
-	TCA_ATM_FD,		/* file/socket descriptor */
-	TCA_ATM_PTR,		/* pointer to descriptor - later */
-	TCA_ATM_HDR,		/* LL header */
-	TCA_ATM_EXCESS,		/* excess traffic class (0 for CLP)  */
-	TCA_ATM_ADDR,		/* PVC address (for output only) */
-	TCA_ATM_STATE,		/* VC state (ATM_VS_*; for output only) */
-	__TCA_ATM_MAX,
-};
-
-#define TCA_ATM_MAX	(__TCA_ATM_MAX - 1)
-
-/* Network emulator */
-
-enum {
-	TCA_NETEM_UNSPEC,
-	TCA_NETEM_CORR,
-	TCA_NETEM_DELAY_DIST,
-	TCA_NETEM_REORDER,
-	TCA_NETEM_CORRUPT,
-	TCA_NETEM_LOSS,
-	TCA_NETEM_RATE,
-	TCA_NETEM_ECN,
-	TCA_NETEM_RATE64,
-	__TCA_NETEM_MAX,
-};
-
-#define TCA_NETEM_MAX (__TCA_NETEM_MAX - 1)
-
-struct tc_netem_qopt {
-	__u32	latency;	/* added delay (us) */
-	__u32   limit;		/* fifo limit (packets) */
-	__u32	loss;		/* random packet loss (0=none ~0=100%) */
-	__u32	gap;		/* re-ordering gap (0 for none) */
-	__u32   duplicate;	/* random packet dup  (0=none ~0=100%) */
-	__u32	jitter;		/* random jitter in latency (us) */
-};
-
-struct tc_netem_corr {
-	__u32	delay_corr;	/* delay correlation */
-	__u32	loss_corr;	/* packet loss correlation */
-	__u32	dup_corr;	/* duplicate correlation  */
-};
-
-struct tc_netem_reorder {
-	__u32	probability;
-	__u32	correlation;
-};
-
-struct tc_netem_corrupt {
-	__u32	probability;
-	__u32	correlation;
-};
-
-struct tc_netem_rate {
-	__u32	rate;	/* byte/s */
-	__s32	packet_overhead;
-	__u32	cell_size;
-	__s32	cell_overhead;
-};
-
-enum {
-	NETEM_LOSS_UNSPEC,
-	NETEM_LOSS_GI,		/* General Intuitive - 4 state model */
-	NETEM_LOSS_GE,		/* Gilbert Elliot models */
-	__NETEM_LOSS_MAX
-};
-#define NETEM_LOSS_MAX (__NETEM_LOSS_MAX - 1)
-
-/* State transition probabilities for 4 state model */
-struct tc_netem_gimodel {
-	__u32	p13;
-	__u32	p31;
-	__u32	p32;
-	__u32	p14;
-	__u32	p23;
-};
-
-/* Gilbert-Elliot models */
-struct tc_netem_gemodel {
-	__u32 p;
-	__u32 r;
-	__u32 h;
-	__u32 k1;
-};
-
-#define NETEM_DIST_SCALE	8192
-#define NETEM_DIST_MAX		16384
-
-/* DRR */
-
-enum {
-	TCA_DRR_UNSPEC,
-	TCA_DRR_QUANTUM,
-	__TCA_DRR_MAX
-};
-
-#define TCA_DRR_MAX	(__TCA_DRR_MAX - 1)
-
-struct tc_drr_stats {
-	__u32	deficit;
-};
-
-/* MQPRIO */
-#define TC_QOPT_BITMASK 15
-#define TC_QOPT_MAX_QUEUE 16
-
-struct tc_mqprio_qopt {
-	__u8	num_tc;
-	__u8	prio_tc_map[TC_QOPT_BITMASK + 1];
-	__u8	hw;
-	__u16	count[TC_QOPT_MAX_QUEUE];
-	__u16	offset[TC_QOPT_MAX_QUEUE];
-};
-
-/* SFB */
-
-enum {
-	TCA_SFB_UNSPEC,
-	TCA_SFB_PARMS,
-	__TCA_SFB_MAX,
-};
-
-#define TCA_SFB_MAX (__TCA_SFB_MAX - 1)
-
-/*
- * Note: increment, decrement are Q0.16 fixed-point values.
- */
-struct tc_sfb_qopt {
-	__u32 rehash_interval;	/* delay between hash move, in ms */
-	__u32 warmup_time;	/* double buffering warmup time in ms (warmup_time < rehash_interval) */
-	__u32 max;		/* max len of qlen_min */
-	__u32 bin_size;		/* maximum queue length per bin */
-	__u32 increment;	/* probability increment, (d1 in Blue) */
-	__u32 decrement;	/* probability decrement, (d2 in Blue) */
-	__u32 limit;		/* max SFB queue length */
-	__u32 penalty_rate;	/* inelastic flows are rate limited to 'rate' pps */
-	__u32 penalty_burst;
-};
-
-struct tc_sfb_xstats {
-	__u32 earlydrop;
-	__u32 penaltydrop;
-	__u32 bucketdrop;
-	__u32 queuedrop;
-	__u32 childdrop; /* drops in child qdisc */
-	__u32 marked;
-	__u32 maxqlen;
-	__u32 maxprob;
-	__u32 avgprob;
-};
-
-#define SFB_MAX_PROB 0xFFFF
-
-/* QFQ */
-enum {
-	TCA_QFQ_UNSPEC,
-	TCA_QFQ_WEIGHT,
-	TCA_QFQ_LMAX,
-	__TCA_QFQ_MAX
-};
-
-#define TCA_QFQ_MAX	(__TCA_QFQ_MAX - 1)
-
-struct tc_qfq_stats {
-	__u32 weight;
-	__u32 lmax;
-};
-
-/* CODEL */
-
-enum {
-	TCA_CODEL_UNSPEC,
-	TCA_CODEL_TARGET,
-	TCA_CODEL_LIMIT,
-	TCA_CODEL_INTERVAL,
-	TCA_CODEL_ECN,
-	TCA_CODEL_CE_THRESHOLD,
-	__TCA_CODEL_MAX
-};
-
-#define TCA_CODEL_MAX	(__TCA_CODEL_MAX - 1)
-
-struct tc_codel_xstats {
-	__u32	maxpacket; /* largest packet we've seen so far */
-	__u32	count;	   /* how many drops we've done since the last time we
-			    * entered dropping state
-			    */
-	__u32	lastcount; /* count at entry to dropping state */
-	__u32	ldelay;    /* in-queue delay seen by most recently dequeued packet */
-	__s32	drop_next; /* time to drop next packet */
-	__u32	drop_overlimit; /* number of time max qdisc packet limit was hit */
-	__u32	ecn_mark;  /* number of packets we ECN marked instead of dropped */
-	__u32	dropping;  /* are we in dropping state ? */
-	__u32	ce_mark;   /* number of CE marked packets because of ce_threshold */
-};
-
-/* FQ_CODEL */
-
-enum {
-	TCA_FQ_CODEL_UNSPEC,
-	TCA_FQ_CODEL_TARGET,
-	TCA_FQ_CODEL_LIMIT,
-	TCA_FQ_CODEL_INTERVAL,
-	TCA_FQ_CODEL_ECN,
-	TCA_FQ_CODEL_FLOWS,
-	TCA_FQ_CODEL_QUANTUM,
-	TCA_FQ_CODEL_CE_THRESHOLD,
-	__TCA_FQ_CODEL_MAX
-};
-
-#define TCA_FQ_CODEL_MAX	(__TCA_FQ_CODEL_MAX - 1)
-
-enum {
-	TCA_FQ_CODEL_XSTATS_QDISC,
-	TCA_FQ_CODEL_XSTATS_CLASS,
-};
-
-struct tc_fq_codel_qd_stats {
-	__u32	maxpacket;	/* largest packet we've seen so far */
-	__u32	drop_overlimit; /* number of time max qdisc
-				 * packet limit was hit
-				 */
-	__u32	ecn_mark;	/* number of packets we ECN marked
-				 * instead of being dropped
-				 */
-	__u32	new_flow_count; /* number of time packets
-				 * created a 'new flow'
-				 */
-	__u32	new_flows_len;	/* count of flows in new list */
-	__u32	old_flows_len;	/* count of flows in old list */
-	__u32	ce_mark;	/* packets above ce_threshold */
-};
-
-struct tc_fq_codel_cl_stats {
-	__s32	deficit;
-	__u32	ldelay;		/* in-queue delay seen by most recently
-				 * dequeued packet
-				 */
-	__u32	count;
-	__u32	lastcount;
-	__u32	dropping;
-	__s32	drop_next;
-};
-
-struct tc_fq_codel_xstats {
-	__u32	type;
-	union {
-		struct tc_fq_codel_qd_stats qdisc_stats;
-		struct tc_fq_codel_cl_stats class_stats;
-	};
-};
-
-/* FQ */
-
-enum {
-	TCA_FQ_UNSPEC,
-
-	TCA_FQ_PLIMIT,		/* limit of total number of packets in queue */
-
-	TCA_FQ_FLOW_PLIMIT,	/* limit of packets per flow */
-
-	TCA_FQ_QUANTUM,		/* RR quantum */
-
-	TCA_FQ_INITIAL_QUANTUM,		/* RR quantum for new flow */
-
-	TCA_FQ_RATE_ENABLE,	/* enable/disable rate limiting */
-
-	TCA_FQ_FLOW_DEFAULT_RATE,/* obsolete, do not use */
-
-	TCA_FQ_FLOW_MAX_RATE,	/* per flow max rate */
-
-	TCA_FQ_BUCKETS_LOG,	/* log2(number of buckets) */
-
-	TCA_FQ_FLOW_REFILL_DELAY,	/* flow credit refill delay in usec */
-
-	TCA_FQ_ORPHAN_MASK,	/* mask applied to orphaned skb hashes */
-
-	__TCA_FQ_MAX
-};
-
-#define TCA_FQ_MAX	(__TCA_FQ_MAX - 1)
-
-struct tc_fq_qd_stats {
-	__u64	gc_flows;
-	__u64	highprio_packets;
-	__u64	tcp_retrans;
-	__u64	throttled;
-	__u64	flows_plimit;
-	__u64	pkts_too_long;
-	__u64	allocation_errors;
-	__s64	time_next_delayed_flow;
-	__u32	flows;
-	__u32	inactive_flows;
-	__u32	throttled_flows;
-	__u32	pad;
-};
-
-/* Heavy-Hitter Filter */
-
-enum {
-	TCA_HHF_UNSPEC,
-	TCA_HHF_BACKLOG_LIMIT,
-	TCA_HHF_QUANTUM,
-	TCA_HHF_HH_FLOWS_LIMIT,
-	TCA_HHF_RESET_TIMEOUT,
-	TCA_HHF_ADMIT_BYTES,
-	TCA_HHF_EVICT_TIMEOUT,
-	TCA_HHF_NON_HH_WEIGHT,
-	__TCA_HHF_MAX
-};
-
-#define TCA_HHF_MAX	(__TCA_HHF_MAX - 1)
-
-struct tc_hhf_xstats {
-	__u32	drop_overlimit; /* number of times max qdisc packet limit
-				 * was hit
-				 */
-	__u32	hh_overlimit;   /* number of times max heavy-hitters was hit */
-	__u32	hh_tot_count;   /* number of captured heavy-hitters so far */
-	__u32	hh_cur_count;   /* number of current heavy-hitters */
-};
-
-/* PIE */
-enum {
-	TCA_PIE_UNSPEC,
-	TCA_PIE_TARGET,
-	TCA_PIE_LIMIT,
-	TCA_PIE_TUPDATE,
-	TCA_PIE_ALPHA,
-	TCA_PIE_BETA,
-	TCA_PIE_ECN,
-	TCA_PIE_BYTEMODE,
-	__TCA_PIE_MAX
-};
-#define TCA_PIE_MAX   (__TCA_PIE_MAX - 1)
-
-struct tc_pie_xstats {
-	__u32 prob;             /* current probability */
-	__u32 delay;            /* current delay in ms */
-	__u32 avg_dq_rate;      /* current average dq_rate in bits/pie_time */
-	__u32 packets_in;       /* total number of packets enqueued */
-	__u32 dropped;          /* packets dropped due to pie_action */
-	__u32 overlimit;        /* dropped due to lack of space in queue */
-	__u32 maxq;             /* maximum queue size */
-	__u32 ecn_mark;         /* packets marked with ecn*/
-};
-#endif
diff --git a/openflow/usr/include/linux/pktcdvd.h b/openflow/usr/include/linux/pktcdvd.h
deleted file mode 100644
index 7c31eb7..0000000
--- a/openflow/usr/include/linux/pktcdvd.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2000 Jens Axboe <axboe@suse.de>
- * Copyright (C) 2001-2004 Peter Osterlund <petero2@telia.com>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Packet writing layer for ATAPI and SCSI CD-R, CD-RW, DVD-R, and
- * DVD-RW devices.
- *
- */
-#ifndef __PKTCDVD_H
-#define __PKTCDVD_H
-
-#include <linux/types.h>
-
-/*
- * 1 for normal debug messages, 2 is very verbose. 0 to turn it off.
- */
-#define PACKET_DEBUG		1
-
-#define	MAX_WRITERS		8
-
-#define PKT_RB_POOL_SIZE	512
-
-/*
- * How long we should hold a non-full packet before starting data gathering.
- */
-#define PACKET_WAIT_TIME	(HZ * 5 / 1000)
-
-/*
- * use drive write caching -- we need deferred error handling to be
- * able to successfully recover with this option (drive will return good
- * status as soon as the cdb is validated).
- */
-#if defined(CONFIG_CDROM_PKTCDVD_WCACHE)
-#define USE_WCACHING		1
-#else
-#define USE_WCACHING		0
-#endif
-
-/*
- * No user-servicable parts beyond this point ->
- */
-
-/*
- * device types
- */
-#define PACKET_CDR		1
-#define	PACKET_CDRW		2
-#define PACKET_DVDR		3
-#define PACKET_DVDRW		4
-
-/*
- * flags
- */
-#define PACKET_WRITABLE		1	/* pd is writable */
-#define PACKET_NWA_VALID	2	/* next writable address valid */
-#define PACKET_LRA_VALID	3	/* last recorded address valid */
-#define PACKET_MERGE_SEGS	4	/* perform segment merging to keep */
-					/* underlying cdrom device happy */
-
-/*
- * Disc status -- from READ_DISC_INFO
- */
-#define PACKET_DISC_EMPTY	0
-#define PACKET_DISC_INCOMPLETE	1
-#define PACKET_DISC_COMPLETE	2
-#define PACKET_DISC_OTHER	3
-
-/*
- * write type, and corresponding data block type
- */
-#define PACKET_MODE1		1
-#define PACKET_MODE2		2
-#define PACKET_BLOCK_MODE1	8
-#define PACKET_BLOCK_MODE2	10
-
-/*
- * Last session/border status
- */
-#define PACKET_SESSION_EMPTY		0
-#define PACKET_SESSION_INCOMPLETE	1
-#define PACKET_SESSION_RESERVED		2
-#define PACKET_SESSION_COMPLETE		3
-
-#define PACKET_MCN			"4a656e734178626f65323030300000"
-
-#undef PACKET_USE_LS
-
-#define PKT_CTRL_CMD_SETUP	0
-#define PKT_CTRL_CMD_TEARDOWN	1
-#define PKT_CTRL_CMD_STATUS	2
-
-struct pkt_ctrl_command {
-	__u32 command;				/* in: Setup, teardown, status */
-	__u32 dev_index;			/* in/out: Device index */
-	__u32 dev;				/* in/out: Device nr for cdrw device */
-	__u32 pkt_dev;				/* in/out: Device nr for packet device */
-	__u32 num_devices;			/* out: Largest device index + 1 */
-	__u32 padding;				/* Not used */
-};
-
-/*
- * packet ioctls
- */
-#define PACKET_IOCTL_MAGIC	('X')
-#define PACKET_CTRL_CMD		_IOWR(PACKET_IOCTL_MAGIC, 1, struct pkt_ctrl_command)
-
-
-#endif /* __PKTCDVD_H */
diff --git a/openflow/usr/include/linux/pmu.h b/openflow/usr/include/linux/pmu.h
deleted file mode 100644
index 12eccb4..0000000
--- a/openflow/usr/include/linux/pmu.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Definitions for talking to the PMU.  The PMU is a microcontroller
- * which controls battery charging and system power on PowerBook 3400
- * and 2400 models as well as the RTC and various other things.
- *
- * Copyright (C) 1998 Paul Mackerras.
- */
-
-#ifndef _LINUX_PMU_H
-#define _LINUX_PMU_H
-
-#define PMU_DRIVER_VERSION	2
-
-/*
- * PMU commands
- */
-#define PMU_POWER_CTRL0		0x10	/* control power of some devices */
-#define PMU_POWER_CTRL		0x11	/* control power of some devices */
-#define PMU_ADB_CMD		0x20	/* send ADB packet */
-#define PMU_ADB_POLL_OFF	0x21	/* disable ADB auto-poll */
-#define PMU_WRITE_NVRAM		0x33	/* write non-volatile RAM */
-#define PMU_READ_NVRAM		0x3b	/* read non-volatile RAM */
-#define PMU_SET_RTC		0x30	/* set real-time clock */
-#define PMU_READ_RTC		0x38	/* read real-time clock */
-#define PMU_SET_VOLBUTTON	0x40	/* set volume up/down position */
-#define PMU_BACKLIGHT_BRIGHT	0x41	/* set backlight brightness */
-#define PMU_GET_VOLBUTTON	0x48	/* get volume up/down position */
-#define PMU_PCEJECT		0x4c	/* eject PC-card from slot */
-#define PMU_BATTERY_STATE	0x6b	/* report battery state etc. */
-#define PMU_SMART_BATTERY_STATE	0x6f	/* report battery state (new way) */
-#define PMU_SET_INTR_MASK	0x70	/* set PMU interrupt mask */
-#define PMU_INT_ACK		0x78	/* read interrupt bits */
-#define PMU_SHUTDOWN		0x7e	/* turn power off */
-#define PMU_CPU_SPEED		0x7d	/* control CPU speed on some models */
-#define PMU_SLEEP		0x7f	/* put CPU to sleep */
-#define PMU_POWER_EVENTS	0x8f	/* Send power-event commands to PMU */
-#define PMU_I2C_CMD		0x9a	/* I2C operations */
-#define PMU_RESET		0xd0	/* reset CPU */
-#define PMU_GET_BRIGHTBUTTON	0xd9	/* report brightness up/down pos */
-#define PMU_GET_COVER		0xdc	/* report cover open/closed */
-#define PMU_SYSTEM_READY	0xdf	/* tell PMU we are awake */
-#define PMU_GET_VERSION		0xea	/* read the PMU version */
-
-/* Bits to use with the PMU_POWER_CTRL0 command */
-#define PMU_POW0_ON		0x80	/* OR this to power ON the device */
-#define PMU_POW0_OFF		0x00	/* leave bit 7 to 0 to power it OFF */
-#define PMU_POW0_HARD_DRIVE	0x04	/* Hard drive power (on wallstreet/lombard ?) */
-
-/* Bits to use with the PMU_POWER_CTRL command */
-#define PMU_POW_ON		0x80	/* OR this to power ON the device */
-#define PMU_POW_OFF		0x00	/* leave bit 7 to 0 to power it OFF */
-#define PMU_POW_BACKLIGHT	0x01	/* backlight power */
-#define PMU_POW_CHARGER		0x02	/* battery charger power */
-#define PMU_POW_IRLED		0x04	/* IR led power (on wallstreet) */
-#define PMU_POW_MEDIABAY	0x08	/* media bay power (wallstreet/lombard ?) */
-
-/* Bits in PMU interrupt and interrupt mask bytes */
-#define PMU_INT_PCEJECT		0x04	/* PC-card eject buttons */
-#define PMU_INT_SNDBRT		0x08	/* sound/brightness up/down buttons */
-#define PMU_INT_ADB		0x10	/* ADB autopoll or reply data */
-#define PMU_INT_BATTERY		0x20	/* Battery state change */
-#define PMU_INT_ENVIRONMENT	0x40	/* Environment interrupts */
-#define PMU_INT_TICK		0x80	/* 1-second tick interrupt */
-
-/* Other bits in PMU interrupt valid when PMU_INT_ADB is set */
-#define PMU_INT_ADB_AUTO	0x04	/* ADB autopoll, when PMU_INT_ADB */
-#define PMU_INT_WAITING_CHARGER	0x01	/* ??? */
-#define PMU_INT_AUTO_SRQ_POLL	0x02	/* ??? */
-
-/* Bits in the environement message (either obtained via PMU_GET_COVER,
- * or via PMU_INT_ENVIRONMENT on core99 */
-#define PMU_ENV_LID_CLOSED	0x01	/* The lid is closed */
-
-/* I2C related definitions */
-#define PMU_I2C_MODE_SIMPLE	0
-#define PMU_I2C_MODE_STDSUB	1
-#define PMU_I2C_MODE_COMBINED	2
-
-#define PMU_I2C_BUS_STATUS	0
-#define PMU_I2C_BUS_SYSCLK	1
-#define PMU_I2C_BUS_POWER	2
-
-#define PMU_I2C_STATUS_OK	0
-#define PMU_I2C_STATUS_DATAREAD	1
-#define PMU_I2C_STATUS_BUSY	0xfe
-
-
-/* Kind of PMU (model) */
-enum {
-	PMU_UNKNOWN,
-	PMU_OHARE_BASED,	/* 2400, 3400, 3500 (old G3 powerbook) */
-	PMU_HEATHROW_BASED,	/* PowerBook G3 series */
-	PMU_PADDINGTON_BASED,	/* 1999 PowerBook G3 */
-	PMU_KEYLARGO_BASED,	/* Core99 motherboard (PMU99) */
-	PMU_68K_V1,		/* 68K PMU, version 1 */
-	PMU_68K_V2, 		/* 68K PMU, version 2 */
-};
-
-/* PMU PMU_POWER_EVENTS commands */
-enum {
-	PMU_PWR_GET_POWERUP_EVENTS	= 0x00,
-	PMU_PWR_SET_POWERUP_EVENTS	= 0x01,
-	PMU_PWR_CLR_POWERUP_EVENTS	= 0x02,
-	PMU_PWR_GET_WAKEUP_EVENTS	= 0x03,
-	PMU_PWR_SET_WAKEUP_EVENTS	= 0x04,
-	PMU_PWR_CLR_WAKEUP_EVENTS	= 0x05,
-};
-
-/* Power events wakeup bits */
-enum {
-	PMU_PWR_WAKEUP_KEY		= 0x01,	/* Wake on key press */
-	PMU_PWR_WAKEUP_AC_INSERT	= 0x02, /* Wake on AC adapter plug */
-	PMU_PWR_WAKEUP_AC_CHANGE	= 0x04,
-	PMU_PWR_WAKEUP_LID_OPEN		= 0x08,
-	PMU_PWR_WAKEUP_RING		= 0x10,
-};
-	
-/*
- * Ioctl commands for the /dev/pmu device
- */
-#include <linux/ioctl.h>
-
-/* no param */
-#define PMU_IOC_SLEEP		_IO('B', 0)
-/* out param: u32*	backlight value: 0 to 15 */
-#define PMU_IOC_GET_BACKLIGHT	_IOR('B', 1, size_t)
-/* in param: u32	backlight value: 0 to 15 */
-#define PMU_IOC_SET_BACKLIGHT	_IOW('B', 2, size_t)
-/* out param: u32*	PMU model */
-#define PMU_IOC_GET_MODEL	_IOR('B', 3, size_t)
-/* out param: u32*	has_adb: 0 or 1 */
-#define PMU_IOC_HAS_ADB		_IOR('B', 4, size_t) 
-/* out param: u32*	can_sleep: 0 or 1 */
-#define PMU_IOC_CAN_SLEEP	_IOR('B', 5, size_t) 
-/* no param, but historically was _IOR('B', 6, 0), meaning 4 bytes */
-#define PMU_IOC_GRAB_BACKLIGHT	_IOR('B', 6, size_t) 
-
-
-#endif /* _LINUX_PMU_H */
diff --git a/openflow/usr/include/linux/poll.h b/openflow/usr/include/linux/poll.h
deleted file mode 100644
index 2001fed..0000000
--- a/openflow/usr/include/linux/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/poll.h>
diff --git a/openflow/usr/include/linux/posix_types.h b/openflow/usr/include/linux/posix_types.h
deleted file mode 100644
index 988f76e..0000000
--- a/openflow/usr/include/linux/posix_types.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _LINUX_POSIX_TYPES_H
-#define _LINUX_POSIX_TYPES_H
-
-#include <linux/stddef.h>
-
-/*
- * This allows for 1024 file descriptors: if NR_OPEN is ever grown
- * beyond that you'll have to change this too. But 1024 fd's seem to be
- * enough even for such "real" unices like OSF/1, so hopefully this is
- * one limit that doesn't have to be changed [again].
- *
- * Note that POSIX wants the FD_CLEAR(fd,fdsetp) defines to be in
- * <sys/time.h> (and thus <linux/time.h>) - but this is a more logical
- * place for them. Solved by having dummy defines in <sys/time.h>.
- */
-
-/*
- * This macro may have been defined in <gnu/types.h>. But we always
- * use the one here.
- */
-#undef __FD_SETSIZE
-#define __FD_SETSIZE	1024
-
-typedef struct {
-	unsigned long fds_bits[__FD_SETSIZE / (8 * sizeof(long))];
-} __kernel_fd_set;
-
-/* Type of a signal handler.  */
-typedef void (*__kernel_sighandler_t)(int);
-
-/* Type of a SYSV IPC key.  */
-typedef int __kernel_key_t;
-typedef int __kernel_mqd_t;
-
-#include <asm/posix_types.h>
-
-#endif /* _LINUX_POSIX_TYPES_H */
diff --git a/openflow/usr/include/linux/ppdev.h b/openflow/usr/include/linux/ppdev.h
deleted file mode 100644
index dc18c5d..0000000
--- a/openflow/usr/include/linux/ppdev.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * linux/include/linux/ppdev.h
- *
- * User-space parallel port device driver (header file).
- *
- * Copyright (C) 1998-9 Tim Waugh <tim@cyberelk.demon.co.uk>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- * Added PPGETTIME/PPSETTIME, Fred Barnes, 1999
- * Added PPGETMODES/PPGETMODE/PPGETPHASE, Fred Barnes <frmb2@ukc.ac.uk>, 03/01/2001
- */
-
-#define PP_IOCTL	'p'
-
-/* Set mode for read/write (e.g. IEEE1284_MODE_EPP) */
-#define PPSETMODE	_IOW(PP_IOCTL, 0x80, int)
-
-/* Read status */
-#define PPRSTATUS	_IOR(PP_IOCTL, 0x81, unsigned char)
-#define PPWSTATUS	OBSOLETE__IOW(PP_IOCTL, 0x82, unsigned char)
-
-/* Read/write control */
-#define PPRCONTROL	_IOR(PP_IOCTL, 0x83, unsigned char)
-#define PPWCONTROL	_IOW(PP_IOCTL, 0x84, unsigned char)
-
-struct ppdev_frob_struct {
-	unsigned char mask;
-	unsigned char val;
-};
-#define PPFCONTROL      _IOW(PP_IOCTL, 0x8e, struct ppdev_frob_struct)
-
-/* Read/write data */
-#define PPRDATA		_IOR(PP_IOCTL, 0x85, unsigned char)
-#define PPWDATA		_IOW(PP_IOCTL, 0x86, unsigned char)
-
-/* Read/write econtrol (not used) */
-#define PPRECONTROL	OBSOLETE__IOR(PP_IOCTL, 0x87, unsigned char)
-#define PPWECONTROL	OBSOLETE__IOW(PP_IOCTL, 0x88, unsigned char)
-
-/* Read/write FIFO (not used) */
-#define PPRFIFO		OBSOLETE__IOR(PP_IOCTL, 0x89, unsigned char)
-#define PPWFIFO		OBSOLETE__IOW(PP_IOCTL, 0x8a, unsigned char)
-
-/* Claim the port to start using it */
-#define PPCLAIM		_IO(PP_IOCTL, 0x8b)
-
-/* Release the port when you aren't using it */
-#define PPRELEASE	_IO(PP_IOCTL, 0x8c)
-
-/* Yield the port (release it if another driver is waiting,
- * then reclaim) */
-#define PPYIELD		_IO(PP_IOCTL, 0x8d)
-
-/* Register device exclusively (must be before PPCLAIM). */
-#define PPEXCL		_IO(PP_IOCTL, 0x8f)
-
-/* Data line direction: non-zero for input mode. */
-#define PPDATADIR	_IOW(PP_IOCTL, 0x90, int)
-
-/* Negotiate a particular IEEE 1284 mode. */
-#define PPNEGOT		_IOW(PP_IOCTL, 0x91, int)
-
-/* Set control lines when an interrupt occurs. */
-#define PPWCTLONIRQ	_IOW(PP_IOCTL, 0x92, unsigned char)
-
-/* Clear (and return) interrupt count. */
-#define PPCLRIRQ	_IOR(PP_IOCTL, 0x93, int)
-
-/* Set the IEEE 1284 phase that we're in (e.g. IEEE1284_PH_FWD_IDLE) */
-#define PPSETPHASE	_IOW(PP_IOCTL, 0x94, int)
-
-/* Set and get port timeout (struct timeval's) */
-#define PPGETTIME	_IOR(PP_IOCTL, 0x95, struct timeval)
-#define PPSETTIME	_IOW(PP_IOCTL, 0x96, struct timeval)
-
-/* Get available modes (what the hardware can do) */
-#define PPGETMODES	_IOR(PP_IOCTL, 0x97, unsigned int)
-
-/* Get the current mode and phaze */
-#define PPGETMODE	_IOR(PP_IOCTL, 0x98, int)
-#define PPGETPHASE	_IOR(PP_IOCTL, 0x99, int)
-
-/* get/set flags */
-#define PPGETFLAGS	_IOR(PP_IOCTL, 0x9a, int)
-#define PPSETFLAGS	_IOW(PP_IOCTL, 0x9b, int)
-
-/* flags visible to the world */
-#define PP_FASTWRITE	(1<<2)
-#define PP_FASTREAD	(1<<3)
-#define PP_W91284PIC	(1<<4)
-
-/* only masks user-visible flags */
-#define PP_FLAGMASK	(PP_FASTWRITE | PP_FASTREAD | PP_W91284PIC)
-
-
diff --git a/openflow/usr/include/linux/ppp-comp.h b/openflow/usr/include/linux/ppp-comp.h
deleted file mode 100644
index e16dead..0000000
--- a/openflow/usr/include/linux/ppp-comp.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * ppp-comp.h - Definitions for doing PPP packet compression.
- *
- * Copyright 1994-1998 Paul Mackerras.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  version 2 as published by the Free Software Foundation.
- */
-#ifndef _NET_PPP_COMP_H
-#define _NET_PPP_COMP_H
-
-
-/*
- * CCP codes.
- */
-
-#define CCP_CONFREQ	1
-#define CCP_CONFACK	2
-#define CCP_TERMREQ	5
-#define CCP_TERMACK	6
-#define CCP_RESETREQ	14
-#define CCP_RESETACK	15
-
-/*
- * Max # bytes for a CCP option
- */
-
-#define CCP_MAX_OPTION_LENGTH	32
-
-/*
- * Parts of a CCP packet.
- */
-
-#define CCP_CODE(dp)		((dp)[0])
-#define CCP_ID(dp)		((dp)[1])
-#define CCP_LENGTH(dp)		(((dp)[2] << 8) + (dp)[3])
-#define CCP_HDRLEN		4
-
-#define CCP_OPT_CODE(dp)	((dp)[0])
-#define CCP_OPT_LENGTH(dp)	((dp)[1])
-#define CCP_OPT_MINLEN		2
-
-/*
- * Definitions for BSD-Compress.
- */
-
-#define CI_BSD_COMPRESS		21	/* config. option for BSD-Compress */
-#define CILEN_BSD_COMPRESS	3	/* length of config. option */
-
-/* Macros for handling the 3rd byte of the BSD-Compress config option. */
-#define BSD_NBITS(x)		((x) & 0x1F)	/* number of bits requested */
-#define BSD_VERSION(x)		((x) >> 5)	/* version of option format */
-#define BSD_CURRENT_VERSION	1		/* current version number */
-#define BSD_MAKE_OPT(v, n)	(((v) << 5) | (n))
-
-#define BSD_MIN_BITS		9	/* smallest code size supported */
-#define BSD_MAX_BITS		15	/* largest code size supported */
-
-/*
- * Definitions for Deflate.
- */
-
-#define CI_DEFLATE		26	/* config option for Deflate */
-#define CI_DEFLATE_DRAFT	24	/* value used in original draft RFC */
-#define CILEN_DEFLATE		4	/* length of its config option */
-
-#define DEFLATE_MIN_SIZE	9
-#define DEFLATE_MAX_SIZE	15
-#define DEFLATE_METHOD_VAL	8
-#define DEFLATE_SIZE(x)		(((x) >> 4) + 8)
-#define DEFLATE_METHOD(x)	((x) & 0x0F)
-#define DEFLATE_MAKE_OPT(w)	((((w) - 8) << 4) + DEFLATE_METHOD_VAL)
-#define DEFLATE_CHK_SEQUENCE	0
-
-/*
- * Definitions for MPPE.
- */
-
-#define CI_MPPE                18      /* config option for MPPE */
-#define CILEN_MPPE              6      /* length of config option */
-
-/*
- * Definitions for other, as yet unsupported, compression methods.
- */
-
-#define CI_PREDICTOR_1		1	/* config option for Predictor-1 */
-#define CILEN_PREDICTOR_1	2	/* length of its config option */
-#define CI_PREDICTOR_2		2	/* config option for Predictor-2 */
-#define CILEN_PREDICTOR_2	2	/* length of its config option */
-
-
-#endif /* _NET_PPP_COMP_H */
diff --git a/openflow/usr/include/linux/ppp-ioctl.h b/openflow/usr/include/linux/ppp-ioctl.h
deleted file mode 100644
index 62ccaa6..0000000
--- a/openflow/usr/include/linux/ppp-ioctl.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * ppp-ioctl.h - PPP ioctl definitions.
- *
- * Copyright 1999-2002 Paul Mackerras.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  version 2 as published by the Free Software Foundation.
- */
-#ifndef _PPP_IOCTL_H
-#define _PPP_IOCTL_H
-
-#include <linux/types.h>
-
-#include <linux/ppp_defs.h>
-
-/*
- * Bit definitions for flags argument to PPPIOCGFLAGS/PPPIOCSFLAGS.
- */
-#define SC_COMP_PROT	0x00000001	/* protocol compression (output) */
-#define SC_COMP_AC	0x00000002	/* header compression (output) */
-#define	SC_COMP_TCP	0x00000004	/* TCP (VJ) compression (output) */
-#define SC_NO_TCP_CCID	0x00000008	/* disable VJ connection-id comp. */
-#define SC_REJ_COMP_AC	0x00000010	/* reject adrs/ctrl comp. on input */
-#define SC_REJ_COMP_TCP	0x00000020	/* reject TCP (VJ) comp. on input */
-#define SC_CCP_OPEN	0x00000040	/* Look at CCP packets */
-#define SC_CCP_UP	0x00000080	/* May send/recv compressed packets */
-#define SC_ENABLE_IP	0x00000100	/* IP packets may be exchanged */
-#define SC_LOOP_TRAFFIC	0x00000200	/* send traffic to pppd */
-#define SC_MULTILINK	0x00000400	/* do multilink encapsulation */
-#define SC_MP_SHORTSEQ	0x00000800	/* use short MP sequence numbers */
-#define SC_COMP_RUN	0x00001000	/* compressor has been inited */
-#define SC_DECOMP_RUN	0x00002000	/* decompressor has been inited */
-#define SC_MP_XSHORTSEQ	0x00004000	/* transmit short MP seq numbers */
-#define SC_DEBUG	0x00010000	/* enable debug messages */
-#define SC_LOG_INPKT	0x00020000	/* log contents of good pkts recvd */
-#define SC_LOG_OUTPKT	0x00040000	/* log contents of pkts sent */
-#define SC_LOG_RAWIN	0x00080000	/* log all chars received */
-#define SC_LOG_FLUSH	0x00100000	/* log all chars flushed */
-#define	SC_SYNC		0x00200000	/* synchronous serial mode */
-#define	SC_MUST_COMP    0x00400000	/* no uncompressed packets may be sent or received */
-#define	SC_MASK		0x0f600fff	/* bits that user can change */
-
-/* state bits */
-#define SC_XMIT_BUSY	0x10000000	/* (used by isdn_ppp?) */
-#define SC_RCV_ODDP	0x08000000	/* have rcvd char with odd parity */
-#define SC_RCV_EVNP	0x04000000	/* have rcvd char with even parity */
-#define SC_RCV_B7_1	0x02000000	/* have rcvd char with bit 7 = 1 */
-#define SC_RCV_B7_0	0x01000000	/* have rcvd char with bit 7 = 0 */
-#define SC_DC_FERROR	0x00800000	/* fatal decomp error detected */
-#define SC_DC_ERROR	0x00400000	/* non-fatal decomp error detected */
-
-/* Used with PPPIOCGNPMODE/PPPIOCSNPMODE */
-struct npioctl {
-	int		protocol;	/* PPP protocol, e.g. PPP_IP */
-	enum NPmode	mode;
-};
-
-/* Structure describing a CCP configuration option, for PPPIOCSCOMPRESS */
-struct ppp_option_data {
-	__u8	*ptr;
-	__u32	length;
-	int	transmit;
-};
-
-/* For PPPIOCGL2TPSTATS */
-struct pppol2tp_ioc_stats {
-	__u16		tunnel_id;	/* redundant */
-	__u16		session_id;	/* if zero, get tunnel stats */
-	__u32		using_ipsec:1;	/* valid only for session_id == 0 */
-	__aligned_u64	tx_packets;
-	__aligned_u64	tx_bytes;
-	__aligned_u64	tx_errors;
-	__aligned_u64	rx_packets;
-	__aligned_u64	rx_bytes;
-	__aligned_u64	rx_seq_discards;
-	__aligned_u64	rx_oos_packets;
-	__aligned_u64	rx_errors;
-};
-
-/*
- * Ioctl definitions.
- */
-
-#define	PPPIOCGFLAGS	_IOR('t', 90, int)	/* get configuration flags */
-#define	PPPIOCSFLAGS	_IOW('t', 89, int)	/* set configuration flags */
-#define	PPPIOCGASYNCMAP	_IOR('t', 88, int)	/* get async map */
-#define	PPPIOCSASYNCMAP	_IOW('t', 87, int)	/* set async map */
-#define	PPPIOCGUNIT	_IOR('t', 86, int)	/* get ppp unit number */
-#define	PPPIOCGRASYNCMAP _IOR('t', 85, int)	/* get receive async map */
-#define	PPPIOCSRASYNCMAP _IOW('t', 84, int)	/* set receive async map */
-#define	PPPIOCGMRU	_IOR('t', 83, int)	/* get max receive unit */
-#define	PPPIOCSMRU	_IOW('t', 82, int)	/* set max receive unit */
-#define	PPPIOCSMAXCID	_IOW('t', 81, int)	/* set VJ max slot ID */
-#define PPPIOCGXASYNCMAP _IOR('t', 80, ext_accm) /* get extended ACCM */
-#define PPPIOCSXASYNCMAP _IOW('t', 79, ext_accm) /* set extended ACCM */
-#define PPPIOCXFERUNIT	_IO('t', 78)		/* transfer PPP unit */
-#define PPPIOCSCOMPRESS	_IOW('t', 77, struct ppp_option_data)
-#define PPPIOCGNPMODE	_IOWR('t', 76, struct npioctl) /* get NP mode */
-#define PPPIOCSNPMODE	_IOW('t', 75, struct npioctl)  /* set NP mode */
-#define PPPIOCSPASS	_IOW('t', 71, struct sock_fprog) /* set pass filter */
-#define PPPIOCSACTIVE	_IOW('t', 70, struct sock_fprog) /* set active filt */
-#define PPPIOCGDEBUG	_IOR('t', 65, int)	/* Read debug level */
-#define PPPIOCSDEBUG	_IOW('t', 64, int)	/* Set debug level */
-#define PPPIOCGIDLE	_IOR('t', 63, struct ppp_idle) /* get idle time */
-#define PPPIOCNEWUNIT	_IOWR('t', 62, int)	/* create new ppp unit */
-#define PPPIOCATTACH	_IOW('t', 61, int)	/* attach to ppp unit */
-#define PPPIOCDETACH	_IOW('t', 60, int)	/* detach from ppp unit/chan */
-#define PPPIOCSMRRU	_IOW('t', 59, int)	/* set multilink MRU */
-#define PPPIOCCONNECT	_IOW('t', 58, int)	/* connect channel to unit */
-#define PPPIOCDISCONN	_IO('t', 57)		/* disconnect channel */
-#define PPPIOCATTCHAN	_IOW('t', 56, int)	/* attach to ppp channel */
-#define PPPIOCGCHAN	_IOR('t', 55, int)	/* get ppp channel number */
-#define PPPIOCGL2TPSTATS _IOR('t', 54, struct pppol2tp_ioc_stats)
-
-#define SIOCGPPPSTATS   (SIOCDEVPRIVATE + 0)
-#define SIOCGPPPVER     (SIOCDEVPRIVATE + 1)	/* NEVER change this!! */
-#define SIOCGPPPCSTATS  (SIOCDEVPRIVATE + 2)
-
-#endif /* _PPP_IOCTL_H */
diff --git a/openflow/usr/include/linux/ppp_defs.h b/openflow/usr/include/linux/ppp_defs.h
deleted file mode 100644
index 096dd5c..0000000
--- a/openflow/usr/include/linux/ppp_defs.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * ppp_defs.h - PPP definitions.
- *
- * Copyright 1994-2000 Paul Mackerras.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  version 2 as published by the Free Software Foundation.
- */
-#include <linux/types.h>
-
-#ifndef _PPP_DEFS_H_
-#define _PPP_DEFS_H_
-
-/*
- * The basic PPP frame.
- */
-#define PPP_HDRLEN	4	/* octets for standard ppp header */
-#define PPP_FCSLEN	2	/* octets for FCS */
-#define PPP_MRU		1500	/* default MRU = max length of info field */
-
-#define PPP_ADDRESS(p)	(((__u8 *)(p))[0])
-#define PPP_CONTROL(p)	(((__u8 *)(p))[1])
-#define PPP_PROTOCOL(p)	((((__u8 *)(p))[2] << 8) + ((__u8 *)(p))[3])
-
-/*
- * Significant octet values.
- */
-#define	PPP_ALLSTATIONS	0xff	/* All-Stations broadcast address */
-#define	PPP_UI		0x03	/* Unnumbered Information */
-#define	PPP_FLAG	0x7e	/* Flag Sequence */
-#define	PPP_ESCAPE	0x7d	/* Asynchronous Control Escape */
-#define	PPP_TRANS	0x20	/* Asynchronous transparency modifier */
-
-/*
- * Protocol field values.
- */
-#define PPP_IP		0x21	/* Internet Protocol */
-#define PPP_AT		0x29	/* AppleTalk Protocol */
-#define PPP_IPX		0x2b	/* IPX protocol */
-#define	PPP_VJC_COMP	0x2d	/* VJ compressed TCP */
-#define	PPP_VJC_UNCOMP	0x2f	/* VJ uncompressed TCP */
-#define PPP_MP		0x3d	/* Multilink protocol */
-#define PPP_IPV6	0x57	/* Internet Protocol Version 6 */
-#define PPP_COMPFRAG	0xfb	/* fragment compressed below bundle */
-#define PPP_COMP	0xfd	/* compressed packet */
-#define PPP_MPLS_UC	0x0281	/* Multi Protocol Label Switching - Unicast */
-#define PPP_MPLS_MC	0x0283	/* Multi Protocol Label Switching - Multicast */
-#define PPP_IPCP	0x8021	/* IP Control Protocol */
-#define PPP_ATCP	0x8029	/* AppleTalk Control Protocol */
-#define PPP_IPXCP	0x802b	/* IPX Control Protocol */
-#define PPP_IPV6CP	0x8057	/* IPv6 Control Protocol */
-#define PPP_CCPFRAG	0x80fb	/* CCP at link level (below MP bundle) */
-#define PPP_CCP		0x80fd	/* Compression Control Protocol */
-#define PPP_MPLSCP	0x80fd	/* MPLS Control Protocol */
-#define PPP_LCP		0xc021	/* Link Control Protocol */
-#define PPP_PAP		0xc023	/* Password Authentication Protocol */
-#define PPP_LQR		0xc025	/* Link Quality Report protocol */
-#define PPP_CHAP	0xc223	/* Cryptographic Handshake Auth. Protocol */
-#define PPP_CBCP	0xc029	/* Callback Control Protocol */
-
-/*
- * Values for FCS calculations.
- */
-
-#define PPP_INITFCS	0xffff	/* Initial FCS value */
-#define PPP_GOODFCS	0xf0b8	/* Good final FCS value */
-
-
-/*
- * Extended asyncmap - allows any character to be escaped.
- */
-
-typedef __u32		ext_accm[8];
-
-/*
- * What to do with network protocol (NP) packets.
- */
-enum NPmode {
-    NPMODE_PASS,		/* pass the packet through */
-    NPMODE_DROP,		/* silently drop the packet */
-    NPMODE_ERROR,		/* return an error */
-    NPMODE_QUEUE		/* save it up for later. */
-};
-
-/*
- * Statistics for LQRP and pppstats
- */
-struct pppstat	{
-    __u32	ppp_discards;	/* # frames discarded */
-
-    __u32	ppp_ibytes;	/* bytes received */
-    __u32	ppp_ioctects;	/* bytes received not in error */
-    __u32	ppp_ipackets;	/* packets received */
-    __u32	ppp_ierrors;	/* receive errors */
-    __u32	ppp_ilqrs;	/* # LQR frames received */
-
-    __u32	ppp_obytes;	/* raw bytes sent */
-    __u32	ppp_ooctects;	/* frame bytes sent */
-    __u32	ppp_opackets;	/* packets sent */
-    __u32	ppp_oerrors;	/* transmit errors */ 
-    __u32	ppp_olqrs;	/* # LQR frames sent */
-};
-
-struct vjstat {
-    __u32	vjs_packets;	/* outbound packets */
-    __u32	vjs_compressed;	/* outbound compressed packets */
-    __u32	vjs_searches;	/* searches for connection state */
-    __u32	vjs_misses;	/* times couldn't find conn. state */
-    __u32	vjs_uncompressedin; /* inbound uncompressed packets */
-    __u32	vjs_compressedin;   /* inbound compressed packets */
-    __u32	vjs_errorin;	/* inbound unknown type packets */
-    __u32	vjs_tossed;	/* inbound packets tossed because of error */
-};
-
-struct compstat {
-    __u32	unc_bytes;	/* total uncompressed bytes */
-    __u32	unc_packets;	/* total uncompressed packets */
-    __u32	comp_bytes;	/* compressed bytes */
-    __u32	comp_packets;	/* compressed packets */
-    __u32	inc_bytes;	/* incompressible bytes */
-    __u32	inc_packets;	/* incompressible packets */
-
-    /* the compression ratio is defined as in_count / bytes_out */
-    __u32       in_count;	/* Bytes received */
-    __u32       bytes_out;	/* Bytes transmitted */
-
-    double	ratio;		/* not computed in kernel. */
-};
-
-struct ppp_stats {
-    struct pppstat	p;	/* basic PPP statistics */
-    struct vjstat	vj;	/* VJ header compression statistics */
-};
-
-struct ppp_comp_stats {
-    struct compstat	c;	/* packet compression statistics */
-    struct compstat	d;	/* packet decompression statistics */
-};
-
-/*
- * The following structure records the time in seconds since
- * the last NP packet was sent or received.
- */
-struct ppp_idle {
-    __kernel_time_t xmit_idle;	/* time since last NP packet sent */
-    __kernel_time_t recv_idle;	/* time since last NP packet received */
-};
-
-#endif /* _PPP_DEFS_H_ */
diff --git a/openflow/usr/include/linux/pps.h b/openflow/usr/include/linux/pps.h
deleted file mode 100644
index a9bb1d9..0000000
--- a/openflow/usr/include/linux/pps.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * PPS API header
- *
- * Copyright (C) 2005-2009   Rodolfo Giometti <giometti@linux.it>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#ifndef _PPS_H_
-#define _PPS_H_
-
-#include <linux/types.h>
-
-#define PPS_VERSION		"5.3.6"
-#define PPS_MAX_SOURCES		16		/* should be enough... */
-
-/* Implementation note: the logical states ``assert'' and ``clear''
- * are implemented in terms of the chip register, i.e. ``assert''
- * means the bit is set.  */
-
-/*
- * 3.2 New data structures
- */
-
-#define PPS_API_VERS_1		1
-#define PPS_API_VERS		PPS_API_VERS_1	/* we use API version 1 */
-#define PPS_MAX_NAME_LEN	32
-
-/* 32-bit vs. 64-bit compatibility.
- *
- * 0n i386, the alignment of a uint64_t is only 4 bytes, while on most other
- * architectures it's 8 bytes. On i386, there will be no padding between the
- * two consecutive 'struct pps_ktime' members of struct pps_kinfo and struct
- * pps_kparams. But on most platforms there will be padding to ensure correct
- * alignment.
- *
- * The simple fix is probably to add an explicit padding.
- *					 		[David Woodhouse]
- */
-struct pps_ktime {
-	__s64 sec;
-	__s32 nsec;
-	__u32 flags;
-};
-#define PPS_TIME_INVALID	(1<<0)	/* used to specify timeout==NULL */
-
-struct pps_kinfo {
-	__u32 assert_sequence;		/* seq. num. of assert event */
-	__u32 clear_sequence; 		/* seq. num. of clear event */
-	struct pps_ktime assert_tu;	/* time of assert event */
-	struct pps_ktime clear_tu;	/* time of clear event */
-	int current_mode;		/* current mode bits */
-};
-
-struct pps_kparams {
-	int api_version;		/* API version # */
-	int mode;			/* mode bits */
-	struct pps_ktime assert_off_tu;	/* offset compensation for assert */
-	struct pps_ktime clear_off_tu;	/* offset compensation for clear */
-};
-
-/*
- * 3.3 Mode bit definitions
- */
-
-/* Device/implementation parameters */
-#define PPS_CAPTUREASSERT	0x01	/* capture assert events */
-#define PPS_CAPTURECLEAR	0x02	/* capture clear events */
-#define PPS_CAPTUREBOTH		0x03	/* capture assert and clear events */
-
-#define PPS_OFFSETASSERT	0x10	/* apply compensation for assert ev. */
-#define PPS_OFFSETCLEAR		0x20	/* apply compensation for clear ev. */
-
-#define PPS_CANWAIT		0x100	/* can we wait for an event? */
-#define PPS_CANPOLL		0x200	/* bit reserved for future use */
-
-/* Kernel actions */
-#define PPS_ECHOASSERT		0x40	/* feed back assert event to output */
-#define PPS_ECHOCLEAR		0x80	/* feed back clear event to output */
-
-/* Timestamp formats */
-#define PPS_TSFMT_TSPEC		0x1000	/* select timespec format */
-#define PPS_TSFMT_NTPFP		0x2000	/* select NTP format */
-
-/*
- * 3.4.4 New functions: disciplining the kernel timebase
- */
-
-/* Kernel consumers */
-#define PPS_KC_HARDPPS		0	/* hardpps() (or equivalent) */
-#define PPS_KC_HARDPPS_PLL	1	/* hardpps() constrained to
-					   use a phase-locked loop */
-#define PPS_KC_HARDPPS_FLL	2	/* hardpps() constrained to
-					   use a frequency-locked loop */
-/*
- * Here begins the implementation-specific part!
- */
-
-struct pps_fdata {
-	struct pps_kinfo info;
-	struct pps_ktime timeout;
-};
-
-struct pps_bind_args {
-	int tsformat;	/* format of time stamps */
-	int edge;	/* selected event type */
-	int consumer;	/* selected kernel consumer */
-};
-
-#include <linux/ioctl.h>
-
-#define PPS_GETPARAMS		_IOR('p', 0xa1, struct pps_kparams *)
-#define PPS_SETPARAMS		_IOW('p', 0xa2, struct pps_kparams *)
-#define PPS_GETCAP		_IOR('p', 0xa3, int *)
-#define PPS_FETCH		_IOWR('p', 0xa4, struct pps_fdata *)
-#define PPS_KC_BIND		_IOW('p', 0xa5, struct pps_bind_args *)
-
-#endif /* _PPS_H_ */
diff --git a/openflow/usr/include/linux/prctl.h b/openflow/usr/include/linux/prctl.h
deleted file mode 100644
index a8d0759..0000000
--- a/openflow/usr/include/linux/prctl.h
+++ /dev/null
@@ -1,200 +0,0 @@
-#ifndef _LINUX_PRCTL_H
-#define _LINUX_PRCTL_H
-
-#include <linux/types.h>
-
-/* Values to pass as first argument to prctl() */
-
-#define PR_SET_PDEATHSIG  1  /* Second arg is a signal */
-#define PR_GET_PDEATHSIG  2  /* Second arg is a ptr to return the signal */
-
-/* Get/set current->mm->dumpable */
-#define PR_GET_DUMPABLE   3
-#define PR_SET_DUMPABLE   4
-
-/* Get/set unaligned access control bits (if meaningful) */
-#define PR_GET_UNALIGN	  5
-#define PR_SET_UNALIGN	  6
-# define PR_UNALIGN_NOPRINT	1	/* silently fix up unaligned user accesses */
-# define PR_UNALIGN_SIGBUS	2	/* generate SIGBUS on unaligned user access */
-
-/* Get/set whether or not to drop capabilities on setuid() away from
- * uid 0 (as per security/commoncap.c) */
-#define PR_GET_KEEPCAPS   7
-#define PR_SET_KEEPCAPS   8
-
-/* Get/set floating-point emulation control bits (if meaningful) */
-#define PR_GET_FPEMU  9
-#define PR_SET_FPEMU 10
-# define PR_FPEMU_NOPRINT	1	/* silently emulate fp operations accesses */
-# define PR_FPEMU_SIGFPE	2	/* don't emulate fp operations, send SIGFPE instead */
-
-/* Get/set floating-point exception mode (if meaningful) */
-#define PR_GET_FPEXC	11
-#define PR_SET_FPEXC	12
-# define PR_FP_EXC_SW_ENABLE	0x80	/* Use FPEXC for FP exception enables */
-# define PR_FP_EXC_DIV		0x010000	/* floating point divide by zero */
-# define PR_FP_EXC_OVF		0x020000	/* floating point overflow */
-# define PR_FP_EXC_UND		0x040000	/* floating point underflow */
-# define PR_FP_EXC_RES		0x080000	/* floating point inexact result */
-# define PR_FP_EXC_INV		0x100000	/* floating point invalid operation */
-# define PR_FP_EXC_DISABLED	0	/* FP exceptions disabled */
-# define PR_FP_EXC_NONRECOV	1	/* async non-recoverable exc. mode */
-# define PR_FP_EXC_ASYNC	2	/* async recoverable exception mode */
-# define PR_FP_EXC_PRECISE	3	/* precise exception mode */
-
-/* Get/set whether we use statistical process timing or accurate timestamp
- * based process timing */
-#define PR_GET_TIMING   13
-#define PR_SET_TIMING   14
-# define PR_TIMING_STATISTICAL  0       /* Normal, traditional,
-                                                   statistical process timing */
-# define PR_TIMING_TIMESTAMP    1       /* Accurate timestamp based
-                                                   process timing */
-
-#define PR_SET_NAME    15		/* Set process name */
-#define PR_GET_NAME    16		/* Get process name */
-
-/* Get/set process endian */
-#define PR_GET_ENDIAN	19
-#define PR_SET_ENDIAN	20
-# define PR_ENDIAN_BIG		0
-# define PR_ENDIAN_LITTLE	1	/* True little endian mode */
-# define PR_ENDIAN_PPC_LITTLE	2	/* "PowerPC" pseudo little endian */
-
-/* Get/set process seccomp mode */
-#define PR_GET_SECCOMP	21
-#define PR_SET_SECCOMP	22
-
-/* Get/set the capability bounding set (as per security/commoncap.c) */
-#define PR_CAPBSET_READ 23
-#define PR_CAPBSET_DROP 24
-
-/* Get/set the process' ability to use the timestamp counter instruction */
-#define PR_GET_TSC 25
-#define PR_SET_TSC 26
-# define PR_TSC_ENABLE		1	/* allow the use of the timestamp counter */
-# define PR_TSC_SIGSEGV		2	/* throw a SIGSEGV instead of reading the TSC */
-
-/* Get/set securebits (as per security/commoncap.c) */
-#define PR_GET_SECUREBITS 27
-#define PR_SET_SECUREBITS 28
-
-/*
- * Get/set the timerslack as used by poll/select/nanosleep
- * A value of 0 means "use default"
- */
-#define PR_SET_TIMERSLACK 29
-#define PR_GET_TIMERSLACK 30
-
-#define PR_TASK_PERF_EVENTS_DISABLE		31
-#define PR_TASK_PERF_EVENTS_ENABLE		32
-
-/*
- * Set early/late kill mode for hwpoison memory corruption.
- * This influences when the process gets killed on a memory corruption.
- */
-#define PR_MCE_KILL	33
-# define PR_MCE_KILL_CLEAR   0
-# define PR_MCE_KILL_SET     1
-
-# define PR_MCE_KILL_LATE    0
-# define PR_MCE_KILL_EARLY   1
-# define PR_MCE_KILL_DEFAULT 2
-
-#define PR_MCE_KILL_GET 34
-
-/*
- * Tune up process memory map specifics.
- */
-#define PR_SET_MM		35
-# define PR_SET_MM_START_CODE		1
-# define PR_SET_MM_END_CODE		2
-# define PR_SET_MM_START_DATA		3
-# define PR_SET_MM_END_DATA		4
-# define PR_SET_MM_START_STACK		5
-# define PR_SET_MM_START_BRK		6
-# define PR_SET_MM_BRK			7
-# define PR_SET_MM_ARG_START		8
-# define PR_SET_MM_ARG_END		9
-# define PR_SET_MM_ENV_START		10
-# define PR_SET_MM_ENV_END		11
-# define PR_SET_MM_AUXV			12
-# define PR_SET_MM_EXE_FILE		13
-# define PR_SET_MM_MAP			14
-# define PR_SET_MM_MAP_SIZE		15
-
-/*
- * This structure provides new memory descriptor
- * map which mostly modifies /proc/pid/stat[m]
- * output for a task. This mostly done in a
- * sake of checkpoint/restore functionality.
- */
-struct prctl_mm_map {
-	__u64	start_code;		/* code section bounds */
-	__u64	end_code;
-	__u64	start_data;		/* data section bounds */
-	__u64	end_data;
-	__u64	start_brk;		/* heap for brk() syscall */
-	__u64	brk;
-	__u64	start_stack;		/* stack starts at */
-	__u64	arg_start;		/* command line arguments bounds */
-	__u64	arg_end;
-	__u64	env_start;		/* environment variables bounds */
-	__u64	env_end;
-	__u64	*auxv;			/* auxiliary vector */
-	__u32	auxv_size;		/* vector size */
-	__u32	exe_fd;			/* /proc/$pid/exe link file */
-};
-
-/*
- * Set specific pid that is allowed to ptrace the current task.
- * A value of 0 mean "no process".
- */
-#define PR_SET_PTRACER 0x59616d61
-# define PR_SET_PTRACER_ANY ((unsigned long)-1)
-
-#define PR_SET_CHILD_SUBREAPER	36
-#define PR_GET_CHILD_SUBREAPER	37
-
-/*
- * If no_new_privs is set, then operations that grant new privileges (i.e.
- * execve) will either fail or not grant them.  This affects suid/sgid,
- * file capabilities, and LSMs.
- *
- * Operations that merely manipulate or drop existing privileges (setresuid,
- * capset, etc.) will still work.  Drop those privileges if you want them gone.
- *
- * Changing LSM security domain is considered a new privilege.  So, for example,
- * asking selinux for a specific new context (e.g. with runcon) will result
- * in execve returning -EPERM.
- *
- * See Documentation/prctl/no_new_privs.txt for more details.
- */
-#define PR_SET_NO_NEW_PRIVS	38
-#define PR_GET_NO_NEW_PRIVS	39
-
-#define PR_GET_TID_ADDRESS	40
-
-#define PR_SET_THP_DISABLE	41
-#define PR_GET_THP_DISABLE	42
-
-/*
- * Tell the kernel to start/stop helping userspace manage bounds tables.
- */
-#define PR_MPX_ENABLE_MANAGEMENT  43
-#define PR_MPX_DISABLE_MANAGEMENT 44
-
-#define PR_SET_FP_MODE		45
-#define PR_GET_FP_MODE		46
-# define PR_FP_MODE_FR		(1 << 0)	/* 64b FP registers */
-# define PR_FP_MODE_FRE		(1 << 1)	/* 32b compatibility */
-
-/* Control the ambient capability set */
-#define PR_CAP_AMBIENT			47
-# define PR_CAP_AMBIENT_IS_SET		1
-# define PR_CAP_AMBIENT_RAISE		2
-# define PR_CAP_AMBIENT_LOWER		3
-# define PR_CAP_AMBIENT_CLEAR_ALL	4
-
-#endif /* _LINUX_PRCTL_H */
diff --git a/openflow/usr/include/linux/psci.h b/openflow/usr/include/linux/psci.h
deleted file mode 100644
index 08d443f..0000000
--- a/openflow/usr/include/linux/psci.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * ARM Power State and Coordination Interface (PSCI) header
- *
- * This header holds common PSCI defines and macros shared
- * by: ARM kernel, ARM64 kernel, KVM ARM/ARM64 and user space.
- *
- * Copyright (C) 2014 Linaro Ltd.
- * Author: Anup Patel <anup.patel@linaro.org>
- */
-
-#ifndef _LINUX_PSCI_H
-#define _LINUX_PSCI_H
-
-/*
- * PSCI v0.1 interface
- *
- * The PSCI v0.1 function numbers are implementation defined.
- *
- * Only PSCI return values such as: SUCCESS, NOT_SUPPORTED,
- * INVALID_PARAMS, and DENIED defined below are applicable
- * to PSCI v0.1.
- */
-
-/* PSCI v0.2 interface */
-#define PSCI_0_2_FN_BASE			0x84000000
-#define PSCI_0_2_FN(n)				(PSCI_0_2_FN_BASE + (n))
-#define PSCI_0_2_64BIT				0x40000000
-#define PSCI_0_2_FN64_BASE			\
-					(PSCI_0_2_FN_BASE + PSCI_0_2_64BIT)
-#define PSCI_0_2_FN64(n)			(PSCI_0_2_FN64_BASE + (n))
-
-#define PSCI_0_2_FN_PSCI_VERSION		PSCI_0_2_FN(0)
-#define PSCI_0_2_FN_CPU_SUSPEND			PSCI_0_2_FN(1)
-#define PSCI_0_2_FN_CPU_OFF			PSCI_0_2_FN(2)
-#define PSCI_0_2_FN_CPU_ON			PSCI_0_2_FN(3)
-#define PSCI_0_2_FN_AFFINITY_INFO		PSCI_0_2_FN(4)
-#define PSCI_0_2_FN_MIGRATE			PSCI_0_2_FN(5)
-#define PSCI_0_2_FN_MIGRATE_INFO_TYPE		PSCI_0_2_FN(6)
-#define PSCI_0_2_FN_MIGRATE_INFO_UP_CPU		PSCI_0_2_FN(7)
-#define PSCI_0_2_FN_SYSTEM_OFF			PSCI_0_2_FN(8)
-#define PSCI_0_2_FN_SYSTEM_RESET		PSCI_0_2_FN(9)
-
-#define PSCI_0_2_FN64_CPU_SUSPEND		PSCI_0_2_FN64(1)
-#define PSCI_0_2_FN64_CPU_ON			PSCI_0_2_FN64(3)
-#define PSCI_0_2_FN64_AFFINITY_INFO		PSCI_0_2_FN64(4)
-#define PSCI_0_2_FN64_MIGRATE			PSCI_0_2_FN64(5)
-#define PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU	PSCI_0_2_FN64(7)
-
-#define PSCI_1_0_FN_PSCI_FEATURES		PSCI_0_2_FN(10)
-#define PSCI_1_0_FN_SYSTEM_SUSPEND		PSCI_0_2_FN(14)
-
-#define PSCI_1_0_FN64_SYSTEM_SUSPEND		PSCI_0_2_FN64(14)
-
-/* PSCI v0.2 power state encoding for CPU_SUSPEND function */
-#define PSCI_0_2_POWER_STATE_ID_MASK		0xffff
-#define PSCI_0_2_POWER_STATE_ID_SHIFT		0
-#define PSCI_0_2_POWER_STATE_TYPE_SHIFT		16
-#define PSCI_0_2_POWER_STATE_TYPE_MASK		\
-				(0x1 << PSCI_0_2_POWER_STATE_TYPE_SHIFT)
-#define PSCI_0_2_POWER_STATE_AFFL_SHIFT		24
-#define PSCI_0_2_POWER_STATE_AFFL_MASK		\
-				(0x3 << PSCI_0_2_POWER_STATE_AFFL_SHIFT)
-
-/* PSCI extended power state encoding for CPU_SUSPEND function */
-#define PSCI_1_0_EXT_POWER_STATE_ID_MASK	0xfffffff
-#define PSCI_1_0_EXT_POWER_STATE_ID_SHIFT	0
-#define PSCI_1_0_EXT_POWER_STATE_TYPE_SHIFT	30
-#define PSCI_1_0_EXT_POWER_STATE_TYPE_MASK	\
-				(0x1 << PSCI_1_0_EXT_POWER_STATE_TYPE_SHIFT)
-
-/* PSCI v0.2 affinity level state returned by AFFINITY_INFO */
-#define PSCI_0_2_AFFINITY_LEVEL_ON		0
-#define PSCI_0_2_AFFINITY_LEVEL_OFF		1
-#define PSCI_0_2_AFFINITY_LEVEL_ON_PENDING	2
-
-/* PSCI v0.2 multicore support in Trusted OS returned by MIGRATE_INFO_TYPE */
-#define PSCI_0_2_TOS_UP_MIGRATE			0
-#define PSCI_0_2_TOS_UP_NO_MIGRATE		1
-#define PSCI_0_2_TOS_MP				2
-
-/* PSCI version decoding (independent of PSCI version) */
-#define PSCI_VERSION_MAJOR_SHIFT		16
-#define PSCI_VERSION_MINOR_MASK			\
-		((1U << PSCI_VERSION_MAJOR_SHIFT) - 1)
-#define PSCI_VERSION_MAJOR_MASK			~PSCI_VERSION_MINOR_MASK
-#define PSCI_VERSION_MAJOR(ver)			\
-		(((ver) & PSCI_VERSION_MAJOR_MASK) >> PSCI_VERSION_MAJOR_SHIFT)
-#define PSCI_VERSION_MINOR(ver)			\
-		((ver) & PSCI_VERSION_MINOR_MASK)
-
-/* PSCI features decoding (>=1.0) */
-#define PSCI_1_0_FEATURES_CPU_SUSPEND_PF_SHIFT	1
-#define PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK	\
-			(0x1 << PSCI_1_0_FEATURES_CPU_SUSPEND_PF_SHIFT)
-
-/* PSCI return values (inclusive of all PSCI versions) */
-#define PSCI_RET_SUCCESS			0
-#define PSCI_RET_NOT_SUPPORTED			-1
-#define PSCI_RET_INVALID_PARAMS			-2
-#define PSCI_RET_DENIED				-3
-#define PSCI_RET_ALREADY_ON			-4
-#define PSCI_RET_ON_PENDING			-5
-#define PSCI_RET_INTERNAL_FAILURE		-6
-#define PSCI_RET_NOT_PRESENT			-7
-#define PSCI_RET_DISABLED			-8
-#define PSCI_RET_INVALID_ADDRESS		-9
-
-#endif /* _LINUX_PSCI_H */
diff --git a/openflow/usr/include/linux/ptp_clock.h b/openflow/usr/include/linux/ptp_clock.h
deleted file mode 100644
index ac6dded..0000000
--- a/openflow/usr/include/linux/ptp_clock.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * PTP 1588 clock support - user space interface
- *
- * Copyright (C) 2010 OMICRON electronics GmbH
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _PTP_CLOCK_H_
-#define _PTP_CLOCK_H_
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-/* PTP_xxx bits, for the flags field within the request structures. */
-#define PTP_ENABLE_FEATURE (1<<0)
-#define PTP_RISING_EDGE    (1<<1)
-#define PTP_FALLING_EDGE   (1<<2)
-
-/*
- * struct ptp_clock_time - represents a time value
- *
- * The sign of the seconds field applies to the whole value. The
- * nanoseconds field is always unsigned. The reserved field is
- * included for sub-nanosecond resolution, should the demand for
- * this ever appear.
- *
- */
-struct ptp_clock_time {
-	__s64 sec;  /* seconds */
-	__u32 nsec; /* nanoseconds */
-	__u32 reserved;
-};
-
-struct ptp_clock_caps {
-	int max_adj;   /* Maximum frequency adjustment in parts per billon. */
-	int n_alarm;   /* Number of programmable alarms. */
-	int n_ext_ts;  /* Number of external time stamp channels. */
-	int n_per_out; /* Number of programmable periodic signals. */
-	int pps;       /* Whether the clock supports a PPS callback. */
-	int n_pins;    /* Number of input/output pins. */
-	/* Whether the clock supports precise system-device cross timestamps */
-	int cross_timestamping;
-	int rsv[13];   /* Reserved for future use. */
-};
-
-struct ptp_extts_request {
-	unsigned int index;  /* Which channel to configure. */
-	unsigned int flags;  /* Bit field for PTP_xxx flags. */
-	unsigned int rsv[2]; /* Reserved for future use. */
-};
-
-struct ptp_perout_request {
-	struct ptp_clock_time start;  /* Absolute start time. */
-	struct ptp_clock_time period; /* Desired period, zero means disable. */
-	unsigned int index;           /* Which channel to configure. */
-	unsigned int flags;           /* Reserved for future use. */
-	unsigned int rsv[4];          /* Reserved for future use. */
-};
-
-#define PTP_MAX_SAMPLES 25 /* Maximum allowed offset measurement samples. */
-
-struct ptp_sys_offset {
-	unsigned int n_samples; /* Desired number of measurements. */
-	unsigned int rsv[3];    /* Reserved for future use. */
-	/*
-	 * Array of interleaved system/phc time stamps. The kernel
-	 * will provide 2*n_samples + 1 time stamps, with the last
-	 * one as a system time stamp.
-	 */
-	struct ptp_clock_time ts[2 * PTP_MAX_SAMPLES + 1];
-};
-
-struct ptp_sys_offset_precise {
-	struct ptp_clock_time device;
-	struct ptp_clock_time sys_realtime;
-	struct ptp_clock_time sys_monoraw;
-	unsigned int rsv[4];    /* Reserved for future use. */
-};
-
-enum ptp_pin_function {
-	PTP_PF_NONE,
-	PTP_PF_EXTTS,
-	PTP_PF_PEROUT,
-	PTP_PF_PHYSYNC,
-};
-
-struct ptp_pin_desc {
-	/*
-	 * Hardware specific human readable pin name. This field is
-	 * set by the kernel during the PTP_PIN_GETFUNC ioctl and is
-	 * ignored for the PTP_PIN_SETFUNC ioctl.
-	 */
-	char name[64];
-	/*
-	 * Pin index in the range of zero to ptp_clock_caps.n_pins - 1.
-	 */
-	unsigned int index;
-	/*
-	 * Which of the PTP_PF_xxx functions to use on this pin.
-	 */
-	unsigned int func;
-	/*
-	 * The specific channel to use for this function.
-	 * This corresponds to the 'index' field of the
-	 * PTP_EXTTS_REQUEST and PTP_PEROUT_REQUEST ioctls.
-	 */
-	unsigned int chan;
-	/*
-	 * Reserved for future use.
-	 */
-	unsigned int rsv[5];
-};
-
-#define PTP_CLK_MAGIC '='
-
-#define PTP_CLOCK_GETCAPS  _IOR(PTP_CLK_MAGIC, 1, struct ptp_clock_caps)
-#define PTP_EXTTS_REQUEST  _IOW(PTP_CLK_MAGIC, 2, struct ptp_extts_request)
-#define PTP_PEROUT_REQUEST _IOW(PTP_CLK_MAGIC, 3, struct ptp_perout_request)
-#define PTP_ENABLE_PPS     _IOW(PTP_CLK_MAGIC, 4, int)
-#define PTP_SYS_OFFSET     _IOW(PTP_CLK_MAGIC, 5, struct ptp_sys_offset)
-#define PTP_PIN_GETFUNC    _IOWR(PTP_CLK_MAGIC, 6, struct ptp_pin_desc)
-#define PTP_PIN_SETFUNC    _IOW(PTP_CLK_MAGIC, 7, struct ptp_pin_desc)
-#define PTP_SYS_OFFSET_PRECISE \
-	_IOWR(PTP_CLK_MAGIC, 8, struct ptp_sys_offset_precise)
-
-struct ptp_extts_event {
-	struct ptp_clock_time t; /* Time event occured. */
-	unsigned int index;      /* Which channel produced the event. */
-	unsigned int flags;      /* Reserved for future use. */
-	unsigned int rsv[2];     /* Reserved for future use. */
-};
-
-#endif
diff --git a/openflow/usr/include/linux/ptrace.h b/openflow/usr/include/linux/ptrace.h
deleted file mode 100644
index 73b0338..0000000
--- a/openflow/usr/include/linux/ptrace.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef _LINUX_PTRACE_H
-#define _LINUX_PTRACE_H
-/* ptrace.h */
-/* structs and defines to help the user use the ptrace system call. */
-
-/* has the defines to get at the registers. */
-
-#include <linux/types.h>
-
-#define PTRACE_TRACEME		   0
-#define PTRACE_PEEKTEXT		   1
-#define PTRACE_PEEKDATA		   2
-#define PTRACE_PEEKUSR		   3
-#define PTRACE_POKETEXT		   4
-#define PTRACE_POKEDATA		   5
-#define PTRACE_POKEUSR		   6
-#define PTRACE_CONT		   7
-#define PTRACE_KILL		   8
-#define PTRACE_SINGLESTEP	   9
-
-#define PTRACE_ATTACH		  16
-#define PTRACE_DETACH		  17
-
-#define PTRACE_SYSCALL		  24
-
-/* 0x4200-0x4300 are reserved for architecture-independent additions.  */
-#define PTRACE_SETOPTIONS	0x4200
-#define PTRACE_GETEVENTMSG	0x4201
-#define PTRACE_GETSIGINFO	0x4202
-#define PTRACE_SETSIGINFO	0x4203
-
-/*
- * Generic ptrace interface that exports the architecture specific regsets
- * using the corresponding NT_* types (which are also used in the core dump).
- * Please note that the NT_PRSTATUS note type in a core dump contains a full
- * 'struct elf_prstatus'. But the user_regset for NT_PRSTATUS contains just the
- * elf_gregset_t that is the pr_reg field of 'struct elf_prstatus'. For all the
- * other user_regset flavors, the user_regset layout and the ELF core dump note
- * payload are exactly the same layout.
- *
- * This interface usage is as follows:
- *	struct iovec iov = { buf, len};
- *
- *	ret = ptrace(PTRACE_GETREGSET/PTRACE_SETREGSET, pid, NT_XXX_TYPE, &iov);
- *
- * On the successful completion, iov.len will be updated by the kernel,
- * specifying how much the kernel has written/read to/from the user's iov.buf.
- */
-#define PTRACE_GETREGSET	0x4204
-#define PTRACE_SETREGSET	0x4205
-
-#define PTRACE_SEIZE		0x4206
-#define PTRACE_INTERRUPT	0x4207
-#define PTRACE_LISTEN		0x4208
-
-#define PTRACE_PEEKSIGINFO	0x4209
-
-struct ptrace_peeksiginfo_args {
-	__u64 off;	/* from which siginfo to start */
-	__u32 flags;
-	__s32 nr;	/* how may siginfos to take */
-};
-
-#define PTRACE_GETSIGMASK	0x420a
-#define PTRACE_SETSIGMASK	0x420b
-
-#define PTRACE_SECCOMP_GET_FILTER	0x420c
-
-/* Read signals from a shared (process wide) queue */
-#define PTRACE_PEEKSIGINFO_SHARED	(1 << 0)
-
-/* Wait extended result codes for the above trace options.  */
-#define PTRACE_EVENT_FORK	1
-#define PTRACE_EVENT_VFORK	2
-#define PTRACE_EVENT_CLONE	3
-#define PTRACE_EVENT_EXEC	4
-#define PTRACE_EVENT_VFORK_DONE	5
-#define PTRACE_EVENT_EXIT	6
-#define PTRACE_EVENT_SECCOMP	7
-/* Extended result codes which enabled by means other than options.  */
-#define PTRACE_EVENT_STOP	128
-
-/* Options set using PTRACE_SETOPTIONS or using PTRACE_SEIZE @data param */
-#define PTRACE_O_TRACESYSGOOD	1
-#define PTRACE_O_TRACEFORK	(1 << PTRACE_EVENT_FORK)
-#define PTRACE_O_TRACEVFORK	(1 << PTRACE_EVENT_VFORK)
-#define PTRACE_O_TRACECLONE	(1 << PTRACE_EVENT_CLONE)
-#define PTRACE_O_TRACEEXEC	(1 << PTRACE_EVENT_EXEC)
-#define PTRACE_O_TRACEVFORKDONE	(1 << PTRACE_EVENT_VFORK_DONE)
-#define PTRACE_O_TRACEEXIT	(1 << PTRACE_EVENT_EXIT)
-#define PTRACE_O_TRACESECCOMP	(1 << PTRACE_EVENT_SECCOMP)
-
-/* eventless options */
-#define PTRACE_O_EXITKILL		(1 << 20)
-#define PTRACE_O_SUSPEND_SECCOMP	(1 << 21)
-
-#define PTRACE_O_MASK		(\
-	0x000000ff | PTRACE_O_EXITKILL | PTRACE_O_SUSPEND_SECCOMP)
-
-#include <asm/ptrace.h>
-
-
-#endif /* _LINUX_PTRACE_H */
diff --git a/openflow/usr/include/linux/qnx4_fs.h b/openflow/usr/include/linux/qnx4_fs.h
deleted file mode 100644
index 8b9aee1..0000000
--- a/openflow/usr/include/linux/qnx4_fs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Name                         : qnx4_fs.h
- *  Author                       : Richard Frowijn
- *  Function                     : qnx4 global filesystem definitions
- *  History                      : 23-03-1998 created
- */
-#ifndef _LINUX_QNX4_FS_H
-#define _LINUX_QNX4_FS_H
-
-#include <linux/types.h>
-#include <linux/qnxtypes.h>
-#include <linux/magic.h>
-
-#define QNX4_ROOT_INO 1
-
-#define QNX4_MAX_XTNTS_PER_XBLK	60
-/* for di_status */
-#define QNX4_FILE_USED          0x01
-#define QNX4_FILE_MODIFIED      0x02
-#define QNX4_FILE_BUSY          0x04
-#define QNX4_FILE_LINK          0x08
-#define QNX4_FILE_INODE         0x10
-#define QNX4_FILE_FSYSCLEAN     0x20
-
-#define QNX4_I_MAP_SLOTS	8
-#define QNX4_Z_MAP_SLOTS	64
-#define QNX4_VALID_FS		0x0001	/* Clean fs. */
-#define QNX4_ERROR_FS		0x0002	/* fs has errors. */
-#define QNX4_BLOCK_SIZE         0x200	/* blocksize of 512 bytes */
-#define QNX4_BLOCK_SIZE_BITS    9	/* blocksize shift */
-#define QNX4_DIR_ENTRY_SIZE     0x040	/* dir entry size of 64 bytes */
-#define QNX4_DIR_ENTRY_SIZE_BITS 6	/* dir entry size shift */
-#define QNX4_XBLK_ENTRY_SIZE    0x200	/* xblk entry size */
-#define QNX4_INODES_PER_BLOCK   0x08	/* 512 / 64 */
-
-/* for filenames */
-#define QNX4_SHORT_NAME_MAX	16
-#define QNX4_NAME_MAX		48
-
-/*
- * This is the original qnx4 inode layout on disk.
- */
-struct qnx4_inode_entry {
-	char		di_fname[QNX4_SHORT_NAME_MAX];
-	qnx4_off_t	di_size;
-	qnx4_xtnt_t	di_first_xtnt;
-	__le32		di_xblk;
-	__le32		di_ftime;
-	__le32		di_mtime;
-	__le32		di_atime;
-	__le32		di_ctime;
-	qnx4_nxtnt_t	di_num_xtnts;
-	qnx4_mode_t	di_mode;
-	qnx4_muid_t	di_uid;
-	qnx4_mgid_t	di_gid;
-	qnx4_nlink_t	di_nlink;
-	__u8		di_zero[4];
-	qnx4_ftype_t	di_type;
-	__u8		di_status;
-};
-
-struct qnx4_link_info {
-	char		dl_fname[QNX4_NAME_MAX];
-	__le32		dl_inode_blk;
-	__u8		dl_inode_ndx;
-	__u8		dl_spare[10];
-	__u8		dl_status;
-};
-
-struct qnx4_xblk {
-	__le32		xblk_next_xblk;
-	__le32		xblk_prev_xblk;
-	__u8		xblk_num_xtnts;
-	__u8		xblk_spare[3];
-	__le32		xblk_num_blocks;
-	qnx4_xtnt_t	xblk_xtnts[QNX4_MAX_XTNTS_PER_XBLK];
-	char		xblk_signature[8];
-	qnx4_xtnt_t	xblk_first_xtnt;
-};
-
-struct qnx4_super_block {
-	struct qnx4_inode_entry RootDir;
-	struct qnx4_inode_entry Inode;
-	struct qnx4_inode_entry Boot;
-	struct qnx4_inode_entry AltBoot;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/qnxtypes.h b/openflow/usr/include/linux/qnxtypes.h
deleted file mode 100644
index bebbe5c..0000000
--- a/openflow/usr/include/linux/qnxtypes.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Name                         : qnxtypes.h
- *  Author                       : Richard Frowijn
- *  Function                     : standard qnx types
- *  History                      : 22-03-1998 created
- *
- */
-
-#ifndef _QNX4TYPES_H
-#define _QNX4TYPES_H
-
-#include <linux/types.h>
-
-typedef __le16 qnx4_nxtnt_t;
-typedef __u8  qnx4_ftype_t;
-
-typedef struct {
-	__le32 xtnt_blk;
-	__le32 xtnt_size;
-} qnx4_xtnt_t;
-
-typedef __le16 qnx4_mode_t;
-typedef __le16 qnx4_muid_t;
-typedef __le16 qnx4_mgid_t;
-typedef __le32 qnx4_off_t;
-typedef __le16 qnx4_nlink_t;
-
-#endif
diff --git a/openflow/usr/include/linux/quota.h b/openflow/usr/include/linux/quota.h
deleted file mode 100644
index 0695307..0000000
--- a/openflow/usr/include/linux/quota.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Robert Elz at The University of Melbourne.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _LINUX_QUOTA_
-#define _LINUX_QUOTA_
-
-#include <linux/errno.h>
-#include <linux/types.h>
-
-#define __DQUOT_VERSION__	"dquot_6.6.0"
-
-#define MAXQUOTAS 3
-#define USRQUOTA  0		/* element used for user quotas */
-#define GRPQUOTA  1		/* element used for group quotas */
-#define PRJQUOTA  2		/* element used for project quotas */
-
-/*
- * Definitions for the default names of the quotas files.
- */
-#define INITQFNAMES { \
-	"user",    /* USRQUOTA */ \
-	"group",   /* GRPQUOTA */ \
-	"project", /* PRJQUOTA */ \
-	"undefined", \
-};
-
-/*
- * Command definitions for the 'quotactl' system call.
- * The commands are broken into a main command defined below
- * and a subcommand that is used to convey the type of
- * quota that is being manipulated (see above).
- */
-#define SUBCMDMASK  0x00ff
-#define SUBCMDSHIFT 8
-#define QCMD(cmd, type)  (((cmd) << SUBCMDSHIFT) | ((type) & SUBCMDMASK))
-
-#define Q_SYNC     0x800001	/* sync disk copy of a filesystems quotas */
-#define Q_QUOTAON  0x800002	/* turn quotas on */
-#define Q_QUOTAOFF 0x800003	/* turn quotas off */
-#define Q_GETFMT   0x800004	/* get quota format used on given filesystem */
-#define Q_GETINFO  0x800005	/* get information about quota files */
-#define Q_SETINFO  0x800006	/* set information about quota files */
-#define Q_GETQUOTA 0x800007	/* get user quota structure */
-#define Q_SETQUOTA 0x800008	/* set user quota structure */
-
-/* Quota format type IDs */
-#define	QFMT_VFS_OLD 1
-#define	QFMT_VFS_V0 2
-#define QFMT_OCFS2 3
-#define	QFMT_VFS_V1 4
-
-/* Size of block in which space limits are passed through the quota
- * interface */
-#define QIF_DQBLKSIZE_BITS 10
-#define QIF_DQBLKSIZE (1 << QIF_DQBLKSIZE_BITS)
-
-/*
- * Quota structure used for communication with userspace via quotactl
- * Following flags are used to specify which fields are valid
- */
-enum {
-	QIF_BLIMITS_B = 0,
-	QIF_SPACE_B,
-	QIF_ILIMITS_B,
-	QIF_INODES_B,
-	QIF_BTIME_B,
-	QIF_ITIME_B,
-};
-
-#define QIF_BLIMITS	(1 << QIF_BLIMITS_B)
-#define QIF_SPACE	(1 << QIF_SPACE_B)
-#define QIF_ILIMITS	(1 << QIF_ILIMITS_B)
-#define QIF_INODES	(1 << QIF_INODES_B)
-#define QIF_BTIME	(1 << QIF_BTIME_B)
-#define QIF_ITIME	(1 << QIF_ITIME_B)
-#define QIF_LIMITS	(QIF_BLIMITS | QIF_ILIMITS)
-#define QIF_USAGE	(QIF_SPACE | QIF_INODES)
-#define QIF_TIMES	(QIF_BTIME | QIF_ITIME)
-#define QIF_ALL		(QIF_LIMITS | QIF_USAGE | QIF_TIMES)
-
-struct if_dqblk {
-	__u64 dqb_bhardlimit;
-	__u64 dqb_bsoftlimit;
-	__u64 dqb_curspace;
-	__u64 dqb_ihardlimit;
-	__u64 dqb_isoftlimit;
-	__u64 dqb_curinodes;
-	__u64 dqb_btime;
-	__u64 dqb_itime;
-	__u32 dqb_valid;
-};
-
-/*
- * Structure used for setting quota information about file via quotactl
- * Following flags are used to specify which fields are valid
- */
-#define IIF_BGRACE	1
-#define IIF_IGRACE	2
-#define IIF_FLAGS	4
-#define IIF_ALL		(IIF_BGRACE | IIF_IGRACE | IIF_FLAGS)
-
-enum {
-	DQF_ROOT_SQUASH_B = 0,
-	DQF_SYS_FILE_B = 16,
-	/* Kernel internal flags invisible to userspace */
-	DQF_PRIVATE
-};
-
-/* Root squash enabled (for v1 quota format) */
-#define DQF_ROOT_SQUASH	(1 << DQF_ROOT_SQUASH_B)
-/* Quota stored in a system file */
-#define DQF_SYS_FILE	(1 << DQF_SYS_FILE_B)
-
-struct if_dqinfo {
-	__u64 dqi_bgrace;
-	__u64 dqi_igrace;
-	__u32 dqi_flags;	/* DFQ_* */
-	__u32 dqi_valid;
-};
-
-/*
- * Definitions for quota netlink interface
- */
-#define QUOTA_NL_NOWARN 0
-#define QUOTA_NL_IHARDWARN 1		/* Inode hardlimit reached */
-#define QUOTA_NL_ISOFTLONGWARN 2 	/* Inode grace time expired */
-#define QUOTA_NL_ISOFTWARN 3		/* Inode softlimit reached */
-#define QUOTA_NL_BHARDWARN 4		/* Block hardlimit reached */
-#define QUOTA_NL_BSOFTLONGWARN 5	/* Block grace time expired */
-#define QUOTA_NL_BSOFTWARN 6		/* Block softlimit reached */
-#define QUOTA_NL_IHARDBELOW 7		/* Usage got below inode hardlimit */
-#define QUOTA_NL_ISOFTBELOW 8		/* Usage got below inode softlimit */
-#define QUOTA_NL_BHARDBELOW 9		/* Usage got below block hardlimit */
-#define QUOTA_NL_BSOFTBELOW 10		/* Usage got below block softlimit */
-
-enum {
-	QUOTA_NL_C_UNSPEC,
-	QUOTA_NL_C_WARNING,
-	__QUOTA_NL_C_MAX,
-};
-#define QUOTA_NL_C_MAX (__QUOTA_NL_C_MAX - 1)
-
-enum {
-	QUOTA_NL_A_UNSPEC,
-	QUOTA_NL_A_QTYPE,
-	QUOTA_NL_A_EXCESS_ID,
-	QUOTA_NL_A_WARNING,
-	QUOTA_NL_A_DEV_MAJOR,
-	QUOTA_NL_A_DEV_MINOR,
-	QUOTA_NL_A_CAUSED_ID,
-	__QUOTA_NL_A_MAX,
-};
-#define QUOTA_NL_A_MAX (__QUOTA_NL_A_MAX - 1)
-
-
-#endif /* _LINUX_QUOTA_ */
diff --git a/openflow/usr/include/linux/radeonfb.h b/openflow/usr/include/linux/radeonfb.h
deleted file mode 100644
index 8c4bbde..0000000
--- a/openflow/usr/include/linux/radeonfb.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __LINUX_RADEONFB_H__
-#define __LINUX_RADEONFB_H__
-
-#include <asm/ioctl.h>
-#include <linux/types.h>
-
-#define ATY_RADEON_LCD_ON	0x00000001
-#define ATY_RADEON_CRT_ON	0x00000002
-
-
-#define FBIO_RADEON_GET_MIRROR	_IOR('@', 3, size_t)
-#define FBIO_RADEON_SET_MIRROR	_IOW('@', 4, size_t)
-
-#endif
-
diff --git a/openflow/usr/include/linux/raid/md_p.h b/openflow/usr/include/linux/raid/md_p.h
deleted file mode 100644
index e956671..0000000
--- a/openflow/usr/include/linux/raid/md_p.h
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
-   md_p.h : physical layout of Linux RAID devices
-          Copyright (C) 1996-98 Ingo Molnar, Gadi Oxman
-	  
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-   
-   You should have received a copy of the GNU General Public License
-   (for example /usr/src/linux/COPYING); if not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
-*/
-
-#ifndef _MD_P_H
-#define _MD_P_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-/*
- * RAID superblock.
- *
- * The RAID superblock maintains some statistics on each RAID configuration.
- * Each real device in the RAID set contains it near the end of the device.
- * Some of the ideas are copied from the ext2fs implementation.
- *
- * We currently use 4096 bytes as follows:
- *
- *	word offset	function
- *
- *	   0  -    31	Constant generic RAID device information.
- *        32  -    63   Generic state information.
- *	  64  -   127	Personality specific information.
- *	 128  -   511	12 32-words descriptors of the disks in the raid set.
- *	 512  -   911	Reserved.
- *	 912  -  1023	Disk specific descriptor.
- */
-
-/*
- * If x is the real device size in bytes, we return an apparent size of:
- *
- *	y = (x & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES
- *
- * and place the 4kB superblock at offset y.
- */
-#define MD_RESERVED_BYTES		(64 * 1024)
-#define MD_RESERVED_SECTORS		(MD_RESERVED_BYTES / 512)
-
-#define MD_NEW_SIZE_SECTORS(x)		((x & ~(MD_RESERVED_SECTORS - 1)) - MD_RESERVED_SECTORS)
-
-#define MD_SB_BYTES			4096
-#define MD_SB_WORDS			(MD_SB_BYTES / 4)
-#define MD_SB_SECTORS			(MD_SB_BYTES / 512)
-
-/*
- * The following are counted in 32-bit words
- */
-#define	MD_SB_GENERIC_OFFSET		0
-#define MD_SB_PERSONALITY_OFFSET	64
-#define MD_SB_DISKS_OFFSET		128
-#define MD_SB_DESCRIPTOR_OFFSET		992
-
-#define MD_SB_GENERIC_CONSTANT_WORDS	32
-#define MD_SB_GENERIC_STATE_WORDS	32
-#define MD_SB_GENERIC_WORDS		(MD_SB_GENERIC_CONSTANT_WORDS + MD_SB_GENERIC_STATE_WORDS)
-#define MD_SB_PERSONALITY_WORDS		64
-#define MD_SB_DESCRIPTOR_WORDS		32
-#define MD_SB_DISKS			27
-#define MD_SB_DISKS_WORDS		(MD_SB_DISKS*MD_SB_DESCRIPTOR_WORDS)
-#define MD_SB_RESERVED_WORDS		(1024 - MD_SB_GENERIC_WORDS - MD_SB_PERSONALITY_WORDS - MD_SB_DISKS_WORDS - MD_SB_DESCRIPTOR_WORDS)
-#define MD_SB_EQUAL_WORDS		(MD_SB_GENERIC_WORDS + MD_SB_PERSONALITY_WORDS + MD_SB_DISKS_WORDS)
-
-/*
- * Device "operational" state bits
- */
-#define MD_DISK_FAULTY		0 /* disk is faulty / operational */
-#define MD_DISK_ACTIVE		1 /* disk is running or spare disk */
-#define MD_DISK_SYNC		2 /* disk is in sync with the raid set */
-#define MD_DISK_REMOVED		3 /* disk is in sync with the raid set */
-#define MD_DISK_CLUSTER_ADD     4 /* Initiate a disk add across the cluster
-				   * For clustered enviroments only.
-				   */
-#define MD_DISK_CANDIDATE	5 /* disk is added as spare (local) until confirmed
-				   * For clustered enviroments only.
-				   */
-
-#define	MD_DISK_WRITEMOSTLY	9 /* disk is "write-mostly" is RAID1 config.
-				   * read requests will only be sent here in
-				   * dire need
-				   */
-#define MD_DISK_JOURNAL		18 /* disk is used as the write journal in RAID-5/6 */
-
-#define MD_DISK_ROLE_SPARE	0xffff
-#define MD_DISK_ROLE_FAULTY	0xfffe
-#define MD_DISK_ROLE_JOURNAL	0xfffd
-#define MD_DISK_ROLE_MAX	0xff00 /* max value of regular disk role */
-
-typedef struct mdp_device_descriptor_s {
-	__u32 number;		/* 0 Device number in the entire set	      */
-	__u32 major;		/* 1 Device major number		      */
-	__u32 minor;		/* 2 Device minor number		      */
-	__u32 raid_disk;	/* 3 The role of the device in the raid set   */
-	__u32 state;		/* 4 Operational state			      */
-	__u32 reserved[MD_SB_DESCRIPTOR_WORDS - 5];
-} mdp_disk_t;
-
-#define MD_SB_MAGIC		0xa92b4efc
-
-/*
- * Superblock state bits
- */
-#define MD_SB_CLEAN		0
-#define MD_SB_ERRORS		1
-
-#define	MD_SB_CLUSTERED		5 /* MD is clustered */
-#define	MD_SB_BITMAP_PRESENT	8 /* bitmap may be present nearby */
-
-/*
- * Notes:
- * - if an array is being reshaped (restriped) in order to change the
- *   the number of active devices in the array, 'raid_disks' will be
- *   the larger of the old and new numbers.  'delta_disks' will
- *   be the "new - old".  So if +ve, raid_disks is the new value, and
- *   "raid_disks-delta_disks" is the old.  If -ve, raid_disks is the
- *   old value and "raid_disks+delta_disks" is the new (smaller) value.
- */
-
-
-typedef struct mdp_superblock_s {
-	/*
-	 * Constant generic information
-	 */
-	__u32 md_magic;		/*  0 MD identifier 			      */
-	__u32 major_version;	/*  1 major version to which the set conforms */
-	__u32 minor_version;	/*  2 minor version ...			      */
-	__u32 patch_version;	/*  3 patchlevel version ...		      */
-	__u32 gvalid_words;	/*  4 Number of used words in this section    */
-	__u32 set_uuid0;	/*  5 Raid set identifier		      */
-	__u32 ctime;		/*  6 Creation time			      */
-	__u32 level;		/*  7 Raid personality			      */
-	__u32 size;		/*  8 Apparent size of each individual disk   */
-	__u32 nr_disks;		/*  9 total disks in the raid set	      */
-	__u32 raid_disks;	/* 10 disks in a fully functional raid set    */
-	__u32 md_minor;		/* 11 preferred MD minor device number	      */
-	__u32 not_persistent;	/* 12 does it have a persistent superblock    */
-	__u32 set_uuid1;	/* 13 Raid set identifier #2		      */
-	__u32 set_uuid2;	/* 14 Raid set identifier #3		      */
-	__u32 set_uuid3;	/* 15 Raid set identifier #4		      */
-	__u32 gstate_creserved[MD_SB_GENERIC_CONSTANT_WORDS - 16];
-
-	/*
-	 * Generic state information
-	 */
-	__u32 utime;		/*  0 Superblock update time		      */
-	__u32 state;		/*  1 State bits (clean, ...)		      */
-	__u32 active_disks;	/*  2 Number of currently active disks	      */
-	__u32 working_disks;	/*  3 Number of working disks		      */
-	__u32 failed_disks;	/*  4 Number of failed disks		      */
-	__u32 spare_disks;	/*  5 Number of spare disks		      */
-	__u32 sb_csum;		/*  6 checksum of the whole superblock        */
-#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
-	__u32 events_hi;	/*  7 high-order of superblock update count   */
-	__u32 events_lo;	/*  8 low-order of superblock update count    */
-	__u32 cp_events_hi;	/*  9 high-order of checkpoint update count   */
-	__u32 cp_events_lo;	/* 10 low-order of checkpoint update count    */
-#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
-	__u32 events_lo;	/*  7 low-order of superblock update count    */
-	__u32 events_hi;	/*  8 high-order of superblock update count   */
-	__u32 cp_events_lo;	/*  9 low-order of checkpoint update count    */
-	__u32 cp_events_hi;	/* 10 high-order of checkpoint update count   */
-#else
-#error unspecified endianness
-#endif
-	__u32 recovery_cp;	/* 11 recovery checkpoint sector count	      */
-	/* There are only valid for minor_version > 90 */
-	__u64 reshape_position;	/* 12,13 next address in array-space for reshape */
-	__u32 new_level;	/* 14 new level we are reshaping to	      */
-	__u32 delta_disks;	/* 15 change in number of raid_disks	      */
-	__u32 new_layout;	/* 16 new layout			      */
-	__u32 new_chunk;	/* 17 new chunk size (bytes)		      */
-	__u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 18];
-
-	/*
-	 * Personality information
-	 */
-	__u32 layout;		/*  0 the array's physical layout	      */
-	__u32 chunk_size;	/*  1 chunk size in bytes		      */
-	__u32 root_pv;		/*  2 LV root PV */
-	__u32 root_block;	/*  3 LV root block */
-	__u32 pstate_reserved[MD_SB_PERSONALITY_WORDS - 4];
-
-	/*
-	 * Disks information
-	 */
-	mdp_disk_t disks[MD_SB_DISKS];
-
-	/*
-	 * Reserved
-	 */
-	__u32 reserved[MD_SB_RESERVED_WORDS];
-
-	/*
-	 * Active descriptor
-	 */
-	mdp_disk_t this_disk;
-
-} mdp_super_t;
-
-static __inline__ __u64 md_event(mdp_super_t *sb) {
-	__u64 ev = sb->events_hi;
-	return (ev<<32)| sb->events_lo;
-}
-
-#define MD_SUPERBLOCK_1_TIME_SEC_MASK ((1ULL<<40) - 1)
-
-/*
- * The version-1 superblock :
- * All numeric fields are little-endian.
- *
- * total size: 256 bytes plus 2 per device.
- *  1K allows 384 devices.
- */
-struct mdp_superblock_1 {
-	/* constant array information - 128 bytes */
-	__le32	magic;		/* MD_SB_MAGIC: 0xa92b4efc - little endian */
-	__le32	major_version;	/* 1 */
-	__le32	feature_map;	/* bit 0 set if 'bitmap_offset' is meaningful */
-	__le32	pad0;		/* always set to 0 when writing */
-
-	__u8	set_uuid[16];	/* user-space generated. */
-	char	set_name[32];	/* set and interpreted by user-space */
-
-	__le64	ctime;		/* lo 40 bits are seconds, top 24 are microseconds or 0*/
-	__le32	level;		/* -4 (multipath), -1 (linear), 0,1,4,5 */
-	__le32	layout;		/* only for raid5 and raid10 currently */
-	__le64	size;		/* used size of component devices, in 512byte sectors */
-
-	__le32	chunksize;	/* in 512byte sectors */
-	__le32	raid_disks;
-	__le32	bitmap_offset;	/* sectors after start of superblock that bitmap starts
-				 * NOTE: signed, so bitmap can be before superblock
-				 * only meaningful of feature_map[0] is set.
-				 */
-
-	/* These are only valid with feature bit '4' */
-	__le32	new_level;	/* new level we are reshaping to		*/
-	__le64	reshape_position;	/* next address in array-space for reshape */
-	__le32	delta_disks;	/* change in number of raid_disks		*/
-	__le32	new_layout;	/* new layout					*/
-	__le32	new_chunk;	/* new chunk size (512byte sectors)		*/
-	__le32  new_offset;	/* signed number to add to data_offset in new
-				 * layout.  0 == no-change.  This can be
-				 * different on each device in the array.
-				 */
-
-	/* constant this-device information - 64 bytes */
-	__le64	data_offset;	/* sector start of data, often 0 */
-	__le64	data_size;	/* sectors in this device that can be used for data */
-	__le64	super_offset;	/* sector start of this superblock */
-	union {
-		__le64	recovery_offset;/* sectors before this offset (from data_offset) have been recovered */
-		__le64	journal_tail;/* journal tail of journal device (from data_offset) */
-	};
-	__le32	dev_number;	/* permanent identifier of this  device - not role in raid */
-	__le32	cnt_corrected_read; /* number of read errors that were corrected by re-writing */
-	__u8	device_uuid[16]; /* user-space setable, ignored by kernel */
-	__u8	devflags;	/* per-device flags.  Only one defined...*/
-#define	WriteMostly1	1	/* mask for writemostly flag in above */
-	/* Bad block log.  If there are any bad blocks the feature flag is set.
-	 * If offset and size are non-zero, that space is reserved and available
-	 */
-	__u8	bblog_shift;	/* shift from sectors to block size */
-	__le16	bblog_size;	/* number of sectors reserved for list */
-	__le32	bblog_offset;	/* sector offset from superblock to bblog,
-				 * signed - not unsigned */
-
-	/* array state information - 64 bytes */
-	__le64	utime;		/* 40 bits second, 24 bits microseconds */
-	__le64	events;		/* incremented when superblock updated */
-	__le64	resync_offset;	/* data before this offset (from data_offset) known to be in sync */
-	__le32	sb_csum;	/* checksum up to devs[max_dev] */
-	__le32	max_dev;	/* size of devs[] array to consider */
-	__u8	pad3[64-32];	/* set to 0 when writing */
-
-	/* device state information. Indexed by dev_number.
-	 * 2 bytes per device
-	 * Note there are no per-device state flags. State information is rolled
-	 * into the 'roles' value.  If a device is spare or faulty, then it doesn't
-	 * have a meaningful role.
-	 */
-	__le16	dev_roles[0];	/* role in array, or 0xffff for a spare, or 0xfffe for faulty */
-};
-
-/* feature_map bits */
-#define MD_FEATURE_BITMAP_OFFSET	1
-#define	MD_FEATURE_RECOVERY_OFFSET	2 /* recovery_offset is present and
-					   * must be honoured
-					   */
-#define	MD_FEATURE_RESHAPE_ACTIVE	4
-#define	MD_FEATURE_BAD_BLOCKS		8 /* badblock list is not empty */
-#define	MD_FEATURE_REPLACEMENT		16 /* This device is replacing an
-					    * active device with same 'role'.
-					    * 'recovery_offset' is also set.
-					    */
-#define	MD_FEATURE_RESHAPE_BACKWARDS	32 /* Reshape doesn't change number
-					    * of devices, but is going
-					    * backwards anyway.
-					    */
-#define	MD_FEATURE_NEW_OFFSET		64 /* new_offset must be honoured */
-#define	MD_FEATURE_RECOVERY_BITMAP	128 /* recovery that is happening
-					     * is guided by bitmap.
-					     */
-#define MD_FEATURE_CLUSTERED		256 /* clustered MD */
-#define	MD_FEATURE_JOURNAL		512 /* support write cache */
-#define	MD_FEATURE_ALL			(MD_FEATURE_BITMAP_OFFSET	\
-					|MD_FEATURE_RECOVERY_OFFSET	\
-					|MD_FEATURE_RESHAPE_ACTIVE	\
-					|MD_FEATURE_BAD_BLOCKS		\
-					|MD_FEATURE_REPLACEMENT		\
-					|MD_FEATURE_RESHAPE_BACKWARDS	\
-					|MD_FEATURE_NEW_OFFSET		\
-					|MD_FEATURE_RECOVERY_BITMAP	\
-					|MD_FEATURE_CLUSTERED		\
-					|MD_FEATURE_JOURNAL		\
-					)
-
-struct r5l_payload_header {
-	__le16 type;
-	__le16 flags;
-} __attribute__ ((__packed__));
-
-enum r5l_payload_type {
-	R5LOG_PAYLOAD_DATA = 0,
-	R5LOG_PAYLOAD_PARITY = 1,
-	R5LOG_PAYLOAD_FLUSH = 2,
-};
-
-struct r5l_payload_data_parity {
-	struct r5l_payload_header header;
-	__le32 size;		/* sector. data/parity size. each 4k
-				 * has a checksum */
-	__le64 location;	/* sector. For data, it's raid sector. For
-				 * parity, it's stripe sector */
-	__le32 checksum[];
-} __attribute__ ((__packed__));
-
-enum r5l_payload_data_parity_flag {
-	R5LOG_PAYLOAD_FLAG_DISCARD = 1, /* payload is discard */
-	/*
-	 * RESHAPED/RESHAPING is only set when there is reshape activity. Note,
-	 * both data/parity of a stripe should have the same flag set
-	 *
-	 * RESHAPED: reshape is running, and this stripe finished reshape
-	 * RESHAPING: reshape is running, and this stripe isn't reshaped
-	 */
-	R5LOG_PAYLOAD_FLAG_RESHAPED = 2,
-	R5LOG_PAYLOAD_FLAG_RESHAPING = 3,
-};
-
-struct r5l_payload_flush {
-	struct r5l_payload_header header;
-	__le32 size; /* flush_stripes size, bytes */
-	__le64 flush_stripes[];
-} __attribute__ ((__packed__));
-
-enum r5l_payload_flush_flag {
-	R5LOG_PAYLOAD_FLAG_FLUSH_STRIPE = 1, /* data represents whole stripe */
-};
-
-struct r5l_meta_block {
-	__le32 magic;
-	__le32 checksum;
-	__u8 version;
-	__u8 __zero_pading_1;
-	__le16 __zero_pading_2;
-	__le32 meta_size; /* whole size of the block */
-
-	__le64 seq;
-	__le64 position; /* sector, start from rdev->data_offset, current position */
-	struct r5l_payload_header payloads[];
-} __attribute__ ((__packed__));
-
-#define R5LOG_VERSION 0x1
-#define R5LOG_MAGIC 0x6433c509
-#endif
diff --git a/openflow/usr/include/linux/raid/md_u.h b/openflow/usr/include/linux/raid/md_u.h
deleted file mode 100644
index 162e12d..0000000
--- a/openflow/usr/include/linux/raid/md_u.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-   md_u.h : user <=> kernel API between Linux raidtools and RAID drivers
-          Copyright (C) 1998 Ingo Molnar
-	  
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-   
-   You should have received a copy of the GNU General Public License
-   (for example /usr/src/linux/COPYING); if not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
-*/
-
-#ifndef _MD_U_H
-#define _MD_U_H
-
-/*
- * Different major versions are not compatible.
- * Different minor versions are only downward compatible.
- * Different patchlevel versions are downward and upward compatible.
- */
-#define MD_MAJOR_VERSION                0
-#define MD_MINOR_VERSION                90
-/*
- * MD_PATCHLEVEL_VERSION indicates kernel functionality.
- * >=1 means different superblock formats are selectable using SET_ARRAY_INFO
- *     and major_version/minor_version accordingly
- * >=2 means that Internal bitmaps are supported by setting MD_SB_BITMAP_PRESENT
- *     in the super status byte
- * >=3 means that bitmap superblock version 4 is supported, which uses
- *     little-ending representation rather than host-endian
- */
-#define MD_PATCHLEVEL_VERSION           3
-
-/* ioctls */
-
-/* status */
-#define RAID_VERSION		_IOR (MD_MAJOR, 0x10, mdu_version_t)
-#define GET_ARRAY_INFO		_IOR (MD_MAJOR, 0x11, mdu_array_info_t)
-#define GET_DISK_INFO		_IOR (MD_MAJOR, 0x12, mdu_disk_info_t)
-#define RAID_AUTORUN		_IO (MD_MAJOR, 0x14)
-#define GET_BITMAP_FILE		_IOR (MD_MAJOR, 0x15, mdu_bitmap_file_t)
-
-/* configuration */
-#define CLEAR_ARRAY		_IO (MD_MAJOR, 0x20)
-#define ADD_NEW_DISK		_IOW (MD_MAJOR, 0x21, mdu_disk_info_t)
-#define HOT_REMOVE_DISK		_IO (MD_MAJOR, 0x22)
-#define SET_ARRAY_INFO		_IOW (MD_MAJOR, 0x23, mdu_array_info_t)
-#define SET_DISK_INFO		_IO (MD_MAJOR, 0x24)
-#define WRITE_RAID_INFO		_IO (MD_MAJOR, 0x25)
-#define UNPROTECT_ARRAY		_IO (MD_MAJOR, 0x26)
-#define PROTECT_ARRAY		_IO (MD_MAJOR, 0x27)
-#define HOT_ADD_DISK		_IO (MD_MAJOR, 0x28)
-#define SET_DISK_FAULTY		_IO (MD_MAJOR, 0x29)
-#define HOT_GENERATE_ERROR	_IO (MD_MAJOR, 0x2a)
-#define SET_BITMAP_FILE		_IOW (MD_MAJOR, 0x2b, int)
-
-/* usage */
-#define RUN_ARRAY		_IOW (MD_MAJOR, 0x30, mdu_param_t)
-/*  0x31 was START_ARRAY  */
-#define STOP_ARRAY		_IO (MD_MAJOR, 0x32)
-#define STOP_ARRAY_RO		_IO (MD_MAJOR, 0x33)
-#define RESTART_ARRAY_RW	_IO (MD_MAJOR, 0x34)
-#define CLUSTERED_DISK_NACK	_IO (MD_MAJOR, 0x35)
-
-/* 63 partitions with the alternate major number (mdp) */
-#define MdpMinorShift 6
-
-typedef struct mdu_version_s {
-	int major;
-	int minor;
-	int patchlevel;
-} mdu_version_t;
-
-typedef struct mdu_array_info_s {
-	/*
-	 * Generic constant information
-	 */
-	int major_version;
-	int minor_version;
-	int patch_version;
-	int ctime;
-	int level;
-	int size;
-	int nr_disks;
-	int raid_disks;
-	int md_minor;
-	int not_persistent;
-
-	/*
-	 * Generic state information
-	 */
-	int utime;		/*  0 Superblock update time		      */
-	int state;		/*  1 State bits (clean, ...)		      */
-	int active_disks;	/*  2 Number of currently active disks	      */
-	int working_disks;	/*  3 Number of working disks		      */
-	int failed_disks;	/*  4 Number of failed disks		      */
-	int spare_disks;	/*  5 Number of spare disks		      */
-
-	/*
-	 * Personality information
-	 */
-	int layout;		/*  0 the array's physical layout	      */
-	int chunk_size;	/*  1 chunk size in bytes		      */
-
-} mdu_array_info_t;
-
-/* non-obvious values for 'level' */
-#define	LEVEL_MULTIPATH		(-4)
-#define	LEVEL_LINEAR		(-1)
-#define	LEVEL_FAULTY		(-5)
-
-/* we need a value for 'no level specified' and 0
- * means 'raid0', so we need something else.  This is
- * for internal use only
- */
-#define	LEVEL_NONE		(-1000000)
-
-typedef struct mdu_disk_info_s {
-	/*
-	 * configuration/status of one particular disk
-	 */
-	int number;
-	int major;
-	int minor;
-	int raid_disk;
-	int state;
-
-} mdu_disk_info_t;
-
-typedef struct mdu_start_info_s {
-	/*
-	 * configuration/status of one particular disk
-	 */
-	int major;
-	int minor;
-	int raid_disk;
-	int state;
-
-} mdu_start_info_t;
-
-typedef struct mdu_bitmap_file_s
-{
-	char pathname[4096];
-} mdu_bitmap_file_t;
-
-typedef struct mdu_param_s
-{
-	int			personality;	/* 1,2,3,4 */
-	int			chunk_size;	/* in bytes */
-	int			max_fault;	/* unused for now */
-} mdu_param_t;
-
-#endif /* _MD_U_H */
diff --git a/openflow/usr/include/linux/random.h b/openflow/usr/include/linux/random.h
deleted file mode 100644
index 1f166ce..0000000
--- a/openflow/usr/include/linux/random.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * include/linux/random.h
- *
- * Include file for the random number generator.
- */
-
-#ifndef _LINUX_RANDOM_H
-#define _LINUX_RANDOM_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-#include <linux/irqnr.h>
-
-/* ioctl()'s for the random number generator */
-
-/* Get the entropy count. */
-#define RNDGETENTCNT	_IOR( 'R', 0x00, int )
-
-/* Add to (or subtract from) the entropy count.  (Superuser only.) */
-#define RNDADDTOENTCNT	_IOW( 'R', 0x01, int )
-
-/* Get the contents of the entropy pool.  (Superuser only.) */
-#define RNDGETPOOL	_IOR( 'R', 0x02, int [2] )
-
-/* 
- * Write bytes into the entropy pool and add to the entropy count.
- * (Superuser only.)
- */
-#define RNDADDENTROPY	_IOW( 'R', 0x03, int [2] )
-
-/* Clear entropy count to 0.  (Superuser only.) */
-#define RNDZAPENTCNT	_IO( 'R', 0x04 )
-
-/* Clear the entropy pool and associated counters.  (Superuser only.) */
-#define RNDCLEARPOOL	_IO( 'R', 0x06 )
-
-struct rand_pool_info {
-	int	entropy_count;
-	int	buf_size;
-	__u32	buf[0];
-};
-
-/*
- * Flags for getrandom(2)
- *
- * GRND_NONBLOCK	Don't block and return EAGAIN instead
- * GRND_RANDOM		Use the /dev/random pool instead of /dev/urandom
- */
-#define GRND_NONBLOCK	0x0001
-#define GRND_RANDOM	0x0002
-
-#endif /* _LINUX_RANDOM_H */
diff --git a/openflow/usr/include/linux/raw.h b/openflow/usr/include/linux/raw.h
deleted file mode 100644
index 62d543e..0000000
--- a/openflow/usr/include/linux/raw.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __LINUX_RAW_H
-#define __LINUX_RAW_H
-
-#include <linux/types.h>
-
-#define RAW_SETBIND	_IO( 0xac, 0 )
-#define RAW_GETBIND	_IO( 0xac, 1 )
-
-struct raw_config_request 
-{
-	int	raw_minor;
-	__u64	block_major;
-	__u64	block_minor;
-};
-
-#define MAX_RAW_MINORS CONFIG_MAX_RAW_DEVS
-
-#endif /* __LINUX_RAW_H */
diff --git a/openflow/usr/include/linux/rds.h b/openflow/usr/include/linux/rds.h
deleted file mode 100644
index 0f9265c..0000000
--- a/openflow/usr/include/linux/rds.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) 2008 Oracle.  All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _LINUX_RDS_H
-#define _LINUX_RDS_H
-
-#include <linux/types.h>
-
-#define RDS_IB_ABI_VERSION		0x301
-
-#define	SOL_RDS		276
-
-/*
- * setsockopt/getsockopt for SOL_RDS
- */
-#define RDS_CANCEL_SENT_TO      	1
-#define RDS_GET_MR			2
-#define RDS_FREE_MR			3
-/* deprecated: RDS_BARRIER 4 */
-#define RDS_RECVERR			5
-#define RDS_CONG_MONITOR		6
-#define RDS_GET_MR_FOR_DEST		7
-#define SO_RDS_TRANSPORT		8
-
-/* supported values for SO_RDS_TRANSPORT */
-#define	RDS_TRANS_IB	0
-#define	RDS_TRANS_IWARP	1
-#define	RDS_TRANS_TCP	2
-#define RDS_TRANS_COUNT	3
-#define	RDS_TRANS_NONE	(~0)
-
-/*
- * Control message types for SOL_RDS.
- *
- * CMSG_RDMA_ARGS (sendmsg)
- *	Request a RDMA transfer to/from the specified
- *	memory ranges.
- *	The cmsg_data is a struct rds_rdma_args.
- * RDS_CMSG_RDMA_DEST (recvmsg, sendmsg)
- *	Kernel informs application about intended
- *	source/destination of a RDMA transfer
- * RDS_CMSG_RDMA_MAP (sendmsg)
- *	Application asks kernel to map the given
- *	memory range into a IB MR, and send the
- *	R_Key along in an RDS extension header.
- *	The cmsg_data is a struct rds_get_mr_args,
- *	the same as for the GET_MR setsockopt.
- * RDS_CMSG_RDMA_STATUS (recvmsg)
- *	Returns the status of a completed RDMA operation.
- */
-#define RDS_CMSG_RDMA_ARGS		1
-#define RDS_CMSG_RDMA_DEST		2
-#define RDS_CMSG_RDMA_MAP		3
-#define RDS_CMSG_RDMA_STATUS		4
-#define RDS_CMSG_CONG_UPDATE		5
-#define RDS_CMSG_ATOMIC_FADD		6
-#define RDS_CMSG_ATOMIC_CSWP		7
-#define RDS_CMSG_MASKED_ATOMIC_FADD	8
-#define RDS_CMSG_MASKED_ATOMIC_CSWP	9
-
-#define RDS_INFO_FIRST			10000
-#define RDS_INFO_COUNTERS		10000
-#define RDS_INFO_CONNECTIONS		10001
-/* 10002 aka RDS_INFO_FLOWS is deprecated */
-#define RDS_INFO_SEND_MESSAGES		10003
-#define RDS_INFO_RETRANS_MESSAGES       10004
-#define RDS_INFO_RECV_MESSAGES          10005
-#define RDS_INFO_SOCKETS                10006
-#define RDS_INFO_TCP_SOCKETS            10007
-#define RDS_INFO_IB_CONNECTIONS		10008
-#define RDS_INFO_CONNECTION_STATS	10009
-#define RDS_INFO_IWARP_CONNECTIONS	10010
-#define RDS_INFO_LAST			10010
-
-struct rds_info_counter {
-	uint8_t	name[32];
-	uint64_t	value;
-} __attribute__((packed));
-
-#define RDS_INFO_CONNECTION_FLAG_SENDING	0x01
-#define RDS_INFO_CONNECTION_FLAG_CONNECTING	0x02
-#define RDS_INFO_CONNECTION_FLAG_CONNECTED	0x04
-
-#define TRANSNAMSIZ	16
-
-struct rds_info_connection {
-	uint64_t	next_tx_seq;
-	uint64_t	next_rx_seq;
-	__be32		laddr;
-	__be32		faddr;
-	uint8_t	transport[TRANSNAMSIZ];		/* null term ascii */
-	uint8_t	flags;
-} __attribute__((packed));
-
-#define RDS_INFO_MESSAGE_FLAG_ACK               0x01
-#define RDS_INFO_MESSAGE_FLAG_FAST_ACK          0x02
-
-struct rds_info_message {
-	uint64_t	seq;
-	uint32_t	len;
-	__be32		laddr;
-	__be32		faddr;
-	__be16		lport;
-	__be16		fport;
-	uint8_t	flags;
-} __attribute__((packed));
-
-struct rds_info_socket {
-	uint32_t	sndbuf;
-	__be32		bound_addr;
-	__be32		connected_addr;
-	__be16		bound_port;
-	__be16		connected_port;
-	uint32_t	rcvbuf;
-	uint64_t	inum;
-} __attribute__((packed));
-
-struct rds_info_tcp_socket {
-	__be32          local_addr;
-	__be16          local_port;
-	__be32          peer_addr;
-	__be16          peer_port;
-	uint64_t       hdr_rem;
-	uint64_t       data_rem;
-	uint32_t       last_sent_nxt;
-	uint32_t       last_expected_una;
-	uint32_t       last_seen_una;
-} __attribute__((packed));
-
-#define RDS_IB_GID_LEN	16
-struct rds_info_rdma_connection {
-	__be32		src_addr;
-	__be32		dst_addr;
-	uint8_t		src_gid[RDS_IB_GID_LEN];
-	uint8_t		dst_gid[RDS_IB_GID_LEN];
-
-	uint32_t	max_send_wr;
-	uint32_t	max_recv_wr;
-	uint32_t	max_send_sge;
-	uint32_t	rdma_mr_max;
-	uint32_t	rdma_mr_size;
-};
-
-/*
- * Congestion monitoring.
- * Congestion control in RDS happens at the host connection
- * level by exchanging a bitmap marking congested ports.
- * By default, a process sleeping in poll() is always woken
- * up when the congestion map is updated.
- * With explicit monitoring, an application can have more
- * fine-grained control.
- * The application installs a 64bit mask value in the socket,
- * where each bit corresponds to a group of ports.
- * When a congestion update arrives, RDS checks the set of
- * ports that are now uncongested against the list bit mask
- * installed in the socket, and if they overlap, we queue a
- * cong_notification on the socket.
- *
- * To install the congestion monitor bitmask, use RDS_CONG_MONITOR
- * with the 64bit mask.
- * Congestion updates are received via RDS_CMSG_CONG_UPDATE
- * control messages.
- *
- * The correspondence between bits and ports is
- *	1 << (portnum % 64)
- */
-#define RDS_CONG_MONITOR_SIZE	64
-#define RDS_CONG_MONITOR_BIT(port)  (((unsigned int) port) % RDS_CONG_MONITOR_SIZE)
-#define RDS_CONG_MONITOR_MASK(port) (1ULL << RDS_CONG_MONITOR_BIT(port))
-
-/*
- * RDMA related types
- */
-
-/*
- * This encapsulates a remote memory location.
- * In the current implementation, it contains the R_Key
- * of the remote memory region, and the offset into it
- * (so that the application does not have to worry about
- * alignment).
- */
-typedef uint64_t	rds_rdma_cookie_t;
-
-struct rds_iovec {
-	uint64_t	addr;
-	uint64_t	bytes;
-};
-
-struct rds_get_mr_args {
-	struct rds_iovec vec;
-	uint64_t	cookie_addr;
-	uint64_t	flags;
-};
-
-struct rds_get_mr_for_dest_args {
-	struct sockaddr_storage	dest_addr;
-	struct rds_iovec 	vec;
-	uint64_t		cookie_addr;
-	uint64_t		flags;
-};
-
-struct rds_free_mr_args {
-	rds_rdma_cookie_t cookie;
-	uint64_t	flags;
-};
-
-struct rds_rdma_args {
-	rds_rdma_cookie_t cookie;
-	struct rds_iovec remote_vec;
-	uint64_t	local_vec_addr;
-	uint64_t	nr_local;
-	uint64_t	flags;
-	uint64_t	user_token;
-};
-
-struct rds_atomic_args {
-	rds_rdma_cookie_t cookie;
-	uint64_t 	local_addr;
-	uint64_t 	remote_addr;
-	union {
-		struct {
-			uint64_t	compare;
-			uint64_t	swap;
-		} cswp;
-		struct {
-			uint64_t	add;
-		} fadd;
-		struct {
-			uint64_t	compare;
-			uint64_t	swap;
-			uint64_t	compare_mask;
-			uint64_t	swap_mask;
-		} m_cswp;
-		struct {
-			uint64_t	add;
-			uint64_t	nocarry_mask;
-		} m_fadd;
-	};
-	uint64_t	flags;
-	uint64_t	user_token;
-};
-
-struct rds_rdma_notify {
-	uint64_t	user_token;
-	int32_t		status;
-};
-
-#define RDS_RDMA_SUCCESS	0
-#define RDS_RDMA_REMOTE_ERROR	1
-#define RDS_RDMA_CANCELED	2
-#define RDS_RDMA_DROPPED	3
-#define RDS_RDMA_OTHER_ERROR	4
-
-/*
- * Common set of flags for all RDMA related structs
- */
-#define RDS_RDMA_READWRITE	0x0001
-#define RDS_RDMA_FENCE		0x0002	/* use FENCE for immediate send */
-#define RDS_RDMA_INVALIDATE	0x0004	/* invalidate R_Key after freeing MR */
-#define RDS_RDMA_USE_ONCE	0x0008	/* free MR after use */
-#define RDS_RDMA_DONTWAIT	0x0010	/* Don't wait in SET_BARRIER */
-#define RDS_RDMA_NOTIFY_ME	0x0020	/* Notify when operation completes */
-#define RDS_RDMA_SILENT		0x0040	/* Do not interrupt remote */
-
-#endif /* IB_RDS_H */
diff --git a/openflow/usr/include/linux/reboot.h b/openflow/usr/include/linux/reboot.h
deleted file mode 100644
index aa33674..0000000
--- a/openflow/usr/include/linux/reboot.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _LINUX_REBOOT_H
-#define _LINUX_REBOOT_H
-
-/*
- * Magic values required to use _reboot() system call.
- */
-
-#define	LINUX_REBOOT_MAGIC1	0xfee1dead
-#define	LINUX_REBOOT_MAGIC2	672274793
-#define	LINUX_REBOOT_MAGIC2A	85072278
-#define	LINUX_REBOOT_MAGIC2B	369367448
-#define	LINUX_REBOOT_MAGIC2C	537993216
-
-
-/*
- * Commands accepted by the _reboot() system call.
- *
- * RESTART     Restart system using default command and mode.
- * HALT        Stop OS and give system control to ROM monitor, if any.
- * CAD_ON      Ctrl-Alt-Del sequence causes RESTART command.
- * CAD_OFF     Ctrl-Alt-Del sequence sends SIGINT to init task.
- * POWER_OFF   Stop OS and remove all power from system, if possible.
- * RESTART2    Restart system using given command string.
- * SW_SUSPEND  Suspend system using software suspend if compiled in.
- * KEXEC       Restart system using a previously loaded Linux kernel
- */
-
-#define	LINUX_REBOOT_CMD_RESTART	0x01234567
-#define	LINUX_REBOOT_CMD_HALT		0xCDEF0123
-#define	LINUX_REBOOT_CMD_CAD_ON		0x89ABCDEF
-#define	LINUX_REBOOT_CMD_CAD_OFF	0x00000000
-#define	LINUX_REBOOT_CMD_POWER_OFF	0x4321FEDC
-#define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
-#define	LINUX_REBOOT_CMD_SW_SUSPEND	0xD000FCE2
-#define	LINUX_REBOOT_CMD_KEXEC		0x45584543
-
-
-
-#endif /* _LINUX_REBOOT_H */
diff --git a/openflow/usr/include/linux/reiserfs_fs.h b/openflow/usr/include/linux/reiserfs_fs.h
deleted file mode 100644
index ea3700c..0000000
--- a/openflow/usr/include/linux/reiserfs_fs.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 1996, 1997, 1998 Hans Reiser, see reiserfs/README for licensing and copyright details
- */
-#ifndef _LINUX_REISER_FS_H
-#define _LINUX_REISER_FS_H
-
-#include <linux/types.h>
-#include <linux/magic.h>
-
-/*
- *  include/linux/reiser_fs.h
- *
- *  Reiser File System constants and structures
- *
- */
-
-/* ioctl's command */
-#define REISERFS_IOC_UNPACK		_IOW(0xCD,1,long)
-/* define following flags to be the same as in ext2, so that chattr(1),
-   lsattr(1) will work with us. */
-#define REISERFS_IOC_GETFLAGS		FS_IOC_GETFLAGS
-#define REISERFS_IOC_SETFLAGS		FS_IOC_SETFLAGS
-#define REISERFS_IOC_GETVERSION		FS_IOC_GETVERSION
-#define REISERFS_IOC_SETVERSION		FS_IOC_SETVERSION
-
-#endif				/* _LINUX_REISER_FS_H */
diff --git a/openflow/usr/include/linux/reiserfs_xattr.h b/openflow/usr/include/linux/reiserfs_xattr.h
deleted file mode 100644
index 38fdd64..0000000
--- a/openflow/usr/include/linux/reiserfs_xattr.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-  File: linux/reiserfs_xattr.h
-*/
-
-#ifndef _LINUX_REISERFS_XATTR_H
-#define _LINUX_REISERFS_XATTR_H
-
-#include <linux/types.h>
-
-/* Magic value in header */
-#define REISERFS_XATTR_MAGIC 0x52465841	/* "RFXA" */
-
-struct reiserfs_xattr_header {
-	__le32 h_magic;		/* magic number for identification */
-	__le32 h_hash;		/* hash of the value */
-};
-
-struct reiserfs_security_handle {
-	const char *name;
-	void *value;
-	size_t length;
-};
-
-#endif  /*  _LINUX_REISERFS_XATTR_H  */
diff --git a/openflow/usr/include/linux/resource.h b/openflow/usr/include/linux/resource.h
deleted file mode 100644
index 5e036db..0000000
--- a/openflow/usr/include/linux/resource.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef _LINUX_RESOURCE_H
-#define _LINUX_RESOURCE_H
-
-#include <linux/time.h>
-#include <linux/types.h>
-
-/*
- * Resource control/accounting header file for linux
- */
-
-/*
- * Definition of struct rusage taken from BSD 4.3 Reno
- * 
- * We don't support all of these yet, but we might as well have them....
- * Otherwise, each time we add new items, programs which depend on this
- * structure will lose.  This reduces the chances of that happening.
- */
-#define	RUSAGE_SELF	0
-#define	RUSAGE_CHILDREN	(-1)
-#define RUSAGE_BOTH	(-2)		/* sys_wait4() uses this */
-#define	RUSAGE_THREAD	1		/* only the calling thread */
-
-struct	rusage {
-	struct timeval ru_utime;	/* user time used */
-	struct timeval ru_stime;	/* system time used */
-	__kernel_long_t	ru_maxrss;	/* maximum resident set size */
-	__kernel_long_t	ru_ixrss;	/* integral shared memory size */
-	__kernel_long_t	ru_idrss;	/* integral unshared data size */
-	__kernel_long_t	ru_isrss;	/* integral unshared stack size */
-	__kernel_long_t	ru_minflt;	/* page reclaims */
-	__kernel_long_t	ru_majflt;	/* page faults */
-	__kernel_long_t	ru_nswap;	/* swaps */
-	__kernel_long_t	ru_inblock;	/* block input operations */
-	__kernel_long_t	ru_oublock;	/* block output operations */
-	__kernel_long_t	ru_msgsnd;	/* messages sent */
-	__kernel_long_t	ru_msgrcv;	/* messages received */
-	__kernel_long_t	ru_nsignals;	/* signals received */
-	__kernel_long_t	ru_nvcsw;	/* voluntary context switches */
-	__kernel_long_t	ru_nivcsw;	/* involuntary " */
-};
-
-struct rlimit {
-	__kernel_ulong_t	rlim_cur;
-	__kernel_ulong_t	rlim_max;
-};
-
-#define RLIM64_INFINITY		(~0ULL)
-
-struct rlimit64 {
-	__u64 rlim_cur;
-	__u64 rlim_max;
-};
-
-#define	PRIO_MIN	(-20)
-#define	PRIO_MAX	20
-
-#define	PRIO_PROCESS	0
-#define	PRIO_PGRP	1
-#define	PRIO_USER	2
-
-/*
- * Limit the stack by to some sane default: root can always
- * increase this limit if needed..  8MB seems reasonable.
- */
-#define _STK_LIM	(8*1024*1024)
-
-/*
- * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
- * and other sensitive information are never written to disk.
- */
-#define MLOCK_LIMIT	((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
-
-/*
- * Due to binary compatibility, the actual resource numbers
- * may be different for different linux versions..
- */
-#include <asm/resource.h>
-
-
-#endif /* _LINUX_RESOURCE_H */
diff --git a/openflow/usr/include/linux/rfkill.h b/openflow/usr/include/linux/rfkill.h
deleted file mode 100644
index 557cde2..0000000
--- a/openflow/usr/include/linux/rfkill.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2006 - 2007 Ivo van Doorn
- * Copyright (C) 2007 Dmitry Torokhov
- * Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#ifndef __RFKILL_H
-#define __RFKILL_H
-
-
-#include <linux/types.h>
-
-/* define userspace visible states */
-#define RFKILL_STATE_SOFT_BLOCKED	0
-#define RFKILL_STATE_UNBLOCKED		1
-#define RFKILL_STATE_HARD_BLOCKED	2
-
-/**
- * enum rfkill_type - type of rfkill switch.
- *
- * @RFKILL_TYPE_ALL: toggles all switches (requests only - not a switch type)
- * @RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device.
- * @RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device.
- * @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
- * @RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
- * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
- * @RFKILL_TYPE_GPS: switch is on a GPS device.
- * @RFKILL_TYPE_FM: switch is on a FM radio device.
- * @RFKILL_TYPE_NFC: switch is on an NFC device.
- * @NUM_RFKILL_TYPES: number of defined rfkill types
- */
-enum rfkill_type {
-	RFKILL_TYPE_ALL = 0,
-	RFKILL_TYPE_WLAN,
-	RFKILL_TYPE_BLUETOOTH,
-	RFKILL_TYPE_UWB,
-	RFKILL_TYPE_WIMAX,
-	RFKILL_TYPE_WWAN,
-	RFKILL_TYPE_GPS,
-	RFKILL_TYPE_FM,
-	RFKILL_TYPE_NFC,
-	NUM_RFKILL_TYPES,
-};
-
-/**
- * enum rfkill_operation - operation types
- * @RFKILL_OP_ADD: a device was added
- * @RFKILL_OP_DEL: a device was removed
- * @RFKILL_OP_CHANGE: a device's state changed -- userspace changes one device
- * @RFKILL_OP_CHANGE_ALL: userspace changes all devices (of a type, or all)
- */
-enum rfkill_operation {
-	RFKILL_OP_ADD = 0,
-	RFKILL_OP_DEL,
-	RFKILL_OP_CHANGE,
-	RFKILL_OP_CHANGE_ALL,
-};
-
-/**
- * struct rfkill_event - events for userspace on /dev/rfkill
- * @idx: index of dev rfkill
- * @type: type of the rfkill struct
- * @op: operation code
- * @hard: hard state (0/1)
- * @soft: soft state (0/1)
- *
- * Structure used for userspace communication on /dev/rfkill,
- * used for events from the kernel and control to the kernel.
- */
-struct rfkill_event {
-	__u32 idx;
-	__u8  type;
-	__u8  op;
-	__u8  soft, hard;
-} __attribute__((packed));
-
-/*
- * We are planning to be backward and forward compatible with changes
- * to the event struct, by adding new, optional, members at the end.
- * When reading an event (whether the kernel from userspace or vice
- * versa) we need to accept anything that's at least as large as the
- * version 1 event size, but might be able to accept other sizes in
- * the future.
- *
- * One exception is the kernel -- we already have two event sizes in
- * that we've made the 'hard' member optional since our only option
- * is to ignore it anyway.
- */
-#define RFKILL_EVENT_SIZE_V1	8
-
-/* ioctl for turning off rfkill-input (if present) */
-#define RFKILL_IOC_MAGIC	'R'
-#define RFKILL_IOC_NOINPUT	1
-#define RFKILL_IOCTL_NOINPUT	_IO(RFKILL_IOC_MAGIC, RFKILL_IOC_NOINPUT)
-
-/* and that's all userspace gets */
-
-#endif /* __RFKILL_H */
diff --git a/openflow/usr/include/linux/romfs_fs.h b/openflow/usr/include/linux/romfs_fs.h
deleted file mode 100644
index 5f57f93..0000000
--- a/openflow/usr/include/linux/romfs_fs.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __LINUX_ROMFS_FS_H
-#define __LINUX_ROMFS_FS_H
-
-#include <linux/types.h>
-#include <linux/fs.h>
-
-/* The basic structures of the romfs filesystem */
-
-#define ROMBSIZE BLOCK_SIZE
-#define ROMBSBITS BLOCK_SIZE_BITS
-#define ROMBMASK (ROMBSIZE-1)
-#define ROMFS_MAGIC 0x7275
-
-#define ROMFS_MAXFN 128
-
-#define __mkw(h,l) (((h)&0x00ff)<< 8|((l)&0x00ff))
-#define __mkl(h,l) (((h)&0xffff)<<16|((l)&0xffff))
-#define __mk4(a,b,c,d) cpu_to_be32(__mkl(__mkw(a,b),__mkw(c,d)))
-#define ROMSB_WORD0 __mk4('-','r','o','m')
-#define ROMSB_WORD1 __mk4('1','f','s','-')
-
-/* On-disk "super block" */
-
-struct romfs_super_block {
-	__be32 word0;
-	__be32 word1;
-	__be32 size;
-	__be32 checksum;
-	char name[0];		/* volume name */
-};
-
-/* On disk inode */
-
-struct romfs_inode {
-	__be32 next;		/* low 4 bits see ROMFH_ */
-	__be32 spec;
-	__be32 size;
-	__be32 checksum;
-	char name[0];
-};
-
-#define ROMFH_TYPE 7
-#define ROMFH_HRD 0
-#define ROMFH_DIR 1
-#define ROMFH_REG 2
-#define ROMFH_SYM 3
-#define ROMFH_BLK 4
-#define ROMFH_CHR 5
-#define ROMFH_SCK 6
-#define ROMFH_FIF 7
-#define ROMFH_EXEC 8
-
-/* Alignment */
-
-#define ROMFH_SIZE 16
-#define ROMFH_PAD (ROMFH_SIZE-1)
-#define ROMFH_MASK (~ROMFH_PAD)
-
-#endif
diff --git a/openflow/usr/include/linux/rose.h b/openflow/usr/include/linux/rose.h
deleted file mode 100644
index 1fcfe95..0000000
--- a/openflow/usr/include/linux/rose.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * These are the public elements of the Linux kernel Rose implementation.
- * For kernel AX.25 see the file ax25.h. This file requires ax25.h for the
- * definition of the ax25_address structure.
- */
-
-#ifndef	ROSE_KERNEL_H
-#define	ROSE_KERNEL_H
-
-#include <linux/socket.h>
-#include <linux/ax25.h>
-
-#define ROSE_MTU	251
-
-#define ROSE_MAX_DIGIS 6
-
-#define	ROSE_DEFER	1
-#define ROSE_T1		2
-#define	ROSE_T2		3
-#define	ROSE_T3		4
-#define	ROSE_IDLE	5
-#define	ROSE_QBITINCL	6
-#define	ROSE_HOLDBACK	7
-
-#define	SIOCRSGCAUSE		(SIOCPROTOPRIVATE+0)
-#define	SIOCRSSCAUSE		(SIOCPROTOPRIVATE+1)
-#define	SIOCRSL2CALL		(SIOCPROTOPRIVATE+2)
-#define	SIOCRSSL2CALL		(SIOCPROTOPRIVATE+2)
-#define	SIOCRSACCEPT		(SIOCPROTOPRIVATE+3)
-#define	SIOCRSCLRRT		(SIOCPROTOPRIVATE+4)
-#define	SIOCRSGL2CALL		(SIOCPROTOPRIVATE+5)
-#define	SIOCRSGFACILITIES	(SIOCPROTOPRIVATE+6)
-
-#define	ROSE_DTE_ORIGINATED	0x00
-#define	ROSE_NUMBER_BUSY	0x01
-#define	ROSE_INVALID_FACILITY	0x03
-#define	ROSE_NETWORK_CONGESTION	0x05
-#define	ROSE_OUT_OF_ORDER	0x09
-#define	ROSE_ACCESS_BARRED	0x0B
-#define	ROSE_NOT_OBTAINABLE	0x0D
-#define	ROSE_REMOTE_PROCEDURE	0x11
-#define	ROSE_LOCAL_PROCEDURE	0x13
-#define	ROSE_SHIP_ABSENT	0x39
-
-typedef struct {
-	char		rose_addr[5];
-} rose_address;
-
-struct sockaddr_rose {
-	__kernel_sa_family_t srose_family;
-	rose_address	srose_addr;
-	ax25_address	srose_call;
-	int		srose_ndigis;
-	ax25_address	srose_digi;
-};
-
-struct full_sockaddr_rose {
-	__kernel_sa_family_t srose_family;
-	rose_address	srose_addr;
-	ax25_address	srose_call;
-	unsigned int	srose_ndigis;
-	ax25_address	srose_digis[ROSE_MAX_DIGIS];
-};
-
-struct rose_route_struct {
-	rose_address	address;
-	unsigned short	mask;
-	ax25_address	neighbour;
-	char		device[16];
-	unsigned char	ndigis;
-	ax25_address	digipeaters[AX25_MAX_DIGIS];
-};
-
-struct rose_cause_struct {
-	unsigned char	cause;
-	unsigned char	diagnostic;
-};
-
-struct rose_facilities_struct {
-	rose_address	source_addr,   dest_addr;
-	ax25_address	source_call,   dest_call;
-	unsigned char	source_ndigis, dest_ndigis;
-	ax25_address	source_digis[ROSE_MAX_DIGIS];
-	ax25_address	dest_digis[ROSE_MAX_DIGIS];
-	unsigned int	rand;
-	rose_address	fail_addr;
-	ax25_address	fail_call;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/route.h b/openflow/usr/include/linux/route.h
deleted file mode 100644
index 11abf54..0000000
--- a/openflow/usr/include/linux/route.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Global definitions for the IP router interface.
- *
- * Version:	@(#)route.h	1.0.3	05/27/93
- *
- * Authors:	Original taken from Berkeley UNIX 4.3, (c) UCB 1986-1988
- *		for the purposes of compatibility only.
- *
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- * Changes:
- *              Mike McLagan    :       Routing by source
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_ROUTE_H
-#define _LINUX_ROUTE_H
-
-#include <linux/if.h>
-
-
-/* This structure gets passed by the SIOCADDRT and SIOCDELRT calls. */
-struct rtentry {
-	unsigned long	rt_pad1;
-	struct sockaddr	rt_dst;		/* target address		*/
-	struct sockaddr	rt_gateway;	/* gateway addr (RTF_GATEWAY)	*/
-	struct sockaddr	rt_genmask;	/* target network mask (IP)	*/
-	unsigned short	rt_flags;
-	short		rt_pad2;
-	unsigned long	rt_pad3;
-	void		*rt_pad4;
-	short		rt_metric;	/* +1 for binary compatibility!	*/
-	char *rt_dev;	/* forcing the device at add	*/
-	unsigned long	rt_mtu;		/* per route MTU/Window 	*/
-#define rt_mss	rt_mtu			/* Compatibility :-(            */
-	unsigned long	rt_window;	/* Window clamping 		*/
-	unsigned short	rt_irtt;	/* Initial RTT			*/
-};
-
-
-#define	RTF_UP		0x0001		/* route usable		  	*/
-#define	RTF_GATEWAY	0x0002		/* destination is a gateway	*/
-#define	RTF_HOST	0x0004		/* host entry (net otherwise)	*/
-#define RTF_REINSTATE	0x0008		/* reinstate route after tmout	*/
-#define	RTF_DYNAMIC	0x0010		/* created dyn. (by redirect)	*/
-#define	RTF_MODIFIED	0x0020		/* modified dyn. (by redirect)	*/
-#define RTF_MTU		0x0040		/* specific MTU for this route	*/
-#define RTF_MSS		RTF_MTU		/* Compatibility :-(		*/
-#define RTF_WINDOW	0x0080		/* per route window clamping	*/
-#define RTF_IRTT	0x0100		/* Initial round trip time	*/
-#define RTF_REJECT	0x0200		/* Reject route			*/
-
-/*
- *	<linux/ipv6_route.h> uses RTF values >= 64k
- */
-
-
-
-#endif	/* _LINUX_ROUTE_H */
-
diff --git a/openflow/usr/include/linux/rtc.h b/openflow/usr/include/linux/rtc.h
deleted file mode 100644
index cebd172..0000000
--- a/openflow/usr/include/linux/rtc.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Generic RTC interface.
- * This version contains the part of the user interface to the Real Time Clock
- * service. It is used with both the legacy mc146818 and also  EFI
- * Struct rtc_time and first 12 ioctl by Paul Gortmaker, 1996 - separated out
- * from <linux/mc146818rtc.h> to this file for 2.4 kernels.
- *
- * Copyright (C) 1999 Hewlett-Packard Co.
- * Copyright (C) 1999 Stephane Eranian <eranian@hpl.hp.com>
- */
-#ifndef _LINUX_RTC_H_
-#define _LINUX_RTC_H_
-
-/*
- * The struct used to pass data via the following ioctl. Similar to the
- * struct tm in <time.h>, but it needs to be here so that the kernel
- * source is self contained, allowing cross-compiles, etc. etc.
- */
-
-struct rtc_time {
-	int tm_sec;
-	int tm_min;
-	int tm_hour;
-	int tm_mday;
-	int tm_mon;
-	int tm_year;
-	int tm_wday;
-	int tm_yday;
-	int tm_isdst;
-};
-
-/*
- * This data structure is inspired by the EFI (v0.92) wakeup
- * alarm API.
- */
-struct rtc_wkalrm {
-	unsigned char enabled;	/* 0 = alarm disabled, 1 = alarm enabled */
-	unsigned char pending;  /* 0 = alarm not pending, 1 = alarm pending */
-	struct rtc_time time;	/* time the alarm is set to */
-};
-
-/*
- * Data structure to control PLL correction some better RTC feature
- * pll_value is used to get or set current value of correction,
- * the rest of the struct is used to query HW capabilities.
- * This is modeled after the RTC used in Q40/Q60 computers but
- * should be sufficiently flexible for other devices
- *
- * +ve pll_value means clock will run faster by
- *   pll_value*pll_posmult/pll_clock
- * -ve pll_value means clock will run slower by
- *   pll_value*pll_negmult/pll_clock
- */
-
-struct rtc_pll_info {
-	int pll_ctrl;       /* placeholder for fancier control */
-	int pll_value;      /* get/set correction value */
-	int pll_max;        /* max +ve (faster) adjustment value */
-	int pll_min;        /* max -ve (slower) adjustment value */
-	int pll_posmult;    /* factor for +ve correction */
-	int pll_negmult;    /* factor for -ve correction */
-	long pll_clock;     /* base PLL frequency */
-};
-
-/*
- * ioctl calls that are permitted to the /dev/rtc interface, if
- * any of the RTC drivers are enabled.
- */
-
-#define RTC_AIE_ON	_IO('p', 0x01)	/* Alarm int. enable on		*/
-#define RTC_AIE_OFF	_IO('p', 0x02)	/* ... off			*/
-#define RTC_UIE_ON	_IO('p', 0x03)	/* Update int. enable on	*/
-#define RTC_UIE_OFF	_IO('p', 0x04)	/* ... off			*/
-#define RTC_PIE_ON	_IO('p', 0x05)	/* Periodic int. enable on	*/
-#define RTC_PIE_OFF	_IO('p', 0x06)	/* ... off			*/
-#define RTC_WIE_ON	_IO('p', 0x0f)  /* Watchdog int. enable on	*/
-#define RTC_WIE_OFF	_IO('p', 0x10)  /* ... off			*/
-
-#define RTC_ALM_SET	_IOW('p', 0x07, struct rtc_time) /* Set alarm time  */
-#define RTC_ALM_READ	_IOR('p', 0x08, struct rtc_time) /* Read alarm time */
-#define RTC_RD_TIME	_IOR('p', 0x09, struct rtc_time) /* Read RTC time   */
-#define RTC_SET_TIME	_IOW('p', 0x0a, struct rtc_time) /* Set RTC time    */
-#define RTC_IRQP_READ	_IOR('p', 0x0b, unsigned long)	 /* Read IRQ rate   */
-#define RTC_IRQP_SET	_IOW('p', 0x0c, unsigned long)	 /* Set IRQ rate    */
-#define RTC_EPOCH_READ	_IOR('p', 0x0d, unsigned long)	 /* Read epoch      */
-#define RTC_EPOCH_SET	_IOW('p', 0x0e, unsigned long)	 /* Set epoch       */
-
-#define RTC_WKALM_SET	_IOW('p', 0x0f, struct rtc_wkalrm)/* Set wakeup alarm*/
-#define RTC_WKALM_RD	_IOR('p', 0x10, struct rtc_wkalrm)/* Get wakeup alarm*/
-
-#define RTC_PLL_GET	_IOR('p', 0x11, struct rtc_pll_info)  /* Get PLL correction */
-#define RTC_PLL_SET	_IOW('p', 0x12, struct rtc_pll_info)  /* Set PLL correction */
-
-#define RTC_VL_READ	_IOR('p', 0x13, int)	/* Voltage low detector */
-#define RTC_VL_CLR	_IO('p', 0x14)		/* Clear voltage low information */
-
-/* interrupt flags */
-#define RTC_IRQF 0x80	/* Any of the following is active */
-#define RTC_PF 0x40	/* Periodic interrupt */
-#define RTC_AF 0x20	/* Alarm interrupt */
-#define RTC_UF 0x10	/* Update interrupt for 1Hz RTC */
-
-
-#define RTC_MAX_FREQ	8192
-
-
-#endif /* _LINUX_RTC_H_ */
diff --git a/openflow/usr/include/linux/rtnetlink.h b/openflow/usr/include/linux/rtnetlink.h
deleted file mode 100644
index 18c543a..0000000
--- a/openflow/usr/include/linux/rtnetlink.h
+++ /dev/null
@@ -1,674 +0,0 @@
-#ifndef __LINUX_RTNETLINK_H
-#define __LINUX_RTNETLINK_H
-
-#include <linux/types.h>
-#include <linux/netlink.h>
-#include <linux/if_link.h>
-#include <linux/if_addr.h>
-#include <linux/neighbour.h>
-
-/* rtnetlink families. Values up to 127 are reserved for real address
- * families, values above 128 may be used arbitrarily.
- */
-#define RTNL_FAMILY_IPMR		128
-#define RTNL_FAMILY_IP6MR		129
-#define RTNL_FAMILY_MAX			129
-
-/****
- *		Routing/neighbour discovery messages.
- ****/
-
-/* Types of messages */
-
-enum {
-	RTM_BASE	= 16,
-#define RTM_BASE	RTM_BASE
-
-	RTM_NEWLINK	= 16,
-#define RTM_NEWLINK	RTM_NEWLINK
-	RTM_DELLINK,
-#define RTM_DELLINK	RTM_DELLINK
-	RTM_GETLINK,
-#define RTM_GETLINK	RTM_GETLINK
-	RTM_SETLINK,
-#define RTM_SETLINK	RTM_SETLINK
-
-	RTM_NEWADDR	= 20,
-#define RTM_NEWADDR	RTM_NEWADDR
-	RTM_DELADDR,
-#define RTM_DELADDR	RTM_DELADDR
-	RTM_GETADDR,
-#define RTM_GETADDR	RTM_GETADDR
-
-	RTM_NEWROUTE	= 24,
-#define RTM_NEWROUTE	RTM_NEWROUTE
-	RTM_DELROUTE,
-#define RTM_DELROUTE	RTM_DELROUTE
-	RTM_GETROUTE,
-#define RTM_GETROUTE	RTM_GETROUTE
-
-	RTM_NEWNEIGH	= 28,
-#define RTM_NEWNEIGH	RTM_NEWNEIGH
-	RTM_DELNEIGH,
-#define RTM_DELNEIGH	RTM_DELNEIGH
-	RTM_GETNEIGH,
-#define RTM_GETNEIGH	RTM_GETNEIGH
-
-	RTM_NEWRULE	= 32,
-#define RTM_NEWRULE	RTM_NEWRULE
-	RTM_DELRULE,
-#define RTM_DELRULE	RTM_DELRULE
-	RTM_GETRULE,
-#define RTM_GETRULE	RTM_GETRULE
-
-	RTM_NEWQDISC	= 36,
-#define RTM_NEWQDISC	RTM_NEWQDISC
-	RTM_DELQDISC,
-#define RTM_DELQDISC	RTM_DELQDISC
-	RTM_GETQDISC,
-#define RTM_GETQDISC	RTM_GETQDISC
-
-	RTM_NEWTCLASS	= 40,
-#define RTM_NEWTCLASS	RTM_NEWTCLASS
-	RTM_DELTCLASS,
-#define RTM_DELTCLASS	RTM_DELTCLASS
-	RTM_GETTCLASS,
-#define RTM_GETTCLASS	RTM_GETTCLASS
-
-	RTM_NEWTFILTER	= 44,
-#define RTM_NEWTFILTER	RTM_NEWTFILTER
-	RTM_DELTFILTER,
-#define RTM_DELTFILTER	RTM_DELTFILTER
-	RTM_GETTFILTER,
-#define RTM_GETTFILTER	RTM_GETTFILTER
-
-	RTM_NEWACTION	= 48,
-#define RTM_NEWACTION   RTM_NEWACTION
-	RTM_DELACTION,
-#define RTM_DELACTION   RTM_DELACTION
-	RTM_GETACTION,
-#define RTM_GETACTION   RTM_GETACTION
-
-	RTM_NEWPREFIX	= 52,
-#define RTM_NEWPREFIX	RTM_NEWPREFIX
-
-	RTM_GETMULTICAST = 58,
-#define RTM_GETMULTICAST RTM_GETMULTICAST
-
-	RTM_GETANYCAST	= 62,
-#define RTM_GETANYCAST	RTM_GETANYCAST
-
-	RTM_NEWNEIGHTBL	= 64,
-#define RTM_NEWNEIGHTBL	RTM_NEWNEIGHTBL
-	RTM_GETNEIGHTBL	= 66,
-#define RTM_GETNEIGHTBL	RTM_GETNEIGHTBL
-	RTM_SETNEIGHTBL,
-#define RTM_SETNEIGHTBL	RTM_SETNEIGHTBL
-
-	RTM_NEWNDUSEROPT = 68,
-#define RTM_NEWNDUSEROPT RTM_NEWNDUSEROPT
-
-	RTM_NEWADDRLABEL = 72,
-#define RTM_NEWADDRLABEL RTM_NEWADDRLABEL
-	RTM_DELADDRLABEL,
-#define RTM_DELADDRLABEL RTM_DELADDRLABEL
-	RTM_GETADDRLABEL,
-#define RTM_GETADDRLABEL RTM_GETADDRLABEL
-
-	RTM_GETDCB = 78,
-#define RTM_GETDCB RTM_GETDCB
-	RTM_SETDCB,
-#define RTM_SETDCB RTM_SETDCB
-
-	RTM_NEWNETCONF = 80,
-#define RTM_NEWNETCONF RTM_NEWNETCONF
-	RTM_GETNETCONF = 82,
-#define RTM_GETNETCONF RTM_GETNETCONF
-
-	RTM_NEWMDB = 84,
-#define RTM_NEWMDB RTM_NEWMDB
-	RTM_DELMDB = 85,
-#define RTM_DELMDB RTM_DELMDB
-	RTM_GETMDB = 86,
-#define RTM_GETMDB RTM_GETMDB
-
-	RTM_NEWNSID = 88,
-#define RTM_NEWNSID RTM_NEWNSID
-	RTM_DELNSID = 89,
-#define RTM_DELNSID RTM_DELNSID
-	RTM_GETNSID = 90,
-#define RTM_GETNSID RTM_GETNSID
-
-	__RTM_MAX,
-#define RTM_MAX		(((__RTM_MAX + 3) & ~3) - 1)
-};
-
-#define RTM_NR_MSGTYPES	(RTM_MAX + 1 - RTM_BASE)
-#define RTM_NR_FAMILIES	(RTM_NR_MSGTYPES >> 2)
-#define RTM_FAM(cmd)	(((cmd) - RTM_BASE) >> 2)
-
-/* 
-   Generic structure for encapsulation of optional route information.
-   It is reminiscent of sockaddr, but with sa_family replaced
-   with attribute type.
- */
-
-struct rtattr {
-	unsigned short	rta_len;
-	unsigned short	rta_type;
-};
-
-/* Macros to handle rtattributes */
-
-#define RTA_ALIGNTO	4U
-#define RTA_ALIGN(len) ( ((len)+RTA_ALIGNTO-1) & ~(RTA_ALIGNTO-1) )
-#define RTA_OK(rta,len) ((len) >= (int)sizeof(struct rtattr) && \
-			 (rta)->rta_len >= sizeof(struct rtattr) && \
-			 (rta)->rta_len <= (len))
-#define RTA_NEXT(rta,attrlen)	((attrlen) -= RTA_ALIGN((rta)->rta_len), \
-				 (struct rtattr*)(((char*)(rta)) + RTA_ALIGN((rta)->rta_len)))
-#define RTA_LENGTH(len)	(RTA_ALIGN(sizeof(struct rtattr)) + (len))
-#define RTA_SPACE(len)	RTA_ALIGN(RTA_LENGTH(len))
-#define RTA_DATA(rta)   ((void*)(((char*)(rta)) + RTA_LENGTH(0)))
-#define RTA_PAYLOAD(rta) ((int)((rta)->rta_len) - RTA_LENGTH(0))
-
-
-
-
-/******************************************************************************
- *		Definitions used in routing table administration.
- ****/
-
-struct rtmsg {
-	unsigned char		rtm_family;
-	unsigned char		rtm_dst_len;
-	unsigned char		rtm_src_len;
-	unsigned char		rtm_tos;
-
-	unsigned char		rtm_table;	/* Routing table id */
-	unsigned char		rtm_protocol;	/* Routing protocol; see below	*/
-	unsigned char		rtm_scope;	/* See below */	
-	unsigned char		rtm_type;	/* See below	*/
-
-	unsigned		rtm_flags;
-};
-
-/* rtm_type */
-
-enum {
-	RTN_UNSPEC,
-	RTN_UNICAST,		/* Gateway or direct route	*/
-	RTN_LOCAL,		/* Accept locally		*/
-	RTN_BROADCAST,		/* Accept locally as broadcast,
-				   send as broadcast */
-	RTN_ANYCAST,		/* Accept locally as broadcast,
-				   but send as unicast */
-	RTN_MULTICAST,		/* Multicast route		*/
-	RTN_BLACKHOLE,		/* Drop				*/
-	RTN_UNREACHABLE,	/* Destination is unreachable   */
-	RTN_PROHIBIT,		/* Administratively prohibited	*/
-	RTN_THROW,		/* Not in this table		*/
-	RTN_NAT,		/* Translate this address	*/
-	RTN_XRESOLVE,		/* Use external resolver	*/
-	__RTN_MAX
-};
-
-#define RTN_MAX (__RTN_MAX - 1)
-
-
-/* rtm_protocol */
-
-#define RTPROT_UNSPEC	0
-#define RTPROT_REDIRECT	1	/* Route installed by ICMP redirects;
-				   not used by current IPv4 */
-#define RTPROT_KERNEL	2	/* Route installed by kernel		*/
-#define RTPROT_BOOT	3	/* Route installed during boot		*/
-#define RTPROT_STATIC	4	/* Route installed by administrator	*/
-
-/* Values of protocol >= RTPROT_STATIC are not interpreted by kernel;
-   they are just passed from user and back as is.
-   It will be used by hypothetical multiple routing daemons.
-   Note that protocol values should be standardized in order to
-   avoid conflicts.
- */
-
-#define RTPROT_GATED	8	/* Apparently, GateD */
-#define RTPROT_RA	9	/* RDISC/ND router advertisements */
-#define RTPROT_MRT	10	/* Merit MRT */
-#define RTPROT_ZEBRA	11	/* Zebra */
-#define RTPROT_BIRD	12	/* BIRD */
-#define RTPROT_DNROUTED	13	/* DECnet routing daemon */
-#define RTPROT_XORP	14	/* XORP */
-#define RTPROT_NTK	15	/* Netsukuku */
-#define RTPROT_DHCP	16      /* DHCP client */
-#define RTPROT_MROUTED	17      /* Multicast daemon */
-#define RTPROT_BABEL	42      /* Babel daemon */
-
-/* rtm_scope
-
-   Really it is not scope, but sort of distance to the destination.
-   NOWHERE are reserved for not existing destinations, HOST is our
-   local addresses, LINK are destinations, located on directly attached
-   link and UNIVERSE is everywhere in the Universe.
-
-   Intermediate values are also possible f.e. interior routes
-   could be assigned a value between UNIVERSE and LINK.
-*/
-
-enum rt_scope_t {
-	RT_SCOPE_UNIVERSE=0,
-/* User defined values  */
-	RT_SCOPE_SITE=200,
-	RT_SCOPE_LINK=253,
-	RT_SCOPE_HOST=254,
-	RT_SCOPE_NOWHERE=255
-};
-
-/* rtm_flags */
-
-#define RTM_F_NOTIFY		0x100	/* Notify user of route change	*/
-#define RTM_F_CLONED		0x200	/* This route is cloned		*/
-#define RTM_F_EQUALIZE		0x400	/* Multipath equalizer: NI	*/
-#define RTM_F_PREFIX		0x800	/* Prefix addresses		*/
-#define RTM_F_LOOKUP_TABLE	0x1000	/* set rtm_table to FIB lookup result */
-
-/* Reserved table identifiers */
-
-enum rt_class_t {
-	RT_TABLE_UNSPEC=0,
-/* User defined values */
-	RT_TABLE_COMPAT=252,
-	RT_TABLE_DEFAULT=253,
-	RT_TABLE_MAIN=254,
-	RT_TABLE_LOCAL=255,
-	RT_TABLE_MAX=0xFFFFFFFF
-};
-
-
-/* Routing message attributes */
-
-enum rtattr_type_t {
-	RTA_UNSPEC,
-	RTA_DST,
-	RTA_SRC,
-	RTA_IIF,
-	RTA_OIF,
-	RTA_GATEWAY,
-	RTA_PRIORITY,
-	RTA_PREFSRC,
-	RTA_METRICS,
-	RTA_MULTIPATH,
-	RTA_PROTOINFO, /* no longer used */
-	RTA_FLOW,
-	RTA_CACHEINFO,
-	RTA_SESSION, /* no longer used */
-	RTA_MP_ALGO, /* no longer used */
-	RTA_TABLE,
-	RTA_MARK,
-	RTA_MFC_STATS,
-	RTA_VIA,
-	RTA_NEWDST,
-	RTA_PREF,
-	RTA_ENCAP_TYPE,
-	RTA_ENCAP,
-	__RTA_MAX
-};
-
-#define RTA_MAX (__RTA_MAX - 1)
-
-#define RTM_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct rtmsg))))
-#define RTM_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtmsg))
-
-/* RTM_MULTIPATH --- array of struct rtnexthop.
- *
- * "struct rtnexthop" describes all necessary nexthop information,
- * i.e. parameters of path to a destination via this nexthop.
- *
- * At the moment it is impossible to set different prefsrc, mtu, window
- * and rtt for different paths from multipath.
- */
-
-struct rtnexthop {
-	unsigned short		rtnh_len;
-	unsigned char		rtnh_flags;
-	unsigned char		rtnh_hops;
-	int			rtnh_ifindex;
-};
-
-/* rtnh_flags */
-
-#define RTNH_F_DEAD		1	/* Nexthop is dead (used by multipath)	*/
-#define RTNH_F_PERVASIVE	2	/* Do recursive gateway lookup	*/
-#define RTNH_F_ONLINK		4	/* Gateway is forced on link	*/
-#define RTNH_F_OFFLOAD		8	/* offloaded route */
-#define RTNH_F_LINKDOWN		16	/* carrier-down on nexthop */
-
-#define RTNH_COMPARE_MASK	(RTNH_F_DEAD | RTNH_F_LINKDOWN)
-
-/* Macros to handle hexthops */
-
-#define RTNH_ALIGNTO	4
-#define RTNH_ALIGN(len) ( ((len)+RTNH_ALIGNTO-1) & ~(RTNH_ALIGNTO-1) )
-#define RTNH_OK(rtnh,len) ((rtnh)->rtnh_len >= sizeof(struct rtnexthop) && \
-			   ((int)(rtnh)->rtnh_len) <= (len))
-#define RTNH_NEXT(rtnh)	((struct rtnexthop*)(((char*)(rtnh)) + RTNH_ALIGN((rtnh)->rtnh_len)))
-#define RTNH_LENGTH(len) (RTNH_ALIGN(sizeof(struct rtnexthop)) + (len))
-#define RTNH_SPACE(len)	RTNH_ALIGN(RTNH_LENGTH(len))
-#define RTNH_DATA(rtnh)   ((struct rtattr*)(((char*)(rtnh)) + RTNH_LENGTH(0)))
-
-/* RTA_VIA */
-struct rtvia {
-	__kernel_sa_family_t	rtvia_family;
-	__u8			rtvia_addr[0];
-};
-
-/* RTM_CACHEINFO */
-
-struct rta_cacheinfo {
-	__u32	rta_clntref;
-	__u32	rta_lastuse;
-	__s32	rta_expires;
-	__u32	rta_error;
-	__u32	rta_used;
-
-#define RTNETLINK_HAVE_PEERINFO 1
-	__u32	rta_id;
-	__u32	rta_ts;
-	__u32	rta_tsage;
-};
-
-/* RTM_METRICS --- array of struct rtattr with types of RTAX_* */
-
-enum {
-	RTAX_UNSPEC,
-#define RTAX_UNSPEC RTAX_UNSPEC
-	RTAX_LOCK,
-#define RTAX_LOCK RTAX_LOCK
-	RTAX_MTU,
-#define RTAX_MTU RTAX_MTU
-	RTAX_WINDOW,
-#define RTAX_WINDOW RTAX_WINDOW
-	RTAX_RTT,
-#define RTAX_RTT RTAX_RTT
-	RTAX_RTTVAR,
-#define RTAX_RTTVAR RTAX_RTTVAR
-	RTAX_SSTHRESH,
-#define RTAX_SSTHRESH RTAX_SSTHRESH
-	RTAX_CWND,
-#define RTAX_CWND RTAX_CWND
-	RTAX_ADVMSS,
-#define RTAX_ADVMSS RTAX_ADVMSS
-	RTAX_REORDERING,
-#define RTAX_REORDERING RTAX_REORDERING
-	RTAX_HOPLIMIT,
-#define RTAX_HOPLIMIT RTAX_HOPLIMIT
-	RTAX_INITCWND,
-#define RTAX_INITCWND RTAX_INITCWND
-	RTAX_FEATURES,
-#define RTAX_FEATURES RTAX_FEATURES
-	RTAX_RTO_MIN,
-#define RTAX_RTO_MIN RTAX_RTO_MIN
-	RTAX_INITRWND,
-#define RTAX_INITRWND RTAX_INITRWND
-	RTAX_QUICKACK,
-#define RTAX_QUICKACK RTAX_QUICKACK
-	RTAX_CC_ALGO,
-#define RTAX_CC_ALGO RTAX_CC_ALGO
-	__RTAX_MAX
-};
-
-#define RTAX_MAX (__RTAX_MAX - 1)
-
-#define RTAX_FEATURE_ECN	(1 << 0)
-#define RTAX_FEATURE_SACK	(1 << 1)
-#define RTAX_FEATURE_TIMESTAMP	(1 << 2)
-#define RTAX_FEATURE_ALLFRAG	(1 << 3)
-
-#define RTAX_FEATURE_MASK	(RTAX_FEATURE_ECN | RTAX_FEATURE_SACK | \
-				 RTAX_FEATURE_TIMESTAMP | RTAX_FEATURE_ALLFRAG)
-
-struct rta_session {
-	__u8	proto;
-	__u8	pad1;
-	__u16	pad2;
-
-	union {
-		struct {
-			__u16	sport;
-			__u16	dport;
-		} ports;
-
-		struct {
-			__u8	type;
-			__u8	code;
-			__u16	ident;
-		} icmpt;
-
-		__u32		spi;
-	} u;
-};
-
-struct rta_mfc_stats {
-	__u64	mfcs_packets;
-	__u64	mfcs_bytes;
-	__u64	mfcs_wrong_if;
-};
-
-/****
- *		General form of address family dependent message.
- ****/
-
-struct rtgenmsg {
-	unsigned char		rtgen_family;
-};
-
-/*****************************************************************
- *		Link layer specific messages.
- ****/
-
-/* struct ifinfomsg
- * passes link level specific information, not dependent
- * on network protocol.
- */
-
-struct ifinfomsg {
-	unsigned char	ifi_family;
-	unsigned char	__ifi_pad;
-	unsigned short	ifi_type;		/* ARPHRD_* */
-	int		ifi_index;		/* Link index	*/
-	unsigned	ifi_flags;		/* IFF_* flags	*/
-	unsigned	ifi_change;		/* IFF_* change mask */
-};
-
-/********************************************************************
- *		prefix information 
- ****/
-
-struct prefixmsg {
-	unsigned char	prefix_family;
-	unsigned char	prefix_pad1;
-	unsigned short	prefix_pad2;
-	int		prefix_ifindex;
-	unsigned char	prefix_type;
-	unsigned char	prefix_len;
-	unsigned char	prefix_flags;
-	unsigned char	prefix_pad3;
-};
-
-enum 
-{
-	PREFIX_UNSPEC,
-	PREFIX_ADDRESS,
-	PREFIX_CACHEINFO,
-	__PREFIX_MAX
-};
-
-#define PREFIX_MAX	(__PREFIX_MAX - 1)
-
-struct prefix_cacheinfo {
-	__u32	preferred_time;
-	__u32	valid_time;
-};
-
-
-/*****************************************************************
- *		Traffic control messages.
- ****/
-
-struct tcmsg {
-	unsigned char	tcm_family;
-	unsigned char	tcm__pad1;
-	unsigned short	tcm__pad2;
-	int		tcm_ifindex;
-	__u32		tcm_handle;
-	__u32		tcm_parent;
-	__u32		tcm_info;
-};
-
-enum {
-	TCA_UNSPEC,
-	TCA_KIND,
-	TCA_OPTIONS,
-	TCA_STATS,
-	TCA_XSTATS,
-	TCA_RATE,
-	TCA_FCNT,
-	TCA_STATS2,
-	TCA_STAB,
-	__TCA_MAX
-};
-
-#define TCA_MAX (__TCA_MAX - 1)
-
-#define TCA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcmsg))))
-#define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))
-
-/********************************************************************
- *		Neighbor Discovery userland options
- ****/
-
-struct nduseroptmsg {
-	unsigned char	nduseropt_family;
-	unsigned char	nduseropt_pad1;
-	unsigned short	nduseropt_opts_len;	/* Total length of options */
-	int		nduseropt_ifindex;
-	__u8		nduseropt_icmp_type;
-	__u8		nduseropt_icmp_code;
-	unsigned short	nduseropt_pad2;
-	unsigned int	nduseropt_pad3;
-	/* Followed by one or more ND options */
-};
-
-enum {
-	NDUSEROPT_UNSPEC,
-	NDUSEROPT_SRCADDR,
-	__NDUSEROPT_MAX
-};
-
-#define NDUSEROPT_MAX	(__NDUSEROPT_MAX - 1)
-
-/* RTnetlink multicast groups - backwards compatibility for userspace */
-#define RTMGRP_LINK		1
-#define RTMGRP_NOTIFY		2
-#define RTMGRP_NEIGH		4
-#define RTMGRP_TC		8
-
-#define RTMGRP_IPV4_IFADDR	0x10
-#define RTMGRP_IPV4_MROUTE	0x20
-#define RTMGRP_IPV4_ROUTE	0x40
-#define RTMGRP_IPV4_RULE	0x80
-
-#define RTMGRP_IPV6_IFADDR	0x100
-#define RTMGRP_IPV6_MROUTE	0x200
-#define RTMGRP_IPV6_ROUTE	0x400
-#define RTMGRP_IPV6_IFINFO	0x800
-
-#define RTMGRP_DECnet_IFADDR    0x1000
-#define RTMGRP_DECnet_ROUTE     0x4000
-
-#define RTMGRP_IPV6_PREFIX	0x20000
-
-/* RTnetlink multicast groups */
-enum rtnetlink_groups {
-	RTNLGRP_NONE,
-#define RTNLGRP_NONE		RTNLGRP_NONE
-	RTNLGRP_LINK,
-#define RTNLGRP_LINK		RTNLGRP_LINK
-	RTNLGRP_NOTIFY,
-#define RTNLGRP_NOTIFY		RTNLGRP_NOTIFY
-	RTNLGRP_NEIGH,
-#define RTNLGRP_NEIGH		RTNLGRP_NEIGH
-	RTNLGRP_TC,
-#define RTNLGRP_TC		RTNLGRP_TC
-	RTNLGRP_IPV4_IFADDR,
-#define RTNLGRP_IPV4_IFADDR	RTNLGRP_IPV4_IFADDR
-	RTNLGRP_IPV4_MROUTE,
-#define	RTNLGRP_IPV4_MROUTE	RTNLGRP_IPV4_MROUTE
-	RTNLGRP_IPV4_ROUTE,
-#define RTNLGRP_IPV4_ROUTE	RTNLGRP_IPV4_ROUTE
-	RTNLGRP_IPV4_RULE,
-#define RTNLGRP_IPV4_RULE	RTNLGRP_IPV4_RULE
-	RTNLGRP_IPV6_IFADDR,
-#define RTNLGRP_IPV6_IFADDR	RTNLGRP_IPV6_IFADDR
-	RTNLGRP_IPV6_MROUTE,
-#define RTNLGRP_IPV6_MROUTE	RTNLGRP_IPV6_MROUTE
-	RTNLGRP_IPV6_ROUTE,
-#define RTNLGRP_IPV6_ROUTE	RTNLGRP_IPV6_ROUTE
-	RTNLGRP_IPV6_IFINFO,
-#define RTNLGRP_IPV6_IFINFO	RTNLGRP_IPV6_IFINFO
-	RTNLGRP_DECnet_IFADDR,
-#define RTNLGRP_DECnet_IFADDR	RTNLGRP_DECnet_IFADDR
-	RTNLGRP_NOP2,
-	RTNLGRP_DECnet_ROUTE,
-#define RTNLGRP_DECnet_ROUTE	RTNLGRP_DECnet_ROUTE
-	RTNLGRP_DECnet_RULE,
-#define RTNLGRP_DECnet_RULE	RTNLGRP_DECnet_RULE
-	RTNLGRP_NOP4,
-	RTNLGRP_IPV6_PREFIX,
-#define RTNLGRP_IPV6_PREFIX	RTNLGRP_IPV6_PREFIX
-	RTNLGRP_IPV6_RULE,
-#define RTNLGRP_IPV6_RULE	RTNLGRP_IPV6_RULE
-	RTNLGRP_ND_USEROPT,
-#define RTNLGRP_ND_USEROPT	RTNLGRP_ND_USEROPT
-	RTNLGRP_PHONET_IFADDR,
-#define RTNLGRP_PHONET_IFADDR	RTNLGRP_PHONET_IFADDR
-	RTNLGRP_PHONET_ROUTE,
-#define RTNLGRP_PHONET_ROUTE	RTNLGRP_PHONET_ROUTE
-	RTNLGRP_DCB,
-#define RTNLGRP_DCB		RTNLGRP_DCB
-	RTNLGRP_IPV4_NETCONF,
-#define RTNLGRP_IPV4_NETCONF	RTNLGRP_IPV4_NETCONF
-	RTNLGRP_IPV6_NETCONF,
-#define RTNLGRP_IPV6_NETCONF	RTNLGRP_IPV6_NETCONF
-	RTNLGRP_MDB,
-#define RTNLGRP_MDB		RTNLGRP_MDB
-	RTNLGRP_MPLS_ROUTE,
-#define RTNLGRP_MPLS_ROUTE	RTNLGRP_MPLS_ROUTE
-	RTNLGRP_NSID,
-#define RTNLGRP_NSID		RTNLGRP_NSID
-	__RTNLGRP_MAX
-};
-#define RTNLGRP_MAX	(__RTNLGRP_MAX - 1)
-
-/* TC action piece */
-struct tcamsg {
-	unsigned char	tca_family;
-	unsigned char	tca__pad1;
-	unsigned short	tca__pad2;
-};
-#define TA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcamsg))))
-#define TA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg))
-#define TCA_ACT_TAB 1 /* attr type must be >=1 */	
-#define TCAA_MAX 1
-
-/* New extended info filters for IFLA_EXT_MASK */
-#define RTEXT_FILTER_VF		(1 << 0)
-#define RTEXT_FILTER_BRVLAN	(1 << 1)
-#define RTEXT_FILTER_BRVLAN_COMPRESSED	(1 << 2)
-#define	RTEXT_FILTER_SKIP_STATS	(1 << 3)
-
-/* End of information exported to user level */
-
-
-
-#endif /* __LINUX_RTNETLINK_H */
diff --git a/openflow/usr/include/linux/scc.h b/openflow/usr/include/linux/scc.h
deleted file mode 100644
index 73c0cb2..0000000
--- a/openflow/usr/include/linux/scc.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* $Id: scc.h,v 1.29 1997/04/02 14:56:45 jreuter Exp jreuter $ */
-
-#ifndef _SCC_H
-#define _SCC_H
-
-
-/* selection of hardware types */
-
-#define PA0HZP		0x00	/* hardware type for PA0HZP SCC card and compatible */
-#define EAGLE		0x01    /* hardware type for EAGLE card */
-#define PC100		0x02	/* hardware type for PC100 card */
-#define PRIMUS		0x04	/* hardware type for PRIMUS-PC (DG9BL) card */
-#define DRSI		0x08	/* hardware type for DRSI PC*Packet card */
-#define BAYCOM		0x10	/* hardware type for BayCom (U)SCC */
-
-/* DEV ioctl() commands */
-
-enum SCC_ioctl_cmds {
-	SIOCSCCRESERVED = SIOCDEVPRIVATE,
-	SIOCSCCCFG,
-	SIOCSCCINI,
-	SIOCSCCCHANINI,
-	SIOCSCCSMEM,
-	SIOCSCCGKISS,
-	SIOCSCCSKISS,
-	SIOCSCCGSTAT,
-	SIOCSCCCAL
-};
-
-/* Device parameter control (from WAMPES) */
-
-enum L1_params {
-	PARAM_DATA,
-	PARAM_TXDELAY,
-	PARAM_PERSIST,
-	PARAM_SLOTTIME,
-	PARAM_TXTAIL,
-	PARAM_FULLDUP,
-	PARAM_SOFTDCD,		/* was: PARAM_HW */
-	PARAM_MUTE,		/* ??? */
-	PARAM_DTR,
-	PARAM_RTS,
-	PARAM_SPEED,
-	PARAM_ENDDELAY,		/* ??? */
-	PARAM_GROUP,
-	PARAM_IDLE,
-	PARAM_MIN,
-	PARAM_MAXKEY,
-	PARAM_WAIT,
-	PARAM_MAXDEFER,
-	PARAM_TX,
-	PARAM_HWEVENT = 31,
-	PARAM_RETURN = 255	/* reset kiss mode */
-};
-
-/* fulldup parameter */
-
-enum FULLDUP_modes {
-	KISS_DUPLEX_HALF,	/* normal CSMA operation */
-	KISS_DUPLEX_FULL,	/* fullduplex, key down trx after transmission */
-	KISS_DUPLEX_LINK,	/* fullduplex, key down trx after 'idletime' sec */
-	KISS_DUPLEX_OPTIMA	/* fullduplex, let the protocol layer control the hw */
-};
-
-/* misc. parameters */
-
-#define TIMER_OFF	65535U	/* to switch off timers */
-#define NO_SUCH_PARAM	65534U	/* param not implemented */
-
-/* HWEVENT parameter */
-
-enum HWEVENT_opts {
-	HWEV_DCD_ON,
-	HWEV_DCD_OFF,
-	HWEV_ALL_SENT
-};
-
-/* channel grouping */
-
-#define RXGROUP		0100	/* if set, only tx when all channels clear */
-#define TXGROUP		0200	/* if set, don't transmit simultaneously */
-
-/* Tx/Rx clock sources */
-
-enum CLOCK_sources {
-	CLK_DPLL,	/* normal halfduplex operation */
-	CLK_EXTERNAL,	/* external clocking (G3RUH/DF9IC modems) */
-	CLK_DIVIDER,	/* Rx = DPLL, Tx = divider (fullduplex with */
-			/* modems without clock regeneration */
-	CLK_BRG		/* experimental fullduplex mode with DPLL/BRG for */
-			/* MODEMs without clock recovery */
-};
-
-/* Tx state */
-
-enum TX_state {
-	TXS_IDLE,	/* Transmitter off, no data pending */
-	TXS_BUSY,	/* waiting for permission to send / tailtime */
-	TXS_ACTIVE,	/* Transmitter on, sending data */
-	TXS_NEWFRAME,	/* reset CRC and send (next) frame */
-	TXS_IDLE2,	/* Transmitter on, no data pending */
-	TXS_WAIT,	/* Waiting for Mintime to expire */
-	TXS_TIMEOUT	/* We had a transmission timeout */
-};
-
-typedef unsigned long io_port;	/* type definition for an 'io port address' */
-
-/* SCC statistical information */
-
-struct scc_stat {
-        long rxints;            /* Receiver interrupts */
-        long txints;            /* Transmitter interrupts */
-        long exints;            /* External/status interrupts */
-        long spints;            /* Special receiver interrupts */
-
-        long txframes;          /* Packets sent */
-        long rxframes;          /* Number of Frames Actually Received */
-        long rxerrs;            /* CRC Errors */
-        long txerrs;		/* KISS errors */
-        
-	unsigned int nospace;	/* "Out of buffers" */
-	unsigned int rx_over;	/* Receiver Overruns */
-	unsigned int tx_under;	/* Transmitter Underruns */
-
-	unsigned int tx_state;	/* Transmitter state */
-	int tx_queued;		/* tx frames enqueued */
-
-	unsigned int maxqueue;	/* allocated tx_buffers */
-	unsigned int bufsize;	/* used buffersize */
-};
-
-struct scc_modem {
-	long speed;		/* Line speed, bps */
-	char clocksrc;		/* 0 = DPLL, 1 = external, 2 = divider */
-	char nrz;		/* NRZ instead of NRZI */	
-};
-
-struct scc_kiss_cmd {
-	int  	 command;	/* one of the KISS-Commands defined above */
-	unsigned param;		/* KISS-Param */
-};
-
-struct scc_hw_config {
-	io_port data_a;		/* data port channel A */
-	io_port ctrl_a;		/* control port channel A */
-	io_port data_b;		/* data port channel B */
-	io_port ctrl_b;		/* control port channel B */
-	io_port vector_latch;	/* INTACK-Latch (#) */
-	io_port	special;	/* special function port */
-
-	int	irq;		/* irq */
-	long	clock;		/* clock */
-	char	option;		/* command for function port */
-
-	char brand;		/* hardware type */
-	char escc;		/* use ext. features of a 8580/85180/85280 */
-};
-
-/* (#) only one INTACK latch allowed. */
-
-
-struct scc_mem_config {
-	unsigned int dummy;
-	unsigned int bufsize;
-};
-
-struct scc_calibrate {
-	unsigned int time;
-	unsigned char pattern;
-};
-
-#endif /* _SCC_H */
diff --git a/openflow/usr/include/linux/sched.h b/openflow/usr/include/linux/sched.h
deleted file mode 100644
index 2d1e6e0..0000000
--- a/openflow/usr/include/linux/sched.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _LINUX_SCHED_H
-#define _LINUX_SCHED_H
-
-/*
- * cloning flags:
- */
-#define CSIGNAL		0x000000ff	/* signal mask to be sent at exit */
-#define CLONE_VM	0x00000100	/* set if VM shared between processes */
-#define CLONE_FS	0x00000200	/* set if fs info shared between processes */
-#define CLONE_FILES	0x00000400	/* set if open files shared between processes */
-#define CLONE_SIGHAND	0x00000800	/* set if signal handlers and blocked signals shared */
-#define CLONE_PTRACE	0x00002000	/* set if we want to let tracing continue on the child too */
-#define CLONE_VFORK	0x00004000	/* set if the parent wants the child to wake it up on mm_release */
-#define CLONE_PARENT	0x00008000	/* set if we want to have the same parent as the cloner */
-#define CLONE_THREAD	0x00010000	/* Same thread group? */
-#define CLONE_NEWNS	0x00020000	/* New mount namespace group */
-#define CLONE_SYSVSEM	0x00040000	/* share system V SEM_UNDO semantics */
-#define CLONE_SETTLS	0x00080000	/* create a new TLS for the child */
-#define CLONE_PARENT_SETTID	0x00100000	/* set the TID in the parent */
-#define CLONE_CHILD_CLEARTID	0x00200000	/* clear the TID in the child */
-#define CLONE_DETACHED		0x00400000	/* Unused, ignored */
-#define CLONE_UNTRACED		0x00800000	/* set if the tracing process can't force CLONE_PTRACE on this clone */
-#define CLONE_CHILD_SETTID	0x01000000	/* set the TID in the child */
-#define CLONE_NEWCGROUP		0x02000000	/* New cgroup namespace */
-#define CLONE_NEWUTS		0x04000000	/* New utsname namespace */
-#define CLONE_NEWIPC		0x08000000	/* New ipc namespace */
-#define CLONE_NEWUSER		0x10000000	/* New user namespace */
-#define CLONE_NEWPID		0x20000000	/* New pid namespace */
-#define CLONE_NEWNET		0x40000000	/* New network namespace */
-#define CLONE_IO		0x80000000	/* Clone io context */
-
-/*
- * Scheduling policies
- */
-#define SCHED_NORMAL		0
-#define SCHED_FIFO		1
-#define SCHED_RR		2
-#define SCHED_BATCH		3
-/* SCHED_ISO: reserved but not implemented yet */
-#define SCHED_IDLE		5
-#define SCHED_DEADLINE		6
-
-/* Can be ORed in to make sure the process is reverted back to SCHED_NORMAL on fork */
-#define SCHED_RESET_ON_FORK     0x40000000
-
-/*
- * For the sched_{set,get}attr() calls
- */
-#define SCHED_FLAG_RESET_ON_FORK	0x01
-
-#endif /* _LINUX_SCHED_H */
diff --git a/openflow/usr/include/linux/scif_ioctl.h b/openflow/usr/include/linux/scif_ioctl.h
deleted file mode 100644
index d904891..0000000
--- a/openflow/usr/include/linux/scif_ioctl.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Intel MIC Platform Software Stack (MPSS)
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2014 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * BSD LICENSE
- *
- * Copyright(c) 2014 Intel Corporation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in
- *   the documentation and/or other materials provided with the
- *   distribution.
- * * Neither the name of Intel Corporation nor the names of its
- *   contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Intel SCIF driver.
- *
- */
-/*
- * -----------------------------------------
- * SCIF IOCTL interface information
- * -----------------------------------------
- */
-#ifndef SCIF_IOCTL_H
-#define SCIF_IOCTL_H
-
-#include <linux/types.h>
-
-/**
- * struct scif_port_id - SCIF port information
- * @node:	node on which port resides
- * @port:	local port number
- */
-struct scif_port_id {
-	__u16 node;
-	__u16 port;
-};
-
-/**
- * struct scifioctl_connect - used for SCIF_CONNECT IOCTL
- * @self:	used to read back the assigned port_id
- * @peer:	destination node and port to connect to
- */
-struct scifioctl_connect {
-	struct scif_port_id	self;
-	struct scif_port_id	peer;
-};
-
-/**
- * struct scifioctl_accept - used for SCIF_ACCEPTREQ IOCTL
- * @flags:	flags
- * @peer:	global id of peer endpoint
- * @endpt:	new connected endpoint descriptor
- */
-struct scifioctl_accept {
-	__s32			flags;
-	struct scif_port_id	peer;
-	__u64			endpt;
-};
-
-/**
- * struct scifioctl_msg - used for SCIF_SEND/SCIF_RECV IOCTL
- * @msg:	message buffer address
- * @len:	message length
- * @flags:	flags
- * @out_len:	number of bytes sent/received
- */
-struct scifioctl_msg {
-	__u64	msg;
-	__s32	len;
-	__s32	flags;
-	__s32	out_len;
-};
-
-/**
- * struct scifioctl_reg - used for SCIF_REG IOCTL
- * @addr:	starting virtual address
- * @len:	length of range
- * @offset:	offset of window
- * @prot:	read/write protection
- * @flags:	flags
- * @out_offset:	offset returned
- */
-struct scifioctl_reg {
-	__u64		addr;
-	__u64		len;
-	__s64		offset;
-	__s32		prot;
-	__s32		flags;
-	__s64		out_offset;
-};
-
-/**
- * struct scifioctl_unreg - used for SCIF_UNREG IOCTL
- * @offset:	start of range to unregister
- * @len:	length of range to unregister
- */
-struct scifioctl_unreg {
-	__s64		offset;
-	__u64		len;
-};
-
-/**
- * struct scifioctl_copy - used for SCIF DMA copy IOCTLs
- *
- * @loffset:	offset in local registered address space to/from
- *		which to copy
- * @len:	length of range to copy
- * @roffset:	offset in remote registered address space to/from
- *		which to copy
- * @addr:	user virtual address to/from which to copy
- * @flags:	flags
- *
- * This structure is used for SCIF_READFROM, SCIF_WRITETO, SCIF_VREADFROM
- * and SCIF_VREADFROM IOCTL's.
- */
-struct scifioctl_copy {
-	__s64		loffset;
-	__u64		len;
-	__s64		roffset;
-	__u64		addr;
-	__s32		flags;
-};
-
-/**
- * struct scifioctl_fence_mark  - used for SCIF_FENCE_MARK IOCTL
- * @flags:	flags
- * @mark:	fence handle which is a pointer to a __s32
- */
-struct scifioctl_fence_mark {
-	__s32	flags;
-	__u64	mark;
-};
-
-/**
- * struct scifioctl_fence_signal - used for SCIF_FENCE_SIGNAL IOCTL
- * @loff:	local offset
- * @lval:	value to write to loffset
- * @roff:	remote offset
- * @rval:	value to write to roffset
- * @flags:	flags
- */
-struct scifioctl_fence_signal {
-	__s64		loff;
-	__u64		lval;
-	__s64		roff;
-	__u64		rval;
-	__s32		flags;
-};
-
-/**
- * struct scifioctl_node_ids - used for SCIF_GET_NODEIDS IOCTL
- * @nodes:	pointer to an array of node_ids
- * @self:	ID of the current node
- * @len:	length of array
- */
-struct scifioctl_node_ids {
-	__u64	nodes;
-	__u64	self;
-	__s32	len;
-};
-
-#define SCIF_BIND		_IOWR('s', 1, __u64)
-#define SCIF_LISTEN		_IOW('s', 2, __s32)
-#define SCIF_CONNECT		_IOWR('s', 3, struct scifioctl_connect)
-#define SCIF_ACCEPTREQ		_IOWR('s', 4, struct scifioctl_accept)
-#define SCIF_ACCEPTREG		_IOWR('s', 5, __u64)
-#define SCIF_SEND		_IOWR('s', 6, struct scifioctl_msg)
-#define SCIF_RECV		_IOWR('s', 7, struct scifioctl_msg)
-#define SCIF_REG		_IOWR('s', 8, struct scifioctl_reg)
-#define SCIF_UNREG		_IOWR('s', 9, struct scifioctl_unreg)
-#define SCIF_READFROM		_IOWR('s', 10, struct scifioctl_copy)
-#define SCIF_WRITETO		_IOWR('s', 11, struct scifioctl_copy)
-#define SCIF_VREADFROM		_IOWR('s', 12, struct scifioctl_copy)
-#define SCIF_VWRITETO		_IOWR('s', 13, struct scifioctl_copy)
-#define SCIF_GET_NODEIDS	_IOWR('s', 14, struct scifioctl_node_ids)
-#define SCIF_FENCE_MARK		_IOWR('s', 15, struct scifioctl_fence_mark)
-#define SCIF_FENCE_WAIT		_IOWR('s', 16, __s32)
-#define SCIF_FENCE_SIGNAL	_IOWR('s', 17, struct scifioctl_fence_signal)
-
-#endif /* SCIF_IOCTL_H */
diff --git a/openflow/usr/include/linux/screen_info.h b/openflow/usr/include/linux/screen_info.h
deleted file mode 100644
index 5dc1a0a..0000000
--- a/openflow/usr/include/linux/screen_info.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef _SCREEN_INFO_H
-#define _SCREEN_INFO_H
-
-#include <linux/types.h>
-
-/*
- * These are set up by the setup-routine at boot-time:
- */
-
-struct screen_info {
-	__u8  orig_x;		/* 0x00 */
-	__u8  orig_y;		/* 0x01 */
-	__u16 ext_mem_k;	/* 0x02 */
-	__u16 orig_video_page;	/* 0x04 */
-	__u8  orig_video_mode;	/* 0x06 */
-	__u8  orig_video_cols;	/* 0x07 */
-	__u8  flags;		/* 0x08 */
-	__u8  unused2;		/* 0x09 */
-	__u16 orig_video_ega_bx;/* 0x0a */
-	__u16 unused3;		/* 0x0c */
-	__u8  orig_video_lines;	/* 0x0e */
-	__u8  orig_video_isVGA;	/* 0x0f */
-	__u16 orig_video_points;/* 0x10 */
-
-	/* VESA graphic mode -- linear frame buffer */
-	__u16 lfb_width;	/* 0x12 */
-	__u16 lfb_height;	/* 0x14 */
-	__u16 lfb_depth;	/* 0x16 */
-	__u32 lfb_base;		/* 0x18 */
-	__u32 lfb_size;		/* 0x1c */
-	__u16 cl_magic, cl_offset; /* 0x20 */
-	__u16 lfb_linelength;	/* 0x24 */
-	__u8  red_size;		/* 0x26 */
-	__u8  red_pos;		/* 0x27 */
-	__u8  green_size;	/* 0x28 */
-	__u8  green_pos;	/* 0x29 */
-	__u8  blue_size;	/* 0x2a */
-	__u8  blue_pos;		/* 0x2b */
-	__u8  rsvd_size;	/* 0x2c */
-	__u8  rsvd_pos;		/* 0x2d */
-	__u16 vesapm_seg;	/* 0x2e */
-	__u16 vesapm_off;	/* 0x30 */
-	__u16 pages;		/* 0x32 */
-	__u16 vesa_attributes;	/* 0x34 */
-	__u32 capabilities;     /* 0x36 */
-	__u32 ext_lfb_base;	/* 0x3a */
-	__u8  _reserved[2];	/* 0x3e */
-} __attribute__((packed));
-
-#define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-#define VIDEO_TYPE_CGA		0x11	/* CGA Display 			*/
-#define VIDEO_TYPE_EGAM		0x20	/* EGA/VGA in Monochrome Mode	*/
-#define VIDEO_TYPE_EGAC		0x21	/* EGA in Color Mode		*/
-#define VIDEO_TYPE_VGAC		0x22	/* VGA+ in Color Mode		*/
-#define VIDEO_TYPE_VLFB		0x23	/* VESA VGA in graphic mode	*/
-
-#define VIDEO_TYPE_PICA_S3	0x30	/* ACER PICA-61 local S3 video	*/
-#define VIDEO_TYPE_MIPS_G364	0x31    /* MIPS Magnum 4000 G364 video  */
-#define VIDEO_TYPE_SGI          0x33    /* Various SGI graphics hardware */
-
-#define VIDEO_TYPE_TGAC		0x40	/* DEC TGA */
-
-#define VIDEO_TYPE_SUN          0x50    /* Sun frame buffer. */
-#define VIDEO_TYPE_SUNPCI       0x51    /* Sun PCI based frame buffer. */
-
-#define VIDEO_TYPE_PMAC		0x60	/* PowerMacintosh frame buffer. */
-
-#define VIDEO_TYPE_EFI		0x70	/* EFI graphic mode		*/
-
-#define VIDEO_FLAGS_NOCURSOR	(1 << 0) /* The video mode has no cursor set */
-
-#define VIDEO_CAPABILITY_SKIP_QUIRKS	(1 << 0)
-#define VIDEO_CAPABILITY_64BIT_BASE	(1 << 1)	/* Frame buffer base is 64-bit */
-
-#endif /* _SCREEN_INFO_H */
diff --git a/openflow/usr/include/linux/sctp.h b/openflow/usr/include/linux/sctp.h
deleted file mode 100644
index b9bcc0e..0000000
--- a/openflow/usr/include/linux/sctp.h
+++ /dev/null
@@ -1,899 +0,0 @@
-/* SCTP kernel implementation
- * (C) Copyright IBM Corp. 2001, 2004
- * Copyright (c) 1999-2000 Cisco, Inc.
- * Copyright (c) 1999-2001 Motorola, Inc.
- * Copyright (c) 2002 Intel Corp.
- *
- * This file is part of the SCTP kernel implementation
- *
- * This header represents the structures and constants needed to support
- * the SCTP Extension to the Sockets API.
- *
- * This SCTP implementation is free software;
- * you can redistribute it and/or modify it under the terms of
- * the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This SCTP implementation is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied
- *                 ************************
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU CC; see the file COPYING.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Please send any bug reports or fixes you make to the
- * email address(es):
- *    lksctp developers <linux-sctp@vger.kernel.org>
- *
- * Or submit a bug report through the following website:
- *    http://www.sf.net/projects/lksctp
- *
- * Written or modified by:
- *    La Monte H.P. Yarroll    <piggy@acm.org>
- *    R. Stewart               <randall@sctp.chicago.il.us>
- *    K. Morneau               <kmorneau@cisco.com>
- *    Q. Xie                   <qxie1@email.mot.com>
- *    Karl Knutson             <karl@athena.chicago.il.us>
- *    Jon Grimm                <jgrimm@us.ibm.com>
- *    Daisy Chang              <daisyc@us.ibm.com>
- *    Ryan Layer               <rmlayer@us.ibm.com>
- *    Ardelle Fan              <ardelle.fan@intel.com>
- *    Sridhar Samudrala        <sri@us.ibm.com>
- *    Inaky Perez-Gonzalez     <inaky.gonzalez@intel.com>
- *    Vlad Yasevich            <vladislav.yasevich@hp.com>
- *
- * Any bugs reported given to us we will try to fix... any fixes shared will
- * be incorporated into the next SCTP release.
- */
-
-#ifndef _SCTP_H
-#define _SCTP_H
-
-#include <linux/types.h>
-#include <linux/socket.h>
-
-typedef __s32 sctp_assoc_t;
-
-/* The following symbols come from the Sockets API Extensions for
- * SCTP <draft-ietf-tsvwg-sctpsocket-07.txt>.
- */
-#define SCTP_RTOINFO	0
-#define SCTP_ASSOCINFO  1
-#define SCTP_INITMSG	2
-#define SCTP_NODELAY	3		/* Get/set nodelay option. */
-#define SCTP_AUTOCLOSE	4
-#define SCTP_SET_PEER_PRIMARY_ADDR 5
-#define SCTP_PRIMARY_ADDR	6
-#define SCTP_ADAPTATION_LAYER	7
-#define SCTP_DISABLE_FRAGMENTS	8
-#define SCTP_PEER_ADDR_PARAMS	9
-#define SCTP_DEFAULT_SEND_PARAM	10
-#define SCTP_EVENTS	11
-#define SCTP_I_WANT_MAPPED_V4_ADDR 12	/* Turn on/off mapped v4 addresses  */
-#define SCTP_MAXSEG	13		/* Get/set maximum fragment. */
-#define SCTP_STATUS	14
-#define SCTP_GET_PEER_ADDR_INFO	15
-#define SCTP_DELAYED_ACK_TIME	16
-#define SCTP_DELAYED_ACK SCTP_DELAYED_ACK_TIME
-#define SCTP_DELAYED_SACK SCTP_DELAYED_ACK_TIME
-#define SCTP_CONTEXT	17
-#define SCTP_FRAGMENT_INTERLEAVE	18
-#define SCTP_PARTIAL_DELIVERY_POINT	19 /* Set/Get partial delivery point */
-#define SCTP_MAX_BURST	20		/* Set/Get max burst */
-#define SCTP_AUTH_CHUNK	21	/* Set only: add a chunk type to authenticate */
-#define SCTP_HMAC_IDENT	22
-#define SCTP_AUTH_KEY	23
-#define SCTP_AUTH_ACTIVE_KEY	24
-#define SCTP_AUTH_DELETE_KEY	25
-#define SCTP_PEER_AUTH_CHUNKS	26	/* Read only */
-#define SCTP_LOCAL_AUTH_CHUNKS	27	/* Read only */
-#define SCTP_GET_ASSOC_NUMBER	28	/* Read only */
-#define SCTP_GET_ASSOC_ID_LIST	29	/* Read only */
-#define SCTP_AUTO_ASCONF       30
-#define SCTP_PEER_ADDR_THLDS	31
-#define SCTP_RECVRCVINFO	32
-#define SCTP_RECVNXTINFO	33
-#define SCTP_DEFAULT_SNDINFO	34
-
-/* Internal Socket Options. Some of the sctp library functions are
- * implemented using these socket options.
- */
-#define SCTP_SOCKOPT_BINDX_ADD	100	/* BINDX requests for adding addrs */
-#define SCTP_SOCKOPT_BINDX_REM	101	/* BINDX requests for removing addrs. */
-#define SCTP_SOCKOPT_PEELOFF	102	/* peel off association. */
-/* Options 104-106 are deprecated and removed. Do not use this space */
-#define SCTP_SOCKOPT_CONNECTX_OLD	107	/* CONNECTX old requests. */
-#define SCTP_GET_PEER_ADDRS	108		/* Get all peer address. */
-#define SCTP_GET_LOCAL_ADDRS	109		/* Get all local address. */
-#define SCTP_SOCKOPT_CONNECTX	110		/* CONNECTX requests. */
-#define SCTP_SOCKOPT_CONNECTX3	111	/* CONNECTX requests (updated) */
-#define SCTP_GET_ASSOC_STATS	112	/* Read only */
-
-/* These are bit fields for msghdr->msg_flags.  See section 5.1.  */
-/* On user space Linux, these live in <bits/socket.h> as an enum.  */
-enum sctp_msg_flags {
-	MSG_NOTIFICATION = 0x8000,
-#define MSG_NOTIFICATION MSG_NOTIFICATION
-};
-
-/* 5.3.1 SCTP Initiation Structure (SCTP_INIT)
- *
- *   This cmsghdr structure provides information for initializing new
- *   SCTP associations with sendmsg().  The SCTP_INITMSG socket option
- *   uses this same data structure.  This structure is not used for
- *   recvmsg().
- *
- *   cmsg_level    cmsg_type      cmsg_data[]
- *   ------------  ------------   ----------------------
- *   IPPROTO_SCTP  SCTP_INIT      struct sctp_initmsg
- */
-struct sctp_initmsg {
-	__u16 sinit_num_ostreams;
-	__u16 sinit_max_instreams;
-	__u16 sinit_max_attempts;
-	__u16 sinit_max_init_timeo;
-};
-
-/* 5.3.2 SCTP Header Information Structure (SCTP_SNDRCV)
- *
- *   This cmsghdr structure specifies SCTP options for sendmsg() and
- *   describes SCTP header information about a received message through
- *   recvmsg().
- *
- *   cmsg_level    cmsg_type      cmsg_data[]
- *   ------------  ------------   ----------------------
- *   IPPROTO_SCTP  SCTP_SNDRCV    struct sctp_sndrcvinfo
- */
-struct sctp_sndrcvinfo {
-	__u16 sinfo_stream;
-	__u16 sinfo_ssn;
-	__u16 sinfo_flags;
-	__u32 sinfo_ppid;
-	__u32 sinfo_context;
-	__u32 sinfo_timetolive;
-	__u32 sinfo_tsn;
-	__u32 sinfo_cumtsn;
-	sctp_assoc_t sinfo_assoc_id;
-};
-
-/* 5.3.4 SCTP Send Information Structure (SCTP_SNDINFO)
- *
- *   This cmsghdr structure specifies SCTP options for sendmsg().
- *
- *   cmsg_level    cmsg_type      cmsg_data[]
- *   ------------  ------------   -------------------
- *   IPPROTO_SCTP  SCTP_SNDINFO   struct sctp_sndinfo
- */
-struct sctp_sndinfo {
-	__u16 snd_sid;
-	__u16 snd_flags;
-	__u32 snd_ppid;
-	__u32 snd_context;
-	sctp_assoc_t snd_assoc_id;
-};
-
-/* 5.3.5 SCTP Receive Information Structure (SCTP_RCVINFO)
- *
- *   This cmsghdr structure describes SCTP receive information
- *   about a received message through recvmsg().
- *
- *   cmsg_level    cmsg_type      cmsg_data[]
- *   ------------  ------------   -------------------
- *   IPPROTO_SCTP  SCTP_RCVINFO   struct sctp_rcvinfo
- */
-struct sctp_rcvinfo {
-	__u16 rcv_sid;
-	__u16 rcv_ssn;
-	__u16 rcv_flags;
-	__u32 rcv_ppid;
-	__u32 rcv_tsn;
-	__u32 rcv_cumtsn;
-	__u32 rcv_context;
-	sctp_assoc_t rcv_assoc_id;
-};
-
-/* 5.3.6 SCTP Next Receive Information Structure (SCTP_NXTINFO)
- *
- *   This cmsghdr structure describes SCTP receive information
- *   of the next message that will be delivered through recvmsg()
- *   if this information is already available when delivering
- *   the current message.
- *
- *   cmsg_level    cmsg_type      cmsg_data[]
- *   ------------  ------------   -------------------
- *   IPPROTO_SCTP  SCTP_NXTINFO   struct sctp_nxtinfo
- */
-struct sctp_nxtinfo {
-	__u16 nxt_sid;
-	__u16 nxt_flags;
-	__u32 nxt_ppid;
-	__u32 nxt_length;
-	sctp_assoc_t nxt_assoc_id;
-};
-
-/*
- *  sinfo_flags: 16 bits (unsigned integer)
- *
- *   This field may contain any of the following flags and is composed of
- *   a bitwise OR of these values.
- */
-enum sctp_sinfo_flags {
-	SCTP_UNORDERED		= (1 << 0), /* Send/receive message unordered. */
-	SCTP_ADDR_OVER		= (1 << 1), /* Override the primary destination. */
-	SCTP_ABORT		= (1 << 2), /* Send an ABORT message to the peer. */
-	SCTP_SACK_IMMEDIATELY	= (1 << 3), /* SACK should be sent without delay. */
-	SCTP_NOTIFICATION	= MSG_NOTIFICATION, /* Next message is not user msg but notification. */
-	SCTP_EOF		= MSG_FIN,  /* Initiate graceful shutdown process. */
-};
-
-typedef union {
-	__u8   			raw;
-	struct sctp_initmsg	init;
-	struct sctp_sndrcvinfo	sndrcv;
-} sctp_cmsg_data_t;
-
-/* These are cmsg_types.  */
-typedef enum sctp_cmsg_type {
-	SCTP_INIT,		/* 5.2.1 SCTP Initiation Structure */
-#define SCTP_INIT	SCTP_INIT
-	SCTP_SNDRCV,		/* 5.2.2 SCTP Header Information Structure */
-#define SCTP_SNDRCV	SCTP_SNDRCV
-	SCTP_SNDINFO,		/* 5.3.4 SCTP Send Information Structure */
-#define SCTP_SNDINFO	SCTP_SNDINFO
-	SCTP_RCVINFO,		/* 5.3.5 SCTP Receive Information Structure */
-#define SCTP_RCVINFO	SCTP_RCVINFO
-	SCTP_NXTINFO,		/* 5.3.6 SCTP Next Receive Information Structure */
-#define SCTP_NXTINFO	SCTP_NXTINFO
-} sctp_cmsg_t;
-
-/*
- * 5.3.1.1 SCTP_ASSOC_CHANGE
- *
- *   Communication notifications inform the ULP that an SCTP association
- *   has either begun or ended. The identifier for a new association is
- *   provided by this notificaion. The notification information has the
- *   following format:
- *
- */
-struct sctp_assoc_change {
-	__u16 sac_type;
-	__u16 sac_flags;
-	__u32 sac_length;
-	__u16 sac_state;
-	__u16 sac_error;
-	__u16 sac_outbound_streams;
-	__u16 sac_inbound_streams;
-	sctp_assoc_t sac_assoc_id;
-	__u8 sac_info[0];
-};
-
-/*
- *   sac_state: 32 bits (signed integer)
- *
- *   This field holds one of a number of values that communicate the
- *   event that happened to the association.  They include:
- *
- *   Note:  The following state names deviate from the API draft as
- *   the names clash too easily with other kernel symbols.
- */
-enum sctp_sac_state {
-	SCTP_COMM_UP,
-	SCTP_COMM_LOST,
-	SCTP_RESTART,
-	SCTP_SHUTDOWN_COMP,
-	SCTP_CANT_STR_ASSOC,
-};
-
-/*
- * 5.3.1.2 SCTP_PEER_ADDR_CHANGE
- *
- *   When a destination address on a multi-homed peer encounters a change
- *   an interface details event is sent.  The information has the
- *   following structure:
- */
-struct sctp_paddr_change {
-	__u16 spc_type;
-	__u16 spc_flags;
-	__u32 spc_length;
-	struct sockaddr_storage spc_aaddr;
-	int spc_state;
-	int spc_error;
-	sctp_assoc_t spc_assoc_id;
-} __attribute__((packed, aligned(4)));
-
-/*
- *    spc_state:  32 bits (signed integer)
- *
- *   This field holds one of a number of values that communicate the
- *   event that happened to the address.  They include:
- */
-enum sctp_spc_state {
-	SCTP_ADDR_AVAILABLE,
-	SCTP_ADDR_UNREACHABLE,
-	SCTP_ADDR_REMOVED,
-	SCTP_ADDR_ADDED,
-	SCTP_ADDR_MADE_PRIM,
-	SCTP_ADDR_CONFIRMED,
-};
-
-
-/*
- * 5.3.1.3 SCTP_REMOTE_ERROR
- *
- *   A remote peer may send an Operational Error message to its peer.
- *   This message indicates a variety of error conditions on an
- *   association. The entire error TLV as it appears on the wire is
- *   included in a SCTP_REMOTE_ERROR event.  Please refer to the SCTP
- *   specification [SCTP] and any extensions for a list of possible
- *   error formats. SCTP error TLVs have the format:
- */
-struct sctp_remote_error {
-	__u16 sre_type;
-	__u16 sre_flags;
-	__u32 sre_length;
-	__u16 sre_error;
-	sctp_assoc_t sre_assoc_id;
-	__u8 sre_data[0];
-};
-
-
-/*
- * 5.3.1.4 SCTP_SEND_FAILED
- *
- *   If SCTP cannot deliver a message it may return the message as a
- *   notification.
- */
-struct sctp_send_failed {
-	__u16 ssf_type;
-	__u16 ssf_flags;
-	__u32 ssf_length;
-	__u32 ssf_error;
-	struct sctp_sndrcvinfo ssf_info;
-	sctp_assoc_t ssf_assoc_id;
-	__u8 ssf_data[0];
-};
-
-/*
- *   ssf_flags: 16 bits (unsigned integer)
- *
- *   The flag value will take one of the following values
- *
- *   SCTP_DATA_UNSENT  - Indicates that the data was never put on
- *                       the wire.
- *
- *   SCTP_DATA_SENT    - Indicates that the data was put on the wire.
- *                       Note that this does not necessarily mean that the
- *                       data was (or was not) successfully delivered.
- */
-enum sctp_ssf_flags {
-	SCTP_DATA_UNSENT,
-	SCTP_DATA_SENT,
-};
-
-/*
- * 5.3.1.5 SCTP_SHUTDOWN_EVENT
- *
- *   When a peer sends a SHUTDOWN, SCTP delivers this notification to
- *   inform the application that it should cease sending data.
- */
-struct sctp_shutdown_event {
-	__u16 sse_type;
-	__u16 sse_flags;
-	__u32 sse_length;
-	sctp_assoc_t sse_assoc_id;
-};
-
-/*
- * 5.3.1.6 SCTP_ADAPTATION_INDICATION
- *
- *   When a peer sends a Adaptation Layer Indication parameter , SCTP
- *   delivers this notification to inform the application
- *   that of the peers requested adaptation layer.
- */
-struct sctp_adaptation_event {
-	__u16 sai_type;
-	__u16 sai_flags;
-	__u32 sai_length;
-	__u32 sai_adaptation_ind;
-	sctp_assoc_t sai_assoc_id;
-};
-
-/*
- * 5.3.1.7 SCTP_PARTIAL_DELIVERY_EVENT
- *
- *   When a receiver is engaged in a partial delivery of a
- *   message this notification will be used to indicate
- *   various events.
- */
-struct sctp_pdapi_event {
-	__u16 pdapi_type;
-	__u16 pdapi_flags;
-	__u32 pdapi_length;
-	__u32 pdapi_indication;
-	sctp_assoc_t pdapi_assoc_id;
-};
-
-enum { SCTP_PARTIAL_DELIVERY_ABORTED=0, };
-
-/*
- * 5.3.1.8.  SCTP_AUTHENTICATION_EVENT
- *
- *  When a receiver is using authentication this message will provide
- *  notifications regarding new keys being made active as well as errors.
- */
-struct sctp_authkey_event {
-	__u16 auth_type;
-	__u16 auth_flags;
-	__u32 auth_length;
-	__u16 auth_keynumber;
-	__u16 auth_altkeynumber;
-	__u32 auth_indication;
-	sctp_assoc_t auth_assoc_id;
-};
-
-enum { SCTP_AUTH_NEWKEY = 0, };
-
-/*
- * 6.1.9. SCTP_SENDER_DRY_EVENT
- *
- * When the SCTP stack has no more user data to send or retransmit, this
- * notification is given to the user. Also, at the time when a user app
- * subscribes to this event, if there is no data to be sent or
- * retransmit, the stack will immediately send up this notification.
- */
-struct sctp_sender_dry_event {
-	__u16 sender_dry_type;
-	__u16 sender_dry_flags;
-	__u32 sender_dry_length;
-	sctp_assoc_t sender_dry_assoc_id;
-};
-
-/*
- * Described in Section 7.3
- *   Ancillary Data and Notification Interest Options
- */
-struct sctp_event_subscribe {
-	__u8 sctp_data_io_event;
-	__u8 sctp_association_event;
-	__u8 sctp_address_event;
-	__u8 sctp_send_failure_event;
-	__u8 sctp_peer_error_event;
-	__u8 sctp_shutdown_event;
-	__u8 sctp_partial_delivery_event;
-	__u8 sctp_adaptation_layer_event;
-	__u8 sctp_authentication_event;
-	__u8 sctp_sender_dry_event;
-};
-
-/*
- * 5.3.1 SCTP Notification Structure
- *
- *   The notification structure is defined as the union of all
- *   notification types.
- *
- */
-union sctp_notification {
-	struct {
-		__u16 sn_type;             /* Notification type. */
-		__u16 sn_flags;
-		__u32 sn_length;
-	} sn_header;
-	struct sctp_assoc_change sn_assoc_change;
-	struct sctp_paddr_change sn_paddr_change;
-	struct sctp_remote_error sn_remote_error;
-	struct sctp_send_failed sn_send_failed;
-	struct sctp_shutdown_event sn_shutdown_event;
-	struct sctp_adaptation_event sn_adaptation_event;
-	struct sctp_pdapi_event sn_pdapi_event;
-	struct sctp_authkey_event sn_authkey_event;
-	struct sctp_sender_dry_event sn_sender_dry_event;
-};
-
-/* Section 5.3.1
- * All standard values for sn_type flags are greater than 2^15.
- * Values from 2^15 and down are reserved.
- */
-
-enum sctp_sn_type {
-	SCTP_SN_TYPE_BASE     = (1<<15),
-	SCTP_ASSOC_CHANGE,
-#define SCTP_ASSOC_CHANGE		SCTP_ASSOC_CHANGE
-	SCTP_PEER_ADDR_CHANGE,
-#define SCTP_PEER_ADDR_CHANGE		SCTP_PEER_ADDR_CHANGE
-	SCTP_SEND_FAILED,
-#define SCTP_SEND_FAILED		SCTP_SEND_FAILED
-	SCTP_REMOTE_ERROR,
-#define SCTP_REMOTE_ERROR		SCTP_REMOTE_ERROR
-	SCTP_SHUTDOWN_EVENT,
-#define SCTP_SHUTDOWN_EVENT		SCTP_SHUTDOWN_EVENT
-	SCTP_PARTIAL_DELIVERY_EVENT,
-#define SCTP_PARTIAL_DELIVERY_EVENT	SCTP_PARTIAL_DELIVERY_EVENT
-	SCTP_ADAPTATION_INDICATION,
-#define SCTP_ADAPTATION_INDICATION	SCTP_ADAPTATION_INDICATION
-	SCTP_AUTHENTICATION_EVENT,
-#define SCTP_AUTHENTICATION_INDICATION	SCTP_AUTHENTICATION_EVENT
-	SCTP_SENDER_DRY_EVENT,
-#define SCTP_SENDER_DRY_EVENT		SCTP_SENDER_DRY_EVENT
-};
-
-/* Notification error codes used to fill up the error fields in some
- * notifications.
- * SCTP_PEER_ADDRESS_CHAGE 	: spc_error
- * SCTP_ASSOC_CHANGE		: sac_error
- * These names should be potentially included in the draft 04 of the SCTP
- * sockets API specification.
- */
-typedef enum sctp_sn_error {
-	SCTP_FAILED_THRESHOLD,
-	SCTP_RECEIVED_SACK,
-	SCTP_HEARTBEAT_SUCCESS,
-	SCTP_RESPONSE_TO_USER_REQ,
-	SCTP_INTERNAL_ERROR,
-	SCTP_SHUTDOWN_GUARD_EXPIRES,
-	SCTP_PEER_FAULTY,
-} sctp_sn_error_t;
-
-/*
- * 7.1.1 Retransmission Timeout Parameters (SCTP_RTOINFO)
- *
- *   The protocol parameters used to initialize and bound retransmission
- *   timeout (RTO) are tunable.  See [SCTP] for more information on how
- *   these parameters are used in RTO calculation.
- */
-struct sctp_rtoinfo {
-	sctp_assoc_t	srto_assoc_id;
-	__u32		srto_initial;
-	__u32		srto_max;
-	__u32		srto_min;
-};
-
-/*
- * 7.1.2 Association Parameters (SCTP_ASSOCINFO)
- *
- *   This option is used to both examine and set various association and
- *   endpoint parameters.
- */
-struct sctp_assocparams {
-	sctp_assoc_t	sasoc_assoc_id;
-	__u16		sasoc_asocmaxrxt;
-	__u16		sasoc_number_peer_destinations;
-	__u32		sasoc_peer_rwnd;
-	__u32		sasoc_local_rwnd;
-	__u32		sasoc_cookie_life;
-};
-
-/*
- * 7.1.9 Set Peer Primary Address (SCTP_SET_PEER_PRIMARY_ADDR)
- *
- *  Requests that the peer mark the enclosed address as the association
- *  primary. The enclosed address must be one of the association's
- *  locally bound addresses. The following structure is used to make a
- *   set primary request:
- */
-struct sctp_setpeerprim {
-	sctp_assoc_t            sspp_assoc_id;
-	struct sockaddr_storage sspp_addr;
-} __attribute__((packed, aligned(4)));
-
-/*
- * 7.1.10 Set Primary Address (SCTP_PRIMARY_ADDR)
- *
- *  Requests that the local SCTP stack use the enclosed peer address as
- *  the association primary. The enclosed address must be one of the
- *  association peer's addresses. The following structure is used to
- *  make a set peer primary request:
- */
-struct sctp_prim {
-	sctp_assoc_t            ssp_assoc_id;
-	struct sockaddr_storage ssp_addr;
-} __attribute__((packed, aligned(4)));
-
-/* For backward compatibility use, define the old name too */
-#define sctp_setprim	sctp_prim
-
-/*
- * 7.1.11 Set Adaptation Layer Indicator (SCTP_ADAPTATION_LAYER)
- *
- * Requests that the local endpoint set the specified Adaptation Layer
- * Indication parameter for all future INIT and INIT-ACK exchanges.
- */
-struct sctp_setadaptation {
-	__u32	ssb_adaptation_ind;
-};
-
-/*
- * 7.1.13 Peer Address Parameters  (SCTP_PEER_ADDR_PARAMS)
- *
- *   Applications can enable or disable heartbeats for any peer address
- *   of an association, modify an address's heartbeat interval, force a
- *   heartbeat to be sent immediately, and adjust the address's maximum
- *   number of retransmissions sent before an address is considered
- *   unreachable. The following structure is used to access and modify an
- *   address's parameters:
- */
-enum  sctp_spp_flags {
-	SPP_HB_ENABLE = 1<<0,		/*Enable heartbeats*/
-	SPP_HB_DISABLE = 1<<1,		/*Disable heartbeats*/
-	SPP_HB = SPP_HB_ENABLE | SPP_HB_DISABLE,
-	SPP_HB_DEMAND = 1<<2,		/*Send heartbeat immediately*/
-	SPP_PMTUD_ENABLE = 1<<3,	/*Enable PMTU discovery*/
-	SPP_PMTUD_DISABLE = 1<<4,	/*Disable PMTU discovery*/
-	SPP_PMTUD = SPP_PMTUD_ENABLE | SPP_PMTUD_DISABLE,
-	SPP_SACKDELAY_ENABLE = 1<<5,	/*Enable SACK*/
-	SPP_SACKDELAY_DISABLE = 1<<6,	/*Disable SACK*/
-	SPP_SACKDELAY = SPP_SACKDELAY_ENABLE | SPP_SACKDELAY_DISABLE,
-	SPP_HB_TIME_IS_ZERO = 1<<7,	/* Set HB delay to 0 */
-};
-
-struct sctp_paddrparams {
-	sctp_assoc_t		spp_assoc_id;
-	struct sockaddr_storage	spp_address;
-	__u32			spp_hbinterval;
-	__u16			spp_pathmaxrxt;
-	__u32			spp_pathmtu;
-	__u32			spp_sackdelay;
-	__u32			spp_flags;
-} __attribute__((packed, aligned(4)));
-
-/*
- * 7.1.18.  Add a chunk that must be authenticated (SCTP_AUTH_CHUNK)
- *
- * This set option adds a chunk type that the user is requesting to be
- * received only in an authenticated way.  Changes to the list of chunks
- * will only effect future associations on the socket.
- */
-struct sctp_authchunk {
-	__u8		sauth_chunk;
-};
-
-/*
- * 7.1.19.  Get or set the list of supported HMAC Identifiers (SCTP_HMAC_IDENT)
- *
- * This option gets or sets the list of HMAC algorithms that the local
- * endpoint requires the peer to use.
- */
-/* This here is only used by user space as is. It might not be a good idea
- * to export/reveal the whole structure with reserved fields etc.
- */
-enum {
-	SCTP_AUTH_HMAC_ID_SHA1 = 1,
-	SCTP_AUTH_HMAC_ID_SHA256 = 3,
-};
-
-struct sctp_hmacalgo {
-	__u32		shmac_num_idents;
-	__u16		shmac_idents[];
-};
-
-/* Sadly, user and kernel space have different names for
- * this structure member, so this is to not break anything.
- */
-#define shmac_number_of_idents	shmac_num_idents
-
-/*
- * 7.1.20.  Set a shared key (SCTP_AUTH_KEY)
- *
- * This option will set a shared secret key which is used to build an
- * association shared key.
- */
-struct sctp_authkey {
-	sctp_assoc_t	sca_assoc_id;
-	__u16		sca_keynumber;
-	__u16		sca_keylength;
-	__u8		sca_key[];
-};
-
-/*
- * 7.1.21.  Get or set the active shared key (SCTP_AUTH_ACTIVE_KEY)
- *
- * This option will get or set the active shared key to be used to build
- * the association shared key.
- */
-
-struct sctp_authkeyid {
-	sctp_assoc_t	scact_assoc_id;
-	__u16		scact_keynumber;
-};
-
-
-/*
- * 7.1.23.  Get or set delayed ack timer (SCTP_DELAYED_SACK)
- *
- * This option will effect the way delayed acks are performed.  This
- * option allows you to get or set the delayed ack time, in
- * milliseconds.  It also allows changing the delayed ack frequency.
- * Changing the frequency to 1 disables the delayed sack algorithm.  If
- * the assoc_id is 0, then this sets or gets the endpoints default
- * values.  If the assoc_id field is non-zero, then the set or get
- * effects the specified association for the one to many model (the
- * assoc_id field is ignored by the one to one model).  Note that if
- * sack_delay or sack_freq are 0 when setting this option, then the
- * current values will remain unchanged.
- */
-struct sctp_sack_info {
-	sctp_assoc_t	sack_assoc_id;
-	uint32_t	sack_delay;
-	uint32_t	sack_freq;
-};
-
-struct sctp_assoc_value {
-    sctp_assoc_t            assoc_id;
-    uint32_t                assoc_value;
-};
-
-/*
- * 7.2.2 Peer Address Information
- *
- *   Applications can retrieve information about a specific peer address
- *   of an association, including its reachability state, congestion
- *   window, and retransmission timer values.  This information is
- *   read-only. The following structure is used to access this
- *   information:
- */
-struct sctp_paddrinfo {
-	sctp_assoc_t		spinfo_assoc_id;
-	struct sockaddr_storage	spinfo_address;
-	__s32			spinfo_state;
-	__u32			spinfo_cwnd;
-	__u32			spinfo_srtt;
-	__u32			spinfo_rto;
-	__u32			spinfo_mtu;
-} __attribute__((packed, aligned(4)));
-
-/* Peer addresses's state. */
-/* UNKNOWN: Peer address passed by the upper layer in sendmsg or connect[x]
- * calls.
- * UNCONFIRMED: Peer address received in INIT/INIT-ACK address parameters.
- *              Not yet confirmed by a heartbeat and not available for data
- *		transfers.
- * ACTIVE : Peer address confirmed, active and available for data transfers.
- * INACTIVE: Peer address inactive and not available for data transfers.
- */
-enum sctp_spinfo_state {
-	SCTP_INACTIVE,
-	SCTP_PF,
-	SCTP_ACTIVE,
-	SCTP_UNCONFIRMED,
-	SCTP_UNKNOWN = 0xffff  /* Value used for transport state unknown */
-};
-
-/*
- * 7.2.1 Association Status (SCTP_STATUS)
- *
- *   Applications can retrieve current status information about an
- *   association, including association state, peer receiver window size,
- *   number of unacked data chunks, and number of data chunks pending
- *   receipt.  This information is read-only.  The following structure is
- *   used to access this information:
- */
-struct sctp_status {
-	sctp_assoc_t		sstat_assoc_id;
-	__s32			sstat_state;
-	__u32			sstat_rwnd;
-	__u16			sstat_unackdata;
-	__u16			sstat_penddata;
-	__u16			sstat_instrms;
-	__u16			sstat_outstrms;
-	__u32			sstat_fragmentation_point;
-	struct sctp_paddrinfo	sstat_primary;
-};
-
-/*
- * 7.2.3.  Get the list of chunks the peer requires to be authenticated
- *         (SCTP_PEER_AUTH_CHUNKS)
- *
- * This option gets a list of chunks for a specified association that
- * the peer requires to be received authenticated only.
- */
-struct sctp_authchunks {
-	sctp_assoc_t	gauth_assoc_id;
-	__u32		gauth_number_of_chunks;
-	uint8_t		gauth_chunks[];
-};
-
-/* The broken spelling has been released already in lksctp-tools header,
- * so don't break anyone, now that it's fixed.
- */
-#define guth_number_of_chunks	gauth_number_of_chunks
-
-/* Association states.  */
-enum sctp_sstat_state {
-	SCTP_EMPTY                = 0,
-	SCTP_CLOSED               = 1,
-	SCTP_COOKIE_WAIT          = 2,
-	SCTP_COOKIE_ECHOED        = 3,
-	SCTP_ESTABLISHED          = 4,
-	SCTP_SHUTDOWN_PENDING     = 5,
-	SCTP_SHUTDOWN_SENT        = 6,
-	SCTP_SHUTDOWN_RECEIVED    = 7,
-	SCTP_SHUTDOWN_ACK_SENT    = 8,
-};
-
-/*
- * 8.2.6. Get the Current Identifiers of Associations
- *        (SCTP_GET_ASSOC_ID_LIST)
- *
- * This option gets the current list of SCTP association identifiers of
- * the SCTP associations handled by a one-to-many style socket.
- */
-struct sctp_assoc_ids {
-	__u32		gaids_number_of_ids;
-	sctp_assoc_t	gaids_assoc_id[];
-};
-
-/*
- * 8.3, 8.5 get all peer/local addresses in an association.
- * This parameter struct is used by SCTP_GET_PEER_ADDRS and
- * SCTP_GET_LOCAL_ADDRS socket options used internally to implement
- * sctp_getpaddrs() and sctp_getladdrs() API.
- */
-struct sctp_getaddrs_old {
-	sctp_assoc_t            assoc_id;
-	int			addr_num;
-	struct sockaddr		*addrs;
-};
-
-struct sctp_getaddrs {
-	sctp_assoc_t		assoc_id; /*input*/
-	__u32			addr_num; /*output*/
-	__u8			addrs[0]; /*output, variable size*/
-};
-
-/* A socket user request obtained via SCTP_GET_ASSOC_STATS that retrieves
- * association stats. All stats are counts except sas_maxrto and
- * sas_obs_rto_ipaddr. maxrto is the max observed rto + transport since
- * the last call. Will return 0 when RTO was not update since last call
- */
-struct sctp_assoc_stats {
-	sctp_assoc_t	sas_assoc_id;    /* Input */
-					 /* Transport of observed max RTO */
-	struct sockaddr_storage sas_obs_rto_ipaddr;
-	__u64		sas_maxrto;      /* Maximum Observed RTO for period */
-	__u64		sas_isacks;	 /* SACKs received */
-	__u64		sas_osacks;	 /* SACKs sent */
-	__u64		sas_opackets;	 /* Packets sent */
-	__u64		sas_ipackets;	 /* Packets received */
-	__u64		sas_rtxchunks;   /* Retransmitted Chunks */
-	__u64		sas_outofseqtsns;/* TSN received > next expected */
-	__u64		sas_idupchunks;  /* Dups received (ordered+unordered) */
-	__u64		sas_gapcnt;      /* Gap Acknowledgements Received */
-	__u64		sas_ouodchunks;  /* Unordered data chunks sent */
-	__u64		sas_iuodchunks;  /* Unordered data chunks received */
-	__u64		sas_oodchunks;	 /* Ordered data chunks sent */
-	__u64		sas_iodchunks;	 /* Ordered data chunks received */
-	__u64		sas_octrlchunks; /* Control chunks sent */
-	__u64		sas_ictrlchunks; /* Control chunks received */
-};
-
-/*
- * 8.1 sctp_bindx()
- *
- * The flags parameter is formed from the bitwise OR of zero or more of the
- * following currently defined flags:
- */
-#define SCTP_BINDX_ADD_ADDR 0x01
-#define SCTP_BINDX_REM_ADDR 0x02
-
-/* This is the structure that is passed as an argument(optval) to
- * getsockopt(SCTP_SOCKOPT_PEELOFF).
- */
-typedef struct {
-	sctp_assoc_t associd;
-	int sd;
-} sctp_peeloff_arg_t;
-
-/*
- *  Peer Address Thresholds socket option
- */
-struct sctp_paddrthlds {
-	sctp_assoc_t spt_assoc_id;
-	struct sockaddr_storage spt_address;
-	__u16 spt_pathmaxrxt;
-	__u16 spt_pathpfthld;
-};
-
-#endif /* _SCTP_H */
diff --git a/openflow/usr/include/linux/sdla.h b/openflow/usr/include/linux/sdla.h
deleted file mode 100644
index 0760ba4..0000000
--- a/openflow/usr/include/linux/sdla.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Global definitions for the Frame relay interface.
- *
- * Version:	@(#)if_ifrad.h	0.20	13 Apr 96
- *
- * Author:	Mike McLagan <mike.mclagan@linux.org>
- *
- * Changes:
- *		0.15	Mike McLagan	Structure packing
- *
- *		0.20	Mike McLagan	New flags for S508 buffer handling
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-
-#ifndef SDLA_H
-#define SDLA_H
-
-/* adapter type */
-#define SDLA_TYPES
-#define SDLA_S502A			5020
-#define SDLA_S502E			5021
-#define SDLA_S503			5030
-#define SDLA_S507			5070
-#define SDLA_S508			5080
-#define SDLA_S509			5090
-#define SDLA_UNKNOWN			-1
-
-/* port selection flags for the S508 */
-#define SDLA_S508_PORT_V35		0x00
-#define SDLA_S508_PORT_RS232		0x02
-
-/* Z80 CPU speeds */
-#define SDLA_CPU_3M			0x00
-#define SDLA_CPU_5M			0x01
-#define SDLA_CPU_7M			0x02
-#define SDLA_CPU_8M			0x03
-#define SDLA_CPU_10M			0x04
-#define SDLA_CPU_16M			0x05
-#define SDLA_CPU_12M			0x06
-
-/* some private IOCTLs */
-#define SDLA_IDENTIFY			(FRAD_LAST_IOCTL + 1)
-#define SDLA_CPUSPEED			(FRAD_LAST_IOCTL + 2)
-#define SDLA_PROTOCOL			(FRAD_LAST_IOCTL + 3)
-
-#define SDLA_CLEARMEM			(FRAD_LAST_IOCTL + 4)
-#define SDLA_WRITEMEM			(FRAD_LAST_IOCTL + 5)
-#define SDLA_READMEM			(FRAD_LAST_IOCTL + 6)
-
-struct sdla_mem {
-   int  addr;
-   int  len;
-   void *data;
-};
-
-#define SDLA_START			(FRAD_LAST_IOCTL + 7)
-#define SDLA_STOP			(FRAD_LAST_IOCTL + 8)
-
-/* some offsets in the Z80's memory space */
-#define SDLA_NMIADDR			0x0000
-#define SDLA_CONF_ADDR			0x0010
-#define SDLA_S502A_NMIADDR		0x0066
-#define SDLA_CODE_BASEADDR		0x0100
-#define SDLA_WINDOW_SIZE		0x2000
-#define SDLA_ADDR_MASK			0x1FFF
-
-/* largest handleable block of data */
-#define SDLA_MAX_DATA			4080
-#define SDLA_MAX_MTU			4072	/* MAX_DATA - sizeof(fradhdr) */
-#define SDLA_MAX_DLCI			24
-
-/* this should be the same as frad_conf */
-struct sdla_conf {
-   short station;
-   short config;
-   short kbaud;
-   short clocking;
-   short max_frm;
-   short T391;
-   short T392;
-   short N391;
-   short N392;
-   short N393;
-   short CIR_fwd;
-   short Bc_fwd;
-   short Be_fwd;
-   short CIR_bwd;
-   short Bc_bwd;
-   short Be_bwd;
-};
-
-/* this should be the same as dlci_conf */
-struct sdla_dlci_conf {
-   short config;
-   short CIR_fwd;
-   short Bc_fwd;
-   short Be_fwd;
-   short CIR_bwd;
-   short Bc_bwd;
-   short Be_bwd; 
-   short Tc_fwd;
-   short Tc_bwd;
-   short Tf_max;
-   short Tb_max;
-};
-
-
-#endif /* SDLA_H */
diff --git a/openflow/usr/include/linux/seccomp.h b/openflow/usr/include/linux/seccomp.h
deleted file mode 100644
index 2f4c2e9..0000000
--- a/openflow/usr/include/linux/seccomp.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _LINUX_SECCOMP_H
-#define _LINUX_SECCOMP_H
-
-
-#include <linux/types.h>
-
-
-/* Valid values for seccomp.mode and prctl(PR_SET_SECCOMP, <mode>) */
-#define SECCOMP_MODE_DISABLED	0 /* seccomp is not in use. */
-#define SECCOMP_MODE_STRICT	1 /* uses hard-coded filter. */
-#define SECCOMP_MODE_FILTER	2 /* uses user-supplied filter. */
-
-/* Valid operations for seccomp syscall. */
-#define SECCOMP_SET_MODE_STRICT	0
-#define SECCOMP_SET_MODE_FILTER	1
-
-/* Valid flags for SECCOMP_SET_MODE_FILTER */
-#define SECCOMP_FILTER_FLAG_TSYNC	1
-
-/*
- * All BPF programs must return a 32-bit value.
- * The bottom 16-bits are for optional return data.
- * The upper 16-bits are ordered from least permissive values to most.
- *
- * The ordering ensures that a min_t() over composed return values always
- * selects the least permissive choice.
- */
-#define SECCOMP_RET_KILL	0x00000000U /* kill the task immediately */
-#define SECCOMP_RET_TRAP	0x00030000U /* disallow and force a SIGSYS */
-#define SECCOMP_RET_ERRNO	0x00050000U /* returns an errno */
-#define SECCOMP_RET_TRACE	0x7ff00000U /* pass to a tracer or disallow */
-#define SECCOMP_RET_ALLOW	0x7fff0000U /* allow */
-
-/* Masks for the return value sections. */
-#define SECCOMP_RET_ACTION	0x7fff0000U
-#define SECCOMP_RET_DATA	0x0000ffffU
-
-/**
- * struct seccomp_data - the format the BPF program executes over.
- * @nr: the system call number
- * @arch: indicates system call convention as an AUDIT_ARCH_* value
- *        as defined in <linux/audit.h>.
- * @instruction_pointer: at the time of the system call.
- * @args: up to 6 system call arguments always stored as 64-bit values
- *        regardless of the architecture.
- */
-struct seccomp_data {
-	int nr;
-	__u32 arch;
-	__u64 instruction_pointer;
-	__u64 args[6];
-};
-
-#endif /* _LINUX_SECCOMP_H */
diff --git a/openflow/usr/include/linux/securebits.h b/openflow/usr/include/linux/securebits.h
deleted file mode 100644
index 57a1811..0000000
--- a/openflow/usr/include/linux/securebits.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _LINUX_SECUREBITS_H
-#define _LINUX_SECUREBITS_H
-
-/* Each securesetting is implemented using two bits. One bit specifies
-   whether the setting is on or off. The other bit specify whether the
-   setting is locked or not. A setting which is locked cannot be
-   changed from user-level. */
-#define issecure_mask(X)	(1 << (X))
-
-#define SECUREBITS_DEFAULT 0x00000000
-
-/* When set UID 0 has no special privileges. When unset, we support
-   inheritance of root-permissions and suid-root executable under
-   compatibility mode. We raise the effective and inheritable bitmasks
-   *of the executable file* if the effective uid of the new process is
-   0. If the real uid is 0, we raise the effective (legacy) bit of the
-   executable file. */
-#define SECURE_NOROOT			0
-#define SECURE_NOROOT_LOCKED		1  /* make bit-0 immutable */
-
-#define SECBIT_NOROOT		(issecure_mask(SECURE_NOROOT))
-#define SECBIT_NOROOT_LOCKED	(issecure_mask(SECURE_NOROOT_LOCKED))
-
-/* When set, setuid to/from uid 0 does not trigger capability-"fixup".
-   When unset, to provide compatiblility with old programs relying on
-   set*uid to gain/lose privilege, transitions to/from uid 0 cause
-   capabilities to be gained/lost. */
-#define SECURE_NO_SETUID_FIXUP		2
-#define SECURE_NO_SETUID_FIXUP_LOCKED	3  /* make bit-2 immutable */
-
-#define SECBIT_NO_SETUID_FIXUP	(issecure_mask(SECURE_NO_SETUID_FIXUP))
-#define SECBIT_NO_SETUID_FIXUP_LOCKED \
-			(issecure_mask(SECURE_NO_SETUID_FIXUP_LOCKED))
-
-/* When set, a process can retain its capabilities even after
-   transitioning to a non-root user (the set-uid fixup suppressed by
-   bit 2). Bit-4 is cleared when a process calls exec(); setting both
-   bit 4 and 5 will create a barrier through exec that no exec()'d
-   child can use this feature again. */
-#define SECURE_KEEP_CAPS		4
-#define SECURE_KEEP_CAPS_LOCKED		5  /* make bit-4 immutable */
-
-#define SECBIT_KEEP_CAPS	(issecure_mask(SECURE_KEEP_CAPS))
-#define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED))
-
-/* When set, a process cannot add new capabilities to its ambient set. */
-#define SECURE_NO_CAP_AMBIENT_RAISE		6
-#define SECURE_NO_CAP_AMBIENT_RAISE_LOCKED	7  /* make bit-6 immutable */
-
-#define SECBIT_NO_CAP_AMBIENT_RAISE (issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE))
-#define SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED \
-			(issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE_LOCKED))
-
-#define SECURE_ALL_BITS		(issecure_mask(SECURE_NOROOT) | \
-				 issecure_mask(SECURE_NO_SETUID_FIXUP) | \
-				 issecure_mask(SECURE_KEEP_CAPS) | \
-				 issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE))
-#define SECURE_ALL_LOCKS	(SECURE_ALL_BITS << 1)
-
-#endif /* _LINUX_SECUREBITS_H */
diff --git a/openflow/usr/include/linux/selinux_netlink.h b/openflow/usr/include/linux/selinux_netlink.h
deleted file mode 100644
index 7a9bf6a..0000000
--- a/openflow/usr/include/linux/selinux_netlink.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Netlink event notifications for SELinux.
- *
- * Author: James Morris <jmorris@redhat.com>
- *
- * Copyright (C) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- */
-#ifndef _LINUX_SELINUX_NETLINK_H
-#define _LINUX_SELINUX_NETLINK_H
-
-#include <linux/types.h>
-
-/* Message types. */
-#define SELNL_MSG_BASE 0x10
-enum {
-	SELNL_MSG_SETENFORCE = SELNL_MSG_BASE,
-	SELNL_MSG_POLICYLOAD,
-	SELNL_MSG_MAX
-};
-
-/* Multicast groups - backwards compatiblility for userspace */
-#define SELNL_GRP_NONE		0x00000000
-#define SELNL_GRP_AVC		0x00000001	/* AVC notifications */
-#define SELNL_GRP_ALL		0xffffffff
-
-enum selinux_nlgroups {
-	SELNLGRP_NONE,
-#define SELNLGRP_NONE	SELNLGRP_NONE
-	SELNLGRP_AVC,
-#define SELNLGRP_AVC	SELNLGRP_AVC
-	__SELNLGRP_MAX
-};
-#define SELNLGRP_MAX	(__SELNLGRP_MAX - 1)
-
-/* Message structures */
-struct selnl_msg_setenforce {
-	__s32		val;
-};
-
-struct selnl_msg_policyload {
-	__u32	seqno;
-};
-
-#endif /* _LINUX_SELINUX_NETLINK_H */
diff --git a/openflow/usr/include/linux/sem.h b/openflow/usr/include/linux/sem.h
deleted file mode 100644
index b605950..0000000
--- a/openflow/usr/include/linux/sem.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef _LINUX_SEM_H
-#define _LINUX_SEM_H
-
-#include <linux/ipc.h>
-
-/* semop flags */
-#define SEM_UNDO        0x1000  /* undo the operation on exit */
-
-/* semctl Command Definitions. */
-#define GETPID  11       /* get sempid */
-#define GETVAL  12       /* get semval */
-#define GETALL  13       /* get all semval's */
-#define GETNCNT 14       /* get semncnt */
-#define GETZCNT 15       /* get semzcnt */
-#define SETVAL  16       /* set semval */
-#define SETALL  17       /* set all semval's */
-
-/* ipcs ctl cmds */
-#define SEM_STAT 18
-#define SEM_INFO 19
-
-/* Obsolete, used only for backwards compatibility and libc5 compiles */
-struct semid_ds {
-	struct ipc_perm	sem_perm;		/* permissions .. see ipc.h */
-	__kernel_time_t	sem_otime;		/* last semop time */
-	__kernel_time_t	sem_ctime;		/* last change time */
-	struct sem	*sem_base;		/* ptr to first semaphore in array */
-	struct sem_queue *sem_pending;		/* pending operations to be processed */
-	struct sem_queue **sem_pending_last;	/* last pending operation */
-	struct sem_undo	*undo;			/* undo requests on this array */
-	unsigned short	sem_nsems;		/* no. of semaphores in array */
-};
-
-/* Include the definition of semid64_ds */
-#include <asm/sembuf.h>
-
-/* semop system calls takes an array of these. */
-struct sembuf {
-	unsigned short  sem_num;	/* semaphore index in array */
-	short		sem_op;		/* semaphore operation */
-	short		sem_flg;	/* operation flags */
-};
-
-/* arg for semctl system calls. */
-union semun {
-	int val;			/* value for SETVAL */
-	struct semid_ds *buf;	/* buffer for IPC_STAT & IPC_SET */
-	unsigned short *array;	/* array for GETALL & SETALL */
-	struct seminfo *__buf;	/* buffer for IPC_INFO */
-	void *__pad;
-};
-
-struct  seminfo {
-	int semmap;
-	int semmni;
-	int semmns;
-	int semmnu;
-	int semmsl;
-	int semopm;
-	int semume;
-	int semusz;
-	int semvmx;
-	int semaem;
-};
-
-/*
- * SEMMNI, SEMMSL and SEMMNS are default values which can be
- * modified by sysctl.
- * The values has been chosen to be larger than necessary for any
- * known configuration.
- *
- * SEMOPM should not be increased beyond 1000, otherwise there is the
- * risk that semop()/semtimedop() fails due to kernel memory fragmentation when
- * allocating the sop array.
- */
-
-
-#define SEMMNI  32000           /* <= IPCMNI  max # of semaphore identifiers */
-#define SEMMSL  32000           /* <= INT_MAX max num of semaphores per id */
-#define SEMMNS  (SEMMNI*SEMMSL) /* <= INT_MAX max # of semaphores in system */
-#define SEMOPM  500	        /* <= 1 000 max num of ops per semop call */
-#define SEMVMX  32767           /* <= 32767 semaphore maximum value */
-#define SEMAEM  SEMVMX          /* adjust on exit max value */
-
-/* unused */
-#define SEMUME  SEMOPM          /* max num of undo entries per process */
-#define SEMMNU  SEMMNS          /* num of undo structures system wide */
-#define SEMMAP  SEMMNS          /* # of entries in semaphore map */
-#define SEMUSZ  20		/* sizeof struct sem_undo */
-
-
-#endif /* _LINUX_SEM_H */
diff --git a/openflow/usr/include/linux/serial.h b/openflow/usr/include/linux/serial.h
deleted file mode 100644
index 1e0531d..0000000
--- a/openflow/usr/include/linux/serial.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * include/linux/serial.h
- *
- * Copyright (C) 1992 by Theodore Ts'o.
- * 
- * Redistribution of this file is permitted under the terms of the GNU 
- * Public License (GPL)
- */
-
-#ifndef _LINUX_SERIAL_H
-#define _LINUX_SERIAL_H
-
-#include <linux/types.h>
-
-#include <linux/tty_flags.h>
-
-
-struct serial_struct {
-	int	type;
-	int	line;
-	unsigned int	port;
-	int	irq;
-	int	flags;
-	int	xmit_fifo_size;
-	int	custom_divisor;
-	int	baud_base;
-	unsigned short	close_delay;
-	char	io_type;
-	char	reserved_char[1];
-	int	hub6;
-	unsigned short	closing_wait; /* time to wait before closing */
-	unsigned short	closing_wait2; /* no longer used... */
-	unsigned char	*iomem_base;
-	unsigned short	iomem_reg_shift;
-	unsigned int	port_high;
-	unsigned long	iomap_base;	/* cookie passed into ioremap */
-};
-
-/*
- * For the close wait times, 0 means wait forever for serial port to
- * flush its output.  65535 means don't wait at all.
- */
-#define ASYNC_CLOSING_WAIT_INF	0
-#define ASYNC_CLOSING_WAIT_NONE	65535
-
-/*
- * These are the supported serial types.
- */
-#define PORT_UNKNOWN	0
-#define PORT_8250	1
-#define PORT_16450	2
-#define PORT_16550	3
-#define PORT_16550A	4
-#define PORT_CIRRUS     5	/* usurped by cyclades.c */
-#define PORT_16650	6
-#define PORT_16650V2	7
-#define PORT_16750	8
-#define PORT_STARTECH	9	/* usurped by cyclades.c */
-#define PORT_16C950	10	/* Oxford Semiconductor */
-#define PORT_16654	11
-#define PORT_16850	12
-#define PORT_RSA	13	/* RSA-DV II/S card */
-#define PORT_MAX	13
-
-#define SERIAL_IO_PORT	0
-#define SERIAL_IO_HUB6	1
-#define SERIAL_IO_MEM	2
-#define SERIAL_IO_MEM32	  3
-#define SERIAL_IO_AU	  4
-#define SERIAL_IO_TSI	  5
-#define SERIAL_IO_MEM32BE 6
-
-#define UART_CLEAR_FIFO		0x01
-#define UART_USE_FIFO		0x02
-#define UART_STARTECH		0x04
-#define UART_NATSEMI		0x08
-
-
-/*
- * Multiport serial configuration structure --- external structure
- */
-struct serial_multiport_struct {
-	int		irq;
-	int		port1;
-	unsigned char	mask1, match1;
-	int		port2;
-	unsigned char	mask2, match2;
-	int		port3;
-	unsigned char	mask3, match3;
-	int		port4;
-	unsigned char	mask4, match4;
-	int		port_monitor;
-	int	reserved[32];
-};
-
-/*
- * Serial input interrupt line counters -- external structure
- * Four lines can interrupt: CTS, DSR, RI, DCD
- */
-struct serial_icounter_struct {
-	int cts, dsr, rng, dcd;
-	int rx, tx;
-	int frame, overrun, parity, brk;
-	int buf_overrun;
-	int reserved[9];
-};
-
-/*
- * Serial interface for controlling RS485 settings on chips with suitable
- * support. Set with TIOCSRS485 and get with TIOCGRS485 if supported by your
- * platform. The set function returns the new state, with any unsupported bits
- * reverted appropriately.
- */
-
-struct serial_rs485 {
-	__u32	flags;			/* RS485 feature flags */
-#define SER_RS485_ENABLED		(1 << 0)	/* If enabled */
-#define SER_RS485_RTS_ON_SEND		(1 << 1)	/* Logical level for
-							   RTS pin when
-							   sending */
-#define SER_RS485_RTS_AFTER_SEND	(1 << 2)	/* Logical level for
-							   RTS pin after sent*/
-#define SER_RS485_RX_DURING_TX		(1 << 4)
-	__u32	delay_rts_before_send;	/* Delay before send (milliseconds) */
-	__u32	delay_rts_after_send;	/* Delay after send (milliseconds) */
-	__u32	padding[5];		/* Memory is cheap, new structs
-					   are a royal PITA .. */
-};
-
-#endif /* _LINUX_SERIAL_H */
diff --git a/openflow/usr/include/linux/serial_core.h b/openflow/usr/include/linux/serial_core.h
deleted file mode 100644
index dd0f071..0000000
--- a/openflow/usr/include/linux/serial_core.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- *  linux/drivers/char/serial_core.h
- *
- *  Copyright (C) 2000 Deep Blue Solutions Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef LINUX_SERIAL_CORE_H
-#define LINUX_SERIAL_CORE_H
-
-#include <linux/serial.h>
-
-/*
- * The type definitions.  These are from Ted Ts'o's serial.h
- */
-#define PORT_UNKNOWN	0
-#define PORT_8250	1
-#define PORT_16450	2
-#define PORT_16550	3
-#define PORT_16550A	4
-#define PORT_CIRRUS	5
-#define PORT_16650	6
-#define PORT_16650V2	7
-#define PORT_16750	8
-#define PORT_STARTECH	9
-#define PORT_16C950	10
-#define PORT_16654	11
-#define PORT_16850	12
-#define PORT_RSA	13
-#define PORT_NS16550A	14
-#define PORT_XSCALE	15
-#define PORT_RM9000	16	/* PMC-Sierra RM9xxx internal UART */
-#define PORT_OCTEON	17	/* Cavium OCTEON internal UART */
-#define PORT_AR7	18	/* Texas Instruments AR7 internal UART */
-#define PORT_U6_16550A	19	/* ST-Ericsson U6xxx internal UART */
-#define PORT_TEGRA	20	/* NVIDIA Tegra internal UART */
-#define PORT_XR17D15X	21	/* Exar XR17D15x UART */
-#define PORT_LPC3220	22	/* NXP LPC32xx SoC "Standard" UART */
-#define PORT_8250_CIR	23	/* CIR infrared port, has its own driver */
-#define PORT_XR17V35X	24	/* Exar XR17V35x UARTs */
-#define PORT_BRCM_TRUMANAGE	25
-#define PORT_ALTR_16550_F32 26	/* Altera 16550 UART with 32 FIFOs */
-#define PORT_ALTR_16550_F64 27	/* Altera 16550 UART with 64 FIFOs */
-#define PORT_ALTR_16550_F128 28 /* Altera 16550 UART with 128 FIFOs */
-#define PORT_RT2880	29	/* Ralink RT2880 internal UART */
-#define PORT_16550A_FSL64 30	/* Freescale 16550 UART with 64 FIFOs */
-#define PORT_MAX_8250	30	/* max port ID */
-
-/*
- * ARM specific type numbers.  These are not currently guaranteed
- * to be implemented, and will change in the future.  These are
- * separate so any additions to the old serial.c that occur before
- * we are merged can be easily merged here.
- */
-#define PORT_PXA	31
-#define PORT_AMBA	32
-#define PORT_CLPS711X	33
-#define PORT_SA1100	34
-#define PORT_UART00	35
-#define PORT_21285	37
-
-/* Sparc type numbers.  */
-#define PORT_SUNZILOG	38
-#define PORT_SUNSAB	39
-
-/* DEC */
-#define PORT_DZ		46
-#define PORT_ZS		47
-
-/* Parisc type numbers. */
-#define PORT_MUX	48
-
-/* Atmel AT91 / AT32 SoC */
-#define PORT_ATMEL	49
-
-/* Macintosh Zilog type numbers */
-#define PORT_MAC_ZILOG	50	/* m68k : not yet implemented */
-#define PORT_PMAC_ZILOG	51
-
-/* SH-SCI */
-#define PORT_SCI	52
-#define PORT_SCIF	53
-#define PORT_IRDA	54
-
-/* Samsung S3C2410 SoC and derivatives thereof */
-#define PORT_S3C2410    55
-
-/* SGI IP22 aka Indy / Challenge S / Indigo 2 */
-#define PORT_IP22ZILOG	56
-
-/* Sharp LH7a40x -- an ARM9 SoC series */
-#define PORT_LH7A40X	57
-
-/* PPC CPM type number */
-#define PORT_CPM        58
-
-/* MPC52xx (and MPC512x) type numbers */
-#define PORT_MPC52xx	59
-
-/* IBM icom */
-#define PORT_ICOM	60
-
-/* Samsung S3C2440 SoC */
-#define PORT_S3C2440	61
-
-/* Motorola i.MX SoC */
-#define PORT_IMX	62
-
-/* Marvell MPSC */
-#define PORT_MPSC	63
-
-/* TXX9 type number */
-#define PORT_TXX9	64
-
-/* NEC VR4100 series SIU/DSIU */
-#define PORT_VR41XX_SIU		65
-#define PORT_VR41XX_DSIU	66
-
-/* Samsung S3C2400 SoC */
-#define PORT_S3C2400	67
-
-/* M32R SIO */
-#define PORT_M32R_SIO	68
-
-/*Digi jsm */
-#define PORT_JSM        69
-
-#define PORT_PNX8XXX	70
-
-/* Hilscher netx */
-#define PORT_NETX	71
-
-/* SUN4V Hypervisor Console */
-#define PORT_SUNHV	72
-
-#define PORT_S3C2412	73
-
-/* Xilinx uartlite */
-#define PORT_UARTLITE	74
-
-/* Blackfin bf5xx */
-#define PORT_BFIN	75
-
-/* Micrel KS8695 */
-#define PORT_KS8695	76
-
-/* Broadcom SB1250, etc. SOC */
-#define PORT_SB1250_DUART	77
-
-/* Freescale ColdFire */
-#define PORT_MCF	78
-
-/* Blackfin SPORT */
-#define PORT_BFIN_SPORT		79
-
-/* MN10300 on-chip UART numbers */
-#define PORT_MN10300		80
-#define PORT_MN10300_CTS	81
-
-#define PORT_SC26XX	82
-
-/* SH-SCI */
-#define PORT_SCIFA	83
-
-#define PORT_S3C6400	84
-
-/* NWPSERIAL */
-#define PORT_NWPSERIAL	85
-
-/* MAX3100 */
-#define PORT_MAX3100    86
-
-/* Timberdale UART */
-#define PORT_TIMBUART	87
-
-/* Qualcomm MSM SoCs */
-#define PORT_MSM	88
-
-/* BCM63xx family SoCs */
-#define PORT_BCM63XX	89
-
-/* Aeroflex Gaisler GRLIB APBUART */
-#define PORT_APBUART    90
-
-/* Altera UARTs */
-#define PORT_ALTERA_JTAGUART	91
-#define PORT_ALTERA_UART	92
-
-/* SH-SCI */
-#define PORT_SCIFB	93
-
-/* MAX310X */
-#define PORT_MAX310X	94
-
-/* High Speed UART for Medfield */
-#define PORT_MFD	95
-
-/* TI OMAP-UART */
-#define PORT_OMAP	96
-
-/* VIA VT8500 SoC */
-#define PORT_VT8500	97
-
-/* Cadence (Xilinx Zynq) UART */
-#define PORT_XUARTPS	98
-
-/* Atheros AR933X SoC */
-#define PORT_AR933X	99
-
-/* Energy Micro efm32 SoC */
-#define PORT_EFMUART   100
-
-/* ARC (Synopsys) on-chip UART */
-#define PORT_ARC       101
-
-/* Rocketport EXPRESS/INFINITY */
-#define PORT_RP2	102
-
-/* Freescale lpuart */
-#define PORT_LPUART	103
-
-/* SH-SCI */
-#define PORT_HSCIF	104
-
-/* ST ASC type numbers */
-#define PORT_ASC       105
-
-/* Tilera TILE-Gx UART */
-#define PORT_TILEGX	106
-
-/* MEN 16z135 UART */
-#define PORT_MEN_Z135	107
-
-/* SC16IS74xx */
-#define PORT_SC16IS7XX   108
-
-/* MESON */
-#define PORT_MESON	109
-
-/* Conexant Digicolor */
-#define PORT_DIGICOLOR	110
-
-/* SPRD SERIAL  */
-#define PORT_SPRD	111
-
-/* Cris v10 / v32 SoC */
-#define PORT_CRIS	112
-
-/* STM32 USART */
-#define PORT_STM32	113
-
-#endif /* LINUX_SERIAL_CORE_H */
diff --git a/openflow/usr/include/linux/serial_reg.h b/openflow/usr/include/linux/serial_reg.h
deleted file mode 100644
index 1e5ac4e..0000000
--- a/openflow/usr/include/linux/serial_reg.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * include/linux/serial_reg.h
- *
- * Copyright (C) 1992, 1994 by Theodore Ts'o.
- * 
- * Redistribution of this file is permitted under the terms of the GNU 
- * Public License (GPL)
- * 
- * These are the UART port assignments, expressed as offsets from the base
- * register.  These assignments should hold for any serial port based on
- * a 8250, 16450, or 16550(A).
- */
-
-#ifndef _LINUX_SERIAL_REG_H
-#define _LINUX_SERIAL_REG_H
-
-/*
- * DLAB=0
- */
-#define UART_RX		0	/* In:  Receive buffer */
-#define UART_TX		0	/* Out: Transmit buffer */
-
-#define UART_IER	1	/* Out: Interrupt Enable Register */
-#define UART_IER_MSI		0x08 /* Enable Modem status interrupt */
-#define UART_IER_RLSI		0x04 /* Enable receiver line status interrupt */
-#define UART_IER_THRI		0x02 /* Enable Transmitter holding register int. */
-#define UART_IER_RDI		0x01 /* Enable receiver data interrupt */
-/*
- * Sleep mode for ST16650 and TI16750.  For the ST16650, EFR[4]=1
- */
-#define UART_IERX_SLEEP		0x10 /* Enable sleep mode */
-
-#define UART_IIR	2	/* In:  Interrupt ID Register */
-#define UART_IIR_NO_INT		0x01 /* No interrupts pending */
-#define UART_IIR_ID		0x0e /* Mask for the interrupt ID */
-#define UART_IIR_MSI		0x00 /* Modem status interrupt */
-#define UART_IIR_THRI		0x02 /* Transmitter holding register empty */
-#define UART_IIR_RDI		0x04 /* Receiver data interrupt */
-#define UART_IIR_RLSI		0x06 /* Receiver line status interrupt */
-
-#define UART_IIR_BUSY		0x07 /* DesignWare APB Busy Detect */
-
-#define UART_IIR_RX_TIMEOUT	0x0c /* OMAP RX Timeout interrupt */
-#define UART_IIR_XOFF		0x10 /* OMAP XOFF/Special Character */
-#define UART_IIR_CTS_RTS_DSR	0x20 /* OMAP CTS/RTS/DSR Change */
-
-#define UART_FCR	2	/* Out: FIFO Control Register */
-#define UART_FCR_ENABLE_FIFO	0x01 /* Enable the FIFO */
-#define UART_FCR_CLEAR_RCVR	0x02 /* Clear the RCVR FIFO */
-#define UART_FCR_CLEAR_XMIT	0x04 /* Clear the XMIT FIFO */
-#define UART_FCR_DMA_SELECT	0x08 /* For DMA applications */
-/*
- * Note: The FIFO trigger levels are chip specific:
- *	RX:76 = 00  01  10  11	TX:54 = 00  01  10  11
- * PC16550D:	 1   4   8  14		xx  xx  xx  xx
- * TI16C550A:	 1   4   8  14          xx  xx  xx  xx
- * TI16C550C:	 1   4   8  14          xx  xx  xx  xx
- * ST16C550:	 1   4   8  14		xx  xx  xx  xx
- * ST16C650:	 8  16  24  28		16   8  24  30	PORT_16650V2
- * NS16C552:	 1   4   8  14		xx  xx  xx  xx
- * ST16C654:	 8  16  56  60		 8  16  32  56	PORT_16654
- * TI16C750:	 1  16  32  56		xx  xx  xx  xx	PORT_16750
- * TI16C752:	 8  16  56  60		 8  16  32  56
- * Tegra:	 1   4   8  14		16   8   4   1	PORT_TEGRA
- */
-#define UART_FCR_R_TRIG_00	0x00
-#define UART_FCR_R_TRIG_01	0x40
-#define UART_FCR_R_TRIG_10	0x80
-#define UART_FCR_R_TRIG_11	0xc0
-#define UART_FCR_T_TRIG_00	0x00
-#define UART_FCR_T_TRIG_01	0x10
-#define UART_FCR_T_TRIG_10	0x20
-#define UART_FCR_T_TRIG_11	0x30
-
-#define UART_FCR_TRIGGER_MASK	0xC0 /* Mask for the FIFO trigger range */
-#define UART_FCR_TRIGGER_1	0x00 /* Mask for trigger set at 1 */
-#define UART_FCR_TRIGGER_4	0x40 /* Mask for trigger set at 4 */
-#define UART_FCR_TRIGGER_8	0x80 /* Mask for trigger set at 8 */
-#define UART_FCR_TRIGGER_14	0xC0 /* Mask for trigger set at 14 */
-/* 16650 definitions */
-#define UART_FCR6_R_TRIGGER_8	0x00 /* Mask for receive trigger set at 1 */
-#define UART_FCR6_R_TRIGGER_16	0x40 /* Mask for receive trigger set at 4 */
-#define UART_FCR6_R_TRIGGER_24  0x80 /* Mask for receive trigger set at 8 */
-#define UART_FCR6_R_TRIGGER_28	0xC0 /* Mask for receive trigger set at 14 */
-#define UART_FCR6_T_TRIGGER_16	0x00 /* Mask for transmit trigger set at 16 */
-#define UART_FCR6_T_TRIGGER_8	0x10 /* Mask for transmit trigger set at 8 */
-#define UART_FCR6_T_TRIGGER_24  0x20 /* Mask for transmit trigger set at 24 */
-#define UART_FCR6_T_TRIGGER_30	0x30 /* Mask for transmit trigger set at 30 */
-#define UART_FCR7_64BYTE	0x20 /* Go into 64 byte mode (TI16C750 and
-					some Freescale UARTs) */
-
-#define UART_FCR_R_TRIG_SHIFT		6
-#define UART_FCR_R_TRIG_BITS(x)		\
-	(((x) & UART_FCR_TRIGGER_MASK) >> UART_FCR_R_TRIG_SHIFT)
-#define UART_FCR_R_TRIG_MAX_STATE	4
-
-#define UART_LCR	3	/* Out: Line Control Register */
-/*
- * Note: if the word length is 5 bits (UART_LCR_WLEN5), then setting 
- * UART_LCR_STOP will select 1.5 stop bits, not 2 stop bits.
- */
-#define UART_LCR_DLAB		0x80 /* Divisor latch access bit */
-#define UART_LCR_SBC		0x40 /* Set break control */
-#define UART_LCR_SPAR		0x20 /* Stick parity (?) */
-#define UART_LCR_EPAR		0x10 /* Even parity select */
-#define UART_LCR_PARITY		0x08 /* Parity Enable */
-#define UART_LCR_STOP		0x04 /* Stop bits: 0=1 bit, 1=2 bits */
-#define UART_LCR_WLEN5		0x00 /* Wordlength: 5 bits */
-#define UART_LCR_WLEN6		0x01 /* Wordlength: 6 bits */
-#define UART_LCR_WLEN7		0x02 /* Wordlength: 7 bits */
-#define UART_LCR_WLEN8		0x03 /* Wordlength: 8 bits */
-
-/*
- * Access to some registers depends on register access / configuration
- * mode.
- */
-#define UART_LCR_CONF_MODE_A	UART_LCR_DLAB	/* Configutation mode A */
-#define UART_LCR_CONF_MODE_B	0xBF		/* Configutation mode B */
-
-#define UART_MCR	4	/* Out: Modem Control Register */
-#define UART_MCR_CLKSEL		0x80 /* Divide clock by 4 (TI16C752, EFR[4]=1) */
-#define UART_MCR_TCRTLR		0x40 /* Access TCR/TLR (TI16C752, EFR[4]=1) */
-#define UART_MCR_XONANY		0x20 /* Enable Xon Any (TI16C752, EFR[4]=1) */
-#define UART_MCR_AFE		0x20 /* Enable auto-RTS/CTS (TI16C550C/TI16C750) */
-#define UART_MCR_LOOP		0x10 /* Enable loopback test mode */
-#define UART_MCR_OUT2		0x08 /* Out2 complement */
-#define UART_MCR_OUT1		0x04 /* Out1 complement */
-#define UART_MCR_RTS		0x02 /* RTS complement */
-#define UART_MCR_DTR		0x01 /* DTR complement */
-
-#define UART_LSR	5	/* In:  Line Status Register */
-#define UART_LSR_FIFOE		0x80 /* Fifo error */
-#define UART_LSR_TEMT		0x40 /* Transmitter empty */
-#define UART_LSR_THRE		0x20 /* Transmit-hold-register empty */
-#define UART_LSR_BI		0x10 /* Break interrupt indicator */
-#define UART_LSR_FE		0x08 /* Frame error indicator */
-#define UART_LSR_PE		0x04 /* Parity error indicator */
-#define UART_LSR_OE		0x02 /* Overrun error indicator */
-#define UART_LSR_DR		0x01 /* Receiver data ready */
-#define UART_LSR_BRK_ERROR_BITS	0x1E /* BI, FE, PE, OE bits */
-
-#define UART_MSR	6	/* In:  Modem Status Register */
-#define UART_MSR_DCD		0x80 /* Data Carrier Detect */
-#define UART_MSR_RI		0x40 /* Ring Indicator */
-#define UART_MSR_DSR		0x20 /* Data Set Ready */
-#define UART_MSR_CTS		0x10 /* Clear to Send */
-#define UART_MSR_DDCD		0x08 /* Delta DCD */
-#define UART_MSR_TERI		0x04 /* Trailing edge ring indicator */
-#define UART_MSR_DDSR		0x02 /* Delta DSR */
-#define UART_MSR_DCTS		0x01 /* Delta CTS */
-#define UART_MSR_ANY_DELTA	0x0F /* Any of the delta bits! */
-
-#define UART_SCR	7	/* I/O: Scratch Register */
-
-/*
- * DLAB=1
- */
-#define UART_DLL	0	/* Out: Divisor Latch Low */
-#define UART_DLM	1	/* Out: Divisor Latch High */
-
-/*
- * LCR=0xBF (or DLAB=1 for 16C660)
- */
-#define UART_EFR	2	/* I/O: Extended Features Register */
-#define UART_XR_EFR	9	/* I/O: Extended Features Register (XR17D15x) */
-#define UART_EFR_CTS		0x80 /* CTS flow control */
-#define UART_EFR_RTS		0x40 /* RTS flow control */
-#define UART_EFR_SCD		0x20 /* Special character detect */
-#define UART_EFR_ECB		0x10 /* Enhanced control bit */
-/*
- * the low four bits control software flow control
- */
-
-/*
- * LCR=0xBF, TI16C752, ST16650, ST16650A, ST16654
- */
-#define UART_XON1	4	/* I/O: Xon character 1 */
-#define UART_XON2	5	/* I/O: Xon character 2 */
-#define UART_XOFF1	6	/* I/O: Xoff character 1 */
-#define UART_XOFF2	7	/* I/O: Xoff character 2 */
-
-/*
- * EFR[4]=1 MCR[6]=1, TI16C752
- */
-#define UART_TI752_TCR	6	/* I/O: transmission control register */
-#define UART_TI752_TLR	7	/* I/O: trigger level register */
-
-/*
- * LCR=0xBF, XR16C85x
- */
-#define UART_TRG	0	/* FCTR bit 7 selects Rx or Tx
-				 * In: Fifo count
-				 * Out: Fifo custom trigger levels */
-/*
- * These are the definitions for the Programmable Trigger Register
- */
-#define UART_TRG_1		0x01
-#define UART_TRG_4		0x04
-#define UART_TRG_8		0x08
-#define UART_TRG_16		0x10
-#define UART_TRG_32		0x20
-#define UART_TRG_64		0x40
-#define UART_TRG_96		0x60
-#define UART_TRG_120		0x78
-#define UART_TRG_128		0x80
-
-#define UART_FCTR	1	/* Feature Control Register */
-#define UART_FCTR_RTS_NODELAY	0x00  /* RTS flow control delay */
-#define UART_FCTR_RTS_4DELAY	0x01
-#define UART_FCTR_RTS_6DELAY	0x02
-#define UART_FCTR_RTS_8DELAY	0x03
-#define UART_FCTR_IRDA		0x04  /* IrDa data encode select */
-#define UART_FCTR_TX_INT	0x08  /* Tx interrupt type select */
-#define UART_FCTR_TRGA		0x00  /* Tx/Rx 550 trigger table select */
-#define UART_FCTR_TRGB		0x10  /* Tx/Rx 650 trigger table select */
-#define UART_FCTR_TRGC		0x20  /* Tx/Rx 654 trigger table select */
-#define UART_FCTR_TRGD		0x30  /* Tx/Rx 850 programmable trigger select */
-#define UART_FCTR_SCR_SWAP	0x40  /* Scratch pad register swap */
-#define UART_FCTR_RX		0x00  /* Programmable trigger mode select */
-#define UART_FCTR_TX		0x80  /* Programmable trigger mode select */
-
-/*
- * LCR=0xBF, FCTR[6]=1
- */
-#define UART_EMSR	7	/* Extended Mode Select Register */
-#define UART_EMSR_FIFO_COUNT	0x01  /* Rx/Tx select */
-#define UART_EMSR_ALT_COUNT	0x02  /* Alternating count select */
-
-/*
- * The Intel XScale on-chip UARTs define these bits
- */
-#define UART_IER_DMAE	0x80	/* DMA Requests Enable */
-#define UART_IER_UUE	0x40	/* UART Unit Enable */
-#define UART_IER_NRZE	0x20	/* NRZ coding Enable */
-#define UART_IER_RTOIE	0x10	/* Receiver Time Out Interrupt Enable */
-
-#define UART_IIR_TOD	0x08	/* Character Timeout Indication Detected */
-
-#define UART_FCR_PXAR1	0x00	/* receive FIFO threshold = 1 */
-#define UART_FCR_PXAR8	0x40	/* receive FIFO threshold = 8 */
-#define UART_FCR_PXAR16	0x80	/* receive FIFO threshold = 16 */
-#define UART_FCR_PXAR32	0xc0	/* receive FIFO threshold = 32 */
-
-/*
- * These register definitions are for the 16C950
- */
-#define UART_ASR	0x01	/* Additional Status Register */
-#define UART_RFL	0x03	/* Receiver FIFO level */
-#define UART_TFL 	0x04	/* Transmitter FIFO level */
-#define UART_ICR	0x05	/* Index Control Register */
-
-/* The 16950 ICR registers */
-#define UART_ACR	0x00	/* Additional Control Register */
-#define UART_CPR	0x01	/* Clock Prescalar Register */
-#define UART_TCR	0x02	/* Times Clock Register */
-#define UART_CKS	0x03	/* Clock Select Register */
-#define UART_TTL	0x04	/* Transmitter Interrupt Trigger Level */
-#define UART_RTL	0x05	/* Receiver Interrupt Trigger Level */
-#define UART_FCL	0x06	/* Flow Control Level Lower */
-#define UART_FCH	0x07	/* Flow Control Level Higher */
-#define UART_ID1	0x08	/* ID #1 */
-#define UART_ID2	0x09	/* ID #2 */
-#define UART_ID3	0x0A	/* ID #3 */
-#define UART_REV	0x0B	/* Revision */
-#define UART_CSR	0x0C	/* Channel Software Reset */
-#define UART_NMR	0x0D	/* Nine-bit Mode Register */
-#define UART_CTR	0xFF
-
-/*
- * The 16C950 Additional Control Register
- */
-#define UART_ACR_RXDIS	0x01	/* Receiver disable */
-#define UART_ACR_TXDIS	0x02	/* Transmitter disable */
-#define UART_ACR_DSRFC	0x04	/* DSR Flow Control */
-#define UART_ACR_TLENB	0x20	/* 950 trigger levels enable */
-#define UART_ACR_ICRRD	0x40	/* ICR Read enable */
-#define UART_ACR_ASREN	0x80	/* Additional status enable */
-
-
-
-/*
- * These definitions are for the RSA-DV II/S card, from
- *
- * Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
- */
-
-#define UART_RSA_BASE (-8)
-
-#define UART_RSA_MSR ((UART_RSA_BASE) + 0) /* I/O: Mode Select Register */
-
-#define UART_RSA_MSR_SWAP (1 << 0) /* Swap low/high 8 bytes in I/O port addr */
-#define UART_RSA_MSR_FIFO (1 << 2) /* Enable the external FIFO */
-#define UART_RSA_MSR_FLOW (1 << 3) /* Enable the auto RTS/CTS flow control */
-#define UART_RSA_MSR_ITYP (1 << 4) /* Level (1) / Edge triger (0) */
-
-#define UART_RSA_IER ((UART_RSA_BASE) + 1) /* I/O: Interrupt Enable Register */
-
-#define UART_RSA_IER_Rx_FIFO_H (1 << 0) /* Enable Rx FIFO half full int. */
-#define UART_RSA_IER_Tx_FIFO_H (1 << 1) /* Enable Tx FIFO half full int. */
-#define UART_RSA_IER_Tx_FIFO_E (1 << 2) /* Enable Tx FIFO empty int. */
-#define UART_RSA_IER_Rx_TOUT (1 << 3) /* Enable char receive timeout int */
-#define UART_RSA_IER_TIMER (1 << 4) /* Enable timer interrupt */
-
-#define UART_RSA_SRR ((UART_RSA_BASE) + 2) /* IN: Status Read Register */
-
-#define UART_RSA_SRR_Tx_FIFO_NEMP (1 << 0) /* Tx FIFO is not empty (1) */
-#define UART_RSA_SRR_Tx_FIFO_NHFL (1 << 1) /* Tx FIFO is not half full (1) */
-#define UART_RSA_SRR_Tx_FIFO_NFUL (1 << 2) /* Tx FIFO is not full (1) */
-#define UART_RSA_SRR_Rx_FIFO_NEMP (1 << 3) /* Rx FIFO is not empty (1) */
-#define UART_RSA_SRR_Rx_FIFO_NHFL (1 << 4) /* Rx FIFO is not half full (1) */
-#define UART_RSA_SRR_Rx_FIFO_NFUL (1 << 5) /* Rx FIFO is not full (1) */
-#define UART_RSA_SRR_Rx_TOUT (1 << 6) /* Character reception timeout occurred (1) */
-#define UART_RSA_SRR_TIMER (1 << 7) /* Timer interrupt occurred */
-
-#define UART_RSA_FRR ((UART_RSA_BASE) + 2) /* OUT: FIFO Reset Register */
-
-#define UART_RSA_TIVSR ((UART_RSA_BASE) + 3) /* I/O: Timer Interval Value Set Register */
-
-#define UART_RSA_TCR ((UART_RSA_BASE) + 4) /* OUT: Timer Control Register */
-
-#define UART_RSA_TCR_SWITCH (1 << 0) /* Timer on */
-
-/*
- * The RSA DSV/II board has two fixed clock frequencies.  One is the
- * standard rate, and the other is 8 times faster.
- */
-#define SERIAL_RSA_BAUD_BASE (921600)
-#define SERIAL_RSA_BAUD_BASE_LO (SERIAL_RSA_BAUD_BASE / 8)
-
-/*
- * Extra serial register definitions for the internal UARTs
- * in TI OMAP processors.
- */
-#define OMAP1_UART1_BASE	0xfffb0000
-#define OMAP1_UART2_BASE	0xfffb0800
-#define OMAP1_UART3_BASE	0xfffb9800
-#define UART_OMAP_MDR1		0x08	/* Mode definition register */
-#define UART_OMAP_MDR2		0x09	/* Mode definition register 2 */
-#define UART_OMAP_SCR		0x10	/* Supplementary control register */
-#define UART_OMAP_SSR		0x11	/* Supplementary status register */
-#define UART_OMAP_EBLR		0x12	/* BOF length register */
-#define UART_OMAP_OSC_12M_SEL	0x13	/* OMAP1510 12MHz osc select */
-#define UART_OMAP_MVER		0x14	/* Module version register */
-#define UART_OMAP_SYSC		0x15	/* System configuration register */
-#define UART_OMAP_SYSS		0x16	/* System status register */
-#define UART_OMAP_WER		0x17	/* Wake-up enable register */
-#define UART_OMAP_TX_LVL	0x1a	/* TX FIFO level register */
-
-/*
- * These are the definitions for the MDR1 register
- */
-#define UART_OMAP_MDR1_16X_MODE		0x00	/* UART 16x mode */
-#define UART_OMAP_MDR1_SIR_MODE		0x01	/* SIR mode */
-#define UART_OMAP_MDR1_16X_ABAUD_MODE	0x02	/* UART 16x auto-baud */
-#define UART_OMAP_MDR1_13X_MODE		0x03	/* UART 13x mode */
-#define UART_OMAP_MDR1_MIR_MODE		0x04	/* MIR mode */
-#define UART_OMAP_MDR1_FIR_MODE		0x05	/* FIR mode */
-#define UART_OMAP_MDR1_CIR_MODE		0x06	/* CIR mode */
-#define UART_OMAP_MDR1_DISABLE		0x07	/* Disable (default state) */
-
-/*
- * These are definitions for the Exar XR17V35X and XR17(C|D)15X
- */
-#define UART_EXAR_8XMODE	0x88	/* 8X sampling rate select */
-#define UART_EXAR_SLEEP		0x8b	/* Sleep mode */
-#define UART_EXAR_DVID		0x8d	/* Device identification */
-
-#define UART_EXAR_FCTR		0x08	/* Feature Control Register */
-#define UART_FCTR_EXAR_IRDA	0x08	/* IrDa data encode select */
-#define UART_FCTR_EXAR_485	0x10	/* Auto 485 half duplex dir ctl */
-#define UART_FCTR_EXAR_TRGA	0x00	/* FIFO trigger table A */
-#define UART_FCTR_EXAR_TRGB	0x60	/* FIFO trigger table B */
-#define UART_FCTR_EXAR_TRGC	0x80	/* FIFO trigger table C */
-#define UART_FCTR_EXAR_TRGD	0xc0	/* FIFO trigger table D programmable */
-
-#define UART_EXAR_TXTRG		0x0a	/* Tx FIFO trigger level write-only */
-#define UART_EXAR_RXTRG		0x0b	/* Rx FIFO trigger level write-only */
-
-#endif /* _LINUX_SERIAL_REG_H */
-
diff --git a/openflow/usr/include/linux/serio.h b/openflow/usr/include/linux/serio.h
deleted file mode 100644
index c13f49c..0000000
--- a/openflow/usr/include/linux/serio.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 1999-2002 Vojtech Pavlik
-*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-#ifndef _SERIO_H
-#define _SERIO_H
-
-
-#include <linux/ioctl.h>
-
-#define SPIOCSTYPE	_IOW('q', 0x01, unsigned long)
-
-
-/*
- * bit masks for use in "interrupt" flags (3rd argument)
- */
-#define SERIO_TIMEOUT	1
-#define SERIO_PARITY	2
-#define SERIO_FRAME	4
-
-/*
- * Serio types
- */
-#define SERIO_XT	0x00
-#define SERIO_8042	0x01
-#define SERIO_RS232	0x02
-#define SERIO_HIL_MLC	0x03
-#define SERIO_PS_PSTHRU	0x05
-#define SERIO_8042_XL	0x06
-
-/*
- * Serio protocols
- */
-#define SERIO_UNKNOWN	0x00
-#define SERIO_MSC	0x01
-#define SERIO_SUN	0x02
-#define SERIO_MS	0x03
-#define SERIO_MP	0x04
-#define SERIO_MZ	0x05
-#define SERIO_MZP	0x06
-#define SERIO_MZPP	0x07
-#define SERIO_VSXXXAA	0x08
-#define SERIO_SUNKBD	0x10
-#define SERIO_WARRIOR	0x18
-#define SERIO_SPACEORB	0x19
-#define SERIO_MAGELLAN	0x1a
-#define SERIO_SPACEBALL	0x1b
-#define SERIO_GUNZE	0x1c
-#define SERIO_IFORCE	0x1d
-#define SERIO_STINGER	0x1e
-#define SERIO_NEWTON	0x1f
-#define SERIO_STOWAWAY	0x20
-#define SERIO_H3600	0x21
-#define SERIO_PS2SER	0x22
-#define SERIO_TWIDKBD	0x23
-#define SERIO_TWIDJOY	0x24
-#define SERIO_HIL	0x25
-#define SERIO_SNES232	0x26
-#define SERIO_SEMTECH	0x27
-#define SERIO_LKKBD	0x28
-#define SERIO_ELO	0x29
-#define SERIO_MICROTOUCH	0x30
-#define SERIO_PENMOUNT	0x31
-#define SERIO_TOUCHRIGHT	0x32
-#define SERIO_TOUCHWIN	0x33
-#define SERIO_TAOSEVM	0x34
-#define SERIO_FUJITSU	0x35
-#define SERIO_ZHENHUA	0x36
-#define SERIO_INEXIO	0x37
-#define SERIO_TOUCHIT213	0x38
-#define SERIO_W8001	0x39
-#define SERIO_DYNAPRO	0x3a
-#define SERIO_HAMPSHIRE	0x3b
-#define SERIO_PS2MULT	0x3c
-#define SERIO_TSC40	0x3d
-#define SERIO_WACOM_IV	0x3e
-
-#endif /* _SERIO_H */
diff --git a/openflow/usr/include/linux/shm.h b/openflow/usr/include/linux/shm.h
deleted file mode 100644
index 18dac98..0000000
--- a/openflow/usr/include/linux/shm.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _LINUX_SHM_H_
-#define _LINUX_SHM_H_
-
-#include <linux/ipc.h>
-#include <linux/errno.h>
-#include <unistd.h>
-
-/*
- * SHMMNI, SHMMAX and SHMALL are default upper limits which can be
- * modified by sysctl. The SHMMAX and SHMALL values have been chosen to
- * be as large possible without facilitating scenarios where userspace
- * causes overflows when adjusting the limits via operations of the form
- * "retrieve current limit; add X; update limit". It is therefore not
- * advised to make SHMMAX and SHMALL any larger. These limits are
- * suitable for both 32 and 64-bit systems.
- */
-#define SHMMIN 1			 /* min shared seg size (bytes) */
-#define SHMMNI 4096			 /* max num of segs system wide */
-#define SHMMAX (ULONG_MAX - (1UL << 24)) /* max shared seg size (bytes) */
-#define SHMALL (ULONG_MAX - (1UL << 24)) /* max shm system wide (pages) */
-#define SHMSEG SHMMNI			 /* max shared segs per process */
-
-/* Obsolete, used only for backwards compatibility and libc5 compiles */
-struct shmid_ds {
-	struct ipc_perm		shm_perm;	/* operation perms */
-	int			shm_segsz;	/* size of segment (bytes) */
-	__kernel_time_t		shm_atime;	/* last attach time */
-	__kernel_time_t		shm_dtime;	/* last detach time */
-	__kernel_time_t		shm_ctime;	/* last change time */
-	__kernel_ipc_pid_t	shm_cpid;	/* pid of creator */
-	__kernel_ipc_pid_t	shm_lpid;	/* pid of last operator */
-	unsigned short		shm_nattch;	/* no. of current attaches */
-	unsigned short 		shm_unused;	/* compatibility */
-	void 			*shm_unused2;	/* ditto - used by DIPC */
-	void			*shm_unused3;	/* unused */
-};
-
-/* Include the definition of shmid64_ds and shminfo64 */
-#include <asm/shmbuf.h>
-
-/* permission flag for shmget */
-#define SHM_R		0400	/* or S_IRUGO from <linux/stat.h> */
-#define SHM_W		0200	/* or S_IWUGO from <linux/stat.h> */
-
-/* mode for attach */
-#define	SHM_RDONLY	010000	/* read-only access */
-#define	SHM_RND		020000	/* round attach address to SHMLBA boundary */
-#define	SHM_REMAP	040000	/* take-over region on attach */
-#define	SHM_EXEC	0100000	/* execution access */
-
-/* super user shmctl commands */
-#define SHM_LOCK 	11
-#define SHM_UNLOCK 	12
-
-/* ipcs ctl commands */
-#define SHM_STAT 	13
-#define SHM_INFO 	14
-
-/* Obsolete, used only for backwards compatibility */
-struct	shminfo {
-	int shmmax;
-	int shmmin;
-	int shmmni;
-	int shmseg;
-	int shmall;
-};
-
-struct shm_info {
-	int used_ids;
-	__kernel_ulong_t shm_tot;	/* total allocated shm */
-	__kernel_ulong_t shm_rss;	/* total resident shm */
-	__kernel_ulong_t shm_swp;	/* total swapped shm */
-	__kernel_ulong_t swap_attempts;
-	__kernel_ulong_t swap_successes;
-};
-
-
-#endif /* _LINUX_SHM_H_ */
diff --git a/openflow/usr/include/linux/signal.h b/openflow/usr/include/linux/signal.h
deleted file mode 100644
index 94dc2e6..0000000
--- a/openflow/usr/include/linux/signal.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _LINUX_SIGNAL_H
-#define _LINUX_SIGNAL_H
-
-#include <asm/signal.h>
-#include <asm/siginfo.h>
-
-#define SS_ONSTACK	1
-#define SS_DISABLE	2
-
-#endif /* _LINUX_SIGNAL_H */
diff --git a/openflow/usr/include/linux/signalfd.h b/openflow/usr/include/linux/signalfd.h
deleted file mode 100644
index 90e689a..0000000
--- a/openflow/usr/include/linux/signalfd.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  include/linux/signalfd.h
- *
- *  Copyright (C) 2007  Davide Libenzi <davidel@xmailserver.org>
- *
- */
-
-#ifndef _LINUX_SIGNALFD_H
-#define _LINUX_SIGNALFD_H
-
-#include <linux/types.h>
-/* For O_CLOEXEC and O_NONBLOCK */
-#include <linux/fcntl.h>
-
-/* Flags for signalfd4.  */
-#define SFD_CLOEXEC O_CLOEXEC
-#define SFD_NONBLOCK O_NONBLOCK
-
-struct signalfd_siginfo {
-	__u32 ssi_signo;
-	__s32 ssi_errno;
-	__s32 ssi_code;
-	__u32 ssi_pid;
-	__u32 ssi_uid;
-	__s32 ssi_fd;
-	__u32 ssi_tid;
-	__u32 ssi_band;
-	__u32 ssi_overrun;
-	__u32 ssi_trapno;
-	__s32 ssi_status;
-	__s32 ssi_int;
-	__u64 ssi_ptr;
-	__u64 ssi_utime;
-	__u64 ssi_stime;
-	__u64 ssi_addr;
-	__u16 ssi_addr_lsb;
-
-	/*
-	 * Pad strcture to 128 bytes. Remember to update the
-	 * pad size when you add new members. We use a fixed
-	 * size structure to avoid compatibility problems with
-	 * future versions, and we leave extra space for additional
-	 * members. We use fixed size members because this strcture
-	 * comes out of a read(2) and we really don't want to have
-	 * a compat on read(2).
-	 */
-	__u8 __pad[46];
-};
-
-
-
-#endif /* _LINUX_SIGNALFD_H */
diff --git a/openflow/usr/include/linux/smiapp.h b/openflow/usr/include/linux/smiapp.h
deleted file mode 100644
index 53938f4..0000000
--- a/openflow/usr/include/linux/smiapp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * include/uapi/linux/smiapp.h
- *
- * Generic driver for SMIA/SMIA++ compliant camera modules
- *
- * Copyright (C) 2014 Intel Corporation
- * Contact: Sakari Ailus <sakari.ailus@iki.fi>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- */
-
-#ifndef __UAPI_LINUX_SMIAPP_H_
-#define __UAPI_LINUX_SMIAPP_H_
-
-#define V4L2_SMIAPP_TEST_PATTERN_MODE_DISABLED			0
-#define V4L2_SMIAPP_TEST_PATTERN_MODE_SOLID_COLOUR		1
-#define V4L2_SMIAPP_TEST_PATTERN_MODE_COLOUR_BARS		2
-#define V4L2_SMIAPP_TEST_PATTERN_MODE_COLOUR_BARS_GREY		3
-#define V4L2_SMIAPP_TEST_PATTERN_MODE_PN9			4
-
-#endif /* __UAPI_LINUX_SMIAPP_H_ */
diff --git a/openflow/usr/include/linux/snmp.h b/openflow/usr/include/linux/snmp.h
deleted file mode 100644
index 25a9ad8..0000000
--- a/openflow/usr/include/linux/snmp.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Definitions for MIBs
- *
- * Author: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
- */
-
-#ifndef _LINUX_SNMP_H
-#define _LINUX_SNMP_H
-
-/* ipstats mib definitions */
-/*
- * RFC 1213:  MIB-II
- * RFC 2011 (updates 1213):  SNMPv2-MIB-IP
- * RFC 2863:  Interfaces Group MIB
- * RFC 2465:  IPv6 MIB: General Group
- * draft-ietf-ipv6-rfc2011-update-10.txt: MIB for IP: IP Statistics Tables
- */
-enum
-{
-	IPSTATS_MIB_NUM = 0,
-/* frequently written fields in fast path, kept in same cache line */
-	IPSTATS_MIB_INPKTS,			/* InReceives */
-	IPSTATS_MIB_INOCTETS,			/* InOctets */
-	IPSTATS_MIB_INDELIVERS,			/* InDelivers */
-	IPSTATS_MIB_OUTFORWDATAGRAMS,		/* OutForwDatagrams */
-	IPSTATS_MIB_OUTPKTS,			/* OutRequests */
-	IPSTATS_MIB_OUTOCTETS,			/* OutOctets */
-/* other fields */
-	IPSTATS_MIB_INHDRERRORS,		/* InHdrErrors */
-	IPSTATS_MIB_INTOOBIGERRORS,		/* InTooBigErrors */
-	IPSTATS_MIB_INNOROUTES,			/* InNoRoutes */
-	IPSTATS_MIB_INADDRERRORS,		/* InAddrErrors */
-	IPSTATS_MIB_INUNKNOWNPROTOS,		/* InUnknownProtos */
-	IPSTATS_MIB_INTRUNCATEDPKTS,		/* InTruncatedPkts */
-	IPSTATS_MIB_INDISCARDS,			/* InDiscards */
-	IPSTATS_MIB_OUTDISCARDS,		/* OutDiscards */
-	IPSTATS_MIB_OUTNOROUTES,		/* OutNoRoutes */
-	IPSTATS_MIB_REASMTIMEOUT,		/* ReasmTimeout */
-	IPSTATS_MIB_REASMREQDS,			/* ReasmReqds */
-	IPSTATS_MIB_REASMOKS,			/* ReasmOKs */
-	IPSTATS_MIB_REASMFAILS,			/* ReasmFails */
-	IPSTATS_MIB_FRAGOKS,			/* FragOKs */
-	IPSTATS_MIB_FRAGFAILS,			/* FragFails */
-	IPSTATS_MIB_FRAGCREATES,		/* FragCreates */
-	IPSTATS_MIB_INMCASTPKTS,		/* InMcastPkts */
-	IPSTATS_MIB_OUTMCASTPKTS,		/* OutMcastPkts */
-	IPSTATS_MIB_INBCASTPKTS,		/* InBcastPkts */
-	IPSTATS_MIB_OUTBCASTPKTS,		/* OutBcastPkts */
-	IPSTATS_MIB_INMCASTOCTETS,		/* InMcastOctets */
-	IPSTATS_MIB_OUTMCASTOCTETS,		/* OutMcastOctets */
-	IPSTATS_MIB_INBCASTOCTETS,		/* InBcastOctets */
-	IPSTATS_MIB_OUTBCASTOCTETS,		/* OutBcastOctets */
-	IPSTATS_MIB_CSUMERRORS,			/* InCsumErrors */
-	IPSTATS_MIB_NOECTPKTS,			/* InNoECTPkts */
-	IPSTATS_MIB_ECT1PKTS,			/* InECT1Pkts */
-	IPSTATS_MIB_ECT0PKTS,			/* InECT0Pkts */
-	IPSTATS_MIB_CEPKTS,			/* InCEPkts */
-	__IPSTATS_MIB_MAX
-};
-
-/* icmp mib definitions */
-/*
- * RFC 1213:  MIB-II ICMP Group
- * RFC 2011 (updates 1213):  SNMPv2 MIB for IP: ICMP group
- */
-enum
-{
-	ICMP_MIB_NUM = 0,
-	ICMP_MIB_INMSGS,			/* InMsgs */
-	ICMP_MIB_INERRORS,			/* InErrors */
-	ICMP_MIB_INDESTUNREACHS,		/* InDestUnreachs */
-	ICMP_MIB_INTIMEEXCDS,			/* InTimeExcds */
-	ICMP_MIB_INPARMPROBS,			/* InParmProbs */
-	ICMP_MIB_INSRCQUENCHS,			/* InSrcQuenchs */
-	ICMP_MIB_INREDIRECTS,			/* InRedirects */
-	ICMP_MIB_INECHOS,			/* InEchos */
-	ICMP_MIB_INECHOREPS,			/* InEchoReps */
-	ICMP_MIB_INTIMESTAMPS,			/* InTimestamps */
-	ICMP_MIB_INTIMESTAMPREPS,		/* InTimestampReps */
-	ICMP_MIB_INADDRMASKS,			/* InAddrMasks */
-	ICMP_MIB_INADDRMASKREPS,		/* InAddrMaskReps */
-	ICMP_MIB_OUTMSGS,			/* OutMsgs */
-	ICMP_MIB_OUTERRORS,			/* OutErrors */
-	ICMP_MIB_OUTDESTUNREACHS,		/* OutDestUnreachs */
-	ICMP_MIB_OUTTIMEEXCDS,			/* OutTimeExcds */
-	ICMP_MIB_OUTPARMPROBS,			/* OutParmProbs */
-	ICMP_MIB_OUTSRCQUENCHS,			/* OutSrcQuenchs */
-	ICMP_MIB_OUTREDIRECTS,			/* OutRedirects */
-	ICMP_MIB_OUTECHOS,			/* OutEchos */
-	ICMP_MIB_OUTECHOREPS,			/* OutEchoReps */
-	ICMP_MIB_OUTTIMESTAMPS,			/* OutTimestamps */
-	ICMP_MIB_OUTTIMESTAMPREPS,		/* OutTimestampReps */
-	ICMP_MIB_OUTADDRMASKS,			/* OutAddrMasks */
-	ICMP_MIB_OUTADDRMASKREPS,		/* OutAddrMaskReps */
-	ICMP_MIB_CSUMERRORS,			/* InCsumErrors */
-	__ICMP_MIB_MAX
-};
-
-#define __ICMPMSG_MIB_MAX 512	/* Out+In for all 8-bit ICMP types */
-
-/* icmp6 mib definitions */
-/*
- * RFC 2466:  ICMPv6-MIB
- */
-enum
-{
-	ICMP6_MIB_NUM = 0,
-	ICMP6_MIB_INMSGS,			/* InMsgs */
-	ICMP6_MIB_INERRORS,			/* InErrors */
-	ICMP6_MIB_OUTMSGS,			/* OutMsgs */
-	ICMP6_MIB_OUTERRORS,			/* OutErrors */
-	ICMP6_MIB_CSUMERRORS,			/* InCsumErrors */
-	__ICMP6_MIB_MAX
-};
-
-#define __ICMP6MSG_MIB_MAX 512 /* Out+In for all 8-bit ICMPv6 types */
-
-/* tcp mib definitions */
-/*
- * RFC 1213:  MIB-II TCP group
- * RFC 2012 (updates 1213):  SNMPv2-MIB-TCP
- */
-enum
-{
-	TCP_MIB_NUM = 0,
-	TCP_MIB_RTOALGORITHM,			/* RtoAlgorithm */
-	TCP_MIB_RTOMIN,				/* RtoMin */
-	TCP_MIB_RTOMAX,				/* RtoMax */
-	TCP_MIB_MAXCONN,			/* MaxConn */
-	TCP_MIB_ACTIVEOPENS,			/* ActiveOpens */
-	TCP_MIB_PASSIVEOPENS,			/* PassiveOpens */
-	TCP_MIB_ATTEMPTFAILS,			/* AttemptFails */
-	TCP_MIB_ESTABRESETS,			/* EstabResets */
-	TCP_MIB_CURRESTAB,			/* CurrEstab */
-	TCP_MIB_INSEGS,				/* InSegs */
-	TCP_MIB_OUTSEGS,			/* OutSegs */
-	TCP_MIB_RETRANSSEGS,			/* RetransSegs */
-	TCP_MIB_INERRS,				/* InErrs */
-	TCP_MIB_OUTRSTS,			/* OutRsts */
-	TCP_MIB_CSUMERRORS,			/* InCsumErrors */
-	__TCP_MIB_MAX
-};
-
-/* udp mib definitions */
-/*
- * RFC 1213:  MIB-II UDP group
- * RFC 2013 (updates 1213):  SNMPv2-MIB-UDP
- */
-enum
-{
-	UDP_MIB_NUM = 0,
-	UDP_MIB_INDATAGRAMS,			/* InDatagrams */
-	UDP_MIB_NOPORTS,			/* NoPorts */
-	UDP_MIB_INERRORS,			/* InErrors */
-	UDP_MIB_OUTDATAGRAMS,			/* OutDatagrams */
-	UDP_MIB_RCVBUFERRORS,			/* RcvbufErrors */
-	UDP_MIB_SNDBUFERRORS,			/* SndbufErrors */
-	UDP_MIB_CSUMERRORS,			/* InCsumErrors */
-	UDP_MIB_IGNOREDMULTI,			/* IgnoredMulti */
-	__UDP_MIB_MAX
-};
-
-/* linux mib definitions */
-enum
-{
-	LINUX_MIB_NUM = 0,
-	LINUX_MIB_SYNCOOKIESSENT,		/* SyncookiesSent */
-	LINUX_MIB_SYNCOOKIESRECV,		/* SyncookiesRecv */
-	LINUX_MIB_SYNCOOKIESFAILED,		/* SyncookiesFailed */
-	LINUX_MIB_EMBRYONICRSTS,		/* EmbryonicRsts */
-	LINUX_MIB_PRUNECALLED,			/* PruneCalled */
-	LINUX_MIB_RCVPRUNED,			/* RcvPruned */
-	LINUX_MIB_OFOPRUNED,			/* OfoPruned */
-	LINUX_MIB_OUTOFWINDOWICMPS,		/* OutOfWindowIcmps */
-	LINUX_MIB_LOCKDROPPEDICMPS,		/* LockDroppedIcmps */
-	LINUX_MIB_ARPFILTER,			/* ArpFilter */
-	LINUX_MIB_TIMEWAITED,			/* TimeWaited */
-	LINUX_MIB_TIMEWAITRECYCLED,		/* TimeWaitRecycled */
-	LINUX_MIB_TIMEWAITKILLED,		/* TimeWaitKilled */
-	LINUX_MIB_PAWSPASSIVEREJECTED,		/* PAWSPassiveRejected */
-	LINUX_MIB_PAWSACTIVEREJECTED,		/* PAWSActiveRejected */
-	LINUX_MIB_PAWSESTABREJECTED,		/* PAWSEstabRejected */
-	LINUX_MIB_DELAYEDACKS,			/* DelayedACKs */
-	LINUX_MIB_DELAYEDACKLOCKED,		/* DelayedACKLocked */
-	LINUX_MIB_DELAYEDACKLOST,		/* DelayedACKLost */
-	LINUX_MIB_LISTENOVERFLOWS,		/* ListenOverflows */
-	LINUX_MIB_LISTENDROPS,			/* ListenDrops */
-	LINUX_MIB_TCPPREQUEUED,			/* TCPPrequeued */
-	LINUX_MIB_TCPDIRECTCOPYFROMBACKLOG,	/* TCPDirectCopyFromBacklog */
-	LINUX_MIB_TCPDIRECTCOPYFROMPREQUEUE,	/* TCPDirectCopyFromPrequeue */
-	LINUX_MIB_TCPPREQUEUEDROPPED,		/* TCPPrequeueDropped */
-	LINUX_MIB_TCPHPHITS,			/* TCPHPHits */
-	LINUX_MIB_TCPHPHITSTOUSER,		/* TCPHPHitsToUser */
-	LINUX_MIB_TCPPUREACKS,			/* TCPPureAcks */
-	LINUX_MIB_TCPHPACKS,			/* TCPHPAcks */
-	LINUX_MIB_TCPRENORECOVERY,		/* TCPRenoRecovery */
-	LINUX_MIB_TCPSACKRECOVERY,		/* TCPSackRecovery */
-	LINUX_MIB_TCPSACKRENEGING,		/* TCPSACKReneging */
-	LINUX_MIB_TCPFACKREORDER,		/* TCPFACKReorder */
-	LINUX_MIB_TCPSACKREORDER,		/* TCPSACKReorder */
-	LINUX_MIB_TCPRENOREORDER,		/* TCPRenoReorder */
-	LINUX_MIB_TCPTSREORDER,			/* TCPTSReorder */
-	LINUX_MIB_TCPFULLUNDO,			/* TCPFullUndo */
-	LINUX_MIB_TCPPARTIALUNDO,		/* TCPPartialUndo */
-	LINUX_MIB_TCPDSACKUNDO,			/* TCPDSACKUndo */
-	LINUX_MIB_TCPLOSSUNDO,			/* TCPLossUndo */
-	LINUX_MIB_TCPLOSTRETRANSMIT,		/* TCPLostRetransmit */
-	LINUX_MIB_TCPRENOFAILURES,		/* TCPRenoFailures */
-	LINUX_MIB_TCPSACKFAILURES,		/* TCPSackFailures */
-	LINUX_MIB_TCPLOSSFAILURES,		/* TCPLossFailures */
-	LINUX_MIB_TCPFASTRETRANS,		/* TCPFastRetrans */
-	LINUX_MIB_TCPFORWARDRETRANS,		/* TCPForwardRetrans */
-	LINUX_MIB_TCPSLOWSTARTRETRANS,		/* TCPSlowStartRetrans */
-	LINUX_MIB_TCPTIMEOUTS,			/* TCPTimeouts */
-	LINUX_MIB_TCPLOSSPROBES,		/* TCPLossProbes */
-	LINUX_MIB_TCPLOSSPROBERECOVERY,		/* TCPLossProbeRecovery */
-	LINUX_MIB_TCPRENORECOVERYFAIL,		/* TCPRenoRecoveryFail */
-	LINUX_MIB_TCPSACKRECOVERYFAIL,		/* TCPSackRecoveryFail */
-	LINUX_MIB_TCPSCHEDULERFAILED,		/* TCPSchedulerFailed */
-	LINUX_MIB_TCPRCVCOLLAPSED,		/* TCPRcvCollapsed */
-	LINUX_MIB_TCPDSACKOLDSENT,		/* TCPDSACKOldSent */
-	LINUX_MIB_TCPDSACKOFOSENT,		/* TCPDSACKOfoSent */
-	LINUX_MIB_TCPDSACKRECV,			/* TCPDSACKRecv */
-	LINUX_MIB_TCPDSACKOFORECV,		/* TCPDSACKOfoRecv */
-	LINUX_MIB_TCPABORTONDATA,		/* TCPAbortOnData */
-	LINUX_MIB_TCPABORTONCLOSE,		/* TCPAbortOnClose */
-	LINUX_MIB_TCPABORTONMEMORY,		/* TCPAbortOnMemory */
-	LINUX_MIB_TCPABORTONTIMEOUT,		/* TCPAbortOnTimeout */
-	LINUX_MIB_TCPABORTONLINGER,		/* TCPAbortOnLinger */
-	LINUX_MIB_TCPABORTFAILED,		/* TCPAbortFailed */
-	LINUX_MIB_TCPMEMORYPRESSURES,		/* TCPMemoryPressures */
-	LINUX_MIB_TCPSACKDISCARD,		/* TCPSACKDiscard */
-	LINUX_MIB_TCPDSACKIGNOREDOLD,		/* TCPSACKIgnoredOld */
-	LINUX_MIB_TCPDSACKIGNOREDNOUNDO,	/* TCPSACKIgnoredNoUndo */
-	LINUX_MIB_TCPSPURIOUSRTOS,		/* TCPSpuriousRTOs */
-	LINUX_MIB_TCPMD5NOTFOUND,		/* TCPMD5NotFound */
-	LINUX_MIB_TCPMD5UNEXPECTED,		/* TCPMD5Unexpected */
-	LINUX_MIB_SACKSHIFTED,
-	LINUX_MIB_SACKMERGED,
-	LINUX_MIB_SACKSHIFTFALLBACK,
-	LINUX_MIB_TCPBACKLOGDROP,
-	LINUX_MIB_TCPMINTTLDROP, /* RFC 5082 */
-	LINUX_MIB_TCPDEFERACCEPTDROP,
-	LINUX_MIB_IPRPFILTER, /* IP Reverse Path Filter (rp_filter) */
-	LINUX_MIB_TCPTIMEWAITOVERFLOW,		/* TCPTimeWaitOverflow */
-	LINUX_MIB_TCPREQQFULLDOCOOKIES,		/* TCPReqQFullDoCookies */
-	LINUX_MIB_TCPREQQFULLDROP,		/* TCPReqQFullDrop */
-	LINUX_MIB_TCPRETRANSFAIL,		/* TCPRetransFail */
-	LINUX_MIB_TCPRCVCOALESCE,		/* TCPRcvCoalesce */
-	LINUX_MIB_TCPOFOQUEUE,			/* TCPOFOQueue */
-	LINUX_MIB_TCPOFODROP,			/* TCPOFODrop */
-	LINUX_MIB_TCPOFOMERGE,			/* TCPOFOMerge */
-	LINUX_MIB_TCPCHALLENGEACK,		/* TCPChallengeACK */
-	LINUX_MIB_TCPSYNCHALLENGE,		/* TCPSYNChallenge */
-	LINUX_MIB_TCPFASTOPENACTIVE,		/* TCPFastOpenActive */
-	LINUX_MIB_TCPFASTOPENACTIVEFAIL,	/* TCPFastOpenActiveFail */
-	LINUX_MIB_TCPFASTOPENPASSIVE,		/* TCPFastOpenPassive*/
-	LINUX_MIB_TCPFASTOPENPASSIVEFAIL,	/* TCPFastOpenPassiveFail */
-	LINUX_MIB_TCPFASTOPENLISTENOVERFLOW,	/* TCPFastOpenListenOverflow */
-	LINUX_MIB_TCPFASTOPENCOOKIEREQD,	/* TCPFastOpenCookieReqd */
-	LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */
-	LINUX_MIB_BUSYPOLLRXPACKETS,		/* BusyPollRxPackets */
-	LINUX_MIB_TCPAUTOCORKING,		/* TCPAutoCorking */
-	LINUX_MIB_TCPFROMZEROWINDOWADV,		/* TCPFromZeroWindowAdv */
-	LINUX_MIB_TCPTOZEROWINDOWADV,		/* TCPToZeroWindowAdv */
-	LINUX_MIB_TCPWANTZEROWINDOWADV,		/* TCPWantZeroWindowAdv */
-	LINUX_MIB_TCPSYNRETRANS,		/* TCPSynRetrans */
-	LINUX_MIB_TCPORIGDATASENT,		/* TCPOrigDataSent */
-	LINUX_MIB_TCPHYSTARTTRAINDETECT,	/* TCPHystartTrainDetect */
-	LINUX_MIB_TCPHYSTARTTRAINCWND,		/* TCPHystartTrainCwnd */
-	LINUX_MIB_TCPHYSTARTDELAYDETECT,	/* TCPHystartDelayDetect */
-	LINUX_MIB_TCPHYSTARTDELAYCWND,		/* TCPHystartDelayCwnd */
-	LINUX_MIB_TCPACKSKIPPEDSYNRECV,		/* TCPACKSkippedSynRecv */
-	LINUX_MIB_TCPACKSKIPPEDPAWS,		/* TCPACKSkippedPAWS */
-	LINUX_MIB_TCPACKSKIPPEDSEQ,		/* TCPACKSkippedSeq */
-	LINUX_MIB_TCPACKSKIPPEDFINWAIT2,	/* TCPACKSkippedFinWait2 */
-	LINUX_MIB_TCPACKSKIPPEDTIMEWAIT,	/* TCPACKSkippedTimeWait */
-	LINUX_MIB_TCPACKSKIPPEDCHALLENGE,	/* TCPACKSkippedChallenge */
-	LINUX_MIB_TCPWINPROBE,			/* TCPWinProbe */
-	LINUX_MIB_TCPKEEPALIVE,			/* TCPKeepAlive */
-	LINUX_MIB_TCPMTUPFAIL,			/* TCPMTUPFail */
-	LINUX_MIB_TCPMTUPSUCCESS,		/* TCPMTUPSuccess */
-	__LINUX_MIB_MAX
-};
-
-/* linux Xfrm mib definitions */
-enum
-{
-	LINUX_MIB_XFRMNUM = 0,
-	LINUX_MIB_XFRMINERROR,			/* XfrmInError */
-	LINUX_MIB_XFRMINBUFFERERROR,		/* XfrmInBufferError */
-	LINUX_MIB_XFRMINHDRERROR,		/* XfrmInHdrError */
-	LINUX_MIB_XFRMINNOSTATES,		/* XfrmInNoStates */
-	LINUX_MIB_XFRMINSTATEPROTOERROR,	/* XfrmInStateProtoError */
-	LINUX_MIB_XFRMINSTATEMODEERROR,		/* XfrmInStateModeError */
-	LINUX_MIB_XFRMINSTATESEQERROR,		/* XfrmInStateSeqError */
-	LINUX_MIB_XFRMINSTATEEXPIRED,		/* XfrmInStateExpired */
-	LINUX_MIB_XFRMINSTATEMISMATCH,		/* XfrmInStateMismatch */
-	LINUX_MIB_XFRMINSTATEINVALID,		/* XfrmInStateInvalid */
-	LINUX_MIB_XFRMINTMPLMISMATCH,		/* XfrmInTmplMismatch */
-	LINUX_MIB_XFRMINNOPOLS,			/* XfrmInNoPols */
-	LINUX_MIB_XFRMINPOLBLOCK,		/* XfrmInPolBlock */
-	LINUX_MIB_XFRMINPOLERROR,		/* XfrmInPolError */
-	LINUX_MIB_XFRMOUTERROR,			/* XfrmOutError */
-	LINUX_MIB_XFRMOUTBUNDLEGENERROR,	/* XfrmOutBundleGenError */
-	LINUX_MIB_XFRMOUTBUNDLECHECKERROR,	/* XfrmOutBundleCheckError */
-	LINUX_MIB_XFRMOUTNOSTATES,		/* XfrmOutNoStates */
-	LINUX_MIB_XFRMOUTSTATEPROTOERROR,	/* XfrmOutStateProtoError */
-	LINUX_MIB_XFRMOUTSTATEMODEERROR,	/* XfrmOutStateModeError */
-	LINUX_MIB_XFRMOUTSTATESEQERROR,		/* XfrmOutStateSeqError */
-	LINUX_MIB_XFRMOUTSTATEEXPIRED,		/* XfrmOutStateExpired */
-	LINUX_MIB_XFRMOUTPOLBLOCK,		/* XfrmOutPolBlock */
-	LINUX_MIB_XFRMOUTPOLDEAD,		/* XfrmOutPolDead */
-	LINUX_MIB_XFRMOUTPOLERROR,		/* XfrmOutPolError */
-	LINUX_MIB_XFRMFWDHDRERROR,		/* XfrmFwdHdrError*/
-	LINUX_MIB_XFRMOUTSTATEINVALID,		/* XfrmOutStateInvalid */
-	LINUX_MIB_XFRMACQUIREERROR,		/* XfrmAcquireError */
-	__LINUX_MIB_XFRMMAX
-};
-
-#endif	/* _LINUX_SNMP_H */
diff --git a/openflow/usr/include/linux/sock_diag.h b/openflow/usr/include/linux/sock_diag.h
deleted file mode 100644
index 024e1f4..0000000
--- a/openflow/usr/include/linux/sock_diag.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __SOCK_DIAG_H__
-#define __SOCK_DIAG_H__
-
-#include <linux/types.h>
-
-#define SOCK_DIAG_BY_FAMILY 20
-
-struct sock_diag_req {
-	__u8	sdiag_family;
-	__u8	sdiag_protocol;
-};
-
-enum {
-	SK_MEMINFO_RMEM_ALLOC,
-	SK_MEMINFO_RCVBUF,
-	SK_MEMINFO_WMEM_ALLOC,
-	SK_MEMINFO_SNDBUF,
-	SK_MEMINFO_FWD_ALLOC,
-	SK_MEMINFO_WMEM_QUEUED,
-	SK_MEMINFO_OPTMEM,
-	SK_MEMINFO_BACKLOG,
-
-	SK_MEMINFO_VARS,
-};
-
-enum sknetlink_groups {
-	SKNLGRP_NONE,
-	SKNLGRP_INET_TCP_DESTROY,
-	SKNLGRP_INET_UDP_DESTROY,
-	SKNLGRP_INET6_TCP_DESTROY,
-	SKNLGRP_INET6_UDP_DESTROY,
-	__SKNLGRP_MAX,
-};
-#define SKNLGRP_MAX	(__SKNLGRP_MAX - 1)
-
-#endif /* __SOCK_DIAG_H__ */
diff --git a/openflow/usr/include/linux/socket.h b/openflow/usr/include/linux/socket.h
deleted file mode 100644
index 8c1e501..0000000
--- a/openflow/usr/include/linux/socket.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _LINUX_SOCKET_H
-#define _LINUX_SOCKET_H
-
-/*
- * Desired design of maximum size and alignment (see RFC2553)
- */
-#define _K_SS_MAXSIZE	128	/* Implementation specific max size */
-#define _K_SS_ALIGNSIZE	(__alignof__ (struct sockaddr *))
-				/* Implementation specific desired alignment */
-
-typedef unsigned short __kernel_sa_family_t;
-
-struct __kernel_sockaddr_storage {
-	__kernel_sa_family_t	ss_family;		/* address family */
-	/* Following field(s) are implementation specific */
-	char		__data[_K_SS_MAXSIZE - sizeof(unsigned short)];
-				/* space to achieve desired size, */
-				/* _SS_MAXSIZE value minus size of ss_family */
-} __attribute__ ((aligned(_K_SS_ALIGNSIZE)));	/* force desired alignment */
-
-#endif /* _LINUX_SOCKET_H */
diff --git a/openflow/usr/include/linux/sockios.h b/openflow/usr/include/linux/sockios.h
deleted file mode 100644
index e888b1a..0000000
--- a/openflow/usr/include/linux/sockios.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Definitions of the socket-level I/O control calls.
- *
- * Version:	@(#)sockios.h	1.0.2	03/09/93
- *
- * Authors:	Ross Biro
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_SOCKIOS_H
-#define _LINUX_SOCKIOS_H
-
-#include <asm/sockios.h>
-
-/* Linux-specific socket ioctls */
-#define SIOCINQ		FIONREAD
-#define SIOCOUTQ	TIOCOUTQ        /* output queue size (not sent + not acked) */
-
-/* Routing table calls. */
-#define SIOCADDRT	0x890B		/* add routing table entry	*/
-#define SIOCDELRT	0x890C		/* delete routing table entry	*/
-#define SIOCRTMSG	0x890D		/* call to routing system	*/
-
-/* Socket configuration controls. */
-#define SIOCGIFNAME	0x8910		/* get iface name		*/
-#define SIOCSIFLINK	0x8911		/* set iface channel		*/
-#define SIOCGIFCONF	0x8912		/* get iface list		*/
-#define SIOCGIFFLAGS	0x8913		/* get flags			*/
-#define SIOCSIFFLAGS	0x8914		/* set flags			*/
-#define SIOCGIFADDR	0x8915		/* get PA address		*/
-#define SIOCSIFADDR	0x8916		/* set PA address		*/
-#define SIOCGIFDSTADDR	0x8917		/* get remote PA address	*/
-#define SIOCSIFDSTADDR	0x8918		/* set remote PA address	*/
-#define SIOCGIFBRDADDR	0x8919		/* get broadcast PA address	*/
-#define SIOCSIFBRDADDR	0x891a		/* set broadcast PA address	*/
-#define SIOCGIFNETMASK	0x891b		/* get network PA mask		*/
-#define SIOCSIFNETMASK	0x891c		/* set network PA mask		*/
-#define SIOCGIFMETRIC	0x891d		/* get metric			*/
-#define SIOCSIFMETRIC	0x891e		/* set metric			*/
-#define SIOCGIFMEM	0x891f		/* get memory address (BSD)	*/
-#define SIOCSIFMEM	0x8920		/* set memory address (BSD)	*/
-#define SIOCGIFMTU	0x8921		/* get MTU size			*/
-#define SIOCSIFMTU	0x8922		/* set MTU size			*/
-#define SIOCSIFNAME	0x8923		/* set interface name */
-#define	SIOCSIFHWADDR	0x8924		/* set hardware address 	*/
-#define SIOCGIFENCAP	0x8925		/* get/set encapsulations       */
-#define SIOCSIFENCAP	0x8926		
-#define SIOCGIFHWADDR	0x8927		/* Get hardware address		*/
-#define SIOCGIFSLAVE	0x8929		/* Driver slaving support	*/
-#define SIOCSIFSLAVE	0x8930
-#define SIOCADDMULTI	0x8931		/* Multicast address lists	*/
-#define SIOCDELMULTI	0x8932
-#define SIOCGIFINDEX	0x8933		/* name -> if_index mapping	*/
-#define SIOGIFINDEX	SIOCGIFINDEX	/* misprint compatibility :-)	*/
-#define SIOCSIFPFLAGS	0x8934		/* set/get extended flags set	*/
-#define SIOCGIFPFLAGS	0x8935
-#define SIOCDIFADDR	0x8936		/* delete PA address		*/
-#define	SIOCSIFHWBROADCAST	0x8937	/* set hardware broadcast addr	*/
-#define SIOCGIFCOUNT	0x8938		/* get number of devices */
-
-#define SIOCGIFBR	0x8940		/* Bridging support		*/
-#define SIOCSIFBR	0x8941		/* Set bridging options 	*/
-
-#define SIOCGIFTXQLEN	0x8942		/* Get the tx queue length	*/
-#define SIOCSIFTXQLEN	0x8943		/* Set the tx queue length 	*/
-
-/* SIOCGIFDIVERT was:	0x8944		Frame diversion support */
-/* SIOCSIFDIVERT was:	0x8945		Set frame diversion options */
-
-#define SIOCETHTOOL	0x8946		/* Ethtool interface		*/
-
-#define SIOCGMIIPHY	0x8947		/* Get address of MII PHY in use. */
-#define SIOCGMIIREG	0x8948		/* Read MII PHY register.	*/
-#define SIOCSMIIREG	0x8949		/* Write MII PHY register.	*/
-
-#define SIOCWANDEV	0x894A		/* get/set netdev parameters	*/
-
-#define SIOCOUTQNSD	0x894B		/* output queue size (not sent only) */
-
-/* ARP cache control calls. */
-		    /*  0x8950 - 0x8952  * obsolete calls, don't re-use */
-#define SIOCDARP	0x8953		/* delete ARP table entry	*/
-#define SIOCGARP	0x8954		/* get ARP table entry		*/
-#define SIOCSARP	0x8955		/* set ARP table entry		*/
-
-/* RARP cache control calls. */
-#define SIOCDRARP	0x8960		/* delete RARP table entry	*/
-#define SIOCGRARP	0x8961		/* get RARP table entry		*/
-#define SIOCSRARP	0x8962		/* set RARP table entry		*/
-
-/* Driver configuration calls */
-
-#define SIOCGIFMAP	0x8970		/* Get device parameters	*/
-#define SIOCSIFMAP	0x8971		/* Set device parameters	*/
-
-/* DLCI configuration calls */
-
-#define SIOCADDDLCI	0x8980		/* Create new DLCI device	*/
-#define SIOCDELDLCI	0x8981		/* Delete DLCI device		*/
-
-#define SIOCGIFVLAN	0x8982		/* 802.1Q VLAN support		*/
-#define SIOCSIFVLAN	0x8983		/* Set 802.1Q VLAN options 	*/
-
-/* bonding calls */
-
-#define SIOCBONDENSLAVE	0x8990		/* enslave a device to the bond */
-#define SIOCBONDRELEASE 0x8991		/* release a slave from the bond*/
-#define SIOCBONDSETHWADDR      0x8992	/* set the hw addr of the bond  */
-#define SIOCBONDSLAVEINFOQUERY 0x8993   /* rtn info about slave state   */
-#define SIOCBONDINFOQUERY      0x8994	/* rtn info about bond state    */
-#define SIOCBONDCHANGEACTIVE   0x8995   /* update to a new active slave */
-			
-/* bridge calls */
-#define SIOCBRADDBR     0x89a0		/* create new bridge device     */
-#define SIOCBRDELBR     0x89a1		/* remove bridge device         */
-#define SIOCBRADDIF	0x89a2		/* add interface to bridge      */
-#define SIOCBRDELIF	0x89a3		/* remove interface from bridge */
-
-/* hardware time stamping: parameters in linux/net_tstamp.h */
-#define SIOCSHWTSTAMP	0x89b0		/* set and get config		*/
-#define SIOCGHWTSTAMP	0x89b1		/* get config			*/
-
-/* Device private ioctl calls */
-
-/*
- *	These 16 ioctls are available to devices via the do_ioctl() device
- *	vector. Each device should include this file and redefine these names
- *	as their own. Because these are device dependent it is a good idea
- *	_NOT_ to issue them to random objects and hope.
- *
- *	THESE IOCTLS ARE _DEPRECATED_ AND WILL DISAPPEAR IN 2.5.X -DaveM
- */
- 
-#define SIOCDEVPRIVATE	0x89F0	/* to 89FF */
-
-/*
- *	These 16 ioctl calls are protocol private
- */
- 
-#define SIOCPROTOPRIVATE 0x89E0 /* to 89EF */
-#endif	/* _LINUX_SOCKIOS_H */
diff --git a/openflow/usr/include/linux/sonet.h b/openflow/usr/include/linux/sonet.h
deleted file mode 100644
index 77c834a..0000000
--- a/openflow/usr/include/linux/sonet.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* sonet.h - SONET/SHD physical layer control */
- 
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
- 
-
-#ifndef LINUX_SONET_H
-#define LINUX_SONET_H
-
-#define __SONET_ITEMS \
-    __HANDLE_ITEM(section_bip); 	/* section parity errors (B1) */ \
-    __HANDLE_ITEM(line_bip);		/* line parity errors (B2) */ \
-    __HANDLE_ITEM(path_bip);		/* path parity errors (B3) */ \
-    __HANDLE_ITEM(line_febe);		/* line parity errors at remote */ \
-    __HANDLE_ITEM(path_febe);		/* path parity errors at remote */ \
-    __HANDLE_ITEM(corr_hcs);		/* correctable header errors */ \
-    __HANDLE_ITEM(uncorr_hcs);		/* uncorrectable header errors */ \
-    __HANDLE_ITEM(tx_cells);		/* cells sent */ \
-    __HANDLE_ITEM(rx_cells);		/* cells received */
-
-struct sonet_stats {
-#define __HANDLE_ITEM(i) int i
-	__SONET_ITEMS
-#undef __HANDLE_ITEM
-} __attribute__ ((packed));
-
-
-#define SONET_GETSTAT	_IOR('a',ATMIOC_PHYTYP,struct sonet_stats)
-					/* get statistics */
-#define SONET_GETSTATZ	_IOR('a',ATMIOC_PHYTYP+1,struct sonet_stats)
-					/* ... and zero counters */
-#define SONET_SETDIAG	_IOWR('a',ATMIOC_PHYTYP+2,int)
-					/* set error insertion */
-#define SONET_CLRDIAG	_IOWR('a',ATMIOC_PHYTYP+3,int)
-					/* clear error insertion */
-#define SONET_GETDIAG	_IOR('a',ATMIOC_PHYTYP+4,int)
-					/* query error insertion */
-#define SONET_SETFRAMING _IOW('a',ATMIOC_PHYTYP+5,int)
-					/* set framing mode (SONET/SDH) */
-#define SONET_GETFRAMING _IOR('a',ATMIOC_PHYTYP+6,int)
-					/* get framing mode */
-#define SONET_GETFRSENSE _IOR('a',ATMIOC_PHYTYP+7, \
-  unsigned char[SONET_FRSENSE_SIZE])	/* get framing sense information */
-
-#define SONET_INS_SBIP	  1		/* section BIP */
-#define SONET_INS_LBIP	  2		/* line BIP */
-#define SONET_INS_PBIP	  4		/* path BIP */
-#define SONET_INS_FRAME	  8		/* out of frame */
-#define SONET_INS_LOS	 16		/* set line to zero */
-#define SONET_INS_LAIS	 32		/* line alarm indication signal */
-#define SONET_INS_PAIS	 64		/* path alarm indication signal */
-#define SONET_INS_HCS	128		/* insert HCS error */
-
-#define SONET_FRAME_SONET 0		/* SONET STS-3 framing */
-#define SONET_FRAME_SDH   1		/* SDH STM-1 framing */
-
-#define SONET_FRSENSE_SIZE 6		/* C1[3],H1[3] (0xff for unknown) */
-
-
-
-#endif /* LINUX_SONET_H */
diff --git a/openflow/usr/include/linux/sonypi.h b/openflow/usr/include/linux/sonypi.h
deleted file mode 100644
index 1c0a25f..0000000
--- a/openflow/usr/include/linux/sonypi.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Sony Programmable I/O Control Device driver for VAIO
- *
- * Copyright (C) 2001-2005 Stelian Pop <stelian@popies.net>
- *
- * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
-
- * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
- *
- * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
- *
- * Copyright (C) 2001 Junichi Morita <jun1m@mars.dti.ne.jp>
- *
- * Copyright (C) 2000 Takaya Kinjo <t-kinjo@tc4.so-net.ne.jp>
- *
- * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
- *
- * Earlier work by Werner Almesberger, Paul `Rusty' Russell and Paul Mackerras.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef _SONYPI_H_
-#define _SONYPI_H_
-
-#include <linux/types.h>
-
-/* events the user application reading /dev/sonypi can use */
-
-#define SONYPI_EVENT_IGNORE			 0
-#define SONYPI_EVENT_JOGDIAL_DOWN		 1
-#define SONYPI_EVENT_JOGDIAL_UP			 2
-#define SONYPI_EVENT_JOGDIAL_DOWN_PRESSED	 3
-#define SONYPI_EVENT_JOGDIAL_UP_PRESSED		 4
-#define SONYPI_EVENT_JOGDIAL_PRESSED		 5
-#define SONYPI_EVENT_JOGDIAL_RELEASED		 6	/* obsolete */
-#define SONYPI_EVENT_CAPTURE_PRESSED		 7
-#define SONYPI_EVENT_CAPTURE_RELEASED		 8	/* obsolete */
-#define SONYPI_EVENT_CAPTURE_PARTIALPRESSED	 9
-#define SONYPI_EVENT_CAPTURE_PARTIALRELEASED	10
-#define SONYPI_EVENT_FNKEY_ESC			11
-#define SONYPI_EVENT_FNKEY_F1			12
-#define SONYPI_EVENT_FNKEY_F2			13
-#define SONYPI_EVENT_FNKEY_F3			14
-#define SONYPI_EVENT_FNKEY_F4			15
-#define SONYPI_EVENT_FNKEY_F5			16
-#define SONYPI_EVENT_FNKEY_F6			17
-#define SONYPI_EVENT_FNKEY_F7			18
-#define SONYPI_EVENT_FNKEY_F8			19
-#define SONYPI_EVENT_FNKEY_F9			20
-#define SONYPI_EVENT_FNKEY_F10			21
-#define SONYPI_EVENT_FNKEY_F11			22
-#define SONYPI_EVENT_FNKEY_F12			23
-#define SONYPI_EVENT_FNKEY_1			24
-#define SONYPI_EVENT_FNKEY_2			25
-#define SONYPI_EVENT_FNKEY_D			26
-#define SONYPI_EVENT_FNKEY_E			27
-#define SONYPI_EVENT_FNKEY_F			28
-#define SONYPI_EVENT_FNKEY_S			29
-#define SONYPI_EVENT_FNKEY_B			30
-#define SONYPI_EVENT_BLUETOOTH_PRESSED		31
-#define SONYPI_EVENT_PKEY_P1			32
-#define SONYPI_EVENT_PKEY_P2			33
-#define SONYPI_EVENT_PKEY_P3			34
-#define SONYPI_EVENT_BACK_PRESSED		35
-#define SONYPI_EVENT_LID_CLOSED			36
-#define SONYPI_EVENT_LID_OPENED			37
-#define SONYPI_EVENT_BLUETOOTH_ON		38
-#define SONYPI_EVENT_BLUETOOTH_OFF		39
-#define SONYPI_EVENT_HELP_PRESSED		40
-#define SONYPI_EVENT_FNKEY_ONLY			41
-#define SONYPI_EVENT_JOGDIAL_FAST_DOWN		42
-#define SONYPI_EVENT_JOGDIAL_FAST_UP		43
-#define SONYPI_EVENT_JOGDIAL_FAST_DOWN_PRESSED	44
-#define SONYPI_EVENT_JOGDIAL_FAST_UP_PRESSED	45
-#define SONYPI_EVENT_JOGDIAL_VFAST_DOWN		46
-#define SONYPI_EVENT_JOGDIAL_VFAST_UP		47
-#define SONYPI_EVENT_JOGDIAL_VFAST_DOWN_PRESSED	48
-#define SONYPI_EVENT_JOGDIAL_VFAST_UP_PRESSED	49
-#define SONYPI_EVENT_ZOOM_PRESSED		50
-#define SONYPI_EVENT_THUMBPHRASE_PRESSED	51
-#define SONYPI_EVENT_MEYE_FACE			52
-#define SONYPI_EVENT_MEYE_OPPOSITE		53
-#define SONYPI_EVENT_MEMORYSTICK_INSERT		54
-#define SONYPI_EVENT_MEMORYSTICK_EJECT		55
-#define SONYPI_EVENT_ANYBUTTON_RELEASED		56
-#define SONYPI_EVENT_BATTERY_INSERT		57
-#define SONYPI_EVENT_BATTERY_REMOVE		58
-#define SONYPI_EVENT_FNKEY_RELEASED		59
-#define SONYPI_EVENT_WIRELESS_ON		60
-#define SONYPI_EVENT_WIRELESS_OFF		61
-#define SONYPI_EVENT_ZOOM_IN_PRESSED		62
-#define SONYPI_EVENT_ZOOM_OUT_PRESSED		63
-#define SONYPI_EVENT_CD_EJECT_PRESSED		64
-#define SONYPI_EVENT_MODEKEY_PRESSED		65
-#define SONYPI_EVENT_PKEY_P4			66
-#define SONYPI_EVENT_PKEY_P5			67
-#define SONYPI_EVENT_SETTINGKEY_PRESSED		68
-#define SONYPI_EVENT_VOLUME_INC_PRESSED		69
-#define SONYPI_EVENT_VOLUME_DEC_PRESSED		70
-#define SONYPI_EVENT_BRIGHTNESS_PRESSED		71
-#define SONYPI_EVENT_MEDIA_PRESSED		72
-#define SONYPI_EVENT_VENDOR_PRESSED		73
-
-/* get/set brightness */
-#define SONYPI_IOCGBRT		_IOR('v', 0, __u8)
-#define SONYPI_IOCSBRT		_IOW('v', 0, __u8)
-
-/* get battery full capacity/remaining capacity */
-#define SONYPI_IOCGBAT1CAP	_IOR('v', 2, __u16)
-#define SONYPI_IOCGBAT1REM	_IOR('v', 3, __u16)
-#define SONYPI_IOCGBAT2CAP	_IOR('v', 4, __u16)
-#define SONYPI_IOCGBAT2REM	_IOR('v', 5, __u16)
-
-/* get battery flags: battery1/battery2/ac adapter present */
-#define SONYPI_BFLAGS_B1	0x01
-#define SONYPI_BFLAGS_B2	0x02
-#define SONYPI_BFLAGS_AC	0x04
-#define SONYPI_IOCGBATFLAGS	_IOR('v', 7, __u8)
-
-/* get/set bluetooth subsystem state on/off */
-#define SONYPI_IOCGBLUE		_IOR('v', 8, __u8)
-#define SONYPI_IOCSBLUE		_IOW('v', 9, __u8)
-
-/* get/set fan state on/off */
-#define SONYPI_IOCGFAN		_IOR('v', 10, __u8)
-#define SONYPI_IOCSFAN		_IOW('v', 11, __u8)
-
-/* get temperature (C) */
-#define SONYPI_IOCGTEMP		_IOR('v', 12, __u8)
-
-
-#endif /* _SONYPI_H_ */
diff --git a/openflow/usr/include/linux/sound.h b/openflow/usr/include/linux/sound.h
deleted file mode 100644
index a1d0682..0000000
--- a/openflow/usr/include/linux/sound.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _LINUX_SOUND_H
-#define _LINUX_SOUND_H
-
-/*
- * Minor numbers for the sound driver.
- */
-
-#include <linux/fs.h>
-
-#define SND_DEV_CTL		0	/* Control port /dev/mixer */
-#define SND_DEV_SEQ		1	/* Sequencer output /dev/sequencer (FM
-						synthesizer and MIDI output) */
-#define SND_DEV_MIDIN		2	/* Raw midi access */
-#define SND_DEV_DSP		3	/* Digitized voice /dev/dsp */
-#define SND_DEV_AUDIO		4	/* Sparc compatible /dev/audio */
-#define SND_DEV_DSP16		5	/* Like /dev/dsp but 16 bits/sample */
-/* #define SND_DEV_STATUS	6 */	/* /dev/sndstat (obsolete) */
-#define SND_DEV_UNUSED		6
-#define SND_DEV_AWFM		7	/* Reserved */
-#define SND_DEV_SEQ2		8	/* /dev/sequencer, level 2 interface */
-/* #define SND_DEV_SNDPROC	9 */	/* /dev/sndproc for programmable devices (not used) */
-/* #define SND_DEV_DMMIDI	9 */
-#define SND_DEV_SYNTH		9	/* Raw synth access /dev/synth (same as /dev/dmfm) */
-#define SND_DEV_DMFM		10	/* Raw synth access /dev/dmfm */
-#define SND_DEV_UNKNOWN11	11
-#define SND_DEV_ADSP		12	/* Like /dev/dsp (obsolete) */
-#define SND_DEV_AMIDI		13	/* Like /dev/midi (obsolete) */
-#define SND_DEV_ADMMIDI		14	/* Like /dev/dmmidi (onsolete) */
-
-
-#endif /* _LINUX_SOUND_H */
diff --git a/openflow/usr/include/linux/soundcard.h b/openflow/usr/include/linux/soundcard.h
deleted file mode 100644
index c5abf86..0000000
--- a/openflow/usr/include/linux/soundcard.h
+++ /dev/null
@@ -1,1276 +0,0 @@
-/*
- * Copyright by Hannu Savolainen 1993-1997
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef SOUNDCARD_H
-#define SOUNDCARD_H
-
-
-/*
- * OSS interface version. With versions earlier than 3.6 this value is
- * an integer with value less than 361. In versions 3.6 and later
- * it's a six digit hexadecimal value. For example value
- * of 0x030600 represents OSS version 3.6.0.
- * Use ioctl(fd, OSS_GETVERSION, &int) to get the version number of
- * the currently active driver.
- */
-#define SOUND_VERSION	0x030802
-#define OPEN_SOUND_SYSTEM
-
-/* In Linux we need to be prepared for cross compiling */
-#include <linux/ioctl.h>
-
-/* Endian macros. */
-#  include <endian.h>
-
-/*
- *	Supported card ID numbers (Should be somewhere else?)
- */
-
-#define SNDCARD_ADLIB		1
-#define SNDCARD_SB		2
-#define SNDCARD_PAS		3
-#define SNDCARD_GUS		4
-#define SNDCARD_MPU401		5
-#define SNDCARD_SB16		6
-#define SNDCARD_SB16MIDI	7
-#define SNDCARD_UART6850	8
-#define SNDCARD_GUS16		9
-#define SNDCARD_MSS		10
-#define SNDCARD_PSS     	11
-#define SNDCARD_SSCAPE		12
-#define SNDCARD_PSS_MPU     	13
-#define SNDCARD_PSS_MSS     	14
-#define SNDCARD_SSCAPE_MSS	15
-#define SNDCARD_TRXPRO		16
-#define SNDCARD_TRXPRO_SB	17
-#define SNDCARD_TRXPRO_MPU	18
-#define SNDCARD_MAD16		19
-#define SNDCARD_MAD16_MPU	20
-#define SNDCARD_CS4232		21
-#define SNDCARD_CS4232_MPU	22
-#define SNDCARD_MAUI		23
-#define SNDCARD_PSEUDO_MSS	24
-#define SNDCARD_GUSPNP		25
-#define SNDCARD_UART401		26
-/* Sound card numbers 27 to N are reserved. Don't add more numbers here. */
-
-/***********************************
- * IOCTL Commands for /dev/sequencer
- */
-
-#ifndef _SIOWR
-#if defined(_IOWR) && (defined(_AIX) || (!defined(sun) && !defined(sparc) && !defined(__sparc__) && !defined(__INCioctlh) && !defined(__Lynx__)))
-/* Use already defined ioctl defines if they exist (except with Sun or Sparc) */
-#define	SIOCPARM_MASK	IOCPARM_MASK
-#define	SIOC_VOID	IOC_VOID
-#define	SIOC_OUT	IOC_OUT
-#define	SIOC_IN		IOC_IN
-#define	SIOC_INOUT	IOC_INOUT
-#define _SIOC_SIZE	_IOC_SIZE
-#define _SIOC_DIR	_IOC_DIR
-#define _SIOC_NONE	_IOC_NONE
-#define _SIOC_READ	_IOC_READ
-#define _SIOC_WRITE	_IOC_WRITE
-#define	_SIO		_IO
-#define	_SIOR		_IOR
-#define	_SIOW		_IOW
-#define	_SIOWR		_IOWR
-#else
-
-/* Ioctl's have the command encoded in the lower word,
- * and the size of any in or out parameters in the upper
- * word.  The high 2 bits of the upper word are used
- * to encode the in/out status of the parameter; for now
- * we restrict parameters to at most 8191 bytes.
- */
-/* #define	SIOCTYPE		(0xff<<8) */
-#define	SIOCPARM_MASK	0x1fff		/* parameters must be < 8192 bytes */
-#define	SIOC_VOID	0x00000000	/* no parameters */
-#define	SIOC_OUT	0x20000000	/* copy out parameters */
-#define	SIOC_IN		0x40000000	/* copy in parameters */
-#define	SIOC_INOUT	(SIOC_IN|SIOC_OUT)
-/* the 0x20000000 is so we can distinguish new ioctl's from old */
-#define	_SIO(x,y)	((int)(SIOC_VOID|(x<<8)|y))
-#define	_SIOR(x,y,t)	((int)(SIOC_OUT|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
-#define	_SIOW(x,y,t)	((int)(SIOC_IN|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
-/* this should be _SIORW, but stdio got there first */
-#define	_SIOWR(x,y,t)	((int)(SIOC_INOUT|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
-#define _SIOC_SIZE(x)	((x>>16)&SIOCPARM_MASK)	
-#define _SIOC_DIR(x)	(x & 0xf0000000)
-#define _SIOC_NONE	SIOC_VOID
-#define _SIOC_READ	SIOC_OUT
-#define _SIOC_WRITE	SIOC_IN
-#  endif /* _IOWR */
-#endif  /* !_SIOWR */
-
-#define SNDCTL_SEQ_RESET		_SIO  ('Q', 0)
-#define SNDCTL_SEQ_SYNC			_SIO  ('Q', 1)
-#define SNDCTL_SYNTH_INFO		_SIOWR('Q', 2, struct synth_info)
-#define SNDCTL_SEQ_CTRLRATE		_SIOWR('Q', 3, int)	/* Set/get timer resolution (HZ) */
-#define SNDCTL_SEQ_GETOUTCOUNT		_SIOR ('Q', 4, int)
-#define SNDCTL_SEQ_GETINCOUNT		_SIOR ('Q', 5, int)
-#define SNDCTL_SEQ_PERCMODE		_SIOW ('Q', 6, int)
-#define SNDCTL_FM_LOAD_INSTR		_SIOW ('Q', 7, struct sbi_instrument)	/* Obsolete. Don't use!!!!!! */
-#define SNDCTL_SEQ_TESTMIDI		_SIOW ('Q', 8, int)
-#define SNDCTL_SEQ_RESETSAMPLES		_SIOW ('Q', 9, int)
-#define SNDCTL_SEQ_NRSYNTHS		_SIOR ('Q',10, int)
-#define SNDCTL_SEQ_NRMIDIS		_SIOR ('Q',11, int)
-#define SNDCTL_MIDI_INFO		_SIOWR('Q',12, struct midi_info)
-#define SNDCTL_SEQ_THRESHOLD		_SIOW ('Q',13, int)
-#define SNDCTL_SYNTH_MEMAVL		_SIOWR('Q',14, int)	/* in=dev#, out=memsize */
-#define SNDCTL_FM_4OP_ENABLE		_SIOW ('Q',15, int)	/* in=dev# */
-#define SNDCTL_SEQ_PANIC		_SIO  ('Q',17)
-#define SNDCTL_SEQ_OUTOFBAND		_SIOW ('Q',18, struct seq_event_rec)
-#define SNDCTL_SEQ_GETTIME		_SIOR ('Q',19, int)
-#define SNDCTL_SYNTH_ID			_SIOWR('Q',20, struct synth_info)
-#define SNDCTL_SYNTH_CONTROL		_SIOWR('Q',21, struct synth_control)
-#define SNDCTL_SYNTH_REMOVESAMPLE	_SIOWR('Q',22, struct remove_sample)
-
-typedef struct synth_control
-{
-	int devno;	/* Synthesizer # */
-	char data[4000]; /* Device spesific command/data record */
-}synth_control;
-
-typedef struct remove_sample
-{
-	int devno;	/* Synthesizer # */
-	int bankno;	/* MIDI bank # (0=General MIDI) */
-	int instrno;	/* MIDI instrument number */
-} remove_sample;
-
-typedef struct seq_event_rec {
-		unsigned char arr[8];
-} seq_event_rec;
-
-#define SNDCTL_TMR_TIMEBASE		_SIOWR('T', 1, int)
-#define SNDCTL_TMR_START		_SIO  ('T', 2)
-#define SNDCTL_TMR_STOP			_SIO  ('T', 3)
-#define SNDCTL_TMR_CONTINUE		_SIO  ('T', 4)
-#define SNDCTL_TMR_TEMPO		_SIOWR('T', 5, int)
-#define SNDCTL_TMR_SOURCE		_SIOWR('T', 6, int)
-#	define TMR_INTERNAL		0x00000001
-#	define TMR_EXTERNAL		0x00000002
-#		define TMR_MODE_MIDI	0x00000010
-#		define TMR_MODE_FSK	0x00000020
-#		define TMR_MODE_CLS	0x00000040
-#		define TMR_MODE_SMPTE	0x00000080
-#define SNDCTL_TMR_METRONOME		_SIOW ('T', 7, int)
-#define SNDCTL_TMR_SELECT		_SIOW ('T', 8, int)
-
-/*
- * Some big endian/little endian handling macros
- */
-
-#define _LINUX_PATCHKEY_H_INDIRECT
-#include <linux/patchkey.h>
-#undef _LINUX_PATCHKEY_H_INDIRECT
-
-# if defined(__BYTE_ORDER)
-#  if __BYTE_ORDER == __BIG_ENDIAN
-#    define AFMT_S16_NE AFMT_S16_BE
-#  elif __BYTE_ORDER == __LITTLE_ENDIAN
-#    define AFMT_S16_NE AFMT_S16_LE
-#  else
-#    error "could not determine byte order"
-#  endif
-# endif
-
-/*
- *	Sample loading mechanism for internal synthesizers (/dev/sequencer)
- *	The following patch_info structure has been designed to support
- *	Gravis UltraSound. It tries to be universal format for uploading
- *	sample based patches but is probably too limited.
- *
- *      (PBD) As Hannu guessed, the GUS structure is too limited for 
- *      the WaveFront, but this is the right place for a constant definition.
- */
-
-struct patch_info {
-		unsigned short key;		/* Use WAVE_PATCH here */
-#define WAVE_PATCH	   _PATCHKEY(0x04)
-#define GUS_PATCH	   WAVE_PATCH
-#define WAVEFRONT_PATCH    _PATCHKEY(0x06)
-
-		short device_no;	/* Synthesizer number */
-		short instr_no;		/* Midi pgm# */
-
-		unsigned int mode;
-/*
- * The least significant byte has the same format than the GUS .PAT
- * files
- */
-#define WAVE_16_BITS	0x01	/* bit 0 = 8 or 16 bit wave data. */
-#define WAVE_UNSIGNED	0x02	/* bit 1 = Signed - Unsigned data. */
-#define WAVE_LOOPING	0x04	/* bit 2 = looping enabled-1. */
-#define WAVE_BIDIR_LOOP	0x08	/* bit 3 = Set is bidirectional looping. */
-#define WAVE_LOOP_BACK	0x10	/* bit 4 = Set is looping backward. */
-#define WAVE_SUSTAIN_ON	0x20	/* bit 5 = Turn sustaining on. (Env. pts. 3)*/
-#define WAVE_ENVELOPES	0x40	/* bit 6 = Enable envelopes - 1 */
-#define WAVE_FAST_RELEASE 0x80	/* bit 7 = Shut off immediately after note off */
-				/* 	(use the env_rate/env_offs fields). */
-/* Linux specific bits */
-#define WAVE_VIBRATO	0x00010000	/* The vibrato info is valid */
-#define WAVE_TREMOLO	0x00020000	/* The tremolo info is valid */
-#define WAVE_SCALE	0x00040000	/* The scaling info is valid */
-#define WAVE_FRACTIONS	0x00080000	/* Fraction information is valid */
-/* Reserved bits */
-#define WAVE_ROM	0x40000000	/* For future use */
-#define WAVE_MULAW	0x20000000	/* For future use */
-/* Other bits must be zeroed */
-
-		int len;	/* Size of the wave data in bytes */
-		int loop_start, loop_end; /* Byte offsets from the beginning */
-
-/* 
- * The base_freq and base_note fields are used when computing the
- * playback speed for a note. The base_note defines the tone frequency
- * which is heard if the sample is played using the base_freq as the
- * playback speed.
- *
- * The low_note and high_note fields define the minimum and maximum note
- * frequencies for which this sample is valid. It is possible to define
- * more than one samples for an instrument number at the same time. The
- * low_note and high_note fields are used to select the most suitable one.
- *
- * The fields base_note, high_note and low_note should contain
- * the note frequency multiplied by 1000. For example value for the
- * middle A is 440*1000.
- */
-
-		unsigned int base_freq;
-		unsigned int base_note;
-		unsigned int high_note;
-		unsigned int low_note;
-		int panning;	/* -128=left, 127=right */
-		int detuning;
-
-/*	New fields introduced in version 1.99.5	*/
-
-       /* Envelope. Enabled by mode bit WAVE_ENVELOPES	*/
-		unsigned char	env_rate[ 6 ];	 /* GUS HW ramping rate */
-		unsigned char	env_offset[ 6 ]; /* 255 == 100% */
-
-	/* 
-	 * The tremolo, vibrato and scale info are not supported yet.
-	 * Enable by setting the mode bits WAVE_TREMOLO, WAVE_VIBRATO or
-	 * WAVE_SCALE
-	 */
-
-		unsigned char	tremolo_sweep;
-		unsigned char	tremolo_rate;
-		unsigned char	tremolo_depth;
-	
-		unsigned char	vibrato_sweep;
-		unsigned char	vibrato_rate;
-		unsigned char	vibrato_depth;
-
-		int		scale_frequency;
-		unsigned int	scale_factor;		/* from 0 to 2048 or 0 to 2 */
-	
-	        int		volume;
-		int		fractions;
-		int		reserved1;
-	        int		spare[2];
-		char data[1];	/* The waveform data starts here */
-	};
-
-struct sysex_info {
-		short key;		/* Use SYSEX_PATCH or MAUI_PATCH here */
-#define SYSEX_PATCH	_PATCHKEY(0x05)
-#define MAUI_PATCH	_PATCHKEY(0x06)
-		short device_no;	/* Synthesizer number */
-		int len;	/* Size of the sysex data in bytes */
-		unsigned char data[1];	/* Sysex data starts here */
-	};
-
-/*
- * /dev/sequencer input events.
- *
- * The data written to the /dev/sequencer is a stream of events. Events
- * are records of 4 or 8 bytes. The first byte defines the size. 
- * Any number of events can be written with a write call. There
- * is a set of macros for sending these events. Use these macros if you
- * want to maximize portability of your program.
- *
- * Events SEQ_WAIT, SEQ_MIDIPUTC and SEQ_ECHO. Are also input events.
- * (All input events are currently 4 bytes long. Be prepared to support
- * 8 byte events also. If you receive any event having first byte >= 128,
- * it's a 8 byte event.
- *
- * The events are documented at the end of this file.
- *
- * Normal events (4 bytes)
- * There is also a 8 byte version of most of the 4 byte events. The
- * 8 byte one is recommended.
- */
-#define SEQ_NOTEOFF		0
-#define SEQ_FMNOTEOFF		SEQ_NOTEOFF	/* Just old name */
-#define SEQ_NOTEON		1
-#define	SEQ_FMNOTEON		SEQ_NOTEON
-#define SEQ_WAIT		TMR_WAIT_ABS
-#define SEQ_PGMCHANGE		3
-#define SEQ_FMPGMCHANGE		SEQ_PGMCHANGE
-#define SEQ_SYNCTIMER		TMR_START
-#define SEQ_MIDIPUTC		5
-#define SEQ_DRUMON		6	/*** OBSOLETE ***/
-#define SEQ_DRUMOFF		7	/*** OBSOLETE ***/
-#define SEQ_ECHO		TMR_ECHO	/* For synching programs with output */
-#define SEQ_AFTERTOUCH		9
-#define SEQ_CONTROLLER		10
-
-/*******************************************
- *	Midi controller numbers
- *******************************************
- * Controllers 0 to 31 (0x00 to 0x1f) and
- * 32 to 63 (0x20 to 0x3f) are continuous
- * controllers.
- * In the MIDI 1.0 these controllers are sent using
- * two messages. Controller numbers 0 to 31 are used
- * to send the MSB and the controller numbers 32 to 63
- * are for the LSB. Note that just 7 bits are used in MIDI bytes.
- */
-
-#define	   CTL_BANK_SELECT		0x00
-#define	   CTL_MODWHEEL			0x01
-#define    CTL_BREATH			0x02
-/*		undefined		0x03 */
-#define    CTL_FOOT			0x04
-#define    CTL_PORTAMENTO_TIME		0x05
-#define    CTL_DATA_ENTRY		0x06
-#define    CTL_MAIN_VOLUME		0x07
-#define    CTL_BALANCE			0x08
-/*		undefined		0x09 */
-#define    CTL_PAN			0x0a
-#define    CTL_EXPRESSION		0x0b
-/*		undefined		0x0c */
-/*		undefined		0x0d */
-/*		undefined		0x0e */
-/*		undefined		0x0f */
-#define    CTL_GENERAL_PURPOSE1	0x10
-#define    CTL_GENERAL_PURPOSE2	0x11
-#define    CTL_GENERAL_PURPOSE3	0x12
-#define    CTL_GENERAL_PURPOSE4	0x13
-/*		undefined		0x14 - 0x1f */
-
-/*		undefined		0x20 */
-/* The controller numbers 0x21 to 0x3f are reserved for the */
-/* least significant bytes of the controllers 0x00 to 0x1f. */
-/* These controllers are not recognised by the driver. */
-
-/* Controllers 64 to 69 (0x40 to 0x45) are on/off switches. */
-/* 0=OFF and 127=ON (intermediate values are possible) */
-#define    CTL_DAMPER_PEDAL		0x40
-#define    CTL_SUSTAIN			0x40	/* Alias */
-#define    CTL_HOLD			0x40	/* Alias */
-#define    CTL_PORTAMENTO		0x41
-#define    CTL_SOSTENUTO		0x42
-#define    CTL_SOFT_PEDAL		0x43
-/*		undefined		0x44 */
-#define    CTL_HOLD2			0x45
-/*		undefined		0x46 - 0x4f */
-
-#define    CTL_GENERAL_PURPOSE5	0x50
-#define    CTL_GENERAL_PURPOSE6	0x51
-#define    CTL_GENERAL_PURPOSE7	0x52
-#define    CTL_GENERAL_PURPOSE8	0x53
-/*		undefined		0x54 - 0x5a */
-#define    CTL_EXT_EFF_DEPTH		0x5b
-#define    CTL_TREMOLO_DEPTH		0x5c
-#define    CTL_CHORUS_DEPTH		0x5d
-#define    CTL_DETUNE_DEPTH		0x5e
-#define    CTL_CELESTE_DEPTH		0x5e	/* Alias for the above one */
-#define    CTL_PHASER_DEPTH		0x5f
-#define    CTL_DATA_INCREMENT		0x60
-#define    CTL_DATA_DECREMENT		0x61
-#define    CTL_NONREG_PARM_NUM_LSB	0x62
-#define    CTL_NONREG_PARM_NUM_MSB	0x63
-#define    CTL_REGIST_PARM_NUM_LSB	0x64
-#define    CTL_REGIST_PARM_NUM_MSB	0x65
-/*		undefined		0x66 - 0x78 */
-/*		reserved		0x79 - 0x7f */
-
-/* Pseudo controllers (not midi compatible) */
-#define    CTRL_PITCH_BENDER		255
-#define    CTRL_PITCH_BENDER_RANGE	254
-#define    CTRL_EXPRESSION		253	/* Obsolete */
-#define    CTRL_MAIN_VOLUME		252	/* Obsolete */
-#define SEQ_BALANCE		11
-#define SEQ_VOLMODE             12
-
-/*
- * Volume mode decides how volumes are used
- */
-
-#define VOL_METHOD_ADAGIO	1
-#define VOL_METHOD_LINEAR	2
-
-/*
- * Note! SEQ_WAIT, SEQ_MIDIPUTC and SEQ_ECHO are used also as
- *	 input events.
- */
-
-/*
- * Event codes 0xf0 to 0xfc are reserved for future extensions.
- */
-
-#define SEQ_FULLSIZE		0xfd	/* Long events */
-/*
- *	SEQ_FULLSIZE events are used for loading patches/samples to the
- *	synthesizer devices. These events are passed directly to the driver
- *	of the associated synthesizer device. There is no limit to the size
- *	of the extended events. These events are not queued but executed
- *	immediately when the write() is called (execution can take several
- *	seconds of time). 
- *
- *	When a SEQ_FULLSIZE message is written to the device, it must
- *	be written using exactly one write() call. Other events cannot
- *	be mixed to the same write.
- *	
- *	For FM synths (YM3812/OPL3) use struct sbi_instrument and write it to the 
- *	/dev/sequencer. Don't write other data together with the instrument structure
- *	Set the key field of the structure to FM_PATCH. The device field is used to
- *	route the patch to the corresponding device.
- *
- *	For wave table use struct patch_info. Initialize the key field
- *      to WAVE_PATCH.
- */
-#define SEQ_PRIVATE		0xfe	/* Low level HW dependent events (8 bytes) */
-#define SEQ_EXTENDED		0xff	/* Extended events (8 bytes) OBSOLETE */
-
-/*
- * Record for FM patches
- */
-
-typedef unsigned char sbi_instr_data[32];
-
-struct sbi_instrument {
-		unsigned short	key;	/* FM_PATCH or OPL3_PATCH */
-#define FM_PATCH	_PATCHKEY(0x01)
-#define OPL3_PATCH	_PATCHKEY(0x03)
-		short		device;		/*	Synth# (0-4)	*/
-		int 		channel;	/*	Program# to be initialized 	*/
-		sbi_instr_data	operators;	/*	Register settings for operator cells (.SBI format)	*/
-	};
-
-struct synth_info {	/* Read only */
-		char	name[30];
-		int	device;		/* 0-N. INITIALIZE BEFORE CALLING */
-		int	synth_type;
-#define SYNTH_TYPE_FM			0
-#define SYNTH_TYPE_SAMPLE		1
-#define SYNTH_TYPE_MIDI			2	/* Midi interface */
-
-		int	synth_subtype;
-#define FM_TYPE_ADLIB			0x00
-#define FM_TYPE_OPL3			0x01
-#define MIDI_TYPE_MPU401		0x401
-
-#define SAMPLE_TYPE_BASIC		0x10
-#define SAMPLE_TYPE_GUS			SAMPLE_TYPE_BASIC
-#define SAMPLE_TYPE_WAVEFRONT           0x11
-
-		int	perc_mode;	/* No longer supported */
-		int	nr_voices;
-		int	nr_drums;	/* Obsolete field */
-		int	instr_bank_size;
-		unsigned int	capabilities;	
-#define SYNTH_CAP_PERCMODE		0x00000001 /* No longer used */
-#define SYNTH_CAP_OPL3			0x00000002 /* Set if OPL3 supported */
-#define SYNTH_CAP_INPUT			0x00000004 /* Input (MIDI) device */
-		int	dummies[19];	/* Reserve space */
-	};
-
-struct sound_timer_info {
-		char name[32];
-		int caps;
-	};
-
-#define MIDI_CAP_MPU401		1		/* MPU-401 intelligent mode */
-
-struct midi_info {
-		char		name[30];
-		int		device;		/* 0-N. INITIALIZE BEFORE CALLING */
-		unsigned int	capabilities;	/* To be defined later */
-		int		dev_type;
-		int		dummies[18];	/* Reserve space */
-	};
-
-/********************************************
- * ioctl commands for the /dev/midi##
- */
-typedef struct {
-		unsigned char cmd;
-		char nr_args, nr_returns;
-		unsigned char data[30];
-	} mpu_command_rec;
-
-#define SNDCTL_MIDI_PRETIME		_SIOWR('m', 0, int)
-#define SNDCTL_MIDI_MPUMODE		_SIOWR('m', 1, int)
-#define SNDCTL_MIDI_MPUCMD		_SIOWR('m', 2, mpu_command_rec)
-
-/********************************************
- * IOCTL commands for /dev/dsp and /dev/audio
- */
-
-#define SNDCTL_DSP_RESET		_SIO  ('P', 0)
-#define SNDCTL_DSP_SYNC			_SIO  ('P', 1)
-#define SNDCTL_DSP_SPEED		_SIOWR('P', 2, int)
-#define SNDCTL_DSP_STEREO		_SIOWR('P', 3, int)
-#define SNDCTL_DSP_GETBLKSIZE		_SIOWR('P', 4, int)
-#define SNDCTL_DSP_SAMPLESIZE		SNDCTL_DSP_SETFMT
-#define SNDCTL_DSP_CHANNELS		_SIOWR('P', 6, int)
-#define SOUND_PCM_WRITE_CHANNELS	SNDCTL_DSP_CHANNELS
-#define SOUND_PCM_WRITE_FILTER		_SIOWR('P', 7, int)
-#define SNDCTL_DSP_POST			_SIO  ('P', 8)
-#define SNDCTL_DSP_SUBDIVIDE		_SIOWR('P', 9, int)
-#define SNDCTL_DSP_SETFRAGMENT		_SIOWR('P',10, int)
-
-/*	Audio data formats (Note! U8=8 and S16_LE=16 for compatibility) */
-#define SNDCTL_DSP_GETFMTS		_SIOR ('P',11, int) /* Returns a mask */
-#define SNDCTL_DSP_SETFMT		_SIOWR('P',5, int) /* Selects ONE fmt*/
-#	define AFMT_QUERY		0x00000000	/* Return current fmt */
-#	define AFMT_MU_LAW		0x00000001
-#	define AFMT_A_LAW		0x00000002
-#	define AFMT_IMA_ADPCM		0x00000004
-#	define AFMT_U8			0x00000008
-#	define AFMT_S16_LE		0x00000010	/* Little endian signed 16*/
-#	define AFMT_S16_BE		0x00000020	/* Big endian signed 16 */
-#	define AFMT_S8			0x00000040
-#	define AFMT_U16_LE		0x00000080	/* Little endian U16 */
-#	define AFMT_U16_BE		0x00000100	/* Big endian U16 */
-#	define AFMT_MPEG		0x00000200	/* MPEG (2) audio */
-#	define AFMT_AC3		0x00000400	/* Dolby Digital AC3 */
-
-/*
- * Buffer status queries.
- */
-typedef struct audio_buf_info {
-			int fragments;	/* # of available fragments (partially usend ones not counted) */
-			int fragstotal;	/* Total # of fragments allocated */
-			int fragsize;	/* Size of a fragment in bytes */
-
-			int bytes;	/* Available space in bytes (includes partially used fragments) */
-			/* Note! 'bytes' could be more than fragments*fragsize */
-		} audio_buf_info;
-
-#define SNDCTL_DSP_GETOSPACE		_SIOR ('P',12, audio_buf_info)
-#define SNDCTL_DSP_GETISPACE		_SIOR ('P',13, audio_buf_info)
-#define SNDCTL_DSP_NONBLOCK		_SIO  ('P',14)
-#define SNDCTL_DSP_GETCAPS		_SIOR ('P',15, int)
-#	define DSP_CAP_REVISION		0x000000ff	/* Bits for revision level (0 to 255) */
-#	define DSP_CAP_DUPLEX		0x00000100	/* Full duplex record/playback */
-#	define DSP_CAP_REALTIME		0x00000200	/* Real time capability */
-#	define DSP_CAP_BATCH		0x00000400	/* Device has some kind of */
-							/* internal buffers which may */
-							/* cause some delays and */
-							/* decrease precision of timing */
-#	define DSP_CAP_COPROC		0x00000800	/* Has a coprocessor */
-							/* Sometimes it's a DSP */
-							/* but usually not */
-#	define DSP_CAP_TRIGGER		0x00001000	/* Supports SETTRIGGER */
-#	define DSP_CAP_MMAP		0x00002000	/* Supports mmap() */
-#	define DSP_CAP_MULTI		0x00004000	/* support multiple open */
-#	define DSP_CAP_BIND		0x00008000	/* channel binding to front/rear/cneter/lfe */
-
-
-#define SNDCTL_DSP_GETTRIGGER		_SIOR ('P',16, int)
-#define SNDCTL_DSP_SETTRIGGER		_SIOW ('P',16, int)
-#	define PCM_ENABLE_INPUT		0x00000001
-#	define PCM_ENABLE_OUTPUT		0x00000002
-
-typedef struct count_info {
-		int bytes;	/* Total # of bytes processed */
-		int blocks;	/* # of fragment transitions since last time */
-		int ptr;	/* Current DMA pointer value */
-	} count_info;
-
-#define SNDCTL_DSP_GETIPTR		_SIOR ('P',17, count_info)
-#define SNDCTL_DSP_GETOPTR		_SIOR ('P',18, count_info)
-
-typedef struct buffmem_desc {
-		unsigned *buffer;
-		int size;
-	} buffmem_desc;
-#define SNDCTL_DSP_MAPINBUF		_SIOR ('P', 19, buffmem_desc)
-#define SNDCTL_DSP_MAPOUTBUF		_SIOR ('P', 20, buffmem_desc)
-#define SNDCTL_DSP_SETSYNCRO		_SIO  ('P', 21)
-#define SNDCTL_DSP_SETDUPLEX		_SIO  ('P', 22)
-#define SNDCTL_DSP_GETODELAY		_SIOR ('P', 23, int)
-
-#define SNDCTL_DSP_GETCHANNELMASK		_SIOWR('P', 64, int)
-#define SNDCTL_DSP_BIND_CHANNEL		_SIOWR('P', 65, int)
-#	define DSP_BIND_QUERY		0x00000000
-#	define DSP_BIND_FRONT		0x00000001
-#	define DSP_BIND_SURR		0x00000002
-#	define DSP_BIND_CENTER_LFE	0x00000004
-#	define DSP_BIND_HANDSET		0x00000008
-#	define DSP_BIND_MIC		0x00000010
-#	define DSP_BIND_MODEM1		0x00000020
-#	define DSP_BIND_MODEM2		0x00000040
-#	define DSP_BIND_I2S		0x00000080
-#	define DSP_BIND_SPDIF		0x00000100
-
-#define SNDCTL_DSP_SETSPDIF		_SIOW ('P', 66, int)
-#define SNDCTL_DSP_GETSPDIF		_SIOR ('P', 67, int)
-#	define SPDIF_PRO	0x0001
-#	define SPDIF_N_AUD	0x0002
-#	define SPDIF_COPY	0x0004
-#	define SPDIF_PRE	0x0008
-#	define SPDIF_CC		0x07f0
-#	define SPDIF_L		0x0800
-#	define SPDIF_DRS	0x4000
-#	define SPDIF_V		0x8000
-
-/*
- * Application's profile defines the way how playback underrun situations should be handled.
- * 
- *	APF_NORMAL (the default) and APF_NETWORK make the driver to cleanup the
- *	playback buffer whenever an underrun occurs. This consumes some time
- *	prevents looping the existing buffer.
- *	APF_CPUINTENS is intended to be set by CPU intensive applications which
- *	are likely to run out of time occasionally. In this mode the buffer cleanup is
- *	disabled which saves CPU time but also let's the previous buffer content to
- *	be played during the "pause" after the underrun.
- */
-#define SNDCTL_DSP_PROFILE		_SIOW ('P', 23, int)
-#define	  APF_NORMAL	0	/* Normal applications */
-#define	  APF_NETWORK	1	/* Underruns probably caused by an "external" delay */
-#define   APF_CPUINTENS 2	/* Underruns probably caused by "overheating" the CPU */
-
-#define SOUND_PCM_READ_RATE		_SIOR ('P', 2, int)
-#define SOUND_PCM_READ_CHANNELS		_SIOR ('P', 6, int)
-#define SOUND_PCM_READ_BITS		_SIOR ('P', 5, int)
-#define SOUND_PCM_READ_FILTER		_SIOR ('P', 7, int)
-
-/* Some alias names */
-#define SOUND_PCM_WRITE_BITS		SNDCTL_DSP_SETFMT
-#define SOUND_PCM_WRITE_RATE		SNDCTL_DSP_SPEED
-#define SOUND_PCM_POST			SNDCTL_DSP_POST
-#define SOUND_PCM_RESET			SNDCTL_DSP_RESET
-#define SOUND_PCM_SYNC			SNDCTL_DSP_SYNC
-#define SOUND_PCM_SUBDIVIDE		SNDCTL_DSP_SUBDIVIDE
-#define SOUND_PCM_SETFRAGMENT		SNDCTL_DSP_SETFRAGMENT
-#define SOUND_PCM_GETFMTS		SNDCTL_DSP_GETFMTS
-#define SOUND_PCM_SETFMT		SNDCTL_DSP_SETFMT
-#define SOUND_PCM_GETOSPACE		SNDCTL_DSP_GETOSPACE
-#define SOUND_PCM_GETISPACE		SNDCTL_DSP_GETISPACE
-#define SOUND_PCM_NONBLOCK		SNDCTL_DSP_NONBLOCK
-#define SOUND_PCM_GETCAPS		SNDCTL_DSP_GETCAPS
-#define SOUND_PCM_GETTRIGGER		SNDCTL_DSP_GETTRIGGER
-#define SOUND_PCM_SETTRIGGER		SNDCTL_DSP_SETTRIGGER
-#define SOUND_PCM_SETSYNCRO		SNDCTL_DSP_SETSYNCRO
-#define SOUND_PCM_GETIPTR		SNDCTL_DSP_GETIPTR
-#define SOUND_PCM_GETOPTR		SNDCTL_DSP_GETOPTR
-#define SOUND_PCM_MAPINBUF		SNDCTL_DSP_MAPINBUF
-#define SOUND_PCM_MAPOUTBUF		SNDCTL_DSP_MAPOUTBUF
-
-/*
- * ioctl calls to be used in communication with coprocessors and
- * DSP chips.
- */
-
-typedef struct copr_buffer {
-		int command;	/* Set to 0 if not used */
-		int flags;
-#define CPF_NONE		0x0000
-#define CPF_FIRST		0x0001	/* First block */
-#define CPF_LAST		0x0002	/* Last block */
-		int len;
-		int offs;	/* If required by the device (0 if not used) */
-
-		unsigned char data[4000]; /* NOTE! 4000 is not 4k */
-	} copr_buffer;
-
-typedef struct copr_debug_buf {
-		int command;	/* Used internally. Set to 0 */
-		int parm1;
-		int parm2;
-		int flags;	
-		int len;	/* Length of data in bytes */
-	} copr_debug_buf;
-
-typedef struct copr_msg {
-		int len;
-		unsigned char data[4000];
-	} copr_msg;
-
-#define SNDCTL_COPR_RESET             _SIO  ('C',  0)
-#define SNDCTL_COPR_LOAD	      _SIOWR('C',  1, copr_buffer)
-#define SNDCTL_COPR_RDATA	      _SIOWR('C',  2, copr_debug_buf)
-#define SNDCTL_COPR_RCODE	      _SIOWR('C',  3, copr_debug_buf)
-#define SNDCTL_COPR_WDATA	      _SIOW ('C',  4, copr_debug_buf)
-#define SNDCTL_COPR_WCODE	      _SIOW ('C',  5, copr_debug_buf)
-#define SNDCTL_COPR_RUN		      _SIOWR('C',  6, copr_debug_buf)
-#define SNDCTL_COPR_HALT	      _SIOWR('C',  7, copr_debug_buf)
-#define SNDCTL_COPR_SENDMSG	      _SIOWR('C',  8, copr_msg)
-#define SNDCTL_COPR_RCVMSG	      _SIOR ('C',  9, copr_msg)
-
-/*********************************************
- * IOCTL commands for /dev/mixer
- */
-	
-/* 
- * Mixer devices
- *
- * There can be up to 20 different analog mixer channels. The
- * SOUND_MIXER_NRDEVICES gives the currently supported maximum. 
- * The SOUND_MIXER_READ_DEVMASK returns a bitmask which tells
- * the devices supported by the particular mixer.
- */
-
-#define SOUND_MIXER_NRDEVICES	25
-#define SOUND_MIXER_VOLUME	0
-#define SOUND_MIXER_BASS	1
-#define SOUND_MIXER_TREBLE	2
-#define SOUND_MIXER_SYNTH	3
-#define SOUND_MIXER_PCM		4
-#define SOUND_MIXER_SPEAKER	5
-#define SOUND_MIXER_LINE	6
-#define SOUND_MIXER_MIC		7
-#define SOUND_MIXER_CD		8
-#define SOUND_MIXER_IMIX	9	/*  Recording monitor  */
-#define SOUND_MIXER_ALTPCM	10
-#define SOUND_MIXER_RECLEV	11	/* Recording level */
-#define SOUND_MIXER_IGAIN	12	/* Input gain */
-#define SOUND_MIXER_OGAIN	13	/* Output gain */
-/* 
- * The AD1848 codec and compatibles have three line level inputs
- * (line, aux1 and aux2). Since each card manufacturer have assigned
- * different meanings to these inputs, it's inpractical to assign
- * specific meanings (line, cd, synth etc.) to them.
- */
-#define SOUND_MIXER_LINE1	14	/* Input source 1  (aux1) */
-#define SOUND_MIXER_LINE2	15	/* Input source 2  (aux2) */
-#define SOUND_MIXER_LINE3	16	/* Input source 3  (line) */
-#define SOUND_MIXER_DIGITAL1	17	/* Digital (input) 1 */
-#define SOUND_MIXER_DIGITAL2	18	/* Digital (input) 2 */
-#define SOUND_MIXER_DIGITAL3	19	/* Digital (input) 3 */
-#define SOUND_MIXER_PHONEIN	20	/* Phone input */
-#define SOUND_MIXER_PHONEOUT	21	/* Phone output */
-#define SOUND_MIXER_VIDEO	22	/* Video/TV (audio) in */
-#define SOUND_MIXER_RADIO	23	/* Radio in */
-#define SOUND_MIXER_MONITOR	24	/* Monitor (usually mic) volume */
-
-/* Some on/off settings (SOUND_SPECIAL_MIN - SOUND_SPECIAL_MAX) */
-/* Not counted to SOUND_MIXER_NRDEVICES, but use the same number space */
-#define SOUND_ONOFF_MIN		28
-#define SOUND_ONOFF_MAX		30
-
-/* Note!	Number 31 cannot be used since the sign bit is reserved */
-#define SOUND_MIXER_NONE	31
-
-/*
- * The following unsupported macros are no longer functional.
- * Use SOUND_MIXER_PRIVATE# macros in future.
- */
-#define SOUND_MIXER_ENHANCE	SOUND_MIXER_NONE
-#define SOUND_MIXER_MUTE	SOUND_MIXER_NONE
-#define SOUND_MIXER_LOUD	SOUND_MIXER_NONE
-
-
-#define SOUND_DEVICE_LABELS	{"Vol  ", "Bass ", "Trebl", "Synth", "Pcm  ", "Spkr ", "Line ", \
-				 "Mic  ", "CD   ", "Mix  ", "Pcm2 ", "Rec  ", "IGain", "OGain", \
-				 "Line1", "Line2", "Line3", "Digital1", "Digital2", "Digital3", \
-				 "PhoneIn", "PhoneOut", "Video", "Radio", "Monitor"}
-
-#define SOUND_DEVICE_NAMES	{"vol", "bass", "treble", "synth", "pcm", "speaker", "line", \
-				 "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", \
-				 "line1", "line2", "line3", "dig1", "dig2", "dig3", \
-				 "phin", "phout", "video", "radio", "monitor"}
-
-/*	Device bitmask identifiers	*/
-
-#define SOUND_MIXER_RECSRC	0xff	/* Arg contains a bit for each recording source */
-#define SOUND_MIXER_DEVMASK	0xfe	/* Arg contains a bit for each supported device */
-#define SOUND_MIXER_RECMASK	0xfd	/* Arg contains a bit for each supported recording source */
-#define SOUND_MIXER_CAPS	0xfc
-#	define SOUND_CAP_EXCL_INPUT	0x00000001	/* Only one recording source at a time */
-#define SOUND_MIXER_STEREODEVS	0xfb	/* Mixer channels supporting stereo */
-#define SOUND_MIXER_OUTSRC	0xfa	/* Arg contains a bit for each input source to output */
-#define SOUND_MIXER_OUTMASK	0xf9	/* Arg contains a bit for each supported input source to output */
-
-/*	Device mask bits	*/
-
-#define SOUND_MASK_VOLUME	(1 << SOUND_MIXER_VOLUME)
-#define SOUND_MASK_BASS		(1 << SOUND_MIXER_BASS)
-#define SOUND_MASK_TREBLE	(1 << SOUND_MIXER_TREBLE)
-#define SOUND_MASK_SYNTH	(1 << SOUND_MIXER_SYNTH)
-#define SOUND_MASK_PCM		(1 << SOUND_MIXER_PCM)
-#define SOUND_MASK_SPEAKER	(1 << SOUND_MIXER_SPEAKER)
-#define SOUND_MASK_LINE		(1 << SOUND_MIXER_LINE)
-#define SOUND_MASK_MIC		(1 << SOUND_MIXER_MIC)
-#define SOUND_MASK_CD		(1 << SOUND_MIXER_CD)
-#define SOUND_MASK_IMIX		(1 << SOUND_MIXER_IMIX)
-#define SOUND_MASK_ALTPCM	(1 << SOUND_MIXER_ALTPCM)
-#define SOUND_MASK_RECLEV	(1 << SOUND_MIXER_RECLEV)
-#define SOUND_MASK_IGAIN	(1 << SOUND_MIXER_IGAIN)
-#define SOUND_MASK_OGAIN	(1 << SOUND_MIXER_OGAIN)
-#define SOUND_MASK_LINE1	(1 << SOUND_MIXER_LINE1)
-#define SOUND_MASK_LINE2	(1 << SOUND_MIXER_LINE2)
-#define SOUND_MASK_LINE3	(1 << SOUND_MIXER_LINE3)
-#define SOUND_MASK_DIGITAL1	(1 << SOUND_MIXER_DIGITAL1)
-#define SOUND_MASK_DIGITAL2	(1 << SOUND_MIXER_DIGITAL2)
-#define SOUND_MASK_DIGITAL3	(1 << SOUND_MIXER_DIGITAL3)
-#define SOUND_MASK_PHONEIN	(1 << SOUND_MIXER_PHONEIN)
-#define SOUND_MASK_PHONEOUT	(1 << SOUND_MIXER_PHONEOUT)
-#define SOUND_MASK_RADIO	(1 << SOUND_MIXER_RADIO)
-#define SOUND_MASK_VIDEO	(1 << SOUND_MIXER_VIDEO)
-#define SOUND_MASK_MONITOR	(1 << SOUND_MIXER_MONITOR)
-
-/* Obsolete macros */
-#define SOUND_MASK_MUTE		(1 << SOUND_MIXER_MUTE)
-#define SOUND_MASK_ENHANCE	(1 << SOUND_MIXER_ENHANCE)
-#define SOUND_MASK_LOUD		(1 << SOUND_MIXER_LOUD)
-
-#define MIXER_READ(dev)		_SIOR('M', dev, int)
-#define SOUND_MIXER_READ_VOLUME		MIXER_READ(SOUND_MIXER_VOLUME)
-#define SOUND_MIXER_READ_BASS		MIXER_READ(SOUND_MIXER_BASS)
-#define SOUND_MIXER_READ_TREBLE		MIXER_READ(SOUND_MIXER_TREBLE)
-#define SOUND_MIXER_READ_SYNTH		MIXER_READ(SOUND_MIXER_SYNTH)
-#define SOUND_MIXER_READ_PCM		MIXER_READ(SOUND_MIXER_PCM)
-#define SOUND_MIXER_READ_SPEAKER	MIXER_READ(SOUND_MIXER_SPEAKER)
-#define SOUND_MIXER_READ_LINE		MIXER_READ(SOUND_MIXER_LINE)
-#define SOUND_MIXER_READ_MIC		MIXER_READ(SOUND_MIXER_MIC)
-#define SOUND_MIXER_READ_CD		MIXER_READ(SOUND_MIXER_CD)
-#define SOUND_MIXER_READ_IMIX		MIXER_READ(SOUND_MIXER_IMIX)
-#define SOUND_MIXER_READ_ALTPCM		MIXER_READ(SOUND_MIXER_ALTPCM)
-#define SOUND_MIXER_READ_RECLEV		MIXER_READ(SOUND_MIXER_RECLEV)
-#define SOUND_MIXER_READ_IGAIN		MIXER_READ(SOUND_MIXER_IGAIN)
-#define SOUND_MIXER_READ_OGAIN		MIXER_READ(SOUND_MIXER_OGAIN)
-#define SOUND_MIXER_READ_LINE1		MIXER_READ(SOUND_MIXER_LINE1)
-#define SOUND_MIXER_READ_LINE2		MIXER_READ(SOUND_MIXER_LINE2)
-#define SOUND_MIXER_READ_LINE3		MIXER_READ(SOUND_MIXER_LINE3)
-
-/* Obsolete macros */
-#define SOUND_MIXER_READ_MUTE		MIXER_READ(SOUND_MIXER_MUTE)
-#define SOUND_MIXER_READ_ENHANCE	MIXER_READ(SOUND_MIXER_ENHANCE)
-#define SOUND_MIXER_READ_LOUD		MIXER_READ(SOUND_MIXER_LOUD)
-
-#define SOUND_MIXER_READ_RECSRC		MIXER_READ(SOUND_MIXER_RECSRC)
-#define SOUND_MIXER_READ_DEVMASK	MIXER_READ(SOUND_MIXER_DEVMASK)
-#define SOUND_MIXER_READ_RECMASK	MIXER_READ(SOUND_MIXER_RECMASK)
-#define SOUND_MIXER_READ_STEREODEVS	MIXER_READ(SOUND_MIXER_STEREODEVS)
-#define SOUND_MIXER_READ_CAPS		MIXER_READ(SOUND_MIXER_CAPS)
-
-#define MIXER_WRITE(dev)		_SIOWR('M', dev, int)
-#define SOUND_MIXER_WRITE_VOLUME	MIXER_WRITE(SOUND_MIXER_VOLUME)
-#define SOUND_MIXER_WRITE_BASS		MIXER_WRITE(SOUND_MIXER_BASS)
-#define SOUND_MIXER_WRITE_TREBLE	MIXER_WRITE(SOUND_MIXER_TREBLE)
-#define SOUND_MIXER_WRITE_SYNTH		MIXER_WRITE(SOUND_MIXER_SYNTH)
-#define SOUND_MIXER_WRITE_PCM		MIXER_WRITE(SOUND_MIXER_PCM)
-#define SOUND_MIXER_WRITE_SPEAKER	MIXER_WRITE(SOUND_MIXER_SPEAKER)
-#define SOUND_MIXER_WRITE_LINE		MIXER_WRITE(SOUND_MIXER_LINE)
-#define SOUND_MIXER_WRITE_MIC		MIXER_WRITE(SOUND_MIXER_MIC)
-#define SOUND_MIXER_WRITE_CD		MIXER_WRITE(SOUND_MIXER_CD)
-#define SOUND_MIXER_WRITE_IMIX		MIXER_WRITE(SOUND_MIXER_IMIX)
-#define SOUND_MIXER_WRITE_ALTPCM	MIXER_WRITE(SOUND_MIXER_ALTPCM)
-#define SOUND_MIXER_WRITE_RECLEV	MIXER_WRITE(SOUND_MIXER_RECLEV)
-#define SOUND_MIXER_WRITE_IGAIN		MIXER_WRITE(SOUND_MIXER_IGAIN)
-#define SOUND_MIXER_WRITE_OGAIN		MIXER_WRITE(SOUND_MIXER_OGAIN)
-#define SOUND_MIXER_WRITE_LINE1		MIXER_WRITE(SOUND_MIXER_LINE1)
-#define SOUND_MIXER_WRITE_LINE2		MIXER_WRITE(SOUND_MIXER_LINE2)
-#define SOUND_MIXER_WRITE_LINE3		MIXER_WRITE(SOUND_MIXER_LINE3)
-
-/* Obsolete macros */
-#define SOUND_MIXER_WRITE_MUTE		MIXER_WRITE(SOUND_MIXER_MUTE)
-#define SOUND_MIXER_WRITE_ENHANCE	MIXER_WRITE(SOUND_MIXER_ENHANCE)
-#define SOUND_MIXER_WRITE_LOUD		MIXER_WRITE(SOUND_MIXER_LOUD)
-
-#define SOUND_MIXER_WRITE_RECSRC	MIXER_WRITE(SOUND_MIXER_RECSRC)
-
-typedef struct mixer_info
-{
-  char id[16];
-  char name[32];
-  int  modify_counter;
-  int fillers[10];
-} mixer_info;
-
-typedef struct _old_mixer_info /* Obsolete */
-{
-  char id[16];
-  char name[32];
-} _old_mixer_info;
-
-#define SOUND_MIXER_INFO		_SIOR ('M', 101, mixer_info)
-#define SOUND_OLD_MIXER_INFO		_SIOR ('M', 101, _old_mixer_info)
-
-/*
- * A mechanism for accessing "proprietary" mixer features. This method
- * permits passing 128 bytes of arbitrary data between a mixer application
- * and the mixer driver. Interpretation of the record is defined by
- * the particular mixer driver.
- */
-typedef unsigned char mixer_record[128];
-
-#define SOUND_MIXER_ACCESS		_SIOWR('M', 102, mixer_record)
-
-/*
- * Two ioctls for special souncard function
- */
-#define SOUND_MIXER_AGC  _SIOWR('M', 103, int)
-#define SOUND_MIXER_3DSE  _SIOWR('M', 104, int)
-
-/*
- * The SOUND_MIXER_PRIVATE# commands can be redefined by low level drivers.
- * These features can be used when accessing device specific features.
- */
-#define SOUND_MIXER_PRIVATE1		_SIOWR('M', 111, int)
-#define SOUND_MIXER_PRIVATE2		_SIOWR('M', 112, int)
-#define SOUND_MIXER_PRIVATE3		_SIOWR('M', 113, int)
-#define SOUND_MIXER_PRIVATE4		_SIOWR('M', 114, int)
-#define SOUND_MIXER_PRIVATE5		_SIOWR('M', 115, int)
-
-/*
- * SOUND_MIXER_GETLEVELS and SOUND_MIXER_SETLEVELS calls can be used
- * for querying current mixer settings from the driver and for loading
- * default volume settings _prior_ activating the mixer (loading
- * doesn't affect current state of the mixer hardware). These calls
- * are for internal use only.
- */
-
-typedef struct mixer_vol_table {
-  int num;	/* Index to volume table */
-  char name[32];
-  int levels[32];
-} mixer_vol_table;
-
-#define SOUND_MIXER_GETLEVELS		_SIOWR('M', 116, mixer_vol_table)
-#define SOUND_MIXER_SETLEVELS		_SIOWR('M', 117, mixer_vol_table)
-
-/* 
- * An ioctl for identifying the driver version. It will return value
- * of the SOUND_VERSION macro used when compiling the driver.
- * This call was introduced in OSS version 3.6 and it will not work
- * with earlier versions (returns EINVAL).
- */
-#define OSS_GETVERSION			_SIOR ('M', 118, int)
-
-/*
- * Level 2 event types for /dev/sequencer
- */
-
-/*
- * The 4 most significant bits of byte 0 specify the class of
- * the event: 
- *
- *	0x8X = system level events,
- *	0x9X = device/port specific events, event[1] = device/port,
- *		The last 4 bits give the subtype:
- *			0x02	= Channel event (event[3] = chn).
- *			0x01	= note event (event[4] = note).
- *			(0x01 is not used alone but always with bit 0x02).
- *	       event[2] = MIDI message code (0x80=note off etc.)
- *
- */
-
-#define EV_SEQ_LOCAL		0x80
-#define EV_TIMING		0x81
-#define EV_CHN_COMMON		0x92
-#define EV_CHN_VOICE		0x93
-#define EV_SYSEX		0x94
-/*
- * Event types 200 to 220 are reserved for application use.
- * These numbers will not be used by the driver.
- */
-
-/*
- * Events for event type EV_CHN_VOICE
- */
-
-#define MIDI_NOTEOFF		0x80
-#define MIDI_NOTEON		0x90
-#define MIDI_KEY_PRESSURE	0xA0
-
-/*
- * Events for event type EV_CHN_COMMON
- */
-
-#define MIDI_CTL_CHANGE		0xB0
-#define MIDI_PGM_CHANGE		0xC0
-#define MIDI_CHN_PRESSURE	0xD0
-#define MIDI_PITCH_BEND		0xE0
-
-#define MIDI_SYSTEM_PREFIX	0xF0
-
-/*
- * Timer event types
- */
-#define TMR_WAIT_REL		1	/* Time relative to the prev time */
-#define TMR_WAIT_ABS		2	/* Absolute time since TMR_START */
-#define TMR_STOP		3
-#define TMR_START		4
-#define TMR_CONTINUE		5
-#define TMR_TEMPO		6
-#define TMR_ECHO		8
-#define TMR_CLOCK		9	/* MIDI clock */
-#define TMR_SPP			10	/* Song position pointer */
-#define TMR_TIMESIG		11	/* Time signature */
-
-/*
- *	Local event types
- */
-#define LOCL_STARTAUDIO		1
-
-/*
- *	Some convenience macros to simplify programming of the
- *	/dev/sequencer interface
- *
- *	This is a legacy interface for applications written against
- *	the OSSlib-3.8 style interface. It is no longer possible
- *	to actually link against OSSlib with this header, but we
- *	still provide these macros for programs using them.
- *
- *	If you want to use OSSlib, it is recommended that you get
- *	the GPL version of OSS-4.x and build against that version
- *	of the header.
- *
- *	We redefine the extern keyword so that make headers_check
- *	does not complain about SEQ_USE_EXTBUF.
- */
-#define SEQ_DECLAREBUF()		SEQ_USE_EXTBUF()
-
-void seqbuf_dump(void);	/* This function must be provided by programs */
-
-#define SEQ_PM_DEFINES int __foo_bar___
-
-#define SEQ_LOAD_GMINSTR(dev, instr)
-#define SEQ_LOAD_GMDRUM(dev, drum)
-
-#define _SEQ_EXTERN extern
-#define SEQ_USE_EXTBUF() \
-		_SEQ_EXTERN unsigned char _seqbuf[]; \
-		_SEQ_EXTERN int _seqbuflen; _SEQ_EXTERN int _seqbufptr
-
-#ifndef USE_SIMPLE_MACROS
-/* Sample seqbuf_dump() implementation:
- *
- *	SEQ_DEFINEBUF (2048);	-- Defines a buffer for 2048 bytes
- *
- *	int seqfd;		-- The file descriptor for /dev/sequencer.
- *
- *	void
- *	seqbuf_dump ()
- *	{
- *	  if (_seqbufptr)
- *	    if (write (seqfd, _seqbuf, _seqbufptr) == -1)
- *	      {
- *		perror ("write /dev/sequencer");
- *		exit (-1);
- *	      }
- *	  _seqbufptr = 0;
- *	}
- */
-
-#define SEQ_DEFINEBUF(len)		unsigned char _seqbuf[len]; int _seqbuflen = len;int _seqbufptr = 0
-#define _SEQ_NEEDBUF(len)		if ((_seqbufptr+(len)) > _seqbuflen) seqbuf_dump()
-#define _SEQ_ADVBUF(len)		_seqbufptr += len
-#define SEQ_DUMPBUF			seqbuf_dump
-#else
-/*
- * This variation of the sequencer macros is used just to format one event
- * using fixed buffer.
- * 
- * The program using the macro library must define the following macros before
- * using this library.
- *
- * #define _seqbuf 		 name of the buffer (unsigned char[]) 
- * #define _SEQ_ADVBUF(len)	 If the applic needs to know the exact
- *				 size of the event, this macro can be used.
- *				 Otherwise this must be defined as empty.
- * #define _seqbufptr		 Define the name of index variable or 0 if
- *				 not required. 
- */
-#define _SEQ_NEEDBUF(len)	/* empty */
-#endif
-
-#define SEQ_VOLUME_MODE(dev, mode)	{_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr] = SEQ_EXTENDED;\
-					_seqbuf[_seqbufptr+1] = SEQ_VOLMODE;\
-					_seqbuf[_seqbufptr+2] = (dev);\
-					_seqbuf[_seqbufptr+3] = (mode);\
-					_seqbuf[_seqbufptr+4] = 0;\
-					_seqbuf[_seqbufptr+5] = 0;\
-					_seqbuf[_seqbufptr+6] = 0;\
-					_seqbuf[_seqbufptr+7] = 0;\
-					_SEQ_ADVBUF(8);}
-
-/*
- * Midi voice messages
- */
-
-#define _CHN_VOICE(dev, event, chn, note, parm) \
-					{_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr] = EV_CHN_VOICE;\
-					_seqbuf[_seqbufptr+1] = (dev);\
-					_seqbuf[_seqbufptr+2] = (event);\
-					_seqbuf[_seqbufptr+3] = (chn);\
-					_seqbuf[_seqbufptr+4] = (note);\
-					_seqbuf[_seqbufptr+5] = (parm);\
-					_seqbuf[_seqbufptr+6] = (0);\
-					_seqbuf[_seqbufptr+7] = 0;\
-					_SEQ_ADVBUF(8);}
-
-#define SEQ_START_NOTE(dev, chn, note, vol) \
-		_CHN_VOICE(dev, MIDI_NOTEON, chn, note, vol)
-
-#define SEQ_STOP_NOTE(dev, chn, note, vol) \
-		_CHN_VOICE(dev, MIDI_NOTEOFF, chn, note, vol)
-
-#define SEQ_KEY_PRESSURE(dev, chn, note, pressure) \
-		_CHN_VOICE(dev, MIDI_KEY_PRESSURE, chn, note, pressure)
-
-/*
- * Midi channel messages
- */
-
-#define _CHN_COMMON(dev, event, chn, p1, p2, w14) \
-					{_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr] = EV_CHN_COMMON;\
-					_seqbuf[_seqbufptr+1] = (dev);\
-					_seqbuf[_seqbufptr+2] = (event);\
-					_seqbuf[_seqbufptr+3] = (chn);\
-					_seqbuf[_seqbufptr+4] = (p1);\
-					_seqbuf[_seqbufptr+5] = (p2);\
-					*(short *)&_seqbuf[_seqbufptr+6] = (w14);\
-					_SEQ_ADVBUF(8);}
-/*
- * SEQ_SYSEX permits sending of sysex messages. (It may look that it permits
- * sending any MIDI bytes but it's absolutely not possible. Trying to do
- * so _will_ cause problems with MPU401 intelligent mode).
- *
- * Sysex messages are sent in blocks of 1 to 6 bytes. Longer messages must be 
- * sent by calling SEQ_SYSEX() several times (there must be no other events
- * between them). First sysex fragment must have 0xf0 in the first byte
- * and the last byte (buf[len-1] of the last fragment must be 0xf7. No byte
- * between these sysex start and end markers cannot be larger than 0x7f. Also
- * lengths of each fragments (except the last one) must be 6.
- *
- * Breaking the above rules may work with some MIDI ports but is likely to
- * cause fatal problems with some other devices (such as MPU401).
- */
-#define SEQ_SYSEX(dev, buf, len) \
-					{int ii, ll=(len); \
-					 unsigned char *bufp=buf;\
-					 if (ll>6)ll=6;\
-					_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr] = EV_SYSEX;\
-					_seqbuf[_seqbufptr+1] = (dev);\
-					for(ii=0;ii<ll;ii++)\
-					   _seqbuf[_seqbufptr+ii+2] = bufp[ii];\
-					for(ii=ll;ii<6;ii++)\
-					   _seqbuf[_seqbufptr+ii+2] = 0xff;\
-					_SEQ_ADVBUF(8);}
-
-#define SEQ_CHN_PRESSURE(dev, chn, pressure) \
-		_CHN_COMMON(dev, MIDI_CHN_PRESSURE, chn, pressure, 0, 0)
-
-#define SEQ_SET_PATCH SEQ_PGM_CHANGE
-#define SEQ_PGM_CHANGE(dev, chn, patch) \
-		_CHN_COMMON(dev, MIDI_PGM_CHANGE, chn, patch, 0, 0)
-
-#define SEQ_CONTROL(dev, chn, controller, value) \
-		_CHN_COMMON(dev, MIDI_CTL_CHANGE, chn, controller, 0, value)
-
-#define SEQ_BENDER(dev, chn, value) \
-		_CHN_COMMON(dev, MIDI_PITCH_BEND, chn, 0, 0, value)
-
-
-#define SEQ_V2_X_CONTROL(dev, voice, controller, value)	{_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr] = SEQ_EXTENDED;\
-					_seqbuf[_seqbufptr+1] = SEQ_CONTROLLER;\
-					_seqbuf[_seqbufptr+2] = (dev);\
-					_seqbuf[_seqbufptr+3] = (voice);\
-					_seqbuf[_seqbufptr+4] = (controller);\
-					_seqbuf[_seqbufptr+5] = ((value)&0xff);\
-					_seqbuf[_seqbufptr+6] = ((value>>8)&0xff);\
-					_seqbuf[_seqbufptr+7] = 0;\
-					_SEQ_ADVBUF(8);}
-/*
- * The following 5 macros are incorrectly implemented and obsolete.
- * Use SEQ_BENDER and SEQ_CONTROL (with proper controller) instead.
- */
-#define SEQ_PITCHBEND(dev, voice, value) SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER, value)
-#define SEQ_BENDER_RANGE(dev, voice, value) SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER_RANGE, value)
-#define SEQ_EXPRESSION(dev, voice, value) SEQ_CONTROL(dev, voice, CTL_EXPRESSION, value*128)
-#define SEQ_MAIN_VOLUME(dev, voice, value) SEQ_CONTROL(dev, voice, CTL_MAIN_VOLUME, (value*16383)/100)
-#define SEQ_PANNING(dev, voice, pos) SEQ_CONTROL(dev, voice, CTL_PAN, (pos+128) / 2)
-
-/*
- * Timing and synchronization macros
- */
-
-#define _TIMER_EVENT(ev, parm)		{_SEQ_NEEDBUF(8);\
-				 	_seqbuf[_seqbufptr+0] = EV_TIMING; \
-				 	_seqbuf[_seqbufptr+1] = (ev); \
-					_seqbuf[_seqbufptr+2] = 0;\
-					_seqbuf[_seqbufptr+3] = 0;\
-				 	*(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
-					_SEQ_ADVBUF(8);}
-
-#define SEQ_START_TIMER()		_TIMER_EVENT(TMR_START, 0)
-#define SEQ_STOP_TIMER()		_TIMER_EVENT(TMR_STOP, 0)
-#define SEQ_CONTINUE_TIMER()		_TIMER_EVENT(TMR_CONTINUE, 0)
-#define SEQ_WAIT_TIME(ticks)		_TIMER_EVENT(TMR_WAIT_ABS, ticks)
-#define SEQ_DELTA_TIME(ticks)		_TIMER_EVENT(TMR_WAIT_REL, ticks)
-#define SEQ_ECHO_BACK(key)		_TIMER_EVENT(TMR_ECHO, key)
-#define SEQ_SET_TEMPO(value)		_TIMER_EVENT(TMR_TEMPO, value)
-#define SEQ_SONGPOS(pos)		_TIMER_EVENT(TMR_SPP, pos)
-#define SEQ_TIME_SIGNATURE(sig)		_TIMER_EVENT(TMR_TIMESIG, sig)
-
-/*
- * Local control events
- */
-
-#define _LOCAL_EVENT(ev, parm)		{_SEQ_NEEDBUF(8);\
-				 	_seqbuf[_seqbufptr+0] = EV_SEQ_LOCAL; \
-				 	_seqbuf[_seqbufptr+1] = (ev); \
-					_seqbuf[_seqbufptr+2] = 0;\
-					_seqbuf[_seqbufptr+3] = 0;\
-				 	*(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
-					_SEQ_ADVBUF(8);}
-
-#define SEQ_PLAYAUDIO(devmask)		_LOCAL_EVENT(LOCL_STARTAUDIO, devmask)
-/*
- * Events for the level 1 interface only 
- */
-
-#define SEQ_MIDIOUT(device, byte)	{_SEQ_NEEDBUF(4);\
-					_seqbuf[_seqbufptr] = SEQ_MIDIPUTC;\
-					_seqbuf[_seqbufptr+1] = (byte);\
-					_seqbuf[_seqbufptr+2] = (device);\
-					_seqbuf[_seqbufptr+3] = 0;\
-					_SEQ_ADVBUF(4);}
-
-/*
- * Patch loading.
- */
-#define SEQ_WRPATCH(patchx, len) \
-		{if (_seqbufptr) SEQ_DUMPBUF();\
-		 if (write(seqfd, (char*)(patchx), len)==-1) \
-		    perror("Write patch: /dev/sequencer");}
-#define SEQ_WRPATCH2(patchx, len) \
-		(SEQ_DUMPBUF(), write(seqfd, (char*)(patchx), len))
-
-#endif /* SOUNDCARD_H */
diff --git a/openflow/usr/include/linux/spi/spidev.h b/openflow/usr/include/linux/spi/spidev.h
deleted file mode 100644
index dd5f21e..0000000
--- a/openflow/usr/include/linux/spi/spidev.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * include/linux/spi/spidev.h
- *
- * Copyright (C) 2006 SWAPP
- *	Andrea Paterniani <a.paterniani@swapp-eng.it>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
-
-#ifndef SPIDEV_H
-#define SPIDEV_H
-
-#include <linux/types.h>
-
-/* User space versions of kernel symbols for SPI clocking modes,
- * matching <linux/spi/spi.h>
- */
-
-#define SPI_CPHA		0x01
-#define SPI_CPOL		0x02
-
-#define SPI_MODE_0		(0|0)
-#define SPI_MODE_1		(0|SPI_CPHA)
-#define SPI_MODE_2		(SPI_CPOL|0)
-#define SPI_MODE_3		(SPI_CPOL|SPI_CPHA)
-
-#define SPI_CS_HIGH		0x04
-#define SPI_LSB_FIRST		0x08
-#define SPI_3WIRE		0x10
-#define SPI_LOOP		0x20
-#define SPI_NO_CS		0x40
-#define SPI_READY		0x80
-#define SPI_TX_DUAL		0x100
-#define SPI_TX_QUAD		0x200
-#define SPI_RX_DUAL		0x400
-#define SPI_RX_QUAD		0x800
-
-/*---------------------------------------------------------------------------*/
-
-/* IOCTL commands */
-
-#define SPI_IOC_MAGIC			'k'
-
-/**
- * struct spi_ioc_transfer - describes a single SPI transfer
- * @tx_buf: Holds pointer to userspace buffer with transmit data, or null.
- *	If no data is provided, zeroes are shifted out.
- * @rx_buf: Holds pointer to userspace buffer for receive data, or null.
- * @len: Length of tx and rx buffers, in bytes.
- * @speed_hz: Temporary override of the device's bitrate.
- * @bits_per_word: Temporary override of the device's wordsize.
- * @delay_usecs: If nonzero, how long to delay after the last bit transfer
- *	before optionally deselecting the device before the next transfer.
- * @cs_change: True to deselect device before starting the next transfer.
- *
- * This structure is mapped directly to the kernel spi_transfer structure;
- * the fields have the same meanings, except of course that the pointers
- * are in a different address space (and may be of different sizes in some
- * cases, such as 32-bit i386 userspace over a 64-bit x86_64 kernel).
- * Zero-initialize the structure, including currently unused fields, to
- * accommodate potential future updates.
- *
- * SPI_IOC_MESSAGE gives userspace the equivalent of kernel spi_sync().
- * Pass it an array of related transfers, they'll execute together.
- * Each transfer may be half duplex (either direction) or full duplex.
- *
- *	struct spi_ioc_transfer mesg[4];
- *	...
- *	status = ioctl(fd, SPI_IOC_MESSAGE(4), mesg);
- *
- * So for example one transfer might send a nine bit command (right aligned
- * in a 16-bit word), the next could read a block of 8-bit data before
- * terminating that command by temporarily deselecting the chip; the next
- * could send a different nine bit command (re-selecting the chip), and the
- * last transfer might write some register values.
- */
-struct spi_ioc_transfer {
-	__u64		tx_buf;
-	__u64		rx_buf;
-
-	__u32		len;
-	__u32		speed_hz;
-
-	__u16		delay_usecs;
-	__u8		bits_per_word;
-	__u8		cs_change;
-	__u8		tx_nbits;
-	__u8		rx_nbits;
-	__u16		pad;
-
-	/* If the contents of 'struct spi_ioc_transfer' ever change
-	 * incompatibly, then the ioctl number (currently 0) must change;
-	 * ioctls with constant size fields get a bit more in the way of
-	 * error checking than ones (like this) where that field varies.
-	 *
-	 * NOTE: struct layout is the same in 64bit and 32bit userspace.
-	 */
-};
-
-/* not all platforms use <asm-generic/ioctl.h> or _IOC_TYPECHECK() ... */
-#define SPI_MSGSIZE(N) \
-	((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << _IOC_SIZEBITS)) \
-		? ((N)*(sizeof (struct spi_ioc_transfer))) : 0)
-#define SPI_IOC_MESSAGE(N) _IOW(SPI_IOC_MAGIC, 0, char[SPI_MSGSIZE(N)])
-
-
-/* Read / Write of SPI mode (SPI_MODE_0..SPI_MODE_3) (limited to 8 bits) */
-#define SPI_IOC_RD_MODE			_IOR(SPI_IOC_MAGIC, 1, __u8)
-#define SPI_IOC_WR_MODE			_IOW(SPI_IOC_MAGIC, 1, __u8)
-
-/* Read / Write SPI bit justification */
-#define SPI_IOC_RD_LSB_FIRST		_IOR(SPI_IOC_MAGIC, 2, __u8)
-#define SPI_IOC_WR_LSB_FIRST		_IOW(SPI_IOC_MAGIC, 2, __u8)
-
-/* Read / Write SPI device word length (1..N) */
-#define SPI_IOC_RD_BITS_PER_WORD	_IOR(SPI_IOC_MAGIC, 3, __u8)
-#define SPI_IOC_WR_BITS_PER_WORD	_IOW(SPI_IOC_MAGIC, 3, __u8)
-
-/* Read / Write SPI device default max speed hz */
-#define SPI_IOC_RD_MAX_SPEED_HZ		_IOR(SPI_IOC_MAGIC, 4, __u32)
-#define SPI_IOC_WR_MAX_SPEED_HZ		_IOW(SPI_IOC_MAGIC, 4, __u32)
-
-/* Read / Write of the SPI mode field */
-#define SPI_IOC_RD_MODE32		_IOR(SPI_IOC_MAGIC, 5, __u32)
-#define SPI_IOC_WR_MODE32		_IOW(SPI_IOC_MAGIC, 5, __u32)
-
-
-
-#endif /* SPIDEV_H */
diff --git a/openflow/usr/include/linux/stat.h b/openflow/usr/include/linux/stat.h
deleted file mode 100644
index b014ce4..0000000
--- a/openflow/usr/include/linux/stat.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef _LINUX_STAT_H
-#define _LINUX_STAT_H
-
-
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-
-#define S_IFMT  00170000
-#define S_IFSOCK 0140000
-#define S_IFLNK	 0120000
-#define S_IFREG  0100000
-#define S_IFBLK  0060000
-#define S_IFDIR  0040000
-#define S_IFCHR  0020000
-#define S_IFIFO  0010000
-#define S_ISUID  0004000
-#define S_ISGID  0002000
-#define S_ISVTX  0001000
-
-#define S_ISLNK(m)	(((m) & S_IFMT) == S_IFLNK)
-#define S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)
-#define S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
-#define S_ISCHR(m)	(((m) & S_IFMT) == S_IFCHR)
-#define S_ISBLK(m)	(((m) & S_IFMT) == S_IFBLK)
-#define S_ISFIFO(m)	(((m) & S_IFMT) == S_IFIFO)
-#define S_ISSOCK(m)	(((m) & S_IFMT) == S_IFSOCK)
-
-#define S_IRWXU 00700
-#define S_IRUSR 00400
-#define S_IWUSR 00200
-#define S_IXUSR 00100
-
-#define S_IRWXG 00070
-#define S_IRGRP 00040
-#define S_IWGRP 00020
-#define S_IXGRP 00010
-
-#define S_IRWXO 00007
-#define S_IROTH 00004
-#define S_IWOTH 00002
-#define S_IXOTH 00001
-
-#endif
-
-
-#endif /* _LINUX_STAT_H */
diff --git a/openflow/usr/include/linux/stddef.h b/openflow/usr/include/linux/stddef.h
deleted file mode 100644
index 8b13789..0000000
--- a/openflow/usr/include/linux/stddef.h
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/openflow/usr/include/linux/string.h b/openflow/usr/include/linux/string.h
deleted file mode 100644
index d7ed844..0000000
--- a/openflow/usr/include/linux/string.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _LINUX_STRING_H_
-#define _LINUX_STRING_H_
-
-/* We don't want strings.h stuff being used by user stuff by accident */
-
-#include <string.h>
-#endif /* _LINUX_STRING_H_ */
diff --git a/openflow/usr/include/linux/sunrpc/debug.h b/openflow/usr/include/linux/sunrpc/debug.h
deleted file mode 100644
index 4ead318..0000000
--- a/openflow/usr/include/linux/sunrpc/debug.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * linux/include/linux/sunrpc/debug.h
- *
- * Debugging support for sunrpc module
- *
- * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
- */
-
-#ifndef _LINUX_SUNRPC_DEBUG_H_
-#define _LINUX_SUNRPC_DEBUG_H_
-
-/*
- * RPC debug facilities
- */
-#define RPCDBG_XPRT		0x0001
-#define RPCDBG_CALL		0x0002
-#define RPCDBG_DEBUG		0x0004
-#define RPCDBG_NFS		0x0008
-#define RPCDBG_AUTH		0x0010
-#define RPCDBG_BIND		0x0020
-#define RPCDBG_SCHED		0x0040
-#define RPCDBG_TRANS		0x0080
-#define RPCDBG_SVCXPRT		0x0100
-#define RPCDBG_SVCDSP		0x0200
-#define RPCDBG_MISC		0x0400
-#define RPCDBG_CACHE		0x0800
-#define RPCDBG_ALL		0x7fff
-
-
-/*
- * Declarations for the sysctl debug interface, which allows to read or
- * change the debug flags for rpc, nfs, nfsd, and lockd. Since the sunrpc
- * module currently registers its sysctl table dynamically, the sysctl path
- * for module FOO is <CTL_SUNRPC, CTL_FOODEBUG>.
- */
-
-enum {
-	CTL_RPCDEBUG = 1,
-	CTL_NFSDEBUG,
-	CTL_NFSDDEBUG,
-	CTL_NLMDEBUG,
-	CTL_SLOTTABLE_UDP,
-	CTL_SLOTTABLE_TCP,
-	CTL_MIN_RESVPORT,
-	CTL_MAX_RESVPORT,
-};
-
-#endif /* _LINUX_SUNRPC_DEBUG_H_ */
diff --git a/openflow/usr/include/linux/suspend_ioctls.h b/openflow/usr/include/linux/suspend_ioctls.h
deleted file mode 100644
index 0b30382..0000000
--- a/openflow/usr/include/linux/suspend_ioctls.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _LINUX_SUSPEND_IOCTLS_H
-#define _LINUX_SUSPEND_IOCTLS_H
-
-#include <linux/types.h>
-/*
- * This structure is used to pass the values needed for the identification
- * of the resume swap area from a user space to the kernel via the
- * SNAPSHOT_SET_SWAP_AREA ioctl
- */
-struct resume_swap_area {
-	__kernel_loff_t offset;
-	__u32 dev;
-} __attribute__((packed));
-
-#define SNAPSHOT_IOC_MAGIC	'3'
-#define SNAPSHOT_FREEZE			_IO(SNAPSHOT_IOC_MAGIC, 1)
-#define SNAPSHOT_UNFREEZE		_IO(SNAPSHOT_IOC_MAGIC, 2)
-#define SNAPSHOT_ATOMIC_RESTORE		_IO(SNAPSHOT_IOC_MAGIC, 4)
-#define SNAPSHOT_FREE			_IO(SNAPSHOT_IOC_MAGIC, 5)
-#define SNAPSHOT_FREE_SWAP_PAGES	_IO(SNAPSHOT_IOC_MAGIC, 9)
-#define SNAPSHOT_S2RAM			_IO(SNAPSHOT_IOC_MAGIC, 11)
-#define SNAPSHOT_SET_SWAP_AREA		_IOW(SNAPSHOT_IOC_MAGIC, 13, \
-							struct resume_swap_area)
-#define SNAPSHOT_GET_IMAGE_SIZE		_IOR(SNAPSHOT_IOC_MAGIC, 14, __kernel_loff_t)
-#define SNAPSHOT_PLATFORM_SUPPORT	_IO(SNAPSHOT_IOC_MAGIC, 15)
-#define SNAPSHOT_POWER_OFF		_IO(SNAPSHOT_IOC_MAGIC, 16)
-#define SNAPSHOT_CREATE_IMAGE		_IOW(SNAPSHOT_IOC_MAGIC, 17, int)
-#define SNAPSHOT_PREF_IMAGE_SIZE	_IO(SNAPSHOT_IOC_MAGIC, 18)
-#define SNAPSHOT_AVAIL_SWAP_SIZE	_IOR(SNAPSHOT_IOC_MAGIC, 19, __kernel_loff_t)
-#define SNAPSHOT_ALLOC_SWAP_PAGE	_IOR(SNAPSHOT_IOC_MAGIC, 20, __kernel_loff_t)
-#define SNAPSHOT_IOC_MAXNR	20
-
-#endif /* _LINUX_SUSPEND_IOCTLS_H */
diff --git a/openflow/usr/include/linux/swab.h b/openflow/usr/include/linux/swab.h
deleted file mode 100644
index 13a943c..0000000
--- a/openflow/usr/include/linux/swab.h
+++ /dev/null
@@ -1,288 +0,0 @@
-#ifndef _LINUX_SWAB_H
-#define _LINUX_SWAB_H
-
-#include <linux/types.h>
-
-#include <asm/swab.h>
-
-/*
- * casts are necessary for constants, because we never know how for sure
- * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way.
- */
-#define ___constant_swab16(x) ((__u16)(				\
-	(((__u16)(x) & (__u16)0x00ffU) << 8) |			\
-	(((__u16)(x) & (__u16)0xff00U) >> 8)))
-
-#define ___constant_swab32(x) ((__u32)(				\
-	(((__u32)(x) & (__u32)0x000000ffUL) << 24) |		\
-	(((__u32)(x) & (__u32)0x0000ff00UL) <<  8) |		\
-	(((__u32)(x) & (__u32)0x00ff0000UL) >>  8) |		\
-	(((__u32)(x) & (__u32)0xff000000UL) >> 24)))
-
-#define ___constant_swab64(x) ((__u64)(				\
-	(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) |	\
-	(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) |	\
-	(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) |	\
-	(((__u64)(x) & (__u64)0x00000000ff000000ULL) <<  8) |	\
-	(((__u64)(x) & (__u64)0x000000ff00000000ULL) >>  8) |	\
-	(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) |	\
-	(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) |	\
-	(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56)))
-
-#define ___constant_swahw32(x) ((__u32)(			\
-	(((__u32)(x) & (__u32)0x0000ffffUL) << 16) |		\
-	(((__u32)(x) & (__u32)0xffff0000UL) >> 16)))
-
-#define ___constant_swahb32(x) ((__u32)(			\
-	(((__u32)(x) & (__u32)0x00ff00ffUL) << 8) |		\
-	(((__u32)(x) & (__u32)0xff00ff00UL) >> 8)))
-
-/*
- * Implement the following as inlines, but define the interface using
- * macros to allow constant folding when possible:
- * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
- */
-
-static __inline__  __u16 __fswab16(__u16 val)
-{
-#ifdef __HAVE_BUILTIN_BSWAP16__
-	return __builtin_bswap16(val);
-#elif defined (__arch_swab16)
-	return __arch_swab16(val);
-#else
-	return ___constant_swab16(val);
-#endif
-}
-
-static __inline__  __u32 __fswab32(__u32 val)
-{
-#ifdef __HAVE_BUILTIN_BSWAP32__
-	return __builtin_bswap32(val);
-#elif defined(__arch_swab32)
-	return __arch_swab32(val);
-#else
-	return ___constant_swab32(val);
-#endif
-}
-
-static __inline__  __u64 __fswab64(__u64 val)
-{
-#ifdef __HAVE_BUILTIN_BSWAP64__
-	return __builtin_bswap64(val);
-#elif defined (__arch_swab64)
-	return __arch_swab64(val);
-#elif defined(__SWAB_64_THRU_32__)
-	__u32 h = val >> 32;
-	__u32 l = val & ((1ULL << 32) - 1);
-	return (((__u64)__fswab32(l)) << 32) | ((__u64)(__fswab32(h)));
-#else
-	return ___constant_swab64(val);
-#endif
-}
-
-static __inline__  __u32 __fswahw32(__u32 val)
-{
-#ifdef __arch_swahw32
-	return __arch_swahw32(val);
-#else
-	return ___constant_swahw32(val);
-#endif
-}
-
-static __inline__  __u32 __fswahb32(__u32 val)
-{
-#ifdef __arch_swahb32
-	return __arch_swahb32(val);
-#else
-	return ___constant_swahb32(val);
-#endif
-}
-
-/**
- * __swab16 - return a byteswapped 16-bit value
- * @x: value to byteswap
- */
-#define __swab16(x)				\
-	(__builtin_constant_p((__u16)(x)) ?	\
-	___constant_swab16(x) :			\
-	__fswab16(x))
-
-/**
- * __swab32 - return a byteswapped 32-bit value
- * @x: value to byteswap
- */
-#define __swab32(x)				\
-	(__builtin_constant_p((__u32)(x)) ?	\
-	___constant_swab32(x) :			\
-	__fswab32(x))
-
-/**
- * __swab64 - return a byteswapped 64-bit value
- * @x: value to byteswap
- */
-#define __swab64(x)				\
-	(__builtin_constant_p((__u64)(x)) ?	\
-	___constant_swab64(x) :			\
-	__fswab64(x))
-
-/**
- * __swahw32 - return a word-swapped 32-bit value
- * @x: value to wordswap
- *
- * __swahw32(0x12340000) is 0x00001234
- */
-#define __swahw32(x)				\
-	(__builtin_constant_p((__u32)(x)) ?	\
-	___constant_swahw32(x) :		\
-	__fswahw32(x))
-
-/**
- * __swahb32 - return a high and low byte-swapped 32-bit value
- * @x: value to byteswap
- *
- * __swahb32(0x12345678) is 0x34127856
- */
-#define __swahb32(x)				\
-	(__builtin_constant_p((__u32)(x)) ?	\
-	___constant_swahb32(x) :		\
-	__fswahb32(x))
-
-/**
- * __swab16p - return a byteswapped 16-bit value from a pointer
- * @p: pointer to a naturally-aligned 16-bit value
- */
-static __inline__ __u16 __swab16p(const __u16 *p)
-{
-#ifdef __arch_swab16p
-	return __arch_swab16p(p);
-#else
-	return __swab16(*p);
-#endif
-}
-
-/**
- * __swab32p - return a byteswapped 32-bit value from a pointer
- * @p: pointer to a naturally-aligned 32-bit value
- */
-static __inline__ __u32 __swab32p(const __u32 *p)
-{
-#ifdef __arch_swab32p
-	return __arch_swab32p(p);
-#else
-	return __swab32(*p);
-#endif
-}
-
-/**
- * __swab64p - return a byteswapped 64-bit value from a pointer
- * @p: pointer to a naturally-aligned 64-bit value
- */
-static __inline__ __u64 __swab64p(const __u64 *p)
-{
-#ifdef __arch_swab64p
-	return __arch_swab64p(p);
-#else
-	return __swab64(*p);
-#endif
-}
-
-/**
- * __swahw32p - return a wordswapped 32-bit value from a pointer
- * @p: pointer to a naturally-aligned 32-bit value
- *
- * See __swahw32() for details of wordswapping.
- */
-static __inline__ __u32 __swahw32p(const __u32 *p)
-{
-#ifdef __arch_swahw32p
-	return __arch_swahw32p(p);
-#else
-	return __swahw32(*p);
-#endif
-}
-
-/**
- * __swahb32p - return a high and low byteswapped 32-bit value from a pointer
- * @p: pointer to a naturally-aligned 32-bit value
- *
- * See __swahb32() for details of high/low byteswapping.
- */
-static __inline__ __u32 __swahb32p(const __u32 *p)
-{
-#ifdef __arch_swahb32p
-	return __arch_swahb32p(p);
-#else
-	return __swahb32(*p);
-#endif
-}
-
-/**
- * __swab16s - byteswap a 16-bit value in-place
- * @p: pointer to a naturally-aligned 16-bit value
- */
-static __inline__ void __swab16s(__u16 *p)
-{
-#ifdef __arch_swab16s
-	__arch_swab16s(p);
-#else
-	*p = __swab16p(p);
-#endif
-}
-/**
- * __swab32s - byteswap a 32-bit value in-place
- * @p: pointer to a naturally-aligned 32-bit value
- */
-static __inline__ void __swab32s(__u32 *p)
-{
-#ifdef __arch_swab32s
-	__arch_swab32s(p);
-#else
-	*p = __swab32p(p);
-#endif
-}
-
-/**
- * __swab64s - byteswap a 64-bit value in-place
- * @p: pointer to a naturally-aligned 64-bit value
- */
-static __inline__ void __swab64s(__u64 *p)
-{
-#ifdef __arch_swab64s
-	__arch_swab64s(p);
-#else
-	*p = __swab64p(p);
-#endif
-}
-
-/**
- * __swahw32s - wordswap a 32-bit value in-place
- * @p: pointer to a naturally-aligned 32-bit value
- *
- * See __swahw32() for details of wordswapping
- */
-static __inline__ void __swahw32s(__u32 *p)
-{
-#ifdef __arch_swahw32s
-	__arch_swahw32s(p);
-#else
-	*p = __swahw32p(p);
-#endif
-}
-
-/**
- * __swahb32s - high and low byteswap a 32-bit value in-place
- * @p: pointer to a naturally-aligned 32-bit value
- *
- * See __swahb32() for details of high and low byte swapping
- */
-static __inline__ void __swahb32s(__u32 *p)
-{
-#ifdef __arch_swahb32s
-	__arch_swahb32s(p);
-#else
-	*p = __swahb32p(p);
-#endif
-}
-
-
-#endif /* _LINUX_SWAB_H */
diff --git a/openflow/usr/include/linux/synclink.h b/openflow/usr/include/linux/synclink.h
deleted file mode 100644
index 0818434..0000000
--- a/openflow/usr/include/linux/synclink.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * SyncLink Multiprotocol Serial Adapter Driver
- *
- * $Id: synclink.h,v 3.14 2006/07/17 20:15:43 paulkf Exp $
- *
- * Copyright (C) 1998-2000 by Microgate Corporation
- *
- * Redistribution of this file is permitted under
- * the terms of the GNU Public License (GPL)
- */
-
-#ifndef _SYNCLINK_H_
-#define _SYNCLINK_H_
-#define SYNCLINK_H_VERSION 3.6
-
-#include <linux/types.h>
-
-#define BIT0	0x0001
-#define BIT1	0x0002
-#define BIT2	0x0004
-#define BIT3	0x0008
-#define BIT4	0x0010
-#define BIT5	0x0020
-#define BIT6	0x0040
-#define BIT7	0x0080
-#define BIT8	0x0100
-#define BIT9	0x0200
-#define BIT10	0x0400
-#define BIT11	0x0800
-#define BIT12	0x1000
-#define BIT13	0x2000
-#define BIT14	0x4000
-#define BIT15	0x8000
-#define BIT16	0x00010000
-#define BIT17	0x00020000
-#define BIT18	0x00040000
-#define BIT19	0x00080000
-#define BIT20	0x00100000
-#define BIT21	0x00200000
-#define BIT22	0x00400000
-#define BIT23	0x00800000
-#define BIT24	0x01000000
-#define BIT25	0x02000000
-#define BIT26	0x04000000
-#define BIT27	0x08000000
-#define BIT28	0x10000000
-#define BIT29	0x20000000
-#define BIT30	0x40000000
-#define BIT31	0x80000000
-
-
-#define HDLC_MAX_FRAME_SIZE	65535
-#define MAX_ASYNC_TRANSMIT	4096
-#define MAX_ASYNC_BUFFER_SIZE	4096
-
-#define ASYNC_PARITY_NONE		0
-#define ASYNC_PARITY_EVEN		1
-#define ASYNC_PARITY_ODD		2
-#define ASYNC_PARITY_SPACE		3
-
-#define HDLC_FLAG_UNDERRUN_ABORT7	0x0000
-#define HDLC_FLAG_UNDERRUN_ABORT15	0x0001
-#define HDLC_FLAG_UNDERRUN_FLAG		0x0002
-#define HDLC_FLAG_UNDERRUN_CRC		0x0004
-#define HDLC_FLAG_SHARE_ZERO		0x0010
-#define HDLC_FLAG_AUTO_CTS		0x0020
-#define HDLC_FLAG_AUTO_DCD		0x0040
-#define HDLC_FLAG_AUTO_RTS		0x0080
-#define HDLC_FLAG_RXC_DPLL		0x0100
-#define HDLC_FLAG_RXC_BRG		0x0200
-#define HDLC_FLAG_RXC_TXCPIN		0x8000
-#define HDLC_FLAG_RXC_RXCPIN		0x0000
-#define HDLC_FLAG_TXC_DPLL		0x0400
-#define HDLC_FLAG_TXC_BRG		0x0800
-#define HDLC_FLAG_TXC_TXCPIN		0x0000
-#define HDLC_FLAG_TXC_RXCPIN		0x0008
-#define HDLC_FLAG_DPLL_DIV8		0x1000
-#define HDLC_FLAG_DPLL_DIV16		0x2000
-#define HDLC_FLAG_DPLL_DIV32		0x0000
-#define HDLC_FLAG_HDLC_LOOPMODE		0x4000
-
-#define HDLC_CRC_NONE			0
-#define HDLC_CRC_16_CCITT		1
-#define HDLC_CRC_32_CCITT		2
-#define HDLC_CRC_MASK			0x00ff
-#define HDLC_CRC_RETURN_EX		0x8000
-
-#define RX_OK				0
-#define RX_CRC_ERROR			1
-
-#define HDLC_TXIDLE_FLAGS		0
-#define HDLC_TXIDLE_ALT_ZEROS_ONES	1
-#define HDLC_TXIDLE_ZEROS		2
-#define HDLC_TXIDLE_ONES		3
-#define HDLC_TXIDLE_ALT_MARK_SPACE	4
-#define HDLC_TXIDLE_SPACE		5
-#define HDLC_TXIDLE_MARK		6
-#define HDLC_TXIDLE_CUSTOM_8            0x10000000
-#define HDLC_TXIDLE_CUSTOM_16           0x20000000
-
-#define HDLC_ENCODING_NRZ			0
-#define HDLC_ENCODING_NRZB			1
-#define HDLC_ENCODING_NRZI_MARK			2
-#define HDLC_ENCODING_NRZI_SPACE		3
-#define HDLC_ENCODING_NRZI			HDLC_ENCODING_NRZI_SPACE
-#define HDLC_ENCODING_BIPHASE_MARK		4
-#define HDLC_ENCODING_BIPHASE_SPACE		5
-#define HDLC_ENCODING_BIPHASE_LEVEL		6
-#define HDLC_ENCODING_DIFF_BIPHASE_LEVEL	7
-
-#define HDLC_PREAMBLE_LENGTH_8BITS	0
-#define HDLC_PREAMBLE_LENGTH_16BITS	1
-#define HDLC_PREAMBLE_LENGTH_32BITS	2
-#define HDLC_PREAMBLE_LENGTH_64BITS	3
-
-#define HDLC_PREAMBLE_PATTERN_NONE	0
-#define HDLC_PREAMBLE_PATTERN_ZEROS	1
-#define HDLC_PREAMBLE_PATTERN_FLAGS	2
-#define HDLC_PREAMBLE_PATTERN_10	3
-#define HDLC_PREAMBLE_PATTERN_01	4
-#define HDLC_PREAMBLE_PATTERN_ONES	5
-
-#define MGSL_MODE_ASYNC		1
-#define MGSL_MODE_HDLC		2
-#define MGSL_MODE_MONOSYNC	3
-#define MGSL_MODE_BISYNC	4
-#define MGSL_MODE_RAW		6
-#define MGSL_MODE_BASE_CLOCK    7
-#define MGSL_MODE_XSYNC         8
-
-#define MGSL_BUS_TYPE_ISA	1
-#define MGSL_BUS_TYPE_EISA	2
-#define MGSL_BUS_TYPE_PCI	5
-
-#define MGSL_INTERFACE_MASK     0xf
-#define MGSL_INTERFACE_DISABLE  0
-#define MGSL_INTERFACE_RS232    1
-#define MGSL_INTERFACE_V35      2
-#define MGSL_INTERFACE_RS422    3
-#define MGSL_INTERFACE_RTS_EN   0x10
-#define MGSL_INTERFACE_LL       0x20
-#define MGSL_INTERFACE_RL       0x40
-#define MGSL_INTERFACE_MSB_FIRST 0x80
-
-typedef struct _MGSL_PARAMS
-{
-	/* Common */
-
-	unsigned long	mode;		/* Asynchronous or HDLC */
-	unsigned char	loopback;	/* internal loopback mode */
-
-	/* HDLC Only */
-
-	unsigned short	flags;
-	unsigned char	encoding;	/* NRZ, NRZI, etc. */
-	unsigned long	clock_speed;	/* external clock speed in bits per second */
-	unsigned char	addr_filter;	/* receive HDLC address filter, 0xFF = disable */
-	unsigned short	crc_type;	/* None, CRC16-CCITT, or CRC32-CCITT */
-	unsigned char	preamble_length;
-	unsigned char	preamble;
-
-	/* Async Only */
-
-	unsigned long	data_rate;	/* bits per second */
-	unsigned char	data_bits;	/* 7 or 8 data bits */
-	unsigned char	stop_bits;	/* 1 or 2 stop bits */
-	unsigned char	parity;		/* none, even, or odd */
-
-} MGSL_PARAMS, *PMGSL_PARAMS;
-
-#define MICROGATE_VENDOR_ID 0x13c0
-#define SYNCLINK_DEVICE_ID 0x0010
-#define MGSCC_DEVICE_ID 0x0020
-#define SYNCLINK_SCA_DEVICE_ID 0x0030
-#define SYNCLINK_GT_DEVICE_ID 0x0070
-#define SYNCLINK_GT4_DEVICE_ID 0x0080
-#define SYNCLINK_AC_DEVICE_ID  0x0090
-#define SYNCLINK_GT2_DEVICE_ID 0x00A0
-#define MGSL_MAX_SERIAL_NUMBER 30
-
-/*
-** device diagnostics status
-*/
-
-#define DiagStatus_OK				0
-#define DiagStatus_AddressFailure		1
-#define DiagStatus_AddressConflict		2
-#define DiagStatus_IrqFailure			3
-#define DiagStatus_IrqConflict			4
-#define DiagStatus_DmaFailure			5
-#define DiagStatus_DmaConflict			6
-#define DiagStatus_PciAdapterNotFound		7
-#define DiagStatus_CantAssignPciResources	8
-#define DiagStatus_CantAssignPciMemAddr		9
-#define DiagStatus_CantAssignPciIoAddr		10
-#define DiagStatus_CantAssignPciIrq		11
-#define DiagStatus_MemoryError			12
-
-#define SerialSignal_DCD            0x01     /* Data Carrier Detect */
-#define SerialSignal_TXD            0x02     /* Transmit Data */
-#define SerialSignal_RI             0x04     /* Ring Indicator */
-#define SerialSignal_RXD            0x08     /* Receive Data */
-#define SerialSignal_CTS            0x10     /* Clear to Send */
-#define SerialSignal_RTS            0x20     /* Request to Send */
-#define SerialSignal_DSR            0x40     /* Data Set Ready */
-#define SerialSignal_DTR            0x80     /* Data Terminal Ready */
-
-
-/*
- * Counters of the input lines (CTS, DSR, RI, CD) interrupts
- */
-struct mgsl_icount {
-	__u32	cts, dsr, rng, dcd, tx, rx;
-	__u32	frame, parity, overrun, brk;
-	__u32	buf_overrun;
-	__u32	txok;
-	__u32	txunder;
-	__u32	txabort;
-	__u32	txtimeout;
-	__u32	rxshort;
-	__u32	rxlong;
-	__u32	rxabort;
-	__u32	rxover;
-	__u32	rxcrc;
-	__u32	rxok;
-	__u32	exithunt;
-	__u32	rxidle;
-};
-
-struct gpio_desc {
-	__u32 state;
-	__u32 smask;
-	__u32 dir;
-	__u32 dmask;
-};
-
-#define DEBUG_LEVEL_DATA	1
-#define DEBUG_LEVEL_ERROR 	2
-#define DEBUG_LEVEL_INFO  	3
-#define DEBUG_LEVEL_BH    	4
-#define DEBUG_LEVEL_ISR		5
-
-/*
-** Event bit flags for use with MgslWaitEvent
-*/
-
-#define MgslEvent_DsrActive	0x0001
-#define MgslEvent_DsrInactive	0x0002
-#define MgslEvent_Dsr		0x0003
-#define MgslEvent_CtsActive	0x0004
-#define MgslEvent_CtsInactive	0x0008
-#define MgslEvent_Cts		0x000c
-#define MgslEvent_DcdActive	0x0010
-#define MgslEvent_DcdInactive	0x0020
-#define MgslEvent_Dcd		0x0030
-#define MgslEvent_RiActive	0x0040
-#define MgslEvent_RiInactive	0x0080
-#define MgslEvent_Ri		0x00c0
-#define MgslEvent_ExitHuntMode	0x0100
-#define MgslEvent_IdleReceived	0x0200
-
-/* Private IOCTL codes:
- *
- * MGSL_IOCSPARAMS	set MGSL_PARAMS structure values
- * MGSL_IOCGPARAMS	get current MGSL_PARAMS structure values
- * MGSL_IOCSTXIDLE	set current transmit idle mode
- * MGSL_IOCGTXIDLE	get current transmit idle mode
- * MGSL_IOCTXENABLE	enable or disable transmitter
- * MGSL_IOCRXENABLE	enable or disable receiver
- * MGSL_IOCTXABORT	abort transmitting frame (HDLC)
- * MGSL_IOCGSTATS	return current statistics
- * MGSL_IOCWAITEVENT	wait for specified event to occur
- * MGSL_LOOPTXDONE	transmit in HDLC LoopMode done
- * MGSL_IOCSIF          set the serial interface type
- * MGSL_IOCGIF          get the serial interface type
- */
-#define MGSL_MAGIC_IOC	'm'
-#define MGSL_IOCSPARAMS		_IOW(MGSL_MAGIC_IOC,0,struct _MGSL_PARAMS)
-#define MGSL_IOCGPARAMS		_IOR(MGSL_MAGIC_IOC,1,struct _MGSL_PARAMS)
-#define MGSL_IOCSTXIDLE		_IO(MGSL_MAGIC_IOC,2)
-#define MGSL_IOCGTXIDLE		_IO(MGSL_MAGIC_IOC,3)
-#define MGSL_IOCTXENABLE	_IO(MGSL_MAGIC_IOC,4)
-#define MGSL_IOCRXENABLE	_IO(MGSL_MAGIC_IOC,5)
-#define MGSL_IOCTXABORT		_IO(MGSL_MAGIC_IOC,6)
-#define MGSL_IOCGSTATS		_IO(MGSL_MAGIC_IOC,7)
-#define MGSL_IOCWAITEVENT	_IOWR(MGSL_MAGIC_IOC,8,int)
-#define MGSL_IOCCLRMODCOUNT	_IO(MGSL_MAGIC_IOC,15)
-#define MGSL_IOCLOOPTXDONE	_IO(MGSL_MAGIC_IOC,9)
-#define MGSL_IOCSIF		_IO(MGSL_MAGIC_IOC,10)
-#define MGSL_IOCGIF		_IO(MGSL_MAGIC_IOC,11)
-#define MGSL_IOCSGPIO		_IOW(MGSL_MAGIC_IOC,16,struct gpio_desc)
-#define MGSL_IOCGGPIO		_IOR(MGSL_MAGIC_IOC,17,struct gpio_desc)
-#define MGSL_IOCWAITGPIO	_IOWR(MGSL_MAGIC_IOC,18,struct gpio_desc)
-#define MGSL_IOCSXSYNC		_IO(MGSL_MAGIC_IOC, 19)
-#define MGSL_IOCGXSYNC		_IO(MGSL_MAGIC_IOC, 20)
-#define MGSL_IOCSXCTRL		_IO(MGSL_MAGIC_IOC, 21)
-#define MGSL_IOCGXCTRL		_IO(MGSL_MAGIC_IOC, 22)
-
-
-#endif /* _SYNCLINK_H_ */
diff --git a/openflow/usr/include/linux/sysctl.h b/openflow/usr/include/linux/sysctl.h
deleted file mode 100644
index af4d004..0000000
--- a/openflow/usr/include/linux/sysctl.h
+++ /dev/null
@@ -1,934 +0,0 @@
-/*
- * sysctl.h: General linux system control interface
- *
- * Begun 24 March 1995, Stephen Tweedie
- *
- ****************************************************************
- ****************************************************************
- **
- **  WARNING:
- **  The values in this file are exported to user space via 
- **  the sysctl() binary interface.  Do *NOT* change the
- **  numbering of any existing values here, and do not change
- **  any numbers within any one set of values.  If you have to
- **  redefine an existing interface, use a new number for it.
- **  The kernel will then return -ENOTDIR to any application using
- **  the old binary interface.
- **
- ****************************************************************
- ****************************************************************
- */
-
-#ifndef _LINUX_SYSCTL_H
-#define _LINUX_SYSCTL_H
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-
-
-struct completion;
-
-#define CTL_MAXNAME 10		/* how many path components do we allow in a
-				   call to sysctl?   In other words, what is
-				   the largest acceptable value for the nlen
-				   member of a struct __sysctl_args to have? */
-
-struct __sysctl_args {
-	int *name;
-	int nlen;
-	void *oldval;
-	size_t *oldlenp;
-	void *newval;
-	size_t newlen;
-	unsigned long __unused[4];
-};
-
-/* Define sysctl names first */
-
-/* Top-level names: */
-
-enum
-{
-	CTL_KERN=1,		/* General kernel info and control */
-	CTL_VM=2,		/* VM management */
-	CTL_NET=3,		/* Networking */
-	CTL_PROC=4,		/* removal breaks strace(1) compilation */
-	CTL_FS=5,		/* Filesystems */
-	CTL_DEBUG=6,		/* Debugging */
-	CTL_DEV=7,		/* Devices */
-	CTL_BUS=8,		/* Busses */
-	CTL_ABI=9,		/* Binary emulation */
-	CTL_CPU=10,		/* CPU stuff (speed scaling, etc) */
-	CTL_ARLAN=254,		/* arlan wireless driver */
-	CTL_S390DBF=5677,	/* s390 debug */
-	CTL_SUNRPC=7249,	/* sunrpc debug */
-	CTL_PM=9899,		/* frv power management */
-	CTL_FRV=9898,		/* frv specific sysctls */
-};
-
-/* CTL_BUS names: */
-enum
-{
-	CTL_BUS_ISA=1		/* ISA */
-};
-
-/* /proc/sys/fs/inotify/ */
-enum
-{
-	INOTIFY_MAX_USER_INSTANCES=1,	/* max instances per user */
-	INOTIFY_MAX_USER_WATCHES=2,	/* max watches per user */
-	INOTIFY_MAX_QUEUED_EVENTS=3	/* max queued events per instance */
-};
-
-/* CTL_KERN names: */
-enum
-{
-	KERN_OSTYPE=1,		/* string: system version */
-	KERN_OSRELEASE=2,	/* string: system release */
-	KERN_OSREV=3,		/* int: system revision */
-	KERN_VERSION=4,		/* string: compile time info */
-	KERN_SECUREMASK=5,	/* struct: maximum rights mask */
-	KERN_PROF=6,		/* table: profiling information */
-	KERN_NODENAME=7,	/* string: hostname */
-	KERN_DOMAINNAME=8,	/* string: domainname */
-
-	KERN_PANIC=15,		/* int: panic timeout */
-	KERN_REALROOTDEV=16,	/* real root device to mount after initrd */
-
-	KERN_SPARC_REBOOT=21,	/* reboot command on Sparc */
-	KERN_CTLALTDEL=22,	/* int: allow ctl-alt-del to reboot */
-	KERN_PRINTK=23,		/* struct: control printk logging parameters */
-	KERN_NAMETRANS=24,	/* Name translation */
-	KERN_PPC_HTABRECLAIM=25, /* turn htab reclaimation on/off on PPC */
-	KERN_PPC_ZEROPAGED=26,	/* turn idle page zeroing on/off on PPC */
-	KERN_PPC_POWERSAVE_NAP=27, /* use nap mode for power saving */
-	KERN_MODPROBE=28,	/* string: modprobe path */
-	KERN_SG_BIG_BUFF=29,	/* int: sg driver reserved buffer size */
-	KERN_ACCT=30,		/* BSD process accounting parameters */
-	KERN_PPC_L2CR=31,	/* l2cr register on PPC */
-
-	KERN_RTSIGNR=32,	/* Number of rt sigs queued */
-	KERN_RTSIGMAX=33,	/* Max queuable */
-	
-	KERN_SHMMAX=34,         /* long: Maximum shared memory segment */
-	KERN_MSGMAX=35,         /* int: Maximum size of a messege */
-	KERN_MSGMNB=36,         /* int: Maximum message queue size */
-	KERN_MSGPOOL=37,        /* int: Maximum system message pool size */
-	KERN_SYSRQ=38,		/* int: Sysreq enable */
-	KERN_MAX_THREADS=39,	/* int: Maximum nr of threads in the system */
- 	KERN_RANDOM=40,		/* Random driver */
- 	KERN_SHMALL=41,		/* int: Maximum size of shared memory */
- 	KERN_MSGMNI=42,		/* int: msg queue identifiers */
- 	KERN_SEM=43,		/* struct: sysv semaphore limits */
- 	KERN_SPARC_STOP_A=44,	/* int: Sparc Stop-A enable */
- 	KERN_SHMMNI=45,		/* int: shm array identifiers */
-	KERN_OVERFLOWUID=46,	/* int: overflow UID */
-	KERN_OVERFLOWGID=47,	/* int: overflow GID */
-	KERN_SHMPATH=48,	/* string: path to shm fs */
-	KERN_HOTPLUG=49,	/* string: path to uevent helper (deprecated) */
-	KERN_IEEE_EMULATION_WARNINGS=50, /* int: unimplemented ieee instructions */
-	KERN_S390_USER_DEBUG_LOGGING=51,  /* int: dumps of user faults */
-	KERN_CORE_USES_PID=52,		/* int: use core or core.%pid */
-	KERN_TAINTED=53,	/* int: various kernel tainted flags */
-	KERN_CADPID=54,		/* int: PID of the process to notify on CAD */
-	KERN_PIDMAX=55,		/* int: PID # limit */
-  	KERN_CORE_PATTERN=56,	/* string: pattern for core-file names */
-	KERN_PANIC_ON_OOPS=57,  /* int: whether we will panic on an oops */
-	KERN_HPPA_PWRSW=58,	/* int: hppa soft-power enable */
-	KERN_HPPA_UNALIGNED=59,	/* int: hppa unaligned-trap enable */
-	KERN_PRINTK_RATELIMIT=60, /* int: tune printk ratelimiting */
-	KERN_PRINTK_RATELIMIT_BURST=61,	/* int: tune printk ratelimiting */
-	KERN_PTY=62,		/* dir: pty driver */
-	KERN_NGROUPS_MAX=63,	/* int: NGROUPS_MAX */
-	KERN_SPARC_SCONS_PWROFF=64, /* int: serial console power-off halt */
-	KERN_HZ_TIMER=65,	/* int: hz timer on or off */
-	KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */
-	KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */
-	KERN_RANDOMIZE=68, /* int: randomize virtual address space */
-	KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */
-	KERN_SPIN_RETRY=70,	/* int: number of spinlock retries */
-	KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */
-	KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
-	KERN_COMPAT_LOG=73,	/* int: print compat layer  messages */
-	KERN_MAX_LOCK_DEPTH=74, /* int: rtmutex's maximum lock depth */
-	KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
-	KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
-	KERN_PANIC_ON_WARN=77, /* int: call panic() in WARN() functions */
-};
-
-
-
-/* CTL_VM names: */
-enum
-{
-	VM_UNUSED1=1,		/* was: struct: Set vm swapping control */
-	VM_UNUSED2=2,		/* was; int: Linear or sqrt() swapout for hogs */
-	VM_UNUSED3=3,		/* was: struct: Set free page thresholds */
-	VM_UNUSED4=4,		/* Spare */
-	VM_OVERCOMMIT_MEMORY=5,	/* Turn off the virtual memory safety limit */
-	VM_UNUSED5=6,		/* was: struct: Set buffer memory thresholds */
-	VM_UNUSED7=7,		/* was: struct: Set cache memory thresholds */
-	VM_UNUSED8=8,		/* was: struct: Control kswapd behaviour */
-	VM_UNUSED9=9,		/* was: struct: Set page table cache parameters */
-	VM_PAGE_CLUSTER=10,	/* int: set number of pages to swap together */
-	VM_DIRTY_BACKGROUND=11,	/* dirty_background_ratio */
-	VM_DIRTY_RATIO=12,	/* dirty_ratio */
-	VM_DIRTY_WB_CS=13,	/* dirty_writeback_centisecs */
-	VM_DIRTY_EXPIRE_CS=14,	/* dirty_expire_centisecs */
-	VM_NR_PDFLUSH_THREADS=15, /* nr_pdflush_threads */
-	VM_OVERCOMMIT_RATIO=16, /* percent of RAM to allow overcommit in */
-	VM_PAGEBUF=17,		/* struct: Control pagebuf parameters */
-	VM_HUGETLB_PAGES=18,	/* int: Number of available Huge Pages */
-	VM_SWAPPINESS=19,	/* Tendency to steal mapped memory */
-	VM_LOWMEM_RESERVE_RATIO=20,/* reservation ratio for lower memory zones */
-	VM_MIN_FREE_KBYTES=21,	/* Minimum free kilobytes to maintain */
-	VM_MAX_MAP_COUNT=22,	/* int: Maximum number of mmaps/address-space */
-	VM_LAPTOP_MODE=23,	/* vm laptop mode */
-	VM_BLOCK_DUMP=24,	/* block dump mode */
-	VM_HUGETLB_GROUP=25,	/* permitted hugetlb group */
-	VM_VFS_CACHE_PRESSURE=26, /* dcache/icache reclaim pressure */
-	VM_LEGACY_VA_LAYOUT=27, /* legacy/compatibility virtual address space layout */
-	VM_SWAP_TOKEN_TIMEOUT=28, /* default time for token time out */
-	VM_DROP_PAGECACHE=29,	/* int: nuke lots of pagecache */
-	VM_PERCPU_PAGELIST_FRACTION=30,/* int: fraction of pages in each percpu_pagelist */
-	VM_ZONE_RECLAIM_MODE=31, /* reclaim local zone memory before going off node */
-	VM_MIN_UNMAPPED=32,	/* Set min percent of unmapped pages */
-	VM_PANIC_ON_OOM=33,	/* panic at out-of-memory */
-	VM_VDSO_ENABLED=34,	/* map VDSO into new processes? */
-	VM_MIN_SLAB=35,		 /* Percent pages ignored by zone reclaim */
-};
-
-
-/* CTL_NET names: */
-enum
-{
-	NET_CORE=1,
-	NET_ETHER=2,
-	NET_802=3,
-	NET_UNIX=4,
-	NET_IPV4=5,
-	NET_IPX=6,
-	NET_ATALK=7,
-	NET_NETROM=8,
-	NET_AX25=9,
-	NET_BRIDGE=10,
-	NET_ROSE=11,
-	NET_IPV6=12,
-	NET_X25=13,
-	NET_TR=14,
-	NET_DECNET=15,
-	NET_ECONET=16,
-	NET_SCTP=17,
-	NET_LLC=18,
-	NET_NETFILTER=19,
-	NET_DCCP=20,
-	NET_IRDA=412,
-};
-
-/* /proc/sys/kernel/random */
-enum
-{
-	RANDOM_POOLSIZE=1,
-	RANDOM_ENTROPY_COUNT=2,
-	RANDOM_READ_THRESH=3,
-	RANDOM_WRITE_THRESH=4,
-	RANDOM_BOOT_ID=5,
-	RANDOM_UUID=6
-};
-
-/* /proc/sys/kernel/pty */
-enum
-{
-	PTY_MAX=1,
-	PTY_NR=2
-};
-
-/* /proc/sys/bus/isa */
-enum
-{
-	BUS_ISA_MEM_BASE=1,
-	BUS_ISA_PORT_BASE=2,
-	BUS_ISA_PORT_SHIFT=3
-};
-
-/* /proc/sys/net/core */
-enum
-{
-	NET_CORE_WMEM_MAX=1,
-	NET_CORE_RMEM_MAX=2,
-	NET_CORE_WMEM_DEFAULT=3,
-	NET_CORE_RMEM_DEFAULT=4,
-/* was	NET_CORE_DESTROY_DELAY */
-	NET_CORE_MAX_BACKLOG=6,
-	NET_CORE_FASTROUTE=7,
-	NET_CORE_MSG_COST=8,
-	NET_CORE_MSG_BURST=9,
-	NET_CORE_OPTMEM_MAX=10,
-	NET_CORE_HOT_LIST_LENGTH=11,
-	NET_CORE_DIVERT_VERSION=12,
-	NET_CORE_NO_CONG_THRESH=13,
-	NET_CORE_NO_CONG=14,
-	NET_CORE_LO_CONG=15,
-	NET_CORE_MOD_CONG=16,
-	NET_CORE_DEV_WEIGHT=17,
-	NET_CORE_SOMAXCONN=18,
-	NET_CORE_BUDGET=19,
-	NET_CORE_AEVENT_ETIME=20,
-	NET_CORE_AEVENT_RSEQTH=21,
-	NET_CORE_WARNINGS=22,
-};
-
-/* /proc/sys/net/ethernet */
-
-/* /proc/sys/net/802 */
-
-/* /proc/sys/net/unix */
-
-enum
-{
-	NET_UNIX_DESTROY_DELAY=1,
-	NET_UNIX_DELETE_DELAY=2,
-	NET_UNIX_MAX_DGRAM_QLEN=3,
-};
-
-/* /proc/sys/net/netfilter */
-enum
-{
-	NET_NF_CONNTRACK_MAX=1,
-	NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT=2,
-	NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV=3,
-	NET_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED=4,
-	NET_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT=5,
-	NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT=6,
-	NET_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK=7,
-	NET_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT=8,
-	NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE=9,
-	NET_NF_CONNTRACK_UDP_TIMEOUT=10,
-	NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11,
-	NET_NF_CONNTRACK_ICMP_TIMEOUT=12,
-	NET_NF_CONNTRACK_GENERIC_TIMEOUT=13,
-	NET_NF_CONNTRACK_BUCKETS=14,
-	NET_NF_CONNTRACK_LOG_INVALID=15,
-	NET_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS=16,
-	NET_NF_CONNTRACK_TCP_LOOSE=17,
-	NET_NF_CONNTRACK_TCP_BE_LIBERAL=18,
-	NET_NF_CONNTRACK_TCP_MAX_RETRANS=19,
-	NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED=20,
-	NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT=21,
-	NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED=22,
-	NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED=23,
-	NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT=24,
-	NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD=25,
-	NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT=26,
-	NET_NF_CONNTRACK_COUNT=27,
-	NET_NF_CONNTRACK_ICMPV6_TIMEOUT=28,
-	NET_NF_CONNTRACK_FRAG6_TIMEOUT=29,
-	NET_NF_CONNTRACK_FRAG6_LOW_THRESH=30,
-	NET_NF_CONNTRACK_FRAG6_HIGH_THRESH=31,
-	NET_NF_CONNTRACK_CHECKSUM=32,
-};
-
-/* /proc/sys/net/ipv4 */
-enum
-{
-	/* v2.0 compatibile variables */
-	NET_IPV4_FORWARD=8,
-	NET_IPV4_DYNADDR=9,
-
-	NET_IPV4_CONF=16,
-	NET_IPV4_NEIGH=17,
-	NET_IPV4_ROUTE=18,
-	NET_IPV4_FIB_HASH=19,
-	NET_IPV4_NETFILTER=20,
-
-	NET_IPV4_TCP_TIMESTAMPS=33,
-	NET_IPV4_TCP_WINDOW_SCALING=34,
-	NET_IPV4_TCP_SACK=35,
-	NET_IPV4_TCP_RETRANS_COLLAPSE=36,
-	NET_IPV4_DEFAULT_TTL=37,
-	NET_IPV4_AUTOCONFIG=38,
-	NET_IPV4_NO_PMTU_DISC=39,
-	NET_IPV4_TCP_SYN_RETRIES=40,
-	NET_IPV4_IPFRAG_HIGH_THRESH=41,
-	NET_IPV4_IPFRAG_LOW_THRESH=42,
-	NET_IPV4_IPFRAG_TIME=43,
-	NET_IPV4_TCP_MAX_KA_PROBES=44,
-	NET_IPV4_TCP_KEEPALIVE_TIME=45,
-	NET_IPV4_TCP_KEEPALIVE_PROBES=46,
-	NET_IPV4_TCP_RETRIES1=47,
-	NET_IPV4_TCP_RETRIES2=48,
-	NET_IPV4_TCP_FIN_TIMEOUT=49,
-	NET_IPV4_IP_MASQ_DEBUG=50,
-	NET_TCP_SYNCOOKIES=51,
-	NET_TCP_STDURG=52,
-	NET_TCP_RFC1337=53,
-	NET_TCP_SYN_TAILDROP=54,
-	NET_TCP_MAX_SYN_BACKLOG=55,
-	NET_IPV4_LOCAL_PORT_RANGE=56,
-	NET_IPV4_ICMP_ECHO_IGNORE_ALL=57,
-	NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS=58,
-	NET_IPV4_ICMP_SOURCEQUENCH_RATE=59,
-	NET_IPV4_ICMP_DESTUNREACH_RATE=60,
-	NET_IPV4_ICMP_TIMEEXCEED_RATE=61,
-	NET_IPV4_ICMP_PARAMPROB_RATE=62,
-	NET_IPV4_ICMP_ECHOREPLY_RATE=63,
-	NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES=64,
-	NET_IPV4_IGMP_MAX_MEMBERSHIPS=65,
-	NET_TCP_TW_RECYCLE=66,
-	NET_IPV4_ALWAYS_DEFRAG=67,
-	NET_IPV4_TCP_KEEPALIVE_INTVL=68,
-	NET_IPV4_INET_PEER_THRESHOLD=69,
-	NET_IPV4_INET_PEER_MINTTL=70,
-	NET_IPV4_INET_PEER_MAXTTL=71,
-	NET_IPV4_INET_PEER_GC_MINTIME=72,
-	NET_IPV4_INET_PEER_GC_MAXTIME=73,
-	NET_TCP_ORPHAN_RETRIES=74,
-	NET_TCP_ABORT_ON_OVERFLOW=75,
-	NET_TCP_SYNACK_RETRIES=76,
-	NET_TCP_MAX_ORPHANS=77,
-	NET_TCP_MAX_TW_BUCKETS=78,
-	NET_TCP_FACK=79,
-	NET_TCP_REORDERING=80,
-	NET_TCP_ECN=81,
-	NET_TCP_DSACK=82,
-	NET_TCP_MEM=83,
-	NET_TCP_WMEM=84,
-	NET_TCP_RMEM=85,
-	NET_TCP_APP_WIN=86,
-	NET_TCP_ADV_WIN_SCALE=87,
-	NET_IPV4_NONLOCAL_BIND=88,
-	NET_IPV4_ICMP_RATELIMIT=89,
-	NET_IPV4_ICMP_RATEMASK=90,
-	NET_TCP_TW_REUSE=91,
-	NET_TCP_FRTO=92,
-	NET_TCP_LOW_LATENCY=93,
-	NET_IPV4_IPFRAG_SECRET_INTERVAL=94,
-	NET_IPV4_IGMP_MAX_MSF=96,
-	NET_TCP_NO_METRICS_SAVE=97,
-	NET_TCP_DEFAULT_WIN_SCALE=105,
-	NET_TCP_MODERATE_RCVBUF=106,
-	NET_TCP_TSO_WIN_DIVISOR=107,
-	NET_TCP_BIC_BETA=108,
-	NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR=109,
-	NET_TCP_CONG_CONTROL=110,
-	NET_TCP_ABC=111,
-	NET_IPV4_IPFRAG_MAX_DIST=112,
- 	NET_TCP_MTU_PROBING=113,
-	NET_TCP_BASE_MSS=114,
-	NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS=115,
-	NET_TCP_DMA_COPYBREAK=116,
-	NET_TCP_SLOW_START_AFTER_IDLE=117,
-	NET_CIPSOV4_CACHE_ENABLE=118,
-	NET_CIPSOV4_CACHE_BUCKET_SIZE=119,
-	NET_CIPSOV4_RBM_OPTFMT=120,
-	NET_CIPSOV4_RBM_STRICTVALID=121,
-	NET_TCP_AVAIL_CONG_CONTROL=122,
-	NET_TCP_ALLOWED_CONG_CONTROL=123,
-	NET_TCP_MAX_SSTHRESH=124,
-	NET_TCP_FRTO_RESPONSE=125,
-};
-
-enum {
-	NET_IPV4_ROUTE_FLUSH=1,
-	NET_IPV4_ROUTE_MIN_DELAY=2, /* obsolete since 2.6.25 */
-	NET_IPV4_ROUTE_MAX_DELAY=3, /* obsolete since 2.6.25 */
-	NET_IPV4_ROUTE_GC_THRESH=4,
-	NET_IPV4_ROUTE_MAX_SIZE=5,
-	NET_IPV4_ROUTE_GC_MIN_INTERVAL=6,
-	NET_IPV4_ROUTE_GC_TIMEOUT=7,
-	NET_IPV4_ROUTE_GC_INTERVAL=8, /* obsolete since 2.6.38 */
-	NET_IPV4_ROUTE_REDIRECT_LOAD=9,
-	NET_IPV4_ROUTE_REDIRECT_NUMBER=10,
-	NET_IPV4_ROUTE_REDIRECT_SILENCE=11,
-	NET_IPV4_ROUTE_ERROR_COST=12,
-	NET_IPV4_ROUTE_ERROR_BURST=13,
-	NET_IPV4_ROUTE_GC_ELASTICITY=14,
-	NET_IPV4_ROUTE_MTU_EXPIRES=15,
-	NET_IPV4_ROUTE_MIN_PMTU=16,
-	NET_IPV4_ROUTE_MIN_ADVMSS=17,
-	NET_IPV4_ROUTE_SECRET_INTERVAL=18,
-	NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS=19,
-};
-
-enum
-{
-	NET_PROTO_CONF_ALL=-2,
-	NET_PROTO_CONF_DEFAULT=-3
-
-	/* And device ifindices ... */
-};
-
-enum
-{
-	NET_IPV4_CONF_FORWARDING=1,
-	NET_IPV4_CONF_MC_FORWARDING=2,
-	NET_IPV4_CONF_PROXY_ARP=3,
-	NET_IPV4_CONF_ACCEPT_REDIRECTS=4,
-	NET_IPV4_CONF_SECURE_REDIRECTS=5,
-	NET_IPV4_CONF_SEND_REDIRECTS=6,
-	NET_IPV4_CONF_SHARED_MEDIA=7,
-	NET_IPV4_CONF_RP_FILTER=8,
-	NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE=9,
-	NET_IPV4_CONF_BOOTP_RELAY=10,
-	NET_IPV4_CONF_LOG_MARTIANS=11,
-	NET_IPV4_CONF_TAG=12,
-	NET_IPV4_CONF_ARPFILTER=13,
-	NET_IPV4_CONF_MEDIUM_ID=14,
-	NET_IPV4_CONF_NOXFRM=15,
-	NET_IPV4_CONF_NOPOLICY=16,
-	NET_IPV4_CONF_FORCE_IGMP_VERSION=17,
-	NET_IPV4_CONF_ARP_ANNOUNCE=18,
-	NET_IPV4_CONF_ARP_IGNORE=19,
-	NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
-	NET_IPV4_CONF_ARP_ACCEPT=21,
-	NET_IPV4_CONF_ARP_NOTIFY=22,
-};
-
-/* /proc/sys/net/ipv4/netfilter */
-enum
-{
-	NET_IPV4_NF_CONNTRACK_MAX=1,
-	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT=2,
-	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV=3,
-	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED=4,
-	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT=5,
-	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT=6,
-	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK=7,
-	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT=8,
-	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE=9,
-	NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT=10,
-	NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11,
-	NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT=12,
-	NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT=13,
-	NET_IPV4_NF_CONNTRACK_BUCKETS=14,
-	NET_IPV4_NF_CONNTRACK_LOG_INVALID=15,
-	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS=16,
-	NET_IPV4_NF_CONNTRACK_TCP_LOOSE=17,
-	NET_IPV4_NF_CONNTRACK_TCP_BE_LIBERAL=18,
-	NET_IPV4_NF_CONNTRACK_TCP_MAX_RETRANS=19,
- 	NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED=20,
- 	NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT=21,
- 	NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED=22,
- 	NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED=23,
- 	NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT=24,
- 	NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD=25,
- 	NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT=26,
-	NET_IPV4_NF_CONNTRACK_COUNT=27,
-	NET_IPV4_NF_CONNTRACK_CHECKSUM=28,
-};
- 
-/* /proc/sys/net/ipv6 */
-enum {
-	NET_IPV6_CONF=16,
-	NET_IPV6_NEIGH=17,
-	NET_IPV6_ROUTE=18,
-	NET_IPV6_ICMP=19,
-	NET_IPV6_BINDV6ONLY=20,
-	NET_IPV6_IP6FRAG_HIGH_THRESH=21,
-	NET_IPV6_IP6FRAG_LOW_THRESH=22,
-	NET_IPV6_IP6FRAG_TIME=23,
-	NET_IPV6_IP6FRAG_SECRET_INTERVAL=24,
-	NET_IPV6_MLD_MAX_MSF=25,
-};
-
-enum {
-	NET_IPV6_ROUTE_FLUSH=1,
-	NET_IPV6_ROUTE_GC_THRESH=2,
-	NET_IPV6_ROUTE_MAX_SIZE=3,
-	NET_IPV6_ROUTE_GC_MIN_INTERVAL=4,
-	NET_IPV6_ROUTE_GC_TIMEOUT=5,
-	NET_IPV6_ROUTE_GC_INTERVAL=6,
-	NET_IPV6_ROUTE_GC_ELASTICITY=7,
-	NET_IPV6_ROUTE_MTU_EXPIRES=8,
-	NET_IPV6_ROUTE_MIN_ADVMSS=9,
-	NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS=10
-};
-
-enum {
-	NET_IPV6_FORWARDING=1,
-	NET_IPV6_HOP_LIMIT=2,
-	NET_IPV6_MTU=3,
-	NET_IPV6_ACCEPT_RA=4,
-	NET_IPV6_ACCEPT_REDIRECTS=5,
-	NET_IPV6_AUTOCONF=6,
-	NET_IPV6_DAD_TRANSMITS=7,
-	NET_IPV6_RTR_SOLICITS=8,
-	NET_IPV6_RTR_SOLICIT_INTERVAL=9,
-	NET_IPV6_RTR_SOLICIT_DELAY=10,
-	NET_IPV6_USE_TEMPADDR=11,
-	NET_IPV6_TEMP_VALID_LFT=12,
-	NET_IPV6_TEMP_PREFERED_LFT=13,
-	NET_IPV6_REGEN_MAX_RETRY=14,
-	NET_IPV6_MAX_DESYNC_FACTOR=15,
-	NET_IPV6_MAX_ADDRESSES=16,
-	NET_IPV6_FORCE_MLD_VERSION=17,
-	NET_IPV6_ACCEPT_RA_DEFRTR=18,
-	NET_IPV6_ACCEPT_RA_PINFO=19,
-	NET_IPV6_ACCEPT_RA_RTR_PREF=20,
-	NET_IPV6_RTR_PROBE_INTERVAL=21,
-	NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,
-	NET_IPV6_PROXY_NDP=23,
-	NET_IPV6_ACCEPT_SOURCE_ROUTE=25,
-	NET_IPV6_ACCEPT_RA_FROM_LOCAL=26,
-	__NET_IPV6_MAX
-};
-
-/* /proc/sys/net/ipv6/icmp */
-enum {
-	NET_IPV6_ICMP_RATELIMIT=1
-};
-
-/* /proc/sys/net/<protocol>/neigh/<dev> */
-enum {
-	NET_NEIGH_MCAST_SOLICIT=1,
-	NET_NEIGH_UCAST_SOLICIT=2,
-	NET_NEIGH_APP_SOLICIT=3,
-	NET_NEIGH_RETRANS_TIME=4,
-	NET_NEIGH_REACHABLE_TIME=5,
-	NET_NEIGH_DELAY_PROBE_TIME=6,
-	NET_NEIGH_GC_STALE_TIME=7,
-	NET_NEIGH_UNRES_QLEN=8,
-	NET_NEIGH_PROXY_QLEN=9,
-	NET_NEIGH_ANYCAST_DELAY=10,
-	NET_NEIGH_PROXY_DELAY=11,
-	NET_NEIGH_LOCKTIME=12,
-	NET_NEIGH_GC_INTERVAL=13,
-	NET_NEIGH_GC_THRESH1=14,
-	NET_NEIGH_GC_THRESH2=15,
-	NET_NEIGH_GC_THRESH3=16,
-	NET_NEIGH_RETRANS_TIME_MS=17,
-	NET_NEIGH_REACHABLE_TIME_MS=18,
-};
-
-/* /proc/sys/net/dccp */
-enum {
-	NET_DCCP_DEFAULT=1,
-};
-
-/* /proc/sys/net/ipx */
-enum {
-	NET_IPX_PPROP_BROADCASTING=1,
-	NET_IPX_FORWARDING=2
-};
-
-/* /proc/sys/net/llc */
-enum {
-	NET_LLC2=1,
-	NET_LLC_STATION=2,
-};
-
-/* /proc/sys/net/llc/llc2 */
-enum {
-	NET_LLC2_TIMEOUT=1,
-};
-
-/* /proc/sys/net/llc/station */
-enum {
-	NET_LLC_STATION_ACK_TIMEOUT=1,
-};
-
-/* /proc/sys/net/llc/llc2/timeout */
-enum {
-	NET_LLC2_ACK_TIMEOUT=1,
-	NET_LLC2_P_TIMEOUT=2,
-	NET_LLC2_REJ_TIMEOUT=3,
-	NET_LLC2_BUSY_TIMEOUT=4,
-};
-
-/* /proc/sys/net/appletalk */
-enum {
-	NET_ATALK_AARP_EXPIRY_TIME=1,
-	NET_ATALK_AARP_TICK_TIME=2,
-	NET_ATALK_AARP_RETRANSMIT_LIMIT=3,
-	NET_ATALK_AARP_RESOLVE_TIME=4
-};
-
-
-/* /proc/sys/net/netrom */
-enum {
-	NET_NETROM_DEFAULT_PATH_QUALITY=1,
-	NET_NETROM_OBSOLESCENCE_COUNT_INITIALISER=2,
-	NET_NETROM_NETWORK_TTL_INITIALISER=3,
-	NET_NETROM_TRANSPORT_TIMEOUT=4,
-	NET_NETROM_TRANSPORT_MAXIMUM_TRIES=5,
-	NET_NETROM_TRANSPORT_ACKNOWLEDGE_DELAY=6,
-	NET_NETROM_TRANSPORT_BUSY_DELAY=7,
-	NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE=8,
-	NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT=9,
-	NET_NETROM_ROUTING_CONTROL=10,
-	NET_NETROM_LINK_FAILS_COUNT=11,
-	NET_NETROM_RESET=12
-};
-
-/* /proc/sys/net/ax25 */
-enum {
-	NET_AX25_IP_DEFAULT_MODE=1,
-	NET_AX25_DEFAULT_MODE=2,
-	NET_AX25_BACKOFF_TYPE=3,
-	NET_AX25_CONNECT_MODE=4,
-	NET_AX25_STANDARD_WINDOW=5,
-	NET_AX25_EXTENDED_WINDOW=6,
-	NET_AX25_T1_TIMEOUT=7,
-	NET_AX25_T2_TIMEOUT=8,
-	NET_AX25_T3_TIMEOUT=9,
-	NET_AX25_IDLE_TIMEOUT=10,
-	NET_AX25_N2=11,
-	NET_AX25_PACLEN=12,
-	NET_AX25_PROTOCOL=13,
-	NET_AX25_DAMA_SLAVE_TIMEOUT=14
-};
-
-/* /proc/sys/net/rose */
-enum {
-	NET_ROSE_RESTART_REQUEST_TIMEOUT=1,
-	NET_ROSE_CALL_REQUEST_TIMEOUT=2,
-	NET_ROSE_RESET_REQUEST_TIMEOUT=3,
-	NET_ROSE_CLEAR_REQUEST_TIMEOUT=4,
-	NET_ROSE_ACK_HOLD_BACK_TIMEOUT=5,
-	NET_ROSE_ROUTING_CONTROL=6,
-	NET_ROSE_LINK_FAIL_TIMEOUT=7,
-	NET_ROSE_MAX_VCS=8,
-	NET_ROSE_WINDOW_SIZE=9,
-	NET_ROSE_NO_ACTIVITY_TIMEOUT=10
-};
-
-/* /proc/sys/net/x25 */
-enum {
-	NET_X25_RESTART_REQUEST_TIMEOUT=1,
-	NET_X25_CALL_REQUEST_TIMEOUT=2,
-	NET_X25_RESET_REQUEST_TIMEOUT=3,
-	NET_X25_CLEAR_REQUEST_TIMEOUT=4,
-	NET_X25_ACK_HOLD_BACK_TIMEOUT=5,
-	NET_X25_FORWARD=6
-};
-
-/* /proc/sys/net/token-ring */
-enum
-{
-	NET_TR_RIF_TIMEOUT=1
-};
-
-/* /proc/sys/net/decnet/ */
-enum {
-	NET_DECNET_NODE_TYPE = 1,
-	NET_DECNET_NODE_ADDRESS = 2,
-	NET_DECNET_NODE_NAME = 3,
-	NET_DECNET_DEFAULT_DEVICE = 4,
-	NET_DECNET_TIME_WAIT = 5,
-	NET_DECNET_DN_COUNT = 6,
-	NET_DECNET_DI_COUNT = 7,
-	NET_DECNET_DR_COUNT = 8,
-	NET_DECNET_DST_GC_INTERVAL = 9,
-	NET_DECNET_CONF = 10,
-	NET_DECNET_NO_FC_MAX_CWND = 11,
-	NET_DECNET_MEM = 12,
-	NET_DECNET_RMEM = 13,
-	NET_DECNET_WMEM = 14,
-	NET_DECNET_DEBUG_LEVEL = 255
-};
-
-/* /proc/sys/net/decnet/conf/<dev> */
-enum {
-	NET_DECNET_CONF_LOOPBACK = -2,
-	NET_DECNET_CONF_DDCMP = -3,
-	NET_DECNET_CONF_PPP = -4,
-	NET_DECNET_CONF_X25 = -5,
-	NET_DECNET_CONF_GRE = -6,
-	NET_DECNET_CONF_ETHER = -7
-
-	/* ... and ifindex of devices */
-};
-
-/* /proc/sys/net/decnet/conf/<dev>/ */
-enum {
-	NET_DECNET_CONF_DEV_PRIORITY = 1,
-	NET_DECNET_CONF_DEV_T1 = 2,
-	NET_DECNET_CONF_DEV_T2 = 3,
-	NET_DECNET_CONF_DEV_T3 = 4,
-	NET_DECNET_CONF_DEV_FORWARDING = 5,
-	NET_DECNET_CONF_DEV_BLKSIZE = 6,
-	NET_DECNET_CONF_DEV_STATE = 7
-};
-
-/* /proc/sys/net/sctp */
-enum {
-	NET_SCTP_RTO_INITIAL = 1,
-	NET_SCTP_RTO_MIN     = 2,
-	NET_SCTP_RTO_MAX     = 3,
-	NET_SCTP_RTO_ALPHA   = 4,
-	NET_SCTP_RTO_BETA    = 5,
-	NET_SCTP_VALID_COOKIE_LIFE       =  6,
-	NET_SCTP_ASSOCIATION_MAX_RETRANS =  7,
-	NET_SCTP_PATH_MAX_RETRANS        =  8,
-	NET_SCTP_MAX_INIT_RETRANSMITS    =  9,
-	NET_SCTP_HB_INTERVAL             = 10,
-	NET_SCTP_PRESERVE_ENABLE         = 11,
-	NET_SCTP_MAX_BURST               = 12,
-	NET_SCTP_ADDIP_ENABLE		 = 13,
-	NET_SCTP_PRSCTP_ENABLE		 = 14,
-	NET_SCTP_SNDBUF_POLICY		 = 15,
-	NET_SCTP_SACK_TIMEOUT		 = 16,
-	NET_SCTP_RCVBUF_POLICY		 = 17,
-};
-
-/* /proc/sys/net/bridge */
-enum {
-	NET_BRIDGE_NF_CALL_ARPTABLES = 1,
-	NET_BRIDGE_NF_CALL_IPTABLES = 2,
-	NET_BRIDGE_NF_CALL_IP6TABLES = 3,
-	NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4,
-	NET_BRIDGE_NF_FILTER_PPPOE_TAGGED = 5,
-};
-
-/* proc/sys/net/irda */
-enum {
-	NET_IRDA_DISCOVERY=1,
-	NET_IRDA_DEVNAME=2,
-	NET_IRDA_DEBUG=3,
-	NET_IRDA_FAST_POLL=4,
-	NET_IRDA_DISCOVERY_SLOTS=5,
-	NET_IRDA_DISCOVERY_TIMEOUT=6,
-	NET_IRDA_SLOT_TIMEOUT=7,
-	NET_IRDA_MAX_BAUD_RATE=8,
-	NET_IRDA_MIN_TX_TURN_TIME=9,
-	NET_IRDA_MAX_TX_DATA_SIZE=10,
-	NET_IRDA_MAX_TX_WINDOW=11,
-	NET_IRDA_MAX_NOREPLY_TIME=12,
-	NET_IRDA_WARN_NOREPLY_TIME=13,
-	NET_IRDA_LAP_KEEPALIVE_TIME=14,
-};
-
-
-/* CTL_FS names: */
-enum
-{
-	FS_NRINODE=1,	/* int:current number of allocated inodes */
-	FS_STATINODE=2,
-	FS_MAXINODE=3,	/* int:maximum number of inodes that can be allocated */
-	FS_NRDQUOT=4,	/* int:current number of allocated dquots */
-	FS_MAXDQUOT=5,	/* int:maximum number of dquots that can be allocated */
-	FS_NRFILE=6,	/* int:current number of allocated filedescriptors */
-	FS_MAXFILE=7,	/* int:maximum number of filedescriptors that can be allocated */
-	FS_DENTRY=8,
-	FS_NRSUPER=9,	/* int:current number of allocated super_blocks */
-	FS_MAXSUPER=10,	/* int:maximum number of super_blocks that can be allocated */
-	FS_OVERFLOWUID=11,	/* int: overflow UID */
-	FS_OVERFLOWGID=12,	/* int: overflow GID */
-	FS_LEASES=13,	/* int: leases enabled */
-	FS_DIR_NOTIFY=14,	/* int: directory notification enabled */
-	FS_LEASE_TIME=15,	/* int: maximum time to wait for a lease break */
-	FS_DQSTATS=16,	/* disc quota usage statistics and control */
-	FS_XFS=17,	/* struct: control xfs parameters */
-	FS_AIO_NR=18,	/* current system-wide number of aio requests */
-	FS_AIO_MAX_NR=19,	/* system-wide maximum number of aio requests */
-	FS_INOTIFY=20,	/* inotify submenu */
-	FS_OCFS2=988,	/* ocfs2 */
-};
-
-/* /proc/sys/fs/quota/ */
-enum {
-	FS_DQ_LOOKUPS = 1,
-	FS_DQ_DROPS = 2,
-	FS_DQ_READS = 3,
-	FS_DQ_WRITES = 4,
-	FS_DQ_CACHE_HITS = 5,
-	FS_DQ_ALLOCATED = 6,
-	FS_DQ_FREE = 7,
-	FS_DQ_SYNCS = 8,
-	FS_DQ_WARNINGS = 9,
-};
-
-/* CTL_DEBUG names: */
-
-/* CTL_DEV names: */
-enum {
-	DEV_CDROM=1,
-	DEV_HWMON=2,
-	DEV_PARPORT=3,
-	DEV_RAID=4,
-	DEV_MAC_HID=5,
-	DEV_SCSI=6,
-	DEV_IPMI=7,
-};
-
-/* /proc/sys/dev/cdrom */
-enum {
-	DEV_CDROM_INFO=1,
-	DEV_CDROM_AUTOCLOSE=2,
-	DEV_CDROM_AUTOEJECT=3,
-	DEV_CDROM_DEBUG=4,
-	DEV_CDROM_LOCK=5,
-	DEV_CDROM_CHECK_MEDIA=6
-};
-
-/* /proc/sys/dev/parport */
-enum {
-	DEV_PARPORT_DEFAULT=-3
-};
-
-/* /proc/sys/dev/raid */
-enum {
-	DEV_RAID_SPEED_LIMIT_MIN=1,
-	DEV_RAID_SPEED_LIMIT_MAX=2
-};
-
-/* /proc/sys/dev/parport/default */
-enum {
-	DEV_PARPORT_DEFAULT_TIMESLICE=1,
-	DEV_PARPORT_DEFAULT_SPINTIME=2
-};
-
-/* /proc/sys/dev/parport/parport n */
-enum {
-	DEV_PARPORT_SPINTIME=1,
-	DEV_PARPORT_BASE_ADDR=2,
-	DEV_PARPORT_IRQ=3,
-	DEV_PARPORT_DMA=4,
-	DEV_PARPORT_MODES=5,
-	DEV_PARPORT_DEVICES=6,
-	DEV_PARPORT_AUTOPROBE=16
-};
-
-/* /proc/sys/dev/parport/parport n/devices/ */
-enum {
-	DEV_PARPORT_DEVICES_ACTIVE=-3,
-};
-
-/* /proc/sys/dev/parport/parport n/devices/device n */
-enum {
-	DEV_PARPORT_DEVICE_TIMESLICE=1,
-};
-
-/* /proc/sys/dev/mac_hid */
-enum {
-	DEV_MAC_HID_KEYBOARD_SENDS_LINUX_KEYCODES=1,
-	DEV_MAC_HID_KEYBOARD_LOCK_KEYCODES=2,
-	DEV_MAC_HID_MOUSE_BUTTON_EMULATION=3,
-	DEV_MAC_HID_MOUSE_BUTTON2_KEYCODE=4,
-	DEV_MAC_HID_MOUSE_BUTTON3_KEYCODE=5,
-	DEV_MAC_HID_ADB_MOUSE_SENDS_KEYCODES=6
-};
-
-/* /proc/sys/dev/scsi */
-enum {
-	DEV_SCSI_LOGGING_LEVEL=1,
-};
-
-/* /proc/sys/dev/ipmi */
-enum {
-	DEV_IPMI_POWEROFF_POWERCYCLE=1,
-};
-
-/* /proc/sys/abi */
-enum
-{
-	ABI_DEFHANDLER_COFF=1,	/* default handler for coff binaries */
-	ABI_DEFHANDLER_ELF=2, 	/* default handler for ELF binaries */
-	ABI_DEFHANDLER_LCALL7=3,/* default handler for procs using lcall7 */
-	ABI_DEFHANDLER_LIBCSO=4,/* default handler for an libc.so ELF interp */
-	ABI_TRACE=5,		/* tracing flags */
-	ABI_FAKE_UTSNAME=6,	/* fake target utsname information */
-};
-
-
-#endif /* _LINUX_SYSCTL_H */
diff --git a/openflow/usr/include/linux/sysinfo.h b/openflow/usr/include/linux/sysinfo.h
deleted file mode 100644
index 934335a..0000000
--- a/openflow/usr/include/linux/sysinfo.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _LINUX_SYSINFO_H
-#define _LINUX_SYSINFO_H
-
-#include <linux/types.h>
-
-#define SI_LOAD_SHIFT	16
-struct sysinfo {
-	__kernel_long_t uptime;		/* Seconds since boot */
-	__kernel_ulong_t loads[3];	/* 1, 5, and 15 minute load averages */
-	__kernel_ulong_t totalram;	/* Total usable main memory size */
-	__kernel_ulong_t freeram;	/* Available memory size */
-	__kernel_ulong_t sharedram;	/* Amount of shared memory */
-	__kernel_ulong_t bufferram;	/* Memory used by buffers */
-	__kernel_ulong_t totalswap;	/* Total swap space size */
-	__kernel_ulong_t freeswap;	/* swap space still available */
-	__u16 procs;		   	/* Number of current processes */
-	__u16 pad;		   	/* Explicit padding for m68k */
-	__kernel_ulong_t totalhigh;	/* Total high memory size */
-	__kernel_ulong_t freehigh;	/* Available high memory size */
-	__u32 mem_unit;			/* Memory unit size in bytes */
-	char _f[20-2*sizeof(__kernel_ulong_t)-sizeof(__u32)];	/* Padding: libc5 uses this.. */
-};
-
-#endif /* _LINUX_SYSINFO_H */
diff --git a/openflow/usr/include/linux/target_core_user.h b/openflow/usr/include/linux/target_core_user.h
deleted file mode 100644
index 94b1eff..0000000
--- a/openflow/usr/include/linux/target_core_user.h
+++ /dev/null
@@ -1,144 +0,0 @@
-#ifndef __TARGET_CORE_USER_H
-#define __TARGET_CORE_USER_H
-
-/* This header will be used by application too */
-
-#include <linux/types.h>
-#include <linux/uio.h>
-
-#define TCMU_VERSION "2.0"
-
-/*
- * Ring Design
- * -----------
- *
- * The mmaped area is divided into three parts:
- * 1) The mailbox (struct tcmu_mailbox, below)
- * 2) The command ring
- * 3) Everything beyond the command ring (data)
- *
- * The mailbox tells userspace the offset of the command ring from the
- * start of the shared memory region, and how big the command ring is.
- *
- * The kernel passes SCSI commands to userspace by putting a struct
- * tcmu_cmd_entry in the ring, updating mailbox->cmd_head, and poking
- * userspace via uio's interrupt mechanism.
- *
- * tcmu_cmd_entry contains a header. If the header type is PAD,
- * userspace should skip hdr->length bytes (mod cmdr_size) to find the
- * next cmd_entry.
- *
- * Otherwise, the entry will contain offsets into the mmaped area that
- * contain the cdb and data buffers -- the latter accessible via the
- * iov array. iov addresses are also offsets into the shared area.
- *
- * When userspace is completed handling the command, set
- * entry->rsp.scsi_status, fill in rsp.sense_buffer if appropriate,
- * and also set mailbox->cmd_tail equal to the old cmd_tail plus
- * hdr->length, mod cmdr_size. If cmd_tail doesn't equal cmd_head, it
- * should process the next packet the same way, and so on.
- */
-
-#define TCMU_MAILBOX_VERSION 2
-#define ALIGN_SIZE 64 /* Should be enough for most CPUs */
-
-struct tcmu_mailbox {
-	__u16 version;
-	__u16 flags;
-	__u32 cmdr_off;
-	__u32 cmdr_size;
-
-	__u32 cmd_head;
-
-	/* Updated by user. On its own cacheline */
-	__u32 cmd_tail __attribute__((__aligned__(ALIGN_SIZE)));
-
-} __attribute__((packed));
-
-enum tcmu_opcode {
-	TCMU_OP_PAD = 0,
-	TCMU_OP_CMD,
-};
-
-/*
- * Only a few opcodes, and length is 8-byte aligned, so use low bits for opcode.
- */
-struct tcmu_cmd_entry_hdr {
-	__u32 len_op;
-	__u16 cmd_id;
-	__u8 kflags;
-#define TCMU_UFLAG_UNKNOWN_OP 0x1
-	__u8 uflags;
-
-} __attribute__((packed));
-
-#define TCMU_OP_MASK 0x7
-
-static __inline__ enum tcmu_opcode tcmu_hdr_get_op(__u32 len_op)
-{
-	return len_op & TCMU_OP_MASK;
-}
-
-static __inline__ void tcmu_hdr_set_op(__u32 *len_op, enum tcmu_opcode op)
-{
-	*len_op &= ~TCMU_OP_MASK;
-	*len_op |= (op & TCMU_OP_MASK);
-}
-
-static __inline__ __u32 tcmu_hdr_get_len(__u32 len_op)
-{
-	return len_op & ~TCMU_OP_MASK;
-}
-
-static __inline__ void tcmu_hdr_set_len(__u32 *len_op, __u32 len)
-{
-	*len_op &= TCMU_OP_MASK;
-	*len_op |= len;
-}
-
-/* Currently the same as SCSI_SENSE_BUFFERSIZE */
-#define TCMU_SENSE_BUFFERSIZE 96
-
-struct tcmu_cmd_entry {
-	struct tcmu_cmd_entry_hdr hdr;
-
-	union {
-		struct {
-			uint32_t iov_cnt;
-			uint32_t iov_bidi_cnt;
-			uint32_t iov_dif_cnt;
-			uint64_t cdb_off;
-			uint64_t __pad1;
-			uint64_t __pad2;
-			struct iovec iov[0];
-		} req;
-		struct {
-			uint8_t scsi_status;
-			uint8_t __pad1;
-			uint16_t __pad2;
-			uint32_t __pad3;
-			char sense_buffer[TCMU_SENSE_BUFFERSIZE];
-		} rsp;
-	};
-
-} __attribute__((packed));
-
-#define TCMU_OP_ALIGN_SIZE sizeof(uint64_t)
-
-enum tcmu_genl_cmd {
-	TCMU_CMD_UNSPEC,
-	TCMU_CMD_ADDED_DEVICE,
-	TCMU_CMD_REMOVED_DEVICE,
-	__TCMU_CMD_MAX,
-};
-#define TCMU_CMD_MAX (__TCMU_CMD_MAX - 1)
-
-enum tcmu_genl_attr {
-	TCMU_ATTR_UNSPEC,
-	TCMU_ATTR_DEVICE,
-	TCMU_ATTR_MINOR,
-	__TCMU_ATTR_MAX,
-};
-#define TCMU_ATTR_MAX (__TCMU_ATTR_MAX - 1)
-
-#endif
diff --git a/openflow/usr/include/linux/taskstats.h b/openflow/usr/include/linux/taskstats.h
deleted file mode 100644
index 2466e55..0000000
--- a/openflow/usr/include/linux/taskstats.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/* taskstats.h - exporting per-task statistics
- *
- * Copyright (C) Shailabh Nagar, IBM Corp. 2006
- *           (C) Balbir Singh,   IBM Corp. 2006
- *           (C) Jay Lan,        SGI, 2006
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2.1 of the GNU Lesser General Public License
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef _LINUX_TASKSTATS_H
-#define _LINUX_TASKSTATS_H
-
-#include <linux/types.h>
-
-/* Format for per-task data returned to userland when
- *	- a task exits
- *	- listener requests stats for a task
- *
- * The struct is versioned. Newer versions should only add fields to
- * the bottom of the struct to maintain backward compatibility.
- *
- *
- * To add new fields
- *	a) bump up TASKSTATS_VERSION
- *	b) add comment indicating new version number at end of struct
- *	c) add new fields after version comment; maintain 64-bit alignment
- */
-
-
-#define TASKSTATS_VERSION	8
-#define TS_COMM_LEN		32	/* should be >= TASK_COMM_LEN
-					 * in linux/sched.h */
-
-struct taskstats {
-
-	/* The version number of this struct. This field is always set to
-	 * TAKSTATS_VERSION, which is defined in <linux/taskstats.h>.
-	 * Each time the struct is changed, the value should be incremented.
-	 */
-	__u16	version;
-	__u32	ac_exitcode;		/* Exit status */
-
-	/* The accounting flags of a task as defined in <linux/acct.h>
-	 * Defined values are AFORK, ASU, ACOMPAT, ACORE, and AXSIG.
-	 */
-	__u8	ac_flag;		/* Record flags */
-	__u8	ac_nice;		/* task_nice */
-
-	/* Delay accounting fields start
-	 *
-	 * All values, until comment "Delay accounting fields end" are
-	 * available only if delay accounting is enabled, even though the last
-	 * few fields are not delays
-	 *
-	 * xxx_count is the number of delay values recorded
-	 * xxx_delay_total is the corresponding cumulative delay in nanoseconds
-	 *
-	 * xxx_delay_total wraps around to zero on overflow
-	 * xxx_count incremented regardless of overflow
-	 */
-
-	/* Delay waiting for cpu, while runnable
-	 * count, delay_total NOT updated atomically
-	 */
-	__u64	cpu_count __attribute__((aligned(8)));
-	__u64	cpu_delay_total;
-
-	/* Following four fields atomically updated using task->delays->lock */
-
-	/* Delay waiting for synchronous block I/O to complete
-	 * does not account for delays in I/O submission
-	 */
-	__u64	blkio_count;
-	__u64	blkio_delay_total;
-
-	/* Delay waiting for page fault I/O (swap in only) */
-	__u64	swapin_count;
-	__u64	swapin_delay_total;
-
-	/* cpu "wall-clock" running time
-	 * On some architectures, value will adjust for cpu time stolen
-	 * from the kernel in involuntary waits due to virtualization.
-	 * Value is cumulative, in nanoseconds, without a corresponding count
-	 * and wraps around to zero silently on overflow
-	 */
-	__u64	cpu_run_real_total;
-
-	/* cpu "virtual" running time
-	 * Uses time intervals seen by the kernel i.e. no adjustment
-	 * for kernel's involuntary waits due to virtualization.
-	 * Value is cumulative, in nanoseconds, without a corresponding count
-	 * and wraps around to zero silently on overflow
-	 */
-	__u64	cpu_run_virtual_total;
-	/* Delay accounting fields end */
-	/* version 1 ends here */
-
-	/* Basic Accounting Fields start */
-	char	ac_comm[TS_COMM_LEN];	/* Command name */
-	__u8	ac_sched __attribute__((aligned(8)));
-					/* Scheduling discipline */
-	__u8	ac_pad[3];
-	__u32	ac_uid __attribute__((aligned(8)));
-					/* User ID */
-	__u32	ac_gid;			/* Group ID */
-	__u32	ac_pid;			/* Process ID */
-	__u32	ac_ppid;		/* Parent process ID */
-	__u32	ac_btime;		/* Begin time [sec since 1970] */
-	__u64	ac_etime __attribute__((aligned(8)));
-					/* Elapsed time [usec] */
-	__u64	ac_utime;		/* User CPU time [usec] */
-	__u64	ac_stime;		/* SYstem CPU time [usec] */
-	__u64	ac_minflt;		/* Minor Page Fault Count */
-	__u64	ac_majflt;		/* Major Page Fault Count */
-	/* Basic Accounting Fields end */
-
-	/* Extended accounting fields start */
-	/* Accumulated RSS usage in duration of a task, in MBytes-usecs.
-	 * The current rss usage is added to this counter every time
-	 * a tick is charged to a task's system time. So, at the end we
-	 * will have memory usage multiplied by system time. Thus an
-	 * average usage per system time unit can be calculated.
-	 */
-	__u64	coremem;		/* accumulated RSS usage in MB-usec */
-	/* Accumulated virtual memory usage in duration of a task.
-	 * Same as acct_rss_mem1 above except that we keep track of VM usage.
-	 */
-	__u64	virtmem;		/* accumulated VM  usage in MB-usec */
-
-	/* High watermark of RSS and virtual memory usage in duration of
-	 * a task, in KBytes.
-	 */
-	__u64	hiwater_rss;		/* High-watermark of RSS usage, in KB */
-	__u64	hiwater_vm;		/* High-water VM usage, in KB */
-
-	/* The following four fields are I/O statistics of a task. */
-	__u64	read_char;		/* bytes read */
-	__u64	write_char;		/* bytes written */
-	__u64	read_syscalls;		/* read syscalls */
-	__u64	write_syscalls;		/* write syscalls */
-	/* Extended accounting fields end */
-
-#define TASKSTATS_HAS_IO_ACCOUNTING
-	/* Per-task storage I/O accounting starts */
-	__u64	read_bytes;		/* bytes of read I/O */
-	__u64	write_bytes;		/* bytes of write I/O */
-	__u64	cancelled_write_bytes;	/* bytes of cancelled write I/O */
-
-	__u64  nvcsw;			/* voluntary_ctxt_switches */
-	__u64  nivcsw;			/* nonvoluntary_ctxt_switches */
-
-	/* time accounting for SMT machines */
-	__u64	ac_utimescaled;		/* utime scaled on frequency etc */
-	__u64	ac_stimescaled;		/* stime scaled on frequency etc */
-	__u64	cpu_scaled_run_real_total; /* scaled cpu_run_real_total */
-
-	/* Delay waiting for memory reclaim */
-	__u64	freepages_count;
-	__u64	freepages_delay_total;
-};
-
-
-/*
- * Commands sent from userspace
- * Not versioned. New commands should only be inserted at the enum's end
- * prior to __TASKSTATS_CMD_MAX
- */
-
-enum {
-	TASKSTATS_CMD_UNSPEC = 0,	/* Reserved */
-	TASKSTATS_CMD_GET,		/* user->kernel request/get-response */
-	TASKSTATS_CMD_NEW,		/* kernel->user event */
-	__TASKSTATS_CMD_MAX,
-};
-
-#define TASKSTATS_CMD_MAX (__TASKSTATS_CMD_MAX - 1)
-
-enum {
-	TASKSTATS_TYPE_UNSPEC = 0,	/* Reserved */
-	TASKSTATS_TYPE_PID,		/* Process id */
-	TASKSTATS_TYPE_TGID,		/* Thread group id */
-	TASKSTATS_TYPE_STATS,		/* taskstats structure */
-	TASKSTATS_TYPE_AGGR_PID,	/* contains pid + stats */
-	TASKSTATS_TYPE_AGGR_TGID,	/* contains tgid + stats */
-	TASKSTATS_TYPE_NULL,		/* contains nothing */
-	__TASKSTATS_TYPE_MAX,
-};
-
-#define TASKSTATS_TYPE_MAX (__TASKSTATS_TYPE_MAX - 1)
-
-enum {
-	TASKSTATS_CMD_ATTR_UNSPEC = 0,
-	TASKSTATS_CMD_ATTR_PID,
-	TASKSTATS_CMD_ATTR_TGID,
-	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK,
-	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK,
-	__TASKSTATS_CMD_ATTR_MAX,
-};
-
-#define TASKSTATS_CMD_ATTR_MAX (__TASKSTATS_CMD_ATTR_MAX - 1)
-
-/* NETLINK_GENERIC related info */
-
-#define TASKSTATS_GENL_NAME	"TASKSTATS"
-#define TASKSTATS_GENL_VERSION	0x1
-
-#endif /* _LINUX_TASKSTATS_H */
diff --git a/openflow/usr/include/linux/tc_act/tc_bpf.h b/openflow/usr/include/linux/tc_act/tc_bpf.h
deleted file mode 100644
index 07f17cc..0000000
--- a/openflow/usr/include/linux/tc_act/tc_bpf.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2015 Jiri Pirko <jiri@resnulli.us>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __LINUX_TC_BPF_H
-#define __LINUX_TC_BPF_H
-
-#include <linux/pkt_cls.h>
-
-#define TCA_ACT_BPF 13
-
-struct tc_act_bpf {
-	tc_gen;
-};
-
-enum {
-	TCA_ACT_BPF_UNSPEC,
-	TCA_ACT_BPF_TM,
-	TCA_ACT_BPF_PARMS,
-	TCA_ACT_BPF_OPS_LEN,
-	TCA_ACT_BPF_OPS,
-	TCA_ACT_BPF_FD,
-	TCA_ACT_BPF_NAME,
-	__TCA_ACT_BPF_MAX,
-};
-#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
-
-#endif
diff --git a/openflow/usr/include/linux/tc_act/tc_connmark.h b/openflow/usr/include/linux/tc_act/tc_connmark.h
deleted file mode 100644
index 994b097..0000000
--- a/openflow/usr/include/linux/tc_act/tc_connmark.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __UAPI_TC_CONNMARK_H
-#define __UAPI_TC_CONNMARK_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-#define TCA_ACT_CONNMARK 14
-
-struct tc_connmark {
-	tc_gen;
-	__u16 zone;
-};
-
-enum {
-	TCA_CONNMARK_UNSPEC,
-	TCA_CONNMARK_PARMS,
-	TCA_CONNMARK_TM,
-	__TCA_CONNMARK_MAX
-};
-#define TCA_CONNMARK_MAX (__TCA_CONNMARK_MAX - 1)
-
-#endif
diff --git a/openflow/usr/include/linux/tc_act/tc_csum.h b/openflow/usr/include/linux/tc_act/tc_csum.h
deleted file mode 100644
index a047c49..0000000
--- a/openflow/usr/include/linux/tc_act/tc_csum.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __LINUX_TC_CSUM_H
-#define __LINUX_TC_CSUM_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-#define TCA_ACT_CSUM 16
-
-enum {
-	TCA_CSUM_UNSPEC,
-	TCA_CSUM_PARMS,
-	TCA_CSUM_TM,
-	__TCA_CSUM_MAX
-};
-#define TCA_CSUM_MAX (__TCA_CSUM_MAX - 1)
-
-enum {
-	TCA_CSUM_UPDATE_FLAG_IPV4HDR = 1,
-	TCA_CSUM_UPDATE_FLAG_ICMP    = 2,
-	TCA_CSUM_UPDATE_FLAG_IGMP    = 4,
-	TCA_CSUM_UPDATE_FLAG_TCP     = 8,
-	TCA_CSUM_UPDATE_FLAG_UDP     = 16,
-	TCA_CSUM_UPDATE_FLAG_UDPLITE = 32
-};
-
-struct tc_csum {
-	tc_gen;
-
-	__u32 update_flags;
-};
-
-#endif /* __LINUX_TC_CSUM_H */
diff --git a/openflow/usr/include/linux/tc_act/tc_defact.h b/openflow/usr/include/linux/tc_act/tc_defact.h
deleted file mode 100644
index 17dddb4..0000000
--- a/openflow/usr/include/linux/tc_act/tc_defact.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __LINUX_TC_DEF_H
-#define __LINUX_TC_DEF_H
-
-#include <linux/pkt_cls.h>
-
-struct tc_defact {
-	tc_gen;
-};
-
-enum {
-	TCA_DEF_UNSPEC,
-	TCA_DEF_TM,
-	TCA_DEF_PARMS,
-	TCA_DEF_DATA,
-	__TCA_DEF_MAX
-};
-#define TCA_DEF_MAX (__TCA_DEF_MAX - 1)
-
-#endif
diff --git a/openflow/usr/include/linux/tc_act/tc_gact.h b/openflow/usr/include/linux/tc_act/tc_gact.h
deleted file mode 100644
index f7bf94e..0000000
--- a/openflow/usr/include/linux/tc_act/tc_gact.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __LINUX_TC_GACT_H
-#define __LINUX_TC_GACT_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-#define TCA_ACT_GACT 5
-struct tc_gact {
-	tc_gen;
-
-};
-
-struct tc_gact_p {
-#define PGACT_NONE              0
-#define PGACT_NETRAND           1
-#define PGACT_DETERM            2
-#define MAX_RAND                (PGACT_DETERM + 1 )
-	__u16                 ptype;
-	__u16                 pval;
-	int                   paction;
-};
- 
-enum {
-	TCA_GACT_UNSPEC,
-	TCA_GACT_TM,
-	TCA_GACT_PARMS,
-	TCA_GACT_PROB,
-	__TCA_GACT_MAX
-};
-#define TCA_GACT_MAX (__TCA_GACT_MAX - 1)
- 
-#endif
diff --git a/openflow/usr/include/linux/tc_act/tc_ipt.h b/openflow/usr/include/linux/tc_act/tc_ipt.h
deleted file mode 100644
index 130aaad..0000000
--- a/openflow/usr/include/linux/tc_act/tc_ipt.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __LINUX_TC_IPT_H
-#define __LINUX_TC_IPT_H
-
-#include <linux/pkt_cls.h>
-
-#define TCA_ACT_IPT 6
-#define TCA_ACT_XT 10
-
-enum {
-	TCA_IPT_UNSPEC,
-	TCA_IPT_TABLE,
-	TCA_IPT_HOOK,
-	TCA_IPT_INDEX,
-	TCA_IPT_CNT,
-	TCA_IPT_TM,
-	TCA_IPT_TARG,
-	__TCA_IPT_MAX
-};
-#define TCA_IPT_MAX (__TCA_IPT_MAX - 1)
-                                                                                
-#endif
diff --git a/openflow/usr/include/linux/tc_act/tc_mirred.h b/openflow/usr/include/linux/tc_act/tc_mirred.h
deleted file mode 100644
index 7561750..0000000
--- a/openflow/usr/include/linux/tc_act/tc_mirred.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __LINUX_TC_MIR_H
-#define __LINUX_TC_MIR_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-#define TCA_ACT_MIRRED 8
-#define TCA_EGRESS_REDIR 1  /* packet redirect to EGRESS*/
-#define TCA_EGRESS_MIRROR 2 /* mirror packet to EGRESS */
-#define TCA_INGRESS_REDIR 3  /* packet redirect to INGRESS*/
-#define TCA_INGRESS_MIRROR 4 /* mirror packet to INGRESS */
-                                                                                
-struct tc_mirred {
-	tc_gen;
-	int                     eaction;   /* one of IN/EGRESS_MIRROR/REDIR */
-	__u32                   ifindex;  /* ifindex of egress port */
-};
-                                                                                
-enum {
-	TCA_MIRRED_UNSPEC,
-	TCA_MIRRED_TM,
-	TCA_MIRRED_PARMS,
-	__TCA_MIRRED_MAX
-};
-#define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1)
-                                                                                
-#endif
diff --git a/openflow/usr/include/linux/tc_act/tc_nat.h b/openflow/usr/include/linux/tc_act/tc_nat.h
deleted file mode 100644
index 6663aeb..0000000
--- a/openflow/usr/include/linux/tc_act/tc_nat.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __LINUX_TC_NAT_H
-#define __LINUX_TC_NAT_H
-
-#include <linux/pkt_cls.h>
-#include <linux/types.h>
-
-#define TCA_ACT_NAT 9
-
-enum {
-	TCA_NAT_UNSPEC,
-	TCA_NAT_PARMS,
-	TCA_NAT_TM,
-	__TCA_NAT_MAX
-};
-#define TCA_NAT_MAX (__TCA_NAT_MAX - 1)
-
-#define TCA_NAT_FLAG_EGRESS 1
-
-struct tc_nat {
-	tc_gen;
-	__be32 old_addr;
-	__be32 new_addr;
-	__be32 mask;
-	__u32 flags;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/tc_act/tc_pedit.h b/openflow/usr/include/linux/tc_act/tc_pedit.h
deleted file mode 100644
index 716cfab..0000000
--- a/openflow/usr/include/linux/tc_act/tc_pedit.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __LINUX_TC_PED_H
-#define __LINUX_TC_PED_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-#define TCA_ACT_PEDIT 7
-
-enum {
-	TCA_PEDIT_UNSPEC,
-	TCA_PEDIT_TM,
-	TCA_PEDIT_PARMS,
-	__TCA_PEDIT_MAX
-};
-#define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)
-                                                                                
-struct tc_pedit_key {
-	__u32           mask;  /* AND */
-	__u32           val;   /*XOR */
-	__u32           off;  /*offset */
-	__u32           at;
-	__u32           offmask;
-	__u32           shift;
-};
-                                                                                
-struct tc_pedit_sel {
-	tc_gen;
-	unsigned char           nkeys;
-	unsigned char           flags;
-	struct tc_pedit_key     keys[0];
-};
-#define tc_pedit tc_pedit_sel
-
-#endif
diff --git a/openflow/usr/include/linux/tc_act/tc_skbedit.h b/openflow/usr/include/linux/tc_act/tc_skbedit.h
deleted file mode 100644
index 7a2e910..0000000
--- a/openflow/usr/include/linux/tc_act/tc_skbedit.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2008, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307 USA.
- *
- * Author: Alexander Duyck <alexander.h.duyck@intel.com>
- */
-
-#ifndef __LINUX_TC_SKBEDIT_H
-#define __LINUX_TC_SKBEDIT_H
-
-#include <linux/pkt_cls.h>
-
-#define TCA_ACT_SKBEDIT 11
-
-#define SKBEDIT_F_PRIORITY		0x1
-#define SKBEDIT_F_QUEUE_MAPPING		0x2
-#define SKBEDIT_F_MARK			0x4
-
-struct tc_skbedit {
-	tc_gen;
-};
-
-enum {
-	TCA_SKBEDIT_UNSPEC,
-	TCA_SKBEDIT_TM,
-	TCA_SKBEDIT_PARMS,
-	TCA_SKBEDIT_PRIORITY,
-	TCA_SKBEDIT_QUEUE_MAPPING,
-	TCA_SKBEDIT_MARK,
-	__TCA_SKBEDIT_MAX
-};
-#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)
-
-#endif
diff --git a/openflow/usr/include/linux/tc_act/tc_vlan.h b/openflow/usr/include/linux/tc_act/tc_vlan.h
deleted file mode 100644
index f7b8d44..0000000
--- a/openflow/usr/include/linux/tc_act/tc_vlan.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __LINUX_TC_VLAN_H
-#define __LINUX_TC_VLAN_H
-
-#include <linux/pkt_cls.h>
-
-#define TCA_ACT_VLAN 12
-
-#define TCA_VLAN_ACT_POP	1
-#define TCA_VLAN_ACT_PUSH	2
-
-struct tc_vlan {
-	tc_gen;
-	int v_action;
-};
-
-enum {
-	TCA_VLAN_UNSPEC,
-	TCA_VLAN_TM,
-	TCA_VLAN_PARMS,
-	TCA_VLAN_PUSH_VLAN_ID,
-	TCA_VLAN_PUSH_VLAN_PROTOCOL,
-	__TCA_VLAN_MAX,
-};
-#define TCA_VLAN_MAX (__TCA_VLAN_MAX - 1)
-
-#endif
diff --git a/openflow/usr/include/linux/tc_ematch/tc_em_cmp.h b/openflow/usr/include/linux/tc_ematch/tc_em_cmp.h
deleted file mode 100644
index f34bb1b..0000000
--- a/openflow/usr/include/linux/tc_ematch/tc_em_cmp.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __LINUX_TC_EM_CMP_H
-#define __LINUX_TC_EM_CMP_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-struct tcf_em_cmp {
-	__u32		val;
-	__u32		mask;
-	__u16		off;
-	__u8		align:4;
-	__u8		flags:4;
-	__u8		layer:4;
-	__u8		opnd:4;
-};
-
-enum {
-	TCF_EM_ALIGN_U8  = 1,
-	TCF_EM_ALIGN_U16 = 2,
-	TCF_EM_ALIGN_U32 = 4
-};
-
-#define TCF_EM_CMP_TRANS	1
-
-#endif
diff --git a/openflow/usr/include/linux/tc_ematch/tc_em_meta.h b/openflow/usr/include/linux/tc_ematch/tc_em_meta.h
deleted file mode 100644
index b11f8ce..0000000
--- a/openflow/usr/include/linux/tc_ematch/tc_em_meta.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef __LINUX_TC_EM_META_H
-#define __LINUX_TC_EM_META_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-enum {
-	TCA_EM_META_UNSPEC,
-	TCA_EM_META_HDR,
-	TCA_EM_META_LVALUE,
-	TCA_EM_META_RVALUE,
-	__TCA_EM_META_MAX
-};
-#define TCA_EM_META_MAX (__TCA_EM_META_MAX - 1)
-
-struct tcf_meta_val {
-	__u16			kind;
-	__u8			shift;
-	__u8			op;
-};
-
-#define TCF_META_TYPE_MASK	(0xf << 12)
-#define TCF_META_TYPE(kind)	(((kind) & TCF_META_TYPE_MASK) >> 12)
-#define TCF_META_ID_MASK	0x7ff
-#define TCF_META_ID(kind)	((kind) & TCF_META_ID_MASK)
-
-enum {
-	TCF_META_TYPE_VAR,
-	TCF_META_TYPE_INT,
-	__TCF_META_TYPE_MAX
-};
-#define TCF_META_TYPE_MAX (__TCF_META_TYPE_MAX - 1)
-
-enum {
-	TCF_META_ID_VALUE,
-	TCF_META_ID_RANDOM,
-	TCF_META_ID_LOADAVG_0,
-	TCF_META_ID_LOADAVG_1,
-	TCF_META_ID_LOADAVG_2,
-	TCF_META_ID_DEV,
-	TCF_META_ID_PRIORITY,
-	TCF_META_ID_PROTOCOL,
-	TCF_META_ID_PKTTYPE,
-	TCF_META_ID_PKTLEN,
-	TCF_META_ID_DATALEN,
-	TCF_META_ID_MACLEN,
-	TCF_META_ID_NFMARK,
-	TCF_META_ID_TCINDEX,
-	TCF_META_ID_RTCLASSID,
-	TCF_META_ID_RTIIF,
-	TCF_META_ID_SK_FAMILY,
-	TCF_META_ID_SK_STATE,
-	TCF_META_ID_SK_REUSE,
-	TCF_META_ID_SK_BOUND_IF,
-	TCF_META_ID_SK_REFCNT,
-	TCF_META_ID_SK_SHUTDOWN,
-	TCF_META_ID_SK_PROTO,
-	TCF_META_ID_SK_TYPE,
-	TCF_META_ID_SK_RCVBUF,
-	TCF_META_ID_SK_RMEM_ALLOC,
-	TCF_META_ID_SK_WMEM_ALLOC,
-	TCF_META_ID_SK_OMEM_ALLOC,
-	TCF_META_ID_SK_WMEM_QUEUED,
-	TCF_META_ID_SK_RCV_QLEN,
-	TCF_META_ID_SK_SND_QLEN,
- 	TCF_META_ID_SK_ERR_QLEN,
-	TCF_META_ID_SK_FORWARD_ALLOCS,
-	TCF_META_ID_SK_SNDBUF,
- 	TCF_META_ID_SK_ALLOCS,
-	__TCF_META_ID_SK_ROUTE_CAPS,	/* unimplemented but in ABI already */
- 	TCF_META_ID_SK_HASH,
- 	TCF_META_ID_SK_LINGERTIME,
- 	TCF_META_ID_SK_ACK_BACKLOG,
- 	TCF_META_ID_SK_MAX_ACK_BACKLOG,
- 	TCF_META_ID_SK_PRIO,
- 	TCF_META_ID_SK_RCVLOWAT,
- 	TCF_META_ID_SK_RCVTIMEO,
- 	TCF_META_ID_SK_SNDTIMEO,
- 	TCF_META_ID_SK_SENDMSG_OFF,
- 	TCF_META_ID_SK_WRITE_PENDING,
-	TCF_META_ID_VLAN_TAG,
-	TCF_META_ID_RXHASH,
-	__TCF_META_ID_MAX
-};
-#define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1)
-
-struct tcf_meta_hdr {
-	struct tcf_meta_val	left;
-	struct tcf_meta_val	right;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/tc_ematch/tc_em_nbyte.h b/openflow/usr/include/linux/tc_ematch/tc_em_nbyte.h
deleted file mode 100644
index 7172cfb..0000000
--- a/openflow/usr/include/linux/tc_ematch/tc_em_nbyte.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __LINUX_TC_EM_NBYTE_H
-#define __LINUX_TC_EM_NBYTE_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-struct tcf_em_nbyte {
-	__u16		off;
-	__u16		len:12;
-	__u8		layer:4;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/tc_ematch/tc_em_text.h b/openflow/usr/include/linux/tc_ematch/tc_em_text.h
deleted file mode 100644
index 5aac404..0000000
--- a/openflow/usr/include/linux/tc_ematch/tc_em_text.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __LINUX_TC_EM_TEXT_H
-#define __LINUX_TC_EM_TEXT_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-#define TC_EM_TEXT_ALGOSIZ	16
-
-struct tcf_em_text {
-	char		algo[TC_EM_TEXT_ALGOSIZ];
-	__u16		from_offset;
-	__u16		to_offset;
-	__u16		pattern_len;
-	__u8		from_layer:4;
-	__u8		to_layer:4;
-	__u8		pad;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/tcp.h b/openflow/usr/include/linux/tcp.h
deleted file mode 100644
index 1e9b4a6..0000000
--- a/openflow/usr/include/linux/tcp.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Definitions for the TCP protocol.
- *
- * Version:	@(#)tcp.h	1.0.2	04/28/93
- *
- * Author:	Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_TCP_H
-#define _LINUX_TCP_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <linux/socket.h>
-
-struct tcphdr {
-	__be16	source;
-	__be16	dest;
-	__be32	seq;
-	__be32	ack_seq;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-	__u16	res1:4,
-		doff:4,
-		fin:1,
-		syn:1,
-		rst:1,
-		psh:1,
-		ack:1,
-		urg:1,
-		ece:1,
-		cwr:1;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-	__u16	doff:4,
-		res1:4,
-		cwr:1,
-		ece:1,
-		urg:1,
-		ack:1,
-		psh:1,
-		rst:1,
-		syn:1,
-		fin:1;
-#else
-#error	"Adjust your <asm/byteorder.h> defines"
-#endif	
-	__be16	window;
-	__sum16	check;
-	__be16	urg_ptr;
-};
-
-/*
- *	The union cast uses a gcc extension to avoid aliasing problems
- *  (union is compatible to any of its members)
- *  This means this part of the code is -fstrict-aliasing safe now.
- */
-union tcp_word_hdr { 
-	struct tcphdr hdr;
-	__be32 		  words[5];
-}; 
-
-#define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) 
-
-enum { 
-	TCP_FLAG_CWR = __constant_cpu_to_be32(0x00800000),
-	TCP_FLAG_ECE = __constant_cpu_to_be32(0x00400000),
-	TCP_FLAG_URG = __constant_cpu_to_be32(0x00200000),
-	TCP_FLAG_ACK = __constant_cpu_to_be32(0x00100000),
-	TCP_FLAG_PSH = __constant_cpu_to_be32(0x00080000),
-	TCP_FLAG_RST = __constant_cpu_to_be32(0x00040000),
-	TCP_FLAG_SYN = __constant_cpu_to_be32(0x00020000),
-	TCP_FLAG_FIN = __constant_cpu_to_be32(0x00010000),
-	TCP_RESERVED_BITS = __constant_cpu_to_be32(0x0F000000),
-	TCP_DATA_OFFSET = __constant_cpu_to_be32(0xF0000000)
-}; 
-
-/*
- * TCP general constants
- */
-#define TCP_MSS_DEFAULT		 536U	/* IPv4 (RFC1122, RFC2581) */
-#define TCP_MSS_DESIRED		1220U	/* IPv6 (tunneled), EDNS0 (RFC3226) */
-
-/* TCP socket options */
-#define TCP_NODELAY		1	/* Turn off Nagle's algorithm. */
-#define TCP_MAXSEG		2	/* Limit MSS */
-#define TCP_CORK		3	/* Never send partially complete segments */
-#define TCP_KEEPIDLE		4	/* Start keeplives after this period */
-#define TCP_KEEPINTVL		5	/* Interval between keepalives */
-#define TCP_KEEPCNT		6	/* Number of keepalives before death */
-#define TCP_SYNCNT		7	/* Number of SYN retransmits */
-#define TCP_LINGER2		8	/* Life time of orphaned FIN-WAIT-2 state */
-#define TCP_DEFER_ACCEPT	9	/* Wake up listener only when data arrive */
-#define TCP_WINDOW_CLAMP	10	/* Bound advertised window */
-#define TCP_INFO		11	/* Information about this connection. */
-#define TCP_QUICKACK		12	/* Block/reenable quick acks */
-#define TCP_CONGESTION		13	/* Congestion control algorithm */
-#define TCP_MD5SIG		14	/* TCP MD5 Signature (RFC2385) */
-#define TCP_THIN_LINEAR_TIMEOUTS 16      /* Use linear timeouts for thin streams*/
-#define TCP_THIN_DUPACK         17      /* Fast retrans. after 1 dupack */
-#define TCP_USER_TIMEOUT	18	/* How long for loss retry before timeout */
-#define TCP_REPAIR		19	/* TCP sock is under repair right now */
-#define TCP_REPAIR_QUEUE	20
-#define TCP_QUEUE_SEQ		21
-#define TCP_REPAIR_OPTIONS	22
-#define TCP_FASTOPEN		23	/* Enable FastOpen on listeners */
-#define TCP_TIMESTAMP		24
-#define TCP_NOTSENT_LOWAT	25	/* limit number of unsent bytes in write queue */
-#define TCP_CC_INFO		26	/* Get Congestion Control (optional) info */
-#define TCP_SAVE_SYN		27	/* Record SYN headers for new connections */
-#define TCP_SAVED_SYN		28	/* Get SYN headers recorded for connection */
-
-struct tcp_repair_opt {
-	__u32	opt_code;
-	__u32	opt_val;
-};
-
-enum {
-	TCP_NO_QUEUE,
-	TCP_RECV_QUEUE,
-	TCP_SEND_QUEUE,
-	TCP_QUEUES_NR,
-};
-
-/* for TCP_INFO socket option */
-#define TCPI_OPT_TIMESTAMPS	1
-#define TCPI_OPT_SACK		2
-#define TCPI_OPT_WSCALE		4
-#define TCPI_OPT_ECN		8 /* ECN was negociated at TCP session init */
-#define TCPI_OPT_ECN_SEEN	16 /* we received at least one packet with ECT */
-#define TCPI_OPT_SYN_DATA	32 /* SYN-ACK acked data in SYN sent or rcvd */
-
-enum tcp_ca_state {
-	TCP_CA_Open = 0,
-#define TCPF_CA_Open	(1<<TCP_CA_Open)
-	TCP_CA_Disorder = 1,
-#define TCPF_CA_Disorder (1<<TCP_CA_Disorder)
-	TCP_CA_CWR = 2,
-#define TCPF_CA_CWR	(1<<TCP_CA_CWR)
-	TCP_CA_Recovery = 3,
-#define TCPF_CA_Recovery (1<<TCP_CA_Recovery)
-	TCP_CA_Loss = 4
-#define TCPF_CA_Loss	(1<<TCP_CA_Loss)
-};
-
-struct tcp_info {
-	__u8	tcpi_state;
-	__u8	tcpi_ca_state;
-	__u8	tcpi_retransmits;
-	__u8	tcpi_probes;
-	__u8	tcpi_backoff;
-	__u8	tcpi_options;
-	__u8	tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
-
-	__u32	tcpi_rto;
-	__u32	tcpi_ato;
-	__u32	tcpi_snd_mss;
-	__u32	tcpi_rcv_mss;
-
-	__u32	tcpi_unacked;
-	__u32	tcpi_sacked;
-	__u32	tcpi_lost;
-	__u32	tcpi_retrans;
-	__u32	tcpi_fackets;
-
-	/* Times. */
-	__u32	tcpi_last_data_sent;
-	__u32	tcpi_last_ack_sent;     /* Not remembered, sorry. */
-	__u32	tcpi_last_data_recv;
-	__u32	tcpi_last_ack_recv;
-
-	/* Metrics. */
-	__u32	tcpi_pmtu;
-	__u32	tcpi_rcv_ssthresh;
-	__u32	tcpi_rtt;
-	__u32	tcpi_rttvar;
-	__u32	tcpi_snd_ssthresh;
-	__u32	tcpi_snd_cwnd;
-	__u32	tcpi_advmss;
-	__u32	tcpi_reordering;
-
-	__u32	tcpi_rcv_rtt;
-	__u32	tcpi_rcv_space;
-
-	__u32	tcpi_total_retrans;
-
-	__u64	tcpi_pacing_rate;
-	__u64	tcpi_max_pacing_rate;
-	__u64	tcpi_bytes_acked;    /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
-	__u64	tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
-	__u32	tcpi_segs_out;	     /* RFC4898 tcpEStatsPerfSegsOut */
-	__u32	tcpi_segs_in;	     /* RFC4898 tcpEStatsPerfSegsIn */
-};
-
-/* for TCP_MD5SIG socket option */
-#define TCP_MD5SIG_MAXKEYLEN	80
-
-struct tcp_md5sig {
-	struct __kernel_sockaddr_storage tcpm_addr;	/* address associated */
-	__u16	__tcpm_pad1;				/* zero */
-	__u16	tcpm_keylen;				/* key length */
-	__u32	__tcpm_pad2;				/* zero */
-	__u8	tcpm_key[TCP_MD5SIG_MAXKEYLEN];		/* key (binary) */
-};
-
-#endif /* _LINUX_TCP_H */
diff --git a/openflow/usr/include/linux/tcp_metrics.h b/openflow/usr/include/linux/tcp_metrics.h
deleted file mode 100644
index 9353392..0000000
--- a/openflow/usr/include/linux/tcp_metrics.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* tcp_metrics.h - TCP Metrics Interface */
-
-#ifndef _LINUX_TCP_METRICS_H
-#define _LINUX_TCP_METRICS_H
-
-#include <linux/types.h>
-
-/* NETLINK_GENERIC related info
- */
-#define TCP_METRICS_GENL_NAME		"tcp_metrics"
-#define TCP_METRICS_GENL_VERSION	0x1
-
-enum tcp_metric_index {
-	TCP_METRIC_RTT,		/* in ms units */
-	TCP_METRIC_RTTVAR,	/* in ms units */
-	TCP_METRIC_SSTHRESH,
-	TCP_METRIC_CWND,
-	TCP_METRIC_REORDERING,
-
-	TCP_METRIC_RTT_US,	/* in usec units */
-	TCP_METRIC_RTTVAR_US,	/* in usec units */
-
-	/* Always last.  */
-	__TCP_METRIC_MAX,
-};
-
-#define TCP_METRIC_MAX	(__TCP_METRIC_MAX - 1)
-
-enum {
-	TCP_METRICS_ATTR_UNSPEC,
-	TCP_METRICS_ATTR_ADDR_IPV4,		/* u32 */
-	TCP_METRICS_ATTR_ADDR_IPV6,		/* binary */
-	TCP_METRICS_ATTR_AGE,			/* msecs */
-	TCP_METRICS_ATTR_TW_TSVAL,		/* u32, raw, rcv tsval */
-	TCP_METRICS_ATTR_TW_TS_STAMP,		/* s32, sec age */
-	TCP_METRICS_ATTR_VALS,			/* nested +1, u32 */
-	TCP_METRICS_ATTR_FOPEN_MSS,		/* u16 */
-	TCP_METRICS_ATTR_FOPEN_SYN_DROPS,	/* u16, count of drops */
-	TCP_METRICS_ATTR_FOPEN_SYN_DROP_TS,	/* msecs age */
-	TCP_METRICS_ATTR_FOPEN_COOKIE,		/* binary */
-	TCP_METRICS_ATTR_SADDR_IPV4,		/* u32 */
-	TCP_METRICS_ATTR_SADDR_IPV6,		/* binary */
-
-	__TCP_METRICS_ATTR_MAX,
-};
-
-#define TCP_METRICS_ATTR_MAX	(__TCP_METRICS_ATTR_MAX - 1)
-
-enum {
-	TCP_METRICS_CMD_UNSPEC,
-	TCP_METRICS_CMD_GET,
-	TCP_METRICS_CMD_DEL,
-
-	__TCP_METRICS_CMD_MAX,
-};
-
-#define TCP_METRICS_CMD_MAX	(__TCP_METRICS_CMD_MAX - 1)
-
-#endif /* _LINUX_TCP_METRICS_H */
diff --git a/openflow/usr/include/linux/telephony.h b/openflow/usr/include/linux/telephony.h
deleted file mode 100644
index f63afe3..0000000
--- a/openflow/usr/include/linux/telephony.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/******************************************************************************
- *
- *		telephony.h
- *
- *		Basic Linux Telephony Interface
- *
- *		(c) Copyright 1999-2001 Quicknet Technologies, Inc.
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- *    Authors:       Ed Okerson, <eokerson@quicknet.net>
- *                   Greg Herlein, <gherlein@quicknet.net>
- *
- *    Contributors:  Alan Cox, <alan@lxorguk.ukuu.org.uk>
- *                   David W. Erhart, <derhart@quicknet.net>
- *
- * IN NO EVENT SHALL QUICKNET TECHNOLOGIES, INC. BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF QUICKNET
- * TECHNOLOGIES, INC. HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * QUICKNET TECHNOLOGIES, INC. SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND QUICKNET TECHNOLOGIES, INC. HAS NO OBLIGATION
- * TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- *****************************************************************************/
-
-#ifndef TELEPHONY_H
-#define TELEPHONY_H
-
-#define TELEPHONY_VERSION 3013
-
-#define PHONE_VENDOR_IXJ          1
-#define PHONE_VENDOR_QUICKNET	  PHONE_VENDOR_IXJ
-#define PHONE_VENDOR_VOICETRONIX  2
-#define PHONE_VENDOR_ACULAB       3
-#define PHONE_VENDOR_DIGI         4
-#define PHONE_VENDOR_FRANKLIN     5
-
-/******************************************************************************
- *  Vendor Summary Information Area
- *
- *  Quicknet Technologies, Inc. - makes low density analog telephony cards
- *    with audio compression, POTS and PSTN interfaces (www.quicknet.net)
- *
- *  (other vendors following this API shuld add a short description of
- *  the telephony products they support under Linux)
- *
- *****************************************************************************/
-#define QTI_PHONEJACK		100
-#define QTI_LINEJACK		300
-#define QTI_PHONEJACK_LITE	400
-#define QTI_PHONEJACK_PCI	500
-#define QTI_PHONECARD		600
-
-/******************************************************************************
-*
-* The capabilities ioctls can inform you of the capabilities of each phone
-* device installed in your system.  The PHONECTL_CAPABILITIES ioctl
-* returns an integer value indicating the number of capabilities the   
-* device has.  The PHONECTL_CAPABILITIES_LIST will fill an array of 
-* capability structs with all of its capabilities.  The
-* PHONECTL_CAPABILITIES_CHECK takes a single capability struct and returns
-* a TRUE if the device has that capability, otherwise it returns false.
-* 
-******************************************************************************/
-typedef enum {
-	vendor = 0,
-	device,
-	port,
-	codec,
-	dsp
-} phone_cap;
-
-struct phone_capability {
-	char desc[80];
-	phone_cap captype;
-	int cap;
-	int handle;
-};
-
-typedef enum {
-	pots = 0,
-	pstn,
-	handset,
-	speaker
-} phone_ports;
-
-#define PHONE_CAPABILITIES              _IO  ('q', 0x80)
-#define PHONE_CAPABILITIES_LIST         _IOR ('q', 0x81, struct phone_capability *)
-#define PHONE_CAPABILITIES_CHECK        _IOW ('q', 0x82, struct phone_capability *)
-
-typedef struct {
-        char month[3];
-        char day[3];
-        char hour[3];
-        char min[3];
-        int numlen;
-        char number[11];
-        int namelen;
-        char name[80];
-} PHONE_CID;
- 
-#define PHONE_RING			_IO  ('q', 0x83)
-#define PHONE_HOOKSTATE			_IO  ('q', 0x84)
-#define PHONE_MAXRINGS			_IOW ('q', 0x85, char)
-#define PHONE_RING_CADENCE		_IOW ('q', 0x86, short)
-#define OLD_PHONE_RING_START            _IO  ('q', 0x87)
-#define PHONE_RING_START		_IOW ('q', 0x87, PHONE_CID *)
-#define PHONE_RING_STOP			_IO  ('q', 0x88)
-
-#define USA_RING_CADENCE	 0xC0C0
-
-#define PHONE_REC_CODEC			_IOW ('q', 0x89, int)
-#define PHONE_REC_START			_IO  ('q', 0x8A)
-#define PHONE_REC_STOP			_IO  ('q', 0x8B)
-#define PHONE_REC_DEPTH			_IOW ('q', 0x8C, int)
-#define PHONE_FRAME			_IOW ('q', 0x8D, int)
-#define PHONE_REC_VOLUME		_IOW ('q', 0x8E, int)
-#define PHONE_REC_VOLUME_LINEAR		_IOW ('q', 0xDB, int)
-#define PHONE_REC_LEVEL			_IO  ('q', 0x8F)
-
-#define PHONE_PLAY_CODEC		_IOW ('q', 0x90, int)
-#define PHONE_PLAY_START		_IO  ('q', 0x91)
-#define PHONE_PLAY_STOP			_IO  ('q', 0x92)
-#define PHONE_PLAY_DEPTH		_IOW ('q', 0x93, int)
-#define PHONE_PLAY_VOLUME		_IOW ('q', 0x94, int)
-#define PHONE_PLAY_VOLUME_LINEAR	_IOW ('q', 0xDC, int)
-#define PHONE_PLAY_LEVEL		_IO  ('q', 0x95)
-#define PHONE_DTMF_READY		_IOR ('q', 0x96, int)
-#define PHONE_GET_DTMF			_IOR ('q', 0x97, int)
-#define PHONE_GET_DTMF_ASCII		_IOR ('q', 0x98, int)
-#define PHONE_DTMF_OOB			_IOW ('q', 0x99, int)
-#define PHONE_EXCEPTION			_IOR ('q', 0x9A, int)
-#define PHONE_PLAY_TONE			_IOW ('q', 0x9B, char)
-#define PHONE_SET_TONE_ON_TIME		_IOW ('q', 0x9C, int)
-#define PHONE_SET_TONE_OFF_TIME		_IOW ('q', 0x9D, int)
-#define PHONE_GET_TONE_ON_TIME		_IO  ('q', 0x9E)
-#define PHONE_GET_TONE_OFF_TIME		_IO  ('q', 0x9F)
-#define PHONE_GET_TONE_STATE		_IO  ('q', 0xA0)
-#define PHONE_BUSY			_IO  ('q', 0xA1)
-#define PHONE_RINGBACK			_IO  ('q', 0xA2)
-#define PHONE_DIALTONE			_IO  ('q', 0xA3)
-#define PHONE_CPT_STOP			_IO  ('q', 0xA4)
-
-#define PHONE_PSTN_SET_STATE		_IOW ('q', 0xA4, int)
-#define PHONE_PSTN_GET_STATE		_IO  ('q', 0xA5)
-
-#define PSTN_ON_HOOK		0
-#define PSTN_RINGING		1
-#define PSTN_OFF_HOOK		2
-#define PSTN_PULSE_DIAL		3
-
-/******************************************************************************
-* 
-* The wink duration is tunable with this ioctl.  The default wink duration  
-* is 320ms.  You do not need to use this ioctl if you do not require a
-* different wink duration.
-* 
-******************************************************************************/
-#define PHONE_WINK_DURATION		_IOW ('q', 0xA6, int)
-#define PHONE_WINK			_IOW ('q', 0xAA, int)
-
-/******************************************************************************
-* 
-*  Codec Definitions
-* 
-******************************************************************************/
-typedef enum {
-	G723_63 = 1,
-	G723_53 = 2,
-	TS85 = 3,
-	TS48 = 4,
-	TS41 = 5,
-	G728 = 6,
-	G729 = 7,
-	ULAW = 8,
-	ALAW = 9,
-	LINEAR16 = 10,
-	LINEAR8 = 11,
-	WSS = 12,
-	G729B = 13
-} phone_codec;
-
-struct phone_codec_data
-{
-        phone_codec type;
-        unsigned short buf_min, buf_opt, buf_max;
-};
-
-#define PHONE_QUERY_CODEC               _IOWR ('q', 0xA7, struct phone_codec_data *)
-#define PHONE_PSTN_LINETEST             _IO ('q', 0xA8)
-
-/******************************************************************************
-* 
-* This controls the VAD/CNG functionality of G.723.1.  The driver will
-* always pass full size frames, any unused bytes will be padded with zeros,
-* and frames passed to the driver should also be padded with zeros.  The
-* frame type is encoded in the least significant two bits of the first
-* WORD of the frame as follows:
-*
-* bits 1-0	Frame Type	Data Rate		Significant Words
-* 00		0		G.723.1 6.3		12
-* 01		1		G.723.1 5.3		10
-* 10		2		VAD/CNG			 2
-* 11		3		Repeat last CNG		 2 bits
-* 
-******************************************************************************/
-#define PHONE_VAD			_IOW ('q', 0xA9, int)
-
-
-/******************************************************************************
-*
-* The exception structure allows us to multiplex multiple events onto the
-* select() exception set.  If any of these flags are set select() will
-* return with a positive indication on the exception set.  The dtmf_ready
-* bit indicates if there is data waiting in the DTMF buffer.  The
-* hookstate bit is set if there is a change in hookstate status, it does not
-* indicate the current state of the hookswitch.  The pstn_ring bit
-* indicates that the DAA on a LineJACK card has detected ring voltage on
-* the PSTN port.  The caller_id bit indicates that caller_id data has been
-* received and is available.  The pstn_wink bit indicates that the DAA on
-* the LineJACK has received a wink from the telco switch.  The f0, f1, f2
-* and f3 bits indicate that the filter has been triggered by detecting the
-* frequency programmed into that filter.
-*
-* The remaining bits should be set to zero. They will become defined over time
-* for other interface cards and their needs.
-*
-******************************************************************************/
-struct phone_except
-{
-	unsigned int dtmf_ready:1;
-	unsigned int hookstate:1;
-	unsigned int pstn_ring:1;
-	unsigned int caller_id:1;
-	unsigned int pstn_wink:1;
-	unsigned int f0:1;
-	unsigned int f1:1;
-	unsigned int f2:1;
-	unsigned int f3:1;
-	unsigned int flash:1;
-	unsigned int fc0:1;
-	unsigned int fc1:1;
-	unsigned int fc2:1;
-	unsigned int fc3:1;
-	unsigned int reserved:18;
-};
-
-union telephony_exception {
-	struct phone_except bits;
-	unsigned int bytes;
-};
-
-
-#endif		/* TELEPHONY_H */
-
diff --git a/openflow/usr/include/linux/termios.h b/openflow/usr/include/linux/termios.h
deleted file mode 100644
index 2acd0c1..0000000
--- a/openflow/usr/include/linux/termios.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _LINUX_TERMIOS_H
-#define _LINUX_TERMIOS_H
-
-#include <linux/types.h>
-#include <asm/termios.h>
-
-#define NFF	5
-
-struct termiox
-{
-	__u16	x_hflag;
-	__u16	x_cflag;
-	__u16	x_rflag[NFF];
-	__u16	x_sflag;
-};
-
-#define	RTSXOFF		0x0001		/* RTS flow control on input */
-#define	CTSXON		0x0002		/* CTS flow control on output */
-#define	DTRXOFF		0x0004		/* DTR flow control on input */
-#define DSRXON		0x0008		/* DCD flow control on output */
-
-#endif
diff --git a/openflow/usr/include/linux/thermal.h b/openflow/usr/include/linux/thermal.h
deleted file mode 100644
index 7843937..0000000
--- a/openflow/usr/include/linux/thermal.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _LINUX_THERMAL_H
-#define _LINUX_THERMAL_H
-
-#define THERMAL_NAME_LENGTH	20
-
-/* Adding event notification support elements */
-#define THERMAL_GENL_FAMILY_NAME                "thermal_event"
-#define THERMAL_GENL_VERSION                    0x01
-#define THERMAL_GENL_MCAST_GROUP_NAME           "thermal_mc_grp"
-
-/* Events supported by Thermal Netlink */
-enum events {
-	THERMAL_AUX0,
-	THERMAL_AUX1,
-	THERMAL_CRITICAL,
-	THERMAL_DEV_FAULT,
-};
-
-/* attributes of thermal_genl_family */
-enum {
-	THERMAL_GENL_ATTR_UNSPEC,
-	THERMAL_GENL_ATTR_EVENT,
-	__THERMAL_GENL_ATTR_MAX,
-};
-#define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)
-
-/* commands supported by the thermal_genl_family */
-enum {
-	THERMAL_GENL_CMD_UNSPEC,
-	THERMAL_GENL_CMD_EVENT,
-	__THERMAL_GENL_CMD_MAX,
-};
-#define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
-
-#endif /* _LINUX_THERMAL_H */
diff --git a/openflow/usr/include/linux/time.h b/openflow/usr/include/linux/time.h
deleted file mode 100644
index 3d7a29d..0000000
--- a/openflow/usr/include/linux/time.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef _LINUX_TIME_H
-#define _LINUX_TIME_H
-
-#include <linux/types.h>
-
-
-#ifndef _STRUCT_TIMESPEC
-#define _STRUCT_TIMESPEC
-struct timespec {
-	__kernel_time_t	tv_sec;			/* seconds */
-	long		tv_nsec;		/* nanoseconds */
-};
-#endif
-
-struct timeval {
-	__kernel_time_t		tv_sec;		/* seconds */
-	__kernel_suseconds_t	tv_usec;	/* microseconds */
-};
-
-struct timezone {
-	int	tz_minuteswest;	/* minutes west of Greenwich */
-	int	tz_dsttime;	/* type of dst correction */
-};
-
-
-/*
- * Names of the interval timers, and structure
- * defining a timer setting:
- */
-#define	ITIMER_REAL		0
-#define	ITIMER_VIRTUAL		1
-#define	ITIMER_PROF		2
-
-struct itimerspec {
-	struct timespec it_interval;	/* timer period */
-	struct timespec it_value;	/* timer expiration */
-};
-
-struct itimerval {
-	struct timeval it_interval;	/* timer interval */
-	struct timeval it_value;	/* current value */
-};
-
-/*
- * The IDs of the various system clocks (for POSIX.1b interval timers):
- */
-#define CLOCK_REALTIME			0
-#define CLOCK_MONOTONIC			1
-#define CLOCK_PROCESS_CPUTIME_ID	2
-#define CLOCK_THREAD_CPUTIME_ID		3
-#define CLOCK_MONOTONIC_RAW		4
-#define CLOCK_REALTIME_COARSE		5
-#define CLOCK_MONOTONIC_COARSE		6
-#define CLOCK_BOOTTIME			7
-#define CLOCK_REALTIME_ALARM		8
-#define CLOCK_BOOTTIME_ALARM		9
-#define CLOCK_SGI_CYCLE			10	/* Hardware specific */
-#define CLOCK_TAI			11
-
-#define MAX_CLOCKS			16
-#define CLOCKS_MASK			(CLOCK_REALTIME | CLOCK_MONOTONIC)
-#define CLOCKS_MONO			CLOCK_MONOTONIC
-
-/*
- * The various flags for setting POSIX.1b interval timers:
- */
-#define TIMER_ABSTIME			0x01
-
-#endif /* _LINUX_TIME_H */
diff --git a/openflow/usr/include/linux/times.h b/openflow/usr/include/linux/times.h
deleted file mode 100644
index 87b6261..0000000
--- a/openflow/usr/include/linux/times.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _LINUX_TIMES_H
-#define _LINUX_TIMES_H
-
-#include <linux/types.h>
-
-struct tms {
-	__kernel_clock_t tms_utime;
-	__kernel_clock_t tms_stime;
-	__kernel_clock_t tms_cutime;
-	__kernel_clock_t tms_cstime;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/timex.h b/openflow/usr/include/linux/timex.h
deleted file mode 100644
index 9249c77..0000000
--- a/openflow/usr/include/linux/timex.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*****************************************************************************
- *                                                                           *
- * Copyright (c) David L. Mills 1993                                         *
- *                                                                           *
- * Permission to use, copy, modify, and distribute this software and its     *
- * documentation for any purpose and without fee is hereby granted, provided *
- * that the above copyright notice appears in all copies and that both the   *
- * copyright notice and this permission notice appear in supporting          *
- * documentation, and that the name University of Delaware not be used in    *
- * advertising or publicity pertaining to distribution of the software       *
- * without specific, written prior permission.  The University of Delaware   *
- * makes no representations about the suitability this software for any      *
- * purpose.  It is provided "as is" without express or implied warranty.     *
- *                                                                           *
- *****************************************************************************/
-
-/*
- * Modification history timex.h
- *
- * 29 Dec 97	Russell King
- *	Moved CLOCK_TICK_RATE, CLOCK_TICK_FACTOR and FINETUNE to asm/timex.h
- *	for ARM machines
- *
- *  9 Jan 97    Adrian Sun
- *      Shifted LATCH define to allow access to alpha machines.
- *
- * 26 Sep 94	David L. Mills
- *	Added defines for hybrid phase/frequency-lock loop.
- *
- * 19 Mar 94	David L. Mills
- *	Moved defines from kernel routines to header file and added new
- *	defines for PPS phase-lock loop.
- *
- * 20 Feb 94	David L. Mills
- *	Revised status codes and structures for external clock and PPS
- *	signal discipline.
- *
- * 28 Nov 93	David L. Mills
- *	Adjusted parameters to improve stability and increase poll
- *	interval.
- *
- * 17 Sep 93    David L. Mills
- *      Created file $NTP/include/sys/timex.h
- * 07 Oct 93    Torsten Duwe
- *      Derived linux/timex.h
- * 1995-08-13    Torsten Duwe
- *      kernel PLL updated to 1994-12-13 specs (rfc-1589)
- * 1997-08-30    Ulrich Windl
- *      Added new constant NTP_PHASE_LIMIT
- * 2004-08-12    Christoph Lameter
- *      Reworked time interpolation logic
- */
-#ifndef _LINUX_TIMEX_H
-#define _LINUX_TIMEX_H
-
-#include <linux/time.h>
-
-#define NTP_API		4	/* NTP API version */
-
-/*
- * syscall interface - used (mainly by NTP daemon)
- * to discipline kernel clock oscillator
- */
-struct timex {
-	unsigned int modes;	/* mode selector */
-	__kernel_long_t offset;	/* time offset (usec) */
-	__kernel_long_t freq;	/* frequency offset (scaled ppm) */
-	__kernel_long_t maxerror;/* maximum error (usec) */
-	__kernel_long_t esterror;/* estimated error (usec) */
-	int status;		/* clock command/status */
-	__kernel_long_t constant;/* pll time constant */
-	__kernel_long_t precision;/* clock precision (usec) (read only) */
-	__kernel_long_t tolerance;/* clock frequency tolerance (ppm)
-				   * (read only)
-				   */
-	struct timeval time;	/* (read only, except for ADJ_SETOFFSET) */
-	__kernel_long_t tick;	/* (modified) usecs between clock ticks */
-
-	__kernel_long_t ppsfreq;/* pps frequency (scaled ppm) (ro) */
-	__kernel_long_t jitter; /* pps jitter (us) (ro) */
-	int shift;              /* interval duration (s) (shift) (ro) */
-	__kernel_long_t stabil;            /* pps stability (scaled ppm) (ro) */
-	__kernel_long_t jitcnt; /* jitter limit exceeded (ro) */
-	__kernel_long_t calcnt; /* calibration intervals (ro) */
-	__kernel_long_t errcnt; /* calibration errors (ro) */
-	__kernel_long_t stbcnt; /* stability limit exceeded (ro) */
-
-	int tai;		/* TAI offset (ro) */
-
-	int  :32; int  :32; int  :32; int  :32;
-	int  :32; int  :32; int  :32; int  :32;
-	int  :32; int  :32; int  :32;
-};
-
-/*
- * Mode codes (timex.mode)
- */
-#define ADJ_OFFSET		0x0001	/* time offset */
-#define ADJ_FREQUENCY		0x0002	/* frequency offset */
-#define ADJ_MAXERROR		0x0004	/* maximum time error */
-#define ADJ_ESTERROR		0x0008	/* estimated time error */
-#define ADJ_STATUS		0x0010	/* clock status */
-#define ADJ_TIMECONST		0x0020	/* pll time constant */
-#define ADJ_TAI			0x0080	/* set TAI offset */
-#define ADJ_SETOFFSET		0x0100  /* add 'time' to current time */
-#define ADJ_MICRO		0x1000	/* select microsecond resolution */
-#define ADJ_NANO		0x2000	/* select nanosecond resolution */
-#define ADJ_TICK		0x4000	/* tick value */
-
-#define ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
-#define ADJ_OFFSET_SS_READ	0xa001	/* read-only adjtime */
-
-/* NTP userland likes the MOD_ prefix better */
-#define MOD_OFFSET	ADJ_OFFSET
-#define MOD_FREQUENCY	ADJ_FREQUENCY
-#define MOD_MAXERROR	ADJ_MAXERROR
-#define MOD_ESTERROR	ADJ_ESTERROR
-#define MOD_STATUS	ADJ_STATUS
-#define MOD_TIMECONST	ADJ_TIMECONST
-#define MOD_TAI	ADJ_TAI
-#define MOD_MICRO	ADJ_MICRO
-#define MOD_NANO	ADJ_NANO
-
-
-/*
- * Status codes (timex.status)
- */
-#define STA_PLL		0x0001	/* enable PLL updates (rw) */
-#define STA_PPSFREQ	0x0002	/* enable PPS freq discipline (rw) */
-#define STA_PPSTIME	0x0004	/* enable PPS time discipline (rw) */
-#define STA_FLL		0x0008	/* select frequency-lock mode (rw) */
-
-#define STA_INS		0x0010	/* insert leap (rw) */
-#define STA_DEL		0x0020	/* delete leap (rw) */
-#define STA_UNSYNC	0x0040	/* clock unsynchronized (rw) */
-#define STA_FREQHOLD	0x0080	/* hold frequency (rw) */
-
-#define STA_PPSSIGNAL	0x0100	/* PPS signal present (ro) */
-#define STA_PPSJITTER	0x0200	/* PPS signal jitter exceeded (ro) */
-#define STA_PPSWANDER	0x0400	/* PPS signal wander exceeded (ro) */
-#define STA_PPSERROR	0x0800	/* PPS signal calibration error (ro) */
-
-#define STA_CLOCKERR	0x1000	/* clock hardware fault (ro) */
-#define STA_NANO	0x2000	/* resolution (0 = us, 1 = ns) (ro) */
-#define STA_MODE	0x4000	/* mode (0 = PLL, 1 = FLL) (ro) */
-#define STA_CLK		0x8000	/* clock source (0 = A, 1 = B) (ro) */
-
-/* read-only bits */
-#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
-	STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK)
-
-/*
- * Clock states (time_state)
- */
-#define TIME_OK		0	/* clock synchronized, no leap second */
-#define TIME_INS	1	/* insert leap second */
-#define TIME_DEL	2	/* delete leap second */
-#define TIME_OOP	3	/* leap second in progress */
-#define TIME_WAIT	4	/* leap second has occurred */
-#define TIME_ERROR	5	/* clock not synchronized */
-#define TIME_BAD	TIME_ERROR /* bw compat */
-
-
-#endif /* _LINUX_TIMEX_H */
diff --git a/openflow/usr/include/linux/tiocl.h b/openflow/usr/include/linux/tiocl.h
deleted file mode 100644
index 4756862..0000000
--- a/openflow/usr/include/linux/tiocl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _LINUX_TIOCL_H
-#define _LINUX_TIOCL_H
-
-#define TIOCL_SETSEL	2	/* set a selection */
-#define 	TIOCL_SELCHAR	0	/* select characters */
-#define 	TIOCL_SELWORD	1	/* select whole words */
-#define 	TIOCL_SELLINE	2	/* select whole lines */
-#define 	TIOCL_SELPOINTER	3	/* show the pointer */
-#define 	TIOCL_SELCLEAR	4	/* clear visibility of selection */
-#define 	TIOCL_SELMOUSEREPORT	16	/* report beginning of selection */
-#define 	TIOCL_SELBUTTONMASK	15	/* button mask for report */
-/* selection extent */
-struct tiocl_selection {
-	unsigned short xs;	/* X start */
-	unsigned short ys;	/* Y start */
-	unsigned short xe;	/* X end */
-	unsigned short ye;	/* Y end */
-	unsigned short sel_mode;	/* selection mode */
-};
-
-#define TIOCL_PASTESEL	3	/* paste previous selection */
-#define TIOCL_UNBLANKSCREEN	4	/* unblank screen */
-
-#define TIOCL_SELLOADLUT	5
-	/* set characters to be considered alphabetic when selecting */
-	/* u32[8] bit array, 4 bytes-aligned with type */
-
-/* these two don't return a value: they write it back in the type */
-#define TIOCL_GETSHIFTSTATE	6	/* write shift state */
-#define TIOCL_GETMOUSEREPORTING	7	/* write whether mouse event are reported */
-#define TIOCL_SETVESABLANK	10	/* set vesa blanking mode */
-#define TIOCL_SETKMSGREDIRECT	11	/* restrict kernel messages to a vt */
-#define TIOCL_GETFGCONSOLE	12	/* get foreground vt */
-#define TIOCL_SCROLLCONSOLE	13	/* scroll console */
-#define TIOCL_BLANKSCREEN	14	/* keep screen blank even if a key is pressed */
-#define TIOCL_BLANKEDSCREEN	15	/* return which vt was blanked */
-#define TIOCL_GETKMSGREDIRECT	17	/* get the vt the kernel messages are restricted to */
-
-#endif /* _LINUX_TIOCL_H */
diff --git a/openflow/usr/include/linux/tipc.h b/openflow/usr/include/linux/tipc.h
deleted file mode 100644
index ebd3b63..0000000
--- a/openflow/usr/include/linux/tipc.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * include/uapi/linux/tipc.h: Header for TIPC socket interface
- *
- * Copyright (c) 2003-2006, Ericsson AB
- * Copyright (c) 2005, 2010-2011, Wind River Systems
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _LINUX_TIPC_H_
-#define _LINUX_TIPC_H_
-
-#include <linux/types.h>
-#include <linux/sockios.h>
-
-/*
- * TIPC addressing primitives
- */
-
-struct tipc_portid {
-	__u32 ref;
-	__u32 node;
-};
-
-struct tipc_name {
-	__u32 type;
-	__u32 instance;
-};
-
-struct tipc_name_seq {
-	__u32 type;
-	__u32 lower;
-	__u32 upper;
-};
-
-static __inline__ __u32 tipc_addr(unsigned int zone,
-			      unsigned int cluster,
-			      unsigned int node)
-{
-	return (zone << 24) | (cluster << 12) | node;
-}
-
-static __inline__ unsigned int tipc_zone(__u32 addr)
-{
-	return addr >> 24;
-}
-
-static __inline__ unsigned int tipc_cluster(__u32 addr)
-{
-	return (addr >> 12) & 0xfff;
-}
-
-static __inline__ unsigned int tipc_node(__u32 addr)
-{
-	return addr & 0xfff;
-}
-
-/*
- * Application-accessible port name types
- */
-
-#define TIPC_CFG_SRV		0	/* configuration service name type */
-#define TIPC_TOP_SRV		1	/* topology service name type */
-#define TIPC_LINK_STATE		2	/* link state name type */
-#define TIPC_RESERVED_TYPES	64	/* lowest user-publishable name type */
-
-/*
- * Publication scopes when binding port names and port name sequences
- */
-
-#define TIPC_ZONE_SCOPE		1
-#define TIPC_CLUSTER_SCOPE	2
-#define TIPC_NODE_SCOPE		3
-
-/*
- * Limiting values for messages
- */
-
-#define TIPC_MAX_USER_MSG_SIZE	66000U
-
-/*
- * Message importance levels
- */
-
-#define TIPC_LOW_IMPORTANCE		0
-#define TIPC_MEDIUM_IMPORTANCE		1
-#define TIPC_HIGH_IMPORTANCE		2
-#define TIPC_CRITICAL_IMPORTANCE	3
-
-/*
- * Msg rejection/connection shutdown reasons
- */
-
-#define TIPC_OK			0
-#define TIPC_ERR_NO_NAME	1
-#define TIPC_ERR_NO_PORT	2
-#define TIPC_ERR_NO_NODE	3
-#define TIPC_ERR_OVERLOAD	4
-#define TIPC_CONN_SHUTDOWN	5
-
-/*
- * TIPC topology subscription service definitions
- */
-
-#define TIPC_SUB_PORTS		0x01	/* filter for port availability */
-#define TIPC_SUB_SERVICE	0x02	/* filter for service availability */
-#define TIPC_SUB_CANCEL		0x04	/* cancel a subscription */
-
-#define TIPC_WAIT_FOREVER	(~0)	/* timeout for permanent subscription */
-
-struct tipc_subscr {
-	struct tipc_name_seq seq;	/* name sequence of interest */
-	__u32 timeout;			/* subscription duration (in ms) */
-	__u32 filter;			/* bitmask of filter options */
-	char usr_handle[8];		/* available for subscriber use */
-};
-
-#define TIPC_PUBLISHED		1	/* publication event */
-#define TIPC_WITHDRAWN		2	/* withdraw event */
-#define TIPC_SUBSCR_TIMEOUT	3	/* subscription timeout event */
-
-struct tipc_event {
-	__u32 event;			/* event type */
-	__u32 found_lower;		/* matching name seq instances */
-	__u32 found_upper;		/*    "      "    "     "      */
-	struct tipc_portid port;	/* associated port */
-	struct tipc_subscr s;		/* associated subscription */
-};
-
-/*
- * Socket API
- */
-
-#ifndef AF_TIPC
-#define AF_TIPC		30
-#endif
-
-#ifndef PF_TIPC
-#define PF_TIPC		AF_TIPC
-#endif
-
-#ifndef SOL_TIPC
-#define SOL_TIPC	271
-#endif
-
-#define TIPC_ADDR_NAMESEQ	1
-#define TIPC_ADDR_MCAST		1
-#define TIPC_ADDR_NAME		2
-#define TIPC_ADDR_ID		3
-
-struct sockaddr_tipc {
-	unsigned short family;
-	unsigned char  addrtype;
-	signed   char  scope;
-	union {
-		struct tipc_portid id;
-		struct tipc_name_seq nameseq;
-		struct {
-			struct tipc_name name;
-			__u32 domain;
-		} name;
-	} addr;
-};
-
-/*
- * Ancillary data objects supported by recvmsg()
- */
-
-#define TIPC_ERRINFO	1	/* error info */
-#define TIPC_RETDATA	2	/* returned data */
-#define TIPC_DESTNAME	3	/* destination name */
-
-/*
- * TIPC-specific socket option values
- */
-
-#define TIPC_IMPORTANCE		127	/* Default: TIPC_LOW_IMPORTANCE */
-#define TIPC_SRC_DROPPABLE	128	/* Default: based on socket type */
-#define TIPC_DEST_DROPPABLE	129	/* Default: based on socket type */
-#define TIPC_CONN_TIMEOUT	130	/* Default: 8000 (ms)  */
-#define TIPC_NODE_RECVQ_DEPTH	131	/* Default: none (read only) */
-#define TIPC_SOCK_RECVQ_DEPTH	132	/* Default: none (read only) */
-
-/*
- * Maximum sizes of TIPC bearer-related names (including terminating NULL)
- * The string formatting for each name element is:
- * media: media
- * interface: media:interface name
- * link: Z.C.N:interface-Z.C.N:interface
- *
- */
-
-#define TIPC_MAX_MEDIA_NAME	16
-#define TIPC_MAX_IF_NAME	16
-#define TIPC_MAX_BEARER_NAME	32
-#define TIPC_MAX_LINK_NAME	60
-
-#define SIOCGETLINKNAME		SIOCPROTOPRIVATE
-
-struct tipc_sioc_ln_req {
-	__u32 peer;
-	__u32 bearer_id;
-	char linkname[TIPC_MAX_LINK_NAME];
-};
-#endif
diff --git a/openflow/usr/include/linux/tipc_config.h b/openflow/usr/include/linux/tipc_config.h
deleted file mode 100644
index 89f667c..0000000
--- a/openflow/usr/include/linux/tipc_config.h
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * include/uapi/linux/tipc_config.h: Header for TIPC configuration interface
- *
- * Copyright (c) 2003-2006, Ericsson AB
- * Copyright (c) 2005-2007, 2010-2011, Wind River Systems
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _LINUX_TIPC_CONFIG_H_
-#define _LINUX_TIPC_CONFIG_H_
-
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/tipc.h>
-#include <asm/byteorder.h>
-
-#include <arpa/inet.h> /* for ntohs etc. */
-
-/*
- * Configuration
- *
- * All configuration management messaging involves sending a request message
- * to the TIPC configuration service on a node, which sends a reply message
- * back.  (In the future multi-message replies may be supported.)
- *
- * Both request and reply messages consist of a transport header and payload.
- * The transport header contains info about the desired operation;
- * the payload consists of zero or more type/length/value (TLV) items
- * which specify parameters or results for the operation.
- *
- * For many operations, the request and reply messages have a fixed number
- * of TLVs (usually zero or one); however, some reply messages may return
- * a variable number of TLVs.  A failed request is denoted by the presence
- * of an "error string" TLV in the reply message instead of the TLV(s) the
- * reply should contain if the request succeeds.
- */
-
-/*
- * Public commands:
- * May be issued by any process.
- * Accepted by own node, or by remote node only if remote management enabled.
- */
-
-#define  TIPC_CMD_NOOP              0x0000    /* tx none, rx none */
-#define  TIPC_CMD_GET_NODES         0x0001    /* tx net_addr, rx node_info(s) */
-#define  TIPC_CMD_GET_MEDIA_NAMES   0x0002    /* tx none, rx media_name(s) */
-#define  TIPC_CMD_GET_BEARER_NAMES  0x0003    /* tx none, rx bearer_name(s) */
-#define  TIPC_CMD_GET_LINKS         0x0004    /* tx net_addr, rx link_info(s) */
-#define  TIPC_CMD_SHOW_NAME_TABLE   0x0005    /* tx name_tbl_query, rx ultra_string */
-#define  TIPC_CMD_SHOW_PORTS        0x0006    /* tx none, rx ultra_string */
-#define  TIPC_CMD_SHOW_LINK_STATS   0x000B    /* tx link_name, rx ultra_string */
-#define  TIPC_CMD_SHOW_STATS        0x000F    /* tx unsigned, rx ultra_string */
-
-/*
- * Protected commands:
- * May only be issued by "network administration capable" process.
- * Accepted by own node, or by remote node only if remote management enabled
- * and this node is zone manager.
- */
-
-#define  TIPC_CMD_GET_REMOTE_MNG    0x4003    /* tx none, rx unsigned */
-#define  TIPC_CMD_GET_MAX_PORTS     0x4004    /* tx none, rx unsigned */
-#define  TIPC_CMD_GET_MAX_PUBL      0x4005    /* obsoleted */
-#define  TIPC_CMD_GET_MAX_SUBSCR    0x4006    /* obsoleted */
-#define  TIPC_CMD_GET_MAX_ZONES     0x4007    /* obsoleted */
-#define  TIPC_CMD_GET_MAX_CLUSTERS  0x4008    /* obsoleted */
-#define  TIPC_CMD_GET_MAX_NODES     0x4009    /* obsoleted */
-#define  TIPC_CMD_GET_MAX_SLAVES    0x400A    /* obsoleted */
-#define  TIPC_CMD_GET_NETID         0x400B    /* tx none, rx unsigned */
-
-#define  TIPC_CMD_ENABLE_BEARER     0x4101    /* tx bearer_config, rx none */
-#define  TIPC_CMD_DISABLE_BEARER    0x4102    /* tx bearer_name, rx none */
-#define  TIPC_CMD_SET_LINK_TOL      0x4107    /* tx link_config, rx none */
-#define  TIPC_CMD_SET_LINK_PRI      0x4108    /* tx link_config, rx none */
-#define  TIPC_CMD_SET_LINK_WINDOW   0x4109    /* tx link_config, rx none */
-#define  TIPC_CMD_SET_LOG_SIZE      0x410A    /* obsoleted */
-#define  TIPC_CMD_DUMP_LOG          0x410B    /* obsoleted */
-#define  TIPC_CMD_RESET_LINK_STATS  0x410C    /* tx link_name, rx none */
-
-/*
- * Private commands:
- * May only be issued by "network administration capable" process.
- * Accepted by own node only; cannot be used on a remote node.
- */
-
-#define  TIPC_CMD_SET_NODE_ADDR     0x8001    /* tx net_addr, rx none */
-#define  TIPC_CMD_SET_REMOTE_MNG    0x8003    /* tx unsigned, rx none */
-#define  TIPC_CMD_SET_MAX_PORTS     0x8004    /* tx unsigned, rx none */
-#define  TIPC_CMD_SET_MAX_PUBL      0x8005    /* obsoleted */
-#define  TIPC_CMD_SET_MAX_SUBSCR    0x8006    /* obsoleted */
-#define  TIPC_CMD_SET_MAX_ZONES     0x8007    /* obsoleted */
-#define  TIPC_CMD_SET_MAX_CLUSTERS  0x8008    /* obsoleted */
-#define  TIPC_CMD_SET_MAX_NODES     0x8009    /* obsoleted */
-#define  TIPC_CMD_SET_MAX_SLAVES    0x800A    /* obsoleted */
-#define  TIPC_CMD_SET_NETID         0x800B    /* tx unsigned, rx none */
-
-/*
- * Reserved commands:
- * May not be issued by any process.
- * Used internally by TIPC.
- */
-
-#define  TIPC_CMD_NOT_NET_ADMIN     0xC001    /* tx none, rx none */
-
-/*
- * TLV types defined for TIPC
- */
-
-#define TIPC_TLV_NONE		0	/* no TLV present */
-#define TIPC_TLV_VOID		1	/* empty TLV (0 data bytes)*/
-#define TIPC_TLV_UNSIGNED	2	/* 32-bit integer */
-#define TIPC_TLV_STRING		3	/* char[128] (max) */
-#define TIPC_TLV_LARGE_STRING	4	/* char[2048] (max) */
-#define TIPC_TLV_ULTRA_STRING	5	/* char[32768] (max) */
-
-#define TIPC_TLV_ERROR_STRING	16	/* char[128] containing "error code" */
-#define TIPC_TLV_NET_ADDR	17	/* 32-bit integer denoting <Z.C.N> */
-#define TIPC_TLV_MEDIA_NAME	18	/* char[TIPC_MAX_MEDIA_NAME] */
-#define TIPC_TLV_BEARER_NAME	19	/* char[TIPC_MAX_BEARER_NAME] */
-#define TIPC_TLV_LINK_NAME	20	/* char[TIPC_MAX_LINK_NAME] */
-#define TIPC_TLV_NODE_INFO	21	/* struct tipc_node_info */
-#define TIPC_TLV_LINK_INFO	22	/* struct tipc_link_info */
-#define TIPC_TLV_BEARER_CONFIG	23	/* struct tipc_bearer_config */
-#define TIPC_TLV_LINK_CONFIG	24	/* struct tipc_link_config */
-#define TIPC_TLV_NAME_TBL_QUERY	25	/* struct tipc_name_table_query */
-#define TIPC_TLV_PORT_REF	26	/* 32-bit port reference */
-
-/*
- * Link priority limits (min, default, max, media default)
- */
-
-#define TIPC_MIN_LINK_PRI	0
-#define TIPC_DEF_LINK_PRI	10
-#define TIPC_MAX_LINK_PRI	31
-#define TIPC_MEDIA_LINK_PRI	(TIPC_MAX_LINK_PRI + 1)
-
-/*
- * Link tolerance limits (min, default, max), in ms
- */
-
-#define TIPC_MIN_LINK_TOL 50
-#define TIPC_DEF_LINK_TOL 1500
-#define TIPC_MAX_LINK_TOL 30000
-
-#if (TIPC_MIN_LINK_TOL < 16)
-#error "TIPC_MIN_LINK_TOL is too small (abort limit may be NaN)"
-#endif
-
-/*
- * Link window limits (min, default, max), in packets
- */
-
-#define TIPC_MIN_LINK_WIN 16
-#define TIPC_DEF_LINK_WIN 50
-#define TIPC_MAX_LINK_WIN 8191
-
-
-struct tipc_node_info {
-	__be32 addr;			/* network address of node */
-	__be32 up;			/* 0=down, 1= up */
-};
-
-struct tipc_link_info {
-	__be32 dest;			/* network address of peer node */
-	__be32 up;			/* 0=down, 1=up */
-	char str[TIPC_MAX_LINK_NAME];	/* link name */
-};
-
-struct tipc_bearer_config {
-	__be32 priority;		/* Range [1,31]. Override per link  */
-	__be32 disc_domain;		/* <Z.C.N> describing desired nodes */
-	char name[TIPC_MAX_BEARER_NAME];
-};
-
-struct tipc_link_config {
-	__be32 value;
-	char name[TIPC_MAX_LINK_NAME];
-};
-
-#define TIPC_NTQ_ALLTYPES 0x80000000
-
-struct tipc_name_table_query {
-	__be32 depth;	/* 1:type, 2:+name info, 3:+port info, 4+:+debug info */
-	__be32 type;	/* {t,l,u} info ignored if high bit of "depth" is set */
-	__be32 lowbound; /* (i.e. displays all entries of name table) */
-	__be32 upbound;
-};
-
-/*
- * The error string TLV is a null-terminated string describing the cause
- * of the request failure.  To simplify error processing (and to save space)
- * the first character of the string can be a special error code character
- * (lying by the range 0x80 to 0xFF) which represents a pre-defined reason.
- */
-
-#define TIPC_CFG_TLV_ERROR      "\x80"  /* request contains incorrect TLV(s) */
-#define TIPC_CFG_NOT_NET_ADMIN  "\x81"	/* must be network administrator */
-#define TIPC_CFG_NOT_ZONE_MSTR	"\x82"	/* must be zone master */
-#define TIPC_CFG_NO_REMOTE	"\x83"	/* remote management not enabled */
-#define TIPC_CFG_NOT_SUPPORTED  "\x84"	/* request is not supported by TIPC */
-#define TIPC_CFG_INVALID_VALUE  "\x85"  /* request has invalid argument value */
-
-/*
- * A TLV consists of a descriptor, followed by the TLV value.
- * TLV descriptor fields are stored in network byte order;
- * TLV values must also be stored in network byte order (where applicable).
- * TLV descriptors must be aligned to addresses which are multiple of 4,
- * so up to 3 bytes of padding may exist at the end of the TLV value area.
- * There must not be any padding between the TLV descriptor and its value.
- */
-
-struct tlv_desc {
-	__be16 tlv_len;		/* TLV length (descriptor + value) */
-	__be16 tlv_type;		/* TLV identifier */
-};
-
-#define TLV_ALIGNTO 4
-
-#define TLV_ALIGN(datalen) (((datalen)+(TLV_ALIGNTO-1)) & ~(TLV_ALIGNTO-1))
-#define TLV_LENGTH(datalen) (sizeof(struct tlv_desc) + (datalen))
-#define TLV_SPACE(datalen) (TLV_ALIGN(TLV_LENGTH(datalen)))
-#define TLV_DATA(tlv) ((void *)((char *)(tlv) + TLV_LENGTH(0)))
-
-static __inline__ int TLV_OK(const void *tlv, __u16 space)
-{
-	/*
-	 * Would also like to check that "tlv" is a multiple of 4,
-	 * but don't know how to do this in a portable way.
-	 * - Tried doing (!(tlv & (TLV_ALIGNTO-1))), but GCC compiler
-	 *   won't allow binary "&" with a pointer.
-	 * - Tried casting "tlv" to integer type, but causes warning about size
-	 *   mismatch when pointer is bigger than chosen type (int, long, ...).
-	 */
-
-	return (space >= TLV_SPACE(0)) &&
-		(ntohs(((struct tlv_desc *)tlv)->tlv_len) <= space);
-}
-
-static __inline__ int TLV_CHECK(const void *tlv, __u16 space, __u16 exp_type)
-{
-	return TLV_OK(tlv, space) &&
-		(ntohs(((struct tlv_desc *)tlv)->tlv_type) == exp_type);
-}
-
-static __inline__ int TLV_GET_LEN(struct tlv_desc *tlv)
-{
-	return ntohs(tlv->tlv_len);
-}
-
-static __inline__ void TLV_SET_LEN(struct tlv_desc *tlv, __u16 len)
-{
-	tlv->tlv_len = htons(len);
-}
-
-static __inline__ int TLV_CHECK_TYPE(struct tlv_desc *tlv,  __u16 type)
-{
-	return (ntohs(tlv->tlv_type) == type);
-}
-
-static __inline__ void TLV_SET_TYPE(struct tlv_desc *tlv, __u16 type)
-{
-	tlv->tlv_type = htons(type);
-}
-
-static __inline__ int TLV_SET(void *tlv, __u16 type, void *data, __u16 len)
-{
-	struct tlv_desc *tlv_ptr;
-	int tlv_len;
-
-	tlv_len = TLV_LENGTH(len);
-	tlv_ptr = (struct tlv_desc *)tlv;
-	tlv_ptr->tlv_type = htons(type);
-	tlv_ptr->tlv_len  = htons(tlv_len);
-	if (len && data)
-		memcpy(TLV_DATA(tlv_ptr), data, tlv_len);
-	return TLV_SPACE(len);
-}
-
-/*
- * A TLV list descriptor simplifies processing of messages
- * containing multiple TLVs.
- */
-
-struct tlv_list_desc {
-	struct tlv_desc *tlv_ptr;	/* ptr to current TLV */
-	__u32 tlv_space;		/* # bytes from curr TLV to list end */
-};
-
-static __inline__ void TLV_LIST_INIT(struct tlv_list_desc *list,
-				 void *data, __u32 space)
-{
-	list->tlv_ptr = (struct tlv_desc *)data;
-	list->tlv_space = space;
-}
-
-static __inline__ int TLV_LIST_EMPTY(struct tlv_list_desc *list)
-{
-	return (list->tlv_space == 0);
-}
-
-static __inline__ int TLV_LIST_CHECK(struct tlv_list_desc *list, __u16 exp_type)
-{
-	return TLV_CHECK(list->tlv_ptr, list->tlv_space, exp_type);
-}
-
-static __inline__ void *TLV_LIST_DATA(struct tlv_list_desc *list)
-{
-	return TLV_DATA(list->tlv_ptr);
-}
-
-static __inline__ void TLV_LIST_STEP(struct tlv_list_desc *list)
-{
-	__u16 tlv_space = TLV_ALIGN(ntohs(list->tlv_ptr->tlv_len));
-
-	list->tlv_ptr = (struct tlv_desc *)((char *)list->tlv_ptr + tlv_space);
-	list->tlv_space -= tlv_space;
-}
-
-/*
- * Configuration messages exchanged via NETLINK_GENERIC use the following
- * family id, name, version and command.
- */
-#define TIPC_GENL_NAME		"TIPC"
-#define TIPC_GENL_VERSION	0x1
-#define TIPC_GENL_CMD		0x1
-
-/*
- * TIPC specific header used in NETLINK_GENERIC requests.
- */
-struct tipc_genlmsghdr {
-	__u32 dest;		/* Destination address */
-	__u16 cmd;		/* Command */
-	__u16 reserved;		/* Unused */
-};
-
-#define TIPC_GENL_HDRLEN	NLMSG_ALIGN(sizeof(struct tipc_genlmsghdr))
-
-/*
- * Configuration messages exchanged via TIPC sockets use the TIPC configuration
- * message header, which is defined below.  This structure is analogous
- * to the Netlink message header, but fields are stored in network byte order
- * and no padding is permitted between the header and the message data
- * that follows.
- */
-
-struct tipc_cfg_msg_hdr {
-	__be32 tcm_len;		/* Message length (including header) */
-	__be16 tcm_type;	/* Command type */
-	__be16 tcm_flags;	/* Additional flags */
-	char  tcm_reserved[8];	/* Unused */
-};
-
-#define TCM_F_REQUEST	0x1	/* Flag: Request message */
-#define TCM_F_MORE	0x2	/* Flag: Message to be continued */
-
-#define TCM_ALIGN(datalen)  (((datalen)+3) & ~3)
-#define TCM_LENGTH(datalen) (sizeof(struct tipc_cfg_msg_hdr) + datalen)
-#define TCM_SPACE(datalen)  (TCM_ALIGN(TCM_LENGTH(datalen)))
-#define TCM_DATA(tcm_hdr)   ((void *)((char *)(tcm_hdr) + TCM_LENGTH(0)))
-
-static __inline__ int TCM_SET(void *msg, __u16 cmd, __u16 flags,
-			  void *data, __u16 data_len)
-{
-	struct tipc_cfg_msg_hdr *tcm_hdr;
-	int msg_len;
-
-	msg_len = TCM_LENGTH(data_len);
-	tcm_hdr = (struct tipc_cfg_msg_hdr *)msg;
-	tcm_hdr->tcm_len   = htonl(msg_len);
-	tcm_hdr->tcm_type  = htons(cmd);
-	tcm_hdr->tcm_flags = htons(flags);
-	if (data_len && data)
-		memcpy(TCM_DATA(msg), data, data_len);
-	return TCM_SPACE(data_len);
-}
-
-#endif
diff --git a/openflow/usr/include/linux/tipc_netlink.h b/openflow/usr/include/linux/tipc_netlink.h
deleted file mode 100644
index d4c8f14..0000000
--- a/openflow/usr/include/linux/tipc_netlink.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 2014, Ericsson AB
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _LINUX_TIPC_NETLINK_H_
-#define _LINUX_TIPC_NETLINK_H_
-
-#define TIPC_GENL_V2_NAME      "TIPCv2"
-#define TIPC_GENL_V2_VERSION   0x1
-
-/* Netlink commands */
-enum {
-	TIPC_NL_UNSPEC,
-	TIPC_NL_LEGACY,
-	TIPC_NL_BEARER_DISABLE,
-	TIPC_NL_BEARER_ENABLE,
-	TIPC_NL_BEARER_GET,
-	TIPC_NL_BEARER_SET,
-	TIPC_NL_SOCK_GET,
-	TIPC_NL_PUBL_GET,
-	TIPC_NL_LINK_GET,
-	TIPC_NL_LINK_SET,
-	TIPC_NL_LINK_RESET_STATS,
-	TIPC_NL_MEDIA_GET,
-	TIPC_NL_MEDIA_SET,
-	TIPC_NL_NODE_GET,
-	TIPC_NL_NET_GET,
-	TIPC_NL_NET_SET,
-	TIPC_NL_NAME_TABLE_GET,
-
-	__TIPC_NL_CMD_MAX,
-	TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1
-};
-
-/* Top level netlink attributes */
-enum {
-	TIPC_NLA_UNSPEC,
-	TIPC_NLA_BEARER,		/* nest */
-	TIPC_NLA_SOCK,			/* nest */
-	TIPC_NLA_PUBL,			/* nest */
-	TIPC_NLA_LINK,			/* nest */
-	TIPC_NLA_MEDIA,			/* nest */
-	TIPC_NLA_NODE,			/* nest */
-	TIPC_NLA_NET,			/* nest */
-	TIPC_NLA_NAME_TABLE,		/* nest */
-
-	__TIPC_NLA_MAX,
-	TIPC_NLA_MAX = __TIPC_NLA_MAX - 1
-};
-
-/* Bearer info */
-enum {
-	TIPC_NLA_BEARER_UNSPEC,
-	TIPC_NLA_BEARER_NAME,		/* string */
-	TIPC_NLA_BEARER_PROP,		/* nest */
-	TIPC_NLA_BEARER_DOMAIN,		/* u32 */
-	TIPC_NLA_BEARER_UDP_OPTS,	/* nest */
-
-	__TIPC_NLA_BEARER_MAX,
-	TIPC_NLA_BEARER_MAX = __TIPC_NLA_BEARER_MAX - 1
-};
-
-enum {
-	TIPC_NLA_UDP_UNSPEC,
-	TIPC_NLA_UDP_LOCAL,		/* sockaddr_storage */
-	TIPC_NLA_UDP_REMOTE,		/* sockaddr_storage */
-
-	__TIPC_NLA_UDP_MAX,
-	TIPC_NLA_UDP_MAX = __TIPC_NLA_UDP_MAX - 1
-};
-/* Socket info */
-enum {
-	TIPC_NLA_SOCK_UNSPEC,
-	TIPC_NLA_SOCK_ADDR,		/* u32 */
-	TIPC_NLA_SOCK_REF,		/* u32 */
-	TIPC_NLA_SOCK_CON,		/* nest */
-	TIPC_NLA_SOCK_HAS_PUBL,		/* flag */
-
-	__TIPC_NLA_SOCK_MAX,
-	TIPC_NLA_SOCK_MAX = __TIPC_NLA_SOCK_MAX - 1
-};
-
-/* Link info */
-enum {
-	TIPC_NLA_LINK_UNSPEC,
-	TIPC_NLA_LINK_NAME,		/* string */
-	TIPC_NLA_LINK_DEST,		/* u32 */
-	TIPC_NLA_LINK_MTU,		/* u32 */
-	TIPC_NLA_LINK_BROADCAST,	/* flag */
-	TIPC_NLA_LINK_UP,		/* flag */
-	TIPC_NLA_LINK_ACTIVE,		/* flag */
-	TIPC_NLA_LINK_PROP,		/* nest */
-	TIPC_NLA_LINK_STATS,		/* nest */
-	TIPC_NLA_LINK_RX,		/* u32 */
-	TIPC_NLA_LINK_TX,		/* u32 */
-
-	__TIPC_NLA_LINK_MAX,
-	TIPC_NLA_LINK_MAX = __TIPC_NLA_LINK_MAX - 1
-};
-
-/* Media info */
-enum {
-	TIPC_NLA_MEDIA_UNSPEC,
-	TIPC_NLA_MEDIA_NAME,		/* string */
-	TIPC_NLA_MEDIA_PROP,		/* nest */
-
-	__TIPC_NLA_MEDIA_MAX,
-	TIPC_NLA_MEDIA_MAX = __TIPC_NLA_MEDIA_MAX - 1
-};
-
-/* Node info */
-enum {
-	TIPC_NLA_NODE_UNSPEC,
-	TIPC_NLA_NODE_ADDR,		/* u32 */
-	TIPC_NLA_NODE_UP,		/* flag */
-
-	__TIPC_NLA_NODE_MAX,
-	TIPC_NLA_NODE_MAX = __TIPC_NLA_NODE_MAX - 1
-};
-
-/* Net info */
-enum {
-	TIPC_NLA_NET_UNSPEC,
-	TIPC_NLA_NET_ID,		/* u32 */
-	TIPC_NLA_NET_ADDR,		/* u32 */
-
-	__TIPC_NLA_NET_MAX,
-	TIPC_NLA_NET_MAX = __TIPC_NLA_NET_MAX - 1
-};
-
-/* Name table info */
-enum {
-	TIPC_NLA_NAME_TABLE_UNSPEC,
-	TIPC_NLA_NAME_TABLE_PUBL,	/* nest */
-
-	__TIPC_NLA_NAME_TABLE_MAX,
-	TIPC_NLA_NAME_TABLE_MAX = __TIPC_NLA_NAME_TABLE_MAX - 1
-};
-
-/* Publication info */
-enum {
-	TIPC_NLA_PUBL_UNSPEC,
-
-	TIPC_NLA_PUBL_TYPE,		/* u32 */
-	TIPC_NLA_PUBL_LOWER,		/* u32 */
-	TIPC_NLA_PUBL_UPPER,		/* u32 */
-	TIPC_NLA_PUBL_SCOPE,		/* u32 */
-	TIPC_NLA_PUBL_NODE,		/* u32 */
-	TIPC_NLA_PUBL_REF,		/* u32 */
-	TIPC_NLA_PUBL_KEY,		/* u32 */
-
-	__TIPC_NLA_PUBL_MAX,
-	TIPC_NLA_PUBL_MAX = __TIPC_NLA_PUBL_MAX - 1
-};
-
-/* Nest, connection info */
-enum {
-	TIPC_NLA_CON_UNSPEC,
-
-	TIPC_NLA_CON_FLAG,		/* flag */
-	TIPC_NLA_CON_NODE,		/* u32 */
-	TIPC_NLA_CON_SOCK,		/* u32 */
-	TIPC_NLA_CON_TYPE,		/* u32 */
-	TIPC_NLA_CON_INST,		/* u32 */
-
-	__TIPC_NLA_CON_MAX,
-	TIPC_NLA_CON_MAX = __TIPC_NLA_CON_MAX - 1
-};
-
-/* Nest, link propreties. Valid for link, media and bearer */
-enum {
-	TIPC_NLA_PROP_UNSPEC,
-
-	TIPC_NLA_PROP_PRIO,		/* u32 */
-	TIPC_NLA_PROP_TOL,		/* u32 */
-	TIPC_NLA_PROP_WIN,		/* u32 */
-
-	__TIPC_NLA_PROP_MAX,
-	TIPC_NLA_PROP_MAX = __TIPC_NLA_PROP_MAX - 1
-};
-
-/* Nest, statistics info */
-enum {
-	TIPC_NLA_STATS_UNSPEC,
-
-	TIPC_NLA_STATS_RX_INFO,		/* u32 */
-	TIPC_NLA_STATS_RX_FRAGMENTS,	/* u32 */
-	TIPC_NLA_STATS_RX_FRAGMENTED,	/* u32 */
-	TIPC_NLA_STATS_RX_BUNDLES,	/* u32 */
-	TIPC_NLA_STATS_RX_BUNDLED,	/* u32 */
-	TIPC_NLA_STATS_TX_INFO,		/* u32 */
-	TIPC_NLA_STATS_TX_FRAGMENTS,	/* u32 */
-	TIPC_NLA_STATS_TX_FRAGMENTED,	/* u32 */
-	TIPC_NLA_STATS_TX_BUNDLES,	/* u32 */
-	TIPC_NLA_STATS_TX_BUNDLED,	/* u32 */
-	TIPC_NLA_STATS_MSG_PROF_TOT,	/* u32 */
-	TIPC_NLA_STATS_MSG_LEN_CNT,	/* u32 */
-	TIPC_NLA_STATS_MSG_LEN_TOT,	/* u32 */
-	TIPC_NLA_STATS_MSG_LEN_P0,	/* u32 */
-	TIPC_NLA_STATS_MSG_LEN_P1,	/* u32 */
-	TIPC_NLA_STATS_MSG_LEN_P2,	/* u32 */
-	TIPC_NLA_STATS_MSG_LEN_P3,	/* u32 */
-	TIPC_NLA_STATS_MSG_LEN_P4,	/* u32 */
-	TIPC_NLA_STATS_MSG_LEN_P5,	/* u32 */
-	TIPC_NLA_STATS_MSG_LEN_P6,	/* u32 */
-	TIPC_NLA_STATS_RX_STATES,	/* u32 */
-	TIPC_NLA_STATS_RX_PROBES,	/* u32 */
-	TIPC_NLA_STATS_RX_NACKS,	/* u32 */
-	TIPC_NLA_STATS_RX_DEFERRED,	/* u32 */
-	TIPC_NLA_STATS_TX_STATES,	/* u32 */
-	TIPC_NLA_STATS_TX_PROBES,	/* u32 */
-	TIPC_NLA_STATS_TX_NACKS,	/* u32 */
-	TIPC_NLA_STATS_TX_ACKS,		/* u32 */
-	TIPC_NLA_STATS_RETRANSMITTED,	/* u32 */
-	TIPC_NLA_STATS_DUPLICATES,	/* u32 */
-	TIPC_NLA_STATS_LINK_CONGS,	/* u32 */
-	TIPC_NLA_STATS_MAX_QUEUE,	/* u32 */
-	TIPC_NLA_STATS_AVG_QUEUE,	/* u32 */
-
-	__TIPC_NLA_STATS_MAX,
-	TIPC_NLA_STATS_MAX = __TIPC_NLA_STATS_MAX - 1
-};
-
-#endif
diff --git a/openflow/usr/include/linux/toshiba.h b/openflow/usr/include/linux/toshiba.h
deleted file mode 100644
index 42f2f11..0000000
--- a/openflow/usr/include/linux/toshiba.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* toshiba.h -- Linux driver for accessing the SMM on Toshiba laptops 
- *
- * Copyright (c) 1996-2000  Jonathan A. Buzzard (jonathan@buzzard.org.uk)
- * Copyright (c) 2015  Azael Avalos <coproscefalo@gmail.com>
- *
- * Thanks to Juergen Heinzl <juergen@monocerus.demon.co.uk> for the pointers
- * on making sure the structure is aligned and packed.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- */
-
-#ifndef _LINUX_TOSHIBA_H
-#define _LINUX_TOSHIBA_H
-
-/*
- * Toshiba modules paths
- */
-
-#define TOSH_PROC		"/proc/toshiba"
-#define TOSH_DEVICE		"/dev/toshiba"
-#define TOSHIBA_ACPI_PROC	"/proc/acpi/toshiba"
-#define TOSHIBA_ACPI_DEVICE	"/dev/toshiba_acpi"
-
-/*
- * Toshiba SMM structure
- */
-
-typedef struct {
-	unsigned int eax;
-	unsigned int ebx __attribute__ ((packed));
-	unsigned int ecx __attribute__ ((packed));
-	unsigned int edx __attribute__ ((packed));
-	unsigned int esi __attribute__ ((packed));
-	unsigned int edi __attribute__ ((packed));
-} SMMRegisters;
-
-/*
- * IOCTLs (0x90 - 0x91)
- */
-
-#define TOSH_SMM		_IOWR('t', 0x90, SMMRegisters)
-/*
- * Convenience toshiba_acpi command.
- *
- * The System Configuration Interface (SCI) is opened/closed internally
- * to avoid userspace of buggy BIOSes.
- *
- * The toshiba_acpi module checks whether the eax register is set with
- * SCI_GET (0xf300) or SCI_SET (0xf400), returning -EINVAL if not.
- */
-#define TOSHIBA_ACPI_SCI	_IOWR('t', 0x91, SMMRegisters)
-
-
-#endif /* _LINUX_TOSHIBA_H */
diff --git a/openflow/usr/include/linux/tty.h b/openflow/usr/include/linux/tty.h
deleted file mode 100644
index 31156e5..0000000
--- a/openflow/usr/include/linux/tty.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _LINUX_TTY_H
-#define _LINUX_TTY_H
-
-/*
- * 'tty.h' defines some structures used by tty_io.c and some defines.
- */
-
-#define NR_LDISCS		30
-
-/* line disciplines */
-#define N_TTY		0
-#define N_SLIP		1
-#define N_MOUSE		2
-#define N_PPP		3
-#define N_STRIP		4
-#define N_AX25		5
-#define N_X25		6	/* X.25 async */
-#define N_6PACK		7
-#define N_MASC		8	/* Reserved for Mobitex module <kaz@cafe.net> */
-#define N_R3964		9	/* Reserved for Simatic R3964 module */
-#define N_PROFIBUS_FDL	10	/* Reserved for Profibus */
-#define N_IRDA		11	/* Linux IrDa - http://irda.sourceforge.net/ */
-#define N_SMSBLOCK	12	/* SMS block mode - for talking to GSM data */
-				/* cards about SMS messages */
-#define N_HDLC		13	/* synchronous HDLC */
-#define N_SYNC_PPP	14	/* synchronous PPP */
-#define N_HCI		15	/* Bluetooth HCI UART */
-#define N_GIGASET_M101	16	/* Siemens Gigaset M101 serial DECT adapter */
-#define N_SLCAN		17	/* Serial / USB serial CAN Adaptors */
-#define N_PPS		18	/* Pulse per Second */
-#define N_V253		19	/* Codec control over voice modem */
-#define N_CAIF		20      /* CAIF protocol for talking to modems */
-#define N_GSM0710	21	/* GSM 0710 Mux */
-#define N_TI_WL		22	/* for TI's WL BT, FM, GPS combo chips */
-#define N_TRACESINK	23	/* Trace data routing for MIPI P1149.7 */
-#define N_TRACEROUTER	24	/* Trace data routing for MIPI P1149.7 */
-#define N_NCI		25	/* NFC NCI UART */
-
-#endif /* _LINUX_TTY_H */
diff --git a/openflow/usr/include/linux/tty_flags.h b/openflow/usr/include/linux/tty_flags.h
deleted file mode 100644
index 072e41e..0000000
--- a/openflow/usr/include/linux/tty_flags.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef _LINUX_TTY_FLAGS_H
-#define _LINUX_TTY_FLAGS_H
-
-/*
- * Definitions for async_struct (and serial_struct) flags field also
- * shared by the tty_port flags structures.
- *
- * Define ASYNCB_* for convenient use with {test,set,clear}_bit.
- *
- * Bits [0..ASYNCB_LAST_USER] are userspace defined/visible/changeable
- * [x] in the bit comments indicates the flag is defunct and no longer used.
- */
-#define ASYNCB_HUP_NOTIFY	 0 /* Notify getty on hangups and closes
-				    * on the callout port */
-#define ASYNCB_FOURPORT		 1 /* Set OU1, OUT2 per AST Fourport settings */
-#define ASYNCB_SAK		 2 /* Secure Attention Key (Orange book) */
-#define ASYNCB_SPLIT_TERMIOS	 3 /* [x] Separate termios for dialin/callout */
-#define ASYNCB_SPD_HI		 4 /* Use 57600 instead of 38400 bps */
-#define ASYNCB_SPD_VHI		 5 /* Use 115200 instead of 38400 bps */
-#define ASYNCB_SKIP_TEST	 6 /* Skip UART test during autoconfiguration */
-#define ASYNCB_AUTO_IRQ		 7 /* Do automatic IRQ during
-				    * autoconfiguration */
-#define ASYNCB_SESSION_LOCKOUT	 8 /* [x] Lock out cua opens based on session */
-#define ASYNCB_PGRP_LOCKOUT	 9 /* [x] Lock out cua opens based on pgrp */
-#define ASYNCB_CALLOUT_NOHUP	10 /* [x] Don't do hangups for cua device */
-#define ASYNCB_HARDPPS_CD	11 /* Call hardpps when CD goes high  */
-#define ASYNCB_SPD_SHI		12 /* Use 230400 instead of 38400 bps */
-#define ASYNCB_LOW_LATENCY	13 /* Request low latency behaviour */
-#define ASYNCB_BUGGY_UART	14 /* This is a buggy UART, skip some safety
-				    * checks.  Note: can be dangerous! */
-#define ASYNCB_AUTOPROBE	15 /* [x] Port was autoprobed by PCI/PNP code */
-#define ASYNCB_MAGIC_MULTIPLIER	16 /* Use special CLK or divisor */
-#define ASYNCB_LAST_USER	16
-
-/* Internal flags used only by kernel */
-#define ASYNCB_INITIALIZED	31 /* Serial port was initialized */
-#define ASYNCB_SUSPENDED	30 /* Serial port is suspended */
-#define ASYNCB_NORMAL_ACTIVE	29 /* Normal device is active */
-#define ASYNCB_BOOT_AUTOCONF	28 /* Autoconfigure port on bootup */
-#define ASYNCB_CLOSING		27 /* Serial port is closing */
-#define ASYNCB_CTS_FLOW		26 /* Do CTS flow control */
-#define ASYNCB_CHECK_CD		25 /* i.e., CLOCAL */
-#define ASYNCB_SHARE_IRQ	24 /* for multifunction cards, no longer used */
-#define ASYNCB_CONS_FLOW	23 /* flow control for console  */
-#define ASYNCB_FIRST_KERNEL	22
-
-#define ASYNC_HUP_NOTIFY	(1U << ASYNCB_HUP_NOTIFY)
-#define ASYNC_SUSPENDED		(1U << ASYNCB_SUSPENDED)
-#define ASYNC_FOURPORT		(1U << ASYNCB_FOURPORT)
-#define ASYNC_SAK		(1U << ASYNCB_SAK)
-#define ASYNC_SPLIT_TERMIOS	(1U << ASYNCB_SPLIT_TERMIOS)
-#define ASYNC_SPD_HI		(1U << ASYNCB_SPD_HI)
-#define ASYNC_SPD_VHI		(1U << ASYNCB_SPD_VHI)
-#define ASYNC_SKIP_TEST		(1U << ASYNCB_SKIP_TEST)
-#define ASYNC_AUTO_IRQ		(1U << ASYNCB_AUTO_IRQ)
-#define ASYNC_SESSION_LOCKOUT	(1U << ASYNCB_SESSION_LOCKOUT)
-#define ASYNC_PGRP_LOCKOUT	(1U << ASYNCB_PGRP_LOCKOUT)
-#define ASYNC_CALLOUT_NOHUP	(1U << ASYNCB_CALLOUT_NOHUP)
-#define ASYNC_HARDPPS_CD	(1U << ASYNCB_HARDPPS_CD)
-#define ASYNC_SPD_SHI		(1U << ASYNCB_SPD_SHI)
-#define ASYNC_LOW_LATENCY	(1U << ASYNCB_LOW_LATENCY)
-#define ASYNC_BUGGY_UART	(1U << ASYNCB_BUGGY_UART)
-#define ASYNC_AUTOPROBE		(1U << ASYNCB_AUTOPROBE)
-#define ASYNC_MAGIC_MULTIPLIER	(1U << ASYNCB_MAGIC_MULTIPLIER)
-
-#define ASYNC_FLAGS		((1U << (ASYNCB_LAST_USER + 1)) - 1)
-#define ASYNC_DEPRECATED	(ASYNC_SESSION_LOCKOUT | ASYNC_PGRP_LOCKOUT | \
-		ASYNC_CALLOUT_NOHUP | ASYNC_AUTOPROBE)
-#define ASYNC_USR_MASK		(ASYNC_SPD_MASK|ASYNC_CALLOUT_NOHUP| \
-		ASYNC_LOW_LATENCY)
-#define ASYNC_SPD_CUST		(ASYNC_SPD_HI|ASYNC_SPD_VHI)
-#define ASYNC_SPD_WARP		(ASYNC_SPD_HI|ASYNC_SPD_SHI)
-#define ASYNC_SPD_MASK		(ASYNC_SPD_HI|ASYNC_SPD_VHI|ASYNC_SPD_SHI)
-
-#define ASYNC_INITIALIZED	(1U << ASYNCB_INITIALIZED)
-#define ASYNC_NORMAL_ACTIVE	(1U << ASYNCB_NORMAL_ACTIVE)
-#define ASYNC_BOOT_AUTOCONF	(1U << ASYNCB_BOOT_AUTOCONF)
-#define ASYNC_CLOSING		(1U << ASYNCB_CLOSING)
-#define ASYNC_CTS_FLOW		(1U << ASYNCB_CTS_FLOW)
-#define ASYNC_CHECK_CD		(1U << ASYNCB_CHECK_CD)
-#define ASYNC_SHARE_IRQ		(1U << ASYNCB_SHARE_IRQ)
-#define ASYNC_CONS_FLOW		(1U << ASYNCB_CONS_FLOW)
-#define ASYNC_INTERNAL_FLAGS	(~((1U << ASYNCB_FIRST_KERNEL) - 1))
-
-#endif
diff --git a/openflow/usr/include/linux/types.h b/openflow/usr/include/linux/types.h
deleted file mode 100644
index 23ea78f..0000000
--- a/openflow/usr/include/linux/types.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _LINUX_TYPES_H
-#define _LINUX_TYPES_H
-
-#include <asm/types.h>
-
-#ifndef __ASSEMBLY__
-
-#include <linux/posix_types.h>
-
-
-/*
- * Below are truly Linux-specific types that should never collide with
- * any application/library that wants linux/types.h.
- */
-
-#ifdef __CHECKER__
-#define __bitwise__ __attribute__((bitwise))
-#else
-#define __bitwise__
-#endif
-#ifdef __CHECK_ENDIAN__
-#define __bitwise __bitwise__
-#else
-#define __bitwise
-#endif
-
-typedef __u16 __bitwise __le16;
-typedef __u16 __bitwise __be16;
-typedef __u32 __bitwise __le32;
-typedef __u32 __bitwise __be32;
-typedef __u64 __bitwise __le64;
-typedef __u64 __bitwise __be64;
-
-typedef __u16 __bitwise __sum16;
-typedef __u32 __bitwise __wsum;
-
-/*
- * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
- * common 32/64-bit compat problems.
- * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
- * architectures) and to 8-byte boundaries on 64-bit architectures.  The new
- * aligned_64 type enforces 8-byte alignment so that structs containing
- * aligned_64 values have the same alignment on 32-bit and 64-bit architectures.
- * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
- */
-#define __aligned_u64 __u64 __attribute__((aligned(8)))
-#define __aligned_be64 __be64 __attribute__((aligned(8)))
-#define __aligned_le64 __le64 __attribute__((aligned(8)))
-
-#endif /*  __ASSEMBLY__ */
-#endif /* _LINUX_TYPES_H */
diff --git a/openflow/usr/include/linux/udf_fs_i.h b/openflow/usr/include/linux/udf_fs_i.h
deleted file mode 100644
index 3536965..0000000
--- a/openflow/usr/include/linux/udf_fs_i.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * udf_fs_i.h
- *
- * This file is intended for the Linux kernel/module. 
- *
- * COPYRIGHT
- *	This file is distributed under the terms of the GNU General Public
- *	License (GPL). Copies of the GPL can be obtained from:
- *		ftp://prep.ai.mit.edu/pub/gnu/GPL
- *	Each contributing author retains all rights to their own work.
- */
-#ifndef _UDF_FS_I_H
-#define _UDF_FS_I_H 1
-
-/* exported IOCTLs, we have 'l', 0x40-0x7f */
-#define UDF_GETEASIZE   _IOR('l', 0x40, int)
-#define UDF_GETEABLOCK  _IOR('l', 0x41, void *)
-#define UDF_GETVOLIDENT _IOR('l', 0x42, void *)
-#define UDF_RELOCATE_BLOCKS _IOWR('l', 0x43, long)
-
-#endif /* _UDF_FS_I_H */
diff --git a/openflow/usr/include/linux/udp.h b/openflow/usr/include/linux/udp.h
deleted file mode 100644
index ab05413..0000000
--- a/openflow/usr/include/linux/udp.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Definitions for the UDP protocol.
- *
- * Version:	@(#)udp.h	1.0.2	04/28/93
- *
- * Author:	Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_UDP_H
-#define _LINUX_UDP_H
-
-#include <linux/types.h>
-
-struct udphdr {
-	__be16	source;
-	__be16	dest;
-	__be16	len;
-	__sum16	check;
-};
-
-/* UDP socket options */
-#define UDP_CORK	1	/* Never send partially complete segments */
-#define UDP_ENCAP	100	/* Set the socket to accept encapsulated packets */
-#define UDP_NO_CHECK6_TX 101	/* Disable sending checksum for UDP6X */
-#define UDP_NO_CHECK6_RX 102	/* Disable accpeting checksum for UDP6 */
-
-/* UDP encapsulation types */
-#define UDP_ENCAP_ESPINUDP_NON_IKE	1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
-#define UDP_ENCAP_ESPINUDP	2 /* draft-ietf-ipsec-udp-encaps-06 */
-#define UDP_ENCAP_L2TPINUDP	3 /* rfc2661 */
-
-
-#endif /* _LINUX_UDP_H */
diff --git a/openflow/usr/include/linux/uhid.h b/openflow/usr/include/linux/uhid.h
deleted file mode 100644
index 0ef73d4..0000000
--- a/openflow/usr/include/linux/uhid.h
+++ /dev/null
@@ -1,199 +0,0 @@
-#ifndef __UHID_H_
-#define __UHID_H_
-
-/*
- * User-space I/O driver support for HID subsystem
- * Copyright (c) 2012 David Herrmann
- */
-
-/*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/*
- * Public header for user-space communication. We try to keep every structure
- * aligned but to be safe we also use __attribute__((__packed__)). Therefore,
- * the communication should be ABI compatible even between architectures.
- */
-
-#include <linux/input.h>
-#include <linux/types.h>
-#include <linux/hid.h>
-
-enum uhid_event_type {
-	__UHID_LEGACY_CREATE,
-	UHID_DESTROY,
-	UHID_START,
-	UHID_STOP,
-	UHID_OPEN,
-	UHID_CLOSE,
-	UHID_OUTPUT,
-	__UHID_LEGACY_OUTPUT_EV,
-	__UHID_LEGACY_INPUT,
-	UHID_GET_REPORT,
-	UHID_GET_REPORT_REPLY,
-	UHID_CREATE2,
-	UHID_INPUT2,
-	UHID_SET_REPORT,
-	UHID_SET_REPORT_REPLY,
-};
-
-struct uhid_create2_req {
-	__u8 name[128];
-	__u8 phys[64];
-	__u8 uniq[64];
-	__u16 rd_size;
-	__u16 bus;
-	__u32 vendor;
-	__u32 product;
-	__u32 version;
-	__u32 country;
-	__u8 rd_data[HID_MAX_DESCRIPTOR_SIZE];
-} __attribute__((__packed__));
-
-enum uhid_dev_flag {
-	UHID_DEV_NUMBERED_FEATURE_REPORTS			= (1ULL << 0),
-	UHID_DEV_NUMBERED_OUTPUT_REPORTS			= (1ULL << 1),
-	UHID_DEV_NUMBERED_INPUT_REPORTS				= (1ULL << 2),
-};
-
-struct uhid_start_req {
-	__u64 dev_flags;
-};
-
-#define UHID_DATA_MAX 4096
-
-enum uhid_report_type {
-	UHID_FEATURE_REPORT,
-	UHID_OUTPUT_REPORT,
-	UHID_INPUT_REPORT,
-};
-
-struct uhid_input2_req {
-	__u16 size;
-	__u8 data[UHID_DATA_MAX];
-} __attribute__((__packed__));
-
-struct uhid_output_req {
-	__u8 data[UHID_DATA_MAX];
-	__u16 size;
-	__u8 rtype;
-} __attribute__((__packed__));
-
-struct uhid_get_report_req {
-	__u32 id;
-	__u8 rnum;
-	__u8 rtype;
-} __attribute__((__packed__));
-
-struct uhid_get_report_reply_req {
-	__u32 id;
-	__u16 err;
-	__u16 size;
-	__u8 data[UHID_DATA_MAX];
-} __attribute__((__packed__));
-
-struct uhid_set_report_req {
-	__u32 id;
-	__u8 rnum;
-	__u8 rtype;
-	__u16 size;
-	__u8 data[UHID_DATA_MAX];
-} __attribute__((__packed__));
-
-struct uhid_set_report_reply_req {
-	__u32 id;
-	__u16 err;
-} __attribute__((__packed__));
-
-/*
- * Compat Layer
- * All these commands and requests are obsolete. You should avoid using them in
- * new code. We support them for backwards-compatibility, but you might not get
- * access to new feature in case you use them.
- */
-
-enum uhid_legacy_event_type {
-	UHID_CREATE			= __UHID_LEGACY_CREATE,
-	UHID_OUTPUT_EV			= __UHID_LEGACY_OUTPUT_EV,
-	UHID_INPUT			= __UHID_LEGACY_INPUT,
-	UHID_FEATURE			= UHID_GET_REPORT,
-	UHID_FEATURE_ANSWER		= UHID_GET_REPORT_REPLY,
-};
-
-/* Obsolete! Use UHID_CREATE2. */
-struct uhid_create_req {
-	__u8 name[128];
-	__u8 phys[64];
-	__u8 uniq[64];
-	__u8 *rd_data;
-	__u16 rd_size;
-
-	__u16 bus;
-	__u32 vendor;
-	__u32 product;
-	__u32 version;
-	__u32 country;
-} __attribute__((__packed__));
-
-/* Obsolete! Use UHID_INPUT2. */
-struct uhid_input_req {
-	__u8 data[UHID_DATA_MAX];
-	__u16 size;
-} __attribute__((__packed__));
-
-/* Obsolete! Kernel uses UHID_OUTPUT exclusively now. */
-struct uhid_output_ev_req {
-	__u16 type;
-	__u16 code;
-	__s32 value;
-} __attribute__((__packed__));
-
-/* Obsolete! Kernel uses ABI compatible UHID_GET_REPORT. */
-struct uhid_feature_req {
-	__u32 id;
-	__u8 rnum;
-	__u8 rtype;
-} __attribute__((__packed__));
-
-/* Obsolete! Use ABI compatible UHID_GET_REPORT_REPLY. */
-struct uhid_feature_answer_req {
-	__u32 id;
-	__u16 err;
-	__u16 size;
-	__u8 data[UHID_DATA_MAX];
-} __attribute__((__packed__));
-
-/*
- * UHID Events
- * All UHID events from and to the kernel are encoded as "struct uhid_event".
- * The "type" field contains a UHID_* type identifier. All payload depends on
- * that type and can be accessed via ev->u.XYZ accordingly.
- * If user-space writes short events, they're extended with 0s by the kernel. If
- * the kernel writes short events, user-space shall extend them with 0s.
- */
-
-struct uhid_event {
-	__u32 type;
-
-	union {
-		struct uhid_create_req create;
-		struct uhid_input_req input;
-		struct uhid_output_req output;
-		struct uhid_output_ev_req output_ev;
-		struct uhid_feature_req feature;
-		struct uhid_get_report_req get_report;
-		struct uhid_feature_answer_req feature_answer;
-		struct uhid_get_report_reply_req get_report_reply;
-		struct uhid_create2_req create2;
-		struct uhid_input2_req input2;
-		struct uhid_set_report_req set_report;
-		struct uhid_set_report_reply_req set_report_reply;
-		struct uhid_start_req start;
-	} u;
-} __attribute__((__packed__));
-
-#endif /* __UHID_H_ */
diff --git a/openflow/usr/include/linux/uinput.h b/openflow/usr/include/linux/uinput.h
deleted file mode 100644
index 5eaad8a..0000000
--- a/openflow/usr/include/linux/uinput.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- *  User level driver support for input subsystem
- *
- * Heavily based on evdev.c by Vojtech Pavlik
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Author: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
- *
- * Changes/Revisions:
- *	0.4	01/09/2014 (Benjamin Tissoires <benjamin.tissoires@redhat.com>)
- *		- add UI_GET_SYSNAME ioctl
- *	0.3	24/05/2006 (Anssi Hannula <anssi.hannulagmail.com>)
- *		- update ff support for the changes in kernel interface
- *		- add UINPUT_VERSION
- *	0.2	16/10/2004 (Micah Dowty <micah@navi.cx>)
- *		- added force feedback support
- *             - added UI_SET_PHYS
- *	0.1	20/06/2002
- *		- first public version
- */
-#ifndef __UINPUT_H_
-#define __UINPUT_H_
-
-#include <linux/types.h>
-#include <linux/input.h>
-
-#define UINPUT_VERSION		4
-
-
-struct uinput_ff_upload {
-	__u32			request_id;
-	__s32			retval;
-	struct ff_effect	effect;
-	struct ff_effect	old;
-};
-
-struct uinput_ff_erase {
-	__u32			request_id;
-	__s32			retval;
-	__u32			effect_id;
-};
-
-/* ioctl */
-#define UINPUT_IOCTL_BASE	'U'
-#define UI_DEV_CREATE		_IO(UINPUT_IOCTL_BASE, 1)
-#define UI_DEV_DESTROY		_IO(UINPUT_IOCTL_BASE, 2)
-
-#define UI_SET_EVBIT		_IOW(UINPUT_IOCTL_BASE, 100, int)
-#define UI_SET_KEYBIT		_IOW(UINPUT_IOCTL_BASE, 101, int)
-#define UI_SET_RELBIT		_IOW(UINPUT_IOCTL_BASE, 102, int)
-#define UI_SET_ABSBIT		_IOW(UINPUT_IOCTL_BASE, 103, int)
-#define UI_SET_MSCBIT		_IOW(UINPUT_IOCTL_BASE, 104, int)
-#define UI_SET_LEDBIT		_IOW(UINPUT_IOCTL_BASE, 105, int)
-#define UI_SET_SNDBIT		_IOW(UINPUT_IOCTL_BASE, 106, int)
-#define UI_SET_FFBIT		_IOW(UINPUT_IOCTL_BASE, 107, int)
-#define UI_SET_PHYS		_IOW(UINPUT_IOCTL_BASE, 108, char*)
-#define UI_SET_SWBIT		_IOW(UINPUT_IOCTL_BASE, 109, int)
-#define UI_SET_PROPBIT		_IOW(UINPUT_IOCTL_BASE, 110, int)
-
-#define UI_BEGIN_FF_UPLOAD	_IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload)
-#define UI_END_FF_UPLOAD	_IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload)
-#define UI_BEGIN_FF_ERASE	_IOWR(UINPUT_IOCTL_BASE, 202, struct uinput_ff_erase)
-#define UI_END_FF_ERASE		_IOW(UINPUT_IOCTL_BASE, 203, struct uinput_ff_erase)
-
-/**
- * UI_GET_SYSNAME - get the sysfs name of the created uinput device
- *
- * @return the sysfs name of the created virtual input device.
- * The complete sysfs path is then /sys/devices/virtual/input/--NAME--
- * Usually, it is in the form "inputN"
- */
-#define UI_GET_SYSNAME(len)	_IOC(_IOC_READ, UINPUT_IOCTL_BASE, 44, len)
-
-/**
- * UI_GET_VERSION - Return version of uinput protocol
- *
- * This writes uinput protocol version implemented by the kernel into
- * the integer pointed to by the ioctl argument. The protocol version
- * is hard-coded in the kernel and is independent of the uinput device.
- */
-#define UI_GET_VERSION		_IOR(UINPUT_IOCTL_BASE, 45, unsigned int)
-
-/*
- * To write a force-feedback-capable driver, the upload_effect
- * and erase_effect callbacks in input_dev must be implemented.
- * The uinput driver will generate a fake input event when one of
- * these callbacks are invoked. The userspace code then uses
- * ioctls to retrieve additional parameters and send the return code.
- * The callback blocks until this return code is sent.
- *
- * The described callback mechanism is only used if ff_effects_max
- * is set.
- *
- * To implement upload_effect():
- *   1. Wait for an event with type == EV_UINPUT and code == UI_FF_UPLOAD.
- *      A request ID will be given in 'value'.
- *   2. Allocate a uinput_ff_upload struct, fill in request_id with
- *      the 'value' from the EV_UINPUT event.
- *   3. Issue a UI_BEGIN_FF_UPLOAD ioctl, giving it the
- *      uinput_ff_upload struct. It will be filled in with the
- *      ff_effects passed to upload_effect().
- *   4. Perform the effect upload, and place a return code back into
-        the uinput_ff_upload struct.
- *   5. Issue a UI_END_FF_UPLOAD ioctl, also giving it the
- *      uinput_ff_upload_effect struct. This will complete execution
- *      of our upload_effect() handler.
- *
- * To implement erase_effect():
- *   1. Wait for an event with type == EV_UINPUT and code == UI_FF_ERASE.
- *      A request ID will be given in 'value'.
- *   2. Allocate a uinput_ff_erase struct, fill in request_id with
- *      the 'value' from the EV_UINPUT event.
- *   3. Issue a UI_BEGIN_FF_ERASE ioctl, giving it the
- *      uinput_ff_erase struct. It will be filled in with the
- *      effect ID passed to erase_effect().
- *   4. Perform the effect erasure, and place a return code back
- *      into the uinput_ff_erase struct.
- *   5. Issue a UI_END_FF_ERASE ioctl, also giving it the
- *      uinput_ff_erase_effect struct. This will complete execution
- *      of our erase_effect() handler.
- */
-
-/*
- * This is the new event type, used only by uinput.
- * 'code' is UI_FF_UPLOAD or UI_FF_ERASE, and 'value'
- * is the unique request ID. This number was picked
- * arbitrarily, above EV_MAX (since the input system
- * never sees it) but in the range of a 16-bit int.
- */
-#define EV_UINPUT		0x0101
-#define UI_FF_UPLOAD		1
-#define UI_FF_ERASE		2
-
-#define UINPUT_MAX_NAME_SIZE	80
-struct uinput_user_dev {
-	char name[UINPUT_MAX_NAME_SIZE];
-	struct input_id id;
-	__u32 ff_effects_max;
-	__s32 absmax[ABS_CNT];
-	__s32 absmin[ABS_CNT];
-	__s32 absfuzz[ABS_CNT];
-	__s32 absflat[ABS_CNT];
-};
-#endif /* __UINPUT_H_ */
diff --git a/openflow/usr/include/linux/uio.h b/openflow/usr/include/linux/uio.h
deleted file mode 100644
index d0978de..0000000
--- a/openflow/usr/include/linux/uio.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *	Berkeley style UIO structures	-	Alan Cox 1994.
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef __LINUX_UIO_H
-#define __LINUX_UIO_H
-
-
-#include <linux/types.h>
-
-
-struct iovec
-{
-	void *iov_base;	/* BSD uses caddr_t (1003.1g requires void *) */
-	__kernel_size_t iov_len; /* Must be size_t (1003.1g) */
-};
-
-/*
- *	UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1)
- */
- 
-#define UIO_FASTIOV	8
-#define UIO_MAXIOV	1024
-
-
-#endif /* __LINUX_UIO_H */
diff --git a/openflow/usr/include/linux/ultrasound.h b/openflow/usr/include/linux/ultrasound.h
deleted file mode 100644
index 71339dc..0000000
--- a/openflow/usr/include/linux/ultrasound.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef _ULTRASOUND_H_
-#define _ULTRASOUND_H_
-/*
- *	ultrasound.h - Macros for programming the Gravis Ultrasound
- *			These macros are extremely device dependent
- *			and not portable.
- */
-/*
- * Copyright (C) by Hannu Savolainen 1993-1997
- *
- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
- * Version 2 (June 1991). See the "COPYING" file distributed with this software
- * for more info.
- */
-
-
-/*
- *	Private events for Gravis Ultrasound (GUS)
- *
- *	Format:
- *		byte 0 		- SEQ_PRIVATE (0xfe)
- *		byte 1 		- Synthesizer device number (0-N)
- *		byte 2 		- Command (see below)
- *		byte 3 		- Voice number (0-31)
- *		bytes 4 and 5	- parameter P1 (unsigned short)
- *		bytes 6 and 7	- parameter P2 (unsigned short)
- *
- *	Commands:
- *		Each command affects one voice defined in byte 3.
- *		Unused parameters (P1 and/or P2 *MUST* be initialized to zero).
- *		_GUS_NUMVOICES	- Sets max. number of concurrent voices (P1=14-31, default 16)
- *		_GUS_VOICESAMPLE- ************ OBSOLETE *************
- *		_GUS_VOICEON	- Starts voice (P1=voice mode)
- *		_GUS_VOICEOFF	- Stops voice (no parameters)
- *		_GUS_VOICEFADE	- Stops the voice smoothly.
- *		_GUS_VOICEMODE	- Alters the voice mode, don't start or stop voice (P1=voice mode)
- *		_GUS_VOICEBALA	- Sets voice balance (P1, 0=left, 7=middle and 15=right, default 7)
- *		_GUS_VOICEFREQ	- Sets voice (sample) playback frequency (P1=Hz)
- *		_GUS_VOICEVOL	- Sets voice volume (P1=volume, 0xfff=max, 0xeff=half, 0x000=off)
- *		_GUS_VOICEVOL2	- Sets voice volume (P1=volume, 0xfff=max, 0xeff=half, 0x000=off)
- *				  (Like GUS_VOICEVOL but doesn't change the hw
- *				  volume. It just updates volume in the voice table).
- *
- *		_GUS_RAMPRANGE	- Sets limits for volume ramping (P1=low volume, P2=high volume)
- *		_GUS_RAMPRATE	- Sets the speed for volume ramping (P1=scale, P2=rate)
- *		_GUS_RAMPMODE	- Sets the volume ramping mode (P1=ramping mode)
- *		_GUS_RAMPON	- Starts volume ramping (no parameters)
- *		_GUS_RAMPOFF	- Stops volume ramping (no parameters)
- *		_GUS_VOLUME_SCALE - Changes the volume calculation constants
- *				  for all voices.
- */
-
-#define _GUS_NUMVOICES		0x00
-#define _GUS_VOICESAMPLE	0x01	/* OBSOLETE */
-#define _GUS_VOICEON		0x02
-#define _GUS_VOICEOFF		0x03
-#define _GUS_VOICEMODE		0x04
-#define _GUS_VOICEBALA		0x05
-#define _GUS_VOICEFREQ		0x06
-#define _GUS_VOICEVOL		0x07
-#define _GUS_RAMPRANGE		0x08
-#define _GUS_RAMPRATE		0x09
-#define _GUS_RAMPMODE		0x0a
-#define _GUS_RAMPON		0x0b
-#define _GUS_RAMPOFF		0x0c
-#define _GUS_VOICEFADE		0x0d
-#define _GUS_VOLUME_SCALE	0x0e
-#define _GUS_VOICEVOL2		0x0f
-#define _GUS_VOICE_POS		0x10
-
-/*
- *	GUS API macros
- */
-
-#define _GUS_CMD(chn, voice, cmd, p1, p2) \
-					{_SEQ_NEEDBUF(8); _seqbuf[_seqbufptr] = SEQ_PRIVATE;\
-					_seqbuf[_seqbufptr+1] = (chn); _seqbuf[_seqbufptr+2] = cmd;\
-					_seqbuf[_seqbufptr+3] = voice;\
-					*(unsigned short*)&_seqbuf[_seqbufptr+4] = p1;\
-					*(unsigned short*)&_seqbuf[_seqbufptr+6] = p2;\
-					_SEQ_ADVBUF(8);}
-
-#define GUS_NUMVOICES(chn, p1)			_GUS_CMD(chn, 0, _GUS_NUMVOICES, (p1), 0)
-#define GUS_VOICESAMPLE(chn, voice, p1)		_GUS_CMD(chn, voice, _GUS_VOICESAMPLE, (p1), 0)	/* OBSOLETE */
-#define GUS_VOICEON(chn, voice, p1)		_GUS_CMD(chn, voice, _GUS_VOICEON, (p1), 0)
-#define GUS_VOICEOFF(chn, voice)		_GUS_CMD(chn, voice, _GUS_VOICEOFF, 0, 0)
-#define GUS_VOICEFADE(chn, voice)		_GUS_CMD(chn, voice, _GUS_VOICEFADE, 0, 0)
-#define GUS_VOICEMODE(chn, voice, p1)		_GUS_CMD(chn, voice, _GUS_VOICEMODE, (p1), 0)
-#define GUS_VOICEBALA(chn, voice, p1)		_GUS_CMD(chn, voice, _GUS_VOICEBALA, (p1), 0)
-#define GUS_VOICEFREQ(chn, voice, p)		_GUS_CMD(chn, voice, _GUS_VOICEFREQ, \
-							(p) & 0xffff, ((p) >> 16) & 0xffff)
-#define GUS_VOICEVOL(chn, voice, p1)		_GUS_CMD(chn, voice, _GUS_VOICEVOL, (p1), 0)
-#define GUS_VOICEVOL2(chn, voice, p1)		_GUS_CMD(chn, voice, _GUS_VOICEVOL2, (p1), 0)
-#define GUS_RAMPRANGE(chn, voice, low, high)	_GUS_CMD(chn, voice, _GUS_RAMPRANGE, (low), (high))
-#define GUS_RAMPRATE(chn, voice, p1, p2)	_GUS_CMD(chn, voice, _GUS_RAMPRATE, (p1), (p2))
-#define GUS_RAMPMODE(chn, voice, p1)		_GUS_CMD(chn, voice, _GUS_RAMPMODE, (p1), 0)
-#define GUS_RAMPON(chn, voice, p1)		_GUS_CMD(chn, voice, _GUS_RAMPON, (p1), 0)
-#define GUS_RAMPOFF(chn, voice)			_GUS_CMD(chn, voice, _GUS_RAMPOFF, 0, 0)
-#define GUS_VOLUME_SCALE(chn, voice, p1, p2)	_GUS_CMD(chn, voice, _GUS_VOLUME_SCALE, (p1), (p2))
-#define GUS_VOICE_POS(chn, voice, p)		_GUS_CMD(chn, voice, _GUS_VOICE_POS, \
-							(p) & 0xffff, ((p) >> 16) & 0xffff)
-
-#endif
diff --git a/openflow/usr/include/linux/un.h b/openflow/usr/include/linux/un.h
deleted file mode 100644
index 3ed3e46..0000000
--- a/openflow/usr/include/linux/un.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _LINUX_UN_H
-#define _LINUX_UN_H
-
-#include <linux/socket.h>
-
-#define UNIX_PATH_MAX	108
-
-struct sockaddr_un {
-	__kernel_sa_family_t sun_family; /* AF_UNIX */
-	char sun_path[UNIX_PATH_MAX];	/* pathname */
-};
-
-#endif /* _LINUX_UN_H */
diff --git a/openflow/usr/include/linux/unistd.h b/openflow/usr/include/linux/unistd.h
deleted file mode 100644
index aa8d5b5..0000000
--- a/openflow/usr/include/linux/unistd.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LINUX_UNISTD_H_
-#define _LINUX_UNISTD_H_
-
-/*
- * Include machine specific syscall numbers
- */
-#include <asm/unistd.h>
-
-#endif /* _LINUX_UNISTD_H_ */
diff --git a/openflow/usr/include/linux/unix_diag.h b/openflow/usr/include/linux/unix_diag.h
deleted file mode 100644
index 1eb0b8d..0000000
--- a/openflow/usr/include/linux/unix_diag.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef __UNIX_DIAG_H__
-#define __UNIX_DIAG_H__
-
-#include <linux/types.h>
-
-struct unix_diag_req {
-	__u8	sdiag_family;
-	__u8	sdiag_protocol;
-	__u16	pad;
-	__u32	udiag_states;
-	__u32	udiag_ino;
-	__u32	udiag_show;
-	__u32	udiag_cookie[2];
-};
-
-#define UDIAG_SHOW_NAME		0x00000001	/* show name (not path) */
-#define UDIAG_SHOW_VFS		0x00000002	/* show VFS inode info */
-#define UDIAG_SHOW_PEER		0x00000004	/* show peer socket info */
-#define UDIAG_SHOW_ICONS	0x00000008	/* show pending connections */
-#define UDIAG_SHOW_RQLEN	0x00000010	/* show skb receive queue len */
-#define UDIAG_SHOW_MEMINFO	0x00000020	/* show memory info of a socket */
-
-struct unix_diag_msg {
-	__u8	udiag_family;
-	__u8	udiag_type;
-	__u8	udiag_state;
-	__u8	pad;
-
-	__u32	udiag_ino;
-	__u32	udiag_cookie[2];
-};
-
-enum {
-	/* UNIX_DIAG_NONE, standard nl API requires this attribute!  */
-	UNIX_DIAG_NAME,
-	UNIX_DIAG_VFS,
-	UNIX_DIAG_PEER,
-	UNIX_DIAG_ICONS,
-	UNIX_DIAG_RQLEN,
-	UNIX_DIAG_MEMINFO,
-	UNIX_DIAG_SHUTDOWN,
-
-	__UNIX_DIAG_MAX,
-};
-
-#define UNIX_DIAG_MAX (__UNIX_DIAG_MAX - 1)
-
-struct unix_diag_vfs {
-	__u32	udiag_vfs_ino;
-	__u32	udiag_vfs_dev;
-};
-
-struct unix_diag_rqlen {
-	__u32	udiag_rqueue;
-	__u32	udiag_wqueue;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/usb/audio.h b/openflow/usr/include/linux/usb/audio.h
deleted file mode 100644
index 210f2f5..0000000
--- a/openflow/usr/include/linux/usb/audio.h
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * <linux/usb/audio.h> -- USB Audio definitions.
- *
- * Copyright (C) 2006 Thumtronics Pty Ltd.
- * Developed for Thumtronics by Grey Innovation
- * Ben Williamson <ben.williamson@greyinnovation.com>
- *
- * This software is distributed under the terms of the GNU General Public
- * License ("GPL") version 2, as published by the Free Software Foundation.
- *
- * This file holds USB constants and structures defined
- * by the USB Device Class Definition for Audio Devices.
- * Comments below reference relevant sections of that document:
- *
- * http://www.usb.org/developers/devclass_docs/audio10.pdf
- *
- * Types and defines in this file are either specific to version 1.0 of
- * this standard or common for newer versions.
- */
-
-#ifndef __LINUX_USB_AUDIO_H
-#define __LINUX_USB_AUDIO_H
-
-#include <linux/types.h>
-
-/* bInterfaceProtocol values to denote the version of the standard used */
-#define UAC_VERSION_1			0x00
-#define UAC_VERSION_2			0x20
-
-/* A.2 Audio Interface Subclass Codes */
-#define USB_SUBCLASS_AUDIOCONTROL	0x01
-#define USB_SUBCLASS_AUDIOSTREAMING	0x02
-#define USB_SUBCLASS_MIDISTREAMING	0x03
-
-/* A.5 Audio Class-Specific AC Interface Descriptor Subtypes */
-#define UAC_HEADER			0x01
-#define UAC_INPUT_TERMINAL		0x02
-#define UAC_OUTPUT_TERMINAL		0x03
-#define UAC_MIXER_UNIT			0x04
-#define UAC_SELECTOR_UNIT		0x05
-#define UAC_FEATURE_UNIT		0x06
-#define UAC1_PROCESSING_UNIT		0x07
-#define UAC1_EXTENSION_UNIT		0x08
-
-/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */
-#define UAC_AS_GENERAL			0x01
-#define UAC_FORMAT_TYPE			0x02
-#define UAC_FORMAT_SPECIFIC		0x03
-
-/* A.7 Processing Unit Process Types */
-#define UAC_PROCESS_UNDEFINED		0x00
-#define UAC_PROCESS_UP_DOWNMIX		0x01
-#define UAC_PROCESS_DOLBY_PROLOGIC	0x02
-#define UAC_PROCESS_STEREO_EXTENDER	0x03
-#define UAC_PROCESS_REVERB		0x04
-#define UAC_PROCESS_CHORUS		0x05
-#define UAC_PROCESS_DYN_RANGE_COMP	0x06
-
-/* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
-#define UAC_EP_GENERAL			0x01
-
-/* A.9 Audio Class-Specific Request Codes */
-#define UAC_SET_			0x00
-#define UAC_GET_			0x80
-
-#define UAC__CUR			0x1
-#define UAC__MIN			0x2
-#define UAC__MAX			0x3
-#define UAC__RES			0x4
-#define UAC__MEM			0x5
-
-#define UAC_SET_CUR			(UAC_SET_ | UAC__CUR)
-#define UAC_GET_CUR			(UAC_GET_ | UAC__CUR)
-#define UAC_SET_MIN			(UAC_SET_ | UAC__MIN)
-#define UAC_GET_MIN			(UAC_GET_ | UAC__MIN)
-#define UAC_SET_MAX			(UAC_SET_ | UAC__MAX)
-#define UAC_GET_MAX			(UAC_GET_ | UAC__MAX)
-#define UAC_SET_RES			(UAC_SET_ | UAC__RES)
-#define UAC_GET_RES			(UAC_GET_ | UAC__RES)
-#define UAC_SET_MEM			(UAC_SET_ | UAC__MEM)
-#define UAC_GET_MEM			(UAC_GET_ | UAC__MEM)
-
-#define UAC_GET_STAT			0xff
-
-/* A.10 Control Selector Codes */
-
-/* A.10.1 Terminal Control Selectors */
-#define UAC_TERM_COPY_PROTECT		0x01
-
-/* A.10.2 Feature Unit Control Selectors */
-#define UAC_FU_MUTE			0x01
-#define UAC_FU_VOLUME			0x02
-#define UAC_FU_BASS			0x03
-#define UAC_FU_MID			0x04
-#define UAC_FU_TREBLE			0x05
-#define UAC_FU_GRAPHIC_EQUALIZER	0x06
-#define UAC_FU_AUTOMATIC_GAIN		0x07
-#define UAC_FU_DELAY			0x08
-#define UAC_FU_BASS_BOOST		0x09
-#define UAC_FU_LOUDNESS			0x0a
-
-#define UAC_CONTROL_BIT(CS)	(1 << ((CS) - 1))
-
-/* A.10.3.1 Up/Down-mix Processing Unit Controls Selectors */
-#define UAC_UD_ENABLE			0x01
-#define UAC_UD_MODE_SELECT		0x02
-
-/* A.10.3.2 Dolby Prologic (tm) Processing Unit Controls Selectors */
-#define UAC_DP_ENABLE			0x01
-#define UAC_DP_MODE_SELECT		0x02
-
-/* A.10.3.3 3D Stereo Extender Processing Unit Control Selectors */
-#define UAC_3D_ENABLE			0x01
-#define UAC_3D_SPACE			0x02
-
-/* A.10.3.4 Reverberation Processing Unit Control Selectors */
-#define UAC_REVERB_ENABLE		0x01
-#define UAC_REVERB_LEVEL		0x02
-#define UAC_REVERB_TIME			0x03
-#define UAC_REVERB_FEEDBACK		0x04
-
-/* A.10.3.5 Chorus Processing Unit Control Selectors */
-#define UAC_CHORUS_ENABLE		0x01
-#define UAC_CHORUS_LEVEL		0x02
-#define UAC_CHORUS_RATE			0x03
-#define UAC_CHORUS_DEPTH		0x04
-
-/* A.10.3.6 Dynamic Range Compressor Unit Control Selectors */
-#define UAC_DCR_ENABLE			0x01
-#define UAC_DCR_RATE			0x02
-#define UAC_DCR_MAXAMPL			0x03
-#define UAC_DCR_THRESHOLD		0x04
-#define UAC_DCR_ATTACK_TIME		0x05
-#define UAC_DCR_RELEASE_TIME		0x06
-
-/* A.10.4 Extension Unit Control Selectors */
-#define UAC_XU_ENABLE			0x01
-
-/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
-#define UAC_MS_HEADER			0x01
-#define UAC_MIDI_IN_JACK		0x02
-#define UAC_MIDI_OUT_JACK		0x03
-
-/* MIDI - A.1 MS Class-Specific Endpoint Descriptor Subtypes */
-#define UAC_MS_GENERAL			0x01
-
-/* Terminals - 2.1 USB Terminal Types */
-#define UAC_TERMINAL_UNDEFINED		0x100
-#define UAC_TERMINAL_STREAMING		0x101
-#define UAC_TERMINAL_VENDOR_SPEC	0x1FF
-
-/* Terminal Control Selectors */
-/* 4.3.2  Class-Specific AC Interface Descriptor */
-struct uac1_ac_header_descriptor {
-	__u8  bLength;			/* 8 + n */
-	__u8  bDescriptorType;		/* USB_DT_CS_INTERFACE */
-	__u8  bDescriptorSubtype;	/* UAC_MS_HEADER */
-	__le16 bcdADC;			/* 0x0100 */
-	__le16 wTotalLength;		/* includes Unit and Terminal desc. */
-	__u8  bInCollection;		/* n */
-	__u8  baInterfaceNr[];		/* [n] */
-} __attribute__ ((packed));
-
-#define UAC_DT_AC_HEADER_SIZE(n)	(8 + (n))
-
-/* As above, but more useful for defining your own descriptors: */
-#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n)			\
-struct uac1_ac_header_descriptor_##n {			\
-	__u8  bLength;						\
-	__u8  bDescriptorType;					\
-	__u8  bDescriptorSubtype;				\
-	__le16 bcdADC;						\
-	__le16 wTotalLength;					\
-	__u8  bInCollection;					\
-	__u8  baInterfaceNr[n];					\
-} __attribute__ ((packed))
-
-/* 4.3.2.1 Input Terminal Descriptor */
-struct uac_input_terminal_descriptor {
-	__u8  bLength;			/* in bytes: 12 */
-	__u8  bDescriptorType;		/* CS_INTERFACE descriptor type */
-	__u8  bDescriptorSubtype;	/* INPUT_TERMINAL descriptor subtype */
-	__u8  bTerminalID;		/* Constant uniquely terminal ID */
-	__le16 wTerminalType;		/* USB Audio Terminal Types */
-	__u8  bAssocTerminal;		/* ID of the Output Terminal associated */
-	__u8  bNrChannels;		/* Number of logical output channels */
-	__le16 wChannelConfig;
-	__u8  iChannelNames;
-	__u8  iTerminal;
-} __attribute__ ((packed));
-
-#define UAC_DT_INPUT_TERMINAL_SIZE			12
-
-/* Terminals - 2.2 Input Terminal Types */
-#define UAC_INPUT_TERMINAL_UNDEFINED			0x200
-#define UAC_INPUT_TERMINAL_MICROPHONE			0x201
-#define UAC_INPUT_TERMINAL_DESKTOP_MICROPHONE		0x202
-#define UAC_INPUT_TERMINAL_PERSONAL_MICROPHONE		0x203
-#define UAC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE		0x204
-#define UAC_INPUT_TERMINAL_MICROPHONE_ARRAY		0x205
-#define UAC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY	0x206
-
-/* Terminals - control selectors */
-
-#define UAC_TERMINAL_CS_COPY_PROTECT_CONTROL		0x01
-
-/* 4.3.2.2 Output Terminal Descriptor */
-struct uac1_output_terminal_descriptor {
-	__u8  bLength;			/* in bytes: 9 */
-	__u8  bDescriptorType;		/* CS_INTERFACE descriptor type */
-	__u8  bDescriptorSubtype;	/* OUTPUT_TERMINAL descriptor subtype */
-	__u8  bTerminalID;		/* Constant uniquely terminal ID */
-	__le16 wTerminalType;		/* USB Audio Terminal Types */
-	__u8  bAssocTerminal;		/* ID of the Input Terminal associated */
-	__u8  bSourceID;		/* ID of the connected Unit or Terminal*/
-	__u8  iTerminal;
-} __attribute__ ((packed));
-
-#define UAC_DT_OUTPUT_TERMINAL_SIZE			9
-
-/* Terminals - 2.3 Output Terminal Types */
-#define UAC_OUTPUT_TERMINAL_UNDEFINED			0x300
-#define UAC_OUTPUT_TERMINAL_SPEAKER			0x301
-#define UAC_OUTPUT_TERMINAL_HEADPHONES			0x302
-#define UAC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO	0x303
-#define UAC_OUTPUT_TERMINAL_DESKTOP_SPEAKER		0x304
-#define UAC_OUTPUT_TERMINAL_ROOM_SPEAKER		0x305
-#define UAC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER	0x306
-#define UAC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER	0x307
-
-/* Set bControlSize = 2 as default setting */
-#define UAC_DT_FEATURE_UNIT_SIZE(ch)		(7 + ((ch) + 1) * 2)
-
-/* As above, but more useful for defining your own descriptors: */
-#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch)			\
-struct uac_feature_unit_descriptor_##ch {			\
-	__u8  bLength;						\
-	__u8  bDescriptorType;					\
-	__u8  bDescriptorSubtype;				\
-	__u8  bUnitID;						\
-	__u8  bSourceID;					\
-	__u8  bControlSize;					\
-	__le16 bmaControls[ch + 1];				\
-	__u8  iFeature;						\
-} __attribute__ ((packed))
-
-/* 4.3.2.3 Mixer Unit Descriptor */
-struct uac_mixer_unit_descriptor {
-	__u8 bLength;
-	__u8 bDescriptorType;
-	__u8 bDescriptorSubtype;
-	__u8 bUnitID;
-	__u8 bNrInPins;
-	__u8 baSourceID[];
-} __attribute__ ((packed));
-
-static __inline__ __u8 uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc)
-{
-	return desc->baSourceID[desc->bNrInPins];
-}
-
-static __inline__ __u32 uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descriptor *desc,
-						  int protocol)
-{
-	if (protocol == UAC_VERSION_1)
-		return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
-			desc->baSourceID[desc->bNrInPins + 1];
-	else
-		return  (desc->baSourceID[desc->bNrInPins + 4] << 24) |
-			(desc->baSourceID[desc->bNrInPins + 3] << 16) |
-			(desc->baSourceID[desc->bNrInPins + 2] << 8)  |
-			(desc->baSourceID[desc->bNrInPins + 1]);
-}
-
-static __inline__ __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor *desc,
-						int protocol)
-{
-	return (protocol == UAC_VERSION_1) ?
-		desc->baSourceID[desc->bNrInPins + 3] :
-		desc->baSourceID[desc->bNrInPins + 5];
-}
-
-static __inline__ __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc,
-					      int protocol)
-{
-	return (protocol == UAC_VERSION_1) ?
-		&desc->baSourceID[desc->bNrInPins + 4] :
-		&desc->baSourceID[desc->bNrInPins + 6];
-}
-
-static __inline__ __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)
-{
-	__u8 *raw = (__u8 *) desc;
-	return raw[desc->bLength - 1];
-}
-
-/* 4.3.2.4 Selector Unit Descriptor */
-struct uac_selector_unit_descriptor {
-	__u8 bLength;
-	__u8 bDescriptorType;
-	__u8 bDescriptorSubtype;
-	__u8 bUintID;
-	__u8 bNrInPins;
-	__u8 baSourceID[];
-} __attribute__ ((packed));
-
-static __inline__ __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
-{
-	__u8 *raw = (__u8 *) desc;
-	return raw[desc->bLength - 1];
-}
-
-/* 4.3.2.5 Feature Unit Descriptor */
-struct uac_feature_unit_descriptor {
-	__u8 bLength;
-	__u8 bDescriptorType;
-	__u8 bDescriptorSubtype;
-	__u8 bUnitID;
-	__u8 bSourceID;
-	__u8 bControlSize;
-	__u8 bmaControls[0]; /* variable length */
-} __attribute__((packed));
-
-static __inline__ __u8 uac_feature_unit_iFeature(struct uac_feature_unit_descriptor *desc)
-{
-	__u8 *raw = (__u8 *) desc;
-	return raw[desc->bLength - 1];
-}
-
-/* 4.3.2.6 Processing Unit Descriptors */
-struct uac_processing_unit_descriptor {
-	__u8 bLength;
-	__u8 bDescriptorType;
-	__u8 bDescriptorSubtype;
-	__u8 bUnitID;
-	__u16 wProcessType;
-	__u8 bNrInPins;
-	__u8 baSourceID[];
-} __attribute__ ((packed));
-
-static __inline__ __u8 uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc)
-{
-	return desc->baSourceID[desc->bNrInPins];
-}
-
-static __inline__ __u32 uac_processing_unit_wChannelConfig(struct uac_processing_unit_descriptor *desc,
-						       int protocol)
-{
-	if (protocol == UAC_VERSION_1)
-		return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
-			desc->baSourceID[desc->bNrInPins + 1];
-	else
-		return  (desc->baSourceID[desc->bNrInPins + 4] << 24) |
-			(desc->baSourceID[desc->bNrInPins + 3] << 16) |
-			(desc->baSourceID[desc->bNrInPins + 2] << 8)  |
-			(desc->baSourceID[desc->bNrInPins + 1]);
-}
-
-static __inline__ __u8 uac_processing_unit_iChannelNames(struct uac_processing_unit_descriptor *desc,
-						     int protocol)
-{
-	return (protocol == UAC_VERSION_1) ?
-		desc->baSourceID[desc->bNrInPins + 3] :
-		desc->baSourceID[desc->bNrInPins + 5];
-}
-
-static __inline__ __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
-						    int protocol)
-{
-	return (protocol == UAC_VERSION_1) ?
-		desc->baSourceID[desc->bNrInPins + 4] :
-		desc->baSourceID[desc->bNrInPins + 6];
-}
-
-static __inline__ __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc,
-						   int protocol)
-{
-	return (protocol == UAC_VERSION_1) ?
-		&desc->baSourceID[desc->bNrInPins + 5] :
-		&desc->baSourceID[desc->bNrInPins + 7];
-}
-
-static __inline__ __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc,
-						   int protocol)
-{
-	__u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
-	return *(uac_processing_unit_bmControls(desc, protocol)
-			+ control_size);
-}
-
-static __inline__ __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc,
-						 int protocol)
-{
-	__u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
-	return uac_processing_unit_bmControls(desc, protocol)
-			+ control_size + 1;
-}
-
-/* 4.5.2 Class-Specific AS Interface Descriptor */
-struct uac1_as_header_descriptor {
-	__u8  bLength;			/* in bytes: 7 */
-	__u8  bDescriptorType;		/* USB_DT_CS_INTERFACE */
-	__u8  bDescriptorSubtype;	/* AS_GENERAL */
-	__u8  bTerminalLink;		/* Terminal ID of connected Terminal */
-	__u8  bDelay;			/* Delay introduced by the data path */
-	__le16 wFormatTag;		/* The Audio Data Format */
-} __attribute__ ((packed));
-
-#define UAC_DT_AS_HEADER_SIZE		7
-
-/* Formats - A.1.1 Audio Data Format Type I Codes */
-#define UAC_FORMAT_TYPE_I_UNDEFINED	0x0
-#define UAC_FORMAT_TYPE_I_PCM		0x1
-#define UAC_FORMAT_TYPE_I_PCM8		0x2
-#define UAC_FORMAT_TYPE_I_IEEE_FLOAT	0x3
-#define UAC_FORMAT_TYPE_I_ALAW		0x4
-#define UAC_FORMAT_TYPE_I_MULAW		0x5
-
-struct uac_format_type_i_continuous_descriptor {
-	__u8  bLength;			/* in bytes: 8 + (ns * 3) */
-	__u8  bDescriptorType;		/* USB_DT_CS_INTERFACE */
-	__u8  bDescriptorSubtype;	/* FORMAT_TYPE */
-	__u8  bFormatType;		/* FORMAT_TYPE_1 */
-	__u8  bNrChannels;		/* physical channels in the stream */
-	__u8  bSubframeSize;		/* */
-	__u8  bBitResolution;
-	__u8  bSamFreqType;
-	__u8  tLowerSamFreq[3];
-	__u8  tUpperSamFreq[3];
-} __attribute__ ((packed));
-
-#define UAC_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE	14
-
-struct uac_format_type_i_discrete_descriptor {
-	__u8  bLength;			/* in bytes: 8 + (ns * 3) */
-	__u8  bDescriptorType;		/* USB_DT_CS_INTERFACE */
-	__u8  bDescriptorSubtype;	/* FORMAT_TYPE */
-	__u8  bFormatType;		/* FORMAT_TYPE_1 */
-	__u8  bNrChannels;		/* physical channels in the stream */
-	__u8  bSubframeSize;		/* */
-	__u8  bBitResolution;
-	__u8  bSamFreqType;
-	__u8  tSamFreq[][3];
-} __attribute__ ((packed));
-
-#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n)		\
-struct uac_format_type_i_discrete_descriptor_##n {		\
-	__u8  bLength;						\
-	__u8  bDescriptorType;					\
-	__u8  bDescriptorSubtype;				\
-	__u8  bFormatType;					\
-	__u8  bNrChannels;					\
-	__u8  bSubframeSize;					\
-	__u8  bBitResolution;					\
-	__u8  bSamFreqType;					\
-	__u8  tSamFreq[n][3];					\
-} __attribute__ ((packed))
-
-#define UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n)	(8 + (n * 3))
-
-struct uac_format_type_i_ext_descriptor {
-	__u8 bLength;
-	__u8 bDescriptorType;
-	__u8 bDescriptorSubtype;
-	__u8 bFormatType;
-	__u8 bSubslotSize;
-	__u8 bBitResolution;
-	__u8 bHeaderLength;
-	__u8 bControlSize;
-	__u8 bSideBandProtocol;
-} __attribute__((packed));
-
-/* Formats - Audio Data Format Type I Codes */
-
-#define UAC_FORMAT_TYPE_II_MPEG	0x1001
-#define UAC_FORMAT_TYPE_II_AC3	0x1002
-
-struct uac_format_type_ii_discrete_descriptor {
-	__u8 bLength;
-	__u8 bDescriptorType;
-	__u8 bDescriptorSubtype;
-	__u8 bFormatType;
-	__le16 wMaxBitRate;
-	__le16 wSamplesPerFrame;
-	__u8 bSamFreqType;
-	__u8 tSamFreq[][3];
-} __attribute__((packed));
-
-struct uac_format_type_ii_ext_descriptor {
-	__u8 bLength;
-	__u8 bDescriptorType;
-	__u8 bDescriptorSubtype;
-	__u8 bFormatType;
-	__u16 wMaxBitRate;
-	__u16 wSamplesPerFrame;
-	__u8 bHeaderLength;
-	__u8 bSideBandProtocol;
-} __attribute__((packed));
-
-/* type III */
-#define UAC_FORMAT_TYPE_III_IEC1937_AC3	0x2001
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG1_LAYER1	0x2002
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_NOEXT	0x2003
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_EXT	0x2004
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_LAYER1_LS	0x2005
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_LAYER23_LS	0x2006
-
-/* Formats - A.2 Format Type Codes */
-#define UAC_FORMAT_TYPE_UNDEFINED	0x0
-#define UAC_FORMAT_TYPE_I		0x1
-#define UAC_FORMAT_TYPE_II		0x2
-#define UAC_FORMAT_TYPE_III		0x3
-#define UAC_EXT_FORMAT_TYPE_I		0x81
-#define UAC_EXT_FORMAT_TYPE_II		0x82
-#define UAC_EXT_FORMAT_TYPE_III		0x83
-
-struct uac_iso_endpoint_descriptor {
-	__u8  bLength;			/* in bytes: 7 */
-	__u8  bDescriptorType;		/* USB_DT_CS_ENDPOINT */
-	__u8  bDescriptorSubtype;	/* EP_GENERAL */
-	__u8  bmAttributes;
-	__u8  bLockDelayUnits;
-	__le16 wLockDelay;
-} __attribute__((packed));
-#define UAC_ISO_ENDPOINT_DESC_SIZE	7
-
-#define UAC_EP_CS_ATTR_SAMPLE_RATE	0x01
-#define UAC_EP_CS_ATTR_PITCH_CONTROL	0x02
-#define UAC_EP_CS_ATTR_FILL_MAX		0x80
-
-/* status word format (3.7.1.1) */
-
-#define UAC1_STATUS_TYPE_ORIG_MASK		0x0f
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_CONTROL_IF	0x0
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_IF	0x1
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_EP	0x2
-
-#define UAC1_STATUS_TYPE_IRQ_PENDING		(1 << 7)
-#define UAC1_STATUS_TYPE_MEM_CHANGED		(1 << 6)
-
-struct uac1_status_word {
-	__u8 bStatusType;
-	__u8 bOriginator;
-} __attribute__((packed));
-
-
-#endif /* __LINUX_USB_AUDIO_H */
diff --git a/openflow/usr/include/linux/usb/cdc-wdm.h b/openflow/usr/include/linux/usb/cdc-wdm.h
deleted file mode 100644
index a794493..0000000
--- a/openflow/usr/include/linux/usb/cdc-wdm.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * USB CDC Device Management userspace API definitions
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- */
-
-#ifndef __LINUX_USB_CDC_WDM_H
-#define __LINUX_USB_CDC_WDM_H
-
-#include <linux/types.h>
-
-/*
- * This IOCTL is used to retrieve the wMaxCommand for the device,
- * defining the message limit for both reading and writing.
- *
- * For CDC WDM functions this will be the wMaxCommand field of the
- * Device Management Functional Descriptor.
- */
-#define IOCTL_WDM_MAX_COMMAND _IOR('H', 0xA0, __u16)
-
-#endif /* __LINUX_USB_CDC_WDM_H */
diff --git a/openflow/usr/include/linux/usb/cdc.h b/openflow/usr/include/linux/usb/cdc.h
deleted file mode 100644
index e2bc417..0000000
--- a/openflow/usr/include/linux/usb/cdc.h
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * USB Communications Device Class (CDC) definitions
- *
- * CDC says how to talk to lots of different types of network adapters,
- * notably ethernet adapters and various modems.  It's used mostly with
- * firmware based USB peripherals.
- */
-
-#ifndef __UAPI_LINUX_USB_CDC_H
-#define __UAPI_LINUX_USB_CDC_H
-
-#include <linux/types.h>
-
-#define USB_CDC_SUBCLASS_ACM			0x02
-#define USB_CDC_SUBCLASS_ETHERNET		0x06
-#define USB_CDC_SUBCLASS_WHCM			0x08
-#define USB_CDC_SUBCLASS_DMM			0x09
-#define USB_CDC_SUBCLASS_MDLM			0x0a
-#define USB_CDC_SUBCLASS_OBEX			0x0b
-#define USB_CDC_SUBCLASS_EEM			0x0c
-#define USB_CDC_SUBCLASS_NCM			0x0d
-#define USB_CDC_SUBCLASS_MBIM			0x0e
-
-#define USB_CDC_PROTO_NONE			0
-
-#define USB_CDC_ACM_PROTO_AT_V25TER		1
-#define USB_CDC_ACM_PROTO_AT_PCCA101		2
-#define USB_CDC_ACM_PROTO_AT_PCCA101_WAKE	3
-#define USB_CDC_ACM_PROTO_AT_GSM		4
-#define USB_CDC_ACM_PROTO_AT_3G			5
-#define USB_CDC_ACM_PROTO_AT_CDMA		6
-#define USB_CDC_ACM_PROTO_VENDOR		0xff
-
-#define USB_CDC_PROTO_EEM			7
-
-#define USB_CDC_NCM_PROTO_NTB			1
-#define USB_CDC_MBIM_PROTO_NTB			2
-
-/*-------------------------------------------------------------------------*/
-
-/*
- * Class-Specific descriptors ... there are a couple dozen of them
- */
-
-#define USB_CDC_HEADER_TYPE		0x00	/* header_desc */
-#define USB_CDC_CALL_MANAGEMENT_TYPE	0x01	/* call_mgmt_descriptor */
-#define USB_CDC_ACM_TYPE		0x02	/* acm_descriptor */
-#define USB_CDC_UNION_TYPE		0x06	/* union_desc */
-#define USB_CDC_COUNTRY_TYPE		0x07
-#define USB_CDC_NETWORK_TERMINAL_TYPE	0x0a	/* network_terminal_desc */
-#define USB_CDC_ETHERNET_TYPE		0x0f	/* ether_desc */
-#define USB_CDC_WHCM_TYPE		0x11
-#define USB_CDC_MDLM_TYPE		0x12	/* mdlm_desc */
-#define USB_CDC_MDLM_DETAIL_TYPE	0x13	/* mdlm_detail_desc */
-#define USB_CDC_DMM_TYPE		0x14
-#define USB_CDC_OBEX_TYPE		0x15
-#define USB_CDC_NCM_TYPE		0x1a
-#define USB_CDC_MBIM_TYPE		0x1b
-#define USB_CDC_MBIM_EXTENDED_TYPE	0x1c
-
-/* "Header Functional Descriptor" from CDC spec  5.2.3.1 */
-struct usb_cdc_header_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__le16	bcdCDC;
-} __attribute__ ((packed));
-
-/* "Call Management Descriptor" from CDC spec  5.2.3.2 */
-struct usb_cdc_call_mgmt_descriptor {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__u8	bmCapabilities;
-#define USB_CDC_CALL_MGMT_CAP_CALL_MGMT		0x01
-#define USB_CDC_CALL_MGMT_CAP_DATA_INTF		0x02
-
-	__u8	bDataInterface;
-} __attribute__ ((packed));
-
-/* "Abstract Control Management Descriptor" from CDC spec  5.2.3.3 */
-struct usb_cdc_acm_descriptor {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__u8	bmCapabilities;
-} __attribute__ ((packed));
-
-/* capabilities from 5.2.3.3 */
-
-#define USB_CDC_COMM_FEATURE	0x01
-#define USB_CDC_CAP_LINE	0x02
-#define USB_CDC_CAP_BRK		0x04
-#define USB_CDC_CAP_NOTIFY	0x08
-
-/* "Union Functional Descriptor" from CDC spec 5.2.3.8 */
-struct usb_cdc_union_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__u8	bMasterInterface0;
-	__u8	bSlaveInterface0;
-	/* ... and there could be other slave interfaces */
-} __attribute__ ((packed));
-
-/* "Country Selection Functional Descriptor" from CDC spec 5.2.3.9 */
-struct usb_cdc_country_functional_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__u8	iCountryCodeRelDate;
-	__le16	wCountyCode0;
-	/* ... and there can be a lot of country codes */
-} __attribute__ ((packed));
-
-/* "Network Channel Terminal Functional Descriptor" from CDC spec 5.2.3.11 */
-struct usb_cdc_network_terminal_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__u8	bEntityId;
-	__u8	iName;
-	__u8	bChannelIndex;
-	__u8	bPhysicalInterface;
-} __attribute__ ((packed));
-
-/* "Ethernet Networking Functional Descriptor" from CDC spec 5.2.3.16 */
-struct usb_cdc_ether_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__u8	iMACAddress;
-	__le32	bmEthernetStatistics;
-	__le16	wMaxSegmentSize;
-	__le16	wNumberMCFilters;
-	__u8	bNumberPowerFilters;
-} __attribute__ ((packed));
-
-/* "Telephone Control Model Functional Descriptor" from CDC WMC spec 6.3..3 */
-struct usb_cdc_dmm_desc {
-	__u8	bFunctionLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubtype;
-	__u16	bcdVersion;
-	__le16	wMaxCommand;
-} __attribute__ ((packed));
-
-/* "MDLM Functional Descriptor" from CDC WMC spec 6.7.2.3 */
-struct usb_cdc_mdlm_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__le16	bcdVersion;
-	__u8	bGUID[16];
-} __attribute__ ((packed));
-
-/* "MDLM Detail Functional Descriptor" from CDC WMC spec 6.7.2.4 */
-struct usb_cdc_mdlm_detail_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	/* type is associated with mdlm_desc.bGUID */
-	__u8	bGuidDescriptorType;
-	__u8	bDetailData[0];
-} __attribute__ ((packed));
-
-/* "OBEX Control Model Functional Descriptor" */
-struct usb_cdc_obex_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__le16	bcdVersion;
-} __attribute__ ((packed));
-
-/* "NCM Control Model Functional Descriptor" */
-struct usb_cdc_ncm_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__le16	bcdNcmVersion;
-	__u8	bmNetworkCapabilities;
-} __attribute__ ((packed));
-
-/* "MBIM Control Model Functional Descriptor" */
-struct usb_cdc_mbim_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__le16	bcdMBIMVersion;
-	__le16  wMaxControlMessage;
-	__u8    bNumberFilters;
-	__u8    bMaxFilterSize;
-	__le16  wMaxSegmentSize;
-	__u8    bmNetworkCapabilities;
-} __attribute__ ((packed));
-
-/* "MBIM Extended Functional Descriptor" from CDC MBIM spec 1.0 errata-1 */
-struct usb_cdc_mbim_extended_desc {
-	__u8	bLength;
-	__u8	bDescriptorType;
-	__u8	bDescriptorSubType;
-
-	__le16	bcdMBIMExtendedVersion;
-	__u8	bMaxOutstandingCommandMessages;
-	__le16	wMTU;
-} __attribute__ ((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/*
- * Class-Specific Control Requests (6.2)
- *
- * section 3.6.2.1 table 4 has the ACM profile, for modems.
- * section 3.8.2 table 10 has the ethernet profile.
- *
- * Microsoft's RNDIS stack for Ethernet is a vendor-specific CDC ACM variant,
- * heavily dependent on the encapsulated (proprietary) command mechanism.
- */
-
-#define USB_CDC_SEND_ENCAPSULATED_COMMAND	0x00
-#define USB_CDC_GET_ENCAPSULATED_RESPONSE	0x01
-#define USB_CDC_REQ_SET_LINE_CODING		0x20
-#define USB_CDC_REQ_GET_LINE_CODING		0x21
-#define USB_CDC_REQ_SET_CONTROL_LINE_STATE	0x22
-#define USB_CDC_REQ_SEND_BREAK			0x23
-#define USB_CDC_SET_ETHERNET_MULTICAST_FILTERS	0x40
-#define USB_CDC_SET_ETHERNET_PM_PATTERN_FILTER	0x41
-#define USB_CDC_GET_ETHERNET_PM_PATTERN_FILTER	0x42
-#define USB_CDC_SET_ETHERNET_PACKET_FILTER	0x43
-#define USB_CDC_GET_ETHERNET_STATISTIC		0x44
-#define USB_CDC_GET_NTB_PARAMETERS		0x80
-#define USB_CDC_GET_NET_ADDRESS			0x81
-#define USB_CDC_SET_NET_ADDRESS			0x82
-#define USB_CDC_GET_NTB_FORMAT			0x83
-#define USB_CDC_SET_NTB_FORMAT			0x84
-#define USB_CDC_GET_NTB_INPUT_SIZE		0x85
-#define USB_CDC_SET_NTB_INPUT_SIZE		0x86
-#define USB_CDC_GET_MAX_DATAGRAM_SIZE		0x87
-#define USB_CDC_SET_MAX_DATAGRAM_SIZE		0x88
-#define USB_CDC_GET_CRC_MODE			0x89
-#define USB_CDC_SET_CRC_MODE			0x8a
-
-/* Line Coding Structure from CDC spec 6.2.13 */
-struct usb_cdc_line_coding {
-	__le32	dwDTERate;
-	__u8	bCharFormat;
-#define USB_CDC_1_STOP_BITS			0
-#define USB_CDC_1_5_STOP_BITS			1
-#define USB_CDC_2_STOP_BITS			2
-
-	__u8	bParityType;
-#define USB_CDC_NO_PARITY			0
-#define USB_CDC_ODD_PARITY			1
-#define USB_CDC_EVEN_PARITY			2
-#define USB_CDC_MARK_PARITY			3
-#define USB_CDC_SPACE_PARITY			4
-
-	__u8	bDataBits;
-} __attribute__ ((packed));
-
-/* table 62; bits in multicast filter */
-#define	USB_CDC_PACKET_TYPE_PROMISCUOUS		(1 << 0)
-#define	USB_CDC_PACKET_TYPE_ALL_MULTICAST	(1 << 1) /* no filter */
-#define	USB_CDC_PACKET_TYPE_DIRECTED		(1 << 2)
-#define	USB_CDC_PACKET_TYPE_BROADCAST		(1 << 3)
-#define	USB_CDC_PACKET_TYPE_MULTICAST		(1 << 4) /* filtered */
-
-
-/*-------------------------------------------------------------------------*/
-
-/*
- * Class-Specific Notifications (6.3) sent by interrupt transfers
- *
- * section 3.8.2 table 11 of the CDC spec lists Ethernet notifications
- * section 3.6.2.1 table 5 specifies ACM notifications, accepted by RNDIS
- * RNDIS also defines its own bit-incompatible notifications
- */
-
-#define USB_CDC_NOTIFY_NETWORK_CONNECTION	0x00
-#define USB_CDC_NOTIFY_RESPONSE_AVAILABLE	0x01
-#define USB_CDC_NOTIFY_SERIAL_STATE		0x20
-#define USB_CDC_NOTIFY_SPEED_CHANGE		0x2a
-
-struct usb_cdc_notification {
-	__u8	bmRequestType;
-	__u8	bNotificationType;
-	__le16	wValue;
-	__le16	wIndex;
-	__le16	wLength;
-} __attribute__ ((packed));
-
-struct usb_cdc_speed_change {
-	__le32	DLBitRRate;	/* contains the downlink bit rate (IN pipe) */
-	__le32	ULBitRate;	/* contains the uplink bit rate (OUT pipe) */
-} __attribute__ ((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/*
- * Class Specific structures and constants
- *
- * CDC NCM NTB parameters structure, CDC NCM subclass 6.2.1
- *
- */
-
-struct usb_cdc_ncm_ntb_parameters {
-	__le16	wLength;
-	__le16	bmNtbFormatsSupported;
-	__le32	dwNtbInMaxSize;
-	__le16	wNdpInDivisor;
-	__le16	wNdpInPayloadRemainder;
-	__le16	wNdpInAlignment;
-	__le16	wPadding1;
-	__le32	dwNtbOutMaxSize;
-	__le16	wNdpOutDivisor;
-	__le16	wNdpOutPayloadRemainder;
-	__le16	wNdpOutAlignment;
-	__le16	wNtbOutMaxDatagrams;
-} __attribute__ ((packed));
-
-/*
- * CDC NCM transfer headers, CDC NCM subclass 3.2
- */
-
-#define USB_CDC_NCM_NTH16_SIGN		0x484D434E /* NCMH */
-#define USB_CDC_NCM_NTH32_SIGN		0x686D636E /* ncmh */
-
-struct usb_cdc_ncm_nth16 {
-	__le32	dwSignature;
-	__le16	wHeaderLength;
-	__le16	wSequence;
-	__le16	wBlockLength;
-	__le16	wNdpIndex;
-} __attribute__ ((packed));
-
-struct usb_cdc_ncm_nth32 {
-	__le32	dwSignature;
-	__le16	wHeaderLength;
-	__le16	wSequence;
-	__le32	dwBlockLength;
-	__le32	dwNdpIndex;
-} __attribute__ ((packed));
-
-/*
- * CDC NCM datagram pointers, CDC NCM subclass 3.3
- */
-
-#define USB_CDC_NCM_NDP16_CRC_SIGN	0x314D434E /* NCM1 */
-#define USB_CDC_NCM_NDP16_NOCRC_SIGN	0x304D434E /* NCM0 */
-#define USB_CDC_NCM_NDP32_CRC_SIGN	0x316D636E /* ncm1 */
-#define USB_CDC_NCM_NDP32_NOCRC_SIGN	0x306D636E /* ncm0 */
-
-#define USB_CDC_MBIM_NDP16_IPS_SIGN     0x00535049 /* IPS<sessionID> : IPS0 for now */
-#define USB_CDC_MBIM_NDP32_IPS_SIGN     0x00737069 /* ips<sessionID> : ips0 for now */
-#define USB_CDC_MBIM_NDP16_DSS_SIGN     0x00535344 /* DSS<sessionID> */
-#define USB_CDC_MBIM_NDP32_DSS_SIGN     0x00737364 /* dss<sessionID> */
-
-/* 16-bit NCM Datagram Pointer Entry */
-struct usb_cdc_ncm_dpe16 {
-	__le16	wDatagramIndex;
-	__le16	wDatagramLength;
-} __attribute__((__packed__));
-
-/* 16-bit NCM Datagram Pointer Table */
-struct usb_cdc_ncm_ndp16 {
-	__le32	dwSignature;
-	__le16	wLength;
-	__le16	wNextNdpIndex;
-	struct	usb_cdc_ncm_dpe16 dpe16[0];
-} __attribute__ ((packed));
-
-/* 32-bit NCM Datagram Pointer Entry */
-struct usb_cdc_ncm_dpe32 {
-	__le32	dwDatagramIndex;
-	__le32	dwDatagramLength;
-} __attribute__((__packed__));
-
-/* 32-bit NCM Datagram Pointer Table */
-struct usb_cdc_ncm_ndp32 {
-	__le32	dwSignature;
-	__le16	wLength;
-	__le16	wReserved6;
-	__le32	dwNextNdpIndex;
-	__le32	dwReserved12;
-	struct	usb_cdc_ncm_dpe32 dpe32[0];
-} __attribute__ ((packed));
-
-/* CDC NCM subclass 3.2.1 and 3.2.2 */
-#define USB_CDC_NCM_NDP16_INDEX_MIN			0x000C
-#define USB_CDC_NCM_NDP32_INDEX_MIN			0x0010
-
-/* CDC NCM subclass 3.3.3 Datagram Formatting */
-#define USB_CDC_NCM_DATAGRAM_FORMAT_CRC			0x30
-#define USB_CDC_NCM_DATAGRAM_FORMAT_NOCRC		0X31
-
-/* CDC NCM subclass 4.2 NCM Communications Interface Protocol Code */
-#define USB_CDC_NCM_PROTO_CODE_NO_ENCAP_COMMANDS	0x00
-#define USB_CDC_NCM_PROTO_CODE_EXTERN_PROTO		0xFE
-
-/* CDC NCM subclass 5.2.1 NCM Functional Descriptor, bmNetworkCapabilities */
-#define USB_CDC_NCM_NCAP_ETH_FILTER			(1 << 0)
-#define USB_CDC_NCM_NCAP_NET_ADDRESS			(1 << 1)
-#define USB_CDC_NCM_NCAP_ENCAP_COMMAND			(1 << 2)
-#define USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE		(1 << 3)
-#define USB_CDC_NCM_NCAP_CRC_MODE			(1 << 4)
-#define	USB_CDC_NCM_NCAP_NTB_INPUT_SIZE			(1 << 5)
-
-/* CDC NCM subclass Table 6-3: NTB Parameter Structure */
-#define USB_CDC_NCM_NTB16_SUPPORTED			(1 << 0)
-#define USB_CDC_NCM_NTB32_SUPPORTED			(1 << 1)
-
-/* CDC NCM subclass Table 6-3: NTB Parameter Structure */
-#define USB_CDC_NCM_NDP_ALIGN_MIN_SIZE			0x04
-#define USB_CDC_NCM_NTB_MAX_LENGTH			0x1C
-
-/* CDC NCM subclass 6.2.5 SetNtbFormat */
-#define USB_CDC_NCM_NTB16_FORMAT			0x00
-#define USB_CDC_NCM_NTB32_FORMAT			0x01
-
-/* CDC NCM subclass 6.2.7 SetNtbInputSize */
-#define USB_CDC_NCM_NTB_MIN_IN_SIZE			2048
-#define USB_CDC_NCM_NTB_MIN_OUT_SIZE			2048
-
-/* NTB Input Size Structure */
-struct usb_cdc_ncm_ndp_input_size {
-	__le32	dwNtbInMaxSize;
-	__le16	wNtbInMaxDatagrams;
-	__le16	wReserved;
-} __attribute__ ((packed));
-
-/* CDC NCM subclass 6.2.11 SetCrcMode */
-#define USB_CDC_NCM_CRC_NOT_APPENDED			0x00
-#define USB_CDC_NCM_CRC_APPENDED			0x01
-
-#endif /* __UAPI_LINUX_USB_CDC_H */
diff --git a/openflow/usr/include/linux/usb/ch11.h b/openflow/usr/include/linux/usb/ch11.h
deleted file mode 100644
index 361297e..0000000
--- a/openflow/usr/include/linux/usb/ch11.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * This file holds Hub protocol constants and data structures that are
- * defined in chapter 11 (Hub Specification) of the USB 2.0 specification.
- *
- * It is used/shared between the USB core, the HCDs and couple of other USB
- * drivers.
- */
-
-#ifndef __LINUX_CH11_H
-#define __LINUX_CH11_H
-
-#include <linux/types.h>	/* __u8 etc */
-
-/* This is arbitrary.
- * From USB 2.0 spec Table 11-13, offset 7, a hub can
- * have up to 255 ports. The most yet reported is 10.
- *
- * Current Wireless USB host hardware (Intel i1480 for example) allows
- * up to 22 devices to connect. Upcoming hardware might raise that
- * limit. Because the arrays need to add a bit for hub status data, we
- * use 31, so plus one evens out to four bytes.
- */
-#define USB_MAXCHILDREN		31
-
-/*
- * Hub request types
- */
-
-#define USB_RT_HUB	(USB_TYPE_CLASS | USB_RECIP_DEVICE)
-#define USB_RT_PORT	(USB_TYPE_CLASS | USB_RECIP_OTHER)
-
-/*
- * Port status type for GetPortStatus requests added in USB 3.1
- * See USB 3.1 spec Table 10-12
- */
-#define HUB_PORT_STATUS		0
-#define HUB_PORT_PD_STATUS	1
-#define HUB_EXT_PORT_STATUS	2
-
-/*
- * Hub class requests
- * See USB 2.0 spec Table 11-16
- */
-#define HUB_CLEAR_TT_BUFFER	8
-#define HUB_RESET_TT		9
-#define HUB_GET_TT_STATE	10
-#define HUB_STOP_TT		11
-
-/*
- * Hub class additional requests defined by USB 3.0 spec
- * See USB 3.0 spec Table 10-6
- */
-#define HUB_SET_DEPTH		12
-#define HUB_GET_PORT_ERR_COUNT	13
-
-/*
- * Hub Class feature numbers
- * See USB 2.0 spec Table 11-17
- */
-#define C_HUB_LOCAL_POWER	0
-#define C_HUB_OVER_CURRENT	1
-
-/*
- * Port feature numbers
- * See USB 2.0 spec Table 11-17
- */
-#define USB_PORT_FEAT_CONNECTION	0
-#define USB_PORT_FEAT_ENABLE		1
-#define USB_PORT_FEAT_SUSPEND		2	/* L2 suspend */
-#define USB_PORT_FEAT_OVER_CURRENT	3
-#define USB_PORT_FEAT_RESET		4
-#define USB_PORT_FEAT_L1		5	/* L1 suspend */
-#define USB_PORT_FEAT_POWER		8
-#define USB_PORT_FEAT_LOWSPEED		9	/* Should never be used */
-#define USB_PORT_FEAT_C_CONNECTION	16
-#define USB_PORT_FEAT_C_ENABLE		17
-#define USB_PORT_FEAT_C_SUSPEND		18
-#define USB_PORT_FEAT_C_OVER_CURRENT	19
-#define USB_PORT_FEAT_C_RESET		20
-#define USB_PORT_FEAT_TEST              21
-#define USB_PORT_FEAT_INDICATOR         22
-#define USB_PORT_FEAT_C_PORT_L1         23
-
-/*
- * Port feature selectors added by USB 3.0 spec.
- * See USB 3.0 spec Table 10-7
- */
-#define USB_PORT_FEAT_LINK_STATE		5
-#define USB_PORT_FEAT_U1_TIMEOUT		23
-#define USB_PORT_FEAT_U2_TIMEOUT		24
-#define USB_PORT_FEAT_C_PORT_LINK_STATE		25
-#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR	26
-#define USB_PORT_FEAT_REMOTE_WAKE_MASK		27
-#define USB_PORT_FEAT_BH_PORT_RESET		28
-#define USB_PORT_FEAT_C_BH_PORT_RESET		29
-#define USB_PORT_FEAT_FORCE_LINKPM_ACCEPT	30
-
-#define USB_PORT_LPM_TIMEOUT(p)			(((p) & 0xff) << 8)
-
-/* USB 3.0 hub remote wake mask bits, see table 10-14 */
-#define USB_PORT_FEAT_REMOTE_WAKE_CONNECT	(1 << 8)
-#define USB_PORT_FEAT_REMOTE_WAKE_DISCONNECT	(1 << 9)
-#define USB_PORT_FEAT_REMOTE_WAKE_OVER_CURRENT	(1 << 10)
-
-/*
- * Hub Status and Hub Change results
- * See USB 2.0 spec Table 11-19 and Table 11-20
- * USB 3.1 extends the port status request and may return 4 additional bytes.
- * See USB 3.1 spec section 10.16.2.6 Table 10-12 and 10-15
- */
-struct usb_port_status {
-	__le16 wPortStatus;
-	__le16 wPortChange;
-	__le32 dwExtPortStatus;
-} __attribute__ ((packed));
-
-/*
- * wPortStatus bit field
- * See USB 2.0 spec Table 11-21
- */
-#define USB_PORT_STAT_CONNECTION	0x0001
-#define USB_PORT_STAT_ENABLE		0x0002
-#define USB_PORT_STAT_SUSPEND		0x0004
-#define USB_PORT_STAT_OVERCURRENT	0x0008
-#define USB_PORT_STAT_RESET		0x0010
-#define USB_PORT_STAT_L1		0x0020
-/* bits 6 to 7 are reserved */
-#define USB_PORT_STAT_POWER		0x0100
-#define USB_PORT_STAT_LOW_SPEED		0x0200
-#define USB_PORT_STAT_HIGH_SPEED        0x0400
-#define USB_PORT_STAT_TEST              0x0800
-#define USB_PORT_STAT_INDICATOR         0x1000
-/* bits 13 to 15 are reserved */
-
-/*
- * Additions to wPortStatus bit field from USB 3.0
- * See USB 3.0 spec Table 10-10
- */
-#define USB_PORT_STAT_LINK_STATE	0x01e0
-#define USB_SS_PORT_STAT_POWER		0x0200
-#define USB_SS_PORT_STAT_SPEED		0x1c00
-#define USB_PORT_STAT_SPEED_5GBPS	0x0000
-/* Valid only if port is enabled */
-/* Bits that are the same from USB 2.0 */
-#define USB_SS_PORT_STAT_MASK (USB_PORT_STAT_CONNECTION |	    \
-				USB_PORT_STAT_ENABLE |	    \
-				USB_PORT_STAT_OVERCURRENT | \
-				USB_PORT_STAT_RESET)
-
-/*
- * Definitions for PORT_LINK_STATE values
- * (bits 5-8) in wPortStatus
- */
-#define USB_SS_PORT_LS_U0		0x0000
-#define USB_SS_PORT_LS_U1		0x0020
-#define USB_SS_PORT_LS_U2		0x0040
-#define USB_SS_PORT_LS_U3		0x0060
-#define USB_SS_PORT_LS_SS_DISABLED	0x0080
-#define USB_SS_PORT_LS_RX_DETECT	0x00a0
-#define USB_SS_PORT_LS_SS_INACTIVE	0x00c0
-#define USB_SS_PORT_LS_POLLING		0x00e0
-#define USB_SS_PORT_LS_RECOVERY		0x0100
-#define USB_SS_PORT_LS_HOT_RESET	0x0120
-#define USB_SS_PORT_LS_COMP_MOD		0x0140
-#define USB_SS_PORT_LS_LOOPBACK		0x0160
-
-/*
- * wPortChange bit field
- * See USB 2.0 spec Table 11-22 and USB 2.0 LPM ECN Table-4.10
- * Bits 0 to 5 shown, bits 6 to 15 are reserved
- */
-#define USB_PORT_STAT_C_CONNECTION	0x0001
-#define USB_PORT_STAT_C_ENABLE		0x0002
-#define USB_PORT_STAT_C_SUSPEND		0x0004
-#define USB_PORT_STAT_C_OVERCURRENT	0x0008
-#define USB_PORT_STAT_C_RESET		0x0010
-#define USB_PORT_STAT_C_L1		0x0020
-/*
- * USB 3.0 wPortChange bit fields
- * See USB 3.0 spec Table 10-11
- */
-#define USB_PORT_STAT_C_BH_RESET	0x0020
-#define USB_PORT_STAT_C_LINK_STATE	0x0040
-#define USB_PORT_STAT_C_CONFIG_ERROR	0x0080
-
-/*
- * USB 3.1 dwExtPortStatus field masks
- * See USB 3.1 spec 10.16.2.6.3 Table 10-15
- */
-
-#define USB_EXT_PORT_STAT_RX_SPEED_ID	0x0000000f
-#define USB_EXT_PORT_STAT_TX_SPEED_ID	0x000000f0
-#define USB_EXT_PORT_STAT_RX_LANES	0x00000f00
-#define USB_EXT_PORT_STAT_TX_LANES	0x0000f000
-
-/*
- * wHubCharacteristics (masks)
- * See USB 2.0 spec Table 11-13, offset 3
- */
-#define HUB_CHAR_LPSM		0x0003 /* Logical Power Switching Mode mask */
-#define HUB_CHAR_COMMON_LPSM	0x0000 /* All ports power control at once */
-#define HUB_CHAR_INDV_PORT_LPSM	0x0001 /* per-port power control */
-#define HUB_CHAR_NO_LPSM	0x0002 /* no power switching */
-
-#define HUB_CHAR_COMPOUND	0x0004 /* hub is part of a compound device */
-
-#define HUB_CHAR_OCPM		0x0018 /* Over-Current Protection Mode mask */
-#define HUB_CHAR_COMMON_OCPM	0x0000 /* All ports Over-Current reporting */
-#define HUB_CHAR_INDV_PORT_OCPM	0x0008 /* per-port Over-current reporting */
-#define HUB_CHAR_NO_OCPM	0x0010 /* No Over-current Protection support */
-
-#define HUB_CHAR_TTTT		0x0060 /* TT Think Time mask */
-#define HUB_CHAR_PORTIND	0x0080 /* per-port indicators (LEDs) */
-
-struct usb_hub_status {
-	__le16 wHubStatus;
-	__le16 wHubChange;
-} __attribute__ ((packed));
-
-/*
- * Hub Status & Hub Change bit masks
- * See USB 2.0 spec Table 11-19 and Table 11-20
- * Bits 0 and 1 for wHubStatus and wHubChange
- * Bits 2 to 15 are reserved for both
- */
-#define HUB_STATUS_LOCAL_POWER	0x0001
-#define HUB_STATUS_OVERCURRENT	0x0002
-#define HUB_CHANGE_LOCAL_POWER	0x0001
-#define HUB_CHANGE_OVERCURRENT	0x0002
-
-
-/*
- * Hub descriptor
- * See USB 2.0 spec Table 11-13
- */
-
-#define USB_DT_HUB			(USB_TYPE_CLASS | 0x09)
-#define USB_DT_SS_HUB			(USB_TYPE_CLASS | 0x0a)
-#define USB_DT_HUB_NONVAR_SIZE		7
-#define USB_DT_SS_HUB_SIZE              12
-
-/*
- * Hub Device descriptor
- * USB Hub class device protocols
- */
-
-#define USB_HUB_PR_FS		0 /* Full speed hub */
-#define USB_HUB_PR_HS_NO_TT	0 /* Hi-speed hub without TT */
-#define USB_HUB_PR_HS_SINGLE_TT	1 /* Hi-speed hub with single TT */
-#define USB_HUB_PR_HS_MULTI_TT	2 /* Hi-speed hub with multiple TT */
-#define USB_HUB_PR_SS		3 /* Super speed hub */
-
-struct usb_hub_descriptor {
-	__u8  bDescLength;
-	__u8  bDescriptorType;
-	__u8  bNbrPorts;
-	__le16 wHubCharacteristics;
-	__u8  bPwrOn2PwrGood;
-	__u8  bHubContrCurrent;
-
-	/* 2.0 and 3.0 hubs differ here */
-	union {
-		struct {
-			/* add 1 bit for hub status change; round to bytes */
-			__u8  DeviceRemovable[(USB_MAXCHILDREN + 1 + 7) / 8];
-			__u8  PortPwrCtrlMask[(USB_MAXCHILDREN + 1 + 7) / 8];
-		}  __attribute__ ((packed)) hs;
-
-		struct {
-			__u8 bHubHdrDecLat;
-			__le16 wHubDelay;
-			__le16 DeviceRemovable;
-		}  __attribute__ ((packed)) ss;
-	} u;
-} __attribute__ ((packed));
-
-/* port indicator status selectors, tables 11-7 and 11-25 */
-#define HUB_LED_AUTO	0
-#define HUB_LED_AMBER	1
-#define HUB_LED_GREEN	2
-#define HUB_LED_OFF	3
-
-enum hub_led_mode {
-	INDICATOR_AUTO = 0,
-	INDICATOR_CYCLE,
-	/* software blinks for attention:  software, hardware, reserved */
-	INDICATOR_GREEN_BLINK, INDICATOR_GREEN_BLINK_OFF,
-	INDICATOR_AMBER_BLINK, INDICATOR_AMBER_BLINK_OFF,
-	INDICATOR_ALT_BLINK, INDICATOR_ALT_BLINK_OFF
-} __attribute__ ((packed));
-
-/* Transaction Translator Think Times, in bits */
-#define HUB_TTTT_8_BITS		0x00
-#define HUB_TTTT_16_BITS	0x20
-#define HUB_TTTT_24_BITS	0x40
-#define HUB_TTTT_32_BITS	0x60
-
-#endif /* __LINUX_CH11_H */
diff --git a/openflow/usr/include/linux/usb/ch9.h b/openflow/usr/include/linux/usb/ch9.h
deleted file mode 100644
index 135736b..0000000
--- a/openflow/usr/include/linux/usb/ch9.h
+++ /dev/null
@@ -1,1069 +0,0 @@
-/*
- * This file holds USB constants and structures that are needed for
- * USB device APIs.  These are used by the USB device model, which is
- * defined in chapter 9 of the USB 2.0 specification and in the
- * Wireless USB 1.0 (spread around).  Linux has several APIs in C that
- * need these:
- *
- * - the master/host side Linux-USB kernel driver API;
- * - the "usbfs" user space API; and
- * - the Linux "gadget" slave/device/peripheral side driver API.
- *
- * USB 2.0 adds an additional "On The Go" (OTG) mode, which lets systems
- * act either as a USB master/host or as a USB slave/device.  That means
- * the master and slave side APIs benefit from working well together.
- *
- * There's also "Wireless USB", using low power short range radios for
- * peripheral interconnection but otherwise building on the USB framework.
- *
- * Note all descriptors are declared '__attribute__((packed))' so that:
- *
- * [a] they never get padded, either internally (USB spec writers
- *     probably handled that) or externally;
- *
- * [b] so that accessing bigger-than-a-bytes fields will never
- *     generate bus errors on any platform, even when the location of
- *     its descriptor inside a bundle isn't "naturally aligned", and
- *
- * [c] for consistency, removing all doubt even when it appears to
- *     someone that the two other points are non-issues for that
- *     particular descriptor type.
- */
-
-#ifndef __LINUX_USB_CH9_H
-#define __LINUX_USB_CH9_H
-
-#include <linux/types.h>	/* __u8 etc */
-#include <asm/byteorder.h>	/* le16_to_cpu */
-
-/*-------------------------------------------------------------------------*/
-
-/* CONTROL REQUEST SUPPORT */
-
-/*
- * USB directions
- *
- * This bit flag is used in endpoint descriptors' bEndpointAddress field.
- * It's also one of three fields in control requests bRequestType.
- */
-#define USB_DIR_OUT			0		/* to device */
-#define USB_DIR_IN			0x80		/* to host */
-
-/*
- * USB types, the second of three bRequestType fields
- */
-#define USB_TYPE_MASK			(0x03 << 5)
-#define USB_TYPE_STANDARD		(0x00 << 5)
-#define USB_TYPE_CLASS			(0x01 << 5)
-#define USB_TYPE_VENDOR			(0x02 << 5)
-#define USB_TYPE_RESERVED		(0x03 << 5)
-
-/*
- * USB recipients, the third of three bRequestType fields
- */
-#define USB_RECIP_MASK			0x1f
-#define USB_RECIP_DEVICE		0x00
-#define USB_RECIP_INTERFACE		0x01
-#define USB_RECIP_ENDPOINT		0x02
-#define USB_RECIP_OTHER			0x03
-/* From Wireless USB 1.0 */
-#define USB_RECIP_PORT			0x04
-#define USB_RECIP_RPIPE		0x05
-
-/*
- * Standard requests, for the bRequest field of a SETUP packet.
- *
- * These are qualified by the bRequestType field, so that for example
- * TYPE_CLASS or TYPE_VENDOR specific feature flags could be retrieved
- * by a GET_STATUS request.
- */
-#define USB_REQ_GET_STATUS		0x00
-#define USB_REQ_CLEAR_FEATURE		0x01
-#define USB_REQ_SET_FEATURE		0x03
-#define USB_REQ_SET_ADDRESS		0x05
-#define USB_REQ_GET_DESCRIPTOR		0x06
-#define USB_REQ_SET_DESCRIPTOR		0x07
-#define USB_REQ_GET_CONFIGURATION	0x08
-#define USB_REQ_SET_CONFIGURATION	0x09
-#define USB_REQ_GET_INTERFACE		0x0A
-#define USB_REQ_SET_INTERFACE		0x0B
-#define USB_REQ_SYNCH_FRAME		0x0C
-#define USB_REQ_SET_SEL			0x30
-#define USB_REQ_SET_ISOCH_DELAY		0x31
-
-#define USB_REQ_SET_ENCRYPTION		0x0D	/* Wireless USB */
-#define USB_REQ_GET_ENCRYPTION		0x0E
-#define USB_REQ_RPIPE_ABORT		0x0E
-#define USB_REQ_SET_HANDSHAKE		0x0F
-#define USB_REQ_RPIPE_RESET		0x0F
-#define USB_REQ_GET_HANDSHAKE		0x10
-#define USB_REQ_SET_CONNECTION		0x11
-#define USB_REQ_SET_SECURITY_DATA	0x12
-#define USB_REQ_GET_SECURITY_DATA	0x13
-#define USB_REQ_SET_WUSB_DATA		0x14
-#define USB_REQ_LOOPBACK_DATA_WRITE	0x15
-#define USB_REQ_LOOPBACK_DATA_READ	0x16
-#define USB_REQ_SET_INTERFACE_DS	0x17
-
-/* The Link Power Management (LPM) ECN defines USB_REQ_TEST_AND_SET command,
- * used by hubs to put ports into a new L1 suspend state, except that it
- * forgot to define its number ...
- */
-
-/*
- * USB feature flags are written using USB_REQ_{CLEAR,SET}_FEATURE, and
- * are read as a bit array returned by USB_REQ_GET_STATUS.  (So there
- * are at most sixteen features of each type.)  Hubs may also support a
- * new USB_REQ_TEST_AND_SET_FEATURE to put ports into L1 suspend.
- */
-#define USB_DEVICE_SELF_POWERED		0	/* (read only) */
-#define USB_DEVICE_REMOTE_WAKEUP	1	/* dev may initiate wakeup */
-#define USB_DEVICE_TEST_MODE		2	/* (wired high speed only) */
-#define USB_DEVICE_BATTERY		2	/* (wireless) */
-#define USB_DEVICE_B_HNP_ENABLE		3	/* (otg) dev may initiate HNP */
-#define USB_DEVICE_WUSB_DEVICE		3	/* (wireless)*/
-#define USB_DEVICE_A_HNP_SUPPORT	4	/* (otg) RH port supports HNP */
-#define USB_DEVICE_A_ALT_HNP_SUPPORT	5	/* (otg) other RH port does */
-#define USB_DEVICE_DEBUG_MODE		6	/* (special devices only) */
-
-/*
- * Test Mode Selectors
- * See USB 2.0 spec Table 9-7
- */
-#define	TEST_J		1
-#define	TEST_K		2
-#define	TEST_SE0_NAK	3
-#define	TEST_PACKET	4
-#define	TEST_FORCE_EN	5
-
-/*
- * New Feature Selectors as added by USB 3.0
- * See USB 3.0 spec Table 9-7
- */
-#define USB_DEVICE_U1_ENABLE	48	/* dev may initiate U1 transition */
-#define USB_DEVICE_U2_ENABLE	49	/* dev may initiate U2 transition */
-#define USB_DEVICE_LTM_ENABLE	50	/* dev may send LTM */
-#define USB_INTRF_FUNC_SUSPEND	0	/* function suspend */
-
-#define USB_INTR_FUNC_SUSPEND_OPT_MASK	0xFF00
-/*
- * Suspend Options, Table 9-8 USB 3.0 spec
- */
-#define USB_INTRF_FUNC_SUSPEND_LP	(1 << (8 + 0))
-#define USB_INTRF_FUNC_SUSPEND_RW	(1 << (8 + 1))
-
-/*
- * Interface status, Figure 9-5 USB 3.0 spec
- */
-#define USB_INTRF_STAT_FUNC_RW_CAP     1
-#define USB_INTRF_STAT_FUNC_RW         2
-
-#define USB_ENDPOINT_HALT		0	/* IN/OUT will STALL */
-
-/* Bit array elements as returned by the USB_REQ_GET_STATUS request. */
-#define USB_DEV_STAT_U1_ENABLED		2	/* transition into U1 state */
-#define USB_DEV_STAT_U2_ENABLED		3	/* transition into U2 state */
-#define USB_DEV_STAT_LTM_ENABLED	4	/* Latency tolerance messages */
-
-/**
- * struct usb_ctrlrequest - SETUP data for a USB device control request
- * @bRequestType: matches the USB bmRequestType field
- * @bRequest: matches the USB bRequest field
- * @wValue: matches the USB wValue field (le16 byte order)
- * @wIndex: matches the USB wIndex field (le16 byte order)
- * @wLength: matches the USB wLength field (le16 byte order)
- *
- * This structure is used to send control requests to a USB device.  It matches
- * the different fields of the USB 2.0 Spec section 9.3, table 9-2.  See the
- * USB spec for a fuller description of the different fields, and what they are
- * used for.
- *
- * Note that the driver for any interface can issue control requests.
- * For most devices, interfaces don't coordinate with each other, so
- * such requests may be made at any time.
- */
-struct usb_ctrlrequest {
-	__u8 bRequestType;
-	__u8 bRequest;
-	__le16 wValue;
-	__le16 wIndex;
-	__le16 wLength;
-} __attribute__ ((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/*
- * STANDARD DESCRIPTORS ... as returned by GET_DESCRIPTOR, or
- * (rarely) accepted by SET_DESCRIPTOR.
- *
- * Note that all multi-byte values here are encoded in little endian
- * byte order "on the wire".  Within the kernel and when exposed
- * through the Linux-USB APIs, they are not converted to cpu byte
- * order; it is the responsibility of the client code to do this.
- * The single exception is when device and configuration descriptors (but
- * not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD);
- * in this case the fields are converted to host endianness by the kernel.
- */
-
-/*
- * Descriptor types ... USB 2.0 spec table 9.5
- */
-#define USB_DT_DEVICE			0x01
-#define USB_DT_CONFIG			0x02
-#define USB_DT_STRING			0x03
-#define USB_DT_INTERFACE		0x04
-#define USB_DT_ENDPOINT			0x05
-#define USB_DT_DEVICE_QUALIFIER		0x06
-#define USB_DT_OTHER_SPEED_CONFIG	0x07
-#define USB_DT_INTERFACE_POWER		0x08
-/* these are from a minor usb 2.0 revision (ECN) */
-#define USB_DT_OTG			0x09
-#define USB_DT_DEBUG			0x0a
-#define USB_DT_INTERFACE_ASSOCIATION	0x0b
-/* these are from the Wireless USB spec */
-#define USB_DT_SECURITY			0x0c
-#define USB_DT_KEY			0x0d
-#define USB_DT_ENCRYPTION_TYPE		0x0e
-#define USB_DT_BOS			0x0f
-#define USB_DT_DEVICE_CAPABILITY	0x10
-#define USB_DT_WIRELESS_ENDPOINT_COMP	0x11
-#define USB_DT_WIRE_ADAPTER		0x21
-#define USB_DT_RPIPE			0x22
-#define USB_DT_CS_RADIO_CONTROL		0x23
-/* From the T10 UAS specification */
-#define USB_DT_PIPE_USAGE		0x24
-/* From the USB 3.0 spec */
-#define	USB_DT_SS_ENDPOINT_COMP		0x30
-/* From the USB 3.1 spec */
-#define	USB_DT_SSP_ISOC_ENDPOINT_COMP	0x31
-
-/* Conventional codes for class-specific descriptors.  The convention is
- * defined in the USB "Common Class" Spec (3.11).  Individual class specs
- * are authoritative for their usage, not the "common class" writeup.
- */
-#define USB_DT_CS_DEVICE		(USB_TYPE_CLASS | USB_DT_DEVICE)
-#define USB_DT_CS_CONFIG		(USB_TYPE_CLASS | USB_DT_CONFIG)
-#define USB_DT_CS_STRING		(USB_TYPE_CLASS | USB_DT_STRING)
-#define USB_DT_CS_INTERFACE		(USB_TYPE_CLASS | USB_DT_INTERFACE)
-#define USB_DT_CS_ENDPOINT		(USB_TYPE_CLASS | USB_DT_ENDPOINT)
-
-/* All standard descriptors have these 2 fields at the beginning */
-struct usb_descriptor_header {
-	__u8  bLength;
-	__u8  bDescriptorType;
-} __attribute__ ((packed));
-
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_DEVICE: Device descriptor */
-struct usb_device_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__le16 bcdUSB;
-	__u8  bDeviceClass;
-	__u8  bDeviceSubClass;
-	__u8  bDeviceProtocol;
-	__u8  bMaxPacketSize0;
-	__le16 idVendor;
-	__le16 idProduct;
-	__le16 bcdDevice;
-	__u8  iManufacturer;
-	__u8  iProduct;
-	__u8  iSerialNumber;
-	__u8  bNumConfigurations;
-} __attribute__ ((packed));
-
-#define USB_DT_DEVICE_SIZE		18
-
-
-/*
- * Device and/or Interface Class codes
- * as found in bDeviceClass or bInterfaceClass
- * and defined by www.usb.org documents
- */
-#define USB_CLASS_PER_INTERFACE		0	/* for DeviceClass */
-#define USB_CLASS_AUDIO			1
-#define USB_CLASS_COMM			2
-#define USB_CLASS_HID			3
-#define USB_CLASS_PHYSICAL		5
-#define USB_CLASS_STILL_IMAGE		6
-#define USB_CLASS_PRINTER		7
-#define USB_CLASS_MASS_STORAGE		8
-#define USB_CLASS_HUB			9
-#define USB_CLASS_CDC_DATA		0x0a
-#define USB_CLASS_CSCID			0x0b	/* chip+ smart card */
-#define USB_CLASS_CONTENT_SEC		0x0d	/* content security */
-#define USB_CLASS_VIDEO			0x0e
-#define USB_CLASS_WIRELESS_CONTROLLER	0xe0
-#define USB_CLASS_MISC			0xef
-#define USB_CLASS_APP_SPEC		0xfe
-#define USB_CLASS_VENDOR_SPEC		0xff
-
-#define USB_SUBCLASS_VENDOR_SPEC	0xff
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_CONFIG: Configuration descriptor information.
- *
- * USB_DT_OTHER_SPEED_CONFIG is the same descriptor, except that the
- * descriptor type is different.  Highspeed-capable devices can look
- * different depending on what speed they're currently running.  Only
- * devices with a USB_DT_DEVICE_QUALIFIER have any OTHER_SPEED_CONFIG
- * descriptors.
- */
-struct usb_config_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__le16 wTotalLength;
-	__u8  bNumInterfaces;
-	__u8  bConfigurationValue;
-	__u8  iConfiguration;
-	__u8  bmAttributes;
-	__u8  bMaxPower;
-} __attribute__ ((packed));
-
-#define USB_DT_CONFIG_SIZE		9
-
-/* from config descriptor bmAttributes */
-#define USB_CONFIG_ATT_ONE		(1 << 7)	/* must be set */
-#define USB_CONFIG_ATT_SELFPOWER	(1 << 6)	/* self powered */
-#define USB_CONFIG_ATT_WAKEUP		(1 << 5)	/* can wakeup */
-#define USB_CONFIG_ATT_BATTERY		(1 << 4)	/* battery powered */
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_STRING: String descriptor */
-struct usb_string_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__le16 wData[1];		/* UTF-16LE encoded */
-} __attribute__ ((packed));
-
-/* note that "string" zero is special, it holds language codes that
- * the device supports, not Unicode characters.
- */
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_INTERFACE: Interface descriptor */
-struct usb_interface_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__u8  bInterfaceNumber;
-	__u8  bAlternateSetting;
-	__u8  bNumEndpoints;
-	__u8  bInterfaceClass;
-	__u8  bInterfaceSubClass;
-	__u8  bInterfaceProtocol;
-	__u8  iInterface;
-} __attribute__ ((packed));
-
-#define USB_DT_INTERFACE_SIZE		9
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_ENDPOINT: Endpoint descriptor */
-struct usb_endpoint_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__u8  bEndpointAddress;
-	__u8  bmAttributes;
-	__le16 wMaxPacketSize;
-	__u8  bInterval;
-
-	/* NOTE:  these two are _only_ in audio endpoints. */
-	/* use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof. */
-	__u8  bRefresh;
-	__u8  bSynchAddress;
-} __attribute__ ((packed));
-
-#define USB_DT_ENDPOINT_SIZE		7
-#define USB_DT_ENDPOINT_AUDIO_SIZE	9	/* Audio extension */
-
-
-/*
- * Endpoints
- */
-#define USB_ENDPOINT_NUMBER_MASK	0x0f	/* in bEndpointAddress */
-#define USB_ENDPOINT_DIR_MASK		0x80
-
-#define USB_ENDPOINT_XFERTYPE_MASK	0x03	/* in bmAttributes */
-#define USB_ENDPOINT_XFER_CONTROL	0
-#define USB_ENDPOINT_XFER_ISOC		1
-#define USB_ENDPOINT_XFER_BULK		2
-#define USB_ENDPOINT_XFER_INT		3
-#define USB_ENDPOINT_MAX_ADJUSTABLE	0x80
-
-/* The USB 3.0 spec redefines bits 5:4 of bmAttributes as interrupt ep type. */
-#define USB_ENDPOINT_INTRTYPE		0x30
-#define USB_ENDPOINT_INTR_PERIODIC	(0 << 4)
-#define USB_ENDPOINT_INTR_NOTIFICATION	(1 << 4)
-
-#define USB_ENDPOINT_SYNCTYPE		0x0c
-#define USB_ENDPOINT_SYNC_NONE		(0 << 2)
-#define USB_ENDPOINT_SYNC_ASYNC		(1 << 2)
-#define USB_ENDPOINT_SYNC_ADAPTIVE	(2 << 2)
-#define USB_ENDPOINT_SYNC_SYNC		(3 << 2)
-
-#define USB_ENDPOINT_USAGE_MASK		0x30
-#define USB_ENDPOINT_USAGE_DATA		0x00
-#define USB_ENDPOINT_USAGE_FEEDBACK	0x10
-#define USB_ENDPOINT_USAGE_IMPLICIT_FB	0x20	/* Implicit feedback Data endpoint */
-
-/*-------------------------------------------------------------------------*/
-
-/**
- * usb_endpoint_num - get the endpoint's number
- * @epd: endpoint to be checked
- *
- * Returns @epd's number: 0 to 15.
- */
-static __inline__ int usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
-{
-	return epd->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
-}
-
-/**
- * usb_endpoint_type - get the endpoint's transfer type
- * @epd: endpoint to be checked
- *
- * Returns one of USB_ENDPOINT_XFER_{CONTROL, ISOC, BULK, INT} according
- * to @epd's transfer type.
- */
-static __inline__ int usb_endpoint_type(const struct usb_endpoint_descriptor *epd)
-{
-	return epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
-}
-
-/**
- * usb_endpoint_dir_in - check if the endpoint has IN direction
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type IN, otherwise it returns false.
- */
-static __inline__ int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
-{
-	return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN);
-}
-
-/**
- * usb_endpoint_dir_out - check if the endpoint has OUT direction
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type OUT, otherwise it returns false.
- */
-static __inline__ int usb_endpoint_dir_out(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT);
-}
-
-/**
- * usb_endpoint_xfer_bulk - check if the endpoint has bulk transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type bulk, otherwise it returns false.
- */
-static __inline__ int usb_endpoint_xfer_bulk(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-		USB_ENDPOINT_XFER_BULK);
-}
-
-/**
- * usb_endpoint_xfer_control - check if the endpoint has control transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type control, otherwise it returns false.
- */
-static __inline__ int usb_endpoint_xfer_control(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-		USB_ENDPOINT_XFER_CONTROL);
-}
-
-/**
- * usb_endpoint_xfer_int - check if the endpoint has interrupt transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type interrupt, otherwise it returns
- * false.
- */
-static __inline__ int usb_endpoint_xfer_int(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-		USB_ENDPOINT_XFER_INT);
-}
-
-/**
- * usb_endpoint_xfer_isoc - check if the endpoint has isochronous transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type isochronous, otherwise it returns
- * false.
- */
-static __inline__ int usb_endpoint_xfer_isoc(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-		USB_ENDPOINT_XFER_ISOC);
-}
-
-/**
- * usb_endpoint_is_bulk_in - check if the endpoint is bulk IN
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has bulk transfer type and IN direction,
- * otherwise it returns false.
- */
-static __inline__ int usb_endpoint_is_bulk_in(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd);
-}
-
-/**
- * usb_endpoint_is_bulk_out - check if the endpoint is bulk OUT
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has bulk transfer type and OUT direction,
- * otherwise it returns false.
- */
-static __inline__ int usb_endpoint_is_bulk_out(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd);
-}
-
-/**
- * usb_endpoint_is_int_in - check if the endpoint is interrupt IN
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has interrupt transfer type and IN direction,
- * otherwise it returns false.
- */
-static __inline__ int usb_endpoint_is_int_in(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd);
-}
-
-/**
- * usb_endpoint_is_int_out - check if the endpoint is interrupt OUT
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has interrupt transfer type and OUT direction,
- * otherwise it returns false.
- */
-static __inline__ int usb_endpoint_is_int_out(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd);
-}
-
-/**
- * usb_endpoint_is_isoc_in - check if the endpoint is isochronous IN
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has isochronous transfer type and IN direction,
- * otherwise it returns false.
- */
-static __inline__ int usb_endpoint_is_isoc_in(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd);
-}
-
-/**
- * usb_endpoint_is_isoc_out - check if the endpoint is isochronous OUT
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has isochronous transfer type and OUT direction,
- * otherwise it returns false.
- */
-static __inline__ int usb_endpoint_is_isoc_out(
-				const struct usb_endpoint_descriptor *epd)
-{
-	return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd);
-}
-
-/**
- * usb_endpoint_maxp - get endpoint's max packet size
- * @epd: endpoint to be checked
- *
- * Returns @epd's max packet
- */
-static __inline__ int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
-{
-	return __le16_to_cpu(epd->wMaxPacketSize);
-}
-
-static __inline__ int usb_endpoint_interrupt_type(
-		const struct usb_endpoint_descriptor *epd)
-{
-	return epd->bmAttributes & USB_ENDPOINT_INTRTYPE;
-}
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_SSP_ISOC_ENDPOINT_COMP: SuperSpeedPlus Isochronous Endpoint Companion
- * descriptor
- */
-struct usb_ssp_isoc_ep_comp_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__le16 wReseved;
-	__le32 dwBytesPerInterval;
-} __attribute__ ((packed));
-
-#define USB_DT_SSP_ISOC_EP_COMP_SIZE		8
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_SS_ENDPOINT_COMP: SuperSpeed Endpoint Companion descriptor */
-struct usb_ss_ep_comp_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__u8  bMaxBurst;
-	__u8  bmAttributes;
-	__le16 wBytesPerInterval;
-} __attribute__ ((packed));
-
-#define USB_DT_SS_EP_COMP_SIZE		6
-
-/* Bits 4:0 of bmAttributes if this is a bulk endpoint */
-static __inline__ int
-usb_ss_max_streams(const struct usb_ss_ep_comp_descriptor *comp)
-{
-	int		max_streams;
-
-	if (!comp)
-		return 0;
-
-	max_streams = comp->bmAttributes & 0x1f;
-
-	if (!max_streams)
-		return 0;
-
-	max_streams = 1 << max_streams;
-
-	return max_streams;
-}
-
-/* Bits 1:0 of bmAttributes if this is an isoc endpoint */
-#define USB_SS_MULT(p)			(1 + ((p) & 0x3))
-/* Bit 7 of bmAttributes if a SSP isoc endpoint companion descriptor exists */
-#define USB_SS_SSP_ISOC_COMP(p)		((p) & (1 << 7))
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_DEVICE_QUALIFIER: Device Qualifier descriptor */
-struct usb_qualifier_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__le16 bcdUSB;
-	__u8  bDeviceClass;
-	__u8  bDeviceSubClass;
-	__u8  bDeviceProtocol;
-	__u8  bMaxPacketSize0;
-	__u8  bNumConfigurations;
-	__u8  bRESERVED;
-} __attribute__ ((packed));
-
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_OTG (from OTG 1.0a supplement) */
-struct usb_otg_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__u8  bmAttributes;	/* support for HNP, SRP, etc */
-} __attribute__ ((packed));
-
-/* USB_DT_OTG (from OTG 2.0 supplement) */
-struct usb_otg20_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__u8  bmAttributes;	/* support for HNP, SRP and ADP, etc */
-	__le16 bcdOTG;		/* OTG and EH supplement release number
-				 * in binary-coded decimal(i.e. 2.0 is 0200H)
-				 */
-} __attribute__ ((packed));
-
-/* from usb_otg_descriptor.bmAttributes */
-#define USB_OTG_SRP		(1 << 0)
-#define USB_OTG_HNP		(1 << 1)	/* swap host/device roles */
-#define USB_OTG_ADP		(1 << 2)	/* support ADP */
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_DEBUG:  for special highspeed devices, replacing serial console */
-struct usb_debug_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	/* bulk endpoints with 8 byte maxpacket */
-	__u8  bDebugInEndpoint;
-	__u8  bDebugOutEndpoint;
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_INTERFACE_ASSOCIATION: groups interfaces */
-struct usb_interface_assoc_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__u8  bFirstInterface;
-	__u8  bInterfaceCount;
-	__u8  bFunctionClass;
-	__u8  bFunctionSubClass;
-	__u8  bFunctionProtocol;
-	__u8  iFunction;
-} __attribute__ ((packed));
-
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_SECURITY:  group of wireless security descriptors, including
- * encryption types available for setting up a CC/association.
- */
-struct usb_security_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__le16 wTotalLength;
-	__u8  bNumEncryptionTypes;
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_KEY:  used with {GET,SET}_SECURITY_DATA; only public keys
- * may be retrieved.
- */
-struct usb_key_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__u8  tTKID[3];
-	__u8  bReserved;
-	__u8  bKeyData[0];
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_ENCRYPTION_TYPE:  bundled in DT_SECURITY groups */
-struct usb_encryption_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__u8  bEncryptionType;
-#define	USB_ENC_TYPE_UNSECURE		0
-#define	USB_ENC_TYPE_WIRED		1	/* non-wireless mode */
-#define	USB_ENC_TYPE_CCM_1		2	/* aes128/cbc session */
-#define	USB_ENC_TYPE_RSA_1		3	/* rsa3072/sha1 auth */
-	__u8  bEncryptionValue;		/* use in SET_ENCRYPTION */
-	__u8  bAuthKeyIndex;
-} __attribute__((packed));
-
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_BOS:  group of device-level capabilities */
-struct usb_bos_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__le16 wTotalLength;
-	__u8  bNumDeviceCaps;
-} __attribute__((packed));
-
-#define USB_DT_BOS_SIZE		5
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_DEVICE_CAPABILITY:  grouped with BOS */
-struct usb_dev_cap_header {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDevCapabilityType;
-} __attribute__((packed));
-
-#define	USB_CAP_TYPE_WIRELESS_USB	1
-
-struct usb_wireless_cap_descriptor {	/* Ultra Wide Band */
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDevCapabilityType;
-
-	__u8  bmAttributes;
-#define	USB_WIRELESS_P2P_DRD		(1 << 1)
-#define	USB_WIRELESS_BEACON_MASK	(3 << 2)
-#define	USB_WIRELESS_BEACON_SELF	(1 << 2)
-#define	USB_WIRELESS_BEACON_DIRECTED	(2 << 2)
-#define	USB_WIRELESS_BEACON_NONE	(3 << 2)
-	__le16 wPHYRates;	/* bit rates, Mbps */
-#define	USB_WIRELESS_PHY_53		(1 << 0)	/* always set */
-#define	USB_WIRELESS_PHY_80		(1 << 1)
-#define	USB_WIRELESS_PHY_107		(1 << 2)	/* always set */
-#define	USB_WIRELESS_PHY_160		(1 << 3)
-#define	USB_WIRELESS_PHY_200		(1 << 4)	/* always set */
-#define	USB_WIRELESS_PHY_320		(1 << 5)
-#define	USB_WIRELESS_PHY_400		(1 << 6)
-#define	USB_WIRELESS_PHY_480		(1 << 7)
-	__u8  bmTFITXPowerInfo;	/* TFI power levels */
-	__u8  bmFFITXPowerInfo;	/* FFI power levels */
-	__le16 bmBandGroup;
-	__u8  bReserved;
-} __attribute__((packed));
-
-/* USB 2.0 Extension descriptor */
-#define	USB_CAP_TYPE_EXT		2
-
-struct usb_ext_cap_descriptor {		/* Link Power Management */
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDevCapabilityType;
-	__le32 bmAttributes;
-#define USB_LPM_SUPPORT			(1 << 1)	/* supports LPM */
-#define USB_BESL_SUPPORT		(1 << 2)	/* supports BESL */
-#define USB_BESL_BASELINE_VALID		(1 << 3)	/* Baseline BESL valid*/
-#define USB_BESL_DEEP_VALID		(1 << 4)	/* Deep BESL valid */
-#define USB_GET_BESL_BASELINE(p)	(((p) & (0xf << 8)) >> 8)
-#define USB_GET_BESL_DEEP(p)		(((p) & (0xf << 12)) >> 12)
-} __attribute__((packed));
-
-#define USB_DT_USB_EXT_CAP_SIZE	7
-
-/*
- * SuperSpeed USB Capability descriptor: Defines the set of SuperSpeed USB
- * specific device level capabilities
- */
-#define		USB_SS_CAP_TYPE		3
-struct usb_ss_cap_descriptor {		/* Link Power Management */
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDevCapabilityType;
-	__u8  bmAttributes;
-#define USB_LTM_SUPPORT			(1 << 1) /* supports LTM */
-	__le16 wSpeedSupported;
-#define USB_LOW_SPEED_OPERATION		(1)	 /* Low speed operation */
-#define USB_FULL_SPEED_OPERATION	(1 << 1) /* Full speed operation */
-#define USB_HIGH_SPEED_OPERATION	(1 << 2) /* High speed operation */
-#define USB_5GBPS_OPERATION		(1 << 3) /* Operation at 5Gbps */
-	__u8  bFunctionalitySupport;
-	__u8  bU1devExitLat;
-	__le16 bU2DevExitLat;
-} __attribute__((packed));
-
-#define USB_DT_USB_SS_CAP_SIZE	10
-
-/*
- * Container ID Capability descriptor: Defines the instance unique ID used to
- * identify the instance across all operating modes
- */
-#define	CONTAINER_ID_TYPE	4
-struct usb_ss_container_id_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDevCapabilityType;
-	__u8  bReserved;
-	__u8  ContainerID[16]; /* 128-bit number */
-} __attribute__((packed));
-
-#define USB_DT_USB_SS_CONTN_ID_SIZE	20
-
-/*
- * SuperSpeed Plus USB Capability descriptor: Defines the set of
- * SuperSpeed Plus USB specific device level capabilities
- */
-#define	USB_SSP_CAP_TYPE	0xa
-struct usb_ssp_cap_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDevCapabilityType;
-	__u8  bReserved;
-	__le32 bmAttributes;
-#define USB_SSP_SUBLINK_SPEED_ATTRIBS	(0x1f << 0) /* sublink speed entries */
-#define USB_SSP_SUBLINK_SPEED_IDS	(0xf << 5)  /* speed ID entries */
-	__u16  wFunctionalitySupport;
-#define USB_SSP_MIN_SUBLINK_SPEED_ATTRIBUTE_ID	(0xf)
-#define USB_SSP_MIN_RX_LANE_COUNT		(0xf << 8)
-#define USB_SSP_MIN_TX_LANE_COUNT		(0xf << 12)
-	__le16 wReserved;
-	__le32 bmSublinkSpeedAttr[1]; /* list of sublink speed attrib entries */
-#define USB_SSP_SUBLINK_SPEED_SSID	(0xf)		/* sublink speed ID */
-#define USB_SSP_SUBLINK_SPEED_LSE	(0x3 << 4)	/* Lanespeed exponent */
-#define USB_SSP_SUBLINK_SPEED_ST	(0x3 << 6)	/* Sublink type */
-#define USB_SSP_SUBLINK_SPEED_RSVD	(0x3f << 8)	/* Reserved */
-#define USB_SSP_SUBLINK_SPEED_LP	(0x3 << 14)	/* Link protocol */
-#define USB_SSP_SUBLINK_SPEED_LSM	(0xff << 16)	/* Lanespeed mantissa */
-} __attribute__((packed));
-
-/*
- * Precision time measurement capability descriptor: advertised by devices and
- * hubs that support PTM
- */
-#define	USB_PTM_CAP_TYPE	0xb
-struct usb_ptm_cap_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDevCapabilityType;
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_DT_WIRELESS_ENDPOINT_COMP:  companion descriptor associated with
- * each endpoint descriptor for a wireless device
- */
-struct usb_wireless_ep_comp_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__u8  bMaxBurst;
-	__u8  bMaxSequence;
-	__le16 wMaxStreamDelay;
-	__le16 wOverTheAirPacketSize;
-	__u8  bOverTheAirInterval;
-	__u8  bmCompAttributes;
-#define USB_ENDPOINT_SWITCH_MASK	0x03	/* in bmCompAttributes */
-#define USB_ENDPOINT_SWITCH_NO		0
-#define USB_ENDPOINT_SWITCH_SWITCH	1
-#define USB_ENDPOINT_SWITCH_SCALE	2
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_REQ_SET_HANDSHAKE is a four-way handshake used between a wireless
- * host and a device for connection set up, mutual authentication, and
- * exchanging short lived session keys.  The handshake depends on a CC.
- */
-struct usb_handshake {
-	__u8 bMessageNumber;
-	__u8 bStatus;
-	__u8 tTKID[3];
-	__u8 bReserved;
-	__u8 CDID[16];
-	__u8 nonce[16];
-	__u8 MIC[8];
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB_REQ_SET_CONNECTION modifies or revokes a connection context (CC).
- * A CC may also be set up using non-wireless secure channels (including
- * wired USB!), and some devices may support CCs with multiple hosts.
- */
-struct usb_connection_context {
-	__u8 CHID[16];		/* persistent host id */
-	__u8 CDID[16];		/* device id (unique w/in host context) */
-	__u8 CK[16];		/* connection key */
-} __attribute__((packed));
-
-/*-------------------------------------------------------------------------*/
-
-/* USB 2.0 defines three speeds, here's how Linux identifies them */
-
-enum usb_device_speed {
-	USB_SPEED_UNKNOWN = 0,			/* enumerating */
-	USB_SPEED_LOW, USB_SPEED_FULL,		/* usb 1.1 */
-	USB_SPEED_HIGH,				/* usb 2.0 */
-	USB_SPEED_WIRELESS,			/* wireless (usb 2.5) */
-	USB_SPEED_SUPER,			/* usb 3.0 */
-	USB_SPEED_SUPER_PLUS,			/* usb 3.1 */
-};
-
-
-enum usb_device_state {
-	/* NOTATTACHED isn't in the USB spec, and this state acts
-	 * the same as ATTACHED ... but it's clearer this way.
-	 */
-	USB_STATE_NOTATTACHED = 0,
-
-	/* chapter 9 and authentication (wireless) device states */
-	USB_STATE_ATTACHED,
-	USB_STATE_POWERED,			/* wired */
-	USB_STATE_RECONNECTING,			/* auth */
-	USB_STATE_UNAUTHENTICATED,		/* auth */
-	USB_STATE_DEFAULT,			/* limited function */
-	USB_STATE_ADDRESS,
-	USB_STATE_CONFIGURED,			/* most functions */
-
-	USB_STATE_SUSPENDED
-
-	/* NOTE:  there are actually four different SUSPENDED
-	 * states, returning to POWERED, DEFAULT, ADDRESS, or
-	 * CONFIGURED respectively when SOF tokens flow again.
-	 * At this level there's no difference between L1 and L2
-	 * suspend states.  (L2 being original USB 1.1 suspend.)
-	 */
-};
-
-enum usb3_link_state {
-	USB3_LPM_U0 = 0,
-	USB3_LPM_U1,
-	USB3_LPM_U2,
-	USB3_LPM_U3
-};
-
-/*
- * A U1 timeout of 0x0 means the parent hub will reject any transitions to U1.
- * 0xff means the parent hub will accept transitions to U1, but will not
- * initiate a transition.
- *
- * A U1 timeout of 0x1 to 0x7F also causes the hub to initiate a transition to
- * U1 after that many microseconds.  Timeouts of 0x80 to 0xFE are reserved
- * values.
- *
- * A U2 timeout of 0x0 means the parent hub will reject any transitions to U2.
- * 0xff means the parent hub will accept transitions to U2, but will not
- * initiate a transition.
- *
- * A U2 timeout of 0x1 to 0xFE also causes the hub to initiate a transition to
- * U2 after N*256 microseconds.  Therefore a U2 timeout value of 0x1 means a U2
- * idle timer of 256 microseconds, 0x2 means 512 microseconds, 0xFE means
- * 65.024ms.
- */
-#define USB3_LPM_DISABLED		0x0
-#define USB3_LPM_U1_MAX_TIMEOUT		0x7F
-#define USB3_LPM_U2_MAX_TIMEOUT		0xFE
-#define USB3_LPM_DEVICE_INITIATED	0xFF
-
-struct usb_set_sel_req {
-	__u8	u1_sel;
-	__u8	u1_pel;
-	__le16	u2_sel;
-	__le16	u2_pel;
-} __attribute__ ((packed));
-
-/*
- * The Set System Exit Latency control transfer provides one byte each for
- * U1 SEL and U1 PEL, so the max exit latency is 0xFF.  U2 SEL and U2 PEL each
- * are two bytes long.
- */
-#define USB3_LPM_MAX_U1_SEL_PEL		0xFF
-#define USB3_LPM_MAX_U2_SEL_PEL		0xFFFF
-
-/*-------------------------------------------------------------------------*/
-
-/*
- * As per USB compliance update, a device that is actively drawing
- * more than 100mA from USB must report itself as bus-powered in
- * the GetStatus(DEVICE) call.
- * http://compliance.usb.org/index.asp?UpdateFile=Electrical&Format=Standard#34
- */
-#define USB_SELF_POWER_VBUS_MAX_DRAW		100
-
-#endif /* __LINUX_USB_CH9_H */
diff --git a/openflow/usr/include/linux/usb/functionfs.h b/openflow/usr/include/linux/usb/functionfs.h
deleted file mode 100644
index 3585d3c..0000000
--- a/openflow/usr/include/linux/usb/functionfs.h
+++ /dev/null
@@ -1,286 +0,0 @@
-#ifndef __LINUX_FUNCTIONFS_H__
-#define __LINUX_FUNCTIONFS_H__
-
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-#include <linux/usb/ch9.h>
-
-
-enum {
-	FUNCTIONFS_DESCRIPTORS_MAGIC = 1,
-	FUNCTIONFS_STRINGS_MAGIC = 2,
-	FUNCTIONFS_DESCRIPTORS_MAGIC_V2 = 3,
-};
-
-enum functionfs_flags {
-	FUNCTIONFS_HAS_FS_DESC = 1,
-	FUNCTIONFS_HAS_HS_DESC = 2,
-	FUNCTIONFS_HAS_SS_DESC = 4,
-	FUNCTIONFS_HAS_MS_OS_DESC = 8,
-	FUNCTIONFS_VIRTUAL_ADDR = 16,
-	FUNCTIONFS_EVENTFD = 32,
-};
-
-/* Descriptor of an non-audio endpoint */
-struct usb_endpoint_descriptor_no_audio {
-	__u8  bLength;
-	__u8  bDescriptorType;
-
-	__u8  bEndpointAddress;
-	__u8  bmAttributes;
-	__le16 wMaxPacketSize;
-	__u8  bInterval;
-} __attribute__((packed));
-
-struct usb_functionfs_descs_head_v2 {
-	__le32 magic;
-	__le32 length;
-	__le32 flags;
-	/*
-	 * __le32 fs_count, hs_count, fs_count; must be included manually in
-	 * the structure taking flags into consideration.
-	 */
-} __attribute__((packed));
-
-/* Legacy format, deprecated as of 3.14. */
-struct usb_functionfs_descs_head {
-	__le32 magic;
-	__le32 length;
-	__le32 fs_count;
-	__le32 hs_count;
-} __attribute__((packed, deprecated));
-
-/* MS OS Descriptor header */
-struct usb_os_desc_header {
-	__u8	interface;
-	__le32	dwLength;
-	__le16	bcdVersion;
-	__le16	wIndex;
-	union {
-		struct {
-			__u8	bCount;
-			__u8	Reserved;
-		};
-		__le16	wCount;
-	};
-} __attribute__((packed));
-
-struct usb_ext_compat_desc {
-	__u8	bFirstInterfaceNumber;
-	__u8	Reserved1;
-	__u8	CompatibleID[8];
-	__u8	SubCompatibleID[8];
-	__u8	Reserved2[6];
-};
-
-struct usb_ext_prop_desc {
-	__le32	dwSize;
-	__le32	dwPropertyDataType;
-	__le16	wPropertyNameLength;
-} __attribute__((packed));
-
-
-/*
- * Descriptors format:
- *
- * | off | name      | type         | description                          |
- * |-----+-----------+--------------+--------------------------------------|
- * |   0 | magic     | LE32         | FUNCTIONFS_DESCRIPTORS_MAGIC_V2      |
- * |   4 | length    | LE32         | length of the whole data chunk       |
- * |   8 | flags     | LE32         | combination of functionfs_flags      |
- * |     | fs_count  | LE32         | number of full-speed descriptors     |
- * |     | hs_count  | LE32         | number of high-speed descriptors     |
- * |     | ss_count  | LE32         | number of super-speed descriptors    |
- * |     | os_count  | LE32         | number of MS OS descriptors          |
- * |     | fs_descrs | Descriptor[] | list of full-speed descriptors       |
- * |     | hs_descrs | Descriptor[] | list of high-speed descriptors       |
- * |     | ss_descrs | Descriptor[] | list of super-speed descriptors      |
- * |     | os_descrs | OSDesc[]     | list of MS OS descriptors            |
- *
- * Depending on which flags are set, various fields may be missing in the
- * structure.  Any flags that are not recognised cause the whole block to be
- * rejected with -ENOSYS.
- *
- * Legacy descriptors format (deprecated as of 3.14):
- *
- * | off | name      | type         | description                          |
- * |-----+-----------+--------------+--------------------------------------|
- * |   0 | magic     | LE32         | FUNCTIONFS_DESCRIPTORS_MAGIC         |
- * |   4 | length    | LE32         | length of the whole data chunk       |
- * |   8 | fs_count  | LE32         | number of full-speed descriptors     |
- * |  12 | hs_count  | LE32         | number of high-speed descriptors     |
- * |  16 | fs_descrs | Descriptor[] | list of full-speed descriptors       |
- * |     | hs_descrs | Descriptor[] | list of high-speed descriptors       |
- *
- * All numbers must be in little endian order.
- *
- * Descriptor[] is an array of valid USB descriptors which have the following
- * format:
- *
- * | off | name            | type | description              |
- * |-----+-----------------+------+--------------------------|
- * |   0 | bLength         | U8   | length of the descriptor |
- * |   1 | bDescriptorType | U8   | descriptor type          |
- * |   2 | payload         |      | descriptor's payload     |
- *
- * OSDesc[] is an array of valid MS OS Feature Descriptors which have one of
- * the following formats:
- *
- * | off | name            | type | description              |
- * |-----+-----------------+------+--------------------------|
- * |   0 | inteface        | U8   | related interface number |
- * |   1 | dwLength        | U32  | length of the descriptor |
- * |   5 | bcdVersion      | U16  | currently supported: 1   |
- * |   7 | wIndex          | U16  | currently supported: 4   |
- * |   9 | bCount          | U8   | number of ext. compat.   |
- * |  10 | Reserved        | U8   | 0                        |
- * |  11 | ExtCompat[]     |      | list of ext. compat. d.  |
- *
- * | off | name            | type | description              |
- * |-----+-----------------+------+--------------------------|
- * |   0 | inteface        | U8   | related interface number |
- * |   1 | dwLength        | U32  | length of the descriptor |
- * |   5 | bcdVersion      | U16  | currently supported: 1   |
- * |   7 | wIndex          | U16  | currently supported: 5   |
- * |   9 | wCount          | U16  | number of ext. compat.   |
- * |  11 | ExtProp[]       |      | list of ext. prop. d.    |
- *
- * ExtCompat[] is an array of valid Extended Compatiblity descriptors
- * which have the following format:
- *
- * | off | name                  | type | description                         |
- * |-----+-----------------------+------+-------------------------------------|
- * |   0 | bFirstInterfaceNumber | U8   | index of the interface or of the 1st|
- * |     |                       |      | interface in an IAD group           |
- * |   1 | Reserved              | U8   | 0                                   |
- * |   2 | CompatibleID          | U8[8]| compatible ID string                |
- * |  10 | SubCompatibleID       | U8[8]| subcompatible ID string             |
- * |  18 | Reserved              | U8[6]| 0                                   |
- *
- * ExtProp[] is an array of valid Extended Properties descriptors
- * which have the following format:
- *
- * | off | name                  | type | description                         |
- * |-----+-----------------------+------+-------------------------------------|
- * |   0 | dwSize                | U32  | length of the descriptor            |
- * |   4 | dwPropertyDataType    | U32  | 1..7                                |
- * |   8 | wPropertyNameLength   | U16  | bPropertyName length (NL)           |
- * |  10 | bPropertyName         |U8[NL]| name of this property               |
- * |10+NL| dwPropertyDataLength  | U32  | bPropertyData length (DL)           |
- * |14+NL| bProperty             |U8[DL]| payload of this property            |
- */
-
-struct usb_functionfs_strings_head {
-	__le32 magic;
-	__le32 length;
-	__le32 str_count;
-	__le32 lang_count;
-} __attribute__((packed));
-
-/*
- * Strings format:
- *
- * | off | name       | type                  | description                |
- * |-----+------------+-----------------------+----------------------------|
- * |   0 | magic      | LE32                  | FUNCTIONFS_STRINGS_MAGIC   |
- * |   4 | length     | LE32                  | length of the data chunk   |
- * |   8 | str_count  | LE32                  | number of strings          |
- * |  12 | lang_count | LE32                  | number of languages        |
- * |  16 | stringtab  | StringTab[lang_count] | table of strings per lang  |
- *
- * For each language there is one stringtab entry (ie. there are lang_count
- * stringtab entires).  Each StringTab has following format:
- *
- * | off | name    | type              | description                        |
- * |-----+---------+-------------------+------------------------------------|
- * |   0 | lang    | LE16              | language code                      |
- * |   2 | strings | String[str_count] | array of strings in given language |
- *
- * For each string there is one strings entry (ie. there are str_count
- * string entries).  Each String is a NUL terminated string encoded in
- * UTF-8.
- */
-
-
-
-/*
- * Events are delivered on the ep0 file descriptor, when the user mode driver
- * reads from this file descriptor after writing the descriptors.  Don't
- * stop polling this descriptor.
- */
-
-enum usb_functionfs_event_type {
-	FUNCTIONFS_BIND,
-	FUNCTIONFS_UNBIND,
-
-	FUNCTIONFS_ENABLE,
-	FUNCTIONFS_DISABLE,
-
-	FUNCTIONFS_SETUP,
-
-	FUNCTIONFS_SUSPEND,
-	FUNCTIONFS_RESUME
-};
-
-/* NOTE:  this structure must stay the same size and layout on
- * both 32-bit and 64-bit kernels.
- */
-struct usb_functionfs_event {
-	union {
-		/* SETUP: packet; DATA phase i/o precedes next event
-		 *(setup.bmRequestType & USB_DIR_IN) flags direction */
-		struct usb_ctrlrequest	setup;
-	} __attribute__((packed)) u;
-
-	/* enum usb_functionfs_event_type */
-	__u8				type;
-	__u8				_pad[3];
-} __attribute__((packed));
-
-
-/* Endpoint ioctls */
-/* The same as in gadgetfs */
-
-/* IN transfers may be reported to the gadget driver as complete
- *	when the fifo is loaded, before the host reads the data;
- * OUT transfers may be reported to the host's "client" driver as
- *	complete when they're sitting in the FIFO unread.
- * THIS returns how many bytes are "unclaimed" in the endpoint fifo
- * (needed for precise fault handling, when the hardware allows it)
- */
-#define	FUNCTIONFS_FIFO_STATUS	_IO('g', 1)
-
-/* discards any unclaimed data in the fifo. */
-#define	FUNCTIONFS_FIFO_FLUSH	_IO('g', 2)
-
-/* resets endpoint halt+toggle; used to implement set_interface.
- * some hardware (like pxa2xx) can't support this.
- */
-#define	FUNCTIONFS_CLEAR_HALT	_IO('g', 3)
-
-/* Specific for functionfs */
-
-/*
- * Returns reverse mapping of an interface.  Called on EP0.  If there
- * is no such interface returns -EDOM.  If function is not active
- * returns -ENODEV.
- */
-#define	FUNCTIONFS_INTERFACE_REVMAP	_IO('g', 128)
-
-/*
- * Returns real bEndpointAddress of an endpoint.  If function is not
- * active returns -ENODEV.
- */
-#define	FUNCTIONFS_ENDPOINT_REVMAP	_IO('g', 129)
-
-/*
- * Returns endpoint descriptor. If function is not active returns -ENODEV.
- */
-#define	FUNCTIONFS_ENDPOINT_DESC	_IOR('g', 130, \
-					     struct usb_endpoint_descriptor)
-
-
-
-#endif /* __LINUX_FUNCTIONFS_H__ */
diff --git a/openflow/usr/include/linux/usb/g_printer.h b/openflow/usr/include/linux/usb/g_printer.h
deleted file mode 100644
index 6178fde..0000000
--- a/openflow/usr/include/linux/usb/g_printer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * g_printer.h -- Header file for USB Printer gadget driver
- *
- * Copyright (C) 2007 Craig W. Nadler
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __LINUX_USB_G_PRINTER_H
-#define __LINUX_USB_G_PRINTER_H
-
-#define PRINTER_NOT_ERROR	0x08
-#define PRINTER_SELECTED	0x10
-#define PRINTER_PAPER_EMPTY	0x20
-
-/* The 'g' code is also used by gadgetfs ioctl requests.
- * Don't add any colliding codes to either driver, and keep
- * them in unique ranges (size 0x20 for now).
- */
-#define GADGET_GET_PRINTER_STATUS	_IOR('g', 0x21, unsigned char)
-#define GADGET_SET_PRINTER_STATUS	_IOWR('g', 0x22, unsigned char)
-
-#endif /* __LINUX_USB_G_PRINTER_H */
diff --git a/openflow/usr/include/linux/usb/gadgetfs.h b/openflow/usr/include/linux/usb/gadgetfs.h
deleted file mode 100644
index 0bb12e0..0000000
--- a/openflow/usr/include/linux/usb/gadgetfs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Filesystem based user-mode API to USB Gadget controller hardware
- *
- * Other than ep0 operations, most things are done by read() and write()
- * on endpoint files found in one directory.  They are configured by
- * writing descriptors, and then may be used for normal stream style
- * i/o requests.  When ep0 is configured, the device can enumerate;
- * when it's closed, the device disconnects from usb.  Operations on
- * ep0 require ioctl() operations.
- *
- * Configuration and device descriptors get written to /dev/gadget/$CHIP,
- * which may then be used to read usb_gadgetfs_event structs.  The driver
- * may activate endpoints as it handles SET_CONFIGURATION setup events,
- * or earlier; writing endpoint descriptors to /dev/gadget/$ENDPOINT
- * then performing data transfers by reading or writing.
- */
-
-#ifndef __LINUX_USB_GADGETFS_H
-#define __LINUX_USB_GADGETFS_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-#include <linux/usb/ch9.h>
-
-/*
- * Events are delivered on the ep0 file descriptor, when the user mode driver
- * reads from this file descriptor after writing the descriptors.  Don't
- * stop polling this descriptor.
- */
-
-enum usb_gadgetfs_event_type {
-	GADGETFS_NOP = 0,
-
-	GADGETFS_CONNECT,
-	GADGETFS_DISCONNECT,
-	GADGETFS_SETUP,
-	GADGETFS_SUSPEND,
-	/* and likely more ! */
-};
-
-/* NOTE:  this structure must stay the same size and layout on
- * both 32-bit and 64-bit kernels.
- */
-struct usb_gadgetfs_event {
-	union {
-		/* NOP, DISCONNECT, SUSPEND: nothing
-		 * ... some hardware can't report disconnection
-		 */
-
-		/* CONNECT: just the speed */
-		enum usb_device_speed	speed;
-
-		/* SETUP: packet; DATA phase i/o precedes next event
-		 *(setup.bmRequestType & USB_DIR_IN) flags direction
-		 * ... includes SET_CONFIGURATION, SET_INTERFACE
-		 */
-		struct usb_ctrlrequest	setup;
-	} u;
-	enum usb_gadgetfs_event_type	type;
-};
-
-
-/* The 'g' code is also used by printer gadget ioctl requests.
- * Don't add any colliding codes to either driver, and keep
- * them in unique ranges (size 0x20 for now).
- */
-
-/* endpoint ioctls */
-
-/* IN transfers may be reported to the gadget driver as complete
- *	when the fifo is loaded, before the host reads the data;
- * OUT transfers may be reported to the host's "client" driver as
- *	complete when they're sitting in the FIFO unread.
- * THIS returns how many bytes are "unclaimed" in the endpoint fifo
- * (needed for precise fault handling, when the hardware allows it)
- */
-#define	GADGETFS_FIFO_STATUS	_IO('g', 1)
-
-/* discards any unclaimed data in the fifo. */
-#define	GADGETFS_FIFO_FLUSH	_IO('g', 2)
-
-/* resets endpoint halt+toggle; used to implement set_interface.
- * some hardware (like pxa2xx) can't support this.
- */
-#define	GADGETFS_CLEAR_HALT	_IO('g', 3)
-
-#endif /* __LINUX_USB_GADGETFS_H */
diff --git a/openflow/usr/include/linux/usb/midi.h b/openflow/usr/include/linux/usb/midi.h
deleted file mode 100644
index c8c52e3..0000000
--- a/openflow/usr/include/linux/usb/midi.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * <linux/usb/midi.h> -- USB MIDI definitions.
- *
- * Copyright (C) 2006 Thumtronics Pty Ltd.
- * Developed for Thumtronics by Grey Innovation
- * Ben Williamson <ben.williamson@greyinnovation.com>
- *
- * This software is distributed under the terms of the GNU General Public
- * License ("GPL") version 2, as published by the Free Software Foundation.
- *
- * This file holds USB constants and structures defined
- * by the USB Device Class Definition for MIDI Devices.
- * Comments below reference relevant sections of that document:
- *
- * http://www.usb.org/developers/devclass_docs/midi10.pdf
- */
-
-#ifndef __LINUX_USB_MIDI_H
-#define __LINUX_USB_MIDI_H
-
-#include <linux/types.h>
-
-/* A.1  MS Class-Specific Interface Descriptor Subtypes */
-#define USB_MS_HEADER		0x01
-#define USB_MS_MIDI_IN_JACK	0x02
-#define USB_MS_MIDI_OUT_JACK	0x03
-#define USB_MS_ELEMENT		0x04
-
-/* A.2  MS Class-Specific Endpoint Descriptor Subtypes */
-#define USB_MS_GENERAL		0x01
-
-/* A.3  MS MIDI IN and OUT Jack Types */
-#define USB_MS_EMBEDDED		0x01
-#define USB_MS_EXTERNAL		0x02
-
-/* 6.1.2.1  Class-Specific MS Interface Header Descriptor */
-struct usb_ms_header_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubtype;
-	__le16 bcdMSC;
-	__le16 wTotalLength;
-} __attribute__ ((packed));
-
-#define USB_DT_MS_HEADER_SIZE	7
-
-/* 6.1.2.2  MIDI IN Jack Descriptor */
-struct usb_midi_in_jack_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;		/* USB_DT_CS_INTERFACE */
-	__u8  bDescriptorSubtype;	/* USB_MS_MIDI_IN_JACK */
-	__u8  bJackType;		/* USB_MS_EMBEDDED/EXTERNAL */
-	__u8  bJackID;
-	__u8  iJack;
-} __attribute__ ((packed));
-
-#define USB_DT_MIDI_IN_SIZE	6
-
-struct usb_midi_source_pin {
-	__u8  baSourceID;
-	__u8  baSourcePin;
-} __attribute__ ((packed));
-
-/* 6.1.2.3  MIDI OUT Jack Descriptor */
-struct usb_midi_out_jack_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;		/* USB_DT_CS_INTERFACE */
-	__u8  bDescriptorSubtype;	/* USB_MS_MIDI_OUT_JACK */
-	__u8  bJackType;		/* USB_MS_EMBEDDED/EXTERNAL */
-	__u8  bJackID;
-	__u8  bNrInputPins;		/* p */
-	struct usb_midi_source_pin pins[]; /* [p] */
-	/*__u8  iJack;  -- omitted due to variable-sized pins[] */
-} __attribute__ ((packed));
-
-#define USB_DT_MIDI_OUT_SIZE(p)	(7 + 2 * (p))
-
-/* As above, but more useful for defining your own descriptors: */
-#define DECLARE_USB_MIDI_OUT_JACK_DESCRIPTOR(p)			\
-struct usb_midi_out_jack_descriptor_##p {			\
-	__u8  bLength;						\
-	__u8  bDescriptorType;					\
-	__u8  bDescriptorSubtype;				\
-	__u8  bJackType;					\
-	__u8  bJackID;						\
-	__u8  bNrInputPins;					\
-	struct usb_midi_source_pin pins[p];			\
-	__u8  iJack;						\
-} __attribute__ ((packed))
-
-/* 6.2.2  Class-Specific MS Bulk Data Endpoint Descriptor */
-struct usb_ms_endpoint_descriptor {
-	__u8  bLength;			/* 4+n */
-	__u8  bDescriptorType;		/* USB_DT_CS_ENDPOINT */
-	__u8  bDescriptorSubtype;	/* USB_MS_GENERAL */
-	__u8  bNumEmbMIDIJack;		/* n */
-	__u8  baAssocJackID[];		/* [n] */
-} __attribute__ ((packed));
-
-#define USB_DT_MS_ENDPOINT_SIZE(n)	(4 + (n))
-
-/* As above, but more useful for defining your own descriptors: */
-#define DECLARE_USB_MS_ENDPOINT_DESCRIPTOR(n)			\
-struct usb_ms_endpoint_descriptor_##n {				\
-	__u8  bLength;						\
-	__u8  bDescriptorType;					\
-	__u8  bDescriptorSubtype;				\
-	__u8  bNumEmbMIDIJack;					\
-	__u8  baAssocJackID[n];					\
-} __attribute__ ((packed))
-
-#endif /* __LINUX_USB_MIDI_H */
diff --git a/openflow/usr/include/linux/usb/tmc.h b/openflow/usr/include/linux/usb/tmc.h
deleted file mode 100644
index c045ae1..0000000
--- a/openflow/usr/include/linux/usb/tmc.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2007 Stefan Kopp, Gechingen, Germany
- * Copyright (C) 2008 Novell, Inc.
- * Copyright (C) 2008 Greg Kroah-Hartman <gregkh@suse.de>
- *
- * This file holds USB constants defined by the USB Device Class
- * Definition for Test and Measurement devices published by the USB-IF.
- *
- * It also has the ioctl definitions for the usbtmc kernel driver that
- * userspace needs to know about.
- */
-
-#ifndef __LINUX_USB_TMC_H
-#define __LINUX_USB_TMC_H
-
-/* USB TMC status values */
-#define USBTMC_STATUS_SUCCESS				0x01
-#define USBTMC_STATUS_PENDING				0x02
-#define USBTMC_STATUS_FAILED				0x80
-#define USBTMC_STATUS_TRANSFER_NOT_IN_PROGRESS		0x81
-#define USBTMC_STATUS_SPLIT_NOT_IN_PROGRESS		0x82
-#define USBTMC_STATUS_SPLIT_IN_PROGRESS			0x83
-
-/* USB TMC requests values */
-#define USBTMC_REQUEST_INITIATE_ABORT_BULK_OUT		1
-#define USBTMC_REQUEST_CHECK_ABORT_BULK_OUT_STATUS	2
-#define USBTMC_REQUEST_INITIATE_ABORT_BULK_IN		3
-#define USBTMC_REQUEST_CHECK_ABORT_BULK_IN_STATUS	4
-#define USBTMC_REQUEST_INITIATE_CLEAR			5
-#define USBTMC_REQUEST_CHECK_CLEAR_STATUS		6
-#define USBTMC_REQUEST_GET_CAPABILITIES			7
-#define USBTMC_REQUEST_INDICATOR_PULSE			64
-
-/* Request values for USBTMC driver's ioctl entry point */
-#define USBTMC_IOC_NR			91
-#define USBTMC_IOCTL_INDICATOR_PULSE	_IO(USBTMC_IOC_NR, 1)
-#define USBTMC_IOCTL_CLEAR		_IO(USBTMC_IOC_NR, 2)
-#define USBTMC_IOCTL_ABORT_BULK_OUT	_IO(USBTMC_IOC_NR, 3)
-#define USBTMC_IOCTL_ABORT_BULK_IN	_IO(USBTMC_IOC_NR, 4)
-#define USBTMC_IOCTL_CLEAR_OUT_HALT	_IO(USBTMC_IOC_NR, 6)
-#define USBTMC_IOCTL_CLEAR_IN_HALT	_IO(USBTMC_IOC_NR, 7)
-
-#endif
diff --git a/openflow/usr/include/linux/usb/video.h b/openflow/usr/include/linux/usb/video.h
deleted file mode 100644
index 3b3b95e..0000000
--- a/openflow/usr/include/linux/usb/video.h
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * USB Video Class definitions.
- *
- * Copyright (C) 2009 Laurent Pinchart <laurent.pinchart@skynet.be>
- *
- * This file holds USB constants and structures defined by the USB Device
- * Class Definition for Video Devices. Unless otherwise stated, comments
- * below reference relevant sections of the USB Video Class 1.1 specification
- * available at
- *
- * http://www.usb.org/developers/devclass_docs/USB_Video_Class_1_1.zip
- */
-
-#ifndef __LINUX_USB_VIDEO_H
-#define __LINUX_USB_VIDEO_H
-
-#include <linux/types.h>
-
-/* --------------------------------------------------------------------------
- * UVC constants
- */
-
-/* A.2. Video Interface Subclass Codes */
-#define UVC_SC_UNDEFINED				0x00
-#define UVC_SC_VIDEOCONTROL				0x01
-#define UVC_SC_VIDEOSTREAMING				0x02
-#define UVC_SC_VIDEO_INTERFACE_COLLECTION		0x03
-
-/* A.3. Video Interface Protocol Codes */
-#define UVC_PC_PROTOCOL_UNDEFINED			0x00
-
-/* A.5. Video Class-Specific VC Interface Descriptor Subtypes */
-#define UVC_VC_DESCRIPTOR_UNDEFINED			0x00
-#define UVC_VC_HEADER					0x01
-#define UVC_VC_INPUT_TERMINAL				0x02
-#define UVC_VC_OUTPUT_TERMINAL				0x03
-#define UVC_VC_SELECTOR_UNIT				0x04
-#define UVC_VC_PROCESSING_UNIT				0x05
-#define UVC_VC_EXTENSION_UNIT				0x06
-
-/* A.6. Video Class-Specific VS Interface Descriptor Subtypes */
-#define UVC_VS_UNDEFINED				0x00
-#define UVC_VS_INPUT_HEADER				0x01
-#define UVC_VS_OUTPUT_HEADER				0x02
-#define UVC_VS_STILL_IMAGE_FRAME			0x03
-#define UVC_VS_FORMAT_UNCOMPRESSED			0x04
-#define UVC_VS_FRAME_UNCOMPRESSED			0x05
-#define UVC_VS_FORMAT_MJPEG				0x06
-#define UVC_VS_FRAME_MJPEG				0x07
-#define UVC_VS_FORMAT_MPEG2TS				0x0a
-#define UVC_VS_FORMAT_DV				0x0c
-#define UVC_VS_COLORFORMAT				0x0d
-#define UVC_VS_FORMAT_FRAME_BASED			0x10
-#define UVC_VS_FRAME_FRAME_BASED			0x11
-#define UVC_VS_FORMAT_STREAM_BASED			0x12
-
-/* A.7. Video Class-Specific Endpoint Descriptor Subtypes */
-#define UVC_EP_UNDEFINED				0x00
-#define UVC_EP_GENERAL					0x01
-#define UVC_EP_ENDPOINT					0x02
-#define UVC_EP_INTERRUPT				0x03
-
-/* A.8. Video Class-Specific Request Codes */
-#define UVC_RC_UNDEFINED				0x00
-#define UVC_SET_CUR					0x01
-#define UVC_GET_CUR					0x81
-#define UVC_GET_MIN					0x82
-#define UVC_GET_MAX					0x83
-#define UVC_GET_RES					0x84
-#define UVC_GET_LEN					0x85
-#define UVC_GET_INFO					0x86
-#define UVC_GET_DEF					0x87
-
-/* A.9.1. VideoControl Interface Control Selectors */
-#define UVC_VC_CONTROL_UNDEFINED			0x00
-#define UVC_VC_VIDEO_POWER_MODE_CONTROL			0x01
-#define UVC_VC_REQUEST_ERROR_CODE_CONTROL		0x02
-
-/* A.9.2. Terminal Control Selectors */
-#define UVC_TE_CONTROL_UNDEFINED			0x00
-
-/* A.9.3. Selector Unit Control Selectors */
-#define UVC_SU_CONTROL_UNDEFINED			0x00
-#define UVC_SU_INPUT_SELECT_CONTROL			0x01
-
-/* A.9.4. Camera Terminal Control Selectors */
-#define UVC_CT_CONTROL_UNDEFINED			0x00
-#define UVC_CT_SCANNING_MODE_CONTROL			0x01
-#define UVC_CT_AE_MODE_CONTROL				0x02
-#define UVC_CT_AE_PRIORITY_CONTROL			0x03
-#define UVC_CT_EXPOSURE_TIME_ABSOLUTE_CONTROL		0x04
-#define UVC_CT_EXPOSURE_TIME_RELATIVE_CONTROL		0x05
-#define UVC_CT_FOCUS_ABSOLUTE_CONTROL			0x06
-#define UVC_CT_FOCUS_RELATIVE_CONTROL			0x07
-#define UVC_CT_FOCUS_AUTO_CONTROL			0x08
-#define UVC_CT_IRIS_ABSOLUTE_CONTROL			0x09
-#define UVC_CT_IRIS_RELATIVE_CONTROL			0x0a
-#define UVC_CT_ZOOM_ABSOLUTE_CONTROL			0x0b
-#define UVC_CT_ZOOM_RELATIVE_CONTROL			0x0c
-#define UVC_CT_PANTILT_ABSOLUTE_CONTROL			0x0d
-#define UVC_CT_PANTILT_RELATIVE_CONTROL			0x0e
-#define UVC_CT_ROLL_ABSOLUTE_CONTROL			0x0f
-#define UVC_CT_ROLL_RELATIVE_CONTROL			0x10
-#define UVC_CT_PRIVACY_CONTROL				0x11
-
-/* A.9.5. Processing Unit Control Selectors */
-#define UVC_PU_CONTROL_UNDEFINED			0x00
-#define UVC_PU_BACKLIGHT_COMPENSATION_CONTROL		0x01
-#define UVC_PU_BRIGHTNESS_CONTROL			0x02
-#define UVC_PU_CONTRAST_CONTROL				0x03
-#define UVC_PU_GAIN_CONTROL				0x04
-#define UVC_PU_POWER_LINE_FREQUENCY_CONTROL		0x05
-#define UVC_PU_HUE_CONTROL				0x06
-#define UVC_PU_SATURATION_CONTROL			0x07
-#define UVC_PU_SHARPNESS_CONTROL			0x08
-#define UVC_PU_GAMMA_CONTROL				0x09
-#define UVC_PU_WHITE_BALANCE_TEMPERATURE_CONTROL	0x0a
-#define UVC_PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL	0x0b
-#define UVC_PU_WHITE_BALANCE_COMPONENT_CONTROL		0x0c
-#define UVC_PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL	0x0d
-#define UVC_PU_DIGITAL_MULTIPLIER_CONTROL		0x0e
-#define UVC_PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL		0x0f
-#define UVC_PU_HUE_AUTO_CONTROL				0x10
-#define UVC_PU_ANALOG_VIDEO_STANDARD_CONTROL		0x11
-#define UVC_PU_ANALOG_LOCK_STATUS_CONTROL		0x12
-
-/* A.9.7. VideoStreaming Interface Control Selectors */
-#define UVC_VS_CONTROL_UNDEFINED			0x00
-#define UVC_VS_PROBE_CONTROL				0x01
-#define UVC_VS_COMMIT_CONTROL				0x02
-#define UVC_VS_STILL_PROBE_CONTROL			0x03
-#define UVC_VS_STILL_COMMIT_CONTROL			0x04
-#define UVC_VS_STILL_IMAGE_TRIGGER_CONTROL		0x05
-#define UVC_VS_STREAM_ERROR_CODE_CONTROL		0x06
-#define UVC_VS_GENERATE_KEY_FRAME_CONTROL		0x07
-#define UVC_VS_UPDATE_FRAME_SEGMENT_CONTROL		0x08
-#define UVC_VS_SYNC_DELAY_CONTROL			0x09
-
-/* B.1. USB Terminal Types */
-#define UVC_TT_VENDOR_SPECIFIC				0x0100
-#define UVC_TT_STREAMING				0x0101
-
-/* B.2. Input Terminal Types */
-#define UVC_ITT_VENDOR_SPECIFIC				0x0200
-#define UVC_ITT_CAMERA					0x0201
-#define UVC_ITT_MEDIA_TRANSPORT_INPUT			0x0202
-
-/* B.3. Output Terminal Types */
-#define UVC_OTT_VENDOR_SPECIFIC				0x0300
-#define UVC_OTT_DISPLAY					0x0301
-#define UVC_OTT_MEDIA_TRANSPORT_OUTPUT			0x0302
-
-/* B.4. External Terminal Types */
-#define UVC_EXTERNAL_VENDOR_SPECIFIC			0x0400
-#define UVC_COMPOSITE_CONNECTOR				0x0401
-#define UVC_SVIDEO_CONNECTOR				0x0402
-#define UVC_COMPONENT_CONNECTOR				0x0403
-
-/* 2.4.2.2. Status Packet Type */
-#define UVC_STATUS_TYPE_CONTROL				1
-#define UVC_STATUS_TYPE_STREAMING			2
-
-/* 2.4.3.3. Payload Header Information */
-#define UVC_STREAM_EOH					(1 << 7)
-#define UVC_STREAM_ERR					(1 << 6)
-#define UVC_STREAM_STI					(1 << 5)
-#define UVC_STREAM_RES					(1 << 4)
-#define UVC_STREAM_SCR					(1 << 3)
-#define UVC_STREAM_PTS					(1 << 2)
-#define UVC_STREAM_EOF					(1 << 1)
-#define UVC_STREAM_FID					(1 << 0)
-
-/* 4.1.2. Control Capabilities */
-#define UVC_CONTROL_CAP_GET				(1 << 0)
-#define UVC_CONTROL_CAP_SET				(1 << 1)
-#define UVC_CONTROL_CAP_DISABLED			(1 << 2)
-#define UVC_CONTROL_CAP_AUTOUPDATE			(1 << 3)
-#define UVC_CONTROL_CAP_ASYNCHRONOUS			(1 << 4)
-
-/* ------------------------------------------------------------------------
- * UVC structures
- */
-
-/* All UVC descriptors have these 3 fields at the beginning */
-struct uvc_descriptor_header {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-} __attribute__((packed));
-
-/* 3.7.2. Video Control Interface Header Descriptor */
-struct uvc_header_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u16 bcdUVC;
-	__u16 wTotalLength;
-	__u32 dwClockFrequency;
-	__u8  bInCollection;
-	__u8  baInterfaceNr[];
-} __attribute__((__packed__));
-
-#define UVC_DT_HEADER_SIZE(n)				(12+(n))
-
-#define UVC_HEADER_DESCRIPTOR(n) \
-	uvc_header_descriptor_##n
-
-#define DECLARE_UVC_HEADER_DESCRIPTOR(n)		\
-struct UVC_HEADER_DESCRIPTOR(n) {			\
-	__u8  bLength;					\
-	__u8  bDescriptorType;				\
-	__u8  bDescriptorSubType;			\
-	__u16 bcdUVC;					\
-	__u16 wTotalLength;				\
-	__u32 dwClockFrequency;				\
-	__u8  bInCollection;				\
-	__u8  baInterfaceNr[n];				\
-} __attribute__ ((packed))
-
-/* 3.7.2.1. Input Terminal Descriptor */
-struct uvc_input_terminal_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bTerminalID;
-	__u16 wTerminalType;
-	__u8  bAssocTerminal;
-	__u8  iTerminal;
-} __attribute__((__packed__));
-
-#define UVC_DT_INPUT_TERMINAL_SIZE			8
-
-/* 3.7.2.2. Output Terminal Descriptor */
-struct uvc_output_terminal_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bTerminalID;
-	__u16 wTerminalType;
-	__u8  bAssocTerminal;
-	__u8  bSourceID;
-	__u8  iTerminal;
-} __attribute__((__packed__));
-
-#define UVC_DT_OUTPUT_TERMINAL_SIZE			9
-
-/* 3.7.2.3. Camera Terminal Descriptor */
-struct uvc_camera_terminal_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bTerminalID;
-	__u16 wTerminalType;
-	__u8  bAssocTerminal;
-	__u8  iTerminal;
-	__u16 wObjectiveFocalLengthMin;
-	__u16 wObjectiveFocalLengthMax;
-	__u16 wOcularFocalLength;
-	__u8  bControlSize;
-	__u8  bmControls[3];
-} __attribute__((__packed__));
-
-#define UVC_DT_CAMERA_TERMINAL_SIZE(n)			(15+(n))
-
-/* 3.7.2.4. Selector Unit Descriptor */
-struct uvc_selector_unit_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bUnitID;
-	__u8  bNrInPins;
-	__u8  baSourceID[0];
-	__u8  iSelector;
-} __attribute__((__packed__));
-
-#define UVC_DT_SELECTOR_UNIT_SIZE(n)			(6+(n))
-
-#define UVC_SELECTOR_UNIT_DESCRIPTOR(n)	\
-	uvc_selector_unit_descriptor_##n
-
-#define DECLARE_UVC_SELECTOR_UNIT_DESCRIPTOR(n)	\
-struct UVC_SELECTOR_UNIT_DESCRIPTOR(n) {		\
-	__u8  bLength;					\
-	__u8  bDescriptorType;				\
-	__u8  bDescriptorSubType;			\
-	__u8  bUnitID;					\
-	__u8  bNrInPins;				\
-	__u8  baSourceID[n];				\
-	__u8  iSelector;				\
-} __attribute__ ((packed))
-
-/* 3.7.2.5. Processing Unit Descriptor */
-struct uvc_processing_unit_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bUnitID;
-	__u8  bSourceID;
-	__u16 wMaxMultiplier;
-	__u8  bControlSize;
-	__u8  bmControls[2];
-	__u8  iProcessing;
-} __attribute__((__packed__));
-
-#define UVC_DT_PROCESSING_UNIT_SIZE(n)			(9+(n))
-
-/* 3.7.2.6. Extension Unit Descriptor */
-struct uvc_extension_unit_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bUnitID;
-	__u8  guidExtensionCode[16];
-	__u8  bNumControls;
-	__u8  bNrInPins;
-	__u8  baSourceID[0];
-	__u8  bControlSize;
-	__u8  bmControls[0];
-	__u8  iExtension;
-} __attribute__((__packed__));
-
-#define UVC_DT_EXTENSION_UNIT_SIZE(p, n)		(24+(p)+(n))
-
-#define UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) \
-	uvc_extension_unit_descriptor_##p_##n
-
-#define DECLARE_UVC_EXTENSION_UNIT_DESCRIPTOR(p, n)	\
-struct UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) {		\
-	__u8  bLength;					\
-	__u8  bDescriptorType;				\
-	__u8  bDescriptorSubType;			\
-	__u8  bUnitID;					\
-	__u8  guidExtensionCode[16];			\
-	__u8  bNumControls;				\
-	__u8  bNrInPins;				\
-	__u8  baSourceID[p];				\
-	__u8  bControlSize;				\
-	__u8  bmControls[n];				\
-	__u8  iExtension;				\
-} __attribute__ ((packed))
-
-/* 3.8.2.2. Video Control Interrupt Endpoint Descriptor */
-struct uvc_control_endpoint_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u16 wMaxTransferSize;
-} __attribute__((__packed__));
-
-#define UVC_DT_CONTROL_ENDPOINT_SIZE			5
-
-/* 3.9.2.1. Input Header Descriptor */
-struct uvc_input_header_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bNumFormats;
-	__u16 wTotalLength;
-	__u8  bEndpointAddress;
-	__u8  bmInfo;
-	__u8  bTerminalLink;
-	__u8  bStillCaptureMethod;
-	__u8  bTriggerSupport;
-	__u8  bTriggerUsage;
-	__u8  bControlSize;
-	__u8  bmaControls[];
-} __attribute__((__packed__));
-
-#define UVC_DT_INPUT_HEADER_SIZE(n, p)			(13+(n*p))
-
-#define UVC_INPUT_HEADER_DESCRIPTOR(n, p) \
-	uvc_input_header_descriptor_##n_##p
-
-#define DECLARE_UVC_INPUT_HEADER_DESCRIPTOR(n, p)	\
-struct UVC_INPUT_HEADER_DESCRIPTOR(n, p) {		\
-	__u8  bLength;					\
-	__u8  bDescriptorType;				\
-	__u8  bDescriptorSubType;			\
-	__u8  bNumFormats;				\
-	__u16 wTotalLength;				\
-	__u8  bEndpointAddress;				\
-	__u8  bmInfo;					\
-	__u8  bTerminalLink;				\
-	__u8  bStillCaptureMethod;			\
-	__u8  bTriggerSupport;				\
-	__u8  bTriggerUsage;				\
-	__u8  bControlSize;				\
-	__u8  bmaControls[p][n];			\
-} __attribute__ ((packed))
-
-/* 3.9.2.2. Output Header Descriptor */
-struct uvc_output_header_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bNumFormats;
-	__u16 wTotalLength;
-	__u8  bEndpointAddress;
-	__u8  bTerminalLink;
-	__u8  bControlSize;
-	__u8  bmaControls[];
-} __attribute__((__packed__));
-
-#define UVC_DT_OUTPUT_HEADER_SIZE(n, p)			(9+(n*p))
-
-#define UVC_OUTPUT_HEADER_DESCRIPTOR(n, p) \
-	uvc_output_header_descriptor_##n_##p
-
-#define DECLARE_UVC_OUTPUT_HEADER_DESCRIPTOR(n, p)	\
-struct UVC_OUTPUT_HEADER_DESCRIPTOR(n, p) {		\
-	__u8  bLength;					\
-	__u8  bDescriptorType;				\
-	__u8  bDescriptorSubType;			\
-	__u8  bNumFormats;				\
-	__u16 wTotalLength;				\
-	__u8  bEndpointAddress;				\
-	__u8  bTerminalLink;				\
-	__u8  bControlSize;				\
-	__u8  bmaControls[p][n];			\
-} __attribute__ ((packed))
-
-/* 3.9.2.6. Color matching descriptor */
-struct uvc_color_matching_descriptor {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bColorPrimaries;
-	__u8  bTransferCharacteristics;
-	__u8  bMatrixCoefficients;
-} __attribute__((__packed__));
-
-#define UVC_DT_COLOR_MATCHING_SIZE			6
-
-/* 4.3.1.1. Video Probe and Commit Controls */
-struct uvc_streaming_control {
-	__u16 bmHint;
-	__u8  bFormatIndex;
-	__u8  bFrameIndex;
-	__u32 dwFrameInterval;
-	__u16 wKeyFrameRate;
-	__u16 wPFrameRate;
-	__u16 wCompQuality;
-	__u16 wCompWindowSize;
-	__u16 wDelay;
-	__u32 dwMaxVideoFrameSize;
-	__u32 dwMaxPayloadTransferSize;
-	__u32 dwClockFrequency;
-	__u8  bmFramingInfo;
-	__u8  bPreferedVersion;
-	__u8  bMinVersion;
-	__u8  bMaxVersion;
-} __attribute__((__packed__));
-
-/* Uncompressed Payload - 3.1.1. Uncompressed Video Format Descriptor */
-struct uvc_format_uncompressed {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bFormatIndex;
-	__u8  bNumFrameDescriptors;
-	__u8  guidFormat[16];
-	__u8  bBitsPerPixel;
-	__u8  bDefaultFrameIndex;
-	__u8  bAspectRatioX;
-	__u8  bAspectRatioY;
-	__u8  bmInterfaceFlags;
-	__u8  bCopyProtect;
-} __attribute__((__packed__));
-
-#define UVC_DT_FORMAT_UNCOMPRESSED_SIZE			27
-
-/* Uncompressed Payload - 3.1.2. Uncompressed Video Frame Descriptor */
-struct uvc_frame_uncompressed {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bFrameIndex;
-	__u8  bmCapabilities;
-	__u16 wWidth;
-	__u16 wHeight;
-	__u32 dwMinBitRate;
-	__u32 dwMaxBitRate;
-	__u32 dwMaxVideoFrameBufferSize;
-	__u32 dwDefaultFrameInterval;
-	__u8  bFrameIntervalType;
-	__u32 dwFrameInterval[];
-} __attribute__((__packed__));
-
-#define UVC_DT_FRAME_UNCOMPRESSED_SIZE(n)		(26+4*(n))
-
-#define UVC_FRAME_UNCOMPRESSED(n) \
-	uvc_frame_uncompressed_##n
-
-#define DECLARE_UVC_FRAME_UNCOMPRESSED(n)		\
-struct UVC_FRAME_UNCOMPRESSED(n) {			\
-	__u8  bLength;					\
-	__u8  bDescriptorType;				\
-	__u8  bDescriptorSubType;			\
-	__u8  bFrameIndex;				\
-	__u8  bmCapabilities;				\
-	__u16 wWidth;					\
-	__u16 wHeight;					\
-	__u32 dwMinBitRate;				\
-	__u32 dwMaxBitRate;				\
-	__u32 dwMaxVideoFrameBufferSize;		\
-	__u32 dwDefaultFrameInterval;			\
-	__u8  bFrameIntervalType;			\
-	__u32 dwFrameInterval[n];			\
-} __attribute__ ((packed))
-
-/* MJPEG Payload - 3.1.1. MJPEG Video Format Descriptor */
-struct uvc_format_mjpeg {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bFormatIndex;
-	__u8  bNumFrameDescriptors;
-	__u8  bmFlags;
-	__u8  bDefaultFrameIndex;
-	__u8  bAspectRatioX;
-	__u8  bAspectRatioY;
-	__u8  bmInterfaceFlags;
-	__u8  bCopyProtect;
-} __attribute__((__packed__));
-
-#define UVC_DT_FORMAT_MJPEG_SIZE			11
-
-/* MJPEG Payload - 3.1.2. MJPEG Video Frame Descriptor */
-struct uvc_frame_mjpeg {
-	__u8  bLength;
-	__u8  bDescriptorType;
-	__u8  bDescriptorSubType;
-	__u8  bFrameIndex;
-	__u8  bmCapabilities;
-	__u16 wWidth;
-	__u16 wHeight;
-	__u32 dwMinBitRate;
-	__u32 dwMaxBitRate;
-	__u32 dwMaxVideoFrameBufferSize;
-	__u32 dwDefaultFrameInterval;
-	__u8  bFrameIntervalType;
-	__u32 dwFrameInterval[];
-} __attribute__((__packed__));
-
-#define UVC_DT_FRAME_MJPEG_SIZE(n)			(26+4*(n))
-
-#define UVC_FRAME_MJPEG(n) \
-	uvc_frame_mjpeg_##n
-
-#define DECLARE_UVC_FRAME_MJPEG(n)			\
-struct UVC_FRAME_MJPEG(n) {				\
-	__u8  bLength;					\
-	__u8  bDescriptorType;				\
-	__u8  bDescriptorSubType;			\
-	__u8  bFrameIndex;				\
-	__u8  bmCapabilities;				\
-	__u16 wWidth;					\
-	__u16 wHeight;					\
-	__u32 dwMinBitRate;				\
-	__u32 dwMaxBitRate;				\
-	__u32 dwMaxVideoFrameBufferSize;		\
-	__u32 dwDefaultFrameInterval;			\
-	__u8  bFrameIntervalType;			\
-	__u32 dwFrameInterval[n];			\
-} __attribute__ ((packed))
-
-#endif /* __LINUX_USB_VIDEO_H */
-
diff --git a/openflow/usr/include/linux/usbdevice_fs.h b/openflow/usr/include/linux/usbdevice_fs.h
deleted file mode 100644
index 3c0e300..0000000
--- a/openflow/usr/include/linux/usbdevice_fs.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*****************************************************************************/
-
-/*
- *	usbdevice_fs.h  --  USB device file system.
- *
- *	Copyright (C) 2000
- *          Thomas Sailer (sailer@ife.ee.ethz.ch)
- *
- *	This program is free software; you can redistribute it and/or modify
- *	it under the terms of the GNU General Public License as published by
- *	the Free Software Foundation; either version 2 of the License, or
- *	(at your option) any later version.
- *
- *	This program is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *	GNU General Public License for more details.
- *
- *	You should have received a copy of the GNU General Public License
- *	along with this program; if not, write to the Free Software
- *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  History:
- *   0.1  04.01.2000  Created
- */
-
-/*****************************************************************************/
-
-#ifndef _LINUX_USBDEVICE_FS_H
-#define _LINUX_USBDEVICE_FS_H
-
-#include <linux/types.h>
-#include <linux/magic.h>
-
-/* --------------------------------------------------------------------- */
-
-/* usbdevfs ioctl codes */
-
-struct usbdevfs_ctrltransfer {
-	__u8 bRequestType;
-	__u8 bRequest;
-	__u16 wValue;
-	__u16 wIndex;
-	__u16 wLength;
-	__u32 timeout;  /* in milliseconds */
- 	void *data;
-};
-
-struct usbdevfs_bulktransfer {
-	unsigned int ep;
-	unsigned int len;
-	unsigned int timeout; /* in milliseconds */
-	void *data;
-};
-
-struct usbdevfs_setinterface {
-	unsigned int interface;
-	unsigned int altsetting;
-};
-
-struct usbdevfs_disconnectsignal {
-	unsigned int signr;
-	void *context;
-};
-
-#define USBDEVFS_MAXDRIVERNAME 255
-
-struct usbdevfs_getdriver {
-	unsigned int interface;
-	char driver[USBDEVFS_MAXDRIVERNAME + 1];
-};
-
-struct usbdevfs_connectinfo {
-	unsigned int devnum;
-	unsigned char slow;
-};
-
-#define USBDEVFS_URB_SHORT_NOT_OK	0x01
-#define USBDEVFS_URB_ISO_ASAP		0x02
-#define USBDEVFS_URB_BULK_CONTINUATION	0x04
-#define USBDEVFS_URB_NO_FSBR		0x20
-#define USBDEVFS_URB_ZERO_PACKET	0x40
-#define USBDEVFS_URB_NO_INTERRUPT	0x80
-
-#define USBDEVFS_URB_TYPE_ISO		   0
-#define USBDEVFS_URB_TYPE_INTERRUPT	   1
-#define USBDEVFS_URB_TYPE_CONTROL	   2
-#define USBDEVFS_URB_TYPE_BULK		   3
-
-struct usbdevfs_iso_packet_desc {
-	unsigned int length;
-	unsigned int actual_length;
-	unsigned int status;
-};
-
-struct usbdevfs_urb {
-	unsigned char type;
-	unsigned char endpoint;
-	int status;
-	unsigned int flags;
-	void *buffer;
-	int buffer_length;
-	int actual_length;
-	int start_frame;
-	union {
-		int number_of_packets;	/* Only used for isoc urbs */
-		unsigned int stream_id;	/* Only used with bulk streams */
-	};
-	int error_count;
-	unsigned int signr;	/* signal to be sent on completion,
-				  or 0 if none should be sent. */
-	void *usercontext;
-	struct usbdevfs_iso_packet_desc iso_frame_desc[0];
-};
-
-/* ioctls for talking directly to drivers */
-struct usbdevfs_ioctl {
-	int	ifno;		/* interface 0..N ; negative numbers reserved */
-	int	ioctl_code;	/* MUST encode size + direction of data so the
-				 * macros in <asm/ioctl.h> give correct values */
-	void *data;	/* param buffer (in, or out) */
-};
-
-/* You can do most things with hubs just through control messages,
- * except find out what device connects to what port. */
-struct usbdevfs_hub_portinfo {
-	char nports;		/* number of downstream ports in this hub */
-	char port [127];	/* e.g. port 3 connects to device 27 */
-};
-
-/* System and bus capability flags */
-#define USBDEVFS_CAP_ZERO_PACKET		0x01
-#define USBDEVFS_CAP_BULK_CONTINUATION		0x02
-#define USBDEVFS_CAP_NO_PACKET_SIZE_LIM		0x04
-#define USBDEVFS_CAP_BULK_SCATTER_GATHER	0x08
-#define USBDEVFS_CAP_REAP_AFTER_DISCONNECT	0x10
-
-/* USBDEVFS_DISCONNECT_CLAIM flags & struct */
-
-/* disconnect-and-claim if the driver matches the driver field */
-#define USBDEVFS_DISCONNECT_CLAIM_IF_DRIVER	0x01
-/* disconnect-and-claim except when the driver matches the driver field */
-#define USBDEVFS_DISCONNECT_CLAIM_EXCEPT_DRIVER	0x02
-
-struct usbdevfs_disconnect_claim {
-	unsigned int interface;
-	unsigned int flags;
-	char driver[USBDEVFS_MAXDRIVERNAME + 1];
-};
-
-struct usbdevfs_streams {
-	unsigned int num_streams; /* Not used by USBDEVFS_FREE_STREAMS */
-	unsigned int num_eps;
-	unsigned char eps[0];
-};
-
-#define USBDEVFS_CONTROL           _IOWR('U', 0, struct usbdevfs_ctrltransfer)
-#define USBDEVFS_CONTROL32           _IOWR('U', 0, struct usbdevfs_ctrltransfer32)
-#define USBDEVFS_BULK              _IOWR('U', 2, struct usbdevfs_bulktransfer)
-#define USBDEVFS_BULK32              _IOWR('U', 2, struct usbdevfs_bulktransfer32)
-#define USBDEVFS_RESETEP           _IOR('U', 3, unsigned int)
-#define USBDEVFS_SETINTERFACE      _IOR('U', 4, struct usbdevfs_setinterface)
-#define USBDEVFS_SETCONFIGURATION  _IOR('U', 5, unsigned int)
-#define USBDEVFS_GETDRIVER         _IOW('U', 8, struct usbdevfs_getdriver)
-#define USBDEVFS_SUBMITURB         _IOR('U', 10, struct usbdevfs_urb)
-#define USBDEVFS_SUBMITURB32       _IOR('U', 10, struct usbdevfs_urb32)
-#define USBDEVFS_DISCARDURB        _IO('U', 11)
-#define USBDEVFS_REAPURB           _IOW('U', 12, void *)
-#define USBDEVFS_REAPURB32         _IOW('U', 12, __u32)
-#define USBDEVFS_REAPURBNDELAY     _IOW('U', 13, void *)
-#define USBDEVFS_REAPURBNDELAY32   _IOW('U', 13, __u32)
-#define USBDEVFS_DISCSIGNAL        _IOR('U', 14, struct usbdevfs_disconnectsignal)
-#define USBDEVFS_DISCSIGNAL32      _IOR('U', 14, struct usbdevfs_disconnectsignal32)
-#define USBDEVFS_CLAIMINTERFACE    _IOR('U', 15, unsigned int)
-#define USBDEVFS_RELEASEINTERFACE  _IOR('U', 16, unsigned int)
-#define USBDEVFS_CONNECTINFO       _IOW('U', 17, struct usbdevfs_connectinfo)
-#define USBDEVFS_IOCTL             _IOWR('U', 18, struct usbdevfs_ioctl)
-#define USBDEVFS_IOCTL32           _IOWR('U', 18, struct usbdevfs_ioctl32)
-#define USBDEVFS_HUB_PORTINFO      _IOR('U', 19, struct usbdevfs_hub_portinfo)
-#define USBDEVFS_RESET             _IO('U', 20)
-#define USBDEVFS_CLEAR_HALT        _IOR('U', 21, unsigned int)
-#define USBDEVFS_DISCONNECT        _IO('U', 22)
-#define USBDEVFS_CONNECT           _IO('U', 23)
-#define USBDEVFS_CLAIM_PORT        _IOR('U', 24, unsigned int)
-#define USBDEVFS_RELEASE_PORT      _IOR('U', 25, unsigned int)
-#define USBDEVFS_GET_CAPABILITIES  _IOR('U', 26, __u32)
-#define USBDEVFS_DISCONNECT_CLAIM  _IOR('U', 27, struct usbdevfs_disconnect_claim)
-#define USBDEVFS_ALLOC_STREAMS     _IOR('U', 28, struct usbdevfs_streams)
-#define USBDEVFS_FREE_STREAMS      _IOR('U', 29, struct usbdevfs_streams)
-
-#endif /* _LINUX_USBDEVICE_FS_H */
diff --git a/openflow/usr/include/linux/usbip.h b/openflow/usr/include/linux/usbip.h
deleted file mode 100644
index 8d4f9a3..0000000
--- a/openflow/usr/include/linux/usbip.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *	usbip.h
- *
- *	USBIP uapi defines and function prototypes etc.
-*/
-
-#ifndef _LINUX_USBIP_H
-#define _LINUX_USBIP_H
-
-/* usbip device status - exported in usbip device sysfs status */
-enum usbip_device_status {
-	/* sdev is available. */
-	SDEV_ST_AVAILABLE = 0x01,
-	/* sdev is now used. */
-	SDEV_ST_USED,
-	/* sdev is unusable because of a fatal error. */
-	SDEV_ST_ERROR,
-
-	/* vdev does not connect a remote device. */
-	VDEV_ST_NULL,
-	/* vdev is used, but the USB address is not assigned yet */
-	VDEV_ST_NOTASSIGNED,
-	VDEV_ST_USED,
-	VDEV_ST_ERROR
-};
-#endif /* _LINUX_USBIP_H */
diff --git a/openflow/usr/include/linux/userfaultfd.h b/openflow/usr/include/linux/userfaultfd.h
deleted file mode 100644
index 19e8453..0000000
--- a/openflow/usr/include/linux/userfaultfd.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *  include/linux/userfaultfd.h
- *
- *  Copyright (C) 2007  Davide Libenzi <davidel@xmailserver.org>
- *  Copyright (C) 2015  Red Hat, Inc.
- *
- */
-
-#ifndef _LINUX_USERFAULTFD_H
-#define _LINUX_USERFAULTFD_H
-
-#include <linux/types.h>
-
-#define UFFD_API ((__u64)0xAA)
-/*
- * After implementing the respective features it will become:
- * #define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | \
- *			      UFFD_FEATURE_EVENT_FORK)
- */
-#define UFFD_API_FEATURES (0)
-#define UFFD_API_IOCTLS				\
-	((__u64)1 << _UFFDIO_REGISTER |		\
-	 (__u64)1 << _UFFDIO_UNREGISTER |	\
-	 (__u64)1 << _UFFDIO_API)
-#define UFFD_API_RANGE_IOCTLS			\
-	((__u64)1 << _UFFDIO_WAKE |		\
-	 (__u64)1 << _UFFDIO_COPY |		\
-	 (__u64)1 << _UFFDIO_ZEROPAGE)
-
-/*
- * Valid ioctl command number range with this API is from 0x00 to
- * 0x3F.  UFFDIO_API is the fixed number, everything else can be
- * changed by implementing a different UFFD_API. If sticking to the
- * same UFFD_API more ioctl can be added and userland will be aware of
- * which ioctl the running kernel implements through the ioctl command
- * bitmask written by the UFFDIO_API.
- */
-#define _UFFDIO_REGISTER		(0x00)
-#define _UFFDIO_UNREGISTER		(0x01)
-#define _UFFDIO_WAKE			(0x02)
-#define _UFFDIO_COPY			(0x03)
-#define _UFFDIO_ZEROPAGE		(0x04)
-#define _UFFDIO_API			(0x3F)
-
-/* userfaultfd ioctl ids */
-#define UFFDIO 0xAA
-#define UFFDIO_API		_IOWR(UFFDIO, _UFFDIO_API,	\
-				      struct uffdio_api)
-#define UFFDIO_REGISTER		_IOWR(UFFDIO, _UFFDIO_REGISTER, \
-				      struct uffdio_register)
-#define UFFDIO_UNREGISTER	_IOR(UFFDIO, _UFFDIO_UNREGISTER,	\
-				     struct uffdio_range)
-#define UFFDIO_WAKE		_IOR(UFFDIO, _UFFDIO_WAKE,	\
-				     struct uffdio_range)
-#define UFFDIO_COPY		_IOWR(UFFDIO, _UFFDIO_COPY,	\
-				      struct uffdio_copy)
-#define UFFDIO_ZEROPAGE		_IOWR(UFFDIO, _UFFDIO_ZEROPAGE,	\
-				      struct uffdio_zeropage)
-
-/* read() structure */
-struct uffd_msg {
-	__u8	event;
-
-	__u8	reserved1;
-	__u16	reserved2;
-	__u32	reserved3;
-
-	union {
-		struct {
-			__u64	flags;
-			__u64	address;
-		} pagefault;
-
-		struct {
-			/* unused reserved fields */
-			__u64	reserved1;
-			__u64	reserved2;
-			__u64	reserved3;
-		} reserved;
-	} arg;
-} __attribute__((packed));
-
-/*
- * Start at 0x12 and not at 0 to be more strict against bugs.
- */
-#define UFFD_EVENT_PAGEFAULT	0x12
-#if 0 /* not available yet */
-#define UFFD_EVENT_FORK		0x13
-#endif
-
-/* flags for UFFD_EVENT_PAGEFAULT */
-#define UFFD_PAGEFAULT_FLAG_WRITE	(1<<0)	/* If this was a write fault */
-#define UFFD_PAGEFAULT_FLAG_WP		(1<<1)	/* If reason is VM_UFFD_WP */
-
-struct uffdio_api {
-	/* userland asks for an API number and the features to enable */
-	__u64 api;
-	/*
-	 * Kernel answers below with the all available features for
-	 * the API, this notifies userland of which events and/or
-	 * which flags for each event are enabled in the current
-	 * kernel.
-	 *
-	 * Note: UFFD_EVENT_PAGEFAULT and UFFD_PAGEFAULT_FLAG_WRITE
-	 * are to be considered implicitly always enabled in all kernels as
-	 * long as the uffdio_api.api requested matches UFFD_API.
-	 */
-#if 0 /* not available yet */
-#define UFFD_FEATURE_PAGEFAULT_FLAG_WP		(1<<0)
-#define UFFD_FEATURE_EVENT_FORK			(1<<1)
-#endif
-	__u64 features;
-
-	__u64 ioctls;
-};
-
-struct uffdio_range {
-	__u64 start;
-	__u64 len;
-};
-
-struct uffdio_register {
-	struct uffdio_range range;
-#define UFFDIO_REGISTER_MODE_MISSING	((__u64)1<<0)
-#define UFFDIO_REGISTER_MODE_WP		((__u64)1<<1)
-	__u64 mode;
-
-	/*
-	 * kernel answers which ioctl commands are available for the
-	 * range, keep at the end as the last 8 bytes aren't read.
-	 */
-	__u64 ioctls;
-};
-
-struct uffdio_copy {
-	__u64 dst;
-	__u64 src;
-	__u64 len;
-	/*
-	 * There will be a wrprotection flag later that allows to map
-	 * pages wrprotected on the fly. And such a flag will be
-	 * available if the wrprotection ioctl are implemented for the
-	 * range according to the uffdio_register.ioctls.
-	 */
-#define UFFDIO_COPY_MODE_DONTWAKE		((__u64)1<<0)
-	__u64 mode;
-
-	/*
-	 * "copy" is written by the ioctl and must be at the end: the
-	 * copy_from_user will not read the last 8 bytes.
-	 */
-	__s64 copy;
-};
-
-struct uffdio_zeropage {
-	struct uffdio_range range;
-#define UFFDIO_ZEROPAGE_MODE_DONTWAKE		((__u64)1<<0)
-	__u64 mode;
-
-	/*
-	 * "zeropage" is written by the ioctl and must be at the end:
-	 * the copy_from_user will not read the last 8 bytes.
-	 */
-	__s64 zeropage;
-};
-
-#endif /* _LINUX_USERFAULTFD_H */
diff --git a/openflow/usr/include/linux/utime.h b/openflow/usr/include/linux/utime.h
deleted file mode 100644
index 5cdf673..0000000
--- a/openflow/usr/include/linux/utime.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _LINUX_UTIME_H
-#define _LINUX_UTIME_H
-
-#include <linux/types.h>
-
-struct utimbuf {
-	__kernel_time_t actime;
-	__kernel_time_t modtime;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/utsname.h b/openflow/usr/include/linux/utsname.h
deleted file mode 100644
index 6387d45..0000000
--- a/openflow/usr/include/linux/utsname.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _LINUX_UTSNAME_H
-#define _LINUX_UTSNAME_H
-
-#define __OLD_UTS_LEN 8
-
-struct oldold_utsname {
-	char sysname[9];
-	char nodename[9];
-	char release[9];
-	char version[9];
-	char machine[9];
-};
-
-#define __NEW_UTS_LEN 64
-
-struct old_utsname {
-	char sysname[65];
-	char nodename[65];
-	char release[65];
-	char version[65];
-	char machine[65];
-};
-
-struct new_utsname {
-	char sysname[__NEW_UTS_LEN + 1];
-	char nodename[__NEW_UTS_LEN + 1];
-	char release[__NEW_UTS_LEN + 1];
-	char version[__NEW_UTS_LEN + 1];
-	char machine[__NEW_UTS_LEN + 1];
-	char domainname[__NEW_UTS_LEN + 1];
-};
-
-
-#endif /* _LINUX_UTSNAME_H */
diff --git a/openflow/usr/include/linux/uuid.h b/openflow/usr/include/linux/uuid.h
deleted file mode 100644
index af891a3..0000000
--- a/openflow/usr/include/linux/uuid.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * UUID/GUID definition
- *
- * Copyright (C) 2010, Intel Corp.
- *	Huang Ying <ying.huang@intel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version
- * 2 as published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _LINUX_UUID_H_
-#define _LINUX_UUID_H_
-
-#include <linux/types.h>
-#include <linux/string.h>
-
-typedef struct {
-	__u8 b[16];
-} uuid_le;
-
-typedef struct {
-	__u8 b[16];
-} uuid_be;
-
-#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)		\
-((uuid_le)								\
-{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
-   (b) & 0xff, ((b) >> 8) & 0xff,					\
-   (c) & 0xff, ((c) >> 8) & 0xff,					\
-   (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
-
-#define UUID_BE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)		\
-((uuid_be)								\
-{{ ((a) >> 24) & 0xff, ((a) >> 16) & 0xff, ((a) >> 8) & 0xff, (a) & 0xff, \
-   ((b) >> 8) & 0xff, (b) & 0xff,					\
-   ((c) >> 8) & 0xff, (c) & 0xff,					\
-   (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
-
-#define NULL_UUID_LE							\
-	UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,	\
-		0x00, 0x00, 0x00, 0x00)
-
-#define NULL_UUID_BE							\
-	UUID_BE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00,	\
-		0x00, 0x00, 0x00, 0x00)
-
-
-#endif /* _LINUX_UUID_H_ */
diff --git a/openflow/usr/include/linux/uvcvideo.h b/openflow/usr/include/linux/uvcvideo.h
deleted file mode 100644
index faff40e..0000000
--- a/openflow/usr/include/linux/uvcvideo.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef __LINUX_UVCVIDEO_H_
-#define __LINUX_UVCVIDEO_H_
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-/*
- * Dynamic controls
- */
-
-/* Data types for UVC control data */
-#define UVC_CTRL_DATA_TYPE_RAW		0
-#define UVC_CTRL_DATA_TYPE_SIGNED	1
-#define UVC_CTRL_DATA_TYPE_UNSIGNED	2
-#define UVC_CTRL_DATA_TYPE_BOOLEAN	3
-#define UVC_CTRL_DATA_TYPE_ENUM		4
-#define UVC_CTRL_DATA_TYPE_BITMASK	5
-
-/* Control flags */
-#define UVC_CTRL_FLAG_SET_CUR		(1 << 0)
-#define UVC_CTRL_FLAG_GET_CUR		(1 << 1)
-#define UVC_CTRL_FLAG_GET_MIN		(1 << 2)
-#define UVC_CTRL_FLAG_GET_MAX		(1 << 3)
-#define UVC_CTRL_FLAG_GET_RES		(1 << 4)
-#define UVC_CTRL_FLAG_GET_DEF		(1 << 5)
-/* Control should be saved at suspend and restored at resume. */
-#define UVC_CTRL_FLAG_RESTORE		(1 << 6)
-/* Control can be updated by the camera. */
-#define UVC_CTRL_FLAG_AUTO_UPDATE	(1 << 7)
-
-#define UVC_CTRL_FLAG_GET_RANGE \
-	(UVC_CTRL_FLAG_GET_CUR | UVC_CTRL_FLAG_GET_MIN | \
-	 UVC_CTRL_FLAG_GET_MAX | UVC_CTRL_FLAG_GET_RES | \
-	 UVC_CTRL_FLAG_GET_DEF)
-
-struct uvc_menu_info {
-	__u32 value;
-	__u8 name[32];
-};
-
-struct uvc_xu_control_mapping {
-	__u32 id;
-	__u8 name[32];
-	__u8 entity[16];
-	__u8 selector;
-
-	__u8 size;
-	__u8 offset;
-	__u32 v4l2_type;
-	__u32 data_type;
-
-	struct uvc_menu_info *menu_info;
-	__u32 menu_count;
-
-	__u32 reserved[4];
-};
-
-struct uvc_xu_control_query {
-	__u8 unit;
-	__u8 selector;
-	__u8 query;		/* Video Class-Specific Request Code, */
-				/* defined in linux/usb/video.h A.8.  */
-	__u16 size;
-	__u8 *data;
-};
-
-#define UVCIOC_CTRL_MAP		_IOWR('u', 0x20, struct uvc_xu_control_mapping)
-#define UVCIOC_CTRL_QUERY	_IOWR('u', 0x21, struct uvc_xu_control_query)
-
-#endif
diff --git a/openflow/usr/include/linux/v4l2-common.h b/openflow/usr/include/linux/v4l2-common.h
deleted file mode 100644
index 1527398..0000000
--- a/openflow/usr/include/linux/v4l2-common.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * include/linux/v4l2-common.h
- *
- * Common V4L2 and V4L2 subdev definitions.
- *
- * Users are advised to #include this file either through videodev2.h
- * (V4L2) or through v4l2-subdev.h (V4L2 subdev) rather than to refer
- * to this file directly.
- *
- * Copyright (C) 2012 Nokia Corporation
- * Contact: Sakari Ailus <sakari.ailus@iki.fi>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef __V4L2_COMMON__
-#define __V4L2_COMMON__
-
-#include <linux/types.h>
-
-/*
- *
- * Selection interface definitions
- *
- */
-
-/* Current cropping area */
-#define V4L2_SEL_TGT_CROP		0x0000
-/* Default cropping area */
-#define V4L2_SEL_TGT_CROP_DEFAULT	0x0001
-/* Cropping bounds */
-#define V4L2_SEL_TGT_CROP_BOUNDS	0x0002
-/* Native frame size */
-#define V4L2_SEL_TGT_NATIVE_SIZE	0x0003
-/* Current composing area */
-#define V4L2_SEL_TGT_COMPOSE		0x0100
-/* Default composing area */
-#define V4L2_SEL_TGT_COMPOSE_DEFAULT	0x0101
-/* Composing bounds */
-#define V4L2_SEL_TGT_COMPOSE_BOUNDS	0x0102
-/* Current composing area plus all padding pixels */
-#define V4L2_SEL_TGT_COMPOSE_PADDED	0x0103
-
-/* Backward compatibility target definitions --- to be removed. */
-#define V4L2_SEL_TGT_CROP_ACTIVE	V4L2_SEL_TGT_CROP
-#define V4L2_SEL_TGT_COMPOSE_ACTIVE	V4L2_SEL_TGT_COMPOSE
-#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL	V4L2_SEL_TGT_CROP
-#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE
-#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS	V4L2_SEL_TGT_CROP_BOUNDS
-#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS
-
-/* Selection flags */
-#define V4L2_SEL_FLAG_GE		(1 << 0)
-#define V4L2_SEL_FLAG_LE		(1 << 1)
-#define V4L2_SEL_FLAG_KEEP_CONFIG	(1 << 2)
-
-/* Backward compatibility flag definitions --- to be removed. */
-#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE	V4L2_SEL_FLAG_GE
-#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE	V4L2_SEL_FLAG_LE
-#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG
-
-struct v4l2_edid {
-	__u32 pad;
-	__u32 start_block;
-	__u32 blocks;
-	__u32 reserved[5];
-	__u8  *edid;
-};
-
-#endif /* __V4L2_COMMON__ */
diff --git a/openflow/usr/include/linux/v4l2-controls.h b/openflow/usr/include/linux/v4l2-controls.h
deleted file mode 100644
index 1bdce50..0000000
--- a/openflow/usr/include/linux/v4l2-controls.h
+++ /dev/null
@@ -1,964 +0,0 @@
-/*
- *  Video for Linux Two controls header file
- *
- *  Copyright (C) 1999-2012 the contributors
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  Alternatively you can redistribute this file under the terms of the
- *  BSD license as stated below:
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *  3. The names of its contributors may not be used to endorse or promote
- *     products derived from this software without specific prior written
- *     permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  The contents of this header was split off from videodev2.h. All control
- *  definitions should be added to this header, which is included by
- *  videodev2.h.
- */
-
-#ifndef __LINUX_V4L2_CONTROLS_H
-#define __LINUX_V4L2_CONTROLS_H
-
-/* Control classes */
-#define V4L2_CTRL_CLASS_USER		0x00980000	/* Old-style 'user' controls */
-#define V4L2_CTRL_CLASS_MPEG		0x00990000	/* MPEG-compression controls */
-#define V4L2_CTRL_CLASS_CAMERA		0x009a0000	/* Camera class controls */
-#define V4L2_CTRL_CLASS_FM_TX		0x009b0000	/* FM Modulator controls */
-#define V4L2_CTRL_CLASS_FLASH		0x009c0000	/* Camera flash controls */
-#define V4L2_CTRL_CLASS_JPEG		0x009d0000	/* JPEG-compression controls */
-#define V4L2_CTRL_CLASS_IMAGE_SOURCE	0x009e0000	/* Image source controls */
-#define V4L2_CTRL_CLASS_IMAGE_PROC	0x009f0000	/* Image processing controls */
-#define V4L2_CTRL_CLASS_DV		0x00a00000	/* Digital Video controls */
-#define V4L2_CTRL_CLASS_FM_RX		0x00a10000	/* FM Receiver controls */
-#define V4L2_CTRL_CLASS_RF_TUNER	0x00a20000	/* RF tuner controls */
-#define V4L2_CTRL_CLASS_DETECT		0x00a30000	/* Detection controls */
-
-/* User-class control IDs */
-
-#define V4L2_CID_BASE			(V4L2_CTRL_CLASS_USER | 0x900)
-#define V4L2_CID_USER_BASE 		V4L2_CID_BASE
-#define V4L2_CID_USER_CLASS 		(V4L2_CTRL_CLASS_USER | 1)
-#define V4L2_CID_BRIGHTNESS		(V4L2_CID_BASE+0)
-#define V4L2_CID_CONTRAST		(V4L2_CID_BASE+1)
-#define V4L2_CID_SATURATION		(V4L2_CID_BASE+2)
-#define V4L2_CID_HUE			(V4L2_CID_BASE+3)
-#define V4L2_CID_AUDIO_VOLUME		(V4L2_CID_BASE+5)
-#define V4L2_CID_AUDIO_BALANCE		(V4L2_CID_BASE+6)
-#define V4L2_CID_AUDIO_BASS		(V4L2_CID_BASE+7)
-#define V4L2_CID_AUDIO_TREBLE		(V4L2_CID_BASE+8)
-#define V4L2_CID_AUDIO_MUTE		(V4L2_CID_BASE+9)
-#define V4L2_CID_AUDIO_LOUDNESS		(V4L2_CID_BASE+10)
-#define V4L2_CID_BLACK_LEVEL		(V4L2_CID_BASE+11) /* Deprecated */
-#define V4L2_CID_AUTO_WHITE_BALANCE	(V4L2_CID_BASE+12)
-#define V4L2_CID_DO_WHITE_BALANCE	(V4L2_CID_BASE+13)
-#define V4L2_CID_RED_BALANCE		(V4L2_CID_BASE+14)
-#define V4L2_CID_BLUE_BALANCE		(V4L2_CID_BASE+15)
-#define V4L2_CID_GAMMA			(V4L2_CID_BASE+16)
-#define V4L2_CID_WHITENESS		(V4L2_CID_GAMMA) /* Deprecated */
-#define V4L2_CID_EXPOSURE		(V4L2_CID_BASE+17)
-#define V4L2_CID_AUTOGAIN		(V4L2_CID_BASE+18)
-#define V4L2_CID_GAIN			(V4L2_CID_BASE+19)
-#define V4L2_CID_HFLIP			(V4L2_CID_BASE+20)
-#define V4L2_CID_VFLIP			(V4L2_CID_BASE+21)
-
-#define V4L2_CID_POWER_LINE_FREQUENCY	(V4L2_CID_BASE+24)
-enum v4l2_power_line_frequency {
-	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED	= 0,
-	V4L2_CID_POWER_LINE_FREQUENCY_50HZ	= 1,
-	V4L2_CID_POWER_LINE_FREQUENCY_60HZ	= 2,
-	V4L2_CID_POWER_LINE_FREQUENCY_AUTO	= 3,
-};
-#define V4L2_CID_HUE_AUTO			(V4L2_CID_BASE+25)
-#define V4L2_CID_WHITE_BALANCE_TEMPERATURE	(V4L2_CID_BASE+26)
-#define V4L2_CID_SHARPNESS			(V4L2_CID_BASE+27)
-#define V4L2_CID_BACKLIGHT_COMPENSATION 	(V4L2_CID_BASE+28)
-#define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
-#define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
-#define V4L2_CID_COLORFX			(V4L2_CID_BASE+31)
-enum v4l2_colorfx {
-	V4L2_COLORFX_NONE			= 0,
-	V4L2_COLORFX_BW				= 1,
-	V4L2_COLORFX_SEPIA			= 2,
-	V4L2_COLORFX_NEGATIVE			= 3,
-	V4L2_COLORFX_EMBOSS			= 4,
-	V4L2_COLORFX_SKETCH			= 5,
-	V4L2_COLORFX_SKY_BLUE			= 6,
-	V4L2_COLORFX_GRASS_GREEN		= 7,
-	V4L2_COLORFX_SKIN_WHITEN		= 8,
-	V4L2_COLORFX_VIVID			= 9,
-	V4L2_COLORFX_AQUA			= 10,
-	V4L2_COLORFX_ART_FREEZE			= 11,
-	V4L2_COLORFX_SILHOUETTE			= 12,
-	V4L2_COLORFX_SOLARIZATION		= 13,
-	V4L2_COLORFX_ANTIQUE			= 14,
-	V4L2_COLORFX_SET_CBCR			= 15,
-};
-#define V4L2_CID_AUTOBRIGHTNESS			(V4L2_CID_BASE+32)
-#define V4L2_CID_BAND_STOP_FILTER		(V4L2_CID_BASE+33)
-
-#define V4L2_CID_ROTATE				(V4L2_CID_BASE+34)
-#define V4L2_CID_BG_COLOR			(V4L2_CID_BASE+35)
-
-#define V4L2_CID_CHROMA_GAIN                    (V4L2_CID_BASE+36)
-
-#define V4L2_CID_ILLUMINATORS_1			(V4L2_CID_BASE+37)
-#define V4L2_CID_ILLUMINATORS_2			(V4L2_CID_BASE+38)
-
-#define V4L2_CID_MIN_BUFFERS_FOR_CAPTURE	(V4L2_CID_BASE+39)
-#define V4L2_CID_MIN_BUFFERS_FOR_OUTPUT		(V4L2_CID_BASE+40)
-
-#define V4L2_CID_ALPHA_COMPONENT		(V4L2_CID_BASE+41)
-#define V4L2_CID_COLORFX_CBCR			(V4L2_CID_BASE+42)
-
-/* last CID + 1 */
-#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+43)
-
-/* USER-class private control IDs */
-
-/* The base for the meye driver controls. See linux/meye.h for the list
- * of controls. We reserve 16 controls for this driver. */
-#define V4L2_CID_USER_MEYE_BASE			(V4L2_CID_USER_BASE + 0x1000)
-
-/* The base for the bttv driver controls.
- * We reserve 32 controls for this driver. */
-#define V4L2_CID_USER_BTTV_BASE			(V4L2_CID_USER_BASE + 0x1010)
-
-
-/* The base for the s2255 driver controls.
- * We reserve 16 controls for this driver. */
-#define V4L2_CID_USER_S2255_BASE		(V4L2_CID_USER_BASE + 0x1030)
-
-/* The base for the si476x driver controls. See include/media/si476x.h for the list
- * of controls. Total of 16 controls is reserved for this driver */
-#define V4L2_CID_USER_SI476X_BASE		(V4L2_CID_USER_BASE + 0x1040)
-
-/* The base for the TI VPE driver controls. Total of 16 controls is reserved for
- * this driver */
-#define V4L2_CID_USER_TI_VPE_BASE		(V4L2_CID_USER_BASE + 0x1050)
-
-/* The base for the saa7134 driver controls.
- * We reserve 16 controls for this driver. */
-#define V4L2_CID_USER_SAA7134_BASE		(V4L2_CID_USER_BASE + 0x1060)
-
-/* The base for the adv7180 driver controls.
- * We reserve 16 controls for this driver. */
-#define V4L2_CID_USER_ADV7180_BASE		(V4L2_CID_USER_BASE + 0x1070)
-
-/* The base for the tc358743 driver controls.
- * We reserve 16 controls for this driver. */
-#define V4L2_CID_USER_TC358743_BASE		(V4L2_CID_USER_BASE + 0x1080)
-
-/* MPEG-class control IDs */
-/* The MPEG controls are applicable to all codec controls
- * and the 'MPEG' part of the define is historical */
-
-#define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)
-#define V4L2_CID_MPEG_CLASS 			(V4L2_CTRL_CLASS_MPEG | 1)
-
-/*  MPEG streams, specific to multiplexed streams */
-#define V4L2_CID_MPEG_STREAM_TYPE 		(V4L2_CID_MPEG_BASE+0)
-enum v4l2_mpeg_stream_type {
-	V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
-	V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
-	V4L2_MPEG_STREAM_TYPE_MPEG1_SS   = 2, /* MPEG-1 system stream */
-	V4L2_MPEG_STREAM_TYPE_MPEG2_DVD  = 3, /* MPEG-2 DVD-compatible stream */
-	V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
-	V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
-};
-#define V4L2_CID_MPEG_STREAM_PID_PMT 		(V4L2_CID_MPEG_BASE+1)
-#define V4L2_CID_MPEG_STREAM_PID_AUDIO 		(V4L2_CID_MPEG_BASE+2)
-#define V4L2_CID_MPEG_STREAM_PID_VIDEO 		(V4L2_CID_MPEG_BASE+3)
-#define V4L2_CID_MPEG_STREAM_PID_PCR 		(V4L2_CID_MPEG_BASE+4)
-#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO 	(V4L2_CID_MPEG_BASE+5)
-#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO 	(V4L2_CID_MPEG_BASE+6)
-#define V4L2_CID_MPEG_STREAM_VBI_FMT 		(V4L2_CID_MPEG_BASE+7)
-enum v4l2_mpeg_stream_vbi_fmt {
-	V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
-	V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
-};
-
-/*  MPEG audio controls specific to multiplexed streams  */
-#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ 	(V4L2_CID_MPEG_BASE+100)
-enum v4l2_mpeg_audio_sampling_freq {
-	V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
-	V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
-	V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
-};
-#define V4L2_CID_MPEG_AUDIO_ENCODING 		(V4L2_CID_MPEG_BASE+101)
-enum v4l2_mpeg_audio_encoding {
-	V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
-	V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
-	V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
-	V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
-	V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
-};
-#define V4L2_CID_MPEG_AUDIO_L1_BITRATE 		(V4L2_CID_MPEG_BASE+102)
-enum v4l2_mpeg_audio_l1_bitrate {
-	V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
-	V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
-	V4L2_MPEG_AUDIO_L1_BITRATE_96K  = 2,
-	V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
-	V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
-	V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
-	V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
-	V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
-	V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
-	V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
-	V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
-	V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
-	V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
-	V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
-};
-#define V4L2_CID_MPEG_AUDIO_L2_BITRATE 		(V4L2_CID_MPEG_BASE+103)
-enum v4l2_mpeg_audio_l2_bitrate {
-	V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
-	V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
-	V4L2_MPEG_AUDIO_L2_BITRATE_56K  = 2,
-	V4L2_MPEG_AUDIO_L2_BITRATE_64K  = 3,
-	V4L2_MPEG_AUDIO_L2_BITRATE_80K  = 4,
-	V4L2_MPEG_AUDIO_L2_BITRATE_96K  = 5,
-	V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
-	V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
-	V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
-	V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
-	V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
-	V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
-	V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
-	V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
-};
-#define V4L2_CID_MPEG_AUDIO_L3_BITRATE 		(V4L2_CID_MPEG_BASE+104)
-enum v4l2_mpeg_audio_l3_bitrate {
-	V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
-	V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
-	V4L2_MPEG_AUDIO_L3_BITRATE_48K  = 2,
-	V4L2_MPEG_AUDIO_L3_BITRATE_56K  = 3,
-	V4L2_MPEG_AUDIO_L3_BITRATE_64K  = 4,
-	V4L2_MPEG_AUDIO_L3_BITRATE_80K  = 5,
-	V4L2_MPEG_AUDIO_L3_BITRATE_96K  = 6,
-	V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
-	V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
-	V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
-	V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
-	V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
-	V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
-	V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
-};
-#define V4L2_CID_MPEG_AUDIO_MODE 		(V4L2_CID_MPEG_BASE+105)
-enum v4l2_mpeg_audio_mode {
-	V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
-	V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
-	V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
-	V4L2_MPEG_AUDIO_MODE_MONO         = 3,
-};
-#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION 	(V4L2_CID_MPEG_BASE+106)
-enum v4l2_mpeg_audio_mode_extension {
-	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
-	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
-	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
-	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
-};
-#define V4L2_CID_MPEG_AUDIO_EMPHASIS 		(V4L2_CID_MPEG_BASE+107)
-enum v4l2_mpeg_audio_emphasis {
-	V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
-	V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
-	V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
-};
-#define V4L2_CID_MPEG_AUDIO_CRC 		(V4L2_CID_MPEG_BASE+108)
-enum v4l2_mpeg_audio_crc {
-	V4L2_MPEG_AUDIO_CRC_NONE  = 0,
-	V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
-};
-#define V4L2_CID_MPEG_AUDIO_MUTE 		(V4L2_CID_MPEG_BASE+109)
-#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE		(V4L2_CID_MPEG_BASE+110)
-#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE		(V4L2_CID_MPEG_BASE+111)
-enum v4l2_mpeg_audio_ac3_bitrate {
-	V4L2_MPEG_AUDIO_AC3_BITRATE_32K  = 0,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_40K  = 1,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_48K  = 2,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_56K  = 3,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_64K  = 4,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_80K  = 5,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_96K  = 6,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17,
-	V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18,
-};
-#define V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK	(V4L2_CID_MPEG_BASE+112)
-enum v4l2_mpeg_audio_dec_playback {
-	V4L2_MPEG_AUDIO_DEC_PLAYBACK_AUTO	    = 0,
-	V4L2_MPEG_AUDIO_DEC_PLAYBACK_STEREO	    = 1,
-	V4L2_MPEG_AUDIO_DEC_PLAYBACK_LEFT	    = 2,
-	V4L2_MPEG_AUDIO_DEC_PLAYBACK_RIGHT	    = 3,
-	V4L2_MPEG_AUDIO_DEC_PLAYBACK_MONO	    = 4,
-	V4L2_MPEG_AUDIO_DEC_PLAYBACK_SWAPPED_STEREO = 5,
-};
-#define V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK (V4L2_CID_MPEG_BASE+113)
-
-/*  MPEG video controls specific to multiplexed streams */
-#define V4L2_CID_MPEG_VIDEO_ENCODING 		(V4L2_CID_MPEG_BASE+200)
-enum v4l2_mpeg_video_encoding {
-	V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
-	V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
-	V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
-};
-#define V4L2_CID_MPEG_VIDEO_ASPECT 		(V4L2_CID_MPEG_BASE+201)
-enum v4l2_mpeg_video_aspect {
-	V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
-	V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
-	V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
-	V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
-};
-#define V4L2_CID_MPEG_VIDEO_B_FRAMES 		(V4L2_CID_MPEG_BASE+202)
-#define V4L2_CID_MPEG_VIDEO_GOP_SIZE 		(V4L2_CID_MPEG_BASE+203)
-#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE 	(V4L2_CID_MPEG_BASE+204)
-#define V4L2_CID_MPEG_VIDEO_PULLDOWN 		(V4L2_CID_MPEG_BASE+205)
-#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE 	(V4L2_CID_MPEG_BASE+206)
-enum v4l2_mpeg_video_bitrate_mode {
-	V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
-	V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
-};
-#define V4L2_CID_MPEG_VIDEO_BITRATE 		(V4L2_CID_MPEG_BASE+207)
-#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK 	(V4L2_CID_MPEG_BASE+208)
-#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
-#define V4L2_CID_MPEG_VIDEO_MUTE 		(V4L2_CID_MPEG_BASE+210)
-#define V4L2_CID_MPEG_VIDEO_MUTE_YUV 		(V4L2_CID_MPEG_BASE+211)
-#define V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE		(V4L2_CID_MPEG_BASE+212)
-#define V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER	(V4L2_CID_MPEG_BASE+213)
-#define V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB		(V4L2_CID_MPEG_BASE+214)
-#define V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE			(V4L2_CID_MPEG_BASE+215)
-#define V4L2_CID_MPEG_VIDEO_HEADER_MODE				(V4L2_CID_MPEG_BASE+216)
-enum v4l2_mpeg_video_header_mode {
-	V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE			= 0,
-	V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME	= 1,
-
-};
-#define V4L2_CID_MPEG_VIDEO_MAX_REF_PIC			(V4L2_CID_MPEG_BASE+217)
-#define V4L2_CID_MPEG_VIDEO_MB_RC_ENABLE		(V4L2_CID_MPEG_BASE+218)
-#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES	(V4L2_CID_MPEG_BASE+219)
-#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB		(V4L2_CID_MPEG_BASE+220)
-#define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE		(V4L2_CID_MPEG_BASE+221)
-enum v4l2_mpeg_video_multi_slice_mode {
-	V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE		= 0,
-	V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB		= 1,
-	V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES	= 2,
-};
-#define V4L2_CID_MPEG_VIDEO_VBV_SIZE			(V4L2_CID_MPEG_BASE+222)
-#define V4L2_CID_MPEG_VIDEO_DEC_PTS			(V4L2_CID_MPEG_BASE+223)
-#define V4L2_CID_MPEG_VIDEO_DEC_FRAME			(V4L2_CID_MPEG_BASE+224)
-#define V4L2_CID_MPEG_VIDEO_VBV_DELAY			(V4L2_CID_MPEG_BASE+225)
-#define V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER		(V4L2_CID_MPEG_BASE+226)
-#define V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE		(V4L2_CID_MPEG_BASE+227)
-#define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE		(V4L2_CID_MPEG_BASE+228)
-
-#define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP		(V4L2_CID_MPEG_BASE+300)
-#define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP		(V4L2_CID_MPEG_BASE+301)
-#define V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP		(V4L2_CID_MPEG_BASE+302)
-#define V4L2_CID_MPEG_VIDEO_H263_MIN_QP			(V4L2_CID_MPEG_BASE+303)
-#define V4L2_CID_MPEG_VIDEO_H263_MAX_QP			(V4L2_CID_MPEG_BASE+304)
-#define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP		(V4L2_CID_MPEG_BASE+350)
-#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP		(V4L2_CID_MPEG_BASE+351)
-#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP		(V4L2_CID_MPEG_BASE+352)
-#define V4L2_CID_MPEG_VIDEO_H264_MIN_QP			(V4L2_CID_MPEG_BASE+353)
-#define V4L2_CID_MPEG_VIDEO_H264_MAX_QP			(V4L2_CID_MPEG_BASE+354)
-#define V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM		(V4L2_CID_MPEG_BASE+355)
-#define V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE		(V4L2_CID_MPEG_BASE+356)
-#define V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE		(V4L2_CID_MPEG_BASE+357)
-enum v4l2_mpeg_video_h264_entropy_mode {
-	V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC	= 0,
-	V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC	= 1,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_I_PERIOD		(V4L2_CID_MPEG_BASE+358)
-#define V4L2_CID_MPEG_VIDEO_H264_LEVEL			(V4L2_CID_MPEG_BASE+359)
-enum v4l2_mpeg_video_h264_level {
-	V4L2_MPEG_VIDEO_H264_LEVEL_1_0	= 0,
-	V4L2_MPEG_VIDEO_H264_LEVEL_1B	= 1,
-	V4L2_MPEG_VIDEO_H264_LEVEL_1_1	= 2,
-	V4L2_MPEG_VIDEO_H264_LEVEL_1_2	= 3,
-	V4L2_MPEG_VIDEO_H264_LEVEL_1_3	= 4,
-	V4L2_MPEG_VIDEO_H264_LEVEL_2_0	= 5,
-	V4L2_MPEG_VIDEO_H264_LEVEL_2_1	= 6,
-	V4L2_MPEG_VIDEO_H264_LEVEL_2_2	= 7,
-	V4L2_MPEG_VIDEO_H264_LEVEL_3_0	= 8,
-	V4L2_MPEG_VIDEO_H264_LEVEL_3_1	= 9,
-	V4L2_MPEG_VIDEO_H264_LEVEL_3_2	= 10,
-	V4L2_MPEG_VIDEO_H264_LEVEL_4_0	= 11,
-	V4L2_MPEG_VIDEO_H264_LEVEL_4_1	= 12,
-	V4L2_MPEG_VIDEO_H264_LEVEL_4_2	= 13,
-	V4L2_MPEG_VIDEO_H264_LEVEL_5_0	= 14,
-	V4L2_MPEG_VIDEO_H264_LEVEL_5_1	= 15,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA	(V4L2_CID_MPEG_BASE+360)
-#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA	(V4L2_CID_MPEG_BASE+361)
-#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE	(V4L2_CID_MPEG_BASE+362)
-enum v4l2_mpeg_video_h264_loop_filter_mode {
-	V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED				= 0,
-	V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED				= 1,
-	V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY	= 2,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_PROFILE		(V4L2_CID_MPEG_BASE+363)
-enum v4l2_mpeg_video_h264_profile {
-	V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE			= 0,
-	V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE	= 1,
-	V4L2_MPEG_VIDEO_H264_PROFILE_MAIN			= 2,
-	V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED			= 3,
-	V4L2_MPEG_VIDEO_H264_PROFILE_HIGH			= 4,
-	V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10			= 5,
-	V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422			= 6,
-	V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_PREDICTIVE	= 7,
-	V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10_INTRA		= 8,
-	V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422_INTRA		= 9,
-	V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_INTRA		= 10,
-	V4L2_MPEG_VIDEO_H264_PROFILE_CAVLC_444_INTRA		= 11,
-	V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_BASELINE		= 12,
-	V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH		= 13,
-	V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA	= 14,
-	V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH		= 15,
-	V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH		= 16,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT	(V4L2_CID_MPEG_BASE+364)
-#define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH	(V4L2_CID_MPEG_BASE+365)
-#define V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_ENABLE		(V4L2_CID_MPEG_BASE+366)
-#define V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC		(V4L2_CID_MPEG_BASE+367)
-enum v4l2_mpeg_video_h264_vui_sar_idc {
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED	= 0,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_1x1		= 1,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_12x11		= 2,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_10x11		= 3,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_16x11		= 4,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_40x33		= 5,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_24x11		= 6,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_20x11		= 7,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_32x11		= 8,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_80x33		= 9,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_18x11		= 10,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_15x11		= 11,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_64x33		= 12,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_160x99		= 13,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_4x3		= 14,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_3x2		= 15,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_2x1		= 16,
-	V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED	= 17,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_SEI_FRAME_PACKING		(V4L2_CID_MPEG_BASE+368)
-#define V4L2_CID_MPEG_VIDEO_H264_SEI_FP_CURRENT_FRAME_0		(V4L2_CID_MPEG_BASE+369)
-#define V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE	(V4L2_CID_MPEG_BASE+370)
-enum v4l2_mpeg_video_h264_sei_fp_arrangement_type {
-	V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_CHECKERBOARD	= 0,
-	V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_COLUMN		= 1,
-	V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_ROW		= 2,
-	V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_SIDE_BY_SIDE	= 3,
-	V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_TOP_BOTTOM		= 4,
-	V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_TEMPORAL		= 5,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_FMO			(V4L2_CID_MPEG_BASE+371)
-#define V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE		(V4L2_CID_MPEG_BASE+372)
-enum v4l2_mpeg_video_h264_fmo_map_type {
-	V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES		= 0,
-	V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES		= 1,
-	V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_FOREGROUND_WITH_LEFT_OVER	= 2,
-	V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_BOX_OUT			= 3,
-	V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_RASTER_SCAN			= 4,
-	V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_WIPE_SCAN			= 5,
-	V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_EXPLICIT			= 6,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_FMO_SLICE_GROUP	(V4L2_CID_MPEG_BASE+373)
-#define V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_DIRECTION	(V4L2_CID_MPEG_BASE+374)
-enum v4l2_mpeg_video_h264_fmo_change_dir {
-	V4L2_MPEG_VIDEO_H264_FMO_CHANGE_DIR_RIGHT	= 0,
-	V4L2_MPEG_VIDEO_H264_FMO_CHANGE_DIR_LEFT	= 1,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_RATE	(V4L2_CID_MPEG_BASE+375)
-#define V4L2_CID_MPEG_VIDEO_H264_FMO_RUN_LENGTH		(V4L2_CID_MPEG_BASE+376)
-#define V4L2_CID_MPEG_VIDEO_H264_ASO			(V4L2_CID_MPEG_BASE+377)
-#define V4L2_CID_MPEG_VIDEO_H264_ASO_SLICE_ORDER	(V4L2_CID_MPEG_BASE+378)
-#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING		(V4L2_CID_MPEG_BASE+379)
-#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE	(V4L2_CID_MPEG_BASE+380)
-enum v4l2_mpeg_video_h264_hierarchical_coding_type {
-	V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_B	= 0,
-	V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P	= 1,
-};
-#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER	(V4L2_CID_MPEG_BASE+381)
-#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP	(V4L2_CID_MPEG_BASE+382)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP	(V4L2_CID_MPEG_BASE+400)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP	(V4L2_CID_MPEG_BASE+401)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP	(V4L2_CID_MPEG_BASE+402)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP	(V4L2_CID_MPEG_BASE+403)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP	(V4L2_CID_MPEG_BASE+404)
-#define V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL		(V4L2_CID_MPEG_BASE+405)
-enum v4l2_mpeg_video_mpeg4_level {
-	V4L2_MPEG_VIDEO_MPEG4_LEVEL_0	= 0,
-	V4L2_MPEG_VIDEO_MPEG4_LEVEL_0B	= 1,
-	V4L2_MPEG_VIDEO_MPEG4_LEVEL_1	= 2,
-	V4L2_MPEG_VIDEO_MPEG4_LEVEL_2	= 3,
-	V4L2_MPEG_VIDEO_MPEG4_LEVEL_3	= 4,
-	V4L2_MPEG_VIDEO_MPEG4_LEVEL_3B	= 5,
-	V4L2_MPEG_VIDEO_MPEG4_LEVEL_4	= 6,
-	V4L2_MPEG_VIDEO_MPEG4_LEVEL_5	= 7,
-};
-#define V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE	(V4L2_CID_MPEG_BASE+406)
-enum v4l2_mpeg_video_mpeg4_profile {
-	V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE				= 0,
-	V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE			= 1,
-	V4L2_MPEG_VIDEO_MPEG4_PROFILE_CORE				= 2,
-	V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE_SCALABLE			= 3,
-	V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY	= 4,
-};
-#define V4L2_CID_MPEG_VIDEO_MPEG4_QPEL		(V4L2_CID_MPEG_BASE+407)
-
-/*  Control IDs for VP8 streams
- *  Although VP8 is not part of MPEG we add these controls to the MPEG class
- *  as that class is already handling other video compression standards
- */
-#define V4L2_CID_MPEG_VIDEO_VPX_NUM_PARTITIONS		(V4L2_CID_MPEG_BASE+500)
-enum v4l2_vp8_num_partitions {
-	V4L2_CID_MPEG_VIDEO_VPX_1_PARTITION	= 0,
-	V4L2_CID_MPEG_VIDEO_VPX_2_PARTITIONS	= 1,
-	V4L2_CID_MPEG_VIDEO_VPX_4_PARTITIONS	= 2,
-	V4L2_CID_MPEG_VIDEO_VPX_8_PARTITIONS	= 3,
-};
-#define V4L2_CID_MPEG_VIDEO_VPX_IMD_DISABLE_4X4		(V4L2_CID_MPEG_BASE+501)
-#define V4L2_CID_MPEG_VIDEO_VPX_NUM_REF_FRAMES		(V4L2_CID_MPEG_BASE+502)
-enum v4l2_vp8_num_ref_frames {
-	V4L2_CID_MPEG_VIDEO_VPX_1_REF_FRAME	= 0,
-	V4L2_CID_MPEG_VIDEO_VPX_2_REF_FRAME	= 1,
-	V4L2_CID_MPEG_VIDEO_VPX_3_REF_FRAME	= 2,
-};
-#define V4L2_CID_MPEG_VIDEO_VPX_FILTER_LEVEL		(V4L2_CID_MPEG_BASE+503)
-#define V4L2_CID_MPEG_VIDEO_VPX_FILTER_SHARPNESS	(V4L2_CID_MPEG_BASE+504)
-#define V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_REF_PERIOD	(V4L2_CID_MPEG_BASE+505)
-#define V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL	(V4L2_CID_MPEG_BASE+506)
-enum v4l2_vp8_golden_frame_sel {
-	V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_USE_PREV		= 0,
-	V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_USE_REF_PERIOD	= 1,
-};
-#define V4L2_CID_MPEG_VIDEO_VPX_MIN_QP			(V4L2_CID_MPEG_BASE+507)
-#define V4L2_CID_MPEG_VIDEO_VPX_MAX_QP			(V4L2_CID_MPEG_BASE+508)
-#define V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP		(V4L2_CID_MPEG_BASE+509)
-#define V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP		(V4L2_CID_MPEG_BASE+510)
-#define V4L2_CID_MPEG_VIDEO_VPX_PROFILE			(V4L2_CID_MPEG_BASE+511)
-
-/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
-#define V4L2_CID_MPEG_CX2341X_BASE 				(V4L2_CTRL_CLASS_MPEG | 0x1000)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+0)
-enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
-	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
-	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
-};
-#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+1)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+2)
-enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
-	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
-	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
-	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT              = 2,
-	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
-	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
-};
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+3)
-enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
-	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
-	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
-};
-#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+4)
-enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
-	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
-	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
-};
-#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+5)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE 		(V4L2_CID_MPEG_CX2341X_BASE+6)
-enum v4l2_mpeg_cx2341x_video_median_filter_type {
-	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
-	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
-	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT     = 2,
-	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
-	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
-};
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM 	(V4L2_CID_MPEG_CX2341X_BASE+7)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+8)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM	(V4L2_CID_MPEG_CX2341X_BASE+9)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+10)
-#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS 	(V4L2_CID_MPEG_CX2341X_BASE+11)
-
-/*  MPEG-class control IDs specific to the Samsung MFC 5.1 driver as defined by V4L2 */
-#define V4L2_CID_MPEG_MFC51_BASE				(V4L2_CTRL_CLASS_MPEG | 0x1100)
-
-#define V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY		(V4L2_CID_MPEG_MFC51_BASE+0)
-#define V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE	(V4L2_CID_MPEG_MFC51_BASE+1)
-#define V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE			(V4L2_CID_MPEG_MFC51_BASE+2)
-enum v4l2_mpeg_mfc51_video_frame_skip_mode {
-	V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_DISABLED		= 0,
-	V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_LEVEL_LIMIT	= 1,
-	V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT		= 2,
-};
-#define V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE			(V4L2_CID_MPEG_MFC51_BASE+3)
-enum v4l2_mpeg_mfc51_video_force_frame_type {
-	V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_DISABLED		= 0,
-	V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME		= 1,
-	V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_NOT_CODED	= 2,
-};
-#define V4L2_CID_MPEG_MFC51_VIDEO_PADDING				(V4L2_CID_MPEG_MFC51_BASE+4)
-#define V4L2_CID_MPEG_MFC51_VIDEO_PADDING_YUV				(V4L2_CID_MPEG_MFC51_BASE+5)
-#define V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT			(V4L2_CID_MPEG_MFC51_BASE+6)
-#define V4L2_CID_MPEG_MFC51_VIDEO_RC_REACTION_COEFF			(V4L2_CID_MPEG_MFC51_BASE+7)
-#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_ACTIVITY		(V4L2_CID_MPEG_MFC51_BASE+50)
-#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_DARK			(V4L2_CID_MPEG_MFC51_BASE+51)
-#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_SMOOTH		(V4L2_CID_MPEG_MFC51_BASE+52)
-#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC		(V4L2_CID_MPEG_MFC51_BASE+53)
-#define V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P		(V4L2_CID_MPEG_MFC51_BASE+54)
-
-
-/*  Camera class control IDs */
-
-#define V4L2_CID_CAMERA_CLASS_BASE 	(V4L2_CTRL_CLASS_CAMERA | 0x900)
-#define V4L2_CID_CAMERA_CLASS 		(V4L2_CTRL_CLASS_CAMERA | 1)
-
-#define V4L2_CID_EXPOSURE_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+1)
-enum  v4l2_exposure_auto_type {
-	V4L2_EXPOSURE_AUTO = 0,
-	V4L2_EXPOSURE_MANUAL = 1,
-	V4L2_EXPOSURE_SHUTTER_PRIORITY = 2,
-	V4L2_EXPOSURE_APERTURE_PRIORITY = 3
-};
-#define V4L2_CID_EXPOSURE_ABSOLUTE		(V4L2_CID_CAMERA_CLASS_BASE+2)
-#define V4L2_CID_EXPOSURE_AUTO_PRIORITY		(V4L2_CID_CAMERA_CLASS_BASE+3)
-
-#define V4L2_CID_PAN_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+4)
-#define V4L2_CID_TILT_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+5)
-#define V4L2_CID_PAN_RESET			(V4L2_CID_CAMERA_CLASS_BASE+6)
-#define V4L2_CID_TILT_RESET			(V4L2_CID_CAMERA_CLASS_BASE+7)
-
-#define V4L2_CID_PAN_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+8)
-#define V4L2_CID_TILT_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+9)
-
-#define V4L2_CID_FOCUS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+10)
-#define V4L2_CID_FOCUS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+11)
-#define V4L2_CID_FOCUS_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+12)
-
-#define V4L2_CID_ZOOM_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+13)
-#define V4L2_CID_ZOOM_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+14)
-#define V4L2_CID_ZOOM_CONTINUOUS		(V4L2_CID_CAMERA_CLASS_BASE+15)
-
-#define V4L2_CID_PRIVACY			(V4L2_CID_CAMERA_CLASS_BASE+16)
-
-#define V4L2_CID_IRIS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+17)
-#define V4L2_CID_IRIS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+18)
-
-#define V4L2_CID_AUTO_EXPOSURE_BIAS		(V4L2_CID_CAMERA_CLASS_BASE+19)
-
-#define V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE	(V4L2_CID_CAMERA_CLASS_BASE+20)
-enum v4l2_auto_n_preset_white_balance {
-	V4L2_WHITE_BALANCE_MANUAL		= 0,
-	V4L2_WHITE_BALANCE_AUTO			= 1,
-	V4L2_WHITE_BALANCE_INCANDESCENT		= 2,
-	V4L2_WHITE_BALANCE_FLUORESCENT		= 3,
-	V4L2_WHITE_BALANCE_FLUORESCENT_H	= 4,
-	V4L2_WHITE_BALANCE_HORIZON		= 5,
-	V4L2_WHITE_BALANCE_DAYLIGHT		= 6,
-	V4L2_WHITE_BALANCE_FLASH		= 7,
-	V4L2_WHITE_BALANCE_CLOUDY		= 8,
-	V4L2_WHITE_BALANCE_SHADE		= 9,
-};
-
-#define V4L2_CID_WIDE_DYNAMIC_RANGE		(V4L2_CID_CAMERA_CLASS_BASE+21)
-#define V4L2_CID_IMAGE_STABILIZATION		(V4L2_CID_CAMERA_CLASS_BASE+22)
-
-#define V4L2_CID_ISO_SENSITIVITY		(V4L2_CID_CAMERA_CLASS_BASE+23)
-#define V4L2_CID_ISO_SENSITIVITY_AUTO		(V4L2_CID_CAMERA_CLASS_BASE+24)
-enum v4l2_iso_sensitivity_auto_type {
-	V4L2_ISO_SENSITIVITY_MANUAL		= 0,
-	V4L2_ISO_SENSITIVITY_AUTO		= 1,
-};
-
-#define V4L2_CID_EXPOSURE_METERING		(V4L2_CID_CAMERA_CLASS_BASE+25)
-enum v4l2_exposure_metering {
-	V4L2_EXPOSURE_METERING_AVERAGE		= 0,
-	V4L2_EXPOSURE_METERING_CENTER_WEIGHTED	= 1,
-	V4L2_EXPOSURE_METERING_SPOT		= 2,
-	V4L2_EXPOSURE_METERING_MATRIX		= 3,
-};
-
-#define V4L2_CID_SCENE_MODE			(V4L2_CID_CAMERA_CLASS_BASE+26)
-enum v4l2_scene_mode {
-	V4L2_SCENE_MODE_NONE			= 0,
-	V4L2_SCENE_MODE_BACKLIGHT		= 1,
-	V4L2_SCENE_MODE_BEACH_SNOW		= 2,
-	V4L2_SCENE_MODE_CANDLE_LIGHT		= 3,
-	V4L2_SCENE_MODE_DAWN_DUSK		= 4,
-	V4L2_SCENE_MODE_FALL_COLORS		= 5,
-	V4L2_SCENE_MODE_FIREWORKS		= 6,
-	V4L2_SCENE_MODE_LANDSCAPE		= 7,
-	V4L2_SCENE_MODE_NIGHT			= 8,
-	V4L2_SCENE_MODE_PARTY_INDOOR		= 9,
-	V4L2_SCENE_MODE_PORTRAIT		= 10,
-	V4L2_SCENE_MODE_SPORTS			= 11,
-	V4L2_SCENE_MODE_SUNSET			= 12,
-	V4L2_SCENE_MODE_TEXT			= 13,
-};
-
-#define V4L2_CID_3A_LOCK			(V4L2_CID_CAMERA_CLASS_BASE+27)
-#define V4L2_LOCK_EXPOSURE			(1 << 0)
-#define V4L2_LOCK_WHITE_BALANCE			(1 << 1)
-#define V4L2_LOCK_FOCUS				(1 << 2)
-
-#define V4L2_CID_AUTO_FOCUS_START		(V4L2_CID_CAMERA_CLASS_BASE+28)
-#define V4L2_CID_AUTO_FOCUS_STOP		(V4L2_CID_CAMERA_CLASS_BASE+29)
-#define V4L2_CID_AUTO_FOCUS_STATUS		(V4L2_CID_CAMERA_CLASS_BASE+30)
-#define V4L2_AUTO_FOCUS_STATUS_IDLE		(0 << 0)
-#define V4L2_AUTO_FOCUS_STATUS_BUSY		(1 << 0)
-#define V4L2_AUTO_FOCUS_STATUS_REACHED		(1 << 1)
-#define V4L2_AUTO_FOCUS_STATUS_FAILED		(1 << 2)
-
-#define V4L2_CID_AUTO_FOCUS_RANGE		(V4L2_CID_CAMERA_CLASS_BASE+31)
-enum v4l2_auto_focus_range {
-	V4L2_AUTO_FOCUS_RANGE_AUTO		= 0,
-	V4L2_AUTO_FOCUS_RANGE_NORMAL		= 1,
-	V4L2_AUTO_FOCUS_RANGE_MACRO		= 2,
-	V4L2_AUTO_FOCUS_RANGE_INFINITY		= 3,
-};
-
-#define V4L2_CID_PAN_SPEED			(V4L2_CID_CAMERA_CLASS_BASE+32)
-#define V4L2_CID_TILT_SPEED			(V4L2_CID_CAMERA_CLASS_BASE+33)
-
-/* FM Modulator class control IDs */
-
-#define V4L2_CID_FM_TX_CLASS_BASE		(V4L2_CTRL_CLASS_FM_TX | 0x900)
-#define V4L2_CID_FM_TX_CLASS			(V4L2_CTRL_CLASS_FM_TX | 1)
-
-#define V4L2_CID_RDS_TX_DEVIATION		(V4L2_CID_FM_TX_CLASS_BASE + 1)
-#define V4L2_CID_RDS_TX_PI			(V4L2_CID_FM_TX_CLASS_BASE + 2)
-#define V4L2_CID_RDS_TX_PTY			(V4L2_CID_FM_TX_CLASS_BASE + 3)
-#define V4L2_CID_RDS_TX_PS_NAME			(V4L2_CID_FM_TX_CLASS_BASE + 5)
-#define V4L2_CID_RDS_TX_RADIO_TEXT		(V4L2_CID_FM_TX_CLASS_BASE + 6)
-#define V4L2_CID_RDS_TX_MONO_STEREO		(V4L2_CID_FM_TX_CLASS_BASE + 7)
-#define V4L2_CID_RDS_TX_ARTIFICIAL_HEAD		(V4L2_CID_FM_TX_CLASS_BASE + 8)
-#define V4L2_CID_RDS_TX_COMPRESSED		(V4L2_CID_FM_TX_CLASS_BASE + 9)
-#define V4L2_CID_RDS_TX_DYNAMIC_PTY		(V4L2_CID_FM_TX_CLASS_BASE + 10)
-#define V4L2_CID_RDS_TX_TRAFFIC_ANNOUNCEMENT	(V4L2_CID_FM_TX_CLASS_BASE + 11)
-#define V4L2_CID_RDS_TX_TRAFFIC_PROGRAM		(V4L2_CID_FM_TX_CLASS_BASE + 12)
-#define V4L2_CID_RDS_TX_MUSIC_SPEECH		(V4L2_CID_FM_TX_CLASS_BASE + 13)
-#define V4L2_CID_RDS_TX_ALT_FREQS_ENABLE	(V4L2_CID_FM_TX_CLASS_BASE + 14)
-#define V4L2_CID_RDS_TX_ALT_FREQS		(V4L2_CID_FM_TX_CLASS_BASE + 15)
-
-#define V4L2_CID_AUDIO_LIMITER_ENABLED		(V4L2_CID_FM_TX_CLASS_BASE + 64)
-#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 65)
-#define V4L2_CID_AUDIO_LIMITER_DEVIATION	(V4L2_CID_FM_TX_CLASS_BASE + 66)
-
-#define V4L2_CID_AUDIO_COMPRESSION_ENABLED	(V4L2_CID_FM_TX_CLASS_BASE + 80)
-#define V4L2_CID_AUDIO_COMPRESSION_GAIN		(V4L2_CID_FM_TX_CLASS_BASE + 81)
-#define V4L2_CID_AUDIO_COMPRESSION_THRESHOLD	(V4L2_CID_FM_TX_CLASS_BASE + 82)
-#define V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 83)
-#define V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 84)
-
-#define V4L2_CID_PILOT_TONE_ENABLED		(V4L2_CID_FM_TX_CLASS_BASE + 96)
-#define V4L2_CID_PILOT_TONE_DEVIATION		(V4L2_CID_FM_TX_CLASS_BASE + 97)
-#define V4L2_CID_PILOT_TONE_FREQUENCY		(V4L2_CID_FM_TX_CLASS_BASE + 98)
-
-#define V4L2_CID_TUNE_PREEMPHASIS		(V4L2_CID_FM_TX_CLASS_BASE + 112)
-enum v4l2_preemphasis {
-	V4L2_PREEMPHASIS_DISABLED	= 0,
-	V4L2_PREEMPHASIS_50_uS		= 1,
-	V4L2_PREEMPHASIS_75_uS		= 2,
-};
-#define V4L2_CID_TUNE_POWER_LEVEL		(V4L2_CID_FM_TX_CLASS_BASE + 113)
-#define V4L2_CID_TUNE_ANTENNA_CAPACITOR		(V4L2_CID_FM_TX_CLASS_BASE + 114)
-
-
-/* Flash and privacy (indicator) light controls */
-
-#define V4L2_CID_FLASH_CLASS_BASE		(V4L2_CTRL_CLASS_FLASH | 0x900)
-#define V4L2_CID_FLASH_CLASS			(V4L2_CTRL_CLASS_FLASH | 1)
-
-#define V4L2_CID_FLASH_LED_MODE			(V4L2_CID_FLASH_CLASS_BASE + 1)
-enum v4l2_flash_led_mode {
-	V4L2_FLASH_LED_MODE_NONE,
-	V4L2_FLASH_LED_MODE_FLASH,
-	V4L2_FLASH_LED_MODE_TORCH,
-};
-
-#define V4L2_CID_FLASH_STROBE_SOURCE		(V4L2_CID_FLASH_CLASS_BASE + 2)
-enum v4l2_flash_strobe_source {
-	V4L2_FLASH_STROBE_SOURCE_SOFTWARE,
-	V4L2_FLASH_STROBE_SOURCE_EXTERNAL,
-};
-
-#define V4L2_CID_FLASH_STROBE			(V4L2_CID_FLASH_CLASS_BASE + 3)
-#define V4L2_CID_FLASH_STROBE_STOP		(V4L2_CID_FLASH_CLASS_BASE + 4)
-#define V4L2_CID_FLASH_STROBE_STATUS		(V4L2_CID_FLASH_CLASS_BASE + 5)
-
-#define V4L2_CID_FLASH_TIMEOUT			(V4L2_CID_FLASH_CLASS_BASE + 6)
-#define V4L2_CID_FLASH_INTENSITY		(V4L2_CID_FLASH_CLASS_BASE + 7)
-#define V4L2_CID_FLASH_TORCH_INTENSITY		(V4L2_CID_FLASH_CLASS_BASE + 8)
-#define V4L2_CID_FLASH_INDICATOR_INTENSITY	(V4L2_CID_FLASH_CLASS_BASE + 9)
-
-#define V4L2_CID_FLASH_FAULT			(V4L2_CID_FLASH_CLASS_BASE + 10)
-#define V4L2_FLASH_FAULT_OVER_VOLTAGE		(1 << 0)
-#define V4L2_FLASH_FAULT_TIMEOUT		(1 << 1)
-#define V4L2_FLASH_FAULT_OVER_TEMPERATURE	(1 << 2)
-#define V4L2_FLASH_FAULT_SHORT_CIRCUIT		(1 << 3)
-#define V4L2_FLASH_FAULT_OVER_CURRENT		(1 << 4)
-#define V4L2_FLASH_FAULT_INDICATOR		(1 << 5)
-#define V4L2_FLASH_FAULT_UNDER_VOLTAGE		(1 << 6)
-#define V4L2_FLASH_FAULT_INPUT_VOLTAGE		(1 << 7)
-#define V4L2_FLASH_FAULT_LED_OVER_TEMPERATURE	(1 << 8)
-
-#define V4L2_CID_FLASH_CHARGE			(V4L2_CID_FLASH_CLASS_BASE + 11)
-#define V4L2_CID_FLASH_READY			(V4L2_CID_FLASH_CLASS_BASE + 12)
-
-
-/* JPEG-class control IDs */
-
-#define V4L2_CID_JPEG_CLASS_BASE		(V4L2_CTRL_CLASS_JPEG | 0x900)
-#define V4L2_CID_JPEG_CLASS			(V4L2_CTRL_CLASS_JPEG | 1)
-
-#define	V4L2_CID_JPEG_CHROMA_SUBSAMPLING	(V4L2_CID_JPEG_CLASS_BASE + 1)
-enum v4l2_jpeg_chroma_subsampling {
-	V4L2_JPEG_CHROMA_SUBSAMPLING_444	= 0,
-	V4L2_JPEG_CHROMA_SUBSAMPLING_422	= 1,
-	V4L2_JPEG_CHROMA_SUBSAMPLING_420	= 2,
-	V4L2_JPEG_CHROMA_SUBSAMPLING_411	= 3,
-	V4L2_JPEG_CHROMA_SUBSAMPLING_410	= 4,
-	V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY	= 5,
-};
-#define	V4L2_CID_JPEG_RESTART_INTERVAL		(V4L2_CID_JPEG_CLASS_BASE + 2)
-#define	V4L2_CID_JPEG_COMPRESSION_QUALITY	(V4L2_CID_JPEG_CLASS_BASE + 3)
-
-#define	V4L2_CID_JPEG_ACTIVE_MARKER		(V4L2_CID_JPEG_CLASS_BASE + 4)
-#define	V4L2_JPEG_ACTIVE_MARKER_APP0		(1 << 0)
-#define	V4L2_JPEG_ACTIVE_MARKER_APP1		(1 << 1)
-#define	V4L2_JPEG_ACTIVE_MARKER_COM		(1 << 16)
-#define	V4L2_JPEG_ACTIVE_MARKER_DQT		(1 << 17)
-#define	V4L2_JPEG_ACTIVE_MARKER_DHT		(1 << 18)
-
-
-/* Image source controls */
-#define V4L2_CID_IMAGE_SOURCE_CLASS_BASE	(V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900)
-#define V4L2_CID_IMAGE_SOURCE_CLASS		(V4L2_CTRL_CLASS_IMAGE_SOURCE | 1)
-
-#define V4L2_CID_VBLANK				(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 1)
-#define V4L2_CID_HBLANK				(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 2)
-#define V4L2_CID_ANALOGUE_GAIN			(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 3)
-#define V4L2_CID_TEST_PATTERN_RED		(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 4)
-#define V4L2_CID_TEST_PATTERN_GREENR		(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 5)
-#define V4L2_CID_TEST_PATTERN_BLUE		(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 6)
-#define V4L2_CID_TEST_PATTERN_GREENB		(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 7)
-
-
-/* Image processing controls */
-
-#define V4L2_CID_IMAGE_PROC_CLASS_BASE		(V4L2_CTRL_CLASS_IMAGE_PROC | 0x900)
-#define V4L2_CID_IMAGE_PROC_CLASS		(V4L2_CTRL_CLASS_IMAGE_PROC | 1)
-
-#define V4L2_CID_LINK_FREQ			(V4L2_CID_IMAGE_PROC_CLASS_BASE + 1)
-#define V4L2_CID_PIXEL_RATE			(V4L2_CID_IMAGE_PROC_CLASS_BASE + 2)
-#define V4L2_CID_TEST_PATTERN			(V4L2_CID_IMAGE_PROC_CLASS_BASE + 3)
-
-
-/*  DV-class control IDs defined by V4L2 */
-#define V4L2_CID_DV_CLASS_BASE			(V4L2_CTRL_CLASS_DV | 0x900)
-#define V4L2_CID_DV_CLASS			(V4L2_CTRL_CLASS_DV | 1)
-
-#define	V4L2_CID_DV_TX_HOTPLUG			(V4L2_CID_DV_CLASS_BASE + 1)
-#define	V4L2_CID_DV_TX_RXSENSE			(V4L2_CID_DV_CLASS_BASE + 2)
-#define	V4L2_CID_DV_TX_EDID_PRESENT		(V4L2_CID_DV_CLASS_BASE + 3)
-#define	V4L2_CID_DV_TX_MODE			(V4L2_CID_DV_CLASS_BASE + 4)
-enum v4l2_dv_tx_mode {
-	V4L2_DV_TX_MODE_DVI_D	= 0,
-	V4L2_DV_TX_MODE_HDMI	= 1,
-};
-#define V4L2_CID_DV_TX_RGB_RANGE		(V4L2_CID_DV_CLASS_BASE + 5)
-enum v4l2_dv_rgb_range {
-	V4L2_DV_RGB_RANGE_AUTO	  = 0,
-	V4L2_DV_RGB_RANGE_LIMITED = 1,
-	V4L2_DV_RGB_RANGE_FULL	  = 2,
-};
-
-#define	V4L2_CID_DV_RX_POWER_PRESENT		(V4L2_CID_DV_CLASS_BASE + 100)
-#define V4L2_CID_DV_RX_RGB_RANGE		(V4L2_CID_DV_CLASS_BASE + 101)
-
-#define V4L2_CID_FM_RX_CLASS_BASE		(V4L2_CTRL_CLASS_FM_RX | 0x900)
-#define V4L2_CID_FM_RX_CLASS			(V4L2_CTRL_CLASS_FM_RX | 1)
-
-#define V4L2_CID_TUNE_DEEMPHASIS		(V4L2_CID_FM_RX_CLASS_BASE + 1)
-enum v4l2_deemphasis {
-	V4L2_DEEMPHASIS_DISABLED	= V4L2_PREEMPHASIS_DISABLED,
-	V4L2_DEEMPHASIS_50_uS		= V4L2_PREEMPHASIS_50_uS,
-	V4L2_DEEMPHASIS_75_uS		= V4L2_PREEMPHASIS_75_uS,
-};
-
-#define V4L2_CID_RDS_RECEPTION			(V4L2_CID_FM_RX_CLASS_BASE + 2)
-#define V4L2_CID_RDS_RX_PTY			(V4L2_CID_FM_RX_CLASS_BASE + 3)
-#define V4L2_CID_RDS_RX_PS_NAME			(V4L2_CID_FM_RX_CLASS_BASE + 4)
-#define V4L2_CID_RDS_RX_RADIO_TEXT		(V4L2_CID_FM_RX_CLASS_BASE + 5)
-#define V4L2_CID_RDS_RX_TRAFFIC_ANNOUNCEMENT	(V4L2_CID_FM_RX_CLASS_BASE + 6)
-#define V4L2_CID_RDS_RX_TRAFFIC_PROGRAM		(V4L2_CID_FM_RX_CLASS_BASE + 7)
-#define V4L2_CID_RDS_RX_MUSIC_SPEECH		(V4L2_CID_FM_RX_CLASS_BASE + 8)
-
-#define V4L2_CID_RF_TUNER_CLASS_BASE		(V4L2_CTRL_CLASS_RF_TUNER | 0x900)
-#define V4L2_CID_RF_TUNER_CLASS			(V4L2_CTRL_CLASS_RF_TUNER | 1)
-
-#define V4L2_CID_RF_TUNER_BANDWIDTH_AUTO	(V4L2_CID_RF_TUNER_CLASS_BASE + 11)
-#define V4L2_CID_RF_TUNER_BANDWIDTH		(V4L2_CID_RF_TUNER_CLASS_BASE + 12)
-#define V4L2_CID_RF_TUNER_RF_GAIN		(V4L2_CID_RF_TUNER_CLASS_BASE + 32)
-#define V4L2_CID_RF_TUNER_LNA_GAIN_AUTO		(V4L2_CID_RF_TUNER_CLASS_BASE + 41)
-#define V4L2_CID_RF_TUNER_LNA_GAIN		(V4L2_CID_RF_TUNER_CLASS_BASE + 42)
-#define V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO	(V4L2_CID_RF_TUNER_CLASS_BASE + 51)
-#define V4L2_CID_RF_TUNER_MIXER_GAIN		(V4L2_CID_RF_TUNER_CLASS_BASE + 52)
-#define V4L2_CID_RF_TUNER_IF_GAIN_AUTO		(V4L2_CID_RF_TUNER_CLASS_BASE + 61)
-#define V4L2_CID_RF_TUNER_IF_GAIN		(V4L2_CID_RF_TUNER_CLASS_BASE + 62)
-#define V4L2_CID_RF_TUNER_PLL_LOCK			(V4L2_CID_RF_TUNER_CLASS_BASE + 91)
-
-
-/*  Detection-class control IDs defined by V4L2 */
-#define V4L2_CID_DETECT_CLASS_BASE		(V4L2_CTRL_CLASS_DETECT | 0x900)
-#define V4L2_CID_DETECT_CLASS			(V4L2_CTRL_CLASS_DETECT | 1)
-
-#define V4L2_CID_DETECT_MD_MODE			(V4L2_CID_DETECT_CLASS_BASE + 1)
-enum v4l2_detect_md_mode {
-	V4L2_DETECT_MD_MODE_DISABLED		= 0,
-	V4L2_DETECT_MD_MODE_GLOBAL		= 1,
-	V4L2_DETECT_MD_MODE_THRESHOLD_GRID	= 2,
-	V4L2_DETECT_MD_MODE_REGION_GRID		= 3,
-};
-#define V4L2_CID_DETECT_MD_GLOBAL_THRESHOLD	(V4L2_CID_DETECT_CLASS_BASE + 2)
-#define V4L2_CID_DETECT_MD_THRESHOLD_GRID	(V4L2_CID_DETECT_CLASS_BASE + 3)
-#define V4L2_CID_DETECT_MD_REGION_GRID		(V4L2_CID_DETECT_CLASS_BASE + 4)
-
-#endif
diff --git a/openflow/usr/include/linux/v4l2-dv-timings.h b/openflow/usr/include/linux/v4l2-dv-timings.h
deleted file mode 100644
index c039f1d..0000000
--- a/openflow/usr/include/linux/v4l2-dv-timings.h
+++ /dev/null
@@ -1,927 +0,0 @@
-/*
- * V4L2 DV timings header.
- *
- * Copyright (C) 2012  Hans Verkuil <hans.verkuil@cisco.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef _V4L2_DV_TIMINGS_H
-#define _V4L2_DV_TIMINGS_H
-
-#if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6))
-/* Sadly gcc versions older than 4.6 have a bug in how they initialize
-   anonymous unions where they require additional curly brackets.
-   This violates the C1x standard. This workaround adds the curly brackets
-   if needed. */
-#define V4L2_INIT_BT_TIMINGS(_width, args...) \
-	{ .bt = { _width , ## args } }
-#else
-#define V4L2_INIT_BT_TIMINGS(_width, args...) \
-	.bt = { _width , ## args }
-#endif
-
-/* CEA-861-E timings (i.e. standard HDTV timings) */
-
-#define V4L2_DV_BT_CEA_640X480P59_94 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(640, 480, 0, 0, \
-		25175000, 16, 96, 48, 10, 2, 33, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, 0) \
-}
-
-/* Note: these are the nominal timings, for HDMI links this format is typically
- * double-clocked to meet the minimum pixelclock requirements.  */
-#define V4L2_DV_BT_CEA_720X480I59_94 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(720, 480, 1, 0, \
-		13500000, 19, 62, 57, 4, 3, 15, 4, 3, 16, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_720X480P59_94 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(720, 480, 0, 0, \
-		27000000, 16, 62, 60, 9, 6, 30, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-/* Note: these are the nominal timings, for HDMI links this format is typically
- * double-clocked to meet the minimum pixelclock requirements.  */
-#define V4L2_DV_BT_CEA_720X576I50 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(720, 576, 1, 0, \
-		13500000, 12, 63, 69, 2, 3, 19, 2, 3, 20, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_720X576P50 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(720, 576, 0, 0, \
-		27000000, 12, 64, 68, 5, 5, 39, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1280X720P24 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		59400000, 1760, 40, 220, 5, 5, 20, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS) \
-}
-
-#define V4L2_DV_BT_CEA_1280X720P25 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		74250000, 2420, 40, 220, 5, 5, 20, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1280X720P30 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		74250000, 1760, 40, 220, 5, 5, 20, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1280X720P50 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		74250000, 440, 40, 220, 5, 5, 20, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1280X720P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		74250000, 110, 40, 220, 5, 5, 20, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1920X1080P24 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		74250000, 638, 44, 148, 4, 5, 36, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1920X1080P25 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		74250000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1920X1080P30 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		74250000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1920X1080I50 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1080, 1, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		74250000, 528, 44, 148, 2, 5, 15, 2, 5, 16, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1920X1080P50 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		148500000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1920X1080I60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1080, 1, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		74250000, 88, 44, 148, 2, 5, 15, 2, 5, 16, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | \
-		V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_1920X1080P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		148500000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_3840X2160P24 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		297000000, 1276, 88, 296, 8, 10, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_3840X2160P25 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		297000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_3840X2160P30 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		297000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_3840X2160P50 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		594000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_3840X2160P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		594000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_4096X2160P24 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		297000000, 1020, 88, 296, 8, 10, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_4096X2160P25 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		297000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_4096X2160P30 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		297000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_4096X2160P50 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		594000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-#define V4L2_DV_BT_CEA_4096X2160P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		594000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_CEA861, \
-		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
-}
-
-
-/* VESA Discrete Monitor Timings as per version 1.0, revision 12 */
-
-#define V4L2_DV_BT_DMT_640X350P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(640, 350, 0, V4L2_DV_HSYNC_POS_POL, \
-		31500000, 32, 64, 96, 32, 3, 60, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_640X400P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(640, 400, 0, V4L2_DV_VSYNC_POS_POL, \
-		31500000, 32, 64, 96, 1, 3, 41, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_720X400P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(720, 400, 0, V4L2_DV_VSYNC_POS_POL, \
-		35500000, 36, 72, 108, 1, 3, 42, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-/* VGA resolutions */
-#define V4L2_DV_BT_DMT_640X480P60 V4L2_DV_BT_CEA_640X480P59_94
-
-#define V4L2_DV_BT_DMT_640X480P72 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(640, 480, 0, 0, \
-		31500000, 24, 40, 128, 9, 3, 28, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_640X480P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(640, 480, 0, 0, \
-		31500000, 16, 64, 120, 1, 3, 16, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_640X480P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(640, 480, 0, 0, \
-		36000000, 56, 56, 80, 1, 3, 25, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-/* SVGA resolutions */
-#define V4L2_DV_BT_DMT_800X600P56 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(800, 600, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		36000000, 24, 72, 128, 1, 2, 22, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_800X600P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(800, 600, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		40000000, 40, 128, 88, 1, 4, 23, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_800X600P72 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(800, 600, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		50000000, 56, 120, 64, 37, 6, 23, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_800X600P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(800, 600, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		49500000, 16, 80, 160, 1, 3, 21, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_800X600P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(800, 600, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		56250000, 32, 64, 152, 1, 3, 27, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_800X600P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(800, 600, 0, V4L2_DV_HSYNC_POS_POL, \
-		73250000, 48, 32, 80, 3, 4, 29, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_848X480P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(848, 480, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		33750000, 16, 112, 112, 6, 8, 23, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1024X768I43 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1024, 768, 1, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		44900000, 8, 176, 56, 0, 4, 20, 0, 4, 21, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-/* XGA resolutions */
-#define V4L2_DV_BT_DMT_1024X768P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1024, 768, 0, 0, \
-		65000000, 24, 136, 160, 3, 6, 29, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1024X768P70 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1024, 768, 0, 0, \
-		75000000, 24, 136, 144, 3, 6, 29, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1024X768P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1024, 768, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		78750000, 16, 96, 176, 1, 3, 28, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1024X768P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1024, 768, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		94500000, 48, 96, 208, 1, 3, 36, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1024X768P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1024, 768, 0, V4L2_DV_HSYNC_POS_POL, \
-		115500000, 48, 32, 80, 3, 4, 38, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-/* XGA+ resolution */
-#define V4L2_DV_BT_DMT_1152X864P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1152, 864, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		108000000, 64, 128, 256, 1, 3, 32, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X720P60 V4L2_DV_BT_CEA_1280X720P60
-
-/* WXGA resolutions */
-#define V4L2_DV_BT_DMT_1280X768P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 768, 0, V4L2_DV_HSYNC_POS_POL, \
-		68250000, 48, 32, 80, 3, 7, 12, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1280X768P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 768, 0, V4L2_DV_VSYNC_POS_POL, \
-		79500000, 64, 128, 192, 3, 7, 20, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X768P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 768, 0, V4L2_DV_VSYNC_POS_POL, \
-		102250000, 80, 128, 208, 3, 7, 27, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X768P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 768, 0, V4L2_DV_VSYNC_POS_POL, \
-		117500000, 80, 136, 216, 3, 7, 31, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X768P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 768, 0, V4L2_DV_HSYNC_POS_POL, \
-		140250000, 48, 32, 80, 3, 7, 35, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1280X800P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 800, 0, V4L2_DV_HSYNC_POS_POL, \
-		71000000, 48, 32, 80, 3, 6, 14, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1280X800P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 800, 0, V4L2_DV_VSYNC_POS_POL, \
-		83500000, 72, 128, 200, 3, 6, 22, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X800P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 800, 0, V4L2_DV_VSYNC_POS_POL, \
-		106500000, 80, 128, 208, 3, 6, 29, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X800P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 800, 0, V4L2_DV_VSYNC_POS_POL, \
-		122500000, 80, 136, 216, 3, 6, 34, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X800P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 800, 0, V4L2_DV_HSYNC_POS_POL, \
-		146250000, 48, 32, 80, 3, 6, 38, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1280X960P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 960, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		108000000, 96, 112, 312, 1, 3, 36, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X960P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 960, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		148500000, 64, 160, 224, 1, 3, 47, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X960P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 960, 0, V4L2_DV_HSYNC_POS_POL, \
-		175500000, 48, 32, 80, 3, 4, 50, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-/* SXGA resolutions */
-#define V4L2_DV_BT_DMT_1280X1024P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 1024, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		108000000, 48, 112, 248, 1, 3, 38, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X1024P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 1024, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		135000000, 16, 144, 248, 1, 3, 38, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X1024P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 1024, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		157500000, 64, 160, 224, 1, 3, 44, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1280X1024P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1280, 1024, 0, V4L2_DV_HSYNC_POS_POL, \
-		187250000, 48, 32, 80, 3, 7, 50, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1360X768P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1360, 768, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		85500000, 64, 112, 256, 3, 6, 18, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1360X768P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1360, 768, 0, V4L2_DV_HSYNC_POS_POL, \
-		148250000, 48, 32, 80, 3, 5, 37, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1366X768P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1366, 768, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		85500000, 70, 143, 213, 3, 3, 24, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1366X768P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1366, 768, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		72000000, 14, 56, 64, 1, 3, 28, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-/* SXGA+ resolutions */
-#define V4L2_DV_BT_DMT_1400X1050P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1400, 1050, 0, V4L2_DV_HSYNC_POS_POL, \
-		101000000, 48, 32, 80, 3, 4, 23, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1400X1050P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1400, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
-		121750000, 88, 144, 232, 3, 4, 32, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1400X1050P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1400, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
-		156000000, 104, 144, 248, 3, 4, 42, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1400X1050P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1400, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
-		179500000, 104, 152, 256, 3, 4, 48, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1400X1050P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1400, 1050, 0, V4L2_DV_HSYNC_POS_POL, \
-		208000000, 48, 32, 80, 3, 4, 55, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-/* WXGA+ resolutions */
-#define V4L2_DV_BT_DMT_1440X900P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1440, 900, 0, V4L2_DV_HSYNC_POS_POL, \
-		88750000, 48, 32, 80, 3, 6, 17, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1440X900P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1440, 900, 0, V4L2_DV_VSYNC_POS_POL, \
-		106500000, 80, 152, 232, 3, 6, 25, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1440X900P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1440, 900, 0, V4L2_DV_VSYNC_POS_POL, \
-		136750000, 96, 152, 248, 3, 6, 33, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1440X900P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1440, 900, 0, V4L2_DV_VSYNC_POS_POL, \
-		157000000, 104, 152, 256, 3, 6, 39, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1440X900P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1440, 900, 0, V4L2_DV_HSYNC_POS_POL, \
-		182750000, 48, 32, 80, 3, 6, 44, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1600X900P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1600, 900, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		108000000, 24, 80, 96, 1, 3, 96, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-/* UXGA resolutions */
-#define V4L2_DV_BT_DMT_1600X1200P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1600, 1200, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		162000000, 64, 192, 304, 1, 3, 46, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1600X1200P65 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1600, 1200, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		175500000, 64, 192, 304, 1, 3, 46, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1600X1200P70 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1600, 1200, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		189000000, 64, 192, 304, 1, 3, 46, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1600X1200P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1600, 1200, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		202500000, 64, 192, 304, 1, 3, 46, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1600X1200P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1600, 1200, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		229500000, 64, 192, 304, 1, 3, 46, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1600X1200P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1600, 1200, 0, V4L2_DV_HSYNC_POS_POL, \
-		268250000, 48, 32, 80, 3, 4, 64, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-/* WSXGA+ resolutions */
-#define V4L2_DV_BT_DMT_1680X1050P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1680, 1050, 0, V4L2_DV_HSYNC_POS_POL, \
-		119000000, 48, 32, 80, 3, 6, 21, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1680X1050P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1680, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
-		146250000, 104, 176, 280, 3, 6, 30, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1680X1050P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1680, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
-		187000000, 120, 176, 296, 3, 6, 40, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1680X1050P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1680, 1050, 0, V4L2_DV_VSYNC_POS_POL, \
-		214750000, 128, 176, 304, 3, 6, 46, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1680X1050P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1680, 1050, 0, V4L2_DV_HSYNC_POS_POL, \
-		245500000, 48, 32, 80, 3, 6, 53, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1792X1344P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1792, 1344, 0, V4L2_DV_VSYNC_POS_POL, \
-		204750000, 128, 200, 328, 1, 3, 46, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1792X1344P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1792, 1344, 0, V4L2_DV_VSYNC_POS_POL, \
-		261000000, 96, 216, 352, 1, 3, 69, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1792X1344P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1792, 1344, 0, V4L2_DV_HSYNC_POS_POL, \
-		333250000, 48, 32, 80, 3, 4, 72, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1856X1392P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1856, 1392, 0, V4L2_DV_VSYNC_POS_POL, \
-		218250000, 96, 224, 352, 1, 3, 43, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1856X1392P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1856, 1392, 0, V4L2_DV_VSYNC_POS_POL, \
-		288000000, 128, 224, 352, 1, 3, 104, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1856X1392P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1856, 1392, 0, V4L2_DV_HSYNC_POS_POL, \
-		356500000, 48, 32, 80, 3, 4, 75, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1920X1080P60 V4L2_DV_BT_CEA_1920X1080P60
-
-/* WUXGA resolutions */
-#define V4L2_DV_BT_DMT_1920X1200P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1200, 0, V4L2_DV_HSYNC_POS_POL, \
-		154000000, 48, 32, 80, 3, 6, 26, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1920X1200P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1200, 0, V4L2_DV_VSYNC_POS_POL, \
-		193250000, 136, 200, 336, 3, 6, 36, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1920X1200P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1200, 0, V4L2_DV_VSYNC_POS_POL, \
-		245250000, 136, 208, 344, 3, 6, 46, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1920X1200P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1200, 0, V4L2_DV_VSYNC_POS_POL, \
-		281250000, 144, 208, 352, 3, 6, 53, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1920X1200P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1200, 0, V4L2_DV_HSYNC_POS_POL, \
-		317000000, 48, 32, 80, 3, 6, 62, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_1920X1440P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1440, 0, V4L2_DV_VSYNC_POS_POL, \
-		234000000, 128, 208, 344, 1, 3, 56, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1920X1440P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1440, 0, V4L2_DV_VSYNC_POS_POL, \
-		297000000, 144, 224, 352, 1, 3, 56, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_1920X1440P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(1920, 1440, 0, V4L2_DV_HSYNC_POS_POL, \
-		380500000, 48, 32, 80, 3, 4, 78, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_2048X1152P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(2048, 1152, 0, \
-		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
-		162000000, 26, 80, 96, 1, 3, 44, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT, V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-/* WQXGA resolutions */
-#define V4L2_DV_BT_DMT_2560X1600P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(2560, 1600, 0, V4L2_DV_HSYNC_POS_POL, \
-		268500000, 48, 32, 80, 3, 6, 37, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_2560X1600P60 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(2560, 1600, 0, V4L2_DV_VSYNC_POS_POL, \
-		348500000, 192, 280, 472, 3, 6, 49, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_2560X1600P75 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(2560, 1600, 0, V4L2_DV_VSYNC_POS_POL, \
-		443250000, 208, 280, 488, 3, 6, 63, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_2560X1600P85 { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(2560, 1600, 0, V4L2_DV_VSYNC_POS_POL, \
-		505250000, 208, 280, 488, 3, 6, 73, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, 0) \
-}
-
-#define V4L2_DV_BT_DMT_2560X1600P120_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(2560, 1600, 0, V4L2_DV_HSYNC_POS_POL, \
-		552750000, 48, 32, 80, 3, 6, 85, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-/* 4K resolutions */
-#define V4L2_DV_BT_DMT_4096X2160P60_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		556744000, 8, 32, 40, 48, 8, 6, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#define V4L2_DV_BT_DMT_4096X2160P59_94_RB { \
-	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
-		556188000, 8, 32, 40, 48, 8, 6, 0, 0, 0, \
-		V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CVT, \
-		V4L2_DV_FL_REDUCED_BLANKING) \
-}
-
-#endif
diff --git a/openflow/usr/include/linux/v4l2-mediabus.h b/openflow/usr/include/linux/v4l2-mediabus.h
deleted file mode 100644
index dbacc51..0000000
--- a/openflow/usr/include/linux/v4l2-mediabus.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Media Bus API header
- *
- * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __LINUX_V4L2_MEDIABUS_H
-#define __LINUX_V4L2_MEDIABUS_H
-
-#include <linux/media-bus-format.h>
-#include <linux/types.h>
-#include <linux/videodev2.h>
-
-/**
- * struct v4l2_mbus_framefmt - frame format on the media bus
- * @width:	frame width
- * @height:	frame height
- * @code:	data format code (from enum v4l2_mbus_pixelcode)
- * @field:	used interlacing type (from enum v4l2_field)
- * @colorspace:	colorspace of the data (from enum v4l2_colorspace)
- * @ycbcr_enc:	YCbCr encoding of the data (from enum v4l2_ycbcr_encoding)
- * @quantization: quantization of the data (from enum v4l2_quantization)
- * @xfer_func:  transfer function of the data (from enum v4l2_xfer_func)
- */
-struct v4l2_mbus_framefmt {
-	__u32			width;
-	__u32			height;
-	__u32			code;
-	__u32			field;
-	__u32			colorspace;
-	__u16			ycbcr_enc;
-	__u16			quantization;
-	__u16			xfer_func;
-	__u16			reserved[11];
-};
-
-/*
- * enum v4l2_mbus_pixelcode and its definitions are now deprecated, and
- * MEDIA_BUS_FMT_ definitions (defined in media-bus-format.h) should be
- * used instead.
- *
- * New defines should only be added to media-bus-format.h. The
- * v4l2_mbus_pixelcode enum is frozen.
- */
-
-#define V4L2_MBUS_FROM_MEDIA_BUS_FMT(name)	\
-	V4L2_MBUS_FMT_ ## name = MEDIA_BUS_FMT_ ## name
-
-enum v4l2_mbus_pixelcode {
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(FIXED),
-
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(RGB444_2X8_PADHI_BE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(RGB444_2X8_PADHI_LE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(RGB555_2X8_PADHI_BE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(RGB555_2X8_PADHI_LE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(BGR565_2X8_BE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(BGR565_2X8_LE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(RGB565_2X8_BE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(RGB565_2X8_LE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(RGB666_1X18),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(RGB888_1X24),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(RGB888_2X12_BE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(RGB888_2X12_LE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(ARGB8888_1X32),
-
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(Y8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(UV8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(UYVY8_1_5X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(VYUY8_1_5X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YUYV8_1_5X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YVYU8_1_5X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(UYVY8_2X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(VYUY8_2X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YUYV8_2X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YVYU8_2X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(Y10_1X10),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(UYVY10_2X10),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(VYUY10_2X10),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YUYV10_2X10),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YVYU10_2X10),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(Y12_1X12),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(UYVY8_1X16),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(VYUY8_1X16),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YUYV8_1X16),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YVYU8_1X16),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YDYUYDYV8_1X16),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(UYVY10_1X20),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(VYUY10_1X20),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YUYV10_1X20),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YVYU10_1X20),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YUV10_1X30),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(AYUV8_1X32),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(UYVY12_2X12),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(VYUY12_2X12),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YUYV12_2X12),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YVYU12_2X12),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(UYVY12_1X24),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(VYUY12_1X24),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YUYV12_1X24),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(YVYU12_1X24),
-
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SBGGR8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SGBRG8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SGRBG8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SRGGB8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SBGGR10_ALAW8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SGBRG10_ALAW8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SGRBG10_ALAW8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SRGGB10_ALAW8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SBGGR10_DPCM8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SGBRG10_DPCM8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SGRBG10_DPCM8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SRGGB10_DPCM8_1X8),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SBGGR10_2X8_PADHI_BE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SBGGR10_2X8_PADHI_LE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SBGGR10_2X8_PADLO_BE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SBGGR10_2X8_PADLO_LE),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SBGGR10_1X10),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SGBRG10_1X10),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SGRBG10_1X10),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SRGGB10_1X10),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SBGGR12_1X12),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SGBRG12_1X12),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SGRBG12_1X12),
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(SRGGB12_1X12),
-
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(JPEG_1X8),
-
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(S5C_UYVY_JPEG_1X8),
-
-	V4L2_MBUS_FROM_MEDIA_BUS_FMT(AHSV8888_1X32),
-};
-
-#endif
diff --git a/openflow/usr/include/linux/v4l2-subdev.h b/openflow/usr/include/linux/v4l2-subdev.h
deleted file mode 100644
index dbce2b5..0000000
--- a/openflow/usr/include/linux/v4l2-subdev.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * V4L2 subdev userspace API
- *
- * Copyright (C) 2010 Nokia Corporation
- *
- * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- *	     Sakari Ailus <sakari.ailus@iki.fi>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __LINUX_V4L2_SUBDEV_H
-#define __LINUX_V4L2_SUBDEV_H
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-#include <linux/v4l2-common.h>
-#include <linux/v4l2-mediabus.h>
-
-/**
- * enum v4l2_subdev_format_whence - Media bus format type
- * @V4L2_SUBDEV_FORMAT_TRY: try format, for negotiation only
- * @V4L2_SUBDEV_FORMAT_ACTIVE: active format, applied to the device
- */
-enum v4l2_subdev_format_whence {
-	V4L2_SUBDEV_FORMAT_TRY = 0,
-	V4L2_SUBDEV_FORMAT_ACTIVE = 1,
-};
-
-/**
- * struct v4l2_subdev_format - Pad-level media bus format
- * @which: format type (from enum v4l2_subdev_format_whence)
- * @pad: pad number, as reported by the media API
- * @format: media bus format (format code and frame size)
- */
-struct v4l2_subdev_format {
-	__u32 which;
-	__u32 pad;
-	struct v4l2_mbus_framefmt format;
-	__u32 reserved[8];
-};
-
-/**
- * struct v4l2_subdev_crop - Pad-level crop settings
- * @which: format type (from enum v4l2_subdev_format_whence)
- * @pad: pad number, as reported by the media API
- * @rect: pad crop rectangle boundaries
- */
-struct v4l2_subdev_crop {
-	__u32 which;
-	__u32 pad;
-	struct v4l2_rect rect;
-	__u32 reserved[8];
-};
-
-/**
- * struct v4l2_subdev_mbus_code_enum - Media bus format enumeration
- * @pad: pad number, as reported by the media API
- * @index: format index during enumeration
- * @code: format code (MEDIA_BUS_FMT_ definitions)
- * @which: format type (from enum v4l2_subdev_format_whence)
- */
-struct v4l2_subdev_mbus_code_enum {
-	__u32 pad;
-	__u32 index;
-	__u32 code;
-	__u32 which;
-	__u32 reserved[8];
-};
-
-/**
- * struct v4l2_subdev_frame_size_enum - Media bus format enumeration
- * @pad: pad number, as reported by the media API
- * @index: format index during enumeration
- * @code: format code (MEDIA_BUS_FMT_ definitions)
- * @which: format type (from enum v4l2_subdev_format_whence)
- */
-struct v4l2_subdev_frame_size_enum {
-	__u32 index;
-	__u32 pad;
-	__u32 code;
-	__u32 min_width;
-	__u32 max_width;
-	__u32 min_height;
-	__u32 max_height;
-	__u32 which;
-	__u32 reserved[8];
-};
-
-/**
- * struct v4l2_subdev_frame_interval - Pad-level frame rate
- * @pad: pad number, as reported by the media API
- * @interval: frame interval in seconds
- */
-struct v4l2_subdev_frame_interval {
-	__u32 pad;
-	struct v4l2_fract interval;
-	__u32 reserved[9];
-};
-
-/**
- * struct v4l2_subdev_frame_interval_enum - Frame interval enumeration
- * @pad: pad number, as reported by the media API
- * @index: frame interval index during enumeration
- * @code: format code (MEDIA_BUS_FMT_ definitions)
- * @width: frame width in pixels
- * @height: frame height in pixels
- * @interval: frame interval in seconds
- * @which: format type (from enum v4l2_subdev_format_whence)
- */
-struct v4l2_subdev_frame_interval_enum {
-	__u32 index;
-	__u32 pad;
-	__u32 code;
-	__u32 width;
-	__u32 height;
-	struct v4l2_fract interval;
-	__u32 which;
-	__u32 reserved[8];
-};
-
-/**
- * struct v4l2_subdev_selection - selection info
- *
- * @which: either V4L2_SUBDEV_FORMAT_ACTIVE or V4L2_SUBDEV_FORMAT_TRY
- * @pad: pad number, as reported by the media API
- * @target: Selection target, used to choose one of possible rectangles,
- *	    defined in v4l2-common.h; V4L2_SEL_TGT_* .
- * @flags: constraint flags, defined in v4l2-common.h; V4L2_SEL_FLAG_*.
- * @r: coordinates of the selection window
- * @reserved: for future use, set to zero for now
- *
- * Hardware may use multiple helper windows to process a video stream.
- * The structure is used to exchange this selection areas between
- * an application and a driver.
- */
-struct v4l2_subdev_selection {
-	__u32 which;
-	__u32 pad;
-	__u32 target;
-	__u32 flags;
-	struct v4l2_rect r;
-	__u32 reserved[8];
-};
-
-/* Backwards compatibility define --- to be removed */
-#define v4l2_subdev_edid v4l2_edid
-
-#define VIDIOC_SUBDEV_G_FMT			_IOWR('V',  4, struct v4l2_subdev_format)
-#define VIDIOC_SUBDEV_S_FMT			_IOWR('V',  5, struct v4l2_subdev_format)
-#define VIDIOC_SUBDEV_G_FRAME_INTERVAL		_IOWR('V', 21, struct v4l2_subdev_frame_interval)
-#define VIDIOC_SUBDEV_S_FRAME_INTERVAL		_IOWR('V', 22, struct v4l2_subdev_frame_interval)
-#define VIDIOC_SUBDEV_ENUM_MBUS_CODE		_IOWR('V',  2, struct v4l2_subdev_mbus_code_enum)
-#define VIDIOC_SUBDEV_ENUM_FRAME_SIZE		_IOWR('V', 74, struct v4l2_subdev_frame_size_enum)
-#define VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL	_IOWR('V', 75, struct v4l2_subdev_frame_interval_enum)
-#define VIDIOC_SUBDEV_G_CROP			_IOWR('V', 59, struct v4l2_subdev_crop)
-#define VIDIOC_SUBDEV_S_CROP			_IOWR('V', 60, struct v4l2_subdev_crop)
-#define VIDIOC_SUBDEV_G_SELECTION		_IOWR('V', 61, struct v4l2_subdev_selection)
-#define VIDIOC_SUBDEV_S_SELECTION		_IOWR('V', 62, struct v4l2_subdev_selection)
-/* The following ioctls are identical to the ioctls in videodev2.h */
-#define VIDIOC_SUBDEV_G_EDID			_IOWR('V', 40, struct v4l2_edid)
-#define VIDIOC_SUBDEV_S_EDID			_IOWR('V', 41, struct v4l2_edid)
-#define VIDIOC_SUBDEV_S_DV_TIMINGS		_IOWR('V', 87, struct v4l2_dv_timings)
-#define VIDIOC_SUBDEV_G_DV_TIMINGS		_IOWR('V', 88, struct v4l2_dv_timings)
-#define VIDIOC_SUBDEV_ENUM_DV_TIMINGS		_IOWR('V', 98, struct v4l2_enum_dv_timings)
-#define VIDIOC_SUBDEV_QUERY_DV_TIMINGS		_IOR('V', 99, struct v4l2_dv_timings)
-#define VIDIOC_SUBDEV_DV_TIMINGS_CAP		_IOWR('V', 100, struct v4l2_dv_timings_cap)
-
-#endif
diff --git a/openflow/usr/include/linux/version.h b/openflow/usr/include/linux/version.h
deleted file mode 100644
index 6653169..0000000
--- a/openflow/usr/include/linux/version.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define LINUX_VERSION_CODE 263174
-#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/openflow/usr/include/linux/veth.h b/openflow/usr/include/linux/veth.h
deleted file mode 100644
index 3354c1e..0000000
--- a/openflow/usr/include/linux/veth.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __NET_VETH_H_
-#define __NET_VETH_H_
-
-enum {
-	VETH_INFO_UNSPEC,
-	VETH_INFO_PEER,
-
-	__VETH_INFO_MAX
-#define VETH_INFO_MAX	(__VETH_INFO_MAX - 1)
-};
-
-#endif
diff --git a/openflow/usr/include/linux/vfio.h b/openflow/usr/include/linux/vfio.h
deleted file mode 100644
index aa276bc..0000000
--- a/openflow/usr/include/linux/vfio.h
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * VFIO API definition
- *
- * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
- *     Author: Alex Williamson <alex.williamson@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef VFIO_H
-#define VFIO_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-#define VFIO_API_VERSION	0
-
-
-/* Kernel & User level defines for VFIO IOCTLs. */
-
-/* Extensions */
-
-#define VFIO_TYPE1_IOMMU		1
-#define VFIO_SPAPR_TCE_IOMMU		2
-#define VFIO_TYPE1v2_IOMMU		3
-/*
- * IOMMU enforces DMA cache coherence (ex. PCIe NoSnoop stripping).  This
- * capability is subject to change as groups are added or removed.
- */
-#define VFIO_DMA_CC_IOMMU		4
-
-/* Check if EEH is supported */
-#define VFIO_EEH			5
-
-/* Two-stage IOMMU */
-#define VFIO_TYPE1_NESTING_IOMMU	6	/* Implies v2 */
-
-#define VFIO_SPAPR_TCE_v2_IOMMU		7
-
-/*
- * The IOCTL interface is designed for extensibility by embedding the
- * structure length (argsz) and flags into structures passed between
- * kernel and userspace.  We therefore use the _IO() macro for these
- * defines to avoid implicitly embedding a size into the ioctl request.
- * As structure fields are added, argsz will increase to match and flag
- * bits will be defined to indicate additional fields with valid data.
- * It's *always* the caller's responsibility to indicate the size of
- * the structure passed by setting argsz appropriately.
- */
-
-#define VFIO_TYPE	(';')
-#define VFIO_BASE	100
-
-/* -------- IOCTLs for VFIO file descriptor (/dev/vfio/vfio) -------- */
-
-/**
- * VFIO_GET_API_VERSION - _IO(VFIO_TYPE, VFIO_BASE + 0)
- *
- * Report the version of the VFIO API.  This allows us to bump the entire
- * API version should we later need to add or change features in incompatible
- * ways.
- * Return: VFIO_API_VERSION
- * Availability: Always
- */
-#define VFIO_GET_API_VERSION		_IO(VFIO_TYPE, VFIO_BASE + 0)
-
-/**
- * VFIO_CHECK_EXTENSION - _IOW(VFIO_TYPE, VFIO_BASE + 1, __u32)
- *
- * Check whether an extension is supported.
- * Return: 0 if not supported, 1 (or some other positive integer) if supported.
- * Availability: Always
- */
-#define VFIO_CHECK_EXTENSION		_IO(VFIO_TYPE, VFIO_BASE + 1)
-
-/**
- * VFIO_SET_IOMMU - _IOW(VFIO_TYPE, VFIO_BASE + 2, __s32)
- *
- * Set the iommu to the given type.  The type must be supported by an
- * iommu driver as verified by calling CHECK_EXTENSION using the same
- * type.  A group must be set to this file descriptor before this
- * ioctl is available.  The IOMMU interfaces enabled by this call are
- * specific to the value set.
- * Return: 0 on success, -errno on failure
- * Availability: When VFIO group attached
- */
-#define VFIO_SET_IOMMU			_IO(VFIO_TYPE, VFIO_BASE + 2)
-
-/* -------- IOCTLs for GROUP file descriptors (/dev/vfio/$GROUP) -------- */
-
-/**
- * VFIO_GROUP_GET_STATUS - _IOR(VFIO_TYPE, VFIO_BASE + 3,
- *						struct vfio_group_status)
- *
- * Retrieve information about the group.  Fills in provided
- * struct vfio_group_info.  Caller sets argsz.
- * Return: 0 on succes, -errno on failure.
- * Availability: Always
- */
-struct vfio_group_status {
-	__u32	argsz;
-	__u32	flags;
-#define VFIO_GROUP_FLAGS_VIABLE		(1 << 0)
-#define VFIO_GROUP_FLAGS_CONTAINER_SET	(1 << 1)
-};
-#define VFIO_GROUP_GET_STATUS		_IO(VFIO_TYPE, VFIO_BASE + 3)
-
-/**
- * VFIO_GROUP_SET_CONTAINER - _IOW(VFIO_TYPE, VFIO_BASE + 4, __s32)
- *
- * Set the container for the VFIO group to the open VFIO file
- * descriptor provided.  Groups may only belong to a single
- * container.  Containers may, at their discretion, support multiple
- * groups.  Only when a container is set are all of the interfaces
- * of the VFIO file descriptor and the VFIO group file descriptor
- * available to the user.
- * Return: 0 on success, -errno on failure.
- * Availability: Always
- */
-#define VFIO_GROUP_SET_CONTAINER	_IO(VFIO_TYPE, VFIO_BASE + 4)
-
-/**
- * VFIO_GROUP_UNSET_CONTAINER - _IO(VFIO_TYPE, VFIO_BASE + 5)
- *
- * Remove the group from the attached container.  This is the
- * opposite of the SET_CONTAINER call and returns the group to
- * an initial state.  All device file descriptors must be released
- * prior to calling this interface.  When removing the last group
- * from a container, the IOMMU will be disabled and all state lost,
- * effectively also returning the VFIO file descriptor to an initial
- * state.
- * Return: 0 on success, -errno on failure.
- * Availability: When attached to container
- */
-#define VFIO_GROUP_UNSET_CONTAINER	_IO(VFIO_TYPE, VFIO_BASE + 5)
-
-/**
- * VFIO_GROUP_GET_DEVICE_FD - _IOW(VFIO_TYPE, VFIO_BASE + 6, char)
- *
- * Return a new file descriptor for the device object described by
- * the provided string.  The string should match a device listed in
- * the devices subdirectory of the IOMMU group sysfs entry.  The
- * group containing the device must already be added to this context.
- * Return: new file descriptor on success, -errno on failure.
- * Availability: When attached to container
- */
-#define VFIO_GROUP_GET_DEVICE_FD	_IO(VFIO_TYPE, VFIO_BASE + 6)
-
-/* --------------- IOCTLs for DEVICE file descriptors --------------- */
-
-/**
- * VFIO_DEVICE_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 7,
- *						struct vfio_device_info)
- *
- * Retrieve information about the device.  Fills in provided
- * struct vfio_device_info.  Caller sets argsz.
- * Return: 0 on success, -errno on failure.
- */
-struct vfio_device_info {
-	__u32	argsz;
-	__u32	flags;
-#define VFIO_DEVICE_FLAGS_RESET	(1 << 0)	/* Device supports reset */
-#define VFIO_DEVICE_FLAGS_PCI	(1 << 1)	/* vfio-pci device */
-#define VFIO_DEVICE_FLAGS_PLATFORM (1 << 2)	/* vfio-platform device */
-#define VFIO_DEVICE_FLAGS_AMBA  (1 << 3)	/* vfio-amba device */
-	__u32	num_regions;	/* Max region index + 1 */
-	__u32	num_irqs;	/* Max IRQ index + 1 */
-};
-#define VFIO_DEVICE_GET_INFO		_IO(VFIO_TYPE, VFIO_BASE + 7)
-
-/**
- * VFIO_DEVICE_GET_REGION_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 8,
- *				       struct vfio_region_info)
- *
- * Retrieve information about a device region.  Caller provides
- * struct vfio_region_info with index value set.  Caller sets argsz.
- * Implementation of region mapping is bus driver specific.  This is
- * intended to describe MMIO, I/O port, as well as bus specific
- * regions (ex. PCI config space).  Zero sized regions may be used
- * to describe unimplemented regions (ex. unimplemented PCI BARs).
- * Return: 0 on success, -errno on failure.
- */
-struct vfio_region_info {
-	__u32	argsz;
-	__u32	flags;
-#define VFIO_REGION_INFO_FLAG_READ	(1 << 0) /* Region supports read */
-#define VFIO_REGION_INFO_FLAG_WRITE	(1 << 1) /* Region supports write */
-#define VFIO_REGION_INFO_FLAG_MMAP	(1 << 2) /* Region supports mmap */
-	__u32	index;		/* Region index */
-	__u32	resv;		/* Reserved for alignment */
-	__u64	size;		/* Region size (bytes) */
-	__u64	offset;		/* Region offset from start of device fd */
-};
-#define VFIO_DEVICE_GET_REGION_INFO	_IO(VFIO_TYPE, VFIO_BASE + 8)
-
-/**
- * VFIO_DEVICE_GET_IRQ_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 9,
- *				    struct vfio_irq_info)
- *
- * Retrieve information about a device IRQ.  Caller provides
- * struct vfio_irq_info with index value set.  Caller sets argsz.
- * Implementation of IRQ mapping is bus driver specific.  Indexes
- * using multiple IRQs are primarily intended to support MSI-like
- * interrupt blocks.  Zero count irq blocks may be used to describe
- * unimplemented interrupt types.
- *
- * The EVENTFD flag indicates the interrupt index supports eventfd based
- * signaling.
- *
- * The MASKABLE flags indicates the index supports MASK and UNMASK
- * actions described below.
- *
- * AUTOMASKED indicates that after signaling, the interrupt line is
- * automatically masked by VFIO and the user needs to unmask the line
- * to receive new interrupts.  This is primarily intended to distinguish
- * level triggered interrupts.
- *
- * The NORESIZE flag indicates that the interrupt lines within the index
- * are setup as a set and new subindexes cannot be enabled without first
- * disabling the entire index.  This is used for interrupts like PCI MSI
- * and MSI-X where the driver may only use a subset of the available
- * indexes, but VFIO needs to enable a specific number of vectors
- * upfront.  In the case of MSI-X, where the user can enable MSI-X and
- * then add and unmask vectors, it's up to userspace to make the decision
- * whether to allocate the maximum supported number of vectors or tear
- * down setup and incrementally increase the vectors as each is enabled.
- */
-struct vfio_irq_info {
-	__u32	argsz;
-	__u32	flags;
-#define VFIO_IRQ_INFO_EVENTFD		(1 << 0)
-#define VFIO_IRQ_INFO_MASKABLE		(1 << 1)
-#define VFIO_IRQ_INFO_AUTOMASKED	(1 << 2)
-#define VFIO_IRQ_INFO_NORESIZE		(1 << 3)
-	__u32	index;		/* IRQ index */
-	__u32	count;		/* Number of IRQs within this index */
-};
-#define VFIO_DEVICE_GET_IRQ_INFO	_IO(VFIO_TYPE, VFIO_BASE + 9)
-
-/**
- * VFIO_DEVICE_SET_IRQS - _IOW(VFIO_TYPE, VFIO_BASE + 10, struct vfio_irq_set)
- *
- * Set signaling, masking, and unmasking of interrupts.  Caller provides
- * struct vfio_irq_set with all fields set.  'start' and 'count' indicate
- * the range of subindexes being specified.
- *
- * The DATA flags specify the type of data provided.  If DATA_NONE, the
- * operation performs the specified action immediately on the specified
- * interrupt(s).  For example, to unmask AUTOMASKED interrupt [0,0]:
- * flags = (DATA_NONE|ACTION_UNMASK), index = 0, start = 0, count = 1.
- *
- * DATA_BOOL allows sparse support for the same on arrays of interrupts.
- * For example, to mask interrupts [0,1] and [0,3] (but not [0,2]):
- * flags = (DATA_BOOL|ACTION_MASK), index = 0, start = 1, count = 3,
- * data = {1,0,1}
- *
- * DATA_EVENTFD binds the specified ACTION to the provided __s32 eventfd.
- * A value of -1 can be used to either de-assign interrupts if already
- * assigned or skip un-assigned interrupts.  For example, to set an eventfd
- * to be trigger for interrupts [0,0] and [0,2]:
- * flags = (DATA_EVENTFD|ACTION_TRIGGER), index = 0, start = 0, count = 3,
- * data = {fd1, -1, fd2}
- * If index [0,1] is previously set, two count = 1 ioctls calls would be
- * required to set [0,0] and [0,2] without changing [0,1].
- *
- * Once a signaling mechanism is set, DATA_BOOL or DATA_NONE can be used
- * with ACTION_TRIGGER to perform kernel level interrupt loopback testing
- * from userspace (ie. simulate hardware triggering).
- *
- * Setting of an event triggering mechanism to userspace for ACTION_TRIGGER
- * enables the interrupt index for the device.  Individual subindex interrupts
- * can be disabled using the -1 value for DATA_EVENTFD or the index can be
- * disabled as a whole with: flags = (DATA_NONE|ACTION_TRIGGER), count = 0.
- *
- * Note that ACTION_[UN]MASK specify user->kernel signaling (irqfds) while
- * ACTION_TRIGGER specifies kernel->user signaling.
- */
-struct vfio_irq_set {
-	__u32	argsz;
-	__u32	flags;
-#define VFIO_IRQ_SET_DATA_NONE		(1 << 0) /* Data not present */
-#define VFIO_IRQ_SET_DATA_BOOL		(1 << 1) /* Data is bool (u8) */
-#define VFIO_IRQ_SET_DATA_EVENTFD	(1 << 2) /* Data is eventfd (s32) */
-#define VFIO_IRQ_SET_ACTION_MASK	(1 << 3) /* Mask interrupt */
-#define VFIO_IRQ_SET_ACTION_UNMASK	(1 << 4) /* Unmask interrupt */
-#define VFIO_IRQ_SET_ACTION_TRIGGER	(1 << 5) /* Trigger interrupt */
-	__u32	index;
-	__u32	start;
-	__u32	count;
-	__u8	data[];
-};
-#define VFIO_DEVICE_SET_IRQS		_IO(VFIO_TYPE, VFIO_BASE + 10)
-
-#define VFIO_IRQ_SET_DATA_TYPE_MASK	(VFIO_IRQ_SET_DATA_NONE | \
-					 VFIO_IRQ_SET_DATA_BOOL | \
-					 VFIO_IRQ_SET_DATA_EVENTFD)
-#define VFIO_IRQ_SET_ACTION_TYPE_MASK	(VFIO_IRQ_SET_ACTION_MASK | \
-					 VFIO_IRQ_SET_ACTION_UNMASK | \
-					 VFIO_IRQ_SET_ACTION_TRIGGER)
-/**
- * VFIO_DEVICE_RESET - _IO(VFIO_TYPE, VFIO_BASE + 11)
- *
- * Reset a device.
- */
-#define VFIO_DEVICE_RESET		_IO(VFIO_TYPE, VFIO_BASE + 11)
-
-/*
- * The VFIO-PCI bus driver makes use of the following fixed region and
- * IRQ index mapping.  Unimplemented regions return a size of zero.
- * Unimplemented IRQ types return a count of zero.
- */
-
-enum {
-	VFIO_PCI_BAR0_REGION_INDEX,
-	VFIO_PCI_BAR1_REGION_INDEX,
-	VFIO_PCI_BAR2_REGION_INDEX,
-	VFIO_PCI_BAR3_REGION_INDEX,
-	VFIO_PCI_BAR4_REGION_INDEX,
-	VFIO_PCI_BAR5_REGION_INDEX,
-	VFIO_PCI_ROM_REGION_INDEX,
-	VFIO_PCI_CONFIG_REGION_INDEX,
-	/*
-	 * Expose VGA regions defined for PCI base class 03, subclass 00.
-	 * This includes I/O port ranges 0x3b0 to 0x3bb and 0x3c0 to 0x3df
-	 * as well as the MMIO range 0xa0000 to 0xbffff.  Each implemented
-	 * range is found at it's identity mapped offset from the region
-	 * offset, for example 0x3b0 is region_info.offset + 0x3b0.  Areas
-	 * between described ranges are unimplemented.
-	 */
-	VFIO_PCI_VGA_REGION_INDEX,
-	VFIO_PCI_NUM_REGIONS
-};
-
-enum {
-	VFIO_PCI_INTX_IRQ_INDEX,
-	VFIO_PCI_MSI_IRQ_INDEX,
-	VFIO_PCI_MSIX_IRQ_INDEX,
-	VFIO_PCI_ERR_IRQ_INDEX,
-	VFIO_PCI_REQ_IRQ_INDEX,
-	VFIO_PCI_NUM_IRQS
-};
-
-/**
- * VFIO_DEVICE_GET_PCI_HOT_RESET_INFO - _IORW(VFIO_TYPE, VFIO_BASE + 12,
- *					      struct vfio_pci_hot_reset_info)
- *
- * Return: 0 on success, -errno on failure:
- *	-enospc = insufficient buffer, -enodev = unsupported for device.
- */
-struct vfio_pci_dependent_device {
-	__u32	group_id;
-	__u16	segment;
-	__u8	bus;
-	__u8	devfn; /* Use PCI_SLOT/PCI_FUNC */
-};
-
-struct vfio_pci_hot_reset_info {
-	__u32	argsz;
-	__u32	flags;
-	__u32	count;
-	struct vfio_pci_dependent_device	devices[];
-};
-
-#define VFIO_DEVICE_GET_PCI_HOT_RESET_INFO	_IO(VFIO_TYPE, VFIO_BASE + 12)
-
-/**
- * VFIO_DEVICE_PCI_HOT_RESET - _IOW(VFIO_TYPE, VFIO_BASE + 13,
- *				    struct vfio_pci_hot_reset)
- *
- * Return: 0 on success, -errno on failure.
- */
-struct vfio_pci_hot_reset {
-	__u32	argsz;
-	__u32	flags;
-	__u32	count;
-	__s32	group_fds[];
-};
-
-#define VFIO_DEVICE_PCI_HOT_RESET	_IO(VFIO_TYPE, VFIO_BASE + 13)
-
-/* -------- API for Type1 VFIO IOMMU -------- */
-
-/**
- * VFIO_IOMMU_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 12, struct vfio_iommu_info)
- *
- * Retrieve information about the IOMMU object. Fills in provided
- * struct vfio_iommu_info. Caller sets argsz.
- *
- * XXX Should we do these by CHECK_EXTENSION too?
- */
-struct vfio_iommu_type1_info {
-	__u32	argsz;
-	__u32	flags;
-#define VFIO_IOMMU_INFO_PGSIZES (1 << 0)	/* supported page sizes info */
-	__u64	iova_pgsizes;		/* Bitmap of supported page sizes */
-};
-
-#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
-
-/**
- * VFIO_IOMMU_MAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 13, struct vfio_dma_map)
- *
- * Map process virtual addresses to IO virtual addresses using the
- * provided struct vfio_dma_map. Caller sets argsz. READ &/ WRITE required.
- */
-struct vfio_iommu_type1_dma_map {
-	__u32	argsz;
-	__u32	flags;
-#define VFIO_DMA_MAP_FLAG_READ (1 << 0)		/* readable from device */
-#define VFIO_DMA_MAP_FLAG_WRITE (1 << 1)	/* writable from device */
-	__u64	vaddr;				/* Process virtual address */
-	__u64	iova;				/* IO virtual address */
-	__u64	size;				/* Size of mapping (bytes) */
-};
-
-#define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13)
-
-/**
- * VFIO_IOMMU_UNMAP_DMA - _IOWR(VFIO_TYPE, VFIO_BASE + 14,
- *							struct vfio_dma_unmap)
- *
- * Unmap IO virtual addresses using the provided struct vfio_dma_unmap.
- * Caller sets argsz.  The actual unmapped size is returned in the size
- * field.  No guarantee is made to the user that arbitrary unmaps of iova
- * or size different from those used in the original mapping call will
- * succeed.
- */
-struct vfio_iommu_type1_dma_unmap {
-	__u32	argsz;
-	__u32	flags;
-	__u64	iova;				/* IO virtual address */
-	__u64	size;				/* Size of mapping (bytes) */
-};
-
-#define VFIO_IOMMU_UNMAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 14)
-
-/*
- * IOCTLs to enable/disable IOMMU container usage.
- * No parameters are supported.
- */
-#define VFIO_IOMMU_ENABLE	_IO(VFIO_TYPE, VFIO_BASE + 15)
-#define VFIO_IOMMU_DISABLE	_IO(VFIO_TYPE, VFIO_BASE + 16)
-
-/* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */
-
-/*
- * The SPAPR TCE DDW info struct provides the information about
- * the details of Dynamic DMA window capability.
- *
- * @pgsizes contains a page size bitmask, 4K/64K/16M are supported.
- * @max_dynamic_windows_supported tells the maximum number of windows
- * which the platform can create.
- * @levels tells the maximum number of levels in multi-level IOMMU tables;
- * this allows splitting a table into smaller chunks which reduces
- * the amount of physically contiguous memory required for the table.
- */
-struct vfio_iommu_spapr_tce_ddw_info {
-	__u64 pgsizes;			/* Bitmap of supported page sizes */
-	__u32 max_dynamic_windows_supported;
-	__u32 levels;
-};
-
-/*
- * The SPAPR TCE info struct provides the information about the PCI bus
- * address ranges available for DMA, these values are programmed into
- * the hardware so the guest has to know that information.
- *
- * The DMA 32 bit window start is an absolute PCI bus address.
- * The IOVA address passed via map/unmap ioctls are absolute PCI bus
- * addresses too so the window works as a filter rather than an offset
- * for IOVA addresses.
- *
- * Flags supported:
- * - VFIO_IOMMU_SPAPR_INFO_DDW: informs the userspace that dynamic DMA windows
- *   (DDW) support is present. @ddw is only supported when DDW is present.
- */
-struct vfio_iommu_spapr_tce_info {
-	__u32 argsz;
-	__u32 flags;
-#define VFIO_IOMMU_SPAPR_INFO_DDW	(1 << 0)	/* DDW supported */
-	__u32 dma32_window_start;	/* 32 bit window start (bytes) */
-	__u32 dma32_window_size;	/* 32 bit window size (bytes) */
-	struct vfio_iommu_spapr_tce_ddw_info ddw;
-};
-
-#define VFIO_IOMMU_SPAPR_TCE_GET_INFO	_IO(VFIO_TYPE, VFIO_BASE + 12)
-
-/*
- * EEH PE operation struct provides ways to:
- * - enable/disable EEH functionality;
- * - unfreeze IO/DMA for frozen PE;
- * - read PE state;
- * - reset PE;
- * - configure PE;
- * - inject EEH error.
- */
-struct vfio_eeh_pe_err {
-	__u32 type;
-	__u32 func;
-	__u64 addr;
-	__u64 mask;
-};
-
-struct vfio_eeh_pe_op {
-	__u32 argsz;
-	__u32 flags;
-	__u32 op;
-	union {
-		struct vfio_eeh_pe_err err;
-	};
-};
-
-#define VFIO_EEH_PE_DISABLE		0	/* Disable EEH functionality */
-#define VFIO_EEH_PE_ENABLE		1	/* Enable EEH functionality  */
-#define VFIO_EEH_PE_UNFREEZE_IO		2	/* Enable IO for frozen PE   */
-#define VFIO_EEH_PE_UNFREEZE_DMA	3	/* Enable DMA for frozen PE  */
-#define VFIO_EEH_PE_GET_STATE		4	/* PE state retrieval        */
-#define  VFIO_EEH_PE_STATE_NORMAL	0	/* PE in functional state    */
-#define  VFIO_EEH_PE_STATE_RESET	1	/* PE reset in progress      */
-#define  VFIO_EEH_PE_STATE_STOPPED	2	/* Stopped DMA and IO        */
-#define  VFIO_EEH_PE_STATE_STOPPED_DMA	4	/* Stopped DMA only          */
-#define  VFIO_EEH_PE_STATE_UNAVAIL	5	/* State unavailable         */
-#define VFIO_EEH_PE_RESET_DEACTIVATE	5	/* Deassert PE reset         */
-#define VFIO_EEH_PE_RESET_HOT		6	/* Assert hot reset          */
-#define VFIO_EEH_PE_RESET_FUNDAMENTAL	7	/* Assert fundamental reset  */
-#define VFIO_EEH_PE_CONFIGURE		8	/* PE configuration          */
-#define VFIO_EEH_PE_INJECT_ERR		9	/* Inject EEH error          */
-
-#define VFIO_EEH_PE_OP			_IO(VFIO_TYPE, VFIO_BASE + 21)
-
-/**
- * VFIO_IOMMU_SPAPR_REGISTER_MEMORY - _IOW(VFIO_TYPE, VFIO_BASE + 17, struct vfio_iommu_spapr_register_memory)
- *
- * Registers user space memory where DMA is allowed. It pins
- * user pages and does the locked memory accounting so
- * subsequent VFIO_IOMMU_MAP_DMA/VFIO_IOMMU_UNMAP_DMA calls
- * get faster.
- */
-struct vfio_iommu_spapr_register_memory {
-	__u32	argsz;
-	__u32	flags;
-	__u64	vaddr;				/* Process virtual address */
-	__u64	size;				/* Size of mapping (bytes) */
-};
-#define VFIO_IOMMU_SPAPR_REGISTER_MEMORY	_IO(VFIO_TYPE, VFIO_BASE + 17)
-
-/**
- * VFIO_IOMMU_SPAPR_UNREGISTER_MEMORY - _IOW(VFIO_TYPE, VFIO_BASE + 18, struct vfio_iommu_spapr_register_memory)
- *
- * Unregisters user space memory registered with
- * VFIO_IOMMU_SPAPR_REGISTER_MEMORY.
- * Uses vfio_iommu_spapr_register_memory for parameters.
- */
-#define VFIO_IOMMU_SPAPR_UNREGISTER_MEMORY	_IO(VFIO_TYPE, VFIO_BASE + 18)
-
-/**
- * VFIO_IOMMU_SPAPR_TCE_CREATE - _IOWR(VFIO_TYPE, VFIO_BASE + 19, struct vfio_iommu_spapr_tce_create)
- *
- * Creates an additional TCE table and programs it (sets a new DMA window)
- * to every IOMMU group in the container. It receives page shift, window
- * size and number of levels in the TCE table being created.
- *
- * It allocates and returns an offset on a PCI bus of the new DMA window.
- */
-struct vfio_iommu_spapr_tce_create {
-	__u32 argsz;
-	__u32 flags;
-	/* in */
-	__u32 page_shift;
-	__u64 window_size;
-	__u32 levels;
-	/* out */
-	__u64 start_addr;
-};
-#define VFIO_IOMMU_SPAPR_TCE_CREATE	_IO(VFIO_TYPE, VFIO_BASE + 19)
-
-/**
- * VFIO_IOMMU_SPAPR_TCE_REMOVE - _IOW(VFIO_TYPE, VFIO_BASE + 20, struct vfio_iommu_spapr_tce_remove)
- *
- * Unprograms a TCE table from all groups in the container and destroys it.
- * It receives a PCI bus offset as a window id.
- */
-struct vfio_iommu_spapr_tce_remove {
-	__u32 argsz;
-	__u32 flags;
-	/* in */
-	__u64 start_addr;
-};
-#define VFIO_IOMMU_SPAPR_TCE_REMOVE	_IO(VFIO_TYPE, VFIO_BASE + 20)
-
-/* ***************************************************************** */
-
-#endif /* VFIO_H */
diff --git a/openflow/usr/include/linux/vhost.h b/openflow/usr/include/linux/vhost.h
deleted file mode 100644
index ead86db..0000000
--- a/openflow/usr/include/linux/vhost.h
+++ /dev/null
@@ -1,172 +0,0 @@
-#ifndef _LINUX_VHOST_H
-#define _LINUX_VHOST_H
-/* Userspace interface for in-kernel virtio accelerators. */
-
-/* vhost is used to reduce the number of system calls involved in virtio.
- *
- * Existing virtio net code is used in the guest without modification.
- *
- * This header includes interface used by userspace hypervisor for
- * device configuration.
- */
-
-#include <linux/types.h>
-
-#include <linux/ioctl.h>
-#include <linux/virtio_config.h>
-#include <linux/virtio_ring.h>
-
-struct vhost_vring_state {
-	unsigned int index;
-	unsigned int num;
-};
-
-struct vhost_vring_file {
-	unsigned int index;
-	int fd; /* Pass -1 to unbind from file. */
-
-};
-
-struct vhost_vring_addr {
-	unsigned int index;
-	/* Option flags. */
-	unsigned int flags;
-	/* Flag values: */
-	/* Whether log address is valid. If set enables logging. */
-#define VHOST_VRING_F_LOG 0
-
-	/* Start of array of descriptors (virtually contiguous) */
-	__u64 desc_user_addr;
-	/* Used structure address. Must be 32 bit aligned */
-	__u64 used_user_addr;
-	/* Available structure address. Must be 16 bit aligned */
-	__u64 avail_user_addr;
-	/* Logging support. */
-	/* Log writes to used structure, at offset calculated from specified
-	 * address. Address must be 32 bit aligned. */
-	__u64 log_guest_addr;
-};
-
-struct vhost_memory_region {
-	__u64 guest_phys_addr;
-	__u64 memory_size; /* bytes */
-	__u64 userspace_addr;
-	__u64 flags_padding; /* No flags are currently specified. */
-};
-
-/* All region addresses and sizes must be 4K aligned. */
-#define VHOST_PAGE_SIZE 0x1000
-
-struct vhost_memory {
-	__u32 nregions;
-	__u32 padding;
-	struct vhost_memory_region regions[0];
-};
-
-/* ioctls */
-
-#define VHOST_VIRTIO 0xAF
-
-/* Features bitmask for forward compatibility.  Transport bits are used for
- * vhost specific features. */
-#define VHOST_GET_FEATURES	_IOR(VHOST_VIRTIO, 0x00, __u64)
-#define VHOST_SET_FEATURES	_IOW(VHOST_VIRTIO, 0x00, __u64)
-
-/* Set current process as the (exclusive) owner of this file descriptor.  This
- * must be called before any other vhost command.  Further calls to
- * VHOST_OWNER_SET fail until VHOST_OWNER_RESET is called. */
-#define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01)
-/* Give up ownership, and reset the device to default values.
- * Allows subsequent call to VHOST_OWNER_SET to succeed. */
-#define VHOST_RESET_OWNER _IO(VHOST_VIRTIO, 0x02)
-
-/* Set up/modify memory layout */
-#define VHOST_SET_MEM_TABLE	_IOW(VHOST_VIRTIO, 0x03, struct vhost_memory)
-
-/* Write logging setup. */
-/* Memory writes can optionally be logged by setting bit at an offset
- * (calculated from the physical address) from specified log base.
- * The bit is set using an atomic 32 bit operation. */
-/* Set base address for logging. */
-#define VHOST_SET_LOG_BASE _IOW(VHOST_VIRTIO, 0x04, __u64)
-/* Specify an eventfd file descriptor to signal on log write. */
-#define VHOST_SET_LOG_FD _IOW(VHOST_VIRTIO, 0x07, int)
-
-/* Ring setup. */
-/* Set number of descriptors in ring. This parameter can not
- * be modified while ring is running (bound to a device). */
-#define VHOST_SET_VRING_NUM _IOW(VHOST_VIRTIO, 0x10, struct vhost_vring_state)
-/* Set addresses for the ring. */
-#define VHOST_SET_VRING_ADDR _IOW(VHOST_VIRTIO, 0x11, struct vhost_vring_addr)
-/* Base value where queue looks for available descriptors */
-#define VHOST_SET_VRING_BASE _IOW(VHOST_VIRTIO, 0x12, struct vhost_vring_state)
-/* Get accessor: reads index, writes value in num */
-#define VHOST_GET_VRING_BASE _IOWR(VHOST_VIRTIO, 0x12, struct vhost_vring_state)
-
-/* Set the vring byte order in num. Valid values are VHOST_VRING_LITTLE_ENDIAN
- * or VHOST_VRING_BIG_ENDIAN (other values return -EINVAL).
- * The byte order cannot be changed while the device is active: trying to do so
- * returns -EBUSY.
- * This is a legacy only API that is simply ignored when VIRTIO_F_VERSION_1 is
- * set.
- * Not all kernel configurations support this ioctl, but all configurations that
- * support SET also support GET.
- */
-#define VHOST_VRING_LITTLE_ENDIAN 0
-#define VHOST_VRING_BIG_ENDIAN 1
-#define VHOST_SET_VRING_ENDIAN _IOW(VHOST_VIRTIO, 0x13, struct vhost_vring_state)
-#define VHOST_GET_VRING_ENDIAN _IOW(VHOST_VIRTIO, 0x14, struct vhost_vring_state)
-
-/* The following ioctls use eventfd file descriptors to signal and poll
- * for events. */
-
-/* Set eventfd to poll for added buffers */
-#define VHOST_SET_VRING_KICK _IOW(VHOST_VIRTIO, 0x20, struct vhost_vring_file)
-/* Set eventfd to signal when buffers have beed used */
-#define VHOST_SET_VRING_CALL _IOW(VHOST_VIRTIO, 0x21, struct vhost_vring_file)
-/* Set eventfd to signal an error */
-#define VHOST_SET_VRING_ERR _IOW(VHOST_VIRTIO, 0x22, struct vhost_vring_file)
-
-/* VHOST_NET specific defines */
-
-/* Attach virtio net ring to a raw socket, or tap device.
- * The socket must be already bound to an ethernet device, this device will be
- * used for transmit.  Pass fd -1 to unbind from the socket and the transmit
- * device.  This can be used to stop the ring (e.g. for migration). */
-#define VHOST_NET_SET_BACKEND _IOW(VHOST_VIRTIO, 0x30, struct vhost_vring_file)
-
-/* Feature bits */
-/* Log all write descriptors. Can be changed while device is active. */
-#define VHOST_F_LOG_ALL 26
-/* vhost-net should add virtio_net_hdr for RX, and strip for TX packets. */
-#define VHOST_NET_F_VIRTIO_NET_HDR 27
-
-/* VHOST_SCSI specific definitions */
-
-/*
- * Used by QEMU userspace to ensure a consistent vhost-scsi ABI.
- *
- * ABI Rev 0: July 2012 version starting point for v3.6-rc merge candidate +
- *            RFC-v2 vhost-scsi userspace.  Add GET_ABI_VERSION ioctl usage
- * ABI Rev 1: January 2013. Ignore vhost_tpgt filed in struct vhost_scsi_target.
- *            All the targets under vhost_wwpn can be seen and used by guset.
- */
-
-#define VHOST_SCSI_ABI_VERSION	1
-
-struct vhost_scsi_target {
-	int abi_version;
-	char vhost_wwpn[224]; /* TRANSPORT_IQN_LEN */
-	unsigned short vhost_tpgt;
-	unsigned short reserved;
-};
-
-#define VHOST_SCSI_SET_ENDPOINT _IOW(VHOST_VIRTIO, 0x40, struct vhost_scsi_target)
-#define VHOST_SCSI_CLEAR_ENDPOINT _IOW(VHOST_VIRTIO, 0x41, struct vhost_scsi_target)
-/* Changing this breaks userspace. */
-#define VHOST_SCSI_GET_ABI_VERSION _IOW(VHOST_VIRTIO, 0x42, int)
-/* Set and get the events missed flag */
-#define VHOST_SCSI_SET_EVENTS_MISSED _IOW(VHOST_VIRTIO, 0x43, __u32)
-#define VHOST_SCSI_GET_EVENTS_MISSED _IOW(VHOST_VIRTIO, 0x44, __u32)
-
-#endif
diff --git a/openflow/usr/include/linux/videodev2.h b/openflow/usr/include/linux/videodev2.h
deleted file mode 100644
index efa5432..0000000
--- a/openflow/usr/include/linux/videodev2.h
+++ /dev/null
@@ -1,2295 +0,0 @@
-/*
- *  Video for Linux Two header file
- *
- *  Copyright (C) 1999-2012 the contributors
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  Alternatively you can redistribute this file under the terms of the
- *  BSD license as stated below:
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *  3. The names of its contributors may not be used to endorse or promote
- *     products derived from this software without specific prior written
- *     permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	Header file for v4l or V4L2 drivers and applications
- * with public API.
- * All kernel-specific stuff were moved to media/v4l2-dev.h, so
- * no #if __KERNEL tests are allowed here
- *
- *	See http://linuxtv.org for more info
- *
- *	Author: Bill Dirks <bill@thedirks.org>
- *		Justin Schoeman
- *              Hans Verkuil <hverkuil@xs4all.nl>
- *		et al.
- */
-#ifndef __LINUX_VIDEODEV2_H
-#define __LINUX_VIDEODEV2_H
-
-#include <sys/time.h>
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-#include <linux/v4l2-common.h>
-#include <linux/v4l2-controls.h>
-
-/*
- * Common stuff for both V4L1 and V4L2
- * Moved from videodev.h
- */
-#define VIDEO_MAX_FRAME               32
-#define VIDEO_MAX_PLANES               8
-
-/*
- *	M I S C E L L A N E O U S
- */
-
-/*  Four-character-code (FOURCC) */
-#define v4l2_fourcc(a, b, c, d)\
-	((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
-#define v4l2_fourcc_be(a, b, c, d)	(v4l2_fourcc(a, b, c, d) | (1 << 31))
-
-/*
- *	E N U M S
- */
-enum v4l2_field {
-	V4L2_FIELD_ANY           = 0, /* driver can choose from none,
-					 top, bottom, interlaced
-					 depending on whatever it thinks
-					 is approximate ... */
-	V4L2_FIELD_NONE          = 1, /* this device has no fields ... */
-	V4L2_FIELD_TOP           = 2, /* top field only */
-	V4L2_FIELD_BOTTOM        = 3, /* bottom field only */
-	V4L2_FIELD_INTERLACED    = 4, /* both fields interlaced */
-	V4L2_FIELD_SEQ_TB        = 5, /* both fields sequential into one
-					 buffer, top-bottom order */
-	V4L2_FIELD_SEQ_BT        = 6, /* same as above + bottom-top order */
-	V4L2_FIELD_ALTERNATE     = 7, /* both fields alternating into
-					 separate buffers */
-	V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
-					 first and the top field is
-					 transmitted first */
-	V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
-					 first and the bottom field is
-					 transmitted first */
-};
-#define V4L2_FIELD_HAS_TOP(field)	\
-	((field) == V4L2_FIELD_TOP 	||\
-	 (field) == V4L2_FIELD_INTERLACED ||\
-	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-	 (field) == V4L2_FIELD_SEQ_TB	||\
-	 (field) == V4L2_FIELD_SEQ_BT)
-#define V4L2_FIELD_HAS_BOTTOM(field)	\
-	((field) == V4L2_FIELD_BOTTOM 	||\
-	 (field) == V4L2_FIELD_INTERLACED ||\
-	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-	 (field) == V4L2_FIELD_SEQ_TB	||\
-	 (field) == V4L2_FIELD_SEQ_BT)
-#define V4L2_FIELD_HAS_BOTH(field)	\
-	((field) == V4L2_FIELD_INTERLACED ||\
-	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-	 (field) == V4L2_FIELD_SEQ_TB ||\
-	 (field) == V4L2_FIELD_SEQ_BT)
-#define V4L2_FIELD_HAS_T_OR_B(field)	\
-	((field) == V4L2_FIELD_BOTTOM ||\
-	 (field) == V4L2_FIELD_TOP ||\
-	 (field) == V4L2_FIELD_ALTERNATE)
-
-enum v4l2_buf_type {
-	V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
-	V4L2_BUF_TYPE_VIDEO_OUTPUT         = 2,
-	V4L2_BUF_TYPE_VIDEO_OVERLAY        = 3,
-	V4L2_BUF_TYPE_VBI_CAPTURE          = 4,
-	V4L2_BUF_TYPE_VBI_OUTPUT           = 5,
-	V4L2_BUF_TYPE_SLICED_VBI_CAPTURE   = 6,
-	V4L2_BUF_TYPE_SLICED_VBI_OUTPUT    = 7,
-#if 1
-	/* Experimental */
-	V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
-#endif
-	V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
-	V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE  = 10,
-	V4L2_BUF_TYPE_SDR_CAPTURE          = 11,
-	V4L2_BUF_TYPE_SDR_OUTPUT           = 12,
-	/* Deprecated, do not use */
-	V4L2_BUF_TYPE_PRIVATE              = 0x80,
-};
-
-#define V4L2_TYPE_IS_MULTIPLANAR(type)			\
-	((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE	\
-	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-
-#define V4L2_TYPE_IS_OUTPUT(type)				\
-	((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT			\
-	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE		\
-	 || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY		\
-	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY	\
-	 || (type) == V4L2_BUF_TYPE_VBI_OUTPUT			\
-	 || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT		\
-	 || (type) == V4L2_BUF_TYPE_SDR_OUTPUT)
-
-enum v4l2_tuner_type {
-	V4L2_TUNER_RADIO	     = 1,
-	V4L2_TUNER_ANALOG_TV	     = 2,
-	V4L2_TUNER_DIGITAL_TV	     = 3,
-	V4L2_TUNER_SDR               = 4,
-	V4L2_TUNER_RF                = 5,
-};
-
-/* Deprecated, do not use */
-#define V4L2_TUNER_ADC  V4L2_TUNER_SDR
-
-enum v4l2_memory {
-	V4L2_MEMORY_MMAP             = 1,
-	V4L2_MEMORY_USERPTR          = 2,
-	V4L2_MEMORY_OVERLAY          = 3,
-	V4L2_MEMORY_DMABUF           = 4,
-};
-
-/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
-enum v4l2_colorspace {
-	/*
-	 * Default colorspace, i.e. let the driver figure it out.
-	 * Can only be used with video capture.
-	 */
-	V4L2_COLORSPACE_DEFAULT       = 0,
-
-	/* SMPTE 170M: used for broadcast NTSC/PAL SDTV */
-	V4L2_COLORSPACE_SMPTE170M     = 1,
-
-	/* Obsolete pre-1998 SMPTE 240M HDTV standard, superseded by Rec 709 */
-	V4L2_COLORSPACE_SMPTE240M     = 2,
-
-	/* Rec.709: used for HDTV */
-	V4L2_COLORSPACE_REC709        = 3,
-
-	/*
-	 * Deprecated, do not use. No driver will ever return this. This was
-	 * based on a misunderstanding of the bt878 datasheet.
-	 */
-	V4L2_COLORSPACE_BT878         = 4,
-
-	/*
-	 * NTSC 1953 colorspace. This only makes sense when dealing with
-	 * really, really old NTSC recordings. Superseded by SMPTE 170M.
-	 */
-	V4L2_COLORSPACE_470_SYSTEM_M  = 5,
-
-	/*
-	 * EBU Tech 3213 PAL/SECAM colorspace. This only makes sense when
-	 * dealing with really old PAL/SECAM recordings. Superseded by
-	 * SMPTE 170M.
-	 */
-	V4L2_COLORSPACE_470_SYSTEM_BG = 6,
-
-	/*
-	 * Effectively shorthand for V4L2_COLORSPACE_SRGB, V4L2_YCBCR_ENC_601
-	 * and V4L2_QUANTIZATION_FULL_RANGE. To be used for (Motion-)JPEG.
-	 */
-	V4L2_COLORSPACE_JPEG          = 7,
-
-	/* For RGB colorspaces such as produces by most webcams. */
-	V4L2_COLORSPACE_SRGB          = 8,
-
-	/* AdobeRGB colorspace */
-	V4L2_COLORSPACE_ADOBERGB      = 9,
-
-	/* BT.2020 colorspace, used for UHDTV. */
-	V4L2_COLORSPACE_BT2020        = 10,
-
-	/* Raw colorspace: for RAW unprocessed images */
-	V4L2_COLORSPACE_RAW           = 11,
-
-	/* DCI-P3 colorspace, used by cinema projectors */
-	V4L2_COLORSPACE_DCI_P3        = 12,
-};
-
-/*
- * Determine how COLORSPACE_DEFAULT should map to a proper colorspace.
- * This depends on whether this is a SDTV image (use SMPTE 170M), an
- * HDTV image (use Rec. 709), or something else (use sRGB).
- */
-#define V4L2_MAP_COLORSPACE_DEFAULT(is_sdtv, is_hdtv) \
-	((is_sdtv) ? V4L2_COLORSPACE_SMPTE170M : \
-	 ((is_hdtv) ? V4L2_COLORSPACE_REC709 : V4L2_COLORSPACE_SRGB))
-
-enum v4l2_xfer_func {
-	/*
-	 * Mapping of V4L2_XFER_FUNC_DEFAULT to actual transfer functions
-	 * for the various colorspaces:
-	 *
-	 * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M,
-	 * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_REC709 and
-	 * V4L2_COLORSPACE_BT2020: V4L2_XFER_FUNC_709
-	 *
-	 * V4L2_COLORSPACE_SRGB, V4L2_COLORSPACE_JPEG: V4L2_XFER_FUNC_SRGB
-	 *
-	 * V4L2_COLORSPACE_ADOBERGB: V4L2_XFER_FUNC_ADOBERGB
-	 *
-	 * V4L2_COLORSPACE_SMPTE240M: V4L2_XFER_FUNC_SMPTE240M
-	 *
-	 * V4L2_COLORSPACE_RAW: V4L2_XFER_FUNC_NONE
-	 *
-	 * V4L2_COLORSPACE_DCI_P3: V4L2_XFER_FUNC_DCI_P3
-	 */
-	V4L2_XFER_FUNC_DEFAULT     = 0,
-	V4L2_XFER_FUNC_709         = 1,
-	V4L2_XFER_FUNC_SRGB        = 2,
-	V4L2_XFER_FUNC_ADOBERGB    = 3,
-	V4L2_XFER_FUNC_SMPTE240M   = 4,
-	V4L2_XFER_FUNC_NONE        = 5,
-	V4L2_XFER_FUNC_DCI_P3      = 6,
-	V4L2_XFER_FUNC_SMPTE2084   = 7,
-};
-
-/*
- * Determine how XFER_FUNC_DEFAULT should map to a proper transfer function.
- * This depends on the colorspace.
- */
-#define V4L2_MAP_XFER_FUNC_DEFAULT(colsp) \
-	((colsp) == V4L2_COLORSPACE_ADOBERGB ? V4L2_XFER_FUNC_ADOBERGB : \
-	 ((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_XFER_FUNC_SMPTE240M : \
-	  ((colsp) == V4L2_COLORSPACE_DCI_P3 ? V4L2_XFER_FUNC_DCI_P3 : \
-	   ((colsp) == V4L2_COLORSPACE_RAW ? V4L2_XFER_FUNC_NONE : \
-	    ((colsp) == V4L2_COLORSPACE_SRGB || (colsp) == V4L2_COLORSPACE_JPEG ? \
-	     V4L2_XFER_FUNC_SRGB : V4L2_XFER_FUNC_709)))))
-
-enum v4l2_ycbcr_encoding {
-	/*
-	 * Mapping of V4L2_YCBCR_ENC_DEFAULT to actual encodings for the
-	 * various colorspaces:
-	 *
-	 * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M,
-	 * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_ADOBERGB and
-	 * V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601
-	 *
-	 * V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709
-	 *
-	 * V4L2_COLORSPACE_SRGB: V4L2_YCBCR_ENC_SYCC
-	 *
-	 * V4L2_COLORSPACE_BT2020: V4L2_YCBCR_ENC_BT2020
-	 *
-	 * V4L2_COLORSPACE_SMPTE240M: V4L2_YCBCR_ENC_SMPTE240M
-	 */
-	V4L2_YCBCR_ENC_DEFAULT        = 0,
-
-	/* ITU-R 601 -- SDTV */
-	V4L2_YCBCR_ENC_601            = 1,
-
-	/* Rec. 709 -- HDTV */
-	V4L2_YCBCR_ENC_709            = 2,
-
-	/* ITU-R 601/EN 61966-2-4 Extended Gamut -- SDTV */
-	V4L2_YCBCR_ENC_XV601          = 3,
-
-	/* Rec. 709/EN 61966-2-4 Extended Gamut -- HDTV */
-	V4L2_YCBCR_ENC_XV709          = 4,
-
-	/* sYCC (Y'CbCr encoding of sRGB) */
-	V4L2_YCBCR_ENC_SYCC           = 5,
-
-	/* BT.2020 Non-constant Luminance Y'CbCr */
-	V4L2_YCBCR_ENC_BT2020         = 6,
-
-	/* BT.2020 Constant Luminance Y'CbcCrc */
-	V4L2_YCBCR_ENC_BT2020_CONST_LUM = 7,
-
-	/* SMPTE 240M -- Obsolete HDTV */
-	V4L2_YCBCR_ENC_SMPTE240M      = 8,
-};
-
-/*
- * Determine how YCBCR_ENC_DEFAULT should map to a proper Y'CbCr encoding.
- * This depends on the colorspace.
- */
-#define V4L2_MAP_YCBCR_ENC_DEFAULT(colsp) \
-	(((colsp) == V4L2_COLORSPACE_REC709 || \
-	  (colsp) == V4L2_COLORSPACE_DCI_P3) ? V4L2_YCBCR_ENC_709 : \
-	 ((colsp) == V4L2_COLORSPACE_BT2020 ? V4L2_YCBCR_ENC_BT2020 : \
-	  ((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_YCBCR_ENC_SMPTE240M : \
-	   V4L2_YCBCR_ENC_601)))
-
-enum v4l2_quantization {
-	/*
-	 * The default for R'G'B' quantization is always full range, except
-	 * for the BT2020 colorspace. For Y'CbCr the quantization is always
-	 * limited range, except for COLORSPACE_JPEG, SYCC, XV601 or XV709:
-	 * those are full range.
-	 */
-	V4L2_QUANTIZATION_DEFAULT     = 0,
-	V4L2_QUANTIZATION_FULL_RANGE  = 1,
-	V4L2_QUANTIZATION_LIM_RANGE   = 2,
-};
-
-/*
- * Determine how QUANTIZATION_DEFAULT should map to a proper quantization.
- * This depends on whether the image is RGB or not, the colorspace and the
- * Y'CbCr encoding.
- */
-#define V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb, colsp, ycbcr_enc) \
-	(((is_rgb) && (colsp) == V4L2_COLORSPACE_BT2020) ? V4L2_QUANTIZATION_LIM_RANGE : \
-	 (((is_rgb) || (ycbcr_enc) == V4L2_YCBCR_ENC_XV601 || \
-	  (ycbcr_enc) == V4L2_YCBCR_ENC_XV709 || (colsp) == V4L2_COLORSPACE_JPEG) ? \
-	 V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE))
-
-enum v4l2_priority {
-	V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
-	V4L2_PRIORITY_BACKGROUND  = 1,
-	V4L2_PRIORITY_INTERACTIVE = 2,
-	V4L2_PRIORITY_RECORD      = 3,
-	V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
-};
-
-struct v4l2_rect {
-	__s32   left;
-	__s32   top;
-	__u32   width;
-	__u32   height;
-};
-
-struct v4l2_fract {
-	__u32   numerator;
-	__u32   denominator;
-};
-
-/**
-  * struct v4l2_capability - Describes V4L2 device caps returned by VIDIOC_QUERYCAP
-  *
-  * @driver:	   name of the driver module (e.g. "bttv")
-  * @card:	   name of the card (e.g. "Hauppauge WinTV")
-  * @bus_info:	   name of the bus (e.g. "PCI:" + pci_name(pci_dev) )
-  * @version:	   KERNEL_VERSION
-  * @capabilities: capabilities of the physical device as a whole
-  * @device_caps:  capabilities accessed via this particular device (node)
-  * @reserved:	   reserved fields for future extensions
-  */
-struct v4l2_capability {
-	__u8	driver[16];
-	__u8	card[32];
-	__u8	bus_info[32];
-	__u32   version;
-	__u32	capabilities;
-	__u32	device_caps;
-	__u32	reserved[3];
-};
-
-/* Values for 'capabilities' field */
-#define V4L2_CAP_VIDEO_CAPTURE		0x00000001  /* Is a video capture device */
-#define V4L2_CAP_VIDEO_OUTPUT		0x00000002  /* Is a video output device */
-#define V4L2_CAP_VIDEO_OVERLAY		0x00000004  /* Can do video overlay */
-#define V4L2_CAP_VBI_CAPTURE		0x00000010  /* Is a raw VBI capture device */
-#define V4L2_CAP_VBI_OUTPUT		0x00000020  /* Is a raw VBI output device */
-#define V4L2_CAP_SLICED_VBI_CAPTURE	0x00000040  /* Is a sliced VBI capture device */
-#define V4L2_CAP_SLICED_VBI_OUTPUT	0x00000080  /* Is a sliced VBI output device */
-#define V4L2_CAP_RDS_CAPTURE		0x00000100  /* RDS data capture */
-#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY	0x00000200  /* Can do video output overlay */
-#define V4L2_CAP_HW_FREQ_SEEK		0x00000400  /* Can do hardware frequency seek  */
-#define V4L2_CAP_RDS_OUTPUT		0x00000800  /* Is an RDS encoder */
-
-/* Is a video capture device that supports multiplanar formats */
-#define V4L2_CAP_VIDEO_CAPTURE_MPLANE	0x00001000
-/* Is a video output device that supports multiplanar formats */
-#define V4L2_CAP_VIDEO_OUTPUT_MPLANE	0x00002000
-/* Is a video mem-to-mem device that supports multiplanar formats */
-#define V4L2_CAP_VIDEO_M2M_MPLANE	0x00004000
-/* Is a video mem-to-mem device */
-#define V4L2_CAP_VIDEO_M2M		0x00008000
-
-#define V4L2_CAP_TUNER			0x00010000  /* has a tuner */
-#define V4L2_CAP_AUDIO			0x00020000  /* has audio support */
-#define V4L2_CAP_RADIO			0x00040000  /* is a radio device */
-#define V4L2_CAP_MODULATOR		0x00080000  /* has a modulator */
-
-#define V4L2_CAP_SDR_CAPTURE		0x00100000  /* Is a SDR capture device */
-#define V4L2_CAP_EXT_PIX_FORMAT		0x00200000  /* Supports the extended pixel format */
-#define V4L2_CAP_SDR_OUTPUT		0x00400000  /* Is a SDR output device */
-
-#define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
-#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
-#define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
-
-#define V4L2_CAP_DEVICE_CAPS            0x80000000  /* sets device capabilities field */
-
-/*
- *	V I D E O   I M A G E   F O R M A T
- */
-struct v4l2_pix_format {
-	__u32         		width;
-	__u32			height;
-	__u32			pixelformat;
-	__u32			field;		/* enum v4l2_field */
-	__u32            	bytesperline;	/* for padding, zero if unused */
-	__u32          		sizeimage;
-	__u32			colorspace;	/* enum v4l2_colorspace */
-	__u32			priv;		/* private data, depends on pixelformat */
-	__u32			flags;		/* format flags (V4L2_PIX_FMT_FLAG_*) */
-	__u32			ycbcr_enc;	/* enum v4l2_ycbcr_encoding */
-	__u32			quantization;	/* enum v4l2_quantization */
-	__u32			xfer_func;	/* enum v4l2_xfer_func */
-};
-
-/*      Pixel format         FOURCC                          depth  Description  */
-
-/* RGB formats */
-#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
-#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
-#define V4L2_PIX_FMT_ARGB444 v4l2_fourcc('A', 'R', '1', '2') /* 16  aaaarrrr ggggbbbb */
-#define V4L2_PIX_FMT_XRGB444 v4l2_fourcc('X', 'R', '1', '2') /* 16  xxxxrrrr ggggbbbb */
-#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
-#define V4L2_PIX_FMT_ARGB555 v4l2_fourcc('A', 'R', '1', '5') /* 16  ARGB-1-5-5-5  */
-#define V4L2_PIX_FMT_XRGB555 v4l2_fourcc('X', 'R', '1', '5') /* 16  XRGB-1-5-5-5  */
-#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
-#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
-#define V4L2_PIX_FMT_ARGB555X v4l2_fourcc_be('A', 'R', '1', '5') /* 16  ARGB-5-5-5 BE */
-#define V4L2_PIX_FMT_XRGB555X v4l2_fourcc_be('X', 'R', '1', '5') /* 16  XRGB-5-5-5 BE */
-#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
-#define V4L2_PIX_FMT_BGR666  v4l2_fourcc('B', 'G', 'R', 'H') /* 18  BGR-6-6-6	  */
-#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
-#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
-#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
-#define V4L2_PIX_FMT_ABGR32  v4l2_fourcc('A', 'R', '2', '4') /* 32  BGRA-8-8-8-8  */
-#define V4L2_PIX_FMT_XBGR32  v4l2_fourcc('X', 'R', '2', '4') /* 32  BGRX-8-8-8-8  */
-#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
-#define V4L2_PIX_FMT_ARGB32  v4l2_fourcc('B', 'A', '2', '4') /* 32  ARGB-8-8-8-8  */
-#define V4L2_PIX_FMT_XRGB32  v4l2_fourcc('B', 'X', '2', '4') /* 32  XRGB-8-8-8-8  */
-
-/* Grey formats */
-#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
-#define V4L2_PIX_FMT_Y4      v4l2_fourcc('Y', '0', '4', ' ') /*  4  Greyscale     */
-#define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
-#define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
-#define V4L2_PIX_FMT_Y12     v4l2_fourcc('Y', '1', '2', ' ') /* 12  Greyscale     */
-#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
-#define V4L2_PIX_FMT_Y16_BE  v4l2_fourcc_be('Y', '1', '6', ' ') /* 16  Greyscale BE  */
-
-/* Grey bit-packed formats */
-#define V4L2_PIX_FMT_Y10BPACK    v4l2_fourcc('Y', '1', '0', 'B') /* 10  Greyscale bit-packed */
-
-/* Palette formats */
-#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
-
-/* Chrominance formats */
-#define V4L2_PIX_FMT_UV8     v4l2_fourcc('U', 'V', '8', ' ') /*  8  UV 4:4 */
-
-/* Luminance+Chrominance formats */
-#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
-#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
-#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_YVYU    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */
-#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
-#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
-#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
-#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
-#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
-#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
-#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
-#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
-#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
-#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
-#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
-#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
-#define V4L2_PIX_FMT_M420    v4l2_fourcc('M', '4', '2', '0') /* 12  YUV 4:2:0 2 lines y, 1 line uv interleaved */
-
-/* two planes -- one Y, one Cr + Cb interleaved  */
-#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
-#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
-#define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
-#define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
-#define V4L2_PIX_FMT_NV24    v4l2_fourcc('N', 'V', '2', '4') /* 24  Y/CbCr 4:4:4  */
-#define V4L2_PIX_FMT_NV42    v4l2_fourcc('N', 'V', '4', '2') /* 24  Y/CrCb 4:4:4  */
-
-/* two non contiguous planes - one Y, one Cr + Cb interleaved  */
-#define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
-#define V4L2_PIX_FMT_NV21M   v4l2_fourcc('N', 'M', '2', '1') /* 21  Y/CrCb 4:2:0  */
-#define V4L2_PIX_FMT_NV16M   v4l2_fourcc('N', 'M', '1', '6') /* 16  Y/CbCr 4:2:2  */
-#define V4L2_PIX_FMT_NV61M   v4l2_fourcc('N', 'M', '6', '1') /* 16  Y/CrCb 4:2:2  */
-#define V4L2_PIX_FMT_NV12MT  v4l2_fourcc('T', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 64x32 macroblocks */
-#define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 16x16 macroblocks */
-
-/* three non contiguous planes - Y, Cb, Cr */
-#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12  YUV420 planar */
-#define V4L2_PIX_FMT_YVU420M v4l2_fourcc('Y', 'M', '2', '1') /* 12  YVU420 planar */
-
-/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
-#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
-#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
-#define V4L2_PIX_FMT_SGRBG8  v4l2_fourcc('G', 'R', 'B', 'G') /*  8  GRGR.. BGBG.. */
-#define V4L2_PIX_FMT_SRGGB8  v4l2_fourcc('R', 'G', 'G', 'B') /*  8  RGRG.. GBGB.. */
-#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10  BGBG.. GRGR.. */
-#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10  GBGB.. RGRG.. */
-#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10  GRGR.. BGBG.. */
-#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10  RGRG.. GBGB.. */
-	/* 10bit raw bayer packed, 5 bytes for every 4 pixels */
-#define V4L2_PIX_FMT_SBGGR10P v4l2_fourcc('p', 'B', 'A', 'A')
-#define V4L2_PIX_FMT_SGBRG10P v4l2_fourcc('p', 'G', 'A', 'A')
-#define V4L2_PIX_FMT_SGRBG10P v4l2_fourcc('p', 'g', 'A', 'A')
-#define V4L2_PIX_FMT_SRGGB10P v4l2_fourcc('p', 'R', 'A', 'A')
-	/* 10bit raw bayer a-law compressed to 8 bits */
-#define V4L2_PIX_FMT_SBGGR10ALAW8 v4l2_fourcc('a', 'B', 'A', '8')
-#define V4L2_PIX_FMT_SGBRG10ALAW8 v4l2_fourcc('a', 'G', 'A', '8')
-#define V4L2_PIX_FMT_SGRBG10ALAW8 v4l2_fourcc('a', 'g', 'A', '8')
-#define V4L2_PIX_FMT_SRGGB10ALAW8 v4l2_fourcc('a', 'R', 'A', '8')
-	/* 10bit raw bayer DPCM compressed to 8 bits */
-#define V4L2_PIX_FMT_SBGGR10DPCM8 v4l2_fourcc('b', 'B', 'A', '8')
-#define V4L2_PIX_FMT_SGBRG10DPCM8 v4l2_fourcc('b', 'G', 'A', '8')
-#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
-#define V4L2_PIX_FMT_SRGGB10DPCM8 v4l2_fourcc('b', 'R', 'A', '8')
-#define V4L2_PIX_FMT_SBGGR12 v4l2_fourcc('B', 'G', '1', '2') /* 12  BGBG.. GRGR.. */
-#define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12  GBGB.. RGRG.. */
-#define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12  GRGR.. BGBG.. */
-#define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12  RGRG.. GBGB.. */
-#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
-
-/* compressed formats */
-#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
-#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
-#define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
-#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 Multiplexed */
-#define V4L2_PIX_FMT_H264     v4l2_fourcc('H', '2', '6', '4') /* H264 with start codes */
-#define V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */
-#define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC */
-#define V4L2_PIX_FMT_H263     v4l2_fourcc('H', '2', '6', '3') /* H263          */
-#define V4L2_PIX_FMT_MPEG1    v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES     */
-#define V4L2_PIX_FMT_MPEG2    v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES     */
-#define V4L2_PIX_FMT_MPEG4    v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 part 2 ES */
-#define V4L2_PIX_FMT_XVID     v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid           */
-#define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */
-#define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */
-#define V4L2_PIX_FMT_VP8      v4l2_fourcc('V', 'P', '8', '0') /* VP8 */
-
-/*  Vendor-specific formats   */
-#define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
-#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
-#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
-#define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */
-#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
-#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
-#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
-#define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
-#define V4L2_PIX_FMT_SPCA505  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
-#define V4L2_PIX_FMT_SPCA508  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
-#define V4L2_PIX_FMT_SPCA561  v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
-#define V4L2_PIX_FMT_PAC207   v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
-#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */
-#define V4L2_PIX_FMT_JL2005BCD v4l2_fourcc('J', 'L', '2', '0') /* compressed RGGB bayer */
-#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed GBRG bayer */
-#define V4L2_PIX_FMT_SQ905C   v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */
-#define V4L2_PIX_FMT_PJPG     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
-#define V4L2_PIX_FMT_OV511    v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
-#define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
-#define V4L2_PIX_FMT_STV0680  v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
-#define V4L2_PIX_FMT_TM6000   v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
-#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
-#define V4L2_PIX_FMT_KONICA420  v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
-#define V4L2_PIX_FMT_JPGL	v4l2_fourcc('J', 'P', 'G', 'L') /* JPEG-Lite */
-#define V4L2_PIX_FMT_SE401      v4l2_fourcc('S', '4', '0', '1') /* se401 janggu compressed rgb */
-#define V4L2_PIX_FMT_S5C_UYVY_JPG v4l2_fourcc('S', '5', 'C', 'I') /* S5C73M3 interleaved UYVY/JPEG */
-#define V4L2_PIX_FMT_Y8I      v4l2_fourcc('Y', '8', 'I', ' ') /* Greyscale 8-bit L/R interleaved */
-#define V4L2_PIX_FMT_Y12I     v4l2_fourcc('Y', '1', '2', 'I') /* Greyscale 12-bit L/R interleaved */
-#define V4L2_PIX_FMT_Z16      v4l2_fourcc('Z', '1', '6', ' ') /* Depth data 16-bit */
-
-/* SDR formats - used only for Software Defined Radio devices */
-#define V4L2_SDR_FMT_CU8          v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
-#define V4L2_SDR_FMT_CU16LE       v4l2_fourcc('C', 'U', '1', '6') /* IQ u16le */
-#define V4L2_SDR_FMT_CS8          v4l2_fourcc('C', 'S', '0', '8') /* complex s8 */
-#define V4L2_SDR_FMT_CS14LE       v4l2_fourcc('C', 'S', '1', '4') /* complex s14le */
-#define V4L2_SDR_FMT_RU12LE       v4l2_fourcc('R', 'U', '1', '2') /* real u12le */
-
-/* priv field value to indicates that subsequent fields are valid. */
-#define V4L2_PIX_FMT_PRIV_MAGIC		0xfeedcafe
-
-/* Flags */
-#define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA	0x00000001
-
-/*
- *	F O R M A T   E N U M E R A T I O N
- */
-struct v4l2_fmtdesc {
-	__u32		    index;             /* Format number      */
-	__u32		    type;              /* enum v4l2_buf_type */
-	__u32               flags;
-	__u8		    description[32];   /* Description string */
-	__u32		    pixelformat;       /* Format fourcc      */
-	__u32		    reserved[4];
-};
-
-#define V4L2_FMT_FLAG_COMPRESSED 0x0001
-#define V4L2_FMT_FLAG_EMULATED   0x0002
-
-#if 1
-	/* Experimental Frame Size and frame rate enumeration */
-/*
- *	F R A M E   S I Z E   E N U M E R A T I O N
- */
-enum v4l2_frmsizetypes {
-	V4L2_FRMSIZE_TYPE_DISCRETE	= 1,
-	V4L2_FRMSIZE_TYPE_CONTINUOUS	= 2,
-	V4L2_FRMSIZE_TYPE_STEPWISE	= 3,
-};
-
-struct v4l2_frmsize_discrete {
-	__u32			width;		/* Frame width [pixel] */
-	__u32			height;		/* Frame height [pixel] */
-};
-
-struct v4l2_frmsize_stepwise {
-	__u32			min_width;	/* Minimum frame width [pixel] */
-	__u32			max_width;	/* Maximum frame width [pixel] */
-	__u32			step_width;	/* Frame width step size [pixel] */
-	__u32			min_height;	/* Minimum frame height [pixel] */
-	__u32			max_height;	/* Maximum frame height [pixel] */
-	__u32			step_height;	/* Frame height step size [pixel] */
-};
-
-struct v4l2_frmsizeenum {
-	__u32			index;		/* Frame size number */
-	__u32			pixel_format;	/* Pixel format */
-	__u32			type;		/* Frame size type the device supports. */
-
-	union {					/* Frame size */
-		struct v4l2_frmsize_discrete	discrete;
-		struct v4l2_frmsize_stepwise	stepwise;
-	};
-
-	__u32   reserved[2];			/* Reserved space for future use */
-};
-
-/*
- *	F R A M E   R A T E   E N U M E R A T I O N
- */
-enum v4l2_frmivaltypes {
-	V4L2_FRMIVAL_TYPE_DISCRETE	= 1,
-	V4L2_FRMIVAL_TYPE_CONTINUOUS	= 2,
-	V4L2_FRMIVAL_TYPE_STEPWISE	= 3,
-};
-
-struct v4l2_frmival_stepwise {
-	struct v4l2_fract	min;		/* Minimum frame interval [s] */
-	struct v4l2_fract	max;		/* Maximum frame interval [s] */
-	struct v4l2_fract	step;		/* Frame interval step size [s] */
-};
-
-struct v4l2_frmivalenum {
-	__u32			index;		/* Frame format index */
-	__u32			pixel_format;	/* Pixel format */
-	__u32			width;		/* Frame width */
-	__u32			height;		/* Frame height */
-	__u32			type;		/* Frame interval type the device supports. */
-
-	union {					/* Frame interval */
-		struct v4l2_fract		discrete;
-		struct v4l2_frmival_stepwise	stepwise;
-	};
-
-	__u32	reserved[2];			/* Reserved space for future use */
-};
-#endif
-
-/*
- *	T I M E C O D E
- */
-struct v4l2_timecode {
-	__u32	type;
-	__u32	flags;
-	__u8	frames;
-	__u8	seconds;
-	__u8	minutes;
-	__u8	hours;
-	__u8	userbits[4];
-};
-
-/*  Type  */
-#define V4L2_TC_TYPE_24FPS		1
-#define V4L2_TC_TYPE_25FPS		2
-#define V4L2_TC_TYPE_30FPS		3
-#define V4L2_TC_TYPE_50FPS		4
-#define V4L2_TC_TYPE_60FPS		5
-
-/*  Flags  */
-#define V4L2_TC_FLAG_DROPFRAME		0x0001 /* "drop-frame" mode */
-#define V4L2_TC_FLAG_COLORFRAME		0x0002
-#define V4L2_TC_USERBITS_field		0x000C
-#define V4L2_TC_USERBITS_USERDEFINED	0x0000
-#define V4L2_TC_USERBITS_8BITCHARS	0x0008
-/* The above is based on SMPTE timecodes */
-
-struct v4l2_jpegcompression {
-	int quality;
-
-	int  APPn;              /* Number of APP segment to be written,
-				 * must be 0..15 */
-	int  APP_len;           /* Length of data in JPEG APPn segment */
-	char APP_data[60];      /* Data in the JPEG APPn segment. */
-
-	int  COM_len;           /* Length of data in JPEG COM segment */
-	char COM_data[60];      /* Data in JPEG COM segment */
-
-	__u32 jpeg_markers;     /* Which markers should go into the JPEG
-				 * output. Unless you exactly know what
-				 * you do, leave them untouched.
-				 * Including less markers will make the
-				 * resulting code smaller, but there will
-				 * be fewer applications which can read it.
-				 * The presence of the APP and COM marker
-				 * is influenced by APP_len and COM_len
-				 * ONLY, not by this property! */
-
-#define V4L2_JPEG_MARKER_DHT (1<<3)    /* Define Huffman Tables */
-#define V4L2_JPEG_MARKER_DQT (1<<4)    /* Define Quantization Tables */
-#define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
-#define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
-#define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
-					* always use APP0 */
-};
-
-/*
- *	M E M O R Y - M A P P I N G   B U F F E R S
- */
-struct v4l2_requestbuffers {
-	__u32			count;
-	__u32			type;		/* enum v4l2_buf_type */
-	__u32			memory;		/* enum v4l2_memory */
-	__u32			reserved[2];
-};
-
-/**
- * struct v4l2_plane - plane info for multi-planar buffers
- * @bytesused:		number of bytes occupied by data in the plane (payload)
- * @length:		size of this plane (NOT the payload) in bytes
- * @mem_offset:		when memory in the associated struct v4l2_buffer is
- *			V4L2_MEMORY_MMAP, equals the offset from the start of
- *			the device memory for this plane (or is a "cookie" that
- *			should be passed to mmap() called on the video node)
- * @userptr:		when memory is V4L2_MEMORY_USERPTR, a userspace pointer
- *			pointing to this plane
- * @fd:			when memory is V4L2_MEMORY_DMABUF, a userspace file
- *			descriptor associated with this plane
- * @data_offset:	offset in the plane to the start of data; usually 0,
- *			unless there is a header in front of the data
- *
- * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
- * with two planes can have one plane for Y, and another for interleaved CbCr
- * components. Each plane can reside in a separate memory buffer, or even in
- * a completely separate memory node (e.g. in embedded devices).
- */
-struct v4l2_plane {
-	__u32			bytesused;
-	__u32			length;
-	union {
-		__u32		mem_offset;
-		unsigned long	userptr;
-		__s32		fd;
-	} m;
-	__u32			data_offset;
-	__u32			reserved[11];
-};
-
-/**
- * struct v4l2_buffer - video buffer info
- * @index:	id number of the buffer
- * @type:	enum v4l2_buf_type; buffer type (type == *_MPLANE for
- *		multiplanar buffers);
- * @bytesused:	number of bytes occupied by data in the buffer (payload);
- *		unused (set to 0) for multiplanar buffers
- * @flags:	buffer informational flags
- * @field:	enum v4l2_field; field order of the image in the buffer
- * @timestamp:	frame timestamp
- * @timecode:	frame timecode
- * @sequence:	sequence count of this frame
- * @memory:	enum v4l2_memory; the method, in which the actual video data is
- *		passed
- * @offset:	for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
- *		offset from the start of the device memory for this plane,
- *		(or a "cookie" that should be passed to mmap() as offset)
- * @userptr:	for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
- *		a userspace pointer pointing to this buffer
- * @fd:		for non-multiplanar buffers with memory == V4L2_MEMORY_DMABUF;
- *		a userspace file descriptor associated with this buffer
- * @planes:	for multiplanar buffers; userspace pointer to the array of plane
- *		info structs for this buffer
- * @length:	size in bytes of the buffer (NOT its payload) for single-plane
- *		buffers (when type != *_MPLANE); number of elements in the
- *		planes array for multi-plane buffers
- *
- * Contains data exchanged by application and driver using one of the Streaming
- * I/O methods.
- */
-struct v4l2_buffer {
-	__u32			index;
-	__u32			type;
-	__u32			bytesused;
-	__u32			flags;
-	__u32			field;
-	struct timeval		timestamp;
-	struct v4l2_timecode	timecode;
-	__u32			sequence;
-
-	/* memory location */
-	__u32			memory;
-	union {
-		__u32           offset;
-		unsigned long   userptr;
-		struct v4l2_plane *planes;
-		__s32		fd;
-	} m;
-	__u32			length;
-	__u32			reserved2;
-	__u32			reserved;
-};
-
-/*  Flags for 'flags' field */
-/* Buffer is mapped (flag) */
-#define V4L2_BUF_FLAG_MAPPED			0x00000001
-/* Buffer is queued for processing */
-#define V4L2_BUF_FLAG_QUEUED			0x00000002
-/* Buffer is ready */
-#define V4L2_BUF_FLAG_DONE			0x00000004
-/* Image is a keyframe (I-frame) */
-#define V4L2_BUF_FLAG_KEYFRAME			0x00000008
-/* Image is a P-frame */
-#define V4L2_BUF_FLAG_PFRAME			0x00000010
-/* Image is a B-frame */
-#define V4L2_BUF_FLAG_BFRAME			0x00000020
-/* Buffer is ready, but the data contained within is corrupted. */
-#define V4L2_BUF_FLAG_ERROR			0x00000040
-/* timecode field is valid */
-#define V4L2_BUF_FLAG_TIMECODE			0x00000100
-/* Buffer is prepared for queuing */
-#define V4L2_BUF_FLAG_PREPARED			0x00000400
-/* Cache handling flags */
-#define V4L2_BUF_FLAG_NO_CACHE_INVALIDATE	0x00000800
-#define V4L2_BUF_FLAG_NO_CACHE_CLEAN		0x00001000
-/* Timestamp type */
-#define V4L2_BUF_FLAG_TIMESTAMP_MASK		0x0000e000
-#define V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN		0x00000000
-#define V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC	0x00002000
-#define V4L2_BUF_FLAG_TIMESTAMP_COPY		0x00004000
-/* Timestamp sources. */
-#define V4L2_BUF_FLAG_TSTAMP_SRC_MASK		0x00070000
-#define V4L2_BUF_FLAG_TSTAMP_SRC_EOF		0x00000000
-#define V4L2_BUF_FLAG_TSTAMP_SRC_SOE		0x00010000
-/* mem2mem encoder/decoder */
-#define V4L2_BUF_FLAG_LAST			0x00100000
-
-/**
- * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor
- *
- * @index:	id number of the buffer
- * @type:	enum v4l2_buf_type; buffer type (type == *_MPLANE for
- *		multiplanar buffers);
- * @plane:	index of the plane to be exported, 0 for single plane queues
- * @flags:	flags for newly created file, currently only O_CLOEXEC is
- *		supported, refer to manual of open syscall for more details
- * @fd:		file descriptor associated with DMABUF (set by driver)
- *
- * Contains data used for exporting a video buffer as DMABUF file descriptor.
- * The buffer is identified by a 'cookie' returned by VIDIOC_QUERYBUF
- * (identical to the cookie used to mmap() the buffer to userspace). All
- * reserved fields must be set to zero. The field reserved0 is expected to
- * become a structure 'type' allowing an alternative layout of the structure
- * content. Therefore this field should not be used for any other extensions.
- */
-struct v4l2_exportbuffer {
-	__u32		type; /* enum v4l2_buf_type */
-	__u32		index;
-	__u32		plane;
-	__u32		flags;
-	__s32		fd;
-	__u32		reserved[11];
-};
-
-/*
- *	O V E R L A Y   P R E V I E W
- */
-struct v4l2_framebuffer {
-	__u32			capability;
-	__u32			flags;
-/* FIXME: in theory we should pass something like PCI device + memory
- * region + offset instead of some physical address */
-	void                    *base;
-	struct {
-		__u32		width;
-		__u32		height;
-		__u32		pixelformat;
-		__u32		field;		/* enum v4l2_field */
-		__u32		bytesperline;	/* for padding, zero if unused */
-		__u32		sizeimage;
-		__u32		colorspace;	/* enum v4l2_colorspace */
-		__u32		priv;		/* reserved field, set to 0 */
-	} fmt;
-};
-/*  Flags for the 'capability' field. Read only */
-#define V4L2_FBUF_CAP_EXTERNOVERLAY	0x0001
-#define V4L2_FBUF_CAP_CHROMAKEY		0x0002
-#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
-#define V4L2_FBUF_CAP_BITMAP_CLIPPING	0x0008
-#define V4L2_FBUF_CAP_LOCAL_ALPHA	0x0010
-#define V4L2_FBUF_CAP_GLOBAL_ALPHA	0x0020
-#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA	0x0040
-#define V4L2_FBUF_CAP_SRC_CHROMAKEY	0x0080
-/*  Flags for the 'flags' field. */
-#define V4L2_FBUF_FLAG_PRIMARY		0x0001
-#define V4L2_FBUF_FLAG_OVERLAY		0x0002
-#define V4L2_FBUF_FLAG_CHROMAKEY	0x0004
-#define V4L2_FBUF_FLAG_LOCAL_ALPHA	0x0008
-#define V4L2_FBUF_FLAG_GLOBAL_ALPHA	0x0010
-#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA	0x0020
-#define V4L2_FBUF_FLAG_SRC_CHROMAKEY	0x0040
-
-struct v4l2_clip {
-	struct v4l2_rect        c;
-	struct v4l2_clip	*next;
-};
-
-struct v4l2_window {
-	struct v4l2_rect        w;
-	__u32			field;	 /* enum v4l2_field */
-	__u32			chromakey;
-	struct v4l2_clip	*clips;
-	__u32			clipcount;
-	void			*bitmap;
-	__u8                    global_alpha;
-};
-
-/*
- *	C A P T U R E   P A R A M E T E R S
- */
-struct v4l2_captureparm {
-	__u32		   capability;	  /*  Supported modes */
-	__u32		   capturemode;	  /*  Current mode */
-	struct v4l2_fract  timeperframe;  /*  Time per frame in seconds */
-	__u32		   extendedmode;  /*  Driver-specific extensions */
-	__u32              readbuffers;   /*  # of buffers for read */
-	__u32		   reserved[4];
-};
-
-/*  Flags for 'capability' and 'capturemode' fields */
-#define V4L2_MODE_HIGHQUALITY	0x0001	/*  High quality imaging mode */
-#define V4L2_CAP_TIMEPERFRAME	0x1000	/*  timeperframe field is supported */
-
-struct v4l2_outputparm {
-	__u32		   capability;	 /*  Supported modes */
-	__u32		   outputmode;	 /*  Current mode */
-	struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
-	__u32		   extendedmode; /*  Driver-specific extensions */
-	__u32              writebuffers; /*  # of buffers for write */
-	__u32		   reserved[4];
-};
-
-/*
- *	I N P U T   I M A G E   C R O P P I N G
- */
-struct v4l2_cropcap {
-	__u32			type;	/* enum v4l2_buf_type */
-	struct v4l2_rect        bounds;
-	struct v4l2_rect        defrect;
-	struct v4l2_fract       pixelaspect;
-};
-
-struct v4l2_crop {
-	__u32			type;	/* enum v4l2_buf_type */
-	struct v4l2_rect        c;
-};
-
-/**
- * struct v4l2_selection - selection info
- * @type:	buffer type (do not use *_MPLANE types)
- * @target:	Selection target, used to choose one of possible rectangles;
- *		defined in v4l2-common.h; V4L2_SEL_TGT_* .
- * @flags:	constraints flags, defined in v4l2-common.h; V4L2_SEL_FLAG_*.
- * @r:		coordinates of selection window
- * @reserved:	for future use, rounds structure size to 64 bytes, set to zero
- *
- * Hardware may use multiple helper windows to process a video stream.
- * The structure is used to exchange this selection areas between
- * an application and a driver.
- */
-struct v4l2_selection {
-	__u32			type;
-	__u32			target;
-	__u32                   flags;
-	struct v4l2_rect        r;
-	__u32                   reserved[9];
-};
-
-
-/*
- *      A N A L O G   V I D E O   S T A N D A R D
- */
-
-typedef __u64 v4l2_std_id;
-
-/* one bit for each */
-#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
-#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
-#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
-#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
-#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
-#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
-#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
-#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
-
-#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
-#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
-#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
-#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
-
-#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)	/* BTSC */
-#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)	/* EIA-J */
-#define V4L2_STD_NTSC_443       ((v4l2_std_id)0x00004000)
-#define V4L2_STD_NTSC_M_KR      ((v4l2_std_id)0x00008000)	/* FM A2 */
-
-#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
-#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
-#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
-#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
-#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
-#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
-#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
-#define V4L2_STD_SECAM_LC       ((v4l2_std_id)0x00800000)
-
-/* ATSC/HDTV */
-#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
-#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
-
-/* FIXME:
-   Although std_id is 64 bits, there is an issue on PPC32 architecture that
-   makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
-   this value to 32 bits.
-   As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
-   it should work fine. However, if needed to add more than two standards,
-   v4l2-common.c should be fixed.
- */
-
-/*
- * Some macros to merge video standards in order to make live easier for the
- * drivers and V4L2 applications
- */
-
-/*
- * "Common" NTSC/M - It should be noticed that V4L2_STD_NTSC_443 is
- * Missing here.
- */
-#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M	|\
-				 V4L2_STD_NTSC_M_JP     |\
-				 V4L2_STD_NTSC_M_KR)
-/* Secam macros */
-#define V4L2_STD_SECAM_DK      	(V4L2_STD_SECAM_D	|\
-				 V4L2_STD_SECAM_K	|\
-				 V4L2_STD_SECAM_K1)
-/* All Secam Standards */
-#define V4L2_STD_SECAM		(V4L2_STD_SECAM_B	|\
-				 V4L2_STD_SECAM_G	|\
-				 V4L2_STD_SECAM_H	|\
-				 V4L2_STD_SECAM_DK	|\
-				 V4L2_STD_SECAM_L       |\
-				 V4L2_STD_SECAM_LC)
-/* PAL macros */
-#define V4L2_STD_PAL_BG		(V4L2_STD_PAL_B		|\
-				 V4L2_STD_PAL_B1	|\
-				 V4L2_STD_PAL_G)
-#define V4L2_STD_PAL_DK		(V4L2_STD_PAL_D		|\
-				 V4L2_STD_PAL_D1	|\
-				 V4L2_STD_PAL_K)
-/*
- * "Common" PAL - This macro is there to be compatible with the old
- * V4L1 concept of "PAL": /BGDKHI.
- * Several PAL standards are missing here: /M, /N and /Nc
- */
-#define V4L2_STD_PAL		(V4L2_STD_PAL_BG	|\
-				 V4L2_STD_PAL_DK	|\
-				 V4L2_STD_PAL_H		|\
-				 V4L2_STD_PAL_I)
-/* Chroma "agnostic" standards */
-#define V4L2_STD_B		(V4L2_STD_PAL_B		|\
-				 V4L2_STD_PAL_B1	|\
-				 V4L2_STD_SECAM_B)
-#define V4L2_STD_G		(V4L2_STD_PAL_G		|\
-				 V4L2_STD_SECAM_G)
-#define V4L2_STD_H		(V4L2_STD_PAL_H		|\
-				 V4L2_STD_SECAM_H)
-#define V4L2_STD_L		(V4L2_STD_SECAM_L	|\
-				 V4L2_STD_SECAM_LC)
-#define V4L2_STD_GH		(V4L2_STD_G		|\
-				 V4L2_STD_H)
-#define V4L2_STD_DK		(V4L2_STD_PAL_DK	|\
-				 V4L2_STD_SECAM_DK)
-#define V4L2_STD_BG		(V4L2_STD_B		|\
-				 V4L2_STD_G)
-#define V4L2_STD_MN		(V4L2_STD_PAL_M		|\
-				 V4L2_STD_PAL_N		|\
-				 V4L2_STD_PAL_Nc	|\
-				 V4L2_STD_NTSC)
-
-/* Standards where MTS/BTSC stereo could be found */
-#define V4L2_STD_MTS		(V4L2_STD_NTSC_M	|\
-				 V4L2_STD_PAL_M		|\
-				 V4L2_STD_PAL_N		|\
-				 V4L2_STD_PAL_Nc)
-
-/* Standards for Countries with 60Hz Line frequency */
-#define V4L2_STD_525_60		(V4L2_STD_PAL_M		|\
-				 V4L2_STD_PAL_60	|\
-				 V4L2_STD_NTSC		|\
-				 V4L2_STD_NTSC_443)
-/* Standards for Countries with 50Hz Line frequency */
-#define V4L2_STD_625_50		(V4L2_STD_PAL		|\
-				 V4L2_STD_PAL_N		|\
-				 V4L2_STD_PAL_Nc	|\
-				 V4L2_STD_SECAM)
-
-#define V4L2_STD_ATSC           (V4L2_STD_ATSC_8_VSB    |\
-				 V4L2_STD_ATSC_16_VSB)
-/* Macros with none and all analog standards */
-#define V4L2_STD_UNKNOWN        0
-#define V4L2_STD_ALL            (V4L2_STD_525_60	|\
-				 V4L2_STD_625_50)
-
-struct v4l2_standard {
-	__u32		     index;
-	v4l2_std_id          id;
-	__u8		     name[24];
-	struct v4l2_fract    frameperiod; /* Frames, not fields */
-	__u32		     framelines;
-	__u32		     reserved[4];
-};
-
-/*
- *	D V 	B T	T I M I N G S
- */
-
-/** struct v4l2_bt_timings - BT.656/BT.1120 timing data
- * @width:	total width of the active video in pixels
- * @height:	total height of the active video in lines
- * @interlaced:	Interlaced or progressive
- * @polarities:	Positive or negative polarities
- * @pixelclock:	Pixel clock in HZ. Ex. 74.25MHz->74250000
- * @hfrontporch:Horizontal front porch in pixels
- * @hsync:	Horizontal Sync length in pixels
- * @hbackporch:	Horizontal back porch in pixels
- * @vfrontporch:Vertical front porch in lines
- * @vsync:	Vertical Sync length in lines
- * @vbackporch:	Vertical back porch in lines
- * @il_vfrontporch:Vertical front porch for the even field
- *		(aka field 2) of interlaced field formats
- * @il_vsync:	Vertical Sync length for the even field
- *		(aka field 2) of interlaced field formats
- * @il_vbackporch:Vertical back porch for the even field
- *		(aka field 2) of interlaced field formats
- * @standards:	Standards the timing belongs to
- * @flags:	Flags
- * @reserved:	Reserved fields, must be zeroed.
- *
- * A note regarding vertical interlaced timings: height refers to the total
- * height of the active video frame (= two fields). The blanking timings refer
- * to the blanking of each field. So the height of the total frame is
- * calculated as follows:
- *
- * tot_height = height + vfrontporch + vsync + vbackporch +
- *                       il_vfrontporch + il_vsync + il_vbackporch
- *
- * The active height of each field is height / 2.
- */
-struct v4l2_bt_timings {
-	__u32	width;
-	__u32	height;
-	__u32	interlaced;
-	__u32	polarities;
-	__u64	pixelclock;
-	__u32	hfrontporch;
-	__u32	hsync;
-	__u32	hbackporch;
-	__u32	vfrontporch;
-	__u32	vsync;
-	__u32	vbackporch;
-	__u32	il_vfrontporch;
-	__u32	il_vsync;
-	__u32	il_vbackporch;
-	__u32	standards;
-	__u32	flags;
-	__u32	reserved[14];
-} __attribute__ ((packed));
-
-/* Interlaced or progressive format */
-#define	V4L2_DV_PROGRESSIVE	0
-#define	V4L2_DV_INTERLACED	1
-
-/* Polarities. If bit is not set, it is assumed to be negative polarity */
-#define V4L2_DV_VSYNC_POS_POL	0x00000001
-#define V4L2_DV_HSYNC_POS_POL	0x00000002
-
-/* Timings standards */
-#define V4L2_DV_BT_STD_CEA861	(1 << 0)  /* CEA-861 Digital TV Profile */
-#define V4L2_DV_BT_STD_DMT	(1 << 1)  /* VESA Discrete Monitor Timings */
-#define V4L2_DV_BT_STD_CVT	(1 << 2)  /* VESA Coordinated Video Timings */
-#define V4L2_DV_BT_STD_GTF	(1 << 3)  /* VESA Generalized Timings Formula */
-
-/* Flags */
-
-/* CVT/GTF specific: timing uses reduced blanking (CVT) or the 'Secondary
-   GTF' curve (GTF). In both cases the horizontal and/or vertical blanking
-   intervals are reduced, allowing a higher resolution over the same
-   bandwidth. This is a read-only flag. */
-#define V4L2_DV_FL_REDUCED_BLANKING		(1 << 0)
-/* CEA-861 specific: set for CEA-861 formats with a framerate of a multiple
-   of six. These formats can be optionally played at 1 / 1.001 speed.
-   This is a read-only flag. */
-#define V4L2_DV_FL_CAN_REDUCE_FPS		(1 << 1)
-/* CEA-861 specific: only valid for video transmitters, the flag is cleared
-   by receivers.
-   If the framerate of the format is a multiple of six, then the pixelclock
-   used to set up the transmitter is divided by 1.001 to make it compatible
-   with 60 Hz based standards such as NTSC and PAL-M that use a framerate of
-   29.97 Hz. Otherwise this flag is cleared. If the transmitter can't generate
-   such frequencies, then the flag will also be cleared. */
-#define V4L2_DV_FL_REDUCED_FPS			(1 << 2)
-/* Specific to interlaced formats: if set, then field 1 is really one half-line
-   longer and field 2 is really one half-line shorter, so each field has
-   exactly the same number of half-lines. Whether half-lines can be detected
-   or used depends on the hardware. */
-#define V4L2_DV_FL_HALF_LINE			(1 << 3)
-/* If set, then this is a Consumer Electronics (CE) video format. Such formats
- * differ from other formats (commonly called IT formats) in that if RGB
- * encoding is used then by default the RGB values use limited range (i.e.
- * use the range 16-235) as opposed to 0-255. All formats defined in CEA-861
- * except for the 640x480 format are CE formats. */
-#define V4L2_DV_FL_IS_CE_VIDEO			(1 << 4)
-
-/* A few useful defines to calculate the total blanking and frame sizes */
-#define V4L2_DV_BT_BLANKING_WIDTH(bt) \
-	((bt)->hfrontporch + (bt)->hsync + (bt)->hbackporch)
-#define V4L2_DV_BT_FRAME_WIDTH(bt) \
-	((bt)->width + V4L2_DV_BT_BLANKING_WIDTH(bt))
-#define V4L2_DV_BT_BLANKING_HEIGHT(bt) \
-	((bt)->vfrontporch + (bt)->vsync + (bt)->vbackporch + \
-	 (bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch)
-#define V4L2_DV_BT_FRAME_HEIGHT(bt) \
-	((bt)->height + V4L2_DV_BT_BLANKING_HEIGHT(bt))
-
-/** struct v4l2_dv_timings - DV timings
- * @type:	the type of the timings
- * @bt:	BT656/1120 timings
- */
-struct v4l2_dv_timings {
-	__u32 type;
-	union {
-		struct v4l2_bt_timings	bt;
-		__u32	reserved[32];
-	};
-} __attribute__ ((packed));
-
-/* Values for the type field */
-#define V4L2_DV_BT_656_1120	0	/* BT.656/1120 timing type */
-
-
-/** struct v4l2_enum_dv_timings - DV timings enumeration
- * @index:	enumeration index
- * @pad:	the pad number for which to enumerate timings (used with
- *		v4l-subdev nodes only)
- * @reserved:	must be zeroed
- * @timings:	the timings for the given index
- */
-struct v4l2_enum_dv_timings {
-	__u32 index;
-	__u32 pad;
-	__u32 reserved[2];
-	struct v4l2_dv_timings timings;
-};
-
-/** struct v4l2_bt_timings_cap - BT.656/BT.1120 timing capabilities
- * @min_width:		width in pixels
- * @max_width:		width in pixels
- * @min_height:		height in lines
- * @max_height:		height in lines
- * @min_pixelclock:	Pixel clock in HZ. Ex. 74.25MHz->74250000
- * @max_pixelclock:	Pixel clock in HZ. Ex. 74.25MHz->74250000
- * @standards:		Supported standards
- * @capabilities:	Supported capabilities
- * @reserved:		Must be zeroed
- */
-struct v4l2_bt_timings_cap {
-	__u32	min_width;
-	__u32	max_width;
-	__u32	min_height;
-	__u32	max_height;
-	__u64	min_pixelclock;
-	__u64	max_pixelclock;
-	__u32	standards;
-	__u32	capabilities;
-	__u32	reserved[16];
-} __attribute__ ((packed));
-
-/* Supports interlaced formats */
-#define V4L2_DV_BT_CAP_INTERLACED	(1 << 0)
-/* Supports progressive formats */
-#define V4L2_DV_BT_CAP_PROGRESSIVE	(1 << 1)
-/* Supports CVT/GTF reduced blanking */
-#define V4L2_DV_BT_CAP_REDUCED_BLANKING	(1 << 2)
-/* Supports custom formats */
-#define V4L2_DV_BT_CAP_CUSTOM		(1 << 3)
-
-/** struct v4l2_dv_timings_cap - DV timings capabilities
- * @type:	the type of the timings (same as in struct v4l2_dv_timings)
- * @pad:	the pad number for which to query capabilities (used with
- *		v4l-subdev nodes only)
- * @bt:		the BT656/1120 timings capabilities
- */
-struct v4l2_dv_timings_cap {
-	__u32 type;
-	__u32 pad;
-	__u32 reserved[2];
-	union {
-		struct v4l2_bt_timings_cap bt;
-		__u32 raw_data[32];
-	};
-};
-
-
-/*
- *	V I D E O   I N P U T S
- */
-struct v4l2_input {
-	__u32	     index;		/*  Which input */
-	__u8	     name[32];		/*  Label */
-	__u32	     type;		/*  Type of input */
-	__u32	     audioset;		/*  Associated audios (bitfield) */
-	__u32        tuner;             /*  enum v4l2_tuner_type */
-	v4l2_std_id  std;
-	__u32	     status;
-	__u32	     capabilities;
-	__u32	     reserved[3];
-};
-
-/*  Values for the 'type' field */
-#define V4L2_INPUT_TYPE_TUNER		1
-#define V4L2_INPUT_TYPE_CAMERA		2
-
-/* field 'status' - general */
-#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
-#define V4L2_IN_ST_NO_SIGNAL   0x00000002
-#define V4L2_IN_ST_NO_COLOR    0x00000004
-
-/* field 'status' - sensor orientation */
-/* If sensor is mounted upside down set both bits */
-#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
-#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
-
-/* field 'status' - analog */
-#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
-#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
-
-/* field 'status' - digital */
-#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
-#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
-#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
-
-/* field 'status' - VCR and set-top box */
-#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
-#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
-#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
-
-/* capabilities flags */
-#define V4L2_IN_CAP_DV_TIMINGS		0x00000002 /* Supports S_DV_TIMINGS */
-#define V4L2_IN_CAP_CUSTOM_TIMINGS	V4L2_IN_CAP_DV_TIMINGS /* For compatibility */
-#define V4L2_IN_CAP_STD			0x00000004 /* Supports S_STD */
-#define V4L2_IN_CAP_NATIVE_SIZE		0x00000008 /* Supports setting native size */
-
-/*
- *	V I D E O   O U T P U T S
- */
-struct v4l2_output {
-	__u32	     index;		/*  Which output */
-	__u8	     name[32];		/*  Label */
-	__u32	     type;		/*  Type of output */
-	__u32	     audioset;		/*  Associated audios (bitfield) */
-	__u32	     modulator;         /*  Associated modulator */
-	v4l2_std_id  std;
-	__u32	     capabilities;
-	__u32	     reserved[3];
-};
-/*  Values for the 'type' field */
-#define V4L2_OUTPUT_TYPE_MODULATOR		1
-#define V4L2_OUTPUT_TYPE_ANALOG			2
-#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY	3
-
-/* capabilities flags */
-#define V4L2_OUT_CAP_DV_TIMINGS		0x00000002 /* Supports S_DV_TIMINGS */
-#define V4L2_OUT_CAP_CUSTOM_TIMINGS	V4L2_OUT_CAP_DV_TIMINGS /* For compatibility */
-#define V4L2_OUT_CAP_STD		0x00000004 /* Supports S_STD */
-#define V4L2_OUT_CAP_NATIVE_SIZE	0x00000008 /* Supports setting native size */
-
-/*
- *	C O N T R O L S
- */
-struct v4l2_control {
-	__u32		     id;
-	__s32		     value;
-};
-
-struct v4l2_ext_control {
-	__u32 id;
-	__u32 size;
-	__u32 reserved2[1];
-	union {
-		__s32 value;
-		__s64 value64;
-		char *string;
-		__u8 *p_u8;
-		__u16 *p_u16;
-		__u32 *p_u32;
-		void *ptr;
-	};
-} __attribute__ ((packed));
-
-struct v4l2_ext_controls {
-	__u32 ctrl_class;
-	__u32 count;
-	__u32 error_idx;
-	__u32 reserved[2];
-	struct v4l2_ext_control *controls;
-};
-
-#define V4L2_CTRL_ID_MASK      	  (0x0fffffff)
-#define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
-#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
-#define V4L2_CTRL_MAX_DIMS	  (4)
-
-enum v4l2_ctrl_type {
-	V4L2_CTRL_TYPE_INTEGER	     = 1,
-	V4L2_CTRL_TYPE_BOOLEAN	     = 2,
-	V4L2_CTRL_TYPE_MENU	     = 3,
-	V4L2_CTRL_TYPE_BUTTON	     = 4,
-	V4L2_CTRL_TYPE_INTEGER64     = 5,
-	V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
-	V4L2_CTRL_TYPE_STRING        = 7,
-	V4L2_CTRL_TYPE_BITMASK       = 8,
-	V4L2_CTRL_TYPE_INTEGER_MENU  = 9,
-
-	/* Compound types are >= 0x0100 */
-	V4L2_CTRL_COMPOUND_TYPES     = 0x0100,
-	V4L2_CTRL_TYPE_U8	     = 0x0100,
-	V4L2_CTRL_TYPE_U16	     = 0x0101,
-	V4L2_CTRL_TYPE_U32	     = 0x0102,
-};
-
-/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-struct v4l2_queryctrl {
-	__u32		     id;
-	__u32		     type;	/* enum v4l2_ctrl_type */
-	__u8		     name[32];	/* Whatever */
-	__s32		     minimum;	/* Note signedness */
-	__s32		     maximum;
-	__s32		     step;
-	__s32		     default_value;
-	__u32                flags;
-	__u32		     reserved[2];
-};
-
-/*  Used in the VIDIOC_QUERY_EXT_CTRL ioctl for querying extended controls */
-struct v4l2_query_ext_ctrl {
-	__u32		     id;
-	__u32		     type;
-	char		     name[32];
-	__s64		     minimum;
-	__s64		     maximum;
-	__u64		     step;
-	__s64		     default_value;
-	__u32                flags;
-	__u32                elem_size;
-	__u32                elems;
-	__u32                nr_of_dims;
-	__u32                dims[V4L2_CTRL_MAX_DIMS];
-	__u32		     reserved[32];
-};
-
-/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
-struct v4l2_querymenu {
-	__u32		id;
-	__u32		index;
-	union {
-		__u8	name[32];	/* Whatever */
-		__s64	value;
-	};
-	__u32		reserved;
-} __attribute__ ((packed));
-
-/*  Control flags  */
-#define V4L2_CTRL_FLAG_DISABLED		0x0001
-#define V4L2_CTRL_FLAG_GRABBED		0x0002
-#define V4L2_CTRL_FLAG_READ_ONLY 	0x0004
-#define V4L2_CTRL_FLAG_UPDATE 		0x0008
-#define V4L2_CTRL_FLAG_INACTIVE 	0x0010
-#define V4L2_CTRL_FLAG_SLIDER 		0x0020
-#define V4L2_CTRL_FLAG_WRITE_ONLY 	0x0040
-#define V4L2_CTRL_FLAG_VOLATILE		0x0080
-#define V4L2_CTRL_FLAG_HAS_PAYLOAD	0x0100
-#define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE	0x0200
-
-/*  Query flags, to be ORed with the control ID */
-#define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000
-#define V4L2_CTRL_FLAG_NEXT_COMPOUND	0x40000000
-
-/*  User-class control IDs defined by V4L2 */
-#define V4L2_CID_MAX_CTRLS		1024
-/*  IDs reserved for driver specific controls */
-#define V4L2_CID_PRIVATE_BASE		0x08000000
-
-
-/*
- *	T U N I N G
- */
-struct v4l2_tuner {
-	__u32                   index;
-	__u8			name[32];
-	__u32			type;	/* enum v4l2_tuner_type */
-	__u32			capability;
-	__u32			rangelow;
-	__u32			rangehigh;
-	__u32			rxsubchans;
-	__u32			audmode;
-	__s32			signal;
-	__s32			afc;
-	__u32			reserved[4];
-};
-
-struct v4l2_modulator {
-	__u32			index;
-	__u8			name[32];
-	__u32			capability;
-	__u32			rangelow;
-	__u32			rangehigh;
-	__u32			txsubchans;
-	__u32			type;	/* enum v4l2_tuner_type */
-	__u32			reserved[3];
-};
-
-/*  Flags for the 'capability' field */
-#define V4L2_TUNER_CAP_LOW		0x0001
-#define V4L2_TUNER_CAP_NORM		0x0002
-#define V4L2_TUNER_CAP_HWSEEK_BOUNDED	0x0004
-#define V4L2_TUNER_CAP_HWSEEK_WRAP	0x0008
-#define V4L2_TUNER_CAP_STEREO		0x0010
-#define V4L2_TUNER_CAP_LANG2		0x0020
-#define V4L2_TUNER_CAP_SAP		0x0020
-#define V4L2_TUNER_CAP_LANG1		0x0040
-#define V4L2_TUNER_CAP_RDS		0x0080
-#define V4L2_TUNER_CAP_RDS_BLOCK_IO	0x0100
-#define V4L2_TUNER_CAP_RDS_CONTROLS	0x0200
-#define V4L2_TUNER_CAP_FREQ_BANDS	0x0400
-#define V4L2_TUNER_CAP_HWSEEK_PROG_LIM	0x0800
-#define V4L2_TUNER_CAP_1HZ		0x1000
-
-/*  Flags for the 'rxsubchans' field */
-#define V4L2_TUNER_SUB_MONO		0x0001
-#define V4L2_TUNER_SUB_STEREO		0x0002
-#define V4L2_TUNER_SUB_LANG2		0x0004
-#define V4L2_TUNER_SUB_SAP		0x0004
-#define V4L2_TUNER_SUB_LANG1		0x0008
-#define V4L2_TUNER_SUB_RDS		0x0010
-
-/*  Values for the 'audmode' field */
-#define V4L2_TUNER_MODE_MONO		0x0000
-#define V4L2_TUNER_MODE_STEREO		0x0001
-#define V4L2_TUNER_MODE_LANG2		0x0002
-#define V4L2_TUNER_MODE_SAP		0x0002
-#define V4L2_TUNER_MODE_LANG1		0x0003
-#define V4L2_TUNER_MODE_LANG1_LANG2	0x0004
-
-struct v4l2_frequency {
-	__u32	tuner;
-	__u32	type;	/* enum v4l2_tuner_type */
-	__u32	frequency;
-	__u32	reserved[8];
-};
-
-#define V4L2_BAND_MODULATION_VSB	(1 << 1)
-#define V4L2_BAND_MODULATION_FM		(1 << 2)
-#define V4L2_BAND_MODULATION_AM		(1 << 3)
-
-struct v4l2_frequency_band {
-	__u32	tuner;
-	__u32	type;	/* enum v4l2_tuner_type */
-	__u32	index;
-	__u32	capability;
-	__u32	rangelow;
-	__u32	rangehigh;
-	__u32	modulation;
-	__u32	reserved[9];
-};
-
-struct v4l2_hw_freq_seek {
-	__u32	tuner;
-	__u32	type;	/* enum v4l2_tuner_type */
-	__u32	seek_upward;
-	__u32	wrap_around;
-	__u32	spacing;
-	__u32	rangelow;
-	__u32	rangehigh;
-	__u32	reserved[5];
-};
-
-/*
- *	R D S
- */
-
-struct v4l2_rds_data {
-	__u8 	lsb;
-	__u8 	msb;
-	__u8 	block;
-} __attribute__ ((packed));
-
-#define V4L2_RDS_BLOCK_MSK 	 0x7
-#define V4L2_RDS_BLOCK_A 	 0
-#define V4L2_RDS_BLOCK_B 	 1
-#define V4L2_RDS_BLOCK_C 	 2
-#define V4L2_RDS_BLOCK_D 	 3
-#define V4L2_RDS_BLOCK_C_ALT 	 4
-#define V4L2_RDS_BLOCK_INVALID 	 7
-
-#define V4L2_RDS_BLOCK_CORRECTED 0x40
-#define V4L2_RDS_BLOCK_ERROR 	 0x80
-
-/*
- *	A U D I O
- */
-struct v4l2_audio {
-	__u32	index;
-	__u8	name[32];
-	__u32	capability;
-	__u32	mode;
-	__u32	reserved[2];
-};
-
-/*  Flags for the 'capability' field */
-#define V4L2_AUDCAP_STEREO		0x00001
-#define V4L2_AUDCAP_AVL			0x00002
-
-/*  Flags for the 'mode' field */
-#define V4L2_AUDMODE_AVL		0x00001
-
-struct v4l2_audioout {
-	__u32	index;
-	__u8	name[32];
-	__u32	capability;
-	__u32	mode;
-	__u32	reserved[2];
-};
-
-/*
- *	M P E G   S E R V I C E S
- *
- *	NOTE: EXPERIMENTAL API
- */
-#if 1
-#define V4L2_ENC_IDX_FRAME_I    (0)
-#define V4L2_ENC_IDX_FRAME_P    (1)
-#define V4L2_ENC_IDX_FRAME_B    (2)
-#define V4L2_ENC_IDX_FRAME_MASK (0xf)
-
-struct v4l2_enc_idx_entry {
-	__u64 offset;
-	__u64 pts;
-	__u32 length;
-	__u32 flags;
-	__u32 reserved[2];
-};
-
-#define V4L2_ENC_IDX_ENTRIES (64)
-struct v4l2_enc_idx {
-	__u32 entries;
-	__u32 entries_cap;
-	__u32 reserved[4];
-	struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
-};
-
-
-#define V4L2_ENC_CMD_START      (0)
-#define V4L2_ENC_CMD_STOP       (1)
-#define V4L2_ENC_CMD_PAUSE      (2)
-#define V4L2_ENC_CMD_RESUME     (3)
-
-/* Flags for V4L2_ENC_CMD_STOP */
-#define V4L2_ENC_CMD_STOP_AT_GOP_END    (1 << 0)
-
-struct v4l2_encoder_cmd {
-	__u32 cmd;
-	__u32 flags;
-	union {
-		struct {
-			__u32 data[8];
-		} raw;
-	};
-};
-
-/* Decoder commands */
-#define V4L2_DEC_CMD_START       (0)
-#define V4L2_DEC_CMD_STOP        (1)
-#define V4L2_DEC_CMD_PAUSE       (2)
-#define V4L2_DEC_CMD_RESUME      (3)
-
-/* Flags for V4L2_DEC_CMD_START */
-#define V4L2_DEC_CMD_START_MUTE_AUDIO	(1 << 0)
-
-/* Flags for V4L2_DEC_CMD_PAUSE */
-#define V4L2_DEC_CMD_PAUSE_TO_BLACK	(1 << 0)
-
-/* Flags for V4L2_DEC_CMD_STOP */
-#define V4L2_DEC_CMD_STOP_TO_BLACK	(1 << 0)
-#define V4L2_DEC_CMD_STOP_IMMEDIATELY	(1 << 1)
-
-/* Play format requirements (returned by the driver): */
-
-/* The decoder has no special format requirements */
-#define V4L2_DEC_START_FMT_NONE		(0)
-/* The decoder requires full GOPs */
-#define V4L2_DEC_START_FMT_GOP		(1)
-
-/* The structure must be zeroed before use by the application
-   This ensures it can be extended safely in the future. */
-struct v4l2_decoder_cmd {
-	__u32 cmd;
-	__u32 flags;
-	union {
-		struct {
-			__u64 pts;
-		} stop;
-
-		struct {
-			/* 0 or 1000 specifies normal speed,
-			   1 specifies forward single stepping,
-			   -1 specifies backward single stepping,
-			   >1: playback at speed/1000 of the normal speed,
-			   <-1: reverse playback at (-speed/1000) of the normal speed. */
-			__s32 speed;
-			__u32 format;
-		} start;
-
-		struct {
-			__u32 data[16];
-		} raw;
-	};
-};
-#endif
-
-
-/*
- *	D A T A   S E R V I C E S   ( V B I )
- *
- *	Data services API by Michael Schimek
- */
-
-/* Raw VBI */
-struct v4l2_vbi_format {
-	__u32	sampling_rate;		/* in 1 Hz */
-	__u32	offset;
-	__u32	samples_per_line;
-	__u32	sample_format;		/* V4L2_PIX_FMT_* */
-	__s32	start[2];
-	__u32	count[2];
-	__u32	flags;			/* V4L2_VBI_* */
-	__u32	reserved[2];		/* must be zero */
-};
-
-/*  VBI flags  */
-#define V4L2_VBI_UNSYNC		(1 << 0)
-#define V4L2_VBI_INTERLACED	(1 << 1)
-
-/* ITU-R start lines for each field */
-#define V4L2_VBI_ITU_525_F1_START (1)
-#define V4L2_VBI_ITU_525_F2_START (264)
-#define V4L2_VBI_ITU_625_F1_START (1)
-#define V4L2_VBI_ITU_625_F2_START (314)
-
-/* Sliced VBI
- *
- *    This implements is a proposal V4L2 API to allow SLICED VBI
- * required for some hardware encoders. It should change without
- * notice in the definitive implementation.
- */
-
-struct v4l2_sliced_vbi_format {
-	__u16   service_set;
-	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-				 (equals frame lines 313-336 for 625 line video
-				  standards, 263-286 for 525 line standards) */
-	__u16   service_lines[2][24];
-	__u32   io_size;
-	__u32   reserved[2];            /* must be zero */
-};
-
-/* Teletext World System Teletext
-   (WST), defined on ITU-R BT.653-2 */
-#define V4L2_SLICED_TELETEXT_B          (0x0001)
-/* Video Program System, defined on ETS 300 231*/
-#define V4L2_SLICED_VPS                 (0x0400)
-/* Closed Caption, defined on EIA-608 */
-#define V4L2_SLICED_CAPTION_525         (0x1000)
-/* Wide Screen System, defined on ITU-R BT1119.1 */
-#define V4L2_SLICED_WSS_625             (0x4000)
-
-#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
-#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
-
-struct v4l2_sliced_vbi_cap {
-	__u16   service_set;
-	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-				 (equals frame lines 313-336 for 625 line video
-				  standards, 263-286 for 525 line standards) */
-	__u16   service_lines[2][24];
-	__u32	type;		/* enum v4l2_buf_type */
-	__u32   reserved[3];    /* must be 0 */
-};
-
-struct v4l2_sliced_vbi_data {
-	__u32   id;
-	__u32   field;          /* 0: first field, 1: second field */
-	__u32   line;           /* 1-23 */
-	__u32   reserved;       /* must be 0 */
-	__u8    data[48];
-};
-
-/*
- * Sliced VBI data inserted into MPEG Streams
- */
-
-/*
- * V4L2_MPEG_STREAM_VBI_FMT_IVTV:
- *
- * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an
- * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI
- * data
- *
- * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header
- * definitions are not included here.  See the MPEG-2 specifications for details
- * on these headers.
- */
-
-/* Line type IDs */
-#define V4L2_MPEG_VBI_IVTV_TELETEXT_B     (1)
-#define V4L2_MPEG_VBI_IVTV_CAPTION_525    (4)
-#define V4L2_MPEG_VBI_IVTV_WSS_625        (5)
-#define V4L2_MPEG_VBI_IVTV_VPS            (7)
-
-struct v4l2_mpeg_vbi_itv0_line {
-	__u8 id;	/* One of V4L2_MPEG_VBI_IVTV_* above */
-	__u8 data[42];	/* Sliced VBI data for the line */
-} __attribute__ ((packed));
-
-struct v4l2_mpeg_vbi_itv0 {
-	__le32 linemask[2]; /* Bitmasks of VBI service lines present */
-	struct v4l2_mpeg_vbi_itv0_line line[35];
-} __attribute__ ((packed));
-
-struct v4l2_mpeg_vbi_ITV0 {
-	struct v4l2_mpeg_vbi_itv0_line line[36];
-} __attribute__ ((packed));
-
-#define V4L2_MPEG_VBI_IVTV_MAGIC0	"itv0"
-#define V4L2_MPEG_VBI_IVTV_MAGIC1	"ITV0"
-
-struct v4l2_mpeg_vbi_fmt_ivtv {
-	__u8 magic[4];
-	union {
-		struct v4l2_mpeg_vbi_itv0 itv0;
-		struct v4l2_mpeg_vbi_ITV0 ITV0;
-	};
-} __attribute__ ((packed));
-
-/*
- *	A G G R E G A T E   S T R U C T U R E S
- */
-
-/**
- * struct v4l2_plane_pix_format - additional, per-plane format definition
- * @sizeimage:		maximum size in bytes required for data, for which
- *			this plane will be used
- * @bytesperline:	distance in bytes between the leftmost pixels in two
- *			adjacent lines
- */
-struct v4l2_plane_pix_format {
-	__u32		sizeimage;
-	__u32		bytesperline;
-	__u16		reserved[6];
-} __attribute__ ((packed));
-
-/**
- * struct v4l2_pix_format_mplane - multiplanar format definition
- * @width:		image width in pixels
- * @height:		image height in pixels
- * @pixelformat:	little endian four character code (fourcc)
- * @field:		enum v4l2_field; field order (for interlaced video)
- * @colorspace:		enum v4l2_colorspace; supplemental to pixelformat
- * @plane_fmt:		per-plane information
- * @num_planes:		number of planes for this format
- * @flags:		format flags (V4L2_PIX_FMT_FLAG_*)
- * @ycbcr_enc:		enum v4l2_ycbcr_encoding, Y'CbCr encoding
- * @quantization:	enum v4l2_quantization, colorspace quantization
- * @xfer_func:		enum v4l2_xfer_func, colorspace transfer function
- */
-struct v4l2_pix_format_mplane {
-	__u32				width;
-	__u32				height;
-	__u32				pixelformat;
-	__u32				field;
-	__u32				colorspace;
-
-	struct v4l2_plane_pix_format	plane_fmt[VIDEO_MAX_PLANES];
-	__u8				num_planes;
-	__u8				flags;
-	__u8				ycbcr_enc;
-	__u8				quantization;
-	__u8				xfer_func;
-	__u8				reserved[7];
-} __attribute__ ((packed));
-
-/**
- * struct v4l2_sdr_format - SDR format definition
- * @pixelformat:	little endian four character code (fourcc)
- * @buffersize:		maximum size in bytes required for data
- */
-struct v4l2_sdr_format {
-	__u32				pixelformat;
-	__u32				buffersize;
-	__u8				reserved[24];
-} __attribute__ ((packed));
-
-/**
- * struct v4l2_format - stream data format
- * @type:	enum v4l2_buf_type; type of the data stream
- * @pix:	definition of an image format
- * @pix_mp:	definition of a multiplanar image format
- * @win:	definition of an overlaid image
- * @vbi:	raw VBI capture or output parameters
- * @sliced:	sliced VBI capture or output parameters
- * @raw_data:	placeholder for future extensions and custom formats
- */
-struct v4l2_format {
-	__u32	 type;
-	union {
-		struct v4l2_pix_format		pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
-		struct v4l2_pix_format_mplane	pix_mp;  /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */
-		struct v4l2_window		win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
-		struct v4l2_vbi_format		vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
-		struct v4l2_sliced_vbi_format	sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
-		struct v4l2_sdr_format		sdr;     /* V4L2_BUF_TYPE_SDR_CAPTURE */
-		__u8	raw_data[200];                   /* user-defined */
-	} fmt;
-};
-
-/*	Stream type-dependent parameters
- */
-struct v4l2_streamparm {
-	__u32	 type;			/* enum v4l2_buf_type */
-	union {
-		struct v4l2_captureparm	capture;
-		struct v4l2_outputparm	output;
-		__u8	raw_data[200];  /* user-defined */
-	} parm;
-};
-
-/*
- *	E V E N T S
- */
-
-#define V4L2_EVENT_ALL				0
-#define V4L2_EVENT_VSYNC			1
-#define V4L2_EVENT_EOS				2
-#define V4L2_EVENT_CTRL				3
-#define V4L2_EVENT_FRAME_SYNC			4
-#define V4L2_EVENT_SOURCE_CHANGE		5
-#define V4L2_EVENT_MOTION_DET			6
-#define V4L2_EVENT_PRIVATE_START		0x08000000
-
-/* Payload for V4L2_EVENT_VSYNC */
-struct v4l2_event_vsync {
-	/* Can be V4L2_FIELD_ANY, _NONE, _TOP or _BOTTOM */
-	__u8 field;
-} __attribute__ ((packed));
-
-/* Payload for V4L2_EVENT_CTRL */
-#define V4L2_EVENT_CTRL_CH_VALUE		(1 << 0)
-#define V4L2_EVENT_CTRL_CH_FLAGS		(1 << 1)
-#define V4L2_EVENT_CTRL_CH_RANGE		(1 << 2)
-
-struct v4l2_event_ctrl {
-	__u32 changes;
-	__u32 type;
-	union {
-		__s32 value;
-		__s64 value64;
-	};
-	__u32 flags;
-	__s32 minimum;
-	__s32 maximum;
-	__s32 step;
-	__s32 default_value;
-};
-
-struct v4l2_event_frame_sync {
-	__u32 frame_sequence;
-};
-
-#define V4L2_EVENT_SRC_CH_RESOLUTION		(1 << 0)
-
-struct v4l2_event_src_change {
-	__u32 changes;
-};
-
-#define V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ	(1 << 0)
-
-/**
- * struct v4l2_event_motion_det - motion detection event
- * @flags:             if V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ is set, then the
- *                     frame_sequence field is valid.
- * @frame_sequence:    the frame sequence number associated with this event.
- * @region_mask:       which regions detected motion.
- */
-struct v4l2_event_motion_det {
-	__u32 flags;
-	__u32 frame_sequence;
-	__u32 region_mask;
-};
-
-struct v4l2_event {
-	__u32				type;
-	union {
-		struct v4l2_event_vsync		vsync;
-		struct v4l2_event_ctrl		ctrl;
-		struct v4l2_event_frame_sync	frame_sync;
-		struct v4l2_event_src_change	src_change;
-		struct v4l2_event_motion_det	motion_det;
-		__u8				data[64];
-	} u;
-	__u32				pending;
-	__u32				sequence;
-	struct timespec			timestamp;
-	__u32				id;
-	__u32				reserved[8];
-};
-
-#define V4L2_EVENT_SUB_FL_SEND_INITIAL		(1 << 0)
-#define V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK	(1 << 1)
-
-struct v4l2_event_subscription {
-	__u32				type;
-	__u32				id;
-	__u32				flags;
-	__u32				reserved[5];
-};
-
-/*
- *	A D V A N C E D   D E B U G G I N G
- *
- *	NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
- *	FOR DEBUGGING, TESTING AND INTERNAL USE ONLY!
- */
-
-/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
-
-#define V4L2_CHIP_MATCH_BRIDGE      0  /* Match against chip ID on the bridge (0 for the bridge) */
-#define V4L2_CHIP_MATCH_SUBDEV      4  /* Match against subdev index */
-
-/* The following four defines are no longer in use */
-#define V4L2_CHIP_MATCH_HOST V4L2_CHIP_MATCH_BRIDGE
-#define V4L2_CHIP_MATCH_I2C_DRIVER  1  /* Match against I2C driver name */
-#define V4L2_CHIP_MATCH_I2C_ADDR    2  /* Match against I2C 7-bit address */
-#define V4L2_CHIP_MATCH_AC97        3  /* Match against ancillary AC97 chip */
-
-struct v4l2_dbg_match {
-	__u32 type; /* Match type */
-	union {     /* Match this chip, meaning determined by type */
-		__u32 addr;
-		char name[32];
-	};
-} __attribute__ ((packed));
-
-struct v4l2_dbg_register {
-	struct v4l2_dbg_match match;
-	__u32 size;	/* register size in bytes */
-	__u64 reg;
-	__u64 val;
-} __attribute__ ((packed));
-
-#define V4L2_CHIP_FL_READABLE (1 << 0)
-#define V4L2_CHIP_FL_WRITABLE (1 << 1)
-
-/* VIDIOC_DBG_G_CHIP_INFO */
-struct v4l2_dbg_chip_info {
-	struct v4l2_dbg_match match;
-	char name[32];
-	__u32 flags;
-	__u32 reserved[32];
-} __attribute__ ((packed));
-
-/**
- * struct v4l2_create_buffers - VIDIOC_CREATE_BUFS argument
- * @index:	on return, index of the first created buffer
- * @count:	entry: number of requested buffers,
- *		return: number of created buffers
- * @memory:	enum v4l2_memory; buffer memory type
- * @format:	frame format, for which buffers are requested
- * @reserved:	future extensions
- */
-struct v4l2_create_buffers {
-	__u32			index;
-	__u32			count;
-	__u32			memory;
-	struct v4l2_format	format;
-	__u32			reserved[8];
-};
-
-/*
- *	I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
- *
- */
-#define VIDIOC_QUERYCAP		 _IOR('V',  0, struct v4l2_capability)
-#define VIDIOC_RESERVED		  _IO('V',  1)
-#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
-#define VIDIOC_G_FMT		_IOWR('V',  4, struct v4l2_format)
-#define VIDIOC_S_FMT		_IOWR('V',  5, struct v4l2_format)
-#define VIDIOC_REQBUFS		_IOWR('V',  8, struct v4l2_requestbuffers)
-#define VIDIOC_QUERYBUF		_IOWR('V',  9, struct v4l2_buffer)
-#define VIDIOC_G_FBUF		 _IOR('V', 10, struct v4l2_framebuffer)
-#define VIDIOC_S_FBUF		 _IOW('V', 11, struct v4l2_framebuffer)
-#define VIDIOC_OVERLAY		 _IOW('V', 14, int)
-#define VIDIOC_QBUF		_IOWR('V', 15, struct v4l2_buffer)
-#define VIDIOC_EXPBUF		_IOWR('V', 16, struct v4l2_exportbuffer)
-#define VIDIOC_DQBUF		_IOWR('V', 17, struct v4l2_buffer)
-#define VIDIOC_STREAMON		 _IOW('V', 18, int)
-#define VIDIOC_STREAMOFF	 _IOW('V', 19, int)
-#define VIDIOC_G_PARM		_IOWR('V', 21, struct v4l2_streamparm)
-#define VIDIOC_S_PARM		_IOWR('V', 22, struct v4l2_streamparm)
-#define VIDIOC_G_STD		 _IOR('V', 23, v4l2_std_id)
-#define VIDIOC_S_STD		 _IOW('V', 24, v4l2_std_id)
-#define VIDIOC_ENUMSTD		_IOWR('V', 25, struct v4l2_standard)
-#define VIDIOC_ENUMINPUT	_IOWR('V', 26, struct v4l2_input)
-#define VIDIOC_G_CTRL		_IOWR('V', 27, struct v4l2_control)
-#define VIDIOC_S_CTRL		_IOWR('V', 28, struct v4l2_control)
-#define VIDIOC_G_TUNER		_IOWR('V', 29, struct v4l2_tuner)
-#define VIDIOC_S_TUNER		 _IOW('V', 30, struct v4l2_tuner)
-#define VIDIOC_G_AUDIO		 _IOR('V', 33, struct v4l2_audio)
-#define VIDIOC_S_AUDIO		 _IOW('V', 34, struct v4l2_audio)
-#define VIDIOC_QUERYCTRL	_IOWR('V', 36, struct v4l2_queryctrl)
-#define VIDIOC_QUERYMENU	_IOWR('V', 37, struct v4l2_querymenu)
-#define VIDIOC_G_INPUT		 _IOR('V', 38, int)
-#define VIDIOC_S_INPUT		_IOWR('V', 39, int)
-#define VIDIOC_G_EDID		_IOWR('V', 40, struct v4l2_edid)
-#define VIDIOC_S_EDID		_IOWR('V', 41, struct v4l2_edid)
-#define VIDIOC_G_OUTPUT		 _IOR('V', 46, int)
-#define VIDIOC_S_OUTPUT		_IOWR('V', 47, int)
-#define VIDIOC_ENUMOUTPUT	_IOWR('V', 48, struct v4l2_output)
-#define VIDIOC_G_AUDOUT		 _IOR('V', 49, struct v4l2_audioout)
-#define VIDIOC_S_AUDOUT		 _IOW('V', 50, struct v4l2_audioout)
-#define VIDIOC_G_MODULATOR	_IOWR('V', 54, struct v4l2_modulator)
-#define VIDIOC_S_MODULATOR	 _IOW('V', 55, struct v4l2_modulator)
-#define VIDIOC_G_FREQUENCY	_IOWR('V', 56, struct v4l2_frequency)
-#define VIDIOC_S_FREQUENCY	 _IOW('V', 57, struct v4l2_frequency)
-#define VIDIOC_CROPCAP		_IOWR('V', 58, struct v4l2_cropcap)
-#define VIDIOC_G_CROP		_IOWR('V', 59, struct v4l2_crop)
-#define VIDIOC_S_CROP		 _IOW('V', 60, struct v4l2_crop)
-#define VIDIOC_G_JPEGCOMP	 _IOR('V', 61, struct v4l2_jpegcompression)
-#define VIDIOC_S_JPEGCOMP	 _IOW('V', 62, struct v4l2_jpegcompression)
-#define VIDIOC_QUERYSTD      	 _IOR('V', 63, v4l2_std_id)
-#define VIDIOC_TRY_FMT      	_IOWR('V', 64, struct v4l2_format)
-#define VIDIOC_ENUMAUDIO	_IOWR('V', 65, struct v4l2_audio)
-#define VIDIOC_ENUMAUDOUT	_IOWR('V', 66, struct v4l2_audioout)
-#define VIDIOC_G_PRIORITY	 _IOR('V', 67, __u32) /* enum v4l2_priority */
-#define VIDIOC_S_PRIORITY	 _IOW('V', 68, __u32) /* enum v4l2_priority */
-#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
-#define VIDIOC_LOG_STATUS         _IO('V', 70)
-#define VIDIOC_G_EXT_CTRLS	_IOWR('V', 71, struct v4l2_ext_controls)
-#define VIDIOC_S_EXT_CTRLS	_IOWR('V', 72, struct v4l2_ext_controls)
-#define VIDIOC_TRY_EXT_CTRLS	_IOWR('V', 73, struct v4l2_ext_controls)
-#define VIDIOC_ENUM_FRAMESIZES	_IOWR('V', 74, struct v4l2_frmsizeenum)
-#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
-#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
-#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
-#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
-
-/* Experimental, meant for debugging, testing and internal use.
-   Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
-   You must be root to use these ioctls. Never use these in applications! */
-#define	VIDIOC_DBG_S_REGISTER 	 _IOW('V', 79, struct v4l2_dbg_register)
-#define	VIDIOC_DBG_G_REGISTER 	_IOWR('V', 80, struct v4l2_dbg_register)
-
-#define VIDIOC_S_HW_FREQ_SEEK	 _IOW('V', 82, struct v4l2_hw_freq_seek)
-
-#define	VIDIOC_S_DV_TIMINGS	_IOWR('V', 87, struct v4l2_dv_timings)
-#define	VIDIOC_G_DV_TIMINGS	_IOWR('V', 88, struct v4l2_dv_timings)
-#define	VIDIOC_DQEVENT		 _IOR('V', 89, struct v4l2_event)
-#define	VIDIOC_SUBSCRIBE_EVENT	 _IOW('V', 90, struct v4l2_event_subscription)
-#define	VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)
-
-/* Experimental, the below two ioctls may change over the next couple of kernel
-   versions */
-#define VIDIOC_CREATE_BUFS	_IOWR('V', 92, struct v4l2_create_buffers)
-#define VIDIOC_PREPARE_BUF	_IOWR('V', 93, struct v4l2_buffer)
-
-/* Experimental selection API */
-#define VIDIOC_G_SELECTION	_IOWR('V', 94, struct v4l2_selection)
-#define VIDIOC_S_SELECTION	_IOWR('V', 95, struct v4l2_selection)
-
-/* Experimental, these two ioctls may change over the next couple of kernel
-   versions. */
-#define VIDIOC_DECODER_CMD	_IOWR('V', 96, struct v4l2_decoder_cmd)
-#define VIDIOC_TRY_DECODER_CMD	_IOWR('V', 97, struct v4l2_decoder_cmd)
-
-/* Experimental, these three ioctls may change over the next couple of kernel
-   versions. */
-#define VIDIOC_ENUM_DV_TIMINGS  _IOWR('V', 98, struct v4l2_enum_dv_timings)
-#define VIDIOC_QUERY_DV_TIMINGS  _IOR('V', 99, struct v4l2_dv_timings)
-#define VIDIOC_DV_TIMINGS_CAP   _IOWR('V', 100, struct v4l2_dv_timings_cap)
-
-/* Experimental, this ioctl may change over the next couple of kernel
-   versions. */
-#define VIDIOC_ENUM_FREQ_BANDS	_IOWR('V', 101, struct v4l2_frequency_band)
-
-/* Experimental, meant for debugging, testing and internal use.
-   Never use these in applications! */
-#define VIDIOC_DBG_G_CHIP_INFO  _IOWR('V', 102, struct v4l2_dbg_chip_info)
-
-#define VIDIOC_QUERY_EXT_CTRL	_IOWR('V', 103, struct v4l2_query_ext_ctrl)
-
-/* Reminder: when adding new ioctls please add support for them to
-   drivers/media/v4l2-core/v4l2-compat-ioctl32.c as well! */
-
-#define BASE_VIDIOC_PRIVATE	192		/* 192-255 are private */
-
-#endif /* __LINUX_VIDEODEV2_H */
diff --git a/openflow/usr/include/linux/virtio_9p.h b/openflow/usr/include/linux/virtio_9p.h
deleted file mode 100644
index 277c4ad..0000000
--- a/openflow/usr/include/linux/virtio_9p.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _LINUX_VIRTIO_9P_H
-#define _LINUX_VIRTIO_9P_H
-/* This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE. */
-#include <linux/types.h>
-#include <linux/virtio_ids.h>
-#include <linux/virtio_config.h>
-
-/* The feature bitmap for virtio 9P */
-
-/* The mount point is specified in a config variable */
-#define VIRTIO_9P_MOUNT_TAG 0
-
-struct virtio_9p_config {
-	/* length of the tag name */
-	__u16 tag_len;
-	/* non-NULL terminated tag name */
-	__u8 tag[0];
-} __attribute__((packed));
-
-#endif /* _LINUX_VIRTIO_9P_H */
diff --git a/openflow/usr/include/linux/virtio_balloon.h b/openflow/usr/include/linux/virtio_balloon.h
deleted file mode 100644
index d7f1cbc..0000000
--- a/openflow/usr/include/linux/virtio_balloon.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef _LINUX_VIRTIO_BALLOON_H
-#define _LINUX_VIRTIO_BALLOON_H
-/* This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE. */
-#include <linux/types.h>
-#include <linux/virtio_types.h>
-#include <linux/virtio_ids.h>
-#include <linux/virtio_config.h>
-
-/* The feature bitmap for virtio balloon */
-#define VIRTIO_BALLOON_F_MUST_TELL_HOST	0 /* Tell before reclaiming pages */
-#define VIRTIO_BALLOON_F_STATS_VQ	1 /* Memory Stats virtqueue */
-#define VIRTIO_BALLOON_F_DEFLATE_ON_OOM	2 /* Deflate balloon on OOM */
-
-/* Size of a PFN in the balloon interface. */
-#define VIRTIO_BALLOON_PFN_SHIFT 12
-
-struct virtio_balloon_config {
-	/* Number of pages host wants Guest to give up. */
-	__u32 num_pages;
-	/* Number of pages we've actually got in balloon. */
-	__u32 actual;
-};
-
-#define VIRTIO_BALLOON_S_SWAP_IN  0   /* Amount of memory swapped in */
-#define VIRTIO_BALLOON_S_SWAP_OUT 1   /* Amount of memory swapped out */
-#define VIRTIO_BALLOON_S_MAJFLT   2   /* Number of major faults */
-#define VIRTIO_BALLOON_S_MINFLT   3   /* Number of minor faults */
-#define VIRTIO_BALLOON_S_MEMFREE  4   /* Total amount of free memory */
-#define VIRTIO_BALLOON_S_MEMTOT   5   /* Total amount of memory */
-#define VIRTIO_BALLOON_S_NR       6
-
-/*
- * Memory statistics structure.
- * Driver fills an array of these structures and passes to device.
- *
- * NOTE: fields are laid out in a way that would make compiler add padding
- * between and after fields, so we have to use compiler-specific attributes to
- * pack it, to disable this padding. This also often causes compiler to
- * generate suboptimal code.
- *
- * We maintain this statistics structure format for backwards compatibility,
- * but don't follow this example.
- *
- * If implementing a similar structure, do something like the below instead:
- *     struct virtio_balloon_stat {
- *         __virtio16 tag;
- *         __u8 reserved[6];
- *         __virtio64 val;
- *     };
- *
- * In other words, add explicit reserved fields to align field and
- * structure boundaries at field size, avoiding compiler padding
- * without the packed attribute.
- */
-struct virtio_balloon_stat {
-	__virtio16 tag;
-	__virtio64 val;
-} __attribute__((packed));
-
-#endif /* _LINUX_VIRTIO_BALLOON_H */
diff --git a/openflow/usr/include/linux/virtio_blk.h b/openflow/usr/include/linux/virtio_blk.h
deleted file mode 100644
index c7c60d2..0000000
--- a/openflow/usr/include/linux/virtio_blk.h
+++ /dev/null
@@ -1,147 +0,0 @@
-#ifndef _LINUX_VIRTIO_BLK_H
-#define _LINUX_VIRTIO_BLK_H
-/* This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE. */
-#include <linux/types.h>
-#include <linux/virtio_ids.h>
-#include <linux/virtio_config.h>
-#include <linux/virtio_types.h>
-
-/* Feature bits */
-#define VIRTIO_BLK_F_SIZE_MAX	1	/* Indicates maximum segment size */
-#define VIRTIO_BLK_F_SEG_MAX	2	/* Indicates maximum # of segments */
-#define VIRTIO_BLK_F_GEOMETRY	4	/* Legacy geometry available  */
-#define VIRTIO_BLK_F_RO		5	/* Disk is read-only */
-#define VIRTIO_BLK_F_BLK_SIZE	6	/* Block size of disk is available*/
-#define VIRTIO_BLK_F_TOPOLOGY	10	/* Topology information is available */
-#define VIRTIO_BLK_F_MQ		12	/* support more than one vq */
-
-/* Legacy feature bits */
-#ifndef VIRTIO_BLK_NO_LEGACY
-#define VIRTIO_BLK_F_BARRIER	0	/* Does host support barriers? */
-#define VIRTIO_BLK_F_SCSI	7	/* Supports scsi command passthru */
-#define VIRTIO_BLK_F_WCE	9	/* Writeback mode enabled after reset */
-#define VIRTIO_BLK_F_CONFIG_WCE	11	/* Writeback mode available in config */
-/* Old (deprecated) name for VIRTIO_BLK_F_WCE. */
-#define VIRTIO_BLK_F_FLUSH VIRTIO_BLK_F_WCE
-#endif /* !VIRTIO_BLK_NO_LEGACY */
-
-#define VIRTIO_BLK_ID_BYTES	20	/* ID string length */
-
-struct virtio_blk_config {
-	/* The capacity (in 512-byte sectors). */
-	__u64 capacity;
-	/* The maximum segment size (if VIRTIO_BLK_F_SIZE_MAX) */
-	__u32 size_max;
-	/* The maximum number of segments (if VIRTIO_BLK_F_SEG_MAX) */
-	__u32 seg_max;
-	/* geometry of the device (if VIRTIO_BLK_F_GEOMETRY) */
-	struct virtio_blk_geometry {
-		__u16 cylinders;
-		__u8 heads;
-		__u8 sectors;
-	} geometry;
-
-	/* block size of device (if VIRTIO_BLK_F_BLK_SIZE) */
-	__u32 blk_size;
-
-	/* the next 4 entries are guarded by VIRTIO_BLK_F_TOPOLOGY  */
-	/* exponent for physical block per logical block. */
-	__u8 physical_block_exp;
-	/* alignment offset in logical blocks. */
-	__u8 alignment_offset;
-	/* minimum I/O size without performance penalty in logical blocks. */
-	__u16 min_io_size;
-	/* optimal sustained I/O size in logical blocks. */
-	__u32 opt_io_size;
-
-	/* writeback mode (if VIRTIO_BLK_F_CONFIG_WCE) */
-	__u8 wce;
-	__u8 unused;
-
-	/* number of vqs, only available when VIRTIO_BLK_F_MQ is set */
-	__u16 num_queues;
-} __attribute__((packed));
-
-/*
- * Command types
- *
- * Usage is a bit tricky as some bits are used as flags and some are not.
- *
- * Rules:
- *   VIRTIO_BLK_T_OUT may be combined with VIRTIO_BLK_T_SCSI_CMD or
- *   VIRTIO_BLK_T_BARRIER.  VIRTIO_BLK_T_FLUSH is a command of its own
- *   and may not be combined with any of the other flags.
- */
-
-/* These two define direction. */
-#define VIRTIO_BLK_T_IN		0
-#define VIRTIO_BLK_T_OUT	1
-
-#ifndef VIRTIO_BLK_NO_LEGACY
-/* This bit says it's a scsi command, not an actual read or write. */
-#define VIRTIO_BLK_T_SCSI_CMD	2
-#endif /* VIRTIO_BLK_NO_LEGACY */
-
-/* Cache flush command */
-#define VIRTIO_BLK_T_FLUSH	4
-
-/* Get device ID command */
-#define VIRTIO_BLK_T_GET_ID    8
-
-#ifndef VIRTIO_BLK_NO_LEGACY
-/* Barrier before this op. */
-#define VIRTIO_BLK_T_BARRIER	0x80000000
-#endif /* !VIRTIO_BLK_NO_LEGACY */
-
-/*
- * This comes first in the read scatter-gather list.
- * For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated,
- * this is the first element of the read scatter-gather list.
- */
-struct virtio_blk_outhdr {
-	/* VIRTIO_BLK_T* */
-	__virtio32 type;
-	/* io priority. */
-	__virtio32 ioprio;
-	/* Sector (ie. 512 byte offset) */
-	__virtio64 sector;
-};
-
-#ifndef VIRTIO_BLK_NO_LEGACY
-struct virtio_scsi_inhdr {
-	__virtio32 errors;
-	__virtio32 data_len;
-	__virtio32 sense_len;
-	__virtio32 residual;
-};
-#endif /* !VIRTIO_BLK_NO_LEGACY */
-
-/* And this is the final byte of the write scatter-gather list. */
-#define VIRTIO_BLK_S_OK		0
-#define VIRTIO_BLK_S_IOERR	1
-#define VIRTIO_BLK_S_UNSUPP	2
-#endif /* _LINUX_VIRTIO_BLK_H */
diff --git a/openflow/usr/include/linux/virtio_config.h b/openflow/usr/include/linux/virtio_config.h
deleted file mode 100644
index a11101e..0000000
--- a/openflow/usr/include/linux/virtio_config.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef _LINUX_VIRTIO_CONFIG_H
-#define _LINUX_VIRTIO_CONFIG_H
-/* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
- * anyone can use the definitions to implement compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE. */
-
-/* Virtio devices use a standardized configuration space to define their
- * features and pass configuration information, but each implementation can
- * store and access that space differently. */
-#include <linux/types.h>
-
-/* Status byte for guest to report progress, and synchronize features. */
-/* We have seen device and processed generic fields (VIRTIO_CONFIG_F_VIRTIO) */
-#define VIRTIO_CONFIG_S_ACKNOWLEDGE	1
-/* We have found a driver for the device. */
-#define VIRTIO_CONFIG_S_DRIVER		2
-/* Driver has used its parts of the config, and is happy */
-#define VIRTIO_CONFIG_S_DRIVER_OK	4
-/* Driver has finished configuring features */
-#define VIRTIO_CONFIG_S_FEATURES_OK	8
-/* We've given up on this device. */
-#define VIRTIO_CONFIG_S_FAILED		0x80
-
-/* Some virtio feature bits (currently bits 28 through 32) are reserved for the
- * transport being used (eg. virtio_ring), the rest are per-device feature
- * bits. */
-#define VIRTIO_TRANSPORT_F_START	28
-#define VIRTIO_TRANSPORT_F_END		33
-
-#ifndef VIRTIO_CONFIG_NO_LEGACY
-/* Do we get callbacks when the ring is completely used, even if we've
- * suppressed them? */
-#define VIRTIO_F_NOTIFY_ON_EMPTY	24
-
-/* Can the device handle any descriptor layout? */
-#define VIRTIO_F_ANY_LAYOUT		27
-#endif /* VIRTIO_CONFIG_NO_LEGACY */
-
-/* v1.0 compliant. */
-#define VIRTIO_F_VERSION_1		32
-
-#endif /* _LINUX_VIRTIO_CONFIG_H */
diff --git a/openflow/usr/include/linux/virtio_console.h b/openflow/usr/include/linux/virtio_console.h
deleted file mode 100644
index b0be04f..0000000
--- a/openflow/usr/include/linux/virtio_console.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
- * anyone can use the definitions to implement compatible drivers/servers:
- *
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Copyright (C) Red Hat, Inc., 2009, 2010, 2011
- * Copyright (C) Amit Shah <amit.shah@redhat.com>, 2009, 2010, 2011
- */
-#ifndef _LINUX_VIRTIO_CONSOLE_H
-#define _LINUX_VIRTIO_CONSOLE_H
-#include <linux/types.h>
-#include <linux/virtio_types.h>
-#include <linux/virtio_ids.h>
-#include <linux/virtio_config.h>
-
-/* Feature bits */
-#define VIRTIO_CONSOLE_F_SIZE	0	/* Does host provide console size? */
-#define VIRTIO_CONSOLE_F_MULTIPORT 1	/* Does host provide multiple ports? */
-#define VIRTIO_CONSOLE_F_EMERG_WRITE 2 /* Does host support emergency write? */
-
-#define VIRTIO_CONSOLE_BAD_ID		(~(__u32)0)
-
-struct virtio_console_config {
-	/* colums of the screens */
-	__u16 cols;
-	/* rows of the screens */
-	__u16 rows;
-	/* max. number of ports this device can hold */
-	__u32 max_nr_ports;
-	/* emergency write register */
-	__u32 emerg_wr;
-} __attribute__((packed));
-
-/*
- * A message that's passed between the Host and the Guest for a
- * particular port.
- */
-struct virtio_console_control {
-	__virtio32 id;		/* Port number */
-	__virtio16 event;	/* The kind of control event (see below) */
-	__virtio16 value;	/* Extra information for the key */
-};
-
-/* Some events for control messages */
-#define VIRTIO_CONSOLE_DEVICE_READY	0
-#define VIRTIO_CONSOLE_PORT_ADD		1
-#define VIRTIO_CONSOLE_PORT_REMOVE	2
-#define VIRTIO_CONSOLE_PORT_READY	3
-#define VIRTIO_CONSOLE_CONSOLE_PORT	4
-#define VIRTIO_CONSOLE_RESIZE		5
-#define VIRTIO_CONSOLE_PORT_OPEN	6
-#define VIRTIO_CONSOLE_PORT_NAME	7
-
-
-#endif /* _LINUX_VIRTIO_CONSOLE_H */
diff --git a/openflow/usr/include/linux/virtio_gpu.h b/openflow/usr/include/linux/virtio_gpu.h
deleted file mode 100644
index 7a63faa..0000000
--- a/openflow/usr/include/linux/virtio_gpu.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Virtio GPU Device
- *
- * Copyright Red Hat, Inc. 2013-2014
- *
- * Authors:
- *     Dave Airlie <airlied@redhat.com>
- *     Gerd Hoffmann <kraxel@redhat.com>
- *
- * This header is BSD licensed so anyone can use the definitions
- * to implement compatible drivers/servers:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef VIRTIO_GPU_HW_H
-#define VIRTIO_GPU_HW_H
-
-#include <linux/types.h>
-
-#define VIRTIO_GPU_F_VIRGL 0
-
-enum virtio_gpu_ctrl_type {
-	VIRTIO_GPU_UNDEFINED = 0,
-
-	/* 2d commands */
-	VIRTIO_GPU_CMD_GET_DISPLAY_INFO = 0x0100,
-	VIRTIO_GPU_CMD_RESOURCE_CREATE_2D,
-	VIRTIO_GPU_CMD_RESOURCE_UNREF,
-	VIRTIO_GPU_CMD_SET_SCANOUT,
-	VIRTIO_GPU_CMD_RESOURCE_FLUSH,
-	VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D,
-	VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING,
-	VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING,
-	VIRTIO_GPU_CMD_GET_CAPSET_INFO,
-	VIRTIO_GPU_CMD_GET_CAPSET,
-
-	/* 3d commands */
-	VIRTIO_GPU_CMD_CTX_CREATE = 0x0200,
-	VIRTIO_GPU_CMD_CTX_DESTROY,
-	VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE,
-	VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE,
-	VIRTIO_GPU_CMD_RESOURCE_CREATE_3D,
-	VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D,
-	VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D,
-	VIRTIO_GPU_CMD_SUBMIT_3D,
-
-	/* cursor commands */
-	VIRTIO_GPU_CMD_UPDATE_CURSOR = 0x0300,
-	VIRTIO_GPU_CMD_MOVE_CURSOR,
-
-	/* success responses */
-	VIRTIO_GPU_RESP_OK_NODATA = 0x1100,
-	VIRTIO_GPU_RESP_OK_DISPLAY_INFO,
-	VIRTIO_GPU_RESP_OK_CAPSET_INFO,
-	VIRTIO_GPU_RESP_OK_CAPSET,
-
-	/* error responses */
-	VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200,
-	VIRTIO_GPU_RESP_ERR_OUT_OF_MEMORY,
-	VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID,
-	VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID,
-	VIRTIO_GPU_RESP_ERR_INVALID_CONTEXT_ID,
-	VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER,
-};
-
-#define VIRTIO_GPU_FLAG_FENCE (1 << 0)
-
-struct virtio_gpu_ctrl_hdr {
-	__le32 type;
-	__le32 flags;
-	__le64 fence_id;
-	__le32 ctx_id;
-	__le32 padding;
-};
-
-/* data passed in the cursor vq */
-
-struct virtio_gpu_cursor_pos {
-	__le32 scanout_id;
-	__le32 x;
-	__le32 y;
-	__le32 padding;
-};
-
-/* VIRTIO_GPU_CMD_UPDATE_CURSOR, VIRTIO_GPU_CMD_MOVE_CURSOR */
-struct virtio_gpu_update_cursor {
-	struct virtio_gpu_ctrl_hdr hdr;
-	struct virtio_gpu_cursor_pos pos;  /* update & move */
-	__le32 resource_id;           /* update only */
-	__le32 hot_x;                 /* update only */
-	__le32 hot_y;                 /* update only */
-	__le32 padding;
-};
-
-/* data passed in the control vq, 2d related */
-
-struct virtio_gpu_rect {
-	__le32 x;
-	__le32 y;
-	__le32 width;
-	__le32 height;
-};
-
-/* VIRTIO_GPU_CMD_RESOURCE_UNREF */
-struct virtio_gpu_resource_unref {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 resource_id;
-	__le32 padding;
-};
-
-/* VIRTIO_GPU_CMD_RESOURCE_CREATE_2D: create a 2d resource with a format */
-struct virtio_gpu_resource_create_2d {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 resource_id;
-	__le32 format;
-	__le32 width;
-	__le32 height;
-};
-
-/* VIRTIO_GPU_CMD_SET_SCANOUT */
-struct virtio_gpu_set_scanout {
-	struct virtio_gpu_ctrl_hdr hdr;
-	struct virtio_gpu_rect r;
-	__le32 scanout_id;
-	__le32 resource_id;
-};
-
-/* VIRTIO_GPU_CMD_RESOURCE_FLUSH */
-struct virtio_gpu_resource_flush {
-	struct virtio_gpu_ctrl_hdr hdr;
-	struct virtio_gpu_rect r;
-	__le32 resource_id;
-	__le32 padding;
-};
-
-/* VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D: simple transfer to_host */
-struct virtio_gpu_transfer_to_host_2d {
-	struct virtio_gpu_ctrl_hdr hdr;
-	struct virtio_gpu_rect r;
-	__le64 offset;
-	__le32 resource_id;
-	__le32 padding;
-};
-
-struct virtio_gpu_mem_entry {
-	__le64 addr;
-	__le32 length;
-	__le32 padding;
-};
-
-/* VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING */
-struct virtio_gpu_resource_attach_backing {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 resource_id;
-	__le32 nr_entries;
-};
-
-/* VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING */
-struct virtio_gpu_resource_detach_backing {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 resource_id;
-	__le32 padding;
-};
-
-/* VIRTIO_GPU_RESP_OK_DISPLAY_INFO */
-#define VIRTIO_GPU_MAX_SCANOUTS 16
-struct virtio_gpu_resp_display_info {
-	struct virtio_gpu_ctrl_hdr hdr;
-	struct virtio_gpu_display_one {
-		struct virtio_gpu_rect r;
-		__le32 enabled;
-		__le32 flags;
-	} pmodes[VIRTIO_GPU_MAX_SCANOUTS];
-};
-
-/* data passed in the control vq, 3d related */
-
-struct virtio_gpu_box {
-	__le32 x, y, z;
-	__le32 w, h, d;
-};
-
-/* VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D, VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D */
-struct virtio_gpu_transfer_host_3d {
-	struct virtio_gpu_ctrl_hdr hdr;
-	struct virtio_gpu_box box;
-	__le64 offset;
-	__le32 resource_id;
-	__le32 level;
-	__le32 stride;
-	__le32 layer_stride;
-};
-
-/* VIRTIO_GPU_CMD_RESOURCE_CREATE_3D */
-#define VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP (1 << 0)
-struct virtio_gpu_resource_create_3d {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 resource_id;
-	__le32 target;
-	__le32 format;
-	__le32 bind;
-	__le32 width;
-	__le32 height;
-	__le32 depth;
-	__le32 array_size;
-	__le32 last_level;
-	__le32 nr_samples;
-	__le32 flags;
-	__le32 padding;
-};
-
-/* VIRTIO_GPU_CMD_CTX_CREATE */
-struct virtio_gpu_ctx_create {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 nlen;
-	__le32 padding;
-	char debug_name[64];
-};
-
-/* VIRTIO_GPU_CMD_CTX_DESTROY */
-struct virtio_gpu_ctx_destroy {
-	struct virtio_gpu_ctrl_hdr hdr;
-};
-
-/* VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE, VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE */
-struct virtio_gpu_ctx_resource {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 resource_id;
-	__le32 padding;
-};
-
-/* VIRTIO_GPU_CMD_SUBMIT_3D */
-struct virtio_gpu_cmd_submit {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 size;
-	__le32 padding;
-};
-
-#define VIRTIO_GPU_CAPSET_VIRGL 1
-
-/* VIRTIO_GPU_CMD_GET_CAPSET_INFO */
-struct virtio_gpu_get_capset_info {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 capset_index;
-	__le32 padding;
-};
-
-/* VIRTIO_GPU_RESP_OK_CAPSET_INFO */
-struct virtio_gpu_resp_capset_info {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 capset_id;
-	__le32 capset_max_version;
-	__le32 capset_max_size;
-	__le32 padding;
-};
-
-/* VIRTIO_GPU_CMD_GET_CAPSET */
-struct virtio_gpu_get_capset {
-	struct virtio_gpu_ctrl_hdr hdr;
-	__le32 capset_id;
-	__le32 capset_version;
-};
-
-/* VIRTIO_GPU_RESP_OK_CAPSET */
-struct virtio_gpu_resp_capset {
-	struct virtio_gpu_ctrl_hdr hdr;
-	uint8_t capset_data[];
-};
-
-#define VIRTIO_GPU_EVENT_DISPLAY (1 << 0)
-
-struct virtio_gpu_config {
-	__u32 events_read;
-	__u32 events_clear;
-	__u32 num_scanouts;
-	__u32 num_capsets;
-};
-
-/* simple formats for fbcon/X use */
-enum virtio_gpu_formats {
-	VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM  = 1,
-	VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM  = 2,
-	VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM  = 3,
-	VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM  = 4,
-
-	VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM  = 67,
-	VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM  = 68,
-
-	VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM  = 121,
-	VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM  = 134,
-};
-
-#endif
diff --git a/openflow/usr/include/linux/virtio_ids.h b/openflow/usr/include/linux/virtio_ids.h
deleted file mode 100644
index 77925f5..0000000
--- a/openflow/usr/include/linux/virtio_ids.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef _LINUX_VIRTIO_IDS_H
-#define _LINUX_VIRTIO_IDS_H
-/*
- * Virtio IDs
- *
- * This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE. */
-
-#define VIRTIO_ID_NET		1 /* virtio net */
-#define VIRTIO_ID_BLOCK		2 /* virtio block */
-#define VIRTIO_ID_CONSOLE	3 /* virtio console */
-#define VIRTIO_ID_RNG		4 /* virtio rng */
-#define VIRTIO_ID_BALLOON	5 /* virtio balloon */
-#define VIRTIO_ID_RPMSG		7 /* virtio remote processor messaging */
-#define VIRTIO_ID_SCSI		8 /* virtio scsi */
-#define VIRTIO_ID_9P		9 /* 9p virtio console */
-#define VIRTIO_ID_RPROC_SERIAL 11 /* virtio remoteproc serial link */
-#define VIRTIO_ID_CAIF	       12 /* Virtio caif */
-#define VIRTIO_ID_GPU          16 /* virtio GPU */
-#define VIRTIO_ID_INPUT        18 /* virtio input */
-
-#endif /* _LINUX_VIRTIO_IDS_H */
diff --git a/openflow/usr/include/linux/virtio_input.h b/openflow/usr/include/linux/virtio_input.h
deleted file mode 100644
index a7fe5c8..0000000
--- a/openflow/usr/include/linux/virtio_input.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef _LINUX_VIRTIO_INPUT_H
-#define _LINUX_VIRTIO_INPUT_H
-/* This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE. */
-
-#include <linux/types.h>
-
-enum virtio_input_config_select {
-	VIRTIO_INPUT_CFG_UNSET      = 0x00,
-	VIRTIO_INPUT_CFG_ID_NAME    = 0x01,
-	VIRTIO_INPUT_CFG_ID_SERIAL  = 0x02,
-	VIRTIO_INPUT_CFG_ID_DEVIDS  = 0x03,
-	VIRTIO_INPUT_CFG_PROP_BITS  = 0x10,
-	VIRTIO_INPUT_CFG_EV_BITS    = 0x11,
-	VIRTIO_INPUT_CFG_ABS_INFO   = 0x12,
-};
-
-struct virtio_input_absinfo {
-	__u32 min;
-	__u32 max;
-	__u32 fuzz;
-	__u32 flat;
-	__u32 res;
-};
-
-struct virtio_input_devids {
-	__u16 bustype;
-	__u16 vendor;
-	__u16 product;
-	__u16 version;
-};
-
-struct virtio_input_config {
-	__u8    select;
-	__u8    subsel;
-	__u8    size;
-	__u8    reserved[5];
-	union {
-		char string[128];
-		__u8 bitmap[128];
-		struct virtio_input_absinfo abs;
-		struct virtio_input_devids ids;
-	} u;
-};
-
-struct virtio_input_event {
-	__le16 type;
-	__le16 code;
-	__le32 value;
-};
-
-#endif /* _LINUX_VIRTIO_INPUT_H */
diff --git a/openflow/usr/include/linux/virtio_net.h b/openflow/usr/include/linux/virtio_net.h
deleted file mode 100644
index ec32293..0000000
--- a/openflow/usr/include/linux/virtio_net.h
+++ /dev/null
@@ -1,245 +0,0 @@
-#ifndef _LINUX_VIRTIO_NET_H
-#define _LINUX_VIRTIO_NET_H
-/* This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE. */
-#include <linux/types.h>
-#include <linux/virtio_ids.h>
-#include <linux/virtio_config.h>
-#include <linux/virtio_types.h>
-#include <linux/if_ether.h>
-
-/* The feature bitmap for virtio net */
-#define VIRTIO_NET_F_CSUM	0	/* Host handles pkts w/ partial csum */
-#define VIRTIO_NET_F_GUEST_CSUM	1	/* Guest handles pkts w/ partial csum */
-#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS 2 /* Dynamic offload configuration. */
-#define VIRTIO_NET_F_MAC	5	/* Host has given MAC address. */
-#define VIRTIO_NET_F_GUEST_TSO4	7	/* Guest can handle TSOv4 in. */
-#define VIRTIO_NET_F_GUEST_TSO6	8	/* Guest can handle TSOv6 in. */
-#define VIRTIO_NET_F_GUEST_ECN	9	/* Guest can handle TSO[6] w/ ECN in. */
-#define VIRTIO_NET_F_GUEST_UFO	10	/* Guest can handle UFO in. */
-#define VIRTIO_NET_F_HOST_TSO4	11	/* Host can handle TSOv4 in. */
-#define VIRTIO_NET_F_HOST_TSO6	12	/* Host can handle TSOv6 in. */
-#define VIRTIO_NET_F_HOST_ECN	13	/* Host can handle TSO[6] w/ ECN in. */
-#define VIRTIO_NET_F_HOST_UFO	14	/* Host can handle UFO in. */
-#define VIRTIO_NET_F_MRG_RXBUF	15	/* Host can merge receive buffers. */
-#define VIRTIO_NET_F_STATUS	16	/* virtio_net_config.status available */
-#define VIRTIO_NET_F_CTRL_VQ	17	/* Control channel available */
-#define VIRTIO_NET_F_CTRL_RX	18	/* Control channel RX mode support */
-#define VIRTIO_NET_F_CTRL_VLAN	19	/* Control channel VLAN filtering */
-#define VIRTIO_NET_F_CTRL_RX_EXTRA 20	/* Extra RX mode control support */
-#define VIRTIO_NET_F_GUEST_ANNOUNCE 21	/* Guest can announce device on the
-					 * network */
-#define VIRTIO_NET_F_MQ	22	/* Device supports Receive Flow
-					 * Steering */
-#define VIRTIO_NET_F_CTRL_MAC_ADDR 23	/* Set MAC address */
-
-#ifndef VIRTIO_NET_NO_LEGACY
-#define VIRTIO_NET_F_GSO	6	/* Host handles pkts w/ any GSO type */
-#endif /* VIRTIO_NET_NO_LEGACY */
-
-#define VIRTIO_NET_S_LINK_UP	1	/* Link is up */
-#define VIRTIO_NET_S_ANNOUNCE	2	/* Announcement is needed */
-
-struct virtio_net_config {
-	/* The config defining mac address (if VIRTIO_NET_F_MAC) */
-	__u8 mac[ETH_ALEN];
-	/* See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above */
-	__u16 status;
-	/* Maximum number of each of transmit and receive queues;
-	 * see VIRTIO_NET_F_MQ and VIRTIO_NET_CTRL_MQ.
-	 * Legal values are between 1 and 0x8000
-	 */
-	__u16 max_virtqueue_pairs;
-} __attribute__((packed));
-
-/*
- * This header comes first in the scatter-gather list.  If you don't
- * specify GSO or CSUM features, you can simply ignore the header.
- *
- * This is bitwise-equivalent to the legacy struct virtio_net_hdr_mrg_rxbuf,
- * only flattened.
- */
-struct virtio_net_hdr_v1 {
-#define VIRTIO_NET_HDR_F_NEEDS_CSUM	1	/* Use csum_start, csum_offset */
-#define VIRTIO_NET_HDR_F_DATA_VALID	2	/* Csum is valid */
-	__u8 flags;
-#define VIRTIO_NET_HDR_GSO_NONE		0	/* Not a GSO frame */
-#define VIRTIO_NET_HDR_GSO_TCPV4	1	/* GSO frame, IPv4 TCP (TSO) */
-#define VIRTIO_NET_HDR_GSO_UDP		3	/* GSO frame, IPv4 UDP (UFO) */
-#define VIRTIO_NET_HDR_GSO_TCPV6	4	/* GSO frame, IPv6 TCP */
-#define VIRTIO_NET_HDR_GSO_ECN		0x80	/* TCP has ECN set */
-	__u8 gso_type;
-	__virtio16 hdr_len;	/* Ethernet + IP + tcp/udp hdrs */
-	__virtio16 gso_size;	/* Bytes to append to hdr_len per frame */
-	__virtio16 csum_start;	/* Position to start checksumming from */
-	__virtio16 csum_offset;	/* Offset after that to place checksum */
-	__virtio16 num_buffers;	/* Number of merged rx buffers */
-};
-
-#ifndef VIRTIO_NET_NO_LEGACY
-/* This header comes first in the scatter-gather list.
- * For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated, it must
- * be the first element of the scatter-gather list.  If you don't
- * specify GSO or CSUM features, you can simply ignore the header. */
-struct virtio_net_hdr {
-	/* See VIRTIO_NET_HDR_F_* */
-	__u8 flags;
-	/* See VIRTIO_NET_HDR_GSO_* */
-	__u8 gso_type;
-	__virtio16 hdr_len;		/* Ethernet + IP + tcp/udp hdrs */
-	__virtio16 gso_size;		/* Bytes to append to hdr_len per frame */
-	__virtio16 csum_start;	/* Position to start checksumming from */
-	__virtio16 csum_offset;	/* Offset after that to place checksum */
-};
-
-/* This is the version of the header to use when the MRG_RXBUF
- * feature has been negotiated. */
-struct virtio_net_hdr_mrg_rxbuf {
-	struct virtio_net_hdr hdr;
-	__virtio16 num_buffers;	/* Number of merged rx buffers */
-};
-#endif /* ...VIRTIO_NET_NO_LEGACY */
-
-/*
- * Control virtqueue data structures
- *
- * The control virtqueue expects a header in the first sg entry
- * and an ack/status response in the last entry.  Data for the
- * command goes in between.
- */
-struct virtio_net_ctrl_hdr {
-	__u8 class;
-	__u8 cmd;
-} __attribute__((packed));
-
-typedef __u8 virtio_net_ctrl_ack;
-
-#define VIRTIO_NET_OK     0
-#define VIRTIO_NET_ERR    1
-
-/*
- * Control the RX mode, ie. promisucous, allmulti, etc...
- * All commands require an "out" sg entry containing a 1 byte
- * state value, zero = disable, non-zero = enable.  Commands
- * 0 and 1 are supported with the VIRTIO_NET_F_CTRL_RX feature.
- * Commands 2-5 are added with VIRTIO_NET_F_CTRL_RX_EXTRA.
- */
-#define VIRTIO_NET_CTRL_RX    0
- #define VIRTIO_NET_CTRL_RX_PROMISC      0
- #define VIRTIO_NET_CTRL_RX_ALLMULTI     1
- #define VIRTIO_NET_CTRL_RX_ALLUNI       2
- #define VIRTIO_NET_CTRL_RX_NOMULTI      3
- #define VIRTIO_NET_CTRL_RX_NOUNI        4
- #define VIRTIO_NET_CTRL_RX_NOBCAST      5
-
-/*
- * Control the MAC
- *
- * The MAC filter table is managed by the hypervisor, the guest should
- * assume the size is infinite.  Filtering should be considered
- * non-perfect, ie. based on hypervisor resources, the guest may
- * received packets from sources not specified in the filter list.
- *
- * In addition to the class/cmd header, the TABLE_SET command requires
- * two out scatterlists.  Each contains a 4 byte count of entries followed
- * by a concatenated byte stream of the ETH_ALEN MAC addresses.  The
- * first sg list contains unicast addresses, the second is for multicast.
- * This functionality is present if the VIRTIO_NET_F_CTRL_RX feature
- * is available.
- *
- * The ADDR_SET command requests one out scatterlist, it contains a
- * 6 bytes MAC address. This functionality is present if the
- * VIRTIO_NET_F_CTRL_MAC_ADDR feature is available.
- */
-struct virtio_net_ctrl_mac {
-	__virtio32 entries;
-	__u8 macs[][ETH_ALEN];
-} __attribute__((packed));
-
-#define VIRTIO_NET_CTRL_MAC    1
- #define VIRTIO_NET_CTRL_MAC_TABLE_SET        0
- #define VIRTIO_NET_CTRL_MAC_ADDR_SET         1
-
-/*
- * Control VLAN filtering
- *
- * The VLAN filter table is controlled via a simple ADD/DEL interface.
- * VLAN IDs not added may be filterd by the hypervisor.  Del is the
- * opposite of add.  Both commands expect an out entry containing a 2
- * byte VLAN ID.  VLAN filterting is available with the
- * VIRTIO_NET_F_CTRL_VLAN feature bit.
- */
-#define VIRTIO_NET_CTRL_VLAN       2
- #define VIRTIO_NET_CTRL_VLAN_ADD             0
- #define VIRTIO_NET_CTRL_VLAN_DEL             1
-
-/*
- * Control link announce acknowledgement
- *
- * The command VIRTIO_NET_CTRL_ANNOUNCE_ACK is used to indicate that
- * driver has recevied the notification; device would clear the
- * VIRTIO_NET_S_ANNOUNCE bit in the status field after it receives
- * this command.
- */
-#define VIRTIO_NET_CTRL_ANNOUNCE       3
- #define VIRTIO_NET_CTRL_ANNOUNCE_ACK         0
-
-/*
- * Control Receive Flow Steering
- *
- * The command VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET
- * enables Receive Flow Steering, specifying the number of the transmit and
- * receive queues that will be used. After the command is consumed and acked by
- * the device, the device will not steer new packets on receive virtqueues
- * other than specified nor read from transmit virtqueues other than specified.
- * Accordingly, driver should not transmit new packets  on virtqueues other than
- * specified.
- */
-struct virtio_net_ctrl_mq {
-	__virtio16 virtqueue_pairs;
-};
-
-#define VIRTIO_NET_CTRL_MQ   4
- #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET        0
- #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN        1
- #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX        0x8000
-
-/*
- * Control network offloads
- *
- * Reconfigures the network offloads that Guest can handle.
- *
- * Available with the VIRTIO_NET_F_CTRL_GUEST_OFFLOADS feature bit.
- *
- * Command data format matches the feature bit mask exactly.
- *
- * See VIRTIO_NET_F_GUEST_* for the list of offloads
- * that can be enabled/disabled.
- */
-#define VIRTIO_NET_CTRL_GUEST_OFFLOADS   5
-#define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET        0
-
-#endif /* _LINUX_VIRTIO_NET_H */
diff --git a/openflow/usr/include/linux/virtio_pci.h b/openflow/usr/include/linux/virtio_pci.h
deleted file mode 100644
index 90007a1..0000000
--- a/openflow/usr/include/linux/virtio_pci.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Virtio PCI driver
- *
- * This module allows virtio devices to be used over a virtual PCI device.
- * This can be used with QEMU based VMMs like KVM or Xen.
- *
- * Copyright IBM Corp. 2007
- *
- * Authors:
- *  Anthony Liguori  <aliguori@us.ibm.com>
- *
- * This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _LINUX_VIRTIO_PCI_H
-#define _LINUX_VIRTIO_PCI_H
-
-#include <linux/types.h>
-
-#ifndef VIRTIO_PCI_NO_LEGACY
-
-/* A 32-bit r/o bitmask of the features supported by the host */
-#define VIRTIO_PCI_HOST_FEATURES	0
-
-/* A 32-bit r/w bitmask of features activated by the guest */
-#define VIRTIO_PCI_GUEST_FEATURES	4
-
-/* A 32-bit r/w PFN for the currently selected queue */
-#define VIRTIO_PCI_QUEUE_PFN		8
-
-/* A 16-bit r/o queue size for the currently selected queue */
-#define VIRTIO_PCI_QUEUE_NUM		12
-
-/* A 16-bit r/w queue selector */
-#define VIRTIO_PCI_QUEUE_SEL		14
-
-/* A 16-bit r/w queue notifier */
-#define VIRTIO_PCI_QUEUE_NOTIFY		16
-
-/* An 8-bit device status register.  */
-#define VIRTIO_PCI_STATUS		18
-
-/* An 8-bit r/o interrupt status register.  Reading the value will return the
- * current contents of the ISR and will also clear it.  This is effectively
- * a read-and-acknowledge. */
-#define VIRTIO_PCI_ISR			19
-
-/* MSI-X registers: only enabled if MSI-X is enabled. */
-/* A 16-bit vector for configuration changes. */
-#define VIRTIO_MSI_CONFIG_VECTOR        20
-/* A 16-bit vector for selected queue notifications. */
-#define VIRTIO_MSI_QUEUE_VECTOR         22
-
-/* The remaining space is defined by each driver as the per-driver
- * configuration space */
-#define VIRTIO_PCI_CONFIG_OFF(msix_enabled)	((msix_enabled) ? 24 : 20)
-/* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */
-#define VIRTIO_PCI_CONFIG(dev)	VIRTIO_PCI_CONFIG_OFF((dev)->msix_enabled)
-
-/* Virtio ABI version, this must match exactly */
-#define VIRTIO_PCI_ABI_VERSION		0
-
-/* How many bits to shift physical queue address written to QUEUE_PFN.
- * 12 is historical, and due to x86 page size. */
-#define VIRTIO_PCI_QUEUE_ADDR_SHIFT	12
-
-/* The alignment to use between consumer and producer parts of vring.
- * x86 pagesize again. */
-#define VIRTIO_PCI_VRING_ALIGN		4096
-
-#endif /* VIRTIO_PCI_NO_LEGACY */
-
-/* The bit of the ISR which indicates a device configuration change. */
-#define VIRTIO_PCI_ISR_CONFIG		0x2
-/* Vector value used to disable MSI for queue */
-#define VIRTIO_MSI_NO_VECTOR            0xffff
-
-#ifndef VIRTIO_PCI_NO_MODERN
-
-/* IDs for different capabilities.  Must all exist. */
-
-/* Common configuration */
-#define VIRTIO_PCI_CAP_COMMON_CFG	1
-/* Notifications */
-#define VIRTIO_PCI_CAP_NOTIFY_CFG	2
-/* ISR access */
-#define VIRTIO_PCI_CAP_ISR_CFG		3
-/* Device specific configuration */
-#define VIRTIO_PCI_CAP_DEVICE_CFG	4
-/* PCI configuration access */
-#define VIRTIO_PCI_CAP_PCI_CFG		5
-
-/* This is the PCI capability header: */
-struct virtio_pci_cap {
-	__u8 cap_vndr;		/* Generic PCI field: PCI_CAP_ID_VNDR */
-	__u8 cap_next;		/* Generic PCI field: next ptr. */
-	__u8 cap_len;		/* Generic PCI field: capability length */
-	__u8 cfg_type;		/* Identifies the structure. */
-	__u8 bar;		/* Where to find it. */
-	__u8 padding[3];	/* Pad to full dword. */
-	__le32 offset;		/* Offset within bar. */
-	__le32 length;		/* Length of the structure, in bytes. */
-};
-
-struct virtio_pci_notify_cap {
-	struct virtio_pci_cap cap;
-	__le32 notify_off_multiplier;	/* Multiplier for queue_notify_off. */
-};
-
-/* Fields in VIRTIO_PCI_CAP_COMMON_CFG: */
-struct virtio_pci_common_cfg {
-	/* About the whole device. */
-	__le32 device_feature_select;	/* read-write */
-	__le32 device_feature;		/* read-only */
-	__le32 guest_feature_select;	/* read-write */
-	__le32 guest_feature;		/* read-write */
-	__le16 msix_config;		/* read-write */
-	__le16 num_queues;		/* read-only */
-	__u8 device_status;		/* read-write */
-	__u8 config_generation;		/* read-only */
-
-	/* About a specific virtqueue. */
-	__le16 queue_select;		/* read-write */
-	__le16 queue_size;		/* read-write, power of 2. */
-	__le16 queue_msix_vector;	/* read-write */
-	__le16 queue_enable;		/* read-write */
-	__le16 queue_notify_off;	/* read-only */
-	__le32 queue_desc_lo;		/* read-write */
-	__le32 queue_desc_hi;		/* read-write */
-	__le32 queue_avail_lo;		/* read-write */
-	__le32 queue_avail_hi;		/* read-write */
-	__le32 queue_used_lo;		/* read-write */
-	__le32 queue_used_hi;		/* read-write */
-};
-
-/* Fields in VIRTIO_PCI_CAP_PCI_CFG: */
-struct virtio_pci_cfg_cap {
-	struct virtio_pci_cap cap;
-	__u8 pci_cfg_data[4]; /* Data for BAR access. */
-};
-
-/* Macro versions of offsets for the Old Timers! */
-#define VIRTIO_PCI_CAP_VNDR		0
-#define VIRTIO_PCI_CAP_NEXT		1
-#define VIRTIO_PCI_CAP_LEN		2
-#define VIRTIO_PCI_CAP_CFG_TYPE		3
-#define VIRTIO_PCI_CAP_BAR		4
-#define VIRTIO_PCI_CAP_OFFSET		8
-#define VIRTIO_PCI_CAP_LENGTH		12
-
-#define VIRTIO_PCI_NOTIFY_CAP_MULT	16
-
-#define VIRTIO_PCI_COMMON_DFSELECT	0
-#define VIRTIO_PCI_COMMON_DF		4
-#define VIRTIO_PCI_COMMON_GFSELECT	8
-#define VIRTIO_PCI_COMMON_GF		12
-#define VIRTIO_PCI_COMMON_MSIX		16
-#define VIRTIO_PCI_COMMON_NUMQ		18
-#define VIRTIO_PCI_COMMON_STATUS	20
-#define VIRTIO_PCI_COMMON_CFGGENERATION	21
-#define VIRTIO_PCI_COMMON_Q_SELECT	22
-#define VIRTIO_PCI_COMMON_Q_SIZE	24
-#define VIRTIO_PCI_COMMON_Q_MSIX	26
-#define VIRTIO_PCI_COMMON_Q_ENABLE	28
-#define VIRTIO_PCI_COMMON_Q_NOFF	30
-#define VIRTIO_PCI_COMMON_Q_DESCLO	32
-#define VIRTIO_PCI_COMMON_Q_DESCHI	36
-#define VIRTIO_PCI_COMMON_Q_AVAILLO	40
-#define VIRTIO_PCI_COMMON_Q_AVAILHI	44
-#define VIRTIO_PCI_COMMON_Q_USEDLO	48
-#define VIRTIO_PCI_COMMON_Q_USEDHI	52
-
-#endif /* VIRTIO_PCI_NO_MODERN */
-
-#endif
diff --git a/openflow/usr/include/linux/virtio_ring.h b/openflow/usr/include/linux/virtio_ring.h
deleted file mode 100644
index 4bdc90c..0000000
--- a/openflow/usr/include/linux/virtio_ring.h
+++ /dev/null
@@ -1,172 +0,0 @@
-#ifndef _LINUX_VIRTIO_RING_H
-#define _LINUX_VIRTIO_RING_H
-/* An interface for efficient virtio implementation, currently for use by KVM
- * and lguest, but hopefully others soon.  Do NOT change this since it will
- * break existing servers and clients.
- *
- * This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Copyright Rusty Russell IBM Corporation 2007. */
-#include <stdint.h>
-#include <linux/types.h>
-#include <linux/virtio_types.h>
-
-/* This marks a buffer as continuing via the next field. */
-#define VRING_DESC_F_NEXT	1
-/* This marks a buffer as write-only (otherwise read-only). */
-#define VRING_DESC_F_WRITE	2
-/* This means the buffer contains a list of buffer descriptors. */
-#define VRING_DESC_F_INDIRECT	4
-
-/* The Host uses this in used->flags to advise the Guest: don't kick me when
- * you add a buffer.  It's unreliable, so it's simply an optimization.  Guest
- * will still kick if it's out of buffers. */
-#define VRING_USED_F_NO_NOTIFY	1
-/* The Guest uses this in avail->flags to advise the Host: don't interrupt me
- * when you consume a buffer.  It's unreliable, so it's simply an
- * optimization.  */
-#define VRING_AVAIL_F_NO_INTERRUPT	1
-
-/* We support indirect buffer descriptors */
-#define VIRTIO_RING_F_INDIRECT_DESC	28
-
-/* The Guest publishes the used index for which it expects an interrupt
- * at the end of the avail ring. Host should ignore the avail->flags field. */
-/* The Host publishes the avail index for which it expects a kick
- * at the end of the used ring. Guest should ignore the used->flags field. */
-#define VIRTIO_RING_F_EVENT_IDX		29
-
-/* Virtio ring descriptors: 16 bytes.  These can chain together via "next". */
-struct vring_desc {
-	/* Address (guest-physical). */
-	__virtio64 addr;
-	/* Length. */
-	__virtio32 len;
-	/* The flags as indicated above. */
-	__virtio16 flags;
-	/* We chain unused descriptors via this, too */
-	__virtio16 next;
-};
-
-struct vring_avail {
-	__virtio16 flags;
-	__virtio16 idx;
-	__virtio16 ring[];
-};
-
-/* u32 is used here for ids for padding reasons. */
-struct vring_used_elem {
-	/* Index of start of used descriptor chain. */
-	__virtio32 id;
-	/* Total length of the descriptor chain which was used (written to) */
-	__virtio32 len;
-};
-
-struct vring_used {
-	__virtio16 flags;
-	__virtio16 idx;
-	struct vring_used_elem ring[];
-};
-
-struct vring {
-	unsigned int num;
-
-	struct vring_desc *desc;
-
-	struct vring_avail *avail;
-
-	struct vring_used *used;
-};
-
-/* Alignment requirements for vring elements.
- * When using pre-virtio 1.0 layout, these fall out naturally.
- */
-#define VRING_AVAIL_ALIGN_SIZE 2
-#define VRING_USED_ALIGN_SIZE 4
-#define VRING_DESC_ALIGN_SIZE 16
-
-/* The standard layout for the ring is a continuous chunk of memory which looks
- * like this.  We assume num is a power of 2.
- *
- * struct vring
- * {
- *	// The actual descriptors (16 bytes each)
- *	struct vring_desc desc[num];
- *
- *	// A ring of available descriptor heads with free-running index.
- *	__virtio16 avail_flags;
- *	__virtio16 avail_idx;
- *	__virtio16 available[num];
- *	__virtio16 used_event_idx;
- *
- *	// Padding to the next align boundary.
- *	char pad[];
- *
- *	// A ring of used descriptor heads with free-running index.
- *	__virtio16 used_flags;
- *	__virtio16 used_idx;
- *	struct vring_used_elem used[num];
- *	__virtio16 avail_event_idx;
- * };
- */
-/* We publish the used event index at the end of the available ring, and vice
- * versa. They are at the end for backwards compatibility. */
-#define vring_used_event(vr) ((vr)->avail->ring[(vr)->num])
-#define vring_avail_event(vr) (*(__virtio16 *)&(vr)->used->ring[(vr)->num])
-
-static __inline__ void vring_init(struct vring *vr, unsigned int num, void *p,
-			      unsigned long align)
-{
-	vr->num = num;
-	vr->desc = p;
-	vr->avail = p + num*sizeof(struct vring_desc);
-	vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16)
-		+ align-1) & ~(align - 1));
-}
-
-static __inline__ unsigned vring_size(unsigned int num, unsigned long align)
-{
-	return ((sizeof(struct vring_desc) * num + sizeof(__virtio16) * (3 + num)
-		 + align - 1) & ~(align - 1))
-		+ sizeof(__virtio16) * 3 + sizeof(struct vring_used_elem) * num;
-}
-
-/* The following is used with USED_EVENT_IDX and AVAIL_EVENT_IDX */
-/* Assuming a given event_idx value from the other side, if
- * we have just incremented index from old to new_idx,
- * should we trigger an event? */
-static __inline__ int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old)
-{
-	/* Note: Xen has similar logic for notification hold-off
-	 * in include/xen/interface/io/ring.h with req_event and req_prod
-	 * corresponding to event_idx + 1 and new_idx respectively.
-	 * Note also that req_event and req_prod in Xen start at 1,
-	 * event indexes in virtio start at 0. */
-	return (__u16)(new_idx - event_idx - 1) < (__u16)(new_idx - old);
-}
-
-#endif /* _LINUX_VIRTIO_RING_H */
diff --git a/openflow/usr/include/linux/virtio_rng.h b/openflow/usr/include/linux/virtio_rng.h
deleted file mode 100644
index c4d5de8..0000000
--- a/openflow/usr/include/linux/virtio_rng.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _LINUX_VIRTIO_RNG_H
-#define _LINUX_VIRTIO_RNG_H
-/* This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers. */
-#include <linux/virtio_ids.h>
-#include <linux/virtio_config.h>
-
-#endif /* _LINUX_VIRTIO_RNG_H */
diff --git a/openflow/usr/include/linux/virtio_scsi.h b/openflow/usr/include/linux/virtio_scsi.h
deleted file mode 100644
index cc18ef8..0000000
--- a/openflow/usr/include/linux/virtio_scsi.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _LINUX_VIRTIO_SCSI_H
-#define _LINUX_VIRTIO_SCSI_H
-
-#include <linux/virtio_types.h>
-
-/* Default values of the CDB and sense data size configuration fields */
-#define VIRTIO_SCSI_CDB_DEFAULT_SIZE   32
-#define VIRTIO_SCSI_SENSE_DEFAULT_SIZE 96
-
-#ifndef VIRTIO_SCSI_CDB_SIZE
-#define VIRTIO_SCSI_CDB_SIZE VIRTIO_SCSI_CDB_DEFAULT_SIZE
-#endif
-#ifndef VIRTIO_SCSI_SENSE_SIZE
-#define VIRTIO_SCSI_SENSE_SIZE VIRTIO_SCSI_SENSE_DEFAULT_SIZE
-#endif
-
-/* SCSI command request, followed by data-out */
-struct virtio_scsi_cmd_req {
-	__u8 lun[8];		/* Logical Unit Number */
-	__virtio64 tag;		/* Command identifier */
-	__u8 task_attr;		/* Task attribute */
-	__u8 prio;		/* SAM command priority field */
-	__u8 crn;
-	__u8 cdb[VIRTIO_SCSI_CDB_SIZE];
-} __attribute__((packed));
-
-/* SCSI command request, followed by protection information */
-struct virtio_scsi_cmd_req_pi {
-	__u8 lun[8];		/* Logical Unit Number */
-	__virtio64 tag;		/* Command identifier */
-	__u8 task_attr;		/* Task attribute */
-	__u8 prio;		/* SAM command priority field */
-	__u8 crn;
-	__virtio32 pi_bytesout;	/* DataOUT PI Number of bytes */
-	__virtio32 pi_bytesin;		/* DataIN PI Number of bytes */
-	__u8 cdb[VIRTIO_SCSI_CDB_SIZE];
-} __attribute__((packed));
-
-/* Response, followed by sense data and data-in */
-struct virtio_scsi_cmd_resp {
-	__virtio32 sense_len;		/* Sense data length */
-	__virtio32 resid;		/* Residual bytes in data buffer */
-	__virtio16 status_qualifier;	/* Status qualifier */
-	__u8 status;		/* Command completion status */
-	__u8 response;		/* Response values */
-	__u8 sense[VIRTIO_SCSI_SENSE_SIZE];
-} __attribute__((packed));
-
-/* Task Management Request */
-struct virtio_scsi_ctrl_tmf_req {
-	__virtio32 type;
-	__virtio32 subtype;
-	__u8 lun[8];
-	__virtio64 tag;
-} __attribute__((packed));
-
-struct virtio_scsi_ctrl_tmf_resp {
-	__u8 response;
-} __attribute__((packed));
-
-/* Asynchronous notification query/subscription */
-struct virtio_scsi_ctrl_an_req {
-	__virtio32 type;
-	__u8 lun[8];
-	__virtio32 event_requested;
-} __attribute__((packed));
-
-struct virtio_scsi_ctrl_an_resp {
-	__virtio32 event_actual;
-	__u8 response;
-} __attribute__((packed));
-
-struct virtio_scsi_event {
-	__virtio32 event;
-	__u8 lun[8];
-	__virtio32 reason;
-} __attribute__((packed));
-
-struct virtio_scsi_config {
-	__u32 num_queues;
-	__u32 seg_max;
-	__u32 max_sectors;
-	__u32 cmd_per_lun;
-	__u32 event_info_size;
-	__u32 sense_size;
-	__u32 cdb_size;
-	__u16 max_channel;
-	__u16 max_target;
-	__u32 max_lun;
-} __attribute__((packed));
-
-/* Feature Bits */
-#define VIRTIO_SCSI_F_INOUT                    0
-#define VIRTIO_SCSI_F_HOTPLUG                  1
-#define VIRTIO_SCSI_F_CHANGE                   2
-#define VIRTIO_SCSI_F_T10_PI                   3
-
-/* Response codes */
-#define VIRTIO_SCSI_S_OK                       0
-#define VIRTIO_SCSI_S_OVERRUN                  1
-#define VIRTIO_SCSI_S_ABORTED                  2
-#define VIRTIO_SCSI_S_BAD_TARGET               3
-#define VIRTIO_SCSI_S_RESET                    4
-#define VIRTIO_SCSI_S_BUSY                     5
-#define VIRTIO_SCSI_S_TRANSPORT_FAILURE        6
-#define VIRTIO_SCSI_S_TARGET_FAILURE           7
-#define VIRTIO_SCSI_S_NEXUS_FAILURE            8
-#define VIRTIO_SCSI_S_FAILURE                  9
-#define VIRTIO_SCSI_S_FUNCTION_SUCCEEDED       10
-#define VIRTIO_SCSI_S_FUNCTION_REJECTED        11
-#define VIRTIO_SCSI_S_INCORRECT_LUN            12
-
-/* Controlq type codes.  */
-#define VIRTIO_SCSI_T_TMF                      0
-#define VIRTIO_SCSI_T_AN_QUERY                 1
-#define VIRTIO_SCSI_T_AN_SUBSCRIBE             2
-
-/* Valid TMF subtypes.  */
-#define VIRTIO_SCSI_T_TMF_ABORT_TASK           0
-#define VIRTIO_SCSI_T_TMF_ABORT_TASK_SET       1
-#define VIRTIO_SCSI_T_TMF_CLEAR_ACA            2
-#define VIRTIO_SCSI_T_TMF_CLEAR_TASK_SET       3
-#define VIRTIO_SCSI_T_TMF_I_T_NEXUS_RESET      4
-#define VIRTIO_SCSI_T_TMF_LOGICAL_UNIT_RESET   5
-#define VIRTIO_SCSI_T_TMF_QUERY_TASK           6
-#define VIRTIO_SCSI_T_TMF_QUERY_TASK_SET       7
-
-/* Events.  */
-#define VIRTIO_SCSI_T_EVENTS_MISSED            0x80000000
-#define VIRTIO_SCSI_T_NO_EVENT                 0
-#define VIRTIO_SCSI_T_TRANSPORT_RESET          1
-#define VIRTIO_SCSI_T_ASYNC_NOTIFY             2
-#define VIRTIO_SCSI_T_PARAM_CHANGE             3
-
-/* Reasons of transport reset event */
-#define VIRTIO_SCSI_EVT_RESET_HARD             0
-#define VIRTIO_SCSI_EVT_RESET_RESCAN           1
-#define VIRTIO_SCSI_EVT_RESET_REMOVED          2
-
-#define VIRTIO_SCSI_S_SIMPLE                   0
-#define VIRTIO_SCSI_S_ORDERED                  1
-#define VIRTIO_SCSI_S_HEAD                     2
-#define VIRTIO_SCSI_S_ACA                      3
-
-
-#endif /* _LINUX_VIRTIO_SCSI_H */
diff --git a/openflow/usr/include/linux/virtio_types.h b/openflow/usr/include/linux/virtio_types.h
deleted file mode 100644
index 6162bdf..0000000
--- a/openflow/usr/include/linux/virtio_types.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _LINUX_VIRTIO_TYPES_H
-#define _LINUX_VIRTIO_TYPES_H
-/* Type definitions for virtio implementations.
- *
- * This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of IBM nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Copyright (C) 2014 Red Hat, Inc.
- * Author: Michael S. Tsirkin <mst@redhat.com>
- */
-#include <linux/types.h>
-
-/*
- * __virtio{16,32,64} have the following meaning:
- * - __u{16,32,64} for virtio devices in legacy mode, accessed in native endian
- * - __le{16,32,64} for standard-compliant virtio devices
- */
-
-typedef __u16 __bitwise__ __virtio16;
-typedef __u32 __bitwise__ __virtio32;
-typedef __u64 __bitwise__ __virtio64;
-
-#endif /* _LINUX_VIRTIO_TYPES_H */
diff --git a/openflow/usr/include/linux/vm_sockets.h b/openflow/usr/include/linux/vm_sockets.h
deleted file mode 100644
index 5216014..0000000
--- a/openflow/usr/include/linux/vm_sockets.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * VMware vSockets Driver
- *
- * Copyright (C) 2007-2013 VMware, Inc. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation version 2 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-
-#ifndef _VM_SOCKETS_H
-#define _VM_SOCKETS_H
-
-#include <linux/socket.h>
-
-/* Option name for STREAM socket buffer size.  Use as the option name in
- * setsockopt(3) or getsockopt(3) to set or get an unsigned long long that
- * specifies the size of the buffer underlying a vSockets STREAM socket.
- * Value is clamped to the MIN and MAX.
- */
-
-#define SO_VM_SOCKETS_BUFFER_SIZE 0
-
-/* Option name for STREAM socket minimum buffer size.  Use as the option name
- * in setsockopt(3) or getsockopt(3) to set or get an unsigned long long that
- * specifies the minimum size allowed for the buffer underlying a vSockets
- * STREAM socket.
- */
-
-#define SO_VM_SOCKETS_BUFFER_MIN_SIZE 1
-
-/* Option name for STREAM socket maximum buffer size.  Use as the option name
- * in setsockopt(3) or getsockopt(3) to set or get an unsigned long long
- * that specifies the maximum size allowed for the buffer underlying a
- * vSockets STREAM socket.
- */
-
-#define SO_VM_SOCKETS_BUFFER_MAX_SIZE 2
-
-/* Option name for socket peer's host-specific VM ID.  Use as the option name
- * in getsockopt(3) to get a host-specific identifier for the peer endpoint's
- * VM.  The identifier is a signed integer.
- * Only available for hypervisor endpoints.
- */
-
-#define SO_VM_SOCKETS_PEER_HOST_VM_ID 3
-
-/* Option name for determining if a socket is trusted.  Use as the option name
- * in getsockopt(3) to determine if a socket is trusted.  The value is a
- * signed integer.
- */
-
-#define SO_VM_SOCKETS_TRUSTED 5
-
-/* Option name for STREAM socket connection timeout.  Use as the option name
- * in setsockopt(3) or getsockopt(3) to set or get the connection
- * timeout for a STREAM socket.
- */
-
-#define SO_VM_SOCKETS_CONNECT_TIMEOUT 6
-
-/* Option name for using non-blocking send/receive.  Use as the option name
- * for setsockopt(3) or getsockopt(3) to set or get the non-blocking
- * transmit/receive flag for a STREAM socket.  This flag determines whether
- * send() and recv() can be called in non-blocking contexts for the given
- * socket.  The value is a signed integer.
- *
- * This option is only relevant to kernel endpoints, where descheduling the
- * thread of execution is not allowed, for example, while holding a spinlock.
- * It is not to be confused with conventional non-blocking socket operations.
- *
- * Only available for hypervisor endpoints.
- */
-
-#define SO_VM_SOCKETS_NONBLOCK_TXRX 7
-
-/* The vSocket equivalent of INADDR_ANY.  This works for the svm_cid field of
- * sockaddr_vm and indicates the context ID of the current endpoint.
- */
-
-#define VMADDR_CID_ANY -1U
-
-/* Bind to any available port.  Works for the svm_port field of
- * sockaddr_vm.
- */
-
-#define VMADDR_PORT_ANY -1U
-
-/* Use this as the destination CID in an address when referring to the
- * hypervisor.  VMCI relies on it being 0, but this would be useful for other
- * transports too.
- */
-
-#define VMADDR_CID_HYPERVISOR 0
-
-/* This CID is specific to VMCI and can be considered reserved (even VMCI
- * doesn't use it anymore, it's a legacy value from an older release).
- */
-
-#define VMADDR_CID_RESERVED 1
-
-/* Use this as the destination CID in an address when referring to the host
- * (any process other than the hypervisor).  VMCI relies on it being 2, but
- * this would be useful for other transports too.
- */
-
-#define VMADDR_CID_HOST 2
-
-/* Invalid vSockets version. */
-
-#define VM_SOCKETS_INVALID_VERSION -1U
-
-/* The epoch (first) component of the vSockets version.  A single byte
- * representing the epoch component of the vSockets version.
- */
-
-#define VM_SOCKETS_VERSION_EPOCH(_v) (((_v) & 0xFF000000) >> 24)
-
-/* The major (second) component of the vSockets version.   A single byte
- * representing the major component of the vSockets version.  Typically
- * changes for every major release of a product.
- */
-
-#define VM_SOCKETS_VERSION_MAJOR(_v) (((_v) & 0x00FF0000) >> 16)
-
-/* The minor (third) component of the vSockets version.  Two bytes representing
- * the minor component of the vSockets version.
- */
-
-#define VM_SOCKETS_VERSION_MINOR(_v) (((_v) & 0x0000FFFF))
-
-/* Address structure for vSockets.   The address family should be set to
- * AF_VSOCK.  The structure members should all align on their natural
- * boundaries without resorting to compiler packing directives.  The total size
- * of this structure should be exactly the same as that of struct sockaddr.
- */
-
-struct sockaddr_vm {
-	__kernel_sa_family_t svm_family;
-	unsigned short svm_reserved1;
-	unsigned int svm_port;
-	unsigned int svm_cid;
-	unsigned char svm_zero[sizeof(struct sockaddr) -
-			       sizeof(sa_family_t) -
-			       sizeof(unsigned short) -
-			       sizeof(unsigned int) - sizeof(unsigned int)];
-};
-
-#define IOCTL_VM_SOCKETS_GET_LOCAL_CID		_IO(7, 0xb9)
-
-#endif /* _VM_SOCKETS_H */
diff --git a/openflow/usr/include/linux/vt.h b/openflow/usr/include/linux/vt.h
deleted file mode 100644
index 7ffa11f..0000000
--- a/openflow/usr/include/linux/vt.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef _LINUX_VT_H
-#define _LINUX_VT_H
-
-
-/*
- * These constants are also useful for user-level apps (e.g., VC
- * resizing).
- */
-#define MIN_NR_CONSOLES 1       /* must be at least 1 */
-#define MAX_NR_CONSOLES	63	/* serial lines start at 64 */
-#define MAX_NR_USER_CONSOLES 63	/* must be root to allocate above this */
-		/* Note: the ioctl VT_GETSTATE does not work for
-		   consoles 16 and higher (since it returns a short) */
-
-/* 0x56 is 'V', to avoid collision with termios and kd */
-
-#define VT_OPENQRY	0x5600	/* find available vt */
-
-struct vt_mode {
-	char mode;		/* vt mode */
-	char waitv;		/* if set, hang on writes if not active */
-	short relsig;		/* signal to raise on release req */
-	short acqsig;		/* signal to raise on acquisition */
-	short frsig;		/* unused (set to 0) */
-};
-#define VT_GETMODE	0x5601	/* get mode of active vt */
-#define VT_SETMODE	0x5602	/* set mode of active vt */
-#define		VT_AUTO		0x00	/* auto vt switching */
-#define		VT_PROCESS	0x01	/* process controls switching */
-#define		VT_ACKACQ	0x02	/* acknowledge switch */
-
-struct vt_stat {
-	unsigned short v_active;	/* active vt */
-	unsigned short v_signal;	/* signal to send */
-	unsigned short v_state;		/* vt bitmask */
-};
-#define VT_GETSTATE	0x5603	/* get global vt state info */
-#define VT_SENDSIG	0x5604	/* signal to send to bitmask of vts */
-
-#define VT_RELDISP	0x5605	/* release display */
-
-#define VT_ACTIVATE	0x5606	/* make vt active */
-#define VT_WAITACTIVE	0x5607	/* wait for vt active */
-#define VT_DISALLOCATE	0x5608  /* free memory associated to vt */
-
-struct vt_sizes {
-	unsigned short v_rows;		/* number of rows */
-	unsigned short v_cols;		/* number of columns */
-	unsigned short v_scrollsize;	/* number of lines of scrollback */
-};
-#define VT_RESIZE	0x5609	/* set kernel's idea of screensize */
-
-struct vt_consize {
-	unsigned short v_rows;	/* number of rows */
-	unsigned short v_cols;	/* number of columns */
-	unsigned short v_vlin;	/* number of pixel rows on screen */
-	unsigned short v_clin;	/* number of pixel rows per character */
-	unsigned short v_vcol;	/* number of pixel columns on screen */
-	unsigned short v_ccol;	/* number of pixel columns per character */
-};
-#define VT_RESIZEX      0x560A  /* set kernel's idea of screensize + more */
-#define VT_LOCKSWITCH   0x560B  /* disallow vt switching */
-#define VT_UNLOCKSWITCH 0x560C  /* allow vt switching */
-#define VT_GETHIFONTMASK 0x560D  /* return hi font mask */
-
-struct vt_event {
-	unsigned int event;
-#define VT_EVENT_SWITCH		0x0001	/* Console switch */
-#define VT_EVENT_BLANK		0x0002	/* Screen blank */
-#define VT_EVENT_UNBLANK	0x0004	/* Screen unblank */
-#define VT_EVENT_RESIZE		0x0008	/* Resize display */
-#define VT_MAX_EVENT		0x000F
-	unsigned int oldev;		/* Old console */
-	unsigned int newev;		/* New console (if changing) */
-	unsigned int pad[4];		/* Padding for expansion */
-};
-
-#define VT_WAITEVENT	0x560E	/* Wait for an event */
-
-struct vt_setactivate {
-	unsigned int console;
-	struct vt_mode mode;
-};
-
-#define VT_SETACTIVATE	0x560F	/* Activate and set the mode of a console */
-
-#endif /* _LINUX_VT_H */
diff --git a/openflow/usr/include/linux/wait.h b/openflow/usr/include/linux/wait.h
deleted file mode 100644
index bb88233..0000000
--- a/openflow/usr/include/linux/wait.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _LINUX_WAIT_H
-#define _LINUX_WAIT_H
-
-#define WNOHANG		0x00000001
-#define WUNTRACED	0x00000002
-#define WSTOPPED	WUNTRACED
-#define WEXITED		0x00000004
-#define WCONTINUED	0x00000008
-#define WNOWAIT		0x01000000	/* Don't reap, just poll status.  */
-
-#define __WNOTHREAD	0x20000000	/* Don't wait on children of other threads in this group */
-#define __WALL		0x40000000	/* Wait on all children, regardless of type */
-#define __WCLONE	0x80000000	/* Wait only on non-SIGCHLD children */
-
-/* First argument to waitid: */
-#define P_ALL		0
-#define P_PID		1
-#define P_PGID		2
-
-
-#endif /* _LINUX_WAIT_H */
diff --git a/openflow/usr/include/linux/wanrouter.h b/openflow/usr/include/linux/wanrouter.h
deleted file mode 100644
index cc61950..0000000
--- a/openflow/usr/include/linux/wanrouter.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * wanrouter.h	Legacy declarations kept around until X25 is removed
- */
-
-#ifndef _ROUTER_H
-#define _ROUTER_H
-
-/* 'state' defines */
-enum wan_states
-{
-	WAN_UNCONFIGURED,	/* link/channel is not configured */
-	WAN_DISCONNECTED,	/* link/channel is disconnected */
-	WAN_CONNECTING,		/* connection is in progress */
-	WAN_CONNECTED		/* link/channel is operational */
-};
-
-#endif /* _ROUTER_H */
diff --git a/openflow/usr/include/linux/watchdog.h b/openflow/usr/include/linux/watchdog.h
deleted file mode 100644
index a89ed11..0000000
--- a/openflow/usr/include/linux/watchdog.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *	Generic watchdog defines. Derived from..
- *
- * Berkshire PC Watchdog Defines
- * by Ken Hollis <khollis@bitgate.com>
- *
- */
-
-#ifndef _LINUX_WATCHDOG_H
-#define _LINUX_WATCHDOG_H
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-#define	WATCHDOG_IOCTL_BASE	'W'
-
-struct watchdog_info {
-	__u32 options;		/* Options the card/driver supports */
-	__u32 firmware_version;	/* Firmware version of the card */
-	__u8  identity[32];	/* Identity of the board */
-};
-
-#define	WDIOC_GETSUPPORT	_IOR(WATCHDOG_IOCTL_BASE, 0, struct watchdog_info)
-#define	WDIOC_GETSTATUS		_IOR(WATCHDOG_IOCTL_BASE, 1, int)
-#define	WDIOC_GETBOOTSTATUS	_IOR(WATCHDOG_IOCTL_BASE, 2, int)
-#define	WDIOC_GETTEMP		_IOR(WATCHDOG_IOCTL_BASE, 3, int)
-#define	WDIOC_SETOPTIONS	_IOR(WATCHDOG_IOCTL_BASE, 4, int)
-#define	WDIOC_KEEPALIVE		_IOR(WATCHDOG_IOCTL_BASE, 5, int)
-#define	WDIOC_SETTIMEOUT        _IOWR(WATCHDOG_IOCTL_BASE, 6, int)
-#define	WDIOC_GETTIMEOUT        _IOR(WATCHDOG_IOCTL_BASE, 7, int)
-#define	WDIOC_SETPRETIMEOUT	_IOWR(WATCHDOG_IOCTL_BASE, 8, int)
-#define	WDIOC_GETPRETIMEOUT	_IOR(WATCHDOG_IOCTL_BASE, 9, int)
-#define	WDIOC_GETTIMELEFT	_IOR(WATCHDOG_IOCTL_BASE, 10, int)
-
-#define	WDIOF_UNKNOWN		-1	/* Unknown flag error */
-#define	WDIOS_UNKNOWN		-1	/* Unknown status error */
-
-#define	WDIOF_OVERHEAT		0x0001	/* Reset due to CPU overheat */
-#define	WDIOF_FANFAULT		0x0002	/* Fan failed */
-#define	WDIOF_EXTERN1		0x0004	/* External relay 1 */
-#define	WDIOF_EXTERN2		0x0008	/* External relay 2 */
-#define	WDIOF_POWERUNDER	0x0010	/* Power bad/power fault */
-#define	WDIOF_CARDRESET		0x0020	/* Card previously reset the CPU */
-#define	WDIOF_POWEROVER		0x0040	/* Power over voltage */
-#define	WDIOF_SETTIMEOUT	0x0080  /* Set timeout (in seconds) */
-#define	WDIOF_MAGICCLOSE	0x0100	/* Supports magic close char */
-#define	WDIOF_PRETIMEOUT	0x0200  /* Pretimeout (in seconds), get/set */
-#define	WDIOF_ALARMONLY		0x0400	/* Watchdog triggers a management or
-					   other external alarm not a reboot */
-#define	WDIOF_KEEPALIVEPING	0x8000	/* Keep alive ping reply */
-
-#define	WDIOS_DISABLECARD	0x0001	/* Turn off the watchdog timer */
-#define	WDIOS_ENABLECARD	0x0002	/* Turn on the watchdog timer */
-#define	WDIOS_TEMPPANIC		0x0004	/* Kernel panic on temperature trip */
-
-
-#endif /* _LINUX_WATCHDOG_H */
diff --git a/openflow/usr/include/linux/wimax.h b/openflow/usr/include/linux/wimax.h
deleted file mode 100644
index 9f6b77a..0000000
--- a/openflow/usr/include/linux/wimax.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Linux WiMax
- * API for user space
- *
- *
- * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Intel Corporation nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- * Intel Corporation <linux-wimax@intel.com>
- * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
- *  - Initial implementation
- *
- *
- * This file declares the user/kernel protocol that is spoken over
- * Generic Netlink, as well as any type declaration that is to be used
- * by kernel and user space.
- *
- * It is intended for user space to clone it verbatim to use it as a
- * primary reference for definitions.
- *
- * Stuff intended for kernel usage as well as full protocol and stack
- * documentation is rooted in include/net/wimax.h.
- */
-
-#ifndef __LINUX__WIMAX_H__
-#define __LINUX__WIMAX_H__
-
-#include <linux/types.h>
-
-enum {
-	/**
-	 * Version of the interface (unsigned decimal, MMm, max 25.5)
-	 * M - Major: change if removing or modifying an existing call.
-	 * m - minor: change when adding a new call
-	 */
-	WIMAX_GNL_VERSION = 01,
-	/* Generic NetLink attributes */
-	WIMAX_GNL_ATTR_INVALID = 0x00,
-	WIMAX_GNL_ATTR_MAX = 10,
-};
-
-
-/*
- * Generic NetLink operations
- *
- * Most of these map to an API call; _OP_ stands for operation, _RP_
- * for reply and _RE_ for report (aka: signal).
- */
-enum {
-	WIMAX_GNL_OP_MSG_FROM_USER,	/* User to kernel message */
-	WIMAX_GNL_OP_MSG_TO_USER,	/* Kernel to user message */
-	WIMAX_GNL_OP_RFKILL,	/* Run wimax_rfkill() */
-	WIMAX_GNL_OP_RESET,	/* Run wimax_rfkill() */
-	WIMAX_GNL_RE_STATE_CHANGE,	/* Report: status change */
-	WIMAX_GNL_OP_STATE_GET,		/* Request for current state */
-};
-
-
-/* Message from user / to user */
-enum {
-	WIMAX_GNL_MSG_IFIDX = 1,
-	WIMAX_GNL_MSG_PIPE_NAME,
-	WIMAX_GNL_MSG_DATA,
-};
-
-
-/*
- * wimax_rfkill()
- *
- * The state of the radio (ON/OFF) is mapped to the rfkill subsystem's
- * switch state (DISABLED/ENABLED).
- */
-enum wimax_rf_state {
-	WIMAX_RF_OFF = 0,	/* Radio is off, rfkill on/enabled */
-	WIMAX_RF_ON = 1,	/* Radio is on, rfkill off/disabled */
-	WIMAX_RF_QUERY = 2,
-};
-
-/* Attributes */
-enum {
-	WIMAX_GNL_RFKILL_IFIDX = 1,
-	WIMAX_GNL_RFKILL_STATE,
-};
-
-
-/* Attributes for wimax_reset() */
-enum {
-	WIMAX_GNL_RESET_IFIDX = 1,
-};
-
-/* Attributes for wimax_state_get() */
-enum {
-	WIMAX_GNL_STGET_IFIDX = 1,
-};
-
-/*
- * Attributes for the Report State Change
- *
- * For now we just have the old and new states; new attributes might
- * be added later on.
- */
-enum {
-	WIMAX_GNL_STCH_IFIDX = 1,
-	WIMAX_GNL_STCH_STATE_OLD,
-	WIMAX_GNL_STCH_STATE_NEW,
-};
-
-
-/**
- * enum wimax_st - The different states of a WiMAX device
- * @__WIMAX_ST_NULL: The device structure has been allocated and zeroed,
- *     but still wimax_dev_add() hasn't been called. There is no state.
- *
- * @WIMAX_ST_DOWN: The device has been registered with the WiMAX and
- *     networking stacks, but it is not initialized (normally that is
- *     done with 'ifconfig DEV up' [or equivalent], which can upload
- *     firmware and enable communications with the device).
- *     In this state, the device is powered down and using as less
- *     power as possible.
- *     This state is the default after a call to wimax_dev_add(). It
- *     is ok to have drivers move directly to %WIMAX_ST_UNINITIALIZED
- *     or %WIMAX_ST_RADIO_OFF in _probe() after the call to
- *     wimax_dev_add().
- *     It is recommended that the driver leaves this state when
- *     calling 'ifconfig DEV up' and enters it back on 'ifconfig DEV
- *     down'.
- *
- * @__WIMAX_ST_QUIESCING: The device is being torn down, so no API
- *     operations are allowed to proceed except the ones needed to
- *     complete the device clean up process.
- *
- * @WIMAX_ST_UNINITIALIZED: [optional] Communication with the device
- *     is setup, but the device still requires some configuration
- *     before being operational.
- *     Some WiMAX API calls might work.
- *
- * @WIMAX_ST_RADIO_OFF: The device is fully up; radio is off (wether
- *     by hardware or software switches).
- *     It is recommended to always leave the device in this state
- *     after initialization.
- *
- * @WIMAX_ST_READY: The device is fully up and radio is on.
- *
- * @WIMAX_ST_SCANNING: [optional] The device has been instructed to
- *     scan. In this state, the device cannot be actively connected to
- *     a network.
- *
- * @WIMAX_ST_CONNECTING: The device is connecting to a network. This
- *     state exists because in some devices, the connect process can
- *     include a number of negotiations between user space, kernel
- *     space and the device. User space needs to know what the device
- *     is doing. If the connect sequence in a device is atomic and
- *     fast, the device can transition directly to CONNECTED
- *
- * @WIMAX_ST_CONNECTED: The device is connected to a network.
- *
- * @__WIMAX_ST_INVALID: This is an invalid state used to mark the
- *     maximum numeric value of states.
- *
- * Description:
- *
- * Transitions from one state to another one are atomic and can only
- * be caused in kernel space with wimax_state_change(). To read the
- * state, use wimax_state_get().
- *
- * States starting with __ are internal and shall not be used or
- * referred to by drivers or userspace. They look ugly, but that's the
- * point -- if any use is made non-internal to the stack, it is easier
- * to catch on review.
- *
- * All API operations [with well defined exceptions] will take the
- * device mutex before starting and then check the state. If the state
- * is %__WIMAX_ST_NULL, %WIMAX_ST_DOWN, %WIMAX_ST_UNINITIALIZED or
- * %__WIMAX_ST_QUIESCING, it will drop the lock and quit with
- * -%EINVAL, -%ENOMEDIUM, -%ENOTCONN or -%ESHUTDOWN.
- *
- * The order of the definitions is important, so we can do numerical
- * comparisons (eg: < %WIMAX_ST_RADIO_OFF means the device is not ready
- * to operate).
- */
-/*
- * The allowed state transitions are described in the table below
- * (states in rows can go to states in columns where there is an X):
- *
- *                                  UNINI   RADIO READY SCAN CONNEC CONNEC
- *             NULL DOWN QUIESCING TIALIZED  OFF        NING  TING   TED
- * NULL         -    x
- * DOWN              -      x        x       x
- * QUIESCING         x      -
- * UNINITIALIZED            x        -       x
- * RADIO_OFF                x                -     x
- * READY                    x                x     -     x     x      x
- * SCANNING                 x                x     x     -     x      x
- * CONNECTING               x                x     x     x     -      x
- * CONNECTED                x                x     x                  -
- *
- * This table not available in kernel-doc because the formatting messes it up.
- */
- enum wimax_st {
-	__WIMAX_ST_NULL = 0,
-	WIMAX_ST_DOWN,
-	__WIMAX_ST_QUIESCING,
-	WIMAX_ST_UNINITIALIZED,
-	WIMAX_ST_RADIO_OFF,
-	WIMAX_ST_READY,
-	WIMAX_ST_SCANNING,
-	WIMAX_ST_CONNECTING,
-	WIMAX_ST_CONNECTED,
-	__WIMAX_ST_INVALID			/* Always keep last */
-};
-
-
-#endif /* #ifndef __LINUX__WIMAX_H__ */
diff --git a/openflow/usr/include/linux/wimax/i2400m.h b/openflow/usr/include/linux/wimax/i2400m.h
deleted file mode 100644
index fd198bc..0000000
--- a/openflow/usr/include/linux/wimax/i2400m.h
+++ /dev/null
@@ -1,572 +0,0 @@
-/*
- * Intel Wireless WiMax Connection 2400m
- * Host-Device protocol interface definitions
- *
- *
- * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Intel Corporation nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- * Intel Corporation <linux-wimax@intel.com>
- * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
- *  - Initial implementation
- *
- *
- * This header defines the data structures and constants used to
- * communicate with the device.
- *
- * BOOTMODE/BOOTROM/FIRMWARE UPLOAD PROTOCOL
- *
- * The firmware upload protocol is quite simple and only requires a
- * handful of commands. See drivers/net/wimax/i2400m/fw.c for more
- * details.
- *
- * The BCF data structure is for the firmware file header.
- *
- *
- * THE DATA / CONTROL PROTOCOL
- *
- * This is the normal protocol spoken with the device once the
- * firmware is uploaded. It transports data payloads and control
- * messages back and forth.
- *
- * It consists 'messages' that pack one or more payloads each. The
- * format is described in detail in drivers/net/wimax/i2400m/rx.c and
- * tx.c.
- *
- *
- * THE L3L4 PROTOCOL
- *
- * The term L3L4 refers to Layer 3 (the device), Layer 4 (the
- * driver/host software).
- *
- * This is the control protocol used by the host to control the i2400m
- * device (scan, connect, disconnect...). This is sent to / received
- * as control frames. These frames consist of a header and zero or
- * more TLVs with information. We call each control frame a "message".
- *
- * Each message is composed of:
- *
- * HEADER
- * [TLV0 + PAYLOAD0]
- * [TLV1 + PAYLOAD1]
- * [...]
- * [TLVN + PAYLOADN]
- *
- * The HEADER is defined by 'struct i2400m_l3l4_hdr'. The payloads are
- * defined by a TLV structure (Type Length Value) which is a 'header'
- * (struct i2400m_tlv_hdr) and then the payload.
- *
- * All integers are represented as Little Endian.
- *
- * - REQUESTS AND EVENTS
- *
- * The requests can be clasified as follows:
- *
- *   COMMAND:  implies a request from the host to the device requesting
- *             an action being performed. The device will reply with a
- *             message (with the same type as the command), status and
- *             no (TLV) payload. Execution of a command might cause
- *             events (of different type) to be sent later on as
- *             device's state changes.
- *
- *   GET/SET:  similar to COMMAND, but will not cause other
- *             EVENTs. The reply, in the case of GET, will contain
- *             TLVs with the requested information.
- *
- *   EVENT:    asynchronous messages sent from the device, maybe as a
- *             consequence of previous COMMANDs but disassociated from
- *             them.
- *
- * Only one request might be pending at the same time (ie: don't
- * parallelize nor post another GET request before the previous
- * COMMAND has been acknowledged with it's corresponding reply by the
- * device).
- *
- * The different requests and their formats are described below:
- *
- *  I2400M_MT_*   Message types
- *  I2400M_MS_*   Message status (for replies, events)
- *  i2400m_tlv_*  TLVs
- *
- * data types are named 'struct i2400m_msg_OPNAME', OPNAME matching the
- * operation.
- */
-
-#ifndef __LINUX__WIMAX__I2400M_H__
-#define __LINUX__WIMAX__I2400M_H__
-
-#include <linux/types.h>
-#include <linux/if_ether.h>
-
-/*
- * Host Device Interface (HDI) common to all busses
- */
-
-/* Boot-mode (firmware upload mode) commands */
-
-/* Header for the firmware file */
-struct i2400m_bcf_hdr {
-	__le32 module_type;
-	__le32 header_len;
-	__le32 header_version;
-	__le32 module_id;
-	__le32 module_vendor;
-	__le32 date;		/* BCD YYYMMDD */
-	__le32 size;            /* in dwords */
-	__le32 key_size;	/* in dwords */
-	__le32 modulus_size;	/* in dwords */
-	__le32 exponent_size;	/* in dwords */
-	__u8 reserved[88];
-} __attribute__ ((packed));
-
-/* Boot mode opcodes */
-enum i2400m_brh_opcode {
-	I2400M_BRH_READ = 1,
-	I2400M_BRH_WRITE = 2,
-	I2400M_BRH_JUMP = 3,
-	I2400M_BRH_SIGNED_JUMP = 8,
-	I2400M_BRH_HASH_PAYLOAD_ONLY = 9,
-};
-
-/* Boot mode command masks and stuff */
-enum i2400m_brh {
-	I2400M_BRH_SIGNATURE = 0xcbbc0000,
-	I2400M_BRH_SIGNATURE_MASK = 0xffff0000,
-	I2400M_BRH_SIGNATURE_SHIFT = 16,
-	I2400M_BRH_OPCODE_MASK = 0x0000000f,
-	I2400M_BRH_RESPONSE_MASK = 0x000000f0,
-	I2400M_BRH_RESPONSE_SHIFT = 4,
-	I2400M_BRH_DIRECT_ACCESS = 0x00000400,
-	I2400M_BRH_RESPONSE_REQUIRED = 0x00000200,
-	I2400M_BRH_USE_CHECKSUM = 0x00000100,
-};
-
-
-/**
- * i2400m_bootrom_header - Header for a boot-mode command
- *
- * @cmd: the above command descriptor
- * @target_addr: where on the device memory should the action be performed.
- * @data_size: for read/write, amount of data to be read/written
- * @block_checksum: checksum value (if applicable)
- * @payload: the beginning of data attached to this header
- */
-struct i2400m_bootrom_header {
-	__le32 command;		/* Compose with enum i2400_brh */
-	__le32 target_addr;
-	__le32 data_size;
-	__le32 block_checksum;
-	char payload[0];
-} __attribute__ ((packed));
-
-
-/*
- * Data / control protocol
- */
-
-/* Packet types for the host-device interface */
-enum i2400m_pt {
-	I2400M_PT_DATA = 0,
-	I2400M_PT_CTRL,
-	I2400M_PT_TRACE,	/* For device debug */
-	I2400M_PT_RESET_WARM,	/* device reset */
-	I2400M_PT_RESET_COLD,	/* USB[transport] reset, like reconnect */
-	I2400M_PT_EDATA,	/* Extended RX data */
-	I2400M_PT_ILLEGAL
-};
-
-
-/*
- * Payload for a data packet
- *
- * This is prefixed to each and every outgoing DATA type.
- */
-struct i2400m_pl_data_hdr {
-	__le32 reserved;
-} __attribute__((packed));
-
-
-/*
- * Payload for an extended data packet
- *
- * New in fw v1.4
- *
- * @reorder: if this payload has to be reorder or not (and how)
- * @cs: the type of data in the packet, as defined per (802.16e
- *     T11.13.19.1). Currently only 2 (IPv4 packet) supported.
- *
- * This is prefixed to each and every INCOMING DATA packet.
- */
-struct i2400m_pl_edata_hdr {
-	__le32 reorder;		/* bits defined in i2400m_ro */
-	__u8 cs;
-	__u8 reserved[11];
-} __attribute__((packed));
-
-enum i2400m_cs {
-	I2400M_CS_IPV4_0 = 0,
-	I2400M_CS_IPV4 = 2,
-};
-
-enum i2400m_ro {
-	I2400M_RO_NEEDED     = 0x01,
-	I2400M_RO_TYPE       = 0x03,
-	I2400M_RO_TYPE_SHIFT = 1,
-	I2400M_RO_CIN        = 0x0f,
-	I2400M_RO_CIN_SHIFT  = 4,
-	I2400M_RO_FBN        = 0x07ff,
-	I2400M_RO_FBN_SHIFT  = 8,
-	I2400M_RO_SN         = 0x07ff,
-	I2400M_RO_SN_SHIFT   = 21,
-};
-
-enum i2400m_ro_type {
-	I2400M_RO_TYPE_RESET = 0,
-	I2400M_RO_TYPE_PACKET,
-	I2400M_RO_TYPE_WS,
-	I2400M_RO_TYPE_PACKET_WS,
-};
-
-
-/* Misc constants */
-enum {
-	I2400M_PL_ALIGN = 16,	/* Payload data size alignment */
-	I2400M_PL_SIZE_MAX = 0x3EFF,
-	I2400M_MAX_PLS_IN_MSG = 60,
-	/* protocol barkers: sync sequences; for notifications they
-	 * are sent in groups of four. */
-	I2400M_H2D_PREVIEW_BARKER = 0xcafe900d,
-	I2400M_COLD_RESET_BARKER = 0xc01dc01d,
-	I2400M_WARM_RESET_BARKER = 0x50f750f7,
-	I2400M_NBOOT_BARKER = 0xdeadbeef,
-	I2400M_SBOOT_BARKER = 0x0ff1c1a1,
-	I2400M_SBOOT_BARKER_6050 = 0x80000001,
-	I2400M_ACK_BARKER = 0xfeedbabe,
-	I2400M_D2H_MSG_BARKER = 0xbeefbabe,
-};
-
-
-/*
- * Hardware payload descriptor
- *
- * Bitfields encoded in a struct to enforce typing semantics.
- *
- * Look in rx.c and tx.c for a full description of the format.
- */
-struct i2400m_pld {
-	__le32 val;
-} __attribute__ ((packed));
-
-#define I2400M_PLD_SIZE_MASK 0x00003fff
-#define I2400M_PLD_TYPE_SHIFT 16
-#define I2400M_PLD_TYPE_MASK 0x000f0000
-
-/*
- * Header for a TX message or RX message
- *
- * @barker: preamble
- * @size: used for management of the FIFO queue buffer; before
- *     sending, this is converted to be a real preamble. This
- *     indicates the real size of the TX message that starts at this
- *     point. If the highest bit is set, then this message is to be
- *     skipped.
- * @sequence: sequence number of this message
- * @offset: offset where the message itself starts -- see the comments
- *     in the file header about message header and payload descriptor
- *     alignment.
- * @num_pls: number of payloads in this message
- * @padding: amount of padding bytes at the end of the message to make
- *           it be of block-size aligned
- *
- * Look in rx.c and tx.c for a full description of the format.
- */
-struct i2400m_msg_hdr {
-	union {
-		__le32 barker;
-		__u32 size;	/* same size type as barker!! */
-	};
-	union {
-		__le32 sequence;
-		__u32 offset;	/* same size type as barker!! */
-	};
-	__le16 num_pls;
-	__le16 rsv1;
-	__le16 padding;
-	__le16 rsv2;
-	struct i2400m_pld pld[0];
-} __attribute__ ((packed));
-
-
-
-/*
- * L3/L4 control protocol
- */
-
-enum {
-	/* Interface version */
-	I2400M_L3L4_VERSION             = 0x0100,
-};
-
-/* Message types */
-enum i2400m_mt {
-	I2400M_MT_RESERVED              = 0x0000,
-	I2400M_MT_INVALID               = 0xffff,
-	I2400M_MT_REPORT_MASK		= 0x8000,
-
-	I2400M_MT_GET_SCAN_RESULT  	= 0x4202,
-	I2400M_MT_SET_SCAN_PARAM   	= 0x4402,
-	I2400M_MT_CMD_RF_CONTROL   	= 0x4602,
-	I2400M_MT_CMD_SCAN         	= 0x4603,
-	I2400M_MT_CMD_CONNECT      	= 0x4604,
-	I2400M_MT_CMD_DISCONNECT   	= 0x4605,
-	I2400M_MT_CMD_EXIT_IDLE   	= 0x4606,
-	I2400M_MT_GET_LM_VERSION   	= 0x5201,
-	I2400M_MT_GET_DEVICE_INFO  	= 0x5202,
-	I2400M_MT_GET_LINK_STATUS  	= 0x5203,
-	I2400M_MT_GET_STATISTICS   	= 0x5204,
-	I2400M_MT_GET_STATE        	= 0x5205,
-	I2400M_MT_GET_MEDIA_STATUS	= 0x5206,
-	I2400M_MT_SET_INIT_CONFIG	= 0x5404,
-	I2400M_MT_CMD_INIT	        = 0x5601,
-	I2400M_MT_CMD_TERMINATE		= 0x5602,
-	I2400M_MT_CMD_MODE_OF_OP	= 0x5603,
-	I2400M_MT_CMD_RESET_DEVICE	= 0x5604,
-	I2400M_MT_CMD_MONITOR_CONTROL   = 0x5605,
-	I2400M_MT_CMD_ENTER_POWERSAVE   = 0x5606,
-	I2400M_MT_GET_TLS_OPERATION_RESULT = 0x6201,
-	I2400M_MT_SET_EAP_SUCCESS       = 0x6402,
-	I2400M_MT_SET_EAP_FAIL          = 0x6403,
-	I2400M_MT_SET_EAP_KEY          	= 0x6404,
-	I2400M_MT_CMD_SEND_EAP_RESPONSE = 0x6602,
-	I2400M_MT_REPORT_SCAN_RESULT    = 0xc002,
-	I2400M_MT_REPORT_STATE		= 0xd002,
-	I2400M_MT_REPORT_POWERSAVE_READY = 0xd005,
-	I2400M_MT_REPORT_EAP_REQUEST    = 0xe002,
-	I2400M_MT_REPORT_EAP_RESTART    = 0xe003,
-	I2400M_MT_REPORT_ALT_ACCEPT    	= 0xe004,
-	I2400M_MT_REPORT_KEY_REQUEST 	= 0xe005,
-};
-
-
-/*
- * Message Ack Status codes
- *
- * When a message is replied-to, this status is reported.
- */
-enum i2400m_ms {
-	I2400M_MS_DONE_OK                  = 0,
-	I2400M_MS_DONE_IN_PROGRESS         = 1,
-	I2400M_MS_INVALID_OP               = 2,
-	I2400M_MS_BAD_STATE                = 3,
-	I2400M_MS_ILLEGAL_VALUE            = 4,
-	I2400M_MS_MISSING_PARAMS           = 5,
-	I2400M_MS_VERSION_ERROR            = 6,
-	I2400M_MS_ACCESSIBILITY_ERROR      = 7,
-	I2400M_MS_BUSY                     = 8,
-	I2400M_MS_CORRUPTED_TLV            = 9,
-	I2400M_MS_UNINITIALIZED            = 10,
-	I2400M_MS_UNKNOWN_ERROR            = 11,
-	I2400M_MS_PRODUCTION_ERROR         = 12,
-	I2400M_MS_NO_RF                    = 13,
-	I2400M_MS_NOT_READY_FOR_POWERSAVE  = 14,
-	I2400M_MS_THERMAL_CRITICAL         = 15,
-	I2400M_MS_MAX
-};
-
-
-/**
- * i2400m_tlv - enumeration of the different types of TLVs
- *
- * TLVs stand for type-length-value and are the header for a payload
- * composed of almost anything. Each payload has a type assigned
- * and a length.
- */
-enum i2400m_tlv {
-	I2400M_TLV_L4_MESSAGE_VERSIONS = 129,
-	I2400M_TLV_SYSTEM_STATE = 141,
-	I2400M_TLV_MEDIA_STATUS = 161,
-	I2400M_TLV_RF_OPERATION = 162,
-	I2400M_TLV_RF_STATUS = 163,
-	I2400M_TLV_DEVICE_RESET_TYPE = 132,
-	I2400M_TLV_CONFIG_IDLE_PARAMETERS = 601,
-	I2400M_TLV_CONFIG_IDLE_TIMEOUT = 611,
-	I2400M_TLV_CONFIG_D2H_DATA_FORMAT = 614,
-	I2400M_TLV_CONFIG_DL_HOST_REORDER = 615,
-};
-
-
-struct i2400m_tlv_hdr {
-	__le16 type;
-	__le16 length;		/* payload's */
-	__u8   pl[0];
-} __attribute__((packed));
-
-
-struct i2400m_l3l4_hdr {
-	__le16 type;
-	__le16 length;		/* payload's */
-	__le16 version;
-	__le16 resv1;
-	__le16 status;
-	__le16 resv2;
-	struct i2400m_tlv_hdr pl[0];
-} __attribute__((packed));
-
-
-/**
- * i2400m_system_state - different states of the device
- */
-enum i2400m_system_state {
-	I2400M_SS_UNINITIALIZED = 1,
-	I2400M_SS_INIT,
-	I2400M_SS_READY,
-	I2400M_SS_SCAN,
-	I2400M_SS_STANDBY,
-	I2400M_SS_CONNECTING,
-	I2400M_SS_WIMAX_CONNECTED,
-	I2400M_SS_DATA_PATH_CONNECTED,
-	I2400M_SS_IDLE,
-	I2400M_SS_DISCONNECTING,
-	I2400M_SS_OUT_OF_ZONE,
-	I2400M_SS_SLEEPACTIVE,
-	I2400M_SS_PRODUCTION,
-	I2400M_SS_CONFIG,
-	I2400M_SS_RF_OFF,
-	I2400M_SS_RF_SHUTDOWN,
-	I2400M_SS_DEVICE_DISCONNECT,
-	I2400M_SS_MAX,
-};
-
-
-/**
- * i2400m_tlv_system_state - report on the state of the system
- *
- * @state: see enum i2400m_system_state
- */
-struct i2400m_tlv_system_state {
-	struct i2400m_tlv_hdr hdr;
-	__le32 state;
-} __attribute__((packed));
-
-
-struct i2400m_tlv_l4_message_versions {
-	struct i2400m_tlv_hdr hdr;
-	__le16 major;
-	__le16 minor;
-	__le16 branch;
-	__le16 reserved;
-} __attribute__((packed));
-
-
-struct i2400m_tlv_detailed_device_info {
-	struct i2400m_tlv_hdr hdr;
-	__u8 reserved1[400];
-	__u8 mac_address[ETH_ALEN];
-	__u8 reserved2[2];
-} __attribute__((packed));
-
-
-enum i2400m_rf_switch_status {
-	I2400M_RF_SWITCH_ON = 1,
-	I2400M_RF_SWITCH_OFF = 2,
-};
-
-struct i2400m_tlv_rf_switches_status {
-	struct i2400m_tlv_hdr hdr;
-	__u8 sw_rf_switch;	/* 1 ON, 2 OFF */
-	__u8 hw_rf_switch;	/* 1 ON, 2 OFF */
-	__u8 reserved[2];
-} __attribute__((packed));
-
-
-enum {
-	i2400m_rf_operation_on = 1,
-	i2400m_rf_operation_off = 2
-};
-
-struct i2400m_tlv_rf_operation {
-	struct i2400m_tlv_hdr hdr;
-	__le32 status;	/* 1 ON, 2 OFF */
-} __attribute__((packed));
-
-
-enum i2400m_tlv_reset_type {
-	I2400M_RESET_TYPE_COLD = 1,
-	I2400M_RESET_TYPE_WARM
-};
-
-struct i2400m_tlv_device_reset_type {
-	struct i2400m_tlv_hdr hdr;
-	__le32 reset_type;
-} __attribute__((packed));
-
-
-struct i2400m_tlv_config_idle_parameters {
-	struct i2400m_tlv_hdr hdr;
-	__le32 idle_timeout;	/* 100 to 300000 ms [5min], 100 increments
-				 * 0 disabled */
-	__le32 idle_paging_interval;	/* frames */
-} __attribute__((packed));
-
-
-enum i2400m_media_status {
-	I2400M_MEDIA_STATUS_LINK_UP = 1,
-	I2400M_MEDIA_STATUS_LINK_DOWN,
-	I2400M_MEDIA_STATUS_LINK_RENEW,
-};
-
-struct i2400m_tlv_media_status {
-	struct i2400m_tlv_hdr hdr;
-	__le32 media_status;
-} __attribute__((packed));
-
-
-/* New in v1.4 */
-struct i2400m_tlv_config_idle_timeout {
-	struct i2400m_tlv_hdr hdr;
-	__le32 timeout;	/* 100 to 300000 ms [5min], 100 increments
-			 * 0 disabled */
-} __attribute__((packed));
-
-/* New in v1.4 -- for backward compat, will be removed */
-struct i2400m_tlv_config_d2h_data_format {
-	struct i2400m_tlv_hdr hdr;
-	__u8 format; 		/* 0 old format, 1 enhanced */
-	__u8 reserved[3];
-} __attribute__((packed));
-
-/* New in v1.4 */
-struct i2400m_tlv_config_dl_host_reorder {
-	struct i2400m_tlv_hdr hdr;
-	__u8 reorder; 		/* 0 disabled, 1 enabled */
-	__u8 reserved[3];
-} __attribute__((packed));
-
-
-#endif /* #ifndef __LINUX__WIMAX__I2400M_H__ */
diff --git a/openflow/usr/include/linux/wireless.h b/openflow/usr/include/linux/wireless.h
deleted file mode 100644
index ad9839f..0000000
--- a/openflow/usr/include/linux/wireless.h
+++ /dev/null
@@ -1,1128 +0,0 @@
-/*
- * This file define a set of standard wireless extensions
- *
- * Version :	22	16.3.07
- *
- * Authors :	Jean Tourrilhes - HPL - <jt@hpl.hp.com>
- * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved.
- */
-
-#ifndef _LINUX_WIRELESS_H
-#define _LINUX_WIRELESS_H
-
-/************************** DOCUMENTATION **************************/
-/*
- * Initial APIs (1996 -> onward) :
- * -----------------------------
- * Basically, the wireless extensions are for now a set of standard ioctl
- * call + /proc/net/wireless
- *
- * The entry /proc/net/wireless give statistics and information on the
- * driver.
- * This is better than having each driver having its entry because
- * its centralised and we may remove the driver module safely.
- *
- * Ioctl are used to configure the driver and issue commands.  This is
- * better than command line options of insmod because we may want to
- * change dynamically (while the driver is running) some parameters.
- *
- * The ioctl mechanimsm are copied from standard devices ioctl.
- * We have the list of command plus a structure descibing the
- * data exchanged...
- * Note that to add these ioctl, I was obliged to modify :
- *	# net/core/dev.c (two place + add include)
- *	# net/ipv4/af_inet.c (one place + add include)
- *
- * /proc/net/wireless is a copy of /proc/net/dev.
- * We have a structure for data passed from the driver to /proc/net/wireless
- * Too add this, I've modified :
- *	# net/core/dev.c (two other places)
- *	# include/linux/netdevice.h (one place)
- *	# include/linux/proc_fs.h (one place)
- *
- * New driver API (2002 -> onward) :
- * -------------------------------
- * This file is only concerned with the user space API and common definitions.
- * The new driver API is defined and documented in :
- *	# include/net/iw_handler.h
- *
- * Note as well that /proc/net/wireless implementation has now moved in :
- *	# net/core/wireless.c
- *
- * Wireless Events (2002 -> onward) :
- * --------------------------------
- * Events are defined at the end of this file, and implemented in :
- *	# net/core/wireless.c
- *
- * Other comments :
- * --------------
- * Do not add here things that are redundant with other mechanisms
- * (drivers init, ifconfig, /proc/net/dev, ...) and with are not
- * wireless specific.
- *
- * These wireless extensions are not magic : each driver has to provide
- * support for them...
- *
- * IMPORTANT NOTE : As everything in the kernel, this is very much a
- * work in progress. Contact me if you have ideas of improvements...
- */
-
-/***************************** INCLUDES *****************************/
-
-#include <linux/types.h>		/* for __u* and __s* typedefs */
-#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <linux/if.h>			/* for IFNAMSIZ and co... */
-
-/***************************** VERSION *****************************/
-/*
- * This constant is used to know the availability of the wireless
- * extensions and to know which version of wireless extensions it is
- * (there is some stuff that will be added in the future...)
- * I just plan to increment with each new version.
- */
-#define WIRELESS_EXT	22
-
-/*
- * Changes :
- *
- * V2 to V3
- * --------
- *	Alan Cox start some incompatibles changes. I've integrated a bit more.
- *	- Encryption renamed to Encode to avoid US regulation problems
- *	- Frequency changed from float to struct to avoid problems on old 386
- *
- * V3 to V4
- * --------
- *	- Add sensitivity
- *
- * V4 to V5
- * --------
- *	- Missing encoding definitions in range
- *	- Access points stuff
- *
- * V5 to V6
- * --------
- *	- 802.11 support (ESSID ioctls)
- *
- * V6 to V7
- * --------
- *	- define IW_ESSID_MAX_SIZE and IW_MAX_AP
- *
- * V7 to V8
- * --------
- *	- Changed my e-mail address
- *	- More 802.11 support (nickname, rate, rts, frag)
- *	- List index in frequencies
- *
- * V8 to V9
- * --------
- *	- Support for 'mode of operation' (ad-hoc, managed...)
- *	- Support for unicast and multicast power saving
- *	- Change encoding to support larger tokens (>64 bits)
- *	- Updated iw_params (disable, flags) and use it for NWID
- *	- Extracted iw_point from iwreq for clarity
- *
- * V9 to V10
- * ---------
- *	- Add PM capability to range structure
- *	- Add PM modifier : MAX/MIN/RELATIVE
- *	- Add encoding option : IW_ENCODE_NOKEY
- *	- Add TxPower ioctls (work like TxRate)
- *
- * V10 to V11
- * ----------
- *	- Add WE version in range (help backward/forward compatibility)
- *	- Add retry ioctls (work like PM)
- *
- * V11 to V12
- * ----------
- *	- Add SIOCSIWSTATS to get /proc/net/wireless programatically
- *	- Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space
- *	- Add new statistics (frag, retry, beacon)
- *	- Add average quality (for user space calibration)
- *
- * V12 to V13
- * ----------
- *	- Document creation of new driver API.
- *	- Extract union iwreq_data from struct iwreq (for new driver API).
- *	- Rename SIOCSIWNAME as SIOCSIWCOMMIT
- *
- * V13 to V14
- * ----------
- *	- Wireless Events support : define struct iw_event
- *	- Define additional specific event numbers
- *	- Add "addr" and "param" fields in union iwreq_data
- *	- AP scanning stuff (SIOCSIWSCAN and friends)
- *
- * V14 to V15
- * ----------
- *	- Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg
- *	- Make struct iw_freq signed (both m & e), add explicit padding
- *	- Add IWEVCUSTOM for driver specific event/scanning token
- *	- Add IW_MAX_GET_SPY for driver returning a lot of addresses
- *	- Add IW_TXPOW_RANGE for range of Tx Powers
- *	- Add IWEVREGISTERED & IWEVEXPIRED events for Access Points
- *	- Add IW_MODE_MONITOR for passive monitor
- *
- * V15 to V16
- * ----------
- *	- Increase the number of bitrates in iw_range to 32 (for 802.11g)
- *	- Increase the number of frequencies in iw_range to 32 (for 802.11b+a)
- *	- Reshuffle struct iw_range for increases, add filler
- *	- Increase IW_MAX_AP to 64 for driver returning a lot of addresses
- *	- Remove IW_MAX_GET_SPY because conflict with enhanced spy support
- *	- Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy"
- *	- Add IW_ENCODE_TEMP and iw_range->encoding_login_index
- *
- * V16 to V17
- * ----------
- *	- Add flags to frequency -> auto/fixed
- *	- Document (struct iw_quality *)->updated, add new flags (INVALID)
- *	- Wireless Event capability in struct iw_range
- *	- Add support for relative TxPower (yick !)
- *
- * V17 to V18 (From Jouni Malinen <j@w1.fi>)
- * ----------
- *	- Add support for WPA/WPA2
- *	- Add extended encoding configuration (SIOCSIWENCODEEXT and
- *	  SIOCGIWENCODEEXT)
- *	- Add SIOCSIWGENIE/SIOCGIWGENIE
- *	- Add SIOCSIWMLME
- *	- Add SIOCSIWPMKSA
- *	- Add struct iw_range bit field for supported encoding capabilities
- *	- Add optional scan request parameters for SIOCSIWSCAN
- *	- Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA
- *	  related parameters (extensible up to 4096 parameter values)
- *	- Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE,
- *	  IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND
- *
- * V18 to V19
- * ----------
- *	- Remove (struct iw_point *)->pointer from events and streams
- *	- Remove header includes to help user space
- *	- Increase IW_ENCODING_TOKEN_MAX from 32 to 64
- *	- Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros
- *	- Add explicit flag to tell stats are in dBm : IW_QUAL_DBM
- *	- Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros
- *
- * V19 to V20
- * ----------
- *	- RtNetlink requests support (SET/GET)
- *
- * V20 to V21
- * ----------
- *	- Remove (struct net_device *)->get_wireless_stats()
- *	- Change length in ESSID and NICK to strlen() instead of strlen()+1
- *	- Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers
- *	- Power/Retry relative values no longer * 100000
- *	- Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI
- *
- * V21 to V22
- * ----------
- *	- Prevent leaking of kernel space in stream on 64 bits.
- */
-
-/**************************** CONSTANTS ****************************/
-
-/* -------------------------- IOCTL LIST -------------------------- */
-
-/* Wireless Identification */
-#define SIOCSIWCOMMIT	0x8B00		/* Commit pending changes to driver */
-#define SIOCGIWNAME	0x8B01		/* get name == wireless protocol */
-/* SIOCGIWNAME is used to verify the presence of Wireless Extensions.
- * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"...
- * Don't put the name of your driver there, it's useless. */
-
-/* Basic operations */
-#define SIOCSIWNWID	0x8B02		/* set network id (pre-802.11) */
-#define SIOCGIWNWID	0x8B03		/* get network id (the cell) */
-#define SIOCSIWFREQ	0x8B04		/* set channel/frequency (Hz) */
-#define SIOCGIWFREQ	0x8B05		/* get channel/frequency (Hz) */
-#define SIOCSIWMODE	0x8B06		/* set operation mode */
-#define SIOCGIWMODE	0x8B07		/* get operation mode */
-#define SIOCSIWSENS	0x8B08		/* set sensitivity (dBm) */
-#define SIOCGIWSENS	0x8B09		/* get sensitivity (dBm) */
-
-/* Informative stuff */
-#define SIOCSIWRANGE	0x8B0A		/* Unused */
-#define SIOCGIWRANGE	0x8B0B		/* Get range of parameters */
-#define SIOCSIWPRIV	0x8B0C		/* Unused */
-#define SIOCGIWPRIV	0x8B0D		/* get private ioctl interface info */
-#define SIOCSIWSTATS	0x8B0E		/* Unused */
-#define SIOCGIWSTATS	0x8B0F		/* Get /proc/net/wireless stats */
-/* SIOCGIWSTATS is strictly used between user space and the kernel, and
- * is never passed to the driver (i.e. the driver will never see it). */
-
-/* Spy support (statistics per MAC address - used for Mobile IP support) */
-#define SIOCSIWSPY	0x8B10		/* set spy addresses */
-#define SIOCGIWSPY	0x8B11		/* get spy info (quality of link) */
-#define SIOCSIWTHRSPY	0x8B12		/* set spy threshold (spy event) */
-#define SIOCGIWTHRSPY	0x8B13		/* get spy threshold */
-
-/* Access Point manipulation */
-#define SIOCSIWAP	0x8B14		/* set access point MAC addresses */
-#define SIOCGIWAP	0x8B15		/* get access point MAC addresses */
-#define SIOCGIWAPLIST	0x8B17		/* Deprecated in favor of scanning */
-#define SIOCSIWSCAN	0x8B18		/* trigger scanning (list cells) */
-#define SIOCGIWSCAN	0x8B19		/* get scanning results */
-
-/* 802.11 specific support */
-#define SIOCSIWESSID	0x8B1A		/* set ESSID (network name) */
-#define SIOCGIWESSID	0x8B1B		/* get ESSID */
-#define SIOCSIWNICKN	0x8B1C		/* set node name/nickname */
-#define SIOCGIWNICKN	0x8B1D		/* get node name/nickname */
-/* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit
- * within the 'iwreq' structure, so we need to use the 'data' member to
- * point to a string in user space, like it is done for RANGE... */
-
-/* Other parameters useful in 802.11 and some other devices */
-#define SIOCSIWRATE	0x8B20		/* set default bit rate (bps) */
-#define SIOCGIWRATE	0x8B21		/* get default bit rate (bps) */
-#define SIOCSIWRTS	0x8B22		/* set RTS/CTS threshold (bytes) */
-#define SIOCGIWRTS	0x8B23		/* get RTS/CTS threshold (bytes) */
-#define SIOCSIWFRAG	0x8B24		/* set fragmentation thr (bytes) */
-#define SIOCGIWFRAG	0x8B25		/* get fragmentation thr (bytes) */
-#define SIOCSIWTXPOW	0x8B26		/* set transmit power (dBm) */
-#define SIOCGIWTXPOW	0x8B27		/* get transmit power (dBm) */
-#define SIOCSIWRETRY	0x8B28		/* set retry limits and lifetime */
-#define SIOCGIWRETRY	0x8B29		/* get retry limits and lifetime */
-
-/* Encoding stuff (scrambling, hardware security, WEP...) */
-#define SIOCSIWENCODE	0x8B2A		/* set encoding token & mode */
-#define SIOCGIWENCODE	0x8B2B		/* get encoding token & mode */
-/* Power saving stuff (power management, unicast and multicast) */
-#define SIOCSIWPOWER	0x8B2C		/* set Power Management settings */
-#define SIOCGIWPOWER	0x8B2D		/* get Power Management settings */
-
-/* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM).
- * This ioctl uses struct iw_point and data buffer that includes IE id and len
- * fields. More than one IE may be included in the request. Setting the generic
- * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers
- * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers
- * are required to report the used IE as a wireless event, e.g., when
- * associating with an AP. */
-#define SIOCSIWGENIE	0x8B30		/* set generic IE */
-#define SIOCGIWGENIE	0x8B31		/* get generic IE */
-
-/* WPA : IEEE 802.11 MLME requests */
-#define SIOCSIWMLME	0x8B16		/* request MLME operation; uses
-					 * struct iw_mlme */
-/* WPA : Authentication mode parameters */
-#define SIOCSIWAUTH	0x8B32		/* set authentication mode params */
-#define SIOCGIWAUTH	0x8B33		/* get authentication mode params */
-
-/* WPA : Extended version of encoding configuration */
-#define SIOCSIWENCODEEXT 0x8B34		/* set encoding token & mode */
-#define SIOCGIWENCODEEXT 0x8B35		/* get encoding token & mode */
-
-/* WPA2 : PMKSA cache management */
-#define SIOCSIWPMKSA	0x8B36		/* PMKSA cache operation */
-
-/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */
-
-/* These 32 ioctl are wireless device private, for 16 commands.
- * Each driver is free to use them for whatever purpose it chooses,
- * however the driver *must* export the description of those ioctls
- * with SIOCGIWPRIV and *must* use arguments as defined below.
- * If you don't follow those rules, DaveM is going to hate you (reason :
- * it make mixed 32/64bit operation impossible).
- */
-#define SIOCIWFIRSTPRIV	0x8BE0
-#define SIOCIWLASTPRIV	0x8BFF
-/* Previously, we were using SIOCDEVPRIVATE, but we now have our
- * separate range because of collisions with other tools such as
- * 'mii-tool'.
- * We now have 32 commands, so a bit more space ;-).
- * Also, all 'even' commands are only usable by root and don't return the
- * content of ifr/iwr to user (but you are not obliged to use the set/get
- * convention, just use every other two command). More details in iwpriv.c.
- * And I repeat : you are not forced to use them with iwpriv, but you
- * must be compliant with it.
- */
-
-/* ------------------------- IOCTL STUFF ------------------------- */
-
-/* The first and the last (range) */
-#define SIOCIWFIRST	0x8B00
-#define SIOCIWLAST	SIOCIWLASTPRIV		/* 0x8BFF */
-#define IW_IOCTL_IDX(cmd)	((cmd) - SIOCIWFIRST)
-#define IW_HANDLER(id, func)			\
-	[IW_IOCTL_IDX(id)] = func
-
-/* Odd : get (world access), even : set (root access) */
-#define IW_IS_SET(cmd)	(!((cmd) & 0x1))
-#define IW_IS_GET(cmd)	((cmd) & 0x1)
-
-/* ----------------------- WIRELESS EVENTS ----------------------- */
-/* Those are *NOT* ioctls, do not issue request on them !!! */
-/* Most events use the same identifier as ioctl requests */
-
-#define IWEVTXDROP	0x8C00		/* Packet dropped to excessive retry */
-#define IWEVQUAL	0x8C01		/* Quality part of statistics (scan) */
-#define IWEVCUSTOM	0x8C02		/* Driver specific ascii string */
-#define IWEVREGISTERED	0x8C03		/* Discovered a new node (AP mode) */
-#define IWEVEXPIRED	0x8C04		/* Expired a node (AP mode) */
-#define IWEVGENIE	0x8C05		/* Generic IE (WPA, RSN, WMM, ..)
-					 * (scan results); This includes id and
-					 * length fields. One IWEVGENIE may
-					 * contain more than one IE. Scan
-					 * results may contain one or more
-					 * IWEVGENIE events. */
-#define IWEVMICHAELMICFAILURE 0x8C06	/* Michael MIC failure
-					 * (struct iw_michaelmicfailure)
-					 */
-#define IWEVASSOCREQIE	0x8C07		/* IEs used in (Re)Association Request.
-					 * The data includes id and length
-					 * fields and may contain more than one
-					 * IE. This event is required in
-					 * Managed mode if the driver
-					 * generates its own WPA/RSN IE. This
-					 * should be sent just before
-					 * IWEVREGISTERED event for the
-					 * association. */
-#define IWEVASSOCRESPIE	0x8C08		/* IEs used in (Re)Association
-					 * Response. The data includes id and
-					 * length fields and may contain more
-					 * than one IE. This may be sent
-					 * between IWEVASSOCREQIE and
-					 * IWEVREGISTERED events for the
-					 * association. */
-#define IWEVPMKIDCAND	0x8C09		/* PMKID candidate for RSN
-					 * pre-authentication
-					 * (struct iw_pmkid_cand) */
-
-#define IWEVFIRST	0x8C00
-#define IW_EVENT_IDX(cmd)	((cmd) - IWEVFIRST)
-
-/* ------------------------- PRIVATE INFO ------------------------- */
-/*
- * The following is used with SIOCGIWPRIV. It allow a driver to define
- * the interface (name, type of data) for its private ioctl.
- * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV
- */
-
-#define IW_PRIV_TYPE_MASK	0x7000	/* Type of arguments */
-#define IW_PRIV_TYPE_NONE	0x0000
-#define IW_PRIV_TYPE_BYTE	0x1000	/* Char as number */
-#define IW_PRIV_TYPE_CHAR	0x2000	/* Char as character */
-#define IW_PRIV_TYPE_INT	0x4000	/* 32 bits int */
-#define IW_PRIV_TYPE_FLOAT	0x5000	/* struct iw_freq */
-#define IW_PRIV_TYPE_ADDR	0x6000	/* struct sockaddr */
-
-#define IW_PRIV_SIZE_FIXED	0x0800	/* Variable or fixed number of args */
-
-#define IW_PRIV_SIZE_MASK	0x07FF	/* Max number of those args */
-
-/*
- * Note : if the number of args is fixed and the size < 16 octets,
- * instead of passing a pointer we will put args in the iwreq struct...
- */
-
-/* ----------------------- OTHER CONSTANTS ----------------------- */
-
-/* Maximum frequencies in the range struct */
-#define IW_MAX_FREQUENCIES	32
-/* Note : if you have something like 80 frequencies,
- * don't increase this constant and don't fill the frequency list.
- * The user will be able to set by channel anyway... */
-
-/* Maximum bit rates in the range struct */
-#define IW_MAX_BITRATES		32
-
-/* Maximum tx powers in the range struct */
-#define IW_MAX_TXPOWER		8
-/* Note : if you more than 8 TXPowers, just set the max and min or
- * a few of them in the struct iw_range. */
-
-/* Maximum of address that you may set with SPY */
-#define IW_MAX_SPY		8
-
-/* Maximum of address that you may get in the
-   list of access points in range */
-#define IW_MAX_AP		64
-
-/* Maximum size of the ESSID and NICKN strings */
-#define IW_ESSID_MAX_SIZE	32
-
-/* Modes of operation */
-#define IW_MODE_AUTO	0	/* Let the driver decides */
-#define IW_MODE_ADHOC	1	/* Single cell network */
-#define IW_MODE_INFRA	2	/* Multi cell network, roaming, ... */
-#define IW_MODE_MASTER	3	/* Synchronisation master or Access Point */
-#define IW_MODE_REPEAT	4	/* Wireless Repeater (forwarder) */
-#define IW_MODE_SECOND	5	/* Secondary master/repeater (backup) */
-#define IW_MODE_MONITOR	6	/* Passive monitor (listen only) */
-#define IW_MODE_MESH	7	/* Mesh (IEEE 802.11s) network */
-
-/* Statistics flags (bitmask in updated) */
-#define IW_QUAL_QUAL_UPDATED	0x01	/* Value was updated since last read */
-#define IW_QUAL_LEVEL_UPDATED	0x02
-#define IW_QUAL_NOISE_UPDATED	0x04
-#define IW_QUAL_ALL_UPDATED	0x07
-#define IW_QUAL_DBM		0x08	/* Level + Noise are dBm */
-#define IW_QUAL_QUAL_INVALID	0x10	/* Driver doesn't provide value */
-#define IW_QUAL_LEVEL_INVALID	0x20
-#define IW_QUAL_NOISE_INVALID	0x40
-#define IW_QUAL_RCPI		0x80	/* Level + Noise are 802.11k RCPI */
-#define IW_QUAL_ALL_INVALID	0x70
-
-/* Frequency flags */
-#define IW_FREQ_AUTO		0x00	/* Let the driver decides */
-#define IW_FREQ_FIXED		0x01	/* Force a specific value */
-
-/* Maximum number of size of encoding token available
- * they are listed in the range structure */
-#define IW_MAX_ENCODING_SIZES	8
-
-/* Maximum size of the encoding token in bytes */
-#define IW_ENCODING_TOKEN_MAX	64	/* 512 bits (for now) */
-
-/* Flags for encoding (along with the token) */
-#define IW_ENCODE_INDEX		0x00FF	/* Token index (if needed) */
-#define IW_ENCODE_FLAGS		0xFF00	/* Flags defined below */
-#define IW_ENCODE_MODE		0xF000	/* Modes defined below */
-#define IW_ENCODE_DISABLED	0x8000	/* Encoding disabled */
-#define IW_ENCODE_ENABLED	0x0000	/* Encoding enabled */
-#define IW_ENCODE_RESTRICTED	0x4000	/* Refuse non-encoded packets */
-#define IW_ENCODE_OPEN		0x2000	/* Accept non-encoded packets */
-#define IW_ENCODE_NOKEY		0x0800  /* Key is write only, so not present */
-#define IW_ENCODE_TEMP		0x0400  /* Temporary key */
-
-/* Power management flags available (along with the value, if any) */
-#define IW_POWER_ON		0x0000	/* No details... */
-#define IW_POWER_TYPE		0xF000	/* Type of parameter */
-#define IW_POWER_PERIOD		0x1000	/* Value is a period/duration of  */
-#define IW_POWER_TIMEOUT	0x2000	/* Value is a timeout (to go asleep) */
-#define IW_POWER_MODE		0x0F00	/* Power Management mode */
-#define IW_POWER_UNICAST_R	0x0100	/* Receive only unicast messages */
-#define IW_POWER_MULTICAST_R	0x0200	/* Receive only multicast messages */
-#define IW_POWER_ALL_R		0x0300	/* Receive all messages though PM */
-#define IW_POWER_FORCE_S	0x0400	/* Force PM procedure for sending unicast */
-#define IW_POWER_REPEATER	0x0800	/* Repeat broadcast messages in PM period */
-#define IW_POWER_MODIFIER	0x000F	/* Modify a parameter */
-#define IW_POWER_MIN		0x0001	/* Value is a minimum  */
-#define IW_POWER_MAX		0x0002	/* Value is a maximum */
-#define IW_POWER_RELATIVE	0x0004	/* Value is not in seconds/ms/us */
-
-/* Transmit Power flags available */
-#define IW_TXPOW_TYPE		0x00FF	/* Type of value */
-#define IW_TXPOW_DBM		0x0000	/* Value is in dBm */
-#define IW_TXPOW_MWATT		0x0001	/* Value is in mW */
-#define IW_TXPOW_RELATIVE	0x0002	/* Value is in arbitrary units */
-#define IW_TXPOW_RANGE		0x1000	/* Range of value between min/max */
-
-/* Retry limits and lifetime flags available */
-#define IW_RETRY_ON		0x0000	/* No details... */
-#define IW_RETRY_TYPE		0xF000	/* Type of parameter */
-#define IW_RETRY_LIMIT		0x1000	/* Maximum number of retries*/
-#define IW_RETRY_LIFETIME	0x2000	/* Maximum duration of retries in us */
-#define IW_RETRY_MODIFIER	0x00FF	/* Modify a parameter */
-#define IW_RETRY_MIN		0x0001	/* Value is a minimum  */
-#define IW_RETRY_MAX		0x0002	/* Value is a maximum */
-#define IW_RETRY_RELATIVE	0x0004	/* Value is not in seconds/ms/us */
-#define IW_RETRY_SHORT		0x0010	/* Value is for short packets  */
-#define IW_RETRY_LONG		0x0020	/* Value is for long packets */
-
-/* Scanning request flags */
-#define IW_SCAN_DEFAULT		0x0000	/* Default scan of the driver */
-#define IW_SCAN_ALL_ESSID	0x0001	/* Scan all ESSIDs */
-#define IW_SCAN_THIS_ESSID	0x0002	/* Scan only this ESSID */
-#define IW_SCAN_ALL_FREQ	0x0004	/* Scan all Frequencies */
-#define IW_SCAN_THIS_FREQ	0x0008	/* Scan only this Frequency */
-#define IW_SCAN_ALL_MODE	0x0010	/* Scan all Modes */
-#define IW_SCAN_THIS_MODE	0x0020	/* Scan only this Mode */
-#define IW_SCAN_ALL_RATE	0x0040	/* Scan all Bit-Rates */
-#define IW_SCAN_THIS_RATE	0x0080	/* Scan only this Bit-Rate */
-/* struct iw_scan_req scan_type */
-#define IW_SCAN_TYPE_ACTIVE 0
-#define IW_SCAN_TYPE_PASSIVE 1
-/* Maximum size of returned data */
-#define IW_SCAN_MAX_DATA	4096	/* In bytes */
-
-/* Scan capability flags - in (struct iw_range *)->scan_capa */
-#define IW_SCAN_CAPA_NONE		0x00
-#define IW_SCAN_CAPA_ESSID		0x01
-#define IW_SCAN_CAPA_BSSID		0x02
-#define IW_SCAN_CAPA_CHANNEL	0x04
-#define IW_SCAN_CAPA_MODE		0x08
-#define IW_SCAN_CAPA_RATE		0x10
-#define IW_SCAN_CAPA_TYPE		0x20
-#define IW_SCAN_CAPA_TIME		0x40
-
-/* Max number of char in custom event - use multiple of them if needed */
-#define IW_CUSTOM_MAX		256	/* In bytes */
-
-/* Generic information element */
-#define IW_GENERIC_IE_MAX	1024
-
-/* MLME requests (SIOCSIWMLME / struct iw_mlme) */
-#define IW_MLME_DEAUTH		0
-#define IW_MLME_DISASSOC	1
-#define IW_MLME_AUTH		2
-#define IW_MLME_ASSOC		3
-
-/* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */
-#define IW_AUTH_INDEX		0x0FFF
-#define IW_AUTH_FLAGS		0xF000
-/* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095)
- * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the
- * parameter that is being set/get to; value will be read/written to
- * struct iw_param value field) */
-#define IW_AUTH_WPA_VERSION		0
-#define IW_AUTH_CIPHER_PAIRWISE		1
-#define IW_AUTH_CIPHER_GROUP		2
-#define IW_AUTH_KEY_MGMT		3
-#define IW_AUTH_TKIP_COUNTERMEASURES	4
-#define IW_AUTH_DROP_UNENCRYPTED	5
-#define IW_AUTH_80211_AUTH_ALG		6
-#define IW_AUTH_WPA_ENABLED		7
-#define IW_AUTH_RX_UNENCRYPTED_EAPOL	8
-#define IW_AUTH_ROAMING_CONTROL		9
-#define IW_AUTH_PRIVACY_INVOKED		10
-#define IW_AUTH_CIPHER_GROUP_MGMT	11
-#define IW_AUTH_MFP			12
-
-/* IW_AUTH_WPA_VERSION values (bit field) */
-#define IW_AUTH_WPA_VERSION_DISABLED	0x00000001
-#define IW_AUTH_WPA_VERSION_WPA		0x00000002
-#define IW_AUTH_WPA_VERSION_WPA2	0x00000004
-
-/* IW_AUTH_PAIRWISE_CIPHER, IW_AUTH_GROUP_CIPHER, and IW_AUTH_CIPHER_GROUP_MGMT
- * values (bit field) */
-#define IW_AUTH_CIPHER_NONE	0x00000001
-#define IW_AUTH_CIPHER_WEP40	0x00000002
-#define IW_AUTH_CIPHER_TKIP	0x00000004
-#define IW_AUTH_CIPHER_CCMP	0x00000008
-#define IW_AUTH_CIPHER_WEP104	0x00000010
-#define IW_AUTH_CIPHER_AES_CMAC	0x00000020
-
-/* IW_AUTH_KEY_MGMT values (bit field) */
-#define IW_AUTH_KEY_MGMT_802_1X	1
-#define IW_AUTH_KEY_MGMT_PSK	2
-
-/* IW_AUTH_80211_AUTH_ALG values (bit field) */
-#define IW_AUTH_ALG_OPEN_SYSTEM	0x00000001
-#define IW_AUTH_ALG_SHARED_KEY	0x00000002
-#define IW_AUTH_ALG_LEAP	0x00000004
-
-/* IW_AUTH_ROAMING_CONTROL values */
-#define IW_AUTH_ROAMING_ENABLE	0	/* driver/firmware based roaming */
-#define IW_AUTH_ROAMING_DISABLE	1	/* user space program used for roaming
-					 * control */
-
-/* IW_AUTH_MFP (management frame protection) values */
-#define IW_AUTH_MFP_DISABLED	0	/* MFP disabled */
-#define IW_AUTH_MFP_OPTIONAL	1	/* MFP optional */
-#define IW_AUTH_MFP_REQUIRED	2	/* MFP required */
-
-/* SIOCSIWENCODEEXT definitions */
-#define IW_ENCODE_SEQ_MAX_SIZE	8
-/* struct iw_encode_ext ->alg */
-#define IW_ENCODE_ALG_NONE	0
-#define IW_ENCODE_ALG_WEP	1
-#define IW_ENCODE_ALG_TKIP	2
-#define IW_ENCODE_ALG_CCMP	3
-#define IW_ENCODE_ALG_PMK	4
-#define IW_ENCODE_ALG_AES_CMAC	5
-/* struct iw_encode_ext ->ext_flags */
-#define IW_ENCODE_EXT_TX_SEQ_VALID	0x00000001
-#define IW_ENCODE_EXT_RX_SEQ_VALID	0x00000002
-#define IW_ENCODE_EXT_GROUP_KEY		0x00000004
-#define IW_ENCODE_EXT_SET_TX_KEY	0x00000008
-
-/* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */
-#define IW_MICFAILURE_KEY_ID	0x00000003 /* Key ID 0..3 */
-#define IW_MICFAILURE_GROUP	0x00000004
-#define IW_MICFAILURE_PAIRWISE	0x00000008
-#define IW_MICFAILURE_STAKEY	0x00000010
-#define IW_MICFAILURE_COUNT	0x00000060 /* 1 or 2 (0 = count not supported)
-					    */
-
-/* Bit field values for enc_capa in struct iw_range */
-#define IW_ENC_CAPA_WPA		0x00000001
-#define IW_ENC_CAPA_WPA2	0x00000002
-#define IW_ENC_CAPA_CIPHER_TKIP	0x00000004
-#define IW_ENC_CAPA_CIPHER_CCMP	0x00000008
-#define IW_ENC_CAPA_4WAY_HANDSHAKE	0x00000010
-
-/* Event capability macros - in (struct iw_range *)->event_capa
- * Because we have more than 32 possible events, we use an array of
- * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */
-#define IW_EVENT_CAPA_BASE(cmd)		((cmd >= SIOCIWFIRSTPRIV) ? \
-					 (cmd - SIOCIWFIRSTPRIV + 0x60) : \
-					 (cmd - SIOCIWFIRST))
-#define IW_EVENT_CAPA_INDEX(cmd)	(IW_EVENT_CAPA_BASE(cmd) >> 5)
-#define IW_EVENT_CAPA_MASK(cmd)		(1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F))
-/* Event capability constants - event autogenerated by the kernel
- * This list is valid for most 802.11 devices, customise as needed... */
-#define IW_EVENT_CAPA_K_0	(IW_EVENT_CAPA_MASK(0x8B04) | \
-				 IW_EVENT_CAPA_MASK(0x8B06) | \
-				 IW_EVENT_CAPA_MASK(0x8B1A))
-#define IW_EVENT_CAPA_K_1	(IW_EVENT_CAPA_MASK(0x8B2A))
-/* "Easy" macro to set events in iw_range (less efficient) */
-#define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd))
-#define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; }
-
-
-/****************************** TYPES ******************************/
-
-/* --------------------------- SUBTYPES --------------------------- */
-/*
- *	Generic format for most parameters that fit in an int
- */
-struct	iw_param
-{
-  __s32		value;		/* The value of the parameter itself */
-  __u8		fixed;		/* Hardware should not use auto select */
-  __u8		disabled;	/* Disable the feature */
-  __u16		flags;		/* Various specifc flags (if any) */
-};
-
-/*
- *	For all data larger than 16 octets, we need to use a
- *	pointer to memory allocated in user space.
- */
-struct	iw_point
-{
-  void *pointer;	/* Pointer to the data  (in user space) */
-  __u16		length;		/* number of fields or size in bytes */
-  __u16		flags;		/* Optional params */
-};
-
-
-/*
- *	A frequency
- *	For numbers lower than 10^9, we encode the number in 'm' and
- *	set 'e' to 0
- *	For number greater than 10^9, we divide it by the lowest power
- *	of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')...
- *	The power of 10 is in 'e', the result of the division is in 'm'.
- */
-struct	iw_freq
-{
-	__s32		m;		/* Mantissa */
-	__s16		e;		/* Exponent */
-	__u8		i;		/* List index (when in range struct) */
-	__u8		flags;		/* Flags (fixed/auto) */
-};
-
-/*
- *	Quality of the link
- */
-struct	iw_quality
-{
-	__u8		qual;		/* link quality (%retries, SNR,
-					   %missed beacons or better...) */
-	__u8		level;		/* signal level (dBm) */
-	__u8		noise;		/* noise level (dBm) */
-	__u8		updated;	/* Flags to know if updated */
-};
-
-/*
- *	Packet discarded in the wireless adapter due to
- *	"wireless" specific problems...
- *	Note : the list of counter and statistics in net_device_stats
- *	is already pretty exhaustive, and you should use that first.
- *	This is only additional stats...
- */
-struct	iw_discarded
-{
-	__u32		nwid;		/* Rx : Wrong nwid/essid */
-	__u32		code;		/* Rx : Unable to code/decode (WEP) */
-	__u32		fragment;	/* Rx : Can't perform MAC reassembly */
-	__u32		retries;	/* Tx : Max MAC retries num reached */
-	__u32		misc;		/* Others cases */
-};
-
-/*
- *	Packet/Time period missed in the wireless adapter due to
- *	"wireless" specific problems...
- */
-struct	iw_missed
-{
-	__u32		beacon;		/* Missed beacons/superframe */
-};
-
-/*
- *	Quality range (for spy threshold)
- */
-struct	iw_thrspy
-{
-	struct sockaddr		addr;		/* Source address (hw/mac) */
-	struct iw_quality	qual;		/* Quality of the link */
-	struct iw_quality	low;		/* Low threshold */
-	struct iw_quality	high;		/* High threshold */
-};
-
-/*
- *	Optional data for scan request
- *
- *	Note: these optional parameters are controlling parameters for the
- *	scanning behavior, these do not apply to getting scan results
- *	(SIOCGIWSCAN). Drivers are expected to keep a local BSS table and
- *	provide a merged results with all BSSes even if the previous scan
- *	request limited scanning to a subset, e.g., by specifying an SSID.
- *	Especially, scan results are required to include an entry for the
- *	current BSS if the driver is in Managed mode and associated with an AP.
- */
-struct	iw_scan_req
-{
-	__u8		scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */
-	__u8		essid_len;
-	__u8		num_channels; /* num entries in channel_list;
-				       * 0 = scan all allowed channels */
-	__u8		flags; /* reserved as padding; use zero, this may
-				* be used in the future for adding flags
-				* to request different scan behavior */
-	struct sockaddr	bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or
-				* individual address of a specific BSS */
-
-	/*
-	 * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using
-	 * the current ESSID. This allows scan requests for specific ESSID
-	 * without having to change the current ESSID and potentially breaking
-	 * the current association.
-	 */
-	__u8		essid[IW_ESSID_MAX_SIZE];
-
-	/*
-	 * Optional parameters for changing the default scanning behavior.
-	 * These are based on the MLME-SCAN.request from IEEE Std 802.11.
-	 * TU is 1.024 ms. If these are set to 0, driver is expected to use
-	 * reasonable default values. min_channel_time defines the time that
-	 * will be used to wait for the first reply on each channel. If no
-	 * replies are received, next channel will be scanned after this. If
-	 * replies are received, total time waited on the channel is defined by
-	 * max_channel_time.
-	 */
-	__u32		min_channel_time; /* in TU */
-	__u32		max_channel_time; /* in TU */
-
-	struct iw_freq	channel_list[IW_MAX_FREQUENCIES];
-};
-
-/* ------------------------- WPA SUPPORT ------------------------- */
-
-/*
- *	Extended data structure for get/set encoding (this is used with
- *	SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_*
- *	flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and
- *	only the data contents changes (key data -> this structure, including
- *	key data).
- *
- *	If the new key is the first group key, it will be set as the default
- *	TX key. Otherwise, default TX key index is only changed if
- *	IW_ENCODE_EXT_SET_TX_KEY flag is set.
- *
- *	Key will be changed with SIOCSIWENCODEEXT in all cases except for
- *	special "change TX key index" operation which is indicated by setting
- *	key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY.
- *
- *	tx_seq/rx_seq are only used when respective
- *	IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal
- *	TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start
- *	TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally
- *	used only by an Authenticator (AP or an IBSS station) to get the
- *	current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and
- *	RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for
- *	debugging/testing.
- */
-struct	iw_encode_ext
-{
-	__u32		ext_flags; /* IW_ENCODE_EXT_* */
-	__u8		tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
-	__u8		rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
-	struct sockaddr	addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast
-			       * (group) keys or unicast address for
-			       * individual keys */
-	__u16		alg; /* IW_ENCODE_ALG_* */
-	__u16		key_len;
-	__u8		key[0];
-};
-
-/* SIOCSIWMLME data */
-struct	iw_mlme
-{
-	__u16		cmd; /* IW_MLME_* */
-	__u16		reason_code;
-	struct sockaddr	addr;
-};
-
-/* SIOCSIWPMKSA data */
-#define IW_PMKSA_ADD		1
-#define IW_PMKSA_REMOVE		2
-#define IW_PMKSA_FLUSH		3
-
-#define IW_PMKID_LEN	16
-
-struct	iw_pmksa
-{
-	__u32		cmd; /* IW_PMKSA_* */
-	struct sockaddr	bssid;
-	__u8		pmkid[IW_PMKID_LEN];
-};
-
-/* IWEVMICHAELMICFAILURE data */
-struct	iw_michaelmicfailure
-{
-	__u32		flags;
-	struct sockaddr	src_addr;
-	__u8		tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
-};
-
-/* IWEVPMKIDCAND data */
-#define IW_PMKID_CAND_PREAUTH	0x00000001 /* RNS pre-authentication enabled */
-struct	iw_pmkid_cand
-{
-	__u32		flags; /* IW_PMKID_CAND_* */
-	__u32		index; /* the smaller the index, the higher the
-				* priority */
-	struct sockaddr	bssid;
-};
-
-/* ------------------------ WIRELESS STATS ------------------------ */
-/*
- * Wireless statistics (used for /proc/net/wireless)
- */
-struct	iw_statistics
-{
-	__u16		status;		/* Status
-					 * - device dependent for now */
-
-	struct iw_quality	qual;		/* Quality of the link
-						 * (instant/mean/max) */
-	struct iw_discarded	discard;	/* Packet discarded counts */
-	struct iw_missed	miss;		/* Packet missed counts */
-};
-
-/* ------------------------ IOCTL REQUEST ------------------------ */
-/*
- * This structure defines the payload of an ioctl, and is used 
- * below.
- *
- * Note that this structure should fit on the memory footprint
- * of iwreq (which is the same as ifreq), which mean a max size of
- * 16 octets = 128 bits. Warning, pointers might be 64 bits wide...
- * You should check this when increasing the structures defined
- * above in this file...
- */
-union	iwreq_data
-{
-	/* Config - generic */
-	char		name[IFNAMSIZ];
-	/* Name : used to verify the presence of  wireless extensions.
-	 * Name of the protocol/provider... */
-
-	struct iw_point	essid;		/* Extended network name */
-	struct iw_param	nwid;		/* network id (or domain - the cell) */
-	struct iw_freq	freq;		/* frequency or channel :
-					 * 0-1000 = channel
-					 * > 1000 = frequency in Hz */
-
-	struct iw_param	sens;		/* signal level threshold */
-	struct iw_param	bitrate;	/* default bit rate */
-	struct iw_param	txpower;	/* default transmit power */
-	struct iw_param	rts;		/* RTS threshold threshold */
-	struct iw_param	frag;		/* Fragmentation threshold */
-	__u32		mode;		/* Operation mode */
-	struct iw_param	retry;		/* Retry limits & lifetime */
-
-	struct iw_point	encoding;	/* Encoding stuff : tokens */
-	struct iw_param	power;		/* PM duration/timeout */
-	struct iw_quality qual;		/* Quality part of statistics */
-
-	struct sockaddr	ap_addr;	/* Access point address */
-	struct sockaddr	addr;		/* Destination address (hw/mac) */
-
-	struct iw_param	param;		/* Other small parameters */
-	struct iw_point	data;		/* Other large parameters */
-};
-
-/*
- * The structure to exchange data for ioctl.
- * This structure is the same as 'struct ifreq', but (re)defined for
- * convenience...
- * Do I need to remind you about structure size (32 octets) ?
- */
-struct	iwreq 
-{
-	union
-	{
-		char	ifrn_name[IFNAMSIZ];	/* if name, e.g. "eth0" */
-	} ifr_ifrn;
-
-	/* Data part (defined just above) */
-	union	iwreq_data	u;
-};
-
-/* -------------------------- IOCTL DATA -------------------------- */
-/*
- *	For those ioctl which want to exchange mode data that what could
- *	fit in the above structure...
- */
-
-/*
- *	Range of parameters
- */
-
-struct	iw_range
-{
-	/* Informative stuff (to choose between different interface) */
-	__u32		throughput;	/* To give an idea... */
-	/* In theory this value should be the maximum benchmarked
-	 * TCP/IP throughput, because with most of these devices the
-	 * bit rate is meaningless (overhead an co) to estimate how
-	 * fast the connection will go and pick the fastest one.
-	 * I suggest people to play with Netperf or any benchmark...
-	 */
-
-	/* NWID (or domain id) */
-	__u32		min_nwid;	/* Minimal NWID we are able to set */
-	__u32		max_nwid;	/* Maximal NWID we are able to set */
-
-	/* Old Frequency (backward compat - moved lower ) */
-	__u16		old_num_channels;
-	__u8		old_num_frequency;
-
-	/* Scan capabilities */
-	__u8		scan_capa; 	/* IW_SCAN_CAPA_* bit field */
-
-	/* Wireless event capability bitmasks */
-	__u32		event_capa[6];
-
-	/* signal level threshold range */
-	__s32		sensitivity;
-
-	/* Quality of link & SNR stuff */
-	/* Quality range (link, level, noise)
-	 * If the quality is absolute, it will be in the range [0 ; max_qual],
-	 * if the quality is dBm, it will be in the range [max_qual ; 0].
-	 * Don't forget that we use 8 bit arithmetics... */
-	struct iw_quality	max_qual;	/* Quality of the link */
-	/* This should contain the average/typical values of the quality
-	 * indicator. This should be the threshold between a "good" and
-	 * a "bad" link (example : monitor going from green to orange).
-	 * Currently, user space apps like quality monitors don't have any
-	 * way to calibrate the measurement. With this, they can split
-	 * the range between 0 and max_qual in different quality level
-	 * (using a geometric subdivision centered on the average).
-	 * I expect that people doing the user space apps will feedback
-	 * us on which value we need to put in each driver... */
-	struct iw_quality	avg_qual;	/* Quality of the link */
-
-	/* Rates */
-	__u8		num_bitrates;	/* Number of entries in the list */
-	__s32		bitrate[IW_MAX_BITRATES];	/* list, in bps */
-
-	/* RTS threshold */
-	__s32		min_rts;	/* Minimal RTS threshold */
-	__s32		max_rts;	/* Maximal RTS threshold */
-
-	/* Frag threshold */
-	__s32		min_frag;	/* Minimal frag threshold */
-	__s32		max_frag;	/* Maximal frag threshold */
-
-	/* Power Management duration & timeout */
-	__s32		min_pmp;	/* Minimal PM period */
-	__s32		max_pmp;	/* Maximal PM period */
-	__s32		min_pmt;	/* Minimal PM timeout */
-	__s32		max_pmt;	/* Maximal PM timeout */
-	__u16		pmp_flags;	/* How to decode max/min PM period */
-	__u16		pmt_flags;	/* How to decode max/min PM timeout */
-	__u16		pm_capa;	/* What PM options are supported */
-
-	/* Encoder stuff */
-	__u16	encoding_size[IW_MAX_ENCODING_SIZES];	/* Different token sizes */
-	__u8	num_encoding_sizes;	/* Number of entry in the list */
-	__u8	max_encoding_tokens;	/* Max number of tokens */
-	/* For drivers that need a "login/passwd" form */
-	__u8	encoding_login_index;	/* token index for login token */
-
-	/* Transmit power */
-	__u16		txpower_capa;	/* What options are supported */
-	__u8		num_txpower;	/* Number of entries in the list */
-	__s32		txpower[IW_MAX_TXPOWER];	/* list, in bps */
-
-	/* Wireless Extension version info */
-	__u8		we_version_compiled;	/* Must be WIRELESS_EXT */
-	__u8		we_version_source;	/* Last update of source */
-
-	/* Retry limits and lifetime */
-	__u16		retry_capa;	/* What retry options are supported */
-	__u16		retry_flags;	/* How to decode max/min retry limit */
-	__u16		r_time_flags;	/* How to decode max/min retry life */
-	__s32		min_retry;	/* Minimal number of retries */
-	__s32		max_retry;	/* Maximal number of retries */
-	__s32		min_r_time;	/* Minimal retry lifetime */
-	__s32		max_r_time;	/* Maximal retry lifetime */
-
-	/* Frequency */
-	__u16		num_channels;	/* Number of channels [0; num - 1] */
-	__u8		num_frequency;	/* Number of entry in the list */
-	struct iw_freq	freq[IW_MAX_FREQUENCIES];	/* list */
-	/* Note : this frequency list doesn't need to fit channel numbers,
-	 * because each entry contain its channel index */
-
-	__u32		enc_capa;	/* IW_ENC_CAPA_* bit field */
-};
-
-/*
- * Private ioctl interface information
- */
- 
-struct	iw_priv_args
-{
-	__u32		cmd;		/* Number of the ioctl to issue */
-	__u16		set_args;	/* Type and number of args */
-	__u16		get_args;	/* Type and number of args */
-	char		name[IFNAMSIZ];	/* Name of the extension */
-};
-
-/* ----------------------- WIRELESS EVENTS ----------------------- */
-/*
- * Wireless events are carried through the rtnetlink socket to user
- * space. They are encapsulated in the IFLA_WIRELESS field of
- * a RTM_NEWLINK message.
- */
-
-/*
- * A Wireless Event. Contains basically the same data as the ioctl...
- */
-struct iw_event
-{
-	__u16		len;			/* Real length of this stuff */
-	__u16		cmd;			/* Wireless IOCTL */
-	union iwreq_data	u;		/* IOCTL fixed payload */
-};
-
-/* Size of the Event prefix (including padding and alignement junk) */
-#define IW_EV_LCP_LEN	(sizeof(struct iw_event) - sizeof(union iwreq_data))
-/* Size of the various events */
-#define IW_EV_CHAR_LEN	(IW_EV_LCP_LEN + IFNAMSIZ)
-#define IW_EV_UINT_LEN	(IW_EV_LCP_LEN + sizeof(__u32))
-#define IW_EV_FREQ_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_freq))
-#define IW_EV_PARAM_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_param))
-#define IW_EV_ADDR_LEN	(IW_EV_LCP_LEN + sizeof(struct sockaddr))
-#define IW_EV_QUAL_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_quality))
-
-/* iw_point events are special. First, the payload (extra data) come at
- * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second,
- * we omit the pointer, so start at an offset. */
-#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \
-			  (char *) NULL)
-#define IW_EV_POINT_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_point) - \
-			 IW_EV_POINT_OFF)
-
-
-/* Size of the Event prefix when packed in stream */
-#define IW_EV_LCP_PK_LEN	(4)
-/* Size of the various events when packed in stream */
-#define IW_EV_CHAR_PK_LEN	(IW_EV_LCP_PK_LEN + IFNAMSIZ)
-#define IW_EV_UINT_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(__u32))
-#define IW_EV_FREQ_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_freq))
-#define IW_EV_PARAM_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_param))
-#define IW_EV_ADDR_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct sockaddr))
-#define IW_EV_QUAL_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_quality))
-#define IW_EV_POINT_PK_LEN	(IW_EV_LCP_PK_LEN + 4)
-
-#endif /* _LINUX_WIRELESS_H */
diff --git a/openflow/usr/include/linux/x25.h b/openflow/usr/include/linux/x25.h
deleted file mode 100644
index 810cce6..0000000
--- a/openflow/usr/include/linux/x25.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * These are the public elements of the Linux kernel X.25 implementation.
- *
- * 	History
- *	mar/20/00	Daniela Squassoni Disabling/enabling of facilities 
- *					  negotiation.
- *	apr/02/05	Shaun Pereira Selective sub address matching with
- *					call user data
- */
-
-#ifndef	X25_KERNEL_H
-#define	X25_KERNEL_H
-
-#include <linux/types.h>
-#include <linux/socket.h>
-
-#define	SIOCX25GSUBSCRIP	(SIOCPROTOPRIVATE + 0)
-#define	SIOCX25SSUBSCRIP	(SIOCPROTOPRIVATE + 1)
-#define	SIOCX25GFACILITIES	(SIOCPROTOPRIVATE + 2)
-#define	SIOCX25SFACILITIES	(SIOCPROTOPRIVATE + 3)
-#define	SIOCX25GCALLUSERDATA	(SIOCPROTOPRIVATE + 4)
-#define	SIOCX25SCALLUSERDATA	(SIOCPROTOPRIVATE + 5)
-#define	SIOCX25GCAUSEDIAG	(SIOCPROTOPRIVATE + 6)
-#define SIOCX25SCUDMATCHLEN	(SIOCPROTOPRIVATE + 7)
-#define SIOCX25CALLACCPTAPPRV   (SIOCPROTOPRIVATE + 8)
-#define SIOCX25SENDCALLACCPT    (SIOCPROTOPRIVATE + 9)
-#define SIOCX25GDTEFACILITIES (SIOCPROTOPRIVATE + 10)
-#define SIOCX25SDTEFACILITIES (SIOCPROTOPRIVATE + 11)
-#define SIOCX25SCAUSEDIAG	(SIOCPROTOPRIVATE + 12)
-
-/*
- *	Values for {get,set}sockopt.
- */
-#define	X25_QBITINCL		1
-
-/*
- *	X.25 Packet Size values.
- */
-#define	X25_PS16		4
-#define	X25_PS32		5
-#define	X25_PS64		6
-#define	X25_PS128		7
-#define	X25_PS256		8
-#define	X25_PS512		9
-#define	X25_PS1024		10
-#define	X25_PS2048		11
-#define	X25_PS4096		12
-
-/*
- * An X.121 address, it is held as ASCII text, null terminated, up to 15
- * digits and a null terminator.
- */
-struct x25_address {
-	char x25_addr[16];
-};
-
-/*
- *	Linux X.25 Address structure, used for bind, and connect mostly.
- */
-struct sockaddr_x25 {
-	__kernel_sa_family_t sx25_family;	/* Must be AF_X25 */
-	struct x25_address sx25_addr;		/* X.121 Address */
-};
-
-/*
- *	DTE/DCE subscription options.
- *
- *      As this is missing lots of options, user should expect major
- *	changes of this structure in 2.5.x which might break compatibilty.
- *      The somewhat ugly dimension 200-sizeof() is needed to maintain
- *	backward compatibility.
- */
-struct x25_subscrip_struct {
-	char device[200-sizeof(unsigned long)];
-	unsigned long	global_facil_mask;	/* 0 to disable negotiation */
-	unsigned int	extended;
-};
-
-/* values for above global_facil_mask */
-
-#define	X25_MASK_REVERSE	0x01	
-#define	X25_MASK_THROUGHPUT	0x02
-#define	X25_MASK_PACKET_SIZE	0x04
-#define	X25_MASK_WINDOW_SIZE	0x08
-
-#define X25_MASK_CALLING_AE 0x10
-#define X25_MASK_CALLED_AE 0x20
-
-
-/*
- *	Routing table control structure.
- */
-struct x25_route_struct {
-	struct x25_address address;
-	unsigned int	   sigdigits;
-	char		   device[200];
-};
-
-/*
- *	Facilities structure.
- */
-struct x25_facilities {
-	unsigned int	winsize_in, winsize_out;
-	unsigned int	pacsize_in, pacsize_out;
-	unsigned int	throughput;
-	unsigned int	reverse;
-};
-
-/*
-* ITU DTE facilities
-* Only the called and calling address
-* extension are currently implemented.
-* The rest are in place to avoid the struct
-* changing size if someone needs them later
-*/
-
-struct x25_dte_facilities {
-	__u16 delay_cumul;
-	__u16 delay_target;
-	__u16 delay_max;
-	__u8 min_throughput;
-	__u8 expedited;
-	__u8 calling_len;
-	__u8 called_len;
-	__u8 calling_ae[20];
-	__u8 called_ae[20];
-};
-
-/*
- *	Call User Data structure.
- */
-struct x25_calluserdata {
-	unsigned int	cudlength;
-	unsigned char	cuddata[128];
-};
-
-/*
- *	Call clearing Cause and Diagnostic structure.
- */
-struct x25_causediag {
-	unsigned char	cause;
-	unsigned char	diagnostic;
-};
-
-/*
- *	Further optional call user data match length selection
- */
-struct x25_subaddr {
-	unsigned int cudmatchlength;
-};
-
-#endif
diff --git a/openflow/usr/include/linux/xattr.h b/openflow/usr/include/linux/xattr.h
deleted file mode 100644
index 2634d03..0000000
--- a/openflow/usr/include/linux/xattr.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-  File: linux/xattr.h
-
-  Extended attributes handling.
-
-  Copyright (C) 2001 by Andreas Gruenbacher <a.gruenbacher@computer.org>
-  Copyright (c) 2001-2002 Silicon Graphics, Inc.  All Rights Reserved.
-  Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com>
-*/
-
-#include <linux/libc-compat.h>
-
-#ifndef _LINUX_XATTR_H
-#define _LINUX_XATTR_H
-
-#if __UAPI_DEF_XATTR
-#define __USE_KERNEL_XATTR_DEFS
-
-#define XATTR_CREATE	0x1	/* set value, fail if attr already exists */
-#define XATTR_REPLACE	0x2	/* set value, fail if attr does not exist */
-#endif
-
-/* Namespaces */
-#define XATTR_OS2_PREFIX "os2."
-#define XATTR_OS2_PREFIX_LEN (sizeof(XATTR_OS2_PREFIX) - 1)
-
-#define XATTR_MAC_OSX_PREFIX "osx."
-#define XATTR_MAC_OSX_PREFIX_LEN (sizeof(XATTR_MAC_OSX_PREFIX) - 1)
-
-#define XATTR_BTRFS_PREFIX "btrfs."
-#define XATTR_BTRFS_PREFIX_LEN (sizeof(XATTR_BTRFS_PREFIX) - 1)
-
-#define XATTR_SECURITY_PREFIX	"security."
-#define XATTR_SECURITY_PREFIX_LEN (sizeof(XATTR_SECURITY_PREFIX) - 1)
-
-#define XATTR_SYSTEM_PREFIX "system."
-#define XATTR_SYSTEM_PREFIX_LEN (sizeof(XATTR_SYSTEM_PREFIX) - 1)
-
-#define XATTR_TRUSTED_PREFIX "trusted."
-#define XATTR_TRUSTED_PREFIX_LEN (sizeof(XATTR_TRUSTED_PREFIX) - 1)
-
-#define XATTR_USER_PREFIX "user."
-#define XATTR_USER_PREFIX_LEN (sizeof(XATTR_USER_PREFIX) - 1)
-
-/* Security namespace */
-#define XATTR_EVM_SUFFIX "evm"
-#define XATTR_NAME_EVM XATTR_SECURITY_PREFIX XATTR_EVM_SUFFIX
-
-#define XATTR_IMA_SUFFIX "ima"
-#define XATTR_NAME_IMA XATTR_SECURITY_PREFIX XATTR_IMA_SUFFIX
-
-#define XATTR_SELINUX_SUFFIX "selinux"
-#define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX
-
-#define XATTR_SMACK_SUFFIX "SMACK64"
-#define XATTR_SMACK_IPIN "SMACK64IPIN"
-#define XATTR_SMACK_IPOUT "SMACK64IPOUT"
-#define XATTR_SMACK_EXEC "SMACK64EXEC"
-#define XATTR_SMACK_TRANSMUTE "SMACK64TRANSMUTE"
-#define XATTR_SMACK_MMAP "SMACK64MMAP"
-#define XATTR_NAME_SMACK XATTR_SECURITY_PREFIX XATTR_SMACK_SUFFIX
-#define XATTR_NAME_SMACKIPIN	XATTR_SECURITY_PREFIX XATTR_SMACK_IPIN
-#define XATTR_NAME_SMACKIPOUT	XATTR_SECURITY_PREFIX XATTR_SMACK_IPOUT
-#define XATTR_NAME_SMACKEXEC	XATTR_SECURITY_PREFIX XATTR_SMACK_EXEC
-#define XATTR_NAME_SMACKTRANSMUTE XATTR_SECURITY_PREFIX XATTR_SMACK_TRANSMUTE
-#define XATTR_NAME_SMACKMMAP XATTR_SECURITY_PREFIX XATTR_SMACK_MMAP
-
-#define XATTR_CAPS_SUFFIX "capability"
-#define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX
-
-#define XATTR_POSIX_ACL_ACCESS  "posix_acl_access"
-#define XATTR_NAME_POSIX_ACL_ACCESS XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_ACCESS
-#define XATTR_POSIX_ACL_DEFAULT  "posix_acl_default"
-#define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
-
-
-#endif /* _LINUX_XATTR_H */
diff --git a/openflow/usr/include/linux/xfrm.h b/openflow/usr/include/linux/xfrm.h
deleted file mode 100644
index b8f5451..0000000
--- a/openflow/usr/include/linux/xfrm.h
+++ /dev/null
@@ -1,526 +0,0 @@
-#ifndef _LINUX_XFRM_H
-#define _LINUX_XFRM_H
-
-#include <linux/in6.h>
-#include <linux/types.h>
-
-/* All of the structures in this file may not change size as they are
- * passed into the kernel from userspace via netlink sockets.
- */
-
-/* Structure to encapsulate addresses. I do not want to use
- * "standard" structure. My apologies.
- */
-typedef union {
-	__be32		a4;
-	__be32		a6[4];
-	struct in6_addr	in6;
-} xfrm_address_t;
-
-/* Ident of a specific xfrm_state. It is used on input to lookup
- * the state by (spi,daddr,ah/esp) or to store information about
- * spi, protocol and tunnel address on output.
- */
-struct xfrm_id {
-	xfrm_address_t	daddr;
-	__be32		spi;
-	__u8		proto;
-};
-
-struct xfrm_sec_ctx {
-	__u8	ctx_doi;
-	__u8	ctx_alg;
-	__u16	ctx_len;
-	__u32	ctx_sid;
-	char	ctx_str[0];
-};
-
-/* Security Context Domains of Interpretation */
-#define XFRM_SC_DOI_RESERVED 0
-#define XFRM_SC_DOI_LSM 1
-
-/* Security Context Algorithms */
-#define XFRM_SC_ALG_RESERVED 0
-#define XFRM_SC_ALG_SELINUX 1
-
-/* Selector, used as selector both on policy rules (SPD) and SAs. */
-
-struct xfrm_selector {
-	xfrm_address_t	daddr;
-	xfrm_address_t	saddr;
-	__be16	dport;
-	__be16	dport_mask;
-	__be16	sport;
-	__be16	sport_mask;
-	__u16	family;
-	__u8	prefixlen_d;
-	__u8	prefixlen_s;
-	__u8	proto;
-	int	ifindex;
-	__kernel_uid32_t	user;
-};
-
-#define XFRM_INF (~(__u64)0)
-
-struct xfrm_lifetime_cfg {
-	__u64	soft_byte_limit;
-	__u64	hard_byte_limit;
-	__u64	soft_packet_limit;
-	__u64	hard_packet_limit;
-	__u64	soft_add_expires_seconds;
-	__u64	hard_add_expires_seconds;
-	__u64	soft_use_expires_seconds;
-	__u64	hard_use_expires_seconds;
-};
-
-struct xfrm_lifetime_cur {
-	__u64	bytes;
-	__u64	packets;
-	__u64	add_time;
-	__u64	use_time;
-};
-
-struct xfrm_replay_state {
-	__u32	oseq;
-	__u32	seq;
-	__u32	bitmap;
-};
-
-#define XFRMA_REPLAY_ESN_MAX	4096
-
-struct xfrm_replay_state_esn {
-	unsigned int	bmp_len;
-	__u32		oseq;
-	__u32		seq;
-	__u32		oseq_hi;
-	__u32		seq_hi;
-	__u32		replay_window;
-	__u32		bmp[0];
-};
-
-struct xfrm_algo {
-	char		alg_name[64];
-	unsigned int	alg_key_len;    /* in bits */
-	char		alg_key[0];
-};
-
-struct xfrm_algo_auth {
-	char		alg_name[64];
-	unsigned int	alg_key_len;    /* in bits */
-	unsigned int	alg_trunc_len;  /* in bits */
-	char		alg_key[0];
-};
-
-struct xfrm_algo_aead {
-	char		alg_name[64];
-	unsigned int	alg_key_len;	/* in bits */
-	unsigned int	alg_icv_len;	/* in bits */
-	char		alg_key[0];
-};
-
-struct xfrm_stats {
-	__u32	replay_window;
-	__u32	replay;
-	__u32	integrity_failed;
-};
-
-enum {
-	XFRM_POLICY_TYPE_MAIN	= 0,
-	XFRM_POLICY_TYPE_SUB	= 1,
-	XFRM_POLICY_TYPE_MAX	= 2,
-	XFRM_POLICY_TYPE_ANY	= 255
-};
-
-enum {
-	XFRM_POLICY_IN	= 0,
-	XFRM_POLICY_OUT	= 1,
-	XFRM_POLICY_FWD	= 2,
-	XFRM_POLICY_MASK = 3,
-	XFRM_POLICY_MAX	= 3
-};
-
-enum {
-	XFRM_SHARE_ANY,		/* No limitations */
-	XFRM_SHARE_SESSION,	/* For this session only */
-	XFRM_SHARE_USER,	/* For this user only */
-	XFRM_SHARE_UNIQUE	/* Use once */
-};
-
-#define XFRM_MODE_TRANSPORT 0
-#define XFRM_MODE_TUNNEL 1
-#define XFRM_MODE_ROUTEOPTIMIZATION 2
-#define XFRM_MODE_IN_TRIGGER 3
-#define XFRM_MODE_BEET 4
-#define XFRM_MODE_MAX 5
-
-/* Netlink configuration messages.  */
-enum {
-	XFRM_MSG_BASE = 0x10,
-
-	XFRM_MSG_NEWSA = 0x10,
-#define XFRM_MSG_NEWSA XFRM_MSG_NEWSA
-	XFRM_MSG_DELSA,
-#define XFRM_MSG_DELSA XFRM_MSG_DELSA
-	XFRM_MSG_GETSA,
-#define XFRM_MSG_GETSA XFRM_MSG_GETSA
-
-	XFRM_MSG_NEWPOLICY,
-#define XFRM_MSG_NEWPOLICY XFRM_MSG_NEWPOLICY
-	XFRM_MSG_DELPOLICY,
-#define XFRM_MSG_DELPOLICY XFRM_MSG_DELPOLICY
-	XFRM_MSG_GETPOLICY,
-#define XFRM_MSG_GETPOLICY XFRM_MSG_GETPOLICY
-
-	XFRM_MSG_ALLOCSPI,
-#define XFRM_MSG_ALLOCSPI XFRM_MSG_ALLOCSPI
-	XFRM_MSG_ACQUIRE,
-#define XFRM_MSG_ACQUIRE XFRM_MSG_ACQUIRE
-	XFRM_MSG_EXPIRE,
-#define XFRM_MSG_EXPIRE XFRM_MSG_EXPIRE
-
-	XFRM_MSG_UPDPOLICY,
-#define XFRM_MSG_UPDPOLICY XFRM_MSG_UPDPOLICY
-	XFRM_MSG_UPDSA,
-#define XFRM_MSG_UPDSA XFRM_MSG_UPDSA
-
-	XFRM_MSG_POLEXPIRE,
-#define XFRM_MSG_POLEXPIRE XFRM_MSG_POLEXPIRE
-
-	XFRM_MSG_FLUSHSA,
-#define XFRM_MSG_FLUSHSA XFRM_MSG_FLUSHSA
-	XFRM_MSG_FLUSHPOLICY,
-#define XFRM_MSG_FLUSHPOLICY XFRM_MSG_FLUSHPOLICY
-
-	XFRM_MSG_NEWAE,
-#define XFRM_MSG_NEWAE XFRM_MSG_NEWAE
-	XFRM_MSG_GETAE,
-#define XFRM_MSG_GETAE XFRM_MSG_GETAE
-
-	XFRM_MSG_REPORT,
-#define XFRM_MSG_REPORT XFRM_MSG_REPORT
-
-	XFRM_MSG_MIGRATE,
-#define XFRM_MSG_MIGRATE XFRM_MSG_MIGRATE
-
-	XFRM_MSG_NEWSADINFO,
-#define XFRM_MSG_NEWSADINFO XFRM_MSG_NEWSADINFO
-	XFRM_MSG_GETSADINFO,
-#define XFRM_MSG_GETSADINFO XFRM_MSG_GETSADINFO
-
-	XFRM_MSG_NEWSPDINFO,
-#define XFRM_MSG_NEWSPDINFO XFRM_MSG_NEWSPDINFO
-	XFRM_MSG_GETSPDINFO,
-#define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO
-
-	XFRM_MSG_MAPPING,
-#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
-	__XFRM_MSG_MAX
-};
-#define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
-
-#define XFRM_NR_MSGTYPES (XFRM_MSG_MAX + 1 - XFRM_MSG_BASE)
-
-/*
- * Generic LSM security context for comunicating to user space
- * NOTE: Same format as sadb_x_sec_ctx
- */
-struct xfrm_user_sec_ctx {
-	__u16			len;
-	__u16			exttype;
-	__u8			ctx_alg;  /* LSMs: e.g., selinux == 1 */
-	__u8			ctx_doi;
-	__u16			ctx_len;
-};
-
-struct xfrm_user_tmpl {
-	struct xfrm_id		id;
-	__u16			family;
-	xfrm_address_t		saddr;
-	__u32			reqid;
-	__u8			mode;
-	__u8			share;
-	__u8			optional;
-	__u32			aalgos;
-	__u32			ealgos;
-	__u32			calgos;
-};
-
-struct xfrm_encap_tmpl {
-	__u16		encap_type;
-	__be16		encap_sport;
-	__be16		encap_dport;
-	xfrm_address_t	encap_oa;
-};
-
-/* AEVENT flags  */
-enum xfrm_ae_ftype_t {
-	XFRM_AE_UNSPEC,
-	XFRM_AE_RTHR=1,	/* replay threshold*/
-	XFRM_AE_RVAL=2, /* replay value */
-	XFRM_AE_LVAL=4, /* lifetime value */
-	XFRM_AE_ETHR=8, /* expiry timer threshold */
-	XFRM_AE_CR=16, /* Event cause is replay update */
-	XFRM_AE_CE=32, /* Event cause is timer expiry */
-	XFRM_AE_CU=64, /* Event cause is policy update */
-	__XFRM_AE_MAX
-
-#define XFRM_AE_MAX (__XFRM_AE_MAX - 1)
-};
-
-struct xfrm_userpolicy_type {
-	__u8		type;
-	__u16		reserved1;
-	__u8		reserved2;
-};
-
-/* Netlink message attributes.  */
-enum xfrm_attr_type_t {
-	XFRMA_UNSPEC,
-	XFRMA_ALG_AUTH,		/* struct xfrm_algo */
-	XFRMA_ALG_CRYPT,	/* struct xfrm_algo */
-	XFRMA_ALG_COMP,		/* struct xfrm_algo */
-	XFRMA_ENCAP,		/* struct xfrm_algo + struct xfrm_encap_tmpl */
-	XFRMA_TMPL,		/* 1 or more struct xfrm_user_tmpl */
-	XFRMA_SA,		/* struct xfrm_usersa_info  */
-	XFRMA_POLICY,		/*struct xfrm_userpolicy_info */
-	XFRMA_SEC_CTX,		/* struct xfrm_sec_ctx */
-	XFRMA_LTIME_VAL,
-	XFRMA_REPLAY_VAL,
-	XFRMA_REPLAY_THRESH,
-	XFRMA_ETIMER_THRESH,
-	XFRMA_SRCADDR,		/* xfrm_address_t */
-	XFRMA_COADDR,		/* xfrm_address_t */
-	XFRMA_LASTUSED,		/* unsigned long  */
-	XFRMA_POLICY_TYPE,	/* struct xfrm_userpolicy_type */
-	XFRMA_MIGRATE,
-	XFRMA_ALG_AEAD,		/* struct xfrm_algo_aead */
-	XFRMA_KMADDRESS,        /* struct xfrm_user_kmaddress */
-	XFRMA_ALG_AUTH_TRUNC,	/* struct xfrm_algo_auth */
-	XFRMA_MARK,		/* struct xfrm_mark */
-	XFRMA_TFCPAD,		/* __u32 */
-	XFRMA_REPLAY_ESN_VAL,	/* struct xfrm_replay_esn */
-	XFRMA_SA_EXTRA_FLAGS,	/* __u32 */
-	XFRMA_PROTO,		/* __u8 */
-	XFRMA_ADDRESS_FILTER,	/* struct xfrm_address_filter */
-	__XFRMA_MAX
-
-#define XFRMA_MAX (__XFRMA_MAX - 1)
-};
-
-struct xfrm_mark {
-	__u32           v; /* value */
-	__u32           m; /* mask */
-};
-
-enum xfrm_sadattr_type_t {
-	XFRMA_SAD_UNSPEC,
-	XFRMA_SAD_CNT,
-	XFRMA_SAD_HINFO,
-	__XFRMA_SAD_MAX
-
-#define XFRMA_SAD_MAX (__XFRMA_SAD_MAX - 1)
-};
-
-struct xfrmu_sadhinfo {
-	__u32 sadhcnt; /* current hash bkts */
-	__u32 sadhmcnt; /* max allowed hash bkts */
-};
-
-enum xfrm_spdattr_type_t {
-	XFRMA_SPD_UNSPEC,
-	XFRMA_SPD_INFO,
-	XFRMA_SPD_HINFO,
-	XFRMA_SPD_IPV4_HTHRESH,
-	XFRMA_SPD_IPV6_HTHRESH,
-	__XFRMA_SPD_MAX
-
-#define XFRMA_SPD_MAX (__XFRMA_SPD_MAX - 1)
-};
-
-struct xfrmu_spdinfo {
-	__u32 incnt;
-	__u32 outcnt;
-	__u32 fwdcnt;
-	__u32 inscnt;
-	__u32 outscnt;
-	__u32 fwdscnt;
-};
-
-struct xfrmu_spdhinfo {
-	__u32 spdhcnt;
-	__u32 spdhmcnt;
-};
-
-struct xfrmu_spdhthresh {
-	__u8 lbits;
-	__u8 rbits;
-};
-
-struct xfrm_usersa_info {
-	struct xfrm_selector		sel;
-	struct xfrm_id			id;
-	xfrm_address_t			saddr;
-	struct xfrm_lifetime_cfg	lft;
-	struct xfrm_lifetime_cur	curlft;
-	struct xfrm_stats		stats;
-	__u32				seq;
-	__u32				reqid;
-	__u16				family;
-	__u8				mode;		/* XFRM_MODE_xxx */
-	__u8				replay_window;
-	__u8				flags;
-#define XFRM_STATE_NOECN	1
-#define XFRM_STATE_DECAP_DSCP	2
-#define XFRM_STATE_NOPMTUDISC	4
-#define XFRM_STATE_WILDRECV	8
-#define XFRM_STATE_ICMP		16
-#define XFRM_STATE_AF_UNSPEC	32
-#define XFRM_STATE_ALIGN4	64
-#define XFRM_STATE_ESN		128
-};
-
-#define XFRM_SA_XFLAG_DONT_ENCAP_DSCP	1
-
-struct xfrm_usersa_id {
-	xfrm_address_t			daddr;
-	__be32				spi;
-	__u16				family;
-	__u8				proto;
-};
-
-struct xfrm_aevent_id {
-	struct xfrm_usersa_id		sa_id;
-	xfrm_address_t			saddr;
-	__u32				flags;
-	__u32				reqid;
-};
-
-struct xfrm_userspi_info {
-	struct xfrm_usersa_info		info;
-	__u32				min;
-	__u32				max;
-};
-
-struct xfrm_userpolicy_info {
-	struct xfrm_selector		sel;
-	struct xfrm_lifetime_cfg	lft;
-	struct xfrm_lifetime_cur	curlft;
-	__u32				priority;
-	__u32				index;
-	__u8				dir;
-	__u8				action;
-#define XFRM_POLICY_ALLOW	0
-#define XFRM_POLICY_BLOCK	1
-	__u8				flags;
-#define XFRM_POLICY_LOCALOK	1	/* Allow user to override global policy */
-	/* Automatically expand selector to include matching ICMP payloads. */
-#define XFRM_POLICY_ICMP	2
-	__u8				share;
-};
-
-struct xfrm_userpolicy_id {
-	struct xfrm_selector		sel;
-	__u32				index;
-	__u8				dir;
-};
-
-struct xfrm_user_acquire {
-	struct xfrm_id			id;
-	xfrm_address_t			saddr;
-	struct xfrm_selector		sel;
-	struct xfrm_userpolicy_info	policy;
-	__u32				aalgos;
-	__u32				ealgos;
-	__u32				calgos;
-	__u32				seq;
-};
-
-struct xfrm_user_expire {
-	struct xfrm_usersa_info		state;
-	__u8				hard;
-};
-
-struct xfrm_user_polexpire {
-	struct xfrm_userpolicy_info	pol;
-	__u8				hard;
-};
-
-struct xfrm_usersa_flush {
-	__u8				proto;
-};
-
-struct xfrm_user_report {
-	__u8				proto;
-	struct xfrm_selector		sel;
-};
-
-/* Used by MIGRATE to pass addresses IKE should use to perform
- * SA negotiation with the peer */
-struct xfrm_user_kmaddress {
-	xfrm_address_t                  local;
-	xfrm_address_t                  remote;
-	__u32				reserved;
-	__u16				family;
-};
-
-struct xfrm_user_migrate {
-	xfrm_address_t			old_daddr;
-	xfrm_address_t			old_saddr;
-	xfrm_address_t			new_daddr;
-	xfrm_address_t			new_saddr;
-	__u8				proto;
-	__u8				mode;
-	__u16				reserved;
-	__u32				reqid;
-	__u16				old_family;
-	__u16				new_family;
-};
-
-struct xfrm_user_mapping {
-	struct xfrm_usersa_id		id;
-	__u32				reqid;
-	xfrm_address_t			old_saddr;
-	xfrm_address_t			new_saddr;
-	__be16				old_sport;
-	__be16				new_sport;
-};
-
-struct xfrm_address_filter {
-	xfrm_address_t			saddr;
-	xfrm_address_t			daddr;
-	__u16				family;
-	__u8				splen;
-	__u8				dplen;
-};
-
-/* backwards compatibility for userspace */
-#define XFRMGRP_ACQUIRE		1
-#define XFRMGRP_EXPIRE		2
-#define XFRMGRP_SA		4
-#define XFRMGRP_POLICY		8
-#define XFRMGRP_REPORT		0x20
-
-enum xfrm_nlgroups {
-	XFRMNLGRP_NONE,
-#define XFRMNLGRP_NONE		XFRMNLGRP_NONE
-	XFRMNLGRP_ACQUIRE,
-#define XFRMNLGRP_ACQUIRE	XFRMNLGRP_ACQUIRE
-	XFRMNLGRP_EXPIRE,
-#define XFRMNLGRP_EXPIRE	XFRMNLGRP_EXPIRE
-	XFRMNLGRP_SA,
-#define XFRMNLGRP_SA		XFRMNLGRP_SA
-	XFRMNLGRP_POLICY,
-#define XFRMNLGRP_POLICY	XFRMNLGRP_POLICY
-	XFRMNLGRP_AEVENTS,
-#define XFRMNLGRP_AEVENTS	XFRMNLGRP_AEVENTS
-	XFRMNLGRP_REPORT,
-#define XFRMNLGRP_REPORT	XFRMNLGRP_REPORT
-	XFRMNLGRP_MIGRATE,
-#define XFRMNLGRP_MIGRATE	XFRMNLGRP_MIGRATE
-	XFRMNLGRP_MAPPING,
-#define XFRMNLGRP_MAPPING	XFRMNLGRP_MAPPING
-	__XFRMNLGRP_MAX
-};
-#define XFRMNLGRP_MAX	(__XFRMNLGRP_MAX - 1)
-
-#endif /* _LINUX_XFRM_H */
diff --git a/openflow/usr/include/linux/xilinx-v4l2-controls.h b/openflow/usr/include/linux/xilinx-v4l2-controls.h
deleted file mode 100644
index fb495b9..0000000
--- a/openflow/usr/include/linux/xilinx-v4l2-controls.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Xilinx Controls Header
- *
- * Copyright (C) 2013-2015 Ideas on Board
- * Copyright (C) 2013-2015 Xilinx, Inc.
- *
- * Contacts: Hyun Kwon <hyun.kwon@xilinx.com>
- *           Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __UAPI_XILINX_V4L2_CONTROLS_H__
-#define __UAPI_XILINX_V4L2_CONTROLS_H__
-
-#include <linux/v4l2-controls.h>
-
-#define V4L2_CID_XILINX_OFFSET	0xc000
-#define V4L2_CID_XILINX_BASE	(V4L2_CID_USER_BASE + V4L2_CID_XILINX_OFFSET)
-
-/*
- * Private Controls for Xilinx Video IPs
- */
-
-/*
- * Xilinx TPG Video IP
- */
-
-#define V4L2_CID_XILINX_TPG			(V4L2_CID_USER_BASE + 0xc000)
-
-/* Draw cross hairs */
-#define V4L2_CID_XILINX_TPG_CROSS_HAIRS		(V4L2_CID_XILINX_TPG + 1)
-/* Enable a moving box */
-#define V4L2_CID_XILINX_TPG_MOVING_BOX		(V4L2_CID_XILINX_TPG + 2)
-/* Mask out a color component */
-#define V4L2_CID_XILINX_TPG_COLOR_MASK		(V4L2_CID_XILINX_TPG + 3)
-/* Enable a stuck pixel feature */
-#define V4L2_CID_XILINX_TPG_STUCK_PIXEL		(V4L2_CID_XILINX_TPG + 4)
-/* Enable a noisy output */
-#define V4L2_CID_XILINX_TPG_NOISE		(V4L2_CID_XILINX_TPG + 5)
-/* Enable the motion feature */
-#define V4L2_CID_XILINX_TPG_MOTION		(V4L2_CID_XILINX_TPG + 6)
-/* Configure the motion speed of moving patterns */
-#define V4L2_CID_XILINX_TPG_MOTION_SPEED	(V4L2_CID_XILINX_TPG + 7)
-/* The row of horizontal cross hair location */
-#define V4L2_CID_XILINX_TPG_CROSS_HAIR_ROW	(V4L2_CID_XILINX_TPG + 8)
-/* The colum of vertical cross hair location */
-#define V4L2_CID_XILINX_TPG_CROSS_HAIR_COLUMN	(V4L2_CID_XILINX_TPG + 9)
-/* Set starting point of sine wave for horizontal component */
-#define V4L2_CID_XILINX_TPG_ZPLATE_HOR_START	(V4L2_CID_XILINX_TPG + 10)
-/* Set speed of the horizontal component */
-#define V4L2_CID_XILINX_TPG_ZPLATE_HOR_SPEED	(V4L2_CID_XILINX_TPG + 11)
-/* Set starting point of sine wave for vertical component */
-#define V4L2_CID_XILINX_TPG_ZPLATE_VER_START	(V4L2_CID_XILINX_TPG + 12)
-/* Set speed of the vertical component */
-#define V4L2_CID_XILINX_TPG_ZPLATE_VER_SPEED	(V4L2_CID_XILINX_TPG + 13)
-/* Moving box size */
-#define V4L2_CID_XILINX_TPG_BOX_SIZE		(V4L2_CID_XILINX_TPG + 14)
-/* Moving box color */
-#define V4L2_CID_XILINX_TPG_BOX_COLOR		(V4L2_CID_XILINX_TPG + 15)
-/* Upper limit count of generated stuck pixels */
-#define V4L2_CID_XILINX_TPG_STUCK_PIXEL_THRESH	(V4L2_CID_XILINX_TPG + 16)
-/* Noise level */
-#define V4L2_CID_XILINX_TPG_NOISE_GAIN		(V4L2_CID_XILINX_TPG + 17)
-
-#endif /* __UAPI_XILINX_V4L2_CONTROLS_H__ */
diff --git a/openflow/usr/include/linux/zorro.h b/openflow/usr/include/linux/zorro.h
deleted file mode 100644
index 2a26edf..0000000
--- a/openflow/usr/include/linux/zorro.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  linux/zorro.h -- Amiga AutoConfig (Zorro) Bus Definitions
- *
- *  Copyright (C) 1995--2003 Geert Uytterhoeven
- *
- *  This file is subject to the terms and conditions of the GNU General Public
- *  License.  See the file COPYING in the main directory of this archive
- *  for more details.
- */
-
-#ifndef _LINUX_ZORRO_H
-#define _LINUX_ZORRO_H
-
-#include <linux/types.h>
-
-
-    /*
-     *  Each Zorro board has a 32-bit ID of the form
-     *
-     *      mmmmmmmmmmmmmmmmppppppppeeeeeeee
-     *
-     *  with
-     *
-     *      mmmmmmmmmmmmmmmm	16-bit Manufacturer ID (assigned by CBM (sigh))
-     *      pppppppp		8-bit Product ID (assigned by manufacturer)
-     *      eeeeeeee		8-bit Extended Product ID (currently only used
-     *				for some GVP boards)
-     */
-
-
-#define ZORRO_MANUF(id)		((id) >> 16)
-#define ZORRO_PROD(id)		(((id) >> 8) & 0xff)
-#define ZORRO_EPC(id)		((id) & 0xff)
-
-#define ZORRO_ID(manuf, prod, epc) \
-	((ZORRO_MANUF_##manuf << 16) | ((prod) << 8) | (epc))
-
-typedef __u32 zorro_id;
-
-
-/* Include the ID list */
-#include <linux/zorro_ids.h>
-
-
-    /*
-     *  GVP identifies most of its products through the 'extended product code'
-     *  (epc). The epc has to be ANDed with the GVP_PRODMASK before the
-     *  identification.
-     */
-
-#define GVP_PRODMASK		(0xf8)
-#define GVP_SCSICLKMASK		(0x01)
-
-enum GVP_flags {
-	GVP_IO			= 0x01,
-	GVP_ACCEL		= 0x02,
-	GVP_SCSI		= 0x04,
-	GVP_24BITDMA		= 0x08,
-	GVP_25BITDMA		= 0x10,
-	GVP_NOBANK		= 0x20,
-	GVP_14MHZ		= 0x40,
-};
-
-
-struct Node {
-	__be32 ln_Succ;		/* Pointer to next (successor) */
-	__be32 ln_Pred;		/* Pointer to previous (predecessor) */
-	__u8   ln_Type;
-	__s8   ln_Pri;		/* Priority, for sorting */
-	__be32 ln_Name;		/* ID string, null terminated */
-} __attribute__((packed));
-
-struct ExpansionRom {
-	/* -First 16 bytes of the expansion ROM */
-	__u8   er_Type;		/* Board type, size and flags */
-	__u8   er_Product;	/* Product number, assigned by manufacturer */
-	__u8   er_Flags;		/* Flags */
-	__u8   er_Reserved03;	/* Must be zero ($ff inverted) */
-	__be16 er_Manufacturer;	/* Unique ID, ASSIGNED BY COMMODORE-AMIGA! */
-	__be32 er_SerialNumber;	/* Available for use by manufacturer */
-	__be16 er_InitDiagVec;	/* Offset to optional "DiagArea" structure */
-	__u8   er_Reserved0c;
-	__u8   er_Reserved0d;
-	__u8   er_Reserved0e;
-	__u8   er_Reserved0f;
-} __attribute__((packed));
-
-/* er_Type board type bits */
-#define ERT_TYPEMASK	0xc0
-#define ERT_ZORROII	0xc0
-#define ERT_ZORROIII	0x80
-
-/* other bits defined in er_Type */
-#define ERTB_MEMLIST	5		/* Link RAM into free memory list */
-#define ERTF_MEMLIST	(1<<5)
-
-struct ConfigDev {
-	struct Node	cd_Node;
-	__u8		cd_Flags;	/* (read/write) */
-	__u8		cd_Pad;		/* reserved */
-	struct ExpansionRom cd_Rom;	/* copy of board's expansion ROM */
-	__be32		cd_BoardAddr;	/* where in memory the board was placed */
-	__be32		cd_BoardSize;	/* size of board in bytes */
-	__be16		cd_SlotAddr;	/* which slot number (PRIVATE) */
-	__be16		cd_SlotSize;	/* number of slots (PRIVATE) */
-	__be32		cd_Driver;	/* pointer to node of driver */
-	__be32		cd_NextCD;	/* linked list of drivers to config */
-	__be32		cd_Unused[4];	/* for whatever the driver wants */
-} __attribute__((packed));
-
-#define ZORRO_NUM_AUTO		16
-
-#endif /* _LINUX_ZORRO_H */
diff --git a/openflow/usr/include/linux/zorro_ids.h b/openflow/usr/include/linux/zorro_ids.h
deleted file mode 100644
index 74bc53b..0000000
--- a/openflow/usr/include/linux/zorro_ids.h
+++ /dev/null
@@ -1,552 +0,0 @@
-/*
- *  Zorro board IDs
- *
- *  Please keep sorted.
- */
-
-
-#define ZORRO_MANUF_PACIFIC_PERIPHERALS				0x00D3
-#define  ZORRO_PROD_PACIFIC_PERIPHERALS_SE_2000_A500		ZORRO_ID(PACIFIC_PERIPHERALS, 0x00, 0)
-#define  ZORRO_PROD_PACIFIC_PERIPHERALS_SCSI			ZORRO_ID(PACIFIC_PERIPHERALS, 0x0A, 0)
-
-#define ZORRO_MANUF_MACROSYSTEMS_USA_2				0x0100
-#define  ZORRO_PROD_MACROSYSTEMS_WARP_ENGINE			ZORRO_ID(MACROSYSTEMS_USA_2, 0x13, 0)
-
-#define ZORRO_MANUF_KUPKE_1					0x00DD
-#define  ZORRO_PROD_KUPKE_GOLEM_RAM_BOX_2MB			ZORRO_ID(KUPKE_1, 0x00, 0)
-
-#define ZORRO_MANUF_MEMPHIS					0x0100
-#define  ZORRO_PROD_MEMPHIS_STORMBRINGER			ZORRO_ID(MEMPHIS, 0x00, 0)
-
-#define ZORRO_MANUF_3_STATE					0x0200
-#define  ZORRO_PROD_3_STATE_MEGAMIX_2000			ZORRO_ID(3_STATE, 0x02, 0)
-
-#define ZORRO_MANUF_COMMODORE_BRAUNSCHWEIG			0x0201
-#define  ZORRO_PROD_CBM_A2088_A2286				ZORRO_ID(COMMODORE_BRAUNSCHWEIG, 0x01, 0)
-#define  ZORRO_PROD_CBM_A2286					ZORRO_ID(COMMODORE_BRAUNSCHWEIG, 0x02, 0)
-#define  ZORRO_PROD_CBM_A4091_1					ZORRO_ID(COMMODORE_BRAUNSCHWEIG, 0x54, 0)
-#define  ZORRO_PROD_CBM_A2386SX_1				ZORRO_ID(COMMODORE_BRAUNSCHWEIG, 0x67, 0)
-
-#define ZORRO_MANUF_COMMODORE_WEST_CHESTER_1			0x0202
-#define  ZORRO_PROD_CBM_A2090A					ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x01, 0)
-#define  ZORRO_PROD_CBM_A590_A2091_1				ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x02, 0)
-#define  ZORRO_PROD_CBM_A590_A2091_2				ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x03, 0)
-#define  ZORRO_PROD_CBM_A2090B					ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x04, 0)
-#define  ZORRO_PROD_CBM_A2060					ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x09, 0)
-#define  ZORRO_PROD_CBM_A590_A2052_A2058_A2091			ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x0A, 0)
-#define  ZORRO_PROD_CBM_A560_RAM				ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x20, 0)
-#define  ZORRO_PROD_CBM_A2232_PROTOTYPE				ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x45, 0)
-#define  ZORRO_PROD_CBM_A2232					ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x46, 0)
-#define  ZORRO_PROD_CBM_A2620					ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x50, 0)
-#define  ZORRO_PROD_CBM_A2630					ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x51, 0)
-#define  ZORRO_PROD_CBM_A4091_2					ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x54, 0)
-#define  ZORRO_PROD_CBM_A2065_1					ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x5A, 0)
-#define  ZORRO_PROD_CBM_ROMULATOR				ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x60, 0)
-#define  ZORRO_PROD_CBM_A3000_TEST_FIXTURE			ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x61, 0)
-#define  ZORRO_PROD_CBM_A2386SX_2				ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x67, 0)
-#define  ZORRO_PROD_CBM_A2065_2					ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x70, 0)
-
-#define ZORRO_MANUF_COMMODORE_WEST_CHESTER_2			0x0203
-#define  ZORRO_PROD_CBM_A2090A_CM				ZORRO_ID(COMMODORE_WEST_CHESTER_2, 0x03, 0)
-
-#define ZORRO_MANUF_PROGRESSIVE_PERIPHERALS_AND_SYSTEMS_2	0x02F4
-#define  ZORRO_PROD_PPS_EXP8000					ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS_2, 0x02, 0)
-
-#define ZORRO_MANUF_KOLFF_COMPUTER_SUPPLIES			0x02FF
-#define  ZORRO_PROD_KCS_POWER_PC_BOARD				ZORRO_ID(KOLFF_COMPUTER_SUPPLIES, 0x00, 0)
-
-#define ZORRO_MANUF_CARDCO_1					0x03EC
-#define  ZORRO_PROD_CARDCO_KRONOS_2000_1			ZORRO_ID(CARDCO_1, 0x04, 0)
-#define  ZORRO_PROD_CARDCO_A1000_1				ZORRO_ID(CARDCO_1, 0x0C, 0)
-#define  ZORRO_PROD_CARDCO_ESCORT				ZORRO_ID(CARDCO_1, 0x0E, 0)
-#define  ZORRO_PROD_CARDCO_A2410				ZORRO_ID(CARDCO_1, 0xF5, 0)
-
-#define ZORRO_MANUF_A_SQUARED					0x03ED
-#define  ZORRO_PROD_A_SQUARED_LIVE_2000				ZORRO_ID(A_SQUARED, 0x01, 0)
-
-#define ZORRO_MANUF_COMSPEC_COMMUNICATIONS			0x03EE
-#define  ZORRO_PROD_COMSPEC_COMMUNICATIONS_AX2000		ZORRO_ID(COMSPEC_COMMUNICATIONS, 0x01, 0)
-
-#define ZORRO_MANUF_ANAKIN_RESEARCH				0x03F1
-#define  ZORRO_PROD_ANAKIN_RESEARCH_EASYL			ZORRO_ID(ANAKIN_RESEARCH, 0x01, 0)
-
-#define ZORRO_MANUF_MICROBOTICS					0x03F2
-#define  ZORRO_PROD_MICROBOTICS_STARBOARD_II			ZORRO_ID(MICROBOTICS, 0x00, 0)
-#define  ZORRO_PROD_MICROBOTICS_STARDRIVE			ZORRO_ID(MICROBOTICS, 0x02, 0)
-#define  ZORRO_PROD_MICROBOTICS_8_UP_A				ZORRO_ID(MICROBOTICS, 0x03, 0)
-#define  ZORRO_PROD_MICROBOTICS_8_UP_Z				ZORRO_ID(MICROBOTICS, 0x04, 0)
-#define  ZORRO_PROD_MICROBOTICS_DELTA_RAM			ZORRO_ID(MICROBOTICS, 0x20, 0)
-#define  ZORRO_PROD_MICROBOTICS_8_STAR_RAM			ZORRO_ID(MICROBOTICS, 0x40, 0)
-#define  ZORRO_PROD_MICROBOTICS_8_STAR				ZORRO_ID(MICROBOTICS, 0x41, 0)
-#define  ZORRO_PROD_MICROBOTICS_VXL_RAM_32			ZORRO_ID(MICROBOTICS, 0x44, 0)
-#define  ZORRO_PROD_MICROBOTICS_VXL_68030			ZORRO_ID(MICROBOTICS, 0x45, 0)
-#define  ZORRO_PROD_MICROBOTICS_DELTA				ZORRO_ID(MICROBOTICS, 0x60, 0)
-#define  ZORRO_PROD_MICROBOTICS_MBX_1200_1200Z_RAM		ZORRO_ID(MICROBOTICS, 0x81, 0)
-#define  ZORRO_PROD_MICROBOTICS_HARDFRAME_2000_1		ZORRO_ID(MICROBOTICS, 0x96, 0)
-#define  ZORRO_PROD_MICROBOTICS_HARDFRAME_2000_2		ZORRO_ID(MICROBOTICS, 0x9E, 0)
-#define  ZORRO_PROD_MICROBOTICS_MBX_1200_1200Z			ZORRO_ID(MICROBOTICS, 0xC1, 0)
-
-#define ZORRO_MANUF_ACCESS_ASSOCIATES_ALEGRA			0x03F4
-
-#define ZORRO_MANUF_EXPANSION_TECHNOLOGIES			0x03F6
-
-#define ZORRO_MANUF_ASDG					0x03FF
-#define  ZORRO_PROD_ASDG_MEMORY_1				ZORRO_ID(ASDG, 0x01, 0)
-#define  ZORRO_PROD_ASDG_MEMORY_2				ZORRO_ID(ASDG, 0x02, 0)
-#define  ZORRO_PROD_ASDG_EB920_LAN_ROVER			ZORRO_ID(ASDG, 0xFE, 0)
-#define  ZORRO_PROD_ASDG_GPIB_DUALIEEE488_TWIN_X		ZORRO_ID(ASDG, 0xFF, 0)
-
-#define ZORRO_MANUF_IMTRONICS_1					0x0404
-#define  ZORRO_PROD_IMTRONICS_HURRICANE_2800_1			ZORRO_ID(IMTRONICS_1, 0x39, 0)
-#define  ZORRO_PROD_IMTRONICS_HURRICANE_2800_2			ZORRO_ID(IMTRONICS_1, 0x57, 0)
-
-#define ZORRO_MANUF_CBM_UNIVERSITY_OF_LOWELL			0x0406
-#define  ZORRO_PROD_CBM_A2410					ZORRO_ID(CBM_UNIVERSITY_OF_LOWELL, 0x00, 0)
-
-#define ZORRO_MANUF_AMERISTAR					0x041D
-#define  ZORRO_PROD_AMERISTAR_A2065				ZORRO_ID(AMERISTAR, 0x01, 0)
-#define  ZORRO_PROD_AMERISTAR_A560				ZORRO_ID(AMERISTAR, 0x09, 0)
-#define  ZORRO_PROD_AMERISTAR_A4066				ZORRO_ID(AMERISTAR, 0x0A, 0)
-
-#define ZORRO_MANUF_SUPRA					0x0420
-#define  ZORRO_PROD_SUPRA_SUPRADRIVE_4x4			ZORRO_ID(SUPRA, 0x01, 0)
-#define  ZORRO_PROD_SUPRA_1000_RAM				ZORRO_ID(SUPRA, 0x02, 0)
-#define  ZORRO_PROD_SUPRA_2000_DMA				ZORRO_ID(SUPRA, 0x03, 0)
-#define  ZORRO_PROD_SUPRA_500					ZORRO_ID(SUPRA, 0x05, 0)
-#define  ZORRO_PROD_SUPRA_500_SCSI				ZORRO_ID(SUPRA, 0x08, 0)
-#define  ZORRO_PROD_SUPRA_500XP_2000_RAM			ZORRO_ID(SUPRA, 0x09, 0)
-#define  ZORRO_PROD_SUPRA_500RX_2000_RAM			ZORRO_ID(SUPRA, 0x0A, 0)
-#define  ZORRO_PROD_SUPRA_2400ZI				ZORRO_ID(SUPRA, 0x0B, 0)
-#define  ZORRO_PROD_SUPRA_500XP_SUPRADRIVE_WORDSYNC		ZORRO_ID(SUPRA, 0x0C, 0)
-#define  ZORRO_PROD_SUPRA_SUPRADRIVE_WORDSYNC_II		ZORRO_ID(SUPRA, 0x0D, 0)
-#define  ZORRO_PROD_SUPRA_2400ZIPLUS				ZORRO_ID(SUPRA, 0x10, 0)
-
-#define ZORRO_MANUF_COMPUTER_SYSTEMS_ASSOCIATES			0x0422
-#define  ZORRO_PROD_CSA_MAGNUM					ZORRO_ID(COMPUTER_SYSTEMS_ASSOCIATES, 0x11, 0)
-#define  ZORRO_PROD_CSA_12_GAUGE				ZORRO_ID(COMPUTER_SYSTEMS_ASSOCIATES, 0x15, 0)
-
-#define ZORRO_MANUF_MARC_MICHAEL_GROTH				0x0439
-
-#define ZORRO_MANUF_M_TECH					0x0502
-#define  ZORRO_PROD_MTEC_AT500_1				ZORRO_ID(M_TECH, 0x03, 0)
-
-#define ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_1			0x06E1
-#define  ZORRO_PROD_GVP_IMPACT_SERIES_I				ZORRO_ID(GREAT_VALLEY_PRODUCTS_1, 0x08, 0)
-
-#define ZORRO_MANUF_BYTEBOX					0x07DA
-#define  ZORRO_PROD_BYTEBOX_A500				ZORRO_ID(BYTEBOX, 0x00, 0)
-
-#define ZORRO_MANUF_DKB_POWER_COMPUTING				0x07DC
-#define  ZORRO_PROD_DKB_POWER_COMPUTING_SECUREKEY		ZORRO_ID(DKB_POWER_COMPUTING, 0x09, 0)
-#define  ZORRO_PROD_DKB_POWER_COMPUTING_DKM_3128		ZORRO_ID(DKB_POWER_COMPUTING, 0x0E, 0)
-#define  ZORRO_PROD_DKB_POWER_COMPUTING_RAPID_FIRE		ZORRO_ID(DKB_POWER_COMPUTING, 0x0F, 0)
-#define  ZORRO_PROD_DKB_POWER_COMPUTING_DKM_1202		ZORRO_ID(DKB_POWER_COMPUTING, 0x10, 0)
-#define  ZORRO_PROD_DKB_POWER_COMPUTING_COBRA_VIPER_II_68EC030	ZORRO_ID(DKB_POWER_COMPUTING, 0x12, 0)
-#define  ZORRO_PROD_DKB_POWER_COMPUTING_WILDFIRE_060_1		ZORRO_ID(DKB_POWER_COMPUTING, 0x17, 0)
-#define  ZORRO_PROD_DKB_POWER_COMPUTING_WILDFIRE_060_2		ZORRO_ID(DKB_POWER_COMPUTING, 0xFF, 0)
-
-#define ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_2			0x07E1
-#define  ZORRO_PROD_GVP_IMPACT_SERIES_I_4K			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x01, 0)
-#define  ZORRO_PROD_GVP_IMPACT_SERIES_I_16K_2			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x02, 0)
-#define  ZORRO_PROD_GVP_IMPACT_SERIES_I_16K_3			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x03, 0)
-#define  ZORRO_PROD_GVP_IMPACT_3001_IDE_1			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x08, 0)
-#define  ZORRO_PROD_GVP_IMPACT_3001_RAM				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x09, 0)
-#define  ZORRO_PROD_GVP_IMPACT_SERIES_II_RAM_1			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0A, 0)
-#define  ZORRO_PROD_GVP_EPC_BASE				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0)
-#define  ZORRO_PROD_GVP_GFORCE_040_1				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x20)
-#define  ZORRO_PROD_GVP_GFORCE_040_SCSI_1			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x30)
-#define  ZORRO_PROD_GVP_A1291					ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x40)
-#define  ZORRO_PROD_GVP_COMBO_030_R4				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x60)
-#define  ZORRO_PROD_GVP_COMBO_030_R4_SCSI			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x70)
-#define  ZORRO_PROD_GVP_PHONEPAK				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x78)
-#define  ZORRO_PROD_GVP_IO_EXTENDER				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x98)
-#define  ZORRO_PROD_GVP_GFORCE_030				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xa0)
-#define  ZORRO_PROD_GVP_GFORCE_030_SCSI				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xb0)
-#define  ZORRO_PROD_GVP_A530					ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xc0)
-#define  ZORRO_PROD_GVP_A530_SCSI				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xd0)
-#define  ZORRO_PROD_GVP_COMBO_030_R3				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xe0)
-#define  ZORRO_PROD_GVP_COMBO_030_R3_SCSI			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xf0)
-#define  ZORRO_PROD_GVP_SERIES_II				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xf8)
-#define  ZORRO_PROD_GVP_IMPACT_3001_IDE_2			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0D, 0)
-/*#define  ZORRO_PROD_GVP_A2000_030				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0D, 0)*/
-/*#define  ZORRO_PROD_GVP_GFORCE_040_SCSI_2			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0D, 0)*/
-#define  ZORRO_PROD_GVP_GFORCE_040_060				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x16, 0)
-#define  ZORRO_PROD_GVP_IMPACT_VISION_24			ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x20, 0)
-#define  ZORRO_PROD_GVP_GFORCE_040_2				ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0xFF, 0)
-
-#define ZORRO_MANUF_CALIFORNIA_ACCESS_SYNERGY			0x07E5
-#define  ZORRO_PROD_CALIFORNIA_ACCESS_SYNERGY_MALIBU		ZORRO_ID(CALIFORNIA_ACCESS_SYNERGY, 0x01, 0)
-
-#define ZORRO_MANUF_XETEC					0x07E6
-#define  ZORRO_PROD_XETEC_FASTCARD				ZORRO_ID(XETEC, 0x01, 0)
-#define  ZORRO_PROD_XETEC_FASTCARD_RAM				ZORRO_ID(XETEC, 0x02, 0)
-#define  ZORRO_PROD_XETEC_FASTCARD_PLUS				ZORRO_ID(XETEC, 0x03, 0)
-
-#define ZORRO_MANUF_PROGRESSIVE_PERIPHERALS_AND_SYSTEMS		0x07EA
-#define  ZORRO_PROD_PPS_MERCURY					ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS, 0x00, 0)
-#define  ZORRO_PROD_PPS_A3000_68040				ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS, 0x01, 0)
-#define  ZORRO_PROD_PPS_A2000_68040				ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS, 0x69, 0)
-#define  ZORRO_PROD_PPS_ZEUS					ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS, 0x96, 0)
-#define  ZORRO_PROD_PPS_A500_68040				ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS, 0xBB, 0)
-
-#define ZORRO_MANUF_XEBEC					0x07EC
-
-#define ZORRO_MANUF_SPIRIT_TECHNOLOGY				0x07F2
-#define  ZORRO_PROD_SPIRIT_TECHNOLOGY_INSIDER_IN1000		ZORRO_ID(SPIRIT_TECHNOLOGY, 0x01, 0)
-#define  ZORRO_PROD_SPIRIT_TECHNOLOGY_INSIDER_IN500		ZORRO_ID(SPIRIT_TECHNOLOGY, 0x02, 0)
-#define  ZORRO_PROD_SPIRIT_TECHNOLOGY_SIN500			ZORRO_ID(SPIRIT_TECHNOLOGY, 0x03, 0)
-#define  ZORRO_PROD_SPIRIT_TECHNOLOGY_HDA_506			ZORRO_ID(SPIRIT_TECHNOLOGY, 0x04, 0)
-#define  ZORRO_PROD_SPIRIT_TECHNOLOGY_AX_S			ZORRO_ID(SPIRIT_TECHNOLOGY, 0x05, 0)
-#define  ZORRO_PROD_SPIRIT_TECHNOLOGY_OCTABYTE			ZORRO_ID(SPIRIT_TECHNOLOGY, 0x06, 0)
-#define  ZORRO_PROD_SPIRIT_TECHNOLOGY_INMATE			ZORRO_ID(SPIRIT_TECHNOLOGY, 0x08, 0)
-
-#define ZORRO_MANUF_SPIRIT_TECHNOLOGY_2				0x07F3
-
-#define ZORRO_MANUF_BSC_ALFADATA_1				0x07FE
-#define  ZORRO_PROD_BSC_ALF_3_1					ZORRO_ID(BSC_ALFADATA_1, 0x03, 0)
-
-#define ZORRO_MANUF_BSC_ALFADATA_2				0x0801
-#define  ZORRO_PROD_BSC_ALF_2_1					ZORRO_ID(BSC_ALFADATA_2, 0x01, 0)
-#define  ZORRO_PROD_BSC_ALF_2_2					ZORRO_ID(BSC_ALFADATA_2, 0x02, 0)
-#define  ZORRO_PROD_BSC_ALF_3_2					ZORRO_ID(BSC_ALFADATA_2, 0x03, 0)
-
-#define ZORRO_MANUF_CARDCO_2					0x0802
-#define  ZORRO_PROD_CARDCO_KRONOS_2000_2			ZORRO_ID(CARDCO_2, 0x04, 0)
-#define  ZORRO_PROD_CARDCO_A1000_2				ZORRO_ID(CARDCO_2, 0x0C, 0)
-
-#define ZORRO_MANUF_JOCHHEIM					0x0804
-#define  ZORRO_PROD_JOCHHEIM_RAM				ZORRO_ID(JOCHHEIM, 0x01, 0)
-
-#define ZORRO_MANUF_CHECKPOINT_TECHNOLOGIES			0x0807
-#define  ZORRO_PROD_CHECKPOINT_TECHNOLOGIES_SERIAL_SOLUTION	ZORRO_ID(CHECKPOINT_TECHNOLOGIES, 0x00, 0)
-
-#define ZORRO_MANUF_EDOTRONIK					0x0810
-#define  ZORRO_PROD_EDOTRONIK_IEEE_488				ZORRO_ID(EDOTRONIK, 0x01, 0)
-#define  ZORRO_PROD_EDOTRONIK_8032				ZORRO_ID(EDOTRONIK, 0x02, 0)
-#define  ZORRO_PROD_EDOTRONIK_MULTISERIAL			ZORRO_ID(EDOTRONIK, 0x03, 0)
-#define  ZORRO_PROD_EDOTRONIK_VIDEODIGITIZER			ZORRO_ID(EDOTRONIK, 0x04, 0)
-#define  ZORRO_PROD_EDOTRONIK_PARALLEL_IO			ZORRO_ID(EDOTRONIK, 0x05, 0)
-#define  ZORRO_PROD_EDOTRONIK_PIC_PROTOYPING			ZORRO_ID(EDOTRONIK, 0x06, 0)
-#define  ZORRO_PROD_EDOTRONIK_ADC				ZORRO_ID(EDOTRONIK, 0x07, 0)
-#define  ZORRO_PROD_EDOTRONIK_VME				ZORRO_ID(EDOTRONIK, 0x08, 0)
-#define  ZORRO_PROD_EDOTRONIK_DSP96000				ZORRO_ID(EDOTRONIK, 0x09, 0)
-
-#define ZORRO_MANUF_NES_INC					0x0813
-#define  ZORRO_PROD_NES_INC_RAM					ZORRO_ID(NES_INC, 0x00, 0)
-
-#define ZORRO_MANUF_ICD						0x0817
-#define  ZORRO_PROD_ICD_ADVANTAGE_2000_SCSI			ZORRO_ID(ICD, 0x01, 0)
-#define  ZORRO_PROD_ICD_ADVANTAGE_IDE				ZORRO_ID(ICD, 0x03, 0)
-#define  ZORRO_PROD_ICD_ADVANTAGE_2080_RAM			ZORRO_ID(ICD, 0x04, 0)
-
-#define ZORRO_MANUF_KUPKE_2					0x0819
-#define  ZORRO_PROD_KUPKE_OMTI					ZORRO_ID(KUPKE_2, 0x01, 0)
-#define  ZORRO_PROD_KUPKE_SCSI_II				ZORRO_ID(KUPKE_2, 0x02, 0)
-#define  ZORRO_PROD_KUPKE_GOLEM_BOX				ZORRO_ID(KUPKE_2, 0x03, 0)
-#define  ZORRO_PROD_KUPKE_030_882				ZORRO_ID(KUPKE_2, 0x04, 0)
-#define  ZORRO_PROD_KUPKE_SCSI_AT				ZORRO_ID(KUPKE_2, 0x05, 0)
-
-#define ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_3			0x081D
-#define  ZORRO_PROD_GVP_A2000_RAM8				ZORRO_ID(GREAT_VALLEY_PRODUCTS_3, 0x09, 0)
-#define  ZORRO_PROD_GVP_IMPACT_SERIES_II_RAM_2			ZORRO_ID(GREAT_VALLEY_PRODUCTS_3, 0x0A, 0)
-
-#define ZORRO_MANUF_INTERWORKS_NETWORK				0x081E
-
-#define ZORRO_MANUF_HARDITAL_SYNTHESIS				0x0820
-#define  ZORRO_PROD_HARDITAL_SYNTHESIS_TQM_68030_68882		ZORRO_ID(HARDITAL_SYNTHESIS, 0x14, 0)
-
-#define ZORRO_MANUF_APPLIED_ENGINEERING				0x0828
-#define  ZORRO_PROD_APPLIED_ENGINEERING_DL2000			ZORRO_ID(APPLIED_ENGINEERING, 0x10, 0)
-#define  ZORRO_PROD_APPLIED_ENGINEERING_RAM_WORKS		ZORRO_ID(APPLIED_ENGINEERING, 0xE0, 0)
-
-#define ZORRO_MANUF_BSC_ALFADATA_3				0x082C
-#define  ZORRO_PROD_BSC_OKTAGON_2008				ZORRO_ID(BSC_ALFADATA_3, 0x05, 0)
-#define  ZORRO_PROD_BSC_TANDEM_AT_2008_508			ZORRO_ID(BSC_ALFADATA_3, 0x06, 0)
-#define  ZORRO_PROD_BSC_ALFA_RAM_1200				ZORRO_ID(BSC_ALFADATA_3, 0x07, 0)
-#define  ZORRO_PROD_BSC_OKTAGON_2008_RAM			ZORRO_ID(BSC_ALFADATA_3, 0x08, 0)
-#define  ZORRO_PROD_BSC_MULTIFACE_I				ZORRO_ID(BSC_ALFADATA_3, 0x10, 0)
-#define  ZORRO_PROD_BSC_MULTIFACE_II				ZORRO_ID(BSC_ALFADATA_3, 0x11, 0)
-#define  ZORRO_PROD_BSC_MULTIFACE_III				ZORRO_ID(BSC_ALFADATA_3, 0x12, 0)
-#define  ZORRO_PROD_BSC_FRAMEMASTER_II				ZORRO_ID(BSC_ALFADATA_3, 0x20, 0)
-#define  ZORRO_PROD_BSC_GRAFFITI_RAM				ZORRO_ID(BSC_ALFADATA_3, 0x21, 0)
-#define  ZORRO_PROD_BSC_GRAFFITI_REG				ZORRO_ID(BSC_ALFADATA_3, 0x22, 0)
-#define  ZORRO_PROD_BSC_ISDN_MASTERCARD				ZORRO_ID(BSC_ALFADATA_3, 0x40, 0)
-#define  ZORRO_PROD_BSC_ISDN_MASTERCARD_II			ZORRO_ID(BSC_ALFADATA_3, 0x41, 0)
-
-#define ZORRO_MANUF_PHOENIX					0x0835
-#define  ZORRO_PROD_PHOENIX_ST506				ZORRO_ID(PHOENIX, 0x21, 0)
-#define  ZORRO_PROD_PHOENIX_SCSI				ZORRO_ID(PHOENIX, 0x22, 0)
-#define  ZORRO_PROD_PHOENIX_RAM					ZORRO_ID(PHOENIX, 0xBE, 0)
-
-#define ZORRO_MANUF_ADVANCED_STORAGE_SYSTEMS			0x0836
-#define  ZORRO_PROD_ADVANCED_STORAGE_SYSTEMS_NEXUS		ZORRO_ID(ADVANCED_STORAGE_SYSTEMS, 0x01, 0)
-#define  ZORRO_PROD_ADVANCED_STORAGE_SYSTEMS_NEXUS_RAM		ZORRO_ID(ADVANCED_STORAGE_SYSTEMS, 0x08, 0)
-
-#define ZORRO_MANUF_IMPULSE					0x0838
-#define  ZORRO_PROD_IMPULSE_FIRECRACKER_24			ZORRO_ID(IMPULSE, 0x00, 0)
-
-#define ZORRO_MANUF_IVS						0x0840
-#define  ZORRO_PROD_IVS_GRANDSLAM_PIC_2				ZORRO_ID(IVS, 0x02, 0)
-#define  ZORRO_PROD_IVS_GRANDSLAM_PIC_1				ZORRO_ID(IVS, 0x04, 0)
-#define  ZORRO_PROD_IVS_OVERDRIVE				ZORRO_ID(IVS, 0x10, 0)
-#define  ZORRO_PROD_IVS_TRUMPCARD_CLASSIC			ZORRO_ID(IVS, 0x30, 0)
-#define  ZORRO_PROD_IVS_TRUMPCARD_PRO_GRANDSLAM			ZORRO_ID(IVS, 0x34, 0)
-#define  ZORRO_PROD_IVS_META_4					ZORRO_ID(IVS, 0x40, 0)
-#define  ZORRO_PROD_IVS_WAVETOOLS				ZORRO_ID(IVS, 0xBF, 0)
-#define  ZORRO_PROD_IVS_VECTOR_1				ZORRO_ID(IVS, 0xF3, 0)
-#define  ZORRO_PROD_IVS_VECTOR_2				ZORRO_ID(IVS, 0xF4, 0)
-
-#define ZORRO_MANUF_VECTOR_1					0x0841
-#define  ZORRO_PROD_VECTOR_CONNECTION_1				ZORRO_ID(VECTOR_1, 0xE3, 0)
-
-#define ZORRO_MANUF_XPERT_PRODEV				0x0845
-#define  ZORRO_PROD_XPERT_PRODEV_VISIONA_RAM			ZORRO_ID(XPERT_PRODEV, 0x01, 0)
-#define  ZORRO_PROD_XPERT_PRODEV_VISIONA_REG			ZORRO_ID(XPERT_PRODEV, 0x02, 0)
-#define  ZORRO_PROD_XPERT_PRODEV_MERLIN_RAM			ZORRO_ID(XPERT_PRODEV, 0x03, 0)
-#define  ZORRO_PROD_XPERT_PRODEV_MERLIN_REG_1			ZORRO_ID(XPERT_PRODEV, 0x04, 0)
-#define  ZORRO_PROD_XPERT_PRODEV_MERLIN_REG_2			ZORRO_ID(XPERT_PRODEV, 0xC9, 0)
-
-#define ZORRO_MANUF_HYDRA_SYSTEMS				0x0849
-#define  ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET			ZORRO_ID(HYDRA_SYSTEMS, 0x01, 0)
-
-#define ZORRO_MANUF_SUNRIZE_INDUSTRIES				0x084F
-#define  ZORRO_PROD_SUNRIZE_INDUSTRIES_AD1012			ZORRO_ID(SUNRIZE_INDUSTRIES, 0x01, 0)
-#define  ZORRO_PROD_SUNRIZE_INDUSTRIES_AD516			ZORRO_ID(SUNRIZE_INDUSTRIES, 0x02, 0)
-#define  ZORRO_PROD_SUNRIZE_INDUSTRIES_DD512			ZORRO_ID(SUNRIZE_INDUSTRIES, 0x03, 0)
-
-#define ZORRO_MANUF_TRICERATOPS					0x0850
-#define  ZORRO_PROD_TRICERATOPS_MULTI_IO			ZORRO_ID(TRICERATOPS, 0x01, 0)
-
-#define ZORRO_MANUF_APPLIED_MAGIC				0x0851
-#define  ZORRO_PROD_APPLIED_MAGIC_DMI_RESOLVER			ZORRO_ID(APPLIED_MAGIC, 0x01, 0)
-#define  ZORRO_PROD_APPLIED_MAGIC_DIGITAL_BROADCASTER		ZORRO_ID(APPLIED_MAGIC, 0x06, 0)
-
-#define ZORRO_MANUF_GFX_BASE					0x085E
-#define  ZORRO_PROD_GFX_BASE_GDA_1_VRAM				ZORRO_ID(GFX_BASE, 0x00, 0)
-#define  ZORRO_PROD_GFX_BASE_GDA_1				ZORRO_ID(GFX_BASE, 0x01, 0)
-
-#define ZORRO_MANUF_ROCTEC					0x0860
-#define  ZORRO_PROD_ROCTEC_RH_800C				ZORRO_ID(ROCTEC, 0x01, 0)
-#define  ZORRO_PROD_ROCTEC_RH_800C_RAM				ZORRO_ID(ROCTEC, 0x01, 0)
-
-#define ZORRO_MANUF_KATO					0x0861
-#define  ZORRO_PROD_KATO_MELODY					ZORRO_ID(KATO, 0x80, 0)
-/* ID clash!! */
-#define ZORRO_MANUF_HELFRICH_1					0x0861
-#define  ZORRO_PROD_HELFRICH_RAINBOW_II				ZORRO_ID(HELFRICH_1, 0x20, 0)
-#define  ZORRO_PROD_HELFRICH_RAINBOW_III			ZORRO_ID(HELFRICH_1, 0x21, 0)
-
-#define ZORRO_MANUF_ATLANTIS					0x0862
-
-#define ZORRO_MANUF_PROTAR					0x0864
-
-#define ZORRO_MANUF_ACS						0x0865
-
-#define ZORRO_MANUF_SOFTWARE_RESULTS_ENTERPRISES		0x0866
-#define  ZORRO_PROD_SOFTWARE_RESULTS_ENTERPRISES_GOLDEN_GATE_2_BUS_PLUS	ZORRO_ID(SOFTWARE_RESULTS_ENTERPRISES, 0x01, 0)
-
-#define ZORRO_MANUF_MASOBOSHI					0x086D
-#define  ZORRO_PROD_MASOBOSHI_MASTER_CARD_SC201			ZORRO_ID(MASOBOSHI, 0x03, 0)
-#define  ZORRO_PROD_MASOBOSHI_MASTER_CARD_MC702			ZORRO_ID(MASOBOSHI, 0x04, 0)
-#define  ZORRO_PROD_MASOBOSHI_MVD_819				ZORRO_ID(MASOBOSHI, 0x07, 0)
-
-#define ZORRO_MANUF_MAINHATTAN_DATA				0x086F
-#define  ZORRO_PROD_MAINHATTAN_DATA_IDE				ZORRO_ID(MAINHATTAN_DATA, 0x01, 0)
-
-#define ZORRO_MANUF_VILLAGE_TRONIC				0x0877
-#define  ZORRO_PROD_VILLAGE_TRONIC_DOMINO_RAM			ZORRO_ID(VILLAGE_TRONIC, 0x01, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_DOMINO_REG			ZORRO_ID(VILLAGE_TRONIC, 0x02, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_DOMINO_16M_PROTOTYPE		ZORRO_ID(VILLAGE_TRONIC, 0x03, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM	ZORRO_ID(VILLAGE_TRONIC, 0x0B, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG	ZORRO_ID(VILLAGE_TRONIC, 0x0C, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_SEGMENTED_MODE	ZORRO_ID(VILLAGE_TRONIC, 0x0D, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM1		ZORRO_ID(VILLAGE_TRONIC, 0x15, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM2		ZORRO_ID(VILLAGE_TRONIC, 0x16, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_REG		ZORRO_ID(VILLAGE_TRONIC, 0x17, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3		ZORRO_ID(VILLAGE_TRONIC, 0x18, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_ARIADNE			ZORRO_ID(VILLAGE_TRONIC, 0xC9, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2			ZORRO_ID(VILLAGE_TRONIC, 0xCA, 0)
-
-#define ZORRO_MANUF_UTILITIES_UNLIMITED				0x087B
-#define  ZORRO_PROD_UTILITIES_UNLIMITED_EMPLANT_DELUXE		ZORRO_ID(UTILITIES_UNLIMITED, 0x15, 0)
-#define  ZORRO_PROD_UTILITIES_UNLIMITED_EMPLANT_DELUXE2		ZORRO_ID(UTILITIES_UNLIMITED, 0x20, 0)
-
-#define ZORRO_MANUF_AMITRIX					0x0880
-#define  ZORRO_PROD_AMITRIX_MULTI_IO				ZORRO_ID(AMITRIX, 0x01, 0)
-#define  ZORRO_PROD_AMITRIX_CD_RAM				ZORRO_ID(AMITRIX, 0x02, 0)
-
-#define ZORRO_MANUF_ARMAX					0x0885
-#define  ZORRO_PROD_ARMAX_OMNIBUS				ZORRO_ID(ARMAX, 0x00, 0)
-
-#define ZORRO_MANUF_ZEUS					0x088D
-#define  ZORRO_PROD_ZEUS_SPIDER					ZORRO_ID(ZEUS, 0x04, 0)
-
-#define ZORRO_MANUF_NEWTEK					0x088F
-#define  ZORRO_PROD_NEWTEK_VIDEOTOASTER				ZORRO_ID(NEWTEK, 0x00, 0)
-
-#define ZORRO_MANUF_M_TECH_GERMANY				0x0890
-#define  ZORRO_PROD_MTEC_AT500_2				ZORRO_ID(M_TECH_GERMANY, 0x01, 0)
-#define  ZORRO_PROD_MTEC_68030					ZORRO_ID(M_TECH_GERMANY, 0x03, 0)
-#define  ZORRO_PROD_MTEC_68020I					ZORRO_ID(M_TECH_GERMANY, 0x06, 0)
-#define  ZORRO_PROD_MTEC_A1200_T68030_RTC			ZORRO_ID(M_TECH_GERMANY, 0x20, 0)
-#define  ZORRO_PROD_MTEC_VIPER_MK_V_E_MATRIX_530		ZORRO_ID(M_TECH_GERMANY, 0x21, 0)
-#define  ZORRO_PROD_MTEC_8_MB_RAM				ZORRO_ID(M_TECH_GERMANY, 0x22, 0)
-#define  ZORRO_PROD_MTEC_VIPER_MK_V_E_MATRIX_530_SCSI_IDE	ZORRO_ID(M_TECH_GERMANY, 0x24, 0)
-
-#define ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_4			0x0891
-#define  ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM			ZORRO_ID(GREAT_VALLEY_PRODUCTS_4, 0x01, 0)
-#define  ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG			ZORRO_ID(GREAT_VALLEY_PRODUCTS_4, 0x02, 0)
-
-#define ZORRO_MANUF_APOLLO_1					0x0892
-#define  ZORRO_PROD_APOLLO_A1200				ZORRO_ID(APOLLO_1, 0x01, 0)
-
-#define ZORRO_MANUF_HELFRICH_2					0x0893
-#define  ZORRO_PROD_HELFRICH_PICCOLO_RAM			ZORRO_ID(HELFRICH_2, 0x05, 0)
-#define  ZORRO_PROD_HELFRICH_PICCOLO_REG			ZORRO_ID(HELFRICH_2, 0x06, 0)
-#define  ZORRO_PROD_HELFRICH_PEGGY_PLUS_MPEG			ZORRO_ID(HELFRICH_2, 0x07, 0)
-#define  ZORRO_PROD_HELFRICH_VIDEOCRUNCHER			ZORRO_ID(HELFRICH_2, 0x08, 0)
-#define  ZORRO_PROD_HELFRICH_SD64_RAM				ZORRO_ID(HELFRICH_2, 0x0A, 0)
-#define  ZORRO_PROD_HELFRICH_SD64_REG				ZORRO_ID(HELFRICH_2, 0x0B, 0)
-
-#define ZORRO_MANUF_MACROSYSTEMS_USA				0x089B
-#define  ZORRO_PROD_MACROSYSTEMS_WARP_ENGINE_40xx		ZORRO_ID(MACROSYSTEMS_USA, 0x13, 0)
-
-#define ZORRO_MANUF_ELBOX_COMPUTER				0x089E
-#define  ZORRO_PROD_ELBOX_COMPUTER_1200_4			ZORRO_ID(ELBOX_COMPUTER, 0x06, 0)
-
-#define ZORRO_MANUF_HARMS_PROFESSIONAL				0x0A00
-#define  ZORRO_PROD_HARMS_PROFESSIONAL_030_PLUS			ZORRO_ID(HARMS_PROFESSIONAL, 0x10, 0)
-#define  ZORRO_PROD_HARMS_PROFESSIONAL_3500			ZORRO_ID(HARMS_PROFESSIONAL, 0xD0, 0)
-
-#define ZORRO_MANUF_MICRONIK					0x0A50
-#define  ZORRO_PROD_MICRONIK_RCA_120				ZORRO_ID(MICRONIK, 0x0A, 0)
-
-#define ZORRO_MANUF_MICRONIK2					0x0F0F
-#define  ZORRO_PROD_MICRONIK2_Z3I				ZORRO_ID(MICRONIK2, 0x01, 0)
-
-#define ZORRO_MANUF_MEGAMICRO					0x1000
-#define  ZORRO_PROD_MEGAMICRO_SCRAM_500				ZORRO_ID(MEGAMICRO, 0x03, 0)
-#define  ZORRO_PROD_MEGAMICRO_SCRAM_500_RAM			ZORRO_ID(MEGAMICRO, 0x04, 0)
-
-#define ZORRO_MANUF_IMTRONICS_2					0x1028
-#define  ZORRO_PROD_IMTRONICS_HURRICANE_2800_3			ZORRO_ID(IMTRONICS_2, 0x39, 0)
-#define  ZORRO_PROD_IMTRONICS_HURRICANE_2800_4			ZORRO_ID(IMTRONICS_2, 0x57, 0)
-
-/* unofficial ID */
-#define ZORRO_MANUF_INDIVIDUAL_COMPUTERS			0x1212
-#define  ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA			ZORRO_ID(INDIVIDUAL_COMPUTERS, 0x00, 0)
-#define  ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF			ZORRO_ID(INDIVIDUAL_COMPUTERS, 0x17, 0)
-#define  ZORRO_PROD_INDIVIDUAL_COMPUTERS_CATWEASEL		ZORRO_ID(INDIVIDUAL_COMPUTERS, 0x2A, 0)
-
-#define ZORRO_MANUF_KUPKE_3					0x1248
-#define  ZORRO_PROD_KUPKE_GOLEM_HD_3000				ZORRO_ID(KUPKE_3, 0x01, 0)
-
-#define ZORRO_MANUF_ITH						0x1388
-#define  ZORRO_PROD_ITH_ISDN_MASTER_II				ZORRO_ID(ITH, 0x01, 0)
-
-#define ZORRO_MANUF_VMC						0x1389
-#define  ZORRO_PROD_VMC_ISDN_BLASTER_Z2				ZORRO_ID(VMC, 0x01, 0)
-#define  ZORRO_PROD_VMC_HYPERCOM_4				ZORRO_ID(VMC, 0x02, 0)
-
-#define ZORRO_MANUF_INFORMATION					0x157C
-#define  ZORRO_PROD_INFORMATION_ISDN_ENGINE_I			ZORRO_ID(INFORMATION, 0x64, 0)
-
-#define ZORRO_MANUF_VORTEX					0x2017
-#define  ZORRO_PROD_VORTEX_GOLDEN_GATE_80386SX			ZORRO_ID(VORTEX, 0x07, 0)
-#define  ZORRO_PROD_VORTEX_GOLDEN_GATE_RAM			ZORRO_ID(VORTEX, 0x08, 0)
-#define  ZORRO_PROD_VORTEX_GOLDEN_GATE_80486			ZORRO_ID(VORTEX, 0x09, 0)
-
-#define ZORRO_MANUF_EXPANSION_SYSTEMS				0x2062
-#define  ZORRO_PROD_EXPANSION_SYSTEMS_DATAFLYER_4000SX		ZORRO_ID(EXPANSION_SYSTEMS, 0x01, 0)
-#define  ZORRO_PROD_EXPANSION_SYSTEMS_DATAFLYER_4000SX_RAM	ZORRO_ID(EXPANSION_SYSTEMS, 0x02, 0)
-
-#define ZORRO_MANUF_READYSOFT					0x2100
-#define  ZORRO_PROD_READYSOFT_AMAX_II_IV			ZORRO_ID(READYSOFT, 0x01, 0)
-
-#define ZORRO_MANUF_PHASE5					0x2140
-#define  ZORRO_PROD_PHASE5_BLIZZARD_RAM				ZORRO_ID(PHASE5, 0x01, 0)
-#define  ZORRO_PROD_PHASE5_BLIZZARD				ZORRO_ID(PHASE5, 0x02, 0)
-#define  ZORRO_PROD_PHASE5_BLIZZARD_1220_IV			ZORRO_ID(PHASE5, 0x06, 0)
-#define  ZORRO_PROD_PHASE5_FASTLANE_Z3_RAM			ZORRO_ID(PHASE5, 0x0A, 0)
-#define  ZORRO_PROD_PHASE5_BLIZZARD_1230_II_FASTLANE_Z3_CYBERSCSI_CYBERSTORM060	ZORRO_ID(PHASE5, 0x0B, 0)
-#define  ZORRO_PROD_PHASE5_BLIZZARD_1220_CYBERSTORM		ZORRO_ID(PHASE5, 0x0C, 0)
-#define  ZORRO_PROD_PHASE5_BLIZZARD_1230			ZORRO_ID(PHASE5, 0x0D, 0)
-#define  ZORRO_PROD_PHASE5_BLIZZARD_1230_IV_1260		ZORRO_ID(PHASE5, 0x11, 0)
-#define  ZORRO_PROD_PHASE5_BLIZZARD_2060			ZORRO_ID(PHASE5, 0x18, 0)
-#define  ZORRO_PROD_PHASE5_CYBERSTORM_MK_II			ZORRO_ID(PHASE5, 0x19, 0)
-#define  ZORRO_PROD_PHASE5_CYBERVISION64			ZORRO_ID(PHASE5, 0x22, 0)
-#define  ZORRO_PROD_PHASE5_CYBERVISION64_3D_PROTOTYPE		ZORRO_ID(PHASE5, 0x32, 0)
-#define  ZORRO_PROD_PHASE5_CYBERVISION64_3D			ZORRO_ID(PHASE5, 0x43, 0)
-#define  ZORRO_PROD_PHASE5_CYBERSTORM_MK_III			ZORRO_ID(PHASE5, 0x64, 0)
-#define  ZORRO_PROD_PHASE5_BLIZZARD_603E_PLUS			ZORRO_ID(PHASE5, 0x6e, 0)
-
-#define ZORRO_MANUF_DPS						0x2169
-#define  ZORRO_PROD_DPS_PERSONAL_ANIMATION_RECORDER		ZORRO_ID(DPS, 0x01, 0)
-
-#define ZORRO_MANUF_APOLLO_2					0x2200
-#define  ZORRO_PROD_APOLLO_A620_68020_1				ZORRO_ID(APOLLO_2, 0x00, 0)
-#define  ZORRO_PROD_APOLLO_A620_68020_2				ZORRO_ID(APOLLO_2, 0x01, 0)
-
-#define ZORRO_MANUF_APOLLO_3					0x2222
-#define  ZORRO_PROD_APOLLO_AT_APOLLO				ZORRO_ID(APOLLO_3, 0x22, 0)
-#define  ZORRO_PROD_APOLLO_1230_1240_1260_2030_4040_4060	ZORRO_ID(APOLLO_3, 0x23, 0)
-
-#define ZORRO_MANUF_PETSOFF_LP					0x38A5
-#define  ZORRO_PROD_PETSOFF_LP_DELFINA				ZORRO_ID(PETSOFF_LP, 0x00, 0)
-#define  ZORRO_PROD_PETSOFF_LP_DELFINA_LITE			ZORRO_ID(PETSOFF_LP, 0x01, 0)
-
-#define ZORRO_MANUF_UWE_GERLACH					0x3FF7
-#define  ZORRO_PROD_UWE_GERLACH_RAM_ROM				ZORRO_ID(UWE_GERLACH, 0xd4, 0)
-
-#define ZORRO_MANUF_ACT						0x4231
-#define  ZORRO_PROD_ACT_PRELUDE					ZORRO_ID(ACT, 0x01, 0)
-
-#define ZORRO_MANUF_MACROSYSTEMS_GERMANY			0x4754
-#define  ZORRO_PROD_MACROSYSTEMS_MAESTRO			ZORRO_ID(MACROSYSTEMS_GERMANY, 0x03, 0)
-#define  ZORRO_PROD_MACROSYSTEMS_VLAB				ZORRO_ID(MACROSYSTEMS_GERMANY, 0x04, 0)
-#define  ZORRO_PROD_MACROSYSTEMS_MAESTRO_PRO			ZORRO_ID(MACROSYSTEMS_GERMANY, 0x05, 0)
-#define  ZORRO_PROD_MACROSYSTEMS_RETINA				ZORRO_ID(MACROSYSTEMS_GERMANY, 0x06, 0)
-#define  ZORRO_PROD_MACROSYSTEMS_MULTI_EVOLUTION		ZORRO_ID(MACROSYSTEMS_GERMANY, 0x08, 0)
-#define  ZORRO_PROD_MACROSYSTEMS_TOCCATA			ZORRO_ID(MACROSYSTEMS_GERMANY, 0x0C, 0)
-#define  ZORRO_PROD_MACROSYSTEMS_RETINA_Z3			ZORRO_ID(MACROSYSTEMS_GERMANY, 0x10, 0)
-#define  ZORRO_PROD_MACROSYSTEMS_VLAB_MOTION			ZORRO_ID(MACROSYSTEMS_GERMANY, 0x12, 0)
-#define  ZORRO_PROD_MACROSYSTEMS_ALTAIS				ZORRO_ID(MACROSYSTEMS_GERMANY, 0x13, 0)
-#define  ZORRO_PROD_MACROSYSTEMS_FALCON_040			ZORRO_ID(MACROSYSTEMS_GERMANY, 0xFD, 0)
-
-#define ZORRO_MANUF_COMBITEC					0x6766
-
-#define ZORRO_MANUF_SKI_PERIPHERALS				0x8000
-#define  ZORRO_PROD_SKI_PERIPHERALS_MAST_FIREBALL		ZORRO_ID(SKI_PERIPHERALS, 0x08, 0)
-#define  ZORRO_PROD_SKI_PERIPHERALS_SCSI_DUAL_SERIAL		ZORRO_ID(SKI_PERIPHERALS, 0x80, 0)
-
-#define ZORRO_MANUF_REIS_WARE_2					0xA9AD
-#define  ZORRO_PROD_REIS_WARE_SCAN_KING				ZORRO_ID(REIS_WARE_2, 0x11, 0)
-
-#define ZORRO_MANUF_CAMERON					0xAA01
-#define  ZORRO_PROD_CAMERON_PERSONAL_A4				ZORRO_ID(CAMERON, 0x10, 0)
-
-#define ZORRO_MANUF_REIS_WARE					0xAA11
-#define  ZORRO_PROD_REIS_WARE_HANDYSCANNER			ZORRO_ID(REIS_WARE, 0x11, 0)
-
-#define ZORRO_MANUF_PHOENIX_2					0xB5A8
-#define  ZORRO_PROD_PHOENIX_ST506_2				ZORRO_ID(PHOENIX_2, 0x21, 0)
-#define  ZORRO_PROD_PHOENIX_SCSI_2				ZORRO_ID(PHOENIX_2, 0x22, 0)
-#define  ZORRO_PROD_PHOENIX_RAM_2				ZORRO_ID(PHOENIX_2, 0xBE, 0)
-
-#define ZORRO_MANUF_COMBITEC_2					0xC008
-#define  ZORRO_PROD_COMBITEC_HD					ZORRO_ID(COMBITEC_2, 0x2A, 0)
-#define  ZORRO_PROD_COMBITEC_SRAM				ZORRO_ID(COMBITEC_2, 0x2B, 0)
-
-
-    /*
-     *  Test and illegal Manufacturer IDs.
-     */
-
-#define ZORRO_MANUF_HACKER					0x07DB
-#define  ZORRO_PROD_GENERAL_PROTOTYPE				ZORRO_ID(HACKER, 0x00, 0)
-#define  ZORRO_PROD_HACKER_SCSI					ZORRO_ID(HACKER, 0x01, 0)
-#define  ZORRO_PROD_RESOURCE_MANAGEMENT_FORCE_QUICKNET_QN2000	ZORRO_ID(HACKER, 0x02, 0)
-#define  ZORRO_PROD_VECTOR_CONNECTION_2				ZORRO_ID(HACKER, 0xE0, 0)
-#define  ZORRO_PROD_VECTOR_CONNECTION_3				ZORRO_ID(HACKER, 0xE1, 0)
-#define  ZORRO_PROD_VECTOR_CONNECTION_4				ZORRO_ID(HACKER, 0xE2, 0)
-#define  ZORRO_PROD_VECTOR_CONNECTION_5				ZORRO_ID(HACKER, 0xE3, 0)
diff --git a/openflow/usr/include/locale.h b/openflow/usr/include/locale.h
deleted file mode 100644
index 2f85c6c..0000000
--- a/openflow/usr/include/locale.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.11 Localization	<locale.h>
- */
-
-#ifndef	_LOCALE_H
-#define	_LOCALE_H	1
-
-#include <features.h>
-
-#define __need_NULL
-#include <stddef.h>
-#include <bits/locale.h>
-
-__BEGIN_DECLS
-
-/* These are the possibilities for the first argument to setlocale.
-   The code assumes that the lowest LC_* symbol has the value zero.  */
-#define LC_CTYPE          __LC_CTYPE
-#define LC_NUMERIC        __LC_NUMERIC
-#define LC_TIME           __LC_TIME
-#define LC_COLLATE        __LC_COLLATE
-#define LC_MONETARY       __LC_MONETARY
-#define LC_MESSAGES       __LC_MESSAGES
-#define	LC_ALL		  __LC_ALL
-#define LC_PAPER	  __LC_PAPER
-#define LC_NAME		  __LC_NAME
-#define LC_ADDRESS	  __LC_ADDRESS
-#define LC_TELEPHONE	  __LC_TELEPHONE
-#define LC_MEASUREMENT	  __LC_MEASUREMENT
-#define LC_IDENTIFICATION __LC_IDENTIFICATION
-
-
-__BEGIN_NAMESPACE_STD
-
-/* Structure giving information about numeric and monetary notation.  */
-struct lconv
-{
-  /* Numeric (non-monetary) information.  */
-
-  char *decimal_point;		/* Decimal point character.  */
-  char *thousands_sep;		/* Thousands separator.  */
-  /* Each element is the number of digits in each group;
-     elements with higher indices are farther left.
-     An element with value CHAR_MAX means that no further grouping is done.
-     An element with value 0 means that the previous element is used
-     for all groups farther left.  */
-  char *grouping;
-
-  /* Monetary information.  */
-
-  /* First three chars are a currency symbol from ISO 4217.
-     Fourth char is the separator.  Fifth char is '\0'.  */
-  char *int_curr_symbol;
-  char *currency_symbol;	/* Local currency symbol.  */
-  char *mon_decimal_point;	/* Decimal point character.  */
-  char *mon_thousands_sep;	/* Thousands separator.  */
-  char *mon_grouping;		/* Like `grouping' element (above).  */
-  char *positive_sign;		/* Sign for positive values.  */
-  char *negative_sign;		/* Sign for negative values.  */
-  char int_frac_digits;		/* Int'l fractional digits.  */
-  char frac_digits;		/* Local fractional digits.  */
-  /* 1 if currency_symbol precedes a positive value, 0 if succeeds.  */
-  char p_cs_precedes;
-  /* 1 iff a space separates currency_symbol from a positive value.  */
-  char p_sep_by_space;
-  /* 1 if currency_symbol precedes a negative value, 0 if succeeds.  */
-  char n_cs_precedes;
-  /* 1 iff a space separates currency_symbol from a negative value.  */
-  char n_sep_by_space;
-  /* Positive and negative sign positions:
-     0 Parentheses surround the quantity and currency_symbol.
-     1 The sign string precedes the quantity and currency_symbol.
-     2 The sign string follows the quantity and currency_symbol.
-     3 The sign string immediately precedes the currency_symbol.
-     4 The sign string immediately follows the currency_symbol.  */
-  char p_sign_posn;
-  char n_sign_posn;
-#ifdef __USE_ISOC99
-  /* 1 if int_curr_symbol precedes a positive value, 0 if succeeds.  */
-  char int_p_cs_precedes;
-  /* 1 iff a space separates int_curr_symbol from a positive value.  */
-  char int_p_sep_by_space;
-  /* 1 if int_curr_symbol precedes a negative value, 0 if succeeds.  */
-  char int_n_cs_precedes;
-  /* 1 iff a space separates int_curr_symbol from a negative value.  */
-  char int_n_sep_by_space;
-  /* Positive and negative sign positions:
-     0 Parentheses surround the quantity and int_curr_symbol.
-     1 The sign string precedes the quantity and int_curr_symbol.
-     2 The sign string follows the quantity and int_curr_symbol.
-     3 The sign string immediately precedes the int_curr_symbol.
-     4 The sign string immediately follows the int_curr_symbol.  */
-  char int_p_sign_posn;
-  char int_n_sign_posn;
-#else
-  char __int_p_cs_precedes;
-  char __int_p_sep_by_space;
-  char __int_n_cs_precedes;
-  char __int_n_sep_by_space;
-  char __int_p_sign_posn;
-  char __int_n_sign_posn;
-#endif
-};
-
-
-/* Set and/or return the current locale.  */
-extern char *setlocale (int __category, const char *__locale) __THROW;
-
-/* Return the numeric/monetary information for the current locale.  */
-extern struct lconv *localeconv (void) __THROW;
-
-__END_NAMESPACE_STD
-
-
-#ifdef	__USE_XOPEN2K8
-/* The concept of one static locale per category is not very well
-   thought out.  Many applications will need to process its data using
-   information from several different locales.  Another application is
-   the implementation of the internationalization handling in the
-   upcoming ISO C++ standard library.  To support this another set of
-   the functions using locale data exist which have an additional
-   argument.
-
-   Attention: all these functions are *not* standardized in any form.
-   This is a proof-of-concept implementation.  */
-
-/* Get locale datatype definition.  */
-# include <xlocale.h>
-
-/* Return a reference to a data structure representing a set of locale
-   datasets.  Unlike for the CATEGORY parameter for `setlocale' the
-   CATEGORY_MASK parameter here uses a single bit for each category,
-   made by OR'ing together LC_*_MASK bits above.  */
-extern __locale_t newlocale (int __category_mask, const char *__locale,
-			     __locale_t __base) __THROW;
-
-/* These are the bits that can be set in the CATEGORY_MASK argument to
-   `newlocale'.  In the GNU implementation, LC_FOO_MASK has the value
-   of (1 << LC_FOO), but this is not a part of the interface that
-   callers can assume will be true.  */
-# define LC_CTYPE_MASK		(1 << __LC_CTYPE)
-# define LC_NUMERIC_MASK	(1 << __LC_NUMERIC)
-# define LC_TIME_MASK		(1 << __LC_TIME)
-# define LC_COLLATE_MASK	(1 << __LC_COLLATE)
-# define LC_MONETARY_MASK	(1 << __LC_MONETARY)
-# define LC_MESSAGES_MASK	(1 << __LC_MESSAGES)
-# define LC_PAPER_MASK		(1 << __LC_PAPER)
-# define LC_NAME_MASK		(1 << __LC_NAME)
-# define LC_ADDRESS_MASK	(1 << __LC_ADDRESS)
-# define LC_TELEPHONE_MASK	(1 << __LC_TELEPHONE)
-# define LC_MEASUREMENT_MASK	(1 << __LC_MEASUREMENT)
-# define LC_IDENTIFICATION_MASK	(1 << __LC_IDENTIFICATION)
-# define LC_ALL_MASK		(LC_CTYPE_MASK \
-				 | LC_NUMERIC_MASK \
-				 | LC_TIME_MASK \
-				 | LC_COLLATE_MASK \
-				 | LC_MONETARY_MASK \
-				 | LC_MESSAGES_MASK \
-				 | LC_PAPER_MASK \
-				 | LC_NAME_MASK \
-				 | LC_ADDRESS_MASK \
-				 | LC_TELEPHONE_MASK \
-				 | LC_MEASUREMENT_MASK \
-				 | LC_IDENTIFICATION_MASK \
-				 )
-
-/* Return a duplicate of the set of locale in DATASET.  All usage
-   counters are increased if necessary.  */
-extern __locale_t duplocale (__locale_t __dataset) __THROW;
-
-/* Free the data associated with a locale dataset previously returned
-   by a call to `setlocale_r'.  */
-extern void freelocale (__locale_t __dataset) __THROW;
-
-/* Switch the current thread's locale to DATASET.
-   If DATASET is null, instead just return the current setting.
-   The special value LC_GLOBAL_LOCALE is the initial setting
-   for all threads and can also be installed any time, meaning
-   the thread uses the global settings controlled by `setlocale'.  */
-extern __locale_t uselocale (__locale_t __dataset) __THROW;
-
-/* This value can be passed to `uselocale' and may be returned by it.
-   Passing this value to any other function has undefined behavior.  */
-# define LC_GLOBAL_LOCALE	((__locale_t) -1L)
-
-#endif
-
-__END_DECLS
-
-#endif /* locale.h  */
diff --git a/openflow/usr/include/ltdl.h b/openflow/usr/include/ltdl.h
deleted file mode 100644
index f811399..0000000
--- a/openflow/usr/include/ltdl.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ltdl.h -- generic dlopen functions
-
-   Copyright (C) 1998-2000, 2004-2005, 2007-2008, 2011-2015 Free
-   Software Foundation, Inc.
-   Written by Thomas Tanner, 1998
-
-   NOTE: The canonical source of this file is maintained with the
-   GNU Libtool package.  Report bugs to bug-libtool@gnu.org.
-
-GNU Libltdl is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU Libtool, you may include this file under the
-same distribution terms that you use for the rest of that program.
-
-GNU Libltdl is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
-copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
-or obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-/* Only include this header file once. */
-#if !defined LTDL_H
-#define LTDL_H 1
-
-#include <libltdl/lt_system.h>
-#include <libltdl/lt_error.h>
-#include <libltdl/lt_dlloader.h>
-
-LT_BEGIN_C_DECLS
-
-
-/* LT_STRLEN can be used safely on NULL pointers.  */
-#define LT_STRLEN(s)	(((s) && (s)[0]) ? strlen (s) : 0)
-
-
-/* --- DYNAMIC MODULE LOADING API --- */
-
-
-typedef	struct lt__handle *lt_dlhandle;	/* A loaded module.  */
-
-/* Initialisation and finalisation functions for libltdl. */
-LT_SCOPE int	    lt_dlinit		(void);
-LT_SCOPE int	    lt_dlexit		(void);
-
-/* Module search path manipulation.  */
-LT_SCOPE int	    lt_dladdsearchdir	 (const char *search_dir);
-LT_SCOPE int	    lt_dlinsertsearchdir (const char *before,
-						  const char *search_dir);
-LT_SCOPE int	    lt_dlsetsearchpath	 (const char *search_path);
-LT_SCOPE const char *lt_dlgetsearchpath	 (void);
-LT_SCOPE int	    lt_dlforeachfile	 (
-			const char *search_path,
-			int (*func) (const char *filename, void *data),
-			void *data);
-
-/* User module loading advisors.  */
-LT_SCOPE int	    lt_dladvise_init	 (lt_dladvise *advise);
-LT_SCOPE int	    lt_dladvise_destroy  (lt_dladvise *advise);
-LT_SCOPE int	    lt_dladvise_ext	 (lt_dladvise *advise);
-LT_SCOPE int	    lt_dladvise_resident (lt_dladvise *advise);
-LT_SCOPE int	    lt_dladvise_local	 (lt_dladvise *advise);
-LT_SCOPE int	    lt_dladvise_global   (lt_dladvise *advise);
-LT_SCOPE int	    lt_dladvise_preload	 (lt_dladvise *advise);
-
-/* Portable libltdl versions of the system dlopen() API. */
-LT_SCOPE lt_dlhandle lt_dlopen		(const char *filename);
-LT_SCOPE lt_dlhandle lt_dlopenext	(const char *filename);
-LT_SCOPE lt_dlhandle lt_dlopenadvise	(const char *filename,
-					 lt_dladvise advise);
-LT_SCOPE void *	    lt_dlsym		(lt_dlhandle handle, const char *name);
-LT_SCOPE const char *lt_dlerror		(void);
-LT_SCOPE int	    lt_dlclose		(lt_dlhandle handle);
-
-
-
-/* --- PRELOADED MODULE SUPPORT --- */
-
-
-/* A preopened symbol. Arrays of this type comprise the exported
-   symbols for a dlpreopened module. */
-typedef struct {
-  const char *name;
-  void       *address;
-} lt_dlsymlist;
-
-typedef int lt_dlpreload_callback_func (lt_dlhandle handle);
-
-LT_SCOPE int	lt_dlpreload	     (const lt_dlsymlist *preloaded);
-LT_SCOPE int	lt_dlpreload_default (const lt_dlsymlist *preloaded);
-LT_SCOPE int	lt_dlpreload_open    (const char *originator,
-				      lt_dlpreload_callback_func *func);
-
-#define lt_preloaded_symbols	lt__PROGRAM__LTX_preloaded_symbols
-/* Ensure C linkage.  */
-extern LT_DLSYM_CONST lt_dlsymlist lt__PROGRAM__LTX_preloaded_symbols[];
-
-#define LTDL_SET_PRELOADED_SYMBOLS() \
-	lt_dlpreload_default(lt_preloaded_symbols)
-
-
-
-
-/* --- MODULE INFORMATION --- */
-
-
-/* Associating user data with loaded modules. */
-typedef void * lt_dlinterface_id;
-typedef int lt_dlhandle_interface (lt_dlhandle handle, const char *id_string);
-
-LT_SCOPE lt_dlinterface_id lt_dlinterface_register (const char *id_string,
-					  lt_dlhandle_interface *iface);
-LT_SCOPE void	lt_dlinterface_free (lt_dlinterface_id key);
-LT_SCOPE void *	lt_dlcaller_set_data  (lt_dlinterface_id key,
-					  lt_dlhandle handle, void *data);
-LT_SCOPE void *	lt_dlcaller_get_data  (lt_dlinterface_id key,
-					  lt_dlhandle handle);
-
-
-/* Read only information pertaining to a loaded module. */
-typedef	struct {
-  char *	filename;	/* file name */
-  char *	name;		/* module name */
-  int		ref_count;	/* number of times lt_dlopened minus
-				   number of times lt_dlclosed. */
-  unsigned int	is_resident:1;	/* module can't be unloaded. */
-  unsigned int	is_symglobal:1;	/* module symbols can satisfy
-				   subsequently loaded modules.  */
-  unsigned int	is_symlocal:1;	/* module symbols are only available
-				   locally. */
-} lt_dlinfo;
-
-LT_SCOPE const lt_dlinfo *lt_dlgetinfo	    (lt_dlhandle handle);
-
-LT_SCOPE lt_dlhandle	lt_dlhandle_iterate (lt_dlinterface_id iface,
-					     lt_dlhandle place);
-LT_SCOPE lt_dlhandle	lt_dlhandle_fetch   (lt_dlinterface_id iface,
-					     const char *module_name);
-LT_SCOPE int		lt_dlhandle_map	    (lt_dlinterface_id iface,
-				int (*func) (lt_dlhandle handle, void *data),
-				void *data);
-
-
-
-/* Deprecated module residency management API. */
-LT_SCOPE int	    lt_dlmakeresident	(lt_dlhandle handle);
-LT_SCOPE int	    lt_dlisresident	(lt_dlhandle handle);
-
-#define lt_ptr void *
-
-LT_END_C_DECLS
-
-#endif /*!defined LTDL_H*/
diff --git a/openflow/usr/include/malloc.h b/openflow/usr/include/malloc.h
deleted file mode 100644
index f65e18a..0000000
--- a/openflow/usr/include/malloc.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* Prototypes and definition for malloc implementation.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MALLOC_H
-#define _MALLOC_H 1
-
-#include <features.h>
-#include <stddef.h>
-#include <stdio.h>
-
-#ifdef _LIBC
-# define __MALLOC_HOOK_VOLATILE
-# define __MALLOC_DEPRECATED
-#else
-# define __MALLOC_HOOK_VOLATILE volatile
-# define __MALLOC_DEPRECATED __attribute_deprecated__
-#endif
-
-
-__BEGIN_DECLS
-
-/* Allocate SIZE bytes of memory.  */
-extern void *malloc (size_t __size) __THROW __attribute_malloc__ __wur;
-
-/* Allocate NMEMB elements of SIZE bytes each, all initialized to 0.  */
-extern void *calloc (size_t __nmemb, size_t __size)
-__THROW __attribute_malloc__ __wur;
-
-/* Re-allocate the previously allocated block in __ptr, making the new
-   block SIZE bytes long.  */
-/* __attribute_malloc__ is not used, because if realloc returns
-   the same pointer that was passed to it, aliasing needs to be allowed
-   between objects pointed by the old and new pointers.  */
-extern void *realloc (void *__ptr, size_t __size)
-__THROW __attribute_warn_unused_result__;
-
-/* Free a block allocated by `malloc', `realloc' or `calloc'.  */
-extern void free (void *__ptr) __THROW;
-
-/* Free a block allocated by `calloc'. */
-extern void cfree (void *__ptr) __THROW;
-
-/* Allocate SIZE bytes allocated to ALIGNMENT bytes.  */
-extern void *memalign (size_t __alignment, size_t __size)
-__THROW __attribute_malloc__ __wur;
-
-/* Allocate SIZE bytes on a page boundary.  */
-extern void *valloc (size_t __size) __THROW __attribute_malloc__ __wur;
-
-/* Equivalent to valloc(minimum-page-that-holds(n)), that is, round up
-   __size to nearest pagesize. */
-extern void *pvalloc (size_t __size) __THROW __attribute_malloc__ __wur;
-
-/* Underlying allocation function; successive calls should return
-   contiguous pieces of memory.  */
-extern void *(*__morecore) (ptrdiff_t __size);
-
-/* Default value of `__morecore'.  */
-extern void *__default_morecore (ptrdiff_t __size)
-__THROW __attribute_malloc__;
-
-/* SVID2/XPG mallinfo structure */
-
-struct mallinfo
-{
-  int arena;    /* non-mmapped space allocated from system */
-  int ordblks;  /* number of free chunks */
-  int smblks;   /* number of fastbin blocks */
-  int hblks;    /* number of mmapped regions */
-  int hblkhd;   /* space in mmapped regions */
-  int usmblks;  /* maximum total allocated space */
-  int fsmblks;  /* space available in freed fastbin blocks */
-  int uordblks; /* total allocated space */
-  int fordblks; /* total free space */
-  int keepcost; /* top-most, releasable (via malloc_trim) space */
-};
-
-/* Returns a copy of the updated current mallinfo. */
-extern struct mallinfo mallinfo (void) __THROW;
-
-/* SVID2/XPG mallopt options */
-#ifndef M_MXFAST
-# define M_MXFAST  1    /* maximum request size for "fastbins" */
-#endif
-#ifndef M_NLBLKS
-# define M_NLBLKS  2    /* UNUSED in this malloc */
-#endif
-#ifndef M_GRAIN
-# define M_GRAIN   3    /* UNUSED in this malloc */
-#endif
-#ifndef M_KEEP
-# define M_KEEP    4    /* UNUSED in this malloc */
-#endif
-
-/* mallopt options that actually do something */
-#define M_TRIM_THRESHOLD    -1
-#define M_TOP_PAD           -2
-#define M_MMAP_THRESHOLD    -3
-#define M_MMAP_MAX          -4
-#define M_CHECK_ACTION      -5
-#define M_PERTURB           -6
-#define M_ARENA_TEST        -7
-#define M_ARENA_MAX         -8
-
-/* General SVID/XPG interface to tunable parameters. */
-extern int mallopt (int __param, int __val) __THROW;
-
-/* Release all but __pad bytes of freed top-most memory back to the
-   system. Return 1 if successful, else 0. */
-extern int malloc_trim (size_t __pad) __THROW;
-
-/* Report the number of usable allocated bytes associated with allocated
-   chunk __ptr. */
-extern size_t malloc_usable_size (void *__ptr) __THROW;
-
-/* Prints brief summary statistics on stderr. */
-extern void malloc_stats (void) __THROW;
-
-/* Output information about state of allocator to stream FP.  */
-extern int malloc_info (int __options, FILE *__fp) __THROW;
-
-/* Record the state of all malloc variables in an opaque data structure. */
-extern void *malloc_get_state (void) __THROW;
-
-/* Restore the state of all malloc variables from data obtained with
-   malloc_get_state(). */
-extern int malloc_set_state (void *__ptr) __THROW;
-
-/* Called once when malloc is initialized; redefining this variable in
-   the application provides the preferred way to set up the hook
-   pointers. */
-extern void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void)
-__MALLOC_DEPRECATED;
-/* Hooks for debugging and user-defined versions. */
-extern void (*__MALLOC_HOOK_VOLATILE __free_hook) (void *__ptr,
-                                                   const void *)
-__MALLOC_DEPRECATED;
-extern void *(*__MALLOC_HOOK_VOLATILE __malloc_hook)(size_t __size,
-                                                     const void *)
-__MALLOC_DEPRECATED;
-extern void *(*__MALLOC_HOOK_VOLATILE __realloc_hook)(void *__ptr,
-                                                      size_t __size,
-                                                      const void *)
-__MALLOC_DEPRECATED;
-extern void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t __alignment,
-                                                       size_t __size,
-                                                       const void *)
-__MALLOC_DEPRECATED;
-extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void);
-
-/* Activate a standard set of debugging hooks. */
-extern void __malloc_check_init (void) __THROW __MALLOC_DEPRECATED;
-
-
-__END_DECLS
-#endif /* malloc.h */
diff --git a/openflow/usr/include/math.h b/openflow/usr/include/math.h
deleted file mode 100644
index 4724b10..0000000
--- a/openflow/usr/include/math.h
+++ /dev/null
@@ -1,537 +0,0 @@
-/* Declarations for math functions.
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.12 Mathematics	<math.h>
- */
-
-#ifndef	_MATH_H
-#define	_MATH_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* Get machine-dependent vector math functions declarations.  */
-#include <bits/math-vector.h>
-
-/* Get machine-dependent HUGE_VAL value (returned on overflow).
-   On all IEEE754 machines, this is +Infinity.  */
-#include <bits/huge_val.h>
-#ifdef __USE_ISOC99
-# include <bits/huge_valf.h>
-# include <bits/huge_vall.h>
-
-/* Get machine-dependent INFINITY value.  */
-# include <bits/inf.h>
-
-/* Get machine-dependent NAN value (returned for some domain errors).  */
-# include <bits/nan.h>
-#endif /* __USE_ISOC99 */
-
-/* Get general and ISO C99 specific information.  */
-#include <bits/mathdef.h>
-
-/* The file <bits/mathcalls.h> contains the prototypes for all the
-   actual math functions.  These macros are used for those prototypes,
-   so we can easily declare each function as both `name' and `__name',
-   and can declare the float versions `namef' and `__namef'.  */
-
-#define __SIMD_DECL(function) __CONCAT (__DECL_SIMD_, function)
-
-#define __MATHCALL_VEC(function, suffix, args) 	\
-  __SIMD_DECL (__MATH_PRECNAME (function, suffix)) \
-  __MATHCALL (function, suffix, args)
-
-#define __MATHDECL_VEC(type, function,suffix, args) \
-  __SIMD_DECL (__MATH_PRECNAME (function, suffix)) \
-  __MATHDECL(type, function,suffix, args)
-
-#define __MATHCALL(function,suffix, args)	\
-  __MATHDECL (_Mdouble_,function,suffix, args)
-#define __MATHDECL(type, function,suffix, args) \
-  __MATHDECL_1(type, function,suffix, args); \
-  __MATHDECL_1(type, __CONCAT(__,function),suffix, args)
-#define __MATHCALLX(function,suffix, args, attrib)	\
-  __MATHDECLX (_Mdouble_,function,suffix, args, attrib)
-#define __MATHDECLX(type, function,suffix, args, attrib) \
-  __MATHDECL_1(type, function,suffix, args) __attribute__ (attrib); \
-  __MATHDECL_1(type, __CONCAT(__,function),suffix, args) __attribute__ (attrib)
-#define __MATHDECL_1(type, function,suffix, args) \
-  extern type __MATH_PRECNAME(function,suffix) args __THROW
-
-#define _Mdouble_		double
-#define __MATH_PRECNAME(name,r)	__CONCAT(name,r)
-#define __MATH_DECLARING_DOUBLE  1
-#define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_STD
-#define _Mdouble_END_NAMESPACE   __END_NAMESPACE_STD
-#include <bits/mathcalls.h>
-#undef	_Mdouble_
-#undef _Mdouble_BEGIN_NAMESPACE
-#undef _Mdouble_END_NAMESPACE
-#undef	__MATH_PRECNAME
-#undef __MATH_DECLARING_DOUBLE
-
-#ifdef __USE_ISOC99
-
-
-/* Include the file of declarations again, this time using `float'
-   instead of `double' and appending f to each function name.  */
-
-# ifndef _Mfloat_
-#  define _Mfloat_		float
-# endif
-# define _Mdouble_		_Mfloat_
-# define __MATH_PRECNAME(name,r) name##f##r
-# define __MATH_DECLARING_DOUBLE  0
-# define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_C99
-# define _Mdouble_END_NAMESPACE   __END_NAMESPACE_C99
-# include <bits/mathcalls.h>
-# undef	_Mdouble_
-# undef _Mdouble_BEGIN_NAMESPACE
-# undef _Mdouble_END_NAMESPACE
-# undef	__MATH_PRECNAME
-# undef __MATH_DECLARING_DOUBLE
-
-# if !(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \
-     || defined __LDBL_COMPAT \
-     || defined _LIBC_TEST
-#  ifdef __LDBL_COMPAT
-
-#   ifdef __USE_ISOC99
-extern float __nldbl_nexttowardf (float __x, long double __y)
-				  __THROW __attribute__ ((__const__));
-#    ifdef __REDIRECT_NTH
-extern float __REDIRECT_NTH (nexttowardf, (float __x, long double __y),
-			     __nldbl_nexttowardf)
-     __attribute__ ((__const__));
-extern double __REDIRECT_NTH (nexttoward, (double __x, long double __y),
-			      nextafter) __attribute__ ((__const__));
-extern long double __REDIRECT_NTH (nexttowardl,
-				   (long double __x, long double __y),
-				   nextafter) __attribute__ ((__const__));
-#    endif
-#   endif
-
-#   undef __MATHDECL_1
-#   define __MATHDECL_2(type, function,suffix, args, alias) \
-  extern type __REDIRECT_NTH(__MATH_PRECNAME(function,suffix), \
-			     args, alias)
-#   define __MATHDECL_1(type, function,suffix, args) \
-  __MATHDECL_2(type, function,suffix, args, __CONCAT(function,suffix))
-#  endif
-
-/* Include the file of declarations again, this time using `long double'
-   instead of `double' and appending l to each function name.  */
-
-#  ifndef _Mlong_double_
-#   define _Mlong_double_	long double
-#  endif
-#  define _Mdouble_		_Mlong_double_
-#  define __MATH_PRECNAME(name,r) name##l##r
-#  define __MATH_DECLARING_DOUBLE  0
-#  define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_C99
-#  define _Mdouble_END_NAMESPACE   __END_NAMESPACE_C99
-#  define __MATH_DECLARE_LDOUBLE   1
-#  include <bits/mathcalls.h>
-#  undef _Mdouble_
-#  undef _Mdouble_BEGIN_NAMESPACE
-#  undef _Mdouble_END_NAMESPACE
-#  undef __MATH_PRECNAME
-#  undef __MATH_DECLARING_DOUBLE
-
-# endif /* !(__NO_LONG_DOUBLE_MATH && _LIBC) || __LDBL_COMPAT */
-
-#endif	/* Use ISO C99.  */
-#undef	__MATHDECL_1
-#undef	__MATHDECL
-#undef	__MATHCALL
-
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* This variable is used by `gamma' and `lgamma'.  */
-extern int signgam;
-#endif
-
-
-/* ISO C99 defines some generic macros which work on any data type.  */
-#ifdef __USE_ISOC99
-
-/* Get the architecture specific values describing the floating-point
-   evaluation.  The following symbols will get defined:
-
-    float_t	floating-point type at least as wide as `float' used
-		to evaluate `float' expressions
-    double_t	floating-point type at least as wide as `double' used
-		to evaluate `double' expressions
-
-    FLT_EVAL_METHOD
-		Defined to
-		  0	if `float_t' is `float' and `double_t' is `double'
-		  1	if `float_t' and `double_t' are `double'
-		  2	if `float_t' and `double_t' are `long double'
-		  else	`float_t' and `double_t' are unspecified
-
-    INFINITY	representation of the infinity value of type `float'
-
-    FP_FAST_FMA
-    FP_FAST_FMAF
-    FP_FAST_FMAL
-		If defined it indicates that the `fma' function
-		generally executes about as fast as a multiply and an add.
-		This macro is defined only iff the `fma' function is
-		implemented directly with a hardware multiply-add instructions.
-
-    FP_ILOGB0	Expands to a value returned by `ilogb (0.0)'.
-    FP_ILOGBNAN	Expands to a value returned by `ilogb (NAN)'.
-
-    DECIMAL_DIG	Number of decimal digits supported by conversion between
-		decimal and all internal floating-point formats.
-
-*/
-
-/* All floating-point numbers can be put in one of these categories.  */
-enum
-  {
-    FP_NAN =
-# define FP_NAN 0
-      FP_NAN,
-    FP_INFINITE =
-# define FP_INFINITE 1
-      FP_INFINITE,
-    FP_ZERO =
-# define FP_ZERO 2
-      FP_ZERO,
-    FP_SUBNORMAL =
-# define FP_SUBNORMAL 3
-      FP_SUBNORMAL,
-    FP_NORMAL =
-# define FP_NORMAL 4
-      FP_NORMAL
-  };
-
-/* GCC bug 66462 means we cannot use the math builtins with -fsignaling-nan,
-   so disable builtins if this is enabled.  When fixed in a newer GCC,
-   the __SUPPORT_SNAN__ check may be skipped for those versions.  */
-
-/* Return number of classification appropriate for X.  */
-# if __GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__			      \
-     && !defined __OPTIMIZE_SIZE__
-#  define fpclassify(x) __builtin_fpclassify (FP_NAN, FP_INFINITE,	      \
-     FP_NORMAL, FP_SUBNORMAL, FP_ZERO, x)
-# elif defined __NO_LONG_DOUBLE_MATH
-#  define fpclassify(x) \
-     (sizeof (x) == sizeof (float) ? __fpclassifyf (x) : __fpclassify (x))
-# else
-#  define fpclassify(x) \
-     (sizeof (x) == sizeof (float)					      \
-      ? __fpclassifyf (x)						      \
-      : sizeof (x) == sizeof (double)					      \
-      ? __fpclassify (x) : __fpclassifyl (x))
-# endif
-
-/* Return nonzero value if sign of X is negative.  */
-# if __GNUC_PREREQ (4,0)
-#  define signbit(x) \
-     (sizeof (x) == sizeof (float)                                            \
-      ? __builtin_signbitf (x)                                                        \
-      : sizeof (x) == sizeof (double)                                         \
-      ? __builtin_signbit (x) : __builtin_signbitl (x))
-# else
-#  ifdef __NO_LONG_DOUBLE_MATH
-#   define signbit(x) \
-     (sizeof (x) == sizeof (float) ? __signbitf (x) : __signbit (x))
-#  else
-#   define signbit(x) \
-     (sizeof (x) == sizeof (float)					      \
-      ? __signbitf (x)							      \
-      : sizeof (x) == sizeof (double)					      \
-      ? __signbit (x) : __signbitl (x))
-#  endif
-# endif
-
-/* Return nonzero value if X is not +-Inf or NaN.  */
-# if __GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__
-#  define isfinite(x) __builtin_isfinite (x)
-# elif defined __NO_LONG_DOUBLE_MATH
-#  define isfinite(x) \
-     (sizeof (x) == sizeof (float) ? __finitef (x) : __finite (x))
-# else
-#  define isfinite(x) \
-     (sizeof (x) == sizeof (float)					      \
-      ? __finitef (x)							      \
-      : sizeof (x) == sizeof (double)					      \
-      ? __finite (x) : __finitel (x))
-# endif
-
-/* Return nonzero value if X is neither zero, subnormal, Inf, nor NaN.  */
-# if __GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__
-#  define isnormal(x) __builtin_isnormal (x)
-# else
-#  define isnormal(x) (fpclassify (x) == FP_NORMAL)
-# endif
-
-/* Return nonzero value if X is a NaN.  We could use `fpclassify' but
-   we already have this functions `__isnan' and it is faster.  */
-# if __GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__
-#  define isnan(x) __builtin_isnan (x)
-# elif defined __NO_LONG_DOUBLE_MATH
-#  define isnan(x) \
-     (sizeof (x) == sizeof (float) ? __isnanf (x) : __isnan (x))
-# else
-#  define isnan(x) \
-     (sizeof (x) == sizeof (float)					      \
-      ? __isnanf (x)							      \
-      : sizeof (x) == sizeof (double)					      \
-      ? __isnan (x) : __isnanl (x))
-# endif
-
-/* Return nonzero value if X is positive or negative infinity.  */
-# if __GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__
-#  define isinf(x) __builtin_isinf_sign (x)
-# elif defined __NO_LONG_DOUBLE_MATH
-#  define isinf(x) \
-     (sizeof (x) == sizeof (float) ? __isinff (x) : __isinf (x))
-# else
-#  define isinf(x) \
-     (sizeof (x) == sizeof (float)					      \
-      ? __isinff (x)							      \
-      : sizeof (x) == sizeof (double)					      \
-      ? __isinf (x) : __isinfl (x))
-# endif
-
-/* Bitmasks for the math_errhandling macro.  */
-# define MATH_ERRNO	1	/* errno set by math functions.  */
-# define MATH_ERREXCEPT	2	/* Exceptions raised by math functions.  */
-
-/* By default all functions support both errno and exception handling.
-   In gcc's fast math mode and if inline functions are defined this
-   might not be true.  */
-# ifndef __FAST_MATH__
-#  define math_errhandling	(MATH_ERRNO | MATH_ERREXCEPT)
-# endif
-
-#endif /* Use ISO C99.  */
-
-#ifdef __USE_GNU
-/* Return nonzero value if X is a signaling NaN.  */
-# ifdef __NO_LONG_DOUBLE_MATH
-#  define issignaling(x) \
-     (sizeof (x) == sizeof (float) ? __issignalingf (x) : __issignaling (x))
-# else
-#  define issignaling(x) \
-     (sizeof (x) == sizeof (float)					      \
-      ? __issignalingf (x)						      \
-      : sizeof (x) == sizeof (double)					      \
-      ? __issignaling (x) : __issignalingl (x))
-# endif
-#endif /* Use GNU.  */
-
-#ifdef	__USE_MISC
-/* Support for various different standard error handling behaviors.  */
-typedef enum
-{
-  _IEEE_ = -1,	/* According to IEEE 754/IEEE 854.  */
-  _SVID_,	/* According to System V, release 4.  */
-  _XOPEN_,	/* Nowadays also Unix98.  */
-  _POSIX_,
-  _ISOC_	/* Actually this is ISO C99.  */
-} _LIB_VERSION_TYPE;
-
-/* This variable can be changed at run-time to any of the values above to
-   affect floating point error handling behavior (it may also be necessary
-   to change the hardware FPU exception settings).  */
-extern _LIB_VERSION_TYPE _LIB_VERSION;
-#endif
-
-
-#ifdef __USE_MISC
-/* In SVID error handling, `matherr' is called with this description
-   of the exceptional condition.
-
-   We have a problem when using C++ since `exception' is a reserved
-   name in C++.  */
-# ifdef __cplusplus
-struct __exception
-# else
-struct exception
-# endif
-  {
-    int type;
-    char *name;
-    double arg1;
-    double arg2;
-    double retval;
-  };
-
-# ifdef __cplusplus
-extern int matherr (struct __exception *__exc) throw ();
-# else
-extern int matherr (struct exception *__exc);
-# endif
-
-# define X_TLOSS	1.41484755040568800000e+16
-
-/* Types of exceptions in the `type' field.  */
-# define DOMAIN		1
-# define SING		2
-# define OVERFLOW	3
-# define UNDERFLOW	4
-# define TLOSS		5
-# define PLOSS		6
-
-/* SVID mode specifies returning this large value instead of infinity.  */
-# define HUGE		3.40282347e+38F
-
-#else	/* !Misc.  */
-
-# ifdef __USE_XOPEN
-/* X/Open wants another strange constant.  */
-#  define MAXFLOAT	3.40282347e+38F
-# endif
-
-#endif	/* Misc.  */
-
-
-/* Some useful constants.  */
-#if defined __USE_MISC || defined __USE_XOPEN
-# define M_E		2.7182818284590452354	/* e */
-# define M_LOG2E	1.4426950408889634074	/* log_2 e */
-# define M_LOG10E	0.43429448190325182765	/* log_10 e */
-# define M_LN2		0.69314718055994530942	/* log_e 2 */
-# define M_LN10		2.30258509299404568402	/* log_e 10 */
-# define M_PI		3.14159265358979323846	/* pi */
-# define M_PI_2		1.57079632679489661923	/* pi/2 */
-# define M_PI_4		0.78539816339744830962	/* pi/4 */
-# define M_1_PI		0.31830988618379067154	/* 1/pi */
-# define M_2_PI		0.63661977236758134308	/* 2/pi */
-# define M_2_SQRTPI	1.12837916709551257390	/* 2/sqrt(pi) */
-# define M_SQRT2	1.41421356237309504880	/* sqrt(2) */
-# define M_SQRT1_2	0.70710678118654752440	/* 1/sqrt(2) */
-#endif
-
-/* The above constants are not adequate for computation using `long double's.
-   Therefore we provide as an extension constants with similar names as a
-   GNU extension.  Provide enough digits for the 128-bit IEEE quad.  */
-#ifdef __USE_GNU
-# define M_El		2.718281828459045235360287471352662498L /* e */
-# define M_LOG2El	1.442695040888963407359924681001892137L /* log_2 e */
-# define M_LOG10El	0.434294481903251827651128918916605082L /* log_10 e */
-# define M_LN2l		0.693147180559945309417232121458176568L /* log_e 2 */
-# define M_LN10l	2.302585092994045684017991454684364208L /* log_e 10 */
-# define M_PIl		3.141592653589793238462643383279502884L /* pi */
-# define M_PI_2l	1.570796326794896619231321691639751442L /* pi/2 */
-# define M_PI_4l	0.785398163397448309615660845819875721L /* pi/4 */
-# define M_1_PIl	0.318309886183790671537767526745028724L /* 1/pi */
-# define M_2_PIl	0.636619772367581343075535053490057448L /* 2/pi */
-# define M_2_SQRTPIl	1.128379167095512573896158903121545172L /* 2/sqrt(pi) */
-# define M_SQRT2l	1.414213562373095048801688724209698079L /* sqrt(2) */
-# define M_SQRT1_2l	0.707106781186547524400844362104849039L /* 1/sqrt(2) */
-#endif
-
-
-/* When compiling in strict ISO C compatible mode we must not use the
-   inline functions since they, among other things, do not set the
-   `errno' variable correctly.  */
-#if defined __STRICT_ANSI__ && !defined __NO_MATH_INLINES
-# define __NO_MATH_INLINES	1
-#endif
-
-#if defined __USE_ISOC99 && __GNUC_PREREQ(2,97)
-/* ISO C99 defines some macros to compare number while taking care for
-   unordered numbers.  Many FPUs provide special instructions to support
-   these operations.  Generic support in GCC for these as builtins went
-   in before 3.0.0, but not all cpus added their patterns.  We define
-   versions that use the builtins here, and <bits/mathinline.h> will
-   undef/redefine as appropriate for the specific GCC version in use.  */
-# define isgreater(x, y)	__builtin_isgreater(x, y)
-# define isgreaterequal(x, y)	__builtin_isgreaterequal(x, y)
-# define isless(x, y)		__builtin_isless(x, y)
-# define islessequal(x, y)	__builtin_islessequal(x, y)
-# define islessgreater(x, y)	__builtin_islessgreater(x, y)
-# define isunordered(u, v)	__builtin_isunordered(u, v)
-#endif
-
-/* Get machine-dependent inline versions (if there are any).  */
-#ifdef __USE_EXTERN_INLINES
-# include <bits/mathinline.h>
-#endif
-
-/* Define special entry points to use when the compiler got told to
-   only expect finite results.  */
-#if defined __FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0
-# include <bits/math-finite.h>
-#endif
-
-#ifdef __USE_ISOC99
-/* If we've still got undefined comparison macros, provide defaults.  */
-
-/* Return nonzero value if X is greater than Y.  */
-# ifndef isgreater
-#  define isgreater(x, y) \
-  (__extension__							      \
-   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);			      \
-      !isunordered (__x, __y) && __x > __y; }))
-# endif
-
-/* Return nonzero value if X is greater than or equal to Y.  */
-# ifndef isgreaterequal
-#  define isgreaterequal(x, y) \
-  (__extension__							      \
-   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);			      \
-      !isunordered (__x, __y) && __x >= __y; }))
-# endif
-
-/* Return nonzero value if X is less than Y.  */
-# ifndef isless
-#  define isless(x, y) \
-  (__extension__							      \
-   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);			      \
-      !isunordered (__x, __y) && __x < __y; }))
-# endif
-
-/* Return nonzero value if X is less than or equal to Y.  */
-# ifndef islessequal
-#  define islessequal(x, y) \
-  (__extension__							      \
-   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);			      \
-      !isunordered (__x, __y) && __x <= __y; }))
-# endif
-
-/* Return nonzero value if either X is less than Y or Y is less than X.  */
-# ifndef islessgreater
-#  define islessgreater(x, y) \
-  (__extension__							      \
-   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);			      \
-      !isunordered (__x, __y) && (__x < __y || __y < __x); }))
-# endif
-
-/* Return nonzero value if arguments are unordered.  */
-# ifndef isunordered
-#  define isunordered(u, v) \
-  (__extension__							      \
-   ({ __typeof__(u) __u = (u); __typeof__(v) __v = (v);			      \
-      fpclassify (__u) == FP_NAN || fpclassify (__v) == FP_NAN; }))
-# endif
-
-#endif
-
-__END_DECLS
-
-
-#endif /* math.h  */
diff --git a/openflow/usr/include/mcheck.h b/openflow/usr/include/mcheck.h
deleted file mode 100644
index 416fcd6..0000000
--- a/openflow/usr/include/mcheck.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MCHECK_H
-#define _MCHECK_H       1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* Return values for `mprobe': these are the kinds of inconsistencies that
-   `mcheck' enables detection of.  */
-enum mcheck_status
-{
-  MCHECK_DISABLED = -1,         /* Consistency checking is not turned on.  */
-  MCHECK_OK,                    /* Block is fine.  */
-  MCHECK_FREE,                  /* Block freed twice.  */
-  MCHECK_HEAD,                  /* Memory before the block was clobbered.  */
-  MCHECK_TAIL                   /* Memory after the block was clobbered.  */
-};
-
-
-/* Activate a standard collection of debugging hooks.  This must be called
-   before `malloc' is ever called.  ABORTFUNC is called with an error code
-   (see enum above) when an inconsistency is detected.  If ABORTFUNC is
-   null, the standard function prints on stderr and then calls `abort'.  */
-extern int mcheck (void (*__abortfunc)(enum mcheck_status)) __THROW;
-
-/* Similar to `mcheck' but performs checks for all block whenever one of
-   the memory handling functions is called.  This can be very slow.  */
-extern int mcheck_pedantic (void (*__abortfunc)(enum mcheck_status)) __THROW;
-
-/* Force check of all blocks now.  */
-extern void mcheck_check_all (void);
-
-/* Check for aberrations in a particular malloc'd block.  You must have
-   called `mcheck' already.  These are the same checks that `mcheck' does
-   when you free or reallocate a block.  */
-extern enum mcheck_status mprobe (void *__ptr) __THROW;
-
-/* Activate a standard collection of tracing hooks.  */
-extern void mtrace (void) __THROW;
-extern void muntrace (void) __THROW;
-
-__END_DECLS
-#endif /* mcheck.h */
diff --git a/openflow/usr/include/memory.h b/openflow/usr/include/memory.h
deleted file mode 100644
index 10ecaa2..0000000
--- a/openflow/usr/include/memory.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * SVID
- */
-
-#ifndef	_MEMORY_H
-#define	_MEMORY_H	1
-
-#include <features.h>
-
-
-#ifndef	_STRING_H
-# include <string.h>
-#endif	/* string.h  */
-
-
-#endif	/* memory.h  */
diff --git a/openflow/usr/include/menu.h b/openflow/usr/include/menu.h
deleted file mode 100644
index 4eeac01..0000000
--- a/openflow/usr/include/menu.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author:  Juergen Pfeifer, 1995,1997                                    *
- ****************************************************************************/
-
-/* $Id: menu.h,v 1.20 2009/04/05 00:28:07 tom Exp $ */
-
-#ifndef ETI_MENU
-#define ETI_MENU
-
-#ifdef AMIGA
-#define TEXT TEXT_ncurses
-#endif
-
-#include <curses.h>
-#include <eti.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef int Menu_Options;
-typedef int Item_Options;
-
-/* Menu options: */
-#define O_ONEVALUE      (0x01)
-#define O_SHOWDESC      (0x02)
-#define O_ROWMAJOR      (0x04)
-#define O_IGNORECASE    (0x08)
-#define O_SHOWMATCH     (0x10)
-#define O_NONCYCLIC     (0x20)
-
-/* Item options: */
-#define O_SELECTABLE    (0x01)
-
-typedef struct
-{
-  const char* str;
-  unsigned short length;
-} TEXT;
-
-typedef struct tagITEM 
-{
-  TEXT           name;        /* name of menu item                         */
-  TEXT           description; /* description of item, optional in display  */ 
-  struct tagMENU *imenu;      /* Pointer to parent menu                    */
-  void           *userptr;    /* Pointer to user defined per item data     */ 
-  Item_Options   opt;         /* Item options                              */ 
-  short          index;       /* Item number if connected to a menu        */
-  short          y;           /* y and x location of item in menu          */
-  short          x;
-  bool           value;       /* Selection value                           */
-                             
-  struct tagITEM *left;       /* neighbor items                            */
-  struct tagITEM *right;
-  struct tagITEM *up;
-  struct tagITEM *down;
-
-} ITEM;
-
-typedef void (*Menu_Hook)(struct tagMENU *);
-
-typedef struct tagMENU 
-{
-  short          height;                /* Nr. of chars high               */
-  short          width;                 /* Nr. of chars wide               */
-  short          rows;                  /* Nr. of items high               */
-  short          cols;                  /* Nr. of items wide               */
-  short          frows;                 /* Nr. of formatted items high     */
-  short          fcols;                 /* Nr. of formatted items wide     */
-  short          arows;                 /* Nr. of items high (actual)      */
-  short          namelen;               /* Max. name length                */
-  short          desclen;               /* Max. description length         */
-  short          marklen;               /* Length of mark, if any          */
-  short          itemlen;               /* Length of one item              */
-  short          spc_desc;              /* Spacing for descriptor          */
-  short          spc_cols;              /* Spacing for columns             */
-  short          spc_rows;              /* Spacing for rows                */ 
-  char          *pattern;               /* Buffer to store match chars     */
-  short          pindex;                /* Index into pattern buffer       */
-  WINDOW        *win;                   /* Window containing menu          */
-  WINDOW        *sub;                   /* Subwindow for menu display      */
-  WINDOW        *userwin;               /* User's window                   */
-  WINDOW        *usersub;               /* User's subwindow                */
-  ITEM          **items;                /* array of items                  */ 
-  short          nitems;                /* Nr. of items in menu            */
-  ITEM          *curitem;               /* Current item                    */
-  short          toprow;                /* Top row of menu                 */
-  chtype         fore;                  /* Selection attribute             */
-  chtype         back;                  /* Nonselection attribute          */
-  chtype         grey;                  /* Inactive attribute              */
-  unsigned char  pad;                   /* Pad character                   */
-
-  Menu_Hook      menuinit;              /* User hooks                      */
-  Menu_Hook      menuterm;
-  Menu_Hook      iteminit;
-  Menu_Hook      itemterm;
-
-  void          *userptr;               /* Pointer to menus user data      */
-  char          *mark;                  /* Pointer to marker string        */
-
-  Menu_Options   opt;                   /* Menu options                    */
-  unsigned short status;                /* Internal state of menu          */
-
-} MENU;
-
-
-/* Define keys */
-
-#define REQ_LEFT_ITEM           (KEY_MAX + 1)
-#define REQ_RIGHT_ITEM          (KEY_MAX + 2)
-#define REQ_UP_ITEM             (KEY_MAX + 3)
-#define REQ_DOWN_ITEM           (KEY_MAX + 4)
-#define REQ_SCR_ULINE           (KEY_MAX + 5)
-#define REQ_SCR_DLINE           (KEY_MAX + 6)
-#define REQ_SCR_DPAGE           (KEY_MAX + 7)
-#define REQ_SCR_UPAGE           (KEY_MAX + 8)
-#define REQ_FIRST_ITEM          (KEY_MAX + 9)
-#define REQ_LAST_ITEM           (KEY_MAX + 10)
-#define REQ_NEXT_ITEM           (KEY_MAX + 11)
-#define REQ_PREV_ITEM           (KEY_MAX + 12)
-#define REQ_TOGGLE_ITEM         (KEY_MAX + 13)
-#define REQ_CLEAR_PATTERN       (KEY_MAX + 14)
-#define REQ_BACK_PATTERN        (KEY_MAX + 15)
-#define REQ_NEXT_MATCH          (KEY_MAX + 16)
-#define REQ_PREV_MATCH          (KEY_MAX + 17)
-
-#define MIN_MENU_COMMAND        (KEY_MAX + 1)
-#define MAX_MENU_COMMAND        (KEY_MAX + 17)
-
-/*
- * Some AT&T code expects MAX_COMMAND to be out-of-band not
- * just for menu commands but for forms ones as well.
- */
-#if defined(MAX_COMMAND)
-#  if (MAX_MENU_COMMAND > MAX_COMMAND)
-#    error Something is wrong -- MAX_MENU_COMMAND is greater than MAX_COMMAND
-#  elif (MAX_COMMAND != (KEY_MAX + 128))
-#    error Something is wrong -- MAX_COMMAND is already inconsistently defined.
-#  endif
-#else
-#  define MAX_COMMAND (KEY_MAX + 128)
-#endif
-
-
-/* --------- prototypes for libmenu functions ----------------------------- */
-
-extern NCURSES_EXPORT(ITEM **)	menu_items (const MENU *);
-extern NCURSES_EXPORT(ITEM *)	current_item (const MENU *);
-extern NCURSES_EXPORT(ITEM *)	new_item (const char *,const char *);
-
-extern NCURSES_EXPORT(MENU *)	new_menu (ITEM **);
-
-extern NCURSES_EXPORT(Item_Options)	item_opts (const ITEM *);
-extern NCURSES_EXPORT(Menu_Options)	menu_opts (const MENU *);
-
-extern NCURSES_EXPORT(Menu_Hook)	item_init (const MENU *);
-extern NCURSES_EXPORT(Menu_Hook)	item_term (const MENU *);
-extern NCURSES_EXPORT(Menu_Hook)	menu_init (const MENU *);
-extern NCURSES_EXPORT(Menu_Hook)	menu_term (const MENU *);
-
-extern NCURSES_EXPORT(WINDOW *)	menu_sub (const MENU *);
-extern NCURSES_EXPORT(WINDOW *)	menu_win (const MENU *);
-
-extern NCURSES_EXPORT(const char *)	item_description (const ITEM *);
-extern NCURSES_EXPORT(const char *)	item_name (const ITEM *);
-extern NCURSES_EXPORT(const char *)	menu_mark (const MENU *);
-extern NCURSES_EXPORT(const char *)	menu_request_name (int);
-
-extern NCURSES_EXPORT(char *)	menu_pattern (const MENU *);
-
-extern NCURSES_EXPORT(void *)	menu_userptr (const MENU *);
-extern NCURSES_EXPORT(void *)	item_userptr (const ITEM *);
-
-extern NCURSES_EXPORT(chtype)	menu_back (const MENU *);
-extern NCURSES_EXPORT(chtype)	menu_fore (const MENU *);
-extern NCURSES_EXPORT(chtype)	menu_grey (const MENU *);
-
-extern NCURSES_EXPORT(int)	free_item (ITEM *);
-extern NCURSES_EXPORT(int)	free_menu (MENU *);
-extern NCURSES_EXPORT(int)	item_count (const MENU *);
-extern NCURSES_EXPORT(int)	item_index (const ITEM *);
-extern NCURSES_EXPORT(int)	item_opts_off (ITEM *,Item_Options);
-extern NCURSES_EXPORT(int)	item_opts_on (ITEM *,Item_Options);
-extern NCURSES_EXPORT(int)	menu_driver (MENU *,int);
-extern NCURSES_EXPORT(int)	menu_opts_off (MENU *,Menu_Options);
-extern NCURSES_EXPORT(int)	menu_opts_on (MENU *,Menu_Options);
-extern NCURSES_EXPORT(int)	menu_pad (const MENU *);
-extern NCURSES_EXPORT(int)	pos_menu_cursor (const MENU *);
-extern NCURSES_EXPORT(int)	post_menu (MENU *);
-extern NCURSES_EXPORT(int)	scale_menu (const MENU *,int *,int *);
-extern NCURSES_EXPORT(int)	set_current_item (MENU *menu,ITEM *item);
-extern NCURSES_EXPORT(int)	set_item_init (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_item_opts (ITEM *,Item_Options);
-extern NCURSES_EXPORT(int)	set_item_term (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_item_userptr (ITEM *, void *);
-extern NCURSES_EXPORT(int)	set_item_value (ITEM *,bool);
-extern NCURSES_EXPORT(int)	set_menu_back (MENU *,chtype);
-extern NCURSES_EXPORT(int)	set_menu_fore (MENU *,chtype);
-extern NCURSES_EXPORT(int)	set_menu_format (MENU *,int,int);
-extern NCURSES_EXPORT(int)	set_menu_grey (MENU *,chtype);
-extern NCURSES_EXPORT(int)	set_menu_init (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_menu_items (MENU *,ITEM **);
-extern NCURSES_EXPORT(int)	set_menu_mark (MENU *, const char *);
-extern NCURSES_EXPORT(int)	set_menu_opts (MENU *,Menu_Options);
-extern NCURSES_EXPORT(int)	set_menu_pad (MENU *,int);
-extern NCURSES_EXPORT(int)	set_menu_pattern (MENU *,const char *);
-extern NCURSES_EXPORT(int)	set_menu_sub (MENU *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_menu_term (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_menu_userptr (MENU *,void *);
-extern NCURSES_EXPORT(int)	set_menu_win (MENU *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_top_row (MENU *,int);
-extern NCURSES_EXPORT(int)	top_row (const MENU *);
-extern NCURSES_EXPORT(int)	unpost_menu (MENU *);
-extern NCURSES_EXPORT(int)	menu_request_by_name (const char *);
-extern NCURSES_EXPORT(int)	set_menu_spacing (MENU *,int,int,int);
-extern NCURSES_EXPORT(int)	menu_spacing (const MENU *,int *,int *,int *);
-
-
-extern NCURSES_EXPORT(bool)	item_value (const ITEM *);
-extern NCURSES_EXPORT(bool)	item_visible (const ITEM *);
-
-extern NCURSES_EXPORT(void)	menu_format (const MENU *,int *,int *);
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(MENU *)	NCURSES_SP_NAME(new_menu) (SCREEN*, ITEM **);
-#endif
-
-#ifdef __cplusplus
-  }
-#endif
-
-#endif /* ETI_MENU */
diff --git a/openflow/usr/include/misc/cxl.h b/openflow/usr/include/misc/cxl.h
deleted file mode 100644
index 94126f7..0000000
--- a/openflow/usr/include/misc/cxl.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2014 IBM Corp.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _MISC_CXL_H
-#define _MISC_CXL_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-
-struct cxl_ioctl_start_work {
-	__u64 flags;
-	__u64 work_element_descriptor;
-	__u64 amr;
-	__s16 num_interrupts;
-	__s16 reserved1;
-	__s32 reserved2;
-	__u64 reserved3;
-	__u64 reserved4;
-	__u64 reserved5;
-	__u64 reserved6;
-};
-
-#define CXL_START_WORK_AMR		0x0000000000000001ULL
-#define CXL_START_WORK_NUM_IRQS		0x0000000000000002ULL
-#define CXL_START_WORK_ERR_FF		0x0000000000000004ULL
-#define CXL_START_WORK_ALL		(CXL_START_WORK_AMR |\
-					 CXL_START_WORK_NUM_IRQS |\
-					 CXL_START_WORK_ERR_FF)
-
-
-/* Possible modes that an afu can be in */
-#define CXL_MODE_DEDICATED   0x1
-#define CXL_MODE_DIRECTED    0x2
-
-/* possible flags for the cxl_afu_id flags field */
-#define CXL_AFUID_FLAG_SLAVE    0x1  /* In directed-mode afu is in slave mode */
-
-struct cxl_afu_id {
-	__u64 flags;     /* One of CXL_AFUID_FLAG_X */
-	__u32 card_id;
-	__u32 afu_offset;
-	__u32 afu_mode;  /* one of the CXL_MODE_X */
-	__u32 reserved1;
-	__u64 reserved2;
-	__u64 reserved3;
-	__u64 reserved4;
-	__u64 reserved5;
-	__u64 reserved6;
-};
-
-/* ioctl numbers */
-#define CXL_MAGIC 0xCA
-#define CXL_IOCTL_START_WORK		_IOW(CXL_MAGIC, 0x00, struct cxl_ioctl_start_work)
-#define CXL_IOCTL_GET_PROCESS_ELEMENT	_IOR(CXL_MAGIC, 0x01, __u32)
-#define CXL_IOCTL_GET_AFU_ID            _IOR(CXL_MAGIC, 0x02, struct cxl_afu_id)
-
-#define CXL_READ_MIN_SIZE 0x1000 /* 4K */
-
-/* Events from read() */
-enum cxl_event_type {
-	CXL_EVENT_RESERVED      = 0,
-	CXL_EVENT_AFU_INTERRUPT = 1,
-	CXL_EVENT_DATA_STORAGE  = 2,
-	CXL_EVENT_AFU_ERROR     = 3,
-};
-
-struct cxl_event_header {
-	__u16 type;
-	__u16 size;
-	__u16 process_element;
-	__u16 reserved1;
-};
-
-struct cxl_event_afu_interrupt {
-	__u16 flags;
-	__u16 irq; /* Raised AFU interrupt number */
-	__u32 reserved1;
-};
-
-struct cxl_event_data_storage {
-	__u16 flags;
-	__u16 reserved1;
-	__u32 reserved2;
-	__u64 addr;
-	__u64 dsisr;
-	__u64 reserved3;
-};
-
-struct cxl_event_afu_error {
-	__u16 flags;
-	__u16 reserved1;
-	__u32 reserved2;
-	__u64 error;
-};
-
-struct cxl_event {
-	struct cxl_event_header header;
-	union {
-		struct cxl_event_afu_interrupt irq;
-		struct cxl_event_data_storage fault;
-		struct cxl_event_afu_error afu_error;
-	};
-};
-
-#endif /* _MISC_CXL_H */
diff --git a/openflow/usr/include/mntent.h b/openflow/usr/include/mntent.h
deleted file mode 100644
index 43c083b..0000000
--- a/openflow/usr/include/mntent.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_MNTENT_H
-#define	_MNTENT_H	1
-
-#include <features.h>
-#define __need_FILE
-#include <stdio.h>
-#include <paths.h>
-
-
-/* File listing canonical interesting mount points.  */
-#define	MNTTAB		_PATH_MNTTAB	/* Deprecated alias.  */
-
-/* File listing currently active mount points.  */
-#define	MOUNTED		_PATH_MOUNTED	/* Deprecated alias.  */
-
-
-/* General filesystem types.  */
-#define MNTTYPE_IGNORE	"ignore"	/* Ignore this entry.  */
-#define MNTTYPE_NFS	"nfs"		/* Network file system.  */
-#define MNTTYPE_SWAP	"swap"		/* Swap device.  */
-
-
-/* Generic mount options.  */
-#define MNTOPT_DEFAULTS	"defaults"	/* Use all default options.  */
-#define MNTOPT_RO	"ro"		/* Read only.  */
-#define MNTOPT_RW	"rw"		/* Read/write.  */
-#define MNTOPT_SUID	"suid"		/* Set uid allowed.  */
-#define MNTOPT_NOSUID	"nosuid"	/* No set uid allowed.  */
-#define MNTOPT_NOAUTO	"noauto"	/* Do not auto mount.  */
-
-
-__BEGIN_DECLS
-
-/* Structure describing a mount table entry.  */
-struct mntent
-  {
-    char *mnt_fsname;		/* Device or server for filesystem.  */
-    char *mnt_dir;		/* Directory mounted on.  */
-    char *mnt_type;		/* Type of filesystem: ufs, nfs, etc.  */
-    char *mnt_opts;		/* Comma-separated options for fs.  */
-    int mnt_freq;		/* Dump frequency (in days).  */
-    int mnt_passno;		/* Pass number for `fsck'.  */
-  };
-
-
-/* Prepare to begin reading and/or writing mount table entries from the
-   beginning of FILE.  MODE is as for `fopen'.  */
-extern FILE *setmntent (const char *__file, const char *__mode) __THROW;
-
-/* Read one mount table entry from STREAM.  Returns a pointer to storage
-   reused on the next call, or null for EOF or error (use feof/ferror to
-   check).  */
-extern struct mntent *getmntent (FILE *__stream) __THROW;
-
-#ifdef __USE_MISC
-/* Reentrant version of the above function.  */
-extern struct mntent *getmntent_r (FILE *__restrict __stream,
-				   struct mntent *__restrict __result,
-				   char *__restrict __buffer,
-				   int __bufsize) __THROW;
-#endif
-
-/* Write the mount table entry described by MNT to STREAM.
-   Return zero on success, nonzero on failure.  */
-extern int addmntent (FILE *__restrict __stream,
-		      const struct mntent *__restrict __mnt) __THROW;
-
-/* Close a stream opened with `setmntent'.  */
-extern int endmntent (FILE *__stream) __THROW;
-
-/* Search MNT->mnt_opts for an option matching OPT.
-   Returns the address of the substring, or null if none found.  */
-extern char *hasmntopt (const struct mntent *__mnt,
-			const char *__opt) __THROW;
-
-
-__END_DECLS
-
-#endif	/* mntent.h */
diff --git a/openflow/usr/include/monetary.h b/openflow/usr/include/monetary.h
deleted file mode 100644
index 1fe9d6b..0000000
--- a/openflow/usr/include/monetary.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Header file for monetary value formatting functions.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_MONETARY_H
-#define	_MONETARY_H	1
-
-#include <features.h>
-
-/* Get needed types.  */
-#define __need_size_t
-#include <stddef.h>
-#include <bits/types.h>
-
-#ifndef	__ssize_t_defined
-typedef __ssize_t ssize_t;
-# define __ssize_t_defined
-#endif
-
-
-__BEGIN_DECLS
-
-/* Formatting a monetary value according to the current locale.  */
-extern ssize_t strfmon (char *__restrict __s, size_t __maxsize,
-			const char *__restrict __format, ...)
-     __THROW __attribute_format_strfmon__ (3, 4);
-
-#ifdef __USE_XOPEN2K8
-# include <xlocale.h>
-
-/* Formatting a monetary value according to the given locale.  */
-extern ssize_t strfmon_l (char *__restrict __s, size_t __maxsize,
-			  __locale_t __loc,
-			  const char *__restrict __format, ...)
-     __THROW __attribute_format_strfmon__ (4, 5);
-#endif
-
-#ifdef __LDBL_COMPAT
-# include <bits/monetary-ldbl.h>
-#endif
-
-__END_DECLS
-
-#endif	/* monetary.h */
diff --git a/openflow/usr/include/mqueue.h b/openflow/usr/include/mqueue.h
deleted file mode 100644
index 9700cdc..0000000
--- a/openflow/usr/include/mqueue.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright (C) 2004-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MQUEUE_H
-#define _MQUEUE_H	1
-
-#include <features.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#define __need_sigevent_t
-#include <bits/siginfo.h>
-#define __need_timespec
-#include <time.h>
-/* Get the definition of mqd_t and struct mq_attr.  */
-#include <bits/mqueue.h>
-
-__BEGIN_DECLS
-
-/* Establish connection between a process and a message queue NAME and
-   return message queue descriptor or (mqd_t) -1 on error.  OFLAG determines
-   the type of access used.  If O_CREAT is on OFLAG, the third argument is
-   taken as a `mode_t', the mode of the created message queue, and the fourth
-   argument is taken as `struct mq_attr *', pointer to message queue
-   attributes.  If the fourth argument is NULL, default attributes are
-   used.  */
-extern mqd_t mq_open (const char *__name, int __oflag, ...)
-  __THROW __nonnull ((1));
-
-/* Removes the association between message queue descriptor MQDES and its
-   message queue.  */
-extern int mq_close (mqd_t __mqdes) __THROW;
-
-/* Query status and attributes of message queue MQDES.  */
-extern int mq_getattr (mqd_t __mqdes, struct mq_attr *__mqstat)
-  __THROW __nonnull ((2));
-
-/* Set attributes associated with message queue MQDES and if OMQSTAT is
-   not NULL also query its old attributes.  */
-extern int mq_setattr (mqd_t __mqdes,
-		       const struct mq_attr *__restrict __mqstat,
-		       struct mq_attr *__restrict __omqstat)
-  __THROW __nonnull ((2));
-
-/* Remove message queue named NAME.  */
-extern int mq_unlink (const char *__name) __THROW __nonnull ((1));
-
-/* Register notification issued upon message arrival to an empty
-   message queue MQDES.  */
-extern int mq_notify (mqd_t __mqdes, const struct sigevent *__notification)
-     __THROW;
-
-/* Receive the oldest from highest priority messages in message queue
-   MQDES.  */
-extern ssize_t mq_receive (mqd_t __mqdes, char *__msg_ptr, size_t __msg_len,
-			   unsigned int *__msg_prio) __nonnull ((2));
-
-/* Add message pointed by MSG_PTR to message queue MQDES.  */
-extern int mq_send (mqd_t __mqdes, const char *__msg_ptr, size_t __msg_len,
-		    unsigned int __msg_prio) __nonnull ((2));
-
-#ifdef __USE_XOPEN2K
-/* Receive the oldest from highest priority messages in message queue
-   MQDES, stop waiting if ABS_TIMEOUT expires.  */
-extern ssize_t mq_timedreceive (mqd_t __mqdes, char *__restrict __msg_ptr,
-				size_t __msg_len,
-				unsigned int *__restrict __msg_prio,
-				const struct timespec *__restrict __abs_timeout)
-  __nonnull ((2, 5));
-
-/* Add message pointed by MSG_PTR to message queue MQDES, stop blocking
-   on full message queue if ABS_TIMEOUT expires.  */
-extern int mq_timedsend (mqd_t __mqdes, const char *__msg_ptr,
-			 size_t __msg_len, unsigned int __msg_prio,
-			 const struct timespec *__abs_timeout)
-  __nonnull ((2, 5));
-#endif
-
-/* Define some inlines helping to catch common problems.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function \
-    && defined __va_arg_pack_len
-# include <bits/mqueue2.h>
-#endif
-
-__END_DECLS
-
-#endif /* mqueue.h */
diff --git a/openflow/usr/include/mtd/inftl-user.h b/openflow/usr/include/mtd/inftl-user.h
deleted file mode 100644
index 8376bd1..0000000
--- a/openflow/usr/include/mtd/inftl-user.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Parts of INFTL headers shared with userspace
- *
- */
-
-#ifndef __MTD_INFTL_USER_H__
-#define __MTD_INFTL_USER_H__
-
-#include <linux/types.h>
-
-#define	OSAK_VERSION	0x5120
-#define	PERCENTUSED	98
-
-#define	SECTORSIZE	512
-
-/* Block Control Information */
-
-struct inftl_bci {
-	__u8 ECCsig[6];
-	__u8 Status;
-	__u8 Status1;
-} __attribute__((packed));
-
-struct inftl_unithead1 {
-	__u16 virtualUnitNo;
-	__u16 prevUnitNo;
-	__u8 ANAC;
-	__u8 NACs;
-	__u8 parityPerField;
-	__u8 discarded;
-} __attribute__((packed));
-
-struct inftl_unithead2 {
-	__u8 parityPerField;
-	__u8 ANAC;
-	__u16 prevUnitNo;
-	__u16 virtualUnitNo;
-	__u8 NACs;
-	__u8 discarded;
-} __attribute__((packed));
-
-struct inftl_unittail {
-	__u8 Reserved[4];
-	__u16 EraseMark;
-	__u16 EraseMark1;
-} __attribute__((packed));
-
-union inftl_uci {
-	struct inftl_unithead1 a;
-	struct inftl_unithead2 b;
-	struct inftl_unittail c;
-};
-
-struct inftl_oob {
-	struct inftl_bci b;
-	union inftl_uci u;
-};
-
-
-/* INFTL Media Header */
-
-struct INFTLPartition {
-	__u32 virtualUnits;
-	__u32 firstUnit;
-	__u32 lastUnit;
-	__u32 flags;
-	__u32 spareUnits;
-	__u32 Reserved0;
-	__u32 Reserved1;
-} __attribute__((packed));
-
-struct INFTLMediaHeader {
-	char bootRecordID[8];
-	__u32 NoOfBootImageBlocks;
-	__u32 NoOfBinaryPartitions;
-	__u32 NoOfBDTLPartitions;
-	__u32 BlockMultiplierBits;
-	__u32 FormatFlags;
-	__u32 OsakVersion;
-	__u32 PercentUsed;
-	struct INFTLPartition Partitions[4];
-} __attribute__((packed));
-
-/* Partition flag types */
-#define	INFTL_BINARY	0x20000000
-#define	INFTL_BDTL	0x40000000
-#define	INFTL_LAST	0x80000000
-
-#endif /* __MTD_INFTL_USER_H__ */
-
-
diff --git a/openflow/usr/include/mtd/mtd-abi.h b/openflow/usr/include/mtd/mtd-abi.h
deleted file mode 100644
index 20444f3..0000000
--- a/openflow/usr/include/mtd/mtd-abi.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org> et al.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef __MTD_ABI_H__
-#define __MTD_ABI_H__
-
-#include <linux/types.h>
-
-struct erase_info_user {
-	__u32 start;
-	__u32 length;
-};
-
-struct erase_info_user64 {
-	__u64 start;
-	__u64 length;
-};
-
-struct mtd_oob_buf {
-	__u32 start;
-	__u32 length;
-	unsigned char *ptr;
-};
-
-struct mtd_oob_buf64 {
-	__u64 start;
-	__u32 pad;
-	__u32 length;
-	__u64 usr_ptr;
-};
-
-/**
- * MTD operation modes
- *
- * @MTD_OPS_PLACE_OOB:	OOB data are placed at the given offset (default)
- * @MTD_OPS_AUTO_OOB:	OOB data are automatically placed at the free areas
- *			which are defined by the internal ecclayout
- * @MTD_OPS_RAW:	data are transferred as-is, with no error correction;
- *			this mode implies %MTD_OPS_PLACE_OOB
- *
- * These modes can be passed to ioctl(MEMWRITE) and are also used internally.
- * See notes on "MTD file modes" for discussion on %MTD_OPS_RAW vs.
- * %MTD_FILE_MODE_RAW.
- */
-enum {
-	MTD_OPS_PLACE_OOB = 0,
-	MTD_OPS_AUTO_OOB = 1,
-	MTD_OPS_RAW = 2,
-};
-
-/**
- * struct mtd_write_req - data structure for requesting a write operation
- *
- * @start:	start address
- * @len:	length of data buffer
- * @ooblen:	length of OOB buffer
- * @usr_data:	user-provided data buffer
- * @usr_oob:	user-provided OOB buffer
- * @mode:	MTD mode (see "MTD operation modes")
- * @padding:	reserved, must be set to 0
- *
- * This structure supports ioctl(MEMWRITE) operations, allowing data and/or OOB
- * writes in various modes. To write to OOB-only, set @usr_data == NULL, and to
- * write data-only, set @usr_oob == NULL. However, setting both @usr_data and
- * @usr_oob to NULL is not allowed.
- */
-struct mtd_write_req {
-	__u64 start;
-	__u64 len;
-	__u64 ooblen;
-	__u64 usr_data;
-	__u64 usr_oob;
-	__u8 mode;
-	__u8 padding[7];
-};
-
-#define MTD_ABSENT		0
-#define MTD_RAM			1
-#define MTD_ROM			2
-#define MTD_NORFLASH		3
-#define MTD_NANDFLASH		4	/* SLC NAND */
-#define MTD_DATAFLASH		6
-#define MTD_UBIVOLUME		7
-#define MTD_MLCNANDFLASH	8	/* MLC NAND (including TLC) */
-
-#define MTD_WRITEABLE		0x400	/* Device is writeable */
-#define MTD_BIT_WRITEABLE	0x800	/* Single bits can be flipped */
-#define MTD_NO_ERASE		0x1000	/* No erase necessary */
-#define MTD_POWERUP_LOCK	0x2000	/* Always locked after reset */
-
-/* Some common devices / combinations of capabilities */
-#define MTD_CAP_ROM		0
-#define MTD_CAP_RAM		(MTD_WRITEABLE | MTD_BIT_WRITEABLE | MTD_NO_ERASE)
-#define MTD_CAP_NORFLASH	(MTD_WRITEABLE | MTD_BIT_WRITEABLE)
-#define MTD_CAP_NANDFLASH	(MTD_WRITEABLE)
-#define MTD_CAP_NVRAM		(MTD_WRITEABLE | MTD_BIT_WRITEABLE | MTD_NO_ERASE)
-
-/* Obsolete ECC byte placement modes (used with obsolete MEMGETOOBSEL) */
-#define MTD_NANDECC_OFF		0	// Switch off ECC (Not recommended)
-#define MTD_NANDECC_PLACE	1	// Use the given placement in the structure (YAFFS1 legacy mode)
-#define MTD_NANDECC_AUTOPLACE	2	// Use the default placement scheme
-#define MTD_NANDECC_PLACEONLY	3	// Use the given placement in the structure (Do not store ecc result on read)
-#define MTD_NANDECC_AUTOPL_USR 	4	// Use the given autoplacement scheme rather than using the default
-
-/* OTP mode selection */
-#define MTD_OTP_OFF		0
-#define MTD_OTP_FACTORY		1
-#define MTD_OTP_USER		2
-
-struct mtd_info_user {
-	__u8 type;
-	__u32 flags;
-	__u32 size;	/* Total size of the MTD */
-	__u32 erasesize;
-	__u32 writesize;
-	__u32 oobsize;	/* Amount of OOB data per block (e.g. 16) */
-	__u64 padding;	/* Old obsolete field; do not use */
-};
-
-struct region_info_user {
-	__u32 offset;		/* At which this region starts,
-				 * from the beginning of the MTD */
-	__u32 erasesize;	/* For this region */
-	__u32 numblocks;	/* Number of blocks in this region */
-	__u32 regionindex;
-};
-
-struct otp_info {
-	__u32 start;
-	__u32 length;
-	__u32 locked;
-};
-
-/*
- * Note, the following ioctl existed in the past and was removed:
- * #define MEMSETOOBSEL           _IOW('M', 9, struct nand_oobinfo)
- * Try to avoid adding a new ioctl with the same ioctl number.
- */
-
-/* Get basic MTD characteristics info (better to use sysfs) */
-#define MEMGETINFO		_IOR('M', 1, struct mtd_info_user)
-/* Erase segment of MTD */
-#define MEMERASE		_IOW('M', 2, struct erase_info_user)
-/* Write out-of-band data from MTD */
-#define MEMWRITEOOB		_IOWR('M', 3, struct mtd_oob_buf)
-/* Read out-of-band data from MTD */
-#define MEMREADOOB		_IOWR('M', 4, struct mtd_oob_buf)
-/* Lock a chip (for MTD that supports it) */
-#define MEMLOCK			_IOW('M', 5, struct erase_info_user)
-/* Unlock a chip (for MTD that supports it) */
-#define MEMUNLOCK		_IOW('M', 6, struct erase_info_user)
-/* Get the number of different erase regions */
-#define MEMGETREGIONCOUNT	_IOR('M', 7, int)
-/* Get information about the erase region for a specific index */
-#define MEMGETREGIONINFO	_IOWR('M', 8, struct region_info_user)
-/* Get info about OOB modes (e.g., RAW, PLACE, AUTO) - legacy interface */
-#define MEMGETOOBSEL		_IOR('M', 10, struct nand_oobinfo)
-/* Check if an eraseblock is bad */
-#define MEMGETBADBLOCK		_IOW('M', 11, __kernel_loff_t)
-/* Mark an eraseblock as bad */
-#define MEMSETBADBLOCK		_IOW('M', 12, __kernel_loff_t)
-/* Set OTP (One-Time Programmable) mode (factory vs. user) */
-#define OTPSELECT		_IOR('M', 13, int)
-/* Get number of OTP (One-Time Programmable) regions */
-#define OTPGETREGIONCOUNT	_IOW('M', 14, int)
-/* Get all OTP (One-Time Programmable) info about MTD */
-#define OTPGETREGIONINFO	_IOW('M', 15, struct otp_info)
-/* Lock a given range of user data (must be in mode %MTD_FILE_MODE_OTP_USER) */
-#define OTPLOCK			_IOR('M', 16, struct otp_info)
-/* Get ECC layout (deprecated) */
-#define ECCGETLAYOUT		_IOR('M', 17, struct nand_ecclayout_user)
-/* Get statistics about corrected/uncorrected errors */
-#define ECCGETSTATS		_IOR('M', 18, struct mtd_ecc_stats)
-/* Set MTD mode on a per-file-descriptor basis (see "MTD file modes") */
-#define MTDFILEMODE		_IO('M', 19)
-/* Erase segment of MTD (supports 64-bit address) */
-#define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
-/* Write data to OOB (64-bit version) */
-#define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
-/* Read data from OOB (64-bit version) */
-#define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-/* Check if chip is locked (for MTD that supports it) */
-#define MEMISLOCKED		_IOR('M', 23, struct erase_info_user)
-/*
- * Most generic write interface; can write in-band and/or out-of-band in various
- * modes (see "struct mtd_write_req"). This ioctl is not supported for flashes
- * without OOB, e.g., NOR flash.
- */
-#define MEMWRITE		_IOWR('M', 24, struct mtd_write_req)
-
-/*
- * Obsolete legacy interface. Keep it in order not to break userspace
- * interfaces
- */
-struct nand_oobinfo {
-	__u32 useecc;
-	__u32 eccbytes;
-	__u32 oobfree[8][2];
-	__u32 eccpos[32];
-};
-
-struct nand_oobfree {
-	__u32 offset;
-	__u32 length;
-};
-
-#define MTD_MAX_OOBFREE_ENTRIES	8
-#define MTD_MAX_ECCPOS_ENTRIES	64
-/*
- * OBSOLETE: ECC layout control structure. Exported to user-space via ioctl
- * ECCGETLAYOUT for backwards compatbility and should not be mistaken as a
- * complete set of ECC information. The ioctl truncates the larger internal
- * structure to retain binary compatibility with the static declaration of the
- * ioctl. Note that the "MTD_MAX_..._ENTRIES" macros represent the max size of
- * the user struct, not the MAX size of the internal struct nand_ecclayout.
- */
-struct nand_ecclayout_user {
-	__u32 eccbytes;
-	__u32 eccpos[MTD_MAX_ECCPOS_ENTRIES];
-	__u32 oobavail;
-	struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES];
-};
-
-/**
- * struct mtd_ecc_stats - error correction stats
- *
- * @corrected:	number of corrected bits
- * @failed:	number of uncorrectable errors
- * @badblocks:	number of bad blocks in this partition
- * @bbtblocks:	number of blocks reserved for bad block tables
- */
-struct mtd_ecc_stats {
-	__u32 corrected;
-	__u32 failed;
-	__u32 badblocks;
-	__u32 bbtblocks;
-};
-
-/*
- * MTD file modes - for read/write access to MTD
- *
- * @MTD_FILE_MODE_NORMAL:	OTP disabled, ECC enabled
- * @MTD_FILE_MODE_OTP_FACTORY:	OTP enabled in factory mode
- * @MTD_FILE_MODE_OTP_USER:	OTP enabled in user mode
- * @MTD_FILE_MODE_RAW:		OTP disabled, ECC disabled
- *
- * These modes can be set via ioctl(MTDFILEMODE). The mode mode will be retained
- * separately for each open file descriptor.
- *
- * Note: %MTD_FILE_MODE_RAW provides the same functionality as %MTD_OPS_RAW -
- * raw access to the flash, without error correction or autoplacement schemes.
- * Wherever possible, the MTD_OPS_* mode will override the MTD_FILE_MODE_* mode
- * (e.g., when using ioctl(MEMWRITE)), but in some cases, the MTD_FILE_MODE is
- * used out of necessity (e.g., `write()', ioctl(MEMWRITEOOB64)).
- */
-enum mtd_file_modes {
-	MTD_FILE_MODE_NORMAL = MTD_OTP_OFF,
-	MTD_FILE_MODE_OTP_FACTORY = MTD_OTP_FACTORY,
-	MTD_FILE_MODE_OTP_USER = MTD_OTP_USER,
-	MTD_FILE_MODE_RAW,
-};
-
-static __inline__ int mtd_type_is_nand_user(const struct mtd_info_user *mtd)
-{
-	return mtd->type == MTD_NANDFLASH || mtd->type == MTD_MLCNANDFLASH;
-}
-
-#endif /* __MTD_ABI_H__ */
diff --git a/openflow/usr/include/mtd/mtd-user.h b/openflow/usr/include/mtd/mtd-user.h
deleted file mode 100644
index e71d555..0000000
--- a/openflow/usr/include/mtd/mtd-user.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef __MTD_USER_H__
-#define __MTD_USER_H__
-
-/* This file is blessed for inclusion by userspace */
-#include <mtd/mtd-abi.h>
-
-typedef struct mtd_info_user mtd_info_t;
-typedef struct erase_info_user erase_info_t;
-typedef struct region_info_user region_info_t;
-typedef struct nand_oobinfo nand_oobinfo_t;
-typedef struct nand_ecclayout_user nand_ecclayout_t;
-
-#endif /* __MTD_USER_H__ */
diff --git a/openflow/usr/include/mtd/nftl-user.h b/openflow/usr/include/mtd/nftl-user.h
deleted file mode 100644
index bdeabd8..0000000
--- a/openflow/usr/include/mtd/nftl-user.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef __MTD_NFTL_USER_H__
-#define __MTD_NFTL_USER_H__
-
-#include <linux/types.h>
-
-/* Block Control Information */
-
-struct nftl_bci {
-	unsigned char ECCSig[6];
-	__u8 Status;
-	__u8 Status1;
-}__attribute__((packed));
-
-/* Unit Control Information */
-
-struct nftl_uci0 {
-	__u16 VirtUnitNum;
-	__u16 ReplUnitNum;
-	__u16 SpareVirtUnitNum;
-	__u16 SpareReplUnitNum;
-} __attribute__((packed));
-
-struct nftl_uci1 {
-	__u32 WearInfo;
-	__u16 EraseMark;
-	__u16 EraseMark1;
-} __attribute__((packed));
-
-struct nftl_uci2 {
-        __u16 FoldMark;
-        __u16 FoldMark1;
-	__u32 unused;
-} __attribute__((packed));
-
-union nftl_uci {
-	struct nftl_uci0 a;
-	struct nftl_uci1 b;
-	struct nftl_uci2 c;
-};
-
-struct nftl_oob {
-	struct nftl_bci b;
-	union nftl_uci u;
-};
-
-/* NFTL Media Header */
-
-struct NFTLMediaHeader {
-	char DataOrgID[6];
-	__u16 NumEraseUnits;
-	__u16 FirstPhysicalEUN;
-	__u32 FormattedSize;
-	unsigned char UnitSizeFactor;
-} __attribute__((packed));
-
-#define MAX_ERASE_ZONES (8192 - 512)
-
-#define ERASE_MARK 0x3c69
-#define SECTOR_FREE 0xff
-#define SECTOR_USED 0x55
-#define SECTOR_IGNORE 0x11
-#define SECTOR_DELETED 0x00
-
-#define FOLD_MARK_IN_PROGRESS 0x5555
-
-#define ZONE_GOOD 0xff
-#define ZONE_BAD_ORIGINAL 0
-#define ZONE_BAD_MARKED 7
-
-
-#endif /* __MTD_NFTL_USER_H__ */
diff --git a/openflow/usr/include/mtd/ubi-user.h b/openflow/usr/include/mtd/ubi-user.h
deleted file mode 100644
index 275ebd8..0000000
--- a/openflow/usr/include/mtd/ubi-user.h
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * Copyright © International Business Machines Corp., 2006
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Author: Artem Bityutskiy (Битюцкий Артём)
- */
-
-#ifndef __UBI_USER_H__
-#define __UBI_USER_H__
-
-#include <linux/types.h>
-
-/*
- * UBI device creation (the same as MTD device attachment)
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * MTD devices may be attached using %UBI_IOCATT ioctl command of the UBI
- * control device. The caller has to properly fill and pass
- * &struct ubi_attach_req object - UBI will attach the MTD device specified in
- * the request and return the newly created UBI device number as the ioctl
- * return value.
- *
- * UBI device deletion (the same as MTD device detachment)
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * An UBI device maybe deleted with %UBI_IOCDET ioctl command of the UBI
- * control device.
- *
- * UBI volume creation
- * ~~~~~~~~~~~~~~~~~~~
- *
- * UBI volumes are created via the %UBI_IOCMKVOL ioctl command of UBI character
- * device. A &struct ubi_mkvol_req object has to be properly filled and a
- * pointer to it has to be passed to the ioctl.
- *
- * UBI volume deletion
- * ~~~~~~~~~~~~~~~~~~~
- *
- * To delete a volume, the %UBI_IOCRMVOL ioctl command of the UBI character
- * device should be used. A pointer to the 32-bit volume ID hast to be passed
- * to the ioctl.
- *
- * UBI volume re-size
- * ~~~~~~~~~~~~~~~~~~
- *
- * To re-size a volume, the %UBI_IOCRSVOL ioctl command of the UBI character
- * device should be used. A &struct ubi_rsvol_req object has to be properly
- * filled and a pointer to it has to be passed to the ioctl.
- *
- * UBI volumes re-name
- * ~~~~~~~~~~~~~~~~~~~
- *
- * To re-name several volumes atomically at one go, the %UBI_IOCRNVOL command
- * of the UBI character device should be used. A &struct ubi_rnvol_req object
- * has to be properly filled and a pointer to it has to be passed to the ioctl.
- *
- * UBI volume update
- * ~~~~~~~~~~~~~~~~~
- *
- * Volume update should be done via the %UBI_IOCVOLUP ioctl command of the
- * corresponding UBI volume character device. A pointer to a 64-bit update
- * size should be passed to the ioctl. After this, UBI expects user to write
- * this number of bytes to the volume character device. The update is finished
- * when the claimed number of bytes is passed. So, the volume update sequence
- * is something like:
- *
- * fd = open("/dev/my_volume");
- * ioctl(fd, UBI_IOCVOLUP, &image_size);
- * write(fd, buf, image_size);
- * close(fd);
- *
- * Logical eraseblock erase
- * ~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * To erase a logical eraseblock, the %UBI_IOCEBER ioctl command of the
- * corresponding UBI volume character device should be used. This command
- * unmaps the requested logical eraseblock, makes sure the corresponding
- * physical eraseblock is successfully erased, and returns.
- *
- * Atomic logical eraseblock change
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * Atomic logical eraseblock change operation is called using the %UBI_IOCEBCH
- * ioctl command of the corresponding UBI volume character device. A pointer to
- * a &struct ubi_leb_change_req object has to be passed to the ioctl. Then the
- * user is expected to write the requested amount of bytes (similarly to what
- * should be done in case of the "volume update" ioctl).
- *
- * Logical eraseblock map
- * ~~~~~~~~~~~~~~~~~~~~~
- *
- * To map a logical eraseblock to a physical eraseblock, the %UBI_IOCEBMAP
- * ioctl command should be used. A pointer to a &struct ubi_map_req object is
- * expected to be passed. The ioctl maps the requested logical eraseblock to
- * a physical eraseblock and returns.  Only non-mapped logical eraseblocks can
- * be mapped. If the logical eraseblock specified in the request is already
- * mapped to a physical eraseblock, the ioctl fails and returns error.
- *
- * Logical eraseblock unmap
- * ~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * To unmap a logical eraseblock to a physical eraseblock, the %UBI_IOCEBUNMAP
- * ioctl command should be used. The ioctl unmaps the logical eraseblocks,
- * schedules corresponding physical eraseblock for erasure, and returns. Unlike
- * the "LEB erase" command, it does not wait for the physical eraseblock being
- * erased. Note, the side effect of this is that if an unclean reboot happens
- * after the unmap ioctl returns, you may find the LEB mapped again to the same
- * physical eraseblock after the UBI is run again.
- *
- * Check if logical eraseblock is mapped
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * To check if a logical eraseblock is mapped to a physical eraseblock, the
- * %UBI_IOCEBISMAP ioctl command should be used. It returns %0 if the LEB is
- * not mapped, and %1 if it is mapped.
- *
- * Set an UBI volume property
- * ~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * To set an UBI volume property the %UBI_IOCSETPROP ioctl command should be
- * used. A pointer to a &struct ubi_set_vol_prop_req object is expected to be
- * passed. The object describes which property should be set, and to which value
- * it should be set.
- *
- * Block devices on UBI volumes
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * To create a R/O block device on top of an UBI volume the %UBI_IOCVOLCRBLK
- * should be used. A pointer to a &struct ubi_blkcreate_req object is expected
- * to be passed, which is not used and reserved for future usage.
- *
- * Conversely, to remove a block device the %UBI_IOCVOLRMBLK should be used,
- * which takes no arguments.
- */
-
-/*
- * When a new UBI volume or UBI device is created, users may either specify the
- * volume/device number they want to create or to let UBI automatically assign
- * the number using these constants.
- */
-#define UBI_VOL_NUM_AUTO (-1)
-#define UBI_DEV_NUM_AUTO (-1)
-
-/* Maximum volume name length */
-#define UBI_MAX_VOLUME_NAME 127
-
-/* ioctl commands of UBI character devices */
-
-#define UBI_IOC_MAGIC 'o'
-
-/* Create an UBI volume */
-#define UBI_IOCMKVOL _IOW(UBI_IOC_MAGIC, 0, struct ubi_mkvol_req)
-/* Remove an UBI volume */
-#define UBI_IOCRMVOL _IOW(UBI_IOC_MAGIC, 1, __s32)
-/* Re-size an UBI volume */
-#define UBI_IOCRSVOL _IOW(UBI_IOC_MAGIC, 2, struct ubi_rsvol_req)
-/* Re-name volumes */
-#define UBI_IOCRNVOL _IOW(UBI_IOC_MAGIC, 3, struct ubi_rnvol_req)
-
-/* ioctl commands of the UBI control character device */
-
-#define UBI_CTRL_IOC_MAGIC 'o'
-
-/* Attach an MTD device */
-#define UBI_IOCATT _IOW(UBI_CTRL_IOC_MAGIC, 64, struct ubi_attach_req)
-/* Detach an MTD device */
-#define UBI_IOCDET _IOW(UBI_CTRL_IOC_MAGIC, 65, __s32)
-
-/* ioctl commands of UBI volume character devices */
-
-#define UBI_VOL_IOC_MAGIC 'O'
-
-/* Start UBI volume update
- * Note: This actually takes a pointer (__s64*), but we can't change
- *       that without breaking the ABI on 32bit systems
- */
-#define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, __s64)
-/* LEB erasure command, used for debugging, disabled by default */
-#define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, __s32)
-/* Atomic LEB change command */
-#define UBI_IOCEBCH _IOW(UBI_VOL_IOC_MAGIC, 2, __s32)
-/* Map LEB command */
-#define UBI_IOCEBMAP _IOW(UBI_VOL_IOC_MAGIC, 3, struct ubi_map_req)
-/* Unmap LEB command */
-#define UBI_IOCEBUNMAP _IOW(UBI_VOL_IOC_MAGIC, 4, __s32)
-/* Check if LEB is mapped command */
-#define UBI_IOCEBISMAP _IOR(UBI_VOL_IOC_MAGIC, 5, __s32)
-/* Set an UBI volume property */
-#define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \
-			       struct ubi_set_vol_prop_req)
-/* Create a R/O block device on top of an UBI volume */
-#define UBI_IOCVOLCRBLK _IOW(UBI_VOL_IOC_MAGIC, 7, struct ubi_blkcreate_req)
-/* Remove the R/O block device */
-#define UBI_IOCVOLRMBLK _IO(UBI_VOL_IOC_MAGIC, 8)
-
-/* Maximum MTD device name length supported by UBI */
-#define MAX_UBI_MTD_NAME_LEN 127
-
-/* Maximum amount of UBI volumes that can be re-named at one go */
-#define UBI_MAX_RNVOL 32
-
-/*
- * UBI volume type constants.
- *
- * @UBI_DYNAMIC_VOLUME: dynamic volume
- * @UBI_STATIC_VOLUME:  static volume
- */
-enum {
-	UBI_DYNAMIC_VOLUME = 3,
-	UBI_STATIC_VOLUME  = 4,
-};
-
-/*
- * UBI set volume property ioctl constants.
- *
- * @UBI_VOL_PROP_DIRECT_WRITE: allow (any non-zero value) or disallow (value 0)
- *                             user to directly write and erase individual
- *                             eraseblocks on dynamic volumes
- */
-enum {
-	UBI_VOL_PROP_DIRECT_WRITE = 1,
-};
-
-/**
- * struct ubi_attach_req - attach MTD device request.
- * @ubi_num: UBI device number to create
- * @mtd_num: MTD device number to attach
- * @vid_hdr_offset: VID header offset (use defaults if %0)
- * @max_beb_per1024: maximum expected number of bad PEB per 1024 PEBs
- * @padding: reserved for future, not used, has to be zeroed
- *
- * This data structure is used to specify MTD device UBI has to attach and the
- * parameters it has to use. The number which should be assigned to the new UBI
- * device is passed in @ubi_num. UBI may automatically assign the number if
- * @UBI_DEV_NUM_AUTO is passed. In this case, the device number is returned in
- * @ubi_num.
- *
- * Most applications should pass %0 in @vid_hdr_offset to make UBI use default
- * offset of the VID header within physical eraseblocks. The default offset is
- * the next min. I/O unit after the EC header. For example, it will be offset
- * 512 in case of a 512 bytes page NAND flash with no sub-page support. Or
- * it will be 512 in case of a 2KiB page NAND flash with 4 512-byte sub-pages.
- *
- * But in rare cases, if this optimizes things, the VID header may be placed to
- * a different offset. For example, the boot-loader might do things faster if
- * the VID header sits at the end of the first 2KiB NAND page with 4 sub-pages.
- * As the boot-loader would not normally need to read EC headers (unless it
- * needs UBI in RW mode), it might be faster to calculate ECC. This is weird
- * example, but it real-life example. So, in this example, @vid_hdr_offer would
- * be 2KiB-64 bytes = 1984. Note, that this position is not even 512-bytes
- * aligned, which is OK, as UBI is clever enough to realize this is 4th
- * sub-page of the first page and add needed padding.
- *
- * The @max_beb_per1024 is the maximum amount of bad PEBs UBI expects on the
- * UBI device per 1024 eraseblocks.  This value is often given in an other form
- * in the NAND datasheet (min NVB i.e. minimal number of valid blocks). The
- * maximum expected bad eraseblocks per 1024 is then:
- *    1024 * (1 - MinNVB / MaxNVB)
- * Which gives 20 for most NAND devices.  This limit is used in order to derive
- * amount of eraseblock UBI reserves for handling new bad blocks. If the device
- * has more bad eraseblocks than this limit, UBI does not reserve any physical
- * eraseblocks for new bad eraseblocks, but attempts to use available
- * eraseblocks (if any). The accepted range is 0-768. If 0 is given, the
- * default kernel value of %CONFIG_MTD_UBI_BEB_LIMIT will be used.
- */
-struct ubi_attach_req {
-	__s32 ubi_num;
-	__s32 mtd_num;
-	__s32 vid_hdr_offset;
-	__s16 max_beb_per1024;
-	__s8 padding[10];
-};
-
-/**
- * struct ubi_mkvol_req - volume description data structure used in
- *                        volume creation requests.
- * @vol_id: volume number
- * @alignment: volume alignment
- * @bytes: volume size in bytes
- * @vol_type: volume type (%UBI_DYNAMIC_VOLUME or %UBI_STATIC_VOLUME)
- * @padding1: reserved for future, not used, has to be zeroed
- * @name_len: volume name length
- * @padding2: reserved for future, not used, has to be zeroed
- * @name: volume name
- *
- * This structure is used by user-space programs when creating new volumes. The
- * @used_bytes field is only necessary when creating static volumes.
- *
- * The @alignment field specifies the required alignment of the volume logical
- * eraseblock. This means, that the size of logical eraseblocks will be aligned
- * to this number, i.e.,
- *	(UBI device logical eraseblock size) mod (@alignment) = 0.
- *
- * To put it differently, the logical eraseblock of this volume may be slightly
- * shortened in order to make it properly aligned. The alignment has to be
- * multiple of the flash minimal input/output unit, or %1 to utilize the entire
- * available space of logical eraseblocks.
- *
- * The @alignment field may be useful, for example, when one wants to maintain
- * a block device on top of an UBI volume. In this case, it is desirable to fit
- * an integer number of blocks in logical eraseblocks of this UBI volume. With
- * alignment it is possible to update this volume using plane UBI volume image
- * BLOBs, without caring about how to properly align them.
- */
-struct ubi_mkvol_req {
-	__s32 vol_id;
-	__s32 alignment;
-	__s64 bytes;
-	__s8 vol_type;
-	__s8 padding1;
-	__s16 name_len;
-	__s8 padding2[4];
-	char name[UBI_MAX_VOLUME_NAME + 1];
-} __attribute__((packed));
-
-/**
- * struct ubi_rsvol_req - a data structure used in volume re-size requests.
- * @vol_id: ID of the volume to re-size
- * @bytes: new size of the volume in bytes
- *
- * Re-sizing is possible for both dynamic and static volumes. But while dynamic
- * volumes may be re-sized arbitrarily, static volumes cannot be made to be
- * smaller than the number of bytes they bear. To arbitrarily shrink a static
- * volume, it must be wiped out first (by means of volume update operation with
- * zero number of bytes).
- */
-struct ubi_rsvol_req {
-	__s64 bytes;
-	__s32 vol_id;
-} __attribute__((packed));
-
-/**
- * struct ubi_rnvol_req - volumes re-name request.
- * @count: count of volumes to re-name
- * @padding1:  reserved for future, not used, has to be zeroed
- * @vol_id: ID of the volume to re-name
- * @name_len: name length
- * @padding2:  reserved for future, not used, has to be zeroed
- * @name: new volume name
- *
- * UBI allows to re-name up to %32 volumes at one go. The count of volumes to
- * re-name is specified in the @count field. The ID of the volumes to re-name
- * and the new names are specified in the @vol_id and @name fields.
- *
- * The UBI volume re-name operation is atomic, which means that should power cut
- * happen, the volumes will have either old name or new name. So the possible
- * use-cases of this command is atomic upgrade. Indeed, to upgrade, say, volumes
- * A and B one may create temporary volumes %A1 and %B1 with the new contents,
- * then atomically re-name A1->A and B1->B, in which case old %A and %B will
- * be removed.
- *
- * If it is not desirable to remove old A and B, the re-name request has to
- * contain 4 entries: A1->A, A->A1, B1->B, B->B1, in which case old A1 and B1
- * become A and B, and old A and B will become A1 and B1.
- *
- * It is also OK to request: A1->A, A1->X, B1->B, B->Y, in which case old A1
- * and B1 become A and B, and old A and B become X and Y.
- *
- * In other words, in case of re-naming into an existing volume name, the
- * existing volume is removed, unless it is re-named as well at the same
- * re-name request.
- */
-struct ubi_rnvol_req {
-	__s32 count;
-	__s8 padding1[12];
-	struct {
-		__s32 vol_id;
-		__s16 name_len;
-		__s8  padding2[2];
-		char    name[UBI_MAX_VOLUME_NAME + 1];
-	} ents[UBI_MAX_RNVOL];
-} __attribute__((packed));
-
-/**
- * struct ubi_leb_change_req - a data structure used in atomic LEB change
- *                             requests.
- * @lnum: logical eraseblock number to change
- * @bytes: how many bytes will be written to the logical eraseblock
- * @dtype: pass "3" for better compatibility with old kernels
- * @padding: reserved for future, not used, has to be zeroed
- *
- * The @dtype field used to inform UBI about what kind of data will be written
- * to the LEB: long term (value 1), short term (value 2), unknown (value 3).
- * UBI tried to pick a PEB with lower erase counter for short term data and a
- * PEB with higher erase counter for long term data. But this was not really
- * used because users usually do not know this and could easily mislead UBI. We
- * removed this feature in May 2012. UBI currently just ignores the @dtype
- * field. But for better compatibility with older kernels it is recommended to
- * set @dtype to 3 (unknown).
- */
-struct ubi_leb_change_req {
-	__s32 lnum;
-	__s32 bytes;
-	__s8  dtype; /* obsolete, do not use! */
-	__s8  padding[7];
-} __attribute__((packed));
-
-/**
- * struct ubi_map_req - a data structure used in map LEB requests.
- * @dtype: pass "3" for better compatibility with old kernels
- * @lnum: logical eraseblock number to unmap
- * @padding: reserved for future, not used, has to be zeroed
- */
-struct ubi_map_req {
-	__s32 lnum;
-	__s8  dtype; /* obsolete, do not use! */
-	__s8  padding[3];
-} __attribute__((packed));
-
-
-/**
- * struct ubi_set_vol_prop_req - a data structure used to set an UBI volume
- *                               property.
- * @property: property to set (%UBI_VOL_PROP_DIRECT_WRITE)
- * @padding: reserved for future, not used, has to be zeroed
- * @value: value to set
- */
-struct ubi_set_vol_prop_req {
-	__u8  property;
-	__u8  padding[7];
-	__u64 value;
-}  __attribute__((packed));
-
-/**
- * struct ubi_blkcreate_req - a data structure used in block creation requests.
- * @padding: reserved for future, not used, has to be zeroed
- */
-struct ubi_blkcreate_req {
-	__s8  padding[128];
-}  __attribute__((packed));
-
-#endif /* __UBI_USER_H__ */
diff --git a/openflow/usr/include/nc_tparm.h b/openflow/usr/include/nc_tparm.h
deleted file mode 100644
index 248f6c0..0000000
--- a/openflow/usr/include/nc_tparm.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2006-2010,2012 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Thomas E. Dickey                        2006                    *
- ****************************************************************************/
-
-/* $Id: nc_tparm.h,v 1.6 2012/02/18 21:34:42 tom Exp $ */
-
-#ifndef NC_TPARM_included
-#define NC_TPARM_included 1
-
-/*
- * Cast parameters past the formatting-string for tparm() to match the
- * assumption of the varargs code.
- */
-#ifndef TPARM_ARG
-#ifdef NCURSES_TPARM_ARG
-#define TPARM_ARG NCURSES_TPARM_ARG
-#else
-#define TPARM_ARG long
-#endif
-#endif /* TPARAM_ARG */
-
-#define TPARM_N(n) (TPARM_ARG)(n)
-
-#define TPARM_9(a,b,c,d,e,f,g,h,i,j) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f),TPARM_N(g),TPARM_N(h),TPARM_N(i),TPARM_N(j))
-
-#if NCURSES_TPARM_VARARGS
-#define TPARM_8(a,b,c,d,e,f,g,h,i) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f),TPARM_N(g),TPARM_N(h),TPARM_N(i))
-#define TPARM_7(a,b,c,d,e,f,g,h) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f),TPARM_N(g),TPARM_N(h))
-#define TPARM_6(a,b,c,d,e,f,g) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f),TPARM_N(g))
-#define TPARM_5(a,b,c,d,e,f) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f))
-#define TPARM_4(a,b,c,d,e) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e))
-#define TPARM_3(a,b,c,d) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d))
-#define TPARM_2(a,b,c) tparm(a,TPARM_N(b),TPARM_N(c))
-#define TPARM_1(a,b) tparm(a,TPARM_N(b))
-#define TPARM_0(a) tparm(a)
-#else
-#define TPARM_8(a,b,c,d,e,f,g,h,i) TPARM_9(a,b,c,d,e,f,g,h,i,0)
-#define TPARM_7(a,b,c,d,e,f,g,h) TPARM_8(a,b,c,d,e,f,g,h,0)
-#define TPARM_6(a,b,c,d,e,f,g) TPARM_7(a,b,c,d,e,f,g,0)
-#define TPARM_5(a,b,c,d,e,f) TPARM_6(a,b,c,d,e,f,0)
-#define TPARM_4(a,b,c,d,e) TPARM_5(a,b,c,d,e,0)
-#define TPARM_3(a,b,c,d) TPARM_4(a,b,c,d,0)
-#define TPARM_2(a,b,c) TPARM_3(a,b,c,0)
-#define TPARM_1(a,b) TPARM_2(a,b,0)
-#define TPARM_1(a,b) TPARM_2(a,b,0)
-#define TPARM_0(a) TPARM_1(a,0)
-#endif
-
-#endif /* NC_TPARM_included */
diff --git a/openflow/usr/include/ncurses.h b/openflow/usr/include/ncurses.h
deleted file mode 120000
index 149de6c..0000000
--- a/openflow/usr/include/ncurses.h
+++ /dev/null
@@ -1 +0,0 @@
-curses.h
\ No newline at end of file
diff --git a/openflow/usr/include/ncurses_dll.h b/openflow/usr/include/ncurses_dll.h
deleted file mode 100644
index 249493f..0000000
--- a/openflow/usr/include/ncurses_dll.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2009,2014 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-/* $Id: ncurses_dll.h.in,v 1.9 2014/08/02 21:30:20 tom Exp $ */
-
-#ifndef NCURSES_DLL_H_incl
-#define NCURSES_DLL_H_incl 1
-
-/* 2014-08-02 workaround for broken MinGW compiler.
- * Oddly, only TRACE is mapped to trace - the other -D's are okay.
- * suggest TDM as an alternative.
- */
-#if defined(__MINGW64__)
-#elif defined(__MINGW32__)
-#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
-
-#ifdef trace
-#undef trace
-#define TRACE
-#endif
-
-#endif	/* broken compiler */
-#endif	/* MingW */
-
-/*
- * For reentrant code, we map the various global variables into SCREEN by
- * using functions to access them.
- */
-#define NCURSES_PUBLIC_VAR(name) _nc_##name
-#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)
-
-/* no longer needed on cygwin or mingw, thanks to auto-import       */
-/* but this structure may be useful at some point for an MSVC build */
-/* so, for now unconditionally define the important flags           */
-/* "the right way" for proper static and dll+auto-import behavior   */
-#undef NCURSES_DLL
-#define NCURSES_STATIC
-
-#if defined(__CYGWIN__) || defined(__MINGW32__)
-#  if defined(NCURSES_DLL)
-#    if defined(NCURSES_STATIC)
-#      undef NCURSES_STATIC
-#    endif
-#  endif
-#  undef NCURSES_IMPEXP
-#  undef NCURSES_API
-#  undef NCURSES_EXPORT
-#  undef NCURSES_EXPORT_VAR
-#  if defined(NCURSES_DLL)
-/* building a DLL */
-#    define NCURSES_IMPEXP __declspec(dllexport)
-#  elif defined(NCURSES_STATIC)
-/* building or linking to a static library */
-#    define NCURSES_IMPEXP /* nothing */
-#  else
-/* linking to the DLL */
-#    define NCURSES_IMPEXP __declspec(dllimport)
-#  endif
-#  define NCURSES_API __cdecl
-#  define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API
-#  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
-#endif
-
-/* Take care of non-cygwin platforms */
-#if !defined(NCURSES_IMPEXP)
-#  define NCURSES_IMPEXP /* nothing */
-#endif
-#if !defined(NCURSES_API)
-#  define NCURSES_API /* nothing */
-#endif
-#if !defined(NCURSES_EXPORT)
-#  define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API
-#endif
-#if !defined(NCURSES_EXPORT_VAR)
-#  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
-#endif
-
-#endif /* NCURSES_DLL_H_incl */
diff --git a/openflow/usr/include/ncursesw/curses.h b/openflow/usr/include/ncursesw/curses.h
deleted file mode 100644
index bcdad7c..0000000
--- a/openflow/usr/include/ncursesw/curses.h
+++ /dev/null
@@ -1,2030 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- *     and: Thomas E. Dickey                        1996-on                 *
- ****************************************************************************/
-
-/* $Id: curses.h.in,v 1.243 2016/01/23 22:20:31 tom Exp $ */
-
-#ifndef __NCURSES_H
-#define __NCURSES_H
-
-#define CURSES 1
-#define CURSES_H 1
-
-/* These are defined only in curses.h, and are used for conditional compiles */
-#define NCURSES_VERSION_MAJOR 6
-#define NCURSES_VERSION_MINOR 0
-#define NCURSES_VERSION_PATCH 20160213
-
-/* This is defined in more than one ncurses header, for identification */
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "6.0"
-
-/*
- * Identify the mouse encoding version.
- */
-#define NCURSES_MOUSE_VERSION 1
-
-/*
- * Definitions to facilitate DLL's.
- */
-#include <ncursesw/ncurses_dll.h>
-
-#if 1
-#include <stdint.h>
-#endif
-
-/*
- * User-definable tweak to disable the include of <stdbool.h>.
- */
-#ifndef NCURSES_ENABLE_STDBOOL_H
-#define NCURSES_ENABLE_STDBOOL_H 1
-#endif
-
-/*
- * NCURSES_ATTR_T is used to quiet compiler warnings when building ncurses
- * configured using --disable-macros.
- */
-#ifndef NCURSES_ATTR_T
-#define NCURSES_ATTR_T int
-#endif
-
-/*
- * Expands to 'const' if ncurses is configured using --enable-const.  Note that
- * doing so makes it incompatible with other implementations of X/Open Curses.
- */
-#undef  NCURSES_CONST
-#define NCURSES_CONST const
-
-#undef NCURSES_INLINE
-#define NCURSES_INLINE inline
-
-/*
- * The internal type used for color values, and for color-pairs.  The latter
- * allows the curses library to enumerate the combinations of foreground and
- * background colors used by an application, and is normally the product of the
- * total foreground and background colors.
- *
- * X/Open uses "short" for both of these types, ultimately because they are
- * numbers from the terminal database, which uses 16-bit signed values.
- */
-#undef	NCURSES_COLOR_T
-#define	NCURSES_COLOR_T short
-
-#undef	NCURSES_PAIRS_T
-#define	NCURSES_PAIRS_T short
-
-/*
- * Definition used to make WINDOW and similar structs opaque.
- */
-#ifndef NCURSES_OPAQUE
-#define NCURSES_OPAQUE 0
-#endif
-
-/*
- * The reentrant code relies on the opaque setting, but adds features.
- */
-#ifndef NCURSES_REENTRANT
-#define NCURSES_REENTRANT 0
-#endif
-
-/*
- * Control whether bindings for interop support are added.
- */
-#undef	NCURSES_INTEROP_FUNCS
-#define	NCURSES_INTEROP_FUNCS 0
-
-/*
- * The internal type used for window dimensions.
- */
-#undef	NCURSES_SIZE_T
-#define	NCURSES_SIZE_T short
-
-/*
- * Control whether tparm() supports varargs or fixed-parameter list.
- */
-#undef NCURSES_TPARM_VARARGS
-#define NCURSES_TPARM_VARARGS 1
-
-/*
- * Control type used for tparm's arguments.  While X/Open equates long and
- * char* values, this is not always workable for 64-bit platforms.
- */
-#undef NCURSES_TPARM_ARG
-#define NCURSES_TPARM_ARG long
-
-/*
- * Control whether ncurses uses wcwidth() for checking width of line-drawing
- * characters.
- */
-#undef NCURSES_WCWIDTH_GRAPHICS
-#define NCURSES_WCWIDTH_GRAPHICS 1
-
-/*
- * NCURSES_CH_T is used in building the library, but not used otherwise in
- * this header file, since that would make the normal/wide-character versions
- * of the header incompatible.
- */
-#undef	NCURSES_CH_T
-#define NCURSES_CH_T cchar_t
-
-#if 0 && defined(_LP64)
-typedef unsigned chtype;
-typedef unsigned mmask_t;
-#else
-typedef unsigned long chtype;
-typedef unsigned long mmask_t;
-#endif
-
-/*
- * We need FILE, etc.  Include this before checking any feature symbols.
- */
-#include <stdio.h>
-
-/*
- * With XPG4, you must define _XOPEN_SOURCE_EXTENDED, it is redundant (or
- * conflicting) when _XOPEN_SOURCE is 500 or greater.  If NCURSES_WIDECHAR is
- * not already defined, e.g., if the platform relies upon nonstandard feature
- * test macros, define it at this point if the standard feature test macros
- * indicate that it should be defined.
- */
-#ifndef NCURSES_WIDECHAR
-#if defined(_XOPEN_SOURCE_EXTENDED) || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0 >= 500))
-#define NCURSES_WIDECHAR 1
-#else
-#define NCURSES_WIDECHAR 0
-#endif
-#endif /* NCURSES_WIDECHAR */
-
-#include <stdarg.h>	/* we need va_list */
-#if NCURSES_WIDECHAR
-#include <stddef.h>	/* we want wchar_t */
-#endif
-
-/* X/Open and SVr4 specify that curses implements 'bool'.  However, C++ may also
- * implement it.  If so, we must use the C++ compiler's type to avoid conflict
- * with other interfaces.
- *
- * A further complication is that <stdbool.h> may declare 'bool' to be a
- * different type, such as an enum which is not necessarily compatible with
- * C++.  If we have <stdbool.h>, make 'bool' a macro, so users may #undef it.
- * Otherwise, let it remain a typedef to avoid conflicts with other #define's.
- * In either case, make a typedef for NCURSES_BOOL which can be used if needed
- * from either C or C++.
- */
-
-#undef TRUE
-#define TRUE    1
-
-#undef FALSE
-#define FALSE   0
-
-typedef unsigned char NCURSES_BOOL;
-
-#if defined(__cplusplus)	/* __cplusplus, etc. */
-
-/* use the C++ compiler's bool type */
-#define NCURSES_BOOL bool
-
-#else			/* c89, c99, etc. */
-
-#if NCURSES_ENABLE_STDBOOL_H
-#include <stdbool.h>
-/* use whatever the C compiler decides bool really is */
-#define NCURSES_BOOL bool
-#else
-/* there is no predefined bool - use our own */
-#undef bool
-#define bool NCURSES_BOOL
-#endif
-
-#endif /* !__cplusplus, etc. */
-
-#ifdef __cplusplus
-extern "C" {
-#define NCURSES_CAST(type,value) static_cast<type>(value)
-#else
-#define NCURSES_CAST(type,value) (type)(value)
-#endif
-
-/*
- * X/Open attributes.  In the ncurses implementation, they are identical to the
- * A_ attributes.
- */
-#define WA_ATTRIBUTES	A_ATTRIBUTES
-#define WA_NORMAL	A_NORMAL
-#define WA_STANDOUT	A_STANDOUT
-#define WA_UNDERLINE	A_UNDERLINE
-#define WA_REVERSE	A_REVERSE
-#define WA_BLINK	A_BLINK
-#define WA_DIM		A_DIM
-#define WA_BOLD		A_BOLD
-#define WA_ALTCHARSET	A_ALTCHARSET
-#define WA_INVIS	A_INVIS
-#define WA_PROTECT	A_PROTECT
-#define WA_HORIZONTAL	A_HORIZONTAL
-#define WA_LEFT		A_LEFT
-#define WA_LOW		A_LOW
-#define WA_RIGHT	A_RIGHT
-#define WA_TOP		A_TOP
-#define WA_VERTICAL	A_VERTICAL
-
-#if 1
-#define WA_ITALIC	A_ITALIC	/* ncurses extension */
-#endif
-
-/* colors */
-#define COLOR_BLACK	0
-#define COLOR_RED	1
-#define COLOR_GREEN	2
-#define COLOR_YELLOW	3
-#define COLOR_BLUE	4
-#define COLOR_MAGENTA	5
-#define COLOR_CYAN	6
-#define COLOR_WHITE	7
-
-/* line graphics */
-
-#if 0 || NCURSES_REENTRANT
-NCURSES_WRAPPED_VAR(chtype*, acs_map);
-#define acs_map NCURSES_PUBLIC_VAR(acs_map())
-#else
-extern NCURSES_EXPORT_VAR(chtype) acs_map[];
-#endif
-
-#define NCURSES_ACS(c)	(acs_map[NCURSES_CAST(unsigned char,(c))])
-
-/* VT100 symbols begin here */
-#define ACS_ULCORNER	NCURSES_ACS('l') /* upper left corner */
-#define ACS_LLCORNER	NCURSES_ACS('m') /* lower left corner */
-#define ACS_URCORNER	NCURSES_ACS('k') /* upper right corner */
-#define ACS_LRCORNER	NCURSES_ACS('j') /* lower right corner */
-#define ACS_LTEE	NCURSES_ACS('t') /* tee pointing right */
-#define ACS_RTEE	NCURSES_ACS('u') /* tee pointing left */
-#define ACS_BTEE	NCURSES_ACS('v') /* tee pointing up */
-#define ACS_TTEE	NCURSES_ACS('w') /* tee pointing down */
-#define ACS_HLINE	NCURSES_ACS('q') /* horizontal line */
-#define ACS_VLINE	NCURSES_ACS('x') /* vertical line */
-#define ACS_PLUS	NCURSES_ACS('n') /* large plus or crossover */
-#define ACS_S1		NCURSES_ACS('o') /* scan line 1 */
-#define ACS_S9		NCURSES_ACS('s') /* scan line 9 */
-#define ACS_DIAMOND	NCURSES_ACS('`') /* diamond */
-#define ACS_CKBOARD	NCURSES_ACS('a') /* checker board (stipple) */
-#define ACS_DEGREE	NCURSES_ACS('f') /* degree symbol */
-#define ACS_PLMINUS	NCURSES_ACS('g') /* plus/minus */
-#define ACS_BULLET	NCURSES_ACS('~') /* bullet */
-/* Teletype 5410v1 symbols begin here */
-#define ACS_LARROW	NCURSES_ACS(',') /* arrow pointing left */
-#define ACS_RARROW	NCURSES_ACS('+') /* arrow pointing right */
-#define ACS_DARROW	NCURSES_ACS('.') /* arrow pointing down */
-#define ACS_UARROW	NCURSES_ACS('-') /* arrow pointing up */
-#define ACS_BOARD	NCURSES_ACS('h') /* board of squares */
-#define ACS_LANTERN	NCURSES_ACS('i') /* lantern symbol */
-#define ACS_BLOCK	NCURSES_ACS('0') /* solid square block */
-/*
- * These aren't documented, but a lot of System Vs have them anyway
- * (you can spot pprryyzz{{||}} in a lot of AT&T terminfo strings).
- * The ACS_names may not match AT&T's, our source didn't know them.
- */
-#define ACS_S3		NCURSES_ACS('p') /* scan line 3 */
-#define ACS_S7		NCURSES_ACS('r') /* scan line 7 */
-#define ACS_LEQUAL	NCURSES_ACS('y') /* less/equal */
-#define ACS_GEQUAL	NCURSES_ACS('z') /* greater/equal */
-#define ACS_PI		NCURSES_ACS('{') /* Pi */
-#define ACS_NEQUAL	NCURSES_ACS('|') /* not equal */
-#define ACS_STERLING	NCURSES_ACS('}') /* UK pound sign */
-
-/*
- * Line drawing ACS names are of the form ACS_trbl, where t is the top, r
- * is the right, b is the bottom, and l is the left.  t, r, b, and l might
- * be B (blank), S (single), D (double), or T (thick).  The subset defined
- * here only uses B and S.
- */
-#define ACS_BSSB	ACS_ULCORNER
-#define ACS_SSBB	ACS_LLCORNER
-#define ACS_BBSS	ACS_URCORNER
-#define ACS_SBBS	ACS_LRCORNER
-#define ACS_SBSS	ACS_RTEE
-#define ACS_SSSB	ACS_LTEE
-#define ACS_SSBS	ACS_BTEE
-#define ACS_BSSS	ACS_TTEE
-#define ACS_BSBS	ACS_HLINE
-#define ACS_SBSB	ACS_VLINE
-#define ACS_SSSS	ACS_PLUS
-
-#undef	ERR
-#define ERR     (-1)
-
-#undef	OK
-#define OK      (0)
-
-/* values for the _flags member */
-#define _SUBWIN         0x01	/* is this a sub-window? */
-#define _ENDLINE        0x02	/* is the window flush right? */
-#define _FULLWIN        0x04	/* is the window full-screen? */
-#define _SCROLLWIN      0x08	/* bottom edge is at screen bottom? */
-#define _ISPAD	        0x10	/* is this window a pad? */
-#define _HASMOVED       0x20	/* has cursor moved since last refresh? */
-#define _WRAPPED        0x40	/* cursor was just wrappped */
-
-/*
- * this value is used in the firstchar and lastchar fields to mark
- * unchanged lines
- */
-#define _NOCHANGE       -1
-
-/*
- * this value is used in the oldindex field to mark lines created by insertions
- * and scrolls.
- */
-#define _NEWINDEX	-1
-
-typedef struct screen  SCREEN;
-typedef struct _win_st WINDOW;
-
-typedef	chtype	attr_t;		/* ...must be at least as wide as chtype */
-
-#if NCURSES_WIDECHAR
-
-#if 0
-#ifdef mblen			/* libutf8.h defines it w/o undefining first */
-#undef mblen
-#endif
-#include <libutf8.h>
-#endif
-
-#if 1
-#include <wchar.h>		/* ...to get mbstate_t, etc. */
-#endif
-
-#if 0
-typedef unsigned short wchar_t1;
-#endif
-
-#if 0
-typedef unsigned int wint_t1;
-#endif
-
-/*
- * cchar_t stores an array of CCHARW_MAX wide characters.  The first is
- * normally a spacing character.  The others are non-spacing.  If those
- * (spacing and nonspacing) do not fill the array, a null L'\0' follows.
- * Otherwise, a null is assumed to follow when extracting via getcchar().
- */
-#define CCHARW_MAX	5
-typedef struct
-{
-    attr_t	attr;
-    wchar_t	chars[CCHARW_MAX];
-#if 0
-#undef NCURSES_EXT_COLORS
-#define NCURSES_EXT_COLORS 20160213
-    int		ext_color;	/* color pair, must be more than 16-bits */
-#endif
-}
-cchar_t;
-
-#endif /* NCURSES_WIDECHAR */
-
-#if !NCURSES_OPAQUE
-struct ldat;
-
-struct _win_st
-{
-	NCURSES_SIZE_T _cury, _curx; /* current cursor position */
-
-	/* window location and size */
-	NCURSES_SIZE_T _maxy, _maxx; /* maximums of x and y, NOT window size */
-	NCURSES_SIZE_T _begy, _begx; /* screen coords of upper-left-hand corner */
-
-	short   _flags;		/* window state flags */
-
-	/* attribute tracking */
-	attr_t  _attrs;		/* current attribute for non-space character */
-	chtype  _bkgd;		/* current background char/attribute pair */
-
-	/* option values set by user */
-	bool	_notimeout;	/* no time out on function-key entry? */
-	bool	_clear;		/* consider all data in the window invalid? */
-	bool	_leaveok;	/* OK to not reset cursor on exit? */
-	bool	_scroll;	/* OK to scroll this window? */
-	bool	_idlok;		/* OK to use insert/delete line? */
-	bool	_idcok;		/* OK to use insert/delete char? */
-	bool	_immed;		/* window in immed mode? (not yet used) */
-	bool	_sync;		/* window in sync mode? */
-	bool	_use_keypad;	/* process function keys into KEY_ symbols? */
-	int	_delay;		/* 0 = nodelay, <0 = blocking, >0 = delay */
-
-	struct ldat *_line;	/* the actual line data */
-
-	/* global screen state */
-	NCURSES_SIZE_T _regtop;	/* top line of scrolling region */
-	NCURSES_SIZE_T _regbottom; /* bottom line of scrolling region */
-
-	/* these are used only if this is a sub-window */
-	int	_parx;		/* x coordinate of this window in parent */
-	int	_pary;		/* y coordinate of this window in parent */
-	WINDOW	*_parent;	/* pointer to parent if a sub-window */
-
-	/* these are used only if this is a pad */
-	struct pdat
-	{
-	    NCURSES_SIZE_T _pad_y,      _pad_x;
-	    NCURSES_SIZE_T _pad_top,    _pad_left;
-	    NCURSES_SIZE_T _pad_bottom, _pad_right;
-	} _pad;
-
-	NCURSES_SIZE_T _yoffset; /* real begy is _begy + _yoffset */
-
-#if NCURSES_WIDECHAR
-	cchar_t  _bkgrnd;	/* current background char/attribute pair */
-#if 0
-	int	_color;		/* current color-pair for non-space character */
-#endif
-#endif
-};
-#endif /* NCURSES_OPAQUE */
-
-/*
- * This is an extension to support events...
- */
-#if 1
-#ifdef NCURSES_WGETCH_EVENTS
-#if !defined(__BEOS__) || defined(__HAIKU__)
-   /* Fix _nc_timed_wait() on BEOS... */
-#  define NCURSES_EVENT_VERSION	1
-#endif	/* !defined(__BEOS__) */
-
-/*
- * Bits to set in _nc_event.data.flags
- */
-#  define _NC_EVENT_TIMEOUT_MSEC	1
-#  define _NC_EVENT_FILE		2
-#  define _NC_EVENT_FILE_READABLE	2
-#  if 0					/* Not supported yet... */
-#    define _NC_EVENT_FILE_WRITABLE	4
-#    define _NC_EVENT_FILE_EXCEPTION	8
-#  endif
-
-typedef struct
-{
-    int type;
-    union
-    {
-	long timeout_msec;	/* _NC_EVENT_TIMEOUT_MSEC */
-	struct
-	{
-	    unsigned int flags;
-	    int fd;
-	    unsigned int result;
-	} fev;				/* _NC_EVENT_FILE */
-    } data;
-} _nc_event;
-
-typedef struct
-{
-    int count;
-    int result_flags;	/* _NC_EVENT_TIMEOUT_MSEC or _NC_EVENT_FILE_READABLE */
-    _nc_event *events[1];
-} _nc_eventlist;
-
-extern NCURSES_EXPORT(int) wgetch_events (WINDOW *, _nc_eventlist *);	/* experimental */
-extern NCURSES_EXPORT(int) wgetnstr_events (WINDOW *,char *,int,_nc_eventlist *);/* experimental */
-
-#endif /* NCURSES_WGETCH_EVENTS */
-#endif /* NCURSES_EXT_FUNCS */
-
-/*
- * GCC (and some other compilers) define '__attribute__'; we're using this
- * macro to alert the compiler to flag inconsistencies in printf/scanf-like
- * function calls.  Just in case '__attribute__' isn't defined, make a dummy.
- * Old versions of G++ do not accept it anyway, at least not consistently with
- * GCC.
- */
-#if !(defined(__GNUC__) || defined(__GNUG__) || defined(__attribute__))
-#define __attribute__(p) /* nothing */
-#endif
-
-/*
- * We cannot define these in ncurses_cfg.h, since they require parameters to be
- * passed (that is non-portable).  If you happen to be using gcc with warnings
- * enabled, define
- *	GCC_PRINTF
- *	GCC_SCANF
- * to improve checking of calls to printw(), etc.
- */
-#ifndef GCC_PRINTFLIKE
-#if defined(GCC_PRINTF) && !defined(printf)
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-#else
-#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
-#endif
-#endif
-
-#ifndef GCC_SCANFLIKE
-#if defined(GCC_SCANF) && !defined(scanf)
-#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
-#else
-#define GCC_SCANFLIKE(fmt,var)  /*nothing*/
-#endif
-#endif
-
-#ifndef	GCC_NORETURN
-#define	GCC_NORETURN /* nothing */
-#endif
-
-#ifndef	GCC_UNUSED
-#define	GCC_UNUSED /* nothing */
-#endif
-
-/*
- * Curses uses a helper function.  Define our type for this to simplify
- * extending it for the sp-funcs feature.
- */
-typedef int (*NCURSES_OUTC)(int);
-
-/*
- * Function prototypes.  This is the complete X/Open Curses list of required
- * functions.  Those marked `generated' will have sources generated from the
- * macro definitions later in this file, in order to satisfy XPG4.2
- * requirements.
- */
-
-extern NCURSES_EXPORT(int) addch (const chtype);			/* generated */
-extern NCURSES_EXPORT(int) addchnstr (const chtype *, int);		/* generated */
-extern NCURSES_EXPORT(int) addchstr (const chtype *);			/* generated */
-extern NCURSES_EXPORT(int) addnstr (const char *, int);			/* generated */
-extern NCURSES_EXPORT(int) addstr (const char *);			/* generated */
-extern NCURSES_EXPORT(int) attroff (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attron (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attrset (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attr_get (attr_t *, NCURSES_PAIRS_T *, void *);	/* generated */
-extern NCURSES_EXPORT(int) attr_off (attr_t, void *);			/* generated */
-extern NCURSES_EXPORT(int) attr_on (attr_t, void *);			/* generated */
-extern NCURSES_EXPORT(int) attr_set (attr_t, NCURSES_PAIRS_T, void *);		/* generated */
-extern NCURSES_EXPORT(int) baudrate (void);				/* implemented */
-extern NCURSES_EXPORT(int) beep  (void);				/* implemented */
-extern NCURSES_EXPORT(int) bkgd (chtype);				/* generated */
-extern NCURSES_EXPORT(void) bkgdset (chtype);				/* generated */
-extern NCURSES_EXPORT(int) border (chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* generated */
-extern NCURSES_EXPORT(int) box (WINDOW *, chtype, chtype);		/* generated */
-extern NCURSES_EXPORT(bool) can_change_color (void);			/* implemented */
-extern NCURSES_EXPORT(int) cbreak (void);				/* implemented */
-extern NCURSES_EXPORT(int) chgat (int, attr_t, NCURSES_PAIRS_T, const void *);	/* generated */
-extern NCURSES_EXPORT(int) clear (void);				/* generated */
-extern NCURSES_EXPORT(int) clearok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) clrtobot (void);				/* generated */
-extern NCURSES_EXPORT(int) clrtoeol (void);				/* generated */
-extern NCURSES_EXPORT(int) color_content (NCURSES_COLOR_T,NCURSES_COLOR_T*,NCURSES_COLOR_T*,NCURSES_COLOR_T*);	/* implemented */
-extern NCURSES_EXPORT(int) color_set (NCURSES_PAIRS_T,void*);			/* generated */
-extern NCURSES_EXPORT(int) COLOR_PAIR (int);				/* generated */
-extern NCURSES_EXPORT(int) copywin (const WINDOW*,WINDOW*,int,int,int,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) curs_set (int);				/* implemented */
-extern NCURSES_EXPORT(int) def_prog_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) def_shell_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) delay_output (int);				/* implemented */
-extern NCURSES_EXPORT(int) delch (void);				/* generated */
-extern NCURSES_EXPORT(void) delscreen (SCREEN *);			/* implemented */
-extern NCURSES_EXPORT(int) delwin (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) deleteln (void);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) derwin (WINDOW *,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) doupdate (void);				/* implemented */
-extern NCURSES_EXPORT(WINDOW *) dupwin (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) echo (void);					/* implemented */
-extern NCURSES_EXPORT(int) echochar (const chtype);			/* generated */
-extern NCURSES_EXPORT(int) erase (void);				/* generated */
-extern NCURSES_EXPORT(int) endwin (void);				/* implemented */
-extern NCURSES_EXPORT(char) erasechar (void);				/* implemented */
-extern NCURSES_EXPORT(void) filter (void);				/* implemented */
-extern NCURSES_EXPORT(int) flash (void);				/* implemented */
-extern NCURSES_EXPORT(int) flushinp (void);				/* implemented */
-extern NCURSES_EXPORT(chtype) getbkgd (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getch (void);				/* generated */
-extern NCURSES_EXPORT(int) getnstr (char *, int);			/* generated */
-extern NCURSES_EXPORT(int) getstr (char *);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) getwin (FILE *);			/* implemented */
-extern NCURSES_EXPORT(int) halfdelay (int);				/* implemented */
-extern NCURSES_EXPORT(bool) has_colors (void);				/* implemented */
-extern NCURSES_EXPORT(bool) has_ic (void);				/* implemented */
-extern NCURSES_EXPORT(bool) has_il (void);				/* implemented */
-extern NCURSES_EXPORT(int) hline (chtype, int);				/* generated */
-extern NCURSES_EXPORT(void) idcok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(int) idlok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(void) immedok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(chtype) inch (void);				/* generated */
-extern NCURSES_EXPORT(int) inchnstr (chtype *, int);			/* generated */
-extern NCURSES_EXPORT(int) inchstr (chtype *);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) initscr (void);				/* implemented */
-extern NCURSES_EXPORT(int) init_color (NCURSES_COLOR_T,NCURSES_COLOR_T,NCURSES_COLOR_T,NCURSES_COLOR_T);	/* implemented */
-extern NCURSES_EXPORT(int) init_pair (NCURSES_PAIRS_T,NCURSES_COLOR_T,NCURSES_COLOR_T);		/* implemented */
-extern NCURSES_EXPORT(int) innstr (char *, int);			/* generated */
-extern NCURSES_EXPORT(int) insch (chtype);				/* generated */
-extern NCURSES_EXPORT(int) insdelln (int);				/* generated */
-extern NCURSES_EXPORT(int) insertln (void);				/* generated */
-extern NCURSES_EXPORT(int) insnstr (const char *, int);			/* generated */
-extern NCURSES_EXPORT(int) insstr (const char *);			/* generated */
-extern NCURSES_EXPORT(int) instr (char *);				/* generated */
-extern NCURSES_EXPORT(int) intrflush (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(bool) isendwin (void);				/* implemented */
-extern NCURSES_EXPORT(bool) is_linetouched (WINDOW *,int);		/* implemented */
-extern NCURSES_EXPORT(bool) is_wintouched (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(NCURSES_CONST char *) keyname (int);		/* implemented */
-extern NCURSES_EXPORT(int) keypad (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(char) killchar (void);				/* implemented */
-extern NCURSES_EXPORT(int) leaveok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(char *) longname (void);				/* implemented */
-extern NCURSES_EXPORT(int) meta (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) move (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvaddch (int, int, const chtype);		/* generated */
-extern NCURSES_EXPORT(int) mvaddchnstr (int, int, const chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvaddchstr (int, int, const chtype *);	/* generated */
-extern NCURSES_EXPORT(int) mvaddnstr (int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvaddstr (int, int, const char *);		/* generated */
-extern NCURSES_EXPORT(int) mvchgat (int, int, int, attr_t, NCURSES_PAIRS_T, const void *);	/* generated */
-extern NCURSES_EXPORT(int) mvcur (int,int,int,int);			/* implemented */
-extern NCURSES_EXPORT(int) mvdelch (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvderwin (WINDOW *, int, int);		/* implemented */
-extern NCURSES_EXPORT(int) mvgetch (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvgetnstr (int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvgetstr (int, int, char *);			/* generated */
-extern NCURSES_EXPORT(int) mvhline (int, int, chtype, int);		/* generated */
-extern NCURSES_EXPORT(chtype) mvinch (int, int);			/* generated */
-extern NCURSES_EXPORT(int) mvinchnstr (int, int, chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvinchstr (int, int, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) mvinnstr (int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvinsch (int, int, chtype);			/* generated */
-extern NCURSES_EXPORT(int) mvinsnstr (int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvinsstr (int, int, const char *);		/* generated */
-extern NCURSES_EXPORT(int) mvinstr (int, int, char *);			/* generated */
-extern NCURSES_EXPORT(int) mvprintw (int,int, const char *,...)		/* implemented */
-		GCC_PRINTFLIKE(3,4);
-extern NCURSES_EXPORT(int) mvscanw (int,int, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(3,4);
-extern NCURSES_EXPORT(int) mvvline (int, int, chtype, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwaddch (WINDOW *, int, int, const chtype);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddchnstr (WINDOW *, int, int, const chtype *, int);/* generated */
-extern NCURSES_EXPORT(int) mvwaddchstr (WINDOW *, int, int, const chtype *);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddnstr (WINDOW *, int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddstr (WINDOW *, int, int, const char *);	/* generated */
-extern NCURSES_EXPORT(int) mvwchgat (WINDOW *, int, int, int, attr_t, NCURSES_PAIRS_T, const void *);/* generated */
-extern NCURSES_EXPORT(int) mvwdelch (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwgetch (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwgetnstr (WINDOW *, int, int, char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwgetstr (WINDOW *, int, int, char *);	/* generated */
-extern NCURSES_EXPORT(int) mvwhline (WINDOW *, int, int, chtype, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwin (WINDOW *,int,int);			/* implemented */
-extern NCURSES_EXPORT(chtype) mvwinch (WINDOW *, int, int);			/* generated */
-extern NCURSES_EXPORT(int) mvwinchnstr (WINDOW *, int, int, chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwinchstr (WINDOW *, int, int, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype);		/* generated */
-extern NCURSES_EXPORT(int) mvwinsnstr (WINDOW *, int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *);	/* generated */
-extern NCURSES_EXPORT(int) mvwinstr (WINDOW *, int, int, char *);		/* generated */
-extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...)	/* implemented */
-		GCC_PRINTFLIKE(4,5);
-extern NCURSES_EXPORT(int) mvwscanw (WINDOW *,int,int, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(4,5);
-extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int);	/* generated */
-extern NCURSES_EXPORT(int) napms (int);					/* implemented */
-extern NCURSES_EXPORT(WINDOW *) newpad (int,int);		       	/* implemented */
-extern NCURSES_EXPORT(SCREEN *) newterm (NCURSES_CONST char *,FILE *,FILE *);	/* implemented */
-extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);	       	/* implemented */
-extern NCURSES_EXPORT(int) nl (void);					/* implemented */
-extern NCURSES_EXPORT(int) nocbreak (void);				/* implemented */
-extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) noecho (void);				/* implemented */
-extern NCURSES_EXPORT(int) nonl (void);					/* implemented */
-extern NCURSES_EXPORT(void) noqiflush (void);				/* implemented */
-extern NCURSES_EXPORT(int) noraw (void);				/* implemented */
-extern NCURSES_EXPORT(int) notimeout (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) overlay (const WINDOW*,WINDOW *);		/* implemented */
-extern NCURSES_EXPORT(int) overwrite (const WINDOW*,WINDOW *);		/* implemented */
-extern NCURSES_EXPORT(int) pair_content (NCURSES_PAIRS_T,NCURSES_COLOR_T*,NCURSES_COLOR_T*);		/* implemented */
-extern NCURSES_EXPORT(int) PAIR_NUMBER (int);				/* generated */
-extern NCURSES_EXPORT(int) pechochar (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) pnoutrefresh (WINDOW*,int,int,int,int,int,int);/* implemented */
-extern NCURSES_EXPORT(int) prefresh (WINDOW *,int,int,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) printw (const char *,...)			/* implemented */
-		GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(int) putwin (WINDOW *, FILE *);			/* implemented */
-extern NCURSES_EXPORT(void) qiflush (void);				/* implemented */
-extern NCURSES_EXPORT(int) raw (void);					/* implemented */
-extern NCURSES_EXPORT(int) redrawwin (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) refresh (void);				/* generated */
-extern NCURSES_EXPORT(int) resetty (void);				/* implemented */
-extern NCURSES_EXPORT(int) reset_prog_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) reset_shell_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) ripoffline (int, int (*)(WINDOW *, int));	/* implemented */
-extern NCURSES_EXPORT(int) savetty (void);				/* implemented */
-extern NCURSES_EXPORT(int) scanw (NCURSES_CONST char *,...)		/* implemented */
-		GCC_SCANFLIKE(1,2);
-extern NCURSES_EXPORT(int) scr_dump (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scr_init (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scrl (int);					/* generated */
-extern NCURSES_EXPORT(int) scroll (WINDOW *);				/* generated */
-extern NCURSES_EXPORT(int) scrollok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) scr_restore (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scr_set (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) setscrreg (int,int);				/* generated */
-extern NCURSES_EXPORT(SCREEN *) set_term (SCREEN *);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attroff (const chtype);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_off (const attr_t, void *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) slk_attron (const chtype);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_on (attr_t,void*);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) slk_attrset (const chtype);			/* implemented */
-extern NCURSES_EXPORT(attr_t) slk_attr (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_set (const attr_t,NCURSES_PAIRS_T,void*);	/* implemented */
-extern NCURSES_EXPORT(int) slk_clear (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_color (NCURSES_PAIRS_T);				/* implemented */
-extern NCURSES_EXPORT(int) slk_init (int);				/* implemented */
-extern NCURSES_EXPORT(char *) slk_label (int);				/* implemented */
-extern NCURSES_EXPORT(int) slk_noutrefresh (void);			/* implemented */
-extern NCURSES_EXPORT(int) slk_refresh (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_restore (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_set (int,const char *,int);		/* implemented */
-extern NCURSES_EXPORT(int) slk_touch (void);	      	       		/* implemented */
-extern NCURSES_EXPORT(int) standout (void);				/* generated */
-extern NCURSES_EXPORT(int) standend (void);				/* generated */
-extern NCURSES_EXPORT(int) start_color (void);				/* implemented */
-extern NCURSES_EXPORT(WINDOW *) subpad (WINDOW *, int, int, int, int);	/* implemented */
-extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *, int, int, int, int);	/* implemented */
-extern NCURSES_EXPORT(int) syncok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(chtype) termattrs (void);				/* implemented */
-extern NCURSES_EXPORT(char *) termname (void);				/* implemented */
-extern NCURSES_EXPORT(void) timeout (int);				/* generated */
-extern NCURSES_EXPORT(int) touchline (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) touchwin (WINDOW *);				/* generated */
-extern NCURSES_EXPORT(int) typeahead (int);				/* implemented */
-extern NCURSES_EXPORT(int) ungetch (int);				/* implemented */
-extern NCURSES_EXPORT(int) untouchwin (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(void) use_env (bool);				/* implemented */
-extern NCURSES_EXPORT(void) use_tioctl (bool);				/* implemented */
-extern NCURSES_EXPORT(int) vidattr (chtype);				/* implemented */
-extern NCURSES_EXPORT(int) vidputs (chtype, NCURSES_OUTC);		/* implemented */
-extern NCURSES_EXPORT(int) vline (chtype, int);				/* generated */
-extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *,va_list);	/* implemented */
-extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *,va_list);	/* generated */
-extern NCURSES_EXPORT(int) vwscanw (WINDOW *, NCURSES_CONST char *,va_list);	/* implemented */
-extern NCURSES_EXPORT(int) vw_scanw (WINDOW *, NCURSES_CONST char *,va_list);	/* generated */
-extern NCURSES_EXPORT(int) waddch (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) waddchnstr (WINDOW *,const chtype *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddchstr (WINDOW *,const chtype *);		/* generated */
-extern NCURSES_EXPORT(int) waddnstr (WINDOW *,const char *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddstr (WINDOW *,const char *);		/* generated */
-extern NCURSES_EXPORT(int) wattron (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattroff (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattrset (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattr_get (WINDOW *, attr_t *, NCURSES_PAIRS_T *, void *);	/* generated */
-extern NCURSES_EXPORT(int) wattr_on (WINDOW *, attr_t, void *);		/* implemented */
-extern NCURSES_EXPORT(int) wattr_off (WINDOW *, attr_t, void *);	/* implemented */
-extern NCURSES_EXPORT(int) wattr_set (WINDOW *, attr_t, NCURSES_PAIRS_T, void *);	/* generated */
-extern NCURSES_EXPORT(int) wbkgd (WINDOW *, chtype);			/* implemented */
-extern NCURSES_EXPORT(void) wbkgdset (WINDOW *,chtype);			/* implemented */
-extern NCURSES_EXPORT(int) wborder (WINDOW *,chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* implemented */
-extern NCURSES_EXPORT(int) wchgat (WINDOW *, int, attr_t, NCURSES_PAIRS_T, const void *);/* implemented */
-extern NCURSES_EXPORT(int) wclear (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wclrtobot (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wclrtoeol (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wcolor_set (WINDOW*,NCURSES_PAIRS_T,void*);		/* implemented */
-extern NCURSES_EXPORT(void) wcursyncup (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wdelch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wdeleteln (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) wechochar (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) werase (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wgetch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wgetnstr (WINDOW *,char *,int);		/* implemented */
-extern NCURSES_EXPORT(int) wgetstr (WINDOW *, char *);			/* generated */
-extern NCURSES_EXPORT(int) whline (WINDOW *, chtype, int);		/* implemented */
-extern NCURSES_EXPORT(chtype) winch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) winchnstr (WINDOW *, chtype *, int);		/* implemented */
-extern NCURSES_EXPORT(int) winchstr (WINDOW *, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) winnstr (WINDOW *, char *, int);		/* implemented */
-extern NCURSES_EXPORT(int) winsch (WINDOW *, chtype);			/* implemented */
-extern NCURSES_EXPORT(int) winsdelln (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) winsertln (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) winsnstr (WINDOW *, const char *,int);	/* implemented */
-extern NCURSES_EXPORT(int) winsstr (WINDOW *, const char *);		/* generated */
-extern NCURSES_EXPORT(int) winstr (WINDOW *, char *);			/* generated */
-extern NCURSES_EXPORT(int) wmove (WINDOW *,int,int);			/* implemented */
-extern NCURSES_EXPORT(int) wnoutrefresh (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wprintw (WINDOW *, const char *,...)		/* implemented */
-		GCC_PRINTFLIKE(2,3);
-extern NCURSES_EXPORT(int) wredrawln (WINDOW *,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wrefresh (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wscanw (WINDOW *, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(2,3);
-extern NCURSES_EXPORT(int) wscrl (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) wsetscrreg (WINDOW *,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wstandout (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) wstandend (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(void) wsyncdown (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(void) wsyncup (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(void) wtimeout (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) wtouchln (WINDOW *,int,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wvline (WINDOW *,chtype,int);		/* implemented */
-
-/*
- * These are also declared in <ncursesw/term.h>:
- */
-extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(int) putp (const char *);				/* implemented */
-
-#if NCURSES_TPARM_VARARGS
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */
-#else
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG);	/* special */
-extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
-#endif
-
-extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */
-
-/*
- * These functions are not in X/Open, but we use them in macro definitions:
- */
-extern NCURSES_EXPORT(int) getattrs (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getcurx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getcury (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getbegx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getbegy (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getmaxx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getmaxy (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getparx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getpary (const WINDOW *);			/* generated */
-
-/*
- * vid_attr() was implemented originally based on a draft of X/Open curses.
- */
-#if !NCURSES_WIDECHAR
-#define vid_attr(a,pair,opts) vidattr(a)
-#endif
-
-/*
- * These functions are extensions - not in X/Open Curses.
- */
-#if 1
-#undef  NCURSES_EXT_FUNCS
-#define NCURSES_EXT_FUNCS 20160213
-typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
-typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
-extern NCURSES_EXPORT(bool) is_term_resized (int, int);
-extern NCURSES_EXPORT(char *) keybound (int, int);
-extern NCURSES_EXPORT(const char *) curses_version (void);
-extern NCURSES_EXPORT(int) assume_default_colors (int, int);
-extern NCURSES_EXPORT(int) define_key (const char *, int);
-extern NCURSES_EXPORT(int) get_escdelay (void);
-extern NCURSES_EXPORT(int) key_defined (const char *);
-extern NCURSES_EXPORT(int) keyok (int, bool);
-extern NCURSES_EXPORT(int) resize_term (int, int);
-extern NCURSES_EXPORT(int) resizeterm (int, int);
-extern NCURSES_EXPORT(int) set_escdelay (int);
-extern NCURSES_EXPORT(int) set_tabsize (int);
-extern NCURSES_EXPORT(int) use_default_colors (void);
-extern NCURSES_EXPORT(int) use_extended_names (bool);
-extern NCURSES_EXPORT(int) use_legacy_coding (int);
-extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_SCREEN_CB, void *);
-extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_WINDOW_CB, void *);
-extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
-extern NCURSES_EXPORT(void) nofilter(void);
-
-/*
- * These extensions provide access to information stored in the WINDOW even
- * when NCURSES_OPAQUE is set:
- */
-extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_pad (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_subwin (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(int) wgetdelay (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
-
-#else
-#define curses_version() NCURSES_VERSION
-#endif
-
-/*
- * Extra extension-functions, which pass a SCREEN pointer rather than using
- * a global variable SP.
- */
-#if 0
-#undef  NCURSES_SP_FUNCS
-#define NCURSES_SP_FUNCS 20160213
-#define NCURSES_SP_NAME(name) name##_sp
-
-/* Define the sp-funcs helper function */
-#define NCURSES_SP_OUTC NCURSES_SP_NAME(NCURSES_OUTC)
-typedef int (*NCURSES_SP_OUTC)(SCREEN*, int);
-
-extern NCURSES_EXPORT(SCREEN *) new_prescr (void); /* implemented:SP_FUNC */
-
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(baudrate) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(beep) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(can_change_color) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(cbreak) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(curs_set) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(color_content) (SCREEN*, NCURSES_PAIRS_T, NCURSES_COLOR_T*, NCURSES_COLOR_T*, NCURSES_COLOR_T*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_prog_mode) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_shell_mode) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(delay_output) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(doupdate) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(echo) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(endwin) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(char) NCURSES_SP_NAME(erasechar) (SCREEN*);/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(filter) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flash) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flushinp) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(getwin) (SCREEN*, FILE *);			/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(halfdelay) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_colors) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_ic) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_il) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_color) (SCREEN*, NCURSES_COLOR_T, NCURSES_COLOR_T, NCURSES_COLOR_T, NCURSES_COLOR_T); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_pair) (SCREEN*, NCURSES_PAIRS_T, NCURSES_COLOR_T, NCURSES_COLOR_T); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(intrflush) (SCREEN*, WINDOW*, bool);	/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(isendwin) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(NCURSES_CONST char *) NCURSES_SP_NAME(keyname) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(char) NCURSES_SP_NAME(killchar) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(longname) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mvcur) (SCREEN*, int, int, int, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(napms) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newpad) (SCREEN*, int, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(SCREEN *) NCURSES_SP_NAME(newterm) (SCREEN*, NCURSES_CONST char *, FILE *, FILE *); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newwin) (SCREEN*, int, int, int, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nl) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nocbreak) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noecho) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nonl) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(noqiflush) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noraw) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(pair_content) (SCREEN*, NCURSES_PAIRS_T, NCURSES_COLOR_T*, NCURSES_COLOR_T*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(qiflush) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(raw) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_prog_mode) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_shell_mode) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(resetty) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ripoffline) (SCREEN*, int, int (*)(WINDOW *, int));	/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(savetty) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_init) (SCREEN*, const char *); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_restore) (SCREEN*, const char *); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_set) (SCREEN*, const char *); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attroff) (SCREEN*, const chtype); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attron) (SCREEN*, const chtype); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attrset) (SCREEN*, const chtype); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(slk_attr) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attr_set) (SCREEN*, const attr_t, NCURSES_PAIRS_T, void*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_clear) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_color) (SCREEN*, NCURSES_PAIRS_T); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_init) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(slk_label) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_noutrefresh) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_refresh) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_restore) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_set) (SCREEN*, int, const char *, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_touch) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(start_color) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(chtype) NCURSES_SP_NAME(termattrs) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(termname) (SCREEN*); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(typeahead) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetch) (SCREEN*, int); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_env) (SCREEN*, bool); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_tioctl) (SCREEN*, bool); /* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidattr) (SCREEN*, chtype);	/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidputs) (SCREEN*, chtype, NCURSES_SP_OUTC); /* implemented:SP_FUNC */
-#if 1
-extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(assume_default_colors) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(is_term_resized) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(key_defined) (SCREEN*, const char *);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(keyok) (SCREEN*, int, bool);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(nofilter) (SCREEN*); /* implemented */	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(resize_term) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(resizeterm) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_escdelay) (SCREEN*, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_tabsize) (SCREEN*, int);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_default_colors) (SCREEN*);	/* implemented:EXT_SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);	/* implemented:EXT_SP_FUNC */
-#endif
-#else
-#undef  NCURSES_SP_FUNCS
-#define NCURSES_SP_FUNCS 0
-#define NCURSES_SP_NAME(name) name
-#define NCURSES_SP_OUTC NCURSES_OUTC
-#endif
-
-/* attributes */
-
-#define NCURSES_ATTR_SHIFT       8
-#define NCURSES_BITS(mask,shift) (NCURSES_CAST(chtype,(mask)) << ((shift) + NCURSES_ATTR_SHIFT))
-
-#define A_NORMAL	(1UL - 1UL)
-#define A_ATTRIBUTES	NCURSES_BITS(~(1UL - 1UL),0)
-#define A_CHARTEXT	(NCURSES_BITS(1UL,0) - 1UL)
-#define A_COLOR		NCURSES_BITS(((1UL) << 8) - 1UL,0)
-#define A_STANDOUT	NCURSES_BITS(1UL,8)
-#define A_UNDERLINE	NCURSES_BITS(1UL,9)
-#define A_REVERSE	NCURSES_BITS(1UL,10)
-#define A_BLINK		NCURSES_BITS(1UL,11)
-#define A_DIM		NCURSES_BITS(1UL,12)
-#define A_BOLD		NCURSES_BITS(1UL,13)
-#define A_ALTCHARSET	NCURSES_BITS(1UL,14)
-#define A_INVIS		NCURSES_BITS(1UL,15)
-#define A_PROTECT	NCURSES_BITS(1UL,16)
-#define A_HORIZONTAL	NCURSES_BITS(1UL,17)
-#define A_LEFT		NCURSES_BITS(1UL,18)
-#define A_LOW		NCURSES_BITS(1UL,19)
-#define A_RIGHT		NCURSES_BITS(1UL,20)
-#define A_TOP		NCURSES_BITS(1UL,21)
-#define A_VERTICAL	NCURSES_BITS(1UL,22)
-
-#if 1
-#define A_ITALIC	NCURSES_BITS(1UL,23)	/* ncurses extension */
-#endif
-
-/*
- * Most of the pseudo functions are macros that either provide compatibility
- * with older versions of curses, or provide inline functionality to improve
- * performance.
- */
-
-/*
- * These pseudo functions are always implemented as macros:
- */
-
-#define getyx(win,y,x)   	(y = getcury(win), x = getcurx(win))
-#define getbegyx(win,y,x)	(y = getbegy(win), x = getbegx(win))
-#define getmaxyx(win,y,x)	(y = getmaxy(win), x = getmaxx(win))
-#define getparyx(win,y,x)	(y = getpary(win), x = getparx(win))
-
-#define getsyx(y,x) do { if (newscr) { \
-			     if (is_leaveok(newscr)) \
-				(y) = (x) = -1; \
-			     else \
-				 getyx(newscr,(y), (x)); \
-			} \
-		    } while(0)
-
-#define setsyx(y,x) do { if (newscr) { \
-			    if ((y) == -1 && (x) == -1) \
-				leaveok(newscr, TRUE); \
-			    else { \
-				leaveok(newscr, FALSE); \
-				wmove(newscr, (y), (x)); \
-			    } \
-			} \
-		    } while(0)
-
-#ifndef NCURSES_NOMACROS
-
-/*
- * These miscellaneous pseudo functions are provided for compatibility:
- */
-
-#define wgetstr(w, s)		wgetnstr(w, s, -1)
-#define getnstr(s, n)		wgetnstr(stdscr, s, (n))
-
-#define setterm(term)		setupterm(term, 1, (int *)0)
-
-#define fixterm()		reset_prog_mode()
-#define resetterm()		reset_shell_mode()
-#define saveterm()		def_prog_mode()
-#define crmode()		cbreak()
-#define nocrmode()		nocbreak()
-#define gettmode()
-
-/* It seems older SYSV curses versions define these */
-#if !NCURSES_OPAQUE
-#define getattrs(win)		NCURSES_CAST(int, (win) ? (win)->_attrs : A_NORMAL)
-#define getcurx(win)		((win) ? (win)->_curx : ERR)
-#define getcury(win)		((win) ? (win)->_cury : ERR)
-#define getbegx(win)		((win) ? (win)->_begx : ERR)
-#define getbegy(win)		((win) ? (win)->_begy : ERR)
-#define getmaxx(win)		((win) ? ((win)->_maxx + 1) : ERR)
-#define getmaxy(win)		((win) ? ((win)->_maxy + 1) : ERR)
-#define getparx(win)		((win) ? (win)->_parx : ERR)
-#define getpary(win)		((win) ? (win)->_pary : ERR)
-#endif /* NCURSES_OPAQUE */
-
-#define wstandout(win)      	(wattrset(win,A_STANDOUT))
-#define wstandend(win)      	(wattrset(win,A_NORMAL))
-
-#define wattron(win,at)		wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
-#define wattroff(win,at)	wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
-
-#if !NCURSES_OPAQUE
-#if NCURSES_WIDECHAR && 0
-#define wattrset(win,at)	((win) \
-				  ? ((win)->_color = NCURSES_CAST(int, PAIR_NUMBER(at)), \
-                                     (win)->_attrs = NCURSES_CAST(attr_t, at), \
-                                     OK) \
-				  : ERR)
-#else
-#define wattrset(win,at)        ((win) \
-				  ? ((win)->_attrs = NCURSES_CAST(attr_t, at), \
-				     OK) \
-				  : ERR)
-#endif
-#endif /* NCURSES_OPAQUE */
-
-#define scroll(win)		wscrl(win,1)
-
-#define touchwin(win)		wtouchln((win), 0, getmaxy(win), 1)
-#define touchline(win, s, c)	wtouchln((win), s, c, 1)
-#define untouchwin(win)		wtouchln((win), 0, getmaxy(win), 0)
-
-#define box(win, v, h)		wborder(win, v, v, h, h, 0, 0, 0, 0)
-#define border(ls, rs, ts, bs, tl, tr, bl, br)	wborder(stdscr, ls, rs, ts, bs, tl, tr, bl, br)
-#define hline(ch, n)		whline(stdscr, ch, (n))
-#define vline(ch, n)		wvline(stdscr, ch, (n))
-
-#define winstr(w, s)		winnstr(w, s, -1)
-#define winchstr(w, s)		winchnstr(w, s, -1)
-#define winsstr(w, s)		winsnstr(w, s, -1)
-
-#if !NCURSES_OPAQUE
-#define redrawwin(win)		wredrawln(win, 0, ((win) ? (win)->_maxy+1 : -1))
-#endif /* NCURSES_OPAQUE */
-
-#define waddstr(win,str)	waddnstr(win,str,-1)
-#define waddchstr(win,str)	waddchnstr(win,str,-1)
-
-/*
- * These apply to the first 256 color pairs.
- */
-#define COLOR_PAIR(n)	NCURSES_BITS((n), 0)
-#define PAIR_NUMBER(a)	(NCURSES_CAST(int,((NCURSES_CAST(unsigned long,(a)) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
-
-/*
- * pseudo functions for standard screen
- */
-
-#define addch(ch)		waddch(stdscr,(ch))
-#define addchnstr(str,n)	waddchnstr(stdscr,(str),(n))
-#define addchstr(str)		waddchstr(stdscr,(str))
-#define addnstr(str,n)		waddnstr(stdscr,(str),(n))
-#define addstr(str)		waddnstr(stdscr,(str),-1)
-#define attr_get(ap,cp,o)	wattr_get(stdscr,(ap),(cp),(o))
-#define attr_off(a,o)		wattr_off(stdscr,(a),(o))
-#define attr_on(a,o)		wattr_on(stdscr,(a),(o))
-#define attr_set(a,c,o)		wattr_set(stdscr,(a),(c),(o))
-#define attroff(at)		wattroff(stdscr,(at))
-#define attron(at)		wattron(stdscr,(at))
-#define attrset(at)		wattrset(stdscr,(at))
-#define bkgd(ch)		wbkgd(stdscr,(ch))
-#define bkgdset(ch)		wbkgdset(stdscr,(ch))
-#define chgat(n,a,c,o)		wchgat(stdscr,(n),(a),(c),(o))
-#define clear()			wclear(stdscr)
-#define clrtobot()		wclrtobot(stdscr)
-#define clrtoeol()		wclrtoeol(stdscr)
-#define color_set(c,o)		wcolor_set(stdscr,(c),(o))
-#define delch()			wdelch(stdscr)
-#define deleteln()		winsdelln(stdscr,-1)
-#define echochar(c)		wechochar(stdscr,(c))
-#define erase()			werase(stdscr)
-#define getch()			wgetch(stdscr)
-#define getstr(str)		wgetstr(stdscr,(str))
-#define inch()			winch(stdscr)
-#define inchnstr(s,n)		winchnstr(stdscr,(s),(n))
-#define inchstr(s)		winchstr(stdscr,(s))
-#define innstr(s,n)		winnstr(stdscr,(s),(n))
-#define insch(c)		winsch(stdscr,(c))
-#define insdelln(n)		winsdelln(stdscr,(n))
-#define insertln()		winsdelln(stdscr,1)
-#define insnstr(s,n)		winsnstr(stdscr,(s),(n))
-#define insstr(s)		winsstr(stdscr,(s))
-#define instr(s)		winstr(stdscr,(s))
-#define move(y,x)		wmove(stdscr,(y),(x))
-#define refresh()		wrefresh(stdscr)
-#define scrl(n)			wscrl(stdscr,(n))
-#define setscrreg(t,b)		wsetscrreg(stdscr,(t),(b))
-#define standend()		wstandend(stdscr)
-#define standout()		wstandout(stdscr)
-#define timeout(delay)		wtimeout(stdscr,(delay))
-#define wdeleteln(win)		winsdelln(win,-1)
-#define winsertln(win)		winsdelln(win,1)
-
-/*
- * mv functions
- */
-
-#define mvwaddch(win,y,x,ch)		(wmove((win),(y),(x)) == ERR ? ERR : waddch((win),(ch)))
-#define mvwaddchnstr(win,y,x,str,n)	(wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),(n)))
-#define mvwaddchstr(win,y,x,str)	(wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),-1))
-#define mvwaddnstr(win,y,x,str,n)	(wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),(n)))
-#define mvwaddstr(win,y,x,str)		(wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),-1))
-#define mvwchgat(win,y,x,n,a,c,o)	(wmove((win),(y),(x)) == ERR ? ERR : wchgat((win),(n),(a),(c),(o)))
-#define mvwdelch(win,y,x)		(wmove((win),(y),(x)) == ERR ? ERR : wdelch(win))
-#define mvwgetch(win,y,x)		(wmove((win),(y),(x)) == ERR ? ERR : wgetch(win))
-#define mvwgetnstr(win,y,x,str,n)	(wmove((win),(y),(x)) == ERR ? ERR : wgetnstr((win),(str),(n)))
-#define mvwgetstr(win,y,x,str)		(wmove((win),(y),(x)) == ERR ? ERR : wgetstr((win),(str)))
-#define mvwhline(win,y,x,c,n)		(wmove((win),(y),(x)) == ERR ? ERR : whline((win),(c),(n)))
-#define mvwinch(win,y,x)		(wmove((win),(y),(x)) == ERR ? NCURSES_CAST(chtype, ERR) : winch(win))
-#define mvwinchnstr(win,y,x,s,n)	(wmove((win),(y),(x)) == ERR ? ERR : winchnstr((win),(s),(n)))
-#define mvwinchstr(win,y,x,s)		(wmove((win),(y),(x)) == ERR ? ERR : winchstr((win),(s)))
-#define mvwinnstr(win,y,x,s,n)		(wmove((win),(y),(x)) == ERR ? ERR : winnstr((win),(s),(n)))
-#define mvwinsch(win,y,x,c)		(wmove((win),(y),(x)) == ERR ? ERR : winsch((win),(c)))
-#define mvwinsnstr(win,y,x,s,n)		(wmove((win),(y),(x)) == ERR ? ERR : winsnstr((win),(s),(n)))
-#define mvwinsstr(win,y,x,s)		(wmove((win),(y),(x)) == ERR ? ERR : winsstr((win),(s)))
-#define mvwinstr(win,y,x,s)		(wmove((win),(y),(x)) == ERR ? ERR : winstr((win),(s)))
-#define mvwvline(win,y,x,c,n)		(wmove((win),(y),(x)) == ERR ? ERR : wvline((win),(c),(n)))
-
-#define mvaddch(y,x,ch)			mvwaddch(stdscr,(y),(x),(ch))
-#define mvaddchnstr(y,x,str,n)		mvwaddchnstr(stdscr,(y),(x),(str),(n))
-#define mvaddchstr(y,x,str)		mvwaddchstr(stdscr,(y),(x),(str))
-#define mvaddnstr(y,x,str,n)		mvwaddnstr(stdscr,(y),(x),(str),(n))
-#define mvaddstr(y,x,str)		mvwaddstr(stdscr,(y),(x),(str))
-#define mvchgat(y,x,n,a,c,o)		mvwchgat(stdscr,(y),(x),(n),(a),(c),(o))
-#define mvdelch(y,x)			mvwdelch(stdscr,(y),(x))
-#define mvgetch(y,x)			mvwgetch(stdscr,(y),(x))
-#define mvgetnstr(y,x,str,n)		mvwgetnstr(stdscr,(y),(x),(str),(n))
-#define mvgetstr(y,x,str)		mvwgetstr(stdscr,(y),(x),(str))
-#define mvhline(y,x,c,n)		mvwhline(stdscr,(y),(x),(c),(n))
-#define mvinch(y,x)			mvwinch(stdscr,(y),(x))
-#define mvinchnstr(y,x,s,n)		mvwinchnstr(stdscr,(y),(x),(s),(n))
-#define mvinchstr(y,x,s)		mvwinchstr(stdscr,(y),(x),(s))
-#define mvinnstr(y,x,s,n)		mvwinnstr(stdscr,(y),(x),(s),(n))
-#define mvinsch(y,x,c)			mvwinsch(stdscr,(y),(x),(c))
-#define mvinsnstr(y,x,s,n)		mvwinsnstr(stdscr,(y),(x),(s),(n))
-#define mvinsstr(y,x,s)			mvwinsstr(stdscr,(y),(x),(s))
-#define mvinstr(y,x,s)			mvwinstr(stdscr,(y),(x),(s))
-#define mvvline(y,x,c,n)		mvwvline(stdscr,(y),(x),(c),(n))
-
-/*
- * Some wide-character functions can be implemented without the extensions.
- */
-#if !NCURSES_OPAQUE
-#define getbkgd(win)                    ((win) ? ((win)->_bkgd) : 0)
-#endif /* NCURSES_OPAQUE */
-
-#define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
-#define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
-
-#if !NCURSES_OPAQUE
-#if NCURSES_WIDECHAR && 0
-#define wattr_set(win,a,p,opts)		(((win) \
-					  ? ((win)->_attrs = ((a) & ~A_COLOR), \
-					     (win)->_color = (p)) \
-					  : OK), \
-					 OK)
-#define wattr_get(win,a,p,opts)		((void)(((a) != (void *)0) ? (*(a) = (win) ? (win)->_attrs : 0) : OK), \
-					 (void)(((p) != (void *)0) ? (*(p) = (NCURSES_PAIRS_T) ((win) ? (win)->_color : 0)) : OK), \
-					 OK)
-#else
-#define wattr_set(win,a,p,opts)		(((win) \
-					  ? ((win)->_attrs = (((a) & ~A_COLOR) | (attr_t)COLOR_PAIR(p))) \
-					  : OK), \
-					 OK)
-#define wattr_get(win,a,p,opts)		((void)(((a) != (void *)0) ? (*(a) = (win) ? (win)->_attrs : 0) : OK), \
-					 (void)(((p) != (void *)0) ? (*(p) = (NCURSES_PAIRS_T) ((win) ? PAIR_NUMBER((win)->_attrs) : 0)) : OK), \
-					 OK)
-#endif
-#endif /* NCURSES_OPAQUE */
-
-/*
- * X/Open curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
- * varargs.h.  It adds new calls vw_printw/vw_scanw, which are supposed to
- * use POSIX stdarg.h.  The ncurses versions of vwprintw/vwscanw already
- * use stdarg.h, so...
- */
-#define vw_printw		vwprintw
-#define vw_scanw		vwscanw
-
-/*
- * Export fallback function for use in C++ binding.
- */
-#if !1
-#define vsscanf(a,b,c) _nc_vsscanf(a,b,c)
-NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
-#endif
-
-/*
- * These macros are extensions - not in X/Open Curses.
- */
-#if 1
-#if !NCURSES_OPAQUE
-#define is_cleared(win)		((win) ? (win)->_clear : FALSE)
-#define is_idcok(win)		((win) ? (win)->_idcok : FALSE)
-#define is_idlok(win)		((win) ? (win)->_idlok : FALSE)
-#define is_immedok(win)		((win) ? (win)->_immed : FALSE)
-#define is_keypad(win)		((win) ? (win)->_use_keypad : FALSE)
-#define is_leaveok(win)		((win) ? (win)->_leaveok : FALSE)
-#define is_nodelay(win)		((win) ? ((win)->_delay == 0) : FALSE)
-#define is_notimeout(win)	((win) ? (win)->_notimeout : FALSE)
-#define is_pad(win)		((win) ? ((win)->_flags & _ISPAD) != 0 : FALSE)
-#define is_scrollok(win)	((win) ? (win)->_scroll : FALSE)
-#define is_subwin(win)		((win) ? ((win)->_flags & _SUBWIN) != 0 : FALSE)
-#define is_syncok(win)		((win) ? (win)->_sync : FALSE)
-#define wgetdelay(win)		((win) ? (win)->_delay : 0)
-#define wgetparent(win)		((win) ? (win)->_parent : 0)
-#define wgetscrreg(win,t,b)	((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
-#endif
-#endif
-
-#endif /* NCURSES_NOMACROS */
-
-/*
- * Public variables.
- *
- * Notes:
- *	a. ESCDELAY was an undocumented feature under AIX curses.
- *	   It gives the ESC expire time in milliseconds.
- *	b. ttytype is needed for backward compatibility
- */
-#if NCURSES_REENTRANT
-
-NCURSES_WRAPPED_VAR(WINDOW *, curscr);
-NCURSES_WRAPPED_VAR(WINDOW *, newscr);
-NCURSES_WRAPPED_VAR(WINDOW *, stdscr);
-NCURSES_WRAPPED_VAR(char *, ttytype);
-NCURSES_WRAPPED_VAR(int, COLORS);
-NCURSES_WRAPPED_VAR(int, COLOR_PAIRS);
-NCURSES_WRAPPED_VAR(int, COLS);
-NCURSES_WRAPPED_VAR(int, ESCDELAY);
-NCURSES_WRAPPED_VAR(int, LINES);
-NCURSES_WRAPPED_VAR(int, TABSIZE);
-
-#define curscr      NCURSES_PUBLIC_VAR(curscr())
-#define newscr      NCURSES_PUBLIC_VAR(newscr())
-#define stdscr      NCURSES_PUBLIC_VAR(stdscr())
-#define ttytype     NCURSES_PUBLIC_VAR(ttytype())
-#define COLORS      NCURSES_PUBLIC_VAR(COLORS())
-#define COLOR_PAIRS NCURSES_PUBLIC_VAR(COLOR_PAIRS())
-#define COLS        NCURSES_PUBLIC_VAR(COLS())
-#define ESCDELAY    NCURSES_PUBLIC_VAR(ESCDELAY())
-#define LINES       NCURSES_PUBLIC_VAR(LINES())
-#define TABSIZE     NCURSES_PUBLIC_VAR(TABSIZE())
-
-#else
-
-extern NCURSES_EXPORT_VAR(WINDOW *) curscr;
-extern NCURSES_EXPORT_VAR(WINDOW *) newscr;
-extern NCURSES_EXPORT_VAR(WINDOW *) stdscr;
-extern NCURSES_EXPORT_VAR(char) ttytype[];
-extern NCURSES_EXPORT_VAR(int) COLORS;
-extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
-extern NCURSES_EXPORT_VAR(int) COLS;
-extern NCURSES_EXPORT_VAR(int) ESCDELAY;
-extern NCURSES_EXPORT_VAR(int) LINES;
-extern NCURSES_EXPORT_VAR(int) TABSIZE;
-
-#endif
-
-/*
- * Pseudo-character tokens outside ASCII range.  The curses wgetch() function
- * will return any given one of these only if the corresponding k- capability
- * is defined in your terminal's terminfo entry.
- *
- * Some keys (KEY_A1, etc) are arranged like this:
- *	a1     up    a3
- *	left   b2    right
- *	c1     down  c3
- *
- * A few key codes do not depend upon the terminfo entry.
- */
-#define KEY_CODE_YES	0400		/* A wchar_t contains a key code */
-#define KEY_MIN		0401		/* Minimum curses key */
-#define KEY_BREAK	0401		/* Break key (unreliable) */
-#define KEY_SRESET	0530		/* Soft (partial) reset (unreliable) */
-#define KEY_RESET	0531		/* Reset or hard reset (unreliable) */
-/*
- * These definitions were generated by ./MKkey_defs.sh ./Caps
- */
-#define KEY_DOWN	0402		/* down-arrow key */
-#define KEY_UP		0403		/* up-arrow key */
-#define KEY_LEFT	0404		/* left-arrow key */
-#define KEY_RIGHT	0405		/* right-arrow key */
-#define KEY_HOME	0406		/* home key */
-#define KEY_BACKSPACE	0407		/* backspace key */
-#define KEY_F0		0410		/* Function keys.  Space for 64 */
-#define KEY_F(n)	(KEY_F0+(n))	/* Value of function key n */
-#define KEY_DL		0510		/* delete-line key */
-#define KEY_IL		0511		/* insert-line key */
-#define KEY_DC		0512		/* delete-character key */
-#define KEY_IC		0513		/* insert-character key */
-#define KEY_EIC		0514		/* sent by rmir or smir in insert mode */
-#define KEY_CLEAR	0515		/* clear-screen or erase key */
-#define KEY_EOS		0516		/* clear-to-end-of-screen key */
-#define KEY_EOL		0517		/* clear-to-end-of-line key */
-#define KEY_SF		0520		/* scroll-forward key */
-#define KEY_SR		0521		/* scroll-backward key */
-#define KEY_NPAGE	0522		/* next-page key */
-#define KEY_PPAGE	0523		/* previous-page key */
-#define KEY_STAB	0524		/* set-tab key */
-#define KEY_CTAB	0525		/* clear-tab key */
-#define KEY_CATAB	0526		/* clear-all-tabs key */
-#define KEY_ENTER	0527		/* enter/send key */
-#define KEY_PRINT	0532		/* print key */
-#define KEY_LL		0533		/* lower-left key (home down) */
-#define KEY_A1		0534		/* upper left of keypad */
-#define KEY_A3		0535		/* upper right of keypad */
-#define KEY_B2		0536		/* center of keypad */
-#define KEY_C1		0537		/* lower left of keypad */
-#define KEY_C3		0540		/* lower right of keypad */
-#define KEY_BTAB	0541		/* back-tab key */
-#define KEY_BEG		0542		/* begin key */
-#define KEY_CANCEL	0543		/* cancel key */
-#define KEY_CLOSE	0544		/* close key */
-#define KEY_COMMAND	0545		/* command key */
-#define KEY_COPY	0546		/* copy key */
-#define KEY_CREATE	0547		/* create key */
-#define KEY_END		0550		/* end key */
-#define KEY_EXIT	0551		/* exit key */
-#define KEY_FIND	0552		/* find key */
-#define KEY_HELP	0553		/* help key */
-#define KEY_MARK	0554		/* mark key */
-#define KEY_MESSAGE	0555		/* message key */
-#define KEY_MOVE	0556		/* move key */
-#define KEY_NEXT	0557		/* next key */
-#define KEY_OPEN	0560		/* open key */
-#define KEY_OPTIONS	0561		/* options key */
-#define KEY_PREVIOUS	0562		/* previous key */
-#define KEY_REDO	0563		/* redo key */
-#define KEY_REFERENCE	0564		/* reference key */
-#define KEY_REFRESH	0565		/* refresh key */
-#define KEY_REPLACE	0566		/* replace key */
-#define KEY_RESTART	0567		/* restart key */
-#define KEY_RESUME	0570		/* resume key */
-#define KEY_SAVE	0571		/* save key */
-#define KEY_SBEG	0572		/* shifted begin key */
-#define KEY_SCANCEL	0573		/* shifted cancel key */
-#define KEY_SCOMMAND	0574		/* shifted command key */
-#define KEY_SCOPY	0575		/* shifted copy key */
-#define KEY_SCREATE	0576		/* shifted create key */
-#define KEY_SDC		0577		/* shifted delete-character key */
-#define KEY_SDL		0600		/* shifted delete-line key */
-#define KEY_SELECT	0601		/* select key */
-#define KEY_SEND	0602		/* shifted end key */
-#define KEY_SEOL	0603		/* shifted clear-to-end-of-line key */
-#define KEY_SEXIT	0604		/* shifted exit key */
-#define KEY_SFIND	0605		/* shifted find key */
-#define KEY_SHELP	0606		/* shifted help key */
-#define KEY_SHOME	0607		/* shifted home key */
-#define KEY_SIC		0610		/* shifted insert-character key */
-#define KEY_SLEFT	0611		/* shifted left-arrow key */
-#define KEY_SMESSAGE	0612		/* shifted message key */
-#define KEY_SMOVE	0613		/* shifted move key */
-#define KEY_SNEXT	0614		/* shifted next key */
-#define KEY_SOPTIONS	0615		/* shifted options key */
-#define KEY_SPREVIOUS	0616		/* shifted previous key */
-#define KEY_SPRINT	0617		/* shifted print key */
-#define KEY_SREDO	0620		/* shifted redo key */
-#define KEY_SREPLACE	0621		/* shifted replace key */
-#define KEY_SRIGHT	0622		/* shifted right-arrow key */
-#define KEY_SRSUME	0623		/* shifted resume key */
-#define KEY_SSAVE	0624		/* shifted save key */
-#define KEY_SSUSPEND	0625		/* shifted suspend key */
-#define KEY_SUNDO	0626		/* shifted undo key */
-#define KEY_SUSPEND	0627		/* suspend key */
-#define KEY_UNDO	0630		/* undo key */
-#define KEY_MOUSE	0631		/* Mouse event has occurred */
-#define KEY_RESIZE	0632		/* Terminal resize event */
-#define KEY_EVENT	0633		/* We were interrupted by an event */
-
-#define KEY_MAX		0777		/* Maximum key value is 0633 */
-/* $Id: curses.wide,v 1.46 2014/02/01 22:00:32 tom Exp $ */
-/*
- * vile:cmode:
- * This file is part of ncurses, designed to be appended after curses.h.in
- * (see that file for the relevant copyright).
- */
-#define _XOPEN_CURSES 1
-
-#if NCURSES_WIDECHAR
-
-extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
-
-#define NCURSES_WACS(c)	(&_nc_wacs[NCURSES_CAST(unsigned char,(c))])
-
-#define WACS_BSSB	NCURSES_WACS('l')
-#define WACS_SSBB	NCURSES_WACS('m')
-#define WACS_BBSS	NCURSES_WACS('k')
-#define WACS_SBBS	NCURSES_WACS('j')
-#define WACS_SBSS	NCURSES_WACS('u')
-#define WACS_SSSB	NCURSES_WACS('t')
-#define WACS_SSBS	NCURSES_WACS('v')
-#define WACS_BSSS	NCURSES_WACS('w')
-#define WACS_BSBS	NCURSES_WACS('q')
-#define WACS_SBSB	NCURSES_WACS('x')
-#define WACS_SSSS	NCURSES_WACS('n')
-
-#define WACS_ULCORNER	WACS_BSSB
-#define WACS_LLCORNER	WACS_SSBB
-#define WACS_URCORNER	WACS_BBSS
-#define WACS_LRCORNER	WACS_SBBS
-#define WACS_RTEE	WACS_SBSS
-#define WACS_LTEE	WACS_SSSB
-#define WACS_BTEE	WACS_SSBS
-#define WACS_TTEE	WACS_BSSS
-#define WACS_HLINE	WACS_BSBS
-#define WACS_VLINE	WACS_SBSB
-#define WACS_PLUS	WACS_SSSS
-
-#define WACS_S1		NCURSES_WACS('o') /* scan line 1 */
-#define WACS_S9 	NCURSES_WACS('s') /* scan line 9 */
-#define WACS_DIAMOND	NCURSES_WACS('`') /* diamond */
-#define WACS_CKBOARD	NCURSES_WACS('a') /* checker board */
-#define WACS_DEGREE	NCURSES_WACS('f') /* degree symbol */
-#define WACS_PLMINUS	NCURSES_WACS('g') /* plus/minus */
-#define WACS_BULLET	NCURSES_WACS('~') /* bullet */
-
-	/* Teletype 5410v1 symbols */
-#define WACS_LARROW	NCURSES_WACS(',') /* arrow left */
-#define WACS_RARROW	NCURSES_WACS('+') /* arrow right */
-#define WACS_DARROW	NCURSES_WACS('.') /* arrow down */
-#define WACS_UARROW	NCURSES_WACS('-') /* arrow up */
-#define WACS_BOARD	NCURSES_WACS('h') /* board of squares */
-#define WACS_LANTERN	NCURSES_WACS('i') /* lantern symbol */
-#define WACS_BLOCK	NCURSES_WACS('0') /* solid square block */
-
-	/* ncurses extensions */
-#define WACS_S3		NCURSES_WACS('p') /* scan line 3 */
-#define WACS_S7		NCURSES_WACS('r') /* scan line 7 */
-#define WACS_LEQUAL	NCURSES_WACS('y') /* less/equal */
-#define WACS_GEQUAL	NCURSES_WACS('z') /* greater/equal */
-#define WACS_PI		NCURSES_WACS('{') /* Pi */
-#define WACS_NEQUAL	NCURSES_WACS('|') /* not equal */
-#define WACS_STERLING	NCURSES_WACS('}') /* UK pound sign */
-
-	/* double lines */
-#define WACS_BDDB	NCURSES_WACS('C')
-#define WACS_DDBB	NCURSES_WACS('D')
-#define WACS_BBDD	NCURSES_WACS('B')
-#define WACS_DBBD	NCURSES_WACS('A')
-#define WACS_DBDD	NCURSES_WACS('G')
-#define WACS_DDDB	NCURSES_WACS('F')
-#define WACS_DDBD	NCURSES_WACS('H')
-#define WACS_BDDD	NCURSES_WACS('I')
-#define WACS_BDBD	NCURSES_WACS('R')
-#define WACS_DBDB	NCURSES_WACS('Y')
-#define WACS_DDDD	NCURSES_WACS('E')
-
-#define WACS_D_ULCORNER	WACS_BDDB
-#define WACS_D_LLCORNER	WACS_DDBB
-#define WACS_D_URCORNER	WACS_BBDD
-#define WACS_D_LRCORNER	WACS_DBBD
-#define WACS_D_RTEE	WACS_DBDD
-#define WACS_D_LTEE	WACS_DDDB
-#define WACS_D_BTEE	WACS_DDBD
-#define WACS_D_TTEE	WACS_BDDD
-#define WACS_D_HLINE	WACS_BDBD
-#define WACS_D_VLINE	WACS_DBDB
-#define WACS_D_PLUS	WACS_DDDD
-
-	/* thick lines */
-#define WACS_BTTB	NCURSES_WACS('L')
-#define WACS_TTBB	NCURSES_WACS('M')
-#define WACS_BBTT	NCURSES_WACS('K')
-#define WACS_TBBT	NCURSES_WACS('J')
-#define WACS_TBTT	NCURSES_WACS('U')
-#define WACS_TTTB	NCURSES_WACS('T')
-#define WACS_TTBT	NCURSES_WACS('V')
-#define WACS_BTTT	NCURSES_WACS('W')
-#define WACS_BTBT	NCURSES_WACS('Q')
-#define WACS_TBTB	NCURSES_WACS('X')
-#define WACS_TTTT	NCURSES_WACS('N')
-
-#define WACS_T_ULCORNER	WACS_BTTB
-#define WACS_T_LLCORNER	WACS_TTBB
-#define WACS_T_URCORNER	WACS_BBTT
-#define WACS_T_LRCORNER	WACS_TBBT
-#define WACS_T_RTEE	WACS_TBTT
-#define WACS_T_LTEE	WACS_TTTB
-#define WACS_T_BTEE	WACS_TTBT
-#define WACS_T_TTEE	WACS_BTTT
-#define WACS_T_HLINE	WACS_BTBT
-#define WACS_T_VLINE	WACS_TBTB
-#define WACS_T_PLUS	WACS_TTTT
-
-/*
- * Function prototypes for wide-character operations.
- *
- * "generated" comments should include ":WIDEC" to make the corresponding
- * functions ifdef'd in lib_gen.c
- *
- * "implemented" comments do not need this marker.
- */
-
-extern NCURSES_EXPORT(int) add_wch (const cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) add_wchnstr (const cchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) add_wchstr (const cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) addnwstr (const wchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) addwstr (const wchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) bkgrnd (const cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(void) bkgrndset (const cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) border_set (const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) box_set (WINDOW *, const cchar_t *, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) echo_wchar (const cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) erasewchar (wchar_t*);			/* implemented */
-extern NCURSES_EXPORT(int) get_wch (wint_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(int) get_wstr (wint_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(int) getbkgrnd (cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) getcchar (const cchar_t *, wchar_t*, attr_t*, NCURSES_PAIRS_T*, void*);	/* implemented */
-extern NCURSES_EXPORT(int) getn_wstr (wint_t *, int);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) hline_set (const cchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) in_wch (cchar_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(int) in_wchnstr (cchar_t *, int);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) in_wchstr (cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) innwstr (wchar_t *, int);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) ins_nwstr (const wchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) ins_wch (const cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) ins_wstr (const wchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) inwstr (wchar_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(NCURSES_CONST char*) key_name (wchar_t);		/* implemented */
-extern NCURSES_EXPORT(int) killwchar (wchar_t *);			/* implemented */
-extern NCURSES_EXPORT(int) mvadd_wch (int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvadd_wchnstr (int, int, const cchar_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvadd_wchstr (int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvaddnwstr (int, int, const wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvaddwstr (int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvget_wch (int, int, wint_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvget_wstr (int, int, wint_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvgetn_wstr (int, int, wint_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvhline_set (int, int, const cchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvin_wch (int, int, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvin_wchnstr (int, int, cchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvin_wchstr (int, int, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvinnwstr (int, int, wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvins_nwstr (int, int, const wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvins_wch (int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvins_wstr (int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvinwstr (int, int, wchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvvline_set (int, int, const cchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwadd_wch (WINDOW *, int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwadd_wchnstr (WINDOW *, int, int, const cchar_t *, int); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwadd_wchstr (WINDOW *, int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwaddnwstr (WINDOW *, int, int, const wchar_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwaddwstr (WINDOW *, int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwget_wch (WINDOW *, int, int, wint_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwget_wstr (WINDOW *, int, int, wint_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwgetn_wstr (WINDOW *, int, int, wint_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwhline_set (WINDOW *, int, int, const cchar_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwin_wch (WINDOW *, int, int, cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwin_wchnstr (WINDOW *, int,int, cchar_t *,int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwin_wchstr (WINDOW *, int, int, cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwinnwstr (WINDOW *, int, int, wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwins_nwstr (WINDOW *, int,int, const wchar_t *,int); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwins_wch (WINDOW *, int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwins_wstr (WINDOW *, int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwinwstr (WINDOW *, int, int, wchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwvline_set (WINDOW *, int,int, const cchar_t *,int); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) pecho_wchar (WINDOW *, const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) setcchar (cchar_t *, const wchar_t *, const attr_t, NCURSES_PAIRS_T, const void *);	/* implemented */
-extern NCURSES_EXPORT(int) slk_wset (int, const wchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(attr_t) term_attrs (void);			/* implemented */
-extern NCURSES_EXPORT(int) unget_wch (const wchar_t);			/* implemented */
-extern NCURSES_EXPORT(int) vid_attr (attr_t, NCURSES_PAIRS_T, void *);		/* implemented */
-extern NCURSES_EXPORT(int) vid_puts (attr_t, NCURSES_PAIRS_T, void *, NCURSES_OUTC); /* implemented */
-extern NCURSES_EXPORT(int) vline_set (const cchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wadd_wch (WINDOW *,const cchar_t *);		/* implemented */
-extern NCURSES_EXPORT(int) wadd_wchnstr (WINDOW *,const cchar_t *,int);	/* implemented */
-extern NCURSES_EXPORT(int) wadd_wchstr (WINDOW *,const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) waddnwstr (WINDOW *,const wchar_t *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddwstr (WINDOW *,const wchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wbkgrnd (WINDOW *,const cchar_t *);		/* implemented */
-extern NCURSES_EXPORT(void) wbkgrndset (WINDOW *,const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) wborder_set (WINDOW *,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*);	/* implemented */
-extern NCURSES_EXPORT(int) wecho_wchar (WINDOW *, const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) wget_wch (WINDOW *, wint_t *);		/* implemented */
-extern NCURSES_EXPORT(int) wget_wstr (WINDOW *, wint_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wgetbkgrnd (WINDOW *, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wgetn_wstr (WINDOW *,wint_t *, int);		/* implemented */
-extern NCURSES_EXPORT(int) whline_set (WINDOW *, const cchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(int) win_wch (WINDOW *, cchar_t *);		/* implemented */
-extern NCURSES_EXPORT(int) win_wchnstr (WINDOW *, cchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(int) win_wchstr (WINDOW *, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) winnwstr (WINDOW *, wchar_t *, int);		/* implemented */
-extern NCURSES_EXPORT(int) wins_nwstr (WINDOW *, const wchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(int) wins_wch (WINDOW *, const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) wins_wstr (WINDOW *, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) winwstr (WINDOW *, wchar_t *);		/* implemented */
-extern NCURSES_EXPORT(wchar_t*) wunctrl (cchar_t *);			/* implemented */
-extern NCURSES_EXPORT(int) wvline_set (WINDOW *, const cchar_t *, int);	/* implemented */
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(term_attrs) (SCREEN*);		/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(unget_wch) (SCREEN*, const wchar_t);	/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(wchar_t*) NCURSES_SP_NAME(wunctrl) (SCREEN*, cchar_t *);	/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vid_attr) (SCREEN*, attr_t, NCURSES_PAIRS_T, void *);	/* implemented:SP_FUNC */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vid_puts) (SCREEN*, attr_t, NCURSES_PAIRS_T, void *, NCURSES_SP_OUTC);	/* implemented:SP_FUNC */
-#endif
-
-#ifndef NCURSES_NOMACROS
-
-/*
- * XSI curses macros for XPG4 conformance.
- */
-#define add_wch(c)			wadd_wch(stdscr,(c))
-#define add_wchnstr(str,n)		wadd_wchnstr(stdscr,(str),(n))
-#define add_wchstr(str)			wadd_wchstr(stdscr,(str))
-#define addnwstr(wstr,n)		waddnwstr(stdscr,(wstr),(n))
-#define addwstr(wstr)			waddwstr(stdscr,(wstr))
-#define bkgrnd(c)			wbkgrnd(stdscr,(c))
-#define bkgrndset(c)			wbkgrndset(stdscr,(c))
-#define border_set(l,r,t,b,tl,tr,bl,br) wborder_set(stdscr,(l),(r),(t),(b),tl,tr,bl,br)
-#define box_set(w,v,h)			wborder_set((w),(v),(v),(h),(h),0,0,0,0)
-#define echo_wchar(c)			wecho_wchar(stdscr,(c))
-#define get_wch(c)			wget_wch(stdscr,(c))
-#define get_wstr(t)			wget_wstr(stdscr,(t))
-#define getbkgrnd(wch)			wgetbkgrnd(stdscr,(wch))
-#define getn_wstr(t,n)			wgetn_wstr(stdscr,(t),(n))
-#define hline_set(c,n)			whline_set(stdscr,(c),(n))
-#define in_wch(c)			win_wch(stdscr,(c))
-#define in_wchnstr(c,n)			win_wchnstr(stdscr,(c),(n))
-#define in_wchstr(c)			win_wchstr(stdscr,(c))
-#define innwstr(c,n)			winnwstr(stdscr,(c),(n))
-#define ins_nwstr(t,n)			wins_nwstr(stdscr,(t),(n))
-#define ins_wch(c)			wins_wch(stdscr,(c))
-#define ins_wstr(t)			wins_wstr(stdscr,(t))
-#define inwstr(c)			winwstr(stdscr,(c))
-#define vline_set(c,n)			wvline_set(stdscr,(c),(n))
-#define wadd_wchstr(win,str)		wadd_wchnstr((win),(str),-1)
-#define waddwstr(win,wstr)		waddnwstr((win),(wstr),-1)
-#define wget_wstr(w,t)			wgetn_wstr((w),(t),-1)
-#define win_wchstr(w,c)			win_wchnstr((w),(c),-1)
-#define wins_wstr(w,t)			wins_nwstr((w),(t),-1)
-
-#if !NCURSES_OPAQUE
-#define wgetbkgrnd(win,wch)		((win) ? (*(wch) = (win)->_bkgrnd) : *(wch), OK)
-#endif
-
-#define mvadd_wch(y,x,c)		mvwadd_wch(stdscr,(y),(x),(c))
-#define mvadd_wchnstr(y,x,s,n)		mvwadd_wchnstr(stdscr,(y),(x),(s),(n))
-#define mvadd_wchstr(y,x,s)		mvwadd_wchstr(stdscr,(y),(x),(s))
-#define mvaddnwstr(y,x,wstr,n)		mvwaddnwstr(stdscr,(y),(x),(wstr),(n))
-#define mvaddwstr(y,x,wstr)		mvwaddwstr(stdscr,(y),(x),(wstr))
-#define mvget_wch(y,x,c)		mvwget_wch(stdscr,(y),(x),(c))
-#define mvget_wstr(y,x,t)		mvwget_wstr(stdscr,(y),(x),(t))
-#define mvgetn_wstr(y,x,t,n)		mvwgetn_wstr(stdscr,(y),(x),(t),(n))
-#define mvhline_set(y,x,c,n)		mvwhline_set(stdscr,(y),(x),(c),(n))
-#define mvin_wch(y,x,c)			mvwin_wch(stdscr,(y),(x),(c))
-#define mvin_wchnstr(y,x,c,n)		mvwin_wchnstr(stdscr,(y),(x),(c),(n))
-#define mvin_wchstr(y,x,c)		mvwin_wchstr(stdscr,(y),(x),(c))
-#define mvinnwstr(y,x,c,n)		mvwinnwstr(stdscr,(y),(x),(c),(n))
-#define mvins_nwstr(y,x,t,n)		mvwins_nwstr(stdscr,(y),(x),(t),(n))
-#define mvins_wch(y,x,c)		mvwins_wch(stdscr,(y),(x),(c))
-#define mvins_wstr(y,x,t)		mvwins_wstr(stdscr,(y),(x),(t))
-#define mvinwstr(y,x,c)			mvwinwstr(stdscr,(y),(x),(c))
-#define mvvline_set(y,x,c,n)		mvwvline_set(stdscr,(y),(x),(c),(n))
-
-#define mvwadd_wch(win,y,x,c)		(wmove(win,(y),(x)) == ERR ? ERR : wadd_wch((win),(c)))
-#define mvwadd_wchnstr(win,y,x,s,n)	(wmove(win,(y),(x)) == ERR ? ERR : wadd_wchnstr((win),(s),(n)))
-#define mvwadd_wchstr(win,y,x,s)	(wmove(win,(y),(x)) == ERR ? ERR : wadd_wchstr((win),(s)))
-#define mvwaddnwstr(win,y,x,wstr,n)	(wmove(win,(y),(x)) == ERR ? ERR : waddnwstr((win),(wstr),(n)))
-#define mvwaddwstr(win,y,x,wstr)	(wmove(win,(y),(x)) == ERR ? ERR : waddwstr((win),(wstr)))
-#define mvwget_wch(win,y,x,c)		(wmove(win,(y),(x)) == ERR ? ERR : wget_wch((win),(c)))
-#define mvwget_wstr(win,y,x,t)		(wmove(win,(y),(x)) == ERR ? ERR : wget_wstr((win),(t)))
-#define mvwgetn_wstr(win,y,x,t,n)	(wmove(win,(y),(x)) == ERR ? ERR : wgetn_wstr((win),(t),(n)))
-#define mvwhline_set(win,y,x,c,n)	(wmove(win,(y),(x)) == ERR ? ERR : whline_set((win),(c),(n)))
-#define mvwin_wch(win,y,x,c)		(wmove(win,(y),(x)) == ERR ? ERR : win_wch((win),(c)))
-#define mvwin_wchnstr(win,y,x,c,n)	(wmove(win,(y),(x)) == ERR ? ERR : win_wchnstr((win),(c),(n)))
-#define mvwin_wchstr(win,y,x,c)		(wmove(win,(y),(x)) == ERR ? ERR : win_wchstr((win),(c)))
-#define mvwinnwstr(win,y,x,c,n)		(wmove(win,(y),(x)) == ERR ? ERR : winnwstr((win),(c),(n)))
-#define mvwins_nwstr(win,y,x,t,n)	(wmove(win,(y),(x)) == ERR ? ERR : wins_nwstr((win),(t),(n)))
-#define mvwins_wch(win,y,x,c)		(wmove(win,(y),(x)) == ERR ? ERR : wins_wch((win),(c)))
-#define mvwins_wstr(win,y,x,t)		(wmove(win,(y),(x)) == ERR ? ERR : wins_wstr((win),(t)))
-#define mvwinwstr(win,y,x,c)		(wmove(win,(y),(x)) == ERR ? ERR : winwstr((win),(c)))
-#define mvwvline_set(win,y,x,c,n)	(wmove(win,(y),(x)) == ERR ? ERR : wvline_set((win),(c),(n)))
-
-#endif /* NCURSES_NOMACROS */
-
-#if defined(TRACE) || defined(NCURSES_TEST)
-extern NCURSES_EXPORT(const char *) _nc_viswbuf(const wchar_t *);
-extern NCURSES_EXPORT(const char *) _nc_viswibuf(const wint_t *);
-#endif
-
-#endif /* NCURSES_WIDECHAR */
-/* $Id: curses.tail,v 1.23 2016/02/13 16:37:45 tom Exp $ */
-/*
- * vile:cmode:
- * This file is part of ncurses, designed to be appended after curses.h.in
- * (see that file for the relevant copyright).
- */
-
-/* mouse interface */
-
-#if NCURSES_MOUSE_VERSION > 1
-#define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 5))
-#else
-#define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 6))
-#endif
-
-#define	NCURSES_BUTTON_RELEASED	001L
-#define	NCURSES_BUTTON_PRESSED	002L
-#define	NCURSES_BUTTON_CLICKED	004L
-#define	NCURSES_DOUBLE_CLICKED	010L
-#define	NCURSES_TRIPLE_CLICKED	020L
-#define	NCURSES_RESERVED_EVENT	040L
-
-/* event masks */
-#define	BUTTON1_RELEASED	NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_RELEASED)
-#define	BUTTON1_PRESSED		NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_PRESSED)
-#define	BUTTON1_CLICKED		NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_CLICKED)
-#define	BUTTON1_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(1, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON1_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(1, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON2_RELEASED	NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_RELEASED)
-#define	BUTTON2_PRESSED		NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_PRESSED)
-#define	BUTTON2_CLICKED		NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_CLICKED)
-#define	BUTTON2_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(2, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON2_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(2, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON3_RELEASED	NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_RELEASED)
-#define	BUTTON3_PRESSED		NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_PRESSED)
-#define	BUTTON3_CLICKED		NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_CLICKED)
-#define	BUTTON3_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(3, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON3_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(3, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON4_RELEASED	NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_RELEASED)
-#define	BUTTON4_PRESSED		NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_PRESSED)
-#define	BUTTON4_CLICKED		NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_CLICKED)
-#define	BUTTON4_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(4, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON4_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(4, NCURSES_TRIPLE_CLICKED)
-
-/*
- * In 32 bits the version-1 scheme does not provide enough space for a 5th
- * button, unless we choose to change the ABI by omitting the reserved-events.
- */
-#if NCURSES_MOUSE_VERSION > 1
-
-#define	BUTTON5_RELEASED	NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_RELEASED)
-#define	BUTTON5_PRESSED		NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_PRESSED)
-#define	BUTTON5_CLICKED		NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_CLICKED)
-#define	BUTTON5_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(5, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON5_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(5, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON_CTRL		NCURSES_MOUSE_MASK(6, 0001L)
-#define	BUTTON_SHIFT		NCURSES_MOUSE_MASK(6, 0002L)
-#define	BUTTON_ALT		NCURSES_MOUSE_MASK(6, 0004L)
-#define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(6, 0010L)
-
-#else
-
-#define	BUTTON1_RESERVED_EVENT	NCURSES_MOUSE_MASK(1, NCURSES_RESERVED_EVENT)
-#define	BUTTON2_RESERVED_EVENT	NCURSES_MOUSE_MASK(2, NCURSES_RESERVED_EVENT)
-#define	BUTTON3_RESERVED_EVENT	NCURSES_MOUSE_MASK(3, NCURSES_RESERVED_EVENT)
-#define	BUTTON4_RESERVED_EVENT	NCURSES_MOUSE_MASK(4, NCURSES_RESERVED_EVENT)
-
-#define	BUTTON_CTRL		NCURSES_MOUSE_MASK(5, 0001L)
-#define	BUTTON_SHIFT		NCURSES_MOUSE_MASK(5, 0002L)
-#define	BUTTON_ALT		NCURSES_MOUSE_MASK(5, 0004L)
-#define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(5, 0010L)
-
-#endif
-
-#define	ALL_MOUSE_EVENTS	(REPORT_MOUSE_POSITION - 1)
-
-/* macros to extract single event-bits from masks */
-#define	BUTTON_RELEASE(e, x)		((e) & NCURSES_MOUSE_MASK(x, 001))
-#define	BUTTON_PRESS(e, x)		((e) & NCURSES_MOUSE_MASK(x, 002))
-#define	BUTTON_CLICK(e, x)		((e) & NCURSES_MOUSE_MASK(x, 004))
-#define	BUTTON_DOUBLE_CLICK(e, x)	((e) & NCURSES_MOUSE_MASK(x, 010))
-#define	BUTTON_TRIPLE_CLICK(e, x)	((e) & NCURSES_MOUSE_MASK(x, 020))
-#define	BUTTON_RESERVED_EVENT(e, x)	((e) & NCURSES_MOUSE_MASK(x, 040))
-
-typedef struct
-{
-    short id;		/* ID to distinguish multiple devices */
-    int x, y, z;	/* event coordinates (character-cell) */
-    mmask_t bstate;	/* button state bits */
-}
-MEVENT;
-
-extern NCURSES_EXPORT(bool)    has_mouse(void);
-extern NCURSES_EXPORT(int)     getmouse (MEVENT *);
-extern NCURSES_EXPORT(int)     ungetmouse (MEVENT *);
-extern NCURSES_EXPORT(mmask_t) mousemask (mmask_t, mmask_t *);
-extern NCURSES_EXPORT(bool)    wenclose (const WINDOW *, int, int);
-extern NCURSES_EXPORT(int)     mouseinterval (int);
-extern NCURSES_EXPORT(bool)    wmouse_trafo (const WINDOW*, int*, int*, bool);
-extern NCURSES_EXPORT(bool)    mouse_trafo (int*, int*, bool);              /* generated */
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(bool)    NCURSES_SP_NAME(has_mouse) (SCREEN*);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(getmouse) (SCREEN*, MEVENT *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(ungetmouse) (SCREEN*,MEVENT *);
-extern NCURSES_EXPORT(mmask_t) NCURSES_SP_NAME(mousemask) (SCREEN*, mmask_t, mmask_t *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(mouseinterval) (SCREEN*, int);
-#endif
-
-#ifndef NCURSES_NOMACROS
-#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
-#endif
-
-/* other non-XSI functions */
-
-extern NCURSES_EXPORT(int) mcprint (char *, int);	/* direct data to printer */
-extern NCURSES_EXPORT(int) has_key (int);		/* do we have given key? */
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(has_key) (SCREEN*, int);    /* do we have given key? */
-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mcprint) (SCREEN*, char *, int);	/* direct data to printer */
-#endif
-
-/* Debugging : use with libncurses_g.a */
-
-extern NCURSES_EXPORT(void) _tracef (const char *, ...) GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(char *) _traceattr (attr_t);
-extern NCURSES_EXPORT(char *) _traceattr2 (int, chtype);
-extern NCURSES_EXPORT(char *) _tracechar (int);
-extern NCURSES_EXPORT(char *) _tracechtype (chtype);
-extern NCURSES_EXPORT(char *) _tracechtype2 (int, chtype);
-#if NCURSES_WIDECHAR
-#define _tracech_t		_tracecchar_t
-extern NCURSES_EXPORT(char *) _tracecchar_t (const cchar_t *);
-#define _tracech_t2		_tracecchar_t2
-extern NCURSES_EXPORT(char *) _tracecchar_t2 (int, const cchar_t *);
-#else
-#define _tracech_t		_tracechtype
-#define _tracech_t2		_tracechtype2
-#endif
-extern NCURSES_EXPORT(void) trace (const unsigned int);
-
-/* trace masks */
-#define TRACE_DISABLE	0x0000	/* turn off tracing */
-#define TRACE_TIMES	0x0001	/* trace user and system times of updates */
-#define TRACE_TPUTS	0x0002	/* trace tputs calls */
-#define TRACE_UPDATE	0x0004	/* trace update actions, old & new screens */
-#define TRACE_MOVE	0x0008	/* trace cursor moves and scrolls */
-#define TRACE_CHARPUT	0x0010	/* trace all character outputs */
-#define TRACE_ORDINARY	0x001F	/* trace all update actions */
-#define TRACE_CALLS	0x0020	/* trace all curses calls */
-#define TRACE_VIRTPUT	0x0040	/* trace virtual character puts */
-#define TRACE_IEVENT	0x0080	/* trace low-level input processing */
-#define TRACE_BITS	0x0100	/* trace state of TTY control bits */
-#define TRACE_ICALLS	0x0200	/* trace internal/nested calls */
-#define TRACE_CCALLS	0x0400	/* trace per-character calls */
-#define TRACE_DATABASE	0x0800	/* trace read/write of terminfo/termcap data */
-#define TRACE_ATTRS	0x1000	/* trace attribute updates */
-
-#define TRACE_SHIFT	13	/* number of bits in the trace masks */
-#define TRACE_MAXIMUM	((1 << TRACE_SHIFT) - 1) /* maximum trace level */
-
-#if defined(TRACE) || defined(NCURSES_TEST)
-extern NCURSES_EXPORT_VAR(int) _nc_optimize_enable;		/* enable optimizations */
-extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
-#define OPTIMIZE_MVCUR		0x01	/* cursor movement optimization */
-#define OPTIMIZE_HASHMAP	0x02	/* diff hashing to detect scrolls */
-#define OPTIMIZE_SCROLL		0x04	/* scroll optimization */
-#define OPTIMIZE_ALL		0xff	/* enable all optimizations (dflt) */
-#endif
-
-#include <ncursesw/unctrl.h>
-
-#ifdef __cplusplus
-
-#ifndef NCURSES_NOMACROS
-
-/* these names conflict with STL */
-#undef box
-#undef clear
-#undef erase
-#undef move
-#undef refresh
-
-#endif /* NCURSES_NOMACROS */
-
-}
-#endif
-
-#endif /* __NCURSES_H */
diff --git a/openflow/usr/include/ncursesw/cursesapp.h b/openflow/usr/include/ncursesw/cursesapp.h
deleted file mode 100644
index bbc2388..0000000
--- a/openflow/usr/include/ncursesw/cursesapp.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-// $Id: cursesapp.h,v 1.12 2011/09/17 22:12:10 tom Exp $
-
-#ifndef NCURSES_CURSESAPP_H_incl
-#define NCURSES_CURSESAPP_H_incl
-
-#include <ncursesw/cursslk.h>
-
-class NCURSES_IMPEXP NCursesApplication {
-public:
-  typedef struct _slk_link {          // This structure is used to maintain
-    struct _slk_link* prev;           // a stack of SLKs
-    Soft_Label_Key_Set* SLKs;
-  } SLK_Link;
-private:
-  static int rinit(NCursesWindow& w); // Internal Init function for title
-  static NCursesApplication* theApp;  // Global ref. to the application
-
-  static SLK_Link* slk_stack;
-
-protected:
-  static NCursesWindow* titleWindow;  // The Title Window (if any)
-
-  bool b_Colors;                      // Is this a color application?
-  NCursesWindow* Root_Window;         // This is the stdscr equiv.
-
-  // Initialization of attributes;
-  // Rewrite this in your derived class if you prefer other settings
-  virtual void init(bool bColors);
-
-  // The number of lines for the title window. Default is no title window
-  // You may rewrite this in your derived class
-  virtual int titlesize() const {
-    return 0;
-  }
-
-  // This method is called to put something into the title window initially
-  // You may rewrite this in your derived class
-  virtual void title() {
-  }
-
-  // The layout used for the Soft Label Keys. Default is to have no SLKs.
-  // You may rewrite this in your derived class
-  virtual Soft_Label_Key_Set::Label_Layout useSLKs() const {
-    return Soft_Label_Key_Set::None;
-  }
-
-  // This method is called to initialize the SLKs. Default is nothing.
-  // You may rewrite this in your derived class
-  virtual void init_labels(Soft_Label_Key_Set& S) const {
-    (void) S;
-  }
-
-  // Your derived class must implement this method. The return value must
-  // be the exit value of your application.
-  virtual int run() = 0;
-
-  // The constructor is protected, so you may use it in your derived
-  // class constructor. The argument tells whether or not you want colors.
-  NCursesApplication(bool wantColors = FALSE);
-
-  NCursesApplication& operator=(const NCursesApplication& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-    }
-    return *this;
-  }
-
-  NCursesApplication(const NCursesApplication& rhs)
-    : b_Colors(rhs.b_Colors),
-      Root_Window(rhs.Root_Window)
-  {
-  }
-
-public:
-  virtual ~NCursesApplication();
-
-  // Get a pointer to the current application object
-  static NCursesApplication* getApplication() {
-    return theApp;
-  }
-
-  // This method runs the application and returns its exit value
-  int operator()(void);
-
-  // Process the commandline arguments. The default implementation simply
-  // ignores them. Your derived class may rewrite this.
-  virtual void handleArgs(int argc, char* argv[]) {
-    (void) argc;
-    (void) argv;
-  }
-
-  // Does this application use colors?
-  inline bool useColors() const {
-    return b_Colors;
-  }
-
-  // Push the Key Set S onto the SLK Stack. S then becomes the current set
-  // of Soft Labelled Keys.
-  void push(Soft_Label_Key_Set& S);
-
-  // Throw away the current set of SLKs and make the previous one the
-  // new current set.
-  bool pop();
-
-  // Retrieve the current set of Soft Labelled Keys.
-  Soft_Label_Key_Set* top() const;
-
-  // Attributes to use for menu and forms foregrounds
-  virtual chtype foregrounds() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(1)) : A_BOLD;
-  }
-
-  // Attributes to use for menu and forms backgrounds
-  virtual chtype backgrounds() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(2)) : A_NORMAL;
-  }
-
-  // Attributes to use for inactive (menu) elements
-  virtual chtype inactives() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(3)|A_DIM) : A_DIM;
-  }
-
-  // Attributes to use for (form) labels and SLKs
-  virtual chtype labels() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(4)) : A_NORMAL;
-  }
-
-  // Attributes to use for form backgrounds
-  virtual chtype dialog_backgrounds() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(4)) : A_NORMAL;
-  }
-
-  // Attributes to use as default for (form) window backgrounds
-  virtual chtype window_backgrounds() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(5)) : A_NORMAL;
-  }
-
-  // Attributes to use for the title window
-  virtual chtype screen_titles() const {
-    return b_Colors ? static_cast<chtype>(COLOR_PAIR(6)) : A_BOLD;
-  }
-
-};
- 
-#endif /* NCURSES_CURSESAPP_H_incl */
diff --git a/openflow/usr/include/ncursesw/cursesf.h b/openflow/usr/include/ncursesw/cursesf.h
deleted file mode 100644
index cef483a..0000000
--- a/openflow/usr/include/ncursesw/cursesf.h
+++ /dev/null
@@ -1,969 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-// $Id: cursesf.h,v 1.32 2014/08/09 22:06:11 Adam.Jiang Exp $
-
-#ifndef NCURSES_CURSESF_H_incl
-#define NCURSES_CURSESF_H_incl 1
-
-#include <ncursesw/cursesp.h>
-
-#ifndef __EXT_QNX
-#include <string.h>
-#endif
-
-extern "C" {
-#  include <ncursesw/form.h>
-}
-//
-// -------------------------------------------------------------------------
-// The abstract base class for buitin and user defined Fieldtypes.
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP NCursesFormField; // forward declaration
-
-// Class to represent builtin field types as well as C++ written new
-// fieldtypes (see classes UserDefineFieldType...
-class NCURSES_IMPEXP NCursesFieldType
-{
-  friend class NCursesFormField;
-
-protected:
-  FIELDTYPE* fieldtype;
-
-  inline void OnError(int err) const THROW2(NCursesException const, NCursesFormException) {
-    if (err!=E_OK)
-      THROW(new NCursesFormException (err));
-  }
-
-  NCursesFieldType(FIELDTYPE *f) : fieldtype(f) {
-  }
-
-  virtual ~NCursesFieldType() {}
-
-  // Set the fields f fieldtype to this one.
-  virtual void set(NCursesFormField& f) = 0;
-
-public:
-  NCursesFieldType()
-    : fieldtype(STATIC_CAST(FIELDTYPE*)(0))
-  {
-  }
-
-  NCursesFieldType& operator=(const NCursesFieldType& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-    }
-    return *this;
-  }
-
-  NCursesFieldType(const NCursesFieldType& rhs)
-    : fieldtype(rhs.fieldtype)
-  {
-  }
-
-};
-
-//
-// -------------------------------------------------------------------------
-// The class representing a forms field, wrapping the lowlevel FIELD struct
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP NCursesFormField
-{
-  friend class NCursesForm;
-
-protected:
-  FIELD *field;		     // lowlevel structure
-  NCursesFieldType* ftype;   // Associated field type
-
-  // Error handler
-  inline void OnError (int err) const THROW2(NCursesException const, NCursesFormException) {
-    if (err != E_OK)
-      THROW(new NCursesFormException (err));
-  }
-
-public:
-  // Create a 'Null' field. Can be used to delimit a field list
-  NCursesFormField()
-    : field(STATIC_CAST(FIELD*)(0)),
-      ftype(STATIC_CAST(NCursesFieldType*)(0))
-  {
-  }
-
-  // Create a new field
-  NCursesFormField (int rows,
-		    int ncols,
-		    int first_row = 0,
-		    int first_col = 0,
-		    int offscreen_rows = 0,
-		    int additional_buffers = 0)
-    : field(0),
-      ftype(STATIC_CAST(NCursesFieldType*)(0))
-  {
-      field = ::new_field(rows, ncols, first_row, first_col,
-			  offscreen_rows, additional_buffers);
-      if (!field)
-	OnError(errno);
-  }
-
-  NCursesFormField& operator=(const NCursesFormField& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-    }
-    return *this;
-  }
-
-  NCursesFormField(const NCursesFormField& rhs)
-    : field(rhs.field), ftype(rhs.ftype)
-  {
-  }
-
-  virtual ~NCursesFormField ();
-
-  // Duplicate the field at a new position
-  inline NCursesFormField* dup(int first_row, int first_col)
-  {
-    NCursesFormField* f = new NCursesFormField();
-    if (!f)
-      OnError(E_SYSTEM_ERROR);
-    else {
-      f->ftype = ftype;
-      f->field = ::dup_field(field,first_row,first_col);
-      if (!f->field)
-	OnError(errno);
-    }
-    return f;
-  }
-
-  // Link the field to a new location
-  inline NCursesFormField* link(int first_row, int first_col) {
-    NCursesFormField* f = new NCursesFormField();
-    if (!f)
-      OnError(E_SYSTEM_ERROR);
-    else {
-      f->ftype = ftype;
-      f->field = ::link_field(field,first_row,first_col);
-      if (!f->field)
-	OnError(errno);
-    }
-    return f;
-  }
-
-  // Get the lowlevel field representation
-  inline FIELD* get_field() const {
-    return field;
-  }
-
-  // Retrieve info about the field
-  inline void info(int& rows, int& ncols,
-		   int& first_row, int& first_col,
-		   int& offscreen_rows, int& additional_buffers) const {
-    OnError(::field_info(field, &rows, &ncols,
-			 &first_row, &first_col,
-			 &offscreen_rows, &additional_buffers));
-  }
-
-  // Retrieve info about the fields dynamic properties.
-  inline void dynamic_info(int& dynamic_rows, int& dynamic_cols,
-			   int& max_growth) const {
-    OnError(::dynamic_field_info(field, &dynamic_rows, &dynamic_cols,
-				 &max_growth));
-  }
-
-  // For a dynamic field you may set the maximum growth limit.
-  // A zero means unlimited growth.
-  inline void set_maximum_growth(int growth = 0) {
-    OnError(::set_max_field(field,growth));
-  }
-
-  // Move the field to a new position
-  inline void move(int row, int col) {
-    OnError(::move_field(field,row,col));
-  }
-
-  // Mark the field to start a new page
-  inline void new_page(bool pageFlag = FALSE) {
-    OnError(::set_new_page(field,pageFlag));
-  }
-
-  // Retrieve whether or not the field starts a new page.
-  inline bool is_new_page() const {
-    return ::new_page(field);
-  }
-
-  // Set the justification for the field
-  inline void set_justification(int just) {
-    OnError(::set_field_just(field,just));
-  }
-
-  // Retrieve the fields justification
-  inline int justification() const {
-    return ::field_just(field);
-  }
-  // Set the foreground attribute for the field
-  inline void set_foreground(chtype foreground) {
-    OnError(::set_field_fore(field,foreground));
-  }
-
-  // Retrieve the fields foreground attribute
-  inline chtype fore() const {
-    return ::field_fore(field);
-  }
-
-  // Set the background attribute for the field
-  inline void set_background(chtype background) {
-    OnError(::set_field_back(field,background));
-  }
-
-  // Retrieve the fields background attribute
-  inline chtype back() const {
-    return ::field_back(field);
-  }
-
-  // Set the padding character for the field
-  inline void set_pad_character(int padding) {
-    OnError(::set_field_pad(field, padding));
-  }
-
-  // Retrieve the fields padding character
-  inline int pad() const {
-    return ::field_pad(field);
-  }
-
-  // Switch on the fields options
-  inline void options_on (Field_Options opts) {
-    OnError (::field_opts_on (field, opts));
-  }
-
-  // Switch off the fields options
-  inline void options_off (Field_Options opts) {
-    OnError (::field_opts_off (field, opts));
-  }
-
-  // Retrieve the fields options
-  inline Field_Options options () const {
-    return ::field_opts (field);
-  }
-
-  // Set the fields options
-  inline void set_options (Field_Options opts) {
-    OnError (::set_field_opts (field, opts));
-  }
-
-  // Mark the field as changed
-  inline void set_changed(bool changeFlag = TRUE) {
-    OnError(::set_field_status(field,changeFlag));
-  }
-
-  // Test whether or not the field is marked as changed
-  inline bool changed() const {
-    return ::field_status(field);
-  }
-
-  // Return the index of the field in the field array of a form
-  // or -1 if the field is not associated to a form
-  inline int (index)() const {
-    return ::field_index(field);
-  }
-
-  // Store a value in a fields buffer. The default buffer is nr. 0
-  inline void set_value(const char *val, int buffer = 0) {
-    OnError(::set_field_buffer(field,buffer,val));
-  }
-
-  // Retrieve the value of a fields buffer. The default buffer is nr. 0
-  inline char* value(int buffer = 0) const {
-    return ::field_buffer(field,buffer);
-  }
-
-  // Set the validation type of the field.
-  inline void set_fieldtype(NCursesFieldType& f) {
-    ftype = &f;
-    f.set(*this); // A good friend may do that...
-  }
-
-  // Retrieve the validation type of the field.
-  inline NCursesFieldType* fieldtype() const {
-    return ftype;
-  }
-
-};
-
-  // This are the built-in hook functions in this C++ binding. In C++ we use
-  // virtual member functions (see below On_..._Init and On_..._Termination)
-  // to provide this functionality in an object oriented manner.
-extern "C" {
-  void _nc_xx_frm_init(FORM *);
-  void _nc_xx_frm_term(FORM *);
-  void _nc_xx_fld_init(FORM *);
-  void _nc_xx_fld_term(FORM *);
-}
-
-//
-// -------------------------------------------------------------------------
-// The class representing a form, wrapping the lowlevel FORM struct
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP NCursesForm : public NCursesPanel
-{
-protected:
-  FORM* form;  // the lowlevel structure
-
-private:
-  NCursesWindow* sub;   // the subwindow object
-  bool b_sub_owner;     // is this our own subwindow?
-  bool b_framed;	// has the form a border?
-  bool b_autoDelete;    // Delete fields when deleting form?
-
-  NCursesFormField** my_fields; // The array of fields for this form
-
-  // This structure is used for the form's user data field to link the
-  // FORM* to the C++ object and to provide extra space for a user pointer.
-  typedef struct {
-    void*	       m_user;	    // the pointer for the user's data
-    const NCursesForm* m_back;      // backward pointer to C++ object
-    const FORM*	       m_owner;
-  } UserHook;
-
-  // Get the backward pointer to the C++ object from a FORM
-  static inline NCursesForm* getHook(const FORM *f) {
-    UserHook* hook = reinterpret_cast<UserHook*>(::form_userptr(f));
-    assert(hook != 0 && hook->m_owner==f);
-    return const_cast<NCursesForm*>(hook->m_back);
-  }
-
-  friend void _nc_xx_frm_init(FORM *);
-  friend void _nc_xx_frm_term(FORM *);
-  friend void _nc_xx_fld_init(FORM *);
-  friend void _nc_xx_fld_term(FORM *);
-
-  // Calculate FIELD* array for the menu
-  FIELD** mapFields(NCursesFormField* nfields[]);
-
-protected:
-  // internal routines
-  inline void set_user(void *user) {
-    UserHook* uptr = reinterpret_cast<UserHook*>(::form_userptr (form));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
-    uptr->m_user = user;
-  }
-
-  inline void *get_user() {
-    UserHook* uptr = reinterpret_cast<UserHook*>(::form_userptr (form));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
-    return uptr->m_user;
-  }
-
-  void InitForm (NCursesFormField* Fields[],
-		 bool with_frame,
-		 bool autoDeleteFields);
-
-  inline void OnError (int err) const THROW2(NCursesException const, NCursesFormException) {
-    if (err != E_OK)
-      THROW(new NCursesFormException (err));
-  }
-
-  // this wraps the form_driver call.
-  virtual int driver (int c) ;
-
-  // 'Internal' constructor, builds an object without association to a
-  // field array.
-  NCursesForm( int  nlines,
-	       int  ncols,
-	       int  begin_y = 0,
-	       int  begin_x = 0)
-    : NCursesPanel(nlines, ncols, begin_y, begin_x),
-      form (STATIC_CAST(FORM*)(0)),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_fields(0)
-  {
-  }
-
-public:
-  // Create form for the default panel.
-  NCursesForm (NCursesFormField* Fields[],
-	       bool with_frame=FALSE,	      // reserve space for a frame?
-	       bool autoDelete_Fields=FALSE)  // do automatic cleanup?
-    : NCursesPanel(),
-      form(0),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_fields(0)
-  {
-    InitForm(Fields, with_frame, autoDelete_Fields);
-  }
-
-  // Create a form in a panel with the given position and size.
-  NCursesForm (NCursesFormField* Fields[],
-	       int  nlines,
-	       int  ncols,
-	       int  begin_y,
-	       int  begin_x,
-	       bool with_frame=FALSE,	     // reserve space for a frame?
-	       bool autoDelete_Fields=FALSE) // do automatic cleanup?
-    : NCursesPanel(nlines, ncols, begin_y, begin_x),
-      form(0),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_fields(0)
-  {
-      InitForm(Fields, with_frame, autoDelete_Fields);
-  }
-
-  NCursesForm& operator=(const NCursesForm& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      NCursesPanel::operator=(rhs);
-    }
-    return *this;
-  }
-
-  NCursesForm(const NCursesForm& rhs)
-    : NCursesPanel(rhs),
-      form(rhs.form),
-      sub(rhs.sub),
-      b_sub_owner(rhs.b_sub_owner),
-      b_framed(rhs.b_framed),
-      b_autoDelete(rhs.b_autoDelete),
-      my_fields(rhs.my_fields)
-  {
-  }
-
-  virtual ~NCursesForm();
-
-  // Set the default attributes for the form
-  virtual void setDefaultAttributes();
-
-  // Retrieve current field of the form.
-  inline NCursesFormField* current_field() const {
-    return my_fields[::field_index(::current_field(form))];
-  }
-
-  // Set the forms subwindow
-  void setSubWindow(NCursesWindow& sub);
-
-  // Set these fields for the form
-  inline void setFields(NCursesFormField* Fields[]) {
-    OnError(::set_form_fields(form,mapFields(Fields)));
-  }
-
-  // Remove the form from the screen
-  inline void unpost (void) {
-    OnError (::unpost_form (form));
-  }
-
-  // Post the form to the screen if flag is true, unpost it otherwise
-  inline void post(bool flag = TRUE) {
-    OnError (flag ? ::post_form(form) : ::unpost_form (form));
-  }
-
-  // Decorations
-  inline void frame(const char *title=NULL, const char* btitle=NULL) {
-    if (b_framed)
-      NCursesPanel::frame(title,btitle);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  inline void boldframe(const char *title=NULL, const char* btitle=NULL) {
-    if (b_framed)
-      NCursesPanel::boldframe(title,btitle);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  inline void label(const char *topLabel, const char *bottomLabel) {
-    if (b_framed)
-      NCursesPanel::label(topLabel,bottomLabel);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  // -----
-  // Hooks
-  // -----
-
-  // Called after the form gets repositioned in its window.
-  // This is especially true if the form is posted.
-  virtual void On_Form_Init();
-
-  // Called before the form gets repositioned in its window.
-  // This is especially true if the form is unposted.
-  virtual void On_Form_Termination();
-
-  // Called after the field became the current field
-  virtual void On_Field_Init(NCursesFormField& field);
-
-  // Called before this field is left as current field.
-  virtual void On_Field_Termination(NCursesFormField& field);
-
-  // Calculate required window size for the form.
-  void scale(int& rows, int& ncols) const {
-    OnError(::scale_form(form,&rows,&ncols));
-  }
-
-  // Retrieve number of fields in the form.
-  int count() const {
-    return ::field_count(form);
-  }
-
-  // Make the page the current page of the form.
-  void set_page(int pageNum) {
-    OnError(::set_form_page(form, pageNum));
-  }
-
-  // Retrieve current page number
-  int page() const {
-    return ::form_page(form);
-  }
-
-  // Switch on the forms options
-  inline void options_on (Form_Options opts) {
-    OnError (::form_opts_on (form, opts));
-  }
-
-  // Switch off the forms options
-  inline void options_off (Form_Options opts) {
-    OnError (::form_opts_off (form, opts));
-  }
-
-  // Retrieve the forms options
-  inline Form_Options options () const {
-    return ::form_opts (form);
-  }
-
-  // Set the forms options
-  inline void set_options (Form_Options opts) {
-    OnError (::set_form_opts (form, opts));
-  }
-
-  // Are there more data in the current field after the data shown
-  inline bool data_ahead() const {
-    return ::data_ahead(form);
-  }
-
-  // Are there more data in the current field before the data shown
-  inline bool data_behind() const {
-    return ::data_behind(form);
-  }
-
-  // Position the cursor to the current field
-  inline void position_cursor () {
-    OnError (::pos_form_cursor (form));
-  }
-  // Set the current field
-  inline void set_current(NCursesFormField& F) {
-    OnError (::set_current_field(form, F.field));
-  }
-
-  // Provide a default key virtualization. Translate the keyboard
-  // code c into a form request code.
-  // The default implementation provides a hopefully straightforward
-  // mapping for the most common keystrokes and form requests.
-  virtual int virtualize(int c);
-
-  // Operators
-  inline NCursesFormField* operator[](int i) const {
-    if ( (i < 0) || (i >= ::field_count (form)) )
-      OnError (E_BAD_ARGUMENT);
-    return my_fields[i];
-  }
-
-  // Perform the menu's operation
-  // Return the field where you left the form.
-  virtual NCursesFormField* operator()(void);
-
-  // Exception handlers. The default is a Beep.
-  virtual void On_Request_Denied(int c) const;
-  virtual void On_Invalid_Field(int c) const;
-  virtual void On_Unknown_Command(int c) const;
-
-};
-
-//
-// -------------------------------------------------------------------------
-// This is the typical C++ typesafe way to allow to attach
-// user data to a field of a form. Its assumed that the user
-// data belongs to some class T. Use T as template argument
-// to create a UserField.
-// -------------------------------------------------------------------------
-template<class T> class NCURSES_IMPEXP NCursesUserField : public NCursesFormField
-{
-public:
-  NCursesUserField (int rows,
-		    int ncols,
-		    int first_row = 0,
-		    int first_col = 0,
-		    const T* p_UserData = STATIC_CAST(T*)(0),
-		    int offscreen_rows = 0,
-		    int additional_buffers = 0)
-    : NCursesFormField (rows, ncols,
-			first_row, first_col,
-			offscreen_rows, additional_buffers) {
-      if (field)
-	OnError(::set_field_userptr(field, STATIC_CAST(void *)(p_UserData)));
-  }
-
-  virtual ~NCursesUserField() {};
-
-  inline const T* UserData (void) const {
-    return reinterpret_cast<const T*>(::field_userptr (field));
-  }
-
-  inline virtual void setUserData(const T* p_UserData) {
-    if (field)
-      OnError (::set_field_userptr (field, STATIC_CAST(void *)(p_UserData)));
-  }
-};
-//
-// -------------------------------------------------------------------------
-// The same mechanism is used to attach user data to a form
-// -------------------------------------------------------------------------
-//
-template<class T> class NCURSES_IMPEXP NCursesUserForm : public NCursesForm
-{
-protected:
-  // 'Internal' constructor, builds an object without association to a
-  // field array.
-  NCursesUserForm( int  nlines,
-		   int  ncols,
-		   int  begin_y = 0,
-		   int  begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0))
-    : NCursesForm(nlines,ncols,begin_y,begin_x) {
-      if (form)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>
-				     (p_UserData)));
-  }
-
-public:
-  NCursesUserForm (NCursesFormField* Fields[],
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Fields=FALSE)
-    : NCursesForm (Fields, with_frame, autoDelete_Fields) {
-      if (form)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  };
-
-  NCursesUserForm (NCursesFormField* Fields[],
-		   int nlines,
-		   int ncols,
-		   int begin_y = 0,
-		   int begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Fields=FALSE)
-    : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
-		   with_frame, autoDelete_Fields) {
-      if (form)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>
-				     (p_UserData)));
-  };
-
-  virtual ~NCursesUserForm() {
-  };
-
-  inline T* UserData (void) {
-    return reinterpret_cast<T*>(get_user ());
-  };
-
-  inline virtual void setUserData (const T* p_UserData) {
-    if (form)
-      set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  }
-
-};
-//
-// -------------------------------------------------------------------------
-// Builtin Fieldtypes
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP Alpha_Field : public NCursesFieldType
-{
-private:
-  int min_field_width;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,min_field_width));
-  }
-
-public:
-  Alpha_Field(int width)
-    : NCursesFieldType(TYPE_ALPHA),
-      min_field_width(width) {
-  }
-};
-
-class NCURSES_IMPEXP Alphanumeric_Field : public NCursesFieldType
-{
-private:
-  int min_field_width;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,min_field_width));
-  }
-
-public:
-  Alphanumeric_Field(int width)
-    : NCursesFieldType(TYPE_ALNUM),
-      min_field_width(width) {
-  }
-};
-
-class NCURSES_IMPEXP Integer_Field : public NCursesFieldType
-{
-private:
-  int precision;
-  long lower_limit, upper_limit;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,
-			     precision,lower_limit,upper_limit));
-  }
-
-public:
-  Integer_Field(int prec, long low=0L, long high=0L)
-    : NCursesFieldType(TYPE_INTEGER),
-      precision(prec), lower_limit(low), upper_limit(high) {
-  }
-};
-
-class NCURSES_IMPEXP Numeric_Field : public NCursesFieldType
-{
-private:
-  int precision;
-  double lower_limit, upper_limit;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,
-			     precision,lower_limit,upper_limit));
-  }
-
-public:
-  Numeric_Field(int prec, double low=0.0, double high=0.0)
-    : NCursesFieldType(TYPE_NUMERIC),
-      precision(prec), lower_limit(low), upper_limit(high) {
-  }
-};
-
-class NCURSES_IMPEXP Regular_Expression_Field : public NCursesFieldType
-{
-private:
-  char* regex;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,regex));
-  }
-
-  void copy_regex(const char *source)
-  {
-    regex = new char[1 + ::strlen(source)];
-    (::strcpy)(regex, source);
-  }
-
-public:
-  Regular_Expression_Field(const char *expr)
-    : NCursesFieldType(TYPE_REGEXP),
-      regex(NULL)
-  {
-    copy_regex(expr);
-  }
-
-  Regular_Expression_Field& operator=(const Regular_Expression_Field& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      copy_regex(rhs.regex);
-      NCursesFieldType::operator=(rhs);
-    }
-    return *this;
-  }
-
-  Regular_Expression_Field(const Regular_Expression_Field& rhs)
-    : NCursesFieldType(rhs),
-      regex(NULL)
-  {
-    copy_regex(rhs.regex);
-  }
-
-  ~Regular_Expression_Field() {
-    delete[] regex;
-  }
-};
-
-class NCURSES_IMPEXP Enumeration_Field : public NCursesFieldType
-{
-private:
-  const char** list;
-  int case_sensitive;
-  int non_unique_matches;
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,
-			     list,case_sensitive,non_unique_matches));
-  }
-public:
-  Enumeration_Field(const char* enums[],
-		    bool case_sens=FALSE,
-		    bool non_unique=FALSE)
-    : NCursesFieldType(TYPE_ENUM),
-      list(enums),
-      case_sensitive(case_sens ? -1 : 0),
-      non_unique_matches(non_unique ? -1 : 0) {
-  }
-
-  Enumeration_Field& operator=(const Enumeration_Field& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      NCursesFieldType::operator=(rhs);
-    }
-    return *this;
-  }
-
-  Enumeration_Field(const Enumeration_Field& rhs)
-    : NCursesFieldType(rhs),
-      list(rhs.list),
-      case_sensitive(rhs.case_sensitive),
-      non_unique_matches(rhs.non_unique_matches)
-  {
-  }
-};
-
-class NCURSES_IMPEXP IPV4_Address_Field : public NCursesFieldType
-{
-private:
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype));
-  }
-
-public:
-  IPV4_Address_Field() : NCursesFieldType(TYPE_IPV4) {
-  }
-};
-
-extern "C" {
-  bool _nc_xx_fld_fcheck(FIELD *, const void*);
-  bool _nc_xx_fld_ccheck(int c, const void *);
-  void* _nc_xx_fld_makearg(va_list*);
-}
-
-//
-// -------------------------------------------------------------------------
-// Abstract base class for User-Defined Fieldtypes
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP UserDefinedFieldType : public NCursesFieldType
-{
-  friend class UDF_Init; // Internal helper to set up statics
-private:
-  // For all C++ defined fieldtypes we need only one generic lowlevel
-  // FIELDTYPE* element.
-  static FIELDTYPE* generic_fieldtype;
-
-protected:
-  // This are the functions required by the low level libforms functions
-  // to construct a fieldtype.
-  friend bool _nc_xx_fld_fcheck(FIELD *, const void*);
-  friend bool _nc_xx_fld_ccheck(int c, const void *);
-  friend void* _nc_xx_fld_makearg(va_list*);
-
-  void set(NCursesFormField& f) {
-    OnError(::set_field_type(f.get_field(),fieldtype,&f));
-  }
-
-protected:
-  // Redefine this function to do a field validation. The argument
-  // is a reference to the field you should validate.
-  virtual bool field_check(NCursesFormField& f) = 0;
-
-  // Redefine this function to do a character validation. The argument
-  // is the character to be validated.
-  virtual bool char_check (int c) = 0;
-
-public:
-  UserDefinedFieldType() : NCursesFieldType(generic_fieldtype) {
-  }
-};
-
-extern "C" {
-  bool _nc_xx_next_choice(FIELD*, const void *);
-  bool _nc_xx_prev_choice(FIELD*, const void *);
-}
-
-//
-// -------------------------------------------------------------------------
-// Abstract base class for User-Defined Fieldtypes with Choice functions
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP UserDefinedFieldType_With_Choice : public UserDefinedFieldType
-{
-  friend class UDF_Init; // Internal helper to set up statics
-private:
-  // For all C++ defined fieldtypes with choice functions we need only one
-  // generic lowlevel FIELDTYPE* element.
-  static FIELDTYPE* generic_fieldtype_with_choice;
-
-  // This are the functions required by the low level libforms functions
-  // to construct a fieldtype with choice functions.
-  friend bool _nc_xx_next_choice(FIELD*, const void *);
-  friend bool _nc_xx_prev_choice(FIELD*, const void *);
-
-protected:
-  // Redefine this function to do the retrieval of the next choice value.
-  // The argument is a reference to the field tobe examined.
-  virtual bool next    (NCursesFormField& f) = 0;
-
-  // Redefine this function to do the retrieval of the previous choice value.
-  // The argument is a reference to the field tobe examined.
-  virtual bool previous(NCursesFormField& f) = 0;
-
-public:
-  UserDefinedFieldType_With_Choice() {
-    fieldtype = generic_fieldtype_with_choice;
-  }
-};
-
-#endif /* NCURSES_CURSESF_H_incl */
diff --git a/openflow/usr/include/ncursesw/cursesm.h b/openflow/usr/include/ncursesw/cursesm.h
deleted file mode 100644
index 16c1838..0000000
--- a/openflow/usr/include/ncursesw/cursesm.h
+++ /dev/null
@@ -1,673 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-// $Id: cursesm.h,v 1.30 2014/08/09 22:06:18 Adam.Jiang Exp $
-
-#ifndef NCURSES_CURSESM_H_incl
-#define NCURSES_CURSESM_H_incl 1
-
-#include <ncursesw/cursesp.h>
-
-extern "C" {
-#  include <ncursesw/menu.h>
-}
-//
-// -------------------------------------------------------------------------
-// This wraps the ITEM type of <ncursesw/menu.h>
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP NCursesMenuItem
-{
-  friend class NCursesMenu;
-
-protected:
-  ITEM *item;
-
-  inline void OnError (int err) const THROW2(NCursesException const, NCursesMenuException) {
-    if (err != E_OK)
-      THROW(new NCursesMenuException (err));
-  }
-
-public:
-  NCursesMenuItem (const char* p_name     = NULL,
-		   const char* p_descript = NULL)
-    : item(0)
-  {
-    item = p_name ? ::new_item (p_name, p_descript) : STATIC_CAST(ITEM*)(0);
-    if (p_name && !item)
-      OnError (E_SYSTEM_ERROR);
-  }
-  // Create an item. If you pass both parameters as NULL, a delimiting
-  // item is constructed which can be used to terminate a list of
-  // NCursesMenu objects.
-
-  NCursesMenuItem& operator=(const NCursesMenuItem& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-    }
-    return *this;
-  }
-
-  NCursesMenuItem(const NCursesMenuItem& rhs)
-    : item(0)
-  {
-    (void) rhs;
-  }
-
-  virtual ~NCursesMenuItem ();
-  // Release the items memory
-
-  inline const char* name () const {
-    return ::item_name (item);
-  }
-  // Name of the item
-
-  inline const char* description () const {
-    return ::item_description (item);
-  }
-  // Description of the item
-
-  inline int (index) (void) const {
-    return ::item_index (item);
-  }
-  // Index of the item in an item array (or -1)
-
-  inline void options_on (Item_Options opts) {
-    OnError (::item_opts_on (item, opts));
-  }
-  // Switch on the items options
-
-  inline void options_off (Item_Options opts) {
-    OnError (::item_opts_off (item, opts));
-  }
-  // Switch off the item's option
-
-  inline Item_Options options () const {
-    return ::item_opts (item);
-  }
-  // Retrieve the items options
-
-  inline void set_options (Item_Options opts) {
-    OnError (::set_item_opts (item, opts));
-  }
-  // Set the items options
-
-  inline void set_value (bool f) {
-    OnError (::set_item_value (item,f));
-  }
-  // Set/Reset the items selection state
-
-  inline bool value () const {
-    return ::item_value (item);
-  }
-  // Retrieve the items selection state
-
-  inline bool visible () const {
-    return ::item_visible (item);
-  }
-  // Retrieve visibility of the item
-
-  virtual bool action();
-  // Perform an action associated with this item; you may use this in an
-  // user supplied driver for a menu; you may derive from this class and
-  // overload action() to supply items with different actions.
-  // If an action returns true, the menu will be exited. The default action
-  // is to do nothing.
-};
-
-// Prototype for an items callback function.
-typedef bool ITEMCALLBACK(NCursesMenuItem&);
-
-// If you don't like to create a child class for individual items to
-// overload action(), you may use this class and provide a callback
-// function pointer for items.
-class NCURSES_IMPEXP NCursesMenuCallbackItem : public NCursesMenuItem
-{
-private:
-  ITEMCALLBACK* p_fct;
-
-public:
-  NCursesMenuCallbackItem(ITEMCALLBACK* fct       = NULL,
-			  const char* p_name      = NULL,
-			  const char* p_descript  = NULL )
-    : NCursesMenuItem (p_name, p_descript),
-      p_fct (fct) {
-  }
-
-  NCursesMenuCallbackItem& operator=(const NCursesMenuCallbackItem& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-    }
-    return *this;
-  }
-
-  NCursesMenuCallbackItem(const NCursesMenuCallbackItem& rhs)
-    : NCursesMenuItem(rhs),
-      p_fct(0)
-  {
-  }
-
-  virtual ~NCursesMenuCallbackItem();
-
-  bool action();
-};
-
-  // This are the built-in hook functions in this C++ binding. In C++ we use
-  // virtual member functions (see below On_..._Init and On_..._Termination)
-  // to provide this functionality in an object oriented manner.
-extern "C" {
-  void _nc_xx_mnu_init(MENU *);
-  void _nc_xx_mnu_term(MENU *);
-  void _nc_xx_itm_init(MENU *);
-  void _nc_xx_itm_term(MENU *);
-}
-
-//
-// -------------------------------------------------------------------------
-// This wraps the MENU type of <ncursesw/menu.h>
-// -------------------------------------------------------------------------
-//
-class NCURSES_IMPEXP NCursesMenu : public NCursesPanel
-{
-protected:
-  MENU *menu;
-
-private:
-  NCursesWindow* sub;   // the subwindow object
-  bool b_sub_owner;     // is this our own subwindow?
-  bool b_framed;        // has the menu a border?
-  bool b_autoDelete;    // Delete items when deleting menu?
-
-  NCursesMenuItem** my_items; // The array of items for this menu
-
-  // This structure is used for the menu's user data field to link the
-  // MENU* to the C++ object and to provide extra space for a user pointer.
-  typedef struct {
-    void*              m_user;      // the pointer for the user's data
-    const NCursesMenu* m_back;      // backward pointer to C++ object
-    const MENU*        m_owner;
-  } UserHook;
-
-  // Get the backward pointer to the C++ object from a MENU
-  static inline NCursesMenu* getHook(const MENU *m) {
-    UserHook* hook = STATIC_CAST(UserHook*)(::menu_userptr(m));
-    assert(hook != 0 && hook->m_owner==m);
-    return const_cast<NCursesMenu*>(hook->m_back);
-  }
-
-  friend void _nc_xx_mnu_init(MENU *);
-  friend void _nc_xx_mnu_term(MENU *);
-  friend void _nc_xx_itm_init(MENU *);
-  friend void _nc_xx_itm_term(MENU *);
-
-  // Calculate ITEM* array for the menu
-  ITEM** mapItems(NCursesMenuItem* nitems[]);
-
-protected:
-  // internal routines
-  inline void set_user(void *user) {
-    UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
-    uptr->m_user = user;
-  }
-
-  inline void *get_user() {
-    UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
-    return uptr->m_user;
-  }
-
-  void InitMenu (NCursesMenuItem* menu[],
-		 bool with_frame,
-		 bool autoDeleteItems);
-
-  inline void OnError (int err) const THROW2(NCursesException const, NCursesMenuException) {
-    if (err != E_OK)
-      THROW(new NCursesMenuException (this, err));
-  }
-
-  // this wraps the menu_driver call.
-  virtual int driver (int c) ;
-
-  // 'Internal' constructor to create a menu without association to
-  // an array of items.
-  NCursesMenu( int  nlines,
-	       int  ncols,
-	       int  begin_y = 0,
-	       int  begin_x = 0)
-    : NCursesPanel(nlines,ncols,begin_y,begin_x),
-      menu (STATIC_CAST(MENU*)(0)),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_items(0)
-  {
-  }
-
-public:
-  // Make a full window size menu
-  NCursesMenu (NCursesMenuItem* Items[],
-	       bool with_frame=FALSE,        // Reserve space for a frame?
-	       bool autoDelete_Items=FALSE)  // Autocleanup of Items?
-    : NCursesPanel(),
-      menu(0),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_items(0)
-  {
-      InitMenu(Items, with_frame, autoDelete_Items);
-  }
-
-  // Make a menu with a window of this size.
-  NCursesMenu (NCursesMenuItem* Items[],
-	       int  nlines,
-	       int  ncols,
-	       int  begin_y = 0,
-	       int  begin_x = 0,
-	       bool with_frame=FALSE,        // Reserve space for a frame?
-	       bool autoDelete_Items=FALSE)  // Autocleanup of Items?
-    : NCursesPanel(nlines, ncols, begin_y, begin_x),
-      menu(0),
-      sub(0),
-      b_sub_owner(0),
-      b_framed(0),
-      b_autoDelete(0),
-      my_items(0)
-  {
-      InitMenu(Items, with_frame, autoDelete_Items);
-  }
-
-  NCursesMenu& operator=(const NCursesMenu& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      NCursesPanel::operator=(rhs);
-    }
-    return *this;
-  }
-
-  NCursesMenu(const NCursesMenu& rhs)
-    : NCursesPanel(rhs),
-      menu(rhs.menu),
-      sub(rhs.sub),
-      b_sub_owner(rhs.b_sub_owner),
-      b_framed(rhs.b_framed),
-      b_autoDelete(rhs.b_autoDelete),
-      my_items(rhs.my_items)
-  {
-  }
-
-  virtual ~NCursesMenu ();
-
-  // Retrieve the menus subwindow
-  inline NCursesWindow& subWindow() const {
-    assert(sub!=NULL);
-    return *sub;
-  }
-
-  // Set the menus subwindow
-  void setSubWindow(NCursesWindow& sub);
-
-  // Set these items for the menu
-  inline void setItems(NCursesMenuItem* Items[]) {
-    OnError(::set_menu_items(menu,mapItems(Items)));
-  }
-
-  // Remove the menu from the screen
-  inline void unpost (void) {
-    OnError (::unpost_menu (menu));
-  }
-
-  // Post the menu to the screen if flag is true, unpost it otherwise
-  inline void post(bool flag = TRUE) {
-    flag ? OnError (::post_menu(menu)) : OnError (::unpost_menu (menu));
-  }
-
-  // Get the numer of rows and columns for this menu
-  inline void scale (int& mrows, int& mcols) const  {
-    OnError (::scale_menu (menu, &mrows, &mcols));
-  }
-
-  // Set the format of this menu
-  inline void set_format(int mrows, int mcols) {
-    OnError (::set_menu_format(menu, mrows, mcols));
-  }
-
-  // Get the format of this menu
-  inline void menu_format(int& rows,int& ncols) {
-    ::menu_format(menu,&rows,&ncols);
-  }
-
-  // Items of the menu
-  inline NCursesMenuItem* items() const {
-    return *my_items;
-  }
-
-  // Get the number of items in this menu
-  inline int count() const {
-    return ::item_count(menu);
-  }
-
-  // Get the current item (i.e. the one the cursor is located)
-  inline NCursesMenuItem* current_item() const {
-    return my_items[::item_index(::current_item(menu))];
-  }
-
-  // Get the marker string
-  inline const char* mark() const {
-    return ::menu_mark(menu);
-  }
-
-  // Set the marker string
-  inline void set_mark(const char *marker) {
-    OnError (::set_menu_mark (menu, marker));
-  }
-
-  // Get the name of the request code c
-  inline static const char* request_name(int c) {
-    return ::menu_request_name(c);
-  }
-
-  // Get the current pattern
-  inline char* pattern() const {
-    return ::menu_pattern(menu);
-  }
-
-  // true if there is a pattern match, false otherwise.
-  bool set_pattern (const char *pat);
-
-  // set the default attributes for the menu
-  // i.e. set fore, back and grey attribute
-  virtual void setDefaultAttributes();
-
-  // Get the menus background attributes
-  inline chtype back() const {
-    return ::menu_back(menu);
-  }
-
-  // Get the menus foreground attributes
-  inline chtype fore() const {
-    return ::menu_fore(menu);
-  }
-
-  // Get the menus grey attributes (used for unselectable items)
-  inline chtype grey() const {
-    return ::menu_grey(menu);
-  }
-
-  // Set the menus background attributes
-  inline chtype set_background(chtype a) {
-    return ::set_menu_back(menu,a);
-  }
-
-  // Set the menus foreground attributes
-  inline chtype set_foreground(chtype a) {
-    return ::set_menu_fore(menu,a);
-  }
-
-  // Set the menus grey attributes (used for unselectable items)
-  inline chtype set_grey(chtype a) {
-    return ::set_menu_grey(menu,a);
-  }
-
-  inline void options_on (Menu_Options opts) {
-    OnError (::menu_opts_on (menu,opts));
-  }
-
-  inline void options_off(Menu_Options opts) {
-    OnError (::menu_opts_off(menu,opts));
-  }
-
-  inline Menu_Options options() const {
-    return ::menu_opts(menu);
-  }
-
-  inline void set_options (Menu_Options opts) {
-    OnError (::set_menu_opts (menu,opts));
-  }
-
-  inline int pad() const {
-    return ::menu_pad(menu);
-  }
-
-  inline void set_pad (int padch) {
-    OnError (::set_menu_pad (menu, padch));
-  }
-
-  // Position the cursor to the current item
-  inline void position_cursor () const {
-    OnError (::pos_menu_cursor (menu));
-  }
-
-  // Set the current item
-  inline void set_current(NCursesMenuItem& I) {
-    OnError (::set_current_item(menu, I.item));
-  }
-
-  // Get the current top row of the menu
-  inline int top_row (void) const {
-    return ::top_row (menu);
-  }
-
-  // Set the current top row of the menu
-  inline void set_top_row (int row) {
-    OnError (::set_top_row (menu, row));
-  }
-
-  // spacing control
-  // Set the spacing for the menu
-  inline void setSpacing(int spc_description,
-			 int spc_rows,
-			 int spc_columns) {
-    OnError(::set_menu_spacing(menu,
-			       spc_description,
-			       spc_rows,
-			       spc_columns));
-  }
-
-  // Get the spacing info for the menu
-  inline void Spacing(int& spc_description,
-		      int& spc_rows,
-		      int& spc_columns) const {
-    OnError(::menu_spacing(menu,
-			   &spc_description,
-			   &spc_rows,
-			   &spc_columns));
-  }
-
-  // Decorations
-  inline void frame(const char *title=NULL, const char* btitle=NULL) {
-    if (b_framed)
-      NCursesPanel::frame(title,btitle);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  inline void boldframe(const char *title=NULL, const char* btitle=NULL) {
-    if (b_framed)
-      NCursesPanel::boldframe(title,btitle);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  inline void label(const char *topLabel, const char *bottomLabel) {
-    if (b_framed)
-      NCursesPanel::label(topLabel,bottomLabel);
-    else
-      OnError(E_SYSTEM_ERROR);
-  }
-
-  // -----
-  // Hooks
-  // -----
-
-  // Called after the menu gets repositioned in its window.
-  // This is especially true if the menu is posted.
-  virtual void On_Menu_Init();
-
-  // Called before the menu gets repositioned in its window.
-  // This is especially true if the menu is unposted.
-  virtual void On_Menu_Termination();
-
-  // Called after the item became the current item
-  virtual void On_Item_Init(NCursesMenuItem& item);
-
-  // Called before this item is left as current item.
-  virtual void On_Item_Termination(NCursesMenuItem& item);
-
-  // Provide a default key virtualization. Translate the keyboard
-  // code c into a menu request code.
-  // The default implementation provides a hopefully straightforward
-  // mapping for the most common keystrokes and menu requests.
-  virtual int virtualize(int c);
-
-
-  // Operators
-  inline NCursesMenuItem* operator[](int i) const {
-    if ( (i < 0) || (i >= ::item_count (menu)) )
-      OnError (E_BAD_ARGUMENT);
-    return (my_items[i]);
-  }
-
-  // Perform the menu's operation
-  // Return the item where you left the selection mark for a single
-  // selection menu, or NULL for a multivalued menu.
-  virtual NCursesMenuItem* operator()(void);
-
-  // --------------------
-  // Exception handlers
-  // Called by operator()
-  // --------------------
-
-  // Called if the request is denied
-  virtual void On_Request_Denied(int c) const;
-
-  // Called if the item is not selectable
-  virtual void On_Not_Selectable(int c) const;
-
-  // Called if pattern doesn't match
-  virtual void On_No_Match(int c) const;
-
-  // Called if the command is unknown
-  virtual void On_Unknown_Command(int c) const;
-
-};
-//
-// -------------------------------------------------------------------------
-// This is the typical C++ typesafe way to allow to attach
-// user data to an item of a menu. Its assumed that the user
-// data belongs to some class T. Use T as template argument
-// to create a UserItem.
-// -------------------------------------------------------------------------
-//
-template<class T> class NCURSES_IMPEXP NCursesUserItem : public NCursesMenuItem
-{
-public:
-  NCursesUserItem (const char* p_name,
-		   const char* p_descript = NULL,
-		   const T* p_UserData    = STATIC_CAST(T*)(0))
-    : NCursesMenuItem (p_name, p_descript) {
-      if (item)
-	OnError (::set_item_userptr (item, const_cast<void *>(reinterpret_cast<const void*>(p_UserData))));
-  }
-
-  virtual ~NCursesUserItem() {}
-
-  inline const T* UserData (void) const {
-    return reinterpret_cast<const T*>(::item_userptr (item));
-  };
-
-  inline virtual void setUserData(const T* p_UserData) {
-    if (item)
-      OnError (::set_item_userptr (item, const_cast<void *>(reinterpret_cast<const void *>(p_UserData))));
-  }
-};
-//
-// -------------------------------------------------------------------------
-// The same mechanism is used to attach user data to a menu
-// -------------------------------------------------------------------------
-//
-template<class T> class NCURSES_IMPEXP NCursesUserMenu : public NCursesMenu
-{
-protected:
-  NCursesUserMenu( int  nlines,
-		   int  ncols,
-		   int  begin_y = 0,
-		   int  begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0))
-    : NCursesMenu(nlines,ncols,begin_y,begin_x) {
-      if (menu)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  }
-
-public:
-  NCursesUserMenu (NCursesMenuItem* Items[],
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Items=FALSE)
-    : NCursesMenu (Items, with_frame, autoDelete_Items) {
-      if (menu)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  };
-
-  NCursesUserMenu (NCursesMenuItem* Items[],
-		   int nlines,
-		   int ncols,
-		   int begin_y = 0,
-		   int begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE)
-    : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
-      if (menu)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  };
-
-  virtual ~NCursesUserMenu() {
-  };
-
-  inline T* UserData (void) {
-    return reinterpret_cast<T*>(get_user ());
-  };
-
-  inline virtual void setUserData (const T* p_UserData) {
-    if (menu)
-      set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  }
-};
-
-#endif /* NCURSES_CURSESM_H_incl */
diff --git a/openflow/usr/include/ncursesw/cursesp.h b/openflow/usr/include/ncursesw/cursesp.h
deleted file mode 100644
index afe09fb..0000000
--- a/openflow/usr/include/ncursesw/cursesp.h
+++ /dev/null
@@ -1,269 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-#ifndef NCURSES_CURSESP_H_incl
-#define NCURSES_CURSESP_H_incl 1
-
-// $Id: cursesp.h,v 1.31 2014/08/09 22:06:26 Adam.Jiang Exp $
-
-#include <ncursesw/cursesw.h>
-
-extern "C" {
-#  include <ncursesw/panel.h>
-}
-
-class NCURSES_IMPEXP NCursesPanel
-  : public NCursesWindow
-{
-protected:
-  PANEL *p;
-  static NCursesPanel *dummy;
-
-private:
-  // This structure is used for the panel's user data field to link the
-  // PANEL* to the C++ object and to provide extra space for a user pointer.
-  typedef struct {
-    void*               m_user;      // the pointer for the user's data
-    const NCursesPanel* m_back;      // backward pointer to C++ object
-    const PANEL*        m_owner;     // the panel itself
-  } UserHook;
-
-  inline UserHook *UserPointer()
-  {
-    UserHook* uptr = reinterpret_cast<UserHook*>(
-                           const_cast<void *>(::panel_userptr (p)));
-    return uptr;
-  }
-
-  void init();                       // Initialize the panel object
-
-protected:
-  void set_user(void *user)
-  {
-    UserHook* uptr = UserPointer();
-    if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p) {
-      uptr->m_user = user;
-    }
-  }
-  // Set the user pointer of the panel.
-
-  void *get_user()
-  {
-    UserHook* uptr = UserPointer();
-    void *result = 0;
-    if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p)
-      result = uptr->m_user;
-    return result;
-  }
-
-  void OnError (int err) const THROW2(NCursesException const, NCursesPanelException)
-  {
-    if (err==ERR)
-      THROW(new NCursesPanelException (this, err));
-  }
-  // If err is equal to the curses error indicator ERR, an error handler
-  // is called.
-
-  // Get a keystroke. Default implementation calls getch()
-  virtual int getKey(void);
-
-public:
-  NCursesPanel(int nlines,
-	       int ncols,
-	       int begin_y = 0,
-	       int begin_x = 0)
-    : NCursesWindow(nlines,ncols,begin_y,begin_x), p(0)
-  {
-    init();
-  }
-  // Create a panel with this size starting at the requested position.
-
-  NCursesPanel()
-    : NCursesWindow(::stdscr), p(0)
-  {
-    init();
-  }
-  // This constructor creates the default Panel associated with the
-  // ::stdscr window
-
-  NCursesPanel& operator=(const NCursesPanel& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      NCursesWindow::operator=(rhs);
-    }
-    return *this;
-  }
-
-  NCursesPanel(const NCursesPanel& rhs)
-    : NCursesWindow(rhs),
-      p(rhs.p)
-  {
-  }
-
-  virtual ~NCursesPanel();
-
-  // basic manipulation
-  inline void hide()
-  {
-    OnError (::hide_panel(p));
-  }
-  // Hide the panel. It stays in the stack but becomes invisible.
-
-  inline void show()
-  {
-    OnError (::show_panel(p));
-  }
-  // Show the panel, i.e. make it visible.
-
-  inline void top()
-  {
-    OnError (::top_panel(p));
-  }
-  // Make this panel the top panel in the stack.
-
-  inline void bottom()
-  {
-    OnError (::bottom_panel(p));
-  }
-  // Make this panel the bottom panel in the stack.
-  // N.B.: The panel associated with ::stdscr is always on the bottom. So
-  // actually bottom() makes the panel the first above ::stdscr.
-
-  virtual int mvwin(int y, int x)
-  {
-    OnError(::move_panel(p, y, x));
-    return OK;
-  }
-
-  inline bool hidden() const
-  {
-    return (::panel_hidden (p) ? TRUE : FALSE);
-  }
-  // Return TRUE if the panel is hidden, FALSE otherwise.
-
-/* The functions panel_above() and panel_below() are not reflected in
-   the NCursesPanel class. The reason for this is, that we cannot
-   assume that a panel retrieved by those operations is one wrapped
-   by a C++ class. Although this situation might be handled, we also
-   need a reverse mapping from PANEL to NCursesPanel which needs some
-   redesign of the low level stuff. At the moment, we define them in the
-   interface but they will always produce an error. */
-  inline NCursesPanel& above() const
-  {
-    OnError(ERR);
-    return *dummy;
-  }
-
-  inline NCursesPanel& below() const
-  {
-    OnError(ERR);
-    return *dummy;
-  }
-
-  // Those two are rewrites of the corresponding virtual members of
-  // NCursesWindow
-  virtual int refresh();
-  // Propagate all panel changes to the virtual screen and update the
-  // physical screen.
-
-  virtual int noutrefresh();
-  // Propagate all panel changes to the virtual screen.
-
-  static void redraw();
-  // Redraw all panels.
-
-  // decorations
-  virtual void frame(const char* title=NULL,
-		     const char* btitle=NULL);
-  // Put a frame around the panel and put the title centered in the top line
-  // and btitle in the bottom line.
-
-  virtual void boldframe(const char* title=NULL,
-			 const char* btitle=NULL);
-  // Same as frame(), but use highlighted attributes.
-
-  virtual void label(const char* topLabel,
-		     const char* bottomLabel);
-  // Put the title centered in the top line and btitle in the bottom line.
-
-  virtual void centertext(int row,const char* label);
-  // Put the label text centered in the specified row.
-};
-
-/* We use templates to provide a typesafe mechanism to associate
- * user data with a panel. A NCursesUserPanel<T> is a panel
- * associated with some user data of type T.
- */
-template<class T> class NCursesUserPanel : public NCursesPanel
-{
-public:
-  NCursesUserPanel (int nlines,
-		    int ncols,
-		    int begin_y = 0,
-		    int begin_x = 0,
-		    const T* p_UserData = STATIC_CAST(T*)(0))
-    : NCursesPanel (nlines, ncols, begin_y, begin_x)
-  {
-      if (p)
-	set_user (const_cast<void *>(reinterpret_cast<const void*>
-				     (p_UserData)));
-  };
-  // This creates an user panel of the requested size with associated
-  // user data pointed to by p_UserData.
-
-  NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(0)) : NCursesPanel()
-  {
-    if (p)
-      set_user(const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  };
-  // This creates an user panel associated with the ::stdscr and user data
-  // pointed to by p_UserData.
-
-  virtual ~NCursesUserPanel() {};
-
-  T* UserData (void)
-  {
-    return reinterpret_cast<T*>(get_user ());
-  };
-  // Retrieve the user data associated with the panel.
-
-  virtual void setUserData (const T* p_UserData)
-  {
-    if (p)
-      set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));
-  }
-  // Associate the user panel with the user data pointed to by p_UserData.
-};
-
-#endif /* NCURSES_CURSESP_H_incl */
diff --git a/openflow/usr/include/ncursesw/cursesw.h b/openflow/usr/include/ncursesw/cursesw.h
deleted file mode 100644
index bba8a83..0000000
--- a/openflow/usr/include/ncursesw/cursesw.h
+++ /dev/null
@@ -1,1563 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-// vile:cppmode
-/****************************************************************************
- * Copyright (c) 1998-2011,2014 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-#ifndef NCURSES_CURSESW_H_incl
-#define NCURSES_CURSESW_H_incl 1
-
-// $Id: cursesw.h,v 1.50 2014/02/01 22:17:37 tom Exp $
-
-#include <ncursesw/etip.h>
-
-extern "C" {
-#  include   <ncursesw/curses.h>
-}
-
-/* SCO 3.2v4 curses.h includes term.h, which defines lines as a macro.
-   Undefine it here, because NCursesWindow uses lines as a method.  */
-#undef lines
-
-/* "Convert" macros to inlines. We'll define it as another symbol to avoid
- * conflict with library symbols.
- */
-#undef UNDEF
-#define UNDEF(name) CUR_ ##name
-
-#ifdef addch
-inline int UNDEF(addch)(chtype ch)  { return addch(ch); }
-#undef addch
-#define addch UNDEF(addch)
-#endif
-
-#ifdef addchstr
-inline int UNDEF(addchstr)(chtype *at) { return addchstr(at); }
-#undef addchstr
-#define addchstr UNDEF(addchstr)
-#endif
-
-#ifdef addnstr
-inline int UNDEF(addnstr)(const char *str, int n)
-{ return addnstr(str, n); }
-#undef addnstr
-#define addnstr UNDEF(addnstr)
-#endif
-
-#ifdef addstr
-inline int UNDEF(addstr)(const char * str)  { return addstr(str); }
-#undef addstr
-#define addstr UNDEF(addstr)
-#endif
-
-#ifdef attroff
-inline int UNDEF(attroff)(chtype at) { return attroff(at); }
-#undef attroff
-#define attroff UNDEF(attroff)
-#endif
-
-#ifdef attron
-inline int UNDEF(attron)(chtype at) { return attron(at); }
-#undef attron
-#define attron UNDEF(attron)
-#endif
-
-#ifdef attrset
-inline chtype UNDEF(attrset)(chtype at) { return attrset(at); }
-#undef attrset
-#define attrset UNDEF(attrset)
-#endif
-
-#ifdef bkgd
-inline int UNDEF(bkgd)(chtype ch) { return bkgd(ch); }
-#undef bkgd
-#define bkgd UNDEF(bkgd)
-#endif
-
-#ifdef bkgdset
-inline void UNDEF(bkgdset)(chtype ch) { bkgdset(ch); }
-#undef bkgdset
-#define bkgdset UNDEF(bkgdset)
-#endif
-
-#ifdef border
-inline int UNDEF(border)(chtype ls, chtype rs, chtype ts, chtype bs, chtype tl, chtype tr, chtype bl, chtype br)
-{ return border(ls, rs, ts, bs, tl, tr, bl, br); }
-#undef border
-#define border UNDEF(border)
-#endif
-
-#ifdef box
-inline int UNDEF(box)(WINDOW *win, int v, int h) { return box(win, v, h); }
-#undef box
-#define box UNDEF(box)
-#endif
-
-#ifdef chgat
-inline int UNDEF(chgat)(int n, attr_t attr, NCURSES_PAIRS_T color, const void *opts) {
-  return chgat(n, attr, color, opts); }
-#undef chgat
-#define chgat UNDEF(chgat)
-#endif
-
-#ifdef clear
-inline int UNDEF(clear)()  { return clear(); }
-#undef clear
-#define clear UNDEF(clear)
-#endif
-
-#ifdef clearok
-inline int UNDEF(clearok)(WINDOW* win, bool bf)  { return clearok(win, bf); }
-#undef clearok
-#define clearok UNDEF(clearok)
-#else
-extern "C" NCURSES_IMPEXP int NCURSES_API clearok(WINDOW*, bool);
-#endif
-
-#ifdef clrtobot
-inline int UNDEF(clrtobot)()  { return clrtobot(); }
-#undef clrtobot
-#define clrtobot UNDEF(clrtobot)
-#endif
-
-#ifdef clrtoeol
-inline int UNDEF(clrtoeol)()  { return clrtoeol(); }
-#undef clrtoeol
-#define clrtoeol UNDEF(clrtoeol)
-#endif
-
-#ifdef color_set
-inline chtype UNDEF(color_set)(NCURSES_PAIRS_T p, void* opts) { return color_set(p, opts); }
-#undef color_set
-#define color_set UNDEF(color_set)
-#endif
-
-#ifdef crmode
-inline int UNDEF(crmode)(void) { return crmode(); }
-#undef crmode
-#define crmode UNDEF(crmode)
-#endif
-
-#ifdef delch
-inline int UNDEF(delch)()  { return delch(); }
-#undef delch
-#define delch UNDEF(delch)
-#endif
-
-#ifdef deleteln
-inline int UNDEF(deleteln)()  { return deleteln(); }
-#undef deleteln
-#define deleteln UNDEF(deleteln)
-#endif
-
-#ifdef echochar
-inline int UNDEF(echochar)(chtype ch)  { return echochar(ch); }
-#undef echochar
-#define echochar UNDEF(echochar)
-#endif
-
-#ifdef erase
-inline int UNDEF(erase)()  { return erase(); }
-#undef erase
-#define erase UNDEF(erase)
-#endif
-
-#ifdef fixterm
-inline int UNDEF(fixterm)(void) { return fixterm(); }
-#undef fixterm
-#define fixterm UNDEF(fixterm)
-#endif
-
-#ifdef flushok
-inline int UNDEF(flushok)(WINDOW* _win, bool _bf)  {
-  return flushok(_win, _bf); }
-#undef flushok
-#define flushok UNDEF(flushok)
-#else
-#define _no_flushok
-#endif
-
-#ifdef getattrs
-inline int UNDEF(getattrs)(WINDOW *win) { return getattrs(win); }
-#undef getattrs
-#define getattrs UNDEF(getattrs)
-#endif
-
-#ifdef getbegyx
-inline void UNDEF(getbegyx)(WINDOW* win, int& y, int& x) { getbegyx(win, y, x); }
-#undef getbegyx
-#define getbegyx UNDEF(getbegyx)
-#endif
-
-#ifdef getbkgd
-inline chtype UNDEF(getbkgd)(const WINDOW *win) { return getbkgd(win); }
-#undef getbkgd
-#define getbkgd UNDEF(getbkgd)
-#endif
-
-#ifdef getch
-inline int UNDEF(getch)()  { return getch(); }
-#undef getch
-#define getch UNDEF(getch)
-#endif
-
-#ifdef getmaxyx
-inline void UNDEF(getmaxyx)(WINDOW* win, int& y, int& x) { getmaxyx(win, y, x); }
-#undef getmaxyx
-#define getmaxyx UNDEF(getmaxyx)
-#endif
-
-#ifdef getnstr
-inline int UNDEF(getnstr)(char *_str, int n)  { return getnstr(_str, n); }
-#undef getnstr
-#define getnstr UNDEF(getnstr)
-#endif
-
-#ifdef getparyx
-inline void UNDEF(getparyx)(WINDOW* win, int& y, int& x) { getparyx(win, y, x); }
-#undef getparyx
-#define getparyx UNDEF(getparyx)
-#endif
-
-#ifdef getstr
-inline int UNDEF(getstr)(char *_str)  { return getstr(_str); }
-#undef getstr
-#define getstr UNDEF(getstr)
-#endif
-
-#ifdef getyx
-inline void UNDEF(getyx)(const WINDOW* win, int& y, int& x) {
-  getyx(win, y, x); }
-#undef getyx
-#define getyx UNDEF(getyx)
-#endif
-
-#ifdef hline
-inline int UNDEF(hline)(chtype ch, int n) { return hline(ch, n); }
-#undef hline
-#define hline UNDEF(hline)
-#endif
-
-#ifdef inch
-inline chtype UNDEF(inch)()  { return inch(); }
-#undef inch
-#define inch UNDEF(inch)
-#endif
-
-#ifdef inchstr
-inline int UNDEF(inchstr)(chtype *str)  { return inchstr(str); }
-#undef inchstr
-#define inchstr UNDEF(inchstr)
-#endif
-
-#ifdef innstr
-inline int UNDEF(innstr)(char *_str, int n)  { return innstr(_str, n); }
-#undef innstr
-#define innstr UNDEF(innstr)
-#endif
-
-#ifdef insch
-inline int UNDEF(insch)(chtype c)  { return insch(c); }
-#undef insch
-#define insch UNDEF(insch)
-#endif
-
-#ifdef insdelln
-inline int UNDEF(insdelln)(int n)  { return insdelln(n); }
-#undef insdelln
-#define insdelln UNDEF(insdelln)
-#endif
-
-#ifdef insertln
-inline int UNDEF(insertln)()  { return insertln(); }
-#undef insertln
-#define insertln UNDEF(insertln)
-#endif
-
-#ifdef insnstr
-inline int UNDEF(insnstr)(const char *_str, int n)  {
-  return insnstr(_str, n); }
-#undef insnstr
-#define insnstr UNDEF(insnstr)
-#endif
-
-#ifdef insstr
-inline int UNDEF(insstr)(const char *_str)  {
-  return insstr(_str); }
-#undef insstr
-#define insstr UNDEF(insstr)
-#endif
-
-#ifdef instr
-inline int UNDEF(instr)(char *_str)  { return instr(_str); }
-#undef instr
-#define instr UNDEF(instr)
-#endif
-
-#ifdef intrflush
-inline void UNDEF(intrflush)(WINDOW *win, bool bf) { intrflush(); }
-#undef intrflush
-#define intrflush UNDEF(intrflush)
-#endif
-
-#ifdef leaveok
-inline int UNDEF(leaveok)(WINDOW* win, bool bf)  { return leaveok(win, bf); }
-#undef leaveok
-#define leaveok UNDEF(leaveok)
-#else
-extern "C" NCURSES_IMPEXP int NCURSES_API leaveok(WINDOW* win, bool bf);
-#endif
-
-#ifdef move
-inline int UNDEF(move)(int x, int y)  { return move(x, y); }
-#undef move
-#define move UNDEF(move)
-#endif
-
-#ifdef mvaddch
-inline int UNDEF(mvaddch)(int y, int x, chtype ch)
-{ return mvaddch(y, x, ch); }
-#undef mvaddch
-#define mvaddch UNDEF(mvaddch)
-#endif
-
-#ifdef mvaddnstr
-inline int UNDEF(mvaddnstr)(int y, int x, const char *str, int n)
-{ return mvaddnstr(y, x, str, n); }
-#undef mvaddnstr
-#define mvaddnstr UNDEF(mvaddnstr)
-#endif
-
-#ifdef mvaddstr
-inline int UNDEF(mvaddstr)(int y, int x, const char * str)
-{ return mvaddstr(y, x, str); }
-#undef mvaddstr
-#define mvaddstr UNDEF(mvaddstr)
-#endif
-
-#ifdef mvchgat
-inline int UNDEF(mvchgat)(int y, int x, int n,
-			  attr_t attr, NCURSES_PAIRS_T color, const void *opts) {
-  return mvchgat(y, x, n, attr, color, opts); }
-#undef mvchgat
-#define mvchgat UNDEF(mvchgat)
-#endif
-
-#ifdef mvdelch
-inline int UNDEF(mvdelch)(int y, int x) { return mvdelch(y, x);}
-#undef mvdelch
-#define mvdelch UNDEF(mvdelch)
-#endif
-
-#ifdef mvgetch
-inline int UNDEF(mvgetch)(int y, int x) { return mvgetch(y, x);}
-#undef mvgetch
-#define mvgetch UNDEF(mvgetch)
-#endif
-
-#ifdef mvgetnstr
-inline int UNDEF(mvgetnstr)(int y, int x, char *str, int n) {
-  return mvgetnstr(y, x, str, n);}
-#undef mvgetnstr
-#define mvgetnstr UNDEF(mvgetnstr)
-#endif
-
-#ifdef mvgetstr
-inline int UNDEF(mvgetstr)(int y, int x, char *str) {return mvgetstr(y, x, str);}
-#undef mvgetstr
-#define mvgetstr UNDEF(mvgetstr)
-#endif
-
-#ifdef mvinch
-inline chtype UNDEF(mvinch)(int y, int x) { return mvinch(y, x);}
-#undef mvinch
-#define mvinch UNDEF(mvinch)
-#endif
-
-#ifdef mvinnstr
-inline int UNDEF(mvinnstr)(int y, int x, char *_str, int n) {
-  return mvinnstr(y, x, _str, n); }
-#undef mvinnstr
-#define mvinnstr UNDEF(mvinnstr)
-#endif
-
-#ifdef mvinsch
-inline int UNDEF(mvinsch)(int y, int x, chtype c)
-{ return mvinsch(y, x, c); }
-#undef mvinsch
-#define mvinsch UNDEF(mvinsch)
-#endif
-
-#ifdef mvinsnstr
-inline int UNDEF(mvinsnstr)(int y, int x, const char *_str, int n) {
-  return mvinsnstr(y, x, _str, n); }
-#undef mvinsnstr
-#define mvinsnstr UNDEF(mvinsnstr)
-#endif
-
-#ifdef mvinsstr
-inline int UNDEF(mvinsstr)(int y, int x, const char *_str)  {
-  return mvinsstr(y, x, _str); }
-#undef mvinsstr
-#define mvinsstr UNDEF(mvinsstr)
-#endif
-
-#ifdef mvwaddch
-inline int UNDEF(mvwaddch)(WINDOW *win, int y, int x, const chtype ch)
-{ return mvwaddch(win, y, x, ch); }
-#undef mvwaddch
-#define mvwaddch UNDEF(mvwaddch)
-#endif
-
-#ifdef mvwaddchnstr
-inline int UNDEF(mvwaddchnstr)(WINDOW *win, int y, int x, const chtype *str, int n)
-{ return mvwaddchnstr(win, y, x, str, n); }
-#undef mvwaddchnstr
-#define mvwaddchnstr UNDEF(mvwaddchnstr)
-#endif
-
-#ifdef mvwaddchstr
-inline int UNDEF(mvwaddchstr)(WINDOW *win, int y, int x, const chtype *str)
-{ return mvwaddchstr(win, y, x, str); }
-#undef mvwaddchstr
-#define mvwaddchstr UNDEF(mvwaddchstr)
-#endif
-
-#ifdef mvwaddnstr
-inline int UNDEF(mvwaddnstr)(WINDOW *win, int y, int x, const char *str, int n)
-{ return mvwaddnstr(win, y, x, str, n); }
-#undef mvwaddnstr
-#define mvwaddnstr UNDEF(mvwaddnstr)
-#endif
-
-#ifdef mvwaddstr
-inline int UNDEF(mvwaddstr)(WINDOW *win, int y, int x, const char * str)
-{ return mvwaddstr(win, y, x, str); }
-#undef mvwaddstr
-#define mvwaddstr UNDEF(mvwaddstr)
-#endif
-
-#ifdef mvwchgat
-inline int UNDEF(mvwchgat)(WINDOW *win, int y, int x, int n,
-			   attr_t attr, NCURSES_PAIRS_T color, const void *opts) {
-  return mvwchgat(win, y, x, n, attr, color, opts); }
-#undef mvwchgat
-#define mvwchgat UNDEF(mvwchgat)
-#endif
-
-#ifdef mvwdelch
-inline int UNDEF(mvwdelch)(WINDOW *win, int y, int x)
-{ return mvwdelch(win, y, x); }
-#undef mvwdelch
-#define mvwdelch UNDEF(mvwdelch)
-#endif
-
-#ifdef mvwgetch
-inline int UNDEF(mvwgetch)(WINDOW *win, int y, int x) { return mvwgetch(win, y, x);}
-#undef mvwgetch
-#define mvwgetch UNDEF(mvwgetch)
-#endif
-
-#ifdef mvwgetnstr
-inline int UNDEF(mvwgetnstr)(WINDOW *win, int y, int x, char *str, int n)
-{return mvwgetnstr(win, y, x, str, n);}
-#undef mvwgetnstr
-#define mvwgetnstr UNDEF(mvwgetnstr)
-#endif
-
-#ifdef mvwgetstr
-inline int UNDEF(mvwgetstr)(WINDOW *win, int y, int x, char *str)
-{return mvwgetstr(win, y, x, str);}
-#undef mvwgetstr
-#define mvwgetstr UNDEF(mvwgetstr)
-#endif
-
-#ifdef mvwhline
-inline int UNDEF(mvwhline)(WINDOW *win, int y, int x, chtype c, int n) {
-  return mvwhline(win, y, x, c, n); }
-#undef mvwhline
-#define mvwhline UNDEF(mvwhline)
-#endif
-
-#ifdef mvwinch
-inline chtype UNDEF(mvwinch)(WINDOW *win, int y, int x) {
-  return mvwinch(win, y, x);}
-#undef mvwinch
-#define mvwinch UNDEF(mvwinch)
-#endif
-
-#ifdef mvwinchnstr
-inline int UNDEF(mvwinchnstr)(WINDOW *win, int y, int x, chtype *str, int n)  { return mvwinchnstr(win, y, x, str, n); }
-#undef mvwinchnstr
-#define mvwinchnstr UNDEF(mvwinchnstr)
-#endif
-
-#ifdef mvwinchstr
-inline int UNDEF(mvwinchstr)(WINDOW *win, int y, int x, chtype *str)  { return mvwinchstr(win, y, x, str); }
-#undef mvwinchstr
-#define mvwinchstr UNDEF(mvwinchstr)
-#endif
-
-#ifdef mvwinnstr
-inline int UNDEF(mvwinnstr)(WINDOW *win, int y, int x, char *_str, int n) {
-  return mvwinnstr(win, y, x, _str, n); }
-#undef mvwinnstr
-#define mvwinnstr UNDEF(mvwinnstr)
-#endif
-
-#ifdef mvwinsch
-inline int UNDEF(mvwinsch)(WINDOW *win, int y, int x, chtype c)
-{ return mvwinsch(win, y, x, c); }
-#undef mvwinsch
-#define mvwinsch UNDEF(mvwinsch)
-#endif
-
-#ifdef mvwinsnstr
-inline int UNDEF(mvwinsnstr)(WINDOW *w, int y, int x, const char *_str, int n) {
-  return mvwinsnstr(w, y, x, _str, n); }
-#undef mvwinsnstr
-#define mvwinsnstr UNDEF(mvwinsnstr)
-#endif
-
-#ifdef mvwinsstr
-inline int UNDEF(mvwinsstr)(WINDOW *w, int y, int x,  const char *_str)  {
-  return mvwinsstr(w, y, x, _str); }
-#undef mvwinsstr
-#define mvwinsstr UNDEF(mvwinsstr)
-#endif
-
-#ifdef mvwvline
-inline int UNDEF(mvwvline)(WINDOW *win, int y, int x, chtype c, int n) {
-  return mvwvline(win, y, x, c, n); }
-#undef mvwvline
-#define mvwvline UNDEF(mvwvline)
-#endif
-
-#ifdef napms
-inline void UNDEF(napms)(unsigned long x) { napms(x); }
-#undef napms
-#define napms UNDEF(napms)
-#endif
-
-#ifdef nocrmode
-inline int UNDEF(nocrmode)(void) { return nocrmode(); }
-#undef nocrmode
-#define nocrmode UNDEF(nocrmode)
-#endif
-
-#ifdef nodelay
-inline void UNDEF(nodelay)() { nodelay(); }
-#undef nodelay
-#define nodelay UNDEF(nodelay)
-#endif
-
-#ifdef redrawwin
-inline int UNDEF(redrawwin)(WINDOW *win)  { return redrawwin(win); }
-#undef redrawwin
-#define redrawwin UNDEF(redrawwin)
-#endif
-
-#ifdef refresh
-inline int UNDEF(refresh)()  { return refresh(); }
-#undef refresh
-#define refresh UNDEF(refresh)
-#endif
-
-#ifdef resetterm
-inline int UNDEF(resetterm)(void) { return resetterm(); }
-#undef resetterm
-#define resetterm UNDEF(resetterm)
-#endif
-
-#ifdef saveterm
-inline int UNDEF(saveterm)(void) { return saveterm(); }
-#undef saveterm
-#define saveterm UNDEF(saveterm)
-#endif
-
-#ifdef scrl
-inline int UNDEF(scrl)(int l) { return scrl(l); }
-#undef scrl
-#define scrl UNDEF(scrl)
-#endif
-
-#ifdef scroll
-inline int UNDEF(scroll)(WINDOW *win) { return scroll(win); }
-#undef scroll
-#define scroll UNDEF(scroll)
-#endif
-
-#ifdef scrollok
-inline int UNDEF(scrollok)(WINDOW* win, bool bf)  { return scrollok(win, bf); }
-#undef scrollok
-#define scrollok UNDEF(scrollok)
-#else
-#if	defined(__NCURSES_H)
-extern "C" NCURSES_IMPEXP int NCURSES_API scrollok(WINDOW*, bool);
-#else
-extern "C" NCURSES_IMPEXP int NCURSES_API scrollok(WINDOW*, char);
-#endif
-#endif
-
-#ifdef setscrreg
-inline int UNDEF(setscrreg)(int t, int b) { return setscrreg(t, b); }
-#undef setscrreg
-#define setscrreg UNDEF(setscrreg)
-#endif
-
-#ifdef standend
-inline int UNDEF(standend)()  { return standend(); }
-#undef standend
-#define standend UNDEF(standend)
-#endif
-
-#ifdef standout
-inline int UNDEF(standout)()  { return standout(); }
-#undef standout
-#define standout UNDEF(standout)
-#endif
-
-#ifdef subpad
-inline WINDOW *UNDEF(subpad)(WINDOW *p, int l, int c, int y, int x)
-{ return derwin(p, l, c, y, x); }
-#undef subpad
-#define subpad UNDEF(subpad)
-#endif
-
-#ifdef timeout
-inline void UNDEF(timeout)(int delay) { timeout(delay); }
-#undef timeout
-#define timeout UNDEF(timeout)
-#endif
-
-#ifdef touchline
-inline int UNDEF(touchline)(WINDOW *win, int s, int c)
-{ return touchline(win, s, c); }
-#undef touchline
-#define touchline UNDEF(touchline)
-#endif
-
-#ifdef touchwin
-inline int UNDEF(touchwin)(WINDOW *win) { return touchwin(win); }
-#undef touchwin
-#define touchwin UNDEF(touchwin)
-#endif
-
-#ifdef untouchwin
-inline int UNDEF(untouchwin)(WINDOW *win) { return untouchwin(win); }
-#undef untouchwin
-#define untouchwin UNDEF(untouchwin)
-#endif
-
-#ifdef vline
-inline int UNDEF(vline)(chtype ch, int n) { return vline(ch, n); }
-#undef vline
-#define vline UNDEF(vline)
-#endif
-
-#ifdef waddchstr
-inline int UNDEF(waddchstr)(WINDOW *win, chtype *at) { return waddchstr(win, at); }
-#undef waddchstr
-#define waddchstr UNDEF(waddchstr)
-#endif
-
-#ifdef waddstr
-inline int UNDEF(waddstr)(WINDOW *win, char *str) { return waddstr(win, str); }
-#undef waddstr
-#define waddstr UNDEF(waddstr)
-#endif
-
-#ifdef wattroff
-inline int UNDEF(wattroff)(WINDOW *win, int att) { return wattroff(win, att); }
-#undef wattroff
-#define wattroff UNDEF(wattroff)
-#endif
-
-#ifdef wattrset
-inline int UNDEF(wattrset)(WINDOW *win, int att) { return wattrset(win, att); }
-#undef wattrset
-#define wattrset UNDEF(wattrset)
-#endif
-
-#ifdef winch
-inline chtype UNDEF(winch)(const WINDOW* win) { return winch(win); }
-#undef winch
-#define winch UNDEF(winch)
-#endif
-
-#ifdef winchnstr
-inline int UNDEF(winchnstr)(WINDOW *win, chtype *str, int n)  { return winchnstr(win, str, n); }
-#undef winchnstr
-#define winchnstr UNDEF(winchnstr)
-#endif
-
-#ifdef winchstr
-inline int UNDEF(winchstr)(WINDOW *win, chtype *str)  { return winchstr(win, str); }
-#undef winchstr
-#define winchstr UNDEF(winchstr)
-#endif
-
-#ifdef winsstr
-inline int UNDEF(winsstr)(WINDOW *w, const char *_str)  {
-  return winsstr(w, _str); }
-#undef winsstr
-#define winsstr UNDEF(winsstr)
-#endif
-
-#ifdef wstandend
-inline int UNDEF(wstandend)(WINDOW *win)  { return wstandend(win); }
-#undef wstandend
-#define wstandend UNDEF(wstandend)
-#endif
-
-#ifdef wstandout
-inline int UNDEF(wstandout)(WINDOW *win)  { return wstandout(win); }
-#undef wstandout
-#define wstandout UNDEF(wstandout)
-#endif
-
-/*
- *
- * C++ class for windows.
- *
- */
-
-extern "C" int     _nc_ripoffline(int, int (*init)(WINDOW*, int));
-extern "C" int     _nc_xx_ripoff_init(WINDOW *, int);
-extern "C" int     _nc_has_mouse(void);
-
-class NCURSES_IMPEXP NCursesWindow
-{
-  friend class NCursesMenu;
-  friend class NCursesForm;
-
-private:
-  static bool    b_initialized;
-  static void    initialize();
-  void           constructing();
-  friend int     _nc_xx_ripoff_init(WINDOW *, int);
-
-  void           set_keyboard();
-
-  NCURSES_COLOR_T getcolor(int getback) const;
-  NCURSES_PAIRS_T getPair() const;
-
-  static int     setpalette(NCURSES_COLOR_T fore, NCURSES_COLOR_T back, NCURSES_PAIRS_T pair);
-  static int     colorInitialized;
-
-  // This private constructor is only used during the initialization
-  // of windows generated by ripoffline() calls.
-  NCursesWindow(WINDOW* win, int ncols);
-
-protected:
-  virtual void   err_handler(const char *) const THROWS(NCursesException);
-  // Signal an error with the given message text.
-
-  static long count;        // count of all active windows:
-  //   We rely on the c++ promise that
-  //   all otherwise uninitialized
-  //   static class vars are set to 0
-
-  WINDOW*        w;                // the curses WINDOW
-
-  bool           alloced;          // TRUE if we own the WINDOW
-
-  NCursesWindow* par;              // parent, if subwindow
-  NCursesWindow* subwins;          // head of subwindows list
-  NCursesWindow* sib;              // next subwindow of parent
-
-  void           kill_subwindows(); // disable all subwindows
-  // Destroy all subwindows.
-
-  /* Only for use by derived classes. They are then in charge to
-     fill the member variables correctly. */
-  NCursesWindow();
-
-public:
-  NCursesWindow(WINDOW* window);   // useful only for stdscr
-
-  NCursesWindow(int nlines,        // number of lines
-		int ncols,         // number of columns
-		int begin_y,       // line origin
-		int begin_x);      // col origin
-
-  NCursesWindow(NCursesWindow& par,// parent window
-		int nlines,        // number of lines
-		int ncols,         // number of columns
-		int begin_y,       // absolute or relative
-		int begin_x,       //   origins:
-		char absrel = 'a');// if `a', begin_y & begin_x are
-  // absolute screen pos, else if `r', they are relative to par origin
-
-  NCursesWindow(NCursesWindow& par,// parent window
-		bool do_box = TRUE);
-  // this is the very common case that we want to create the subwindow that
-  // is two lines and two columns smaller and begins at (1,1).
-  // We may automatically request the box around it.
-
-  NCursesWindow& operator=(const NCursesWindow& rhs)
-  {
-    if (this != &rhs)
-      *this = rhs;
-    return *this;
-  }
-
-  NCursesWindow(const NCursesWindow& rhs)
-    : w(rhs.w), alloced(rhs.alloced), par(rhs.par), subwins(rhs.subwins), sib(rhs.sib)
-  {
-  }
-
-  virtual ~NCursesWindow();
-
-  NCursesWindow Clone();
-  // Make an exact copy of the window.
-
-  // Initialization.
-  static void    useColors(void);
-  // Call this routine very early if you want to have colors.
-
-  static int ripoffline(int ripoff_lines,
-			int (*init)(NCursesWindow& win));
-  // This function is used to generate a window of ripped-of lines.
-  // If the argument is positive, lines are removed from the top, if it
-  // is negative lines are removed from the bottom. This enhances the
-  // lowlevel ripoffline() function because it uses the internal
-  // implementation that allows to remove more than just a single line.
-  // This function must be called before any other ncurses function. The
-  // creation of the window is deferred until ncurses gets initialized.
-  // The initialization function is then called.
-
-  // -------------------------------------------------------------------------
-  // terminal status
-  // -------------------------------------------------------------------------
-  int            lines() const { initialize(); return LINES; }
-  // Number of lines on terminal, *not* window
-
-  int            cols() const { initialize(); return COLS; }
-  // Number of cols  on terminal, *not* window
-
-  int            tabsize() const { initialize(); return TABSIZE; }
-  // Size of a tab on terminal, *not* window
-
-  static int     NumberOfColors();
-  // Number of available colors
-
-  int            colors() const { return NumberOfColors(); }
-  // Number of available colors
-
-  // -------------------------------------------------------------------------
-  // window status
-  // -------------------------------------------------------------------------
-  int            height() const { return maxy() + 1; }
-  // Number of lines in this window
-
-  int            width() const { return maxx() + 1; }
-  // Number of columns in this window
-
-  int            begx() const { return getbegx(w); }
-  // Column of top left corner relative to stdscr
-
-  int            begy() const { return getbegy(w); }
-  // Line of top left corner relative to stdscr
-
-  int            curx() const { return getcurx(w); }
-  // Column of top left corner relative to stdscr
-
-  int            cury() const { return getcury(w); }
-  // Line of top left corner relative to stdscr
-
-  int            maxx() const { return getmaxx(w) == ERR ? ERR : getmaxx(w)-1; }
-  // Largest x coord in window
-
-  int            maxy() const { return getmaxy(w) == ERR ? ERR : getmaxy(w)-1; }
-  // Largest y coord in window
-
-  NCURSES_PAIRS_T getcolor() const;
-  // Actual color pair
-
-  NCURSES_COLOR_T foreground() const { return getcolor(0); }
-  // Actual foreground color
-
-  NCURSES_COLOR_T background() const { return getcolor(1); }
-  // Actual background color
-
-  int            setpalette(NCURSES_COLOR_T fore, NCURSES_COLOR_T back);
-  // Set color palette entry
-
-  int            setcolor(NCURSES_PAIRS_T pair);
-  // Set actually used palette entry
-
-  // -------------------------------------------------------------------------
-  // window positioning
-  // -------------------------------------------------------------------------
-  virtual int    mvwin(int begin_y, int begin_x) {
-    return ::mvwin(w, begin_y, begin_x); }
-  // Move window to new position with the new position as top left corner.
-  // This is virtual because it is redefined in NCursesPanel.
-
-  // -------------------------------------------------------------------------
-  // coordinate positioning
-  // -------------------------------------------------------------------------
-  int            move(int y, int x) { return ::wmove(w, y, x); }
-  // Move cursor the this position
-
-  void           getyx(int& y, int& x) const { ::getyx(w, y, x); }
-  // Get current position of the cursor
-
-  void           getbegyx(int& y, int& x) const { ::getbegyx(w, y, x); }
-  // Get beginning of the window
-
-  void           getmaxyx(int& y, int& x) const { ::getmaxyx(w, y, x); }
-  // Get size of the window
-
-  void           getparyx(int& y, int& x) const { ::getparyx(w, y, x); }
-  // Get parent's beginning of the window
-
-  int            mvcur(int oldrow, int oldcol, int newrow, int newcol) const {
-    return ::mvcur(oldrow, oldcol, newrow, newcol); }
-  // Perform lowlevel cursor motion that takes effect immediately.
-
-  // -------------------------------------------------------------------------
-  // input
-  // -------------------------------------------------------------------------
-  int            getch() { return ::wgetch(w); }
-  // Get a keystroke from the window.
-
-  int            getch(int y, int x) { return ::mvwgetch(w, y, x); }
-  // Move cursor to position and get a keystroke from the window
-
-  int            getstr(char* str, int n=-1) {
-    return ::wgetnstr(w, str, n); }
-  // Read a series of characters into str until a newline or carriage return
-  // is received. Read at most n characters. If n is negative, the limit is
-  // ignored.
-
-  int            getstr(int y, int x, char* str, int n=-1) {
-    return ::mvwgetnstr(w, y, x, str, n); }
-  // Move the cursor to the requested position and then perform the getstr()
-  // as described above.
-
-  int            instr(char *s, int n=-1) { return ::winnstr(w, s, n); }
-  // Get a string of characters from the window into the buffer s. Retrieve
-  // at most n characters, if n is negative retrieve all characters up to the
-  // end of the current line. Attributes are stripped from the characters.
-
-  int            instr(int y, int x, char *s, int n=-1) {
-    return ::mvwinnstr(w, y, x, s, n); }
-  // Move the cursor to the requested position and then perform the instr()
-  // as described above.
-
-  int            scanw(const char* fmt, ...)
-    // Perform a scanw function from the window.
-#if __GNUG__ >= 2
-    __attribute__ ((format (scanf, 2, 3)));
-#else
-  ;
-#endif
-
-  int            scanw(const char*, va_list);
-    // Perform a scanw function from the window.
-
-  int            scanw(int y, int x, const char* fmt, ...)
-    // Move the cursor to the requested position and then perform a scanw
-    // from the window.
-#if __GNUG__ >= 2
-    __attribute__ ((format (scanf, 4, 5)));
-#else
-  ;
-#endif
-
-  int            scanw(int y, int x, const char* fmt, va_list);
-    // Move the cursor to the requested position and then perform a scanw
-    // from the window.
-
-  // -------------------------------------------------------------------------
-  // output
-  // -------------------------------------------------------------------------
-  int            addch(const chtype ch) { return ::waddch(w, ch); }
-  // Put attributed character to the window.
-
-  int            addch(int y, int x, const chtype ch) {
-    return ::mvwaddch(w, y, x, ch); }
-  // Move cursor to the requested position and then put attributed character
-  // to the window.
-
-  int            echochar(const chtype ch) { return ::wechochar(w, ch); }
-  // Put attributed character to the window and refresh it immediately.
-
-  int            addstr(const char* str, int n=-1) {
-    return ::waddnstr(w, str, n); }
-  // Write the string str to the window, stop writing if the terminating
-  // NUL or the limit n is reached. If n is negative, it is ignored.
-
-  int            addstr(int y, int x, const char * str, int n=-1) {
-    return ::mvwaddnstr(w, y, x, str, n); }
-  // Move the cursor to the requested position and then perform the addchstr
-  // as described above.
-
-  int            addchstr(const chtype* str, int n=-1) {
-    return ::waddchnstr(w, str, n); }
-  // Write the string str to the window, stop writing if the terminating
-  // NUL or the limit n is reached. If n is negative, it is ignored.
-
-  int            addchstr(int y, int x, const chtype * str, int n=-1) {
-    return ::mvwaddchnstr(w, y, x, str, n); }
-  // Move the cursor to the requested position and then perform the addchstr
-  // as described above.
-
-  int            printw(const char* fmt, ...)
-    // Do a formatted print to the window.
-#if (__GNUG__ >= 2) && !defined(printf)
-    __attribute__ ((format (printf, 2, 3)));
-#else
-  ;
-#endif
-
-  int            printw(int y, int x, const char * fmt, ...)
-    // Move the cursor and then do a formatted print to the window.
-#if (__GNUG__ >= 2) && !defined(printf)
-    __attribute__ ((format (printf, 4, 5)));
-#else
-  ;
-#endif
-
-  int            printw(const char* fmt, va_list args);
-    // Do a formatted print to the window.
-
-  int            printw(int y, int x, const char * fmt, va_list args);
-    // Move the cursor and then do a formatted print to the window.
-
-  chtype         inch() const { return ::winch(w); }
-  // Retrieve attributed character under the current cursor position.
-
-  chtype         inch(int y, int x) { return ::mvwinch(w, y, x); }
-  // Move cursor to requested position and then retrieve attributed character
-  // at this position.
-
-  int            inchstr(chtype* str, int n=-1) {
-    return ::winchnstr(w, str, n); }
-  // Read the string str from the window, stop reading if the terminating
-  // NUL or the limit n is reached. If n is negative, it is ignored.
-
-  int            inchstr(int y, int x, chtype * str, int n=-1) {
-    return ::mvwinchnstr(w, y, x, str, n); }
-  // Move the cursor to the requested position and then perform the inchstr
-  // as described above.
-
-  int            insch(chtype ch) { return ::winsch(w, ch); }
-  // Insert attributed character into the window before current cursor
-  // position.
-
-  int            insch(int y, int x, chtype ch) {
-    return ::mvwinsch(w, y, x, ch); }
-  // Move cursor to requested position and then insert the attributed
-  // character before that position.
-
-  int            insertln() { return ::winsdelln(w, 1); }
-  // Insert an empty line above the current line.
-
-  int            insdelln(int n=1) { return ::winsdelln(w, n); }
-  // If n>0 insert that many lines above the current line. If n<0 delete
-  // that many lines beginning with the current line.
-
-  int            insstr(const char *s, int n=-1) {
-    return ::winsnstr(w, s, n); }
-  // Insert the string into the window before the current cursor position.
-  // Insert stops at end of string or when the limit n is reached. If n is
-  // negative, it is ignored.
-
-  int            insstr(int y, int x, const char *s, int n=-1) {
-    return ::mvwinsnstr(w, y, x, s, n); }
-  // Move the cursor to the requested position and then perform the insstr()
-  // as described above.
-
-  int            attron (chtype at) { return ::wattron (w, at); }
-  // Switch on the window attributes;
-
-  int            attroff(chtype at) { return ::wattroff(w, static_cast<int>(at)); }
-  // Switch off the window attributes;
-
-  int            attrset(chtype at) { return ::wattrset(w, static_cast<int>(at)); }
-  // Set the window attributes;
-
-  chtype         attrget() { return ::getattrs(w); }
-  // Get the window attributes;
-
-  int            color_set(NCURSES_PAIRS_T color_pair_number, void* opts=NULL) {
-    return ::wcolor_set(w, color_pair_number, opts); }
-  // Set the window color attribute;
-
-  int            chgat(int n, attr_t attr, NCURSES_PAIRS_T color, const void *opts=NULL) {
-    return ::wchgat(w, n, attr, color, opts); }
-  // Change the attributes of the next n characters in the current line. If
-  // n is negative or greater than the number of remaining characters in the
-  // line, the attributes will be changed up to the end of the line.
-
-  int            chgat(int y, int x,
-		       int n, attr_t attr, NCURSES_PAIRS_T color, const void *opts=NULL) {
-    return ::mvwchgat(w, y, x, n, attr, color, opts); }
-  // Move the cursor to the requested position and then perform chgat() as
-  // described above.
-
-  // -------------------------------------------------------------------------
-  // background
-  // -------------------------------------------------------------------------
-  chtype         getbkgd() const { return ::getbkgd(w); }
-  // Get current background setting.
-
-  int            bkgd(const chtype ch) { return ::wbkgd(w, ch); }
-  // Set the background property and apply it to the window.
-
-  void           bkgdset(chtype ch) { ::wbkgdset(w, ch); }
-  // Set the background property.
-
-  // -------------------------------------------------------------------------
-  // borders
-  // -------------------------------------------------------------------------
-  int            box(chtype vert=0, chtype  hor=0) {
-    return ::wborder(w, vert, vert, hor, hor, 0, 0, 0, 0); }
-  // Draw a box around the window with the given vertical and horizontal
-  // drawing characters. If you specify a zero as character, curses will try
-  // to find a "nice" character.
-
-  int            border(chtype left=0, chtype right=0,
-			chtype top =0, chtype bottom=0,
-			chtype top_left =0, chtype top_right=0,
-			chtype bottom_left =0, chtype bottom_right=0) {
-    return ::wborder(w, left, right, top, bottom, top_left, top_right,
-		     bottom_left, bottom_right); }
-  // Draw a border around the window with the given characters for the
-  // various parts of the border. If you pass zero for a character, curses
-  // will try to find "nice" characters.
-
-  // -------------------------------------------------------------------------
-  // lines and boxes
-  // -------------------------------------------------------------------------
-  int            hline(int len, chtype ch=0) { return ::whline(w, ch, len); }
-  // Draw a horizontal line of len characters with the given character. If
-  // you pass zero for the character, curses will try to find a "nice" one.
-
-  int            hline(int y, int x, int len, chtype ch=0) {
-    return ::mvwhline(w, y, x, ch, len); }
-  // Move the cursor to the requested position and then draw a horizontal line.
-
-  int            vline(int len, chtype ch=0) { return ::wvline(w, ch, len); }
-  // Draw a vertical line of len characters with the given character. If
-  // you pass zero for the character, curses will try to find a "nice" one.
-
-  int            vline(int y, int x, int len, chtype ch=0) {
-    return ::mvwvline(w, y, x, ch, len); }
-  // Move the cursor to the requested position and then draw a vertical line.
-
-  // -------------------------------------------------------------------------
-  // erasure
-  // -------------------------------------------------------------------------
-  int            erase() { return ::werase(w); }
-  // Erase the window.
-
-  int            clear() { return ::wclear(w); }
-  // Clear the window.
-
-  int            clearok(bool bf) { return ::clearok(w, bf); }
-  // Set/Reset the clear flag. If set, the next refresh() will clear the
-  // screen.
-
-  int            clrtobot() { return ::wclrtobot(w); }
-  // Clear to the end of the window.
-
-  int            clrtoeol() { return ::wclrtoeol(w); }
-  // Clear to the end of the line.
-
-  int            delch() { return ::wdelch(w); }
-  // Delete character under the cursor.
-
-  int            delch(int y, int x) { return ::mvwdelch(w, y, x); }
-  // Move cursor to requested position and delete the character under the
-  // cursor.
-
-  int            deleteln() { return ::winsdelln(w, -1); }
-  // Delete the current line.
-
-  // -------------------------------------------------------------------------
-  // screen control
-  // -------------------------------------------------------------------------
-  int            scroll(int amount=1) { return ::wscrl(w, amount); }
-  // Scroll amount lines. If amount is positive, scroll up, otherwise
-  // scroll down.
-
-  int            scrollok(bool bf) { return ::scrollok(w, bf); }
-  // If bf is TRUE, window scrolls if cursor is moved off the bottom
-  // edge of the window or a scrolling region, otherwise the cursor is left
-  // at the bottom line.
-
-  int            setscrreg(int from, int to) {
-    return ::wsetscrreg(w, from, to); }
-  // Define a soft scrolling region.
-
-  int            idlok(bool bf) { return ::idlok(w, bf); }
-  // If bf is TRUE, use insert/delete line hardware support if possible.
-  // Otherwise do it in software.
-
-  void           idcok(bool bf) { ::idcok(w, bf); }
-  // If bf is TRUE, use insert/delete character hardware support if possible.
-  // Otherwise do it in software.
-
-  int            touchline(int s, int c) { return ::touchline(w, s, c); }
-  // Mark the given lines as modified.
-
-  int            touchwin()   { return ::wtouchln(w, 0, height(), 1); }
-  // Mark the whole window as modified.
-
-  int            untouchwin() { return ::wtouchln(w, 0, height(), 0); }
-  // Mark the whole window as unmodified.
-
-  int            touchln(int s, int cnt, bool changed=TRUE) {
-    return ::wtouchln(w, s, cnt, static_cast<int>(changed ? 1 : 0)); }
-  // Mark cnt lines beginning from line s as changed or unchanged, depending
-  // on the value of the changed flag.
-
-  bool           is_linetouched(int line) const {
-    return (::is_linetouched(w, line) ? TRUE:FALSE); }
-  // Return TRUE if line is marked as changed, FALSE otherwise
-
-  bool           is_wintouched() const {
-    return (::is_wintouched(w) ? TRUE:FALSE); }
-  // Return TRUE if window is marked as changed, FALSE otherwise
-
-  int            leaveok(bool bf) { return ::leaveok(w, bf); }
-  // If bf is TRUE, curses will leave the cursor after an update whereever
-  // it is after the update.
-
-  int            redrawln(int from, int n) { return ::wredrawln(w, from, n); }
-  // Redraw n lines starting from the requested line
-
-  int            redrawwin() { return ::wredrawln(w, 0, height()); }
-  // Redraw the whole window
-
-  int            doupdate()  { return ::doupdate(); }
-  // Do all outputs to make the physical screen looking like the virtual one
-
-  void           syncdown()  { ::wsyncdown(w); }
-  // Propagate the changes down to all descendant windows
-
-  void           syncup()    { ::wsyncup(w); }
-  // Propagate the changes up in the hierarchy
-
-  void           cursyncup() { ::wcursyncup(w); }
-  // Position the cursor in all ancestor windows corresponding to our setting
-
-  int            syncok(bool bf) { return ::syncok(w, bf); }
-  // If called with bf=TRUE, syncup() is called whenever the window is changed
-
-#ifndef _no_flushok
-  int            flushok(bool bf) { return ::flushok(w, bf); }
-#endif
-
-  void           immedok(bool bf) { ::immedok(w, bf); }
-  // If called with bf=TRUE, any change in the window will cause an
-  // automatic immediate refresh()
-
-  int            intrflush(bool bf) { return ::intrflush(w, bf); }
-
-  int            keypad(bool bf) { return ::keypad(w, bf); }
-  // If called with bf=TRUE, the application will interpret function keys.
-
-  int            nodelay(bool bf) { return ::nodelay(w, bf); }
-
-  int            meta(bool bf) { return ::meta(w, bf); }
-  // If called with bf=TRUE, keys may generate 8-Bit characters. Otherwise
-  // 7-Bit characters are generated.
-
-  int            standout() { return ::wstandout(w); }
-  // Enable "standout" attributes
-
-  int            standend() { return ::wstandend(w); }
-  // Disable "standout" attributes
-
-  // -------------------------------------------------------------------------
-  // The next two are virtual, because we redefine them in the
-  // NCursesPanel class.
-  // -------------------------------------------------------------------------
-  virtual int    refresh() { return ::wrefresh(w); }
-  // Propagate the changes in this window to the virtual screen and call
-  // doupdate(). This is redefined in NCursesPanel.
-
-  virtual int    noutrefresh() { return ::wnoutrefresh(w); }
-  // Propagate the changes in this window to the virtual screen. This is
-  // redefined in NCursesPanel.
-
-  // -------------------------------------------------------------------------
-  // multiple window control
-  // -------------------------------------------------------------------------
-  int            overlay(NCursesWindow& win) {
-    return ::overlay(w, win.w); }
-  // Overlay this window over win.
-
-  int            overwrite(NCursesWindow& win) {
-    return ::overwrite(w, win.w); }
-  // Overwrite win with this window.
-
-  int            copywin(NCursesWindow& win,
-			 int sminrow, int smincol,
-			 int dminrow, int dmincol,
-			 int dmaxrow, int dmaxcol, bool overlaywin=TRUE) {
-    return ::copywin(w, win.w, sminrow, smincol, dminrow, dmincol,
-		     dmaxrow, dmaxcol, static_cast<int>(overlaywin ? 1 : 0)); }
-  // Overlay or overwrite the rectangle in win given by dminrow,dmincol,
-  // dmaxrow,dmaxcol with the rectangle in this window beginning at
-  // sminrow,smincol.
-
-  // -------------------------------------------------------------------------
-  // Extended functions
-  // -------------------------------------------------------------------------
-#if defined(NCURSES_EXT_FUNCS) && (NCURSES_EXT_FUNCS != 0)
-  int            wresize(int newLines, int newColumns) {
-    return ::wresize(w, newLines, newColumns); }
-#endif
-
-  // -------------------------------------------------------------------------
-  // Mouse related
-  // -------------------------------------------------------------------------
-  bool has_mouse() const;
-  // Return TRUE if terminal supports a mouse, FALSE otherwise
-
-  // -------------------------------------------------------------------------
-  // traversal support
-  // -------------------------------------------------------------------------
-  NCursesWindow*  child() { return subwins; }
-  // Get the first child window.
-
-  NCursesWindow*  sibling() { return sib; }
-  // Get the next child of my parent.
-
-  NCursesWindow*  parent() { return par; }
-  // Get my parent.
-
-  bool isDescendant(NCursesWindow& win);
-  // Return TRUE if win is a descendant of this.
-};
-
-// -------------------------------------------------------------------------
-// We leave this here for compatibility reasons.
-// -------------------------------------------------------------------------
-class NCURSES_IMPEXP NCursesColorWindow : public NCursesWindow
-{
-public:
-  NCursesColorWindow(WINDOW* &window)   // useful only for stdscr
-    : NCursesWindow(window) {
-      useColors(); }
-
-  NCursesColorWindow(int nlines,        // number of lines
-		     int ncols,         // number of columns
-		     int begin_y,       // line origin
-		     int begin_x)       // col origin
-    : NCursesWindow(nlines, ncols, begin_y, begin_x) {
-      useColors(); }
-
-  NCursesColorWindow(NCursesWindow& parentWin,// parent window
-		     int nlines,        // number of lines
-		     int ncols,         // number of columns
-		     int begin_y,       // absolute or relative
-		     int begin_x,       //   origins:
-		     char absrel = 'a') // if `a', by & bx are
-    : NCursesWindow(parentWin,
-		    nlines, ncols,	// absolute screen pos,
-		    begin_y, begin_x,   // else if `r', they are
-		    absrel ) {          // relative to par origin
-      useColors(); }
-};
-
-// These enum definitions really belong inside the NCursesPad class, but only
-// recent compilers support that feature.
-
-  typedef enum {
-    REQ_PAD_REFRESH = KEY_MAX + 1,
-    REQ_PAD_UP,
-    REQ_PAD_DOWN,
-    REQ_PAD_LEFT,
-    REQ_PAD_RIGHT,
-    REQ_PAD_EXIT
-  } Pad_Request;
-
-  const Pad_Request PAD_LOW  = REQ_PAD_REFRESH;   // lowest  op-code
-  const Pad_Request PAD_HIGH = REQ_PAD_EXIT;      // highest op-code
-
-// -------------------------------------------------------------------------
-// Pad Support. We allow an association of a pad with a "real" window
-// through which the pad may be viewed.
-// -------------------------------------------------------------------------
-class NCURSES_IMPEXP NCursesPad : public NCursesWindow
-{
-private:
-  NCursesWindow* viewWin;       // the "viewport" window
-  NCursesWindow* viewSub;       // the "viewport" subwindow
-
-  int h_gridsize, v_gridsize;
-
-protected:
-  int min_row, min_col;         // top left row/col of the pads display area
-
-  NCursesWindow* Win(void) const {
-    // Get the window into which the pad should be copied (if any)
-    return (viewSub?viewSub:(viewWin?viewWin:0));
-  }
-
-  NCursesWindow* getWindow(void) const {
-    return viewWin;
-  }
-
-  NCursesWindow* getSubWindow(void) const {
-    return viewSub;
-  }
-
-  virtual int driver (int key);      // Virtualize keystroke key
-  // The driver translates the keystroke c into an Pad_Request
-
-  virtual void OnUnknownOperation(int pad_req) {
-    (void) pad_req;
-    ::beep();
-  }
-  // This is called if the driver returns an unknown op-code
-
-  virtual void OnNavigationError(int pad_req) {
-    (void) pad_req;
-    ::beep();
-  }
-  // This is called if a navigation request couldn't be satisfied
-
-  virtual void OnOperation(int pad_req) {
-    (void) pad_req;
-  };
-  // OnOperation is called if a Pad_Operation was executed and just before
-  // the refresh() operation is done.
-
-public:
-  NCursesPad(int nlines, int ncols);
-  // create a pad with the given size
-
-  NCursesPad& operator=(const NCursesPad& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      NCursesWindow::operator=(rhs);
-    }
-    return *this;
-  }
-
-  NCursesPad(const NCursesPad& rhs)
-    : NCursesWindow(rhs),
-      viewWin(rhs.viewWin),
-      viewSub(rhs.viewSub),
-      h_gridsize(rhs.h_gridsize),
-      v_gridsize(rhs.v_gridsize),
-      min_row(rhs.min_row),
-      min_col(rhs.min_col)
-  {
-  }
-
-  virtual ~NCursesPad() {}
-
-  int echochar(const chtype ch) { return ::pechochar(w, ch); }
-  // Put the attributed character onto the pad and immediately do a
-  // prefresh().
-
-  int refresh();
-  // If a viewport is defined the pad is displayed in this window, otherwise
-  // this is a noop.
-
-  int refresh(int pminrow, int pmincol,
-	      int sminrow, int smincol,
-	      int smaxrow, int smaxcol) {
-    return ::prefresh(w, pminrow, pmincol,
-		      sminrow, smincol, smaxrow, smaxcol);
-  }
-  // The coordinates sminrow,smincol,smaxrow,smaxcol describe a rectangle
-  // on the screen. <b>refresh</b> copies a rectangle of this size beginning
-  // with top left corner pminrow,pmincol onto the screen and calls doupdate().
-
-  int noutrefresh();
-  // If a viewport is defined the pad is displayed in this window, otherwise
-  // this is a noop.
-
-  int noutrefresh(int pminrow, int pmincol,
-		  int sminrow, int smincol,
-		  int smaxrow, int smaxcol) {
-    return ::pnoutrefresh(w, pminrow, pmincol,
-			  sminrow, smincol, smaxrow, smaxcol);
-  }
-  // Does the same as refresh() but without calling doupdate().
-
-  virtual void setWindow(NCursesWindow& view, int v_grid = 1, int h_grid = 1);
-  // Add the window "view" as viewing window to the pad.
-
-  virtual void setSubWindow(NCursesWindow& sub);
-  // Use the subwindow "sub" of the viewport window for the actual viewing.
-  // The full viewport window is usually used to provide some decorations
-  // like frames, titles etc.
-
-  virtual void operator() (void);
-  // Perform Pad's operation
-};
-
-// A FramedPad is constructed always with a viewport window. This viewport
-// will be framed (by a box() command) and the interior of the box is the
-// viewport subwindow. On the frame we display scrollbar sliders.
-class NCURSES_IMPEXP NCursesFramedPad : public NCursesPad
-{
-protected:
-  virtual void OnOperation(int pad_req);
-
-public:
-  NCursesFramedPad(NCursesWindow& win, int nlines, int ncols,
-		   int v_grid = 1, int h_grid = 1)
-    : NCursesPad(nlines, ncols) {
-    NCursesPad::setWindow(win, v_grid, h_grid);
-    NCursesPad::setSubWindow(*(new NCursesWindow(win)));
-  }
-  // Construct the FramedPad with the given Window win as viewport.
-
-  virtual ~NCursesFramedPad() {
-    delete getSubWindow();
-  }
-
-  void setWindow(NCursesWindow& view, int v_grid = 1, int h_grid = 1) {
-    (void) view;
-    (void) v_grid;
-    (void) h_grid;
-    err_handler("Operation not allowed");
-  }
-  // Disable this call; the viewport is already defined
-
-  void setSubWindow(NCursesWindow& sub) {
-    (void) sub;
-    err_handler("Operation not allowed");
-  }
-  // Disable this call; the viewport subwindow is already defined
-
-};
-
-#endif /* NCURSES_CURSESW_H_incl */
diff --git a/openflow/usr/include/ncursesw/cursslk.h b/openflow/usr/include/ncursesw/cursslk.h
deleted file mode 100644
index d42c152..0000000
--- a/openflow/usr/include/ncursesw/cursslk.h
+++ /dev/null
@@ -1,238 +0,0 @@
-// * this is for making emacs happy: -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-// $Id: cursslk.h,v 1.13 2005/05/28 21:58:18 tom Exp $
-
-#ifndef NCURSES_CURSSLK_H_incl
-#define NCURSES_CURSSLK_H_incl
-
-#include <ncursesw/cursesw.h>
-
-class NCURSES_IMPEXP Soft_Label_Key_Set {
-public:
-  // This inner class represents the attributes of a Soft Label Key (SLK)
-  class NCURSES_IMPEXP Soft_Label_Key {
-    friend class Soft_Label_Key_Set;
-  public:
-    typedef enum { Left=0, Center=1, Right=2 } Justification;
-
-  private:
-    char *label;           // The Text of the Label
-    Justification format;  // The Justification
-    int num;               // The number of the Label
-
-    Soft_Label_Key() : label(NULL), format(Left), num(-1) {
-    }
-
-    virtual ~Soft_Label_Key() {
-      delete[] label;
-    };
-
-  public:
-    // Set the text of the Label
-    Soft_Label_Key& operator=(char *text);
-
-    // Set the Justification of the Label
-    Soft_Label_Key& operator=(Justification just) {
-      format = just;
-      return *this;
-    }
-
-    // Retrieve the text of the label
-    inline char* operator()(void) const {
-      return label;
-    }
-
-    Soft_Label_Key& operator=(const Soft_Label_Key& rhs)
-    {
-      if (this != &rhs) {
-        *this = rhs;
-      }
-      return *this;
-    }
-
-    Soft_Label_Key(const Soft_Label_Key& rhs)
-      : label(NULL),
-        format(rhs.format),
-        num(rhs.num)
-    {
-      *this = rhs.label;
-    }
-  };
-
-public:
-  typedef enum {
-    None                = -1,
-    Three_Two_Three     = 0,
-    Four_Four           = 1,
-    PC_Style            = 2,
-    PC_Style_With_Index = 3
-  } Label_Layout;
-
-private:
-  static long NCURSES_IMPEXP count;               // Number of Key Sets
-  static Label_Layout NCURSES_IMPEXP  format;     // Layout of the Key Sets
-  static int  NCURSES_IMPEXP num_labels;          // Number Of Labels in Key Sets
-  bool NCURSES_IMPEXP b_attrInit;                 // Are attributes initialized
-
-  Soft_Label_Key *slk_array;       // The array of SLK's
-
-  // Init the Key Set
-  void init();
-
-  // Activate or Deactivate Label# i, Label counting starts with 1!
-  void activate_label(int i, bool bf=TRUE);
-
-  // Activate of Deactivate all Labels
-  void activate_labels(bool bf);
-
-protected:
-  inline void Error (const char* msg) const THROWS(NCursesException) {
-    THROW(new NCursesException (msg));
-  }
-
-  // Remove SLK's from screen
-  void clear() {
-    if (ERR==::slk_clear())
-      Error("slk_clear");
-  }
-
-  // Restore them
-  void restore() {
-    if (ERR==::slk_restore())
-      Error("slk_restore");
-  }
-
-public:
-
-  // Construct a Key Set, use the most comfortable layout as default.
-  // You must create a Soft_Label_Key_Set before you create any object of
-  // the NCursesWindow, NCursesPanel or derived classes. (Actually before
-  // ::initscr() is called).
-  Soft_Label_Key_Set(Label_Layout fmt);
-
-  // This constructor assumes, that you already constructed a Key Set
-  // with a layout by the constructor above. This layout will be reused.
-  NCURSES_IMPEXP Soft_Label_Key_Set();
-
-  Soft_Label_Key_Set& operator=(const Soft_Label_Key_Set& rhs)
-  {
-    if (this != &rhs) {
-      *this = rhs;
-      init();		// allocate a new slk_array[]
-    }
-    return *this;
-  }
-
-  Soft_Label_Key_Set(const Soft_Label_Key_Set& rhs)
-    : b_attrInit(rhs.b_attrInit),
-      slk_array(NULL)
-  {
-    init();		// allocate a new slk_array[]
-  }
-
-  virtual ~Soft_Label_Key_Set();
-
-  // Get Label# i. Label counting starts with 1!
-  NCURSES_IMPEXP Soft_Label_Key& operator[](int i);
-
-  // Retrieve number of Labels
-  inline int labels() const { return num_labels; }
-
-  // Refresh the SLK portion of the screen
-  inline void refresh() {
-    if (ERR==::slk_refresh())
-      Error("slk_refresh");
-  }
-
-  // Mark the SLK portion of the screen for refresh, defer actual refresh
-  // until next update call.
-  inline void noutrefresh() {
-    if (ERR==::slk_noutrefresh())
-      Error("slk_noutrefresh");
-  }
-
-  // Mark the whole SLK portion of the screen as modified
-  inline void touch() {
-    if (ERR==::slk_touch())
-      Error("slk_touch");
-  }
-
-  // Activate Label# i
-  inline void show(int i) {
-    activate_label(i,FALSE);
-    activate_label(i,TRUE);
-  }
-
-  // Hide Label# i
-  inline void hide(int i) {
-    activate_label(i,FALSE);
-  }
-
-  // Show all Labels
-  inline void show() {
-    activate_labels(FALSE);
-    activate_labels(TRUE);
-  }
-
-  // Hide all Labels
-  inline void hide() {
-    activate_labels(FALSE);
-  }
-
-  inline void attron(attr_t attrs) {
-    if (ERR==::slk_attron(attrs))
-      Error("slk_attron");
-  }
-
-  inline void attroff(attr_t attrs) {
-    if (ERR==::slk_attroff(attrs))
-      Error("slk_attroff");
-  }
-
-  inline void attrset(attr_t attrs) {
-    if (ERR==::slk_attrset(attrs))
-      Error("slk_attrset");
-  }
-
-  inline void color(short color_pair_number) {
-    if (ERR==::slk_color(color_pair_number))
-      Error("slk_color");
-  }
-
-  inline attr_t attr() const {
-    return ::slk_attr();
-  }
-};
-
-#endif /* NCURSES_CURSSLK_H_incl */
diff --git a/openflow/usr/include/ncursesw/eti.h b/openflow/usr/include/ncursesw/eti.h
deleted file mode 100644
index baa6190..0000000
--- a/openflow/usr/include/ncursesw/eti.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author:  Juergen Pfeifer, 1995,1997                                    *
- ****************************************************************************/
-
-/* $Id: eti.h,v 1.8 2003/10/25 15:24:29 tom Exp $ */
-
-#ifndef NCURSES_ETI_H_incl
-#define NCURSES_ETI_H_incl 1
-
-#define	E_OK			(0)
-#define	E_SYSTEM_ERROR	 	(-1)
-#define	E_BAD_ARGUMENT	 	(-2)
-#define	E_POSTED	 	(-3)
-#define	E_CONNECTED	 	(-4)
-#define	E_BAD_STATE	 	(-5)
-#define	E_NO_ROOM	 	(-6)
-#define	E_NOT_POSTED		(-7)
-#define	E_UNKNOWN_COMMAND	(-8)
-#define	E_NO_MATCH		(-9)
-#define	E_NOT_SELECTABLE	(-10)
-#define	E_NOT_CONNECTED	        (-11)
-#define	E_REQUEST_DENIED	(-12)
-#define	E_INVALID_FIELD	        (-13)
-#define	E_CURRENT		(-14)
-
-#endif
diff --git a/openflow/usr/include/ncursesw/etip.h b/openflow/usr/include/ncursesw/etip.h
deleted file mode 100644
index 7a5cfb7..0000000
--- a/openflow/usr/include/ncursesw/etip.h
+++ /dev/null
@@ -1,380 +0,0 @@
-// * This makes emacs happy -*-Mode: C++;-*-
-/****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author: Juergen Pfeifer, 1997                                          *
- ****************************************************************************/
-
-// $Id: etip.h.in,v 1.39 2012/12/29 21:50:44 tom Exp $
-
-#ifndef NCURSES_ETIP_H_incl
-#define NCURSES_ETIP_H_incl 1
-
-// These are substituted at configure/build time
-#ifndef HAVE_BUILTIN_H
-#define HAVE_BUILTIN_H 0
-#endif
-
-#ifndef HAVE_GXX_BUILTIN_H
-#define HAVE_GXX_BUILTIN_H 0
-#endif
-
-#ifndef HAVE_GPP_BUILTIN_H
-#define HAVE_GPP_BUILTIN_H 0
-#endif
-
-#ifndef HAVE_IOSTREAM
-#define HAVE_IOSTREAM 1
-#endif
-
-#ifndef HAVE_TYPEINFO
-#define HAVE_TYPEINFO 1
-#endif
-
-#ifndef HAVE_VALUES_H
-#define HAVE_VALUES_H 0
-#endif
-
-#ifndef ETIP_NEEDS_MATH_H
-#define ETIP_NEEDS_MATH_H 0
-#endif
-
-#ifndef ETIP_NEEDS_MATH_EXCEPTION
-#define ETIP_NEEDS_MATH_EXCEPTION 0
-#endif
-
-#ifndef CPP_HAS_PARAM_INIT
-#define CPP_HAS_PARAM_INIT 0
-#endif
-
-#ifndef CPP_HAS_STATIC_CAST
-#define CPP_HAS_STATIC_CAST 1
-#endif
-
-#ifndef IOSTREAM_NAMESPACE
-#define IOSTREAM_NAMESPACE 1
-#endif
-
-#ifdef __GNUG__
-#  if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8))
-#    if HAVE_TYPEINFO
-#      include <typeinfo>
-#    endif
-#  endif
-#endif
-
-#if defined(__GNUG__)
-#  if HAVE_BUILTIN_H || HAVE_GXX_BUILTIN_H || HAVE_GPP_BUILTIN_H
-#    if ETIP_NEEDS_MATH_H
-#      if ETIP_NEEDS_MATH_EXCEPTION
-#        undef exception
-#        define exception math_exception
-#      endif
-#      include <math.h>
-#    endif
-#    undef exception
-#    define exception builtin_exception
-#    if HAVE_GPP_BUILTIN_H
-#     include <gpp/builtin.h>
-#    elif HAVE_GXX_BUILTIN_H
-#     include <g++/builtin.h>
-#    else
-#     include <builtin.h>
-#    endif
-#    undef exception
-#  endif
-#elif defined (__SUNPRO_CC)
-#  include <generic.h>
-#endif
-
-#include <ncursesw/ncurses_dll.h>
-
-extern "C" {
-#if HAVE_VALUES_H
-#  include <values.h>
-#endif
-
-#include <assert.h>
-#include <ncursesw/eti.h>
-#include <errno.h>
-}
-
-// Language features
-#if CPP_HAS_PARAM_INIT
-#define NCURSES_PARAM_INIT(value) = value
-#else
-#define NCURSES_PARAM_INIT(value) /*nothing*/
-#endif
-
-#if CPP_HAS_STATIC_CAST
-#define STATIC_CAST(s) static_cast<s>
-#else
-#define STATIC_CAST(s) (s)
-#endif
-
-// Forward Declarations
-class NCURSES_IMPEXP NCursesPanel;
-class NCURSES_IMPEXP NCursesMenu;
-class NCURSES_IMPEXP NCursesForm;
-
-class NCURSES_IMPEXP NCursesException
-{
-public:
-  const char *message;
-  int errorno;
-
-  NCursesException (const char* msg, int err)
-    : message(msg), errorno (err)
-    {};
-
-  NCursesException (const char* msg)
-    : message(msg), errorno (E_SYSTEM_ERROR)
-    {};
-
-  NCursesException& operator=(const NCursesException& rhs)
-  {
-    errorno = rhs.errorno;
-    return *this;
-  }
-
-  NCursesException(const NCursesException& rhs)
-    : message(rhs.message), errorno(rhs.errorno)
-  {
-  }
-
-  virtual const char *classname() const {
-    return "NCursesWindow";
-  }
-
-  virtual ~NCursesException()
-  {
-  }
-};
-
-class NCURSES_IMPEXP NCursesPanelException : public NCursesException
-{
-public:
-  const NCursesPanel* p;
-
-  NCursesPanelException (const char *msg, int err) :
-    NCursesException (msg, err),
-    p (0)
-    {};
-
-  NCursesPanelException (const NCursesPanel* panel,
-			 const char *msg,
-			 int err) :
-    NCursesException (msg, err),
-    p (panel)
-    {};
-
-  NCursesPanelException (int err) :
-    NCursesException ("panel library error", err),
-    p (0)
-    {};
-
-  NCursesPanelException (const NCursesPanel* panel,
-			 int err) :
-    NCursesException ("panel library error", err),
-    p (panel)
-    {};
-
-  NCursesPanelException& operator=(const NCursesPanelException& rhs)
-  {
-    if (this != &rhs) {
-      NCursesException::operator=(rhs);
-      p = rhs.p;
-    }
-    return *this;
-  }
-
-  NCursesPanelException(const NCursesPanelException& rhs)
-    : NCursesException(rhs), p(rhs.p)
-  {
-  }
-
-  virtual const char *classname() const {
-    return "NCursesPanel";
-  }
-
-  virtual ~NCursesPanelException()
-  {
-  }
-};
-
-class NCURSES_IMPEXP NCursesMenuException : public NCursesException
-{
-public:
-  const NCursesMenu* m;
-
-  NCursesMenuException (const char *msg, int err) :
-    NCursesException (msg, err),
-    m (0)
-    {};
-
-  NCursesMenuException (const NCursesMenu* menu,
-			const char *msg,
-			int err) :
-    NCursesException (msg, err),
-    m (menu)
-    {};
-
-  NCursesMenuException (int err) :
-    NCursesException ("menu library error", err),
-    m (0)
-    {};
-
-  NCursesMenuException (const NCursesMenu* menu,
-			int err) :
-    NCursesException ("menu library error", err),
-    m (menu)
-    {};
-
-  NCursesMenuException& operator=(const NCursesMenuException& rhs)
-  {
-    if (this != &rhs) {
-      NCursesException::operator=(rhs);
-      m = rhs.m;
-    }
-    return *this;
-  }
-
-  NCursesMenuException(const NCursesMenuException& rhs)
-    : NCursesException(rhs), m(rhs.m)
-  {
-  }
-
-  virtual const char *classname() const {
-    return "NCursesMenu";
-  }
-
-  virtual ~NCursesMenuException()
-  {
-  }
-};
-
-class NCURSES_IMPEXP NCursesFormException : public NCursesException
-{
-public:
-  const NCursesForm* f;
-
-  NCursesFormException (const char *msg, int err) :
-    NCursesException (msg, err),
-    f (0)
-    {};
-
-  NCursesFormException (const NCursesForm* form,
-			const char *msg,
-			int err) :
-    NCursesException (msg, err),
-    f (form)
-    {};
-
-  NCursesFormException (int err) :
-    NCursesException ("form library error", err),
-    f (0)
-    {};
-
-  NCursesFormException (const NCursesForm* form,
-			int err) :
-    NCursesException ("form library error", err),
-    f (form)
-    {};
-
-  NCursesFormException& operator=(const NCursesFormException& rhs)
-  {
-    if (this != &rhs) {
-      NCursesException::operator=(rhs);
-      f = rhs.f;
-    }
-    return *this;
-  }
-
-  NCursesFormException(const NCursesFormException& rhs)
-    : NCursesException(rhs), f(rhs.f)
-  {
-  }
-
-  virtual const char *classname() const {
-    return "NCursesForm";
-  }
-
-  virtual ~NCursesFormException()
-  {
-  }
-};
-
-#if !((defined(__GNUG__) && defined(__EXCEPTIONS)) || defined(__SUNPRO_CC))
-#  if HAVE_IOSTREAM
-#     include <iostream>
-#     if IOSTREAM_NAMESPACE
-using std::cerr;
-using std::endl;
-#     endif
-#  else
-#     include <iostream.h>
-#  endif
-   extern "C" void exit(int);
-#endif
-
-inline void THROW(const NCursesException *e) {
-#if defined(__GNUG__) && defined(__EXCEPTIONS)
-#  if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8))
-      (*lib_error_handler)(e ? e->classname() : "", e ? e->message : "");
-#else
-#define CPP_HAS_TRY_CATCH 1
-#endif
-#elif defined(__SUNPRO_CC)
-#  if !defined(__SUNPRO_CC_COMPAT) || (__SUNPRO_CC_COMPAT < 5)
-  genericerror(1, ((e != 0) ? (char *)(e->message) : ""));
-#else
-#define CPP_HAS_TRY_CATCH 1
-#endif
-#else
-  if (e)
-    cerr << e->message << endl;
-  exit(0);
-#endif
-
-#ifndef CPP_HAS_TRY_CATCH
-#define CPP_HAS_TRY_CATCH 0
-#define NCURSES_CPP_TRY		/* nothing */
-#define NCURSES_CPP_CATCH(e)	if (false)
-#define THROWS(s)		/* nothing */
-#define THROW2(s,t)		/* nothing */
-#elif CPP_HAS_TRY_CATCH
-  throw *e;
-#define NCURSES_CPP_TRY		try
-#define NCURSES_CPP_CATCH(e)	catch(e)
-#define THROWS(s)		throw(s)
-#define THROW2(s,t)		throw(s,t)
-#endif
-}
-
-#endif /* NCURSES_ETIP_H_incl */
diff --git a/openflow/usr/include/ncursesw/form.h b/openflow/usr/include/ncursesw/form.h
deleted file mode 100644
index e1eb90e..0000000
--- a/openflow/usr/include/ncursesw/form.h
+++ /dev/null
@@ -1,429 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author:  Juergen Pfeifer, 1995,1997                                    *
- ****************************************************************************/
-
-/* $Id: form.h,v 0.25 2015/11/28 20:13:39 Leon.Winter Exp $ */
-
-#ifndef FORM_H
-#define FORM_H
-/* *INDENT-OFF*/
-
-#include <ncursesw/curses.h>
-#include <ncursesw/eti.h>
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
-#ifndef FORM_PRIV_H
-typedef void *FIELD_CELL;
-#endif
-
-#ifndef NCURSES_FIELD_INTERNALS
-#define NCURSES_FIELD_INTERNALS /* nothing */
-#endif
-
-typedef int Form_Options;
-typedef int Field_Options;
-
-	/**********
-	*  _PAGE  *
-	**********/
-
-typedef struct {
-  short pmin;		/* index of first field on page			*/
-  short pmax;		/* index of last field on page			*/
-  short smin;		/* index of top leftmost field on page		*/
-  short smax;		/* index of bottom rightmost field on page	*/
-} _PAGE;
-
-	/**********
-	*  FIELD  *
-	**********/
-
-typedef struct fieldnode {
-  unsigned short	status;		/* flags			*/
-  short			rows;		/* size in rows			*/
-  short			cols;		/* size in cols			*/
-  short			frow;		/* first row			*/
-  short			fcol;		/* first col			*/
-  int			drows;		/* dynamic rows			*/
-  int			dcols;		/* dynamic cols			*/
-  int			maxgrow;	/* maximum field growth		*/
-  int			nrow;		/* off-screen rows		*/
-  short			nbuf;		/* additional buffers		*/
-  short			just;		/* justification		*/
-  short			page;		/* page on form			*/
-  short			index;		/* into form -> field		*/
-  int			pad;		/* pad character		*/
-  chtype		fore;		/* foreground attribute		*/
-  chtype		back;		/* background attribute		*/
-  Field_Options		opts;		/* options			*/
-  struct fieldnode *	snext;		/* sorted order pointer		*/
-  struct fieldnode *	sprev;		/* sorted order pointer		*/
-  struct fieldnode *	link;		/* linked field chain		*/
-  struct formnode *	form;		/* containing form		*/
-  struct typenode *	type;		/* field type			*/
-  void *		arg;		/* argument for type		*/
-  FIELD_CELL *		buf;		/* field buffers		*/
-  void *		usrptr;		/* user pointer			*/
-  /*
-   * The wide-character configuration requires extra information.  Because
-   * there are existing applications that manipulate the members of FIELD
-   * directly, we cannot make the struct opaque.  Offsets of members up to
-   * this point are the same in the narrow- and wide-character configuration.
-   * But note that the type of buf depends on the configuration, and is made
-   * opaque for that reason.
-   */
-  NCURSES_FIELD_INTERNALS
-} FIELD;
-
-
-	/*********
-	*  FORM  *
-	*********/
-
-typedef struct formnode {
-  unsigned short	status;	  	/* flags			*/
-  short			rows;		/* size in rows			*/
-  short			cols;		/* size in cols			*/
-  int			currow;		/* current row in field window	*/
-  int			curcol;		/* current col in field window	*/
-  int			toprow;		/* in scrollable field window	*/
-  int			begincol;	/* in horiz. scrollable field	*/
-  short			maxfield;	/* number of fields		*/
-  short			maxpage;	/* number of pages		*/
-  short			curpage;	/* index into page		*/
-  Form_Options		opts;		/* options			*/
-  WINDOW *		win;		/* window			*/
-  WINDOW *		sub;		/* subwindow			*/
-  WINDOW *		w;		/* window for current field	*/
-  FIELD **		field;		/* field [maxfield]		*/
-  FIELD *		current;	/* current field		*/
-  _PAGE *		page;		/* page [maxpage]		*/
-  void *		usrptr;		/* user pointer			*/
-
-  void			(*forminit)(struct formnode *);
-  void			(*formterm)(struct formnode *);
-  void			(*fieldinit)(struct formnode *);
-  void			(*fieldterm)(struct formnode *);
-
-} FORM;
-
-
-	/**************
-	*  FIELDTYPE  *
-	**************/
-
-typedef struct typenode {
-  unsigned short	status;			/* flags		    */
-  long			ref;			/* reference count	    */
-  struct typenode *	left;			/* ptr to operand for |     */
-  struct typenode *	right;			/* ptr to operand for |     */
-
-  void* (*makearg)(va_list *);			/* make fieldtype arg	    */
-  void* (*copyarg)(const void *);		/* copy fieldtype arg 	    */
-  void	(*freearg)(void *);			/* free fieldtype arg	    */
-
-#if NCURSES_INTEROP_FUNCS
-  union {
-    bool (*ofcheck)(FIELD *,const void *);	/* field validation	    */
-    bool (*gfcheck)(FORM*,FIELD *,const void*);	/* generic field validation */
-  } fieldcheck;
-  union {
-    bool (*occheck)(int,const void *);		/* character validation     */
-    bool (*gccheck)(int,FORM*,
-		    FIELD*,const void*);        /* generic char validation  */
-  } charcheck;
-  union {
-    bool (*onext)(FIELD *,const void *);        /* enumerate next value     */
-    bool (*gnext)(FORM*,FIELD*,const void*);    /* generic enumerate next   */
-  } enum_next;
-  union {
-    bool (*oprev)(FIELD *,const void *);	/* enumerate prev value     */
-    bool (*gprev)(FORM*,FIELD*,const void*);    /* generic enumerate prev   */
-  } enum_prev;
-  void* (*genericarg)(void*);                   /* Alternate Arg method     */
-#else
-  bool	(*fcheck)(FIELD *,const void *);	/* field validation	*/
-  bool	(*ccheck)(int,const void *);		/* character validation */
-
-  bool	(*next)(FIELD *,const void *);		/* enumerate next value */
-  bool	(*prev)(FIELD *,const void *);		/* enumerate prev value */
-#endif
-} FIELDTYPE;
-
-typedef void (*Form_Hook)(FORM *);
-
-	/***************************
-	*  miscellaneous #defines  *
-	***************************/
-
-/* field justification */
-#define NO_JUSTIFICATION	(0)
-#define JUSTIFY_LEFT		(1)
-#define JUSTIFY_CENTER		(2)
-#define JUSTIFY_RIGHT		(3)
-
-/* field options */
-#define O_VISIBLE		(0x0001U)
-#define O_ACTIVE		(0x0002U)
-#define O_PUBLIC		(0x0004U)
-#define O_EDIT			(0x0008U)
-#define O_WRAP			(0x0010U)
-#define O_BLANK			(0x0020U)
-#define O_AUTOSKIP		(0x0040U)
-#define O_NULLOK		(0x0080U)
-#define O_PASSOK		(0x0100U)
-#define O_STATIC		(0x0200U)
-#define O_DYNAMIC_JUSTIFY	(0x0400U)	/* ncurses extension	*/
-#define O_NO_LEFT_STRIP		(0x0800U)	/* ncurses extension	*/
-
-/* form options */
-#define O_NL_OVERLOAD		(0x0001U)
-#define O_BS_OVERLOAD		(0x0002U)
-
-/* form driver commands */
-#define REQ_NEXT_PAGE	 (KEY_MAX + 1)	/* move to next page		*/
-#define REQ_PREV_PAGE	 (KEY_MAX + 2)	/* move to previous page	*/
-#define REQ_FIRST_PAGE	 (KEY_MAX + 3)	/* move to first page		*/
-#define REQ_LAST_PAGE	 (KEY_MAX + 4)	/* move to last page		*/
-
-#define REQ_NEXT_FIELD	 (KEY_MAX + 5)	/* move to next field		*/
-#define REQ_PREV_FIELD	 (KEY_MAX + 6)	/* move to previous field	*/
-#define REQ_FIRST_FIELD	 (KEY_MAX + 7)	/* move to first field		*/
-#define REQ_LAST_FIELD	 (KEY_MAX + 8)	/* move to last field		*/
-#define REQ_SNEXT_FIELD	 (KEY_MAX + 9)	/* move to sorted next field	*/
-#define REQ_SPREV_FIELD	 (KEY_MAX + 10)	/* move to sorted prev field	*/
-#define REQ_SFIRST_FIELD (KEY_MAX + 11)	/* move to sorted first field	*/
-#define REQ_SLAST_FIELD	 (KEY_MAX + 12)	/* move to sorted last field	*/
-#define REQ_LEFT_FIELD	 (KEY_MAX + 13)	/* move to left to field	*/
-#define REQ_RIGHT_FIELD	 (KEY_MAX + 14)	/* move to right to field	*/
-#define REQ_UP_FIELD	 (KEY_MAX + 15)	/* move to up to field		*/
-#define REQ_DOWN_FIELD	 (KEY_MAX + 16)	/* move to down to field	*/
-
-#define REQ_NEXT_CHAR	 (KEY_MAX + 17)	/* move to next char in field	*/
-#define REQ_PREV_CHAR	 (KEY_MAX + 18)	/* move to prev char in field	*/
-#define REQ_NEXT_LINE	 (KEY_MAX + 19)	/* move to next line in field	*/
-#define REQ_PREV_LINE	 (KEY_MAX + 20)	/* move to prev line in field	*/
-#define REQ_NEXT_WORD	 (KEY_MAX + 21)	/* move to next word in field	*/
-#define REQ_PREV_WORD	 (KEY_MAX + 22)	/* move to prev word in field	*/
-#define REQ_BEG_FIELD	 (KEY_MAX + 23)	/* move to first char in field	*/
-#define REQ_END_FIELD	 (KEY_MAX + 24)	/* move after last char in fld	*/
-#define REQ_BEG_LINE	 (KEY_MAX + 25)	/* move to beginning of line	*/
-#define REQ_END_LINE	 (KEY_MAX + 26)	/* move after last char in line	*/
-#define REQ_LEFT_CHAR	 (KEY_MAX + 27)	/* move left in field		*/
-#define REQ_RIGHT_CHAR	 (KEY_MAX + 28)	/* move right in field		*/
-#define REQ_UP_CHAR	 (KEY_MAX + 29)	/* move up in field		*/
-#define REQ_DOWN_CHAR	 (KEY_MAX + 30)	/* move down in field		*/
-
-#define REQ_NEW_LINE	 (KEY_MAX + 31)	/* insert/overlay new line	*/
-#define REQ_INS_CHAR	 (KEY_MAX + 32)	/* insert blank char at cursor	*/
-#define REQ_INS_LINE	 (KEY_MAX + 33)	/* insert blank line at cursor	*/
-#define REQ_DEL_CHAR	 (KEY_MAX + 34)	/* delete char at cursor	*/
-#define REQ_DEL_PREV	 (KEY_MAX + 35)	/* delete char before cursor	*/
-#define REQ_DEL_LINE	 (KEY_MAX + 36)	/* delete line at cursor	*/
-#define REQ_DEL_WORD	 (KEY_MAX + 37)	/* delete word at cursor	*/
-#define REQ_CLR_EOL	 (KEY_MAX + 38)	/* clear to end of line		*/
-#define REQ_CLR_EOF	 (KEY_MAX + 39)	/* clear to end of field	*/
-#define REQ_CLR_FIELD	 (KEY_MAX + 40)	/* clear entire field		*/
-#define REQ_OVL_MODE	 (KEY_MAX + 41)	/* begin overlay mode		*/
-#define REQ_INS_MODE	 (KEY_MAX + 42)	/* begin insert mode		*/
-#define REQ_SCR_FLINE	 (KEY_MAX + 43)	/* scroll field forward a line	*/
-#define REQ_SCR_BLINE	 (KEY_MAX + 44)	/* scroll field backward a line	*/
-#define REQ_SCR_FPAGE	 (KEY_MAX + 45)	/* scroll field forward a page	*/
-#define REQ_SCR_BPAGE	 (KEY_MAX + 46)	/* scroll field backward a page	*/
-#define REQ_SCR_FHPAGE	 (KEY_MAX + 47) /* scroll field forward	 half page */
-#define REQ_SCR_BHPAGE	 (KEY_MAX + 48) /* scroll field backward half page */
-#define REQ_SCR_FCHAR	 (KEY_MAX + 49) /* horizontal scroll char	*/
-#define REQ_SCR_BCHAR	 (KEY_MAX + 50) /* horizontal scroll char	*/
-#define REQ_SCR_HFLINE	 (KEY_MAX + 51) /* horizontal scroll line	*/
-#define REQ_SCR_HBLINE	 (KEY_MAX + 52) /* horizontal scroll line	*/
-#define REQ_SCR_HFHALF	 (KEY_MAX + 53) /* horizontal scroll half line	*/
-#define REQ_SCR_HBHALF	 (KEY_MAX + 54) /* horizontal scroll half line	*/
-
-#define REQ_VALIDATION	 (KEY_MAX + 55)	/* validate field		*/
-#define REQ_NEXT_CHOICE	 (KEY_MAX + 56)	/* display next field choice	*/
-#define REQ_PREV_CHOICE	 (KEY_MAX + 57)	/* display prev field choice	*/
-
-#define MIN_FORM_COMMAND (KEY_MAX + 1)	/* used by form_driver		*/
-#define MAX_FORM_COMMAND (KEY_MAX + 57)	/* used by form_driver		*/
-
-#if defined(MAX_COMMAND)
-#  if (MAX_FORM_COMMAND > MAX_COMMAND)
-#    error Something is wrong -- MAX_FORM_COMMAND is greater than MAX_COMMAND
-#  elif (MAX_COMMAND != (KEY_MAX + 128))
-#    error Something is wrong -- MAX_COMMAND is already inconsistently defined.
-#  endif
-#else
-#  define MAX_COMMAND (KEY_MAX + 128)
-#endif
-
-	/*************************
-	*  standard field types  *
-	*************************/
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ALPHA;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ALNUM;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ENUM;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_INTEGER;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_NUMERIC;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_REGEXP;
-
-	/************************************
-	*  built-in additional field types  *
-	*  They are not defined in SVr4     *
-	************************************/
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_IPV4;      /* Internet IP Version 4 address */
-
-	/***********************
-	*  FIELDTYPE routines  *
-	***********************/
-extern NCURSES_EXPORT(FIELDTYPE *) new_fieldtype (
-		    bool (* const field_check)(FIELD *,const void *),
-		    bool (* const char_check)(int,const void *));
-extern NCURSES_EXPORT(FIELDTYPE *) link_fieldtype(
-		    FIELDTYPE *, FIELDTYPE *);
-
-extern NCURSES_EXPORT(int)	free_fieldtype (FIELDTYPE *);
-extern NCURSES_EXPORT(int)	set_fieldtype_arg (FIELDTYPE *,
-		    void * (* const make_arg)(va_list *),
-		    void * (* const copy_arg)(const void *),
-		    void (* const free_arg)(void *));
-extern NCURSES_EXPORT(int)	 set_fieldtype_choice (FIELDTYPE *,
-		    bool (* const next_choice)(FIELD *,const void *),
-	      	    bool (* const prev_choice)(FIELD *,const void *));
-
-	/*******************
-	*  FIELD routines  *
-	*******************/
-extern NCURSES_EXPORT(FIELD *)	new_field (int,int,int,int,int,int);
-extern NCURSES_EXPORT(FIELD *)	dup_field (FIELD *,int,int);
-extern NCURSES_EXPORT(FIELD *)	link_field (FIELD *,int,int);
-
-extern NCURSES_EXPORT(int)	free_field (FIELD *);
-extern NCURSES_EXPORT(int)	field_info (const FIELD *,int *,int *,int *,int *,int *,int *);
-extern NCURSES_EXPORT(int)	dynamic_field_info (const FIELD *,int *,int *,int *);
-extern NCURSES_EXPORT(int)	set_max_field ( FIELD *,int);
-extern NCURSES_EXPORT(int)	move_field (FIELD *,int,int);
-extern NCURSES_EXPORT(int)	set_field_type (FIELD *,FIELDTYPE *,...);
-extern NCURSES_EXPORT(int)	set_new_page (FIELD *,bool);
-extern NCURSES_EXPORT(int)	set_field_just (FIELD *,int);
-extern NCURSES_EXPORT(int)	field_just (const FIELD *);
-extern NCURSES_EXPORT(int)	set_field_fore (FIELD *,chtype);
-extern NCURSES_EXPORT(int)	set_field_back (FIELD *,chtype);
-extern NCURSES_EXPORT(int)	set_field_pad (FIELD *,int);
-extern NCURSES_EXPORT(int)	field_pad (const FIELD *);
-extern NCURSES_EXPORT(int)	set_field_buffer (FIELD *,int,const char *);
-extern NCURSES_EXPORT(int)	set_field_status (FIELD *,bool);
-extern NCURSES_EXPORT(int)	set_field_userptr (FIELD *, void *);
-extern NCURSES_EXPORT(int)	set_field_opts (FIELD *,Field_Options);
-extern NCURSES_EXPORT(int)	field_opts_on (FIELD *,Field_Options);
-extern NCURSES_EXPORT(int)	field_opts_off (FIELD *,Field_Options);
-
-extern NCURSES_EXPORT(chtype)	field_fore (const FIELD *);
-extern NCURSES_EXPORT(chtype)	field_back (const FIELD *);
-
-extern NCURSES_EXPORT(bool)	new_page (const FIELD *);
-extern NCURSES_EXPORT(bool)	field_status (const FIELD *);
-
-extern NCURSES_EXPORT(void *)	field_arg (const FIELD *);
-
-extern NCURSES_EXPORT(void *)	field_userptr (const FIELD *);
-
-extern NCURSES_EXPORT(FIELDTYPE *)	field_type (const FIELD *);
-
-extern NCURSES_EXPORT(char *)	field_buffer (const FIELD *,int);
-
-extern NCURSES_EXPORT(Field_Options)	field_opts (const FIELD *);
-
-	/******************
-	*  FORM routines  *
-	******************/
-
-extern NCURSES_EXPORT(FORM *)	new_form (FIELD **);
-
-extern NCURSES_EXPORT(FIELD **)	form_fields (const FORM *);
-extern NCURSES_EXPORT(FIELD *)	current_field (const FORM *);
-
-extern NCURSES_EXPORT(WINDOW *)	form_win (const FORM *);
-extern NCURSES_EXPORT(WINDOW *)	form_sub (const FORM *);
-
-extern NCURSES_EXPORT(Form_Hook)	form_init (const FORM *);
-extern NCURSES_EXPORT(Form_Hook)	form_term (const FORM *);
-extern NCURSES_EXPORT(Form_Hook)	field_init (const FORM *);
-extern NCURSES_EXPORT(Form_Hook)	field_term (const FORM *);
-
-extern NCURSES_EXPORT(int)	free_form (FORM *);
-extern NCURSES_EXPORT(int)	set_form_fields (FORM *,FIELD **);
-extern NCURSES_EXPORT(int)	field_count (const FORM *);
-extern NCURSES_EXPORT(int)	set_form_win (FORM *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_form_sub (FORM *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_current_field (FORM *,FIELD *);
-extern NCURSES_EXPORT(int)	field_index (const FIELD *);
-extern NCURSES_EXPORT(int)	set_form_page (FORM *,int);
-extern NCURSES_EXPORT(int)	form_page (const FORM *);
-extern NCURSES_EXPORT(int)	scale_form (const FORM *,int *,int *);
-extern NCURSES_EXPORT(int)	set_form_init (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	set_form_term (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	set_field_init (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	set_field_term (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	post_form (FORM *);
-extern NCURSES_EXPORT(int)	unpost_form (FORM *);
-extern NCURSES_EXPORT(int)	pos_form_cursor (FORM *);
-extern NCURSES_EXPORT(int)	form_driver (FORM *,int);
-# if NCURSES_WIDECHAR
-extern NCURSES_EXPORT(int)	form_driver_w (FORM *,int,wchar_t);
-# endif
-extern NCURSES_EXPORT(int)	set_form_userptr (FORM *,void *);
-extern NCURSES_EXPORT(int)	set_form_opts (FORM *,Form_Options);
-extern NCURSES_EXPORT(int)	form_opts_on (FORM *,Form_Options);
-extern NCURSES_EXPORT(int)	form_opts_off (FORM *,Form_Options);
-extern NCURSES_EXPORT(int)	form_request_by_name (const char *);
-
-extern NCURSES_EXPORT(const char *)	form_request_name (int);
-
-extern NCURSES_EXPORT(void *)	form_userptr (const FORM *);
-
-extern NCURSES_EXPORT(Form_Options)	form_opts (const FORM *);
-
-extern NCURSES_EXPORT(bool)	data_ahead (const FORM *);
-extern NCURSES_EXPORT(bool)	data_behind (const FORM *);
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(FORM *)	NCURSES_SP_NAME(new_form) (SCREEN*, FIELD **);
-#endif
-
-#ifdef __cplusplus
-  }
-#endif
-/* *INDENT-ON*/
-
-#endif /* FORM_H */
diff --git a/openflow/usr/include/ncursesw/menu.h b/openflow/usr/include/ncursesw/menu.h
deleted file mode 100644
index f76b248..0000000
--- a/openflow/usr/include/ncursesw/menu.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author:  Juergen Pfeifer, 1995,1997                                    *
- ****************************************************************************/
-
-/* $Id: menu.h,v 1.20 2009/04/05 00:28:07 tom Exp $ */
-
-#ifndef ETI_MENU
-#define ETI_MENU
-
-#ifdef AMIGA
-#define TEXT TEXT_ncurses
-#endif
-
-#include <ncursesw/curses.h>
-#include <ncursesw/eti.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef int Menu_Options;
-typedef int Item_Options;
-
-/* Menu options: */
-#define O_ONEVALUE      (0x01)
-#define O_SHOWDESC      (0x02)
-#define O_ROWMAJOR      (0x04)
-#define O_IGNORECASE    (0x08)
-#define O_SHOWMATCH     (0x10)
-#define O_NONCYCLIC     (0x20)
-
-/* Item options: */
-#define O_SELECTABLE    (0x01)
-
-typedef struct
-{
-  const char* str;
-  unsigned short length;
-} TEXT;
-
-typedef struct tagITEM 
-{
-  TEXT           name;        /* name of menu item                         */
-  TEXT           description; /* description of item, optional in display  */ 
-  struct tagMENU *imenu;      /* Pointer to parent menu                    */
-  void           *userptr;    /* Pointer to user defined per item data     */ 
-  Item_Options   opt;         /* Item options                              */ 
-  short          index;       /* Item number if connected to a menu        */
-  short          y;           /* y and x location of item in menu          */
-  short          x;
-  bool           value;       /* Selection value                           */
-                             
-  struct tagITEM *left;       /* neighbor items                            */
-  struct tagITEM *right;
-  struct tagITEM *up;
-  struct tagITEM *down;
-
-} ITEM;
-
-typedef void (*Menu_Hook)(struct tagMENU *);
-
-typedef struct tagMENU 
-{
-  short          height;                /* Nr. of chars high               */
-  short          width;                 /* Nr. of chars wide               */
-  short          rows;                  /* Nr. of items high               */
-  short          cols;                  /* Nr. of items wide               */
-  short          frows;                 /* Nr. of formatted items high     */
-  short          fcols;                 /* Nr. of formatted items wide     */
-  short          arows;                 /* Nr. of items high (actual)      */
-  short          namelen;               /* Max. name length                */
-  short          desclen;               /* Max. description length         */
-  short          marklen;               /* Length of mark, if any          */
-  short          itemlen;               /* Length of one item              */
-  short          spc_desc;              /* Spacing for descriptor          */
-  short          spc_cols;              /* Spacing for columns             */
-  short          spc_rows;              /* Spacing for rows                */ 
-  char          *pattern;               /* Buffer to store match chars     */
-  short          pindex;                /* Index into pattern buffer       */
-  WINDOW        *win;                   /* Window containing menu          */
-  WINDOW        *sub;                   /* Subwindow for menu display      */
-  WINDOW        *userwin;               /* User's window                   */
-  WINDOW        *usersub;               /* User's subwindow                */
-  ITEM          **items;                /* array of items                  */ 
-  short          nitems;                /* Nr. of items in menu            */
-  ITEM          *curitem;               /* Current item                    */
-  short          toprow;                /* Top row of menu                 */
-  chtype         fore;                  /* Selection attribute             */
-  chtype         back;                  /* Nonselection attribute          */
-  chtype         grey;                  /* Inactive attribute              */
-  unsigned char  pad;                   /* Pad character                   */
-
-  Menu_Hook      menuinit;              /* User hooks                      */
-  Menu_Hook      menuterm;
-  Menu_Hook      iteminit;
-  Menu_Hook      itemterm;
-
-  void          *userptr;               /* Pointer to menus user data      */
-  char          *mark;                  /* Pointer to marker string        */
-
-  Menu_Options   opt;                   /* Menu options                    */
-  unsigned short status;                /* Internal state of menu          */
-
-} MENU;
-
-
-/* Define keys */
-
-#define REQ_LEFT_ITEM           (KEY_MAX + 1)
-#define REQ_RIGHT_ITEM          (KEY_MAX + 2)
-#define REQ_UP_ITEM             (KEY_MAX + 3)
-#define REQ_DOWN_ITEM           (KEY_MAX + 4)
-#define REQ_SCR_ULINE           (KEY_MAX + 5)
-#define REQ_SCR_DLINE           (KEY_MAX + 6)
-#define REQ_SCR_DPAGE           (KEY_MAX + 7)
-#define REQ_SCR_UPAGE           (KEY_MAX + 8)
-#define REQ_FIRST_ITEM          (KEY_MAX + 9)
-#define REQ_LAST_ITEM           (KEY_MAX + 10)
-#define REQ_NEXT_ITEM           (KEY_MAX + 11)
-#define REQ_PREV_ITEM           (KEY_MAX + 12)
-#define REQ_TOGGLE_ITEM         (KEY_MAX + 13)
-#define REQ_CLEAR_PATTERN       (KEY_MAX + 14)
-#define REQ_BACK_PATTERN        (KEY_MAX + 15)
-#define REQ_NEXT_MATCH          (KEY_MAX + 16)
-#define REQ_PREV_MATCH          (KEY_MAX + 17)
-
-#define MIN_MENU_COMMAND        (KEY_MAX + 1)
-#define MAX_MENU_COMMAND        (KEY_MAX + 17)
-
-/*
- * Some AT&T code expects MAX_COMMAND to be out-of-band not
- * just for menu commands but for forms ones as well.
- */
-#if defined(MAX_COMMAND)
-#  if (MAX_MENU_COMMAND > MAX_COMMAND)
-#    error Something is wrong -- MAX_MENU_COMMAND is greater than MAX_COMMAND
-#  elif (MAX_COMMAND != (KEY_MAX + 128))
-#    error Something is wrong -- MAX_COMMAND is already inconsistently defined.
-#  endif
-#else
-#  define MAX_COMMAND (KEY_MAX + 128)
-#endif
-
-
-/* --------- prototypes for libmenu functions ----------------------------- */
-
-extern NCURSES_EXPORT(ITEM **)	menu_items (const MENU *);
-extern NCURSES_EXPORT(ITEM *)	current_item (const MENU *);
-extern NCURSES_EXPORT(ITEM *)	new_item (const char *,const char *);
-
-extern NCURSES_EXPORT(MENU *)	new_menu (ITEM **);
-
-extern NCURSES_EXPORT(Item_Options)	item_opts (const ITEM *);
-extern NCURSES_EXPORT(Menu_Options)	menu_opts (const MENU *);
-
-extern NCURSES_EXPORT(Menu_Hook)	item_init (const MENU *);
-extern NCURSES_EXPORT(Menu_Hook)	item_term (const MENU *);
-extern NCURSES_EXPORT(Menu_Hook)	menu_init (const MENU *);
-extern NCURSES_EXPORT(Menu_Hook)	menu_term (const MENU *);
-
-extern NCURSES_EXPORT(WINDOW *)	menu_sub (const MENU *);
-extern NCURSES_EXPORT(WINDOW *)	menu_win (const MENU *);
-
-extern NCURSES_EXPORT(const char *)	item_description (const ITEM *);
-extern NCURSES_EXPORT(const char *)	item_name (const ITEM *);
-extern NCURSES_EXPORT(const char *)	menu_mark (const MENU *);
-extern NCURSES_EXPORT(const char *)	menu_request_name (int);
-
-extern NCURSES_EXPORT(char *)	menu_pattern (const MENU *);
-
-extern NCURSES_EXPORT(void *)	menu_userptr (const MENU *);
-extern NCURSES_EXPORT(void *)	item_userptr (const ITEM *);
-
-extern NCURSES_EXPORT(chtype)	menu_back (const MENU *);
-extern NCURSES_EXPORT(chtype)	menu_fore (const MENU *);
-extern NCURSES_EXPORT(chtype)	menu_grey (const MENU *);
-
-extern NCURSES_EXPORT(int)	free_item (ITEM *);
-extern NCURSES_EXPORT(int)	free_menu (MENU *);
-extern NCURSES_EXPORT(int)	item_count (const MENU *);
-extern NCURSES_EXPORT(int)	item_index (const ITEM *);
-extern NCURSES_EXPORT(int)	item_opts_off (ITEM *,Item_Options);
-extern NCURSES_EXPORT(int)	item_opts_on (ITEM *,Item_Options);
-extern NCURSES_EXPORT(int)	menu_driver (MENU *,int);
-extern NCURSES_EXPORT(int)	menu_opts_off (MENU *,Menu_Options);
-extern NCURSES_EXPORT(int)	menu_opts_on (MENU *,Menu_Options);
-extern NCURSES_EXPORT(int)	menu_pad (const MENU *);
-extern NCURSES_EXPORT(int)	pos_menu_cursor (const MENU *);
-extern NCURSES_EXPORT(int)	post_menu (MENU *);
-extern NCURSES_EXPORT(int)	scale_menu (const MENU *,int *,int *);
-extern NCURSES_EXPORT(int)	set_current_item (MENU *menu,ITEM *item);
-extern NCURSES_EXPORT(int)	set_item_init (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_item_opts (ITEM *,Item_Options);
-extern NCURSES_EXPORT(int)	set_item_term (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_item_userptr (ITEM *, void *);
-extern NCURSES_EXPORT(int)	set_item_value (ITEM *,bool);
-extern NCURSES_EXPORT(int)	set_menu_back (MENU *,chtype);
-extern NCURSES_EXPORT(int)	set_menu_fore (MENU *,chtype);
-extern NCURSES_EXPORT(int)	set_menu_format (MENU *,int,int);
-extern NCURSES_EXPORT(int)	set_menu_grey (MENU *,chtype);
-extern NCURSES_EXPORT(int)	set_menu_init (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_menu_items (MENU *,ITEM **);
-extern NCURSES_EXPORT(int)	set_menu_mark (MENU *, const char *);
-extern NCURSES_EXPORT(int)	set_menu_opts (MENU *,Menu_Options);
-extern NCURSES_EXPORT(int)	set_menu_pad (MENU *,int);
-extern NCURSES_EXPORT(int)	set_menu_pattern (MENU *,const char *);
-extern NCURSES_EXPORT(int)	set_menu_sub (MENU *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_menu_term (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_menu_userptr (MENU *,void *);
-extern NCURSES_EXPORT(int)	set_menu_win (MENU *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_top_row (MENU *,int);
-extern NCURSES_EXPORT(int)	top_row (const MENU *);
-extern NCURSES_EXPORT(int)	unpost_menu (MENU *);
-extern NCURSES_EXPORT(int)	menu_request_by_name (const char *);
-extern NCURSES_EXPORT(int)	set_menu_spacing (MENU *,int,int,int);
-extern NCURSES_EXPORT(int)	menu_spacing (const MENU *,int *,int *,int *);
-
-
-extern NCURSES_EXPORT(bool)	item_value (const ITEM *);
-extern NCURSES_EXPORT(bool)	item_visible (const ITEM *);
-
-extern NCURSES_EXPORT(void)	menu_format (const MENU *,int *,int *);
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(MENU *)	NCURSES_SP_NAME(new_menu) (SCREEN*, ITEM **);
-#endif
-
-#ifdef __cplusplus
-  }
-#endif
-
-#endif /* ETI_MENU */
diff --git a/openflow/usr/include/ncursesw/nc_tparm.h b/openflow/usr/include/ncursesw/nc_tparm.h
deleted file mode 100644
index 248f6c0..0000000
--- a/openflow/usr/include/ncursesw/nc_tparm.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2006-2010,2012 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Thomas E. Dickey                        2006                    *
- ****************************************************************************/
-
-/* $Id: nc_tparm.h,v 1.6 2012/02/18 21:34:42 tom Exp $ */
-
-#ifndef NC_TPARM_included
-#define NC_TPARM_included 1
-
-/*
- * Cast parameters past the formatting-string for tparm() to match the
- * assumption of the varargs code.
- */
-#ifndef TPARM_ARG
-#ifdef NCURSES_TPARM_ARG
-#define TPARM_ARG NCURSES_TPARM_ARG
-#else
-#define TPARM_ARG long
-#endif
-#endif /* TPARAM_ARG */
-
-#define TPARM_N(n) (TPARM_ARG)(n)
-
-#define TPARM_9(a,b,c,d,e,f,g,h,i,j) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f),TPARM_N(g),TPARM_N(h),TPARM_N(i),TPARM_N(j))
-
-#if NCURSES_TPARM_VARARGS
-#define TPARM_8(a,b,c,d,e,f,g,h,i) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f),TPARM_N(g),TPARM_N(h),TPARM_N(i))
-#define TPARM_7(a,b,c,d,e,f,g,h) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f),TPARM_N(g),TPARM_N(h))
-#define TPARM_6(a,b,c,d,e,f,g) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f),TPARM_N(g))
-#define TPARM_5(a,b,c,d,e,f) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f))
-#define TPARM_4(a,b,c,d,e) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e))
-#define TPARM_3(a,b,c,d) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d))
-#define TPARM_2(a,b,c) tparm(a,TPARM_N(b),TPARM_N(c))
-#define TPARM_1(a,b) tparm(a,TPARM_N(b))
-#define TPARM_0(a) tparm(a)
-#else
-#define TPARM_8(a,b,c,d,e,f,g,h,i) TPARM_9(a,b,c,d,e,f,g,h,i,0)
-#define TPARM_7(a,b,c,d,e,f,g,h) TPARM_8(a,b,c,d,e,f,g,h,0)
-#define TPARM_6(a,b,c,d,e,f,g) TPARM_7(a,b,c,d,e,f,g,0)
-#define TPARM_5(a,b,c,d,e,f) TPARM_6(a,b,c,d,e,f,0)
-#define TPARM_4(a,b,c,d,e) TPARM_5(a,b,c,d,e,0)
-#define TPARM_3(a,b,c,d) TPARM_4(a,b,c,d,0)
-#define TPARM_2(a,b,c) TPARM_3(a,b,c,0)
-#define TPARM_1(a,b) TPARM_2(a,b,0)
-#define TPARM_1(a,b) TPARM_2(a,b,0)
-#define TPARM_0(a) TPARM_1(a,0)
-#endif
-
-#endif /* NC_TPARM_included */
diff --git a/openflow/usr/include/ncursesw/ncurses.h b/openflow/usr/include/ncursesw/ncurses.h
deleted file mode 120000
index 149de6c..0000000
--- a/openflow/usr/include/ncursesw/ncurses.h
+++ /dev/null
@@ -1 +0,0 @@
-curses.h
\ No newline at end of file
diff --git a/openflow/usr/include/ncursesw/ncurses_dll.h b/openflow/usr/include/ncursesw/ncurses_dll.h
deleted file mode 100644
index 249493f..0000000
--- a/openflow/usr/include/ncursesw/ncurses_dll.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2009,2014 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-/* $Id: ncurses_dll.h.in,v 1.9 2014/08/02 21:30:20 tom Exp $ */
-
-#ifndef NCURSES_DLL_H_incl
-#define NCURSES_DLL_H_incl 1
-
-/* 2014-08-02 workaround for broken MinGW compiler.
- * Oddly, only TRACE is mapped to trace - the other -D's are okay.
- * suggest TDM as an alternative.
- */
-#if defined(__MINGW64__)
-#elif defined(__MINGW32__)
-#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
-
-#ifdef trace
-#undef trace
-#define TRACE
-#endif
-
-#endif	/* broken compiler */
-#endif	/* MingW */
-
-/*
- * For reentrant code, we map the various global variables into SCREEN by
- * using functions to access them.
- */
-#define NCURSES_PUBLIC_VAR(name) _nc_##name
-#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)
-
-/* no longer needed on cygwin or mingw, thanks to auto-import       */
-/* but this structure may be useful at some point for an MSVC build */
-/* so, for now unconditionally define the important flags           */
-/* "the right way" for proper static and dll+auto-import behavior   */
-#undef NCURSES_DLL
-#define NCURSES_STATIC
-
-#if defined(__CYGWIN__) || defined(__MINGW32__)
-#  if defined(NCURSES_DLL)
-#    if defined(NCURSES_STATIC)
-#      undef NCURSES_STATIC
-#    endif
-#  endif
-#  undef NCURSES_IMPEXP
-#  undef NCURSES_API
-#  undef NCURSES_EXPORT
-#  undef NCURSES_EXPORT_VAR
-#  if defined(NCURSES_DLL)
-/* building a DLL */
-#    define NCURSES_IMPEXP __declspec(dllexport)
-#  elif defined(NCURSES_STATIC)
-/* building or linking to a static library */
-#    define NCURSES_IMPEXP /* nothing */
-#  else
-/* linking to the DLL */
-#    define NCURSES_IMPEXP __declspec(dllimport)
-#  endif
-#  define NCURSES_API __cdecl
-#  define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API
-#  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
-#endif
-
-/* Take care of non-cygwin platforms */
-#if !defined(NCURSES_IMPEXP)
-#  define NCURSES_IMPEXP /* nothing */
-#endif
-#if !defined(NCURSES_API)
-#  define NCURSES_API /* nothing */
-#endif
-#if !defined(NCURSES_EXPORT)
-#  define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API
-#endif
-#if !defined(NCURSES_EXPORT_VAR)
-#  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
-#endif
-
-#endif /* NCURSES_DLL_H_incl */
diff --git a/openflow/usr/include/ncursesw/panel.h b/openflow/usr/include/ncursesw/panel.h
deleted file mode 100644
index cbad12e..0000000
--- a/openflow/usr/include/ncursesw/panel.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995                    *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- *     and: Juergen Pfeifer                         1996-1999,2008          *
- ****************************************************************************/
-
-/* $Id: panel.h,v 1.11 2009/04/11 19:50:40 tom Exp $ */
-
-/* panel.h -- interface file for panels library */
-
-#ifndef NCURSES_PANEL_H_incl
-#define NCURSES_PANEL_H_incl 1
-
-#include <ncursesw/curses.h>
-
-typedef struct panel
-{
-  WINDOW *win;
-  struct panel *below;
-  struct panel *above;
-  NCURSES_CONST void *user;
-} PANEL;
-
-#if	defined(__cplusplus)
-extern "C" {
-#endif
-
-extern NCURSES_EXPORT(WINDOW*) panel_window (const PANEL *);
-extern NCURSES_EXPORT(void)    update_panels (void);
-extern NCURSES_EXPORT(int)     hide_panel (PANEL *);
-extern NCURSES_EXPORT(int)     show_panel (PANEL *);
-extern NCURSES_EXPORT(int)     del_panel (PANEL *);
-extern NCURSES_EXPORT(int)     top_panel (PANEL *);
-extern NCURSES_EXPORT(int)     bottom_panel (PANEL *);
-extern NCURSES_EXPORT(PANEL*)  new_panel (WINDOW *);
-extern NCURSES_EXPORT(PANEL*)  panel_above (const PANEL *);
-extern NCURSES_EXPORT(PANEL*)  panel_below (const PANEL *);
-extern NCURSES_EXPORT(int)     set_panel_userptr (PANEL *, NCURSES_CONST void *);
-extern NCURSES_EXPORT(NCURSES_CONST void*) panel_userptr (const PANEL *);
-extern NCURSES_EXPORT(int)     move_panel (PANEL *, int, int);
-extern NCURSES_EXPORT(int)     replace_panel (PANEL *,WINDOW *);
-extern NCURSES_EXPORT(int)     panel_hidden (const PANEL *);
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(PANEL *) ground_panel(SCREEN *);
-extern NCURSES_EXPORT(PANEL *) ceiling_panel(SCREEN *);
-
-extern NCURSES_EXPORT(void)    NCURSES_SP_NAME(update_panels) (SCREEN*);
-#endif
-
-#if	defined(__cplusplus)
-}
-#endif
-
-#endif /* NCURSES_PANEL_H_incl */
-
-/* end of panel.h */
diff --git a/openflow/usr/include/ncursesw/term.h b/openflow/usr/include/ncursesw/term.h
deleted file mode 100644
index ea60152..0000000
--- a/openflow/usr/include/ncursesw/term.h
+++ /dev/null
@@ -1,806 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2011,2013 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************/
-/* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995                */
-/*    and: Eric S. Raymond <esr@snark.thyrsus.com>                          */
-/*    and: Thomas E. Dickey                        1995-on                  */
-/****************************************************************************/
-
-/* $Id: MKterm.h.awk.in,v 1.62 2013/08/17 19:21:56 tom Exp $ */
-
-/*
-**	term.h -- Definition of struct term
-*/
-
-#ifndef NCURSES_TERM_H_incl
-#define NCURSES_TERM_H_incl 1
-
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "6.0"
-
-#include <ncursesw/ncurses_dll.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Make this file self-contained by providing defaults for the HAVE_TERMIO[S]_H
- * definition (based on the system for which this was configured).
- */
-
-#undef  NCURSES_CONST
-#define NCURSES_CONST const
-
-#undef  NCURSES_SBOOL
-#define NCURSES_SBOOL char
-
-#undef  NCURSES_USE_DATABASE
-#define NCURSES_USE_DATABASE 1
-
-#undef  NCURSES_USE_TERMCAP
-#define NCURSES_USE_TERMCAP 0
-
-#undef  NCURSES_XNAMES
-#define NCURSES_XNAMES 1
-
-/* We will use these symbols to hide differences between
- * termios/termio/sgttyb interfaces.
- */
-#undef  TTY
-#undef  SET_TTY
-#undef  GET_TTY
-
-/* Assume POSIX termio if we have the header and function */
-/* #if HAVE_TERMIOS_H && HAVE_TCGETATTR */
-#if 1 && 1
-
-#undef  TERMIOS
-#define TERMIOS 1
-
-#include <termios.h>
-#define TTY struct termios
-
-#else /* !HAVE_TERMIOS_H */
-
-/* #if HAVE_TERMIO_H */
-#if 1
-
-#undef  TERMIOS
-#define TERMIOS 1
-
-#include <termio.h>
-#define TTY struct termio
-
-#else /* !HAVE_TERMIO_H */
-
-#if __MINGW32__
-#  include <ncursesw/ncurses_mingw.h>
-#  define TTY struct termios
-#else
-#undef TERMIOS
-#include <sgtty.h>
-#include <sys/ioctl.h>
-#define TTY struct sgttyb
-#endif /* MINGW32 */
-#endif /* HAVE_TERMIO_H */
-
-#endif /* HAVE_TERMIOS_H */
-
-#ifdef TERMIOS
-#define GET_TTY(fd, buf) tcgetattr(fd, buf)
-#define SET_TTY(fd, buf) tcsetattr(fd, TCSADRAIN, buf)
-#else
-#define GET_TTY(fd, buf) gtty(fd, buf)
-#define SET_TTY(fd, buf) stty(fd, buf)
-#endif
-
-#define NAMESIZE 256
-
-#define CUR cur_term->type.
-
-#define auto_left_margin               CUR Booleans[0]
-#define auto_right_margin              CUR Booleans[1]
-#define no_esc_ctlc                    CUR Booleans[2]
-#define ceol_standout_glitch           CUR Booleans[3]
-#define eat_newline_glitch             CUR Booleans[4]
-#define erase_overstrike               CUR Booleans[5]
-#define generic_type                   CUR Booleans[6]
-#define hard_copy                      CUR Booleans[7]
-#define has_meta_key                   CUR Booleans[8]
-#define has_status_line                CUR Booleans[9]
-#define insert_null_glitch             CUR Booleans[10]
-#define memory_above                   CUR Booleans[11]
-#define memory_below                   CUR Booleans[12]
-#define move_insert_mode               CUR Booleans[13]
-#define move_standout_mode             CUR Booleans[14]
-#define over_strike                    CUR Booleans[15]
-#define status_line_esc_ok             CUR Booleans[16]
-#define dest_tabs_magic_smso           CUR Booleans[17]
-#define tilde_glitch                   CUR Booleans[18]
-#define transparent_underline          CUR Booleans[19]
-#define xon_xoff                       CUR Booleans[20]
-#define needs_xon_xoff                 CUR Booleans[21]
-#define prtr_silent                    CUR Booleans[22]
-#define hard_cursor                    CUR Booleans[23]
-#define non_rev_rmcup                  CUR Booleans[24]
-#define no_pad_char                    CUR Booleans[25]
-#define non_dest_scroll_region         CUR Booleans[26]
-#define can_change                     CUR Booleans[27]
-#define back_color_erase               CUR Booleans[28]
-#define hue_lightness_saturation       CUR Booleans[29]
-#define col_addr_glitch                CUR Booleans[30]
-#define cr_cancels_micro_mode          CUR Booleans[31]
-#define has_print_wheel                CUR Booleans[32]
-#define row_addr_glitch                CUR Booleans[33]
-#define semi_auto_right_margin         CUR Booleans[34]
-#define cpi_changes_res                CUR Booleans[35]
-#define lpi_changes_res                CUR Booleans[36]
-#define columns                        CUR Numbers[0]
-#define init_tabs                      CUR Numbers[1]
-#define lines                          CUR Numbers[2]
-#define lines_of_memory                CUR Numbers[3]
-#define magic_cookie_glitch            CUR Numbers[4]
-#define padding_baud_rate              CUR Numbers[5]
-#define virtual_terminal               CUR Numbers[6]
-#define width_status_line              CUR Numbers[7]
-#define num_labels                     CUR Numbers[8]
-#define label_height                   CUR Numbers[9]
-#define label_width                    CUR Numbers[10]
-#define max_attributes                 CUR Numbers[11]
-#define maximum_windows                CUR Numbers[12]
-#define max_colors                     CUR Numbers[13]
-#define max_pairs                      CUR Numbers[14]
-#define no_color_video                 CUR Numbers[15]
-#define buffer_capacity                CUR Numbers[16]
-#define dot_vert_spacing               CUR Numbers[17]
-#define dot_horz_spacing               CUR Numbers[18]
-#define max_micro_address              CUR Numbers[19]
-#define max_micro_jump                 CUR Numbers[20]
-#define micro_col_size                 CUR Numbers[21]
-#define micro_line_size                CUR Numbers[22]
-#define number_of_pins                 CUR Numbers[23]
-#define output_res_char                CUR Numbers[24]
-#define output_res_line                CUR Numbers[25]
-#define output_res_horz_inch           CUR Numbers[26]
-#define output_res_vert_inch           CUR Numbers[27]
-#define print_rate                     CUR Numbers[28]
-#define wide_char_size                 CUR Numbers[29]
-#define buttons                        CUR Numbers[30]
-#define bit_image_entwining            CUR Numbers[31]
-#define bit_image_type                 CUR Numbers[32]
-#define back_tab                       CUR Strings[0]
-#define bell                           CUR Strings[1]
-#define carriage_return                CUR Strings[2]
-#define change_scroll_region           CUR Strings[3]
-#define clear_all_tabs                 CUR Strings[4]
-#define clear_screen                   CUR Strings[5]
-#define clr_eol                        CUR Strings[6]
-#define clr_eos                        CUR Strings[7]
-#define column_address                 CUR Strings[8]
-#define command_character              CUR Strings[9]
-#define cursor_address                 CUR Strings[10]
-#define cursor_down                    CUR Strings[11]
-#define cursor_home                    CUR Strings[12]
-#define cursor_invisible               CUR Strings[13]
-#define cursor_left                    CUR Strings[14]
-#define cursor_mem_address             CUR Strings[15]
-#define cursor_normal                  CUR Strings[16]
-#define cursor_right                   CUR Strings[17]
-#define cursor_to_ll                   CUR Strings[18]
-#define cursor_up                      CUR Strings[19]
-#define cursor_visible                 CUR Strings[20]
-#define delete_character               CUR Strings[21]
-#define delete_line                    CUR Strings[22]
-#define dis_status_line                CUR Strings[23]
-#define down_half_line                 CUR Strings[24]
-#define enter_alt_charset_mode         CUR Strings[25]
-#define enter_blink_mode               CUR Strings[26]
-#define enter_bold_mode                CUR Strings[27]
-#define enter_ca_mode                  CUR Strings[28]
-#define enter_delete_mode              CUR Strings[29]
-#define enter_dim_mode                 CUR Strings[30]
-#define enter_insert_mode              CUR Strings[31]
-#define enter_secure_mode              CUR Strings[32]
-#define enter_protected_mode           CUR Strings[33]
-#define enter_reverse_mode             CUR Strings[34]
-#define enter_standout_mode            CUR Strings[35]
-#define enter_underline_mode           CUR Strings[36]
-#define erase_chars                    CUR Strings[37]
-#define exit_alt_charset_mode          CUR Strings[38]
-#define exit_attribute_mode            CUR Strings[39]
-#define exit_ca_mode                   CUR Strings[40]
-#define exit_delete_mode               CUR Strings[41]
-#define exit_insert_mode               CUR Strings[42]
-#define exit_standout_mode             CUR Strings[43]
-#define exit_underline_mode            CUR Strings[44]
-#define flash_screen                   CUR Strings[45]
-#define form_feed                      CUR Strings[46]
-#define from_status_line               CUR Strings[47]
-#define init_1string                   CUR Strings[48]
-#define init_2string                   CUR Strings[49]
-#define init_3string                   CUR Strings[50]
-#define init_file                      CUR Strings[51]
-#define insert_character               CUR Strings[52]
-#define insert_line                    CUR Strings[53]
-#define insert_padding                 CUR Strings[54]
-#define key_backspace                  CUR Strings[55]
-#define key_catab                      CUR Strings[56]
-#define key_clear                      CUR Strings[57]
-#define key_ctab                       CUR Strings[58]
-#define key_dc                         CUR Strings[59]
-#define key_dl                         CUR Strings[60]
-#define key_down                       CUR Strings[61]
-#define key_eic                        CUR Strings[62]
-#define key_eol                        CUR Strings[63]
-#define key_eos                        CUR Strings[64]
-#define key_f0                         CUR Strings[65]
-#define key_f1                         CUR Strings[66]
-#define key_f10                        CUR Strings[67]
-#define key_f2                         CUR Strings[68]
-#define key_f3                         CUR Strings[69]
-#define key_f4                         CUR Strings[70]
-#define key_f5                         CUR Strings[71]
-#define key_f6                         CUR Strings[72]
-#define key_f7                         CUR Strings[73]
-#define key_f8                         CUR Strings[74]
-#define key_f9                         CUR Strings[75]
-#define key_home                       CUR Strings[76]
-#define key_ic                         CUR Strings[77]
-#define key_il                         CUR Strings[78]
-#define key_left                       CUR Strings[79]
-#define key_ll                         CUR Strings[80]
-#define key_npage                      CUR Strings[81]
-#define key_ppage                      CUR Strings[82]
-#define key_right                      CUR Strings[83]
-#define key_sf                         CUR Strings[84]
-#define key_sr                         CUR Strings[85]
-#define key_stab                       CUR Strings[86]
-#define key_up                         CUR Strings[87]
-#define keypad_local                   CUR Strings[88]
-#define keypad_xmit                    CUR Strings[89]
-#define lab_f0                         CUR Strings[90]
-#define lab_f1                         CUR Strings[91]
-#define lab_f10                        CUR Strings[92]
-#define lab_f2                         CUR Strings[93]
-#define lab_f3                         CUR Strings[94]
-#define lab_f4                         CUR Strings[95]
-#define lab_f5                         CUR Strings[96]
-#define lab_f6                         CUR Strings[97]
-#define lab_f7                         CUR Strings[98]
-#define lab_f8                         CUR Strings[99]
-#define lab_f9                         CUR Strings[100]
-#define meta_off                       CUR Strings[101]
-#define meta_on                        CUR Strings[102]
-#define newline                        CUR Strings[103]
-#define pad_char                       CUR Strings[104]
-#define parm_dch                       CUR Strings[105]
-#define parm_delete_line               CUR Strings[106]
-#define parm_down_cursor               CUR Strings[107]
-#define parm_ich                       CUR Strings[108]
-#define parm_index                     CUR Strings[109]
-#define parm_insert_line               CUR Strings[110]
-#define parm_left_cursor               CUR Strings[111]
-#define parm_right_cursor              CUR Strings[112]
-#define parm_rindex                    CUR Strings[113]
-#define parm_up_cursor                 CUR Strings[114]
-#define pkey_key                       CUR Strings[115]
-#define pkey_local                     CUR Strings[116]
-#define pkey_xmit                      CUR Strings[117]
-#define print_screen                   CUR Strings[118]
-#define prtr_off                       CUR Strings[119]
-#define prtr_on                        CUR Strings[120]
-#define repeat_char                    CUR Strings[121]
-#define reset_1string                  CUR Strings[122]
-#define reset_2string                  CUR Strings[123]
-#define reset_3string                  CUR Strings[124]
-#define reset_file                     CUR Strings[125]
-#define restore_cursor                 CUR Strings[126]
-#define row_address                    CUR Strings[127]
-#define save_cursor                    CUR Strings[128]
-#define scroll_forward                 CUR Strings[129]
-#define scroll_reverse                 CUR Strings[130]
-#define set_attributes                 CUR Strings[131]
-#define set_tab                        CUR Strings[132]
-#define set_window                     CUR Strings[133]
-#define tab                            CUR Strings[134]
-#define to_status_line                 CUR Strings[135]
-#define underline_char                 CUR Strings[136]
-#define up_half_line                   CUR Strings[137]
-#define init_prog                      CUR Strings[138]
-#define key_a1                         CUR Strings[139]
-#define key_a3                         CUR Strings[140]
-#define key_b2                         CUR Strings[141]
-#define key_c1                         CUR Strings[142]
-#define key_c3                         CUR Strings[143]
-#define prtr_non                       CUR Strings[144]
-#define char_padding                   CUR Strings[145]
-#define acs_chars                      CUR Strings[146]
-#define plab_norm                      CUR Strings[147]
-#define key_btab                       CUR Strings[148]
-#define enter_xon_mode                 CUR Strings[149]
-#define exit_xon_mode                  CUR Strings[150]
-#define enter_am_mode                  CUR Strings[151]
-#define exit_am_mode                   CUR Strings[152]
-#define xon_character                  CUR Strings[153]
-#define xoff_character                 CUR Strings[154]
-#define ena_acs                        CUR Strings[155]
-#define label_on                       CUR Strings[156]
-#define label_off                      CUR Strings[157]
-#define key_beg                        CUR Strings[158]
-#define key_cancel                     CUR Strings[159]
-#define key_close                      CUR Strings[160]
-#define key_command                    CUR Strings[161]
-#define key_copy                       CUR Strings[162]
-#define key_create                     CUR Strings[163]
-#define key_end                        CUR Strings[164]
-#define key_enter                      CUR Strings[165]
-#define key_exit                       CUR Strings[166]
-#define key_find                       CUR Strings[167]
-#define key_help                       CUR Strings[168]
-#define key_mark                       CUR Strings[169]
-#define key_message                    CUR Strings[170]
-#define key_move                       CUR Strings[171]
-#define key_next                       CUR Strings[172]
-#define key_open                       CUR Strings[173]
-#define key_options                    CUR Strings[174]
-#define key_previous                   CUR Strings[175]
-#define key_print                      CUR Strings[176]
-#define key_redo                       CUR Strings[177]
-#define key_reference                  CUR Strings[178]
-#define key_refresh                    CUR Strings[179]
-#define key_replace                    CUR Strings[180]
-#define key_restart                    CUR Strings[181]
-#define key_resume                     CUR Strings[182]
-#define key_save                       CUR Strings[183]
-#define key_suspend                    CUR Strings[184]
-#define key_undo                       CUR Strings[185]
-#define key_sbeg                       CUR Strings[186]
-#define key_scancel                    CUR Strings[187]
-#define key_scommand                   CUR Strings[188]
-#define key_scopy                      CUR Strings[189]
-#define key_screate                    CUR Strings[190]
-#define key_sdc                        CUR Strings[191]
-#define key_sdl                        CUR Strings[192]
-#define key_select                     CUR Strings[193]
-#define key_send                       CUR Strings[194]
-#define key_seol                       CUR Strings[195]
-#define key_sexit                      CUR Strings[196]
-#define key_sfind                      CUR Strings[197]
-#define key_shelp                      CUR Strings[198]
-#define key_shome                      CUR Strings[199]
-#define key_sic                        CUR Strings[200]
-#define key_sleft                      CUR Strings[201]
-#define key_smessage                   CUR Strings[202]
-#define key_smove                      CUR Strings[203]
-#define key_snext                      CUR Strings[204]
-#define key_soptions                   CUR Strings[205]
-#define key_sprevious                  CUR Strings[206]
-#define key_sprint                     CUR Strings[207]
-#define key_sredo                      CUR Strings[208]
-#define key_sreplace                   CUR Strings[209]
-#define key_sright                     CUR Strings[210]
-#define key_srsume                     CUR Strings[211]
-#define key_ssave                      CUR Strings[212]
-#define key_ssuspend                   CUR Strings[213]
-#define key_sundo                      CUR Strings[214]
-#define req_for_input                  CUR Strings[215]
-#define key_f11                        CUR Strings[216]
-#define key_f12                        CUR Strings[217]
-#define key_f13                        CUR Strings[218]
-#define key_f14                        CUR Strings[219]
-#define key_f15                        CUR Strings[220]
-#define key_f16                        CUR Strings[221]
-#define key_f17                        CUR Strings[222]
-#define key_f18                        CUR Strings[223]
-#define key_f19                        CUR Strings[224]
-#define key_f20                        CUR Strings[225]
-#define key_f21                        CUR Strings[226]
-#define key_f22                        CUR Strings[227]
-#define key_f23                        CUR Strings[228]
-#define key_f24                        CUR Strings[229]
-#define key_f25                        CUR Strings[230]
-#define key_f26                        CUR Strings[231]
-#define key_f27                        CUR Strings[232]
-#define key_f28                        CUR Strings[233]
-#define key_f29                        CUR Strings[234]
-#define key_f30                        CUR Strings[235]
-#define key_f31                        CUR Strings[236]
-#define key_f32                        CUR Strings[237]
-#define key_f33                        CUR Strings[238]
-#define key_f34                        CUR Strings[239]
-#define key_f35                        CUR Strings[240]
-#define key_f36                        CUR Strings[241]
-#define key_f37                        CUR Strings[242]
-#define key_f38                        CUR Strings[243]
-#define key_f39                        CUR Strings[244]
-#define key_f40                        CUR Strings[245]
-#define key_f41                        CUR Strings[246]
-#define key_f42                        CUR Strings[247]
-#define key_f43                        CUR Strings[248]
-#define key_f44                        CUR Strings[249]
-#define key_f45                        CUR Strings[250]
-#define key_f46                        CUR Strings[251]
-#define key_f47                        CUR Strings[252]
-#define key_f48                        CUR Strings[253]
-#define key_f49                        CUR Strings[254]
-#define key_f50                        CUR Strings[255]
-#define key_f51                        CUR Strings[256]
-#define key_f52                        CUR Strings[257]
-#define key_f53                        CUR Strings[258]
-#define key_f54                        CUR Strings[259]
-#define key_f55                        CUR Strings[260]
-#define key_f56                        CUR Strings[261]
-#define key_f57                        CUR Strings[262]
-#define key_f58                        CUR Strings[263]
-#define key_f59                        CUR Strings[264]
-#define key_f60                        CUR Strings[265]
-#define key_f61                        CUR Strings[266]
-#define key_f62                        CUR Strings[267]
-#define key_f63                        CUR Strings[268]
-#define clr_bol                        CUR Strings[269]
-#define clear_margins                  CUR Strings[270]
-#define set_left_margin                CUR Strings[271]
-#define set_right_margin               CUR Strings[272]
-#define label_format                   CUR Strings[273]
-#define set_clock                      CUR Strings[274]
-#define display_clock                  CUR Strings[275]
-#define remove_clock                   CUR Strings[276]
-#define create_window                  CUR Strings[277]
-#define goto_window                    CUR Strings[278]
-#define hangup                         CUR Strings[279]
-#define dial_phone                     CUR Strings[280]
-#define quick_dial                     CUR Strings[281]
-#define tone                           CUR Strings[282]
-#define pulse                          CUR Strings[283]
-#define flash_hook                     CUR Strings[284]
-#define fixed_pause                    CUR Strings[285]
-#define wait_tone                      CUR Strings[286]
-#define user0                          CUR Strings[287]
-#define user1                          CUR Strings[288]
-#define user2                          CUR Strings[289]
-#define user3                          CUR Strings[290]
-#define user4                          CUR Strings[291]
-#define user5                          CUR Strings[292]
-#define user6                          CUR Strings[293]
-#define user7                          CUR Strings[294]
-#define user8                          CUR Strings[295]
-#define user9                          CUR Strings[296]
-#define orig_pair                      CUR Strings[297]
-#define orig_colors                    CUR Strings[298]
-#define initialize_color               CUR Strings[299]
-#define initialize_pair                CUR Strings[300]
-#define set_color_pair                 CUR Strings[301]
-#define set_foreground                 CUR Strings[302]
-#define set_background                 CUR Strings[303]
-#define change_char_pitch              CUR Strings[304]
-#define change_line_pitch              CUR Strings[305]
-#define change_res_horz                CUR Strings[306]
-#define change_res_vert                CUR Strings[307]
-#define define_char                    CUR Strings[308]
-#define enter_doublewide_mode          CUR Strings[309]
-#define enter_draft_quality            CUR Strings[310]
-#define enter_italics_mode             CUR Strings[311]
-#define enter_leftward_mode            CUR Strings[312]
-#define enter_micro_mode               CUR Strings[313]
-#define enter_near_letter_quality      CUR Strings[314]
-#define enter_normal_quality           CUR Strings[315]
-#define enter_shadow_mode              CUR Strings[316]
-#define enter_subscript_mode           CUR Strings[317]
-#define enter_superscript_mode         CUR Strings[318]
-#define enter_upward_mode              CUR Strings[319]
-#define exit_doublewide_mode           CUR Strings[320]
-#define exit_italics_mode              CUR Strings[321]
-#define exit_leftward_mode             CUR Strings[322]
-#define exit_micro_mode                CUR Strings[323]
-#define exit_shadow_mode               CUR Strings[324]
-#define exit_subscript_mode            CUR Strings[325]
-#define exit_superscript_mode          CUR Strings[326]
-#define exit_upward_mode               CUR Strings[327]
-#define micro_column_address           CUR Strings[328]
-#define micro_down                     CUR Strings[329]
-#define micro_left                     CUR Strings[330]
-#define micro_right                    CUR Strings[331]
-#define micro_row_address              CUR Strings[332]
-#define micro_up                       CUR Strings[333]
-#define order_of_pins                  CUR Strings[334]
-#define parm_down_micro                CUR Strings[335]
-#define parm_left_micro                CUR Strings[336]
-#define parm_right_micro               CUR Strings[337]
-#define parm_up_micro                  CUR Strings[338]
-#define select_char_set                CUR Strings[339]
-#define set_bottom_margin              CUR Strings[340]
-#define set_bottom_margin_parm         CUR Strings[341]
-#define set_left_margin_parm           CUR Strings[342]
-#define set_right_margin_parm          CUR Strings[343]
-#define set_top_margin                 CUR Strings[344]
-#define set_top_margin_parm            CUR Strings[345]
-#define start_bit_image                CUR Strings[346]
-#define start_char_set_def             CUR Strings[347]
-#define stop_bit_image                 CUR Strings[348]
-#define stop_char_set_def              CUR Strings[349]
-#define subscript_characters           CUR Strings[350]
-#define superscript_characters         CUR Strings[351]
-#define these_cause_cr                 CUR Strings[352]
-#define zero_motion                    CUR Strings[353]
-#define char_set_names                 CUR Strings[354]
-#define key_mouse                      CUR Strings[355]
-#define mouse_info                     CUR Strings[356]
-#define req_mouse_pos                  CUR Strings[357]
-#define get_mouse                      CUR Strings[358]
-#define set_a_foreground               CUR Strings[359]
-#define set_a_background               CUR Strings[360]
-#define pkey_plab                      CUR Strings[361]
-#define device_type                    CUR Strings[362]
-#define code_set_init                  CUR Strings[363]
-#define set0_des_seq                   CUR Strings[364]
-#define set1_des_seq                   CUR Strings[365]
-#define set2_des_seq                   CUR Strings[366]
-#define set3_des_seq                   CUR Strings[367]
-#define set_lr_margin                  CUR Strings[368]
-#define set_tb_margin                  CUR Strings[369]
-#define bit_image_repeat               CUR Strings[370]
-#define bit_image_newline              CUR Strings[371]
-#define bit_image_carriage_return      CUR Strings[372]
-#define color_names                    CUR Strings[373]
-#define define_bit_image_region        CUR Strings[374]
-#define end_bit_image_region           CUR Strings[375]
-#define set_color_band                 CUR Strings[376]
-#define set_page_length                CUR Strings[377]
-#define display_pc_char                CUR Strings[378]
-#define enter_pc_charset_mode          CUR Strings[379]
-#define exit_pc_charset_mode           CUR Strings[380]
-#define enter_scancode_mode            CUR Strings[381]
-#define exit_scancode_mode             CUR Strings[382]
-#define pc_term_options                CUR Strings[383]
-#define scancode_escape                CUR Strings[384]
-#define alt_scancode_esc               CUR Strings[385]
-#define enter_horizontal_hl_mode       CUR Strings[386]
-#define enter_left_hl_mode             CUR Strings[387]
-#define enter_low_hl_mode              CUR Strings[388]
-#define enter_right_hl_mode            CUR Strings[389]
-#define enter_top_hl_mode              CUR Strings[390]
-#define enter_vertical_hl_mode         CUR Strings[391]
-#define set_a_attributes               CUR Strings[392]
-#define set_pglen_inch                 CUR Strings[393]
-
-#define BOOLWRITE 37
-#define NUMWRITE  33
-#define STRWRITE  394
-
-/* older synonyms for some capabilities */
-#define beehive_glitch	no_esc_ctlc
-#define teleray_glitch	dest_tabs_magic_smso
-#define micro_char_size micro_col_size
-
-#ifdef __INTERNAL_CAPS_VISIBLE
-#define termcap_init2                  CUR Strings[394]
-#define termcap_reset                  CUR Strings[395]
-#define magic_cookie_glitch_ul         CUR Numbers[33]
-#define backspaces_with_bs             CUR Booleans[37]
-#define crt_no_scrolling               CUR Booleans[38]
-#define no_correctly_working_cr        CUR Booleans[39]
-#define carriage_return_delay          CUR Numbers[34]
-#define new_line_delay                 CUR Numbers[35]
-#define linefeed_if_not_lf             CUR Strings[396]
-#define backspace_if_not_bs            CUR Strings[397]
-#define gnu_has_meta_key               CUR Booleans[40]
-#define linefeed_is_newline            CUR Booleans[41]
-#define backspace_delay                CUR Numbers[36]
-#define horizontal_tab_delay           CUR Numbers[37]
-#define number_of_function_keys        CUR Numbers[38]
-#define other_non_function_keys        CUR Strings[398]
-#define arrow_key_map                  CUR Strings[399]
-#define has_hardware_tabs              CUR Booleans[42]
-#define return_does_clr_eol            CUR Booleans[43]
-#define acs_ulcorner                   CUR Strings[400]
-#define acs_llcorner                   CUR Strings[401]
-#define acs_urcorner                   CUR Strings[402]
-#define acs_lrcorner                   CUR Strings[403]
-#define acs_ltee                       CUR Strings[404]
-#define acs_rtee                       CUR Strings[405]
-#define acs_btee                       CUR Strings[406]
-#define acs_ttee                       CUR Strings[407]
-#define acs_hline                      CUR Strings[408]
-#define acs_vline                      CUR Strings[409]
-#define acs_plus                       CUR Strings[410]
-#define memory_lock                    CUR Strings[411]
-#define memory_unlock                  CUR Strings[412]
-#define box_chars_1                    CUR Strings[413]
-#endif /* __INTERNAL_CAPS_VISIBLE */
-
-
-/*
- * Predefined terminfo array sizes
- */
-#define BOOLCOUNT 44
-#define NUMCOUNT  39
-#define STRCOUNT  414
-
-/* used by code for comparing entries */
-#define acs_chars_index	 146
-
-typedef struct termtype {	/* in-core form of terminfo data */
-    char  *term_names;		/* str_table offset of term names */
-    char  *str_table;		/* pointer to string table */
-    NCURSES_SBOOL  *Booleans;	/* array of boolean values */
-    short *Numbers;		/* array of integer values */
-    char  **Strings;		/* array of string offsets */
-
-#if NCURSES_XNAMES
-    char  *ext_str_table;	/* pointer to extended string table */
-    char  **ext_Names;		/* corresponding names */
-
-    unsigned short num_Booleans;/* count total Booleans */
-    unsigned short num_Numbers;	/* count total Numbers */
-    unsigned short num_Strings;	/* count total Strings */
-
-    unsigned short ext_Booleans;/* count extensions to Booleans */
-    unsigned short ext_Numbers;	/* count extensions to Numbers */
-    unsigned short ext_Strings;	/* count extensions to Strings */
-#endif /* NCURSES_XNAMES */
-
-} TERMTYPE;
-
-typedef struct term {		/* describe an actual terminal */
-    TERMTYPE	type;		/* terminal type description */
-    short	Filedes;	/* file description being written to */
-    TTY		Ottyb,		/* original state of the terminal */
-		Nttyb;		/* current state of the terminal */
-    int		_baudrate;	/* used to compute padding */
-    char *      _termname;      /* used for termname() */
-} TERMINAL;
-
-#if 0 && !0
-extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;
-#elif 0
-NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);
-#define cur_term   NCURSES_PUBLIC_VAR(cur_term())
-#else
-extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;
-#endif
-
-#if 0 || 0
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numcodes);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numfnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);
-
-#define boolnames  NCURSES_PUBLIC_VAR(boolnames())
-#define boolcodes  NCURSES_PUBLIC_VAR(boolcodes())
-#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())
-#define numnames   NCURSES_PUBLIC_VAR(numnames())
-#define numcodes   NCURSES_PUBLIC_VAR(numcodes())
-#define numfnames  NCURSES_PUBLIC_VAR(numfnames())
-#define strnames   NCURSES_PUBLIC_VAR(strnames())
-#define strcodes   NCURSES_PUBLIC_VAR(strcodes())
-#define strfnames  NCURSES_PUBLIC_VAR(strfnames())
-
-#else
-
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numcodes[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numfnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strcodes[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strfnames[];
-
-#endif
-
-/* internals */
-extern NCURSES_EXPORT(int) _nc_set_tty_mode (TTY *buf);
-extern NCURSES_EXPORT(int) _nc_get_tty_mode (TTY *buf);
-extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);
-extern NCURSES_EXPORT(int) _nc_read_file_entry (const char *const, TERMTYPE *);
-extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE *const);
-extern NCURSES_EXPORT(int) _nc_read_termtype (TERMTYPE *, char *, int);
-extern NCURSES_EXPORT(char *) _nc_first_name (const char *const);
-extern NCURSES_EXPORT(int) _nc_name_match (const char *const, const char *const, const char *const);
-extern NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *);
-
-/* entry points */
-extern NCURSES_EXPORT(TERMINAL *) set_curterm (TERMINAL *);
-extern NCURSES_EXPORT(int) del_curterm (TERMINAL *);
-
-/* miscellaneous entry points */
-extern NCURSES_EXPORT(int) restartterm (NCURSES_CONST char *, int, int *);
-extern NCURSES_EXPORT(int) setupterm (NCURSES_CONST char *,int,int *);
-
-/* terminfo entry points, also declared in curses.h */
-#if !defined(__NCURSES_H)
-extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);
-extern NCURSES_EXPORT_VAR(char) ttytype[];
-extern NCURSES_EXPORT(int) putp (const char *);
-extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);
-
-#if 1 /* NCURSES_TPARM_VARARGS */
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */
-#else
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */
-extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
-#endif
-
-extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */
-
-#endif /* __NCURSES_H */
-
-/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */
-#if !defined(NCURSES_TERMCAP_H_incl)
-extern NCURSES_EXPORT(char *) tgetstr (NCURSES_CONST char *, char **);
-extern NCURSES_EXPORT(char *) tgoto (const char *, int, int);
-extern NCURSES_EXPORT(int) tgetent (char *, const char *);
-extern NCURSES_EXPORT(int) tgetflag (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tgetnum (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tputs (const char *, int, int (*)(int));
-#endif /* NCURSES_TERMCAP_H_incl */
-
-/*
- * Include curses.h before term.h to enable these extensions.
- */
-#if defined(NCURSES_SP_FUNCS) && (NCURSES_SP_FUNCS != 0)
-
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tigetstr) (SCREEN*, NCURSES_CONST char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(putp) (SCREEN*, const char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tigetflag) (SCREEN*, NCURSES_CONST char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tigetnum) (SCREEN*, NCURSES_CONST char *);
-
-#if 1 /* NCURSES_TPARM_VARARGS */
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tparm) (SCREEN*, NCURSES_CONST char *, ...);	/* special */
-#else
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tparm) (SCREEN*, NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tparm_varargs) (SCREEN*, NCURSES_CONST char *, ...);	/* special */
-#endif
-
-/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tgetstr) (SCREEN*, NCURSES_CONST char *, char **);
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tgoto) (SCREEN*, const char *, int, int);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetent) (SCREEN*, char *, const char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetflag) (SCREEN*, NCURSES_CONST char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetnum) (SCREEN*, NCURSES_CONST char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tputs) (SCREEN*, const char *, int, NCURSES_SP_OUTC);
-
-extern NCURSES_EXPORT(TERMINAL *) NCURSES_SP_NAME(set_curterm) (SCREEN*, TERMINAL *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(del_curterm) (SCREEN*, TERMINAL *);
-
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(restartterm) (SCREEN*, NCURSES_CONST char *, int, int *);
-#endif /* NCURSES_SP_FUNCS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NCURSES_TERM_H_incl */
diff --git a/openflow/usr/include/ncursesw/term_entry.h b/openflow/usr/include/ncursesw/term_entry.h
deleted file mode 100644
index 807bf08..0000000
--- a/openflow/usr/include/ncursesw/term_entry.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- *     and: Thomas E. Dickey                        1998-on                 *
- ****************************************************************************/
-
-/* $Id: term_entry.h,v 1.47 2015/08/30 00:41:20 tom Exp $ */
-
-/*
- *	term_entry.h -- interface to entry-manipulation code
- */
-
-#ifndef NCURSES_TERM_ENTRY_H_incl
-#define NCURSES_TERM_ENTRY_H_incl 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ncursesw/term.h>
-
-    /*
-     * see db_iterator.c - this enumeration lists the places searched for a
-     * terminal description and defines the order in which they are searched.
-     */
-    typedef enum {
-	dbdTIC = 0,		/* special, used by tic when writing entry */
-#if NCURSES_USE_DATABASE
-	dbdEnvOnce,		/* the $TERMINFO environment variable */
-	dbdHome,		/* $HOME/.terminfo */
-	dbdEnvList,		/* the $TERMINFO_DIRS environment variable */
-	dbdCfgList,		/* the compiled-in TERMINFO_DIRS value */
-	dbdCfgOnce,		/* the compiled-in TERMINFO value */
-#endif
-#if NCURSES_USE_TERMCAP
-	dbdEnvOnce2,		/* the $TERMCAP environment variable */
-	dbdEnvList2,		/* the $TERMPATH environment variable */
-	dbdCfgList2,		/* the compiled-in TERMPATH */
-#endif
-	dbdLAST
-    } DBDIRS;
-
-#define MAX_USES	32
-#define MAX_CROSSLINKS	16
-
-    typedef struct entry {
-	TERMTYPE tterm;
-	unsigned nuses;
-	struct {
-	    char *name;
-	    struct entry *link;
-	    long line;
-	} uses[MAX_USES];
-	int ncrosslinks;
-	struct entry *crosslinks[MAX_CROSSLINKS];
-	long cstart, cend;
-	long startline;
-	struct entry *next;
-	struct entry *last;
-    } ENTRY;
-/* *INDENT-OFF* */
-#if NCURSES_XNAMES
-#define NUM_BOOLEANS(tp) (tp)->num_Booleans
-#define NUM_NUMBERS(tp)  (tp)->num_Numbers
-#define NUM_STRINGS(tp)  (tp)->num_Strings
-#define EXT_NAMES(tp,i,limit,index,table) (i >= limit) ? tp->ext_Names[index] : table[i]
-#else
-#define NUM_BOOLEANS(tp) BOOLCOUNT
-#define NUM_NUMBERS(tp)  NUMCOUNT
-#define NUM_STRINGS(tp)  STRCOUNT
-#define EXT_NAMES(tp,i,limit,index,table) table[i]
-#endif
-
-#define NUM_EXT_NAMES(tp) (unsigned) ((tp)->ext_Booleans + (tp)->ext_Numbers + (tp)->ext_Strings)
-
-#define for_each_boolean(n,tp) for(n = 0; n < NUM_BOOLEANS(tp); n++)
-#define for_each_number(n,tp)  for(n = 0; n < NUM_NUMBERS(tp);  n++)
-#define for_each_string(n,tp)  for(n = 0; n < NUM_STRINGS(tp);  n++)
-
-#if NCURSES_XNAMES
-#define for_each_ext_boolean(n,tp) for(n = BOOLCOUNT; (int) n < (int) NUM_BOOLEANS(tp); n++)
-#define for_each_ext_number(n,tp)  for(n = NUMCOUNT; (int) n < (int) NUM_NUMBERS(tp);  n++)
-#define for_each_ext_string(n,tp)  for(n = STRCOUNT; (int) n < (int) NUM_STRINGS(tp);  n++)
-#endif
-
-#define ExtBoolname(tp,i,names) EXT_NAMES(tp, i, BOOLCOUNT, (i - (tp->num_Booleans - tp->ext_Booleans)), names)
-#define ExtNumname(tp,i,names)  EXT_NAMES(tp, i, NUMCOUNT, (i - (tp->num_Numbers - tp->ext_Numbers)) + tp->ext_Booleans, names)
-#define ExtStrname(tp,i,names)  EXT_NAMES(tp, i, STRCOUNT, (i - (tp->num_Strings - tp->ext_Strings)) + (tp->ext_Numbers + tp->ext_Booleans), names)
-
-extern NCURSES_EXPORT_VAR(ENTRY *) _nc_head;
-extern NCURSES_EXPORT_VAR(ENTRY *) _nc_tail;
-#define for_entry_list(qp)	for (qp = _nc_head; qp; qp = qp->next)
-
-#define MAX_LINE	132
-
-#define NULLHOOK        (bool(*)(ENTRY *))0
-
-/*
- * Note that WANTED and PRESENT are not simple inverses!  If a capability
- * has been explicitly cancelled, it's not considered WANTED.
- */
-#define WANTED(s)	((s) == ABSENT_STRING)
-#define PRESENT(s)	(((s) != ABSENT_STRING) && ((s) != CANCELLED_STRING))
-
-#define ANDMISSING(p,q) \
-		{if (PRESENT(p) && !PRESENT(q)) _nc_warning(#p " but no " #q);}
-
-#define PAIRED(p,q) \
-		{ \
-		if (PRESENT(q) && !PRESENT(p)) \
-			_nc_warning(#q " but no " #p); \
-		if (PRESENT(p) && !PRESENT(q)) \
-			_nc_warning(#p " but no " #q); \
-		}
-
-/* alloc_entry.c: elementary allocation code */
-extern NCURSES_EXPORT(ENTRY *) _nc_copy_entry (ENTRY *oldp);
-extern NCURSES_EXPORT(char *) _nc_save_str (const char *const);
-extern NCURSES_EXPORT(void) _nc_init_entry (TERMTYPE *const);
-extern NCURSES_EXPORT(void) _nc_merge_entry (TERMTYPE *const, TERMTYPE *const);
-extern NCURSES_EXPORT(void) _nc_wrap_entry (ENTRY *const, bool);
-
-/* alloc_ttype.c: elementary allocation code */
-extern NCURSES_EXPORT(void) _nc_align_termtype (TERMTYPE *, TERMTYPE *);
-extern NCURSES_EXPORT(void) _nc_copy_termtype (TERMTYPE *, const TERMTYPE *);
-
-/* free_ttype.c: elementary allocation code */
-extern NCURSES_EXPORT(void) _nc_free_termtype (TERMTYPE *);
-
-/* lib_acs.c */
-extern NCURSES_EXPORT(void) _nc_init_acs (void);	/* corresponds to traditional 'init_acs()' */
-
-/* lib_termcap.c: trim sgr0 string for termcap users */
-extern NCURSES_EXPORT(char *) _nc_trim_sgr0 (TERMTYPE *);
-
-/* parse_entry.c: entry-parsing code */
-#if NCURSES_XNAMES
-extern NCURSES_EXPORT_VAR(bool) _nc_user_definable;
-extern NCURSES_EXPORT_VAR(bool) _nc_disable_period;
-#endif
-extern NCURSES_EXPORT(int) _nc_parse_entry (ENTRY *, int, bool);
-extern NCURSES_EXPORT(int) _nc_capcmp (const char *, const char *);
-
-/* write_entry.c: writing an entry to the file system */
-extern NCURSES_EXPORT(void) _nc_set_writedir (const char *);
-extern NCURSES_EXPORT(void) _nc_write_entry (TERMTYPE *const);
-extern NCURSES_EXPORT(int) _nc_write_object(TERMTYPE *, char *, unsigned *, unsigned);
-
-/* comp_parse.c: entry list handling */
-extern NCURSES_EXPORT(void) _nc_read_entry_source (FILE*, char*, int, bool, bool (*)(ENTRY*));
-extern NCURSES_EXPORT(bool) _nc_entry_match (char *, char *);
-extern NCURSES_EXPORT(int) _nc_resolve_uses (bool); /* obs 20040705 */
-extern NCURSES_EXPORT(int) _nc_resolve_uses2 (bool, bool);
-extern NCURSES_EXPORT(void) _nc_free_entries (ENTRY *);
-extern NCURSES_IMPEXP void NCURSES_API (*_nc_check_termtype)(TERMTYPE *); /* obs 20040705 */
-extern NCURSES_IMPEXP void NCURSES_API (*_nc_check_termtype2)(TERMTYPE *, bool);
-
-/* trace_xnames.c */
-extern NCURSES_EXPORT(void) _nc_trace_xnames (TERMTYPE *);
-/* *INDENT-ON* */
-
-#ifdef __cplusplus
-}
-#endif
-#endif				/* NCURSES_TERM_ENTRY_H_incl */
diff --git a/openflow/usr/include/ncursesw/termcap.h b/openflow/usr/include/ncursesw/termcap.h
deleted file mode 100644
index 0fde1e1..0000000
--- a/openflow/usr/include/ncursesw/termcap.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- ****************************************************************************/
-
-/* $Id: termcap.h.in,v 1.16 2001/03/24 21:53:27 tom Exp $ */
-
-#ifndef NCURSES_TERMCAP_H_incl
-#define NCURSES_TERMCAP_H_incl	1
-
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "6.0"
-
-#include <ncursesw/ncurses_dll.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <sys/types.h>
-
-#undef  NCURSES_CONST 
-#define NCURSES_CONST const 
-
-#undef  NCURSES_OSPEED 
-#define NCURSES_OSPEED short 
-
-extern NCURSES_EXPORT_VAR(char) PC;
-extern NCURSES_EXPORT_VAR(char *) UP;
-extern NCURSES_EXPORT_VAR(char *) BC;
-extern NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed; 
-
-#if !defined(NCURSES_TERM_H_incl)
-extern NCURSES_EXPORT(char *) tgetstr (NCURSES_CONST char *, char **);
-extern NCURSES_EXPORT(char *) tgoto (const char *, int, int);
-extern NCURSES_EXPORT(int) tgetent (char *, const char *);
-extern NCURSES_EXPORT(int) tgetflag (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tgetnum (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tputs (const char *, int, int (*)(int));
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NCURSES_TERMCAP_H_incl */
diff --git a/openflow/usr/include/ncursesw/tic.h b/openflow/usr/include/ncursesw/tic.h
deleted file mode 100644
index e0e5f3f..0000000
--- a/openflow/usr/include/ncursesw/tic.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- *     and: Thomas E. Dickey 1996 on                                        *
- ****************************************************************************/
-
-/*
- * $Id: tic.h,v 1.69 2012/03/17 18:22:10 tom Exp $
- *	tic.h - Global variables and structures for the terminfo
- *			compiler.
- */
-
-#ifndef __TIC_H
-#define __TIC_H
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ncursesw/curses.h>	/* for the _tracef() prototype, ERR/OK, bool defs */
-
-/*
-** The format of compiled terminfo files is as follows:
-**
-**		Header (12 bytes), containing information given below
-**		Names Section, containing the names of the terminal
-**		Boolean Section, containing the values of all of the
-**				boolean capabilities
-**				A null byte may be inserted here to make
-**				sure that the Number Section begins on an
-**				even word boundary.
-**		Number Section, containing the values of all of the numeric
-**				capabilities, each as a short integer
-**		String Section, containing short integer offsets into the
-**				String Table, one per string capability
-**		String Table, containing the actual characters of the string
-**				capabilities.
-**
-**	NOTE that all short integers in the file are stored using VAX/PDP-style
-**	byte-order, i.e., least-significant byte first.
-**
-**	There is no structure definition here because it would only confuse
-**	matters.  Terminfo format is a raw byte layout, not a structure
-**	dump.  If you happen to be on a little-endian machine with 16-bit
-**	shorts that requires no padding between short members in a struct,
-**	then there is a natural C structure that captures the header, but
-**	not very helpfully.
-*/
-
-#define MAGIC		0432	/* first two bytes of a compiled entry */
-
-#undef  BYTE
-#define BYTE(p,n)	(unsigned char)((p)[n])
-
-#define IS_NEG1(p)	((BYTE(p,0) == 0377) && (BYTE(p,1) == 0377))
-#define IS_NEG2(p)	((BYTE(p,0) == 0376) && (BYTE(p,1) == 0377))
-#define LOW_MSB(p)	(BYTE(p,0) + 256*BYTE(p,1))
-
-#define IS_TIC_MAGIC(p)	(LOW_MSB(p) == MAGIC)
-
-/*
- * The "maximum" here is misleading; XSI guarantees minimum values, which a
- * given implementation may exceed.
- */
-#define MAX_NAME_SIZE	512	/* maximum legal name field size (XSI:127) */
-#define MAX_ENTRY_SIZE	4096	/* maximum legal entry size */
-
-/*
- * The maximum size of individual name or alias is guaranteed in XSI to be at
- * least 14, since that corresponds to the older filename lengths.  Newer
- * systems allow longer aliases, though not many terminal descriptions are
- * written to use them.  The MAX_ALIAS symbol is used for warnings.
- */
-#if HAVE_LONG_FILE_NAMES
-#define MAX_ALIAS	32	/* smaller than POSIX minimum for PATH_MAX */
-#else
-#define MAX_ALIAS	14	/* SVr3 filename length */
-#endif
-
-/* location of user's personal info directory */
-#define PRIVATE_INFO	"%s/.terminfo"	/* plug getenv("HOME") into %s */
-
-/*
- * Some traces are designed to be used via tic's verbose option (and similar in
- * infocmp and toe) rather than the 'trace()' function.  So we use the bits
- * above the normal trace() parameter as a debug-level.
- */
-
-#define MAX_DEBUG_LEVEL 15
-#define DEBUG_LEVEL(n)	((n) << TRACE_SHIFT)
-
-#define set_trace_level(n) \
-	_nc_tracing &= DEBUG_LEVEL(MAX_DEBUG_LEVEL), \
-	_nc_tracing |= DEBUG_LEVEL(n)
-
-#ifdef TRACE
-#define DEBUG(n, a)	if (_nc_tracing >= DEBUG_LEVEL(n)) _tracef a
-#else
-#define DEBUG(n, a)	/*nothing*/
-#endif
-
-extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
-extern NCURSES_EXPORT(void) _nc_tracef (char *, ...) GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
-extern NCURSES_EXPORT(const char *) _nc_visbuf2 (int, const char *);
-
-/*
- * These are the types of tokens returned by the scanner.  The first
- * three are also used in the hash table of capability names.  The scanner
- * returns one of these values after loading the specifics into the global
- * structure curr_token.
- */
-
-#define BOOLEAN 0		/* Boolean capability */
-#define NUMBER 1		/* Numeric capability */
-#define STRING 2		/* String-valued capability */
-#define CANCEL 3		/* Capability to be cancelled in following tc's */
-#define NAMES  4		/* The names for a terminal type */
-#define UNDEF  5		/* Undefined */
-
-#define NO_PUSHBACK	-1	/* used in pushtype to indicate no pushback */
-
-	/*
-	 *	The global structure in which the specific parts of a
-	 *	scanned token are returned.
-	 *
-	 */
-
-struct token
-{
-	char	*tk_name;		/* name of capability */
-	int	tk_valnumber;	/* value of capability (if a number) */
-	char	*tk_valstring;	/* value of capability (if a string) */
-};
-
-extern NCURSES_EXPORT_VAR(struct token)	_nc_curr_token;
-
-	/*
-	 * Offsets to string capabilities, with the corresponding functionkey
-	 * codes.
-	 */
-struct tinfo_fkeys {
-	unsigned offset;
-	chtype code;
-	};
-
-#if	BROKEN_LINKER
-
-#define	_nc_tinfo_fkeys	_nc_tinfo_fkeysf()
-extern NCURSES_EXPORT(const struct tinfo_fkeys *) _nc_tinfo_fkeysf (void);
-
-#else
-
-extern NCURSES_EXPORT_VAR(const struct tinfo_fkeys) _nc_tinfo_fkeys[];
-
-#endif
-
-typedef short HashValue;
-
-	/*
-	 * The file comp_captab.c contains an array of these structures, one
-	 * per possible capability.  These are indexed by a hash table array of
-	 * pointers to the same structures for use by the parser.
-	 */
-
-struct name_table_entry
-{
-	const char *nte_name;	/* name to hash on */
-	int	nte_type;	/* BOOLEAN, NUMBER or STRING */
-	HashValue nte_index;	/* index of associated variable in its array */
-	HashValue nte_link;	/* index in table of next hash, or -1 */
-};
-
-	/*
-	 * Use this structure to hide differences between terminfo and termcap
-	 * tables.
-	 */
-typedef struct {
-	unsigned table_size;
-	const HashValue *table_data;
-	HashValue (*hash_of)(const char *);
-	int (*compare_names)(const char *, const char *);
-} HashData;
-
-struct alias
-{
-	const char	*from;
-	const char	*to;
-	const char	*source;
-};
-
-extern NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool);
-extern NCURSES_EXPORT(const HashData *) _nc_get_hash_info (bool);
-extern NCURSES_EXPORT(const HashValue *) _nc_get_hash_table (bool);
-extern NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool);
-
-#define NOTFOUND	((struct name_table_entry *) 0)
-
-/*
- * The casts are required for correct sign-propagation with systems such as
- * AIX, IRIX64, Solaris which default to unsigned characters.  The C standard
- * leaves this detail unspecified.
- */
-
-/* out-of-band values for representing absent capabilities */
-#define ABSENT_BOOLEAN		((signed char)-1)	/* 255 */
-#define ABSENT_NUMERIC		(-1)
-#define ABSENT_STRING		(char *)0
-
-/* out-of-band values for representing cancels */
-#define CANCELLED_BOOLEAN	((signed char)-2)	/* 254 */
-#define CANCELLED_NUMERIC	(-2)
-#define CANCELLED_STRING	(char *)(-1)
-
-#define VALID_BOOLEAN(s) ((unsigned char)(s) <= 1) /* reject "-1" */
-#define VALID_NUMERIC(s) ((s) >= 0)
-#define VALID_STRING(s)  ((s) != CANCELLED_STRING && (s) != ABSENT_STRING)
-
-/* termcap entries longer than this may break old binaries */
-#define MAX_TERMCAP_LENGTH	1023
-
-/* this is a documented limitation of terminfo */
-#define MAX_TERMINFO_LENGTH	4096
-
-#ifndef TERMINFO
-#define TERMINFO "/usr/share/terminfo"
-#endif
-
-#ifdef NCURSES_TERM_ENTRY_H_incl
-
-/* access.c */
-extern NCURSES_EXPORT(unsigned) _nc_pathlast (const char *);
-extern NCURSES_EXPORT(bool) _nc_is_abs_path (const char *);
-extern NCURSES_EXPORT(bool) _nc_is_dir_path (const char *);
-extern NCURSES_EXPORT(bool) _nc_is_file_path (const char *);
-extern NCURSES_EXPORT(char *) _nc_basename (char *);
-extern NCURSES_EXPORT(char *) _nc_rootname (char *);
-
-/* comp_hash.c: name lookup */
-extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry
-	(const char *, const HashValue *);
-extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_type_entry
-	(const char *, int, bool);
-
-/* comp_scan.c: lexical analysis */
-extern NCURSES_EXPORT(int)  _nc_get_token (bool);
-extern NCURSES_EXPORT(void) _nc_panic_mode (char);
-extern NCURSES_EXPORT(void) _nc_push_token (int);
-extern NCURSES_EXPORT(void) _nc_reset_input (FILE *, char *);
-extern NCURSES_EXPORT_VAR(int) _nc_curr_col;
-extern NCURSES_EXPORT_VAR(int) _nc_curr_line;
-extern NCURSES_EXPORT_VAR(int) _nc_syntax;
-extern NCURSES_EXPORT_VAR(int) _nc_strict_bsd;
-extern NCURSES_EXPORT_VAR(long) _nc_comment_end;
-extern NCURSES_EXPORT_VAR(long) _nc_comment_start;
-extern NCURSES_EXPORT_VAR(long) _nc_curr_file_pos;
-extern NCURSES_EXPORT_VAR(long) _nc_start_line;
-#define SYN_TERMINFO	0
-#define SYN_TERMCAP	1
-
-/* comp_error.c: warning & abort messages */
-extern NCURSES_EXPORT(const char *) _nc_get_source (void);
-extern NCURSES_EXPORT(void) _nc_err_abort (const char *const,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
-extern NCURSES_EXPORT(void) _nc_get_type (char *name);
-extern NCURSES_EXPORT(void) _nc_set_source (const char *const);
-extern NCURSES_EXPORT(void) _nc_set_type (const char *const);
-extern NCURSES_EXPORT(void) _nc_syserr_abort (const char *const,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
-extern NCURSES_EXPORT(void) _nc_warning (const char *const,...) GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings;
-
-/* comp_expand.c: expand string into readable form */
-extern NCURSES_EXPORT(char *) _nc_tic_expand (const char *, bool, int);
-
-/* comp_scan.c: decode string from readable form */
-extern NCURSES_EXPORT(int) _nc_trans_string (char *, char *);
-
-/* captoinfo.c: capability conversion */
-extern NCURSES_EXPORT(char *) _nc_captoinfo (const char *, const char *, int const);
-extern NCURSES_EXPORT(char *) _nc_infotocap (const char *, const char *, int const);
-
-/* home_terminfo.c */
-extern NCURSES_EXPORT(char *) _nc_home_terminfo (void);
-
-/* lib_tparm.c */
-#define NUM_PARM 9
-
-extern NCURSES_EXPORT_VAR(int) _nc_tparm_err;
-
-extern NCURSES_EXPORT(int) _nc_tparm_analyze(const char *, char **, int *);
-
-/* lib_tputs.c */
-extern NCURSES_EXPORT_VAR(int) _nc_nulls_sent;		/* Add one for every null sent */
-
-/* comp_main.c: compiler main */
-extern const char * _nc_progname;
-
-/* db_iterator.c */
-extern NCURSES_EXPORT(const char *) _nc_next_db(DBDIRS *, int *);
-extern NCURSES_EXPORT(const char *) _nc_tic_dir (const char *);
-extern NCURSES_EXPORT(void) _nc_first_db(DBDIRS *, int *);
-extern NCURSES_EXPORT(void) _nc_last_db(void);
-
-/* write_entry.c */
-extern NCURSES_EXPORT(int) _nc_tic_written (void);
-
-#endif /* NCURSES_TERM_ENTRY_H_incl */
-
-#ifdef __cplusplus
-}
-#endif
-
-/* *INDENT-ON* */
-#endif /* __TIC_H */
diff --git a/openflow/usr/include/ncursesw/unctrl.h b/openflow/usr/include/ncursesw/unctrl.h
deleted file mode 100644
index 8d57814..0000000
--- a/openflow/usr/include/ncursesw/unctrl.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- ****************************************************************************/
-
-/*
- * unctrl.h
- *
- * Display a printable version of a control character.
- * Control characters are displayed in caret notation (^x), DELETE is displayed
- * as ^?. Printable characters are displayed as is.
- */
-
-/* $Id: unctrl.h.in,v 1.11 2009/04/18 21:00:52 tom Exp $ */
-
-#ifndef NCURSES_UNCTRL_H_incl
-#define NCURSES_UNCTRL_H_incl	1
-
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "6.0"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ncursesw/curses.h>
-
-#undef unctrl
-NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype);
-
-#if 0
-NCURSES_EXPORT(NCURSES_CONST char *) NCURSES_SP_NAME(unctrl) (SCREEN*, chtype);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NCURSES_UNCTRL_H_incl */
diff --git a/openflow/usr/include/net/ethernet.h b/openflow/usr/include/net/ethernet.h
deleted file mode 100644
index 3160e93..0000000
--- a/openflow/usr/include/net/ethernet.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Based on the FreeBSD version of this file. Curiously, that file
-   lacks a copyright in the header. */
-
-#ifndef __NET_ETHERNET_H
-#define __NET_ETHERNET_H 1
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <linux/if_ether.h>     /* IEEE 802.3 Ethernet constants */
-
-__BEGIN_DECLS
-
-/* This is a name for the 48 bit ethernet address available on many
-   systems.  */
-struct ether_addr
-{
-  u_int8_t ether_addr_octet[ETH_ALEN];
-} __attribute__ ((__packed__));
-
-/* 10Mb/s ethernet header */
-struct ether_header
-{
-  u_int8_t  ether_dhost[ETH_ALEN];	/* destination eth addr	*/
-  u_int8_t  ether_shost[ETH_ALEN];	/* source ether addr	*/
-  u_int16_t ether_type;		        /* packet type ID field	*/
-} __attribute__ ((__packed__));
-
-/* Ethernet protocol ID's */
-#define	ETHERTYPE_PUP		0x0200          /* Xerox PUP */
-#define ETHERTYPE_SPRITE	0x0500		/* Sprite */
-#define	ETHERTYPE_IP		0x0800		/* IP */
-#define	ETHERTYPE_ARP		0x0806		/* Address resolution */
-#define	ETHERTYPE_REVARP	0x8035		/* Reverse ARP */
-#define ETHERTYPE_AT		0x809B		/* AppleTalk protocol */
-#define ETHERTYPE_AARP		0x80F3		/* AppleTalk ARP */
-#define	ETHERTYPE_VLAN		0x8100		/* IEEE 802.1Q VLAN tagging */
-#define ETHERTYPE_IPX		0x8137		/* IPX */
-#define	ETHERTYPE_IPV6		0x86dd		/* IP protocol version 6 */
-#define ETHERTYPE_LOOPBACK	0x9000		/* used to test interfaces */
-
-
-#define	ETHER_ADDR_LEN	ETH_ALEN                 /* size of ethernet addr */
-#define	ETHER_TYPE_LEN	2                        /* bytes in type field */
-#define	ETHER_CRC_LEN	4                        /* bytes in CRC field */
-#define	ETHER_HDR_LEN	ETH_HLEN                 /* total octets in header */
-#define	ETHER_MIN_LEN	(ETH_ZLEN + ETHER_CRC_LEN) /* min packet length */
-#define	ETHER_MAX_LEN	(ETH_FRAME_LEN + ETHER_CRC_LEN) /* max packet length */
-
-/* make sure ethenet length is valid */
-#define	ETHER_IS_VALID_LEN(foo)	\
-	((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
-
-/*
- * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
- * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
- * by an ETHER type (as given above) and then the (variable-length) header.
- */
-#define	ETHERTYPE_TRAIL		0x1000		/* Trailer packet */
-#define	ETHERTYPE_NTRAILER	16
-
-#define	ETHERMTU	ETH_DATA_LEN
-#define	ETHERMIN	(ETHER_MIN_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN)
-
-__END_DECLS
-
-#endif	/* net/ethernet.h */
diff --git a/openflow/usr/include/net/if.h b/openflow/usr/include/net/if.h
deleted file mode 100644
index bbc2094..0000000
--- a/openflow/usr/include/net/if.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* net/if.h -- declarations for inquiring about network interfaces
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NET_IF_H
-#define _NET_IF_H	1
-
-#include <features.h>
-
-#ifdef __USE_MISC
-# include <sys/types.h>
-# include <sys/socket.h>
-#endif
-
-
-/* Length of interface name.  */
-#define IF_NAMESIZE	16
-
-struct if_nameindex
-  {
-    unsigned int if_index;	/* 1, 2, ... */
-    char *if_name;		/* null terminated name: "eth0", ... */
-  };
-
-
-#ifdef __USE_MISC
-/* Standard interface flags. */
-enum
-  {
-    IFF_UP = 0x1,		/* Interface is up.  */
-# define IFF_UP	IFF_UP
-    IFF_BROADCAST = 0x2,	/* Broadcast address valid.  */
-# define IFF_BROADCAST	IFF_BROADCAST
-    IFF_DEBUG = 0x4,		/* Turn on debugging.  */
-# define IFF_DEBUG	IFF_DEBUG
-    IFF_LOOPBACK = 0x8,		/* Is a loopback net.  */
-# define IFF_LOOPBACK	IFF_LOOPBACK
-    IFF_POINTOPOINT = 0x10,	/* Interface is point-to-point link.  */
-# define IFF_POINTOPOINT IFF_POINTOPOINT
-    IFF_NOTRAILERS = 0x20,	/* Avoid use of trailers.  */
-# define IFF_NOTRAILERS	IFF_NOTRAILERS
-    IFF_RUNNING = 0x40,		/* Resources allocated.  */
-# define IFF_RUNNING	IFF_RUNNING
-    IFF_NOARP = 0x80,		/* No address resolution protocol.  */
-# define IFF_NOARP	IFF_NOARP
-    IFF_PROMISC = 0x100,	/* Receive all packets.  */
-# define IFF_PROMISC	IFF_PROMISC
-
-    /* Not supported */
-    IFF_ALLMULTI = 0x200,	/* Receive all multicast packets.  */
-# define IFF_ALLMULTI	IFF_ALLMULTI
-
-    IFF_MASTER = 0x400,		/* Master of a load balancer.  */
-# define IFF_MASTER	IFF_MASTER
-    IFF_SLAVE = 0x800,		/* Slave of a load balancer.  */
-# define IFF_SLAVE	IFF_SLAVE
-
-    IFF_MULTICAST = 0x1000,	/* Supports multicast.  */
-# define IFF_MULTICAST	IFF_MULTICAST
-
-    IFF_PORTSEL = 0x2000,	/* Can set media type.  */
-# define IFF_PORTSEL	IFF_PORTSEL
-    IFF_AUTOMEDIA = 0x4000,	/* Auto media select active.  */
-# define IFF_AUTOMEDIA	IFF_AUTOMEDIA
-    IFF_DYNAMIC = 0x8000	/* Dialup device with changing addresses.  */
-# define IFF_DYNAMIC	IFF_DYNAMIC
-  };
-
-/* The ifaddr structure contains information about one address of an
-   interface.  They are maintained by the different address families,
-   are allocated and attached when an address is set, and are linked
-   together so all addresses for an interface can be located.  */
-
-struct ifaddr
-  {
-    struct sockaddr ifa_addr;	/* Address of interface.  */
-    union
-      {
-	struct sockaddr	ifu_broadaddr;
-	struct sockaddr	ifu_dstaddr;
-      } ifa_ifu;
-    struct iface *ifa_ifp;	/* Back-pointer to interface.  */
-    struct ifaddr *ifa_next;	/* Next address for interface.  */
-  };
-
-# define ifa_broadaddr	ifa_ifu.ifu_broadaddr	/* broadcast address	*/
-# define ifa_dstaddr	ifa_ifu.ifu_dstaddr	/* other end of link	*/
-
-/* Device mapping structure. I'd just gone off and designed a
-   beautiful scheme using only loadable modules with arguments for
-   driver options and along come the PCMCIA people 8)
-
-   Ah well. The get() side of this is good for WDSETUP, and it'll be
-   handy for debugging things. The set side is fine for now and being
-   very small might be worth keeping for clean configuration.  */
-
-struct ifmap
-  {
-    unsigned long int mem_start;
-    unsigned long int mem_end;
-    unsigned short int base_addr;
-    unsigned char irq;
-    unsigned char dma;
-    unsigned char port;
-    /* 3 bytes spare */
-  };
-
-/* Interface request structure used for socket ioctl's.  All interface
-   ioctl's must have parameter definitions which begin with ifr_name.
-   The remainder may be interface specific.  */
-
-struct ifreq
-  {
-# define IFHWADDRLEN	6
-# define IFNAMSIZ	IF_NAMESIZE
-    union
-      {
-	char ifrn_name[IFNAMSIZ];	/* Interface name, e.g. "en0".  */
-      } ifr_ifrn;
-
-    union
-      {
-	struct sockaddr ifru_addr;
-	struct sockaddr ifru_dstaddr;
-	struct sockaddr ifru_broadaddr;
-	struct sockaddr ifru_netmask;
-	struct sockaddr ifru_hwaddr;
-	short int ifru_flags;
-	int ifru_ivalue;
-	int ifru_mtu;
-	struct ifmap ifru_map;
-	char ifru_slave[IFNAMSIZ];	/* Just fits the size */
-	char ifru_newname[IFNAMSIZ];
-	__caddr_t ifru_data;
-      } ifr_ifru;
-  };
-# define ifr_name	ifr_ifrn.ifrn_name	/* interface name 	*/
-# define ifr_hwaddr	ifr_ifru.ifru_hwaddr	/* MAC address 		*/
-# define ifr_addr	ifr_ifru.ifru_addr	/* address		*/
-# define ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-p lnk	*/
-# define ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address	*/
-# define ifr_netmask	ifr_ifru.ifru_netmask	/* interface net mask	*/
-# define ifr_flags	ifr_ifru.ifru_flags	/* flags		*/
-# define ifr_metric	ifr_ifru.ifru_ivalue	/* metric		*/
-# define ifr_mtu	ifr_ifru.ifru_mtu	/* mtu			*/
-# define ifr_map	ifr_ifru.ifru_map	/* device map		*/
-# define ifr_slave	ifr_ifru.ifru_slave	/* slave device		*/
-# define ifr_data	ifr_ifru.ifru_data	/* for use by interface	*/
-# define ifr_ifindex	ifr_ifru.ifru_ivalue    /* interface index      */
-# define ifr_bandwidth	ifr_ifru.ifru_ivalue	/* link bandwidth	*/
-# define ifr_qlen	ifr_ifru.ifru_ivalue	/* queue length		*/
-# define ifr_newname	ifr_ifru.ifru_newname	/* New name		*/
-# define _IOT_ifreq	_IOT(_IOTS(char),IFNAMSIZ,_IOTS(char),16,0,0)
-# define _IOT_ifreq_short _IOT(_IOTS(char),IFNAMSIZ,_IOTS(short),1,0,0)
-# define _IOT_ifreq_int	_IOT(_IOTS(char),IFNAMSIZ,_IOTS(int),1,0,0)
-
-
-/* Structure used in SIOCGIFCONF request.  Used to retrieve interface
-   configuration for machine (useful for programs which must know all
-   networks accessible).  */
-
-struct ifconf
-  {
-    int	ifc_len;			/* Size of buffer.  */
-    union
-      {
-	__caddr_t ifcu_buf;
-	struct ifreq *ifcu_req;
-      } ifc_ifcu;
-  };
-# define ifc_buf	ifc_ifcu.ifcu_buf	/* Buffer address.  */
-# define ifc_req	ifc_ifcu.ifcu_req	/* Array of structures.  */
-# define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) /* not right */
-#endif	/* Misc.  */
-
-__BEGIN_DECLS
-
-/* Convert an interface name to an index, and vice versa.  */
-extern unsigned int if_nametoindex (const char *__ifname) __THROW;
-extern char *if_indextoname (unsigned int __ifindex, char *__ifname) __THROW;
-
-/* Return a list of all interfaces and their indices.  */
-extern struct if_nameindex *if_nameindex (void) __THROW;
-
-/* Free the data returned from if_nameindex.  */
-extern void if_freenameindex (struct if_nameindex *__ptr) __THROW;
-
-__END_DECLS
-
-#endif /* net/if.h */
diff --git a/openflow/usr/include/net/if_arp.h b/openflow/usr/include/net/if_arp.h
deleted file mode 100644
index 1b3f1d3..0000000
--- a/openflow/usr/include/net/if_arp.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Definitions for Address Resolution Protocol.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Based on the 4.4BSD and Linux version of this file.  */
-
-#ifndef _NET_IF_ARP_H
-
-#define _NET_IF_ARP_H 1
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-__BEGIN_DECLS
-
-/* Some internals from deep down in the kernel.  */
-#define MAX_ADDR_LEN	7
-
-
-/* This structure defines an ethernet arp header.  */
-
-/* ARP protocol opcodes. */
-#define	ARPOP_REQUEST	1		/* ARP request.  */
-#define	ARPOP_REPLY	2		/* ARP reply.  */
-#define	ARPOP_RREQUEST	3		/* RARP request.  */
-#define	ARPOP_RREPLY	4		/* RARP reply.  */
-#define	ARPOP_InREQUEST	8		/* InARP request.  */
-#define	ARPOP_InREPLY	9		/* InARP reply.  */
-#define	ARPOP_NAK	10		/* (ATM)ARP NAK.  */
-
-/* See RFC 826 for protocol description.  ARP packets are variable
-   in size; the arphdr structure defines the fixed-length portion.
-   Protocol type values are the same as those for 10 Mb/s Ethernet.
-   It is followed by the variable-sized fields ar_sha, arp_spa,
-   arp_tha and arp_tpa in that order, according to the lengths
-   specified.  Field names used correspond to RFC 826.  */
-
-struct arphdr
-  {
-    unsigned short int ar_hrd;		/* Format of hardware address.  */
-    unsigned short int ar_pro;		/* Format of protocol address.  */
-    unsigned char ar_hln;		/* Length of hardware address.  */
-    unsigned char ar_pln;		/* Length of protocol address.  */
-    unsigned short int ar_op;		/* ARP opcode (command).  */
-#if 0
-    /* Ethernet looks like this : This bit is variable sized
-       however...  */
-    unsigned char __ar_sha[ETH_ALEN];	/* Sender hardware address.  */
-    unsigned char __ar_sip[4];		/* Sender IP address.  */
-    unsigned char __ar_tha[ETH_ALEN];	/* Target hardware address.  */
-    unsigned char __ar_tip[4];		/* Target IP address.  */
-#endif
-  };
-
-
-/* ARP protocol HARDWARE identifiers. */
-#define ARPHRD_NETROM	0		/* From KA9Q: NET/ROM pseudo. */
-#define ARPHRD_ETHER 	1		/* Ethernet 10/100Mbps.  */
-#define	ARPHRD_EETHER	2		/* Experimental Ethernet.  */
-#define	ARPHRD_AX25	3		/* AX.25 Level 2.  */
-#define	ARPHRD_PRONET	4		/* PROnet token ring.  */
-#define	ARPHRD_CHAOS	5		/* Chaosnet.  */
-#define	ARPHRD_IEEE802	6		/* IEEE 802.2 Ethernet/TR/TB.  */
-#define	ARPHRD_ARCNET	7		/* ARCnet.  */
-#define	ARPHRD_APPLETLK	8		/* APPLEtalk.  */
-#define	ARPHRD_DLCI	15		/* Frame Relay DLCI.  */
-#define	ARPHRD_ATM	19		/* ATM.  */
-#define	ARPHRD_METRICOM	23		/* Metricom STRIP (new IANA id).  */
-#define ARPHRD_IEEE1394	24		/* IEEE 1394 IPv4 - RFC 2734.  */
-#define ARPHRD_EUI64		27		/* EUI-64.  */
-#define ARPHRD_INFINIBAND	32		/* InfiniBand.  */
-
-/* Dummy types for non ARP hardware */
-#define ARPHRD_SLIP	256
-#define ARPHRD_CSLIP	257
-#define ARPHRD_SLIP6	258
-#define ARPHRD_CSLIP6	259
-#define ARPHRD_RSRVD	260		/* Notional KISS type.  */
-#define ARPHRD_ADAPT	264
-#define ARPHRD_ROSE	270
-#define ARPHRD_X25	271		/* CCITT X.25.  */
-#define ARPHRD_HWX25	272		/* Boards with X.25 in firmware.  */
-#define ARPHRD_PPP	512
-#define ARPHRD_CISCO	513		/* Cisco HDLC.  */
-#define ARPHRD_HDLC	ARPHRD_CISCO
-#define ARPHRD_LAPB	516		/* LAPB.  */
-#define ARPHRD_DDCMP	517		/* Digital's DDCMP.  */
-#define	ARPHRD_RAWHDLC	518		/* Raw HDLC.  */
-
-#define ARPHRD_TUNNEL	768		/* IPIP tunnel.  */
-#define ARPHRD_TUNNEL6	769		/* IPIP6 tunnel.  */
-#define ARPHRD_FRAD	770             /* Frame Relay Access Device.  */
-#define ARPHRD_SKIP	771		/* SKIP vif.  */
-#define ARPHRD_LOOPBACK	772		/* Loopback device.  */
-#define ARPHRD_LOCALTLK 773		/* Localtalk device.  */
-#define ARPHRD_FDDI	774		/* Fiber Distributed Data Interface. */
-#define ARPHRD_BIF	775             /* AP1000 BIF.  */
-#define ARPHRD_SIT	776		/* sit0 device - IPv6-in-IPv4.  */
-#define ARPHRD_IPDDP	777		/* IP-in-DDP tunnel.  */
-#define ARPHRD_IPGRE	778		/* GRE over IP.  */
-#define ARPHRD_PIMREG	779		/* PIMSM register interface.  */
-#define ARPHRD_HIPPI	780		/* High Performance Parallel I'face. */
-#define ARPHRD_ASH	781		/* (Nexus Electronics) Ash.  */
-#define ARPHRD_ECONET	782		/* Acorn Econet.  */
-#define ARPHRD_IRDA	783		/* Linux-IrDA.  */
-#define ARPHRD_FCPP	784		/* Point to point fibrechanel.  */
-#define ARPHRD_FCAL	785		/* Fibrechanel arbitrated loop.  */
-#define ARPHRD_FCPL	786		/* Fibrechanel public loop.  */
-#define ARPHRD_FCFABRIC 787		/* Fibrechanel fabric.  */
-#define ARPHRD_IEEE802_TR 800		/* Magic type ident for TR.  */
-#define ARPHRD_IEEE80211 801		/* IEEE 802.11.  */
-#define ARPHRD_IEEE80211_PRISM 802	/* IEEE 802.11 + Prism2 header.  */
-#define ARPHRD_IEEE80211_RADIOTAP 803	/* IEEE 802.11 + radiotap header.  */
-#define ARPHRD_IEEE802154 804		/* IEEE 802.15.4 header.  */
-#define ARPHRD_IEEE802154_PHY 805	/* IEEE 802.15.4 PHY header.  */
-
-#define ARPHRD_VOID	  0xFFFF	/* Void type, nothing is known.  */
-#define ARPHRD_NONE	  0xFFFE	/* Zero header length.  */
-
-
-/* ARP ioctl request.  */
-struct arpreq
-  {
-    struct sockaddr arp_pa;		/* Protocol address.  */
-    struct sockaddr arp_ha;		/* Hardware address.  */
-    int arp_flags;			/* Flags.  */
-    struct sockaddr arp_netmask;	/* Netmask (only for proxy arps).  */
-    char arp_dev[16];
-  };
-
-struct arpreq_old
-  {
-    struct sockaddr arp_pa;		/* Protocol address.  */
-    struct sockaddr arp_ha;		/* Hardware address.  */
-    int arp_flags;			/* Flags.  */
-    struct sockaddr arp_netmask;	/* Netmask (only for proxy arps).  */
-  };
-
-/* ARP Flag values.  */
-#define ATF_COM		0x02		/* Completed entry (ha valid).  */
-#define	ATF_PERM	0x04		/* Permanent entry.  */
-#define	ATF_PUBL	0x08		/* Publish entry.  */
-#define	ATF_USETRAILERS	0x10		/* Has requested trailers.  */
-#define ATF_NETMASK     0x20            /* Want to use a netmask (only
-					   for proxy entries).  */
-#define ATF_DONTPUB	0x40		/* Don't answer this addresses.  */
-#define ATF_MAGIC	0x80		/* Automatically added entry.  */
-
-
-/* Support for the user space arp daemon, arpd.  */
-#define ARPD_UPDATE	0x01
-#define ARPD_LOOKUP	0x02
-#define ARPD_FLUSH	0x03
-
-struct arpd_request
-  {
-    unsigned short int req;		/* Request type.  */
-    u_int32_t ip;			/* IP address of entry.  */
-    unsigned long int dev;		/* Device entry is tied to.  */
-    unsigned long int stamp;
-    unsigned long int updated;
-    unsigned char ha[MAX_ADDR_LEN];	/* Hardware address.  */
-  };
-
-__END_DECLS
-
-#endif	/* net/if_arp.h */
diff --git a/openflow/usr/include/net/if_packet.h b/openflow/usr/include/net/if_packet.h
deleted file mode 100644
index 67f9f98..0000000
--- a/openflow/usr/include/net/if_packet.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Definitions for use with Linux SOCK_PACKET sockets.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __IF_PACKET_H
-#define __IF_PACKET_H
-
-#include <features.h>
-#include <bits/sockaddr.h>
-
-/* This is the SOCK_PACKET address structure as used in Linux 2.0.
-   From Linux 2.1 the AF_PACKET interface is preferred and you should
-   consider using it in place of this one.  */
-
-struct sockaddr_pkt
-  {
-    __SOCKADDR_COMMON (spkt_);
-    unsigned char spkt_device[14];
-    unsigned short spkt_protocol;
-  };
-
-#endif
diff --git a/openflow/usr/include/net/if_ppp.h b/openflow/usr/include/net/if_ppp.h
deleted file mode 100644
index 1b1c3ea..0000000
--- a/openflow/usr/include/net/if_ppp.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*	From: if_ppp.h,v 1.3 1995/06/12 11:36:50 paulus Exp */
-
-/*
- * if_ppp.h - Point-to-Point Protocol definitions.
- *
- * Copyright (c) 1989 Carnegie Mellon University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE UNIVERSITY OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
- *  ==FILEVERSION 960926==
- *
- *  NOTE TO MAINTAINERS:
- *     If you modify this file at all, please set the above date.
- *     if_ppp.h is shipped with a PPP distribution as well as with the kernel;
- *     if everyone increases the FILEVERSION number above, then scripts
- *     can do the right thing when deciding whether to install a new if_ppp.h
- *     file.  Don't change the format of that line otherwise, so the
- *     installation script can recognize it.
- */
-
-
-#ifndef __NET_IF_PPP_H
-#define __NET_IF_PPP_H 1
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-#include <net/if.h>
-#include <sys/ioctl.h>
-#include <net/ppp_defs.h>
-
-__BEGIN_DECLS
-
-/*
- * Packet sizes
- */
-
-#define	PPP_MTU		1500	/* Default MTU (size of Info field) */
-#define PPP_MAXMRU	65000	/* Largest MRU we allow */
-#define PPP_VERSION	"2.2.0"
-#define PPP_MAGIC	0x5002	/* Magic value for the ppp structure */
-#define PROTO_IPX	0x002b	/* protocol numbers */
-#define PROTO_DNA_RT    0x0027  /* DNA Routing */
-
-
-/*
- * Bit definitions for flags.
- */
-
-#define SC_COMP_PROT	0x00000001	/* protocol compression (output) */
-#define SC_COMP_AC	0x00000002	/* header compression (output) */
-#define	SC_COMP_TCP	0x00000004	/* TCP (VJ) compression (output) */
-#define SC_NO_TCP_CCID	0x00000008	/* disable VJ connection-id comp. */
-#define SC_REJ_COMP_AC	0x00000010	/* reject adrs/ctrl comp. on input */
-#define SC_REJ_COMP_TCP	0x00000020	/* reject TCP (VJ) comp. on input */
-#define SC_CCP_OPEN	0x00000040	/* Look at CCP packets */
-#define SC_CCP_UP	0x00000080	/* May send/recv compressed packets */
-#define SC_ENABLE_IP	0x00000100	/* IP packets may be exchanged */
-#define SC_COMP_RUN	0x00001000	/* compressor has been inited */
-#define SC_DECOMP_RUN	0x00002000	/* decompressor has been inited */
-#define SC_DEBUG	0x00010000	/* enable debug messages */
-#define SC_LOG_INPKT	0x00020000	/* log contents of good pkts recvd */
-#define SC_LOG_OUTPKT	0x00040000	/* log contents of pkts sent */
-#define SC_LOG_RAWIN	0x00080000	/* log all chars received */
-#define SC_LOG_FLUSH	0x00100000	/* log all chars flushed */
-#define	SC_MASK		0x0fE0ffff	/* bits that user can change */
-
-/* state bits */
-#define	SC_ESCAPED	0x80000000	/* saw a PPP_ESCAPE */
-#define	SC_FLUSH	0x40000000	/* flush input until next PPP_FLAG */
-#define SC_VJ_RESET	0x20000000	/* Need to reset the VJ decompressor */
-#define SC_XMIT_BUSY	0x10000000	/* ppp_write_wakeup is active */
-#define SC_RCV_ODDP	0x08000000	/* have rcvd char with odd parity */
-#define SC_RCV_EVNP	0x04000000	/* have rcvd char with even parity */
-#define SC_RCV_B7_1	0x02000000	/* have rcvd char with bit 7 = 1 */
-#define SC_RCV_B7_0	0x01000000	/* have rcvd char with bit 7 = 0 */
-#define SC_DC_FERROR	0x00800000	/* fatal decomp error detected */
-#define SC_DC_ERROR	0x00400000	/* non-fatal decomp error detected */
-
-/*
- * Ioctl definitions.
- */
-
-struct npioctl {
-    int		protocol;	/* PPP protocol, e.g. PPP_IP */
-    enum NPmode	mode;
-};
-
-/* Structure describing a CCP configuration option, for PPPIOCSCOMPRESS */
-struct ppp_option_data {
-	u_int8_t  *ptr;
-	u_int32_t length;
-	int	  transmit;
-};
-
-struct ifpppstatsreq {
-  struct ifreq	   b;
-  struct ppp_stats stats;			/* statistic information */
-};
-
-struct ifpppcstatsreq {
-  struct ifreq		b;
-  struct ppp_comp_stats stats;
-};
-
-#define ifr__name       b.ifr_ifrn.ifrn_name
-#define stats_ptr       b.ifr_ifru.ifru_data
-
-/*
- * Ioctl definitions.
- */
-
-#define	PPPIOCGFLAGS	_IOR('t', 90, int)	/* get configuration flags */
-#define	PPPIOCSFLAGS	_IOW('t', 89, int)	/* set configuration flags */
-#define	PPPIOCGASYNCMAP	_IOR('t', 88, int)	/* get async map */
-#define	PPPIOCSASYNCMAP	_IOW('t', 87, int)	/* set async map */
-#define	PPPIOCGUNIT	_IOR('t', 86, int)	/* get ppp unit number */
-#define	PPPIOCGRASYNCMAP _IOR('t', 85, int)	/* get receive async map */
-#define	PPPIOCSRASYNCMAP _IOW('t', 84, int)	/* set receive async map */
-#define	PPPIOCGMRU	_IOR('t', 83, int)	/* get max receive unit */
-#define	PPPIOCSMRU	_IOW('t', 82, int)	/* set max receive unit */
-#define	PPPIOCSMAXCID	_IOW('t', 81, int)	/* set VJ max slot ID */
-#define PPPIOCGXASYNCMAP _IOR('t', 80, ext_accm) /* get extended ACCM */
-#define PPPIOCSXASYNCMAP _IOW('t', 79, ext_accm) /* set extended ACCM */
-#define PPPIOCXFERUNIT	_IO('t', 78)		/* transfer PPP unit */
-#define PPPIOCSCOMPRESS	_IOW('t', 77, struct ppp_option_data)
-#define PPPIOCGNPMODE	_IOWR('t', 76, struct npioctl) /* get NP mode */
-#define PPPIOCSNPMODE	_IOW('t', 75, struct npioctl)  /* set NP mode */
-#define PPPIOCGDEBUG	_IOR('t', 65, int)	/* Read debug level */
-#define PPPIOCSDEBUG	_IOW('t', 64, int)	/* Set debug level */
-#define PPPIOCGIDLE	_IOR('t', 63, struct ppp_idle) /* get idle time */
-
-#define SIOCGPPPSTATS   (SIOCDEVPRIVATE + 0)
-#define SIOCGPPPVER     (SIOCDEVPRIVATE + 1)  /* NEVER change this!! */
-#define SIOCGPPPCSTATS  (SIOCDEVPRIVATE + 2)
-
-#if !defined(ifr_mtu)
-#define ifr_mtu	ifr_ifru.ifru_metric
-#endif
-
-__END_DECLS
-
-#endif /* net/if_ppp.h */
diff --git a/openflow/usr/include/net/if_shaper.h b/openflow/usr/include/net/if_shaper.h
deleted file mode 100644
index 956ad62..0000000
--- a/openflow/usr/include/net/if_shaper.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NET_IF_SHAPER_H
-#define _NET_IF_SHAPER_H 1
-
-#include <features.h>
-#include <sys/types.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-
-__BEGIN_DECLS
-
-#define SHAPER_QLEN	10
-/*
- *	This is a bit speed dependant (read it shouldnt be a constant!)
- *
- *	5 is about right for 28.8 upwards. Below that double for every
- *	halving of speed or so. - ie about 20 for 9600 baud.
- */
-#define SHAPER_LATENCY	(5 * HZ)
-#define SHAPER_MAXSLIP	2
-#define SHAPER_BURST	(HZ / 50)	/* Good for >128K then */
-
-#define SHAPER_SET_DEV		0x0001
-#define SHAPER_SET_SPEED	0x0002
-#define SHAPER_GET_DEV		0x0003
-#define SHAPER_GET_SPEED	0x0004
-
-struct shaperconf
-{
-  u_int16_t ss_cmd;
-  union
-  {
-    char ssu_name[14];
-    u_int32_t ssu_speed;
-  } ss_u;
-#define ss_speed ss_u.ssu_speed
-#define ss_name ss_u.ssu_name
-};
-
-__END_DECLS
-
-#endif /* net/if_shaper.h */
diff --git a/openflow/usr/include/net/if_slip.h b/openflow/usr/include/net/if_slip.h
deleted file mode 100644
index 25856d0..0000000
--- a/openflow/usr/include/net/if_slip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NET_IF_SLIP_H
-#define _NET_IF_SLIP_H 1
-
-/* We can use the kernel header.  */
-#include <linux/if_slip.h>
-
-#endif	/* net/if_slip.h.  */
diff --git a/openflow/usr/include/net/ppp-comp.h b/openflow/usr/include/net/ppp-comp.h
deleted file mode 100644
index 4a992d5..0000000
--- a/openflow/usr/include/net/ppp-comp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linux/ppp-comp.h>
diff --git a/openflow/usr/include/net/ppp_defs.h b/openflow/usr/include/net/ppp_defs.h
deleted file mode 100644
index f8924c4..0000000
--- a/openflow/usr/include/net/ppp_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _NET_PPP_DEFS_H
-#define _NET_PPP_DEFS_H 1
-
-#define __need_time_t
-#include <time.h>
-
-#include <asm/types.h>
-#include <linux/ppp_defs.h>
-
-#endif /* net/ppp_defs.h */
diff --git a/openflow/usr/include/net/route.h b/openflow/usr/include/net/route.h
deleted file mode 100644
index 11d21c6..0000000
--- a/openflow/usr/include/net/route.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Based on the 4.4BSD and Linux version of this file.  */
-
-#ifndef _NET_ROUTE_H
-#define _NET_ROUTE_H	1
-
-#include <features.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <bits/wordsize.h>
-
-
-/* This structure gets passed by the SIOCADDRT and SIOCDELRT calls. */
-struct rtentry
-  {
-    unsigned long int rt_pad1;
-    struct sockaddr rt_dst;		/* Target address.  */
-    struct sockaddr rt_gateway;		/* Gateway addr (RTF_GATEWAY).  */
-    struct sockaddr rt_genmask;		/* Target network mask (IP).  */
-    unsigned short int rt_flags;
-    short int rt_pad2;
-    unsigned long int rt_pad3;
-    unsigned char rt_tos;
-    unsigned char rt_class;
-#if __WORDSIZE == 64
-    short int rt_pad4[3];
-#else
-    short int rt_pad4;
-#endif
-    short int rt_metric;		/* +1 for binary compatibility!  */
-    char *rt_dev;			/* Forcing the device at add.  */
-    unsigned long int rt_mtu;		/* Per route MTU/Window.  */
-    unsigned long int rt_window;	/* Window clamping.  */
-    unsigned short int rt_irtt;		/* Initial RTT.  */
-  };
-/* Compatibility hack.  */
-#define rt_mss	rt_mtu
-
-
-struct in6_rtmsg
-  {
-    struct in6_addr rtmsg_dst;
-    struct in6_addr rtmsg_src;
-    struct in6_addr rtmsg_gateway;
-    u_int32_t rtmsg_type;
-    u_int16_t rtmsg_dst_len;
-    u_int16_t rtmsg_src_len;
-    u_int32_t rtmsg_metric;
-    unsigned long int rtmsg_info;
-    u_int32_t rtmsg_flags;
-    int rtmsg_ifindex;
-  };
-
-
-#define	RTF_UP		0x0001		/* Route usable.  */
-#define	RTF_GATEWAY	0x0002		/* Destination is a gateway.  */
-
-#define	RTF_HOST	0x0004		/* Host entry (net otherwise).  */
-#define RTF_REINSTATE	0x0008		/* Reinstate route after timeout.  */
-#define	RTF_DYNAMIC	0x0010		/* Created dyn. (by redirect).  */
-#define	RTF_MODIFIED	0x0020		/* Modified dyn. (by redirect).  */
-#define RTF_MTU		0x0040		/* Specific MTU for this route.  */
-#define RTF_MSS		RTF_MTU		/* Compatibility.  */
-#define RTF_WINDOW	0x0080		/* Per route window clamping.  */
-#define RTF_IRTT	0x0100		/* Initial round trip time.  */
-#define RTF_REJECT	0x0200		/* Reject route.  */
-#define	RTF_STATIC	0x0400		/* Manually injected route.  */
-#define	RTF_XRESOLVE	0x0800		/* External resolver.  */
-#define RTF_NOFORWARD   0x1000		/* Forwarding inhibited.  */
-#define RTF_THROW	0x2000		/* Go to next class.  */
-#define RTF_NOPMTUDISC  0x4000		/* Do not send packets with DF.  */
-
-/* for IPv6 */
-#define RTF_DEFAULT	0x00010000	/* default - learned via ND	*/
-#define RTF_ALLONLINK	0x00020000	/* fallback, no routers on link	*/
-#define RTF_ADDRCONF	0x00040000	/* addrconf route - RA		*/
-
-#define RTF_LINKRT	0x00100000	/* link specific - device match	*/
-#define RTF_NONEXTHOP	0x00200000	/* route with no nexthop	*/
-
-#define RTF_CACHE	0x01000000	/* cache entry			*/
-#define RTF_FLOW	0x02000000	/* flow significant route	*/
-#define RTF_POLICY	0x04000000	/* policy route			*/
-
-#define RTCF_VALVE	0x00200000
-#define RTCF_MASQ	0x00400000
-#define RTCF_NAT	0x00800000
-#define RTCF_DOREDIRECT 0x01000000
-#define RTCF_LOG	0x02000000
-#define RTCF_DIRECTSRC	0x04000000
-
-#define RTF_LOCAL	0x80000000
-#define RTF_INTERFACE	0x40000000
-#define RTF_MULTICAST	0x20000000
-#define RTF_BROADCAST	0x10000000
-#define RTF_NAT		0x08000000
-
-#define RTF_ADDRCLASSMASK	0xF8000000
-#define RT_ADDRCLASS(flags)	((__u_int32_t) flags >> 23)
-
-#define RT_TOS(tos)		((tos) & IPTOS_TOS_MASK)
-
-#define RT_LOCALADDR(flags)	((flags & RTF_ADDRCLASSMASK) \
-				 == (RTF_LOCAL|RTF_INTERFACE))
-
-#define RT_CLASS_UNSPEC		0
-#define RT_CLASS_DEFAULT	253
-
-#define RT_CLASS_MAIN		254
-#define RT_CLASS_LOCAL		255
-#define RT_CLASS_MAX		255
-
-
-#define RTMSG_ACK		NLMSG_ACK
-#define RTMSG_OVERRUN		NLMSG_OVERRUN
-
-#define RTMSG_NEWDEVICE		0x11
-#define RTMSG_DELDEVICE		0x12
-#define RTMSG_NEWROUTE		0x21
-#define RTMSG_DELROUTE		0x22
-#define RTMSG_NEWRULE		0x31
-#define RTMSG_DELRULE		0x32
-#define RTMSG_CONTROL		0x40
-
-#define RTMSG_AR_FAILED		0x51	/* Address Resolution failed.  */
-
-#endif /* net/route.h */
diff --git a/openflow/usr/include/netash/ash.h b/openflow/usr/include/netash/ash.h
deleted file mode 100644
index 2ce600d..0000000
--- a/openflow/usr/include/netash/ash.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Definitions for use with Linux AF_ASH sockets.
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETASH_ASH_H
-#define _NETASH_ASH_H	1
-
-#include <features.h>
-#include <bits/sockaddr.h>
-
-struct sockaddr_ash
-  {
-    __SOCKADDR_COMMON (sash_);		/* Common data: address family etc.  */
-    int sash_ifindex;			/* Interface to use.  */
-    unsigned char sash_channel;		/* Realtime or control.  */
-    unsigned int sash_plen;
-    unsigned char sash_prefix[16];
-  };
-
-/* Values for `channel' member.  */
-#define ASH_CHANNEL_ANY		0
-#define ASH_CHANNEL_CONTROL	1
-#define ASH_CHANNEL_REALTIME	2
-
-#endif	/* netash/ash.h */
diff --git a/openflow/usr/include/netatalk/at.h b/openflow/usr/include/netatalk/at.h
deleted file mode 100644
index 34945d8..0000000
--- a/openflow/usr/include/netatalk/at.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETATALK_AT_H
-#define _NETATALK_AT_H 1
-
-#include <asm/types.h>
-#include <bits/sockaddr.h>
-#include <linux/atalk.h>
-#include <sys/socket.h>
-
-#define SOL_ATALK       258     /* sockopt level for atalk */
-
-#endif	/* netatalk/at.h */
diff --git a/openflow/usr/include/netax25/ax25.h b/openflow/usr/include/netax25/ax25.h
deleted file mode 100644
index 13883a0..0000000
--- a/openflow/usr/include/netax25/ax25.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETAX25_AX25_H
-#define _NETAX25_AX25_H	1
-
-#include <features.h>
-#include <bits/sockaddr.h>
-
-/* Setsockoptions(2) level.  Thanks to BSD these must match IPPROTO_xxx.  */
-#define SOL_AX25	257
-
-/* AX.25 flags: */
-#define AX25_WINDOW	1
-#define AX25_T1		2
-#define AX25_T2		5
-#define AX25_T3		4
-#define AX25_N2		3
-#define AX25_BACKOFF	6
-#define AX25_EXTSEQ	7
-#define AX25_PIDINCL	8
-#define AX25_IDLE	9
-#define	AX25_PACLEN	10
-#define AX25_IPMAXQUEUE 11
-#define AX25_IAMDIGI	12
-#define AX25_KILL	99
-
-/* AX.25 socket ioctls: */
-#define SIOCAX25GETUID		(SIOCPROTOPRIVATE)
-#define SIOCAX25ADDUID		(SIOCPROTOPRIVATE+1)
-#define SIOCAX25DELUID		(SIOCPROTOPRIVATE+2)
-#define SIOCAX25NOUID		(SIOCPROTOPRIVATE+3)
-#define SIOCAX25BPQADDR		(SIOCPROTOPRIVATE+4)
-#define SIOCAX25GETPARMS	(SIOCPROTOPRIVATE+5)
-#define SIOCAX25SETPARMS	(SIOCPROTOPRIVATE+6)
-#define SIOCAX25OPTRT		(SIOCPROTOPRIVATE+7)
-#define SIOCAX25CTLCON		(SIOCPROTOPRIVATE+8)
-#define SIOCAX25GETINFO		(SIOCPROTOPRIVATE+9)
-#define SIOCAX25ADDFWD		(SIOCPROTOPRIVATE+10)
-#define SIOCAX25DELFWD		(SIOCPROTOPRIVATE+11)
-
-/* unknown: */
-#define AX25_NOUID_DEFAULT	0
-#define AX25_NOUID_BLOCK	1
-#define AX25_SET_RT_IPMODE	2
-
-/* Digipeating flags: */
-#define AX25_DIGI_INBAND	0x01	/* Allow digipeating within port */
-#define AX25_DIGI_XBAND		0x02	/* Allow digipeating across ports */
-
-/* Maximim number of digipeaters: */
-#define AX25_MAX_DIGIS 8
-
-
-typedef struct
-  {
-    char ax25_call[7];		/* 6 call + SSID (shifted ascii) */
-  }
-ax25_address;
-
-struct sockaddr_ax25
-  {
-    sa_family_t sax25_family;
-    ax25_address sax25_call;
-    int sax25_ndigis;
-  };
-
-/*
- * The sockaddr struct with the digipeater adresses:
- */
-struct full_sockaddr_ax25
-  {
-    struct sockaddr_ax25 fsa_ax25;
-    ax25_address fsa_digipeater[AX25_MAX_DIGIS];
-  };
-#define sax25_uid	sax25_ndigis
-
-struct ax25_routes_struct
-  {
-    ax25_address port_addr;
-    ax25_address dest_addr;
-    unsigned char digi_count;
-    ax25_address digi_addr[AX25_MAX_DIGIS];
-  };
-
-/* The AX.25 ioctl structure: */
-struct ax25_ctl_struct
-  {
-    ax25_address port_addr;
-    ax25_address source_addr;
-    ax25_address dest_addr;
-    unsigned int cmd;
-    unsigned long arg;
-    unsigned char digi_count;
-    ax25_address digi_addr[AX25_MAX_DIGIS];
-  };
-
-struct ax25_info_struct
-  {
-    unsigned int  n2, n2count;
-    unsigned int t1, t1timer;
-    unsigned int t2, t2timer;
-    unsigned int t3, t3timer;
-    unsigned int idle, idletimer;
-    unsigned int state;
-    unsigned int rcv_q, snd_q;
-  };
-
-struct ax25_fwd_struct
-  {
-    ax25_address port_from;
-    ax25_address port_to;
-  };
-
-/* AX.25 route structure: */
-struct ax25_route_opt_struct
-  {
-    ax25_address port_addr;
-    ax25_address dest_addr;
-    int cmd;
-    int arg;
-  };
-
-/* AX.25 BPQ stuff: */
-struct ax25_bpqaddr_struct
-  {
-    char dev[16];
-    ax25_address addr;
-  };
-
-/* Definitions for the AX.25 `values' fields: */
-#define	AX25_VALUES_IPDEFMODE	0	/* 'D'=DG 'V'=VC */
-#define	AX25_VALUES_AXDEFMODE	1	/* 8=Normal 128=Extended Seq Nos */
-#define	AX25_VALUES_NETROM	2	/* Allow NET/ROM  - 0=No 1=Yes */
-#define	AX25_VALUES_TEXT	3	/* Allow PID=Text - 0=No 1=Yes */
-#define	AX25_VALUES_BACKOFF	4	/* 'E'=Exponential 'L'=Linear */
-#define	AX25_VALUES_CONMODE	5	/* Allow connected modes - 0=No 1=Yes */
-#define	AX25_VALUES_WINDOW	6	/* Default window size for standard AX.25 */
-#define	AX25_VALUES_EWINDOW	7	/* Default window size for extended AX.25 */
-#define	AX25_VALUES_T1		8	/* Default T1 timeout value */
-#define	AX25_VALUES_T2		9	/* Default T2 timeout value */
-#define	AX25_VALUES_T3		10	/* Default T3 timeout value */
-#define	AX25_VALUES_N2		11	/* Default N2 value */
-#define	AX25_VALUES_DIGI	12	/* Digipeat mode */
-#define AX25_VALUES_IDLE	13	/* mode vc idle timer */
-#define AX25_VALUES_PACLEN	14	/* AX.25 MTU */
-#define AX25_VALUES_IPMAXQUEUE  15	/* Maximum number of buffers enqueued */
-#define	AX25_MAX_VALUES		20
-
-struct ax25_parms_struct
-  {
-    ax25_address port_addr;
-    unsigned short values[AX25_MAX_VALUES];
-  };
-
-#endif /* netax25/ax25.h */
diff --git a/openflow/usr/include/netdb.h b/openflow/usr/include/netdb.h
deleted file mode 100644
index 3aba530..0000000
--- a/openflow/usr/include/netdb.h
+++ /dev/null
@@ -1,715 +0,0 @@
-  /* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* All data returned by the network data base library are supplied in
-   host order and returned in network order (suitable for use in
-   system calls).  */
-
-#ifndef	_NETDB_H
-#define	_NETDB_H	1
-
-#include <features.h>
-
-#include <netinet/in.h>
-#include <stdint.h>
-#ifdef __USE_MISC
-/* This is necessary to make this include file properly replace the
-   Sun version.  */
-# include <rpc/netdb.h>
-#endif
-
-#ifdef __USE_GNU
-# define __need_sigevent_t
-# include <bits/siginfo.h>
-# define __need_timespec
-# include <time.h>
-#endif
-
-#include <bits/netdb.h>
-
-/* Absolute file name for network data base files.  */
-#define	_PATH_HEQUIV		"/etc/hosts.equiv"
-#define	_PATH_HOSTS		"/etc/hosts"
-#define	_PATH_NETWORKS		"/etc/networks"
-#define	_PATH_NSSWITCH_CONF	"/etc/nsswitch.conf"
-#define	_PATH_PROTOCOLS		"/etc/protocols"
-#define	_PATH_SERVICES		"/etc/services"
-
-
-__BEGIN_DECLS
-
-#if defined __USE_MISC || !defined __USE_XOPEN2K8
-/* Error status for non-reentrant lookup functions.
-   We use a macro to access always the thread-specific `h_errno' variable.  */
-# define h_errno (*__h_errno_location ())
-
-/* Function to get address of global `h_errno' variable.  */
-extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
-
-
-/* Possible values left in `h_errno'.  */
-# define HOST_NOT_FOUND	1	/* Authoritative Answer Host not found.  */
-# define TRY_AGAIN	2	/* Non-Authoritative Host not found,
-				   or SERVERFAIL.  */
-# define NO_RECOVERY	3	/* Non recoverable errors, FORMERR, REFUSED,
-				   NOTIMP.  */
-# define NO_DATA	4	/* Valid name, no data record of requested
-				   type.  */
-#endif
-#ifdef __USE_MISC
-# define NETDB_INTERNAL	-1	/* See errno.  */
-# define NETDB_SUCCESS	0	/* No problem.  */
-# define NO_ADDRESS	NO_DATA	/* No address, look for MX record.  */
-#endif
-
-#if defined __USE_XOPEN2K || defined __USE_XOPEN_EXTENDED
-/* Highest reserved Internet port number.  */
-# define IPPORT_RESERVED	1024
-#endif
-
-#ifdef __USE_GNU
-/* Scope delimiter for getaddrinfo(), getnameinfo().  */
-# define SCOPE_DELIMITER	'%'
-#endif
-
-#ifdef __USE_MISC
-/* Print error indicated by `h_errno' variable on standard error.  STR
-   if non-null is printed before the error string.  */
-extern void herror (const char *__str) __THROW;
-
-/* Return string associated with error ERR_NUM.  */
-extern const char *hstrerror (int __err_num) __THROW;
-#endif
-
-
-/* Description of data base entry for a single host.  */
-struct hostent
-{
-  char *h_name;			/* Official name of host.  */
-  char **h_aliases;		/* Alias list.  */
-  int h_addrtype;		/* Host address type.  */
-  int h_length;			/* Length of address.  */
-  char **h_addr_list;		/* List of addresses from name server.  */
-#ifdef __USE_MISC
-# define	h_addr	h_addr_list[0] /* Address, for backward compatibility.*/
-#endif
-};
-
-/* Open host data base files and mark them as staying open even after
-   a later search if STAY_OPEN is non-zero.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void sethostent (int __stay_open);
-
-/* Close host data base files and clear `stay open' flag.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void endhostent (void);
-
-/* Get next entry from host data base file.  Open data base if
-   necessary.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct hostent *gethostent (void);
-
-/* Return entry from host data base which address match ADDR with
-   length LEN and type TYPE.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct hostent *gethostbyaddr (const void *__addr, __socklen_t __len,
-				      int __type);
-
-/* Return entry from host data base for host with NAME.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct hostent *gethostbyname (const char *__name);
-
-#ifdef __USE_MISC
-/* Return entry from host data base for host with NAME.  AF must be
-   set to the address type which is `AF_INET' for IPv4 or `AF_INET6'
-   for IPv6.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct hostent *gethostbyname2 (const char *__name, int __af);
-
-/* Reentrant versions of the functions above.  The additional
-   arguments specify a buffer of BUFLEN starting at BUF.  The last
-   argument is a pointer to a variable which gets the value which
-   would be stored in the global variable `herrno' by the
-   non-reentrant functions.
-
-   These functions are not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation they are cancellation points and
-   therefore not marked with __THROW.  */
-extern int gethostent_r (struct hostent *__restrict __result_buf,
-			 char *__restrict __buf, size_t __buflen,
-			 struct hostent **__restrict __result,
-			 int *__restrict __h_errnop);
-
-extern int gethostbyaddr_r (const void *__restrict __addr, __socklen_t __len,
-			    int __type,
-			    struct hostent *__restrict __result_buf,
-			    char *__restrict __buf, size_t __buflen,
-			    struct hostent **__restrict __result,
-			    int *__restrict __h_errnop);
-
-extern int gethostbyname_r (const char *__restrict __name,
-			    struct hostent *__restrict __result_buf,
-			    char *__restrict __buf, size_t __buflen,
-			    struct hostent **__restrict __result,
-			    int *__restrict __h_errnop);
-
-extern int gethostbyname2_r (const char *__restrict __name, int __af,
-			     struct hostent *__restrict __result_buf,
-			     char *__restrict __buf, size_t __buflen,
-			     struct hostent **__restrict __result,
-			     int *__restrict __h_errnop);
-#endif	/* misc */
-
-
-/* Open network data base files and mark them as staying open even
-   after a later search if STAY_OPEN is non-zero.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void setnetent (int __stay_open);
-
-/* Close network data base files and clear `stay open' flag.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void endnetent (void);
-
-/* Get next entry from network data base file.  Open data base if
-   necessary.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct netent *getnetent (void);
-
-/* Return entry from network data base which address match NET and
-   type TYPE.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct netent *getnetbyaddr (uint32_t __net, int __type);
-
-/* Return entry from network data base for network with NAME.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct netent *getnetbyname (const char *__name);
-
-#ifdef	__USE_MISC
-/* Reentrant versions of the functions above.  The additional
-   arguments specify a buffer of BUFLEN starting at BUF.  The last
-   argument is a pointer to a variable which gets the value which
-   would be stored in the global variable `herrno' by the
-   non-reentrant functions.
-
-   These functions are not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation they are cancellation points and
-   therefore not marked with __THROW.  */
-extern int getnetent_r (struct netent *__restrict __result_buf,
-			char *__restrict __buf, size_t __buflen,
-			struct netent **__restrict __result,
-			int *__restrict __h_errnop);
-
-extern int getnetbyaddr_r (uint32_t __net, int __type,
-			   struct netent *__restrict __result_buf,
-			   char *__restrict __buf, size_t __buflen,
-			   struct netent **__restrict __result,
-			   int *__restrict __h_errnop);
-
-extern int getnetbyname_r (const char *__restrict __name,
-			   struct netent *__restrict __result_buf,
-			   char *__restrict __buf, size_t __buflen,
-			   struct netent **__restrict __result,
-			   int *__restrict __h_errnop);
-#endif	/* misc */
-
-
-/* Description of data base entry for a single service.  */
-struct servent
-{
-  char *s_name;			/* Official service name.  */
-  char **s_aliases;		/* Alias list.  */
-  int s_port;			/* Port number.  */
-  char *s_proto;		/* Protocol to use.  */
-};
-
-/* Open service data base files and mark them as staying open even
-   after a later search if STAY_OPEN is non-zero.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void setservent (int __stay_open);
-
-/* Close service data base files and clear `stay open' flag.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void endservent (void);
-
-/* Get next entry from service data base file.  Open data base if
-   necessary.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct servent *getservent (void);
-
-/* Return entry from network data base for network with NAME and
-   protocol PROTO.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct servent *getservbyname (const char *__name, const char *__proto);
-
-/* Return entry from service data base which matches port PORT and
-   protocol PROTO.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct servent *getservbyport (int __port, const char *__proto);
-
-
-#ifdef	__USE_MISC
-/* Reentrant versions of the functions above.  The additional
-   arguments specify a buffer of BUFLEN starting at BUF.
-
-   These functions are not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation they are cancellation points and
-   therefore not marked with __THROW.  */
-extern int getservent_r (struct servent *__restrict __result_buf,
-			 char *__restrict __buf, size_t __buflen,
-			 struct servent **__restrict __result);
-
-extern int getservbyname_r (const char *__restrict __name,
-			    const char *__restrict __proto,
-			    struct servent *__restrict __result_buf,
-			    char *__restrict __buf, size_t __buflen,
-			    struct servent **__restrict __result);
-
-extern int getservbyport_r (int __port, const char *__restrict __proto,
-			    struct servent *__restrict __result_buf,
-			    char *__restrict __buf, size_t __buflen,
-			    struct servent **__restrict __result);
-#endif	/* misc */
-
-
-/* Description of data base entry for a single service.  */
-struct protoent
-{
-  char *p_name;			/* Official protocol name.  */
-  char **p_aliases;		/* Alias list.  */
-  int p_proto;			/* Protocol number.  */
-};
-
-/* Open protocol data base files and mark them as staying open even
-   after a later search if STAY_OPEN is non-zero.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void setprotoent (int __stay_open);
-
-/* Close protocol data base files and clear `stay open' flag.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void endprotoent (void);
-
-/* Get next entry from protocol data base file.  Open data base if
-   necessary.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct protoent *getprotoent (void);
-
-/* Return entry from protocol data base for network with NAME.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct protoent *getprotobyname (const char *__name);
-
-/* Return entry from protocol data base which number is PROTO.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct protoent *getprotobynumber (int __proto);
-
-
-#ifdef	__USE_MISC
-/* Reentrant versions of the functions above.  The additional
-   arguments specify a buffer of BUFLEN starting at BUF.
-
-   These functions are not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation they are cancellation points and
-   therefore not marked with __THROW.  */
-extern int getprotoent_r (struct protoent *__restrict __result_buf,
-			  char *__restrict __buf, size_t __buflen,
-			  struct protoent **__restrict __result);
-
-extern int getprotobyname_r (const char *__restrict __name,
-			     struct protoent *__restrict __result_buf,
-			     char *__restrict __buf, size_t __buflen,
-			     struct protoent **__restrict __result);
-
-extern int getprotobynumber_r (int __proto,
-			       struct protoent *__restrict __result_buf,
-			       char *__restrict __buf, size_t __buflen,
-			       struct protoent **__restrict __result);
-
-
-/* Establish network group NETGROUP for enumeration.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int setnetgrent (const char *__netgroup);
-
-/* Free all space allocated by previous `setnetgrent' call.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern void endnetgrent (void);
-
-/* Get next member of netgroup established by last `setnetgrent' call
-   and return pointers to elements in HOSTP, USERP, and DOMAINP.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int getnetgrent (char **__restrict __hostp,
-			char **__restrict __userp,
-			char **__restrict __domainp);
-
-
-/* Test whether NETGROUP contains the triple (HOST,USER,DOMAIN).
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int innetgr (const char *__netgroup, const char *__host,
-		    const char *__user, const char *__domain);
-
-/* Reentrant version of `getnetgrent' where result is placed in BUFFER.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int getnetgrent_r (char **__restrict __hostp,
-			  char **__restrict __userp,
-			  char **__restrict __domainp,
-			  char *__restrict __buffer, size_t __buflen);
-#endif	/* misc */
-
-
-#ifdef __USE_MISC
-/* Call `rshd' at port RPORT on remote machine *AHOST to execute CMD.
-   The local user is LOCUSER, on the remote machine the command is
-   executed as REMUSER.  In *FD2P the descriptor to the socket for the
-   connection is returned.  The caller must have the right to use a
-   reserved port.  When the function returns *AHOST contains the
-   official host name.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int rcmd (char **__restrict __ahost, unsigned short int __rport,
-		 const char *__restrict __locuser,
-		 const char *__restrict __remuser,
-		 const char *__restrict __cmd, int *__restrict __fd2p);
-
-/* This is the equivalent function where the protocol can be selected
-   and which therefore can be used for IPv6.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int rcmd_af (char **__restrict __ahost, unsigned short int __rport,
-		    const char *__restrict __locuser,
-		    const char *__restrict __remuser,
-		    const char *__restrict __cmd, int *__restrict __fd2p,
-		    sa_family_t __af);
-
-/* Call `rexecd' at port RPORT on remote machine *AHOST to execute
-   CMD.  The process runs at the remote machine using the ID of user
-   NAME whose cleartext password is PASSWD.  In *FD2P the descriptor
-   to the socket for the connection is returned.  When the function
-   returns *AHOST contains the official host name.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int rexec (char **__restrict __ahost, int __rport,
-		  const char *__restrict __name,
-		  const char *__restrict __pass,
-		  const char *__restrict __cmd, int *__restrict __fd2p);
-
-/* This is the equivalent function where the protocol can be selected
-   and which therefore can be used for IPv6.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int rexec_af (char **__restrict __ahost, int __rport,
-		     const char *__restrict __name,
-		     const char *__restrict __pass,
-		     const char *__restrict __cmd, int *__restrict __fd2p,
-		     sa_family_t __af);
-
-/* Check whether user REMUSER on system RHOST is allowed to login as LOCUSER.
-   If SUSER is not zero the user tries to become superuser.  Return 0 if
-   it is possible.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int ruserok (const char *__rhost, int __suser,
-		    const char *__remuser, const char *__locuser);
-
-/* This is the equivalent function where the protocol can be selected
-   and which therefore can be used for IPv6.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int ruserok_af (const char *__rhost, int __suser,
-		       const char *__remuser, const char *__locuser,
-		       sa_family_t __af);
-
-/* Check whether user REMUSER on system indicated by IPv4 address
-   RADDR is allowed to login as LOCUSER.  Non-IPv4 (e.g., IPv6) are
-   not supported.  If SUSER is not zero the user tries to become
-   superuser.  Return 0 if it is possible.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int iruserok (uint32_t __raddr, int __suser,
-		     const char *__remuser, const char *__locuser);
-
-/* This is the equivalent function where the pfamiliy if the address
-   pointed to by RADDR is determined by the value of AF.  It therefore
-   can be used for IPv6
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int iruserok_af (const void *__raddr, int __suser,
-			const char *__remuser, const char *__locuser,
-			sa_family_t __af);
-
-/* Try to allocate reserved port, returning a descriptor for a socket opened
-   at this port or -1 if unsuccessful.  The search for an available port
-   will start at ALPORT and continues with lower numbers.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int rresvport (int *__alport);
-
-/* This is the equivalent function where the protocol can be selected
-   and which therefore can be used for IPv6.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int rresvport_af (int *__alport, sa_family_t __af);
-#endif
-
-
-/* Extension from POSIX.1:2001.  */
-#ifdef __USE_XOPEN2K
-/* Structure to contain information about address of a service provider.  */
-struct addrinfo
-{
-  int ai_flags;			/* Input flags.  */
-  int ai_family;		/* Protocol family for socket.  */
-  int ai_socktype;		/* Socket type.  */
-  int ai_protocol;		/* Protocol for socket.  */
-  socklen_t ai_addrlen;		/* Length of socket address.  */
-  struct sockaddr *ai_addr;	/* Socket address for socket.  */
-  char *ai_canonname;		/* Canonical name for service location.  */
-  struct addrinfo *ai_next;	/* Pointer to next in list.  */
-};
-
-# ifdef __USE_GNU
-/* Structure used as control block for asynchronous lookup.  */
-struct gaicb
-{
-  const char *ar_name;		/* Name to look up.  */
-  const char *ar_service;	/* Service name.  */
-  const struct addrinfo *ar_request; /* Additional request specification.  */
-  struct addrinfo *ar_result;	/* Pointer to result.  */
-  /* The following are internal elements.  */
-  int __return;
-  int __glibc_reserved[5];
-};
-
-/* Lookup mode.  */
-#  define GAI_WAIT	0
-#  define GAI_NOWAIT	1
-# endif
-
-/* Possible values for `ai_flags' field in `addrinfo' structure.  */
-# define AI_PASSIVE	0x0001	/* Socket address is intended for `bind'.  */
-# define AI_CANONNAME	0x0002	/* Request for canonical name.  */
-# define AI_NUMERICHOST	0x0004	/* Don't use name resolution.  */
-# define AI_V4MAPPED	0x0008	/* IPv4 mapped addresses are acceptable.  */
-# define AI_ALL		0x0010	/* Return IPv4 mapped and IPv6 addresses.  */
-# define AI_ADDRCONFIG	0x0020	/* Use configuration of this host to choose
-				   returned address type..  */
-# ifdef __USE_GNU
-#  define AI_IDN	0x0040	/* IDN encode input (assuming it is encoded
-				   in the current locale's character set)
-				   before looking it up. */
-#  define AI_CANONIDN	0x0080	/* Translate canonical name from IDN format. */
-#  define AI_IDN_ALLOW_UNASSIGNED 0x0100 /* Don't reject unassigned Unicode
-					    code points.  */
-#  define AI_IDN_USE_STD3_ASCII_RULES 0x0200 /* Validate strings according to
-						STD3 rules.  */
-# endif
-# define AI_NUMERICSERV	0x0400	/* Don't use name resolution.  */
-
-/* Error values for `getaddrinfo' function.  */
-# define EAI_BADFLAGS	  -1	/* Invalid value for `ai_flags' field.  */
-# define EAI_NONAME	  -2	/* NAME or SERVICE is unknown.  */
-# define EAI_AGAIN	  -3	/* Temporary failure in name resolution.  */
-# define EAI_FAIL	  -4	/* Non-recoverable failure in name res.  */
-# define EAI_FAMILY	  -6	/* `ai_family' not supported.  */
-# define EAI_SOCKTYPE	  -7	/* `ai_socktype' not supported.  */
-# define EAI_SERVICE	  -8	/* SERVICE not supported for `ai_socktype'.  */
-# define EAI_MEMORY	  -10	/* Memory allocation failure.  */
-# define EAI_SYSTEM	  -11	/* System error returned in `errno'.  */
-# define EAI_OVERFLOW	  -12	/* Argument buffer overflow.  */
-# ifdef __USE_GNU
-#  define EAI_NODATA	  -5	/* No address associated with NAME.  */
-#  define EAI_ADDRFAMILY  -9	/* Address family for NAME not supported.  */
-#  define EAI_INPROGRESS  -100	/* Processing request in progress.  */
-#  define EAI_CANCELED	  -101	/* Request canceled.  */
-#  define EAI_NOTCANCELED -102	/* Request not canceled.  */
-#  define EAI_ALLDONE	  -103	/* All requests done.  */
-#  define EAI_INTR	  -104	/* Interrupted by a signal.  */
-#  define EAI_IDN_ENCODE  -105	/* IDN encoding failed.  */
-# endif
-
-# ifdef __USE_MISC
-#  define NI_MAXHOST      1025
-#  define NI_MAXSERV      32
-# endif
-
-# define NI_NUMERICHOST	1	/* Don't try to look up hostname.  */
-# define NI_NUMERICSERV 2	/* Don't convert port number to name.  */
-# define NI_NOFQDN	4	/* Only return nodename portion.  */
-# define NI_NAMEREQD	8	/* Don't return numeric addresses.  */
-# define NI_DGRAM	16	/* Look up UDP service rather than TCP.  */
-# ifdef __USE_GNU
-#  define NI_IDN	32	/* Convert name from IDN format.  */
-#  define NI_IDN_ALLOW_UNASSIGNED 64 /* Don't reject unassigned Unicode
-					code points.  */
-#  define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to
-					     STD3 rules.  */
-# endif
-
-/* Translate name of a service location and/or a service name to set of
-   socket addresses.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int getaddrinfo (const char *__restrict __name,
-			const char *__restrict __service,
-			const struct addrinfo *__restrict __req,
-			struct addrinfo **__restrict __pai);
-
-/* Free `addrinfo' structure AI including associated storage.  */
-extern void freeaddrinfo (struct addrinfo *__ai) __THROW;
-
-/* Convert error return from getaddrinfo() to a string.  */
-extern const char *gai_strerror (int __ecode) __THROW;
-
-/* Translate a socket address to a location and service name.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int getnameinfo (const struct sockaddr *__restrict __sa,
-			socklen_t __salen, char *__restrict __host,
-			socklen_t __hostlen, char *__restrict __serv,
-			socklen_t __servlen, int __flags);
-#endif	/* POSIX */
-
-#ifdef __USE_GNU
-/* Enqueue ENT requests from the LIST.  If MODE is GAI_WAIT wait until all
-   requests are handled.  If WAIT is GAI_NOWAIT return immediately after
-   queueing the requests and signal completion according to SIG.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int getaddrinfo_a (int __mode, struct gaicb *__list[__restrict_arr],
-			  int __ent, struct sigevent *__restrict __sig);
-
-/* Suspend execution of the thread until at least one of the ENT requests
-   in LIST is handled.  If TIMEOUT is not a null pointer it specifies the
-   longest time the function keeps waiting before returning with an error.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int gai_suspend (const struct gaicb *const __list[], int __ent,
-			const struct timespec *__timeout);
-
-/* Get the error status of the request REQ.  */
-extern int gai_error (struct gaicb *__req) __THROW;
-
-/* Cancel the requests associated with GAICBP.  */
-extern int gai_cancel (struct gaicb *__gaicbp) __THROW;
-#endif	/* GNU */
-
-__END_DECLS
-
-#endif	/* netdb.h */
diff --git a/openflow/usr/include/neteconet/ec.h b/openflow/usr/include/neteconet/ec.h
deleted file mode 100644
index 990f935..0000000
--- a/openflow/usr/include/neteconet/ec.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Definitions for use with Linux AF_ECONET sockets.
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETECONET_EC_H
-#define _NETECONET_EC_H	1
-
-#include <features.h>
-#include <bits/sockaddr.h>
-
-struct ec_addr
-  {
-    unsigned char station;		/* Station number.  */
-    unsigned char net;			/* Network number.  */
-  };
-
-struct sockaddr_ec
-  {
-    __SOCKADDR_COMMON (sec_);
-    unsigned char port;			/* Port number.  */
-    unsigned char cb;			/* Control/flag byte.  */
-    unsigned char type;			/* Type of message.  */
-    struct ec_addr addr;
-    unsigned long cookie;
-  };
-
-#define ECTYPE_PACKET_RECEIVED		0	/* Packet received */
-#define ECTYPE_TRANSMIT_STATUS		0x10	/* Transmit completed */
-
-#define ECTYPE_TRANSMIT_OK		1
-#define ECTYPE_TRANSMIT_NOT_LISTENING	2
-#define ECTYPE_TRANSMIT_NET_ERROR	3
-#define ECTYPE_TRANSMIT_NO_CLOCK	4
-#define ECTYPE_TRANSMIT_LINE_JAMMED	5
-#define ECTYPE_TRANSMIT_NOT_PRESENT	6
-
-#endif
diff --git a/openflow/usr/include/netinet/ether.h b/openflow/usr/include/netinet/ether.h
deleted file mode 100644
index 3dff523..0000000
--- a/openflow/usr/include/netinet/ether.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Functions for storing Ethernet addresses in ASCII and mapping to hostnames.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETINET_ETHER_H
-#define _NETINET_ETHER_H	1
-
-#include <features.h>
-
-/* Get definition of `struct ether_addr'.  */
-#include <netinet/if_ether.h>
-
-__BEGIN_DECLS
-
-/* Convert 48 bit Ethernet ADDRess to ASCII.  */
-extern char *ether_ntoa (const struct ether_addr *__addr) __THROW;
-extern char *ether_ntoa_r (const struct ether_addr *__addr, char *__buf)
-     __THROW;
-
-/* Convert ASCII string S to 48 bit Ethernet address.  */
-extern struct ether_addr *ether_aton (const char *__asc) __THROW;
-extern struct ether_addr *ether_aton_r (const char *__asc,
-					struct ether_addr *__addr) __THROW;
-
-/* Map 48 bit Ethernet number ADDR to HOSTNAME.  */
-extern int ether_ntohost (char *__hostname, const struct ether_addr *__addr)
-     __THROW;
-
-/* Map HOSTNAME to 48 bit Ethernet address.  */
-extern int ether_hostton (const char *__hostname, struct ether_addr *__addr)
-     __THROW;
-
-/* Scan LINE and set ADDR and HOSTNAME.  */
-extern int ether_line (const char *__line, struct ether_addr *__addr,
-		       char *__hostname) __THROW;
-
-__END_DECLS
-
-#endif /* netinet/ether.h */
diff --git a/openflow/usr/include/netinet/icmp6.h b/openflow/usr/include/netinet/icmp6.h
deleted file mode 100644
index b7a9637..0000000
--- a/openflow/usr/include/netinet/icmp6.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETINET_ICMP6_H
-#define _NETINET_ICMP6_H 1
-
-#include <inttypes.h>
-#include <string.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-
-#define ICMP6_FILTER 1
-
-#define ICMP6_FILTER_BLOCK		1
-#define ICMP6_FILTER_PASS		2
-#define ICMP6_FILTER_BLOCKOTHERS	3
-#define ICMP6_FILTER_PASSONLY		4
-
-struct icmp6_filter
-  {
-    uint32_t icmp6_filt[8];
-  };
-
-struct icmp6_hdr
-  {
-    uint8_t     icmp6_type;   /* type field */
-    uint8_t     icmp6_code;   /* code field */
-    uint16_t    icmp6_cksum;  /* checksum field */
-    union
-      {
-	uint32_t  icmp6_un_data32[1]; /* type-specific field */
-	uint16_t  icmp6_un_data16[2]; /* type-specific field */
-	uint8_t   icmp6_un_data8[4];  /* type-specific field */
-      } icmp6_dataun;
-  };
-
-#define icmp6_data32    icmp6_dataun.icmp6_un_data32
-#define icmp6_data16    icmp6_dataun.icmp6_un_data16
-#define icmp6_data8     icmp6_dataun.icmp6_un_data8
-#define icmp6_pptr      icmp6_data32[0]  /* parameter prob */
-#define icmp6_mtu       icmp6_data32[0]  /* packet too big */
-#define icmp6_id        icmp6_data16[0]  /* echo request/reply */
-#define icmp6_seq       icmp6_data16[1]  /* echo request/reply */
-#define icmp6_maxdelay  icmp6_data16[0]  /* mcast group membership */
-
-#define ICMP6_DST_UNREACH             1
-#define ICMP6_PACKET_TOO_BIG          2
-#define ICMP6_TIME_EXCEEDED           3
-#define ICMP6_PARAM_PROB              4
-
-#define ICMP6_INFOMSG_MASK  0x80    /* all informational messages */
-
-#define ICMP6_ECHO_REQUEST          128
-#define ICMP6_ECHO_REPLY            129
-#define MLD_LISTENER_QUERY          130
-#define MLD_LISTENER_REPORT         131
-#define MLD_LISTENER_REDUCTION      132
-
-#define ICMP6_DST_UNREACH_NOROUTE     0 /* no route to destination */
-#define ICMP6_DST_UNREACH_ADMIN       1 /* communication with destination */
-                                        /* administratively prohibited */
-#define ICMP6_DST_UNREACH_BEYONDSCOPE 2 /* beyond scope of source address */
-#define ICMP6_DST_UNREACH_ADDR        3 /* address unreachable */
-#define ICMP6_DST_UNREACH_NOPORT      4 /* bad port */
-
-#define ICMP6_TIME_EXCEED_TRANSIT     0 /* Hop Limit == 0 in transit */
-#define ICMP6_TIME_EXCEED_REASSEMBLY  1 /* Reassembly time out */
-
-#define ICMP6_PARAMPROB_HEADER        0 /* erroneous header field */
-#define ICMP6_PARAMPROB_NEXTHEADER    1 /* unrecognized Next Header */
-#define ICMP6_PARAMPROB_OPTION        2 /* unrecognized IPv6 option */
-
-#define ICMP6_FILTER_WILLPASS(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) == 0)
-
-#define ICMP6_FILTER_WILLBLOCK(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) != 0)
-
-#define ICMP6_FILTER_SETPASS(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) &= ~(1 << ((type) & 31))))
-
-#define ICMP6_FILTER_SETBLOCK(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) |=  (1 << ((type) & 31))))
-
-#define ICMP6_FILTER_SETPASSALL(filterp) \
-	memset (filterp, 0, sizeof (struct icmp6_filter));
-
-#define ICMP6_FILTER_SETBLOCKALL(filterp) \
-	memset (filterp, 0xFF, sizeof (struct icmp6_filter));
-
-#define ND_ROUTER_SOLICIT           133
-#define ND_ROUTER_ADVERT            134
-#define ND_NEIGHBOR_SOLICIT         135
-#define ND_NEIGHBOR_ADVERT          136
-#define ND_REDIRECT                 137
-
-struct nd_router_solicit      /* router solicitation */
-  {
-    struct icmp6_hdr  nd_rs_hdr;
-    /* could be followed by options */
-  };
-
-#define nd_rs_type               nd_rs_hdr.icmp6_type
-#define nd_rs_code               nd_rs_hdr.icmp6_code
-#define nd_rs_cksum              nd_rs_hdr.icmp6_cksum
-#define nd_rs_reserved           nd_rs_hdr.icmp6_data32[0]
-
-struct nd_router_advert       /* router advertisement */
-  {
-    struct icmp6_hdr  nd_ra_hdr;
-    uint32_t   nd_ra_reachable;   /* reachable time */
-    uint32_t   nd_ra_retransmit;  /* retransmit timer */
-    /* could be followed by options */
-  };
-
-#define nd_ra_type               nd_ra_hdr.icmp6_type
-#define nd_ra_code               nd_ra_hdr.icmp6_code
-#define nd_ra_cksum              nd_ra_hdr.icmp6_cksum
-#define nd_ra_curhoplimit        nd_ra_hdr.icmp6_data8[0]
-#define nd_ra_flags_reserved     nd_ra_hdr.icmp6_data8[1]
-#define ND_RA_FLAG_MANAGED       0x80
-#define ND_RA_FLAG_OTHER         0x40
-#define ND_RA_FLAG_HOME_AGENT    0x20
-#define nd_ra_router_lifetime    nd_ra_hdr.icmp6_data16[1]
-
-struct nd_neighbor_solicit    /* neighbor solicitation */
-  {
-    struct icmp6_hdr  nd_ns_hdr;
-    struct in6_addr   nd_ns_target; /* target address */
-    /* could be followed by options */
-  };
-
-#define nd_ns_type               nd_ns_hdr.icmp6_type
-#define nd_ns_code               nd_ns_hdr.icmp6_code
-#define nd_ns_cksum              nd_ns_hdr.icmp6_cksum
-#define nd_ns_reserved           nd_ns_hdr.icmp6_data32[0]
-
-struct nd_neighbor_advert     /* neighbor advertisement */
-  {
-    struct icmp6_hdr  nd_na_hdr;
-    struct in6_addr   nd_na_target; /* target address */
-    /* could be followed by options */
-  };
-
-#define nd_na_type               nd_na_hdr.icmp6_type
-#define nd_na_code               nd_na_hdr.icmp6_code
-#define nd_na_cksum              nd_na_hdr.icmp6_cksum
-#define nd_na_flags_reserved     nd_na_hdr.icmp6_data32[0]
-#if     BYTE_ORDER == BIG_ENDIAN
-#define ND_NA_FLAG_ROUTER        0x80000000
-#define ND_NA_FLAG_SOLICITED     0x40000000
-#define ND_NA_FLAG_OVERRIDE      0x20000000
-#else   /* BYTE_ORDER == LITTLE_ENDIAN */
-#define ND_NA_FLAG_ROUTER        0x00000080
-#define ND_NA_FLAG_SOLICITED     0x00000040
-#define ND_NA_FLAG_OVERRIDE      0x00000020
-#endif
-
-struct nd_redirect            /* redirect */
-  {
-    struct icmp6_hdr  nd_rd_hdr;
-    struct in6_addr   nd_rd_target; /* target address */
-    struct in6_addr   nd_rd_dst;    /* destination address */
-    /* could be followed by options */
-  };
-
-#define nd_rd_type               nd_rd_hdr.icmp6_type
-#define nd_rd_code               nd_rd_hdr.icmp6_code
-#define nd_rd_cksum              nd_rd_hdr.icmp6_cksum
-#define nd_rd_reserved           nd_rd_hdr.icmp6_data32[0]
-
-struct nd_opt_hdr             /* Neighbor discovery option header */
-  {
-    uint8_t  nd_opt_type;
-    uint8_t  nd_opt_len;        /* in units of 8 octets */
-    /* followed by option specific data */
-  };
-
-#define ND_OPT_SOURCE_LINKADDR		1
-#define ND_OPT_TARGET_LINKADDR		2
-#define ND_OPT_PREFIX_INFORMATION	3
-#define ND_OPT_REDIRECTED_HEADER	4
-#define ND_OPT_MTU			5
-#define ND_OPT_RTR_ADV_INTERVAL		7
-#define ND_OPT_HOME_AGENT_INFO		8
-
-struct nd_opt_prefix_info     /* prefix information */
-  {
-    uint8_t   nd_opt_pi_type;
-    uint8_t   nd_opt_pi_len;
-    uint8_t   nd_opt_pi_prefix_len;
-    uint8_t   nd_opt_pi_flags_reserved;
-    uint32_t  nd_opt_pi_valid_time;
-    uint32_t  nd_opt_pi_preferred_time;
-    uint32_t  nd_opt_pi_reserved2;
-    struct in6_addr  nd_opt_pi_prefix;
-  };
-
-#define ND_OPT_PI_FLAG_ONLINK	0x80
-#define ND_OPT_PI_FLAG_AUTO	0x40
-#define ND_OPT_PI_FLAG_RADDR	0x20
-
-struct nd_opt_rd_hdr          /* redirected header */
-  {
-    uint8_t   nd_opt_rh_type;
-    uint8_t   nd_opt_rh_len;
-    uint16_t  nd_opt_rh_reserved1;
-    uint32_t  nd_opt_rh_reserved2;
-    /* followed by IP header and data */
-  };
-
-struct nd_opt_mtu             /* MTU option */
-  {
-    uint8_t   nd_opt_mtu_type;
-    uint8_t   nd_opt_mtu_len;
-    uint16_t  nd_opt_mtu_reserved;
-    uint32_t  nd_opt_mtu_mtu;
-  };
-
-struct mld_hdr
-  {
-    struct icmp6_hdr    mld_icmp6_hdr;
-    struct in6_addr     mld_addr; /* multicast address */
-  };
-
-#define mld_type        mld_icmp6_hdr.icmp6_type
-#define mld_code        mld_icmp6_hdr.icmp6_code
-#define mld_cksum       mld_icmp6_hdr.icmp6_cksum
-#define mld_maxdelay    mld_icmp6_hdr.icmp6_data16[0]
-#define mld_reserved    mld_icmp6_hdr.icmp6_data16[1]
-
-#define ICMP6_ROUTER_RENUMBERING    138
-
-struct icmp6_router_renum    /* router renumbering header */
-  {
-    struct icmp6_hdr    rr_hdr;
-    uint8_t             rr_segnum;
-    uint8_t             rr_flags;
-    uint16_t            rr_maxdelay;
-    uint32_t            rr_reserved;
-  };
-
-#define rr_type		rr_hdr.icmp6_type
-#define rr_code         rr_hdr.icmp6_code
-#define rr_cksum        rr_hdr.icmp6_cksum
-#define rr_seqnum       rr_hdr.icmp6_data32[0]
-
-/* Router renumbering flags */
-#define ICMP6_RR_FLAGS_TEST             0x80
-#define ICMP6_RR_FLAGS_REQRESULT        0x40
-#define ICMP6_RR_FLAGS_FORCEAPPLY       0x20
-#define ICMP6_RR_FLAGS_SPECSITE         0x10
-#define ICMP6_RR_FLAGS_PREVDONE         0x08
-
-struct rr_pco_match    /* match prefix part */
-  {
-    uint8_t             rpm_code;
-    uint8_t             rpm_len;
-    uint8_t             rpm_ordinal;
-    uint8_t             rpm_matchlen;
-    uint8_t             rpm_minlen;
-    uint8_t             rpm_maxlen;
-    uint16_t            rpm_reserved;
-    struct in6_addr     rpm_prefix;
-  };
-
-/* PCO code values */
-#define RPM_PCO_ADD             1
-#define RPM_PCO_CHANGE          2
-#define RPM_PCO_SETGLOBAL       3
-
-struct rr_pco_use      /* use prefix part */
-  {
-    uint8_t             rpu_uselen;
-    uint8_t             rpu_keeplen;
-    uint8_t             rpu_ramask;
-    uint8_t             rpu_raflags;
-    uint32_t            rpu_vltime;
-    uint32_t            rpu_pltime;
-    uint32_t            rpu_flags;
-    struct in6_addr     rpu_prefix;
-  };
-
-#define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK  0x20
-#define ICMP6_RR_PCOUSE_RAFLAGS_AUTO    0x10
-
-#if BYTE_ORDER == BIG_ENDIAN
-# define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME 0x80000000
-# define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME 0x40000000
-#elif BYTE_ORDER == LITTLE_ENDIAN
-# define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME 0x80
-# define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME 0x40
-#endif
-
-struct rr_result       /* router renumbering result message */
-  {
-    uint16_t            rrr_flags;
-    uint8_t             rrr_ordinal;
-    uint8_t             rrr_matchedlen;
-    uint32_t            rrr_ifid;
-    struct in6_addr     rrr_prefix;
-  };
-
-#if BYTE_ORDER == BIG_ENDIAN
-# define ICMP6_RR_RESULT_FLAGS_OOB       0x0002
-# define ICMP6_RR_RESULT_FLAGS_FORBIDDEN 0x0001
-#elif BYTE_ORDER == LITTLE_ENDIAN
-# define ICMP6_RR_RESULT_FLAGS_OOB       0x0200
-# define ICMP6_RR_RESULT_FLAGS_FORBIDDEN 0x0100
-#endif
-
-/* Mobile IPv6 extension: Advertisement Interval.  */
-struct nd_opt_adv_interval
-  {
-    uint8_t   nd_opt_adv_interval_type;
-    uint8_t   nd_opt_adv_interval_len;
-    uint16_t  nd_opt_adv_interval_reserved;
-    uint32_t  nd_opt_adv_interval_ival;
-  };
-
-/* Mobile IPv6 extension: Home Agent Info.  */
-struct nd_opt_home_agent_info
-  {
-    uint8_t   nd_opt_home_agent_info_type;
-    uint8_t   nd_opt_home_agent_info_len;
-    uint16_t  nd_opt_home_agent_info_reserved;
-    uint16_t  nd_opt_home_agent_info_preference;
-    uint16_t  nd_opt_home_agent_info_lifetime;
-  };
-
-#endif /* netinet/icmpv6.h */
diff --git a/openflow/usr/include/netinet/if_ether.h b/openflow/usr/include/netinet/if_ether.h
deleted file mode 100644
index e9ed137..0000000
--- a/openflow/usr/include/netinet/if_ether.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __NETINET_IF_ETHER_H
-
-#define __NETINET_IF_ETHER_H	1
-#include <features.h>
-#include <sys/types.h>
-
-/* Get definitions from kernel header file.  */
-#include <linux/if_ether.h>
-
-#ifdef __USE_MISC
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- *	$FreeBSD$
- */
-
-#include <net/ethernet.h>
-#include <net/if_arp.h>
-
-__BEGIN_DECLS
-/*
- * Ethernet Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  Structure below is adapted
- * to resolving internet addresses.  Field names used correspond to
- * RFC 826.
- */
-struct	ether_arp {
-	struct	arphdr ea_hdr;		/* fixed-size header */
-	u_int8_t arp_sha[ETH_ALEN];	/* sender hardware address */
-	u_int8_t arp_spa[4];		/* sender protocol address */
-	u_int8_t arp_tha[ETH_ALEN];	/* target hardware address */
-	u_int8_t arp_tpa[4];		/* target protocol address */
-};
-#define	arp_hrd	ea_hdr.ar_hrd
-#define	arp_pro	ea_hdr.ar_pro
-#define	arp_hln	ea_hdr.ar_hln
-#define	arp_pln	ea_hdr.ar_pln
-#define	arp_op	ea_hdr.ar_op
-
-/*
- * Macro to map an IP multicast address to an Ethernet multicast address.
- * The high-order 25 bits of the Ethernet address are statically assigned,
- * and the low-order 23 bits are taken from the low end of the IP address.
- */
-#define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \
-	/* struct in_addr *ipaddr; */ \
-	/* u_char enaddr[ETH_ALEN];	   */ \
-{ \
-	(enaddr)[0] = 0x01; \
-	(enaddr)[1] = 0x00; \
-	(enaddr)[2] = 0x5e; \
-	(enaddr)[3] = ((u_int8_t *)ipaddr)[1] & 0x7f; \
-	(enaddr)[4] = ((u_int8_t *)ipaddr)[2]; \
-	(enaddr)[5] = ((u_int8_t *)ipaddr)[3]; \
-}
-
-__END_DECLS
-#endif /* __USE_MISC */
-
-#endif /* netinet/if_ether.h */
diff --git a/openflow/usr/include/netinet/if_fddi.h b/openflow/usr/include/netinet/if_fddi.h
deleted file mode 100644
index 6e0ab37..0000000
--- a/openflow/usr/include/netinet/if_fddi.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETINET_IF_FDDI_H
-#define	_NETINET_IF_FDDI_H 1
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <asm/types.h>
-
-#include <linux/if_fddi.h>
-
-#ifdef __USE_MISC
-
-struct fddi_header {
-  u_int8_t fddi_fc;                    /* Frame Control (FC) value */
-  u_int8_t fddi_dhost[FDDI_K_ALEN];    /* Destination host */
-  u_int8_t fddi_shost[FDDI_K_ALEN];    /* Source host */
-};
-#endif
-
-#endif	/* netinet/if_fddi.h */
diff --git a/openflow/usr/include/netinet/if_tr.h b/openflow/usr/include/netinet/if_tr.h
deleted file mode 100644
index c203d11..0000000
--- a/openflow/usr/include/netinet/if_tr.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETINET_IF_TR_H
-#define	_NETINET_IF_TR_H 1
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/* IEEE 802.5 Token-Ring magic constants.  The frame sizes omit the preamble
-   and FCS/CRC (frame check sequence). */
-#define TR_ALEN		6		/* Octets in one token-ring addr */
-#define TR_HLEN 	(sizeof (struct trh_hdr) + sizeof (struct trllc))
-#define AC		0x10
-#define LLC_FRAME 	0x40
-
-/* LLC and SNAP constants */
-#define EXTENDED_SAP 	0xAA
-#define UI_CMD       	0x03
-
-/* This is an Token-Ring frame header. */
-struct trh_hdr
-{
-  u_int8_t  ac;			/* access control field */
-  u_int8_t  fc;			/* frame control field */
-  u_int8_t  daddr[TR_ALEN];	/* destination address */
-  u_int8_t  saddr[TR_ALEN];	/* source address */
-  u_int16_t rcf;		/* route control field */
-  u_int16_t rseg[8];		/* routing registers */
-};
-
-/* This is an Token-Ring LLC structure */
-struct trllc
-{
-  u_int8_t  dsap;		/* destination SAP */
-  u_int8_t  ssap;		/* source SAP */
-  u_int8_t  llc;		/* LLC control field */
-  u_int8_t  protid[3];		/* protocol id */
-  u_int16_t ethertype;		/* ether type field */
-};
-
-/* Token-Ring statistics collection data. */
-struct tr_statistics
-{
-  unsigned long rx_packets;     /* total packets received	*/
-  unsigned long tx_packets;	/* total packets transmitted	*/
-  unsigned long rx_bytes;	/* total bytes received   	*/
-  unsigned long tx_bytes;	/* total bytes transmitted	*/
-  unsigned long rx_errors;	/* bad packets received		*/
-  unsigned long tx_errors;	/* packet transmit problems	*/
-  unsigned long rx_dropped;	/* no space in linux buffers	*/
-  unsigned long tx_dropped;	/* no space available in linux	*/
-  unsigned long multicast;	/* multicast packets received	*/
-  unsigned long transmit_collision;
-
-  /* detailed Token-Ring errors. See IBM Token-Ring Network
-     Architecture for more info */
-
-  unsigned long line_errors;
-  unsigned long internal_errors;
-  unsigned long burst_errors;
-  unsigned long A_C_errors;
-  unsigned long abort_delimiters;
-  unsigned long lost_frames;
-  unsigned long recv_congest_count;
-  unsigned long frame_copied_errors;
-  unsigned long frequency_errors;
-  unsigned long token_errors;
-  unsigned long dummy1;
-};
-
-/* source routing stuff */
-#define TR_RII 			0x80
-#define TR_RCF_DIR_BIT 		0x80
-#define TR_RCF_LEN_MASK 	0x1f00
-#define TR_RCF_BROADCAST 	0x8000	/* all-routes broadcast */
-#define TR_RCF_LIMITED_BROADCAST 0xC000	/* single-route broadcast */
-#define TR_RCF_FRAME2K 		0x20
-#define TR_RCF_BROADCAST_MASK 	0xC000
-#define TR_MAXRIFLEN 		18
-
-#ifdef __USE_MISC
-
-struct trn_hdr
-{
-  u_int8_t trn_ac;                /* access control field */
-  u_int8_t trn_fc;                /* field control field */
-  u_int8_t trn_dhost[TR_ALEN];    /* destination host */
-  u_int8_t trn_shost[TR_ALEN];    /* source host */
-  u_int16_t trn_rcf;              /* route control field */
-  u_int16_t trn_rseg[8];          /* routing registers */
-};
-
-#endif
-
-#endif	/* netinet/if_tr.h */
diff --git a/openflow/usr/include/netinet/igmp.h b/openflow/usr/include/netinet/igmp.h
deleted file mode 100644
index fc7599e..0000000
--- a/openflow/usr/include/netinet/igmp.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETINET_IGMP_H
-#define	_NETINET_IGMP_H 1
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#ifdef __USE_MISC
-
-#include <netinet/in.h>
-
-__BEGIN_DECLS
-
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- *	$FreeBSD$
- */
-
-struct igmp {
-  u_int8_t igmp_type;             /* IGMP type */
-  u_int8_t igmp_code;             /* routing code */
-  u_int16_t igmp_cksum;           /* checksum */
-  struct in_addr igmp_group;      /* group address */
-};
-
-#define IGMP_MINLEN			8
-
-/*
- * Message types, including version number.
- */
-#define IGMP_MEMBERSHIP_QUERY   	0x11	/* membership query         */
-#define IGMP_V1_MEMBERSHIP_REPORT	0x12	/* Ver. 1 membership report */
-#define IGMP_V2_MEMBERSHIP_REPORT	0x16	/* Ver. 2 membership report */
-#define IGMP_V2_LEAVE_GROUP		0x17	/* Leave-group message	    */
-
-#define IGMP_DVMRP			0x13	/* DVMRP routing message    */
-#define IGMP_PIM			0x14	/* PIM routing message      */
-#define IGMP_TRACE			0x15
-
-#define IGMP_MTRACE_RESP		0x1e	/* traceroute resp.(to sender)*/
-#define IGMP_MTRACE			0x1f	/* mcast traceroute messages  */
-
-#define IGMP_MAX_HOST_REPORT_DELAY	10	/* max delay for response to     */
-						/*  query (in seconds) according */
-						/*  to RFC1112                   */
-#define IGMP_TIMER_SCALE		10	/* denotes that the igmp code field */
-						/* specifies time in 10th of seconds*/
-
-/*
- * States for the IGMP v2 state table.
- */
-#define IGMP_DELAYING_MEMBER	1
-#define IGMP_IDLE_MEMBER	2
-#define IGMP_LAZY_MEMBER	3
-#define IGMP_SLEEPING_MEMBER	4
-#define IGMP_AWAKENING_MEMBER	5
-
-/*
- * States for IGMP router version cache.
- */
-#define IGMP_v1_ROUTER		1
-#define IGMP_v2_ROUTER		2
-
-/*
- * The following four defininitions are for backwards compatibility.
- * They should be removed as soon as all applications are updated to
- * use the new constant names.
- */
-#define IGMP_HOST_MEMBERSHIP_QUERY	IGMP_MEMBERSHIP_QUERY
-#define IGMP_HOST_MEMBERSHIP_REPORT	IGMP_V1_MEMBERSHIP_REPORT
-#define IGMP_HOST_NEW_MEMBERSHIP_REPORT	IGMP_V2_MEMBERSHIP_REPORT
-#define IGMP_HOST_LEAVE_MESSAGE		IGMP_V2_LEAVE_GROUP
-
-__END_DECLS
-
-#endif
-
-#endif	/* netinet/igmp.h */
diff --git a/openflow/usr/include/netinet/in.h b/openflow/usr/include/netinet/in.h
deleted file mode 100644
index 6122ab5..0000000
--- a/openflow/usr/include/netinet/in.h
+++ /dev/null
@@ -1,633 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_NETINET_IN_H
-#define	_NETINET_IN_H	1
-
-#include <features.h>
-#include <stdint.h>
-#include <sys/socket.h>
-#include <bits/types.h>
-
-
-__BEGIN_DECLS
-
-/* Internet address.  */
-typedef uint32_t in_addr_t;
-struct in_addr
-  {
-    in_addr_t s_addr;
-  };
-
-/* Get system-specific definitions.  */
-#include <bits/in.h>
-
-/* Standard well-defined IP protocols.  */
-enum
-  {
-    IPPROTO_IP = 0,	   /* Dummy protocol for TCP.  */
-#define IPPROTO_IP		IPPROTO_IP
-    IPPROTO_ICMP = 1,	   /* Internet Control Message Protocol.  */
-#define IPPROTO_ICMP		IPPROTO_ICMP
-    IPPROTO_IGMP = 2,	   /* Internet Group Management Protocol. */
-#define IPPROTO_IGMP		IPPROTO_IGMP
-    IPPROTO_IPIP = 4,	   /* IPIP tunnels (older KA9Q tunnels use 94).  */
-#define IPPROTO_IPIP		IPPROTO_IPIP
-    IPPROTO_TCP = 6,	   /* Transmission Control Protocol.  */
-#define IPPROTO_TCP		IPPROTO_TCP
-    IPPROTO_EGP = 8,	   /* Exterior Gateway Protocol.  */
-#define IPPROTO_EGP		IPPROTO_EGP
-    IPPROTO_PUP = 12,	   /* PUP protocol.  */
-#define IPPROTO_PUP		IPPROTO_PUP
-    IPPROTO_UDP = 17,	   /* User Datagram Protocol.  */
-#define IPPROTO_UDP		IPPROTO_UDP
-    IPPROTO_IDP = 22,	   /* XNS IDP protocol.  */
-#define IPPROTO_IDP		IPPROTO_IDP
-    IPPROTO_TP = 29,	   /* SO Transport Protocol Class 4.  */
-#define IPPROTO_TP		IPPROTO_TP
-    IPPROTO_DCCP = 33,	   /* Datagram Congestion Control Protocol.  */
-#define IPPROTO_DCCP		IPPROTO_DCCP
-    IPPROTO_IPV6 = 41,     /* IPv6 header.  */
-#define IPPROTO_IPV6		IPPROTO_IPV6
-    IPPROTO_RSVP = 46,	   /* Reservation Protocol.  */
-#define IPPROTO_RSVP		IPPROTO_RSVP
-    IPPROTO_GRE = 47,	   /* General Routing Encapsulation.  */
-#define IPPROTO_GRE		IPPROTO_GRE
-    IPPROTO_ESP = 50,      /* encapsulating security payload.  */
-#define IPPROTO_ESP		IPPROTO_ESP
-    IPPROTO_AH = 51,       /* authentication header.  */
-#define IPPROTO_AH		IPPROTO_AH
-    IPPROTO_MTP = 92,	   /* Multicast Transport Protocol.  */
-#define IPPROTO_MTP		IPPROTO_MTP
-    IPPROTO_BEETPH = 94,   /* IP option pseudo header for BEET.  */
-#define IPPROTO_BEETPH		IPPROTO_BEETPH
-    IPPROTO_ENCAP = 98,	   /* Encapsulation Header.  */
-#define IPPROTO_ENCAP		IPPROTO_ENCAP
-    IPPROTO_PIM = 103,	   /* Protocol Independent Multicast.  */
-#define IPPROTO_PIM		IPPROTO_PIM
-    IPPROTO_COMP = 108,	   /* Compression Header Protocol.  */
-#define IPPROTO_COMP		IPPROTO_COMP
-    IPPROTO_SCTP = 132,	   /* Stream Control Transmission Protocol.  */
-#define IPPROTO_SCTP		IPPROTO_SCTP
-    IPPROTO_UDPLITE = 136, /* UDP-Lite protocol.  */
-#define IPPROTO_UDPLITE		IPPROTO_UDPLITE
-    IPPROTO_MPLS = 137,    /* MPLS in IP.  */
-#define IPPROTO_MPLS		IPPROTO_MPLS
-    IPPROTO_RAW = 255,	   /* Raw IP packets.  */
-#define IPPROTO_RAW		IPPROTO_RAW
-    IPPROTO_MAX
-  };
-
-/* If __USE_KERNEL_IPV6_DEFS is defined then the user has included the kernel
-   network headers first and we should use those ABI-identical definitions
-   instead of our own.  */
-#ifndef __USE_KERNEL_IPV6_DEFS
-enum
-  {
-    IPPROTO_HOPOPTS = 0,   /* IPv6 Hop-by-Hop options.  */
-#define IPPROTO_HOPOPTS		IPPROTO_HOPOPTS
-    IPPROTO_ROUTING = 43,  /* IPv6 routing header.  */
-#define IPPROTO_ROUTING		IPPROTO_ROUTING
-    IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header.  */
-#define IPPROTO_FRAGMENT	IPPROTO_FRAGMENT
-    IPPROTO_ICMPV6 = 58,   /* ICMPv6.  */
-#define IPPROTO_ICMPV6		IPPROTO_ICMPV6
-    IPPROTO_NONE = 59,     /* IPv6 no next header.  */
-#define IPPROTO_NONE		IPPROTO_NONE
-    IPPROTO_DSTOPTS = 60,  /* IPv6 destination options.  */
-#define IPPROTO_DSTOPTS		IPPROTO_DSTOPTS
-    IPPROTO_MH = 135       /* IPv6 mobility header.  */
-#define IPPROTO_MH		IPPROTO_MH
-  };
-#endif /* !__USE_KERNEL_IPV6_DEFS */
-
-/* Type to represent a port.  */
-typedef uint16_t in_port_t;
-
-/* Standard well-known ports.  */
-enum
-  {
-    IPPORT_ECHO = 7,		/* Echo service.  */
-    IPPORT_DISCARD = 9,		/* Discard transmissions service.  */
-    IPPORT_SYSTAT = 11,		/* System status service.  */
-    IPPORT_DAYTIME = 13,	/* Time of day service.  */
-    IPPORT_NETSTAT = 15,	/* Network status service.  */
-    IPPORT_FTP = 21,		/* File Transfer Protocol.  */
-    IPPORT_TELNET = 23,		/* Telnet protocol.  */
-    IPPORT_SMTP = 25,		/* Simple Mail Transfer Protocol.  */
-    IPPORT_TIMESERVER = 37,	/* Timeserver service.  */
-    IPPORT_NAMESERVER = 42,	/* Domain Name Service.  */
-    IPPORT_WHOIS = 43,		/* Internet Whois service.  */
-    IPPORT_MTP = 57,
-
-    IPPORT_TFTP = 69,		/* Trivial File Transfer Protocol.  */
-    IPPORT_RJE = 77,
-    IPPORT_FINGER = 79,		/* Finger service.  */
-    IPPORT_TTYLINK = 87,
-    IPPORT_SUPDUP = 95,		/* SUPDUP protocol.  */
-
-
-    IPPORT_EXECSERVER = 512,	/* execd service.  */
-    IPPORT_LOGINSERVER = 513,	/* rlogind service.  */
-    IPPORT_CMDSERVER = 514,
-    IPPORT_EFSSERVER = 520,
-
-    /* UDP ports.  */
-    IPPORT_BIFFUDP = 512,
-    IPPORT_WHOSERVER = 513,
-    IPPORT_ROUTESERVER = 520,
-
-    /* Ports less than this value are reserved for privileged processes.  */
-    IPPORT_RESERVED = 1024,
-
-    /* Ports greater this value are reserved for (non-privileged) servers.  */
-    IPPORT_USERRESERVED = 5000
-  };
-
-/* Definitions of the bits in an Internet address integer.
-
-   On subnets, host and network parts are found according to
-   the subnet mask, not these masks.  */
-
-#define	IN_CLASSA(a)		((((in_addr_t)(a)) & 0x80000000) == 0)
-#define	IN_CLASSA_NET		0xff000000
-#define	IN_CLASSA_NSHIFT	24
-#define	IN_CLASSA_HOST		(0xffffffff & ~IN_CLASSA_NET)
-#define	IN_CLASSA_MAX		128
-
-#define	IN_CLASSB(a)		((((in_addr_t)(a)) & 0xc0000000) == 0x80000000)
-#define	IN_CLASSB_NET		0xffff0000
-#define	IN_CLASSB_NSHIFT	16
-#define	IN_CLASSB_HOST		(0xffffffff & ~IN_CLASSB_NET)
-#define	IN_CLASSB_MAX		65536
-
-#define	IN_CLASSC(a)		((((in_addr_t)(a)) & 0xe0000000) == 0xc0000000)
-#define	IN_CLASSC_NET		0xffffff00
-#define	IN_CLASSC_NSHIFT	8
-#define	IN_CLASSC_HOST		(0xffffffff & ~IN_CLASSC_NET)
-
-#define	IN_CLASSD(a)		((((in_addr_t)(a)) & 0xf0000000) == 0xe0000000)
-#define	IN_MULTICAST(a)		IN_CLASSD(a)
-
-#define	IN_EXPERIMENTAL(a)	((((in_addr_t)(a)) & 0xe0000000) == 0xe0000000)
-#define	IN_BADCLASS(a)		((((in_addr_t)(a)) & 0xf0000000) == 0xf0000000)
-
-/* Address to accept any incoming messages.  */
-#define	INADDR_ANY		((in_addr_t) 0x00000000)
-/* Address to send to all hosts.  */
-#define	INADDR_BROADCAST	((in_addr_t) 0xffffffff)
-/* Address indicating an error return.  */
-#define	INADDR_NONE		((in_addr_t) 0xffffffff)
-
-/* Network number for local host loopback.  */
-#define	IN_LOOPBACKNET		127
-/* Address to loopback in software to local host.  */
-#ifndef INADDR_LOOPBACK
-# define INADDR_LOOPBACK	((in_addr_t) 0x7f000001) /* Inet 127.0.0.1.  */
-#endif
-
-/* Defines for Multicast INADDR.  */
-#define INADDR_UNSPEC_GROUP	((in_addr_t) 0xe0000000) /* 224.0.0.0 */
-#define INADDR_ALLHOSTS_GROUP	((in_addr_t) 0xe0000001) /* 224.0.0.1 */
-#define INADDR_ALLRTRS_GROUP    ((in_addr_t) 0xe0000002) /* 224.0.0.2 */
-#define INADDR_MAX_LOCAL_GROUP  ((in_addr_t) 0xe00000ff) /* 224.0.0.255 */
-
-#ifndef __USE_KERNEL_IPV6_DEFS
-/* IPv6 address */
-struct in6_addr
-  {
-    union
-      {
-	uint8_t	__u6_addr8[16];
-#ifdef __USE_MISC
-	uint16_t __u6_addr16[8];
-	uint32_t __u6_addr32[4];
-#endif
-      } __in6_u;
-#define s6_addr			__in6_u.__u6_addr8
-#ifdef __USE_MISC
-# define s6_addr16		__in6_u.__u6_addr16
-# define s6_addr32		__in6_u.__u6_addr32
-#endif
-  };
-#endif /* !__USE_KERNEL_IPV6_DEFS */
-
-extern const struct in6_addr in6addr_any;        /* :: */
-extern const struct in6_addr in6addr_loopback;   /* ::1 */
-#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
-#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
-
-#define INET_ADDRSTRLEN 16
-#define INET6_ADDRSTRLEN 46
-
-
-/* Structure describing an Internet socket address.  */
-struct sockaddr_in
-  {
-    __SOCKADDR_COMMON (sin_);
-    in_port_t sin_port;			/* Port number.  */
-    struct in_addr sin_addr;		/* Internet address.  */
-
-    /* Pad to size of `struct sockaddr'.  */
-    unsigned char sin_zero[sizeof (struct sockaddr) -
-			   __SOCKADDR_COMMON_SIZE -
-			   sizeof (in_port_t) -
-			   sizeof (struct in_addr)];
-  };
-
-#ifndef __USE_KERNEL_IPV6_DEFS
-/* Ditto, for IPv6.  */
-struct sockaddr_in6
-  {
-    __SOCKADDR_COMMON (sin6_);
-    in_port_t sin6_port;	/* Transport layer port # */
-    uint32_t sin6_flowinfo;	/* IPv6 flow information */
-    struct in6_addr sin6_addr;	/* IPv6 address */
-    uint32_t sin6_scope_id;	/* IPv6 scope-id */
-  };
-#endif /* !__USE_KERNEL_IPV6_DEFS */
-
-#ifdef __USE_MISC
-/* IPv4 multicast request.  */
-struct ip_mreq
-  {
-    /* IP multicast address of group.  */
-    struct in_addr imr_multiaddr;
-
-    /* Local IP address of interface.  */
-    struct in_addr imr_interface;
-  };
-
-struct ip_mreq_source
-  {
-    /* IP multicast address of group.  */
-    struct in_addr imr_multiaddr;
-
-    /* IP address of source.  */
-    struct in_addr imr_interface;
-
-    /* IP address of interface.  */
-    struct in_addr imr_sourceaddr;
-  };
-#endif
-
-#ifndef __USE_KERNEL_IPV6_DEFS
-/* Likewise, for IPv6.  */
-struct ipv6_mreq
-  {
-    /* IPv6 multicast address of group */
-    struct in6_addr ipv6mr_multiaddr;
-
-    /* local interface */
-    unsigned int ipv6mr_interface;
-  };
-#endif /* !__USE_KERNEL_IPV6_DEFS */
-
-#ifdef __USE_MISC
-/* Multicast group request.  */
-struct group_req
-  {
-    /* Interface index.  */
-    uint32_t gr_interface;
-
-    /* Group address.  */
-    struct sockaddr_storage gr_group;
-  };
-
-struct group_source_req
-  {
-    /* Interface index.  */
-    uint32_t gsr_interface;
-
-    /* Group address.  */
-    struct sockaddr_storage gsr_group;
-
-    /* Source address.  */
-    struct sockaddr_storage gsr_source;
-  };
-
-
-/* Full-state filter operations.  */
-struct ip_msfilter
-  {
-    /* IP multicast address of group.  */
-    struct in_addr imsf_multiaddr;
-
-    /* Local IP address of interface.  */
-    struct in_addr imsf_interface;
-
-    /* Filter mode.  */
-    uint32_t imsf_fmode;
-
-    /* Number of source addresses.  */
-    uint32_t imsf_numsrc;
-    /* Source addresses.  */
-    struct in_addr imsf_slist[1];
-  };
-
-#define IP_MSFILTER_SIZE(numsrc) (sizeof (struct ip_msfilter) \
-				  - sizeof (struct in_addr)		      \
-				  + (numsrc) * sizeof (struct in_addr))
-
-struct group_filter
-  {
-    /* Interface index.  */
-    uint32_t gf_interface;
-
-    /* Group address.  */
-    struct sockaddr_storage gf_group;
-
-    /* Filter mode.  */
-    uint32_t gf_fmode;
-
-    /* Number of source addresses.  */
-    uint32_t gf_numsrc;
-    /* Source addresses.  */
-    struct sockaddr_storage gf_slist[1];
-};
-
-#define GROUP_FILTER_SIZE(numsrc) (sizeof (struct group_filter) \
-				   - sizeof (struct sockaddr_storage)	      \
-				   + ((numsrc)				      \
-				      * sizeof (struct sockaddr_storage)))
-#endif
-
-/* Functions to convert between host and network byte order.
-
-   Please note that these functions normally take `unsigned long int' or
-   `unsigned short int' values as arguments and also return them.  But
-   this was a short-sighted decision since on different systems the types
-   may have different representations but the values are always the same.  */
-
-extern uint32_t ntohl (uint32_t __netlong) __THROW __attribute__ ((__const__));
-extern uint16_t ntohs (uint16_t __netshort)
-     __THROW __attribute__ ((__const__));
-extern uint32_t htonl (uint32_t __hostlong)
-     __THROW __attribute__ ((__const__));
-extern uint16_t htons (uint16_t __hostshort)
-     __THROW __attribute__ ((__const__));
-
-#include <endian.h>
-
-/* Get machine dependent optimized versions of byte swapping functions.  */
-#include <bits/byteswap.h>
-
-#ifdef __OPTIMIZE__
-/* We can optimize calls to the conversion functions.  Either nothing has
-   to be done or we are using directly the byte-swapping functions which
-   often can be inlined.  */
-# if __BYTE_ORDER == __BIG_ENDIAN
-/* The host byte order is the same as network byte order,
-   so these functions are all just identity.  */
-# define ntohl(x)	(x)
-# define ntohs(x)	(x)
-# define htonl(x)	(x)
-# define htons(x)	(x)
-# else
-#  if __BYTE_ORDER == __LITTLE_ENDIAN
-#   define ntohl(x)	__bswap_32 (x)
-#   define ntohs(x)	__bswap_16 (x)
-#   define htonl(x)	__bswap_32 (x)
-#   define htons(x)	__bswap_16 (x)
-#  endif
-# endif
-#endif
-
-#ifdef __GNUC__
-# define IN6_IS_ADDR_UNSPECIFIED(a) \
-  (__extension__							      \
-   ({ const struct in6_addr *__a = (const struct in6_addr *) (a);	      \
-      __a->s6_addr32[0] == 0						      \
-      && __a->s6_addr32[1] == 0						      \
-      && __a->s6_addr32[2] == 0						      \
-      && __a->s6_addr32[3] == 0; }))
-
-# define IN6_IS_ADDR_LOOPBACK(a) \
-  (__extension__							      \
-   ({ const struct in6_addr *__a = (const struct in6_addr *) (a);	      \
-      __a->s6_addr32[0] == 0						      \
-      && __a->s6_addr32[1] == 0						      \
-      && __a->s6_addr32[2] == 0						      \
-      && __a->s6_addr32[3] == htonl (1); }))
-
-# define IN6_IS_ADDR_LINKLOCAL(a) \
-  (__extension__							      \
-   ({ const struct in6_addr *__a = (const struct in6_addr *) (a);	      \
-      (__a->s6_addr32[0] & htonl (0xffc00000)) == htonl (0xfe800000); }))
-
-# define IN6_IS_ADDR_SITELOCAL(a) \
-  (__extension__							      \
-   ({ const struct in6_addr *__a = (const struct in6_addr *) (a);	      \
-      (__a->s6_addr32[0] & htonl (0xffc00000)) == htonl (0xfec00000); }))
-
-# define IN6_IS_ADDR_V4MAPPED(a) \
-  (__extension__							      \
-   ({ const struct in6_addr *__a = (const struct in6_addr *) (a);	      \
-      __a->s6_addr32[0] == 0						      \
-      && __a->s6_addr32[1] == 0						      \
-      && __a->s6_addr32[2] == htonl (0xffff); }))
-
-# define IN6_IS_ADDR_V4COMPAT(a) \
-  (__extension__							      \
-   ({ const struct in6_addr *__a = (const struct in6_addr *) (a);	      \
-      __a->s6_addr32[0] == 0						      \
-      && __a->s6_addr32[1] == 0						      \
-      && __a->s6_addr32[2] == 0						      \
-      && ntohl (__a->s6_addr32[3]) > 1; }))
-
-# define IN6_ARE_ADDR_EQUAL(a,b) \
-  (__extension__							      \
-   ({ const struct in6_addr *__a = (const struct in6_addr *) (a);	      \
-      const struct in6_addr *__b = (const struct in6_addr *) (b);	      \
-      __a->s6_addr32[0] == __b->s6_addr32[0]				      \
-      && __a->s6_addr32[1] == __b->s6_addr32[1]				      \
-      && __a->s6_addr32[2] == __b->s6_addr32[2]				      \
-      && __a->s6_addr32[3] == __b->s6_addr32[3]; }))
-#else
-# define IN6_IS_ADDR_UNSPECIFIED(a) \
-	(((const uint32_t *) (a))[0] == 0				      \
-	 && ((const uint32_t *) (a))[1] == 0				      \
-	 && ((const uint32_t *) (a))[2] == 0				      \
-	 && ((const uint32_t *) (a))[3] == 0)
-
-# define IN6_IS_ADDR_LOOPBACK(a) \
-	(((const uint32_t *) (a))[0] == 0				      \
-	 && ((const uint32_t *) (a))[1] == 0				      \
-	 && ((const uint32_t *) (a))[2] == 0				      \
-	 && ((const uint32_t *) (a))[3] == htonl (1))
-
-# define IN6_IS_ADDR_LINKLOCAL(a) \
-	((((const uint32_t *) (a))[0] & htonl (0xffc00000))		      \
-	 == htonl (0xfe800000))
-
-# define IN6_IS_ADDR_SITELOCAL(a) \
-	((((const uint32_t *) (a))[0] & htonl (0xffc00000))		      \
-	 == htonl (0xfec00000))
-
-# define IN6_IS_ADDR_V4MAPPED(a) \
-	((((const uint32_t *) (a))[0] == 0)				      \
-	 && (((const uint32_t *) (a))[1] == 0)				      \
-	 && (((const uint32_t *) (a))[2] == htonl (0xffff)))
-
-# define IN6_IS_ADDR_V4COMPAT(a) \
-	((((const uint32_t *) (a))[0] == 0)				      \
-	 && (((const uint32_t *) (a))[1] == 0)				      \
-	 && (((const uint32_t *) (a))[2] == 0)				      \
-	 && (ntohl (((const uint32_t *) (a))[3]) > 1))
-
-# define IN6_ARE_ADDR_EQUAL(a,b) \
-	((((const uint32_t *) (a))[0] == ((const uint32_t *) (b))[0])	      \
-	 && (((const uint32_t *) (a))[1] == ((const uint32_t *) (b))[1])      \
-	 && (((const uint32_t *) (a))[2] == ((const uint32_t *) (b))[2])      \
-	 && (((const uint32_t *) (a))[3] == ((const uint32_t *) (b))[3]))
-#endif
-
-#define IN6_IS_ADDR_MULTICAST(a) (((const uint8_t *) (a))[0] == 0xff)
-
-#ifdef __USE_MISC
-/* Bind socket to a privileged IP port.  */
-extern int bindresvport (int __sockfd, struct sockaddr_in *__sock_in) __THROW;
-
-/* The IPv6 version of this function.  */
-extern int bindresvport6 (int __sockfd, struct sockaddr_in6 *__sock_in)
-     __THROW;
-#endif
-
-
-#define IN6_IS_ADDR_MC_NODELOCAL(a) \
-	(IN6_IS_ADDR_MULTICAST(a)					      \
-	 && ((((const uint8_t *) (a))[1] & 0xf) == 0x1))
-
-#define IN6_IS_ADDR_MC_LINKLOCAL(a) \
-	(IN6_IS_ADDR_MULTICAST(a)					      \
-	 && ((((const uint8_t *) (a))[1] & 0xf) == 0x2))
-
-#define IN6_IS_ADDR_MC_SITELOCAL(a) \
-	(IN6_IS_ADDR_MULTICAST(a)					      \
-	 && ((((const uint8_t *) (a))[1] & 0xf) == 0x5))
-
-#define IN6_IS_ADDR_MC_ORGLOCAL(a) \
-	(IN6_IS_ADDR_MULTICAST(a)					      \
-	 && ((((const uint8_t *) (a))[1] & 0xf) == 0x8))
-
-#define IN6_IS_ADDR_MC_GLOBAL(a) \
-	(IN6_IS_ADDR_MULTICAST(a)					      \
-	 && ((((const uint8_t *) (a))[1] & 0xf) == 0xe))
-
-
-#ifdef __USE_GNU
-struct cmsghdr;			/* Forward declaration.  */
-
-#ifndef __USE_KERNEL_IPV6_DEFS
-/* IPv6 packet information.  */
-struct in6_pktinfo
-  {
-    struct in6_addr ipi6_addr;	/* src/dst IPv6 address */
-    unsigned int ipi6_ifindex;	/* send/recv interface index */
-  };
-
-/* IPv6 MTU information.  */
-struct ip6_mtuinfo
-  {
-    struct sockaddr_in6 ip6m_addr; /* dst address including zone ID */
-    uint32_t ip6m_mtu;		   /* path MTU in host byte order */
-  };
-#endif /* !__USE_KERNEL_IPV6_DEFS */
-
-/* Obsolete hop-by-hop and Destination Options Processing (RFC 2292).  */
-extern int inet6_option_space (int __nbytes)
-     __THROW __attribute_deprecated__;
-extern int inet6_option_init (void *__bp, struct cmsghdr **__cmsgp,
-			      int __type) __THROW __attribute_deprecated__;
-extern int inet6_option_append (struct cmsghdr *__cmsg,
-				const uint8_t *__typep, int __multx,
-				int __plusy) __THROW __attribute_deprecated__;
-extern uint8_t *inet6_option_alloc (struct cmsghdr *__cmsg, int __datalen,
-				    int __multx, int __plusy)
-     __THROW __attribute_deprecated__;
-extern int inet6_option_next (const struct cmsghdr *__cmsg,
-			      uint8_t **__tptrp)
-     __THROW __attribute_deprecated__;
-extern int inet6_option_find (const struct cmsghdr *__cmsg,
-			      uint8_t **__tptrp, int __type)
-     __THROW __attribute_deprecated__;
-
-
-/* Hop-by-Hop and Destination Options Processing (RFC 3542).  */
-extern int inet6_opt_init (void *__extbuf, socklen_t __extlen) __THROW;
-extern int inet6_opt_append (void *__extbuf, socklen_t __extlen, int __offset,
-			     uint8_t __type, socklen_t __len, uint8_t __align,
-			     void **__databufp) __THROW;
-extern int inet6_opt_finish (void *__extbuf, socklen_t __extlen, int __offset)
-     __THROW;
-extern int inet6_opt_set_val (void *__databuf, int __offset, void *__val,
-			      socklen_t __vallen) __THROW;
-extern int inet6_opt_next (void *__extbuf, socklen_t __extlen, int __offset,
-			   uint8_t *__typep, socklen_t *__lenp,
-			   void **__databufp) __THROW;
-extern int inet6_opt_find (void *__extbuf, socklen_t __extlen, int __offset,
-			   uint8_t __type, socklen_t *__lenp,
-			   void **__databufp) __THROW;
-extern int inet6_opt_get_val (void *__databuf, int __offset, void *__val,
-			      socklen_t __vallen) __THROW;
-
-
-/* Routing Header Option (RFC 3542).  */
-extern socklen_t inet6_rth_space (int __type, int __segments) __THROW;
-extern void *inet6_rth_init (void *__bp, socklen_t __bp_len, int __type,
-			     int __segments) __THROW;
-extern int inet6_rth_add (void *__bp, const struct in6_addr *__addr) __THROW;
-extern int inet6_rth_reverse (const void *__in, void *__out) __THROW;
-extern int inet6_rth_segments (const void *__bp) __THROW;
-extern struct in6_addr *inet6_rth_getaddr (const void *__bp, int __index)
-     __THROW;
-
-
-/* Multicast source filter support.  */
-
-/* Get IPv4 source filter.  */
-extern int getipv4sourcefilter (int __s, struct in_addr __interface_addr,
-				struct in_addr __group, uint32_t *__fmode,
-				uint32_t *__numsrc, struct in_addr *__slist)
-     __THROW;
-
-/* Set IPv4 source filter.  */
-extern int setipv4sourcefilter (int __s, struct in_addr __interface_addr,
-				struct in_addr __group, uint32_t __fmode,
-				uint32_t __numsrc,
-				const struct in_addr *__slist)
-     __THROW;
-
-
-/* Get source filter.  */
-extern int getsourcefilter (int __s, uint32_t __interface_addr,
-			    const struct sockaddr *__group,
-			    socklen_t __grouplen, uint32_t *__fmode,
-			    uint32_t *__numsrc,
-			    struct sockaddr_storage *__slist) __THROW;
-
-/* Set source filter.  */
-extern int setsourcefilter (int __s, uint32_t __interface_addr,
-			    const struct sockaddr *__group,
-			    socklen_t __grouplen, uint32_t __fmode,
-			    uint32_t __numsrc,
-			    const struct sockaddr_storage *__slist) __THROW;
-#endif	/* use GNU */
-
-__END_DECLS
-
-#endif	/* netinet/in.h */
diff --git a/openflow/usr/include/netinet/in_systm.h b/openflow/usr/include/netinet/in_systm.h
deleted file mode 100644
index 41704ee..0000000
--- a/openflow/usr/include/netinet/in_systm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* System specific type definitions for networking code.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETINET_IN_SYSTM_H
-#define _NETINET_IN_SYSTM_H 1
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-__BEGIN_DECLS
-
-/*
- * Network order versions of various data types. Unfortunately, BSD
- * assumes specific sizes for shorts (16 bit) and longs (32 bit) which
- * don't hold in general. As a consequence, the network order versions
- * may not reflect the actual size of the native data types.
- */
-
-typedef u_int16_t n_short;      /* short as received from the net */
-typedef u_int32_t n_long;       /* long as received from the net  */
-typedef u_int32_t n_time;       /* ms since 00:00 GMT, byte rev   */
-
-__END_DECLS
-
-#endif /* netinet/in_systm.h */
diff --git a/openflow/usr/include/netinet/ip.h b/openflow/usr/include/netinet/ip.h
deleted file mode 100644
index 557a460..0000000
--- a/openflow/usr/include/netinet/ip.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __NETINET_IP_H
-#define __NETINET_IP_H 1
-
-#include <features.h>
-#include <sys/types.h>
-
-#include <netinet/in.h>
-
-__BEGIN_DECLS
-
-struct timestamp
-  {
-    u_int8_t len;
-    u_int8_t ptr;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-    unsigned int flags:4;
-    unsigned int overflow:4;
-#elif __BYTE_ORDER == __BIG_ENDIAN
-    unsigned int overflow:4;
-    unsigned int flags:4;
-#else
-# error	"Please fix <bits/endian.h>"
-#endif
-    u_int32_t data[9];
-  };
-
-struct iphdr
-  {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-    unsigned int ihl:4;
-    unsigned int version:4;
-#elif __BYTE_ORDER == __BIG_ENDIAN
-    unsigned int version:4;
-    unsigned int ihl:4;
-#else
-# error	"Please fix <bits/endian.h>"
-#endif
-    u_int8_t tos;
-    u_int16_t tot_len;
-    u_int16_t id;
-    u_int16_t frag_off;
-    u_int8_t ttl;
-    u_int8_t protocol;
-    u_int16_t check;
-    u_int32_t saddr;
-    u_int32_t daddr;
-    /*The options start here. */
-  };
-
-#ifdef __USE_MISC
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip.h	8.1 (Berkeley) 6/10/93
- */
-
-/*
- * Definitions for internet protocol version 4.
- * Per RFC 791, September 1981.
- */
-
-/*
- * Structure of an internet header, naked of options.
- */
-struct ip
-  {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-    unsigned int ip_hl:4;		/* header length */
-    unsigned int ip_v:4;		/* version */
-#endif
-#if __BYTE_ORDER == __BIG_ENDIAN
-    unsigned int ip_v:4;		/* version */
-    unsigned int ip_hl:4;		/* header length */
-#endif
-    u_int8_t ip_tos;			/* type of service */
-    u_short ip_len;			/* total length */
-    u_short ip_id;			/* identification */
-    u_short ip_off;			/* fragment offset field */
-#define	IP_RF 0x8000			/* reserved fragment flag */
-#define	IP_DF 0x4000			/* dont fragment flag */
-#define	IP_MF 0x2000			/* more fragments flag */
-#define	IP_OFFMASK 0x1fff		/* mask for fragmenting bits */
-    u_int8_t ip_ttl;			/* time to live */
-    u_int8_t ip_p;			/* protocol */
-    u_short ip_sum;			/* checksum */
-    struct in_addr ip_src, ip_dst;	/* source and dest address */
-  };
-
-/*
- * Time stamp option structure.
- */
-struct ip_timestamp
-  {
-    u_int8_t ipt_code;			/* IPOPT_TS */
-    u_int8_t ipt_len;			/* size of structure (variable) */
-    u_int8_t ipt_ptr;			/* index of current entry */
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-    unsigned int ipt_flg:4;		/* flags, see below */
-    unsigned int ipt_oflw:4;		/* overflow counter */
-#endif
-#if __BYTE_ORDER == __BIG_ENDIAN
-    unsigned int ipt_oflw:4;		/* overflow counter */
-    unsigned int ipt_flg:4;		/* flags, see below */
-#endif
-    u_int32_t data[9];
-  };
-#endif /* __USE_MISC */
-
-#define	IPVERSION	4               /* IP version number */
-#define	IP_MAXPACKET	65535		/* maximum packet size */
-
-/*
- * Definitions for Explicit Congestion Notification (ECN)
- *
- * Taken from RFC-3168, Section 5.
- */
-
-#define	IPTOS_ECN_MASK		0x03
-#define	IPTOS_ECN(x)		((x) & IPTOS_ECN_MASK)
-#define	IPTOS_ECN_NOT_ECT	0x00
-#define	IPTOS_ECN_ECT1		0x01
-#define	IPTOS_ECN_ECT0		0x02
-#define	IPTOS_ECN_CE		0x03
-
-/*
- * Definitions for IP differentiated services code points (DSCP)
- *
- * Taken from RFC-2597, Section 6 and RFC-2598, Section 2.3.
- */
-
-#define	IPTOS_DSCP_MASK		0xfc
-#define	IPTOS_DSCP(x)		((x) & IPTOS_DSCP_MASK)
-#define	IPTOS_DSCP_AF11		0x28
-#define	IPTOS_DSCP_AF12		0x30
-#define	IPTOS_DSCP_AF13		0x38
-#define	IPTOS_DSCP_AF21		0x48
-#define	IPTOS_DSCP_AF22		0x50
-#define	IPTOS_DSCP_AF23		0x58
-#define	IPTOS_DSCP_AF31		0x68
-#define	IPTOS_DSCP_AF32		0x70
-#define	IPTOS_DSCP_AF33		0x78
-#define	IPTOS_DSCP_AF41		0x88
-#define	IPTOS_DSCP_AF42		0x90
-#define	IPTOS_DSCP_AF43		0x98
-#define	IPTOS_DSCP_EF		0xb8
-
-/*
- * In RFC 2474, Section 4.2.2.1, the Class Selector Codepoints subsume
- * the old ToS Precedence values.
- */
-
-#define	IPTOS_CLASS_MASK		0xe0
-#define	IPTOS_CLASS(class)		((class) & IPTOS_CLASS_MASK)
-#define	IPTOS_CLASS_CS0			0x00
-#define	IPTOS_CLASS_CS1			0x20
-#define	IPTOS_CLASS_CS2			0x40
-#define	IPTOS_CLASS_CS3			0x60
-#define	IPTOS_CLASS_CS4			0x80
-#define	IPTOS_CLASS_CS5			0xa0
-#define	IPTOS_CLASS_CS6			0xc0
-#define	IPTOS_CLASS_CS7			0xe0
-
-#define	IPTOS_CLASS_DEFAULT		IPTOS_CLASS_CS0
-
-/*
- * Definitions for IP type of service (ip_tos) [deprecated; use DSCP
- * and CS definitions above instead.]
- */
-#define	IPTOS_TOS_MASK		0x1E
-#define	IPTOS_TOS(tos)		((tos) & IPTOS_TOS_MASK)
-#define	IPTOS_LOWDELAY		0x10
-#define	IPTOS_THROUGHPUT	0x08
-#define	IPTOS_RELIABILITY	0x04
-#define	IPTOS_LOWCOST		0x02
-#define	IPTOS_MINCOST		IPTOS_LOWCOST
-
-/*
- * Definitions for IP precedence (also in ip_tos) [also deprecated.]
- */
-#define	IPTOS_PREC_MASK			IPTOS_CLASS_MASK
-#define	IPTOS_PREC(tos)			IPTOS_CLASS(tos)
-#define	IPTOS_PREC_NETCONTROL		IPTOS_CLASS_CS7
-#define	IPTOS_PREC_INTERNETCONTROL	IPTOS_CLASS_CS6
-#define	IPTOS_PREC_CRITIC_ECP		IPTOS_CLASS_CS5
-#define	IPTOS_PREC_FLASHOVERRIDE	IPTOS_CLASS_CS4
-#define	IPTOS_PREC_FLASH		IPTOS_CLASS_CS3
-#define	IPTOS_PREC_IMMEDIATE		IPTOS_CLASS_CS2
-#define	IPTOS_PREC_PRIORITY		IPTOS_CLASS_CS1
-#define	IPTOS_PREC_ROUTINE		IPTOS_CLASS_CS0
-
-/*
- * Definitions for options.
- */
-#define	IPOPT_COPY		0x80
-#define	IPOPT_CLASS_MASK	0x60
-#define	IPOPT_NUMBER_MASK	0x1f
-
-#define	IPOPT_COPIED(o)		((o) & IPOPT_COPY)
-#define	IPOPT_CLASS(o)		((o) & IPOPT_CLASS_MASK)
-#define	IPOPT_NUMBER(o)		((o) & IPOPT_NUMBER_MASK)
-
-#define	IPOPT_CONTROL		0x00
-#define	IPOPT_RESERVED1		0x20
-#define	IPOPT_DEBMEAS		0x40
-#define	IPOPT_MEASUREMENT       IPOPT_DEBMEAS
-#define	IPOPT_RESERVED2		0x60
-
-#define	IPOPT_EOL		0		/* end of option list */
-#define	IPOPT_END		IPOPT_EOL
-#define	IPOPT_NOP		1		/* no operation */
-#define	IPOPT_NOOP		IPOPT_NOP
-
-#define	IPOPT_RR		7		/* record packet route */
-#define	IPOPT_TS		68		/* timestamp */
-#define	IPOPT_TIMESTAMP		IPOPT_TS
-#define	IPOPT_SECURITY		130		/* provide s,c,h,tcc */
-#define	IPOPT_SEC		IPOPT_SECURITY
-#define	IPOPT_LSRR		131		/* loose source route */
-#define	IPOPT_SATID		136		/* satnet id */
-#define	IPOPT_SID		IPOPT_SATID
-#define	IPOPT_SSRR		137		/* strict source route */
-#define	IPOPT_RA		148		/* router alert */
-
-/*
- * Offsets to fields in options other than EOL and NOP.
- */
-#define	IPOPT_OPTVAL		0		/* option ID */
-#define	IPOPT_OLEN		1		/* option length */
-#define	IPOPT_OFFSET		2		/* offset within option */
-#define	IPOPT_MINOFF		4		/* min value of above */
-
-#define	MAX_IPOPTLEN		40
-
-/* flag bits for ipt_flg */
-#define	IPOPT_TS_TSONLY		0		/* timestamps only */
-#define	IPOPT_TS_TSANDADDR	1		/* timestamps and addresses */
-#define	IPOPT_TS_PRESPEC	3		/* specified modules only */
-
-/* bits for security (not byte swapped) */
-#define	IPOPT_SECUR_UNCLASS	0x0000
-#define	IPOPT_SECUR_CONFID	0xf135
-#define	IPOPT_SECUR_EFTO	0x789a
-#define	IPOPT_SECUR_MMMM	0xbc4d
-#define	IPOPT_SECUR_RESTR	0xaf13
-#define	IPOPT_SECUR_SECRET	0xd788
-#define	IPOPT_SECUR_TOPSECRET	0x6bc5
-
-/*
- * Internet implementation parameters.
- */
-#define	MAXTTL		255		/* maximum time to live (seconds) */
-#define	IPDEFTTL	64		/* default ttl, from RFC 1340 */
-#define	IPFRAGTTL	60		/* time to live for frags, slowhz */
-#define	IPTTLDEC	1		/* subtracted when forwarding */
-
-#define	IP_MSS		576		/* default maximum segment size */
-
-__END_DECLS
-
-#endif /* netinet/ip.h */
diff --git a/openflow/usr/include/netinet/ip6.h b/openflow/usr/include/netinet/ip6.h
deleted file mode 100644
index 929d4b5..0000000
--- a/openflow/usr/include/netinet/ip6.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETINET_IP6_H
-#define _NETINET_IP6_H 1
-
-#include <inttypes.h>
-#include <netinet/in.h>
-
-struct ip6_hdr
-  {
-    union
-      {
-	struct ip6_hdrctl
-	  {
-	    uint32_t ip6_un1_flow;   /* 4 bits version, 8 bits TC,
-					20 bits flow-ID */
-	    uint16_t ip6_un1_plen;   /* payload length */
-	    uint8_t  ip6_un1_nxt;    /* next header */
-	    uint8_t  ip6_un1_hlim;   /* hop limit */
-	  } ip6_un1;
-	uint8_t ip6_un2_vfc;       /* 4 bits version, top 4 bits tclass */
-      } ip6_ctlun;
-    struct in6_addr ip6_src;      /* source address */
-    struct in6_addr ip6_dst;      /* destination address */
-  };
-
-#define ip6_vfc   ip6_ctlun.ip6_un2_vfc
-#define ip6_flow  ip6_ctlun.ip6_un1.ip6_un1_flow
-#define ip6_plen  ip6_ctlun.ip6_un1.ip6_un1_plen
-#define ip6_nxt   ip6_ctlun.ip6_un1.ip6_un1_nxt
-#define ip6_hlim  ip6_ctlun.ip6_un1.ip6_un1_hlim
-#define ip6_hops  ip6_ctlun.ip6_un1.ip6_un1_hlim
-
-/* Generic extension header.  */
-struct ip6_ext
-  {
-    uint8_t  ip6e_nxt;		/* next header.  */
-    uint8_t  ip6e_len;		/* length in units of 8 octets.  */
-  };
-
-/* Hop-by-Hop options header.  */
-struct ip6_hbh
-  {
-    uint8_t  ip6h_nxt;		/* next header.  */
-    uint8_t  ip6h_len;		/* length in units of 8 octets.  */
-    /* followed by options */
-  };
-
-/* Destination options header */
-struct ip6_dest
-  {
-    uint8_t  ip6d_nxt;		/* next header */
-    uint8_t  ip6d_len;		/* length in units of 8 octets */
-    /* followed by options */
-  };
-
-/* Routing header */
-struct ip6_rthdr
-  {
-    uint8_t  ip6r_nxt;		/* next header */
-    uint8_t  ip6r_len;		/* length in units of 8 octets */
-    uint8_t  ip6r_type;		/* routing type */
-    uint8_t  ip6r_segleft;	/* segments left */
-    /* followed by routing type specific data */
-  };
-
-/* Type 0 Routing header */
-struct ip6_rthdr0
-  {
-    uint8_t  ip6r0_nxt;		/* next header */
-    uint8_t  ip6r0_len;		/* length in units of 8 octets */
-    uint8_t  ip6r0_type;	/* always zero */
-    uint8_t  ip6r0_segleft;	/* segments left */
-    uint8_t  ip6r0_reserved;	/* reserved field */
-    uint8_t  ip6r0_slmap[3];	/* strict/loose bit map */
-    /* followed by up to 127 struct in6_addr */
-    struct in6_addr ip6r0_addr[0];
-  };
-
-/* Fragment header */
-struct ip6_frag
-  {
-    uint8_t   ip6f_nxt;		/* next header */
-    uint8_t   ip6f_reserved;	/* reserved field */
-    uint16_t  ip6f_offlg;	/* offset, reserved, and flag */
-    uint32_t  ip6f_ident;	/* identification */
-  };
-
-#if BYTE_ORDER == BIG_ENDIAN
-# define IP6F_OFF_MASK       0xfff8  /* mask out offset from _offlg */
-# define IP6F_RESERVED_MASK  0x0006  /* reserved bits in ip6f_offlg */
-# define IP6F_MORE_FRAG      0x0001  /* more-fragments flag */
-#else   /* BYTE_ORDER == LITTLE_ENDIAN */
-# define IP6F_OFF_MASK       0xf8ff  /* mask out offset from _offlg */
-# define IP6F_RESERVED_MASK  0x0600  /* reserved bits in ip6f_offlg */
-# define IP6F_MORE_FRAG      0x0100  /* more-fragments flag */
-#endif
-
-/* IPv6 options */
-struct ip6_opt
-  {
-    uint8_t  ip6o_type;
-    uint8_t  ip6o_len;
-  };
-
-/* The high-order 3 bits of the option type define the behavior
- * when processing an unknown option and whether or not the option
- * content changes in flight.
- */
-#define IP6OPT_TYPE(o)		((o) & 0xc0)
-#define IP6OPT_TYPE_SKIP	0x00
-#define IP6OPT_TYPE_DISCARD	0x40
-#define IP6OPT_TYPE_FORCEICMP	0x80
-#define IP6OPT_TYPE_ICMP	0xc0
-#define IP6OPT_TYPE_MUTABLE	0x20
-
-/* Special option types for padding.  */
-#define IP6OPT_PAD1	0
-#define IP6OPT_PADN	1
-
-#define IP6OPT_JUMBO		0xc2
-#define IP6OPT_NSAP_ADDR	0xc3
-#define IP6OPT_TUNNEL_LIMIT	0x04
-#define IP6OPT_ROUTER_ALERT	0x05
-
-/* Jumbo Payload Option */
-struct ip6_opt_jumbo
-  {
-    uint8_t  ip6oj_type;
-    uint8_t  ip6oj_len;
-    uint8_t  ip6oj_jumbo_len[4];
-  };
-#define IP6OPT_JUMBO_LEN	6
-
-/* NSAP Address Option */
-struct ip6_opt_nsap
-  {
-    uint8_t  ip6on_type;
-    uint8_t  ip6on_len;
-    uint8_t  ip6on_src_nsap_len;
-    uint8_t  ip6on_dst_nsap_len;
-      /* followed by source NSAP */
-      /* followed by destination NSAP */
-  };
-
-/* Tunnel Limit Option */
-struct ip6_opt_tunnel
-  {
-    uint8_t  ip6ot_type;
-    uint8_t  ip6ot_len;
-    uint8_t  ip6ot_encap_limit;
-  };
-
-/* Router Alert Option */
-struct ip6_opt_router
-  {
-    uint8_t  ip6or_type;
-    uint8_t  ip6or_len;
-    uint8_t  ip6or_value[2];
-  };
-
-/* Router alert values (in network byte order) */
-#if BYTE_ORDER == BIG_ENDIAN
-# define IP6_ALERT_MLD	0x0000
-# define IP6_ALERT_RSVP	0x0001
-# define IP6_ALERT_AN	0x0002
-#else /* BYTE_ORDER == LITTLE_ENDING */
-# define IP6_ALERT_MLD	0x0000
-# define IP6_ALERT_RSVP	0x0100
-# define IP6_ALERT_AN	0x0200
-#endif
-
-#endif /* netinet/ip6.h */
diff --git a/openflow/usr/include/netinet/ip_icmp.h b/openflow/usr/include/netinet/ip_icmp.h
deleted file mode 100644
index 4f7c1b1..0000000
--- a/openflow/usr/include/netinet/ip_icmp.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __NETINET_IP_ICMP_H
-#define __NETINET_IP_ICMP_H    1
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-__BEGIN_DECLS
-
-struct icmphdr
-{
-  u_int8_t type;		/* message type */
-  u_int8_t code;		/* type sub-code */
-  u_int16_t checksum;
-  union
-  {
-    struct
-    {
-      u_int16_t	id;
-      u_int16_t	sequence;
-    } echo;			/* echo datagram */
-    u_int32_t	gateway;	/* gateway address */
-    struct
-    {
-      u_int16_t	__glibc_reserved;
-      u_int16_t	mtu;
-    } frag;			/* path mtu discovery */
-  } un;
-};
-
-#define ICMP_ECHOREPLY		0	/* Echo Reply			*/
-#define ICMP_DEST_UNREACH	3	/* Destination Unreachable	*/
-#define ICMP_SOURCE_QUENCH	4	/* Source Quench		*/
-#define ICMP_REDIRECT		5	/* Redirect (change route)	*/
-#define ICMP_ECHO		8	/* Echo Request			*/
-#define ICMP_TIME_EXCEEDED	11	/* Time Exceeded		*/
-#define ICMP_PARAMETERPROB	12	/* Parameter Problem		*/
-#define ICMP_TIMESTAMP		13	/* Timestamp Request		*/
-#define ICMP_TIMESTAMPREPLY	14	/* Timestamp Reply		*/
-#define ICMP_INFO_REQUEST	15	/* Information Request		*/
-#define ICMP_INFO_REPLY		16	/* Information Reply		*/
-#define ICMP_ADDRESS		17	/* Address Mask Request		*/
-#define ICMP_ADDRESSREPLY	18	/* Address Mask Reply		*/
-#define NR_ICMP_TYPES		18
-
-
-/* Codes for UNREACH. */
-#define ICMP_NET_UNREACH	0	/* Network Unreachable		*/
-#define ICMP_HOST_UNREACH	1	/* Host Unreachable		*/
-#define ICMP_PROT_UNREACH	2	/* Protocol Unreachable		*/
-#define ICMP_PORT_UNREACH	3	/* Port Unreachable		*/
-#define ICMP_FRAG_NEEDED	4	/* Fragmentation Needed/DF set	*/
-#define ICMP_SR_FAILED		5	/* Source Route failed		*/
-#define ICMP_NET_UNKNOWN	6
-#define ICMP_HOST_UNKNOWN	7
-#define ICMP_HOST_ISOLATED	8
-#define ICMP_NET_ANO		9
-#define ICMP_HOST_ANO		10
-#define ICMP_NET_UNR_TOS	11
-#define ICMP_HOST_UNR_TOS	12
-#define ICMP_PKT_FILTERED	13	/* Packet filtered */
-#define ICMP_PREC_VIOLATION	14	/* Precedence violation */
-#define ICMP_PREC_CUTOFF	15	/* Precedence cut off */
-#define NR_ICMP_UNREACH		15	/* instead of hardcoding immediate value */
-
-/* Codes for REDIRECT. */
-#define ICMP_REDIR_NET		0	/* Redirect Net			*/
-#define ICMP_REDIR_HOST		1	/* Redirect Host		*/
-#define ICMP_REDIR_NETTOS	2	/* Redirect Net for TOS		*/
-#define ICMP_REDIR_HOSTTOS	3	/* Redirect Host for TOS	*/
-
-/* Codes for TIME_EXCEEDED. */
-#define ICMP_EXC_TTL		0	/* TTL count exceeded		*/
-#define ICMP_EXC_FRAGTIME	1	/* Fragment Reass time exceeded	*/
-
-
-#ifdef __USE_MISC
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- */
-
-#include <netinet/in.h>
-#include <netinet/ip.h>
-
-/*
- * Internal of an ICMP Router Advertisement
- */
-struct icmp_ra_addr
-{
-  u_int32_t ira_addr;
-  u_int32_t ira_preference;
-};
-
-struct icmp
-{
-  u_int8_t  icmp_type;	/* type of message, see below */
-  u_int8_t  icmp_code;	/* type sub code */
-  u_int16_t icmp_cksum;	/* ones complement checksum of struct */
-  union
-  {
-    u_char ih_pptr;		/* ICMP_PARAMPROB */
-    struct in_addr ih_gwaddr;	/* gateway address */
-    struct ih_idseq		/* echo datagram */
-    {
-      u_int16_t icd_id;
-      u_int16_t icd_seq;
-    } ih_idseq;
-    u_int32_t ih_void;
-
-    /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
-    struct ih_pmtu
-    {
-      u_int16_t ipm_void;
-      u_int16_t ipm_nextmtu;
-    } ih_pmtu;
-
-    struct ih_rtradv
-    {
-      u_int8_t irt_num_addrs;
-      u_int8_t irt_wpa;
-      u_int16_t irt_lifetime;
-    } ih_rtradv;
-  } icmp_hun;
-#define	icmp_pptr	icmp_hun.ih_pptr
-#define	icmp_gwaddr	icmp_hun.ih_gwaddr
-#define	icmp_id		icmp_hun.ih_idseq.icd_id
-#define	icmp_seq	icmp_hun.ih_idseq.icd_seq
-#define	icmp_void	icmp_hun.ih_void
-#define	icmp_pmvoid	icmp_hun.ih_pmtu.ipm_void
-#define	icmp_nextmtu	icmp_hun.ih_pmtu.ipm_nextmtu
-#define	icmp_num_addrs	icmp_hun.ih_rtradv.irt_num_addrs
-#define	icmp_wpa	icmp_hun.ih_rtradv.irt_wpa
-#define	icmp_lifetime	icmp_hun.ih_rtradv.irt_lifetime
-  union
-  {
-    struct
-    {
-      u_int32_t its_otime;
-      u_int32_t its_rtime;
-      u_int32_t its_ttime;
-    } id_ts;
-    struct
-    {
-      struct ip idi_ip;
-      /* options and then 64 bits of data */
-    } id_ip;
-    struct icmp_ra_addr id_radv;
-    u_int32_t   id_mask;
-    u_int8_t    id_data[1];
-  } icmp_dun;
-#define	icmp_otime	icmp_dun.id_ts.its_otime
-#define	icmp_rtime	icmp_dun.id_ts.its_rtime
-#define	icmp_ttime	icmp_dun.id_ts.its_ttime
-#define	icmp_ip		icmp_dun.id_ip.idi_ip
-#define	icmp_radv	icmp_dun.id_radv
-#define	icmp_mask	icmp_dun.id_mask
-#define	icmp_data	icmp_dun.id_data
-};
-
-/*
- * Lower bounds on packet lengths for various types.
- * For the error advice packets must first insure that the
- * packet is large enough to contain the returned ip header.
- * Only then can we do the check to see if 64 bits of packet
- * data have been returned, since we need to check the returned
- * ip header length.
- */
-#define	ICMP_MINLEN	8				/* abs minimum */
-#define	ICMP_TSLEN	(8 + 3 * sizeof (n_time))	/* timestamp */
-#define	ICMP_MASKLEN	12				/* address mask */
-#define	ICMP_ADVLENMIN	(8 + sizeof (struct ip) + 8)	/* min */
-#ifndef _IP_VHL
-#define	ICMP_ADVLEN(p)	(8 + ((p)->icmp_ip.ip_hl << 2) + 8)
-	/* N.B.: must separately check that ip_hl >= 5 */
-#else
-#define	ICMP_ADVLEN(p)	(8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8)
-	/* N.B.: must separately check that header length >= 5 */
-#endif
-
-/* Definition of type and code fields. */
-/* defined above: ICMP_ECHOREPLY, ICMP_REDIRECT, ICMP_ECHO */
-#define	ICMP_UNREACH		3		/* dest unreachable, codes: */
-#define	ICMP_SOURCEQUENCH	4		/* packet lost, slow down */
-#define	ICMP_ROUTERADVERT	9		/* router advertisement */
-#define	ICMP_ROUTERSOLICIT	10		/* router solicitation */
-#define	ICMP_TIMXCEED		11		/* time exceeded, code: */
-#define	ICMP_PARAMPROB		12		/* ip header bad */
-#define	ICMP_TSTAMP		13		/* timestamp request */
-#define	ICMP_TSTAMPREPLY	14		/* timestamp reply */
-#define	ICMP_IREQ		15		/* information request */
-#define	ICMP_IREQREPLY		16		/* information reply */
-#define	ICMP_MASKREQ		17		/* address mask request */
-#define	ICMP_MASKREPLY		18		/* address mask reply */
-
-#define	ICMP_MAXTYPE		18
-
-/* UNREACH codes */
-#define	ICMP_UNREACH_NET	        0	/* bad net */
-#define	ICMP_UNREACH_HOST	        1	/* bad host */
-#define	ICMP_UNREACH_PROTOCOL	        2	/* bad protocol */
-#define	ICMP_UNREACH_PORT	        3	/* bad port */
-#define	ICMP_UNREACH_NEEDFRAG	        4	/* IP_DF caused drop */
-#define	ICMP_UNREACH_SRCFAIL	        5	/* src route failed */
-#define	ICMP_UNREACH_NET_UNKNOWN        6	/* unknown net */
-#define	ICMP_UNREACH_HOST_UNKNOWN       7	/* unknown host */
-#define	ICMP_UNREACH_ISOLATED	        8	/* src host isolated */
-#define	ICMP_UNREACH_NET_PROHIB	        9	/* net denied */
-#define	ICMP_UNREACH_HOST_PROHIB        10	/* host denied */
-#define	ICMP_UNREACH_TOSNET	        11	/* bad tos for net */
-#define	ICMP_UNREACH_TOSHOST	        12	/* bad tos for host */
-#define	ICMP_UNREACH_FILTER_PROHIB      13	/* admin prohib */
-#define	ICMP_UNREACH_HOST_PRECEDENCE    14	/* host prec vio. */
-#define	ICMP_UNREACH_PRECEDENCE_CUTOFF  15	/* prec cutoff */
-
-/* REDIRECT codes */
-#define	ICMP_REDIRECT_NET	0		/* for network */
-#define	ICMP_REDIRECT_HOST	1		/* for host */
-#define	ICMP_REDIRECT_TOSNET	2		/* for tos and net */
-#define	ICMP_REDIRECT_TOSHOST	3		/* for tos and host */
-
-/* TIMEXCEED codes */
-#define	ICMP_TIMXCEED_INTRANS	0		/* ttl==0 in transit */
-#define	ICMP_TIMXCEED_REASS	1		/* ttl==0 in reass */
-
-/* PARAMPROB code */
-#define	ICMP_PARAMPROB_OPTABSENT 1		/* req. opt. absent */
-
-#define	ICMP_INFOTYPE(type) \
-	((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
-	(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
-	(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
-	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
-	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
-
-#endif /* __USE_MISC */
-
-__END_DECLS
-
-#endif /* netinet/ip_icmp.h */
diff --git a/openflow/usr/include/netinet/tcp.h b/openflow/usr/include/netinet/tcp.h
deleted file mode 100644
index 3918bca..0000000
--- a/openflow/usr/include/netinet/tcp.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NETINET_TCP_H
-#define _NETINET_TCP_H	1
-
-#include <features.h>
-
-/*
- * User-settable options (used with setsockopt).
- */
-#define	TCP_NODELAY		 1  /* Don't delay send to coalesce packets  */
-#define	TCP_MAXSEG		 2  /* Set maximum segment size  */
-#define TCP_CORK		 3  /* Control sending of partial frames  */
-#define TCP_KEEPIDLE		 4  /* Start keeplives after this period */
-#define TCP_KEEPINTVL		 5  /* Interval between keepalives */
-#define TCP_KEEPCNT		 6  /* Number of keepalives before death */
-#define TCP_SYNCNT		 7  /* Number of SYN retransmits */
-#define TCP_LINGER2		 8  /* Life time of orphaned FIN-WAIT-2 state */
-#define TCP_DEFER_ACCEPT	 9  /* Wake up listener only when data arrive */
-#define TCP_WINDOW_CLAMP	 10 /* Bound advertised window */
-#define TCP_INFO		 11 /* Information about this connection. */
-#define	TCP_QUICKACK		 12 /* Bock/reenable quick ACKs.  */
-#define TCP_CONGESTION		 13 /* Congestion control algorithm.  */
-#define TCP_MD5SIG		 14 /* TCP MD5 Signature (RFC2385) */
-#define TCP_COOKIE_TRANSACTIONS	 15 /* TCP Cookie Transactions */
-#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/
-#define TCP_THIN_DUPACK		 17 /* Fast retrans. after 1 dupack */
-#define TCP_USER_TIMEOUT	 18 /* How long for loss retry before timeout */
-#define TCP_REPAIR		 19 /* TCP sock is under repair right now */
-#define TCP_REPAIR_QUEUE	 20 /* Set TCP queue to repair */
-#define TCP_QUEUE_SEQ		 21 /* Set sequence number of repaired queue. */
-#define TCP_REPAIR_OPTIONS	 22 /* Repair TCP connection options */
-#define TCP_FASTOPEN		 23 /* Enable FastOpen on listeners */
-#define TCP_TIMESTAMP		 24 /* TCP time stamp */
-#define TCP_NOTSENT_LOWAT	 25 /* Limit number of unsent bytes in
-				       write queue.  */
-#define TCP_CC_INFO		 26 /* Get Congestion Control
-				       (optional) info.  */
-#define TCP_SAVE_SYN		 27 /* Record SYN headers for new
-				       connections.  */
-#define TCP_SAVED_SYN		 28 /* Get SYN headers recorded for
-				       connection.  */
-
-#ifdef __USE_MISC
-# include <sys/types.h>
-# include <sys/socket.h>
-
-typedef	u_int32_t tcp_seq;
-/*
- * TCP header.
- * Per RFC 793, September, 1981.
- */
-struct tcphdr
-  {
-    __extension__ union
-    {
-      struct
-      {
-	u_int16_t th_sport;		/* source port */
-	u_int16_t th_dport;		/* destination port */
-	tcp_seq th_seq;		/* sequence number */
-	tcp_seq th_ack;		/* acknowledgement number */
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-	u_int8_t th_x2:4;		/* (unused) */
-	u_int8_t th_off:4;		/* data offset */
-# endif
-# if __BYTE_ORDER == __BIG_ENDIAN
-	u_int8_t th_off:4;		/* data offset */
-	u_int8_t th_x2:4;		/* (unused) */
-# endif
-	u_int8_t th_flags;
-# define TH_FIN	0x01
-# define TH_SYN	0x02
-# define TH_RST	0x04
-# define TH_PUSH	0x08
-# define TH_ACK	0x10
-# define TH_URG	0x20
-	u_int16_t th_win;		/* window */
-	u_int16_t th_sum;		/* checksum */
-	u_int16_t th_urp;		/* urgent pointer */
-      };
-      struct
-      {
-	u_int16_t source;
-	u_int16_t dest;
-	u_int32_t seq;
-	u_int32_t ack_seq;
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-	u_int16_t res1:4;
-	u_int16_t doff:4;
-	u_int16_t fin:1;
-	u_int16_t syn:1;
-	u_int16_t rst:1;
-	u_int16_t psh:1;
-	u_int16_t ack:1;
-	u_int16_t urg:1;
-	u_int16_t res2:2;
-# elif __BYTE_ORDER == __BIG_ENDIAN
-	u_int16_t doff:4;
-	u_int16_t res1:4;
-	u_int16_t res2:2;
-	u_int16_t urg:1;
-	u_int16_t ack:1;
-	u_int16_t psh:1;
-	u_int16_t rst:1;
-	u_int16_t syn:1;
-	u_int16_t fin:1;
-# else
-#  error "Adjust your <bits/endian.h> defines"
-# endif
-	u_int16_t window;
-	u_int16_t check;
-	u_int16_t urg_ptr;
-      };
-    };
-};
-
-enum
-{
-  TCP_ESTABLISHED = 1,
-  TCP_SYN_SENT,
-  TCP_SYN_RECV,
-  TCP_FIN_WAIT1,
-  TCP_FIN_WAIT2,
-  TCP_TIME_WAIT,
-  TCP_CLOSE,
-  TCP_CLOSE_WAIT,
-  TCP_LAST_ACK,
-  TCP_LISTEN,
-  TCP_CLOSING   /* now a valid state */
-};
-
-# define TCPOPT_EOL		0
-# define TCPOPT_NOP		1
-# define TCPOPT_MAXSEG		2
-# define TCPOLEN_MAXSEG		4
-# define TCPOPT_WINDOW		3
-# define TCPOLEN_WINDOW		3
-# define TCPOPT_SACK_PERMITTED	4		/* Experimental */
-# define TCPOLEN_SACK_PERMITTED	2
-# define TCPOPT_SACK		5		/* Experimental */
-# define TCPOPT_TIMESTAMP	8
-# define TCPOLEN_TIMESTAMP	10
-# define TCPOLEN_TSTAMP_APPA	(TCPOLEN_TIMESTAMP+2) /* appendix A */
-
-# define TCPOPT_TSTAMP_HDR	\
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
-
-/*
- * Default maximum segment size for TCP.
- * With an IP MSS of 576, this is 536,
- * but 512 is probably more convenient.
- * This should be defined as MIN(512, IP_MSS - sizeof (struct tcpiphdr)).
- */
-# define TCP_MSS	512
-
-# define TCP_MAXWIN	65535	/* largest value for (unscaled) window */
-
-# define TCP_MAX_WINSHIFT	14	/* maximum window shift */
-
-# define SOL_TCP		6	/* TCP level */
-
-
-# define TCPI_OPT_TIMESTAMPS	1
-# define TCPI_OPT_SACK		2
-# define TCPI_OPT_WSCALE	4
-# define TCPI_OPT_ECN		8  /* ECN was negociated at TCP session init */
-# define TCPI_OPT_ECN_SEEN	16 /* we received at least one packet with ECT */
-# define TCPI_OPT_SYN_DATA	32 /* SYN-ACK acked data in SYN sent or rcvd */
-
-/* Values for tcpi_state.  */
-enum tcp_ca_state
-{
-  TCP_CA_Open = 0,
-  TCP_CA_Disorder = 1,
-  TCP_CA_CWR = 2,
-  TCP_CA_Recovery = 3,
-  TCP_CA_Loss = 4
-};
-
-struct tcp_info
-{
-  u_int8_t	tcpi_state;
-  u_int8_t	tcpi_ca_state;
-  u_int8_t	tcpi_retransmits;
-  u_int8_t	tcpi_probes;
-  u_int8_t	tcpi_backoff;
-  u_int8_t	tcpi_options;
-  u_int8_t	tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
-
-  u_int32_t	tcpi_rto;
-  u_int32_t	tcpi_ato;
-  u_int32_t	tcpi_snd_mss;
-  u_int32_t	tcpi_rcv_mss;
-
-  u_int32_t	tcpi_unacked;
-  u_int32_t	tcpi_sacked;
-  u_int32_t	tcpi_lost;
-  u_int32_t	tcpi_retrans;
-  u_int32_t	tcpi_fackets;
-
-  /* Times. */
-  u_int32_t	tcpi_last_data_sent;
-  u_int32_t	tcpi_last_ack_sent;	/* Not remembered, sorry.  */
-  u_int32_t	tcpi_last_data_recv;
-  u_int32_t	tcpi_last_ack_recv;
-
-  /* Metrics. */
-  u_int32_t	tcpi_pmtu;
-  u_int32_t	tcpi_rcv_ssthresh;
-  u_int32_t	tcpi_rtt;
-  u_int32_t	tcpi_rttvar;
-  u_int32_t	tcpi_snd_ssthresh;
-  u_int32_t	tcpi_snd_cwnd;
-  u_int32_t	tcpi_advmss;
-  u_int32_t	tcpi_reordering;
-
-  u_int32_t	tcpi_rcv_rtt;
-  u_int32_t	tcpi_rcv_space;
-
-  u_int32_t	tcpi_total_retrans;
-};
-
-
-/* For TCP_MD5SIG socket option.  */
-#define TCP_MD5SIG_MAXKEYLEN	80
-
-struct tcp_md5sig
-{
-  struct sockaddr_storage tcpm_addr;		/* Address associated.  */
-  u_int16_t	__tcpm_pad1;			/* Zero.  */
-  u_int16_t	tcpm_keylen;			/* Key length.  */
-  u_int32_t	__tcpm_pad2;			/* Zero.  */
-  u_int8_t	tcpm_key[TCP_MD5SIG_MAXKEYLEN];	/* Key (binary).  */
-};
-
-/* For socket repair options.  */
-struct tcp_repair_opt
-{
-  u_int32_t	opt_code;
-  u_int32_t	opt_val;
-};
-
-/* Queue to repair, for TCP_REPAIR_QUEUE.  */
-enum
-{
-  TCP_NO_QUEUE,
-  TCP_RECV_QUEUE,
-  TCP_SEND_QUEUE,
-  TCP_QUEUES_NR,
-};
-
-/* For cookie transactions socket options.  */
-#define TCP_COOKIE_MIN		8		/*  64-bits */
-#define TCP_COOKIE_MAX		16		/* 128-bits */
-#define TCP_COOKIE_PAIR_SIZE	(2*TCP_COOKIE_MAX)
-
-/* Flags for both getsockopt and setsockopt */
-#define TCP_COOKIE_IN_ALWAYS	(1 << 0)	/* Discard SYN without cookie */
-#define TCP_COOKIE_OUT_NEVER	(1 << 1)	/* Prohibit outgoing cookies,
-						 * supercedes everything. */
-
-/* Flags for getsockopt */
-#define TCP_S_DATA_IN		(1 << 2)	/* Was data received? */
-#define TCP_S_DATA_OUT		(1 << 3)	/* Was data sent? */
-
-#define TCP_MSS_DEFAULT		 536U	/* IPv4 (RFC1122, RFC2581) */
-#define TCP_MSS_DESIRED		1220U	/* IPv6 (tunneled), EDNS0 (RFC3226) */
-
-struct tcp_cookie_transactions
-{
-  u_int16_t	tcpct_flags;
-  u_int8_t	__tcpct_pad1;
-  u_int8_t	tcpct_cookie_desired;
-  u_int16_t	tcpct_s_data_desired;
-  u_int16_t	tcpct_used;
-  u_int8_t	tcpct_value[TCP_MSS_DEFAULT];
-};
-
-#endif /* Misc.  */
-
-#endif /* netinet/tcp.h */
diff --git a/openflow/usr/include/netinet/udp.h b/openflow/usr/include/netinet/udp.h
deleted file mode 100644
index bcc3213..0000000
--- a/openflow/usr/include/netinet/udp.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * Copyright (C) 1982, 1986 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __NETINET_UDP_H
-#define __NETINET_UDP_H    1
-
-#include <features.h>
-#include <sys/types.h>
-
-
-/* UDP header as specified by RFC 768, August 1980. */
-
-struct udphdr
-{
-  __extension__ union
-  {
-    struct
-    {
-      u_int16_t uh_sport;		/* source port */
-      u_int16_t uh_dport;		/* destination port */
-      u_int16_t uh_ulen;		/* udp length */
-      u_int16_t uh_sum;		/* udp checksum */
-    };
-    struct
-    {
-      u_int16_t source;
-      u_int16_t dest;
-      u_int16_t len;
-      u_int16_t check;
-    };
-  };
-};
-
-/* UDP socket options */
-#define UDP_CORK	1	/* Never send partially complete segments.  */
-#define UDP_ENCAP	100	/* Set the socket to accept
-				   encapsulated packets.  */
-#define UDP_NO_CHECK6_TX 101	/* Disable sending checksum for UDP
-				   over IPv6.  */
-#define UDP_NO_CHECK6_RX 102	/* Disable accepting checksum for UDP
-				   over IPv6.  */
-
-/* UDP encapsulation types */
-#define UDP_ENCAP_ESPINUDP_NON_IKE 1	/* draft-ietf-ipsec-nat-t-ike-00/01 */
-#define UDP_ENCAP_ESPINUDP	2	/* draft-ietf-ipsec-udp-encaps-06 */
-#define UDP_ENCAP_L2TPINUDP	3	/* rfc2661 */
-
-#define SOL_UDP            17      /* sockopt level for UDP */
-
-#endif /* netinet/udp.h */
diff --git a/openflow/usr/include/netipx/ipx.h b/openflow/usr/include/netipx/ipx.h
deleted file mode 100644
index 855ab99..0000000
--- a/openflow/usr/include/netipx/ipx.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __NETIPX_IPX_H
-#define __NETIPX_IPX_H 1
-
-#include <features.h>
-
-#include <sys/types.h>
-#include <bits/sockaddr.h>
-
-__BEGIN_DECLS
-
-#define SOL_IPX    256          /* sockopt level */
-
-#define IPX_TYPE        1
-#define IPX_NODE_LEN	6
-#define IPX_MTU		576
-
-struct sockaddr_ipx
-  {
-    sa_family_t sipx_family;
-    u_int16_t sipx_port;
-    u_int32_t sipx_network;
-    unsigned char sipx_node[IPX_NODE_LEN];
-    u_int8_t sipx_type;
-    unsigned char sipx_zero;	/* 16 byte fill */
-  };
-
-/*
- *	So we can fit the extra info for SIOCSIFADDR into the address nicely
- */
-
-#define sipx_special	sipx_port
-#define sipx_action	sipx_zero
-#define IPX_DLTITF	0
-#define IPX_CRTITF	1
-
-typedef struct ipx_route_definition
-  {
-    unsigned long ipx_network;
-    unsigned long ipx_router_network;
-    unsigned char ipx_router_node[IPX_NODE_LEN];
-  }
-ipx_route_definition;
-
-typedef struct ipx_interface_definition
-  {
-    unsigned long ipx_network;
-    unsigned char ipx_device[16];
-    unsigned char ipx_dlink_type;
-#define IPX_FRAME_NONE		0
-#define IPX_FRAME_SNAP		1
-#define IPX_FRAME_8022		2
-#define IPX_FRAME_ETHERII	3
-#define IPX_FRAME_8023		4
-#define IPX_FRAME_TR_8022	5
-    unsigned char ipx_special;
-#define IPX_SPECIAL_NONE	0
-#define IPX_PRIMARY		1
-#define IPX_INTERNAL		2
-    unsigned char ipx_node[IPX_NODE_LEN];
-  }
-ipx_interface_definition;
-
-typedef struct ipx_config_data
-  {
-    unsigned char ipxcfg_auto_select_primary;
-    unsigned char ipxcfg_auto_create_interfaces;
-  }
-ipx_config_data;
-
-/*
- * OLD Route Definition for backward compatibility.
- */
-
-struct ipx_route_def
-  {
-    unsigned long ipx_network;
-    unsigned long ipx_router_network;
-#define IPX_ROUTE_NO_ROUTER	0
-    unsigned char ipx_router_node[IPX_NODE_LEN];
-    unsigned char ipx_device[16];
-    unsigned short ipx_flags;
-#define IPX_RT_SNAP		8
-#define IPX_RT_8022		4
-#define IPX_RT_BLUEBOOK		2
-#define IPX_RT_ROUTED		1
-  };
-
-#define SIOCAIPXITFCRT		(SIOCPROTOPRIVATE)
-#define SIOCAIPXPRISLT		(SIOCPROTOPRIVATE + 1)
-#define SIOCIPXCFGDATA		(SIOCPROTOPRIVATE + 2)
-#define SIOCIPXNCPCONN		(SIOCPROTOPRIVATE + 3)
-
-__END_DECLS
-
-#endif /* netipx/ipx.h */
diff --git a/openflow/usr/include/netiucv/iucv.h b/openflow/usr/include/netiucv/iucv.h
deleted file mode 100644
index 13cfe98..0000000
--- a/openflow/usr/include/netiucv/iucv.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 2007-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __NETIUCV_IUCV_H
-#define __NETIUCV_IUCV_H	1
-
-#include <features.h>
-#include <bits/sockaddr.h>
-
-__BEGIN_DECLS
-
-struct sockaddr_iucv
-  {
-    __SOCKADDR_COMMON (siucv_);
-    unsigned short	siucv_port;		/* Reserved */
-    unsigned int	siucv_addr;		/* Reserved */
-    char		siucv_nodeid[8];	/* Reserved */
-    char		siucv_user_id[8];	/* Guest User Id */
-    char		siucv_name[8];		/* Application Name */
-  };
-
-__END_DECLS
-
-#endif
diff --git a/openflow/usr/include/netpacket/packet.h b/openflow/usr/include/netpacket/packet.h
deleted file mode 100644
index 52b67df..0000000
--- a/openflow/usr/include/netpacket/packet.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Definitions for use with Linux AF_PACKET sockets.
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __NETPACKET_PACKET_H
-#define __NETPACKET_PACKET_H	1
-
-struct sockaddr_ll
-  {
-    unsigned short int sll_family;
-    unsigned short int sll_protocol;
-    int sll_ifindex;
-    unsigned short int sll_hatype;
-    unsigned char sll_pkttype;
-    unsigned char sll_halen;
-    unsigned char sll_addr[8];
-  };
-
-/* Packet types.  */
-
-#define PACKET_HOST		0		/* To us.  */
-#define PACKET_BROADCAST	1		/* To all.  */
-#define PACKET_MULTICAST	2		/* To group.  */
-#define PACKET_OTHERHOST	3		/* To someone else.  */
-#define PACKET_OUTGOING		4		/* Originated by us . */
-#define PACKET_LOOPBACK		5
-#define PACKET_FASTROUTE	6
-
-/* Packet socket options.  */
-
-#define PACKET_ADD_MEMBERSHIP		1
-#define PACKET_DROP_MEMBERSHIP		2
-#define	PACKET_RECV_OUTPUT		3
-#define	PACKET_RX_RING			5
-#define	PACKET_STATISTICS		6
-#define	PACKET_COPY_THRESH		7
-#define	PACKET_AUXDATA			8
-#define	PACKET_ORIGDEV			9
-#define	PACKET_VERSION			10
-#define	PACKET_HDRLEN			11
-#define	PACKET_RESERVE			12
-#define	PACKET_TX_RING			13
-#define	PACKET_LOSS			14
-#define	PACKET_VNET_HDR			15
-#define	PACKET_TX_TIMESTAMP		16
-#define	PACKET_TIMESTAMP		17
-#define	PACKET_FANOUT			18
-#define	PACKET_TX_HAS_OFF		19
-#define	PACKET_QDISC_BYPASS		20
-#define	PACKET_ROLLOVER_STATS		21
-#define	PACKET_FANOUT_DATA		22
-
-struct packet_mreq
-  {
-    int mr_ifindex;
-    unsigned short int mr_type;
-    unsigned short int mr_alen;
-    unsigned char mr_address[8];
-  };
-
-#define PACKET_MR_MULTICAST	0
-#define PACKET_MR_PROMISC	1
-#define PACKET_MR_ALLMULTI	2
-#define PACKET_MR_UNICAST	3
-
-#endif	/* netpacket/packet.h */
diff --git a/openflow/usr/include/netrom/netrom.h b/openflow/usr/include/netrom/netrom.h
deleted file mode 100644
index 4d544ad..0000000
--- a/openflow/usr/include/netrom/netrom.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NETROM_NETROM_H
-#define _NETROM_NETROM_H	1
-
-#include <netax25/ax25.h>
-
-/* Setsockoptions(2) level.  Thanks to BSD these must match IPPROTO_xxx.  */
-#define SOL_NETROM	259
-
-/* NetRom control values: */
-#define NETROM_T1	1
-#define NETROM_T2	2
-#define NETROM_N2	3
-#define NETROM_PACLEN	5
-#define	NETROM_T4	6
-#define NETROM_IDLE	7
-
-#define NETROM_KILL	99
-
-/* Type of route: */
-#define NETROM_NEIGH    0
-#define NETROM_NODE     1
-
-struct nr_route_struct
-  {
-    int type;
-    ax25_address callsign;
-    char device[16];
-    unsigned int quality;
-    char mnemonic[7];
-    ax25_address neighbour;
-    unsigned int obs_count;
-    unsigned int ndigis;
-    ax25_address digipeaters[AX25_MAX_DIGIS];
-  };
-
-/* NetRom socket ioctls: */
-#define	SIOCNRGETPARMS		(SIOCPROTOPRIVATE+0)
-#define	SIOCNRSETPARMS		(SIOCPROTOPRIVATE+1)
-#define	SIOCNRDECOBS		(SIOCPROTOPRIVATE+2)
-#define	SIOCNRRTCTL		(SIOCPROTOPRIVATE+3)
-#define	SIOCNRCTLCON		(SIOCPROTOPRIVATE+4)
-
-/* NetRom parameter structure: */
-struct nr_parms_struct
-  {
-    unsigned int quality;
-    unsigned int obs_count;
-    unsigned int ttl;
-    unsigned int timeout;
-    unsigned int ack_delay;
-    unsigned int busy_delay;
-    unsigned int tries;
-    unsigned int window;
-    unsigned int paclen;
-  };
-
-/* NetRom control structure: */
-struct nr_ctl_struct
-  {
-    unsigned char index;
-    unsigned char id;
-    unsigned int cmd;
-    unsigned long arg;
-  };
-
-#endif /* netrom/netrom.h */
diff --git a/openflow/usr/include/netrose/rose.h b/openflow/usr/include/netrose/rose.h
deleted file mode 100644
index 3cb7f84..0000000
--- a/openflow/usr/include/netrose/rose.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Definitions for Rose packet radio address family.
-   Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* What follows is copied from the 2.1.93 <linux/rose.h>.  */
-
-#ifndef _NETROSE_ROSE_H
-#define _NETROSE_ROSE_H 1
-
-/* Socket level values.  */
-#define SOL_ROSE        260
-
-
-/* These are the public elements of the Linux kernel Rose
-   implementation.  For kernel AX.25 see the file ax25.h. This file
-   requires ax25.h for the definition of the ax25_address structure.  */
-#define ROSE_MTU	251
-
-#define ROSE_MAX_DIGIS	6
-
-#define	ROSE_DEFER	1
-#define	ROSE_T1		2
-#define	ROSE_T2		3
-#define	ROSE_T3		4
-#define	ROSE_IDLE	5
-#define	ROSE_QBITINCL	6
-#define	ROSE_HOLDBACK	7
-
-#define	SIOCRSGCAUSE		(SIOCPROTOPRIVATE + 0)
-#define	SIOCRSSCAUSE		(SIOCPROTOPRIVATE + 1)
-#define	SIOCRSL2CALL		(SIOCPROTOPRIVATE + 2)
-#define	SIOCRSSL2CALL		(SIOCPROTOPRIVATE + 2)
-#define	SIOCRSACCEPT		(SIOCPROTOPRIVATE + 3)
-#define	SIOCRSCLRRT		(SIOCPROTOPRIVATE + 4)
-#define	SIOCRSGL2CALL		(SIOCPROTOPRIVATE + 5)
-#define	SIOCRSGFACILITIES	(SIOCPROTOPRIVATE + 6)
-
-#define	ROSE_DTE_ORIGINATED	0x00
-#define	ROSE_NUMBER_BUSY	0x01
-#define	ROSE_INVALID_FACILITY	0x03
-#define	ROSE_NETWORK_CONGESTION	0x05
-#define	ROSE_OUT_OF_ORDER	0x09
-#define	ROSE_ACCESS_BARRED	0x0B
-#define	ROSE_NOT_OBTAINABLE	0x0D
-#define	ROSE_REMOTE_PROCEDURE	0x11
-#define	ROSE_LOCAL_PROCEDURE	0x13
-#define	ROSE_SHIP_ABSENT	0x39
-
-
-typedef struct
-{
-  char rose_addr[5];
-} rose_address;
-
-struct sockaddr_rose
-{
-  sa_family_t srose_family;
-  rose_address srose_addr;
-  ax25_address srose_call;
-  int srose_ndigis;
-  ax25_address	srose_digi;
-};
-
-struct full_sockaddr_rose
-{
-  sa_family_t srose_family;
-  rose_address srose_addr;
-  ax25_address srose_call;
-  unsigned int srose_ndigis;
-  ax25_address srose_digis[ROSE_MAX_DIGIS];
-};
-
-struct rose_route_struct
-{
-  rose_address address;
-  unsigned short int mask;
-  ax25_address	neighbour;
-  char device[16];
-  unsigned char	ndigis;
-  ax25_address digipeaters[AX25_MAX_DIGIS];
-};
-
-struct rose_cause_struct
-{
-  unsigned char	cause;
-  unsigned char	diagnostic;
-};
-
-struct rose_facilities_struct
-{
-  rose_address source_addr,   dest_addr;
-  ax25_address source_call,   dest_call;
-  unsigned char source_ndigis, dest_ndigis;
-  ax25_address source_digis[ROSE_MAX_DIGIS];
-  ax25_address dest_digis[ROSE_MAX_DIGIS];
-  unsigned int rand;
-  rose_address fail_addr;
-  ax25_address fail_call;
-};
-
-#endif	/* netrose/rose.h */
diff --git a/openflow/usr/include/nfs/nfs.h b/openflow/usr/include/nfs/nfs.h
deleted file mode 100644
index 61e4b65..0000000
--- a/openflow/usr/include/nfs/nfs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linux/nfs.h>
diff --git a/openflow/usr/include/nl_types.h b/openflow/usr/include/nl_types.h
deleted file mode 100644
index 202603f..0000000
--- a/openflow/usr/include/nl_types.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _NL_TYPES_H
-#define _NL_TYPES_H 1
-
-#include <features.h>
-
-/* The default message set used by the gencat program.  */
-#define NL_SETD 1
-
-/* Value for FLAG parameter of `catgets' to say we want XPG4 compliance.  */
-#define NL_CAT_LOCALE 1
-
-
-__BEGIN_DECLS
-
-/* Message catalog descriptor type.  */
-typedef void *nl_catd;
-
-/* Type used by `nl_langinfo'.  */
-typedef int nl_item;
-
-/* Open message catalog for later use, returning descriptor.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern nl_catd catopen (const char *__cat_name, int __flag) __nonnull ((1));
-
-/* Return translation with NUMBER in SET of CATALOG; if not found
-   return STRING.  */
-extern char *catgets (nl_catd __catalog, int __set, int __number,
-		      const char *__string) __THROW __nonnull ((1));
-
-/* Close message CATALOG.  */
-extern int catclose (nl_catd __catalog) __THROW __nonnull ((1));
-
-__END_DECLS
-
-#endif /* nl_types.h  */
diff --git a/openflow/usr/include/nspr/md/_aix32.cfg b/openflow/usr/include/nspr/md/_aix32.cfg
deleted file mode 100644
index 23a3f51..0000000
--- a/openflow/usr/include/nspr/md/_aix32.cfg
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef AIX
-#define AIX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2	5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-/* used by protypes.h only */
-#define _PR_AIX_HAVE_BSD_INT_TYPES
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_aix64.cfg b/openflow/usr/include/nspr/md/_aix64.cfg
deleted file mode 100644
index 7efe896..0000000
--- a/openflow/usr/include/nspr/md/_aix64.cfg
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef AIX
-#define AIX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2	6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 8
-
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-/* used by protypes.h only */
-#define _PR_AIX_HAVE_BSD_INT_TYPES
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_beos.cfg b/openflow/usr/include/nspr/md/_beos.cfg
deleted file mode 100644
index 5a3c569..0000000
--- a/openflow/usr/include/nspr/md/_beos.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_BEOS
-#define XP_BEOS
-#undef XP_UNIX
-#endif
-
-#ifndef BEOS
-#define BEOS
-#endif
-
-#define PR_AF_INET6 5  /* same as AF_INET6 */
-
-#ifdef __powerpc__
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#else
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#endif
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-/*
- * XXX These two macros need to be investigated for different architectures.
- */
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_bsdi.cfg b/openflow/usr/include/nspr/md/_bsdi.cfg
deleted file mode 100644
index 130cf82..0000000
--- a/openflow/usr/include/nspr/md/_bsdi.cfg
+++ /dev/null
@@ -1,170 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef BSDI
-#define BSDI
-#endif
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#if defined(__i386__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__sparc__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error "Unknown CPU architecture"
-
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_darwin.cfg b/openflow/usr/include/nspr/md/_darwin.cfg
deleted file mode 100644
index 5e11893..0000000
--- a/openflow/usr/include/nspr/md/_darwin.cfg
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#define PR_AF_INET6 30  /* same as AF_INET6 */
-
-#ifdef __LITTLE_ENDIAN__
-#undef IS_BIG_ENDIAN
-#define  IS_LITTLE_ENDIAN 1
-#else
-#undef IS_LITTLE_ENDIAN
-#define  IS_BIG_ENDIAN 1
-#endif
-
-#ifdef __LP64__
-#define IS_64
-#endif
-
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-#undef	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS 1
-
-#ifdef IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-#define PR_BITS_PER_DWORD   64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-#define PR_BITS_PER_DWORD_LOG2  6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-#define PR_ALIGN_OF_DWORD   8
-
-#else /* IS_64 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-#define PR_BITS_PER_DWORD   64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#endif /* IS_64 */
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
-
diff --git a/openflow/usr/include/nspr/md/_dgux.cfg b/openflow/usr/include/nspr/md/_dgux.cfg
deleted file mode 100644
index 8c9e3de..0000000
--- a/openflow/usr/include/nspr/md/_dgux.cfg
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef DGUX
-#define DGUX
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_freebsd.cfg b/openflow/usr/include/nspr/md/_freebsd.cfg
deleted file mode 100644
index 1d1039a..0000000
--- a/openflow/usr/include/nspr/md/_freebsd.cfg
+++ /dev/null
@@ -1,594 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef FREEBSD
-#define FREEBSD
-#endif
-
-#define PR_AF_INET6 28  /* same as AF_INET6 */
-
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-
-#if defined(__i386__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(__alpha__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#elif defined(__sparc__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#elif defined(__ia64__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#elif defined(__amd64__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#elif defined(__powerpc64__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__powerpc__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__aarch64__)
-
-#undef  IS_BIG_ENDIAN
-#define IS_LITTLE_ENDIAN 1
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__arm__)
-
-#if defined(__ARMEB__) || defined(__ARM_BIG_ENDIAN__)
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#else
-#undef  IS_BIG_ENDIAN
-#define IS_LITTLE_ENDIAN 1
-#endif
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__mips64__)
-
-#if defined(__MIPSEB__) || defined(_MIPSEB)
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#else
-#undef  IS_BIG_ENDIAN
-#define IS_LITTLE_ENDIAN 1
-#endif
-
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__mips__)
-
-#if defined(__MIPSEB__) || defined(_MIPSEB)
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#else
-#undef  IS_BIG_ENDIAN
-#define IS_LITTLE_ENDIAN 1
-#endif
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error "Unknown CPU architecture"
-
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_hpux32.cfg b/openflow/usr/include/nspr/md/_hpux32.cfg
deleted file mode 100644
index 08950cb..0000000
--- a/openflow/usr/include/nspr/md/_hpux32.cfg
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef HPUX
-#define HPUX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_AF_INET6 22  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BYTES_PER_WORD_LOG2 2
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_hpux64.cfg b/openflow/usr/include/nspr/md/_hpux64.cfg
deleted file mode 100644
index 028a034..0000000
--- a/openflow/usr/include/nspr/md/_hpux64.cfg
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef HPUX
-#define HPUX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define IS_64
-
-#define PR_AF_INET6 22  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BYTES_PER_WORD_LOG2 3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_irix32.cfg b/openflow/usr/include/nspr/md/_irix32.cfg
deleted file mode 100644
index 3a5005c..0000000
--- a/openflow/usr/include/nspr/md/_irix32.cfg
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef _SGI_MP_SOURCE
-#define _SGI_MP_SOURCE
-#endif
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef IRIX
-#define IRIX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_BYTES_PER_WORD_LOG2  2
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_irix64.cfg b/openflow/usr/include/nspr/md/_irix64.cfg
deleted file mode 100644
index e6f29e3..0000000
--- a/openflow/usr/include/nspr/md/_irix64.cfg
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef _SGI_MP_SOURCE
-#define _SGI_MP_SOURCE
-#endif
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef IRIX
-#define IRIX
-#endif
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define IS_64
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_linux.cfg b/openflow/usr/include/nspr/md/_linux.cfg
deleted file mode 100644
index 8cbf0cb..0000000
--- a/openflow/usr/include/nspr/md/_linux.cfg
+++ /dev/null
@@ -1,1081 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * This file is used by not only Linux but also other glibc systems
- * such as GNU/Hurd and GNU/k*BSD.
- */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#if !defined(LINUX) && defined(__linux__)
-#define LINUX
-#endif
-
-#ifdef __FreeBSD_kernel__
-#define PR_AF_INET6 28  /* same as AF_INET6 */
-#elif defined(__GNU__)
-#define PR_AF_INET6 26  /* same as AF_INET6 */
-#else
-#define PR_AF_INET6 10  /* same as AF_INET6 */
-#endif
-
-#ifdef __powerpc64__
-
-#ifdef __LITTLE_ENDIAN__
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#endif
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__powerpc__)
-
-#ifdef __LITTLE_ENDIAN__
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#endif
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__alpha)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__ia64__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__x86_64__)
-
-#ifdef __ILP32__
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#endif
-
-#elif defined(__mc68000__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     2
-#define PR_ALIGN_OF_LONG    2
-#define PR_ALIGN_OF_INT64   2
-#define PR_ALIGN_OF_FLOAT   2
-#define PR_ALIGN_OF_DOUBLE  2
-#define PR_ALIGN_OF_POINTER 2
-#define PR_ALIGN_OF_WORD    2
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__sparc__) && defined (__arch64__)
-
-#undef	IS_LITTLE_ENDIAN
-#define	IS_BIG_ENDIAN 1
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__sparc__)
-
-#undef	IS_LITTLE_ENDIAN
-#define	IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__i386__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__mips__)
-
-#ifdef __MIPSEB__
-#define IS_BIG_ENDIAN 1
-#undef  IS_LITTLE_ENDIAN
-#elif defined(__MIPSEL__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#error "Unknown MIPS endianness."
-#endif
-
-#if _MIPS_SIM == _ABI64
-
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else /* _ABI64 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#endif /* _ABI64 */
-
-#elif defined(__arm__)
-
-#ifdef __ARMEB__
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#elif defined(__ARMEL__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#error "Unknown ARM endianness."
-#endif
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__aarch64__)
-
-#ifdef __AARCH64EB__
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#elif defined(__AARCH64EL__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#error "Unknown Aarch64 endianness."
-#endif
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__hppa__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__s390x__)
-
-#define IS_BIG_ENDIAN 1
-#undef  IS_LITTLE_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__s390__)
-
-#define IS_BIG_ENDIAN 1
-#undef  IS_LITTLE_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__sh__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__avr32__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__m32r__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__or1k__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error "Unknown CPU architecture"
-
-#endif
-
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-#if PR_ALIGN_OF_DOUBLE == 8
-#define HAVE_ALIGNED_DOUBLES
-#endif
-#if PR_ALIGN_OF_INT64 == 8
-#define HAVE_ALIGNED_LONGLONGS
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_netbsd.cfg b/openflow/usr/include/nspr/md/_netbsd.cfg
deleted file mode 100644
index 1326556..0000000
--- a/openflow/usr/include/nspr/md/_netbsd.cfg
+++ /dev/null
@@ -1,351 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef NETBSD
-#define NETBSD
-#endif
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-
-#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
-	defined(__MIPSEL__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(__sparc_v9__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8 
-#define PR_ALIGN_OF_FLOAT   4 
-#define PR_ALIGN_OF_DOUBLE  8 
-#define PR_ALIGN_OF_POINTER 8 
-
-#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(__alpha__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__amd64__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__powerpc__) || defined(__m68k__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error Must define constants for type sizes here.
-
-#endif
-
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_nto.cfg b/openflow/usr/include/nspr/md/_nto.cfg
deleted file mode 100644
index b76a560..0000000
--- a/openflow/usr/include/nspr/md/_nto.cfg
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef NTO
-#define NTO
-#endif
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#ifdef __i386__
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1L
-#define PR_BYTES_PER_SHORT  2L
-#define PR_BYTES_PER_INT    4L
-#define PR_BYTES_PER_INT64  8L
-#define PR_BYTES_PER_LONG   4L
-#define PR_BYTES_PER_FLOAT  4L
-#define PR_BYTES_PER_DOUBLE 8L
-#define PR_BYTES_PER_WORD   4L
-#define PR_BYTES_PER_DWORD  8L
-
-#define PR_BITS_PER_BYTE    8L
-#define PR_BITS_PER_SHORT   16L
-#define PR_BITS_PER_INT     32L
-#define PR_BITS_PER_INT64   64L
-#define PR_BITS_PER_LONG    32L
-#define PR_BITS_PER_FLOAT   32L
-#define PR_BITS_PER_DOUBLE  64L
-#define PR_BITS_PER_WORD    32L
-
-#define PR_BITS_PER_BYTE_LOG2   3L
-#define PR_BITS_PER_SHORT_LOG2  4L
-#define PR_BITS_PER_INT_LOG2    5L
-#define PR_BITS_PER_INT64_LOG2  6L
-#define PR_BITS_PER_LONG_LOG2   5L
-#define PR_BITS_PER_FLOAT_LOG2  5L
-#define PR_BITS_PER_DOUBLE_LOG2 6L
-#define PR_BITS_PER_WORD_LOG2   5L
-
-#define PR_ALIGN_OF_SHORT   2L
-#define PR_ALIGN_OF_INT     4L
-#define PR_ALIGN_OF_LONG    4L
-#define PR_ALIGN_OF_INT64   4L
-#define PR_ALIGN_OF_FLOAT   4L
-#define PR_ALIGN_OF_DOUBLE  4L
-#define PR_ALIGN_OF_POINTER 4L
-#define PR_ALIGN_OF_WORD    4L
-
-#define PR_BYTES_PER_WORD_LOG2   2L
-#define PR_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  1L
-
-#else
-
-#error Undefined CPU Architecture
-
-#endif
-
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_openbsd.cfg b/openflow/usr/include/nspr/md/_openbsd.cfg
deleted file mode 100644
index b68d6e9..0000000
--- a/openflow/usr/include/nspr/md/_openbsd.cfg
+++ /dev/null
@@ -1,353 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef OPENBSD
-#define OPENBSD
-#endif
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-
-#if defined(__i386__) || defined(__arm__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(__amd64__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-
-#elif defined(__sparc_v9__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__sparc__)
-
-#undef IS_LITTLE_ENDIAN
-#define  IS_BIG_ENDIAN 1
-#define  HAVE_ALIGNED_DOUBLES
-#define  HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#elif defined(__alpha__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__powerpc__) || defined(__m68k__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error Must define constants for type sizes here.
-
-#endif
-
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_os2.cfg b/openflow/usr/include/nspr/md/_os2.cfg
deleted file mode 100644
index 67c2ded..0000000
--- a/openflow/usr/include/nspr/md/_os2.cfg
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_PC
-#define XP_PC
-#endif
-
-#ifndef XP_OS2
-#define XP_OS2
-#endif
-
-#ifndef OS2
-#define OS2
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#ifdef NO_LONG_LONG
-#undef HAVE_LONG_LONG
-#else
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG 1
-#endif
-#endif
-
-#define PR_AF_INET6 24  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD       4
-#define PR_BYTES_PER_DWORD	8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	32
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	5
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_WORD	4
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2	2
-#define PR_BYTES_PER_DWORD_LOG2	2
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE      PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT     PR_BYTES_PER_SHORT
-#define BYTES_PER_INT       PR_BYTES_PER_INT
-#define BYTES_PER_INT64     PR_BYTES_PER_INT64
-#define BYTES_PER_LONG      PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT     PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE    PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD      PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD     PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE       PR_BITS_PER_BYTE
-#define BITS_PER_SHORT      PR_BITS_PER_SHORT
-#define BITS_PER_INT        PR_BITS_PER_INT
-#define BITS_PER_INT64      PR_BITS_PER_INT64
-#define BITS_PER_LONG       PR_BITS_PER_LONG
-#define BITS_PER_FLOAT      PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE     PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD       PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2  PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2   PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2  PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2    PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2  PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT      PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT        PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG       PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64      PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT      PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE     PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER    PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD       PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2		PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2    PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2    PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_osf1.cfg b/openflow/usr/include/nspr/md/_osf1.cfg
deleted file mode 100644
index 7999402..0000000
--- a/openflow/usr/include/nspr/md/_osf1.cfg
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef OSF1
-#define OSF1
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-#define HAVE_ALIGNED_DOUBLES
-#define HAVE_ALIGNED_LONGLONGS
-#ifndef IS_64
-#define IS_64
-#endif
-
-#define PR_AF_INET6 26  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_qnx.cfg b/openflow/usr/include/nspr/md/_qnx.cfg
deleted file mode 100644
index a459b8c..0000000
--- a/openflow/usr/include/nspr/md/_qnx.cfg
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef QNX
-#define QNX
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#undef  HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   1
-#define PR_ALIGN_OF_INT     1
-#define PR_ALIGN_OF_LONG    1
-#define PR_ALIGN_OF_INT64   1
-#define PR_ALIGN_OF_FLOAT   1
-#define PR_ALIGN_OF_DOUBLE  1
-#define PR_ALIGN_OF_POINTER 1
-#define PR_ALIGN_OF_WORD    1
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-#define PR_WORDS_PER_DWORD_LOG2  1
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_riscos.cfg b/openflow/usr/include/nspr/md/_riscos.cfg
deleted file mode 100644
index c7adf2e..0000000
--- a/openflow/usr/include/nspr/md/_riscos.cfg
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef RISCOS
-#define RISCOS
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-#undef  HAVE_ALIGNED_DOUBLES
-#undef  HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-#define PR_WORDS_PER_DWORD_LOG2  1
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_scoos.cfg b/openflow/usr/include/nspr/md/_scoos.cfg
deleted file mode 100644
index 70cc6b7..0000000
--- a/openflow/usr/include/nspr/md/_scoos.cfg
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef SCO
-#define SCO
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#undef	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_solaris.cfg b/openflow/usr/include/nspr/md/_solaris.cfg
deleted file mode 100644
index 6745637..0000000
--- a/openflow/usr/include/nspr/md/_solaris.cfg
+++ /dev/null
@@ -1,171 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef SOLARIS
-#define SOLARIS
-#endif
-
-#define PR_AF_INET6 26  /* same as AF_INET6 */
-
-#if defined(sparc) || defined(__sparc)
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_DOUBLE  8
-#if defined(__sparcv9)
-#define IS_64
-#endif
-#elif defined(__x86_64)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_DOUBLE  8
-#define IS_64
-#elif defined(i386) || defined(__i386)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_DOUBLE  4
-#else
-#error unknown processor
-#endif
-
-#ifdef IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_POINTER 8
-
-#else /* IS_64 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_POINTER 4
-
-#endif /* IS_64 */
-
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-#define	HAVE_ALIGNED_DOUBLES
-#define	HAVE_ALIGNED_LONGLONGS
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* ifndef nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_symbian.cfg b/openflow/usr/include/nspr/md/_symbian.cfg
deleted file mode 100644
index 4d49797..0000000
--- a/openflow/usr/include/nspr/md/_symbian.cfg
+++ /dev/null
@@ -1,170 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef SYMBIAN
-#define SYMBIAN
-#endif
-
-#define PR_AF_INET6 0x0806  /* same as AF_INET6 */
-
-#ifdef __arm__
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_DOUBLE  8
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__WINS__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_DOUBLE  4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error "Unknown CPU architecture"
-
-#endif
-
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-#if PR_ALIGN_OF_DOUBLE == 8
-#define HAVE_ALIGNED_DOUBLES
-#endif
-#if PR_ALIGN_OF_INT64 == 8
-#define HAVE_ALIGNED_LONGLONGS
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_unixware.cfg b/openflow/usr/include/nspr/md/_unixware.cfg
deleted file mode 100644
index 0fa8dfc..0000000
--- a/openflow/usr/include/nspr/md/_unixware.cfg
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef UNIXWARE
-#define UNIXWARE
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#undef	HAVE_LONG_LONG
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_unixware7.cfg b/openflow/usr/include/nspr/md/_unixware7.cfg
deleted file mode 100644
index 33ce83b..0000000
--- a/openflow/usr/include/nspr/md/_unixware7.cfg
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#ifndef UNIXWARE
-#define UNIXWARE
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-#undef	HAVE_ALIGNED_DOUBLES
-#undef	HAVE_ALIGNED_LONGLONGS
-
-#define PR_AF_INET6 27  /* same as AF_INET6 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define _PR_POLL_BACKCOMPAT
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_win95.cfg b/openflow/usr/include/nspr/md/_win95.cfg
deleted file mode 100644
index 1e693cc..0000000
--- a/openflow/usr/include/nspr/md/_win95.cfg
+++ /dev/null
@@ -1,272 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_PC
-#define XP_PC
-#endif
-
-#ifndef WIN32
-#define WIN32
-#endif
-
-#ifndef WIN95
-#define WIN95
-#endif
-
-#define PR_AF_INET6 23  /* same as AF_INET6 */
-
-#if defined(_M_IX86) || defined(_X86_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD	4
-#define PR_BYTES_PER_DWORD	8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	32
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	5
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD	4
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2	2
-#define PR_BYTES_PER_DWORD_LOG2	3
-
-#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD	8
-#define PR_BYTES_PER_DWORD	8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	64
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	6
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD	8
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2	3
-#define PR_BYTES_PER_DWORD_LOG2	3
-
-#elif defined(_M_IA64) || defined(_IA64_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD	8
-#define PR_BYTES_PER_DWORD	8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	64
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	6
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD	8
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2	3
-#define PR_BYTES_PER_DWORD_LOG2	3
-
-#elif defined(_M_ARM) || defined(_ARM_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD    32
-#define PR_BITS_PER_DWORD   64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2   5
-#define PR_BITS_PER_DWORD_LOG2  6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD    4
-#define PR_ALIGN_OF_DWORD   8
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2  2
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#else /* defined(_M_IX86) || defined(_X86_) */
-
-#error unknown processor architecture
-
-#endif /* defined(_M_IX86) || defined(_X86_) */
-
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE      PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT     PR_BYTES_PER_SHORT
-#define BYTES_PER_INT       PR_BYTES_PER_INT
-#define BYTES_PER_INT64     PR_BYTES_PER_INT64
-#define BYTES_PER_LONG      PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT     PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE    PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD      PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD     PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE       PR_BITS_PER_BYTE
-#define BITS_PER_SHORT      PR_BITS_PER_SHORT
-#define BITS_PER_INT        PR_BITS_PER_INT
-#define BITS_PER_INT64      PR_BITS_PER_INT64
-#define BITS_PER_LONG       PR_BITS_PER_LONG
-#define BITS_PER_FLOAT      PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE     PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD       PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2  PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2   PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2  PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2    PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2  PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT      PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT        PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG       PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64      PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT      PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE     PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER    PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD       PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2		PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2    PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2    PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/md/_winnt.cfg b/openflow/usr/include/nspr/md/_winnt.cfg
deleted file mode 100644
index e2a277f..0000000
--- a/openflow/usr/include/nspr/md/_winnt.cfg
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_PC
-#define XP_PC
-#endif
-
-#ifndef WIN32
-#define WIN32
-#endif
-
-#ifndef WINNT
-#define WINNT
-#endif
-
-#define PR_AF_INET6 23  /* same as AF_INET6 */
-
-#if defined(_M_IX86) || defined(_X86_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD	4
-#define PR_BYTES_PER_DWORD	8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	32
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	5
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD	4
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2	2
-#define PR_BYTES_PER_DWORD_LOG2	2
-
-#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD    64
-#define PR_BITS_PER_DWORD   64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	6
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD    8
-#define PR_ALIGN_OF_DWORD   8
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2	3
-#define PR_BYTES_PER_DWORD_LOG2	3
-
-#elif defined(_M_IA64) || defined(_IA64_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD    64
-#define PR_BITS_PER_DWORD   64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	6
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD    8
-#define PR_ALIGN_OF_DWORD   8
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-
-#define PR_BYTES_PER_WORD_LOG2	3
-#define PR_BYTES_PER_DWORD_LOG2	3
-
-#else /* defined(_M_IX86) || defined(_X86_) */
-
-#error unknown processor architecture
-
-#endif /* defined(_M_IX86) || defined(_X86_) */
-
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE      PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT     PR_BYTES_PER_SHORT
-#define BYTES_PER_INT       PR_BYTES_PER_INT
-#define BYTES_PER_INT64     PR_BYTES_PER_INT64
-#define BYTES_PER_LONG      PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT     PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE    PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD      PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD     PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE       PR_BITS_PER_BYTE
-#define BITS_PER_SHORT      PR_BITS_PER_SHORT
-#define BITS_PER_INT        PR_BITS_PER_INT
-#define BITS_PER_INT64      PR_BITS_PER_INT64
-#define BITS_PER_LONG       PR_BITS_PER_LONG
-#define BITS_PER_FLOAT      PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE     PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD       PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2  PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2   PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2  PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2    PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2  PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT      PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT        PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG       PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64      PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT      PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE     PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER    PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD       PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2		PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2    PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2    PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/nspr.h b/openflow/usr/include/nspr/nspr.h
deleted file mode 100644
index 0cbc71c..0000000
--- a/openflow/usr/include/nspr/nspr.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nspr_h___
-#define nspr_h___
-
-#include "pratom.h"
-#include "prbit.h"
-#include "prclist.h"
-#include "prcmon.h"
-#include "prcvar.h"
-#include "prdtoa.h"
-#include "prenv.h"
-#include "prerror.h"
-#include "prinet.h"
-#include "prinit.h"
-#include "prinrval.h"
-#include "prio.h"
-#include "pripcsem.h"
-#include "prlink.h"
-#include "prlock.h"
-#include "prlog.h"
-#include "prlong.h"
-#include "prmem.h"
-#include "prmon.h"
-#include "prmwait.h"
-#include "prnetdb.h"
-#include "prprf.h"
-#include "prproces.h"
-#include "prrng.h"
-#include "prrwlock.h"
-#include "prshm.h"
-#include "prshma.h"
-#include "prsystem.h"
-#include "prthread.h"
-#include "prtime.h"
-#include "prtpool.h"
-#include "prtrace.h"
-#include "prtypes.h"
-
-#endif /* nspr_h___ */
diff --git a/openflow/usr/include/nspr/obsolete/pralarm.h b/openflow/usr/include/nspr/obsolete/pralarm.h
deleted file mode 100644
index 959e74b..0000000
--- a/openflow/usr/include/nspr/obsolete/pralarm.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File:		pralarm.h
-** Description:	API to periodic alarms.
-**
-**
-** Alarms are defined to invoke some client specified function at 
-** a time in the future. The notification may be a one time event
-** or repeated at a fixed interval. The interval at which the next
-** notification takes place may be modified by the client code only
-** during the respective notification.
-**
-** The notification is delivered on a thread that is part of the
-** alarm context (PRAlarm). The thread will inherit the priority
-** of the Alarm creator.
-**
-** Any number of periodic alarms (PRAlarmID) may be created within
-** the context of a single alarm (PRAlarm). The notifications will be
-** scheduled as close to the desired time as possible.
-**
-** Repeating periodic notifies are expected to run at a fixed rate.
-** That rate is expressed as some number of notifies per period where
-** the period is much larger than a PRIntervalTime (see prinrval.h).
-*/
-
-#if !defined(pralarm_h)
-#define pralarm_h
-
-#include "prtypes.h"
-#include "prinrval.h"
-
-
-PR_BEGIN_EXTERN_C
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-typedef struct PRAlarm PRAlarm;
-typedef struct PRAlarmID PRAlarmID;
-
-typedef PRBool (PR_CALLBACK *PRPeriodicAlarmFn)(
-    PRAlarmID *id, void *clientData, PRUint32 late);
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/***********************************************************************
-** FUNCTION:    PR_CreateAlarm
-** DESCRIPTION:
-**  Create an alarm context.
-** INPUTS:      void
-** OUTPUTS:     None
-** RETURN:      PRAlarm*
-**  
-** SIDE EFFECTS:
-**  This creates an alarm context, which is an object used for subsequent
-**  notification creations. It also creates a thread that will be used to
-** deliver the notifications that are expected to be defined. The client
-** is resposible for destroying the context when appropriate.
-** RESTRICTIONS:
-**  None. 
-** MEMORY:      The object (PRAlarm) and a thread to support notifications.
-** ALGORITHM:   N/A
-***********************************************************************/
-NSPR_API(PRAlarm*) PR_CreateAlarm(void);
-
-/***********************************************************************
-** FUNCTION:    PR_DestroyAlarm
-** DESCRIPTION:
-**  Destroys the context created by PR_CreateAlarm().
-** INPUTS:      PRAlarm*
-** OUTPUTS:     None
-** RETURN:      PRStatus
-**  
-** SIDE EFFECTS:
-**  This destroys the context that was created by PR_CreateAlarm().
-**  If there are any active alarms (PRAlarmID), they will be cancelled.
-**  Once that is done, the thread that was used to deliver the alarms
-**  will be joined. 
-** RESTRICTIONS:
-**  None. 
-** MEMORY:      N/A
-** ALGORITHM:   N/A
-***********************************************************************/
-NSPR_API(PRStatus) PR_DestroyAlarm(PRAlarm *alarm);
-
-/***********************************************************************
-** FUNCTION:    PR_SetAlarm
-** DESCRIPTION:
-**  Creates a periodic notifier that is to be delivered to a specified
-**  function at some fixed interval.
-** INPUTS:      PRAlarm *alarm              Parent alarm context
-**              PRIntervalTime period       Interval over which the notifies
-**                                          are delivered.
-**              PRUint32 rate               The rate within the interval that
-**                                          the notifies will be delivered.
-**              PRPeriodicAlarmFn function  Entry point where the notifies
-**                                          will be delivered.
-** OUTPUTS:     None
-** RETURN:      PRAlarmID*                  Handle to the notifier just created
-**                                          or NULL if the request failed.
-**  
-** SIDE EFFECTS:
-**  A periodic notifier is created. The notifications will be delivered
-**  by the alarm's internal thread at a fixed interval whose rate is the
-**  number of interrupts per interval specified. The first notification
-**  will be delivered as soon as possible, and they will continue until
-**  the notifier routine indicates that they should cease of the alarm
-**  context is destroyed (PR_DestroyAlarm).
-** RESTRICTIONS:
-**  None. 
-** MEMORY:      Memory for the notifier object.
-** ALGORITHM:   The rate at which notifications are delivered are stated
-**              to be "'rate' notifies per 'interval'". The exact time of
-**              the notification is computed based on a epoch established
-**              when the notifier was set. Each notification is delivered
-**              not ealier than the epoch plus the fixed rate times the
-**              notification sequence number. Such notifications have the
-**              potential to be late by not more than 'interval'/'rate'.
-**              The amount of lateness of one notification is taken into
-**              account on the next in an attempt to avoid long term slew.  
-***********************************************************************/
-NSPR_API(PRAlarmID*) PR_SetAlarm(
-    PRAlarm *alarm, PRIntervalTime period, PRUint32 rate,
-    PRPeriodicAlarmFn function, void *clientData);
-
-/***********************************************************************
-** FUNCTION:    PR_ResetAlarm
-** DESCRIPTION:
-**  Resets an existing alarm.
-** INPUTS:      PRAlarmID *id               Identify of the notifier.
-**              PRIntervalTime period       Interval over which the notifies
-**                                          are delivered.
-**              PRUint32 rate               The rate within the interval that
-**                                          the notifies will be delivered.
-** OUTPUTS:     None
-** RETURN:      PRStatus                    Indication of completion.
-**  
-** SIDE EFFECTS:
-**  An existing alarm may have its period and rate redefined. The
-**  additional side effect is that the notifier's epoch is recomputed.
-**  The first notification delivered by the newly refreshed alarm is
-**  defined to be 'interval'/'rate' from the time of the reset.
-** RESTRICTIONS:
-**  This function may only be called in the notifier for that alarm.
-** MEMORY:      N/A.
-** ALGORITHM:   See PR_SetAlarm().  
-***********************************************************************/
-NSPR_API(PRStatus) PR_ResetAlarm(
-	PRAlarmID *id, PRIntervalTime period, PRUint32 rate);
-
-PR_END_EXTERN_C
-
-#endif /* !defined(pralarm_h) */
-
-/* prinrval.h */
diff --git a/openflow/usr/include/nspr/obsolete/probslet.h b/openflow/usr/include/nspr/obsolete/probslet.h
deleted file mode 100644
index 2eff0ba..0000000
--- a/openflow/usr/include/nspr/obsolete/probslet.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** A collection of things thought to be obsolete
-*/
-
-#if defined(PROBSLET_H)
-#else
-#define PROBSLET_H
-
-#include "prio.h"
-#include "private/pprio.h"  /* for PROsfd */
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Yield the current thread.  The proper function to use in place of
-** PR_Yield() is PR_Sleep() with an argument of PR_INTERVAL_NO_WAIT.
-*/
-NSPR_API(PRStatus) PR_Yield(void);
-
-/************************************************************************/
-/************* The following definitions are for select *****************/
-/************************************************************************/
-
-/*
-** The following is obsolete and will be deleted in the next release!
-** These are provided for compatibility, but are GUARANTEED to be slow.
-**
-** Override PR_MAX_SELECT_DESC if you need more space in the select set.
-*/
-#ifndef PR_MAX_SELECT_DESC
-#define PR_MAX_SELECT_DESC 1024
-#endif
-typedef struct PR_fd_set {
-    PRUint32      hsize;
-    PRFileDesc   *harray[PR_MAX_SELECT_DESC];
-    PRUint32      nsize;
-    PROsfd        narray[PR_MAX_SELECT_DESC];
-} PR_fd_set;
-
-/*
-*************************************************************************
-** FUNCTION:    PR_Select
-** DESCRIPTION:
-**
-** The call returns as soon as I/O is ready on one or more of the underlying
-** file/socket descriptors or an exceptional condition is pending. A count of the 
-** number of ready descriptors is returned unless a timeout occurs in which case 
-** zero is returned.  On return, PR_Select replaces the given descriptor sets with 
-** subsets consisting of those descriptors that are ready for the requested condition.
-** The total number of ready descriptors in all the sets is the return value.
-**
-** INPUTS:
-**   PRInt32 num             
-**       This argument is unused but is provided for select(unix) interface
-**       compatability.  All input PR_fd_set arguments are self-describing
-**       with its own maximum number of elements in the set.
-**                               
-**   PR_fd_set *readfds
-**       A set describing the io descriptors for which ready for reading
-**       condition is of interest.  
-**                               
-**   PR_fd_set *writefds
-**       A set describing the io descriptors for which ready for writing
-**       condition is of interest.  
-**                               
-**   PR_fd_set *exceptfds
-**       A set describing the io descriptors for which exception pending
-**       condition is of interest.  
-**
-**   Any of the above readfds, writefds or exceptfds may be given as NULL 
-**   pointers if no descriptors are of interest for that particular condition.                          
-**   
-**   PRIntervalTime timeout  
-**       Amount of time the call will block waiting for I/O to become ready. 
-**       If this time expires without any I/O becoming ready, the result will
-**       be zero.
-**
-** OUTPUTS:    
-**   PR_fd_set *readfds
-**       A set describing the io descriptors which are ready for reading.
-**                               
-**   PR_fd_set *writefds
-**       A set describing the io descriptors which are ready for writing.
-**                               
-**   PR_fd_set *exceptfds
-**       A set describing the io descriptors which have pending exception.
-**
-** RETURN:PRInt32
-**   Number of io descriptors with asked for conditions or zero if the function
-**   timed out or -1 on failure.  The reason for the failure is obtained by 
-**   calling PR_GetError().
-** XXX can we implement this on windoze and mac?
-**************************************************************************
-*/
-NSPR_API(PRInt32) PR_Select(
-    PRInt32 num, PR_fd_set *readfds, PR_fd_set *writefds,
-    PR_fd_set *exceptfds, PRIntervalTime timeout);
-
-/* 
-** The following are not thread safe for two threads operating on them at the
-** same time.
-**
-** The following routines are provided for manipulating io descriptor sets.
-** PR_FD_ZERO(&fdset) initializes a descriptor set fdset to the null set.
-** PR_FD_SET(fd, &fdset) includes a particular file descriptor fd in fdset.
-** PR_FD_CLR(fd, &fdset) removes a file descriptor fd from fdset.  
-** PR_FD_ISSET(fd, &fdset) is nonzero if file descriptor fd is a member of 
-** fdset, zero otherwise.
-**
-** PR_FD_NSET(osfd, &fdset) includes a particular native file descriptor osfd
-** in fdset.
-** PR_FD_NCLR(osfd, &fdset) removes a native file descriptor osfd from fdset.  
-** PR_FD_NISSET(osfd, &fdset) is nonzero if native file descriptor osfd is a member of 
-** fdset, zero otherwise.
-*/
-
-NSPR_API(void)        PR_FD_ZERO(PR_fd_set *set);
-NSPR_API(void)        PR_FD_SET(PRFileDesc *fd, PR_fd_set *set);
-NSPR_API(void)        PR_FD_CLR(PRFileDesc *fd, PR_fd_set *set);
-NSPR_API(PRInt32)     PR_FD_ISSET(PRFileDesc *fd, PR_fd_set *set);
-NSPR_API(void)        PR_FD_NSET(PROsfd osfd, PR_fd_set *set);
-NSPR_API(void)        PR_FD_NCLR(PROsfd osfd, PR_fd_set *set);
-NSPR_API(PRInt32)     PR_FD_NISSET(PROsfd osfd, PR_fd_set *set);
-
-/*
-** The next two entry points should not be in the API, but they are
-** declared here for historical reasons.
-*/
-
-NSPR_API(PRInt32) PR_GetSysfdTableMax(void);
-
-NSPR_API(PRInt32) PR_SetSysfdTableSize(PRIntn table_size);
-
-#ifndef NO_NSPR_10_SUPPORT
-#include <sys/stat.h>
-
-NSPR_API(PRInt32) PR_Stat(const char *path, struct stat *buf);
-#endif /* NO_NSPR_10_SUPPORT */
-
-PR_END_EXTERN_C
-
-#endif /* defined(PROBSLET_H) */
-
-/* probslet.h */
diff --git a/openflow/usr/include/nspr/obsolete/protypes.h b/openflow/usr/include/nspr/obsolete/protypes.h
deleted file mode 100644
index 2275bce..0000000
--- a/openflow/usr/include/nspr/obsolete/protypes.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * This header typedefs the old 'native' types to the new PR<type>s.
- * These definitions are scheduled to be eliminated at the earliest
- * possible time. The NSPR API is implemented and documented using
- * the new definitions.
- */
-
-#if !defined(PROTYPES_H)
-#define PROTYPES_H
-
-typedef PRUintn uintn;
-#ifndef _XP_Core_
-typedef PRIntn intn;
-#endif
-
-/*
- * It is trickier to define uint, int8, uint8, int16, uint16,
- * int32, uint32, int64, and uint64 because some of these int
- * types are defined by standard header files on some platforms.
- * Our strategy here is to include all such standard headers
- * first, and then define these int types only if they are not
- * defined by those standard headers.
- */
-
-/*
- * BeOS defines all the int types below in its standard header
- * file SupportDefs.h.
- */
-#ifdef XP_BEOS
-#include <support/SupportDefs.h>
-#endif
-
-/*
- * SVR4 typedef of uint is commonly found on UNIX machines.
- *
- * On AIX 4.3, sys/inttypes.h (which is included by sys/types.h)
- * defines the types int8, int16, int32, and int64.
- *
- * On OS/2, sys/types.h defines uint.
- */
-#if defined(XP_UNIX) || defined(XP_OS2)
-#include <sys/types.h>
-#endif
-
-/* model.h on HP-UX defines int8, int16, and int32. */
-#ifdef HPUX
-#include <model.h>
-#endif
-
-/*
- * uint
- */
-
-#if !defined(XP_BEOS) && !defined(XP_OS2) && !defined(XP_UNIX) || defined(NTO)
-typedef PRUintn uint;
-#endif
-
-/*
- * uint64
- */
-
-#if !defined(XP_BEOS)
-typedef PRUint64 uint64;
-#endif
-
-/*
- * uint32
- */
-
-#if !defined(XP_BEOS)
-#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
-typedef PRUint32 uint32;
-#else
-typedef unsigned long uint32;
-#endif
-#endif
-
-/*
- * uint16
- */
-
-#if !defined(XP_BEOS)
-typedef PRUint16 uint16;
-#endif
-
-/*
- * uint8
- */
-
-#if !defined(XP_BEOS)
-typedef PRUint8 uint8;
-#endif
-
-/*
- * int64
- */
-
-#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES)
-typedef PRInt64 int64;
-#endif
-
-/*
- * int32
- */
-
-#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
-    && !defined(HPUX)
-#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
-typedef PRInt32 int32;
-#else
-typedef long int32;
-#endif
-#endif
-
-/*
- * int16
- */
-
-#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
-    && !defined(HPUX)
-typedef PRInt16 int16;
-#endif
-
-/*
- * int8
- */
-
-#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
-    && !defined(HPUX)
-typedef PRInt8 int8;
-#endif
-
-typedef PRFloat64 float64;
-typedef PRUptrdiff uptrdiff_t;
-typedef PRUword uprword_t;
-typedef PRWord prword_t;
-
-
-/* Re: prbit.h */
-#define TEST_BIT	PR_TEST_BIT
-#define SET_BIT		PR_SET_BIT
-#define CLEAR_BIT	PR_CLEAR_BIT
-
-/* Re: prarena.h->plarena.h */
-#define PRArena PLArena
-#define PRArenaPool PLArenaPool
-#define PRArenaStats PLArenaStats
-#define PR_ARENA_ALIGN PL_ARENA_ALIGN
-#define PR_INIT_ARENA_POOL PL_INIT_ARENA_POOL
-#define PR_ARENA_ALLOCATE PL_ARENA_ALLOCATE
-#define PR_ARENA_GROW PL_ARENA_GROW
-#define PR_ARENA_MARK PL_ARENA_MARK
-#define PR_CLEAR_UNUSED PL_CLEAR_UNUSED
-#define PR_CLEAR_ARENA PL_CLEAR_ARENA
-#define PR_ARENA_RELEASE PL_ARENA_RELEASE
-#define PR_COUNT_ARENA PL_COUNT_ARENA
-#define PR_ARENA_DESTROY PL_ARENA_DESTROY
-#define PR_InitArenaPool PL_InitArenaPool
-#define PR_FreeArenaPool PL_FreeArenaPool
-#define PR_FinishArenaPool PL_FinishArenaPool
-#define PR_CompactArenaPool PL_CompactArenaPool
-#define PR_ArenaFinish PL_ArenaFinish
-#define PR_ArenaAllocate PL_ArenaAllocate
-#define PR_ArenaGrow PL_ArenaGrow
-#define PR_ArenaRelease PL_ArenaRelease
-#define PR_ArenaCountAllocation PL_ArenaCountAllocation
-#define PR_ArenaCountInplaceGrowth PL_ArenaCountInplaceGrowth
-#define PR_ArenaCountGrowth PL_ArenaCountGrowth
-#define PR_ArenaCountRelease PL_ArenaCountRelease
-#define PR_ArenaCountRetract PL_ArenaCountRetract
-
-/* Re: prhash.h->plhash.h */
-#define PRHashEntry PLHashEntry
-#define PRHashTable PLHashTable
-#define PRHashNumber PLHashNumber
-#define PRHashFunction PLHashFunction
-#define PRHashComparator PLHashComparator
-#define PRHashEnumerator PLHashEnumerator
-#define PRHashAllocOps PLHashAllocOps
-#define PR_NewHashTable PL_NewHashTable
-#define PR_HashTableDestroy PL_HashTableDestroy
-#define PR_HashTableRawLookup PL_HashTableRawLookup
-#define PR_HashTableRawAdd PL_HashTableRawAdd
-#define PR_HashTableRawRemove PL_HashTableRawRemove
-#define PR_HashTableAdd PL_HashTableAdd
-#define PR_HashTableRemove PL_HashTableRemove
-#define PR_HashTableEnumerateEntries PL_HashTableEnumerateEntries
-#define PR_HashTableLookup PL_HashTableLookup
-#define PR_HashTableDump PL_HashTableDump
-#define PR_HashString PL_HashString
-#define PR_CompareStrings PL_CompareStrings
-#define PR_CompareValues PL_CompareValues
-
-#endif /* !defined(PROTYPES_H) */
diff --git a/openflow/usr/include/nspr/obsolete/prsem.h b/openflow/usr/include/nspr/obsolete/prsem.h
deleted file mode 100644
index ee313cb..0000000
--- a/openflow/usr/include/nspr/obsolete/prsem.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prsem_h___
-#define prsem_h___
-
-/*
-** API for counting semaphores. Semaphores are counting synchronizing 
-** variables based on a lock and a condition variable.  They are lightweight 
-** contention control for a given count of resources.
-*/
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRSemaphore PRSemaphore;
-
-/*
-** Create a new semaphore object.
-*/
-NSPR_API(PRSemaphore*) PR_NewSem(PRUintn value);
-
-/*
-** Destroy the given semaphore object.
-**
-*/
-NSPR_API(void) PR_DestroySem(PRSemaphore *sem);
-
-/*
-** Wait on a Semaphore.
-** 
-** This routine allows a calling thread to wait or proceed depending upon the 
-** state of the semahore sem. The thread can proceed only if the counter value 
-** of the semaphore sem is currently greater than 0. If the value of semaphore 
-** sem is positive, it is decremented by one and the routine returns immediately 
-** allowing the calling thread to continue. If the value of semaphore sem is 0, 
-** the calling thread blocks awaiting the semaphore to be released by another 
-** thread.
-** 
-** This routine can return PR_PENDING_INTERRUPT if the waiting thread 
-** has been interrupted.
-*/
-NSPR_API(PRStatus) PR_WaitSem(PRSemaphore *sem);
-
-/*
-** This routine increments the counter value of the semaphore. If other threads 
-** are blocked for the semaphore, then the scheduler will determine which ONE 
-** thread will be unblocked.
-*/
-NSPR_API(void) PR_PostSem(PRSemaphore *sem);
-
-/*
-** Returns the value of the semaphore referenced by sem without affecting
-** the state of the semaphore.  The value represents the semaphore vaule
-F** at the time of the call, but may not be the actual value when the
-** caller inspects it.
-*/
-NSPR_API(PRUintn) PR_GetValueSem(PRSemaphore *sem);
-
-PR_END_EXTERN_C
-
-#endif /* prsem_h___ */
diff --git a/openflow/usr/include/nspr/plarena.h b/openflow/usr/include/nspr/plarena.h
deleted file mode 100644
index 5336a0e..0000000
--- a/openflow/usr/include/nspr/plarena.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef plarena_h___
-#define plarena_h___
-/*
- * Lifetime-based fast allocation, inspired by much prior art, including
- * "Fast Allocation and Deallocation of Memory Based on Object Lifetimes"
- * David R. Hanson, Software -- Practice and Experience, Vol. 20(1).
- *
- * Also supports LIFO allocation (PL_ARENA_MARK/PL_ARENA_RELEASE).
- */
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PLArena          PLArena;
-
-struct PLArena {
-    PLArena     *next;          /* next arena for this lifetime */
-    PRUword     base;           /* aligned base address, follows this header */
-    PRUword     limit;          /* one beyond last byte in arena */
-    PRUword     avail;          /* points to next available byte */
-};
-
-#ifdef PL_ARENAMETER
-typedef struct PLArenaStats PLArenaStats;
-
-struct PLArenaStats {
-    PLArenaStats  *next;        /* next in arenaStats list */
-    char          *name;        /* name for debugging */
-    PRUint32      narenas;      /* number of arenas in pool */
-    PRUint32      nallocs;      /* number of PL_ARENA_ALLOCATE() calls */
-    PRUint32      nreclaims;    /* number of reclaims from freeArenas */
-    PRUint32      nmallocs;     /* number of malloc() calls */
-    PRUint32      ndeallocs;    /* number of lifetime deallocations */
-    PRUint32      ngrows;       /* number of PL_ARENA_GROW() calls */
-    PRUint32      ninplace;     /* number of in-place growths */
-    PRUint32      nreleases;    /* number of PL_ARENA_RELEASE() calls */
-    PRUint32      nfastrels;    /* number of "fast path" releases */
-    PRUint32      nbytes;       /* total bytes allocated */
-    PRUint32      maxalloc;     /* maximum allocation size in bytes */
-    PRFloat64     variance;     /* size variance accumulator */
-};
-#endif
-
-typedef struct PLArenaPool      PLArenaPool;
-
-struct PLArenaPool {
-    PLArena     first;          /* first arena in pool list */
-    PLArena     *current;       /* arena from which to allocate space */
-    PRUint32    arenasize;      /* net exact size of a new arena */
-    PRUword     mask;           /* alignment mask (power-of-2 - 1) */
-#ifdef PL_ARENAMETER
-    PLArenaStats stats;
-#endif
-};
-
-/*
- * WARNING: The PL_MAKE_MEM_ macros are for internal use by NSPR. Do NOT use
- * them in your code.
- *
- * NOTE: Valgrind support to be added.
- *
- * The PL_MAKE_MEM_ macros are modeled after the MOZ_MAKE_MEM_ macros in
- * Mozilla's mfbt/MemoryChecking.h. Only AddressSanitizer is supported now.
- *
- * Provides a common interface to the ASan (AddressSanitizer) and Valgrind
- * functions used to mark memory in certain ways. In detail, the following
- * three macros are provided:
- *
- *   PL_MAKE_MEM_NOACCESS  - Mark memory as unsafe to access (e.g. freed)
- *   PL_MAKE_MEM_UNDEFINED - Mark memory as accessible, with content undefined
- *   PL_MAKE_MEM_DEFINED - Mark memory as accessible, with content defined
- *
- * With Valgrind in use, these directly map to the three respective Valgrind
- * macros. With ASan in use, the NOACCESS macro maps to poisoning the memory,
- * while the UNDEFINED/DEFINED macros unpoison memory.
- *
- * With no memory checker available, all macros expand to the empty statement.
- */
-
-/* WARNING: PL_SANITIZE_ADDRESS is for internal use by this header. Do NOT
- * define or test this macro in your code.
- */
-#if defined(__has_feature)
-#if __has_feature(address_sanitizer)
-#define PL_SANITIZE_ADDRESS 1
-#endif
-#elif defined(__SANITIZE_ADDRESS__)
-#define PL_SANITIZE_ADDRESS 1
-#endif
-
-#if defined(PL_SANITIZE_ADDRESS)
-
-/* These definitions are usually provided through the
- * sanitizer/asan_interface.h header installed by ASan.
- * See https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning
- */
-
-PR_IMPORT(void) __asan_poison_memory_region(void const volatile *addr, size_t size);
-PR_IMPORT(void) __asan_unpoison_memory_region(void const volatile *addr, size_t size);
-
-#define PL_MAKE_MEM_NOACCESS(addr, size) \
-    __asan_poison_memory_region((addr), (size))
-
-#define PL_MAKE_MEM_UNDEFINED(addr, size) \
-    __asan_unpoison_memory_region((addr), (size))
-
-#define PL_MAKE_MEM_DEFINED(addr, size) \
-    __asan_unpoison_memory_region((addr), (size))
-
-#else
-
-#define PL_MAKE_MEM_NOACCESS(addr, size)
-#define PL_MAKE_MEM_UNDEFINED(addr, size)
-#define PL_MAKE_MEM_DEFINED(addr, size)
-
-#endif
-
-/*
- * If the including .c file uses only one power-of-2 alignment, it may define
- * PL_ARENA_CONST_ALIGN_MASK to the alignment mask and save a few instructions
- * per ALLOCATE and GROW.
- */
-#ifdef PL_ARENA_CONST_ALIGN_MASK
-#define PL_ARENA_ALIGN(pool, n) (((PRUword)(n) + PL_ARENA_CONST_ALIGN_MASK) \
-                                & ~PL_ARENA_CONST_ALIGN_MASK)
-
-#define PL_INIT_ARENA_POOL(pool, name, size) \
-        PL_InitArenaPool(pool, name, size, PL_ARENA_CONST_ALIGN_MASK + 1)
-#else
-#define PL_ARENA_ALIGN(pool, n) (((PRUword)(n) + (pool)->mask) & ~(pool)->mask)
-#endif
-
-#define PL_ARENA_ALLOCATE(p, pool, nb) \
-    PR_BEGIN_MACRO \
-        PLArena *_a = (pool)->current; \
-        PRUint32 _nb = PL_ARENA_ALIGN(pool, (PRUint32)nb); \
-        PRUword _p = _a->avail; \
-        if (_nb < (PRUint32)nb) { \
-            _p = 0; \
-        } else if (_nb > (_a->limit - _a->avail)) { \
-            _p = (PRUword)PL_ArenaAllocate(pool, _nb); \
-        } else { \
-            _a->avail += _nb; \
-        } \
-        p = (void *)_p; \
-        if (p) { \
-            PL_MAKE_MEM_UNDEFINED(p, (PRUint32)nb); \
-            PL_ArenaCountAllocation(pool, (PRUint32)nb); \
-        } \
-    PR_END_MACRO
-
-#define PL_ARENA_GROW(p, pool, size, incr) \
-    PR_BEGIN_MACRO \
-        PLArena *_a = (pool)->current; \
-        PRUint32 _incr = PL_ARENA_ALIGN(pool, (PRUint32)incr); \
-        if (_incr < (PRUint32)incr) { \
-            p = NULL; \
-        } else if (_a->avail == (PRUword)(p) + PL_ARENA_ALIGN(pool, size) && \
-            _incr <= (_a->limit - _a->avail)) { \
-            PL_MAKE_MEM_UNDEFINED((unsigned char *)(p) + size, (PRUint32)incr); \
-            _a->avail += _incr; \
-            PL_ArenaCountInplaceGrowth(pool, size, (PRUint32)incr); \
-        } else { \
-            p = PL_ArenaGrow(pool, p, size, (PRUint32)incr); \
-        } \
-        if (p) {\
-            PL_ArenaCountGrowth(pool, size, (PRUint32)incr); \
-        } \
-    PR_END_MACRO
-
-#define PL_ARENA_MARK(pool) ((void *) (pool)->current->avail)
-#define PR_UPTRDIFF(p,q) ((PRUword)(p) - (PRUword)(q))
-
-#define PL_CLEAR_UNUSED_PATTERN(a, pattern) \
-    PR_BEGIN_MACRO \
-        PR_ASSERT((a)->avail <= (a)->limit); \
-        PL_MAKE_MEM_UNDEFINED((void*)(a)->avail, (a)->limit - (a)->avail); \
-        memset((void*)(a)->avail, (pattern), (a)->limit - (a)->avail); \
-    PR_END_MACRO
-#ifdef DEBUG
-#define PL_FREE_PATTERN 0xDA
-#define PL_CLEAR_UNUSED(a) PL_CLEAR_UNUSED_PATTERN((a), PL_FREE_PATTERN)
-#define PL_CLEAR_ARENA(a) \
-    PR_BEGIN_MACRO \
-        PL_MAKE_MEM_UNDEFINED((void*)(a), (a)->limit - (PRUword)(a)); \
-        memset((void*)(a), PL_FREE_PATTERN, (a)->limit - (PRUword)(a)); \
-    PR_END_MACRO
-#else
-#define PL_CLEAR_UNUSED(a)
-#define PL_CLEAR_ARENA(a)
-#endif
-
-#define PL_ARENA_RELEASE(pool, mark) \
-    PR_BEGIN_MACRO \
-        char *_m = (char *)(mark); \
-        PLArena *_a = (pool)->current; \
-        if (PR_UPTRDIFF(_m, _a->base) <= PR_UPTRDIFF(_a->avail, _a->base)) { \
-            _a->avail = (PRUword)PL_ARENA_ALIGN(pool, _m); \
-            PL_CLEAR_UNUSED(_a); \
-            PL_MAKE_MEM_NOACCESS((void*)_a->avail, _a->limit - _a->avail); \
-            PL_ArenaCountRetract(pool, _m); \
-        } else { \
-            PL_ArenaRelease(pool, _m); \
-        } \
-        PL_ArenaCountRelease(pool, _m); \
-    PR_END_MACRO
-
-#ifdef PL_ARENAMETER
-#define PL_COUNT_ARENA(pool,op) ((pool)->stats.narenas op)
-#else
-#define PL_COUNT_ARENA(pool,op)
-#endif
-
-#define PL_ARENA_DESTROY(pool, a, pnext) \
-    PR_BEGIN_MACRO \
-        PL_COUNT_ARENA(pool,--); \
-        if ((pool)->current == (a)) (pool)->current = &(pool)->first; \
-        *(pnext) = (a)->next; \
-        PL_CLEAR_ARENA(a); \
-        free(a); \
-        (a) = 0; \
-    PR_END_MACRO
-
-/*
-** Initialize an arena pool with the given name for debugging and metering,
-** with a minimum gross size per arena of size bytes.  The net size per arena
-** is smaller than the gross size by a header of four pointers plus any
-** necessary padding for alignment.
-**
-** Note: choose a gross size that's a power of two to avoid the heap allocator
-** rounding the size up.
-**/
-PR_EXTERN(void) PL_InitArenaPool(
-    PLArenaPool *pool, const char *name, PRUint32 size, PRUint32 align);
-
-/*
-** Finish using arenas, freeing all memory associated with them.
-** NOTE: this function is now a no-op. If you want to free a single
-** PLArenaPoolUse use PL_FreeArenaPool() or PL_FinishArenaPool().
-**/
-PR_EXTERN(void) PL_ArenaFinish(void);
-
-/*
-** Free the arenas in pool.  The user may continue to allocate from pool
-** after calling this function.  There is no need to call PL_InitArenaPool()
-** again unless PL_FinishArenaPool(pool) has been called.
-**/
-PR_EXTERN(void) PL_FreeArenaPool(PLArenaPool *pool);
-
-/*
-** Free the arenas in pool and finish using it altogether.
-**/
-PR_EXTERN(void) PL_FinishArenaPool(PLArenaPool *pool);
-
-/*
-** Compact all of the arenas in a pool so that no space is wasted.
-** NOT IMPLEMENTED.  Do not use.
-**/
-PR_EXTERN(void) PL_CompactArenaPool(PLArenaPool *pool);
-
-/*
-** Friend functions used by the PL_ARENA_*() macros.
-**
-** WARNING: do not call these functions directly. Always use the
-** PL_ARENA_*() macros.
-**/
-PR_EXTERN(void *) PL_ArenaAllocate(PLArenaPool *pool, PRUint32 nb);
-
-PR_EXTERN(void *) PL_ArenaGrow(
-    PLArenaPool *pool, void *p, PRUint32 size, PRUint32 incr);
-
-PR_EXTERN(void) PL_ArenaRelease(PLArenaPool *pool, char *mark);
-
-/*
-** memset contents of all arenas in pool to pattern
-*/
-PR_EXTERN(void) PL_ClearArenaPool(PLArenaPool *pool, PRInt32 pattern);
-
-/*
-** A function like malloc_size() or malloc_usable_size() that measures the
-** size of a heap block.
-*/
-typedef size_t (*PLMallocSizeFn)(const void *ptr);
-
-/*
-** Measure all memory used by a PLArenaPool, excluding the PLArenaPool
-** structure.
-*/
-PR_EXTERN(size_t) PL_SizeOfArenaPoolExcludingPool(
-    const PLArenaPool *pool, PLMallocSizeFn mallocSizeOf);
-
-#ifdef PL_ARENAMETER
-
-#include <stdio.h>
-
-PR_EXTERN(void) PL_ArenaCountAllocation(PLArenaPool *pool, PRUint32 nb);
-
-PR_EXTERN(void) PL_ArenaCountInplaceGrowth(
-    PLArenaPool *pool, PRUint32 size, PRUint32 incr);
-
-PR_EXTERN(void) PL_ArenaCountGrowth(
-    PLArenaPool *pool, PRUint32 size, PRUint32 incr);
-
-PR_EXTERN(void) PL_ArenaCountRelease(PLArenaPool *pool, char *mark);
-
-PR_EXTERN(void) PL_ArenaCountRetract(PLArenaPool *pool, char *mark);
-
-PR_EXTERN(void) PL_DumpArenaStats(FILE *fp);
-
-#else  /* !PL_ARENAMETER */
-
-#define PL_ArenaCountAllocation(ap, nb)                 /* nothing */
-#define PL_ArenaCountInplaceGrowth(ap, size, incr)      /* nothing */
-#define PL_ArenaCountGrowth(ap, size, incr)             /* nothing */
-#define PL_ArenaCountRelease(ap, mark)                  /* nothing */
-#define PL_ArenaCountRetract(ap, mark)                  /* nothing */
-
-#endif /* !PL_ARENAMETER */
-
-PR_END_EXTERN_C
-
-#endif /* plarena_h___ */
diff --git a/openflow/usr/include/nspr/plarenas.h b/openflow/usr/include/nspr/plarenas.h
deleted file mode 100644
index 4a0f5a8..0000000
--- a/openflow/usr/include/nspr/plarenas.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** PLArena-related declarations used to be split between plarenas.h and
-** plarena.h. That split wasn't useful, so now all the declarations are in
-** plarena.h. However, this file still exists so that any old code that
-** includes it will still work.
-**/
-#include "plarena.h"
diff --git a/openflow/usr/include/nspr/plbase64.h b/openflow/usr/include/nspr/plbase64.h
deleted file mode 100644
index 7d17ea7..0000000
--- a/openflow/usr/include/nspr/plbase64.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _plbase64_h
-#define _plbase64_h
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
- * PL_Base64Encode
- *
- * This routine encodes the data pointed to by the "src" parameter using the
- * base64 algorithm, and returns a pointer to the result.  If the "srclen"
- * parameter is not zero, it specifies the length of the source data.  If it
- * is zero, the source data is assumed to be null-terminated, and PL_strlen
- * is used to determine the source length.  If the "dest" parameter is not
- * null, it is assumed to point to a buffer of sufficient size (which may be
- * calculated: ((srclen + 2)/3)*4) into which the encoded data is placed 
- * (without any termination).  If the "dest" parameter is null, a buffer is
- * allocated from the heap to hold the encoded data, and the result *will*
- * be terminated with an extra null character.  It is the caller's 
- * responsibility to free the result when it is allocated.  A null is returned 
- * if the allocation fails.
- *
- * NOTE: when calculating ((srclen + 2)/3)*4), first ensure that
- *     srclen <= (PR_UINT32_MAX/4) * 3
- * to avoid PRUint32 overflow.
- */
-
-PR_EXTERN(char *)
-PL_Base64Encode
-(
-    const char *src,
-    PRUint32    srclen,
-    char       *dest
-);
-
-/*
- * PL_Base64Decode
- *
- * This routine decodes the data pointed to by the "src" parameter using
- * the base64 algorithm, and returns a pointer to the result.  The source
- * may either include or exclude any trailing '=' characters.  If the
- * "srclen" parameter is not zero, it specifies the length of the source
- * data.  If it is zero, PL_strlen will be used to determine the source
- * length.  If the "dest" parameter is not null, it is assumed to point to
- * a buffer of sufficient size (which may be calculated: (srclen * 3)/4
- * when srclen includes the '=' characters) into which the decoded data
- * is placed (without any termination).  If the "dest" parameter is null,
- * a buffer is allocated from the heap to hold the decoded data, and the
- * result *will* be terminated with an extra null character.  It is the
- * caller's responsibility to free the result when it is allocated.  A null
- * is retuned if the allocation fails, or if the source is not well-coded.
- *
- * NOTE: when calculating (srclen * 3)/4, first ensure that 
- *     srclen <= PR_UINT32_MAX/3
- * to avoid PRUint32 overflow.  Alternatively, calculate
- *     (srclen/4) * 3 + ((srclen%4) * 3)/4
- * which is equivalent but doesn't overflow for any value of srclen.
- */
-
-PR_EXTERN(char *)
-PL_Base64Decode
-(
-    const char *src,
-    PRUint32    srclen,
-    char       *dest
-);
-
-PR_END_EXTERN_C
-
-#endif /* _plbase64_h */
diff --git a/openflow/usr/include/nspr/plerror.h b/openflow/usr/include/nspr/plerror.h
deleted file mode 100644
index cd85dd3..0000000
--- a/openflow/usr/include/nspr/plerror.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File:        plerror.h
-** Description: Simple routine to print translate the calling thread's
-**              error numbers and print them.
-*/
-
-#if defined(PLERROR_H)
-#else
-#define PLERROR_H
-
-#include "prio.h"
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-/*
-** Print the messages to "syserr" prepending 'msg' if not NULL.
-*/
-PR_EXTERN(void) PL_PrintError(const char *msg);
-
-/*
-** Print the messages to specified output file prepending 'msg' if not NULL.
-*/
-PR_EXTERN(void) PL_FPrintError(PRFileDesc *output, const char *msg);
-
-PR_END_EXTERN_C
-
-#endif /* defined(PLERROR_H) */
-
-/* plerror.h */
diff --git a/openflow/usr/include/nspr/plgetopt.h b/openflow/usr/include/nspr/plgetopt.h
deleted file mode 100644
index 19cafa6..0000000
--- a/openflow/usr/include/nspr/plgetopt.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File:          plgetopt.h
-** Description:   utilities to parse argc/argv
-*/
-
-#if defined(PLGETOPT_H_)
-#else
-#define PLGETOPT_H_
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PLOptionInternal PLOptionInternal; 
-
-typedef enum
-{
-        PL_OPT_OK,              /* all's well with the option */
-        PL_OPT_EOL,             /* end of options list */
-        PL_OPT_BAD              /* invalid option (and value) */
-} PLOptStatus;
-
-typedef struct PLLongOpt
-{
-    const char * longOptName;   /* long option name string                  */
-    PRIntn       longOption;    /* value put in PLOptState for this option. */
-    PRBool       valueRequired; /* If option name not followed by '=',      */
-                                /* value is the next argument from argv.    */
-} PLLongOpt;
-
-typedef struct PLOptState
-{
-    char option;                /* the name of the option */
-    const char *value;          /* the value of that option | NULL */
-
-    PLOptionInternal *internal; /* private processing state */
-
-    PRIntn   longOption;        /* value from PLLongOpt put here */
-    PRIntn   longOptIndex;      /* index into caller's array of PLLongOpts */
-} PLOptState;
-
-/*
- * PL_CreateOptState
- *
- * The argument "options" points to a string of single-character option 
- * names.  Option names that may have an option argument value must be 
- * followed immediately by a ':' character.  
- */
-PR_EXTERN(PLOptState*) PL_CreateOptState(
-        PRIntn argc, char **argv, const char *options);
-
-/* 
- * PL_CreateLongOptState
- *
- * Alternative to PL_CreateOptState.  
- * Allows caller to specify BOTH a string of single-character option names, 
- * AND an array of structures describing "long" (keyword) option names.  
- * The array is terminated by a structure in which longOptName is NULL.  
- * Long option values (arguments) may always be given as "--name=value".
- * If PLLongOpt.valueRequired is not PR_FALSE, and the option name was not 
- * followed by '=' then the next argument from argv is taken as the value.  
- */
-PR_EXTERN(PLOptState*) PL_CreateLongOptState(
-        PRIntn argc, char **argv, const char *options, 
-        const PLLongOpt *longOpts);
-/*
- * PL_DestroyOptState
- *
- * Call this to destroy the PLOptState returned from PL_CreateOptState or
- * PL_CreateLongOptState.
- */
-PR_EXTERN(void) PL_DestroyOptState(PLOptState *opt);
-
-/*
- * PL_GetNextOpt
- *
- * When this function returns PL_OPT_OK, 
- * - opt->option will hold the single-character option name that was parsed, 
- *   or zero.  
- * When opt->option is zero, the token parsed was either a "long" (keyword) 
- *   option or a positional parameter.  
- * For a positional parameter, 
- * - opt->longOptIndex will contain -1, and
- * - opt->value will point to the positional parameter string.
- * For a long option name, 
- * - opt->longOptIndex will contain the non-negative index of the 
- *   PLLongOpt structure in the caller's array of PLLongOpt structures 
- *   corresponding to the long option name, and 
- * For a single-character or long option, 
- * - opt->longOption will contain the value of the single-character option
- *   name, or the value of the longOption from the PLLongOpt structure
- *   for that long option.  See notes below.
- * - opt->value will point to the argument option string, or will
- *   be NULL if option does not require argument.  If option requires
- *   argument but it is not provided, PL_OPT_BAD is returned.
- * When opt->option is non-zero, 
- * - opt->longOptIndex will be -1
- * When this function returns PL_OPT_EOL, or PL_OPT_BAD, the contents of
- *   opt are undefined.
- *
- * Notes: It is possible to ignore opt->option, and always look at 
- *   opt->longOption instead.  opt->longOption will contain the same value
- *   as opt->option for single-character option names, and will contain the
- *   value of longOption from the PLLongOpt structure for long option names.
- * This means that it is possible to equivalence long option names to 
- *   single character names by giving the longOption in the PLLongOpt struct
- *   the same value as the single-character option name.  
- * For long options that are NOT intended to be equivalent to any single-
- *   character option, the longOption value should be chosen to not match 
- *   any possible single character name.  It might be advisable to choose
- *   longOption values greater than 0xff for such long options.
- */
-PR_EXTERN(PLOptStatus) PL_GetNextOpt(PLOptState *opt);
-
-PR_END_EXTERN_C
-
-#endif /* defined(PLGETOPT_H_) */
-
-/* plgetopt.h */
-
diff --git a/openflow/usr/include/nspr/plhash.h b/openflow/usr/include/nspr/plhash.h
deleted file mode 100644
index 2c221ae..0000000
--- a/openflow/usr/include/nspr/plhash.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef plhash_h___
-#define plhash_h___
-/*
- * API to portable hash table code.
- */
-#include <stdio.h>
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PLHashEntry  PLHashEntry;
-typedef struct PLHashTable  PLHashTable;
-typedef PRUint32 PLHashNumber;
-#define PL_HASH_BITS 32  /* Number of bits in PLHashNumber */
-typedef PLHashNumber (PR_CALLBACK *PLHashFunction)(const void *key);
-typedef PRIntn (PR_CALLBACK *PLHashComparator)(const void *v1, const void *v2);
-
-typedef PRIntn (PR_CALLBACK *PLHashEnumerator)(PLHashEntry *he, PRIntn i, void *arg);
-
-/* Flag bits in PLHashEnumerator's return value */
-#define HT_ENUMERATE_NEXT       0       /* continue enumerating entries */
-#define HT_ENUMERATE_STOP       1       /* stop enumerating entries */
-#define HT_ENUMERATE_REMOVE     2       /* remove and free the current entry */
-#define HT_ENUMERATE_UNHASH     4       /* just unhash the current entry */
-
-typedef struct PLHashAllocOps {
-    void *              (PR_CALLBACK *allocTable)(void *pool, PRSize size);
-    void                (PR_CALLBACK *freeTable)(void *pool, void *item);
-    PLHashEntry *       (PR_CALLBACK *allocEntry)(void *pool, const void *key);
-    void                (PR_CALLBACK *freeEntry)(void *pool, PLHashEntry *he, PRUintn flag);
-} PLHashAllocOps;
-
-#define HT_FREE_VALUE   0               /* just free the entry's value */
-#define HT_FREE_ENTRY   1               /* free value and entire entry */
-
-struct PLHashEntry {
-    PLHashEntry         *next;          /* hash chain linkage */
-    PLHashNumber        keyHash;        /* key hash function result */
-    const void          *key;           /* ptr to opaque key */
-    void                *value;         /* ptr to opaque value */
-};
-
-struct PLHashTable {
-    PLHashEntry         **buckets;      /* vector of hash buckets */
-    PRUint32              nentries;       /* number of entries in table */
-    PRUint32              shift;          /* multiplicative hash shift */
-    PLHashFunction      keyHash;        /* key hash function */
-    PLHashComparator    keyCompare;     /* key comparison function */
-    PLHashComparator    valueCompare;   /* value comparison function */
-    const PLHashAllocOps *allocOps;     /* allocation operations */
-    void                *allocPriv;     /* allocation private data */
-#ifdef HASHMETER
-    PRUint32              nlookups;       /* total number of lookups */
-    PRUint32              nsteps;         /* number of hash chains traversed */
-    PRUint32              ngrows;         /* number of table expansions */
-    PRUint32              nshrinks;       /* number of table contractions */
-#endif
-};
-
-/*
- * Create a new hash table.
- * If allocOps is null, use default allocator ops built on top of malloc().
- */
-PR_EXTERN(PLHashTable *)
-PL_NewHashTable(PRUint32 numBuckets, PLHashFunction keyHash,
-                PLHashComparator keyCompare, PLHashComparator valueCompare,
-                const PLHashAllocOps *allocOps, void *allocPriv);
-
-PR_EXTERN(void)
-PL_HashTableDestroy(PLHashTable *ht);
-
-/* Higher level access methods */
-PR_EXTERN(PLHashEntry *)
-PL_HashTableAdd(PLHashTable *ht, const void *key, void *value);
-
-PR_EXTERN(PRBool)
-PL_HashTableRemove(PLHashTable *ht, const void *key);
-
-PR_EXTERN(void *)
-PL_HashTableLookup(PLHashTable *ht, const void *key);
-
-PR_EXTERN(void *)
-PL_HashTableLookupConst(PLHashTable *ht, const void *key);
-
-PR_EXTERN(PRIntn)
-PL_HashTableEnumerateEntries(PLHashTable *ht, PLHashEnumerator f, void *arg);
-
-/* General-purpose C string hash function. */
-PR_EXTERN(PLHashNumber)
-PL_HashString(const void *key);
-
-/* Compare strings using strcmp(), return true if equal. */
-PR_EXTERN(PRIntn)
-PL_CompareStrings(const void *v1, const void *v2);
-
-/* Stub function just returns v1 == v2 */
-PR_EXTERN(PRIntn)
-PL_CompareValues(const void *v1, const void *v2);
-
-/* Low level access methods */
-PR_EXTERN(PLHashEntry **)
-PL_HashTableRawLookup(PLHashTable *ht, PLHashNumber keyHash, const void *key);
-
-PR_EXTERN(PLHashEntry **)
-PL_HashTableRawLookupConst(PLHashTable *ht, PLHashNumber keyHash,
-                           const void *key);
-
-PR_EXTERN(PLHashEntry *)
-PL_HashTableRawAdd(PLHashTable *ht, PLHashEntry **hep, PLHashNumber keyHash,
-                   const void *key, void *value);
-
-PR_EXTERN(void)
-PL_HashTableRawRemove(PLHashTable *ht, PLHashEntry **hep, PLHashEntry *he);
-
-/* This can be trivially implemented using PL_HashTableEnumerateEntries. */
-PR_EXTERN(PRIntn)
-PL_HashTableDump(PLHashTable *ht, PLHashEnumerator dump, FILE *fp);
-
-PR_END_EXTERN_C
-
-#endif /* plhash_h___ */
diff --git a/openflow/usr/include/nspr/plstr.h b/openflow/usr/include/nspr/plstr.h
deleted file mode 100644
index 57814c7..0000000
--- a/openflow/usr/include/nspr/plstr.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _plstr_h
-#define _plstr_h
-
-/*
- * plstr.h
- *
- * This header file exports the API to the NSPR portable library or string-
- * handling functions.  
- * 
- * This API was not designed as an "optimal" or "ideal" string library; it 
- * was based on the good ol' unix string.3 functions, and was written to
- *
- *  1) replace the libc functions, for cross-platform consistency, 
- *  2) complete the API on platforms lacking common functions (e.g., 
- *     strcase*), and
- *  3) to implement some obvious "closure" functions that I've seen
- *     people hacking around in our code.
- *
- * Point number three largely means that most functions have an "strn"
- * limited-length version, and all comparison routines have a non-case-
- * sensitive version available.
- */
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-/*
- * PL_strlen
- *
- * Returns the length of the provided string, not including the trailing '\0'.
- */
-
-PR_EXTERN(PRUint32)
-PL_strlen(const char *str);
-
-/*
- * PL_strnlen
- *
- * Returns the length of the provided string, not including the trailing '\0',
- * up to the indicated maximum.  The string will not be examined beyond the
- * maximum; if no terminating '\0' is found, the maximum will be returned.
- */
-
-PR_EXTERN(PRUint32)
-PL_strnlen(const char *str, PRUint32 max);
-
-/*
- * PL_strcpy
- *
- * Copies the source string, up to and including the trailing '\0', into the
- * destination buffer.  It does not (can not) verify that the destination
- * buffer is large enough.  It returns the "dest" argument.
- */
-
-PR_EXTERN(char *)
-PL_strcpy(char *dest, const char *src);
-
-/*
- * PL_strncpy
- *
- * Copies the source string into the destination buffer, up to and including
- * the trailing '\0' or up to and including the max'th character, whichever
- * comes first.  It does not (can not) verify that the destination buffer is
- * large enough.  If the source string is longer than the maximum length,
- * the result will *not* be null-terminated (JLRU).
- */
-
-PR_EXTERN(char *)
-PL_strncpy(char *dest, const char *src, PRUint32 max);
-
-/*
- * PL_strncpyz
- *
- * Copies the source string into the destination buffer, up to and including 
- * the trailing '\0' or up but not including the max'th character, whichever 
- * comes first.  It does not (can not) verify that the destination buffer is
- * large enough.  The destination string is always terminated with a '\0',
- * unlike the traditional libc implementation.  It returns the "dest" argument.
- *
- * NOTE: If you call this with a source "abcdefg" and a max of 5, the 
- * destination will end up with "abcd\0" (i.e., its strlen length will be 4)!
- *
- * This means you can do this:
- *
- *     char buffer[ SOME_SIZE ];
- *     PL_strncpyz(buffer, src, sizeof(buffer));
- *
- * and the result will be properly terminated.
- */
-
-PR_EXTERN(char *)
-PL_strncpyz(char *dest, const char *src, PRUint32 max);
-
-/*
- * PL_strdup
- *
- * Returns a pointer to a malloc'd extent of memory containing a duplicate
- * of the argument string.  The size of the allocated extent is one greater
- * than the length of the argument string, because of the terminator.  A
- * null argument, like a zero-length argument, will result in a pointer to
- * a one-byte extent containing the null value.  This routine returns null
- * upon malloc failure.
- */
-
-PR_EXTERN(char *)
-PL_strdup(const char *s);
-
-/*
- * PL_strfree
- *
- * Free memory allocated by PL_strdup
- */
-
-PR_EXTERN(void)
-PL_strfree(char *s);
-
-/*
- * PL_strndup
- *
- * Returns a pointer to a malloc'd extent of memory containing a duplicate
- * of the argument string, up to the maximum specified.  If the argument
- * string has a length greater than the value of the specified maximum, the
- * return value will be a pointer to an extent of memory of length one
- * greater than the maximum specified.  A null string, a zero-length string,
- * or a zero maximum will all result in a pointer to a one-byte extent
- * containing the null value.  This routine returns null upon malloc failure.
- */
-
-PR_EXTERN(char *)
-PL_strndup(const char *s, PRUint32 max);
-
-/*
- * PL_strcat
- *
- * Appends a copy of the string pointed to by the second argument to the
- * end of the string pointed to by the first.  The destination buffer is
- * not (can not be) checked for sufficient size.  A null destination
- * argument returns null; otherwise, the first argument is returned.
- */
-
-PR_EXTERN(char *)
-PL_strcat(char *dst, const char *src);
-
-/*
- * PL_strncat
- *
- * Appends a copy of the string pointed to by the second argument, up to
- * the maximum size specified, to the end of the string pointed to by the
- * first.  The destination buffer is not (can not be) checked for sufficient
- * size.  A null destination argument returns null; otherwise, the first 
- * argument is returned.  If the maximum size limits the copy, then the
- * result will *not* be null-terminated (JLRU).  A null destination
- * returns null; otherwise, the destination argument is returned.
- */
-
-PR_EXTERN(char *)
-PL_strncat(char *dst, const char *src, PRUint32 max);
-
-/*
- * PL_strcatn
- *
- * Appends a copy of the string pointed to by the third argument, to the
- * end of the string pointed to by the first.  The second argument specifies
- * the maximum size of the destination buffer, including the null termination.
- * If the existing string in dst is longer than the max, no action is taken.
- * The resulting string will be null-terminated.  A null destination returns
- * null; otherwise, the destination argument is returned.
- */
-
-PR_EXTERN(char *)
-PL_strcatn(char *dst, PRUint32 max, const char *src);
-
-/*
- * PL_strcmp
- *
- * Returns an integer, the sign of which -- positive, zero, or negative --
- * reflects the lexical sorting order of the two strings indicated.  The
- * result is positive if the first string comes after the second.  The
- * NSPR implementation is not i18n.
- */
-
-PR_EXTERN(PRIntn)
-PL_strcmp(const char *a, const char *b);
-
-/*
- * PL_strncmp
- * 
- * Returns an integer, the sign of which -- positive, zero, or negative --
- * reflects the lexical sorting order of the two strings indicated, up to
- * the maximum specified.  The result is positive if the first string comes 
- * after the second.  The NSPR implementation is not i18n.  If the maximum
- * is zero, only the existance or non-existance (pointer is null) of the
- * strings is compared.
- */
-
-PR_EXTERN(PRIntn)
-PL_strncmp(const char *a, const char *b, PRUint32 max);
-
-/*
- * PL_strcasecmp
- *
- * Returns an integer, the sign of which -- positive, zero or negative --
- * reflects the case-insensitive lexical sorting order of the two strings
- * indicated.  The result is positive if the first string comes after the 
- * second.  The NSPR implementation is not i18n.
- */
-
-PR_EXTERN(PRIntn)
-PL_strcasecmp(const char *a, const char *b);
-
-/*
- * PL_strncasecmp
- *
- * Returns an integer, the sign of which -- positive, zero or negative --
- * reflects the case-insensitive lexical sorting order of the first n characters
- * of the two strings indicated.  The result is positive if the first string comes 
- * after the second.  The NSPR implementation is not i18n.
- */
-
-PR_EXTERN(PRIntn)
-PL_strncasecmp(const char *a, const char *b, PRUint32 max);
-
-/*
- * PL_strchr
- *
- * Returns a pointer to the first instance of the specified character in the
- * provided string.  It returns null if the character is not found, or if the
- * provided string is null.  The character may be the null character.
- */
-
-PR_EXTERN(char *)
-PL_strchr(const char *s, char c);
-
-/*
- * PL_strrchr
- *
- * Returns a pointer to the last instance of the specified character in the
- * provided string.  It returns null if the character is not found, or if the
- * provided string is null.  The character may be the null character.
- */
-
-PR_EXTERN(char *)
-PL_strrchr(const char *s, char c);
-
-/*
- * PL_strnchr
- * 
- * Returns a pointer to the first instance of the specified character within the
- * first n characters of the provided string.  It returns null if the character
- * is not found, or if the provided string is null.  The character may be the
- * null character.
- */
-
-PR_EXTERN(char *)
-PL_strnchr(const char *s, char c, PRUint32 n);
-
-/*
- * PL_strnrchr
- *
- * Returns a pointer to the last instance of the specified character within the
- * first n characters of the provided string.  It returns null if the character is
- * not found, or if the provided string is null.  The character may be the null
- * character.
- */
-
-PR_EXTERN(char *)
-PL_strnrchr(const char *s, char c, PRUint32 n);
-
-/*
- * NOTE: Looking for strcasechr, strcaserchr, strncasechr, or strncaserchr?
- * Use strpbrk, strprbrk, strnpbrk or strnprbrk.
- */
-
-/*
- * PL_strpbrk
- *
- * Returns a pointer to the first instance in the first string of any character
- * (not including the terminating null character) of the second string.  It returns
- * null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strpbrk(const char *s, const char *list);
-
-/*
- * PL_strprbrk
- *
- * Returns a pointer to the last instance in the first string of any character
- * (not including the terminating null character) of the second string.  It returns
- * null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strprbrk(const char *s, const char *list);
-
-/*
- * PL_strnpbrk
- *
- * Returns a pointer to the first instance (within the first n characters) of any
- * character (not including the terminating null character) of the second string.
- * It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strnpbrk(const char *s, const char *list, PRUint32 n);
-
-/*
- * PL_strnprbrk
- *
- * Returns a pointer to the last instance (within the first n characters) of any
- * character (not including the terminating null character) of the second string.
- * It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strnprbrk(const char *s, const char *list, PRUint32 n);
-
-/*
- * PL_strstr
- *
- * Returns a pointer to the first instance of the little string within the
- * big one.  It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strstr(const char *big, const char *little);
-
-/*
- * PL_strrstr
- *
- * Returns a pointer to the last instance of the little string within the big one.
- * It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strrstr(const char *big, const char *little);
-
-/*
- * PL_strnstr
- *
- * Returns a pointer to the first instance of the little string within the first
- * n characters of the big one.  It returns null if either string is null.  It
- * returns null if the length of the little string is greater than n.
- */
-
-PR_EXTERN(char *)
-PL_strnstr(const char *big, const char *little, PRUint32 n);
-
-/*
- * PL_strnrstr
- *
- * Returns a pointer to the last instance of the little string within the first
- * n characters of the big one.  It returns null if either string is null.  It
- * returns null if the length of the little string is greater than n.
- */
-
-PR_EXTERN(char *)
-PL_strnrstr(const char *big, const char *little, PRUint32 max);
-
-/*
- * PL_strcasestr
- *
- * Returns a pointer to the first instance of the little string within the big one,
- * ignoring case.  It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strcasestr(const char *big, const char *little);
-
-/*
- * PL_strcaserstr
- *
- * Returns a pointer to the last instance of the little string within the big one,
- * ignoring case.  It returns null if either string is null.
- */
-
-PR_EXTERN(char *)
-PL_strcaserstr(const char *big, const char *little);
-
-/*
- * PL_strncasestr
- *
- * Returns a pointer to the first instance of the little string within the first
- * n characters of the big one, ignoring case.  It returns null if either string is 
- * null.  It returns null if the length of the little string is greater than n.
- */
-
-PR_EXTERN(char *)
-PL_strncasestr(const char *big, const char *little, PRUint32 max);
-
-/*
- * PL_strncaserstr
- *
- * Returns a pointer to the last instance of the little string within the first
- * n characters of the big one, ignoring case.  It returns null if either string is
- * null.  It returns null if the length of the little string is greater than n.
- */
-
-PR_EXTERN(char *)
-PL_strncaserstr(const char *big, const char *little, PRUint32 max);
-
-/*
- * PL_strtok_r
- *
- * Splits the string s1 into tokens, separated by one or more characters
- * from the separator string s2.  The argument lasts points to a
- * user-supplied char * pointer in which PL_strtok_r stores information
- * for it to continue scanning the same string.
- *
- * In the first call to PL_strtok_r, s1 points to a string and the value
- * of *lasts is ignored.  PL_strtok_r returns a pointer to the first
- * token, writes '\0' into the character following the first token, and
- * updates *lasts.
- *
- * In subsequent calls, s1 is null and lasts must stay unchanged from the
- * previous call.  The separator string s2 may be different from call to
- * call.  PL_strtok_r returns a pointer to the next token in s1.  When no
- * token remains in s1, PL_strtok_r returns null.
- */
-
-PR_EXTERN(char *)
-PL_strtok_r(char *s1, const char *s2, char **lasts);
-
-/*
- * Things not (yet?) included: strspn/strcspn, strsep.
- * memchr, memcmp, memcpy, memccpy, index, rindex, bcmp, bcopy, bzero.
- * Any and all i18n/l10n stuff.
- */
-
-PR_END_EXTERN_C
-
-#endif /* _plstr_h */
diff --git a/openflow/usr/include/nspr/pratom.h b/openflow/usr/include/nspr/pratom.h
deleted file mode 100644
index dff9d6c..0000000
--- a/openflow/usr/include/nspr/pratom.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* GLOBAL FUNCTIONS:
-** DESCRIPTION:
-**     PR Atomic operations
-*/
-
-#ifndef pratom_h___
-#define pratom_h___
-
-#include "prtypes.h"
-#include "prlock.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** FUNCTION: PR_AtomicIncrement
-** DESCRIPTION:
-**    Atomically increment a 32 bit value.
-** INPUTS:
-**    val:  a pointer to the value to increment
-** RETURN:
-**    the returned value is the result of the increment
-*/
-NSPR_API(PRInt32)	PR_AtomicIncrement(PRInt32 *val);
-
-/*
-** FUNCTION: PR_AtomicDecrement
-** DESCRIPTION:
-**    Atomically decrement a 32 bit value.
-** INPUTS:
-**    val:  a pointer to the value to decrement
-** RETURN:
-**    the returned value is the result of the decrement
-*/
-NSPR_API(PRInt32)	PR_AtomicDecrement(PRInt32 *val);
-
-/*
-** FUNCTION: PR_AtomicSet
-** DESCRIPTION:
-**    Atomically set a 32 bit value.
-** INPUTS:
-**    val: A pointer to a 32 bit value to be set
-**    newval: The newvalue to assign to val
-** RETURN:
-**    Returns the prior value
-*/
-NSPR_API(PRInt32) PR_AtomicSet(PRInt32 *val, PRInt32 newval);
-
-/*
-** FUNCTION: PR_AtomicAdd
-** DESCRIPTION:
-**    Atomically add a 32 bit value.
-** INPUTS:
-**    ptr:  a pointer to the value to increment
-**	  val:  value to be added
-** RETURN:
-**    the returned value is the result of the addition
-*/
-NSPR_API(PRInt32)	PR_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-
-/*
-** MACRO: PR_ATOMIC_INCREMENT
-** MACRO: PR_ATOMIC_DECREMENT
-** MACRO: PR_ATOMIC_SET
-** MACRO: PR_ATOMIC_ADD
-** DESCRIPTION:
-**    Macro versions of the atomic operations.  They may be implemented
-**    as compiler intrinsics.
-**
-** IMPORTANT NOTE TO NSPR MAINTAINERS:
-**    Implement these macros with compiler intrinsics only on platforms
-**    where the PR_AtomicXXX functions are truly atomic (i.e., where the
-**    configuration macro _PR_HAVE_ATOMIC_OPS is defined).  Otherwise,
-**    the macros and functions won't be compatible and can't be used
-**    interchangeably.
-*/
-#if defined(_WIN32) && !defined(_WIN32_WCE) && \
-    (!defined(_MSC_VER) || (_MSC_VER >= 1310))
-
-#include <intrin.h>
-
-#ifdef _MSC_VER
-#pragma intrinsic(_InterlockedIncrement)
-#pragma intrinsic(_InterlockedDecrement)
-#pragma intrinsic(_InterlockedExchange)
-#pragma intrinsic(_InterlockedExchangeAdd)
-#endif
-
-#define PR_ATOMIC_INCREMENT(val) _InterlockedIncrement((long volatile *)(val))
-#define PR_ATOMIC_DECREMENT(val) _InterlockedDecrement((long volatile *)(val))
-#define PR_ATOMIC_SET(val, newval) \
-        _InterlockedExchange((long volatile *)(val), (long)(newval))
-#define PR_ATOMIC_ADD(ptr, val) \
-        (_InterlockedExchangeAdd((long volatile *)(ptr), (long)(val)) + (val))
-
-#elif ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && \
-      ((defined(__APPLE__) && \
-           (defined(__ppc__) || defined(__i386__) || defined(__x86_64__))) || \
-       (defined(__linux__) && \
-           ((defined(__i386__) && \
-           defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \
-           defined(__ia64__) || defined(__x86_64__) || \
-           defined(__powerpc__) || \
-           (defined(__arm__) && \
-           defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \
-           defined(__aarch64__) || defined(__alpha) || \
-           (defined(__mips__) && \
-           defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)))))
-
-/*
- * Because the GCC manual warns that some processors may support
- * reduced functionality of __sync_lock_test_and_set, we test for the
- * processors that we believe support a full atomic exchange operation.
- */
-
-#define PR_ATOMIC_INCREMENT(val) __sync_add_and_fetch(val, 1)
-#define PR_ATOMIC_DECREMENT(val) __sync_sub_and_fetch(val, 1)
-#define PR_ATOMIC_SET(val, newval) __sync_lock_test_and_set(val, newval)
-#define PR_ATOMIC_ADD(ptr, val) __sync_add_and_fetch(ptr, val)
-
-#else
-
-#define PR_ATOMIC_INCREMENT(val) PR_AtomicIncrement(val)
-#define PR_ATOMIC_DECREMENT(val) PR_AtomicDecrement(val)
-#define PR_ATOMIC_SET(val, newval) PR_AtomicSet(val, newval)
-#define PR_ATOMIC_ADD(ptr, val) PR_AtomicAdd(ptr, val)
-
-#endif
-
-/*
-** LIFO linked-list (stack)
-*/
-typedef struct PRStackElemStr PRStackElem;
-
-struct PRStackElemStr {
-    PRStackElem	*prstk_elem_next;	/* next pointer MUST be at offset 0;
-									  assembly language code relies on this */
-};
-
-typedef struct PRStackStr PRStack;
-
-/*
-** FUNCTION: PR_CreateStack
-** DESCRIPTION:
-**    Create a stack, a LIFO linked list
-** INPUTS:
-**    stack_name:  a pointer to string containing the name of the stack
-** RETURN:
-**    A pointer to the created stack, if successful, else NULL.
-*/
-NSPR_API(PRStack *)	PR_CreateStack(const char *stack_name);
-
-/*
-** FUNCTION: PR_StackPush
-** DESCRIPTION:
-**    Push an element on the top of the stack
-** INPUTS:
-**    stack:		pointer to the stack
-**    stack_elem:	pointer to the stack element
-** RETURN:
-**    None
-*/
-NSPR_API(void)			PR_StackPush(PRStack *stack, PRStackElem *stack_elem);
-
-/*
-** FUNCTION: PR_StackPop
-** DESCRIPTION:
-**    Remove the element on the top of the stack
-** INPUTS:
-**    stack:		pointer to the stack
-** RETURN:
-**    A pointer to the stack element removed from the top of the stack,
-**	  if non-empty,
-**    else NULL
-*/
-NSPR_API(PRStackElem *)	PR_StackPop(PRStack *stack);
-
-/*
-** FUNCTION: PR_DestroyStack
-** DESCRIPTION:
-**    Destroy the stack
-** INPUTS:
-**    stack:		pointer to the stack
-** RETURN:
-**    PR_SUCCESS - if successfully deleted
-**	  PR_FAILURE - if the stack is not empty
-**					PR_GetError will return
-**						PR_INVALID_STATE_ERROR - stack is not empty
-*/
-NSPR_API(PRStatus)		PR_DestroyStack(PRStack *stack);
-
-PR_END_EXTERN_C
-
-#endif /* pratom_h___ */
diff --git a/openflow/usr/include/nspr/prbit.h b/openflow/usr/include/nspr/prbit.h
deleted file mode 100644
index 0434fc6..0000000
--- a/openflow/usr/include/nspr/prbit.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prbit_h___
-#define prbit_h___
-
-#include "prtypes.h"
-PR_BEGIN_EXTERN_C
-
-/*
-** Replace compare/jump/add/shift sequence with compiler built-in/intrinsic
-** functions.
-*/
-#if defined(_WIN32) && (_MSC_VER >= 1300) && \
-    (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM))
-# include <intrin.h>
-# pragma  intrinsic(_BitScanForward,_BitScanReverse)
-  __forceinline static int __prBitScanForward32(unsigned int val)
-  { 
-    unsigned long idx;
-    _BitScanForward(&idx, (unsigned long)val);
-    return( (int)idx );
-  }
-  __forceinline static int __prBitScanReverse32(unsigned int val)
-  {
-    unsigned long idx;
-    _BitScanReverse(&idx, (unsigned long)val);
-    return( (int)(31-idx) );
-  }
-# define pr_bitscan_ctz32(val)  __prBitScanForward32(val)
-# define pr_bitscan_clz32(val)  __prBitScanReverse32(val)
-# define  PR_HAVE_BUILTIN_BITSCAN32
-#elif ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) && \
-       (defined(__i386__) || defined(__x86_64__) || defined(__arm__))
-# define pr_bitscan_ctz32(val)  __builtin_ctz(val)
-# define pr_bitscan_clz32(val)  __builtin_clz(val)
-# define  PR_HAVE_BUILTIN_BITSCAN32
-#endif /* MSVC || GCC */
-
-/*
-** A prbitmap_t is a long integer that can be used for bitmaps
-*/
-typedef unsigned long prbitmap_t;
-
-#define PR_TEST_BIT(_map,_bit) \
-    ((_map)[(_bit)>>PR_BITS_PER_LONG_LOG2] & (1L << ((_bit) & (PR_BITS_PER_LONG-1))))
-#define PR_SET_BIT(_map,_bit) \
-    ((_map)[(_bit)>>PR_BITS_PER_LONG_LOG2] |= (1L << ((_bit) & (PR_BITS_PER_LONG-1))))
-#define PR_CLEAR_BIT(_map,_bit) \
-    ((_map)[(_bit)>>PR_BITS_PER_LONG_LOG2] &= ~(1L << ((_bit) & (PR_BITS_PER_LONG-1))))
-
-/*
-** Compute the log of the least power of 2 greater than or equal to n
-*/
-NSPR_API(PRIntn) PR_CeilingLog2(PRUint32 i); 
-
-/*
-** Compute the log of the greatest power of 2 less than or equal to n
-*/
-NSPR_API(PRIntn) PR_FloorLog2(PRUint32 i); 
-
-/*
-** Macro version of PR_CeilingLog2: Compute the log of the least power of
-** 2 greater than or equal to _n. The result is returned in _log2.
-*/
-#ifdef PR_HAVE_BUILTIN_BITSCAN32 
-#define PR_CEILING_LOG2(_log2,_n)      \
-  PR_BEGIN_MACRO                       \
-    PRUint32 j_ = (PRUint32)(_n);      \
-    (_log2) = (j_ <= 1 ? 0 : 32 - pr_bitscan_clz32(j_ - 1)); \
-  PR_END_MACRO
-#else
-#define PR_CEILING_LOG2(_log2,_n)   \
-  PR_BEGIN_MACRO                    \
-    PRUint32 j_ = (PRUint32)(_n); 	\
-    (_log2) = 0;                    \
-    if ((j_) & ((j_)-1))            \
-	(_log2) += 1;               \
-    if ((j_) >> 16)                 \
-	(_log2) += 16, (j_) >>= 16; \
-    if ((j_) >> 8)                  \
-	(_log2) += 8, (j_) >>= 8;   \
-    if ((j_) >> 4)                  \
-	(_log2) += 4, (j_) >>= 4;   \
-    if ((j_) >> 2)                  \
-	(_log2) += 2, (j_) >>= 2;   \
-    if ((j_) >> 1)                  \
-	(_log2) += 1;               \
-  PR_END_MACRO
-#endif /* PR_HAVE_BUILTIN_BITSCAN32 */
-
-/*
-** Macro version of PR_FloorLog2: Compute the log of the greatest power of
-** 2 less than or equal to _n. The result is returned in _log2.
-**
-** This is equivalent to finding the highest set bit in the word.
-*/
-#ifdef PR_HAVE_BUILTIN_BITSCAN32
-#define PR_FLOOR_LOG2(_log2,_n)     \
-  PR_BEGIN_MACRO                    \
-    PRUint32 j_ = (PRUint32)(_n);   \
-    (_log2) = 31 - pr_bitscan_clz32((j_) | 1); \
-  PR_END_MACRO
-#else
-#define PR_FLOOR_LOG2(_log2,_n)   \
-  PR_BEGIN_MACRO                    \
-    PRUint32 j_ = (PRUint32)(_n); 	\
-    (_log2) = 0;                    \
-    if ((j_) >> 16)                 \
-	(_log2) += 16, (j_) >>= 16; \
-    if ((j_) >> 8)                  \
-	(_log2) += 8, (j_) >>= 8;   \
-    if ((j_) >> 4)                  \
-	(_log2) += 4, (j_) >>= 4;   \
-    if ((j_) >> 2)                  \
-	(_log2) += 2, (j_) >>= 2;   \
-    if ((j_) >> 1)                  \
-	(_log2) += 1;               \
-  PR_END_MACRO
-#endif /* PR_HAVE_BUILTIN_BITSCAN32 */
-
-/*
-** Macros for rotate left and right. The argument 'a' must be an unsigned
-** 32-bit integer type such as PRUint32.
-**
-** There is no rotate operation in the C Language, so the construct
-** (a << 4) | (a >> 28) is frequently used instead. Most compilers convert
-** this to a rotate instruction, but MSVC doesn't without a little help.
-** To get MSVC to generate a rotate instruction, we have to use the _rotl
-** or _rotr intrinsic and use a pragma to make it inline.
-**
-** Note: MSVC in VS2005 will do an inline rotate instruction on the above
-** construct.
-*/
-
-#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || \
-    defined(_M_X64) || defined(_M_ARM))
-#include <stdlib.h>
-#pragma intrinsic(_rotl, _rotr)
-#define PR_ROTATE_LEFT32(a, bits) _rotl(a, bits)
-#define PR_ROTATE_RIGHT32(a, bits) _rotr(a, bits)
-#else
-#define PR_ROTATE_LEFT32(a, bits) (((a) << (bits)) | ((a) >> (32 - (bits))))
-#define PR_ROTATE_RIGHT32(a, bits) (((a) >> (bits)) | ((a) << (32 - (bits))))
-#endif
-
-PR_END_EXTERN_C
-#endif /* prbit_h___ */
diff --git a/openflow/usr/include/nspr/prclist.h b/openflow/usr/include/nspr/prclist.h
deleted file mode 100644
index 2324722..0000000
--- a/openflow/usr/include/nspr/prclist.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prclist_h___
-#define prclist_h___
-
-#include "prtypes.h"
-
-typedef struct PRCListStr PRCList;
-
-/*
-** Circular linked list
-*/
-struct PRCListStr {
-    PRCList	*next;
-    PRCList	*prev;
-};
-
-/*
-** Insert element "_e" into the list, before "_l".
-*/
-#define PR_INSERT_BEFORE(_e,_l)	 \
-    PR_BEGIN_MACRO		 \
-	(_e)->next = (_l);	 \
-	(_e)->prev = (_l)->prev; \
-	(_l)->prev->next = (_e); \
-	(_l)->prev = (_e);	 \
-    PR_END_MACRO
-
-/*
-** Insert element "_e" into the list, after "_l".
-*/
-#define PR_INSERT_AFTER(_e,_l)	 \
-    PR_BEGIN_MACRO		 \
-	(_e)->next = (_l)->next; \
-	(_e)->prev = (_l);	 \
-	(_l)->next->prev = (_e); \
-	(_l)->next = (_e);	 \
-    PR_END_MACRO
-
-/*
-** Return the element following element "_e"
-*/
-#define PR_NEXT_LINK(_e)	 \
-    	((_e)->next)
-/*
-** Return the element preceding element "_e"
-*/
-#define PR_PREV_LINK(_e)	 \
-    	((_e)->prev)
-
-/*
-** Append an element "_e" to the end of the list "_l"
-*/
-#define PR_APPEND_LINK(_e,_l) PR_INSERT_BEFORE(_e,_l)
-
-/*
-** Insert an element "_e" at the head of the list "_l"
-*/
-#define PR_INSERT_LINK(_e,_l) PR_INSERT_AFTER(_e,_l)
-
-/* Return the head/tail of the list */
-#define PR_LIST_HEAD(_l) (_l)->next
-#define PR_LIST_TAIL(_l) (_l)->prev
-
-/*
-** Remove the element "_e" from it's circular list.
-*/
-#define PR_REMOVE_LINK(_e)	       \
-    PR_BEGIN_MACRO		       \
-	(_e)->prev->next = (_e)->next; \
-	(_e)->next->prev = (_e)->prev; \
-    PR_END_MACRO
-
-/*
-** Remove the element "_e" from it's circular list. Also initializes the
-** linkage.
-*/
-#define PR_REMOVE_AND_INIT_LINK(_e)    \
-    PR_BEGIN_MACRO		       \
-	(_e)->prev->next = (_e)->next; \
-	(_e)->next->prev = (_e)->prev; \
-	(_e)->next = (_e);	       \
-	(_e)->prev = (_e);	       \
-    PR_END_MACRO
-
-/*
-** Return non-zero if the given circular list "_l" is empty, zero if the
-** circular list is not empty
-*/
-#define PR_CLIST_IS_EMPTY(_l) \
-    ((_l)->next == (_l))
-
-/*
-** Initialize a circular list
-*/
-#define PR_INIT_CLIST(_l)  \
-    PR_BEGIN_MACRO	   \
-	(_l)->next = (_l); \
-	(_l)->prev = (_l); \
-    PR_END_MACRO
-
-#define PR_INIT_STATIC_CLIST(_l) \
-    {(_l), (_l)}
-
-#endif /* prclist_h___ */
diff --git a/openflow/usr/include/nspr/prcmon.h b/openflow/usr/include/nspr/prcmon.h
deleted file mode 100644
index 6917113..0000000
--- a/openflow/usr/include/nspr/prcmon.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prcmon_h___
-#define prcmon_h___
-
-/*
-** Interface to cached monitors. Cached monitors use an address to find a
-** given PR monitor. In this way a monitor can be associated with another
-** object without preallocating a monitor for all objects.
-**
-** A hash table is used to quickly map addresses to individual monitors
-** and the system automatically grows the hash table as needed.
-**
-** Cache monitors are about 5 times slower to use than uncached monitors.
-*/
-#include "prmon.h"
-#include "prinrval.h"
-
-PR_BEGIN_EXTERN_C
-
-/**
-** Like PR_EnterMonitor except use the "address" to find a monitor in the
-** monitor cache. If successful, returns the PRMonitor now associated
-** with "address". Note that you must PR_CExitMonitor the address to
-** release the monitor cache entry (otherwise the monitor cache will fill
-** up). This call will return NULL if the monitor cache needs to be
-** expanded and the system is out of memory.
-*/
-NSPR_API(PRMonitor*) PR_CEnterMonitor(void *address);
-
-/*
-** Like PR_ExitMonitor except use the "address" to find a monitor in the
-** monitor cache.
-*/
-NSPR_API(PRStatus) PR_CExitMonitor(void *address);
-
-/*
-** Like PR_Wait except use the "address" to find a monitor in the
-** monitor cache.
-*/
-NSPR_API(PRStatus) PR_CWait(void *address, PRIntervalTime timeout);
-
-/*
-** Like PR_Notify except use the "address" to find a monitor in the
-** monitor cache.
-*/
-NSPR_API(PRStatus) PR_CNotify(void *address);
-
-/*
-** Like PR_NotifyAll except use the "address" to find a monitor in the
-** monitor cache.
-*/
-NSPR_API(PRStatus) PR_CNotifyAll(void *address);
-
-/*
-** Set a callback to be invoked each time a monitor is recycled from the cache
-** freelist, with the monitor's cache-key passed in address.
-*/
-NSPR_API(void) PR_CSetOnMonitorRecycle(void (PR_CALLBACK *callback)(void *address));
-
-PR_END_EXTERN_C
-
-#endif /* prcmon_h___ */
diff --git a/openflow/usr/include/nspr/prcountr.h b/openflow/usr/include/nspr/prcountr.h
deleted file mode 100644
index 53b6176..0000000
--- a/openflow/usr/include/nspr/prcountr.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prcountr_h___
-#define prcountr_h___
-
-/*----------------------------------------------------------------------------
-** prcountr.h -- NSPR Instrumentation counters
-**
-** The NSPR Counter Feature provides a means to "count
-** something." Counters can be dynamically defined, incremented,
-** decremented, set, and deleted under application program
-** control.
-** 																                   
-** The Counter Feature is intended to be used as instrumentation,                  
-** not as operational data. If you need a counter for operational                  
-** data, use native integral types.                                                
-** 																                   
-** Counters are 32bit unsigned intergers. On overflow, a counter                   
-** will wrap. No exception is recognized or reported.                              
-**                                                                                 
-** A counter can be dynamically created using a two level naming
-** convention. A "handle" is returned when the counter is
-** created. The counter can subsequently be addressed by its
-** handle. An API is provided to get an existing counter's handle
-** given the names with  which it was originally created. 
-** Similarly, a counter's name can be retrieved given its handle.
-** 
-** The counter naming convention is a two-level hierarchy. The
-** QName is the higher level of the hierarchy; RName is the
-** lower level. RNames can be thought of as existing within a
-** QName. The same RName can exist within multiple QNames. QNames
-** are unique. The NSPR Counter is not a near-zero overhead
-** feature. Application designers should be aware of 
-** serialization issues when using the Counter API. Creating a
-** counter locks a large asset, potentially causing a stall. This
-** suggest that applications should create counters at component
-** initialization, for example, and not create and destroy them
-** willy-nilly. ... You have been warned.
-** 
-** Incrementing and Adding to counters uses atomic operations.
-** The performance of these operations will vary from platform
-** to platform. On platforms where atomic operations are not
-** supported the overhead may be substantial.
-** 
-** When traversing the counter database with FindNext functions,
-** the instantaneous values of any given counter is that at the
-** moment of extraction. The state of the entire counter database
-** may not be viewed as atomic.
-** 
-** The counter interface may be disabled (No-Op'd) at compile
-** time. When DEBUG is defined at compile time, the Counter
-** Feature is compiled into NSPR and applications invoking it.
-** When DEBUG is not defined, the counter macros compile to
-** nothing. To force the Counter Feature to be compiled into an
-** optimized build, define FORCE_NSPR_COUNTERS at compile time
-** for both NSPR and the application intending to use it.
-** 
-** Application designers should use the macro form of the Counter
-** Feature methods to minimize performance impact in optimized
-** builds. The macros normally compile to nothing on optimized
-** builds.
-** 
-** Application designers should be aware of the effects of
-** debug and optimized build differences when using result of the
-** Counter Feature macros in expressions.
-** 
-** The Counter Feature is thread-safe and SMP safe.
-** 
-** /lth. 09-Jun-1998.
-*/
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Opaque counter handle type.
-** ... don't even think of looking in here.
-**
-*/
-typedef void *  PRCounterHandle;
-
-#define PRCOUNTER_NAME_MAX 31
-#define PRCOUNTER_DESC_MAX 255
-
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DEFINE_COUNTER() -- Define a PRCounterHandle
-** 
-** DESCRIPTION: PR_DEFINE_COUNTER() is used to define a counter
-** handle.
-** 
-*/
-#define PR_DEFINE_COUNTER(name) PRCounterHandle name
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_INIT_COUNTER_HANDLE() -- Set the value of a PRCounterHandle
-** 
-** DESCRIPTION: 
-** PR_INIT_COUNTER_HANDLE() sets the value of a PRCounterHandle
-** to value.
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_INIT_COUNTER_HANDLE(handle,value)\
-    (handle) = (PRCounterHandle)(value)
-#else
-#define PR_INIT_COUNTER_HANDLE(handle,value)
-#endif
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_CreateCounter() -- Create a counter
-** 
-** DESCRIPTION: PR_CreateCounter() creates a counter object and
-** initializes it to zero.
-** 
-** The macro form takes as its first argument the name of the
-** PRCounterHandle to receive the handle returned from
-** PR_CreateCounter().
-** 
-** INPUTS:
-**  qName: The QName for the counter object. The maximum length
-** of qName is defined by PRCOUNTER_NAME_MAX
-** 
-**  rName: The RName for the counter object. The maximum length
-** of qName is defined by PRCOUNTER_NAME_MAX
-** 
-**  descrioption: The description of the counter object. The
-** maximum length of description is defined by
-** PRCOUNTER_DESC_MAX.
-** 
-** OUTPUTS:
-** 
-** RETURNS:
-**  PRCounterHandle.
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_CREATE_COUNTER(handle,qName,rName,description)\
-   (handle) = PR_CreateCounter((qName),(rName),(description))
-#else
-#define PR_CREATE_COUNTER(handle,qName,rName,description)
-#endif
-
-NSPR_API(PRCounterHandle) 
-	PR_CreateCounter( 
-		const char *qName, 
-    	const char *rName, 
-        const char *description 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DestroyCounter() -- Destroy a counter object.
-** 
-** DESCRIPTION: PR_DestroyCounter() removes a counter and
-** unregisters its handle from the counter database.
-** 
-** INPUTS:
-**  handle: the PRCounterHandle of the counter to be destroyed.
-** 
-** OUTPUTS: 
-**  The counter is destroyed.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_DESTROY_COUNTER(handle) PR_DestroyCounter((handle))
-#else
-#define PR_DESTROY_COUNTER(handle)
-#endif
-
-NSPR_API(void) 
-	PR_DestroyCounter( 
-		PRCounterHandle handle 
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetCounterHandleFromName() -- Retreive a
-** counter's handle give its name.
-** 
-** DESCRIPTION: PR_GetCounterHandleFromName() retreives a
-** counter's handle from the counter database, given the name
-** the counter was originally created with.
-** 
-** INPUTS:
-**  qName: Counter's original QName.
-**  rName: Counter's original RName.
-** 
-** OUTPUTS:
-** 
-** RETURNS: 
-**  PRCounterHandle or PRCounterError.
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_GET_COUNTER_HANDLE_FROM_NAME(handle,qName,rName)\
-    (handle) = PR_GetCounterHandleFromName((qName),(rName))
-#else
-#define PR_GET_COUNTER_HANDLE_FROM_NAME(handle,qName,rName)
-#endif
-
-NSPR_API(PRCounterHandle) 
-	PR_GetCounterHandleFromName( 
-    	const char *qName, 
-    	const char *rName 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetCounterNameFromHandle() -- Retreive a
-** counter's name, given its handle.
-** 
-** DESCRIPTION: PR_GetCounterNameFromHandle() retreives a
-** counter's name given its handle.
-** 
-** INPUTS:
-**  qName: Where to store a pointer to qName.
-**  rName: Where to store a pointer to rName.
-**  description: Where to store a pointer to description.
-** 
-** OUTPUTS: Pointers to the Counter Feature's copies of the names
-** used when the counters were created.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_GET_COUNTER_NAME_FROM_HANDLE(handle,qName,rName,description)\
-    PR_GetCounterNameFromHandle((handle),(qName),(rName),(description))
-#else
-#define PR_GET_COUNTER_NAME_FROM_HANDLE(handle,qName,rName,description )
-#endif
-
-NSPR_API(void) 
-	PR_GetCounterNameFromHandle( 
-    	PRCounterHandle handle,  
-	    const char **qName, 
-	    const char **rName, 
-		const char **description 
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_IncrementCounter() -- Add one to the referenced
-** counter.
-** 
-** DESCRIPTION: Add one to the referenced counter.
-** 
-** INPUTS:
-**  handle: The PRCounterHandle of the counter to be incremented
-** 
-** OUTPUTS: The counter is incrementd.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_INCREMENT_COUNTER(handle) PR_IncrementCounter(handle)
-#else
-#define PR_INCREMENT_COUNTER(handle)
-#endif
-
-NSPR_API(void) 
-	PR_IncrementCounter( 
-		PRCounterHandle handle
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DecrementCounter() -- Subtract one from the
-** referenced counter
-** 
-** DESCRIPTION: Subtract one from the referenced counter.
-** 
-** INPUTS: 
-**  handle: The PRCounterHandle of the coutner to be
-** decremented.
-** 
-** OUTPUTS: the counter is decremented.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_DECREMENT_COUNTER(handle) PR_DecrementCounter(handle)
-#else
-#define PR_DECREMENT_COUNTER(handle)
-#endif
-
-NSPR_API(void) 
-	PR_DecrementCounter( 
-		PRCounterHandle handle
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_AddToCounter() -- Add a value to a counter.
-** 
-** DESCRIPTION: Add value to the counter referenced by handle.
-** 
-** INPUTS:
-**  handle: the PRCounterHandle of the counter to be added to.
-** 
-**  value: the value to be added to the counter.
-** 
-** OUTPUTS: new value for counter.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_ADD_TO_COUNTER(handle,value)\
-    PR_AddToCounter((handle),(value))
-#else
-#define PR_ADD_TO_COUNTER(handle,value)
-#endif
-
-NSPR_API(void) 
-	PR_AddToCounter( 
-    	PRCounterHandle handle, 
-	    PRUint32 value 
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_SubtractFromCounter() -- A value is subtracted
-** from a counter.
-** 
-** DESCRIPTION:
-** Subtract a value from a counter.
-** 
-** INPUTS:
-**  handle: the PRCounterHandle of the counter to be subtracted
-** from.
-** 
-**  value: the value to be subtracted from the counter.
-** 
-** OUTPUTS: new value for counter
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_SUBTRACT_FROM_COUNTER(handle,value)\
-    PR_SubtractFromCounter((handle),(value))
-#else
-#define PR_SUBTRACT_FROM_COUNTER(handle,value)
-#endif
-
-NSPR_API(void) 
-	PR_SubtractFromCounter( 
-    	PRCounterHandle handle, 
-	    PRUint32 value 
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetCounter() -- Retreive the value of a counter
-** 
-** DESCRIPTION:
-** Retreive the value of a counter.
-** 
-** INPUTS:
-**  handle: the PR_CounterHandle of the counter to be retreived
-** 
-** OUTPUTS:
-** 
-** RETURNS: The value of the referenced counter
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_GET_COUNTER(counter,handle)\
-    (counter) = PR_GetCounter((handle))
-#else
-#define PR_GET_COUNTER(counter,handle) 0
-#endif
-
-NSPR_API(PRUint32) 
-	PR_GetCounter( 
-		PRCounterHandle handle 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_SetCounter() -- Replace the content of counter
-** with value.
-** 
-** DESCRIPTION: The contents of the referenced counter are
-** replaced by value.
-** 
-** INPUTS:
-**  handle: the PRCounterHandle of the counter whose contents
-** are to be replaced.
-** 
-**  value: the new value of the counter.
-** 
-** OUTPUTS:
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_SET_COUNTER(handle,value) PR_SetCounter((handle),(value))
-#else
-#define PR_SET_COUNTER(handle,value)
-#endif
-
-NSPR_API(void) 
-	PR_SetCounter( 
-		PRCounterHandle handle, 
-		PRUint32 value 
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_FindNextCounterQname() -- Retreive the next QName counter
-** handle iterator
-** 
-** DESCRIPTION:
-** PR_FindNextCounterQname() retreives the first or next Qname
-** the counter data base, depending on the value of handle. When
-** handle is NULL, the function attempts to retreive the first
-** QName handle in the database. When handle is a handle previosly
-** retreived QName handle, then the function attempts to retreive
-** the next QName handle.
-** 
-** INPUTS: 
-**  handle: PRCounterHandle or NULL.
-** 
-** OUTPUTS: returned
-** 
-** RETURNS: PRCounterHandle or NULL when no more QName counter
-** handles are present.
-** 
-** RESTRICTIONS:
-**  A concurrent PR_CreateCounter() or PR_DestroyCounter() may
-** cause unpredictable results.
-** 
-** A PRCounterHandle returned from this function may only be used
-** in another PR_FindNextCounterQname() function call; other
-** operations may cause unpredictable results.
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_FIND_NEXT_COUNTER_QNAME(next,handle)\
-    (next) = PR_FindNextCounterQname((handle))
-#else
-#define PR_FIND_NEXT_COUNTER_QNAME(next,handle) NULL
-#endif
-
-NSPR_API(PRCounterHandle) 
-	PR_FindNextCounterQname( 
-        PRCounterHandle handle
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_FindNextCounterRname() -- Retreive the next RName counter
-** handle iterator
-** 
-** DESCRIPTION:
-** PR_FindNextCounterRname() retreives the first or next RNname
-** handle from the counter data base, depending on the
-** value of handle. When handle is NULL, the function attempts to
-** retreive the first RName handle in the database. When handle is
-** a handle previosly retreived RName handle, then the function
-** attempts to retreive the next RName handle.
-** 
-** INPUTS:
-**  handle: PRCounterHandle or NULL.
-**  qhandle: PRCounterHandle of a previously aquired via
-** PR_FIND_NEXT_QNAME_HANDLE()
-** 
-** OUTPUTS: returned
-** 
-** RETURNS: PRCounterHandle or NULL when no more RName counter
-** handles are present.
-** 
-** RESTRICTIONS:
-**  A concurrent PR_CreateCounter() or PR_DestroyCounter() may
-** cause unpredictable results.
-** 
-** A PRCounterHandle returned from this function may only be used
-** in another PR_FindNextCounterRname() function call; other
-** operations may cause unpredictable results.
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
-#define PR_FIND_NEXT_COUNTER_RNAME(next,rhandle,qhandle)\
-    (next) = PR_FindNextCounterRname((rhandle),(qhandle))
-#else
-#define PR_FIND_NEXT_COUNTER_RNAME(next,rhandle,qhandle)
-#endif
-
-NSPR_API(PRCounterHandle) 
-	PR_FindNextCounterRname( 
-        PRCounterHandle rhandle,
-        PRCounterHandle qhandle
-);
-
-PR_END_EXTERN_C
-
-#endif /* prcountr_h___ */
diff --git a/openflow/usr/include/nspr/prcpucfg.h b/openflow/usr/include/nspr/prcpucfg.h
deleted file mode 100644
index 8cbf0cb..0000000
--- a/openflow/usr/include/nspr/prcpucfg.h
+++ /dev/null
@@ -1,1081 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * This file is used by not only Linux but also other glibc systems
- * such as GNU/Hurd and GNU/k*BSD.
- */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-
-#if !defined(LINUX) && defined(__linux__)
-#define LINUX
-#endif
-
-#ifdef __FreeBSD_kernel__
-#define PR_AF_INET6 28  /* same as AF_INET6 */
-#elif defined(__GNU__)
-#define PR_AF_INET6 26  /* same as AF_INET6 */
-#else
-#define PR_AF_INET6 10  /* same as AF_INET6 */
-#endif
-
-#ifdef __powerpc64__
-
-#ifdef __LITTLE_ENDIAN__
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#endif
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__powerpc__)
-
-#ifdef __LITTLE_ENDIAN__
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-#endif
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__alpha)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__ia64__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__x86_64__)
-
-#ifdef __ILP32__
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#endif
-
-#elif defined(__mc68000__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     2
-#define PR_ALIGN_OF_LONG    2
-#define PR_ALIGN_OF_INT64   2
-#define PR_ALIGN_OF_FLOAT   2
-#define PR_ALIGN_OF_DOUBLE  2
-#define PR_ALIGN_OF_POINTER 2
-#define PR_ALIGN_OF_WORD    2
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__sparc__) && defined (__arch64__)
-
-#undef	IS_LITTLE_ENDIAN
-#define	IS_BIG_ENDIAN 1
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__sparc__)
-
-#undef	IS_LITTLE_ENDIAN
-#define	IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__i386__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__mips__)
-
-#ifdef __MIPSEB__
-#define IS_BIG_ENDIAN 1
-#undef  IS_LITTLE_ENDIAN
-#elif defined(__MIPSEL__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#error "Unknown MIPS endianness."
-#endif
-
-#if _MIPS_SIM == _ABI64
-
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else /* _ABI64 */
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#endif /* _ABI64 */
-
-#elif defined(__arm__)
-
-#ifdef __ARMEB__
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#elif defined(__ARMEL__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#error "Unknown ARM endianness."
-#endif
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__aarch64__)
-
-#ifdef __AARCH64EB__
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-#elif defined(__AARCH64EL__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-#else
-#error "Unknown Aarch64 endianness."
-#endif
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2  3
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#elif defined(__hppa__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN    1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__s390x__)
-
-#define IS_BIG_ENDIAN 1
-#undef  IS_LITTLE_ENDIAN
-#define IS_64
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   8
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   8
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    64
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   6
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    8
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 8
-#define PR_ALIGN_OF_WORD    8
-
-#define PR_BYTES_PER_WORD_LOG2   3
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__s390__)
-
-#define IS_BIG_ENDIAN 1
-#undef  IS_LITTLE_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__sh__)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__avr32__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__m32r__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#elif defined(__or1k__)
-
-#undef  IS_LITTLE_ENDIAN
-#define IS_BIG_ENDIAN 1
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   4
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-#define PR_ALIGN_OF_WORD    4
-
-#define PR_BYTES_PER_WORD_LOG2   2
-#define PR_BYTES_PER_DWORD_LOG2  3
-
-#else
-
-#error "Unknown CPU architecture"
-
-#endif
-
-#ifndef HAVE_LONG_LONG
-#define	HAVE_LONG_LONG
-#endif
-#if PR_ALIGN_OF_DOUBLE == 8
-#define HAVE_ALIGNED_DOUBLES
-#endif
-#if PR_ALIGN_OF_INT64 == 8
-#define HAVE_ALIGNED_LONGLONGS
-#endif
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-#define BYTES_PER_INT 		PR_BYTES_PER_INT
-#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-#define BITS_PER_INT		PR_BITS_PER_INT
-#define BITS_PER_INT64		PR_BITS_PER_INT64
-#define BITS_PER_LONG		PR_BITS_PER_LONG
-#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD		PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/openflow/usr/include/nspr/prcvar.h b/openflow/usr/include/nspr/prcvar.h
deleted file mode 100644
index 3e30ce1..0000000
--- a/openflow/usr/include/nspr/prcvar.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prcvar_h___
-#define prcvar_h___
-
-#include "prlock.h"
-#include "prinrval.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRCondVar PRCondVar;
-
-/*
-** Create a new condition variable.
-**
-** 	"lock" is the lock used to protect the condition variable.
-**
-** Condition variables are synchronization objects that threads can use
-** to wait for some condition to occur.
-**
-** This may fail if memory is tight or if some operating system resource
-** is low. In such cases, a NULL will be returned.
-*/
-NSPR_API(PRCondVar*) PR_NewCondVar(PRLock *lock);
-
-/*
-** Destroy a condition variable. There must be no thread
-** waiting on the condvar. The caller is responsible for guaranteeing
-** that the condvar is no longer in use.
-**
-*/
-NSPR_API(void) PR_DestroyCondVar(PRCondVar *cvar);
-
-/*
-** The thread that waits on a condition is blocked in a "waiting on
-** condition" state until another thread notifies the condition or a
-** caller specified amount of time expires. The lock associated with
-** the condition variable will be released, which must have be held
-** prior to the call to wait.
-**
-** Logically a notified thread is moved from the "waiting on condition"
-** state and made "ready." When scheduled, it will attempt to reacquire
-** the lock that it held when wait was called.
-**
-** The timeout has two well known values, PR_INTERVAL_NO_TIMEOUT and
-** PR_INTERVAL_NO_WAIT. The former value requires that a condition be
-** notified (or the thread interrupted) before it will resume from the
-** wait. If the timeout has a value of PR_INTERVAL_NO_WAIT, the effect
-** is to release the lock, possibly causing a rescheduling within the
-** runtime, then immediately attempting to reacquire the lock and resume.
-**
-** Any other value for timeout will cause the thread to be rescheduled
-** either due to explicit notification or an expired interval. The latter
-** must be determined by treating time as one part of the monitored data
-** being protected by the lock and tested explicitly for an expired
-** interval.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable or the thread was interrupted (PR_Interrupt()).
-** The particular reason can be extracted with PR_GetError().
-*/
-NSPR_API(PRStatus) PR_WaitCondVar(PRCondVar *cvar, PRIntervalTime timeout);
-
-/*
-** Notify ONE thread that is currently waiting on 'cvar'. Which thread is
-** dependent on the implementation of the runtime. Common sense would dictate
-** that all threads waiting on a single condition have identical semantics,
-** therefore which one gets notified is not significant. 
-**
-** The calling thead must hold the lock that protects the condition, as
-** well as the invariants that are tightly bound to the condition, when
-** notify is called.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable.
-*/
-NSPR_API(PRStatus) PR_NotifyCondVar(PRCondVar *cvar);
-
-/*
-** Notify all of the threads waiting on the condition variable. The order
-** that the threads are notified is indeterminant. The lock that protects
-** the condition must be held.
-**
-** Returns PR_FAILURE if the caller has not locked the lock associated
-** with the condition variable.
-*/
-NSPR_API(PRStatus) PR_NotifyAllCondVar(PRCondVar *cvar);
-
-PR_END_EXTERN_C
-
-#endif /* prcvar_h___ */
diff --git a/openflow/usr/include/nspr/prdtoa.h b/openflow/usr/include/nspr/prdtoa.h
deleted file mode 100644
index 191b6c7..0000000
--- a/openflow/usr/include/nspr/prdtoa.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prdtoa_h___
-#define prdtoa_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** PR_strtod() returns as a double-precision floating-point number
-** the  value represented by the character string pointed to by
-** s00. The string is scanned up to the first unrecognized
-** character.
-**a
-** If the value of se is not (char **)NULL, a  pointer  to
-** the  character terminating the scan is returned in the location pointed
-** to by se. If no number can be formed, se is set to s00, and
-** zero is returned.
-*/
-NSPR_API(PRFloat64)
-PR_strtod(const char *s00, char **se);
-
-/*
-** PR_cnvtf()
-** conversion routines for floating point
-** prcsn - number of digits of precision to generate floating
-** point value.
-*/
-NSPR_API(void) PR_cnvtf(char *buf, PRIntn bufsz, PRIntn prcsn, PRFloat64 fval);
-
-/*
-** PR_dtoa() converts double to a string.
-**
-** ARGUMENTS:
-** If rve is not null, *rve is set to point to the end of the return value.
-** If d is +-Infinity or NaN, then *decpt is set to 9999.
-**
-** mode:
-**     0 ==> shortest string that yields d when read in
-**           and rounded to nearest.
-*/
-NSPR_API(PRStatus) PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits,
-	PRIntn *decpt, PRIntn *sign, char **rve, char *buf, PRSize bufsize);
-
-PR_END_EXTERN_C
-
-#endif /* prdtoa_h___ */
diff --git a/openflow/usr/include/nspr/prenv.h b/openflow/usr/include/nspr/prenv.h
deleted file mode 100644
index 468c7d5..0000000
--- a/openflow/usr/include/nspr/prenv.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prenv_h___
-#define prenv_h___
-
-#include "prtypes.h"
-
-/*******************************************************************************/
-/*******************************************************************************/
-/****************** THESE FUNCTIONS MAY NOT BE THREAD SAFE *********************/
-/*******************************************************************************/
-/*******************************************************************************/
-
-PR_BEGIN_EXTERN_C
-
-/*
-** PR_GetEnv() -- Retrieve value of environment variable
-** 
-** Description:
-** PR_GetEnv() is modeled on Unix getenv().
-** 
-** 
-** Inputs: 
-**   var -- The name of the environment variable
-** 
-** Returns:
-**   The value of the environment variable 'var' or NULL if
-** the variable is undefined.
-** 
-** Restrictions:
-**   You'd think that a POSIX getenv(), putenv() would be
-**   consistently implemented everywhere. Surprise! It is not. On
-**   some platforms, a putenv() where the argument is of
-**   the form "name"  causes the named environment variable to
-**   be un-set; that is: a subsequent getenv() returns NULL. On
-**   other platforms, the putenv() fails, on others, it is a
-**   no-op. Similarly, a putenv() where the argument is of the
-**   form "name=" causes the named environment variable to be
-**   un-set; a subsequent call to getenv() returns NULL. On
-**   other platforms, a subsequent call to getenv() returns a
-**   pointer to a null-string (a byte of zero).
-** 
-**   PR_GetEnv(), PR_SetEnv() provide a consistent behavior 
-**   across all supported platforms. There are, however, some
-**   restrictions and some practices you must use to achieve
-**   consistent results everywhere.
-** 
-**   When manipulating the environment there is no way to un-set
-**   an environment variable across all platforms. We suggest
-**   you interpret the return of a pointer to null-string to
-**   mean the same as a return of NULL from PR_GetEnv().
-** 
-**   A call to PR_SetEnv() where the parameter is of the form
-**   "name" will return PR_FAILURE; the environment remains
-**   unchanged. A call to PR_SetEnv() where the parameter is
-**   of the form "name=" may un-set the envrionment variable on
-**   some platforms; on others it may set the value of the
-**   environment variable to the null-string.
-** 
-**   For example, to test for NULL return or return of the
-**   null-string from PR_GetEnv(), use the following code
-**   fragment:
-** 
-**      char *val = PR_GetEnv("foo");
-**      if ((NULL == val) || ('\0' == *val)) { 
-**          ... interpret this as un-set ... 
-**      }
-** 
-**   The caller must ensure that the string passed
-**   to PR_SetEnv() is persistent. That is: The string should
-**   not be on the stack, where it can be overwritten
-**   on return from the function calling PR_SetEnv().
-**   Similarly, the string passed to PR_SetEnv() must not be
-**   overwritten by other actions of the process. ... Some
-**   platforms use the string by reference rather than copying
-**   it into the environment space. ... You have been warned!
-** 
-**   Use of platform-native functions that manipulate the
-**   environment (getenv(), putenv(), 
-**   SetEnvironmentVariable(), etc.) must not be used with
-**   NSPR's similar functions. The platform-native functions
-**   may not be thread safe and/or may operate on different
-**   conceptual environment space than that operated upon by
-**   NSPR's functions or other environment manipulating
-**   functions on the same platform. (!)
-** 
-*/
-NSPR_API(char*) PR_GetEnv(const char *var);
-
-/*
-** PR_GetEnvSecure() -- get a security-sensitive environment variable
-**
-** Description:
-**
-** PR_GetEnvSecure() is similar to PR_GetEnv(), but it returns NULL if
-** the program was run with elevated privilege (e.g., setuid or setgid
-** on Unix).  This can be used for cases like log file paths which
-** could otherwise be used for privilege escalation.  Note that some
-** platforms may have platform-specific privilege elevation mechanisms
-** not recognized by this function; see the implementation for details.
-*/
-NSPR_API(char*) PR_GetEnvSecure(const char *var);
-
-/*
-** PR_SetEnv() -- set, unset or change an environment variable
-** 
-** Description:
-** PR_SetEnv() is modeled on the Unix putenv() function.
-** 
-** Inputs: 
-**   string -- pointer to a caller supplied
-**   constant, persistent string of the form name=value. Where
-**   name is the name of the environment variable to be set or
-**   changed; value is the value assigned to the variable.
-**
-** Returns: 
-**   PRStatus.
-** 
-** Restrictions: 
-**   See the Restrictions documented in the description of
-**   PR_GetEnv() in this header file.
-** 
-** 
-*/
-NSPR_API(PRStatus) PR_SetEnv(const char *string);
-
-/*
-** PR_DuplicateEnvironment() -- Obtain a copy of the environment.
-**
-** Description:
-** PR_DuplicateEnvironment() copies the environment so that it can be
-** modified without changing the current process's environment, and
-** then passed to interfaces such as POSIX execve().  In particular,
-** this avoids needing to allocate memory or take locks in the child
-** after a fork(); neither of these is allowed by POSIX after a
-** multithreaded process calls fork(), and PR_SetEnv does both.
-**
-** Inputs:
-**   none
-**
-** Returns:
-**   A pointer to a null-terminated array of null-terminated strings,
-**   like the traditional global variable "environ".  The array and
-**   the strings are allocated with PR_Malloc(), and it is the
-**   caller's responsibility to free them.
-**
-**   In case of memory allocation failure, or if the operating system
-**   doesn't support reading the entire environment through the global
-**   variable "environ" or similar, returns NULL instead.
-**
-** Restrictions:
-**   Similarly to PR_GetEnv(), this function may not interoperate as
-**   expected with the operating system's native environment accessors.
-*/
-NSPR_API(char **) PR_DuplicateEnvironment(void);
-
-PR_END_EXTERN_C
-
-#endif /* prenv_h___ */
diff --git a/openflow/usr/include/nspr/prerr.h b/openflow/usr/include/nspr/prerr.h
deleted file mode 100644
index 8512329..0000000
--- a/openflow/usr/include/nspr/prerr.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prerr_h___
-#define prerr_h___
-
-/*
- *
- * prerr.h
- * This file is automatically generated; please do not edit it.
- */
-
-/* Memory allocation attempt failed */
-#define PR_OUT_OF_MEMORY_ERROR                   (-6000L)
-
-/* Invalid file descriptor */
-#define PR_BAD_DESCRIPTOR_ERROR                  (-5999L)
-
-/* The operation would have blocked */
-#define PR_WOULD_BLOCK_ERROR                     (-5998L)
-
-/* Invalid memory address argument */
-#define PR_ACCESS_FAULT_ERROR                    (-5997L)
-
-/* Invalid function for file type */
-#define PR_INVALID_METHOD_ERROR                  (-5996L)
-
-/* Invalid memory address argument */
-#define PR_ILLEGAL_ACCESS_ERROR                  (-5995L)
-
-/* Some unknown error has occurred */
-#define PR_UNKNOWN_ERROR                         (-5994L)
-
-/* Operation interrupted by another thread */
-#define PR_PENDING_INTERRUPT_ERROR               (-5993L)
-
-/* function not implemented */
-#define PR_NOT_IMPLEMENTED_ERROR                 (-5992L)
-
-/* I/O function error */
-#define PR_IO_ERROR                              (-5991L)
-
-/* I/O operation timed out */
-#define PR_IO_TIMEOUT_ERROR                      (-5990L)
-
-/* I/O operation on busy file descriptor */
-#define PR_IO_PENDING_ERROR                      (-5989L)
-
-/* The directory could not be opened */
-#define PR_DIRECTORY_OPEN_ERROR                  (-5988L)
-
-/* Invalid function argument */
-#define PR_INVALID_ARGUMENT_ERROR                (-5987L)
-
-/* Network address not available (in use?) */
-#define PR_ADDRESS_NOT_AVAILABLE_ERROR           (-5986L)
-
-/* Network address type not supported */
-#define PR_ADDRESS_NOT_SUPPORTED_ERROR           (-5985L)
-
-/* Already connected */
-#define PR_IS_CONNECTED_ERROR                    (-5984L)
-
-/* Network address is invalid */
-#define PR_BAD_ADDRESS_ERROR                     (-5983L)
-
-/* Local Network address is in use */
-#define PR_ADDRESS_IN_USE_ERROR                  (-5982L)
-
-/* Connection refused by peer */
-#define PR_CONNECT_REFUSED_ERROR                 (-5981L)
-
-/* Network address is presently unreachable */
-#define PR_NETWORK_UNREACHABLE_ERROR             (-5980L)
-
-/* Connection attempt timed out */
-#define PR_CONNECT_TIMEOUT_ERROR                 (-5979L)
-
-/* Network file descriptor is not connected */
-#define PR_NOT_CONNECTED_ERROR                   (-5978L)
-
-/* Failure to load dynamic library */
-#define PR_LOAD_LIBRARY_ERROR                    (-5977L)
-
-/* Failure to unload dynamic library */
-#define PR_UNLOAD_LIBRARY_ERROR                  (-5976L)
-
-/* Symbol not found in any of the loaded dynamic libraries */
-#define PR_FIND_SYMBOL_ERROR                     (-5975L)
-
-/* Insufficient system resources */
-#define PR_INSUFFICIENT_RESOURCES_ERROR          (-5974L)
-
-/* A directory lookup on a network address has failed */
-#define PR_DIRECTORY_LOOKUP_ERROR                (-5973L)
-
-/* Attempt to access a TPD key that is out of range */
-#define PR_TPD_RANGE_ERROR                       (-5972L)
-
-/* Process open FD table is full */
-#define PR_PROC_DESC_TABLE_FULL_ERROR            (-5971L)
-
-/* System open FD table is full */
-#define PR_SYS_DESC_TABLE_FULL_ERROR             (-5970L)
-
-/* Network operation attempted on non-network file descriptor */
-#define PR_NOT_SOCKET_ERROR                      (-5969L)
-
-/* TCP-specific function attempted on a non-TCP file descriptor */
-#define PR_NOT_TCP_SOCKET_ERROR                  (-5968L)
-
-/* TCP file descriptor is already bound */
-#define PR_SOCKET_ADDRESS_IS_BOUND_ERROR         (-5967L)
-
-/* Access Denied */
-#define PR_NO_ACCESS_RIGHTS_ERROR                (-5966L)
-
-/* The requested operation is not supported by the platform */
-#define PR_OPERATION_NOT_SUPPORTED_ERROR         (-5965L)
-
-/* The host operating system does not support the protocol requested */
-#define PR_PROTOCOL_NOT_SUPPORTED_ERROR          (-5964L)
-
-/* Access to the remote file has been severed */
-#define PR_REMOTE_FILE_ERROR                     (-5963L)
-
-/* The value requested is too large to be stored in the data buffer provided */
-#define PR_BUFFER_OVERFLOW_ERROR                 (-5962L)
-
-/* TCP connection reset by peer */
-#define PR_CONNECT_RESET_ERROR                   (-5961L)
-
-/* Unused */
-#define PR_RANGE_ERROR                           (-5960L)
-
-/* The operation would have deadlocked */
-#define PR_DEADLOCK_ERROR                        (-5959L)
-
-/* The file is already locked */
-#define PR_FILE_IS_LOCKED_ERROR                  (-5958L)
-
-/* Write would result in file larger than the system allows */
-#define PR_FILE_TOO_BIG_ERROR                    (-5957L)
-
-/* The device for storing the file is full */
-#define PR_NO_DEVICE_SPACE_ERROR                 (-5956L)
-
-/* Unused */
-#define PR_PIPE_ERROR                            (-5955L)
-
-/* Unused */
-#define PR_NO_SEEK_DEVICE_ERROR                  (-5954L)
-
-/* Cannot perform a normal file operation on a directory */
-#define PR_IS_DIRECTORY_ERROR                    (-5953L)
-
-/* Symbolic link loop */
-#define PR_LOOP_ERROR                            (-5952L)
-
-/* File name is too long */
-#define PR_NAME_TOO_LONG_ERROR                   (-5951L)
-
-/* File not found */
-#define PR_FILE_NOT_FOUND_ERROR                  (-5950L)
-
-/* Cannot perform directory operation on a normal file */
-#define PR_NOT_DIRECTORY_ERROR                   (-5949L)
-
-/* Cannot write to a read-only file system */
-#define PR_READ_ONLY_FILESYSTEM_ERROR            (-5948L)
-
-/* Cannot delete a directory that is not empty */
-#define PR_DIRECTORY_NOT_EMPTY_ERROR             (-5947L)
-
-/* Cannot delete or rename a file object while the file system is busy */
-#define PR_FILESYSTEM_MOUNTED_ERROR              (-5946L)
-
-/* Cannot rename a file to a file system on another device */
-#define PR_NOT_SAME_DEVICE_ERROR                 (-5945L)
-
-/* The directory object in the file system is corrupted */
-#define PR_DIRECTORY_CORRUPTED_ERROR             (-5944L)
-
-/* Cannot create or rename a filename that already exists */
-#define PR_FILE_EXISTS_ERROR                     (-5943L)
-
-/* Directory is full.  No additional filenames may be added */
-#define PR_MAX_DIRECTORY_ENTRIES_ERROR           (-5942L)
-
-/* The required device was in an invalid state */
-#define PR_INVALID_DEVICE_STATE_ERROR            (-5941L)
-
-/* The device is locked */
-#define PR_DEVICE_IS_LOCKED_ERROR                (-5940L)
-
-/* No more entries in the directory */
-#define PR_NO_MORE_FILES_ERROR                   (-5939L)
-
-/* Encountered end of file */
-#define PR_END_OF_FILE_ERROR                     (-5938L)
-
-/* Seek error */
-#define PR_FILE_SEEK_ERROR                       (-5937L)
-
-/* The file is busy */
-#define PR_FILE_IS_BUSY_ERROR                    (-5936L)
-
-/* The I/O operation was aborted */
-#define PR_OPERATION_ABORTED_ERROR               (-5935L)
-
-/* Operation is still in progress (probably a non-blocking connect) */
-#define PR_IN_PROGRESS_ERROR                     (-5934L)
-
-/* Operation has already been initiated (probably a non-blocking connect) */
-#define PR_ALREADY_INITIATED_ERROR               (-5933L)
-
-/* The wait group is empty */
-#define PR_GROUP_EMPTY_ERROR                     (-5932L)
-
-/* Object state improper for request */
-#define PR_INVALID_STATE_ERROR                   (-5931L)
-
-/* Network is down */
-#define PR_NETWORK_DOWN_ERROR                    (-5930L)
-
-/* Socket shutdown */
-#define PR_SOCKET_SHUTDOWN_ERROR                 (-5929L)
-
-/* Connection aborted */
-#define PR_CONNECT_ABORTED_ERROR                 (-5928L)
-
-/* Host is unreachable */
-#define PR_HOST_UNREACHABLE_ERROR                (-5927L)
-
-/* The library is not loaded */
-#define PR_LIBRARY_NOT_LOADED_ERROR              (-5926L)
-
-/* The one-time function was previously called and failed. Its error code is no longer available */
-#define PR_CALL_ONCE_ERROR                       (-5925L)
-
-/* Placeholder for the end of the list */
-#define PR_MAX_ERROR                             (-5924L)
-
-extern void nspr_InitializePRErrorTable(void);
-#define ERROR_TABLE_BASE_nspr (-6000L)
-
-#endif /* prerr_h___ */
diff --git a/openflow/usr/include/nspr/prerror.h b/openflow/usr/include/nspr/prerror.h
deleted file mode 100644
index 3d6baf6..0000000
--- a/openflow/usr/include/nspr/prerror.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prerror_h___
-#define prerror_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef PRInt32 PRErrorCode;
-
-#define PR_NSPR_ERROR_BASE -6000
-
-#include "prerr.h"
-
-/*
-** Set error will preserve an error condition within a thread context.
-** The values stored are the NSPR (platform independent) translation of
-** the error. Also, if available, the platform specific oserror is stored.
-** If there is no appropriate OS error number, a zero my be supplied.
-*/
-NSPR_API(void) PR_SetError(PRErrorCode errorCode, PRInt32 oserr);
-
-/*
-** The text value specified may be NULL. If it is not NULL and the text length
-** is zero, the string is assumed to be a null terminated C string. Otherwise
-** the text is assumed to be the length specified and possibly include NULL
-** characters (e.g., a multi-national string).
-**
-** The text will be copied into to thread structure and remain there
-** until the next call to PR_SetError.
-*/
-NSPR_API(void) PR_SetErrorText(
-    PRIntn textLength, const char *text);
-
-/*
-** Return the current threads last set error code.
-*/
-NSPR_API(PRErrorCode) PR_GetError(void);
-
-/*
-** Return the current threads last set os error code. This is used for
-** machine specific code that desires the underlying os error.
-*/
-NSPR_API(PRInt32) PR_GetOSError(void);
-
-/*
-** Get the length of the error text. If a zero is returned, then there
-** is no text. Otherwise, the value returned is sufficient to contain
-** the error text currently available.
-*/
-NSPR_API(PRInt32) PR_GetErrorTextLength(void);
-
-/*
-** Copy the current threads current error text. Then actual number of bytes
-** copied is returned as the result. If the result is zero, the 'text' area
-** is unaffected.
-*/
-NSPR_API(PRInt32) PR_GetErrorText(char *text);
-
-
-/*
-Copyright (C) 1987, 1988 Student Information Processing Board of the
-Massachusetts Institute of Technology.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of M.I.T. and the M.I.T. S.I.P.B. not be
-used in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.  M.I.T. and the M.I.T. S.I.P.B.
-make no representations about the suitability of this software for any
-purpose.  It is provided "as is" without express or implied warranty.
-*/
-
-
-/*
- * NOTE:
- *		The interfaces for error-code-translation described in the rest of
- *		this file are preliminary in the 3.1 release of nspr and are subject 
- *		to change in future releases.
- */
-
-/*
-** Description:	Localizable error code to string function.
-**
-**
-** NSPR provides a mechanism for converting an error code to a
-** descriptive string, in a caller-specified language.
-**
-** Error codes themselves are 32 bit (signed) integers.  Typically,
-** the high order 24 bits are an identifier of which error table the
-** error code is from, and the low order 8 bits are a sequential error
-** number within the table.  NSPR supports error tables whose first
-** error code is not a multiple of 256, such error code assignments
-** should be avoided when possible.
-**
-** Error table 0 is defined to match the UNIX system call error table
-** (sys_errlist); this allows errno values to be used directly in the
-** library.  Other error table numbers are typically formed by
-** compacting together the first four characters of the error table
-** name.  The mapping between characters in the name and numeric
-** values in the error code are defined in a system-independent
-** fashion, so that two systems that can pass integral values between
-** them can reliably pass error codes without loss of meaning; this
-** should work even if the character sets used are not the
-** same. (However, if this is to be done, error table 0 should be
-** avoided, since the local system call error tables may differ.)
-**
-** Libraries defining error codes need only provide a table mapping
-** error code numbers to names and default English descriptions,
-** calling a routine to install the table, making it ``known'' to NSPR
-** library.  Once installed, a table may not be removed.  Any error
-** code the library generates can be converted to the corresponding
-** error message.  There is also a default format for error codes
-** accidentally returned before making the table known, which is of
-** the form "unknown code foo 32", where "foo" would be the name of
-** the table.
-**
-** Normally, the error code conversion routine only supports the
-** languages "i-default" and "en", returning the error-table-provided
-** English description for both languages.  The application may
-** provide a localization plugin, allowing support for additional
-** languages.
-**
-**/
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-/*
- * PRLanguageCode --
- *
- *    NSPR represents a language code as a non-negative integer.
- *    Languages 0 is always "i-default" the language you get without
- *    explicit negotiation.  Language 1 is always "en", English
- *    which has been explicitly negotiated.  Additional language
- *    codes are defined by an application-provided localization plugin.
- */
-typedef PRUint32 PRLanguageCode;
-#define PR_LANGUAGE_I_DEFAULT 0 /* i-default, the default language */
-#define PR_LANGUAGE_EN 1 /* English, explicitly negotiated */
-
-/*
- * struct PRErrorMessage --
- *
- *    An error message in an error table.
- */
-struct PRErrorMessage {
-    const char * name;    /* Macro name for error */
-    const char * en_text; /* Default English text */
-};
-
-/*
- * struct PRErrorTable --
- *
- *    An error table, provided by a library.
- */
-struct PRErrorTable {
-    const struct PRErrorMessage * msgs; /* Array of error information */
-    const char *name; /* Name of error table source */
-    PRErrorCode base; /* Error code for first error in table */
-    int n_msgs; /* Number of codes in table */
-};
-
-/*
- * struct PRErrorCallbackPrivate --
- *
- *    A private structure for the localization plugin 
- */
-struct PRErrorCallbackPrivate;
-
-/*
- * struct PRErrorCallbackTablePrivate --
- *
- *    A data structure under which the localization plugin may store information,
- *    associated with an error table, that is private to itself.
- */
-struct PRErrorCallbackTablePrivate;
-
-/*
- * PRErrorCallbackLookupFn --
- *
- *    A function of PRErrorCallbackLookupFn type is a localization
- *    plugin callback which converts an error code into a description
- *    in the requested language.  The callback is provided the
- *    appropriate error table, private data for the plugin and the table.
- *    The callback returns the appropriate UTF-8 encoded description, or NULL
- *    if no description can be found.
- */
-typedef const char *
-PRErrorCallbackLookupFn(PRErrorCode code, PRLanguageCode language, 
-		   const struct PRErrorTable *table,
-		   struct PRErrorCallbackPrivate *cb_private,
-		   struct PRErrorCallbackTablePrivate *table_private);
-
-/*
- * PRErrorCallbackNewTableFn --
- *
- *    A function PRErrorCallbackNewTableFn type is a localization plugin
- *    callback which is called once with each error table registered
- *    with NSPR.  The callback is provided with the error table and
- *    the plugin's private structure.  The callback returns any table private
- *    data it wishes to associate with the error table.  Does not need to be thread
- *    safe.
- */
-typedef struct PRErrorCallbackTablePrivate *
-PRErrorCallbackNewTableFn(const struct PRErrorTable *table,
-			struct PRErrorCallbackPrivate *cb_private);
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorToString
-** DESCRIPTION:
-**  Returns the UTF-8 message for an error code in
-**  the requested language.  May return the message
-**  in the default language if a translation in the requested
-**  language is not available.  The returned string is
-**  valid for the duration of the process.  Never returns NULL.
-**
-***********************************************************************/
-NSPR_API(const char *) PR_ErrorToString(PRErrorCode code,
-    PRLanguageCode language);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorToName
-** DESCRIPTION:
-**  Returns the macro name for an error code, or NULL
-**  if the error code is not known.  The returned string is
-**  valid for the duration of the process.
-**
-**  Does not work for error table 0, the system error codes.
-**
-***********************************************************************/
-NSPR_API(const char *) PR_ErrorToName(PRErrorCode code);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorLanguages
-** DESCRIPTION:
-**  Returns the RFC 1766 language tags for the language
-**  codes PR_ErrorToString() supports.  The returned array is valid
-**  for the duration of the process.  Never returns NULL.  The first
-**  item in the returned array is the language tag for PRLanguageCode 0,
-**  the second is for PRLanguageCode 1, and so on.  The array is terminated
-**  with a null pointer.
-**
-***********************************************************************/
-NSPR_API(const char * const *) PR_ErrorLanguages(void);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorInstallTable
-** DESCRIPTION:
-**  Registers an error table with NSPR.  Must be done exactly once per
-**  table.  Memory pointed to by `table' must remain valid for the life
-**  of the process.
-**
-**  NOT THREAD SAFE!
-**  
-***********************************************************************/
-NSPR_API(PRErrorCode) PR_ErrorInstallTable(const struct PRErrorTable *table);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorInstallCallback
-** DESCRIPTION:
-**  Registers an error localization plugin with NSPR.  May be called
-**  at most one time.  `languages' contains the language codes supported
-**  by this plugin.  Languages 0 and 1 must be "i-default" and "en"
-**  respectively.  `lookup' and `newtable' contain pointers to
-**  the plugin callback functions.  `cb_private' contains any information
-**  private to the plugin functions.
-**
-**  NOT THREAD SAFE!
-**
-***********************************************************************/
-NSPR_API(void) PR_ErrorInstallCallback(const char * const * languages,
-			      PRErrorCallbackLookupFn *lookup, 
-			      PRErrorCallbackNewTableFn *newtable,
-			      struct PRErrorCallbackPrivate *cb_private);
-
-PR_END_EXTERN_C
-
-#endif /* prerror_h___ */
diff --git a/openflow/usr/include/nspr/prinet.h b/openflow/usr/include/nspr/prinet.h
deleted file mode 100644
index 15d229f..0000000
--- a/openflow/usr/include/nspr/prinet.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * File:		prinet.h
- * Description:
- *     Header file used to find the system header files for socket support[1].
- *     This file serves the following purposes:
- *     - A cross-platform, "get-everything" socket header file.  On
- *       Unix, socket support is scattered in several header files,
- *       while Windows has a "get-everything" socket header file[2].
- *     - NSPR needs the following macro definitions and function
- *       prototype declarations from these header files:
- *           AF_INET
- *           INADDR_ANY, INADDR_LOOPBACK, INADDR_BROADCAST
- *           ntohl(), ntohs(), htonl(), ntons().
- *       NSPR does not define its own versions of these macros and
- *       functions.  It simply uses the native versions, which have
- *       the same names on all supported platforms.
- *     This file is intended to be included by NSPR public header
- *     files, such as prio.h.  One should not include this file directly.
- *
- * Notes:
- *     1. This file should have been an internal header.  Please do not
- *        depend on it to pull in the system header files you need.
- *     2. WARNING: This file is no longer cross-platform as it is a no-op
- *        for WIN32!  See the comment in the WIN32 section for details.
- */
-
-#ifndef prinet_h__
-#define prinet_h__
-
-#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
-#include <sys/types.h>
-#include <sys/socket.h>		/* AF_INET */
-#include <netinet/in.h>         /* INADDR_ANY, ..., ntohl(), ... */
-#ifdef XP_OS2
-#include <sys/ioctl.h>
-#endif
-#ifdef XP_UNIX
-#ifdef AIX
-/*
- * On AIX 4.3, the header <arpa/inet.h> refers to struct
- * ether_addr and struct sockaddr_dl that are not declared.
- * The following struct declarations eliminate the compiler
- * warnings.
- */
-struct ether_addr;
-struct sockaddr_dl;
-#endif /* AIX */
-#include <arpa/inet.h>
-#endif /* XP_UNIX */
-#include <netdb.h>
-
-#if defined(FREEBSD) || defined(BSDI) || defined(QNX)
-#include <rpc/types.h> /* the only place that defines INADDR_LOOPBACK */
-#endif
-
-/*
- * OS/2 hack.  For some reason INADDR_LOOPBACK is not defined in the
- * socket headers.
- */
-#if defined(OS2) && !defined(INADDR_LOOPBACK)
-#define INADDR_LOOPBACK 0x7f000001
-#endif
-
-/*
- * Prototypes of ntohl() etc. are declared in <machine/endian.h>
- * on these platforms.
- */
-#if defined(BSDI) || defined(OSF1)
-#include <machine/endian.h>
-#endif
-
-/* On Android, ntohl() etc. are declared in <sys/endian.h>. */
-#ifdef __ANDROID__
-#include <sys/endian.h>
-#endif
-
-#elif defined(WIN32)
-
-/*
- * Do not include any system header files.
- *
- * Originally we were including <windows.h>.  It slowed down the
- * compilation of files that included NSPR headers, so we removed
- * the <windows.h> inclusion at customer's request, which created
- * an unfortunate inconsistency with other platforms.
- */
-
-#else
-
-#error Unknown platform
-
-#endif
-
-#endif /* prinet_h__ */
diff --git a/openflow/usr/include/nspr/prinit.h b/openflow/usr/include/nspr/prinit.h
deleted file mode 100644
index e27fc34..0000000
--- a/openflow/usr/include/nspr/prinit.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prinit_h___
-#define prinit_h___
-
-#include "prthread.h"
-#include "prtypes.h"
-#include "prwin16.h"
-#include <stdio.h>
-
-PR_BEGIN_EXTERN_C
-
-/************************************************************************/
-/**************************IDENTITY AND VERSIONING***********************/
-/************************************************************************/
-
-/*
-** NSPR's name, this should persist until at least the turn of the
-** century.
-*/
-#define PR_NAME     "NSPR"
-
-/*
-** NSPR's version is used to determine the likelihood that the version you
-** used to build your component is anywhere close to being compatible with
-** what is in the underlying library.
-**
-** The format of the version string is
-**     "<major version>.<minor version>[.<patch level>] [<Beta>]"
-*/
-#define PR_VERSION  "4.13.1"
-#define PR_VMAJOR   4
-#define PR_VMINOR   13
-#define PR_VPATCH   1
-#define PR_BETA     PR_FALSE
-
-/*
-** PRVersionCheck
-**
-** The basic signature of the function that is called to provide version
-** checking. The result will be a boolean that indicates the likelihood
-** that the underling library will perform as the caller expects.
-**
-** The only argument is a string, which should be the verson identifier
-** of the library in question. That string will be compared against an
-** equivalent string that represents the actual build version of the
-** exporting library.
-**
-** The result will be the logical union of the directly called library
-** and all dependent libraries.
-*/
-
-typedef PRBool (*PRVersionCheck)(const char*);
-
-/*
-** PR_VersionCheck
-**
-** NSPR's existance proof of the version check function.
-**
-** Note that NSPR has no cooperating dependencies.
-*/
-
-NSPR_API(PRBool) PR_VersionCheck(const char *importedVersion);
-
-/*
- * Returns a const string of the NSPR library version.
- */
-NSPR_API(const char*) PR_GetVersion(void);
-
-
-/************************************************************************/
-/*******************************INITIALIZATION***************************/
-/************************************************************************/
-
-/*
-** Initialize the runtime. Attach a thread object to the currently
-** executing native thread of type "type".
-**
-** The specificaiton of 'maxPTDs' is ignored.
-*/
-NSPR_API(void) PR_Init(
-    PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs);
-
-/*
-** And alternate form of initialization, one that may become the default if
-** not the only mechanism, provides a method to get the NSPR runtime init-
-** ialized and place NSPR between the caller and the runtime library. This
-** allows main() to be treated as any other thread root function, signalling
-** its compeletion by returning and allowing the runtime to coordinate the
-** completion of the other threads of the runtime.
-**
-** The priority of the main (or primordial) thread will be PR_PRIORITY_NORMAL.
-** The thread may adjust its own priority by using PR_SetPriority(), though
-** at this time the support for priorities is somewhat weak.
-**
-** The specificaiton of 'maxPTDs' is ignored.
-**
-** The value returned by PR_Initialize is the value returned from the root
-** function, 'prmain'.
-*/
-
-typedef PRIntn (PR_CALLBACK *PRPrimordialFn)(PRIntn argc, char **argv);
-
-NSPR_API(PRIntn) PR_Initialize(
-    PRPrimordialFn prmain, PRIntn argc, char **argv, PRUintn maxPTDs);
-
-/*
-** Return PR_TRUE if PR_Init has already been called.
-*/
-NSPR_API(PRBool) PR_Initialized(void);
-
-/*
- * Perform a graceful shutdown of NSPR.  PR_Cleanup() may be called by
- * the primordial thread near the end of the main() function.
- *
- * PR_Cleanup() attempts to synchronize the natural termination of
- * process.  It does that by blocking the caller, if and only if it is
- * the primordial thread, until the number of user threads has dropped
- * to zero.  When the primordial thread returns from main(), the process
- * will immediately and silently exit.  That is, it will (if necessary)
- * forcibly terminate any existing threads and exit without significant
- * blocking and there will be no error messages or core files.
- *
- * PR_Cleanup() returns PR_SUCCESS if NSPR is successfully shutdown,
- * or PR_FAILURE if the calling thread of this function is not the
- * primordial thread.
- */
-NSPR_API(PRStatus) PR_Cleanup(void);
-
-/*
-** Disable Interrupts
-**		Disables timer signals used for pre-emptive scheduling.
-*/
-NSPR_API(void) PR_DisableClockInterrupts(void);
-
-/*
-** Enables Interrupts
-**		Enables timer signals used for pre-emptive scheduling.
-*/
-NSPR_API(void) PR_EnableClockInterrupts(void);
-
-/*
-** Block Interrupts
-**		Blocks the timer signal used for pre-emptive scheduling
-*/
-NSPR_API(void) PR_BlockClockInterrupts(void);
-
-/*
-** Unblock Interrupts
-**		Unblocks the timer signal used for pre-emptive scheduling
-*/
-NSPR_API(void) PR_UnblockClockInterrupts(void);
-
-/*
-** Create extra virtual processor threads. Generally used with MP systems.
-*/
-NSPR_API(void) PR_SetConcurrency(PRUintn numCPUs);
-
-/*
-** Control the method and size of the file descriptor (PRFileDesc*)
-** cache used by the runtime. Setting 'high' to zero is for performance,
-** any other value probably for debugging (see memo on FD caching).
-*/
-NSPR_API(PRStatus) PR_SetFDCacheSize(PRIntn low, PRIntn high);
-
-/*
- * Cause an immediate, nongraceful, forced termination of the process.
- * It takes a PRIntn argument, which is the exit status code of the
- * process.
- */
-NSPR_API(void) PR_ProcessExit(PRIntn status);
-
-/*
-** Abort the process in a non-graceful manner. This will cause a core file,
-** call to the debugger or other moral equivalent as well as causing the
-** entire process to stop.
-*/
-NSPR_API(void) PR_Abort(void);
-
-/*
- ****************************************************************
- *
- * Module initialization:
- *
- ****************************************************************
- */
-
-typedef struct PRCallOnceType {
-    PRIntn initialized;
-    PRInt32 inProgress;
-    PRStatus status;
-} PRCallOnceType;
-
-typedef PRStatus (PR_CALLBACK *PRCallOnceFN)(void);
-
-typedef PRStatus (PR_CALLBACK *PRCallOnceWithArgFN)(void *arg);
-
-NSPR_API(PRStatus) PR_CallOnce(
-    PRCallOnceType *once,
-    PRCallOnceFN    func
-);
-
-NSPR_API(PRStatus) PR_CallOnceWithArg(
-    PRCallOnceType      *once,
-    PRCallOnceWithArgFN  func,
-    void                *arg
-);
-
-
-PR_END_EXTERN_C
-
-#endif /* prinit_h___ */
diff --git a/openflow/usr/include/nspr/prinrval.h b/openflow/usr/include/nspr/prinrval.h
deleted file mode 100644
index 14cd39b..0000000
--- a/openflow/usr/include/nspr/prinrval.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File:		prinrval.h
-** Description:	API to interval timing functions of NSPR.
-**
-**
-** NSPR provides interval times that are independent of network time
-** of day values. Interval times are (in theory) accurate regardless
-** of host processing requirements and also very cheap to acquire. It
-** is expected that getting an interval time while in a synchronized
-** function (holding one's lock).
-**/
-
-#if !defined(prinrval_h)
-#define prinrval_h
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-typedef PRUint32 PRIntervalTime;
-
-/***********************************************************************
-** DEFINES:     PR_INTERVAL_MIN
-**              PR_INTERVAL_MAX
-** DESCRIPTION:
-**  These two constants define the range (in ticks / second) of the
-**  platform dependent type, PRIntervalTime. These constants bound both
-**  the period and the resolution of a PRIntervalTime. 
-***********************************************************************/
-#define PR_INTERVAL_MIN 1000UL
-#define PR_INTERVAL_MAX 100000UL
-
-/***********************************************************************
-** DEFINES:     PR_INTERVAL_NO_WAIT
-**              PR_INTERVAL_NO_TIMEOUT
-** DESCRIPTION:
-**  Two reserved constants are defined in the PRIntervalTime namespace.
-**  They are used to indicate that the process should wait no time (return
-**  immediately) or wait forever (never time out), respectively.
-**  Note: PR_INTERVAL_NO_TIMEOUT passed as input to PR_Connect is 
-**  interpreted as use the OS's connect timeout.
-**  
-***********************************************************************/
-#define PR_INTERVAL_NO_WAIT 0UL
-#define PR_INTERVAL_NO_TIMEOUT 0xffffffffUL
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/***********************************************************************
-** FUNCTION:    PR_IntervalNow
-** DESCRIPTION:
-**  Return the value of NSPR's free running interval timer. That timer
-**  can be used to establish epochs and determine intervals (be computing
-**  the difference between two times).
-** INPUTS:      void
-** OUTPUTS:     void
-** RETURN:      PRIntervalTime
-**  
-** SIDE EFFECTS:
-**  None
-** RESTRICTIONS:
-**  The units of PRIntervalTime are platform dependent. They are chosen
-**  such that they are appropriate for the host OS, yet provide sufficient
-**  resolution and period to be useful to clients. 
-** MEMORY:      N/A
-** ALGORITHM:   Platform dependent
-***********************************************************************/
-NSPR_API(PRIntervalTime) PR_IntervalNow(void);
-
-/***********************************************************************
-** FUNCTION:    PR_TicksPerSecond
-** DESCRIPTION:
-**  Return the number of ticks per second for PR_IntervalNow's clock.
-**  The value will be in the range [PR_INTERVAL_MIN..PR_INTERVAL_MAX].
-** INPUTS:      void
-** OUTPUTS:     void
-** RETURN:      PRUint32
-**  
-** SIDE EFFECTS:
-**  None
-** RESTRICTIONS:
-**  None
-** MEMORY:      N/A
-** ALGORITHM:   N/A
-***********************************************************************/
-NSPR_API(PRUint32) PR_TicksPerSecond(void);
-
-/***********************************************************************
-** FUNCTION:    PR_SecondsToInterval
-**              PR_MillisecondsToInterval
-**              PR_MicrosecondsToInterval
-** DESCRIPTION:
-**  Convert standard clock units to platform dependent intervals.
-** INPUTS:      PRUint32
-** OUTPUTS:     void
-** RETURN:      PRIntervalTime
-**  
-** SIDE EFFECTS:
-**  None
-** RESTRICTIONS:
-**  Conversion may cause overflow, which is not reported.
-** MEMORY:      N/A
-** ALGORITHM:   N/A
-***********************************************************************/
-NSPR_API(PRIntervalTime) PR_SecondsToInterval(PRUint32 seconds);
-NSPR_API(PRIntervalTime) PR_MillisecondsToInterval(PRUint32 milli);
-NSPR_API(PRIntervalTime) PR_MicrosecondsToInterval(PRUint32 micro);
-
-/***********************************************************************
-** FUNCTION:    PR_IntervalToSeconds
-**              PR_IntervalToMilliseconds
-**              PR_IntervalToMicroseconds
-** DESCRIPTION:
-**  Convert platform dependent intervals to standard clock units.
-** INPUTS:      PRIntervalTime
-** OUTPUTS:     void
-** RETURN:      PRUint32
-**  
-** SIDE EFFECTS:
-**  None
-** RESTRICTIONS:
-**  Conversion may cause overflow, which is not reported.
-** MEMORY:      N/A
-** ALGORITHM:   N/A
-***********************************************************************/
-NSPR_API(PRUint32) PR_IntervalToSeconds(PRIntervalTime ticks);
-NSPR_API(PRUint32) PR_IntervalToMilliseconds(PRIntervalTime ticks);
-NSPR_API(PRUint32) PR_IntervalToMicroseconds(PRIntervalTime ticks);
-
-PR_END_EXTERN_C
-
-
-#endif /* !defined(prinrval_h) */
-
-/* prinrval.h */
diff --git a/openflow/usr/include/nspr/prio.h b/openflow/usr/include/nspr/prio.h
deleted file mode 100644
index a9fcf37..0000000
--- a/openflow/usr/include/nspr/prio.h
+++ /dev/null
@@ -1,2022 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * File:     prio.h
- *
- * Description:    PR i/o related stuff, such as file system access, file
- *         i/o, socket i/o, etc.
- */
-
-#ifndef prio_h___
-#define prio_h___
-
-#include "prlong.h"
-#include "prtime.h"
-#include "prinrval.h"
-#include "prinet.h"
-
-PR_BEGIN_EXTERN_C
-
-/* Typedefs */
-typedef struct PRDir            PRDir;
-typedef struct PRDirEntry       PRDirEntry;
-#ifdef MOZ_UNICODE
-typedef struct PRDirUTF16       PRDirUTF16;
-typedef struct PRDirEntryUTF16  PRDirEntryUTF16;
-#endif /* MOZ_UNICODE */
-typedef struct PRFileDesc       PRFileDesc;
-typedef struct PRFileInfo       PRFileInfo;
-typedef struct PRFileInfo64     PRFileInfo64;
-typedef union  PRNetAddr        PRNetAddr;
-typedef struct PRIOMethods      PRIOMethods;
-typedef struct PRPollDesc       PRPollDesc;
-typedef struct PRFilePrivate    PRFilePrivate;
-typedef struct PRSendFileData   PRSendFileData;
-
-/*
-***************************************************************************
-** The file descriptor.
-** This is the primary structure to represent any active open socket,
-** whether it be a normal file or a network connection. Such objects
-** are stackable (or layerable). Each layer may have its own set of
-** method pointers and context private to that layer. All each layer
-** knows about its neighbors is how to get to their method table.
-***************************************************************************
-*/
-
-typedef PRIntn PRDescIdentity;          /* see: Layering file descriptors */
-
-struct PRFileDesc {
-    const PRIOMethods *methods;         /* the I/O methods table */
-    PRFilePrivate *secret;              /* layer dependent data */
-    PRFileDesc *lower, *higher;         /* pointers to adjacent layers */
-    void (PR_CALLBACK *dtor)(PRFileDesc *fd);
-                                        /* A destructor function for layer */
-    PRDescIdentity identity;            /* Identity of this particular layer  */
-};
-
-/*
-***************************************************************************
-** PRTransmitFileFlags
-**
-** Flags for PR_TransmitFile.  Pass PR_TRANSMITFILE_CLOSE_SOCKET to
-** PR_TransmitFile if the connection should be closed after the file
-** is transmitted.
-***************************************************************************
-*/
-typedef enum PRTransmitFileFlags {
-    PR_TRANSMITFILE_KEEP_OPEN = 0,    /* socket is left open after file
-                                       * is transmitted. */
-    PR_TRANSMITFILE_CLOSE_SOCKET = 1  /* socket is closed after file
-                                       * is transmitted. */
-} PRTransmitFileFlags;
-
-/*
-**************************************************************************
-** Macros for PRNetAddr
-**
-** Address families: PR_AF_INET, PR_AF_INET6, PR_AF_LOCAL
-** IP addresses: PR_INADDR_ANY, PR_INADDR_LOOPBACK, PR_INADDR_BROADCAST
-**************************************************************************
-*/
-
-#ifdef WIN32
-
-#define PR_AF_INET 2
-#define PR_AF_LOCAL 1
-#define PR_INADDR_ANY (unsigned long)0x00000000
-#define PR_INADDR_LOOPBACK 0x7f000001
-#define PR_INADDR_BROADCAST (unsigned long)0xffffffff
-
-#else /* WIN32 */
-
-#define PR_AF_INET AF_INET
-#define PR_AF_LOCAL AF_UNIX
-#define PR_INADDR_ANY INADDR_ANY
-#define PR_INADDR_LOOPBACK INADDR_LOOPBACK
-#define PR_INADDR_BROADCAST INADDR_BROADCAST
-
-#endif /* WIN32 */
-
-/*
-** Define PR_AF_INET6 in prcpucfg.h with the same
-** value as AF_INET6 on platforms with IPv6 support.
-** Otherwise define it here.
-*/
-#ifndef PR_AF_INET6
-#define PR_AF_INET6 100
-#endif
-
-#define PR_AF_INET_SDP 101
-#define PR_AF_INET6_SDP 102
-
-#ifndef PR_AF_UNSPEC
-#define PR_AF_UNSPEC 0
-#endif
-
-/*
-**************************************************************************
-** A network address
-**
-** Only Internet Protocol (IPv4 and IPv6) addresses are supported.
-** The address family must always represent IPv4 (AF_INET, probably == 2)
-** or IPv6 (AF_INET6).
-**************************************************************************
-*************************************************************************/
-
-struct PRIPv6Addr {
-	union {
-		PRUint8  _S6_u8[16];
-		PRUint16 _S6_u16[8];
-		PRUint32 _S6_u32[4];
-		PRUint64 _S6_u64[2];
-	} _S6_un;
-};
-#define pr_s6_addr		_S6_un._S6_u8
-#define pr_s6_addr16	_S6_un._S6_u16
-#define pr_s6_addr32	_S6_un._S6_u32
-#define pr_s6_addr64 	_S6_un._S6_u64
-
-typedef struct PRIPv6Addr PRIPv6Addr;
-
-union PRNetAddr {
-    struct {
-        PRUint16 family;                /* address family (0x00ff maskable) */
-#ifdef XP_BEOS
-        char data[10];                  /* Be has a smaller structure */
-#else
-        char data[14];                  /* raw address data */
-#endif
-    } raw;
-    struct {
-        PRUint16 family;                /* address family (AF_INET) */
-        PRUint16 port;                  /* port number */
-        PRUint32 ip;                    /* The actual 32 bits of address */
-#ifdef XP_BEOS
-        char pad[4];                    /* Be has a smaller structure */
-#else
-        char pad[8];
-#endif
-    } inet;
-    struct {
-        PRUint16 family;                /* address family (AF_INET6) */
-        PRUint16 port;                  /* port number */
-        PRUint32 flowinfo;              /* routing information */
-        PRIPv6Addr ip;                  /* the actual 128 bits of address */
-        PRUint32 scope_id;              /* set of interfaces for a scope */
-    } ipv6;
-#if defined(XP_UNIX) || defined(XP_OS2)
-    struct {                            /* Unix domain socket address */
-        PRUint16 family;                /* address family (AF_UNIX) */
-#ifdef XP_OS2
-        char path[108];                 /* null-terminated pathname */
-                                        /* bind fails if size is not 108. */
-#else
-        char path[104];                 /* null-terminated pathname */
-#endif
-    } local;
-#endif
-};
-
-/*
-***************************************************************************
-** PRSockOption
-**
-** The file descriptors can have predefined options set after they file
-** descriptor is created to change their behavior. Only the options in
-** the following enumeration are supported.
-***************************************************************************
-*/
-typedef enum PRSockOption
-{
-    PR_SockOpt_Nonblocking,     /* nonblocking io */
-    PR_SockOpt_Linger,          /* linger on close if data present */
-    PR_SockOpt_Reuseaddr,       /* allow local address reuse */
-    PR_SockOpt_Keepalive,       /* keep connections alive */
-    PR_SockOpt_RecvBufferSize,  /* receive buffer size */
-    PR_SockOpt_SendBufferSize,  /* send buffer size */
-
-    PR_SockOpt_IpTimeToLive,    /* time to live */
-    PR_SockOpt_IpTypeOfService, /* type of service and precedence */
-
-    PR_SockOpt_AddMember,       /* add an IP group membership */
-    PR_SockOpt_DropMember,      /* drop an IP group membership */
-    PR_SockOpt_McastInterface,  /* multicast interface address */
-    PR_SockOpt_McastTimeToLive, /* multicast timetolive */
-    PR_SockOpt_McastLoopback,   /* multicast loopback */
-
-    PR_SockOpt_NoDelay,         /* don't delay send to coalesce packets */
-    PR_SockOpt_MaxSegment,      /* maximum segment size */
-    PR_SockOpt_Broadcast,       /* enable broadcast */
-    PR_SockOpt_Reuseport,       /* allow local address & port reuse on
-                                 * platforms that support it */
-    PR_SockOpt_Last
-} PRSockOption;
-
-typedef struct PRLinger {
-	PRBool polarity;		    /* Polarity of the option's setting */
-	PRIntervalTime linger;	    /* Time to linger before closing */
-} PRLinger;
-
-typedef struct PRMcastRequest {
-	PRNetAddr mcaddr;			/* IP multicast address of group */
-	PRNetAddr ifaddr;			/* local IP address of interface */
-} PRMcastRequest;
-
-typedef struct PRSocketOptionData
-{
-    PRSockOption option;
-    union
-    {
-        PRUintn ip_ttl;             /* IP time to live */
-        PRUintn mcast_ttl;          /* IP multicast time to live */
-        PRUintn tos;                /* IP type of service and precedence */
-        PRBool non_blocking;        /* Non-blocking (network) I/O */
-        PRBool reuse_addr;          /* Allow local address reuse */
-        PRBool reuse_port;          /* Allow local address & port reuse on
-                                     * platforms that support it */
-        PRBool keep_alive;          /* Keep connections alive */
-        PRBool mcast_loopback;      /* IP multicast loopback */
-        PRBool no_delay;            /* Don't delay send to coalesce packets */
-        PRBool broadcast;           /* Enable broadcast */
-        PRSize max_segment;         /* Maximum segment size */
-        PRSize recv_buffer_size;    /* Receive buffer size */
-        PRSize send_buffer_size;    /* Send buffer size */
-        PRLinger linger;            /* Time to linger on close if data present */
-        PRMcastRequest add_member;  /* add an IP group membership */
-        PRMcastRequest drop_member; /* Drop an IP group membership */
-        PRNetAddr mcast_if;         /* multicast interface address */
-    } value;
-} PRSocketOptionData;
-
-/*
-***************************************************************************
-** PRIOVec
-**
-** The I/O vector is used by the write vector method to describe the areas
-** that are affected by the ouput operation.
-***************************************************************************
-*/
-typedef struct PRIOVec {
-    char *iov_base;
-    int iov_len;
-} PRIOVec;
-
-/*
-***************************************************************************
-** Discover what type of socket is being described by the file descriptor.
-***************************************************************************
-*/
-typedef enum PRDescType
-{
-    PR_DESC_FILE = 1,
-    PR_DESC_SOCKET_TCP = 2,
-    PR_DESC_SOCKET_UDP = 3,
-    PR_DESC_LAYERED = 4,
-    PR_DESC_PIPE = 5
-} PRDescType;
-
-typedef enum PRSeekWhence {
-    PR_SEEK_SET = 0,
-    PR_SEEK_CUR = 1,
-    PR_SEEK_END = 2
-} PRSeekWhence;
-
-NSPR_API(PRDescType) PR_GetDescType(PRFileDesc *file);
-
-/*
-***************************************************************************
-** PRIOMethods
-**
-** The I/O methods table provides procedural access to the functions of
-** the file descriptor. It is the responsibility of a layer implementor
-** to provide suitable functions at every entry point. If a layer provides
-** no functionality, it should call the next lower(higher) function of the
-** same name (e.g., return fd->lower->method->close(fd->lower));
-**
-** Not all functions are implemented for all types of files. In cases where
-** that is true, the function will return a error indication with an error
-** code of PR_INVALID_METHOD_ERROR.
-***************************************************************************
-*/
-
-typedef PRStatus (PR_CALLBACK *PRCloseFN)(PRFileDesc *fd);
-typedef PRInt32 (PR_CALLBACK *PRReadFN)(PRFileDesc *fd, void *buf, PRInt32 amount);
-typedef PRInt32 (PR_CALLBACK *PRWriteFN)(PRFileDesc *fd, const void *buf, PRInt32 amount);
-typedef PRInt32 (PR_CALLBACK *PRAvailableFN)(PRFileDesc *fd);
-typedef PRInt64 (PR_CALLBACK *PRAvailable64FN)(PRFileDesc *fd);
-typedef PRStatus (PR_CALLBACK *PRFsyncFN)(PRFileDesc *fd);
-typedef PROffset32 (PR_CALLBACK *PRSeekFN)(PRFileDesc *fd, PROffset32 offset, PRSeekWhence how);
-typedef PROffset64 (PR_CALLBACK *PRSeek64FN)(PRFileDesc *fd, PROffset64 offset, PRSeekWhence how);
-typedef PRStatus (PR_CALLBACK *PRFileInfoFN)(PRFileDesc *fd, PRFileInfo *info);
-typedef PRStatus (PR_CALLBACK *PRFileInfo64FN)(PRFileDesc *fd, PRFileInfo64 *info);
-typedef PRInt32 (PR_CALLBACK *PRWritevFN)(
-    PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_size,
-    PRIntervalTime timeout);
-typedef PRStatus (PR_CALLBACK *PRConnectFN)(
-    PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout);
-typedef PRFileDesc* (PR_CALLBACK *PRAcceptFN) (
-    PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout);
-typedef PRStatus (PR_CALLBACK *PRBindFN)(PRFileDesc *fd, const PRNetAddr *addr);
-typedef PRStatus (PR_CALLBACK *PRListenFN)(PRFileDesc *fd, PRIntn backlog);
-typedef PRStatus (PR_CALLBACK *PRShutdownFN)(PRFileDesc *fd, PRIntn how);
-typedef PRInt32 (PR_CALLBACK *PRRecvFN)(
-    PRFileDesc *fd, void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout);
-typedef PRInt32 (PR_CALLBACK *PRSendFN) (
-    PRFileDesc *fd, const void *buf, PRInt32 amount,
-    PRIntn flags, PRIntervalTime timeout);
-typedef PRInt32 (PR_CALLBACK *PRRecvfromFN)(
-    PRFileDesc *fd, void *buf, PRInt32 amount,
-    PRIntn flags, PRNetAddr *addr, PRIntervalTime timeout);
-typedef PRInt32 (PR_CALLBACK *PRSendtoFN)(
-    PRFileDesc *fd, const void *buf, PRInt32 amount,
-    PRIntn flags, const PRNetAddr *addr, PRIntervalTime timeout);
-typedef PRInt16 (PR_CALLBACK *PRPollFN)(
-    PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags);
-typedef PRInt32 (PR_CALLBACK *PRAcceptreadFN)(
-    PRFileDesc *sd, PRFileDesc **nd, PRNetAddr **raddr,
-    void *buf, PRInt32 amount, PRIntervalTime t);
-typedef PRInt32 (PR_CALLBACK *PRTransmitfileFN)(
-     PRFileDesc *sd, PRFileDesc *fd, const void *headers,
-     PRInt32 hlen, PRTransmitFileFlags flags, PRIntervalTime t);
-typedef PRStatus (PR_CALLBACK *PRGetsocknameFN)(PRFileDesc *fd, PRNetAddr *addr);
-typedef PRStatus (PR_CALLBACK *PRGetpeernameFN)(PRFileDesc *fd, PRNetAddr *addr);
-typedef PRStatus (PR_CALLBACK *PRGetsocketoptionFN)(
-    PRFileDesc *fd, PRSocketOptionData *data);
-typedef PRStatus (PR_CALLBACK *PRSetsocketoptionFN)(
-    PRFileDesc *fd, const PRSocketOptionData *data);
-typedef PRInt32 (PR_CALLBACK *PRSendfileFN)(
-	PRFileDesc *networkSocket, PRSendFileData *sendData,
-	PRTransmitFileFlags flags, PRIntervalTime timeout);
-typedef PRStatus (PR_CALLBACK *PRConnectcontinueFN)(
-    PRFileDesc *fd, PRInt16 out_flags);
-typedef PRIntn (PR_CALLBACK *PRReservedFN)(PRFileDesc *fd);
-
-struct PRIOMethods {
-    PRDescType file_type;           /* Type of file represented (tos)           */
-    PRCloseFN close;                /* close file and destroy descriptor        */
-    PRReadFN read;                  /* read up to specified bytes into buffer   */
-    PRWriteFN write;                /* write specified bytes from buffer        */
-    PRAvailableFN available;        /* determine number of bytes available      */
-    PRAvailable64FN available64;    /*          ditto, 64 bit                   */
-    PRFsyncFN fsync;                /* flush all buffers to permanent store     */
-    PRSeekFN seek;                  /* position the file to the desired place   */
-    PRSeek64FN seek64;              /*           ditto, 64 bit                  */
-    PRFileInfoFN fileInfo;          /* Get information about an open file       */
-    PRFileInfo64FN fileInfo64;      /*           ditto, 64 bit                  */
-    PRWritevFN writev;              /* Write segments as described by iovector  */
-    PRConnectFN connect;            /* Connect to the specified (net) address   */
-    PRAcceptFN accept;              /* Accept a connection for a (net) peer     */
-    PRBindFN bind;                  /* Associate a (net) address with the fd    */
-    PRListenFN listen;              /* Prepare to listen for (net) connections  */
-    PRShutdownFN shutdown;          /* Shutdown a (net) connection              */
-    PRRecvFN recv;                  /* Solicit up the the specified bytes       */
-    PRSendFN send;                  /* Send all the bytes specified             */
-    PRRecvfromFN recvfrom;          /* Solicit (net) bytes and report source    */
-    PRSendtoFN sendto;              /* Send bytes to (net) address specified    */
-    PRPollFN poll;                  /* Test the fd to see if it is ready        */
-    PRAcceptreadFN acceptread;      /* Accept and read on a new (net) fd        */
-    PRTransmitfileFN transmitfile;  /* Transmit at entire file                  */
-    PRGetsocknameFN getsockname;    /* Get (net) address associated with fd     */
-    PRGetpeernameFN getpeername;    /* Get peer's (net) address                 */
-    PRReservedFN reserved_fn_6;     /* reserved for future use */
-    PRReservedFN reserved_fn_5;     /* reserved for future use */
-    PRGetsocketoptionFN getsocketoption;
-                                    /* Get current setting of specified option  */
-    PRSetsocketoptionFN setsocketoption;
-                                    /* Set value of specified option            */
-    PRSendfileFN sendfile;			/* Send a (partial) file with header/trailer*/
-    PRConnectcontinueFN connectcontinue;
-                                    /* Continue a nonblocking connect */
-    PRReservedFN reserved_fn_3;		/* reserved for future use */
-    PRReservedFN reserved_fn_2;		/* reserved for future use */
-    PRReservedFN reserved_fn_1;		/* reserved for future use */
-    PRReservedFN reserved_fn_0;		/* reserved for future use */
-};
-
-/*
- **************************************************************************
- * FUNCTION: PR_GetSpecialFD
- * DESCRIPTION: Get the file descriptor that represents the standard input,
- *              output, or error stream.
- * INPUTS:
- *     PRSpecialFD id
- *         A value indicating the type of stream desired:
- *             PR_StandardInput: standard input
- *             PR_StandardOuput: standard output
- *             PR_StandardError: standard error
- * OUTPUTS: none
- * RETURNS: PRFileDesc *
- *     If the argument is valid, PR_GetSpecialFD returns a file descriptor
- *     that represents the corresponding standard I/O stream.  Otherwise,
- *     PR_GetSpecialFD returns NULL and sets error PR_INVALID_ARGUMENT_ERROR.
- **************************************************************************
- */
-
-typedef enum PRSpecialFD
-{
-    PR_StandardInput,          /* standard input */
-    PR_StandardOutput,         /* standard output */
-    PR_StandardError           /* standard error */
-} PRSpecialFD;
-
-NSPR_API(PRFileDesc*) PR_GetSpecialFD(PRSpecialFD id);
-
-#define PR_STDIN	PR_GetSpecialFD(PR_StandardInput)
-#define PR_STDOUT	PR_GetSpecialFD(PR_StandardOutput)
-#define PR_STDERR	PR_GetSpecialFD(PR_StandardError)
-
-/*
- **************************************************************************
- * Layering file descriptors
- *
- * File descriptors may be layered. Each layer has it's own identity.
- * Identities are allocated by the runtime and are to be associated
- * (by the layer implementor) with all layers that are of that type.
- * It is then possible to scan the chain of layers and find a layer
- * that one recongizes and therefore predict that it will implement
- * a desired protocol.
- *
- * There are three well-known identities:
- *      PR_INVALID_IO_LAYER => an invalid layer identity, for error return
- *      PR_TOP_IO_LAYER     => the identity of the top of the stack
- *      PR_NSPR_IO_LAYER    => the identity used by NSPR proper
- * PR_TOP_IO_LAYER may be used as a shorthand for identifying the topmost
- * layer of an existing stack. Ie., the following two constructs are
- * equivalent.
- *
- *      rv = PR_PushIOLayer(stack, PR_TOP_IO_LAYER, my_layer);
- *      rv = PR_PushIOLayer(stack, PR_GetLayersIdentity(stack), my_layer)
- *
- * A string may be associated with the creation of the identity. It
- * will be copied by the runtime. If queried the runtime will return
- * a reference to that copied string (not yet another copy). There
- * is no facility for deleting an identity.
- **************************************************************************
- */
-
-#define PR_IO_LAYER_HEAD (PRDescIdentity)-3
-#define PR_INVALID_IO_LAYER (PRDescIdentity)-1
-#define PR_TOP_IO_LAYER (PRDescIdentity)-2
-#define PR_NSPR_IO_LAYER (PRDescIdentity)0
-
-NSPR_API(PRDescIdentity) PR_GetUniqueIdentity(const char *layer_name);
-NSPR_API(const char*) PR_GetNameForIdentity(PRDescIdentity ident);
-NSPR_API(PRDescIdentity) PR_GetLayersIdentity(PRFileDesc* fd);
-NSPR_API(PRFileDesc*) PR_GetIdentitiesLayer(PRFileDesc* fd_stack, PRDescIdentity id);
-
-/*
- **************************************************************************
- * PR_GetDefaultIOMethods: Accessing the default methods table.
- * You may get a pointer to the default methods table by calling this function.
- * You may then select any elements from that table with which to build your
- * layer's methods table. You may NOT modify the table directly.
- **************************************************************************
- */
-NSPR_API(const PRIOMethods *) PR_GetDefaultIOMethods(void);
-
-/*
- **************************************************************************
- * Creating a layer
- *
- * A new layer may be allocated by calling PR_CreateIOLayerStub(). The
- * file descriptor returned will contain the pointer to the methods table
- * provided. The runtime will not modify the table nor test its correctness.
- **************************************************************************
- */
-NSPR_API(PRFileDesc*) PR_CreateIOLayerStub(
-    PRDescIdentity ident, const PRIOMethods *methods);
-
-/*
- **************************************************************************
- * Creating a layer
- *
- * A new stack may be created by calling PR_CreateIOLayer(). The
- * file descriptor returned will point to the top of the stack, which has
- * the layer 'fd' as the topmost layer.
- * 
- * NOTE: This function creates a new style stack, which has a fixed, dummy
- * header. The old style stack, created by a call to PR_PushIOLayer,
- * results in modifying contents of the top layer of the stack, when
- * pushing and popping layers of the stack.
- **************************************************************************
- */
-NSPR_API(PRFileDesc*) PR_CreateIOLayer(PRFileDesc* fd);
-
-/*
- **************************************************************************
- * Pushing a layer
- *
- * A file descriptor (perhaps allocated using PR_CreateIOLayerStub()) may
- * be pushed into an existing stack of file descriptors at any point the
- * caller deems appropriate. The new layer will be inserted into the stack
- * just above the layer with the indicated identity.
- *
- * Note: Even if the identity parameter indicates the top-most layer of
- * the stack, the value of the file descriptor describing the original
- * stack will not change.
- **************************************************************************
- */
-NSPR_API(PRStatus) PR_PushIOLayer(
-    PRFileDesc *fd_stack, PRDescIdentity id, PRFileDesc *layer);
-
-/*
- **************************************************************************
- * Popping a layer
- *
- * A layer may be popped from a stack by indicating the identity of the
- * layer to be removed. If found, a pointer to the removed object will
- * be returned to the caller. The object then becomes the responsibility
- * of the caller.
- *
- * Note: Even if the identity indicates the top layer of the stack, the
- * reference returned will not be the file descriptor for the stack and
- * that file descriptor will remain valid.
- **************************************************************************
- */
-NSPR_API(PRFileDesc*) PR_PopIOLayer(PRFileDesc *fd_stack, PRDescIdentity id);
-
-/*
- **************************************************************************
- * FUNCTION:    PR_Open
- * DESCRIPTION:    Open a file for reading, writing, or both.
- * INPUTS:
- *     const char *name
- *         The path name of the file to be opened
- *     PRIntn flags
- *         The file status flags.
- *         It is a bitwise OR of the following bit flags (only one of
- *         the first three flags below may be used):
- *		PR_RDONLY        Open for reading only.
- *		PR_WRONLY        Open for writing only.
- *		PR_RDWR          Open for reading and writing.
- *		PR_CREATE_FILE   If the file does not exist, the file is created
- *                              If the file exists, this flag has no effect.
- *      PR_SYNC          If set, each write will wait for both the file data
- *                              and file status to be physically updated.
- *		PR_APPEND        The file pointer is set to the end of
- *                              the file prior to each write.
- *		PR_TRUNCATE      If the file exists, its length is truncated to 0.
- *      PR_EXCL          With PR_CREATE_FILE, if the file does not exist,
- *                              the file is created. If the file already 
- *                              exists, no action and NULL is returned
- *
- *     PRIntn mode
- *         The access permission bits of the file mode, if the file is
- *         created when PR_CREATE_FILE is on.
- * OUTPUTS:    None
- * RETURNS:    PRFileDesc *
- *     If the file is successfully opened,
- *     returns a pointer to the PRFileDesc
- *     created for the newly opened file.
- *     Returns a NULL pointer if the open
- *     failed.
- * SIDE EFFECTS:
- * RESTRICTIONS:
- * MEMORY:
- *     The return value, if not NULL, points to a dynamically allocated
- *     PRFileDesc object.
- * ALGORITHM:
- **************************************************************************
- */
-
-/* Open flags */
-#define PR_RDONLY       0x01
-#define PR_WRONLY       0x02
-#define PR_RDWR         0x04
-#define PR_CREATE_FILE  0x08
-#define PR_APPEND       0x10
-#define PR_TRUNCATE     0x20
-#define PR_SYNC         0x40
-#define PR_EXCL         0x80
-
-/*
-** File modes ....
-**
-** CAVEAT: 'mode' is currently only applicable on UNIX platforms.
-** The 'mode' argument may be ignored by PR_Open on other platforms.
-**
-**   00400   Read by owner.
-**   00200   Write by owner.
-**   00100   Execute (search if a directory) by owner.
-**   00040   Read by group.
-**   00020   Write by group.
-**   00010   Execute by group.
-**   00004   Read by others.
-**   00002   Write by others
-**   00001   Execute by others.
-**
-*/
-
-NSPR_API(PRFileDesc*) PR_Open(const char *name, PRIntn flags, PRIntn mode);
-
-/*
- **************************************************************************
- * FUNCTION: PR_OpenFile
- * DESCRIPTION:
- *     Open a file for reading, writing, or both.
- *     PR_OpenFile has the same prototype as PR_Open but implements
- *     the specified file mode where possible.
- **************************************************************************
- */
-
-/* File mode bits */
-#define PR_IRWXU 00700  /* read, write, execute/search by owner */
-#define PR_IRUSR 00400  /* read permission, owner */
-#define PR_IWUSR 00200  /* write permission, owner */
-#define PR_IXUSR 00100  /* execute/search permission, owner */
-#define PR_IRWXG 00070  /* read, write, execute/search by group */
-#define PR_IRGRP 00040  /* read permission, group */
-#define PR_IWGRP 00020  /* write permission, group */
-#define PR_IXGRP 00010  /* execute/search permission, group */
-#define PR_IRWXO 00007  /* read, write, execute/search by others */
-#define PR_IROTH 00004  /* read permission, others */
-#define PR_IWOTH 00002  /* write permission, others */
-#define PR_IXOTH 00001  /* execute/search permission, others */
-
-NSPR_API(PRFileDesc*) PR_OpenFile(
-    const char *name, PRIntn flags, PRIntn mode);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRFileDesc*) PR_OpenFileUTF16(
-    const PRUnichar *name, PRIntn flags, PRIntn mode);
-#endif /* MOZ_UNICODE */
-
-/*
- **************************************************************************
- * FUNCTION: PR_Close
- * DESCRIPTION:
- *     Close a file or socket.
- * INPUTS:
- *     PRFileDesc *fd
- *         a pointer to a PRFileDesc.
- * OUTPUTS:
- *     None.
- * RETURN:
- *     PRStatus
- * SIDE EFFECTS:
- * RESTRICTIONS:
- *     None.
- * MEMORY:
- *     The dynamic memory pointed to by the argument fd is freed.
- **************************************************************************
- */
-
-NSPR_API(PRStatus)    PR_Close(PRFileDesc *fd);
-
-/*
- **************************************************************************
- * FUNCTION: PR_Read
- * DESCRIPTION:
- *     Read bytes from a file or socket.
- *     The operation will block until either an end of stream indication is
- *     encountered, some positive number of bytes are transferred, or there
- *     is an error. No more than 'amount' bytes will be transferred.
- * INPUTS:
- *     PRFileDesc *fd
- *         pointer to the PRFileDesc object for the file or socket
- *     void *buf
- *         pointer to a buffer to hold the data read in.
- *     PRInt32 amount
- *         the size of 'buf' (in bytes)
- * OUTPUTS:
- * RETURN:
- *     PRInt32
- *         a positive number indicates the number of bytes actually read in.
- *         0 means end of file is reached or the network connection is closed.
- *         -1 indicates a failure. The reason for the failure is obtained
- *         by calling PR_GetError().
- * SIDE EFFECTS:
- *     data is written into the buffer pointed to by 'buf'.
- * RESTRICTIONS:
- *     None.
- * MEMORY:
- *     N/A
- * ALGORITHM:
- *     N/A
- **************************************************************************
- */
-
-NSPR_API(PRInt32) PR_Read(PRFileDesc *fd, void *buf, PRInt32 amount);
-
-/*
- ***************************************************************************
- * FUNCTION: PR_Write
- * DESCRIPTION:
- *     Write a specified number of bytes to a file or socket.  The thread
- *     invoking this function blocks until all the data is written.
- * INPUTS:
- *     PRFileDesc *fd
- *         pointer to a PRFileDesc object that refers to a file or socket
- *     const void *buf
- *         pointer to the buffer holding the data
- *     PRInt32 amount
- *         amount of data in bytes to be written from the buffer
- * OUTPUTS:
- *     None.
- * RETURN: PRInt32
- *     A positive number indicates the number of bytes successfully written.
- *     A -1 is an indication that the operation failed. The reason
- *     for the failure is obtained by calling PR_GetError().
- ***************************************************************************
- */
-
-NSPR_API(PRInt32) PR_Write(PRFileDesc *fd,const void *buf,PRInt32 amount);
-
-/*
- ***************************************************************************
- * FUNCTION: PR_Writev
- * DESCRIPTION:
- *     Write data to a socket.  The data is organized in a PRIOVec array. The
- *     operation will block until all the data is written or the operation
- *     fails.
- * INPUTS:
- *     PRFileDesc *fd
- *         Pointer that points to a PRFileDesc object for a socket.
- *     const PRIOVec *iov
- *         An array of PRIOVec.  PRIOVec is a struct with the following
- *         two fields:
- *             char *iov_base;
- *             int iov_len;
- *     PRInt32 iov_size
- *         Number of elements in the iov array. The value of this
- *         argument must not be greater than PR_MAX_IOVECTOR_SIZE.
- *         If it is, the method will fail (PR_BUFFER_OVERFLOW_ERROR).
- *     PRIntervalTime timeout
- *       Time limit for completion of the entire write operation.
- * OUTPUTS:
- *     None
- * RETURN:
- *     A positive number indicates the number of bytes successfully written.
- *     A -1 is an indication that the operation failed. The reason
- *     for the failure is obtained by calling PR_GetError().
- ***************************************************************************
- */
-
-#define PR_MAX_IOVECTOR_SIZE 16   /* 'iov_size' must be <= */
-
-NSPR_API(PRInt32) PR_Writev(
-    PRFileDesc *fd, const PRIOVec *iov, PRInt32 iov_size,
-    PRIntervalTime timeout);
-
-/*
- ***************************************************************************
- * FUNCTION: PR_Delete
- * DESCRIPTION:
- *     Delete a file from the filesystem. The operation may fail if the
- *     file is open.
- * INPUTS:
- *     const char *name
- *         Path name of the file to be deleted.
- * OUTPUTS:
- *     None.
- * RETURN: PRStatus
- *     The function returns PR_SUCCESS if the file is successfully
- *     deleted, otherwise it returns PR_FAILURE.
- ***************************************************************************
- */
-
-NSPR_API(PRStatus) PR_Delete(const char *name);
-
-/**************************************************************************/
-
-typedef enum PRFileType
-{
-    PR_FILE_FILE = 1,
-    PR_FILE_DIRECTORY = 2,
-    PR_FILE_OTHER = 3
-} PRFileType;
-
-struct PRFileInfo {
-    PRFileType type;        /* Type of file */
-    PROffset32 size;        /* Size, in bytes, of file's contents */
-    PRTime creationTime;    /* Creation time per definition of PRTime */
-    PRTime modifyTime;      /* Last modification time per definition of PRTime */
-};
-
-struct PRFileInfo64 {
-    PRFileType type;        /* Type of file */
-    PROffset64 size;        /* Size, in bytes, of file's contents */
-    PRTime creationTime;    /* Creation time per definition of PRTime */
-    PRTime modifyTime;      /* Last modification time per definition of PRTime */
-};
-
-/****************************************************************************
- * FUNCTION: PR_GetFileInfo, PR_GetFileInfo64
- * DESCRIPTION:
- *     Get the information about the file with the given path name. This is
- *     applicable only to NSFileDesc describing 'file' types (see
- * INPUTS:
- *     const char *fn
- *         path name of the file
- * OUTPUTS:
- *     PRFileInfo *info
- *         Information about the given file is written into the file
- *         information object pointer to by 'info'.
- * RETURN: PRStatus
- *     PR_GetFileInfo returns PR_SUCCESS if file information is successfully
- *     obtained, otherwise it returns PR_FAILURE.
- ***************************************************************************
- */
-
-NSPR_API(PRStatus) PR_GetFileInfo(const char *fn, PRFileInfo *info);
-NSPR_API(PRStatus) PR_GetFileInfo64(const char *fn, PRFileInfo64 *info);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRStatus) PR_GetFileInfo64UTF16(const PRUnichar *fn, PRFileInfo64 *info);
-#endif /* MOZ_UNICODE */
-
-/*
- **************************************************************************
- * FUNCTION: PR_GetOpenFileInfo, PR_GetOpenFileInfo64
- * DESCRIPTION:
- *     Get information about an open file referred to by the
- *     given PRFileDesc object.
- * INPUTS:
- *     const PRFileDesc *fd
- *          A reference to a valid, open file.
- * OUTPUTS:
- *     Same as PR_GetFileInfo, PR_GetFileInfo64
- * RETURN: PRStatus
- *     PR_GetFileInfo returns PR_SUCCESS if file information is successfully
- *     obtained, otherwise it returns PR_FAILURE.
- ***************************************************************************
- */
-
-NSPR_API(PRStatus) PR_GetOpenFileInfo(PRFileDesc *fd, PRFileInfo *info);
-NSPR_API(PRStatus) PR_GetOpenFileInfo64(PRFileDesc *fd, PRFileInfo64 *info);
-
-/*
- **************************************************************************
- * FUNCTION: PR_Rename
- * DESCRIPTION:
- *     Rename a file from the old name 'from' to the new name 'to'.
- * INPUTS:
- *     const char *from
- *         The old name of the file to be renamed.
- *     const char *to
- *         The new name of the file.
- * OUTPUTS:
- *     None.
- * RETURN: PRStatus
- **************************************************************************
- */
-
-NSPR_API(PRStatus)    PR_Rename(const char *from, const char *to);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Access
- * DESCRIPTION:
- *     Determine accessibility of a file.
- * INPUTS:
- *     const char *name
- *         path name of the file
- *     PRAccessHow how
- *         specifies which access permission to check for.
- *         It can be one of the following values:
- *             PR_ACCESS_READ_OK       Test for read permission
- *             PR_ACCESS_WRITE_OK      Test for write permission
- *             PR_ACCESS_EXISTS        Check existence of file
- * OUTPUTS:
- *     None.
- * RETURN: PRStatus
- *     PR_SUCCESS is returned if the requested access is permitted.
- *     Otherwise, PR_FAILURE is returned. Additional information
- *     regarding the reason for the failure may be retrieved from
- *     PR_GetError().
- *************************************************************************
- */
-
-typedef enum PRAccessHow {
-    PR_ACCESS_EXISTS = 1,
-    PR_ACCESS_WRITE_OK = 2,
-    PR_ACCESS_READ_OK = 3
-} PRAccessHow;
-
-NSPR_API(PRStatus) PR_Access(const char *name, PRAccessHow how);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Seek, PR_Seek64
- * DESCRIPTION:
- *     Moves read-write file offset
- * INPUTS:
- *     PRFileDesc *fd
- *         Pointer to a PRFileDesc object.
- *     PROffset32, PROffset64 offset
- *         Specifies a value, in bytes, that is used in conjunction
- *         with the 'whence' parameter to set the file pointer.  A
- *         negative value causes seeking in the reverse direction.
- *     PRSeekWhence whence
- *         Specifies how to interpret the 'offset' parameter in setting
- *         the file pointer associated with the 'fd' parameter.
- *         Values for the 'whence' parameter are:
- *             PR_SEEK_SET  Sets the file pointer to the value of the
- *                          'offset' parameter
- *             PR_SEEK_CUR  Sets the file pointer to its current location
- *                          plus the value of the offset parameter.
- *             PR_SEEK_END  Sets the file pointer to the size of the
- *                          file plus the value of the offset parameter.
- * OUTPUTS:
- *     None.
- * RETURN: PROffset32, PROffset64
- *     Upon successful completion, the resulting pointer location,
- *     measured in bytes from the beginning of the file, is returned.
- *     If the PR_Seek() function fails, the file offset remains
- *     unchanged, and the returned value is -1. The error code can
- *     then be retrieved via PR_GetError().
- *************************************************************************
- */
-
-NSPR_API(PROffset32) PR_Seek(PRFileDesc *fd, PROffset32 offset, PRSeekWhence whence);
-NSPR_API(PROffset64) PR_Seek64(PRFileDesc *fd, PROffset64 offset, PRSeekWhence whence);
-
-/*
- ************************************************************************
- * FUNCTION: PR_Available
- * DESCRIPTION:
- *     Determine the amount of data in bytes available for reading
- *     in the given file or socket.
- * INPUTS:
- *     PRFileDesc *fd
- *         Pointer to a PRFileDesc object that refers to a file or
- *         socket.
- * OUTPUTS:
- *     None
- * RETURN: PRInt32, PRInt64
- *     Upon successful completion, PR_Available returns the number of
- *     bytes beyond the current read pointer that is available for
- *     reading.  Otherwise, it returns a -1 and the reason for the
- *     failure can be retrieved via PR_GetError().
- ************************************************************************
- */
-
-NSPR_API(PRInt32) PR_Available(PRFileDesc *fd);
-NSPR_API(PRInt64) PR_Available64(PRFileDesc *fd);
-
-/*
- ************************************************************************
- * FUNCTION: PR_Sync
- * DESCRIPTION:
- *     Sync any buffered data for a fd to its backing device (disk).
- * INPUTS:
- *     PRFileDesc *fd
- *         Pointer to a PRFileDesc object that refers to a file or
- *         socket
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *     PR_SUCCESS is returned if the requested access is permitted.
- *     Otherwise, PR_FAILURE is returned.
- ************************************************************************
- */
-
-NSPR_API(PRStatus)	PR_Sync(PRFileDesc *fd);
-
-/************************************************************************/
-
-struct PRDirEntry {
-    const char *name;        /* name of entry, relative to directory name */
-};
-
-#ifdef MOZ_UNICODE
-struct PRDirEntryUTF16 {
-    const PRUnichar *name;   /* name of entry in UTF16, relative to
-                              * directory name */
-};
-#endif /* MOZ_UNICODE */
-
-#if !defined(NO_NSPR_10_SUPPORT)
-#define PR_DirName(dirEntry)	(dirEntry->name)
-#endif
-
-/*
- *************************************************************************
- * FUNCTION: PR_OpenDir
- * DESCRIPTION:
- *     Open the directory by the given name
- * INPUTS:
- *     const char *name
- *         path name of the directory to be opened
- * OUTPUTS:
- *     None
- * RETURN: PRDir *
- *     If the directory is sucessfully opened, a PRDir object is
- *     dynamically allocated and a pointer to it is returned.
- *     If the directory cannot be opened, a NULL pointer is returned.
- * MEMORY:
- *     Upon successful completion, the return value points to
- *     dynamically allocated memory.
- *************************************************************************
- */
-
-NSPR_API(PRDir*) PR_OpenDir(const char *name);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRDirUTF16*) PR_OpenDirUTF16(const PRUnichar *name);
-#endif /* MOZ_UNICODE */
-
-/*
- *************************************************************************
- * FUNCTION: PR_ReadDir
- * DESCRIPTION:
- * INPUTS:
- *     PRDir *dir
- *         pointer to a PRDir object that designates an open directory
- *     PRDirFlags flags
- *           PR_SKIP_NONE     Do not skip any files
- *           PR_SKIP_DOT      Skip the directory entry "." that
- *                            represents the current directory
- *           PR_SKIP_DOT_DOT  Skip the directory entry ".." that
- *                            represents the parent directory.
- *           PR_SKIP_BOTH     Skip both '.' and '..'
- *           PR_SKIP_HIDDEN   Skip hidden files
- * OUTPUTS:
- * RETURN: PRDirEntry*
- *     Returns a pointer to the next entry in the directory.  Returns
- *     a NULL pointer upon reaching the end of the directory or when an
- *     error occurs. The actual reason can be retrieved via PR_GetError().
- *************************************************************************
- */
-
-typedef enum PRDirFlags {
-    PR_SKIP_NONE = 0x0,
-    PR_SKIP_DOT = 0x1,
-    PR_SKIP_DOT_DOT = 0x2,
-    PR_SKIP_BOTH = 0x3,
-    PR_SKIP_HIDDEN = 0x4
-} PRDirFlags;
-
-NSPR_API(PRDirEntry*) PR_ReadDir(PRDir *dir, PRDirFlags flags);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRDirEntryUTF16*) PR_ReadDirUTF16(PRDirUTF16 *dir, PRDirFlags flags);
-#endif /* MOZ_UNICODE */
-
-/*
- *************************************************************************
- * FUNCTION: PR_CloseDir
- * DESCRIPTION:
- *     Close the specified directory.
- * INPUTS:
- *     PRDir *dir
- *        The directory to be closed.
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *        If successful, will return a status of PR_SUCCESS. Otherwise
- *        a value of PR_FAILURE. The reason for the failure may be re-
- *        trieved using PR_GetError().
- *************************************************************************
- */
-
-NSPR_API(PRStatus) PR_CloseDir(PRDir *dir);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRStatus) PR_CloseDirUTF16(PRDirUTF16 *dir);
-#endif /* MOZ_UNICODE */
-
-/*
- *************************************************************************
- * FUNCTION: PR_MkDir
- * DESCRIPTION:
- *     Create a new directory with the given name and access mode.
- * INPUTS:
- *     const char *name
- *        The name of the directory to be created. All the path components
- *        up to but not including the leaf component must already exist.
- *     PRIntn mode
- *        See 'mode' definiton in PR_Open().
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *        If successful, will return a status of PR_SUCCESS. Otherwise
- *        a value of PR_FAILURE. The reason for the failure may be re-
- *        trieved using PR_GetError().
- *************************************************************************
- */
-
-NSPR_API(PRStatus) PR_MkDir(const char *name, PRIntn mode);
-
-/*
- *************************************************************************
- * FUNCTION: PR_MakeDir
- * DESCRIPTION:
- *     Create a new directory with the given name and access mode.
- *     PR_MakeDir has the same prototype as PR_MkDir but implements
- *     the specified access mode where possible.
- *************************************************************************
- */
-
-NSPR_API(PRStatus) PR_MakeDir(const char *name, PRIntn mode);
-
-/*
- *************************************************************************
- * FUNCTION: PR_RmDir
- * DESCRIPTION:
- *     Remove a directory by the given name.
- * INPUTS:
- *     const char *name
- *        The name of the directory to be removed. All the path components
- *        must already exist. Only the leaf component will be removed.
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *        If successful, will return a status of PR_SUCCESS. Otherwise
- *        a value of PR_FAILURE. The reason for the failure may be re-
- *        trieved using PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRStatus) PR_RmDir(const char *name);
-
-/*
- *************************************************************************
- * FUNCTION: PR_NewUDPSocket
- * DESCRIPTION:
- *     Create a new UDP socket.
- * INPUTS:
- *     None
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_NewUDPSocket returns a pointer
- *     to the PRFileDesc created for the newly opened UDP socket.
- *     Returns a NULL pointer if the creation of a new UDP socket failed.
- *
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*)    PR_NewUDPSocket(void);
-
-/*
- *************************************************************************
- * FUNCTION: PR_NewTCPSocket
- * DESCRIPTION:
- *     Create a new TCP socket.
- * INPUTS:
- *     None
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_NewTCPSocket returns a pointer
- *     to the PRFileDesc created for the newly opened TCP socket.
- *     Returns a NULL pointer if the creation of a new TCP socket failed.
- *
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*)    PR_NewTCPSocket(void);
-
-/*
- *************************************************************************
- * FUNCTION: PR_OpenUDPSocket
- * DESCRIPTION:
- *     Create a new UDP socket of the specified address family.
- * INPUTS:
- *     PRIntn af
- *       Address family
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_OpenUDPSocket returns a pointer
- *     to the PRFileDesc created for the newly opened UDP socket.
- *     Returns a NULL pointer if the creation of a new UDP socket failed.
- *
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*)    PR_OpenUDPSocket(PRIntn af);
-
-/*
- *************************************************************************
- * FUNCTION: PR_OpenTCPSocket
- * DESCRIPTION:
- *     Create a new TCP socket of the specified address family.
- * INPUTS:
- *     PRIntn af
- *       Address family
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_NewTCPSocket returns a pointer
- *     to the PRFileDesc created for the newly opened TCP socket.
- *     Returns a NULL pointer if the creation of a new TCP socket failed.
- *
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*)    PR_OpenTCPSocket(PRIntn af);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Connect
- * DESCRIPTION:
- *     Initiate a connection on a socket.
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object representing a socket
- *     PRNetAddr *addr
- *       Specifies the address of the socket in its own communication
- *       space.
- *     PRIntervalTime timeout
- *       The function uses the lesser of the provided timeout and
- *       the OS's connect timeout.  In particular, if you specify
- *       PR_INTERVAL_NO_TIMEOUT as the timeout, the OS's connection
- *       time limit will be used.
- *
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *     Upon successful completion of connection initiation, PR_Connect
- *     returns PR_SUCCESS.  Otherwise, it returns PR_FAILURE.  Further
- *     failure information can be obtained by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRStatus) PR_Connect(
-    PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout);
-
-/*
- *************************************************************************
- * FUNCTION: PR_ConnectContinue
- * DESCRIPTION:
- *     Continue a nonblocking connect.  After a nonblocking connect
- *     is initiated with PR_Connect() (which fails with
- *     PR_IN_PROGRESS_ERROR), one should call PR_Poll() on the socket,
- *     with the in_flags PR_POLL_WRITE | PR_POLL_EXCEPT.  When
- *     PR_Poll() returns, one calls PR_ConnectContinue() on the
- *     socket to determine whether the nonblocking connect has
- *     completed or is still in progress.  Repeat the PR_Poll(),
- *     PR_ConnectContinue() sequence until the nonblocking connect
- *     has completed.
- * INPUTS:
- *     PRFileDesc *fd
- *         the file descriptor representing a socket
- *     PRInt16 out_flags
- *         the out_flags field of the poll descriptor returned by
- *         PR_Poll()
- * RETURN: PRStatus
- *     If the nonblocking connect has successfully completed,
- *     PR_ConnectContinue returns PR_SUCCESS.  If PR_ConnectContinue()
- *     returns PR_FAILURE, call PR_GetError():
- *     - PR_IN_PROGRESS_ERROR: the nonblocking connect is still in
- *       progress and has not completed yet.  The caller should poll
- *       on the file descriptor for the in_flags
- *       PR_POLL_WRITE|PR_POLL_EXCEPT and retry PR_ConnectContinue
- *       later when PR_Poll() returns.
- *     - Other errors: the nonblocking connect has failed with this
- *       error code.
- */
-
-NSPR_API(PRStatus)    PR_ConnectContinue(PRFileDesc *fd, PRInt16 out_flags);
-
-/*
- *************************************************************************
- * THIS FUNCTION IS DEPRECATED.  USE PR_ConnectContinue INSTEAD.
- *
- * FUNCTION: PR_GetConnectStatus
- * DESCRIPTION:
- *     Get the completion status of a nonblocking connect.  After
- *     a nonblocking connect is initiated with PR_Connect() (which
- *     fails with PR_IN_PROGRESS_ERROR), one should call PR_Poll()
- *     on the socket, with the in_flags PR_POLL_WRITE | PR_POLL_EXCEPT.
- *     When PR_Poll() returns, one calls PR_GetConnectStatus on the
- *     PRPollDesc structure to determine whether the nonblocking
- *     connect has succeeded or failed.
- * INPUTS:
- *     const PRPollDesc *pd
- *         Pointer to a PRPollDesc whose fd member is the socket,
- *         and in_flags must contain PR_POLL_WRITE and PR_POLL_EXCEPT.
- *         PR_Poll() should have been called and set the out_flags.
- * RETURN: PRStatus
- *     If the nonblocking connect has successfully completed,
- *     PR_GetConnectStatus returns PR_SUCCESS.  If PR_GetConnectStatus()
- *     returns PR_FAILURE, call PR_GetError():
- *     - PR_IN_PROGRESS_ERROR: the nonblocking connect is still in
- *       progress and has not completed yet.
- *     - Other errors: the nonblocking connect has failed with this
- *       error code.
- */
-
-NSPR_API(PRStatus)    PR_GetConnectStatus(const PRPollDesc *pd);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Accept
- * DESCRIPTION:
- *     Accept a connection on a socket.
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object representing the rendezvous socket
- *       on which the caller is willing to accept new connections.
- *     PRIntervalTime timeout
- *       Time limit for completion of the accept operation.
- * OUTPUTS:
- *     PRNetAddr *addr
- *       Returns the address of the connecting entity in its own
- *       communication space. It may be NULL.
- * RETURN: PRFileDesc*
- *     Upon successful acceptance of a connection, PR_Accept
- *     returns a valid file descriptor. Otherwise, it returns NULL.
- *     Further failure information can be obtained by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*) PR_Accept(
-    PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Bind
- * DESCRIPTION:
- *    Bind an address to a socket.
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object representing a socket.
- *     PRNetAddr *addr
- *       Specifies the address to which the socket will be bound.
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *     Upon successful binding of an address to a socket, PR_Bind
- *     returns PR_SUCCESS.  Otherwise, it returns PR_FAILURE.  Further
- *     failure information can be obtained by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRStatus) PR_Bind(PRFileDesc *fd, const PRNetAddr *addr);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Listen
- * DESCRIPTION:
- *    Listen for connections on a socket.
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object representing a socket that will be
- *       used to listen for new connections.
- *     PRIntn backlog
- *       Specifies the maximum length of the queue of pending connections.
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *     Upon successful completion of listen request, PR_Listen
- *     returns PR_SUCCESS.  Otherwise, it returns PR_FAILURE.  Further
- *     failure information can be obtained by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRStatus) PR_Listen(PRFileDesc *fd, PRIntn backlog);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Shutdown
- * DESCRIPTION:
- *    Shut down part of a full-duplex connection on a socket.
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object representing a connected socket.
- *     PRIntn how
- *       Specifies the kind of disallowed operations on the socket.
- *           PR_SHUTDOWN_RCV - Further receives will be disallowed
- *           PR_SHUTDOWN_SEND - Further sends will be disallowed
- *           PR_SHUTDOWN_BOTH - Further sends and receives will be disallowed
- * OUTPUTS:
- *     None
- * RETURN: PRStatus
- *     Upon successful completion of shutdown request, PR_Shutdown
- *     returns PR_SUCCESS.  Otherwise, it returns PR_FAILURE.  Further
- *     failure information can be obtained by calling PR_GetError().
- **************************************************************************
- */
-
-typedef enum PRShutdownHow
-{
-    PR_SHUTDOWN_RCV = 0,      /* disallow further receives */
-    PR_SHUTDOWN_SEND = 1,     /* disallow further sends */
-    PR_SHUTDOWN_BOTH = 2      /* disallow further receives and sends */
-} PRShutdownHow;
-
-NSPR_API(PRStatus)    PR_Shutdown(PRFileDesc *fd, PRShutdownHow how);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Recv
- * DESCRIPTION:
- *    Receive a specified number of bytes from a connected socket.
- *     The operation will block until some positive number of bytes are 
- *     transferred, a time out has occurred, or there is an error. 
- *     No more than 'amount' bytes will be transferred.
- * INPUTS:
- *     PRFileDesc *fd
- *       points to a PRFileDesc object representing a socket.
- *     void *buf
- *       pointer to a buffer to hold the data received.
- *     PRInt32 amount
- *       the size of 'buf' (in bytes)
- *     PRIntn flags
- *       must be zero or PR_MSG_PEEK.
- *     PRIntervalTime timeout
- *       Time limit for completion of the receive operation.
- * OUTPUTS:
- *     None
- * RETURN: PRInt32
- *         a positive number indicates the number of bytes actually received.
- *         0 means the network connection is closed.
- *         -1 indicates a failure. The reason for the failure is obtained
- *         by calling PR_GetError().
- **************************************************************************
- */
-
-#define PR_MSG_PEEK 0x2
-
-NSPR_API(PRInt32)    PR_Recv(PRFileDesc *fd, void *buf, PRInt32 amount,
-                PRIntn flags, PRIntervalTime timeout);
-
-/*
- *************************************************************************
- * FUNCTION: PR_Send
- * DESCRIPTION:
- *    Send a specified number of bytes from a connected socket.
- *     The operation will block until all bytes are 
- *     processed, a time out has occurred, or there is an error. 
- * INPUTS:
- *     PRFileDesc *fd
- *       points to a PRFileDesc object representing a socket.
- *     void *buf
- *       pointer to a buffer from where the data is sent.
- *     PRInt32 amount
- *       the size of 'buf' (in bytes)
- *     PRIntn flags
- *        (OBSOLETE - must always be zero)
- *     PRIntervalTime timeout
- *       Time limit for completion of the send operation.
- * OUTPUTS:
- *     None
- * RETURN: PRInt32
- *     A positive number indicates the number of bytes successfully processed.
- *     This number must always equal 'amount'. A -1 is an indication that the
- *     operation failed. The reason for the failure is obtained by calling
- *     PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRInt32)    PR_Send(PRFileDesc *fd, const void *buf, PRInt32 amount,
-                                PRIntn flags, PRIntervalTime timeout);
-
-/*
- *************************************************************************
- * FUNCTION: PR_RecvFrom
- * DESCRIPTION:
- *     Receive up to a specified number of bytes from socket which may
- *     or may not be connected.
- *     The operation will block until one or more bytes are 
- *     transferred, a time out has occurred, or there is an error. 
- *     No more than 'amount' bytes will be transferred.
- * INPUTS:
- *     PRFileDesc *fd
- *       points to a PRFileDesc object representing a socket.
- *     void *buf
- *       pointer to a buffer to hold the data received.
- *     PRInt32 amount
- *       the size of 'buf' (in bytes)
- *     PRIntn flags
- *        (OBSOLETE - must always be zero)
- *     PRNetAddr *addr
- *       Specifies the address of the sending peer. It may be NULL.
- *     PRIntervalTime timeout
- *       Time limit for completion of the receive operation.
- * OUTPUTS:
- *     None
- * RETURN: PRInt32
- *         a positive number indicates the number of bytes actually received.
- *         0 means the network connection is closed.
- *         -1 indicates a failure. The reason for the failure is obtained
- *         by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRInt32) PR_RecvFrom(
-    PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags,
-    PRNetAddr *addr, PRIntervalTime timeout);
-
-/*
- *************************************************************************
- * FUNCTION: PR_SendTo
- * DESCRIPTION:
- *    Send a specified number of bytes from an unconnected socket.
- *    The operation will block until all bytes are 
- *    sent, a time out has occurred, or there is an error. 
- * INPUTS:
- *     PRFileDesc *fd
- *       points to a PRFileDesc object representing an unconnected socket.
- *     void *buf
- *       pointer to a buffer from where the data is sent.
- *     PRInt32 amount
- *       the size of 'buf' (in bytes)
- *     PRIntn flags
- *        (OBSOLETE - must always be zero)
- *     PRNetAddr *addr
- *       Specifies the address of the peer.
-.*     PRIntervalTime timeout
- *       Time limit for completion of the send operation.
- * OUTPUTS:
- *     None
- * RETURN: PRInt32
- *     A positive number indicates the number of bytes successfully sent.
- *     -1 indicates a failure. The reason for the failure is obtained
- *     by calling PR_GetError().
- **************************************************************************
- */
-
-NSPR_API(PRInt32) PR_SendTo(
-    PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
-    const PRNetAddr *addr, PRIntervalTime timeout);
-
-/*
-*************************************************************************
-** FUNCTION: PR_TransmitFile
-** DESCRIPTION:
-**    Transmitfile sends a complete file (sourceFile) across a socket 
-**    (networkSocket).  If headers is non-NULL, the headers will be sent across
-**    the socket prior to sending the file.
-** 
-**    Optionally, the PR_TRANSMITFILE_CLOSE_SOCKET flag may be passed to
-**    transmitfile.  This flag specifies that transmitfile should close the
-**    socket after sending the data.
-**
-** INPUTS:
-**    PRFileDesc *networkSocket
-**        The socket to send data over
-**    PRFileDesc *sourceFile
-**        The file to send
-**    const void *headers
-**        A pointer to headers to be sent before sending data
-**    PRInt32       hlen
-**        length of header buffers in bytes.
-**    PRTransmitFileFlags       flags
-**        If the flags indicate that the connection should be closed,
-**        it will be done immediately after transferring the file, unless
-**        the operation is unsuccessful. 
-.*     PRIntervalTime timeout
- *        Time limit for completion of the transmit operation.
-**
-** RETURNS:
-**    Returns the number of bytes written or -1 if the operation failed.
-**    If an error occurs while sending the file, the PR_TRANSMITFILE_CLOSE_
-**    SOCKET flag is ignored. The reason for the failure is obtained
-**    by calling PR_GetError().
-**************************************************************************
-*/
-
-NSPR_API(PRInt32) PR_TransmitFile(
-    PRFileDesc *networkSocket, PRFileDesc *sourceFile,
-    const void *headers, PRInt32 hlen, PRTransmitFileFlags flags,
-    PRIntervalTime timeout);
-
-/*
-*************************************************************************
-** FUNCTION: PR_SendFile
-** DESCRIPTION:
-**    PR_SendFile sends data from a file (sendData->fd) across a socket 
-**    (networkSocket).  If specified, a header and/or trailer buffer are sent
-**	  before and after the file, respectively. The file offset, number of bytes
-** 	  of file data to send, the header and trailer buffers are specified in the
-**	  sendData argument.
-** 
-**    Optionally, if the PR_TRANSMITFILE_CLOSE_SOCKET flag is passed, the
-**    socket is closed after successfully sending the data.
-**
-** INPUTS:
-**    PRFileDesc *networkSocket
-**        The socket to send data over
-**    PRSendFileData *sendData
-**        Contains the FD, file offset and length, header and trailer
-**		  buffer specifications.
-**    PRTransmitFileFlags       flags
-**        If the flags indicate that the connection should be closed,
-**        it will be done immediately after transferring the file, unless
-**        the operation is unsuccessful. 
-.*     PRIntervalTime timeout
- *        Time limit for completion of the send operation.
-**
-** RETURNS:
-**    Returns the number of bytes written or -1 if the operation failed.
-**    If an error occurs while sending the file, the PR_TRANSMITFILE_CLOSE_
-**    SOCKET flag is ignored. The reason for the failure is obtained
-**    by calling PR_GetError().
-**************************************************************************
-*/
-
-struct PRSendFileData {
-	PRFileDesc	*fd;			/* file to send							*/
-	PRUint32	file_offset;	/* file offset							*/
-	PRSize		file_nbytes;	/* number of bytes of file data to send	*/
-								/* if 0, send data from file_offset to	*/
-								/* end-of-file.							*/
-	const void	*header;		/* header buffer						*/
-	PRInt32		hlen;			/* header len							*/
-	const void	*trailer;		/* trailer buffer						*/
-	PRInt32		tlen;			/* trailer len							*/
-};
-
-
-NSPR_API(PRInt32) PR_SendFile(
-    PRFileDesc *networkSocket, PRSendFileData *sendData,
-	PRTransmitFileFlags flags, PRIntervalTime timeout);
-
-/*
-*************************************************************************
-** FUNCTION: PR_AcceptRead
-** DESCRIPTION:
-**    AcceptRead accepts a new connection, returns the newly created
-**    socket's descriptor and also returns the connecting peer's address.
-**    AcceptRead, as its name suggests, also receives the first block of data 
-**    sent by the peer.
-**
-** INPUTS:
-**    PRFileDesc *listenSock
-**        A socket descriptor that has been called with the PR_Listen() 
-**        function, also known as the rendezvous socket.
-**    void *buf
-**        A pointer to a buffer to receive data sent by the client.  This 
-**        buffer must be large enough to receive <amount> bytes of data
-**        and two PRNetAddr structures, plus an extra 32 bytes. See:
-**        PR_ACCEPT_READ_BUF_OVERHEAD.
-**    PRInt32 amount
-**        The number of bytes of client data to receive.  Does not include
-**        the size of the PRNetAddr structures.  If 0, no data will be read
-**        from the client.
-**    PRIntervalTime timeout
-**        The timeout interval only applies to the read portion of the 
-**        operation.  PR_AcceptRead will block indefinitely until the 
-**        connection is accepted; the read will timeout after the timeout 
-**        interval elapses.
-** OUTPUTS:
-**    PRFileDesc **acceptedSock
-**        The file descriptor for the newly connected socket.  This parameter
-**        will only be valid if the function return does not indicate failure.
-**    PRNetAddr  **peerAddr,
-**        The address of the remote socket.  This parameter will only be
-**        valid if the function return does not indicate failure.  The
-**        returned address is not guaranteed to be properly aligned.
-** 
-** RETURNS:
-**     The number of bytes read from the client or -1 on failure.  The reason 
-**     for the failure is obtained by calling PR_GetError().
-**************************************************************************
-**/       
-/* define buffer overhead constant. Add this value to the user's 
-** data length when allocating a buffer to accept data.
-**    Example:
-**    #define USER_DATA_SIZE 10
-**    char buf[USER_DATA_SIZE + PR_ACCEPT_READ_BUF_OVERHEAD];
-**    bytesRead = PR_AcceptRead( s, fd, &a, &p, USER_DATA_SIZE, ...);
-*/
-#define PR_ACCEPT_READ_BUF_OVERHEAD (32+(2*sizeof(PRNetAddr)))
-
-NSPR_API(PRInt32) PR_AcceptRead(
-    PRFileDesc *listenSock, PRFileDesc **acceptedSock,
-    PRNetAddr **peerAddr, void *buf, PRInt32 amount, PRIntervalTime timeout);
-
-/*
-*************************************************************************
-** FUNCTION: PR_NewTCPSocketPair
-** DESCRIPTION:
-**    Create a new TCP socket pair. The returned descriptors can be used
-**    interchangeably; they are interconnected full-duplex descriptors: data
-**    written to one can be read from the other and vice-versa.
-**
-** INPUTS:
-**    None
-** OUTPUTS:
-**    PRFileDesc *fds[2]
-**        The file descriptor pair for the newly created TCP sockets.
-** RETURN: PRStatus
-**     Upon successful completion of TCP socket pair, PR_NewTCPSocketPair 
-**     returns PR_SUCCESS.  Otherwise, it returns PR_FAILURE.  Further
-**     failure information can be obtained by calling PR_GetError().
-** XXX can we implement this on windoze and mac?
-**************************************************************************
-**/
-NSPR_API(PRStatus) PR_NewTCPSocketPair(PRFileDesc *fds[2]);
-
-/*
-*************************************************************************
-** FUNCTION: PR_GetSockName
-** DESCRIPTION:
-**    Get socket name.  Return the network address for this socket.
-**
-** INPUTS:
-**     PRFileDesc *fd
-**       Points to a PRFileDesc object representing the socket.
-** OUTPUTS:
-**     PRNetAddr *addr
-**       Returns the address of the socket in its own communication space.
-** RETURN: PRStatus
-**     Upon successful completion, PR_GetSockName returns PR_SUCCESS.  
-**     Otherwise, it returns PR_FAILURE.  Further failure information can 
-**     be obtained by calling PR_GetError().
-**************************************************************************
-**/
-NSPR_API(PRStatus)	PR_GetSockName(PRFileDesc *fd, PRNetAddr *addr);
-
-/*
-*************************************************************************
-** FUNCTION: PR_GetPeerName
-** DESCRIPTION:
-**    Get name of the connected peer.  Return the network address for the 
-**    connected peer socket.
-**
-** INPUTS:
-**     PRFileDesc *fd
-**       Points to a PRFileDesc object representing the connected peer.
-** OUTPUTS:
-**     PRNetAddr *addr
-**       Returns the address of the connected peer in its own communication
-**       space.
-** RETURN: PRStatus
-**     Upon successful completion, PR_GetPeerName returns PR_SUCCESS.  
-**     Otherwise, it returns PR_FAILURE.  Further failure information can 
-**     be obtained by calling PR_GetError().
-**************************************************************************
-**/
-NSPR_API(PRStatus)	PR_GetPeerName(PRFileDesc *fd, PRNetAddr *addr);
-
-NSPR_API(PRStatus)	PR_GetSocketOption(
-    PRFileDesc *fd, PRSocketOptionData *data);
-
-NSPR_API(PRStatus)	PR_SetSocketOption(
-    PRFileDesc *fd, const PRSocketOptionData *data);
-
-/*
- *********************************************************************
- *
- * File descriptor inheritance
- *
- *********************************************************************
- */
-
-/*
- ************************************************************************
- * FUNCTION: PR_SetFDInheritable
- * DESCRIPTION:
- *    Set the inheritance attribute of a file descriptor.
- *
- * INPUTS:
- *     PRFileDesc *fd
- *       Points to a PRFileDesc object.
- *     PRBool inheritable
- *       If PR_TRUE, the file descriptor fd is set to be inheritable
- *       by a child process.  If PR_FALSE, the file descriptor is set
- *       to be not inheritable by a child process.
- * RETURN: PRStatus
- *     Upon successful completion, PR_SetFDInheritable returns PR_SUCCESS.  
- *     Otherwise, it returns PR_FAILURE.  Further failure information can 
- *     be obtained by calling PR_GetError().
- *************************************************************************
- */
-NSPR_API(PRStatus) PR_SetFDInheritable(
-    PRFileDesc *fd,
-    PRBool inheritable);
-
-/*
- ************************************************************************
- * FUNCTION: PR_GetInheritedFD
- * DESCRIPTION:
- *    Get an inherited file descriptor with the specified name.
- *
- * INPUTS:
- *     const char *name
- *       The name of the inherited file descriptor.
- * RETURN: PRFileDesc *
- *     Upon successful completion, PR_GetInheritedFD returns the
- *     inherited file descriptor with the specified name.  Otherwise,  
- *     it returns NULL.  Further failure information can be obtained
- *     by calling PR_GetError().
- *************************************************************************
- */
-NSPR_API(PRFileDesc *) PR_GetInheritedFD(const char *name);
-
-/*
- *********************************************************************
- *
- * Memory-mapped files
- *
- *********************************************************************
- */
-
-typedef struct PRFileMap PRFileMap;
-
-/*
- * protection options for read and write accesses of a file mapping
- */
-typedef enum PRFileMapProtect {
-    PR_PROT_READONLY,     /* read only */
-    PR_PROT_READWRITE,    /* readable, and write is shared */
-    PR_PROT_WRITECOPY     /* readable, and write is private (copy-on-write) */
-} PRFileMapProtect;
-
-NSPR_API(PRFileMap *) PR_CreateFileMap(
-    PRFileDesc *fd,
-    PRInt64 size,
-    PRFileMapProtect prot);
-
-/*
- * return the alignment (in bytes) of the offset argument to PR_MemMap
- */
-NSPR_API(PRInt32) PR_GetMemMapAlignment(void);
-
-NSPR_API(void *) PR_MemMap(
-    PRFileMap *fmap,
-    PROffset64 offset,  /* must be aligned and sized according to the
-                         * return value of PR_GetMemMapAlignment() */
-    PRUint32 len);
-
-NSPR_API(PRStatus) PR_MemUnmap(void *addr, PRUint32 len);
-
-NSPR_API(PRStatus) PR_CloseFileMap(PRFileMap *fmap);
-
-/*
- * Synchronously flush the given memory-mapped address range of the given open
- * file to disk. The function does not return until all modified data have
- * been written to disk.
- *
- * On some platforms, the function will call PR_Sync(fd) internally if it is
- * necessary for flushing modified data to disk synchronously.
- */
-NSPR_API(PRStatus) PR_SyncMemMap(
-    PRFileDesc *fd,
-    void *addr,
-    PRUint32 len);
-
-/*
- ******************************************************************
- *
- * Interprocess communication
- *
- ******************************************************************
- */
-
-/*
- * Creates an anonymous pipe and returns file descriptors for the
- * read and write ends of the pipe.
- */
-
-NSPR_API(PRStatus) PR_CreatePipe(
-    PRFileDesc **readPipe,
-    PRFileDesc **writePipe
-);
-
-/************************************************************************/
-/************** The following definitions are for poll ******************/
-/************************************************************************/
-
-struct PRPollDesc {
-    PRFileDesc* fd;
-    PRInt16 in_flags;
-    PRInt16 out_flags;
-};
-
-/*
-** Bit values for PRPollDesc.in_flags or PRPollDesc.out_flags. Binary-or
-** these together to produce the desired poll request.
-*/
-
-#if defined(_PR_POLL_BACKCOMPAT)
-
-#include <poll.h>
-#define PR_POLL_READ    POLLIN
-#define PR_POLL_WRITE   POLLOUT
-#define PR_POLL_EXCEPT  POLLPRI
-#define PR_POLL_ERR     POLLERR     /* only in out_flags */
-#define PR_POLL_NVAL    POLLNVAL    /* only in out_flags when fd is bad */
-#define PR_POLL_HUP     POLLHUP     /* only in out_flags */
-
-#else  /* _PR_POLL_BACKCOMPAT */
-
-#define PR_POLL_READ    0x1
-#define PR_POLL_WRITE   0x2
-#define PR_POLL_EXCEPT  0x4
-#define PR_POLL_ERR     0x8         /* only in out_flags */
-#define PR_POLL_NVAL    0x10        /* only in out_flags when fd is bad */
-#define PR_POLL_HUP     0x20        /* only in out_flags */
-
-#endif  /* _PR_POLL_BACKCOMPAT */
-
-/*
-*************************************************************************
-** FUNCTION:    PR_Poll
-** DESCRIPTION:
-**
-** The call returns as soon as I/O is ready on one or more of the underlying
-** socket objects. A count of the number of ready descriptors is
-** returned unless a timeout occurs in which case zero is returned.
-**
-** PRPollDesc.fd should be set to a pointer to a PRFileDesc object
-** representing a socket. This field can be set to NULL to indicate to
-** PR_Poll that this PRFileDesc object should be ignored.
-** PRPollDesc.in_flags should be set to the desired request
-** (read/write/except or some combination). Upon successful return from
-** this call PRPollDesc.out_flags will be set to indicate what kind of
-** i/o can be performed on the respective descriptor. PR_Poll() uses the
-** out_flags fields as scratch variables during the call. If PR_Poll()
-** returns 0 or -1, the out_flags fields do not contain meaningful values
-** and must not be used.
-**
-** INPUTS:
-**      PRPollDesc *pds         A pointer to an array of PRPollDesc
-**
-**      PRIntn npds             The number of elements in the array
-**                              If this argument is zero PR_Poll is
-**                              equivalent to a PR_Sleep(timeout).
-**
-**      PRIntervalTime timeout  Amount of time the call will block waiting
-**                              for I/O to become ready. If this time expires
-**                              w/o any I/O becoming ready, the result will
-**                              be zero.
-**
-** OUTPUTS:    None
-** RETURN:
-**      PRInt32                 Number of PRPollDesc's with events or zero
-**                              if the function timed out or -1 on failure.
-**                              The reason for the failure is obtained by
-**                              calling PR_GetError().
-**************************************************************************
-*/
-NSPR_API(PRInt32) PR_Poll(
-    PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout);
-
-/*
-**************************************************************************
-**
-** Pollable events
-**
-** A pollable event is a special kind of file descriptor.
-** The only I/O operation you can perform on a pollable event
-** is to poll it with the PR_POLL_READ flag.  You can't
-** read from or write to a pollable event.
-**
-** The purpose of a pollable event is to combine event waiting
-** with I/O waiting in a single PR_Poll call.  Pollable events
-** are implemented using a pipe or a pair of TCP sockets
-** connected via the loopback address, therefore setting and
-** waiting for pollable events are expensive operating system
-** calls.  Do not use pollable events for general thread
-** synchronization. Use condition variables instead.
-**
-** A pollable event has two states: set and unset.  Events
-** are not queued, so there is no notion of an event count.
-** A pollable event is either set or unset.
-**
-** A new pollable event is created by a PR_NewPollableEvent
-** call and is initially in the unset state.
-**
-** PR_WaitForPollableEvent blocks the calling thread until
-** the pollable event is set, and then it atomically unsets
-** the pollable event before it returns.
-**
-** To set a pollable event, call PR_SetPollableEvent.
-**
-** One can call PR_Poll with the PR_POLL_READ flag on a pollable
-** event.  When the pollable event is set, PR_Poll returns with
-** the PR_POLL_READ flag set in the out_flags.
-**
-** To close a pollable event, call PR_DestroyPollableEvent
-** (not PR_Close).
-**
-**************************************************************************
-*/
-
-NSPR_API(PRFileDesc *) PR_NewPollableEvent(void);
-
-NSPR_API(PRStatus) PR_DestroyPollableEvent(PRFileDesc *event);
-
-NSPR_API(PRStatus) PR_SetPollableEvent(PRFileDesc *event);
-
-NSPR_API(PRStatus) PR_WaitForPollableEvent(PRFileDesc *event);
-
-PR_END_EXTERN_C
-
-#endif /* prio_h___ */
diff --git a/openflow/usr/include/nspr/pripcsem.h b/openflow/usr/include/nspr/pripcsem.h
deleted file mode 100644
index f5a524d..0000000
--- a/openflow/usr/include/nspr/pripcsem.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * File: pripcsem.h
- *
- * Description: named semaphores for interprocess
- * synchronization
- *
- * Unrelated processes obtain access to a shared semaphore
- * by specifying its name.
- *
- * Our goal is to support named semaphores on at least
- * Unix and Win32 platforms.  The implementation will use
- * one of the three native semaphore APIs: POSIX, System V,
- * and Win32.
- *
- * Because POSIX named semaphores have kernel persistence,
- * we are forced to have a delete function in this API.
- */
-
-#ifndef pripcsem_h___
-#define pripcsem_h___
-
-#include "prtypes.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
- * PRSem is an opaque structure that represents a named
- * semaphore.
- */
-typedef struct PRSem PRSem;
-
-/*
- * PR_OpenSemaphore --
- *
- * Create or open a named semaphore with the specified name.
- * A handle to the semaphore is returned.
- *
- * If the named semaphore doesn't exist and the PR_SEM_CREATE
- * flag is specified, the named semaphore is created.  The
- * created semaphore needs to be removed from the system with
- * a PR_DeleteSemaphore call.
- *
- * If PR_SEM_CREATE is specified, the third argument is the
- * access permission bits of the new semaphore (same
- * interpretation as the mode argument to PR_Open) and the
- * fourth argument is the initial value of the new semaphore.
- * If PR_SEM_CREATE is not specified, the third and fourth
- * arguments are ignored.
- */
-
-#define PR_SEM_CREATE 0x1  /* create if not exist */
-#define PR_SEM_EXCL   0x2  /* fail if already exists */
-
-NSPR_API(PRSem *) PR_OpenSemaphore(
-    const char *name, PRIntn flags, PRIntn mode, PRUintn value);
-
-/*
- * PR_WaitSemaphore --
- *
- * If the value of the semaphore is > 0, decrement the value and return.
- * If the value is 0, sleep until the value becomes > 0, then decrement
- * the value and return.
- *
- * The "test and decrement" operation is performed atomically.
- */
-
-NSPR_API(PRStatus) PR_WaitSemaphore(PRSem *sem);
-
-/*
- * PR_PostSemaphore --
- *
- * Increment the value of the named semaphore by 1.
- */
-
-NSPR_API(PRStatus) PR_PostSemaphore(PRSem *sem);
-
-/*
- * PR_CloseSemaphore --
- *
- * Close a named semaphore handle.
- */
-
-NSPR_API(PRStatus) PR_CloseSemaphore(PRSem *sem);
-
-/*
- * PR_DeleteSemaphore --
- *
- * Remove a named semaphore from the system.
- */
-
-NSPR_API(PRStatus) PR_DeleteSemaphore(const char *name);
-
-PR_END_EXTERN_C
-
-#endif /* pripcsem_h___ */
diff --git a/openflow/usr/include/nspr/private/pprio.h b/openflow/usr/include/nspr/private/pprio.h
deleted file mode 100644
index 26bcd0d..0000000
--- a/openflow/usr/include/nspr/private/pprio.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File:	pprio.h
-**
-** Description:	Private definitions for I/O related structures
-*/
-
-#ifndef pprio_h___
-#define pprio_h___
-
-#include "prtypes.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-/************************************************************************/
-/************************************************************************/
-
-#ifdef _WIN64
-typedef __int64 PROsfd;
-#else
-typedef PRInt32 PROsfd;
-#endif
-
-/* Return the method tables for files, tcp sockets and udp sockets */
-NSPR_API(const PRIOMethods*)    PR_GetFileMethods(void);
-NSPR_API(const PRIOMethods*)    PR_GetTCPMethods(void);
-NSPR_API(const PRIOMethods*)    PR_GetUDPMethods(void);
-NSPR_API(const PRIOMethods*)    PR_GetPipeMethods(void);
-
-/*
-** Convert a NSPR socket handle to a native socket handle.
-**
-** Using this function makes your code depend on the properties of the
-** current NSPR implementation, which may change (although extremely
-** unlikely because of NSPR's backward compatibility requirement).  Avoid
-** using it if you can.
-**
-** If you use this function, you need to understand what NSPR does to
-** the native handle.  For example, NSPR puts native socket handles in
-** non-blocking mode or associates them with an I/O completion port (the
-** WINNT build configuration only).  Your use of the native handle should
-** not interfere with NSPR's use of the native handle.  If your code
-** changes the configuration of the native handle, (e.g., changes it to
-** blocking or closes it), NSPR will not work correctly.
-*/
-NSPR_API(PROsfd)       PR_FileDesc2NativeHandle(PRFileDesc *);
-NSPR_API(void)         PR_ChangeFileDescNativeHandle(PRFileDesc *, PROsfd);
-NSPR_API(PRFileDesc*)  PR_AllocFileDesc(PROsfd osfd,
-                                         const PRIOMethods *methods);
-NSPR_API(void)         PR_FreeFileDesc(PRFileDesc *fd);
-/*
-** Import an existing OS file to NSPR. 
-*/
-NSPR_API(PRFileDesc*)  PR_ImportFile(PROsfd osfd);
-NSPR_API(PRFileDesc*)  PR_ImportPipe(PROsfd osfd);
-NSPR_API(PRFileDesc*)  PR_ImportTCPSocket(PROsfd osfd);
-NSPR_API(PRFileDesc*)  PR_ImportUDPSocket(PROsfd osfd);
-
-
-/*
- *************************************************************************
- * FUNCTION: PR_CreateSocketPollFd
- * DESCRIPTION:
- *     Create a PRFileDesc wrapper for a native socket handle, for use with
- *	   PR_Poll only
- * INPUTS:
- *     None
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_CreateSocketPollFd returns a pointer
- *     to the PRFileDesc created for the native socket handle
- *     Returns a NULL pointer if the create of a new PRFileDesc failed
- *
- **************************************************************************
- */
-
-NSPR_API(PRFileDesc*)	PR_CreateSocketPollFd(PROsfd osfd);
-
-/*
- *************************************************************************
- * FUNCTION: PR_DestroySocketPollFd
- * DESCRIPTION:
- *     Destroy the PRFileDesc wrapper created by PR_CreateSocketPollFd
- * INPUTS:
- *     None
- * OUTPUTS:
- *     None
- * RETURN: PRFileDesc*
- *     Upon successful completion, PR_DestroySocketPollFd returns
- *	   PR_SUCCESS, else PR_FAILURE
- *
- **************************************************************************
- */
-
-NSPR_API(PRStatus) PR_DestroySocketPollFd(PRFileDesc *fd);
-
-
-/*
-** Macros for PR_Socket
-**
-** Socket types: PR_SOCK_STREAM, PR_SOCK_DGRAM
-*/
-
-#ifdef WIN32
-
-#define PR_SOCK_STREAM 1
-#define PR_SOCK_DGRAM 2
-
-#else /* WIN32 */
-
-#define PR_SOCK_STREAM SOCK_STREAM
-#define PR_SOCK_DGRAM SOCK_DGRAM
-
-#endif /* WIN32 */
-
-/*
-** Create a new Socket; this function is obsolete.
-*/
-NSPR_API(PRFileDesc*)	PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto);
-
-/* FUNCTION: PR_LockFile
-** DESCRIPTION:
-**    Lock a file for exclusive access.
-** RETURNS:
-**    PR_SUCCESS when the lock is held
-**    PR_FAILURE otherwise
-*/
-NSPR_API(PRStatus) PR_LockFile(PRFileDesc *fd);
-
-/* FUNCTION: PR_TLockFile
-** DESCRIPTION:
-**    Test and Lock a file for exclusive access.  Do not block if the
-**    file cannot be locked immediately.
-** RETURNS:
-**    PR_SUCCESS when the lock is held
-**    PR_FAILURE otherwise
-*/
-NSPR_API(PRStatus) PR_TLockFile(PRFileDesc *fd);
-
-/* FUNCTION: PR_UnlockFile
-** DESCRIPTION:
-**    Unlock a file which has been previously locked successfully by this
-**    process.
-** RETURNS:
-**    PR_SUCCESS when the lock is released
-**    PR_FAILURE otherwise
-*/
-NSPR_API(PRStatus) PR_UnlockFile(PRFileDesc *fd);
-
-/*
-** Emulate acceptread by accept and recv.
-*/
-NSPR_API(PRInt32) PR_EmulateAcceptRead(PRFileDesc *sd, PRFileDesc **nd,
-    PRNetAddr **raddr, void *buf, PRInt32 amount, PRIntervalTime timeout);
-
-/*
-** Emulate sendfile by reading from the file and writing to the socket.
-** The file is memory-mapped if memory-mapped files are supported.
-*/
-NSPR_API(PRInt32) PR_EmulateSendFile(
-    PRFileDesc *networkSocket, PRSendFileData *sendData,
-    PRTransmitFileFlags flags, PRIntervalTime timeout);
-
-#ifdef WIN32
-/* FUNCTION: PR_NTFast_AcceptRead
-** DESCRIPTION:
-**    NT has the notion of an "accept context", which is only needed in
-**    order to make certain calls.  By default, a socket connected via
-**    AcceptEx can only do a limited number of things without updating
-**    the acceptcontext.  The generic version of PR_AcceptRead always
-**    updates the accept context.  This version does not.
-**/
-NSPR_API(PRInt32) PR_NTFast_AcceptRead(PRFileDesc *sd, PRFileDesc **nd,
-              PRNetAddr **raddr, void *buf, PRInt32 amount, PRIntervalTime t);
-
-typedef void (*_PR_AcceptTimeoutCallback)(void *);
-
-/* FUNCTION: PR_NTFast_AcceptRead_WithTimeoutCallback
-** DESCRIPTION:
-**    The AcceptEx call combines the accept with the read function.  However,
-**    our daemon threads need to be able to wakeup and reliably flush their
-**    log buffers if the Accept times out.  However, with the current blocking
-**    interface to AcceptRead, there is no way for us to timeout the Accept;
-**    this is because when we timeout the Read, we can close the newly 
-**    socket and continue; but when we timeout the accept itself, there is no
-**    new socket to timeout.  So instead, this version of the function is
-**    provided.  After the initial timeout period elapses on the accept()
-**    portion of the function, it will call the callback routine and then
-**    continue the accept.   If the timeout occurs on the read, it will 
-**    close the connection and return error.
-*/
-NSPR_API(PRInt32) PR_NTFast_AcceptRead_WithTimeoutCallback(
-              PRFileDesc *sd, 
-              PRFileDesc **nd,
-              PRNetAddr **raddr, 
-              void *buf, 
-              PRInt32 amount, 
-              PRIntervalTime t,
-              _PR_AcceptTimeoutCallback callback, 
-              void *callback_arg);
-
-/* FUNCTION: PR_NTFast_Accept
-** DESCRIPTION:
-**    NT has the notion of an "accept context", which is only needed in
-**    order to make certain calls.  By default, a socket connected via
-**    AcceptEx can only do a limited number of things without updating
-**    the acceptcontext.  The generic version of PR_Accept always
-**    updates the accept context.  This version does not.
-**/
-NSPR_API(PRFileDesc*)	PR_NTFast_Accept(PRFileDesc *fd, PRNetAddr *addr,
-                                                PRIntervalTime timeout);
-
-/* FUNCTION: PR_NTFast_Update
-** DESCRIPTION:
-**    For sockets accepted with PR_NTFast_Accept or PR_NTFastAcceptRead,
-**    this function will update the accept context for those sockets,
-**    so that the socket can make general purpose socket calls.
-**    Without calling this, the only operations supported on the socket
-**    Are PR_Read, PR_Write, PR_Transmitfile, and PR_Close.
-*/
-NSPR_API(void) PR_NTFast_UpdateAcceptContext(PRFileDesc *acceptSock, 
-                                        PRFileDesc *listenSock);
-
-
-/* FUNCTION: PR_NT_CancelIo
-** DESCRIPTION:
-**    Cancel IO operations on fd.
-*/
-NSPR_API(PRStatus) PR_NT_CancelIo(PRFileDesc *fd);
-
-
-#endif /* WIN32 */
-
-PR_END_EXTERN_C
-
-#endif /* pprio_h___ */
diff --git a/openflow/usr/include/nspr/private/pprthred.h b/openflow/usr/include/nspr/private/pprthred.h
deleted file mode 100644
index eb60bae..0000000
--- a/openflow/usr/include/nspr/private/pprthred.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef pprthred_h___
-#define pprthred_h___
-
-/*
-** API for PR private functions.  These calls are to be used by internal
-** developers only.
-*/
-#include "nspr.h"
-
-#if defined(XP_OS2)
-#define INCL_DOS
-#define INCL_DOSERRORS
-#define INCL_WIN
-#include <os2.h>
-#endif
-
-PR_BEGIN_EXTERN_C
-
-/*---------------------------------------------------------------------------
-** THREAD PRIVATE FUNCTIONS
----------------------------------------------------------------------------*/
-
-/*
-** Associate a thread object with an existing native thread.
-** 	"type" is the type of thread object to attach
-** 	"priority" is the priority to assign to the thread
-** 	"stack" defines the shape of the threads stack
-**
-** This can return NULL if some kind of error occurs, or if memory is
-** tight. This call invokes "start(obj,arg)" and returns when the
-** function returns. The thread object is automatically destroyed.
-**
-** This call is not normally needed unless you create your own native
-** thread. PR_Init does this automatically for the primordial thread.
-*/
-NSPR_API(PRThread*) PR_AttachThread(PRThreadType type,
-                                     PRThreadPriority priority,
-				     PRThreadStack *stack);
-
-/*
-** Detach the nspr thread from the currently executing native thread.
-** The thread object will be destroyed and all related data attached
-** to it. The exit procs will be invoked.
-**
-** This call is not normally needed unless you create your own native
-** thread. PR_Exit will automatially detach the nspr thread object
-** created by PR_Init for the primordial thread.
-**
-** This call returns after the nspr thread object is destroyed.
-*/
-NSPR_API(void) PR_DetachThread(void);
-
-/*
-** Get the id of the named thread. Each thread is assigned a unique id
-** when it is created or attached.
-*/
-NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
-
-/*
-** Set the procedure that is called when a thread is dumped. The procedure
-** will be applied to the argument, arg, when called. Setting the procedure
-** to NULL effectively removes it.
-*/
-typedef void (*PRThreadDumpProc)(PRFileDesc *fd, PRThread *t, void *arg);
-NSPR_API(void) PR_SetThreadDumpProc(
-    PRThread* thread, PRThreadDumpProc dump, void *arg);
-
-/*
-** Get this thread's affinity mask.  The affinity mask is a 32 bit quantity
-** marking a bit for each processor this process is allowed to run on.
-** The processor mask is returned in the mask argument.
-** The least-significant-bit represents processor 0.
-**
-** Returns 0 on success, -1 on failure.
-*/
-NSPR_API(PRInt32) PR_GetThreadAffinityMask(PRThread *thread, PRUint32 *mask);
-
-/*
-** Set this thread's affinity mask.  
-**
-** Returns 0 on success, -1 on failure.
-*/
-NSPR_API(PRInt32) PR_SetThreadAffinityMask(PRThread *thread, PRUint32 mask );
-
-/*
-** Set the default CPU Affinity mask.
-**
-*/
-NSPR_API(PRInt32) PR_SetCPUAffinityMask(PRUint32 mask);
-
-/*
-** Show status of all threads to standard error output.
-*/
-NSPR_API(void) PR_ShowStatus(void);
-
-/*
-** Set thread recycle mode to on (1) or off (0)
-*/
-NSPR_API(void) PR_SetThreadRecycleMode(PRUint32 flag);
-
-
-/*---------------------------------------------------------------------------
-** THREAD PRIVATE FUNCTIONS FOR GARBAGE COLLECTIBLE THREADS           
----------------------------------------------------------------------------*/
-
-/* 
-** Only Garbage collectible threads participate in resume all, suspend all and 
-** enumeration operations.  They are also different during creation when
-** platform specific action may be needed (For example, all Solaris GC able
-** threads are bound threads).
-*/
-
-/*
-** Same as PR_CreateThread except that the thread is marked as garbage
-** collectible.
-*/
-NSPR_API(PRThread*) PR_CreateThreadGCAble(PRThreadType type,
-				     void (*start)(void *arg),
-				     void *arg,
-				     PRThreadPriority priority,
-				     PRThreadScope scope,
-				     PRThreadState state,
-				     PRUint32 stackSize);
-
-/*
-** Same as PR_AttachThread except that the thread being attached is marked as 
-** garbage collectible.
-*/
-NSPR_API(PRThread*) PR_AttachThreadGCAble(PRThreadType type,
-					PRThreadPriority priority,
-					PRThreadStack *stack);
-
-/*
-** Mark the thread as garbage collectible.
-*/
-NSPR_API(void) PR_SetThreadGCAble(void);
-
-/*
-** Unmark the thread as garbage collectible.
-*/
-NSPR_API(void) PR_ClearThreadGCAble(void);
-
-/*
-** This routine prevents all other GC able threads from running. This call is needed by 
-** the garbage collector.
-*/
-NSPR_API(void) PR_SuspendAll(void);
-
-/*
-** This routine unblocks all other GC able threads that were suspended from running by 
-** PR_SuspendAll(). This call is needed by the garbage collector.
-*/
-NSPR_API(void) PR_ResumeAll(void);
-
-/*
-** Return the thread stack pointer of the given thread. 
-** Needed by the garbage collector.
-*/
-NSPR_API(void *) PR_GetSP(PRThread *thread);
-
-/*
-** Save the registers that the GC would find interesting into the thread
-** "t". isCurrent will be non-zero if the thread state that is being
-** saved is the currently executing thread. Return the address of the
-** first register to be scanned as well as the number of registers to
-** scan in "np".
-**
-** If "isCurrent" is non-zero then it is allowed for the thread context
-** area to be used as scratch storage to hold just the registers
-** necessary for scanning.
-**
-** This function simply calls the internal function _MD_HomeGCRegisters().
-*/
-NSPR_API(PRWord *) PR_GetGCRegisters(PRThread *t, int isCurrent, int *np);
-
-/*
-** (Get|Set)ExecutionEnvironent
-**
-** Used by Java to associate it's execution environment so garbage collector
-** can find it. If return is NULL, then it's probably not a collectable thread.
-**
-** There's no locking required around these calls.
-*/
-NSPR_API(void*) GetExecutionEnvironment(PRThread *thread);
-NSPR_API(void) SetExecutionEnvironment(PRThread* thread, void *environment);
-
-/*
-** Enumeration function that applies "func(thread,i,arg)" to each active
-** thread in the process. The enumerator returns PR_SUCCESS if the enumeration
-** should continue, any other value is considered failure, and enumeration
-** stops, returning the failure value from PR_EnumerateThreads.
-** Needed by the garbage collector.
-*/
-typedef PRStatus (PR_CALLBACK *PREnumerator)(PRThread *t, int i, void *arg);
-NSPR_API(PRStatus) PR_EnumerateThreads(PREnumerator func, void *arg);
-
-/* 
-** Signature of a thread stack scanning function. It is applied to every
-** contiguous group of potential pointers within a thread. Count denotes the
-** number of pointers. 
-*/
-typedef PRStatus 
-(PR_CALLBACK *PRScanStackFun)(PRThread* t,
-			      void** baseAddr, PRUword count, void* closure);
-
-/*
-** Applies scanFun to all contiguous groups of potential pointers 
-** within a thread. This includes the stack, registers, and thread-local
-** data. If scanFun returns a status value other than PR_SUCCESS the scan
-** is aborted, and the status value is returned. 
-*/
-NSPR_API(PRStatus)
-PR_ThreadScanStackPointers(PRThread* t,
-                           PRScanStackFun scanFun, void* scanClosure);
-
-/* 
-** Calls PR_ThreadScanStackPointers for every thread.
-*/
-NSPR_API(PRStatus)
-PR_ScanStackPointers(PRScanStackFun scanFun, void* scanClosure);
-
-/*
-** Returns a conservative estimate on the amount of stack space left
-** on a thread in bytes, sufficient for making decisions about whether 
-** to continue recursing or not.
-*/
-NSPR_API(PRUword)
-PR_GetStackSpaceLeft(PRThread* t);
-
-/*---------------------------------------------------------------------------
-** THREAD CPU PRIVATE FUNCTIONS             
----------------------------------------------------------------------------*/
-
-/*
-** Get a pointer to the primordial CPU.
-*/
-NSPR_API(struct _PRCPU *) _PR_GetPrimordialCPU(void);
-
-/*---------------------------------------------------------------------------
-** THREAD SYNCHRONIZATION PRIVATE FUNCTIONS
----------------------------------------------------------------------------*/
-
-/*
-** Create a new named monitor (named for debugging purposes).
-**  Monitors are re-entrant locks with a built-in condition variable.
-**
-** This may fail if memory is tight or if some operating system resource
-** is low.
-*/
-NSPR_API(PRMonitor*) PR_NewNamedMonitor(const char* name);
-
-/*
-** Test and then lock the lock if it's not already locked by some other
-** thread. Return PR_FALSE if some other thread owned the lock at the
-** time of the call.
-*/
-NSPR_API(PRBool) PR_TestAndLock(PRLock *lock);
-
-/*
-** Test and then enter the mutex associated with the monitor if it's not
-** already entered by some other thread. Return PR_FALSE if some other
-** thread owned the mutex at the time of the call.
-*/
-NSPR_API(PRBool) PR_TestAndEnterMonitor(PRMonitor *mon);
-
-/*
-** Return the number of times that the current thread has entered the
-** mutex. Returns zero if the current thread has not entered the mutex.
-*/
-NSPR_API(PRIntn) PR_GetMonitorEntryCount(PRMonitor *mon);
-
-/*
-** Just like PR_CEnterMonitor except that if the monitor is owned by
-** another thread NULL is returned.
-*/
-NSPR_API(PRMonitor*) PR_CTestAndEnterMonitor(void *address);
-
-/*---------------------------------------------------------------------------
-** PLATFORM-SPECIFIC INITIALIZATION FUNCTIONS
----------------------------------------------------------------------------*/
-#if defined(IRIX)
-/*
-** Irix specific initialization funtion to be called before PR_Init
-** is called by the application. Sets the CONF_INITUSERS and CONF_INITSIZE
-** attributes of the shared arena set up by nspr.
-**
-** The environment variables _NSPR_IRIX_INITUSERS and _NSPR_IRIX_INITSIZE
-** can also be used to set these arena attributes. If _NSPR_IRIX_INITUSERS
-** is set, but not _NSPR_IRIX_INITSIZE, the value of the CONF_INITSIZE
-** attribute of the nspr arena is scaled as a function of the
-** _NSPR_IRIX_INITUSERS value.
-** 
-** If the _PR_Irix_Set_Arena_Params() is called in addition to setting the
-** environment variables, the values of the environment variables are used.
-** 
-*/
-NSPR_API(void) _PR_Irix_Set_Arena_Params(PRInt32 initusers, PRInt32 initsize);
-
-#endif /* IRIX */
-
-#if defined(XP_OS2)
-/*
-** These functions need to be called at the start and end of a thread.
-** An EXCEPTIONREGISTRATIONRECORD must be declared on the stack and its
-** address passed to the two functions.
-*/
-NSPR_API(void) PR_OS2_SetFloatExcpHandler(EXCEPTIONREGISTRATIONRECORD* e);
-NSPR_API(void) PR_OS2_UnsetFloatExcpHandler(EXCEPTIONREGISTRATIONRECORD* e);
-#endif /* XP_OS2 */
-
-/* I think PR_GetMonitorEntryCount is useless. All you really want is this... */
-#define PR_InMonitor(m)		(PR_GetMonitorEntryCount(m) > 0)
-
-/*---------------------------------------------------------------------------
-** Special X-Lock hack for client
----------------------------------------------------------------------------*/
-
-#ifdef XP_UNIX
-extern void PR_XLock(void);
-extern void PR_XUnlock(void);
-extern PRBool PR_XIsLocked(void);
-#endif /* XP_UNIX */
-
-PR_END_EXTERN_C
-
-#endif /* pprthred_h___ */
diff --git a/openflow/usr/include/nspr/private/prpriv.h b/openflow/usr/include/nspr/private/prpriv.h
deleted file mode 100644
index f45eee4..0000000
--- a/openflow/usr/include/nspr/private/prpriv.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prpriv_h___
-#define prpriv_h___
-
-/*
- * NSPR 2.0 Private API
- */
-
-#include "private/pprio.h"
-#include "private/pprthred.h"
-
-#endif /* prpriv_h___ */
diff --git a/openflow/usr/include/nspr/prlink.h b/openflow/usr/include/nspr/prlink.h
deleted file mode 100644
index ea45ef8..0000000
--- a/openflow/usr/include/nspr/prlink.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prlink_h___
-#define prlink_h___
-
-/*
-** API to static and dynamic linking.
-*/
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRLibrary PRLibrary;
-
-typedef struct PRStaticLinkTable {
-    const char *name;
-    void (*fp)(void);
-} PRStaticLinkTable;
-
-/*
-** Change the default library path to the given string. The string is
-** copied. This call will fail if it runs out of memory.
-**
-** The string provided as 'path' is copied. The caller can do whatever is
-** convenient with the argument when the function is complete.
-*/
-NSPR_API(PRStatus) PR_SetLibraryPath(const char *path);
-
-/*
-** Return a character string which contains the path used to search for
-** dynamically loadable libraries.
-**
-** The returned value is basically a copy of a PR_SetLibraryPath().
-** The storage is allocated by the runtime and becomes the responsibilty
-** of the caller.
-*/
-NSPR_API(char*) PR_GetLibraryPath(void);
-
-/*
-** Given a directory name "dir" and a library name "lib" construct a full
-** path name that will refer to the actual dynamically loaded
-** library. This does not test for existance of said file, it just
-** constructs the full filename. The name constructed is system dependent
-** and prepared for PR_LoadLibrary. The result must be free'd when the
-** caller is done with it.
-**
-** The storage for the result is allocated by the runtime and becomes the
-** responsibility of the caller.
-*/
-NSPR_API(char*) PR_GetLibraryName(const char *dir, const char *lib);
-
-/*
-**
-** Free the memory allocated, for the caller, by PR_GetLibraryName
-*/
-NSPR_API(void) PR_FreeLibraryName(char *mem);
-
-/*
-** Given a library "name" try to load the library. The argument "name"
-** is a machine-dependent name for the library, such as the full pathname
-** returned by PR_GetLibraryName.  If the library is already loaded,
-** this function will avoid loading the library twice.
-**
-** If the library is loaded successfully, then a pointer to the PRLibrary
-** structure representing the library is returned.  Otherwise, NULL is
-** returned.
-**
-** This increments the reference count of the library.
-*/
-NSPR_API(PRLibrary*) PR_LoadLibrary(const char *name);
-
-/*
-** Each operating system has its preferred way of specifying
-** a file in the file system.  Most operating systems use
-** a pathname.  Mac OS Classic, on the other hand, uses the FSSpec
-** structure to specify a file. PRLibSpec allows NSPR clients
-** to use the type of file specification that is most efficient
-** for a particular platform.
-**
-** On some operating systems such as Mac OS Classic, a shared library
-** may contain code fragments that can be individually loaded.
-** PRLibSpec also allows NSPR clients to identify a code fragment
-** in a library, if code fragments are supported by the OS.
-** A code fragment can be specified by name or by an integer index.
-**
-** Right now PRLibSpec supports four types of library specification:
-** a pathname in the native character encoding, a Mac code fragment
-** by name, a Mac code fragment by index, and a UTF-16 pathname.
-*/
-
-typedef enum PRLibSpecType {
-    PR_LibSpec_Pathname,
-    PR_LibSpec_MacNamedFragment,   /* obsolete (for Mac OS Classic) */
-    PR_LibSpec_MacIndexedFragment, /* obsolete (for Mac OS Classic) */
-    PR_LibSpec_PathnameU           /* supported only on Win32 */ 
-} PRLibSpecType;
-
-struct FSSpec; /* Mac OS Classic FSSpec */
-
-typedef struct PRLibSpec {
-    PRLibSpecType type;
-    union {
-        /* if type is PR_LibSpec_Pathname */
-        const char *pathname;
-
-        /* if type is PR_LibSpec_MacNamedFragment */
-        struct {
-            const struct FSSpec *fsspec;
-            const char *name;
-        } mac_named_fragment;      /* obsolete (for Mac OS Classic) */
-
-        /* if type is PR_LibSpec_MacIndexedFragment */
-        struct {
-            const struct FSSpec *fsspec;
-            PRUint32 index;
-        } mac_indexed_fragment;    /* obsolete (for Mac OS Classic) */
-
-        /* if type is PR_LibSpec_PathnameU */
-        const PRUnichar *pathname_u; /* supported only on Win32 */
-    } value;
-} PRLibSpec;
-
-/*
-** The following bit flags may be or'd together and passed
-** as the 'flags' argument to PR_LoadLibraryWithFlags.
-** Flags not supported by the underlying OS are ignored.
-*/
-
-#define PR_LD_LAZY   0x1  /* equivalent to RTLD_LAZY on Unix */
-#define PR_LD_NOW    0x2  /* equivalent to RTLD_NOW on Unix */
-#define PR_LD_GLOBAL 0x4  /* equivalent to RTLD_GLOBAL on Unix */
-#define PR_LD_LOCAL  0x8  /* equivalent to RTLD_LOCAL on Unix */
-/* The following is equivalent to LOAD_WITH_ALTERED_SEARCH_PATH on Windows */
-#define PR_LD_ALT_SEARCH_PATH  0x10  
-/*                0x8000     reserved for NSPR internal use */
-
-/*
-** Load the specified library, in the manner specified by 'flags'.
-*/
-
-NSPR_API(PRLibrary *)
-PR_LoadLibraryWithFlags(
-    PRLibSpec libSpec,    /* the shared library */
-    PRIntn flags          /* flags that affect the loading */
-);
-
-/*
-** Unload a previously loaded library. If the library was a static
-** library then the static link table will no longer be referenced. The
-** associated PRLibrary object is freed.
-**
-** PR_FAILURE is returned if the library cannot be unloaded.
-**
-** This function decrements the reference count of the library.
-*/
-NSPR_API(PRStatus) PR_UnloadLibrary(PRLibrary *lib);
-
-/*
-** Given the name of a procedure, return the address of the function that
-** implements the procedure, or NULL if no such function can be
-** found. This does not find symbols in the main program (the ".exe");
-** use PR_LoadStaticLibrary to register symbols in the main program.
-**
-** This function does not modify the reference count of the library.
-*/
-NSPR_API(void*) PR_FindSymbol(PRLibrary *lib, const char *name);
-
-/*
-** Similar to PR_FindSymbol, except that the return value is a pointer to
-** a function, and not a pointer to void. Casting between a data pointer
-** and a function pointer is not portable according to the C standard.
-** Any function pointer can be cast to any other function pointer.
-**
-** This function does not modify the reference count of the library.
-*/
-typedef void (*PRFuncPtr)(void);
-NSPR_API(PRFuncPtr) PR_FindFunctionSymbol(PRLibrary *lib, const char *name);
-
-/*
-** Finds a symbol in one of the currently loaded libraries. Given the
-** name of a procedure, return the address of the function that
-** implements the procedure, and return the library that contains that
-** symbol, or NULL if no such function can be found. This does not find
-** symbols in the main program (the ".exe"); use PR_AddStaticLibrary to
-** register symbols in the main program.  
-**
-** This increments the reference count of the library.
-*/
-NSPR_API(void*) PR_FindSymbolAndLibrary(const char *name,
-						      PRLibrary* *lib);
-
-/*
-** Similar to PR_FindSymbolAndLibrary, except that the return value is
-** a pointer to a function, and not a pointer to void. Casting between a
-** data pointer and a function pointer is not portable according to the C
-** standard. Any function pointer can be cast to any other function pointer.
-**
-** This increments the reference count of the library.
-*/
-NSPR_API(PRFuncPtr) PR_FindFunctionSymbolAndLibrary(const char *name,
-						      PRLibrary* *lib);
-
-/*
-** Register a static link table with the runtime under the name
-** "name". The symbols present in the static link table will be made
-** available to PR_FindSymbol. If "name" is null then the symbols will be
-** made available to the library which represents the executable. The
-** tables are not copied.
-**
-** Returns the library object if successful, null otherwise.
-**
-** This increments the reference count of the library.
-*/
-NSPR_API(PRLibrary*) PR_LoadStaticLibrary(
-    const char *name, const PRStaticLinkTable *table);
-
-/*
-** Return the pathname of the file that the library "name" was loaded
-** from. "addr" is the address of a function defined in the library.
-**
-** The caller is responsible for freeing the result with PR_Free.
-*/
-NSPR_API(char *) PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr);
-
-PR_END_EXTERN_C
-
-#endif /* prlink_h___ */
diff --git a/openflow/usr/include/nspr/prlock.h b/openflow/usr/include/nspr/prlock.h
deleted file mode 100644
index bc76a0e..0000000
--- a/openflow/usr/include/nspr/prlock.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File:		prlock.h
-** Description:	API to basic locking functions of NSPR.
-**
-**
-** NSPR provides basic locking mechanisms for thread synchronization.  Locks 
-** are lightweight resource contention controls that prevent multiple threads 
-** from accessing something (code/data) simultaneously.
-**/
-
-#ifndef prlock_h___
-#define prlock_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-/*
- * PRLock --
- *
- *     NSPR represents the lock as an opaque entity to the client of the
- *	   API.  All routines operate on a pointer to this opaque entity.
- */
-
-typedef struct PRLock PRLock;
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/***********************************************************************
-** FUNCTION:    PR_NewLock
-** DESCRIPTION:
-**  Returns a pointer to a newly created opaque lock object.
-** INPUTS:      void
-** OUTPUTS:     void
-** RETURN:      PRLock*
-**   If the lock can not be created because of resource constraints, NULL
-**   is returned.
-**  
-***********************************************************************/
-NSPR_API(PRLock*) PR_NewLock(void);
-
-/***********************************************************************
-** FUNCTION:    PR_DestroyLock
-** DESCRIPTION:
-**  Destroys a given opaque lock object.
-** INPUTS:      PRLock *lock
-**              Lock to be freed.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-NSPR_API(void) PR_DestroyLock(PRLock *lock);
-
-/***********************************************************************
-** FUNCTION:    PR_Lock
-** DESCRIPTION:
-**  Lock a lock.
-** INPUTS:      PRLock *lock
-**              Lock to locked.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-NSPR_API(void) PR_Lock(PRLock *lock);
-
-/***********************************************************************
-** FUNCTION:    PR_Unlock
-** DESCRIPTION:
-**  Unlock a lock.  Unlocking an unlocked lock has undefined results.
-** INPUTS:      PRLock *lock
-**              Lock to unlocked.
-** OUTPUTS:     void
-** RETURN:      PR_STATUS
-**              Returns PR_FAILURE if the caller does not own the lock.
-***********************************************************************/
-NSPR_API(PRStatus) PR_Unlock(PRLock *lock);
-
-/***********************************************************************
-** MACRO:    PR_ASSERT_CURRENT_THREAD_OWNS_LOCK
-** DESCRIPTION:
-**  If the current thread owns |lock|, this assertion is guaranteed to
-**  succeed.  Otherwise, the behavior of this function is undefined.
-** INPUTS:      PRLock *lock
-**              Lock to assert ownership of.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-#define PR_ASSERT_CURRENT_THREAD_OWNS_LOCK(/* PrLock* */ lock) \
-    PR_AssertCurrentThreadOwnsLock(lock)
-#else
-#define PR_ASSERT_CURRENT_THREAD_OWNS_LOCK(/* PrLock* */ lock)
-#endif
-
-/* Don't call this function directly. */
-NSPR_API(void) PR_AssertCurrentThreadOwnsLock(PRLock *lock);
-
-PR_END_EXTERN_C
-
-#endif /* prlock_h___ */
diff --git a/openflow/usr/include/nspr/prlog.h b/openflow/usr/include/nspr/prlog.h
deleted file mode 100644
index 4a291dc..0000000
--- a/openflow/usr/include/nspr/prlog.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prlog_h___
-#define prlog_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** prlog.h -- Declare interfaces to NSPR's Logging service
-**
-** NSPR provides a logging service that is used by NSPR itself and is
-** available to client programs.
-**
-** To use the service from a client program, you should create a
-** PRLogModuleInfo structure by calling PR_NewLogModule(). After
-** creating the LogModule, you can write to the log using the PR_LOG()
-** macro.
-**
-** Initialization of the log service is handled by NSPR initialization.
-**
-** At execution time, you must enable the log service. To enable the
-** log service, set the environment variable: NSPR_LOG_MODULES
-** variable.
-**
-** NSPR_LOG_MODULES variable has the form:
-**
-**     <moduleName>:<value>[, <moduleName>:<value>]*
-**
-** Where:
-**  <moduleName> is the name passed to PR_NewLogModule().
-**  <value> is a numeric constant, e.g. 5. This value is the maximum
-** value of a log event, enumerated by PRLogModuleLevel, that you want
-** written to the log.
-** 
-** For example: to record all events of greater value than or equal to
-** PR_LOG_ERROR for a LogModule names "gizmo", say:
-** 
-** set NSPR_LOG_MODULES=gizmo:2
-** 
-** Note that you must specify the numeric value of PR_LOG_ERROR.
-** 
-** Special LogModule names are provided for controlling NSPR's log
-** service at execution time. These controls should be set in the
-** NSPR_LOG_MODULES environment variable at execution time to affect
-** NSPR's log service for your application.
-** 
-** The special LogModule "all" enables all LogModules. To enable all
-** LogModule calls to PR_LOG(), say:
-** 
-** set NSPR_LOG_MODULES=all:5
-** 
-** The special LogModule name "sync" tells the NSPR log service to do
-** unbuffered logging.
-** 
-** The special LogModule name "bufsize:<size>" tells NSPR to set the
-** log buffer to <size>.
-**
-** The environment variable NSPR_LOG_FILE specifies the log file to use
-** unless the default of "stderr" is acceptable. For MS Windows
-** systems, NSPR_LOG_FILE can be set to a special value: "WinDebug"
-** (case sensitive). This value causes PR_LOG() output to be written
-** using the Windows API OutputDebugString(). OutputDebugString()
-** writes to the debugger window; some people find this helpful.
-** 
-**
-** To put log messages in your programs, use the PR_LOG macro:
-**
-**     PR_LOG(<module>, <level>, (<printfString>, <args>*));
-**
-** Where <module> is the address of a PRLogModuleInfo structure, and
-** <level> is one of the levels defined by the enumeration:
-** PRLogModuleLevel. <args> is a printf() style of argument list. That
-** is: (fmtstring, ...).
-**
-** Example:
-** 
-** main() {
-**    PRIntn one = 1;
-**    PRLogModuleInfo * myLm = PR_NewLogModule("gizmo");
-**    PR_LOG( myLm, PR_LOG_ALWAYS, ("Log this! %d\n", one)); 
-**    return; 
-** }
-** 
-** Note the use of printf() style arguments as the third agrument(s) to
-** PR_LOG().
-** 
-** After compiling and linking you application, set the environment:
-** 
-** set NSPR_LOG_MODULES=gizmo:5
-** set NSPR_LOG_FILE=logfile.txt
-** 
-** When you execute your application, the string "Log this! 1" will be
-** written to the file "logfile.txt".
-** 
-** Note to NSPR engineers: a number of PRLogModuleInfo structures are
-** defined and initialized in prinit.c. See this module for ideas on
-** what to log where.
-** 
-*/
-
-typedef enum PRLogModuleLevel {
-    PR_LOG_NONE = 0,                /* nothing */
-    PR_LOG_ALWAYS = 1,              /* always printed */
-    PR_LOG_ERROR = 2,               /* error messages */
-    PR_LOG_WARNING = 3,             /* warning messages */
-    PR_LOG_DEBUG = 4,               /* debug messages */
-
-    PR_LOG_NOTICE = PR_LOG_DEBUG,   /* notice messages */
-    PR_LOG_WARN = PR_LOG_WARNING,   /* warning messages */
-    PR_LOG_MIN = PR_LOG_DEBUG,      /* minimal debugging messages */
-    PR_LOG_MAX = PR_LOG_DEBUG       /* maximal debugging messages */
-} PRLogModuleLevel;
-
-/*
-** One of these structures is created for each module that uses logging.
-**    "name" is the name of the module
-**    "level" is the debugging level selected for that module
-*/
-typedef struct PRLogModuleInfo {
-    const char *name;
-    PRLogModuleLevel level;
-    struct PRLogModuleInfo *next;
-} PRLogModuleInfo;
-
-/*
-** Create a new log module.
-*/
-NSPR_API(PRLogModuleInfo*) PR_NewLogModule(const char *name);
-
-/*
-** Set the file to use for logging. Returns PR_FALSE if the file cannot
-** be created
-*/
-NSPR_API(PRBool) PR_SetLogFile(const char *name);
-
-/*
-** Set the size of the logging buffer. If "buffer_size" is zero then the
-** logging becomes "synchronous" (or unbuffered).
-*/
-NSPR_API(void) PR_SetLogBuffering(PRIntn buffer_size);
-
-/*
-** Print a string to the log. "fmt" is a PR_snprintf format type. All
-** messages printed to the log are preceeded by the name of the thread
-** and a time stamp. Also, the routine provides a missing newline if one
-** is not provided.
-*/
-NSPR_API(void) PR_LogPrint(const char *fmt, ...);
-
-/*
-** Flush the log to its file.
-*/
-NSPR_API(void) PR_LogFlush(void);
-
-NSPR_API(void) PR_Assert(const char *s, const char *file, PRIntn ln)
-    PR_PRETEND_NORETURN;
-
-#if defined(DEBUG) || defined(FORCE_PR_LOG)
-#define PR_LOGGING 1
-
-#define PR_LOG_TEST(_module,_level) \
-    ((_module)->level >= (_level))
-
-/*
-** Log something.
-**    "module" is the address of a PRLogModuleInfo structure
-**    "level" is the desired logging level
-**    "args" is a variable length list of arguments to print, in the following
-**       format:  ("printf style format string", ...)
-*/
-#define PR_LOG(_module,_level,_args)     \
-    PR_BEGIN_MACRO             \
-      if (PR_LOG_TEST(_module,_level)) { \
-      PR_LogPrint _args;         \
-      }                     \
-    PR_END_MACRO
-
-#else /* defined(DEBUG) || defined(FORCE_PR_LOG) */
-
-#undef PR_LOGGING
-#define PR_LOG_TEST(module,level) 0
-#define PR_LOG(module,level,args)
-
-#endif /* defined(DEBUG) || defined(FORCE_PR_LOG) */
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#ifdef PR_LOGGING
-#define PR_LOG_BEGIN    PR_LOG
-#define PR_LOG_END      PR_LOG
-#define PR_LOG_DEFINE   PR_NewLogModule
-#else
-#define PR_LOG_BEGIN(module,level,args)
-#define PR_LOG_END(module,level,args)
-#define PR_LOG_DEFINE(_name)    NULL
-#endif /* PR_LOGGING */
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-
-#define PR_ASSERT(_expr) \
-    ((_expr)?((void)0):PR_Assert(# _expr,__FILE__,__LINE__))
-
-#define PR_NOT_REACHED(_reasonStr) \
-    PR_Assert(_reasonStr,__FILE__,__LINE__)
-
-#else
-
-#define PR_ASSERT(expr) ((void) 0)
-#define PR_NOT_REACHED(reasonStr)
-
-#endif /* defined(DEBUG) || defined(FORCE_PR_ASSERT) */
-
-PR_END_EXTERN_C
-
-#endif /* prlog_h___ */
diff --git a/openflow/usr/include/nspr/prlong.h b/openflow/usr/include/nspr/prlong.h
deleted file mode 100644
index df1f30b..0000000
--- a/openflow/usr/include/nspr/prlong.h
+++ /dev/null
@@ -1,403 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File:                prlong.h
-** Description: Portable access to 64 bit numerics
-**
-** Long-long (64-bit signed integer type) support. Some C compilers
-** don't support 64 bit integers yet, so we use these macros to
-** support both machines that do and don't.
-**/
-#ifndef prlong_h___
-#define prlong_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/***********************************************************************
-** DEFINES:     LL_MaxInt
-**              LL_MinInt
-**              LL_Zero
-**              LL_MaxUint
-** DESCRIPTION:
-**      Various interesting constants and static variable
-**      initializer
-***********************************************************************/
-NSPR_API(PRInt64) LL_MaxInt(void);
-NSPR_API(PRInt64) LL_MinInt(void);
-NSPR_API(PRInt64) LL_Zero(void);
-NSPR_API(PRUint64) LL_MaxUint(void);
-
-#if defined(HAVE_LONG_LONG)
-
-/* Keep this in sync with prtypes.h. */
-#if PR_BYTES_PER_LONG == 8 && !defined(PR_ALTERNATE_INT64_TYPEDEF)
-#define LL_MAXINT   9223372036854775807L
-#define LL_MININT   (-LL_MAXINT - 1L)
-#define LL_ZERO     0L
-#define LL_MAXUINT  18446744073709551615UL
-#define LL_INIT(hi, lo)  ((hi ## L << 32) + lo ## L)
-#elif defined(WIN32) && !defined(__GNUC__)
-#define LL_MAXINT   9223372036854775807i64
-#define LL_MININT   (-LL_MAXINT - 1i64)
-#define LL_ZERO     0i64
-#define LL_MAXUINT  18446744073709551615ui64
-#define LL_INIT(hi, lo)  ((hi ## i64 << 32) + lo ## i64)
-#else
-#define LL_MAXINT   9223372036854775807LL
-#define LL_MININT   (-LL_MAXINT - 1LL)
-#define LL_ZERO     0LL
-#define LL_MAXUINT  18446744073709551615ULL
-#define LL_INIT(hi, lo)  ((hi ## LL << 32) + lo ## LL)
-#endif
-
-/***********************************************************************
-** MACROS:      LL_*
-** DESCRIPTION:
-**      The following macros define portable access to the 64 bit
-**      math facilities.
-**
-***********************************************************************/
-
-/***********************************************************************
-** MACROS:      LL_<relational operators>
-**
-**  LL_IS_ZERO        Test for zero
-**  LL_EQ             Test for equality
-**  LL_NE             Test for inequality
-**  LL_GE_ZERO        Test for zero or positive
-**  LL_CMP            Compare two values
-***********************************************************************/
-#define LL_IS_ZERO(a)       ((a) == 0)
-#define LL_EQ(a, b)         ((a) == (b))
-#define LL_NE(a, b)         ((a) != (b))
-#define LL_GE_ZERO(a)       ((a) >= 0)
-#define LL_CMP(a, op, b)    ((PRInt64)(a) op (PRInt64)(b))
-#define LL_UCMP(a, op, b)   ((PRUint64)(a) op (PRUint64)(b))
-
-/***********************************************************************
-** MACROS:      LL_<logical operators>
-**
-**  LL_AND            Logical and
-**  LL_OR             Logical or
-**  LL_XOR            Logical exclusion
-**  LL_OR2            A disgusting deviation
-**  LL_NOT            Negation (one's complement)
-***********************************************************************/
-#define LL_AND(r, a, b)        ((r) = (a) & (b))
-#define LL_OR(r, a, b)        ((r) = (a) | (b))
-#define LL_XOR(r, a, b)        ((r) = (a) ^ (b))
-#define LL_OR2(r, a)        ((r) = (r) | (a))
-#define LL_NOT(r, a)        ((r) = ~(a))
-
-/***********************************************************************
-** MACROS:      LL_<mathematical operators>
-**
-**  LL_NEG            Negation (two's complement)
-**  LL_ADD            Summation (two's complement)
-**  LL_SUB            Difference (two's complement)
-***********************************************************************/
-#define LL_NEG(r, a)        ((r) = -(a))
-#define LL_ADD(r, a, b)     ((r) = (a) + (b))
-#define LL_SUB(r, a, b)     ((r) = (a) - (b))
-
-/***********************************************************************
-** MACROS:      LL_<mathematical operators>
-**
-**  LL_MUL            Product (two's complement)
-**  LL_DIV            Quotient (two's complement)
-**  LL_MOD            Modulus (two's complement)
-***********************************************************************/
-#define LL_MUL(r, a, b)        ((r) = (a) * (b))
-#define LL_DIV(r, a, b)        ((r) = (a) / (b))
-#define LL_MOD(r, a, b)        ((r) = (a) % (b))
-
-/***********************************************************************
-** MACROS:      LL_<shifting operators>
-**
-**  LL_SHL            Shift left [0..64] bits
-**  LL_SHR            Shift right [0..64] bits with sign extension
-**  LL_USHR           Unsigned shift right [0..64] bits
-**  LL_ISHL           Signed shift left [0..64] bits
-***********************************************************************/
-#define LL_SHL(r, a, b)     ((r) = (PRInt64)(a) << (b))
-#define LL_SHR(r, a, b)     ((r) = (PRInt64)(a) >> (b))
-#define LL_USHR(r, a, b)    ((r) = (PRUint64)(a) >> (b))
-#define LL_ISHL(r, a, b)    ((r) = (PRInt64)(a) << (b))
-
-/***********************************************************************
-** MACROS:      LL_<conversion operators>
-**
-**  LL_L2I            Convert to signed 32 bit
-**  LL_L2UI           Convert to unsigned 32 bit
-**  LL_L2F            Convert to floating point
-**  LL_L2D            Convert to floating point
-**  LL_I2L            Convert signed to 64 bit
-**  LL_UI2L           Convert unsigned to 64 bit
-**  LL_F2L            Convert float to 64 bit
-**  LL_D2L            Convert float to 64 bit
-***********************************************************************/
-#define LL_L2I(i, l)        ((i) = (PRInt32)(l))
-#define LL_L2UI(ui, l)        ((ui) = (PRUint32)(l))
-#define LL_L2F(f, l)        ((f) = (PRFloat64)(l))
-#define LL_L2D(d, l)        ((d) = (PRFloat64)(l))
-
-#define LL_I2L(l, i)        ((l) = (PRInt64)(i))
-#define LL_UI2L(l, ui)        ((l) = (PRInt64)(ui))
-#define LL_F2L(l, f)        ((l) = (PRInt64)(f))
-#define LL_D2L(l, d)        ((l) = (PRInt64)(d))
-
-/***********************************************************************
-** MACROS:      LL_UDIVMOD
-** DESCRIPTION:
-**  Produce both a quotient and a remainder given an unsigned 
-** INPUTS:      PRUint64 a: The dividend of the operation
-**              PRUint64 b: The quotient of the operation
-** OUTPUTS:     PRUint64 *qp: pointer to quotient
-**              PRUint64 *rp: pointer to remainder
-***********************************************************************/
-#define LL_UDIVMOD(qp, rp, a, b) \
-    (*(qp) = ((PRUint64)(a) / (b)), \
-     *(rp) = ((PRUint64)(a) % (b)))
-
-#else  /* !HAVE_LONG_LONG */
-
-#define LL_MAXINT   LL_MaxInt()
-#define LL_MININT   LL_MinInt()
-#define LL_ZERO     LL_Zero()
-#define LL_MAXUINT  LL_MaxUint()
-
-#ifdef IS_LITTLE_ENDIAN
-#define LL_INIT(hi, lo) {PR_UINT32(lo), PR_UINT32(hi)}
-#else
-#define LL_INIT(hi, lo) {PR_UINT32(hi), PR_UINT32(lo)}
-#endif
-
-#define LL_IS_ZERO(a)        (((a).hi == 0) && ((a).lo == 0))
-#define LL_EQ(a, b)        (((a).hi == (b).hi) && ((a).lo == (b).lo))
-#define LL_NE(a, b)        (((a).hi != (b).hi) || ((a).lo != (b).lo))
-#define LL_GE_ZERO(a)        (((a).hi >> 31) == 0)
-
-#define LL_CMP(a, op, b)    (((a).hi == (b).hi) ? ((a).lo op (b).lo) : \
-                 ((PRInt32)(a).hi op (PRInt32)(b).hi))
-#define LL_UCMP(a, op, b)    (((a).hi == (b).hi) ? ((a).lo op (b).lo) : \
-                 ((a).hi op (b).hi))
-
-#define LL_AND(r, a, b)        ((r).lo = (a).lo & (b).lo, \
-                 (r).hi = (a).hi & (b).hi)
-#define LL_OR(r, a, b)        ((r).lo = (a).lo | (b).lo, \
-                 (r).hi = (a).hi | (b).hi)
-#define LL_XOR(r, a, b)        ((r).lo = (a).lo ^ (b).lo, \
-                 (r).hi = (a).hi ^ (b).hi)
-#define LL_OR2(r, a)        ((r).lo = (r).lo | (a).lo, \
-                 (r).hi = (r).hi | (a).hi)
-#define LL_NOT(r, a)        ((r).lo = ~(a).lo, \
-                 (r).hi = ~(a).hi)
-
-#define LL_NEG(r, a)        ((r).lo = -(PRInt32)(a).lo, \
-                 (r).hi = -(PRInt32)(a).hi - ((r).lo != 0))
-#define LL_ADD(r, a, b) { \
-    PRInt64 _a, _b; \
-    _a = a; _b = b; \
-    (r).lo = _a.lo + _b.lo; \
-    (r).hi = _a.hi + _b.hi + ((r).lo < _b.lo); \
-}
-
-#define LL_SUB(r, a, b) { \
-    PRInt64 _a, _b; \
-    _a = a; _b = b; \
-    (r).lo = _a.lo - _b.lo; \
-    (r).hi = _a.hi - _b.hi - (_a.lo < _b.lo); \
-}
-
-#define LL_MUL(r, a, b) { \
-    PRInt64 _a, _b; \
-    _a = a; _b = b; \
-    LL_MUL32(r, _a.lo, _b.lo); \
-    (r).hi += _a.hi * _b.lo + _a.lo * _b.hi; \
-}
-
-#define _lo16(a)        ((a) & PR_BITMASK(16))
-#define _hi16(a)        ((a) >> 16)
-
-#define LL_MUL32(r, a, b) { \
-     PRUint32 _a1, _a0, _b1, _b0, _y0, _y1, _y2, _y3; \
-     _a1 = _hi16(a), _a0 = _lo16(a); \
-     _b1 = _hi16(b), _b0 = _lo16(b); \
-     _y0 = _a0 * _b0; \
-     _y1 = _a0 * _b1; \
-     _y2 = _a1 * _b0; \
-     _y3 = _a1 * _b1; \
-     _y1 += _hi16(_y0);                         /* can't carry */ \
-     _y1 += _y2;                                /* might carry */ \
-     if (_y1 < _y2)    \
-        _y3 += (PRUint32)(PR_BIT(16));  /* propagate */ \
-     (r).lo = (_lo16(_y1) << 16) + _lo16(_y0); \
-     (r).hi = _y3 + _hi16(_y1); \
-}
-
-#define LL_UDIVMOD(qp, rp, a, b)    ll_udivmod(qp, rp, a, b)
-
-NSPR_API(void) ll_udivmod(PRUint64 *qp, PRUint64 *rp, PRUint64 a, PRUint64 b);
-
-#define LL_DIV(r, a, b) { \
-    PRInt64 _a, _b; \
-    PRUint32 _negative = (PRInt32)(a).hi < 0; \
-    if (_negative) { \
-    LL_NEG(_a, a); \
-    } else { \
-    _a = a; \
-    } \
-    if ((PRInt32)(b).hi < 0) { \
-    _negative ^= 1; \
-    LL_NEG(_b, b); \
-    } else { \
-    _b = b; \
-    } \
-    LL_UDIVMOD(&(r), 0, _a, _b); \
-    if (_negative) \
-    LL_NEG(r, r); \
-}
-
-#define LL_MOD(r, a, b) { \
-    PRInt64 _a, _b; \
-    PRUint32 _negative = (PRInt32)(a).hi < 0; \
-    if (_negative) { \
-    LL_NEG(_a, a); \
-    } else { \
-    _a = a; \
-    } \
-    if ((PRInt32)(b).hi < 0) { \
-    LL_NEG(_b, b); \
-    } else { \
-    _b = b; \
-    } \
-    LL_UDIVMOD(0, &(r), _a, _b); \
-    if (_negative) \
-    LL_NEG(r, r); \
-}
-
-#define LL_SHL(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-        _a = a; \
-        if ((b) < 32) { \
-        (r).lo = _a.lo << ((b) & 31); \
-        (r).hi = (_a.hi << ((b) & 31)) | (_a.lo >> (32 - (b))); \
-    } else { \
-        (r).lo = 0; \
-        (r).hi = _a.lo << ((b) & 31); \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-/* a is an PRInt32, b is PRInt32, r is PRInt64 */
-#define LL_ISHL(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-    _a.lo = (a); \
-    _a.hi = 0; \
-        if ((b) < 32) { \
-        (r).lo = (a) << ((b) & 31); \
-        (r).hi = ((a) >> (32 - (b))); \
-    } else { \
-        (r).lo = 0; \
-        (r).hi = (a) << ((b) & 31); \
-    } \
-    } else { \
-    (r).lo = (a); \
-    (r).hi = 0; \
-    } \
-}
-
-#define LL_SHR(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-        _a = a; \
-    if ((b) < 32) { \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> ((b) & 31)); \
-        (r).hi = (PRInt32)_a.hi >> ((b) & 31); \
-    } else { \
-        (r).lo = (PRInt32)_a.hi >> ((b) & 31); \
-        (r).hi = (PRInt32)_a.hi >> 31; \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-#define LL_USHR(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-        _a = a; \
-    if ((b) < 32) { \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> ((b) & 31)); \
-        (r).hi = _a.hi >> ((b) & 31); \
-    } else { \
-        (r).lo = _a.hi >> ((b) & 31); \
-        (r).hi = 0; \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-#define LL_L2I(i, l)        ((i) = (l).lo)
-#define LL_L2UI(ui, l)        ((ui) = (l).lo)
-#define LL_L2F(f, l)        { double _d; LL_L2D(_d, l); (f) = (PRFloat64)_d; }
-
-#define LL_L2D(d, l) { \
-    int _negative; \
-    PRInt64 _absval; \
- \
-    _negative = (l).hi >> 31; \
-    if (_negative) { \
-    LL_NEG(_absval, l); \
-    } else { \
-    _absval = l; \
-    } \
-    (d) = (double)_absval.hi * 4.294967296e9 + _absval.lo; \
-    if (_negative) \
-    (d) = -(d); \
-}
-
-#define LL_I2L(l, i)        { PRInt32 _i = ((PRInt32)(i)) >> 31; (l).lo = (i); (l).hi = _i; }
-#define LL_UI2L(l, ui)      ((l).lo = (ui), (l).hi = 0)
-#define LL_F2L(l, f)        { double _d = (double)f; LL_D2L(l, _d); }
-
-#define LL_D2L(l, d) { \
-    int _negative; \
-    double _absval, _d_hi; \
-    PRInt64 _lo_d; \
- \
-    _negative = ((d) < 0); \
-    _absval = _negative ? -(d) : (d); \
- \
-    (l).hi = _absval / 4.294967296e9; \
-    (l).lo = 0; \
-    LL_L2D(_d_hi, l); \
-    _absval -= _d_hi; \
-    _lo_d.hi = 0; \
-    if (_absval < 0) { \
-    _lo_d.lo = -_absval; \
-    LL_SUB(l, l, _lo_d); \
-    } else { \
-    _lo_d.lo = _absval; \
-    LL_ADD(l, l, _lo_d); \
-    } \
- \
-    if (_negative) \
-    LL_NEG(l, l); \
-}
-
-#endif /* !HAVE_LONG_LONG */
-
-PR_END_EXTERN_C
-
-#endif /* prlong_h___ */
diff --git a/openflow/usr/include/nspr/prmem.h b/openflow/usr/include/nspr/prmem.h
deleted file mode 100644
index c7cb5fb..0000000
--- a/openflow/usr/include/nspr/prmem.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File: prmem.h
-** Description: API to NSPR memory management functions
-**
-*/
-#ifndef prmem_h___
-#define prmem_h___
-
-#include "prtypes.h"
-#include <stdlib.h>
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Thread safe memory allocation.
-**
-** NOTE: pr wraps up malloc, free, calloc, realloc so they are already
-** thread safe (and are not declared here - look in stdlib.h).
-*/
-
-/*
-** PR_Malloc, PR_Calloc, PR_Realloc, and PR_Free have the same signatures
-** as their libc equivalent malloc, calloc, realloc, and free, and have
-** the same semantics.  (Note that the argument type size_t is replaced
-** by PRUint32.)  Memory allocated by PR_Malloc, PR_Calloc, or PR_Realloc
-** must be freed by PR_Free.
-*/
-
-NSPR_API(void *) PR_Malloc(PRUint32 size);
-
-NSPR_API(void *) PR_Calloc(PRUint32 nelem, PRUint32 elsize);
-
-NSPR_API(void *) PR_Realloc(void *ptr, PRUint32 size);
-
-NSPR_API(void) PR_Free(void *ptr);
-
-/*
-** The following are some convenience macros defined in terms of
-** PR_Malloc, PR_Calloc, PR_Realloc, and PR_Free.
-*/
-
-/***********************************************************************
-** FUNCTION:	PR_MALLOC()
-** DESCRIPTION:
-**   PR_NEW() allocates an untyped item of size _size from the heap.
-** INPUTS:  _size: size in bytes of item to be allocated
-** OUTPUTS:	untyped pointer to the node allocated
-** RETURN:	pointer to node or error returned from malloc().
-***********************************************************************/
-#define PR_MALLOC(_bytes) (PR_Malloc((_bytes)))
-
-/***********************************************************************
-** FUNCTION:	PR_NEW()
-** DESCRIPTION:
-**   PR_NEW() allocates an item of type _struct from the heap.
-** INPUTS:  _struct: a data type
-** OUTPUTS:	pointer to _struct
-** RETURN:	pointer to _struct or error returns from malloc().
-***********************************************************************/
-#define PR_NEW(_struct) ((_struct *) PR_MALLOC(sizeof(_struct)))
-
-/***********************************************************************
-** FUNCTION:	PR_REALLOC()
-** DESCRIPTION:
-**   PR_REALLOC() re-allocates _ptr bytes from the heap as a _size
-**   untyped item.
-** INPUTS:	_ptr: pointer to node to reallocate
-**          _size: size of node to allocate
-** OUTPUTS:	pointer to node allocated
-** RETURN:	pointer to node allocated
-***********************************************************************/
-#define PR_REALLOC(_ptr, _size) (PR_Realloc((_ptr), (_size)))
-
-/***********************************************************************
-** FUNCTION:	PR_CALLOC()
-** DESCRIPTION:
-**   PR_CALLOC() allocates a _size bytes untyped item from the heap
-**   and sets the allocated memory to all 0x00.
-** INPUTS:	_size: size of node to allocate
-** OUTPUTS:	pointer to node allocated
-** RETURN:	pointer to node allocated
-***********************************************************************/
-#define PR_CALLOC(_size) (PR_Calloc(1, (_size)))
-
-/***********************************************************************
-** FUNCTION:	PR_NEWZAP()
-** DESCRIPTION:
-**   PR_NEWZAP() allocates an item of type _struct from the heap
-**   and sets the allocated memory to all 0x00.
-** INPUTS:	_struct: a data type
-** OUTPUTS:	pointer to _struct
-** RETURN:	pointer to _struct
-***********************************************************************/
-#define PR_NEWZAP(_struct) ((_struct*)PR_Calloc(1, sizeof(_struct)))
-
-/***********************************************************************
-** FUNCTION:	PR_DELETE()
-** DESCRIPTION:
-**   PR_DELETE() unallocates an object previosly allocated via PR_NEW()
-**   or PR_NEWZAP() to the heap.
-** INPUTS:	pointer to previously allocated object
-** OUTPUTS:	the referenced object is returned to the heap
-** RETURN:	void
-***********************************************************************/
-#define PR_DELETE(_ptr) { PR_Free(_ptr); (_ptr) = NULL; }
-
-/***********************************************************************
-** FUNCTION:	PR_FREEIF()
-** DESCRIPTION:
-**   PR_FREEIF() conditionally unallocates an object previously allocated
-**   vial PR_NEW() or PR_NEWZAP(). If the pointer to the object is
-**   equal to zero (0), the object is not released.
-** INPUTS:	pointer to previously allocated object
-** OUTPUTS:	the referenced object is conditionally returned to the heap
-** RETURN:	void
-***********************************************************************/
-#define PR_FREEIF(_ptr)	if (_ptr) PR_DELETE(_ptr)
-
-PR_END_EXTERN_C
-
-#endif /* prmem_h___ */
diff --git a/openflow/usr/include/nspr/prmon.h b/openflow/usr/include/nspr/prmon.h
deleted file mode 100644
index 374e298..0000000
--- a/openflow/usr/include/nspr/prmon.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prmon_h___
-#define prmon_h___
-
-#include "prtypes.h"
-#include "prinrval.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRMonitor PRMonitor;
-
-/*
-** Create a new monitor. Monitors are re-entrant locks with a single built-in
-** condition variable.
-**
-** This may fail if memory is tight or if some operating system resource
-** is low.
-*/
-NSPR_API(PRMonitor*) PR_NewMonitor(void);
-
-/*
-** Destroy a monitor. The caller is responsible for guaranteeing that the
-** monitor is no longer in use. There must be no thread waiting on the monitor's
-** condition variable and that the lock is not held.
-**
-*/
-NSPR_API(void) PR_DestroyMonitor(PRMonitor *mon);
-
-/*
-** Enter the lock associated with the monitor. If the calling thread currently
-** is in the monitor, the call to enter will silently succeed. In either case,
-** it will increment the entry count by one.
-*/
-NSPR_API(void) PR_EnterMonitor(PRMonitor *mon);
-
-/*
-** Decrement the entry count associated with the monitor. If the decremented
-** entry count is zero, the monitor is exited. Returns PR_FAILURE if the
-** calling thread has not entered the monitor.
-*/
-NSPR_API(PRStatus) PR_ExitMonitor(PRMonitor *mon);
-
-/*
-** Wait for a notify on the monitor's condition variable. Sleep for "ticks"
-** amount of time (if "ticks" is PR_INTERVAL_NO_TIMEOUT then the sleep is
-** indefinite).
-**
-** While the thread is waiting it exits the monitor (as if it called
-** PR_ExitMonitor as many times as it had called PR_EnterMonitor).  When
-** the wait has finished the thread regains control of the monitors lock
-** with the same entry count as before the wait began.
-**
-** The thread waiting on the monitor will be resumed when the monitor is
-** notified (assuming the thread is the next in line to receive the
-** notify) or when the "ticks" timeout elapses.
-**
-** Returns PR_FAILURE if the caller has not entered the monitor.
-*/
-NSPR_API(PRStatus) PR_Wait(PRMonitor *mon, PRIntervalTime ticks);
-
-/*
-** Notify a thread waiting on the monitor's condition variable. If a thread
-** is waiting on the condition variable (using PR_Wait) then it is awakened
-** and attempts to reenter the monitor.
-*/
-NSPR_API(PRStatus) PR_Notify(PRMonitor *mon);
-
-/*
-** Notify all of the threads waiting on the monitor's condition variable.
-** All of threads waiting on the condition are scheduled to reenter the
-** monitor.
-*/
-NSPR_API(PRStatus) PR_NotifyAll(PRMonitor *mon);
-
-/*
-** PR_ASSERT_CURRENT_THREAD_IN_MONITOR
-** If the current thread is in |mon|, this assertion is guaranteed to
-** succeed.  Otherwise, the behavior of this function is undefined.
-*/
-#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-#define PR_ASSERT_CURRENT_THREAD_IN_MONITOR(/* PRMonitor* */ mon) \
-    PR_AssertCurrentThreadInMonitor(mon)
-#else
-#define PR_ASSERT_CURRENT_THREAD_IN_MONITOR(/* PRMonitor* */ mon)
-#endif
-
-/* Don't call this function directly. */
-NSPR_API(void) PR_AssertCurrentThreadInMonitor(PRMonitor *mon);
-
-PR_END_EXTERN_C
-
-#endif /* prmon_h___ */
diff --git a/openflow/usr/include/nspr/prmwait.h b/openflow/usr/include/nspr/prmwait.h
deleted file mode 100644
index a902d90..0000000
--- a/openflow/usr/include/nspr/prmwait.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#if defined(_PRMWAIT_H)
-#else
-#define _PRMWAIT_H
-
-#include "prio.h"
-#include "prtypes.h"
-#include "prclist.h"
-
-PR_BEGIN_EXTERN_C
-
-/********************************************************************************/
-/********************************************************************************/
-/********************************************************************************/
-/******************************       WARNING        ****************************/
-/********************************************************************************/
-/**************************** This is work in progress. *************************/
-/************************** Do not make any assumptions *************************/
-/************************** about the stability of this *************************/
-/************************** API or the underlying imple- ************************/
-/************************** mentation.                   ************************/
-/********************************************************************************/
-/********************************************************************************/
-
-/*
-** STRUCTURE:   PRWaitGroup
-** DESCRIPTION:
-**      The client may define several wait groups in order to semantically
-**      tie a collection of file descriptors for a single purpose. This allows
-**      easier dispatching of threads that returned with active file descriptors
-**      from the wait function.
-*/
-typedef struct PRWaitGroup PRWaitGroup;
-
-/*
-** ENUMERATION: PRMWStatus
-** DESCRIPTION:
-**      This enumeration is used to indicate the completion status of
-**      a receive wait object. Generally stated, a positive value indicates
-**      that the operation is not yet complete. A zero value indicates
-**      success (similar to PR_SUCCESS) and any negative value is an
-**      indication of failure. The reason for the failure can be retrieved
-**      by calling PR_GetError().
-**
-**  PR_MW_PENDING       The operation is still pending. None of the other
-**                      fields of the object are currently valid.
-**  PR_MW_SUCCESS       The operation is complete and it was successful.
-**  PR_MW_FAILURE       The operation failed. The reason for the failure
-**                      can be retrieved by calling PR_GetError().
-**  PR_MW_TIMEOUT       The amount of time allowed for by the object's
-**                      'timeout' field has expired w/o the operation
-**                      otherwise coming to closure.
-**  PR_MW_INTERRUPT     The operation was cancelled, either by the client
-**                      calling PR_CancelWaitFileDesc() or destroying the
-**                      entire wait group (PR_DestroyWaitGroup()).
-*/
-typedef enum PRMWStatus
-{
-    PR_MW_PENDING = 1,
-    PR_MW_SUCCESS = 0,
-    PR_MW_FAILURE = -1,
-    PR_MW_TIMEOUT = -2,
-    PR_MW_INTERRUPT = -3
-} PRMWStatus;
-
-/*
-** STRUCTURE:   PRMemoryDescriptor
-** DESCRIPTION:
-**      THis is a descriptor for an interval of memory. It contains a
-**      pointer to the first byte of that memory and the length (in
-**      bytes) of the interval.
-*/
-typedef struct PRMemoryDescriptor
-{
-    void *start;                /* pointer to first byte of memory */
-    PRSize length;              /* length (in bytes) of memory interval */
-} PRMemoryDescriptor;
-
-/*
-** STRUCTURE:   PRMWaitClientData
-** DESCRIPTION:
-**      An opague stucture for which a client MAY give provide a concrete
-**      definition and associate with a receive descriptor. The NSPR runtime
-**      does not manage this field. It is completely up to the client.
-*/
-typedef struct PRMWaitClientData PRMWaitClientData;
-
-/*
-** STRUCTURE:   PRRecvWait
-** DESCRIPTION:
-**      A receive wait object contains the file descriptor that is subject
-**      to the wait and the amount of time (beginning epoch established
-**      when the object is presented to the runtime) the the channel should
-**      block before abandoning the process.
-**
-**      The success of the wait operation will be noted in the object's
-**      'outcome' field. The fields are not valid when the NSPR runtime
-**      is in possession of the object.
-**
-**      The memory descriptor describes an interval of writable memory
-**      in the caller's address space where data from an initial read
-**      can be placed. The description may indicate a null interval.
-*/
-typedef struct PRRecvWait 
-{
-    PRCList internal;           /* internal runtime linkages */
-
-    PRFileDesc *fd;             /* file descriptor associated w/ object */
-    PRMWStatus outcome;         /* outcome of the current/last operation */
-    PRIntervalTime timeout;     /* time allowed for entire operation */
-
-    PRInt32 bytesRecv;          /* number of bytes transferred into buffer */
-    PRMemoryDescriptor buffer;  /* where to store first segment of input data */
-    PRMWaitClientData *client;  /* pointer to arbitrary client defined data */
-} PRRecvWait;
-
-/*
-** STRUCTURE:   PRMWaitEnumerator
-** DESCRIPTION:
-**      An enumeration object is used to store the state of an existing
-**      enumeration over a wait group. The opaque object must be allocated
-**      by the client and the reference presented on each call to the
-**      pseudo-stateless enumerator. The enumeration objects are sharable
-**      only in serial fashion.
-*/
-typedef struct PRMWaitEnumerator PRMWaitEnumerator;
-
-
-/*
-** FUNCTION:    PR_AddWaitFileDesc
-** DESCRIPTION:
-**      This function will effectively add a file descriptor to the
-**      list of those waiting for network receive. The new descriptor
-**      will be semantically tied to the wait group specified.
-**
-**      The ownership for the storage pointed to by 'desc' is temporarily
-**      passed over the the NSPR runtime. It will be handed back by the
-**      function PR_WaitRecvReady().
-**
-**  INPUTS
-**      group       A reference to a PRWaitGroup or NULL. Wait groups are
-**                  created by calling PR_CreateWaitGroup() and are used
-**                  to semantically group various file descriptors by the
-**                  client's application.
-**      desc        A reference to a valid PRRecvWait. The object of the
-**                  reference must be preserved and not be modified
-**                  until its ownership is returned to the client.
-**  RETURN
-**      PRStatus    An indication of success. If equal to PR_FAILUE details
-**                  of the failure are avaiable via PR_GetError().
-**
-**  ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**                  Invalid 'group' identifier or duplicate 'desc' object.
-**      PR_OUT_OF_MEMORY_ERROR
-**                  Insuffient memory for internal data structures.
-**      PR_INVALID_STATE_ERROR
-**                  The group is being destroyed.
-*/
-NSPR_API(PRStatus) PR_AddWaitFileDesc(PRWaitGroup *group, PRRecvWait *desc);
-
-/*
-** FUNCTION:    PR_WaitRecvReady
-** DESCRIPTION:
-**      PR_WaitRecvReady will block the calling thread until one of the
-**      file descriptors that have been added via PR_AddWaitFileDesc is
-**      available for input I/O.
-**  INPUT
-**      group       A pointer to a valid PRWaitGroup or NULL (the null
-**                  group. The function will block the caller until a
-**                  channel from the wait group becomes ready for receive
-**                  or there is some sort of error.
-**  RETURN
-**      PRReciveWait
-**                  When the caller is resumed it is either returned a
-**                  valid pointer to a previously added receive wait or
-**                  a NULL. If the latter, the function has terminated
-**                  for a reason that can be determined by calling
-**                  PR_GetError().
-**                  If a valid pointer is returned, the reference is to the
-**                  file descriptor contained in the receive wait object.
-**                  The outcome of the wait operation may still fail, and
-**                  if it has, that fact will be noted in the object's
-**                  outcome field. Details can be retrieved from PR_GetError().
-**
-**  ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**                  The 'group' is not known by the runtime.
-**      PR_PENDING_INTERRUPT_ERROR
-                    The thread was interrupted.
-**      PR_INVALID_STATE_ERROR
-**                  The group is being destroyed.
-*/
-NSPR_API(PRRecvWait*) PR_WaitRecvReady(PRWaitGroup *group);
-
-/*
-** FUNCTION:    PR_CancelWaitFileDesc
-** DESCRIPTION:
-**      PR_CancelWaitFileDesc is provided as a means for cancelling operations
-**      on objects previously submitted by use of PR_AddWaitFileDesc(). If
-**      the runtime knows of the object, it will be marked as having failed
-**      because it was interrupted (similar to PR_Interrupt()). The first
-**      available thread waiting on the group will be made to return the
-**      PRRecvWait object with the outcome noted.
-**
-**  INPUTS
-**      group       The wait group under which the wait receive object was
-**                  added.
-**      desc        A pointer to the wait receive object that is to be
-**                  cancelled.
-**  RETURN
-**      PRStatus    If the wait receive object was located and associated
-**                  with the specified wait group, the status returned will
-**                  be PR_SUCCESS. There is still a race condition that would
-**                  permit the offected object to complete normally, but it
-**                  is assured that it will complete in the near future.
-**                  If the receive object or wait group are invalid, the
-**                  function will return with a status of PR_FAILURE.
-**
-**  ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**                  The 'group' argument is not recognized as a valid group.
-**      PR_COLLECTION_EMPTY_ERROR
-**                  There are no more receive wait objects in the group's
-**                  collection.
-**      PR_INVALID_STATE_ERROR
-**                  The group is being destroyed.
-*/
-NSPR_API(PRStatus) PR_CancelWaitFileDesc(PRWaitGroup *group, PRRecvWait *desc);
-
-/*
-** FUNCTION:    PR_CancelWaitGroup
-** DESCRIPTION:
-**      PR_CancelWaitGroup is provided as a means for cancelling operations
-**      on objects previously submitted by use of PR_AddWaitFileDesc(). Each
-**      successive call will return a pointer to a PRRecvWait object that
-**      was previously registered via PR_AddWaitFileDesc(). If no wait
-**      objects are associated with the wait group, a NULL will be returned.
-**      This function should be called in a loop until a NULL is returned
-**      to reclaim all the wait objects prior to calling PR_DestroyWaitGroup().
-**
-**  INPUTS
-**      group       The wait group under which the wait receive object was
-**                  added.
-**  RETURN
-**      PRRecvWait* If the wait group is valid and at least one receive wait
-**                  object is present in the group, that object will be
-**                  marked as PR_MW_INTERRUPT'd and removed from the group's
-**                  queues. Otherwise a NULL will be returned and the reason
-**                  for the NULL may be retrieved by calling PR_GetError().
-**
-**  ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**      PR_GROUP_EMPTY_ERROR
-*/
-NSPR_API(PRRecvWait*) PR_CancelWaitGroup(PRWaitGroup *group);
-
-/*
-** FUNCTION:    PR_CreateWaitGroup
-** DESCRIPTION:
-**      A wait group is an opaque object that a client may create in order
-**      to semantically group various wait requests. Each wait group is
-**      unique, including the default wait group (NULL). A wait request
-**      that was added under a wait group will only be serviced by a caller
-**      that specified the same wait group.
-**
-**  INPUT
-**      size        The size of the hash table to be used to contain the
-**                  receive wait objects. This is just the initial size.
-**                  It will grow as it needs to, but to avoid that hassle
-**                  one can suggest a suitable size initially. It should
-**                  be ~30% larger than the maximum number of receive wait
-**                  objects expected.
-**  RETURN
-**      PRWaitGroup If successful, the function will return a pointer to an
-**                  object that was allocated by and owned by the runtime.
-**                  The reference remains valid until it is explicitly destroyed
-**                  by calling PR_DestroyWaitGroup().
-**
-**  ERRORS
-**      PR_OUT_OF_MEMORY_ERROR
-*/
-NSPR_API(PRWaitGroup*) PR_CreateWaitGroup(PRInt32 size);
-
-/*
-** FUNCTION:    PR_DestroyWaitGroup
-** DESCRIPTION:
-**      Undo the effects of PR_CreateWaitGroup(). Any receive wait operations
-**      on the group will be treated as if the each had been the target of a
-**      PR_CancelWaitFileDesc().
-**
-**  INPUT
-**      group       Reference to a wait group previously allocated using
-**                  PR_CreateWaitGroup().
-**  RETURN
-**      PRStatus    Will be PR_SUCCESS if the wait group was valid and there
-**                  are no receive wait objects in that group. Otherwise
-**                  will indicate PR_FAILURE.
-**
-**  ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**                  The 'group' argument does not reference a known object.
-**      PR_INVALID_STATE_ERROR
-**                  The group still contains receive wait objects.
-*/
-NSPR_API(PRStatus) PR_DestroyWaitGroup(PRWaitGroup *group);
-
-/*
-** FUNCTION:    PR_CreateMWaitEnumerator
-** DESCRIPTION:
-**      The PR_CreateMWaitEnumerator() function returns a reference to an
-**      opaque PRMWaitEnumerator object. The enumerator object is required
-**      as an argument for each successive call in the stateless enumeration
-**      of the indicated wait group.
-**
-**      group       The wait group that the enumeration is intended to
-**                  process. It may be be the default wait group (NULL).
-** RETURN
-**      PRMWaitEnumerator* group
-**                  A reference to an object that will be used to store
-**                  intermediate state of enumerations.
-** ERRORS
-**      Errors are indicated by the function returning a NULL.
-**      PR_INVALID_ARGUMENT_ERROR
-**                  The 'group' argument does not reference a known object.
-**      PR_OUT_OF_MEMORY_ERROR
-*/
-NSPR_API(PRMWaitEnumerator*) PR_CreateMWaitEnumerator(PRWaitGroup *group);
-
-/*
-** FUNCTION:    PR_DestroyMWaitEnumerator
-** DESCRIPTION:
-**      Destroys the object created by PR_CreateMWaitEnumerator(). The reference
-**      used as an argument becomes invalid.
-**
-** INPUT
-**      PRMWaitEnumerator* enumerator
-**          The PRMWaitEnumerator object to destroy.
-** RETURN
-**      PRStatus
-**          PR_SUCCESS if successful, PR_FAILURE otherwise.
-** ERRORS
-**      PR_INVALID_ARGUMENT_ERROR
-**                  The enumerator is invalid.
-*/
-NSPR_API(PRStatus) PR_DestroyMWaitEnumerator(PRMWaitEnumerator* enumerator);
-
-/*
-** FUNCTION:    PR_EnumerateWaitGroup
-** DESCRIPTION:
-**      PR_EnumerateWaitGroup is a thread safe enumerator over a wait group.
-**      Each call to the enumerator must present a valid PRMWaitEnumerator
-**      rererence and a pointer to the "previous" element returned from the
-**      enumeration process or a NULL.
-**
-**      An enumeration is started by passing a NULL as the "previous" value.
-**      Subsequent calls to the enumerator must pass in the result of the
-**      previous call. The enumeration end is signaled by the runtime returning
-**      a NULL as the result.
-**
-**      Modifications to the content of the wait group are allowed during
-**      an enumeration. The effect is that the enumeration may have to be
-**      "reset" and that may result in duplicates being returned from the
-**      enumeration.
-**
-**      An enumeration may be abandoned at any time. The runtime is not
-**      keeping any state, so there are no issues in that regard.
-*/
-NSPR_API(PRRecvWait*) PR_EnumerateWaitGroup(
-    PRMWaitEnumerator *enumerator, const PRRecvWait *previous);
-   
-PR_END_EXTERN_C
-
-#endif /* defined(_PRMWAIT_H) */
-
-/* prmwait.h */
diff --git a/openflow/usr/include/nspr/prnetdb.h b/openflow/usr/include/nspr/prnetdb.h
deleted file mode 100644
index 49b77b1..0000000
--- a/openflow/usr/include/nspr/prnetdb.h
+++ /dev/null
@@ -1,467 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prnetdb_h___
-#define prnetdb_h___
-
-#include "prtypes.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-
-/*
- *********************************************************************
- *  Translate an Internet address to/from a character string
- *********************************************************************
- */
-NSPR_API(PRStatus) PR_StringToNetAddr(
-    const char *string, PRNetAddr *addr);
-
-NSPR_API(PRStatus) PR_NetAddrToString(
-    const PRNetAddr *addr, char *string, PRUint32 size);
-
-/*
-** Structures returned by network data base library.  All addresses are
-** supplied in host order, and returned in network order (suitable for
-** use in system calls).
-*/
-/*
-** Beware that WINSOCK.H defines h_addrtype and h_length as short.
-** Client code does direct struct copies of hostent to PRHostEnt and
-** hence the ifdef.
-*/
-typedef struct PRHostEnt {
-    char *h_name;       /* official name of host */
-    char **h_aliases;   /* alias list */
-#ifdef WIN32
-    PRInt16 h_addrtype; /* host address type */
-    PRInt16 h_length;   /* length of address */
-#else
-    PRInt32 h_addrtype; /* host address type */
-    PRInt32 h_length;   /* length of address */
-#endif
-    char **h_addr_list; /* list of addresses from name server */
-} PRHostEnt;
-
-/* A safe size to use that will mostly work... */
-#if (defined(AIX) && defined(_THREAD_SAFE)) || defined(OSF1)
-#define PR_NETDB_BUF_SIZE sizeof(struct protoent_data)
-#else
-#define PR_NETDB_BUF_SIZE 1024
-#endif
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_GetHostByName()
-** Lookup a host by name.
-**
-** INPUTS:
-**  char *hostname      Character string defining the host name of interest
-**  char *buf           A scratch buffer for the runtime to return result.
-**                      This buffer is allocated by the caller.
-**  PRIntn bufsize      Number of bytes in 'buf'. A recommnded value to
-**                      use is PR_NETDB_BUF_SIZE.
-** OUTPUTS:
-**  PRHostEnt *hostentry
-**                      This structure is filled in by the runtime if
-**                      the function returns PR_SUCCESS. This structure
-**                      is allocated by the caller.
-** RETURN:
-**  PRStatus            PR_SUCCESS if the lookup succeeds. If it fails
-**                      the result will be PR_FAILURE and the reason
-**                      for the failure can be retrieved by PR_GetError().
-***********************************************************************/
-NSPR_API(PRStatus) PR_GetHostByName(
-    const char *hostname, char *buf, PRIntn bufsize, PRHostEnt *hostentry);
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_GetIPNodeByName()
-** Lookup a host by name. Equivalent to getipnodebyname(AI_DEFAULT)
-** of RFC 2553.
-**
-** INPUTS:
-**  char *hostname      Character string defining the host name of interest
-**  PRUint16 af         Address family (either PR_AF_INET or PR_AF_INET6)
-**  PRIntn flags        Specifies the types of addresses that are searched
-**                      for and the types of addresses that are returned.
-**                      The only supported flag is PR_AI_DEFAULT.
-**  char *buf           A scratch buffer for the runtime to return result.
-**                      This buffer is allocated by the caller.
-**  PRIntn bufsize      Number of bytes in 'buf'. A recommnded value to
-**                      use is PR_NETDB_BUF_SIZE.
-** OUTPUTS:
-**  PRHostEnt *hostentry
-**                      This structure is filled in by the runtime if
-**                      the function returns PR_SUCCESS. This structure
-**                      is allocated by the caller.
-** RETURN:
-**  PRStatus            PR_SUCCESS if the lookup succeeds. If it fails
-**                      the result will be PR_FAILURE and the reason
-**                      for the failure can be retrieved by PR_GetError().
-***********************************************************************/
-
-
-#define PR_AI_ALL         0x08
-#define PR_AI_V4MAPPED    0x10
-#define PR_AI_ADDRCONFIG  0x20
-#define PR_AI_NOCANONNAME 0x8000
-#define PR_AI_DEFAULT     (PR_AI_V4MAPPED | PR_AI_ADDRCONFIG)
-
-NSPR_API(PRStatus) PR_GetIPNodeByName(
-    const char *hostname,
-    PRUint16 af,
-    PRIntn flags,
-    char *buf,
-    PRIntn bufsize,
-    PRHostEnt *hostentry);
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_GetHostByAddr()
-** Lookup a host entry by its network address.
-**
-** INPUTS:
-**  char *hostaddr      IP address of host in question
-**  char *buf           A scratch buffer for the runtime to return result.
-**                      This buffer is allocated by the caller.
-**  PRIntn bufsize      Number of bytes in 'buf'. A recommnded value to
-**                      use is PR_NETDB_BUF_SIZE.
-** OUTPUTS:
-**  PRHostEnt *hostentry
-**                      This structure is filled in by the runtime if
-**                      the function returns PR_SUCCESS. This structure
-**                      is allocated by the caller.
-** RETURN:
-**  PRStatus            PR_SUCCESS if the lookup succeeds. If it fails
-**                      the result will be PR_FAILURE and the reason
-**                      for the failure can be retrieved by PR_GetError().
-***********************************************************************/
-NSPR_API(PRStatus) PR_GetHostByAddr(
-    const PRNetAddr *hostaddr, char *buf, PRIntn bufsize, PRHostEnt *hostentry);
-
-/***********************************************************************
-** FUNCTION:	PR_EnumerateHostEnt()	
-** DESCRIPTION:
-**  A stateless enumerator over a PRHostEnt structure acquired from
-**  PR_GetHostByName() PR_GetHostByAddr() to evaluate the possible
-**  network addresses.
-**
-** INPUTS:
-**  PRIntn  enumIndex   Index of the enumeration. The enumeration starts
-**                      and ends with a value of zero.
-**
-**  PRHostEnt *hostEnt  A pointer to a host entry struct that was
-**                      previously returned by PR_GetHostByName() or
-**                      PR_GetHostByAddr().
-**
-**  PRUint16 port       The port number to be assigned as part of the
-**                      PRNetAddr.
-**
-** OUTPUTS:
-**  PRNetAddr *address  A pointer to an address structure that will be
-**                      filled in by the call to the enumeration if the
-**                      result of the call is greater than zero.
-**
-** RETURN:
-**  PRIntn              The value that should be used for the next call
-**                      of the enumerator ('enumIndex'). The enumeration
-**                      is ended if this value is returned zero.
-**                      If a value of -1 is returned, the enumeration
-**                      has failed. The reason for the failure can be
-**                      retrieved by calling PR_GetError().
-***********************************************************************/
-NSPR_API(PRIntn) PR_EnumerateHostEnt(
-    PRIntn enumIndex, const PRHostEnt *hostEnt, PRUint16 port, PRNetAddr *address);
-
-/***********************************************************************
-** FUNCTION: PR_InitializeNetAddr(), 
-** DESCRIPTION:
-**  Initialize the fields of a PRNetAddr, assigning well known values as
-**  appropriate.
-**
-** INPUTS
-**  PRNetAddrValue val  The value to be assigned to the IP Address portion
-**                      of the network address. This can only specify the
-**                      special well known values that are equivalent to
-**                      INADDR_ANY and INADDR_LOOPBACK.
-**
-**  PRUint16 port       The port number to be assigned in the structure.
-**
-** OUTPUTS:
-**  PRNetAddr *addr     The address to be manipulated.
-**
-** RETURN:
-**  PRStatus            To indicate success or failure. If the latter, the
-**                      reason for the failure can be retrieved by calling
-**                      PR_GetError();
-***********************************************************************/
-typedef enum PRNetAddrValue
-{
-    PR_IpAddrNull,      /* do NOT overwrite the IP address */
-    PR_IpAddrAny,       /* assign logical INADDR_ANY to IP address */
-    PR_IpAddrLoopback,  /* assign logical INADDR_LOOPBACK  */
-    PR_IpAddrV4Mapped   /* IPv4 mapped address */
-} PRNetAddrValue;
-
-NSPR_API(PRStatus) PR_InitializeNetAddr(
-    PRNetAddrValue val, PRUint16 port, PRNetAddr *addr);
-
-/***********************************************************************
-** FUNCTION: PR_SetNetAddr(), 
-** DESCRIPTION:
-**  Set the fields of a PRNetAddr, assigning well known values as
-**  appropriate. This function is similar to PR_InitializeNetAddr
-**  but differs in that the address family is specified.
-**
-** INPUTS
-**  PRNetAddrValue val  The value to be assigned to the IP Address portion
-**                      of the network address. This can only specify the
-**                      special well known values that are equivalent to
-**                      INADDR_ANY and INADDR_LOOPBACK.
-**
-**  PRUint16 af         The address family (either PR_AF_INET or PR_AF_INET6)
-**
-**  PRUint16 port       The port number to be assigned in the structure.
-**
-** OUTPUTS:
-**  PRNetAddr *addr     The address to be manipulated.
-**
-** RETURN:
-**  PRStatus            To indicate success or failure. If the latter, the
-**                      reason for the failure can be retrieved by calling
-**                      PR_GetError();
-***********************************************************************/
-NSPR_API(PRStatus) PR_SetNetAddr(
-    PRNetAddrValue val, PRUint16 af, PRUint16 port, PRNetAddr *addr);
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_IsNetAddrType()
-** Determine if the network address is of the specified type.
-**
-** INPUTS:
-**  const PRNetAddr *addr   A network address.
-**  PRNetAddrValue          The type of network address 
-**
-** RETURN:
-**  PRBool                  PR_TRUE if the network address is of the
-**                          specified type, else PR_FALSE.
-***********************************************************************/
-NSPR_API(PRBool) PR_IsNetAddrType(const PRNetAddr *addr, PRNetAddrValue val);
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_ConvertIPv4AddrToIPv6()
-** Convert an IPv4 addr to an (IPv4-mapped) IPv6 addr
-**
-** INPUTS:
-**  PRUint32 	v4addr		IPv4 address
-**
-** OUTPUTS:
-**  PRIPv6Addr *v6addr      The converted IPv6 address
-**
-** RETURN:
-**  void
-**                       
-***********************************************************************/
-NSPR_API(void) PR_ConvertIPv4AddrToIPv6(PRUint32 v4addr, PRIPv6Addr *v6addr);
-
-/***********************************************************************
-** MACRO:	
-** DESCRIPTION:	PR_NetAddrFamily()
-** Get the 'family' field of a PRNetAddr union.
-**
-** INPUTS:
-**  const PRNetAddr *addr   A network address.
-**
-** RETURN:
-**  PRUint16                The 'family' field of 'addr'.
-***********************************************************************/
-#define PR_NetAddrFamily(addr) ((addr)->raw.family)
-
-/***********************************************************************
-** MACRO:	
-** DESCRIPTION:	PR_NetAddrInetPort()
-** Get the 'port' field of a PRNetAddr union.
-**
-** INPUTS:
-**  const PRNetAddr *addr   A network address.
-**
-** RETURN:
-**  PRUint16                The 'port' field of 'addr'.
-***********************************************************************/
-#define PR_NetAddrInetPort(addr) \
-    ((addr)->raw.family == PR_AF_INET6 ? (addr)->ipv6.port : (addr)->inet.port)
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_GetProtoByName()
-** Lookup a protocol entry based on protocol's name
-**
-** INPUTS:
-**  char *protocolname  Character string of the protocol's name.
-**  char *buf           A scratch buffer for the runtime to return result.
-**                      This buffer is allocated by the caller.
-**  PRIntn bufsize      Number of bytes in 'buf'. A recommnded value to
-**                      use is PR_NETDB_BUF_SIZE.
-** OUTPUTS:
-**  PRHostEnt *PRProtoEnt
-**                      This structure is filled in by the runtime if
-**                      the function returns PR_SUCCESS. This structure
-**                      is allocated by the caller.
-** RETURN:
-**  PRStatus            PR_SUCCESS if the lookup succeeds. If it fails
-**                      the result will be PR_FAILURE and the reason
-**                      for the failure can be retrieved by PR_GetError().
-***********************************************************************/
-
-typedef struct PRProtoEnt {
-    char *p_name;       /* official protocol name */
-    char **p_aliases;   /* alias list */
-#ifdef WIN32
-    PRInt16 p_num;      /* protocol # */
-#else
-    PRInt32 p_num;      /* protocol # */
-#endif
-} PRProtoEnt;
-
-NSPR_API(PRStatus) PR_GetProtoByName(
-    const char* protocolname, char* buffer, PRInt32 bufsize, PRProtoEnt* result);
-
-/***********************************************************************
-** FUNCTION:	
-** DESCRIPTION:	PR_GetProtoByNumber()
-** Lookup a protocol entry based on protocol's number
-**
-** INPUTS:
-**  PRInt32 protocolnumber
-**                      Number assigned to the protocol.
-**  char *buf           A scratch buffer for the runtime to return result.
-**                      This buffer is allocated by the caller.
-**  PRIntn bufsize      Number of bytes in 'buf'. A recommnded value to
-**                      use is PR_NETDB_BUF_SIZE.
-** OUTPUTS:
-**  PRHostEnt *PRProtoEnt
-**                      This structure is filled in by the runtime if
-**                      the function returns PR_SUCCESS. This structure
-**                      is allocated by the caller.
-** RETURN:
-**  PRStatus            PR_SUCCESS if the lookup succeeds. If it fails
-**                      the result will be PR_FAILURE and the reason
-**                      for the failure can be retrieved by PR_GetError().
-***********************************************************************/
-NSPR_API(PRStatus) PR_GetProtoByNumber(
-    PRInt32 protocolnumber, char* buffer, PRInt32 bufsize, PRProtoEnt* result);
-
-/***********************************************************************
-** FUNCTION:
-** DESCRIPTION: PR_GetAddrInfoByName()
-**  Look up a host by name. Equivalent to getaddrinfo(host, NULL, ...) of
-**  RFC 3493.
-**
-** INPUTS:
-**  char *hostname      Character string defining the host name of interest
-**  PRUint16 af         May be PR_AF_UNSPEC or PR_AF_INET.
-**  PRIntn flags        May be either PR_AI_ADDRCONFIG or
-**                      PR_AI_ADDRCONFIG | PR_AI_NOCANONNAME. Include
-**                      PR_AI_NOCANONNAME to suppress the determination of
-**                      the canonical name corresponding to hostname.
-** RETURN:
-**  PRAddrInfo*         Handle to a data structure containing the results
-**                      of the host lookup. Use PR_EnumerateAddrInfo to
-**                      inspect the PRNetAddr values stored in this object.
-**                      When no longer needed, this handle must be destroyed
-**                      with a call to PR_FreeAddrInfo.  If a lookup error
-**                      occurs, then NULL will be returned.
-***********************************************************************/
-typedef struct PRAddrInfo PRAddrInfo;
-
-NSPR_API(PRAddrInfo*) PR_GetAddrInfoByName(
-    const char *hostname, PRUint16 af, PRIntn flags);
-
-/***********************************************************************
-** FUNCTION:
-** DESCRIPTION: PR_FreeAddrInfo()
-**  Destroy the PRAddrInfo handle allocated by PR_GetAddrInfoByName().
-**
-** INPUTS:
-**  PRAddrInfo *addrInfo
-**                      The handle resulting from a successful call to
-**                      PR_GetAddrInfoByName().
-** RETURN:
-**  void
-***********************************************************************/
-NSPR_API(void) PR_FreeAddrInfo(PRAddrInfo *addrInfo);
-
-/***********************************************************************
-** FUNCTION:
-** DESCRIPTION: PR_EnumerateAddrInfo()
-**  A stateless enumerator over a PRAddrInfo handle acquired from
-**  PR_GetAddrInfoByName() to inspect the possible network addresses.
-**
-** INPUTS:
-**  void *enumPtr       Index pointer of the enumeration. The enumeration
-**                      starts and ends with a value of NULL.
-**  const PRAddrInfo *addrInfo
-**                      The PRAddrInfo handle returned by a successful
-**                      call to PR_GetAddrInfoByName().
-**  PRUint16 port       The port number to be assigned as part of the
-**                      PRNetAddr.
-** OUTPUTS:
-**  PRNetAddr *result   A pointer to an address structure that will be
-**                      filled in by the call to the enumeration if the
-**                      result of the call is not NULL.
-** RETURN:
-**  void*               The value that should be used for the next call
-**                      of the enumerator ('enumPtr'). The enumeration
-**                      is ended if this value is NULL.
-***********************************************************************/
-NSPR_API(void *) PR_EnumerateAddrInfo(
-    void *enumPtr, const PRAddrInfo *addrInfo, PRUint16 port, PRNetAddr *result);
-
-/***********************************************************************
-** FUNCTION:
-** DESCRIPTION: PR_GetCanonNameFromAddrInfo()
-**  Extracts the canonical name of the hostname passed to
-**  PR_GetAddrInfoByName().
-**
-** INPUTS:
-**  const PRAddrInfo *addrInfo 
-**                      The PRAddrInfo handle returned by a successful
-**                      call to PR_GetAddrInfoByName().
-** RETURN:
-**  const char *        A const pointer to the canonical hostname stored
-**                      in the given PRAddrInfo handle. This pointer is
-**                      invalidated once the PRAddrInfo handle is destroyed
-**                      by a call to PR_FreeAddrInfo().
-***********************************************************************/
-NSPR_API(const char *) PR_GetCanonNameFromAddrInfo(
-    const PRAddrInfo *addrInfo);
-
-/***********************************************************************
-** FUNCTIONS: PR_ntohs, PR_ntohl, PR_ntohll, PR_htons, PR_htonl, PR_htonll
-**
-** DESCRIPTION: API entries for the common byte ordering routines.
-**
-**      PR_ntohs        16 bit conversion from network to host
-**      PR_ntohl        32 bit conversion from network to host
-**      PR_ntohll       64 bit conversion from network to host
-**      PR_htons        16 bit conversion from host to network
-**      PR_htonl        32 bit conversion from host to network
-**      PR_ntonll       64 bit conversion from host to network
-**
-***********************************************************************/
-NSPR_API(PRUint16) PR_ntohs(PRUint16);
-NSPR_API(PRUint32) PR_ntohl(PRUint32);
-NSPR_API(PRUint64) PR_ntohll(PRUint64);
-NSPR_API(PRUint16) PR_htons(PRUint16);
-NSPR_API(PRUint32) PR_htonl(PRUint32);
-NSPR_API(PRUint64) PR_htonll(PRUint64);
-
-PR_END_EXTERN_C
-
-#endif /* prnetdb_h___ */
diff --git a/openflow/usr/include/nspr/prolock.h b/openflow/usr/include/nspr/prolock.h
deleted file mode 100644
index 5e5a409..0000000
--- a/openflow/usr/include/nspr/prolock.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prolock_h___
-#define prolock_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** A locking mechanism, built on the existing PRLock definition,
-** is provided that will permit applications to define a Lock
-** Hierarchy (or Lock Ordering) schema. An application designed
-** using the Ordered Lock functions will terminate with a
-** diagnostic message when a lock inversion condition is
-** detected. 
-** 
-** The lock ordering detection is compile-time enabled only. In
-** optimized builds of NSPR, the Ordered Lock functions map
-** directly to PRLock functions, providing no lock order
-** detection.
-** 
-** The Ordered Lock Facility is compiled in when DEBUG is defined at
-** compile-time. Ordered Lock can be forced on in optimized builds by
-** defining FORCE_NSPR_ORDERED_LOCK at compile-time. Both the
-** application using Ordered Lock and NSPR must be compiled with the
-** facility enabled to achieve the desired results.
-** 
-** Application designers should use the macro interfaces to the Ordered
-** Lock facility to ensure that it is compiled out in optimized builds.
-**
-** Application designers are responsible for defining their own
-** lock hierarchy. 
-**
-** Ordered Lock is thread-safe and SMP safe.
-**
-** See Also: prlock.h
-**
-** /lth. 10-Jun-1998.
-**
-*/
-
-/*
-** Opaque type for ordered lock.
-** ... Don't even think of looking in here.
-**
-*/
-
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-typedef void * PROrderedLock;
-#else
-/*
-** Map PROrderedLock and methods onto PRLock when ordered locking
-** is not compiled in.
-**  
-*/
-#include "prlock.h"
-
-typedef PRLock PROrderedLock;
-#endif
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_CreateOrderedLock() -- Create an Ordered Lock
-** 
-** DESCRIPTION: PR_CreateOrderedLock() creates an ordered lock.
-** 
-** INPUTS:
-**  order: user defined order of this lock.
-**  name: name of the lock. For debugging purposes.
-** 
-** OUTPUTS: returned
-** 
-** RETURNS: PR_OrderedLock pointer
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-#define PR_CREATE_ORDERED_LOCK(order,name)\
-    PR_CreateOrderedLock((order),(name))
-#else
-#define PR_CREATE_ORDERED_LOCK(order) PR_NewLock()
-#endif
-
-NSPR_API(PROrderedLock *) 
-    PR_CreateOrderedLock( 
-        PRInt32 order,
-        const char *name
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DestroyOrderedLock() -- Destroy an Ordered Lock
-** 
-** DESCRIPTION: PR_DestroyOrderedLock() destroys the ordered lock
-** referenced by lock.
-** 
-** INPUTS: lock: pointer to a PROrderedLock
-** 
-** OUTPUTS: the lock is destroyed
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-#define PR_DESTROY_ORDERED_LOCK(lock) PR_DestroyOrderedLock((lock))
-#else
-#define PR_DESTROY_ORDERED_LOCK(lock) PR_DestroyLock((lock))
-#endif
-
-NSPR_API(void) 
-    PR_DestroyOrderedLock( 
-        PROrderedLock *lock 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_LockOrderedLock() -- Lock an ordered lock
-** 
-** DESCRIPTION: PR_LockOrderedLock() locks the ordered lock
-** referenced by lock. If the order of lock is less than or equal
-** to the order of the highest lock held by the locking thread,
-** the function asserts.
-** 
-** INPUTS: lock: a pointer to a PROrderedLock
-** 
-** OUTPUTS: The lock is held or the function asserts.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-#define PR_LOCK_ORDERED_LOCK(lock) PR_LockOrderedLock((lock))
-#else
-#define PR_LOCK_ORDERED_LOCK(lock) PR_Lock((lock))
-#endif
-
-NSPR_API(void) 
-    PR_LockOrderedLock( 
-        PROrderedLock *lock 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_UnlockOrderedLock() -- unlock and Ordered Lock
-** 
-** DESCRIPTION: PR_UnlockOrderedLock() unlocks the lock referenced
-** by lock.
-** 
-** INPUTS: lock: a pointer to a PROrderedLock
-** 
-** OUTPUTS: the lock is unlocked
-** 
-** RETURNS:
-**  PR_SUCCESS
-**  PR_FAILURE
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-#define PR_UNLOCK_ORDERED_LOCK(lock) PR_UnlockOrderedLock((lock))
-#else
-#define PR_UNLOCK_ORDERED_LOCK(lock) PR_Unlock((lock))
-#endif
-
-NSPR_API(PRStatus) 
-    PR_UnlockOrderedLock( 
-        PROrderedLock *lock 
-);
-
-PR_END_EXTERN_C
-
-#endif /* prolock_h___ */
diff --git a/openflow/usr/include/nspr/prpdce.h b/openflow/usr/include/nspr/prpdce.h
deleted file mode 100644
index b681795..0000000
--- a/openflow/usr/include/nspr/prpdce.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * File:		prpdce.h
- * Description:	This file is the API defined to allow for DCE (aka POSIX)
- *				thread emulation in an NSPR environment. It is not the
- *				intent that this be a fully supported API.
- */
-
-#if !defined(PRPDCE_H)
-#define PRPDCE_H
-
-#include "prlock.h"
-#include "prcvar.h"
-#include "prtypes.h"
-#include "prinrval.h"
-
-PR_BEGIN_EXTERN_C
-
-#define _PR_NAKED_CV_LOCK (PRLock*)0xdce1dce1
-
-/*
-** Test and acquire a lock.
-**
-** If the lock is acquired by the calling thread, the
-** return value will be PR_SUCCESS. If the lock is
-** already held, by another thread or this thread, the
-** result will be PR_FAILURE.
-*/
-NSPR_API(PRStatus) PRP_TryLock(PRLock *lock);
-
-/*
-** Create a naked condition variable
-**
-** A "naked" condition variable is one that is not created bound
-** to a lock. The CV created with this function is the only type
-** that may be used in the subsequent "naked" condition variable
-** operations (see PRP_NakedWait, PRP_NakedNotify, PRP_NakedBroadcast);
-*/
-NSPR_API(PRCondVar*) PRP_NewNakedCondVar(void);
-
-/*
-** Destroy a naked condition variable
-**
-** Destroy the condition variable created by PR_NewNakedCondVar.
-*/
-NSPR_API(void) PRP_DestroyNakedCondVar(PRCondVar *cvar);
-
-/*
-** Wait on a condition
-**
-** Wait on the condition variable 'cvar'. It is asserted that
-** the lock protecting the condition 'lock' is held by the
-** calling thread. If more time expires than that declared in
-** 'timeout' the condition will be notified. Waits can be
-** interrupted by another thread.
-**
-** NB: The CV ('cvar') must be one created using PR_NewNakedCondVar.
-*/
-NSPR_API(PRStatus) PRP_NakedWait(
-	PRCondVar *cvar, PRLock *lock, PRIntervalTime timeout);
-
-/*
-** Notify a thread waiting on a condition
-**
-** Notify the condition specified 'cvar'.
-**
-** NB: The CV ('cvar') must be one created using PR_NewNakedCondVar.
-*/
-NSPR_API(PRStatus) PRP_NakedNotify(PRCondVar *cvar);
-
-/*
-** Notify all threads waiting on a condition
-**
-** Notify the condition specified 'cvar'.
-**
-** NB: The CV ('cvar') must be one created using PR_NewNakedCondVar.
-*/
-NSPR_API(PRStatus) PRP_NakedBroadcast(PRCondVar *cvar);
-
-PR_END_EXTERN_C
-
-#endif /* PRPDCE_H */
diff --git a/openflow/usr/include/nspr/prprf.h b/openflow/usr/include/nspr/prprf.h
deleted file mode 100644
index 440be88..0000000
--- a/openflow/usr/include/nspr/prprf.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prprf_h___
-#define prprf_h___
-
-/*
-** API for PR printf like routines. Supports the following formats
-**	%d - decimal
-**	%u - unsigned decimal
-**	%x - unsigned hex
-**	%X - unsigned uppercase hex
-**	%o - unsigned octal
-**	%hd, %hu, %hx, %hX, %ho - 16-bit versions of above
-**	%ld, %lu, %lx, %lX, %lo - 32-bit versions of above
-**	%lld, %llu, %llx, %llX, %llo - 64 bit versions of above
-**	%s - string
-**	%c - character
-**	%p - pointer (deals with machine dependent pointer size)
-**	%f - float
-**	%g - float
-*/
-#include "prtypes.h"
-#include "prio.h"
-#include <stdio.h>
-#include <stdarg.h>
-
-PR_BEGIN_EXTERN_C
-
-/*
-** sprintf into a fixed size buffer. Guarantees that a NUL is at the end
-** of the buffer. Returns the length of the written output, NOT including
-** the NUL, or (PRUint32)-1 if an error occurs.
-*/
-NSPR_API(PRUint32) PR_snprintf(char *out, PRUint32 outlen, const char *fmt, ...);
-
-/*
-** sprintf into a PR_MALLOC'd buffer. Return a pointer to the malloc'd
-** buffer on success, NULL on failure. Call "PR_smprintf_free" to release
-** the memory returned.
-*/
-NSPR_API(char*) PR_smprintf(const char *fmt, ...);
-
-/*
-** Free the memory allocated, for the caller, by PR_smprintf
-*/
-NSPR_API(void) PR_smprintf_free(char *mem);
-
-/*
-** "append" sprintf into a PR_MALLOC'd buffer. "last" is the last value of
-** the PR_MALLOC'd buffer. sprintf will append data to the end of last,
-** growing it as necessary using realloc. If last is NULL, PR_sprintf_append
-** will allocate the initial string. The return value is the new value of
-** last for subsequent calls, or NULL if there is a malloc failure.
-*/
-NSPR_API(char*) PR_sprintf_append(char *last, const char *fmt, ...);
-
-/*
-** sprintf into a function. The function "f" is called with a string to
-** place into the output. "arg" is an opaque pointer used by the stuff
-** function to hold any state needed to do the storage of the output
-** data. The return value is a count of the number of characters fed to
-** the stuff function, or (PRUint32)-1 if an error occurs.
-*/
-typedef PRIntn (*PRStuffFunc)(void *arg, const char *s, PRUint32 slen);
-
-NSPR_API(PRUint32) PR_sxprintf(PRStuffFunc f, void *arg, const char *fmt, ...);
-
-/*
-** fprintf to a PRFileDesc
-*/
-NSPR_API(PRUint32) PR_fprintf(struct PRFileDesc* fd, const char *fmt, ...);
-
-/*
-** va_list forms of the above.
-*/
-NSPR_API(PRUint32) PR_vsnprintf(char *out, PRUint32 outlen, const char *fmt, va_list ap);
-NSPR_API(char*) PR_vsmprintf(const char *fmt, va_list ap);
-NSPR_API(char*) PR_vsprintf_append(char *last, const char *fmt, va_list ap);
-NSPR_API(PRUint32) PR_vsxprintf(PRStuffFunc f, void *arg, const char *fmt, va_list ap);
-NSPR_API(PRUint32) PR_vfprintf(struct PRFileDesc* fd, const char *fmt, va_list ap);
-
-/*
-***************************************************************************
-** FUNCTION: PR_sscanf
-** DESCRIPTION:
-**     PR_sscanf() scans the input character string, performs data
-**     conversions, and stores the converted values in the data objects
-**     pointed to by its arguments according to the format control
-**     string.
-**
-**     PR_sscanf() behaves the same way as the sscanf() function in the
-**     Standard C Library (stdio.h), with the following exceptions:
-**     - PR_sscanf() handles the NSPR integer and floating point types,
-**       such as PRInt16, PRInt32, PRInt64, and PRFloat64, whereas
-**       sscanf() handles the standard C types like short, int, long,
-**       and double.
-**     - PR_sscanf() has no multibyte character support, while sscanf()
-**       does.
-** INPUTS:
-**     const char *buf
-**         a character string holding the input to scan
-**     const char *fmt
-**         the format control string for the conversions
-**     ...
-**         variable number of arguments, each of them is a pointer to
-**         a data object in which the converted value will be stored
-** OUTPUTS: none
-** RETURNS: PRInt32
-**     The number of values converted and stored.
-** RESTRICTIONS:
-**    Multibyte characters in 'buf' or 'fmt' are not allowed.
-***************************************************************************
-*/
-
-NSPR_API(PRInt32) PR_sscanf(const char *buf, const char *fmt, ...);
-
-PR_END_EXTERN_C
-
-#endif /* prprf_h___ */
diff --git a/openflow/usr/include/nspr/prproces.h b/openflow/usr/include/nspr/prproces.h
deleted file mode 100644
index 9782542..0000000
--- a/openflow/usr/include/nspr/prproces.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prproces_h___
-#define prproces_h___
-
-#include "prtypes.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-/************************************************************************/
-/*****************************PROCESS OPERATIONS*************************/
-/************************************************************************/
-
-typedef struct PRProcess PRProcess;
-typedef struct PRProcessAttr PRProcessAttr;
-
-NSPR_API(PRProcessAttr *) PR_NewProcessAttr(void);
-
-NSPR_API(void) PR_ResetProcessAttr(PRProcessAttr *attr);
-
-NSPR_API(void) PR_DestroyProcessAttr(PRProcessAttr *attr);
-
-NSPR_API(void) PR_ProcessAttrSetStdioRedirect(
-    PRProcessAttr *attr,
-    PRSpecialFD stdioFd,
-    PRFileDesc *redirectFd
-);
-
-/*
- * OBSOLETE -- use PR_ProcessAttrSetStdioRedirect instead.
- */
-NSPR_API(void) PR_SetStdioRedirect(
-    PRProcessAttr *attr,
-    PRSpecialFD stdioFd,
-    PRFileDesc *redirectFd
-);
-
-NSPR_API(PRStatus) PR_ProcessAttrSetCurrentDirectory(
-    PRProcessAttr *attr,
-    const char *dir
-);
-
-NSPR_API(PRStatus) PR_ProcessAttrSetInheritableFD(
-    PRProcessAttr *attr,
-    PRFileDesc *fd,
-    const char *name
-);
-
-/*
-** Create a new process
-**
-** Create a new process executing the file specified as 'path' and with
-** the supplied arguments and environment.
-**
-** This function may fail because of illegal access (permissions),
-** invalid arguments or insufficient resources.
-**
-** A process may be created such that the creator can later synchronize its
-** termination using PR_WaitProcess(). 
-*/
-
-NSPR_API(PRProcess*) PR_CreateProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr);
-
-NSPR_API(PRStatus) PR_CreateProcessDetached(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr);
-
-NSPR_API(PRStatus) PR_DetachProcess(PRProcess *process);
-
-NSPR_API(PRStatus) PR_WaitProcess(PRProcess *process, PRInt32 *exitCode);
-
-NSPR_API(PRStatus) PR_KillProcess(PRProcess *process);
-
-PR_END_EXTERN_C
-
-#endif /* prproces_h___ */
diff --git a/openflow/usr/include/nspr/prrng.h b/openflow/usr/include/nspr/prrng.h
deleted file mode 100644
index 3b5a443..0000000
--- a/openflow/usr/include/nspr/prrng.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/*
-** prrng.h -- NSPR Random Number Generator
-** 
-**
-** lth. 29-Oct-1999.
-*/
-
-#ifndef prrng_h___ 
-#define prrng_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** PR_GetRandomNoise() -- Get random noise from the host platform
-**
-** Description:
-** PR_GetRandomNoise() provides, depending on platform, a random value.
-** The length of the random value is dependent on platform and the
-** platform's ability to provide a random value at that moment.
-**
-** The intent of PR_GetRandomNoise() is to provide a "seed" value for a
-** another random number generator that may be suitable for
-** cryptographic operations. This implies that the random value
-** provided may not be, by itself, cryptographically secure. The value
-** generated by PR_GetRandomNoise() is at best, extremely difficult to
-** predict and is as non-deterministic as the underlying platfrom can
-** provide.
-**
-** Inputs:
-**   buf -- pointer to a caller supplied buffer to contain the
-**          generated random number. buf must be at least as large as
-**          is specified in the 'size' argument.
-**
-**   size -- the requested size of the generated random number
-**
-** Outputs:
-**   a random number provided in 'buf'.
-**
-** Returns:
-**   PRSize value equal to the size of the random number actually
-**   generated, or zero. The generated size may be less than the size
-**   requested. A return value of zero means that PR_GetRandomNoise() is
-**   not implemented on this platform, or there is no available noise
-**   available to be returned at the time of the call.
-**
-** Restrictions:
-**   Calls to PR_GetRandomNoise() may use a lot of CPU on some platforms.
-**   Some platforms may block for up to a few seconds while they
-**   accumulate some noise. Busy machines generate lots of noise, but
-**   care is advised when using PR_GetRandomNoise() frequently in your
-**   application.
-**
-** History:
-**   Parts of the model dependent implementation for PR_GetRandomNoise()
-**   were taken in whole or part from code previously in Netscape's NSS
-**   component.
-**
-*/
-NSPR_API(PRSize) PR_GetRandomNoise( 
-    void    *buf,
-    PRSize  size
-);
-
-PR_END_EXTERN_C
-
-#endif /* prrng_h___ */
-/* end prrng.h */
diff --git a/openflow/usr/include/nspr/prrwlock.h b/openflow/usr/include/nspr/prrwlock.h
deleted file mode 100644
index 65d052d..0000000
--- a/openflow/usr/include/nspr/prrwlock.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File:		prrwlock.h
-** Description:	API to basic reader-writer lock functions of NSPR.
-**
-**/
-
-#ifndef prrwlock_h___
-#define prrwlock_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
- * PRRWLock --
- *
- *	The reader writer lock, PRRWLock, is an opaque object to the clients
- *	of NSPR.  All routines operate on a pointer to this opaque entity.
- */
-
-
-typedef struct PRRWLock PRRWLock;
-
-#define	PR_RWLOCK_RANK_NONE	0
-
-
-/***********************************************************************
-** FUNCTION:    PR_NewRWLock
-** DESCRIPTION:
-**  Returns a pointer to a newly created reader-writer lock object.
-** INPUTS:      Lock rank
-**				Lock name
-** OUTPUTS:     void
-** RETURN:      PRRWLock*
-**   If the lock cannot be created because of resource constraints, NULL
-**   is returned.
-**  
-***********************************************************************/
-NSPR_API(PRRWLock*) PR_NewRWLock(PRUint32 lock_rank, const char *lock_name);
-
-/***********************************************************************
-** FUNCTION:    PR_DestroyRWLock
-** DESCRIPTION:
-**  Destroys a given RW lock object.
-** INPUTS:      PRRWLock *lock - Lock to be freed.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-NSPR_API(void) PR_DestroyRWLock(PRRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    PR_RWLock_Rlock
-** DESCRIPTION:
-**  Apply a read lock (non-exclusive) on a RWLock
-** INPUTS:      PRRWLock *lock - Lock to be read-locked.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-NSPR_API(void) PR_RWLock_Rlock(PRRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    PR_RWLock_Wlock
-** DESCRIPTION:
-**  Apply a write lock (exclusive) on a RWLock
-** INPUTS:      PRRWLock *lock - Lock to write-locked.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-NSPR_API(void) PR_RWLock_Wlock(PRRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    PR_RWLock_Unlock
-** DESCRIPTION:
-**  Release a RW lock. Unlocking an unlocked lock has undefined results.
-** INPUTS:      PRRWLock *lock - Lock to unlocked.
-** OUTPUTS:     void
-** RETURN:      void
-***********************************************************************/
-NSPR_API(void) PR_RWLock_Unlock(PRRWLock *lock);
-
-PR_END_EXTERN_C
-
-#endif /* prrwlock_h___ */
diff --git a/openflow/usr/include/nspr/prshm.h b/openflow/usr/include/nspr/prshm.h
deleted file mode 100644
index f821a58..0000000
--- a/openflow/usr/include/nspr/prshm.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** prshm.h -- NSPR Shared Memory
-**
-** NSPR Named Shared Memory API provides a cross-platform named
-** shared-memory interface. NSPR Named Shared Memory is modeled on
-** similar constructs in Unix and Windows operating systems. Shared
-** memory allows multiple processes to access one or more common shared
-** memory regions, using it as an inter-process communication channel.
-**
-** Notes on Platform Independence:
-**   NSPR Named Shared Memory is built on the native services offered
-**   by most platforms. The NSPR Named Shared Memory API tries to
-**   provide a least common denominator interface so that it works
-**   across all supported platforms. To ensure that it works everywhere,
-**   some platform considerations must be accomodated and the protocol
-**   for using NSPR Shared Memory API must be observed.
-**
-** Protocol:
-**   Multiple shared memories can be created using NSPR's Shared Memory
-**   feature. For each named shared memory, as defined by the name
-**   given in the PR_OpenSharedMemory() call, a protocol for using the
-**   shared memory API is required to ensure desired behavior. Failing
-**   to follow the protocol may yield unpredictable results.
-**   
-**   PR_OpenSharedMemory() will create the shared memory segment, if it
-**   does not already exist, or open a connection that the existing
-**   shared memory segment if it already exists.
-**   
-**   PR_AttachSharedMemory() should be called following
-**   PR_OpenSharedMemory() to map the memory segment to an address in
-**   the application's address space.
-**   
-**   PR_AttachSharedMemory() may be called to re-map a shared memory
-**   segment after detaching the same PRSharedMemory object. Be
-**   sure to detach it when done.
-**   
-**   PR_DetachSharedMemory() should be called to un-map the shared
-**   memory segment from the application's address space.
-**   
-**   PR_CloseSharedMemory() should be called when no further use of the
-**   PRSharedMemory object is required within a process. Following a
-**   call to  PR_CloseSharedMemory() the PRSharedMemory object is
-**   invalid and cannot be reused.
-**   
-**   PR_DeleteSharedMemory() should be called before process
-**   termination. After calling PR_DeleteSharedMemory() any further use
-**   of the shared memory associated with the name may cause
-**   unpredictable results.
-**   
-** Files:
-**   The name passed to PR_OpenSharedMemory() should be a valid filename
-**   for a unix platform. PR_OpenSharedMemory() creates file using the
-**   name passed in. Some platforms may mangle the name before creating
-**   the file and the shared memory.
-**   
-**   The unix implementation may use SysV IPC shared memory, Posix
-**   shared memory, or memory mapped files; the filename may used to
-**   define the namespace. On Windows, the name is significant, but
-**   there is no file associated with name.
-**   
-**   No assumptions about the persistence of data in the named file
-**   should be made. Depending on platform, the shared memory may be
-**   mapped onto system paging space and be discarded at process
-**   termination.
-**   
-**   All names provided to PR_OpenSharedMemory() should be valid
-**   filename syntax or name syntax for shared memory for the target
-**   platform. Referenced directories should have permissions 
-**   appropriate for writing.
-**
-** Limits:
-**   Different platforms have limits on both the number and size of
-**   shared memory resources. The default system limits on some
-**   platforms may be smaller than your requirements. These limits may
-**   be adjusted on some platforms either via boot-time options or by
-**   setting the size of the system paging space to accomodate more
-**   and/or larger shared memory segment(s).
-**
-** Security:
-**   On unix platforms, depending on implementation, contents of the
-**   backing store for the shared memory can be exposed via the file
-**   system. Set permissions and or access controls at create and attach
-**   time to ensure you get the desired security.
-**
-**   On windows platforms, no special security measures are provided.
-**
-** Example:
-**   The test case pr/tests/nameshm1.c provides an example of use as
-**   well as testing the operation of NSPR's Named Shared Memory.
-**
-** lth. 18-Aug-1999.
-*/
-
-#ifndef prshm_h___
-#define prshm_h___
-
-#include "prtypes.h"
-#include "prio.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Declare opaque type PRSharedMemory.
-*/
-typedef struct PRSharedMemory PRSharedMemory;
-
-/*
-** FUNCTION: PR_OpenSharedMemory()
-**
-** DESCRIPTION:
-**   PR_OpenSharedMemory() creates a new shared-memory segment or
-**   associates a previously created memory segment with name.
-**
-**   When parameter create is (PR_SHM_EXCL | PR_SHM_CREATE) and the
-**   shared memory already exists, the function returns NULL with the
-**   error set to PR_FILE_EXISTS_ERROR.
-**
-**   When parameter create is PR_SHM_CREATE and the shared memory
-**   already exists, a handle to that memory segment is returned. If
-**   the segment does not exist, it is created and a pointer to the
-**   related PRSharedMemory structure is returned.
-**
-**   When parameter create is 0, and the shared memory exists, a
-**   pointer to a PRSharedMemory is returned. If the shared memory does
-**   not exist, NULL is returned with the error set to
-**   PR_FILE_NOT_FOUND_ERROR.
-**
-** INPUTS:
-**   name -- the name the shared-memory segment is known as.
-**   size -- the size of the shared memory segment. 
-**   flags -- Options for creating the shared memory
-**   mode -- Same as is passed to PR_Open()
-**
-** OUTPUTS: 
-**   The shared memory is allocated.
-**
-** RETURNS: Pointer to opaque structure PRSharedMemory or NULL.
-**   NULL is returned on error. The reason for the error can be
-**   retrieved via PR_GetError() and PR_GetOSError();
-**
-*/
-NSPR_API( PRSharedMemory * )
-    PR_OpenSharedMemory(
-        const char *name,
-        PRSize      size,
-        PRIntn      flags,
-        PRIntn      mode
-);
-/* Define values for PR_OpenShareMemory(...,create) */
-#define PR_SHM_CREATE 0x1  /* create if not exist */
-#define PR_SHM_EXCL   0x2  /* fail if already exists */
-
-/*
-** FUNCTION: PR_AttachSharedMemory()
-**
-** DESCRIPTION:
-** PR_AttachSharedMemory() maps the shared-memory described by
-** shm to the current process. 
-**
-** INPUTS: 
-**   shm -- The handle returned from PR_OpenSharedMemory().
-**   flags -- options for mapping the shared memory.
-**   PR_SHM_READONLY causes the memory to be attached 
-**   read-only.
-**
-** OUTPUTS:
-**   On success, the shared memory segment represented by shm is mapped
-**   into the process' address space.
-**
-** RETURNS: Address where shared memory is mapped, or NULL.
-**   NULL is returned on error. The reason for the error can be
-**   retrieved via PR_GetError() and PR_GetOSError();
-**
-**
-*/
-NSPR_API( void * )
-    PR_AttachSharedMemory(
-        PRSharedMemory *shm,
-        PRIntn  flags
-);
-/* Define values for PR_AttachSharedMemory(...,flags) */ 
-#define PR_SHM_READONLY 0x01
-
-/*
-** FUNCTION: PR_DetachSharedMemory()
-**
-** DESCRIPTION:
-**   PR_DetachSharedMemory() detaches the shared-memory described
-**   by shm. 
-**
-** INPUTS: 
-**   shm -- The handle returned from PR_OpenSharedMemory().
-**   addr -- The address at which the memory was attached.
-**
-** OUTPUTS:
-**   The shared memory mapped to an address via a previous call to
-**   PR_AttachSharedMemory() is unmapped.
-**
-** RETURNS: PRStatus
-**
-*/
-NSPR_API( PRStatus )
-    PR_DetachSharedMemory(
-        PRSharedMemory *shm,
-        void  *addr
-);
-
-/*
-** FUNCTION: PR_CloseSharedMemory()
-**
-** DESCRIPTION:
-**   PR_CloseSharedMemory() closes the shared-memory described by
-**   shm.
-** 
-** INPUTS:
-**   shm -- The handle returned from PR_OpenSharedMemory().
-**
-** OUTPUTS:
-**   the shared memory represented by shm is closed
-**
-** RETURNS: PRStatus
-**
-*/
-NSPR_API( PRStatus )
-    PR_CloseSharedMemory(
-        PRSharedMemory *shm
-);
-
-/*
-** FUNCTION: PR_DeleteSharedMemory()
-**
-** DESCRIPTION:
-**   The shared memory resource represented by name is released.
-**
-** INPUTS:
-**   name -- the name the shared-memory segment
-**
-** OUTPUTS:
-**   depending on platform, resources may be returned to the underlying
-**   operating system.
-**
-** RETURNS: PRStatus
-**
-*/
-NSPR_API( PRStatus )
-    PR_DeleteSharedMemory( 
-        const char *name
-);
-
-PR_END_EXTERN_C
-
-#endif /* prshm_h___ */
diff --git a/openflow/usr/include/nspr/prshma.h b/openflow/usr/include/nspr/prshma.h
deleted file mode 100644
index 2abc4ae..0000000
--- a/openflow/usr/include/nspr/prshma.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** prshma.h -- NSPR Anonymous Shared Memory
-**
-** NSPR provides an anonymous shared memory based on NSPR's PRFileMap
-** type. The anonymous file-mapped shared memory provides an inheritable
-** shared memory, as in: the child process inherits the shared memory.
-** Compare the file-mapped anonymous shared memory to to a named shared
-** memory described in prshm.h. The intent is to provide a shared
-** memory that is accessable only by parent and child processes. ...
-** It's a security thing.
-** 
-** Depending on the underlying platform, the file-mapped shared memory
-** may be backed by a file. ... surprise! ... On some platforms, no
-** real file backs the shared memory. On platforms where the shared
-** memory is backed by a file, the file's name in the filesystem is
-** visible to other processes for only the duration of the creation of
-** the file, hopefully a very short time. This restricts processess
-** that do not inherit the shared memory from opening the file and
-** reading or writing its contents. Further, when all processes
-** using an anonymous shared memory terminate, the backing file is
-** deleted. ... If you are not paranoid, you're not paying attention.
-** 
-** The file-mapped shared memory requires a protocol for the parent
-** process and child process to share the memory. NSPR provides two
-** protocols. Use one or the other; don't mix and match.
-** 
-** In the first protocol, the job of passing the inheritable shared
-** memory is done via helper-functions with PR_CreateProcess(). In the
-** second protocol, the parent process is responsible for creating the
-** child process; the parent and child are mutually responsible for
-** passing a FileMap string. NSPR provides helper functions for
-** extracting data from the PRFileMap object. ... See the examples
-** below.
-** 
-** Both sides should adhere strictly to the protocol for proper
-** operation. The pseudo-code below shows the use of a file-mapped
-** shared memory by a parent and child processes. In the examples, the
-** server creates the file-mapped shared memory, the client attaches to
-** it.
-**
-** First protocol.
-** Server:
-**
-**   fm = PR_OpenAnonFileMap(dirName, size, FilemapProt); 
-**   addr = PR_MemMap(fm); 
-**   attr = PR_NewProcessAttr();
-**   PR_ProcessAttrSetInheritableFileMap( attr, fm, shmname );
-**   PR_CreateProcess(Client); 
-**   PR_DestroyProcessAttr(attr);
-**   ... yadda ...
-**   PR_MemUnmap( addr );
-**   PR_CloseFileMap(fm);
-**
-**
-** Client: 
-**   ... started by server via PR_CreateProcess()
-**   fm = PR_GetInheritedFileMap( shmname );
-**   addr = PR_MemMap(fm);
-**   ... yadda ...
-**   PR_MemUnmap(addr);
-**   PR_CloseFileMap(fm);
-**
-**
-** Second Protocol:
-** Server:
-**
-**   fm = PR_OpenAnonFileMap(dirName, size, FilemapProt); 
-**   fmstring = PR_ExportFileMapAsString( fm );
-**   addr = PR_MemMap(fm); 
-**    ... application specific technique to pass fmstring to child
-**    ... yadda ... Server uses his own magic to create child
-**   PR_MemUnmap( addr );
-**   PR_CloseFileMap(fm);
-**
-**
-** Client: 
-**   ... started by server via his own magic
-**   ... application specific technique to find fmstring from parent
-**   fm = PR_ImportFileMapFromString( fmstring )
-**   addr = PR_MemMap(fm);
-**   ... yadda ...
-**   PR_MemUnmap(addr);
-**   PR_CloseFileMap(fm);
-**
-**
-** lth. 2-Jul-1999.
-**
-** Note: The second protocol was requested by NelsonB (7/1999); this is
-** to accomodate servers which already create their own child processes
-** using platform native methods.
-** 
-*/
-
-#ifndef prshma_h___
-#define prshma_h___
-
-#include "prtypes.h"
-#include "prio.h"
-#include "prproces.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** PR_OpenAnonFileMap() -- Creates an anonymous file-mapped shared memory
-**
-** Description:
-** PR_OpenAnonFileMap() creates an anonymous shared memory. If the
-** shared memory already exists, a handle is returned to that shared
-** memory object.
-**
-** On Unix platforms, PR_OpenAnonFileMap() uses 'dirName' as a
-** directory name, without the trailing '/', to contain the anonymous
-** file. A filename is generated for the name.
-**
-** On Windows platforms, dirName is ignored.
-**
-** Inputs:
-**   dirName -- A directory name to contain the anonymous file.
-**   size -- The size of the shared memory
-**   prot -- How the shared memory is mapped. See prio.h
-**   
-** Outputs:
-**   PRFileMap *
-**
-** Returns:
-**   Pointer to PRFileMap or NULL on error.
-**
-*/
-NSPR_API( PRFileMap *)
-PR_OpenAnonFileMap(
-    const char *dirName,
-    PRSize      size, 
-    PRFileMapProtect prot
-);  
-
-/*
-** PR_ProcessAttrSetInheritableFileMap() -- Prepare FileMap for export  
-**   to my children processes via PR_CreateProcess()
-**
-** Description:
-** PR_ProcessAttrSetInheritableFileMap() connects the PRFileMap to
-** PRProcessAttr with shmname. A subsequent call to PR_CreateProcess()
-** makes the PRFileMap importable by the child process.
-**
-** Inputs:
-**   attr -- PRProcessAttr, used to pass data to PR_CreateProcess()
-**   fm -- PRFileMap structure to be passed to the child process
-**   shmname -- The name for the PRFileMap; used by child.
-**
-** Outputs:
-**   PRFileMap *
-**
-** Returns:
-**   PRStatus
-**
-*/
-NSPR_API(PRStatus) 
-PR_ProcessAttrSetInheritableFileMap( 
-    PRProcessAttr   *attr,
-    PRFileMap       *fm, 
-    const char      *shmname
-);
-
-/*
-** PR_GetInheritedFileMap() -- Import a PRFileMap previously exported
-**   by my parent process via PR_CreateProcess()
-**
-** Description:
-** PR_GetInheritedFileMap() retrieves a PRFileMap object exported from
-** its parent process via PR_CreateProcess().
-**
-** Inputs:
-**    shmname -- The name provided to PR_ProcessAttrSetInheritableFileMap()
-** 
-** Outputs:
-**   PRFileMap *
-**
-** Returns:
-**   PRFileMap pointer or NULL.
-**
-*/
-NSPR_API( PRFileMap *)
-PR_GetInheritedFileMap( 
-    const char *shmname 
-);
-
-/*
-** PR_ExportFileMapAsString() -- Creates a string identifying a PRFileMap
-**
-** Description:
-** Creates an identifier, as a string, from a PRFileMap object
-** previously created with PR_OpenAnonFileMap().
-**
-** Inputs:
-**   fm -- PRFileMap pointer to be represented as a string.
-**   bufsize -- sizeof(buf)
-**   buf -- a buffer of length PR_FILEMAP_STRING_BUFSIZE
-**
-** Outputs:
-**   buf contains the stringized PRFileMap identifier
-**
-** Returns:
-**   PRStatus
-**
-*/
-NSPR_API( PRStatus )
-PR_ExportFileMapAsString( 
-    PRFileMap *fm,
-    PRSize    bufsize,
-    char      *buf
-);
-#define PR_FILEMAP_STRING_BUFSIZE 128
-
-/*
-** PR_ImportFileMapFromString() -- Creates a PRFileMap from the identifying string
-**
-** Description:
-** PR_ImportFileMapFromString() creates a PRFileMap object from a
-** string previously created by PR_ExportFileMapAsString().
-**
-** Inputs:
-**   fmstring -- string created by PR_ExportFileMapAsString()
-**
-** Returns:
-**   PRFileMap pointer or NULL.
-**
-*/
-NSPR_API( PRFileMap * )
-PR_ImportFileMapFromString( 
-    const char *fmstring
-);
-
-PR_END_EXTERN_C
-#endif /* prshma_h___ */
diff --git a/openflow/usr/include/nspr/prsystem.h b/openflow/usr/include/nspr/prsystem.h
deleted file mode 100644
index b3e14e7..0000000
--- a/openflow/usr/include/nspr/prsystem.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prsystem_h___
-#define prsystem_h___
-
-/*
-** API to NSPR functions returning system info.
-*/
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Get the host' directory separator.
-**  Pathnames are then assumed to be of the form:
-**      [<sep><root_component><sep>]*(<component><sep>)<leaf_name>
-*/
-
-NSPR_API(char) PR_GetDirectorySeparator(void);
-
-/*
-** OBSOLETE -- the function name is misspelled.
-** Use PR_GetDirectorySeparator instead.
-*/
-
-NSPR_API(char) PR_GetDirectorySepartor(void);
-
-/*
-** Get the host' path separator.
-**  Paths are assumed to be of the form:
-**      <directory>[<sep><directory>]*
-*/
-
-NSPR_API(char) PR_GetPathSeparator(void);
-
-/* Types of information available via PR_GetSystemInfo(...) */
-typedef enum {
-    PR_SI_HOSTNAME,  /* the hostname with the domain name (if any)
-                      * removed */
-    PR_SI_SYSNAME,
-    PR_SI_RELEASE,
-    PR_SI_ARCHITECTURE,
-    PR_SI_HOSTNAME_UNTRUNCATED  /* the hostname exactly as configured
-                                 * on the system */
-} PRSysInfo;
-
-
-/*
-** If successful returns a null termintated string in 'buf' for
-** the information indicated in 'cmd'. If unseccussful the reason for
-** the failure can be retrieved from PR_GetError().
-**
-** The buffer is allocated by the caller and should be at least
-** SYS_INFO_BUFFER_LENGTH bytes in length.
-*/
-
-#define SYS_INFO_BUFFER_LENGTH 256
-
-NSPR_API(PRStatus) PR_GetSystemInfo(PRSysInfo cmd, char *buf, PRUint32 buflen);
-
-/*
-** Return the number of bytes in a page
-*/
-NSPR_API(PRInt32) PR_GetPageSize(void);
-
-/*
-** Return log2 of the size of a page
-*/
-NSPR_API(PRInt32) PR_GetPageShift(void);
-
-/*
-** PR_GetNumberOfProcessors() -- returns the number of CPUs
-**
-** Description:
-** PR_GetNumberOfProcessors() extracts the number of processors
-** (CPUs available in an SMP system) and returns the number.
-** 
-** Parameters:
-**   none
-**
-** Returns:
-**   The number of available processors or -1 on error
-** 
-*/
-NSPR_API(PRInt32) PR_GetNumberOfProcessors( void );
-
-/*
-** PR_GetPhysicalMemorySize() -- returns the amount of system RAM
-**
-** Description:
-** PR_GetPhysicalMemorySize() determines the amount of physical RAM
-** in the system and returns the size in bytes.
-**
-** Parameters:
-**   none
-**
-** Returns:
-**   The amount of system RAM, or 0 on failure.
-**
-*/
-NSPR_API(PRUint64) PR_GetPhysicalMemorySize(void);
-
-PR_END_EXTERN_C
-
-#endif /* prsystem_h___ */
diff --git a/openflow/usr/include/nspr/prthread.h b/openflow/usr/include/nspr/prthread.h
deleted file mode 100644
index f8b28a6..0000000
--- a/openflow/usr/include/nspr/prthread.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prthread_h___
-#define prthread_h___
-
-/*
-** API for NSPR threads. On some architectures (Mac OS Classic
-** notably) pre-emptibility is not guaranteed. Hard priority scheduling
-** is not guaranteed, so programming using priority based synchronization
-** is a no-no.
-**
-** NSPR threads are scheduled based loosely on their client set priority.
-** In general, a thread of a higher priority has a statistically better
-** chance of running relative to threads of lower priority. However,
-** NSPR uses multiple strategies to provide execution vehicles for thread
-** abstraction of various host platforms. As it turns out, there is little
-** NSPR can do to affect the scheduling attributes of "GLOBAL" threads.
-** However, a semblance of GLOBAL threads is used to implement "LOCAL"
-** threads. An arbitrary number of such LOCAL threads can be assigned to
-** a single GLOBAL thread.
-**
-** For scheduling, NSPR will attempt to run the highest priority LOCAL
-** thread associated with a given GLOBAL thread. It is further assumed
-** that the host OS will apply some form of "fair" scheduling on the
-** GLOBAL threads.
-**
-** Threads have a "system flag" which when set indicates the thread
-** doesn't count for determining when the process should exit (the
-** process exits when the last user thread exits).
-**
-** Threads also have a "scope flag" which controls whether the threads
-** are scheduled in the local scope or scheduled by the OS globally. This 
-** indicates whether a thread is permanently bound to a native OS thread. 
-** An unbound thread competes for scheduling resources in the same process.
-**
-** Another flag is "state flag" which control whether the thread is joinable.
-** It allows other threads to wait for the created thread to reach completion.
-**
-** Threads can have "per-thread-data" attached to them. Each thread has a
-** per-thread error number and error string which are updated when NSPR
-** operations fail.
-*/
-#include "prtypes.h"
-#include "prinrval.h"
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRThread PRThread;
-typedef struct PRThreadStack PRThreadStack;
-
-typedef enum PRThreadType {
-    PR_USER_THREAD,
-    PR_SYSTEM_THREAD
-} PRThreadType;
-
-typedef enum PRThreadScope {
-    PR_LOCAL_THREAD,
-    PR_GLOBAL_THREAD,
-    PR_GLOBAL_BOUND_THREAD
-} PRThreadScope;
-
-typedef enum PRThreadState {
-    PR_JOINABLE_THREAD,
-    PR_UNJOINABLE_THREAD
-} PRThreadState;
-
-typedef enum PRThreadPriority
-{
-    PR_PRIORITY_FIRST = 0,      /* just a placeholder */
-    PR_PRIORITY_LOW = 0,        /* the lowest possible priority */
-    PR_PRIORITY_NORMAL = 1,     /* most common expected priority */
-    PR_PRIORITY_HIGH = 2,       /* slightly more aggressive scheduling */
-    PR_PRIORITY_URGENT = 3,     /* it does little good to have more than one */
-    PR_PRIORITY_LAST = 3        /* this is just a placeholder */
-} PRThreadPriority;
-
-/*
-** Create a new thread:
-**     "type" is the type of thread to create
-**     "start(arg)" will be invoked as the threads "main"
-**     "priority" will be created thread's priority
-**     "scope" will specify whether the thread is local or global
-**     "state" will specify whether the thread is joinable or not
-**     "stackSize" the size of the stack, in bytes. The value can be zero
-**        and then a machine specific stack size will be chosen.
-**
-** This can return NULL if some kind of error occurs, such as if memory is
-** tight.
-**
-** If you want the thread to start up waiting for the creator to do
-** something, enter a lock before creating the thread and then have the
-** threads start routine enter and exit the same lock. When you are ready
-** for the thread to run, exit the lock.
-**
-** If you want to detect the completion of the created thread, the thread
-** should be created joinable.  Then, use PR_JoinThread to synchrnoize the
-** termination of another thread.
-**
-** When the start function returns the thread exits. If it is the last
-** PR_USER_THREAD to exit then the process exits.
-*/
-NSPR_API(PRThread*) PR_CreateThread(PRThreadType type,
-                     void (PR_CALLBACK *start)(void *arg),
-                     void *arg,
-                     PRThreadPriority priority,
-                     PRThreadScope scope,
-                     PRThreadState state,
-                     PRUint32 stackSize);
-
-/*
-** Wait for thread termination:
-**     "thread" is the target thread 
-**
-** This can return PR_FAILURE if no joinable thread could be found 
-** corresponding to the specified target thread.
-**
-** The calling thread is blocked until the target thread completes.
-** Several threads cannot wait for the same thread to complete; one thread
-** will operate successfully and others will terminate with an error PR_FAILURE.
-** The calling thread will not be blocked if the target thread has already
-** terminated.
-*/
-NSPR_API(PRStatus) PR_JoinThread(PRThread *thread);
-
-/*
-** Return the current thread object for the currently running code.
-** Never returns NULL.
-*/
-NSPR_API(PRThread*) PR_GetCurrentThread(void);
-#ifndef NO_NSPR_10_SUPPORT
-#define PR_CurrentThread() PR_GetCurrentThread() /* for nspr1.0 compat. */
-#endif /* NO_NSPR_10_SUPPORT */
-
-/*
-** Get the priority of "thread".
-*/
-NSPR_API(PRThreadPriority) PR_GetThreadPriority(const PRThread *thread);
-
-/*
-** Change the priority of the "thread" to "priority".
-**
-** PR_SetThreadPriority works in a best-effort manner. On some platforms a
-** special privilege, such as root access, is required to change thread
-** priorities, especially to raise thread priorities. If the caller doesn't
-** have enough privileges to change thread priorites, the function has no
-** effect except causing a future PR_GetThreadPriority call to return
-** |priority|.
-*/
-NSPR_API(void) PR_SetThreadPriority(PRThread *thread, PRThreadPriority priority);
-
-/*
-** Set the name of the current thread, which will be visible in a debugger
-** and accessible via a call to PR_GetThreadName().
-*/
-NSPR_API(PRStatus) PR_SetCurrentThreadName(const char *name);
-
-/*
-** Return the name of "thread", if set.  Otherwise return NULL.
-*/
-NSPR_API(const char *) PR_GetThreadName(const PRThread *thread);
-
-/*
-** This routine returns a new index for per-thread-private data table. 
-** The index is visible to all threads within a process. This index can 
-** be used with the PR_SetThreadPrivate() and PR_GetThreadPrivate() routines 
-** to save and retrieve data associated with the index for a thread.
-**
-** Each index is associationed with a destructor function ('dtor'). The function
-** may be specified as NULL when the index is created. If it is not NULL, the
-** function will be called when:
-**      - the thread exits and the private data for the associated index
-**        is not NULL,
-**      - new thread private data is set and the current private data is
-**        not NULL.
-**
-** The index independently maintains specific values for each binding thread. 
-** A thread can only get access to its own thread-specific-data.
-**
-** Upon a new index return the value associated with the index for all threads
-** is NULL, and upon thread creation the value associated with all indices for 
-** that thread is NULL. 
-**
-** Returns PR_FAILURE if the total number of indices will exceed the maximun 
-** allowed.
-*/
-typedef void (PR_CALLBACK *PRThreadPrivateDTOR)(void *priv);
-
-NSPR_API(PRStatus) PR_NewThreadPrivateIndex(
-    PRUintn *newIndex, PRThreadPrivateDTOR destructor);
-
-/*
-** Define some per-thread-private data.
-**     "tpdIndex" is an index into the per-thread private data table
-**     "priv" is the per-thread-private data 
-**
-** If the per-thread private data table has a previously registered
-** destructor function and a non-NULL per-thread-private data value,
-** the destructor function is invoked.
-**
-** This can return PR_FAILURE if the index is invalid.
-*/
-NSPR_API(PRStatus) PR_SetThreadPrivate(PRUintn tpdIndex, void *priv);
-
-/*
-** Recover the per-thread-private data for the current thread. "tpdIndex" is
-** the index into the per-thread private data table. 
-**
-** The returned value may be NULL which is indistinguishable from an error 
-** condition.
-**
-** A thread can only get access to its own thread-specific-data.
-*/
-NSPR_API(void*) PR_GetThreadPrivate(PRUintn tpdIndex);
-
-/*
-** This routine sets the interrupt request for a target thread. The interrupt
-** request remains in the thread's state until it is delivered exactly once
-** or explicitly canceled.
-**
-** A thread that has been interrupted will fail all NSPR blocking operations
-** that return a PRStatus (I/O, waiting on a condition, etc).
-**
-** PR_Interrupt may itself fail if the target thread is invalid.
-*/
-NSPR_API(PRStatus) PR_Interrupt(PRThread *thread);
-
-/*
-** Clear the interrupt request for the calling thread. If no such request
-** is pending, this operation is a noop.
-*/
-NSPR_API(void) PR_ClearInterrupt(void);
-
-/*
-** Block the interrupt for the calling thread.
-*/
-NSPR_API(void) PR_BlockInterrupt(void);
-
-/*
-** Unblock the interrupt for the calling thread.
-*/
-NSPR_API(void) PR_UnblockInterrupt(void);
-
-/*
-** Make the current thread sleep until "ticks" time amount of time
-** has expired. If "ticks" is PR_INTERVAL_NO_WAIT then the call is
-** equivalent to calling PR_Yield. Calling PR_Sleep with an argument
-** equivalent to PR_INTERVAL_NO_TIMEOUT is an error and will result
-** in a PR_FAILURE error return.
-*/
-NSPR_API(PRStatus) PR_Sleep(PRIntervalTime ticks);
-
-/*
-** Get the scoping of this thread.
-*/
-NSPR_API(PRThreadScope) PR_GetThreadScope(const PRThread *thread);
-
-/*
-** Get the type of this thread.
-*/
-NSPR_API(PRThreadType) PR_GetThreadType(const PRThread *thread);
-
-/*
-** Get the join state of this thread.
-*/
-NSPR_API(PRThreadState) PR_GetThreadState(const PRThread *thread);
-
-PR_END_EXTERN_C
-
-#endif /* prthread_h___ */
diff --git a/openflow/usr/include/nspr/prtime.h b/openflow/usr/include/nspr/prtime.h
deleted file mode 100644
index caaee14..0000000
--- a/openflow/usr/include/nspr/prtime.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- *----------------------------------------------------------------------
- *
- * prtime.h --
- *
- *     NSPR date and time functions
- *
- *-----------------------------------------------------------------------
- */
-
-#ifndef prtime_h___
-#define prtime_h___
-
-#include "prlong.h"
-
-PR_BEGIN_EXTERN_C
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-#define PR_MSEC_PER_SEC		1000L
-#define PR_USEC_PER_SEC		1000000L
-#define PR_NSEC_PER_SEC		1000000000L
-#define PR_USEC_PER_MSEC	1000L
-#define PR_NSEC_PER_MSEC	1000000L
-
-/*
- * PRTime --
- *
- *     NSPR represents basic time as 64-bit signed integers relative
- *     to midnight (00:00:00), January 1, 1970 Greenwich Mean Time (GMT).
- *     (GMT is also known as Coordinated Universal Time, UTC.)
- *     The units of time are in microseconds. Negative times are allowed
- *     to represent times prior to the January 1970 epoch. Such values are
- *     intended to be exported to other systems or converted to human
- *     readable form.
- *
- *     Notes on porting: PRTime corresponds to time_t in ANSI C.  NSPR 1.0
- *     simply uses PRInt64.
- */
-
-typedef PRInt64 PRTime;
-
-/*
- * Time zone and daylight saving time corrections applied to GMT to
- * obtain the local time of some geographic location
- */
-
-typedef struct PRTimeParameters {
-    PRInt32 tp_gmt_offset;     /* the offset from GMT in seconds */
-    PRInt32 tp_dst_offset;     /* contribution of DST in seconds */
-} PRTimeParameters;
-
-/*
- * PRExplodedTime --
- *
- *     Time broken down into human-readable components such as year, month,
- *     day, hour, minute, second, and microsecond.  Time zone and daylight
- *     saving time corrections may be applied.  If they are applied, the
- *     offsets from the GMT must be saved in the 'tm_params' field so that
- *     all the information is available to reconstruct GMT.
- *
- *     Notes on porting: PRExplodedTime corrresponds to struct tm in
- *     ANSI C, with the following differences:
- *       - an additional field tm_usec;
- *       - replacing tm_isdst by tm_params;
- *       - the month field is spelled tm_month, not tm_mon;
- *       - we use absolute year, AD, not the year since 1900.
- *     The corresponding type in NSPR 1.0 is called PRTime.  Below is
- *     a table of date/time type correspondence in the three APIs:
- *         API          time since epoch          time in components
- *       ANSI C             time_t                  struct tm
- *       NSPR 1.0           PRInt64                   PRTime
- *       NSPR 2.0           PRTime                  PRExplodedTime
- */
-
-typedef struct PRExplodedTime {
-    PRInt32 tm_usec;		    /* microseconds past tm_sec (0-99999)  */
-    PRInt32 tm_sec;             /* seconds past tm_min (0-61, accomodating
-                                   up to two leap seconds) */
-    PRInt32 tm_min;             /* minutes past tm_hour (0-59) */
-    PRInt32 tm_hour;            /* hours past tm_day (0-23) */
-    PRInt32 tm_mday;            /* days past tm_mon (1-31, note that it
-				                starts from 1) */
-    PRInt32 tm_month;           /* months past tm_year (0-11, Jan = 0) */
-    PRInt16 tm_year;            /* absolute year, AD (note that we do not
-				                count from 1900) */
-
-    PRInt8 tm_wday;		        /* calculated day of the week
-				                (0-6, Sun = 0) */
-    PRInt16 tm_yday;            /* calculated day of the year
-				                (0-365, Jan 1 = 0) */
-
-    PRTimeParameters tm_params;  /* time parameters used by conversion */
-} PRExplodedTime;
-
-/*
- * PRTimeParamFn --
- *
- *     A function of PRTimeParamFn type returns the time zone and
- *     daylight saving time corrections for some geographic location,
- *     given the current time in GMT.  The input argument gmt should
- *     point to a PRExplodedTime that is in GMT, i.e., whose
- *     tm_params contains all 0's.
- *
- *     For any time zone other than GMT, the computation is intended to
- *     consist of two steps:
- *       - Figure out the time zone correction, tp_gmt_offset.  This number
- *         usually depends on the geographic location only.  But it may
- *         also depend on the current time.  For example, all of China
- *         is one time zone right now.  But this situation may change
- *         in the future.
- *       - Figure out the daylight saving time correction, tp_dst_offset.
- *         This number depends on both the geographic location and the
- *         current time.  Most of the DST rules are expressed in local
- *         current time.  If so, one should apply the time zone correction
- *         to GMT before applying the DST rules.
- */
-
-typedef PRTimeParameters (PR_CALLBACK *PRTimeParamFn)(const PRExplodedTime *gmt);
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/*
- * The PR_Now routine returns the current time relative to the
- * epoch, midnight, January 1, 1970 UTC. The units of the returned
- * value are microseconds since the epoch.
- *
- * The values returned are not guaranteed to advance in a linear fashion
- * due to the application of time correction protocols which synchronize
- * computer clocks to some external time source. Consequently it should
- * not be depended on for interval timing.
- *
- * The implementation is machine dependent.
- * Cf. time_t time(time_t *tp) in ANSI C.
- */
-NSPR_API(PRTime)
-PR_Now(void);
-
-/*
- * Expand time binding it to time parameters provided by PRTimeParamFn.
- * The calculation is envisoned to proceed in the following steps:
- *   - From given PRTime, calculate PRExplodedTime in GMT
- *   - Apply the given PRTimeParamFn to the GMT that we just calculated
- *     to obtain PRTimeParameters.
- *   - Add the PRTimeParameters offsets to GMT to get the local time
- *     as PRExplodedTime.
- */
-
-NSPR_API(void) PR_ExplodeTime(
-    PRTime usecs, PRTimeParamFn params, PRExplodedTime *exploded);
-
-/* Reverse operation of PR_ExplodeTime */
-NSPR_API(PRTime)
-PR_ImplodeTime(const PRExplodedTime *exploded);
-
-/*
- * Adjust exploded time to normalize field overflows after manipulation.
- * Note that the following fields of PRExplodedTime should not be
- * manipulated:
- *   - tm_month and tm_year: because the number of days in a month and
- *     number of days in a year are not constant, it is ambiguous to
- *     manipulate the month and year fields, although one may be tempted
- *     to.  For example, what does "a month from January 31st" mean?
- *   - tm_wday and tm_yday: these fields are calculated by NSPR.  Users
- *     should treat them as "read-only".
- */
-
-NSPR_API(void) PR_NormalizeTime(
-    PRExplodedTime *exploded, PRTimeParamFn params);
-
-/**********************************************************************/
-/*********************** TIME PARAMETER FUNCTIONS *********************/
-/**********************************************************************/
-
-/* Time parameters that suit current host machine */
-NSPR_API(PRTimeParameters) PR_LocalTimeParameters(const PRExplodedTime *gmt);
-
-/* Time parameters that represent Greenwich Mean Time */
-NSPR_API(PRTimeParameters) PR_GMTParameters(const PRExplodedTime *gmt);
-
-/*
- * Time parameters that represent the US Pacific Time Zone, with the
- * current daylight saving time rules (for testing only)
- */
-NSPR_API(PRTimeParameters) PR_USPacificTimeParameters(const PRExplodedTime *gmt);
-
-/*
- * This parses a time/date string into a PRExplodedTime
- * struct. It populates all fields but it can't split
- * the offset from UTC into tp_gmt_offset and tp_dst_offset in
- * most cases (exceptions: PST/PDT, MST/MDT, CST/CDT, EST/EDT, GMT/BST).
- * In those cases tp_gmt_offset will be the sum of these two and
- * tp_dst_offset will be 0.
- * It returns PR_SUCCESS on success, and PR_FAILURE
- * if the time/date string can't be parsed.
- *
- * Many formats are handled, including:
- *
- *   14 Apr 89 03:20:12
- *   14 Apr 89 03:20 GMT
- *   Fri, 17 Mar 89 4:01:33
- *   Fri, 17 Mar 89 4:01 GMT
- *   Mon Jan 16 16:12 PDT 1989
- *   Mon Jan 16 16:12 +0130 1989
- *   6 May 1992 16:41-JST (Wednesday)
- *   22-AUG-1993 10:59:12.82
- *   22-AUG-1993 10:59pm
- *   22-AUG-1993 12:59am
- *   22-AUG-1993 12:59 PM
- *   Friday, August 04, 1995 3:54 PM
- *   06/21/95 04:24:34 PM
- *   20/06/95 21:07
- *   95-06-08 19:32:48 EDT
- *
- * If the input string doesn't contain a description of the timezone,
- * we consult the `default_to_gmt' to decide whether the string should
- * be interpreted relative to the local time zone (PR_FALSE) or GMT (PR_TRUE).
- * The correct value for this argument depends on what standard specified
- * the time string which you are parsing.
- */
-
-NSPR_API(PRStatus) PR_ParseTimeStringToExplodedTime (
-        const char *string,
-        PRBool default_to_gmt,
-        PRExplodedTime *result);
-
-/*
- * This uses PR_ParseTimeStringToExplodedTime to parse
- * a time/date string and PR_ImplodeTime to transform it into
- * a PRTime (microseconds after "1-Jan-1970 00:00:00 GMT").
- * It returns PR_SUCCESS on success, and PR_FAILURE
- * if the time/date string can't be parsed.
- */
-
-NSPR_API(PRStatus) PR_ParseTimeString (
-	const char *string,
-	PRBool default_to_gmt,
-	PRTime *result);
-
-/* Format a time value into a buffer. Same semantics as strftime() */
-NSPR_API(PRUint32) PR_FormatTime(char *buf, int buflen, const char *fmt,
-                                 const PRExplodedTime *time);
-
-/* Format a time value into a buffer. Time is always in US English format,
- * regardless of locale setting.
- */
-NSPR_API(PRUint32)
-PR_FormatTimeUSEnglish(char *buf, PRUint32 bufSize,
-                       const char *format, const PRExplodedTime *time);
-
-PR_END_EXTERN_C
-
-#endif /* prtime_h___ */
diff --git a/openflow/usr/include/nspr/prtpool.h b/openflow/usr/include/nspr/prtpool.h
deleted file mode 100644
index 6a434dd..0000000
--- a/openflow/usr/include/nspr/prtpool.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prtpool_h___
-#define prtpool_h___
-
-#include "prtypes.h"
-#include "prthread.h"
-#include "prio.h"
-#include "prerror.h"
-
-/*
- * NOTE:
- *		THIS API IS A PRELIMINARY VERSION IN NSPR 4.0 AND IS SUBJECT TO
- *		CHANGE
- */
-
-PR_BEGIN_EXTERN_C
-
-typedef struct PRJobIoDesc {
-    PRFileDesc *socket;
-    PRErrorCode error;
-    PRIntervalTime timeout;
-} PRJobIoDesc;
-
-typedef struct PRThreadPool PRThreadPool;
-typedef struct PRJob PRJob;
-typedef void (PR_CALLBACK *PRJobFn) (void *arg);
-
-/* Create thread pool */
-NSPR_API(PRThreadPool *)
-PR_CreateThreadPool(PRInt32 initial_threads, PRInt32 max_threads,
-                          PRUint32 stacksize);
-
-/* queue a job */
-NSPR_API(PRJob *)
-PR_QueueJob(PRThreadPool *tpool, PRJobFn fn, void *arg, PRBool joinable);
-
-/* queue a job, when a socket is readable */
-NSPR_API(PRJob *)
-PR_QueueJob_Read(PRThreadPool *tpool, PRJobIoDesc *iod,
-							PRJobFn fn, void * arg, PRBool joinable);
-
-/* queue a job, when a socket is writeable */
-NSPR_API(PRJob *)
-PR_QueueJob_Write(PRThreadPool *tpool, PRJobIoDesc *iod,
-								PRJobFn fn, void * arg, PRBool joinable);
-
-/* queue a job, when a socket has a pending connection */
-NSPR_API(PRJob *)
-PR_QueueJob_Accept(PRThreadPool *tpool, PRJobIoDesc *iod,
-									PRJobFn fn, void * arg, PRBool joinable);
-
-/* queue a job, when the socket connection to addr succeeds or fails */
-NSPR_API(PRJob *)
-PR_QueueJob_Connect(PRThreadPool *tpool, PRJobIoDesc *iod,
-			const PRNetAddr *addr, PRJobFn fn, void * arg, PRBool joinable);
-
-/* queue a job, when a timer exipres */
-NSPR_API(PRJob *)
-PR_QueueJob_Timer(PRThreadPool *tpool, PRIntervalTime timeout,
-								PRJobFn fn, void * arg, PRBool joinable);
-/* cancel a job */
-NSPR_API(PRStatus)
-PR_CancelJob(PRJob *job);
-
-/* join a job */
-NSPR_API(PRStatus)
-PR_JoinJob(PRJob *job);
-
-/* shutdown pool */
-NSPR_API(PRStatus)
-PR_ShutdownThreadPool(PRThreadPool *tpool);
-
-/* join pool, wait for exit of all threads */
-NSPR_API(PRStatus)
-PR_JoinThreadPool(PRThreadPool *tpool);
-
-PR_END_EXTERN_C
-
-#endif /* prtpool_h___ */
diff --git a/openflow/usr/include/nspr/prtrace.h b/openflow/usr/include/nspr/prtrace.h
deleted file mode 100644
index 12a5fbf..0000000
--- a/openflow/usr/include/nspr/prtrace.h
+++ /dev/null
@@ -1,646 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prtrace_h___
-#define prtrace_h___
-/*
-** prtrace.h -- NSPR's Trace Facility.  		           
-**                                                               		           
-** The Trace Facility provides a means to trace application				           
-** program events within a process. When implementing an         		           
-** application program an engineer may insert a "Trace" function 		           
-** call, passing arguments to be traced. The "Trace" function     		           
-** combines the user trace data with identifying data and        		           
-** writes this data in time ordered sequence into a circular     		           
-** in-memory buffer; when the buffer fills, it wraps.
-**                                                               		           
-** Functions are provided to set and/or re-configure the size of		           
-** the trace buffer, control what events are recorded in the			           
-** buffer, enable and disable tracing based on specific user			           
-** supplied data and other control functions. Methods are provided		           
-** to record the trace entries in the in-memory trace buffer to
-** a file.
-**                                                               		           
-** Tracing may cause a performance degredation to the application		           
-** depending on the number and placement of calls to the tracing		           
-** facility. When tracing is compiled in and all tracing is				           
-** disabled via the runtime controls, the overhead should be			           
-** minimal. ... Famous last words, eh?									           
-** 																                   
-** When DEBUG is defined at compile time, the Trace Facility is                    
-** compiled as part of NSPR and any application using NSPR's                       
-** header files will have tracing compiled in. When DEBUG is not                   
-** defined, the Trace Facility is not compiled into NSPR nor                       
-** exported in its header files.  If the Trace Facility is                         
-** desired in a non-debug build, then FORCE_NSPR_TRACE may be                      
-** defined at compile time for both the optimized build of NSPR                    
-** and the application. NSPR and any application using  NSPR's                     
-** Trace Facility must be compiled with the same level of trace                    
-** conditioning or unresolved references may be realized at link                   
-** time.                                                                           
-**                                                                                 
-** For any of the Trace Facility methods that requires a trace                     
-** handle as an input argument, the caller must ensure that the                    
-** trace handle argument is valid. An invalid trace handle                         
-** argument may cause unpredictable results.                                       
-**                                                                                 
-** Trace Facility methods are thread-safe and SMP safe.                            
-**                                                                                 
-** Users of the Trace Facility should use the defined macros to                     
-** invoke trace methods, not the function calls directly. e.g.                      
-** PR_TRACE( h1,0,1,2, ...); not PR_Trace(h1,0,1,2, ...);
-**                                                                                  
-** Application designers should be aware of the effects of
-** debug and optimized build differences when using result of the
-** Trace Facility macros in expressions.
-** 
-** See Also: prcountr.h                                                                                 
-**                                                                                  
-** /lth. 08-Jun-1998.                                                                                  
-*/
-
-#include "prtypes.h"
-#include "prthread.h"
-#include "prtime.h"
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Opaque type for the trace handle 
-** ... Don't even think about looking in here.
-**
-*/
-typedef void *  PRTraceHandle;
-
-/*
-** PRTraceEntry -- A trace entry in the in-memory trace buffer
-** looks like this.
-**
-*/
-typedef struct PRTraceEntry
-{
-    PRThread        *thread;        /* The thread creating the trace entry */
-    PRTraceHandle   handle;         /* PRTraceHandle creating the trace entry */
-    PRTime          time;           /* Value of PR_Now() at time of trace entry */
-    PRUint32        userData[8];    /* user supplied trace data */
-} PRTraceEntry;
-
-/*
-** PRTraceOption -- command operands to
-** PR_[Set|Get]TraceOption(). See descriptive meanings there.
-**
-*/
-typedef enum PRTraceOption
-{
-    PRTraceBufSize,
-    PRTraceEnable,              
-    PRTraceDisable,
-    PRTraceSuspend,
-    PRTraceResume,
-    PRTraceSuspendRecording,
-    PRTraceResumeRecording,
-    PRTraceLockHandles,
-    PRTraceUnLockHandles,
-    PRTraceStopRecording
-} PRTraceOption;
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DEFINE_TRACE() -- Define a PRTraceHandle
-** 
-** DESCRIPTION: PR_DEFINE_TRACE() is used to define a trace
-** handle.
-** 
-*/
-#define PR_DEFINE_TRACE(name) PRTraceHandle name
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_INIT_TRACE_HANDLE() -- Set the value of a PRTraceHandle
-** 
-** DESCRIPTION: 
-** PR_INIT_TRACE_HANDLE() sets the value of a PRTraceHandle
-** to value. e.g. PR_INIT_TRACE_HANDLE( myHandle, NULL );
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_INIT_TRACE_HANDLE(handle,value)\
-    (handle) = (PRCounterHandle)(value)
-#else
-#define PR_INIT_TRACE_HANDLE(handle,value)
-#endif
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_CreateTrace() -- Create a trace handle
-** 
-** DESCRIPTION:
-**  PR_CreateTrace() creates a new trace handle. Tracing is
-**  enabled for this handle when it is created. The trace handle
-**  is intended for use in other Trace Facility calls.
-**  
-**  PR_CreateTrace() registers the QName, RName and description
-**  data so that this data can be retrieved later.
-** 
-** INPUTS: 
-**  qName: pointer to string. QName for this trace handle. 
-** 
-**  rName: pointer to string. RName for this trace handle. 
-** 
-**  description: pointer to string. Descriptive data about this
-**  trace handle.
-**
-** OUTPUTS:
-**  Creates the trace handle. 
-**  Registers the QName and RName with the trace facility.
-** 
-** RETURNS: 
-**  PRTraceHandle
-** 
-** RESTRICTIONS:
-**  qName is limited to 31 characters.
-**  rName is limited to 31 characters.
-**  description is limited to 255 characters.
-** 
-*/
-#define PRTRACE_NAME_MAX 31
-#define PRTRACE_DESC_MAX 255
-
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_CREATE_TRACE(handle,qName,rName,description)\
-    (handle) = PR_CreateTrace((qName),(rName),(description))
-#else
-#define PR_CREATE_TRACE(handle,qName,rName,description)
-#endif
-
-NSPR_API(PRTraceHandle)
-	PR_CreateTrace( 
-    	const char *qName,          /* QName for this trace handle */
-	    const char *rName,          /* RName for this trace handle */
-	    const char *description     /* description for this trace handle */
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_DestroyTrace() -- Destroy a trace handle
-** 
-** DESCRIPTION: 
-**  PR_DestroyTrace() removes the referenced trace handle and
-** associated QName, RName and description data from the Trace
-** Facility.
-** 
-** INPUTS: handle. A PRTraceHandle
-** 
-** OUTPUTS: 
-**  The trace handle is unregistered.
-**  The QName, RName and description are removed.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_DESTROY_TRACE(handle)\
-    PR_DestroyTrace((handle))
-#else
-#define PR_DESTROY_TRACE(handle)
-#endif
-
-NSPR_API(void) 
-	PR_DestroyTrace( 
-		PRTraceHandle handle    /* Handle to be destroyed */
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_Trace() -- Make a trace entry in the in-memory trace
-** 
-** DESCRIPTION:
-** PR_Trace() makes an entry in the in-memory trace buffer for
-** the referenced trace handle. The next logically available
-** PRTraceEntry is used; when the next trace entry would overflow
-** the trace table, the table wraps.
-**
-** PR_Trace() for a specific trace handle may be disabled by
-** calling PR_SetTraceOption() specifying PRTraceDisable for the
-** trace handle to be disabled.
-** 
-** INPUTS:
-** handle: PRTraceHandle. The trace handle for this trace.
-** 
-** userData[0..7]: unsigned 32bit integers. user supplied data
-** that is copied into the PRTraceEntry
-** 
-** OUTPUTS:
-**  A PRTraceEntry is (conditionally) formatted in the in-memory
-** trace buffer.
-** 
-** RETURNS: void.
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_TRACE(handle,ud0,ud1,ud2,ud3,ud4,ud5,ud6,ud7)\
-    PR_Trace((handle),(ud0),(ud1),(ud2),(ud3),(ud4),(ud5),(ud6),(ud7))
-#else
-#define PR_TRACE(handle,ud0,ud1,ud2,ud3,ud4,ud5,ud6,ud7)
-#endif
-
-NSPR_API(void) 
-	PR_Trace( 
-    	PRTraceHandle handle,       /* use this trace handle */
-	    PRUint32    userData0,      /* User supplied data word 0 */
-	    PRUint32    userData1,      /* User supplied data word 1 */
-	    PRUint32    userData2,      /* User supplied data word 2 */
-	    PRUint32    userData3,      /* User supplied data word 3 */
-	    PRUint32    userData4,      /* User supplied data word 4 */
-	    PRUint32    userData5,      /* User supplied data word 5 */
-	    PRUint32    userData6,      /* User supplied data word 6 */
-	    PRUint32    userData7       /* User supplied data word 7 */
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_SetTraceOption() -- Control the Trace Facility
-** 
-** DESCRIPTION:
-** PR_SetTraceOption() controls the Trace Facility. Depending on
-** command and value, attributes of the Trace Facility may be
-** changed.
-** 
-** INPUTS:
-**  command: An enumerated value in the set of PRTraceOption.
-**  value: pointer to the data to be set. Type of the data is
-**  dependent on command; for each value of command, the type
-**  and meaning of dereferenced value is shown.
-**
-**  PRTraceBufSize: unsigned long: the size of the trace buffer,
-** in bytes.
-** 
-**  PRTraceEnable: PRTraceHandle. The trace handle to be
-** enabled.
-** 
-**  PRTraceDisable: PRTraceHandle. The trace handle to be
-** disabled.
-** 
-**  PRTraceSuspend: void. value must be NULL. All tracing is
-** suspended.
-** 
-**  PRTraceResume: void. value must be NULL. Tracing for all
-** previously enabled, prior to a PRTraceSuspend, is resumed.
-** 
-**  PRTraceStopRecording: void. value must be NULL. If recording
-** (see: ** PR_RecordTraceEntries()) is being done, 
-** PRTraceStopRecording causes PR_RecordTraceEntries() to return
-** to its caller. If recording is not being done, this function
-** has no effect.
-** 
-**  PRTraceSuspendRecording: void. Must be NULL. If recording is
-** being done, PRTraceSuspendRecording causes further writes to
-** the trace file to be suspended. Data in the in-memory
-** trace buffer that would ordinarily be written to the
-** trace file will not be written. Trace entries will continue
-** to be entered in the in-memory buffer. If the Trace Facility
-** recording is already in a suspended state, the call has no
-** effect.
-** 
-**  PRTraceResumeRecording: void. value must be NULL. If
-** recording for the Trace Facility has been previously been
-** suspended, this causes recording to resume. Recording resumes
-** with the next in-memory buffer segment that would be written
-** if trace recording had not been suspended. If recording is
-** not currently suspended, the call has no effect.
-** 
-**  PRTraceLockHandles: void. value must be NULL. Locks the
-** trace handle lock. While the trace handle lock is held,
-** calls to PR_CreateTrace() will block until the lock is
-** released.
-** 
-**  PRTraceUnlockHandles: void. value must be NULL. Unlocks the
-** trace handle lock.
-** 
-** OUTPUTS:
-**  The operation of the Trace Facility may be changed.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_SET_TRACE_OPTION(command,value)\
-    PR_SetTraceOption((command),(value))
-#else
-#define PR_SET_TRACE_OPTION(command,value)
-#endif
-
-NSPR_API(void) 
-	PR_SetTraceOption( 
-	    PRTraceOption command,  /* One of the enumerated values */
-	    void *value             /* command value or NULL */
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetTraceOption() -- Retrieve settings from the Trace Facility
-** 
-** DESCRIPTION:
-** PR_GetTraceOption() retrieves the current setting of the
-** Trace Facility control depending on command.
-** 
-** 
-**  PRTraceBufSize: unsigned long: the size of the trace buffer,
-** in bytes.
-** 
-** 
-** INPUTS:
-**  command: one of the enumerated values in PRTraceOptions
-** valid for PR_GetTraceOption().
-** 
-** OUTPUTS:
-**  dependent on command.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_GET_TRACE_OPTION(command,value)\
-    PR_GetTraceOption((command),(value))
-#else
-#define PR_GET_TRACE_OPTION(command,value)
-#endif
-
-NSPR_API(void) 
-	PR_GetTraceOption( 
-    	PRTraceOption command,  /* One of the enumerated values */
-	    void *value             /* command value or NULL */
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetTraceHandleFromName() -- Retrieve an existing
-** handle by name.
-** 
-** DESCRIPTION:
-** PR_GetTraceHandleFromName() retreives an existing tracehandle
-** using the name specified by qName and rName.
-** 
-** INPUTS:
-**  qName: pointer to string. QName for this trace handle. 
-** 
-**  rName: pointer to string. RName for this trace handle. 
-** 
-** 
-** OUTPUTS: returned.
-** 
-** RETURNS: 
-**  PRTraceHandle associated with qName and rName or NULL when
-** there is no match.
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_GET_TRACE_HANDLE_FROM_NAME(handle,qName,rName)\
-    (handle) = PR_GetTraceHandleFromName((qName),(rName))
-#else
-#define PR_GET_TRACE_HANDLE_FROM_NAME(handle,qName,rName)
-#endif
-
-NSPR_API(PRTraceHandle) 
-	PR_GetTraceHandleFromName( 
-    	const char *qName,      /* QName search argument */
-        const char *rName       /* RName search argument */
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetTraceNameFromHandle() -- Retreive trace name
-** by bandle.
-** 
-** DESCRIPTION:
-** PR_GetTraceNameFromHandle() retreives the existing qName,
-** rName, and description for the referenced trace handle.
-** 
-** INPUTS: handle: PRTraceHandle.
-** 
-** OUTPUTS: pointers to the Trace Facility's copy of qName,
-** rName and description. ... Don't mess with these values.
-** They're mine.
-** 
-** RETURNS: void
-** 
-** RESTRICTIONS:
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_GET_TRACE_NAME_FROM_HANDLE(handle,qName,rName,description)\
-    PR_GetTraceNameFromHandle((handle),(qName),(rName),(description))
-#else
-#define PR_GET_TRACE_NAME_FROM_HANDLE(handle,qName,rName,description)
-#endif
-
-NSPR_API(void) 
-	PR_GetTraceNameFromHandle( 
-    	PRTraceHandle handle,       /* handle as search argument */
-	    const char **qName,         /* pointer to associated QName */
-	    const char **rName,         /* pointer to associated RName */
-    	const char **description    /* pointer to associated description */
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_FindNextTraceQname() -- Retrieive a QName handle
-** iterator.
-** 
-** DESCRIPTION:
-** PR_FindNextTraceQname() retreives the first or next trace
-** QName handle, depending on the value of handle, from the trace
-** database. The PRTraceHandle returned can be used as an
-** iterator to traverse the QName handles in the Trace database.
-** 
-** INPUTS:
-**  handle: When NULL, PR_FindNextQname() returns the first QName
-** handle. When a handle is a valid PRTraceHandle previously
-** retreived using PR_FindNextQname() the next QName handle is
-** retreived.
-** 
-** OUTPUTS: returned.
-** 
-** RETURNS: 
-**  PRTraceHandle or NULL when there are no trace handles.
-** 
-** RESTRICTIONS:
-**  Iterating thru the trace handles via FindFirst/FindNext
-** should be done under protection of the trace handle lock.
-** See: PR_SetTraceOption( PRLockTraceHandles ).
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_FIND_NEXT_TRACE_QNAME(next,handle)\
-    (next) = PR_FindNextTraceQname((handle))
-#else
-#define PR_FIND_NEXT_TRACE_QNAME(next,handle)
-#endif
-
-NSPR_API(PRTraceHandle) 
-	PR_FindNextTraceQname( 
-        PRTraceHandle handle
-);
-
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_FindNextTraceRname() -- Retrieive an RName handle
-** iterator.
-** 
-** DESCRIPTION:
-** PR_FindNextTraceRname() retreives the first or next trace
-** RName handle, depending on the value of handle, from the trace
-** database. The PRTraceHandle returned can be used as an
-** iterator to traverse the RName handles in the Trace database.
-** 
-** INPUTS:
-**  rhandle: When NULL, PR_FindNextRname() returns the first
-** RName handle. When a handle is a valid PRTraceHandle
-** previously retreived using PR_FindNextRname() the next RName
-** handle is retreived.
-**  qhandle: A valid PRTraceHandle retruned from a previous call
-** to PR_FIND_NEXT_TRACE_QNAME().
-** 
-** OUTPUTS: returned.
-** 
-** RETURNS: 
-**  PRTraceHandle or NULL when there are no trace handles.
-** 
-** RESTRICTIONS:
-**  Iterating thru the trace handles via FindNext should be done
-** under protection of the trace handle lock. See: (
-** PR_SetTraceOption( PRLockTraceHandles ).
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_FIND_NEXT_TRACE_RNAME(next,rhandle,qhandle)\
-    (next) = PR_FindNextTraceRname((rhandle),(qhandle))
-#else
-#define PR_FIND_NEXT_TRACE_RNAME(next,rhandle,qhandle)
-#endif
-
-NSPR_API(PRTraceHandle) 
-	PR_FindNextTraceRname( 
-        PRTraceHandle rhandle,
-        PRTraceHandle qhandle
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_RecordTraceEntries() -- Write trace entries to external media
-** 
-** DESCRIPTION:
-** PR_RecordTraceEntries() causes entries in the in-memory trace
-** buffer to be written to external media.
-**
-** When PR_RecordTraceEntries() is called from an application
-** thread, the function appears to block until another thread
-** calls PR_SetTraceOption() with the PRTraceStopRecording
-** option. This suggests that PR_RecordTraceEntries() should be
-** called from a user supplied thread whose only job is to
-** record trace entries. 
-** 
-** The environment variable NSPR_TRACE_LOG controls the operation
-** of this function. When NSPR_TRACE_LOG is not defined in the
-** environment, no recording of trace entries occurs. When
-** NSPR_TRACE_LOG is defined, the value of its definition must be
-** the filename of the file to receive the trace entry buffer.
-**
-** PR_RecordTraceEntries() attempts to record the in-memory
-** buffer to a file, subject to the setting of the environment
-** variable NSPR_TRACE_LOG. It is possible because of system
-** load, the thread priority of the recording thread, number of
-** active trace records being written over time, and other
-** variables that some trace records can be lost. ... In other
-** words: don't bet the farm on getting everything.
-** 
-** INPUTS: none
-** 
-** OUTPUTS: none
-** 
-** RETURNS: PR_STATUS
-**    PR_SUCCESS no errors were found.
-**    PR_FAILURE errors were found.
-** 
-** RESTRICTIONS:
-** Only one thread can call PR_RecordTraceEntries() within a
-** process.
-** 
-** On error, PR_RecordTraceEntries() may return prematurely.
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_RECORD_TRACE_ENTRIES()\
-	PR_RecordTraceEntries()
-#else
-#define PR_RECORD_TRACE_ENTRIES()
-#endif
-    
-NSPR_API(void)
-	PR_RecordTraceEntries(
-        void 
-);
-
-/* -----------------------------------------------------------------------
-** FUNCTION: PR_GetTraceEntries() -- Retreive trace entries from
-** the Trace Facility
-** 
-** DESCRIPTION:
-** PR_GetTraceEntries() retreives trace entries from the Trace
-** Facility. Up to count trace entries are copied from the Trace
-** Facility into buffer. Only those trace entries that have not
-** been copied via a previous call to PR_GetTraceEntries() are
-** copied. The actual number copied is placed in the PRInt32
-** variable pointed to by found.
-**
-** If more than count trace entries have entered the Trace
-** Facility since the last call to PR_GetTraceEntries() 
-** a lost data condition is returned. In this case, the most
-** recent count trace entries are copied into buffer and found is
-** set to count.
-** 
-** INPUTS:
-**  count. The number of trace entries to be copied into buffer.
-** 
-** 
-** OUTPUTS:
-**  buffer. An array of PRTraceEntries. The buffer is supplied
-** by the caller.
-** 
-** found: 32bit signed integer. The number of PRTraceEntries
-** actually copied. found is always less than or equal to count.
-** 
-** RETURNS: 
-**  zero when there is no lost data.
-**  non-zero when some PRTraceEntries have been lost.
-** 
-** RESTRICTIONS:
-** This is a real performance pig. The copy out operation is bad
-** enough, but depending on then frequency of calls to the
-** function, serious performance impact to the operating
-** application may be realized. ... YMMV.
-** 
-*/
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
-#define PR_GET_TRACE_ENTRIES(buffer,count,found)\
-        PR_GetTraceEntries((buffer),(count),(found))
-#else
-#define PR_GET_TRACE_ENTRIES(buffer,count,found)
-#endif
-
-NSPR_API(PRIntn)
-    PR_GetTraceEntries(
-        PRTraceEntry    *buffer,    /* where to write output */
-        PRInt32         count,      /* number to get */
-        PRInt32         *found      /* number you got */
-);
-
-PR_END_EXTERN_C
-
-#endif /* prtrace_h___ */
-
diff --git a/openflow/usr/include/nspr/prtypes.h b/openflow/usr/include/nspr/prtypes.h
deleted file mode 100644
index 52b3ab0..0000000
--- a/openflow/usr/include/nspr/prtypes.h
+++ /dev/null
@@ -1,590 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File:                prtypes.h
-** Description: Definitions of NSPR's basic types
-**
-** Prototypes and macros used to make up for deficiencies that we have found
-** in ANSI environments.
-**
-** Since we do not wrap <stdlib.h> and all the other standard headers, authors
-** of portable code will not know in general that they need these definitions.
-** Instead of requiring these authors to find the dependent uses in their code
-** and take the following steps only in those C files, we take steps once here
-** for all C files.
-**/
-
-#ifndef prtypes_h___
-#define prtypes_h___
-
-#ifdef MDCPUCFG
-#include MDCPUCFG
-#else
-#include "prcpucfg.h"
-#endif
-
-#include <stddef.h>
-
-/***********************************************************************
-** MACROS:      PR_EXTERN
-**              PR_IMPLEMENT
-** DESCRIPTION:
-**      These are only for externally visible routines and globals.  For
-**      internal routines, just use "extern" for type checking and that
-**      will not export internal cross-file or forward-declared symbols.
-**      Define a macro for declaring procedures return types. We use this to
-**      deal with windoze specific type hackery for DLL definitions. Use
-**      PR_EXTERN when the prototype for the method is declared. Use
-**      PR_IMPLEMENT for the implementation of the method.
-**
-** Example:
-**   in dowhim.h
-**     PR_EXTERN( void ) DoWhatIMean( void );
-**   in dowhim.c
-**     PR_IMPLEMENT( void ) DoWhatIMean( void ) { return; }
-**
-**
-***********************************************************************/
-#if defined(WIN32)
-
-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT(__type) __declspec(dllimport) __type
-#define PR_IMPORT_DATA(__type) __declspec(dllimport) __type
-
-#define PR_EXTERN(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(XP_BEOS)
-
-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT_DATA(__type) extern __declspec(dllexport) __type
-
-#define PR_EXTERN(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(XP_OS2) && defined(__declspec)
-
-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT(__type) extern  __declspec(dllimport) __type
-#define PR_IMPORT_DATA(__type) extern __declspec(dllimport) __type
-
-#define PR_EXTERN(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(SYMBIAN)
-
-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#ifdef __WINS__
-#define PR_IMPORT(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT_DATA(__type) extern __declspec(dllexport) __type
-#else
-#define PR_IMPORT(__type) extern __declspec(dllimport) __type
-#define PR_IMPORT_DATA(__type) extern __declspec(dllimport) __type
-#endif
-
-#define PR_EXTERN(__type) extern __type
-#define PR_IMPLEMENT(__type) __type
-#define PR_EXTERN_DATA(__type) extern __type
-#define PR_IMPLEMENT_DATA(__type) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#else /* Unix */
-
-/* GCC 3.3 and later support the visibility attribute. */
-#if (__GNUC__ >= 4) || \
-    (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-#define PR_VISIBILITY_DEFAULT __attribute__((visibility("default")))
-#else
-#define PR_VISIBILITY_DEFAULT
-#endif
-
-#define PR_EXPORT(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_EXPORT_DATA(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPORT(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPORT_DATA(__type) extern PR_VISIBILITY_DEFAULT __type
-
-#define PR_EXTERN(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPLEMENT(__type) PR_VISIBILITY_DEFAULT __type
-#define PR_EXTERN_DATA(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPLEMENT_DATA(__type) PR_VISIBILITY_DEFAULT __type
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#endif
-
-#if defined(_NSPR_BUILD_)
-#define NSPR_API(__type) PR_EXPORT(__type)
-#define NSPR_DATA_API(__type) PR_EXPORT_DATA(__type)
-#else
-#define NSPR_API(__type) PR_IMPORT(__type)
-#define NSPR_DATA_API(__type) PR_IMPORT_DATA(__type)
-#endif
-
-/***********************************************************************
-** MACROS:      PR_BEGIN_MACRO
-**              PR_END_MACRO
-** DESCRIPTION:
-**      Macro body brackets so that macros with compound statement definitions
-**      behave syntactically more like functions when called.
-***********************************************************************/
-#define PR_BEGIN_MACRO  do {
-#define PR_END_MACRO    } while (0)
-
-/***********************************************************************
-** MACROS:      PR_BEGIN_EXTERN_C
-**              PR_END_EXTERN_C
-** DESCRIPTION:
-**      Macro shorthands for conditional C++ extern block delimiters.
-***********************************************************************/
-#ifdef __cplusplus
-#define PR_BEGIN_EXTERN_C       extern "C" {
-#define PR_END_EXTERN_C         }
-#else
-#define PR_BEGIN_EXTERN_C
-#define PR_END_EXTERN_C
-#endif
-
-/***********************************************************************
-** MACROS:      PR_BIT
-**              PR_BITMASK
-** DESCRIPTION:
-** Bit masking macros.  XXX n must be <= 31 to be portable
-***********************************************************************/
-#define PR_BIT(n)       ((PRUint32)1 << (n))
-#define PR_BITMASK(n)   (PR_BIT(n) - 1)
-
-/***********************************************************************
-** MACROS:      PR_ROUNDUP
-**              PR_MIN
-**              PR_MAX
-**              PR_ABS
-** DESCRIPTION:
-**      Commonly used macros for operations on compatible types.
-***********************************************************************/
-#define PR_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
-#define PR_MIN(x,y)     ((x)<(y)?(x):(y))
-#define PR_MAX(x,y)     ((x)>(y)?(x):(y))
-#define PR_ABS(x)       ((x)<0?-(x):(x))
-
-/***********************************************************************
-** MACROS:      PR_ARRAY_SIZE
-** DESCRIPTION:
-**  The number of elements in an array.
-***********************************************************************/
-#define PR_ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
-
-PR_BEGIN_EXTERN_C
-
-/*
-** Starting in NSPR 4.9.5, NSPR's exact-width integer types should match
-** the exact-width integer types defined in <stdint.h>. This allows sloppy
-** code to use PRInt{N} and int{N}_t interchangeably.
-**
-** The 8-bit and 16-bit integer types can only be defined using char and
-** short. All platforms define the 32-bit integer types using int. So only
-** the 64-bit integer types could be defined differently.
-**
-** NSPR's original strategy was to use the "shortest" 64-bit integer type:
-** if long is 64-bit, then prefer it over long long. This strategy is also
-** used by Linux/glibc, FreeBSD, and NetBSD.
-**
-** Other platforms use a different strategy: simply define the 64-bit
-** integer types using long long. We define the PR_ALTERNATE_INT64_TYPEDEF
-** macro on these platforms. Note that PR_ALTERNATE_INT64_TYPEDEF is for
-** internal use by NSPR headers only. Do not define or test this macro in
-** your code.
-**
-** NOTE: NSPR can't use <stdint.h> because C99 requires C++ code to define
-** __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS to make all the macros
-** defined in <stdint.h> available. This strange requirement is gone in
-** C11. When most platforms ignore this C99 requirement, NSPR will be able
-** to use <stdint.h>. A patch to do that is in NSPR bug 634793.
-*/
-
-#if defined(__APPLE__) || defined(__ANDROID__) || defined(__OpenBSD__)
-#define PR_ALTERNATE_INT64_TYPEDEF
-#endif
-
-/************************************************************************
-** TYPES:       PRUint8
-**              PRInt8
-** DESCRIPTION:
-**  The int8 types are known to be 8 bits each. There is no type that
-**      is equivalent to a plain "char".
-************************************************************************/
-#if PR_BYTES_PER_BYTE == 1
-typedef unsigned char PRUint8;
-/*
-** Some cfront-based C++ compilers do not like 'signed char' and
-** issue the warning message:
-**     warning: "signed" not implemented (ignored)
-** For these compilers, we have to define PRInt8 as plain 'char'.
-** Make sure that plain 'char' is indeed signed under these compilers.
-*/
-#if (defined(HPUX) && defined(__cplusplus) \
-        && !defined(__GNUC__) && __cplusplus < 199707L) \
-    || (defined(SCO) && defined(__cplusplus) \
-        && !defined(__GNUC__) && __cplusplus == 1L)
-typedef char PRInt8;
-#else
-typedef signed char PRInt8;
-#endif
-#else
-#error No suitable type for PRInt8/PRUint8
-#endif
-
-/************************************************************************
- * MACROS:      PR_INT8_MAX
- *              PR_INT8_MIN
- *              PR_UINT8_MAX
- * DESCRIPTION:
- *  The maximum and minimum values of a PRInt8 or PRUint8.
-************************************************************************/
-
-#define PR_INT8_MAX 127
-#define PR_INT8_MIN (-128)
-#define PR_UINT8_MAX 255U
-
-/************************************************************************
-** TYPES:       PRUint16
-**              PRInt16
-** DESCRIPTION:
-**  The int16 types are known to be 16 bits each.
-************************************************************************/
-#if PR_BYTES_PER_SHORT == 2
-typedef unsigned short PRUint16;
-typedef short PRInt16;
-#else
-#error No suitable type for PRInt16/PRUint16
-#endif
-
-/************************************************************************
- * MACROS:      PR_INT16_MAX
- *              PR_INT16_MIN
- *              PR_UINT16_MAX
- * DESCRIPTION:
- *  The maximum and minimum values of a PRInt16 or PRUint16.
-************************************************************************/
-
-#define PR_INT16_MAX 32767
-#define PR_INT16_MIN (-32768)
-#define PR_UINT16_MAX 65535U
-
-/************************************************************************
-** TYPES:       PRUint32
-**              PRInt32
-** DESCRIPTION:
-**  The int32 types are known to be 32 bits each.
-************************************************************************/
-#if PR_BYTES_PER_INT == 4
-typedef unsigned int PRUint32;
-typedef int PRInt32;
-#define PR_INT32(x)  x
-#define PR_UINT32(x) x ## U
-#elif PR_BYTES_PER_LONG == 4
-typedef unsigned long PRUint32;
-typedef long PRInt32;
-#define PR_INT32(x)  x ## L
-#define PR_UINT32(x) x ## UL
-#else
-#error No suitable type for PRInt32/PRUint32
-#endif
-
-/************************************************************************
- * MACROS:      PR_INT32_MAX
- *              PR_INT32_MIN
- *              PR_UINT32_MAX
- * DESCRIPTION:
- *  The maximum and minimum values of a PRInt32 or PRUint32.
-************************************************************************/
-
-#define PR_INT32_MAX PR_INT32(2147483647)
-#define PR_INT32_MIN (-PR_INT32_MAX - 1)
-#define PR_UINT32_MAX PR_UINT32(4294967295)
-
-/************************************************************************
-** TYPES:       PRUint64
-**              PRInt64
-** DESCRIPTION:
-**  The int64 types are known to be 64 bits each. Care must be used when
-**      declaring variables of type PRUint64 or PRInt64. Different hardware
-**      architectures and even different compilers have varying support for
-**      64 bit values. The only guaranteed portability requires the use of
-**      the LL_ macros (see prlong.h).
-**
-** MACROS:      PR_INT64
-**              PR_UINT64
-** DESCRIPTION:
-**  The PR_INT64 and PR_UINT64 macros provide a portable way for
-**      specifying 64-bit integer constants. They can only be used if
-**      PRInt64 and PRUint64 are defined as compiler-supported 64-bit
-**      integer types (i.e., if HAVE_LONG_LONG is defined, which is true
-**      for all the supported compilers topday). If PRInt64 and PRUint64
-**      are defined as structs, the LL_INIT macro defined in prlong.h has
-**      to be used.
-**
-** MACROS:      PR_INT64_MAX
-**              PR_INT64_MIN
-**              PR_UINT64_MAX
-** DESCRIPTION:
-**  The maximum and minimum values of a PRInt64 or PRUint64.
-************************************************************************/
-#ifdef HAVE_LONG_LONG
-/* Keep this in sync with prlong.h. */
-#if PR_BYTES_PER_LONG == 8 && !defined(PR_ALTERNATE_INT64_TYPEDEF)
-typedef long PRInt64;
-typedef unsigned long PRUint64;
-#define PR_INT64(x)  x ## L
-#define PR_UINT64(x) x ## UL
-#elif defined(WIN32) && !defined(__GNUC__)
-typedef __int64  PRInt64;
-typedef unsigned __int64 PRUint64;
-#define PR_INT64(x)  x ## i64
-#define PR_UINT64(x) x ## ui64
-#else
-typedef long long PRInt64;
-typedef unsigned long long PRUint64;
-#define PR_INT64(x)  x ## LL
-#define PR_UINT64(x) x ## ULL
-#endif /* PR_BYTES_PER_LONG == 8 */
-
-#define PR_INT64_MAX PR_INT64(0x7fffffffffffffff)
-#define PR_INT64_MIN (-PR_INT64_MAX - 1)
-#define PR_UINT64_MAX PR_UINT64(-1)
-#else  /* !HAVE_LONG_LONG */
-typedef struct {
-#ifdef IS_LITTLE_ENDIAN
-    PRUint32 lo, hi;
-#else
-    PRUint32 hi, lo;
-#endif
-} PRInt64;
-typedef PRInt64 PRUint64;
-
-#define PR_INT64_MAX (PRInt64){0x7fffffff, 0xffffffff}
-#define PR_INT64_MIN (PRInt64){0xffffffff, 0xffffffff}
-#define PR_UINT64_MAX (PRUint64){0xffffffff, 0xffffffff}
-
-#endif /* !HAVE_LONG_LONG */
-
-/************************************************************************
-** TYPES:       PRUintn
-**              PRIntn
-** DESCRIPTION:
-**  The PRIntn types are most appropriate for automatic variables. They are
-**      guaranteed to be at least 16 bits, though various architectures may
-**      define them to be wider (e.g., 32 or even 64 bits). These types are
-**      never valid for fields of a structure.
-************************************************************************/
-#if PR_BYTES_PER_INT >= 2
-typedef int PRIntn;
-typedef unsigned int PRUintn;
-#else
-#error 'sizeof(int)' not sufficient for platform use
-#endif
-
-/************************************************************************
-** TYPES:       PRFloat64
-** DESCRIPTION:
-**  NSPR's floating point type is always 64 bits.
-************************************************************************/
-typedef double          PRFloat64;
-
-/************************************************************************
-** TYPES:       PRSize
-** DESCRIPTION:
-**  A type for representing the size of objects.
-************************************************************************/
-typedef size_t PRSize;
-
-
-/************************************************************************
-** TYPES:       PROffset32, PROffset64
-** DESCRIPTION:
-**  A type for representing byte offsets from some location.
-************************************************************************/
-typedef PRInt32 PROffset32;
-typedef PRInt64 PROffset64;
-
-/************************************************************************
-** TYPES:       PRPtrDiff
-** DESCRIPTION:
-**  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer subtraction.
-************************************************************************/
-typedef ptrdiff_t PRPtrdiff;
-
-/************************************************************************
-** TYPES:       PRUptrdiff
-** DESCRIPTION:
-**  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction.
-************************************************************************/
-#ifdef _WIN64
-typedef PRUint64 PRUptrdiff;
-#else
-typedef unsigned long PRUptrdiff;
-#endif
-
-/************************************************************************
-** TYPES:       PRBool
-** DESCRIPTION:
-**  Use PRBool for variables and parameter types. Use PR_FALSE and PR_TRUE
-**      for clarity of target type in assignments and actual arguments. Use
-**      'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans
-**      just as you would C int-valued conditions.
-************************************************************************/
-typedef PRIntn PRBool;
-#define PR_TRUE 1
-#define PR_FALSE 0
-
-/************************************************************************
-** TYPES:       PRPackedBool
-** DESCRIPTION:
-**  Use PRPackedBool within structs where bitfields are not desirable
-**      but minimum and consistant overhead matters.
-************************************************************************/
-typedef PRUint8 PRPackedBool;
-
-/*
-** Status code used by some routines that have a single point of failure or
-** special status return.
-*/
-typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
-
-#ifndef __PRUNICHAR__
-#define __PRUNICHAR__
-#ifdef WIN32
-typedef wchar_t PRUnichar;
-#else
-typedef PRUint16 PRUnichar;
-#endif
-#endif
-
-/*
-** WARNING: The undocumented data types PRWord and PRUword are
-** only used in the garbage collection and arena code.  Do not
-** use PRWord and PRUword in new code.
-**
-** A PRWord is an integer that is the same size as a void*.
-** It implements the notion of a "word" in the Java Virtual
-** Machine.  (See Sec. 3.4 "Words", The Java Virtual Machine
-** Specification, Addison-Wesley, September 1996.
-** http://java.sun.com/docs/books/vmspec/index.html.)
-*/
-#ifdef _WIN64
-typedef PRInt64 PRWord;
-typedef PRUint64 PRUword;
-#else
-typedef long PRWord;
-typedef unsigned long PRUword;
-#endif
-
-/*
- * PR_PRETEND_NORETURN, specified at the end of a function declaration,
- * indicates that for the purposes of static analysis, this function does not
- * return.  (The function definition does not need to be annotated.)
- *
- * void PR_Assert(const char *s, const char *file, PRIntn ln)
- *     PR_PRETEND_NORETURN;
- *
- * Some static analyzers, like scan-build from clang, can use this information
- * to eliminate false positives.  From the upstream documentation of
- * scan-build:
- *     This attribute is useful for annotating assertion handlers that actually
- *     can return, but for the purpose of using the analyzer we want to pretend
- *     that such functions do not return.
- */
-#ifdef __clang_analyzer__
-#if __has_extension(attribute_analyzer_noreturn)
-#define PR_PRETEND_NORETURN __attribute__((analyzer_noreturn))
-#endif
-#endif
-
-#ifndef PR_PRETEND_NORETURN
-#define PR_PRETEND_NORETURN /* no support */
-#endif
-
-#if defined(NO_NSPR_10_SUPPORT)
-#else
-/********* ???????????????? FIX ME       ??????????????????????????? *****/
-/********************** Some old definitions until pr=>ds transition is done ***/
-/********************** Also, we are still using NSPR 1.0. GC ******************/
-/*
-** Fundamental NSPR macros, used nearly everywhere.
-*/
-
-#define PR_PUBLIC_API		PR_IMPLEMENT
-
-/*
-** Macro body brackets so that macros with compound statement definitions
-** behave syntactically more like functions when called.
-*/
-#define NSPR_BEGIN_MACRO        do {
-#define NSPR_END_MACRO          } while (0)
-
-/*
-** Macro shorthands for conditional C++ extern block delimiters.
-*/
-#ifdef NSPR_BEGIN_EXTERN_C
-#undef NSPR_BEGIN_EXTERN_C
-#endif
-#ifdef NSPR_END_EXTERN_C
-#undef NSPR_END_EXTERN_C
-#endif
-
-#ifdef __cplusplus
-#define NSPR_BEGIN_EXTERN_C     extern "C" {
-#define NSPR_END_EXTERN_C       }
-#else
-#define NSPR_BEGIN_EXTERN_C
-#define NSPR_END_EXTERN_C
-#endif
-
-#include "obsolete/protypes.h"
-
-/********* ????????????? End Fix me ?????????????????????????????? *****/
-#endif /* NO_NSPR_10_SUPPORT */
-
-/*
-** Compile-time assert. "condition" must be a constant expression.
-** The macro can be used only in places where an "extern" declaration is
-** allowed.
-*/
-#define PR_STATIC_ASSERT(condition) \
-    extern void pr_static_assert(int arg[(condition) ? 1 : -1])
-
-PR_END_EXTERN_C
-
-#endif /* prtypes_h___ */
-
diff --git a/openflow/usr/include/nspr/prvrsion.h b/openflow/usr/include/nspr/prvrsion.h
deleted file mode 100644
index a8415b2..0000000
--- a/openflow/usr/include/nspr/prvrsion.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-/* author: jstewart */
-
-#if defined(_PRVERSION_H)
-#else
-#define _PRVERSION_H
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/* All components participating in the PR version protocol must expose
- * a structure and a function. The structure is defined below and named
- * according to the naming conventions outlined further below.  The function
- * is called libVersionPoint and returns a pointer to this structure.
- */
-
-/* on NT, always pack the structure the same. */
-#ifdef _WIN32
-#pragma pack(push, 8)
-#endif
-
-typedef struct {
-    /*
-     * The first field defines which version of this structure is in use.
-     * At this time, only version 2 is specified. If this value is not 
-     * 2, you must read no further into the structure.
-     */
-    PRInt32    version; 
-  
-    /* for Version 2, this is the body format. */
-    PRInt64         buildTime;      /* 64 bits - usecs since midnight, 1/1/1970 */
-    char *          buildTimeString;/* a human readable version of the time */
-  
-    PRUint8   vMajor;               /* Major version of this component */
-    PRUint8   vMinor;               /* Minor version of this component */
-    PRUint8   vPatch;               /* Patch level of this component */
-  
-    PRBool          beta;           /* true if this is a beta component */
-    PRBool          debug;          /* true if this is a debug component */
-    PRBool          special;        /* true if this component is a special build */
-  
-    char *          filename;       /* The original filename */
-    char *          description;    /* description of this component */
-    char *          security;       /* level of security in this component */
-    char *          copyright;      /* The copyright for this file */
-    char *          comment;        /* free form field for misc usage */
-    char *          specialString;  /* the special variant for this build */
-} PRVersionDescription;
-
-/* on NT, restore the previous packing */
-#ifdef _WIN32
-#pragma pack(pop)
-#endif
-
-/*
- * All components must define an entrypoint named libVersionPoint which
- * is of type versionEntryPointType.
- *
- * For example, for a library named libfoo, we would have:
- *
- *   PRVersionDescription prVersionDescription_libfoo =
- *   {
- *       ...
- *   };
- *
- *   PR_IMPLEMENT(const PRVersionDescription*) libVersionPoint(void)
- *   {
- *       return &prVersionDescription_libfoo;
- *   }
- */
-typedef const PRVersionDescription *(*versionEntryPointType)(void);
-
-/* 
- * Where you declare your libVersionPoint, do it like this: 
- * PR_IMPLEMENT(const PRVersionDescription *) libVersionPoint(void) {
- *  fill it in...
- * }
- */
-
-/*
- * NAMING CONVENTION FOR struct
- *
- * all components should also expose a static PRVersionDescription
- * The name of the struct should be calculated as follows:
- * Take the value of filename. (If filename is not specified, calculate
- * a short, unique string.)  Convert all non-alphanumeric characters
- * to '_'.  To this, prepend "PRVersionDescription_".  Thus for libfoo.so,
- * the symbol name is "PRVersionDescription_libfoo_so".
- * so the file should have
- * PRVersionDescription PRVersionDescription_libfoo_so { fill it in };
- * on NT, this file should be declspec export.
- */
-
-PR_END_EXTERN_C
-
-#endif  /* defined(_PRVERSION_H) */
-
-/* prvrsion.h */
-
diff --git a/openflow/usr/include/nspr/prwin16.h b/openflow/usr/include/nspr/prwin16.h
deleted file mode 100644
index 9f8d7a9..0000000
--- a/openflow/usr/include/nspr/prwin16.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef prwin16_h___
-#define prwin16_h___
-
-/*
-** Condition use of this header on platform.
-*/
-#if (defined(XP_PC) && !defined(_WIN32) && !defined(XP_OS2) && defined(MOZILLA_CLIENT)) || defined(WIN16)
-#include <stdio.h>
-
-PR_BEGIN_EXTERN_C
-/* 
-** Win16 stdio special case.
-** To get stdio to work for Win16, all calls to printf() and related
-** things must be called from the environment of the .EXE; calls to
-** printf() from the .DLL send output to the bit-bucket.
-**
-** To make sure that PR_fprintf(), and related functions, work correctly,
-** the actual stream I/O to stdout, stderr, stdin must be done in the
-** .EXE. To do this, a hack is placed in _MD_Write() such that the
-** fd for stdio handles results in a call to the .EXE.
-**
-** file w16stdio.c contains the functions that get called from NSPR
-** to do the actual I/O. w16stdio.o must be statically linked with
-** any application needing stdio for Win16.
-**
-** The address of these functions must be made available to the .DLL
-** so he can call back to the .EXE. To do this, function 
-** PR_MD_RegisterW16StdioCallbacks() is called from the .EXE.
-** The arguments are the functions defined in w16stdio.c
-** At runtime, MD_Write() calls the registered functions, if any
-** were registered.
-**
-** prinit.h contains a macro PR_STDIO_INIT() that calls the registration
-** function for Win16; For other platforms, the macro is a No-Op.
-**
-** Note that stdio is not operational at all on Win16 GUI applications.
-** This special case exists to provide stdio capability from the NSPR
-** .DLL for command line applications only. NSPR's test cases are
-** almost exclusively command line applications.
-**
-** See also: w16io.c, w16stdio.c
-*/
-typedef PRInt32 (PR_CALLBACK *PRStdinRead)( void *buf, PRInt32 amount);
-typedef PRInt32 (PR_CALLBACK *PRStdoutWrite)( void *buf, PRInt32 amount);
-typedef PRInt32 (PR_CALLBACK *PRStderrWrite)( void *buf, PRInt32 amount);
-
-NSPR_API(PRStatus)
-PR_MD_RegisterW16StdioCallbacks( 
-    PRStdinRead inReadf,            /* i: function pointer for stdin read       */
-    PRStdoutWrite outWritef,        /* i: function pointer for stdout write     */
-    PRStderrWrite errWritef         /* i: function pointer for stderr write     */
-    );
-
-NSPR_API(PRInt32)
-_PL_W16StdioWrite( void *buf, PRInt32 amount );
-
-NSPR_API(PRInt32)
-_PL_W16StdioRead( void *buf, PRInt32 amount );
-
-#define PR_STDIO_INIT() PR_MD_RegisterW16StdioCallbacks( \
-    _PL_W16StdioRead, _PL_W16StdioWrite, _PL_W16StdioWrite ); \
-    PR_INIT_CALLBACKS();
-
-/*
-** Win16 hackery.
-**
-*/
-struct PRMethodCallbackStr {
-    int     (PR_CALLBACK *auxOutput)(const char *outputString);
-    size_t  (PR_CALLBACK *strftime)(char *s, size_t len, const char *fmt, const struct tm *p);
-    void *  (PR_CALLBACK *malloc)( size_t size );
-    void *  (PR_CALLBACK *calloc)(size_t n, size_t size );
-    void *  (PR_CALLBACK *realloc)( void* old_blk, size_t size );
-    void    (PR_CALLBACK *free)( void *ptr );
-    void *  (PR_CALLBACK *getenv)( const char *name);
-    int     (PR_CALLBACK *putenv)( const char *assoc);
-/*    void *  (PR_CALLBACK *perror)( const char *prefix ); */
-};
-
-NSPR_API(void) PR_MDRegisterCallbacks(struct PRMethodCallbackStr *);
-
-int PR_CALLBACK _PL_W16CallBackPuts( const char *outputString );
-size_t PR_CALLBACK _PL_W16CallBackStrftime( 
-    char *s, 
-    size_t len, 
-    const char *fmt,
-    const struct tm *p );
-void * PR_CALLBACK _PL_W16CallBackMalloc( size_t size );
-void * PR_CALLBACK _PL_W16CallBackCalloc( size_t n, size_t size );
-void * PR_CALLBACK _PL_W16CallBackRealloc( 
-    void *old_blk, 
-    size_t size );
-void   PR_CALLBACK _PL_W16CallBackFree( void *ptr );
-void * PR_CALLBACK _PL_W16CallBackGetenv( const char *name );
-int PR_CALLBACK _PL_W16CallBackPutenv( const char *assoc );
-
-/*
-** Hackery! 
-**
-** These functions are provided as static link points.
-** This is to satisfy the quick port of Gromit to NSPR 2.0
-** ... Don't do this! ... alas, It may never go away.
-** 
-*/
-NSPR_API(int)     PR_MD_printf(const char *, ...);
-NSPR_API(void)    PR_MD_exit(int);
-NSPR_API(size_t)  PR_MD_strftime(char *, size_t, const char *, const struct tm *); 
-NSPR_API(int)     PR_MD_sscanf(const char *, const char *, ...);
-NSPR_API(void*)   PR_MD_malloc( size_t size );
-NSPR_API(void*)   PR_MD_calloc( size_t n, size_t size );
-NSPR_API(void*)   PR_MD_realloc( void* old_blk, size_t size );
-NSPR_API(void)    PR_MD_free( void *ptr );
-NSPR_API(char*)   PR_MD_getenv( const char *name );
-NSPR_API(int)     PR_MD_putenv( const char *assoc );
-NSPR_API(int)     PR_MD_fprintf(FILE *fPtr, const char *fmt, ...);
-
-#define PR_INIT_CALLBACKS()                         \
-    {                                               \
-        static struct PRMethodCallbackStr cbf = {   \
-            _PL_W16CallBackPuts,                    \
-            _PL_W16CallBackStrftime,                \
-            _PL_W16CallBackMalloc,                  \
-            _PL_W16CallBackCalloc,                  \
-            _PL_W16CallBackRealloc,                 \
-            _PL_W16CallBackFree,                    \
-            _PL_W16CallBackGetenv,                  \
-            _PL_W16CallBackPutenv,                  \
-        };                                          \
-        PR_MDRegisterCallbacks( &cbf );             \
-    }
-
-
-/*
-** Get the exception context for Win16 MFC applications threads
-*/
-NSPR_API(void *) PR_W16GetExceptionContext(void);
-/*
-** Set the exception context for Win16 MFC applications threads
-*/
-NSPR_API(void) PR_W16SetExceptionContext(void *context);
-
-PR_END_EXTERN_C
-#else
-/*
-** For platforms other than Win16, define
-** PR_STDIO_INIT() as a No-Op.
-*/
-#define PR_STDIO_INIT()
-#endif /* WIN16 || MOZILLA_CLIENT */
-
-#endif /* prwin16_h___ */
-
-
-
-
-
-
-
-
diff --git a/openflow/usr/include/nss.h b/openflow/usr/include/nss.h
deleted file mode 100644
index e0681b2..0000000
--- a/openflow/usr/include/nss.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Define interface to NSS.  This is meant for the interface functions
-   and for implementors of new services.  */
-
-#ifndef _NSS_H
-#define _NSS_H	1
-
-#include <features.h>
-#include <stdint.h>
-
-
-__BEGIN_DECLS
-
-/* Possible results of lookup using a nss_* function.  */
-enum nss_status
-{
-  NSS_STATUS_TRYAGAIN = -2,
-  NSS_STATUS_UNAVAIL,
-  NSS_STATUS_NOTFOUND,
-  NSS_STATUS_SUCCESS,
-  NSS_STATUS_RETURN
-};
-
-
-/* Data structure used for the 'gethostbyname4_r' function.  */
-struct gaih_addrtuple
-  {
-    struct gaih_addrtuple *next;
-    char *name;
-    int family;
-    uint32_t addr[4];
-    uint32_t scopeid;
-  };
-
-
-/* Overwrite service selection for database DBNAME using specification
-   in STRING.
-   This function should only be used by system programs which have to
-   work around non-existing services (e.e., while booting).
-   Attention: Using this function repeatedly will slowly eat up the
-   whole memory since previous selection data cannot be freed.  */
-extern int __nss_configure_lookup (const char *__dbname,
-				   const char *__string) __THROW;
-
-__END_DECLS
-
-#endif /* nss.h */
diff --git a/openflow/usr/include/nss/alghmac.h b/openflow/usr/include/nss/alghmac.h
deleted file mode 100644
index 462526a..0000000
--- a/openflow/usr/include/nss/alghmac.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _ALGHMAC_H_
-#define _ALGHMAC_H_
-
-typedef struct HMACContextStr HMACContext;
-
-SEC_BEGIN_PROTOS
-
-/* destroy HMAC context */
-extern void
-HMAC_Destroy(HMACContext *cx, PRBool freeit);
-
-/* create HMAC context
- *  hash_obj    hash object from SECRawHashObjects[]
- *  secret      the secret with which the HMAC is performed.
- *  secret_len  the length of the secret.
- *  isFIPS      true if conforming to FIPS 198.
- *
- * NULL is returned if an error occurs.
- */
-extern HMACContext *
-HMAC_Create(const SECHashObject *hash_obj, const unsigned char *secret,
-            unsigned int secret_len, PRBool isFIPS);
-
-/* like HMAC_Create, except caller allocates HMACContext. */
-SECStatus
-HMAC_Init(HMACContext *cx, const SECHashObject *hash_obj,
-          const unsigned char *secret, unsigned int secret_len, PRBool isFIPS);
-
-/* reset HMAC for a fresh round */
-extern void
-HMAC_Begin(HMACContext *cx);
-
-/* update HMAC
- *  cx          HMAC Context
- *  data        the data to perform HMAC on
- *  data_len    the length of the data to process
- */
-extern void
-HMAC_Update(HMACContext *cx, const unsigned char *data, unsigned int data_len);
-
-/* Finish HMAC -- place the results within result
- *  cx          HMAC context
- *  result      buffer for resulting hmac'd data
- *  result_len  where the resultant hmac length is stored
- *  max_result_len  maximum possible length that can be stored in result
- */
-extern SECStatus
-HMAC_Finish(HMACContext *cx, unsigned char *result, unsigned int *result_len,
-            unsigned int max_result_len);
-
-/* clone a copy of the HMAC state.  this is usefult when you would
- * need to keep a running hmac but also need to extract portions
- * partway through the process.
- */
-extern HMACContext *
-HMAC_Clone(HMACContext *cx);
-
-SEC_END_PROTOS
-
-#endif
diff --git a/openflow/usr/include/nss/base64.h b/openflow/usr/include/nss/base64.h
deleted file mode 100644
index ddc2db6..0000000
--- a/openflow/usr/include/nss/base64.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * base64.h - prototypes for base64 encoding/decoding
- * Note: These functions are deprecated; see nssb64.h for new routines.
- */
-#ifndef _BASE64_H_
-#define _BASE64_H_
-
-#include "utilrename.h"
-#include "seccomon.h"
-
-SEC_BEGIN_PROTOS
-
-/*
-** Return an PORT_Alloc'd ascii string which is the base64 encoded
-** version of the input string.
-*/
-extern char *BTOA_DataToAscii(const unsigned char *data, unsigned int len);
-
-/*
-** Return an PORT_Alloc'd string which is the base64 decoded version
-** of the input string; set *lenp to the length of the returned data.
-*/
-extern unsigned char *ATOB_AsciiToData(const char *string, unsigned int *lenp);
-
-/*
-** Convert from ascii to binary encoding of an item.
-*/
-extern SECStatus ATOB_ConvertAsciiToItem(SECItem *binary_item, const char *ascii);
-
-/*
-** Convert from binary encoding of an item to ascii.
-*/
-extern char *BTOA_ConvertItemToAscii(SECItem *binary_item);
-
-SEC_END_PROTOS
-
-#endif /* _BASE64_H_ */
diff --git a/openflow/usr/include/nss/blapi.h b/openflow/usr/include/nss/blapi.h
deleted file mode 100644
index e5a6cf3..0000000
--- a/openflow/usr/include/nss/blapi.h
+++ /dev/null
@@ -1,1625 +0,0 @@
-/*
- * blapi.h - public prototypes for the freebl library
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _BLAPI_H_
-#define _BLAPI_H_
-
-#include "blapit.h"
-#include "hasht.h"
-#include "alghmac.h"
-
-SEC_BEGIN_PROTOS
-
-/*
-** RSA encryption/decryption. When encrypting/decrypting the output
-** buffer must be at least the size of the public key modulus.
-*/
-
-extern SECStatus BL_Init(void);
-
-/*
-** Generate and return a new RSA public and private key.
-**  Both keys are encoded in a single RSAPrivateKey structure.
-**  "cx" is the random number generator context
-**  "keySizeInBits" is the size of the key to be generated, in bits.
-**     512, 1024, etc.
-**  "publicExponent" when not NULL is a pointer to some data that
-**     represents the public exponent to use. The data is a byte
-**     encoded integer, in "big endian" order.
-*/
-extern RSAPrivateKey *RSA_NewKey(int keySizeInBits,
-                                 SECItem *publicExponent);
-
-/*
-** Perform a raw public-key operation
-**  Length of input and output buffers are equal to key's modulus len.
-*/
-extern SECStatus RSA_PublicKeyOp(RSAPublicKey *key,
-                                 unsigned char *output,
-                                 const unsigned char *input);
-
-/*
-** Perform a raw private-key operation
-**  Length of input and output buffers are equal to key's modulus len.
-*/
-extern SECStatus RSA_PrivateKeyOp(RSAPrivateKey *key,
-                                  unsigned char *output,
-                                  const unsigned char *input);
-
-/*
-** Perform a raw private-key operation, and check the parameters used in
-** the operation for validity by performing a test operation first.
-**  Length of input and output buffers are equal to key's modulus len.
-*/
-extern SECStatus RSA_PrivateKeyOpDoubleChecked(RSAPrivateKey *key,
-                                               unsigned char *output,
-                                               const unsigned char *input);
-
-/*
-** Perform a check of private key parameters for consistency.
-*/
-extern SECStatus RSA_PrivateKeyCheck(const RSAPrivateKey *key);
-
-/*
-** Given only minimal private key parameters, fill in the rest of the
-** parameters.
-**
-**
-** All the entries, including those supplied by the caller, will be
-** overwritten with data alocated out of the arena.
-**
-** If no arena is supplied, one will be created.
-**
-** The following fields must be supplied in order for this function
-** to succeed:
-**   one of either publicExponent or privateExponent
-**   two more of the following 5 parameters (not counting the above).
-**      modulus (n)
-**      prime1  (p)
-**      prime2  (q)
-**      publicExponent (e)
-**      privateExponent (d)
-**
-** NOTE: if only the publicExponent, privateExponent, and one prime is given,
-** then there may be more than one RSA key that matches that combination. If
-** we find 2 possible valid keys that meet this criteria, we return an error.
-** If we return the wrong key, and the original modulus is compared to the
-** new modulus, both can be factored by calculateing gcd(n_old,n_new) to get
-** the common prime.
-**
-** NOTE: in some cases the publicExponent must be less than 2^23 for this
-** function to work correctly. (The case where we have only one of: modulus
-** prime1 and prime2).
-**
-** All parameters will be replaced in the key structure with new parameters
-** allocated out of the arena. There is no attempt to free the old structures.
-** prime1 will always be greater than prime2 (even if the caller supplies the
-** smaller prime as prime1 or the larger prime as prime2). The parameters are
-** not overwritten on failure.
-**
-** While the remaining Chinese remainder theorem parameters (dp,dp, and qinv)
-** can also be used in reconstructing the private key, they are currently
-** ignored in this implementation.
-*/
-extern SECStatus RSA_PopulatePrivateKey(RSAPrivateKey *key);
-
-/********************************************************************
-** RSA algorithm
-*/
-
-/********************************************************************
-** Raw signing/encryption/decryption operations.
-**
-** No padding or formatting will be applied.
-** inputLen MUST be equivalent to the modulus size (in bytes).
-*/
-extern SECStatus
-RSA_SignRaw(RSAPrivateKey *key,
-            unsigned char *output,
-            unsigned int *outputLen,
-            unsigned int maxOutputLen,
-            const unsigned char *input,
-            unsigned int inputLen);
-
-extern SECStatus
-RSA_CheckSignRaw(RSAPublicKey *key,
-                 const unsigned char *sig,
-                 unsigned int sigLen,
-                 const unsigned char *hash,
-                 unsigned int hashLen);
-
-extern SECStatus
-RSA_CheckSignRecoverRaw(RSAPublicKey *key,
-                        unsigned char *data,
-                        unsigned int *dataLen,
-                        unsigned int maxDataLen,
-                        const unsigned char *sig,
-                        unsigned int sigLen);
-
-extern SECStatus
-RSA_EncryptRaw(RSAPublicKey *key,
-               unsigned char *output,
-               unsigned int *outputLen,
-               unsigned int maxOutputLen,
-               const unsigned char *input,
-               unsigned int inputLen);
-
-extern SECStatus
-RSA_DecryptRaw(RSAPrivateKey *key,
-               unsigned char *output,
-               unsigned int *outputLen,
-               unsigned int maxOutputLen,
-               const unsigned char *input,
-               unsigned int inputLen);
-
-/********************************************************************
-** RSAES-OAEP encryption/decryption, as defined in RFC 3447, Section 7.1.
-**
-** Note: Only MGF1 is supported as the mask generation function. It will be
-** used with maskHashAlg as the inner hash function.
-**
-** Unless performing Known Answer Tests, "seed" should be NULL, indicating that
-** freebl should generate a random value. Otherwise, it should be an octet
-** string of seedLen bytes, which should be the same size as the output of
-** hashAlg.
-*/
-extern SECStatus
-RSA_EncryptOAEP(RSAPublicKey *key,
-                HASH_HashType hashAlg,
-                HASH_HashType maskHashAlg,
-                const unsigned char *label,
-                unsigned int labelLen,
-                const unsigned char *seed,
-                unsigned int seedLen,
-                unsigned char *output,
-                unsigned int *outputLen,
-                unsigned int maxOutputLen,
-                const unsigned char *input,
-                unsigned int inputLen);
-
-extern SECStatus
-RSA_DecryptOAEP(RSAPrivateKey *key,
-                HASH_HashType hashAlg,
-                HASH_HashType maskHashAlg,
-                const unsigned char *label,
-                unsigned int labelLen,
-                unsigned char *output,
-                unsigned int *outputLen,
-                unsigned int maxOutputLen,
-                const unsigned char *input,
-                unsigned int inputLen);
-
-/********************************************************************
-** RSAES-PKCS1-v1_5 encryption/decryption, as defined in RFC 3447, Section 7.2.
-*/
-extern SECStatus
-RSA_EncryptBlock(RSAPublicKey *key,
-                 unsigned char *output,
-                 unsigned int *outputLen,
-                 unsigned int maxOutputLen,
-                 const unsigned char *input,
-                 unsigned int inputLen);
-
-extern SECStatus
-RSA_DecryptBlock(RSAPrivateKey *key,
-                 unsigned char *output,
-                 unsigned int *outputLen,
-                 unsigned int maxOutputLen,
-                 const unsigned char *input,
-                 unsigned int inputLen);
-
-/********************************************************************
-** RSASSA-PSS signing/verifying, as defined in RFC 3447, Section 8.1.
-**
-** Note: Only MGF1 is supported as the mask generation function. It will be
-** used with maskHashAlg as the inner hash function.
-**
-** Unless performing Known Answer Tests, "salt" should be NULL, indicating that
-** freebl should generate a random value.
-*/
-extern SECStatus
-RSA_SignPSS(RSAPrivateKey *key,
-            HASH_HashType hashAlg,
-            HASH_HashType maskHashAlg,
-            const unsigned char *salt,
-            unsigned int saltLen,
-            unsigned char *output,
-            unsigned int *outputLen,
-            unsigned int maxOutputLen,
-            const unsigned char *input,
-            unsigned int inputLen);
-
-extern SECStatus
-RSA_CheckSignPSS(RSAPublicKey *key,
-                 HASH_HashType hashAlg,
-                 HASH_HashType maskHashAlg,
-                 unsigned int saltLen,
-                 const unsigned char *sig,
-                 unsigned int sigLen,
-                 const unsigned char *hash,
-                 unsigned int hashLen);
-
-/********************************************************************
-** RSASSA-PKCS1-v1_5 signing/verifying, as defined in RFC 3447, Section 8.2.
-**
-** These functions expect as input to be the raw value to be signed. For most
-** cases using PKCS1-v1_5, this should be the value of T, the DER-encoded
-** DigestInfo structure defined in Section 9.2, Step 2.
-** Note: This can also be used for signatures that use PKCS1-v1_5 padding, such
-** as the signatures used in SSL/TLS, which sign a raw hash.
-*/
-extern SECStatus
-RSA_Sign(RSAPrivateKey *key,
-         unsigned char *output,
-         unsigned int *outputLen,
-         unsigned int maxOutputLen,
-         const unsigned char *data,
-         unsigned int dataLen);
-
-extern SECStatus
-RSA_CheckSign(RSAPublicKey *key,
-              const unsigned char *sig,
-              unsigned int sigLen,
-              const unsigned char *data,
-              unsigned int dataLen);
-
-extern SECStatus
-RSA_CheckSignRecover(RSAPublicKey *key,
-                     unsigned char *output,
-                     unsigned int *outputLen,
-                     unsigned int maxOutputLen,
-                     const unsigned char *sig,
-                     unsigned int sigLen);
-
-/********************************************************************
-** DSA signing algorithm
-*/
-
-/* Generate a new random value within the interval [2, q-1].
-*/
-extern SECStatus DSA_NewRandom(PLArenaPool *arena, const SECItem *q,
-                               SECItem *random);
-
-/*
-** Generate and return a new DSA public and private key pair,
-**  both of which are encoded into a single DSAPrivateKey struct.
-**  "params" is a pointer to the PQG parameters for the domain
-**  Uses a random seed.
-*/
-extern SECStatus DSA_NewKey(const PQGParams *params,
-                            DSAPrivateKey **privKey);
-
-/* signature is caller-supplied buffer of at least 20 bytes.
-** On input,  signature->len == size of buffer to hold signature.
-**            digest->len    == size of digest.
-** On output, signature->len == size of signature in buffer.
-** Uses a random seed.
-*/
-extern SECStatus DSA_SignDigest(DSAPrivateKey *key,
-                                SECItem *signature,
-                                const SECItem *digest);
-
-/* signature is caller-supplied buffer of at least 20 bytes.
-** On input,  signature->len == size of buffer to hold signature.
-**            digest->len    == size of digest.
-*/
-extern SECStatus DSA_VerifyDigest(DSAPublicKey *key,
-                                  const SECItem *signature,
-                                  const SECItem *digest);
-
-/* For FIPS compliance testing. Seed must be exactly 20 bytes long */
-extern SECStatus DSA_NewKeyFromSeed(const PQGParams *params,
-                                    const unsigned char *seed,
-                                    DSAPrivateKey **privKey);
-
-/* For FIPS compliance testing. Seed must be exactly 20 bytes. */
-extern SECStatus DSA_SignDigestWithSeed(DSAPrivateKey *key,
-                                        SECItem *signature,
-                                        const SECItem *digest,
-                                        const unsigned char *seed);
-
-/******************************************************
-** Diffie Helman key exchange algorithm
-*/
-
-/* Generates parameters for Diffie-Helman key generation.
-**  primeLen is the length in bytes of prime P to be generated.
-*/
-extern SECStatus DH_GenParam(int primeLen, DHParams **params);
-
-/* Generates a public and private key, both of which are encoded in a single
-**  DHPrivateKey struct. Params is input, privKey are output.
-**  This is Phase 1 of Diffie Hellman.
-*/
-extern SECStatus DH_NewKey(DHParams *params,
-                           DHPrivateKey **privKey);
-
-/*
-** DH_Derive does the Diffie-Hellman phase 2 calculation, using the
-** other party's publicValue, and the prime and our privateValue.
-** maxOutBytes is the requested length of the generated secret in bytes.
-** A zero value means produce a value of any length up to the size of
-** the prime.   If successful, derivedSecret->data is set
-** to the address of the newly allocated buffer containing the derived
-** secret, and derivedSecret->len is the size of the secret produced.
-** The size of the secret produced will depend on the value of outBytes.
-** If outBytes is 0, the key length will be all the significant bytes of
-** the derived secret (leading zeros are dropped). This length could be less
-** than the length of the prime. If outBytes is nonzero, the length of the
-** produced key will be outBytes long. If the key is truncated, the most
-** significant bytes are truncated. If it is expanded, zero bytes are added
-** at the beginning.
-** It is the caller's responsibility to free the allocated buffer
-** containing the derived secret.
-*/
-extern SECStatus DH_Derive(SECItem *publicValue,
-                           SECItem *prime,
-                           SECItem *privateValue,
-                           SECItem *derivedSecret,
-                           unsigned int outBytes);
-
-/*
-** KEA_CalcKey returns octet string with the private key for a dual
-** Diffie-Helman  key generation as specified for government key exchange.
-*/
-extern SECStatus KEA_Derive(SECItem *prime,
-                            SECItem *public1,
-                            SECItem *public2,
-                            SECItem *private1,
-                            SECItem *private2,
-                            SECItem *derivedSecret);
-
-/*
- * verify that a KEA or DSA public key is a valid key for this prime and
- * subprime domain.
- */
-extern PRBool KEA_Verify(SECItem *Y, SECItem *prime, SECItem *subPrime);
-
-/****************************************
- * J-PAKE key transport
- */
-
-/* Given gx == g^x, create a Schnorr zero-knowledge proof for the value x
- * using the specified hash algorithm and signer ID. The signature is
- * returned in the values gv and r. testRandom must be NULL for a PRNG
- * generated random committment to be used in the sigature. When testRandom
- * is non-NULL, that value must contain a value in the subgroup q; that
- * value will be used instead of a PRNG-generated committment in order to
- * facilitate known-answer tests.
- *
- * If gxIn is non-NULL then it must contain a pre-computed value of g^x that
- * will be used by the function; in this case, the gxOut parameter must be NULL.
- * If the gxIn parameter is NULL then gxOut must be non-NULL; in this case
- * gxOut will contain the value g^x on output.
- *
- * gx (if not supplied by the caller), gv, and r will be allocated in the arena.
- * The arena is *not* optional so do not pass NULL for the arena parameter.
- * The arena should be zeroed when it is freed.
- */
-SECStatus
-JPAKE_Sign(PLArenaPool *arena, const PQGParams *pqg, HASH_HashType hashType,
-           const SECItem *signerID, const SECItem *x,
-           const SECItem *testRandom, const SECItem *gxIn, SECItem *gxOut,
-           SECItem *gv, SECItem *r);
-
-/* Given gx == g^x, verify the Schnorr zero-knowledge proof (gv, r) for the
- * value x using the specified hash algorithm and signer ID.
- *
- * The arena is *not* optional so do not pass NULL for the arena parameter.
- */
-SECStatus
-JPAKE_Verify(PLArenaPool *arena, const PQGParams *pqg,
-             HASH_HashType hashType, const SECItem *signerID,
-             const SECItem *peerID, const SECItem *gx,
-             const SECItem *gv, const SECItem *r);
-
-/* Call before round 2 with x2, s, and x2s all non-NULL. This will calculate
- * base = g^(x1+x3+x4) (mod p) and x2s = x2*s (mod q). The values to send in
- * round 2 (A and the proof of knowledge of x2s) can then be calculated with
- * JPAKE_Sign using pqg->base = base and x = x2s.
- *
- * Call after round 2 with x2, s, and x2s all NULL, and passing (gx1, gx2, gx3)
- * instead of (gx1, gx3, gx4). This will calculate base = g^(x1+x2+x3). Then call
- * JPAKE_Verify with pqg->base = base and then JPAKE_Final.
- *
- * base and x2s will be allocated in the arena. The arena is *not* optional so
- * do not pass NULL for the arena parameter. The arena should be zeroed when it
- * is freed.
-*/
-SECStatus
-JPAKE_Round2(PLArenaPool *arena, const SECItem *p, const SECItem *q,
-             const SECItem *gx1, const SECItem *gx3, const SECItem *gx4,
-             SECItem *base, const SECItem *x2, const SECItem *s, SECItem *x2s);
-
-/* K = (B/g^(x2*x4*s))^x2 (mod p)
- *
- * K will be allocated in the arena. The arena is *not* optional so do not pass
- * NULL for the arena parameter. The arena should be zeroed when it is freed.
- */
-SECStatus
-JPAKE_Final(PLArenaPool *arena, const SECItem *p, const SECItem *q,
-            const SECItem *x2, const SECItem *gx4, const SECItem *x2s,
-            const SECItem *B, SECItem *K);
-
-/******************************************************
-** Elliptic Curve algorithms
-*/
-
-/* Generates a public and private key, both of which are encoded
-** in a single ECPrivateKey struct. Params is input, privKey are
-** output.
-*/
-extern SECStatus EC_NewKey(ECParams *params,
-                           ECPrivateKey **privKey);
-
-extern SECStatus EC_NewKeyFromSeed(ECParams *params,
-                                   ECPrivateKey **privKey,
-                                   const unsigned char *seed,
-                                   int seedlen);
-
-/* Validates an EC public key as described in Section 5.2.2 of
- * X9.62. Such validation prevents against small subgroup attacks
- * when the ECDH primitive is used with the cofactor.
- */
-extern SECStatus EC_ValidatePublicKey(ECParams *params,
-                                      SECItem *publicValue);
-
-/*
-** ECDH_Derive performs a scalar point multiplication of a point
-** representing a (peer's) public key and a large integer representing
-** a private key (its own). Both keys must use the same elliptic curve
-** parameters. If the withCofactor parameter is true, the
-** multiplication also uses the cofactor associated with the curve
-** parameters.  The output of this scheme is the x-coordinate of the
-** resulting point. If successful, derivedSecret->data is set to the
-** address of the newly allocated buffer containing the derived
-** secret, and derivedSecret->len is the size of the secret
-** produced. It is the caller's responsibility to free the allocated
-** buffer containing the derived secret.
-*/
-extern SECStatus ECDH_Derive(SECItem *publicValue,
-                             ECParams *params,
-                             SECItem *privateValue,
-                             PRBool withCofactor,
-                             SECItem *derivedSecret);
-
-/* On input,  signature->len == size of buffer to hold signature.
-**            digest->len    == size of digest.
-** On output, signature->len == size of signature in buffer.
-** Uses a random seed.
-*/
-extern SECStatus ECDSA_SignDigest(ECPrivateKey *key,
-                                  SECItem *signature,
-                                  const SECItem *digest);
-
-/* On input,  signature->len == size of buffer to hold signature.
-**            digest->len    == size of digest.
-*/
-extern SECStatus ECDSA_VerifyDigest(ECPublicKey *key,
-                                    const SECItem *signature,
-                                    const SECItem *digest);
-
-/* Uses the provided seed. */
-extern SECStatus ECDSA_SignDigestWithSeed(ECPrivateKey *key,
-                                          SECItem *signature,
-                                          const SECItem *digest,
-                                          const unsigned char *seed,
-                                          const int seedlen);
-
-/******************************************/
-/*
-** RC4 symmetric stream cypher
-*/
-
-/*
-** Create a new RC4 context suitable for RC4 encryption/decryption.
-**  "key" raw key data
-**  "len" the number of bytes of key data
-*/
-extern RC4Context *RC4_CreateContext(const unsigned char *key, int len);
-
-extern RC4Context *RC4_AllocateContext(void);
-extern SECStatus RC4_InitContext(RC4Context *cx,
-                                 const unsigned char *key,
-                                 unsigned int keylen,
-                                 const unsigned char *,
-                                 int,
-                                 unsigned int,
-                                 unsigned int);
-
-/*
-** Destroy an RC4 encryption/decryption context.
-**  "cx" the context
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void RC4_DestroyContext(RC4Context *cx, PRBool freeit);
-
-/*
-** Perform RC4 encryption.
-**  "cx" the context
-**  "output" the output buffer to store the encrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-*/
-extern SECStatus RC4_Encrypt(RC4Context *cx, unsigned char *output,
-                             unsigned int *outputLen, unsigned int maxOutputLen,
-                             const unsigned char *input, unsigned int inputLen);
-
-/*
-** Perform RC4 decryption.
-**  "cx" the context
-**  "output" the output buffer to store the decrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-*/
-extern SECStatus RC4_Decrypt(RC4Context *cx, unsigned char *output,
-                             unsigned int *outputLen, unsigned int maxOutputLen,
-                             const unsigned char *input, unsigned int inputLen);
-
-/******************************************/
-/*
-** RC2 symmetric block cypher
-*/
-
-/*
-** Create a new RC2 context suitable for RC2 encryption/decryption.
-**  "key" raw key data
-**  "len" the number of bytes of key data
-**  "iv" is the CBC initialization vector (if mode is NSS_RC2_CBC)
-**  "mode" one of NSS_RC2 or NSS_RC2_CBC
-**  "effectiveKeyLen" is the effective key length (as specified in
-**      RFC 2268) in bytes (not bits).
-**
-** When mode is set to NSS_RC2_CBC the RC2 cipher is run in "cipher block
-** chaining" mode.
-*/
-extern RC2Context *RC2_CreateContext(const unsigned char *key, unsigned int len,
-                                     const unsigned char *iv, int mode,
-                                     unsigned effectiveKeyLen);
-extern RC2Context *RC2_AllocateContext(void);
-extern SECStatus RC2_InitContext(RC2Context *cx,
-                                 const unsigned char *key,
-                                 unsigned int keylen,
-                                 const unsigned char *iv,
-                                 int mode,
-                                 unsigned int effectiveKeyLen,
-                                 unsigned int);
-
-/*
-** Destroy an RC2 encryption/decryption context.
-**  "cx" the context
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void RC2_DestroyContext(RC2Context *cx, PRBool freeit);
-
-/*
-** Perform RC2 encryption.
-**  "cx" the context
-**  "output" the output buffer to store the encrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-*/
-extern SECStatus RC2_Encrypt(RC2Context *cx, unsigned char *output,
-                             unsigned int *outputLen, unsigned int maxOutputLen,
-                             const unsigned char *input, unsigned int inputLen);
-
-/*
-** Perform RC2 decryption.
-**  "cx" the context
-**  "output" the output buffer to store the decrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-*/
-extern SECStatus RC2_Decrypt(RC2Context *cx, unsigned char *output,
-                             unsigned int *outputLen, unsigned int maxOutputLen,
-                             const unsigned char *input, unsigned int inputLen);
-
-/******************************************/
-/*
-** RC5 symmetric block cypher -- 64-bit block size
-*/
-
-/*
-** Create a new RC5 context suitable for RC5 encryption/decryption.
-**      "key" raw key data
-**      "len" the number of bytes of key data
-**      "iv" is the CBC initialization vector (if mode is NSS_RC5_CBC)
-**      "mode" one of NSS_RC5 or NSS_RC5_CBC
-**
-** When mode is set to NSS_RC5_CBC the RC5 cipher is run in "cipher block
-** chaining" mode.
-*/
-extern RC5Context *RC5_CreateContext(const SECItem *key, unsigned int rounds,
-                                     unsigned int wordSize, const unsigned char *iv, int mode);
-extern RC5Context *RC5_AllocateContext(void);
-extern SECStatus RC5_InitContext(RC5Context *cx,
-                                 const unsigned char *key,
-                                 unsigned int keylen,
-                                 const unsigned char *iv,
-                                 int mode,
-                                 unsigned int rounds,
-                                 unsigned int wordSize);
-
-/*
-** Destroy an RC5 encryption/decryption context.
-**      "cx" the context
-**      "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void RC5_DestroyContext(RC5Context *cx, PRBool freeit);
-
-/*
-** Perform RC5 encryption.
-**      "cx" the context
-**      "output" the output buffer to store the encrypted data.
-**      "outputLen" how much data is stored in "output". Set by the routine
-**         after some data is stored in output.
-**      "maxOutputLen" the maximum amount of data that can ever be
-**         stored in "output"
-**      "input" the input data
-**      "inputLen" the amount of input data
-*/
-extern SECStatus RC5_Encrypt(RC5Context *cx, unsigned char *output,
-                             unsigned int *outputLen, unsigned int maxOutputLen,
-                             const unsigned char *input, unsigned int inputLen);
-
-/*
-** Perform RC5 decryption.
-**      "cx" the context
-**      "output" the output buffer to store the decrypted data.
-**      "outputLen" how much data is stored in "output". Set by the routine
-**         after some data is stored in output.
-**      "maxOutputLen" the maximum amount of data that can ever be
-**         stored in "output"
-**      "input" the input data
-**      "inputLen" the amount of input data
-*/
-
-extern SECStatus RC5_Decrypt(RC5Context *cx, unsigned char *output,
-                             unsigned int *outputLen, unsigned int maxOutputLen,
-                             const unsigned char *input, unsigned int inputLen);
-
-/******************************************/
-/*
-** DES symmetric block cypher
-*/
-
-/*
-** Create a new DES context suitable for DES encryption/decryption.
-**  "key" raw key data
-**  "len" the number of bytes of key data
-**  "iv" is the CBC initialization vector (if mode is NSS_DES_CBC or
-**     mode is DES_EDE3_CBC)
-**  "mode" one of NSS_DES, NSS_DES_CBC, NSS_DES_EDE3 or NSS_DES_EDE3_CBC
-**  "encrypt" is PR_TRUE if the context will be used for encryption
-**
-** When mode is set to NSS_DES_CBC or NSS_DES_EDE3_CBC then the DES
-** cipher is run in "cipher block chaining" mode.
-*/
-extern DESContext *DES_CreateContext(const unsigned char *key,
-                                     const unsigned char *iv,
-                                     int mode, PRBool encrypt);
-extern DESContext *DES_AllocateContext(void);
-extern SECStatus DES_InitContext(DESContext *cx,
-                                 const unsigned char *key,
-                                 unsigned int keylen,
-                                 const unsigned char *iv,
-                                 int mode,
-                                 unsigned int encrypt,
-                                 unsigned int);
-
-/*
-** Destroy an DES encryption/decryption context.
-**  "cx" the context
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void DES_DestroyContext(DESContext *cx, PRBool freeit);
-
-/*
-** Perform DES encryption.
-**  "cx" the context
-**  "output" the output buffer to store the encrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-**
-** NOTE: the inputLen must be a multiple of DES_KEY_LENGTH
-*/
-extern SECStatus DES_Encrypt(DESContext *cx, unsigned char *output,
-                             unsigned int *outputLen, unsigned int maxOutputLen,
-                             const unsigned char *input, unsigned int inputLen);
-
-/*
-** Perform DES decryption.
-**  "cx" the context
-**  "output" the output buffer to store the decrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-**
-** NOTE: the inputLen must be a multiple of DES_KEY_LENGTH
-*/
-extern SECStatus DES_Decrypt(DESContext *cx, unsigned char *output,
-                             unsigned int *outputLen, unsigned int maxOutputLen,
-                             const unsigned char *input, unsigned int inputLen);
-
-/******************************************/
-/*
-** SEED symmetric block cypher
-*/
-extern SEEDContext *
-SEED_CreateContext(const unsigned char *key, const unsigned char *iv,
-                   int mode, PRBool encrypt);
-extern SEEDContext *SEED_AllocateContext(void);
-extern SECStatus SEED_InitContext(SEEDContext *cx,
-                                  const unsigned char *key,
-                                  unsigned int keylen,
-                                  const unsigned char *iv,
-                                  int mode, unsigned int encrypt,
-                                  unsigned int);
-extern void SEED_DestroyContext(SEEDContext *cx, PRBool freeit);
-extern SECStatus
-SEED_Encrypt(SEEDContext *cx, unsigned char *output,
-             unsigned int *outputLen, unsigned int maxOutputLen,
-             const unsigned char *input, unsigned int inputLen);
-extern SECStatus
-SEED_Decrypt(SEEDContext *cx, unsigned char *output,
-             unsigned int *outputLen, unsigned int maxOutputLen,
-             const unsigned char *input, unsigned int inputLen);
-
-/******************************************/
-/*
-** AES symmetric block cypher (Rijndael)
-*/
-
-/*
-** Create a new AES context suitable for AES encryption/decryption.
-**  "key" raw key data
-**  "keylen" the number of bytes of key data (16, 24, or 32)
-**      "blocklen" is the blocksize to use (16, 24, or 32)
-**                        XXX currently only blocksize==16 has been tested!
-*/
-extern AESContext *
-AES_CreateContext(const unsigned char *key, const unsigned char *iv,
-                  int mode, int encrypt,
-                  unsigned int keylen, unsigned int blocklen);
-extern AESContext *AES_AllocateContext(void);
-extern SECStatus AES_InitContext(AESContext *cx,
-                                 const unsigned char *key,
-                                 unsigned int keylen,
-                                 const unsigned char *iv,
-                                 int mode,
-                                 unsigned int encrypt,
-                                 unsigned int blocklen);
-
-/*
-** Destroy a AES encryption/decryption context.
-**  "cx" the context
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void
-AES_DestroyContext(AESContext *cx, PRBool freeit);
-
-/*
-** Perform AES encryption.
-**  "cx" the context
-**  "output" the output buffer to store the encrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-*/
-extern SECStatus
-AES_Encrypt(AESContext *cx, unsigned char *output,
-            unsigned int *outputLen, unsigned int maxOutputLen,
-            const unsigned char *input, unsigned int inputLen);
-
-/*
-** Perform AES decryption.
-**  "cx" the context
-**  "output" the output buffer to store the decrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-*/
-extern SECStatus
-AES_Decrypt(AESContext *cx, unsigned char *output,
-            unsigned int *outputLen, unsigned int maxOutputLen,
-            const unsigned char *input, unsigned int inputLen);
-
-/******************************************/
-/*
-** AES key wrap algorithm, RFC 3394
-*/
-
-/*
-** Create a new AES context suitable for AES encryption/decryption.
-**  "key" raw key data
-**      "iv"  The 8 byte "initial value"
-**      "encrypt", a boolean, true for key wrapping, false for unwrapping.
-**  "keylen" the number of bytes of key data (16, 24, or 32)
-*/
-extern AESKeyWrapContext *
-AESKeyWrap_CreateContext(const unsigned char *key, const unsigned char *iv,
-                         int encrypt, unsigned int keylen);
-extern AESKeyWrapContext *AESKeyWrap_AllocateContext(void);
-extern SECStatus
-AESKeyWrap_InitContext(AESKeyWrapContext *cx,
-                       const unsigned char *key,
-                       unsigned int keylen,
-                       const unsigned char *iv,
-                       int,
-                       unsigned int encrypt,
-                       unsigned int);
-
-/*
-** Destroy a AES KeyWrap context.
-**  "cx" the context
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void
-AESKeyWrap_DestroyContext(AESKeyWrapContext *cx, PRBool freeit);
-
-/*
-** Perform AES key wrap.
-**  "cx" the context
-**  "output" the output buffer to store the encrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-*/
-extern SECStatus
-AESKeyWrap_Encrypt(AESKeyWrapContext *cx, unsigned char *output,
-                   unsigned int *outputLen, unsigned int maxOutputLen,
-                   const unsigned char *input, unsigned int inputLen);
-
-/*
-** Perform AES key unwrap.
-**  "cx" the context
-**  "output" the output buffer to store the decrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-*/
-extern SECStatus
-AESKeyWrap_Decrypt(AESKeyWrapContext *cx, unsigned char *output,
-                   unsigned int *outputLen, unsigned int maxOutputLen,
-                   const unsigned char *input, unsigned int inputLen);
-
-/******************************************/
-/*
-** Camellia symmetric block cypher
-*/
-
-/*
-** Create a new Camellia context suitable for Camellia encryption/decryption.
-**  "key" raw key data
-**  "keylen" the number of bytes of key data (16, 24, or 32)
-*/
-extern CamelliaContext *
-Camellia_CreateContext(const unsigned char *key, const unsigned char *iv,
-                       int mode, int encrypt, unsigned int keylen);
-
-extern CamelliaContext *Camellia_AllocateContext(void);
-extern SECStatus Camellia_InitContext(CamelliaContext *cx,
-                                      const unsigned char *key,
-                                      unsigned int keylen,
-                                      const unsigned char *iv,
-                                      int mode,
-                                      unsigned int encrypt,
-                                      unsigned int unused);
-/*
-** Destroy a Camellia encryption/decryption context.
-**  "cx" the context
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void
-Camellia_DestroyContext(CamelliaContext *cx, PRBool freeit);
-
-/*
-** Perform Camellia encryption.
-**  "cx" the context
-**  "output" the output buffer to store the encrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-*/
-extern SECStatus
-Camellia_Encrypt(CamelliaContext *cx, unsigned char *output,
-                 unsigned int *outputLen, unsigned int maxOutputLen,
-                 const unsigned char *input, unsigned int inputLen);
-
-/*
-** Perform Camellia decryption.
-**  "cx" the context
-**  "output" the output buffer to store the decrypted data.
-**  "outputLen" how much data is stored in "output". Set by the routine
-**     after some data is stored in output.
-**  "maxOutputLen" the maximum amount of data that can ever be
-**     stored in "output"
-**  "input" the input data
-**  "inputLen" the amount of input data
-*/
-extern SECStatus
-Camellia_Decrypt(CamelliaContext *cx, unsigned char *output,
-                 unsigned int *outputLen, unsigned int maxOutputLen,
-                 const unsigned char *input, unsigned int inputLen);
-
-/******************************************/
-/*
-** ChaCha20+Poly1305 AEAD
-*/
-
-extern SECStatus ChaCha20Poly1305_InitContext(ChaCha20Poly1305Context *ctx,
-                                              const unsigned char *key,
-                                              unsigned int keyLen,
-                                              unsigned int tagLen);
-
-extern ChaCha20Poly1305Context *ChaCha20Poly1305_CreateContext(
-    const unsigned char *key, unsigned int keyLen, unsigned int tagLen);
-
-extern void ChaCha20Poly1305_DestroyContext(ChaCha20Poly1305Context *ctx,
-                                            PRBool freeit);
-
-extern SECStatus ChaCha20Poly1305_Seal(
-    const ChaCha20Poly1305Context *ctx, unsigned char *output,
-    unsigned int *outputLen, unsigned int maxOutputLen,
-    const unsigned char *input, unsigned int inputLen,
-    const unsigned char *nonce, unsigned int nonceLen,
-    const unsigned char *ad, unsigned int adLen);
-
-extern SECStatus ChaCha20Poly1305_Open(
-    const ChaCha20Poly1305Context *ctx, unsigned char *output,
-    unsigned int *outputLen, unsigned int maxOutputLen,
-    const unsigned char *input, unsigned int inputLen,
-    const unsigned char *nonce, unsigned int nonceLen,
-    const unsigned char *ad, unsigned int adLen);
-
-/******************************************/
-/*
-** MD5 secure hash function
-*/
-
-/*
-** Hash a null terminated string "src" into "dest" using MD5
-*/
-extern SECStatus MD5_Hash(unsigned char *dest, const char *src);
-
-/*
-** Hash a non-null terminated string "src" into "dest" using MD5
-*/
-extern SECStatus MD5_HashBuf(unsigned char *dest, const unsigned char *src,
-                             PRUint32 src_length);
-
-/*
-** Create a new MD5 context
-*/
-extern MD5Context *MD5_NewContext(void);
-
-/*
-** Destroy an MD5 secure hash context.
-**  "cx" the context
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void MD5_DestroyContext(MD5Context *cx, PRBool freeit);
-
-/*
-** Reset an MD5 context, preparing it for a fresh round of hashing
-*/
-extern void MD5_Begin(MD5Context *cx);
-
-/*
-** Update the MD5 hash function with more data.
-**  "cx" the context
-**  "input" the data to hash
-**  "inputLen" the amount of data to hash
-*/
-extern void MD5_Update(MD5Context *cx,
-                       const unsigned char *input, unsigned int inputLen);
-
-/*
-** Finish the MD5 hash function. Produce the digested results in "digest"
-**  "cx" the context
-**  "digest" where the 16 bytes of digest data are stored
-**  "digestLen" where the digest length (16) is stored
-**  "maxDigestLen" the maximum amount of data that can ever be
-**     stored in "digest"
-*/
-extern void MD5_End(MD5Context *cx, unsigned char *digest,
-                    unsigned int *digestLen, unsigned int maxDigestLen);
-
-/*
-** Export the current state of the MD5 hash without appending the standard
-** padding and length bytes. Produce the digested results in "digest"
-**  "cx" the context
-**  "digest" where the 16 bytes of digest data are stored
-**  "digestLen" where the digest length (16) is stored (optional)
-**  "maxDigestLen" the maximum amount of data that can ever be
-**     stored in "digest"
-*/
-extern void MD5_EndRaw(MD5Context *cx, unsigned char *digest,
-                       unsigned int *digestLen, unsigned int maxDigestLen);
-
-/*
- * Return the the size of a buffer needed to flatten the MD5 Context into
- *    "cx" the context
- *  returns size;
- */
-extern unsigned int MD5_FlattenSize(MD5Context *cx);
-
-/*
- * Flatten the MD5 Context into a buffer:
- *    "cx" the context
- *    "space" the buffer to flatten to
- *  returns status;
- */
-extern SECStatus MD5_Flatten(MD5Context *cx, unsigned char *space);
-
-/*
- * Resurrect a flattened context into a MD5 Context
- *    "space" the buffer of the flattend buffer
- *    "arg" ptr to void used by cryptographic resurrect
- *  returns resurected context;
- */
-extern MD5Context *MD5_Resurrect(unsigned char *space, void *arg);
-extern void MD5_Clone(MD5Context *dest, MD5Context *src);
-
-/*
-** trace the intermediate state info of the MD5 hash.
-*/
-extern void MD5_TraceState(MD5Context *cx);
-
-/******************************************/
-/*
-** MD2 secure hash function
-*/
-
-/*
-** Hash a null terminated string "src" into "dest" using MD2
-*/
-extern SECStatus MD2_Hash(unsigned char *dest, const char *src);
-
-/*
-** Create a new MD2 context
-*/
-extern MD2Context *MD2_NewContext(void);
-
-/*
-** Destroy an MD2 secure hash context.
-**  "cx" the context
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void MD2_DestroyContext(MD2Context *cx, PRBool freeit);
-
-/*
-** Reset an MD2 context, preparing it for a fresh round of hashing
-*/
-extern void MD2_Begin(MD2Context *cx);
-
-/*
-** Update the MD2 hash function with more data.
-**  "cx" the context
-**  "input" the data to hash
-**  "inputLen" the amount of data to hash
-*/
-extern void MD2_Update(MD2Context *cx,
-                       const unsigned char *input, unsigned int inputLen);
-
-/*
-** Finish the MD2 hash function. Produce the digested results in "digest"
-**  "cx" the context
-**  "digest" where the 16 bytes of digest data are stored
-**  "digestLen" where the digest length (16) is stored
-**  "maxDigestLen" the maximum amount of data that can ever be
-**     stored in "digest"
-*/
-extern void MD2_End(MD2Context *cx, unsigned char *digest,
-                    unsigned int *digestLen, unsigned int maxDigestLen);
-
-/*
- * Return the the size of a buffer needed to flatten the MD2 Context into
- *    "cx" the context
- *  returns size;
- */
-extern unsigned int MD2_FlattenSize(MD2Context *cx);
-
-/*
- * Flatten the MD2 Context into a buffer:
- *    "cx" the context
- *    "space" the buffer to flatten to
- *  returns status;
- */
-extern SECStatus MD2_Flatten(MD2Context *cx, unsigned char *space);
-
-/*
- * Resurrect a flattened context into a MD2 Context
- *    "space" the buffer of the flattend buffer
- *    "arg" ptr to void used by cryptographic resurrect
- *  returns resurected context;
- */
-extern MD2Context *MD2_Resurrect(unsigned char *space, void *arg);
-extern void MD2_Clone(MD2Context *dest, MD2Context *src);
-
-/******************************************/
-/*
-** SHA-1 secure hash function
-*/
-
-/*
-** Hash a null terminated string "src" into "dest" using SHA-1
-*/
-extern SECStatus SHA1_Hash(unsigned char *dest, const char *src);
-
-/*
-** Hash a non-null terminated string "src" into "dest" using SHA-1
-*/
-extern SECStatus SHA1_HashBuf(unsigned char *dest, const unsigned char *src,
-                              PRUint32 src_length);
-
-/*
-** Create a new SHA-1 context
-*/
-extern SHA1Context *SHA1_NewContext(void);
-
-/*
-** Destroy a SHA-1 secure hash context.
-**  "cx" the context
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void SHA1_DestroyContext(SHA1Context *cx, PRBool freeit);
-
-/*
-** Reset a SHA-1 context, preparing it for a fresh round of hashing
-*/
-extern void SHA1_Begin(SHA1Context *cx);
-
-/*
-** Update the SHA-1 hash function with more data.
-**  "cx" the context
-**  "input" the data to hash
-**  "inputLen" the amount of data to hash
-*/
-extern void SHA1_Update(SHA1Context *cx, const unsigned char *input,
-                        unsigned int inputLen);
-
-/*
-** Finish the SHA-1 hash function. Produce the digested results in "digest"
-**  "cx" the context
-**  "digest" where the 16 bytes of digest data are stored
-**  "digestLen" where the digest length (20) is stored
-**  "maxDigestLen" the maximum amount of data that can ever be
-**     stored in "digest"
-*/
-extern void SHA1_End(SHA1Context *cx, unsigned char *digest,
-                     unsigned int *digestLen, unsigned int maxDigestLen);
-
-/*
-** Export the current state of the SHA-1 hash without appending the standard
-** padding and length bytes. Produce the digested results in "digest"
-**  "cx" the context
-**  "digest" where the 20 bytes of digest data are stored
-**  "digestLen" where the digest length (20) is stored (optional)
-**  "maxDigestLen" the maximum amount of data that can ever be
-**     stored in "digest"
-*/
-extern void SHA1_EndRaw(SHA1Context *cx, unsigned char *digest,
-                        unsigned int *digestLen, unsigned int maxDigestLen);
-
-/*
-** trace the intermediate state info of the SHA1 hash.
-*/
-extern void SHA1_TraceState(SHA1Context *cx);
-
-/*
- * Return the the size of a buffer needed to flatten the SHA-1 Context into
- *    "cx" the context
- *  returns size;
- */
-extern unsigned int SHA1_FlattenSize(SHA1Context *cx);
-
-/*
- * Flatten the SHA-1 Context into a buffer:
- *    "cx" the context
- *    "space" the buffer to flatten to
- *  returns status;
- */
-extern SECStatus SHA1_Flatten(SHA1Context *cx, unsigned char *space);
-
-/*
- * Resurrect a flattened context into a SHA-1 Context
- *    "space" the buffer of the flattend buffer
- *    "arg" ptr to void used by cryptographic resurrect
- *  returns resurected context;
- */
-extern SHA1Context *SHA1_Resurrect(unsigned char *space, void *arg);
-extern void SHA1_Clone(SHA1Context *dest, SHA1Context *src);
-
-/******************************************/
-
-extern SHA224Context *SHA224_NewContext(void);
-extern void SHA224_DestroyContext(SHA224Context *cx, PRBool freeit);
-extern void SHA224_Begin(SHA224Context *cx);
-extern void SHA224_Update(SHA224Context *cx, const unsigned char *input,
-                          unsigned int inputLen);
-extern void SHA224_End(SHA224Context *cx, unsigned char *digest,
-                       unsigned int *digestLen, unsigned int maxDigestLen);
-/*
-** Export the current state of the SHA-224 hash without appending the standard
-** padding and length bytes. Produce the digested results in "digest"
-**  "cx" the context
-**  "digest" where the 28 bytes of digest data are stored
-**  "digestLen" where the digest length (28) is stored (optional)
-**  "maxDigestLen" the maximum amount of data that can ever be
-**     stored in "digest"
-*/
-extern void SHA224_EndRaw(SHA224Context *cx, unsigned char *digest,
-                          unsigned int *digestLen, unsigned int maxDigestLen);
-extern SECStatus SHA224_HashBuf(unsigned char *dest, const unsigned char *src,
-                                PRUint32 src_length);
-extern SECStatus SHA224_Hash(unsigned char *dest, const char *src);
-extern void SHA224_TraceState(SHA224Context *cx);
-extern unsigned int SHA224_FlattenSize(SHA224Context *cx);
-extern SECStatus SHA224_Flatten(SHA224Context *cx, unsigned char *space);
-extern SHA224Context *SHA224_Resurrect(unsigned char *space, void *arg);
-extern void SHA224_Clone(SHA224Context *dest, SHA224Context *src);
-
-/******************************************/
-
-extern SHA256Context *SHA256_NewContext(void);
-extern void SHA256_DestroyContext(SHA256Context *cx, PRBool freeit);
-extern void SHA256_Begin(SHA256Context *cx);
-extern void SHA256_Update(SHA256Context *cx, const unsigned char *input,
-                          unsigned int inputLen);
-extern void SHA256_End(SHA256Context *cx, unsigned char *digest,
-                       unsigned int *digestLen, unsigned int maxDigestLen);
-/*
-** Export the current state of the SHA-256 hash without appending the standard
-** padding and length bytes. Produce the digested results in "digest"
-**  "cx" the context
-**  "digest" where the 32 bytes of digest data are stored
-**  "digestLen" where the digest length (32) is stored (optional)
-**  "maxDigestLen" the maximum amount of data that can ever be
-**     stored in "digest"
-*/
-extern void SHA256_EndRaw(SHA256Context *cx, unsigned char *digest,
-                          unsigned int *digestLen, unsigned int maxDigestLen);
-extern SECStatus SHA256_HashBuf(unsigned char *dest, const unsigned char *src,
-                                PRUint32 src_length);
-extern SECStatus SHA256_Hash(unsigned char *dest, const char *src);
-extern void SHA256_TraceState(SHA256Context *cx);
-extern unsigned int SHA256_FlattenSize(SHA256Context *cx);
-extern SECStatus SHA256_Flatten(SHA256Context *cx, unsigned char *space);
-extern SHA256Context *SHA256_Resurrect(unsigned char *space, void *arg);
-extern void SHA256_Clone(SHA256Context *dest, SHA256Context *src);
-
-/******************************************/
-
-extern SHA512Context *SHA512_NewContext(void);
-extern void SHA512_DestroyContext(SHA512Context *cx, PRBool freeit);
-extern void SHA512_Begin(SHA512Context *cx);
-extern void SHA512_Update(SHA512Context *cx, const unsigned char *input,
-                          unsigned int inputLen);
-/*
-** Export the current state of the SHA-512 hash without appending the standard
-** padding and length bytes. Produce the digested results in "digest"
-**  "cx" the context
-**  "digest" where the 64 bytes of digest data are stored
-**  "digestLen" where the digest length (64) is stored (optional)
-**  "maxDigestLen" the maximum amount of data that can ever be
-**     stored in "digest"
-*/
-extern void SHA512_EndRaw(SHA512Context *cx, unsigned char *digest,
-                          unsigned int *digestLen, unsigned int maxDigestLen);
-extern void SHA512_End(SHA512Context *cx, unsigned char *digest,
-                       unsigned int *digestLen, unsigned int maxDigestLen);
-extern SECStatus SHA512_HashBuf(unsigned char *dest, const unsigned char *src,
-                                PRUint32 src_length);
-extern SECStatus SHA512_Hash(unsigned char *dest, const char *src);
-extern void SHA512_TraceState(SHA512Context *cx);
-extern unsigned int SHA512_FlattenSize(SHA512Context *cx);
-extern SECStatus SHA512_Flatten(SHA512Context *cx, unsigned char *space);
-extern SHA512Context *SHA512_Resurrect(unsigned char *space, void *arg);
-extern void SHA512_Clone(SHA512Context *dest, SHA512Context *src);
-
-/******************************************/
-
-extern SHA384Context *SHA384_NewContext(void);
-extern void SHA384_DestroyContext(SHA384Context *cx, PRBool freeit);
-extern void SHA384_Begin(SHA384Context *cx);
-extern void SHA384_Update(SHA384Context *cx, const unsigned char *input,
-                          unsigned int inputLen);
-extern void SHA384_End(SHA384Context *cx, unsigned char *digest,
-                       unsigned int *digestLen, unsigned int maxDigestLen);
-/*
-** Export the current state of the SHA-384 hash without appending the standard
-** padding and length bytes. Produce the digested results in "digest"
-**  "cx" the context
-**  "digest" where the 48 bytes of digest data are stored
-**  "digestLen" where the digest length (48) is stored (optional)
-**  "maxDigestLen" the maximum amount of data that can ever be
-**     stored in "digest"
-*/
-extern void SHA384_EndRaw(SHA384Context *cx, unsigned char *digest,
-                          unsigned int *digestLen, unsigned int maxDigestLen);
-extern SECStatus SHA384_HashBuf(unsigned char *dest, const unsigned char *src,
-                                PRUint32 src_length);
-extern SECStatus SHA384_Hash(unsigned char *dest, const char *src);
-extern void SHA384_TraceState(SHA384Context *cx);
-extern unsigned int SHA384_FlattenSize(SHA384Context *cx);
-extern SECStatus SHA384_Flatten(SHA384Context *cx, unsigned char *space);
-extern SHA384Context *SHA384_Resurrect(unsigned char *space, void *arg);
-extern void SHA384_Clone(SHA384Context *dest, SHA384Context *src);
-
-/****************************************
- * implement TLS 1.0 Pseudo Random Function (PRF) and TLS P_hash function
- */
-
-extern SECStatus
-TLS_PRF(const SECItem *secret, const char *label, SECItem *seed,
-        SECItem *result, PRBool isFIPS);
-
-extern SECStatus
-TLS_P_hash(HASH_HashType hashAlg, const SECItem *secret, const char *label,
-           SECItem *seed, SECItem *result, PRBool isFIPS);
-
-/******************************************/
-/*
-** Pseudo Random Number Generation.  FIPS compliance desirable.
-*/
-
-/*
-** Initialize the global RNG context and give it some seed input taken
-** from the system.  This function is thread-safe and will only allow
-** the global context to be initialized once.  The seed input is likely
-** small, so it is imperative that RNG_RandomUpdate() be called with
-** additional seed data before the generator is used.  A good way to
-** provide the generator with additional entropy is to call
-** RNG_SystemInfoForRNG().  Note that NSS_Init() does exactly that.
-*/
-extern SECStatus RNG_RNGInit(void);
-
-/*
-** Update the global random number generator with more seeding
-** material
-*/
-extern SECStatus RNG_RandomUpdate(const void *data, size_t bytes);
-
-/*
-** Generate some random bytes, using the global random number generator
-** object.
-*/
-extern SECStatus RNG_GenerateGlobalRandomBytes(void *dest, size_t len);
-
-extern SECStatus RNG_ResetForFuzzing(void);
-
-/* Destroy the global RNG context.  After a call to RNG_RNGShutdown()
-** a call to RNG_RNGInit() is required in order to use the generator again,
-** along with seed data (see the comment above RNG_RNGInit()).
-*/
-extern void RNG_RNGShutdown(void);
-
-extern void RNG_SystemInfoForRNG(void);
-
-/*
- * FIPS 186-2 Change Notice 1 RNG Algorithm 1, used both to
- * generate the DSA X parameter and as a generic purpose RNG.
- *
- * The following two FIPS186Change functions are needed for
- * NIST RNG Validation System.
- */
-
-/*
- * FIPS186Change_GenerateX is now deprecated. It will return SECFailure with
- * the error set to PR_NOT_IMPLEMENTED_ERROR.
- */
-extern SECStatus
-FIPS186Change_GenerateX(unsigned char *XKEY,
-                        const unsigned char *XSEEDj,
-                        unsigned char *x_j);
-
-/*
- * When generating the DSA X parameter, we generate 2*GSIZE bytes
- * of random output and reduce it mod q.
- *
- * Input: w, 2*GSIZE bytes
- *        q, DSA_SUBPRIME_LEN bytes
- * Output: xj, DSA_SUBPRIME_LEN bytes
- */
-extern SECStatus
-FIPS186Change_ReduceModQForDSA(const unsigned char *w,
-                               const unsigned char *q,
-                               unsigned char *xj);
-
-/* To allow NIST KAT tests */
-extern SECStatus
-PRNGTEST_Instantiate_Kat(const PRUint8 *entropy, unsigned int entropy_len,
-                         const PRUint8 *nonce, unsigned int nonce_len,
-                         const PRUint8 *personal_string, unsigned int ps_len);
-
-/*
- * The following functions are for FIPS poweron self test and FIPS algorithm
- * testing.
- */
-extern SECStatus
-PRNGTEST_Instantiate(const PRUint8 *entropy, unsigned int entropy_len,
-                     const PRUint8 *nonce, unsigned int nonce_len,
-                     const PRUint8 *personal_string, unsigned int ps_len);
-
-extern SECStatus
-PRNGTEST_Reseed(const PRUint8 *entropy, unsigned int entropy_len,
-                const PRUint8 *additional, unsigned int additional_len);
-
-extern SECStatus
-PRNGTEST_Generate(PRUint8 *bytes, unsigned int bytes_len,
-                  const PRUint8 *additional, unsigned int additional_len);
-
-extern SECStatus
-PRNGTEST_Uninstantiate(void);
-
-extern SECStatus
-PRNGTEST_RunHealthTests(void);
-
-/* Generate PQGParams and PQGVerify structs.
- * Length of seed and length of h both equal length of P.
- * All lengths are specified by "j", according to the table above.
- *
- * The verify parameters will conform to FIPS186-1.
- */
-extern SECStatus
-PQG_ParamGen(unsigned int j,      /* input : determines length of P. */
-             PQGParams **pParams, /* output: P Q and G returned here */
-             PQGVerify **pVfy);   /* output: counter and seed. */
-
-/* Generate PQGParams and PQGVerify structs.
- * Length of P specified by j.  Length of h will match length of P.
- * Length of SEED in bytes specified in seedBytes.
- * seedBbytes must be in the range [20..255] or an error will result.
- *
- * The verify parameters will conform to FIPS186-1.
- */
-extern SECStatus
-PQG_ParamGenSeedLen(
-    unsigned int j,         /* input : determines length of P. */
-    unsigned int seedBytes, /* input : length of seed in bytes.*/
-    PQGParams **pParams,    /* output: P Q and G returned here */
-    PQGVerify **pVfy);      /* output: counter and seed. */
-
-/* Generate PQGParams and PQGVerify structs.
- * Length of P specified by L in bits.
- * Length of Q specified by N in bits.
- * Length of SEED in bytes specified in seedBytes.
- * seedBbytes must be in the range [N..L*2] or an error will result.
- *
- * Not that J uses the above table, L is the length exact. L and N must
- * match the table below or an error will result:
- *
- *  L            N
- * 1024         160
- * 2048         224
- * 2048         256
- * 3072         256
- *
- * If N or seedBytes are set to zero, then PQG_ParamGenSeedLen will
- * pick a default value (typically the smallest secure value for these
- * variables).
- *
- * The verify parameters will conform to FIPS186-3 using the smallest
- * permissible hash for the key strength.
- */
-extern SECStatus
-PQG_ParamGenV2(
-    unsigned int L,         /* input : determines length of P. */
-    unsigned int N,         /* input : determines length of Q. */
-    unsigned int seedBytes, /* input : length of seed in bytes.*/
-    PQGParams **pParams,    /* output: P Q and G returned here */
-    PQGVerify **pVfy);      /* output: counter and seed. */
-
-/*  Test PQGParams for validity as DSS PQG values.
- *  If vfy is non-NULL, test PQGParams to make sure they were generated
- *       using the specified seed, counter, and h values.
- *
- *  Return value indicates whether Verification operation ran successfully
- *  to completion, but does not indicate if PQGParams are valid or not.
- *  If return value is SECSuccess, then *pResult has these meanings:
- *       SECSuccess: PQGParams are valid.
- *       SECFailure: PQGParams are invalid.
- *
- * Verify the PQG againts the counter, SEED and h.
- * These tests are specified in FIPS 186-3 Appendix A.1.1.1, A.1.1.3, and A.2.2
- * PQG_VerifyParams will automatically choose the appropriate test.
- */
-
-extern SECStatus PQG_VerifyParams(const PQGParams *params,
-                                  const PQGVerify *vfy, SECStatus *result);
-
-extern void PQG_DestroyParams(PQGParams *params);
-
-extern void PQG_DestroyVerify(PQGVerify *vfy);
-
-/*
- * clean-up any global tables freebl may have allocated after it starts up.
- * This function is not thread safe and should be called only after the
- * library has been quiessed.
- */
-extern void BL_Cleanup(void);
-
-/* unload freebl shared library from memory */
-extern void BL_Unload(void);
-
-/**************************************************************************
- *  Verify a given Shared library signature                               *
- **************************************************************************/
-PRBool BLAPI_SHVerify(const char *name, PRFuncPtr addr);
-
-/**************************************************************************
- *  Verify a given filename's signature                               *
- **************************************************************************/
-PRBool BLAPI_SHVerifyFile(const char *shName);
-
-/**************************************************************************
- *  Verify Are Own Shared library signature                               *
- **************************************************************************/
-PRBool BLAPI_VerifySelf(const char *name);
-
-/*********************************************************************/
-extern const SECHashObject *HASH_GetRawHashObject(HASH_HashType hashType);
-
-extern void BL_SetForkState(PRBool forked);
-
-/*
-** pepare an ECParam structure from DEREncoded params
- */
-extern SECStatus EC_FillParams(PLArenaPool *arena,
-                               const SECItem *encodedParams, ECParams *params);
-extern SECStatus EC_DecodeParams(const SECItem *encodedParams,
-                                 ECParams **ecparams);
-extern SECStatus EC_CopyParams(PLArenaPool *arena, ECParams *dstParams,
-                               const ECParams *srcParams);
-
-/*
- * use the internal table to get the size in bytes of a single EC point
- */
-extern int EC_GetPointSize(const ECParams *params);
-
-SEC_END_PROTOS
-
-#endif /* _BLAPI_H_ */
diff --git a/openflow/usr/include/nss/blapit.h b/openflow/usr/include/nss/blapit.h
deleted file mode 100644
index 2a17b5f..0000000
--- a/openflow/usr/include/nss/blapit.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * blapit.h - public data structures for the freebl library
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _BLAPIT_H_
-#define _BLAPIT_H_
-
-#include "seccomon.h"
-#include "prlink.h"
-#include "plarena.h"
-#include "ecl-exp.h"
-
-/* RC2 operation modes */
-#define NSS_RC2 0
-#define NSS_RC2_CBC 1
-
-/* RC5 operation modes */
-#define NSS_RC5 0
-#define NSS_RC5_CBC 1
-
-/* DES operation modes */
-#define NSS_DES 0
-#define NSS_DES_CBC 1
-#define NSS_DES_EDE3 2
-#define NSS_DES_EDE3_CBC 3
-
-#define DES_KEY_LENGTH 8 /* Bytes */
-
-/* AES operation modes */
-#define NSS_AES 0
-#define NSS_AES_CBC 1
-#define NSS_AES_CTS 2
-#define NSS_AES_CTR 3
-#define NSS_AES_GCM 4
-
-/* Camellia operation modes */
-#define NSS_CAMELLIA 0
-#define NSS_CAMELLIA_CBC 1
-
-/* SEED operation modes */
-#define NSS_SEED 0
-#define NSS_SEED_CBC 1
-
-#define DSA1_SUBPRIME_LEN 20                             /* Bytes */
-#define DSA1_SIGNATURE_LEN (DSA1_SUBPRIME_LEN * 2)       /* Bytes */
-#define DSA_MAX_SUBPRIME_LEN 32                          /* Bytes */
-#define DSA_MAX_SIGNATURE_LEN (DSA_MAX_SUBPRIME_LEN * 2) /* Bytes */
-
-/*
- * Mark the old defines as deprecated. This will warn code that expected
- * DSA1 only that they need to change if the are to support DSA2.
- */
-#if defined(__GNUC__) && (__GNUC__ > 3)
-/* make GCC warn when we use these #defines */
-typedef int __BLAPI_DEPRECATED __attribute__((deprecated));
-#define DSA_SUBPRIME_LEN ((__BLAPI_DEPRECATED)DSA1_SUBPRIME_LEN)
-#define DSA_SIGNATURE_LEN ((__BLAPI_DEPRECATED)DSA1_SIGNATURE_LEN)
-#define DSA_Q_BITS ((__BLAPI_DEPRECATED)(DSA1_SUBPRIME_LEN * 8))
-#else
-#ifdef _WIN32
-/* This magic gets the windows compiler to give us a deprecation
- * warning */
-#pragma deprecated(DSA_SUBPRIME_LEN, DSA_SIGNATURE_LEN, DSA_QBITS)
-#endif
-#define DSA_SUBPRIME_LEN DSA1_SUBPRIME_LEN
-#define DSA_SIGNATURE_LEN DSA1_SIGNATURE_LEN
-#define DSA_Q_BITS (DSA1_SUBPRIME_LEN * 8)
-#endif
-
-/* XXX We shouldn't have to hard code this limit. For
- * now, this is the quickest way to support ECDSA signature
- * processing (ECDSA signature lengths depend on curve
- * size). This limit is sufficient for curves upto
- * 576 bits.
- */
-#define MAX_ECKEY_LEN 72 /* Bytes */
-
-#define EC_MAX_KEY_BITS 521 /* in bits */
-#define EC_MIN_KEY_BITS 256 /* in bits */
-
-/* EC point compression format */
-#define EC_POINT_FORM_COMPRESSED_Y0 0x02
-#define EC_POINT_FORM_COMPRESSED_Y1 0x03
-#define EC_POINT_FORM_UNCOMPRESSED 0x04
-#define EC_POINT_FORM_HYBRID_Y0 0x06
-#define EC_POINT_FORM_HYBRID_Y1 0x07
-
-/*
- * Number of bytes each hash algorithm produces
- */
-#define MD2_LENGTH 16    /* Bytes */
-#define MD5_LENGTH 16    /* Bytes */
-#define SHA1_LENGTH 20   /* Bytes */
-#define SHA256_LENGTH 32 /* bytes */
-#define SHA384_LENGTH 48 /* bytes */
-#define SHA512_LENGTH 64 /* bytes */
-#define HASH_LENGTH_MAX SHA512_LENGTH
-
-/*
- * Input block size for each hash algorithm.
- */
-
-#define MD2_BLOCK_LENGTH 64     /* bytes */
-#define MD5_BLOCK_LENGTH 64     /* bytes */
-#define SHA1_BLOCK_LENGTH 64    /* bytes */
-#define SHA224_BLOCK_LENGTH 64  /* bytes */
-#define SHA256_BLOCK_LENGTH 64  /* bytes */
-#define SHA384_BLOCK_LENGTH 128 /* bytes */
-#define SHA512_BLOCK_LENGTH 128 /* bytes */
-#define HASH_BLOCK_LENGTH_MAX SHA512_BLOCK_LENGTH
-
-#define AES_KEY_WRAP_IV_BYTES 8
-#define AES_KEY_WRAP_BLOCK_SIZE 8 /* bytes */
-#define AES_BLOCK_SIZE 16         /* bytes */
-
-#define AES_128_KEY_LENGTH 16 /* bytes */
-#define AES_192_KEY_LENGTH 24 /* bytes */
-#define AES_256_KEY_LENGTH 32 /* bytes */
-
-#define CAMELLIA_BLOCK_SIZE 16 /* bytes */
-
-#define SEED_BLOCK_SIZE 16 /* bytes */
-#define SEED_KEY_LENGTH 16 /* bytes */
-
-#define NSS_FREEBL_DEFAULT_CHUNKSIZE 2048
-
-/*
- * These values come from the initial key size limits from the PKCS #11
- * module. They may be arbitrarily adjusted to any value freebl supports.
- */
-#define RSA_MIN_MODULUS_BITS 128
-#define RSA_MAX_MODULUS_BITS 16384
-#define RSA_MAX_EXPONENT_BITS 64
-#define DH_MIN_P_BITS 128
-#define DH_MAX_P_BITS 16384
-
-/*
- * The FIPS 186-1 algorithm for generating primes P and Q allows only 9
- * distinct values for the length of P, and only one value for the
- * length of Q.
- * The algorithm uses a variable j to indicate which of the 9 lengths
- * of P is to be used.
- * The following table relates j to the lengths of P and Q in bits.
- *
- *  j   bits in P   bits in Q
- *  _   _________   _________
- *  0    512        160
- *  1    576        160
- *  2    640        160
- *  3    704        160
- *  4    768        160
- *  5    832        160
- *  6    896        160
- *  7    960        160
- *  8   1024        160
- *
- * The FIPS-186-1 compliant PQG generator takes j as an input parameter.
- *
- * FIPS 186-3 algorithm specifies 4 distinct P and Q sizes:
- *
- *     bits in P       bits in Q
- *     _________       _________
- *      1024           160
- *      2048           224
- *      2048           256
- *      3072           256
- *
- * The FIPS-186-3 complaiant PQG generator (PQG V2) takes arbitrary p and q
- * lengths as input and returns an error if they aren't in this list.
- */
-
-#define DSA1_Q_BITS 160
-#define DSA_MAX_P_BITS 3072
-#define DSA_MIN_P_BITS 512
-#define DSA_MAX_Q_BITS 256
-#define DSA_MIN_Q_BITS 160
-
-#if DSA_MAX_Q_BITS != DSA_MAX_SUBPRIME_LEN * 8
-#error "Inconsistent declaration of DSA SUBPRIME/Q parameters in blapit.h"
-#endif
-
-/*
- * function takes desired number of bits in P,
- * returns index (0..8) or -1 if number of bits is invalid.
- */
-#define PQG_PBITS_TO_INDEX(bits) \
-    (((bits) < 512 || (bits) > 1024 || (bits) % 64) ? -1 : (int)((bits)-512) / 64)
-
-/*
- * function takes index (0-8)
- * returns number of bits in P for that index, or -1 if index is invalid.
- */
-#define PQG_INDEX_TO_PBITS(j) (((unsigned)(j) > 8) ? -1 : (512 + 64 * (j)))
-
-/***************************************************************************
-** Opaque objects
-*/
-
-struct DESContextStr;
-struct RC2ContextStr;
-struct RC4ContextStr;
-struct RC5ContextStr;
-struct AESContextStr;
-struct CamelliaContextStr;
-struct MD2ContextStr;
-struct MD5ContextStr;
-struct SHA1ContextStr;
-struct SHA256ContextStr;
-struct SHA512ContextStr;
-struct AESKeyWrapContextStr;
-struct SEEDContextStr;
-struct ChaCha20Poly1305ContextStr;
-
-typedef struct DESContextStr DESContext;
-typedef struct RC2ContextStr RC2Context;
-typedef struct RC4ContextStr RC4Context;
-typedef struct RC5ContextStr RC5Context;
-typedef struct AESContextStr AESContext;
-typedef struct CamelliaContextStr CamelliaContext;
-typedef struct MD2ContextStr MD2Context;
-typedef struct MD5ContextStr MD5Context;
-typedef struct SHA1ContextStr SHA1Context;
-typedef struct SHA256ContextStr SHA256Context;
-/* SHA224Context is really a SHA256ContextStr.  This is not a mistake. */
-typedef struct SHA256ContextStr SHA224Context;
-typedef struct SHA512ContextStr SHA512Context;
-/* SHA384Context is really a SHA512ContextStr.  This is not a mistake. */
-typedef struct SHA512ContextStr SHA384Context;
-typedef struct AESKeyWrapContextStr AESKeyWrapContext;
-typedef struct SEEDContextStr SEEDContext;
-typedef struct ChaCha20Poly1305ContextStr ChaCha20Poly1305Context;
-
-/***************************************************************************
-** RSA Public and Private Key structures
-*/
-
-/* member names from PKCS#1, section 7.1 */
-struct RSAPublicKeyStr {
-    PLArenaPool *arena;
-    SECItem modulus;
-    SECItem publicExponent;
-};
-typedef struct RSAPublicKeyStr RSAPublicKey;
-
-/* member names from PKCS#1, section 7.2 */
-struct RSAPrivateKeyStr {
-    PLArenaPool *arena;
-    SECItem version;
-    SECItem modulus;
-    SECItem publicExponent;
-    SECItem privateExponent;
-    SECItem prime1;
-    SECItem prime2;
-    SECItem exponent1;
-    SECItem exponent2;
-    SECItem coefficient;
-};
-typedef struct RSAPrivateKeyStr RSAPrivateKey;
-
-/***************************************************************************
-** DSA Public and Private Key and related structures
-*/
-
-struct PQGParamsStr {
-    PLArenaPool *arena;
-    SECItem prime;    /* p */
-    SECItem subPrime; /* q */
-    SECItem base;     /* g */
-    /* XXX chrisk: this needs to be expanded to hold j and validationParms (RFC2459 7.3.2) */
-};
-typedef struct PQGParamsStr PQGParams;
-
-struct PQGVerifyStr {
-    PLArenaPool *arena; /* includes this struct, seed, & h. */
-    unsigned int counter;
-    SECItem seed;
-    SECItem h;
-};
-typedef struct PQGVerifyStr PQGVerify;
-
-struct DSAPublicKeyStr {
-    PQGParams params;
-    SECItem publicValue;
-};
-typedef struct DSAPublicKeyStr DSAPublicKey;
-
-struct DSAPrivateKeyStr {
-    PQGParams params;
-    SECItem publicValue;
-    SECItem privateValue;
-};
-typedef struct DSAPrivateKeyStr DSAPrivateKey;
-
-/***************************************************************************
-** Diffie-Hellman Public and Private Key and related structures
-** Structure member names suggested by PKCS#3.
-*/
-
-struct DHParamsStr {
-    PLArenaPool *arena;
-    SECItem prime; /* p */
-    SECItem base;  /* g */
-};
-typedef struct DHParamsStr DHParams;
-
-struct DHPublicKeyStr {
-    PLArenaPool *arena;
-    SECItem prime;
-    SECItem base;
-    SECItem publicValue;
-};
-typedef struct DHPublicKeyStr DHPublicKey;
-
-struct DHPrivateKeyStr {
-    PLArenaPool *arena;
-    SECItem prime;
-    SECItem base;
-    SECItem publicValue;
-    SECItem privateValue;
-};
-typedef struct DHPrivateKeyStr DHPrivateKey;
-
-/***************************************************************************
-** Data structures used for elliptic curve parameters and
-** public and private keys.
-*/
-
-/*
-** The ECParams data structures can encode elliptic curve
-** parameters for both GFp and GF2m curves.
-*/
-
-typedef enum { ec_params_explicit,
-               ec_params_named
-} ECParamsType;
-
-typedef enum { ec_field_GFp = 1,
-               ec_field_GF2m,
-               ec_field_plain
-} ECFieldType;
-
-struct ECFieldIDStr {
-    int size; /* field size in bits */
-    ECFieldType type;
-    union {
-        SECItem prime; /* prime p for (GFp) */
-        SECItem poly;  /* irreducible binary polynomial for (GF2m) */
-    } u;
-    int k1; /* first coefficient of pentanomial or
-                         * the only coefficient of trinomial
-                         */
-    int k2; /* two remaining coefficients of pentanomial */
-    int k3;
-};
-typedef struct ECFieldIDStr ECFieldID;
-
-struct ECCurveStr {
-    SECItem a; /* contains octet stream encoding of
-                         * field element (X9.62 section 4.3.3)
-             */
-    SECItem b;
-    SECItem seed;
-};
-typedef struct ECCurveStr ECCurve;
-
-struct ECParamsStr {
-    PLArenaPool *arena;
-    ECParamsType type;
-    ECFieldID fieldID;
-    ECCurve curve;
-    SECItem base;
-    SECItem order;
-    int cofactor;
-    SECItem DEREncoding;
-    ECCurveName name;
-    SECItem curveOID;
-};
-typedef struct ECParamsStr ECParams;
-
-struct ECPublicKeyStr {
-    ECParams ecParams;
-    SECItem publicValue; /* elliptic curve point encoded as
-                * octet stream.
-                */
-};
-typedef struct ECPublicKeyStr ECPublicKey;
-
-struct ECPrivateKeyStr {
-    ECParams ecParams;
-    SECItem publicValue;  /* encoded ec point */
-    SECItem privateValue; /* private big integer */
-    SECItem version;      /* As per SEC 1, Appendix C, Section C.4 */
-};
-typedef struct ECPrivateKeyStr ECPrivateKey;
-
-typedef void *(*BLapiAllocateFunc)(void);
-typedef void (*BLapiDestroyContextFunc)(void *cx, PRBool freeit);
-typedef SECStatus (*BLapiInitContextFunc)(void *cx,
-                                          const unsigned char *key,
-                                          unsigned int keylen,
-                                          const unsigned char *,
-                                          int,
-                                          unsigned int,
-                                          unsigned int);
-typedef SECStatus (*BLapiEncrypt)(void *cx, unsigned char *output,
-                                  unsigned int *outputLen,
-                                  unsigned int maxOutputLen,
-                                  const unsigned char *input,
-                                  unsigned int inputLen);
-
-#endif /* _BLAPIT_H_ */
diff --git a/openflow/usr/include/nss/cert.h b/openflow/usr/include/nss/cert.h
deleted file mode 100644
index e0af65a..0000000
--- a/openflow/usr/include/nss/cert.h
+++ /dev/null
@@ -1,1584 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * cert.h - public data structures and prototypes for the certificate library
- */
-
-#ifndef _CERT_H_
-#define _CERT_H_
-
-#include "utilrename.h"
-#include "plarena.h"
-#include "plhash.h"
-#include "prlong.h"
-#include "prlog.h"
-
-#include "seccomon.h"
-#include "secdert.h"
-#include "secoidt.h"
-#include "keyt.h"
-#include "certt.h"
-
-SEC_BEGIN_PROTOS
-
-/****************************************************************************
- *
- * RFC1485 ascii to/from X.? RelativeDistinguishedName (aka CERTName)
- *
- ****************************************************************************/
-
-/*
-** Convert an ascii RFC1485 encoded name into its CERTName equivalent.
-*/
-extern CERTName *CERT_AsciiToName(const char *string);
-
-/*
-** Convert an CERTName into its RFC1485 encoded equivalent.
-** Returns a string that must be freed with PORT_Free().
-** This version produces a string for maximum human readability,
-** not for strict RFC compliance.
-*/
-extern char *CERT_NameToAscii(CERTName *name);
-
-/*
-** Convert an CERTName into its RFC1485 encoded equivalent.
-** Returns a string that must be freed with PORT_Free().
-** Caller chooses encoding rules.
-*/
-extern char *CERT_NameToAsciiInvertible(CERTName *name,
-                                        CertStrictnessLevel strict);
-
-extern CERTAVA *CERT_CopyAVA(PLArenaPool *arena, CERTAVA *src);
-
-/* convert an OID to dotted-decimal representation */
-/* Returns a string that must be freed with PR_smprintf_free(). */
-extern char *CERT_GetOidString(const SECItem *oid);
-
-/*
-** Examine an AVA and return the tag that refers to it. The AVA tags are
-** defined as SEC_OID_AVA*.
-*/
-extern SECOidTag CERT_GetAVATag(CERTAVA *ava);
-
-/*
-** Compare two AVA's, returning the difference between them.
-*/
-extern SECComparison CERT_CompareAVA(const CERTAVA *a, const CERTAVA *b);
-
-/*
-** Create an RDN (relative-distinguished-name). The argument list is a
-** NULL terminated list of AVA's.
-*/
-extern CERTRDN *CERT_CreateRDN(PLArenaPool *arena, CERTAVA *avas, ...);
-
-/*
-** Make a copy of "src" storing it in "dest".
-*/
-extern SECStatus CERT_CopyRDN(PLArenaPool *arena, CERTRDN *dest, CERTRDN *src);
-
-/*
-** Add an AVA to an RDN.
-**	"rdn" the RDN to add to
-**	"ava" the AVA to add
-*/
-extern SECStatus CERT_AddAVA(PLArenaPool *arena, CERTRDN *rdn, CERTAVA *ava);
-
-/*
-** Compare two RDN's, returning the difference between them.
-*/
-extern SECComparison CERT_CompareRDN(const CERTRDN *a, const CERTRDN *b);
-
-/*
-** Create an X.500 style name using a NULL terminated list of RDN's.
-*/
-extern CERTName *CERT_CreateName(CERTRDN *rdn, ...);
-
-/*
-** Make a copy of "src" storing it in "dest". Memory is allocated in
-** "dest" for each of the appropriate sub objects. Memory is not freed in
-** "dest" before allocation is done (use CERT_DestroyName(dest, PR_FALSE) to
-** do that).
-*/
-extern SECStatus CERT_CopyName(PLArenaPool *arena, CERTName *dest,
-                               const CERTName *src);
-
-/*
-** Destroy a Name object.
-**	"name" the CERTName to destroy
-**	"freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void CERT_DestroyName(CERTName *name);
-
-/*
-** Add an RDN to a name.
-**	"name" the name to add the RDN to
-**	"rdn" the RDN to add to name
-*/
-extern SECStatus CERT_AddRDN(CERTName *name, CERTRDN *rdn);
-
-/*
-** Compare two names, returning the difference between them.
-*/
-extern SECComparison CERT_CompareName(const CERTName *a, const CERTName *b);
-
-/*
-** Convert a CERTName into something readable
-*/
-extern char *CERT_FormatName(CERTName *name);
-
-/*
-** Convert a der-encoded integer to a hex printable string form.
-** Perhaps this should be a SEC function but it's only used for certs.
-*/
-extern char *CERT_Hexify(SECItem *i, int do_colon);
-
-/*
-** Converts DER string (with explicit length) into zString, if destination
-** buffer is big enough to receive it.  Does quoting and/or escaping as
-** specified in RFC 1485.  Input string must be single or multi-byte DER
-** character set, (ASCII, UTF8, or ISO 8851-x) not a wide character set.
-** Returns SECSuccess or SECFailure with error code set. If output buffer
-** is too small, sets error code SEC_ERROR_OUTPUT_LEN.
-*/
-extern SECStatus CERT_RFC1485_EscapeAndQuote(char *dst, int dstlen, char *src,
-                                             int srclen);
-
-/******************************************************************************
- *
- * Certificate handling operations
- *
- *****************************************************************************/
-
-/*
-** Create a new validity object given two unix time values.
-**	"notBefore" the time before which the validity is not valid
-**	"notAfter" the time after which the validity is not valid
-*/
-extern CERTValidity *CERT_CreateValidity(PRTime notBefore, PRTime notAfter);
-
-/*
-** Destroy a validity object.
-**	"v" the validity to destroy
-**	"freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void CERT_DestroyValidity(CERTValidity *v);
-
-/*
-** Copy the "src" object to "dest". Memory is allocated in "dest" for
-** each of the appropriate sub-objects. Memory in "dest" is not freed
-** before memory is allocated (use CERT_DestroyValidity(v, PR_FALSE) to do
-** that).
-*/
-extern SECStatus CERT_CopyValidity(PLArenaPool *arena, CERTValidity *dest,
-                                   CERTValidity *src);
-
-/*
-** The cert lib considers a cert or CRL valid if the "notBefore" time is
-** in the not-too-distant future, e.g. within the next 24 hours. This
-** prevents freshly issued certificates from being considered invalid
-** because the local system's time zone is incorrectly set.
-** The amount of "pending slop time" is adjustable by the application.
-** Units of SlopTime are seconds.  Default is 86400  (24 hours).
-** Negative SlopTime values are not allowed.
-*/
-PRInt32 CERT_GetSlopTime(void);
-
-SECStatus CERT_SetSlopTime(PRInt32 slop);
-
-/*
-** Create a new certificate object. The result must be wrapped with an
-** CERTSignedData to create a signed certificate.
-**	"serialNumber" the serial number
-**	"issuer" the name of the certificate issuer
-**	"validity" the validity period of the certificate
-**	"req" the certificate request that prompted the certificate issuance
-*/
-extern CERTCertificate *CERT_CreateCertificate(unsigned long serialNumber,
-                                               CERTName *issuer,
-                                               CERTValidity *validity,
-                                               CERTCertificateRequest *req);
-
-/*
-** Destroy a certificate object
-**	"cert" the certificate to destroy
-** NOTE: certificate's are reference counted. This call decrements the
-** reference count, and if the result is zero, then the object is destroyed
-** and optionally freed.
-*/
-extern void CERT_DestroyCertificate(CERTCertificate *cert);
-
-/*
-** Make a shallow copy of a certificate "c". Just increments the
-** reference count on "c".
-*/
-extern CERTCertificate *CERT_DupCertificate(CERTCertificate *c);
-
-/*
-** Create a new certificate request. This result must be wrapped with an
-** CERTSignedData to create a signed certificate request.
-**	"name" the subject name (who the certificate request is from)
-**	"spki" describes/defines the public key the certificate is for
-**	"attributes" if non-zero, some optional attribute data
-*/
-extern CERTCertificateRequest *CERT_CreateCertificateRequest(
-    CERTName *name, CERTSubjectPublicKeyInfo *spki, SECItem **attributes);
-
-/*
-** Destroy a certificate-request object
-**	"r" the certificate-request to destroy
-**	"freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void CERT_DestroyCertificateRequest(CERTCertificateRequest *r);
-
-/*
-** Start adding extensions to a certificate request.
-*/
-void *CERT_StartCertificateRequestAttributes(CERTCertificateRequest *req);
-
-/*
-** Reformat the certificate extension list into a CertificateRequest
-** attribute list.
-*/
-SECStatus CERT_FinishCertificateRequestAttributes(CERTCertificateRequest *req);
-
-/*
-** Extract the Extension Requests from a DER CertRequest attribute list.
-*/
-SECStatus CERT_GetCertificateRequestExtensions(CERTCertificateRequest *req,
-                                               CERTCertExtension ***exts);
-
-/*
-** Extract a public key object from a certificate
-*/
-extern SECKEYPublicKey *CERT_ExtractPublicKey(CERTCertificate *cert);
-
-/*
-** Retrieve the Key Type associated with the cert we're dealing with
-*/
-
-extern KeyType CERT_GetCertKeyType(const CERTSubjectPublicKeyInfo *spki);
-
-/*
-** Initialize the certificate database.  This is called to create
-**  the initial list of certificates in the database.
-*/
-extern SECStatus CERT_InitCertDB(CERTCertDBHandle *handle);
-
-extern int CERT_GetDBContentVersion(CERTCertDBHandle *handle);
-
-/*
-** Default certificate database routines
-*/
-extern void CERT_SetDefaultCertDB(CERTCertDBHandle *handle);
-
-extern CERTCertDBHandle *CERT_GetDefaultCertDB(void);
-
-extern CERTCertList *CERT_GetCertChainFromCert(CERTCertificate *cert,
-                                               PRTime time, SECCertUsage usage);
-extern CERTCertificate *CERT_NewTempCertificate(CERTCertDBHandle *handle,
-                                                SECItem *derCert,
-                                                char *nickname, PRBool isperm,
-                                                PRBool copyDER);
-
-/******************************************************************************
- *
- * X.500 Name handling operations
- *
- *****************************************************************************/
-
-/*
-** Create an AVA (attribute-value-assertion)
-**	"arena" the memory arena to alloc from
-**	"kind" is one of SEC_OID_AVA_*
-**	"valueType" is one of DER_PRINTABLE_STRING, DER_IA5_STRING, or
-**	   DER_T61_STRING
-**	"value" is the null terminated string containing the value
-*/
-extern CERTAVA *CERT_CreateAVA(PLArenaPool *arena, SECOidTag kind,
-                               int valueType, char *value);
-
-/*
-** Extract the Distinguished Name from a DER encoded certificate
-**	"derCert" is the DER encoded certificate
-**	"derName" is the SECItem that the name is returned in
-*/
-extern SECStatus CERT_NameFromDERCert(SECItem *derCert, SECItem *derName);
-
-/*
-** Extract the Issuers Distinguished Name from a DER encoded certificate
-**	"derCert" is the DER encoded certificate
-**	"derName" is the SECItem that the name is returned in
-*/
-extern SECStatus CERT_IssuerNameFromDERCert(SECItem *derCert, SECItem *derName);
-
-extern SECItem *CERT_EncodeGeneralName(CERTGeneralName *genName, SECItem *dest,
-                                       PLArenaPool *arena);
-
-extern CERTGeneralName *CERT_DecodeGeneralName(PLArenaPool *reqArena,
-                                               SECItem *encodedName,
-                                               CERTGeneralName *genName);
-
-/*
-** Generate a database search key for a certificate, based on the
-** issuer and serial number.
-**	"arena" the memory arena to alloc from
-**	"derCert" the DER encoded certificate
-**	"key" the returned key
-*/
-extern SECStatus CERT_KeyFromDERCert(PLArenaPool *reqArena, SECItem *derCert,
-                                     SECItem *key);
-
-extern SECStatus CERT_KeyFromIssuerAndSN(PLArenaPool *arena, SECItem *issuer,
-                                         SECItem *sn, SECItem *key);
-
-extern SECStatus CERT_SerialNumberFromDERCert(SECItem *derCert,
-                                              SECItem *derName);
-
-/*
-** Generate a database search key for a crl, based on the
-** issuer.
-**	"arena" the memory arena to alloc from
-**	"derCrl" the DER encoded crl
-**	"key" the returned key
-*/
-extern SECStatus CERT_KeyFromDERCrl(PLArenaPool *arena, SECItem *derCrl,
-                                    SECItem *key);
-
-/*
-** Open the certificate database.  Use callback to get name of database.
-*/
-extern SECStatus CERT_OpenCertDB(CERTCertDBHandle *handle, PRBool readOnly,
-                                 CERTDBNameFunc namecb, void *cbarg);
-
-/* Open the certificate database.  Use given filename for database. */
-extern SECStatus CERT_OpenCertDBFilename(CERTCertDBHandle *handle,
-                                         char *certdbname, PRBool readOnly);
-
-/*
-** Open and initialize a cert database that is entirely in memory.  This
-** can be used when the permanent database can not be opened or created.
-*/
-extern SECStatus CERT_OpenVolatileCertDB(CERTCertDBHandle *handle);
-
-/*
-** Extract the list of host names, host name patters, IP address strings
-** this cert is valid for.
-** This function does NOT return nicknames.
-** Type CERTCertNicknames is being used because it's a convenient
-** data structure to carry a list of strings and its count.
-*/
-extern CERTCertNicknames *CERT_GetValidDNSPatternsFromCert(
-    CERTCertificate *cert);
-
-/*
-** Check the hostname to make sure that it matches the shexp that
-** is given in the common name of the certificate.
-*/
-extern SECStatus CERT_VerifyCertName(const CERTCertificate *cert,
-                                     const char *hostname);
-
-/*
-** Add a domain name to the list of names that the user has explicitly
-** allowed (despite cert name mismatches) for use with a server cert.
-*/
-extern SECStatus CERT_AddOKDomainName(CERTCertificate *cert,
-                                      const char *hostname);
-
-/*
-** Decode a DER encoded certificate into an CERTCertificate structure
-**	"derSignedCert" is the DER encoded signed certificate
-**	"copyDER" is true if the DER should be copied, false if the
-**		existing copy should be referenced
-**	"nickname" is the nickname to use in the database.  If it is NULL
-**		then a temporary nickname is generated.
-*/
-extern CERTCertificate *CERT_DecodeDERCertificate(SECItem *derSignedCert,
-                                                  PRBool copyDER,
-                                                  char *nickname);
-/*
-** Decode a DER encoded CRL into a CERTSignedCrl structure
-**	"derSignedCrl" is the DER encoded signed CRL.
-**	"type" must be SEC_CRL_TYPE.
-*/
-#define SEC_CRL_TYPE 1
-#define SEC_KRL_TYPE 0 /* deprecated */
-
-extern CERTSignedCrl *CERT_DecodeDERCrl(PLArenaPool *arena,
-                                        SECItem *derSignedCrl, int type);
-
-/*
- * same as CERT_DecodeDERCrl, plus allow options to be passed in
- */
-
-extern CERTSignedCrl *CERT_DecodeDERCrlWithFlags(PLArenaPool *narena,
-                                                 SECItem *derSignedCrl,
-                                                 int type, PRInt32 options);
-
-/* CRL options to pass */
-
-#define CRL_DECODE_DEFAULT_OPTIONS 0x00000000
-
-/* when CRL_DECODE_DONT_COPY_DER is set, the DER is not copied . The
-   application must then keep derSignedCrl until it destroys the
-   CRL . Ideally, it should allocate derSignedCrl in an arena
-   and pass that arena in as the first argument to
-   CERT_DecodeDERCrlWithFlags */
-
-#define CRL_DECODE_DONT_COPY_DER 0x00000001
-#define CRL_DECODE_SKIP_ENTRIES 0x00000002
-#define CRL_DECODE_KEEP_BAD_CRL 0x00000004
-#define CRL_DECODE_ADOPT_HEAP_DER 0x00000008
-
-/* complete the decoding of a partially decoded CRL, ie. decode the
-   entries. Note that entries is an optional field in a CRL, so the
-   "entries" pointer in CERTCrlStr may still be NULL even after
-   function returns SECSuccess */
-
-extern SECStatus CERT_CompleteCRLDecodeEntries(CERTSignedCrl *crl);
-
-/* Validate CRL then import it to the dbase.  If there is already a CRL with the
- * same CA in the dbase, it will be replaced if derCRL is more up to date.
- * If the process successes, a CRL will be returned.  Otherwise, a NULL will
- * be returned. The caller should call PORT_GetError() for the exactly error
- * code.
- */
-extern CERTSignedCrl *CERT_ImportCRL(CERTCertDBHandle *handle, SECItem *derCRL,
-                                     char *url, int type, void *wincx);
-
-extern void CERT_DestroyCrl(CERTSignedCrl *crl);
-
-/* this is a hint to flush the CRL cache. crlKey is the DER subject of
-   the issuer (CA). */
-void CERT_CRLCacheRefreshIssuer(CERTCertDBHandle *dbhandle, SECItem *crlKey);
-
-/* add the specified DER CRL object to the CRL cache. Doing so will allow
-   certificate verification functions (such as CERT_VerifyCertificate)
-   to automatically find and make use of this CRL object.
-   Once a CRL is added to the CRL cache, the application must hold on to
-   the object's memory, because the cache will reference it directly. The
-   application can only free the object after it calls CERT_UncacheCRL to
-   remove it from the CRL cache.
-*/
-SECStatus CERT_CacheCRL(CERTCertDBHandle *dbhandle, SECItem *newcrl);
-
-/* remove a previously added CRL object from the CRL cache. It is OK
-   for the application to free the memory after a successful removal
-*/
-SECStatus CERT_UncacheCRL(CERTCertDBHandle *dbhandle, SECItem *oldcrl);
-
-/*
-** Find a certificate in the database
-**	"key" is the database key to look for
-*/
-extern CERTCertificate *CERT_FindCertByKey(CERTCertDBHandle *handle,
-                                           SECItem *key);
-
-/*
-** Find a certificate in the database by name
-**	"name" is the distinguished name to look up
-*/
-extern CERTCertificate *CERT_FindCertByName(CERTCertDBHandle *handle,
-                                            SECItem *name);
-
-/*
-** Find a certificate in the database by name
-**	"name" is the distinguished name to look up (in ascii)
-*/
-extern CERTCertificate *CERT_FindCertByNameString(CERTCertDBHandle *handle,
-                                                  char *name);
-
-/*
-** Find a certificate in the database by name and keyid
-**	"name" is the distinguished name to look up
-**	"keyID" is the value of the subjectKeyID to match
-*/
-extern CERTCertificate *CERT_FindCertByKeyID(CERTCertDBHandle *handle,
-                                             SECItem *name, SECItem *keyID);
-
-/*
-** Generate a certificate key from the issuer and serialnumber, then look it
-** up in the database.  Return the cert if found.
-**	"issuerAndSN" is the issuer and serial number to look for
-*/
-extern CERTCertificate *CERT_FindCertByIssuerAndSN(
-    CERTCertDBHandle *handle, CERTIssuerAndSN *issuerAndSN);
-
-/*
-** Find a certificate in the database by a subject key ID
-**	"subjKeyID" is the subject Key ID to look for
-*/
-extern CERTCertificate *CERT_FindCertBySubjectKeyID(CERTCertDBHandle *handle,
-                                                    SECItem *subjKeyID);
-
-/*
-** Encode Certificate SKID (Subject Key ID) extension.
-**
-*/
-extern SECStatus CERT_EncodeSubjectKeyID(PLArenaPool *arena,
-                                         const SECItem *srcString,
-                                         SECItem *encodedValue);
-
-/*
-** Find a certificate in the database by a nickname
-**	"nickname" is the ascii string nickname to look for
-*/
-extern CERTCertificate *CERT_FindCertByNickname(CERTCertDBHandle *handle,
-                                                const char *nickname);
-
-/*
-** Find a certificate in the database by a DER encoded certificate
-**	"derCert" is the DER encoded certificate
-*/
-extern CERTCertificate *CERT_FindCertByDERCert(CERTCertDBHandle *handle,
-                                               SECItem *derCert);
-
-/*
-** Find a certificate in the database by a email address
-**	"emailAddr" is the email address to look up
-*/
-CERTCertificate *CERT_FindCertByEmailAddr(CERTCertDBHandle *handle,
-                                          char *emailAddr);
-
-/*
-** Find a certificate in the database by a email address or nickname
-**	"name" is the email address or nickname to look up
-*/
-CERTCertificate *CERT_FindCertByNicknameOrEmailAddr(CERTCertDBHandle *handle,
-                                                    const char *name);
-
-/*
-** Find a certificate in the database by a email address or nickname
-** and require it to have the given usage.
-**      "name" is the email address or nickname to look up
-*/
-CERTCertificate *CERT_FindCertByNicknameOrEmailAddrForUsage(
-    CERTCertDBHandle *handle, const char *name, SECCertUsage lookingForUsage);
-
-/*
-** Find a certificate in the database by a digest of a subject public key
-**	"spkDigest" is the digest to look up
-*/
-extern CERTCertificate *CERT_FindCertBySPKDigest(CERTCertDBHandle *handle,
-                                                 SECItem *spkDigest);
-
-/*
- * Find the issuer of a cert
- */
-CERTCertificate *CERT_FindCertIssuer(CERTCertificate *cert, PRTime validTime,
-                                     SECCertUsage usage);
-
-/*
-** Check the validity times of a certificate vs. time 't', allowing
-** some slop for broken clocks and stuff.
-**	"cert" is the certificate to be checked
-**	"t" is the time to check against
-**	"allowOverride" if true then check to see if the invalidity has
-**		been overridden by the user.
-*/
-extern SECCertTimeValidity CERT_CheckCertValidTimes(const CERTCertificate *cert,
-                                                    PRTime t,
-                                                    PRBool allowOverride);
-
-/*
-** WARNING - this function is deprecated, and will either go away or have
-**		a new API in the near future.
-**
-** Check the validity times of a certificate vs. the current time, allowing
-** some slop for broken clocks and stuff.
-**	"cert" is the certificate to be checked
-*/
-extern SECStatus CERT_CertTimesValid(CERTCertificate *cert);
-
-/*
-** Extract the validity times from a certificate
-**	"c" is the certificate
-**	"notBefore" is the start of the validity period
-**	"notAfter" is the end of the validity period
-*/
-extern SECStatus CERT_GetCertTimes(const CERTCertificate *c, PRTime *notBefore,
-                                   PRTime *notAfter);
-
-/*
-** Extract the issuer and serial number from a certificate
-*/
-extern CERTIssuerAndSN *CERT_GetCertIssuerAndSN(PLArenaPool *,
-                                                CERTCertificate *);
-
-/*
-** verify the signature of a signed data object with a given certificate
-**	"sd" the signed data object to be verified
-**	"cert" the certificate to use to check the signature
-*/
-extern SECStatus CERT_VerifySignedData(CERTSignedData *sd,
-                                       CERTCertificate *cert, PRTime t,
-                                       void *wincx);
-/*
-** verify the signature of a signed data object with the given DER publickey
-*/
-extern SECStatus CERT_VerifySignedDataWithPublicKeyInfo(
-    CERTSignedData *sd, CERTSubjectPublicKeyInfo *pubKeyInfo, void *wincx);
-
-/*
-** verify the signature of a signed data object with a SECKEYPublicKey.
-*/
-extern SECStatus CERT_VerifySignedDataWithPublicKey(const CERTSignedData *sd,
-                                                    SECKEYPublicKey *pubKey,
-                                                    void *wincx);
-
-/*
-** NEW FUNCTIONS with new bit-field-FIELD SECCertificateUsage - please use
-** verify a certificate by checking validity times against a certain time,
-** that we trust the issuer, and that the signature on the certificate is
-** valid.
-**	"cert" the certificate to verify
-**	"checkSig" only check signatures if true
-*/
-extern SECStatus CERT_VerifyCertificate(CERTCertDBHandle *handle,
-                                        CERTCertificate *cert, PRBool checkSig,
-                                        SECCertificateUsage requiredUsages,
-                                        PRTime t, void *wincx,
-                                        CERTVerifyLog *log,
-                                        SECCertificateUsage *returnedUsages);
-
-/* same as above, but uses current time */
-extern SECStatus CERT_VerifyCertificateNow(CERTCertDBHandle *handle,
-                                           CERTCertificate *cert,
-                                           PRBool checkSig,
-                                           SECCertificateUsage requiredUsages,
-                                           void *wincx,
-                                           SECCertificateUsage *returnedUsages);
-
-/*
-** Verify that a CA cert can certify some (unspecified) leaf cert for a given
-** purpose. This is used by UI code to help identify where a chain may be
-** broken and why. This takes identical parameters to CERT_VerifyCert
-*/
-extern SECStatus CERT_VerifyCACertForUsage(CERTCertDBHandle *handle,
-                                           CERTCertificate *cert,
-                                           PRBool checkSig,
-                                           SECCertUsage certUsage, PRTime t,
-                                           void *wincx, CERTVerifyLog *log);
-
-/*
-** OLD OBSOLETE FUNCTIONS with enum SECCertUsage - DO NOT USE FOR NEW CODE
-** verify a certificate by checking validity times against a certain time,
-** that we trust the issuer, and that the signature on the certificate is
-** valid.
-**	"cert" the certificate to verify
-**	"checkSig" only check signatures if true
-*/
-extern SECStatus CERT_VerifyCert(CERTCertDBHandle *handle,
-                                 CERTCertificate *cert, PRBool checkSig,
-                                 SECCertUsage certUsage, PRTime t, void *wincx,
-                                 CERTVerifyLog *log);
-
-/* same as above, but uses current time */
-extern SECStatus CERT_VerifyCertNow(CERTCertDBHandle *handle,
-                                    CERTCertificate *cert, PRBool checkSig,
-                                    SECCertUsage certUsage, void *wincx);
-
-SECStatus CERT_VerifyCertChain(CERTCertDBHandle *handle, CERTCertificate *cert,
-                               PRBool checkSig, SECCertUsage certUsage,
-                               PRTime t, void *wincx, CERTVerifyLog *log);
-
-/*
-** Read a base64 ascii encoded DER certificate and convert it to our
-** internal format.
-**	"certstr" is a null-terminated string containing the certificate
-*/
-extern CERTCertificate *CERT_ConvertAndDecodeCertificate(char *certstr);
-
-/*
-** Read a certificate in some foreign format, and convert it to our
-** internal format.
-**	"certbuf" is the buffer containing the certificate
-**	"certlen" is the length of the buffer
-** NOTE - currently supports netscape base64 ascii encoded raw certs
-**  and netscape binary DER typed files.
-*/
-extern CERTCertificate *CERT_DecodeCertFromPackage(char *certbuf, int certlen);
-
-extern SECStatus CERT_ImportCAChain(SECItem *certs, int numcerts,
-                                    SECCertUsage certUsage);
-
-extern SECStatus CERT_ImportCAChainTrusted(SECItem *certs, int numcerts,
-                                           SECCertUsage certUsage);
-
-/*
-** Read a certificate chain in some foreign format, and pass it to a
-** callback function.
-**	"certbuf" is the buffer containing the certificate
-**	"certlen" is the length of the buffer
-**	"f" is the callback function
-**	"arg" is the callback argument
-*/
-typedef SECStatus(PR_CALLBACK *CERTImportCertificateFunc)(void *arg,
-                                                          SECItem **certs,
-                                                          int numcerts);
-
-extern SECStatus CERT_DecodeCertPackage(char *certbuf, int certlen,
-                                        CERTImportCertificateFunc f, void *arg);
-
-/*
-** Returns the value of an AVA.  This was a formerly static
-** function that has been exposed due to the need to decode
-** and convert unicode strings to UTF8.
-**
-** XXX This function resides in certhtml.c, should it be
-** moved elsewhere?
-*/
-extern SECItem *CERT_DecodeAVAValue(const SECItem *derAVAValue);
-
-/*
-** extract various element strings from a distinguished name.
-**	"name" the distinguished name
-*/
-
-extern char *CERT_GetCertificateEmailAddress(CERTCertificate *cert);
-
-extern char *CERT_GetCertEmailAddress(const CERTName *name);
-
-extern const char *CERT_GetFirstEmailAddress(CERTCertificate *cert);
-
-extern const char *CERT_GetNextEmailAddress(CERTCertificate *cert,
-                                            const char *prev);
-
-/* The return value must be freed with PORT_Free. */
-extern char *CERT_GetCommonName(const CERTName *name);
-
-extern char *CERT_GetCountryName(const CERTName *name);
-
-extern char *CERT_GetLocalityName(const CERTName *name);
-
-extern char *CERT_GetStateName(const CERTName *name);
-
-extern char *CERT_GetOrgName(const CERTName *name);
-
-extern char *CERT_GetOrgUnitName(const CERTName *name);
-
-extern char *CERT_GetDomainComponentName(const CERTName *name);
-
-extern char *CERT_GetCertUid(const CERTName *name);
-
-/* manipulate the trust parameters of a certificate */
-
-extern SECStatus CERT_GetCertTrust(const CERTCertificate *cert,
-                                   CERTCertTrust *trust);
-
-extern SECStatus CERT_ChangeCertTrust(CERTCertDBHandle *handle,
-                                      CERTCertificate *cert,
-                                      CERTCertTrust *trust);
-
-extern SECStatus CERT_ChangeCertTrustByUsage(CERTCertDBHandle *certdb,
-                                             CERTCertificate *cert,
-                                             SECCertUsage usage);
-
-/*************************************************************************
- *
- * manipulate the extensions of a certificate
- *
- ************************************************************************/
-
-/*
-** Set up a cert for adding X509v3 extensions.  Returns an opaque handle
-** used by the next two routines.
-**	"cert" is the certificate we are adding extensions to
-*/
-extern void *CERT_StartCertExtensions(CERTCertificate *cert);
-
-/*
-** Add an extension to a certificate.
-**	"exthandle" is the handle returned by the previous function
-**	"idtag" is the integer tag for the OID that should ID this extension
-**	"value" is the value of the extension
-**	"critical" is the critical extension flag
-**	"copyData" is a flag indicating whether the value data should be
-**		copied.
-*/
-extern SECStatus CERT_AddExtension(void *exthandle, int idtag, SECItem *value,
-                                   PRBool critical, PRBool copyData);
-
-extern SECStatus CERT_AddExtensionByOID(void *exthandle, SECItem *oid,
-                                        SECItem *value, PRBool critical,
-                                        PRBool copyData);
-
-extern SECStatus CERT_EncodeAndAddExtension(void *exthandle, int idtag,
-                                            void *value, PRBool critical,
-                                            const SEC_ASN1Template *atemplate);
-
-extern SECStatus CERT_EncodeAndAddBitStrExtension(void *exthandle, int idtag,
-                                                  SECItem *value,
-                                                  PRBool critical);
-
-extern SECStatus CERT_EncodeAltNameExtension(PLArenaPool *arena,
-                                             CERTGeneralName *value,
-                                             SECItem *encodedValue);
-
-/*
-** Finish adding cert extensions.  Does final processing on extension
-** data, putting it in the right format, and freeing any temporary
-** storage.
-**	"exthandle" is the handle used to add extensions to a certificate
-*/
-extern SECStatus CERT_FinishExtensions(void *exthandle);
-
-/*
-** Merge an external list of extensions into a cert's extension list, adding one
-** only when its OID matches none of the cert's existing extensions. Call this
-** immediately before calling CERT_FinishExtensions().
-*/
-SECStatus CERT_MergeExtensions(void *exthandle, CERTCertExtension **exts);
-
-/* If the extension is found, return its criticality and value.
-** This allocate storage for the returning extension value.
-*/
-extern SECStatus CERT_GetExtenCriticality(CERTCertExtension **extensions,
-                                          int tag, PRBool *isCritical);
-
-extern void CERT_DestroyOidSequence(CERTOidSequence *oidSeq);
-
-/****************************************************************************
- *
- * DER encode and decode extension values
- *
- ****************************************************************************/
-
-/* Encode the value of the basicConstraint extension.
-**	arena - where to allocate memory for the encoded value.
-**	value - extension value to encode
-**	encodedValue - output encoded value
-*/
-extern SECStatus CERT_EncodeBasicConstraintValue(PLArenaPool *arena,
-                                                 CERTBasicConstraints *value,
-                                                 SECItem *encodedValue);
-
-/*
-** Encode the value of the authorityKeyIdentifier extension.
-*/
-extern SECStatus CERT_EncodeAuthKeyID(PLArenaPool *arena, CERTAuthKeyID *value,
-                                      SECItem *encodedValue);
-
-/*
-** Encode the value of the crlDistributionPoints extension.
-*/
-extern SECStatus CERT_EncodeCRLDistributionPoints(
-    PLArenaPool *arena, CERTCrlDistributionPoints *value, SECItem *derValue);
-
-/*
-** Decodes a DER encoded basicConstaint extension value into a readable format
-**	value - decoded value
-**	encodedValue - value to decoded
-*/
-extern SECStatus CERT_DecodeBasicConstraintValue(CERTBasicConstraints *value,
-                                                 const SECItem *encodedValue);
-
-/* Decodes a DER encoded authorityKeyIdentifier extension value into a
-** readable format.
-**	arena - where to allocate memory for the decoded value
-**	encodedValue - value to be decoded
-**	Returns a CERTAuthKeyID structure which contains the decoded value
-*/
-extern CERTAuthKeyID *CERT_DecodeAuthKeyID(PLArenaPool *arena,
-                                           const SECItem *encodedValue);
-
-/* Decodes a DER encoded crlDistributionPoints extension value into a
-** readable format.
-**	arena - where to allocate memory for the decoded value
-**	der - value to be decoded
-**	Returns a CERTCrlDistributionPoints structure which contains the
-**          decoded value
-*/
-extern CERTCrlDistributionPoints *CERT_DecodeCRLDistributionPoints(
-    PLArenaPool *arena, SECItem *der);
-
-/* Extract certain name type from a generalName */
-extern void *CERT_GetGeneralNameByType(CERTGeneralName *genNames,
-                                       CERTGeneralNameType type,
-                                       PRBool derFormat);
-
-extern CERTOidSequence *CERT_DecodeOidSequence(const SECItem *seqItem);
-
-/****************************************************************************
- *
- * Find extension values of a certificate
- *
- ***************************************************************************/
-
-extern SECStatus CERT_FindCertExtension(const CERTCertificate *cert, int tag,
-                                        SECItem *value);
-
-extern SECStatus CERT_FindNSCertTypeExtension(CERTCertificate *cert,
-                                              SECItem *value);
-
-extern char *CERT_FindNSStringExtension(CERTCertificate *cert, int oidtag);
-
-extern SECStatus CERT_FindCertExtensionByOID(CERTCertificate *cert,
-                                             SECItem *oid, SECItem *value);
-
-/* Returns the decoded value of the authKeyID extension.
-**   Note that this uses passed in the arena to allocate storage for the result
-*/
-extern CERTAuthKeyID *CERT_FindAuthKeyIDExten(PLArenaPool *arena,
-                                              CERTCertificate *cert);
-
-/* Returns the decoded value of the basicConstraint extension.
- */
-extern SECStatus CERT_FindBasicConstraintExten(CERTCertificate *cert,
-                                               CERTBasicConstraints *value);
-
-/* Returns the decoded value of the crlDistributionPoints extension.
-**  Note that the arena in cert is used to allocate storage for the result
-*/
-extern CERTCrlDistributionPoints *CERT_FindCRLDistributionPoints(
-    CERTCertificate *cert);
-
-/* Returns value of the keyUsage extension.  This uses PR_Alloc to allocate
-** buffer for the decoded value. The caller should free up the storage
-** allocated in value->data.
-*/
-extern SECStatus CERT_FindKeyUsageExtension(CERTCertificate *cert,
-                                            SECItem *value);
-
-/* Return the decoded value of the subjectKeyID extension. The caller should
-** free up the storage allocated in retItem->data.
-*/
-extern SECStatus CERT_FindSubjectKeyIDExtension(CERTCertificate *cert,
-                                                SECItem *retItem);
-
-/*
-** If cert is a v3 certificate, and a critical keyUsage extension is included,
-** then check the usage against the extension value.  If a non-critical
-** keyUsage extension is included, this will return SECSuccess without
-** checking, since the extension is an advisory field, not a restriction.
-** If cert is not a v3 certificate, this will return SECSuccess.
-**	cert - certificate
-**	usage - one of the x.509 v3 the Key Usage Extension flags
-*/
-extern SECStatus CERT_CheckCertUsage(CERTCertificate *cert,
-                                     unsigned char usage);
-
-/****************************************************************************
- *
- *  CRL v2 Extensions supported routines
- *
- ****************************************************************************/
-
-extern SECStatus CERT_FindCRLExtensionByOID(CERTCrl *crl, SECItem *oid,
-                                            SECItem *value);
-
-extern SECStatus CERT_FindCRLExtension(CERTCrl *crl, int tag, SECItem *value);
-
-extern SECStatus CERT_FindInvalidDateExten(CERTCrl *crl, PRTime *value);
-
-/*
-** Set up a crl for adding X509v3 extensions.  Returns an opaque handle
-** used by routines that take an exthandle (void*) argument .
-**	"crl" is the CRL we are adding extensions to
-*/
-extern void *CERT_StartCRLExtensions(CERTCrl *crl);
-
-/*
-** Set up a crl entry for adding X509v3 extensions.  Returns an opaque handle
-** used by routines that take an exthandle (void*) argument .
-**	"crl" is the crl we are adding certs entries to
-**      "entry" is the crl entry we are adding extensions to
-*/
-extern void *CERT_StartCRLEntryExtensions(CERTCrl *crl, CERTCrlEntry *entry);
-
-extern CERTCertNicknames *CERT_GetCertNicknames(CERTCertDBHandle *handle,
-                                                int what, void *wincx);
-
-/*
-** Finds the crlNumber extension and decodes its value into 'value'
-*/
-extern SECStatus CERT_FindCRLNumberExten(PLArenaPool *arena, CERTCrl *crl,
-                                         SECItem *value);
-
-extern SECStatus CERT_FindCRLEntryReasonExten(CERTCrlEntry *crlEntry,
-                                              CERTCRLEntryReasonCode *value);
-
-extern void CERT_FreeNicknames(CERTCertNicknames *nicknames);
-
-extern PRBool CERT_CompareCerts(const CERTCertificate *c1,
-                                const CERTCertificate *c2);
-
-extern PRBool CERT_CompareCertsForRedirection(CERTCertificate *c1,
-                                              CERTCertificate *c2);
-
-/*
-** Generate an array of the Distinguished Names that the given cert database
-** "trusts"
-*/
-extern CERTDistNames *CERT_GetSSLCACerts(CERTCertDBHandle *handle);
-
-extern void CERT_FreeDistNames(CERTDistNames *names);
-
-/* Duplicate distinguished name array */
-extern CERTDistNames *CERT_DupDistNames(CERTDistNames *orig);
-
-/*
-** Generate an array of Distinguished names from an array of nicknames
-*/
-extern CERTDistNames *CERT_DistNamesFromNicknames(CERTCertDBHandle *handle,
-                                                  char **nicknames, int nnames);
-
-/*
-** Generate an array of Distinguished names from a list of certs.
-*/
-extern CERTDistNames *CERT_DistNamesFromCertList(CERTCertList *list);
-
-/*
-** Generate a certificate chain from a certificate.
-*/
-extern CERTCertificateList *CERT_CertChainFromCert(CERTCertificate *cert,
-                                                   SECCertUsage usage,
-                                                   PRBool includeRoot);
-
-extern CERTCertificateList *CERT_CertListFromCert(CERTCertificate *cert);
-
-extern CERTCertificateList *CERT_DupCertList(
-    const CERTCertificateList *oldList);
-
-extern void CERT_DestroyCertificateList(CERTCertificateList *list);
-
-/*
-** is cert a user cert? i.e. does it have CERTDB_USER trust,
-** i.e. a private key?
-*/
-PRBool CERT_IsUserCert(CERTCertificate *cert);
-
-/* is cert a newer than cert b? */
-PRBool CERT_IsNewer(CERTCertificate *certa, CERTCertificate *certb);
-
-/* currently a stub for address book */
-PRBool CERT_IsCertRevoked(CERTCertificate *cert);
-
-void CERT_DestroyCertArray(CERTCertificate **certs, unsigned int ncerts);
-
-/* convert an email address to lower case */
-char *CERT_FixupEmailAddr(const char *emailAddr);
-
-/* decode string representation of trust flags into trust struct */
-SECStatus CERT_DecodeTrustString(CERTCertTrust *trust, const char *trusts);
-
-/* encode trust struct into string representation of trust flags */
-char *CERT_EncodeTrustString(CERTCertTrust *trust);
-
-/* find the next or prev cert in a subject list */
-CERTCertificate *CERT_PrevSubjectCert(CERTCertificate *cert);
-CERTCertificate *CERT_NextSubjectCert(CERTCertificate *cert);
-
-/*
- * import a collection of certs into the temporary or permanent cert
- * database
- */
-SECStatus CERT_ImportCerts(CERTCertDBHandle *certdb, SECCertUsage usage,
-                           unsigned int ncerts, SECItem **derCerts,
-                           CERTCertificate ***retCerts, PRBool keepCerts,
-                           PRBool caOnly, char *nickname);
-
-char *CERT_MakeCANickname(CERTCertificate *cert);
-
-PRBool CERT_IsCACert(CERTCertificate *cert, unsigned int *rettype);
-
-PRBool CERT_IsCADERCert(SECItem *derCert, unsigned int *rettype);
-
-PRBool CERT_IsRootDERCert(SECItem *derCert);
-
-SECStatus CERT_SaveSMimeProfile(CERTCertificate *cert, SECItem *emailProfile,
-                                SECItem *profileTime);
-
-/*
- * find the smime symmetric capabilities profile for a given cert
- */
-SECItem *CERT_FindSMimeProfile(CERTCertificate *cert);
-
-SECStatus CERT_AddNewCerts(CERTCertDBHandle *handle);
-
-CERTCertificatePolicies *CERT_DecodeCertificatePoliciesExtension(
-    const SECItem *extnValue);
-
-void CERT_DestroyCertificatePoliciesExtension(
-    CERTCertificatePolicies *policies);
-
-CERTCertificatePolicyMappings *CERT_DecodePolicyMappingsExtension(
-    SECItem *encodedCertPolicyMaps);
-
-SECStatus CERT_DestroyPolicyMappingsExtension(
-    CERTCertificatePolicyMappings *mappings);
-
-SECStatus CERT_DecodePolicyConstraintsExtension(
-    CERTCertificatePolicyConstraints *decodedValue,
-    const SECItem *encodedValue);
-
-SECStatus CERT_DecodeInhibitAnyExtension(
-    CERTCertificateInhibitAny *decodedValue, SECItem *extnValue);
-
-CERTUserNotice *CERT_DecodeUserNotice(SECItem *noticeItem);
-
-extern CERTGeneralName *CERT_DecodeAltNameExtension(PLArenaPool *reqArena,
-                                                    SECItem *EncodedAltName);
-
-extern CERTNameConstraints *CERT_DecodeNameConstraintsExtension(
-    PLArenaPool *arena, const SECItem *encodedConstraints);
-
-/* returns addr of a NULL termainated array of pointers to CERTAuthInfoAccess */
-extern CERTAuthInfoAccess **CERT_DecodeAuthInfoAccessExtension(
-    PLArenaPool *reqArena, const SECItem *encodedExtension);
-
-extern CERTPrivKeyUsagePeriod *CERT_DecodePrivKeyUsagePeriodExtension(
-    PLArenaPool *arena, SECItem *extnValue);
-
-extern CERTGeneralName *CERT_GetNextGeneralName(CERTGeneralName *current);
-
-extern CERTGeneralName *CERT_GetPrevGeneralName(CERTGeneralName *current);
-
-/*
- * Look up name constraints for some certs that do not include name constraints
- * (Most importantly, root certificates)
- *
- * If a matching subject is found, |extensions| will be populated with a copy of
- * the
- * DER-encoded name constraints extension. The data in |extensions| will point
- * to
- * memory that the caller owns.
- *
- * There is no mechanism to configure imposed name constraints right now.  All
- * imposed name constraints are built into NSS.
- */
-SECStatus CERT_GetImposedNameConstraints(const SECItem *derSubject,
-                                         SECItem *extensions);
-
-CERTNameConstraint *CERT_GetNextNameConstraint(CERTNameConstraint *current);
-
-CERTNameConstraint *CERT_GetPrevNameConstraint(CERTNameConstraint *current);
-
-void CERT_DestroyUserNotice(CERTUserNotice *userNotice);
-
-typedef char *(*CERTPolicyStringCallback)(char *org, unsigned long noticeNumber,
-                                          void *arg);
-void CERT_SetCAPolicyStringCallback(CERTPolicyStringCallback cb, void *cbarg);
-
-char *CERT_GetCertCommentString(CERTCertificate *cert);
-
-PRBool CERT_GovtApprovedBitSet(CERTCertificate *cert);
-
-SECStatus CERT_AddPermNickname(CERTCertificate *cert, char *nickname);
-
-CERTCertList *CERT_MatchUserCert(CERTCertDBHandle *handle, SECCertUsage usage,
-                                 int nCANames, char **caNames, void *proto_win);
-
-CERTCertList *CERT_NewCertList(void);
-
-/* free the cert list and all the certs in the list */
-void CERT_DestroyCertList(CERTCertList *certs);
-
-/* remove the node and free the cert */
-void CERT_RemoveCertListNode(CERTCertListNode *node);
-
-/* equivalent to CERT_AddCertToListTailWithData(certs, cert, NULL) */
-SECStatus CERT_AddCertToListTail(CERTCertList *certs, CERTCertificate *cert);
-
-/* equivalent to CERT_AddCertToListHeadWithData(certs, cert, NULL) */
-SECStatus CERT_AddCertToListHead(CERTCertList *certs, CERTCertificate *cert);
-
-/*
- * The new cert list node takes ownership of "cert". "cert" is freed
- * when the list node is removed.
- */
-SECStatus CERT_AddCertToListTailWithData(CERTCertList *certs,
-                                         CERTCertificate *cert, void *appData);
-
-/*
- * The new cert list node takes ownership of "cert". "cert" is freed
- * when the list node is removed.
- */
-SECStatus CERT_AddCertToListHeadWithData(CERTCertList *certs,
-                                         CERTCertificate *cert, void *appData);
-
-typedef PRBool (*CERTSortCallback)(CERTCertificate *certa,
-                                   CERTCertificate *certb, void *arg);
-SECStatus CERT_AddCertToListSorted(CERTCertList *certs, CERTCertificate *cert,
-                                   CERTSortCallback f, void *arg);
-
-/* callback for CERT_AddCertToListSorted that sorts based on validity
- * period and a given time.
- */
-PRBool CERT_SortCBValidity(CERTCertificate *certa, CERTCertificate *certb,
-                           void *arg);
-
-SECStatus CERT_CheckForEvilCert(CERTCertificate *cert);
-
-CERTGeneralName *CERT_GetCertificateNames(CERTCertificate *cert,
-                                          PLArenaPool *arena);
-
-CERTGeneralName *CERT_GetConstrainedCertificateNames(
-    const CERTCertificate *cert, PLArenaPool *arena,
-    PRBool includeSubjectCommonName);
-
-/*
- * Creates or adds to a list of all certs with a give subject name, sorted by
- * validity time, newest first.  Invalid certs are considered older than
- * valid certs. If validOnly is set, do not include invalid certs on list.
- */
-CERTCertList *CERT_CreateSubjectCertList(CERTCertList *certList,
-                                         CERTCertDBHandle *handle,
-                                         const SECItem *name, PRTime sorttime,
-                                         PRBool validOnly);
-
-/*
- * remove certs from a list that don't have keyUsage and certType
- * that match the given usage.
- */
-SECStatus CERT_FilterCertListByUsage(CERTCertList *certList, SECCertUsage usage,
-                                     PRBool ca);
-
-/*
- * check the key usage of a cert against a set of required values
- */
-SECStatus CERT_CheckKeyUsage(CERTCertificate *cert, unsigned int requiredUsage);
-
-/*
- * return required key usage and cert type based on cert usage
- */
-SECStatus CERT_KeyUsageAndTypeForCertUsage(SECCertUsage usage, PRBool ca,
-                                           unsigned int *retKeyUsage,
-                                           unsigned int *retCertType);
-/*
- * return required trust flags for various cert usages for CAs
- */
-SECStatus CERT_TrustFlagsForCACertUsage(SECCertUsage usage,
-                                        unsigned int *retFlags,
-                                        SECTrustType *retTrustType);
-
-/*
- * Find all user certificates that match the given criteria.
- *
- *	"handle" - database to search
- *	"usage" - certificate usage to match
- *	"oneCertPerName" - if set then only return the "best" cert per
- *			name
- *	"validOnly" - only return certs that are curently valid
- *	"proto_win" - window handle passed to pkcs11
- */
-CERTCertList *CERT_FindUserCertsByUsage(CERTCertDBHandle *handle,
-                                        SECCertUsage usage,
-                                        PRBool oneCertPerName, PRBool validOnly,
-                                        void *proto_win);
-
-/*
- * Find a user certificate that matchs the given criteria.
- *
- *	"handle" - database to search
- *	"nickname" - nickname to match
- *	"usage" - certificate usage to match
- *	"validOnly" - only return certs that are curently valid
- *	"proto_win" - window handle passed to pkcs11
- */
-CERTCertificate *CERT_FindUserCertByUsage(CERTCertDBHandle *handle,
-                                          const char *nickname,
-                                          SECCertUsage usage, PRBool validOnly,
-                                          void *proto_win);
-
-/*
- * Filter a list of certificates, removing those certs that do not have
- * one of the named CA certs somewhere in their cert chain.
- *
- *	"certList" - the list of certificates to filter
- *	"nCANames" - number of CA names
- *	"caNames" - array of CA names in string(rfc 1485) form
- *	"usage" - what use the certs are for, this is used when
- *		selecting CA certs
- */
-SECStatus CERT_FilterCertListByCANames(CERTCertList *certList, int nCANames,
-                                       char **caNames, SECCertUsage usage);
-
-/*
- * Filter a list of certificates, removing those certs that aren't user certs
- */
-SECStatus CERT_FilterCertListForUserCerts(CERTCertList *certList);
-
-/*
- * Collect the nicknames from all certs in a CertList.  If the cert is not
- * valid, append a string to that nickname.
- *
- * "certList" - the list of certificates
- * "expiredString" - the string to append to the nickname of any expired cert
- * "notYetGoodString" - the string to append to the nickname of any cert
- *		that is not yet valid
- */
-CERTCertNicknames *CERT_NicknameStringsFromCertList(CERTCertList *certList,
-                                                    char *expiredString,
-                                                    char *notYetGoodString);
-
-/*
- * Extract the nickname from a nickmake string that may have either
- * expiredString or notYetGoodString appended.
- *
- * Args:
- *	"namestring" - the string containing the nickname, and possibly
- *		one of the validity label strings
- *	"expiredString" - the expired validity label string
- *	"notYetGoodString" - the not yet good validity label string
- *
- * Returns the raw nickname
- */
-char *CERT_ExtractNicknameString(char *namestring, char *expiredString,
-                                 char *notYetGoodString);
-
-/*
- * Given a certificate, return a string containing the nickname, and possibly
- * one of the validity strings, based on the current validity state of the
- * certificate.
- *
- * "arena" - arena to allocate returned string from.  If NULL, then heap
- *	is used.
- * "cert" - the cert to get nickname from
- * "expiredString" - the string to append to the nickname if the cert is
- *		expired.
- * "notYetGoodString" - the string to append to the nickname if the cert is
- *		not yet good.
- */
-char *CERT_GetCertNicknameWithValidity(PLArenaPool *arena,
-                                       CERTCertificate *cert,
-                                       char *expiredString,
-                                       char *notYetGoodString);
-
-/*
- * Return the string representation of a DER encoded distinguished name
- * "dername" - The DER encoded name to convert
- */
-char *CERT_DerNameToAscii(SECItem *dername);
-
-/*
- * Supported usage values and types:
- *	certUsageSSLClient
- *	certUsageSSLServer
- *	certUsageSSLServerWithStepUp
- *	certUsageEmailSigner
- *	certUsageEmailRecipient
- *	certUsageObjectSigner
- */
-
-CERTCertificate *CERT_FindMatchingCert(CERTCertDBHandle *handle,
-                                       SECItem *derName, CERTCertOwner owner,
-                                       SECCertUsage usage, PRBool preferTrusted,
-                                       PRTime validTime, PRBool validOnly);
-
-/*
- * Acquire the global lock on the cert database.
- * This lock is currently used for the following operations:
- *	adding or deleting a cert to either the temp or perm databases
- *	converting a temp to perm or perm to temp
- *	changing(maybe just adding?) the trust of a cert
- *	adjusting the reference count of a cert
- */
-void CERT_LockDB(CERTCertDBHandle *handle);
-
-/*
- * Free the global cert database lock.
- */
-void CERT_UnlockDB(CERTCertDBHandle *handle);
-
-/*
- * Get the certificate status checking configuratino data for
- * the certificate database
- */
-CERTStatusConfig *CERT_GetStatusConfig(CERTCertDBHandle *handle);
-
-/*
- * Set the certificate status checking information for the
- * database.  The input structure becomes part of the certificate
- * database and will be freed by calling the 'Destroy' function in
- * the configuration object.
- */
-void CERT_SetStatusConfig(CERTCertDBHandle *handle, CERTStatusConfig *config);
-
-/*
- * Acquire the cert reference count lock
- * There is currently one global lock for all certs, but I'm putting a cert
- * arg here so that it will be easy to make it per-cert in the future if
- * that turns out to be necessary.
- */
-void CERT_LockCertRefCount(CERTCertificate *cert);
-
-/*
- * Free the cert reference count lock
- */
-void CERT_UnlockCertRefCount(CERTCertificate *cert);
-
-/*
- * Acquire the cert trust lock
- * There is currently one global lock for all certs, but I'm putting a cert
- * arg here so that it will be easy to make it per-cert in the future if
- * that turns out to be necessary.
- */
-void CERT_LockCertTrust(const CERTCertificate *cert);
-
-/*
- * Free the cert trust lock
- */
-void CERT_UnlockCertTrust(const CERTCertificate *cert);
-
-/*
- * Digest the cert's subject public key using the specified algorithm.
- * NOTE: this digests the value of the BIT STRING subjectPublicKey (excluding
- * the tag, length, and number of unused bits) rather than the whole
- * subjectPublicKeyInfo field.
- *
- * The necessary storage for the digest data is allocated.  If "fill" is
- * non-null, the data is put there, otherwise a SECItem is allocated.
- * Allocation from "arena" if it is non-null, heap otherwise.  Any problem
- * results in a NULL being returned (and an appropriate error set).
- */
-extern SECItem *CERT_GetSubjectPublicKeyDigest(PLArenaPool *arena,
-                                               const CERTCertificate *cert,
-                                               SECOidTag digestAlg,
-                                               SECItem *fill);
-
-/*
- * Digest the cert's subject name using the specified algorithm.
- */
-extern SECItem *CERT_GetSubjectNameDigest(PLArenaPool *arena,
-                                          const CERTCertificate *cert,
-                                          SECOidTag digestAlg, SECItem *fill);
-
-SECStatus CERT_CheckCRL(CERTCertificate *cert, CERTCertificate *issuer,
-                        const SECItem *dp, PRTime t, void *wincx);
-
-/*
- * Add a CERTNameConstraint to the CERTNameConstraint list
- */
-extern CERTNameConstraint *CERT_AddNameConstraint(
-    CERTNameConstraint *list, CERTNameConstraint *constraint);
-
-/*
- * Allocate space and copy CERTNameConstraint from src to dest.
- * Arena is used to allocate result(if dest eq NULL) and its members
- * SECItem data.
- */
-extern CERTNameConstraint *CERT_CopyNameConstraint(PLArenaPool *arena,
-                                                   CERTNameConstraint *dest,
-                                                   CERTNameConstraint *src);
-
-/*
- * Verify name against all the constraints relevant to that type of
- * the name.
- */
-extern SECStatus CERT_CheckNameSpace(PLArenaPool *arena,
-                                     const CERTNameConstraints *constraints,
-                                     const CERTGeneralName *currentName);
-
-/*
- * Extract and allocate the name constraints extension from the CA cert.
- * If the certificate contains no name constraints extension, but
- * CERT_GetImposedNameConstraints returns a name constraints extension
- * for the subject of the certificate, then that extension will be returned.
- */
-extern SECStatus CERT_FindNameConstraintsExten(
-    PLArenaPool *arena, CERTCertificate *cert,
-    CERTNameConstraints **constraints);
-
-/*
- * Initialize a new GERTGeneralName fields (link)
- */
-extern CERTGeneralName *CERT_NewGeneralName(PLArenaPool *arena,
-                                            CERTGeneralNameType type);
-
-/*
- * Lookup a CERTGeneralNameType constant by its human readable string.
- */
-extern CERTGeneralNameType CERT_GetGeneralNameTypeFromString(
-    const char *string);
-
-/*
- * PKIX extension encoding routines
- */
-extern SECStatus CERT_EncodePolicyConstraintsExtension(
-    PLArenaPool *arena, CERTCertificatePolicyConstraints *constr,
-    SECItem *dest);
-extern SECStatus CERT_EncodeInhibitAnyExtension(
-    PLArenaPool *arena, CERTCertificateInhibitAny *inhibitAny, SECItem *dest);
-extern SECStatus CERT_EncodePolicyMappingExtension(
-    PLArenaPool *arena, CERTCertificatePolicyMappings *maps, SECItem *dest);
-
-extern SECStatus CERT_EncodeInfoAccessExtension(PLArenaPool *arena,
-                                                CERTAuthInfoAccess **info,
-                                                SECItem *dest);
-extern SECStatus CERT_EncodeUserNotice(PLArenaPool *arena,
-                                       CERTUserNotice *notice, SECItem *dest);
-
-extern SECStatus CERT_EncodeDisplayText(PLArenaPool *arena, SECItem *text,
-                                        SECItem *dest);
-
-extern SECStatus CERT_EncodeCertPoliciesExtension(PLArenaPool *arena,
-                                                  CERTPolicyInfo **info,
-                                                  SECItem *dest);
-extern SECStatus CERT_EncodeNoticeReference(PLArenaPool *arena,
-                                            CERTNoticeReference *reference,
-                                            SECItem *dest);
-
-/*
- * Returns a pointer to a static structure.
- */
-extern const CERTRevocationFlags *CERT_GetPKIXVerifyNistRevocationPolicy(void);
-
-/*
- * Returns a pointer to a static structure.
- */
-extern const CERTRevocationFlags *CERT_GetClassicOCSPEnabledSoftFailurePolicy(
-    void);
-
-/*
- * Returns a pointer to a static structure.
- */
-extern const CERTRevocationFlags *CERT_GetClassicOCSPEnabledHardFailurePolicy(
-    void);
-
-/*
- * Returns a pointer to a static structure.
- */
-extern const CERTRevocationFlags *CERT_GetClassicOCSPDisabledPolicy(void);
-
-/*
- * Verify a Cert with libpkix
- *  paramsIn control the verification options. If a value isn't specified
- *   in paramsIn, it reverts to the application default.
- *  paramsOut specifies the parameters the caller would like to get back.
- *   the caller may pass NULL, in which case no parameters are returned.
- */
-extern SECStatus CERT_PKIXVerifyCert(CERTCertificate *cert,
-                                     SECCertificateUsage usages,
-                                     CERTValInParam *paramsIn,
-                                     CERTValOutParam *paramsOut, void *wincx);
-
-/* Makes old cert validation APIs(CERT_VerifyCert, CERT_VerifyCertificate)
- * to use libpkix validation engine. The function should be called ones at
- * application initialization time.
- * Function is not thread safe.*/
-extern SECStatus CERT_SetUsePKIXForValidation(PRBool enable);
-
-/* The function return PR_TRUE if cert validation should use
- * libpkix cert validation engine. */
-extern PRBool CERT_GetUsePKIXForValidation(void);
-
-/*
- * Allocate a parameter container of type CERTRevocationFlags,
- * and allocate the inner arrays of the given sizes.
- * To cleanup call CERT_DestroyCERTRevocationFlags.
- */
-extern CERTRevocationFlags *CERT_AllocCERTRevocationFlags(
-    PRUint32 number_leaf_methods, PRUint32 number_leaf_pref_methods,
-    PRUint32 number_chain_methods, PRUint32 number_chain_pref_methods);
-
-/*
- * Destroy the arrays inside flags,
- * and destroy the object pointed to by flags, too.
- */
-extern void CERT_DestroyCERTRevocationFlags(CERTRevocationFlags *flags);
-
-SEC_END_PROTOS
-
-#endif /* _CERT_H_ */
diff --git a/openflow/usr/include/nss/certdb.h b/openflow/usr/include/nss/certdb.h
deleted file mode 100644
index 53d8a39..0000000
--- a/openflow/usr/include/nss/certdb.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _CERTDB_H_
-#define _CERTDB_H_
-
-/* common flags for all types of certificates */
-#define CERTDB_TERMINAL_RECORD (1u << 0)
-#define CERTDB_TRUSTED (1u << 1)
-#define CERTDB_SEND_WARN (1u << 2)
-#define CERTDB_VALID_CA (1u << 3)
-#define CERTDB_TRUSTED_CA (1u << 4) /* trusted for issuing server certs */
-#define CERTDB_NS_TRUSTED_CA (1u << 5)
-#define CERTDB_USER (1u << 6)
-#define CERTDB_TRUSTED_CLIENT_CA (1u << 7) /* trusted for issuing client certs */
-#define CERTDB_INVISIBLE_CA (1u << 8)      /* don't show in UI */
-#define CERTDB_GOVT_APPROVED_CA (1u << 9)  /* can do strong crypto in export ver */
-
-/* old usage, to keep old programs compiling */
-/* On Windows, Mac, and Linux (and other gcc platforms), we can give compile
- * time deprecation warnings when applications use the old CERTDB_VALID_PEER
- * define */
-#if __GNUC__ > 3
-#if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)
-typedef unsigned int __CERTDB_VALID_PEER __attribute__((deprecated));
-#else
-typedef unsigned int __CERTDB_VALID_PEER __attribute__((
-    deprecated("CERTDB_VALID_PEER is now CERTDB_TERMINAL_RECORD")));
-#endif
-#define CERTDB_VALID_PEER ((__CERTDB_VALID_PEER)CERTDB_TERMINAL_RECORD)
-#else
-#ifdef _WIN32
-#pragma deprecated(CERTDB_VALID_PEER)
-#endif
-#define CERTDB_VALID_PEER CERTDB_TERMINAL_RECORD
-#endif
-
-SEC_BEGIN_PROTOS
-
-CERTSignedCrl *SEC_FindCrlByKey(CERTCertDBHandle *handle, SECItem *crlKey,
-                                int type);
-
-CERTSignedCrl *SEC_FindCrlByName(CERTCertDBHandle *handle, SECItem *crlKey,
-                                 int type);
-
-CERTSignedCrl *SEC_FindCrlByDERCert(CERTCertDBHandle *handle, SECItem *derCrl,
-                                    int type);
-
-PRBool SEC_CertNicknameConflict(const char *nickname, const SECItem *derSubject,
-                                CERTCertDBHandle *handle);
-CERTSignedCrl *SEC_NewCrl(CERTCertDBHandle *handle, char *url, SECItem *derCrl,
-                          int type);
-
-SECStatus SEC_DeletePermCRL(CERTSignedCrl *crl);
-
-SECStatus SEC_LookupCrls(CERTCertDBHandle *handle, CERTCrlHeadNode **nodes,
-                         int type);
-
-SECStatus SEC_DestroyCrl(CERTSignedCrl *crl);
-
-CERTSignedCrl *SEC_DupCrl(CERTSignedCrl *acrl);
-
-SECStatus CERT_AddTempCertToPerm(CERTCertificate *cert, char *nickname,
-                                 CERTCertTrust *trust);
-
-SECStatus SEC_DeletePermCertificate(CERTCertificate *cert);
-
-PRBool SEC_CrlIsNewer(CERTCrl *inNew, CERTCrl *old);
-
-/*
-** Extract the validity times from a CRL
-**	"crl" is the CRL
-**	"notBefore" is the start of the validity period (last update)
-**	"notAfter" is the end of the validity period (next update)
-*/
-SECStatus SEC_GetCrlTimes(CERTCrl *crl, PRTime *notBefore, PRTime *notAfter);
-
-/*
-** Check the validity times of a crl vs. time 't', allowing
-** some slop for broken clocks and stuff.
-**	"crl" is the certificate to be checked
-**	"t" is the time to check against
-*/
-SECCertTimeValidity SEC_CheckCrlTimes(CERTCrl *crl, PRTime t);
-
-SEC_END_PROTOS
-
-#endif /* _CERTDB_H_ */
diff --git a/openflow/usr/include/nss/certt.h b/openflow/usr/include/nss/certt.h
deleted file mode 100644
index 797f9f5..0000000
--- a/openflow/usr/include/nss/certt.h
+++ /dev/null
@@ -1,1328 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*
- * certt.h - public data structures for the certificate library
- */
-#ifndef _CERTT_H_
-#define _CERTT_H_
-
-#include "prclist.h"
-#include "pkcs11t.h"
-#include "seccomon.h"
-#include "secmodt.h"
-#include "secoidt.h"
-#include "plarena.h"
-#include "prcvar.h"
-#include "nssilock.h"
-#include "prio.h"
-#include "prmon.h"
-
-/* Stan data types */
-struct NSSCertificateStr;
-struct NSSTrustDomainStr;
-
-/* Non-opaque objects */
-typedef struct CERTAVAStr CERTAVA;
-typedef struct CERTAttributeStr CERTAttribute;
-typedef struct CERTAuthInfoAccessStr CERTAuthInfoAccess;
-typedef struct CERTAuthKeyIDStr CERTAuthKeyID;
-typedef struct CERTBasicConstraintsStr CERTBasicConstraints;
-typedef struct NSSTrustDomainStr CERTCertDBHandle;
-typedef struct CERTCertExtensionStr CERTCertExtension;
-typedef struct CERTCertKeyStr CERTCertKey;
-typedef struct CERTCertListStr CERTCertList;
-typedef struct CERTCertListNodeStr CERTCertListNode;
-typedef struct CERTCertNicknamesStr CERTCertNicknames;
-typedef struct CERTCertTrustStr CERTCertTrust;
-typedef struct CERTCertificateStr CERTCertificate;
-typedef struct CERTCertificateListStr CERTCertificateList;
-typedef struct CERTCertificateRequestStr CERTCertificateRequest;
-typedef struct CERTCrlStr CERTCrl;
-typedef struct CERTCrlDistributionPointsStr CERTCrlDistributionPoints;
-typedef struct CERTCrlEntryStr CERTCrlEntry;
-typedef struct CERTCrlHeadNodeStr CERTCrlHeadNode;
-typedef struct CERTCrlKeyStr CERTCrlKey;
-typedef struct CERTCrlNodeStr CERTCrlNode;
-typedef struct CERTDERCertsStr CERTDERCerts;
-typedef struct CERTDistNamesStr CERTDistNames;
-typedef struct CERTGeneralNameStr CERTGeneralName;
-typedef struct CERTGeneralNameListStr CERTGeneralNameList;
-typedef struct CERTIssuerAndSNStr CERTIssuerAndSN;
-typedef struct CERTNameStr CERTName;
-typedef struct CERTNameConstraintStr CERTNameConstraint;
-typedef struct CERTNameConstraintsStr CERTNameConstraints;
-typedef struct CERTOKDomainNameStr CERTOKDomainName;
-typedef struct CERTPrivKeyUsagePeriodStr CERTPrivKeyUsagePeriod;
-typedef struct CERTPublicKeyAndChallengeStr CERTPublicKeyAndChallenge;
-typedef struct CERTRDNStr CERTRDN;
-typedef struct CERTSignedCrlStr CERTSignedCrl;
-typedef struct CERTSignedDataStr CERTSignedData;
-typedef struct CERTStatusConfigStr CERTStatusConfig;
-typedef struct CERTSubjectListStr CERTSubjectList;
-typedef struct CERTSubjectNodeStr CERTSubjectNode;
-typedef struct CERTSubjectPublicKeyInfoStr CERTSubjectPublicKeyInfo;
-typedef struct CERTValidityStr CERTValidity;
-typedef struct CERTVerifyLogStr CERTVerifyLog;
-typedef struct CERTVerifyLogNodeStr CERTVerifyLogNode;
-typedef struct CRLDistributionPointStr CRLDistributionPoint;
-
-/* CRL extensions type */
-typedef unsigned long CERTCrlNumber;
-
-/*
-** An X.500 AVA object
-*/
-struct CERTAVAStr {
-    SECItem type;
-    SECItem value;
-};
-
-/*
-** An X.500 RDN object
-*/
-struct CERTRDNStr {
-    CERTAVA **avas;
-};
-
-/*
-** An X.500 name object
-*/
-struct CERTNameStr {
-    PLArenaPool *arena;
-    CERTRDN **rdns;
-};
-
-/*
-** An X.509 validity object
-*/
-struct CERTValidityStr {
-    PLArenaPool *arena;
-    SECItem notBefore;
-    SECItem notAfter;
-};
-
-/*
- * A serial number and issuer name, which is used as a database key
- */
-struct CERTCertKeyStr {
-    SECItem serialNumber;
-    SECItem derIssuer;
-};
-
-/*
-** A signed data object. Used to implement the "signed" macro used
-** in the X.500 specs.
-*/
-struct CERTSignedDataStr {
-    SECItem data;
-    SECAlgorithmID signatureAlgorithm;
-    SECItem signature;
-};
-
-/*
-** An X.509 subject-public-key-info object
-*/
-struct CERTSubjectPublicKeyInfoStr {
-    PLArenaPool *arena;
-    SECAlgorithmID algorithm;
-    SECItem subjectPublicKey;
-};
-
-struct CERTPublicKeyAndChallengeStr {
-    SECItem spki;
-    SECItem challenge;
-};
-
-struct CERTCertTrustStr {
-    unsigned int sslFlags;
-    unsigned int emailFlags;
-    unsigned int objectSigningFlags;
-};
-
-/*
- * defined the types of trust that exist
- */
-typedef enum SECTrustTypeEnum {
-    trustSSL = 0,
-    trustEmail = 1,
-    trustObjectSigning = 2,
-    trustTypeNone = 3
-} SECTrustType;
-
-#define SEC_GET_TRUST_FLAGS(trust, type)                                  \
-    (((type) == trustSSL)                                                 \
-         ? ((trust)->sslFlags)                                            \
-         : (((type) == trustEmail) ? ((trust)->emailFlags)                \
-                                   : (((type) == trustObjectSigning)      \
-                                          ? ((trust)->objectSigningFlags) \
-                                          : 0)))
-
-/*
-** An X.509.3 certificate extension
-*/
-struct CERTCertExtensionStr {
-    SECItem id;
-    SECItem critical;
-    SECItem value;
-};
-
-struct CERTSubjectNodeStr {
-    struct CERTSubjectNodeStr *next;
-    struct CERTSubjectNodeStr *prev;
-    SECItem certKey;
-    SECItem keyID;
-};
-
-struct CERTSubjectListStr {
-    PLArenaPool *arena;
-    int ncerts;
-    char *emailAddr;
-    CERTSubjectNode *head;
-    CERTSubjectNode *tail; /* do we need tail? */
-    void *entry;
-};
-
-/*
-** An X.509 certificate object (the unsigned form)
-*/
-struct CERTCertificateStr {
-    /* the arena is used to allocate any data structures that have the same
-     * lifetime as the cert.  This is all stuff that hangs off of the cert
-     * structure, and is all freed at the same time.  It is used when the
-     * cert is decoded, destroyed, and at some times when it changes
-     * state
-     */
-    PLArenaPool *arena;
-
-    /* The following fields are static after the cert has been decoded */
-    char *subjectName;
-    char *issuerName;
-    CERTSignedData signatureWrap; /* XXX */
-    SECItem derCert;              /* original DER for the cert */
-    SECItem derIssuer;            /* DER for issuer name */
-    SECItem derSubject;           /* DER for subject name */
-    SECItem derPublicKey;         /* DER for the public key */
-    SECItem certKey;              /* database key for this cert */
-    SECItem version;
-    SECItem serialNumber;
-    SECAlgorithmID signature;
-    CERTName issuer;
-    CERTValidity validity;
-    CERTName subject;
-    CERTSubjectPublicKeyInfo subjectPublicKeyInfo;
-    SECItem issuerID;
-    SECItem subjectID;
-    CERTCertExtension **extensions;
-    char *emailAddr;
-    CERTCertDBHandle *dbhandle;
-    SECItem subjectKeyID;     /* x509v3 subject key identifier */
-    PRBool keyIDGenerated;    /* was the keyid generated? */
-    unsigned int keyUsage;    /* what uses are allowed for this cert */
-    unsigned int rawKeyUsage; /* value of the key usage extension */
-    PRBool keyUsagePresent;   /* was the key usage extension present */
-    PRUint32 nsCertType;      /* value of the ns cert type extension */
-                              /* must be 32-bit for PR_ATOMIC_SET */
-
-    /* these values can be set by the application to bypass certain checks
-     * or to keep the cert in memory for an entire session.
-     * XXX - need an api to set these
-     */
-    PRBool keepSession;         /* keep this cert for entire session*/
-    PRBool timeOK;              /* is the bad validity time ok? */
-    CERTOKDomainName *domainOK; /* these domain names are ok */
-
-    /*
-     * these values can change when the cert changes state.  These state
-     * changes include transitions from temp to perm or vice-versa, and
-     * changes of trust flags
-     */
-    PRBool isperm;
-    PRBool istemp;
-    char *nickname;
-    char *dbnickname;
-    struct NSSCertificateStr *nssCertificate; /* This is Stan stuff. */
-    CERTCertTrust *trust;
-
-    /* the reference count is modified whenever someone looks up, dups
-     * or destroys a certificate
-     */
-    int referenceCount;
-
-    /* The subject list is a list of all certs with the same subject name.
-     * It can be modified any time a cert is added or deleted from either
-     * the in-memory(temporary) or on-disk(permanent) database.
-     */
-    CERTSubjectList *subjectList;
-
-    /* these belong in the static section, but are here to maintain
-     * the structure's integrity
-     */
-    CERTAuthKeyID *authKeyID; /* x509v3 authority key identifier */
-    PRBool isRoot;            /* cert is the end of a chain */
-
-    /* these fields are used by client GUI code to keep track of ssl sockets
-     * that are blocked waiting on GUI feedback related to this cert.
-     * XXX - these should be moved into some sort of application specific
-     *       data structure.  They are only used by the browser right now.
-     */
-    union {
-        void *apointer; /* was struct SECSocketNode* authsocketlist */
-        struct {
-            unsigned int hasUnsupportedCriticalExt : 1;
-            /* add any new option bits needed here */
-        } bits;
-    } options;
-    int series; /* was int authsocketcount; record the series of the pkcs11ID */
-
-    /* This is PKCS #11 stuff. */
-    PK11SlotInfo *slot;        /*if this cert came of a token, which is it*/
-    CK_OBJECT_HANDLE pkcs11ID; /*and which object on that token is it */
-    PRBool ownSlot;            /*true if the cert owns the slot reference */
-};
-#define SEC_CERTIFICATE_VERSION_1 0 /* default created */
-#define SEC_CERTIFICATE_VERSION_2 1 /* v2 */
-#define SEC_CERTIFICATE_VERSION_3 2 /* v3 extensions */
-
-#define SEC_CRL_VERSION_1 0 /* default */
-#define SEC_CRL_VERSION_2 1 /* v2 extensions */
-
-/*
- * used to identify class of cert in mime stream code
- */
-#define SEC_CERT_CLASS_CA 1
-#define SEC_CERT_CLASS_SERVER 2
-#define SEC_CERT_CLASS_USER 3
-#define SEC_CERT_CLASS_EMAIL 4
-
-struct CERTDERCertsStr {
-    PLArenaPool *arena;
-    int numcerts;
-    SECItem *rawCerts;
-};
-
-/*
-** A PKCS ? Attribute
-** XXX this is duplicated through out the code, it *should* be moved
-** to a central location.  Where would be appropriate?
-*/
-struct CERTAttributeStr {
-    SECItem attrType;
-    SECItem **attrValue;
-};
-
-/*
-** A PKCS#10 certificate-request object (the unsigned form)
-*/
-struct CERTCertificateRequestStr {
-    PLArenaPool *arena;
-    SECItem version;
-    CERTName subject;
-    CERTSubjectPublicKeyInfo subjectPublicKeyInfo;
-    CERTAttribute **attributes;
-};
-#define SEC_CERTIFICATE_REQUEST_VERSION 0 /* what we *create* */
-
-/*
-** A certificate list object.
-*/
-struct CERTCertificateListStr {
-    SECItem *certs;
-    int len; /* number of certs */
-    PLArenaPool *arena;
-};
-
-struct CERTCertListNodeStr {
-    PRCList links;
-    CERTCertificate *cert;
-    void *appData;
-};
-
-struct CERTCertListStr {
-    PRCList list;
-    PLArenaPool *arena;
-};
-
-#define CERT_LIST_HEAD(l) ((CERTCertListNode *)PR_LIST_HEAD(&l->list))
-#define CERT_LIST_TAIL(l) ((CERTCertListNode *)PR_LIST_TAIL(&l->list))
-#define CERT_LIST_NEXT(n) ((CERTCertListNode *)n->links.next)
-#define CERT_LIST_END(n, l) (((void *)n) == ((void *)&l->list))
-#define CERT_LIST_EMPTY(l) CERT_LIST_END(CERT_LIST_HEAD(l), l)
-
-struct CERTCrlEntryStr {
-    SECItem serialNumber;
-    SECItem revocationDate;
-    CERTCertExtension **extensions;
-};
-
-struct CERTCrlStr {
-    PLArenaPool *arena;
-    SECItem version;
-    SECAlgorithmID signatureAlg;
-    SECItem derName;
-    CERTName name;
-    SECItem lastUpdate;
-    SECItem nextUpdate; /* optional for x.509 CRL  */
-    CERTCrlEntry **entries;
-    CERTCertExtension **extensions;
-    /* can't add anything there for binary backwards compatibility reasons */
-};
-
-struct CERTCrlKeyStr {
-    SECItem derName;
-    SECItem dummy; /* The decoder can not skip a primitive,
-                      this serves as a place holder for the
-                      decoder to finish its task only
-                   */
-};
-
-struct CERTSignedCrlStr {
-    PLArenaPool *arena;
-    CERTCrl crl;
-    void *reserved1;
-    PRBool reserved2;
-    PRBool isperm;
-    PRBool istemp;
-    int referenceCount;
-    CERTCertDBHandle *dbhandle;
-    CERTSignedData signatureWrap; /* XXX */
-    char *url;
-    SECItem *derCrl;
-    PK11SlotInfo *slot;
-    CK_OBJECT_HANDLE pkcs11ID;
-    void *opaque; /* do not touch */
-};
-
-struct CERTCrlHeadNodeStr {
-    PLArenaPool *arena;
-    CERTCertDBHandle *dbhandle;
-    CERTCrlNode *first;
-    CERTCrlNode *last;
-};
-
-struct CERTCrlNodeStr {
-    CERTCrlNode *next;
-    int type;
-    CERTSignedCrl *crl;
-};
-
-/*
- * Array of X.500 Distinguished Names
- */
-struct CERTDistNamesStr {
-    PLArenaPool *arena;
-    int nnames;
-    SECItem *names;
-    void *head; /* private */
-};
-
-#define NS_CERT_TYPE_SSL_CLIENT (0x80)        /* bit 0 */
-#define NS_CERT_TYPE_SSL_SERVER (0x40)        /* bit 1 */
-#define NS_CERT_TYPE_EMAIL (0x20)             /* bit 2 */
-#define NS_CERT_TYPE_OBJECT_SIGNING (0x10)    /* bit 3 */
-#define NS_CERT_TYPE_RESERVED (0x08)          /* bit 4 */
-#define NS_CERT_TYPE_SSL_CA (0x04)            /* bit 5 */
-#define NS_CERT_TYPE_EMAIL_CA (0x02)          /* bit 6 */
-#define NS_CERT_TYPE_OBJECT_SIGNING_CA (0x01) /* bit 7 */
-
-#define EXT_KEY_USAGE_TIME_STAMP (0x8000)
-#define EXT_KEY_USAGE_STATUS_RESPONDER (0x4000)
-
-#define NS_CERT_TYPE_APP                                                      \
-    (NS_CERT_TYPE_SSL_CLIENT | NS_CERT_TYPE_SSL_SERVER | NS_CERT_TYPE_EMAIL | \
-     NS_CERT_TYPE_OBJECT_SIGNING)
-
-#define NS_CERT_TYPE_CA                            \
-    (NS_CERT_TYPE_SSL_CA | NS_CERT_TYPE_EMAIL_CA | \
-     NS_CERT_TYPE_OBJECT_SIGNING_CA | EXT_KEY_USAGE_STATUS_RESPONDER)
-typedef enum SECCertUsageEnum {
-    certUsageSSLClient = 0,
-    certUsageSSLServer = 1,
-    certUsageSSLServerWithStepUp = 2,
-    certUsageSSLCA = 3,
-    certUsageEmailSigner = 4,
-    certUsageEmailRecipient = 5,
-    certUsageObjectSigner = 6,
-    certUsageUserCertImport = 7,
-    certUsageVerifyCA = 8,
-    certUsageProtectedObjectSigner = 9,
-    certUsageStatusResponder = 10,
-    certUsageAnyCA = 11
-} SECCertUsage;
-
-typedef PRInt64 SECCertificateUsage;
-
-#define certificateUsageCheckAllUsages (0x0000)
-#define certificateUsageSSLClient (0x0001)
-#define certificateUsageSSLServer (0x0002)
-#define certificateUsageSSLServerWithStepUp (0x0004)
-#define certificateUsageSSLCA (0x0008)
-#define certificateUsageEmailSigner (0x0010)
-#define certificateUsageEmailRecipient (0x0020)
-#define certificateUsageObjectSigner (0x0040)
-#define certificateUsageUserCertImport (0x0080)
-#define certificateUsageVerifyCA (0x0100)
-#define certificateUsageProtectedObjectSigner (0x0200)
-#define certificateUsageStatusResponder (0x0400)
-#define certificateUsageAnyCA (0x0800)
-
-#define certificateUsageHighest certificateUsageAnyCA
-
-/*
- * Does the cert belong to the user, a peer, or a CA.
- */
-typedef enum CERTCertOwnerEnum {
-    certOwnerUser = 0,
-    certOwnerPeer = 1,
-    certOwnerCA = 2
-} CERTCertOwner;
-
-/*
- * This enum represents the state of validity times of a certificate
- */
-typedef enum SECCertTimeValidityEnum {
-    secCertTimeValid = 0,
-    secCertTimeExpired = 1,
-    secCertTimeNotValidYet = 2,
-    secCertTimeUndetermined = 3 /* validity could not be decoded from the
-                                   cert, most likely because it was NULL */
-} SECCertTimeValidity;
-
-/*
- * This is used as return status in functions that compare the validity
- * periods of two certificates A and B, currently only
- * CERT_CompareValidityTimes.
- */
-
-typedef enum CERTCompareValidityStatusEnum {
-    certValidityUndetermined = 0, /* the function is unable to select one cert
-                                     over another */
-    certValidityChooseB = 1,      /* cert B should be preferred */
-    certValidityEqual = 2,        /* both certs have the same validity period */
-    certValidityChooseA = 3       /* cert A should be preferred */
-} CERTCompareValidityStatus;
-
-/*
- * Interface for getting certificate nickname strings out of the database
- */
-
-/* these are values for the what argument below */
-#define SEC_CERT_NICKNAMES_ALL 1
-#define SEC_CERT_NICKNAMES_USER 2
-#define SEC_CERT_NICKNAMES_SERVER 3
-#define SEC_CERT_NICKNAMES_CA 4
-
-struct CERTCertNicknamesStr {
-    PLArenaPool *arena;
-    void *head;
-    int numnicknames;
-    char **nicknames;
-    int what;
-    int totallen;
-};
-
-struct CERTIssuerAndSNStr {
-    SECItem derIssuer;
-    CERTName issuer;
-    SECItem serialNumber;
-};
-
-/* X.509 v3 Key Usage Extension flags */
-#define KU_DIGITAL_SIGNATURE (0x80) /* bit 0 */
-#define KU_NON_REPUDIATION (0x40)   /* bit 1 */
-#define KU_KEY_ENCIPHERMENT (0x20)  /* bit 2 */
-#define KU_DATA_ENCIPHERMENT (0x10) /* bit 3 */
-#define KU_KEY_AGREEMENT (0x08)     /* bit 4 */
-#define KU_KEY_CERT_SIGN (0x04)     /* bit 5 */
-#define KU_CRL_SIGN (0x02)          /* bit 6 */
-#define KU_ENCIPHER_ONLY (0x01)     /* bit 7 */
-#define KU_ALL                                                         \
-    (KU_DIGITAL_SIGNATURE | KU_NON_REPUDIATION | KU_KEY_ENCIPHERMENT | \
-     KU_DATA_ENCIPHERMENT | KU_KEY_AGREEMENT | KU_KEY_CERT_SIGN |      \
-     KU_CRL_SIGN | KU_ENCIPHER_ONLY)
-
-/* This value will not occur in certs.  It is used internally for the case
- * when either digital signature or non-repudiation is the correct value.
- */
-#define KU_DIGITAL_SIGNATURE_OR_NON_REPUDIATION (0x2000)
-
-/* This value will not occur in certs.  It is used internally for the case
- * when the key type is not know ahead of time and either key agreement or
- * key encipherment are the correct value based on key type
- */
-#define KU_KEY_AGREEMENT_OR_ENCIPHERMENT (0x4000)
-
-/* internal bits that do not match bits in the x509v3 spec, but are used
- * for similar purposes
- */
-#define KU_NS_GOVT_APPROVED (0x8000) /*don't make part of KU_ALL!*/
-/*
-* x.509 v3 Basic Constraints Extension
-* If isCA is false, the pathLenConstraint is ignored.
-* Otherwise, the following pathLenConstraint values will apply:
-*	< 0 - there is no limit to the certificate path
-*	0   - CA can issues end-entity certificates only
-*	> 0 - the number of certificates in the certificate path is
-*	      limited to this number
-*/
-#define CERT_UNLIMITED_PATH_CONSTRAINT -2
-
-struct CERTBasicConstraintsStr {
-    PRBool isCA;           /* on if is CA */
-    int pathLenConstraint; /* maximum number of certificates that can be
-                              in the cert path.  Only applies to a CA
-                              certificate; otherwise, it's ignored.
-                            */
-};
-
-/* Maximum length of a certificate chain */
-#define CERT_MAX_CERT_CHAIN 20
-
-#define CERT_MAX_SERIAL_NUMBER_BYTES 20 /* from RFC 3280 */
-#define CERT_MAX_DN_BYTES 4096          /* arbitrary */
-
-/* x.509 v3 Reason Flags, used in CRLDistributionPoint Extension */
-#define RF_UNUSED (0x80)                 /* bit 0 */
-#define RF_KEY_COMPROMISE (0x40)         /* bit 1 */
-#define RF_CA_COMPROMISE (0x20)          /* bit 2 */
-#define RF_AFFILIATION_CHANGED (0x10)    /* bit 3 */
-#define RF_SUPERSEDED (0x08)             /* bit 4 */
-#define RF_CESSATION_OF_OPERATION (0x04) /* bit 5 */
-#define RF_CERTIFICATE_HOLD (0x02)       /* bit 6 */
-
-/* enum for CRL Entry Reason Code */
-typedef enum CERTCRLEntryReasonCodeEnum {
-    crlEntryReasonUnspecified = 0,
-    crlEntryReasonKeyCompromise = 1,
-    crlEntryReasonCaCompromise = 2,
-    crlEntryReasonAffiliationChanged = 3,
-    crlEntryReasonSuperseded = 4,
-    crlEntryReasonCessationOfOperation = 5,
-    crlEntryReasoncertificatedHold = 6,
-    crlEntryReasonRemoveFromCRL = 8,
-    crlEntryReasonPrivilegeWithdrawn = 9,
-    crlEntryReasonAaCompromise = 10
-} CERTCRLEntryReasonCode;
-
-/* If we needed to extract the general name field, use this */
-/* General Name types */
-typedef enum CERTGeneralNameTypeEnum {
-    certOtherName = 1,
-    certRFC822Name = 2,
-    certDNSName = 3,
-    certX400Address = 4,
-    certDirectoryName = 5,
-    certEDIPartyName = 6,
-    certURI = 7,
-    certIPAddress = 8,
-    certRegisterID = 9
-} CERTGeneralNameType;
-
-typedef struct OtherNameStr {
-    SECItem name;
-    SECItem oid;
-} OtherName;
-
-struct CERTGeneralNameStr {
-    CERTGeneralNameType type; /* name type */
-    union {
-        CERTName directoryName; /* distinguish name */
-        OtherName OthName;      /* Other Name */
-        SECItem other;          /* the rest of the name forms */
-    } name;
-    SECItem derDirectoryName; /* this is saved to simplify directory name
-                                 comparison */
-    PRCList l;
-};
-
-struct CERTGeneralNameListStr {
-    PLArenaPool *arena;
-    CERTGeneralName *name;
-    int refCount;
-    int len;
-    PZLock *lock;
-};
-
-struct CERTNameConstraintStr {
-    CERTGeneralName name;
-    SECItem DERName;
-    SECItem min;
-    SECItem max;
-    PRCList l;
-};
-
-struct CERTNameConstraintsStr {
-    CERTNameConstraint *permited;
-    CERTNameConstraint *excluded;
-    SECItem **DERPermited;
-    SECItem **DERExcluded;
-};
-
-/* Private Key Usage Period extension struct. */
-struct CERTPrivKeyUsagePeriodStr {
-    SECItem notBefore;
-    SECItem notAfter;
-    PLArenaPool *arena;
-};
-
-/* X.509 v3 Authority Key Identifier extension.  For the authority certificate
-   issuer field, we only support URI now.
- */
-struct CERTAuthKeyIDStr {
-    SECItem keyID;                   /* unique key identifier */
-    CERTGeneralName *authCertIssuer; /* CA's issuer name.  End with a NULL */
-    SECItem authCertSerialNumber;    /* CA's certificate serial number */
-    SECItem **DERAuthCertIssuer;     /* This holds the DER encoded format of
-                                        the authCertIssuer field. It is used
-                                        by the encoding engine. It should be
-                                        used as a read only field by the caller.
-                                     */
-};
-
-/* x.509 v3 CRL Distributeion Point */
-
-/*
- * defined the types of CRL Distribution points
- */
-typedef enum DistributionPointTypesEnum {
-    generalName = 1, /* only support this for now */
-    relativeDistinguishedName = 2
-} DistributionPointTypes;
-
-struct CRLDistributionPointStr {
-    DistributionPointTypes distPointType;
-    union {
-        CERTGeneralName *fullName;
-        CERTRDN relativeName;
-    } distPoint;
-    SECItem reasons;
-    CERTGeneralName *crlIssuer;
-
-    /* Reserved for internal use only*/
-    SECItem derDistPoint;
-    SECItem derRelativeName;
-    SECItem **derCrlIssuer;
-    SECItem **derFullName;
-    SECItem bitsmap;
-};
-
-struct CERTCrlDistributionPointsStr {
-    CRLDistributionPoint **distPoints;
-};
-
-/*
- * This structure is used to keep a log of errors when verifying
- * a cert chain.  This allows multiple errors to be reported all at
- * once.
- */
-struct CERTVerifyLogNodeStr {
-    CERTCertificate *cert;             /* what cert had the error */
-    long error;                        /* what error was it? */
-    unsigned int depth;                /* how far up the chain are we */
-    void *arg;                         /* error specific argument */
-    struct CERTVerifyLogNodeStr *next; /* next in the list */
-    struct CERTVerifyLogNodeStr *prev; /* next in the list */
-};
-
-struct CERTVerifyLogStr {
-    PLArenaPool *arena;
-    unsigned int count;
-    struct CERTVerifyLogNodeStr *head;
-    struct CERTVerifyLogNodeStr *tail;
-};
-
-struct CERTOKDomainNameStr {
-    CERTOKDomainName *next;
-    char *name;
-};
-
-typedef SECStatus(PR_CALLBACK *CERTStatusChecker)(CERTCertDBHandle *handle,
-                                                  CERTCertificate *cert,
-                                                  PRTime time, void *pwArg);
-
-typedef SECStatus(PR_CALLBACK *CERTStatusDestroy)(CERTStatusConfig *handle);
-
-struct CERTStatusConfigStr {
-    CERTStatusChecker statusChecker; /* NULL means no checking enabled */
-    CERTStatusDestroy statusDestroy; /* enabled or no, will clean up */
-    void *statusContext;             /* cx specific to checking protocol */
-};
-
-struct CERTAuthInfoAccessStr {
-    SECItem method;
-    SECItem derLocation;
-    CERTGeneralName *location; /* decoded location */
-};
-
-/* This is the typedef for the callback passed to CERT_OpenCertDB() */
-/* callback to return database name based on version number */
-typedef char *(*CERTDBNameFunc)(void *arg, int dbVersion);
-
-/*
- * types of cert packages that we can decode
- */
-typedef enum CERTPackageTypeEnum {
-    certPackageNone = 0,
-    certPackageCert = 1,
-    certPackagePKCS7 = 2,
-    certPackageNSCertSeq = 3,
-    certPackageNSCertWrap = 4
-} CERTPackageType;
-
-/*
- * these types are for the PKIX Certificate Policies extension
- */
-typedef struct {
-    SECOidTag oid;
-    SECItem qualifierID;
-    SECItem qualifierValue;
-} CERTPolicyQualifier;
-
-typedef struct {
-    SECOidTag oid;
-    SECItem policyID;
-    CERTPolicyQualifier **policyQualifiers;
-} CERTPolicyInfo;
-
-typedef struct {
-    PLArenaPool *arena;
-    CERTPolicyInfo **policyInfos;
-} CERTCertificatePolicies;
-
-typedef struct {
-    SECItem organization;
-    SECItem **noticeNumbers;
-} CERTNoticeReference;
-
-typedef struct {
-    PLArenaPool *arena;
-    CERTNoticeReference noticeReference;
-    SECItem derNoticeReference;
-    SECItem displayText;
-} CERTUserNotice;
-
-typedef struct {
-    PLArenaPool *arena;
-    SECItem **oids;
-} CERTOidSequence;
-
-/*
- * these types are for the PKIX Policy Mappings extension
- */
-typedef struct {
-    SECItem issuerDomainPolicy;
-    SECItem subjectDomainPolicy;
-} CERTPolicyMap;
-
-typedef struct {
-    PLArenaPool *arena;
-    CERTPolicyMap **policyMaps;
-} CERTCertificatePolicyMappings;
-
-/*
- * these types are for the PKIX inhibitAnyPolicy extension
- */
-typedef struct {
-    SECItem inhibitAnySkipCerts;
-} CERTCertificateInhibitAny;
-
-/*
- * these types are for the PKIX Policy Constraints extension
- */
-typedef struct {
-    SECItem explicitPolicySkipCerts;
-    SECItem inhibitMappingSkipCerts;
-} CERTCertificatePolicyConstraints;
-
-/*
- * These types are for the validate chain callback param.
- *
- * CERTChainVerifyCallback is an application-supplied callback that can be used
- * to augment libpkix's certificate chain validation with additional
- * application-specific checks. It may be called multiple times if there are
- * multiple potentially-valid paths for the certificate being validated. This
- * callback is called before revocation checking is done on the certificates in
- * the given chain.
- *
- * - isValidChainArg contains the application-provided opaque argument
- * - currentChain is the currently validated chain. It is ordered with the leaf
- *   certificate at the head and the trust anchor at the tail.
- *
- * The callback should set *chainOK = PR_TRUE and return SECSuccess if the
- * certificate chain is acceptable. It should set *chainOK = PR_FALSE and
- * return SECSuccess if the chain is unacceptable, to indicate that the given
- * chain is bad and path building should continue. It should return SECFailure
- * to indicate an fatal error that will cause path validation to fail
- * immediately.
- */
-typedef SECStatus (*CERTChainVerifyCallbackFunc)(
-    void *isChainValidArg, const CERTCertList *currentChain, PRBool *chainOK);
-
-/*
- * Note: If extending this structure, it will be necessary to change the
- * associated CERTValParamInType
- */
-typedef struct {
-    CERTChainVerifyCallbackFunc isChainValid;
-    void *isChainValidArg;
-} CERTChainVerifyCallback;
-
-/*
- * these types are for the CERT_PKIX* Verification functions
- * These are all optional parameters.
- */
-
-typedef enum {
-    cert_pi_end = 0,              /* SPECIAL: signifies end of array of
-                              * CERTValParam* */
-    cert_pi_nbioContext = 1,      /* specify a non-blocking IO context used to
-                              * resume a session. If this argument is
-                              * specified, no other arguments should be.
-                              * Specified in value.pointer.p. If the
-                              * operation completes the context will be
-                              * freed. */
-    cert_pi_nbioAbort = 2,        /* specify a non-blocking IO context for an
-                              * existing operation which the caller wants
-                              * to abort. If this argument is
-                              * specified, no other arguments should be.
-                              * Specified in value.pointer.p. If the
-                              * operation succeeds the context will be
-                              * freed. */
-    cert_pi_certList = 3,         /* specify the chain to validate against. If
-                              * this value is given, then the path
-                              * construction step in the validation is
-                              * skipped. Specified in value.pointer.chain */
-    cert_pi_policyOID = 4,        /* validate certificate for policy OID.
-                              * Specified in value.array.oids. Cert must
-                              * be good for at least one OID in order
-                              * to validate. Default is that the user is not
-                              * concerned about certificate policy. */
-    cert_pi_policyFlags = 5,      /* flags for each policy specified in policyOID.
-                              * Specified in value.scalar.ul. Policy flags
-                              * apply to all specified oids.
-                              * Use CERT_POLICY_FLAG_* macros below. If not
-                              * specified policy flags default to 0 */
-    cert_pi_keyusage = 6,         /* specify what the keyusages the certificate
-                              * will be evaluated against, specified in
-                              * value.scalar.ui. The cert must validate for
-                              * at least one of the specified key usages.
-                              * Values match the KU_  bit flags defined
-                              * in this file. Default is derived from
-                              * the 'usages' function argument */
-    cert_pi_extendedKeyusage = 7, /* specify what the required extended key
-                                   * usage of the certificate. Specified as
-                                   * an array of oidTags in value.array.oids.
-                                   * The cert must validate for at least one
-                                   * of the specified extended key usages.
-                                   * If not specified, no extended key usages
-                                   * will be checked. */
-    cert_pi_date = 8,             /* validate certificate is valid as of date
-                                   * specified in value.scalar.time. A special
-                                   * value '0' indicates 'now'. default is '0' */
-    cert_pi_revocationFlags = 9,  /* Specify what revocation checking to do.
-                                   * See CERT_REV_FLAG_* macros below
-                                   * Set in value.pointer.revocation */
-    cert_pi_certStores = 10,      /* Bitmask of Cert Store flags (see below)
-                                   * Set in value.scalar.ui */
-    cert_pi_trustAnchors =
-        11,                       /* Specify the list of trusted roots to
-                                   * validate against.
-                                   * The default set of trusted roots, these are
-                                   * root CA certs from libnssckbi.so or CA
-                                   * certs trusted by user, are used in any of
-                                   * the following cases:
-                                   *      * when the parameter is not set.
-                                   *      * when the list of trust anchors is
-                                   *        empty.
-                                   * Note that this handling can be further
-                                   * altered by altering the
-                                   * cert_pi_useOnlyTrustAnchors flag
-                                   * Specified in value.pointer.chain */
-    cert_pi_useAIACertFetch = 12, /* Enables cert fetching using AIA extension.
-                                  * In NSS 3.12.1 or later. Default is off.
-                                  * Value is in value.scalar.b */
-    cert_pi_chainVerifyCallback = 13,
-    /* The callback container for doing extra
-     * validation on the currently calculated chain.
-     * Value is in value.pointer.chainVerifyCallback */
-    cert_pi_useOnlyTrustAnchors = 14,
-    /* If true, disables trusting any
-        * certificates other than the ones passed in via cert_pi_trustAnchors.
-        * If false, then the certificates specified via cert_pi_trustAnchors
-        * will be combined with the pre-existing trusted roots, but only
-        * for the certificate validation being performed.
-        * If no value has been supplied via cert_pi_trustAnchors, this has
-        * no effect.
-        * The default value is true, meaning if this is not supplied, only
-        * trust anchors supplied via cert_pi_trustAnchors are trusted.
-        * Specified in value.scalar.b */
-    cert_pi_max /* SPECIAL: signifies maximum allowed value,
-                 *  can increase in future releases */
-} CERTValParamInType;
-
-/*
- * for all out parameters:
- *  out parameters are only returned if the caller asks for them in
- *  the CERTValOutParam array. Caller is responsible for the CERTValOutParam
- *  array itself. The pkix verify function will allocate and other arrays
- *  pointers, or objects. The Caller is responsible for freeing those results.
- * If SECWouldBlock is returned, only cert_pi_nbioContext is returned.
- */
-typedef enum {
-    cert_po_end = 0,              /* SPECIAL: signifies end of array of
-                                   * CERTValParam* */
-    cert_po_nbioContext = 1,      /* Return a nonblocking context. If no
-                                   * non-blocking context is specified, then
-                                   * blocking IO will be used.
-                                   * Returned in value.pointer.p. The context is
-                                   * freed after an abort or a complete operation.
-                                   * This value is only returned on SECWouldBlock.
-                                   */
-    cert_po_trustAnchor = 2,      /* Return the trust anchor for the chain that
-                                   * was validated. Returned in
-                                   * value.pointer.cert, this value is only
-                                   * returned on SECSuccess. */
-    cert_po_certList = 3,         /* Return the entire chain that was validated.
-                                   * Returned in value.pointer.certList. If no
-                                   * chain could be constructed, this value
-                                   * would be NULL. */
-    cert_po_policyOID = 4,        /* Return the policies that were found to be
-                                   * valid. Returned in value.array.oids as an
-                                   * array. This is only returned on
-                                   * SECSuccess. */
-    cert_po_errorLog = 5,         /* Return a log of problems with the chain.
-                                   * Returned in value.pointer.log  */
-    cert_po_usages = 6,           /* Return what usages the certificate is valid
-                                     for. Returned in value.scalar.usages */
-    cert_po_keyUsage = 7,         /* Return what key usages the certificate
-                                   * is valid for.
-                                   * Returned in value.scalar.usage */
-    cert_po_extendedKeyusage = 8, /* Return what extended key usages the
-                                   * certificate is valid for.
-                                   * Returned in value.array.oids */
-    cert_po_max                   /* SPECIAL: signifies maximum allowed value,
-                                   *  can increase in future releases */
-
-} CERTValParamOutType;
-
-typedef enum {
-    cert_revocation_method_crl = 0,
-    cert_revocation_method_ocsp,
-    cert_revocation_method_count
-} CERTRevocationMethodIndex;
-
-/*
- * The following flags are supposed to be used to control bits in
- * each integer contained in the array pointed to be:
- *     CERTRevocationTests.cert_rev_flags_per_method
- * All Flags are prefixed by CERT_REV_M_, where _M_ indicates
- * this is a method dependent flag.
- */
-
-/*
- * Whether or not to use a method for revocation testing.
- * If set to "do not test", then all other flags are ignored.
- */
-#define CERT_REV_M_DO_NOT_TEST_USING_THIS_METHOD 0UL
-#define CERT_REV_M_TEST_USING_THIS_METHOD 1UL
-
-/*
- * Whether or not NSS is allowed to attempt to fetch fresh information
- *         from the network.
- * (Although fetching will never happen if fresh information for the
- *           method is already locally available.)
- */
-#define CERT_REV_M_ALLOW_NETWORK_FETCHING 0UL
-#define CERT_REV_M_FORBID_NETWORK_FETCHING 2UL
-
-/*
- * Example for an implicit default source:
- *         The globally configured default OCSP responder.
- * IGNORE means:
- *        ignore the implicit default source, whether it's configured or not.
- * ALLOW means:
- *       if an implicit default source is configured,
- *          then it overrides any available or missing source in the cert.
- *       if no implicit default source is configured,
- *          then we continue to use what's available (or not available)
- *          in the certs.
- */
-#define CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE 0UL
-#define CERT_REV_M_IGNORE_IMPLICIT_DEFAULT_SOURCE 4UL
-
-/*
- * Defines the behavior if no fresh information is available,
- *   fetching from the network is allowed, but the source of revocation
- *   information is unknown (even after considering implicit sources,
- *   if allowed by other flags).
- * SKIPT_TEST means:
- *          We ignore that no fresh information is available and
- *          skip this test.
- * REQUIRE_INFO means:
- *          We still require that fresh information is available.
- *          Other flags define what happens on missing fresh info.
- */
-#define CERT_REV_M_SKIP_TEST_ON_MISSING_SOURCE 0UL
-#define CERT_REV_M_REQUIRE_INFO_ON_MISSING_SOURCE 8UL
-
-/*
- * Defines the behavior if we are unable to obtain fresh information.
- * INGORE means:
- *      Return "cert status unknown"
- * FAIL means:
- *      Return "cert revoked".
- */
-#define CERT_REV_M_IGNORE_MISSING_FRESH_INFO 0UL
-#define CERT_REV_M_FAIL_ON_MISSING_FRESH_INFO 16UL
-
-/*
- * What should happen if we were able to find fresh information using
- * this method, and the data indicated the cert is good?
- * STOP_TESTING means:
- *              Our success is sufficient, do not continue testing
- *              other methods.
- * CONTINUE_TESTING means:
- *                  We will continue and test the next allowed
- *                  specified method.
- */
-#define CERT_REV_M_STOP_TESTING_ON_FRESH_INFO 0UL
-#define CERT_REV_M_CONTINUE_TESTING_ON_FRESH_INFO 32UL
-
-/* When this flag is used, libpkix will never attempt to use the GET HTTP
- * method for OCSP requests; it will always use POST.
- */
-#define CERT_REV_M_FORCE_POST_METHOD_FOR_OCSP 64UL
-
-/*
- * The following flags are supposed to be used to control bits in
- *     CERTRevocationTests.cert_rev_method_independent_flags
- * All Flags are prefixed by CERT_REV_M_, where _M_ indicates
- * this is a method independent flag.
- */
-
-/*
- * This defines the order to checking.
- * EACH_METHOD_SEPARATELY means:
- *      Do all tests related to a particular allowed method
- *      (both local information and network fetching) in a single step.
- *      Only after testing for a particular method is done,
- *      then switching to the next method will happen.
- * ALL_LOCAL_INFORMATION_FIRST means:
- *      Start by testing the information for all allowed methods
- *      which are already locally available. Only after that is done
- *      consider to fetch from the network (as allowed by other flags).
- */
-#define CERT_REV_MI_TEST_EACH_METHOD_SEPARATELY 0UL
-#define CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST 1UL
-
-/*
- * Use this flag to specify that it's necessary that fresh information
- * is available for at least one of the allowed methods, but it's
- * irrelevant which of the mechanisms succeeded.
- * NO_OVERALL_INFO_REQUIREMENT means:
- *     We strictly follow the requirements for each individual method.
- * REQUIRE_SOME_FRESH_INFO_AVAILABLE means:
- *     After the individual tests have been executed, we must have
- *     been able to find fresh information using at least one method.
- *     If we were unable to find fresh info, it's a failure.
- *     This setting overrides the CERT_REV_M_FAIL_ON_MISSING_FRESH_INFO
- *     flag on all methods.
- */
-#define CERT_REV_MI_NO_OVERALL_INFO_REQUIREMENT 0UL
-#define CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE 2UL
-
-typedef struct {
-    /*
-     * The size of the array that cert_rev_flags_per_method points to,
-     * meaning, the number of methods that are known and defined
-     * by the caller.
-     */
-    PRUint32 number_of_defined_methods;
-
-    /*
-     * A pointer to an array of integers.
-     * Each integer defines revocation checking for a single method,
-     *      by having individual CERT_REV_M_* bits set or not set.
-     * The meaning of index numbers into this array are defined by
-     *     enum CERTRevocationMethodIndex
-     * The size of the array must be specified by the caller in the separate
-     *     variable number_of_defined_methods.
-     * The size of the array may be smaller than
-     *     cert_revocation_method_count, it can happen if a caller
-     *     is not yet aware of the latest revocation methods
-     *     (or does not want to use them).
-     */
-    PRUint64 *cert_rev_flags_per_method;
-
-    /*
-     * How many preferred methods are specified?
-     * This is equivalent to the size of the array that
-     *      preferred_methods points to.
-     * It's allowed to set this value to zero,
-     *      then NSS will decide which methods to prefer.
-     */
-    PRUint32 number_of_preferred_methods;
-
-    /* Array that may specify an optional order of preferred methods.
-     * Each array entry shall contain a method identifier as defined
-     *   by CERTRevocationMethodIndex.
-     * The entry at index [0] specifies the method with highest preference.
-     * These methods will be tested first for locally available information.
-     * Methods allowed for downloading will be attempted in the same order.
-     */
-    CERTRevocationMethodIndex *preferred_methods;
-
-    /*
-     * An integer which defines certain aspects of revocation checking
-     * (independent of individual methods) by having individual
-     * CERT_REV_MI_* bits set or not set.
-     */
-    PRUint64 cert_rev_method_independent_flags;
-} CERTRevocationTests;
-
-typedef struct {
-    CERTRevocationTests leafTests;
-    CERTRevocationTests chainTests;
-} CERTRevocationFlags;
-
-typedef struct CERTValParamInValueStr {
-    union {
-        PRBool b;
-        PRInt32 i;
-        PRUint32 ui;
-        PRInt64 l;
-        PRUint64 ul;
-        PRTime time;
-    } scalar;
-    union {
-        const void *p;
-        const char *s;
-        const CERTCertificate *cert;
-        const CERTCertList *chain;
-        const CERTRevocationFlags *revocation;
-        const CERTChainVerifyCallback *chainVerifyCallback;
-    } pointer;
-    union {
-        const PRInt32 *pi;
-        const PRUint32 *pui;
-        const PRInt64 *pl;
-        const PRUint64 *pul;
-        const SECOidTag *oids;
-    } array;
-    int arraySize;
-} CERTValParamInValue;
-
-typedef struct CERTValParamOutValueStr {
-    union {
-        PRBool b;
-        PRInt32 i;
-        PRUint32 ui;
-        PRInt64 l;
-        PRUint64 ul;
-        SECCertificateUsage usages;
-    } scalar;
-    union {
-        void *p;
-        char *s;
-        CERTVerifyLog *log;
-        CERTCertificate *cert;
-        CERTCertList *chain;
-    } pointer;
-    union {
-        void *p;
-        SECOidTag *oids;
-    } array;
-    int arraySize;
-} CERTValParamOutValue;
-
-typedef struct {
-    CERTValParamInType type;
-    CERTValParamInValue value;
-} CERTValInParam;
-
-typedef struct {
-    CERTValParamOutType type;
-    CERTValParamOutValue value;
-} CERTValOutParam;
-
-/*
- * Levels of standards conformance strictness for CERT_NameToAsciiInvertible
- */
-typedef enum CertStrictnessLevels {
-    CERT_N2A_READABLE = 0,   /* maximum human readability */
-    CERT_N2A_STRICT = 10,    /* strict RFC compliance    */
-    CERT_N2A_INVERTIBLE = 20 /* maximum invertibility,
-                                all DirectoryStrings encoded in hex */
-} CertStrictnessLevel;
-
-/*
- * policy flag defines
- */
-#define CERT_POLICY_FLAG_NO_MAPPING 1
-#define CERT_POLICY_FLAG_EXPLICIT 2
-#define CERT_POLICY_FLAG_NO_ANY 4
-
-/*
- * CertStore flags
- */
-#define CERT_ENABLE_LDAP_FETCH 1
-#define CERT_ENABLE_HTTP_FETCH 2
-
-/* This functin pointer type may be used for any function that takes
- * a CERTCertificate * and returns an allocated string, which must be
- * freed by a call to PORT_Free.
- */
-typedef char *(*CERT_StringFromCertFcn)(CERTCertificate *cert);
-
-/* XXX Lisa thinks the template declarations belong in cert.h, not here? */
-
-#include "secasn1t.h" /* way down here because I expect template stuff to
-                       * move out of here anyway */
-
-SEC_BEGIN_PROTOS
-
-extern const SEC_ASN1Template CERT_CertificateRequestTemplate[];
-extern const SEC_ASN1Template CERT_CertificateTemplate[];
-extern const SEC_ASN1Template SEC_SignedCertificateTemplate[];
-extern const SEC_ASN1Template CERT_CertExtensionTemplate[];
-extern const SEC_ASN1Template CERT_SequenceOfCertExtensionTemplate[];
-extern const SEC_ASN1Template SECKEY_PublicKeyTemplate[];
-extern const SEC_ASN1Template CERT_SubjectPublicKeyInfoTemplate[];
-extern const SEC_ASN1Template CERT_TimeChoiceTemplate[];
-extern const SEC_ASN1Template CERT_ValidityTemplate[];
-extern const SEC_ASN1Template CERT_PublicKeyAndChallengeTemplate[];
-extern const SEC_ASN1Template SEC_CertSequenceTemplate[];
-
-extern const SEC_ASN1Template CERT_IssuerAndSNTemplate[];
-extern const SEC_ASN1Template CERT_NameTemplate[];
-extern const SEC_ASN1Template CERT_SetOfSignedCrlTemplate[];
-extern const SEC_ASN1Template CERT_RDNTemplate[];
-extern const SEC_ASN1Template CERT_SignedDataTemplate[];
-extern const SEC_ASN1Template CERT_CrlTemplate[];
-extern const SEC_ASN1Template CERT_SignedCrlTemplate[];
-
-/*
-** XXX should the attribute stuff be centralized for all of ns/security?
-*/
-extern const SEC_ASN1Template CERT_AttributeTemplate[];
-extern const SEC_ASN1Template CERT_SetOfAttributeTemplate[];
-
-/* These functions simply return the address of the above-declared templates.
-** This is necessary for Windows DLLs.  Sigh.
-*/
-SEC_ASN1_CHOOSER_DECLARE(CERT_CertificateRequestTemplate)
-SEC_ASN1_CHOOSER_DECLARE(CERT_CertificateTemplate)
-SEC_ASN1_CHOOSER_DECLARE(CERT_CrlTemplate)
-SEC_ASN1_CHOOSER_DECLARE(CERT_IssuerAndSNTemplate)
-SEC_ASN1_CHOOSER_DECLARE(CERT_NameTemplate)
-SEC_ASN1_CHOOSER_DECLARE(CERT_SequenceOfCertExtensionTemplate)
-SEC_ASN1_CHOOSER_DECLARE(CERT_SetOfSignedCrlTemplate)
-SEC_ASN1_CHOOSER_DECLARE(CERT_SignedDataTemplate)
-SEC_ASN1_CHOOSER_DECLARE(CERT_SubjectPublicKeyInfoTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_SignedCertificateTemplate)
-SEC_ASN1_CHOOSER_DECLARE(CERT_SignedCrlTemplate)
-SEC_ASN1_CHOOSER_DECLARE(CERT_TimeChoiceTemplate)
-
-SEC_END_PROTOS
-
-#endif /* _CERTT_H_ */
diff --git a/openflow/usr/include/nss/ciferfam.h b/openflow/usr/include/nss/ciferfam.h
deleted file mode 100644
index 559e92f..0000000
--- a/openflow/usr/include/nss/ciferfam.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * ciferfam.h - cipher familie IDs used for configuring ciphers for export
- *              control
- */
-
-#ifndef _CIFERFAM_H_
-#define _CIFERFAM_H_
-
-#include "utilrename.h"
-/* Cipher Suite "Families" */
-#define CIPHER_FAMILY_PKCS12 "PKCS12"
-#define CIPHER_FAMILY_SMIME "SMIME"
-#define CIPHER_FAMILY_SSL2 "SSLv2" /* deprecated */
-#define CIPHER_FAMILY_SSL3 "SSLv3"
-#define CIPHER_FAMILY_SSL "SSL"
-#define CIPHER_FAMILY_ALL ""
-#define CIPHER_FAMILY_UNKNOWN "UNKNOWN"
-
-#define CIPHER_FAMILYID_MASK 0xFFFF0000L
-#define CIPHER_FAMILYID_SSL 0x00000000L
-#define CIPHER_FAMILYID_SMIME 0x00010000L
-#define CIPHER_FAMILYID_PKCS12 0x00020000L
-
-/* SMIME "Cipher Suites" */
-/*
- * Note that it is assumed that the cipher number itself can be used
- * as a bit position in a mask, and that mask is currently 32 bits wide.
- * So, if you want to add a cipher that is greater than 0037, secmime.c
- * needs to be made smarter at the same time.
- */
-#define SMIME_RC2_CBC_40 (CIPHER_FAMILYID_SMIME | 0001)
-#define SMIME_RC2_CBC_64 (CIPHER_FAMILYID_SMIME | 0002)
-#define SMIME_RC2_CBC_128 (CIPHER_FAMILYID_SMIME | 0003)
-#define SMIME_DES_CBC_56 (CIPHER_FAMILYID_SMIME | 0011)
-#define SMIME_DES_EDE3_168 (CIPHER_FAMILYID_SMIME | 0012)
-#define SMIME_AES_CBC_128 (CIPHER_FAMILYID_SMIME | 0013)
-#define SMIME_AES_CBC_256 (CIPHER_FAMILYID_SMIME | 0014)
-#define SMIME_RC5PAD_64_16_40 (CIPHER_FAMILYID_SMIME | 0021)
-#define SMIME_RC5PAD_64_16_64 (CIPHER_FAMILYID_SMIME | 0022)
-#define SMIME_RC5PAD_64_16_128 (CIPHER_FAMILYID_SMIME | 0023)
-#define SMIME_FORTEZZA (CIPHER_FAMILYID_SMIME | 0031)
-
-/* PKCS12 "Cipher Suites" */
-
-#define PKCS12_RC2_CBC_40 (CIPHER_FAMILYID_PKCS12 | 0001)
-#define PKCS12_RC2_CBC_128 (CIPHER_FAMILYID_PKCS12 | 0002)
-#define PKCS12_RC4_40 (CIPHER_FAMILYID_PKCS12 | 0011)
-#define PKCS12_RC4_128 (CIPHER_FAMILYID_PKCS12 | 0012)
-#define PKCS12_DES_56 (CIPHER_FAMILYID_PKCS12 | 0021)
-#define PKCS12_DES_EDE3_168 (CIPHER_FAMILYID_PKCS12 | 0022)
-
-/* SMIME version numbers are negative, to avoid colliding with SSL versions */
-#define SMIME_LIBRARY_VERSION_1_0 -0x0100
-
-#endif /* _CIFERFAM_H_ */
diff --git a/openflow/usr/include/nss/cmmf.h b/openflow/usr/include/nss/cmmf.h
deleted file mode 100644
index 1e39a8d..0000000
--- a/openflow/usr/include/nss/cmmf.h
+++ /dev/null
@@ -1,1082 +0,0 @@
-/* -*- Mode: C; tab-width: 8 -*-*/
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _CMMF_H_
-#define _CMMF_H_
-/*
- * These are the functions exported by the security library for
- * implementing Certificate Management Message Formats (CMMF).
- *
- * This API is designed against July 1998 CMMF draft.  Please read this
- * draft before trying to use this API in an application that use CMMF.
- */
-#include "seccomon.h"
-#include "cmmft.h"
-#include "crmf.h"
-
-SEC_BEGIN_PROTOS
-
-/******************* Creation Functions *************************/
-
-/*
- * FUNCTION: CMMF_CreateCertRepContent
- * INPUTS:
- *    NONE
- * NOTES:
- *    This function will create an empty CMMFCertRepContent Structure.
- *    The client of the library must set the CMMFCertResponses.
- *    Call CMMF_CertRepContentSetCertResponse to accomplish this task.
- *    If the client of the library also wants to include the chain of
- *    CA certs required to make the certificates in CMMFCertResponse valid,
- *    then the user must also set the caPubs field of CMMFCertRepContent.
- *    Call CMMF_CertRepContentSetCAPubs to accomplish this.  After setting
- *    the desired fields, the user can then call CMMF_EncodeCertRepContent
- *    to DER-encode the CertRepContent.
- * RETURN:
- *    A pointer to the CMMFCertRepContent.  A NULL return value indicates
- *    an error in allocating memory or failure to initialize the structure.
- */
-extern CMMFCertRepContent *CMMF_CreateCertRepContent(void);
-
-/*
- * FUNCTION: CMMF_CreateCertRepContentFromDER
- * INPUTS
- *    db
- *        The certificate database where the certificates will be placed.
- *        The certificates will be placed in the temporary database associated
- *        with the handle.
- *    buf
- *        A buffer to the DER-encoded CMMFCertRepContent
- *    len
- *        The length in bytes of the buffer 'buf'
- * NOTES:
- *    This function passes the buffer to the ASN1 decoder and creates a
- *    CMMFCertRepContent structure.  The user must call
- *    CMMF_DestroyCertRepContent after the return value is no longer needed.
- *
- * RETURN:
- *    A pointer to the CMMFCertRepContent structure.  A NULL return
- *    value indicates the library was unable to parse the DER.
- */
-extern CMMFCertRepContent *
-CMMF_CreateCertRepContentFromDER(CERTCertDBHandle *db,
-                                 const char *buf,
-                                 long len);
-
-/*
- * FUNCTION: CMMF_CreateCertResponse
- * INPUTS:
- *    inCertReqId
- *        The Certificate Request Id this response is for.
- * NOTES:
- *    This creates a CMMFCertResponse.  This response should correspond
- *    to a request that was received via CRMF.  From the CRMF message you
- *    can get the Request Id to pass in as inCertReqId, in essence binding
- *    a CMRFCertRequest message to the CMMFCertResponse created by this
- *    function.  If no requuest id is associated with the response to create
- *    then the user should pass in -1 for 'inCertReqId'.
- *
- * RETURN:
- *    A pointer to the new CMMFCertResponse corresponding to the request id
- *    passed in.  A NULL return value indicates an error while trying to
- *    create the CMMFCertResponse.
- */
-extern CMMFCertResponse *CMMF_CreateCertResponse(long inCertReqId);
-
-/*
- * FUNCTION: CMMF_CreateKeyRecRepContent
- * INPUTS:
- *    NONE
- * NOTES:
- *    This function creates a new empty CMMFKeyRecRepContent structure.
- *    At the very minimum, the user  must call
- *    CMMF_KeyRecRepContentSetPKIStatusInfoStatus field to have an
- *    encodable structure.  Depending on what the response is, the user may
- *    have to set other fields as well to properly build up the structure so
- *    that it can be encoded.  Refer to the CMMF draft for how to properly
- *    set up a CMMFKeyRecRepContent. This is the structure that an RA returns
- *    to an end entity when doing key recovery.
-
- *    The user must call CMMF_DestroyKeyRecRepContent when the return value
- *    is no longer needed.
- * RETURN:
- *    A pointer to the empty CMMFKeyRecRepContent.  A return value of NULL
- *    indicates an error in allocating memory or initializing the structure.
- */
-extern CMMFKeyRecRepContent *CMMF_CreateKeyRecRepContent(void);
-
-/*
- * FUNCTION: CMMF_CreateKeyRecRepContentFromDER
- * INPUTS:
- *    db
- *        The handle for the certificate database where the decoded
- *        certificates will be placed.  The decoded certificates will
- *        be placed in the temporary database associated with the
- *        handle.
- *    buf
- *        A buffer contatining the DER-encoded CMMFKeyRecRepContent
- *    len
- *        The length in bytes of the buffer 'buf'
- * NOTES
- *    This function passes the buffer to the ASN1 decoder and creates a
- *    CMMFKeyRecRepContent structure.
- *
- * RETURN:
- *    A pointer to the CMMFKeyRecRepContent structure.  A NULL return
- *    value indicates the library was unable to parse the DER.
- */
-extern CMMFKeyRecRepContent *
-CMMF_CreateKeyRecRepContentFromDER(CERTCertDBHandle *db,
-                                   const char *buf,
-                                   long len);
-
-/*
- * FUNCTION: CMMF_CreatePOPODecKeyChallContent
- * INPUTS:
- *    NONE
- * NOTES:
- *    This function creates an empty CMMFPOPODecKeyChallContent.  The user
- *    must add the challenges individually specifying the random number to
- *    be used and the public key to be used when creating each individual
- *    challenge.  User can accomplish this by calling the function
- *    CMMF_POPODecKeyChallContentSetNextChallenge.
- * RETURN:
- *    A pointer to a CMMFPOPODecKeyChallContent structure.  Ther user can
- *    then call CMMF_EncodePOPODecKeyChallContent passing in the return
- *    value from this function after setting all of the challenges.  A
- *    return value of NULL indicates an error while creating the
- *    CMMFPOPODecKeyChallContent structure.
- */
-extern CMMFPOPODecKeyChallContent *
-CMMF_CreatePOPODecKeyChallContent(void);
-
-/*
- * FUNCTION: CMMF_CreatePOPODecKeyChallContentFromDER
- * INPUTS
- *    buf
- *        A buffer containing the DER-encoded CMMFPOPODecKeyChallContent
- *    len
- *        The length in bytes of the buffer 'buf'
- * NOTES:
- *    This function passes the buffer to the ASN1 decoder and creates a
- *    CMMFPOPODecKeyChallContent structure.
- *
- * RETURN:
- *    A pointer to the CMMFPOPODecKeyChallContent structure.  A NULL return
- *    value indicates the library was unable to parse the DER.
- */
-extern CMMFPOPODecKeyChallContent *
-CMMF_CreatePOPODecKeyChallContentFromDER(const char *buf, long len);
-
-/*
- * FUNCTION: CMMF_CreatePOPODecKeyRespContentFromDER
- * INPUTS:
- *    buf
- *        A buffer contatining the DER-encoded CMMFPOPODecKeyRespContent
- *    len
- *        The length in bytes of the buffer 'buf'
- * NOTES
- *    This function passes the buffer to the ASN1 decoder and creates a
- *    CMMFPOPODecKeyRespContent structure.
- *
- * RETURN:
- *    A pointer to the CMMFPOPODecKeyRespContent structure.  A NULL return
- *    value indicates the library was unable to parse the DER.
- */
-extern CMMFPOPODecKeyRespContent *
-CMMF_CreatePOPODecKeyRespContentFromDER(const char *buf, long len);
-
-/************************** Set Functions *************************/
-
-/*
- * FUNCTION: CMMF_CertRepContentSetCertResponses
- * INPUTS:
- *    inCertRepContent
- *        The CMMFCertRepContent to operate on.
- *    inCertResponses
- *        An array of pointers to CMMFCertResponse structures to
- *        add to the CMMFCertRepContent structure.
- *    inNumResponses
- *        The length of the array 'inCertResponses'
- * NOTES:
- *    This function will add the CMMFCertResponse structure to the
- *    CMMFCertRepContent passed in.  The CMMFCertResponse field of
- *    CMMFCertRepContent is required, so the client must call this function
- *    before calling CMMF_EncodeCertRepContent.  If the user calls
- *    CMMF_EncodeCertRepContent before calling this function,
- *    CMMF_EncodeCertRepContent will fail.
- *
- * RETURN:
- *    SECSuccess if adding the CMMFCertResponses to the CMMFCertRepContent
- *    structure was successful.  Any other return value indicates an error
- *    while trying to add the CMMFCertResponses.
- */
-extern SECStatus
-CMMF_CertRepContentSetCertResponses(CMMFCertRepContent *inCertRepContent,
-                                    CMMFCertResponse **inCertResponses,
-                                    int inNumResponses);
-
-/*
- * FUNCTION: CMMF_CertRepContentSetCAPubs
- * INPUTS:
- *    inCertRepContent
- *        The CMMFCertRepContent to operate on.
- *    inCAPubs
- *        The certificate list which makes up the chain of CA certificates
- *        required to make the issued cert valid.
- * NOTES:
- *    This function will set the the certificates in the CA chain as part
- *    of the CMMFCertRepContent.  This field is an optional member of the
- *    CMMFCertRepContent structure, so the client is not required to call
- *    this function before calling CMMF_EncodeCertRepContent.
- *
- * RETURN:
- *    SECSuccess if adding the 'inCAPubs' to the CERTRepContent was successful.
- *    Any other return value indicates an error while adding 'inCAPubs' to the
- *    CMMFCertRepContent structure.
- *
- */
-extern SECStatus
-CMMF_CertRepContentSetCAPubs(CMMFCertRepContent *inCertRepContent,
-                             CERTCertList *inCAPubs);
-
-/*
- * FUNCTION: CMMF_CertResponseSetPKIStatusInfoStatus
- * INPUTS:
- *    inCertResp
- *        The CMMFCertResponse to operate on.
- *     inPKIStatus
- *        The value to set for the PKIStatusInfo.status field.
- * NOTES:
- *    This function will set the CertResponse.status.status field of
- *    the CMMFCertResponse structure.  (View the definition of CertResponse
- *    in the CMMF draft to see exactly which value this talks about.)  This
- *    field is a required member of the structure, so the user must call this
- *    function in order to have a CMMFCertResponse that can be encoded.
- *
- * RETURN:
- *    SECSuccess if setting the field with the passed in value was successful.
- *    Any other return value indicates an error while trying to set the field.
- */
-extern SECStatus
-CMMF_CertResponseSetPKIStatusInfoStatus(CMMFCertResponse *inCertResp,
-                                        CMMFPKIStatus inPKIStatus);
-
-/*
- * FUNCTION: CMMF_CertResponseSetCertificate
- * INPUTS:
- *    inCertResp
- *        The CMMFCertResponse to operate on.
- *    inCertificate
- *        The certificate to add to the
- *        CertResponse.CertifiedKeyPair.certOrEncCert.certificate field.
- * NOTES:
- *    This function will take the certificate and make it a member of the
- *    CMMFCertResponse.  The certificate should be the actual certificate
- *    being issued via the response.
- *
- * RETURN:
- *    SECSuccess if adding the certificate to the response was successful.
- *    Any other return value indicates an error in adding the certificate to
- *    the CertResponse.
- */
-extern SECStatus
-CMMF_CertResponseSetCertificate(CMMFCertResponse *inCertResp,
-                                CERTCertificate *inCertificate);
-
-/*
- * FUNCTION: CMMF_KeyRecRepContentSetPKIStatusInfoStatus
- * INPUTS:
- *    inKeyRecRep
- *        The CMMFKeyRecRepContent to operate on.
- *    inPKIStatus
- *        The value to set the PKIStatusInfo.status field to.
- * NOTES:
- *    This function sets the only required field for the KeyRecRepContent.
- *    In most cases, the user will set this field and other fields of the
- *    structure to properly create the CMMFKeyRecRepContent structure.
- *    Refer to the CMMF draft to see which fields need to be set in order
- *    to create the desired CMMFKeyRecRepContent.
- *
- * RETURN:
- *    SECSuccess if setting the PKIStatusInfo.status field was successful.
- *    Any other return value indicates an error in setting the field.
- */
-extern SECStatus
-CMMF_KeyRecRepContentSetPKIStatusInfoStatus(CMMFKeyRecRepContent *inKeyRecRep,
-                                            CMMFPKIStatus inPKIStatus);
-
-/*
- * FUNCTION: CMMF_KeyRecRepContentSetNewSignCert
- * INPUTS:
- *    inKeyRecRep
- *        The CMMFKeyRecRepContent to operate on.
- *    inNewSignCert
- *        The new signing cert to add to the CMMFKeyRecRepContent structure.
- * NOTES:
- *    This function sets the new signeing cert in the CMMFKeyRecRepContent
- *    structure.
- *
- * RETURN:
- *    SECSuccess if setting the new signing cert was successful.  Any other
- *    return value indicates an error occurred while trying to add the
- *    new signing certificate.
- */
-extern SECStatus
-CMMF_KeyRecRepContentSetNewSignCert(CMMFKeyRecRepContent *inKeyRecRep,
-                                    CERTCertificate *inNewSignCert);
-
-/*
- * FUNCTION: CMMF_KeyRecRepContentSetCACerts
- * INPUTS:
- *    inKeyRecRep
- *        The CMMFKeyRecRepContent to operate on.
- *    inCACerts
- *        The list of CA certificates required to construct a valid
- *        certificate chain with the certificates that will be returned
- *        to the end user via this KeyRecRepContent.
- * NOTES:
- *    This function sets the caCerts that are required to form a chain with the
- *    end entity certificates that are being re-issued in this
- *    CMMFKeyRecRepContent structure.
- *
- * RETURN:
- *    SECSuccess if adding the caCerts was successful.  Any other return value
- *    indicates an error while tring to add the caCerts.
- */
-extern SECStatus
-CMMF_KeyRecRepContentSetCACerts(CMMFKeyRecRepContent *inKeyRecRep,
-                                CERTCertList *inCACerts);
-
-/*
- * FUNCTION: CMMF_KeyRecRepContentSetCertifiedKeyPair
- * INPUTS:
- *    inKeyRecRep
- *        The CMMFKeyRecRepContent to operate on.
- *    inCert
- *        The certificate to add to the CMMFKeyRecRepContent structure.
- *    inPrivKey
- *        The private key associated with the certificate above passed in.
- *    inPubKey
- *        The public key to use for wrapping the private key.
- * NOTES:
- *    This function adds another certificate-key pair to the
- *    CMMFKeyRecRepcontent structure.  There may be more than one
- *    certificate-key pair in the structure, so the user must call this
- *    function multiple times to add more than one cert-key pair.
- *
- * RETURN:
- *    SECSuccess if adding the certified key pair was successful.  Any other
- *    return value indicates an error in adding certified key pair to
- *    CMMFKeyRecRepContent structure.
- */
-extern SECStatus
-CMMF_KeyRecRepContentSetCertifiedKeyPair(CMMFKeyRecRepContent *inKeyRecRep,
-                                         CERTCertificate *inCert,
-                                         SECKEYPrivateKey *inPrivKey,
-                                         SECKEYPublicKey *inPubKey);
-
-/*
- * FUNCTION: CMMF_POPODecKeyChallContentSetNextChallenge
- * INPUTS:
- *    inDecKeyChall
- *        The CMMFPOPODecKeyChallContent to operate on.
- *    inRandom
- *        The random number to use when generating the challenge,
- *    inSender
- *        The GeneralName representation of the sender of the challenge.
- *    inPubKey
- *        The public key to use when encrypting the challenge.
- *    passwdArg
- *        This value will be passed to the function used for getting a
- *        password.  The password for getting a password should be registered
- *        by calling PK11_SetPasswordFunc before this function is called.
- *        If no password callback is registered and the library needs to
- *        authenticate to the slot for any reason, this function will fail.
- * NOTES:
- *    This function adds a challenge to the end of the list of challenges
- *    contained by 'inDecKeyChall'.  Refer to the CMMF draft on how the
- *    the random number passed in and the sender's GeneralName are used
- *    to generate the challenge and witness fields of the challenge.  This
- *    library will use SHA1 as the one-way function for generating the
- *    witess field of the challenge.
- *
- * RETURN:
- *    SECSuccess if generating the challenge and adding to the end of list
- *    of challenges was successful.  Any other return value indicates an error
- *    while trying to generate the challenge.
- */
-extern SECStatus
-CMMF_POPODecKeyChallContentSetNextChallenge(CMMFPOPODecKeyChallContent *inDecKeyChall,
-                                            long inRandom,
-                                            CERTGeneralName *inSender,
-                                            SECKEYPublicKey *inPubKey,
-                                            void *passwdArg);
-
-/************************** Encoding Functions *************************/
-
-/*
- * FUNCTION: CMMF_EncodeCertRepContent
- * INPUTS:
- *    inCertRepContent
- *        The CMMFCertRepContent to DER-encode.
- *    inCallback
- *        A callback function that the ASN1 encoder will call whenever it
- *        wants to write out DER-encoded bytes.  Look at the defintion of
- *        CRMFEncoderOutputCallback in crmft.h for a description of the
- *        parameters to the function.
- *    inArg
- *        An opaque pointer to a user-supplied argument that will be passed
- *        to the callback funtion whenever the function is called.
- * NOTES:
- *    The CMMF library will use the same DER-encoding scheme as the CRMF
- *    library.  In other words, when reading CRMF comments that pertain to
- *    encoding, those comments apply to the CMMF libray as well.
- *    The callback function will be called multiple times, each time supplying
- *    the next chunk of DER-encoded bytes.  The user must concatenate the
- *    output of each successive call to the callback in order to get the
- *    entire DER-encoded CMMFCertRepContent structure.
- *
- * RETURN:
- *    SECSuccess if encoding the CMMFCertRepContent was successful.  Any
- *    other return value indicates an error while decoding the structure.
- */
-extern SECStatus
-CMMF_EncodeCertRepContent(CMMFCertRepContent *inCertRepContent,
-                          CRMFEncoderOutputCallback inCallback,
-                          void *inArg);
-
-/*
- * FUNCTION: CMMF_EncodeKeyRecRepContent
- * INPUTS:
- *    inKeyRecRep
- *        The CMMFKeyRepContent to DER-encode.
- *    inCallback
- *        A callback function that the ASN1 encoder will call whenever it
- *        wants to write out DER-encoded bytes.  Look at the defintion of
- *        CRMFEncoderOutputCallback in crmft.h for a description of the
- *        parameters to the function.
- *    inArg
- *        An opaque pointer to a user-supplied argument that will be passed
- *        to the callback funtion whenever the function is called.
- * NOTES:
- *    The CMMF library will use the same DER-encoding scheme as the CRMF
- *    library.  In other words, when reading CRMF comments that pertain to
- *    encoding, those comments apply to the CMMF libray as well.
- *    The callback function will be called multiple times, each time supplying
- *    the next chunk of DER-encoded bytes.  The user must concatenate the
- *    output of each successive call to the callback in order to get the
- *    entire DER-encoded CMMFCertRepContent structure.
- *
- * RETURN:
- *    SECSuccess if encoding the CMMFKeyRecRepContent was successful.  Any
- *    other return value indicates an error while decoding the structure.
- */
-extern SECStatus
-CMMF_EncodeKeyRecRepContent(CMMFKeyRecRepContent *inKeyRecRep,
-                            CRMFEncoderOutputCallback inCallback,
-                            void *inArg);
-
-/*
- * FUNCTION: CMMF_EncodePOPODecKeyChallContent
- * INPUTS:
- *    inDecKeyChall
- *        The CMMFDecKeyChallContent to operate on.
- *    inCallback
- *        A callback function that the ASN1 encoder will call whenever it
- *        wants to write out DER-encoded bytes.  Look at the defintion of
- *        CRMFEncoderOutputCallback in crmft.h for a description of the
- *        parameters to the function.
- *    inArg
- *        An opaque pointer to a user-supplied argument that will be passed
- *        to the callback function whenever the function is called.
- * NOTES:
- *    The CMMF library will use the same DER-encoding scheme as the CRMF
- *    library.  In other words, when reading CRMF comments that pertain to
- *    encoding, those comments apply to the CMMF libray as well.
- *    The callback function will be called multiple times, each time supplying
- *    the next chunk of DER-encoded bytes.  The user must concatenate the
- *    output of each successive call to the callback in order to get the
- *    entire DER-encoded CMMFCertRepContent structure.
- *    The DER will be an encoding of the type POPODecKeyChallContents, which
- *    is just a sequence of challenges.
- *
- * RETURN:
- *    SECSuccess if encoding was successful.  Any other return value indicates
- *    an error in trying to encode the Challenges.
- */
-extern SECStatus
-CMMF_EncodePOPODecKeyChallContent(CMMFPOPODecKeyChallContent *inDecKeyChall,
-                                  CRMFEncoderOutputCallback inCallback,
-                                  void *inArg);
-
-/*
- * FUNCTION: CMMF_EncodePOPODecKeyRespContent
- * INPUTS:
- *    inDecodedRand
- *        An array of integers to encode as the responses to
- *        CMMFPOPODecKeyChallContent.  The integers must be in the same order
- *        as the challenges extracted from CMMFPOPODecKeyChallContent.
- *    inNumRand
- *        The number of random integers contained in the array 'inDecodedRand'
- *    inCallback
- *        A callback function that the ASN1 encoder will call whenever it
- *        wants to write out DER-encoded bytes.  Look at the defintion of
- *        CRMFEncoderOutputCallback in crmft.h for a description of the
- *        parameters to the function.
- *    inArg
- *        An opaque pointer to a user-supplied argument that will be passed
- *        to the callback funtion whenever the function is called.
- * NOTES:
- *    The CMMF library will use the same DER-encoding scheme as the CRMF
- *    library.  In other words, when reading CRMF comments that pertain to
- *    encoding, those comments apply to the CMMF libray as well.
- *    The callback function will be called multiple times, each time supplying
- *    the next chunk of DER-encoded bytes.  The user must concatenate the
- *    output of each successive call to the callback in order to get the
- *    entire DER-encoded  POPODecKeyRespContent.
- *
- * RETURN:
- *    SECSuccess if encoding was successful.  Any other return value indicates
- *    an error in trying to encode the Challenges.
- */
-extern SECStatus
-CMMF_EncodePOPODecKeyRespContent(long *inDecodedRand,
-                                 int inNumRand,
-                                 CRMFEncoderOutputCallback inCallback,
-                                 void *inArg);
-
-/***************  Accessor function  ***********************************/
-
-/*
- * FUNCTION: CMMF_CertRepContentGetCAPubs
- * INPUTS:
- *    inCertRepContent
- *        The CMMFCertRepContent to extract the caPubs from.
- * NOTES:
- *    This function will return a copy of the list of certificates that
- *    make up the chain of CA's required to make the cert issued valid.
- *    The user must call CERT_DestroyCertList on the return value when
- *    done using the return value.
- *
- *    Only call this function on a CertRepContent that has been decoded.
- *    The client must call CERT_DestroyCertList when the certificate list
- *    is no longer needed.
- *
- *    The certs in the list will not be in the temporary database.  In order
- *    to make these certificates a part of the permanent CA internal database,
- *    the user must collect the der for all of these certs and call
- *    CERT_ImportCAChain.  Afterwards the certs will be part of the permanent
- *    database.
- *
- * RETURN:
- *    A pointer to the CERTCertList representing the CA chain associated
- *    with the issued cert.  A NULL return value indicates  that no CA Pubs
- *    were available in the CMMFCertRepContent structure.
- */
-extern CERTCertList *
-CMMF_CertRepContentGetCAPubs(CMMFCertRepContent *inCertRepContent);
-
-/*
- * FUNCTION: CMMF_CertRepContentGetNumResponses
- * INPUTS:
- *    inCertRepContent
- *        The CMMFCertRepContent to operate on.
- * NOTES:
- *    This function will return the number of CertResponses that are contained
- *    by the CMMFCertRepContent passed in.
- *
- * RETURN:
- *    The number of CMMFCertResponses contained in the structure passed in.
- */
-extern int
-CMMF_CertRepContentGetNumResponses(CMMFCertRepContent *inCertRepContent);
-
-/*
- * FUNCTION: CMMF_CertRepContentGetResponseAtIndex
- * INPUTS:
- *    inCertRepContent
- *        The CMMFCertRepContent to operate on.
- *    inIndex
- *        The index of the CMMFCertResponse the user wants a copy of.
- * NOTES:
- *    This function creates a copy of the CMMFCertResponse at the index
- *    corresponding to the parameter 'inIndex'.  Indexing is done like a
- *    traditional C array, ie the valid indexes are (0...numResponses-1).
- *    The user must call CMMF_DestroyCertResponse after the return value is
- *    no longer needed.
- *
- * RETURN:
- *    A pointer to the CMMFCertResponse at the index corresponding to
- *    'inIndex'.  A return value of NULL indicates an error in copying
- *    the CMMFCertResponse.
- */
-extern CMMFCertResponse *
-CMMF_CertRepContentGetResponseAtIndex(CMMFCertRepContent *inCertRepContent,
-                                      int inIndex);
-
-/*
- * FUNCTION: CMMF_CertResponseGetCertReqId
- * INPUTS:
- *    inCertResp
- *        The CMMFCertResponse to operate on.
- * NOTES:
- *    This function returns the CertResponse.certReqId from the
- *    CMMFCertResponse structure passed in.  If the return value is -1, that
- *    means there is no associated certificate request with the CertResponse.
- * RETURN:
- *    A long representing the id of the certificate request this
- *    CMMFCertResponse corresponds to.  A return value of -1 indicates an
- *    error in extracting the value of the integer.
- */
-extern long CMMF_CertResponseGetCertReqId(CMMFCertResponse *inCertResp);
-
-/*
- * FUNCTION: CMMF_CertResponseGetPKIStatusInfoStatus
- * INPUTS:
- *    inCertResp
- *        The CMMFCertResponse to operate on.
- * NOTES:
- *    This function returns the CertResponse.status.status field of the
- *    CMMFCertResponse structure.
- *
- * RETURN:
- *    The enumerated value corresponding to the PKIStatus defined in the CMMF
- *    draft.  See the CMMF draft for the definition of PKIStatus.  See crmft.h
- *    for the definition of CMMFPKIStatus.
- */
-extern CMMFPKIStatus
-CMMF_CertResponseGetPKIStatusInfoStatus(CMMFCertResponse *inCertResp);
-
-/*
- * FUNCTION: CMMF_CertResponseGetCertificate
- * INPUTS:
- *    inCertResp
- *        The Certificate Response to operate on.
- *    inCertdb
- *        This is the certificate database where the function will place the
- *        newly issued certificate.
- * NOTES:
- *    This function retrieves the CertResponse.certifiedKeyPair.certificate
- *    from the CMMFCertResponse.  The user will get a copy of that certificate
- *    so  the user must call CERT_DestroyCertificate when the return value is
- *    no longer needed.  The certificate returned will be in the temporary
- *    certificate database.
- *
- * RETURN:
- *    A pointer to a copy of the certificate contained within the
- *    CMMFCertResponse.  A return value of NULL indicates an error while trying
- *    to make a copy of the certificate.
- */
-extern CERTCertificate *
-CMMF_CertResponseGetCertificate(CMMFCertResponse *inCertResp,
-                                CERTCertDBHandle *inCertdb);
-
-/*
- * FUNCTION: CMMF_KeyRecRepContentGetPKIStatusInfoStatus
- * INPUTS:
- *    inKeyRecRep
- *        The CMMFKeyRecRepContent structure to operate on.
- * NOTES:
- *    This function retrieves the KeyRecRepContent.status.status field of
- *    the CMMFKeyRecRepContent structure.
- * RETURN:
- *    The CMMFPKIStatus corresponding to the value held in the
- *    CMMFKeyRecRepContent structure.
- */
-extern CMMFPKIStatus
-CMMF_KeyRecRepContentGetPKIStatusInfoStatus(CMMFKeyRecRepContent *inKeyRecRep);
-
-/*
- * FUNCTION: CMMF_KeyRecRepContentGetNewSignCert
- * INPUTS:
- *    inKeyRecRep
- *        The CMMFKeyRecRepContent to operate on.
- * NOTES:
- *    This function retrieves the KeyRecRepContent.newSignCert field of the
- *    CMMFKeyRecRepContent structure.  The user must call
- *    CERT_DestroyCertificate when the return value is no longer needed. The
- *    returned certificate will be in the temporary database.  The user
- *    must then place the certificate permanently in whatever token the
- *    user determines is the proper destination.  A return value of NULL
- *    indicates the newSigCert field was not present.
- */
-extern CERTCertificate *
-CMMF_KeyRecRepContentGetNewSignCert(CMMFKeyRecRepContent *inKeyRecRep);
-
-/*
- * FUNCTION: CMMF_KeyRecRepContentGetCACerts
- * INPUTS:
- *    inKeyRecRep
- *        The CMMFKeyRecRepContent to operate on.
- * NOTES:
- *    This function returns a CERTCertList which contains all of the
- *    certficates that are in the sequence KeyRecRepContent.caCerts
- *    User must call CERT_DestroyCertList when the return value is no longer
- *    needed.  All of these certificates will be placed in the tempoaray
- *    database.
- *
- * RETURN:
- *    A pointer to the list of caCerts contained in the CMMFKeyRecRepContent
- *    structure.  A return value of NULL indicates the library was not able to
- *    make a copy of the certifcates.  This may be because there are no caCerts
- *    included in the CMMFKeyRecRepContent strucure or an internal error.  Call
- *    CMMF_KeyRecRepContentHasCACerts to find out if there are any caCerts
- *    included in 'inKeyRecRep'.
- */
-extern CERTCertList *
-CMMF_KeyRecRepContentGetCACerts(CMMFKeyRecRepContent *inKeyRecRep);
-
-/*
- * FUNCTION: CMMF_KeyRecRepContentGetNumKeyPairs
- * INPUTS:
- *    inKeyRecRep
- *        The CMMFKeyRecRepContent to operate on.
- * RETURN:
- *    This function returns the number of CMMFCertifiedKeyPair structures that
- *    that are stored in the KeyRecRepContent structure.
- */
-extern int
-CMMF_KeyRecRepContentGetNumKeyPairs(CMMFKeyRecRepContent *inKeyRecRep);
-
-/*
- * FUNCTION: CMMF_KeyRecRepContentGetCertKeyAtIndex
- * INPUTS:
- *    inKeyRecRepContent
- *        The CMMFKeyRecRepContent to operate on.
- *    inIndex
- *        The index of the desired CMMFCertifiedKeyPair
- * NOTES:
- *    This function retrieves the CMMFCertifiedKeyPair structure at the index
- *    'inIndex'.  Valid indexes are 0...(numKeyPairs-1)  The user must call
- *    CMMF_DestroyCertifiedKeyPair when the return value is no longer needed.
- *
- * RETURN:
- *    A pointer to the Certified Key Pair at the desired index.  A return value
- *    of NULL indicates an error in extracting the Certified Key Pair at the
- *    desired index.
- */
-extern CMMFCertifiedKeyPair *
-CMMF_KeyRecRepContentGetCertKeyAtIndex(CMMFKeyRecRepContent *inKeyRecRep,
-                                       int inIndex);
-
-/*
- * FUNCTION: CMMF_CertifiedKeyPairGetCertificate
- * INPUTS:
- *    inCertKeyPair
- *        The CMMFCertifiedKeyPair to operate on.
- *    inCertdb
- *        The database handle for the database you want this certificate
- *        to wind up in.
- * NOTES:
- *    This function retrieves the certificate at
- *    CertifiedKeyPair.certOrEncCert.certificate
- *    The user must call CERT_DestroyCertificate when the return value is no
- *    longer needed.  The user must import this certificate as a token object
- *    onto PKCS#11 slot in order to make it a permanent object.  The returned
- *    certificate will be in the temporary database.
- *
- * RETURN:
- *    A pointer to the certificate contained within the certified key pair.
- *    A return value of NULL indicates an error in creating the copy of the
- *    certificate.
- */
-extern CERTCertificate *
-CMMF_CertifiedKeyPairGetCertificate(CMMFCertifiedKeyPair *inCertKeyPair,
-                                    CERTCertDBHandle *inCertdb);
-
-/*
- * FUNCTION: CMMF_POPODecKeyChallContentGetNumChallenges
- * INPUTS:
- *    inKeyChallCont
- *        The CMMFPOPODecKeyChallContent to operate on.
- * RETURN:
- *    This function returns the number of CMMFChallenges are contained in
- *    the CMMFPOPODecKeyChallContent structure.
- */
-extern int CMMF_POPODecKeyChallContentGetNumChallenges(CMMFPOPODecKeyChallContent *inKeyChallCont);
-
-/*
- * FUNCTION: CMMF_POPODecKeyChallContentGetPublicValue
- * ---------------------------------------------------
- * INPUTS:
- *    inKeyChallCont
- *        The CMMFPOPODecKeyChallContent to operate on.
- *    inIndex
- *        The index of the Challenge within inKeyChallCont to operate on.
- *        Indexes start from 0, ie the Nth Challenge corresponds to index
- *        N-1.
- * NOTES:
- * This function retrieves the public value stored away in the Challenge at
- * index inIndex of inKeyChallCont.
- * RETURN:
- * A pointer to a SECItem containing the public value.  User must call
- * SECITEM_FreeItem on the return value when the value is no longer necessary.
- * A return value of NULL indicates an error while retrieving the public value.
- */
-extern SECItem *CMMF_POPODecKeyChallContentGetPublicValue(CMMFPOPODecKeyChallContent *inKeyChallCont,
-                                                          int inIndex);
-
-/*
- * FUNCTION: CMMF_POPODecKeyChallContentGetRandomNumber
- * INPUTS:
- *    inChallContent
- *        The CMMFPOPODecKeyChallContent to operate on.
- *    inIndex
- *        The index of the challenge to look at.  Valid indexes are 0 through
- *        (CMMF_POPODecKeyChallContentGetNumChallenges(inChallContent) - 1).
- *    inDest
- *        A pointer to a user supplied buffer where the library
- *        can place a copy of the random integer contatained in the
- *        challenge.
- * NOTES:
- *    This function returns the value held in the decrypted Rand structure
- *    corresponding to the random integer.  The user must call
- *    CMMF_POPODecKeyChallContentDecryptChallenge before calling this function.  Call
- *    CMMF_ChallengeIsDecrypted to find out if the challenge has been
- *    decrypted.
- *
- * RETURN:
- *    SECSuccess indicates the witness field has been previously decrypted
- *    and the value for the random integer was successfully placed at *inDest.
- *    Any other return value indicates an error and that the value at *inDest
- *    is not a valid value.
- */
-extern SECStatus CMMF_POPODecKeyChallContentGetRandomNumber(CMMFPOPODecKeyChallContent *inKeyChallCont,
-                                                            int inIndex,
-                                                            long *inDest);
-
-/*
- * FUNCTION: CMMF_POPODecKeyRespContentGetNumResponses
- * INPUTS:
- *    inRespCont
- *        The POPODecKeyRespContent to operate on.
- * RETURN:
- * This function returns the number of responses contained in inRespContent.
- */
-extern int
-CMMF_POPODecKeyRespContentGetNumResponses(CMMFPOPODecKeyRespContent *inRespCont);
-
-/*
- * FUNCTION: CMMF_POPODecKeyRespContentGetResponse
- * INPUTS:
- *    inRespCont
- *        The POPODecKeyRespContent to operate on.
- *    inIndex
- *        The index of the response to retrieve.
- *        The Nth response is at index N-1, ie the 1st response is at index 0,
- *        the 2nd response is at index 1, and so on.
- *    inDest
- *        A pointer to a pre-allocated buffer where the library can put the
- *        value of the response located at inIndex.
- * NOTES:
- * The function returns the response contained at index inIndex.
- * CMMFPOPODecKeyRespContent is a structure that the server will generally
- * get in response to a CMMFPOPODecKeyChallContent.  The server will expect
- * to see the responses in the same order as it constructed them in
- * the CMMFPOPODecKeyChallContent structure.
- * RETURN:
- * SECSuccess if getting the response at the desired index was successful.  Any
- * other return value indicates an errror.
- */
-extern SECStatus
-CMMF_POPODecKeyRespContentGetResponse(CMMFPOPODecKeyRespContent *inRespCont,
-                                      int inIndex,
-                                      long *inDest);
-
-/************************* Destructor Functions ******************************/
-
-/*
- * FUNCTION: CMMF_DestroyCertResponse
- * INPUTS:
- *    inCertResp
- *        The CMMFCertResponse to destroy.
- * NOTES:
- *    This function frees all the memory associated with the CMMFCertResponse
- *    passed in.
- * RETURN:
- *    SECSuccess if freeing the memory was successful.  Any other return value
- *    indicates an error while freeing the memory.
- */
-extern SECStatus CMMF_DestroyCertResponse(CMMFCertResponse *inCertResp);
-
-/*
- * FUNCTION: CMMF_DestroyCertRepContent
- * INPUTS:
- *    inCertRepContent
- *        The CMMFCertRepContent to destroy
- * NOTES:
- *    This function frees the memory associated with the CMMFCertRepContent
- *    passed in.
- * RETURN:
- *    SECSuccess if freeing all the memory associated with the
- *    CMMFCertRepContent passed in is successful.  Any other return value
- *    indicates an error while freeing the memory.
- */
-extern SECStatus
-CMMF_DestroyCertRepContent(CMMFCertRepContent *inCertRepContent);
-
-/*
- * FUNCTION: CMMF_DestroyKeyRecRepContent
- * INPUTS:
- *    inKeyRecRep
- *        The CMMFKeyRecRepContent to destroy.
- * NOTES:
- *    This function destroys all the memory associated with the
- *    CMMFKeyRecRepContent passed in.
- *
- * RETURN:
- *    SECSuccess if freeing all the memory is successful.  Any other return
- *    value indicates an error in freeing the memory.
- */
-extern SECStatus
-CMMF_DestroyKeyRecRepContent(CMMFKeyRecRepContent *inKeyRecRep);
-
-/*
- * FUNCTION: CMMF_DestroyCertifiedKeyPair
- * INPUTS:
- *    inCertKeyPair
- *        The CMMFCertifiedKeyPair to operate on.
- * NOTES:
- *    This function frees up all the memory associated with 'inCertKeyPair'
- *
- * RETURN:
- *    SECSuccess if freeing all the memory associated with 'inCertKeyPair'
- *    is successful.  Any other return value indicates an error while trying
- *    to free the memory.
- */
-extern SECStatus
-CMMF_DestroyCertifiedKeyPair(CMMFCertifiedKeyPair *inCertKeyPair);
-
-/*
- * FUNCTION: CMMF_DestroyPOPODecKeyRespContent
- * INPUTS:
- *    inDecKeyResp
- *        The CMMFPOPODecKeyRespContent structure to free.
- * NOTES:
- *    This function frees up all the memory associate with the
- *    CMMFPOPODecKeyRespContent.
- *
- * RETURN:
- *    SECSuccess if freeing up all the memory associated with the
- *    CMMFPOPODecKeyRespContent structure is successful.  Any other
- *    return value indicates an error while freeing the memory.
- */
-extern SECStatus
-CMMF_DestroyPOPODecKeyRespContent(CMMFPOPODecKeyRespContent *inDecKeyResp);
-
-/************************** Miscellaneous Functions *************************/
-
-/*
- * FUNCTION: CMMF_CertifiedKeyPairUnwrapPrivKey
- * INPUTS:
- *    inCertKeyPair
- *        The CMMFCertifiedKeyPair to operate on.
- *    inPrivKey
- *        The private key to use to un-wrap the private key
- *    inNickName
- *        This is the nickname that will be associated with the private key
- *        to be unwrapped.
- *    inSlot
- *        The PKCS11 slot where the unwrapped private key should end up.
- *    inCertdb
- *        The Certificate database with which the new key will be associated.
- *    destPrivKey
- *        A pointer to memory where the library can place a pointer to the
- *        private key after importing the key onto the specified slot.
- *    wincx
- *        An opaque pointer that the library will use in a callback function
- *        to get the password if necessary.
- *
- * NOTES:
- *    This function uses the private key passed in to unwrap the private key
- *    contained within the CMMFCertifiedKeyPair structure. After this
- *    function successfully returns, the private key has been unwrapped and
- *    placed in the specified slot.
- *
- * RETURN:
- *    SECSuccess if unwrapping the private key was successful.  Any other
- *    return value indicates an error while trying to un-wrap the private key.
- */
-extern SECStatus
-CMMF_CertifiedKeyPairUnwrapPrivKey(CMMFCertifiedKeyPair *inKeyPair,
-                                   SECKEYPrivateKey *inPrivKey,
-                                   SECItem *inNickName,
-                                   PK11SlotInfo *inSlot,
-                                   CERTCertDBHandle *inCertdb,
-                                   SECKEYPrivateKey **destPrivKey,
-                                   void *wincx);
-
-/*
- * FUNCTION: CMMF_KeyRecRepContentHasCACerts
- * INPUTS:
- *    inKeyRecRecp
- *        The CMMFKeyRecRepContent to operate on.
- * RETURN:
- *    This function returns PR_TRUE if there are one or more certificates in
- *    the sequence KeyRecRepContent.caCerts within the CMMFKeyRecRepContent
- *    structure.  The function will return PR_FALSE if there are 0 certificate
- *    in the above mentioned sequence.
- */
-extern PRBool
-CMMF_KeyRecRepContentHasCACerts(CMMFKeyRecRepContent *inKeyRecRep);
-
-/*
- * FUNCTION: CMMF_POPODecKeyChallContDecryptChallenge
- * INPUTS:
- *    inChalCont
- *        The CMMFPOPODecKeyChallContent to operate on.
- *    inIndex
- *        The index of the Challenge to operate on.  The 1st Challenge is
- *        at index 0, the second at index 1 and so forth.
- *    inPrivKey
- *        The private key to use to decrypt the witness field.
- * NOTES:
- *    This function uses the private key to decrypt the challenge field
- *    contained in the appropriate challenge.  Make sure the private key matches
- *    the public key that was used to encrypt the witness.  Use
- *    CMMF_POPODecKeyChallContentGetPublicValue to get the public value of
- *    the key used to encrypt the witness and then use that to determine the
- *    appropriate private key.  This can be done by calling PK11_MakeIDFromPubKey
- *    and then passing that return value to PK11_FindKeyByKeyID.  The creator of
- *    the challenge will most likely be an RA that has the public key
- *    from a Cert request.  So the private key should be the private key
- *    associated with public key in that request.  This function will also
- *    verify the witness field of the challenge.  This function also verifies
- *    that the sender and witness hashes match within the challenge.
- *
- * RETURN:
- *    SECSuccess if decrypting the witness field was successful.  This does
- *    not indicate that the decrypted data is valid, since the private key
- *    passed in may not be the actual key needed to properly decrypt the
- *    witness field.  Meaning that there is a decrypted structure now, but
- *    may be garbage because the private key was incorrect.
- *    Any other return value indicates the function could not complete the
- *    decryption process.
- */
-extern SECStatus
-CMMF_POPODecKeyChallContDecryptChallenge(CMMFPOPODecKeyChallContent *inChalCont,
-                                         int inIndex,
-                                         SECKEYPrivateKey *inPrivKey);
-
-/*
- * FUNCTION: CMMF_DestroyPOPODecKeyChallContent
- * INPUTS:
- *    inDecKeyCont
- *        The CMMFPOPODecKeyChallContent to free
- * NOTES:
- *    This function frees up all the memory associated with the
- *    CMMFPOPODecKeyChallContent
- * RETURN:
- *    SECSuccess if freeing up all the memory associatd with the
- *    CMMFPOPODecKeyChallContent is successful.  Any other return value
- *    indicates an error while freeing the memory.
- *
- */
-extern SECStatus
-CMMF_DestroyPOPODecKeyChallContent(CMMFPOPODecKeyChallContent *inDecKeyCont);
-
-SEC_END_PROTOS
-#endif /* _CMMF_H_ */
diff --git a/openflow/usr/include/nss/cmmft.h b/openflow/usr/include/nss/cmmft.h
deleted file mode 100644
index e39f19e..0000000
--- a/openflow/usr/include/nss/cmmft.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8 -*-*/
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _CMMFT_H_
-#define _CMMFT_H_
-
-#include "secasn1.h"
-
-/*
- * These are the enumerations used to distinguish between the different
- * choices available for the CMMFCertOrEncCert structure.
- */
-typedef enum {
-    cmmfNoCertOrEncCert = 0,
-    cmmfCertificate = 1,
-    cmmfEncryptedCert = 2
-} CMMFCertOrEncCertChoice;
-
-/*
- * This is the enumeration and the corresponding values used to
- * represent the CMMF type PKIStatus
- */
-typedef enum {
-    cmmfNoPKIStatus = -1,
-    cmmfGranted = 0,
-    cmmfGrantedWithMods = 1,
-    cmmfRejection = 2,
-    cmmfWaiting = 3,
-    cmmfRevocationWarning = 4,
-    cmmfRevocationNotification = 5,
-    cmmfKeyUpdateWarning = 6,
-    cmmfNumPKIStatus
-} CMMFPKIStatus;
-
-/*
- * These enumerations are used to represent the corresponding values
- * in PKIFailureInfo defined in CMMF.
- */
-typedef enum {
-    cmmfBadAlg = 0,
-    cmmfBadMessageCheck = 1,
-    cmmfBadRequest = 2,
-    cmmfBadTime = 3,
-    cmmfBadCertId = 4,
-    cmmfBadDataFormat = 5,
-    cmmfWrongAuthority = 6,
-    cmmfIncorrectData = 7,
-    cmmfMissingTimeStamp = 8,
-    cmmfNoFailureInfo = 9
-} CMMFPKIFailureInfo;
-
-typedef struct CMMFPKIStatusInfoStr CMMFPKIStatusInfo;
-typedef struct CMMFCertOrEncCertStr CMMFCertOrEncCert;
-typedef struct CMMFCertifiedKeyPairStr CMMFCertifiedKeyPair;
-typedef struct CMMFCertResponseStr CMMFCertResponse;
-typedef struct CMMFCertResponseSeqStr CMMFCertResponseSeq;
-typedef struct CMMFPOPODecKeyChallContentStr CMMFPOPODecKeyChallContent;
-typedef struct CMMFChallengeStr CMMFChallenge;
-typedef struct CMMFRandStr CMMFRand;
-typedef struct CMMFPOPODecKeyRespContentStr CMMFPOPODecKeyRespContent;
-typedef struct CMMFKeyRecRepContentStr CMMFKeyRecRepContent;
-typedef struct CMMFCertRepContentStr CMMFCertRepContent;
-
-/* Export this so people can call SEC_ASN1EncodeItem instead of having to
- * write callbacks that are passed in to the high level encode function
- * for CMMFCertRepContent.
- */
-extern const SEC_ASN1Template CMMFCertRepContentTemplate[];
-extern const SEC_ASN1Template CMMFPOPODecKeyChallContentTemplate[];
-
-#endif /*_CMMFT_H_*/
diff --git a/openflow/usr/include/nss/cms.h b/openflow/usr/include/nss/cms.h
deleted file mode 100644
index 244df48..0000000
--- a/openflow/usr/include/nss/cms.h
+++ /dev/null
@@ -1,1153 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Interfaces of the CMS implementation.
- */
-
-#ifndef _CMS_H_
-#define _CMS_H_
-
-#include "seccomon.h"
-
-#include "secoidt.h"
-#include "certt.h"
-#include "keyt.h"
-#include "hasht.h"
-#include "cmst.h"
-
-/************************************************************************/
-SEC_BEGIN_PROTOS
-
-/************************************************************************
- * cmsdecode.c - CMS decoding
- ************************************************************************/
-
-/*
- * NSS_CMSDecoder_Start - set up decoding of a DER-encoded CMS message
- *
- * "poolp" - pointer to arena for message, or NULL if new pool should be created
- * "cb", "cb_arg" - callback function and argument for delivery of inner content
- *                  inner content will be stored in the message if cb is NULL.
- * "pwfn", pwfn_arg" - callback function for getting token password
- * "decrypt_key_cb", "decrypt_key_cb_arg" - callback function for getting bulk key for encryptedData
- */
-extern NSSCMSDecoderContext *
-NSS_CMSDecoder_Start(PLArenaPool *poolp,
-                     NSSCMSContentCallback cb, void *cb_arg,
-                     PK11PasswordFunc pwfn, void *pwfn_arg,
-                     NSSCMSGetDecryptKeyCallback decrypt_key_cb, void *decrypt_key_cb_arg);
-
-/*
- * NSS_CMSDecoder_Update - feed DER-encoded data to decoder
- */
-extern SECStatus
-NSS_CMSDecoder_Update(NSSCMSDecoderContext *p7dcx, const char *buf, unsigned long len);
-
-/*
- * NSS_CMSDecoder_Cancel - cancel a decoding process
- */
-extern void
-NSS_CMSDecoder_Cancel(NSSCMSDecoderContext *p7dcx);
-
-/*
- * NSS_CMSDecoder_Finish - mark the end of inner content and finish decoding
- */
-extern NSSCMSMessage *
-NSS_CMSDecoder_Finish(NSSCMSDecoderContext *p7dcx);
-
-/*
- * NSS_CMSMessage_CreateFromDER - decode a CMS message from DER encoded data
- */
-extern NSSCMSMessage *
-NSS_CMSMessage_CreateFromDER(SECItem *DERmessage,
-                             NSSCMSContentCallback cb, void *cb_arg,
-                             PK11PasswordFunc pwfn, void *pwfn_arg,
-                             NSSCMSGetDecryptKeyCallback decrypt_key_cb, void *decrypt_key_cb_arg);
-
-/************************************************************************
- * cmsencode.c - CMS encoding
- ************************************************************************/
-
-/*
- * NSS_CMSEncoder_Start - set up encoding of a CMS message
- *
- * "cmsg" - message to encode
- * "outputfn", "outputarg" - callback function for delivery of DER-encoded output
- *                           will not be called if NULL.
- * "dest" - if non-NULL, pointer to SECItem that will hold the DER-encoded output
- * "destpoolp" - pool to allocate DER-encoded output in
- * "pwfn", pwfn_arg" - callback function for getting token password
- * "decrypt_key_cb", "decrypt_key_cb_arg" - callback function for getting bulk key for encryptedData
- * "detached_digestalgs", "detached_digests" - digests from detached content
- */
-extern NSSCMSEncoderContext *
-NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
-                     NSSCMSContentCallback outputfn, void *outputarg,
-                     SECItem *dest, PLArenaPool *destpoolp,
-                     PK11PasswordFunc pwfn, void *pwfn_arg,
-                     NSSCMSGetDecryptKeyCallback decrypt_key_cb, void *decrypt_key_cb_arg,
-                     SECAlgorithmID **detached_digestalgs, SECItem **detached_digests);
-
-/*
- * NSS_CMSEncoder_Update - take content data delivery from the user
- *
- * "p7ecx" - encoder context
- * "data" - content data
- * "len" - length of content data
- */
-extern SECStatus
-NSS_CMSEncoder_Update(NSSCMSEncoderContext *p7ecx, const char *data, unsigned long len);
-
-/*
- * NSS_CMSEncoder_Cancel - stop all encoding
- */
-extern SECStatus
-NSS_CMSEncoder_Cancel(NSSCMSEncoderContext *p7ecx);
-
-/*
- * NSS_CMSEncoder_Finish - signal the end of data
- *
- * we need to walk down the chain of encoders and the finish them from the innermost out
- */
-extern SECStatus
-NSS_CMSEncoder_Finish(NSSCMSEncoderContext *p7ecx);
-
-/************************************************************************
- * cmsmessage.c - CMS message object
- ************************************************************************/
-
-/*
- * NSS_CMSMessage_Create - create a CMS message object
- *
- * "poolp" - arena to allocate memory from, or NULL if new arena should be created
- */
-extern NSSCMSMessage *
-NSS_CMSMessage_Create(PLArenaPool *poolp);
-
-/*
- * NSS_CMSMessage_SetEncodingParams - set up a CMS message object for encoding or decoding
- *
- * "cmsg" - message object
- * "pwfn", pwfn_arg" - callback function for getting token password
- * "decrypt_key_cb", "decrypt_key_cb_arg" - callback function for getting bulk key for encryptedData
- * "detached_digestalgs", "detached_digests" - digests from detached content
- *
- * used internally.
- */
-extern void
-NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg,
-                                 PK11PasswordFunc pwfn, void *pwfn_arg,
-                                 NSSCMSGetDecryptKeyCallback decrypt_key_cb, void *decrypt_key_cb_arg,
-                                 SECAlgorithmID **detached_digestalgs, SECItem **detached_digests);
-
-/*
- * NSS_CMSMessage_Destroy - destroy a CMS message and all of its sub-pieces.
- */
-extern void
-NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg);
-
-/*
- * NSS_CMSMessage_Copy - return a copy of the given message.
- *
- * The copy may be virtual or may be real -- either way, the result needs
- * to be passed to NSS_CMSMessage_Destroy later (as does the original).
- */
-extern NSSCMSMessage *
-NSS_CMSMessage_Copy(NSSCMSMessage *cmsg);
-
-/*
- * NSS_CMSMessage_GetArena - return a pointer to the message's arena pool
- */
-extern PLArenaPool *
-NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg);
-
-/*
- * NSS_CMSMessage_GetContentInfo - return a pointer to the top level contentInfo
- */
-extern NSSCMSContentInfo *
-NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg);
-
-/*
- * Return a pointer to the actual content.
- * In the case of those types which are encrypted, this returns the *plain* content.
- * In case of nested contentInfos, this descends and retrieves the innermost content.
- */
-extern SECItem *
-NSS_CMSMessage_GetContent(NSSCMSMessage *cmsg);
-
-/*
- * NSS_CMSMessage_ContentLevelCount - count number of levels of CMS content objects in this message
- *
- * CMS data content objects do not count.
- */
-extern int
-NSS_CMSMessage_ContentLevelCount(NSSCMSMessage *cmsg);
-
-/*
- * NSS_CMSMessage_ContentLevel - find content level #n
- *
- * CMS data content objects do not count.
- */
-extern NSSCMSContentInfo *
-NSS_CMSMessage_ContentLevel(NSSCMSMessage *cmsg, int n);
-
-/*
- * NSS_CMSMessage_ContainsCertsOrCrls - see if message contains certs along the way
- */
-extern PRBool
-NSS_CMSMessage_ContainsCertsOrCrls(NSSCMSMessage *cmsg);
-
-/*
- * NSS_CMSMessage_IsEncrypted - see if message contains a encrypted submessage
- */
-extern PRBool
-NSS_CMSMessage_IsEncrypted(NSSCMSMessage *cmsg);
-
-/*
- * NSS_CMSMessage_IsSigned - see if message contains a signed submessage
- *
- * If the CMS message has a SignedData with a signature (not just a SignedData)
- * return true; false otherwise.  This can/should be called before calling
- * VerifySignature, which will always indicate failure if no signature is
- * present, but that does not mean there even was a signature!
- * Note that the content itself can be empty (detached content was sent
- * another way); it is the presence of the signature that matters.
- */
-extern PRBool
-NSS_CMSMessage_IsSigned(NSSCMSMessage *cmsg);
-
-/*
- * NSS_CMSMessage_IsContentEmpty - see if content is empty
- *
- * returns PR_TRUE is innermost content length is < minLen
- * XXX need the encrypted content length (why?)
- */
-extern PRBool
-NSS_CMSMessage_IsContentEmpty(NSSCMSMessage *cmsg, unsigned int minLen);
-
-/************************************************************************
- * cmscinfo.c - CMS contentInfo methods
- ************************************************************************/
-
-/*
- * NSS_CMSContentInfo_Destroy - destroy a CMS contentInfo and all of its sub-pieces.
- */
-extern void
-NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo);
-
-/*
- * NSS_CMSContentInfo_GetChildContentInfo - get content's contentInfo (if it exists)
- */
-extern NSSCMSContentInfo *
-NSS_CMSContentInfo_GetChildContentInfo(NSSCMSContentInfo *cinfo);
-
-/*
- * NSS_CMSContentInfo_SetContent - set cinfo's content type & content to CMS object
- */
-extern SECStatus
-NSS_CMSContentInfo_SetContent(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, SECOidTag type, void *ptr);
-
-/*
- * NSS_CMSContentInfo_SetContent_XXXX - typesafe wrappers for NSS_CMSContentInfo_SetType
- *   set cinfo's content type & content to CMS object
- */
-extern SECStatus
-NSS_CMSContentInfo_SetContent_Data(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, SECItem *data, PRBool detached);
-
-extern SECStatus
-NSS_CMSContentInfo_SetContent_SignedData(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, NSSCMSSignedData *sigd);
-
-extern SECStatus
-NSS_CMSContentInfo_SetContent_EnvelopedData(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, NSSCMSEnvelopedData *envd);
-
-extern SECStatus
-NSS_CMSContentInfo_SetContent_DigestedData(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, NSSCMSDigestedData *digd);
-
-extern SECStatus
-NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, NSSCMSEncryptedData *encd);
-
-/*
- * turn off streaming for this content type.
- * This could fail with SEC_ERROR_NO_MEMORY in memory constrained conditions.
- */
-extern SECStatus
-NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream);
-
-/*
- * NSS_CMSContentInfo_GetContent - get pointer to inner content
- *
- * needs to be casted...
- */
-extern void *
-NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo);
-
-/*
- * NSS_CMSContentInfo_GetInnerContent - get pointer to innermost content
- *
- * this is typically only called by NSS_CMSMessage_GetContent()
- */
-extern SECItem *
-NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo);
-
-/*
- * NSS_CMSContentInfo_GetContentType{Tag,OID} - find out (saving pointer to lookup result
- * for future reference) and return the inner content type.
- */
-extern SECOidTag
-NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo);
-
-extern SECItem *
-NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo);
-
-/*
- * NSS_CMSContentInfo_GetContentEncAlgTag - find out (saving pointer to lookup result
- * for future reference) and return the content encryption algorithm tag.
- */
-extern SECOidTag
-NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo);
-
-/*
- * NSS_CMSContentInfo_GetContentEncAlg - find out and return the content encryption algorithm tag.
- */
-extern SECAlgorithmID *
-NSS_CMSContentInfo_GetContentEncAlg(NSSCMSContentInfo *cinfo);
-
-extern SECStatus
-NSS_CMSContentInfo_SetContentEncAlg(PLArenaPool *poolp, NSSCMSContentInfo *cinfo,
-                                    SECOidTag bulkalgtag, SECItem *parameters, int keysize);
-
-extern SECStatus
-NSS_CMSContentInfo_SetContentEncAlgID(PLArenaPool *poolp, NSSCMSContentInfo *cinfo,
-                                      SECAlgorithmID *algid, int keysize);
-
-extern void
-NSS_CMSContentInfo_SetBulkKey(NSSCMSContentInfo *cinfo, PK11SymKey *bulkkey);
-
-extern PK11SymKey *
-NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo);
-
-extern int
-NSS_CMSContentInfo_GetBulkKeySize(NSSCMSContentInfo *cinfo);
-
-/************************************************************************
- * cmsutil.c - CMS misc utility functions
- ************************************************************************/
-
-/*
- * NSS_CMSArray_SortByDER - sort array of objects by objects' DER encoding
- *
- * make sure that the order of the objects guarantees valid DER (which must be
- * in lexigraphically ascending order for a SET OF); if reordering is necessary it
- * will be done in place (in objs).
- */
-extern SECStatus
-NSS_CMSArray_SortByDER(void **objs, const SEC_ASN1Template *objtemplate, void **objs2);
-
-/*
- * NSS_CMSUtil_DERCompare - for use with NSS_CMSArray_Sort to
- *  sort arrays of SECItems containing DER
- */
-extern int
-NSS_CMSUtil_DERCompare(void *a, void *b);
-
-/*
- * NSS_CMSAlgArray_GetIndexByAlgID - find a specific algorithm in an array of
- * algorithms.
- *
- * algorithmArray - array of algorithm IDs
- * algid - algorithmid of algorithm to pick
- *
- * Returns:
- *  An integer containing the index of the algorithm in the array or -1 if
- *  algorithm was not found.
- */
-extern int
-NSS_CMSAlgArray_GetIndexByAlgID(SECAlgorithmID **algorithmArray, SECAlgorithmID *algid);
-
-/*
- * NSS_CMSAlgArray_GetIndexByAlgID - find a specific algorithm in an array of
- * algorithms.
- *
- * algorithmArray - array of algorithm IDs
- * algiddata - id of algorithm to pick
- *
- * Returns:
- *  An integer containing the index of the algorithm in the array or -1 if
- *  algorithm was not found.
- */
-extern int
-NSS_CMSAlgArray_GetIndexByAlgTag(SECAlgorithmID **algorithmArray, SECOidTag algtag);
-
-extern const SECHashObject *
-NSS_CMSUtil_GetHashObjByAlgID(SECAlgorithmID *algid);
-
-extern const SEC_ASN1Template *
-NSS_CMSUtil_GetTemplateByTypeTag(SECOidTag type);
-
-extern size_t
-NSS_CMSUtil_GetSizeByTypeTag(SECOidTag type);
-
-extern NSSCMSContentInfo *
-NSS_CMSContent_GetContentInfo(void *msg, SECOidTag type);
-
-extern const char *
-NSS_CMSUtil_VerificationStatusToString(NSSCMSVerificationStatus vs);
-
-/************************************************************************
- * cmssigdata.c - CMS signedData methods
- ************************************************************************/
-
-extern NSSCMSSignedData *
-NSS_CMSSignedData_Create(NSSCMSMessage *cmsg);
-
-extern void
-NSS_CMSSignedData_Destroy(NSSCMSSignedData *sigd);
-
-/*
- * NSS_CMSSignedData_Encode_BeforeStart - do all the necessary things to a SignedData
- *     before start of encoding.
- *
- * In detail:
- *  - find out about the right value to put into sigd->version
- *  - come up with a list of digestAlgorithms (which should be the union of the algorithms
- *         in the signerinfos).
- *         If we happen to have a pre-set list of algorithms (and digest values!), we
- *         check if we have all the signerinfos' algorithms. If not, this is an error.
- */
-extern SECStatus
-NSS_CMSSignedData_Encode_BeforeStart(NSSCMSSignedData *sigd);
-
-extern SECStatus
-NSS_CMSSignedData_Encode_BeforeData(NSSCMSSignedData *sigd);
-
-/*
- * NSS_CMSSignedData_Encode_AfterData - do all the necessary things to a SignedData
- *     after all the encapsulated data was passed through the encoder.
- *
- * In detail:
- *  - create the signatures in all the SignerInfos
- *
- * Please note that nothing is done to the Certificates and CRLs in the message - this
- * is entirely the responsibility of our callers.
- */
-extern SECStatus
-NSS_CMSSignedData_Encode_AfterData(NSSCMSSignedData *sigd);
-
-extern SECStatus
-NSS_CMSSignedData_Decode_BeforeData(NSSCMSSignedData *sigd);
-
-/*
- * NSS_CMSSignedData_Decode_AfterData - do all the necessary things to a SignedData
- *     after all the encapsulated data was passed through the decoder.
- */
-extern SECStatus
-NSS_CMSSignedData_Decode_AfterData(NSSCMSSignedData *sigd);
-
-/*
- * NSS_CMSSignedData_Decode_AfterEnd - do all the necessary things to a SignedData
- *     after all decoding is finished.
- */
-extern SECStatus
-NSS_CMSSignedData_Decode_AfterEnd(NSSCMSSignedData *sigd);
-
-/*
- * NSS_CMSSignedData_GetSignerInfos - retrieve the SignedData's signer list
- */
-extern NSSCMSSignerInfo **
-NSS_CMSSignedData_GetSignerInfos(NSSCMSSignedData *sigd);
-
-extern int
-NSS_CMSSignedData_SignerInfoCount(NSSCMSSignedData *sigd);
-
-extern NSSCMSSignerInfo *
-NSS_CMSSignedData_GetSignerInfo(NSSCMSSignedData *sigd, int i);
-
-/*
- * NSS_CMSSignedData_GetDigestAlgs - retrieve the SignedData's digest algorithm list
- */
-extern SECAlgorithmID **
-NSS_CMSSignedData_GetDigestAlgs(NSSCMSSignedData *sigd);
-
-/*
- * NSS_CMSSignedData_GetContentInfo - return pointer to this signedData's contentinfo
- */
-extern NSSCMSContentInfo *
-NSS_CMSSignedData_GetContentInfo(NSSCMSSignedData *sigd);
-
-/*
- * NSS_CMSSignedData_GetCertificateList - retrieve the SignedData's certificate list
- */
-extern SECItem **
-NSS_CMSSignedData_GetCertificateList(NSSCMSSignedData *sigd);
-
-extern SECStatus
-NSS_CMSSignedData_ImportCerts(NSSCMSSignedData *sigd, CERTCertDBHandle *certdb,
-                              SECCertUsage certusage, PRBool keepcerts);
-
-/*
- * NSS_CMSSignedData_HasDigests - see if we have digests in place
- */
-extern PRBool
-NSS_CMSSignedData_HasDigests(NSSCMSSignedData *sigd);
-
-/*
- * NSS_CMSSignedData_VerifySignerInfo - check a signature.
- *
- * The digests were either calculated during decoding (and are stored in the
- * signedData itself) or set after decoding using NSS_CMSSignedData_SetDigests.
- *
- * The verification checks if the signing cert is valid and has a trusted chain
- * for the purpose specified by "certusage".
- */
-extern SECStatus
-NSS_CMSSignedData_VerifySignerInfo(NSSCMSSignedData *sigd, int i, CERTCertDBHandle *certdb,
-                                   SECCertUsage certusage);
-
-/*
- * NSS_CMSSignedData_VerifyCertsOnly - verify the certs in a certs-only message
-*/
-extern SECStatus
-NSS_CMSSignedData_VerifyCertsOnly(NSSCMSSignedData *sigd,
-                                  CERTCertDBHandle *certdb,
-                                  SECCertUsage usage);
-
-extern SECStatus
-NSS_CMSSignedData_AddCertList(NSSCMSSignedData *sigd, CERTCertificateList *certlist);
-
-/*
- * NSS_CMSSignedData_AddCertChain - add cert and its entire chain to the set of certs
- */
-extern SECStatus
-NSS_CMSSignedData_AddCertChain(NSSCMSSignedData *sigd, CERTCertificate *cert);
-
-extern SECStatus
-NSS_CMSSignedData_AddCertificate(NSSCMSSignedData *sigd, CERTCertificate *cert);
-
-extern PRBool
-NSS_CMSSignedData_ContainsCertsOrCrls(NSSCMSSignedData *sigd);
-
-extern SECStatus
-NSS_CMSSignedData_AddSignerInfo(NSSCMSSignedData *sigd,
-                                NSSCMSSignerInfo *signerinfo);
-
-extern SECStatus
-NSS_CMSSignedData_SetDigests(NSSCMSSignedData *sigd,
-                             SECAlgorithmID **digestalgs,
-                             SECItem **digests);
-
-extern SECStatus
-NSS_CMSSignedData_SetDigestValue(NSSCMSSignedData *sigd,
-                                 SECOidTag digestalgtag,
-                                 SECItem *digestdata);
-
-extern SECStatus
-NSS_CMSSignedData_AddDigest(PLArenaPool *poolp,
-                            NSSCMSSignedData *sigd,
-                            SECOidTag digestalgtag,
-                            SECItem *digest);
-
-extern SECItem *
-NSS_CMSSignedData_GetDigestValue(NSSCMSSignedData *sigd, SECOidTag digestalgtag);
-
-/*
- * NSS_CMSSignedData_CreateCertsOnly - create a certs-only SignedData.
- *
- * cert          - base certificates that will be included
- * include_chain - if true, include the complete cert chain for cert
- *
- * More certs and chains can be added via AddCertificate and AddCertChain.
- *
- * An error results in a return value of NULL and an error set.
- */
-extern NSSCMSSignedData *
-NSS_CMSSignedData_CreateCertsOnly(NSSCMSMessage *cmsg, CERTCertificate *cert, PRBool include_chain);
-
-/************************************************************************
- * cmssiginfo.c - signerinfo methods
- ************************************************************************/
-
-extern NSSCMSSignerInfo *
-NSS_CMSSignerInfo_Create(NSSCMSMessage *cmsg, CERTCertificate *cert, SECOidTag digestalgtag);
-extern NSSCMSSignerInfo *
-NSS_CMSSignerInfo_CreateWithSubjKeyID(NSSCMSMessage *cmsg, SECItem *subjKeyID, SECKEYPublicKey *pubKey, SECKEYPrivateKey *signingKey, SECOidTag digestalgtag);
-
-/*
- * NSS_CMSSignerInfo_Destroy - destroy a SignerInfo data structure
- */
-extern void
-NSS_CMSSignerInfo_Destroy(NSSCMSSignerInfo *si);
-
-/*
- * NSS_CMSSignerInfo_Sign - sign something
- *
- */
-extern SECStatus
-NSS_CMSSignerInfo_Sign(NSSCMSSignerInfo *signerinfo, SECItem *digest, SECItem *contentType);
-
-extern SECStatus
-NSS_CMSSignerInfo_VerifyCertificate(NSSCMSSignerInfo *signerinfo, CERTCertDBHandle *certdb,
-                                    SECCertUsage certusage);
-
-/*
- * NSS_CMSSignerInfo_Verify - verify the signature of a single SignerInfo
- *
- * Just verifies the signature. The assumption is that verification of the certificate
- * is done already.
- */
-extern SECStatus
-NSS_CMSSignerInfo_Verify(NSSCMSSignerInfo *signerinfo, SECItem *digest, SECItem *contentType);
-
-extern NSSCMSVerificationStatus
-NSS_CMSSignerInfo_GetVerificationStatus(NSSCMSSignerInfo *signerinfo);
-
-extern SECOidData *
-NSS_CMSSignerInfo_GetDigestAlg(NSSCMSSignerInfo *signerinfo);
-
-extern SECOidTag
-NSS_CMSSignerInfo_GetDigestAlgTag(NSSCMSSignerInfo *signerinfo);
-
-extern int
-NSS_CMSSignerInfo_GetVersion(NSSCMSSignerInfo *signerinfo);
-
-extern CERTCertificateList *
-NSS_CMSSignerInfo_GetCertList(NSSCMSSignerInfo *signerinfo);
-
-/*
- * NSS_CMSSignerInfo_GetSigningTime - return the signing time,
- *                                    in UTCTime format, of a CMS signerInfo.
- *
- * sinfo - signerInfo data for this signer
- *
- * Returns a pointer to XXXX (what?)
- * A return value of NULL is an error.
- */
-extern SECStatus
-NSS_CMSSignerInfo_GetSigningTime(NSSCMSSignerInfo *sinfo, PRTime *stime);
-
-/*
- * Return the signing cert of a CMS signerInfo.
- *
- * the certs in the enclosing SignedData must have been imported already
- */
-extern CERTCertificate *
-NSS_CMSSignerInfo_GetSigningCertificate(NSSCMSSignerInfo *signerinfo, CERTCertDBHandle *certdb);
-
-/*
- * NSS_CMSSignerInfo_GetSignerCommonName - return the common name of the signer
- *
- * sinfo - signerInfo data for this signer
- *
- * Returns a pointer to allocated memory, which must be freed with PORT_Free.
- * A return value of NULL is an error.
- */
-extern char *
-NSS_CMSSignerInfo_GetSignerCommonName(NSSCMSSignerInfo *sinfo);
-
-/*
- * NSS_CMSSignerInfo_GetSignerEmailAddress - return the common name of the signer
- *
- * sinfo - signerInfo data for this signer
- *
- * Returns a pointer to allocated memory, which must be freed.
- * A return value of NULL is an error.
- */
-extern char *
-NSS_CMSSignerInfo_GetSignerEmailAddress(NSSCMSSignerInfo *sinfo);
-
-/*
- * NSS_CMSSignerInfo_AddAuthAttr - add an attribute to the
- * authenticated (i.e. signed) attributes of "signerinfo".
- */
-extern SECStatus
-NSS_CMSSignerInfo_AddAuthAttr(NSSCMSSignerInfo *signerinfo, NSSCMSAttribute *attr);
-
-/*
- * NSS_CMSSignerInfo_AddUnauthAttr - add an attribute to the
- * unauthenticated attributes of "signerinfo".
- */
-extern SECStatus
-NSS_CMSSignerInfo_AddUnauthAttr(NSSCMSSignerInfo *signerinfo, NSSCMSAttribute *attr);
-
-/*
- * NSS_CMSSignerInfo_AddSigningTime - add the signing time to the
- * authenticated (i.e. signed) attributes of "signerinfo".
- *
- * This is expected to be included in outgoing signed
- * messages for email (S/MIME) but is likely useful in other situations.
- *
- * This should only be added once; a second call will do nothing.
- *
- * XXX This will probably just shove the current time into "signerinfo"
- * but it will not actually get signed until the entire item is
- * processed for encoding.  Is this (expected to be small) delay okay?
- */
-extern SECStatus
-NSS_CMSSignerInfo_AddSigningTime(NSSCMSSignerInfo *signerinfo, PRTime t);
-
-/*
- * NSS_CMSSignerInfo_AddSMIMECaps - add a SMIMECapabilities attribute to the
- * authenticated (i.e. signed) attributes of "signerinfo".
- *
- * This is expected to be included in outgoing signed
- * messages for email (S/MIME).
- */
-extern SECStatus
-NSS_CMSSignerInfo_AddSMIMECaps(NSSCMSSignerInfo *signerinfo);
-
-/*
- * NSS_CMSSignerInfo_AddSMIMEEncKeyPrefs - add a SMIMEEncryptionKeyPreferences attribute to the
- * authenticated (i.e. signed) attributes of "signerinfo".
- *
- * This is expected to be included in outgoing signed messages for email (S/MIME).
- */
-SECStatus
-NSS_CMSSignerInfo_AddSMIMEEncKeyPrefs(NSSCMSSignerInfo *signerinfo, CERTCertificate *cert, CERTCertDBHandle *certdb);
-
-/*
- * NSS_CMSSignerInfo_AddMSSMIMEEncKeyPrefs - add a SMIMEEncryptionKeyPreferences attribute to the
- * authenticated (i.e. signed) attributes of "signerinfo", using the OID preferred by Microsoft.
- *
- * This is expected to be included in outgoing signed messages for email (S/MIME),
- * if compatibility with Microsoft mail clients is wanted.
- */
-SECStatus
-NSS_CMSSignerInfo_AddMSSMIMEEncKeyPrefs(NSSCMSSignerInfo *signerinfo, CERTCertificate *cert, CERTCertDBHandle *certdb);
-
-/*
- * NSS_CMSSignerInfo_AddCounterSignature - countersign a signerinfo
- */
-extern SECStatus
-NSS_CMSSignerInfo_AddCounterSignature(NSSCMSSignerInfo *signerinfo,
-                                      SECOidTag digestalg, CERTCertificate signingcert);
-
-/*
- * XXXX the following needs to be done in the S/MIME layer code
- * after signature of a signerinfo is verified
- */
-extern SECStatus
-NSS_SMIMESignerInfo_SaveSMIMEProfile(NSSCMSSignerInfo *signerinfo);
-
-/*
- * NSS_CMSSignerInfo_IncludeCerts - set cert chain inclusion mode for this signer
- */
-extern SECStatus
-NSS_CMSSignerInfo_IncludeCerts(NSSCMSSignerInfo *signerinfo, NSSCMSCertChainMode cm, SECCertUsage usage);
-
-/************************************************************************
- * cmsenvdata.c - CMS envelopedData methods
- ************************************************************************/
-
-/*
- * NSS_CMSEnvelopedData_Create - create an enveloped data message
- */
-extern NSSCMSEnvelopedData *
-NSS_CMSEnvelopedData_Create(NSSCMSMessage *cmsg, SECOidTag algorithm, int keysize);
-
-/*
- * NSS_CMSEnvelopedData_Destroy - destroy an enveloped data message
- */
-extern void
-NSS_CMSEnvelopedData_Destroy(NSSCMSEnvelopedData *edp);
-
-/*
- * NSS_CMSEnvelopedData_GetContentInfo - return pointer to this envelopedData's contentinfo
- */
-extern NSSCMSContentInfo *
-NSS_CMSEnvelopedData_GetContentInfo(NSSCMSEnvelopedData *envd);
-
-/*
- * NSS_CMSEnvelopedData_AddRecipient - add a recipientinfo to the enveloped data msg
- *
- * rip must be created on the same pool as edp - this is not enforced, though.
- */
-extern SECStatus
-NSS_CMSEnvelopedData_AddRecipient(NSSCMSEnvelopedData *edp, NSSCMSRecipientInfo *rip);
-
-/*
- * NSS_CMSEnvelopedData_Encode_BeforeStart - prepare this envelopedData for encoding
- *
- * at this point, we need
- * - recipientinfos set up with recipient's certificates
- * - a content encryption algorithm (if none, 3DES will be used)
- *
- * this function will generate a random content encryption key (aka bulk key),
- * initialize the recipientinfos with certificate identification and wrap the bulk key
- * using the proper algorithm for every certificiate.
- * it will finally set the bulk algorithm and key so that the encode step can find it.
- */
-extern SECStatus
-NSS_CMSEnvelopedData_Encode_BeforeStart(NSSCMSEnvelopedData *envd);
-
-/*
- * NSS_CMSEnvelopedData_Encode_BeforeData - set up encryption
- */
-extern SECStatus
-NSS_CMSEnvelopedData_Encode_BeforeData(NSSCMSEnvelopedData *envd);
-
-/*
- * NSS_CMSEnvelopedData_Encode_AfterData - finalize this envelopedData for encoding
- */
-extern SECStatus
-NSS_CMSEnvelopedData_Encode_AfterData(NSSCMSEnvelopedData *envd);
-
-/*
- * NSS_CMSEnvelopedData_Decode_BeforeData - find our recipientinfo,
- * derive bulk key & set up our contentinfo
- */
-extern SECStatus
-NSS_CMSEnvelopedData_Decode_BeforeData(NSSCMSEnvelopedData *envd);
-
-/*
- * NSS_CMSEnvelopedData_Decode_AfterData - finish decrypting this envelopedData's content
- */
-extern SECStatus
-NSS_CMSEnvelopedData_Decode_AfterData(NSSCMSEnvelopedData *envd);
-
-/*
- * NSS_CMSEnvelopedData_Decode_AfterEnd - finish decoding this envelopedData
- */
-extern SECStatus
-NSS_CMSEnvelopedData_Decode_AfterEnd(NSSCMSEnvelopedData *envd);
-
-/************************************************************************
- * cmsrecinfo.c - CMS recipientInfo methods
- ************************************************************************/
-
-/*
- * NSS_CMSRecipientInfo_Create - create a recipientinfo
- *
- * we currently do not create KeyAgreement recipientinfos with multiple recipientEncryptedKeys
- * the certificate is supposed to have been verified by the caller
- */
-extern NSSCMSRecipientInfo *
-NSS_CMSRecipientInfo_Create(NSSCMSMessage *cmsg, CERTCertificate *cert);
-
-extern NSSCMSRecipientInfo *
-NSS_CMSRecipientInfo_CreateWithSubjKeyID(NSSCMSMessage *cmsg,
-                                         SECItem *subjKeyID,
-                                         SECKEYPublicKey *pubKey);
-
-extern NSSCMSRecipientInfo *
-NSS_CMSRecipientInfo_CreateWithSubjKeyIDFromCert(NSSCMSMessage *cmsg,
-                                                 CERTCertificate *cert);
-
-/*
- * NSS_CMSRecipientInfo_CreateNew - create a blank recipientinfo for
- * applications which want to encode their own CMS structures and
- * key exchange types.
- */
-extern NSSCMSRecipientInfo *
-NSS_CMSRecipientInfo_CreateNew(void *pwfn_arg);
-
-/*
- * NSS_CMSRecipientInfo_CreateFromDER - create a recipientinfo  from partially
- * decoded DER data for applications which want to encode their own CMS
- * structures and key exchange types.
- */
-extern NSSCMSRecipientInfo *
-NSS_CMSRecipientInfo_CreateFromDER(SECItem *input, void *pwfn_arg);
-
-extern void
-NSS_CMSRecipientInfo_Destroy(NSSCMSRecipientInfo *ri);
-
-/*
- * NSS_CMSRecipientInfo_GetCertAndKey - retrieve the cert and key from the
- * recipientInfo struct. If retcert or retkey are NULL, the cert or
- * key (respectively) would not be returned). This function is a no-op if both
- * retcert and retkey are NULL. Caller inherits ownership of the cert and key
- * he requested (and is responsible to free them).
- */
-SECStatus NSS_CMSRecipientInfo_GetCertAndKey(NSSCMSRecipientInfo *ri,
-                                             CERTCertificate **retcert,
-                                             SECKEYPrivateKey **retkey);
-
-extern int
-NSS_CMSRecipientInfo_GetVersion(NSSCMSRecipientInfo *ri);
-
-extern SECItem *
-NSS_CMSRecipientInfo_GetEncryptedKey(NSSCMSRecipientInfo *ri, int subIndex);
-
-/*
- * NSS_CMSRecipientInfo_Encode - encode an NSS_CMSRecipientInfo as ASN.1
- */
-SECStatus NSS_CMSRecipientInfo_Encode(PLArenaPool *poolp,
-                                      const NSSCMSRecipientInfo *src,
-                                      SECItem *returned);
-
-extern SECOidTag
-NSS_CMSRecipientInfo_GetKeyEncryptionAlgorithmTag(NSSCMSRecipientInfo *ri);
-
-extern SECStatus
-NSS_CMSRecipientInfo_WrapBulkKey(NSSCMSRecipientInfo *ri, PK11SymKey *bulkkey,
-                                 SECOidTag bulkalgtag);
-
-extern PK11SymKey *
-NSS_CMSRecipientInfo_UnwrapBulkKey(NSSCMSRecipientInfo *ri, int subIndex,
-                                   CERTCertificate *cert, SECKEYPrivateKey *privkey,
-                                   SECOidTag bulkalgtag);
-
-/************************************************************************
- * cmsencdata.c - CMS encryptedData methods
- ************************************************************************/
-/*
- * NSS_CMSEncryptedData_Create - create an empty encryptedData object.
- *
- * "algorithm" specifies the bulk encryption algorithm to use.
- * "keysize" is the key size.
- *
- * An error results in a return value of NULL and an error set.
- * (Retrieve specific errors via PORT_GetError()/XP_GetError().)
- */
-extern NSSCMSEncryptedData *
-NSS_CMSEncryptedData_Create(NSSCMSMessage *cmsg, SECOidTag algorithm, int keysize);
-
-/*
- * NSS_CMSEncryptedData_Destroy - destroy an encryptedData object
- */
-extern void
-NSS_CMSEncryptedData_Destroy(NSSCMSEncryptedData *encd);
-
-/*
- * NSS_CMSEncryptedData_GetContentInfo - return pointer to encryptedData object's contentInfo
- */
-extern NSSCMSContentInfo *
-NSS_CMSEncryptedData_GetContentInfo(NSSCMSEncryptedData *encd);
-
-/*
- * NSS_CMSEncryptedData_Encode_BeforeStart - do all the necessary things to a EncryptedData
- *     before encoding begins.
- *
- * In particular:
- *  - set the correct version value.
- *  - get the encryption key
- */
-extern SECStatus
-NSS_CMSEncryptedData_Encode_BeforeStart(NSSCMSEncryptedData *encd);
-
-/*
- * NSS_CMSEncryptedData_Encode_BeforeData - set up encryption
- */
-extern SECStatus
-NSS_CMSEncryptedData_Encode_BeforeData(NSSCMSEncryptedData *encd);
-
-/*
- * NSS_CMSEncryptedData_Encode_AfterData - finalize this encryptedData for encoding
- */
-extern SECStatus
-NSS_CMSEncryptedData_Encode_AfterData(NSSCMSEncryptedData *encd);
-
-/*
- * NSS_CMSEncryptedData_Decode_BeforeData - find bulk key & set up decryption
- */
-extern SECStatus
-NSS_CMSEncryptedData_Decode_BeforeData(NSSCMSEncryptedData *encd);
-
-/*
- * NSS_CMSEncryptedData_Decode_AfterData - finish decrypting this encryptedData's content
- */
-extern SECStatus
-NSS_CMSEncryptedData_Decode_AfterData(NSSCMSEncryptedData *encd);
-
-/*
- * NSS_CMSEncryptedData_Decode_AfterEnd - finish decoding this encryptedData
- */
-extern SECStatus
-NSS_CMSEncryptedData_Decode_AfterEnd(NSSCMSEncryptedData *encd);
-
-/************************************************************************
- * cmsdigdata.c - CMS encryptedData methods
- ************************************************************************/
-/*
- * NSS_CMSDigestedData_Create - create a digestedData object (presumably for encoding)
- *
- * version will be set by NSS_CMSDigestedData_Encode_BeforeStart
- * digestAlg is passed as parameter
- * contentInfo must be filled by the user
- * digest will be calculated while encoding
- */
-extern NSSCMSDigestedData *
-NSS_CMSDigestedData_Create(NSSCMSMessage *cmsg, SECAlgorithmID *digestalg);
-
-/*
- * NSS_CMSDigestedData_Destroy - destroy a digestedData object
- */
-extern void
-NSS_CMSDigestedData_Destroy(NSSCMSDigestedData *digd);
-
-/*
- * NSS_CMSDigestedData_GetContentInfo - return pointer to digestedData object's contentInfo
- */
-extern NSSCMSContentInfo *
-NSS_CMSDigestedData_GetContentInfo(NSSCMSDigestedData *digd);
-
-/*
- * NSS_CMSDigestedData_Encode_BeforeStart - do all the necessary things to a DigestedData
- *     before encoding begins.
- *
- * In particular:
- *  - set the right version number. The contentInfo's content type must be set up already.
- */
-extern SECStatus
-NSS_CMSDigestedData_Encode_BeforeStart(NSSCMSDigestedData *digd);
-
-/*
- * NSS_CMSDigestedData_Encode_BeforeData - do all the necessary things to a DigestedData
- *     before the encapsulated data is passed through the encoder.
- *
- * In detail:
- *  - set up the digests if necessary
- */
-extern SECStatus
-NSS_CMSDigestedData_Encode_BeforeData(NSSCMSDigestedData *digd);
-
-/*
- * NSS_CMSDigestedData_Encode_AfterData - do all the necessary things to a DigestedData
- *     after all the encapsulated data was passed through the encoder.
- *
- * In detail:
- *  - finish the digests
- */
-extern SECStatus
-NSS_CMSDigestedData_Encode_AfterData(NSSCMSDigestedData *digd);
-
-/*
- * NSS_CMSDigestedData_Decode_BeforeData - do all the necessary things to a DigestedData
- *     before the encapsulated data is passed through the encoder.
- *
- * In detail:
- *  - set up the digests if necessary
- */
-extern SECStatus
-NSS_CMSDigestedData_Decode_BeforeData(NSSCMSDigestedData *digd);
-
-/*
- * NSS_CMSDigestedData_Decode_AfterData - do all the necessary things to a DigestedData
- *     after all the encapsulated data was passed through the encoder.
- *
- * In detail:
- *  - finish the digests
- */
-extern SECStatus
-NSS_CMSDigestedData_Decode_AfterData(NSSCMSDigestedData *digd);
-
-/*
- * NSS_CMSDigestedData_Decode_AfterEnd - finalize a digestedData.
- *
- * In detail:
- *  - check the digests for equality
- */
-extern SECStatus
-NSS_CMSDigestedData_Decode_AfterEnd(NSSCMSDigestedData *digd);
-
-/************************************************************************
- * cmsdigest.c - digestion routines
- ************************************************************************/
-
-/*
- * NSS_CMSDigestContext_StartMultiple - start digest calculation using all the
- *  digest algorithms in "digestalgs" in parallel.
- */
-extern NSSCMSDigestContext *
-NSS_CMSDigestContext_StartMultiple(SECAlgorithmID **digestalgs);
-
-/*
- * NSS_CMSDigestContext_StartSingle - same as NSS_CMSDigestContext_StartMultiple, but
- *  only one algorithm.
- */
-extern NSSCMSDigestContext *
-NSS_CMSDigestContext_StartSingle(SECAlgorithmID *digestalg);
-
-/*
- * NSS_CMSDigestContext_Update - feed more data into the digest machine
- */
-extern void
-NSS_CMSDigestContext_Update(NSSCMSDigestContext *cmsdigcx, const unsigned char *data, int len);
-
-/*
- * NSS_CMSDigestContext_Cancel - cancel digesting operation
- */
-extern void
-NSS_CMSDigestContext_Cancel(NSSCMSDigestContext *cmsdigcx);
-
-/*
- * NSS_CMSDigestContext_FinishMultiple - finish the digests and put them
- *  into an array of SECItems (allocated on poolp)
- */
-extern SECStatus
-NSS_CMSDigestContext_FinishMultiple(NSSCMSDigestContext *cmsdigcx, PLArenaPool *poolp,
-                                    SECItem ***digestsp);
-
-/*
- * NSS_CMSDigestContext_FinishSingle - same as NSS_CMSDigestContext_FinishMultiple,
- *  but for one digest.
- */
-extern SECStatus
-NSS_CMSDigestContext_FinishSingle(NSSCMSDigestContext *cmsdigcx, PLArenaPool *poolp,
-                                  SECItem *digest);
-
-/************************************************************************
- *
- ************************************************************************/
-
-/* shortcuts for basic use */
-
-/*
- * NSS_CMSDEREncode - DER Encode a CMS message, with input being
- *                    the plaintext message and derOut being the output,
- *                    stored in arena's pool.
- */
-extern SECStatus
-NSS_CMSDEREncode(NSSCMSMessage *cmsg, SECItem *input, SECItem *derOut,
-                 PLArenaPool *arena);
-
-/************************************************************************
- *
- ************************************************************************/
-
-/*
- *  define new S/MIME content type entries
- *
- *  S/MIME uses the builtin PKCS7 oid types for encoding and decoding the
- *  various S/MIME content. Some applications have their own content type
- *  which is different from the standard content type defined by S/MIME.
- *
- *  This function allows you to register new content types. There are basically
- *  Two different types of content, Wrappping content, and Data.
- *
- *  For data types, All the functions below can be zero or NULL excext
- *  type and is isData, which should be your oid tag and PR_FALSE respectively
- *
- *  For wrapping types, everything must be provided, or you will get encoder
- *  failures.
- *
- *  If NSS doesn't already define the OID that you need, you can register
- *  your own with SECOID_AddEntry.
- *
- *  Once you have defined your new content type, you can pass your new content
- *  type to NSS_CMSContentInfo_SetContent().
- *
- *  If you are using a wrapping type you can pass your own data structure in
- *  the ptr field, but it must contain and embedded NSSCMSGenericWrappingData
- *  structure as the first element. The size you pass to
- *  NSS_CMSType_RegisterContentType is the total size of your self defined
- *  data structure. NSS_CMSContentInfo_GetContent will return that data
- *  structure from the content info. Your ASN1Template will be evaluated
- *  against that data structure.
- */
-SECStatus NSS_CMSType_RegisterContentType(SECOidTag type,
-                                          SEC_ASN1Template *asn1Template, size_t size,
-                                          NSSCMSGenericWrapperDataDestroy destroy,
-                                          NSSCMSGenericWrapperDataCallback decode_before,
-                                          NSSCMSGenericWrapperDataCallback decode_after,
-                                          NSSCMSGenericWrapperDataCallback decode_end,
-                                          NSSCMSGenericWrapperDataCallback encode_start,
-                                          NSSCMSGenericWrapperDataCallback encode_before,
-                                          NSSCMSGenericWrapperDataCallback encode_after,
-                                          PRBool isData);
-
-/************************************************************************/
-SEC_END_PROTOS
-
-#endif /* _CMS_H_ */
diff --git a/openflow/usr/include/nss/cmsreclist.h b/openflow/usr/include/nss/cmsreclist.h
deleted file mode 100644
index f424aca..0000000
--- a/openflow/usr/include/nss/cmsreclist.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _CMSRECLIST_H
-#define _CMSRECLIST_H
-
-struct NSSCMSRecipientStr {
-    int riIndex;  /* this recipient's index in recipientInfo array */
-    int subIndex; /* index into recipientEncryptedKeys */
-                  /* (only in NSSCMSKeyAgreeRecipientInfoStr) */
-    enum { RLIssuerSN = 0,
-           RLSubjKeyID = 1 } kind; /* for conversion recipientinfos -> recipientlist */
-    union {
-        CERTIssuerAndSN* issuerAndSN;
-        SECItem* subjectKeyID;
-    } id;
-
-    /* result data (filled out for each recipient that's us) */
-    CERTCertificate* cert;
-    SECKEYPrivateKey* privkey;
-    PK11SlotInfo* slot;
-};
-
-typedef struct NSSCMSRecipientStr NSSCMSRecipient;
-
-#endif /* _CMSRECLIST_H */
diff --git a/openflow/usr/include/nss/cmst.h b/openflow/usr/include/nss/cmst.h
deleted file mode 100644
index 3d888bc..0000000
--- a/openflow/usr/include/nss/cmst.h
+++ /dev/null
@@ -1,491 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Header for CMS types.
- */
-
-#ifndef _CMST_H_
-#define _CMST_H_
-
-#include "seccomon.h"
-#include "secoidt.h"
-#include "certt.h"
-#include "secmodt.h"
-#include "secmodt.h"
-
-#include "plarena.h"
-
-/* Non-opaque objects.  NOTE, though: I want them to be treated as
- * opaque as much as possible.  If I could hide them completely,
- * I would.  (I tried, but ran into trouble that was taking me too
- * much time to get out of.)  I still intend to try to do so.
- * In fact, the only type that "outsiders" should even *name* is
- * NSSCMSMessage, and they should not reference its fields.
- */
-/* rjr: PKCS #11 cert handling (pk11cert.c) does use NSSCMSRecipientInfo's.
- * This is because when we search the recipient list for the cert and key we
- * want, we need to invert the order of the loops we used to have. The old
- * loops were:
- *
- *  For each recipient {
- *       find_cert = PK11_Find_AllCert(recipient->issuerSN);
- *       [which unrolls to... ]
- *       For each slot {
- *            Log into slot;
- *            search slot for cert;
- *      }
- *  }
- *
- *  the new loop searchs all the recipients at once on a slot. this allows
- *  PKCS #11 to order slots in such a way that logout slots don't get checked
- *  if we can find the cert on a logged in slot. This eliminates lots of
- *  spurious password prompts when smart cards are installed... so why this
- *  comment? If you make NSSCMSRecipientInfo completely opaque, you need
- *  to provide a non-opaque list of issuerSN's (the only field PKCS#11 needs
- *  and fix up pk11cert.c first. NOTE: Only S/MIME calls this special PKCS #11
- *  function.
- */
-
-typedef struct NSSCMSMessageStr NSSCMSMessage;
-
-typedef union NSSCMSContentUnion NSSCMSContent;
-typedef struct NSSCMSContentInfoStr NSSCMSContentInfo;
-
-typedef struct NSSCMSSignedDataStr NSSCMSSignedData;
-typedef struct NSSCMSSignerInfoStr NSSCMSSignerInfo;
-typedef struct NSSCMSSignerIdentifierStr NSSCMSSignerIdentifier;
-
-typedef struct NSSCMSEnvelopedDataStr NSSCMSEnvelopedData;
-typedef struct NSSCMSOriginatorInfoStr NSSCMSOriginatorInfo;
-typedef struct NSSCMSRecipientInfoStr NSSCMSRecipientInfo;
-
-typedef struct NSSCMSDigestedDataStr NSSCMSDigestedData;
-typedef struct NSSCMSEncryptedDataStr NSSCMSEncryptedData;
-
-typedef struct NSSCMSGenericWrapperDataStr NSSCMSGenericWrapperData;
-
-typedef struct NSSCMSAttributeStr NSSCMSAttribute;
-
-typedef struct NSSCMSDecoderContextStr NSSCMSDecoderContext;
-typedef struct NSSCMSEncoderContextStr NSSCMSEncoderContext;
-
-typedef struct NSSCMSCipherContextStr NSSCMSCipherContext;
-typedef struct NSSCMSDigestContextStr NSSCMSDigestContext;
-
-typedef struct NSSCMSContentInfoPrivateStr NSSCMSContentInfoPrivate;
-
-typedef SECStatus (*NSSCMSGenericWrapperDataCallback)(NSSCMSGenericWrapperData *);
-typedef void (*NSSCMSGenericWrapperDataDestroy)(NSSCMSGenericWrapperData *);
-
-extern const SEC_ASN1Template NSSCMSGenericWrapperDataTemplate[];
-extern const SEC_ASN1Template NSS_PointerToCMSGenericWrapperDataTemplate[];
-
-SEC_ASN1_CHOOSER_DECLARE(NSS_PointerToCMSGenericWrapperDataTemplate)
-SEC_ASN1_CHOOSER_DECLARE(NSSCMSGenericWrapperDataTemplate)
-
-/*
- * Type of function passed to NSSCMSDecode or NSSCMSDecoderStart.
- * If specified, this is where the content bytes (only) will be "sent"
- * as they are recovered during the decoding.
- * And:
- * Type of function passed to NSSCMSEncode or NSSCMSEncoderStart.
- * This is where the DER-encoded bytes will be "sent".
- *
- * XXX Should just combine this with NSSCMSEncoderContentCallback type
- * and use a simpler, common name.
- */
-typedef void (*NSSCMSContentCallback)(void *arg, const char *buf, unsigned long len);
-
-/*
- * Type of function passed to NSSCMSDecode or NSSCMSDecoderStart
- * to retrieve the decryption key.  This function is intended to be
- * used for EncryptedData content info's which do not have a key available
- * in a certificate, etc.
- */
-typedef PK11SymKey *(*NSSCMSGetDecryptKeyCallback)(void *arg, SECAlgorithmID *algid);
-
-/* =============================================================================
- * ENCAPSULATED CONTENTINFO & CONTENTINFO
- */
-
-union NSSCMSContentUnion {
-    /* either unstructured */
-    SECItem *data;
-    /* or structured data */
-    NSSCMSDigestedData *digestedData;
-    NSSCMSEncryptedData *encryptedData;
-    NSSCMSEnvelopedData *envelopedData;
-    NSSCMSSignedData *signedData;
-    NSSCMSGenericWrapperData *genericData;
-    /* or anonymous pointer to something */
-    void *pointer;
-};
-
-struct NSSCMSContentInfoStr {
-    SECItem contentType;
-    NSSCMSContent content;
-    /* --------- local; not part of encoding --------- */
-    SECOidData *contentTypeTag;
-
-    /* additional info for encryptedData and envelopedData */
-    /* we waste this space for signedData and digestedData. sue me. */
-
-    SECAlgorithmID contentEncAlg;
-    SECItem *rawContent; /* encrypted DER, optional */
-                         /* XXXX bytes not encrypted, but encoded? */
-    /* --------- local; not part of encoding --------- */
-    PK11SymKey *bulkkey;                   /* bulk encryption key */
-    int keysize;                           /* size of bulk encryption key
-                                           * (only used by creation code) */
-    SECOidTag contentEncAlgTag;            /* oid tag of encryption algorithm
-                                           * (only used by creation code) */
-    NSSCMSContentInfoPrivate *privateInfo; /* place for NSS private info */
-    void *reserved;                        /* keep binary compatibility */
-};
-
-/* =============================================================================
- * MESSAGE
- */
-
-struct NSSCMSMessageStr {
-    NSSCMSContentInfo contentInfo; /* "outer" cinfo */
-    /* --------- local; not part of encoding --------- */
-    PLArenaPool *poolp;
-    PRBool poolp_is_ours;
-    int refCount;
-    /* properties of the "inner" data */
-    SECAlgorithmID **detached_digestalgs;
-    SECItem **detached_digests;
-    void *pwfn_arg;
-    NSSCMSGetDecryptKeyCallback decrypt_key_cb;
-    void *decrypt_key_cb_arg;
-};
-
-/* ============================================================================
- * GENERIC WRAPPER
- *
- * used for user defined types.
- */
-struct NSSCMSGenericWrapperDataStr {
-    NSSCMSContentInfo contentInfo;
-    /* ---- local; not part of encoding ------ */
-    NSSCMSMessage *cmsg;
-    /* wrapperspecific data starts here */
-};
-
-/* =============================================================================
- * SIGNEDDATA
- */
-
-struct NSSCMSSignedDataStr {
-    SECItem version;
-    SECAlgorithmID **digestAlgorithms;
-    NSSCMSContentInfo contentInfo;
-    SECItem **rawCerts;
-    CERTSignedCrl **crls;
-    NSSCMSSignerInfo **signerInfos;
-    /* --------- local; not part of encoding --------- */
-    NSSCMSMessage *cmsg; /* back pointer to message */
-    SECItem **digests;
-    CERTCertificate **certs;
-    CERTCertificateList **certLists;
-    CERTCertificate **tempCerts; /* temporary certs, needed
-                                  * for example for signature
-                                  * verification */
-};
-#define NSS_CMS_SIGNED_DATA_VERSION_BASIC 1 /* what we *create* */
-#define NSS_CMS_SIGNED_DATA_VERSION_EXT 3   /* what we *create* */
-
-typedef enum {
-    NSSCMSVS_Unverified = 0,
-    NSSCMSVS_GoodSignature = 1,
-    NSSCMSVS_BadSignature = 2,
-    NSSCMSVS_DigestMismatch = 3,
-    NSSCMSVS_SigningCertNotFound = 4,
-    NSSCMSVS_SigningCertNotTrusted = 5,
-    NSSCMSVS_SignatureAlgorithmUnknown = 6,
-    NSSCMSVS_SignatureAlgorithmUnsupported = 7,
-    NSSCMSVS_MalformedSignature = 8,
-    NSSCMSVS_ProcessingError = 9
-} NSSCMSVerificationStatus;
-
-typedef enum {
-    NSSCMSSignerID_IssuerSN = 0,
-    NSSCMSSignerID_SubjectKeyID = 1
-} NSSCMSSignerIDSelector;
-
-struct NSSCMSSignerIdentifierStr {
-    NSSCMSSignerIDSelector identifierType;
-    union {
-        CERTIssuerAndSN *issuerAndSN;
-        SECItem *subjectKeyID;
-    } id;
-};
-
-struct NSSCMSSignerInfoStr {
-    SECItem version;
-    NSSCMSSignerIdentifier signerIdentifier;
-    SECAlgorithmID digestAlg;
-    NSSCMSAttribute **authAttr;
-    SECAlgorithmID digestEncAlg;
-    SECItem encDigest;
-    NSSCMSAttribute **unAuthAttr;
-    /* --------- local; not part of encoding --------- */
-    NSSCMSMessage *cmsg; /* back pointer to message */
-    CERTCertificate *cert;
-    CERTCertificateList *certList;
-    PRTime signingTime;
-    NSSCMSVerificationStatus verificationStatus;
-    SECKEYPrivateKey *signingKey; /* Used if we're using subjKeyID*/
-    SECKEYPublicKey *pubKey;
-};
-#define NSS_CMS_SIGNER_INFO_VERSION_ISSUERSN 1 /* what we *create* */
-#define NSS_CMS_SIGNER_INFO_VERSION_SUBJKEY 3  /* what we *create* */
-
-typedef enum {
-    NSSCMSCM_None = 0,
-    NSSCMSCM_CertOnly = 1,
-    NSSCMSCM_CertChain = 2,
-    NSSCMSCM_CertChainWithRoot = 3
-} NSSCMSCertChainMode;
-
-/* =============================================================================
- * ENVELOPED DATA
- */
-struct NSSCMSEnvelopedDataStr {
-    SECItem version;
-    NSSCMSOriginatorInfo *originatorInfo; /* optional */
-    NSSCMSRecipientInfo **recipientInfos;
-    NSSCMSContentInfo contentInfo;
-    NSSCMSAttribute **unprotectedAttr;
-    /* --------- local; not part of encoding --------- */
-    NSSCMSMessage *cmsg; /* back pointer to message */
-};
-#define NSS_CMS_ENVELOPED_DATA_VERSION_REG 0 /* what we *create* */
-#define NSS_CMS_ENVELOPED_DATA_VERSION_ADV 2 /* what we *create* */
-
-struct NSSCMSOriginatorInfoStr {
-    SECItem **rawCerts;
-    CERTSignedCrl **crls;
-    /* --------- local; not part of encoding --------- */
-    CERTCertificate **certs;
-};
-
-/* -----------------------------------------------------------------------------
- * key transport recipient info
- */
-typedef enum {
-    NSSCMSRecipientID_IssuerSN = 0,
-    NSSCMSRecipientID_SubjectKeyID = 1,
-    NSSCMSRecipientID_BrandNew = 2
-} NSSCMSRecipientIDSelector;
-
-struct NSSCMSRecipientIdentifierStr {
-    NSSCMSRecipientIDSelector identifierType;
-    union {
-        CERTIssuerAndSN *issuerAndSN;
-        SECItem *subjectKeyID;
-    } id;
-};
-typedef struct NSSCMSRecipientIdentifierStr NSSCMSRecipientIdentifier;
-
-struct NSSCMSKeyTransRecipientInfoStr {
-    SECItem version;
-    NSSCMSRecipientIdentifier recipientIdentifier;
-    SECAlgorithmID keyEncAlg;
-    SECItem encKey;
-};
-typedef struct NSSCMSKeyTransRecipientInfoStr NSSCMSKeyTransRecipientInfo;
-
-/*
- * View comments before NSSCMSRecipientInfoStr for purpose of this
- * structure.
- */
-struct NSSCMSKeyTransRecipientInfoExStr {
-    NSSCMSKeyTransRecipientInfo recipientInfo;
-    int version; /* version of this structure (0) */
-    SECKEYPublicKey *pubKey;
-};
-
-typedef struct NSSCMSKeyTransRecipientInfoExStr NSSCMSKeyTransRecipientInfoEx;
-
-#define NSS_CMS_KEYTRANS_RECIPIENT_INFO_VERSION_ISSUERSN 0 /* what we *create* */
-#define NSS_CMS_KEYTRANS_RECIPIENT_INFO_VERSION_SUBJKEY 2  /* what we *create* */
-
-/* -----------------------------------------------------------------------------
- * key agreement recipient info
- */
-struct NSSCMSOriginatorPublicKeyStr {
-    SECAlgorithmID algorithmIdentifier;
-    SECItem publicKey; /* bit string! */
-};
-typedef struct NSSCMSOriginatorPublicKeyStr NSSCMSOriginatorPublicKey;
-
-typedef enum {
-    NSSCMSOriginatorIDOrKey_IssuerSN = 0,
-    NSSCMSOriginatorIDOrKey_SubjectKeyID = 1,
-    NSSCMSOriginatorIDOrKey_OriginatorPublicKey = 2
-} NSSCMSOriginatorIDOrKeySelector;
-
-struct NSSCMSOriginatorIdentifierOrKeyStr {
-    NSSCMSOriginatorIDOrKeySelector identifierType;
-    union {
-        CERTIssuerAndSN *issuerAndSN;                  /* static-static */
-        SECItem *subjectKeyID;                         /* static-static */
-        NSSCMSOriginatorPublicKey originatorPublicKey; /* ephemeral-static */
-    } id;
-};
-typedef struct NSSCMSOriginatorIdentifierOrKeyStr NSSCMSOriginatorIdentifierOrKey;
-
-struct NSSCMSRecipientKeyIdentifierStr {
-    SECItem *subjectKeyIdentifier;
-    SECItem *date;  /* optional */
-    SECItem *other; /* optional */
-};
-typedef struct NSSCMSRecipientKeyIdentifierStr NSSCMSRecipientKeyIdentifier;
-
-typedef enum {
-    NSSCMSKeyAgreeRecipientID_IssuerSN = 0,
-    NSSCMSKeyAgreeRecipientID_RKeyID = 1
-} NSSCMSKeyAgreeRecipientIDSelector;
-
-struct NSSCMSKeyAgreeRecipientIdentifierStr {
-    NSSCMSKeyAgreeRecipientIDSelector identifierType;
-    union {
-        CERTIssuerAndSN *issuerAndSN;
-        NSSCMSRecipientKeyIdentifier recipientKeyIdentifier;
-    } id;
-};
-typedef struct NSSCMSKeyAgreeRecipientIdentifierStr NSSCMSKeyAgreeRecipientIdentifier;
-
-struct NSSCMSRecipientEncryptedKeyStr {
-    NSSCMSKeyAgreeRecipientIdentifier recipientIdentifier;
-    SECItem encKey;
-};
-typedef struct NSSCMSRecipientEncryptedKeyStr NSSCMSRecipientEncryptedKey;
-
-struct NSSCMSKeyAgreeRecipientInfoStr {
-    SECItem version;
-    NSSCMSOriginatorIdentifierOrKey originatorIdentifierOrKey;
-    SECItem *ukm; /* optional */
-    SECAlgorithmID keyEncAlg;
-    NSSCMSRecipientEncryptedKey **recipientEncryptedKeys;
-};
-typedef struct NSSCMSKeyAgreeRecipientInfoStr NSSCMSKeyAgreeRecipientInfo;
-
-#define NSS_CMS_KEYAGREE_RECIPIENT_INFO_VERSION 3 /* what we *create* */
-
-/* -----------------------------------------------------------------------------
- * KEK recipient info
- */
-struct NSSCMSKEKIdentifierStr {
-    SECItem keyIdentifier;
-    SECItem *date;  /* optional */
-    SECItem *other; /* optional */
-};
-typedef struct NSSCMSKEKIdentifierStr NSSCMSKEKIdentifier;
-
-struct NSSCMSKEKRecipientInfoStr {
-    SECItem version;
-    NSSCMSKEKIdentifier kekIdentifier;
-    SECAlgorithmID keyEncAlg;
-    SECItem encKey;
-};
-typedef struct NSSCMSKEKRecipientInfoStr NSSCMSKEKRecipientInfo;
-
-#define NSS_CMS_KEK_RECIPIENT_INFO_VERSION 4 /* what we *create* */
-
-/* -----------------------------------------------------------------------------
- * recipient info
- */
-
-typedef enum {
-    NSSCMSRecipientInfoID_KeyTrans = 0,
-    NSSCMSRecipientInfoID_KeyAgree = 1,
-    NSSCMSRecipientInfoID_KEK = 2
-} NSSCMSRecipientInfoIDSelector;
-
-/*
- * In order to preserve backwards binary compatibility when implementing
- * creation of Recipient Info's that uses subjectKeyID in the
- * keyTransRecipientInfo we need to stash a public key pointer in this
- * structure somewhere.  We figured out that NSSCMSKeyTransRecipientInfo
- * is the smallest member of the ri union.  We're in luck since that's
- * the very structure that would need to use the public key. So we created
- * a new structure NSSCMSKeyTransRecipientInfoEx which has a member
- * NSSCMSKeyTransRecipientInfo as the first member followed by a version
- * and a public key pointer.  This way we can keep backwards compatibility
- * without changing the size of this structure.
- *
- * BTW, size of structure:
- * NSSCMSKeyTransRecipientInfo:  9 ints, 4 pointers
- * NSSCMSKeyAgreeRecipientInfo: 12 ints, 8 pointers
- * NSSCMSKEKRecipientInfo:      10 ints, 7 pointers
- *
- * The new structure:
- * NSSCMSKeyTransRecipientInfoEx: sizeof(NSSCMSKeyTransRecipientInfo) +
- *                                1 int, 1 pointer
- */
-
-struct NSSCMSRecipientInfoStr {
-    NSSCMSRecipientInfoIDSelector recipientInfoType;
-    union {
-        NSSCMSKeyTransRecipientInfo keyTransRecipientInfo;
-        NSSCMSKeyAgreeRecipientInfo keyAgreeRecipientInfo;
-        NSSCMSKEKRecipientInfo kekRecipientInfo;
-        NSSCMSKeyTransRecipientInfoEx keyTransRecipientInfoEx;
-    } ri;
-    /* --------- local; not part of encoding --------- */
-    NSSCMSMessage *cmsg;   /* back pointer to message */
-    CERTCertificate *cert; /* recipient's certificate */
-};
-
-/* =============================================================================
- * DIGESTED DATA
- */
-struct NSSCMSDigestedDataStr {
-    SECItem version;
-    SECAlgorithmID digestAlg;
-    NSSCMSContentInfo contentInfo;
-    SECItem digest;
-    /* --------- local; not part of encoding --------- */
-    NSSCMSMessage *cmsg; /* back pointer */
-    SECItem cdigest;     /* calculated digest */
-};
-#define NSS_CMS_DIGESTED_DATA_VERSION_DATA 0  /* what we *create* */
-#define NSS_CMS_DIGESTED_DATA_VERSION_ENCAP 2 /* what we *create* */
-
-/* =============================================================================
- * ENCRYPTED DATA
- */
-struct NSSCMSEncryptedDataStr {
-    SECItem version;
-    NSSCMSContentInfo contentInfo;
-    NSSCMSAttribute **unprotectedAttr; /* optional */
-    /* --------- local; not part of encoding --------- */
-    NSSCMSMessage *cmsg; /* back pointer */
-};
-#define NSS_CMS_ENCRYPTED_DATA_VERSION 0        /* what we *create* */
-#define NSS_CMS_ENCRYPTED_DATA_VERSION_UPATTR 2 /* what we *create* */
-
-/*
- * *****************************************************************************
- * *****************************************************************************
- * *****************************************************************************
- */
-
-/*
- * See comment above about this type not really belonging to CMS.
- */
-struct NSSCMSAttributeStr {
-    /* The following fields make up an encoded Attribute: */
-    SECItem type;
-    SECItem **values; /* data may or may not be encoded */
-    /* The following fields are not part of an encoded Attribute: */
-    SECOidData *typeTag;
-    PRBool encoded; /* when true, values are encoded */
-};
-
-#endif /* _CMST_H_ */
diff --git a/openflow/usr/include/nss/crmf.h b/openflow/usr/include/nss/crmf.h
deleted file mode 100644
index c56e289..0000000
--- a/openflow/usr/include/nss/crmf.h
+++ /dev/null
@@ -1,1741 +0,0 @@
-/* -*- Mode: C; tab-width: 8 -*-*/
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _CRMF_H_
-#define _CRMF_H_
-
-#include "seccomon.h"
-#include "cert.h"
-#include "crmft.h"
-#include "secoid.h"
-#include "secpkcs7.h"
-
-SEC_BEGIN_PROTOS
-
-/*
- * FUNCTION: CRMF_EncodeCertReqMsg
- * INPUTS:
- *    inCertReqMsg
- *        The Certificate Request Message to be encoded.
- *    fn
- *        A Callback function that the ASN1 encoder calls whenever
- *        the encoder wants to write out some DER encoded bytes.
- *    arg
- *        An opaque pointer that gets passed to the function fn
- * OUTPUT:
- *    The function fn will be called multiple times.  Look at the
- *    comments in crmft.h where the CRMFEncoderOutputCallback type is
- *    defined for information on proper behavior of the function fn.
- * RETURN:
- *    SECSuccess if encoding was successful.  Any other return value
- *    indicates an error occurred during encoding.
- */
-extern SECStatus
-CRMF_EncodeCertReqMsg(CRMFCertReqMsg *inCertReqMsg,
-                      CRMFEncoderOutputCallback fn,
-                      void *arg);
-
-/*
- * FUNCTION: CRMF_EncoderCertRequest
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to be encoded.
- *    fn
- *        A Callback function that the ASN1 encoder calls whenever
- *        the encoder wants to write out some DER encoded bytes.
- *    arg
- *        An opaque pointer that gets passed to the function fn.
- * OUTPUT:
- *    The function fn will be called, probably multiple times whenever
- *    the ASN1 encoder wants to write out DER-encoded bytes.  Look at the
- *    comments in crmft.h where the CRMFEncoderOutputCallback type is
- *    defined for information on proper behavior of the function fn.
- * RETURN:
- *    SECSuccess if encoding was successful.  Any other return value
- *    indicates an error occurred during encoding.
- */
-extern SECStatus CRMF_EncodeCertRequest(CRMFCertRequest *inCertReq,
-                                        CRMFEncoderOutputCallback fn,
-                                        void *arg);
-/*
- * FUNCTION: CRMF_EncodeCertReqMessages
- * INPUTS:
- *    inCertReqMsgs
- *        An array of pointers to the Certificate Request Messages
- *        to encode.  The user must place a NULL pointer in the index
- *        after the last message to be encoded.  When the library runs
- *        into the NULL pointer, the library assumes there are no more
- *        messages to encode.
- *    fn
- *        A Callback function that the ASN1 encoder calls whenever
- *        the encoder wants to write out some DER encoded byts.
- *    arg
- *        An opaque pointer that gets passed to the function fn.
- *
- * NOTES:
- *    The parameter inCertReqMsgs needs to be an array with a NULL pointer
- *    to signal the end of messages.  An array in the form of
- *    {m1, m2, m3, NULL, m4, ...} will only encode the messages m1, m2, and
- *    m3.  All messages from m4 on will not be looked at by the library.
- *
- * OUTPUT:
- *    The function fn will be called, probably multiple times.  Look at the
- *    comments in crmft.h where the CRMFEncoderOutputCallback type is
- *    defined for information on proper behavior of the function fn.
- *
- * RETURN:
- * SECSuccess if encoding the Certificate Request Messages was successful.
- * Any other return value indicates an error occurred while encoding the
- * certificate request messages.
- */
-extern SECStatus
-CRMF_EncodeCertReqMessages(CRMFCertReqMsg **inCertReqMsgs,
-                           CRMFEncoderOutputCallback fn,
-                           void *arg);
-
-/*
- * FUNCTION: CRMF_CreateCertReqMsg
- * INPUTS:
- *    NONE
- * OUTPUT:
- *    An empty CRMF Certificate Request Message.
- *    Before encoding this message, the user must set
- *    the ProofOfPossession field and the certificate
- *    request which are necessary for the full message.
- *    After the user no longer needs this CertReqMsg,
- *    the user must call CRMF_DestroyCertReqMsg to free
- *    all memory associated with the Certificate Request
- *    Message.
- * RETURN:
- *    A pointer to a Certificate Request Message.  The user
- *    must pass the return value of this function to
- *    CRMF_DestroyCertReqMsg after the Certificate Request
- *    Message is no longer necessary.
- */
-extern CRMFCertReqMsg *CRMF_CreateCertReqMsg(void);
-
-/*
- * FUNCTION: CRMF_DestroyCertReqMsg
- * INPUTS:
- *    inCertReqMsg
- *        The Certificate Request Message to destroy.
- *  NOTES:
- *    This function frees all the memory used for the Certificate
- *    Request Message and all the memory used in making copies of
- *    fields of elelments of the message, eg. the Proof Of Possession
- *    filed and the Cetificate Request.
- * RETURN:
- *    SECSuccess if destruction was successful.  Any other return value
- *    indicates an error while trying to free the memory associated
- *    with inCertReqMsg.
- *
- */
-extern SECStatus CRMF_DestroyCertReqMsg(CRMFCertReqMsg *inCertReqMsg);
-
-/*
- * FUNCTION: CRMF_CertReqMsgSetCertRequest
- * INPUTS:
- *    inCertReqMsg
- *        The Certificate Request Message that the function will set
- *        the certificate request for.
- *    inCertReq
- *        The Certificate Request that will be added to the Certificate
- *        Request Message.
- * NOTES:
- *    This function will make a copy of the Certificate Request passed in
- *    and store it as part of the Certificate Request Message.  Therefore,
- *    the user must not call this function until the Certificate Request
- *    has been fully built and is ready to be encoded.
- * RETURN:
- *    SECSuccess
- *        If copying the Certificate as a member of the Certificate
- *        request message was successful.
- *    Any other return value indicates a failure to copy the Certificate
- *    Request and make it a part of the Certificate Request Message.
- */
-extern SECStatus CRMF_CertReqMsgSetCertRequest(CRMFCertReqMsg *inCertReqMsg,
-                                               CRMFCertRequest *inCertReq);
-
-/*
- * FUNCTION: CRMF_CreateCertRequest
- * INPUTS:
- *    inRequestID
- *        The ID that will be associated with this certificate request.
- * OUTPUTS:
- *    A certificate request which only has the requestID set.
- * NOTES:
- *    The user must call the function CRMF_DestroyCertRequest when
- *    the returned value is no longer needed.  This is usually the
- *    case after fully constructing the Certificate Request and then
- *    calling the function CRMF_CertReqMsgSetCertRequest.
- * RETURN:
- *    A pointer to the new Certificate Request.  A NULL return value
- *    indicates an error in creating the Certificate Request.
- */
-extern CRMFCertRequest *CRMF_CreateCertRequest(PRUint32 inRequestID);
-
-/*
- * FUNCTION: CRMF_DestroyCertRequest
- * INPUTS:
- *    inCertReq
- *        The Certificate Request that will be destroyed.
- * RETURN:
- *    SECSuccess
- *        If freeing the memory associated with the certificate request
- *        was successful.
- *    Any other return value indicates an error while trying to free the
- *    memory.
- */
-extern SECStatus CRMF_DestroyCertRequest(CRMFCertRequest *inCertReq);
-
-/*
- * FUNCTION: CRMF_CreateCertExtension
- * INPUTS:
- *    id
- *        The SECOidTag to associate with this CertExtension.  This must
- *        correspond to a valid Certificate Extension, if not the function
- *        will fail.
- *    isCritical
- *        A boolean value stating if the extension value is crtical.  PR_TRUE
- *        means the value is crtical.  PR_FALSE indicates the value is not
- *        critical.
- *    data
- *        This is the data associated with the extension.  The user of the
- *        library is responsible for making sure the value passed in is a
- *        valid interpretation of the certificate extension.
- * NOTES:
- * Use this function to create CRMFCertExtension Structures which will
- * then be passed to CRMF_AddFieldToCertTemplate as part of the
- * CRMFCertCreationInfo.extensions  The user must call
- * CRMF_DestroyCertExtension after the extension has been added to a certifcate
- * and the extension is no longer needed.
- *
- * RETURN:
- * A pointer to a newly created CertExtension.  A return value of NULL
- * indicates the id passed in was an invalid certificate extension.
- */
-extern CRMFCertExtension *CRMF_CreateCertExtension(SECOidTag id,
-                                                   PRBool isCritical,
-                                                   SECItem *data);
-
-/*
- * FUNCTION: CMRF_DestroyCertExtension
- * INPUTS:
- *    inExtension
- *        The Cert Extension to destroy
- * NOTES:
- * Destroy a structure allocated by CRMF_CreateCertExtension.
- *
- * RETURN:
- * SECSuccess if freeing the memory associated with the certificate extension
- * was successful.  Any other error indicates an error while freeing the
- * memory.
- */
-extern SECStatus CRMF_DestroyCertExtension(CRMFCertExtension *inExtension);
-
-/*
- * FUNCTION: CRMF_CertRequestSetTemplateField
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to operate on.
- *    inTemplateField
- *        An enumeration that indicates which field of the Certificate
- *        template to add.
- *    data
- *        A generic pointer that will be type cast according to the
- *        table under NOTES and used as the key for adding to the
- *        certificate template;
- * NOTES:
- *
- * Below is a table that tells what type to pass in as data
- * depending on the template field one wants to set.
- *
- * Look in crmft.h for the definition of CRMFCertTemplateField.
- *
- * In all cases, the library makes copies of the data passed in.
- *
- *   CRMFCertTemplateField    Type of data    What data means
- *   ---------------------    ------------    ---------------
- *   crmfVersion              long *          The version of
- *                                            the certificate
- *                                            to be created.
- *
- *   crmfSerialNumber         long *          The serial number
- *                                            for the cert to be
- *                                            created.
- *
- *   crmfSigningAlg           SECAlgorithm *  The ASN.1 object ID for
- *                                            the algorithm used in encoding
- *                                            the certificate.
- *
- *   crmfIssuer               CERTName *      Certificate Library
- *                                            representation of the ASN1 type
- *                                            Name from X.509
- *
- *   crmfValidity     CRMFValidityCreationInfo *  At least one of the two
- *                                                fields in the structure must
- *                                                be present.  A NULL pointer
- *                                                in the structure indicates
- *                                                that member should not be
- *                                                added.
- *
- *   crmfSubject              CERTName *      Certificate Library
- *                                            representation of the ASN1 type
- *                                            Name from X.509
- *
- *   crmfPublicKey    CERTSubjectPublicKeyInfo *  The public key info for the
- *                                                certificate being requested.
- *
- *   crmfIssuerUID            SECItem *           A bit string representation
- *                                                of the issuer UID. NOTE: The
- *                                                length is the number of bits
- *                                                and not the number of bytes.
- *
- *   crmfSubjectUID           SECItem*            A bit string representation
- *                                                of the subject UID. NOTE: The
- *                                                length is the number of bits
- *                                                and not the number of bytes.
- *
- *   crmfExtension   CRMFCertExtCreationInfo *     A pointer to the structure
- *                                                 populated with an array of
- *                                                 of certificate extensions
- *                                                 and an integer that tells
- *                                                 how many elements are in the
- *                                                 array. Look in crmft.h for
- *                                                 the definition of
- *                                                 CRMFCertExtCreationInfo
- * RETURN:
- *    SECSuccess if adding the desired field to the template was successful.
- *    Any other return value indicates failure when trying to add the field
- *    to the template.
- *
- */
-extern SECStatus
-CRMF_CertRequestSetTemplateField(CRMFCertRequest *inCertReq,
-                                 CRMFCertTemplateField inTemplateField,
-                                 void *data);
-
-/*
- * FUNCTION: CRMF_CertRequestIsFieldPresent
- * INPUTS:
- *    inCertReq
- *        The certificate request to operate on.
- *    inTemplateField
- *        The enumeration for the template field the user wants to query
- *        about.
- * NOTES:
- * This function checks to see if the the field associated with inTemplateField
- * enumeration is already present in the certificate request passed in.
- *
- * RETURN:
- * The function returns PR_TRUE if the field associated with inTemplateField
- * is already present in the certificate request.  If the field is not present
- * the function returns PR_FALSE.
- */
-extern PRBool
-CRMF_CertRequestIsFieldPresent(CRMFCertRequest *inCertReq,
-                               CRMFCertTemplateField inTemplateField);
-
-/*
- * FUNCTION: CRMF_CertRequestIsControlPresent
- * INPUTS:
- *    inCertReq
- *        The certificate request to operate on.
- *    inControlType
- *        The type of control to look for.
- * NOTES:
- * This function looks at the control present in the certificate request
- * and returns PR_TRUE iff a control of type inControlType already exists.
- * The CRMF draft does not explicitly state that two controls of the same
- * type can not exist within the same request.  So the library will not
- * cause an error if you try to add a control and one of the same type
- * already exists.  It is up to the application to ensure that multiple
- * controls of the same type do not exist, if that is the desired behavior
- * by the application.
- *
- * RETURN:
- * The function returns PR_TRUE if a control of type inControlType already
- * exists in the certificate request.  If a control of type inControlType
- * does not exist, the function will return PR_FALSE.
- */
-extern PRBool
-CRMF_CertRequestIsControlPresent(CRMFCertRequest *inCertReq,
-                                 CRMFControlType inControlType);
-
-/*
- * FUNCTION: CRMF_CertRequestSetRegTokenControl
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to operate on.
- *    value
- *        The UTF8 value which will be the Registration Token Control
- *        for this Certificate Request.
- * NOTES:
- *    The library does no verification that the value passed in is
- *    a valid UTF8 value.  The caller must make sure of this in order
- *    to get an encoding that is valid.  The library will ultimately
- *    encode this value as it was passed in.
- * RETURN:
- *    SECSucces on successful addition of the Registration Token Control.
- *    Any other return value indicates an unsuccessful attempt to add the
- *    control.
- *
- */
-extern SECStatus CRMF_CertRequestSetRegTokenControl(CRMFCertRequest *inCertReq,
-                                                    SECItem *value);
-
-/*
- * FUNCTION: CRMF_CertRequestSetAuthenticatorControl
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to operate on.
- *    value
- *        The UTF8 value that will become the Authenticator Control
- *        for the passed in Certificate Request.
- * NOTES:
- *    The library does no verification that the value passed in is
- *    a valid UTF8 value.  The caller must make sure of this in order
- *    to get an encoding that is valid.  The library will ultimately
- *    encode this value as it was passed in.
- * RETURN:
- *    SECSucces on successful addition of the Authenticator Control.
- *    Any other return value indicates an unsuccessful attempt to add the
- *    control.
- */
-extern SECStatus
-CRMF_CertRequestSetAuthenticatorControl(CRMFCertRequest *inCertReq,
-                                        SECItem *value);
-
-/*
- * FUNCTION: CRMF_CreateEncryptedKeyWithencryptedValue
- * INPUTS:
- *    inPrivKey
- *        This is the private key associated with a certificate that is
- *        being requested.  This structure will eventually wind up as
- *        a part of the PKIArchiveOptions Control.
- *    inCACert
- *        This is the certificate for the CA that will be receiving the
- *        certificate request for the private key passed in.
- * OUTPUT:
- *    A CRMFEncryptedKey that can ultimately be used as part of the
- *    PKIArchiveOptions Control.
- *
- * RETURN:
- *    A pointer to a CRMFEncyptedKey.  A NULL return value indicates an erro
- *    during the creation of the encrypted key.
- */
-extern CRMFEncryptedKey *
-CRMF_CreateEncryptedKeyWithEncryptedValue(SECKEYPrivateKey *inPrivKey,
-                                          CERTCertificate *inCACert);
-
-/*
- * FUNCTION: CRMF_DestroyEncryptedKey
- * INPUTS:
- *    inEncrKey
- *        The CRMFEncryptedKey to be destroyed.
- * NOTES:
- *    Frees all memory associated with the CRMFEncryptedKey passed in.
- * RETURN:
- *    SECSuccess if freeing the memory was successful.  Any other return
- *    value indicates an error while freeig the memroy.
- */
-extern SECStatus CRMF_DestroyEncryptedKey(CRMFEncryptedKey *inEncrKey);
-
-/*
- * FUNCTION: CRMF_CreatePKIArchiveOptions
- * INPUTS:
- *    inType
- *        An enumeration value indicating which option for
- *        PKIArchiveOptions to use.
- *    data
- *        A pointer that will be type-cast and de-referenced according
- *        to the table under NOTES.
- * NOTES:
- * A table listing what should be passed in as data
- * ------------------------------------------------
- *
- * inType                            data
- * ------                            ----
- * crmfEncryptedPrivateKey           CRMFEncryptedKey*
- * crmfKeyGenParameters              SECItem*(This needs to be an octet string)
- * crmfArchiveRemGenPrivKey          PRBool*
- *
- * RETURN:
- *    A pointer the a CRMFPKIArchiveOptions that can be added to a Certificate
- *    Request.  A NULL pointer indicates an error occurred while creating
- *    the CRMFPKIArchiveOptions Structure.
- */
-extern CRMFPKIArchiveOptions *
-CRMF_CreatePKIArchiveOptions(CRMFPKIArchiveOptionsType inType,
-                             void *data);
-/*
- * FUNCTION: CRMF_DestroyPKIArchiveOptions
- * INPUTS:
- *    inArchOpt
- *        A pointer to the CRMFPKIArchiveOptions structure to free.
- * NOTES:
- *    Will free all memory associated with 'inArchOpt'.
- * RETURN:
- *    SECSuccess if successful in freeing the memory used by 'inArchOpt'
- *    Any other return value indicates an error while freeing the memory.
- */
-extern SECStatus
-CRMF_DestroyPKIArchiveOptions(CRMFPKIArchiveOptions *inArchOpt);
-
-/*
- * FUNCTION: CRMF_CertRequestSetPKIArchiveOptions
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to add the the options to.
- *    inOptions
- *        The Archive Options to add to the Certificate Request.
- * NOTES:
- *    Adds the PKIArchiveOption to the Certificate Request.  This is what
- *    enables Key Escrow to take place through CRMF.  The library makes
- *    its own copy of the information.
- * RETURN:
- *    SECSuccess if successful in adding the ArchiveOptions to the Certificate
- *    request.  Any other return value indicates an error when trying to add
- *    the Archive Options  to the Certificate Request.
- */
-extern SECStatus
-CRMF_CertRequestSetPKIArchiveOptions(CRMFCertRequest *inCertReq,
-                                     CRMFPKIArchiveOptions *inOptions);
-
-/*
- * FUNCTION: CRMF_CertReqMsgGetPOPType
- * INPUTS:
- *    inCertReqMsg
- *        The Certificate Request Message to operate on.
- * NOTES:
- *    Returns an enumeration value indicating the method of Proof
- *    of Possession that was used for the passed in Certificate Request
- *    Message.
- * RETURN:
- *    An enumeration indicating what method for Proof Of Possession is
- *    being used in this Certificate Request Message.  Look in the file
- *    crmft.h for the definition of CRMFPOPChoice for the possible return
- *    values.
- */
-extern CRMFPOPChoice CRMF_CertReqMsgGetPOPType(CRMFCertReqMsg *inCertReqMsg);
-
-/*
- * FUNCTION: CRMF_CertReqMsgSetRAVerifiedPOP
- * INPUT:
- *    InCertReqMsg
- *        The Certificate Request Message to operate on.
- * NOTES:
- *    This function will set the method of Proof Of Possession to
- *    crmfRAVerified which means the RA has already verified the
- *    requester does possess the private key.
- * RETURN:
- *    SECSuccess if adding RAVerified to the message is successful.
- *    Any other message indicates an error while trying to add RAVerified
- *    as the Proof of Possession.
- */
-extern SECStatus CRMF_CertReqMsgSetRAVerifiedPOP(CRMFCertReqMsg *inCertReqMsg);
-
-/*
- * FUNCTION: CRMF_CertReqMsgSetSignaturePOP
- * INPUT:
- *    inCertReqMsg
- *        The Certificate Request Message to add the SignaturePOP to.
- *    inPrivKey
- *        The Private Key which corresponds to the the Certificate Request
- *        Message.
- *    inPubKey
- *        The Public Key which corresponds to the Private Key passed in.
- *    inCertForInput
- *        A Certificate that in the future may be used to create
- *        POPOSigningKeyInput.
- *    fn
- *        A callback for retrieving a password which may be used in the
- *       future to generate POPOSigningKeyInput.
- *    arg
- *        An opaque pointer that would be passed to fn whenever it is
- *        called.
- * NOTES:
- * Adds Proof Of Possession to the CertRequest using the signature field
- * of the ProofOfPossession field.  NOTE: In order to use this option,
- * the certificate template must contain the publicKey at the very minimum.
- *
- * If you don't want the function to generate POPOSigningKeyInput, then
- * make sure the cert template already contains the subject and public key
- * values.  Currently creating POPOSigningKeyInput is not supported, so
- * a Message passed to this function must have the publicKey and the subject
- * as part of the template
- *
- * This will take care of creating the entire POPOSigningKey structure
- * that will become part of the message.
- *
- * inPrivKey is the key to be used in the signing operation when creating
- * POPOSigningKey structure.  This should be the key corresponding to
- * the certificate being requested.
- *
- * inCertForInput will be used if POPOSigningKeyInput needs to be generated.
- * It will be used in generating the authInfo.sender field.  If the parameter
- * is not passed in then authInfo.publicKeyMAC will be generated instead.
- * If passed in, this certificate needs to be a valid certificate.
- *
- * The last 3 arguments are for future compatibility in case we ever want to
- * support generating POPOSigningKeyInput.  Pass in NULL for all 3 if you
- * definitely don't want the function to even try to generate
- * POPOSigningKeyInput.  If you try to use POPOSigningKeyInput, the function
- * will fail.
- *
- * RETURN:
- *    SECSuccess if adding the Signature Proof Of Possession worked.
- *    Any other return value indicates an error in trying to add
- *    the Signature Proof Of Possession.
- */
-extern SECStatus
-CRMF_CertReqMsgSetSignaturePOP(CRMFCertReqMsg *inCertReqMsg,
-                               SECKEYPrivateKey *inPrivKey,
-                               SECKEYPublicKey *inPubKey,
-                               CERTCertificate *inCertForInput,
-                               CRMFMACPasswordCallback fn,
-                               void *arg);
-
-/*
- * FUNCTION: CRMF_CertReqMsgSetKeyEnciphermentPOP
- * INPUTS:
- *    inCertReqMsg
- *        The Certificate Request Message to operate on.
- *    inKeyChoice
- *        An enumeration indicating which POPOPrivKey Choice to use
- *        in constructing the KeyEnciphermentPOP.
- *    subseqMess
- *        This parameter must be provided iff inKeyChoice is
- *        crmfSubsequentMessage.  This details how the RA is to respond
- *        in order to perform Proof Of Possession.  Look in crmft.h under
- *        the definition of CRMFSubseqMessOptions for possible values.
- *    encPrivKey
- *        This parameter only needs to be provided if inKeyChoice is
- *        crmfThisMessage.  The item should contain the encrypted private
- *        key.
- *
- * NOTES:
- * Adds Proof Of Possession using the keyEncipherment field of
- * ProofOfPossession.
- *
- * The function looks at the the inKeyChoice parameter and interprets it in
- * in the following manner.
- *
- * If a parameter is not mentioned under interpretation, the function will not
- * look at its value when implementing that case.
- *
- * inKeyChoice          Interpretation
- * -----------          --------------
- * crmfThisMessage      This options requires that the encrypted private key
- *                      be included in the thisMessage field of POPOPrivKey.
- *                      We don't support this yet, so any clients who want
- *                      to use this feature have to implement a wrapping
- *                      function and agree with the server on how to properly
- *                      wrap the key.  That encrypted key must be passed in
- *                      as the encPrivKey parameter.
- *
- * crmfSubequentMessage Must pass in a value for subseqMess.  The value must
- *                      be either CRMFEncrCert or CRMFChallengeResp.  The
- *                      parameter encPrivKey will not be looked at in this
- *                      case.
- *
- * crmfDHMAC            This is not a valid option for this function.  Passing
- *                      in this value will result in the function returning
- *                      SECFailure.
- * RETURN:
- *    SECSuccess if adding KeyEnciphermentPOP was successful.  Any other return
- *    value indicates an error in adding KeyEnciphermentPOP.
- */
-extern SECStatus
-CRMF_CertReqMsgSetKeyEnciphermentPOP(CRMFCertReqMsg *inCertReqMsg,
-                                     CRMFPOPOPrivKeyChoice inKeyChoice,
-                                     CRMFSubseqMessOptions subseqMess,
-                                     SECItem *encPrivKey);
-
-/*
- * FUNCTION: CRMF_CertReqMsgSetKeyAgreementPOP
- * INPUTS:
- *    inCertReqMsg
- *        The Certificate Request Message to operate on.
- *    inKeyChoice
- *        An enumeration indicating which POPOPrivKey Choice to use
- *        in constructing the KeyAgreementPOP.
- *    subseqMess
- *        This parameter must be provided iff inKeyChoice is
- *        crmfSubsequentMessage.  This details how the RA is to respond
- *        in order to perform Proof Of Possession.  Look in crmft.h under
- *        the definition of CRMFSubseqMessOptions for possible values.
- *    encPrivKey
- *        This parameter only needs to be provided if inKeyChoice is
- *        crmfThisMessage.  The item should contain the encrypted private
- *        key.
- * Adds Proof Of Possession using the keyAgreement field of
- * ProofOfPossession.
- *
- * The function looks at the the inKeyChoice parameter and interprets it in
- * in the following manner.
- *
- * If a parameter is not mentioned under interpretation, the function will not
- * look at its value when implementing that case.
- *
- * inKeyChoice          Interpretation
- * -----------          --------------
- * crmfThisMessage      This options requires that the encrypted private key
- *                      be included in the thisMessage field of POPOPrivKey.
- *                      We don't support this yet, so any clients who want
- *                      to use this feature have to implement a wrapping
- *                      function and agree with the server on how to properly
- *                      wrap the key.  That encrypted key must be passed in
- *                      as the encPrivKey parameter.
- *
- * crmfSubequentMessage Must pass in a value for subseqMess.  The value must
- *                      be either crmfEncrCert or crmfChallengeResp.  The
- *                      parameter encPrivKey will not be looked at in this
- *                      case.
- *
- * crmfDHMAC            This option is not supported.
- */
-extern SECStatus
-CRMF_CertReqMsgSetKeyAgreementPOP(CRMFCertReqMsg *inCertReqMsg,
-                                  CRMFPOPOPrivKeyChoice inKeyChoice,
-                                  CRMFSubseqMessOptions subseqMess,
-                                  SECItem *encPrivKey);
-
-/*
- * FUNCTION: CRMF_CreateCertReqMsgFromDER
- * INPUTS:
- *    buf
- *        A buffer to the DER-encoded Certificate Request Message.
- *    len
- *        The length in bytes of the buffer 'buf'
- * NOTES:
- * This function passes the buffer to the ASN1 decoder and creates a
- * CRMFCertReqMsg structure.  Do not try adding any fields to a message
- * returned from this function.  Specifically adding more Controls or
- * Extensions may cause your program to crash.
- *
- * RETURN:
- *    A pointer to the Certificate Request Message structure.  A NULL return
- *    value indicates the library was unable to parse the DER.
- */
-extern CRMFCertReqMsg *CRMF_CreateCertReqMsgFromDER(const char *buf, long len);
-
-/*
- * FUNCTION: CRMF_CreateCertReqMessagesFromDER
- * INPUTS:
- *    buf
- *        A buffer to the DER-encoded Certificate Request Messages.
- *    len
- *        The length in bytes of buf
- * NOTES:
- * This function passes the buffer to the ASN1 decoder and creates a
- * CRMFCertReqMessages structure.  Do not try adding any fields to a message
- * derived from this function.  Specifically adding more Controls or
- * Extensions may cause your program to crash.
- * The user must call CRMF_DestroyCertReqMessages after the return value is
- * no longer needed, ie when all individual messages have been extracted.
- *
- * RETURN:
- *    A pointer to the Certificate Request Messages structure.  A NULL return
- *    value indicates the library was unable to parse the DER.
- */
-extern CRMFCertReqMessages *
-CRMF_CreateCertReqMessagesFromDER(const char *buf, long len);
-
-/*
- * FUNCTION: CRMF_DestroyCertReqMessages
- * INPUTS
- *    inCertReqMsgs
- *        The Messages to destroy.
- * RETURN:
- *    SECSuccess if freeing the memory was done successfully.  Any other
- *    return value indicates an error in freeing up memory.
- */
-extern SECStatus
-CRMF_DestroyCertReqMessages(CRMFCertReqMessages *inCertReqMsgs);
-
-/*
- * FUNCTION: CRMF_CertReqMessagesGetNumMessages
- * INPUTS:
- *    inCertReqMsgs
- *        The Request Messages to operate on.
- * RETURN:
- *    The number of messages contained in the in the Request Messages
- *    strucure.
- */
-extern int
-CRMF_CertReqMessagesGetNumMessages(CRMFCertReqMessages *inCertReqMsgs);
-
-/*
- * FUNCTION: CRMF_CertReqMessagesGetCertReqMsgAtIndex
- * INPUTS:
- *    inReqMsgs
- *        The Certificate Request Messages to operate on.
- *    index
- *        The index of the single message the user wants a copy of.
- * NOTES:
- * This function returns a copy of the request messages stored at the
- * index corresponding to the parameter 'index'.  Indexing of the messages
- * is done in the same manner as a C array.  Meaning the valid index are
- * 0...numMessages-1.  User must call CRMF_DestroyCertReqMsg when done using
- * the return value of this function.
- *
- * RETURN:
- * SECSuccess if copying the message at the requested index was successful.
- * Any other return value indicates an invalid index or error while copying
- * the single request message.
- */
-extern CRMFCertReqMsg *
-CRMF_CertReqMessagesGetCertReqMsgAtIndex(CRMFCertReqMessages *inReqMsgs,
-                                         int index);
-
-/*
- * FUNCTION: CRMF_CertReqMsgGetID
- * INPUTS:
- *    inCertReqMsg
- *        The Certificate Request Message to get the ID from.
- *    destID
- *        A pointer to where the library can place the ID of the Message.
- * RETURN:
- *    SECSuccess if the function was able to retrieve the ID and place it
- *    at *destID.  Any other return value indicates an error meaning the value
- *    in *destId is un-reliable and should not be used by the caller of this
- *    function.
- *
- */
-extern SECStatus CRMF_CertReqMsgGetID(CRMFCertReqMsg *inCertReqMsg,
-                                      long *destID);
-
-/*
- * FUNCTION: CRMF_DoesRequestHaveField
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to operate on.
- *    inField
- *        An enumeration indicating which filed of the certificate template
- *        to look for.
- * NOTES:
- * All the fields in a certificate template are optional.  This function
- * checks to see if the requested field is present.  Look in crmft.h at the
- * definition of CRMFCertTemplateField for possible values for possible
- * querying.
- *
- * RETURN:
- * PR_TRUE iff the field corresponding to 'inField' has been specified as part
- *         of 'inCertReq'
- * PR_FALSE iff the field corresponding to 'inField' has not been speicified
- *          as part of 'inCertReq'
- *
- */
-extern PRBool CRMF_DoesRequestHaveField(CRMFCertRequest *inCertReq,
-                                        CRMFCertTemplateField inField);
-
-/*
- * FUNCTION: CRMF_CertReqMsgGetCertRequest
- * INPUTS:
- *    inCertReqMsg
- *        The Certificate Request Message to operate on.
- * NOTES:
- *    This function returns a copy of the Certificate Request to the user.
- *    The user can keep adding to this request and then making it a part
- *    of another message.  After the user no longer wants to use the
- *    returned request, the user must call CRMF_DestroyCertRequest and
- *    pass it the request returned by this function.
- * RETURN:
- *    A pointer to a copy of the certificate request contained by the message.
- *    A NULL return value indicates an error occurred while copying the
- *   certificate request.
- */
-extern CRMFCertRequest *
-CRMF_CertReqMsgGetCertRequest(CRMFCertReqMsg *inCertReqMsg);
-
-/*
- * FUNCTION: CRMF_CertRequestGetCertTemplateVersion
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to operate on.
- *    version
- *        A pointer to where the library can store the version contatined
- *        in the certificate template within the certifcate request.
- * RETURN:
- *    SECSuccess if the Certificate template contains the version field.  In
- *    this case, *version will hold the value of the certificate template
- *    version.
- *    SECFailure indicates that version field was not present as part of
- *    of the certificate template.
- */
-extern SECStatus
-CRMF_CertRequestGetCertTemplateVersion(CRMFCertRequest *inCertReq,
-                                       long *version);
-
-/*
- * FUNCTION: CRMF_CertRequestGetCertTemplateSerialNumber
- * INPUTS:
- *    inCertReq
- *        The certificate request to operate on.
- *    serialNumber
- *        A pointer where the library can put the serial number contained
- *        in the certificate request's certificate template.
- * RETURN:
- * If a serial number exists in the CertTemplate of the request, the function
- * returns SECSuccess and the value at *serialNumber contains the serial
- * number.
- * If no serial number is present, then the function returns SECFailure and
- * the value at *serialNumber is un-changed.
- */
-extern SECStatus
-CRMF_CertRequestGetCertTemplateSerialNumber(CRMFCertRequest *inCertReq,
-                                            long *serialNumber);
-
-/*
- * FUNCTION: CRMF_CertRequestGetCertTemplateSigningAlg
- * INPUT:
- *    inCertReq
- *        The Certificate Request to operate on.
- *    destAlg
- *        A Pointer to where the library can place a copy of the signing alg
- *        used in the cert request's cert template.
- * RETURN:
- * If the signingAlg is present in the CertRequest's CertTemplate, then
- * the function returns SECSuccess and places a copy of sigingAlg in
- * *destAlg.
- * If no signingAlg is present, then the function returns SECFailure and
- * the value at *destAlg is un-changed
- */
-extern SECStatus
-CRMF_CertRequestGetCertTemplateSigningAlg(CRMFCertRequest *inCertReq,
-                                          SECAlgorithmID *destAlg);
-/*
- * FUNCTION: CRMF_CertRequestGetCertTemplateIssuer
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to operate on.
- *    destIssuer
- *        A pointer to where the library can place a copy of the cert
- *        request's cert template issuer field.
- * RETURN:
- * If the issuer is present in the cert request cert template, the function
- * returns SECSuccess and places a  copy of the issuer in *destIssuer.
- * If there is no issuer present, the function returns SECFailure and the
- * value at *destIssuer is unchanged.
- */
-extern SECStatus
-CRMF_CertRequestGetCertTemplateIssuer(CRMFCertRequest *inCertReq,
-                                      CERTName *destIssuer);
-
-/*
- * FUNCTION: CRMF_CertRequestGetCertTemplateValidity
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to operate on.
- *    destValdity
- *        A pointer to where the library can place a copy of the validity
- *        info in the cert request cert template.
- * NOTES:
- * Pass the pointer to
- * RETURN:
- * If there is an OptionalValidity field, the function will return SECSuccess
- * and place the appropriate values in *destValidity->notBefore and
- * *destValidity->notAfter. (Each field is optional, but at least one will
- * be present if the function returns SECSuccess)
- *
- * If there is no OptionalValidity field, the function will return SECFailure
- * and the values at *destValidity will be un-changed.
- */
-extern SECStatus
-CRMF_CertRequestGetCertTemplateValidity(CRMFCertRequest *inCertReq,
-                                        CRMFGetValidity *destValidity);
-/*
- * FUNCTION: CRMF_DestroyGetValidity
- * INPUTS:
- *    inValidity
- *        A pointer to the memroy to be freed.
- * NOTES:
- * The function will free the memory allocated by the function
- * CRMF_CertRequestGetCertTemplateValidity.  That means only memory pointed
- * to within the CRMFGetValidity structure.  Since
- * CRMF_CertRequestGetCertTemplateValidity does not allocate memory for the
- * structure passed into it, it will not free it.  Meaning this function will
- * free the memory at inValidity->notBefore and inValidity->notAfter, but not
- * the memory directly at inValdity.
- *
- * RETURN:
- * SECSuccess if freeing the memory was successful.  Any other return value
- * indicates an error while freeing the memory.
- */
-extern SECStatus
-CRMF_DestroyGetValidity(CRMFGetValidity *inValidity);
-
-/*
- * FUNCTION: CRMF_CertRequestGetCertTemplateSubject
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to operate on.
- *    destSubject
- *        A pointer to where the library can place a copy of the subject
- *        contained in the request's cert template.
- * RETURN:
- * If there is a subject in the CertTemplate, then the function returns
- * SECSuccess and a copy of the subject is placed in *destSubject.
- *
- * If there is no subject, the function returns SECFailure and the values at
- * *destSubject is unchanged.
- */
-extern SECStatus
-CRMF_CertRequestGetCertTemplateSubject(CRMFCertRequest *inCertReq,
-                                       CERTName *destSubject);
-
-/*
- * FUNCTION: CRMF_CertRequestGetCertTemplatePublicKey
- * INPUTS:
- *    inCertReq
- *        The Cert request to operate on.
- *    destPublicKey
- *        A pointer to where the library can place a copy of the request's
- *        cert template public key.
- * RETURN:
- * If there is a publicKey parameter in the CertRequest, the function returns
- * SECSuccess, and places a copy of the publicKey in *destPublicKey.
- *
- * If there is no publicKey, the function returns SECFailure and the value
- * at *destPublicKey is un-changed.
- */
-extern SECStatus
-CRMF_CertRequestGetCertTemplatePublicKey(CRMFCertRequest *inCertReq,
-                                         CERTSubjectPublicKeyInfo *destPublicKey);
-
-/*
- * FUNCTION: CRMF_CertRequestGetCertTemplateIssuerUID
- * INPUTS:
- *    inCertReq
- *        The Cert request to operate on.
- *    destIssuerUID
- *        A pointer to where the library can store a copy of the request's
- *        cert template destIssuerUID.
- *
- * NOTES:
- * destIssuerUID is a bit string and will be returned in a SECItem as
- * a bit string.  Meaning the len field contains the number of valid bits as
- * opposed to the number of bytes allocated.
- *
- * RETURN:
- * If the CertTemplate has an issuerUID, the function returns SECSuccess and
- * places a copy of the issuerUID in *destIssuerUID.
- *
- * If there is no issuerUID, the function returns SECFailure and the value
- * *destIssuerUID is unchanged.
- */
-extern SECStatus
-CRMF_CertRequestGetCertTemplateIssuerUID(CRMFCertRequest *inCertReq,
-                                         SECItem *destIssuerUID);
-
-/*
- * FUNCTION: CRMF_CertRequestGetCertTemplateSubjectUID
- *    inCertReq
- *        The Cert request to operate on.
- *    destSubjectUID
- *        A pointer to where the library can store a copy of the request's
- *        cert template destIssuerUID.
- *
- * NOTES:
- * destSubjectUID is a bit string and will be returned in a SECItem as
- * a bit string.  Meaning the len field contains the number of valid bits as
- * opposed to the number of bytes allocated.
- *
- * RETURN:
- * If the CertTemplate has an issuerUID, the function returns SECSuccess and
- * places a copy of the issuerUID in *destIssuerUID.
- *
- * If there is no issuerUID, the function returns SECSuccess and the value
- * *destIssuerUID is unchanged.
- */
-extern SECStatus CRMF_GetCertTemplateSubjectUID(CRMFCertRequest *inCertReq,
-                                                SECItem *destSubjectUID);
-
-/*
- * FUNCTION: CRMF_CertRequestGetNumberOfExtensions
- * INPUTS:
- *    inCertReq
- *        The cert request to operate on.
- * RETURN:
- *    Returns the number of extensions contained by the Cert Request.
- */
-extern int CRMF_CertRequestGetNumberOfExtensions(CRMFCertRequest *inCertReq);
-
-/*
- * FUNCTION: CRMF_CertRequestGetExtensionAtIndex
- * INPUTS:
- *    inCertReq
- *        The Certificate request to operate on.
- *    index
- *        The index of the extension array whihc the user wants to access.
- * NOTES:
- * This function retrieves the extension at the index corresponding to the
- * parameter "index" indicates.  Indexing is done like a C array.
- * (0 ... numElements-1)
- *
- * Call CRMF_DestroyCertExtension when done using the return value.
- *
- * RETURN:
- *    A pointer to a copy of the extension at the desired index.  A NULL
- *    return value indicates an invalid index or an error while copying
- *    the extension.
- */
-extern CRMFCertExtension *
-CRMF_CertRequestGetExtensionAtIndex(CRMFCertRequest *inCertReq,
-                                    int index);
-/*
- * FUNCTION: CRMF_CertExtensionGetOidTag
- * INPUTS:
- *    inExtension
-
- *        The extension to operate on.
- * RETURN:
- *    Returns the SECOidTag associated with the cert extension passed in.
- */
-extern SECOidTag CRMF_CertExtensionGetOidTag(CRMFCertExtension *inExtension);
-
-/*
- * FUNCTION: CRMF_CertExtensionGetIsCritical
- * INPUT:
- *    inExt
- *        The cert extension to operate on.
- *
- * RETURN:
- * PR_TRUE if the extension is critical.
- * PR_FALSE if the extension is not critical.
- */
-extern PRBool CRMF_CertExtensionGetIsCritical(CRMFCertExtension *inExt);
-
-/*
- * FUNCTION: CRMF_CertExtensionGetValue
- * INPUT:
- *    inExtension
- *        The extension to operate on.
- * NOTES:
- * Caller is responsible for freeing the memory associated with the return
- * value.  Call SECITEM_FreeItem(retVal, PR_TRUE) when done using the return
- * value.
- *
- * RETURN:
- * A pointer to an item containig the value for the certificate extension.
- * A NULL return value indicates an error in copying the information.
- */
-extern SECItem *CRMF_CertExtensionGetValue(CRMFCertExtension *inExtension);
-
-/*
- * FUNCTION: CRMF_CertReqMsgGetPOPOSigningKey
- * INPUTS:
- *    inCertReqMsg
- *        The certificate request message to operate on.
- *    destKey
- *        A pointer to where the library can place a pointer to
- *        a copy of the Proof Of Possession Signing Key used
- *        by the message.
- *
- * RETURN:
- * Get the POPOSigningKey associated with this CRMFCertReqMsg.
- * If the CertReqMsg does not have a pop, the function returns
- * SECFailure and the value at *destKey is un-changed..
- *
- * If the CertReqMsg does have a pop, then the CertReqMsg's
- * POPOSigningKey will be placed at *destKey.
- */
-extern SECStatus
-CRMF_CertReqMsgGetPOPOSigningKey(CRMFCertReqMsg *inCertReqMsg,
-                                 CRMFPOPOSigningKey **destKey);
-
-/*
- * FUNCTION: CRMF_DestroyPOPOSigningKey
- * INPUTS:
- *    inKey
- *        The signing key to free.
- *
- * RETURN:
- * SECSuccess if freeing the memory was successful.  Any other return value
- * indicates an error while freeing memory.
- */
-extern SECStatus CRMF_DestroyPOPOSigningKey(CRMFPOPOSigningKey *inKey);
-
-/*
- * FUNCTION: CRMF_POPOSigningKeyGetAlgID
- * INPUTS:
- *    inSignKey
- *        The Signing Key to operate on.
- * RETURN:
- * Return the algorithmID used by the CRMFPOPOSigningKey.  User must
- * call SECOID_DestroyAlgorithmID(destID, PR_TRUE) when done using the
- * return value.
- */
-extern SECAlgorithmID *
-CRMF_POPOSigningKeyGetAlgID(CRMFPOPOSigningKey *inSignKey);
-
-/*
- * FUNCTION: CRMF_POPOSigningKeyGetSignature
- * INPUTS:
- *    inSignKey
- *        The Signing Key to operate on.
- *
- * RETURN:
- * Get the actual signature stored away in the CRMFPOPOSigningKey.  SECItem
- * returned is a BIT STRING, so the len field is the number of bits as opposed
- * to the total number of bytes allocatd.  User must call
- * SECITEM_FreeItem(retVal,PR_TRUE) when done using the return value.
- */
-extern SECItem *CRMF_POPOSigningKeyGetSignature(CRMFPOPOSigningKey *inSignKey);
-
-/*
- * FUNCTION: CRMF_POPOSigningKeyGetInput
- * INPUTS:
- *    inSignKey
- *        The Signing Key to operate on.
- * NOTES:
- * This function will return the der encoded input that was read in while
- * decoding.  The API does not support this option when creating, so you
- * cannot add this field.
- *
- * RETURN:
- * Get the poposkInput that is part of the of the POPOSigningKey. If the
- * optional field is not part of the POPOSigningKey, the function returns
- * NULL.
- *
- * If the optional field is part of the POPOSingingKey, the function will
- * return a copy of the der encoded poposkInput.
- */
-extern SECItem *CRMF_POPOSigningKeyGetInput(CRMFPOPOSigningKey *inSignKey);
-
-/*
- * FUNCTION: CRMF_CertReqMsgGetPOPKeyEncipherment
- * INPUTS:
- *    inCertReqMsg
- *        The certificate request message to operate on.
- *    destKey
- *        A pointer to where the library can place a pointer to a
- *        copy of the POPOPrivKey representing Key Encipherment
- *        Proof of Possession.
- *NOTES:
- * This function gets the POPOPrivKey associated with this CRMFCertReqMsg
- * for Key Encipherment.
- *
- * RETURN:
- * If the CertReqMsg did not use Key Encipherment for Proof Of Possession, the
- * function returns SECFailure and the value at *destKey is un-changed.
- *
- * If the CertReqMsg did use Key Encipherment for ProofOfPossession, the
- * function returns SECSuccess and places the POPOPrivKey representing the
- * Key Encipherment Proof Of Possessin at *destKey.
- */
-extern SECStatus
-CRMF_CertReqMsgGetPOPKeyEncipherment(CRMFCertReqMsg *inCertReqMsg,
-                                     CRMFPOPOPrivKey **destKey);
-
-/*
- * FUNCTION: CRMF_CertReqMsgGetPOPKeyAgreement
- * INPUTS:
- *    inCertReqMsg
- *        The certificate request message to operate on.
- *    destKey
- *        A pointer to where the library can place a pointer to a
- *        copy of the POPOPrivKey representing Key Agreement
- *        Proof of Possession.
- * NOTES:
- * This function gets the POPOPrivKey associated with this CRMFCertReqMsg for
- * Key Agreement.
- *
- * RETURN:
- * If the CertReqMsg used Key Agreement for Proof Of Possession, the
- * function returns SECSuccess and the POPOPrivKey for Key Agreement
- * is placed at *destKey.
- *
- * If the CertReqMsg did not use Key Agreement for Proof Of Possession, the
- * function return SECFailure and the value at *destKey is unchanged.
- */
-extern SECStatus
-CRMF_CertReqMsgGetPOPKeyAgreement(CRMFCertReqMsg *inCertReqMsg,
-                                  CRMFPOPOPrivKey **destKey);
-
-/*
- * FUNCTION: CRMF_DestroyPOPOPrivKey
- * INPUTS:
- *    inPrivKey
- *        The POPOPrivKey to destroy.
- * NOTES:
- * Destroy a structure allocated by CRMF_GetPOPKeyEncipherment or
- * CRMF_GetPOPKeyAgreement.
- *
- * RETURN:
- * SECSuccess on successful destruction of the POPOPrivKey.
- * Any other return value indicates an error in freeing the
- * memory.
- */
-extern SECStatus CRMF_DestroyPOPOPrivKey(CRMFPOPOPrivKey *inPrivKey);
-
-/*
- * FUNCTION: CRMF_POPOPrivKeyGetChoice
- * INPUT:
- *    inKey
- *        The POPOPrivKey to operate on.
- * RETURN:
- * Returns which choice was used in constructing the POPPOPrivKey. Look at
- * the definition of CRMFPOPOPrivKeyChoice in crmft.h for the possible return
- * values.
- */
-extern CRMFPOPOPrivKeyChoice CRMF_POPOPrivKeyGetChoice(CRMFPOPOPrivKey *inKey);
-
-/*
- * FUNCTION: CRMF_POPOPrivKeyGetThisMessage
- * INPUTS:
- *    inKey
- *        The POPOPrivKey to operate on.
- *    destString
- *        A pointer to where the library can place a copy of the This Message
- *        field stored in the POPOPrivKey
- *
- * RETURN:
- * Returns the field thisMessage from the POPOPrivKey.
- * If the POPOPrivKey did not use the field thisMessage, the function
- * returns SECFailure and the value at *destString is unchanged.
- *
- * If the POPOPrivKey did use the field thisMessage, the function returns
- * SECSuccess and the BIT STRING representing thisMessage is placed
- * at *destString. BIT STRING representation means the len field is the
- * number of valid bits as opposed to the total number of bytes.
- */
-extern SECStatus CRMF_POPOPrivKeyGetThisMessage(CRMFPOPOPrivKey *inKey,
-                                                SECItem *destString);
-
-/*
- * FUNCTION: CRMF_POPOPrivKeyGetSubseqMess
- * INPUTS:
- *    inKey
- *        The POPOPrivKey to operate on.
- *    destOpt
- *        A pointer to where the library can place the value of the
- *        Subsequent Message option used by POPOPrivKey.
- *
- * RETURN:
- * Retrieves the field subsequentMessage from the POPOPrivKey.
- * If the POPOPrivKey used the subsequentMessage option, the function
- * returns SECSuccess and places the appropriate enumerated value at
- * *destMessageOption.
- *
- * If the POPOPrivKey did not use the subsequenMessage option, the function
- * returns SECFailure and the value at *destOpt is un-changed.
- */
-extern SECStatus CRMF_POPOPrivKeyGetSubseqMess(CRMFPOPOPrivKey *inKey,
-                                               CRMFSubseqMessOptions *destOpt);
-
-/*
- * FUNCTION: CRMF_POPOPrivKeyGetDHMAC
- * INPUTS:
- *    inKey
- *        The POPOPrivKey to operate on.
- *    destMAC
- *        A pointer to where the library can place a copy of the dhMAC
- *        field of the POPOPrivKey.
- *
- * NOTES:
- * Returns the field dhMAC from the POPOPrivKey.  The populated SECItem
- * is in BIT STRING format.
- *
- * RETURN:
- * If the POPOPrivKey used the dhMAC option, the function returns SECSuccess
- * and the BIT STRING for dhMAC will be placed at *destMAC.  The len field in
- * destMAC (ie destMAC->len) will be the valid number of bits as opposed to
- * the number of allocated bytes.
- *
- * If the POPOPrivKey did not use the dhMAC option, the function returns
- * SECFailure and the value at *destMAC is unchanged.
- *
- */
-extern SECStatus CRMF_POPOPrivKeyGetDHMAC(CRMFPOPOPrivKey *inKey,
-                                          SECItem *destMAC);
-
-/*
- * FUNCTION: CRMF_CertRequestGetNumControls
- * INPUTS:
- *    inCertReq
- *        The Certificate Request to operate on.
- * RETURN:
- * Returns the number of Controls registered with this CertRequest.
- */
-extern int CRMF_CertRequestGetNumControls(CRMFCertRequest *inCertReq);
-
-/*
- * FUNCTION: CRMF_CertRequestGetControlAtIndex
- * INPUTS:
- *    inCertReq
- *        The certificate request to operate on.
- *    index
- *        The index of the control the user wants a copy of.
- * NOTES:
- * Function retrieves the Control at located at index.  The Controls
- * are numbered like a traditional C array (0 ... numElements-1)
- *
- * RETURN:
- * Returns a copy of the control at the index specified.  This is a copy
- * so the user must call CRMF_DestroyControl after the return value is no
- * longer needed.  A return value of NULL indicates an error while copying
- * the control or that the index was invalid.
- */
-extern CRMFControl *
-CRMF_CertRequestGetControlAtIndex(CRMFCertRequest *inCertReq,
-                                  int index);
-
-/*
- * FUNCTION: CRMF_DestroyControl
- * INPUTS:
- *    inControl
- *        The Control to destroy.
- * NOTES:
- * Destroy a CRMFControl allocated by CRMF_GetControlAtIndex.
- *
- * RETURN:
- * SECSuccess if freeing the memory was successful.  Any other return
- * value indicates an error while freeing the memory.
- */
-extern SECStatus CRMF_DestroyControl(CRMFControl *inControl);
-
-/*
- * FUNCTION: CRMF_ControlGetControlType
- * INPUTS:
- *    inControl
- *        The control to operate on.
- * NOTES:
- * The function returns an enumertion which indicates the type of control
- * 'inControl'.
- *
- * RETURN:
- * Look in crmft.h at the definition of the enumerated type CRMFControlType
- * for the possible return values.
- */
-extern CRMFControlType CRMF_ControlGetControlType(CRMFControl *inControl);
-
-/*
- * FUNCTION: CRMF_ControlGetRegTokenControlValue
- * INPUTS:
- *    inControl
- *        The Control to operate on.
- * NOTES:
- * The user must call SECITEM_FreeItem passing in the return value
- * after the returnvalue is no longer needed.
-
- * RETURN:
- * Return the value for a Registration Token Control.
- * The SECItem returned should be in UTF8 format.  A NULL
- * return value indicates there was no Registration Control associated
- * with the Control.
- * (This library will not verify format.  It assumes the client properly
- * formatted the strings when adding it or the message decoded was properly
- * formatted.  The library will just give back the bytes it was given.)
- */
-extern SECItem *CRMF_ControlGetRegTokenControlValue(CRMFControl *inControl);
-
-/*
- * FUNCTION: CRMF_ControlGetAuthenticatorControlValue
- * INPUTS:
- *    inControl
- *        The Control to operate on.
- * NOTES:
- * The user must call SECITEM_FreeItem passing in the return value
- * after the returnvalue is no longer needed.
- *
- * RETURN:
- * Return the value for the Authenticator Control.
- * The SECItem returned should be in UTF8 format.  A NULL
- * return value indicates there was no Authenticator Control associated
- * with the CRMFControl..
- * (This library will not verify format.  It assumes the client properly
- * formatted the strings when adding it or the message decoded was properly
- * formatted.  The library will just give back the bytes it was given.)
- */
-extern SECItem *CRMF_ControlGetAuthicatorControlValue(CRMFControl *inControl);
-
-/*
- * FUNCTION: CRMF_ControlGetPKIArchiveOptions
- * INPUTS:inControl
- *    The Control tooperate on.
- * NOTES:
- * This function returns a copy of the PKIArchiveOptions.  The user must call
- * the function CRMF_DestroyPKIArchiveOptions when the return value is no
- * longer needed.
- *
- * RETURN:
- * Get the PKIArchiveOptions associated with the Control.  A return
- * value of NULL indicates the Control was not a PKIArchiveOptions
- * Control.
- */
-extern CRMFPKIArchiveOptions *
-CRMF_ControlGetPKIArchiveOptions(CRMFControl *inControl);
-
-/*
- * FUNCTION: CMRF_DestroyPKIArchiveOptions
- * INPUTS:
- *    inOptions
- *        The ArchiveOptions to destroy.
- * NOTE:
- * Destroy the CRMFPKIArchiveOptions structure.
- *
- * RETURN:
- * SECSuccess if successful in freeing all the memory associated with
- * the PKIArchiveOptions.  Any other return value indicates an error while
- * freeing the PKIArchiveOptions.
- */
-extern SECStatus
-CRMF_DestroyPKIArchiveOptions(CRMFPKIArchiveOptions *inOptions);
-
-/*
- * FUNCTION: CRMF_PKIArchiveOptionsGetOptionType
- * INPUTS:
- *    inOptions
- *        The PKIArchiveOptions to operate on.
- * RETURN:
- * Returns the choice used for the PKIArchiveOptions.  Look at the definition
- * of CRMFPKIArchiveOptionsType in crmft.h for possible return values.
- */
-extern CRMFPKIArchiveOptionsType
-CRMF_PKIArchiveOptionsGetOptionType(CRMFPKIArchiveOptions *inOptions);
-
-/*
- * FUNCTION: CRMF_PKIArchiveOptionsGetEncryptedPrivKey
- * INPUTS:
- *    inOpts
- *        The PKIArchiveOptions to operate on.
- *
- * NOTES:
- * The user must call CRMF_DestroyEncryptedKey when done using this return
- * value.
- *
- * RETURN:
- * Get the encryptedPrivKey field of the PKIArchiveOptions structure.
- * A return value of NULL indicates that encryptedPrivKey was not used as
- * the choice for this PKIArchiveOptions.
- */
-extern CRMFEncryptedKey *
-CRMF_PKIArchiveOptionsGetEncryptedPrivKey(CRMFPKIArchiveOptions *inOpts);
-
-/*
- * FUNCTION: CRMF_EncryptedKeyGetChoice
- * INPUTS:
- *    inEncrKey
- *        The EncryptedKey to operate on.
- *
- * NOTES:
- * Get the choice used for representing the EncryptedKey.
- *
- * RETURN:
- * Returns the Choice used in representing the EncryptedKey.  Look in
- * crmft.h at the definition of CRMFEncryptedKeyChoice for possible return
- * values.
- */
-extern CRMFEncryptedKeyChoice
-CRMF_EncryptedKeyGetChoice(CRMFEncryptedKey *inEncrKey);
-
-/*
- * FUNCTION: CRMF_EncryptedKeyGetEncryptedValue
- * INPUTS:
- *    inKey
- *        The EncryptedKey to operate on.
- *
- * NOTES:
- * The user must call CRMF_DestroyEncryptedValue passing in
- * CRMF_GetEncryptedValue's return value.
- *
- * RETURN:
- * A pointer to a copy of the EncryptedValue contained as a member of
- * the EncryptedKey.
- */
-extern CRMFEncryptedValue *
-CRMF_EncryptedKeyGetEncryptedValue(CRMFEncryptedKey *inKey);
-
-/*
- * FUNCTION: CRMF_DestroyEncryptedValue
- * INPUTS:
- *    inEncrValue
- *        The EncryptedValue to destroy.
- *
- * NOTES:
- * Free up all memory associated with 'inEncrValue'.
- *
- * RETURN:
- * SECSuccess if freeing up the memory associated with the EncryptedValue
- * is successful. Any other return value indicates an error while freeing the
- * memory.
- */
-extern SECStatus CRMF_DestroyEncryptedValue(CRMFEncryptedValue *inEncrValue);
-
-/*
- * FUNCTION: CRMF_EncryptedValueGetEncValue
- * INPUTS:
- *    inEncValue
- *        The EncryptedValue to operate on.
- * NOTES:
- * Function retrieves the encValue from an EncryptedValue structure.
- *
- * RETURN:
- * A poiner to a SECItem containing the encValue of the EncryptedValue
- * structure.  The return value is in BIT STRING format, meaning the
- * len field of the return structure represents the number of valid bits
- * as opposed to the allocated number of bytes.
- * ANULL return value indicates an error in copying the encValue field.
- */
-extern SECItem *CRMF_EncryptedValueGetEncValue(CRMFEncryptedValue *inEncValue);
-
-/*
- * FUNCTION: CRMF_EncryptedValueGetIntendedAlg
- * INPUTS
- *    inEncValue
- *        The EncryptedValue to operate on.
- * NOTES:
- * Retrieve the IntendedAlg field from the EncryptedValue structure.
- * Call SECOID_DestroyAlgorithmID (destAlgID, PR_TRUE) after done using
- * the return value.  When present, this alogorithm is the alogrithm for
- * which the private key will be used.
- *
- * RETURN:
- * A Copy of the intendedAlg field.  A NULL return value indicates the
- * optional field was not present in the structure.
- */
-extern SECAlgorithmID *
-CRMF_EncryptedValueGetIntendedAlg(CRMFEncryptedValue *inEncValue);
-
-/*
- * FUNCTION: CRMF_EncryptedValueGetSymmAlg
- * INPUTS
- *    inEncValue
- *        The EncryptedValue to operate on.
- * NOTES:
- * Retrieve the symmAlg field from the EncryptedValue structure.
- * Call SECOID_DestroyAlgorithmID (destAlgID, PR_TRUE) after done using
- * the return value.  When present, this is algorithm used to
- * encrypt the encValue of the EncryptedValue.
- *
- * RETURN:
- * A Copy of the symmAlg field.  A NULL return value indicates the
- * optional field was not present in the structure.
- */
-extern SECAlgorithmID *
-CRMF_EncryptedValueGetSymmAlg(CRMFEncryptedValue *inEncValue);
-
-/*
- * FUNCTION: CRMF_EncryptedValueGetKeyAlg
- * INPUTS
- *    inEncValue
- *        The EncryptedValue to operate on.
- * NOTES:
- * Retrieve the keyAlg field from the EncryptedValue structure.
- * Call SECOID_DestroyAlgorithmID (destAlgID, PR_TRUE) after done using
- * the return value.  When present, this is the algorithm used to encrypt
- * the symmetric key in the encSymmKey field of the EncryptedValue structure.
- *
- * RETURN:
- * A Copy of the keyAlg field.  A NULL return value indicates the
- * optional field was not present in the structure.
- */
-extern SECAlgorithmID *
-CRMF_EncryptedValueGetKeyAlg(CRMFEncryptedValue *inEncValue);
-
-/*
- * FUNCTION: CRMF_EncryptedValueGetValueHint
- * INPUTS:
- *    inEncValue
- *        The EncryptedValue to operate on.
- *
- * NOTES:
- * Return a copy of the der-encoded value hint.
- * User must call SECITEM_FreeItem(retVal, PR_TRUE) when done using the
- * return value.  When, present, this is a value that the client which
- * originally issued a certificate request can use to reproduce any data
- * it wants.  The RA does not know how to interpret this data.
- *
- * RETURN:
- * A copy of the valueHint field of the EncryptedValue.  A NULL return
- * value indicates the optional valueHint field is not present in the
- * EncryptedValue.
- */
-extern SECItem *
-CRMF_EncryptedValueGetValueHint(CRMFEncryptedValue *inEncValue);
-
-/*
- * FUNCTION: CRMF_EncrypteValueGetEncSymmKey
- * INPUTS:
- *    inEncValue
- *        The EncryptedValue to operate on.
- *
- * NOTES:
- * Return a copy of the encSymmKey field. This field is the encrypted
- * symmetric key that the client uses in doing Public Key wrap of a private
- * key.  When present, this is the symmetric key that was used to wrap the
- * private key.  (The encrypted private key will be stored in encValue
- * of the same EncryptedValue structure.)  The user must call
- * SECITEM_FreeItem(retVal, PR_TRUE) when the return value is no longer
- * needed.
- *
- * RETURN:
- * A copy of the optional encSymmKey field of the EncryptedValue structure.
- * The return value will be in BIT STRING format, meaning the len field will
- * be the number of valid bits as opposed to the number of bytes. A return
- * value of NULL means the optional encSymmKey field was not present in
- * the EncryptedValue structure.
- */
-extern SECItem *
-CRMF_EncryptedValueGetEncSymmKey(CRMFEncryptedValue *inEncValue);
-
-/*
- * FUNCTION: CRMF_PKIArchiveOptionsGetKeyGenParameters
- * INPUTS:
- *    inOptions
- *        The PKiArchiveOptions to operate on.
- *
- * NOTES:
- * User must call SECITEM_FreeItem(retVal, PR_TRUE) after the return
- * value is no longer needed.
- *
- * RETURN:
- * Get the keyGenParameters field of the PKIArchiveOptions.
- * A NULL return value indicates that keyGenParameters was not
- * used as the choice for this PKIArchiveOptions.
- *
- * The SECItem returned is in BIT STRING format (ie, the len field indicates
- * number of valid bits as opposed to allocated number of bytes.)
- */
-extern SECItem *
-CRMF_PKIArchiveOptionsGetKeyGenParameters(CRMFPKIArchiveOptions *inOptions);
-
-/*
- * FUNCTION: CRMF_PKIArchiveOptionsGetArchiveRemGenPrivKey
- * INPUTS:
- *    inOpt
- *        The PKIArchiveOptions to operate on.
- *    destVal
- *        A pointer to where the library can place the value for
- *        arciveRemGenPrivKey
- * RETURN:
- * If the PKIArchiveOptions used the archiveRemGenPrivKey field, the
- * function returns SECSuccess and fills the value at *destValue with either
- * PR_TRUE or PR_FALSE, depending on what the PKIArchiveOptions has as a
- * value.
- *
- * If the PKIArchiveOptions does not use the archiveRemGenPrivKey field, the
- * function returns SECFailure and the value at *destValue is unchanged.
- */
-extern SECStatus
-CRMF_PKIArchiveOptionsGetArchiveRemGenPrivKey(CRMFPKIArchiveOptions *inOpt,
-                                              PRBool *destVal);
-
-/* Helper functions that can be used by other libraries. */
-/*
- * A quick helper function to get the best wrap mechanism.
- */
-extern CK_MECHANISM_TYPE CRMF_GetBestWrapPadMechanism(PK11SlotInfo *slot);
-
-/*
- * A helper function to get a randomly generated IV from a mechanism
- * type.
- */
-extern SECItem *CRMF_GetIVFromMechanism(CK_MECHANISM_TYPE mechType);
-
-SEC_END_PROTOS
-#endif /*_CRMF_H_*/
diff --git a/openflow/usr/include/nss/crmft.h b/openflow/usr/include/nss/crmft.h
deleted file mode 100644
index 8d83cf1..0000000
--- a/openflow/usr/include/nss/crmft.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C; tab-width: 8 -*-*/
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* Header file with all of the structures and types that will be exported
- * by the security library for implementation of CRMF.
- */
-
-#ifndef _CRMFT_H_
-#define _CRMFT_H_
-
-/* Use these enumerated values for adding fields to the certificate request */
-typedef enum {
-    crmfVersion = 0,
-    crmfSerialNumber = 1,
-    crmfSigningAlg = 2,
-    crmfIssuer = 3,
-    crmfValidity = 4,
-    crmfSubject = 5,
-    crmfPublicKey = 6,
-    crmfIssuerUID = 7,
-    crmfSubjectUID = 8,
-    crmfExtension = 9
-} CRMFCertTemplateField;
-
-/*
- * An enumeration for the different types of controls.
- */
-typedef enum {
-    crmfNoControl = 0,
-    crmfRegTokenControl = 1,
-    crmfAuthenticatorControl = 2,
-    crmfPKIPublicationInfoControl = 3,
-    crmfPKIArchiveOptionsControl = 4,
-    crmfOldCertIDControl = 5,
-    crmfProtocolEncrKeyControl = 6
-} CRMFControlType;
-
-/*
- * The possible values that are passed into CRMF_CreatePKIPublicationInfo
- */
-typedef enum {
-    crmfDontPublish = 0,
-    crmfPleasePublish = 1
-} CRMFPublicationAction;
-
-/*
- * An enumeration for the possible for pubMethod which is a part of
- * the SinglePubInfo ASN1 type.
- */
-typedef enum {
-    crmfDontCare = 0,
-    crmfX500 = 1,
-    crmfWeb = 2,
-    crmfLdap = 3
-} CRMFPublicationMethod;
-
-/*
- * An enumeration for the different options for PKIArchiveOptions type.
- */
-typedef enum {
-    crmfNoArchiveOptions = 0,
-    crmfEncryptedPrivateKey = 1,
-    crmfKeyGenParameters = 2,
-    crmfArchiveRemGenPrivKey = 3
-} CRMFPKIArchiveOptionsType;
-
-/*
- * An enumeration for the different options for ProofOfPossession
- */
-typedef enum {
-    crmfNoPOPChoice = 0,
-    crmfRAVerified = 1,
-    crmfSignature = 2,
-    crmfKeyEncipherment = 3,
-    crmfKeyAgreement = 4
-} CRMFPOPChoice;
-
-/*
- * An enumertion type for options for the authInfo field of the
- * CRMFPOPOSigningKeyInput structure.
- */
-typedef enum {
-    crmfSender = 0,
-    crmfPublicKeyMAC = 1
-} CRMFPOPOSkiInputAuthChoice;
-
-/*
- * An enumeration for the SubsequentMessage Options.
- */
-typedef enum {
-    crmfNoSubseqMess = 0,
-    crmfEncrCert = 1,
-    crmfChallengeResp = 2
-} CRMFSubseqMessOptions;
-
-/*
- * An enumeration for the choice used by POPOPrivKey.
- */
-typedef enum {
-    crmfNoMessage = 0,
-    crmfThisMessage = 1,
-    crmfSubsequentMessage = 2,
-    crmfDHMAC = 3
-} CRMFPOPOPrivKeyChoice;
-
-/*
- * An enumeration for the choices for the EncryptedKey type.
- */
-typedef enum {
-    crmfNoEncryptedKeyChoice = 0,
-    crmfEncryptedValueChoice = 1,
-    crmfEnvelopedDataChoice = 2
-} CRMFEncryptedKeyChoice;
-
-/*
- * TYPE: CRMFEncoderOutputCallback
- *     This function type defines a prototype for a function that the CRMF
- *     library expects when encoding is performed.
- *
- * ARGUMENTS:
- *     arg
- *         This will be a pointer the user passed into an encoding function.
- *         The user of the library is free to use this pointer in any way.
- *         The most common use is to keep around a buffer for writing out
- *         the DER encoded bytes.
- *     buf
- *         The DER encoded bytes that should be written out.
- *     len
- *         The number of DER encoded bytes to write out.
- *
- */
-typedef void (*CRMFEncoderOutputCallback)(void *arg,
-                                          const char *buf,
-                                          unsigned long len);
-
-/*
- * Type for the function that gets a password.  Just in case we ever
- * need to support publicKeyMAC for POPOSigningKeyInput
- */
-typedef SECItem *(*CRMFMACPasswordCallback)(void *arg);
-
-typedef struct CRMFOptionalValidityStr CRMFOptionalValidity;
-typedef struct CRMFValidityCreationInfoStr CRMFGetValidity;
-typedef struct CRMFCertTemplateStr CRMFCertTemplate;
-typedef struct CRMFCertRequestStr CRMFCertRequest;
-typedef struct CRMFCertReqMsgStr CRMFCertReqMsg;
-typedef struct CRMFCertReqMessagesStr CRMFCertReqMessages;
-typedef struct CRMFProofOfPossessionStr CRMFProofOfPossession;
-typedef struct CRMFPOPOSigningKeyStr CRMFPOPOSigningKey;
-typedef struct CRMFPOPOSigningKeyInputStr CRMFPOPOSigningKeyInput;
-typedef struct CRMFPOPOPrivKeyStr CRMFPOPOPrivKey;
-typedef struct CRMFPKIPublicationInfoStr CRMFPKIPublicationInfo;
-typedef struct CRMFSinglePubInfoStr CRMFSinglePubInfo;
-typedef struct CRMFPKIArchiveOptionsStr CRMFPKIArchiveOptions;
-typedef struct CRMFEncryptedKeyStr CRMFEncryptedKey;
-typedef struct CRMFEncryptedValueStr CRMFEncryptedValue;
-typedef struct CRMFCertIDStr CRMFCertID;
-typedef struct CRMFCertIDStr CRMFOldCertID;
-typedef CERTSubjectPublicKeyInfo CRMFProtocolEncrKey;
-typedef struct CRMFValidityCreationInfoStr CRMFValidityCreationInfo;
-typedef struct CRMFCertExtCreationInfoStr CRMFCertExtCreationInfo;
-typedef struct CRMFPKMACValueStr CRMFPKMACValue;
-typedef struct CRMFAttributeStr CRMFAttribute;
-typedef struct CRMFControlStr CRMFControl;
-typedef CERTGeneralName CRMFGeneralName;
-typedef struct CRMFCertExtensionStr CRMFCertExtension;
-
-struct CRMFValidityCreationInfoStr {
-    PRTime *notBefore;
-    PRTime *notAfter;
-};
-
-struct CRMFCertExtCreationInfoStr {
-    CRMFCertExtension **extensions;
-    int numExtensions;
-};
-
-/*
- * Some ASN1 Templates that may be needed.
- */
-extern const SEC_ASN1Template CRMFCertReqMessagesTemplate[];
-extern const SEC_ASN1Template CRMFCertRequestTemplate[];
-
-#endif /*_CRMFT_H_*/
diff --git a/openflow/usr/include/nss/cryptohi.h b/openflow/usr/include/nss/cryptohi.h
deleted file mode 100644
index f658daa..0000000
--- a/openflow/usr/include/nss/cryptohi.h
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * cryptohi.h - public prototypes for the crypto library
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _CRYPTOHI_H_
-#define _CRYPTOHI_H_
-
-#include "blapit.h"
-
-#include "seccomon.h"
-#include "secoidt.h"
-#include "secdert.h"
-#include "cryptoht.h"
-#include "keyt.h"
-#include "certt.h"
-
-SEC_BEGIN_PROTOS
-
-/****************************************/
-/*
-** DER encode/decode (EC)DSA signatures
-*/
-
-/* ANSI X9.57 defines DSA signatures as DER encoded data.  Our DSA1 code (and
- * most of the rest of the world) just generates 40 bytes of raw data.  These
- * functions convert between formats.
- */
-extern SECStatus DSAU_EncodeDerSig(SECItem *dest, SECItem *src);
-extern SECItem *DSAU_DecodeDerSig(const SECItem *item);
-
-/*
- * Unlike DSA1, raw DSA2 and ECDSA signatures do not have a fixed length.
- * Rather they contain two integers r and s whose length depends
- * on the size of q or the EC key used for signing.
- *
- * We can reuse the DSAU_EncodeDerSig interface to DER encode
- * raw ECDSA signature keeping in mind that the length of r
- * is the same as that of s and exactly half of src->len.
- *
- * For decoding, we need to pass the length of the desired
- * raw signature (twice the key size) explicitly.
- */
-extern SECStatus DSAU_EncodeDerSigWithLen(SECItem *dest, SECItem *src,
-                                          unsigned int len);
-extern SECItem *DSAU_DecodeDerSigToLen(const SECItem *item, unsigned int len);
-
-/****************************************/
-/*
-** Signature creation operations
-*/
-
-/*
-** Create a new signature context used for signing a data stream.
-**      "alg" the signature algorithm to use (e.g. SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION)
-**	"privKey" the private key to use
-*/
-extern SGNContext *SGN_NewContext(SECOidTag alg, SECKEYPrivateKey *privKey);
-
-/*
-** Destroy a signature-context object
-**	"cx" the object
-**	"freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void SGN_DestroyContext(SGNContext *cx, PRBool freeit);
-
-/*
-** Reset the signing context "cx" to its initial state, preparing it for
-** another stream of data.
-*/
-extern SECStatus SGN_Begin(SGNContext *cx);
-
-/*
-** Update the signing context with more data to sign.
-**	"cx" the context
-**	"input" the input data to sign
-**	"inputLen" the length of the input data
-*/
-extern SECStatus SGN_Update(SGNContext *cx, const unsigned char *input,
-                            unsigned int inputLen);
-
-/*
-** Finish the signature process. Use either k0 or k1 to sign the data
-** stream that was input using SGN_Update. The resulting signature is
-** formatted using PKCS#1 and then encrypted using RSA private or public
-** encryption.
-**	"cx" the context
-**	"result" the final signature data (memory is allocated)
-*/
-extern SECStatus SGN_End(SGNContext *cx, SECItem *result);
-
-/*
-** Sign a single block of data using private key encryption and given
-** signature/hash algorithm.
-**	"result" the final signature data (memory is allocated)
-**	"buf" the input data to sign
-**	"len" the amount of data to sign
-**	"pk" the private key to encrypt with
-**	"algid" the signature/hash algorithm to sign with
-**		(must be compatible with the key type).
-*/
-extern SECStatus SEC_SignData(SECItem *result,
-                              const unsigned char *buf, int len,
-                              SECKEYPrivateKey *pk, SECOidTag algid);
-
-/*
-** Sign a pre-digested block of data using private key encryption, encoding
-**  The given signature/hash algorithm.
-**	"result" the final signature data (memory is allocated)
-**	"digest" the digest to sign
-**	"privKey" the private key to encrypt with
-**	"algtag" The algorithm tag to encode (need for RSA only)
-*/
-extern SECStatus SGN_Digest(SECKEYPrivateKey *privKey,
-                            SECOidTag algtag, SECItem *result, SECItem *digest);
-
-/*
-** DER sign a single block of data using private key encryption and the
-** MD5 hashing algorithm. This routine first computes a digital signature
-** using SEC_SignData, then wraps it with an CERTSignedData and then der
-** encodes the result.
-**	"arena" is the memory arena to use to allocate data from
-** 	"result" the final der encoded data (memory is allocated)
-** 	"buf" the input data to sign
-** 	"len" the amount of data to sign
-** 	"pk" the private key to encrypt with
-*/
-extern SECStatus SEC_DerSignData(PLArenaPool *arena, SECItem *result,
-                                 const unsigned char *buf, int len,
-                                 SECKEYPrivateKey *pk, SECOidTag algid);
-
-/*
-** Destroy a signed-data object.
-**	"sd" the object
-**	"freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void SEC_DestroySignedData(CERTSignedData *sd, PRBool freeit);
-
-/*
-** Get the signature algorithm tag number for the given key type and hash
-** algorithm tag. Returns SEC_OID_UNKNOWN if key type and hash algorithm
-** do not match or are not supported.
-*/
-extern SECOidTag SEC_GetSignatureAlgorithmOidTag(KeyType keyType,
-                                                 SECOidTag hashAlgTag);
-
-/****************************************/
-/*
-** Signature verification operations
-*/
-
-/*
-** Create a signature verification context. This version is deprecated,
-**  This function is deprecated. Use VFY_CreateContextDirect or
-**  VFY_CreateContextWithAlgorithmID instead.
-**	"key" the public key to verify with
-**	"sig" the encrypted signature data if sig is NULL then
-**	   VFY_EndWithSignature must be called with the correct signature at
-**	   the end of the processing.
-**	"sigAlg" specifies the signing algorithm to use (including the
-**         hash algorthim).  This must match the key type.
-**	"wincx" void pointer to the window context
-*/
-extern VFYContext *VFY_CreateContext(SECKEYPublicKey *key, SECItem *sig,
-                                     SECOidTag sigAlg, void *wincx);
-/*
-** Create a signature verification context.
-**	"key" the public key to verify with
-**	"sig" the encrypted signature data if sig is NULL then
-**	   VFY_EndWithSignature must be called with the correct signature at
-**	   the end of the processing.
-**	"pubkAlg" specifies the cryptographic signing algorithm to use (the
-**         raw algorithm without any hash specified.  This must match the key
-**         type.
-**	"hashAlg" specifies the hashing algorithm used. If the key is an
-**	   RSA key, and sig is not NULL, then hashAlg can be SEC_OID_UNKNOWN.
-**	   the hash is selected from data in the sig.
-**	"hash" optional pointer to return the actual hash algorithm used.
-**	   in practice this should always match the passed in hashAlg (the
-**	   exception is the case where hashAlg is SEC_OID_UNKNOWN above).
-**         If this value is NULL no, hash oid is returned.
-**	"wincx" void pointer to the window context
-*/
-extern VFYContext *VFY_CreateContextDirect(const SECKEYPublicKey *key,
-                                           const SECItem *sig,
-                                           SECOidTag pubkAlg,
-                                           SECOidTag hashAlg,
-                                           SECOidTag *hash, void *wincx);
-/*
-** Create a signature verification context from a algorithm ID.
-**	"key" the public key to verify with
-**	"sig" the encrypted signature data if sig is NULL then
-**	   VFY_EndWithSignature must be called with the correct signature at
-**	   the end of the processing.
-**	"algid" specifies the signing algorithm and parameters to use.
-**         This must match the key type.
-**      "hash" optional pointer to return the oid of the actual hash used in
-**         the signature. If this value is NULL no, hash oid is returned.
-**	"wincx" void pointer to the window context
-*/
-extern VFYContext *VFY_CreateContextWithAlgorithmID(const SECKEYPublicKey *key,
-                                                    const SECItem *sig,
-                                                    const SECAlgorithmID *algid,
-                                                    SECOidTag *hash,
-                                                    void *wincx);
-
-/*
-** Destroy a verification-context object.
-**	"cx" the context to destroy
-**	"freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void VFY_DestroyContext(VFYContext *cx, PRBool freeit);
-
-extern SECStatus VFY_Begin(VFYContext *cx);
-
-/*
-** Update a verification context with more input data. The input data
-** is fed to a secure hash function (depending on what was in the
-** encrypted signature data).
-**	"cx" the context
-**	"input" the input data
-**	"inputLen" the amount of input data
-*/
-extern SECStatus VFY_Update(VFYContext *cx, const unsigned char *input,
-                            unsigned int inputLen);
-
-/*
-** Finish the verification process. The return value is a status which
-** indicates success or failure. On success, the SECSuccess value is
-** returned. Otherwise, SECFailure is returned and the error code found
-** using PORT_GetError() indicates what failure occurred.
-** 	"cx" the context
-*/
-extern SECStatus VFY_End(VFYContext *cx);
-
-/*
-** Finish the verification process. The return value is a status which
-** indicates success or failure. On success, the SECSuccess value is
-** returned. Otherwise, SECFailure is returned and the error code found
-** using PORT_GetError() indicates what failure occurred. If signature is
-** supplied the verification uses this signature to verify, otherwise the
-** signature passed in VFY_CreateContext() is used.
-** VFY_EndWithSignature(cx,NULL); is identical to VFY_End(cx);.
-** 	"cx" the context
-** 	"sig" the encrypted signature data
-*/
-extern SECStatus VFY_EndWithSignature(VFYContext *cx, SECItem *sig);
-
-/*
-** Verify the signature on a block of data for which we already have
-** the digest. The signature data is an RSA private key encrypted
-** block of data formatted according to PKCS#1.
-**  This function is deprecated. Use VFY_VerifyDigestDirect or
-**  VFY_VerifyDigestWithAlgorithmID instead.
-** 	"dig" the digest
-** 	"key" the public key to check the signature with
-** 	"sig" the encrypted signature data
-**	"sigAlg" specifies the signing algorithm to use.  This must match
-**	    the key type.
-**	"wincx" void pointer to the window context
-**/
-extern SECStatus VFY_VerifyDigest(SECItem *dig, SECKEYPublicKey *key,
-                                  SECItem *sig, SECOidTag sigAlg, void *wincx);
-/*
-** Verify the signature on a block of data for which we already have
-** the digest. The signature data is an RSA private key encrypted
-** block of data formatted according to PKCS#1.
-** 	"dig" the digest
-** 	"key" the public key to check the signature with
-** 	"sig" the encrypted signature data
-**	"pubkAlg" specifies the cryptographic signing algorithm to use (the
-**         raw algorithm without any hash specified.  This must match the key
-**         type.
-**	"hashAlg" specifies the hashing algorithm used.
-**	"wincx" void pointer to the window context
-**/
-extern SECStatus VFY_VerifyDigestDirect(const SECItem *dig,
-                                        const SECKEYPublicKey *key,
-                                        const SECItem *sig, SECOidTag pubkAlg,
-                                        SECOidTag hashAlg, void *wincx);
-/*
-** Verify the signature on a block of data for which we already have
-** the digest. The signature data is an RSA private key encrypted
-** block of data formatted according to PKCS#1.
-**	"key" the public key to verify with
-**	"sig" the encrypted signature data if sig is NULL then
-**	   VFY_EndWithSignature must be called with the correct signature at
-**	   the end of the processing.
-**	"algid" specifies the signing algorithm and parameters to use.
-**         This must match the key type.
-**      "hash" oid of the actual hash used to create digest. If this  value is
-**         not set to SEC_OID_UNKNOWN, it must match the hash of the signature.
-**	"wincx" void pointer to the window context
-*/
-extern SECStatus VFY_VerifyDigestWithAlgorithmID(const SECItem *dig,
-                                                 const SECKEYPublicKey *key, const SECItem *sig,
-                                                 const SECAlgorithmID *algid, SECOidTag hash,
-                                                 void *wincx);
-
-/*
-** Verify the signature on a block of data. The signature data is an RSA
-** private key encrypted block of data formatted according to PKCS#1.
-**   This function is deprecated. Use VFY_VerifyDataDirect or
-**   VFY_VerifyDataWithAlgorithmID instead.
-** 	"buf" the input data
-** 	"len" the length of the input data
-** 	"key" the public key to check the signature with
-** 	"sig" the encrypted signature data
-**	"sigAlg" specifies the signing algorithm to use.  This must match
-**	    the key type.
-**	"wincx" void pointer to the window context
-*/
-extern SECStatus VFY_VerifyData(const unsigned char *buf, int len,
-                                const SECKEYPublicKey *key, const SECItem *sig,
-                                SECOidTag sigAlg, void *wincx);
-/*
-** Verify the signature on a block of data. The signature data is an RSA
-** private key encrypted block of data formatted according to PKCS#1.
-** 	"buf" the input data
-** 	"len" the length of the input data
-** 	"key" the public key to check the signature with
-** 	"sig" the encrypted signature data
-**	"pubkAlg" specifies the cryptographic signing algorithm to use (the
-**         raw algorithm without any hash specified.  This must match the key
-**         type.
-**	"hashAlg" specifies the hashing algorithm used. If the key is an
-**	   RSA key, and sig is not NULL, then hashAlg can be SEC_OID_UNKNOWN.
-**	   the hash is selected from data in the sig.
-**	"hash" optional pointer to return the actual hash algorithm used.
-**	   in practice this should always match the passed in hashAlg (the
-**	   exception is the case where hashAlg is SEC_OID_UNKNOWN above).
-**         If this value is NULL no, hash oid is returned.
-**	"wincx" void pointer to the window context
-*/
-extern SECStatus VFY_VerifyDataDirect(const unsigned char *buf, int len,
-                                      const SECKEYPublicKey *key,
-                                      const SECItem *sig,
-                                      SECOidTag pubkAlg, SECOidTag hashAlg,
-                                      SECOidTag *hash, void *wincx);
-
-/*
-** Verify the signature on a block of data. The signature data is an RSA
-** private key encrypted block of data formatted according to PKCS#1.
-** 	"buf" the input data
-** 	"len" the length of the input data
-** 	"key" the public key to check the signature with
-** 	"sig" the encrypted signature data
-**	"algid" specifies the signing algorithm and parameters to use.
-**         This must match the key type.
-**      "hash" optional pointer to return the oid of the actual hash used in
-**         the signature. If this value is NULL no, hash oid is returned.
-**	"wincx" void pointer to the window context
-*/
-extern SECStatus VFY_VerifyDataWithAlgorithmID(const unsigned char *buf,
-                                               int len, const SECKEYPublicKey *key,
-                                               const SECItem *sig,
-                                               const SECAlgorithmID *algid, SECOidTag *hash,
-                                               void *wincx);
-
-SEC_END_PROTOS
-
-#endif /* _CRYPTOHI_H_ */
diff --git a/openflow/usr/include/nss/cryptoht.h b/openflow/usr/include/nss/cryptoht.h
deleted file mode 100644
index 5780bf4..0000000
--- a/openflow/usr/include/nss/cryptoht.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * cryptoht.h - public data structures for the crypto library
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _CRYPTOHT_H_
-#define _CRYPTOHT_H_
-
-typedef struct SGNContextStr SGNContext;
-typedef struct VFYContextStr VFYContext;
-
-#endif /* _CRYPTOHT_H_ */
diff --git a/openflow/usr/include/nss/eccutil.h b/openflow/usr/include/nss/eccutil.h
deleted file mode 100644
index 8c627e1..0000000
--- a/openflow/usr/include/nss/eccutil.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _FREEBL_H_
-#define _FREEBL_H_
-
-/* deprecated */
-typedef enum {
-    ECPoint_Uncompressed,
-    ECPoint_XOnly,
-    ECPoint_Undefined
-} ECPointEncoding;
-
-#endif /* _FREEBL_H_ */
diff --git a/openflow/usr/include/nss/ecl-exp.h b/openflow/usr/include/nss/ecl-exp.h
deleted file mode 100644
index 44adb8a..0000000
--- a/openflow/usr/include/nss/ecl-exp.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __ecl_exp_h_
-#define __ecl_exp_h_
-
-/* Curve field type */
-typedef enum {
-    ECField_GFp,
-    ECField_GF2m
-} ECField;
-
-/* Hexadecimal encoding of curve parameters */
-struct ECCurveParamsStr {
-    char *text;
-    ECField field;
-    unsigned int size;
-    char *irr;
-    char *curvea;
-    char *curveb;
-    char *genx;
-    char *geny;
-    char *order;
-    int cofactor;
-    int security;
-    int pointSize;
-    unsigned int usage;
-};
-typedef struct ECCurveParamsStr ECCurveParams;
-
-/* Named curve parameters */
-typedef enum {
-
-    ECCurve_noName = 0,
-
-    /* NIST prime curves */
-    ECCurve_NIST_P192, /* not supported */
-    ECCurve_NIST_P224, /* not supported */
-    ECCurve_NIST_P256,
-    ECCurve_NIST_P384,
-    ECCurve_NIST_P521,
-
-    /* NIST binary curves */
-    ECCurve_NIST_K163, /* not supported */
-    ECCurve_NIST_B163, /* not supported */
-    ECCurve_NIST_K233, /* not supported */
-    ECCurve_NIST_B233, /* not supported */
-    ECCurve_NIST_K283, /* not supported */
-    ECCurve_NIST_B283, /* not supported */
-    ECCurve_NIST_K409, /* not supported */
-    ECCurve_NIST_B409, /* not supported */
-    ECCurve_NIST_K571, /* not supported */
-    ECCurve_NIST_B571, /* not supported */
-
-    /* ANSI X9.62 prime curves */
-    /* ECCurve_X9_62_PRIME_192V1 == ECCurve_NIST_P192 */
-    ECCurve_X9_62_PRIME_192V2, /* not supported */
-    ECCurve_X9_62_PRIME_192V3, /* not supported */
-    ECCurve_X9_62_PRIME_239V1, /* not supported */
-    ECCurve_X9_62_PRIME_239V2, /* not supported */
-    ECCurve_X9_62_PRIME_239V3, /* not supported */
-    /* ECCurve_X9_62_PRIME_256V1 == ECCurve_NIST_P256 */
-
-    /* ANSI X9.62 binary curves */
-    ECCurve_X9_62_CHAR2_PNB163V1, /* not supported */
-    ECCurve_X9_62_CHAR2_PNB163V2, /* not supported */
-    ECCurve_X9_62_CHAR2_PNB163V3, /* not supported */
-    ECCurve_X9_62_CHAR2_PNB176V1, /* not supported */
-    ECCurve_X9_62_CHAR2_TNB191V1, /* not supported */
-    ECCurve_X9_62_CHAR2_TNB191V2, /* not supported */
-    ECCurve_X9_62_CHAR2_TNB191V3, /* not supported */
-    ECCurve_X9_62_CHAR2_PNB208W1, /* not supported */
-    ECCurve_X9_62_CHAR2_TNB239V1, /* not supported */
-    ECCurve_X9_62_CHAR2_TNB239V2, /* not supported */
-    ECCurve_X9_62_CHAR2_TNB239V3, /* not supported */
-    ECCurve_X9_62_CHAR2_PNB272W1, /* not supported */
-    ECCurve_X9_62_CHAR2_PNB304W1, /* not supported */
-    ECCurve_X9_62_CHAR2_TNB359V1, /* not supported */
-    ECCurve_X9_62_CHAR2_PNB368W1, /* not supported */
-    ECCurve_X9_62_CHAR2_TNB431R1, /* not supported */
-
-    /* SEC2 prime curves */
-    ECCurve_SECG_PRIME_112R1, /* not supported */
-    ECCurve_SECG_PRIME_112R2, /* not supported */
-    ECCurve_SECG_PRIME_128R1, /* not supported */
-    ECCurve_SECG_PRIME_128R2, /* not supported */
-    ECCurve_SECG_PRIME_160K1, /* not supported */
-    ECCurve_SECG_PRIME_160R1, /* not supported */
-    ECCurve_SECG_PRIME_160R2, /* not supported */
-    ECCurve_SECG_PRIME_192K1, /* not supported */
-    /* ECCurve_SECG_PRIME_192R1 == ECCurve_NIST_P192 */
-    ECCurve_SECG_PRIME_224K1, /* not supported */
-    /* ECCurve_SECG_PRIME_224R1 == ECCurve_NIST_P224 */
-    ECCurve_SECG_PRIME_256K1, /* not supported */
-    /* ECCurve_SECG_PRIME_256R1 == ECCurve_NIST_P256 */
-    /* ECCurve_SECG_PRIME_384R1 == ECCurve_NIST_P384 */
-    /* ECCurve_SECG_PRIME_521R1 == ECCurve_NIST_P521 */
-
-    /* SEC2 binary curves */
-    ECCurve_SECG_CHAR2_113R1, /* not supported */
-    ECCurve_SECG_CHAR2_113R2, /* not supported */
-    ECCurve_SECG_CHAR2_131R1, /* not supported */
-    ECCurve_SECG_CHAR2_131R2, /* not supported */
-    /* ECCurve_SECG_CHAR2_163K1 == ECCurve_NIST_K163 */
-    ECCurve_SECG_CHAR2_163R1, /* not supported */
-    /* ECCurve_SECG_CHAR2_163R2 == ECCurve_NIST_B163 */
-    ECCurve_SECG_CHAR2_193R1, /* not supported */
-    ECCurve_SECG_CHAR2_193R2, /* not supported */
-    /* ECCurve_SECG_CHAR2_233K1 == ECCurve_NIST_K233 */
-    /* ECCurve_SECG_CHAR2_233R1 == ECCurve_NIST_B233 */
-    ECCurve_SECG_CHAR2_239K1, /* not supported */
-    /* ECCurve_SECG_CHAR2_283K1 == ECCurve_NIST_K283 */
-    /* ECCurve_SECG_CHAR2_283R1 == ECCurve_NIST_B283 */
-    /* ECCurve_SECG_CHAR2_409K1 == ECCurve_NIST_K409 */
-    /* ECCurve_SECG_CHAR2_409R1 == ECCurve_NIST_B409 */
-    /* ECCurve_SECG_CHAR2_571K1 == ECCurve_NIST_K571 */
-    /* ECCurve_SECG_CHAR2_571R1 == ECCurve_NIST_B571 */
-
-    /* WTLS curves */
-    ECCurve_WTLS_1, /* not supported */
-    /* there is no WTLS 2 curve */
-    /* ECCurve_WTLS_3 == ECCurve_NIST_K163 */
-    /* ECCurve_WTLS_4 == ECCurve_SECG_CHAR2_113R1 */
-    /* ECCurve_WTLS_5 == ECCurve_X9_62_CHAR2_PNB163V1 */
-    /* ECCurve_WTLS_6 == ECCurve_SECG_PRIME_112R1 */
-    /* ECCurve_WTLS_7 == ECCurve_SECG_PRIME_160R1 */
-    ECCurve_WTLS_8, /* not supported */
-    ECCurve_WTLS_9, /* not supported */
-    /* ECCurve_WTLS_10 == ECCurve_NIST_K233 */
-    /* ECCurve_WTLS_11 == ECCurve_NIST_B233 */
-    /* ECCurve_WTLS_12 == ECCurve_NIST_P224 */
-
-    ECCurve25519,
-
-    ECCurve_pastLastCurve
-} ECCurveName;
-
-/* Aliased named curves */
-
-#define ECCurve_X9_62_PRIME_192V1 ECCurve_NIST_P192 /* not supported */
-#define ECCurve_X9_62_PRIME_256V1 ECCurve_NIST_P256
-#define ECCurve_SECG_PRIME_192R1 ECCurve_NIST_P192 /* not supported */
-#define ECCurve_SECG_PRIME_224R1 ECCurve_NIST_P224 /* not supported */
-#define ECCurve_SECG_PRIME_256R1 ECCurve_NIST_P256
-#define ECCurve_SECG_PRIME_384R1 ECCurve_NIST_P384
-#define ECCurve_SECG_PRIME_521R1 ECCurve_NIST_P521
-#define ECCurve_SECG_CHAR2_163K1 ECCurve_NIST_K163  /* not supported */
-#define ECCurve_SECG_CHAR2_163R2 ECCurve_NIST_B163  /* not supported */
-#define ECCurve_SECG_CHAR2_233K1 ECCurve_NIST_K233  /* not supported */
-#define ECCurve_SECG_CHAR2_233R1 ECCurve_NIST_B233  /* not supported */
-#define ECCurve_SECG_CHAR2_283K1 ECCurve_NIST_K283  /* not supported */
-#define ECCurve_SECG_CHAR2_283R1 ECCurve_NIST_B283  /* not supported */
-#define ECCurve_SECG_CHAR2_409K1 ECCurve_NIST_K409  /* not supported */
-#define ECCurve_SECG_CHAR2_409R1 ECCurve_NIST_B409  /* not supported */
-#define ECCurve_SECG_CHAR2_571K1 ECCurve_NIST_K571  /* not supported */
-#define ECCurve_SECG_CHAR2_571R1 ECCurve_NIST_B571  /* not supported */
-#define ECCurve_WTLS_3 ECCurve_NIST_K163            /* not supported */
-#define ECCurve_WTLS_4 ECCurve_SECG_CHAR2_113R1     /* not supported */
-#define ECCurve_WTLS_5 ECCurve_X9_62_CHAR2_PNB163V1 /* not supported */
-#define ECCurve_WTLS_6 ECCurve_SECG_PRIME_112R1     /* not supported */
-#define ECCurve_WTLS_7 ECCurve_SECG_PRIME_160R1     /* not supported */
-#define ECCurve_WTLS_10 ECCurve_NIST_K233           /* not supported */
-#define ECCurve_WTLS_11 ECCurve_NIST_B233           /* not supported */
-#define ECCurve_WTLS_12 ECCurve_NIST_P224           /* not supported */
-
-#endif /* __ecl_exp_h_ */
diff --git a/openflow/usr/include/nss/hasht.h b/openflow/usr/include/nss/hasht.h
deleted file mode 100644
index 536d34c..0000000
--- a/openflow/usr/include/nss/hasht.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _HASHT_H_
-#define _HASHT_H_
-
-#include "prtypes.h"
-
-/* Opaque objects */
-typedef struct SECHashObjectStr SECHashObject;
-typedef struct HASHContextStr HASHContext;
-
-/*
- * The hash functions the security library supports
- * NOTE the order must match the definition of SECHashObjects[]!
- */
-typedef enum {
-    HASH_AlgNULL = 0,
-    HASH_AlgMD2 = 1,
-    HASH_AlgMD5 = 2,
-    HASH_AlgSHA1 = 3,
-    HASH_AlgSHA256 = 4,
-    HASH_AlgSHA384 = 5,
-    HASH_AlgSHA512 = 6,
-    HASH_AlgSHA224 = 7,
-    HASH_AlgTOTAL
-} HASH_HashType;
-
-/*
- * Number of bytes each hash algorithm produces
- */
-#define MD2_LENGTH 16
-#define MD5_LENGTH 16
-#define SHA1_LENGTH 20
-#define SHA224_LENGTH 28
-#define SHA256_LENGTH 32
-#define SHA384_LENGTH 48
-#define SHA512_LENGTH 64
-#define HASH_LENGTH_MAX SHA512_LENGTH
-
-/*
- * Structure to hold hash computation info and routines
- */
-struct SECHashObjectStr {
-    unsigned int length; /* hash output length (in bytes) */
-    void *(*create)(void);
-    void *(*clone)(void *);
-    void (*destroy)(void *, PRBool);
-    void (*begin)(void *);
-    void (*update)(void *, const unsigned char *, unsigned int);
-    void (*end)(void *, unsigned char *, unsigned int *, unsigned int);
-    unsigned int blocklength; /* hash input block size (in bytes) */
-    HASH_HashType type;
-    void (*end_raw)(void *, unsigned char *, unsigned int *, unsigned int);
-};
-
-struct HASHContextStr {
-    const struct SECHashObjectStr *hashobj;
-    void *hash_context;
-};
-
-#endif /* _HASHT_H_ */
diff --git a/openflow/usr/include/nss/jar-ds.h b/openflow/usr/include/nss/jar-ds.h
deleted file mode 100644
index 9818c66..0000000
--- a/openflow/usr/include/nss/jar-ds.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __JAR_DS_h_
-#define __JAR_DS_h_
-
-/* Typedefs */
-typedef struct ZZLinkStr ZZLink;
-typedef struct ZZListStr ZZList;
-
-/*
-** Circular linked list. Each link contains a pointer to the object that
-** is actually in the list.
-*/
-struct ZZLinkStr {
-    ZZLink *next;
-    ZZLink *prev;
-    JAR_Item *thing;
-};
-
-struct ZZListStr {
-    ZZLink link;
-};
-
-#define ZZ_InitList(lst)                 \
-    {                                    \
-        (lst)->link.next = &(lst)->link; \
-        (lst)->link.prev = &(lst)->link; \
-        (lst)->link.thing = 0;           \
-    }
-
-#define ZZ_ListEmpty(lst) ((lst)->link.next == &(lst)->link)
-
-#define ZZ_ListHead(lst) ((lst)->link.next)
-
-#define ZZ_ListTail(lst) ((lst)->link.prev)
-
-#define ZZ_ListIterDone(lst, lnk) ((lnk) == &(lst)->link)
-
-#define ZZ_AppendLink(lst, lnk)         \
-    {                                   \
-        (lnk)->next = &(lst)->link;     \
-        (lnk)->prev = (lst)->link.prev; \
-        (lst)->link.prev->next = (lnk); \
-        (lst)->link.prev = (lnk);       \
-    }
-
-#define ZZ_InsertLink(lst, lnk)         \
-    {                                   \
-        (lnk)->next = (lst)->link.next; \
-        (lnk)->prev = &(lst)->link;     \
-        (lst)->link.next->prev = (lnk); \
-        (lst)->link.next = (lnk);       \
-    }
-
-#define ZZ_RemoveLink(lnk)               \
-    {                                    \
-        (lnk)->next->prev = (lnk)->prev; \
-        (lnk)->prev->next = (lnk)->next; \
-        (lnk)->next = 0;                 \
-        (lnk)->prev = 0;                 \
-    }
-
-extern ZZLink *
-ZZ_NewLink(JAR_Item *thing);
-
-extern void
-ZZ_DestroyLink(ZZLink *link);
-
-extern ZZList *
-ZZ_NewList(void);
-
-extern void
-ZZ_DestroyList(ZZList *list);
-
-#endif /* __JAR_DS_h_ */
diff --git a/openflow/usr/include/nss/jar.h b/openflow/usr/include/nss/jar.h
deleted file mode 100644
index d337cef..0000000
--- a/openflow/usr/include/nss/jar.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __JAR_h_
-#define __JAR_h_
-
-/*
- *  In general, any functions that return pointers
- *  have memory owned by the caller.
- *
- */
-
-/* security includes */
-#include "cert.h"
-#include "hasht.h"
-
-/* nspr 2.0 includes */
-#include "prio.h"
-
-#define ZHUGEP
-
-#include <stdio.h>
-
-/* various types */
-
-typedef enum {
-    jarTypeMF = 2,
-    jarTypeSF = 3,
-    jarTypeMeta = 6,
-    jarTypePhy = 7,
-    jarTypeSign = 10,
-    jarTypeSect = 11,
-    jarTypeOwner = 13
-} jarType;
-
-/* void data in ZZList's contain JAR_Item type */
-typedef struct JAR_Item_ {
-    char *pathname; /* relative. inside zip file */
-    jarType type;   /* various types */
-    size_t size;    /* size of data below */
-    void *data;     /* totally opaque */
-} JAR_Item;
-
-/* hashes */
-typedef enum {
-    jarHashNone = 0,
-    jarHashBad = 1,
-    jarHashPresent = 2
-} jarHash;
-
-typedef struct JAR_Digest_ {
-    jarHash md5_status;
-    unsigned char md5[MD5_LENGTH];
-    jarHash sha1_status;
-    unsigned char sha1[SHA1_LENGTH];
-} JAR_Digest;
-
-/* physical archive formats */
-typedef enum {
-    jarArchGuess = 0,
-    jarArchNone = 1,
-    jarArchZip = 2,
-    jarArchTar = 3
-} jarArch;
-
-#include "jar-ds.h"
-
-struct JAR_;
-
-typedef int jar_settable_callback_fn(int status, struct JAR_ *jar,
-                                     const char *metafile, char *pathname,
-                                     char *errortext);
-
-/* jar object */
-typedef struct JAR_ {
-    jarArch format; /* physical archive format */
-
-    char *url;      /* Where it came from */
-    char *filename; /* Disk location */
-    FILE *fp;       /* For multiple extractions */
-    /* JAR_FILE */
-
-    /* various linked lists */
-    ZZList *manifest; /* Digests of MF sections */
-    ZZList *hashes;   /* Digests of actual signed files */
-    ZZList *phy;      /* Physical layout of JAR file */
-    ZZList *metainfo; /* Global metainfo */
-
-    JAR_Digest *globalmeta; /* digest of .MF global portion */
-
-    /* Below will change to a linked list to support multiple sigs */
-    int pkcs7; /* Enforced opaqueness */
-    int valid; /* PKCS7 signature validated */
-
-    ZZList *signers; /* the above, per signer */
-
-    /* Window context, very necessary for PKCS11 now */
-    void *mw; /* MWContext window context */
-
-    /* Signal callback function */
-    jar_settable_callback_fn *signal;
-} JAR;
-
-/*
- *  Iterator
- *
- *  Context for iterative operations. Certain operations
- *  require iterating multiple linked lists because of
- *  multiple signers. "nextsign" is used for this purpose.
- *
- */
-typedef struct JAR_Context_ {
-    JAR *jar;         /* Jar we are searching */
-    char *pattern;    /* Regular expression */
-    jarType finding;  /* Type of item to find */
-    ZZLink *next;     /* Next item in find */
-    ZZLink *nextsign; /* Next signer, sometimes */
-} JAR_Context;
-
-typedef struct JAR_Signer_ {
-    int pkcs7;          /* Enforced opaqueness */
-    int valid;          /* PKCS7 signature validated */
-    char *owner;        /* name of .RSA file */
-    JAR_Digest *digest; /* of .SF file */
-    ZZList *sf;         /* Linked list of .SF file contents */
-    ZZList *certs;      /* Signing information */
-} JAR_Signer;
-
-/* Meta informaton, or "policy", from the manifest file.
-   Right now just one tuple per JAR_Item. */
-typedef struct JAR_Metainfo_ {
-    char *header;
-    char *info;
-} JAR_Metainfo;
-
-/* This should not be global */
-typedef struct JAR_Physical_ {
-    unsigned char compression;
-    unsigned long offset;
-    unsigned long length;
-    unsigned long uncompressed_length;
-#if defined(XP_UNIX) || defined(XP_BEOS)
-    PRUint16 mode;
-#endif
-} JAR_Physical;
-
-typedef struct JAR_Cert_ {
-    size_t length;
-    void *key;
-    CERTCertificate *cert;
-} JAR_Cert;
-
-/* certificate stuff */
-typedef enum {
-    jarCertCompany = 1,
-    jarCertCA = 2,
-    jarCertSerial = 3,
-    jarCertExpires = 4,
-    jarCertNickname = 5,
-    jarCertFinger = 6,
-    jarCertJavaHack = 100
-} jarCert;
-
-/* callback types */
-#define JAR_CB_SIGNAL 1
-
-/*
- *  This is the base for the JAR error codes. It will
- *  change when these are incorporated into allxpstr.c,
- *  but right now they won't let me put them there.
- *
- */
-#ifndef SEC_ERR_BASE
-#define SEC_ERR_BASE (-0x2000)
-#endif
-
-#define JAR_BASE SEC_ERR_BASE + 300
-
-/* Jar specific error definitions */
-
-#define JAR_ERR_GENERAL (JAR_BASE + 1)
-#define JAR_ERR_FNF (JAR_BASE + 2)
-#define JAR_ERR_CORRUPT (JAR_BASE + 3)
-#define JAR_ERR_MEMORY (JAR_BASE + 4)
-#define JAR_ERR_DISK (JAR_BASE + 5)
-#define JAR_ERR_ORDER (JAR_BASE + 6)
-#define JAR_ERR_SIG (JAR_BASE + 7)
-#define JAR_ERR_METADATA (JAR_BASE + 8)
-#define JAR_ERR_ENTRY (JAR_BASE + 9)
-#define JAR_ERR_HASH (JAR_BASE + 10)
-#define JAR_ERR_PK7 (JAR_BASE + 11)
-#define JAR_ERR_PNF (JAR_BASE + 12)
-
-/* Function declarations */
-
-extern JAR *JAR_new(void);
-
-extern void PR_CALLBACK JAR_destroy(JAR *jar);
-
-extern char *JAR_get_error(int status);
-
-extern int JAR_set_callback(int type, JAR *jar, jar_settable_callback_fn *fn);
-
-extern void
-JAR_init_callbacks(char *(*string_cb)(int),
-                   void *(*find_cx)(void),
-                   void *(*init_cx)(void));
-
-/*
- *  JAR_set_context
- *
- *  PKCS11 may require a password to be entered by the user
- *  before any crypto routines may be called. This will require
- *  a window context if used from inside Mozilla.
- *
- *  Call this routine with your context before calling
- *  verifying or signing. If you have no context, call with NULL
- *  and one will be chosen for you.
- *
- */
-int JAR_set_context(JAR *jar, void /*MWContext*/ *mw);
-
-/*
- *  Iterative operations
- *
- *  JAR_find sets up for repeated calls with JAR_find_next.
- *  I never liked findfirst and findnext, this is nicer.
- *
- *  Pattern contains a relative pathname to match inside the
- *  archive. It is currently assumed to be "*".
- *
- *  To use:
- *
- *     JAR_Item *item;
- *     JAR_find (jar, "*.class", jarTypeMF);
- *     while (JAR_find_next (jar, &item) >= 0)
- *   { do stuff }
- *
- */
-
-/* Replacement functions with an external context */
-
-extern JAR_Context *JAR_find(JAR *jar, char *pattern, jarType type);
-
-extern int JAR_find_next(JAR_Context *ctx, JAR_Item **it);
-
-extern void JAR_find_end(JAR_Context *ctx);
-
-/*
- *  Function to parse manifest file:
- *
- *  Many signatures may be attached to a single filename located
- *  inside the zip file. We only support one.
- *
- *  Several manifests may be included in the zip file.
- *
- *  You must pass the MANIFEST.MF file before any .SF files.
- *
- *  Right now this returns a big ole list, privately in the jar structure.
- *  If you need to traverse it, use JAR_find if possible.
- *
- *  The path is needed to determine what type of binary signature is
- *  being passed, though it is technically not needed for manifest files.
- *
- *  When parsing an ASCII file, null terminate the ASCII raw_manifest
- *  prior to sending it, and indicate a length of 0. For binary digital
- *  signatures only, indicate the true length of the signature.
- *  (This is legacy behavior.)
- *
- *  You may free the manifest after parsing it.
- *
- */
-
-extern int
-JAR_parse_manifest(JAR *jar, char *raw_manifest, long length, const char *path,
-                   const char *url);
-
-/*
- *  Verify data (nonstreaming). The signature is actually
- *  checked by JAR_parse_manifest or JAR_pass_archive.
- *
- */
-
-extern JAR_Digest *PR_CALLBACK
-JAR_calculate_digest(void *data, long length);
-
-extern int PR_CALLBACK
-JAR_verify_digest(JAR *jar, const char *name, JAR_Digest *dig);
-
-extern int
-JAR_digest_file(char *filename, JAR_Digest *dig);
-
-/*
- *  Meta information
- *
- *  Currently, since this call does not support passing of an owner
- *  (certificate, or physical name of the .sf file), it is restricted to
- *  returning information located in the manifest.mf file.
- *
- *  Meta information is a name/value pair inside the archive file. Here,
- *  the name is passed in *header and value returned in **info.
- *
- *  Pass a NULL as the name to retrieve metainfo from the global section.
- *
- *  Data is returned in **info, of size *length. The return value
- *  will indicate if no data was found.
- *
- */
-
-extern int
-JAR_get_metainfo(JAR *jar, char *name, char *header, void **info,
-                 unsigned long *length);
-
-extern char *JAR_get_filename(JAR *jar);
-
-extern char *JAR_get_url(JAR *jar);
-
-/* save the certificate with this fingerprint in persistent
-   storage, somewhere, for retrieval in a future session when there
-   is no corresponding JAR structure. */
-extern int PR_CALLBACK
-JAR_stash_cert(JAR *jar, long keylen, void *key);
-
-/* retrieve a certificate presumably stashed with the above
-   function, but may be any certificate. Type is &CERTCertificate */
-CERTCertificate *
-JAR_fetch_cert(long length, void *key);
-
-/*
- *  New functions to handle archives alone
- *    (call JAR_new beforehand)
- *
- *  JAR_pass_archive acts much like parse_manifest. Certificates
- *  are returned in the JAR structure but as opaque data. When calling
- *  JAR_verified_extract you still need to decide which of these
- *  certificates to honor.
- *
- *  Code to examine a JAR structure is in jarbert.c. You can obtain both
- *  a list of filenames and certificates from traversing the linked list.
- *
- */
-extern int
-JAR_pass_archive(JAR *jar, jarArch format, char *filename, const char *url);
-
-/*
- * Same thing, but don't check signatures
- */
-extern int
-JAR_pass_archive_unverified(JAR *jar, jarArch format, char *filename,
-                            const char *url);
-
-/*
- *  Extracts a relative pathname from the archive and places it
- *  in the filename specified.
- *
- *  Call JAR_set_nailed if you want to keep the file descriptors
- *  open between multiple calls to JAR_verify_extract.
- *
- */
-extern int
-JAR_verified_extract(JAR *jar, char *path, char *outpath);
-
-/*
- *  JAR_extract does no crypto checking. This can be used if you
- *  need to extract a manifest file or signature, etc.
- *
- */
-extern int
-JAR_extract(JAR *jar, char *path, char *outpath);
-
-#endif /* __JAR_h_ */
diff --git a/openflow/usr/include/nss/jarfile.h b/openflow/usr/include/nss/jarfile.h
deleted file mode 100644
index 52d4f1f..0000000
--- a/openflow/usr/include/nss/jarfile.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- *  JARFILE.H
- *
- *  Certain constants and structures for the archive format.
- *
- */
-
-/* ZIP */
-struct ZipLocal { /* 30 bytes */
-    char signature[4];
-    char word[2];
-    char bitflag[2];
-    char method[2];
-    char time[2];
-    char date[2];
-    char crc32[4];
-    char size[4];
-    char orglen[4];
-    char filename_len[2];
-    char extrafield_len[2];
-};
-
-struct ZipCentral { /* 46 bytes */
-    char signature[4];
-    char version_made_by[2];
-    char version[2];
-    char bitflag[2];
-    char method[2];
-    char time[2];
-    char date[2];
-    char crc32[4];
-    char size[4];
-    char orglen[4];
-    char filename_len[2];
-    char extrafield_len[2];
-    char commentfield_len[2];
-    char diskstart_number[2];
-    char internal_attributes[2];
-    char external_attributes[4];
-    char localhdr_offset[4];
-};
-
-struct ZipEnd { /* 22 bytes */
-    char signature[4];
-    char disk_nr[2];
-    char start_central_dir[2];
-    char total_entries_disk[2];
-    char total_entries_archive[2];
-    char central_dir_size[4];
-    char offset_central_dir[4];
-    char commentfield_len[2];
-};
-
-#define LSIG 0x04034B50l
-#define CSIG 0x02014B50l
-#define ESIG 0x06054B50l
-
-/* TAR */
-union TarEntry {    /* 512 bytes */
-    struct header { /* 257 bytes */
-        char filename[100];
-        char mode[8];
-        char uid[8];
-        char gid[8];
-        char size[12];
-        char time[12];
-        char checksum[8];
-        char linkflag;
-        char linkname[100];
-    } val;
-    char buffer[512];
-};
diff --git a/openflow/usr/include/nss/key.h b/openflow/usr/include/nss/key.h
deleted file mode 100644
index 3e89b74..0000000
--- a/openflow/usr/include/nss/key.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* This header is deprecated.  Please include keyhi.h instead. */
-
-#ifndef _KEY_H_
-#define _KEY_H_
-
-#include "keyhi.h"
-
-#endif /* _KEY_H_ */
diff --git a/openflow/usr/include/nss/keyhi.h b/openflow/usr/include/nss/keyhi.h
deleted file mode 100644
index 1809900..0000000
--- a/openflow/usr/include/nss/keyhi.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _KEYHI_H_
-#define _KEYHI_H_
-
-#include "plarena.h"
-
-#include "seccomon.h"
-#include "secoidt.h"
-#include "secdert.h"
-#include "keythi.h"
-#include "certt.h"
-/*#include "secpkcs5.h" */
-
-SEC_BEGIN_PROTOS
-
-/*
-** Destroy a subject-public-key-info object.
-*/
-extern void SECKEY_DestroySubjectPublicKeyInfo(CERTSubjectPublicKeyInfo *spki);
-
-/*
-** Copy subject-public-key-info "src" to "dst". "dst" is filled in
-** appropriately (memory is allocated for each of the sub objects).
-*/
-extern SECStatus SECKEY_CopySubjectPublicKeyInfo(PLArenaPool *arena,
-                                                 CERTSubjectPublicKeyInfo *dst,
-                                                 CERTSubjectPublicKeyInfo *src);
-
-/*
-** Update the PQG parameters for a cert's public key.
-** Only done for DSA certs
-*/
-extern SECStatus
-SECKEY_UpdateCertPQG(CERTCertificate *subjectCert);
-
-/*
-** Return the number of bits in the provided big integer.  This assumes that the
-** SECItem contains a big-endian number and counts from the first non-zero bit.
-*/
-extern unsigned SECKEY_BigIntegerBitLength(const SECItem *number);
-
-/*
-** Return the strength of the public key in bytes
-*/
-extern unsigned SECKEY_PublicKeyStrength(const SECKEYPublicKey *pubk);
-
-/*
-** Return the strength of the public key in bits
-*/
-extern unsigned SECKEY_PublicKeyStrengthInBits(const SECKEYPublicKey *pubk);
-
-/*
-** Return the length of the signature in bytes
-*/
-extern unsigned SECKEY_SignatureLen(const SECKEYPublicKey *pubk);
-
-/*
-** Make a copy of the private key "privKey"
-*/
-extern SECKEYPrivateKey *SECKEY_CopyPrivateKey(const SECKEYPrivateKey *privKey);
-
-/*
-** Make a copy of the public key "pubKey"
-*/
-extern SECKEYPublicKey *SECKEY_CopyPublicKey(const SECKEYPublicKey *pubKey);
-
-/*
-** Convert a private key "privateKey" into a public key
-*/
-extern SECKEYPublicKey *SECKEY_ConvertToPublicKey(SECKEYPrivateKey *privateKey);
-
-/*
- * create a new RSA key pair. The private Key is returned...
- */
-SECKEYPrivateKey *SECKEY_CreateRSAPrivateKey(int keySizeInBits,
-                                             SECKEYPublicKey **pubk, void *cx);
-
-/*
- * create a new DH key pair. The private Key is returned...
- */
-SECKEYPrivateKey *SECKEY_CreateDHPrivateKey(SECKEYDHParams *param,
-                                            SECKEYPublicKey **pubk, void *cx);
-
-/*
- * create a new EC key pair. The private Key is returned...
- */
-SECKEYPrivateKey *SECKEY_CreateECPrivateKey(SECKEYECParams *param,
-                                            SECKEYPublicKey **pubk, void *cx);
-
-/*
-** Create a subject-public-key-info based on a public key.
-*/
-extern CERTSubjectPublicKeyInfo *
-SECKEY_CreateSubjectPublicKeyInfo(const SECKEYPublicKey *k);
-
-/*
-** Convert a base64 ascii encoded DER public key and challenge to spki,
-** and verify the signature and challenge data are correct
-*/
-extern CERTSubjectPublicKeyInfo *
-SECKEY_ConvertAndDecodePublicKeyAndChallenge(char *pkacstr, char *challenge,
-                                             void *cx);
-
-/*
-** Encode a  CERTSubjectPublicKeyInfo structure. into a
-** DER encoded subject public key info.
-*/
-SECItem *
-SECKEY_EncodeDERSubjectPublicKeyInfo(const SECKEYPublicKey *pubk);
-
-/*
-** Decode a DER encoded subject public key info into a
-** CERTSubjectPublicKeyInfo structure.
-*/
-extern CERTSubjectPublicKeyInfo *
-SECKEY_DecodeDERSubjectPublicKeyInfo(const SECItem *spkider);
-
-/*
-** Convert a base64 ascii encoded DER subject public key info to our
-** internal format.
-*/
-extern CERTSubjectPublicKeyInfo *
-SECKEY_ConvertAndDecodeSubjectPublicKeyInfo(const char *spkistr);
-
-/*
- * extract the public key from a subject Public Key info structure.
- * (used by JSS).
- */
-extern SECKEYPublicKey *
-SECKEY_ExtractPublicKey(const CERTSubjectPublicKeyInfo *);
-
-/*
-** Destroy a private key object.
-**	"key" the object
-*/
-extern void SECKEY_DestroyPrivateKey(SECKEYPrivateKey *key);
-
-/*
-** Destroy a public key object.
-**	"key" the object
-*/
-extern void SECKEY_DestroyPublicKey(SECKEYPublicKey *key);
-
-/* Destroy and zero out a private key info structure.  for now this
- * function zero's out memory allocated in an arena for the key
- * since PORT_FreeArena does not currently do this.
- *
- * NOTE -- If a private key info is allocated in an arena, one should
- * not call this function with freeit = PR_FALSE.  The function should
- * destroy the arena.
- */
-extern void
-SECKEY_DestroyPrivateKeyInfo(SECKEYPrivateKeyInfo *pvk, PRBool freeit);
-
-/* Destroy and zero out an encrypted private key info.
- *
- * NOTE -- If a encrypted private key info is allocated in an arena, one should
- * not call this function with freeit = PR_FALSE.  The function should
- * destroy the arena.
- */
-extern void
-SECKEY_DestroyEncryptedPrivateKeyInfo(SECKEYEncryptedPrivateKeyInfo *epki,
-                                      PRBool freeit);
-
-/* Copy private key info structure.
- *  poolp is the arena into which the contents of from is to be copied.
- *	NULL is a valid entry.
- *  to is the destination private key info
- *  from is the source private key info
- * if either from or to is NULL or an error occurs, SECFailure is
- * returned.  otherwise, SECSuccess is returned.
- */
-extern SECStatus
-SECKEY_CopyPrivateKeyInfo(PLArenaPool *poolp,
-                          SECKEYPrivateKeyInfo *to,
-                          const SECKEYPrivateKeyInfo *from);
-
-extern SECStatus
-SECKEY_CacheStaticFlags(SECKEYPrivateKey *key);
-
-/* Copy encrypted private key info structure.
- *  poolp is the arena into which the contents of from is to be copied.
- *	NULL is a valid entry.
- *  to is the destination encrypted private key info
- *  from is the source encrypted private key info
- * if either from or to is NULL or an error occurs, SECFailure is
- * returned.  otherwise, SECSuccess is returned.
- */
-extern SECStatus
-SECKEY_CopyEncryptedPrivateKeyInfo(PLArenaPool *poolp,
-                                   SECKEYEncryptedPrivateKeyInfo *to,
-                                   const SECKEYEncryptedPrivateKeyInfo *from);
-/*
- * Accessor functions for key type of public and private keys.
- */
-KeyType SECKEY_GetPrivateKeyType(const SECKEYPrivateKey *privKey);
-KeyType SECKEY_GetPublicKeyType(const SECKEYPublicKey *pubKey);
-
-/*
- * Creates a PublicKey from its DER encoding.
- * Currently only supports RSA, DSA, and DH keys.
- */
-SECKEYPublicKey *
-SECKEY_ImportDERPublicKey(const SECItem *derKey, CK_KEY_TYPE type);
-
-SECKEYPrivateKeyList *
-SECKEY_NewPrivateKeyList(void);
-
-void
-SECKEY_DestroyPrivateKeyList(SECKEYPrivateKeyList *keys);
-
-void
-SECKEY_RemovePrivateKeyListNode(SECKEYPrivateKeyListNode *node);
-
-SECStatus
-SECKEY_AddPrivateKeyToListTail(SECKEYPrivateKeyList *list,
-                               SECKEYPrivateKey *key);
-
-#define PRIVKEY_LIST_HEAD(l) ((SECKEYPrivateKeyListNode *)PR_LIST_HEAD(&l->list))
-#define PRIVKEY_LIST_NEXT(n) ((SECKEYPrivateKeyListNode *)n->links.next)
-#define PRIVKEY_LIST_END(n, l) (((void *)n) == ((void *)&l->list))
-
-SECKEYPublicKeyList *
-SECKEY_NewPublicKeyList(void);
-
-void
-SECKEY_DestroyPublicKeyList(SECKEYPublicKeyList *keys);
-
-void
-SECKEY_RemovePublicKeyListNode(SECKEYPublicKeyListNode *node);
-
-SECStatus
-SECKEY_AddPublicKeyToListTail(SECKEYPublicKeyList *list,
-                              SECKEYPublicKey *key);
-
-#define PUBKEY_LIST_HEAD(l) ((SECKEYPublicKeyListNode *)PR_LIST_HEAD(&l->list))
-#define PUBKEY_LIST_NEXT(n) ((SECKEYPublicKeyListNode *)n->links.next)
-#define PUBKEY_LIST_END(n, l) (((void *)n) == ((void *)&l->list))
-
-/*
- * Length in bits of the EC's field size.  This is also the length of
- * the x and y coordinates of EC points, such as EC public keys and
- * base points.
- *
- * Return 0 on failure (unknown EC domain parameters).
- */
-extern int SECKEY_ECParamsToKeySize(const SECItem *params);
-
-/*
- * Length in bits of the EC base point order, usually denoted n.  This
- * is also the length of EC private keys and ECDSA signature components
- * r and s.
- *
- * Return 0 on failure (unknown EC domain parameters).
- */
-extern int SECKEY_ECParamsToBasePointOrderLen(const SECItem *params);
-
-/*
- * Returns the object identifier of the curve, of the provided
- * elliptic curve parameters structures.
- *
- * Return 0 on failure (unknown EC domain parameters).
- */
-SECOidTag SECKEY_GetECCOid(const SECKEYECParams *params);
-
-SEC_END_PROTOS
-
-#endif /* _KEYHI_H_ */
diff --git a/openflow/usr/include/nss/keyt.h b/openflow/usr/include/nss/keyt.h
deleted file mode 100644
index 99da312..0000000
--- a/openflow/usr/include/nss/keyt.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _KEYT_H_
-#define _KEYT_H_
-
-#include "keythi.h"
-
-#endif /* _KEYT_H_ */
diff --git a/openflow/usr/include/nss/keythi.h b/openflow/usr/include/nss/keythi.h
deleted file mode 100644
index 3689654..0000000
--- a/openflow/usr/include/nss/keythi.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _KEYTHI_H_
-#define _KEYTHI_H_ 1
-
-#include "eccutil.h"
-#include "plarena.h"
-#include "pkcs11t.h"
-#include "secmodt.h"
-#include "prclist.h"
-
-/*
-** RFC 4055 Section 1.2 specifies three different RSA key types.
-**
-** rsaKey maps to keys with SEC_OID_PKCS1_RSA_ENCRYPTION and can be used for
-** both encryption and signatures with old (PKCS #1 v1.5) and new (PKCS #1
-** v2.1) padding schemes.
-**
-** rsaPssKey maps to keys with SEC_OID_PKCS1_RSA_PSS_SIGNATURE and may only
-** be used for signatures with PSS padding (PKCS #1 v2.1).
-**
-** rsaOaepKey maps to keys with SEC_OID_PKCS1_RSA_OAEP_ENCRYPTION and may only
-** be used for encryption with OAEP padding (PKCS #1 v2.1).
-*/
-
-typedef enum {
-    nullKey = 0,
-    rsaKey = 1,
-    dsaKey = 2,
-    fortezzaKey = 3, /* deprecated */
-    dhKey = 4,
-    keaKey = 5, /* deprecated */
-    ecKey = 6,
-    rsaPssKey = 7,
-    rsaOaepKey = 8
-} KeyType;
-
-/*
-** Template Definitions
-**/
-
-SEC_BEGIN_PROTOS
-extern const SEC_ASN1Template SECKEY_RSAPublicKeyTemplate[];
-extern const SEC_ASN1Template SECKEY_RSAPSSParamsTemplate[];
-extern const SEC_ASN1Template SECKEY_DSAPublicKeyTemplate[];
-extern const SEC_ASN1Template SECKEY_DHPublicKeyTemplate[];
-extern const SEC_ASN1Template SECKEY_DHParamKeyTemplate[];
-extern const SEC_ASN1Template SECKEY_PQGParamsTemplate[];
-extern const SEC_ASN1Template SECKEY_DSAPrivateKeyExportTemplate[];
-
-/* Windows DLL accessor functions */
-SEC_ASN1_CHOOSER_DECLARE(SECKEY_DSAPublicKeyTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SECKEY_RSAPublicKeyTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SECKEY_RSAPSSParamsTemplate)
-SEC_END_PROTOS
-
-/*
-** RSA Public Key structures
-** member names from PKCS#1, section 7.1
-*/
-
-struct SECKEYRSAPublicKeyStr {
-    PLArenaPool *arena;
-    SECItem modulus;
-    SECItem publicExponent;
-};
-typedef struct SECKEYRSAPublicKeyStr SECKEYRSAPublicKey;
-
-/*
-** RSA-PSS parameters
-*/
-struct SECKEYRSAPSSParamsStr {
-    SECAlgorithmID *hashAlg;
-    SECAlgorithmID *maskAlg;
-    SECItem saltLength;
-    SECItem trailerField;
-};
-typedef struct SECKEYRSAPSSParamsStr SECKEYRSAPSSParams;
-
-/*
-** DSA Public Key and related structures
-*/
-
-struct SECKEYPQGParamsStr {
-    PLArenaPool *arena;
-    SECItem prime;    /* p */
-    SECItem subPrime; /* q */
-    SECItem base;     /* g */
-    /* XXX chrisk: this needs to be expanded to hold j and validationParms (RFC2459 7.3.2) */
-};
-typedef struct SECKEYPQGParamsStr SECKEYPQGParams;
-
-struct SECKEYDSAPublicKeyStr {
-    SECKEYPQGParams params;
-    SECItem publicValue;
-};
-typedef struct SECKEYDSAPublicKeyStr SECKEYDSAPublicKey;
-
-/*
-** Diffie-Hellman Public Key structure
-** Structure member names suggested by PKCS#3.
-*/
-struct SECKEYDHParamsStr {
-    PLArenaPool *arena;
-    SECItem prime; /* p */
-    SECItem base;  /* g */
-};
-typedef struct SECKEYDHParamsStr SECKEYDHParams;
-
-struct SECKEYDHPublicKeyStr {
-    PLArenaPool *arena;
-    SECItem prime;
-    SECItem base;
-    SECItem publicValue;
-};
-typedef struct SECKEYDHPublicKeyStr SECKEYDHPublicKey;
-
-/*
-** Elliptic curve Public Key structure
-** The PKCS#11 layer needs DER encoding of ANSI X9.62
-** parameters value
-*/
-typedef SECItem SECKEYECParams;
-
-struct SECKEYECPublicKeyStr {
-    SECKEYECParams DEREncodedParams;
-    int size;                 /* size in bits */
-    SECItem publicValue;      /* encoded point */
-    ECPointEncoding encoding; /* deprecated, ignored */
-};
-typedef struct SECKEYECPublicKeyStr SECKEYECPublicKey;
-
-/*
-** FORTEZZA Public Key structures
-*/
-struct SECKEYFortezzaPublicKeyStr {
-    int KEAversion;
-    int DSSversion;
-    unsigned char KMID[8];
-    SECItem clearance;
-    SECItem KEApriviledge;
-    SECItem DSSpriviledge;
-    SECItem KEAKey;
-    SECItem DSSKey;
-    SECKEYPQGParams params;
-    SECKEYPQGParams keaParams;
-};
-typedef struct SECKEYFortezzaPublicKeyStr SECKEYFortezzaPublicKey;
-#define KEAprivilege KEApriviledge /* corrected spelling */
-#define DSSprivilege DSSpriviledge /* corrected spelling */
-
-struct SECKEYDiffPQGParamsStr {
-    SECKEYPQGParams DiffKEAParams;
-    SECKEYPQGParams DiffDSAParams;
-};
-typedef struct SECKEYDiffPQGParamsStr SECKEYDiffPQGParams;
-
-struct SECKEYPQGDualParamsStr {
-    SECKEYPQGParams CommParams;
-    SECKEYDiffPQGParams DiffParams;
-};
-typedef struct SECKEYPQGDualParamsStr SECKEYPQGDualParams;
-
-struct SECKEYKEAParamsStr {
-    PLArenaPool *arena;
-    SECItem hash;
-};
-typedef struct SECKEYKEAParamsStr SECKEYKEAParams;
-
-struct SECKEYKEAPublicKeyStr {
-    SECKEYKEAParams params;
-    SECItem publicValue;
-};
-typedef struct SECKEYKEAPublicKeyStr SECKEYKEAPublicKey;
-
-/*
-** A Generic  public key object.
-*/
-struct SECKEYPublicKeyStr {
-    PLArenaPool *arena;
-    KeyType keyType;
-    PK11SlotInfo *pkcs11Slot;
-    CK_OBJECT_HANDLE pkcs11ID;
-    union {
-        SECKEYRSAPublicKey rsa;
-        SECKEYDSAPublicKey dsa;
-        SECKEYDHPublicKey dh;
-        SECKEYKEAPublicKey kea;
-        SECKEYFortezzaPublicKey fortezza;
-        SECKEYECPublicKey ec;
-    } u;
-};
-typedef struct SECKEYPublicKeyStr SECKEYPublicKey;
-
-/* bit flag definitions for staticflags */
-#define SECKEY_Attributes_Cached 0x1 /* bit 0 states \
-                                        whether attributes are cached */
-#define SECKEY_CKA_PRIVATE (1U << 1) /* bit 1 is the value of CKA_PRIVATE */
-#define SECKEY_CKA_ALWAYS_AUTHENTICATE (1U << 2)
-
-#define SECKEY_ATTRIBUTES_CACHED(key) \
-    (0 != (key->staticflags & SECKEY_Attributes_Cached))
-
-#define SECKEY_ATTRIBUTE_VALUE(key, attribute) \
-    (0 != (key->staticflags & SECKEY_##attribute))
-
-#define SECKEY_HAS_ATTRIBUTE_SET(key, attribute) \
-    (0 != (key->staticflags & SECKEY_Attributes_Cached)) ? (0 != (key->staticflags & SECKEY_##attribute)) : PK11_HasAttributeSet(key->pkcs11Slot, key->pkcs11ID, attribute, PR_FALSE)
-
-#define SECKEY_HAS_ATTRIBUTE_SET_LOCK(key, attribute, haslock) \
-    (0 != (key->staticflags & SECKEY_Attributes_Cached)) ? (0 != (key->staticflags & SECKEY_##attribute)) : PK11_HasAttributeSet(key->pkcs11Slot, key->pkcs11ID, attribute, haslock)
-
-/*
-** A generic key structure
-*/
-struct SECKEYPrivateKeyStr {
-    PLArenaPool *arena;
-    KeyType keyType;
-    PK11SlotInfo *pkcs11Slot;  /* pkcs11 slot this key lives in */
-    CK_OBJECT_HANDLE pkcs11ID; /* ID of pkcs11 object */
-    PRBool pkcs11IsTemp;       /* temp pkcs11 object, delete it when done */
-    void *wincx;               /* context for errors and pw prompts */
-    PRUint32 staticflags;      /* bit flag of cached PKCS#11 attributes */
-};
-typedef struct SECKEYPrivateKeyStr SECKEYPrivateKey;
-
-typedef struct {
-    PRCList links;
-    SECKEYPrivateKey *key;
-} SECKEYPrivateKeyListNode;
-
-typedef struct {
-    PRCList list;
-    PLArenaPool *arena;
-} SECKEYPrivateKeyList;
-
-typedef struct {
-    PRCList links;
-    SECKEYPublicKey *key;
-} SECKEYPublicKeyListNode;
-
-typedef struct {
-    PRCList list;
-    PLArenaPool *arena;
-} SECKEYPublicKeyList;
-#endif /* _KEYTHI_H_ */
diff --git a/openflow/usr/include/nss/lowkeyi.h b/openflow/usr/include/nss/lowkeyi.h
deleted file mode 100644
index a5878c2..0000000
--- a/openflow/usr/include/nss/lowkeyi.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _LOWKEYI_H_
-#define _LOWKEYI_H_
-
-#include "prtypes.h"
-#include "seccomon.h"
-#include "secoidt.h"
-#include "lowkeyti.h"
-
-SEC_BEGIN_PROTOS
-
-/*
- * See bugzilla bug 125359
- * Since NSS (via PKCS#11) wants to handle big integers as unsigned ints,
- * all of the templates above that en/decode into integers must be converted
- * from ASN.1's signed integer type.  This is done by marking either the
- * source or destination (encoding or decoding, respectively) type as
- * siUnsignedInteger.
- */
-extern void prepare_low_rsa_priv_key_for_asn1(NSSLOWKEYPrivateKey *key);
-extern void prepare_low_pqg_params_for_asn1(PQGParams *params);
-extern void prepare_low_dsa_priv_key_for_asn1(NSSLOWKEYPrivateKey *key);
-extern void prepare_low_dsa_priv_key_export_for_asn1(NSSLOWKEYPrivateKey *key);
-extern void prepare_low_dh_priv_key_for_asn1(NSSLOWKEYPrivateKey *key);
-#ifndef NSS_DISABLE_ECC
-extern void prepare_low_ec_priv_key_for_asn1(NSSLOWKEYPrivateKey *key);
-extern void prepare_low_ecparams_for_asn1(ECParams *params);
-#endif /* NSS_DISABLE_ECC */
-
-/*
-** Destroy a private key object.
-**  "key" the object
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void nsslowkey_DestroyPrivateKey(NSSLOWKEYPrivateKey *key);
-
-/*
-** Destroy a public key object.
-**  "key" the object
-**  "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void nsslowkey_DestroyPublicKey(NSSLOWKEYPublicKey *key);
-
-/*
-** Return the modulus length of "pubKey".
-*/
-extern unsigned int nsslowkey_PublicModulusLen(NSSLOWKEYPublicKey *pubKey);
-
-/*
-** Return the modulus length of "privKey".
-*/
-extern unsigned int nsslowkey_PrivateModulusLen(NSSLOWKEYPrivateKey *privKey);
-
-/*
-** Convert a low private key "privateKey" into a public low key
-*/
-extern NSSLOWKEYPublicKey *
-nsslowkey_ConvertToPublicKey(NSSLOWKEYPrivateKey *privateKey);
-
-/* Make a copy of a low private key in it's own arena.
- * a return of NULL indicates an error.
- */
-extern NSSLOWKEYPrivateKey *
-nsslowkey_CopyPrivateKey(NSSLOWKEYPrivateKey *privKey);
-
-SEC_END_PROTOS
-
-#endif /* _LOWKEYI_H_ */
diff --git a/openflow/usr/include/nss/lowkeyti.h b/openflow/usr/include/nss/lowkeyti.h
deleted file mode 100644
index 2ef1640..0000000
--- a/openflow/usr/include/nss/lowkeyti.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _LOWKEYTI_H_
-#define _LOWKEYTI_H_ 1
-
-#include "blapit.h"
-#include "prtypes.h"
-#include "plarena.h"
-#include "secitem.h"
-#include "secasn1t.h"
-#include "secoidt.h"
-
-/*
-** Typedef for callback to get a password "key".
-*/
-extern const SEC_ASN1Template nsslowkey_PQGParamsTemplate[];
-extern const SEC_ASN1Template nsslowkey_RSAPrivateKeyTemplate[];
-extern const SEC_ASN1Template nsslowkey_DSAPrivateKeyTemplate[];
-extern const SEC_ASN1Template nsslowkey_DSAPrivateKeyExportTemplate[];
-extern const SEC_ASN1Template nsslowkey_DHPrivateKeyTemplate[];
-extern const SEC_ASN1Template nsslowkey_DHPrivateKeyExportTemplate[];
-#ifndef NSS_DISABLE_ECC
-#define NSSLOWKEY_EC_PRIVATE_KEY_VERSION 1 /* as per SECG 1 C.4 */
-extern const SEC_ASN1Template nsslowkey_ECPrivateKeyTemplate[];
-#endif /* NSS_DISABLE_ECC */
-
-extern const SEC_ASN1Template nsslowkey_PrivateKeyInfoTemplate[];
-extern const SEC_ASN1Template nsslowkey_EncryptedPrivateKeyInfoTemplate[];
-
-/*
- * PKCS #8 attributes
- */
-struct NSSLOWKEYAttributeStr {
-    SECItem attrType;
-    SECItem *attrValue;
-};
-typedef struct NSSLOWKEYAttributeStr NSSLOWKEYAttribute;
-
-/*
-** A PKCS#8 private key info object
-*/
-struct NSSLOWKEYPrivateKeyInfoStr {
-    PLArenaPool *arena;
-    SECItem version;
-    SECAlgorithmID algorithm;
-    SECItem privateKey;
-    NSSLOWKEYAttribute **attributes;
-};
-typedef struct NSSLOWKEYPrivateKeyInfoStr NSSLOWKEYPrivateKeyInfo;
-#define NSSLOWKEY_PRIVATE_KEY_INFO_VERSION 0 /* what we *create* */
-
-typedef enum {
-    NSSLOWKEYNullKey = 0,
-    NSSLOWKEYRSAKey = 1,
-    NSSLOWKEYDSAKey = 2,
-    NSSLOWKEYDHKey = 4,
-    NSSLOWKEYECKey = 5
-} NSSLOWKEYType;
-
-/*
-** An RSA public key object.
-*/
-struct NSSLOWKEYPublicKeyStr {
-    PLArenaPool *arena;
-    NSSLOWKEYType keyType;
-    union {
-        RSAPublicKey rsa;
-        DSAPublicKey dsa;
-        DHPublicKey dh;
-        ECPublicKey ec;
-    } u;
-};
-typedef struct NSSLOWKEYPublicKeyStr NSSLOWKEYPublicKey;
-
-/*
-** Low Level private key object
-** This is only used by the raw Crypto engines (crypto), keydb (keydb),
-** and PKCS #11. Everyone else uses the high level key structure.
-*/
-struct NSSLOWKEYPrivateKeyStr {
-    PLArenaPool *arena;
-    NSSLOWKEYType keyType;
-    union {
-        RSAPrivateKey rsa;
-        DSAPrivateKey dsa;
-        DHPrivateKey dh;
-        ECPrivateKey ec;
-    } u;
-};
-typedef struct NSSLOWKEYPrivateKeyStr NSSLOWKEYPrivateKey;
-
-#endif /* _LOWKEYTI_H_ */
diff --git a/openflow/usr/include/nss/nss.h b/openflow/usr/include/nss/nss.h
deleted file mode 100644
index 66bc373..0000000
--- a/openflow/usr/include/nss/nss.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * NSS utility functions
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __nss_h_
-#define __nss_h_
-
-/* The private macro _NSS_CUSTOMIZED is for NSS internal use only. */
-#if defined(NSS_ALLOW_UNSUPPORTED_CRITICAL)
-#define _NSS_CUSTOMIZED " (Customized build)"
-#else
-#define _NSS_CUSTOMIZED
-#endif
-
-/*
- * NSS's major version, minor version, patch level, build number, and whether
- * this is a beta release.
- *
- * The format of the version string should be
- *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
- */
-#define NSS_VERSION "3.28.4" _NSS_CUSTOMIZED
-#define NSS_VMAJOR 3
-#define NSS_VMINOR 28
-#define NSS_VPATCH 4
-#define NSS_VBUILD 0
-#define NSS_BETA PR_FALSE
-
-#ifndef RC_INVOKED
-
-#include "seccomon.h"
-
-typedef struct NSSInitParametersStr NSSInitParameters;
-
-/*
- * parameters used to initialize softoken. Mostly strings used to
- * internationalize softoken. Memory for the strings are owned by the caller,
- * who is free to free them once NSS_ContextInit returns. If the string
- * parameter is NULL (as opposed to empty, zero length), then the softoken
- * default is used. These are equivalent to the parameters for
- * PK11_ConfigurePKCS11().
- *
- * field names match their equivalent parameter names for softoken strings
- * documented at https://developer.mozilla.org/en/PKCS11_Module_Specs.
- *
- * minPWLen
- *     Minimum password length in bytes.
- * manufacturerID
- *     Override the default manufactureID value for the module returned in
- *     the CK_INFO, CK_SLOT_INFO, and CK_TOKEN_INFO structures with an
- *     internationalize string (UTF8). This value will be truncated at 32
- *     bytes (not including the trailing NULL, partial UTF8 characters will be
- *     dropped).
- * libraryDescription
- *     Override the default libraryDescription value for the module returned in
- *     the CK_INFO structure with an internationalize string (UTF8). This value
- *     will be truncated at 32 bytes(not including the trailing NULL, partial
- *     UTF8 characters will be dropped).
- * cryptoTokenDescription
- *     Override the default label value for the internal crypto token returned
- *     in the CK_TOKEN_INFO structure with an internationalize string (UTF8).
- *     This value will be truncated at 32 bytes (not including the trailing
- *     NULL, partial UTF8 characters will be dropped).
- * dbTokenDescription
- *     Override the default label value for the internal DB token returned in
- *     the CK_TOKEN_INFO structure with an internationalize string (UTF8). This
- *     value will be truncated at 32 bytes (not including the trailing NULL,
- *     partial UTF8 characters will be dropped).
- * FIPSTokenDescription
- *     Override the default label value for the internal FIPS token returned in
- *     the CK_TOKEN_INFO structure with an internationalize string (UTF8). This
- *     value will be truncated at 32 bytes (not including the trailing NULL,
- *     partial UTF8 characters will be dropped).
- * cryptoSlotDescription
- *     Override the default slotDescription value for the internal crypto token
- *     returned in the CK_SLOT_INFO structure with an internationalize string
- *     (UTF8). This value will be truncated at 64 bytes (not including the
- *     trailing NULL, partial UTF8 characters will be dropped).
- * dbSlotDescription
- *     Override the default slotDescription value for the internal DB token
- *     returned in the CK_SLOT_INFO structure with an internationalize string
- *     (UTF8). This value will be truncated at 64 bytes (not including the
- *     trailing NULL, partial UTF8 characters will be dropped).
- * FIPSSlotDescription
- *     Override the default slotDecription value for the internal FIPS token
- *     returned in the CK_SLOT_INFO structure with an internationalize string
- *     (UTF8). This value will be truncated at 64 bytes (not including the
- *     trailing NULL, partial UTF8 characters will be dropped).
- *
- */
-struct NSSInitParametersStr {
-    unsigned int length; /* allow this structure to grow in the future,
-                                * must be set */
-    PRBool passwordRequired;
-    int minPWLen;
-    char *manufactureID;      /* variable names for strings match the */
-    char *libraryDescription; /*   parameter name in softoken */
-    char *cryptoTokenDescription;
-    char *dbTokenDescription;
-    char *FIPSTokenDescription;
-    char *cryptoSlotDescription;
-    char *dbSlotDescription;
-    char *FIPSSlotDescription;
-};
-
-SEC_BEGIN_PROTOS
-
-/*
- * Return a boolean that indicates whether the underlying library
- * will perform as the caller expects.
- *
- * The only argument is a string, which should be the version
- * identifier of the NSS library. That string will be compared
- * against a string that represents the actual build version of
- * the NSS library.
- */
-extern PRBool NSS_VersionCheck(const char *importedVersion);
-
-/*
- * Returns a const string of the NSS library version.
- */
-extern const char *NSS_GetVersion(void);
-
-/*
- * Open the Cert, Key, and Security Module databases, read only.
- * Initialize the Random Number Generator.
- * Does not initialize the cipher policies or enables.
- * Default policy settings disallow all ciphers.
- */
-extern SECStatus NSS_Init(const char *configdir);
-
-/*
- * Returns whether NSS has already been initialized or not.
- */
-extern PRBool NSS_IsInitialized(void);
-
-/*
- * Open the Cert, Key, and Security Module databases, read/write.
- * Initialize the Random Number Generator.
- * Does not initialize the cipher policies or enables.
- * Default policy settings disallow all ciphers.
- */
-extern SECStatus NSS_InitReadWrite(const char *configdir);
-
-/*
- * Open the Cert, Key, and Security Module databases, read/write.
- * Initialize the Random Number Generator.
- * Does not initialize the cipher policies or enables.
- * Default policy settings disallow all ciphers.
- *
- * This allows using application defined prefixes for the cert and key db's
- * and an alternate name for the secmod database. NOTE: In future releases,
- * the database prefixes my not necessarily map to database names.
- *
- * configdir - base directory where all the cert, key, and module datbases live.
- * certPrefix - prefix added to the beginning of the cert database example: "
- *                      "https-server1-"
- * keyPrefix - prefix added to the beginning of the key database example: "
- *                      "https-server1-"
- * secmodName - name of the security module database (usually "secmod.db").
- * flags - change the open options of NSS_Initialize as follows:
- *      NSS_INIT_READONLY - Open the databases read only.
- *      NSS_INIT_NOCERTDB - Don't open the cert DB and key DB's, just
- *                      initialize the volatile certdb.
- *      NSS_INIT_NOMODDB  - Don't open the security module DB, just
- *                      initialize the  PKCS #11 module.
- *      NSS_INIT_FORCEOPEN - Continue to force initializations even if the
- *                      databases cannot be opened.
- *      NSS_INIT_NOROOTINIT - Don't try to look for the root certs module
- *                      automatically.
- *      NSS_INIT_OPTIMIZESPACE - Use smaller tables and caches.
- *      NSS_INIT_PK11THREADSAFE - only load PKCS#11 modules that are
- *                      thread-safe, ie. that support locking - either OS
- *                      locking or NSS-provided locks . If a PKCS#11
- *                      module isn't thread-safe, don't serialize its
- *                      calls; just don't load it instead. This is necessary
- *                      if another piece of code is using the same PKCS#11
- *                      modules that NSS is accessing without going through
- *                      NSS, for example the Java SunPKCS11 provider.
- *      NSS_INIT_PK11RELOAD - ignore the CKR_CRYPTOKI_ALREADY_INITIALIZED
- *                      error when loading PKCS#11 modules. This is necessary
- *                      if another piece of code is using the same PKCS#11
- *                      modules that NSS is accessing without going through
- *                      NSS, for example Java SunPKCS11 provider.
- *      NSS_INIT_NOPK11FINALIZE - never call C_Finalize on any
- *                      PKCS#11 module. This may be necessary in order to
- *                      ensure continuous operation and proper shutdown
- *                      sequence if another piece of code is using the same
- *                      PKCS#11 modules that NSS is accessing without going
- *                      through NSS, for example Java SunPKCS11 provider.
- *                      The following limitation applies when this is set :
- *                      SECMOD_WaitForAnyTokenEvent will not use
- *                      C_WaitForSlotEvent, in order to prevent the need for
- *                      C_Finalize. This call will be emulated instead.
- *      NSS_INIT_RESERVED - Currently has no effect, but may be used in the
- *                      future to trigger better cooperation between PKCS#11
- *                      modules used by both NSS and the Java SunPKCS11
- *                      provider. This should occur after a new flag is defined
- *                      for C_Initialize by the PKCS#11 working group.
- *      NSS_INIT_COOPERATE - Sets 4 recommended options for applications that
- *                      use both NSS and the Java SunPKCS11 provider.
- *
- * Also NOTE: This is not the recommended method for initializing NSS.
- * The preferred method is NSS_init().
- */
-#define NSS_INIT_READONLY 0x1
-#define NSS_INIT_NOCERTDB 0x2
-#define NSS_INIT_NOMODDB 0x4
-#define NSS_INIT_FORCEOPEN 0x8
-#define NSS_INIT_NOROOTINIT 0x10
-#define NSS_INIT_OPTIMIZESPACE 0x20
-#define NSS_INIT_PK11THREADSAFE 0x40
-#define NSS_INIT_PK11RELOAD 0x80
-#define NSS_INIT_NOPK11FINALIZE 0x100
-#define NSS_INIT_RESERVED 0x200
-
-#define NSS_INIT_COOPERATE NSS_INIT_PK11THREADSAFE |     \
-                               NSS_INIT_PK11RELOAD |     \
-                               NSS_INIT_NOPK11FINALIZE | \
-                               NSS_INIT_RESERVED
-
-#define SECMOD_DB "secmod.db"
-
-typedef struct NSSInitContextStr NSSInitContext;
-
-extern SECStatus NSS_Initialize(const char *configdir,
-                                const char *certPrefix, const char *keyPrefix,
-                                const char *secmodName, PRUint32 flags);
-
-extern NSSInitContext *NSS_InitContext(const char *configdir,
-                                       const char *certPrefix, const char *keyPrefix,
-                                       const char *secmodName, NSSInitParameters *initParams, PRUint32 flags);
-
-extern SECStatus NSS_ShutdownContext(NSSInitContext *);
-
-/*
- * same as NSS_Init, but checks to see if we need to merge an
- * old database in.
- *   updatedir is the directory where the old database lives.
- *   updCertPrefix is the certPrefix for the old database.
- *   updKeyPrefix is the keyPrefix for the old database.
- *   updateID is a unique identifier chosen by the application for
- *      the specific database.
- *   updatName is the name the user will be prompted for when
- *      asking to authenticate to the old database  */
-extern SECStatus NSS_InitWithMerge(const char *configdir,
-                                   const char *certPrefix, const char *keyPrefix, const char *secmodName,
-                                   const char *updatedir, const char *updCertPrefix,
-                                   const char *updKeyPrefix, const char *updateID,
-                                   const char *updateName, PRUint32 flags);
-/*
- * initialize NSS without a creating cert db's, key db's, or secmod db's.
- */
-SECStatus NSS_NoDB_Init(const char *configdir);
-
-/*
- * Allow applications and libraries to register with NSS so that they are called
- * when NSS shuts down.
- *
- * void *appData application specific data passed in by the application at
- * NSS_RegisterShutdown() time.
- * void *nssData is NULL in this release, but is reserved for future versions of
- * NSS to pass some future status information * back to the shutdown function.
- *
- * If the shutdown function returns SECFailure,
- * Shutdown will still complete, but NSS_Shutdown() will return SECFailure.
- */
-typedef SECStatus (*NSS_ShutdownFunc)(void *appData, void *nssData);
-
-/*
- * Register a shutdown function.
- */
-SECStatus NSS_RegisterShutdown(NSS_ShutdownFunc sFunc, void *appData);
-
-/*
- * Remove an existing shutdown function (you may do this if your library is
- * complete and going away, but NSS is still running).
- */
-SECStatus NSS_UnregisterShutdown(NSS_ShutdownFunc sFunc, void *appData);
-
-/* Available options for NSS_OptionSet() and NSS_OptionGet().
- */
-#define NSS_RSA_MIN_KEY_SIZE 0x001
-#define NSS_DH_MIN_KEY_SIZE 0x002
-#define NSS_DSA_MIN_KEY_SIZE 0x004
-#define NSS_TLS_VERSION_MIN_POLICY 0x008
-#define NSS_TLS_VERSION_MAX_POLICY 0x009
-#define NSS_DTLS_VERSION_MIN_POLICY 0x00a
-#define NSS_DTLS_VERSION_MAX_POLICY 0x00b
-
-/*
- * Set and get global options for the NSS library.
- */
-SECStatus NSS_OptionSet(PRInt32 which, PRInt32 value);
-SECStatus NSS_OptionGet(PRInt32 which, PRInt32 *value);
-
-/*
- * Close the Cert, Key databases.
- */
-extern SECStatus NSS_Shutdown(void);
-
-/*
- * set the PKCS #11 strings for the internal token.
- */
-void PK11_ConfigurePKCS11(const char *man, const char *libdesc,
-                          const char *tokdesc, const char *ptokdesc, const char *slotdesc,
-                          const char *pslotdesc, const char *fslotdesc, const char *fpslotdesc,
-                          int minPwd, int pwRequired);
-
-/*
- * Dump the contents of the certificate cache and the temporary cert store.
- * Use to detect leaked references of certs at shutdown time.
- */
-void nss_DumpCertificateCacheInfo(void);
-
-SEC_END_PROTOS
-
-#endif /* RC_INVOKED */
-#endif /* __nss_h_ */
diff --git a/openflow/usr/include/nss/nssb64.h b/openflow/usr/include/nss/nssb64.h
deleted file mode 100644
index 7882c3b..0000000
--- a/openflow/usr/include/nss/nssb64.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Public prototypes for base64 encoding/decoding.
- */
-#ifndef _NSSB64_H_
-#define _NSSB64_H_
-
-#include "utilrename.h"
-#include "seccomon.h"
-#include "nssb64t.h"
-
-SEC_BEGIN_PROTOS
-
-/*
- * Functions to start a base64 decoding/encoding context.
- */
-
-extern NSSBase64Decoder *
-NSSBase64Decoder_Create(PRInt32 (*output_fn)(void *, const unsigned char *,
-                                             PRInt32),
-                        void *output_arg);
-
-extern NSSBase64Encoder *
-NSSBase64Encoder_Create(PRInt32 (*output_fn)(void *, const char *, PRInt32),
-                        void *output_arg);
-
-/*
- * Push data through the decoder/encoder, causing the output_fn (provided
- * to Create) to be called with the decoded/encoded data.
- */
-
-extern SECStatus
-NSSBase64Decoder_Update(NSSBase64Decoder *data, const char *buffer,
-                        PRUint32 size);
-
-extern SECStatus
-NSSBase64Encoder_Update(NSSBase64Encoder *data, const unsigned char *buffer,
-                        PRUint32 size);
-
-/*
- * When you're done processing, call this to close the context.
- * If "abort_p" is false, then calling this may cause the output_fn
- * to be called one last time (as the last buffered data is flushed out).
- */
-
-extern SECStatus
-NSSBase64Decoder_Destroy(NSSBase64Decoder *data, PRBool abort_p);
-
-extern SECStatus
-NSSBase64Encoder_Destroy(NSSBase64Encoder *data, PRBool abort_p);
-
-/*
- * Perform base64 decoding from an ascii string "inStr" to an Item.
- * The length of the input must be provided as "inLen".  The Item
- * may be provided (as "outItemOpt"); you can also pass in a NULL
- * and the Item will be allocated for you.
- *
- * In any case, the data within the Item will be allocated for you.
- * All allocation will happen out of the passed-in "arenaOpt", if non-NULL.
- * If "arenaOpt" is NULL, standard allocation (heap) will be used and
- * you will want to free the result via SECITEM_FreeItem.
- *
- * Return value is NULL on error, the Item (allocated or provided) otherwise.
- */
-extern SECItem *
-NSSBase64_DecodeBuffer(PLArenaPool *arenaOpt, SECItem *outItemOpt,
-                       const char *inStr, unsigned int inLen);
-
-/*
- * Perform base64 encoding of binary data "inItem" to an ascii string.
- * The output buffer may be provided (as "outStrOpt"); you can also pass
- * in a NULL and the buffer will be allocated for you.  The result will
- * be null-terminated, and if the buffer is provided, "maxOutLen" must
- * specify the maximum length of the buffer and will be checked to
- * supply sufficient space space for the encoded result.  (If "outStrOpt"
- * is NULL, "maxOutLen" is ignored.)
- *
- * If "outStrOpt" is NULL, allocation will happen out of the passed-in
- * "arenaOpt", if *it* is non-NULL, otherwise standard allocation (heap)
- * will be used.
- *
- * Return value is NULL on error, the output buffer (allocated or provided)
- * otherwise.
- */
-extern char *
-NSSBase64_EncodeItem(PLArenaPool *arenaOpt, char *outStrOpt,
-                     unsigned int maxOutLen, SECItem *inItem);
-
-SEC_END_PROTOS
-
-#endif /* _NSSB64_H_ */
diff --git a/openflow/usr/include/nss/nssb64t.h b/openflow/usr/include/nss/nssb64t.h
deleted file mode 100644
index 75e7877..0000000
--- a/openflow/usr/include/nss/nssb64t.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Public data structures for base64 encoding/decoding.
- */
-#ifndef _NSSB64T_H_
-#define _NSSB64T_H_
-
-#include "utilrename.h"
-typedef struct NSSBase64DecoderStr NSSBase64Decoder;
-typedef struct NSSBase64EncoderStr NSSBase64Encoder;
-
-#endif /* _NSSB64T_H_ */
diff --git a/openflow/usr/include/nss/nssbase.h b/openflow/usr/include/nss/nssbase.h
deleted file mode 100644
index 02e285f..0000000
--- a/openflow/usr/include/nss/nssbase.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef NSSBASE_H
-#define NSSBASE_H
-
-/*
- * nssbase.h
- *
- * This header file contains the prototypes of the basic public
- * NSS routines.
- */
-
-#ifndef NSSBASET_H
-#include "nssbaset.h"
-#endif /* NSSBASET_H */
-
-PR_BEGIN_EXTERN_C
-
-/*
- * NSSArena
- *
- * The public methods relating to this type are:
- *
- *  NSSArena_Create  -- constructor
- *  NSSArena_Destroy
- *  NSS_ZAlloc
- *  NSS_ZRealloc
- *  NSS_ZFreeIf
- */
-
-/*
- * NSSArena_Create
- *
- * This routine creates a new memory arena.  This routine may return
- * NULL upon error, in which case it will have created an error stack.
- *
- * The top-level error may be one of the following values:
- *  NSS_ERROR_NO_MEMORY
- *
- * Return value:
- *  NULL upon error
- *  A pointer to an NSSArena upon success
- */
-
-NSS_EXTERN NSSArena *NSSArena_Create(void);
-
-extern const NSSError NSS_ERROR_NO_MEMORY;
-
-/*
- * NSSArena_Destroy
- *
- * This routine will destroy the specified arena, freeing all memory
- * allocated from it.  This routine returns a PRStatus value; if
- * successful, it will return PR_SUCCESS.  If unsuccessful, it will
- * create an error stack and return PR_FAILURE.
- *
- * The top-level error may be one of the following values:
- *  NSS_ERROR_INVALID_ARENA
- *
- * Return value:
- *  PR_SUCCESS upon success
- *  PR_FAILURE upon failure
- */
-
-NSS_EXTERN PRStatus NSSArena_Destroy(NSSArena *arena);
-
-extern const NSSError NSS_ERROR_INVALID_ARENA;
-
-/*
- * The error stack
- *
- * The public methods relating to the error stack are:
- *
- *  NSS_GetError
- *  NSS_GetErrorStack
- */
-
-/*
- * NSS_GetError
- *
- * This routine returns the highest-level (most general) error set
- * by the most recent NSS library routine called by the same thread
- * calling this routine.
- *
- * This routine cannot fail.  It may return NSS_ERROR_NO_ERROR, which
- * indicates that the previous NSS library call did not set an error.
- *
- * Return value:
- *  0 if no error has been set
- *  A nonzero error number
- */
-
-NSS_EXTERN NSSError NSS_GetError(void);
-
-extern const NSSError NSS_ERROR_NO_ERROR;
-
-/*
- * NSS_GetErrorStack
- *
- * This routine returns a pointer to an array of NSSError values,
- * containingthe entire sequence or "stack" of errors set by the most
- * recent NSS library routine called by the same thread calling this
- * routine.  NOTE: the caller DOES NOT OWN the memory pointed to by
- * the return value.  The pointer will remain valid until the calling
- * thread calls another NSS routine.  The lowest-level (most specific)
- * error is first in the array, and the highest-level is last.  The
- * array is zero-terminated.  This routine may return NULL upon error;
- * this indicates a low-memory situation.
- *
- * Return value:
- *  NULL upon error, which is an implied NSS_ERROR_NO_MEMORY
- *  A NON-caller-owned pointer to an array of NSSError values
- */
-
-NSS_EXTERN NSSError *NSS_GetErrorStack(void);
-
-/*
- * NSS_ZNEW
- *
- * This preprocessor macro will allocate memory for a new object
- * of the specified type with nss_ZAlloc, and will cast the
- * return value appropriately.  If the optional arena argument is
- * non-null, the memory will be obtained from that arena; otherwise,
- * the memory will be obtained from the heap.  This routine may
- * return NULL upon error, in which case it will have set an error
- * upon the error stack.
- *
- * The error may be one of the following values:
- *  NSS_ERROR_INVALID_ARENA
- *  NSS_ERROR_NO_MEMORY
- *
- * Return value:
- *  NULL upon error
- *  A pointer to the new segment of zeroed memory
- */
-
-#define NSS_ZNEW(arenaOpt, type) ((type *)NSS_ZAlloc((arenaOpt), sizeof(type)))
-
-/*
- * NSS_ZNEWARRAY
- *
- * This preprocessor macro will allocate memory for an array of
- * new objects, and will cast the return value appropriately.
- * If the optional arena argument is non-null, the memory will
- * be obtained from that arena; otherwise, the memory will be
- * obtained from the heap.  This routine may return NULL upon
- * error, in which case it will have set an error upon the error
- * stack.  The array size may be specified as zero.
- *
- * The error may be one of the following values:
- *  NSS_ERROR_INVALID_ARENA
- *  NSS_ERROR_NO_MEMORY
- *
- * Return value:
- *  NULL upon error
- *  A pointer to the new segment of zeroed memory
- */
-
-#define NSS_ZNEWARRAY(arenaOpt, type, quantity) \
-    ((type *)NSS_ZAlloc((arenaOpt), sizeof(type) * (quantity)))
-
-/*
- * NSS_ZAlloc
- *
- * This routine allocates and zeroes a section of memory of the
- * size, and returns to the caller a pointer to that memory.  If
- * the optional arena argument is non-null, the memory will be
- * obtained from that arena; otherwise, the memory will be obtained
- * from the heap.  This routine may return NULL upon error, in
- * which case it will have set an error upon the error stack.  The
- * value specified for size may be zero; in which case a valid
- * zero-length block of memory will be allocated.  This block may
- * be expanded by calling NSS_ZRealloc.
- *
- * The error may be one of the following values:
- *  NSS_ERROR_INVALID_ARENA
- *  NSS_ERROR_NO_MEMORY
- *  NSS_ERROR_ARENA_MARKED_BY_ANOTHER_THREAD
- *
- * Return value:
- *  NULL upon error
- *  A pointer to the new segment of zeroed memory
- */
-
-NSS_EXTERN void *NSS_ZAlloc(NSSArena *arenaOpt, PRUint32 size);
-
-/*
- * NSS_ZRealloc
- *
- * This routine reallocates a block of memory obtained by calling
- * nss_ZAlloc or nss_ZRealloc.  The portion of memory
- * between the new and old sizes -- which is either being newly
- * obtained or released -- is in either case zeroed.  This routine
- * may return NULL upon failure, in which case it will have placed
- * an error on the error stack.
- *
- * The error may be one of the following values:
- *  NSS_ERROR_INVALID_POINTER
- *  NSS_ERROR_NO_MEMORY
- *  NSS_ERROR_ARENA_MARKED_BY_ANOTHER_THREAD
- *
- * Return value:
- *  NULL upon error
- *  A pointer to the replacement segment of memory
- */
-
-NSS_EXTERN void *NSS_ZRealloc(void *pointer, PRUint32 newSize);
-
-/*
- * NSS_ZFreeIf
- *
- * If the specified pointer is non-null, then the region of memory
- * to which it points -- which must have been allocated with
- * nss_ZAlloc -- will be zeroed and released.  This routine
- * returns a PRStatus value; if successful, it will return PR_SUCCESS.
- * If unsuccessful, it will set an error on the error stack and return
- * PR_FAILURE.
- *
- * The error may be one of the following values:
- *  NSS_ERROR_INVALID_POINTER
- *
- * Return value:
- *  PR_SUCCESS
- *  PR_FAILURE
- */
-
-NSS_EXTERN PRStatus NSS_ZFreeIf(void *pointer);
-
-PR_END_EXTERN_C
-
-#endif /* NSSBASE_H */
diff --git a/openflow/usr/include/nss/nssbaset.h b/openflow/usr/include/nss/nssbaset.h
deleted file mode 100644
index 8bc556e..0000000
--- a/openflow/usr/include/nss/nssbaset.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef NSSBASET_H
-#define NSSBASET_H
-
-/*
- * nssbaset.h
- *
- * This file contains the most low-level, fundamental public types.
- */
-
-#include "nspr.h"
-#include "nssilock.h"
-
-/*
- * NSS_EXTERN, NSS_IMPLEMENT, NSS_EXTERN_DATA, NSS_IMPLEMENT_DATA
- *
- * NSS has its own versions of these NSPR macros, in a form which
- * does not confuse ctags and other related utilities.  NSPR
- * defines these macros to take the type as an argument, because
- * of certain OS requirements on platforms not supported by NSS.
- */
-
-#define DUMMY /* dummy */
-#define NSS_EXTERN extern
-#define NSS_EXTERN_DATA extern
-#define NSS_IMPLEMENT
-#define NSS_IMPLEMENT_DATA
-
-PR_BEGIN_EXTERN_C
-
-/*
- * NSSError
- *
- * Calls to NSS routines may result in one or more errors being placed
- * on the calling thread's "error stack."  Every possible error that
- * may be returned from a function is declared where the function is
- * prototyped.  All errors are of the following type.
- */
-
-typedef PRInt32 NSSError;
-
-/*
- * NSSArena
- *
- * Arenas are logical sets of heap memory, from which memory may be
- * allocated.  When an arena is destroyed, all memory allocated within
- * that arena is implicitly freed.  These arenas are thread-safe:
- * an arena pointer may be used by multiple threads simultaneously.
- * However, as they are not backed by shared memory, they may only be
- * used within one process.
- */
-
-struct NSSArenaStr;
-typedef struct NSSArenaStr NSSArena;
-
-/*
- * NSSItem
- *
- * This is the basic type used to refer to an unconstrained datum of
- * arbitrary size.
- */
-
-struct NSSItemStr {
-    void *data;
-    PRUint32 size;
-};
-typedef struct NSSItemStr NSSItem;
-
-/*
- * NSSBER
- *
- * Data packed according to the Basic Encoding Rules of ASN.1.
- */
-
-typedef NSSItem NSSBER;
-
-/*
- * NSSDER
- *
- * Data packed according to the Distinguished Encoding Rules of ASN.1;
- * this form is also known as the Canonical Encoding Rules form (CER).
- */
-
-typedef NSSBER NSSDER;
-
-/*
- * NSSBitString
- *
- * Some ASN.1 types use "bit strings," which are passed around as
- * octet strings but whose length is counted in bits.  We use this
- * typedef of NSSItem to point out the occasions when the length
- * is counted in bits, not octets.
- */
-
-typedef NSSItem NSSBitString;
-
-/*
- * NSSUTF8
- *
- * Character strings encoded in UTF-8, as defined by RFC 2279.
- */
-
-typedef char NSSUTF8;
-
-/*
- * NSSASCII7
- *
- * Character strings guaranteed to be 7-bit ASCII.
- */
-
-typedef char NSSASCII7;
-
-PR_END_EXTERN_C
-
-#endif /* NSSBASET_H */
diff --git a/openflow/usr/include/nss/nssck.api b/openflow/usr/include/nss/nssck.api
deleted file mode 100644
index 55b4351..0000000
--- a/openflow/usr/include/nss/nssck.api
+++ /dev/null
@@ -1,1854 +0,0 @@
-/* THIS IS A GENERATED FILE */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * nssck.api
- *
- * This automatically-generated file is used to generate a set of
- * Cryptoki entry points within the object space of a Module using
- * the NSS Cryptoki Framework.
- *
- * The Module should have a .c file with the following:
- *
- *  #define MODULE_NAME name
- *  #define INSTANCE_NAME instance
- *  #include "nssck.api"
- *
- * where "name" is some module-specific name that can be used to
- * disambiguate various modules.  This included file will then
- * define the actual Cryptoki routines which pass through to the
- * Framework calls.  All routines, except C_GetFunctionList, will
- * be prefixed with the name; C_GetFunctionList will be generated
- * to return an entry-point vector with these routines.  The
- * instance specified should be the basic instance of NSSCKMDInstance.
- *
- * If, prior to including nssck.api, the .c file also specifies
- *
- *  #define DECLARE_STRICT_CRYTPOKI_NAMES
- *
- * Then a set of "stub" routines not prefixed with the name will
- * be included.  This would allow the combined module and framework
- * to be used in applications which are hard-coded to use the
- * PKCS#11 names (instead of going through the EPV).  Please note
- * that such applications should be careful resolving symbols when
- * more than one PKCS#11 module is loaded.
- */
-
-#ifndef MODULE_NAME
-#error "Error: MODULE_NAME must be defined."
-#endif /* MODULE_NAME */
-
-#ifndef INSTANCE_NAME
-#error "Error: INSTANCE_NAME must be defined."
-#endif /* INSTANCE_NAME */
-
-#ifndef NSSCKT_H
-#include "nssckt.h"
-#endif /* NSSCKT_H */
-
-#ifndef NSSCKFWT_H
-#include "nssckfwt.h"
-#endif /* NSSCKFWT_H */
-
-#ifndef NSSCKFWC_H
-#include "nssckfwc.h"
-#endif /* NSSCKFWC_H */
-
-#ifndef NSSCKEPV_H
-#include "nssckepv.h"
-#endif /* NSSCKEPV_H */
-
-#define ADJOIN(x,y) x##y
-
-#define __ADJOIN(x,y) ADJOIN(x,y)
-
-/*
- * The anchor.  This object is used to store an "anchor" pointer in
- * the Module's object space, so the wrapper functions can relate
- * back to this instance.
- */
-
-static NSSCKFWInstance *fwInstance = (NSSCKFWInstance *)0;
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_Initialize)
-(
-  CK_VOID_PTR pInitArgs
-)
-{
-  return NSSCKFWC_Initialize(&fwInstance, INSTANCE_NAME, pInitArgs);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY 
-C_Initialize
-(
-  CK_VOID_PTR pInitArgs
-)
-{
-  return __ADJOIN(MODULE_NAME,C_Initialize)(pInitArgs);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_Finalize)
-(
-  CK_VOID_PTR pReserved
-)
-{
-  return NSSCKFWC_Finalize(&fwInstance);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_Finalize
-(
-  CK_VOID_PTR pReserved
-)
-{
-  return __ADJOIN(MODULE_NAME,C_Finalize)(pReserved);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetInfo)
-(
-  CK_INFO_PTR pInfo
-)
-{
-  return NSSCKFWC_GetInfo(fwInstance, pInfo);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetInfo
-(
-  CK_INFO_PTR pInfo
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetInfo)(pInfo);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-/*
- * C_GetFunctionList is defined at the end.
- */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetSlotList)
-(
-  CK_BBOOL tokenPresent,
-  CK_SLOT_ID_PTR pSlotList,
-  CK_ULONG_PTR pulCount
-)
-{
-  return NSSCKFWC_GetSlotList(fwInstance, tokenPresent, pSlotList, pulCount);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetSlotList
-(
-  CK_BBOOL tokenPresent,
-  CK_SLOT_ID_PTR pSlotList,
-  CK_ULONG_PTR pulCount
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetSlotList)(tokenPresent, pSlotList, pulCount);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetSlotInfo)
-(
-  CK_SLOT_ID slotID,
-  CK_SLOT_INFO_PTR pInfo
-)
-{
-  return NSSCKFWC_GetSlotInfo(fwInstance, slotID, pInfo);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetSlotInfo
-(
-  CK_SLOT_ID slotID,
-  CK_SLOT_INFO_PTR pInfo
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetSlotInfo)(slotID, pInfo);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetTokenInfo)
-(
-  CK_SLOT_ID slotID,
-  CK_TOKEN_INFO_PTR pInfo
-)
-{
-  return NSSCKFWC_GetTokenInfo(fwInstance, slotID, pInfo);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetTokenInfo
-(
-  CK_SLOT_ID slotID,
-  CK_TOKEN_INFO_PTR pInfo
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetTokenInfo)(slotID, pInfo);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetMechanismList)
-(
-  CK_SLOT_ID slotID,
-  CK_MECHANISM_TYPE_PTR pMechanismList,
-  CK_ULONG_PTR pulCount
-)
-{
-  return NSSCKFWC_GetMechanismList(fwInstance, slotID, pMechanismList, pulCount);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetMechanismList
-(
-  CK_SLOT_ID slotID,
-  CK_MECHANISM_TYPE_PTR pMechanismList,
-  CK_ULONG_PTR pulCount
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetMechanismList)(slotID, pMechanismList, pulCount);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetMechanismInfo)
-(
-  CK_SLOT_ID slotID,
-  CK_MECHANISM_TYPE type,
-  CK_MECHANISM_INFO_PTR pInfo
-)
-{
-  return NSSCKFWC_GetMechanismInfo(fwInstance, slotID, type, pInfo);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetMechanismInfo
-(
-  CK_SLOT_ID slotID,
-  CK_MECHANISM_TYPE type,
-  CK_MECHANISM_INFO_PTR pInfo
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetMechanismInfo)(slotID, type, pInfo);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_InitToken)
-(
-  CK_SLOT_ID slotID,
-  CK_CHAR_PTR pPin,
-  CK_ULONG ulPinLen,
-  CK_CHAR_PTR pLabel
-)
-{
-  return NSSCKFWC_InitToken(fwInstance, slotID, pPin, ulPinLen, pLabel);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_InitToken
-(
-  CK_SLOT_ID slotID,
-  CK_CHAR_PTR pPin,
-  CK_ULONG ulPinLen,
-  CK_CHAR_PTR pLabel
-)
-{
-  return __ADJOIN(MODULE_NAME,C_InitToken)(slotID, pPin, ulPinLen, pLabel);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_InitPIN)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_CHAR_PTR pPin,
-  CK_ULONG ulPinLen
-)
-{
-  return NSSCKFWC_InitPIN(fwInstance, hSession, pPin, ulPinLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_InitPIN
-(
-  CK_SESSION_HANDLE hSession,
-  CK_CHAR_PTR pPin,
-  CK_ULONG ulPinLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_InitPIN)(hSession, pPin, ulPinLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_SetPIN)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_CHAR_PTR pOldPin,
-  CK_ULONG ulOldLen,
-  CK_CHAR_PTR pNewPin,
-  CK_ULONG ulNewLen
-)
-{
-  return NSSCKFWC_SetPIN(fwInstance, hSession, pOldPin, ulOldLen, pNewPin, ulNewLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_SetPIN
-(
-  CK_SESSION_HANDLE hSession,
-  CK_CHAR_PTR pOldPin,
-  CK_ULONG ulOldLen,
-  CK_CHAR_PTR pNewPin,
-  CK_ULONG ulNewLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_SetPIN)(hSession, pOldPin, ulOldLen, pNewPin, ulNewLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_OpenSession)
-(
-  CK_SLOT_ID slotID,
-  CK_FLAGS flags,
-  CK_VOID_PTR pApplication,
-  CK_NOTIFY Notify,
-  CK_SESSION_HANDLE_PTR phSession
-)
-{
-  return NSSCKFWC_OpenSession(fwInstance, slotID, flags, pApplication, Notify, phSession);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_OpenSession
-(
-  CK_SLOT_ID slotID,
-  CK_FLAGS flags,
-  CK_VOID_PTR pApplication,
-  CK_NOTIFY Notify,
-  CK_SESSION_HANDLE_PTR phSession
-)
-{
-  return __ADJOIN(MODULE_NAME,C_OpenSession)(slotID, flags, pApplication, Notify, phSession);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_CloseSession)
-(
-  CK_SESSION_HANDLE hSession
-)
-{
-  return NSSCKFWC_CloseSession(fwInstance, hSession);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_CloseSession
-(
-  CK_SESSION_HANDLE hSession
-)
-{
-  return __ADJOIN(MODULE_NAME,C_CloseSession)(hSession);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_CloseAllSessions)
-(
-  CK_SLOT_ID slotID
-)
-{
-  return NSSCKFWC_CloseAllSessions(fwInstance, slotID);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_CloseAllSessions
-(
-  CK_SLOT_ID slotID
-)
-{
-  return __ADJOIN(MODULE_NAME,C_CloseAllSessions)(slotID);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetSessionInfo)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_SESSION_INFO_PTR pInfo
-)
-{
-  return NSSCKFWC_GetSessionInfo(fwInstance, hSession, pInfo);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetSessionInfo
-(
-  CK_SESSION_HANDLE hSession,
-  CK_SESSION_INFO_PTR pInfo
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetSessionInfo)(hSession, pInfo);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetOperationState)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pOperationState,
-  CK_ULONG_PTR pulOperationStateLen
-)
-{
-  return NSSCKFWC_GetOperationState(fwInstance, hSession, pOperationState, pulOperationStateLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetOperationState
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pOperationState,
-  CK_ULONG_PTR pulOperationStateLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetOperationState)(hSession, pOperationState, pulOperationStateLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_SetOperationState)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pOperationState,
-  CK_ULONG ulOperationStateLen,
-  CK_OBJECT_HANDLE hEncryptionKey,
-  CK_OBJECT_HANDLE hAuthenticationKey
-)
-{
-  return NSSCKFWC_SetOperationState(fwInstance, hSession, pOperationState, ulOperationStateLen, hEncryptionKey, hAuthenticationKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_SetOperationState
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pOperationState,
-  CK_ULONG ulOperationStateLen,
-  CK_OBJECT_HANDLE hEncryptionKey,
-  CK_OBJECT_HANDLE hAuthenticationKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_SetOperationState)(hSession, pOperationState, ulOperationStateLen, hEncryptionKey, hAuthenticationKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_Login)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_USER_TYPE userType,
-  CK_CHAR_PTR pPin,
-  CK_ULONG ulPinLen
-)
-{
-  return NSSCKFWC_Login(fwInstance, hSession, userType, pPin, ulPinLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_Login
-(
-  CK_SESSION_HANDLE hSession,
-  CK_USER_TYPE userType,
-  CK_CHAR_PTR pPin,
-  CK_ULONG ulPinLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_Login)(hSession, userType, pPin, ulPinLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_Logout)
-(
-  CK_SESSION_HANDLE hSession
-)
-{
-  return NSSCKFWC_Logout(fwInstance, hSession);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_Logout
-(
-  CK_SESSION_HANDLE hSession
-)
-{
-  return __ADJOIN(MODULE_NAME,C_Logout)(hSession);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_CreateObject)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount,
-  CK_OBJECT_HANDLE_PTR phObject
-)
-{
-  return NSSCKFWC_CreateObject(fwInstance, hSession, pTemplate, ulCount, phObject);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_CreateObject
-(
-  CK_SESSION_HANDLE hSession,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount,
-  CK_OBJECT_HANDLE_PTR phObject
-)
-{
-  return __ADJOIN(MODULE_NAME,C_CreateObject)(hSession, pTemplate, ulCount, phObject);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_CopyObject)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hObject,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount,
-  CK_OBJECT_HANDLE_PTR phNewObject
-)
-{
-  return NSSCKFWC_CopyObject(fwInstance, hSession, hObject, pTemplate, ulCount, phNewObject);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_CopyObject
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hObject,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount,
-  CK_OBJECT_HANDLE_PTR phNewObject
-)
-{
-  return __ADJOIN(MODULE_NAME,C_CopyObject)(hSession, hObject, pTemplate, ulCount, phNewObject);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DestroyObject)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hObject
-)
-{
-  return NSSCKFWC_DestroyObject(fwInstance, hSession, hObject);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DestroyObject
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hObject
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DestroyObject)(hSession, hObject);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetObjectSize)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hObject,
-  CK_ULONG_PTR pulSize
-)
-{
-  return NSSCKFWC_GetObjectSize(fwInstance, hSession, hObject, pulSize);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetObjectSize
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hObject,
-  CK_ULONG_PTR pulSize
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetObjectSize)(hSession, hObject, pulSize);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetAttributeValue)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hObject,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount
-)
-{
-  return NSSCKFWC_GetAttributeValue(fwInstance, hSession, hObject, pTemplate, ulCount);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetAttributeValue
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hObject,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetAttributeValue)(hSession, hObject, pTemplate, ulCount);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_SetAttributeValue)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hObject,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount
-)
-{
-  return NSSCKFWC_SetAttributeValue(fwInstance, hSession, hObject, pTemplate, ulCount);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_SetAttributeValue
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hObject,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount
-)
-{
-  return __ADJOIN(MODULE_NAME,C_SetAttributeValue)(hSession, hObject, pTemplate, ulCount);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_FindObjectsInit)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount
-)
-{
-  return NSSCKFWC_FindObjectsInit(fwInstance, hSession, pTemplate, ulCount);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_FindObjectsInit
-(
-  CK_SESSION_HANDLE hSession,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount
-)
-{
-  return __ADJOIN(MODULE_NAME,C_FindObjectsInit)(hSession, pTemplate, ulCount);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_FindObjects)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE_PTR phObject,
-  CK_ULONG ulMaxObjectCount,
-  CK_ULONG_PTR pulObjectCount
-)
-{
-  return NSSCKFWC_FindObjects(fwInstance, hSession, phObject, ulMaxObjectCount, pulObjectCount);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_FindObjects
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE_PTR phObject,
-  CK_ULONG ulMaxObjectCount,
-  CK_ULONG_PTR pulObjectCount
-)
-{
-  return __ADJOIN(MODULE_NAME,C_FindObjects)(hSession, phObject, ulMaxObjectCount, pulObjectCount);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_FindObjectsFinal)
-(
-  CK_SESSION_HANDLE hSession
-)
-{
-  return NSSCKFWC_FindObjectsFinal(fwInstance, hSession);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_FindObjectsFinal
-(
-  CK_SESSION_HANDLE hSession
-)
-{
-  return __ADJOIN(MODULE_NAME,C_FindObjectsFinal)(hSession);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_EncryptInit)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return NSSCKFWC_EncryptInit(fwInstance, hSession, pMechanism, hKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_EncryptInit
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_EncryptInit)(hSession, pMechanism, hKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_Encrypt)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pData,
-  CK_ULONG ulDataLen,
-  CK_BYTE_PTR pEncryptedData,
-  CK_ULONG_PTR pulEncryptedDataLen
-)
-{
-  return NSSCKFWC_Encrypt(fwInstance, hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_Encrypt
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pData,
-  CK_ULONG ulDataLen,
-  CK_BYTE_PTR pEncryptedData,
-  CK_ULONG_PTR pulEncryptedDataLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_Encrypt)(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_EncryptUpdate)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG_PTR pulEncryptedPartLen
-)
-{
-  return NSSCKFWC_EncryptUpdate(fwInstance, hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_EncryptUpdate
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG_PTR pulEncryptedPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_EncryptUpdate)(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_EncryptFinal)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pLastEncryptedPart,
-  CK_ULONG_PTR pulLastEncryptedPartLen
-)
-{
-  return NSSCKFWC_EncryptFinal(fwInstance, hSession, pLastEncryptedPart, pulLastEncryptedPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_EncryptFinal
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pLastEncryptedPart,
-  CK_ULONG_PTR pulLastEncryptedPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_EncryptFinal)(hSession, pLastEncryptedPart, pulLastEncryptedPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DecryptInit)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return NSSCKFWC_DecryptInit(fwInstance, hSession, pMechanism, hKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DecryptInit
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DecryptInit)(hSession, pMechanism, hKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_Decrypt)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pEncryptedData,
-  CK_ULONG ulEncryptedDataLen,
-  CK_BYTE_PTR pData,
-  CK_ULONG_PTR pulDataLen
-)
-{
-  return NSSCKFWC_Decrypt(fwInstance, hSession, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_Decrypt
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pEncryptedData,
-  CK_ULONG ulEncryptedDataLen,
-  CK_BYTE_PTR pData,
-  CK_ULONG_PTR pulDataLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_Decrypt)(hSession, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DecryptUpdate)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG ulEncryptedPartLen,
-  CK_BYTE_PTR pPart,
-  CK_ULONG_PTR pulPartLen
-)
-{
-  return NSSCKFWC_DecryptUpdate(fwInstance, hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DecryptUpdate
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG ulEncryptedPartLen,
-  CK_BYTE_PTR pPart,
-  CK_ULONG_PTR pulPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DecryptUpdate)(hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DecryptFinal)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pLastPart,
-  CK_ULONG_PTR pulLastPartLen
-)
-{
-  return NSSCKFWC_DecryptFinal(fwInstance, hSession, pLastPart, pulLastPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DecryptFinal
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pLastPart,
-  CK_ULONG_PTR pulLastPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DecryptFinal)(hSession, pLastPart, pulLastPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DigestInit)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism
-)
-{
-  return NSSCKFWC_DigestInit(fwInstance, hSession, pMechanism);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DigestInit
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DigestInit)(hSession, pMechanism);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_Digest)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pData,
-  CK_ULONG ulDataLen,
-  CK_BYTE_PTR pDigest,
-  CK_ULONG_PTR pulDigestLen
-)
-{
-  return NSSCKFWC_Digest(fwInstance, hSession, pData, ulDataLen, pDigest, pulDigestLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_Digest
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pData,
-  CK_ULONG ulDataLen,
-  CK_BYTE_PTR pDigest,
-  CK_ULONG_PTR pulDigestLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_Digest)(hSession, pData, ulDataLen, pDigest, pulDigestLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DigestUpdate)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen
-)
-{
-  return NSSCKFWC_DigestUpdate(fwInstance, hSession, pPart, ulPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DigestUpdate
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DigestUpdate)(hSession, pPart, ulPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DigestKey)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return NSSCKFWC_DigestKey(fwInstance, hSession, hKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DigestKey
-(
-  CK_SESSION_HANDLE hSession,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DigestKey)(hSession, hKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DigestFinal)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pDigest,
-  CK_ULONG_PTR pulDigestLen
-)
-{
-  return NSSCKFWC_DigestFinal(fwInstance, hSession, pDigest, pulDigestLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DigestFinal
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pDigest,
-  CK_ULONG_PTR pulDigestLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DigestFinal)(hSession, pDigest, pulDigestLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_SignInit)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return NSSCKFWC_SignInit(fwInstance, hSession, pMechanism, hKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_SignInit
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_SignInit)(hSession, pMechanism, hKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_Sign)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pData,
-  CK_ULONG ulDataLen,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG_PTR pulSignatureLen
-)
-{
-  return NSSCKFWC_Sign(fwInstance, hSession, pData, ulDataLen, pSignature, pulSignatureLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_Sign
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pData,
-  CK_ULONG ulDataLen,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG_PTR pulSignatureLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_Sign)(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_SignUpdate)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen
-)
-{
-  return NSSCKFWC_SignUpdate(fwInstance, hSession, pPart, ulPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_SignUpdate
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_SignUpdate)(hSession, pPart, ulPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_SignFinal)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG_PTR pulSignatureLen
-)
-{
-  return NSSCKFWC_SignFinal(fwInstance, hSession, pSignature, pulSignatureLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_SignFinal
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG_PTR pulSignatureLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_SignFinal)(hSession, pSignature, pulSignatureLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_SignRecoverInit)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return NSSCKFWC_SignRecoverInit(fwInstance, hSession, pMechanism, hKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_SignRecoverInit
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_SignRecoverInit)(hSession, pMechanism, hKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_SignRecover)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pData,
-  CK_ULONG ulDataLen,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG_PTR pulSignatureLen
-)
-{
-  return NSSCKFWC_SignRecover(fwInstance, hSession, pData, ulDataLen, pSignature, pulSignatureLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_SignRecover
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pData,
-  CK_ULONG ulDataLen,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG_PTR pulSignatureLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_SignRecover)(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_VerifyInit)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return NSSCKFWC_VerifyInit(fwInstance, hSession, pMechanism, hKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_VerifyInit
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_VerifyInit)(hSession, pMechanism, hKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_Verify)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pData,
-  CK_ULONG ulDataLen,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG ulSignatureLen
-)
-{
-  return NSSCKFWC_Verify(fwInstance, hSession, pData, ulDataLen, pSignature, ulSignatureLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_Verify
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pData,
-  CK_ULONG ulDataLen,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG ulSignatureLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_Verify)(hSession, pData, ulDataLen, pSignature, ulSignatureLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_VerifyUpdate)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen
-)
-{
-  return NSSCKFWC_VerifyUpdate(fwInstance, hSession, pPart, ulPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_VerifyUpdate
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_VerifyUpdate)(hSession, pPart, ulPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_VerifyFinal)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG ulSignatureLen
-)
-{
-  return NSSCKFWC_VerifyFinal(fwInstance, hSession, pSignature, ulSignatureLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_VerifyFinal
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG ulSignatureLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_VerifyFinal)(hSession, pSignature, ulSignatureLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_VerifyRecoverInit)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return NSSCKFWC_VerifyRecoverInit(fwInstance, hSession, pMechanism, hKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_VerifyRecoverInit
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_VerifyRecoverInit)(hSession, pMechanism, hKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_VerifyRecover)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG ulSignatureLen,
-  CK_BYTE_PTR pData,
-  CK_ULONG_PTR pulDataLen
-)
-{
-  return NSSCKFWC_VerifyRecover(fwInstance, hSession, pSignature, ulSignatureLen, pData, pulDataLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_VerifyRecover
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pSignature,
-  CK_ULONG ulSignatureLen,
-  CK_BYTE_PTR pData,
-  CK_ULONG_PTR pulDataLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_VerifyRecover)(hSession, pSignature, ulSignatureLen, pData, pulDataLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DigestEncryptUpdate)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG_PTR pulEncryptedPartLen
-)
-{
-  return NSSCKFWC_DigestEncryptUpdate(fwInstance, hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DigestEncryptUpdate
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG_PTR pulEncryptedPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DigestEncryptUpdate)(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DecryptDigestUpdate)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG ulEncryptedPartLen,
-  CK_BYTE_PTR pPart,
-  CK_ULONG_PTR pulPartLen
-)
-{
-  return NSSCKFWC_DecryptDigestUpdate(fwInstance, hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DecryptDigestUpdate
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG ulEncryptedPartLen,
-  CK_BYTE_PTR pPart,
-  CK_ULONG_PTR pulPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DecryptDigestUpdate)(hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_SignEncryptUpdate)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG_PTR pulEncryptedPartLen
-)
-{
-  return NSSCKFWC_SignEncryptUpdate(fwInstance, hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_SignEncryptUpdate
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pPart,
-  CK_ULONG ulPartLen,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG_PTR pulEncryptedPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_SignEncryptUpdate)(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DecryptVerifyUpdate)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG ulEncryptedPartLen,
-  CK_BYTE_PTR pPart,
-  CK_ULONG_PTR pulPartLen
-)
-{
-  return NSSCKFWC_DecryptVerifyUpdate(fwInstance, hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DecryptVerifyUpdate
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pEncryptedPart,
-  CK_ULONG ulEncryptedPartLen,
-  CK_BYTE_PTR pPart,
-  CK_ULONG_PTR pulPartLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DecryptVerifyUpdate)(hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GenerateKey)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount,
-  CK_OBJECT_HANDLE_PTR phKey
-)
-{
-  return NSSCKFWC_GenerateKey(fwInstance, hSession, pMechanism, pTemplate, ulCount, phKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GenerateKey
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulCount,
-  CK_OBJECT_HANDLE_PTR phKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GenerateKey)(hSession, pMechanism, pTemplate, ulCount, phKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GenerateKeyPair)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_ATTRIBUTE_PTR pPublicKeyTemplate,
-  CK_ULONG ulPublicKeyAttributeCount,
-  CK_ATTRIBUTE_PTR pPrivateKeyTemplate,
-  CK_ULONG ulPrivateKeyAttributeCount,
-  CK_OBJECT_HANDLE_PTR phPublicKey,
-  CK_OBJECT_HANDLE_PTR phPrivateKey
-)
-{
-  return NSSCKFWC_GenerateKeyPair(fwInstance, hSession, pMechanism, pPublicKeyTemplate, ulPublicKeyAttributeCount, pPrivateKeyTemplate, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GenerateKeyPair
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_ATTRIBUTE_PTR pPublicKeyTemplate,
-  CK_ULONG ulPublicKeyAttributeCount,
-  CK_ATTRIBUTE_PTR pPrivateKeyTemplate,
-  CK_ULONG ulPrivateKeyAttributeCount,
-  CK_OBJECT_HANDLE_PTR phPublicKey,
-  CK_OBJECT_HANDLE_PTR phPrivateKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GenerateKeyPair)(hSession, pMechanism, pPublicKeyTemplate, ulPublicKeyAttributeCount, pPrivateKeyTemplate, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_WrapKey)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hWrappingKey,
-  CK_OBJECT_HANDLE hKey,
-  CK_BYTE_PTR pWrappedKey,
-  CK_ULONG_PTR pulWrappedKeyLen
-)
-{
-  return NSSCKFWC_WrapKey(fwInstance, hSession, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_WrapKey
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hWrappingKey,
-  CK_OBJECT_HANDLE hKey,
-  CK_BYTE_PTR pWrappedKey,
-  CK_ULONG_PTR pulWrappedKeyLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_WrapKey)(hSession, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_UnwrapKey)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hUnwrappingKey,
-  CK_BYTE_PTR pWrappedKey,
-  CK_ULONG ulWrappedKeyLen,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulAttributeCount,
-  CK_OBJECT_HANDLE_PTR phKey
-)
-{
-  return NSSCKFWC_UnwrapKey(fwInstance, hSession, pMechanism, hUnwrappingKey, pWrappedKey, ulWrappedKeyLen, pTemplate, ulAttributeCount, phKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_UnwrapKey
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hUnwrappingKey,
-  CK_BYTE_PTR pWrappedKey,
-  CK_ULONG ulWrappedKeyLen,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulAttributeCount,
-  CK_OBJECT_HANDLE_PTR phKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_UnwrapKey)(hSession, pMechanism, hUnwrappingKey, pWrappedKey, ulWrappedKeyLen, pTemplate, ulAttributeCount, phKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_DeriveKey)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hBaseKey,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulAttributeCount,
-  CK_OBJECT_HANDLE_PTR phKey
-)
-{
-  return NSSCKFWC_DeriveKey(fwInstance, hSession, pMechanism, hBaseKey, pTemplate, ulAttributeCount, phKey);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_DeriveKey
-(
-  CK_SESSION_HANDLE hSession,
-  CK_MECHANISM_PTR pMechanism,
-  CK_OBJECT_HANDLE hBaseKey,
-  CK_ATTRIBUTE_PTR pTemplate,
-  CK_ULONG ulAttributeCount,
-  CK_OBJECT_HANDLE_PTR phKey
-)
-{
-  return __ADJOIN(MODULE_NAME,C_DeriveKey)(hSession, pMechanism, hBaseKey, pTemplate, ulAttributeCount, phKey);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_SeedRandom)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pSeed,
-  CK_ULONG ulSeedLen
-)
-{
-  return NSSCKFWC_SeedRandom(fwInstance, hSession, pSeed, ulSeedLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_SeedRandom
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR pSeed,
-  CK_ULONG ulSeedLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_SeedRandom)(hSession, pSeed, ulSeedLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GenerateRandom)
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR RandomData,
-  CK_ULONG ulRandomLen
-)
-{
-  return NSSCKFWC_GenerateRandom(fwInstance, hSession, RandomData, ulRandomLen);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GenerateRandom
-(
-  CK_SESSION_HANDLE hSession,
-  CK_BYTE_PTR RandomData,
-  CK_ULONG ulRandomLen
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GenerateRandom)(hSession, RandomData, ulRandomLen);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetFunctionStatus)
-(
-  CK_SESSION_HANDLE hSession
-)
-{
-  return NSSCKFWC_GetFunctionStatus(fwInstance, hSession);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_GetFunctionStatus
-(
-  CK_SESSION_HANDLE hSession
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetFunctionStatus)(hSession);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_CancelFunction)
-(
-  CK_SESSION_HANDLE hSession
-)
-{
-  return NSSCKFWC_CancelFunction(fwInstance, hSession);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_CancelFunction
-(
-  CK_SESSION_HANDLE hSession
-)
-{
-  return __ADJOIN(MODULE_NAME,C_CancelFunction)(hSession);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_WaitForSlotEvent)
-(
-  CK_FLAGS flags,
-  CK_SLOT_ID_PTR pSlot,
-  CK_VOID_PTR pRserved
-)
-{
-  return NSSCKFWC_WaitForSlotEvent(fwInstance, flags, pSlot, pRserved);
-}
-
-#ifdef DECLARE_STRICT_CRYPTOKI_NAMES
-CK_RV CK_ENTRY
-C_WaitForSlotEvent
-(
-  CK_FLAGS flags,
-  CK_SLOT_ID_PTR pSlot,
-  CK_VOID_PTR pRserved
-)
-{
-  return __ADJOIN(MODULE_NAME,C_WaitForSlotEvent)(flags, pSlot, pRserved);
-}
-#endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetFunctionList)
-(
-  CK_FUNCTION_LIST_PTR_PTR ppFunctionList
-);
-
-static CK_FUNCTION_LIST FunctionList = {
-  { 2, 1 },
-__ADJOIN(MODULE_NAME,C_Initialize),
-__ADJOIN(MODULE_NAME,C_Finalize),
-__ADJOIN(MODULE_NAME,C_GetInfo),
-__ADJOIN(MODULE_NAME,C_GetFunctionList),
-__ADJOIN(MODULE_NAME,C_GetSlotList),
-__ADJOIN(MODULE_NAME,C_GetSlotInfo),
-__ADJOIN(MODULE_NAME,C_GetTokenInfo),
-__ADJOIN(MODULE_NAME,C_GetMechanismList),
-__ADJOIN(MODULE_NAME,C_GetMechanismInfo),
-__ADJOIN(MODULE_NAME,C_InitToken),
-__ADJOIN(MODULE_NAME,C_InitPIN),
-__ADJOIN(MODULE_NAME,C_SetPIN),
-__ADJOIN(MODULE_NAME,C_OpenSession),
-__ADJOIN(MODULE_NAME,C_CloseSession),
-__ADJOIN(MODULE_NAME,C_CloseAllSessions),
-__ADJOIN(MODULE_NAME,C_GetSessionInfo),
-__ADJOIN(MODULE_NAME,C_GetOperationState),
-__ADJOIN(MODULE_NAME,C_SetOperationState),
-__ADJOIN(MODULE_NAME,C_Login),
-__ADJOIN(MODULE_NAME,C_Logout),
-__ADJOIN(MODULE_NAME,C_CreateObject),
-__ADJOIN(MODULE_NAME,C_CopyObject),
-__ADJOIN(MODULE_NAME,C_DestroyObject),
-__ADJOIN(MODULE_NAME,C_GetObjectSize),
-__ADJOIN(MODULE_NAME,C_GetAttributeValue),
-__ADJOIN(MODULE_NAME,C_SetAttributeValue),
-__ADJOIN(MODULE_NAME,C_FindObjectsInit),
-__ADJOIN(MODULE_NAME,C_FindObjects),
-__ADJOIN(MODULE_NAME,C_FindObjectsFinal),
-__ADJOIN(MODULE_NAME,C_EncryptInit),
-__ADJOIN(MODULE_NAME,C_Encrypt),
-__ADJOIN(MODULE_NAME,C_EncryptUpdate),
-__ADJOIN(MODULE_NAME,C_EncryptFinal),
-__ADJOIN(MODULE_NAME,C_DecryptInit),
-__ADJOIN(MODULE_NAME,C_Decrypt),
-__ADJOIN(MODULE_NAME,C_DecryptUpdate),
-__ADJOIN(MODULE_NAME,C_DecryptFinal),
-__ADJOIN(MODULE_NAME,C_DigestInit),
-__ADJOIN(MODULE_NAME,C_Digest),
-__ADJOIN(MODULE_NAME,C_DigestUpdate),
-__ADJOIN(MODULE_NAME,C_DigestKey),
-__ADJOIN(MODULE_NAME,C_DigestFinal),
-__ADJOIN(MODULE_NAME,C_SignInit),
-__ADJOIN(MODULE_NAME,C_Sign),
-__ADJOIN(MODULE_NAME,C_SignUpdate),
-__ADJOIN(MODULE_NAME,C_SignFinal),
-__ADJOIN(MODULE_NAME,C_SignRecoverInit),
-__ADJOIN(MODULE_NAME,C_SignRecover),
-__ADJOIN(MODULE_NAME,C_VerifyInit),
-__ADJOIN(MODULE_NAME,C_Verify),
-__ADJOIN(MODULE_NAME,C_VerifyUpdate),
-__ADJOIN(MODULE_NAME,C_VerifyFinal),
-__ADJOIN(MODULE_NAME,C_VerifyRecoverInit),
-__ADJOIN(MODULE_NAME,C_VerifyRecover),
-__ADJOIN(MODULE_NAME,C_DigestEncryptUpdate),
-__ADJOIN(MODULE_NAME,C_DecryptDigestUpdate),
-__ADJOIN(MODULE_NAME,C_SignEncryptUpdate),
-__ADJOIN(MODULE_NAME,C_DecryptVerifyUpdate),
-__ADJOIN(MODULE_NAME,C_GenerateKey),
-__ADJOIN(MODULE_NAME,C_GenerateKeyPair),
-__ADJOIN(MODULE_NAME,C_WrapKey),
-__ADJOIN(MODULE_NAME,C_UnwrapKey),
-__ADJOIN(MODULE_NAME,C_DeriveKey),
-__ADJOIN(MODULE_NAME,C_SeedRandom),
-__ADJOIN(MODULE_NAME,C_GenerateRandom),
-__ADJOIN(MODULE_NAME,C_GetFunctionStatus),
-__ADJOIN(MODULE_NAME,C_CancelFunction),
-__ADJOIN(MODULE_NAME,C_WaitForSlotEvent)
-};
-
-static CK_RV CK_ENTRY
-__ADJOIN(MODULE_NAME,C_GetFunctionList)
-(
-  CK_FUNCTION_LIST_PTR_PTR ppFunctionList
-)
-{
-  *ppFunctionList = &FunctionList;
-  return CKR_OK;
-}
-
-/* This one is always present */
-CK_RV CK_ENTRY
-C_GetFunctionList
-(
-  CK_FUNCTION_LIST_PTR_PTR ppFunctionList
-)
-{
-  return __ADJOIN(MODULE_NAME,C_GetFunctionList)(ppFunctionList);
-}
-
-#undef __ADJOIN
-
diff --git a/openflow/usr/include/nss/nssckbi.h b/openflow/usr/include/nss/nssckbi.h
deleted file mode 100644
index 4f1e357..0000000
--- a/openflow/usr/include/nss/nssckbi.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef NSSCKBI_H
-#define NSSCKBI_H
-
-/*
- * NSS BUILTINS Version numbers.
- *
- * These are the version numbers for the builtins module packaged with
- * this release on NSS. To determine the version numbers of the builtin
- * module you are using, use the appropriate PKCS #11 calls.
- *
- * These version numbers detail changes to the PKCS #11 interface. They map
- * to the PKCS #11 spec versions.
- */
-#define NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR 2
-#define NSS_BUILTINS_CRYPTOKI_VERSION_MINOR 20
-
-/* These version numbers detail the changes
- * to the list of trusted certificates.
- *
- * The NSS_BUILTINS_LIBRARY_VERSION_MINOR macro needs to be bumped
- * for each NSS minor release AND whenever we change the list of
- * trusted certificates.  10 minor versions are allocated for each
- * NSS 3.x branch as follows, allowing us to change the list of
- * trusted certificates up to 9 times on each branch.
- *   - NSS 3.5 branch:  3-9
- *   - NSS 3.6 branch:  10-19
- *   - NSS 3.7 branch:  20-29
- *   - NSS 3.8 branch:  30-39
- *   - NSS 3.9 branch:  40-49
- *   - NSS 3.10 branch: 50-59
- *   - NSS 3.11 branch: 60-69
- *     ...
- *   - NSS 3.12 branch: 70-89
- *   - NSS 3.13 branch: 90-99
- *   - NSS 3.14 branch: 100-109
- *     ...
- *   - NSS 3.29 branch: 250-255
- *
- * NSS_BUILTINS_LIBRARY_VERSION_MINOR is a CK_BYTE.  It's not clear
- * whether we may use its full range (0-255) or only 0-99 because
- * of the comment in the CK_VERSION type definition.
- */
-#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 11
-#define NSS_BUILTINS_LIBRARY_VERSION "2.11"
-
-/* These version numbers detail the semantic changes to the ckfw engine. */
-#define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
-#define NSS_BUILTINS_HARDWARE_VERSION_MINOR 0
-
-/* These version numbers detail the semantic changes to ckbi itself
- * (new PKCS #11 objects), etc. */
-#define NSS_BUILTINS_FIRMWARE_VERSION_MAJOR 1
-#define NSS_BUILTINS_FIRMWARE_VERSION_MINOR 0
-
-#endif /* NSSCKBI_H */
diff --git a/openflow/usr/include/nss/nssckepv.h b/openflow/usr/include/nss/nssckepv.h
deleted file mode 100644
index 042845d..0000000
--- a/openflow/usr/include/nss/nssckepv.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* THIS IS A GENERATED FILE */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef NSSCKEPV_H
-#define NSSCKEPV_H
-
-#include "pkcs11.h"
-
-#endif /* NSSCKEPV_H */
diff --git a/openflow/usr/include/nss/nssckft.h b/openflow/usr/include/nss/nssckft.h
deleted file mode 100644
index 80ee292..0000000
--- a/openflow/usr/include/nss/nssckft.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* THIS IS A GENERATED FILE */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _NSSCKFT_H_
-#define _NSSCKFT_H_ 1
-
-#include "pkcs11t.h"
-
-#endif /* _NSSCKFT_H_ */
diff --git a/openflow/usr/include/nss/nssckfw.h b/openflow/usr/include/nss/nssckfw.h
deleted file mode 100644
index 0f93eaa..0000000
--- a/openflow/usr/include/nss/nssckfw.h
+++ /dev/null
@@ -1,462 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef NSSCKFW_H
-#define NSSCKFW_H
-
-/*
- * nssckfw.h
- *
- * This file prototypes the publicly available calls of the
- * NSS Cryptoki Framework.
- */
-
-#ifndef NSSBASET_H
-#include "nssbaset.h"
-#endif /* NSSBASET_H */
-
-#ifndef NSSCKT_H
-#include "nssckt.h"
-#endif /* NSSCKT_H */
-
-#ifndef NSSCKFWT_H
-#include "nssckfwt.h"
-#endif /* NSSCKFWT_H */
-
-/*
- * NSSCKFWInstance
- *
- *  NSSCKFWInstance_GetMDInstance
- *  NSSCKFWInstance_GetArena
- *  NSSCKFWInstance_MayCreatePthreads
- *  NSSCKFWInstance_CreateMutex
- *  NSSCKFWInstance_GetConfigurationData
- *  NSSCKFWInstance_GetInitArgs
- *  NSSCKFWInstance_DestroySessionHandle
- *  NSSCKFWInstance_FindSessionHandle
- */
-
-/*
- * NSSCKFWInstance_GetMDInstance
- *
- */
-
-NSS_EXTERN NSSCKMDInstance *
-NSSCKFWInstance_GetMDInstance(
-    NSSCKFWInstance *fwInstance);
-
-/*
- * NSSCKFWInstance_GetArena
- *
- */
-
-NSS_EXTERN NSSArena *
-NSSCKFWInstance_GetArena(
-    NSSCKFWInstance *fwInstance,
-    CK_RV *pError);
-
-/*
- * NSSCKFWInstance_MayCreatePthreads
- *
- */
-
-NSS_EXTERN CK_BBOOL
-NSSCKFWInstance_MayCreatePthreads(
-    NSSCKFWInstance *fwInstance);
-
-/*
- * NSSCKFWInstance_CreateMutex
- *
- */
-
-NSS_EXTERN NSSCKFWMutex *
-NSSCKFWInstance_CreateMutex(
-    NSSCKFWInstance *fwInstance,
-    NSSArena *arena,
-    CK_RV *pError);
-
-/*
- * NSSCKFWInstance_GetConfigurationData
- *
- */
-
-NSS_EXTERN NSSUTF8 *
-NSSCKFWInstance_GetConfigurationData(
-    NSSCKFWInstance *fwInstance);
-
-/*
- * NSSCKFWInstance_GetInitArgs
- *
- */
-
-NSS_EXTERN CK_C_INITIALIZE_ARGS_PTR
-NSSCKFWInstance_GetInitArgs(
-    NSSCKFWInstance *fwInstance);
-
-/*
- * nssCKFWInstance_DestroySessionHandle
- *
- */
-NSS_EXTERN void
-NSSCKFWInstance_DestroySessionHandle(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession);
-
-/*
- * nssCKFWInstance_FindSessionHandle
- *
- */
-NSS_EXTERN CK_SESSION_HANDLE
-NSSCKFWInstance_FindSessionHandle(
-    NSSCKFWInstance *fwInstance,
-    NSSCKFWSession *fwSession);
-
-/*
- * NSSCKFWSlot
- *
- *  NSSCKFWSlot_GetMDSlot
- *  NSSCKFWSlot_GetFWInstance
- *  NSSCKFWSlot_GetMDInstance
- *  NSSCKFWSlot_GetSlotID
- *
- */
-
-/*
- * NSSCKFWSlot_GetMDSlot
- *
- */
-
-NSS_EXTERN NSSCKMDSlot *
-NSSCKFWSlot_GetMDSlot(
-    NSSCKFWSlot *fwSlot);
-
-/*
- * NSSCKFWSlot_GetFWInstance
- *
- */
-
-NSS_EXTERN NSSCKFWInstance *
-NSSCKFWSlot_GetFWInstance(
-    NSSCKFWSlot *fwSlot);
-
-/*
- * NSSCKFWSlot_GetMDInstance
- *
- */
-
-NSS_EXTERN NSSCKMDInstance *
-NSSCKFWSlot_GetMDInstance(
-    NSSCKFWSlot *fwSlot);
-
-/*
- * NSSCKFWSlot_GetSlotID
- *
- */
-
-NSS_EXTERN CK_SLOT_ID
-NSSCKFWSlot_GetSlotID(
-    NSSCKFWSlot *fwSlot);
-
-/*
- * NSSCKFWToken
- *
- *  NSSCKFWToken_GetMDToken
- *  NSSCKFWToken_GetFWSlot
- *  NSSCKFWToken_GetMDSlot
- *  NSSCKFWToken_GetSessionState
- *
- */
-
-/*
- * NSSCKFWToken_GetMDToken
- *
- */
-
-NSS_EXTERN NSSCKMDToken *
-NSSCKFWToken_GetMDToken(
-    NSSCKFWToken *fwToken);
-
-/*
- * NSSCKFWToken_GetArena
- *
- */
-
-NSS_EXTERN NSSArena *
-NSSCKFWToken_GetArena(
-    NSSCKFWToken *fwToken,
-    CK_RV *pError);
-
-/*
- * NSSCKFWToken_GetFWSlot
- *
- */
-
-NSS_EXTERN NSSCKFWSlot *
-NSSCKFWToken_GetFWSlot(
-    NSSCKFWToken *fwToken);
-
-/*
- * NSSCKFWToken_GetMDSlot
- *
- */
-
-NSS_EXTERN NSSCKMDSlot *
-NSSCKFWToken_GetMDSlot(
-    NSSCKFWToken *fwToken);
-
-/*
- * NSSCKFWToken_GetSessionState
- *
- */
-
-NSS_EXTERN CK_STATE
-NSSCKFWToken_GetSessionState(
-    NSSCKFWToken *fwToken);
-
-/*
- * NSSCKFWMechanism
- *
- *  NSSKCFWMechanism_GetMDMechanism
- *  NSSCKFWMechanism_GetParameter
- *
- */
-
-/*
- * NSSKCFWMechanism_GetMDMechanism
- *
- */
-
-NSS_EXTERN NSSCKMDMechanism *
-NSSCKFWMechanism_GetMDMechanism(
-    NSSCKFWMechanism *fwMechanism);
-
-/*
- * NSSCKFWMechanism_GetParameter
- *
- */
-
-NSS_EXTERN NSSItem *
-NSSCKFWMechanism_GetParameter(
-    NSSCKFWMechanism *fwMechanism);
-
-/*
- * NSSCKFWSession
- *
- *  NSSCKFWSession_GetMDSession
- *  NSSCKFWSession_GetArena
- *  NSSCKFWSession_CallNotification
- *  NSSCKFWSession_IsRWSession
- *  NSSCKFWSession_IsSO
- *  NSSCKFWSession_GetCurrentCryptoOperation
- *  NSSCKFWSession_GetFWSlot
- *
- */
-
-/*
- * NSSCKFWSession_GetMDSession
- *
- */
-
-NSS_EXTERN NSSCKMDSession *
-NSSCKFWSession_GetMDSession(
-    NSSCKFWSession *fwSession);
-
-/*
- * NSSCKFWSession_GetArena
- *
- */
-
-NSS_EXTERN NSSArena *
-NSSCKFWSession_GetArena(
-    NSSCKFWSession *fwSession,
-    CK_RV *pError);
-
-/*
- * NSSCKFWSession_CallNotification
- *
- */
-
-NSS_EXTERN CK_RV
-NSSCKFWSession_CallNotification(
-    NSSCKFWSession *fwSession,
-    CK_NOTIFICATION event);
-
-/*
- * NSSCKFWSession_IsRWSession
- *
- */
-
-NSS_EXTERN CK_BBOOL
-NSSCKFWSession_IsRWSession(
-    NSSCKFWSession *fwSession);
-
-/*
- * NSSCKFWSession_IsSO
- *
- */
-
-NSS_EXTERN CK_BBOOL
-NSSCKFWSession_IsSO(
-    NSSCKFWSession *fwSession);
-
-/*
- * NSSCKFWSession_GetCurrentCryptoOperation
- *
- */
-
-NSS_EXTERN NSSCKFWCryptoOperation *
-NSSCKFWSession_GetCurrentCryptoOperation(
-    NSSCKFWSession *fwSession,
-    NSSCKFWCryptoOperationState state);
-
-/*
- * NSSCKFWSession_GetFWSlot
- *
- */
-
-NSS_EXTERN NSSCKFWSlot *
-NSSCKFWSession_GetFWSlot(
-    NSSCKFWSession *fwSession);
-
-/*
- * NSSCKFWObject
- *
- *  NSSCKFWObject_GetMDObject
- *  NSSCKFWObject_GetArena
- *  NSSCKFWObject_IsTokenObject
- *  NSSCKFWObject_GetAttributeCount
- *  NSSCKFWObject_GetAttributeTypes
- *  NSSCKFWObject_GetAttributeSize
- *  NSSCKFWObject_GetAttribute
- *  NSSCKFWObject_GetObjectSize
- */
-
-/*
- * NSSCKFWObject_GetMDObject
- *
- */
-NSS_EXTERN NSSCKMDObject *
-NSSCKFWObject_GetMDObject(
-    NSSCKFWObject *fwObject);
-
-/*
- * NSSCKFWObject_GetArena
- *
- */
-NSS_EXTERN NSSArena *
-NSSCKFWObject_GetArena(
-    NSSCKFWObject *fwObject,
-    CK_RV *pError);
-
-/*
- * NSSCKFWObject_IsTokenObject
- *
- */
-NSS_EXTERN CK_BBOOL
-NSSCKFWObject_IsTokenObject(
-    NSSCKFWObject *fwObject);
-
-/*
- * NSSCKFWObject_GetAttributeCount
- *
- */
-NSS_EXTERN CK_ULONG
-NSSCKFWObject_GetAttributeCount(
-    NSSCKFWObject *fwObject,
-    CK_RV *pError);
-
-/*
- * NSSCKFWObject_GetAttributeTypes
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWObject_GetAttributeTypes(
-    NSSCKFWObject *fwObject,
-    CK_ATTRIBUTE_TYPE_PTR typeArray,
-    CK_ULONG ulCount);
-
-/*
- * NSSCKFWObject_GetAttributeSize
- *
- */
-NSS_EXTERN CK_ULONG
-NSSCKFWObject_GetAttributeSize(
-    NSSCKFWObject *fwObject,
-    CK_ATTRIBUTE_TYPE attribute,
-    CK_RV *pError);
-
-/*
- * NSSCKFWObject_GetAttribute
- *
- */
-NSS_EXTERN NSSItem *
-NSSCKFWObject_GetAttribute(
-    NSSCKFWObject *fwObject,
-    CK_ATTRIBUTE_TYPE attribute,
-    NSSItem *itemOpt,
-    NSSArena *arenaOpt,
-    CK_RV *pError);
-
-/*
- * NSSCKFWObject_GetObjectSize
- *
- */
-NSS_EXTERN CK_ULONG
-NSSCKFWObject_GetObjectSize(
-    NSSCKFWObject *fwObject,
-    CK_RV *pError);
-
-/*
- * NSSCKFWFindObjects
- *
- *  NSSCKFWFindObjects_GetMDFindObjects
- *
- */
-
-/*
- * NSSCKFWFindObjects_GetMDFindObjects
- *
- */
-
-NSS_EXTERN NSSCKMDFindObjects *
-NSSCKFWFindObjects_GetMDFindObjects(
-    NSSCKFWFindObjects *);
-
-/*
- * NSSCKFWMutex
- *
- *  NSSCKFWMutex_Destroy
- *  NSSCKFWMutex_Lock
- *  NSSCKFWMutex_Unlock
- *
- */
-
-/*
- * NSSCKFWMutex_Destroy
- *
- */
-
-NSS_EXTERN CK_RV
-NSSCKFWMutex_Destroy(
-    NSSCKFWMutex *mutex);
-
-/*
- * NSSCKFWMutex_Lock
- *
- */
-
-NSS_EXTERN CK_RV
-NSSCKFWMutex_Lock(
-    NSSCKFWMutex *mutex);
-
-/*
- * NSSCKFWMutex_Unlock
- *
- */
-
-NSS_EXTERN CK_RV
-NSSCKFWMutex_Unlock(
-    NSSCKFWMutex *mutex);
-
-#endif /* NSSCKFW_H */
diff --git a/openflow/usr/include/nss/nssckfwc.h b/openflow/usr/include/nss/nssckfwc.h
deleted file mode 100644
index 734a67c..0000000
--- a/openflow/usr/include/nss/nssckfwc.h
+++ /dev/null
@@ -1,879 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef NSSCKFWC_H
-#define NSSCKFWC_H
-
-/*
- * nssckfwc.h
- *
- * This file prototypes all of the NSS Cryptoki Framework "wrapper"
- * which implement the PKCS#11 API.  Technically, these are public
- * routines (with capital "NSS" prefixes), since they are called
- * from (generated) code within a Module using the Framework.
- * However, they should not be called except from those generated
- * calls.  Hence, the prototypes have been split out into this file.
- */
-
-#ifndef NSSCKT_H
-#include "nssckt.h"
-#endif /* NSSCKT_H */
-
-#ifndef NSSCKFWT_H
-#include "nssckfwt.h"
-#endif /* NSSCKFWT_H */
-
-#ifndef NSSCKMDT_H
-#include "nssckmdt.h"
-#endif /* NSSCKMDT_H */
-
-/*
- * NSSCKFWC_Initialize
- * NSSCKFWC_Finalize
- * NSSCKFWC_GetInfo
- * -- NSSCKFWC_GetFunctionList -- see the API insert file
- * NSSCKFWC_GetSlotList
- * NSSCKFWC_GetSlotInfo
- * NSSCKFWC_GetTokenInfo
- * NSSCKFWC_WaitForSlotEvent
- * NSSCKFWC_GetMechanismList
- * NSSCKFWC_GetMechanismInfo
- * NSSCKFWC_InitToken
- * NSSCKFWC_InitPIN
- * NSSCKFWC_SetPIN
- * NSSCKFWC_OpenSession
- * NSSCKFWC_CloseSession
- * NSSCKFWC_CloseAllSessions
- * NSSCKFWC_GetSessionInfo
- * NSSCKFWC_GetOperationState
- * NSSCKFWC_SetOperationState
- * NSSCKFWC_Login
- * NSSCKFWC_Logout
- * NSSCKFWC_CreateObject
- * NSSCKFWC_CopyObject
- * NSSCKFWC_DestroyObject
- * NSSCKFWC_GetObjectSize
- * NSSCKFWC_GetAttributeValue
- * NSSCKFWC_SetAttributeValue
- * NSSCKFWC_FindObjectsInit
- * NSSCKFWC_FindObjects
- * NSSCKFWC_FindObjectsFinal
- * NSSCKFWC_EncryptInit
- * NSSCKFWC_Encrypt
- * NSSCKFWC_EncryptUpdate
- * NSSCKFWC_EncryptFinal
- * NSSCKFWC_DecryptInit
- * NSSCKFWC_Decrypt
- * NSSCKFWC_DecryptUpdate
- * NSSCKFWC_DecryptFinal
- * NSSCKFWC_DigestInit
- * NSSCKFWC_Digest
- * NSSCKFWC_DigestUpdate
- * NSSCKFWC_DigestKey
- * NSSCKFWC_DigestFinal
- * NSSCKFWC_SignInit
- * NSSCKFWC_Sign
- * NSSCKFWC_SignUpdate
- * NSSCKFWC_SignFinal
- * NSSCKFWC_SignRecoverInit
- * NSSCKFWC_SignRecover
- * NSSCKFWC_VerifyInit
- * NSSCKFWC_Verify
- * NSSCKFWC_VerifyUpdate
- * NSSCKFWC_VerifyFinal
- * NSSCKFWC_VerifyRecoverInit
- * NSSCKFWC_VerifyRecover
- * NSSCKFWC_DigestEncryptUpdate
- * NSSCKFWC_DecryptDigestUpdate
- * NSSCKFWC_SignEncryptUpdate
- * NSSCKFWC_DecryptVerifyUpdate
- * NSSCKFWC_GenerateKey
- * NSSCKFWC_GenerateKeyPair
- * NSSCKFWC_WrapKey
- * NSSCKFWC_UnwrapKey
- * NSSCKFWC_DeriveKey
- * NSSCKFWC_SeedRandom
- * NSSCKFWC_GenerateRandom
- * NSSCKFWC_GetFunctionStatus
- * NSSCKFWC_CancelFunction
- */
-
-/*
- * NSSCKFWC_Initialize
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_Initialize(
-    NSSCKFWInstance **pFwInstance,
-    NSSCKMDInstance *mdInstance,
-    CK_VOID_PTR pInitArgs);
-
-/*
- * NSSCKFWC_Finalize
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_Finalize(
-    NSSCKFWInstance **pFwInstance);
-
-/*
- * NSSCKFWC_GetInfo
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetInfo(
-    NSSCKFWInstance *fwInstance,
-    CK_INFO_PTR pInfo);
-
-/*
- * C_GetFunctionList is implemented entirely in the Module's file which
- * includes the Framework API insert file.  It requires no "actual"
- * NSSCKFW routine.
- */
-
-/*
- * NSSCKFWC_GetSlotList
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetSlotList(
-    NSSCKFWInstance *fwInstance,
-    CK_BBOOL tokenPresent,
-    CK_SLOT_ID_PTR pSlotList,
-    CK_ULONG_PTR pulCount);
-
-/*
- * NSSCKFWC_GetSlotInfo
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetSlotInfo(
-    NSSCKFWInstance *fwInstance,
-    CK_SLOT_ID slotID,
-    CK_SLOT_INFO_PTR pInfo);
-
-/*
- * NSSCKFWC_GetTokenInfo
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetTokenInfo(
-    NSSCKFWInstance *fwInstance,
-    CK_SLOT_ID slotID,
-    CK_TOKEN_INFO_PTR pInfo);
-
-/*
- * NSSCKFWC_WaitForSlotEvent
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_WaitForSlotEvent(
-    NSSCKFWInstance *fwInstance,
-    CK_FLAGS flags,
-    CK_SLOT_ID_PTR pSlot,
-    CK_VOID_PTR pReserved);
-
-/*
- * NSSCKFWC_GetMechanismList
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetMechanismList(
-    NSSCKFWInstance *fwInstance,
-    CK_SLOT_ID slotID,
-    CK_MECHANISM_TYPE_PTR pMechanismList,
-    CK_ULONG_PTR pulCount);
-
-/*
- * NSSCKFWC_GetMechanismInfo
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetMechanismInfo(
-    NSSCKFWInstance *fwInstance,
-    CK_SLOT_ID slotID,
-    CK_MECHANISM_TYPE type,
-    CK_MECHANISM_INFO_PTR pInfo);
-
-/*
- * NSSCKFWC_InitToken
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_InitToken(
-    NSSCKFWInstance *fwInstance,
-    CK_SLOT_ID slotID,
-    CK_CHAR_PTR pPin,
-    CK_ULONG ulPinLen,
-    CK_CHAR_PTR pLabel);
-
-/*
- * NSSCKFWC_InitPIN
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_InitPIN(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_CHAR_PTR pPin,
-    CK_ULONG ulPinLen);
-
-/*
- * NSSCKFWC_SetPIN
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_SetPIN(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_CHAR_PTR pOldPin,
-    CK_ULONG ulOldLen,
-    CK_CHAR_PTR pNewPin,
-    CK_ULONG ulNewLen);
-
-/*
- * NSSCKFWC_OpenSession
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_OpenSession(
-    NSSCKFWInstance *fwInstance,
-    CK_SLOT_ID slotID,
-    CK_FLAGS flags,
-    CK_VOID_PTR pApplication,
-    CK_NOTIFY Notify,
-    CK_SESSION_HANDLE_PTR phSession);
-
-/*
- * NSSCKFWC_CloseSession
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_CloseSession(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession);
-
-/*
- * NSSCKFWC_CloseAllSessions
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_CloseAllSessions(
-    NSSCKFWInstance *fwInstance,
-    CK_SLOT_ID slotID);
-
-/*
- * NSSCKFWC_GetSessionInfo
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetSessionInfo(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_SESSION_INFO_PTR pInfo);
-
-/*
- * NSSCKFWC_GetOperationState
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetOperationState(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pOperationState,
-    CK_ULONG_PTR pulOperationStateLen);
-
-/*
- * NSSCKFWC_SetOperationState
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_SetOperationState(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pOperationState,
-    CK_ULONG ulOperationStateLen,
-    CK_OBJECT_HANDLE hEncryptionKey,
-    CK_OBJECT_HANDLE hAuthenticationKey);
-
-/*
- * NSSCKFWC_Login
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_Login(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_USER_TYPE userType,
-    CK_CHAR_PTR pPin,
-    CK_ULONG ulPinLen);
-
-/*
- * NSSCKFWC_Logout
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_Logout(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession);
-
-/*
- * NSSCKFWC_CreateObject
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_CreateObject(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_ATTRIBUTE_PTR pTemplate,
-    CK_ULONG ulCount,
-    CK_OBJECT_HANDLE_PTR phObject);
-
-/*
- * NSSCKFWC_CopyObject
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_CopyObject(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_OBJECT_HANDLE hObject,
-    CK_ATTRIBUTE_PTR pTemplate,
-    CK_ULONG ulCount,
-    CK_OBJECT_HANDLE_PTR phNewObject);
-
-/*
- * NSSCKFWC_DestroyObject
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DestroyObject(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_OBJECT_HANDLE hObject);
-
-/*
- * NSSCKFWC_GetObjectSize
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetObjectSize(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_OBJECT_HANDLE hObject,
-    CK_ULONG_PTR pulSize);
-
-/*
- * NSSCKFWC_GetAttributeValue
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetAttributeValue(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_OBJECT_HANDLE hObject,
-    CK_ATTRIBUTE_PTR pTemplate,
-    CK_ULONG ulCount);
-
-/*
- * NSSCKFWC_SetAttributeValue
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_SetAttributeValue(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_OBJECT_HANDLE hObject,
-    CK_ATTRIBUTE_PTR pTemplate,
-    CK_ULONG ulCount);
-
-/*
- * NSSCKFWC_FindObjectsInit
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_FindObjectsInit(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_ATTRIBUTE_PTR pTemplate,
-    CK_ULONG ulCount);
-
-/*
- * NSSCKFWC_FindObjects
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_FindObjects(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_OBJECT_HANDLE_PTR phObject,
-    CK_ULONG ulMaxObjectCount,
-    CK_ULONG_PTR pulObjectCount);
-
-/*
- * NSSCKFWC_FindObjectsFinal
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_FindObjectsFinal(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession);
-
-/*
- * NSSCKFWC_EncryptInit
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_EncryptInit(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_OBJECT_HANDLE hKey);
-
-/*
- * NSSCKFWC_Encrypt
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_Encrypt(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pData,
-    CK_ULONG ulDataLen,
-    CK_BYTE_PTR pEncryptedData,
-    CK_ULONG_PTR pulEncryptedDataLen);
-
-/*
- * NSSCKFWC_EncryptUpdate
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_EncryptUpdate(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pPart,
-    CK_ULONG ulPartLen,
-    CK_BYTE_PTR pEncryptedPart,
-    CK_ULONG_PTR pulEncryptedPartLen);
-
-/*
- * NSSCKFWC_EncryptFinal
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_EncryptFinal(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pLastEncryptedPart,
-    CK_ULONG_PTR pulLastEncryptedPartLen);
-
-/*
- * NSSCKFWC_DecryptInit
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DecryptInit(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_OBJECT_HANDLE hKey);
-
-/*
- * NSSCKFWC_Decrypt
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_Decrypt(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pEncryptedData,
-    CK_ULONG ulEncryptedDataLen,
-    CK_BYTE_PTR pData,
-    CK_ULONG_PTR pulDataLen);
-
-/*
- * NSSCKFWC_DecryptUpdate
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DecryptUpdate(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pEncryptedPart,
-    CK_ULONG ulEncryptedPartLen,
-    CK_BYTE_PTR pPart,
-    CK_ULONG_PTR pulPartLen);
-
-/*
- * NSSCKFWC_DecryptFinal
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DecryptFinal(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pLastPart,
-    CK_ULONG_PTR pulLastPartLen);
-
-/*
- * NSSCKFWC_DigestInit
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DigestInit(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism);
-
-/*
- * NSSCKFWC_Digest
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_Digest(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pData,
-    CK_ULONG ulDataLen,
-    CK_BYTE_PTR pDigest,
-    CK_ULONG_PTR pulDigestLen);
-
-/*
- * NSSCKFWC_DigestUpdate
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DigestUpdate(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pData,
-    CK_ULONG ulDataLen);
-
-/*
- * NSSCKFWC_DigestKey
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DigestKey(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_OBJECT_HANDLE hKey);
-
-/*
- * NSSCKFWC_DigestFinal
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DigestFinal(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pDigest,
-    CK_ULONG_PTR pulDigestLen);
-
-/*
- * NSSCKFWC_SignInit
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_SignInit(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_OBJECT_HANDLE hKey);
-
-/*
- * NSSCKFWC_Sign
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_Sign(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pData,
-    CK_ULONG ulDataLen,
-    CK_BYTE_PTR pSignature,
-    CK_ULONG_PTR pulSignatureLen);
-
-/*
- * NSSCKFWC_SignUpdate
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_SignUpdate(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pPart,
-    CK_ULONG ulPartLen);
-
-/*
- * NSSCKFWC_SignFinal
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_SignFinal(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pSignature,
-    CK_ULONG_PTR pulSignatureLen);
-
-/*
- * NSSCKFWC_SignRecoverInit
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_SignRecoverInit(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_OBJECT_HANDLE hKey);
-
-/*
- * NSSCKFWC_SignRecover
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_SignRecover(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pData,
-    CK_ULONG ulDataLen,
-    CK_BYTE_PTR pSignature,
-    CK_ULONG_PTR pulSignatureLen);
-
-/*
- * NSSCKFWC_VerifyInit
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_VerifyInit(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_OBJECT_HANDLE hKey);
-
-/*
- * NSSCKFWC_Verify
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_Verify(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pData,
-    CK_ULONG ulDataLen,
-    CK_BYTE_PTR pSignature,
-    CK_ULONG ulSignatureLen);
-
-/*
- * NSSCKFWC_VerifyUpdate
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_VerifyUpdate(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pPart,
-    CK_ULONG ulPartLen);
-
-/*
- * NSSCKFWC_VerifyFinal
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_VerifyFinal(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pSignature,
-    CK_ULONG ulSignatureLen);
-
-/*
- * NSSCKFWC_VerifyRecoverInit
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_VerifyRecoverInit(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_OBJECT_HANDLE hKey);
-
-/*
- * NSSCKFWC_VerifyRecover
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_VerifyRecover(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pSignature,
-    CK_ULONG ulSignatureLen,
-    CK_BYTE_PTR pData,
-    CK_ULONG_PTR pulDataLen);
-
-/*
- * NSSCKFWC_DigestEncryptUpdate
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DigestEncryptUpdate(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pPart,
-    CK_ULONG ulPartLen,
-    CK_BYTE_PTR pEncryptedPart,
-    CK_ULONG_PTR pulEncryptedPartLen);
-
-/*
- * NSSCKFWC_DecryptDigestUpdate
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DecryptDigestUpdate(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pEncryptedPart,
-    CK_ULONG ulEncryptedPartLen,
-    CK_BYTE_PTR pPart,
-    CK_ULONG_PTR pulPartLen);
-
-/*
- * NSSCKFWC_SignEncryptUpdate
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_SignEncryptUpdate(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pPart,
-    CK_ULONG ulPartLen,
-    CK_BYTE_PTR pEncryptedPart,
-    CK_ULONG_PTR pulEncryptedPartLen);
-
-/*
- * NSSCKFWC_DecryptVerifyUpdate
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DecryptVerifyUpdate(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pEncryptedPart,
-    CK_ULONG ulEncryptedPartLen,
-    CK_BYTE_PTR pPart,
-    CK_ULONG_PTR pulPartLen);
-
-/*
- * NSSCKFWC_GenerateKey
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GenerateKey(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_ATTRIBUTE_PTR pTemplate,
-    CK_ULONG ulCount,
-    CK_OBJECT_HANDLE_PTR phKey);
-
-/*
- * NSSCKFWC_GenerateKeyPair
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GenerateKeyPair(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_ATTRIBUTE_PTR pPublicKeyTemplate,
-    CK_ULONG ulPublicKeyAttributeCount,
-    CK_ATTRIBUTE_PTR pPrivateKeyTemplate,
-    CK_ULONG ulPrivateKeyAttributeCount,
-    CK_OBJECT_HANDLE_PTR phPublicKey,
-    CK_OBJECT_HANDLE_PTR phPrivateKey);
-
-/*
- * NSSCKFWC_WrapKey
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_WrapKey(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_OBJECT_HANDLE hWrappingKey,
-    CK_OBJECT_HANDLE hKey,
-    CK_BYTE_PTR pWrappedKey,
-    CK_ULONG_PTR pulWrappedKeyLen);
-
-/*
- * NSSCKFWC_UnwrapKey
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_UnwrapKey(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_OBJECT_HANDLE hUnwrappingKey,
-    CK_BYTE_PTR pWrappedKey,
-    CK_ULONG ulWrappedKeyLen,
-    CK_ATTRIBUTE_PTR pTemplate,
-    CK_ULONG ulAttributeCount,
-    CK_OBJECT_HANDLE_PTR phKey);
-
-/*
- * NSSCKFWC_DeriveKey
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_DeriveKey(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_MECHANISM_PTR pMechanism,
-    CK_OBJECT_HANDLE hBaseKey,
-    CK_ATTRIBUTE_PTR pTemplate,
-    CK_ULONG ulAttributeCount,
-    CK_OBJECT_HANDLE_PTR phKey);
-
-/*
- * NSSCKFWC_SeedRandom
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_SeedRandom(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pSeed,
-    CK_ULONG ulSeedLen);
-
-/*
- * NSSCKFWC_GenerateRandom
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GenerateRandom(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession,
-    CK_BYTE_PTR pRandomData,
-    CK_ULONG ulRandomLen);
-
-/*
- * NSSCKFWC_GetFunctionStatus
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_GetFunctionStatus(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession);
-
-/*
- * NSSCKFWC_CancelFunction
- *
- */
-NSS_EXTERN CK_RV
-NSSCKFWC_CancelFunction(
-    NSSCKFWInstance *fwInstance,
-    CK_SESSION_HANDLE hSession);
-
-#endif /* NSSCKFWC_H */
diff --git a/openflow/usr/include/nss/nssckfwt.h b/openflow/usr/include/nss/nssckfwt.h
deleted file mode 100644
index cd015d5..0000000
--- a/openflow/usr/include/nss/nssckfwt.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef NSSCKFWT_H
-#define NSSCKFWT_H
-
-/*
- * nssckfwt.h
- *
- * This file declares the public types used by the NSS Cryptoki Framework.
- */
-
-/*
- * NSSCKFWInstance
- *
- */
-
-struct NSSCKFWInstanceStr;
-typedef struct NSSCKFWInstanceStr NSSCKFWInstance;
-
-/*
- * NSSCKFWSlot
- *
- */
-
-struct NSSCKFWSlotStr;
-typedef struct NSSCKFWSlotStr NSSCKFWSlot;
-
-/*
- * NSSCKFWToken
- *
- */
-
-struct NSSCKFWTokenStr;
-typedef struct NSSCKFWTokenStr NSSCKFWToken;
-
-/*
- * NSSCKFWMechanism
- *
- */
-
-struct NSSCKFWMechanismStr;
-typedef struct NSSCKFWMechanismStr NSSCKFWMechanism;
-
-/*
- * NSSCKFWCryptoOperation
- *
- */
-
-struct NSSCKFWCryptoOperationStr;
-typedef struct NSSCKFWCryptoOperationStr NSSCKFWCryptoOperation;
-
-/*
- * NSSCKFWSession
- *
- */
-
-struct NSSCKFWSessionStr;
-typedef struct NSSCKFWSessionStr NSSCKFWSession;
-
-/*
- * NSSCKFWObject
- *
- */
-
-struct NSSCKFWObjectStr;
-typedef struct NSSCKFWObjectStr NSSCKFWObject;
-
-/*
- * NSSCKFWFindObjects
- *
- */
-
-struct NSSCKFWFindObjectsStr;
-typedef struct NSSCKFWFindObjectsStr NSSCKFWFindObjects;
-
-/*
- * NSSCKFWMutex
- *
- */
-
-struct NSSCKFWMutexStr;
-typedef struct NSSCKFWMutexStr NSSCKFWMutex;
-
-typedef enum {
-    SingleThreaded,
-    MultiThreaded
-} CryptokiLockingState;
-
-/* used as an index into an array, make sure it starts at '0' */
-typedef enum {
-    NSSCKFWCryptoOperationState_EncryptDecrypt = 0,
-    NSSCKFWCryptoOperationState_SignVerify,
-    NSSCKFWCryptoOperationState_Digest,
-    NSSCKFWCryptoOperationState_Max
-} NSSCKFWCryptoOperationState;
-
-typedef enum {
-    NSSCKFWCryptoOperationType_Encrypt,
-    NSSCKFWCryptoOperationType_Decrypt,
-    NSSCKFWCryptoOperationType_Digest,
-    NSSCKFWCryptoOperationType_Sign,
-    NSSCKFWCryptoOperationType_Verify,
-    NSSCKFWCryptoOperationType_SignRecover,
-    NSSCKFWCryptoOperationType_VerifyRecover
-} NSSCKFWCryptoOperationType;
-
-#endif /* NSSCKFWT_H */
diff --git a/openflow/usr/include/nss/nssckg.h b/openflow/usr/include/nss/nssckg.h
deleted file mode 100644
index bf0d43f..0000000
--- a/openflow/usr/include/nss/nssckg.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* THIS IS A GENERATED FILE */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef NSSCKG_H
-#define NSSCKG_H
-
-#include "pkcs11.h"
-
-#endif /* NSSCKG_H */
diff --git a/openflow/usr/include/nss/nssckmdt.h b/openflow/usr/include/nss/nssckmdt.h
deleted file mode 100644
index d98f9b0..0000000
--- a/openflow/usr/include/nss/nssckmdt.h
+++ /dev/null
@@ -1,1904 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef NSSCKMDT_H
-#define NSSCKMDT_H
-
-/*
- * nssckmdt.h
- *
- * This file specifies the basic types that must be implemented by
- * any Module using the NSS Cryptoki Framework.
- */
-
-#ifndef NSSBASET_H
-#include "nssbaset.h"
-#endif /* NSSBASET_H */
-
-#ifndef NSSCKT_H
-#include "nssckt.h"
-#endif /* NSSCKT_H */
-
-#ifndef NSSCKFWT_H
-#include "nssckfwt.h"
-#endif /* NSSCKFWT_H */
-
-typedef struct NSSCKMDInstanceStr NSSCKMDInstance;
-typedef struct NSSCKMDSlotStr NSSCKMDSlot;
-typedef struct NSSCKMDTokenStr NSSCKMDToken;
-typedef struct NSSCKMDSessionStr NSSCKMDSession;
-typedef struct NSSCKMDCryptoOperationStr NSSCKMDCryptoOperation;
-typedef struct NSSCKMDFindObjectsStr NSSCKMDFindObjects;
-typedef struct NSSCKMDMechanismStr NSSCKMDMechanism;
-typedef struct NSSCKMDObjectStr NSSCKMDObject;
-
-/*
- * NSSCKFWItem
- *
- * This is a structure used by modules to return object attributes.
- * The needsFreeing bit indicates whether the object needs to be freed.
- * If so, the framework will call the FreeAttribute function on the item
- * after it is done using it.
- *
- */
-
-typedef struct {
-    PRBool needsFreeing;
-    NSSItem *item;
-} NSSCKFWItem;
-
-/*
- * NSSCKMDInstance
- *
- * This is the basic handle for an instance of a PKCS#11 Module.
- * It is returned by the Module's CreateInstance routine, and
- * may be obtained from the corresponding NSSCKFWInstance object.
- * It contains a pointer for use by the Module, to store any
- * instance-related data, and it contains the EPV for a set of
- * routines which the Module may implement for use by the Framework.
- * Some of these routines are optional; others are mandatory.
- */
-
-struct NSSCKMDInstanceStr {
-    /*
-     * The Module may use this pointer for its own purposes.
-     */
-    void *etc;
-
-    /*
-     * This routine is called by the Framework to initialize
-     * the Module.  This routine is optional; if unimplemented,
-     * it won't be called.  If this routine returns an error,
-     * then the initialization will fail.
-     */
-    CK_RV(PR_CALLBACK *Initialize)
-    (
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSUTF8 *configurationData);
-
-    /*
-     * This routine is called when the Framework is finalizing
-     * the PKCS#11 Module.  It is the last thing called before
-     * the NSSCKFWInstance's NSSArena is destroyed.  This routine
-     * is optional; if unimplemented, it merely won't be called.
-     */
-    void(PR_CALLBACK *Finalize)(
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-   * This routine gets the number of slots.  This value must
-   * never change, once the instance is initialized.  This
-   * routine must be implemented.  It may return zero on error.
-   */
-    CK_ULONG(PR_CALLBACK *GetNSlots)
-    (
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine returns the version of the Cryptoki standard
-     * to which this Module conforms.  This routine is optional;
-     * if unimplemented, the Framework uses the version to which
-     * ~it~ was implemented.
-     */
-    CK_VERSION(PR_CALLBACK *GetCryptokiVersion)
-    (
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns a pointer to a UTF8-encoded string
-     * containing the manufacturer ID for this Module.  Only
-     * the characters completely encoded in the first thirty-
-     * two bytes are significant.  This routine is optional.
-     * The string returned is never freed; if dynamically generated,
-     * the space for it should be allocated from the NSSArena
-     * that may be obtained from the NSSCKFWInstance.  This
-     * routine may return NULL upon error; however if *pError
-     * is CKR_OK, the NULL will be considered the valid response.
-     */
-    NSSUTF8 *(PR_CALLBACK *GetManufacturerID)(
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine returns a pointer to a UTF8-encoded string
-     * containing a description of this Module library.  Only
-     * the characters completely encoded in the first thirty-
-     * two bytes are significant.  This routine is optional.
-     * The string returned is never freed; if dynamically generated,
-     * the space for it should be allocated from the NSSArena
-     * that may be obtained from the NSSCKFWInstance.  This
-     * routine may return NULL upon error; however if *pError
-     * is CKR_OK, the NULL will be considered the valid response.
-     */
-    NSSUTF8 *(PR_CALLBACK *GetLibraryDescription)(
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine returns the version of this Module library.
-     * This routine is optional; if unimplemented, the Framework
-     * will assume a Module library version of 0.1.
-     */
-    CK_VERSION(PR_CALLBACK *GetLibraryVersion)
-    (
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns CK_TRUE if the Module wishes to
-     * handle session objects.  This routine is optional.
-     * If this routine is NULL, or if it exists but returns
-     * CK_FALSE, the Framework will assume responsibility
-     * for managing session objects.
-     */
-    CK_BBOOL(PR_CALLBACK *ModuleHandlesSessionObjects)
-    (
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine stuffs pointers to NSSCKMDSlot objects into
-     * the specified array; one for each slot supported by this
-     * instance.  The Framework will determine the size needed
-     * for the array by calling GetNSlots.  This routine is
-     * required.
-     */
-    CK_RV(PR_CALLBACK *GetSlots)
-    (
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDSlot *slots[]);
-
-    /*
-     * This call returns a pointer to the slot in which an event
-     * has occurred.  If the block argument is CK_TRUE, the call
-     * should block until a slot event occurs; if CK_FALSE, it
-     * should check to see if an event has occurred, occurred,
-     * but return NULL (and set *pError to CK_NO_EVENT) if one
-     * hasn't.  This routine is optional; if unimplemented, the
-     * Framework will assume that no event has happened.  This
-     * routine may return NULL upon error.
-     */
-    NSSCKMDSlot *(PR_CALLBACK *WaitForSlotEvent)(
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_BBOOL block,
-        CK_RV *pError);
-
-    /*
-     * This object may be extended in future versions of the
-     * NSS Cryptoki Framework.  To allow for some flexibility
-     * in the area of binary compatibility, this field should
-     * be NULL.
-     */
-    void *null;
-};
-
-/*
- * NSSCKMDSlot
- *
- * This is the basic handle for a PKCS#11 Module Slot.  It is
- * created by the NSSCKMDInstance->GetSlots call, and may be
- * obtained from the Framework's corresponding NSSCKFWSlot
- * object.  It contains a pointer for use by the Module, to
- * store any slot-related data, and it contains the EPV for
- * a set of routines which the Module may implement for use
- * by the Framework.  Some of these routines are optional.
- */
-
-struct NSSCKMDSlotStr {
-    /*
-     * The Module may use this pointer for its own purposes.
-     */
-    void *etc;
-
-    /*
-     * This routine is called during the Framework initialization
-     * step, after the Framework Instance has obtained the list
-     * of slots (by calling NSSCKMDInstance->GetSlots).  Any slot-
-     * specific initialization can be done here.  This routine is
-     * optional; if unimplemented, it won't be called.  Note that
-     * if this routine returns an error, the entire Framework
-     * initialization for this Module will fail.
-     */
-    CK_RV(PR_CALLBACK *Initialize)
-    (
-        NSSCKMDSlot *mdSlot,
-        NSSCKFWSlot *fwSlot,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine is called when the Framework is finalizing
-     * the PKCS#11 Module.  This call (for each of the slots)
-     * is the last thing called before NSSCKMDInstance->Finalize.
-     * This routine is optional; if unimplemented, it merely
-     * won't be called.  Note: In the rare circumstance that
-     * the Framework initialization cannot complete (due to,
-     * for example, memory limitations), this can be called with
-     * a NULL value for fwSlot.
-     */
-    void(PR_CALLBACK *Destroy)(
-        NSSCKMDSlot *mdSlot,
-        NSSCKFWSlot *fwSlot,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns a pointer to a UTF8-encoded string
-     * containing a description of this slot.  Only the characters
-     * completely encoded in the first sixty-four bytes are
-     * significant.  This routine is optional.  The string
-     * returned is never freed; if dynamically generated,
-     * the space for it should be allocated from the NSSArena
-     * that may be obtained from the NSSCKFWInstance.  This
-     * routine may return NULL upon error; however if *pError
-     * is CKR_OK, the NULL will be considered the valid response.
-     */
-    NSSUTF8 *(PR_CALLBACK *GetSlotDescription)(
-        NSSCKMDSlot *mdSlot,
-        NSSCKFWSlot *fwSlot,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine returns a pointer to a UTF8-encoded string
-     * containing a description of the manufacturer of this slot.
-     * Only the characters completely encoded in the first thirty-
-     * two bytes are significant.  This routine is optional.
-     * The string  returned is never freed; if dynamically generated,
-     * the space for it should be allocated from the NSSArena
-     * that may be obtained from the NSSCKFWInstance.  This
-     * routine may return NULL upon error; however if *pError
-     * is CKR_OK, the NULL will be considered the valid response.
-     */
-    NSSUTF8 *(PR_CALLBACK *GetManufacturerID)(
-        NSSCKMDSlot *mdSlot,
-        NSSCKFWSlot *fwSlot,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine returns CK_TRUE if a token is present in this
-     * slot.  This routine is optional; if unimplemented, CK_TRUE
-     * is assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetTokenPresent)
-    (
-        NSSCKMDSlot *mdSlot,
-        NSSCKFWSlot *fwSlot,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns CK_TRUE if the slot supports removable
-     * tokens.  This routine is optional; if unimplemented, CK_FALSE
-     * is assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetRemovableDevice)
-    (
-        NSSCKMDSlot *mdSlot,
-        NSSCKFWSlot *fwSlot,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns CK_TRUE if this slot is a hardware
-     * device, or CK_FALSE if this slot is a software device.  This
-     * routine is optional; if unimplemented, CK_FALSE is assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetHardwareSlot)
-    (
-        NSSCKMDSlot *mdSlot,
-        NSSCKFWSlot *fwSlot,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the version of this slot's hardware.
-     * This routine is optional; if unimplemented, the Framework
-     * will assume a hardware version of 0.1.
-     */
-    CK_VERSION(PR_CALLBACK *GetHardwareVersion)
-    (
-        NSSCKMDSlot *mdSlot,
-        NSSCKFWSlot *fwSlot,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the version of this slot's firmware.
-     * This routine is optional; if unimplemented, the Framework
-     * will assume a hardware version of 0.1.
-     */
-    CK_VERSION(PR_CALLBACK *GetFirmwareVersion)
-    (
-        NSSCKMDSlot *mdSlot,
-        NSSCKFWSlot *fwSlot,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine should return a pointer to an NSSCKMDToken
-     * object corresponding to the token in the specified slot.
-     * The NSSCKFWToken object passed in has an NSSArena
-     * available which is dedicated for this token.  This routine
-     * must be implemented.  This routine may return NULL upon
-     * error.
-     */
-    NSSCKMDToken *(PR_CALLBACK *GetToken)(
-        NSSCKMDSlot *mdSlot,
-        NSSCKFWSlot *fwSlot,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This object may be extended in future versions of the
-     * NSS Cryptoki Framework.  To allow for some flexibility
-     * in the area of binary compatibility, this field should
-     * be NULL.
-     */
-    void *null;
-};
-
-/*
- * NSSCKMDToken
- *
- * This is the basic handle for a PKCS#11 Token.  It is created by
- * the NSSCKMDSlot->GetToken call, and may be obtained from the
- * Framework's corresponding NSSCKFWToken object.  It contains a
- * pointer for use by the Module, to store any token-related
- * data, and it contains the EPV for a set of routines which the
- * Module may implement for use by the Framework.  Some of these
- * routines are optional.
- */
-
-struct NSSCKMDTokenStr {
-    /*
-     * The Module may use this pointer for its own purposes.
-     */
-    void *etc;
-
-    /*
-     * This routine is used to prepare a Module token object for
-     * use.  It is called after the NSSCKMDToken object is obtained
-     * from NSSCKMDSlot->GetToken.  It is named "Setup" here because
-     * Cryptoki already defines "InitToken" to do the process of
-     * wiping out any existing state on a token and preparing it for
-     * a new use.  This routine is optional; if unimplemented, it
-     * merely won't be called.
-     */
-    CK_RV(PR_CALLBACK *Setup)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine is called by the Framework whenever it notices
-     * that the token object is invalid.  (Typically this is when a
-     * routine indicates an error such as CKR_DEVICE_REMOVED).  This
-     * call is the last thing called before the NSSArena in the
-     * corresponding NSSCKFWToken is destroyed.  This routine is
-     * optional; if unimplemented, it merely won't be called.
-     */
-    void(PR_CALLBACK *Invalidate)(
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine initialises the token in the specified slot.
-     * This routine is optional; if unimplemented, the Framework
-     * will fail this operation with an error of CKR_DEVICE_ERROR.
-     */
-
-    CK_RV(PR_CALLBACK *InitToken)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSItem *pin,
-        NSSUTF8 *label);
-
-    /*
-     * This routine returns a pointer to a UTF8-encoded string
-     * containing this token's label.  Only the characters
-     * completely encoded in the first thirty-two bytes are
-     * significant.  This routine is optional.  The string
-     * returned is never freed; if dynamically generated,
-     * the space for it should be allocated from the NSSArena
-     * that may be obtained from the NSSCKFWInstance.  This
-     * routine may return NULL upon error; however if *pError
-     * is CKR_OK, the NULL will be considered the valid response.
-     */
-    NSSUTF8 *(PR_CALLBACK *GetLabel)(
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine returns a pointer to a UTF8-encoded string
-     * containing this token's manufacturer ID.  Only the characters
-     * completely encoded in the first thirty-two bytes are
-     * significant.  This routine is optional.  The string
-     * returned is never freed; if dynamically generated,
-     * the space for it should be allocated from the NSSArena
-     * that may be obtained from the NSSCKFWInstance.  This
-     * routine may return NULL upon error; however if *pError
-     * is CKR_OK, the NULL will be considered the valid response.
-     */
-    NSSUTF8 *(PR_CALLBACK *GetManufacturerID)(
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine returns a pointer to a UTF8-encoded string
-     * containing this token's model name.  Only the characters
-     * completely encoded in the first thirty-two bytes are
-     * significant.  This routine is optional.  The string
-     * returned is never freed; if dynamically generated,
-     * the space for it should be allocated from the NSSArena
-     * that may be obtained from the NSSCKFWInstance.  This
-     * routine may return NULL upon error; however if *pError
-     * is CKR_OK, the NULL will be considered the valid response.
-     */
-    NSSUTF8 *(PR_CALLBACK *GetModel)(
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine returns a pointer to a UTF8-encoded string
-     * containing this token's serial number.  Only the characters
-     * completely encoded in the first thirty-two bytes are
-     * significant.  This routine is optional.  The string
-     * returned is never freed; if dynamically generated,
-     * the space for it should be allocated from the NSSArena
-     * that may be obtained from the NSSCKFWInstance.  This
-     * routine may return NULL upon error; however if *pError
-     * is CKR_OK, the NULL will be considered the valid response.
-     */
-    NSSUTF8 *(PR_CALLBACK *GetSerialNumber)(
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine returns CK_TRUE if the token has its own
-     * random number generator.  This routine is optional; if
-     * unimplemented, CK_FALSE is assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetHasRNG)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns CK_TRUE if this token is write-protected.
-     * This routine is optional; if unimplemented, CK_FALSE is
-     * assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetIsWriteProtected)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns CK_TRUE if this token requires a login.
-     * This routine is optional; if unimplemented, CK_FALSE is
-     * assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetLoginRequired)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns CK_TRUE if the normal user's PIN on this
-     * token has been initialised.  This routine is optional; if
-     * unimplemented, CK_FALSE is assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetUserPinInitialized)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns CK_TRUE if a successful save of a
-     * session's cryptographic operations state ~always~ contains
-     * all keys needed to restore the state of the session.  This
-     * routine is optional; if unimplemented, CK_FALSE is assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetRestoreKeyNotNeeded)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns CK_TRUE if the token has its own
-     * hardware clock.  This routine is optional; if unimplemented,
-     * CK_FALSE is assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetHasClockOnToken)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns CK_TRUE if the token has a protected
-     * authentication path.  This routine is optional; if
-     * unimplemented, CK_FALSE is assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetHasProtectedAuthenticationPath)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns CK_TRUE if the token supports dual
-     * cryptographic operations within a single session.  This
-     * routine is optional; if unimplemented, CK_FALSE is assumed.
-     */
-    CK_BBOOL(PR_CALLBACK *GetSupportsDualCryptoOperations)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * XXX fgmr-- should we have a call to return all the flags
-     * at once, for folks who already know about Cryptoki?
-     */
-
-    /*
-     * This routine returns the maximum number of sessions that
-     * may be opened on this token.  This routine is optional;
-     * if unimplemented, the special value CK_UNAVAILABLE_INFORMATION
-     * is assumed.  XXX fgmr-- or CK_EFFECTIVELY_INFINITE?
-     */
-    CK_ULONG(PR_CALLBACK *GetMaxSessionCount)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the maximum number of read/write
-     * sesisons that may be opened on this token.  This routine
-     * is optional; if unimplemented, the special value
-     * CK_UNAVAILABLE_INFORMATION is assumed.  XXX fgmr-- or
-     * CK_EFFECTIVELY_INFINITE?
-     */
-    CK_ULONG(PR_CALLBACK *GetMaxRwSessionCount)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the maximum PIN code length that is
-     * supported on this token.  This routine is optional;
-     * if unimplemented, the special value CK_UNAVAILABLE_INFORMATION
-     * is assumed.
-     */
-    CK_ULONG(PR_CALLBACK *GetMaxPinLen)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the minimum PIN code length that is
-     * supported on this token.  This routine is optional; if
-     * unimplemented, the special value CK_UNAVAILABLE_INFORMATION
-     *  is assumed.  XXX fgmr-- or 0?
-     */
-    CK_ULONG(PR_CALLBACK *GetMinPinLen)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the total amount of memory on the token
-     * in which public objects may be stored.  This routine is
-     * optional; if unimplemented, the special value
-     * CK_UNAVAILABLE_INFORMATION is assumed.
-     */
-    CK_ULONG(PR_CALLBACK *GetTotalPublicMemory)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the amount of unused memory on the
-     * token in which public objects may be stored.  This routine
-     * is optional; if unimplemented, the special value
-     * CK_UNAVAILABLE_INFORMATION is assumed.
-     */
-    CK_ULONG(PR_CALLBACK *GetFreePublicMemory)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the total amount of memory on the token
-     * in which private objects may be stored.  This routine is
-     * optional; if unimplemented, the special value
-     * CK_UNAVAILABLE_INFORMATION is assumed.
-     */
-    CK_ULONG(PR_CALLBACK *GetTotalPrivateMemory)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the amount of unused memory on the
-     * token in which private objects may be stored.  This routine
-     * is optional; if unimplemented, the special value
-     * CK_UNAVAILABLE_INFORMATION is assumed.
-     */
-    CK_ULONG(PR_CALLBACK *GetFreePrivateMemory)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the version number of this token's
-     * hardware.  This routine is optional; if unimplemented,
-     * the value 0.1 is assumed.
-     */
-    CK_VERSION(PR_CALLBACK *GetHardwareVersion)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the version number of this token's
-     * firmware.  This routine is optional; if unimplemented,
-     * the value 0.1 is assumed.
-     */
-    CK_VERSION(PR_CALLBACK *GetFirmwareVersion)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine stuffs the current UTC time, as obtained from
-     * the token, into the sixteen-byte buffer in the form
-     * YYYYMMDDhhmmss00.  This routine need only be implemented
-     * by token which indicate that they have a real-time clock.
-     * XXX fgmr-- think about time formats.
-     */
-    CK_RV(PR_CALLBACK *GetUTCTime)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_CHAR utcTime[16]);
-
-    /*
-     * This routine creates a session on the token, and returns
-     * the corresponding NSSCKMDSession object.  The value of
-     * rw will be CK_TRUE if the session is to be a read/write
-     * session, or CK_FALSE otherwise.  An NSSArena dedicated to
-     * the new session is available from the specified NSSCKFWSession.
-     * This routine may return NULL upon error.
-     */
-    NSSCKMDSession *(PR_CALLBACK *OpenSession)(
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKFWSession *fwSession,
-        CK_BBOOL rw,
-        CK_RV *pError);
-
-    /*
-     * This routine returns the number of PKCS#11 Mechanisms
-     * supported by this token.  This routine is optional; if
-     * unimplemented, zero is assumed.
-     */
-    CK_ULONG(PR_CALLBACK *GetMechanismCount)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine stuffs into the specified array the types
-     * of the mechanisms supported by this token.  The Framework
-     * determines the size of the array by calling GetMechanismCount.
-     */
-    CK_RV(PR_CALLBACK *GetMechanismTypes)
-    (
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_MECHANISM_TYPE types[]);
-
-    /*
-     * This routine returns a pointer to a Module mechanism
-     * object corresponding to a specified type.  This routine
-     * need only exist for tokens implementing at least one
-     * mechanism.
-     */
-    NSSCKMDMechanism *(PR_CALLBACK *GetMechanism)(
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_MECHANISM_TYPE which,
-        CK_RV *pError);
-
-    /*
-     * This object may be extended in future versions of the
-     * NSS Cryptoki Framework.  To allow for some flexibility
-     * in the area of binary compatibility, this field should
-     * be NULL.
-     */
-    void *null;
-};
-
-/*
- * NSSCKMDSession
- *
- * This is the basic handle for a session on a PKCS#11 Token.  It
- * is created by NSSCKMDToken->OpenSession, and may be obtained
- * from the Framework's corresponding NSSCKFWSession object.  It
- * contains a pointer for use by the Module, to store any session-
- * realted data, and it contains the EPV for a set of routines
- * which the Module may implement for use by the Framework.  Some
- * of these routines are optional.
- */
-
-struct NSSCKMDSessionStr {
-    /*
-     * The Module may use this pointer for its own purposes.
-     */
-    void *etc;
-
-    /*
-     * This routine is called by the Framework when a session is
-     * closed.  This call is the last thing called before the
-     * NSSArena in the correspoinding NSSCKFWSession is destroyed.
-     * This routine is optional; if unimplemented, it merely won't
-     * be called.
-     */
-    void(PR_CALLBACK *Close)(
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine is used to get any device-specific error.
-     * This routine is optional.
-     */
-    CK_ULONG(PR_CALLBACK *GetDeviceError)
-    (
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine is used to log in a user to the token.  This
-     * routine is optional, since the Framework's NSSCKFWSession
-     * object keeps track of the login state.
-     */
-    CK_RV(PR_CALLBACK *Login)
-    (
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_USER_TYPE userType,
-        NSSItem *pin,
-        CK_STATE oldState,
-        CK_STATE newState);
-
-    /*
-     * This routine is used to log out a user from the token.  This
-     * routine is optional, since the Framework's NSSCKFWSession
-     * object keeps track of the login state.
-     */
-    CK_RV(PR_CALLBACK *Logout)
-    (
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_STATE oldState,
-        CK_STATE newState);
-
-    /*
-     * This routine is used to initialize the normal user's PIN or
-     * password.  This will only be called in the "read/write
-     * security officer functions" state.  If this token has a
-     * protected authentication path, then the pin argument will
-     * be NULL.  This routine is optional; if unimplemented, the
-     * Framework will return the error CKR_TOKEN_WRITE_PROTECTED.
-     */
-    CK_RV(PR_CALLBACK *InitPIN)
-    (
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSItem *pin);
-
-    /*
-     * This routine is used to modify a user's PIN or password.  This
-     * routine will only be called in the "read/write security officer
-     * functions" or "read/write user functions" state.  If this token
-     * has a protected authentication path, then the pin arguments
-     * will be NULL.  This routine is optional; if unimplemented, the
-     * Framework will return the error CKR_TOKEN_WRITE_PROTECTED.
-     */
-    CK_RV(PR_CALLBACK *SetPIN)
-    (
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSItem *oldPin,
-        NSSItem *newPin);
-
-    /*
-     * This routine is used to find out how much space would be required
-     * to save the current operational state.  This routine is optional;
-     * if unimplemented, the Framework will reject any attempts to save
-     * the operational state with the error CKR_STATE_UNSAVEABLE.  This
-     * routine may return zero on error.
-     */
-    CK_ULONG(PR_CALLBACK *GetOperationStateLen)
-    (
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine is used to store the current operational state.  This
-     * routine is only required if GetOperationStateLen is implemented
-     * and can return a nonzero value.  The buffer in the specified item
-     * will be pre-allocated, and the length will specify the amount of
-     * space available (which may be more than GetOperationStateLen
-     * asked for, but which will not be smaller).
-     */
-    CK_RV(PR_CALLBACK *GetOperationState)
-    (
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSItem *buffer);
-
-    /*
-     * This routine is used to restore an operational state previously
-     * obtained with GetOperationState.  The Framework will take pains
-     * to be sure that the state is (or was at one point) valid; if the
-     * Module notices that the state is invalid, it should return an
-     * error, but it is not required to be paranoid about the issue.
-     * [XXX fgmr-- should (can?) the framework verify the keys match up?]
-     * This routine is required only if GetOperationState is implemented.
-     */
-    CK_RV(PR_CALLBACK *SetOperationState)
-    (
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSItem *state,
-        NSSCKMDObject *mdEncryptionKey,
-        NSSCKFWObject *fwEncryptionKey,
-        NSSCKMDObject *mdAuthenticationKey,
-        NSSCKFWObject *fwAuthenticationKey);
-
-    /*
-     * This routine is used to create an object.  The specified template
-     * will only specify a session object if the Module has indicated
-     * that it wishes to handle its own session objects.  This routine
-     * is optional; if unimplemented, the Framework will reject the
-     * operation with the error CKR_TOKEN_WRITE_PROTECTED.  Space for
-     * token objects should come from the NSSArena available from the
-     * NSSCKFWToken object; space for session objects (if supported)
-     * should come from the NSSArena available from the NSSCKFWSession
-     * object.  The appropriate NSSArena pointer will, as a convenience,
-     * be passed as the handyArenaPointer argument.  This routine may
-     * return NULL upon error.
-     */
-    NSSCKMDObject *(PR_CALLBACK *CreateObject)(
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSArena *handyArenaPointer,
-        CK_ATTRIBUTE_PTR pTemplate,
-        CK_ULONG ulAttributeCount,
-        CK_RV *pError);
-
-    /*
-     * This routine is used to make a copy of an object.  It is entirely
-     * optional; if unimplemented, the Framework will try to use
-     * CreateObject instead.  If the Module has indicated that it does
-     * not wish to handle session objects, then this routine will only
-     * be called to copy a token object to another token object.
-     * Otherwise, either the original object or the new may be of
-     * either the token or session variety.  As with CreateObject, the
-     * handyArenaPointer will point to the appropriate arena for the
-     * new object.  This routine may return NULL upon error.
-     */
-    NSSCKMDObject *(PR_CALLBACK *CopyObject)(
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdOldObject,
-        NSSCKFWObject *fwOldObject,
-        NSSArena *handyArenaPointer,
-        CK_ATTRIBUTE_PTR pTemplate,
-        CK_ULONG ulAttributeCount,
-        CK_RV *pError);
-
-    /*
-     * This routine is used to begin an object search.  This routine may
-     * be unimplemented only if the Module does not handle session
-     * objects, and if none of its tokens have token objects.  The
-     * NSSCKFWFindObjects pointer has an NSSArena that may be used for
-     * storage for the life of this "find" operation.  This routine may
-     * return NULL upon error.  If the Module can determine immediately
-     * that the search will not find any matching objects, it may return
-     * NULL, and specify CKR_OK as the error.
-     */
-    NSSCKMDFindObjects *(PR_CALLBACK *FindObjectsInit)(
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_ATTRIBUTE_PTR pTemplate,
-        CK_ULONG ulAttributeCount,
-        CK_RV *pError);
-
-    /*
-     * This routine seeds the random-number generator.  It is
-     * optional, even if GetRandom is implemented.  If unimplemented,
-     * the Framework will issue the error CKR_RANDOM_SEED_NOT_SUPPORTED.
-     */
-    CK_RV(PR_CALLBACK *SeedRandom)
-    (
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSItem *seed);
-
-    /*
-     * This routine gets random data.  It is optional.  If unimplemented,
-     * the Framework will issue the error CKR_RANDOM_NO_RNG.
-     */
-    CK_RV(PR_CALLBACK *GetRandom)
-    (
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSItem *buffer);
-
-    /*
-     * This object may be extended in future versions of the
-     * NSS Cryptoki Framework.  To allow for some flexibility
-     * in the area of binary compatibility, this field should
-     * be NULL.
-     */
-    void *null;
-};
-
-/*
- * NSSCKMDFindObjects
- *
- * This is the basic handle for an object search.  It is
- * created by NSSCKMDSession->FindObjectsInit, and may be
- * obtained from the Framework's corresponding object.
- * It contains a pointer for use by the Module, to store
- * any search-related data, and it contains the EPV for a
- * set of routines which the Module may implement for use
- * by the Framework.  Some of these routines are optional.
- */
-
-struct NSSCKMDFindObjectsStr {
-    /*
-     * The Module may use this pointer for its own purposes.
-     */
-    void *etc;
-
-    /*
-     * This routine is called by the Framework to finish a
-     * search operation.  Note that the Framework may finish
-     * a search before it has completed.  This routine is
-     * optional; if unimplemented, it merely won't be called.
-     */
-    void(PR_CALLBACK *Final)(
-        NSSCKMDFindObjects *mdFindObjects,
-        NSSCKFWFindObjects *fwFindObjects,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine is used to obtain another pointer to an
-     * object matching the search criteria.  This routine is
-     * required.  If no (more) objects match the search, it
-     * should return NULL and set the error to CKR_OK.
-     */
-    NSSCKMDObject *(PR_CALLBACK *Next)(
-        NSSCKMDFindObjects *mdFindObjects,
-        NSSCKFWFindObjects *fwFindObjects,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSArena *arena,
-        CK_RV *pError);
-
-    /*
-     * This object may be extended in future versions of the
-     * NSS Cryptoki Framework.  To allow for some flexibility
-     * in the area of binary compatibility, this field should
-     * be NULL.
-     */
-    void *null;
-};
-
-/*
- * NSSCKMDCryptoOperaion
- *
- * This is the basic handle for an encryption, decryption,
- * sign, verify, or hash opertion.
- * created by NSSCKMDMechanism->XXXXInit, and may be
- * obtained from the Framework's corresponding object.
- * It contains a pointer for use by the Module, to store
- * any intermediate data, and it contains the EPV for a
- * set of routines which the Module may implement for use
- * by the Framework.  Some of these routines are optional.
- */
-
-struct NSSCKMDCryptoOperationStr {
-    /*
-     * The Module may use this pointer for its own purposes.
-     */
-    void *etc;
-
-    /*
-     * This routine is called by the Framework clean up the mdCryptoOperation
-     * structure.
-     * This routine is optional; if unimplemented, it will be ignored.
-     */
-    void(PR_CALLBACK *Destroy)(
-        NSSCKMDCryptoOperation *mdCryptoOperation,
-        NSSCKFWCryptoOperation *fwCryptoOperation,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * how many bytes do we need to finish this buffer?
-     * must be implemented if Final is implemented.
-     */
-    CK_ULONG(PR_CALLBACK *GetFinalLength)
-    (
-        NSSCKMDCryptoOperation *mdCryptoOperation,
-        NSSCKFWCryptoOperation *fwCryptoOperation,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * how many bytes do we need to complete the next operation.
-     * used in both Update and UpdateFinal.
-     */
-    CK_ULONG(PR_CALLBACK *GetOperationLength)
-    (
-        NSSCKMDCryptoOperation *mdCryptoOperation,
-        NSSCKFWCryptoOperation *fwCryptoOperation,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        const NSSItem *inputBuffer,
-        CK_RV *pError);
-
-    /*
-     * This routine is called by the Framework to finish a
-     * search operation.  Note that the Framework may finish
-     * a search before it has completed.  This routine is
-     * optional; if unimplemented, it merely won't be called.
-     * The respective final call with fail with CKR_FUNCTION_FAILED
-     * Final should not free the mdCryptoOperation.
-     */
-    CK_RV(PR_CALLBACK *Final)
-    (
-        NSSCKMDCryptoOperation *mdCryptoOperation,
-        NSSCKFWCryptoOperation *fwCryptoOperation,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSItem *outputBuffer);
-
-    /*
-     * This routine is called by the Framework to complete the
-     * next step in an encryption/decryption operation.
-     * This routine is optional; if unimplemented, the respective
-     * update call with fail with CKR_FUNCTION_FAILED.
-     * Update should not be implemented for signing/verification/digest
-     * mechanisms.
-     */
-    CK_RV(PR_CALLBACK *Update)
-    (
-        NSSCKMDCryptoOperation *mdCryptoOperation,
-        NSSCKFWCryptoOperation *fwCryptoOperation,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        const NSSItem *inputBuffer,
-        NSSItem *outputBuffer);
-
-    /*
-     * This routine is called by the Framework to complete the
-     * next step in a signing/verification/digest operation.
-     * This routine is optional; if unimplemented, the respective
-     * update call with fail with CKR_FUNCTION_FAILED
-     * Update should not be implemented for encryption/decryption
-     * mechanisms.
-     */
-    CK_RV(PR_CALLBACK *DigestUpdate)
-    (
-        NSSCKMDCryptoOperation *mdCryptoOperation,
-        NSSCKFWCryptoOperation *fwCryptoOperation,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        const NSSItem *inputBuffer);
-
-    /*
-     * This routine is called by the Framework to complete a
-     * single step operation. This routine is optional; if unimplemented,
-     * the framework will use the Update and Final functions to complete
-     * the operation.
-     */
-    CK_RV(PR_CALLBACK *UpdateFinal)
-    (
-        NSSCKMDCryptoOperation *mdCryptoOperation,
-        NSSCKFWCryptoOperation *fwCryptoOperation,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        const NSSItem *inputBuffer,
-        NSSItem *outputBuffer);
-
-    /*
-     * This routine is called by the Framework to complete next
-     * step in a combined operation. The Decrypt/Encrypt mechanism
-     * should define and drive the combo step.
-     * This routine is optional; if unimplemented,
-     * the framework will use the appropriate Update functions to complete
-     * the operation.
-     */
-    CK_RV(PR_CALLBACK *UpdateCombo)
-    (
-        NSSCKMDCryptoOperation *mdCryptoOperation,
-        NSSCKFWCryptoOperation *fwCryptoOperation,
-        NSSCKMDCryptoOperation *mdPeerCryptoOperation,
-        NSSCKFWCryptoOperation *fwPeerCryptoOperation,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        const NSSItem *inputBuffer,
-        NSSItem *outputBuffer);
-
-    /*
-     * Hash a key directly into the digest
-     */
-    CK_RV(PR_CALLBACK *DigestKey)
-    (
-        NSSCKMDCryptoOperation *mdCryptoOperation,
-        NSSCKFWCryptoOperation *fwCryptoOperation,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdKey,
-        NSSCKFWObject *fwKey);
-
-    /*
-     * This object may be extended in future versions of the
-     * NSS Cryptoki Framework.  To allow for some flexibility
-     * in the area of binary compatibility, this field should
-     * be NULL.
-     */
-    void *null;
-};
-
-/*
- * NSSCKMDMechanism
- *
- */
-
-struct NSSCKMDMechanismStr {
-    /*
-     * The Module may use this pointer for its own purposes.
-     */
-    void *etc;
-
-    /*
-     * This also frees the fwMechanism if appropriate.
-     * If it is not supplied, the Framework will assume that the Token
-     * Manages a static list of mechanisms and the function will not be called.
-     */
-    void(PR_CALLBACK *Destroy)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the minimum key size allowed for
-     * this mechanism.  This routine is optional; if unimplemented,
-     * zero will be assumed.  This routine may return zero on
-     * error; if the error is CKR_OK, zero will be accepted as
-     * a valid response.
-     */
-    CK_ULONG(PR_CALLBACK *GetMinKeySize)
-    (
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine returns the maximum key size allowed for
-     * this mechanism.  This routine is optional; if unimplemented,
-     * zero will be assumed.  This routine may return zero on
-     * error; if the error is CKR_OK, zero will be accepted as
-     * a valid response.
-     */
-    CK_ULONG(PR_CALLBACK *GetMaxKeySize)
-    (
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine is called to determine if the mechanism is
-     * implemented in hardware or software.  It returns CK_TRUE
-     * if it is done in hardware.
-     */
-    CK_BBOOL(PR_CALLBACK *GetInHardware)
-    (
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * The crypto routines themselves.  Most crypto operations may
-     * be performed in two ways, streaming and single-part.  The
-     * streaming operations involve the use of (typically) three
-     * calls-- an Init method to set up the operation, an Update
-     * method to feed data to the operation, and a Final method to
-     * obtain the final result.  Single-part operations involve
-     * one method, to perform the crypto operation all at once.
-     *
-     * The NSS Cryptoki Framework can implement the single-part
-     * operations in terms of the streaming operations on behalf
-     * of the Module.  There are a few variances.
-     *
-     * Only the Init Functions are defined by the mechanism. Each
-     * init function will return a NSSCKFWCryptoOperation which
-     * can supply update, final, the single part updateFinal, and
-     * the combo updateCombo functions.
-     *
-     * For simplicity, the routines are listed in summary here:
-     *
-     *  EncryptInit,
-     *  DecryptInit,
-     *  DigestInit,
-     *  SignInit,
-     *  SignRecoverInit;
-     *  VerifyInit,
-     *  VerifyRecoverInit;
-     *
-     * The key-management routines are
-     *
-     *  GenerateKey
-     *  GenerateKeyPair
-     *  WrapKey
-     *  UnwrapKey
-     *  DeriveKey
-     *
-     * All of these routines based on the Cryptoki API;
-     * see PKCS#11 for further information.
-     */
-
-    /*
-     */
-    NSSCKMDCryptoOperation *(PR_CALLBACK *EncryptInit)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdKey,
-        NSSCKFWObject *fwKey,
-        CK_RV *pError);
-
-    /*
-     */
-    NSSCKMDCryptoOperation *(PR_CALLBACK *DecryptInit)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdKey,
-        NSSCKFWObject *fwKey,
-        CK_RV *pError);
-
-    /*
-     */
-    NSSCKMDCryptoOperation *(PR_CALLBACK *DigestInit)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     */
-    NSSCKMDCryptoOperation *(PR_CALLBACK *SignInit)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdKey,
-        NSSCKFWObject *fwKey,
-        CK_RV *pError);
-
-    /*
-     */
-    NSSCKMDCryptoOperation *(PR_CALLBACK *VerifyInit)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdKey,
-        NSSCKFWObject *fwKey,
-        CK_RV *pError);
-
-    /*
-     */
-    NSSCKMDCryptoOperation *(PR_CALLBACK *SignRecoverInit)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdKey,
-        NSSCKFWObject *fwKey,
-        CK_RV *pError);
-
-    /*
-     */
-    NSSCKMDCryptoOperation *(PR_CALLBACK *VerifyRecoverInit)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdKey,
-        NSSCKFWObject *fwKey,
-        CK_RV *pError);
-
-    /*
-     * Key management operations.
-     */
-
-    /*
-     * This routine generates a key.  This routine may return NULL
-     * upon error.
-     */
-    NSSCKMDObject *(PR_CALLBACK *GenerateKey)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_ATTRIBUTE_PTR pTemplate,
-        CK_ULONG ulAttributeCount,
-        CK_RV *pError);
-
-    /*
-     * This routine generates a key pair.
-     */
-    CK_RV(PR_CALLBACK *GenerateKeyPair)
-    (
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_ATTRIBUTE_PTR pPublicKeyTemplate,
-        CK_ULONG ulPublicKeyAttributeCount,
-        CK_ATTRIBUTE_PTR pPrivateKeyTemplate,
-        CK_ULONG ulPrivateKeyAttributeCount,
-        NSSCKMDObject **pPublicKey,
-        NSSCKMDObject **pPrivateKey);
-
-    /*
-     * This routine wraps a key.
-     */
-    CK_ULONG(PR_CALLBACK *GetWrapKeyLength)
-    (
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdWrappingKey,
-        NSSCKFWObject *fwWrappingKey,
-        NSSCKMDObject *mdWrappedKey,
-        NSSCKFWObject *fwWrappedKey,
-        CK_RV *pError);
-
-    /*
-     * This routine wraps a key.
-     */
-    CK_RV(PR_CALLBACK *WrapKey)
-    (
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdWrappingKey,
-        NSSCKFWObject *fwWrappingKey,
-        NSSCKMDObject *mdKeyObject,
-        NSSCKFWObject *fwKeyObject,
-        NSSItem *wrappedKey);
-
-    /*
-     * This routine unwraps a key.  This routine may return NULL
-     * upon error.
-     */
-    NSSCKMDObject *(PR_CALLBACK *UnwrapKey)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdWrappingKey,
-        NSSCKFWObject *fwWrappingKey,
-        NSSItem *wrappedKey,
-        CK_ATTRIBUTE_PTR pTemplate,
-        CK_ULONG ulAttributeCount,
-        CK_RV *pError);
-
-    /*
-     * This routine derives a key.  This routine may return NULL
-     * upon error.
-     */
-    NSSCKMDObject *(PR_CALLBACK *DeriveKey)(
-        NSSCKMDMechanism *mdMechanism,
-        NSSCKFWMechanism *fwMechanism,
-        CK_MECHANISM_PTR pMechanism,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        NSSCKMDObject *mdBaseKey,
-        NSSCKFWObject *fwBaseKey,
-        CK_ATTRIBUTE_PTR pTemplate,
-        CK_ULONG ulAttributeCount,
-        CK_RV *pError);
-
-    /*
-     * This object may be extended in future versions of the
-     * NSS Cryptoki Framework.  To allow for some flexibility
-     * in the area of binary compatibility, this field should
-     * be NULL.
-     */
-    void *null;
-};
-
-/*
- * NSSCKMDObject
- *
- * This is the basic handle for any object used by a PKCS#11 Module.
- * Modules must implement it if they support their own objects, and
- * the Framework supports it for Modules that do not handle session
- * objects.  This type contains a pointer for use by the implementor,
- * to store any object-specific data, and it contains an EPV for a
- * set of routines used to access the object.
- */
-
-struct NSSCKMDObjectStr {
-    /*
-     * The implementation my use this pointer for its own purposes.
-     */
-    void *etc;
-
-    /*
-     * This routine is called by the Framework when it is letting
-     * go of an object handle.  It can be used by the Module to
-     * free any resources tied up by an object "in use."  It is
-     * optional.
-     */
-    void(PR_CALLBACK *Finalize)(
-        NSSCKMDObject *mdObject,
-        NSSCKFWObject *fwObject,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine is used to completely destroy an object.
-     * It is optional.  The parameter fwObject might be NULL
-     * if the framework runs out of memory at the wrong moment.
-     */
-    CK_RV(PR_CALLBACK *Destroy)
-    (
-        NSSCKMDObject *mdObject,
-        NSSCKFWObject *fwObject,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This helper routine is used by the Framework, and is especially
-     * useful when it is managing session objects on behalf of the
-     * Module.  This routine is optional; if unimplemented, the
-     * Framework will actually look up the CKA_TOKEN attribute.  In the
-     * event of an error, just make something up-- the Framework will
-     * find out soon enough anyway.
-     */
-    CK_BBOOL(PR_CALLBACK *IsTokenObject)
-    (
-        NSSCKMDObject *mdObject,
-        NSSCKFWObject *fwObject,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance);
-
-    /*
-     * This routine returns the number of attributes of which this
-     * object consists.  It is mandatory.  It can return zero on
-     * error.
-     */
-    CK_ULONG(PR_CALLBACK *GetAttributeCount)
-    (
-        NSSCKMDObject *mdObject,
-        NSSCKFWObject *fwObject,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This routine stuffs the attribute types into the provided array.
-     * The array size (as obtained from GetAttributeCount) is passed in
-     * as a check; return CKR_BUFFER_TOO_SMALL if the count is wrong
-     * (either too big or too small).
-     */
-    CK_RV(PR_CALLBACK *GetAttributeTypes)
-    (
-        NSSCKMDObject *mdObject,
-        NSSCKFWObject *fwObject,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_ATTRIBUTE_TYPE_PTR typeArray,
-        CK_ULONG ulCount);
-
-    /*
-     * This routine returns the size (in bytes) of the specified
-     * attribute.  It can return zero on error.
-     */
-    CK_ULONG(PR_CALLBACK *GetAttributeSize)
-    (
-        NSSCKMDObject *mdObject,
-        NSSCKFWObject *fwObject,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_ATTRIBUTE_TYPE attribute,
-        CK_RV *pError);
-
-    /*
-     * This routine returns an NSSCKFWItem structure.
-     * The item pointer points to an NSSItem containing the attribute value.
-     * The needsFreeing bit tells the framework whether to call the
-     * FreeAttribute function . Upon error, an NSSCKFWItem structure
-     * with a NULL NSSItem item pointer will be returned
-     */
-    NSSCKFWItem(PR_CALLBACK *GetAttribute)(
-        NSSCKMDObject *mdObject,
-        NSSCKFWObject *fwObject,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_ATTRIBUTE_TYPE attribute,
-        CK_RV *pError);
-
-    /*
-     * This routine returns CKR_OK if the attribute could be freed.
-     */
-    CK_RV(PR_CALLBACK *FreeAttribute)
-    (
-        NSSCKFWItem *item);
-
-    /*
-     * This routine changes the specified attribute.  If unimplemented,
-     * the object will be considered read-only.
-     */
-    CK_RV(PR_CALLBACK *SetAttribute)
-    (
-        NSSCKMDObject *mdObject,
-        NSSCKFWObject *fwObject,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_ATTRIBUTE_TYPE attribute,
-        NSSItem *value);
-
-    /*
-     * This routine returns the storage requirements of this object,
-     * in bytes.  Cryptoki doesn't strictly define the definition,
-     * but it should relate to the values returned by the "Get Memory"
-     * routines of the NSSCKMDToken.  This routine is optional; if
-     * unimplemented, the Framework will consider this information
-     * sensitive.  This routine may return zero on error.  If the
-     * specified error is CKR_OK, zero will be accepted as a valid
-     * response.
-     */
-    CK_ULONG(PR_CALLBACK *GetObjectSize)
-    (
-        NSSCKMDObject *mdObject,
-        NSSCKFWObject *fwObject,
-        NSSCKMDSession *mdSession,
-        NSSCKFWSession *fwSession,
-        NSSCKMDToken *mdToken,
-        NSSCKFWToken *fwToken,
-        NSSCKMDInstance *mdInstance,
-        NSSCKFWInstance *fwInstance,
-        CK_RV *pError);
-
-    /*
-     * This object may be extended in future versions of the
-     * NSS Cryptoki Framework.  To allow for some flexibility
-     * in the area of binary compatibility, this field should
-     * be NULL.
-     */
-    void *null;
-};
-
-#endif /* NSSCKMDT_H */
diff --git a/openflow/usr/include/nss/nssckt.h b/openflow/usr/include/nss/nssckt.h
deleted file mode 100644
index b50a88f..0000000
--- a/openflow/usr/include/nss/nssckt.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _NSSCKT_H_
-#define _NSSCKT_H_ 1
-
-#include "pkcs11t.h"
-
-typedef CK_ATTRIBUTE_TYPE CK_PTR CK_ATTRIBUTE_TYPE_PTR;
-#define CK_ENTRY
-
-#endif /* _NSSCKT_H_ */
diff --git a/openflow/usr/include/nss/nssilckt.h b/openflow/usr/include/nss/nssilckt.h
deleted file mode 100644
index 417f96f..0000000
--- a/openflow/usr/include/nss/nssilckt.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** nssilock.h - Instrumented locking functions for NSS
-**
-** Description:
-**    nssilock provides instrumentation for locks and monitors in
-**    the NSS libraries. The instrumentation, when enabled, causes
-**    each call to the instrumented function to record data about
-**    the call to an external file. The external file
-**    subsequently used to extract performance data and other
-**    statistical information about the operation of locks used in
-**    the nss library.
-**
-**    To enable compilation with instrumentation, build NSS with
-**    the compile time switch NEED_NSS_ILOCK defined.
-**
-**    say:  "gmake OS_CFLAGS+=-DNEED_NSS_ILOCK" at make time.
-**
-**    At runtime, to enable recording from nssilock, one or more
-**    environment variables must be set. For each nssILockType to
-**    be recorded, an environment variable of the form NSS_ILOCK_x
-**    must be set to 1. For example:
-**
-**       set NSS_ILOCK_Cert=1
-**
-**    nssilock uses PRLOG is used to record to trace data. The
-**    PRLogModule name associated with nssilock data is: "nssilock".
-**    To enable recording of nssilock data you will need to set the
-**    environment variable NSPR_LOG_MODULES to enable
-**    recording for the nssilock log module. Similarly, you will
-**    need to set the environment variable NSPR_LOG_FILE to specify
-**    the filename to receive the recorded data. See prlog.h for usage.
-**    Example:
-**
-**        export NSPR_LOG_MODULES=nssilock:6
-**        export NSPR_LOG_FILE=xxxLogfile
-**
-** Operation:
-**    nssilock wraps calls to NSPR's PZLock and PZMonitor functions
-**    with similarly named functions: PZ_NewLock(), etc. When NSS is
-**    built with lock instrumentation enabled, the PZ* functions are
-**    compiled into NSS; when lock instrumentation is disabled,
-**    calls to PZ* functions are directly mapped to PR* functions
-**    and the instrumentation arguments to the PZ* functions are
-**    compiled away.
-**
-**
-** File Format:
-**    The format of the external file is implementation
-**    dependent. Where NSPR's PR_LOG() function is used, the file
-**    contains data defined for PR_LOG() plus the data written by
-**    the wrapped function. On some platforms and under some
-**    circumstances, platform dependent logging or
-**    instrumentation probes may be used. In any case, the
-**    relevant data provided by the lock instrumentation is:
-**
-**      lockType, func, address, duration, line, file [heldTime]
-**
-**    where:
-**
-**       lockType: a character representation of nssILockType for the
-**       call. e.g. ... "cert"
-**
-**       func: the function doing the tracing. e.g. "NewLock"
-**
-**       address: address of the instrumented lock or monitor
-**
-**       duration: is how long was spent in the instrumented function,
-**       in PRIntervalTime "ticks".
-**
-**       line: the line number within the calling function
-**
-**       file: the file from which the call was made
-**
-**       heldTime: how long the lock/monitor was held. field
-**       present only for PZ_Unlock() and PZ_ExitMonitor().
-**
-** Design Notes:
-**    The design for lock instrumentation was influenced by the
-**    need to gather performance data on NSS 3.x. It is intended
-**    that the effort to modify NSS to use lock instrumentation
-**    be minimized. Existing calls to locking functions need only
-**    have their names changed to the instrumentation function
-**    names.
-**
-** Private NSS Interface:
-**    nssilock.h defines a private interface for use by NSS.
-**    nssilock.h is experimental in nature and is subject to
-**    change or revocation without notice. ... Don't mess with
-**    it.
-**
-*/
-
-/*
- * $Id:
- */
-
-#ifndef _NSSILCKT_H_
-#define _NSSILCKT_H_
-
-#include "utilrename.h"
-#include "prtypes.h"
-#include "prmon.h"
-#include "prlock.h"
-#include "prcvar.h"
-
-typedef enum {
-    nssILockArena = 0,
-    nssILockSession = 1,
-    nssILockObject = 2,
-    nssILockRefLock = 3,
-    nssILockCert = 4,
-    nssILockCertDB = 5,
-    nssILockDBM = 6,
-    nssILockCache = 7,
-    nssILockSSL = 8,
-    nssILockList = 9,
-    nssILockSlot = 10,
-    nssILockFreelist = 11,
-    nssILockOID = 12,
-    nssILockAttribute = 13,
-    nssILockPK11cxt = 14, /* pk11context */
-    nssILockRWLock = 15,
-    nssILockOther = 16,
-    nssILockSelfServ = 17,
-    nssILockKeyDB = 18,
-    nssILockLast /* don't use this one! */
-} nssILockType;
-
-/*
-** conditionally compile in nssilock features
-*/
-#if defined(NEED_NSS_ILOCK)
-
-/*
-** Declare operation type enumerator
-** enumerations identify the function being performed
-*/
-typedef enum {
-    FlushTT = 0,
-    NewLock = 1,
-    Lock = 2,
-    Unlock = 3,
-    DestroyLock = 4,
-    NewCondVar = 5,
-    WaitCondVar = 6,
-    NotifyCondVar = 7,
-    NotifyAllCondVar = 8,
-    DestroyCondVar = 9,
-    NewMonitor = 10,
-    EnterMonitor = 11,
-    ExitMonitor = 12,
-    Notify = 13,
-    NotifyAll = 14,
-    Wait = 15,
-    DestroyMonitor = 16
-} nssILockOp;
-
-/*
-** Declare the trace record
-*/
-struct pzTrace_s {
-    PRUint32 threadID;       /* PR_GetThreadID() */
-    nssILockOp op;           /* operation being performed */
-    nssILockType ltype;      /* lock type identifier */
-    PRIntervalTime callTime; /* time spent in function */
-    PRIntervalTime heldTime; /* lock held time, or -1 */
-    void *lock;              /* address of lock structure */
-    PRIntn line;             /* line number */
-    char file[24];           /* filename */
-};
-
-/*
-** declare opaque types. See: nssilock.c
-*/
-typedef struct pzlock_s PZLock;
-typedef struct pzcondvar_s PZCondVar;
-typedef struct pzmonitor_s PZMonitor;
-
-#else /* NEED_NSS_ILOCK */
-
-#define PZLock PRLock
-#define PZCondVar PRCondVar
-#define PZMonitor PRMonitor
-
-#endif /* NEED_NSS_ILOCK */
-
-#endif /* _NSSILCKT_H_ */
diff --git a/openflow/usr/include/nss/nssilock.h b/openflow/usr/include/nss/nssilock.h
deleted file mode 100644
index 01f666a..0000000
--- a/openflow/usr/include/nss/nssilock.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** nssilock.h - Instrumented locking functions for NSS
-**
-** Description:
-**    nssilock provides instrumentation for locks and monitors in
-**    the NSS libraries. The instrumentation, when enabled, causes
-**    each call to the instrumented function to record data about
-**    the call to an external file. The external file
-**    subsequently used to extract performance data and other
-**    statistical information about the operation of locks used in
-**    the nss library.
-**
-**    To enable compilation with instrumentation, build NSS with
-**    the compile time switch NEED_NSS_ILOCK defined.
-**
-**    say:  "gmake OS_CFLAGS+=-DNEED_NSS_ILOCK" at make time.
-**
-**    At runtime, to enable recording from nssilock, one or more
-**    environment variables must be set. For each nssILockType to
-**    be recorded, an environment variable of the form NSS_ILOCK_x
-**    must be set to 1. For example:
-**
-**       set NSS_ILOCK_Cert=1
-**
-**    nssilock uses PRLOG is used to record to trace data. The
-**    PRLogModule name associated with nssilock data is: "nssilock".
-**    To enable recording of nssilock data you will need to set the
-**    environment variable NSPR_LOG_MODULES to enable
-**    recording for the nssilock log module. Similarly, you will
-**    need to set the environment variable NSPR_LOG_FILE to specify
-**    the filename to receive the recorded data. See prlog.h for usage.
-**    Example:
-**
-**        export NSPR_LOG_MODULES=nssilock:6
-**        export NSPR_LOG_FILE=xxxLogfile
-**
-** Operation:
-**    nssilock wraps calls to NSPR's PZLock and PZMonitor functions
-**    with similarly named functions: PZ_NewLock(), etc. When NSS is
-**    built with lock instrumentation enabled, the PZ* functions are
-**    compiled into NSS; when lock instrumentation is disabled,
-**    calls to PZ* functions are directly mapped to PR* functions
-**    and the instrumentation arguments to the PZ* functions are
-**    compiled away.
-**
-**
-** File Format:
-**    The format of the external file is implementation
-**    dependent. Where NSPR's PR_LOG() function is used, the file
-**    contains data defined for PR_LOG() plus the data written by
-**    the wrapped function. On some platforms and under some
-**    circumstances, platform dependent logging or
-**    instrumentation probes may be used. In any case, the
-**    relevant data provided by the lock instrumentation is:
-**
-**      lockType, func, address, duration, line, file [heldTime]
-**
-**    where:
-**
-**       lockType: a character representation of nssILockType for the
-**       call. e.g. ... "cert"
-**
-**       func: the function doing the tracing. e.g. "NewLock"
-**
-**       address: address of the instrumented lock or monitor
-**
-**       duration: is how long was spent in the instrumented function,
-**       in PRIntervalTime "ticks".
-**
-**       line: the line number within the calling function
-**
-**       file: the file from which the call was made
-**
-**       heldTime: how long the lock/monitor was held. field
-**       present only for PZ_Unlock() and PZ_ExitMonitor().
-**
-** Design Notes:
-**    The design for lock instrumentation was influenced by the
-**    need to gather performance data on NSS 3.x. It is intended
-**    that the effort to modify NSS to use lock instrumentation
-**    be minimized. Existing calls to locking functions need only
-**    have their names changed to the instrumentation function
-**    names.
-**
-** Private NSS Interface:
-**    nssilock.h defines a private interface for use by NSS.
-**    nssilock.h is experimental in nature and is subject to
-**    change or revocation without notice. ... Don't mess with
-**    it.
-**
-*/
-
-/*
- * $Id:
- */
-
-#ifndef _NSSILOCK_H_
-#define _NSSILOCK_H_
-
-#include "utilrename.h"
-#include "prtypes.h"
-#include "prmon.h"
-#include "prlock.h"
-#include "prcvar.h"
-
-#include "nssilckt.h"
-
-PR_BEGIN_EXTERN_C
-
-#if defined(NEED_NSS_ILOCK)
-
-#define PZ_NewLock(t) pz_NewLock((t), __FILE__, __LINE__)
-extern PZLock *
-pz_NewLock(
-    nssILockType ltype,
-    char *file,
-    PRIntn line);
-
-#define PZ_Lock(k) pz_Lock((k), __FILE__, __LINE__)
-extern void
-pz_Lock(
-    PZLock *lock,
-    char *file,
-    PRIntn line);
-
-#define PZ_Unlock(k) pz_Unlock((k), __FILE__, __LINE__)
-extern PRStatus
-pz_Unlock(
-    PZLock *lock,
-    char *file,
-    PRIntn line);
-
-#define PZ_DestroyLock(k) pz_DestroyLock((k), __FILE__, __LINE__)
-extern void
-pz_DestroyLock(
-    PZLock *lock,
-    char *file,
-    PRIntn line);
-
-#define PZ_NewCondVar(l) pz_NewCondVar((l), __FILE__, __LINE__)
-extern PZCondVar *
-pz_NewCondVar(
-    PZLock *lock,
-    char *file,
-    PRIntn line);
-
-#define PZ_DestroyCondVar(v) pz_DestroyCondVar((v), __FILE__, __LINE__)
-extern void
-pz_DestroyCondVar(
-    PZCondVar *cvar,
-    char *file,
-    PRIntn line);
-
-#define PZ_WaitCondVar(v, t) pz_WaitCondVar((v), (t), __FILE__, __LINE__)
-extern PRStatus
-pz_WaitCondVar(
-    PZCondVar *cvar,
-    PRIntervalTime timeout,
-    char *file,
-    PRIntn line);
-
-#define PZ_NotifyCondVar(v) pz_NotifyCondVar((v), __FILE__, __LINE__)
-extern PRStatus
-pz_NotifyCondVar(
-    PZCondVar *cvar,
-    char *file,
-    PRIntn line);
-
-#define PZ_NotifyAllCondVar(v) pz_NotifyAllCondVar((v), __FILE__, __LINE__)
-extern PRStatus
-pz_NotifyAllCondVar(
-    PZCondVar *cvar,
-    char *file,
-    PRIntn line);
-
-#define PZ_NewMonitor(t) pz_NewMonitor((t), __FILE__, __LINE__)
-extern PZMonitor *
-pz_NewMonitor(
-    nssILockType ltype,
-    char *file,
-    PRIntn line);
-
-#define PZ_DestroyMonitor(m) pz_DestroyMonitor((m), __FILE__, __LINE__)
-extern void
-pz_DestroyMonitor(
-    PZMonitor *mon,
-    char *file,
-    PRIntn line);
-
-#define PZ_EnterMonitor(m) pz_EnterMonitor((m), __FILE__, __LINE__)
-extern void
-pz_EnterMonitor(
-    PZMonitor *mon,
-    char *file,
-    PRIntn line);
-
-#define PZ_ExitMonitor(m) pz_ExitMonitor((m), __FILE__, __LINE__)
-extern PRStatus
-pz_ExitMonitor(
-    PZMonitor *mon,
-    char *file,
-    PRIntn line);
-
-#define PZ_InMonitor(m) (PZ_GetMonitorEntryCount(m) > 0)
-#define PZ_GetMonitorEntryCount(m) pz_GetMonitorEntryCount((m), __FILE__, __LINE__)
-extern PRIntn
-pz_GetMonitorEntryCount(
-    PZMonitor *mon,
-    char *file,
-    PRIntn line);
-
-#define PZ_Wait(m, i) pz_Wait((m), ((i)), __FILE__, __LINE__)
-extern PRStatus
-pz_Wait(
-    PZMonitor *mon,
-    PRIntervalTime ticks,
-    char *file,
-    PRIntn line);
-
-#define PZ_Notify(m) pz_Notify((m), __FILE__, __LINE__)
-extern PRStatus
-pz_Notify(
-    PZMonitor *mon,
-    char *file,
-    PRIntn line);
-
-#define PZ_NotifyAll(m) pz_NotifyAll((m), __FILE__, __LINE__)
-extern PRStatus
-pz_NotifyAll(
-    PZMonitor *mon,
-    char *file,
-    PRIntn line);
-
-#define PZ_TraceFlush() pz_TraceFlush()
-extern void pz_TraceFlush(void);
-
-#else /* NEED_NSS_ILOCK */
-
-#define PZ_NewLock(t) PR_NewLock()
-#define PZ_DestroyLock(k) PR_DestroyLock((k))
-#define PZ_Lock(k) PR_Lock((k))
-#define PZ_Unlock(k) PR_Unlock((k))
-
-#define PZ_NewCondVar(l) PR_NewCondVar((l))
-#define PZ_DestroyCondVar(v) PR_DestroyCondVar((v))
-#define PZ_WaitCondVar(v, t) PR_WaitCondVar((v), (t))
-#define PZ_NotifyCondVar(v) PR_NotifyCondVar((v))
-#define PZ_NotifyAllCondVar(v) PR_NotifyAllCondVar((v))
-
-#define PZ_NewMonitor(t) PR_NewMonitor()
-#define PZ_DestroyMonitor(m) PR_DestroyMonitor((m))
-#define PZ_EnterMonitor(m) PR_EnterMonitor((m))
-#define PZ_ExitMonitor(m) PR_ExitMonitor((m))
-#define PZ_InMonitor(m) PR_InMonitor((m))
-#define PZ_Wait(m, t) PR_Wait(((m)), ((t)))
-#define PZ_Notify(m) PR_Notify((m))
-#define PZ_NotifyAll(m) PR_Notify((m))
-#define PZ_TraceFlush() /* nothing */
-
-#endif /* NEED_NSS_ILOCK */
-
-PR_END_EXTERN_C
-#endif /* _NSSILOCK_H_ */
diff --git a/openflow/usr/include/nss/nsslocks.h b/openflow/usr/include/nss/nsslocks.h
deleted file mode 100644
index 6098f56..0000000
--- a/openflow/usr/include/nss/nsslocks.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * nsslocks.h - threadsafe functions to initialize lock pointers.
- *
- * NOTE - The interfaces formerly in this header were private and are now all
- *        obsolete.
- */
diff --git a/openflow/usr/include/nss/nsslowhash.h b/openflow/usr/include/nss/nsslowhash.h
deleted file mode 100644
index d8f0587..0000000
--- a/openflow/usr/include/nss/nsslowhash.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Provide FIPS validated hashing for applications that only need hashing.
- * NOTE: mac'ing requires keys and will not work in this interface.
- * Also NOTE: this only works with Hashing. Only the FIPS interface is enabled.
- */
-
-#ifndef _NSSLOWHASH_H_
-#define _NSSLOWHASH_H_
-
-typedef struct NSSLOWInitContextStr NSSLOWInitContext;
-typedef struct NSSLOWHASHContextStr NSSLOWHASHContext;
-
-NSSLOWInitContext *NSSLOW_Init(void);
-void NSSLOW_Shutdown(NSSLOWInitContext *context);
-void NSSLOW_Reset(NSSLOWInitContext *context);
-NSSLOWHASHContext *NSSLOWHASH_NewContext(
-    NSSLOWInitContext *initContext,
-    HASH_HashType hashType);
-void NSSLOWHASH_Begin(NSSLOWHASHContext *context);
-void NSSLOWHASH_Update(NSSLOWHASHContext *context,
-                       const unsigned char *buf,
-                       unsigned int len);
-void NSSLOWHASH_End(NSSLOWHASHContext *context,
-                    unsigned char *buf,
-                    unsigned int *ret, unsigned int len);
-void NSSLOWHASH_Destroy(NSSLOWHASHContext *context);
-unsigned int NSSLOWHASH_Length(NSSLOWHASHContext *context);
-
-#endif
diff --git a/openflow/usr/include/nss/nssrwlk.h b/openflow/usr/include/nss/nssrwlk.h
deleted file mode 100644
index 2ae6931..0000000
--- a/openflow/usr/include/nss/nssrwlk.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
-** File:        nsrwlock.h
-** Description: API to basic reader-writer lock functions of NSS.
-**  These are re-entrant reader writer locks; that is,
-**  If I hold the write lock, I can ask for it and get it again.
-**  If I hold the write lock, I can also ask for and get a read lock.
-**      I can then release the locks in any order (read or write).
-**  I must release each lock type as many times as I acquired it.
-**  Otherwise, these are normal reader/writer locks.
-**
-** For deadlock detection, locks should be ranked, and no lock may be aquired
-** while I hold a lock of higher rank number.
-** If you don't want that feature, always use NSS_RWLOCK_RANK_NONE.
-** Lock name is for debugging, and is optional (may be NULL)
-**/
-
-#ifndef nssrwlk_h___
-#define nssrwlk_h___
-
-#include "utilrename.h"
-#include "prtypes.h"
-#include "nssrwlkt.h"
-
-#define NSS_RWLOCK_RANK_NONE 0
-
-/* SEC_BEGIN_PROTOS */
-PR_BEGIN_EXTERN_C
-
-/***********************************************************************
-** FUNCTION:    NSSRWLock_New
-** DESCRIPTION:
-**  Returns a pointer to a newly created reader-writer lock object.
-** INPUTS:      Lock rank
-**      Lock name
-** OUTPUTS:     void
-** RETURN:      NSSRWLock*
-**   If the lock cannot be created because of resource constraints, NULL
-**   is returned.
-**
-***********************************************************************/
-extern NSSRWLock *NSSRWLock_New(PRUint32 lock_rank, const char *lock_name);
-
-/***********************************************************************
-** FUNCTION:    NSSRWLock_AtomicCreate
-** DESCRIPTION:
-**  Given the address of a NULL pointer to a NSSRWLock,
-**  atomically initializes that pointer to a newly created NSSRWLock.
-**  Returns the value placed into that pointer, or NULL.
-**
-** INPUTS:      address of NSRWLock pointer
-**              Lock rank
-**      Lock name
-** OUTPUTS:     NSSRWLock*
-** RETURN:      NSSRWLock*
-**   If the lock cannot be created because of resource constraints,
-**   the pointer will be left NULL.
-**
-***********************************************************************/
-extern NSSRWLock *
-nssRWLock_AtomicCreate(NSSRWLock **prwlock,
-                       PRUint32 lock_rank,
-                       const char *lock_name);
-
-/***********************************************************************
-** FUNCTION:    NSSRWLock_Destroy
-** DESCRIPTION:
-**  Destroys a given RW lock object.
-** INPUTS:      NSSRWLock *lock - Lock to be freed.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-extern void NSSRWLock_Destroy(NSSRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    NSSRWLock_LockRead
-** DESCRIPTION:
-**  Apply a read lock (non-exclusive) on a RWLock
-** INPUTS:      NSSRWLock *lock - Lock to be read-locked.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-extern void NSSRWLock_LockRead(NSSRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    NSSRWLock_LockWrite
-** DESCRIPTION:
-**  Apply a write lock (exclusive) on a RWLock
-** INPUTS:      NSSRWLock *lock - Lock to write-locked.
-** OUTPUTS:     void
-** RETURN:      None
-***********************************************************************/
-extern void NSSRWLock_LockWrite(NSSRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    NSSRWLock_UnlockRead
-** DESCRIPTION:
-**  Release a Read lock. Unlocking an unlocked lock has undefined results.
-** INPUTS:      NSSRWLock *lock - Lock to unlocked.
-** OUTPUTS:     void
-** RETURN:      void
-***********************************************************************/
-extern void NSSRWLock_UnlockRead(NSSRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    NSSRWLock_UnlockWrite
-** DESCRIPTION:
-**  Release a Write lock. Unlocking an unlocked lock has undefined results.
-** INPUTS:      NSSRWLock *lock - Lock to unlocked.
-** OUTPUTS:     void
-** RETURN:      void
-***********************************************************************/
-extern void NSSRWLock_UnlockWrite(NSSRWLock *lock);
-
-/***********************************************************************
-** FUNCTION:    NSSRWLock_HaveWriteLock
-** DESCRIPTION:
-**  Tells caller whether the current thread holds the write lock, or not.
-** INPUTS:      NSSRWLock *lock - Lock to test.
-** OUTPUTS:     void
-** RETURN:      PRBool  PR_TRUE IFF the current thread holds the write lock.
-***********************************************************************/
-
-extern PRBool NSSRWLock_HaveWriteLock(NSSRWLock *rwlock);
-
-/* SEC_END_PROTOS */
-PR_END_EXTERN_C
-
-#endif /* nsrwlock_h___ */
diff --git a/openflow/usr/include/nss/nssrwlkt.h b/openflow/usr/include/nss/nssrwlkt.h
deleted file mode 100644
index 50a4112..0000000
--- a/openflow/usr/include/nss/nssrwlkt.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nssrwlkt_h___
-#define nssrwlkt_h___
-
-#include "utilrename.h"
-#include "nssilock.h"
-/*
- * NSSRWLock --
- *
- *  The reader writer lock, NSSRWLock, is an opaque object to the clients
- *  of NSS.  All routines operate on a pointer to this opaque entity.
- */
-
-typedef struct nssRWLockStr NSSRWLock;
-
-#endif /* nsrwlock_h___ */
diff --git a/openflow/usr/include/nss/nssutil.h b/openflow/usr/include/nss/nssutil.h
deleted file mode 100644
index a9fb6f1..0000000
--- a/openflow/usr/include/nss/nssutil.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * NSS utility functions
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __nssutil_h_
-#define __nssutil_h_
-
-#ifndef RC_INVOKED
-#include "seccomon.h"
-#endif
-
-/*
- * NSS utilities's major version, minor version, patch level, build number,
- * and whether this is a beta release.
- *
- * The format of the version string should be
- *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
- */
-#define NSSUTIL_VERSION "3.28.4"
-#define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 28
-#define NSSUTIL_VPATCH 4
-#define NSSUTIL_VBUILD 0
-#define NSSUTIL_BETA PR_FALSE
-
-SEC_BEGIN_PROTOS
-
-/*
- * Returns a const string of the UTIL library version.
- */
-extern const char *NSSUTIL_GetVersion(void);
-
-extern SECStatus
-NSS_InitializePRErrorTable(void);
-
-SEC_END_PROTOS
-
-#endif /* __nssutil_h_ */
diff --git a/openflow/usr/include/nss/ocsp.h b/openflow/usr/include/nss/ocsp.h
deleted file mode 100644
index ac9dd64..0000000
--- a/openflow/usr/include/nss/ocsp.h
+++ /dev/null
@@ -1,723 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Interface to the OCSP implementation.
- */
-
-#ifndef _OCSP_H_
-#define _OCSP_H_
-
-#include "plarena.h"
-#include "seccomon.h"
-#include "secoidt.h"
-#include "keyt.h"
-#include "certt.h"
-#include "ocspt.h"
-
-/************************************************************************/
-SEC_BEGIN_PROTOS
-
-/*
- * This function registers the HttpClient with whose functions the
- * HttpClientFcn structure has been populated as the default Http
- * client.
- *
- * The function table must be a global object.
- * The caller must ensure that NSS will be able to call
- * the registered functions for the lifetime of the process.
- */
-extern SECStatus
-SEC_RegisterDefaultHttpClient(const SEC_HttpClientFcn *fcnTable);
-
-/*
- * This function obtains the HttpClient which has been registered
- * by an earlier call to SEC_RegisterDefaultHttpClient.
- */
-extern const SEC_HttpClientFcn *
-SEC_GetRegisteredHttpClient(void);
-
-/*
- * Sets parameters that control NSS' internal OCSP cache.
- * maxCacheEntries, special varlues are:
- *   -1 disable cache
- *   0 unlimited cache entries
- * minimumSecondsToNextFetchAttempt:
- *   whenever an OCSP request was attempted or completed over the network,
- *   wait at least this number of seconds before trying to fetch again.
- * maximumSecondsToNextFetchAttempt:
- *   this is the maximum age of a cached response we allow, until we try
- *   to fetch an updated response, even if the OCSP responder expects
- *   that newer information update will not be available yet.
- */
-extern SECStatus
-CERT_OCSPCacheSettings(PRInt32 maxCacheEntries,
-                       PRUint32 minimumSecondsToNextFetchAttempt,
-                       PRUint32 maximumSecondsToNextFetchAttempt);
-
-/*
- * Set the desired behaviour on OCSP failures.
- * See definition of ocspFailureMode for allowed choices.
- */
-extern SECStatus
-CERT_SetOCSPFailureMode(SEC_OcspFailureMode ocspFailureMode);
-
-/*
- * Configure the maximum time NSS will wait for an OCSP response.
- */
-extern SECStatus
-CERT_SetOCSPTimeout(PRUint32 seconds);
-
-/*
- * Removes all items currently stored in the OCSP cache.
- */
-extern SECStatus
-CERT_ClearOCSPCache(void);
-
-/*
- * FUNCTION: CERT_EnableOCSPChecking
- *   Turns on OCSP checking for the given certificate database.
- * INPUTS:
- *   CERTCertDBHandle *handle
- *     Certificate database for which OCSP checking will be enabled.
- * RETURN:
- *   Returns SECFailure if an error occurred (likely only problem
- *   allocating memory); SECSuccess otherwise.
- */
-extern SECStatus
-CERT_EnableOCSPChecking(CERTCertDBHandle *handle);
-
-/*
- * FUNCTION: CERT_DisableOCSPChecking
- *   Turns off OCSP checking for the given certificate database.
- *   This routine disables OCSP checking.  Though it will return
- *   SECFailure if OCSP checking is not enabled, it is "safe" to
- *   call it that way and just ignore the return value, if it is
- *   easier to just call it than to "remember" whether it is enabled.
- * INPUTS:
- *   CERTCertDBHandle *handle
- *     Certificate database for which OCSP checking will be disabled.
- * RETURN:
- *   Returns SECFailure if an error occurred (usually means that OCSP
- *   checking was not enabled or status contexts were not initialized --
- *   error set will be SEC_ERROR_OCSP_NOT_ENABLED); SECSuccess otherwise.
- */
-extern SECStatus
-CERT_DisableOCSPChecking(CERTCertDBHandle *handle);
-
-/*
- * FUNCTION: CERT_SetOCSPDefaultResponder
- *   Specify the location and cert of the default responder.
- *   If OCSP checking is already enabled *and* use of a default responder
- *   is also already enabled, all OCSP checking from now on will go directly
- *   to the specified responder.  If OCSP checking is not enabled, or if
- *   it is but use of a default responder is not enabled, the information
- *   will be recorded and take effect whenever both are enabled.
- * INPUTS:
- *   CERTCertDBHandle *handle
- *     Cert database on which OCSP checking should use the default responder.
- *   const char *url
- *     The location of the default responder (e.g. "http://foo.com:80/ocsp")
- *     Note that the location will not be tested until the first attempt
- *     to send a request there.
- *   const char *name
- *     The nickname of the cert to trust (expected) to sign the OCSP responses.
- *     If the corresponding cert cannot be found, SECFailure is returned.
- * RETURN:
- *   Returns SECFailure if an error occurred; SECSuccess otherwise.
- *   The most likely error is that the cert for "name" could not be found
- *   (probably SEC_ERROR_UNKNOWN_CERT).  Other errors are low-level (no memory,
- *   bad database, etc.).
- */
-extern SECStatus
-CERT_SetOCSPDefaultResponder(CERTCertDBHandle *handle,
-                             const char *url, const char *name);
-
-/*
- * FUNCTION: CERT_EnableOCSPDefaultResponder
- *   Turns on use of a default responder when OCSP checking.
- *   If OCSP checking is already enabled, this will make subsequent checks
- *   go directly to the default responder.  (The location of the responder
- *   and the nickname of the responder cert must already be specified.)
- *   If OCSP checking is not enabled, this will be recorded and take effect
- *   whenever it is enabled.
- * INPUTS:
- *   CERTCertDBHandle *handle
- *     Cert database on which OCSP checking should use the default responder.
- * RETURN:
- *   Returns SECFailure if an error occurred; SECSuccess otherwise.
- *   No errors are especially likely unless the caller did not previously
- *   perform a successful call to SetOCSPDefaultResponder (in which case
- *   the error set will be SEC_ERROR_OCSP_NO_DEFAULT_RESPONDER).
- */
-extern SECStatus
-CERT_EnableOCSPDefaultResponder(CERTCertDBHandle *handle);
-
-/*
- * FUNCTION: CERT_DisableOCSPDefaultResponder
- *   Turns off use of a default responder when OCSP checking.
- *   (Does nothing if use of a default responder is not enabled.)
- * INPUTS:
- *   CERTCertDBHandle *handle
- *     Cert database on which OCSP checking should stop using a default
- *     responder.
- * RETURN:
- *   Returns SECFailure if an error occurred; SECSuccess otherwise.
- *   Errors very unlikely (like random memory corruption...).
- */
-extern SECStatus
-CERT_DisableOCSPDefaultResponder(CERTCertDBHandle *handle);
-
-/* If forcePost is set, OCSP requests will only be sent using the HTTP POST
- * method. When forcePost is not set, OCSP requests will be sent using the
- * HTTP GET method, with a fallback to POST when we fail to receive a response
- * and/or when we receive an uncacheable response like "Unknown."
- *
- * The default is to use GET and fallback to POST.
- */
-extern SECStatus CERT_ForcePostMethodForOCSP(PRBool forcePost);
-
-/*
- * -------------------------------------------------------
- * The Functions above are those expected to be used by a client
- * providing OCSP status checking along with every cert verification.
- * The functions below are for OCSP testing, debugging, or clients
- * or servers performing more specialized OCSP tasks.
- * -------------------------------------------------------
- */
-
-/*
- * FUNCTION: CERT_CreateOCSPRequest
- *   Creates a CERTOCSPRequest, requesting the status of the certs in
- *   the given list.
- * INPUTS:
- *   CERTCertList *certList
- *     A list of certs for which status will be requested.
- *     Note that all of these certificates should have the same issuer,
- *     or it's expected the response will be signed by a trusted responder.
- *     If the certs need to be broken up into multiple requests, that
- *     must be handled by the caller (and thus by having multiple calls
- *     to this routine), who knows about where the request(s) are being
- *     sent and whether there are any trusted responders in place.
- *   PRTime time
- *     Indicates the time for which the certificate status is to be
- *     determined -- this may be used in the search for the cert's issuer
- *     but has no effect on the request itself.
- *   PRBool addServiceLocator
- *     If true, the Service Locator extension should be added to the
- *     single request(s) for each cert.
- *   CERTCertificate *signerCert
- *     If non-NULL, means sign the request using this cert.  Otherwise,
- *     do not sign.
- *     XXX note that request signing is not yet supported; see comment in code
- * RETURN:
- *   A pointer to a CERTOCSPRequest structure containing an OCSP request
- *   for the cert list.  On error, null is returned, with an error set
- *   indicating the reason.  This is likely SEC_ERROR_UNKNOWN_ISSUER.
- *   (The issuer is needed to create a request for the certificate.)
- *   Other errors are low-level problems (no memory, bad database, etc.).
- */
-extern CERTOCSPRequest *
-CERT_CreateOCSPRequest(CERTCertList *certList, PRTime time,
-                       PRBool addServiceLocator,
-                       CERTCertificate *signerCert);
-
-/*
- * FUNCTION: CERT_AddOCSPAcceptableResponses
- *   Add the AcceptableResponses extension to an OCSP Request.
- * INPUTS:
- *   CERTOCSPRequest *request
- *     The request to which the extension should be added.
- *   SECOidTag responseType0, ...
- *     A list (of one or more) of SECOidTag -- each of the response types
- *     to be added.  The last OID *must* be SEC_OID_PKIX_OCSP_BASIC_RESPONSE.
- *     (This marks the end of the list, and it must be specified because a
- *     client conforming to the OCSP standard is required to handle the basic
- *     response type.)  The OIDs are not checked in any way.
- * RETURN:
- *   SECSuccess if the extension is added; SECFailure if anything goes wrong.
- *   All errors are internal or low-level problems (e.g. no memory).
- */
-extern SECStatus
-CERT_AddOCSPAcceptableResponses(CERTOCSPRequest *request,
-                                SECOidTag responseType0, ...);
-
-/*
- * FUNCTION: CERT_EncodeOCSPRequest
- *   DER encodes an OCSP Request, possibly adding a signature as well.
- *   XXX Signing is not yet supported, however; see comments in code.
- * INPUTS:
- *   PLArenaPool *arena
- *     The return value is allocated from here.
- *     If a NULL is passed in, allocation is done from the heap instead.
- *   CERTOCSPRequest *request
- *     The request to be encoded.
- *   void *pwArg
- *     Pointer to argument for password prompting, if needed.  (Definitely
- *     not needed if not signing.)
- * RETURN:
- *   Returns a NULL on error and a pointer to the SECItem with the
- *   encoded value otherwise.  Any error is likely to be low-level
- *   (e.g. no memory).
- */
-extern SECItem *
-CERT_EncodeOCSPRequest(PLArenaPool *arena, CERTOCSPRequest *request,
-                       void *pwArg);
-
-/*
- * FUNCTION: CERT_DecodeOCSPRequest
- *   Decode a DER encoded OCSP Request.
- * INPUTS:
- *   SECItem *src
- *     Pointer to a SECItem holding DER encoded OCSP Request.
- * RETURN:
- *   Returns a pointer to a CERTOCSPRequest containing the decoded request.
- *   On error, returns NULL.  Most likely error is trouble decoding
- *   (SEC_ERROR_OCSP_MALFORMED_REQUEST), or low-level problem (no memory).
- */
-extern CERTOCSPRequest *
-CERT_DecodeOCSPRequest(const SECItem *src);
-
-/*
- * FUNCTION: CERT_DestroyOCSPRequest
- *   Frees an OCSP Request structure.
- * INPUTS:
- *   CERTOCSPRequest *request
- *     Pointer to CERTOCSPRequest to be freed.
- * RETURN:
- *   No return value; no errors.
- */
-extern void
-CERT_DestroyOCSPRequest(CERTOCSPRequest *request);
-
-/*
- * FUNCTION: CERT_DecodeOCSPResponse
- *   Decode a DER encoded OCSP Response.
- * INPUTS:
- *   SECItem *src
- *     Pointer to a SECItem holding DER encoded OCSP Response.
- * RETURN:
- *   Returns a pointer to a CERTOCSPResponse (the decoded OCSP Response);
- *   the caller is responsible for destroying it.  Or NULL if error (either
- *   response could not be decoded (SEC_ERROR_OCSP_MALFORMED_RESPONSE),
- *   it was of an unexpected type (SEC_ERROR_OCSP_UNKNOWN_RESPONSE_TYPE),
- *   or a low-level or internal error occurred).
- */
-extern CERTOCSPResponse *
-CERT_DecodeOCSPResponse(const SECItem *src);
-
-/*
- * FUNCTION: CERT_DestroyOCSPResponse
- *   Frees an OCSP Response structure.
- * INPUTS:
- *   CERTOCSPResponse *request
- *     Pointer to CERTOCSPResponse to be freed.
- * RETURN:
- *   No return value; no errors.
- */
-extern void
-CERT_DestroyOCSPResponse(CERTOCSPResponse *response);
-
-/*
- * FUNCTION: CERT_GetEncodedOCSPResponse
- *   Creates and sends a request to an OCSP responder, then reads and
- *   returns the (encoded) response.
- * INPUTS:
- *   PLArenaPool *arena
- *     Pointer to arena from which return value will be allocated.
- *     If NULL, result will be allocated from the heap (and thus should
- *     be freed via SECITEM_FreeItem).
- *   CERTCertList *certList
- *     A list of certs for which status will be requested.
- *     Note that all of these certificates should have the same issuer,
- *     or it's expected the response will be signed by a trusted responder.
- *     If the certs need to be broken up into multiple requests, that
- *     must be handled by the caller (and thus by having multiple calls
- *     to this routine), who knows about where the request(s) are being
- *     sent and whether there are any trusted responders in place.
- *   const char *location
- *     The location of the OCSP responder (a URL).
- *   PRTime time
- *     Indicates the time for which the certificate status is to be
- *     determined -- this may be used in the search for the cert's issuer
- *     but has no other bearing on the operation.
- *   PRBool addServiceLocator
- *     If true, the Service Locator extension should be added to the
- *     single request(s) for each cert.
- *   CERTCertificate *signerCert
- *     If non-NULL, means sign the request using this cert.  Otherwise,
- *     do not sign.
- *   void *pwArg
- *     Pointer to argument for password prompting, if needed.  (Definitely
- *     not needed if not signing.)
- * OUTPUTS:
- *   CERTOCSPRequest **pRequest
- *     Pointer in which to store the OCSP request created for the given
- *     list of certificates.  It is only filled in if the entire operation
- *     is successful and the pointer is not null -- and in that case the
- *     caller is then reponsible for destroying it.
- * RETURN:
- *   Returns a pointer to the SECItem holding the response.
- *   On error, returns null with error set describing the reason:
- *	SEC_ERROR_UNKNOWN_ISSUER
- *	SEC_ERROR_CERT_BAD_ACCESS_LOCATION
- *	SEC_ERROR_OCSP_BAD_HTTP_RESPONSE
- *   Other errors are low-level problems (no memory, bad database, etc.).
- */
-extern SECItem *
-CERT_GetEncodedOCSPResponse(PLArenaPool *arena, CERTCertList *certList,
-                            const char *location, PRTime time,
-                            PRBool addServiceLocator,
-                            CERTCertificate *signerCert, void *pwArg,
-                            CERTOCSPRequest **pRequest);
-
-/*
- * FUNCTION: CERT_VerifyOCSPResponseSignature
- *   Check the signature on an OCSP Response.  Will also perform a
- *   verification of the signer's certificate.  Note, however, that a
- *   successful verification does not make any statement about the
- *   signer's *authority* to provide status for the certificate(s),
- *   that must be checked individually for each certificate.
- * INPUTS:
- *   CERTOCSPResponse *response
- *     Pointer to response structure with signature to be checked.
- *   CERTCertDBHandle *handle
- *     Pointer to CERTCertDBHandle for certificate DB to use for verification.
- *   void *pwArg
- *     Pointer to argument for password prompting, if needed.
- *   CERTCertificate *issuerCert
- *     Issuer of the certificate that generated the OCSP request.
- * OUTPUTS:
- *   CERTCertificate **pSignerCert
- *     Pointer in which to store signer's certificate; only filled-in if
- *     non-null.
- * RETURN:
- *   Returns SECSuccess when signature is valid, anything else means invalid.
- *   Possible errors set:
- *	SEC_ERROR_OCSP_MALFORMED_RESPONSE - unknown type of ResponderID
- *	SEC_ERROR_INVALID_TIME - bad format of "ProducedAt" time
- *	SEC_ERROR_UNKNOWN_SIGNER - signer's cert could not be found
- *	SEC_ERROR_BAD_SIGNATURE - the signature did not verify
- *   Other errors are any of the many possible failures in cert verification
- *   (e.g. SEC_ERROR_REVOKED_CERTIFICATE, SEC_ERROR_UNTRUSTED_ISSUER) when
- *   verifying the signer's cert, or low-level problems (no memory, etc.)
- */
-extern SECStatus
-CERT_VerifyOCSPResponseSignature(CERTOCSPResponse *response,
-                                 CERTCertDBHandle *handle, void *pwArg,
-                                 CERTCertificate **pSignerCert,
-                                 CERTCertificate *issuerCert);
-
-/*
- * FUNCTION: CERT_GetOCSPAuthorityInfoAccessLocation
- *   Get the value of the URI of the OCSP responder for the given cert.
- *   This is found in the (optional) Authority Information Access extension
- *   in the cert.
- * INPUTS:
- *   CERTCertificate *cert
- *     The certificate being examined.
- * RETURN:
- *   char *
- *     A copy of the URI for the OCSP method, if found.  If either the
- *     extension is not present or it does not contain an entry for OCSP,
- *     SEC_ERROR_EXTENSION_NOT_FOUND will be set and a NULL returned.
- *     Any other error will also result in a NULL being returned.
- *
- *     This result should be freed (via PORT_Free) when no longer in use.
- */
-extern char *
-CERT_GetOCSPAuthorityInfoAccessLocation(const CERTCertificate *cert);
-
-/*
- * FUNCTION: CERT_RegisterAlternateOCSPAIAInfoCallBack
- *   This function serves two purposes.
- *   1) It registers the address of a callback function that will be
- *   called for certs that have no OCSP AIA extension, to see if the
- *   callback wishes to supply an alternative URL for such an OCSP inquiry.
- *   2) It outputs the previously registered function's address to the
- *   address supplied by the caller, unless that is NULL.
- *   The registered callback function returns NULL, or an allocated string
- *   that may be subsequently freed by calling PORT_Free().
- * RETURN:
- *   SECSuccess or SECFailure (if the library is not yet intialized)
- */
-extern SECStatus
-CERT_RegisterAlternateOCSPAIAInfoCallBack(
-    CERT_StringFromCertFcn newCallback,
-    CERT_StringFromCertFcn *oldCallback);
-
-/*
- * FUNCTION: CERT_ParseURL
- *   Parse a URI into hostname, port, and path.  The scheme in the URI must
- *   be "http".
- * INPUTS:
- *   const char *url
- *     The URI to be parsed
- * OUTPUTS:
- *   char **pHostname
- *     Pointer to store the hostname obtained from the URI.
- *     This result should be freed (via PORT_Free) when no longer in use.
- *   PRUint16 *pPort
- *     Pointer to store the port number obtained from the URI.
- *   char **pPath
- *     Pointer to store the path obtained from the URI.
- *     This result should be freed (via PORT_Free) when no longer in use.
- * RETURN:
- *   Returns SECSuccess when parsing was successful. Returns SECFailure when
- *   problems were encountered.
- */
-extern SECStatus
-CERT_ParseURL(const char *url, char **pHostname, PRUint16 *pPort, char **pPath);
-
-/*
- * FUNCTION: CERT_CheckOCSPStatus
- *   Checks the status of a certificate via OCSP.  Will only check status for
- *   a certificate that has an AIA (Authority Information Access) extension
- *   for OCSP *or* when a "default responder" is specified and enabled.
- *   (If no AIA extension for OCSP and no default responder in place, the
- *   cert is considered to have a good status and SECSuccess is returned.)
- * INPUTS:
- *   CERTCertDBHandle *handle
- *     certificate DB of the cert that is being checked
- *   CERTCertificate *cert
- *     the certificate being checked
- *   XXX in the long term also need a boolean parameter that specifies
- *	whether to check the cert chain, as well; for now we check only
- *	the leaf (the specified certificate)
- *   PRTime time
- *     time for which status is to be determined
- *   void *pwArg
- *     argument for password prompting, if needed
- * RETURN:
- *   Returns SECSuccess if an approved OCSP responder "knows" the cert
- *   *and* returns a non-revoked status for it; SECFailure otherwise,
- *   with an error set describing the reason:
- *
- *	SEC_ERROR_OCSP_BAD_HTTP_RESPONSE
- *	SEC_ERROR_OCSP_FUTURE_RESPONSE
- *	SEC_ERROR_OCSP_MALFORMED_REQUEST
- *	SEC_ERROR_OCSP_MALFORMED_RESPONSE
- *	SEC_ERROR_OCSP_OLD_RESPONSE
- *	SEC_ERROR_OCSP_REQUEST_NEEDS_SIG
- *	SEC_ERROR_OCSP_SERVER_ERROR
- *	SEC_ERROR_OCSP_TRY_SERVER_LATER
- *	SEC_ERROR_OCSP_UNAUTHORIZED_REQUEST
- *	SEC_ERROR_OCSP_UNAUTHORIZED_RESPONSE
- *	SEC_ERROR_OCSP_UNKNOWN_CERT
- *	SEC_ERROR_OCSP_UNKNOWN_RESPONSE_STATUS
- *	SEC_ERROR_OCSP_UNKNOWN_RESPONSE_TYPE
- *
- *	SEC_ERROR_BAD_SIGNATURE
- *	SEC_ERROR_CERT_BAD_ACCESS_LOCATION
- *	SEC_ERROR_INVALID_TIME
- *	SEC_ERROR_REVOKED_CERTIFICATE
- *	SEC_ERROR_UNKNOWN_ISSUER
- *	SEC_ERROR_UNKNOWN_SIGNER
- *
- *   Other errors are any of the many possible failures in cert verification
- *   (e.g. SEC_ERROR_REVOKED_CERTIFICATE, SEC_ERROR_UNTRUSTED_ISSUER) when
- *   verifying the signer's cert, or low-level problems (error allocating
- *   memory, error performing ASN.1 decoding, etc.).
- */
-extern SECStatus
-CERT_CheckOCSPStatus(CERTCertDBHandle *handle, CERTCertificate *cert,
-                     PRTime time, void *pwArg);
-
-/*
- * FUNCTION: CERT_CacheOCSPResponseFromSideChannel
- *   First, this function checks the OCSP cache to see if a good response
- *   for the given certificate already exists. If it does, then the function
- *   returns successfully.
- *
- *   If not, then it validates that the given OCSP response is a valid,
- *   good response for the given certificate and inserts it into the
- *   cache.
- *
- *   This function is intended for use when OCSP responses are provided via a
- *   side-channel, i.e. TLS OCSP stapling (a.k.a. the status_request extension).
- *
- * INPUTS:
- *   CERTCertDBHandle *handle
- *     certificate DB of the cert that is being checked
- *   CERTCertificate *cert
- *     the certificate being checked
- *   PRTime time
- *     time for which status is to be determined
- *   SECItem *encodedResponse
- *     the DER encoded bytes of the OCSP response
- *   void *pwArg
- *     argument for password prompting, if needed
- * RETURN:
- *   SECSuccess if the cert was found in the cache, or if the OCSP response was
- *   found to be valid and inserted into the cache. SECFailure otherwise.
- */
-extern SECStatus
-CERT_CacheOCSPResponseFromSideChannel(CERTCertDBHandle *handle,
-                                      CERTCertificate *cert,
-                                      PRTime time,
-                                      const SECItem *encodedResponse,
-                                      void *pwArg);
-
-/*
- * FUNCTION: CERT_GetOCSPStatusForCertID
- *  Returns the OCSP status contained in the passed in parameter response
- *  that corresponds to the certID passed in.
- * INPUTS:
- *  CERTCertDBHandle *handle
- *    certificate DB of the cert that is being checked
- *  CERTOCSPResponse *response
- *    the OCSP response we want to retrieve status from.
- *  CERTOCSPCertID *certID
- *    the ID we want to look for from the response.
- *  CERTCertificate *signerCert
- *    the certificate that was used to sign the OCSP response.
- *    must be obtained via a call to CERT_VerifyOCSPResponseSignature.
- *  PRTime time
- *    The time at which we're checking the status for.
- *  RETURN:
- *    Return values are the same as those for CERT_CheckOCSPStatus
- */
-extern SECStatus
-CERT_GetOCSPStatusForCertID(CERTCertDBHandle *handle,
-                            CERTOCSPResponse *response,
-                            CERTOCSPCertID *certID,
-                            CERTCertificate *signerCert,
-                            PRTime time);
-
-/*
- * FUNCTION CERT_GetOCSPResponseStatus
- *   Returns the response status for the response passed.
- * INPUTS:
- *   CERTOCSPResponse *response
- *     The response to query for status
- *  RETURN:
- *    Returns SECSuccess if the response has a successful status value.
- *    Otherwise it returns SECFailure and sets one of the following error
- *    codes via PORT_SetError
- *        SEC_ERROR_OCSP_MALFORMED_REQUEST
- *        SEC_ERROR_OCSP_SERVER_ERROR
- *        SEC_ERROR_OCSP_TRY_SERVER_LATER
- *        SEC_ERROR_OCSP_REQUEST_NEEDS_SIG
- *        SEC_ERROR_OCSP_UNAUTHORIZED_REQUEST
- *        SEC_ERROR_OCSP_UNKNOWN_RESPONSE_STATUS
- */
-extern SECStatus
-CERT_GetOCSPResponseStatus(CERTOCSPResponse *response);
-
-/*
- * FUNCTION CERT_CreateOCSPCertID
- *  Returns the OCSP certID for the certificate passed in.
- * INPUTS:
- *  CERTCertificate *cert
- *    The certificate for which to create the certID for.
- *  PRTime time
- *    The time at which the id is requested for.  This is used
- *    to determine the appropriate issuer for the cert since
- *    the issuing CA may be an older expired certificate.
- *  RETURN:
- *    A new copy of a CERTOCSPCertID*.  The memory for this certID
- *    should be freed by calling CERT_DestroyOCSPCertID when the
- *    certID is no longer necessary.
- */
-extern CERTOCSPCertID *
-CERT_CreateOCSPCertID(CERTCertificate *cert, PRTime time);
-
-/*
- * FUNCTION: CERT_DestroyOCSPCertID
- *  Frees the memory associated with the certID passed in.
- * INPUTS:
- *  CERTOCSPCertID* certID
- *    The certID that the caller no longer needs and wants to
- *    free the associated memory.
- * RETURN:
- *  SECSuccess if freeing the memory was successful.  Returns
- *  SECFailure if the memory passed in was not allocated with
- *  a call to CERT_CreateOCSPCertID.
- */
-extern SECStatus
-CERT_DestroyOCSPCertID(CERTOCSPCertID *certID);
-
-extern CERTOCSPSingleResponse *
-CERT_CreateOCSPSingleResponseGood(PLArenaPool *arena,
-                                  CERTOCSPCertID *id,
-                                  PRTime thisUpdate,
-                                  const PRTime *nextUpdate);
-
-extern CERTOCSPSingleResponse *
-CERT_CreateOCSPSingleResponseUnknown(PLArenaPool *arena,
-                                     CERTOCSPCertID *id,
-                                     PRTime thisUpdate,
-                                     const PRTime *nextUpdate);
-
-extern CERTOCSPSingleResponse *
-CERT_CreateOCSPSingleResponseRevoked(
-    PLArenaPool *arena,
-    CERTOCSPCertID *id,
-    PRTime thisUpdate,
-    const PRTime *nextUpdate,
-    PRTime revocationTime,
-    const CERTCRLEntryReasonCode *revocationReason);
-
-extern SECItem *
-CERT_CreateEncodedOCSPSuccessResponse(
-    PLArenaPool *arena,
-    CERTCertificate *responderCert,
-    CERTOCSPResponderIDType responderIDType,
-    PRTime producedAt,
-    CERTOCSPSingleResponse **responses,
-    void *wincx);
-
-/*
- * FUNCTION: CERT_CreateEncodedOCSPErrorResponse
- *  Creates an encoded OCSP response with an error response status.
- * INPUTS:
- *  PLArenaPool *arena
- *    The return value is allocated from here.
- *    If a NULL is passed in, allocation is done from the heap instead.
- *  int error
- *    An NSS error code indicating an error response status. The error
- *    code is mapped to an OCSP response status as follows:
- *        SEC_ERROR_OCSP_MALFORMED_REQUEST -> malformedRequest
- *        SEC_ERROR_OCSP_SERVER_ERROR -> internalError
- *        SEC_ERROR_OCSP_TRY_SERVER_LATER -> tryLater
- *        SEC_ERROR_OCSP_REQUEST_NEEDS_SIG -> sigRequired
- *        SEC_ERROR_OCSP_UNAUTHORIZED_REQUEST -> unauthorized
- *    where the OCSP response status is an enumerated type defined in
- *    RFC 2560:
- *    OCSPResponseStatus ::= ENUMERATED {
- *        successful           (0),     --Response has valid confirmations
- *        malformedRequest     (1),     --Illegal confirmation request
- *        internalError        (2),     --Internal error in issuer
- *        tryLater             (3),     --Try again later
- *                                      --(4) is not used
- *        sigRequired          (5),     --Must sign the request
- *        unauthorized         (6)      --Request unauthorized
- *    }
- * RETURN:
- *   Returns a pointer to the SECItem holding the response.
- *   On error, returns null with error set describing the reason:
- *	SEC_ERROR_INVALID_ARGS
- *   Other errors are low-level problems (no memory, bad database, etc.).
- */
-extern SECItem *
-CERT_CreateEncodedOCSPErrorResponse(PLArenaPool *arena, int error);
-
-/* Sends an OCSP request using the HTTP POST method to the location addressed
- * by the URL in |location| parameter. The request body will be
- * |encodedRequest|, which must be a valid encoded OCSP request. On success,
- * the server's response is returned and the caller must free it using
- * SECITEM_FreeItem. On failure, NULL is returned. No parsing or validation of
- * the HTTP response is done.
- *
- * If a default HTTP client has been registered with
- * SEC_RegisterDefaultHttpClient then that client is used. Otherwise, an
- * internal HTTP client is used.
- */
-SECItem *CERT_PostOCSPRequest(PLArenaPool *arena, const char *location,
-                              const SECItem *encodedRequest);
-
-/************************************************************************/
-SEC_END_PROTOS
-
-#endif /* _OCSP_H_ */
diff --git a/openflow/usr/include/nss/ocspt.h b/openflow/usr/include/nss/ocspt.h
deleted file mode 100644
index db429ff..0000000
--- a/openflow/usr/include/nss/ocspt.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Public header for exported OCSP types.
- */
-
-#ifndef _OCSPT_H_
-#define _OCSPT_H_
-
-/*
- * The following are all opaque types.  If someone needs to get at
- * a field within, then we need to fix the API.  Try very hard not
- * make the type available to them.
- */
-typedef struct CERTOCSPRequestStr CERTOCSPRequest;
-typedef struct CERTOCSPResponseStr CERTOCSPResponse;
-
-/*
- * XXX I think only those first two above should need to be exported,
- * but until I know for certain I am leaving the rest of these here, too.
- */
-typedef struct CERTOCSPCertIDStr CERTOCSPCertID;
-typedef struct CERTOCSPSingleResponseStr CERTOCSPSingleResponse;
-
-/*
- * This interface is described in terms of an HttpClient which
- * supports at least a specified set of functions. (An implementer may
- * provide HttpClients with additional functionality accessible only to
- * users with a particular implementation in mind.) The basic behavior
- * is provided by defining a set of functions, listed in an
- * SEC_HttpServerFcnStruct. If the implementor of a SpecificHttpClient
- * registers his SpecificHttpClient as the default HttpClient, then his
- * functions will be called by the user of an HttpClient, such as an
- * OCSPChecker.
- *
- * The implementer of a specific HttpClient (e.g., the NSS-provided
- * DefaultHttpClient), populates an SEC_HttpClientFcnStruct, uses it to
- * register his client, and waits for his functions to be called.
- *
- * For future expandability, the SEC_HttpClientFcnStruct is defined as a
- * union, with the version field acting as a selector. The proposed
- * initial version of the structure is given following the definition
- * of the union. The HttpClientState structure is implementation-
- * dependent, and should be opaque to the user.
- */
-
-typedef void *SEC_HTTP_SERVER_SESSION;
-typedef void *SEC_HTTP_REQUEST_SESSION;
-
-/*
- * This function creates a SEC_HTTP_SERVER_SESSION object. The implementer of a
- * specific HttpClient will allocate the necessary space, when this
- * function is called, and will free it when the corresponding FreeFcn
- * is called. The SEC_HTTP_SERVER_SESSION object is passed, as an opaque object,
- * to subsequent calls.
- *
- * If the function returns SECSuccess, the returned SEC_HTTP_SERVER_SESSION
- * must be cleaned up with a call to SEC_HttpServer_FreeSession,
- * after processing is finished.
- */
-typedef SECStatus (*SEC_HttpServer_CreateSessionFcn)(
-    const char *host,
-    PRUint16 portnum,
-    SEC_HTTP_SERVER_SESSION *pSession);
-
-/*
- * This function is called to allow the implementation to attempt to keep
- * the connection alive. Depending on the underlying platform, it might
- * immediately return SECSuccess without having performed any operations.
- * (If a connection has not been kept alive, a subsequent call to
- * SEC_HttpRequest_TrySendAndReceiveFcn should reopen the connection
- * automatically.)
- *
- * If the connection uses nonblocking I/O, this function may return
- * SECWouldBlock and store a nonzero value at "pPollDesc". In that case
- * the caller may wait on the poll descriptor, and should call this function
- * again until SECSuccess (and a zero value at "pPollDesc") is obtained.
- */
-typedef SECStatus (*SEC_HttpServer_KeepAliveSessionFcn)(
-    SEC_HTTP_SERVER_SESSION session,
-    PRPollDesc **pPollDesc);
-
-/*
- * This function frees the client SEC_HTTP_SERVER_SESSION object, closes all
- * SEC_HTTP_REQUEST_SESSIONs created for that server, discards all partial results,
- * frees any memory that was allocated by the client, and invalidates any
- * response pointers that might have been returned by prior server or request
- * functions.
- */
-typedef SECStatus (*SEC_HttpServer_FreeSessionFcn)(
-    SEC_HTTP_SERVER_SESSION session);
-
-/*
- * This function creates a SEC_HTTP_REQUEST_SESSION object. The implementer of a
- * specific HttpClient will allocate the necessary space, when this
- * function is called, and will free it when the corresponding FreeFcn
- * is called. The SEC_HTTP_REQUEST_SESSION object is passed, as an opaque object,
- * to subsequent calls.
- *
- * An implementation that does not support the requested protocol variant
- * (usually "http", but could eventually allow "https") or request method
- * should return SECFailure.
- *
- * Timeout values may include the constants PR_INTERVAL_NO_TIMEOUT (wait
- * forever) or PR_INTERVAL_NO_WAIT (nonblocking I/O).
- *
- * If the function returns SECSuccess, the returned SEC_HTTP_REQUEST_SESSION
- * must be cleaned up with a call to SEC_HttpRequest_FreeSession,
- * after processing is finished.
- */
-typedef SECStatus (*SEC_HttpRequest_CreateFcn)(
-    SEC_HTTP_SERVER_SESSION session,
-    const char *http_protocol_variant, /* usually "http" */
-    const char *path_and_query_string,
-    const char *http_request_method,
-    const PRIntervalTime timeout,
-    SEC_HTTP_REQUEST_SESSION *pRequest);
-
-/*
- * This function sets data to be sent to the server for an HTTP request
- * of http_request_method == POST. If a particular implementation
- * supports it, the details for the POST request can be set by calling
- * this function, prior to activating the request with TrySendAndReceiveFcn.
- *
- * An implementation that does not support the POST method should
- * implement a SetPostDataFcn function that returns immediately.
- *
- * Setting http_content_type is optional, the parameter may
- * by NULL or the empty string.
- */
-typedef SECStatus (*SEC_HttpRequest_SetPostDataFcn)(
-    SEC_HTTP_REQUEST_SESSION request,
-    const char *http_data,
-    const PRUint32 http_data_len,
-    const char *http_content_type);
-
-/*
- * This function sets an additional HTTP protocol request header.
- * If a particular implementation supports it, one or multiple headers
- * can be added to the request by calling this function once or multiple
- * times, prior to activating the request with TryFcn.
- *
- * An implementation that does not support setting additional headers
- * should implement an AddRequestHeaderFcn function that returns immediately.
- */
-typedef SECStatus (*SEC_HttpRequest_AddHeaderFcn)(
-    SEC_HTTP_REQUEST_SESSION request,
-    const char *http_header_name,
-    const char *http_header_value);
-
-/*
- * This function initiates or continues an HTTP request. After
- * parameters have been set with the Create function and, optionally,
- * modified or enhanced with the AddParams function, this call creates
- * the socket connection and initiates the communication.
- *
- * If a timeout value of zero is specified, indicating non-blocking
- * I/O, the client creates a non-blocking socket, and returns a status
- * of SECWouldBlock and a non-NULL PRPollDesc if the operation is not
- * complete. In that case all other return parameters are undefined.
- * The caller is expected to repeat the call, possibly after using
- * PRPoll to determine that a completion has occurred, until a return
- * value of SECSuccess (and a NULL value for pPollDesc) or a return
- * value of SECFailure (indicating failure on the network level)
- * is obtained.
- *
- * http_response_data_len is both input and output parameter.
- * If a pointer to a PRUint32 is supplied, the http client is
- * expected to check the given integer value and always set an out
- * value, even on failure.
- * An input value of zero means, the caller will accept any response len.
- * A different input value indicates the maximum response value acceptable
- * to the caller.
- * If data is successfully read and the size is acceptable to the caller,
- * the function will return SECSuccess and set http_response_data_len to
- * the size of the block returned in http_response_data.
- * If the data read from the http server is larger than the acceptable
- * size, the function will return SECFailure.
- * http_response_data_len will be set to a value different from zero to
- * indicate the reason of the failure.
- * An out value of "0" means, the failure was unrelated to the
- * acceptable size.
- * An out value of "1" means, the result data is larger than the
- * accpeptable size, but the real size is not yet known to the http client
- * implementation and it stopped retrieving it,
- * Any other out value combined with a return value of SECFailure
- * will indicate the actual size of the server data.
- *
- * The caller is permitted to provide NULL values for any of the
- * http_response arguments, indicating the caller is not interested in
- * those values. If the caller does provide an address, the HttpClient
- * stores at that address a pointer to the corresponding argument, at
- * the completion of the operation.
- *
- * All returned pointers will be owned by the the HttpClient
- * implementation and will remain valid until the call to
- * SEC_HttpRequest_FreeFcn.
- */
-typedef SECStatus (*SEC_HttpRequest_TrySendAndReceiveFcn)(
-    SEC_HTTP_REQUEST_SESSION request,
-    PRPollDesc **pPollDesc,
-    PRUint16 *http_response_code,
-    const char **http_response_content_type,
-    const char **http_response_headers,
-    const char **http_response_data,
-    PRUint32 *http_response_data_len);
-
-/*
- * Calling CancelFcn asks for premature termination of the request.
- *
- * Future calls to SEC_HttpRequest_TrySendAndReceive should
- * by avoided, but in this case the HttpClient implementation
- * is expected to return immediately with SECFailure.
- *
- * After calling CancelFcn, a separate call to SEC_HttpRequest_FreeFcn
- * is still necessary to free resources.
- */
-typedef SECStatus (*SEC_HttpRequest_CancelFcn)(
-    SEC_HTTP_REQUEST_SESSION request);
-
-/*
- * Before calling this function, it must be assured the request
- * has been completed, i.e. either SEC_HttpRequest_TrySendAndReceiveFcn has
- * returned SECSuccess, or the request has been canceled with
- * a call to SEC_HttpRequest_CancelFcn.
- *
- * This function frees the client state object, closes all sockets,
- * discards all partial results, frees any memory that was allocated
- * by the client, and invalidates all response pointers that might
- * have been returned by SEC_HttpRequest_TrySendAndReceiveFcn
- */
-typedef SECStatus (*SEC_HttpRequest_FreeFcn)(
-    SEC_HTTP_REQUEST_SESSION request);
-
-typedef struct SEC_HttpClientFcnV1Struct {
-    SEC_HttpServer_CreateSessionFcn createSessionFcn;
-    SEC_HttpServer_KeepAliveSessionFcn keepAliveSessionFcn;
-    SEC_HttpServer_FreeSessionFcn freeSessionFcn;
-    SEC_HttpRequest_CreateFcn createFcn;
-    SEC_HttpRequest_SetPostDataFcn setPostDataFcn;
-    SEC_HttpRequest_AddHeaderFcn addHeaderFcn;
-    SEC_HttpRequest_TrySendAndReceiveFcn trySendAndReceiveFcn;
-    SEC_HttpRequest_CancelFcn cancelFcn;
-    SEC_HttpRequest_FreeFcn freeFcn;
-} SEC_HttpClientFcnV1;
-
-typedef struct SEC_HttpClientFcnStruct {
-    PRInt16 version;
-    union {
-        SEC_HttpClientFcnV1 ftable1;
-        /* SEC_HttpClientFcnV2 ftable2; */
-        /* ...                      */
-    } fcnTable;
-} SEC_HttpClientFcn;
-
-/*
- * ocspMode_FailureIsVerificationFailure:
- * This is the classic behaviour of NSS.
- * Any OCSP failure is a verification failure (classic mode, default).
- * Without a good response, OCSP networking will be retried each time
- * it is required for verifying a cert.
- *
- * ocspMode_FailureIsNotAVerificationFailure:
- * If we fail to obtain a valid OCSP response, consider the
- * cert as good.
- * Failed OCSP attempts might get cached and not retried until
- * minimumSecondsToNextFetchAttempt.
- * If we are able to obtain a valid response, the cert
- * will be considered good, if either status is "good"
- * or the cert was not yet revoked at verification time.
- *
- * Additional failure modes might be added in the future.
- */
-typedef enum {
-    ocspMode_FailureIsVerificationFailure = 0,
-    ocspMode_FailureIsNotAVerificationFailure = 1
-} SEC_OcspFailureMode;
-
-/*
- * A ResponderID identifies the responder -- or more correctly, the
- * signer of the response.  The ASN.1 definition of a ResponderID is:
- *
- * ResponderID	::=	CHOICE {
- *	byName			[1] EXPLICIT Name,
- *	byKey			[2] EXPLICIT KeyHash }
- *
- * Because it is CHOICE, the type of identification used and the
- * identification itself are actually encoded together.  To represent
- * this same information internally, we explicitly define a type and
- * save it, along with the value, into a data structure.
- */
-
-typedef enum {
-    ocspResponderID_other = -1, /* unknown kind of responderID */
-    ocspResponderID_byName = 1,
-    ocspResponderID_byKey = 2
-} CERTOCSPResponderIDType;
-
-#endif /* _OCSPT_H_ */
diff --git a/openflow/usr/include/nss/p12.h b/openflow/usr/include/nss/p12.h
deleted file mode 100644
index 118db6e..0000000
--- a/openflow/usr/include/nss/p12.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _P12_H_
-#define _P12_H_
-
-#include "secoid.h"
-#include "key.h"
-#include "secpkcs7.h"
-#include "p12t.h"
-
-typedef int(PR_CALLBACK *PKCS12OpenFunction)(void *arg);
-typedef int(PR_CALLBACK *PKCS12ReadFunction)(void *arg,
-                                             unsigned char *buffer,
-                                             unsigned int *lenRead,
-                                             unsigned int maxLen);
-typedef int(PR_CALLBACK *PKCS12WriteFunction)(void *arg,
-                                              unsigned char *buffer,
-                                              unsigned int *bufLen,
-                                              unsigned int *lenWritten);
-typedef int(PR_CALLBACK *PKCS12CloseFunction)(void *arg);
-typedef SECStatus(PR_CALLBACK *PKCS12UnicodeConvertFunction)(
-    PLArenaPool *arena,
-    SECItem *dest, SECItem *src,
-    PRBool toUnicode,
-    PRBool swapBytes);
-typedef void(PR_CALLBACK *SEC_PKCS12EncoderOutputCallback)(
-    void *arg, const char *buf,
-    unsigned long len);
-typedef void(PR_CALLBACK *SEC_PKCS12DecoderOutputCallback)(
-    void *arg, const char *buf,
-    unsigned long len);
-/*
- * In NSS 3.12 or later, 'arg' actually points to a CERTCertificate,
- * the 'leafCert' variable in sec_pkcs12_validate_cert in p12d.c.
- * See r1.35 of p12d.c ("Patch 2" in bug 321584).
- *
- * This callback might be called by SEC_PKCS12DecoderValidateBags each time
- * a nickname collission is detected. The callback must return a new
- * nickname. The returned SECItem should be of type siAsciiString,
- * it should be allocated using:
- *     SECITEM_AllocItem(NULL, NULL, LENGTH_OF_NEW_NICKNAME + 1)
- * and data must contain the new nickname as a zero terminated string.
- */
-typedef SECItem *(PR_CALLBACK *SEC_PKCS12NicknameCollisionCallback)(
-    SECItem *old_nickname,
-    PRBool *cancel,
-    void *arg);
-/*
- * This callback is called by SEC_PKCS12DecoderRenameCertNicknames for each
- * certificate found in the p12 source data.
- *
- * cert: A decoded certificate.
- * default_nickname: The nickname as found in the source data.
- *                   Will be NULL if source data doesn't have nickname.
- * new_nickname: Output parameter that may contain the renamed nickname.
- * arg: The user data that was passed to SEC_PKCS12DecoderRenameCertNicknames.
- *
- * If the callback accept that NSS will use a nickname based on the
- * default_nickname (potentially resolving conflicts), then the callback
- * must set *new_nickname to NULL.
- *
- * If the callback wishes to override the nickname, it must set *new_nickname
- * to a new SECItem which should be allocated using
- *     SECITEM_AllocItem(NULL, NULL, LENGTH_OF_NEW_NICKNAME + 1)
- * new_nickname->type should be set to siAsciiString, and new_nickname->data
- * must contain the new nickname as a zero terminated string.
- *
- * A return value of SECFailure indicates that the renaming operation failed,
- * and callback should release new_nickname before returning if it's already
- * being allocated.
- * Otherwise, the callback function must return SECSuccess, including use
- * default nickname as mentioned above.
- */
-typedef SECStatus(PR_CALLBACK *SEC_PKCS12NicknameRenameCallback)(
-    const CERTCertificate *cert,
-    const SECItem *default_nickname,
-    SECItem **new_nickname,
-    void *arg);
-
-typedef SECStatus(PR_CALLBACK *digestOpenFn)(void *arg, PRBool readData);
-typedef SECStatus(PR_CALLBACK *digestCloseFn)(void *arg, PRBool removeFile);
-typedef int(PR_CALLBACK *digestIOFn)(void *arg, unsigned char *buf,
-                                     unsigned long len);
-
-typedef struct SEC_PKCS12ExportContextStr SEC_PKCS12ExportContext;
-typedef struct SEC_PKCS12SafeInfoStr SEC_PKCS12SafeInfo;
-typedef struct SEC_PKCS12DecoderContextStr SEC_PKCS12DecoderContext;
-typedef struct SEC_PKCS12DecoderItemStr SEC_PKCS12DecoderItem;
-
-struct sec_PKCS12PasswordModeInfo {
-    SECItem *password;
-    SECOidTag algorithm;
-};
-
-struct sec_PKCS12PublicKeyModeInfo {
-    CERTCertificate *cert;
-    CERTCertDBHandle *certDb;
-    SECOidTag algorithm;
-    int keySize;
-};
-
-struct SEC_PKCS12DecoderItemStr {
-    SECItem *der;
-    SECOidTag type;
-    PRBool hasKey;
-    SECItem *friendlyName; /* UTF-8 string */
-    SECAlgorithmID *shroudAlg;
-};
-
-SEC_BEGIN_PROTOS
-
-SEC_PKCS12SafeInfo *
-SEC_PKCS12CreatePubKeyEncryptedSafe(SEC_PKCS12ExportContext *p12ctxt,
-                                    CERTCertDBHandle *certDb,
-                                    CERTCertificate *signer,
-                                    CERTCertificate **recipients,
-                                    SECOidTag algorithm, int keysize);
-
-extern SEC_PKCS12SafeInfo *
-SEC_PKCS12CreatePasswordPrivSafe(SEC_PKCS12ExportContext *p12ctxt,
-                                 SECItem *pwitem, SECOidTag privAlg);
-
-extern SEC_PKCS12SafeInfo *
-SEC_PKCS12CreateUnencryptedSafe(SEC_PKCS12ExportContext *p12ctxt);
-
-extern SECStatus
-SEC_PKCS12AddPasswordIntegrity(SEC_PKCS12ExportContext *p12ctxt,
-                               SECItem *pwitem, SECOidTag integAlg);
-extern SECStatus
-SEC_PKCS12AddPublicKeyIntegrity(SEC_PKCS12ExportContext *p12ctxt,
-                                CERTCertificate *cert, CERTCertDBHandle *certDb,
-                                SECOidTag algorithm, int keySize);
-
-extern SEC_PKCS12ExportContext *
-SEC_PKCS12CreateExportContext(SECKEYGetPasswordKey pwfn, void *pwfnarg,
-                              PK11SlotInfo *slot, void *wincx);
-
-extern SECStatus
-SEC_PKCS12AddCert(SEC_PKCS12ExportContext *p12ctxt,
-                  SEC_PKCS12SafeInfo *safe, void *nestedDest,
-                  CERTCertificate *cert, CERTCertDBHandle *certDb,
-                  SECItem *keyId, PRBool includeCertChain);
-
-extern SECStatus
-SEC_PKCS12AddKeyForCert(SEC_PKCS12ExportContext *p12ctxt,
-                        SEC_PKCS12SafeInfo *safe,
-                        void *nestedDest, CERTCertificate *cert,
-                        PRBool shroudKey, SECOidTag algorithm, SECItem *pwitem,
-                        SECItem *keyId, SECItem *nickName);
-
-extern SECStatus
-SEC_PKCS12AddCertOrChainAndKey(SEC_PKCS12ExportContext *p12ctxt,
-                               void *certSafe, void *certNestedDest,
-                               CERTCertificate *cert, CERTCertDBHandle *certDb,
-                               void *keySafe, void *keyNestedDest, PRBool shroudKey,
-                               SECItem *pwitem, SECOidTag algorithm,
-                               PRBool includeCertChain);
-
-extern SECStatus
-SEC_PKCS12AddCertAndKey(SEC_PKCS12ExportContext *p12ctxt,
-                        void *certSafe, void *certNestedDest,
-                        CERTCertificate *cert, CERTCertDBHandle *certDb,
-                        void *keySafe, void *keyNestedDest,
-                        PRBool shroudKey, SECItem *pwitem, SECOidTag algorithm);
-
-extern void *
-SEC_PKCS12CreateNestedSafeContents(SEC_PKCS12ExportContext *p12ctxt,
-                                   void *baseSafe, void *nestedDest);
-
-extern SECStatus
-SEC_PKCS12Encode(SEC_PKCS12ExportContext *p12exp,
-                 SEC_PKCS12EncoderOutputCallback output, void *outputarg);
-
-extern void
-SEC_PKCS12DestroyExportContext(SEC_PKCS12ExportContext *p12exp);
-
-extern SEC_PKCS12DecoderContext *
-SEC_PKCS12DecoderStart(SECItem *pwitem, PK11SlotInfo *slot, void *wincx,
-                       digestOpenFn dOpen, digestCloseFn dClose,
-                       digestIOFn dRead, digestIOFn dWrite, void *dArg);
-
-extern SECStatus
-SEC_PKCS12DecoderSetTargetTokenCAs(SEC_PKCS12DecoderContext *p12dcx,
-                                   SECPKCS12TargetTokenCAs tokenCAs);
-
-extern SECStatus
-SEC_PKCS12DecoderUpdate(SEC_PKCS12DecoderContext *p12dcx, unsigned char *data,
-                        unsigned long len);
-
-extern void
-SEC_PKCS12DecoderFinish(SEC_PKCS12DecoderContext *p12dcx);
-
-extern SECStatus
-SEC_PKCS12DecoderVerify(SEC_PKCS12DecoderContext *p12dcx);
-
-extern SECStatus
-SEC_PKCS12DecoderValidateBags(SEC_PKCS12DecoderContext *p12dcx,
-                              SEC_PKCS12NicknameCollisionCallback nicknameCb);
-
-/*
- * SEC_PKCS12DecoderRenameCertNicknames() can be used to change
- * certificate nicknames in SEC_PKCS12DecoderContext, prior to calling
- * SEC_PKCS12DecoderImportBags.
- *
- * arg: User-defined data that will be passed to nicknameCb.
- *
- * If SEC_PKCS12DecoderRenameCertNicknames() is called after calling
- * SEC_PKCS12DecoderValidateBags(), then only the certificate nickname
- * will be changed.
- * If SEC_PKCS12DecoderRenameCertNicknames() is called prior to calling
- * SEC_PKCS12DecoderValidateBags(), then SEC_PKCS12DecoderValidateBags()
- * will change the nickname of the corresponding private key, too.
- */
-extern SECStatus
-SEC_PKCS12DecoderRenameCertNicknames(SEC_PKCS12DecoderContext *p12dcx,
-                                     SEC_PKCS12NicknameRenameCallback nicknameCb,
-                                     void *arg);
-
-extern SECStatus
-SEC_PKCS12DecoderImportBags(SEC_PKCS12DecoderContext *p12dcx);
-
-CERTCertList *
-SEC_PKCS12DecoderGetCerts(SEC_PKCS12DecoderContext *p12dcx);
-
-SECStatus
-SEC_PKCS12DecoderIterateInit(SEC_PKCS12DecoderContext *p12dcx);
-
-SECStatus
-SEC_PKCS12DecoderIterateNext(SEC_PKCS12DecoderContext *p12dcx,
-                             const SEC_PKCS12DecoderItem **ipp);
-
-SEC_END_PROTOS
-
-#endif
diff --git a/openflow/usr/include/nss/p12plcy.h b/openflow/usr/include/nss/p12plcy.h
deleted file mode 100644
index d3f818d..0000000
--- a/openflow/usr/include/nss/p12plcy.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _P12PLCY_H_
-#define _P12PLCY_H_
-
-#include "secoid.h"
-#include "ciferfam.h"
-
-SEC_BEGIN_PROTOS
-
-/* for the algid specified, can we decrypt it ? */
-extern PRBool SEC_PKCS12DecryptionAllowed(SECAlgorithmID *algid);
-
-/* is encryption allowed? */
-extern PRBool SEC_PKCS12IsEncryptionAllowed(void);
-
-/* enable a cipher for encryption/decryption */
-extern SECStatus SEC_PKCS12EnableCipher(long which, int on);
-
-/* return the preferred cipher for encryption */
-extern SECStatus SEC_PKCS12SetPreferredCipher(long which, int on);
-
-SEC_END_PROTOS
-#endif
diff --git a/openflow/usr/include/nss/p12t.h b/openflow/usr/include/nss/p12t.h
deleted file mode 100644
index 62c2b50..0000000
--- a/openflow/usr/include/nss/p12t.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _P12T_H_
-#define _P12T_H_
-
-#include "secoid.h"
-#include "key.h"
-#include "pkcs11.h"
-#include "secpkcs7.h"
-#include "secdig.h" /* for SGNDigestInfo */
-#include "pkcs12t.h"
-
-#define SEC_PKCS12_VERSION 3
-
-/* structure declarations */
-typedef struct sec_PKCS12PFXItemStr sec_PKCS12PFXItem;
-typedef struct sec_PKCS12MacDataStr sec_PKCS12MacData;
-typedef struct sec_PKCS12AuthenticatedSafeStr sec_PKCS12AuthenticatedSafe;
-typedef struct sec_PKCS12SafeContentsStr sec_PKCS12SafeContents;
-typedef struct sec_PKCS12SafeBagStr sec_PKCS12SafeBag;
-typedef struct sec_PKCS12PKCS8ShroudedKeyBagStr sec_PKCS12PKCS8ShroudedKeyBag;
-typedef struct sec_PKCS12CertBagStr sec_PKCS12CertBag;
-typedef struct sec_PKCS12CRLBagStr sec_PKCS12CRLBag;
-typedef struct sec_PKCS12SecretBag sec_PKCS12SecretBag;
-typedef struct sec_PKCS12AttributeStr sec_PKCS12Attribute;
-
-struct sec_PKCS12CertBagStr {
-    /* what type of cert is stored? */
-    SECItem bagID;
-
-    /* certificate information */
-    union {
-        SECItem x509Cert;
-        SECItem SDSICert;
-    } value;
-};
-
-struct sec_PKCS12CRLBagStr {
-    /* what type of cert is stored? */
-    SECItem bagID;
-
-    /* certificate information */
-    union {
-        SECItem x509CRL;
-    } value;
-};
-
-struct sec_PKCS12SecretBag {
-    /* what type of secret? */
-    SECItem secretType;
-
-    /* secret information.  ssshhhh be vewy vewy quiet. */
-    SECItem secretContent;
-};
-
-struct sec_PKCS12AttributeStr {
-    SECItem attrType;
-    SECItem **attrValue;
-};
-
-struct sec_PKCS12SafeBagStr {
-
-    /* What type of bag are we using? */
-    SECItem safeBagType;
-
-    /* Dependent upon the type of bag being used. */
-    union {
-        SECKEYPrivateKeyInfo *pkcs8KeyBag;
-        SECKEYEncryptedPrivateKeyInfo *pkcs8ShroudedKeyBag;
-        sec_PKCS12CertBag *certBag;
-        sec_PKCS12CRLBag *crlBag;
-        sec_PKCS12SecretBag *secretBag;
-        sec_PKCS12SafeContents *safeContents;
-    } safeBagContent;
-
-    sec_PKCS12Attribute **attribs;
-
-    /* used locally */
-    SECOidData *bagTypeTag;
-    PLArenaPool *arena;
-    unsigned int nAttribs;
-
-    /* used for validation/importing */
-    PRBool problem, noInstall, validated, hasKey, unused, installed;
-    int error;
-
-    PRBool swapUnicodeBytes;
-    PK11SlotInfo *slot;
-    SECItem *pwitem;
-    PRBool oldBagType;
-    SECPKCS12TargetTokenCAs tokenCAs;
-};
-
-struct sec_PKCS12SafeContentsStr {
-    sec_PKCS12SafeBag **safeBags;
-    SECItem **encodedSafeBags;
-
-    /* used locally */
-    PLArenaPool *arena;
-    unsigned int bagCount;
-};
-
-struct sec_PKCS12MacDataStr {
-    SGNDigestInfo safeMac;
-    SECItem macSalt;
-    SECItem iter;
-};
-
-struct sec_PKCS12PFXItemStr {
-
-    SECItem version;
-
-    /* Content type will either be Data (password integrity mode)
-     * or signedData (public-key integrity mode)
-     */
-    SEC_PKCS7ContentInfo *authSafe;
-    SECItem encodedAuthSafe;
-
-    /* Only present in password integrity mode */
-    sec_PKCS12MacData macData;
-    SECItem encodedMacData;
-};
-
-struct sec_PKCS12AuthenticatedSafeStr {
-    /* Content type will either be encryptedData (password privacy mode)
-     * or envelopedData (public-key privacy mode)
-     */
-    SEC_PKCS7ContentInfo **safes;
-    SECItem **encodedSafes;
-
-    /* used locally */
-    unsigned int safeCount;
-    SECItem dummySafe;
-};
-
-extern const SEC_ASN1Template sec_PKCS12PFXItemTemplate[];
-extern const SEC_ASN1Template sec_PKCS12MacDataTemplate[];
-extern const SEC_ASN1Template sec_PKCS12AuthenticatedSafeTemplate[];
-extern const SEC_ASN1Template sec_PKCS12SafeContentsTemplate[];
-extern const SEC_ASN1Template sec_PKCS12SafeContentsDecodeTemplate[];
-extern const SEC_ASN1Template sec_PKCS12NestedSafeContentsDecodeTemplate[];
-extern const SEC_ASN1Template sec_PKCS12CertBagTemplate[];
-extern const SEC_ASN1Template sec_PKCS12CRLBagTemplate[];
-extern const SEC_ASN1Template sec_PKCS12SecretBagTemplate[];
-extern const SEC_ASN1Template sec_PKCS12PointerToCertBagTemplate[];
-extern const SEC_ASN1Template sec_PKCS12PointerToCRLBagTemplate[];
-extern const SEC_ASN1Template sec_PKCS12PointerToSecretBagTemplate[];
-extern const SEC_ASN1Template sec_PKCS12PointerToSafeContentsTemplate[];
-extern const SEC_ASN1Template sec_PKCS12AttributeTemplate[];
-extern const SEC_ASN1Template sec_PKCS12PointerToContentInfoTemplate[];
-extern const SEC_ASN1Template sec_PKCS12SafeBagTemplate[];
-
-#endif
diff --git a/openflow/usr/include/nss/pk11func.h b/openflow/usr/include/nss/pk11func.h
deleted file mode 100644
index 331c0eb..0000000
--- a/openflow/usr/include/nss/pk11func.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _PK11FUNC_H_
-#define _PK11FUNC_H_
-
-/*
- * The original pk11func.h had a mix of public and private functions.
- * Continue to provide those for backward compatibility.  New code should
- * include pk11pub.h instead of pk11func.h.
- */
-#include "pk11pub.h"
-#include "pk11priv.h"
-
-#endif
diff --git a/openflow/usr/include/nss/pk11pqg.h b/openflow/usr/include/nss/pk11pqg.h
deleted file mode 100644
index 36596dd..0000000
--- a/openflow/usr/include/nss/pk11pqg.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/* Thse functions are stub functions which will get replaced with calls through
- * PKCS #11.
- */
-
-#ifndef _PK11PQG_H_
-#define _PK11PQG_H_ 1
-
-#include "blapit.h"
-
-SEC_BEGIN_PROTOS
-
-/* Generate PQGParams and PQGVerify structs.
- * Length of seed and length of h both equal length of P.
- * All lengths are specified by "j", according to the table above.
- */
-extern SECStatus PK11_PQG_ParamGen(unsigned int j, PQGParams **pParams,
-                                   PQGVerify **pVfy);
-
-/* Generate PQGParams and PQGVerify structs.
- * Length of P specified by j.  Length of h will match length of P.
- * Length of SEED in bytes specified in seedBytes.
- * seedBbytes must be in the range [20..255] or an error will result.
- */
-extern SECStatus PK11_PQG_ParamGenSeedLen(unsigned int j,
-                                          unsigned int seedBytes, PQGParams **pParams, PQGVerify **pVfy);
-
-/* Generate PQGParams and PQGVerify structs.
- * Length of P specified by L.
- *   if L is greater than 1024 then the resulting verify parameters will be
- *   DSA2.
- * Length of Q specified by N. If zero, The PKCS #11 module will
- *   pick an appropriately sized Q for L. If N is specified and L = 1024, then
- *   the resulting verify parameters will be DSA2, Otherwise DSA1 parameters
- *   will be returned.
- * Length of SEED in bytes specified in seedBytes.
- *
- * The underlying PKCS #11 module will check the values for L, N,
- * and seedBytes. The rules for softoken are:
- *
- * If L <= 1024, then L must be between 512 and 1024 in increments of 64 bits.
- * If L <= 1024, then N must be 0 or 160.
- * If L >= 1024, then L and N must match the following table:
- *   L=1024   N=0 or 160
- *   L=2048   N=0 or 224
- *   L=2048   N=256
- *   L=3072   N=0 or 256
- * if L <= 1024
- *   seedBbytes must be in the range [20..256].
- * if L >= 1024
- *   seedBbytes must be in the range [20..L/16].
- */
-extern SECStatus
-PK11_PQG_ParamGenV2(unsigned int L, unsigned int N, unsigned int seedBytes,
-                    PQGParams **pParams, PQGVerify **pVfy);
-
-/*  Test PQGParams for validity as DSS PQG values.
- *  If vfy is non-NULL, test PQGParams to make sure they were generated
- *       using the specified seed, counter, and h values.
- *
- *  Return value indicates whether Verification operation ran successfully
- *  to completion, but does not indicate if PQGParams are valid or not.
- *  If return value is SECSuccess, then *pResult has these meanings:
- *       SECSuccess: PQGParams are valid.
- *       SECFailure: PQGParams are invalid.
- *
- * Verify the following 12 facts about PQG counter SEED g and h
- * These tests are specified in FIPS 186-3 Appendix A.1.1.1, A.1.1.3, and A.2.2
- * PQG_VerifyParams in softoken/freebl will automatically choose the
- * appropriate test.
- */
-extern SECStatus PK11_PQG_VerifyParams(const PQGParams *params,
-                                       const PQGVerify *vfy, SECStatus *result);
-extern void PK11_PQG_DestroyParams(PQGParams *params);
-extern void PK11_PQG_DestroyVerify(PQGVerify *vfy);
-
-/**************************************************************************
- *  Return a pointer to a new PQGParams struct that is constructed from   *
- *  copies of the arguments passed in.                                    *
- *  Return NULL on failure.                                               *
- **************************************************************************/
-extern PQGParams *PK11_PQG_NewParams(const SECItem *prime, const SECItem *subPrime, const SECItem *base);
-
-/**************************************************************************
- * Fills in caller's "prime" SECItem with the prime value in params.
- * Contents can be freed by calling SECITEM_FreeItem(prime, PR_FALSE);
- **************************************************************************/
-extern SECStatus PK11_PQG_GetPrimeFromParams(const PQGParams *params,
-                                             SECItem *prime);
-
-/**************************************************************************
- * Fills in caller's "subPrime" SECItem with the prime value in params.
- * Contents can be freed by calling SECITEM_FreeItem(subPrime, PR_FALSE);
- **************************************************************************/
-extern SECStatus PK11_PQG_GetSubPrimeFromParams(const PQGParams *params,
-                                                SECItem *subPrime);
-
-/**************************************************************************
- * Fills in caller's "base" SECItem with the base value in params.
- * Contents can be freed by calling SECITEM_FreeItem(base, PR_FALSE);
- **************************************************************************/
-extern SECStatus PK11_PQG_GetBaseFromParams(const PQGParams *params,
-                                            SECItem *base);
-
-/**************************************************************************
- *  Return a pointer to a new PQGVerify struct that is constructed from   *
- *  copies of the arguments passed in.                                    *
- *  Return NULL on failure.                                               *
- **************************************************************************/
-extern PQGVerify *PK11_PQG_NewVerify(unsigned int counter,
-                                     const SECItem *seed, const SECItem *h);
-
-/**************************************************************************
- * Returns "counter" value from the PQGVerify.
- **************************************************************************/
-extern unsigned int PK11_PQG_GetCounterFromVerify(const PQGVerify *verify);
-
-/**************************************************************************
- * Fills in caller's "seed" SECItem with the seed value in verify.
- * Contents can be freed by calling SECITEM_FreeItem(seed, PR_FALSE);
- **************************************************************************/
-extern SECStatus PK11_PQG_GetSeedFromVerify(const PQGVerify *verify,
-                                            SECItem *seed);
-
-/**************************************************************************
- * Fills in caller's "h" SECItem with the h value in verify.
- * Contents can be freed by calling SECITEM_FreeItem(h, PR_FALSE);
- **************************************************************************/
-extern SECStatus PK11_PQG_GetHFromVerify(const PQGVerify *verify, SECItem *h);
-
-SEC_END_PROTOS
-
-#endif
diff --git a/openflow/usr/include/nss/pk11priv.h b/openflow/usr/include/nss/pk11priv.h
deleted file mode 100644
index 45a60b4..0000000
--- a/openflow/usr/include/nss/pk11priv.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _PK11PRIV_H_
-#define _PK11PRIV_H_
-#include "plarena.h"
-#include "seccomon.h"
-#include "secoidt.h"
-#include "secdert.h"
-#include "keyt.h"
-#include "certt.h"
-#include "pkcs11t.h"
-#include "secmodt.h"
-#include "seccomon.h"
-#include "pkcs7t.h"
-#include "cmsreclist.h"
-
-/*
- * These are the private NSS functions. They are not exported by nss.def, and
- * are not callable outside nss3.dll.
- */
-
-SEC_BEGIN_PROTOS
-
-/************************************************************
- * Generic Slot Lists Management
- ************************************************************/
-PK11SlotList *PK11_NewSlotList(void);
-PK11SlotList *PK11_GetPrivateKeyTokens(CK_MECHANISM_TYPE type,
-                                       PRBool needRW, void *wincx);
-SECStatus PK11_AddSlotToList(PK11SlotList *list, PK11SlotInfo *slot, PRBool sorted);
-SECStatus PK11_DeleteSlotFromList(PK11SlotList *list, PK11SlotListElement *le);
-PK11SlotListElement *PK11_FindSlotElement(PK11SlotList *list,
-                                          PK11SlotInfo *slot);
-PK11SlotInfo *PK11_FindSlotBySerial(char *serial);
-int PK11_GetMaxKeyLength(CK_MECHANISM_TYPE type);
-
-/************************************************************
- * Generic Slot Management
- ************************************************************/
-CK_OBJECT_HANDLE PK11_CopyKey(PK11SlotInfo *slot, CK_OBJECT_HANDLE srcObject);
-SECStatus PK11_ReadAttribute(PK11SlotInfo *slot, CK_OBJECT_HANDLE id,
-                             CK_ATTRIBUTE_TYPE type, PLArenaPool *arena, SECItem *result);
-CK_ULONG PK11_ReadULongAttribute(PK11SlotInfo *slot, CK_OBJECT_HANDLE id,
-                                 CK_ATTRIBUTE_TYPE type);
-char *PK11_MakeString(PLArenaPool *arena, char *space, char *staticSring,
-                      int stringLen);
-int PK11_MapError(CK_RV error);
-CK_SESSION_HANDLE PK11_GetRWSession(PK11SlotInfo *slot);
-void PK11_RestoreROSession(PK11SlotInfo *slot, CK_SESSION_HANDLE rwsession);
-PRBool PK11_RWSessionHasLock(PK11SlotInfo *slot,
-                             CK_SESSION_HANDLE session_handle);
-PK11SlotInfo *PK11_NewSlotInfo(SECMODModule *mod);
-void PK11_EnterSlotMonitor(PK11SlotInfo *);
-void PK11_ExitSlotMonitor(PK11SlotInfo *);
-void PK11_CleanKeyList(PK11SlotInfo *slot);
-
-/************************************************************
- *  Slot Password Management
- ************************************************************/
-SECStatus PK11_DoPassword(PK11SlotInfo *slot, CK_SESSION_HANDLE session,
-                          PRBool loadCerts, void *wincx, PRBool alreadyLocked,
-                          PRBool contextSpecific);
-SECStatus PK11_VerifyPW(PK11SlotInfo *slot, char *pw);
-void PK11_HandlePasswordCheck(PK11SlotInfo *slot, void *wincx);
-void PK11_SetVerifyPasswordFunc(PK11VerifyPasswordFunc func);
-void PK11_SetIsLoggedInFunc(PK11IsLoggedInFunc func);
-
-/************************************************************
- * Manage the built-In Slot Lists
- ************************************************************/
-SECStatus PK11_InitSlotLists(void);
-void PK11_DestroySlotLists(void);
-PK11SlotList *PK11_GetSlotList(CK_MECHANISM_TYPE type);
-void PK11_LoadSlotList(PK11SlotInfo *slot, PK11PreSlotInfo *psi, int count);
-void PK11_ClearSlotList(PK11SlotInfo *slot);
-
-/******************************************************************
- *           Slot initialization
- ******************************************************************/
-SECStatus PK11_InitToken(PK11SlotInfo *slot, PRBool loadCerts);
-void PK11_InitSlot(SECMODModule *mod, CK_SLOT_ID slotID, PK11SlotInfo *slot);
-PRBool PK11_NeedPWInitForSlot(PK11SlotInfo *slot);
-SECStatus PK11_ReadSlotCerts(PK11SlotInfo *slot);
-void pk11_SetInternalKeySlot(PK11SlotInfo *slot);
-PK11SlotInfo *pk11_SwapInternalKeySlot(PK11SlotInfo *slot);
-void pk11_SetInternalKeySlotIfFirst(PK11SlotInfo *slot);
-
-/*********************************************************************
- *       Mechanism Mapping functions
- *********************************************************************/
-void PK11_AddMechanismEntry(CK_MECHANISM_TYPE type, CK_KEY_TYPE key,
-                            CK_MECHANISM_TYPE keygen, CK_MECHANISM_TYPE pad,
-                            int ivLen, int blocksize);
-CK_MECHANISM_TYPE PK11_GetKeyMechanism(CK_KEY_TYPE type);
-CK_MECHANISM_TYPE PK11_GetKeyGenWithSize(CK_MECHANISM_TYPE type, int size);
-
-/**********************************************************************
- *                   Symetric, Public, and Private Keys
- **********************************************************************/
-/* Key Generation specialized for SDR (fixed DES3 key) */
-PK11SymKey *PK11_GenDES3TokenKey(PK11SlotInfo *slot, SECItem *keyid, void *cx);
-SECKEYPublicKey *PK11_ExtractPublicKey(PK11SlotInfo *slot, KeyType keyType,
-                                       CK_OBJECT_HANDLE id);
-CK_OBJECT_HANDLE PK11_FindObjectForCert(CERTCertificate *cert,
-                                        void *wincx, PK11SlotInfo **pSlot);
-PK11SymKey *pk11_CopyToSlot(PK11SlotInfo *slot, CK_MECHANISM_TYPE type,
-                            CK_ATTRIBUTE_TYPE operation, PK11SymKey *symKey);
-
-/**********************************************************************
- *                   Certs
- **********************************************************************/
-SECStatus PK11_TraversePrivateKeysInSlot(PK11SlotInfo *slot,
-                                         SECStatus (*callback)(SECKEYPrivateKey *, void *), void *arg);
-SECKEYPrivateKey *PK11_FindPrivateKeyFromNickname(char *nickname, void *wincx);
-CK_OBJECT_HANDLE *PK11_FindObjectsFromNickname(char *nickname,
-                                               PK11SlotInfo **slotptr, CK_OBJECT_CLASS objclass, int *returnCount,
-                                               void *wincx);
-CK_OBJECT_HANDLE PK11_MatchItem(PK11SlotInfo *slot, CK_OBJECT_HANDLE peer,
-                                CK_OBJECT_CLASS o_class);
-CK_BBOOL PK11_HasAttributeSet(PK11SlotInfo *slot,
-                              CK_OBJECT_HANDLE id,
-                              CK_ATTRIBUTE_TYPE type,
-                              PRBool haslock);
-CK_RV PK11_GetAttributes(PLArenaPool *arena, PK11SlotInfo *slot,
-                         CK_OBJECT_HANDLE obj, CK_ATTRIBUTE *attr, int count);
-int PK11_NumberCertsForCertSubject(CERTCertificate *cert);
-SECStatus PK11_TraverseCertsForSubject(CERTCertificate *cert,
-                                       SECStatus (*callback)(CERTCertificate *, void *), void *arg);
-SECStatus PK11_GetKEAMatchedCerts(PK11SlotInfo *slot1,
-                                  PK11SlotInfo *slot2, CERTCertificate **cert1, CERTCertificate **cert2);
-SECStatus PK11_TraverseCertsInSlot(PK11SlotInfo *slot,
-                                   SECStatus (*callback)(CERTCertificate *, void *), void *arg);
-SECStatus PK11_LookupCrls(CERTCrlHeadNode *nodes, int type, void *wincx);
-
-/**********************************************************************
- *                   Crypto Contexts
- **********************************************************************/
-PK11Context *PK11_CreateContextByRawKey(PK11SlotInfo *slot,
-                                        CK_MECHANISM_TYPE type, PK11Origin origin, CK_ATTRIBUTE_TYPE operation,
-                                        SECItem *key, SECItem *param, void *wincx);
-PRBool PK11_HashOK(SECOidTag hashAlg);
-
-/**********************************************************************
- * Functions which are  deprecated....
- **********************************************************************/
-
-SECItem *
-PK11_FindCrlByName(PK11SlotInfo **slot, CK_OBJECT_HANDLE *handle,
-                   SECItem *derName, int type, char **url);
-
-CK_OBJECT_HANDLE
-PK11_PutCrl(PK11SlotInfo *slot, SECItem *crl,
-            SECItem *name, char *url, int type);
-
-SECItem *
-PK11_FindSMimeProfile(PK11SlotInfo **slotp, char *emailAddr, SECItem *derSubj,
-                      SECItem **profileTime);
-SECStatus
-PK11_SaveSMimeProfile(PK11SlotInfo *slot, char *emailAddr, SECItem *derSubj,
-                      SECItem *emailProfile, SECItem *profileTime);
-
-PRBool PK11_IsPermObject(PK11SlotInfo *slot, CK_OBJECT_HANDLE handle);
-
-char *PK11_GetObjectNickname(PK11SlotInfo *slot, CK_OBJECT_HANDLE id);
-SECStatus PK11_SetObjectNickname(PK11SlotInfo *slot, CK_OBJECT_HANDLE id,
-                                 const char *nickname);
-
-/* private */
-SECStatus pk11_TraverseAllSlots(SECStatus (*callback)(PK11SlotInfo *, void *),
-                                void *cbArg, PRBool forceLogin, void *pwArg);
-
-/* fetch multiple CRLs for a specific issuer */
-SECStatus pk11_RetrieveCrls(CERTCrlHeadNode *nodes, SECItem *issuer,
-                            void *wincx);
-
-/* set global options for NSS PKCS#11 module loader */
-SECStatus pk11_setGlobalOptions(PRBool noSingleThreadedModules,
-                                PRBool allowAlreadyInitializedModules,
-                                PRBool dontFinalizeModules);
-
-/* return whether NSS is allowed to call C_Finalize */
-PRBool pk11_getFinalizeModulesOption(void);
-
-SEC_END_PROTOS
-
-#endif
diff --git a/openflow/usr/include/nss/pk11pub.h b/openflow/usr/include/nss/pk11pub.h
deleted file mode 100644
index e11af86..0000000
--- a/openflow/usr/include/nss/pk11pub.h
+++ /dev/null
@@ -1,879 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _PK11PUB_H_
-#define _PK11PUB_H_
-#include "plarena.h"
-#include "seccomon.h"
-#include "secoidt.h"
-#include "secdert.h"
-#include "keyt.h"
-#include "certt.h"
-#include "pkcs11t.h"
-#include "secmodt.h"
-#include "seccomon.h"
-#include "pkcs7t.h"
-#include "cmsreclist.h"
-
-/*
- * Exported PK11 wrap functions.
- */
-
-SEC_BEGIN_PROTOS
-
-/************************************************************
- * Generic Slot Lists Management
- ************************************************************/
-void PK11_FreeSlotList(PK11SlotList *list);
-SECStatus PK11_FreeSlotListElement(PK11SlotList *list, PK11SlotListElement *le);
-PK11SlotListElement *PK11_GetFirstSafe(PK11SlotList *list);
-PK11SlotListElement *PK11_GetNextSafe(PK11SlotList *list,
-                                      PK11SlotListElement *le, PRBool restart);
-
-/************************************************************
- * Generic Slot Management
- ************************************************************/
-PK11SlotInfo *PK11_ReferenceSlot(PK11SlotInfo *slot);
-void PK11_FreeSlot(PK11SlotInfo *slot);
-SECStatus PK11_DestroyObject(PK11SlotInfo *slot, CK_OBJECT_HANDLE object);
-SECStatus PK11_DestroyTokenObject(PK11SlotInfo *slot, CK_OBJECT_HANDLE object);
-PK11SlotInfo *PK11_GetInternalKeySlot(void);
-PK11SlotInfo *PK11_GetInternalSlot(void);
-SECStatus PK11_Logout(PK11SlotInfo *slot);
-void PK11_LogoutAll(void);
-
-/************************************************************
- *  Slot Password Management
- ************************************************************/
-void PK11_SetSlotPWValues(PK11SlotInfo *slot, int askpw, int timeout);
-void PK11_GetSlotPWValues(PK11SlotInfo *slot, int *askpw, int *timeout);
-SECStatus PK11_CheckSSOPassword(PK11SlotInfo *slot, char *ssopw);
-SECStatus PK11_CheckUserPassword(PK11SlotInfo *slot, const char *pw);
-PRBool PK11_IsLoggedIn(PK11SlotInfo *slot, void *wincx);
-SECStatus PK11_InitPin(PK11SlotInfo *slot, const char *ssopw,
-                       const char *pk11_userpwd);
-SECStatus PK11_ChangePW(PK11SlotInfo *slot, const char *oldpw,
-                        const char *newpw);
-void PK11_SetPasswordFunc(PK11PasswordFunc func);
-int PK11_GetMinimumPwdLength(PK11SlotInfo *slot);
-SECStatus PK11_ResetToken(PK11SlotInfo *slot, char *sso_pwd);
-SECStatus PK11_Authenticate(PK11SlotInfo *slot, PRBool loadCerts, void *wincx);
-SECStatus PK11_TokenRefresh(PK11SlotInfo *slot);
-
-/******************************************************************
- *           Slot info functions
- ******************************************************************/
-PK11SlotInfo *PK11_FindSlotByName(const char *name);
-/******************************************************************
- * PK11_FindSlotsByNames searches for a PK11SlotInfo using one or
- * more criteria : dllName, slotName and tokenName . In addition, if
- * presentOnly is set , only slots with a token inserted will be
- * returned.
- ******************************************************************/
-PK11SlotList *PK11_FindSlotsByNames(const char *dllName,
-                                    const char *slotName, const char *tokenName, PRBool presentOnly);
-PRBool PK11_IsReadOnly(PK11SlotInfo *slot);
-PRBool PK11_IsInternal(PK11SlotInfo *slot);
-PRBool PK11_IsInternalKeySlot(PK11SlotInfo *slot);
-char *PK11_GetTokenName(PK11SlotInfo *slot);
-char *PK11_GetSlotName(PK11SlotInfo *slot);
-PRBool PK11_NeedLogin(PK11SlotInfo *slot);
-PRBool PK11_IsFriendly(PK11SlotInfo *slot);
-PRBool PK11_IsHW(PK11SlotInfo *slot);
-PRBool PK11_IsRemovable(PK11SlotInfo *slot);
-PRBool PK11_NeedUserInit(PK11SlotInfo *slot);
-PRBool PK11_ProtectedAuthenticationPath(PK11SlotInfo *slot);
-int PK11_GetSlotSeries(PK11SlotInfo *slot);
-int PK11_GetCurrentWrapIndex(PK11SlotInfo *slot);
-unsigned long PK11_GetDefaultFlags(PK11SlotInfo *slot);
-CK_SLOT_ID PK11_GetSlotID(PK11SlotInfo *slot);
-SECMODModuleID PK11_GetModuleID(PK11SlotInfo *slot);
-SECStatus PK11_GetSlotInfo(PK11SlotInfo *slot, CK_SLOT_INFO *info);
-SECStatus PK11_GetTokenInfo(PK11SlotInfo *slot, CK_TOKEN_INFO *info);
-PRBool PK11_IsDisabled(PK11SlotInfo *slot);
-PRBool PK11_HasRootCerts(PK11SlotInfo *slot);
-PK11DisableReasons PK11_GetDisabledReason(PK11SlotInfo *slot);
-/* Prevents the slot from being used, and set disable reason to user-disable */
-/* NOTE: Mechanisms that were ON continue to stay ON */
-/*       Therefore, when the slot is enabled, it will remember */
-/*       what mechanisms needs to be turned on */
-PRBool PK11_UserDisableSlot(PK11SlotInfo *slot);
-/* Allow all mechanisms that are ON before UserDisableSlot() */
-/* was called to be available again */
-PRBool PK11_UserEnableSlot(PK11SlotInfo *slot);
-/*
- * wait for a specific slot event.
- * event is a specific event to wait for. Currently only
- *    PK11TokenChangeOrRemovalEvent and PK11TokenPresentEvents are defined.
- * timeout can be an interval time to wait, PR_INTERVAL_NO_WAIT (meaning only
- * poll once), or PR_INTERVAL_NO_TIMEOUT (meaning block until a change).
- * pollInterval is a suggested pulling interval value. '0' means use the
- *  default. Future implementations that don't poll may ignore this value.
- * series is the current series for the last slot. This should be the series
- *  value for the slot the last time you read persistant information from the
- *  slot. For instance, if you publish a cert from the slot, you should obtain
- *  the slot series at that time. Then PK11_WaitForTokenEvent can detect a
- *  a change in the slot between the time you publish and the time
- *  PK11_WaitForTokenEvent is called, elliminating potential race conditions.
- *
- * The current status that is returned is:
- *   PK11TokenNotRemovable - always returned for any non-removable token.
- *   PK11TokenPresent - returned when the token is present and we are waiting
- *     on a PK11TokenPresentEvent. Then next event to look for is a
- *     PK11TokenChangeOrRemovalEvent.
- *   PK11TokenChanged - returned when the old token has been removed and a new
- *     token ad been inserted, and we are waiting for a
- *     PK11TokenChangeOrRemovalEvent. The next event to look for is another
- *     PK11TokenChangeOrRemovalEvent.
- *   PK11TokenRemoved - returned when the token is not present and we are
- *     waiting for a PK11TokenChangeOrRemovalEvent. The next event to look for
- *     is a PK11TokenPresentEvent.
- */
-PK11TokenStatus PK11_WaitForTokenEvent(PK11SlotInfo *slot, PK11TokenEvent event,
-                                       PRIntervalTime timeout, PRIntervalTime pollInterval, int series);
-
-PRBool PK11_NeedPWInit(void);
-PRBool PK11_TokenExists(CK_MECHANISM_TYPE);
-SECStatus PK11_GetModInfo(SECMODModule *mod, CK_INFO *info);
-PRBool PK11_IsFIPS(void);
-SECMODModule *PK11_GetModule(PK11SlotInfo *slot);
-
-/*********************************************************************
- *            Slot mapping utility functions.
- *********************************************************************/
-PRBool PK11_IsPresent(PK11SlotInfo *slot);
-PRBool PK11_DoesMechanism(PK11SlotInfo *slot, CK_MECHANISM_TYPE type);
-PK11SlotList *PK11_GetAllTokens(CK_MECHANISM_TYPE type, PRBool needRW,
-                                PRBool loadCerts, void *wincx);
-PK11SlotInfo *PK11_GetBestSlotMultipleWithAttributes(CK_MECHANISM_TYPE *type,
-                                                     CK_FLAGS *mechFlag, unsigned int *keySize,
-                                                     unsigned int count, void *wincx);
-PK11SlotInfo *PK11_GetBestSlotMultiple(CK_MECHANISM_TYPE *type,
-                                       unsigned int count, void *wincx);
-PK11SlotInfo *PK11_GetBestSlot(CK_MECHANISM_TYPE type, void *wincx);
-PK11SlotInfo *PK11_GetBestSlotWithAttributes(CK_MECHANISM_TYPE type,
-                                             CK_FLAGS mechFlag, unsigned int keySize, void *wincx);
-CK_MECHANISM_TYPE PK11_GetBestWrapMechanism(PK11SlotInfo *slot);
-int PK11_GetBestKeyLength(PK11SlotInfo *slot, CK_MECHANISM_TYPE type);
-
-/*
- * Open a new database using the softoken. The caller is responsible for making
- * sure the module spec is correct and usable. The caller should ask for one
- * new database per call if the caller wants to get meaningful information
- * about the new database.
- *
- * moduleSpec is the same data that you would pass to softoken at
- * initialization time under the 'tokens' options. For example, if you were
- * to specify tokens=<0x4=[configdir='./mybackup' tokenDescription='Backup']>
- * You would specify "configdir='./mybackup' tokenDescription='Backup'" as your
- * module spec here. The slot ID will be calculated for you by
- * SECMOD_OpenUserDB().
- *
- * Typical parameters here are configdir, tokenDescription and flags.
- *
- * a Full list is below:
- *
- *
- *  configDir - The location of the databases for this token. If configDir is
- *         not specified, and noCertDB and noKeyDB is not specified, the load
- *         will fail.
- *   certPrefix - Cert prefix for this token.
- *   keyPrefix - Prefix for the key database for this token. (if not specified,
- *         certPrefix will be used).
- *   tokenDescription - The label value for this token returned in the
- *         CK_TOKEN_INFO structure with an internationalize string (UTF8).
- *         This value will be truncated at 32 bytes (no NULL, partial UTF8
- *         characters dropped). You should specify a user friendly name here
- *         as this is the value the token will be referred to in most
- *         application UI's. You should make sure tokenDescription is unique.
- *   slotDescription - The slotDescription value for this token returned
- *         in the CK_SLOT_INFO structure with an internationalize string
- *         (UTF8). This value will be truncated at 64 bytes (no NULL, partial
- *         UTF8 characters dropped). This name will not change after the
- *         database is closed. It should have some number to make this unique.
- *   minPWLen - minimum password length for this token.
- *   flags - comma separated list of flag values, parsed case-insensitive.
- *         Valid flags are:
- *              readOnly - Databases should be opened read only.
- *              noCertDB - Don't try to open a certificate database.
- *              noKeyDB - Don't try to open a key database.
- *              forceOpen - Don't fail to initialize the token if the
- *                databases could not be opened.
- *              passwordRequired - zero length passwords are not acceptable
- *                (valid only if there is a keyDB).
- *              optimizeSpace - allocate smaller hash tables and lock tables.
- *                When this flag is not specified, Softoken will allocate
- *                large tables to prevent lock contention.
- */
-PK11SlotInfo *SECMOD_OpenUserDB(const char *moduleSpec);
-SECStatus SECMOD_CloseUserDB(PK11SlotInfo *slot);
-
-/*
- * This is exactly the same as OpenUserDB except it can be called on any
- * module that understands softoken style new slot entries. The resulting
- * slot can be closed using SECMOD_CloseUserDB above. Value of moduleSpec
- * is token specific.
- */
-PK11SlotInfo *SECMOD_OpenNewSlot(SECMODModule *mod, const char *moduleSpec);
-
-/*
- * merge the permanent objects from on token to another
- */
-SECStatus PK11_MergeTokens(PK11SlotInfo *targetSlot, PK11SlotInfo *sourceSlot,
-                           PK11MergeLog *log, void *targetPwArg, void *sourcePwArg);
-
-/*
- * create and destroy merge logs needed by PK11_MergeTokens
- */
-PK11MergeLog *PK11_CreateMergeLog(void);
-void PK11_DestroyMergeLog(PK11MergeLog *log);
-
-/*********************************************************************
- *       Mechanism Mapping functions
- *********************************************************************/
-CK_KEY_TYPE PK11_GetKeyType(CK_MECHANISM_TYPE type, unsigned long len);
-CK_MECHANISM_TYPE PK11_GetKeyGen(CK_MECHANISM_TYPE type);
-int PK11_GetBlockSize(CK_MECHANISM_TYPE type, SECItem *params);
-int PK11_GetIVLength(CK_MECHANISM_TYPE type);
-SECItem *PK11_ParamFromIV(CK_MECHANISM_TYPE type, SECItem *iv);
-unsigned char *PK11_IVFromParam(CK_MECHANISM_TYPE type, SECItem *param, int *len);
-SECItem *PK11_BlockData(SECItem *data, unsigned long size);
-
-/* PKCS #11 to DER mapping functions */
-SECItem *PK11_ParamFromAlgid(SECAlgorithmID *algid);
-SECItem *PK11_GenerateNewParam(CK_MECHANISM_TYPE, PK11SymKey *);
-CK_MECHANISM_TYPE PK11_AlgtagToMechanism(SECOidTag algTag);
-SECOidTag PK11_MechanismToAlgtag(CK_MECHANISM_TYPE type);
-SECOidTag PK11_FortezzaMapSig(SECOidTag algTag);
-SECStatus PK11_ParamToAlgid(SECOidTag algtag, SECItem *param,
-                            PLArenaPool *arena, SECAlgorithmID *algid);
-SECStatus PK11_SeedRandom(PK11SlotInfo *, unsigned char *data, int len);
-SECStatus PK11_GenerateRandomOnSlot(PK11SlotInfo *, unsigned char *data, int len);
-SECStatus PK11_RandomUpdate(void *data, size_t bytes);
-SECStatus PK11_GenerateRandom(unsigned char *data, int len);
-
-/* warning: cannot work with pkcs 5 v2
- * use algorithm ID s instead of pkcs #11 mechanism pointers */
-CK_RV PK11_MapPBEMechanismToCryptoMechanism(CK_MECHANISM_PTR pPBEMechanism,
-                                            CK_MECHANISM_PTR pCryptoMechanism,
-                                            SECItem *pbe_pwd, PRBool bad3DES);
-CK_MECHANISM_TYPE PK11_GetPadMechanism(CK_MECHANISM_TYPE);
-CK_MECHANISM_TYPE PK11_MapSignKeyType(KeyType keyType);
-
-/**********************************************************************
- *                   Symmetric, Public, and Private Keys
- **********************************************************************/
-void PK11_FreeSymKey(PK11SymKey *key);
-PK11SymKey *PK11_ReferenceSymKey(PK11SymKey *symKey);
-PK11SymKey *PK11_ImportSymKey(PK11SlotInfo *slot, CK_MECHANISM_TYPE type,
-                              PK11Origin origin, CK_ATTRIBUTE_TYPE operation, SECItem *key, void *wincx);
-PK11SymKey *PK11_ImportSymKeyWithFlags(PK11SlotInfo *slot,
-                                       CK_MECHANISM_TYPE type, PK11Origin origin, CK_ATTRIBUTE_TYPE operation,
-                                       SECItem *key, CK_FLAGS flags, PRBool isPerm, void *wincx);
-PK11SymKey *PK11_SymKeyFromHandle(PK11SlotInfo *slot, PK11SymKey *parent,
-                                  PK11Origin origin, CK_MECHANISM_TYPE type, CK_OBJECT_HANDLE keyID,
-                                  PRBool owner, void *wincx);
-PK11SymKey *PK11_GetWrapKey(PK11SlotInfo *slot, int wrap,
-                            CK_MECHANISM_TYPE type, int series, void *wincx);
-/*
- * This function is not thread-safe.  It can only be called when only
- * one thread has a reference to wrapKey.
- */
-void PK11_SetWrapKey(PK11SlotInfo *slot, int wrap, PK11SymKey *wrapKey);
-CK_MECHANISM_TYPE PK11_GetMechanism(PK11SymKey *symKey);
-/*
- * import a public key into the desired slot
- *
- * This function takes a public key structure and creates a public key in a
- * given slot. If isToken is set, then a persistant public key is created.
- *
- * Note: it is possible for this function to return a handle for a key which
- * is persistant, even if isToken is not set.
- */
-CK_OBJECT_HANDLE PK11_ImportPublicKey(PK11SlotInfo *slot,
-                                      SECKEYPublicKey *pubKey, PRBool isToken);
-PK11SymKey *PK11_KeyGen(PK11SlotInfo *slot, CK_MECHANISM_TYPE type,
-                        SECItem *param, int keySize, void *wincx);
-PK11SymKey *PK11_TokenKeyGen(PK11SlotInfo *slot, CK_MECHANISM_TYPE type,
-                             SECItem *param, int keySize, SECItem *keyid,
-                             PRBool isToken, void *wincx);
-PK11SymKey *PK11_TokenKeyGenWithFlags(PK11SlotInfo *slot,
-                                      CK_MECHANISM_TYPE type, SECItem *param,
-                                      int keySize, SECItem *keyid, CK_FLAGS opFlags,
-                                      PK11AttrFlags attrFlags, void *wincx);
-/* Generates a key using the exact template supplied by the caller. The other
- * PK11_[Token]KeyGen mechanisms should be used instead of this one whenever
- * they work because they include/exclude the CKA_VALUE_LEN template value
- * based on the mechanism type as required by many tokens.
- *
- * keyGenType should be PK11_GetKeyGenWithSize(type, <key size>) or it should
- * be equal to type if PK11_GetKeyGenWithSize cannot be used (e.g. because
- * pk11wrap does not know about the mechanisms).
- */
-PK11SymKey *PK11_KeyGenWithTemplate(PK11SlotInfo *slot, CK_MECHANISM_TYPE type,
-                                    CK_MECHANISM_TYPE keyGenType,
-                                    SECItem *param, CK_ATTRIBUTE *attrs,
-                                    unsigned int attrsCount, void *wincx);
-PK11SymKey *PK11_ListFixedKeysInSlot(PK11SlotInfo *slot, char *nickname,
-                                     void *wincx);
-PK11SymKey *PK11_GetNextSymKey(PK11SymKey *symKey);
-CK_KEY_TYPE PK11_GetSymKeyType(PK11SymKey *key);
-CK_OBJECT_HANDLE PK11_GetSymKeyHandle(PK11SymKey *symKey);
-
-/*
- * PK11_SetSymKeyUserData
- *   sets generic user data on keys (usually a pointer to a data structure)
- * that can later be retrieved by PK11_GetSymKeyUserData().
- *    symKey - key where data will be set.
- *    data - data to be set.
- *    freefunc - function used to free the data.
- * Setting user data on symKeys with existing user data already set will cause
- * the existing user data to be freed before the new user data is set.
- * Freeing user data is done by calling the user specified freefunc.
- * If freefunc is NULL, the user data is assumed to be global or static an
- * not freed. Passing NULL for user data to PK11_SetSymKeyUserData has the
- * effect of freeing any existing user data, and clearing the user data
- * pointer. If user data exists when the symKey is finally freed, that
- * data will be freed with freefunc.
- *
- * Applications should only use this function on keys which the application
- * has created directly, as there is only one user data value per key.
- */
-void PK11_SetSymKeyUserData(PK11SymKey *symKey, void *data,
-                            PK11FreeDataFunc freefunc);
-/* PK11_GetSymKeyUserData
- *   retrieves generic user data which was set on a key by
- * PK11_SetSymKeyUserData.
- *    symKey - key with data to be fetched
- *
- * If no data exists, or the data has been cleared, PK11_GetSymKeyUserData
- * will return NULL. Returned data is still owned and managed by the SymKey,
- * the caller should not free the data.
- *
- */
-void *PK11_GetSymKeyUserData(PK11SymKey *symKey);
-
-SECStatus PK11_PubWrapSymKey(CK_MECHANISM_TYPE type, SECKEYPublicKey *pubKey,
-                             PK11SymKey *symKey, SECItem *wrappedKey);
-SECStatus PK11_WrapSymKey(CK_MECHANISM_TYPE type, SECItem *params,
-                          PK11SymKey *wrappingKey, PK11SymKey *symKey, SECItem *wrappedKey);
-/* move a key to 'slot' optionally set the key attributes according to either
- * operation or the  flags and making the key permanent at the same time.
- * If the key is moved to the same slot, operation and flags values are
- * currently ignored */
-PK11SymKey *PK11_MoveSymKey(PK11SlotInfo *slot, CK_ATTRIBUTE_TYPE operation,
-                            CK_FLAGS flags, PRBool perm, PK11SymKey *symKey);
-/*
- * derive a new key from the base key.
- *  PK11_Derive returns a key which can do exactly one operation, and is
- * ephemeral (session key).
- *  PK11_DeriveWithFlags is the same as PK11_Derive, except you can use
- * CKF_ flags to enable more than one operation.
- *  PK11_DeriveWithFlagsPerm is the same as PK11_DeriveWithFlags except you can
- *  (optionally) make the key permanent (token key).
- */
-PK11SymKey *PK11_Derive(PK11SymKey *baseKey, CK_MECHANISM_TYPE mechanism,
-                        SECItem *param, CK_MECHANISM_TYPE target,
-                        CK_ATTRIBUTE_TYPE operation, int keySize);
-PK11SymKey *PK11_DeriveWithFlags(PK11SymKey *baseKey,
-                                 CK_MECHANISM_TYPE derive, SECItem *param, CK_MECHANISM_TYPE target,
-                                 CK_ATTRIBUTE_TYPE operation, int keySize, CK_FLAGS flags);
-PK11SymKey *PK11_DeriveWithFlagsPerm(PK11SymKey *baseKey,
-                                     CK_MECHANISM_TYPE derive,
-                                     SECItem *param, CK_MECHANISM_TYPE target, CK_ATTRIBUTE_TYPE operation,
-                                     int keySize, CK_FLAGS flags, PRBool isPerm);
-PK11SymKey *
-PK11_DeriveWithTemplate(PK11SymKey *baseKey, CK_MECHANISM_TYPE derive,
-                        SECItem *param, CK_MECHANISM_TYPE target, CK_ATTRIBUTE_TYPE operation,
-                        int keySize, CK_ATTRIBUTE *userAttr, unsigned int numAttrs,
-                        PRBool isPerm);
-
-PK11SymKey *PK11_PubDerive(SECKEYPrivateKey *privKey,
-                           SECKEYPublicKey *pubKey, PRBool isSender, SECItem *randomA, SECItem *randomB,
-                           CK_MECHANISM_TYPE derive, CK_MECHANISM_TYPE target,
-                           CK_ATTRIBUTE_TYPE operation, int keySize, void *wincx);
-PK11SymKey *PK11_PubDeriveWithKDF(SECKEYPrivateKey *privKey,
-                                  SECKEYPublicKey *pubKey, PRBool isSender, SECItem *randomA, SECItem *randomB,
-                                  CK_MECHANISM_TYPE derive, CK_MECHANISM_TYPE target,
-                                  CK_ATTRIBUTE_TYPE operation, int keySize,
-                                  CK_ULONG kdf, SECItem *sharedData, void *wincx);
-
-/*
- * unwrap a new key with a symetric key.
- *  PK11_Unwrap returns a key which can do exactly one operation, and is
- * ephemeral (session key).
- *  PK11_UnwrapWithFlags is the same as PK11_Unwrap, except you can use
- * CKF_ flags to enable more than one operation.
- *  PK11_UnwrapWithFlagsPerm is the same as PK11_UnwrapWithFlags except you can
- *  (optionally) make the key permanent (token key).
- */
-PK11SymKey *PK11_UnwrapSymKey(PK11SymKey *key,
-                              CK_MECHANISM_TYPE wraptype, SECItem *param, SECItem *wrapppedKey,
-                              CK_MECHANISM_TYPE target, CK_ATTRIBUTE_TYPE operation, int keySize);
-PK11SymKey *PK11_UnwrapSymKeyWithFlags(PK11SymKey *wrappingKey,
-                                       CK_MECHANISM_TYPE wrapType, SECItem *param, SECItem *wrappedKey,
-                                       CK_MECHANISM_TYPE target, CK_ATTRIBUTE_TYPE operation, int keySize,
-                                       CK_FLAGS flags);
-PK11SymKey *PK11_UnwrapSymKeyWithFlagsPerm(PK11SymKey *wrappingKey,
-                                           CK_MECHANISM_TYPE wrapType,
-                                           SECItem *param, SECItem *wrappedKey,
-                                           CK_MECHANISM_TYPE target, CK_ATTRIBUTE_TYPE operation,
-                                           int keySize, CK_FLAGS flags, PRBool isPerm);
-
-/*
- * unwrap a new key with a private key.
- *  PK11_PubUnwrap returns a key which can do exactly one operation, and is
- * ephemeral (session key).
- *  PK11_PubUnwrapWithFlagsPerm is the same as PK11_PubUnwrap except you can
- * use * CKF_ flags to enable more than one operation, and optionally make
- * the key permanent (token key).
- */
-PK11SymKey *PK11_PubUnwrapSymKey(SECKEYPrivateKey *key, SECItem *wrapppedKey,
-                                 CK_MECHANISM_TYPE target, CK_ATTRIBUTE_TYPE operation, int keySize);
-PK11SymKey *PK11_PubUnwrapSymKeyWithFlagsPerm(SECKEYPrivateKey *wrappingKey,
-                                              SECItem *wrappedKey, CK_MECHANISM_TYPE target,
-                                              CK_ATTRIBUTE_TYPE operation, int keySize,
-                                              CK_FLAGS flags, PRBool isPerm);
-PK11SymKey *PK11_FindFixedKey(PK11SlotInfo *slot, CK_MECHANISM_TYPE type,
-                              SECItem *keyID, void *wincx);
-SECStatus PK11_DeleteTokenPrivateKey(SECKEYPrivateKey *privKey, PRBool force);
-SECStatus PK11_DeleteTokenPublicKey(SECKEYPublicKey *pubKey);
-SECStatus PK11_DeleteTokenSymKey(PK11SymKey *symKey);
-SECStatus PK11_DeleteTokenCertAndKey(CERTCertificate *cert, void *wincx);
-SECKEYPrivateKey *PK11_LoadPrivKey(PK11SlotInfo *slot,
-                                   SECKEYPrivateKey *privKey, SECKEYPublicKey *pubKey,
-                                   PRBool token, PRBool sensitive);
-char *PK11_GetSymKeyNickname(PK11SymKey *symKey);
-char *PK11_GetPrivateKeyNickname(SECKEYPrivateKey *privKey);
-char *PK11_GetPublicKeyNickname(SECKEYPublicKey *pubKey);
-SECStatus PK11_SetSymKeyNickname(PK11SymKey *symKey, const char *nickname);
-SECStatus PK11_SetPrivateKeyNickname(SECKEYPrivateKey *privKey,
-                                     const char *nickname);
-SECStatus PK11_SetPublicKeyNickname(SECKEYPublicKey *pubKey,
-                                    const char *nickname);
-
-/*
- * Using __PK11_SetCertificateNickname is *DANGEROUS*.
- *
- * The API will update the NSS database, but it *will NOT* update the in-memory data.
- * As a result, after calling this API, there will be INCONSISTENCY between
- * in-memory data and the database.
- *
- * Use of the API should be limited to short-lived tools, which will exit immediately
- * after using this API.
- *
- * If you ignore this warning, your process is TAINTED and will most likely misbehave.
- */
-SECStatus __PK11_SetCertificateNickname(CERTCertificate *cert,
-                                        const char *nickname);
-
-/* size to hold key in bytes */
-unsigned int PK11_GetKeyLength(PK11SymKey *key);
-/* size of actual secret parts of key in bits */
-/* algid is because RC4 strength is determined by the effective bits as well
- * as the key bits */
-unsigned int PK11_GetKeyStrength(PK11SymKey *key, SECAlgorithmID *algid);
-SECStatus PK11_ExtractKeyValue(PK11SymKey *symKey);
-SECItem *PK11_GetKeyData(PK11SymKey *symKey);
-PK11SlotInfo *PK11_GetSlotFromKey(PK11SymKey *symKey);
-void *PK11_GetWindow(PK11SymKey *symKey);
-
-/*
- * Explicitly set the key usage for the generated private key.
- *
- * This allows us to specify single use EC and RSA keys whose usage
- * can be regulated by the underlying token.
- *
- * The underlying key usage is set using opFlags. opFlagsMask specifies
- * which operations are specified by opFlags. For instance to turn encrypt
- * on and signing off, opFlags would be CKF_ENCRYPT|CKF_DECRYPT and
- * opFlagsMask would be CKF_ENCRYPT|CKF_DECRYPT|CKF_SIGN|CKF_VERIFY. You
- * need to specify both the public and private key flags,
- * PK11_GenerateKeyPairWithOpFlags will sort out the correct flag to the
- * correct key type. Flags not specified in opFlagMask will be defaulted
- * according to mechanism type and token capabilities.
- */
-SECKEYPrivateKey *PK11_GenerateKeyPairWithOpFlags(PK11SlotInfo *slot,
-                                                  CK_MECHANISM_TYPE type, void *param, SECKEYPublicKey **pubk,
-                                                  PK11AttrFlags attrFlags, CK_FLAGS opFlags, CK_FLAGS opFlagsMask,
-                                                  void *wincx);
-/*
- * The attrFlags is the logical OR of the PK11_ATTR_XXX bitflags.
- * These flags apply to the private key.  The PK11_ATTR_TOKEN,
- * PK11_ATTR_SESSION, PK11_ATTR_MODIFIABLE, and PK11_ATTR_UNMODIFIABLE
- * flags also apply to the public key.
- */
-SECKEYPrivateKey *PK11_GenerateKeyPairWithFlags(PK11SlotInfo *slot,
-                                                CK_MECHANISM_TYPE type, void *param, SECKEYPublicKey **pubk,
-                                                PK11AttrFlags attrFlags, void *wincx);
-SECKEYPrivateKey *PK11_GenerateKeyPair(PK11SlotInfo *slot,
-                                       CK_MECHANISM_TYPE type, void *param, SECKEYPublicKey **pubk,
-                                       PRBool isPerm, PRBool isSensitive, void *wincx);
-SECKEYPrivateKey *PK11_FindPrivateKeyFromCert(PK11SlotInfo *slot,
-                                              CERTCertificate *cert, void *wincx);
-SECKEYPrivateKey *PK11_FindKeyByAnyCert(CERTCertificate *cert, void *wincx);
-SECKEYPrivateKey *PK11_FindKeyByKeyID(PK11SlotInfo *slot, SECItem *keyID,
-                                      void *wincx);
-int PK11_GetPrivateModulusLen(SECKEYPrivateKey *key);
-
-SECStatus PK11_Decrypt(PK11SymKey *symkey,
-                       CK_MECHANISM_TYPE mechanism, SECItem *param,
-                       unsigned char *out, unsigned int *outLen,
-                       unsigned int maxLen,
-                       const unsigned char *enc, unsigned int encLen);
-SECStatus PK11_Encrypt(PK11SymKey *symKey,
-                       CK_MECHANISM_TYPE mechanism, SECItem *param,
-                       unsigned char *out, unsigned int *outLen,
-                       unsigned int maxLen,
-                       const unsigned char *data, unsigned int dataLen);
-
-/* note: despite the name, this function takes a private key. */
-SECStatus PK11_PubDecryptRaw(SECKEYPrivateKey *key,
-                             unsigned char *data, unsigned *outLen,
-                             unsigned int maxLen,
-                             const unsigned char *enc, unsigned encLen);
-#define PK11_PrivDecryptRaw PK11_PubDecryptRaw
-/* The encrypt function that complements the above decrypt function. */
-SECStatus PK11_PubEncryptRaw(SECKEYPublicKey *key,
-                             unsigned char *enc,
-                             const unsigned char *data, unsigned dataLen,
-                             void *wincx);
-
-SECStatus PK11_PrivDecryptPKCS1(SECKEYPrivateKey *key,
-                                unsigned char *data, unsigned *outLen,
-                                unsigned int maxLen,
-                                const unsigned char *enc, unsigned encLen);
-/* The encrypt function that complements the above decrypt function. */
-SECStatus PK11_PubEncryptPKCS1(SECKEYPublicKey *key,
-                               unsigned char *enc,
-                               const unsigned char *data, unsigned dataLen,
-                               void *wincx);
-
-SECStatus PK11_PrivDecrypt(SECKEYPrivateKey *key,
-                           CK_MECHANISM_TYPE mechanism, SECItem *param,
-                           unsigned char *out, unsigned int *outLen,
-                           unsigned int maxLen,
-                           const unsigned char *enc, unsigned int encLen);
-SECStatus PK11_PubEncrypt(SECKEYPublicKey *key,
-                          CK_MECHANISM_TYPE mechanism, SECItem *param,
-                          unsigned char *out, unsigned int *outLen,
-                          unsigned int maxLen,
-                          const unsigned char *data, unsigned int dataLen,
-                          void *wincx);
-
-SECStatus PK11_ImportPrivateKeyInfo(PK11SlotInfo *slot,
-                                    SECKEYPrivateKeyInfo *pki, SECItem *nickname,
-                                    SECItem *publicValue, PRBool isPerm, PRBool isPrivate,
-                                    unsigned int usage, void *wincx);
-SECStatus PK11_ImportPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot,
-                                                SECKEYPrivateKeyInfo *pki, SECItem *nickname,
-                                                SECItem *publicValue, PRBool isPerm, PRBool isPrivate,
-                                                unsigned int usage, SECKEYPrivateKey **privk, void *wincx);
-SECStatus PK11_ImportDERPrivateKeyInfo(PK11SlotInfo *slot,
-                                       SECItem *derPKI, SECItem *nickname,
-                                       SECItem *publicValue, PRBool isPerm, PRBool isPrivate,
-                                       unsigned int usage, void *wincx);
-SECStatus PK11_ImportDERPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot,
-                                                   SECItem *derPKI, SECItem *nickname,
-                                                   SECItem *publicValue, PRBool isPerm, PRBool isPrivate,
-                                                   unsigned int usage, SECKEYPrivateKey **privk, void *wincx);
-SECStatus PK11_ImportEncryptedPrivateKeyInfo(PK11SlotInfo *slot,
-                                             SECKEYEncryptedPrivateKeyInfo *epki, SECItem *pwitem,
-                                             SECItem *nickname, SECItem *publicValue, PRBool isPerm,
-                                             PRBool isPrivate, KeyType type,
-                                             unsigned int usage, void *wincx);
-SECStatus PK11_ImportEncryptedPrivateKeyInfoAndReturnKey(PK11SlotInfo *slot,
-                                                         SECKEYEncryptedPrivateKeyInfo *epki, SECItem *pwitem,
-                                                         SECItem *nickname, SECItem *publicValue, PRBool isPerm,
-                                                         PRBool isPrivate, KeyType type,
-                                                         unsigned int usage, SECKEYPrivateKey **privk, void *wincx);
-SECItem *PK11_ExportDERPrivateKeyInfo(SECKEYPrivateKey *pk, void *wincx);
-SECKEYPrivateKeyInfo *PK11_ExportPrivKeyInfo(
-    SECKEYPrivateKey *pk, void *wincx);
-SECKEYPrivateKeyInfo *PK11_ExportPrivateKeyInfo(
-    CERTCertificate *cert, void *wincx);
-SECKEYEncryptedPrivateKeyInfo *PK11_ExportEncryptedPrivKeyInfo(
-    PK11SlotInfo *slot, SECOidTag algTag, SECItem *pwitem,
-    SECKEYPrivateKey *pk, int iteration, void *wincx);
-SECKEYEncryptedPrivateKeyInfo *PK11_ExportEncryptedPrivateKeyInfo(
-    PK11SlotInfo *slot, SECOidTag algTag, SECItem *pwitem,
-    CERTCertificate *cert, int iteration, void *wincx);
-SECKEYPrivateKey *PK11_FindKeyByDERCert(PK11SlotInfo *slot,
-                                        CERTCertificate *cert, void *wincx);
-SECKEYPublicKey *PK11_MakeKEAPubKey(unsigned char *data, int length);
-SECStatus PK11_DigestKey(PK11Context *context, PK11SymKey *key);
-PRBool PK11_VerifyKeyOK(PK11SymKey *key);
-SECKEYPrivateKey *PK11_UnwrapPrivKey(PK11SlotInfo *slot,
-                                     PK11SymKey *wrappingKey, CK_MECHANISM_TYPE wrapType,
-                                     SECItem *param, SECItem *wrappedKey, SECItem *label,
-                                     SECItem *publicValue, PRBool token, PRBool sensitive,
-                                     CK_KEY_TYPE keyType, CK_ATTRIBUTE_TYPE *usage, int usageCount,
-                                     void *wincx);
-SECStatus PK11_WrapPrivKey(PK11SlotInfo *slot, PK11SymKey *wrappingKey,
-                           SECKEYPrivateKey *privKey, CK_MECHANISM_TYPE wrapType,
-                           SECItem *param, SECItem *wrappedKey, void *wincx);
-/*
- * The caller of PK11_DEREncodePublicKey should free the returned SECItem with
- * a SECITEM_FreeItem(..., PR_TRUE) call.
- */
-SECItem *PK11_DEREncodePublicKey(const SECKEYPublicKey *pubk);
-PK11SymKey *PK11_CopySymKeyForSigning(PK11SymKey *originalKey,
-                                      CK_MECHANISM_TYPE mech);
-SECKEYPrivateKeyList *PK11_ListPrivKeysInSlot(PK11SlotInfo *slot,
-                                              char *nickname, void *wincx);
-SECKEYPublicKeyList *PK11_ListPublicKeysInSlot(PK11SlotInfo *slot,
-                                               char *nickname);
-SECKEYPQGParams *PK11_GetPQGParamsFromPrivateKey(SECKEYPrivateKey *privKey);
-/* deprecated */
-SECKEYPrivateKeyList *PK11_ListPrivateKeysInSlot(PK11SlotInfo *slot);
-
-PK11SymKey *PK11_ConvertSessionSymKeyToTokenSymKey(PK11SymKey *symk,
-                                                   void *wincx);
-SECKEYPrivateKey *PK11_ConvertSessionPrivKeyToTokenPrivKey(
-    SECKEYPrivateKey *privk, void *wincx);
-SECKEYPrivateKey *PK11_CopyTokenPrivKeyToSessionPrivKey(PK11SlotInfo *destSlot,
-                                                        SECKEYPrivateKey *privKey);
-
-/**********************************************************************
- *                   Certs
- **********************************************************************/
-SECItem *PK11_MakeIDFromPubKey(SECItem *pubKeyData);
-SECStatus PK11_TraverseSlotCerts(
-    SECStatus (*callback)(CERTCertificate *, SECItem *, void *),
-    void *arg, void *wincx);
-CERTCertificate *PK11_FindCertFromNickname(const char *nickname, void *wincx);
-CERTCertList *PK11_FindCertsFromEmailAddress(const char *email, void *wincx);
-CERTCertList *PK11_FindCertsFromNickname(const char *nickname, void *wincx);
-CERTCertificate *PK11_GetCertFromPrivateKey(SECKEYPrivateKey *privKey);
-SECStatus PK11_ImportCert(PK11SlotInfo *slot, CERTCertificate *cert,
-                          CK_OBJECT_HANDLE key, const char *nickname,
-                          PRBool includeTrust);
-SECStatus PK11_ImportDERCert(PK11SlotInfo *slot, SECItem *derCert,
-                             CK_OBJECT_HANDLE key, char *nickname, PRBool includeTrust);
-PK11SlotInfo *PK11_ImportCertForKey(CERTCertificate *cert,
-                                    const char *nickname, void *wincx);
-PK11SlotInfo *PK11_ImportDERCertForKey(SECItem *derCert, char *nickname,
-                                       void *wincx);
-PK11SlotInfo *PK11_KeyForCertExists(CERTCertificate *cert,
-                                    CK_OBJECT_HANDLE *keyPtr, void *wincx);
-PK11SlotInfo *PK11_KeyForDERCertExists(SECItem *derCert,
-                                       CK_OBJECT_HANDLE *keyPtr, void *wincx);
-CERTCertificate *PK11_FindCertByIssuerAndSN(PK11SlotInfo **slot,
-                                            CERTIssuerAndSN *sn, void *wincx);
-CERTCertificate *PK11_FindCertAndKeyByRecipientList(PK11SlotInfo **slot,
-                                                    SEC_PKCS7RecipientInfo **array, SEC_PKCS7RecipientInfo **rip,
-                                                    SECKEYPrivateKey **privKey, void *wincx);
-int PK11_FindCertAndKeyByRecipientListNew(NSSCMSRecipient **recipientlist,
-                                          void *wincx);
-SECStatus PK11_TraverseCertsForSubjectInSlot(CERTCertificate *cert,
-                                             PK11SlotInfo *slot, SECStatus (*callback)(CERTCertificate *, void *),
-                                             void *arg);
-CERTCertificate *PK11_FindCertFromDERCert(PK11SlotInfo *slot,
-                                          CERTCertificate *cert, void *wincx);
-CERTCertificate *PK11_FindCertFromDERCertItem(PK11SlotInfo *slot,
-                                              const SECItem *derCert, void *wincx);
-SECStatus PK11_ImportCertForKeyToSlot(PK11SlotInfo *slot, CERTCertificate *cert,
-                                      char *nickname, PRBool addUsage,
-                                      void *wincx);
-CERTCertificate *PK11_FindBestKEAMatch(CERTCertificate *serverCert, void *wincx);
-PRBool PK11_FortezzaHasKEA(CERTCertificate *cert);
-CK_OBJECT_HANDLE PK11_FindCertInSlot(PK11SlotInfo *slot, CERTCertificate *cert,
-                                     void *wincx);
-SECStatus PK11_TraverseCertsForNicknameInSlot(SECItem *nickname,
-                                              PK11SlotInfo *slot, SECStatus (*callback)(CERTCertificate *, void *),
-                                              void *arg);
-CERTCertList *PK11_ListCerts(PK11CertListType type, void *pwarg);
-CERTCertList *PK11_ListCertsInSlot(PK11SlotInfo *slot);
-CERTSignedCrl *PK11_ImportCRL(PK11SlotInfo *slot, SECItem *derCRL, char *url,
-                              int type, void *wincx, PRInt32 importOptions, PLArenaPool *arena, PRInt32 decodeOptions);
-
-/**********************************************************************
- *                   Sign/Verify
- **********************************************************************/
-
-/*
- * Return the length in bytes of a signature generated with the
- * private key.
- *
- * Return 0 or -1 on failure.  (XXX Should we fix it to always return
- * -1 on failure?)
- */
-int PK11_SignatureLen(SECKEYPrivateKey *key);
-PK11SlotInfo *PK11_GetSlotFromPrivateKey(SECKEYPrivateKey *key);
-SECStatus PK11_Sign(SECKEYPrivateKey *key, SECItem *sig,
-                    const SECItem *hash);
-SECStatus PK11_SignWithMechanism(SECKEYPrivateKey *key,
-                                 CK_MECHANISM_TYPE mechanism,
-                                 const SECItem *param, SECItem *sig,
-                                 const SECItem *hash);
-SECStatus PK11_SignWithSymKey(PK11SymKey *symKey, CK_MECHANISM_TYPE mechanism,
-                              SECItem *param, SECItem *sig, const SECItem *data);
-SECStatus PK11_VerifyRecover(SECKEYPublicKey *key, const SECItem *sig,
-                             SECItem *dsig, void *wincx);
-SECStatus PK11_Verify(SECKEYPublicKey *key, const SECItem *sig,
-                      const SECItem *hash, void *wincx);
-SECStatus PK11_VerifyWithMechanism(SECKEYPublicKey *key,
-                                   CK_MECHANISM_TYPE mechanism,
-                                   const SECItem *param, const SECItem *sig,
-                                   const SECItem *hash, void *wincx);
-
-/**********************************************************************
- *                   Crypto Contexts
- **********************************************************************/
-void PK11_DestroyContext(PK11Context *context, PRBool freeit);
-PK11Context *PK11_CreateContextBySymKey(CK_MECHANISM_TYPE type,
-                                        CK_ATTRIBUTE_TYPE operation, PK11SymKey *symKey, SECItem *param);
-PK11Context *PK11_CreateDigestContext(SECOidTag hashAlg);
-PK11Context *PK11_CloneContext(PK11Context *old);
-SECStatus PK11_DigestBegin(PK11Context *cx);
-/*
- * The output buffer 'out' must be big enough to hold the output of
- * the hash algorithm 'hashAlg'.
- */
-SECStatus PK11_HashBuf(SECOidTag hashAlg, unsigned char *out,
-                       const unsigned char *in, PRInt32 len);
-SECStatus PK11_DigestOp(PK11Context *context, const unsigned char *in,
-                        unsigned len);
-SECStatus PK11_CipherOp(PK11Context *context, unsigned char *out, int *outlen,
-                        int maxout, const unsigned char *in, int inlen);
-SECStatus PK11_Finalize(PK11Context *context);
-SECStatus PK11_DigestFinal(PK11Context *context, unsigned char *data,
-                           unsigned int *outLen, unsigned int length);
-#define PK11_CipherFinal PK11_DigestFinal
-SECStatus PK11_SaveContext(PK11Context *cx, unsigned char *save,
-                           int *len, int saveLength);
-
-/* Save the context's state, with possible allocation.
- * The caller may supply an already allocated buffer in preAllocBuf,
- * with length pabLen.  If the buffer is large enough for the context's
- * state, it will receive the state.
- * If the buffer is not large enough (or NULL), then a new buffer will
- * be allocated with PORT_Alloc.
- * In either case, the state will be returned as a buffer, and the length
- * of the state will be given in *stateLen.
- */
-unsigned char *
-PK11_SaveContextAlloc(PK11Context *cx,
-                      unsigned char *preAllocBuf, unsigned int pabLen,
-                      unsigned int *stateLen);
-
-SECStatus PK11_RestoreContext(PK11Context *cx, unsigned char *save, int len);
-SECStatus PK11_GenerateFortezzaIV(PK11SymKey *symKey, unsigned char *iv, int len);
-void PK11_SetFortezzaHack(PK11SymKey *symKey);
-
-/**********************************************************************
- *                   PBE functions
- **********************************************************************/
-
-/* This function creates PBE parameters from the given inputs.  The result
- * can be used to create a password integrity key for PKCS#12, by sending
- * the return value to PK11_KeyGen along with the appropriate mechanism.
- */
-SECItem *
-PK11_CreatePBEParams(SECItem *salt, SECItem *pwd, unsigned int iterations);
-
-/* free params created above (can be called after keygen is done */
-void PK11_DestroyPBEParams(SECItem *params);
-
-SECAlgorithmID *
-PK11_CreatePBEAlgorithmID(SECOidTag algorithm, int iteration, SECItem *salt);
-
-/* use to create PKCS5 V2 algorithms with finder control than that provided
- * by PK11_CreatePBEAlgorithmID. */
-SECAlgorithmID *
-PK11_CreatePBEV2AlgorithmID(SECOidTag pbeAlgTag, SECOidTag cipherAlgTag,
-                            SECOidTag prfAlgTag, int keyLength, int iteration,
-                            SECItem *salt);
-PK11SymKey *
-PK11_PBEKeyGen(PK11SlotInfo *slot, SECAlgorithmID *algid, SECItem *pwitem,
-               PRBool faulty3DES, void *wincx);
-
-/* warning: cannot work with PKCS 5 v2 use PK11_PBEKeyGen instead */
-PK11SymKey *
-PK11_RawPBEKeyGen(PK11SlotInfo *slot, CK_MECHANISM_TYPE type, SECItem *params,
-                  SECItem *pwitem, PRBool faulty3DES, void *wincx);
-SECItem *
-PK11_GetPBEIV(SECAlgorithmID *algid, SECItem *pwitem);
-/*
- * Get the Mechanism and parameter of the base encryption or mac scheme from
- * a PBE algorithm ID.
- *  Caller is responsible for freeing the return parameter (param).
- */
-CK_MECHANISM_TYPE
-PK11_GetPBECryptoMechanism(SECAlgorithmID *algid,
-                           SECItem **param, SECItem *pwd);
-
-/**********************************************************************
- * Functions to manage secmod flags
- **********************************************************************/
-const PK11DefaultArrayEntry *PK11_GetDefaultArray(int *size);
-SECStatus PK11_UpdateSlotAttribute(PK11SlotInfo *slot,
-                                   const PK11DefaultArrayEntry *entry,
-                                   PRBool add);
-
-/**********************************************************************
- * Functions to look at PKCS #11 dependent data
- **********************************************************************/
-PK11GenericObject *PK11_FindGenericObjects(PK11SlotInfo *slot,
-                                           CK_OBJECT_CLASS objClass);
-PK11GenericObject *PK11_GetNextGenericObject(PK11GenericObject *object);
-PK11GenericObject *PK11_GetPrevGenericObject(PK11GenericObject *object);
-SECStatus PK11_UnlinkGenericObject(PK11GenericObject *object);
-SECStatus PK11_LinkGenericObject(PK11GenericObject *list,
-                                 PK11GenericObject *object);
-SECStatus PK11_DestroyGenericObjects(PK11GenericObject *object);
-SECStatus PK11_DestroyGenericObject(PK11GenericObject *object);
-PK11GenericObject *PK11_CreateGenericObject(PK11SlotInfo *slot,
-                                            const CK_ATTRIBUTE *pTemplate,
-                                            int count, PRBool token);
-
-/*
- * PK11_ReadRawAttribute and PK11_WriteRawAttribute are generic
- * functions to read and modify the actual PKCS #11 attributes of
- * the underlying pkcs #11 object.
- *
- * object is a pointer to an NSS object that represents the underlying
- *  PKCS #11 object. It's type must match the type of PK11ObjectType
- *  as follows:
- *
- *     type                           object
- *   PK11_TypeGeneric            PK11GenericObject *
- *   PK11_TypePrivKey            SECKEYPrivateKey *
- *   PK11_TypePubKey             SECKEYPublicKey *
- *   PK11_TypeSymKey             PK11SymKey *
- *
- *  All other types are considered invalid. If type does not match the object
- *  passed, unpredictable results will occur.
- *
- * PK11_ReadRawAttribute allocates the buffer for returning the attribute
- * value.  The caller of PK11_ReadRawAttribute should free the data buffer
- * pointed to by item using a SECITEM_FreeItem(item, PR_FALSE) or
- * PORT_Free(item->data) call.
- */
-SECStatus PK11_ReadRawAttribute(PK11ObjectType type, void *object,
-                                CK_ATTRIBUTE_TYPE attr, SECItem *item);
-SECStatus PK11_WriteRawAttribute(PK11ObjectType type, void *object,
-                                 CK_ATTRIBUTE_TYPE attr, SECItem *item);
-
-/*
- * PK11_GetAllSlotsForCert returns all the slots that a given certificate
- * exists on, since it's possible for a cert to exist on more than one
- * PKCS#11 token.
- */
-PK11SlotList *
-PK11_GetAllSlotsForCert(CERTCertificate *cert, void *arg);
-
-/**********************************************************************
- * New functions which are already deprecated....
- **********************************************************************/
-SECItem *
-PK11_GetLowLevelKeyIDForCert(PK11SlotInfo *slot,
-                             CERTCertificate *cert, void *pwarg);
-SECItem *
-PK11_GetLowLevelKeyIDForPrivateKey(SECKEYPrivateKey *key);
-
-PRBool SECMOD_HasRootCerts(void);
-
-SEC_END_PROTOS
-
-#endif
diff --git a/openflow/usr/include/nss/pk11sdr.h b/openflow/usr/include/nss/pk11sdr.h
deleted file mode 100644
index 0ffa425..0000000
--- a/openflow/usr/include/nss/pk11sdr.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _PK11SDR_H_
-#define _PK11SDR_H_
-
-#include "seccomon.h"
-
-SEC_BEGIN_PROTOS
-
-/*
- * PK11SDR_Encrypt - encrypt data using the specified key id or SDR default
- * result should be freed with SECItem_ZfreeItem
- */
-SECStatus
-PK11SDR_Encrypt(SECItem *keyid, SECItem *data, SECItem *result, void *cx);
-
-/*
- * PK11SDR_Decrypt - decrypt data previously encrypted with PK11SDR_Encrypt
- * result should be freed with SECItem_ZfreeItem
- */
-SECStatus
-PK11SDR_Decrypt(SECItem *data, SECItem *result, void *cx);
-
-SEC_END_PROTOS
-
-#endif
diff --git a/openflow/usr/include/nss/pkcs11.h b/openflow/usr/include/nss/pkcs11.h
deleted file mode 100644
index bd98126..0000000
--- a/openflow/usr/include/nss/pkcs11.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*
- * Copyright (C) 1994-1999 RSA Security Inc. Licence to copy this document
- * is granted provided that it is identified as "RSA Security In.c Public-Key
- * Cryptography Standards (PKCS)" in all material mentioning or referencing
- * this document.
- *
- * The latest version of this header can be found at:
- *    http://www.rsalabs.com/pkcs/pkcs-11/index.html
- */
-#ifndef _PKCS11_H_
-#define _PKCS11_H_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Before including this file (pkcs11.h) (or pkcs11t.h by
- * itself), 6 platform-specific macros must be defined.  These
- * macros are described below, and typical definitions for them
- * are also given.  Be advised that these definitions can depend
- * on both the platform and the compiler used (and possibly also
- * on whether a PKCS #11 library is linked statically or
- * dynamically).
- *
- * In addition to defining these 6 macros, the packing convention
- * for PKCS #11 structures should be set.  The PKCS #11
- * convention on packing is that structures should be 1-byte
- * aligned.
- *
- * In a Win32 environment, this might be done by using the
- * following preprocessor directive before including pkcs11.h
- * or pkcs11t.h:
- *
- * #pragma pack(push, cryptoki, 1)
- *
- * and using the following preprocessor directive after including
- * pkcs11.h or pkcs11t.h:
- *
- * #pragma pack(pop, cryptoki)
- *
- * In a UNIX environment, you're on your own here.  You might
- * not need to do anything.
- *
- *
- * Now for the macros:
- *
- *
- * 1. CK_PTR: The indirection string for making a pointer to an
- * object.  It can be used like this:
- *
- * typedef CK_BYTE CK_PTR CK_BYTE_PTR;
- *
- * In a Win32 environment, it might be defined by
- *
- * #define CK_PTR *
- *
- * In a UNIX environment, it might be defined by
- *
- * #define CK_PTR *
- *
- *
- * 2. CK_DEFINE_FUNCTION(returnType, name): A macro which makes
- * an exportable PKCS #11 library function definition out of a
- * return type and a function name.  It should be used in the
- * following fashion to define the exposed PKCS #11 functions in
- * a PKCS #11 library:
- *
- * CK_DEFINE_FUNCTION(CK_RV, C_Initialize)(
- *   CK_VOID_PTR pReserved
- * )
- * {
- *   ...
- * }
- *
- * For defining a function in a Win32 PKCS #11 .dll, it might be
- * defined by
- *
- * #define CK_DEFINE_FUNCTION(returnType, name) \
- *   returnType __declspec(dllexport) name
- *
- * In a UNIX environment, it might be defined by
- *
- * #define CK_DEFINE_FUNCTION(returnType, name) \
- *   returnType name
- *
- *
- * 3. CK_DECLARE_FUNCTION(returnType, name): A macro which makes
- * an importable PKCS #11 library function declaration out of a
- * return type and a function name.  It should be used in the
- * following fashion:
- *
- * extern CK_DECLARE_FUNCTION(CK_RV, C_Initialize)(
- *   CK_VOID_PTR pReserved
- * );
- *
- * For declaring a function in a Win32 PKCS #11 .dll, it might
- * be defined by
- *
- * #define CK_DECLARE_FUNCTION(returnType, name) \
- *   returnType __declspec(dllimport) name
- *
- * In a UNIX environment, it might be defined by
- *
- * #define CK_DECLARE_FUNCTION(returnType, name) \
- *   returnType name
- *
- *
- * 4. CK_DECLARE_FUNCTION_POINTER(returnType, name): A macro
- * which makes a PKCS #11 API function pointer declaration or
- * function pointer type declaration out of a return type and a
- * function name.  It should be used in the following fashion:
- *
- * // Define funcPtr to be a pointer to a PKCS #11 API function
- * // taking arguments args and returning CK_RV.
- * CK_DECLARE_FUNCTION_POINTER(CK_RV, funcPtr)(args);
- *
- * or
- *
- * // Define funcPtrType to be the type of a pointer to a
- * // PKCS #11 API function taking arguments args and returning
- * // CK_RV, and then define funcPtr to be a variable of type
- * // funcPtrType.
- * typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, funcPtrType)(args);
- * funcPtrType funcPtr;
- *
- * For accessing functions in a Win32 PKCS #11 .dll, in might be
- * defined by
- *
- * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
- *   returnType __declspec(dllimport) (* name)
- *
- * In a UNIX environment, it might be defined by
- *
- * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
- *   returnType (* name)
- *
- *
- * 5. CK_CALLBACK_FUNCTION(returnType, name): A macro which makes
- * a function pointer type for an application callback out of
- * a return type for the callback and a name for the callback.
- * It should be used in the following fashion:
- *
- * CK_CALLBACK_FUNCTION(CK_RV, myCallback)(args);
- *
- * to declare a function pointer, myCallback, to a callback
- * which takes arguments args and returns a CK_RV.  It can also
- * be used like this:
- *
- * typedef CK_CALLBACK_FUNCTION(CK_RV, myCallbackType)(args);
- * myCallbackType myCallback;
- *
- * In a Win32 environment, it might be defined by
- *
- * #define CK_CALLBACK_FUNCTION(returnType, name) \
- *   returnType (* name)
- *
- * In a UNIX environment, it might be defined by
- *
- * #define CK_CALLBACK_FUNCTION(returnType, name) \
- *   returnType (* name)
- *
- *
- * 6. NULL_PTR: This macro is the value of a NULL pointer.
- *
- * In any ANSI/ISO C environment (and in many others as well),
- * this should be defined by
- *
- * #ifndef NULL_PTR
- * #define NULL_PTR 0
- * #endif
- */
-
-/* All the various PKCS #11 types and #define'd values are in the
- * file pkcs11t.h. */
-#include "pkcs11t.h"
-
-#define __PASTE(x, y) x##y
-
-/* packing defines */
-#include "pkcs11p.h"
-/* ==============================================================
- * Define the "extern" form of all the entry points.
- * ==============================================================
- */
-
-#define CK_NEED_ARG_LIST 1
-#define CK_PKCS11_FUNCTION_INFO(name) \
-    CK_DECLARE_FUNCTION(CK_RV, name)
-
-/* pkcs11f.h has all the information about the PKCS #11
- * function prototypes. */
-#include "pkcs11f.h"
-
-#undef CK_NEED_ARG_LIST
-#undef CK_PKCS11_FUNCTION_INFO
-
-/* ==============================================================
- * Define the typedef form of all the entry points.  That is, for
- * each PKCS #11 function C_XXX, define a type CK_C_XXX which is
- * a pointer to that kind of function.
- * ==============================================================
- */
-
-#define CK_NEED_ARG_LIST 1
-#define CK_PKCS11_FUNCTION_INFO(name) \
-    typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, __PASTE(CK_, name))
-
-/* pkcs11f.h has all the information about the PKCS #11
- * function prototypes. */
-#include "pkcs11f.h"
-
-#undef CK_NEED_ARG_LIST
-#undef CK_PKCS11_FUNCTION_INFO
-
-/* ==============================================================
- * Define structed vector of entry points.  A CK_FUNCTION_LIST
- * contains a CK_VERSION indicating a library's PKCS #11 version
- * and then a whole slew of function pointers to the routines in
- * the library.  This type was declared, but not defined, in
- * pkcs11t.h.
- * ==============================================================
- */
-
-#define CK_PKCS11_FUNCTION_INFO(name) \
-    __PASTE(CK_, name)                \
-    name;
-
-struct CK_FUNCTION_LIST {
-
-    CK_VERSION version; /* PKCS #11 version */
-
-/* Pile all the function pointers into the CK_FUNCTION_LIST. */
-/* pkcs11f.h has all the information about the PKCS #11
- * function prototypes. */
-#include "pkcs11f.h"
-};
-
-#undef CK_PKCS11_FUNCTION_INFO
-
-#undef __PASTE
-
-/* unpack */
-#include "pkcs11u.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/nss/pkcs11f.h b/openflow/usr/include/nss/pkcs11f.h
deleted file mode 100644
index e79e125..0000000
--- a/openflow/usr/include/nss/pkcs11f.h
+++ /dev/null
@@ -1,812 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*
- * Copyright (C) 1994-1999 RSA Security Inc. Licence to copy this document
- * is granted provided that it is identified as "RSA Security In.c Public-Key
- * Cryptography Standards (PKCS)" in all material mentioning or referencing
- * this document.
- */
-/* This function contains pretty much everything about all the */
-/* PKCS #11  function prototypes.  Because this information is */
-/* used for more than just declaring function prototypes, the */
-/* order of the functions appearing herein is important, and */
-/* should not be altered. */
-
-/* General-purpose */
-
-/* C_Initialize initializes the PKCS #11 library. */
-CK_PKCS11_FUNCTION_INFO(C_Initialize)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_VOID_PTR pInitArgs /* if this is not NULL_PTR, it gets
-                           * cast to CK_C_INITIALIZE_ARGS_PTR
-                           * and dereferenced */
-    );
-#endif
-
-/* C_Finalize indicates that an application is done with the
- * PKCS #11 library. */
-CK_PKCS11_FUNCTION_INFO(C_Finalize)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_VOID_PTR pReserved /* reserved.  Should be NULL_PTR */
-    );
-#endif
-
-/* C_GetInfo returns general information about PKCS #11. */
-CK_PKCS11_FUNCTION_INFO(C_GetInfo)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_INFO_PTR pInfo /* location that receives information */
-    );
-#endif
-
-/* C_GetFunctionList returns the function list. */
-CK_PKCS11_FUNCTION_INFO(C_GetFunctionList)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_FUNCTION_LIST_PTR_PTR ppFunctionList /* receives pointer to
-                                             * function list */
-    );
-#endif
-
-/* Slot and token management */
-
-/* C_GetSlotList obtains a list of slots in the system. */
-CK_PKCS11_FUNCTION_INFO(C_GetSlotList)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_BBOOL tokenPresent,    /* only slots with tokens? */
-    CK_SLOT_ID_PTR pSlotList, /* receives array of slot IDs */
-    CK_ULONG_PTR pulCount     /* receives number of slots */
-    );
-#endif
-
-/* C_GetSlotInfo obtains information about a particular slot in
- * the system. */
-CK_PKCS11_FUNCTION_INFO(C_GetSlotInfo)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SLOT_ID slotID,     /* the ID of the slot */
-    CK_SLOT_INFO_PTR pInfo /* receives the slot information */
-    );
-#endif
-
-/* C_GetTokenInfo obtains information about a particular token
- * in the system. */
-CK_PKCS11_FUNCTION_INFO(C_GetTokenInfo)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SLOT_ID slotID,      /* ID of the token's slot */
-    CK_TOKEN_INFO_PTR pInfo /* receives the token information */
-    );
-#endif
-
-/* C_GetMechanismList obtains a list of mechanism types
- * supported by a token. */
-CK_PKCS11_FUNCTION_INFO(C_GetMechanismList)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SLOT_ID slotID,                    /* ID of token's slot */
-    CK_MECHANISM_TYPE_PTR pMechanismList, /* gets mech. array */
-    CK_ULONG_PTR pulCount                 /* gets # of mechs. */
-    );
-#endif
-
-/* C_GetMechanismInfo obtains information about a particular
- * mechanism possibly supported by a token. */
-CK_PKCS11_FUNCTION_INFO(C_GetMechanismInfo)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SLOT_ID slotID,          /* ID of the token's slot */
-    CK_MECHANISM_TYPE type,     /* type of mechanism */
-    CK_MECHANISM_INFO_PTR pInfo /* receives mechanism info */
-    );
-#endif
-
-/* C_InitToken initializes a token. */
-CK_PKCS11_FUNCTION_INFO(C_InitToken)
-#ifdef CK_NEED_ARG_LIST
-/* pLabel changed from CK_CHAR_PTR to CK_UTF8CHAR_PTR for v2.10 */
-(
-    CK_SLOT_ID slotID,     /* ID of the token's slot */
-    CK_UTF8CHAR_PTR pPin,  /* the SO's initial PIN */
-    CK_ULONG ulPinLen,     /* length in bytes of the PIN */
-    CK_UTF8CHAR_PTR pLabel /* 32-byte token label (blank padded) */
-    );
-#endif
-
-/* C_InitPIN initializes the normal user's PIN. */
-CK_PKCS11_FUNCTION_INFO(C_InitPIN)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_UTF8CHAR_PTR pPin,       /* the normal user's PIN */
-    CK_ULONG ulPinLen           /* length in bytes of the PIN */
-    );
-#endif
-
-/* C_SetPIN modifies the PIN of the user who is logged in. */
-CK_PKCS11_FUNCTION_INFO(C_SetPIN)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_UTF8CHAR_PTR pOldPin,    /* the old PIN */
-    CK_ULONG ulOldLen,          /* length of the old PIN */
-    CK_UTF8CHAR_PTR pNewPin,    /* the new PIN */
-    CK_ULONG ulNewLen           /* length of the new PIN */
-    );
-#endif
-
-/* Session management */
-
-/* C_OpenSession opens a session between an application and a
- * token. */
-CK_PKCS11_FUNCTION_INFO(C_OpenSession)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SLOT_ID slotID,              /* the slot's ID */
-    CK_FLAGS flags,                 /* from CK_SESSION_INFO */
-    CK_VOID_PTR pApplication,       /* passed to callback */
-    CK_NOTIFY Notify,               /* callback function */
-    CK_SESSION_HANDLE_PTR phSession /* gets session handle */
-    );
-#endif
-
-/* C_CloseSession closes a session between an application and a
- * token. */
-CK_PKCS11_FUNCTION_INFO(C_CloseSession)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession /* the session's handle */
-    );
-#endif
-
-/* C_CloseAllSessions closes all sessions with a token. */
-CK_PKCS11_FUNCTION_INFO(C_CloseAllSessions)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SLOT_ID slotID /* the token's slot */
-    );
-#endif
-
-/* C_GetSessionInfo obtains information about the session. */
-CK_PKCS11_FUNCTION_INFO(C_GetSessionInfo)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_SESSION_INFO_PTR pInfo   /* receives session info */
-    );
-#endif
-
-/* C_GetOperationState obtains the state of the cryptographic operation
- * in a session. */
-CK_PKCS11_FUNCTION_INFO(C_GetOperationState)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,       /* session's handle */
-    CK_BYTE_PTR pOperationState,      /* gets state */
-    CK_ULONG_PTR pulOperationStateLen /* gets state length */
-    );
-#endif
-
-/* C_SetOperationState restores the state of the cryptographic
- * operation in a session. */
-CK_PKCS11_FUNCTION_INFO(C_SetOperationState)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,         /* session's handle */
-    CK_BYTE_PTR pOperationState,        /* holds state */
-    CK_ULONG ulOperationStateLen,       /* holds state length */
-    CK_OBJECT_HANDLE hEncryptionKey,    /* en/decryption key */
-    CK_OBJECT_HANDLE hAuthenticationKey /* sign/verify key */
-    );
-#endif
-
-/* C_Login logs a user into a token. */
-CK_PKCS11_FUNCTION_INFO(C_Login)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_USER_TYPE userType,      /* the user type */
-    CK_UTF8CHAR_PTR pPin,       /* the user's PIN */
-    CK_ULONG ulPinLen           /* the length of the PIN */
-    );
-#endif
-
-/* C_Logout logs a user out from a token. */
-CK_PKCS11_FUNCTION_INFO(C_Logout)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession /* the session's handle */
-    );
-#endif
-
-/* Object management */
-
-/* C_CreateObject creates a new object. */
-CK_PKCS11_FUNCTION_INFO(C_CreateObject)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,   /* the session's handle */
-    CK_ATTRIBUTE_PTR pTemplate,   /* the object's template */
-    CK_ULONG ulCount,             /* attributes in template */
-    CK_OBJECT_HANDLE_PTR phObject /* gets new object's handle. */
-    );
-#endif
-
-/* C_CopyObject copies an object, creating a new object for the
- * copy. */
-CK_PKCS11_FUNCTION_INFO(C_CopyObject)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,      /* the session's handle */
-    CK_OBJECT_HANDLE hObject,        /* the object's handle */
-    CK_ATTRIBUTE_PTR pTemplate,      /* template for new object */
-    CK_ULONG ulCount,                /* attributes in template */
-    CK_OBJECT_HANDLE_PTR phNewObject /* receives handle of copy */
-    );
-#endif
-
-/* C_DestroyObject destroys an object. */
-CK_PKCS11_FUNCTION_INFO(C_DestroyObject)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_OBJECT_HANDLE hObject    /* the object's handle */
-    );
-#endif
-
-/* C_GetObjectSize gets the size of an object in bytes. */
-CK_PKCS11_FUNCTION_INFO(C_GetObjectSize)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_OBJECT_HANDLE hObject,   /* the object's handle */
-    CK_ULONG_PTR pulSize        /* receives size of object */
-    );
-#endif
-
-/* C_GetAttributeValue obtains the value of one or more object
- * attributes. */
-CK_PKCS11_FUNCTION_INFO(C_GetAttributeValue)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_OBJECT_HANDLE hObject,   /* the object's handle */
-    CK_ATTRIBUTE_PTR pTemplate, /* specifies attrs; gets vals */
-    CK_ULONG ulCount            /* attributes in template */
-    );
-#endif
-
-/* C_SetAttributeValue modifies the value of one or more object
- * attributes */
-CK_PKCS11_FUNCTION_INFO(C_SetAttributeValue)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_OBJECT_HANDLE hObject,   /* the object's handle */
-    CK_ATTRIBUTE_PTR pTemplate, /* specifies attrs and values */
-    CK_ULONG ulCount            /* attributes in template */
-    );
-#endif
-
-/* C_FindObjectsInit initializes a search for token and session
- * objects that match a template. */
-CK_PKCS11_FUNCTION_INFO(C_FindObjectsInit)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_ATTRIBUTE_PTR pTemplate, /* attribute values to match */
-    CK_ULONG ulCount            /* attrs in search template */
-    );
-#endif
-
-/* C_FindObjects continues a search for token and session
- * objects that match a template, obtaining additional object
- * handles. */
-CK_PKCS11_FUNCTION_INFO(C_FindObjects)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,    /* session's handle */
-    CK_OBJECT_HANDLE_PTR phObject, /* gets obj. handles */
-    CK_ULONG ulMaxObjectCount,     /* max handles to get */
-    CK_ULONG_PTR pulObjectCount    /* actual # returned */
-    );
-#endif
-
-/* C_FindObjectsFinal finishes a search for token and session
- * objects. */
-CK_PKCS11_FUNCTION_INFO(C_FindObjectsFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession /* the session's handle */
-    );
-#endif
-
-/* Encryption and decryption */
-
-/* C_EncryptInit initializes an encryption operation. */
-CK_PKCS11_FUNCTION_INFO(C_EncryptInit)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* the session's handle */
-    CK_MECHANISM_PTR pMechanism, /* the encryption mechanism */
-    CK_OBJECT_HANDLE hKey        /* handle of encryption key */
-    );
-#endif
-
-/* C_Encrypt encrypts single-part data. */
-CK_PKCS11_FUNCTION_INFO(C_Encrypt)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,      /* session's handle */
-    CK_BYTE_PTR pData,               /* the plaintext data */
-    CK_ULONG ulDataLen,              /* bytes of plaintext */
-    CK_BYTE_PTR pEncryptedData,      /* gets ciphertext */
-    CK_ULONG_PTR pulEncryptedDataLen /* gets c-text size */
-    );
-#endif
-
-/* C_EncryptUpdate continues a multiple-part encryption
- * operation. */
-CK_PKCS11_FUNCTION_INFO(C_EncryptUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,      /* session's handle */
-    CK_BYTE_PTR pPart,               /* the plaintext data */
-    CK_ULONG ulPartLen,              /* plaintext data len */
-    CK_BYTE_PTR pEncryptedPart,      /* gets ciphertext */
-    CK_ULONG_PTR pulEncryptedPartLen /* gets c-text size */
-    );
-#endif
-
-/* C_EncryptFinal finishes a multiple-part encryption
- * operation. */
-CK_PKCS11_FUNCTION_INFO(C_EncryptFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,          /* session handle */
-    CK_BYTE_PTR pLastEncryptedPart,      /* last c-text */
-    CK_ULONG_PTR pulLastEncryptedPartLen /* gets last size */
-    );
-#endif
-
-/* C_DecryptInit initializes a decryption operation. */
-CK_PKCS11_FUNCTION_INFO(C_DecryptInit)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* the session's handle */
-    CK_MECHANISM_PTR pMechanism, /* the decryption mechanism */
-    CK_OBJECT_HANDLE hKey        /* handle of decryption key */
-    );
-#endif
-
-/* C_Decrypt decrypts encrypted data in a single part. */
-CK_PKCS11_FUNCTION_INFO(C_Decrypt)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* session's handle */
-    CK_BYTE_PTR pEncryptedData,  /* ciphertext */
-    CK_ULONG ulEncryptedDataLen, /* ciphertext length */
-    CK_BYTE_PTR pData,           /* gets plaintext */
-    CK_ULONG_PTR pulDataLen      /* gets p-text size */
-    );
-#endif
-
-/* C_DecryptUpdate continues a multiple-part decryption
- * operation. */
-CK_PKCS11_FUNCTION_INFO(C_DecryptUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* session's handle */
-    CK_BYTE_PTR pEncryptedPart,  /* encrypted data */
-    CK_ULONG ulEncryptedPartLen, /* input length */
-    CK_BYTE_PTR pPart,           /* gets plaintext */
-    CK_ULONG_PTR pulPartLen      /* p-text size */
-    );
-#endif
-
-/* C_DecryptFinal finishes a multiple-part decryption
- * operation. */
-CK_PKCS11_FUNCTION_INFO(C_DecryptFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR pLastPart,      /* gets plaintext */
-    CK_ULONG_PTR pulLastPartLen /* p-text size */
-    );
-#endif
-
-/* Message digesting */
-
-/* C_DigestInit initializes a message-digesting operation. */
-CK_PKCS11_FUNCTION_INFO(C_DigestInit)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_MECHANISM_PTR pMechanism /* the digesting mechanism */
-    );
-#endif
-
-/* C_Digest digests data in a single part. */
-CK_PKCS11_FUNCTION_INFO(C_Digest)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR pData,          /* data to be digested */
-    CK_ULONG ulDataLen,         /* bytes of data to digest */
-    CK_BYTE_PTR pDigest,        /* gets the message digest */
-    CK_ULONG_PTR pulDigestLen   /* gets digest length */
-    );
-#endif
-
-/* C_DigestUpdate continues a multiple-part message-digesting
- * operation. */
-CK_PKCS11_FUNCTION_INFO(C_DigestUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR pPart,          /* data to be digested */
-    CK_ULONG ulPartLen          /* bytes of data to be digested */
-    );
-#endif
-
-/* C_DigestKey continues a multi-part message-digesting
- * operation, by digesting the value of a secret key as part of
- * the data already digested. */
-CK_PKCS11_FUNCTION_INFO(C_DigestKey)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_OBJECT_HANDLE hKey       /* secret key to digest */
-    );
-#endif
-
-/* C_DigestFinal finishes a multiple-part message-digesting
- * operation. */
-CK_PKCS11_FUNCTION_INFO(C_DigestFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR pDigest,        /* gets the message digest */
-    CK_ULONG_PTR pulDigestLen   /* gets byte count of digest */
-    );
-#endif
-
-/* Signing and MACing */
-
-/* C_SignInit initializes a signature (private key encryption)
- * operation, where the signature is (will be) an appendix to
- * the data, and plaintext cannot be recovered from the
- *signature. */
-CK_PKCS11_FUNCTION_INFO(C_SignInit)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* the session's handle */
-    CK_MECHANISM_PTR pMechanism, /* the signature mechanism */
-    CK_OBJECT_HANDLE hKey        /* handle of signature key */
-    );
-#endif
-
-/* C_Sign signs (encrypts with private key) data in a single
- * part, where the signature is (will be) an appendix to the
- * data, and plaintext cannot be recovered from the signature. */
-CK_PKCS11_FUNCTION_INFO(C_Sign)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* the session's handle */
-    CK_BYTE_PTR pData,           /* the data to sign */
-    CK_ULONG ulDataLen,          /* count of bytes to sign */
-    CK_BYTE_PTR pSignature,      /* gets the signature */
-    CK_ULONG_PTR pulSignatureLen /* gets signature length */
-    );
-#endif
-
-/* C_SignUpdate continues a multiple-part signature operation,
- * where the signature is (will be) an appendix to the data,
- * and plaintext cannot be recovered from the signature. */
-CK_PKCS11_FUNCTION_INFO(C_SignUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR pPart,          /* the data to sign */
-    CK_ULONG ulPartLen          /* count of bytes to sign */
-    );
-#endif
-
-/* C_SignFinal finishes a multiple-part signature operation,
- * returning the signature. */
-CK_PKCS11_FUNCTION_INFO(C_SignFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* the session's handle */
-    CK_BYTE_PTR pSignature,      /* gets the signature */
-    CK_ULONG_PTR pulSignatureLen /* gets signature length */
-    );
-#endif
-
-/* C_SignRecoverInit initializes a signature operation, where
- * the data can be recovered from the signature. */
-CK_PKCS11_FUNCTION_INFO(C_SignRecoverInit)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* the session's handle */
-    CK_MECHANISM_PTR pMechanism, /* the signature mechanism */
-    CK_OBJECT_HANDLE hKey        /* handle of the signature key */
-    );
-#endif
-
-/* C_SignRecover signs data in a single operation, where the
- * data can be recovered from the signature. */
-CK_PKCS11_FUNCTION_INFO(C_SignRecover)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* the session's handle */
-    CK_BYTE_PTR pData,           /* the data to sign */
-    CK_ULONG ulDataLen,          /* count of bytes to sign */
-    CK_BYTE_PTR pSignature,      /* gets the signature */
-    CK_ULONG_PTR pulSignatureLen /* gets signature length */
-    );
-#endif
-
-/* Verifying signatures and MACs */
-
-/* C_VerifyInit initializes a verification operation, where the
- * signature is an appendix to the data, and plaintext cannot
- *  cannot be recovered from the signature (e.g. DSA). */
-CK_PKCS11_FUNCTION_INFO(C_VerifyInit)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* the session's handle */
-    CK_MECHANISM_PTR pMechanism, /* the verification mechanism */
-    CK_OBJECT_HANDLE hKey        /* verification key */
-    );
-#endif
-
-/* C_Verify verifies a signature in a single-part operation,
- * where the signature is an appendix to the data, and plaintext
- * cannot be recovered from the signature. */
-CK_PKCS11_FUNCTION_INFO(C_Verify)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR pData,          /* signed data */
-    CK_ULONG ulDataLen,         /* length of signed data */
-    CK_BYTE_PTR pSignature,     /* signature */
-    CK_ULONG ulSignatureLen     /* signature length*/
-    );
-#endif
-
-/* C_VerifyUpdate continues a multiple-part verification
- * operation, where the signature is an appendix to the data,
- * and plaintext cannot be recovered from the signature. */
-CK_PKCS11_FUNCTION_INFO(C_VerifyUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR pPart,          /* signed data */
-    CK_ULONG ulPartLen          /* length of signed data */
-    );
-#endif
-
-/* C_VerifyFinal finishes a multiple-part verification
- * operation, checking the signature. */
-CK_PKCS11_FUNCTION_INFO(C_VerifyFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR pSignature,     /* signature to verify */
-    CK_ULONG ulSignatureLen     /* signature length */
-    );
-#endif
-
-/* C_VerifyRecoverInit initializes a signature verification
- * operation, where the data is recovered from the signature. */
-CK_PKCS11_FUNCTION_INFO(C_VerifyRecoverInit)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* the session's handle */
-    CK_MECHANISM_PTR pMechanism, /* the verification mechanism */
-    CK_OBJECT_HANDLE hKey        /* verification key */
-    );
-#endif
-
-/* C_VerifyRecover verifies a signature in a single-part
- * operation, where the data is recovered from the signature. */
-CK_PKCS11_FUNCTION_INFO(C_VerifyRecover)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR pSignature,     /* signature to verify */
-    CK_ULONG ulSignatureLen,    /* signature length */
-    CK_BYTE_PTR pData,          /* gets signed data */
-    CK_ULONG_PTR pulDataLen     /* gets signed data len */
-    );
-#endif
-
-/* Dual-function cryptographic operations */
-
-/* C_DigestEncryptUpdate continues a multiple-part digesting
- * and encryption operation. */
-CK_PKCS11_FUNCTION_INFO(C_DigestEncryptUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,      /* session's handle */
-    CK_BYTE_PTR pPart,               /* the plaintext data */
-    CK_ULONG ulPartLen,              /* plaintext length */
-    CK_BYTE_PTR pEncryptedPart,      /* gets ciphertext */
-    CK_ULONG_PTR pulEncryptedPartLen /* gets c-text length */
-    );
-#endif
-
-/* C_DecryptDigestUpdate continues a multiple-part decryption and
- * digesting operation. */
-CK_PKCS11_FUNCTION_INFO(C_DecryptDigestUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* session's handle */
-    CK_BYTE_PTR pEncryptedPart,  /* ciphertext */
-    CK_ULONG ulEncryptedPartLen, /* ciphertext length */
-    CK_BYTE_PTR pPart,           /* gets plaintext */
-    CK_ULONG_PTR pulPartLen      /* gets plaintext len */
-    );
-#endif
-
-/* C_SignEncryptUpdate continues a multiple-part signing and
- * encryption operation. */
-CK_PKCS11_FUNCTION_INFO(C_SignEncryptUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,      /* session's handle */
-    CK_BYTE_PTR pPart,               /* the plaintext data */
-    CK_ULONG ulPartLen,              /* plaintext length */
-    CK_BYTE_PTR pEncryptedPart,      /* gets ciphertext */
-    CK_ULONG_PTR pulEncryptedPartLen /* gets c-text length */
-    );
-#endif
-
-/* C_DecryptVerifyUpdate continues a multiple-part decryption and
- * verify operation. */
-CK_PKCS11_FUNCTION_INFO(C_DecryptVerifyUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* session's handle */
-    CK_BYTE_PTR pEncryptedPart,  /* ciphertext */
-    CK_ULONG ulEncryptedPartLen, /* ciphertext length */
-    CK_BYTE_PTR pPart,           /* gets plaintext */
-    CK_ULONG_PTR pulPartLen      /* gets p-text length */
-    );
-#endif
-
-/* Key management */
-
-/* C_GenerateKey generates a secret key, creating a new key
- * object. */
-CK_PKCS11_FUNCTION_INFO(C_GenerateKey)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* the session's handle */
-    CK_MECHANISM_PTR pMechanism, /* key generation mech. */
-    CK_ATTRIBUTE_PTR pTemplate,  /* template for new key */
-    CK_ULONG ulCount,            /* # of attrs in template */
-    CK_OBJECT_HANDLE_PTR phKey   /* gets handle of new key */
-    );
-#endif
-
-/* C_GenerateKeyPair generates a public-key/private-key pair,
- * creating new key objects. */
-CK_PKCS11_FUNCTION_INFO(C_GenerateKeyPair)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,           /* session handle */
-    CK_MECHANISM_PTR pMechanism,          /* key-gen mech. */
-    CK_ATTRIBUTE_PTR pPublicKeyTemplate,  /* template for pub. key */
-    CK_ULONG ulPublicKeyAttributeCount,   /* # pub. attrs. */
-    CK_ATTRIBUTE_PTR pPrivateKeyTemplate, /* template for priv. key */
-    CK_ULONG ulPrivateKeyAttributeCount,  /* # priv. attrs. */
-    CK_OBJECT_HANDLE_PTR phPublicKey,     /* gets pub. key handle */
-    CK_OBJECT_HANDLE_PTR phPrivateKey     /* gets priv. key handle */
-    );
-#endif
-
-/* C_WrapKey wraps (i.e., encrypts) a key. */
-CK_PKCS11_FUNCTION_INFO(C_WrapKey)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,    /* the session's handle */
-    CK_MECHANISM_PTR pMechanism,   /* the wrapping mechanism */
-    CK_OBJECT_HANDLE hWrappingKey, /* wrapping key */
-    CK_OBJECT_HANDLE hKey,         /* key to be wrapped */
-    CK_BYTE_PTR pWrappedKey,       /* gets wrapped key */
-    CK_ULONG_PTR pulWrappedKeyLen  /* gets wrapped key size */
-    );
-#endif
-
-/* C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
- * key object. */
-CK_PKCS11_FUNCTION_INFO(C_UnwrapKey)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,      /* session's handle */
-    CK_MECHANISM_PTR pMechanism,     /* unwrapping mech. */
-    CK_OBJECT_HANDLE hUnwrappingKey, /* unwrapping key */
-    CK_BYTE_PTR pWrappedKey,         /* the wrapped key */
-    CK_ULONG ulWrappedKeyLen,        /* wrapped key len */
-    CK_ATTRIBUTE_PTR pTemplate,      /* new key template */
-    CK_ULONG ulAttributeCount,       /* template length */
-    CK_OBJECT_HANDLE_PTR phKey       /* gets new handle */
-    );
-#endif
-
-/* C_DeriveKey derives a key from a base key, creating a new key
- * object. */
-CK_PKCS11_FUNCTION_INFO(C_DeriveKey)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession,  /* session's handle */
-    CK_MECHANISM_PTR pMechanism, /* key deriv. mech. */
-    CK_OBJECT_HANDLE hBaseKey,   /* base key */
-    CK_ATTRIBUTE_PTR pTemplate,  /* new key template */
-    CK_ULONG ulAttributeCount,   /* template length */
-    CK_OBJECT_HANDLE_PTR phKey   /* gets new handle */
-    );
-#endif
-
-/* Random number generation */
-
-/* C_SeedRandom mixes additional seed material into the token's
- * random number generator. */
-CK_PKCS11_FUNCTION_INFO(C_SeedRandom)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR pSeed,          /* the seed material */
-    CK_ULONG ulSeedLen          /* length of seed material */
-    );
-#endif
-
-/* C_GenerateRandom generates random data. */
-CK_PKCS11_FUNCTION_INFO(C_GenerateRandom)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_BYTE_PTR RandomData,     /* receives the random data */
-    CK_ULONG ulRandomLen        /* # of bytes to generate */
-    );
-#endif
-
-/* Parallel function management */
-
-/* C_GetFunctionStatus is a legacy function; it obtains an
- * updated status of a function running in parallel with an
- * application. */
-CK_PKCS11_FUNCTION_INFO(C_GetFunctionStatus)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession /* the session's handle */
-    );
-#endif
-
-/* C_CancelFunction is a legacy function; it cancels a function
- * running in parallel. */
-CK_PKCS11_FUNCTION_INFO(C_CancelFunction)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_SESSION_HANDLE hSession /* the session's handle */
-    );
-#endif
-
-/* Functions added in for PKCS #11 Version 2.01 or later */
-
-/* C_WaitForSlotEvent waits for a slot event (token insertion,
- * removal, etc.) to occur. */
-CK_PKCS11_FUNCTION_INFO(C_WaitForSlotEvent)
-#ifdef CK_NEED_ARG_LIST
-(
-    CK_FLAGS flags,       /* blocking/nonblocking flag */
-    CK_SLOT_ID_PTR pSlot, /* location that receives the slot ID */
-    CK_VOID_PTR pRserved  /* reserved.  Should be NULL_PTR */
-    );
-#endif
diff --git a/openflow/usr/include/nss/pkcs11n.h b/openflow/usr/include/nss/pkcs11n.h
deleted file mode 100644
index ebb8122..0000000
--- a/openflow/usr/include/nss/pkcs11n.h
+++ /dev/null
@@ -1,501 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _PKCS11N_H_
-#define _PKCS11N_H_
-
-/*
- * pkcs11n.h
- *
- * This file contains the NSS-specific type definitions for Cryptoki
- * (PKCS#11).
- */
-
-/*
- * NSSCK_VENDOR_NSS
- *
- * Cryptoki reserves the high half of all the number spaces for
- * vendor-defined use.  I'd like to keep all of our NSS-
- * specific values together, but not in the oh-so-obvious
- * 0x80000001, 0x80000002, etc. area.  So I've picked an offset,
- * and constructed values for the beginnings of our spaces.
- *
- * Note that some "historical" Netscape values don't fall within
- * this range.
- */
-#define NSSCK_VENDOR_NSS 0x4E534350 /* NSCP */
-
-/*
- * NSS-defined object classes
- *
- */
-#define CKO_NSS (CKO_VENDOR_DEFINED | NSSCK_VENDOR_NSS)
-
-#define CKO_NSS_CRL (CKO_NSS + 1)
-#define CKO_NSS_SMIME (CKO_NSS + 2)
-#define CKO_NSS_TRUST (CKO_NSS + 3)
-#define CKO_NSS_BUILTIN_ROOT_LIST (CKO_NSS + 4)
-#define CKO_NSS_NEWSLOT (CKO_NSS + 5)
-#define CKO_NSS_DELSLOT (CKO_NSS + 6)
-
-/*
- * NSS-defined key types
- *
- */
-#define CKK_NSS (CKK_VENDOR_DEFINED | NSSCK_VENDOR_NSS)
-
-#define CKK_NSS_PKCS8 (CKK_NSS + 1)
-
-#define CKK_NSS_JPAKE_ROUND1 (CKK_NSS + 2)
-#define CKK_NSS_JPAKE_ROUND2 (CKK_NSS + 3)
-
-#define CKK_NSS_CHACHA20 (CKK_NSS + 4)
-
-/*
- * NSS-defined certificate types
- *
- */
-#define CKC_NSS (CKC_VENDOR_DEFINED | NSSCK_VENDOR_NSS)
-
-/* FAKE PKCS #11 defines */
-#define CKA_DIGEST 0x81000000L
-#define CKA_FLAGS_ONLY 0 /* CKA_CLASS */
-
-/*
- * NSS-defined object attributes
- *
- */
-#define CKA_NSS (CKA_VENDOR_DEFINED | NSSCK_VENDOR_NSS)
-
-#define CKA_NSS_URL (CKA_NSS + 1)
-#define CKA_NSS_EMAIL (CKA_NSS + 2)
-#define CKA_NSS_SMIME_INFO (CKA_NSS + 3)
-#define CKA_NSS_SMIME_TIMESTAMP (CKA_NSS + 4)
-#define CKA_NSS_PKCS8_SALT (CKA_NSS + 5)
-#define CKA_NSS_PASSWORD_CHECK (CKA_NSS + 6)
-#define CKA_NSS_EXPIRES (CKA_NSS + 7)
-#define CKA_NSS_KRL (CKA_NSS + 8)
-
-#define CKA_NSS_PQG_COUNTER (CKA_NSS + 20)
-#define CKA_NSS_PQG_SEED (CKA_NSS + 21)
-#define CKA_NSS_PQG_H (CKA_NSS + 22)
-#define CKA_NSS_PQG_SEED_BITS (CKA_NSS + 23)
-#define CKA_NSS_MODULE_SPEC (CKA_NSS + 24)
-#define CKA_NSS_OVERRIDE_EXTENSIONS (CKA_NSS + 25)
-
-#define CKA_NSS_JPAKE_SIGNERID (CKA_NSS + 26)
-#define CKA_NSS_JPAKE_PEERID (CKA_NSS + 27)
-#define CKA_NSS_JPAKE_GX1 (CKA_NSS + 28)
-#define CKA_NSS_JPAKE_GX2 (CKA_NSS + 29)
-#define CKA_NSS_JPAKE_GX3 (CKA_NSS + 30)
-#define CKA_NSS_JPAKE_GX4 (CKA_NSS + 31)
-#define CKA_NSS_JPAKE_X2 (CKA_NSS + 32)
-#define CKA_NSS_JPAKE_X2S (CKA_NSS + 33)
-
-/*
- * Trust attributes:
- *
- * If trust goes standard, these probably will too.  So I'll
- * put them all in one place.
- */
-
-#define CKA_TRUST (CKA_NSS + 0x2000)
-
-/* "Usage" key information */
-#define CKA_TRUST_DIGITAL_SIGNATURE (CKA_TRUST + 1)
-#define CKA_TRUST_NON_REPUDIATION (CKA_TRUST + 2)
-#define CKA_TRUST_KEY_ENCIPHERMENT (CKA_TRUST + 3)
-#define CKA_TRUST_DATA_ENCIPHERMENT (CKA_TRUST + 4)
-#define CKA_TRUST_KEY_AGREEMENT (CKA_TRUST + 5)
-#define CKA_TRUST_KEY_CERT_SIGN (CKA_TRUST + 6)
-#define CKA_TRUST_CRL_SIGN (CKA_TRUST + 7)
-
-/* "Purpose" trust information */
-#define CKA_TRUST_SERVER_AUTH (CKA_TRUST + 8)
-#define CKA_TRUST_CLIENT_AUTH (CKA_TRUST + 9)
-#define CKA_TRUST_CODE_SIGNING (CKA_TRUST + 10)
-#define CKA_TRUST_EMAIL_PROTECTION (CKA_TRUST + 11)
-#define CKA_TRUST_IPSEC_END_SYSTEM (CKA_TRUST + 12)
-#define CKA_TRUST_IPSEC_TUNNEL (CKA_TRUST + 13)
-#define CKA_TRUST_IPSEC_USER (CKA_TRUST + 14)
-#define CKA_TRUST_TIME_STAMPING (CKA_TRUST + 15)
-#define CKA_TRUST_STEP_UP_APPROVED (CKA_TRUST + 16)
-
-#define CKA_CERT_SHA1_HASH (CKA_TRUST + 100)
-#define CKA_CERT_MD5_HASH (CKA_TRUST + 101)
-
-/* NSS trust stuff */
-
-/* HISTORICAL: define used to pass in the database key for DSA private keys */
-#define CKA_NETSCAPE_DB 0xD5A0DB00L
-#define CKA_NETSCAPE_TRUST 0x80000001L
-
-/* FAKE PKCS #11 defines */
-#define CKM_FAKE_RANDOM 0x80000efeUL
-#define CKM_INVALID_MECHANISM 0xffffffffUL
-
-/*
- * NSS-defined crypto mechanisms
- *
- */
-#define CKM_NSS (CKM_VENDOR_DEFINED | NSSCK_VENDOR_NSS)
-
-#define CKM_NSS_AES_KEY_WRAP (CKM_NSS + 1)
-#define CKM_NSS_AES_KEY_WRAP_PAD (CKM_NSS + 2)
-
-/* HKDF key derivation mechanisms. See CK_NSS_HKDFParams for documentation. */
-#define CKM_NSS_HKDF_SHA1 (CKM_NSS + 3)
-#define CKM_NSS_HKDF_SHA256 (CKM_NSS + 4)
-#define CKM_NSS_HKDF_SHA384 (CKM_NSS + 5)
-#define CKM_NSS_HKDF_SHA512 (CKM_NSS + 6)
-
-/* J-PAKE round 1 key generation mechanisms.
- *
- * Required template attributes: CKA_PRIME, CKA_SUBPRIME, CKA_BASE,
- *                               CKA_NSS_JPAKE_SIGNERID
- * Output key type: CKK_NSS_JPAKE_ROUND1
- * Output key class: CKO_PRIVATE_KEY
- * Parameter type: CK_NSS_JPAKERound1Params
- *
- */
-#define CKM_NSS_JPAKE_ROUND1_SHA1 (CKM_NSS + 7)
-#define CKM_NSS_JPAKE_ROUND1_SHA256 (CKM_NSS + 8)
-#define CKM_NSS_JPAKE_ROUND1_SHA384 (CKM_NSS + 9)
-#define CKM_NSS_JPAKE_ROUND1_SHA512 (CKM_NSS + 10)
-
-/* J-PAKE round 2 key derivation mechanisms.
- *
- * Required template attributes: CKA_NSS_JPAKE_PEERID
- * Input key type:  CKK_NSS_JPAKE_ROUND1
- * Output key type: CKK_NSS_JPAKE_ROUND2
- * Output key class: CKO_PRIVATE_KEY
- * Parameter type: CK_NSS_JPAKERound2Params
- */
-#define CKM_NSS_JPAKE_ROUND2_SHA1 (CKM_NSS + 11)
-#define CKM_NSS_JPAKE_ROUND2_SHA256 (CKM_NSS + 12)
-#define CKM_NSS_JPAKE_ROUND2_SHA384 (CKM_NSS + 13)
-#define CKM_NSS_JPAKE_ROUND2_SHA512 (CKM_NSS + 14)
-
-/* J-PAKE final key material derivation mechanisms
- *
- * Input key type:  CKK_NSS_JPAKE_ROUND2
- * Output key type: CKK_GENERIC_SECRET
- * Output key class: CKO_SECRET_KEY
- * Parameter type: CK_NSS_JPAKEFinalParams
- *
- * You must apply a KDF (e.g. CKM_NSS_HKDF_*) to resultant keying material
- * to get a key with uniformly distributed bits.
- */
-#define CKM_NSS_JPAKE_FINAL_SHA1 (CKM_NSS + 15)
-#define CKM_NSS_JPAKE_FINAL_SHA256 (CKM_NSS + 16)
-#define CKM_NSS_JPAKE_FINAL_SHA384 (CKM_NSS + 17)
-#define CKM_NSS_JPAKE_FINAL_SHA512 (CKM_NSS + 18)
-
-/* Constant-time MAC mechanisms:
- *
- * These operations verify a padded, MAC-then-encrypt block of data in
- * constant-time. Because of the order of operations, the padding bytes are not
- * protected by the MAC. However, disclosing the value of the padding bytes
- * gives an attacker the ability to decrypt ciphertexts. Such disclosure can be
- * as subtle as taking slightly less time to perform the MAC when the padding
- * is one byte longer. See https://www.isg.rhul.ac.uk/tls/
- *
- * CKM_NSS_HMAC_CONSTANT_TIME: performs an HMAC authentication.
- * CKM_NSS_SSL3_MAC_CONSTANT_TIME: performs an authentication with SSLv3 MAC.
- *
- * Parameter type: CK_NSS_MAC_CONSTANT_TIME_PARAMS
- */
-#define CKM_NSS_HMAC_CONSTANT_TIME (CKM_NSS + 19)
-#define CKM_NSS_SSL3_MAC_CONSTANT_TIME (CKM_NSS + 20)
-
-/* TLS 1.2 mechanisms */
-#define CKM_NSS_TLS_PRF_GENERAL_SHA256 (CKM_NSS + 21)
-#define CKM_NSS_TLS_MASTER_KEY_DERIVE_SHA256 (CKM_NSS + 22)
-#define CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256 (CKM_NSS + 23)
-#define CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256 (CKM_NSS + 24)
-
-/* TLS extended master secret derivation */
-#define CKM_NSS_TLS_EXTENDED_MASTER_KEY_DERIVE (CKM_NSS + 25)
-#define CKM_NSS_TLS_EXTENDED_MASTER_KEY_DERIVE_DH (CKM_NSS + 26)
-
-#define CKM_NSS_CHACHA20_KEY_GEN (CKM_NSS + 27)
-#define CKM_NSS_CHACHA20_POLY1305 (CKM_NSS + 28)
-
-/*
- * HISTORICAL:
- * Do not attempt to use these. They are only used by NETSCAPE's internal
- * PKCS #11 interface. Most of these are place holders for other mechanism
- * and will change in the future.
- */
-#define CKM_NETSCAPE_PBE_SHA1_DES_CBC 0x80000002UL
-#define CKM_NETSCAPE_PBE_SHA1_TRIPLE_DES_CBC 0x80000003UL
-#define CKM_NETSCAPE_PBE_SHA1_40_BIT_RC2_CBC 0x80000004UL
-#define CKM_NETSCAPE_PBE_SHA1_128_BIT_RC2_CBC 0x80000005UL
-#define CKM_NETSCAPE_PBE_SHA1_40_BIT_RC4 0x80000006UL
-#define CKM_NETSCAPE_PBE_SHA1_128_BIT_RC4 0x80000007UL
-#define CKM_NETSCAPE_PBE_SHA1_FAULTY_3DES_CBC 0x80000008UL
-#define CKM_NETSCAPE_PBE_SHA1_HMAC_KEY_GEN 0x80000009UL
-#define CKM_NETSCAPE_PBE_MD5_HMAC_KEY_GEN 0x8000000aUL
-#define CKM_NETSCAPE_PBE_MD2_HMAC_KEY_GEN 0x8000000bUL
-
-#define CKM_TLS_PRF_GENERAL 0x80000373UL
-
-typedef struct CK_NSS_JPAKEPublicValue {
-    CK_BYTE *pGX;
-    CK_ULONG ulGXLen;
-    CK_BYTE *pGV;
-    CK_ULONG ulGVLen;
-    CK_BYTE *pR;
-    CK_ULONG ulRLen;
-} CK_NSS_JPAKEPublicValue;
-
-typedef struct CK_NSS_JPAKERound1Params {
-    CK_NSS_JPAKEPublicValue gx1; /* out */
-    CK_NSS_JPAKEPublicValue gx2; /* out */
-} CK_NSS_JPAKERound1Params;
-
-typedef struct CK_NSS_JPAKERound2Params {
-    CK_BYTE *pSharedKey;         /* in */
-    CK_ULONG ulSharedKeyLen;     /* in */
-    CK_NSS_JPAKEPublicValue gx3; /* in */
-    CK_NSS_JPAKEPublicValue gx4; /* in */
-    CK_NSS_JPAKEPublicValue A;   /* out */
-} CK_NSS_JPAKERound2Params;
-
-typedef struct CK_NSS_JPAKEFinalParams {
-    CK_NSS_JPAKEPublicValue B; /* in */
-} CK_NSS_JPAKEFinalParams;
-
-/* macAlg: the MAC algorithm to use. This determines the hash function used in
- *     the HMAC/SSLv3 MAC calculations.
- * ulBodyTotalLen: the total length of the data, including padding bytes and
- *     padding length.
- * pHeader: points to a block of data that contains additional data to
- *     authenticate. For TLS this includes the sequence number etc. For SSLv3,
- *     this also includes the initial padding bytes.
- *
- * NOTE: the softoken's implementation of CKM_NSS_HMAC_CONSTANT_TIME and
- * CKM_NSS_SSL3_MAC_CONSTANT_TIME requires that the sum of ulBodyTotalLen
- * and ulHeaderLen be much smaller than 2^32 / 8 bytes because it uses an
- * unsigned int variable to represent the length in bits. This should not
- * be a problem because the SSL/TLS protocol limits the size of an SSL
- * record to something considerably less than 2^32 bytes.
- */
-typedef struct CK_NSS_MAC_CONSTANT_TIME_PARAMS {
-    CK_MECHANISM_TYPE macAlg; /* in */
-    CK_ULONG ulBodyTotalLen;  /* in */
-    CK_BYTE *pHeader;         /* in */
-    CK_ULONG ulHeaderLen;     /* in */
-} CK_NSS_MAC_CONSTANT_TIME_PARAMS;
-
-typedef struct CK_NSS_AEAD_PARAMS {
-    CK_BYTE_PTR pNonce;
-    CK_ULONG ulNonceLen;
-    CK_BYTE_PTR pAAD;
-    CK_ULONG ulAADLen;
-    CK_ULONG ulTagLen;
-} CK_NSS_AEAD_PARAMS;
-
-/*
- * NSS-defined return values
- *
- */
-#define CKR_NSS (CKM_VENDOR_DEFINED | NSSCK_VENDOR_NSS)
-
-#define CKR_NSS_CERTDB_FAILED (CKR_NSS + 1)
-#define CKR_NSS_KEYDB_FAILED (CKR_NSS + 2)
-
-/* Mandatory parameter for the CKM_NSS_HKDF_* key deriviation mechanisms.
-   See RFC 5869.
-
-    bExtract: If set, HKDF-Extract will be applied to the input key. If
-              the optional salt is given, it is used; otherwise, the salt is
-              set to a sequence of zeros equal in length to the HMAC output.
-              If bExpand is not set, then the key template given to
-              C_DeriveKey must indicate an output key size less than or equal
-              to the output size of the HMAC.
-
-    bExpand:  If set, HKDF-Expand will be applied to the input key (if
-              bExtract is not set) or to the result of HKDF-Extract (if
-              bExtract is set). Any info given in the optional pInfo field will
-              be included in the calculation.
-
-    The size of the output key must be specified in the template passed to
-    C_DeriveKey.
-*/
-typedef struct CK_NSS_HKDFParams {
-    CK_BBOOL bExtract;
-    CK_BYTE_PTR pSalt;
-    CK_ULONG ulSaltLen;
-    CK_BBOOL bExpand;
-    CK_BYTE_PTR pInfo;
-    CK_ULONG ulInfoLen;
-} CK_NSS_HKDFParams;
-
-/*
- * Parameter for the TLS extended master secret key derivation mechanisms:
- *
- *  * CKM_NSS_TLS_EXTENDED_MASTER_KEY_DERIVE
- *  * CKM_NSS_TLS_EXTENDED_MASTER_KEY_DERIVE_DH
- *
- * For the TLS 1.2 PRF, the prfHashMechanism parameter determines the hash
- * function used. For earlier versions of the PRF, set the prfHashMechanism
- * value to CKM_TLS_PRF.
- *
- * The session hash input is expected to be the output of the same hash
- * function as the PRF uses (as required by draft-ietf-tls-session-hash).  So
- * the ulSessionHashLen member must be equal the output length of the hash
- * function specified by the prfHashMechanism member (or, for pre-TLS 1.2 PRF,
- * the length of concatenated MD5 and SHA-1 digests).
- *
- */
-typedef struct CK_NSS_TLS_EXTENDED_MASTER_KEY_DERIVE_PARAMS {
-    CK_MECHANISM_TYPE prfHashMechanism;
-    CK_BYTE_PTR pSessionHash;
-    CK_ULONG ulSessionHashLen;
-    CK_VERSION_PTR pVersion;
-} CK_NSS_TLS_EXTENDED_MASTER_KEY_DERIVE_PARAMS;
-
-/*
- * Trust info
- *
- * This isn't part of the Cryptoki standard (yet), so I'm putting
- * all the definitions here.  Some of this would move to nssckt.h
- * if trust info were made part of the standard.  In view of this
- * possibility, I'm putting my (NSS) values in the NSS
- * vendor space, like everything else.
- */
-
-typedef CK_ULONG CK_TRUST;
-
-/* The following trust types are defined: */
-#define CKT_VENDOR_DEFINED 0x80000000
-
-#define CKT_NSS (CKT_VENDOR_DEFINED | NSSCK_VENDOR_NSS)
-
-/* If trust goes standard, these'll probably drop out of vendor space. */
-#define CKT_NSS_TRUSTED (CKT_NSS + 1)
-#define CKT_NSS_TRUSTED_DELEGATOR (CKT_NSS + 2)
-#define CKT_NSS_MUST_VERIFY_TRUST (CKT_NSS + 3)
-#define CKT_NSS_NOT_TRUSTED (CKT_NSS + 10)
-#define CKT_NSS_TRUST_UNKNOWN (CKT_NSS + 5) /* default */
-
-/*
- * These may well remain NSS-specific; I'm only using them
- * to cache resolution data.
- */
-#define CKT_NSS_VALID_DELEGATOR (CKT_NSS + 11)
-
-/*
- * old definitions. They still exist, but the plain meaning of the
- * labels have never been accurate to what was really implemented.
- * The new labels correctly reflect what the values effectively mean.
- */
-#if defined(__GNUC__) && (__GNUC__ > 3)
-/* make GCC warn when we use these #defines */
-/*
- *  This is really painful because GCC doesn't allow us to mark random
- *  #defines as deprecated. We can only mark the following:
- *      functions, variables, and types.
- *  const variables will create extra storage for everyone including this
- *       header file, so it's undesirable.
- *  functions could be inlined to prevent storage creation, but will fail
- *       when constant values are expected (like switch statements).
- *  enum types do not seem to pay attention to the deprecated attribute.
- *
- *  That leaves typedefs. We declare new types that we then deprecate, then
- *  cast the resulting value to the deprecated type in the #define, thus
- *  producting the warning when the #define is used.
- */
-#if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)
-/* The mac doesn't like the friendlier deprecate messages. I'm assuming this
- * is a gcc version issue rather than mac or ppc specific */
-typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));
-typedef CK_TRUST __CKT_NSS_VALID __attribute__((deprecated));
-typedef CK_TRUST __CKT_NSS_MUST_VERIFY __attribute__((deprecated));
-#else
-/* when possible, get a full deprecation warning. This works on gcc 4.5
- * it may work on earlier versions of gcc */
-typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated("CKT_NSS_UNTRUSTED really means CKT_NSS_MUST_VERIFY_TRUST")));
-typedef CK_TRUST __CKT_NSS_VALID __attribute__((deprecated("CKT_NSS_VALID really means CKT_NSS_NOT_TRUSTED")));
-typedef CK_TRUST __CKT_NSS_MUST_VERIFY __attribute__((deprecated("CKT_NSS_MUST_VERIFY really functions as CKT_NSS_TRUST_UNKNOWN")));
-#endif
-#define CKT_NSS_UNTRUSTED ((__CKT_NSS_UNTRUSTED)CKT_NSS_MUST_VERIFY_TRUST)
-#define CKT_NSS_VALID ((__CKT_NSS_VALID)CKT_NSS_NOT_TRUSTED)
-/* keep the old value for compatibility reasons*/
-#define CKT_NSS_MUST_VERIFY ((__CKT_NSS_MUST_VERIFY)(CKT_NSS + 4))
-#else
-#ifdef _WIN32
-/* This magic gets the windows compiler to give us a deprecation
- * warning */
-#pragma deprecated(CKT_NSS_UNTRUSTED, CKT_NSS_MUST_VERIFY, CKT_NSS_VALID)
-#endif
-/* CKT_NSS_UNTRUSTED really means CKT_NSS_MUST_VERIFY_TRUST */
-#define CKT_NSS_UNTRUSTED CKT_NSS_MUST_VERIFY_TRUST
-/* CKT_NSS_VALID really means CKT_NSS_NOT_TRUSTED */
-#define CKT_NSS_VALID CKT_NSS_NOT_TRUSTED
-/* CKT_NSS_MUST_VERIFY was always treated as CKT_NSS_TRUST_UNKNOWN */
-#define CKT_NSS_MUST_VERIFY (CKT_NSS + 4) /*really means trust unknown*/
-#endif
-
-/* don't leave old programs in a lurch just yet, give them the old NETSCAPE
- * synonym */
-#define CKO_NETSCAPE_CRL CKO_NSS_CRL
-#define CKO_NETSCAPE_SMIME CKO_NSS_SMIME
-#define CKO_NETSCAPE_TRUST CKO_NSS_TRUST
-#define CKO_NETSCAPE_BUILTIN_ROOT_LIST CKO_NSS_BUILTIN_ROOT_LIST
-#define CKO_NETSCAPE_NEWSLOT CKO_NSS_NEWSLOT
-#define CKO_NETSCAPE_DELSLOT CKO_NSS_DELSLOT
-#define CKK_NETSCAPE_PKCS8 CKK_NSS_PKCS8
-#define CKA_NETSCAPE_URL CKA_NSS_URL
-#define CKA_NETSCAPE_EMAIL CKA_NSS_EMAIL
-#define CKA_NETSCAPE_SMIME_INFO CKA_NSS_SMIME_INFO
-#define CKA_NETSCAPE_SMIME_TIMESTAMP CKA_NSS_SMIME_TIMESTAMP
-#define CKA_NETSCAPE_PKCS8_SALT CKA_NSS_PKCS8_SALT
-#define CKA_NETSCAPE_PASSWORD_CHECK CKA_NSS_PASSWORD_CHECK
-#define CKA_NETSCAPE_EXPIRES CKA_NSS_EXPIRES
-#define CKA_NETSCAPE_KRL CKA_NSS_KRL
-#define CKA_NETSCAPE_PQG_COUNTER CKA_NSS_PQG_COUNTER
-#define CKA_NETSCAPE_PQG_SEED CKA_NSS_PQG_SEED
-#define CKA_NETSCAPE_PQG_H CKA_NSS_PQG_H
-#define CKA_NETSCAPE_PQG_SEED_BITS CKA_NSS_PQG_SEED_BITS
-#define CKA_NETSCAPE_MODULE_SPEC CKA_NSS_MODULE_SPEC
-#define CKM_NETSCAPE_AES_KEY_WRAP CKM_NSS_AES_KEY_WRAP
-#define CKM_NETSCAPE_AES_KEY_WRAP_PAD CKM_NSS_AES_KEY_WRAP_PAD
-#define CKR_NETSCAPE_CERTDB_FAILED CKR_NSS_CERTDB_FAILED
-#define CKR_NETSCAPE_KEYDB_FAILED CKR_NSS_KEYDB_FAILED
-
-#define CKT_NETSCAPE_TRUSTED CKT_NSS_TRUSTED
-#define CKT_NETSCAPE_TRUSTED_DELEGATOR CKT_NSS_TRUSTED_DELEGATOR
-#define CKT_NETSCAPE_UNTRUSTED CKT_NSS_UNTRUSTED
-#define CKT_NETSCAPE_MUST_VERIFY CKT_NSS_MUST_VERIFY
-#define CKT_NETSCAPE_TRUST_UNKNOWN CKT_NSS_TRUST_UNKNOWN
-#define CKT_NETSCAPE_VALID CKT_NSS_VALID
-#define CKT_NETSCAPE_VALID_DELEGATOR CKT_NSS_VALID_DELEGATOR
-
-/*
- * These are not really PKCS #11 values specifically. They are the 'loadable'
- * module spec NSS uses. The are available for others to use as well, but not
- * part of the formal PKCS #11 spec.
- *
- * The function 'FIND' returns an array of PKCS #11 initialization strings
- * The function 'ADD' takes a PKCS #11 initialization string and stores it.
- * The function 'DEL' takes a 'name= library=' value and deletes the associated
- *  string.
- * The function 'RELEASE' frees the array returned by 'FIND'
- */
-#define SECMOD_MODULE_DB_FUNCTION_FIND 0
-#define SECMOD_MODULE_DB_FUNCTION_ADD 1
-#define SECMOD_MODULE_DB_FUNCTION_DEL 2
-#define SECMOD_MODULE_DB_FUNCTION_RELEASE 3
-typedef char **(PR_CALLBACK *SECMODModuleDBFunc)(unsigned long function,
-                                                 char *parameters, void *moduleSpec);
-
-/* softoken slot ID's */
-#define SFTK_MIN_USER_SLOT_ID 4
-#define SFTK_MAX_USER_SLOT_ID 100
-#define SFTK_MIN_FIPS_USER_SLOT_ID 101
-#define SFTK_MAX_FIPS_USER_SLOT_ID 127
-
-#endif /* _PKCS11N_H_ */
diff --git a/openflow/usr/include/nss/pkcs11p.h b/openflow/usr/include/nss/pkcs11p.h
deleted file mode 100644
index 2e904ee..0000000
--- a/openflow/usr/include/nss/pkcs11p.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*
- * Copyright (C) 1994-1999 RSA Security Inc. Licence to copy this document
- * is granted provided that it is identified as "RSA Security Inc. Public-Key
- * Cryptography Standards (PKCS)" in all material mentioning or referencing
- * this document.
- */
-/* these data types are platform/implementation dependent. */
-/*
- * Packing was removed from the shipped RSA header files, even
- * though it's still needed. put in a central file to help merging..
- */
-
-#if defined(_WIN32)
-#ifdef _MSC_VER
-#pragma warning(disable : 4103)
-#endif
-#pragma pack(push, cryptoki, 1)
-#endif
diff --git a/openflow/usr/include/nss/pkcs11t.h b/openflow/usr/include/nss/pkcs11t.h
deleted file mode 100644
index c945f31..0000000
--- a/openflow/usr/include/nss/pkcs11t.h
+++ /dev/null
@@ -1,1800 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/* License to copy and use this software is granted provided that it is
- * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
- * (Cryptoki)" in all material mentioning or referencing this software.
-
- * License is also granted to make and use derivative works provided that
- * such works are identified as "derived from the RSA Security Inc. PKCS #11
- * Cryptographic Token Interface (Cryptoki)" in all material mentioning or
- * referencing the derived work.
-
- * RSA Security Inc. makes no representations concerning either the
- * merchantability of this software or the suitability of this software for
- * any particular purpose. It is provided "as is" without express or implied
- * warranty of any kind.
- */
-
-#ifndef _PKCS11T_H_
-#define _PKCS11T_H_ 1
-
-#define CK_TRUE 1
-#define CK_FALSE 0
-
-#include "prtypes.h"
-
-#define CK_PTR *
-#define CK_NULL_PTR 0
-#define CK_CALLBACK_FUNCTION(rtype, func) rtype(PR_CALLBACK *func)
-#define CK_DECLARE_FUNCTION(rtype, func) extern rtype func
-#define CK_DECLARE_FUNCTION_POINTER(rtype, func) rtype(PR_CALLBACK *func)
-
-#define CK_INVALID_SESSION 0
-
-/* an unsigned 8-bit value */
-typedef unsigned char CK_BYTE;
-
-/* an unsigned 8-bit character */
-typedef CK_BYTE CK_CHAR;
-
-/* an 8-bit UTF-8 character */
-typedef CK_BYTE CK_UTF8CHAR;
-
-/* a BYTE-sized Boolean flag */
-typedef CK_BYTE CK_BBOOL;
-
-/* an unsigned value, at least 32 bits long */
-typedef unsigned long int CK_ULONG;
-
-/* a signed value, the same size as a CK_ULONG */
-/* CK_LONG is new for v2.0 */
-typedef long int CK_LONG;
-
-/* at least 32 bits; each bit is a Boolean flag */
-typedef CK_ULONG CK_FLAGS;
-
-/* some special values for certain CK_ULONG variables */
-#define CK_UNAVAILABLE_INFORMATION (~0UL)
-#define CK_EFFECTIVELY_INFINITE 0
-
-typedef CK_BYTE CK_PTR CK_BYTE_PTR;
-typedef CK_CHAR CK_PTR CK_CHAR_PTR;
-typedef CK_UTF8CHAR CK_PTR CK_UTF8CHAR_PTR;
-typedef CK_ULONG CK_PTR CK_ULONG_PTR;
-typedef void CK_PTR CK_VOID_PTR;
-
-/* Pointer to a CK_VOID_PTR-- i.e., pointer to pointer to void */
-typedef CK_VOID_PTR CK_PTR CK_VOID_PTR_PTR;
-
-/* The following value is always invalid if used as a session */
-/* handle or object handle */
-#define CK_INVALID_HANDLE 0
-
-/* pack */
-#include "pkcs11p.h"
-
-typedef struct CK_VERSION {
-    CK_BYTE major; /* integer portion of version number */
-    CK_BYTE minor; /* 1/100ths portion of version number */
-} CK_VERSION;
-
-typedef CK_VERSION CK_PTR CK_VERSION_PTR;
-
-typedef struct CK_INFO {
-    /* manufacturerID and libraryDecription have been changed from
-   * CK_CHAR to CK_UTF8CHAR for v2.10 */
-    CK_VERSION cryptokiVersion;     /* PKCS #11 interface ver */
-    CK_UTF8CHAR manufacturerID[32]; /* blank padded */
-    CK_FLAGS flags;                 /* must be zero */
-
-    /* libraryDescription and libraryVersion are new for v2.0 */
-    CK_UTF8CHAR libraryDescription[32]; /* blank padded */
-    CK_VERSION libraryVersion;          /* version of library */
-} CK_INFO;
-
-typedef CK_INFO CK_PTR CK_INFO_PTR;
-
-/* CK_NOTIFICATION enumerates the types of notifications that
- * PKCS #11 provides to an application */
-/* CK_NOTIFICATION has been changed from an enum to a CK_ULONG
- * for v2.0 */
-typedef CK_ULONG CK_NOTIFICATION;
-#define CKN_SURRENDER 0
-
-typedef CK_ULONG CK_SLOT_ID;
-
-typedef CK_SLOT_ID CK_PTR CK_SLOT_ID_PTR;
-
-/* CK_SLOT_INFO provides information about a slot */
-typedef struct CK_SLOT_INFO {
-    /* slotDescription and manufacturerID have been changed from
-     * CK_CHAR to CK_UTF8CHAR for v2.10 */
-    CK_UTF8CHAR slotDescription[64]; /* blank padded */
-    CK_UTF8CHAR manufacturerID[32];  /* blank padded */
-    CK_FLAGS flags;
-
-    /* hardwareVersion and firmwareVersion are new for v2.0 */
-    CK_VERSION hardwareVersion; /* version of hardware */
-    CK_VERSION firmwareVersion; /* version of firmware */
-} CK_SLOT_INFO;
-
-/* flags: bit flags that provide capabilities of the slot
- *      Bit Flag              Mask        Meaning
- */
-#define CKF_TOKEN_PRESENT 0x00000001    /* a token is there */
-#define CKF_REMOVABLE_DEVICE 0x00000002 /* removable devices*/
-#define CKF_HW_SLOT 0x00000004          /* hardware slot */
-
-typedef CK_SLOT_INFO CK_PTR CK_SLOT_INFO_PTR;
-
-/* CK_TOKEN_INFO provides information about a token */
-typedef struct CK_TOKEN_INFO {
-    /* label, manufacturerID, and model have been changed from
-     * CK_CHAR to CK_UTF8CHAR for v2.10 */
-    CK_UTF8CHAR label[32];          /* blank padded */
-    CK_UTF8CHAR manufacturerID[32]; /* blank padded */
-    CK_UTF8CHAR model[16];          /* blank padded */
-    CK_CHAR serialNumber[16];       /* blank padded */
-    CK_FLAGS flags;                 /* see below */
-
-    /* ulMaxSessionCount, ulSessionCount, ulMaxRwSessionCount,
-     * ulRwSessionCount, ulMaxPinLen, and ulMinPinLen have all been
-     * changed from CK_USHORT to CK_ULONG for v2.0 */
-    CK_ULONG ulMaxSessionCount;    /* max open sessions */
-    CK_ULONG ulSessionCount;       /* sess. now open */
-    CK_ULONG ulMaxRwSessionCount;  /* max R/W sessions */
-    CK_ULONG ulRwSessionCount;     /* R/W sess. now open */
-    CK_ULONG ulMaxPinLen;          /* in bytes */
-    CK_ULONG ulMinPinLen;          /* in bytes */
-    CK_ULONG ulTotalPublicMemory;  /* in bytes */
-    CK_ULONG ulFreePublicMemory;   /* in bytes */
-    CK_ULONG ulTotalPrivateMemory; /* in bytes */
-    CK_ULONG ulFreePrivateMemory;  /* in bytes */
-
-    /* hardwareVersion, firmwareVersion, and time are new for
-     * v2.0 */
-    CK_VERSION hardwareVersion; /* version of hardware */
-    CK_VERSION firmwareVersion; /* version of firmware */
-    CK_CHAR utcTime[16];        /* time */
-} CK_TOKEN_INFO;
-
-/* The flags parameter is defined as follows:
- *      Bit Flag                    Mask        Meaning
- */
-#define CKF_RNG 0x00000001                  /* has random # \
-                                             * generator */
-#define CKF_WRITE_PROTECTED 0x00000002      /* token is \
-                                             * write-   \
-                                             * protected */
-#define CKF_LOGIN_REQUIRED 0x00000004       /* user must \
-                                             * login */
-#define CKF_USER_PIN_INITIALIZED 0x00000008 /* normal user's \
-                                             * PIN is set */
-
-/* CKF_RESTORE_KEY_NOT_NEEDED is new for v2.0.  If it is set,
- * that means that *every* time the state of cryptographic
- * operations of a session is successfully saved, all keys
- * needed to continue those operations are stored in the state */
-#define CKF_RESTORE_KEY_NOT_NEEDED 0x00000020
-
-/* CKF_CLOCK_ON_TOKEN is new for v2.0.  If it is set, that means
- * that the token has some sort of clock.  The time on that
- * clock is returned in the token info structure */
-#define CKF_CLOCK_ON_TOKEN 0x00000040
-
-/* CKF_PROTECTED_AUTHENTICATION_PATH is new for v2.0.  If it is
- * set, that means that there is some way for the user to login
- * without sending a PIN through the PKCS #11 library itself */
-#define CKF_PROTECTED_AUTHENTICATION_PATH 0x00000100
-
-/* CKF_DUAL_CRYPTO_OPERATIONS is new for v2.0.  If it is true,
- * that means that a single session with the token can perform
- * dual simultaneous cryptographic operations (digest and
- * encrypt; decrypt and digest; sign and encrypt; and decrypt
- * and sign) */
-#define CKF_DUAL_CRYPTO_OPERATIONS 0x00000200
-
-/* CKF_TOKEN_INITIALIZED if new for v2.10. If it is true, the
- * token has been initialized using C_InitializeToken or an
- * equivalent mechanism outside the scope of PKCS #11.
- * Calling C_InitializeToken when this flag is set will cause
- * the token to be reinitialized. */
-#define CKF_TOKEN_INITIALIZED 0x00000400
-
-/* CKF_SECONDARY_AUTHENTICATION if new for v2.10. If it is
- * true, the token supports secondary authentication for
- * private key objects. This flag is deprecated in v2.11 and
-   onwards. */
-#define CKF_SECONDARY_AUTHENTICATION 0x00000800
-
-/* CKF_USER_PIN_COUNT_LOW if new for v2.10. If it is true, an
- * incorrect user login PIN has been entered at least once
- * since the last successful authentication. */
-#define CKF_USER_PIN_COUNT_LOW 0x00010000
-
-/* CKF_USER_PIN_FINAL_TRY if new for v2.10. If it is true,
- * supplying an incorrect user PIN will it to become locked. */
-#define CKF_USER_PIN_FINAL_TRY 0x00020000
-
-/* CKF_USER_PIN_LOCKED if new for v2.10. If it is true, the
- * user PIN has been locked. User login to the token is not
- * possible. */
-#define CKF_USER_PIN_LOCKED 0x00040000
-
-/* CKF_USER_PIN_TO_BE_CHANGED if new for v2.10. If it is true,
- * the user PIN value is the default value set by token
- * initialization or manufacturing, or the PIN has been
- * expired by the card. */
-#define CKF_USER_PIN_TO_BE_CHANGED 0x00080000
-
-/* CKF_SO_PIN_COUNT_LOW if new for v2.10. If it is true, an
- * incorrect SO login PIN has been entered at least once since
- * the last successful authentication. */
-#define CKF_SO_PIN_COUNT_LOW 0x00100000
-
-/* CKF_SO_PIN_FINAL_TRY if new for v2.10. If it is true,
- * supplying an incorrect SO PIN will it to become locked. */
-#define CKF_SO_PIN_FINAL_TRY 0x00200000
-
-/* CKF_SO_PIN_LOCKED if new for v2.10. If it is true, the SO
- * PIN has been locked. SO login to the token is not possible.
- */
-#define CKF_SO_PIN_LOCKED 0x00400000
-
-/* CKF_SO_PIN_TO_BE_CHANGED if new for v2.10. If it is true,
- * the SO PIN value is the default value set by token
- * initialization or manufacturing, or the PIN has been
- * expired by the card. */
-#define CKF_SO_PIN_TO_BE_CHANGED 0x00800000
-
-typedef CK_TOKEN_INFO CK_PTR CK_TOKEN_INFO_PTR;
-
-/* CK_SESSION_HANDLE is a PKCS #11-assigned value that
- * identifies a session */
-typedef CK_ULONG CK_SESSION_HANDLE;
-
-typedef CK_SESSION_HANDLE CK_PTR CK_SESSION_HANDLE_PTR;
-
-/* CK_USER_TYPE enumerates the types of PKCS #11 users */
-/* CK_USER_TYPE has been changed from an enum to a CK_ULONG for
- * v2.0 */
-typedef CK_ULONG CK_USER_TYPE;
-/* Security Officer */
-#define CKU_SO 0
-/* Normal user */
-#define CKU_USER 1
-/* Context specific (added in v2.20) */
-#define CKU_CONTEXT_SPECIFIC 2
-
-/* CK_STATE enumerates the session states */
-/* CK_STATE has been changed from an enum to a CK_ULONG for
- * v2.0 */
-typedef CK_ULONG CK_STATE;
-#define CKS_RO_PUBLIC_SESSION 0
-#define CKS_RO_USER_FUNCTIONS 1
-#define CKS_RW_PUBLIC_SESSION 2
-#define CKS_RW_USER_FUNCTIONS 3
-#define CKS_RW_SO_FUNCTIONS 4
-
-/* CK_SESSION_INFO provides information about a session */
-typedef struct CK_SESSION_INFO {
-    CK_SLOT_ID slotID;
-    CK_STATE state;
-    CK_FLAGS flags; /* see below */
-
-    /* ulDeviceError was changed from CK_USHORT to CK_ULONG for
-     * v2.0 */
-    CK_ULONG ulDeviceError; /* device-dependent error code */
-} CK_SESSION_INFO;
-
-/* The flags are defined in the following table:
- *      Bit Flag                Mask        Meaning
- */
-#define CKF_RW_SESSION 0x00000002     /* session is r/w */
-#define CKF_SERIAL_SESSION 0x00000004 /* no parallel */
-
-typedef CK_SESSION_INFO CK_PTR CK_SESSION_INFO_PTR;
-
-/* CK_OBJECT_HANDLE is a token-specific identifier for an
- * object  */
-typedef CK_ULONG CK_OBJECT_HANDLE;
-
-typedef CK_OBJECT_HANDLE CK_PTR CK_OBJECT_HANDLE_PTR;
-
-/* CK_OBJECT_CLASS is a value that identifies the classes (or
- * types) of objects that PKCS #11 recognizes.  It is defined
- * as follows: */
-/* CK_OBJECT_CLASS was changed from CK_USHORT to CK_ULONG for
- * v2.0 */
-typedef CK_ULONG CK_OBJECT_CLASS;
-
-/* The following classes of objects are defined: */
-/* CKO_HW_FEATURE is new for v2.10 */
-/* CKO_DOMAIN_PARAMETERS is new for v2.11 */
-/* CKO_MECHANISM is new for v2.20 */
-#define CKO_DATA 0x00000000
-#define CKO_CERTIFICATE 0x00000001
-#define CKO_PUBLIC_KEY 0x00000002
-#define CKO_PRIVATE_KEY 0x00000003
-#define CKO_SECRET_KEY 0x00000004
-#define CKO_HW_FEATURE 0x00000005
-#define CKO_DOMAIN_PARAMETERS 0x00000006
-#define CKO_MECHANISM 0x00000007
-#define CKO_VENDOR_DEFINED 0x80000000
-
-typedef CK_OBJECT_CLASS CK_PTR CK_OBJECT_CLASS_PTR;
-
-/* CK_HW_FEATURE_TYPE is new for v2.10. CK_HW_FEATURE_TYPE is a
- * value that identifies the hardware feature type of an object
- * with CK_OBJECT_CLASS equal to CKO_HW_FEATURE. */
-typedef CK_ULONG CK_HW_FEATURE_TYPE;
-
-/* The following hardware feature types are defined */
-/* CKH_USER_INTERFACE is new for v2.20 */
-#define CKH_MONOTONIC_COUNTER 0x00000001
-#define CKH_CLOCK 0x00000002
-#define CKH_USER_INTERFACE 0x00000003
-#define CKH_VENDOR_DEFINED 0x80000000
-
-/* CK_KEY_TYPE is a value that identifies a key type */
-/* CK_KEY_TYPE was changed from CK_USHORT to CK_ULONG for v2.0 */
-typedef CK_ULONG CK_KEY_TYPE;
-
-/* the following key types are defined: */
-#define CKK_RSA 0x00000000
-#define CKK_DSA 0x00000001
-#define CKK_DH 0x00000002
-
-/* CKK_ECDSA and CKK_KEA are new for v2.0 */
-/* CKK_ECDSA is deprecated in v2.11, CKK_EC is preferred. */
-#define CKK_ECDSA 0x00000003
-#define CKK_EC 0x00000003
-#define CKK_X9_42_DH 0x00000004
-#define CKK_KEA 0x00000005
-
-#define CKK_GENERIC_SECRET 0x00000010
-#define CKK_RC2 0x00000011
-#define CKK_RC4 0x00000012
-#define CKK_DES 0x00000013
-#define CKK_DES2 0x00000014
-#define CKK_DES3 0x00000015
-
-/* all these key types are new for v2.0 */
-#define CKK_CAST 0x00000016
-#define CKK_CAST3 0x00000017
-/* CKK_CAST5 is deprecated in v2.11, CKK_CAST128 is preferred. */
-#define CKK_CAST5 0x00000018
-#define CKK_CAST128 0x00000018
-#define CKK_RC5 0x00000019
-#define CKK_IDEA 0x0000001A
-#define CKK_SKIPJACK 0x0000001B
-#define CKK_BATON 0x0000001C
-#define CKK_JUNIPER 0x0000001D
-#define CKK_CDMF 0x0000001E
-#define CKK_AES 0x0000001F
-
-/* BlowFish and TwoFish are new for v2.20 */
-#define CKK_BLOWFISH 0x00000020
-#define CKK_TWOFISH 0x00000021
-
-/* Camellia is proposed for v2.20 Amendment 3 */
-#define CKK_CAMELLIA 0x00000025
-
-#define CKK_SEED 0x00000026
-
-#define CKK_VENDOR_DEFINED 0x80000000
-
-/* CK_CERTIFICATE_TYPE is a value that identifies a certificate
- * type */
-/* CK_CERTIFICATE_TYPE was changed from CK_USHORT to CK_ULONG
- * for v2.0 */
-typedef CK_ULONG CK_CERTIFICATE_TYPE;
-
-/* The following certificate types are defined: */
-/* CKC_X_509_ATTR_CERT is new for v2.10 */
-/* CKC_WTLS is new for v2.20 */
-#define CKC_X_509 0x00000000
-#define CKC_X_509_ATTR_CERT 0x00000001
-#define CKC_WTLS 0x00000002
-#define CKC_VENDOR_DEFINED 0x80000000
-
-/* CK_ATTRIBUTE_TYPE is a value that identifies an attribute
- * type */
-/* CK_ATTRIBUTE_TYPE was changed from CK_USHORT to CK_ULONG for
- * v2.0 */
-typedef CK_ULONG CK_ATTRIBUTE_TYPE;
-
-/* The CKF_ARRAY_ATTRIBUTE flag identifies an attribute which
-   consists of an array of values. */
-#define CKF_ARRAY_ATTRIBUTE 0x40000000
-
-/* The following attribute types are defined: */
-#define CKA_CLASS 0x00000000
-#define CKA_TOKEN 0x00000001
-#define CKA_PRIVATE 0x00000002
-#define CKA_LABEL 0x00000003
-#define CKA_APPLICATION 0x00000010
-#define CKA_VALUE 0x00000011
-
-/* CKA_OBJECT_ID is new for v2.10 */
-#define CKA_OBJECT_ID 0x00000012
-
-#define CKA_CERTIFICATE_TYPE 0x00000080
-#define CKA_ISSUER 0x00000081
-#define CKA_SERIAL_NUMBER 0x00000082
-
-/* CKA_AC_ISSUER, CKA_OWNER, and CKA_ATTR_TYPES are new
- * for v2.10 */
-#define CKA_AC_ISSUER 0x00000083
-#define CKA_OWNER 0x00000084
-#define CKA_ATTR_TYPES 0x00000085
-
-/* CKA_TRUSTED is new for v2.11 */
-#define CKA_TRUSTED 0x00000086
-
-/* CKA_CERTIFICATE_CATEGORY ...
- * CKA_CHECK_VALUE are new for v2.20 */
-#define CKA_CERTIFICATE_CATEGORY 0x00000087
-#define CKA_JAVA_MIDP_SECURITY_DOMAIN 0x00000088
-#define CKA_URL 0x00000089
-#define CKA_HASH_OF_SUBJECT_PUBLIC_KEY 0x0000008A
-#define CKA_HASH_OF_ISSUER_PUBLIC_KEY 0x0000008B
-#define CKA_CHECK_VALUE 0x00000090
-
-#define CKA_KEY_TYPE 0x00000100
-#define CKA_SUBJECT 0x00000101
-#define CKA_ID 0x00000102
-#define CKA_SENSITIVE 0x00000103
-#define CKA_ENCRYPT 0x00000104
-#define CKA_DECRYPT 0x00000105
-#define CKA_WRAP 0x00000106
-#define CKA_UNWRAP 0x00000107
-#define CKA_SIGN 0x00000108
-#define CKA_SIGN_RECOVER 0x00000109
-#define CKA_VERIFY 0x0000010A
-#define CKA_VERIFY_RECOVER 0x0000010B
-#define CKA_DERIVE 0x0000010C
-#define CKA_START_DATE 0x00000110
-#define CKA_END_DATE 0x00000111
-#define CKA_MODULUS 0x00000120
-#define CKA_MODULUS_BITS 0x00000121
-#define CKA_PUBLIC_EXPONENT 0x00000122
-#define CKA_PRIVATE_EXPONENT 0x00000123
-#define CKA_PRIME_1 0x00000124
-#define CKA_PRIME_2 0x00000125
-#define CKA_EXPONENT_1 0x00000126
-#define CKA_EXPONENT_2 0x00000127
-#define CKA_COEFFICIENT 0x00000128
-#define CKA_PRIME 0x00000130
-#define CKA_SUBPRIME 0x00000131
-#define CKA_BASE 0x00000132
-
-/* CKA_PRIME_BITS and CKA_SUB_PRIME_BITS are new for v2.11 */
-#define CKA_PRIME_BITS 0x00000133
-#define CKA_SUBPRIME_BITS 0x00000134
-#define CKA_SUB_PRIME_BITS CKA_SUBPRIME_BITS
-/* (To retain backwards-compatibility) */
-
-#define CKA_VALUE_BITS 0x00000160
-#define CKA_VALUE_LEN 0x00000161
-
-/* CKA_EXTRACTABLE, CKA_LOCAL, CKA_NEVER_EXTRACTABLE,
- * CKA_ALWAYS_SENSITIVE, CKA_MODIFIABLE, CKA_ECDSA_PARAMS,
- * and CKA_EC_POINT are new for v2.0 */
-#define CKA_EXTRACTABLE 0x00000162
-#define CKA_LOCAL 0x00000163
-#define CKA_NEVER_EXTRACTABLE 0x00000164
-#define CKA_ALWAYS_SENSITIVE 0x00000165
-
-/* CKA_KEY_GEN_MECHANISM is new for v2.11 */
-#define CKA_KEY_GEN_MECHANISM 0x00000166
-
-#define CKA_MODIFIABLE 0x00000170
-
-/* CKA_ECDSA_PARAMS is deprecated in v2.11,
- * CKA_EC_PARAMS is preferred. */
-#define CKA_ECDSA_PARAMS 0x00000180
-#define CKA_EC_PARAMS 0x00000180
-
-#define CKA_EC_POINT 0x00000181
-
-/* CKA_SECONDARY_AUTH, CKA_AUTH_PIN_FLAGS,
- * are new for v2.10. Deprecated in v2.11 and onwards. */
-#define CKA_SECONDARY_AUTH 0x00000200
-#define CKA_AUTH_PIN_FLAGS 0x00000201
-
-/* CKA_ALWAYS_AUTHENTICATE ...
- * CKA_UNWRAP_TEMPLATE are new for v2.20 */
-#define CKA_ALWAYS_AUTHENTICATE 0x00000202
-
-#define CKA_WRAP_WITH_TRUSTED 0x00000210
-#define CKA_WRAP_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x00000211)
-#define CKA_UNWRAP_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x00000212)
-
-/* CKA_HW_FEATURE_TYPE, CKA_RESET_ON_INIT, and CKA_HAS_RESET
- * are new for v2.10 */
-#define CKA_HW_FEATURE_TYPE 0x00000300
-#define CKA_RESET_ON_INIT 0x00000301
-#define CKA_HAS_RESET 0x00000302
-
-/* The following attributes are new for v2.20 */
-#define CKA_PIXEL_X 0x00000400
-#define CKA_PIXEL_Y 0x00000401
-#define CKA_RESOLUTION 0x00000402
-#define CKA_CHAR_ROWS 0x00000403
-#define CKA_CHAR_COLUMNS 0x00000404
-#define CKA_COLOR 0x00000405
-#define CKA_BITS_PER_PIXEL 0x00000406
-#define CKA_CHAR_SETS 0x00000480
-#define CKA_ENCODING_METHODS 0x00000481
-#define CKA_MIME_TYPES 0x00000482
-#define CKA_MECHANISM_TYPE 0x00000500
-#define CKA_REQUIRED_CMS_ATTRIBUTES 0x00000501
-#define CKA_DEFAULT_CMS_ATTRIBUTES 0x00000502
-#define CKA_SUPPORTED_CMS_ATTRIBUTES 0x00000503
-#define CKA_ALLOWED_MECHANISMS (CKF_ARRAY_ATTRIBUTE | 0x00000600)
-
-#define CKA_VENDOR_DEFINED 0x80000000
-
-/* CK_ATTRIBUTE is a structure that includes the type, length
- * and value of an attribute */
-typedef struct CK_ATTRIBUTE {
-    CK_ATTRIBUTE_TYPE type;
-    CK_VOID_PTR pValue;
-
-    /* ulValueLen went from CK_USHORT to CK_ULONG for v2.0 */
-    CK_ULONG ulValueLen; /* in bytes */
-} CK_ATTRIBUTE;
-
-typedef CK_ATTRIBUTE CK_PTR CK_ATTRIBUTE_PTR;
-
-/* CK_DATE is a structure that defines a date */
-typedef struct CK_DATE {
-    CK_CHAR year[4];  /* the year ("1900" - "9999") */
-    CK_CHAR month[2]; /* the month ("01" - "12") */
-    CK_CHAR day[2];   /* the day   ("01" - "31") */
-} CK_DATE;
-
-/* CK_MECHANISM_TYPE is a value that identifies a mechanism
- * type */
-/* CK_MECHANISM_TYPE was changed from CK_USHORT to CK_ULONG for
- * v2.0 */
-typedef CK_ULONG CK_MECHANISM_TYPE;
-
-/* the following mechanism types are defined: */
-#define CKM_RSA_PKCS_KEY_PAIR_GEN 0x00000000
-#define CKM_RSA_PKCS 0x00000001
-#define CKM_RSA_9796 0x00000002
-#define CKM_RSA_X_509 0x00000003
-
-/* CKM_MD2_RSA_PKCS, CKM_MD5_RSA_PKCS, and CKM_SHA1_RSA_PKCS
- * are new for v2.0.  They are mechanisms which hash and sign */
-#define CKM_MD2_RSA_PKCS 0x00000004
-#define CKM_MD5_RSA_PKCS 0x00000005
-#define CKM_SHA1_RSA_PKCS 0x00000006
-
-/* CKM_RIPEMD128_RSA_PKCS, CKM_RIPEMD160_RSA_PKCS, and
- * CKM_RSA_PKCS_OAEP are new for v2.10 */
-#define CKM_RIPEMD128_RSA_PKCS 0x00000007
-#define CKM_RIPEMD160_RSA_PKCS 0x00000008
-#define CKM_RSA_PKCS_OAEP 0x00000009
-
-/* CKM_RSA_X9_31_KEY_PAIR_GEN, CKM_RSA_X9_31, CKM_SHA1_RSA_X9_31,
- * CKM_RSA_PKCS_PSS, and CKM_SHA1_RSA_PKCS_PSS are new for v2.11 */
-#define CKM_RSA_X9_31_KEY_PAIR_GEN 0x0000000A
-#define CKM_RSA_X9_31 0x0000000B
-#define CKM_SHA1_RSA_X9_31 0x0000000C
-#define CKM_RSA_PKCS_PSS 0x0000000D
-#define CKM_SHA1_RSA_PKCS_PSS 0x0000000E
-
-#define CKM_DSA_KEY_PAIR_GEN 0x00000010
-#define CKM_DSA 0x00000011
-#define CKM_DSA_SHA1 0x00000012
-#define CKM_DH_PKCS_KEY_PAIR_GEN 0x00000020
-#define CKM_DH_PKCS_DERIVE 0x00000021
-
-/* CKM_X9_42_DH_KEY_PAIR_GEN, CKM_X9_42_DH_DERIVE,
- * CKM_X9_42_DH_HYBRID_DERIVE, and CKM_X9_42_MQV_DERIVE are new for
- * v2.11 */
-#define CKM_X9_42_DH_KEY_PAIR_GEN 0x00000030
-#define CKM_X9_42_DH_DERIVE 0x00000031
-#define CKM_X9_42_DH_HYBRID_DERIVE 0x00000032
-#define CKM_X9_42_MQV_DERIVE 0x00000033
-
-/* CKM_SHA256/384/512 are new for v2.20 */
-#define CKM_SHA256_RSA_PKCS 0x00000040
-#define CKM_SHA384_RSA_PKCS 0x00000041
-#define CKM_SHA512_RSA_PKCS 0x00000042
-#define CKM_SHA256_RSA_PKCS_PSS 0x00000043
-#define CKM_SHA384_RSA_PKCS_PSS 0x00000044
-#define CKM_SHA512_RSA_PKCS_PSS 0x00000045
-
-/* CKM_SHA224 new for v2.20 amendment 3 */
-#define CKM_SHA224_RSA_PKCS 0x00000046
-#define CKM_SHA224_RSA_PKCS_PSS 0x00000047
-
-#define CKM_RC2_KEY_GEN 0x00000100
-#define CKM_RC2_ECB 0x00000101
-#define CKM_RC2_CBC 0x00000102
-#define CKM_RC2_MAC 0x00000103
-
-/* CKM_RC2_MAC_GENERAL and CKM_RC2_CBC_PAD are new for v2.0 */
-#define CKM_RC2_MAC_GENERAL 0x00000104
-#define CKM_RC2_CBC_PAD 0x00000105
-
-#define CKM_RC4_KEY_GEN 0x00000110
-#define CKM_RC4 0x00000111
-#define CKM_DES_KEY_GEN 0x00000120
-#define CKM_DES_ECB 0x00000121
-#define CKM_DES_CBC 0x00000122
-#define CKM_DES_MAC 0x00000123
-
-/* CKM_DES_MAC_GENERAL and CKM_DES_CBC_PAD are new for v2.0 */
-#define CKM_DES_MAC_GENERAL 0x00000124
-#define CKM_DES_CBC_PAD 0x00000125
-
-#define CKM_DES2_KEY_GEN 0x00000130
-#define CKM_DES3_KEY_GEN 0x00000131
-#define CKM_DES3_ECB 0x00000132
-#define CKM_DES3_CBC 0x00000133
-#define CKM_DES3_MAC 0x00000134
-
-/* CKM_DES3_MAC_GENERAL, CKM_DES3_CBC_PAD, CKM_CDMF_KEY_GEN,
- * CKM_CDMF_ECB, CKM_CDMF_CBC, CKM_CDMF_MAC,
- * CKM_CDMF_MAC_GENERAL, and CKM_CDMF_CBC_PAD are new for v2.0 */
-#define CKM_DES3_MAC_GENERAL 0x00000135
-#define CKM_DES3_CBC_PAD 0x00000136
-#define CKM_CDMF_KEY_GEN 0x00000140
-#define CKM_CDMF_ECB 0x00000141
-#define CKM_CDMF_CBC 0x00000142
-#define CKM_CDMF_MAC 0x00000143
-#define CKM_CDMF_MAC_GENERAL 0x00000144
-#define CKM_CDMF_CBC_PAD 0x00000145
-
-/* the following four DES mechanisms are new for v2.20 */
-#define CKM_DES_OFB64 0x00000150
-#define CKM_DES_OFB8 0x00000151
-#define CKM_DES_CFB64 0x00000152
-#define CKM_DES_CFB8 0x00000153
-
-#define CKM_MD2 0x00000200
-
-/* CKM_MD2_HMAC and CKM_MD2_HMAC_GENERAL are new for v2.0 */
-#define CKM_MD2_HMAC 0x00000201
-#define CKM_MD2_HMAC_GENERAL 0x00000202
-
-#define CKM_MD5 0x00000210
-
-/* CKM_MD5_HMAC and CKM_MD5_HMAC_GENERAL are new for v2.0 */
-#define CKM_MD5_HMAC 0x00000211
-#define CKM_MD5_HMAC_GENERAL 0x00000212
-
-#define CKM_SHA_1 0x00000220
-
-/* CKM_SHA_1_HMAC and CKM_SHA_1_HMAC_GENERAL are new for v2.0 */
-#define CKM_SHA_1_HMAC 0x00000221
-#define CKM_SHA_1_HMAC_GENERAL 0x00000222
-
-/* CKM_RIPEMD128, CKM_RIPEMD128_HMAC,
- * CKM_RIPEMD128_HMAC_GENERAL, CKM_RIPEMD160, CKM_RIPEMD160_HMAC,
- * and CKM_RIPEMD160_HMAC_GENERAL are new for v2.10 */
-#define CKM_RIPEMD128 0x00000230
-#define CKM_RIPEMD128_HMAC 0x00000231
-#define CKM_RIPEMD128_HMAC_GENERAL 0x00000232
-#define CKM_RIPEMD160 0x00000240
-#define CKM_RIPEMD160_HMAC 0x00000241
-#define CKM_RIPEMD160_HMAC_GENERAL 0x00000242
-
-/* CKM_SHA256/384/512 are new for v2.20 */
-#define CKM_SHA256 0x00000250
-#define CKM_SHA256_HMAC 0x00000251
-#define CKM_SHA256_HMAC_GENERAL 0x00000252
-#define CKM_SHA384 0x00000260
-#define CKM_SHA384_HMAC 0x00000261
-#define CKM_SHA384_HMAC_GENERAL 0x00000262
-#define CKM_SHA512 0x00000270
-#define CKM_SHA512_HMAC 0x00000271
-#define CKM_SHA512_HMAC_GENERAL 0x00000272
-
-/* CKM_SHA224 new for v2.20 amendment 3 */
-#define CKM_SHA224 0x00000255
-#define CKM_SHA224_HMAC 0x00000256
-#define CKM_SHA224_HMAC_GENERAL 0x00000257
-
-/* All of the following mechanisms are new for v2.0 */
-/* Note that CAST128 and CAST5 are the same algorithm */
-#define CKM_CAST_KEY_GEN 0x00000300
-#define CKM_CAST_ECB 0x00000301
-#define CKM_CAST_CBC 0x00000302
-#define CKM_CAST_MAC 0x00000303
-#define CKM_CAST_MAC_GENERAL 0x00000304
-#define CKM_CAST_CBC_PAD 0x00000305
-#define CKM_CAST3_KEY_GEN 0x00000310
-#define CKM_CAST3_ECB 0x00000311
-#define CKM_CAST3_CBC 0x00000312
-#define CKM_CAST3_MAC 0x00000313
-#define CKM_CAST3_MAC_GENERAL 0x00000314
-#define CKM_CAST3_CBC_PAD 0x00000315
-#define CKM_CAST5_KEY_GEN 0x00000320
-#define CKM_CAST128_KEY_GEN 0x00000320
-#define CKM_CAST5_ECB 0x00000321
-#define CKM_CAST128_ECB 0x00000321
-#define CKM_CAST5_CBC 0x00000322
-#define CKM_CAST128_CBC 0x00000322
-#define CKM_CAST5_MAC 0x00000323
-#define CKM_CAST128_MAC 0x00000323
-#define CKM_CAST5_MAC_GENERAL 0x00000324
-#define CKM_CAST128_MAC_GENERAL 0x00000324
-#define CKM_CAST5_CBC_PAD 0x00000325
-#define CKM_CAST128_CBC_PAD 0x00000325
-#define CKM_RC5_KEY_GEN 0x00000330
-#define CKM_RC5_ECB 0x00000331
-#define CKM_RC5_CBC 0x00000332
-#define CKM_RC5_MAC 0x00000333
-#define CKM_RC5_MAC_GENERAL 0x00000334
-#define CKM_RC5_CBC_PAD 0x00000335
-#define CKM_IDEA_KEY_GEN 0x00000340
-#define CKM_IDEA_ECB 0x00000341
-#define CKM_IDEA_CBC 0x00000342
-#define CKM_IDEA_MAC 0x00000343
-#define CKM_IDEA_MAC_GENERAL 0x00000344
-#define CKM_IDEA_CBC_PAD 0x00000345
-#define CKM_GENERIC_SECRET_KEY_GEN 0x00000350
-#define CKM_CONCATENATE_BASE_AND_KEY 0x00000360
-#define CKM_CONCATENATE_BASE_AND_DATA 0x00000362
-#define CKM_CONCATENATE_DATA_AND_BASE 0x00000363
-#define CKM_XOR_BASE_AND_DATA 0x00000364
-#define CKM_EXTRACT_KEY_FROM_KEY 0x00000365
-#define CKM_SSL3_PRE_MASTER_KEY_GEN 0x00000370
-#define CKM_SSL3_MASTER_KEY_DERIVE 0x00000371
-#define CKM_SSL3_KEY_AND_MAC_DERIVE 0x00000372
-
-/* CKM_SSL3_MASTER_KEY_DERIVE_DH, CKM_TLS_PRE_MASTER_KEY_GEN,
- * CKM_TLS_MASTER_KEY_DERIVE, CKM_TLS_KEY_AND_MAC_DERIVE, and
- * CKM_TLS_MASTER_KEY_DERIVE_DH are new for v2.11 */
-#define CKM_SSL3_MASTER_KEY_DERIVE_DH 0x00000373
-#define CKM_TLS_PRE_MASTER_KEY_GEN 0x00000374
-#define CKM_TLS_MASTER_KEY_DERIVE 0x00000375
-#define CKM_TLS_KEY_AND_MAC_DERIVE 0x00000376
-#define CKM_TLS_MASTER_KEY_DERIVE_DH 0x00000377
-
-/* CKM_TLS_PRF is new for v2.20 */
-#define CKM_TLS_PRF 0x00000378
-
-#define CKM_SSL3_MD5_MAC 0x00000380
-#define CKM_SSL3_SHA1_MAC 0x00000381
-#define CKM_MD5_KEY_DERIVATION 0x00000390
-#define CKM_MD2_KEY_DERIVATION 0x00000391
-#define CKM_SHA1_KEY_DERIVATION 0x00000392
-
-/* CKM_SHA256/384/512 are new for v2.20 */
-#define CKM_SHA256_KEY_DERIVATION 0x00000393
-#define CKM_SHA384_KEY_DERIVATION 0x00000394
-#define CKM_SHA512_KEY_DERIVATION 0x00000395
-
-/* CKM_SHA224 new for v2.20 amendment 3 */
-#define CKM_SHA224_KEY_DERIVATION 0x00000396
-
-#define CKM_PBE_MD2_DES_CBC 0x000003A0
-#define CKM_PBE_MD5_DES_CBC 0x000003A1
-#define CKM_PBE_MD5_CAST_CBC 0x000003A2
-#define CKM_PBE_MD5_CAST3_CBC 0x000003A3
-#define CKM_PBE_MD5_CAST5_CBC 0x000003A4
-#define CKM_PBE_MD5_CAST128_CBC 0x000003A4
-#define CKM_PBE_SHA1_CAST5_CBC 0x000003A5
-#define CKM_PBE_SHA1_CAST128_CBC 0x000003A5
-#define CKM_PBE_SHA1_RC4_128 0x000003A6
-#define CKM_PBE_SHA1_RC4_40 0x000003A7
-#define CKM_PBE_SHA1_DES3_EDE_CBC 0x000003A8
-#define CKM_PBE_SHA1_DES2_EDE_CBC 0x000003A9
-#define CKM_PBE_SHA1_RC2_128_CBC 0x000003AA
-#define CKM_PBE_SHA1_RC2_40_CBC 0x000003AB
-
-/* CKM_PKCS5_PBKD2 is new for v2.10 */
-#define CKM_PKCS5_PBKD2 0x000003B0
-
-#define CKM_PBA_SHA1_WITH_SHA1_HMAC 0x000003C0
-
-/* WTLS mechanisms are new for v2.20 */
-#define CKM_WTLS_PRE_MASTER_KEY_GEN 0x000003D0
-#define CKM_WTLS_MASTER_KEY_DERIVE 0x000003D1
-#define CKM_WTLS_MASTER_KEY_DERIVE_DH_ECC 0x000003D2
-#define CKM_WTLS_PRF 0x000003D3
-#define CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE 0x000003D4
-#define CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE 0x000003D5
-
-/* TLS 1.2 mechanisms are new for v2.40 */
-#define CKM_TLS12_MASTER_KEY_DERIVE 0x000003E0
-#define CKM_TLS12_KEY_AND_MAC_DERIVE 0x000003E1
-#define CKM_TLS12_MASTER_KEY_DERIVE_DH 0x000003E2
-#define CKM_TLS12_KEY_SAFE_DERIVE 0x000003E3
-#define CKM_TLS12_MAC 0x000003E4
-#define CKM_TLS_MAC 0x000003E4
-#define CKM_TLS_KDF 0x000003E5
-
-#define CKM_KEY_WRAP_LYNKS 0x00000400
-#define CKM_KEY_WRAP_SET_OAEP 0x00000401
-
-/* CKM_CMS_SIG is new for v2.20 */
-#define CKM_CMS_SIG 0x00000500
-
-/* Fortezza mechanisms */
-#define CKM_SKIPJACK_KEY_GEN 0x00001000
-#define CKM_SKIPJACK_ECB64 0x00001001
-#define CKM_SKIPJACK_CBC64 0x00001002
-#define CKM_SKIPJACK_OFB64 0x00001003
-#define CKM_SKIPJACK_CFB64 0x00001004
-#define CKM_SKIPJACK_CFB32 0x00001005
-#define CKM_SKIPJACK_CFB16 0x00001006
-#define CKM_SKIPJACK_CFB8 0x00001007
-#define CKM_SKIPJACK_WRAP 0x00001008
-#define CKM_SKIPJACK_PRIVATE_WRAP 0x00001009
-#define CKM_SKIPJACK_RELAYX 0x0000100a
-#define CKM_KEA_KEY_PAIR_GEN 0x00001010
-#define CKM_KEA_KEY_DERIVE 0x00001011
-#define CKM_FORTEZZA_TIMESTAMP 0x00001020
-#define CKM_BATON_KEY_GEN 0x00001030
-#define CKM_BATON_ECB128 0x00001031
-#define CKM_BATON_ECB96 0x00001032
-#define CKM_BATON_CBC128 0x00001033
-#define CKM_BATON_COUNTER 0x00001034
-#define CKM_BATON_SHUFFLE 0x00001035
-#define CKM_BATON_WRAP 0x00001036
-
-/* CKM_ECDSA_KEY_PAIR_GEN is deprecated in v2.11,
- * CKM_EC_KEY_PAIR_GEN is preferred */
-#define CKM_ECDSA_KEY_PAIR_GEN 0x00001040
-#define CKM_EC_KEY_PAIR_GEN 0x00001040
-
-#define CKM_ECDSA 0x00001041
-#define CKM_ECDSA_SHA1 0x00001042
-
-/* CKM_ECDH1_DERIVE, CKM_ECDH1_COFACTOR_DERIVE, and CKM_ECMQV_DERIVE
- * are new for v2.11 */
-#define CKM_ECDH1_DERIVE 0x00001050
-#define CKM_ECDH1_COFACTOR_DERIVE 0x00001051
-#define CKM_ECMQV_DERIVE 0x00001052
-
-#define CKM_JUNIPER_KEY_GEN 0x00001060
-#define CKM_JUNIPER_ECB128 0x00001061
-#define CKM_JUNIPER_CBC128 0x00001062
-#define CKM_JUNIPER_COUNTER 0x00001063
-#define CKM_JUNIPER_SHUFFLE 0x00001064
-#define CKM_JUNIPER_WRAP 0x00001065
-#define CKM_FASTHASH 0x00001070
-
-/* CKM_AES_KEY_GEN, CKM_AES_ECB, CKM_AES_CBC, CKM_AES_MAC,
- * CKM_AES_MAC_GENERAL, CKM_AES_CBC_PAD, CKM_DSA_PARAMETER_GEN,
- * CKM_DH_PKCS_PARAMETER_GEN, and CKM_X9_42_DH_PARAMETER_GEN are
- * new for v2.11 */
-#define CKM_AES_KEY_GEN 0x00001080
-#define CKM_AES_ECB 0x00001081
-#define CKM_AES_CBC 0x00001082
-#define CKM_AES_MAC 0x00001083
-#define CKM_AES_MAC_GENERAL 0x00001084
-#define CKM_AES_CBC_PAD 0x00001085
-/* new for v2.20 amendment 3 */
-#define CKM_AES_CTR 0x00001086
-/* new for v2.30 */
-#define CKM_AES_GCM 0x00001087
-#define CKM_AES_CCM 0x00001088
-#define CKM_AES_CTS 0x00001089
-
-/* BlowFish and TwoFish are new for v2.20 */
-#define CKM_BLOWFISH_KEY_GEN 0x00001090
-#define CKM_BLOWFISH_CBC 0x00001091
-#define CKM_TWOFISH_KEY_GEN 0x00001092
-#define CKM_TWOFISH_CBC 0x00001093
-
-/* Camellia is proposed for v2.20 Amendment 3 */
-#define CKM_CAMELLIA_KEY_GEN 0x00000550
-#define CKM_CAMELLIA_ECB 0x00000551
-#define CKM_CAMELLIA_CBC 0x00000552
-#define CKM_CAMELLIA_MAC 0x00000553
-#define CKM_CAMELLIA_MAC_GENERAL 0x00000554
-#define CKM_CAMELLIA_CBC_PAD 0x00000555
-#define CKM_CAMELLIA_ECB_ENCRYPT_DATA 0x00000556
-#define CKM_CAMELLIA_CBC_ENCRYPT_DATA 0x00000557
-
-#define CKM_SEED_KEY_GEN 0x00000650
-#define CKM_SEED_ECB 0x00000651
-#define CKM_SEED_CBC 0x00000652
-#define CKM_SEED_MAC 0x00000653
-#define CKM_SEED_MAC_GENERAL 0x00000654
-#define CKM_SEED_CBC_PAD 0x00000655
-#define CKM_SEED_ECB_ENCRYPT_DATA 0x00000656
-#define CKM_SEED_CBC_ENCRYPT_DATA 0x00000657
-
-/* CKM_xxx_ENCRYPT_DATA mechanisms are new for v2.20 */
-#define CKM_DES_ECB_ENCRYPT_DATA 0x00001100
-#define CKM_DES_CBC_ENCRYPT_DATA 0x00001101
-#define CKM_DES3_ECB_ENCRYPT_DATA 0x00001102
-#define CKM_DES3_CBC_ENCRYPT_DATA 0x00001103
-#define CKM_AES_ECB_ENCRYPT_DATA 0x00001104
-#define CKM_AES_CBC_ENCRYPT_DATA 0x00001105
-
-#define CKM_DSA_PARAMETER_GEN 0x00002000
-#define CKM_DH_PKCS_PARAMETER_GEN 0x00002001
-#define CKM_X9_42_DH_PARAMETER_GEN 0x00002002
-
-#define CKM_VENDOR_DEFINED 0x80000000
-
-typedef CK_MECHANISM_TYPE CK_PTR CK_MECHANISM_TYPE_PTR;
-
-/* CK_MECHANISM is a structure that specifies a particular
- * mechanism  */
-typedef struct CK_MECHANISM {
-    CK_MECHANISM_TYPE mechanism;
-    CK_VOID_PTR pParameter;
-
-    /* ulParameterLen was changed from CK_USHORT to CK_ULONG for
-     * v2.0 */
-    CK_ULONG ulParameterLen; /* in bytes */
-} CK_MECHANISM;
-
-typedef CK_MECHANISM CK_PTR CK_MECHANISM_PTR;
-
-/* CK_MECHANISM_INFO provides information about a particular
- * mechanism */
-typedef struct CK_MECHANISM_INFO {
-    CK_ULONG ulMinKeySize;
-    CK_ULONG ulMaxKeySize;
-    CK_FLAGS flags;
-} CK_MECHANISM_INFO;
-
-/* The flags are defined as follows:
- *      Bit Flag               Mask        Meaning */
-#define CKF_HW 0x00000001 /* performed by HW */
-
-/* The flags CKF_ENCRYPT, CKF_DECRYPT, CKF_DIGEST, CKF_SIGN,
- * CKG_SIGN_RECOVER, CKF_VERIFY, CKF_VERIFY_RECOVER,
- * CKF_GENERATE, CKF_GENERATE_KEY_PAIR, CKF_WRAP, CKF_UNWRAP,
- * and CKF_DERIVE are new for v2.0.  They specify whether or not
- * a mechanism can be used for a particular task */
-#define CKF_ENCRYPT 0x00000100
-#define CKF_DECRYPT 0x00000200
-#define CKF_DIGEST 0x00000400
-#define CKF_SIGN 0x00000800
-#define CKF_SIGN_RECOVER 0x00001000
-#define CKF_VERIFY 0x00002000
-#define CKF_VERIFY_RECOVER 0x00004000
-#define CKF_GENERATE 0x00008000
-#define CKF_GENERATE_KEY_PAIR 0x00010000
-#define CKF_WRAP 0x00020000
-#define CKF_UNWRAP 0x00040000
-#define CKF_DERIVE 0x00080000
-
-/* CKF_EC_F_P, CKF_EC_F_2M, CKF_EC_ECPARAMETERS, CKF_EC_NAMEDCURVE,
- * CKF_EC_UNCOMPRESS, and CKF_EC_COMPRESS are new for v2.11. They
- * describe a token's EC capabilities not available in mechanism
- * information. */
-#define CKF_EC_F_P 0x00100000
-#define CKF_EC_F_2M 0x00200000
-#define CKF_EC_ECPARAMETERS 0x00400000
-#define CKF_EC_NAMEDCURVE 0x00800000
-#define CKF_EC_UNCOMPRESS 0x01000000
-#define CKF_EC_COMPRESS 0x02000000
-
-#define CKF_EXTENSION 0x80000000 /* FALSE for this version */
-
-typedef CK_MECHANISM_INFO CK_PTR CK_MECHANISM_INFO_PTR;
-
-/* CK_RV is a value that identifies the return value of a
- * PKCS #11 function */
-/* CK_RV was changed from CK_USHORT to CK_ULONG for v2.0 */
-typedef CK_ULONG CK_RV;
-
-#define CKR_OK 0x00000000
-#define CKR_CANCEL 0x00000001
-#define CKR_HOST_MEMORY 0x00000002
-#define CKR_SLOT_ID_INVALID 0x00000003
-
-/* CKR_FLAGS_INVALID was removed for v2.0 */
-
-/* CKR_GENERAL_ERROR and CKR_FUNCTION_FAILED are new for v2.0 */
-#define CKR_GENERAL_ERROR 0x00000005
-#define CKR_FUNCTION_FAILED 0x00000006
-
-/* CKR_ARGUMENTS_BAD, CKR_NO_EVENT, CKR_NEED_TO_CREATE_THREADS,
- * and CKR_CANT_LOCK are new for v2.01 */
-#define CKR_ARGUMENTS_BAD 0x00000007
-#define CKR_NO_EVENT 0x00000008
-#define CKR_NEED_TO_CREATE_THREADS 0x00000009
-#define CKR_CANT_LOCK 0x0000000A
-
-#define CKR_ATTRIBUTE_READ_ONLY 0x00000010
-#define CKR_ATTRIBUTE_SENSITIVE 0x00000011
-#define CKR_ATTRIBUTE_TYPE_INVALID 0x00000012
-#define CKR_ATTRIBUTE_VALUE_INVALID 0x00000013
-#define CKR_DATA_INVALID 0x00000020
-#define CKR_DATA_LEN_RANGE 0x00000021
-#define CKR_DEVICE_ERROR 0x00000030
-#define CKR_DEVICE_MEMORY 0x00000031
-#define CKR_DEVICE_REMOVED 0x00000032
-#define CKR_ENCRYPTED_DATA_INVALID 0x00000040
-#define CKR_ENCRYPTED_DATA_LEN_RANGE 0x00000041
-#define CKR_FUNCTION_CANCELED 0x00000050
-#define CKR_FUNCTION_NOT_PARALLEL 0x00000051
-
-/* CKR_FUNCTION_NOT_SUPPORTED is new for v2.0 */
-#define CKR_FUNCTION_NOT_SUPPORTED 0x00000054
-
-#define CKR_KEY_HANDLE_INVALID 0x00000060
-
-/* CKR_KEY_SENSITIVE was removed for v2.0 */
-
-#define CKR_KEY_SIZE_RANGE 0x00000062
-#define CKR_KEY_TYPE_INCONSISTENT 0x00000063
-
-/* CKR_KEY_NOT_NEEDED, CKR_KEY_CHANGED, CKR_KEY_NEEDED,
- * CKR_KEY_INDIGESTIBLE, CKR_KEY_FUNCTION_NOT_PERMITTED,
- * CKR_KEY_NOT_WRAPPABLE, and CKR_KEY_UNEXTRACTABLE are new for
- * v2.0 */
-#define CKR_KEY_NOT_NEEDED 0x00000064
-#define CKR_KEY_CHANGED 0x00000065
-#define CKR_KEY_NEEDED 0x00000066
-#define CKR_KEY_INDIGESTIBLE 0x00000067
-#define CKR_KEY_FUNCTION_NOT_PERMITTED 0x00000068
-#define CKR_KEY_NOT_WRAPPABLE 0x00000069
-#define CKR_KEY_UNEXTRACTABLE 0x0000006A
-
-#define CKR_MECHANISM_INVALID 0x00000070
-#define CKR_MECHANISM_PARAM_INVALID 0x00000071
-
-/* CKR_OBJECT_CLASS_INCONSISTENT and CKR_OBJECT_CLASS_INVALID
- * were removed for v2.0 */
-#define CKR_OBJECT_HANDLE_INVALID 0x00000082
-#define CKR_OPERATION_ACTIVE 0x00000090
-#define CKR_OPERATION_NOT_INITIALIZED 0x00000091
-#define CKR_PIN_INCORRECT 0x000000A0
-#define CKR_PIN_INVALID 0x000000A1
-#define CKR_PIN_LEN_RANGE 0x000000A2
-
-/* CKR_PIN_EXPIRED and CKR_PIN_LOCKED are new for v2.0 */
-#define CKR_PIN_EXPIRED 0x000000A3
-#define CKR_PIN_LOCKED 0x000000A4
-
-#define CKR_SESSION_CLOSED 0x000000B0
-#define CKR_SESSION_COUNT 0x000000B1
-#define CKR_SESSION_HANDLE_INVALID 0x000000B3
-#define CKR_SESSION_PARALLEL_NOT_SUPPORTED 0x000000B4
-#define CKR_SESSION_READ_ONLY 0x000000B5
-#define CKR_SESSION_EXISTS 0x000000B6
-
-/* CKR_SESSION_READ_ONLY_EXISTS and
- * CKR_SESSION_READ_WRITE_SO_EXISTS are new for v2.0 */
-#define CKR_SESSION_READ_ONLY_EXISTS 0x000000B7
-#define CKR_SESSION_READ_WRITE_SO_EXISTS 0x000000B8
-
-#define CKR_SIGNATURE_INVALID 0x000000C0
-#define CKR_SIGNATURE_LEN_RANGE 0x000000C1
-#define CKR_TEMPLATE_INCOMPLETE 0x000000D0
-#define CKR_TEMPLATE_INCONSISTENT 0x000000D1
-#define CKR_TOKEN_NOT_PRESENT 0x000000E0
-#define CKR_TOKEN_NOT_RECOGNIZED 0x000000E1
-#define CKR_TOKEN_WRITE_PROTECTED 0x000000E2
-#define CKR_UNWRAPPING_KEY_HANDLE_INVALID 0x000000F0
-#define CKR_UNWRAPPING_KEY_SIZE_RANGE 0x000000F1
-#define CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT 0x000000F2
-#define CKR_USER_ALREADY_LOGGED_IN 0x00000100
-#define CKR_USER_NOT_LOGGED_IN 0x00000101
-#define CKR_USER_PIN_NOT_INITIALIZED 0x00000102
-#define CKR_USER_TYPE_INVALID 0x00000103
-
-/* CKR_USER_ANOTHER_ALREADY_LOGGED_IN and CKR_USER_TOO_MANY_TYPES
- * are new to v2.01 */
-#define CKR_USER_ANOTHER_ALREADY_LOGGED_IN 0x00000104
-#define CKR_USER_TOO_MANY_TYPES 0x00000105
-
-#define CKR_WRAPPED_KEY_INVALID 0x00000110
-#define CKR_WRAPPED_KEY_LEN_RANGE 0x00000112
-#define CKR_WRAPPING_KEY_HANDLE_INVALID 0x00000113
-#define CKR_WRAPPING_KEY_SIZE_RANGE 0x00000114
-#define CKR_WRAPPING_KEY_TYPE_INCONSISTENT 0x00000115
-#define CKR_RANDOM_SEED_NOT_SUPPORTED 0x00000120
-
-/* These are new to v2.0 */
-#define CKR_RANDOM_NO_RNG 0x00000121
-
-/* These are new to v2.11 */
-#define CKR_DOMAIN_PARAMS_INVALID 0x00000130
-
-/* These are new to v2.0 */
-#define CKR_BUFFER_TOO_SMALL 0x00000150
-#define CKR_SAVED_STATE_INVALID 0x00000160
-#define CKR_INFORMATION_SENSITIVE 0x00000170
-#define CKR_STATE_UNSAVEABLE 0x00000180
-
-/* These are new to v2.01 */
-#define CKR_CRYPTOKI_NOT_INITIALIZED 0x00000190
-#define CKR_CRYPTOKI_ALREADY_INITIALIZED 0x00000191
-#define CKR_MUTEX_BAD 0x000001A0
-#define CKR_MUTEX_NOT_LOCKED 0x000001A1
-
-/* This is new to v2.20 */
-#define CKR_FUNCTION_REJECTED 0x00000200
-
-#define CKR_VENDOR_DEFINED 0x80000000
-
-/* CK_NOTIFY is an application callback that processes events */
-typedef CK_CALLBACK_FUNCTION(CK_RV, CK_NOTIFY)(
-    CK_SESSION_HANDLE hSession, /* the session's handle */
-    CK_NOTIFICATION event,
-    CK_VOID_PTR pApplication /* passed to C_OpenSession */
-    );
-
-/* CK_FUNCTION_LIST is a structure holding a PKCS #11 spec
- * version and pointers of appropriate types to all the
- * PKCS #11 functions */
-/* CK_FUNCTION_LIST is new for v2.0 */
-typedef struct CK_FUNCTION_LIST CK_FUNCTION_LIST;
-
-typedef CK_FUNCTION_LIST CK_PTR CK_FUNCTION_LIST_PTR;
-
-typedef CK_FUNCTION_LIST_PTR CK_PTR CK_FUNCTION_LIST_PTR_PTR;
-
-/* CK_CREATEMUTEX is an application callback for creating a
- * mutex object */
-typedef CK_CALLBACK_FUNCTION(CK_RV, CK_CREATEMUTEX)(
-    CK_VOID_PTR_PTR ppMutex /* location to receive ptr to mutex */
-    );
-
-/* CK_DESTROYMUTEX is an application callback for destroying a
- * mutex object */
-typedef CK_CALLBACK_FUNCTION(CK_RV, CK_DESTROYMUTEX)(
-    CK_VOID_PTR pMutex /* pointer to mutex */
-    );
-
-/* CK_LOCKMUTEX is an application callback for locking a mutex */
-typedef CK_CALLBACK_FUNCTION(CK_RV, CK_LOCKMUTEX)(
-    CK_VOID_PTR pMutex /* pointer to mutex */
-    );
-
-/* CK_UNLOCKMUTEX is an application callback for unlocking a
- * mutex */
-typedef CK_CALLBACK_FUNCTION(CK_RV, CK_UNLOCKMUTEX)(
-    CK_VOID_PTR pMutex /* pointer to mutex */
-    );
-
-/* CK_C_INITIALIZE_ARGS provides the optional arguments to
- * C_Initialize */
-typedef struct CK_C_INITIALIZE_ARGS {
-    CK_CREATEMUTEX CreateMutex;
-    CK_DESTROYMUTEX DestroyMutex;
-    CK_LOCKMUTEX LockMutex;
-    CK_UNLOCKMUTEX UnlockMutex;
-    CK_FLAGS flags;
-    /* The official PKCS #11 spec does not have a 'LibraryParameters' field, but
-     * a reserved field. NSS needs a way to pass instance-specific information
-     * to the library (like where to find its config files, etc). This
-     * information is usually provided by the installer and passed uninterpreted
-     * by NSS to the library, though NSS does know the specifics of the softoken
-     * version of this parameter. Most compliant PKCS#11 modules expect this
-     * parameter to be NULL, and will return CKR_ARGUMENTS_BAD from
-     * C_Initialize if Library parameters is supplied. */
-    CK_CHAR_PTR *LibraryParameters;
-    /* This field is only present if the LibraryParameters is not NULL. It must
-     * be NULL in all cases */
-    CK_VOID_PTR pReserved;
-} CK_C_INITIALIZE_ARGS;
-
-/* flags: bit flags that provide capabilities of the slot
- *      Bit Flag                           Mask       Meaning
- */
-#define CKF_LIBRARY_CANT_CREATE_OS_THREADS 0x00000001
-#define CKF_OS_LOCKING_OK 0x00000002
-
-typedef CK_C_INITIALIZE_ARGS CK_PTR CK_C_INITIALIZE_ARGS_PTR;
-
-/* additional flags for parameters to functions */
-
-/* CKF_DONT_BLOCK is for the function C_WaitForSlotEvent */
-#define CKF_DONT_BLOCK 1
-
-/* CK_RSA_PKCS_OAEP_MGF_TYPE is new for v2.10.
- * CK_RSA_PKCS_OAEP_MGF_TYPE  is used to indicate the Message
- * Generation Function (MGF) applied to a message block when
- * formatting a message block for the PKCS #1 OAEP encryption
- * scheme. */
-typedef CK_ULONG CK_RSA_PKCS_MGF_TYPE;
-
-typedef CK_RSA_PKCS_MGF_TYPE CK_PTR CK_RSA_PKCS_MGF_TYPE_PTR;
-
-/* The following MGFs are defined */
-/* CKG_MGF1_SHA256, CKG_MGF1_SHA384, and CKG_MGF1_SHA512
- * are new for v2.20 */
-#define CKG_MGF1_SHA1 0x00000001
-#define CKG_MGF1_SHA256 0x00000002
-#define CKG_MGF1_SHA384 0x00000003
-#define CKG_MGF1_SHA512 0x00000004
-
-/* v2.20 amendment 3 */
-#define CKG_MGF1_SHA224 0x00000005
-
-/* CK_RSA_PKCS_OAEP_SOURCE_TYPE is new for v2.10.
- * CK_RSA_PKCS_OAEP_SOURCE_TYPE  is used to indicate the source
- * of the encoding parameter when formatting a message block
- * for the PKCS #1 OAEP encryption scheme. */
-typedef CK_ULONG CK_RSA_PKCS_OAEP_SOURCE_TYPE;
-
-typedef CK_RSA_PKCS_OAEP_SOURCE_TYPE CK_PTR CK_RSA_PKCS_OAEP_SOURCE_TYPE_PTR;
-
-/* The following encoding parameter sources are defined */
-#define CKZ_DATA_SPECIFIED 0x00000001
-
-/* CK_RSA_PKCS_OAEP_PARAMS is new for v2.10.
- * CK_RSA_PKCS_OAEP_PARAMS provides the parameters to the
- * CKM_RSA_PKCS_OAEP mechanism. */
-typedef struct CK_RSA_PKCS_OAEP_PARAMS {
-    CK_MECHANISM_TYPE hashAlg;
-    CK_RSA_PKCS_MGF_TYPE mgf;
-    CK_RSA_PKCS_OAEP_SOURCE_TYPE source;
-    CK_VOID_PTR pSourceData;
-    CK_ULONG ulSourceDataLen;
-} CK_RSA_PKCS_OAEP_PARAMS;
-
-typedef CK_RSA_PKCS_OAEP_PARAMS CK_PTR CK_RSA_PKCS_OAEP_PARAMS_PTR;
-
-/* CK_RSA_PKCS_PSS_PARAMS is new for v2.11.
- * CK_RSA_PKCS_PSS_PARAMS provides the parameters to the
- * CKM_RSA_PKCS_PSS mechanism(s). */
-typedef struct CK_RSA_PKCS_PSS_PARAMS {
-    CK_MECHANISM_TYPE hashAlg;
-    CK_RSA_PKCS_MGF_TYPE mgf;
-    CK_ULONG sLen;
-} CK_RSA_PKCS_PSS_PARAMS;
-
-typedef CK_RSA_PKCS_PSS_PARAMS CK_PTR CK_RSA_PKCS_PSS_PARAMS_PTR;
-
-/* CK_EC_KDF_TYPE is new for v2.11. */
-typedef CK_ULONG CK_EC_KDF_TYPE;
-
-/* The following EC Key Derivation Functions are defined */
-#define CKD_NULL 0x00000001
-#define CKD_SHA1_KDF 0x00000002
-#define CKD_SHA224_KDF 0x00000005
-#define CKD_SHA256_KDF 0x00000006
-#define CKD_SHA384_KDF 0x00000007
-#define CKD_SHA512_KDF 0x00000008
-
-/* CK_ECDH1_DERIVE_PARAMS is new for v2.11.
- * CK_ECDH1_DERIVE_PARAMS provides the parameters to the
- * CKM_ECDH1_DERIVE and CKM_ECDH1_COFACTOR_DERIVE mechanisms,
- * where each party contributes one key pair.
- */
-typedef struct CK_ECDH1_DERIVE_PARAMS {
-    CK_EC_KDF_TYPE kdf;
-    CK_ULONG ulSharedDataLen;
-    CK_BYTE_PTR pSharedData;
-    CK_ULONG ulPublicDataLen;
-    CK_BYTE_PTR pPublicData;
-} CK_ECDH1_DERIVE_PARAMS;
-
-typedef CK_ECDH1_DERIVE_PARAMS CK_PTR CK_ECDH1_DERIVE_PARAMS_PTR;
-
-/* CK_ECDH2_DERIVE_PARAMS is new for v2.11.
- * CK_ECDH2_DERIVE_PARAMS provides the parameters to the
- * CKM_ECMQV_DERIVE mechanism, where each party contributes two key pairs. */
-typedef struct CK_ECDH2_DERIVE_PARAMS {
-    CK_EC_KDF_TYPE kdf;
-    CK_ULONG ulSharedDataLen;
-    CK_BYTE_PTR pSharedData;
-    CK_ULONG ulPublicDataLen;
-    CK_BYTE_PTR pPublicData;
-    CK_ULONG ulPrivateDataLen;
-    CK_OBJECT_HANDLE hPrivateData;
-    CK_ULONG ulPublicDataLen2;
-    CK_BYTE_PTR pPublicData2;
-} CK_ECDH2_DERIVE_PARAMS;
-
-typedef CK_ECDH2_DERIVE_PARAMS CK_PTR CK_ECDH2_DERIVE_PARAMS_PTR;
-
-typedef struct CK_ECMQV_DERIVE_PARAMS {
-    CK_EC_KDF_TYPE kdf;
-    CK_ULONG ulSharedDataLen;
-    CK_BYTE_PTR pSharedData;
-    CK_ULONG ulPublicDataLen;
-    CK_BYTE_PTR pPublicData;
-    CK_ULONG ulPrivateDataLen;
-    CK_OBJECT_HANDLE hPrivateData;
-    CK_ULONG ulPublicDataLen2;
-    CK_BYTE_PTR pPublicData2;
-    CK_OBJECT_HANDLE publicKey;
-} CK_ECMQV_DERIVE_PARAMS;
-
-typedef CK_ECMQV_DERIVE_PARAMS CK_PTR CK_ECMQV_DERIVE_PARAMS_PTR;
-
-/* Typedefs and defines for the CKM_X9_42_DH_KEY_PAIR_GEN and the
- * CKM_X9_42_DH_PARAMETER_GEN mechanisms (new for PKCS #11 v2.11) */
-typedef CK_ULONG CK_X9_42_DH_KDF_TYPE;
-typedef CK_X9_42_DH_KDF_TYPE CK_PTR CK_X9_42_DH_KDF_TYPE_PTR;
-
-/* The following X9.42 DH key derivation functions are defined
-   (besides CKD_NULL already defined : */
-#define CKD_SHA1_KDF_ASN1 0x00000003
-#define CKD_SHA1_KDF_CONCATENATE 0x00000004
-
-/* CK_X9_42_DH1_DERIVE_PARAMS is new for v2.11.
- * CK_X9_42_DH1_DERIVE_PARAMS provides the parameters to the
- * CKM_X9_42_DH_DERIVE key derivation mechanism, where each party
- * contributes one key pair */
-typedef struct CK_X9_42_DH1_DERIVE_PARAMS {
-    CK_X9_42_DH_KDF_TYPE kdf;
-    CK_ULONG ulOtherInfoLen;
-    CK_BYTE_PTR pOtherInfo;
-    CK_ULONG ulPublicDataLen;
-    CK_BYTE_PTR pPublicData;
-} CK_X9_42_DH1_DERIVE_PARAMS;
-
-typedef struct CK_X9_42_DH1_DERIVE_PARAMS CK_PTR CK_X9_42_DH1_DERIVE_PARAMS_PTR;
-
-/* CK_X9_42_DH2_DERIVE_PARAMS is new for v2.11.
- * CK_X9_42_DH2_DERIVE_PARAMS provides the parameters to the
- * CKM_X9_42_DH_HYBRID_DERIVE and CKM_X9_42_MQV_DERIVE key derivation
- * mechanisms, where each party contributes two key pairs */
-typedef struct CK_X9_42_DH2_DERIVE_PARAMS {
-    CK_X9_42_DH_KDF_TYPE kdf;
-    CK_ULONG ulOtherInfoLen;
-    CK_BYTE_PTR pOtherInfo;
-    CK_ULONG ulPublicDataLen;
-    CK_BYTE_PTR pPublicData;
-    CK_ULONG ulPrivateDataLen;
-    CK_OBJECT_HANDLE hPrivateData;
-    CK_ULONG ulPublicDataLen2;
-    CK_BYTE_PTR pPublicData2;
-} CK_X9_42_DH2_DERIVE_PARAMS;
-
-typedef CK_X9_42_DH2_DERIVE_PARAMS CK_PTR CK_X9_42_DH2_DERIVE_PARAMS_PTR;
-
-typedef struct CK_X9_42_MQV_DERIVE_PARAMS {
-    CK_X9_42_DH_KDF_TYPE kdf;
-    CK_ULONG ulOtherInfoLen;
-    CK_BYTE_PTR pOtherInfo;
-    CK_ULONG ulPublicDataLen;
-    CK_BYTE_PTR pPublicData;
-    CK_ULONG ulPrivateDataLen;
-    CK_OBJECT_HANDLE hPrivateData;
-    CK_ULONG ulPublicDataLen2;
-    CK_BYTE_PTR pPublicData2;
-    CK_OBJECT_HANDLE publicKey;
-} CK_X9_42_MQV_DERIVE_PARAMS;
-
-typedef CK_X9_42_MQV_DERIVE_PARAMS CK_PTR CK_X9_42_MQV_DERIVE_PARAMS_PTR;
-
-/* CK_KEA_DERIVE_PARAMS provides the parameters to the
- * CKM_KEA_DERIVE mechanism */
-/* CK_KEA_DERIVE_PARAMS is new for v2.0 */
-typedef struct CK_KEA_DERIVE_PARAMS {
-    CK_BBOOL isSender;
-    CK_ULONG ulRandomLen;
-    CK_BYTE_PTR pRandomA;
-    CK_BYTE_PTR pRandomB;
-    CK_ULONG ulPublicDataLen;
-    CK_BYTE_PTR pPublicData;
-} CK_KEA_DERIVE_PARAMS;
-
-typedef CK_KEA_DERIVE_PARAMS CK_PTR CK_KEA_DERIVE_PARAMS_PTR;
-
-/* CK_RC2_PARAMS provides the parameters to the CKM_RC2_ECB and
- * CKM_RC2_MAC mechanisms.  An instance of CK_RC2_PARAMS just
- * holds the effective keysize */
-typedef CK_ULONG CK_RC2_PARAMS;
-
-typedef CK_RC2_PARAMS CK_PTR CK_RC2_PARAMS_PTR;
-
-/* CK_RC2_CBC_PARAMS provides the parameters to the CKM_RC2_CBC
- * mechanism */
-typedef struct CK_RC2_CBC_PARAMS {
-    /* ulEffectiveBits was changed from CK_USHORT to CK_ULONG for
-   * v2.0 */
-    CK_ULONG ulEffectiveBits; /* effective bits (1-1024) */
-
-    CK_BYTE iv[8]; /* IV for CBC mode */
-} CK_RC2_CBC_PARAMS;
-
-typedef CK_RC2_CBC_PARAMS CK_PTR CK_RC2_CBC_PARAMS_PTR;
-
-/* CK_RC2_MAC_GENERAL_PARAMS provides the parameters for the
- * CKM_RC2_MAC_GENERAL mechanism */
-/* CK_RC2_MAC_GENERAL_PARAMS is new for v2.0 */
-typedef struct CK_RC2_MAC_GENERAL_PARAMS {
-    CK_ULONG ulEffectiveBits; /* effective bits (1-1024) */
-    CK_ULONG ulMacLength;     /* Length of MAC in bytes */
-} CK_RC2_MAC_GENERAL_PARAMS;
-
-typedef CK_RC2_MAC_GENERAL_PARAMS CK_PTR
-    CK_RC2_MAC_GENERAL_PARAMS_PTR;
-
-/* CK_RC5_PARAMS provides the parameters to the CKM_RC5_ECB and
- * CKM_RC5_MAC mechanisms */
-/* CK_RC5_PARAMS is new for v2.0 */
-typedef struct CK_RC5_PARAMS {
-    CK_ULONG ulWordsize; /* wordsize in bits */
-    CK_ULONG ulRounds;   /* number of rounds */
-} CK_RC5_PARAMS;
-
-typedef CK_RC5_PARAMS CK_PTR CK_RC5_PARAMS_PTR;
-
-/* CK_RC5_CBC_PARAMS provides the parameters to the CKM_RC5_CBC
- * mechanism */
-/* CK_RC5_CBC_PARAMS is new for v2.0 */
-typedef struct CK_RC5_CBC_PARAMS {
-    CK_ULONG ulWordsize; /* wordsize in bits */
-    CK_ULONG ulRounds;   /* number of rounds */
-    CK_BYTE_PTR pIv;     /* pointer to IV */
-    CK_ULONG ulIvLen;    /* length of IV in bytes */
-} CK_RC5_CBC_PARAMS;
-
-typedef CK_RC5_CBC_PARAMS CK_PTR CK_RC5_CBC_PARAMS_PTR;
-
-/* CK_RC5_MAC_GENERAL_PARAMS provides the parameters for the
- * CKM_RC5_MAC_GENERAL mechanism */
-/* CK_RC5_MAC_GENERAL_PARAMS is new for v2.0 */
-typedef struct CK_RC5_MAC_GENERAL_PARAMS {
-    CK_ULONG ulWordsize;  /* wordsize in bits */
-    CK_ULONG ulRounds;    /* number of rounds */
-    CK_ULONG ulMacLength; /* Length of MAC in bytes */
-} CK_RC5_MAC_GENERAL_PARAMS;
-
-typedef CK_RC5_MAC_GENERAL_PARAMS CK_PTR
-    CK_RC5_MAC_GENERAL_PARAMS_PTR;
-
-/* CK_MAC_GENERAL_PARAMS provides the parameters to most block
- * ciphers' MAC_GENERAL mechanisms.  Its value is the length of
- * the MAC */
-/* CK_MAC_GENERAL_PARAMS is new for v2.0 */
-typedef CK_ULONG CK_MAC_GENERAL_PARAMS;
-
-typedef CK_MAC_GENERAL_PARAMS CK_PTR CK_MAC_GENERAL_PARAMS_PTR;
-
-/* CK_DES/AES_ECB/CBC_ENCRYPT_DATA_PARAMS are new for v2.20 */
-typedef struct CK_DES_CBC_ENCRYPT_DATA_PARAMS {
-    CK_BYTE iv[8];
-    CK_BYTE_PTR pData;
-    CK_ULONG length;
-} CK_DES_CBC_ENCRYPT_DATA_PARAMS;
-
-typedef CK_DES_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_DES_CBC_ENCRYPT_DATA_PARAMS_PTR;
-
-typedef struct CK_AES_CBC_ENCRYPT_DATA_PARAMS {
-    CK_BYTE iv[16];
-    CK_BYTE_PTR pData;
-    CK_ULONG length;
-} CK_AES_CBC_ENCRYPT_DATA_PARAMS;
-
-typedef CK_AES_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_AES_CBC_ENCRYPT_DATA_PARAMS_PTR;
-
-/* CK_AES_CTR_PARAMS is new for PKCS #11 v2.20 amendment 3 */
-typedef struct CK_AES_CTR_PARAMS {
-    CK_ULONG ulCounterBits;
-    CK_BYTE cb[16];
-} CK_AES_CTR_PARAMS;
-
-typedef CK_AES_CTR_PARAMS CK_PTR CK_AES_CTR_PARAMS_PTR;
-
-/* CK_GCM_PARAMS is new for version 2.30 */
-typedef struct CK_GCM_PARAMS {
-    CK_BYTE_PTR pIv;
-    CK_ULONG ulIvLen;
-    CK_BYTE_PTR pAAD;
-    CK_ULONG ulAADLen;
-    CK_ULONG ulTagBits;
-} CK_GCM_PARAMS;
-
-typedef CK_GCM_PARAMS CK_PTR CK_GCM_PARAMS_PTR;
-
-/* CK_CCM_PARAMS is new for version 2.30 */
-typedef struct CK_CCM_PARAMS {
-    CK_ULONG ulDataLen;
-    CK_BYTE_PTR pNonce;
-    CK_ULONG ulNonceLen;
-    CK_BYTE_PTR pAAD;
-    CK_ULONG ulAADLen;
-    CK_ULONG ulMACLen;
-} CK_CCM_PARAMS;
-
-typedef CK_CCM_PARAMS CK_PTR CK_CCM_PARAMS_PTR;
-
-/* CK_SKIPJACK_PRIVATE_WRAP_PARAMS provides the parameters to the
- * CKM_SKIPJACK_PRIVATE_WRAP mechanism */
-/* CK_SKIPJACK_PRIVATE_WRAP_PARAMS is new for v2.0 */
-typedef struct CK_SKIPJACK_PRIVATE_WRAP_PARAMS {
-    CK_ULONG ulPasswordLen;
-    CK_BYTE_PTR pPassword;
-    CK_ULONG ulPublicDataLen;
-    CK_BYTE_PTR pPublicData;
-    CK_ULONG ulPAndGLen;
-    CK_ULONG ulQLen;
-    CK_ULONG ulRandomLen;
-    CK_BYTE_PTR pRandomA;
-    CK_BYTE_PTR pPrimeP;
-    CK_BYTE_PTR pBaseG;
-    CK_BYTE_PTR pSubprimeQ;
-} CK_SKIPJACK_PRIVATE_WRAP_PARAMS;
-
-typedef CK_SKIPJACK_PRIVATE_WRAP_PARAMS CK_PTR
-    CK_SKIPJACK_PRIVATE_WRAP_PTR;
-
-/* CK_SKIPJACK_RELAYX_PARAMS provides the parameters to the
- * CKM_SKIPJACK_RELAYX mechanism */
-/* CK_SKIPJACK_RELAYX_PARAMS is new for v2.0 */
-typedef struct CK_SKIPJACK_RELAYX_PARAMS {
-    CK_ULONG ulOldWrappedXLen;
-    CK_BYTE_PTR pOldWrappedX;
-    CK_ULONG ulOldPasswordLen;
-    CK_BYTE_PTR pOldPassword;
-    CK_ULONG ulOldPublicDataLen;
-    CK_BYTE_PTR pOldPublicData;
-    CK_ULONG ulOldRandomLen;
-    CK_BYTE_PTR pOldRandomA;
-    CK_ULONG ulNewPasswordLen;
-    CK_BYTE_PTR pNewPassword;
-    CK_ULONG ulNewPublicDataLen;
-    CK_BYTE_PTR pNewPublicData;
-    CK_ULONG ulNewRandomLen;
-    CK_BYTE_PTR pNewRandomA;
-} CK_SKIPJACK_RELAYX_PARAMS;
-
-typedef CK_SKIPJACK_RELAYX_PARAMS CK_PTR
-    CK_SKIPJACK_RELAYX_PARAMS_PTR;
-
-typedef struct CK_PBE_PARAMS {
-    CK_BYTE_PTR pInitVector;
-    CK_UTF8CHAR_PTR pPassword;
-    CK_ULONG ulPasswordLen;
-    CK_BYTE_PTR pSalt;
-    CK_ULONG ulSaltLen;
-    CK_ULONG ulIteration;
-} CK_PBE_PARAMS;
-
-typedef CK_PBE_PARAMS CK_PTR CK_PBE_PARAMS_PTR;
-
-/* CK_KEY_WRAP_SET_OAEP_PARAMS provides the parameters to the
- * CKM_KEY_WRAP_SET_OAEP mechanism */
-/* CK_KEY_WRAP_SET_OAEP_PARAMS is new for v2.0 */
-typedef struct CK_KEY_WRAP_SET_OAEP_PARAMS {
-    CK_BYTE bBC;     /* block contents byte */
-    CK_BYTE_PTR pX;  /* extra data */
-    CK_ULONG ulXLen; /* length of extra data in bytes */
-} CK_KEY_WRAP_SET_OAEP_PARAMS;
-
-typedef CK_KEY_WRAP_SET_OAEP_PARAMS CK_PTR
-    CK_KEY_WRAP_SET_OAEP_PARAMS_PTR;
-
-typedef struct CK_SSL3_RANDOM_DATA {
-    CK_BYTE_PTR pClientRandom;
-    CK_ULONG ulClientRandomLen;
-    CK_BYTE_PTR pServerRandom;
-    CK_ULONG ulServerRandomLen;
-} CK_SSL3_RANDOM_DATA;
-
-typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS {
-    CK_SSL3_RANDOM_DATA RandomInfo;
-    CK_VERSION_PTR pVersion;
-} CK_SSL3_MASTER_KEY_DERIVE_PARAMS;
-
-typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS CK_PTR
-    CK_SSL3_MASTER_KEY_DERIVE_PARAMS_PTR;
-
-typedef struct CK_SSL3_KEY_MAT_OUT {
-    CK_OBJECT_HANDLE hClientMacSecret;
-    CK_OBJECT_HANDLE hServerMacSecret;
-    CK_OBJECT_HANDLE hClientKey;
-    CK_OBJECT_HANDLE hServerKey;
-    CK_BYTE_PTR pIVClient;
-    CK_BYTE_PTR pIVServer;
-} CK_SSL3_KEY_MAT_OUT;
-
-typedef CK_SSL3_KEY_MAT_OUT CK_PTR CK_SSL3_KEY_MAT_OUT_PTR;
-
-typedef struct CK_SSL3_KEY_MAT_PARAMS {
-    CK_ULONG ulMacSizeInBits;
-    CK_ULONG ulKeySizeInBits;
-    CK_ULONG ulIVSizeInBits;
-    CK_BBOOL bIsExport; /* Unused. Must be set to CK_FALSE. */
-    CK_SSL3_RANDOM_DATA RandomInfo;
-    CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
-} CK_SSL3_KEY_MAT_PARAMS;
-
-typedef CK_SSL3_KEY_MAT_PARAMS CK_PTR CK_SSL3_KEY_MAT_PARAMS_PTR;
-
-/* CK_TLS_PRF_PARAMS is new for version 2.20 */
-typedef struct CK_TLS_PRF_PARAMS {
-    CK_BYTE_PTR pSeed;
-    CK_ULONG ulSeedLen;
-    CK_BYTE_PTR pLabel;
-    CK_ULONG ulLabelLen;
-    CK_BYTE_PTR pOutput;
-    CK_ULONG_PTR pulOutputLen;
-} CK_TLS_PRF_PARAMS;
-
-typedef CK_TLS_PRF_PARAMS CK_PTR CK_TLS_PRF_PARAMS_PTR;
-
-/* TLS 1.2 is new for version 2.40 */
-typedef struct CK_TLS12_MASTER_KEY_DERIVE_PARAMS {
-    CK_SSL3_RANDOM_DATA RandomInfo;
-    CK_VERSION_PTR pVersion;
-    CK_MECHANISM_TYPE prfHashMechanism;
-} CK_TLS12_MASTER_KEY_DERIVE_PARAMS;
-
-typedef CK_TLS12_MASTER_KEY_DERIVE_PARAMS CK_PTR
-    CK_TLS12_MASTER_KEY_DERIVE_PARAMS_PTR;
-
-typedef struct CK_TLS12_KEY_MAT_PARAMS {
-    CK_ULONG ulMacSizeInBits;
-    CK_ULONG ulKeySizeInBits;
-    CK_ULONG ulIVSizeInBits;
-    CK_BBOOL bIsExport; /* Unused. Must be set to CK_FALSE. */
-    CK_SSL3_RANDOM_DATA RandomInfo;
-    CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
-    CK_MECHANISM_TYPE prfHashMechanism;
-} CK_TLS12_KEY_MAT_PARAMS;
-
-typedef CK_TLS12_KEY_MAT_PARAMS CK_PTR CK_TLS12_KEY_MAT_PARAMS_PTR;
-
-typedef struct CK_TLS_KDF_PARAMS {
-    CK_MECHANISM_TYPE prfMechanism;
-    CK_BYTE_PTR pLabel;
-    CK_ULONG ulLabelLength;
-    CK_SSL3_RANDOM_DATA RandomInfo;
-    CK_BYTE_PTR pContextData;
-    CK_ULONG ulContextDataLength;
-} CK_TLS_KDF_PARAMS;
-
-typedef struct CK_TLS_MAC_PARAMS {
-    CK_MECHANISM_TYPE prfMechanism;
-    CK_ULONG ulMacLength;
-    CK_ULONG ulServerOrClient;
-} CK_TLS_MAC_PARAMS;
-
-typedef CK_TLS_MAC_PARAMS CK_PTR CK_TLS_MAC_PARAMS_PTR;
-
-/* WTLS is new for version 2.20 */
-typedef struct CK_WTLS_RANDOM_DATA {
-    CK_BYTE_PTR pClientRandom;
-    CK_ULONG ulClientRandomLen;
-    CK_BYTE_PTR pServerRandom;
-    CK_ULONG ulServerRandomLen;
-} CK_WTLS_RANDOM_DATA;
-
-typedef CK_WTLS_RANDOM_DATA CK_PTR CK_WTLS_RANDOM_DATA_PTR;
-
-typedef struct CK_WTLS_MASTER_KEY_DERIVE_PARAMS {
-    CK_MECHANISM_TYPE DigestMechanism;
-    CK_WTLS_RANDOM_DATA RandomInfo;
-    CK_BYTE_PTR pVersion;
-} CK_WTLS_MASTER_KEY_DERIVE_PARAMS;
-
-typedef CK_WTLS_MASTER_KEY_DERIVE_PARAMS CK_PTR
-    CK_WTLS_MASTER_KEY_DERIVE_PARAMS_PTR;
-
-typedef struct CK_WTLS_PRF_PARAMS {
-    CK_MECHANISM_TYPE DigestMechanism;
-    CK_BYTE_PTR pSeed;
-    CK_ULONG ulSeedLen;
-    CK_BYTE_PTR pLabel;
-    CK_ULONG ulLabelLen;
-    CK_BYTE_PTR pOutput;
-    CK_ULONG_PTR pulOutputLen;
-} CK_WTLS_PRF_PARAMS;
-
-typedef CK_WTLS_PRF_PARAMS CK_PTR CK_WTLS_PRF_PARAMS_PTR;
-
-typedef struct CK_WTLS_KEY_MAT_OUT {
-    CK_OBJECT_HANDLE hMacSecret;
-    CK_OBJECT_HANDLE hKey;
-    CK_BYTE_PTR pIV;
-} CK_WTLS_KEY_MAT_OUT;
-
-typedef CK_WTLS_KEY_MAT_OUT CK_PTR CK_WTLS_KEY_MAT_OUT_PTR;
-
-typedef struct CK_WTLS_KEY_MAT_PARAMS {
-    CK_MECHANISM_TYPE DigestMechanism;
-    CK_ULONG ulMacSizeInBits;
-    CK_ULONG ulKeySizeInBits;
-    CK_ULONG ulIVSizeInBits;
-    CK_ULONG ulSequenceNumber;
-    CK_BBOOL bIsExport; /* Unused. Must be set to CK_FALSE. */
-    CK_WTLS_RANDOM_DATA RandomInfo;
-    CK_WTLS_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
-} CK_WTLS_KEY_MAT_PARAMS;
-
-typedef CK_WTLS_KEY_MAT_PARAMS CK_PTR CK_WTLS_KEY_MAT_PARAMS_PTR;
-
-/* CMS is new for version 2.20 */
-typedef struct CK_CMS_SIG_PARAMS {
-    CK_OBJECT_HANDLE certificateHandle;
-    CK_MECHANISM_PTR pSigningMechanism;
-    CK_MECHANISM_PTR pDigestMechanism;
-    CK_UTF8CHAR_PTR pContentType;
-    CK_BYTE_PTR pRequestedAttributes;
-    CK_ULONG ulRequestedAttributesLen;
-    CK_BYTE_PTR pRequiredAttributes;
-    CK_ULONG ulRequiredAttributesLen;
-} CK_CMS_SIG_PARAMS;
-
-typedef CK_CMS_SIG_PARAMS CK_PTR CK_CMS_SIG_PARAMS_PTR;
-
-typedef struct CK_KEY_DERIVATION_STRING_DATA {
-    CK_BYTE_PTR pData;
-    CK_ULONG ulLen;
-} CK_KEY_DERIVATION_STRING_DATA;
-
-typedef CK_KEY_DERIVATION_STRING_DATA CK_PTR
-    CK_KEY_DERIVATION_STRING_DATA_PTR;
-
-/* The CK_EXTRACT_PARAMS is used for the
- * CKM_EXTRACT_KEY_FROM_KEY mechanism.  It specifies which bit
- * of the base key should be used as the first bit of the
- * derived key */
-/* CK_EXTRACT_PARAMS is new for v2.0 */
-typedef CK_ULONG CK_EXTRACT_PARAMS;
-
-typedef CK_EXTRACT_PARAMS CK_PTR CK_EXTRACT_PARAMS_PTR;
-
-/* CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE is new for v2.10.
- * CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE is used to
- * indicate the Pseudo-Random Function (PRF) used to generate
- * key bits using PKCS #5 PBKDF2. */
-typedef CK_ULONG CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE;
-
-typedef CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE CK_PTR CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE_PTR;
-
-/* The following PRFs are defined in PKCS #5 v2.1. */
-#define CKP_PKCS5_PBKD2_HMAC_SHA1 0x00000001
-#define CKP_PKCS5_PBKD2_HMAC_GOSTR3411 0x00000002
-#define CKP_PKCS5_PBKD2_HMAC_SHA224 0x00000003
-#define CKP_PKCS5_PBKD2_HMAC_SHA256 0x00000004
-#define CKP_PKCS5_PBKD2_HMAC_SHA384 0x00000005
-#define CKP_PKCS5_PBKD2_HMAC_SHA512 0x00000006
-#define CKP_PKCS5_PBKD2_HMAC_SHA512_224 0x00000007
-#define CKP_PKCS5_PBKD2_HMAC_SHA512_256 0x00000008
-
-/* CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE is new for v2.10.
- * CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE is used to indicate the
- * source of the salt value when deriving a key using PKCS #5
- * PBKDF2. */
-typedef CK_ULONG CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE;
-
-typedef CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE CK_PTR CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE_PTR;
-
-/* The following salt value sources are defined in PKCS #5 v2.0. */
-#define CKZ_SALT_SPECIFIED 0x00000001
-
-/* CK_PKCS5_PBKD2_PARAMS is new for v2.10.
- * CK_PKCS5_PBKD2_PARAMS is a structure that provides the
- * parameters to the CKM_PKCS5_PBKD2 mechanism. */
-typedef struct CK_PKCS5_PBKD2_PARAMS {
-    CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE saltSource;
-    CK_VOID_PTR pSaltSourceData;
-    CK_ULONG ulSaltSourceDataLen;
-    CK_ULONG iterations;
-    CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE prf;
-    CK_VOID_PTR pPrfData;
-    CK_ULONG ulPrfDataLen;
-    CK_UTF8CHAR_PTR pPassword;
-    CK_ULONG_PTR ulPasswordLen;
-} CK_PKCS5_PBKD2_PARAMS;
-
-typedef CK_PKCS5_PBKD2_PARAMS CK_PTR CK_PKCS5_PBKD2_PARAMS_PTR;
-
-/* NSS Specific defines */
-
-/* defines that have been deprecated in 2.20, but maintained in our
- * header file for backward compatibility */
-#define CKO_KG_PARAMETERS CKO_DOMAIN_PARAMETERS
-#define CKF_EC_FP CKF_EC_F_P
-/* new in v2.11 deprecated by 2.20 */
-#define CKR_KEY_PARAMS_INVALID 0x0000006B
-
-/* stuff that for historic reasons is in this header file but should have
- * been in pkcs11n.h */
-#define CKK_INVALID_KEY_TYPE 0xffffffff
-
-#include "pkcs11n.h"
-
-/* undo packing */
-#include "pkcs11u.h"
-
-#endif
diff --git a/openflow/usr/include/nss/pkcs11u.h b/openflow/usr/include/nss/pkcs11u.h
deleted file mode 100644
index be949bc..0000000
--- a/openflow/usr/include/nss/pkcs11u.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*
- * Copyright (C) 1994-1999 RSA Security Inc. Licence to copy this document
- * is granted provided that it is identified as "RSA Security Inc. Public-Key
- * Cryptography Standards (PKCS)" in all material mentioning or referencing
- * this document.
- */
-/*
- * reset any packing set by pkcs11p.h
- */
-
-#if defined(_WIN32)
-#ifdef _MSC_VER
-#pragma warning(disable : 4103)
-#endif
-#pragma pack(pop, cryptoki)
-#endif
diff --git a/openflow/usr/include/nss/pkcs12.h b/openflow/usr/include/nss/pkcs12.h
deleted file mode 100644
index 57b3263..0000000
--- a/openflow/usr/include/nss/pkcs12.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _PKCS12_H_
-#define _PKCS12_H_
-
-#include "pkcs12t.h"
-#include "p12.h"
-
-SEC_BEGIN_PROTOS
-
-typedef SECItem *(*SEC_PKCS12GetPassword)(void *arg);
-
-/* Decode functions */
-/* Import a PFX item.
- *      der_pfx is the der-encoded pfx item to import.
- *      pbef, and pbefarg are used to retrieve passwords for the HMAC,
- *          and any passwords needed for passing to PKCS5 encryption
- *          routines.
- *      algorithm is the algorithm by which private keys are stored in
- *          the key database.  this could be a specific algorithm or could
- *          be based on a global setting.
- *      slot is the slot to where the certificates will be placed.  if NULL,
- *          the internal key slot is used.
- * If the process is successful, a SECSuccess is returned, otherwise
- * a failure occurred.
- */
-SECStatus
-SEC_PKCS12PutPFX(SECItem *der_pfx, SECItem *pwitem,
-                 SEC_PKCS12NicknameCollisionCallback ncCall,
-                 PK11SlotInfo *slot, void *wincx);
-
-/* check the first two bytes of a file to make sure that it matches
- * the desired header for a PKCS 12 file
- */
-PRBool SEC_PKCS12ValidData(char *buf, int bufLen, long int totalLength);
-
-SEC_END_PROTOS
-
-#endif
diff --git a/openflow/usr/include/nss/pkcs12t.h b/openflow/usr/include/nss/pkcs12t.h
deleted file mode 100644
index ad00d7b..0000000
--- a/openflow/usr/include/nss/pkcs12t.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _PKCS12T_H_
-#define _PKCS12T_H_
-
-#include "seccomon.h"
-#include "secoid.h"
-#include "cert.h"
-#include "key.h"
-#include "plarena.h"
-#include "secpkcs7.h"
-#include "secdig.h" /* for SGNDigestInfo */
-
-typedef enum {
-    SECPKCS12TargetTokenNoCAs,           /* CA get loaded intothe fixed token,
-                                          * User certs go to target token */
-    SECPKCS12TargetTokenIntermediateCAs, /* User certs and intermediates go to
-                                          * target token, root certs got to
-                                          * fixed token */
-    SECPKCS12TargetTokenAllCAs           /* All certs go to target token */
-} SECPKCS12TargetTokenCAs;
-
-/* PKCS12 Structures */
-typedef struct SEC_PKCS12PFXItemStr SEC_PKCS12PFXItem;
-typedef struct SEC_PKCS12MacDataStr SEC_PKCS12MacData;
-typedef struct SEC_PKCS12AuthenticatedSafeStr SEC_PKCS12AuthenticatedSafe;
-typedef struct SEC_PKCS12BaggageItemStr SEC_PKCS12BaggageItem;
-typedef struct SEC_PKCS12BaggageStr SEC_PKCS12Baggage;
-typedef struct SEC_PKCS12Baggage_OLDStr SEC_PKCS12Baggage_OLD;
-typedef struct SEC_PKCS12ESPVKItemStr SEC_PKCS12ESPVKItem;
-typedef struct SEC_PKCS12PVKSupportingDataStr SEC_PKCS12PVKSupportingData;
-typedef struct SEC_PKCS12PVKAdditionalDataStr SEC_PKCS12PVKAdditionalData;
-typedef struct SEC_PKCS12SafeContentsStr SEC_PKCS12SafeContents;
-typedef struct SEC_PKCS12SafeBagStr SEC_PKCS12SafeBag;
-typedef struct SEC_PKCS12PrivateKeyStr SEC_PKCS12PrivateKey;
-typedef struct SEC_PKCS12PrivateKeyBagStr SEC_PKCS12PrivateKeyBag;
-typedef struct SEC_PKCS12CertAndCRLBagStr SEC_PKCS12CertAndCRLBag;
-typedef struct SEC_PKCS12CertAndCRLStr SEC_PKCS12CertAndCRL;
-typedef struct SEC_PKCS12X509CertCRLStr SEC_PKCS12X509CertCRL;
-typedef struct SEC_PKCS12SDSICertStr SEC_PKCS12SDSICert;
-typedef struct SEC_PKCS12SecretStr SEC_PKCS12Secret;
-typedef struct SEC_PKCS12SecretAdditionalStr SEC_PKCS12SecretAdditional;
-typedef struct SEC_PKCS12SecretItemStr SEC_PKCS12SecretItem;
-typedef struct SEC_PKCS12SecretBagStr SEC_PKCS12SecretBag;
-
-typedef SECItem *(*SEC_PKCS12PasswordFunc)(SECItem *args);
-
-/* PKCS12 types */
-
-/* stores shrouded keys */
-struct SEC_PKCS12BaggageStr {
-    PLArenaPool *poolp;
-    SEC_PKCS12BaggageItem **bags;
-
-    int luggage_size; /* used locally */
-};
-
-/* additional data to be associated with keys.  currently there
- * is nothing defined to be stored here.  allows future expansion.
- */
-struct SEC_PKCS12PVKAdditionalDataStr {
-    PLArenaPool *poolp;
-    SECOidData *pvkAdditionalTypeTag; /* used locally */
-    SECItem pvkAdditionalType;
-    SECItem pvkAdditionalContent;
-};
-
-/* cert and other supporting data for private keys.  used
- * for both shrouded and non-shrouded keys.
- */
-struct SEC_PKCS12PVKSupportingDataStr {
-    PLArenaPool *poolp;
-    SGNDigestInfo **assocCerts;
-    SECItem regenerable;
-    SECItem nickname;
-    SEC_PKCS12PVKAdditionalData pvkAdditional;
-    SECItem pvkAdditionalDER;
-
-    SECItem uniNickName;
-    /* used locally */
-    int nThumbs;
-};
-
-/* shrouded key structure.  supports only pkcs8 shrouding
- * currently.
- */
-struct SEC_PKCS12ESPVKItemStr {
-    PLArenaPool *poolp;   /* used locally */
-    SECOidData *espvkTag; /* used locally */
-    SECItem espvkOID;
-    SEC_PKCS12PVKSupportingData espvkData;
-    union {
-        SECKEYEncryptedPrivateKeyInfo *pkcs8KeyShroud;
-    } espvkCipherText;
-
-    PRBool duplicate;    /* used locally */
-    PRBool problem_cert; /* used locally */
-    PRBool single_cert;  /* used locally */
-    int nCerts;          /* used locally */
-    SECItem derCert;     /* used locally */
-};
-
-/* generic bag store for the safe.  safeBagType identifies
- * the type of bag stored.
- */
-struct SEC_PKCS12SafeBagStr {
-    PLArenaPool *poolp;
-    SECOidData *safeBagTypeTag; /* used locally */
-    SECItem safeBagType;
-    union {
-        SEC_PKCS12PrivateKeyBag *keyBag;
-        SEC_PKCS12CertAndCRLBag *certAndCRLBag;
-        SEC_PKCS12SecretBag *secretBag;
-    } safeContent;
-
-    SECItem derSafeContent;
-    SECItem safeBagName;
-
-    SECItem uniSafeBagName;
-};
-
-/* stores private keys and certificates in a list.  each safebag
- * has an ID identifying the type of content stored.
- */
-struct SEC_PKCS12SafeContentsStr {
-    PLArenaPool *poolp;
-    SEC_PKCS12SafeBag **contents;
-
-    /* used for tracking purposes */
-    int safe_size;
-    PRBool old;
-    PRBool swapUnicode;
-    PRBool possibleSwapUnicode;
-};
-
-/* private key structure which holds encrypted private key and
- * supporting data including nickname and certificate thumbprint.
- */
-struct SEC_PKCS12PrivateKeyStr {
-    PLArenaPool *poolp;
-    SEC_PKCS12PVKSupportingData pvkData;
-    SECKEYPrivateKeyInfo pkcs8data; /* borrowed from PKCS 8 */
-
-    PRBool duplicate;    /* used locally */
-    PRBool problem_cert; /* used locally */
-    PRBool single_cert;  /* used locally */
-    int nCerts;          /* used locally */
-    SECItem derCert;     /* used locally */
-};
-
-/* private key bag, holds a (null terminated) list of private key
- * structures.
- */
-struct SEC_PKCS12PrivateKeyBagStr {
-    PLArenaPool *poolp;
-    SEC_PKCS12PrivateKey **privateKeys;
-
-    int bag_size; /* used locally */
-};
-
-/* container to hold certificates.  currently supports x509
- * and sdsi certificates
- */
-struct SEC_PKCS12CertAndCRLStr {
-    PLArenaPool *poolp;
-    SECOidData *BagTypeTag; /* used locally */
-    SECItem BagID;
-    union {
-        SEC_PKCS12X509CertCRL *x509;
-        SEC_PKCS12SDSICert *sdsi;
-    } value;
-
-    SECItem derValue;
-    SECItem nickname; /* used locally */
-    PRBool duplicate; /* used locally */
-};
-
-/* x509 certificate structure.  typically holds the der encoding
- * of the x509 certificate.  thumbprint contains a digest of the
- * certificate
- */
-struct SEC_PKCS12X509CertCRLStr {
-    PLArenaPool *poolp;
-    SEC_PKCS7ContentInfo certOrCRL;
-    SGNDigestInfo thumbprint;
-
-    SECItem *derLeafCert; /* used locally */
-};
-
-/* sdsi certificate structure.  typically holds the der encoding
- * of the sdsi certificate.  thumbprint contains a digest of the
- * certificate
- */
-struct SEC_PKCS12SDSICertStr {
-    PLArenaPool *poolp;
-    SECItem value;
-    SGNDigestInfo thumbprint;
-};
-
-/* contains a null terminated list of certs and crls */
-struct SEC_PKCS12CertAndCRLBagStr {
-    PLArenaPool *poolp;
-    SEC_PKCS12CertAndCRL **certAndCRLs;
-
-    int bag_size; /* used locally */
-};
-
-/* additional secret information.  currently no information
- * stored in this structure.
- */
-struct SEC_PKCS12SecretAdditionalStr {
-    PLArenaPool *poolp;
-    SECOidData *secretTypeTag; /* used locally */
-    SECItem secretAdditionalType;
-    SECItem secretAdditionalContent;
-};
-
-/* secrets container.  this will be used to contain currently
- * unspecified secrets.  (it's a secret)
- */
-struct SEC_PKCS12SecretStr {
-    PLArenaPool *poolp;
-    SECItem secretName;
-    SECItem value;
-    SEC_PKCS12SecretAdditional secretAdditional;
-
-    SECItem uniSecretName;
-};
-
-struct SEC_PKCS12SecretItemStr {
-    PLArenaPool *poolp;
-    SEC_PKCS12Secret secret;
-    SEC_PKCS12SafeBag subFolder;
-};
-
-/* a bag of secrets.  holds a null terminated list of secrets.
- */
-struct SEC_PKCS12SecretBagStr {
-    PLArenaPool *poolp;
-    SEC_PKCS12SecretItem **secrets;
-
-    int bag_size; /* used locally */
-};
-
-struct SEC_PKCS12MacDataStr {
-    SGNDigestInfo safeMac;
-    SECItem macSalt;
-};
-
-/* outer transfer unit */
-struct SEC_PKCS12PFXItemStr {
-    PLArenaPool *poolp;
-    SEC_PKCS12MacData macData;
-    SEC_PKCS7ContentInfo authSafe;
-
-    /* for compatibility with beta */
-    PRBool old;
-    SGNDigestInfo old_safeMac;
-    SECItem old_macSalt;
-
-    /* compatibility between platforms for unicode swapping */
-    PRBool swapUnicode;
-};
-
-struct SEC_PKCS12BaggageItemStr {
-    PLArenaPool *poolp;
-    SEC_PKCS12ESPVKItem **espvks;
-    SEC_PKCS12SafeBag **unencSecrets;
-
-    int nEspvks;
-    int nSecrets;
-};
-
-/* stores shrouded keys */
-struct SEC_PKCS12Baggage_OLDStr {
-    PLArenaPool *poolp;
-    SEC_PKCS12ESPVKItem **espvks;
-
-    int luggage_size; /* used locally */
-};
-
-/* authenticated safe, stores certs, keys, and shrouded keys */
-struct SEC_PKCS12AuthenticatedSafeStr {
-    PLArenaPool *poolp;
-    SECItem version;
-    SECOidData *transportTypeTag; /* local not part of encoding*/
-    SECItem transportMode;
-    SECItem privacySalt;
-    SEC_PKCS12Baggage baggage;
-    SEC_PKCS7ContentInfo *safe;
-
-    /* used for beta compatibility */
-    PRBool old;
-    PRBool emptySafe;
-    SEC_PKCS12Baggage_OLD old_baggage;
-    SEC_PKCS7ContentInfo old_safe;
-    PRBool swapUnicode;
-};
-#define SEC_PKCS12_PFX_VERSION 1 /* what we create */
-
-/* PKCS 12 Templates */
-extern const SEC_ASN1Template SEC_PKCS12PFXItemTemplate_OLD[];
-extern const SEC_ASN1Template SEC_PKCS12AuthenticatedSafeTemplate_OLD[];
-extern const SEC_ASN1Template SEC_PKCS12BaggageTemplate_OLD[];
-extern const SEC_ASN1Template SEC_PKCS12PFXItemTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12MacDataTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12AuthenticatedSafeTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12BaggageTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12ESPVKItemTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12PVKSupportingDataTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12PVKAdditionalTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12SafeContentsTemplate_OLD[];
-extern const SEC_ASN1Template SEC_PKCS12SafeContentsTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12SafeBagTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12PrivateKeyTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12PrivateKeyBagTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12CertAndCRLTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12CertAndCRLBagTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12X509CertCRLTemplate_OLD[];
-extern const SEC_ASN1Template SEC_PKCS12X509CertCRLTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12SDSICertTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12SecretBagTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12SecretTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12SecretItemTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12SecretAdditionalTemplate[];
-extern const SEC_ASN1Template SGN_DigestInfoTemplate[];
-extern const SEC_ASN1Template SEC_PointerToPKCS12KeyBagTemplate[];
-extern const SEC_ASN1Template SEC_PointerToPKCS12CertAndCRLBagTemplate[];
-extern const SEC_ASN1Template SEC_PointerToPKCS12CertAndCRLBagTemplate_OLD[];
-extern const SEC_ASN1Template SEC_PointerToPKCS12SecretBagTemplate[];
-extern const SEC_ASN1Template SEC_PointerToPKCS12X509CertCRLTemplate_OLD[];
-extern const SEC_ASN1Template SEC_PointerToPKCS12X509CertCRLTemplate[];
-extern const SEC_ASN1Template SEC_PointerToPKCS12SDSICertTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12CodedSafeBagTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12CodedCertBagTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12CodedCertAndCRLBagTemplate[];
-extern const SEC_ASN1Template SEC_PKCS12PVKSupportingDataTemplate_OLD[];
-extern const SEC_ASN1Template SEC_PKCS12ESPVKItemTemplate_OLD[];
-#endif
diff --git a/openflow/usr/include/nss/pkcs1sig.h b/openflow/usr/include/nss/pkcs1sig.h
deleted file mode 100644
index 7c52b15..0000000
--- a/openflow/usr/include/nss/pkcs1sig.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef _PKCS1SIG_H_
-#define _PKCS1SIG_H_
-
-#include "hasht.h"
-#include "seccomon.h"
-#include "secoidt.h"
-
-/* SGN_VerifyPKCS1DigestInfo verifies that the length of the digest is correct
- * for the given algorithm, then verifies that the recovered data from the
- * PKCS#1 signature is a properly-formatted DigestInfo that identifies the
- * given digest algorithm, then verifies that the digest in the DigestInfo
- * matches the given digest.
- *
- * dataRecoveredFromSignature must be the result of calling PK11_VerifyRecover
- * or equivalent.
- *
- * If unsafeAllowMissingParameters is true (not recommended), then a DigestInfo
- * without the mandatory ASN.1 NULL parameter will also be accepted.
- */
-SECStatus _SGN_VerifyPKCS1DigestInfo(SECOidTag digestAlg,
-                                     const SECItem* digest,
-                                     const SECItem* dataRecoveredFromSignature,
-                                     PRBool unsafeAllowMissingParameters);
-
-#endif /* _PKCS1SIG_H_ */
diff --git a/openflow/usr/include/nss/pkcs7t.h b/openflow/usr/include/nss/pkcs7t.h
deleted file mode 100644
index 4ef8902..0000000
--- a/openflow/usr/include/nss/pkcs7t.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Header for pkcs7 types.
- */
-
-#ifndef _PKCS7T_H_
-#define _PKCS7T_H_
-
-#include "plarena.h"
-
-#include "seccomon.h"
-#include "secoidt.h"
-#include "certt.h"
-#include "secmodt.h"
-
-/* Opaque objects */
-typedef struct SEC_PKCS7DecoderContextStr SEC_PKCS7DecoderContext;
-typedef struct SEC_PKCS7EncoderContextStr SEC_PKCS7EncoderContext;
-
-/* legacy defines that haven't been active for years */
-typedef void *(*SECKEYGetPasswordKey)(void *arg, void *handle);
-
-/* Non-opaque objects.  NOTE, though: I want them to be treated as
- * opaque as much as possible.  If I could hide them completely,
- * I would.  (I tried, but ran into trouble that was taking me too
- * much time to get out of.)  I still intend to try to do so.
- * In fact, the only type that "outsiders" should even *name* is
- * SEC_PKCS7ContentInfo, and they should not reference its fields.
- */
-/* rjr: PKCS #11 cert handling (pk11cert.c) does use SEC_PKCS7RecipientInfo's.
- * This is because when we search the recipient list for the cert and key we
- * want, we need to invert the order of the loops we used to have. The old
- * loops were:
- *
- *  For each recipient {
- *       find_cert = PK11_Find_AllCert(recipient->issuerSN);
- *       [which unrolls to... ]
- *       For each slot {
- *            Log into slot;
- *            search slot for cert;
- *      }
- *  }
- *
- *  the new loop searchs all the recipients at once on a slot. this allows
- *  PKCS #11 to order slots in such a way that logout slots don't get checked
- *  if we can find the cert on a logged in slot. This eliminates lots of
- *  spurious password prompts when smart cards are installed... so why this
- *  comment? If you make SEC_PKCS7RecipientInfo completely opaque, you need
- *  to provide a non-opaque list of issuerSN's (the only field PKCS#11 needs
- *  and fix up pk11cert.c first. NOTE: Only S/MIME calls this special PKCS #11
- *  function.
- */
-typedef struct SEC_PKCS7ContentInfoStr SEC_PKCS7ContentInfo;
-typedef struct SEC_PKCS7SignedDataStr SEC_PKCS7SignedData;
-typedef struct SEC_PKCS7EncryptedContentInfoStr SEC_PKCS7EncryptedContentInfo;
-typedef struct SEC_PKCS7EnvelopedDataStr SEC_PKCS7EnvelopedData;
-typedef struct SEC_PKCS7SignedAndEnvelopedDataStr
-    SEC_PKCS7SignedAndEnvelopedData;
-typedef struct SEC_PKCS7SignerInfoStr SEC_PKCS7SignerInfo;
-typedef struct SEC_PKCS7RecipientInfoStr SEC_PKCS7RecipientInfo;
-typedef struct SEC_PKCS7DigestedDataStr SEC_PKCS7DigestedData;
-typedef struct SEC_PKCS7EncryptedDataStr SEC_PKCS7EncryptedData;
-/*
- * The following is not actually a PKCS7 type, but for now it is only
- * used by PKCS7, so we have adopted it.  If someone else *ever* needs
- * it, its name should be changed and it should be moved out of here.
- * Do not dare to use it without doing so!
- */
-typedef struct SEC_PKCS7AttributeStr SEC_PKCS7Attribute;
-
-struct SEC_PKCS7ContentInfoStr {
-    PLArenaPool *poolp;         /* local; not part of encoding */
-    PRBool created;             /* local; not part of encoding */
-    int refCount;               /* local; not part of encoding */
-    SECOidData *contentTypeTag; /* local; not part of encoding */
-    SECKEYGetPasswordKey pwfn;  /* local; not part of encoding */
-    void *pwfn_arg;             /* local; not part of encoding */
-    SECItem contentType;
-    union {
-        SECItem *data;
-        SEC_PKCS7DigestedData *digestedData;
-        SEC_PKCS7EncryptedData *encryptedData;
-        SEC_PKCS7EnvelopedData *envelopedData;
-        SEC_PKCS7SignedData *signedData;
-        SEC_PKCS7SignedAndEnvelopedData *signedAndEnvelopedData;
-    } content;
-};
-
-struct SEC_PKCS7SignedDataStr {
-    SECItem version;
-    SECAlgorithmID **digestAlgorithms;
-    SEC_PKCS7ContentInfo contentInfo;
-    SECItem **rawCerts;
-    CERTSignedCrl **crls;
-    SEC_PKCS7SignerInfo **signerInfos;
-    SECItem **digests;               /* local; not part of encoding */
-    CERTCertificate **certs;         /* local; not part of encoding */
-    CERTCertificateList **certLists; /* local; not part of encoding */
-};
-#define SEC_PKCS7_SIGNED_DATA_VERSION 1 /* what we *create* */
-
-struct SEC_PKCS7EncryptedContentInfoStr {
-    SECOidData *contentTypeTag; /* local; not part of encoding */
-    SECItem contentType;
-    SECAlgorithmID contentEncAlg;
-    SECItem encContent;
-    SECItem plainContent; /* local; not part of encoding */
-                          /* bytes not encrypted, but encoded */
-    int keysize;          /* local; not part of encoding */
-                          /* size of bulk encryption key
-                           * (only used by creation code) */
-    SECOidTag encalg;     /* local; not part of encoding */
-                          /* oid tag of encryption algorithm
-                           * (only used by creation code) */
-};
-
-struct SEC_PKCS7EnvelopedDataStr {
-    SECItem version;
-    SEC_PKCS7RecipientInfo **recipientInfos;
-    SEC_PKCS7EncryptedContentInfo encContentInfo;
-};
-#define SEC_PKCS7_ENVELOPED_DATA_VERSION 0 /* what we *create* */
-
-struct SEC_PKCS7SignedAndEnvelopedDataStr {
-    SECItem version;
-    SEC_PKCS7RecipientInfo **recipientInfos;
-    SECAlgorithmID **digestAlgorithms;
-    SEC_PKCS7EncryptedContentInfo encContentInfo;
-    SECItem **rawCerts;
-    CERTSignedCrl **crls;
-    SEC_PKCS7SignerInfo **signerInfos;
-    SECItem **digests;               /* local; not part of encoding */
-    CERTCertificate **certs;         /* local; not part of encoding */
-    CERTCertificateList **certLists; /* local; not part of encoding */
-    PK11SymKey *sigKey;              /* local; not part of encoding */
-};
-#define SEC_PKCS7_SIGNED_AND_ENVELOPED_DATA_VERSION 1 /* what we *create* */
-
-struct SEC_PKCS7SignerInfoStr {
-    SECItem version;
-    CERTIssuerAndSN *issuerAndSN;
-    SECAlgorithmID digestAlg;
-    SEC_PKCS7Attribute **authAttr;
-    SECAlgorithmID digestEncAlg;
-    SECItem encDigest;
-    SEC_PKCS7Attribute **unAuthAttr;
-    CERTCertificate *cert;         /* local; not part of encoding */
-    CERTCertificateList *certList; /* local; not part of encoding */
-};
-#define SEC_PKCS7_SIGNER_INFO_VERSION 1 /* what we *create* */
-
-struct SEC_PKCS7RecipientInfoStr {
-    SECItem version;
-    CERTIssuerAndSN *issuerAndSN;
-    SECAlgorithmID keyEncAlg;
-    SECItem encKey;
-    CERTCertificate *cert; /* local; not part of encoding */
-};
-#define SEC_PKCS7_RECIPIENT_INFO_VERSION 0 /* what we *create* */
-
-struct SEC_PKCS7DigestedDataStr {
-    SECItem version;
-    SECAlgorithmID digestAlg;
-    SEC_PKCS7ContentInfo contentInfo;
-    SECItem digest;
-};
-#define SEC_PKCS7_DIGESTED_DATA_VERSION 0 /* what we *create* */
-
-struct SEC_PKCS7EncryptedDataStr {
-    SECItem version;
-    SEC_PKCS7EncryptedContentInfo encContentInfo;
-};
-#define SEC_PKCS7_ENCRYPTED_DATA_VERSION 0 /* what we *create* */
-
-/*
- * See comment above about this type not really belonging to PKCS7.
- */
-struct SEC_PKCS7AttributeStr {
-    /* The following fields make up an encoded Attribute: */
-    SECItem type;
-    SECItem **values; /* data may or may not be encoded */
-    /* The following fields are not part of an encoded Attribute: */
-    SECOidData *typeTag;
-    PRBool encoded; /* when true, values are encoded */
-};
-
-/*
- * Type of function passed to SEC_PKCS7Decode or SEC_PKCS7DecoderStart.
- * If specified, this is where the content bytes (only) will be "sent"
- * as they are recovered during the decoding.
- *
- * XXX Should just combine this with SEC_PKCS7EncoderContentCallback type
- * and use a simpler, common name.
- */
-typedef void (*SEC_PKCS7DecoderContentCallback)(void *arg,
-                                                const char *buf,
-                                                unsigned long len);
-
-/*
- * Type of function passed to SEC_PKCS7Encode or SEC_PKCS7EncoderStart.
- * This is where the encoded bytes will be "sent".
- *
- * XXX Should just combine this with SEC_PKCS7DecoderContentCallback type
- * and use a simpler, common name.
- */
-typedef void (*SEC_PKCS7EncoderOutputCallback)(void *arg,
-                                               const char *buf,
-                                               unsigned long len);
-
-/*
- * Type of function passed to SEC_PKCS7Decode or SEC_PKCS7DecoderStart
- * to retrieve the decryption key.  This function is inteded to be
- * used for EncryptedData content info's which do not have a key available
- * in a certificate, etc.
- */
-typedef PK11SymKey *(*SEC_PKCS7GetDecryptKeyCallback)(void *arg,
-                                                      SECAlgorithmID *algid);
-
-/*
- * Type of function passed to SEC_PKCS7Decode or SEC_PKCS7DecoderStart.
- * This function in intended to be used to verify that decrypting a
- * particular crypto algorithm is allowed.  Content types which do not
- * require decryption will not need the callback.  If the callback
- * is not specified for content types which require decryption, the
- * decryption will be disallowed.
- */
-typedef PRBool (*SEC_PKCS7DecryptionAllowedCallback)(SECAlgorithmID *algid,
-                                                     PK11SymKey *bulkkey);
-
-#endif /* _PKCS7T_H_ */
diff --git a/openflow/usr/include/nss/portreg.h b/openflow/usr/include/nss/portreg.h
deleted file mode 100644
index 14bd9e7..0000000
--- a/openflow/usr/include/nss/portreg.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * shexp.h: Defines and prototypes for shell exp. match routines
- *
- * This routine will match a string with a shell expression. The expressions
- * accepted are based loosely on the expressions accepted by zsh.
- *
- * o * matches anything
- * o ? matches one character
- * o \ will escape a special character
- * o $ matches the end of the string
- * Bracketed expressions:
- * o [abc] matches one occurence of a, b, or c.
- * o [^abc] matches any character except a, b, or c.
- *     To be matched between [ and ], these characters must be escaped: \ ]
- *     No other characters need be escaped between brackets.
- *     Unnecessary escaping is permitted.
- * o [a-z] matches any character between a and z, inclusive.
- *     The two range-definition characters must be alphanumeric ASCII.
- *     If one is upper case and the other is lower case, then the ASCII
- *     non-alphanumeric characters between Z and a will also be in range.
- * o [^a-z] matches any character except those between a and z, inclusive.
- *     These forms cannot be combined, e.g [a-gp-z] does not work.
- * o Exclusions:
- *   As a top level, outter-most expression only, the expression
- *   foo~bar will match the expression foo, provided it does not also
- *     match the expression bar.  Either expression or both may be a union.
- *     Except between brackets, any unescaped ~ is an exclusion.
- *     At most one exclusion is permitted.
- *     Exclusions cannot be nested (contain other exclusions).
- *     example: *~abc will match any string except abc
- * o Unions:
- *   (foo|bar) will match either the expression foo, or the expression bar.
- *     At least one '|' separator is required.  More are permitted.
- *     Expressions inside unions may not include unions or exclusions.
- *     Inside a union, to be matched and not treated as a special character,
- *     these characters must be escaped: \ ( | ) [ ~ except when they occur
- *     inside a bracketed expression, where only \ and ] require escaping.
- *
- * The public interface to these routines is documented below.
- *
- */
-
-#ifndef SHEXP_H
-#define SHEXP_H
-
-#include "utilrename.h"
-/*
- * Requires that the macro MALLOC be set to a "safe" malloc that will
- * exit if no memory is available.
- */
-
-/* --------------------------- Public routines ---------------------------- */
-
-/*
- * shexp_valid takes a shell expression exp as input. It returns:
- *
- *  NON_SXP      if exp is a standard string
- *  INVALID_SXP  if exp is a shell expression, but invalid
- *  VALID_SXP    if exp is a valid shell expression
- */
-
-#define NON_SXP -1
-#define INVALID_SXP -2
-#define VALID_SXP 1
-
-SEC_BEGIN_PROTOS
-
-extern int PORT_RegExpValid(const char *exp);
-
-extern int PORT_RegExpSearch(const char *str, const char *exp);
-
-/* same as above but uses case insensitive search */
-extern int PORT_RegExpCaseSearch(const char *str, const char *exp);
-
-SEC_END_PROTOS
-
-#endif
diff --git a/openflow/usr/include/nss/preenc.h b/openflow/usr/include/nss/preenc.h
deleted file mode 100644
index bebff89..0000000
--- a/openflow/usr/include/nss/preenc.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
-/*
- * Fortezza support is removed.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* Fortezza support is removed.
- * This file remains so that old programs will continue to compile,
- * But this functionality is no longer supported or implemented.
- */
-
-#include "seccomon.h"
-#include "prio.h"
-
-typedef struct PEHeaderStr PEHeader;
-
-#define PE_MIME_TYPE "application/pre-encrypted"
-
-typedef struct PEFortezzaHeaderStr PEFortezzaHeader;
-typedef struct PEFortezzaGeneratedHeaderStr PEFortezzaGeneratedHeader;
-typedef struct PEFixedKeyHeaderStr PEFixedKeyHeader;
-typedef struct PERSAKeyHeaderStr PERSAKeyHeader;
-
-struct PEFortezzaHeaderStr {
-    unsigned char key[12];
-    unsigned char iv[24];
-    unsigned char hash[20];
-    unsigned char serial[8];
-};
-
-struct PEFortezzaGeneratedHeaderStr {
-    unsigned char key[12];
-    unsigned char iv[24];
-    unsigned char hash[20];
-    unsigned char Ra[128];
-    unsigned char Y[128];
-};
-
-struct PEFixedKeyHeaderStr {
-    unsigned char pkcs11Mech[4];
-    unsigned char labelLen[2];
-    unsigned char keyIDLen[2];
-    unsigned char ivLen[2];
-    unsigned char keyLen[2];
-    unsigned char data[1];
-};
-
-struct PERSAKeyHeaderStr {
-    unsigned char pkcs11Mech[4];
-    unsigned char issuerLen[2];
-    unsigned char serialLen[2];
-    unsigned char ivLen[2];
-    unsigned char keyLen[2];
-    unsigned char data[1];
-};
-
-#define PEFIXED_Label(header) (header->data)
-#define PEFIXED_KeyID(header) (&header->data[GetInt2(header->labelLen)])
-#define PEFIXED_IV(header) (&header->data[GetInt2(header->labelLen) + \
-                                          GetInt2(header->keyIDLen)])
-#define PEFIXED_Key(header) (&header->data[GetInt2(header->labelLen) + \
-                                           GetInt2(header->keyIDLen) + \
-                                           GetInt2(header->keyLen)])
-#define PERSA_Issuer(header) (header->data)
-#define PERSA_Serial(header) (&header->data[GetInt2(header->issuerLen)])
-#define PERSA_IV(header) (&header->data[GetInt2(header->issuerLen) + \
-                                        GetInt2(header->serialLen)])
-#define PERSA_Key(header) (&header->data[GetInt2(header->issuerLen) + \
-                                         GetInt2(header->serialLen) + \
-                                         GetInt2(header->keyLen)])
-struct PEHeaderStr {
-    unsigned char magic[2];
-    unsigned char len[2];
-    unsigned char type[2];
-    unsigned char version[2];
-    union {
-        PEFortezzaHeader fortezza;
-        PEFortezzaGeneratedHeader g_fortezza;
-        PEFixedKeyHeader fixed;
-        PERSAKeyHeader rsa;
-    } u;
-};
-
-#define PE_CRYPT_INTRO_LEN 8
-#define PE_INTRO_LEN 4
-#define PE_BASE_HEADER_LEN 8
-
-#define PRE_BLOCK_SIZE 8
-
-#define GetInt2(c) ((c[0] << 8) | c[1])
-#define GetInt4(c) (((unsigned long)c[0] << 24) | ((unsigned long)c[1] << 16) | \
-                    ((unsigned long)c[2] << 8) | ((unsigned long)c[3]))
-#define PutInt2(c, i) ((c[1] = (i)&0xff), (c[0] = ((i) >> 8) & 0xff))
-#define PutInt4(c, i) ((c[0] = ((i) >> 24) & 0xff), (c[1] = ((i) >> 16) & 0xff), \
-                       (c[2] = ((i) >> 8) & 0xff), (c[3] = (i)&0xff))
-
-#define PRE_MAGIC 0xc0de
-#define PRE_VERSION 0x1010
-#define PRE_FORTEZZA_FILE 0x00ff
-#define PRE_FORTEZZA_STREAM 0x00f5
-#define PRE_FORTEZZA_GEN_STREAM 0x00f6
-#define PRE_FIXED_FILE 0x000f
-#define PRE_RSA_FILE 0x001f
-#define PRE_FIXED_STREAM 0x0005
-
-PEHeader *SSL_PreencryptedStreamToFile(PRFileDesc *fd, PEHeader *,
-                                       int *headerSize);
-
-PEHeader *SSL_PreencryptedFileToStream(PRFileDesc *fd, PEHeader *,
-                                       int *headerSize);
diff --git a/openflow/usr/include/nss/secasn1.h b/openflow/usr/include/nss/secasn1.h
deleted file mode 100644
index b6292cd..0000000
--- a/openflow/usr/include/nss/secasn1.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Support for encoding/decoding of ASN.1 using BER/DER (Basic/Distinguished
- * Encoding Rules).  The routines are found in and used extensively by the
- * security library, but exported for other use.
- */
-
-#ifndef _SECASN1_H_
-#define _SECASN1_H_
-
-#include "utilrename.h"
-#include "plarena.h"
-
-#include "seccomon.h"
-#include "secasn1t.h"
-
-/************************************************************************/
-SEC_BEGIN_PROTOS
-
-/*
- * XXX These function prototypes need full, explanatory comments.
- */
-
-/*
-** Decoding.
-*/
-
-extern SEC_ASN1DecoderContext *SEC_ASN1DecoderStart(PLArenaPool *pool,
-                                                    void *dest,
-                                                    const SEC_ASN1Template *t);
-
-/* XXX char or unsigned char? */
-extern SECStatus SEC_ASN1DecoderUpdate(SEC_ASN1DecoderContext *cx,
-                                       const char *buf,
-                                       unsigned long len);
-
-extern SECStatus SEC_ASN1DecoderFinish(SEC_ASN1DecoderContext *cx);
-
-/* Higher level code detected an error, abort the rest of the processing */
-extern void SEC_ASN1DecoderAbort(SEC_ASN1DecoderContext *cx, int error);
-
-extern void SEC_ASN1DecoderSetFilterProc(SEC_ASN1DecoderContext *cx,
-                                         SEC_ASN1WriteProc fn,
-                                         void *arg, PRBool no_store);
-
-extern void SEC_ASN1DecoderClearFilterProc(SEC_ASN1DecoderContext *cx);
-
-extern void SEC_ASN1DecoderSetNotifyProc(SEC_ASN1DecoderContext *cx,
-                                         SEC_ASN1NotifyProc fn,
-                                         void *arg);
-
-extern void SEC_ASN1DecoderClearNotifyProc(SEC_ASN1DecoderContext *cx);
-
-extern SECStatus SEC_ASN1Decode(PLArenaPool *pool, void *dest,
-                                const SEC_ASN1Template *t,
-                                const char *buf, long len);
-
-/* Both classic ASN.1 and QuickDER have a feature that removes leading zeroes
-   out of SEC_ASN1_INTEGER if the caller sets siUnsignedInteger in the type
-   field of the target SECItem prior to calling the decoder. Otherwise, the
-   type field is ignored and untouched. For SECItem that are dynamically
-   allocated (from POINTER, SET OF, SEQUENCE OF) the decoder sets the type
-   field to siBuffer. */
-
-extern SECStatus SEC_ASN1DecodeItem(PLArenaPool *pool, void *dest,
-                                    const SEC_ASN1Template *t,
-                                    const SECItem *src);
-
-extern SECStatus SEC_QuickDERDecodeItem(PLArenaPool *arena, void *dest,
-                                        const SEC_ASN1Template *templateEntry,
-                                        const SECItem *src);
-
-/*
-** Encoding.
-*/
-
-extern SEC_ASN1EncoderContext *SEC_ASN1EncoderStart(const void *src,
-                                                    const SEC_ASN1Template *t,
-                                                    SEC_ASN1WriteProc fn,
-                                                    void *output_arg);
-
-/* XXX char or unsigned char? */
-extern SECStatus SEC_ASN1EncoderUpdate(SEC_ASN1EncoderContext *cx,
-                                       const char *buf,
-                                       unsigned long len);
-
-extern void SEC_ASN1EncoderFinish(SEC_ASN1EncoderContext *cx);
-
-/* Higher level code detected an error, abort the rest of the processing */
-extern void SEC_ASN1EncoderAbort(SEC_ASN1EncoderContext *cx, int error);
-
-extern void SEC_ASN1EncoderSetNotifyProc(SEC_ASN1EncoderContext *cx,
-                                         SEC_ASN1NotifyProc fn,
-                                         void *arg);
-
-extern void SEC_ASN1EncoderClearNotifyProc(SEC_ASN1EncoderContext *cx);
-
-extern void SEC_ASN1EncoderSetStreaming(SEC_ASN1EncoderContext *cx);
-
-extern void SEC_ASN1EncoderClearStreaming(SEC_ASN1EncoderContext *cx);
-
-extern void sec_ASN1EncoderSetDER(SEC_ASN1EncoderContext *cx);
-
-extern void sec_ASN1EncoderClearDER(SEC_ASN1EncoderContext *cx);
-
-extern void SEC_ASN1EncoderSetTakeFromBuf(SEC_ASN1EncoderContext *cx);
-
-extern void SEC_ASN1EncoderClearTakeFromBuf(SEC_ASN1EncoderContext *cx);
-
-extern SECStatus SEC_ASN1Encode(const void *src, const SEC_ASN1Template *t,
-                                SEC_ASN1WriteProc output_proc,
-                                void *output_arg);
-
-/*
- * If both pool and dest are NULL, the caller should free the returned SECItem
- * with a SECITEM_FreeItem(..., PR_TRUE) call.  If pool is NULL but dest is
- * not NULL, the caller should free the data buffer pointed to by dest with a
- * SECITEM_FreeItem(dest, PR_FALSE) or PORT_Free(dest->data) call.
- */
-extern SECItem *SEC_ASN1EncodeItem(PLArenaPool *pool, SECItem *dest,
-                                   const void *src, const SEC_ASN1Template *t);
-
-extern SECItem *SEC_ASN1EncodeInteger(PLArenaPool *pool,
-                                      SECItem *dest, long value);
-
-extern SECItem *SEC_ASN1EncodeUnsignedInteger(PLArenaPool *pool,
-                                              SECItem *dest,
-                                              unsigned long value);
-
-extern SECStatus SEC_ASN1DecodeInteger(SECItem *src,
-                                       unsigned long *value);
-
-/*
-** Utilities.
-*/
-
-/*
- * We have a length that needs to be encoded; how many bytes will the
- * encoding take?
- */
-extern int SEC_ASN1LengthLength(unsigned long len);
-
-/* encode the length and return the number of bytes we encoded. Buffer
- * must be pre allocated  */
-extern int SEC_ASN1EncodeLength(unsigned char *buf, int value);
-
-/*
- * Find the appropriate subtemplate for the given template.
- * This may involve calling a "chooser" function, or it may just
- * be right there.  In either case, it is expected to *have* a
- * subtemplate; this is asserted in debug builds (in non-debug
- * builds, NULL will be returned).
- *
- * "thing" is a pointer to the structure being encoded/decoded
- * "encoding", when true, means that we are in the process of encoding
- *  (as opposed to in the process of decoding)
- */
-extern const SEC_ASN1Template *
-SEC_ASN1GetSubtemplate(const SEC_ASN1Template *inTemplate, void *thing,
-                       PRBool encoding);
-
-/* whether the template is for a primitive type or a choice of
- * primitive types
- */
-extern PRBool SEC_ASN1IsTemplateSimple(const SEC_ASN1Template *theTemplate);
-
-/************************************************************************/
-
-/*
- * Generic Templates
- * One for each of the simple types, plus a special one for ANY, plus:
- *  - a pointer to each one of those
- *  - a set of each one of those
- *  - a sequence of each one of those
- *
- * Note that these are alphabetical (case insensitive); please add new
- * ones in the appropriate place.
- */
-
-extern const SEC_ASN1Template SEC_AnyTemplate[];
-extern const SEC_ASN1Template SEC_BitStringTemplate[];
-extern const SEC_ASN1Template SEC_BMPStringTemplate[];
-extern const SEC_ASN1Template SEC_BooleanTemplate[];
-extern const SEC_ASN1Template SEC_EnumeratedTemplate[];
-extern const SEC_ASN1Template SEC_GeneralizedTimeTemplate[];
-extern const SEC_ASN1Template SEC_IA5StringTemplate[];
-extern const SEC_ASN1Template SEC_IntegerTemplate[];
-extern const SEC_ASN1Template SEC_NullTemplate[];
-extern const SEC_ASN1Template SEC_ObjectIDTemplate[];
-extern const SEC_ASN1Template SEC_OctetStringTemplate[];
-extern const SEC_ASN1Template SEC_PrintableStringTemplate[];
-extern const SEC_ASN1Template SEC_T61StringTemplate[];
-extern const SEC_ASN1Template SEC_UniversalStringTemplate[];
-extern const SEC_ASN1Template SEC_UTCTimeTemplate[];
-extern const SEC_ASN1Template SEC_UTF8StringTemplate[];
-extern const SEC_ASN1Template SEC_VisibleStringTemplate[];
-
-extern const SEC_ASN1Template SEC_PointerToAnyTemplate[];
-extern const SEC_ASN1Template SEC_PointerToBitStringTemplate[];
-extern const SEC_ASN1Template SEC_PointerToBMPStringTemplate[];
-extern const SEC_ASN1Template SEC_PointerToBooleanTemplate[];
-extern const SEC_ASN1Template SEC_PointerToEnumeratedTemplate[];
-extern const SEC_ASN1Template SEC_PointerToGeneralizedTimeTemplate[];
-extern const SEC_ASN1Template SEC_PointerToIA5StringTemplate[];
-extern const SEC_ASN1Template SEC_PointerToIntegerTemplate[];
-extern const SEC_ASN1Template SEC_PointerToNullTemplate[];
-extern const SEC_ASN1Template SEC_PointerToObjectIDTemplate[];
-extern const SEC_ASN1Template SEC_PointerToOctetStringTemplate[];
-extern const SEC_ASN1Template SEC_PointerToPrintableStringTemplate[];
-extern const SEC_ASN1Template SEC_PointerToT61StringTemplate[];
-extern const SEC_ASN1Template SEC_PointerToUniversalStringTemplate[];
-extern const SEC_ASN1Template SEC_PointerToUTCTimeTemplate[];
-extern const SEC_ASN1Template SEC_PointerToUTF8StringTemplate[];
-extern const SEC_ASN1Template SEC_PointerToVisibleStringTemplate[];
-
-extern const SEC_ASN1Template SEC_SequenceOfAnyTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfBitStringTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfBMPStringTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfBooleanTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfEnumeratedTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfGeneralizedTimeTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfIA5StringTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfIntegerTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfNullTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfObjectIDTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfOctetStringTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfPrintableStringTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfT61StringTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfUniversalStringTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfUTCTimeTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfUTF8StringTemplate[];
-extern const SEC_ASN1Template SEC_SequenceOfVisibleStringTemplate[];
-
-extern const SEC_ASN1Template SEC_SetOfAnyTemplate[];
-extern const SEC_ASN1Template SEC_SetOfBitStringTemplate[];
-extern const SEC_ASN1Template SEC_SetOfBMPStringTemplate[];
-extern const SEC_ASN1Template SEC_SetOfBooleanTemplate[];
-extern const SEC_ASN1Template SEC_SetOfEnumeratedTemplate[];
-extern const SEC_ASN1Template SEC_SetOfGeneralizedTimeTemplate[];
-extern const SEC_ASN1Template SEC_SetOfIA5StringTemplate[];
-extern const SEC_ASN1Template SEC_SetOfIntegerTemplate[];
-extern const SEC_ASN1Template SEC_SetOfNullTemplate[];
-extern const SEC_ASN1Template SEC_SetOfObjectIDTemplate[];
-extern const SEC_ASN1Template SEC_SetOfOctetStringTemplate[];
-extern const SEC_ASN1Template SEC_SetOfPrintableStringTemplate[];
-extern const SEC_ASN1Template SEC_SetOfT61StringTemplate[];
-extern const SEC_ASN1Template SEC_SetOfUniversalStringTemplate[];
-extern const SEC_ASN1Template SEC_SetOfUTCTimeTemplate[];
-extern const SEC_ASN1Template SEC_SetOfUTF8StringTemplate[];
-extern const SEC_ASN1Template SEC_SetOfVisibleStringTemplate[];
-
-/*
- * Template for skipping a subitem; this only makes sense when decoding.
- */
-extern const SEC_ASN1Template SEC_SkipTemplate[];
-
-/* These functions simply return the address of the above-declared templates.
-** This is necessary for Windows DLLs.  Sigh.
-*/
-SEC_ASN1_CHOOSER_DECLARE(SEC_AnyTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_BMPStringTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_BooleanTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_BitStringTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_GeneralizedTimeTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_IA5StringTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_IntegerTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_NullTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_ObjectIDTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_OctetStringTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_UTCTimeTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_UTF8StringTemplate)
-
-SEC_ASN1_CHOOSER_DECLARE(SEC_PointerToAnyTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_PointerToOctetStringTemplate)
-
-SEC_ASN1_CHOOSER_DECLARE(SEC_SetOfAnyTemplate)
-
-SEC_ASN1_CHOOSER_DECLARE(SEC_EnumeratedTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_PointerToEnumeratedTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_SequenceOfAnyTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_SequenceOfObjectIDTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_SkipTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_UniversalStringTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_PrintableStringTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_T61StringTemplate)
-SEC_ASN1_CHOOSER_DECLARE(SEC_PointerToGeneralizedTimeTemplate)
-SEC_END_PROTOS
-#endif /* _SECASN1_H_ */
diff --git a/openflow/usr/include/nss/secasn1t.h b/openflow/usr/include/nss/secasn1t.h
deleted file mode 100644
index 0d1a6ae..0000000
--- a/openflow/usr/include/nss/secasn1t.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Types for encoding/decoding of ASN.1 using BER/DER (Basic/Distinguished
- * Encoding Rules).
- */
-
-#ifndef _SECASN1T_H_
-#define _SECASN1T_H_
-
-#include "utilrename.h"
-
-/*
-** An array of these structures defines a BER/DER encoding for an object.
-**
-** The array usually starts with a dummy entry whose kind is SEC_ASN1_SEQUENCE;
-** such an array is terminated with an entry where kind == 0.  (An array
-** which consists of a single component does not require a second dummy
-** entry -- the array is only searched as long as previous component(s)
-** instruct it.)
-*/
-typedef struct sec_ASN1Template_struct {
-    /*
-    ** Kind of item being decoded/encoded, including tags and modifiers.
-    */
-    unsigned long kind;
-
-    /*
-    ** The value is the offset from the base of the structure to the
-    ** field that holds the value being decoded/encoded.
-    */
-    unsigned long offset;
-
-    /*
-    ** When kind suggests it (SEC_ASN1_POINTER, SEC_ASN1_GROUP, SEC_ASN1_INLINE,
-    ** or a component that is *not* a SEC_ASN1_UNIVERSAL), this points to
-    ** a sub-template for nested encoding/decoding,
-    ** OR, iff SEC_ASN1_DYNAMIC is set, then this is a pointer to a pointer
-    ** to a function which will return the appropriate template when called
-    ** at runtime.  NOTE! that explicit level of indirection, which is
-    ** necessary because ANSI does not allow you to store a function
-    ** pointer directly as a "void *" so we must store it separately and
-    ** dereference it to get at the function pointer itself.
-    */
-    const void *sub;
-
-    /*
-    ** In the first element of a template array, the value is the size
-    ** of the structure to allocate when this template is being referenced
-    ** by another template via SEC_ASN1_POINTER or SEC_ASN1_GROUP.
-    ** In all other cases, the value is ignored.
-    */
-    unsigned int size;
-} SEC_ASN1Template;
-
-/* default size used for allocation of encoding/decoding stuff */
-/* XXX what is the best value here? */
-#define SEC_ASN1_DEFAULT_ARENA_SIZE (2048)
-
-/*
-** BER/DER values for ASN.1 identifier octets.
-*/
-#define SEC_ASN1_TAG_MASK 0xff
-
-/*
- * BER/DER universal type tag numbers.
- * The values are defined by the X.208 standard; do not change them!
- * NOTE: if you add anything to this list, you must add code to secasn1d.c
- * to accept the tag, and probably also to secasn1e.c to encode it.
- * XXX It appears some have been added recently without being added to
- * the code; so need to go through the list now and double-check them all.
- * (Look especially at those added in revision 1.10.)
- */
-#define SEC_ASN1_TAGNUM_MASK 0x1f
-#define SEC_ASN1_BOOLEAN 0x01
-#define SEC_ASN1_INTEGER 0x02
-#define SEC_ASN1_BIT_STRING 0x03
-#define SEC_ASN1_OCTET_STRING 0x04
-#define SEC_ASN1_NULL 0x05
-#define SEC_ASN1_OBJECT_ID 0x06
-#define SEC_ASN1_OBJECT_DESCRIPTOR 0x07
-/* External type and instance-of type   0x08 */
-#define SEC_ASN1_REAL 0x09
-#define SEC_ASN1_ENUMERATED 0x0a
-#define SEC_ASN1_EMBEDDED_PDV 0x0b
-#define SEC_ASN1_UTF8_STRING 0x0c
-/*                                      0x0d */
-/*                                      0x0e */
-/*                                      0x0f */
-#define SEC_ASN1_SEQUENCE 0x10
-#define SEC_ASN1_SET 0x11
-#define SEC_ASN1_NUMERIC_STRING 0x12
-#define SEC_ASN1_PRINTABLE_STRING 0x13
-#define SEC_ASN1_T61_STRING 0x14
-#define SEC_ASN1_VIDEOTEX_STRING 0x15
-#define SEC_ASN1_IA5_STRING 0x16
-#define SEC_ASN1_UTC_TIME 0x17
-#define SEC_ASN1_GENERALIZED_TIME 0x18
-#define SEC_ASN1_GRAPHIC_STRING 0x19
-#define SEC_ASN1_VISIBLE_STRING 0x1a
-#define SEC_ASN1_GENERAL_STRING 0x1b
-#define SEC_ASN1_UNIVERSAL_STRING 0x1c
-/*                                      0x1d */
-#define SEC_ASN1_BMP_STRING 0x1e
-#define SEC_ASN1_HIGH_TAG_NUMBER 0x1f
-#define SEC_ASN1_TELETEX_STRING SEC_ASN1_T61_STRING
-
-/*
-** Modifiers to type tags.  These are also specified by a/the
-** standard, and must not be changed.
-*/
-
-#define SEC_ASN1_METHOD_MASK 0x20
-#define SEC_ASN1_PRIMITIVE 0x00
-#define SEC_ASN1_CONSTRUCTED 0x20
-
-#define SEC_ASN1_CLASS_MASK 0xc0
-#define SEC_ASN1_UNIVERSAL 0x00
-#define SEC_ASN1_APPLICATION 0x40
-#define SEC_ASN1_CONTEXT_SPECIFIC 0x80
-#define SEC_ASN1_PRIVATE 0xc0
-
-/*
-** Our additions, used for templates.
-** These are not defined by any standard; the values are used internally only.
-** Just be careful to keep them out of the low 8 bits.
-** XXX finish comments
-*/
-#define SEC_ASN1_OPTIONAL 0x00100
-#define SEC_ASN1_EXPLICIT 0x00200
-#define SEC_ASN1_ANY 0x00400
-#define SEC_ASN1_INLINE 0x00800
-#define SEC_ASN1_POINTER 0x01000
-#define SEC_ASN1_GROUP 0x02000        /* with SET or SEQUENCE means \
-                                       * SET OF or SEQUENCE OF */
-#define SEC_ASN1_DYNAMIC 0x04000      /* subtemplate is found by calling \
-                                       * a function at runtime */
-#define SEC_ASN1_SKIP 0x08000         /* skip a field; only for decoding */
-#define SEC_ASN1_INNER 0x10000        /* with ANY means capture the      \
-                                       * contents only (not the id, len, \
-                                       * or eoc); only for decoding */
-#define SEC_ASN1_SAVE 0x20000         /* stash away the encoded bytes first; \
-                                       * only for decoding */
-#define SEC_ASN1_MAY_STREAM 0x40000   /* field or one of its sub-fields may \
-                                       * stream in and so should encode as  \
-                                       * indefinite-length when streaming   \
-                                       * has been indicated; only for       \
-                                       * encoding */
-#define SEC_ASN1_SKIP_REST 0x80000    /* skip all following fields; \
-                                         only for decoding */
-#define SEC_ASN1_CHOICE 0x100000      /* pick one from a template */
-#define SEC_ASN1_NO_STREAM 0X200000   /* This entry will not stream          \
-                                         even if the sub-template says       \
-                                         streaming is possible.  Helps       \
-                                         to solve ambiguities with potential \
-                                         streaming entries that are          \
-                                         optional */
-#define SEC_ASN1_DEBUG_BREAK 0X400000 /* put this in your template and the \
-                                         decoder will assert when it       \
-                                         processes it. Only for use with   \
-                                         SEC_QuickDERDecodeItem */
-
-/* Shorthand/Aliases */
-#define SEC_ASN1_SEQUENCE_OF (SEC_ASN1_GROUP | SEC_ASN1_SEQUENCE)
-#define SEC_ASN1_SET_OF (SEC_ASN1_GROUP | SEC_ASN1_SET)
-#define SEC_ASN1_ANY_CONTENTS (SEC_ASN1_ANY | SEC_ASN1_INNER)
-
-/* Maximum depth of nested SEQUENCEs and SETs */
-#define SEC_ASN1D_MAX_DEPTH 32
-
-/*
-** Function used for SEC_ASN1_DYNAMIC.
-** "arg" is a pointer to the structure being encoded/decoded
-** "enc", when true, means that we are encoding (false means decoding)
-*/
-typedef const SEC_ASN1Template *SEC_ASN1TemplateChooser(void *arg, PRBool enc);
-typedef SEC_ASN1TemplateChooser *SEC_ASN1TemplateChooserPtr;
-
-#if defined(_WIN32) || defined(ANDROID)
-#define SEC_ASN1_GET(x) NSS_Get_##x(NULL, PR_FALSE)
-#define SEC_ASN1_SUB(x) &p_NSS_Get_##x
-#define SEC_ASN1_XTRN SEC_ASN1_DYNAMIC
-#define SEC_ASN1_MKSUB(x) \
-    static const SEC_ASN1TemplateChooserPtr p_NSS_Get_##x = &NSS_Get_##x;
-#else
-#define SEC_ASN1_GET(x) x
-#define SEC_ASN1_SUB(x) x
-#define SEC_ASN1_XTRN 0
-#define SEC_ASN1_MKSUB(x)
-#endif
-
-#define SEC_ASN1_CHOOSER_DECLARE(x) \
-    extern const SEC_ASN1Template *NSS_Get_##x(void *arg, PRBool enc);
-
-#define SEC_ASN1_CHOOSER_IMPLEMENT(x)                          \
-    const SEC_ASN1Template *NSS_Get_##x(void *arg, PRBool enc) \
-    {                                                          \
-        return x;                                              \
-    }
-
-/*
-** Opaque object used by the decoder to store state.
-*/
-typedef struct sec_DecoderContext_struct SEC_ASN1DecoderContext;
-
-/*
-** Opaque object used by the encoder to store state.
-*/
-typedef struct sec_EncoderContext_struct SEC_ASN1EncoderContext;
-
-/*
- * This is used to describe to a filter function the bytes that are
- * being passed to it.  This is only useful when the filter is an "outer"
- * one, meaning it expects to get *all* of the bytes not just the
- * contents octets.
- */
-typedef enum {
-    SEC_ASN1_Identifier = 0,
-    SEC_ASN1_Length = 1,
-    SEC_ASN1_Contents = 2,
-    SEC_ASN1_EndOfContents = 3
-} SEC_ASN1EncodingPart;
-
-/*
- * Type of the function pointer used either for decoding or encoding,
- * when doing anything "funny" (e.g. manipulating the data stream)
- */
-typedef void (*SEC_ASN1NotifyProc)(void *arg, PRBool before,
-                                   void *dest, int real_depth);
-
-/*
- * Type of the function pointer used for grabbing encoded bytes.
- * This can be used during either encoding or decoding, as follows...
- *
- * When decoding, this can be used to filter the encoded bytes as they
- * are parsed.  This is what you would do if you wanted to process the data
- * along the way (like to decrypt it, or to perform a hash on it in order
- * to do a signature check later).  See SEC_ASN1DecoderSetFilterProc().
- * When processing only part of the encoded bytes is desired, you "watch"
- * for the field(s) you are interested in with a "notify proc" (see
- * SEC_ASN1DecoderSetNotifyProc()) and for even finer granularity (e.g. to
- * ignore all by the contents bytes) you pay attention to the "data_kind"
- * parameter.
- *
- * When encoding, this is the specification for the output function which
- * will receive the bytes as they are encoded.  The output function can
- * perform any postprocessing necessary (like hashing (some of) the data
- * to create a digest that gets included at the end) as well as shoving
- * the data off wherever it needs to go.  (In order to "tune" any processing,
- * you can set a "notify proc" as described above in the decoding case.)
- *
- * The parameters:
- * - "arg" is an opaque pointer that you provided at the same time you
- *   specified a function of this type
- * - "data" is a buffer of length "len", containing the encoded bytes
- * - "depth" is how deep in a nested encoding we are (it is not usually
- *   valuable, but can be useful sometimes so I included it)
- * - "data_kind" tells you if these bytes are part of the ASN.1 encoded
- *   octets for identifier, length, contents, or end-of-contents
- */
-typedef void (*SEC_ASN1WriteProc)(void *arg,
-                                  const char *data, unsigned long len,
-                                  int depth, SEC_ASN1EncodingPart data_kind);
-
-#endif /* _SECASN1T_H_ */
diff --git a/openflow/usr/include/nss/seccomon.h b/openflow/usr/include/nss/seccomon.h
deleted file mode 100644
index edd5c53..0000000
--- a/openflow/usr/include/nss/seccomon.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * seccomon.h - common data structures for security libraries
- *
- * This file should have lowest-common-denominator datastructures
- * for security libraries.  It should not be dependent on any other
- * headers, and should not require linking with any libraries.
- */
-
-#ifndef _SECCOMMON_H_
-#define _SECCOMMON_H_
-
-#include "utilrename.h"
-#include "prtypes.h"
-
-#ifdef __cplusplus
-#define SEC_BEGIN_PROTOS extern "C" {
-#define SEC_END_PROTOS }
-#else
-#define SEC_BEGIN_PROTOS
-#define SEC_END_PROTOS
-#endif
-
-#include "secport.h"
-
-typedef enum {
-    siBuffer = 0,
-    siClearDataBuffer = 1,
-    siCipherDataBuffer = 2,
-    siDERCertBuffer = 3,
-    siEncodedCertBuffer = 4,
-    siDERNameBuffer = 5,
-    siEncodedNameBuffer = 6,
-    siAsciiNameString = 7,
-    siAsciiString = 8,
-    siDEROID = 9,
-    siUnsignedInteger = 10,
-    siUTCTime = 11,
-    siGeneralizedTime = 12,
-    siVisibleString = 13,
-    siUTF8String = 14,
-    siBMPString = 15
-} SECItemType;
-
-typedef struct SECItemStr SECItem;
-
-struct SECItemStr {
-    SECItemType type;
-    unsigned char *data;
-    unsigned int len;
-};
-
-typedef struct SECItemArrayStr SECItemArray;
-
-struct SECItemArrayStr {
-    SECItem *items;
-    unsigned int len;
-};
-
-/*
-** A status code. Status's are used by procedures that return status
-** values. Again the motivation is so that a compiler can generate
-** warnings when return values are wrong. Correct testing of status codes:
-**
-**  SECStatus rv;
-**  rv = some_function (some_argument);
-**  if (rv != SECSuccess)
-**      do_an_error_thing();
-**
-*/
-typedef enum _SECStatus {
-    SECWouldBlock = -2,
-    SECFailure = -1,
-    SECSuccess = 0
-} SECStatus;
-
-/*
-** A comparison code. Used for procedures that return comparision
-** values. Again the motivation is so that a compiler can generate
-** warnings when return values are wrong.
-*/
-typedef enum _SECComparison {
-    SECLessThan = -1,
-    SECEqual = 0,
-    SECGreaterThan = 1
-} SECComparison;
-
-#endif /* _SECCOMMON_H_ */
diff --git a/openflow/usr/include/nss/secder.h b/openflow/usr/include/nss/secder.h
deleted file mode 100644
index dbc3580..0000000
--- a/openflow/usr/include/nss/secder.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _SECDER_H_
-#define _SECDER_H_
-
-#include "utilrename.h"
-
-/*
- * secder.h - public data structures and prototypes for the DER encoding and
- *        decoding utilities library
- */
-
-#include <time.h>
-
-#include "plarena.h"
-#include "prlong.h"
-
-#include "seccomon.h"
-#include "secdert.h"
-#include "prtime.h"
-
-SEC_BEGIN_PROTOS
-
-/*
-** Encode a data structure into DER.
-**  "dest" will be filled in (and memory allocated) to hold the der
-**     encoded structure in "src"
-**  "t" is a template structure which defines the shape of the
-**     stored data
-**  "src" is a pointer to the structure that will be encoded
-*/
-extern SECStatus DER_Encode(PLArenaPool *arena, SECItem *dest, DERTemplate *t,
-                            void *src);
-
-extern SECStatus DER_Lengths(SECItem *item, int *header_len_p,
-                             PRUint32 *contents_len_p);
-
-/*
-** Lower level der subroutine that stores the standard header into "to".
-** The header is of variable length, based on encodingLen.
-** The return value is the new value of "to" after skipping over the header.
-**  "to" is where the header will be stored
-**  "code" is the der code to write
-**  "encodingLen" is the number of bytes of data that will follow
-**     the header
-*/
-extern unsigned char *DER_StoreHeader(unsigned char *to, unsigned int code,
-                                      PRUint32 encodingLen);
-
-/*
-** Return the number of bytes it will take to hold a der encoded length.
-*/
-extern int DER_LengthLength(PRUint32 len);
-
-/*
-** Store a der encoded *signed* integer (whose value is "src") into "dst".
-** XXX This should really be enhanced to take a long.
-*/
-extern SECStatus DER_SetInteger(PLArenaPool *arena, SECItem *dst, PRInt32 src);
-
-/*
-** Store a der encoded *unsigned* integer (whose value is "src") into "dst".
-** XXX This should really be enhanced to take an unsigned long.
-*/
-extern SECStatus DER_SetUInteger(PLArenaPool *arena, SECItem *dst, PRUint32 src);
-
-/*
-** Decode a der encoded *signed* integer that is stored in "src".
-** If "-1" is returned, then the caller should check the error in
-** XP_GetError() to see if an overflow occurred (SEC_ERROR_BAD_DER).
-*/
-extern long DER_GetInteger(const SECItem *src);
-
-/*
-** Decode a der encoded *unsigned* integer that is stored in "src".
-** If the ULONG_MAX is returned, then the caller should check the error
-** in XP_GetError() to see if an overflow occurred (SEC_ERROR_BAD_DER).
-*/
-extern unsigned long DER_GetUInteger(SECItem *src);
-
-/*
-** Convert an NSPR time value to a der encoded time value.
-**  "result" is the der encoded time (memory is allocated)
-**  "time" is the NSPR time value (Since Jan 1st, 1970).
-**      time must be on or after January 1, 1950, and
-**      before January 1, 2050
-** The caller is responsible for freeing up the buffer which
-** result->data points to upon a successful operation.
-*/
-extern SECStatus DER_TimeToUTCTime(SECItem *result, PRTime time);
-extern SECStatus DER_TimeToUTCTimeArena(PLArenaPool *arenaOpt,
-                                        SECItem *dst, PRTime gmttime);
-
-/*
-** Convert an ascii encoded time value (according to DER rules) into
-** an NSPR time value.
-**  "result" the resulting NSPR time
-**  "string" the der notation ascii value to decode
-*/
-extern SECStatus DER_AsciiToTime(PRTime *result, const char *string);
-
-/*
-** Same as DER_AsciiToTime except takes an SECItem instead of a string
-*/
-extern SECStatus DER_UTCTimeToTime(PRTime *result, const SECItem *time);
-
-/*
-** Convert a DER encoded UTC time to an ascii time representation
-** "utctime" is the DER encoded UTC time to be converted. The
-** caller is responsible for deallocating the returned buffer.
-*/
-extern char *DER_UTCTimeToAscii(SECItem *utcTime);
-
-/*
-** Convert a DER encoded UTC time to an ascii time representation, but only
-** include the day, not the time.
-**  "utctime" is the DER encoded UTC time to be converted.
-** The caller is responsible for deallocating the returned buffer.
-*/
-extern char *DER_UTCDayToAscii(SECItem *utctime);
-/* same thing for DER encoded GeneralizedTime */
-extern char *DER_GeneralizedDayToAscii(SECItem *gentime);
-/* same thing for either DER UTCTime or GeneralizedTime */
-extern char *DER_TimeChoiceDayToAscii(SECItem *timechoice);
-
-/*
-** Convert a PRTime to a DER encoded Generalized time
-** gmttime must be on or after January 1, year 1 and
-** before January 1, 10000.
-*/
-extern SECStatus DER_TimeToGeneralizedTime(SECItem *dst, PRTime gmttime);
-extern SECStatus DER_TimeToGeneralizedTimeArena(PLArenaPool *arenaOpt,
-                                                SECItem *dst, PRTime gmttime);
-
-/*
-** Convert a DER encoded Generalized time value into an NSPR time value.
-**  "dst" the resulting NSPR time
-**  "string" the der notation ascii value to decode
-*/
-extern SECStatus DER_GeneralizedTimeToTime(PRTime *dst, const SECItem *time);
-
-/*
-** Convert from a PRTime UTC time value to a formatted ascii value. The
-** caller is responsible for deallocating the returned buffer.
-*/
-extern char *CERT_UTCTime2FormattedAscii(PRTime utcTime, char *format);
-#define CERT_GeneralizedTime2FormattedAscii CERT_UTCTime2FormattedAscii
-
-/*
-** Convert from a PRTime Generalized time value to a formatted ascii value. The
-** caller is responsible for deallocating the returned buffer.
-*/
-extern char *CERT_GenTime2FormattedAscii(PRTime genTime, char *format);
-
-/*
-** decode a SECItem containing either a SEC_ASN1_GENERALIZED_TIME
-** or a SEC_ASN1_UTC_TIME
-*/
-
-extern SECStatus DER_DecodeTimeChoice(PRTime *output, const SECItem *input);
-
-/* encode a PRTime to an ASN.1 DER SECItem containing either a
-   SEC_ASN1_GENERALIZED_TIME or a SEC_ASN1_UTC_TIME */
-
-extern SECStatus DER_EncodeTimeChoice(PLArenaPool *arena, SECItem *output,
-                                      PRTime input);
-
-SEC_END_PROTOS
-
-#endif /* _SECDER_H_ */
diff --git a/openflow/usr/include/nss/secdert.h b/openflow/usr/include/nss/secdert.h
deleted file mode 100644
index de67eaf..0000000
--- a/openflow/usr/include/nss/secdert.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _SECDERT_H_
-#define _SECDERT_H_
-/*
- * secdert.h - public data structures for the DER encoding and
- *             decoding utilities library
- */
-
-#include "utilrename.h"
-#include "seccomon.h"
-
-typedef struct DERTemplateStr DERTemplate;
-
-/*
-** An array of these structures defines an encoding for an object using DER.
-** The array usually starts with a dummy entry whose kind is DER_SEQUENCE;
-** such an array is terminated with an entry where kind == 0.  (An array
-** which consists of a single component does not require a second dummy
-** entry -- the array is only searched as long as previous component(s)
-** instruct it.)
-*/
-struct DERTemplateStr {
-    /*
-    ** Kind of item being decoded/encoded, including tags and modifiers.
-    */
-    unsigned long kind;
-
-    /*
-    ** Offset from base of structure to field that holds the value
-    ** being decoded/encoded.
-    */
-    unsigned int offset;
-
-    /*
-    ** When kind suggests it (DER_POINTER, DER_INDEFINITE, DER_INLINE),
-    ** this points to a sub-template for nested encoding/decoding.
-    */
-    DERTemplate *sub;
-
-    /*
-    ** Argument value, dependent on "kind" and/or template placement
-    ** within an array of templates:
-    **  - In the first element of a template array, the value is the
-    **    size of the structure to allocate when this template is being
-    **    referenced by another template via DER_POINTER or DER_INDEFINITE.
-    **  - In a component of a DER_SET or DER_SEQUENCE which is *not* a
-    **    DER_UNIVERSAL type (that is, it has a class tag for either
-    **    DER_APPLICATION, DER_CONTEXT_SPECIFIC, or DER_PRIVATE), the
-    **    value is the underlying type of item being decoded/encoded.
-    */
-    unsigned long arg;
-};
-
-/************************************************************************/
-
-/* default chunksize for arenas used for DER stuff */
-#define DER_DEFAULT_CHUNKSIZE (2048)
-
-/*
-** BER/DER values for ASN.1 identifier octets.
-*/
-#define DER_TAG_MASK 0xff
-
-/*
- * BER/DER universal type tag numbers.
- * The values are defined by the X.208 standard; do not change them!
- * NOTE: if you add anything to this list, you must add code to derdec.c
- * to accept the tag, and probably also to derenc.c to encode it.
- */
-#define DER_TAGNUM_MASK 0x1f
-#define DER_BOOLEAN 0x01
-#define DER_INTEGER 0x02
-#define DER_BIT_STRING 0x03
-#define DER_OCTET_STRING 0x04
-#define DER_NULL 0x05
-#define DER_OBJECT_ID 0x06
-#define DER_SEQUENCE 0x10
-#define DER_SET 0x11
-#define DER_PRINTABLE_STRING 0x13
-#define DER_T61_STRING 0x14
-#define DER_IA5_STRING 0x16
-#define DER_UTC_TIME 0x17
-#define DER_VISIBLE_STRING 0x1a
-#define DER_HIGH_TAG_NUMBER 0x1f
-
-/*
-** Modifiers to type tags.  These are also specified by a/the
-** standard, and must not be changed.
-*/
-
-#define DER_METHOD_MASK 0x20
-#define DER_PRIMITIVE 0x00
-#define DER_CONSTRUCTED 0x20
-
-#define DER_CLASS_MASK 0xc0
-#define DER_UNIVERSAL 0x00
-#define DER_APPLICATION 0x40
-#define DER_CONTEXT_SPECIFIC 0x80
-#define DER_PRIVATE 0xc0
-
-/*
-** Our additions, used for templates.
-** These are not defined by any standard; the values are used internally only.
-** Just be careful to keep them out of the low 8 bits.
-*/
-#define DER_OPTIONAL 0x00100
-#define DER_EXPLICIT 0x00200
-#define DER_ANY 0x00400
-#define DER_INLINE 0x00800
-#define DER_POINTER 0x01000
-#define DER_INDEFINITE 0x02000
-#define DER_DERPTR 0x04000
-#define DER_SKIP 0x08000
-#define DER_FORCE 0x10000
-#define DER_OUTER 0x40000 /* for DER_DERPTR */
-
-/*
-** Macro to convert der decoded bit string into a decoded octet
-** string. All it needs to do is fiddle with the length code.
-*/
-#define DER_ConvertBitString(item)            \
-    {                                         \
-        (item)->len = ((item)->len + 7) >> 3; \
-    }
-
-#endif /* _SECDERT_H_ */
diff --git a/openflow/usr/include/nss/secdig.h b/openflow/usr/include/nss/secdig.h
deleted file mode 100644
index 1531bf1..0000000
--- a/openflow/usr/include/nss/secdig.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * secdig.h - public prototypes for digest-info functions
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _SECDIG_H_
-#define _SECDIG_H_
-
-#include "utilrename.h"
-#include "secdigt.h"
-
-#include "seccomon.h"
-#include "secasn1t.h"
-#include "secdert.h"
-
-SEC_BEGIN_PROTOS
-
-extern const SEC_ASN1Template sgn_DigestInfoTemplate[];
-
-SEC_ASN1_CHOOSER_DECLARE(sgn_DigestInfoTemplate)
-
-/****************************************/
-/*
-** Digest-info functions
-*/
-
-/*
-** Create a new digest-info object
-**  "algorithm" one of SEC_OID_MD2, SEC_OID_MD5, or SEC_OID_SHA1
-**  "sig" the raw signature data (from MD2 or MD5)
-**  "sigLen" the length of the signature data
-**
-** NOTE: this is a low level routine used to prepare some data for PKCS#1
-** digital signature formatting.
-**
-** XXX It might be nice to combine the create and encode functions.
-** I think that is all anybody ever wants to do anyway.
-*/
-extern SGNDigestInfo *SGN_CreateDigestInfo(SECOidTag algorithm,
-                                           const unsigned char *sig,
-                                           unsigned int sigLen);
-
-/*
-** Destroy a digest-info object
-*/
-extern void SGN_DestroyDigestInfo(SGNDigestInfo *info);
-
-/*
-** Encode a digest-info object
-**  "poolp" is where to allocate the result from; it can be NULL in
-**      which case generic heap allocation (XP_ALLOC) will be used
-**  "dest" is where to store the result; it can be NULL, in which case
-**      it will be allocated (from poolp or heap, as explained above)
-**  "diginfo" is the object to be encoded
-** The return value is NULL if any error occurred, otherwise it is the
-** resulting SECItem (either allocated or the same as the "dest" parameter).
-**
-** XXX It might be nice to combine the create and encode functions.
-** I think that is all anybody ever wants to do anyway.
-*/
-extern SECItem *SGN_EncodeDigestInfo(PLArenaPool *poolp, SECItem *dest,
-                                     SGNDigestInfo *diginfo);
-
-/*
-** Decode a DER encoded digest info objct.
-**  didata is thr source of the encoded digest.
-** The return value is NULL if an error occurs.  Otherwise, a
-** digest info object which is allocated within it's own
-** pool is returned.  The digest info should be deleted
-** by later calling SGN_DestroyDigestInfo.
-*/
-extern SGNDigestInfo *SGN_DecodeDigestInfo(SECItem *didata);
-
-/*
-** Copy digest info.
-**  poolp is the arena to which the digest will be copied.
-**  a is the destination digest, it must be non-NULL.
-**  b is the source digest
-** This function is for copying digests.  It allows digests
-** to be copied into a specified pool.  If the digest is in
-** the same pool as other data, you do not want to delete
-** the digest by calling SGN_DestroyDigestInfo.
-** A return value of SECFailure indicates an error.  A return
-** of SECSuccess indicates no error occurred.
-*/
-extern SECStatus SGN_CopyDigestInfo(PLArenaPool *poolp,
-                                    SGNDigestInfo *a,
-                                    SGNDigestInfo *b);
-
-/*
-** Compare two digest-info objects, returning the difference between
-** them.
-*/
-extern SECComparison SGN_CompareDigestInfo(SGNDigestInfo *a, SGNDigestInfo *b);
-
-SEC_END_PROTOS
-
-#endif /* _SECDIG_H_ */
diff --git a/openflow/usr/include/nss/secdigt.h b/openflow/usr/include/nss/secdigt.h
deleted file mode 100644
index 4553434..0000000
--- a/openflow/usr/include/nss/secdigt.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * secdigt.h - public data structures for digest-info objects
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _SECDIGT_H_
-#define _SECDIGT_H_
-
-#include "utilrename.h"
-#include "plarena.h"
-#include "secoidt.h"
-#include "secitem.h"
-
-/*
-** A PKCS#1 digest-info object
-*/
-struct SGNDigestInfoStr {
-    PLArenaPool* arena;
-    SECAlgorithmID digestAlgorithm;
-    SECItem digest;
-};
-typedef struct SGNDigestInfoStr SGNDigestInfo;
-
-#endif /* _SECDIGT_H_ */
diff --git a/openflow/usr/include/nss/secerr.h b/openflow/usr/include/nss/secerr.h
deleted file mode 100644
index 4fe1d8e..0000000
--- a/openflow/usr/include/nss/secerr.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __SEC_ERR_H_
-#define __SEC_ERR_H_
-
-#include "utilrename.h"
-
-#define SEC_ERROR_BASE (-0x2000)
-#define SEC_ERROR_LIMIT (SEC_ERROR_BASE + 1000)
-
-#define IS_SEC_ERROR(code) \
-    (((code) >= SEC_ERROR_BASE) && ((code) < SEC_ERROR_LIMIT))
-
-#ifndef NO_SECURITY_ERROR_ENUM
-typedef enum {
-    SEC_ERROR_IO = SEC_ERROR_BASE + 0,
-    SEC_ERROR_LIBRARY_FAILURE = SEC_ERROR_BASE + 1,
-    SEC_ERROR_BAD_DATA = SEC_ERROR_BASE + 2,
-    SEC_ERROR_OUTPUT_LEN = SEC_ERROR_BASE + 3,
-    SEC_ERROR_INPUT_LEN = SEC_ERROR_BASE + 4,
-    SEC_ERROR_INVALID_ARGS = SEC_ERROR_BASE + 5,
-    SEC_ERROR_INVALID_ALGORITHM = SEC_ERROR_BASE + 6,
-    SEC_ERROR_INVALID_AVA = SEC_ERROR_BASE + 7,
-    SEC_ERROR_INVALID_TIME = SEC_ERROR_BASE + 8,
-    SEC_ERROR_BAD_DER = SEC_ERROR_BASE + 9,
-    SEC_ERROR_BAD_SIGNATURE = SEC_ERROR_BASE + 10,
-    SEC_ERROR_EXPIRED_CERTIFICATE = SEC_ERROR_BASE + 11,
-    SEC_ERROR_REVOKED_CERTIFICATE = SEC_ERROR_BASE + 12,
-    SEC_ERROR_UNKNOWN_ISSUER = SEC_ERROR_BASE + 13,
-    SEC_ERROR_BAD_KEY = SEC_ERROR_BASE + 14,
-    SEC_ERROR_BAD_PASSWORD = SEC_ERROR_BASE + 15,
-    SEC_ERROR_RETRY_PASSWORD = SEC_ERROR_BASE + 16,
-    SEC_ERROR_NO_NODELOCK = SEC_ERROR_BASE + 17,
-    SEC_ERROR_BAD_DATABASE = SEC_ERROR_BASE + 18,
-    SEC_ERROR_NO_MEMORY = SEC_ERROR_BASE + 19,
-    SEC_ERROR_UNTRUSTED_ISSUER = SEC_ERROR_BASE + 20,
-    SEC_ERROR_UNTRUSTED_CERT = SEC_ERROR_BASE + 21,
-    SEC_ERROR_DUPLICATE_CERT = (SEC_ERROR_BASE + 22),
-    SEC_ERROR_DUPLICATE_CERT_NAME = (SEC_ERROR_BASE + 23),
-    SEC_ERROR_ADDING_CERT = (SEC_ERROR_BASE + 24),
-    SEC_ERROR_FILING_KEY = (SEC_ERROR_BASE + 25),
-    SEC_ERROR_NO_KEY = (SEC_ERROR_BASE + 26),
-    SEC_ERROR_CERT_VALID = (SEC_ERROR_BASE + 27),
-    SEC_ERROR_CERT_NOT_VALID = (SEC_ERROR_BASE + 28),
-    SEC_ERROR_CERT_NO_RESPONSE = (SEC_ERROR_BASE + 29),
-    SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE = (SEC_ERROR_BASE + 30),
-    SEC_ERROR_CRL_EXPIRED = (SEC_ERROR_BASE + 31),
-    SEC_ERROR_CRL_BAD_SIGNATURE = (SEC_ERROR_BASE + 32),
-    SEC_ERROR_CRL_INVALID = (SEC_ERROR_BASE + 33),
-    SEC_ERROR_EXTENSION_VALUE_INVALID = (SEC_ERROR_BASE + 34),
-    SEC_ERROR_EXTENSION_NOT_FOUND = (SEC_ERROR_BASE + 35),
-    SEC_ERROR_CA_CERT_INVALID = (SEC_ERROR_BASE + 36),
-    SEC_ERROR_PATH_LEN_CONSTRAINT_INVALID = (SEC_ERROR_BASE + 37),
-    SEC_ERROR_CERT_USAGES_INVALID = (SEC_ERROR_BASE + 38),
-    SEC_INTERNAL_ONLY = (SEC_ERROR_BASE + 39),
-    SEC_ERROR_INVALID_KEY = (SEC_ERROR_BASE + 40),
-    SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION = (SEC_ERROR_BASE + 41),
-    SEC_ERROR_OLD_CRL = (SEC_ERROR_BASE + 42),
-    SEC_ERROR_NO_EMAIL_CERT = (SEC_ERROR_BASE + 43),
-    SEC_ERROR_NO_RECIPIENT_CERTS_QUERY = (SEC_ERROR_BASE + 44),
-    SEC_ERROR_NOT_A_RECIPIENT = (SEC_ERROR_BASE + 45),
-    SEC_ERROR_PKCS7_KEYALG_MISMATCH = (SEC_ERROR_BASE + 46),
-    SEC_ERROR_PKCS7_BAD_SIGNATURE = (SEC_ERROR_BASE + 47),
-    SEC_ERROR_UNSUPPORTED_KEYALG = (SEC_ERROR_BASE + 48),
-    SEC_ERROR_DECRYPTION_DISALLOWED = (SEC_ERROR_BASE + 49),
-    /* Fortezza Alerts */
-    XP_SEC_FORTEZZA_BAD_CARD = (SEC_ERROR_BASE + 50),
-    XP_SEC_FORTEZZA_NO_CARD = (SEC_ERROR_BASE + 51),
-    XP_SEC_FORTEZZA_NONE_SELECTED = (SEC_ERROR_BASE + 52),
-    XP_SEC_FORTEZZA_MORE_INFO = (SEC_ERROR_BASE + 53),
-    XP_SEC_FORTEZZA_PERSON_NOT_FOUND = (SEC_ERROR_BASE + 54),
-    XP_SEC_FORTEZZA_NO_MORE_INFO = (SEC_ERROR_BASE + 55),
-    XP_SEC_FORTEZZA_BAD_PIN = (SEC_ERROR_BASE + 56),
-    XP_SEC_FORTEZZA_PERSON_ERROR = (SEC_ERROR_BASE + 57),
-    SEC_ERROR_NO_KRL = (SEC_ERROR_BASE + 58),
-    SEC_ERROR_KRL_EXPIRED = (SEC_ERROR_BASE + 59),
-    SEC_ERROR_KRL_BAD_SIGNATURE = (SEC_ERROR_BASE + 60),
-    SEC_ERROR_REVOKED_KEY = (SEC_ERROR_BASE + 61),
-    SEC_ERROR_KRL_INVALID = (SEC_ERROR_BASE + 62),
-    SEC_ERROR_NEED_RANDOM = (SEC_ERROR_BASE + 63),
-    SEC_ERROR_NO_MODULE = (SEC_ERROR_BASE + 64),
-    SEC_ERROR_NO_TOKEN = (SEC_ERROR_BASE + 65),
-    SEC_ERROR_READ_ONLY = (SEC_ERROR_BASE + 66),
-    SEC_ERROR_NO_SLOT_SELECTED = (SEC_ERROR_BASE + 67),
-    SEC_ERROR_CERT_NICKNAME_COLLISION = (SEC_ERROR_BASE + 68),
-    SEC_ERROR_KEY_NICKNAME_COLLISION = (SEC_ERROR_BASE + 69),
-    SEC_ERROR_SAFE_NOT_CREATED = (SEC_ERROR_BASE + 70),
-    SEC_ERROR_BAGGAGE_NOT_CREATED = (SEC_ERROR_BASE + 71),
-    XP_JAVA_REMOVE_PRINCIPAL_ERROR = (SEC_ERROR_BASE + 72),
-    XP_JAVA_DELETE_PRIVILEGE_ERROR = (SEC_ERROR_BASE + 73),
-    XP_JAVA_CERT_NOT_EXISTS_ERROR = (SEC_ERROR_BASE + 74),
-    SEC_ERROR_BAD_EXPORT_ALGORITHM = (SEC_ERROR_BASE + 75),
-    SEC_ERROR_EXPORTING_CERTIFICATES = (SEC_ERROR_BASE + 76),
-    SEC_ERROR_IMPORTING_CERTIFICATES = (SEC_ERROR_BASE + 77),
-    SEC_ERROR_PKCS12_DECODING_PFX = (SEC_ERROR_BASE + 78),
-    SEC_ERROR_PKCS12_INVALID_MAC = (SEC_ERROR_BASE + 79),
-    SEC_ERROR_PKCS12_UNSUPPORTED_MAC_ALGORITHM = (SEC_ERROR_BASE + 80),
-    SEC_ERROR_PKCS12_UNSUPPORTED_TRANSPORT_MODE = (SEC_ERROR_BASE + 81),
-    SEC_ERROR_PKCS12_CORRUPT_PFX_STRUCTURE = (SEC_ERROR_BASE + 82),
-    SEC_ERROR_PKCS12_UNSUPPORTED_PBE_ALGORITHM = (SEC_ERROR_BASE + 83),
-    SEC_ERROR_PKCS12_UNSUPPORTED_VERSION = (SEC_ERROR_BASE + 84),
-    SEC_ERROR_PKCS12_PRIVACY_PASSWORD_INCORRECT = (SEC_ERROR_BASE + 85),
-    SEC_ERROR_PKCS12_CERT_COLLISION = (SEC_ERROR_BASE + 86),
-    SEC_ERROR_USER_CANCELLED = (SEC_ERROR_BASE + 87),
-    SEC_ERROR_PKCS12_DUPLICATE_DATA = (SEC_ERROR_BASE + 88),
-    SEC_ERROR_MESSAGE_SEND_ABORTED = (SEC_ERROR_BASE + 89),
-    SEC_ERROR_INADEQUATE_KEY_USAGE = (SEC_ERROR_BASE + 90),
-    SEC_ERROR_INADEQUATE_CERT_TYPE = (SEC_ERROR_BASE + 91),
-    SEC_ERROR_CERT_ADDR_MISMATCH = (SEC_ERROR_BASE + 92),
-    SEC_ERROR_PKCS12_UNABLE_TO_IMPORT_KEY = (SEC_ERROR_BASE + 93),
-    SEC_ERROR_PKCS12_IMPORTING_CERT_CHAIN = (SEC_ERROR_BASE + 94),
-    SEC_ERROR_PKCS12_UNABLE_TO_LOCATE_OBJECT_BY_NAME = (SEC_ERROR_BASE + 95),
-    SEC_ERROR_PKCS12_UNABLE_TO_EXPORT_KEY = (SEC_ERROR_BASE + 96),
-    SEC_ERROR_PKCS12_UNABLE_TO_WRITE = (SEC_ERROR_BASE + 97),
-    SEC_ERROR_PKCS12_UNABLE_TO_READ = (SEC_ERROR_BASE + 98),
-    SEC_ERROR_PKCS12_KEY_DATABASE_NOT_INITIALIZED = (SEC_ERROR_BASE + 99),
-    SEC_ERROR_KEYGEN_FAIL = (SEC_ERROR_BASE + 100),
-    SEC_ERROR_INVALID_PASSWORD = (SEC_ERROR_BASE + 101),
-    SEC_ERROR_RETRY_OLD_PASSWORD = (SEC_ERROR_BASE + 102),
-    SEC_ERROR_BAD_NICKNAME = (SEC_ERROR_BASE + 103),
-    SEC_ERROR_NOT_FORTEZZA_ISSUER = (SEC_ERROR_BASE + 104),
-    SEC_ERROR_CANNOT_MOVE_SENSITIVE_KEY = (SEC_ERROR_BASE + 105),
-    SEC_ERROR_JS_INVALID_MODULE_NAME = (SEC_ERROR_BASE + 106),
-    SEC_ERROR_JS_INVALID_DLL = (SEC_ERROR_BASE + 107),
-    SEC_ERROR_JS_ADD_MOD_FAILURE = (SEC_ERROR_BASE + 108),
-    SEC_ERROR_JS_DEL_MOD_FAILURE = (SEC_ERROR_BASE + 109),
-    SEC_ERROR_OLD_KRL = (SEC_ERROR_BASE + 110),
-    SEC_ERROR_CKL_CONFLICT = (SEC_ERROR_BASE + 111),
-    SEC_ERROR_CERT_NOT_IN_NAME_SPACE = (SEC_ERROR_BASE + 112),
-    SEC_ERROR_KRL_NOT_YET_VALID = (SEC_ERROR_BASE + 113),
-    SEC_ERROR_CRL_NOT_YET_VALID = (SEC_ERROR_BASE + 114),
-    SEC_ERROR_UNKNOWN_CERT = (SEC_ERROR_BASE + 115),
-    SEC_ERROR_UNKNOWN_SIGNER = (SEC_ERROR_BASE + 116),
-    SEC_ERROR_CERT_BAD_ACCESS_LOCATION = (SEC_ERROR_BASE + 117),
-    SEC_ERROR_OCSP_UNKNOWN_RESPONSE_TYPE = (SEC_ERROR_BASE + 118),
-    SEC_ERROR_OCSP_BAD_HTTP_RESPONSE = (SEC_ERROR_BASE + 119),
-    SEC_ERROR_OCSP_MALFORMED_REQUEST = (SEC_ERROR_BASE + 120),
-    SEC_ERROR_OCSP_SERVER_ERROR = (SEC_ERROR_BASE + 121),
-    SEC_ERROR_OCSP_TRY_SERVER_LATER = (SEC_ERROR_BASE + 122),
-    SEC_ERROR_OCSP_REQUEST_NEEDS_SIG = (SEC_ERROR_BASE + 123),
-    SEC_ERROR_OCSP_UNAUTHORIZED_REQUEST = (SEC_ERROR_BASE + 124),
-    SEC_ERROR_OCSP_UNKNOWN_RESPONSE_STATUS = (SEC_ERROR_BASE + 125),
-    SEC_ERROR_OCSP_UNKNOWN_CERT = (SEC_ERROR_BASE + 126),
-    SEC_ERROR_OCSP_NOT_ENABLED = (SEC_ERROR_BASE + 127),
-    SEC_ERROR_OCSP_NO_DEFAULT_RESPONDER = (SEC_ERROR_BASE + 128),
-    SEC_ERROR_OCSP_MALFORMED_RESPONSE = (SEC_ERROR_BASE + 129),
-    SEC_ERROR_OCSP_UNAUTHORIZED_RESPONSE = (SEC_ERROR_BASE + 130),
-    SEC_ERROR_OCSP_FUTURE_RESPONSE = (SEC_ERROR_BASE + 131),
-    SEC_ERROR_OCSP_OLD_RESPONSE = (SEC_ERROR_BASE + 132),
-    /* smime stuff */
-    SEC_ERROR_DIGEST_NOT_FOUND = (SEC_ERROR_BASE + 133),
-    SEC_ERROR_UNSUPPORTED_MESSAGE_TYPE = (SEC_ERROR_BASE + 134),
-    SEC_ERROR_MODULE_STUCK = (SEC_ERROR_BASE + 135),
-    SEC_ERROR_BAD_TEMPLATE = (SEC_ERROR_BASE + 136),
-    SEC_ERROR_CRL_NOT_FOUND = (SEC_ERROR_BASE + 137),
-    SEC_ERROR_REUSED_ISSUER_AND_SERIAL = (SEC_ERROR_BASE + 138),
-    SEC_ERROR_BUSY = (SEC_ERROR_BASE + 139),
-    SEC_ERROR_EXTRA_INPUT = (SEC_ERROR_BASE + 140),
-    /* error codes used by elliptic curve code */
-    SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE = (SEC_ERROR_BASE + 141),
-    SEC_ERROR_UNSUPPORTED_EC_POINT_FORM = (SEC_ERROR_BASE + 142),
-    SEC_ERROR_UNRECOGNIZED_OID = (SEC_ERROR_BASE + 143),
-    SEC_ERROR_OCSP_INVALID_SIGNING_CERT = (SEC_ERROR_BASE + 144),
-    /* new revocation errors */
-    SEC_ERROR_REVOKED_CERTIFICATE_CRL = (SEC_ERROR_BASE + 145),
-    SEC_ERROR_REVOKED_CERTIFICATE_OCSP = (SEC_ERROR_BASE + 146),
-    SEC_ERROR_CRL_INVALID_VERSION = (SEC_ERROR_BASE + 147),
-    SEC_ERROR_CRL_V1_CRITICAL_EXTENSION = (SEC_ERROR_BASE + 148),
-    SEC_ERROR_CRL_UNKNOWN_CRITICAL_EXTENSION = (SEC_ERROR_BASE + 149),
-    SEC_ERROR_UNKNOWN_OBJECT_TYPE = (SEC_ERROR_BASE + 150),
-    SEC_ERROR_INCOMPATIBLE_PKCS11 = (SEC_ERROR_BASE + 151),
-    SEC_ERROR_NO_EVENT = (SEC_ERROR_BASE + 152),
-    SEC_ERROR_CRL_ALREADY_EXISTS = (SEC_ERROR_BASE + 153),
-    SEC_ERROR_NOT_INITIALIZED = (SEC_ERROR_BASE + 154),
-    SEC_ERROR_TOKEN_NOT_LOGGED_IN = (SEC_ERROR_BASE + 155),
-    SEC_ERROR_OCSP_RESPONDER_CERT_INVALID = (SEC_ERROR_BASE + 156),
-    SEC_ERROR_OCSP_BAD_SIGNATURE = (SEC_ERROR_BASE + 157),
-
-    SEC_ERROR_OUT_OF_SEARCH_LIMITS = (SEC_ERROR_BASE + 158),
-    SEC_ERROR_INVALID_POLICY_MAPPING = (SEC_ERROR_BASE + 159),
-    SEC_ERROR_POLICY_VALIDATION_FAILED = (SEC_ERROR_BASE + 160),
-    /* No longer used.  Unknown AIA location types are now silently ignored. */
-    SEC_ERROR_UNKNOWN_AIA_LOCATION_TYPE = (SEC_ERROR_BASE + 161),
-    SEC_ERROR_BAD_HTTP_RESPONSE = (SEC_ERROR_BASE + 162),
-    SEC_ERROR_BAD_LDAP_RESPONSE = (SEC_ERROR_BASE + 163),
-    SEC_ERROR_FAILED_TO_ENCODE_DATA = (SEC_ERROR_BASE + 164),
-    SEC_ERROR_BAD_INFO_ACCESS_LOCATION = (SEC_ERROR_BASE + 165),
-
-    SEC_ERROR_LIBPKIX_INTERNAL = (SEC_ERROR_BASE + 166),
-
-    SEC_ERROR_PKCS11_GENERAL_ERROR = (SEC_ERROR_BASE + 167),
-    SEC_ERROR_PKCS11_FUNCTION_FAILED = (SEC_ERROR_BASE + 168),
-    SEC_ERROR_PKCS11_DEVICE_ERROR = (SEC_ERROR_BASE + 169),
-
-    SEC_ERROR_BAD_INFO_ACCESS_METHOD = (SEC_ERROR_BASE + 170),
-    SEC_ERROR_CRL_IMPORT_FAILED = (SEC_ERROR_BASE + 171),
-
-    SEC_ERROR_EXPIRED_PASSWORD = (SEC_ERROR_BASE + 172),
-    SEC_ERROR_LOCKED_PASSWORD = (SEC_ERROR_BASE + 173),
-
-    SEC_ERROR_UNKNOWN_PKCS11_ERROR = (SEC_ERROR_BASE + 174),
-
-    SEC_ERROR_BAD_CRL_DP_URL = (SEC_ERROR_BASE + 175),
-
-    SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED = (SEC_ERROR_BASE + 176),
-
-    SEC_ERROR_LEGACY_DATABASE = (SEC_ERROR_BASE + 177),
-
-    SEC_ERROR_APPLICATION_CALLBACK_ERROR = (SEC_ERROR_BASE + 178),
-
-    /* Add new error codes above here. */
-    SEC_ERROR_END_OF_LIST
-} SECErrorCodes;
-#endif /* NO_SECURITY_ERROR_ENUM */
-
-#endif /* __SEC_ERR_H_ */
diff --git a/openflow/usr/include/nss/sechash.h b/openflow/usr/include/nss/sechash.h
deleted file mode 100644
index 94ff7ed..0000000
--- a/openflow/usr/include/nss/sechash.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _HASH_H_
-#define _HASH_H_
-
-#include "seccomon.h"
-#include "hasht.h"
-#include "secoidt.h"
-
-SEC_BEGIN_PROTOS
-
-/*
-** Generic hash api.
-*/
-
-extern unsigned int HASH_ResultLen(HASH_HashType type);
-
-extern unsigned int HASH_ResultLenContext(HASHContext *context);
-
-extern unsigned int HASH_ResultLenByOidTag(SECOidTag hashOid);
-
-extern SECStatus HASH_HashBuf(HASH_HashType type,
-                              unsigned char *dest,
-                              const unsigned char *src,
-                              PRUint32 src_len);
-
-extern HASHContext *HASH_Create(HASH_HashType type);
-
-extern HASHContext *HASH_Clone(HASHContext *context);
-
-extern void HASH_Destroy(HASHContext *context);
-
-extern void HASH_Begin(HASHContext *context);
-
-extern void HASH_Update(HASHContext *context,
-                        const unsigned char *src,
-                        unsigned int len);
-
-extern void HASH_End(HASHContext *context,
-                     unsigned char *result,
-                     unsigned int *result_len,
-                     unsigned int max_result_len);
-
-extern HASH_HashType HASH_GetType(HASHContext *context);
-
-extern const SECHashObject *HASH_GetHashObject(HASH_HashType type);
-
-extern const SECHashObject *HASH_GetHashObjectByOidTag(SECOidTag hashOid);
-
-extern HASH_HashType HASH_GetHashTypeByOidTag(SECOidTag hashOid);
-extern SECOidTag HASH_GetHashOidTagByHMACOidTag(SECOidTag hmacOid);
-extern SECOidTag HASH_GetHMACOidTagByHashOidTag(SECOidTag hashOid);
-
-SEC_END_PROTOS
-
-#endif /* _HASH_H_ */
diff --git a/openflow/usr/include/nss/secitem.h b/openflow/usr/include/nss/secitem.h
deleted file mode 100644
index 5b9d0e1..0000000
--- a/openflow/usr/include/nss/secitem.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _SECITEM_H_
-#define _SECITEM_H_
-
-#include "utilrename.h"
-
-/*
- * secitem.h - public data structures and prototypes for handling
- *             SECItems
- */
-
-#include "plarena.h"
-#include "plhash.h"
-#include "seccomon.h"
-
-SEC_BEGIN_PROTOS
-
-/*
-** Allocate an item.  If "arena" is not NULL, then allocate from there,
-** otherwise allocate from the heap.  If "item" is not NULL, allocate
-** only the data buffer for the item, not the item itself.  If "len" is
-** 0, do not allocate the data buffer for the item; simply set the data
-** field to NULL and the len field to 0.  The item structure is allocated
-** zero-filled; the data buffer is not zeroed.  The caller is responsible
-** for initializing the type field of the item.
-**
-** The resulting item is returned; NULL if any error occurs.
-**
-** XXX This probably should take a SECItemType, but since that is mostly
-** unused and our improved APIs (aka Stan) are looming, I left it out.
-*/
-extern SECItem *SECITEM_AllocItem(PLArenaPool *arena, SECItem *item,
-                                  unsigned int len);
-
-/*
-** This is a legacy function containing bugs. It doesn't update item->len,
-** and it has other issues as described in bug 298649 and bug 298938.
-** However, the function is  kept unchanged for consumers that might depend
-** on the broken behaviour. New code should call SECITEM_ReallocItemV2.
-**
-** Reallocate the data for the specified "item".  If "arena" is not NULL,
-** then reallocate from there, otherwise reallocate from the heap.
-** In the case where oldlen is 0, the data is allocated (not reallocated).
-** In any case, "item" is expected to be a valid SECItem pointer;
-** SECFailure is returned if it is not.  If the allocation succeeds,
-** SECSuccess is returned.
-*/
-extern SECStatus SECITEM_ReallocItem(/* deprecated function */
-                                     PLArenaPool *arena, SECItem *item,
-                                     unsigned int oldlen, unsigned int newlen);
-
-/*
-** Reallocate the data for the specified "item".  If "arena" is not NULL,
-** then reallocate from there, otherwise reallocate from the heap.
-** If item->data is NULL, the data is allocated (not reallocated).
-** In any case, "item" is expected to be a valid SECItem pointer;
-** SECFailure is returned if it is not, and the item will remain unchanged.
-** If the allocation succeeds, the item is updated and SECSuccess is returned.
- */
-extern SECStatus SECITEM_ReallocItemV2(PLArenaPool *arena, SECItem *item,
-                                       unsigned int newlen);
-
-/*
-** Compare two items returning the difference between them.
-*/
-extern SECComparison SECITEM_CompareItem(const SECItem *a, const SECItem *b);
-
-/*
-** Compare two items -- if they are the same, return true; otherwise false.
-*/
-extern PRBool SECITEM_ItemsAreEqual(const SECItem *a, const SECItem *b);
-
-/*
-** Copy "from" to "to"
-*/
-extern SECStatus SECITEM_CopyItem(PLArenaPool *arena, SECItem *to,
-                                  const SECItem *from);
-
-/*
-** Allocate an item and copy "from" into it.
-*/
-extern SECItem *SECITEM_DupItem(const SECItem *from);
-
-/*
-** Allocate an item and copy "from" into it.  The item itself and the
-** data it points to are both allocated from the arena.  If arena is
-** NULL, this function is equivalent to SECITEM_DupItem.
-*/
-extern SECItem *SECITEM_ArenaDupItem(PLArenaPool *arena, const SECItem *from);
-
-/*
-** Free "zap". If freeit is PR_TRUE then "zap" itself is freed.
-*/
-extern void SECITEM_FreeItem(SECItem *zap, PRBool freeit);
-
-/*
-** Zero and then free "zap". If freeit is PR_TRUE then "zap" itself is freed.
-*/
-extern void SECITEM_ZfreeItem(SECItem *zap, PRBool freeit);
-
-PLHashNumber PR_CALLBACK SECITEM_Hash(const void *key);
-
-PRIntn PR_CALLBACK SECITEM_HashCompare(const void *k1, const void *k2);
-
-extern SECItemArray *SECITEM_AllocArray(PLArenaPool *arena,
-                                        SECItemArray *array,
-                                        unsigned int len);
-extern SECItemArray *SECITEM_DupArray(PLArenaPool *arena,
-                                      const SECItemArray *from);
-extern void SECITEM_FreeArray(SECItemArray *array, PRBool freeit);
-extern void SECITEM_ZfreeArray(SECItemArray *array, PRBool freeit);
-
-SEC_END_PROTOS
-
-#endif /* _SECITEM_H_ */
diff --git a/openflow/usr/include/nss/secmime.h b/openflow/usr/include/nss/secmime.h
deleted file mode 100644
index 683cd8d..0000000
--- a/openflow/usr/include/nss/secmime.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Header file for routines specific to S/MIME.  Keep things that are pure
- * pkcs7 out of here; this is for S/MIME policy, S/MIME interoperability, etc.
- */
-
-#ifndef _SECMIME_H_
-#define _SECMIME_H_ 1
-
-#include "secpkcs7.h"
-
-/************************************************************************/
-SEC_BEGIN_PROTOS
-
-/*
- * Initialize the local recording of the user S/MIME cipher preferences.
- * This function is called once for each cipher, the order being
- * important (first call records greatest preference, and so on).
- * When finished, it is called with a "which" of CIPHER_FAMILID_MASK.
- * If the function is called again after that, it is assumed that
- * the preferences are being reset, and the old preferences are
- * discarded.
- *
- * XXX This is for a particular user, and right now the storage is
- * XXX local, static.  The preference should be stored elsewhere to allow
- * XXX for multiple uses of one library?  How does SSL handle this;
- * XXX it has something similar?
- *
- *  - The "which" values are defined in ciferfam.h (the SMIME_* values,
- *    for example SMIME_DES_CBC_56).
- *  - If "on" is non-zero then the named cipher is enabled, otherwise
- *    it is disabled.  (It is not necessary to call the function for
- *    ciphers that are disabled, however, as that is the default.)
- *
- * If the cipher preference is successfully recorded, SECSuccess
- * is returned.  Otherwise SECFailure is returned.  The only errors
- * are due to failure allocating memory or bad parameters/calls:
- *	SEC_ERROR_XXX ("which" is not in the S/MIME cipher family)
- *	SEC_ERROR_XXX (function is being called more times than there
- *		are known/expected ciphers)
- */
-extern SECStatus SECMIME_EnableCipher(long which, int on);
-
-/*
- * Initialize the local recording of the S/MIME policy.
- * This function is called to enable/disable a particular cipher.
- * (S/MIME encryption or decryption using a particular cipher is only
- * allowed if that cipher is currently enabled.)  At startup, all S/MIME
- * ciphers are disabled.  From that point, this function can be called
- * to enable a cipher -- it is not necessary to call this to disable
- * a cipher unless that cipher was previously, explicitly enabled via
- * this function.
- *
- * XXX This is for a the current module, I think, so local, static storage
- * XXX is okay.  Is that correct, or could multiple uses of the same
- * XXX library expect to operate under different policies?
- *
- *  - The "which" values are defined in ciferfam.h (the SMIME_* values,
- *    for example SMIME_DES_CBC_56).
- *  - If "on" is non-zero then the named cipher is enabled, otherwise
- *    it is disabled.
- *
- * If the cipher is successfully enabled/disabled, SECSuccess is
- * returned.  Otherwise SECFailure is returned.  The only errors
- * are due to bad parameters:
- *	SEC_ERROR_XXX ("which" is not in the S/MIME cipher family)
- *	SEC_ERROR_XXX ("which" exceeds expected maximum cipher; this is
- *		really an internal error)
- */
-extern SECStatus SECMIME_SetPolicy(long which, int on);
-
-/*
- * Does the current policy allow S/MIME decryption of this particular
- * algorithm and keysize?
- */
-extern PRBool SECMIME_DecryptionAllowed(SECAlgorithmID *algid, PK11SymKey *key);
-
-/*
- * Does the current policy allow *any* S/MIME encryption (or decryption)?
- *
- * This tells whether or not *any* S/MIME encryption can be done,
- * according to policy.  Callers may use this to do nicer user interface
- * (say, greying out a checkbox so a user does not even try to encrypt
- * a message when they are not allowed to) or for any reason they want
- * to check whether S/MIME encryption (or decryption, for that matter)
- * may be done.
- *
- * It takes no arguments.  The return value is a simple boolean:
- *   PR_TRUE means encryption (or decryption) is *possible*
- *	(but may still fail due to other reasons, like because we cannot
- *	find all the necessary certs, etc.; PR_TRUE is *not* a guarantee)
- *   PR_FALSE means encryption (or decryption) is not permitted
- *
- * There are no errors from this routine.
- */
-extern PRBool SECMIME_EncryptionPossible(void);
-
-/*
- * Start an S/MIME encrypting context.
- *
- * "scert" is the cert for the sender.  It will be checked for validity.
- * "rcerts" are the certs for the recipients.  They will also be checked.
- *
- * "certdb" is the cert database to use for verifying the certs.
- * It can be NULL if a default database is available (like in the client).
- *
- * This function already does all of the stuff specific to S/MIME protocol
- * and local policy; the return value just needs to be passed to
- * SEC_PKCS7Encode() or to SEC_PKCS7EncoderStart() to create the encoded data,
- * and finally to SEC_PKCS7DestroyContentInfo().
- *
- * An error results in a return value of NULL and an error set.
- * (Retrieve specific errors via PORT_GetError()/XP_GetError().)
- */
-extern SEC_PKCS7ContentInfo *SECMIME_CreateEncrypted(CERTCertificate *scert,
-                                                     CERTCertificate **rcerts,
-                                                     CERTCertDBHandle *certdb,
-                                                     SECKEYGetPasswordKey pwfn,
-                                                     void *pwfn_arg);
-
-/*
- * Start an S/MIME signing context.
- *
- * "scert" is the cert that will be used to sign the data.  It will be
- * checked for validity.
- *
- * "certdb" is the cert database to use for verifying the cert.
- * It can be NULL if a default database is available (like in the client).
- *
- * "digestalg" names the digest algorithm.  (It should be SEC_OID_SHA1;
- * XXX There should be SECMIME functions for hashing, or the hashing should
- * be built into this interface, which we would like because we would
- * support more smartcards that way, and then this argument should go away.)
- *
- * "digest" is the actual digest of the data.  It must be provided in
- * the case of detached data or NULL if the content will be included.
- *
- * This function already does all of the stuff specific to S/MIME protocol
- * and local policy; the return value just needs to be passed to
- * SEC_PKCS7Encode() or to SEC_PKCS7EncoderStart() to create the encoded data,
- * and finally to SEC_PKCS7DestroyContentInfo().
- *
- * An error results in a return value of NULL and an error set.
- * (Retrieve specific errors via PORT_GetError()/XP_GetError().)
- */
-extern SEC_PKCS7ContentInfo *SECMIME_CreateSigned(CERTCertificate *scert,
-                                                  CERTCertificate *ecert,
-                                                  CERTCertDBHandle *certdb,
-                                                  SECOidTag digestalg,
-                                                  SECItem *digest,
-                                                  SECKEYGetPasswordKey pwfn,
-                                                  void *pwfn_arg);
-
-/************************************************************************/
-SEC_END_PROTOS
-
-#endif /* _SECMIME_H_ */
diff --git a/openflow/usr/include/nss/secmod.h b/openflow/usr/include/nss/secmod.h
deleted file mode 100644
index fcc7707..0000000
--- a/openflow/usr/include/nss/secmod.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _SECMOD_H_
-#define _SECMOD_H_
-#include "seccomon.h"
-#include "secmodt.h"
-#include "prinrval.h"
-
-/* These mechanisms flags are visible to all other libraries. */
-/* They must be converted to internal SECMOD_*_FLAG */
-/* if used inside the functions of the security library */
-#define PUBLIC_MECH_RSA_FLAG 0x00000001ul
-#define PUBLIC_MECH_DSA_FLAG 0x00000002ul
-#define PUBLIC_MECH_RC2_FLAG 0x00000004ul
-#define PUBLIC_MECH_RC4_FLAG 0x00000008ul
-#define PUBLIC_MECH_DES_FLAG 0x00000010ul
-#define PUBLIC_MECH_DH_FLAG 0x00000020ul
-#define PUBLIC_MECH_FORTEZZA_FLAG 0x00000040ul
-#define PUBLIC_MECH_RC5_FLAG 0x00000080ul
-#define PUBLIC_MECH_SHA1_FLAG 0x00000100ul
-#define PUBLIC_MECH_MD5_FLAG 0x00000200ul
-#define PUBLIC_MECH_MD2_FLAG 0x00000400ul
-#define PUBLIC_MECH_SSL_FLAG 0x00000800ul
-#define PUBLIC_MECH_TLS_FLAG 0x00001000ul
-#define PUBLIC_MECH_AES_FLAG 0x00002000ul
-#define PUBLIC_MECH_SHA256_FLAG 0x00004000ul
-#define PUBLIC_MECH_SHA512_FLAG 0x00008000ul
-#define PUBLIC_MECH_CAMELLIA_FLAG 0x00010000ul
-#define PUBLIC_MECH_SEED_FLAG 0x00020000ul
-#define PUBLIC_MECH_ECC_FLAG 0x00040000ul
-
-#define PUBLIC_MECH_RANDOM_FLAG 0x08000000ul
-#define PUBLIC_MECH_FRIENDLY_FLAG 0x10000000ul
-#define PUBLIC_OWN_PW_DEFAULTS 0X20000000ul
-#define PUBLIC_DISABLE_FLAG 0x40000000ul
-
-/* warning: reserved means reserved */
-#define PUBLIC_MECH_RESERVED_FLAGS 0x87FF0000ul
-
-/* These cipher flags are visible to all other libraries, */
-/* But they must be converted before used in functions */
-/* withing the security module */
-#define PUBLIC_CIPHER_FORTEZZA_FLAG 0x00000001ul
-
-/* warning: reserved means reserved */
-#define PUBLIC_CIPHER_RESERVED_FLAGS 0xFFFFFFFEul
-
-SEC_BEGIN_PROTOS
-
-/*
- * the following functions are going to be deprecated in NSS 4.0 in
- * favor of the new stan functions.
- */
-
-/* Initialization */
-extern SECMODModule *SECMOD_LoadModule(char *moduleSpec, SECMODModule *parent,
-                                       PRBool recurse);
-
-extern SECMODModule *SECMOD_LoadUserModule(char *moduleSpec, SECMODModule *parent,
-                                           PRBool recurse);
-
-SECStatus SECMOD_UnloadUserModule(SECMODModule *mod);
-
-SECMODModule *SECMOD_CreateModule(const char *lib, const char *name,
-                                  const char *param, const char *nss);
-SECMODModule *SECMOD_CreateModuleEx(const char *lib, const char *name,
-                                    const char *param, const char *nss,
-                                    const char *config);
-/*
- * After a fork(), PKCS #11 says we need to call C_Initialize again in
- * the child before we can use the module. This function causes this
- * reinitialization.
- * NOTE: Any outstanding handles will become invalid, which means your
- * keys and contexts will fail, but new ones can be created.
- *
- * Setting 'force' to true means to do the reinitialization even if the
- * PKCS #11 module does not seem to need it. This allows software modules
- * which ignore fork to preserve their keys across the fork().
- */
-SECStatus SECMOD_RestartModules(PRBool force);
-
-/* Module Management */
-char **SECMOD_GetModuleSpecList(SECMODModule *module);
-SECStatus SECMOD_FreeModuleSpecList(SECMODModule *module, char **moduleSpecList);
-
-/* protoypes */
-/* Get a list of active PKCS #11 modules */
-extern SECMODModuleList *SECMOD_GetDefaultModuleList(void);
-/* Get a list of defined but not loaded PKCS #11 modules */
-extern SECMODModuleList *SECMOD_GetDeadModuleList(void);
-/* Get a list of Modules which define PKCS #11 modules to load */
-extern SECMODModuleList *SECMOD_GetDBModuleList(void);
-
-/* lock to protect all three module lists above */
-extern SECMODListLock *SECMOD_GetDefaultModuleListLock(void);
-
-extern SECStatus SECMOD_UpdateModule(SECMODModule *module);
-
-/* lock management */
-extern void SECMOD_GetReadLock(SECMODListLock *);
-extern void SECMOD_ReleaseReadLock(SECMODListLock *);
-
-/* Operate on modules by name */
-extern SECMODModule *SECMOD_FindModule(const char *name);
-extern SECStatus SECMOD_DeleteModule(const char *name, int *type);
-extern SECStatus SECMOD_DeleteModuleEx(const char *name,
-                                       SECMODModule *mod,
-                                       int *type,
-                                       PRBool permdb);
-extern SECStatus SECMOD_DeleteInternalModule(const char *name);
-extern PRBool SECMOD_CanDeleteInternalModule(void);
-extern SECStatus SECMOD_AddNewModule(const char *moduleName,
-                                     const char *dllPath,
-                                     unsigned long defaultMechanismFlags,
-                                     unsigned long cipherEnableFlags);
-extern SECStatus SECMOD_AddNewModuleEx(const char *moduleName,
-                                       const char *dllPath,
-                                       unsigned long defaultMechanismFlags,
-                                       unsigned long cipherEnableFlags,
-                                       char *modparms,
-                                       char *nssparms);
-
-/* database/memory management */
-extern SECMODModule *SECMOD_GetInternalModule(void);
-extern SECMODModule *SECMOD_ReferenceModule(SECMODModule *module);
-extern void SECMOD_DestroyModule(SECMODModule *module);
-extern PK11SlotInfo *SECMOD_LookupSlot(SECMODModuleID module,
-                                       unsigned long slotID);
-extern PK11SlotInfo *SECMOD_FindSlot(SECMODModule *module, const char *name);
-
-/* Funtion reports true if at least one of the modules */
-/* of modType has been installed */
-PRBool SECMOD_IsModulePresent(unsigned long int pubCipherEnableFlags);
-
-/* accessors */
-PRBool SECMOD_GetSkipFirstFlag(SECMODModule *mod);
-PRBool SECMOD_GetDefaultModDBFlag(SECMODModule *mod);
-
-/* Functions used to convert between internal & public representation
- * of Mechanism Flags and Cipher Enable Flags */
-extern unsigned long SECMOD_PubMechFlagstoInternal(unsigned long publicFlags);
-extern unsigned long SECMOD_InternaltoPubMechFlags(unsigned long internalFlags);
-extern unsigned long SECMOD_PubCipherFlagstoInternal(unsigned long publicFlags);
-
-PRBool SECMOD_HasRemovableSlots(SECMODModule *mod);
-PK11SlotInfo *SECMOD_WaitForAnyTokenEvent(SECMODModule *mod,
-                                          unsigned long flags, PRIntervalTime latency);
-/*
- * Warning: the SECMOD_CancelWait function is highly destructive, potentially
- * finalizing  the module 'mod' (causing inprogress operations to fail,
- * and session key material to disappear). It should only be called when
- * shutting down  the module.
- */
-SECStatus SECMOD_CancelWait(SECMODModule *mod);
-/*
- * check to see if the module has added new slots. PKCS 11 v2.20 allows for
- * modules to add new slots, but never remove them. Slots not be added between
- * a call to C_GetSlotLlist(Flag, NULL, &count) and the corresponding
- * C_GetSlotList(flag, &data, &count) so that the array doesn't accidently
- * grow on the caller. It is permissible for the slots to increase between
- * corresponding calls with NULL to get the size.
- */
-SECStatus SECMOD_UpdateSlotList(SECMODModule *mod);
-SEC_END_PROTOS
-
-#endif
diff --git a/openflow/usr/include/nss/secmodt.h b/openflow/usr/include/nss/secmodt.h
deleted file mode 100644
index 23abe30..0000000
--- a/openflow/usr/include/nss/secmodt.h
+++ /dev/null
@@ -1,444 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _SECMODT_H_
-#define _SECMODT_H_ 1
-
-#include "nssrwlkt.h"
-#include "nssilckt.h"
-#include "secoid.h"
-#include "secasn1.h"
-#include "pkcs11t.h"
-#include "utilmodt.h"
-
-SEC_BEGIN_PROTOS
-
-/* find a better home for these... */
-extern const SEC_ASN1Template SECKEY_PointerToEncryptedPrivateKeyInfoTemplate[];
-SEC_ASN1_CHOOSER_DECLARE(SECKEY_PointerToEncryptedPrivateKeyInfoTemplate)
-extern const SEC_ASN1Template SECKEY_EncryptedPrivateKeyInfoTemplate[];
-SEC_ASN1_CHOOSER_DECLARE(SECKEY_EncryptedPrivateKeyInfoTemplate)
-extern const SEC_ASN1Template SECKEY_PrivateKeyInfoTemplate[];
-SEC_ASN1_CHOOSER_DECLARE(SECKEY_PrivateKeyInfoTemplate)
-extern const SEC_ASN1Template SECKEY_PointerToPrivateKeyInfoTemplate[];
-SEC_ASN1_CHOOSER_DECLARE(SECKEY_PointerToPrivateKeyInfoTemplate)
-
-SEC_END_PROTOS
-
-/* PKCS11 needs to be included */
-typedef struct SECMODModuleStr SECMODModule;
-typedef struct SECMODModuleListStr SECMODModuleList;
-typedef NSSRWLock SECMODListLock;
-typedef struct PK11SlotInfoStr PK11SlotInfo;          /* defined in secmodti.h */
-typedef struct NSSUTILPreSlotInfoStr PK11PreSlotInfo; /* defined in secmodti.h */
-typedef struct PK11SymKeyStr PK11SymKey;              /* defined in secmodti.h */
-typedef struct PK11ContextStr PK11Context;            /* defined in secmodti.h */
-typedef struct PK11SlotListStr PK11SlotList;
-typedef struct PK11SlotListElementStr PK11SlotListElement;
-typedef struct PK11RSAGenParamsStr PK11RSAGenParams;
-typedef unsigned long SECMODModuleID;
-typedef struct PK11DefaultArrayEntryStr PK11DefaultArrayEntry;
-typedef struct PK11GenericObjectStr PK11GenericObject;
-typedef void (*PK11FreeDataFunc)(void *);
-
-struct SECMODModuleStr {
-    PLArenaPool *arena;
-    PRBool internal;           /* true of internally linked modules, false
-                                * for the loaded modules */
-    PRBool loaded;             /* Set to true if module has been loaded */
-    PRBool isFIPS;             /* Set to true if module is finst internal */
-    char *dllName;             /* name of the shared library which implements
-                                * this module */
-    char *commonName;          /* name of the module to display to the user */
-    void *library;             /* pointer to the library. opaque. used only by
-                                * pk11load.c */
-    void *functionList;        /* The PKCS #11 function table */
-    PZLock *refLock;           /* only used pk11db.c */
-    int refCount;              /* Module reference count */
-    PK11SlotInfo **slots;      /* array of slot points attached to this mod*/
-    int slotCount;             /* count of slot in above array */
-    PK11PreSlotInfo *slotInfo; /* special info about slots default settings */
-    int slotInfoCount;         /* count */
-    SECMODModuleID moduleID;   /* ID so we can find this module again */
-    PRBool isThreadSafe;
-    unsigned long ssl[2];        /* SSL cipher enable flags */
-    char *libraryParams;         /* Module specific parameters */
-    void *moduleDBFunc;          /* function to return module configuration data*/
-    SECMODModule *parent;        /* module that loaded us */
-    PRBool isCritical;           /* This module must load successfully */
-    PRBool isModuleDB;           /* this module has lists of PKCS #11 modules */
-    PRBool moduleDBOnly;         /* this module only has lists of PKCS #11 modules */
-    int trustOrder;              /* order for this module's certificate trust rollup */
-    int cipherOrder;             /* order for cipher operations */
-    unsigned long evControlMask; /* control the running and shutdown of slot
-                                  * events (SECMOD_WaitForAnyTokenEvent) */
-    CK_VERSION cryptokiVersion;  /* version of this library */
-};
-
-/* evControlMask flags */
-/*
- * These bits tell the current state of a SECMOD_WaitForAnyTokenEvent.
- *
- * SECMOD_WAIT_PKCS11_EVENT - we're waiting in the PKCS #11 module in
- *  C_WaitForSlotEvent().
- * SECMOD_WAIT_SIMULATED_EVENT - we're waiting in the NSS simulation code
- *  which polls for token insertion and removal events.
- * SECMOD_END_WAIT - SECMOD_CancelWait has been called while the module is
- *  waiting in SECMOD_WaitForAnyTokenEvent. SECMOD_WaitForAnyTokenEvent
- *  should return immediately to it's caller.
- */
-#define SECMOD_END_WAIT 0x01
-#define SECMOD_WAIT_SIMULATED_EVENT 0x02
-#define SECMOD_WAIT_PKCS11_EVENT 0x04
-
-struct SECMODModuleListStr {
-    SECMODModuleList *next;
-    SECMODModule *module;
-};
-
-struct PK11SlotListStr {
-    PK11SlotListElement *head;
-    PK11SlotListElement *tail;
-    PZLock *lock;
-};
-
-struct PK11SlotListElementStr {
-    PK11SlotListElement *next;
-    PK11SlotListElement *prev;
-    PK11SlotInfo *slot;
-    int refCount;
-};
-
-struct PK11RSAGenParamsStr {
-    int keySizeInBits;
-    unsigned long pe;
-};
-
-typedef enum {
-    PK11CertListUnique = 0,     /* get one instance of all certs */
-    PK11CertListUser = 1,       /* get all instances of user certs */
-    PK11CertListRootUnique = 2, /* get one instance of CA certs without a private key.
-                                 * deprecated. Use PK11CertListCAUnique
-                                 */
-    PK11CertListCA = 3,         /* get all instances of CA certs */
-    PK11CertListCAUnique = 4,   /* get one instance of CA certs */
-    PK11CertListUserUnique = 5, /* get one instance of user certs */
-    PK11CertListAll = 6         /* get all instances of all certs */
-} PK11CertListType;
-
-/*
- * Entry into the array which lists all the legal bits for the default flags
- * in the slot, their definition, and the PKCS #11 mechanism they represent.
- * Always statically allocated.
- */
-struct PK11DefaultArrayEntryStr {
-    const char *name;
-    unsigned long flag;
-    unsigned long mechanism; /* this is a long so we don't include the
-                              * whole pkcs 11 world to use this header */
-};
-
-/*
- * PK11AttrFlags
- *
- * A 32-bit bitmask of PK11_ATTR_XXX flags
- */
-typedef PRUint32 PK11AttrFlags;
-
-/*
- * PK11_ATTR_XXX
- *
- * The following PK11_ATTR_XXX bitflags are used to specify
- * PKCS #11 object attributes that have Boolean values.  Some NSS
- * functions have a "PK11AttrFlags attrFlags" parameter whose value
- * is the logical OR of these bitflags.  NSS use these bitflags on
- * private keys or secret keys.  Some of these bitflags also apply
- * to the public keys associated with the private keys.
- *
- * For each PKCS #11 object attribute, we need two bitflags to
- * specify not only "true" and "false" but also "default".  For
- * example, PK11_ATTR_PRIVATE and PK11_ATTR_PUBLIC control the
- * CKA_PRIVATE attribute.  If PK11_ATTR_PRIVATE is set, we add
- *     { CKA_PRIVATE, &cktrue, sizeof(CK_BBOOL) }
- * to the template.  If PK11_ATTR_PUBLIC is set, we add
- *     { CKA_PRIVATE, &ckfalse, sizeof(CK_BBOOL) }
- * to the template.  If neither flag is set, we don't add any
- * CKA_PRIVATE entry to the template.
- */
-
-/*
- * Attributes for PKCS #11 storage objects, which include not only
- * keys but also certificates and domain parameters.
- */
-
-/*
- * PK11_ATTR_TOKEN
- * PK11_ATTR_SESSION
- *
- * These two flags determine whether the object is a token or
- * session object.
- *
- * These two flags are related and cannot both be set.
- * If the PK11_ATTR_TOKEN flag is set, the object is a token
- * object.  If the PK11_ATTR_SESSION flag is set, the object is
- * a session object.  If neither flag is set, the object is *by
- * default* a session object.
- *
- * These two flags specify the value of the PKCS #11 CKA_TOKEN
- * attribute.
- */
-#define PK11_ATTR_TOKEN 0x00000001L
-#define PK11_ATTR_SESSION 0x00000002L
-
-/*
- * PK11_ATTR_PRIVATE
- * PK11_ATTR_PUBLIC
- *
- * These two flags determine whether the object is a private or
- * public object.  A user may not access a private object until the
- * user has authenticated to the token.
- *
- * These two flags are related and cannot both be set.
- * If the PK11_ATTR_PRIVATE flag is set, the object is a private
- * object.  If the PK11_ATTR_PUBLIC flag is set, the object is a
- * public object.  If neither flag is set, it is token-specific
- * whether the object is private or public.
- *
- * These two flags specify the value of the PKCS #11 CKA_PRIVATE
- * attribute.  NSS only uses this attribute on private and secret
- * keys, so public keys created by NSS get the token-specific
- * default value of the CKA_PRIVATE attribute.
- */
-#define PK11_ATTR_PRIVATE 0x00000004L
-#define PK11_ATTR_PUBLIC 0x00000008L
-
-/*
- * PK11_ATTR_MODIFIABLE
- * PK11_ATTR_UNMODIFIABLE
- *
- * These two flags determine whether the object is modifiable or
- * read-only.
- *
- * These two flags are related and cannot both be set.
- * If the PK11_ATTR_MODIFIABLE flag is set, the object can be
- * modified.  If the PK11_ATTR_UNMODIFIABLE flag is set, the object
- * is read-only.  If neither flag is set, the object is *by default*
- * modifiable.
- *
- * These two flags specify the value of the PKCS #11 CKA_MODIFIABLE
- * attribute.
- */
-#define PK11_ATTR_MODIFIABLE 0x00000010L
-#define PK11_ATTR_UNMODIFIABLE 0x00000020L
-
-/* Attributes for PKCS #11 key objects. */
-
-/*
- * PK11_ATTR_SENSITIVE
- * PK11_ATTR_INSENSITIVE
- *
- * These two flags are related and cannot both be set.
- * If the PK11_ATTR_SENSITIVE flag is set, the key is sensitive.
- * If the PK11_ATTR_INSENSITIVE flag is set, the key is not
- * sensitive.  If neither flag is set, it is token-specific whether
- * the key is sensitive or not.
- *
- * If a key is sensitive, certain attributes of the key cannot be
- * revealed in plaintext outside the token.
- *
- * This flag specifies the value of the PKCS #11 CKA_SENSITIVE
- * attribute.  Although the default value of the CKA_SENSITIVE
- * attribute for secret keys is CK_FALSE per PKCS #11, some FIPS
- * tokens set the default value to CK_TRUE because only CK_TRUE
- * is allowed.  So in practice the default value of this attribute
- * is token-specific, hence the need for two bitflags.
- */
-#define PK11_ATTR_SENSITIVE 0x00000040L
-#define PK11_ATTR_INSENSITIVE 0x00000080L
-
-/*
- * PK11_ATTR_EXTRACTABLE
- * PK11_ATTR_UNEXTRACTABLE
- *
- * These two flags are related and cannot both be set.
- * If the PK11_ATTR_EXTRACTABLE flag is set, the key is extractable
- * and can be wrapped.  If the PK11_ATTR_UNEXTRACTABLE flag is set,
- * the key is not extractable, and certain attributes of the key
- * cannot be revealed in plaintext outside the token (just like a
- * sensitive key).  If neither flag is set, it is token-specific
- * whether the key is extractable or not.
- *
- * These two flags specify the value of the PKCS #11 CKA_EXTRACTABLE
- * attribute.
- */
-#define PK11_ATTR_EXTRACTABLE 0x00000100L
-#define PK11_ATTR_UNEXTRACTABLE 0x00000200L
-
-/* Cryptographic module types */
-#define SECMOD_EXTERNAL 0 /* external module */
-#define SECMOD_INTERNAL 1 /* internal default module */
-#define SECMOD_FIPS 2     /* internal fips module */
-
-/* default module configuration strings */
-#define SECMOD_SLOT_FLAGS "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]"
-
-#define SECMOD_MAKE_NSS_FLAGS(fips, slot) \
-    "Flags=internal,critical" fips " slotparams=(" #slot "={" SECMOD_SLOT_FLAGS "})"
-
-#define SECMOD_INT_NAME "NSS Internal PKCS #11 Module"
-#define SECMOD_INT_FLAGS SECMOD_MAKE_NSS_FLAGS("", 1)
-#define SECMOD_FIPS_NAME "NSS Internal FIPS PKCS #11 Module"
-#define SECMOD_FIPS_FLAGS SECMOD_MAKE_NSS_FLAGS(",fips", 3)
-
-/*
- * What is the origin of a given Key. Normally this doesn't matter, but
- * the fortezza code needs to know if it needs to invoke the SSL3 fortezza
- * hack.
- */
-typedef enum {
-    PK11_OriginNULL = 0,         /* There is not key, it's a null SymKey */
-    PK11_OriginDerive = 1,       /* Key was derived from some other key */
-    PK11_OriginGenerated = 2,    /* Key was generated (also PBE keys) */
-    PK11_OriginFortezzaHack = 3, /* Key was marked for fortezza hack */
-    PK11_OriginUnwrap = 4        /* Key was unwrapped or decrypted */
-} PK11Origin;
-
-/* PKCS #11 disable reasons */
-typedef enum {
-    PK11_DIS_NONE = 0,
-    PK11_DIS_USER_SELECTED = 1,
-    PK11_DIS_COULD_NOT_INIT_TOKEN = 2,
-    PK11_DIS_TOKEN_VERIFY_FAILED = 3,
-    PK11_DIS_TOKEN_NOT_PRESENT = 4
-} PK11DisableReasons;
-
-/* types of PKCS #11 objects
- * used to identify which NSS data structure is
- * passed to the PK11_Raw* functions. Types map as follows:
- *   PK11_TypeGeneric            PK11GenericObject *
- *   PK11_TypePrivKey            SECKEYPrivateKey *
- *   PK11_TypePubKey             SECKEYPublicKey *
- *   PK11_TypeSymKey             PK11SymKey *
- *   PK11_TypeCert               CERTCertificate * (currently not used).
- */
-typedef enum {
-    PK11_TypeGeneric = 0,
-    PK11_TypePrivKey = 1,
-    PK11_TypePubKey = 2,
-    PK11_TypeCert = 3,
-    PK11_TypeSymKey = 4
-} PK11ObjectType;
-
-/* function pointer type for password callback function.
- * This type is passed in to PK11_SetPasswordFunc()
- */
-typedef char *(PR_CALLBACK *PK11PasswordFunc)(PK11SlotInfo *slot, PRBool retry, void *arg);
-typedef PRBool(PR_CALLBACK *PK11VerifyPasswordFunc)(PK11SlotInfo *slot, void *arg);
-typedef PRBool(PR_CALLBACK *PK11IsLoggedInFunc)(PK11SlotInfo *slot, void *arg);
-
-/*
- * Special strings the password callback function can return only if
- * the slot is an protected auth path slot.
- */
-#define PK11_PW_RETRY "RETRY"        /* an failed attempt to authenticate \
-                                      * has already been made, just retry \
-                                      * the operation */
-#define PK11_PW_AUTHENTICATED "AUTH" /* a successful attempt to authenticate \
-                                      * has completed. Continue without      \
-                                      * another call to C_Login */
-/* All other non-null values mean that that NSS could call C_Login to force
- * the authentication. The following define is to aid applications in
- * documenting that is what it's trying to do */
-#define PK11_PW_TRY "TRY" /* Default: a prompt has been presented \
-                           * to the user, initiate a C_Login      \
-                           * to authenticate the token */
-
-/*
- * PKCS #11 key structures
- */
-
-/*
-** Attributes
-*/
-struct SECKEYAttributeStr {
-    SECItem attrType;
-    SECItem **attrValue;
-};
-typedef struct SECKEYAttributeStr SECKEYAttribute;
-
-/*
-** A PKCS#8 private key info object
-*/
-struct SECKEYPrivateKeyInfoStr {
-    PLArenaPool *arena;
-    SECItem version;
-    SECAlgorithmID algorithm;
-    SECItem privateKey;
-    SECKEYAttribute **attributes;
-};
-typedef struct SECKEYPrivateKeyInfoStr SECKEYPrivateKeyInfo;
-
-/*
-** A PKCS#8 private key info object
-*/
-struct SECKEYEncryptedPrivateKeyInfoStr {
-    PLArenaPool *arena;
-    SECAlgorithmID algorithm;
-    SECItem encryptedData;
-};
-typedef struct SECKEYEncryptedPrivateKeyInfoStr SECKEYEncryptedPrivateKeyInfo;
-
-/*
- * token removal detection
- */
-typedef enum {
-    PK11TokenNotRemovable = 0,
-    PK11TokenPresent = 1,
-    PK11TokenChanged = 2,
-    PK11TokenRemoved = 3
-} PK11TokenStatus;
-
-typedef enum {
-    PK11TokenRemovedOrChangedEvent = 0,
-    PK11TokenPresentEvent = 1
-} PK11TokenEvent;
-
-/*
- * CRL Import Flags
- */
-#define CRL_IMPORT_DEFAULT_OPTIONS 0x00000000
-#define CRL_IMPORT_BYPASS_CHECKS 0x00000001
-
-/*
- * Merge Error Log
- */
-typedef struct PK11MergeLogStr PK11MergeLog;
-typedef struct PK11MergeLogNodeStr PK11MergeLogNode;
-
-/* These need to be global, leave some open fields so we can 'expand'
- * these without breaking binary compatibility */
-struct PK11MergeLogNodeStr {
-    PK11MergeLogNode *next;    /* next entry in the list */
-    PK11MergeLogNode *prev;    /* last entry in the list */
-    PK11GenericObject *object; /* object that failed */
-    int error;                 /* what the error was */
-    CK_RV reserved1;
-    unsigned long reserved2; /* future flags */
-    unsigned long reserved3; /* future scalar */
-    void *reserved4;         /* future pointer */
-    void *reserved5;         /* future expansion pointer */
-};
-
-struct PK11MergeLogStr {
-    PK11MergeLogNode *head;
-    PK11MergeLogNode *tail;
-    PLArenaPool *arena;
-    int version;
-    unsigned long reserved1;
-    unsigned long reserved2;
-    unsigned long reserved3;
-    void *reserverd4;
-    void *reserverd5;
-};
-
-#endif /*_SECMODT_H_ */
diff --git a/openflow/usr/include/nss/secoid.h b/openflow/usr/include/nss/secoid.h
deleted file mode 100644
index e6eaa8c..0000000
--- a/openflow/usr/include/nss/secoid.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _SECOID_H_
-#define _SECOID_H_
-
-#include "utilrename.h"
-
-/*
- * secoid.h - public data structures and prototypes for ASN.1 OID functions
- */
-
-#include "plarena.h"
-
-#include "seccomon.h"
-#include "secoidt.h"
-#include "secasn1t.h"
-
-SEC_BEGIN_PROTOS
-
-extern const SEC_ASN1Template SECOID_AlgorithmIDTemplate[];
-
-/* This functions simply returns the address of the above-declared template. */
-SEC_ASN1_CHOOSER_DECLARE(SECOID_AlgorithmIDTemplate)
-
-/*
- * OID handling routines
- */
-extern SECOidData *SECOID_FindOID(const SECItem *oid);
-extern SECOidTag SECOID_FindOIDTag(const SECItem *oid);
-extern SECOidData *SECOID_FindOIDByTag(SECOidTag tagnum);
-extern SECOidData *SECOID_FindOIDByMechanism(unsigned long mechanism);
-
-/****************************************/
-/*
-** Algorithm id handling operations
-*/
-
-/*
-** Fill in an algorithm-ID object given a tag and some parameters.
-**      "aid" where the DER encoded algorithm info is stored (memory
-**         is allocated)
-**      "tag" the tag number defining the algorithm
-**      "params" if not NULL, the parameters to go with the algorithm
-*/
-extern SECStatus SECOID_SetAlgorithmID(PLArenaPool *arena, SECAlgorithmID *aid,
-                                       SECOidTag tag, SECItem *params);
-
-/*
-** Copy the "src" object to "dest". Memory is allocated in "dest" for
-** each of the appropriate sub-objects. Memory in "dest" is not freed
-** before memory is allocated (use SECOID_DestroyAlgorithmID(dest, PR_FALSE)
-** to do that).
-*/
-extern SECStatus SECOID_CopyAlgorithmID(PLArenaPool *arena, SECAlgorithmID *dest,
-                                        const SECAlgorithmID *src);
-
-/*
-** Get the tag number for the given algorithm-id object.
-*/
-extern SECOidTag SECOID_GetAlgorithmTag(const SECAlgorithmID *aid);
-
-/*
-** Destroy an algorithm-id object.
-**      "aid" the certificate-request to destroy
-**      "freeit" if PR_TRUE then free the object as well as its sub-objects
-*/
-extern void SECOID_DestroyAlgorithmID(SECAlgorithmID *aid, PRBool freeit);
-
-/*
-** Compare two algorithm-id objects, returning the difference between
-** them.
-*/
-extern SECComparison SECOID_CompareAlgorithmID(SECAlgorithmID *a,
-                                               SECAlgorithmID *b);
-
-extern PRBool SECOID_KnownCertExtenOID(SECItem *extenOid);
-
-/* Given a tag number, return a string describing it.
- */
-extern const char *SECOID_FindOIDTagDescription(SECOidTag tagnum);
-
-/* Add a dynamic SECOidData to the dynamic OID table.
-** Routine copies the src entry, and returns the new SECOidTag.
-** Returns SEC_OID_INVALID if failed to add for some reason.
-*/
-extern SECOidTag SECOID_AddEntry(const SECOidData *src);
-
-/*
- * initialize the oid data structures.
- */
-extern SECStatus SECOID_Init(void);
-
-/*
- * free up the oid data structures.
- */
-extern SECStatus SECOID_Shutdown(void);
-
-/* if to->data is not NULL, and to->len is large enough to hold the result,
- * then the resultant OID will be copyed into to->data, and to->len will be
- * changed to show the actual OID length.
- * Otherwise, memory for the OID will be allocated (from the caller's
- * PLArenaPool, if pool is non-NULL) and to->data will receive the address
- * of the allocated data, and to->len will receive the OID length.
- * The original value of to->data is not freed when a new buffer is allocated.
- *
- * The input string may begin with "OID." and this still be ignored.
- * The length of the input string is given in len.  If len == 0, then
- * len will be computed as strlen(from), meaning it must be NUL terminated.
- * It is an error if from == NULL, or if *from == '\0'.
- */
-extern SECStatus SEC_StringToOID(PLArenaPool *pool, SECItem *to,
-                                 const char *from, PRUint32 len);
-
-extern void UTIL_SetForkState(PRBool forked);
-
-/*
- * Accessor functions for new opaque extended SECOID table.
- * Any of these functions may return SECSuccess or SECFailure with the error
- * code set to SEC_ERROR_UNKNOWN_OBJECT_TYPE if the SECOidTag is out of range.
- */
-
-/* The Get function outputs the 32-bit value associated with the SECOidTag.
- * Flags bits are the NSS_USE_ALG_ #defines in "secoidt.h".
- * Default value for any algorithm is 0xffffffff (enabled for all purposes).
- * No value is output if function returns SECFailure.
- */
-extern SECStatus NSS_GetAlgorithmPolicy(SECOidTag tag, PRUint32 *pValue);
-
-/* The Set function modifies the stored value according to the following
- * algorithm:
- *   policy[tag] = (policy[tag] & ~clearBits) | setBits;
- */
-extern SECStatus
-NSS_SetAlgorithmPolicy(SECOidTag tag, PRUint32 setBits, PRUint32 clearBits);
-
-SEC_END_PROTOS
-
-#endif /* _SECOID_H_ */
diff --git a/openflow/usr/include/nss/secoidt.h b/openflow/usr/include/nss/secoidt.h
deleted file mode 100644
index 0a40f29..0000000
--- a/openflow/usr/include/nss/secoidt.h
+++ /dev/null
@@ -1,540 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _SECOIDT_H_
-#define _SECOIDT_H_
-
-#include "utilrename.h"
-
-/*
- * secoidt.h - public data structures for ASN.1 OID functions
- */
-
-#include "secitem.h"
-
-typedef struct SECOidDataStr SECOidData;
-typedef struct SECAlgorithmIDStr SECAlgorithmID;
-
-/*
-** An X.500 algorithm identifier
-*/
-struct SECAlgorithmIDStr {
-    SECItem algorithm;
-    SECItem parameters;
-};
-
-/*
- * Misc object IDs - these numbers are for convenient handling.
- * They are mapped into real object IDs
- *
- * NOTE: the order of these entries must mach the array "oids" of SECOidData
- * in util/secoid.c.
- */
-typedef enum {
-    SEC_OID_UNKNOWN = 0,
-    SEC_OID_MD2 = 1,
-    SEC_OID_MD4 = 2,
-    SEC_OID_MD5 = 3,
-    SEC_OID_SHA1 = 4,
-    SEC_OID_RC2_CBC = 5,
-    SEC_OID_RC4 = 6,
-    SEC_OID_DES_EDE3_CBC = 7,
-    SEC_OID_RC5_CBC_PAD = 8,
-    SEC_OID_DES_ECB = 9,
-    SEC_OID_DES_CBC = 10,
-    SEC_OID_DES_OFB = 11,
-    SEC_OID_DES_CFB = 12,
-    SEC_OID_DES_MAC = 13,
-    SEC_OID_DES_EDE = 14,
-    SEC_OID_ISO_SHA_WITH_RSA_SIGNATURE = 15,
-    SEC_OID_PKCS1_RSA_ENCRYPTION = 16,
-    SEC_OID_PKCS1_MD2_WITH_RSA_ENCRYPTION = 17,
-    SEC_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION = 18,
-    SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION = 19,
-    SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION = 20,
-    SEC_OID_PKCS5_PBE_WITH_MD2_AND_DES_CBC = 21,
-    SEC_OID_PKCS5_PBE_WITH_MD5_AND_DES_CBC = 22,
-    SEC_OID_PKCS5_PBE_WITH_SHA1_AND_DES_CBC = 23,
-    SEC_OID_PKCS7 = 24,
-    SEC_OID_PKCS7_DATA = 25,
-    SEC_OID_PKCS7_SIGNED_DATA = 26,
-    SEC_OID_PKCS7_ENVELOPED_DATA = 27,
-    SEC_OID_PKCS7_SIGNED_ENVELOPED_DATA = 28,
-    SEC_OID_PKCS7_DIGESTED_DATA = 29,
-    SEC_OID_PKCS7_ENCRYPTED_DATA = 30,
-    SEC_OID_PKCS9_EMAIL_ADDRESS = 31,
-    SEC_OID_PKCS9_UNSTRUCTURED_NAME = 32,
-    SEC_OID_PKCS9_CONTENT_TYPE = 33,
-    SEC_OID_PKCS9_MESSAGE_DIGEST = 34,
-    SEC_OID_PKCS9_SIGNING_TIME = 35,
-    SEC_OID_PKCS9_COUNTER_SIGNATURE = 36,
-    SEC_OID_PKCS9_CHALLENGE_PASSWORD = 37,
-    SEC_OID_PKCS9_UNSTRUCTURED_ADDRESS = 38,
-    SEC_OID_PKCS9_EXTENDED_CERTIFICATE_ATTRIBUTES = 39,
-    SEC_OID_PKCS9_SMIME_CAPABILITIES = 40,
-    SEC_OID_AVA_COMMON_NAME = 41,
-    SEC_OID_AVA_COUNTRY_NAME = 42,
-    SEC_OID_AVA_LOCALITY = 43,
-    SEC_OID_AVA_STATE_OR_PROVINCE = 44,
-    SEC_OID_AVA_ORGANIZATION_NAME = 45,
-    SEC_OID_AVA_ORGANIZATIONAL_UNIT_NAME = 46,
-    SEC_OID_AVA_DN_QUALIFIER = 47,
-    SEC_OID_AVA_DC = 48,
-
-    SEC_OID_NS_TYPE_GIF = 49,
-    SEC_OID_NS_TYPE_JPEG = 50,
-    SEC_OID_NS_TYPE_URL = 51,
-    SEC_OID_NS_TYPE_HTML = 52,
-    SEC_OID_NS_TYPE_CERT_SEQUENCE = 53,
-    SEC_OID_MISSI_KEA_DSS_OLD = 54,
-    SEC_OID_MISSI_DSS_OLD = 55,
-    SEC_OID_MISSI_KEA_DSS = 56,
-    SEC_OID_MISSI_DSS = 57,
-    SEC_OID_MISSI_KEA = 58,
-    SEC_OID_MISSI_ALT_KEA = 59,
-
-    /* Netscape private certificate extensions */
-    SEC_OID_NS_CERT_EXT_NETSCAPE_OK = 60,
-    SEC_OID_NS_CERT_EXT_ISSUER_LOGO = 61,
-    SEC_OID_NS_CERT_EXT_SUBJECT_LOGO = 62,
-    SEC_OID_NS_CERT_EXT_CERT_TYPE = 63,
-    SEC_OID_NS_CERT_EXT_BASE_URL = 64,
-    SEC_OID_NS_CERT_EXT_REVOCATION_URL = 65,
-    SEC_OID_NS_CERT_EXT_CA_REVOCATION_URL = 66,
-    SEC_OID_NS_CERT_EXT_CA_CRL_URL = 67,
-    SEC_OID_NS_CERT_EXT_CA_CERT_URL = 68,
-    SEC_OID_NS_CERT_EXT_CERT_RENEWAL_URL = 69,
-    SEC_OID_NS_CERT_EXT_CA_POLICY_URL = 70,
-    SEC_OID_NS_CERT_EXT_HOMEPAGE_URL = 71,
-    SEC_OID_NS_CERT_EXT_ENTITY_LOGO = 72,
-    SEC_OID_NS_CERT_EXT_USER_PICTURE = 73,
-    SEC_OID_NS_CERT_EXT_SSL_SERVER_NAME = 74,
-    SEC_OID_NS_CERT_EXT_COMMENT = 75,
-    SEC_OID_NS_CERT_EXT_LOST_PASSWORD_URL = 76,
-    SEC_OID_NS_CERT_EXT_CERT_RENEWAL_TIME = 77,
-    SEC_OID_NS_KEY_USAGE_GOVT_APPROVED = 78,
-
-    /* x.509 v3 Extensions */
-    SEC_OID_X509_SUBJECT_DIRECTORY_ATTR = 79,
-    SEC_OID_X509_SUBJECT_KEY_ID = 80,
-    SEC_OID_X509_KEY_USAGE = 81,
-    SEC_OID_X509_PRIVATE_KEY_USAGE_PERIOD = 82,
-    SEC_OID_X509_SUBJECT_ALT_NAME = 83,
-    SEC_OID_X509_ISSUER_ALT_NAME = 84,
-    SEC_OID_X509_BASIC_CONSTRAINTS = 85,
-    SEC_OID_X509_NAME_CONSTRAINTS = 86,
-    SEC_OID_X509_CRL_DIST_POINTS = 87,
-    SEC_OID_X509_CERTIFICATE_POLICIES = 88,
-    SEC_OID_X509_POLICY_MAPPINGS = 89,
-    SEC_OID_X509_POLICY_CONSTRAINTS = 90,
-    SEC_OID_X509_AUTH_KEY_ID = 91,
-    SEC_OID_X509_EXT_KEY_USAGE = 92,
-    SEC_OID_X509_AUTH_INFO_ACCESS = 93,
-
-    SEC_OID_X509_CRL_NUMBER = 94,
-    SEC_OID_X509_REASON_CODE = 95,
-    SEC_OID_X509_INVALID_DATE = 96,
-    /* End of x.509 v3 Extensions */
-
-    SEC_OID_X500_RSA_ENCRYPTION = 97,
-
-    /* alg 1485 additions */
-    SEC_OID_RFC1274_UID = 98,
-    SEC_OID_RFC1274_MAIL = 99,
-
-    /* PKCS 12 additions */
-    SEC_OID_PKCS12 = 100,
-    SEC_OID_PKCS12_MODE_IDS = 101,
-    SEC_OID_PKCS12_ESPVK_IDS = 102,
-    SEC_OID_PKCS12_BAG_IDS = 103,
-    SEC_OID_PKCS12_CERT_BAG_IDS = 104,
-    SEC_OID_PKCS12_OIDS = 105,
-    SEC_OID_PKCS12_PBE_IDS = 106,
-    SEC_OID_PKCS12_SIGNATURE_IDS = 107,
-    SEC_OID_PKCS12_ENVELOPING_IDS = 108,
-    /* SEC_OID_PKCS12_OFFLINE_TRANSPORT_MODE,
-    SEC_OID_PKCS12_ONLINE_TRANSPORT_MODE, */
-    SEC_OID_PKCS12_PKCS8_KEY_SHROUDING = 109,
-    SEC_OID_PKCS12_KEY_BAG_ID = 110,
-    SEC_OID_PKCS12_CERT_AND_CRL_BAG_ID = 111,
-    SEC_OID_PKCS12_SECRET_BAG_ID = 112,
-    SEC_OID_PKCS12_X509_CERT_CRL_BAG = 113,
-    SEC_OID_PKCS12_SDSI_CERT_BAG = 114,
-    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_128_BIT_RC4 = 115,
-    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_40_BIT_RC4 = 116,
-    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_TRIPLE_DES_CBC = 117,
-    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC = 118,
-    SEC_OID_PKCS12_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC = 119,
-    SEC_OID_PKCS12_RSA_ENCRYPTION_WITH_128_BIT_RC4 = 120,
-    SEC_OID_PKCS12_RSA_ENCRYPTION_WITH_40_BIT_RC4 = 121,
-    SEC_OID_PKCS12_RSA_ENCRYPTION_WITH_TRIPLE_DES = 122,
-    SEC_OID_PKCS12_RSA_SIGNATURE_WITH_SHA1_DIGEST = 123,
-    /* end of PKCS 12 additions */
-
-    /* DSA signatures */
-    SEC_OID_ANSIX9_DSA_SIGNATURE = 124,
-    SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST = 125,
-    SEC_OID_BOGUS_DSA_SIGNATURE_WITH_SHA1_DIGEST = 126,
-
-    /* Verisign OIDs */
-    SEC_OID_VERISIGN_USER_NOTICES = 127,
-
-    /* PKIX OIDs */
-    SEC_OID_PKIX_CPS_POINTER_QUALIFIER = 128,
-    SEC_OID_PKIX_USER_NOTICE_QUALIFIER = 129,
-    SEC_OID_PKIX_OCSP = 130,
-    SEC_OID_PKIX_OCSP_BASIC_RESPONSE = 131,
-    SEC_OID_PKIX_OCSP_NONCE = 132,
-    SEC_OID_PKIX_OCSP_CRL = 133,
-    SEC_OID_PKIX_OCSP_RESPONSE = 134,
-    SEC_OID_PKIX_OCSP_NO_CHECK = 135,
-    SEC_OID_PKIX_OCSP_ARCHIVE_CUTOFF = 136,
-    SEC_OID_PKIX_OCSP_SERVICE_LOCATOR = 137,
-    SEC_OID_PKIX_REGCTRL_REGTOKEN = 138,
-    SEC_OID_PKIX_REGCTRL_AUTHENTICATOR = 139,
-    SEC_OID_PKIX_REGCTRL_PKIPUBINFO = 140,
-    SEC_OID_PKIX_REGCTRL_PKI_ARCH_OPTIONS = 141,
-    SEC_OID_PKIX_REGCTRL_OLD_CERT_ID = 142,
-    SEC_OID_PKIX_REGCTRL_PROTOCOL_ENC_KEY = 143,
-    SEC_OID_PKIX_REGINFO_UTF8_PAIRS = 144,
-    SEC_OID_PKIX_REGINFO_CERT_REQUEST = 145,
-    SEC_OID_EXT_KEY_USAGE_SERVER_AUTH = 146,
-    SEC_OID_EXT_KEY_USAGE_CLIENT_AUTH = 147,
-    SEC_OID_EXT_KEY_USAGE_CODE_SIGN = 148,
-    SEC_OID_EXT_KEY_USAGE_EMAIL_PROTECT = 149,
-    SEC_OID_EXT_KEY_USAGE_TIME_STAMP = 150,
-    SEC_OID_OCSP_RESPONDER = 151,
-
-    /* Netscape Algorithm OIDs */
-    SEC_OID_NETSCAPE_SMIME_KEA = 152,
-
-    /* Skipjack OID -- ### mwelch temporary */
-    SEC_OID_FORTEZZA_SKIPJACK = 153,
-
-    /* PKCS 12 V2 oids */
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC4 = 154,
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC4 = 155,
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC = 156,
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_2KEY_TRIPLE_DES_CBC = 157,
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC = 158,
-    SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC = 159,
-    SEC_OID_PKCS12_SAFE_CONTENTS_ID = 160,
-    SEC_OID_PKCS12_PKCS8_SHROUDED_KEY_BAG_ID = 161,
-
-    SEC_OID_PKCS12_V1_KEY_BAG_ID = 162,
-    SEC_OID_PKCS12_V1_PKCS8_SHROUDED_KEY_BAG_ID = 163,
-    SEC_OID_PKCS12_V1_CERT_BAG_ID = 164,
-    SEC_OID_PKCS12_V1_CRL_BAG_ID = 165,
-    SEC_OID_PKCS12_V1_SECRET_BAG_ID = 166,
-    SEC_OID_PKCS12_V1_SAFE_CONTENTS_BAG_ID = 167,
-    SEC_OID_PKCS9_X509_CERT = 168,
-    SEC_OID_PKCS9_SDSI_CERT = 169,
-    SEC_OID_PKCS9_X509_CRL = 170,
-    SEC_OID_PKCS9_FRIENDLY_NAME = 171,
-    SEC_OID_PKCS9_LOCAL_KEY_ID = 172,
-    SEC_OID_BOGUS_KEY_USAGE = 173,
-
-    /*Diffe Helman OIDS */
-    SEC_OID_X942_DIFFIE_HELMAN_KEY = 174,
-
-    /* Netscape other name types */
-    /* SEC_OID_NETSCAPE_NICKNAME is an otherName field of type IA5String
-     * in the subjectAltName certificate extension.  NSS dropped support
-     * for SEC_OID_NETSCAPE_NICKNAME in NSS 3.13. */
-    SEC_OID_NETSCAPE_NICKNAME = 175,
-
-    /* Cert Server OIDS */
-    SEC_OID_NETSCAPE_RECOVERY_REQUEST = 176,
-
-    /* New PSM certificate management OIDs */
-    SEC_OID_CERT_RENEWAL_LOCATOR = 177,
-    SEC_OID_NS_CERT_EXT_SCOPE_OF_USE = 178,
-
-    /* CMS (RFC2630) OIDs */
-    SEC_OID_CMS_EPHEMERAL_STATIC_DIFFIE_HELLMAN = 179,
-    SEC_OID_CMS_3DES_KEY_WRAP = 180,
-    SEC_OID_CMS_RC2_KEY_WRAP = 181,
-
-    /* SMIME attributes */
-    SEC_OID_SMIME_ENCRYPTION_KEY_PREFERENCE = 182,
-
-    /* AES OIDs */
-    SEC_OID_AES_128_ECB = 183,
-    SEC_OID_AES_128_CBC = 184,
-    SEC_OID_AES_192_ECB = 185,
-    SEC_OID_AES_192_CBC = 186,
-    SEC_OID_AES_256_ECB = 187,
-    SEC_OID_AES_256_CBC = 188,
-
-    SEC_OID_SDN702_DSA_SIGNATURE = 189,
-
-    SEC_OID_MS_SMIME_ENCRYPTION_KEY_PREFERENCE = 190,
-
-    SEC_OID_SHA256 = 191,
-    SEC_OID_SHA384 = 192,
-    SEC_OID_SHA512 = 193,
-
-    SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION = 194,
-    SEC_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION = 195,
-    SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION = 196,
-
-    SEC_OID_AES_128_KEY_WRAP = 197,
-    SEC_OID_AES_192_KEY_WRAP = 198,
-    SEC_OID_AES_256_KEY_WRAP = 199,
-
-    /* Elliptic Curve Cryptography (ECC) OIDs */
-    SEC_OID_ANSIX962_EC_PUBLIC_KEY = 200,
-    SEC_OID_ANSIX962_ECDSA_SHA1_SIGNATURE = 201,
-
-#define SEC_OID_ANSIX962_ECDSA_SIGNATURE_WITH_SHA1_DIGEST \
-    SEC_OID_ANSIX962_ECDSA_SHA1_SIGNATURE
-
-    /* ANSI X9.62 named elliptic curves (prime field) */
-    SEC_OID_ANSIX962_EC_PRIME192V1 = 202,
-    SEC_OID_ANSIX962_EC_PRIME192V2 = 203,
-    SEC_OID_ANSIX962_EC_PRIME192V3 = 204,
-    SEC_OID_ANSIX962_EC_PRIME239V1 = 205,
-    SEC_OID_ANSIX962_EC_PRIME239V2 = 206,
-    SEC_OID_ANSIX962_EC_PRIME239V3 = 207,
-    SEC_OID_ANSIX962_EC_PRIME256V1 = 208,
-
-    /* SECG named elliptic curves (prime field) */
-    SEC_OID_SECG_EC_SECP112R1 = 209,
-    SEC_OID_SECG_EC_SECP112R2 = 210,
-    SEC_OID_SECG_EC_SECP128R1 = 211,
-    SEC_OID_SECG_EC_SECP128R2 = 212,
-    SEC_OID_SECG_EC_SECP160K1 = 213,
-    SEC_OID_SECG_EC_SECP160R1 = 214,
-    SEC_OID_SECG_EC_SECP160R2 = 215,
-    SEC_OID_SECG_EC_SECP192K1 = 216,
-    /* SEC_OID_SECG_EC_SECP192R1 is SEC_OID_ANSIX962_EC_PRIME192V1 */
-    SEC_OID_SECG_EC_SECP224K1 = 217,
-    SEC_OID_SECG_EC_SECP224R1 = 218,
-    SEC_OID_SECG_EC_SECP256K1 = 219,
-    /* SEC_OID_SECG_EC_SECP256R1 is SEC_OID_ANSIX962_EC_PRIME256V1 */
-    SEC_OID_SECG_EC_SECP384R1 = 220,
-    SEC_OID_SECG_EC_SECP521R1 = 221,
-
-    /* ANSI X9.62 named elliptic curves (characteristic two field) */
-    SEC_OID_ANSIX962_EC_C2PNB163V1 = 222,
-    SEC_OID_ANSIX962_EC_C2PNB163V2 = 223,
-    SEC_OID_ANSIX962_EC_C2PNB163V3 = 224,
-    SEC_OID_ANSIX962_EC_C2PNB176V1 = 225,
-    SEC_OID_ANSIX962_EC_C2TNB191V1 = 226,
-    SEC_OID_ANSIX962_EC_C2TNB191V2 = 227,
-    SEC_OID_ANSIX962_EC_C2TNB191V3 = 228,
-    SEC_OID_ANSIX962_EC_C2ONB191V4 = 229,
-    SEC_OID_ANSIX962_EC_C2ONB191V5 = 230,
-    SEC_OID_ANSIX962_EC_C2PNB208W1 = 231,
-    SEC_OID_ANSIX962_EC_C2TNB239V1 = 232,
-    SEC_OID_ANSIX962_EC_C2TNB239V2 = 233,
-    SEC_OID_ANSIX962_EC_C2TNB239V3 = 234,
-    SEC_OID_ANSIX962_EC_C2ONB239V4 = 235,
-    SEC_OID_ANSIX962_EC_C2ONB239V5 = 236,
-    SEC_OID_ANSIX962_EC_C2PNB272W1 = 237,
-    SEC_OID_ANSIX962_EC_C2PNB304W1 = 238,
-    SEC_OID_ANSIX962_EC_C2TNB359V1 = 239,
-    SEC_OID_ANSIX962_EC_C2PNB368W1 = 240,
-    SEC_OID_ANSIX962_EC_C2TNB431R1 = 241,
-
-    /* SECG named elliptic curves (characteristic two field) */
-    SEC_OID_SECG_EC_SECT113R1 = 242,
-    SEC_OID_SECG_EC_SECT113R2 = 243,
-    SEC_OID_SECG_EC_SECT131R1 = 244,
-    SEC_OID_SECG_EC_SECT131R2 = 245,
-    SEC_OID_SECG_EC_SECT163K1 = 246,
-    SEC_OID_SECG_EC_SECT163R1 = 247,
-    SEC_OID_SECG_EC_SECT163R2 = 248,
-    SEC_OID_SECG_EC_SECT193R1 = 249,
-    SEC_OID_SECG_EC_SECT193R2 = 250,
-    SEC_OID_SECG_EC_SECT233K1 = 251,
-    SEC_OID_SECG_EC_SECT233R1 = 252,
-    SEC_OID_SECG_EC_SECT239K1 = 253,
-    SEC_OID_SECG_EC_SECT283K1 = 254,
-    SEC_OID_SECG_EC_SECT283R1 = 255,
-    SEC_OID_SECG_EC_SECT409K1 = 256,
-    SEC_OID_SECG_EC_SECT409R1 = 257,
-    SEC_OID_SECG_EC_SECT571K1 = 258,
-    SEC_OID_SECG_EC_SECT571R1 = 259,
-
-    SEC_OID_NETSCAPE_AOLSCREENNAME = 260,
-
-    SEC_OID_AVA_SURNAME = 261,
-    SEC_OID_AVA_SERIAL_NUMBER = 262,
-    SEC_OID_AVA_STREET_ADDRESS = 263,
-    SEC_OID_AVA_TITLE = 264,
-    SEC_OID_AVA_POSTAL_ADDRESS = 265,
-    SEC_OID_AVA_POSTAL_CODE = 266,
-    SEC_OID_AVA_POST_OFFICE_BOX = 267,
-    SEC_OID_AVA_GIVEN_NAME = 268,
-    SEC_OID_AVA_INITIALS = 269,
-    SEC_OID_AVA_GENERATION_QUALIFIER = 270,
-    SEC_OID_AVA_HOUSE_IDENTIFIER = 271,
-    SEC_OID_AVA_PSEUDONYM = 272,
-
-    /* More OIDs */
-    SEC_OID_PKIX_CA_ISSUERS = 273,
-    SEC_OID_PKCS9_EXTENSION_REQUEST = 274,
-
-    /* new EC Signature oids */
-    SEC_OID_ANSIX962_ECDSA_SIGNATURE_RECOMMENDED_DIGEST = 275,
-    SEC_OID_ANSIX962_ECDSA_SIGNATURE_SPECIFIED_DIGEST = 276,
-    SEC_OID_ANSIX962_ECDSA_SHA224_SIGNATURE = 277,
-    SEC_OID_ANSIX962_ECDSA_SHA256_SIGNATURE = 278,
-    SEC_OID_ANSIX962_ECDSA_SHA384_SIGNATURE = 279,
-    SEC_OID_ANSIX962_ECDSA_SHA512_SIGNATURE = 280,
-
-    /* More id-ce and id-pe OIDs from RFC 3280 */
-    SEC_OID_X509_HOLD_INSTRUCTION_CODE = 281,
-    SEC_OID_X509_DELTA_CRL_INDICATOR = 282,
-    SEC_OID_X509_ISSUING_DISTRIBUTION_POINT = 283,
-    SEC_OID_X509_CERT_ISSUER = 284,
-    SEC_OID_X509_FRESHEST_CRL = 285,
-    SEC_OID_X509_INHIBIT_ANY_POLICY = 286,
-    SEC_OID_X509_SUBJECT_INFO_ACCESS = 287,
-
-    /* Camellia OIDs (RFC3657)*/
-    SEC_OID_CAMELLIA_128_CBC = 288,
-    SEC_OID_CAMELLIA_192_CBC = 289,
-    SEC_OID_CAMELLIA_256_CBC = 290,
-
-    /* PKCS 5 V2 OIDS */
-    SEC_OID_PKCS5_PBKDF2 = 291,
-    SEC_OID_PKCS5_PBES2 = 292,
-    SEC_OID_PKCS5_PBMAC1 = 293,
-    SEC_OID_HMAC_SHA1 = 294,
-    SEC_OID_HMAC_SHA224 = 295,
-    SEC_OID_HMAC_SHA256 = 296,
-    SEC_OID_HMAC_SHA384 = 297,
-    SEC_OID_HMAC_SHA512 = 298,
-
-    SEC_OID_PKIX_TIMESTAMPING = 299,
-    SEC_OID_PKIX_CA_REPOSITORY = 300,
-
-    SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE = 301,
-
-    SEC_OID_SEED_CBC = 302,
-
-    SEC_OID_X509_ANY_POLICY = 303,
-
-    SEC_OID_PKCS1_RSA_OAEP_ENCRYPTION = 304,
-    SEC_OID_PKCS1_MGF1 = 305,
-    SEC_OID_PKCS1_PSPECIFIED = 306,
-    SEC_OID_PKCS1_RSA_PSS_SIGNATURE = 307,
-    SEC_OID_PKCS1_SHA224_WITH_RSA_ENCRYPTION = 308,
-
-    SEC_OID_SHA224 = 309,
-
-    SEC_OID_EV_INCORPORATION_LOCALITY = 310,
-    SEC_OID_EV_INCORPORATION_STATE = 311,
-    SEC_OID_EV_INCORPORATION_COUNTRY = 312,
-    SEC_OID_BUSINESS_CATEGORY = 313,
-
-    SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA224_DIGEST = 314,
-    SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST = 315,
-
-    /* Microsoft Trust List Signing
-     * szOID_KP_CTL_USAGE_SIGNING
-     * where KP stands for Key Purpose
-     */
-    SEC_OID_MS_EXT_KEY_USAGE_CTL_SIGNING = 316,
-
-    /* The 'name' attribute type in X.520 */
-    SEC_OID_AVA_NAME = 317,
-
-    SEC_OID_AES_128_GCM = 318,
-    SEC_OID_AES_192_GCM = 319,
-    SEC_OID_AES_256_GCM = 320,
-    SEC_OID_IDEA_CBC = 321,
-
-    /* pseudo - OIDs */
-
-    SEC_OID_RC2_40_CBC = 322,
-    SEC_OID_DES_40_CBC = 323,
-    SEC_OID_RC4_40 = 324,
-    SEC_OID_RC4_56 = 325,
-    SEC_OID_NULL_CIPHER = 326,
-
-    SEC_OID_HMAC_MD5 = 327,
-
-    SEC_OID_TLS_RSA = 328,
-    SEC_OID_TLS_DHE_RSA = 329,
-    SEC_OID_TLS_DHE_DSS = 330,
-    SEC_OID_TLS_DH_RSA = 331,
-    SEC_OID_TLS_DH_DSS = 332,
-    SEC_OID_TLS_DH_ANON = 333,
-    SEC_OID_TLS_ECDHE_ECDSA = 334,
-    SEC_OID_TLS_ECDHE_RSA = 335,
-    SEC_OID_TLS_ECDH_ECDSA = 336,
-    SEC_OID_TLS_ECDH_RSA = 337,
-    SEC_OID_TLS_ECDH_ANON = 338,
-    SEC_OID_TLS_RSA_EXPORT = 339,
-
-    SEC_OID_TLS_DHE_RSA_EXPORT = 340,
-    SEC_OID_TLS_DHE_DSS_EXPORT = 341,
-    SEC_OID_TLS_DH_RSA_EXPORT = 342,
-    SEC_OID_TLS_DH_DSS_EXPORT = 343,
-    SEC_OID_TLS_DH_ANON_EXPORT = 344,
-    SEC_OID_APPLY_SSL_POLICY = 345,
-
-    SEC_OID_CHACHA20_POLY1305 = 346,
-
-    SEC_OID_TLS_ECDHE_PSK = 347,
-    SEC_OID_TLS_DHE_PSK = 348,
-
-    SEC_OID_TLS_FFDHE_2048 = 349,
-    SEC_OID_TLS_FFDHE_3072 = 350,
-    SEC_OID_TLS_FFDHE_4096 = 351,
-    SEC_OID_TLS_FFDHE_6144 = 352,
-    SEC_OID_TLS_FFDHE_8192 = 353,
-    SEC_OID_TLS_DHE_CUSTOM = 354,
-
-    SEC_OID_CURVE25519 = 355,
-
-    SEC_OID_TLS13_KEA_ANY = 356,
-
-    SEC_OID_TOTAL
-} SECOidTag;
-
-#define SEC_OID_SECG_EC_SECP192R1 SEC_OID_ANSIX962_EC_PRIME192V1
-#define SEC_OID_SECG_EC_SECP256R1 SEC_OID_ANSIX962_EC_PRIME256V1
-#define SEC_OID_PKCS12_KEY_USAGE SEC_OID_X509_KEY_USAGE
-
-/* fake OID for DSS sign/verify */
-#define SEC_OID_SHA SEC_OID_MISS_DSS
-
-typedef enum {
-    INVALID_CERT_EXTENSION = 0,
-    UNSUPPORTED_CERT_EXTENSION = 1,
-    SUPPORTED_CERT_EXTENSION = 2
-} SECSupportExtenTag;
-
-struct SECOidDataStr {
-    SECItem oid;
-    SECOidTag offset;
-    const char* desc;
-    unsigned long mechanism;
-    SECSupportExtenTag supportedExtension;
-    /* only used for x.509 v3 extensions, so
-       that we can print the names of those
-       extensions that we don't even support */
-};
-
-/* New Opaque extended OID table API.
- * These are algorithm policy Flags, used with functions
- * NSS_SetAlgorithmPolicy & NSS_GetAlgorithmPolicy.
- */
-#define NSS_USE_ALG_IN_CERT_SIGNATURE 0x00000001 /* CRLs and OCSP, too */
-#define NSS_USE_ALG_IN_CMS_SIGNATURE 0x00000002  /* used in S/MIME */
-#define NSS_USE_ALG_IN_SSL_KX 0x00000004         /* used in SSL key exchange */
-#define NSS_USE_ALG_IN_SSL 0x00000008            /* used in SSL record protocol */
-#define NSS_USE_POLICY_IN_SSL 0x00000010         /* enable policy in SSL protocol */
-#define NSS_USE_ALG_RESERVED 0xfffffffc          /* may be used in future */
-
-/* Code MUST NOT SET or CLEAR reserved bits, and must NOT depend on them
- * being all zeros or having any other known value.  The reserved bits
- * must be ignored.
- */
-
-#endif /* _SECOIDT_H_ */
diff --git a/openflow/usr/include/nss/secpkcs5.h b/openflow/usr/include/nss/secpkcs5.h
deleted file mode 100644
index 5785676..0000000
--- a/openflow/usr/include/nss/secpkcs5.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef _SECPKCS5_H_
-#define _SECPKCS5_H_
-#include "seccomon.h"
-#include "secmodt.h"
-
-/* used for V2 PKCS 12 Draft Spec */
-typedef enum {
-    pbeBitGenIDNull = 0,
-    pbeBitGenCipherKey = 0x01,
-    pbeBitGenCipherIV = 0x02,
-    pbeBitGenIntegrityKey = 0x03
-} PBEBitGenID;
-
-typedef struct PBEBitGenContextStr PBEBitGenContext;
-
-SEC_BEGIN_PROTOS
-
-/* private */
-SECAlgorithmID *
-sec_pkcs5CreateAlgorithmID(SECOidTag algorithm, SECOidTag cipherAlgorithm,
-                           SECOidTag prfAlg, SECOidTag *pPbeAlgorithm,
-                           int keyLengh, SECItem *salt, int iteration);
-
-/* Get the initialization vector.  The password is passed in, hashing
- * is performed, and the initialization vector is returned.
- *  algid is a pointer to a PBE algorithm ID
- *  pwitem is the password
- * If an error occurs or the algorithm id is not a PBE algrithm,
- * NULL is returned.  Otherwise, the iv is returned in a secitem.
- */
-SECItem *
-SEC_PKCS5GetIV(SECAlgorithmID *algid, SECItem *pwitem, PRBool faulty3DES);
-
-SECOidTag SEC_PKCS5GetCryptoAlgorithm(SECAlgorithmID *algid);
-PRBool SEC_PKCS5IsAlgorithmPBEAlg(SECAlgorithmID *algid);
-PRBool SEC_PKCS5IsAlgorithmPBEAlgTag(SECOidTag algTag);
-SECOidTag SEC_PKCS5GetPBEAlgorithm(SECOidTag algTag, int keyLen);
-int SEC_PKCS5GetKeyLength(SECAlgorithmID *algid);
-
-/**********************************************************************
- * Deprecated PBE functions.  Use the PBE functions in pk11func.h
- * instead.
- **********************************************************************/
-
-PBEBitGenContext *
-PBE_CreateContext(SECOidTag hashAlgorithm, PBEBitGenID bitGenPurpose,
-                  SECItem *pwitem, SECItem *salt, unsigned int bitsNeeded,
-                  unsigned int iterations);
-
-void
-PBE_DestroyContext(PBEBitGenContext *context);
-
-SECItem *
-PBE_GenerateBits(PBEBitGenContext *context);
-
-SEC_END_PROTOS
-
-#endif /* _SECPKS5_H_ */
diff --git a/openflow/usr/include/nss/secpkcs7.h b/openflow/usr/include/nss/secpkcs7.h
deleted file mode 100644
index d95c7d8..0000000
--- a/openflow/usr/include/nss/secpkcs7.h
+++ /dev/null
@@ -1,606 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Interface to the PKCS7 implementation.
- */
-
-#ifndef _SECPKCS7_H_
-#define _SECPKCS7_H_
-
-#include "seccomon.h"
-
-#include "secoidt.h"
-#include "certt.h"
-#include "keyt.h"
-#include "hasht.h"
-#include "pkcs7t.h"
-
-extern const SEC_ASN1Template sec_PKCS7ContentInfoTemplate[];
-
-/************************************************************************/
-SEC_BEGIN_PROTOS
-
-/************************************************************************
- *      Miscellaneous
- ************************************************************************/
-
-/*
- * Returns the content type of the given contentInfo.
- */
-extern SECOidTag SEC_PKCS7ContentType(SEC_PKCS7ContentInfo *cinfo);
-
-/*
- * Destroy a PKCS7 contentInfo and all of its sub-pieces.
- */
-extern void SEC_PKCS7DestroyContentInfo(SEC_PKCS7ContentInfo *contentInfo);
-
-/*
- * Copy a PKCS7 contentInfo.  A Destroy is needed on *each* copy.
- */
-extern SEC_PKCS7ContentInfo *
-SEC_PKCS7CopyContentInfo(SEC_PKCS7ContentInfo *contentInfo);
-
-/*
- * Return a pointer to the actual content.  In the case of those types
- * which are encrypted, this returns the *plain* content.
- */
-extern SECItem *SEC_PKCS7GetContent(SEC_PKCS7ContentInfo *cinfo);
-
-/************************************************************************
- *      PKCS7 Decoding, Verification, etc..
- ************************************************************************/
-
-extern SEC_PKCS7DecoderContext *
-SEC_PKCS7DecoderStart(SEC_PKCS7DecoderContentCallback callback,
-                      void *callback_arg,
-                      SECKEYGetPasswordKey pwfn, void *pwfn_arg,
-                      SEC_PKCS7GetDecryptKeyCallback decrypt_key_cb,
-                      void *decrypt_key_cb_arg,
-                      SEC_PKCS7DecryptionAllowedCallback decrypt_allowed_cb);
-
-extern SECStatus
-SEC_PKCS7DecoderUpdate(SEC_PKCS7DecoderContext *p7dcx,
-                       const char *buf, unsigned long len);
-
-extern SEC_PKCS7ContentInfo *
-SEC_PKCS7DecoderFinish(SEC_PKCS7DecoderContext *p7dcx);
-
-/*  Abort the underlying ASN.1 stream & set an error  */
-void SEC_PKCS7DecoderAbort(SEC_PKCS7DecoderContext *p7dcx, int error);
-
-extern SEC_PKCS7ContentInfo *
-SEC_PKCS7DecodeItem(SECItem *p7item,
-                    SEC_PKCS7DecoderContentCallback cb, void *cb_arg,
-                    SECKEYGetPasswordKey pwfn, void *pwfn_arg,
-                    SEC_PKCS7GetDecryptKeyCallback decrypt_key_cb,
-                    void *decrypt_key_cb_arg,
-                    SEC_PKCS7DecryptionAllowedCallback decrypt_allowed_cb);
-
-extern PRBool SEC_PKCS7ContainsCertsOrCrls(SEC_PKCS7ContentInfo *cinfo);
-
-/* checks to see if the contents of the content info is
- * empty.  it so, PR_TRUE is returned.  PR_FALSE, otherwise.
- *
- * minLen is used to specify a minimum size.  if content size <= minLen,
- * content is assumed empty.
- */
-extern PRBool
-SEC_PKCS7IsContentEmpty(SEC_PKCS7ContentInfo *cinfo, unsigned int minLen);
-
-extern PRBool SEC_PKCS7ContentIsEncrypted(SEC_PKCS7ContentInfo *cinfo);
-
-/*
- * If the PKCS7 content has a signature (not just *could* have a signature)
- * return true; false otherwise.  This can/should be called before calling
- * VerifySignature, which will always indicate failure if no signature is
- * present, but that does not mean there even was a signature!
- * Note that the content itself can be empty (detached content was sent
- * another way); it is the presence of the signature that matters.
- */
-extern PRBool SEC_PKCS7ContentIsSigned(SEC_PKCS7ContentInfo *cinfo);
-
-/*
- * SEC_PKCS7VerifySignature
- *      Look at a PKCS7 contentInfo and check if the signature is good.
- *      The verification checks that the signing cert is valid and trusted
- *      for the purpose specified by "certusage".
- *
- *      In addition, if "keepcerts" is true, add any new certificates found
- *      into our local database.
- */
-extern PRBool SEC_PKCS7VerifySignature(SEC_PKCS7ContentInfo *cinfo,
-                                       SECCertUsage certusage,
-                                       PRBool keepcerts);
-
-/*
- * SEC_PKCS7VerifyDetachedSignature
- *      Look at a PKCS7 contentInfo and check if the signature matches
- *      a passed-in digest (calculated, supposedly, from detached contents).
- *      The verification checks that the signing cert is valid and trusted
- *      for the purpose specified by "certusage".
- *
- *      In addition, if "keepcerts" is true, add any new certificates found
- *      into our local database.
- */
-extern PRBool SEC_PKCS7VerifyDetachedSignature(SEC_PKCS7ContentInfo *cinfo,
-                                               SECCertUsage certusage,
-                                               const SECItem *detached_digest,
-                                               HASH_HashType digest_type,
-                                               PRBool keepcerts);
-
-/*
- * SEC_PKCS7VerifyDetachedSignatureAtTime
- *      Look at a PKCS7 contentInfo and check if the signature matches
- *      a passed-in digest (calculated, supposedly, from detached contents).
- *      The verification checks that the signing cert is valid and trusted
- *      for the purpose specified by "certusage" at time "atTime".
- *
- *      In addition, if "keepcerts" is true, add any new certificates found
- *      into our local database.
- */
-extern PRBool
-SEC_PKCS7VerifyDetachedSignatureAtTime(SEC_PKCS7ContentInfo *cinfo,
-                                       SECCertUsage certusage,
-                                       const SECItem *detached_digest,
-                                       HASH_HashType digest_type,
-                                       PRBool keepcerts,
-                                       PRTime atTime);
-
-/*
- * SEC_PKCS7GetSignerCommonName, SEC_PKCS7GetSignerEmailAddress
- *      The passed-in contentInfo is espected to be Signed, and these
- *      functions return the specified portion of the full signer name.
- *
- *      Returns a pointer to allocated memory, which must be freed.
- *      A NULL return value is an error.
- */
-extern char *SEC_PKCS7GetSignerCommonName(SEC_PKCS7ContentInfo *cinfo);
-extern char *SEC_PKCS7GetSignerEmailAddress(SEC_PKCS7ContentInfo *cinfo);
-
-/*
- * Return the the signing time, in UTCTime format, of a PKCS7 contentInfo.
- */
-extern SECItem *SEC_PKCS7GetSigningTime(SEC_PKCS7ContentInfo *cinfo);
-
-/************************************************************************
- *      PKCS7 Creation and Encoding.
- ************************************************************************/
-
-/*
- * Start a PKCS7 signing context.
- *
- * "cert" is the cert that will be used to sign the data.  It will be
- * checked for validity.
- *
- * "certusage" describes the signing usage (e.g. certUsageEmailSigner)
- * XXX Maybe SECCertUsage should be split so that our caller just says
- * "email" and *we* add the "signing" part -- otherwise our caller
- * could be lying about the usage; we do not want to allow encryption
- * certs for signing or vice versa.
- *
- * "certdb" is the cert database to use for verifying the cert.
- * It can be NULL if a default database is available (like in the client).
- *
- * "digestalg" names the digest algorithm (e.g. SEC_OID_SHA1).
- *
- * "digest" is the actual digest of the data.  It must be provided in
- * the case of detached data or NULL if the content will be included.
- *
- * The return value can be passed to functions which add things to
- * it like attributes, then eventually to SEC_PKCS7Encode() or to
- * SEC_PKCS7EncoderStart() to create the encoded data, and finally to
- * SEC_PKCS7DestroyContentInfo().
- *
- * An error results in a return value of NULL and an error set.
- * (Retrieve specific errors via PORT_GetError()/XP_GetError().)
- */
-extern SEC_PKCS7ContentInfo *
-SEC_PKCS7CreateSignedData(CERTCertificate *cert,
-                          SECCertUsage certusage,
-                          CERTCertDBHandle *certdb,
-                          SECOidTag digestalg,
-                          SECItem *digest,
-                          SECKEYGetPasswordKey pwfn, void *pwfn_arg);
-
-/*
- * Create a PKCS7 certs-only container.
- *
- * "cert" is the (first) cert that will be included.
- *
- * "include_chain" specifies whether the entire chain for "cert" should
- * be included.
- *
- * "certdb" is the cert database to use for finding the chain.
- * It can be NULL in when "include_chain" is false, or when meaning
- * use the default database.
- *
- * More certs and chains can be added via AddCertficate and AddCertChain.
- *
- * An error results in a return value of NULL and an error set.
- * (Retrieve specific errors via PORT_GetError()/XP_GetError().)
- */
-extern SEC_PKCS7ContentInfo *
-SEC_PKCS7CreateCertsOnly(CERTCertificate *cert,
-                         PRBool include_chain,
-                         CERTCertDBHandle *certdb);
-
-/*
- * Start a PKCS7 enveloping context.
- *
- * "cert" is the cert for the recipient.  It will be checked for validity.
- *
- * "certusage" describes the encryption usage (e.g. certUsageEmailRecipient)
- * XXX Maybe SECCertUsage should be split so that our caller just says
- * "email" and *we* add the "recipient" part -- otherwise our caller
- * could be lying about the usage; we do not want to allow encryption
- * certs for signing or vice versa.
- *
- * "certdb" is the cert database to use for verifying the cert.
- * It can be NULL if a default database is available (like in the client).
- *
- * "encalg" specifies the bulk encryption algorithm to use (e.g. SEC_OID_RC2).
- *
- * "keysize" specifies the bulk encryption key size, in bits.
- *
- * The return value can be passed to functions which add things to
- * it like more recipients, then eventually to SEC_PKCS7Encode() or to
- * SEC_PKCS7EncoderStart() to create the encoded data, and finally to
- * SEC_PKCS7DestroyContentInfo().
- *
- * An error results in a return value of NULL and an error set.
- * (Retrieve specific errors via PORT_GetError()/XP_GetError().)
- */
-extern SEC_PKCS7ContentInfo *
-SEC_PKCS7CreateEnvelopedData(CERTCertificate *cert,
-                             SECCertUsage certusage,
-                             CERTCertDBHandle *certdb,
-                             SECOidTag encalg,
-                             int keysize,
-                             SECKEYGetPasswordKey pwfn, void *pwfn_arg);
-
-/*
- * XXX There will be a similar routine for creating signedAndEnvelopedData.
- * But its parameters will be different and I have no plans to implement
- * it any time soon because we have no current need for it.
- */
-
-/*
- * Create an empty PKCS7 data content info.
- *
- * An error results in a return value of NULL and an error set.
- * (Retrieve specific errors via PORT_GetError()/XP_GetError().)
- */
-extern SEC_PKCS7ContentInfo *SEC_PKCS7CreateData(void);
-
-/*
- * Create an empty PKCS7 encrypted content info.
- *
- * "algorithm" specifies the bulk encryption algorithm to use.
- *
- * An error results in a return value of NULL and an error set.
- * (Retrieve specific errors via PORT_GetError()/XP_GetError().)
- */
-extern SEC_PKCS7ContentInfo *
-SEC_PKCS7CreateEncryptedData(SECOidTag algorithm, int keysize,
-                             SECKEYGetPasswordKey pwfn, void *pwfn_arg);
-
-/*
- * All of the following things return SECStatus to signal success or failure.
- * Failure should have a more specific error status available via
- * PORT_GetError()/XP_GetError().
- */
-
-/*
- * Add the specified attribute to the authenticated (i.e. signed) attributes
- * of "cinfo" -- "oidtag" describes the attribute and "value" is the
- * value to be associated with it.  NOTE! "value" must already be encoded;
- * no interpretation of "oidtag" is done.  Also, it is assumed that this
- * signedData has only one signer -- if we ever need to add attributes
- * when there is more than one signature, we need a way to specify *which*
- * signature should get the attribute.
- *
- * XXX Technically, a signed attribute can have multiple values; if/when
- * we ever need to support an attribute which takes multiple values, we
- * either need to change this interface or create an AddSignedAttributeValue
- * which can be called subsequently, and would then append a value.
- *
- * "cinfo" should be of type signedData (the only kind of pkcs7 data
- * that is allowed authenticated attributes); SECFailure will be returned
- * if it is not.
- */
-extern SECStatus SEC_PKCS7AddSignedAttribute(SEC_PKCS7ContentInfo *cinfo,
-                                             SECOidTag oidtag,
-                                             SECItem *value);
-
-/*
- * Add "cert" and its entire chain to the set of certs included in "cinfo".
- *
- * "certdb" is the cert database to use for finding the chain.
- * It can be NULL, meaning use the default database.
- *
- * "cinfo" should be of type signedData or signedAndEnvelopedData;
- * SECFailure will be returned if it is not.
- */
-extern SECStatus SEC_PKCS7AddCertChain(SEC_PKCS7ContentInfo *cinfo,
-                                       CERTCertificate *cert,
-                                       CERTCertDBHandle *certdb);
-
-/*
- * Add "cert" to the set of certs included in "cinfo".
- *
- * "cinfo" should be of type signedData or signedAndEnvelopedData;
- * SECFailure will be returned if it is not.
- */
-extern SECStatus SEC_PKCS7AddCertificate(SEC_PKCS7ContentInfo *cinfo,
-                                         CERTCertificate *cert);
-
-/*
- * Add another recipient to an encrypted message.
- *
- * "cinfo" should be of type envelopedData or signedAndEnvelopedData;
- * SECFailure will be returned if it is not.
- *
- * "cert" is the cert for the recipient.  It will be checked for validity.
- *
- * "certusage" describes the encryption usage (e.g. certUsageEmailRecipient)
- * XXX Maybe SECCertUsage should be split so that our caller just says
- * "email" and *we* add the "recipient" part -- otherwise our caller
- * could be lying about the usage; we do not want to allow encryption
- * certs for signing or vice versa.
- *
- * "certdb" is the cert database to use for verifying the cert.
- * It can be NULL if a default database is available (like in the client).
- */
-extern SECStatus SEC_PKCS7AddRecipient(SEC_PKCS7ContentInfo *cinfo,
-                                       CERTCertificate *cert,
-                                       SECCertUsage certusage,
-                                       CERTCertDBHandle *certdb);
-
-/*
- * Add the signing time to the authenticated (i.e. signed) attributes
- * of "cinfo".  This is expected to be included in outgoing signed
- * messages for email (S/MIME) but is likely useful in other situations.
- *
- * This should only be added once; a second call will either do
- * nothing or replace an old signing time with a newer one.
- *
- * XXX This will probably just shove the current time into "cinfo"
- * but it will not actually get signed until the entire item is
- * processed for encoding.  Is this (expected to be small) delay okay?
- *
- * "cinfo" should be of type signedData (the only kind of pkcs7 data
- * that is allowed authenticated attributes); SECFailure will be returned
- * if it is not.
- */
-extern SECStatus SEC_PKCS7AddSigningTime(SEC_PKCS7ContentInfo *cinfo);
-
-/*
- * Add the signer's symmetric capabilities to the authenticated
- * (i.e. signed) attributes of "cinfo".  This is expected to be
- * included in outgoing signed messages for email (S/MIME).
- *
- * This can only be added once; a second call will return SECFailure.
- *
- * "cinfo" should be of type signedData or signedAndEnvelopedData;
- * SECFailure will be returned if it is not.
- */
-extern SECStatus SEC_PKCS7AddSymmetricCapabilities(SEC_PKCS7ContentInfo *cinfo);
-
-/*
- * Mark that the signer's certificate and its issuing chain should
- * be included in the encoded data.  This is expected to be used
- * in outgoing signed messages for email (S/MIME).
- *
- * "certdb" is the cert database to use for finding the chain.
- * It can be NULL, meaning use the default database.
- *
- * "cinfo" should be of type signedData or signedAndEnvelopedData;
- * SECFailure will be returned if it is not.
- */
-extern SECStatus SEC_PKCS7IncludeCertChain(SEC_PKCS7ContentInfo *cinfo,
-                                           CERTCertDBHandle *certdb);
-
-/*
- * Set the content; it will be included and also hashed and/or encrypted
- * as appropriate.  This is for in-memory content (expected to be "small")
- * that will be included in the PKCS7 object.  All others should stream the
- * content through when encoding (see SEC_PKCS7Encoder{Start,Update,Finish}).
- *
- * "buf" points to data of length "len"; it will be copied.
- */
-extern SECStatus SEC_PKCS7SetContent(SEC_PKCS7ContentInfo *cinfo,
-                                     const char *buf, unsigned long len);
-
-/*
- * Encode a PKCS7 object, in one shot.  All necessary components
- * of the object must already be specified.  Either the data has
- * already been included (via SetContent), or the data is detached,
- * or there is no data at all (certs-only).
- *
- * "cinfo" specifies the object to be encoded.
- *
- * "outputfn" is where the encoded bytes will be passed.
- *
- * "outputarg" is an opaque argument to the above callback.
- *
- * "bulkkey" specifies the bulk encryption key to use.   This argument
- * can be NULL if no encryption is being done, or if the bulk key should
- * be generated internally (usually the case for EnvelopedData but never
- * for EncryptedData, which *must* provide a bulk encryption key).
- *
- * "pwfn" is a callback for getting the password which protects the
- * private key of the signer.  This argument can be NULL if it is known
- * that no signing is going to be done.
- *
- * "pwfnarg" is an opaque argument to the above callback.
- */
-extern SECStatus SEC_PKCS7Encode(SEC_PKCS7ContentInfo *cinfo,
-                                 SEC_PKCS7EncoderOutputCallback outputfn,
-                                 void *outputarg,
-                                 PK11SymKey *bulkkey,
-                                 SECKEYGetPasswordKey pwfn,
-                                 void *pwfnarg);
-
-/*
- * Encode a PKCS7 object, in one shot.  All necessary components
- * of the object must already be specified.  Either the data has
- * already been included (via SetContent), or the data is detached,
- * or there is no data at all (certs-only).  The output, rather than
- * being passed to an output function as is done above, is all put
- * into a SECItem.
- *
- * "pool" specifies a pool from which to allocate the result.
- * It can be NULL, in which case memory is allocated generically.
- *
- * "dest" specifies a SECItem in which to put the result data.
- * It can be NULL, in which case the entire item is allocated, too.
- *
- * "cinfo" specifies the object to be encoded.
- *
- * "bulkkey" specifies the bulk encryption key to use.   This argument
- * can be NULL if no encryption is being done, or if the bulk key should
- * be generated internally (usually the case for EnvelopedData but never
- * for EncryptedData, which *must* provide a bulk encryption key).
- *
- * "pwfn" is a callback for getting the password which protects the
- * private key of the signer.  This argument can be NULL if it is known
- * that no signing is going to be done.
- *
- * "pwfnarg" is an opaque argument to the above callback.
- */
-extern SECItem *SEC_PKCS7EncodeItem(PLArenaPool *pool,
-                                    SECItem *dest,
-                                    SEC_PKCS7ContentInfo *cinfo,
-                                    PK11SymKey *bulkkey,
-                                    SECKEYGetPasswordKey pwfn,
-                                    void *pwfnarg);
-
-/*
- * For those who want to simply point to the pkcs7 contentInfo ASN.1
- * template, and *not* call the encoding functions directly, the
- * following function can be used -- after it is called, the entire
- * PKCS7 contentInfo is ready to be encoded.
- */
-extern SECStatus SEC_PKCS7PrepareForEncode(SEC_PKCS7ContentInfo *cinfo,
-                                           PK11SymKey *bulkkey,
-                                           SECKEYGetPasswordKey pwfn,
-                                           void *pwfnarg);
-
-/*
- * Start the process of encoding a PKCS7 object.  The first part of
- * the encoded object will be passed to the output function right away;
- * after that it is expected that SEC_PKCS7EncoderUpdate will be called,
- * streaming in the actual content that is getting included as well as
- * signed or encrypted (or both).
- *
- * "cinfo" specifies the object to be encoded.
- *
- * "outputfn" is where the encoded bytes will be passed.
- *
- * "outputarg" is an opaque argument to the above callback.
- *
- * "bulkkey" specifies the bulk encryption key to use.   This argument
- * can be NULL if no encryption is being done, or if the bulk key should
- * be generated internally (usually the case for EnvelopedData but never
- * for EncryptedData, which *must* provide a bulk encryption key).
- *
- * Returns an object to be passed to EncoderUpdate and EncoderFinish.
- */
-extern SEC_PKCS7EncoderContext *
-SEC_PKCS7EncoderStart(SEC_PKCS7ContentInfo *cinfo,
-                      SEC_PKCS7EncoderOutputCallback outputfn,
-                      void *outputarg,
-                      PK11SymKey *bulkkey);
-
-/*
- * Encode more contents, hashing and/or encrypting along the way.
- */
-extern SECStatus SEC_PKCS7EncoderUpdate(SEC_PKCS7EncoderContext *p7ecx,
-                                        const char *buf,
-                                        unsigned long len);
-
-/*
- * No more contents; finish the signature creation, if appropriate,
- * and then the encoding.
- *
- * "pwfn" is a callback for getting the password which protects the
- * signer's private key.  This argument can be NULL if it is known
- * that no signing is going to be done.
- *
- * "pwfnarg" is an opaque argument to the above callback.
- */
-extern SECStatus SEC_PKCS7EncoderFinish(SEC_PKCS7EncoderContext *p7ecx,
-                                        SECKEYGetPasswordKey pwfn,
-                                        void *pwfnarg);
-
-/*  Abort the underlying ASN.1 stream & set an error  */
-void SEC_PKCS7EncoderAbort(SEC_PKCS7EncoderContext *p7dcx, int error);
-
-/* retrieve the algorithm ID used to encrypt the content info
- * for encrypted and enveloped data.  The SECAlgorithmID pointer
- * returned needs to be freed as it is a copy of the algorithm
- * id in the content info.
- */
-extern SECAlgorithmID *
-SEC_PKCS7GetEncryptionAlgorithm(SEC_PKCS7ContentInfo *cinfo);
-
-/* the content of an encrypted data content info is encrypted.
- * it is assumed that for encrypted data, that the data has already
- * been set and is in the "plainContent" field of the content info.
- *
- * cinfo is the content info to encrypt
- *
- * key is the key with which to perform the encryption.  if the
- *     algorithm is a password based encryption algorithm, the
- *     key is actually a password which will be processed per
- *     PKCS #5.
- *
- * in the event of an error, SECFailure is returned.  SECSuccess
- * indicates a success.
- */
-extern SECStatus
-SEC_PKCS7EncryptContents(PLArenaPool *poolp,
-                         SEC_PKCS7ContentInfo *cinfo,
-                         SECItem *key,
-                         void *wincx);
-
-/* the content of an encrypted data content info is decrypted.
- * it is assumed that for encrypted data, that the data has already
- * been set and is in the "encContent" field of the content info.
- *
- * cinfo is the content info to decrypt
- *
- * key is the key with which to perform the decryption.  if the
- *     algorithm is a password based encryption algorithm, the
- *     key is actually a password which will be processed per
- *     PKCS #5.
- *
- * in the event of an error, SECFailure is returned.  SECSuccess
- * indicates a success.
- */
-extern SECStatus
-SEC_PKCS7DecryptContents(PLArenaPool *poolp,
-                         SEC_PKCS7ContentInfo *cinfo,
-                         SECItem *key,
-                         void *wincx);
-
-/* retrieve the certificate list from the content info.  the list
- * is a pointer to the list in the content info.  this should not
- * be deleted or freed in any way short of calling
- * SEC_PKCS7DestroyContentInfo
- */
-extern SECItem **
-SEC_PKCS7GetCertificateList(SEC_PKCS7ContentInfo *cinfo);
-
-/* Returns the key length (in bits) of the algorithm used to encrypt
-   this object.  Returns 0 if it's not encrypted, or the key length is
-   irrelevant. */
-extern int
-SEC_PKCS7GetKeyLength(SEC_PKCS7ContentInfo *cinfo);
-
-/************************************************************************/
-SEC_END_PROTOS
-
-#endif /* _SECPKCS7_H_ */
diff --git a/openflow/usr/include/nss/secport.h b/openflow/usr/include/nss/secport.h
deleted file mode 100644
index 0f4b08f..0000000
--- a/openflow/usr/include/nss/secport.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * secport.h - portability interfaces for security libraries
- */
-
-#ifndef _SECPORT_H_
-#define _SECPORT_H_
-
-#include "utilrename.h"
-#include "prlink.h"
-
-/*
- * define XP_WIN, XP_BEOS, or XP_UNIX, in case they are not defined
- * by anyone else
- */
-#ifdef _WINDOWS
-#ifndef XP_WIN
-#define XP_WIN
-#endif
-#if defined(_WIN32) || defined(WIN32)
-#ifndef XP_WIN32
-#define XP_WIN32
-#endif
-#endif
-#endif
-
-#ifdef __BEOS__
-#ifndef XP_BEOS
-#define XP_BEOS
-#endif
-#endif
-
-#ifdef unix
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-#endif
-
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <string.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include "prtypes.h"
-#include "prlog.h" /* for PR_ASSERT */
-#include "plarena.h"
-#include "plstr.h"
-
-/*
- * HACK for NSS 2.8 to allow Admin to compile without source changes.
- */
-#ifndef SEC_BEGIN_PROTOS
-#include "seccomon.h"
-#endif
-
-/*
- * The PORT_*Arena* function signatures mostly involve PLArenaPool* arguments.
- * But this is misleading! It's not actually safe to use vanilla PLArenaPools
- * with them. There are two "subclasses" of PLArenaPool that should be used
- * instead.
- *
- * - PORTArenaPool (defined in secport.c): this "subclass" is always
- *   heap-allocated and uses a (heap-allocated) lock to protect all accesses.
- *   Use PORT_NewArena() and PORT_FreeArena() to create and destroy
- *   PORTArenaPools.
- *
- * - PORTCheapArenaPool (defined here): this "subclass" can be stack-allocated
- *   and does not use a lock to protect accesses. This makes it cheaper but
- *   less general. It is best used for arena pools that (a) are hot, (b) have
- *   lifetimes bounded within a single function, and (c) don't need locking.
- *   Use PORT_InitArena() and PORT_DestroyArena() to initialize and finalize
- *   PORTCheapArenaPools.
- *
- * All the other PORT_Arena* functions will operate safely with either
- * subclass.
- */
-typedef struct PORTCheapArenaPool_str {
-    PLArenaPool arena;
-    PRUint32 magic; /* This is used to distinguish the two subclasses. */
-} PORTCheapArenaPool;
-
-SEC_BEGIN_PROTOS
-
-extern void *PORT_Alloc(size_t len);
-extern void *PORT_Realloc(void *old, size_t len);
-extern void *PORT_ZAlloc(size_t len);
-extern void PORT_Free(void *ptr);
-extern void PORT_ZFree(void *ptr, size_t len);
-extern char *PORT_Strdup(const char *s);
-extern void PORT_SetError(int value);
-extern int PORT_GetError(void);
-
-/* These functions are for use with PORTArenaPools. */
-extern PLArenaPool *PORT_NewArena(unsigned long chunksize);
-extern void PORT_FreeArena(PLArenaPool *arena, PRBool zero);
-
-/* These functions are for use with PORTCheapArenaPools. */
-extern void PORT_InitCheapArena(PORTCheapArenaPool *arena,
-                                unsigned long chunksize);
-extern void PORT_DestroyCheapArena(PORTCheapArenaPool *arena);
-
-/* These functions work with both kinds of arena pool. */
-extern void *PORT_ArenaAlloc(PLArenaPool *arena, size_t size);
-extern void *PORT_ArenaZAlloc(PLArenaPool *arena, size_t size);
-extern void *PORT_ArenaGrow(PLArenaPool *arena, void *ptr,
-                            size_t oldsize, size_t newsize);
-extern void *PORT_ArenaMark(PLArenaPool *arena);
-extern void PORT_ArenaRelease(PLArenaPool *arena, void *mark);
-extern void PORT_ArenaZRelease(PLArenaPool *arena, void *mark);
-extern void PORT_ArenaUnmark(PLArenaPool *arena, void *mark);
-extern char *PORT_ArenaStrdup(PLArenaPool *arena, const char *str);
-
-SEC_END_PROTOS
-
-#define PORT_Assert PR_ASSERT
-/* This runs a function that should return SECSuccess.
- * Intended for NSS internal use only.
- * The return value is asserted in a debug build, otherwise it is ignored.
- * This is no substitute for proper error handling.  It is OK only if you
- * have ensured that the function cannot fail by other means such as checking
- * prerequisites.  In that case this can be used as a safeguard against
- * unexpected changes in a function.
- */
-#ifdef DEBUG
-#define PORT_CheckSuccess(f) PR_ASSERT((f) == SECSuccess)
-#else
-#define PORT_CheckSuccess(f) (f)
-#endif
-#define PORT_ZNew(type) (type *)PORT_ZAlloc(sizeof(type))
-#define PORT_New(type) (type *)PORT_Alloc(sizeof(type))
-#define PORT_ArenaNew(poolp, type) \
-    (type *)PORT_ArenaAlloc(poolp, sizeof(type))
-#define PORT_ArenaZNew(poolp, type) \
-    (type *)PORT_ArenaZAlloc(poolp, sizeof(type))
-#define PORT_NewArray(type, num) \
-    (type *)PORT_Alloc(sizeof(type) * (num))
-#define PORT_ZNewArray(type, num) \
-    (type *)PORT_ZAlloc(sizeof(type) * (num))
-#define PORT_ArenaNewArray(poolp, type, num) \
-    (type *)PORT_ArenaAlloc(poolp, sizeof(type) * (num))
-#define PORT_ArenaZNewArray(poolp, type, num) \
-    (type *)PORT_ArenaZAlloc(poolp, sizeof(type) * (num))
-
-/* Please, keep these defines sorted alphabetically.  Thanks! */
-
-#define PORT_Atoi(buff) (int)strtol(buff, NULL, 10)
-
-/* Returns a UTF-8 encoded constant error string for err.
- * Returns NULL if initialization of the error tables fails
- * due to insufficient memory.
- *
- * This string must not be modified by the application.
- */
-#define PORT_ErrorToString(err) PR_ErrorToString((err), PR_LANGUAGE_I_DEFAULT)
-
-#define PORT_ErrorToName PR_ErrorToName
-
-#define PORT_Memcmp memcmp
-#define PORT_Memcpy memcpy
-#ifndef SUNOS4
-#define PORT_Memmove memmove
-#else /*SUNOS4*/
-#define PORT_Memmove(s, ct, n) bcopy((ct), (s), (n))
-#endif /*SUNOS4*/
-#define PORT_Memset memset
-
-#define PORT_Strcasecmp PL_strcasecmp
-#define PORT_Strcat strcat
-#define PORT_Strchr strchr
-#define PORT_Strrchr strrchr
-#define PORT_Strcmp strcmp
-#define PORT_Strcpy strcpy
-#define PORT_Strlen(s) strlen(s)
-#define PORT_Strncasecmp PL_strncasecmp
-#define PORT_Strncat strncat
-#define PORT_Strncmp strncmp
-#define PORT_Strncpy strncpy
-#define PORT_Strpbrk strpbrk
-#define PORT_Strstr strstr
-#define PORT_Strtok strtok
-
-#define PORT_Tolower tolower
-
-typedef PRBool(PR_CALLBACK *PORTCharConversionWSwapFunc)(PRBool toUnicode,
-                                                         unsigned char *inBuf, unsigned int inBufLen,
-                                                         unsigned char *outBuf, unsigned int maxOutBufLen,
-                                                         unsigned int *outBufLen, PRBool swapBytes);
-
-typedef PRBool(PR_CALLBACK *PORTCharConversionFunc)(PRBool toUnicode,
-                                                    unsigned char *inBuf, unsigned int inBufLen,
-                                                    unsigned char *outBuf, unsigned int maxOutBufLen,
-                                                    unsigned int *outBufLen);
-
-SEC_BEGIN_PROTOS
-
-void PORT_SetUCS4_UTF8ConversionFunction(PORTCharConversionFunc convFunc);
-void PORT_SetUCS2_ASCIIConversionFunction(PORTCharConversionWSwapFunc convFunc);
-PRBool PORT_UCS4_UTF8Conversion(PRBool toUnicode, unsigned char *inBuf,
-                                unsigned int inBufLen, unsigned char *outBuf,
-                                unsigned int maxOutBufLen, unsigned int *outBufLen);
-PRBool PORT_UCS2_ASCIIConversion(PRBool toUnicode, unsigned char *inBuf,
-                                 unsigned int inBufLen, unsigned char *outBuf,
-                                 unsigned int maxOutBufLen, unsigned int *outBufLen,
-                                 PRBool swapBytes);
-void PORT_SetUCS2_UTF8ConversionFunction(PORTCharConversionFunc convFunc);
-PRBool PORT_UCS2_UTF8Conversion(PRBool toUnicode, unsigned char *inBuf,
-                                unsigned int inBufLen, unsigned char *outBuf,
-                                unsigned int maxOutBufLen, unsigned int *outBufLen);
-
-/* One-way conversion from ISO-8859-1 to UTF-8 */
-PRBool PORT_ISO88591_UTF8Conversion(const unsigned char *inBuf,
-                                    unsigned int inBufLen, unsigned char *outBuf,
-                                    unsigned int maxOutBufLen, unsigned int *outBufLen);
-
-extern PRBool
-sec_port_ucs4_utf8_conversion_function(
-    PRBool toUnicode,
-    unsigned char *inBuf,
-    unsigned int inBufLen,
-    unsigned char *outBuf,
-    unsigned int maxOutBufLen,
-    unsigned int *outBufLen);
-
-extern PRBool
-sec_port_ucs2_utf8_conversion_function(
-    PRBool toUnicode,
-    unsigned char *inBuf,
-    unsigned int inBufLen,
-    unsigned char *outBuf,
-    unsigned int maxOutBufLen,
-    unsigned int *outBufLen);
-
-/* One-way conversion from ISO-8859-1 to UTF-8 */
-extern PRBool
-sec_port_iso88591_utf8_conversion_function(
-    const unsigned char *inBuf,
-    unsigned int inBufLen,
-    unsigned char *outBuf,
-    unsigned int maxOutBufLen,
-    unsigned int *outBufLen);
-
-extern int NSS_PutEnv(const char *envVarName, const char *envValue);
-
-extern int NSS_SecureMemcmp(const void *a, const void *b, size_t n);
-
-/*
- * Load a shared library called "newShLibName" in the same directory as
- * a shared library that is already loaded, called existingShLibName.
- * A pointer to a static function in that shared library,
- * staticShLibFunc, is required.
- *
- * existingShLibName:
- *   The file name of the shared library that shall be used as the
- *   "reference library". The loader will attempt to load the requested
- *   library from the same directory as the reference library.
- *
- * staticShLibFunc:
- *   Pointer to a static function in the "reference library".
- *
- * newShLibName:
- *   The simple file name of the new shared library to be loaded.
- *
- * We use PR_GetLibraryFilePathname to get the pathname of the loaded
- * shared lib that contains this function, and then do a
- * PR_LoadLibraryWithFlags with an absolute pathname for the shared
- * library to be loaded.
- *
- * On Windows, the "alternate search path" strategy is employed, if available.
- * On Unix, if existingShLibName is a symbolic link, and no link exists for the
- * new library, the original link will be resolved, and the new library loaded
- * from the resolved location.
- *
- * If the new shared library is not found in the same location as the reference
- * library, it will then be loaded from the normal system library path.
- */
-PRLibrary *
-PORT_LoadLibraryFromOrigin(const char *existingShLibName,
-                           PRFuncPtr staticShLibFunc,
-                           const char *newShLibName);
-
-SEC_END_PROTOS
-
-#endif /* _SECPORT_H_ */
diff --git a/openflow/usr/include/nss/shsign.h b/openflow/usr/include/nss/shsign.h
deleted file mode 100644
index 590c0e6..0000000
--- a/openflow/usr/include/nss/shsign.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _SHSIGN_H_
-#define _SHSIGN_H_
-
-#define SGN_SUFFIX ".chk"
-#define NSS_SIGN_CHK_MAGIC1 0xf1
-#define NSS_SIGN_CHK_MAGIC2 0xc5
-#define NSS_SIGN_CHK_MAJOR_VERSION 0x01
-#define NSS_SIGN_CHK_MINOR_VERSION 0x02
-
-#endif /* _SHSIGN_H_ */
diff --git a/openflow/usr/include/nss/smime.h b/openflow/usr/include/nss/smime.h
deleted file mode 100644
index e534ef0..0000000
--- a/openflow/usr/include/nss/smime.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Header file for routines specific to S/MIME.  Keep things that are pure
- * pkcs7 out of here; this is for S/MIME policy, S/MIME interoperability, etc.
- */
-
-#ifndef _SMIME_H_
-#define _SMIME_H_ 1
-
-#include "cms.h"
-
-/************************************************************************/
-SEC_BEGIN_PROTOS
-
-/*
- * Initialize the local recording of the user S/MIME cipher preferences.
- * This function is called once for each cipher, the order being
- * important (first call records greatest preference, and so on).
- * When finished, it is called with a "which" of CIPHER_FAMILID_MASK.
- * If the function is called again after that, it is assumed that
- * the preferences are being reset, and the old preferences are
- * discarded.
- *
- * XXX This is for a particular user, and right now the storage is
- * XXX local, static.  The preference should be stored elsewhere to allow
- * XXX for multiple uses of one library?  How does SSL handle this;
- * XXX it has something similar?
- *
- *  - The "which" values are defined in ciferfam.h (the SMIME_* values,
- *    for example SMIME_DES_CBC_56).
- *  - If "on" is non-zero then the named cipher is enabled, otherwise
- *    it is disabled.  (It is not necessary to call the function for
- *    ciphers that are disabled, however, as that is the default.)
- *
- * If the cipher preference is successfully recorded, SECSuccess
- * is returned.  Otherwise SECFailure is returned.  The only errors
- * are due to failure allocating memory or bad parameters/calls:
- *      SEC_ERROR_XXX ("which" is not in the S/MIME cipher family)
- *      SEC_ERROR_XXX (function is being called more times than there
- *              are known/expected ciphers)
- */
-extern SECStatus NSS_SMIMEUtil_EnableCipher(long which, int on);
-
-/*
- * Initialize the local recording of the S/MIME policy.
- * This function is called to allow/disallow a particular cipher.
- *
- * XXX This is for the current module, I think, so local, static storage
- * XXX is okay.  Is that correct, or could multiple uses of the same
- * XXX library expect to operate under different policies?
- *
- *  - The "which" values are defined in ciferfam.h (the SMIME_* values,
- *    for example SMIME_DES_CBC_56).
- *  - If "on" is non-zero then the named cipher is enabled, otherwise
- *    it is disabled.
- */
-extern SECStatus NSS_SMIMEUtils_AllowCipher(long which, int on);
-
-/*
- * Does the current policy allow S/MIME decryption of this particular
- * algorithm and keysize?
- */
-extern PRBool NSS_SMIMEUtil_DecryptionAllowed(SECAlgorithmID *algid, PK11SymKey *key);
-
-/*
- * Does the current policy allow *any* S/MIME encryption (or decryption)?
- *
- * This tells whether or not *any* S/MIME encryption can be done,
- * according to policy.  Callers may use this to do nicer user interface
- * (say, greying out a checkbox so a user does not even try to encrypt
- * a message when they are not allowed to) or for any reason they want
- * to check whether S/MIME encryption (or decryption, for that matter)
- * may be done.
- *
- * It takes no arguments.  The return value is a simple boolean:
- *   PR_TRUE means encryption (or decryption) is *possible*
- *      (but may still fail due to other reasons, like because we cannot
- *      find all the necessary certs, etc.; PR_TRUE is *not* a guarantee)
- *   PR_FALSE means encryption (or decryption) is not permitted
- *
- * There are no errors from this routine.
- */
-extern PRBool NSS_SMIMEUtil_EncryptionPossible(void);
-
-/*
- * NSS_SMIMEUtil_CreateSMIMECapabilities - get S/MIME capabilities attr value
- *
- * scans the list of allowed and enabled ciphers and construct a PKCS9-compliant
- * S/MIME capabilities attribute value.
- */
-extern SECStatus NSS_SMIMEUtil_CreateSMIMECapabilities(PLArenaPool *poolp, SECItem *dest);
-
-/*
- * NSS_SMIMEUtil_CreateSMIMEEncKeyPrefs - create S/MIME encryption key preferences attr value
- */
-extern SECStatus NSS_SMIMEUtil_CreateSMIMEEncKeyPrefs(PLArenaPool *poolp,
-                                                      SECItem *dest, CERTCertificate *cert);
-
-/*
- * NSS_SMIMEUtil_CreateMSSMIMEEncKeyPrefs - create S/MIME encryption key preferences attr value using MS oid
- */
-extern SECStatus NSS_SMIMEUtil_CreateMSSMIMEEncKeyPrefs(PLArenaPool *poolp,
-                                                        SECItem *dest, CERTCertificate *cert);
-
-/*
- * NSS_SMIMEUtil_GetCertFromEncryptionKeyPreference - find cert marked by EncryptionKeyPreference
- *          attribute
- */
-extern CERTCertificate *NSS_SMIMEUtil_GetCertFromEncryptionKeyPreference(CERTCertDBHandle *certdb,
-                                                                         SECItem *DERekp);
-
-/*
- * NSS_SMIMEUtil_FindBulkAlgForRecipients - find bulk algorithm suitable for all recipients
- */
-extern SECStatus
-NSS_SMIMEUtil_FindBulkAlgForRecipients(CERTCertificate **rcerts,
-                                       SECOidTag *bulkalgtag, int *keysize);
-
-/*
- * Return a boolean that indicates whether the underlying library
- * will perform as the caller expects.
- *
- * The only argument is a string, which should be the version
- * identifier of the NSS library. That string will be compared
- * against a string that represents the actual build version of
- * the S/MIME library.
- */
-extern PRBool NSSSMIME_VersionCheck(const char *importedVersion);
-
-/*
- * Returns a const string of the S/MIME library version.
- */
-extern const char *NSSSMIME_GetVersion(void);
-
-/************************************************************************/
-SEC_END_PROTOS
-
-#endif /* _SECMIME_H_ */
diff --git a/openflow/usr/include/nss/ssl.h b/openflow/usr/include/nss/ssl.h
deleted file mode 100644
index 9394adc..0000000
--- a/openflow/usr/include/nss/ssl.h
+++ /dev/null
@@ -1,1344 +0,0 @@
-/*
- * This file contains prototypes for the public SSL functions.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __ssl_h_
-#define __ssl_h_
-
-#include "prtypes.h"
-#include "prerror.h"
-#include "prio.h"
-#include "seccomon.h"
-#include "cert.h"
-#include "keyt.h"
-
-#include "sslt.h" /* public ssl data types */
-
-#if defined(_WIN32) && !defined(IN_LIBSSL) && !defined(NSS_USE_STATIC_LIBS)
-#define SSL_IMPORT extern __declspec(dllimport)
-#else
-#define SSL_IMPORT extern
-#endif
-
-SEC_BEGIN_PROTOS
-
-/* constant table enumerating all implemented cipher suites. */
-SSL_IMPORT const PRUint16 SSL_ImplementedCiphers[];
-
-/* the same as the above, but is a function */
-SSL_IMPORT const PRUint16 *SSL_GetImplementedCiphers(void);
-
-/* number of entries in the above table. */
-SSL_IMPORT const PRUint16 SSL_NumImplementedCiphers;
-
-/* the same as the above, but is a function */
-SSL_IMPORT PRUint16 SSL_GetNumImplementedCiphers(void);
-
-/* Macro to tell which ciphers in table are SSL2 vs SSL3/TLS. */
-#define SSL_IS_SSL2_CIPHER(which) (((which)&0xfff0) == 0xff00)
-
-/*
-** Imports fd into SSL, returning a new socket.  Copies SSL configuration
-** from model.
-*/
-SSL_IMPORT PRFileDesc *SSL_ImportFD(PRFileDesc *model, PRFileDesc *fd);
-
-/*
-** Imports fd into DTLS, returning a new socket.  Copies DTLS configuration
-** from model.
-*/
-SSL_IMPORT PRFileDesc *DTLS_ImportFD(PRFileDesc *model, PRFileDesc *fd);
-
-/*
-** Enable/disable an ssl mode
-**
-**  SSL_SECURITY:
-**    enable/disable use of SSL security protocol before connect
-**
-**  SSL_SOCKS:
-**    enable/disable use of socks before connect
-**    (No longer supported).
-**
-**  SSL_REQUEST_CERTIFICATE:
-**    require a certificate during secure connect
-*/
-/* options */
-#define SSL_SECURITY 1            /* (on by default) */
-#define SSL_SOCKS 2               /* (off by default) */
-#define SSL_REQUEST_CERTIFICATE 3 /* (off by default) */
-#define SSL_HANDSHAKE_AS_CLIENT 5 /* force accept to hs as client */
-                                  /* (off by default) */
-#define SSL_HANDSHAKE_AS_SERVER 6 /* force connect to hs as server */
-                                  /* (off by default) */
-
-/* OBSOLETE: SSL v2 is obsolete and may be removed soon. */
-#define SSL_ENABLE_SSL2 7 /* enable ssl v2 (off by default) */
-
-/* OBSOLETE: See "SSL Version Range API" below for the replacement and a
-** description of the non-obvious semantics of using SSL_ENABLE_SSL3.
-*/
-#define SSL_ENABLE_SSL3 8 /* enable ssl v3 (on by default) */
-
-#define SSL_NO_CACHE 9             /* don't use the session cache */
-                                   /* (off by default) */
-#define SSL_REQUIRE_CERTIFICATE 10 /* (SSL_REQUIRE_FIRST_HANDSHAKE */
-                                   /* by default) */
-#define SSL_ENABLE_FDX 11          /* permit simultaneous read/write */
-                                   /* (off by default) */
-
-/* OBSOLETE: SSL v2 compatible hellos are not accepted by some TLS servers
-** and cannot negotiate extensions. SSL v2 is obsolete. This option may be
-** removed soon.
-*/
-#define SSL_V2_COMPATIBLE_HELLO 12 /* send v3 client hello in v2 fmt */
-                                   /* (off by default) */
-
-/* OBSOLETE: See "SSL Version Range API" below for the replacement and a
-** description of the non-obvious semantics of using SSL_ENABLE_TLS.
-*/
-#define SSL_ENABLE_TLS 13 /* enable TLS (on by default) */
-
-#define SSL_ROLLBACK_DETECTION 14       /* for compatibility, default: on */
-#define SSL_NO_STEP_DOWN 15             /* (unsupported, deprecated, off) */
-#define SSL_BYPASS_PKCS11 16            /* (unsupported, deprecated, off) */
-#define SSL_NO_LOCKS 17                 /* Don't use locks for protection */
-#define SSL_ENABLE_SESSION_TICKETS 18   /* Enable TLS SessionTicket       */
-                                        /* extension (off by default)     */
-#define SSL_ENABLE_DEFLATE 19           /* Enable TLS compression with    */
-                                        /* DEFLATE (off by default)       */
-#define SSL_ENABLE_RENEGOTIATION 20     /* Values below (default: never)  */
-#define SSL_REQUIRE_SAFE_NEGOTIATION 21 /* Peer must send Signaling       */
-                                        /* Cipher Suite Value (SCSV) or   */
-                                        /* Renegotiation  Info (RI)       */
-                                        /* extension in ALL handshakes.   */
-                                        /* default: off                   */
-#define SSL_ENABLE_FALSE_START 22       /* Enable SSL false start (off by */
-                                        /* default, applies only to       */
-                                        /* clients). False start is a     */
-/* mode where an SSL client will start sending application data before
- * verifying the server's Finished message. This means that we could end up
- * sending data to an imposter. However, the data will be encrypted and
- * only the true server can derive the session key. Thus, so long as the
- * cipher isn't broken this is safe. The advantage of false start is that
- * it saves a round trip for client-speaks-first protocols when performing a
- * full handshake.
- *
- * In addition to enabling this option, the application must register a
- * callback using the SSL_SetCanFalseStartCallback function.
- */
-
-/* For SSL 3.0 and TLS 1.0, by default we prevent chosen plaintext attacks
- * on SSL CBC mode cipher suites (see RFC 4346 Section F.3) by splitting
- * non-empty application_data records into two records; the first record has
- * only the first byte of plaintext, and the second has the rest.
- *
- * This only prevents the attack in the sending direction; the connection may
- * still be vulnerable to such attacks if the peer does not implement a similar
- * countermeasure.
- *
- * This protection mechanism is on by default; the default can be overridden by
- * setting NSS_SSL_CBC_RANDOM_IV=0 in the environment prior to execution,
- * and/or by the application setting the option SSL_CBC_RANDOM_IV to PR_FALSE.
- *
- * The per-record IV in TLS 1.1 and later adds one block of overhead per
- * record, whereas this hack will add at least two blocks of overhead per
- * record, so TLS 1.1+ will always be more efficient.
- *
- * Other implementations (e.g. some versions of OpenSSL, in some
- * configurations) prevent the same attack by prepending an empty
- * application_data record to every application_data record they send; we do
- * not do that because some implementations cannot handle empty
- * application_data records. Also, we only split application_data records and
- * not other types of records, because some implementations will not accept
- * fragmented records of some other types (e.g. some versions of NSS do not
- * accept fragmented alerts).
- */
-#define SSL_CBC_RANDOM_IV 23
-#define SSL_ENABLE_OCSP_STAPLING 24 /* Request OCSP stapling (client) */
-
-/* SSL_ENABLE_NPN controls whether the NPN extension is enabled for the initial
- * handshake when application layer protocol negotiation is used.
- * SSL_SetNextProtoCallback or SSL_SetNextProtoNego must be used to control the
- * application layer protocol negotiation; otherwise, the NPN extension will
- * not be negotiated. SSL_ENABLE_NPN is currently enabled by default but this
- * may change in future versions.
- */
-#define SSL_ENABLE_NPN 25
-
-/* SSL_ENABLE_ALPN controls whether the ALPN extension is enabled for the
- * initial handshake when application layer protocol negotiation is used.
- * SSL_SetNextProtoNego (not SSL_SetNextProtoCallback) must be used to control
- * the application layer protocol negotiation; otherwise, the ALPN extension
- * will not be negotiated. ALPN is not negotiated for renegotiation handshakes,
- * even though the ALPN specification defines a way to use ALPN during
- * renegotiations. SSL_ENABLE_ALPN is currently disabled by default, but this
- * may change in future versions.
- */
-#define SSL_ENABLE_ALPN 26
-
-/* SSL_REUSE_SERVER_ECDHE_KEY controls whether the ECDHE server key is
- * reused for multiple handshakes or generated each time.
- * SSL_REUSE_SERVER_ECDHE_KEY is currently enabled by default.
- * This socket option is for ECDHE, only. It is unrelated to DHE.
- */
-#define SSL_REUSE_SERVER_ECDHE_KEY 27
-
-#define SSL_ENABLE_FALLBACK_SCSV 28 /* Send fallback SCSV in \
-                                     * handshakes. */
-
-/* SSL_ENABLE_SERVER_DHE controls whether DHE is enabled for the server socket.
- */
-#define SSL_ENABLE_SERVER_DHE 29
-
-/* Use draft-ietf-tls-session-hash. Controls whether we offer the
- * extended_master_secret extension which, when accepted, hashes
- * the handshake transcript into the master secret. This option is
- * disabled by default.
- */
-#define SSL_ENABLE_EXTENDED_MASTER_SECRET 30
-
-/* Request Signed Certificate Timestamps via TLS extension (client) */
-#define SSL_ENABLE_SIGNED_CERT_TIMESTAMPS 31
-
-/* Ordinarily, when negotiating a TLS_DHE_* cipher suite the server picks the
- * group.  draft-ietf-tls-negotiated-ff-dhe changes this to use supported_groups
- * (formerly supported_curves) to signal which pre-defined groups are OK.
- *
- * This option causes an NSS client to use this extension and demand that those
- * groups be used.  A client will signal any enabled DHE groups in the
- * supported_groups extension and reject groups that don't match what it has
- * enabled.  A server will only negotiate TLS_DHE_* cipher suites if the
- * client includes the extension.
- *
- * See SSL_NamedGroupConfig() for how to control which groups are enabled.
- *
- * This option cannot be enabled if NSS is not compiled with ECC support.
- */
-#define SSL_REQUIRE_DH_NAMED_GROUPS 32
-
-/* Allow 0-RTT data (for TLS 1.3).
- *
- * When this option is set, the server's session tickets will contain
- * a flag indicating that it accepts 0-RTT. When resuming such a
- * session, PR_Write() on the client will be allowed immediately after
- * starting the handshake and PR_Read() on the server will be allowed
- * on the server to read that data. Calls to
- * SSL_GetPreliminaryChannelInfo() and SSL_GetNextProto()
- * can be made used during this period to learn about the channel
- * parameters [TODO(ekr@rtfm.com): This hasn't landed yet].
- *
- * The transition between the 0-RTT and 1-RTT modes is marked by the
- * handshake callback.
- *
- * WARNING: 0-RTT data has different anti-replay and PFS properties than
- * the rest of the TLS data. See [draft-ietf-tls-tls13; Section 6.2.3]
- * for more details.
- */
-#define SSL_ENABLE_0RTT_DATA 33
-
-#ifdef SSL_DEPRECATED_FUNCTION
-/* Old deprecated function names */
-SSL_IMPORT SECStatus SSL_Enable(PRFileDesc *fd, int option, PRBool on);
-SSL_IMPORT SECStatus SSL_EnableDefault(int option, PRBool on);
-#endif
-
-/* New function names */
-SSL_IMPORT SECStatus SSL_OptionSet(PRFileDesc *fd, PRInt32 option, PRBool on);
-SSL_IMPORT SECStatus SSL_OptionGet(PRFileDesc *fd, PRInt32 option, PRBool *on);
-SSL_IMPORT SECStatus SSL_OptionSetDefault(PRInt32 option, PRBool on);
-SSL_IMPORT SECStatus SSL_OptionGetDefault(PRInt32 option, PRBool *on);
-SSL_IMPORT SECStatus SSL_CertDBHandleSet(PRFileDesc *fd, CERTCertDBHandle *dbHandle);
-
-/* SSLNextProtoCallback is called during the handshake for the client, when a
- * Next Protocol Negotiation (NPN) extension has been received from the server.
- * |protos| and |protosLen| define a buffer which contains the server's
- * advertisement. This data is guaranteed to be well formed per the NPN spec.
- * |protoOut| is a buffer provided by the caller, of length 255 (the maximum
- * allowed by the protocol). On successful return, the protocol to be announced
- * to the server will be in |protoOut| and its length in |*protoOutLen|.
- *
- * The callback must return SECFailure or SECSuccess (not SECWouldBlock).
- */
-typedef SECStatus(PR_CALLBACK *SSLNextProtoCallback)(
-    void *arg,
-    PRFileDesc *fd,
-    const unsigned char *protos,
-    unsigned int protosLen,
-    unsigned char *protoOut,
-    unsigned int *protoOutLen,
-    unsigned int protoMaxOut);
-
-/* SSL_SetNextProtoCallback sets a callback function to handle Next Protocol
- * Negotiation. It causes a client to advertise NPN. */
-SSL_IMPORT SECStatus SSL_SetNextProtoCallback(PRFileDesc *fd,
-                                              SSLNextProtoCallback callback,
-                                              void *arg);
-
-/* SSL_SetNextProtoNego can be used as an alternative to
- * SSL_SetNextProtoCallback. It also causes a client to advertise NPN and
- * installs a default callback function which selects the first supported
- * protocol in server-preference order. If no matching protocol is found it
- * selects the first supported protocol.
- *
- * Using this function also allows the client to transparently support ALPN.
- * The same set of protocols will be advertised via ALPN and, if the server
- * uses ALPN to select a protocol, SSL_GetNextProto will return
- * SSL_NEXT_PROTO_SELECTED as the state.
- *
- * Since NPN uses the first protocol as the fallback protocol, when sending an
- * ALPN extension, the first protocol is moved to the end of the list. This
- * indicates that the fallback protocol is the least preferred. The other
- * protocols should be in preference order.
- *
- * The supported protocols are specified in |data| in wire-format (8-bit
- * length-prefixed). For example: "\010http/1.1\006spdy/2". */
-SSL_IMPORT SECStatus SSL_SetNextProtoNego(PRFileDesc *fd,
-                                          const unsigned char *data,
-                                          unsigned int length);
-
-typedef enum SSLNextProtoState {
-    SSL_NEXT_PROTO_NO_SUPPORT = 0, /* No peer support                   */
-    SSL_NEXT_PROTO_NEGOTIATED = 1, /* Mutual agreement                  */
-    SSL_NEXT_PROTO_NO_OVERLAP = 2, /* No protocol overlap found         */
-    SSL_NEXT_PROTO_SELECTED = 3,   /* Server selected proto (ALPN)      */
-    SSL_NEXT_PROTO_EARLY_VALUE = 4 /* We are in 0-RTT using this value. */
-} SSLNextProtoState;
-
-/* SSL_GetNextProto can be used in the HandshakeCallback or any time after
- * a handshake to retrieve the result of the Next Protocol negotiation.
- *
- * The length of the negotiated protocol, if any, is written into *bufLen.
- * If the negotiated protocol is longer than bufLenMax, then SECFailure is
- * returned. Otherwise, the negotiated protocol, if any, is written into buf,
- * and SECSuccess is returned. */
-SSL_IMPORT SECStatus SSL_GetNextProto(PRFileDesc *fd,
-                                      SSLNextProtoState *state,
-                                      unsigned char *buf,
-                                      unsigned int *bufLen,
-                                      unsigned int bufLenMax);
-
-/*
-** Control ciphers that SSL uses. If on is non-zero then the named cipher
-** is enabled, otherwise it is disabled.
-** The "cipher" values are defined in sslproto.h (the SSL_EN_* values).
-** EnableCipher records user preferences.
-** SetPolicy sets the policy according to the policy module.
-*/
-#ifdef SSL_DEPRECATED_FUNCTION
-/* Old deprecated function names */
-SSL_IMPORT SECStatus SSL_EnableCipher(long which, PRBool enabled);
-SSL_IMPORT SECStatus SSL_SetPolicy(long which, int policy);
-#endif
-
-/* New function names */
-SSL_IMPORT SECStatus SSL_CipherPrefSet(PRFileDesc *fd, PRInt32 cipher, PRBool enabled);
-SSL_IMPORT SECStatus SSL_CipherPrefGet(PRFileDesc *fd, PRInt32 cipher, PRBool *enabled);
-SSL_IMPORT SECStatus SSL_CipherPrefSetDefault(PRInt32 cipher, PRBool enabled);
-SSL_IMPORT SECStatus SSL_CipherPrefGetDefault(PRInt32 cipher, PRBool *enabled);
-SSL_IMPORT SECStatus SSL_CipherPolicySet(PRInt32 cipher, PRInt32 policy);
-SSL_IMPORT SECStatus SSL_CipherPolicyGet(PRInt32 cipher, PRInt32 *policy);
-
-/*
-** Control for TLS signature schemes for TLS 1.2 and 1.3.
-**
-** This governs what signature schemes (or algorithms) are sent by a client in
-** the signature_algorithms extension.  A client will not accept a signature
-** from a server unless it uses an enabled algorithm.
-**
-** This also governs what the server sends in the supported_signature_algorithms
-** field of a CertificateRequest.
-**
-** This changes what the server uses to sign ServerKeyExchange and
-** CertificateVerify messages.  An endpoint uses the first entry from this list
-** that is compatible with both its certificate and its peer's supported
-** values.
-**
-** This configuration affects TLS 1.2, but the combination of EC group and hash
-** algorithm is interpreted loosely to be compatible with other implementations.
-** For TLS 1.2, NSS will ignore the curve group when generating or verifying
-** ECDSA signatures.  For example, a P-384 ECDSA certificate is used with
-** SHA-256 if ssl_sig_ecdsa_secp256r1_sha256 is enabled.
-**
-** Omitting SHA-256 schemes from this list might be foolish.  Support is
-** mandatory in TLS 1.2 and 1.3 and there might be interoperability issues.
-*/
-SSL_IMPORT SECStatus SSL_SignatureSchemePrefSet(
-    PRFileDesc *fd, const SSLSignatureScheme *schemes, unsigned int count);
-
-/* Deprecated, use SSL_SignatureSchemePrefSet() instead. */
-SSL_IMPORT SECStatus SSL_SignaturePrefSet(
-    PRFileDesc *fd, const SSLSignatureAndHashAlg *algorithms,
-    unsigned int count);
-
-/*
-** Get the currently configured signature schemes.
-**
-** The schemes are written to |schemes| but not if there are more than
-** |maxCount| values configured.  The number of schemes that are in use are
-** written to |count|.  This fails if |maxCount| is insufficiently large.
-*/
-SSL_IMPORT SECStatus SSL_SignatureSchemePrefGet(
-    PRFileDesc *fd, SSLSignatureScheme *algorithms, unsigned int *count,
-    unsigned int maxCount);
-
-/* Deprecated, use SSL_SignatureSchemePrefGet() instead. */
-SSL_IMPORT SECStatus SSL_SignaturePrefGet(
-    PRFileDesc *fd, SSLSignatureAndHashAlg *algorithms, unsigned int *count,
-    unsigned int maxCount);
-
-/*
-** Returns the maximum number of signature algorithms that are supported and
-** can be set or retrieved using SSL_SignatureSchemePrefSet or
-** SSL_SignatureSchemePrefGet.
-*/
-SSL_IMPORT unsigned int SSL_SignatureMaxCount();
-
-/*
-** Define custom priorities for EC and FF groups used in DH key exchange and EC
-** groups for ECDSA. This only changes the order of enabled lists (and thus
-** their priorities) and enables all groups in |groups| while disabling all other
-** groups.
-*/
-SSL_IMPORT SECStatus SSL_NamedGroupConfig(PRFileDesc *fd,
-                                          const SSLNamedGroup *groups,
-                                          unsigned int num_groups);
-
-/*
-** Configure the socket to configure additional key shares.  Normally when a TLS
-** 1.3 ClientHello is sent, just one key share is included using the first
-** preference group (as set by SSL_NamedGroupConfig).  If the server decides to
-** pick a different group for key exchange, it is forced to send a
-** HelloRetryRequest, which adds an entire round trip of latency.
-**
-** This function can be used to configure libssl to generate additional key
-** shares when sending a TLS 1.3 ClientHello.  If |count| is set to a non-zero
-** value, then additional key shares are generated.  Shares are added in the
-** preference order set in SSL_NamedGroupConfig.  |count| can be set to any
-** value; NSS limits the number of shares to the number of supported groups.
-*/
-SSL_IMPORT SECStatus SSL_SendAdditionalKeyShares(PRFileDesc *fd,
-                                                 unsigned int count);
-
-/* Deprecated: use SSL_NamedGroupConfig() instead.
-** SSL_DHEGroupPrefSet is used to configure the set of allowed/enabled DHE group
-** parameters that can be used by NSS for the given server socket.
-** The first item in the array is used as the default group, if no other
-** selection criteria can be used by NSS.
-** The set is provided as an array of identifiers as defined by SSLDHEGroupType.
-** If more than one group identifier is provided, NSS will select the one to use.
-** For example, a TLS extension sent by the client might indicate a preference.
-*/
-SSL_IMPORT SECStatus SSL_DHEGroupPrefSet(PRFileDesc *fd,
-                                         const SSLDHEGroupType *groups,
-                                         PRUint16 num_groups);
-
-/* Enable the use of a DHE group that's smaller than the library default,
-** for backwards compatibility reasons. The DH parameters will be created
-** at the time this function is called, which might take a very long time.
-** The function will block until generation is completed.
-** The intention is to enforce that fresh and safe parameters are generated
-** each time a process is started.
-** At the time this API was initially implemented, the API will enable the
-** use of 1024 bit DHE parameters. This value might get increased in future
-** versions of NSS.
-**
-** It is allowed to call this API will a NULL value for parameter fd,
-** which will prepare the global parameters that NSS will reuse for the remainder
-** of the process lifetime. This can be used early after startup of a process,
-** to avoid a delay when handling incoming client connections.
-** This preparation with a NULL for parameter fd will NOT enable the weak group
-** on sockets. The function needs to be called again for every socket that
-** should use the weak group.
-**
-** It is allowed to use this API in combination with the SSL_NamedGroupConfig API.
-** If both APIs have been called, the weakest group will be used, unless it is
-** certain that the client supports larger group parameters. The weak group will
-** be used as the default group for TLS <= 1.2, overriding the preference for
-** the first group potentially set with a call to SSL_NamedGroupConfig.
-*/
-SSL_IMPORT SECStatus SSL_EnableWeakDHEPrimeGroup(PRFileDesc *fd, PRBool enabled);
-
-/* SSL Version Range API
-**
-** This API should be used to control SSL 3.0 & TLS support instead of the
-** older SSL_Option* API; however, the SSL_Option* API MUST still be used to
-** control SSL 2.0 support. In this version of libssl, SSL 3.0 and TLS 1.0 are
-** enabled by default. Future versions of libssl may change which versions of
-** the protocol are enabled by default.
-**
-** The SSLProtocolVariant enum indicates whether the protocol is of type
-** stream or datagram. This must be provided to the functions that do not
-** take an fd. Functions which take an fd will get the variant from the fd,
-** which is typed.
-**
-** Using the new version range API in conjunction with the older
-** SSL_OptionSet-based API for controlling the enabled protocol versions may
-** cause unexpected results. Going forward, we guarantee only the following:
-**
-** SSL_OptionGet(SSL_ENABLE_TLS) will return PR_TRUE if *ANY* versions of TLS
-** are enabled.
-**
-** SSL_OptionSet(SSL_ENABLE_TLS, PR_FALSE) will disable *ALL* versions of TLS,
-** including TLS 1.0 and later.
-**
-** The above two properties provide compatibility for applications that use
-** SSL_OptionSet to implement the insecure fallback from TLS 1.x to SSL 3.0.
-**
-** SSL_OptionSet(SSL_ENABLE_TLS, PR_TRUE) will enable TLS 1.0, and may also
-** enable some later versions of TLS, if it is necessary to do so in order to
-** keep the set of enabled versions contiguous. For example, if TLS 1.2 is
-** enabled, then after SSL_OptionSet(SSL_ENABLE_TLS, PR_TRUE), TLS 1.0,
-** TLS 1.1, and TLS 1.2 will be enabled, and the call will have no effect on
-** whether SSL 3.0 is enabled. If no later versions of TLS are enabled at the
-** time SSL_OptionSet(SSL_ENABLE_TLS, PR_TRUE) is called, then no later
-** versions of TLS will be enabled by the call.
-**
-** SSL_OptionSet(SSL_ENABLE_SSL3, PR_FALSE) will disable SSL 3.0, and will not
-** change the set of TLS versions that are enabled.
-**
-** SSL_OptionSet(SSL_ENABLE_SSL3, PR_TRUE) will enable SSL 3.0, and may also
-** enable some versions of TLS if TLS 1.1 or later is enabled at the time of
-** the call, the same way SSL_OptionSet(SSL_ENABLE_TLS, PR_TRUE) works, in
-** order to keep the set of enabled versions contiguous.
-*/
-
-/* Returns, in |*vrange|, the range of SSL3/TLS versions supported for the
-** given protocol variant by the version of libssl linked-to at runtime.
-*/
-SSL_IMPORT SECStatus SSL_VersionRangeGetSupported(
-    SSLProtocolVariant protocolVariant, SSLVersionRange *vrange);
-
-/* Returns, in |*vrange|, the range of SSL3/TLS versions enabled by default
-** for the given protocol variant.
-*/
-SSL_IMPORT SECStatus SSL_VersionRangeGetDefault(
-    SSLProtocolVariant protocolVariant, SSLVersionRange *vrange);
-
-/* Sets the range of enabled-by-default SSL3/TLS versions for the given
-** protocol variant to |*vrange|.
-*/
-SSL_IMPORT SECStatus SSL_VersionRangeSetDefault(
-    SSLProtocolVariant protocolVariant, const SSLVersionRange *vrange);
-
-/* Returns, in |*vrange|, the range of enabled SSL3/TLS versions for |fd|. */
-SSL_IMPORT SECStatus SSL_VersionRangeGet(PRFileDesc *fd,
-                                         SSLVersionRange *vrange);
-
-/* Sets the range of enabled SSL3/TLS versions for |fd| to |*vrange|. */
-SSL_IMPORT SECStatus SSL_VersionRangeSet(PRFileDesc *fd,
-                                         const SSLVersionRange *vrange);
-
-/* Sets the version to check the server random against for the
- * fallback check defined in [draft-ietf-tls-tls13-11 Section 6.3.1.1].
- * This function is provided to allow for detection of forced downgrade
- * attacks against client-side reconnect-and-fallback outside of TLS
- * by setting |version| to be that of the original connection, rather
- * than that of the new connection.
- *
- * The default, which can also be enabled by setting |version| to
- * zero, is just to check against the max version in the
- * version range (see SSL_VersionRangeSet). */
-SSL_IMPORT SECStatus SSL_SetDowngradeCheckVersion(PRFileDesc *fd,
-                                                  PRUint16 version);
-
-/* Values for "policy" argument to SSL_CipherPolicySet */
-/* Values returned by SSL_CipherPolicyGet. */
-#define SSL_NOT_ALLOWED 0 /* or invalid or unimplemented */
-#define SSL_ALLOWED 1
-#define SSL_RESTRICTED 2 /* only with "Step-Up" certs. */
-
-/* Values for "on" with SSL_REQUIRE_CERTIFICATE. */
-#define SSL_REQUIRE_NEVER ((PRBool)0)
-#define SSL_REQUIRE_ALWAYS ((PRBool)1)
-#define SSL_REQUIRE_FIRST_HANDSHAKE ((PRBool)2)
-#define SSL_REQUIRE_NO_ERROR ((PRBool)3)
-
-/* Values for "on" with SSL_ENABLE_RENEGOTIATION */
-/* Never renegotiate at all.                                               */
-#define SSL_RENEGOTIATE_NEVER ((PRBool)0)
-/* Renegotiate without restriction, whether or not the peer's client hello */
-/* bears the renegotiation info extension.  Vulnerable, as in the past.    */
-#define SSL_RENEGOTIATE_UNRESTRICTED ((PRBool)1)
-/* Only renegotiate if the peer's hello bears the TLS renegotiation_info   */
-/* extension. This is safe renegotiation.                                  */
-#define SSL_RENEGOTIATE_REQUIRES_XTN ((PRBool)2)
-/* Disallow unsafe renegotiation in server sockets only, but allow clients */
-/* to continue to renegotiate with vulnerable servers.                     */
-/* This value should only be used during the transition period when few    */
-/* servers have been upgraded.                                             */
-#define SSL_RENEGOTIATE_TRANSITIONAL ((PRBool)3)
-
-/*
-** Reset the handshake state for fd. This will make the complete SSL
-** handshake protocol execute from the ground up on the next i/o
-** operation.
-*/
-SSL_IMPORT SECStatus SSL_ResetHandshake(PRFileDesc *fd, PRBool asServer);
-
-/*
-** Force the handshake for fd to complete immediately.  This blocks until
-** the complete SSL handshake protocol is finished.
-*/
-SSL_IMPORT SECStatus SSL_ForceHandshake(PRFileDesc *fd);
-
-/*
-** Same as above, but with an I/O timeout.
- */
-SSL_IMPORT SECStatus SSL_ForceHandshakeWithTimeout(PRFileDesc *fd,
-                                                   PRIntervalTime timeout);
-
-/*
-** Query security status of socket. *on is set to one if security is
-** enabled. *keySize will contain the stream key size used. *issuer will
-** contain the RFC1485 verison of the name of the issuer of the
-** certificate at the other end of the connection. For a client, this is
-** the issuer of the server's certificate; for a server, this is the
-** issuer of the client's certificate (if any). Subject is the subject of
-** the other end's certificate. The pointers can be zero if the desired
-** data is not needed.  All strings returned by this function are owned
-** by the caller, and need to be freed with PORT_Free.
-*/
-SSL_IMPORT SECStatus SSL_SecurityStatus(PRFileDesc *fd, int *on, char **cipher,
-                                        int *keySize, int *secretKeySize,
-                                        char **issuer, char **subject);
-
-/* Values for "on" */
-#define SSL_SECURITY_STATUS_NOOPT -1
-#define SSL_SECURITY_STATUS_OFF 0
-#define SSL_SECURITY_STATUS_ON_HIGH 1
-#define SSL_SECURITY_STATUS_ON_LOW 2
-#define SSL_SECURITY_STATUS_FORTEZZA 3 /* NO LONGER SUPPORTED */
-
-/*
-** Return the certificate for our SSL peer. If the client calls this
-** it will always return the server's certificate. If the server calls
-** this, it may return NULL if client authentication is not enabled or
-** if the client had no certificate when asked.
-**  "fd" the socket "file" descriptor
-*/
-SSL_IMPORT CERTCertificate *SSL_PeerCertificate(PRFileDesc *fd);
-
-/*
-** Return the certificates presented by the SSL peer. If the SSL peer
-** did not present certificates, return NULL with the
-** SSL_ERROR_NO_CERTIFICATE error. On failure, return NULL with an error
-** code other than SSL_ERROR_NO_CERTIFICATE.
-**  "fd" the socket "file" descriptor
-*/
-SSL_IMPORT CERTCertList *SSL_PeerCertificateChain(PRFileDesc *fd);
-
-/* SSL_PeerStapledOCSPResponses returns the OCSP responses that were provided
- * by the TLS server. The return value is a pointer to an internal SECItemArray
- * that contains the returned OCSP responses; it is only valid until the
- * callback function that calls SSL_PeerStapledOCSPResponses returns.
- *
- * If no OCSP responses were given by the server then the result will be empty.
- * If there was an error, then the result will be NULL.
- *
- * You must set the SSL_ENABLE_OCSP_STAPLING option to enable OCSP stapling.
- * to be provided by a server.
- *
- * libssl does not do any validation of the OCSP response itself; the
- * authenticate certificate hook is responsible for doing so. The default
- * authenticate certificate hook, SSL_AuthCertificate, does not implement
- * any OCSP stapling funtionality, but this may change in future versions.
- */
-SSL_IMPORT const SECItemArray *SSL_PeerStapledOCSPResponses(PRFileDesc *fd);
-
-/* SSL_PeerSignedCertTimestamps returns the signed_certificate_timestamp
- * extension data provided by the TLS server. The return value is a pointer
- * to an internal SECItem that contains the returned response (as a serialized
- * SignedCertificateTimestampList, see RFC 6962). The returned pointer is only
- * valid until the callback function that calls SSL_PeerSignedCertTimestamps
- * (e.g. the authenticate certificate hook, or the handshake callback) returns.
- *
- * If no Signed Certificate Timestamps were given by the server then the result
- * will be empty. If there was an error, then the result will be NULL.
- *
- * You must set the SSL_ENABLE_SIGNED_CERT_TIMESTAMPS option to indicate support
- * for Signed Certificate Timestamps to a server.
- *
- * libssl does not do any parsing or validation of the response itself.
- */
-SSL_IMPORT const SECItem *SSL_PeerSignedCertTimestamps(PRFileDesc *fd);
-
-/* SSL_SetStapledOCSPResponses stores an array of one or multiple OCSP responses
- * in the fd's data, which may be sent as part of a server side cert_status
- * handshake message. Parameter |responses| is for the server certificate of
- * the key exchange type |kea|.
- * The function will duplicate the responses array.
- *
- * Deprecated: see SSL_ConfigSecureServer for details.
- */
-SSL_IMPORT SECStatus
-SSL_SetStapledOCSPResponses(PRFileDesc *fd, const SECItemArray *responses,
-                            SSLKEAType kea);
-
-/*
- * SSL_SetSignedCertTimestamps stores serialized signed_certificate_timestamp
- * extension data in the fd. The signed_certificate_timestamp data is sent
- * during the handshake (if requested by the client). Parameter |scts|
- * is for the server certificate of the key exchange type |kea|.
- * The function will duplicate the provided data item. To clear previously
- * set data for a given key exchange type |kea|, pass NULL to |scts|.
- *
- * Deprecated: see SSL_ConfigSecureServer for details.
- */
-SSL_IMPORT SECStatus
-SSL_SetSignedCertTimestamps(PRFileDesc *fd, const SECItem *scts,
-                            SSLKEAType kea);
-
-/*
-** Authenticate certificate hook. Called when a certificate comes in
-** (because of SSL_REQUIRE_CERTIFICATE in SSL_Enable) to authenticate the
-** certificate.
-**
-** The authenticate certificate hook must return SECSuccess to indicate the
-** certificate is valid, SECFailure to indicate the certificate is invalid,
-** or SECWouldBlock if the application will authenticate the certificate
-** asynchronously. SECWouldBlock is only supported for non-blocking sockets.
-**
-** If the authenticate certificate hook returns SECFailure, then the bad cert
-** hook will be called. The bad cert handler is NEVER called if the
-** authenticate certificate hook returns SECWouldBlock. If the application
-** needs to handle and/or override a bad cert, it should do so before it
-** calls SSL_AuthCertificateComplete (modifying the error it passes to
-** SSL_AuthCertificateComplete as needed).
-**
-** See the documentation for SSL_AuthCertificateComplete for more information
-** about the asynchronous behavior that occurs when the authenticate
-** certificate hook returns SECWouldBlock.
-**
-** RFC 6066 says that clients should send the bad_certificate_status_response
-** alert when they encounter an error processing the stapled OCSP response.
-** libssl does not provide a way for the authenticate certificate hook to
-** indicate that an OCSP error (SEC_ERROR_OCSP_*) that it returns is an error
-** in the stapled OCSP response or an error in some other OCSP response.
-** Further, NSS does not provide a convenient way to control or determine
-** which OCSP response(s) were used to validate a certificate chain.
-** Consequently, the current version of libssl does not ever send the
-** bad_certificate_status_response alert. This may change in future releases.
-*/
-typedef SECStatus(PR_CALLBACK *SSLAuthCertificate)(void *arg, PRFileDesc *fd,
-                                                   PRBool checkSig,
-                                                   PRBool isServer);
-
-SSL_IMPORT SECStatus SSL_AuthCertificateHook(PRFileDesc *fd,
-                                             SSLAuthCertificate f,
-                                             void *arg);
-
-/* An implementation of the certificate authentication hook */
-SSL_IMPORT SECStatus SSL_AuthCertificate(void *arg, PRFileDesc *fd,
-                                         PRBool checkSig, PRBool isServer);
-
-/*
- * Prototype for SSL callback to get client auth data from the application.
- *  arg - application passed argument
- *  caNames - pointer to distinguished names of CAs that the server likes
- *  pRetCert - pointer to pointer to cert, for return of cert
- *  pRetKey - pointer to key pointer, for return of key
- */
-typedef SECStatus(PR_CALLBACK *SSLGetClientAuthData)(void *arg,
-                                                     PRFileDesc *fd,
-                                                     CERTDistNames *caNames,
-                                                     CERTCertificate **pRetCert,  /*return */
-                                                     SECKEYPrivateKey **pRetKey); /* return */
-
-/*
- * Set the client side callback for SSL to retrieve user's private key
- * and certificate.
- *  fd - the file descriptor for the connection in question
- *  f - the application's callback that delivers the key and cert
- *  a - application specific data
- */
-SSL_IMPORT SECStatus SSL_GetClientAuthDataHook(PRFileDesc *fd,
-                                               SSLGetClientAuthData f, void *a);
-
-/*
-** SNI extension processing callback function.
-** It is called when SSL socket receives SNI extension in ClientHello message.
-** Upon this callback invocation, application is responsible to reconfigure the
-** socket with the data for a particular server name.
-** There are three potential outcomes of this function invocation:
-**    * application does not recognize the name or the type and wants the
-**    "unrecognized_name" alert be sent to the client. In this case the callback
-**    function must return SSL_SNI_SEND_ALERT status.
-**    * application does not recognize  the name, but wants to continue with
-**    the handshake using the current socket configuration. In this case,
-**    no socket reconfiguration is needed and the function should return
-**    SSL_SNI_CURRENT_CONFIG_IS_USED.
-**    * application recognizes the name and reconfigures the socket with
-**    appropriate certs, key, etc. There are many ways to reconfigure. NSS
-**    provides SSL_ReconfigFD function that can be used to update the socket
-**    data from model socket. To continue with the rest of the handshake, the
-**    implementation function should return an index of a name it has chosen.
-** LibSSL will ignore any SNI extension received in a ClientHello message
-** if application does not register a SSLSNISocketConfig callback.
-** Each type field of SECItem indicates the name type.
-** NOTE: currently RFC3546 defines only one name type: sni_host_name.
-** Client is allowed to send only one name per known type. LibSSL will
-** send an "unrecognized_name" alert if SNI extension name list contains more
-** then one name of a type.
-*/
-typedef PRInt32(PR_CALLBACK *SSLSNISocketConfig)(PRFileDesc *fd,
-                                                 const SECItem *srvNameArr,
-                                                 PRUint32 srvNameArrSize,
-                                                 void *arg);
-
-/*
-** SSLSNISocketConfig should return an index within 0 and srvNameArrSize-1
-** when it has reconfigured the socket fd to use certs and keys, etc
-** for a specific name. There are two other allowed return values. One
-** tells libSSL to use the default cert and key.  The other tells libSSL
-** to send the "unrecognized_name" alert.  These values are:
-**/
-#define SSL_SNI_CURRENT_CONFIG_IS_USED -1
-#define SSL_SNI_SEND_ALERT -2
-
-/*
-** Set application implemented SNISocketConfig callback.
-*/
-SSL_IMPORT SECStatus SSL_SNISocketConfigHook(PRFileDesc *fd,
-                                             SSLSNISocketConfig f,
-                                             void *arg);
-
-/*
-** Reconfigure fd SSL socket with model socket parameters. Sets
-** server certs and keys, list of trust anchor, socket options
-** and all SSL socket call backs and parameters.
-*/
-SSL_IMPORT PRFileDesc *SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd);
-
-/*
- * Set the client side argument for SSL to retrieve PKCS #11 pin.
- *  fd - the file descriptor for the connection in question
- *  a - pkcs11 application specific data
- */
-SSL_IMPORT SECStatus SSL_SetPKCS11PinArg(PRFileDesc *fd, void *a);
-
-/*
-** This is a callback for dealing with server certs that are not authenticated
-** by the client.  The client app can decide that it actually likes the
-** cert by some external means and restart the connection.
-**
-** The bad cert hook must return SECSuccess to override the result of the
-** authenticate certificate hook, SECFailure if the certificate should still be
-** considered invalid, or SECWouldBlock if the application will authenticate
-** the certificate asynchronously. SECWouldBlock is only supported for
-** non-blocking sockets.
-**
-** See the documentation for SSL_AuthCertificateComplete for more information
-** about the asynchronous behavior that occurs when the bad cert hook returns
-** SECWouldBlock.
-*/
-typedef SECStatus(PR_CALLBACK *SSLBadCertHandler)(void *arg, PRFileDesc *fd);
-SSL_IMPORT SECStatus SSL_BadCertHook(PRFileDesc *fd, SSLBadCertHandler f,
-                                     void *arg);
-
-/*
-** Configure SSL socket for running a secure server. Needs the
-** certificate for the server and the servers private key. The arguments
-** are copied.
-**
-** This method should be used in preference to SSL_ConfigSecureServer,
-** SSL_ConfigSecureServerWithCertChain, SSL_SetStapledOCSPResponses, and
-** SSL_SetSignedCertTimestamps.
-**
-** The authentication method is determined from the certificate and private key
-** based on how libssl authenticates peers. Primarily, this uses the value of
-** the SSLAuthType enum and is derived from the type of public key in the
-** certificate.  For example, different RSA certificates might be saved for
-** signing (ssl_auth_rsa_sign) and key encipherment
-** (ssl_auth_rsa_decrypt). Unique to RSA, the same certificate can be used for
-** both usages. Additional information about the authentication method is also
-** used: EC keys with different curves are separately stored.
-**
-** Only one certificate is stored for each authentication method.
-**
-** The optional |data| argument contains additional information about the
-** certificate:
-**
-** - |authType| (with a value other than ssl_auth_null) limits the
-**   authentication method; this is primarily useful in limiting the use of an
-**   RSA certificate to one particular key usage (either signing or key
-**   encipherment) when its key usages indicate support for both.
-**
-** - |certChain| provides an explicit certificate chain, rather than relying on
-**   NSS functions for finding a certificate chain.
-**
-** - |stapledOCSPResponses| provides a response for OCSP stapling.
-**
-** - |signedCertTimestamps| provides a value for the
-**   signed_certificate_timestamp extension used in certificate transparency.
-**
-** The |data_len| argument provides the length of the data.  This should be set
-** to |sizeof(data)|.
-**
-** This function allows an application to provide certificates with narrow key
-** usages attached to them.  For instance, RSA keys can be provided that are
-** limited to signing or decryption only.  Multiple EC certificates with keys on
-** different named curves can be provided.
-**
-** Unlike SSL_ConfigSecureServer(WithCertChain), this function does not accept
-** NULL for the |cert| and |key| arguments.  It will replace certificates that
-** have the same type, but it cannot be used to remove certificates that have
-** already been configured.
-*/
-SSL_IMPORT SECStatus SSL_ConfigServerCert(
-    PRFileDesc *fd, CERTCertificate *cert, SECKEYPrivateKey *key,
-    const SSLExtraServerCertData *data, unsigned int data_len);
-
-/*
-** Deprecated variant of SSL_ConfigServerCert.
-**
-** This uses values from the SSLKEAType to identify the type of |key| that the
-** |cert| contains.  This is incorrect, since key exchange and authentication
-** are separated in some cipher suites (in particular, ECDHE_RSA_* suites).
-**
-** Providing a |kea| parameter of ssl_kea_ecdh (or kt_ecdh) is interpreted as
-** providing both ECDH and ECDSA certificates.
-*/
-SSL_IMPORT SECStatus SSL_ConfigSecureServer(
-    PRFileDesc *fd, CERTCertificate *cert,
-    SECKEYPrivateKey *key, SSLKEAType kea);
-
-/*
-** Deprecated variant of SSL_ConfigSecureServerCert.  The |data| argument to
-** SSL_ConfigSecureServerCert can be used to pass a certificate chain.
-*/
-SSL_IMPORT SECStatus
-SSL_ConfigSecureServerWithCertChain(PRFileDesc *fd, CERTCertificate *cert,
-                                    const CERTCertificateList *certChainOpt,
-                                    SECKEYPrivateKey *key, SSLKEAType kea);
-
-/*
-** Configure a secure server's session-id cache. Define the maximum number
-** of entries in the cache, the longevity of the entires, and the directory
-** where the cache files will be placed.  These values can be zero, and
-** if so, the implementation will choose defaults.
-** This version of the function is for use in applications that have only one
-** process that uses the cache (even if that process has multiple threads).
-*/
-SSL_IMPORT SECStatus SSL_ConfigServerSessionIDCache(int maxCacheEntries,
-                                                    PRUint32 timeout,
-                                                    PRUint32 ssl3_timeout,
-                                                    const char *directory);
-
-/* Configure a secure server's session-id cache. Depends on value of
- * enableMPCache, configures malti-proc or single proc cache. */
-SSL_IMPORT SECStatus SSL_ConfigServerSessionIDCacheWithOpt(
-    PRUint32 timeout,
-    PRUint32 ssl3_timeout,
-    const char *directory,
-    int maxCacheEntries,
-    int maxCertCacheEntries,
-    int maxSrvNameCacheEntries,
-    PRBool enableMPCache);
-
-/*
-** Like SSL_ConfigServerSessionIDCache, with one important difference.
-** If the application will run multiple processes (as opposed to, or in
-** addition to multiple threads), then it must call this function, instead
-** of calling SSL_ConfigServerSessionIDCache().
-** This has nothing to do with the number of processORs, only processEs.
-** This function sets up a Server Session ID (SID) cache that is safe for
-** access by multiple processes on the same system.
-*/
-SSL_IMPORT SECStatus SSL_ConfigMPServerSIDCache(int maxCacheEntries,
-                                                PRUint32 timeout,
-                                                PRUint32 ssl3_timeout,
-                                                const char *directory);
-
-/* Get and set the configured maximum number of mutexes used for the
-** server's store of SSL sessions.  This value is used by the server
-** session ID cache initialization functions shown above.  Note that on
-** some platforms, these mutexes are actually implemented with POSIX
-** semaphores, or with unnamed pipes.  The default value varies by platform.
-** An attempt to set a too-low maximum will return an error and the
-** configured value will not be changed.
-*/
-SSL_IMPORT PRUint32 SSL_GetMaxServerCacheLocks(void);
-SSL_IMPORT SECStatus SSL_SetMaxServerCacheLocks(PRUint32 maxLocks);
-
-/* environment variable set by SSL_ConfigMPServerSIDCache, and queried by
- * SSL_InheritMPServerSIDCache when envString is NULL.
- */
-#define SSL_ENV_VAR_NAME "SSL_INHERITANCE"
-
-/* called in child to inherit SID Cache variables.
- * If envString is NULL, this function will use the value of the environment
- * variable "SSL_INHERITANCE", otherwise the string value passed in will be
- * used.
- */
-SSL_IMPORT SECStatus SSL_InheritMPServerSIDCache(const char *envString);
-
-/*
-** Set the callback that gets called when a TLS handshake is complete. The
-** handshake callback is called after verifying the peer's Finished message and
-** before processing incoming application data.
-**
-** For the initial handshake: If the handshake false started (see
-** SSL_ENABLE_FALSE_START), then application data may already have been sent
-** before the handshake callback is called. If we did not false start then the
-** callback will get called before any application data is sent.
-*/
-typedef void(PR_CALLBACK *SSLHandshakeCallback)(PRFileDesc *fd,
-                                                void *client_data);
-SSL_IMPORT SECStatus SSL_HandshakeCallback(PRFileDesc *fd,
-                                           SSLHandshakeCallback cb, void *client_data);
-
-/* Applications that wish to enable TLS false start must set this callback
-** function. NSS will invoke the functon to determine if a particular
-** connection should use false start or not. SECSuccess indicates that the
-** callback completed successfully, and if so *canFalseStart indicates if false
-** start can be used. If the callback does not return SECSuccess then the
-** handshake will be canceled. NSS's recommended criteria can be evaluated by
-** calling SSL_RecommendedCanFalseStart.
-**
-** If no false start callback is registered then false start will never be
-** done, even if the SSL_ENABLE_FALSE_START option is enabled.
-**/
-typedef SECStatus(PR_CALLBACK *SSLCanFalseStartCallback)(
-    PRFileDesc *fd, void *arg, PRBool *canFalseStart);
-
-SSL_IMPORT SECStatus SSL_SetCanFalseStartCallback(
-    PRFileDesc *fd, SSLCanFalseStartCallback callback, void *arg);
-
-/* This function sets *canFalseStart according to the recommended criteria for
-** false start. These criteria may change from release to release and may depend
-** on which handshake features have been negotiated and/or properties of the
-** certifciates/keys used on the connection.
-*/
-SSL_IMPORT SECStatus SSL_RecommendedCanFalseStart(PRFileDesc *fd,
-                                                  PRBool *canFalseStart);
-
-/*
-** For the server, request a new handshake.  For the client, begin a new
-** handshake.  If flushCache is non-zero, the SSL3 cache entry will be
-** flushed first, ensuring that a full SSL handshake will be done.
-** If flushCache is zero, and an SSL connection is established, it will
-** do the much faster session restart handshake.  This will change the
-** session keys without doing another private key operation.
-*/
-SSL_IMPORT SECStatus SSL_ReHandshake(PRFileDesc *fd, PRBool flushCache);
-
-/*
-** Same as above, but with an I/O timeout.
- */
-SSL_IMPORT SECStatus SSL_ReHandshakeWithTimeout(PRFileDesc *fd,
-                                                PRBool flushCache,
-                                                PRIntervalTime timeout);
-
-#ifdef SSL_DEPRECATED_FUNCTION
-/* deprecated!
-** For the server, request a new handshake.  For the client, begin a new
-** handshake.  Flushes SSL3 session cache entry first, ensuring that a
-** full handshake will be done.
-** This call is equivalent to SSL_ReHandshake(fd, PR_TRUE)
-*/
-SSL_IMPORT SECStatus SSL_RedoHandshake(PRFileDesc *fd);
-#endif
-
-/*
- * Allow the application to pass a URL or hostname into the SSL library.
- */
-SSL_IMPORT SECStatus SSL_SetURL(PRFileDesc *fd, const char *url);
-
-/*
- * Allow an application to define a set of trust anchors for peer
- * cert validation.
- */
-SSL_IMPORT SECStatus SSL_SetTrustAnchors(PRFileDesc *fd, CERTCertList *list);
-
-/*
-** Return the number of bytes that SSL has waiting in internal buffers.
-** Return 0 if security is not enabled.
-*/
-SSL_IMPORT int SSL_DataPending(PRFileDesc *fd);
-
-/*
-** Invalidate the SSL session associated with fd.
-*/
-SSL_IMPORT SECStatus SSL_InvalidateSession(PRFileDesc *fd);
-
-/*
-** Return a SECItem containing the SSL session ID associated with the fd.
-*/
-SSL_IMPORT SECItem *SSL_GetSessionID(PRFileDesc *fd);
-
-/*
-** Clear out the client's SSL session cache, not the server's session cache.
-*/
-SSL_IMPORT void SSL_ClearSessionCache(void);
-
-/*
-** Close the server's SSL session cache.
-*/
-SSL_IMPORT SECStatus SSL_ShutdownServerSessionIDCache(void);
-
-/*
-** Set peer information so we can correctly look up SSL session later.
-** You only have to do this if you're tunneling through a proxy.
-*/
-SSL_IMPORT SECStatus SSL_SetSockPeerID(PRFileDesc *fd, const char *peerID);
-
-/*
-** Reveal the security information for the peer.
-*/
-SSL_IMPORT CERTCertificate *SSL_RevealCert(PRFileDesc *socket);
-SSL_IMPORT void *SSL_RevealPinArg(PRFileDesc *socket);
-SSL_IMPORT char *SSL_RevealURL(PRFileDesc *socket);
-
-/* This callback may be passed to the SSL library via a call to
- * SSL_GetClientAuthDataHook() for each SSL client socket.
- * It will be invoked when SSL needs to know what certificate and private key
- * (if any) to use to respond to a request for client authentication.
- * If arg is non-NULL, it is a pointer to a NULL-terminated string containing
- * the nickname of the cert/key pair to use.
- * If arg is NULL, this function will search the cert and key databases for
- * a suitable match and send it if one is found.
- */
-SSL_IMPORT SECStatus
-NSS_GetClientAuthData(void *arg,
-                      PRFileDesc *socket,
-                      struct CERTDistNamesStr *caNames,
-                      struct CERTCertificateStr **pRetCert,
-                      struct SECKEYPrivateKeyStr **pRetKey);
-
-/*
-** Configure DTLS-SRTP (RFC 5764) cipher suite preferences.
-** Input is a list of ciphers in descending preference order and a length
-** of the list. As a side effect, this causes the use_srtp extension to be
-** negotiated.
-**
-** Invalid or unimplemented cipher suites in |ciphers| are ignored. If at
-** least one cipher suite in |ciphers| is implemented, returns SECSuccess.
-** Otherwise returns SECFailure.
-*/
-SSL_IMPORT SECStatus SSL_SetSRTPCiphers(PRFileDesc *fd,
-                                        const PRUint16 *ciphers,
-                                        unsigned int numCiphers);
-
-/*
-** Get the selected DTLS-SRTP cipher suite (if any).
-** To be called after the handshake completes.
-** Returns SECFailure if not negotiated.
-*/
-SSL_IMPORT SECStatus SSL_GetSRTPCipher(PRFileDesc *fd,
-                                       PRUint16 *cipher);
-
-/*
- * Look to see if any of the signers in the cert chain for "cert" are found
- * in the list of caNames.
- * Returns SECSuccess if so, SECFailure if not.
- * Used by NSS_GetClientAuthData.  May be used by other callback functions.
- */
-SSL_IMPORT SECStatus NSS_CmpCertChainWCANames(CERTCertificate *cert,
-                                              CERTDistNames *caNames);
-
-/* Deprecated.  This reports a misleading value for certificates that might
- * be used for signing rather than key exchange.
- * Returns key exchange type of the keys in an SSL server certificate.
- */
-SSL_IMPORT SSLKEAType NSS_FindCertKEAType(CERTCertificate *cert);
-
-/* Set cipher policies to a predefined Domestic (U.S.A.) policy.
- * This essentially allows all supported ciphers.
- */
-SSL_IMPORT SECStatus NSS_SetDomesticPolicy(void);
-
-/* Set cipher policies to a predefined Policy that is exportable from the USA
- *   according to present U.S. policies as we understand them.
- * It is the same as NSS_SetDomesticPolicy now.
- */
-SSL_IMPORT SECStatus NSS_SetExportPolicy(void);
-
-/* Set cipher policies to a predefined Policy that is exportable from the USA
- *   according to present U.S. policies as we understand them, and that the
- *   nation of France will permit to be imported into their country.
- * It is the same as NSS_SetDomesticPolicy now.
- */
-SSL_IMPORT SECStatus NSS_SetFrancePolicy(void);
-
-SSL_IMPORT SSL3Statistics *SSL_GetStatistics(void);
-
-/* Report more information than SSL_SecurityStatus.
- * Caller supplies the info struct.  This function fills it in.  Caller should
- * pass sizeof(SSLChannelInfo) as the |len| argument.
- *
- * The information here will be zeroed prior to details being confirmed.  The
- * details are confirmed either when a Finished message is received, or - for a
- * client - when the second flight of messages have been sent.  This function
- * therefore produces unreliable results prior to receiving the
- * SSLHandshakeCallback or the SSLCanFalseStartCallback.
- */
-SSL_IMPORT SECStatus SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info,
-                                        PRUintn len);
-/* Get preliminary information about a channel.
- * Caller supplies the info struct.  This function fills it in.  Caller should
- * pass sizeof(SSLPreliminaryChannelInfo) as the |len| argument.
- *
- * This function can be called prior to handshake details being confirmed (see
- * SSL_GetChannelInfo above for what that means).  Thus, information provided by
- * this function is available to SSLAuthCertificate, SSLGetClientAuthData,
- * SSLSNISocketConfig, and other callbacks that might be called during the
- * processing of the first flight of client of server handshake messages.
- * Values are marked as being unavailable when renegotiation is initiated.
- */
-SSL_IMPORT SECStatus
-SSL_GetPreliminaryChannelInfo(PRFileDesc *fd,
-                              SSLPreliminaryChannelInfo *info,
-                              PRUintn len);
-/* Get information about cipher suite with id of |cipherSuite|.
- * Caller supplies the info struct.  This function fills it in.  Caller should
- * pass sizeof(SSLCipherSuiteInfo) as the |len| argument.
- */
-SSL_IMPORT SECStatus SSL_GetCipherSuiteInfo(PRUint16 cipherSuite,
-                                            SSLCipherSuiteInfo *info, PRUintn len);
-
-/* Returnes negotiated through SNI host info. */
-SSL_IMPORT SECItem *SSL_GetNegotiatedHostInfo(PRFileDesc *fd);
-
-/* Export keying material according to RFC 5705.
-** fd must correspond to a TLS 1.0 or higher socket and out must
-** already be allocated. If hasContext is false, it uses the no-context
-** construction from the RFC and ignores the context and contextLen
-** arguments.
-*/
-SSL_IMPORT SECStatus SSL_ExportKeyingMaterial(PRFileDesc *fd,
-                                              const char *label,
-                                              unsigned int labelLen,
-                                              PRBool hasContext,
-                                              const unsigned char *context,
-                                              unsigned int contextLen,
-                                              unsigned char *out,
-                                              unsigned int outLen);
-
-/* Early exporters are used if 0-RTT is enabled.  This is TLS 1.3 only.  Note
- * that in TLS 1.3, an empty context is equivalent to an absent context. */
-SSL_IMPORT SECStatus SSL_ExportEarlyKeyingMaterial(PRFileDesc *fd,
-                                                   const char *label,
-                                                   unsigned int labelLen,
-                                                   const unsigned char *context,
-                                                   unsigned int contextLen,
-                                                   unsigned char *out,
-                                                   unsigned int outLen);
-
-/*
-** Return a new reference to the certificate that was most recently sent
-** to the peer on this SSL/TLS connection, or NULL if none has been sent.
-*/
-SSL_IMPORT CERTCertificate *SSL_LocalCertificate(PRFileDesc *fd);
-
-#define SSL_CBP_SSL3 0x0001   /* (deprecated) */
-#define SSL_CBP_TLS1_0 0x0002 /* (deprecated) */
-
-/* DEPRECATED: The PKCS#11 bypass has been removed.
-**             This function will now always return false. */
-SSL_IMPORT SECStatus SSL_CanBypass(CERTCertificate *cert,
-                                   SECKEYPrivateKey *privKey,
-                                   PRUint32 protocolmask,
-                                   PRUint16 *ciphers, int nciphers,
-                                   PRBool *pcanbypass, void *pwArg);
-
-/*
-** Did the handshake with the peer negotiate the given extension?
-** Output parameter valid only if function returns SECSuccess
-*/
-SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc *socket,
-                                                      SSLExtensionType extId,
-                                                      PRBool *yes);
-
-/*
-** How long should we wait before retransmitting the next flight of
-** the DTLS handshake? Returns SECFailure if not DTLS or not in a
-** handshake.
-*/
-SSL_IMPORT SECStatus DTLS_GetHandshakeTimeout(PRFileDesc *socket,
-                                              PRIntervalTime *timeout);
-
-/*
- * Return a boolean that indicates whether the underlying library
- * will perform as the caller expects.
- *
- * The only argument is a string, which should be the version
- * identifier of the NSS library. That string will be compared
- * against a string that represents the actual build version of
- * the SSL library.
- */
-extern PRBool NSSSSL_VersionCheck(const char *importedVersion);
-
-/*
- * Returns a const string of the SSL library version.
- */
-extern const char *NSSSSL_GetVersion(void);
-
-/* Restart an SSL connection that was paused to do asynchronous certificate
- * chain validation (when the auth certificate hook or bad cert handler
- * returned SECWouldBlock).
- *
- * This function only works for non-blocking sockets; Do not use it for
- * blocking sockets. Currently, this function works only for the client role of
- * a connection; it does not work for the server role.
- *
- * The application must call SSL_AuthCertificateComplete with 0 as the value of
- * the error parameter after it has successfully validated the peer's
- * certificate, in order to continue the SSL handshake.
- *
- * The application may call SSL_AuthCertificateComplete with a non-zero value
- * for error (e.g. SEC_ERROR_REVOKED_CERTIFICATE) when certificate validation
- * fails, before it closes the connection. If the application does so, an
- * alert corresponding to the error (e.g. certificate_revoked) will be sent to
- * the peer. See the source code of the internal function
- * ssl3_SendAlertForCertError for the current mapping of error to alert. This
- * mapping may change in future versions of libssl.
- *
- * This function will not complete the entire handshake. The application must
- * call SSL_ForceHandshake, PR_Recv, PR_Send, etc. after calling this function
- * to force the handshake to complete.
- *
- * On the first handshake of a connection, libssl will wait for the peer's
- * certificate to be authenticated before calling the handshake callback,
- * sending a client certificate, sending any application data, or returning
- * any application data to the application. On subsequent (renegotiation)
- * handshakes, libssl will block the handshake unconditionally while the
- * certificate is being validated.
- *
- * libssl may send and receive handshake messages while waiting for the
- * application to call SSL_AuthCertificateComplete, and it may call other
- * callbacks (e.g, the client auth data hook) before
- * SSL_AuthCertificateComplete has been called.
- *
- * An application that uses this asynchronous mechanism will usually have lower
- * handshake latency if it has to do public key operations on the certificate
- * chain and/or CRL/OCSP/cert fetching during the authentication, especially if
- * it does so in parallel on another thread. However, if the application can
- * authenticate the peer's certificate quickly then it may be more efficient
- * to use the synchronous mechanism (i.e. returning SECFailure/SECSuccess
- * instead of SECWouldBlock from the authenticate certificate hook).
- *
- * Be careful about converting an application from synchronous cert validation
- * to asynchronous certificate validation. A naive conversion is likely to
- * result in deadlocks; e.g. the application will wait in PR_Poll for network
- * I/O on the connection while all network I/O on the connection is blocked
- * waiting for this function to be called.
- *
- * Returns SECFailure on failure, SECSuccess on success. Never returns
- * SECWouldBlock. Note that SSL_AuthCertificateComplete will (usually) return
- * SECSuccess; do not interpret the return value of SSL_AuthCertificateComplete
- * as an indicator of whether it is OK to continue using the connection. For
- * example, SSL_AuthCertificateComplete(fd, SEC_ERROR_REVOKED_CERTIFICATE) will
- * return SECSuccess (normally), but that does not mean that the application
- * should continue using the connection. If the application passes a non-zero
- * value for second argument (error), or if SSL_AuthCertificateComplete returns
- * anything other than SECSuccess, then the application should close the
- * connection.
- */
-SSL_IMPORT SECStatus SSL_AuthCertificateComplete(PRFileDesc *fd,
-                                                 PRErrorCode error);
-SEC_END_PROTOS
-
-#endif /* __ssl_h_ */
diff --git a/openflow/usr/include/nss/sslerr.h b/openflow/usr/include/nss/sslerr.h
deleted file mode 100644
index 751c335..0000000
--- a/openflow/usr/include/nss/sslerr.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Enumeration of all SSL-specific error codes.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef __SSL_ERR_H_
-#define __SSL_ERR_H_
-
-/* clang-format off */
-
-#define SSL_ERROR_BASE                          (-0x3000)
-#define SSL_ERROR_LIMIT                         (SSL_ERROR_BASE + 1000)
-
-#define IS_SSL_ERROR(code) \
-    (((code) >= SSL_ERROR_BASE) && ((code) < SSL_ERROR_LIMIT))
-
-#ifndef NO_SECURITY_ERROR_ENUM
-typedef enum {
-    SSL_ERROR_EXPORT_ONLY_SERVER            = (SSL_ERROR_BASE +  0),
-                                            /* error 0 is obsolete */
-    SSL_ERROR_US_ONLY_SERVER                = (SSL_ERROR_BASE +  1),
-                                            /* error 1 is obsolete */
-    SSL_ERROR_NO_CYPHER_OVERLAP             = (SSL_ERROR_BASE +  2),
-    /*
-     * Received an alert reporting what we did wrong.  (more alerts below)
-     */
-    SSL_ERROR_NO_CERTIFICATE /*_ALERT */    = (SSL_ERROR_BASE +  3),
-    SSL_ERROR_BAD_CERTIFICATE               = (SSL_ERROR_BASE +  4),
-                                            /* error 4 is obsolete */
-    SSL_ERROR_UNUSED_5                      = (SSL_ERROR_BASE +  5),
-                                            /* error 5 is obsolete */
-    SSL_ERROR_BAD_CLIENT                    = (SSL_ERROR_BASE +  6),
-    SSL_ERROR_BAD_SERVER                    = (SSL_ERROR_BASE +  7),
-    SSL_ERROR_UNSUPPORTED_CERTIFICATE_TYPE  = (SSL_ERROR_BASE +  8),
-                                            /* error 8 is obsolete */
-    SSL_ERROR_UNSUPPORTED_VERSION           = (SSL_ERROR_BASE +  9),
-    SSL_ERROR_UNUSED_10                     = (SSL_ERROR_BASE + 10),
-                                            /* error 10 is obsolete */
-    SSL_ERROR_WRONG_CERTIFICATE             = (SSL_ERROR_BASE + 11),
-                                            /* error 11 is obsolete */
-    SSL_ERROR_BAD_CERT_DOMAIN               = (SSL_ERROR_BASE + 12),
-    SSL_ERROR_POST_WARNING                  = (SSL_ERROR_BASE + 13),
-                                            /* error 13 is obsolete */
-    SSL_ERROR_SSL2_DISABLED                 = (SSL_ERROR_BASE + 14),
-                                            /* error 14 is obsolete */
-    SSL_ERROR_BAD_MAC_READ                  = (SSL_ERROR_BASE + 15),
-    /*
-     * Received an alert reporting what we did wrong.
-     * (two more alerts above, and many more below)
-     */
-    SSL_ERROR_BAD_MAC_ALERT                 = (SSL_ERROR_BASE + 16),
-    SSL_ERROR_BAD_CERT_ALERT                = (SSL_ERROR_BASE + 17),
-    SSL_ERROR_REVOKED_CERT_ALERT            = (SSL_ERROR_BASE + 18),
-    SSL_ERROR_EXPIRED_CERT_ALERT            = (SSL_ERROR_BASE + 19),
-
-    SSL_ERROR_SSL_DISABLED                  = (SSL_ERROR_BASE + 20),
-    SSL_ERROR_FORTEZZA_PQG                  = (SSL_ERROR_BASE + 21),
-                                            /* error 21 is obsolete */
-    SSL_ERROR_UNKNOWN_CIPHER_SUITE          = (SSL_ERROR_BASE + 22),
-    SSL_ERROR_NO_CIPHERS_SUPPORTED          = (SSL_ERROR_BASE + 23),
-    SSL_ERROR_BAD_BLOCK_PADDING             = (SSL_ERROR_BASE + 24),
-    SSL_ERROR_RX_RECORD_TOO_LONG            = (SSL_ERROR_BASE + 25),
-    SSL_ERROR_TX_RECORD_TOO_LONG            = (SSL_ERROR_BASE + 26),
-    /*
-     * Received a malformed (too long or short) SSL handshake.
-     */
-    SSL_ERROR_RX_MALFORMED_HELLO_REQUEST    = (SSL_ERROR_BASE + 27),
-    SSL_ERROR_RX_MALFORMED_CLIENT_HELLO     = (SSL_ERROR_BASE + 28),
-    SSL_ERROR_RX_MALFORMED_SERVER_HELLO     = (SSL_ERROR_BASE + 29),
-    SSL_ERROR_RX_MALFORMED_CERTIFICATE      = (SSL_ERROR_BASE + 30),
-    SSL_ERROR_RX_MALFORMED_SERVER_KEY_EXCH  = (SSL_ERROR_BASE + 31),
-    SSL_ERROR_RX_MALFORMED_CERT_REQUEST     = (SSL_ERROR_BASE + 32),
-    SSL_ERROR_RX_MALFORMED_HELLO_DONE       = (SSL_ERROR_BASE + 33),
-    SSL_ERROR_RX_MALFORMED_CERT_VERIFY      = (SSL_ERROR_BASE + 34),
-    SSL_ERROR_RX_MALFORMED_CLIENT_KEY_EXCH  = (SSL_ERROR_BASE + 35),
-    SSL_ERROR_RX_MALFORMED_FINISHED         = (SSL_ERROR_BASE + 36),
-    /*
-     * Received a malformed (too long or short) SSL record.
-     */
-    SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER    = (SSL_ERROR_BASE + 37),
-    SSL_ERROR_RX_MALFORMED_ALERT            = (SSL_ERROR_BASE + 38),
-    SSL_ERROR_RX_MALFORMED_HANDSHAKE        = (SSL_ERROR_BASE + 39),
-    SSL_ERROR_RX_MALFORMED_APPLICATION_DATA = (SSL_ERROR_BASE + 40),
-    /*
-     * Received an SSL handshake that was inappropriate for the state we're in.
-     * E.g. Server received message from server, or wrong state in state machine.
-     */
-    SSL_ERROR_RX_UNEXPECTED_HELLO_REQUEST   = (SSL_ERROR_BASE + 41),
-    SSL_ERROR_RX_UNEXPECTED_CLIENT_HELLO    = (SSL_ERROR_BASE + 42),
-    SSL_ERROR_RX_UNEXPECTED_SERVER_HELLO    = (SSL_ERROR_BASE + 43),
-    SSL_ERROR_RX_UNEXPECTED_CERTIFICATE     = (SSL_ERROR_BASE + 44),
-    SSL_ERROR_RX_UNEXPECTED_SERVER_KEY_EXCH = (SSL_ERROR_BASE + 45),
-    SSL_ERROR_RX_UNEXPECTED_CERT_REQUEST    = (SSL_ERROR_BASE + 46),
-    SSL_ERROR_RX_UNEXPECTED_HELLO_DONE      = (SSL_ERROR_BASE + 47),
-    SSL_ERROR_RX_UNEXPECTED_CERT_VERIFY     = (SSL_ERROR_BASE + 48),
-    SSL_ERROR_RX_UNEXPECTED_CLIENT_KEY_EXCH = (SSL_ERROR_BASE + 49),
-    SSL_ERROR_RX_UNEXPECTED_FINISHED        = (SSL_ERROR_BASE + 50),
-    /*
-     * Received an SSL record that was inappropriate for the state we're in.
-     */
-    SSL_ERROR_RX_UNEXPECTED_CHANGE_CIPHER   = (SSL_ERROR_BASE + 51),
-    SSL_ERROR_RX_UNEXPECTED_ALERT           = (SSL_ERROR_BASE + 52),
-    SSL_ERROR_RX_UNEXPECTED_HANDSHAKE       = (SSL_ERROR_BASE + 53),
-    SSL_ERROR_RX_UNEXPECTED_APPLICATION_DATA = (SSL_ERROR_BASE + 54),
-    /*
-     * Received record/message with unknown discriminant.
-     */
-    SSL_ERROR_RX_UNKNOWN_RECORD_TYPE        = (SSL_ERROR_BASE + 55),
-    SSL_ERROR_RX_UNKNOWN_HANDSHAKE          = (SSL_ERROR_BASE + 56),
-    SSL_ERROR_RX_UNKNOWN_ALERT              = (SSL_ERROR_BASE + 57),
-    /*
-     * Received an alert reporting what we did wrong.  (more alerts above)
-     */
-    SSL_ERROR_CLOSE_NOTIFY_ALERT            = (SSL_ERROR_BASE + 58),
-    SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT    = (SSL_ERROR_BASE + 59),
-    SSL_ERROR_DECOMPRESSION_FAILURE_ALERT   = (SSL_ERROR_BASE + 60),
-    SSL_ERROR_HANDSHAKE_FAILURE_ALERT       = (SSL_ERROR_BASE + 61),
-    SSL_ERROR_ILLEGAL_PARAMETER_ALERT       = (SSL_ERROR_BASE + 62),
-    SSL_ERROR_UNSUPPORTED_CERT_ALERT        = (SSL_ERROR_BASE + 63),
-    SSL_ERROR_CERTIFICATE_UNKNOWN_ALERT     = (SSL_ERROR_BASE + 64),
-
-    SSL_ERROR_GENERATE_RANDOM_FAILURE       = (SSL_ERROR_BASE + 65),
-    SSL_ERROR_SIGN_HASHES_FAILURE           = (SSL_ERROR_BASE + 66),
-    SSL_ERROR_EXTRACT_PUBLIC_KEY_FAILURE    = (SSL_ERROR_BASE + 67),
-    SSL_ERROR_SERVER_KEY_EXCHANGE_FAILURE   = (SSL_ERROR_BASE + 68),
-    SSL_ERROR_CLIENT_KEY_EXCHANGE_FAILURE   = (SSL_ERROR_BASE + 69),
-
-    SSL_ERROR_ENCRYPTION_FAILURE            = (SSL_ERROR_BASE + 70),
-    SSL_ERROR_DECRYPTION_FAILURE            = (SSL_ERROR_BASE + 71),
-                                            /* error 71 is obsolete */
-    SSL_ERROR_SOCKET_WRITE_FAILURE          = (SSL_ERROR_BASE + 72),
-
-    SSL_ERROR_MD5_DIGEST_FAILURE            = (SSL_ERROR_BASE + 73),
-    SSL_ERROR_SHA_DIGEST_FAILURE            = (SSL_ERROR_BASE + 74),
-    SSL_ERROR_MAC_COMPUTATION_FAILURE       = (SSL_ERROR_BASE + 75),
-    SSL_ERROR_SYM_KEY_CONTEXT_FAILURE       = (SSL_ERROR_BASE + 76),
-    SSL_ERROR_SYM_KEY_UNWRAP_FAILURE        = (SSL_ERROR_BASE + 77),
-    SSL_ERROR_PUB_KEY_SIZE_LIMIT_EXCEEDED   = (SSL_ERROR_BASE + 78),
-                                            /* error 78 is obsolete */
-    SSL_ERROR_IV_PARAM_FAILURE              = (SSL_ERROR_BASE + 79),
-    SSL_ERROR_INIT_CIPHER_SUITE_FAILURE     = (SSL_ERROR_BASE + 80),
-    SSL_ERROR_SESSION_KEY_GEN_FAILURE       = (SSL_ERROR_BASE + 81),
-    SSL_ERROR_NO_SERVER_KEY_FOR_ALG         = (SSL_ERROR_BASE + 82),
-    SSL_ERROR_TOKEN_INSERTION_REMOVAL       = (SSL_ERROR_BASE + 83),
-    SSL_ERROR_TOKEN_SLOT_NOT_FOUND          = (SSL_ERROR_BASE + 84),
-    SSL_ERROR_NO_COMPRESSION_OVERLAP        = (SSL_ERROR_BASE + 85),
-    SSL_ERROR_HANDSHAKE_NOT_COMPLETED       = (SSL_ERROR_BASE + 86),
-    SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE      = (SSL_ERROR_BASE + 87),
-    SSL_ERROR_CERT_KEA_MISMATCH             = (SSL_ERROR_BASE + 88),
-    SSL_ERROR_NO_TRUSTED_SSL_CLIENT_CA      = (SSL_ERROR_BASE + 89),
-                                            /* error 89 is obsolete */
-    SSL_ERROR_SESSION_NOT_FOUND             = (SSL_ERROR_BASE + 90),
-
-    SSL_ERROR_DECRYPTION_FAILED_ALERT       = (SSL_ERROR_BASE + 91),
-    SSL_ERROR_RECORD_OVERFLOW_ALERT         = (SSL_ERROR_BASE + 92),
-    SSL_ERROR_UNKNOWN_CA_ALERT              = (SSL_ERROR_BASE + 93),
-    SSL_ERROR_ACCESS_DENIED_ALERT           = (SSL_ERROR_BASE + 94),
-    SSL_ERROR_DECODE_ERROR_ALERT            = (SSL_ERROR_BASE + 95),
-    SSL_ERROR_DECRYPT_ERROR_ALERT           = (SSL_ERROR_BASE + 96),
-    SSL_ERROR_EXPORT_RESTRICTION_ALERT      = (SSL_ERROR_BASE + 97),
-    SSL_ERROR_PROTOCOL_VERSION_ALERT        = (SSL_ERROR_BASE + 98),
-    SSL_ERROR_INSUFFICIENT_SECURITY_ALERT   = (SSL_ERROR_BASE + 99),
-    SSL_ERROR_INTERNAL_ERROR_ALERT          = (SSL_ERROR_BASE + 100),
-    SSL_ERROR_USER_CANCELED_ALERT           = (SSL_ERROR_BASE + 101),
-    SSL_ERROR_NO_RENEGOTIATION_ALERT        = (SSL_ERROR_BASE + 102),
-
-    SSL_ERROR_SERVER_CACHE_NOT_CONFIGURED   = (SSL_ERROR_BASE + 103),
-
-    SSL_ERROR_UNSUPPORTED_EXTENSION_ALERT   = (SSL_ERROR_BASE + 104),
-    SSL_ERROR_CERTIFICATE_UNOBTAINABLE_ALERT = (SSL_ERROR_BASE + 105),
-    SSL_ERROR_UNRECOGNIZED_NAME_ALERT       = (SSL_ERROR_BASE + 106),
-    SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT = (SSL_ERROR_BASE + 107),
-    SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT     = (SSL_ERROR_BASE + 108),
-
-    SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET = (SSL_ERROR_BASE + 109),
-    SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET = (SSL_ERROR_BASE + 110),
-
-    SSL_ERROR_DECOMPRESSION_FAILURE         = (SSL_ERROR_BASE + 111),
-    SSL_ERROR_RENEGOTIATION_NOT_ALLOWED     = (SSL_ERROR_BASE + 112),
-    SSL_ERROR_UNSAFE_NEGOTIATION            = (SSL_ERROR_BASE + 113),
-
-    SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD = (SSL_ERROR_BASE + 114),
-
-    SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY  = (SSL_ERROR_BASE + 115),
-
-    SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID    = (SSL_ERROR_BASE + 116),
-
-    SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2 = (SSL_ERROR_BASE + 117),
-                                             /* error 117 is obsolete */
-    SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SERVERS = (SSL_ERROR_BASE + 118),
-    SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_CLIENTS = (SSL_ERROR_BASE + 119),
-
-    SSL_ERROR_INVALID_VERSION_RANGE         = (SSL_ERROR_BASE + 120),
-    SSL_ERROR_CIPHER_DISALLOWED_FOR_VERSION = (SSL_ERROR_BASE + 121),
-
-    SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST = (SSL_ERROR_BASE + 122),
-    SSL_ERROR_RX_UNEXPECTED_HELLO_VERIFY_REQUEST = (SSL_ERROR_BASE + 123),
-
-    SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION = (SSL_ERROR_BASE + 124),
-
-    SSL_ERROR_RX_UNEXPECTED_CERT_STATUS     = (SSL_ERROR_BASE + 125),
-
-    SSL_ERROR_UNSUPPORTED_HASH_ALGORITHM    = (SSL_ERROR_BASE + 126),
-    SSL_ERROR_DIGEST_FAILURE                = (SSL_ERROR_BASE + 127),
-    SSL_ERROR_INCORRECT_SIGNATURE_ALGORITHM = (SSL_ERROR_BASE + 128),
-
-    SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK     = (SSL_ERROR_BASE + 129),
-    SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL     = (SSL_ERROR_BASE + 130),
-
-    SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT  = (SSL_ERROR_BASE + 131),
-
-    SSL_ERROR_WEAK_SERVER_CERT_KEY          = (SSL_ERROR_BASE + 132),
-
-    SSL_ERROR_RX_SHORT_DTLS_READ            = (SSL_ERROR_BASE + 133),
-
-    SSL_ERROR_NO_SUPPORTED_SIGNATURE_ALGORITHM = (SSL_ERROR_BASE + 134),
-    SSL_ERROR_UNSUPPORTED_SIGNATURE_ALGORITHM = (SSL_ERROR_BASE + 135),
-
-    SSL_ERROR_MISSING_EXTENDED_MASTER_SECRET = (SSL_ERROR_BASE + 136),
-    SSL_ERROR_UNEXPECTED_EXTENDED_MASTER_SECRET = (SSL_ERROR_BASE + 137),
-
-    SSL_ERROR_RX_MALFORMED_KEY_SHARE        = (SSL_ERROR_BASE + 138),
-    SSL_ERROR_MISSING_KEY_SHARE             = (SSL_ERROR_BASE + 139),
-    SSL_ERROR_RX_MALFORMED_ECDHE_KEY_SHARE  = (SSL_ERROR_BASE + 140),
-    SSL_ERROR_RX_MALFORMED_DHE_KEY_SHARE    = (SSL_ERROR_BASE + 141),
-
-    SSL_ERROR_RX_UNEXPECTED_ENCRYPTED_EXTENSIONS = (SSL_ERROR_BASE + 142),
-    SSL_ERROR_MISSING_EXTENSION_ALERT       = (SSL_ERROR_BASE + 143),
-
-    SSL_ERROR_KEY_EXCHANGE_FAILURE          = (SSL_ERROR_BASE + 144),
-    SSL_ERROR_EXTENSION_DISALLOWED_FOR_VERSION = (SSL_ERROR_BASE + 145),
-    SSL_ERROR_RX_MALFORMED_ENCRYPTED_EXTENSIONS = (SSL_ERROR_BASE + 146),
-    SSL_ERROR_MALFORMED_PRE_SHARED_KEY = (SSL_ERROR_BASE + 147),
-    SSL_ERROR_MALFORMED_EARLY_DATA = (SSL_ERROR_BASE + 148),
-    SSL_ERROR_END_OF_EARLY_DATA_ALERT = (SSL_ERROR_BASE + 149),
-    SSL_ERROR_MISSING_ALPN_EXTENSION = (SSL_ERROR_BASE + 150),
-    SSL_ERROR_RX_UNEXPECTED_EXTENSION = (SSL_ERROR_BASE + 151),
-    SSL_ERROR_MISSING_SUPPORTED_GROUPS_EXTENSION = (SSL_ERROR_BASE + 152),
-    SSL_ERROR_TOO_MANY_RECORDS = (SSL_ERROR_BASE + 153),
-    SSL_ERROR_RX_UNEXPECTED_HELLO_RETRY_REQUEST = (SSL_ERROR_BASE + 154),
-    SSL_ERROR_RX_MALFORMED_HELLO_RETRY_REQUEST = (SSL_ERROR_BASE + 155),
-    SSL_ERROR_BAD_2ND_CLIENT_HELLO = (SSL_ERROR_BASE + 156),
-    SSL_ERROR_MISSING_SIGNATURE_ALGORITHMS_EXTENSION = (SSL_ERROR_BASE + 157),
-    SSL_ERROR_MALFORMED_PSK_KEY_EXCHANGE_MODES = (SSL_ERROR_BASE + 158),
-    SSL_ERROR_MISSING_PSK_KEY_EXCHANGE_MODES = (SSL_ERROR_BASE + 159),
-    SSL_ERROR_END_OF_LIST   /* let the c compiler determine the value of this. */
-} SSLErrorCodes;
-#endif /* NO_SECURITY_ERROR_ENUM */
-
-/* clang-format on */
-
-#endif /* __SSL_ERR_H_ */
diff --git a/openflow/usr/include/nss/sslproto.h b/openflow/usr/include/nss/sslproto.h
deleted file mode 100644
index 70daea0..0000000
--- a/openflow/usr/include/nss/sslproto.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Various and sundry protocol constants. DON'T CHANGE THESE. These values
- * are mostly defined by the SSL3 or TLS protocol specifications.
- * Cipher kinds and ciphersuites are part of the public API.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __sslproto_h_
-#define __sslproto_h_
-
-/* clang-format off */
-
-/* All versions less than 3_0 are treated as SSL version 2 */
-#define SSL_LIBRARY_VERSION_2                   0x0002
-#define SSL_LIBRARY_VERSION_3_0                 0x0300
-#define SSL_LIBRARY_VERSION_TLS_1_0             0x0301
-#define SSL_LIBRARY_VERSION_TLS_1_1             0x0302
-#define SSL_LIBRARY_VERSION_TLS_1_2             0x0303
-#define SSL_LIBRARY_VERSION_TLS_1_3             0x0304
-
-/* Note: this is the internal format, not the wire format */
-#define SSL_LIBRARY_VERSION_DTLS_1_0            SSL_LIBRARY_VERSION_TLS_1_1
-#define SSL_LIBRARY_VERSION_DTLS_1_2            SSL_LIBRARY_VERSION_TLS_1_2
-#define SSL_LIBRARY_VERSION_DTLS_1_3            SSL_LIBRARY_VERSION_TLS_1_3
-
-/* deprecated old name */
-#define SSL_LIBRARY_VERSION_3_1_TLS SSL_LIBRARY_VERSION_TLS_1_0
-
-/* The DTLS versions used in the spec */
-#define SSL_LIBRARY_VERSION_DTLS_1_0_WIRE       ((~0x0100) & 0xffff)
-#define SSL_LIBRARY_VERSION_DTLS_1_2_WIRE       ((~0x0102) & 0xffff)
-#define SSL_LIBRARY_VERSION_DTLS_1_3_WIRE       SSL_LIBRARY_VERSION_DTLS_1_3
-
-/* Certificate types */
-#define SSL_CT_X509_CERTIFICATE                 0x01
-#if 0 /* XXX Not implemented yet */
-#define SSL_PKCS6_CERTIFICATE                   0x02
-#endif
-#define SSL_AT_MD5_WITH_RSA_ENCRYPTION          0x01
-
-/* Error codes */
-#define SSL_PE_NO_CYPHERS                       0x0001
-#define SSL_PE_NO_CERTIFICATE                   0x0002
-#define SSL_PE_BAD_CERTIFICATE                  0x0004
-#define SSL_PE_UNSUPPORTED_CERTIFICATE_TYPE     0x0006
-
-/* Deprecated SSL 3.0 & libssl names replaced by IANA-registered TLS names. */
-#ifndef SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
-#define SSL_NULL_WITH_NULL_NULL                TLS_NULL_WITH_NULL_NULL
-#define SSL_RSA_WITH_NULL_MD5                  TLS_RSA_WITH_NULL_MD5
-#define SSL_RSA_WITH_NULL_SHA                  TLS_RSA_WITH_NULL_SHA
-#define SSL_RSA_WITH_RC4_128_MD5               TLS_RSA_WITH_RC4_128_MD5
-#define SSL_RSA_WITH_RC4_128_SHA               TLS_RSA_WITH_RC4_128_SHA
-#define SSL_RSA_WITH_IDEA_CBC_SHA              TLS_RSA_WITH_IDEA_CBC_SHA
-#define SSL_RSA_WITH_DES_CBC_SHA               TLS_RSA_WITH_DES_CBC_SHA
-#define SSL_RSA_WITH_3DES_EDE_CBC_SHA          TLS_RSA_WITH_3DES_EDE_CBC_SHA
-#define SSL_DH_DSS_WITH_DES_CBC_SHA            TLS_DH_DSS_WITH_DES_CBC_SHA
-#define SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA       TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
-#define SSL_DH_RSA_WITH_DES_CBC_SHA            TLS_DH_RSA_WITH_DES_CBC_SHA
-#define SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA       TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
-#define SSL_DHE_DSS_WITH_DES_CBC_SHA           TLS_DHE_DSS_WITH_DES_CBC_SHA
-#define SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA      TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
-#define SSL_DHE_RSA_WITH_DES_CBC_SHA           TLS_DHE_RSA_WITH_DES_CBC_SHA
-#define SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA      TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
-#define SSL_DH_ANON_WITH_RC4_128_MD5           TLS_DH_anon_WITH_RC4_128_MD5
-#define SSL_DH_ANON_WITH_DES_CBC_SHA           TLS_DH_anon_WITH_DES_CBC_SHA
-#define SSL_DH_ANON_WITH_3DES_EDE_CBC_SHA      TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
-#define TLS_DH_ANON_WITH_AES_128_CBC_SHA       TLS_DH_anon_WITH_AES_128_CBC_SHA
-#define TLS_DH_ANON_WITH_AES_256_CBC_SHA       TLS_DH_anon_WITH_AES_256_CBC_SHA
-#define TLS_DH_ANON_WITH_CAMELLIA_128_CBC_SHA  TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA
-#define TLS_DH_ANON_WITH_CAMELLIA_256_CBC_SHA  TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA
-#endif
-
-#define TLS_NULL_WITH_NULL_NULL                 0x0000
-
-#define TLS_RSA_WITH_NULL_MD5                   0x0001
-#define TLS_RSA_WITH_NULL_SHA                   0x0002
-#define TLS_RSA_WITH_RC4_128_MD5                0x0004
-#define TLS_RSA_WITH_RC4_128_SHA                0x0005
-#define TLS_RSA_WITH_IDEA_CBC_SHA               0x0007
-#define TLS_RSA_WITH_DES_CBC_SHA                0x0009
-#define TLS_RSA_WITH_3DES_EDE_CBC_SHA           0x000a
-
-#define TLS_DH_DSS_WITH_DES_CBC_SHA             0x000c
-#define TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA        0x000d
-#define TLS_DH_RSA_WITH_DES_CBC_SHA             0x000f
-#define TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA        0x0010
-
-#define TLS_DHE_DSS_WITH_DES_CBC_SHA            0x0012
-#define TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA       0x0013
-#define TLS_DHE_RSA_WITH_DES_CBC_SHA            0x0015
-#define TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA       0x0016
-
-#define TLS_DH_anon_WITH_RC4_128_MD5            0x0018
-#define TLS_DH_anon_WITH_DES_CBC_SHA            0x001a
-#define TLS_DH_anon_WITH_3DES_EDE_CBC_SHA       0x001b
-
-#define TLS_RSA_WITH_AES_128_CBC_SHA            0x002F
-#define TLS_DH_DSS_WITH_AES_128_CBC_SHA         0x0030
-#define TLS_DH_RSA_WITH_AES_128_CBC_SHA         0x0031
-#define TLS_DHE_DSS_WITH_AES_128_CBC_SHA        0x0032
-#define TLS_DHE_RSA_WITH_AES_128_CBC_SHA        0x0033
-#define TLS_DH_anon_WITH_AES_128_CBC_SHA        0x0034
-
-#define TLS_RSA_WITH_AES_256_CBC_SHA            0x0035
-#define TLS_DH_DSS_WITH_AES_256_CBC_SHA         0x0036
-#define TLS_DH_RSA_WITH_AES_256_CBC_SHA         0x0037
-#define TLS_DHE_DSS_WITH_AES_256_CBC_SHA        0x0038
-#define TLS_DHE_RSA_WITH_AES_256_CBC_SHA        0x0039
-#define TLS_DH_anon_WITH_AES_256_CBC_SHA        0x003A
-#define TLS_RSA_WITH_NULL_SHA256                0x003B
-#define TLS_RSA_WITH_AES_128_CBC_SHA256         0x003C
-#define TLS_RSA_WITH_AES_256_CBC_SHA256         0x003D
-
-#define TLS_DHE_DSS_WITH_AES_128_CBC_SHA256     0x0040
-#define TLS_RSA_WITH_CAMELLIA_128_CBC_SHA       0x0041
-#define TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA    0x0042
-#define TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA    0x0043
-#define TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA   0x0044
-#define TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA   0x0045
-#define TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA   0x0046
-
-#define TLS_DHE_DSS_WITH_RC4_128_SHA            0x0066
-#define TLS_DHE_RSA_WITH_AES_128_CBC_SHA256     0x0067
-#define TLS_DHE_DSS_WITH_AES_256_CBC_SHA256     0x006A
-#define TLS_DHE_RSA_WITH_AES_256_CBC_SHA256     0x006B
-
-#define TLS_RSA_WITH_CAMELLIA_256_CBC_SHA       0x0084
-#define TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA    0x0085
-#define TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA    0x0086
-#define TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA   0x0087
-#define TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA   0x0088
-#define TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA   0x0089
-
-#define TLS_RSA_WITH_SEED_CBC_SHA               0x0096
-
-#define TLS_RSA_WITH_AES_128_GCM_SHA256         0x009C
-#define TLS_RSA_WITH_AES_256_GCM_SHA384         0x009D
-#define TLS_DHE_RSA_WITH_AES_128_GCM_SHA256     0x009E
-#define TLS_DHE_RSA_WITH_AES_256_GCM_SHA384     0x009F
-#define TLS_DHE_DSS_WITH_AES_128_GCM_SHA256     0x00A2
-#define TLS_DHE_DSS_WITH_AES_256_GCM_SHA384     0x00A3
-
-/* TLS "Signaling Cipher Suite Value" (SCSV). May be requested by client.
- * Must NEVER be chosen by server.  SSL 3.0 server acknowledges by sending
- * back an empty Renegotiation Info (RI) server hello extension.
- */
-#define TLS_EMPTY_RENEGOTIATION_INFO_SCSV       0x00FF
-
-/* TLS_FALLBACK_SCSV is a signaling cipher suite value that indicates that a
- * handshake is the result of TLS version fallback.
- */
-#define TLS_FALLBACK_SCSV                       0x5600
-
-/* Cipher Suite Values starting with 0xC000 are defined in informational
- * RFCs.
- */
-#define TLS_ECDH_ECDSA_WITH_NULL_SHA            0xC001
-#define TLS_ECDH_ECDSA_WITH_RC4_128_SHA         0xC002
-#define TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA    0xC003
-#define TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA     0xC004
-#define TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA     0xC005
-
-#define TLS_ECDHE_ECDSA_WITH_NULL_SHA           0xC006
-#define TLS_ECDHE_ECDSA_WITH_RC4_128_SHA        0xC007
-#define TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA   0xC008
-#define TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA    0xC009
-#define TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA    0xC00A
-
-#define TLS_ECDH_RSA_WITH_NULL_SHA              0xC00B
-#define TLS_ECDH_RSA_WITH_RC4_128_SHA           0xC00C
-#define TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA      0xC00D
-#define TLS_ECDH_RSA_WITH_AES_128_CBC_SHA       0xC00E
-#define TLS_ECDH_RSA_WITH_AES_256_CBC_SHA       0xC00F
-
-#define TLS_ECDHE_RSA_WITH_NULL_SHA             0xC010
-#define TLS_ECDHE_RSA_WITH_RC4_128_SHA          0xC011
-#define TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA     0xC012
-#define TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA      0xC013
-#define TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA      0xC014
-
-#define TLS_ECDH_anon_WITH_NULL_SHA             0xC015
-#define TLS_ECDH_anon_WITH_RC4_128_SHA          0xC016
-#define TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA     0xC017
-#define TLS_ECDH_anon_WITH_AES_128_CBC_SHA      0xC018
-#define TLS_ECDH_anon_WITH_AES_256_CBC_SHA      0xC019
-
-#define TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 0xC023
-#define TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 0xC024
-#define TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256   0xC027
-#define TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384   0xC028
-
-#define TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 0xC02B
-#define TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 0xC02C
-#define TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256  0xC02D
-#define TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256   0xC02F
-#define TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384   0xC030
-#define TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256    0xC031
-
-/* draft-ietf-tls-chacha20-poly1305-04 */
-#define TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256   0xCCA8
-#define TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 0xCCA9
-#define TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256     0xCCAA
-
-/* Special TLS 1.3 cipher suites that really just specify AEAD */
-#define TLS_AES_128_GCM_SHA256                0x1301
-#define TLS_AES_256_GCM_SHA384                0x1302
-#define TLS_CHACHA20_POLY1305_SHA256          0x1303
-
-/* PSK cipher suites. NSS doesn't actually support these, but we
- * exposed them when TLS 1.3 used them so we need to keep them
- * in the API. */
-#define TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256   0xCCAC
-#define TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256     0xCCAD
-#define TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256   0xD001
-#define TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384   0xD002
-#define TLS_DHE_PSK_WITH_AES_128_GCM_SHA256     0x00AA /* RFC 5487 */
-#define TLS_DHE_PSK_WITH_AES_256_GCM_SHA384     0x00AB /* RFC 5487 */
-
-/* DTLS-SRTP cipher suites from RFC 5764 */
-/* If you modify this, also modify MAX_DTLS_SRTP_CIPHER_SUITES in sslimpl.h */
-#define SRTP_AES128_CM_HMAC_SHA1_80             0x0001
-#define SRTP_AES128_CM_HMAC_SHA1_32             0x0002
-#define SRTP_NULL_HMAC_SHA1_80                  0x0005
-#define SRTP_NULL_HMAC_SHA1_32                  0x0006
-
-/* DO NOT USE. (deprecated, will be removed) */
-#define SSL_HL_ERROR_HBYTES                     3
-#define SSL_HL_CLIENT_HELLO_HBYTES              9
-#define SSL_HL_CLIENT_MASTER_KEY_HBYTES         10
-#define SSL_HL_CLIENT_FINISHED_HBYTES           1
-#define SSL_HL_SERVER_HELLO_HBYTES              11
-#define SSL_HL_SERVER_VERIFY_HBYTES             1
-#define SSL_HL_SERVER_FINISHED_HBYTES           1
-#define SSL_HL_REQUEST_CERTIFICATE_HBYTES       2
-#define SSL_HL_CLIENT_CERTIFICATE_HBYTES        6
-#define SSL_MT_ERROR                            0
-#define SSL_MT_CLIENT_HELLO                     1
-#define SSL_MT_CLIENT_MASTER_KEY                2
-#define SSL_MT_CLIENT_FINISHED                  3
-#define SSL_MT_SERVER_HELLO                     4
-#define SSL_MT_SERVER_VERIFY                    5
-#define SSL_MT_SERVER_FINISHED                  6
-#define SSL_MT_REQUEST_CERTIFICATE              7
-#define SSL_MT_CLIENT_CERTIFICATE               8
-#define SSL_CK_RC4_128_WITH_MD5                 0x01
-#define SSL_CK_RC4_128_EXPORT40_WITH_MD5        0x02
-#define SSL_CK_RC2_128_CBC_WITH_MD5             0x03
-#define SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5    0x04
-#define SSL_CK_IDEA_128_CBC_WITH_MD5            0x05
-#define SSL_CK_DES_64_CBC_WITH_MD5              0x06
-#define SSL_CK_DES_192_EDE3_CBC_WITH_MD5        0x07
-#define SSL_EN_RC4_128_WITH_MD5                 0xFF01
-#define SSL_EN_RC4_128_EXPORT40_WITH_MD5        0xFF02
-#define SSL_EN_RC2_128_CBC_WITH_MD5             0xFF03
-#define SSL_EN_RC2_128_CBC_EXPORT40_WITH_MD5    0xFF04
-#define SSL_EN_IDEA_128_CBC_WITH_MD5            0xFF05
-#define SSL_EN_DES_64_CBC_WITH_MD5              0xFF06
-#define SSL_EN_DES_192_EDE3_CBC_WITH_MD5        0xFF07
-#define TLS_RSA_EXPORT_WITH_RC4_40_MD5          0x0003
-#define TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5      0x0006
-#define TLS_RSA_EXPORT_WITH_DES40_CBC_SHA       0x0008
-#define TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA     0x0062
-#define TLS_RSA_EXPORT1024_WITH_RC4_56_SHA      0x0064
-#define TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA   0x0014
-#define TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA    0x000e
-#define TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA 0x0063
-#define TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA  0x0065
-#define TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA    0x000b
-#define TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA   0x0011
-#define TLS_DH_anon_EXPORT_WITH_RC4_40_MD5      0x0017
-#define TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA   0x0019
-#define SSL_FORTEZZA_DMS_WITH_NULL_SHA          0x001c
-#define SSL_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA  0x001d
-#define SSL_FORTEZZA_DMS_WITH_RC4_128_SHA       0x001e
-#define SSL_RSA_OLDFIPS_WITH_3DES_EDE_CBC_SHA   0xffe0
-#define SSL_RSA_OLDFIPS_WITH_DES_CBC_SHA        0xffe1
-#define SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA      0xfeff
-#define SSL_RSA_FIPS_WITH_DES_CBC_SHA           0xfefe
-#define SSL_RSA_EXPORT_WITH_RC4_40_MD5         TLS_RSA_EXPORT_WITH_RC4_40_MD5
-#define SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5     TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
-#define SSL_RSA_EXPORT_WITH_DES40_CBC_SHA      TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
-#define SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA   TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
-#define SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA  TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
-#define SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA   TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
-#define SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA  TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
-#define SSL_DH_ANON_EXPORT_WITH_DES40_CBC_SHA  TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
-#define SSL_DH_ANON_EXPORT_WITH_RC4_40_MD5     TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
-
-/* clang-format on */
-
-#endif /* __sslproto_h_ */
diff --git a/openflow/usr/include/nss/sslt.h b/openflow/usr/include/nss/sslt.h
deleted file mode 100644
index 506b78d..0000000
--- a/openflow/usr/include/nss/sslt.h
+++ /dev/null
@@ -1,415 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file contains prototypes for the public SSL functions.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __sslt_h_
-#define __sslt_h_
-
-#include "prtypes.h"
-#include "secitem.h"
-#include "certt.h"
-
-typedef struct SSL3StatisticsStr {
-    /* statistics from ssl3_SendClientHello (sch) */
-    long sch_sid_cache_hits;
-    long sch_sid_cache_misses;
-    long sch_sid_cache_not_ok;
-
-    /* statistics from ssl3_HandleServerHello (hsh) */
-    long hsh_sid_cache_hits;
-    long hsh_sid_cache_misses;
-    long hsh_sid_cache_not_ok;
-
-    /* statistics from ssl3_HandleClientHello (hch) */
-    long hch_sid_cache_hits;
-    long hch_sid_cache_misses;
-    long hch_sid_cache_not_ok;
-
-    /* statistics related to stateless resume */
-    long sch_sid_stateless_resumes;
-    long hsh_sid_stateless_resumes;
-    long hch_sid_stateless_resumes;
-    long hch_sid_ticket_parse_failures;
-} SSL3Statistics;
-
-/* Key Exchange algorithm values */
-typedef enum {
-    ssl_kea_null = 0,
-    ssl_kea_rsa = 1,
-    ssl_kea_dh = 2,
-    ssl_kea_fortezza = 3, /* deprecated, now unused */
-    ssl_kea_ecdh = 4,
-    ssl_kea_ecdh_psk = 5,
-    ssl_kea_dh_psk = 6,
-    ssl_kea_tls13_any = 7,
-    ssl_kea_size /* number of ssl_kea_ algorithms */
-} SSLKEAType;
-
-/* The following defines are for backwards compatibility.
-** They will be removed in a forthcoming release to reduce namespace pollution.
-** programs that use the kt_ symbols should convert to the ssl_kt_ symbols
-** soon.
-*/
-#define kt_null ssl_kea_null
-#define kt_rsa ssl_kea_rsa
-#define kt_dh ssl_kea_dh
-#define kt_fortezza ssl_kea_fortezza /* deprecated, now unused */
-#define kt_ecdh ssl_kea_ecdh
-#define kt_kea_size ssl_kea_size
-
-/* Values of this enum match the SignatureAlgorithm enum from
- * https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1 */
-typedef enum {
-    ssl_sign_null = 0, /* "anonymous" in TLS */
-    ssl_sign_rsa = 1,
-    ssl_sign_dsa = 2,
-    ssl_sign_ecdsa = 3
-} SSLSignType;
-
-/* Values of this enum match the HashAlgorithm enum from
- * https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1 */
-typedef enum {
-    /* ssl_hash_none is used internally to mean the pre-1.2 combination of MD5
-     * and SHA1. The other values are only used in TLS 1.2. */
-    ssl_hash_none = 0,
-    ssl_hash_md5 = 1,
-    ssl_hash_sha1 = 2,
-    ssl_hash_sha224 = 3,
-    ssl_hash_sha256 = 4,
-    ssl_hash_sha384 = 5,
-    ssl_hash_sha512 = 6
-} SSLHashType;
-
-/* Deprecated */
-typedef struct SSLSignatureAndHashAlgStr {
-    SSLHashType hashAlg;
-    SSLSignType sigAlg;
-} SSLSignatureAndHashAlg;
-
-typedef enum {
-    ssl_sig_none = 0,
-    ssl_sig_rsa_pkcs1_sha1 = 0x0201,
-    ssl_sig_rsa_pkcs1_sha256 = 0x0401,
-    ssl_sig_rsa_pkcs1_sha384 = 0x0501,
-    ssl_sig_rsa_pkcs1_sha512 = 0x0601,
-    /* For ECDSA, the pairing of the hash with a specific curve is only enforced
-     * in TLS 1.3; in TLS 1.2 any curve can be used with each of these. */
-    ssl_sig_ecdsa_secp256r1_sha256 = 0x0403,
-    ssl_sig_ecdsa_secp384r1_sha384 = 0x0503,
-    ssl_sig_ecdsa_secp521r1_sha512 = 0x0603,
-    ssl_sig_rsa_pss_sha256 = 0x0804,
-    ssl_sig_rsa_pss_sha384 = 0x0805,
-    ssl_sig_rsa_pss_sha512 = 0x0806,
-    ssl_sig_ed25519 = 0x0807,
-    ssl_sig_ed448 = 0x0808,
-
-    ssl_sig_dsa_sha1 = 0x0202,
-    ssl_sig_dsa_sha256 = 0x0402,
-    ssl_sig_dsa_sha384 = 0x0502,
-    ssl_sig_dsa_sha512 = 0x0602,
-    ssl_sig_ecdsa_sha1 = 0x0203,
-
-    /* The following value (which can't be used in the protocol), represents
-     * the RSA signature using SHA-1 and MD5 that is used in TLS 1.0 and 1.1.
-     * This is reported as a signature scheme when TLS 1.0 or 1.1 is used.
-     * This should not be passed to SSL_SignatureSchemePrefSet(); this
-     * signature scheme is always used and cannot be disabled. */
-    ssl_sig_rsa_pkcs1_sha1md5 = 0x10101,
-} SSLSignatureScheme;
-
-/*
-** SSLAuthType describes the type of key that is used to authenticate a
-** connection.  That is, the type of key in the end-entity certificate.
-*/
-typedef enum {
-    ssl_auth_null = 0,
-    ssl_auth_rsa_decrypt = 1, /* static RSA */
-    ssl_auth_dsa = 2,
-    ssl_auth_kea = 3, /* unused */
-    ssl_auth_ecdsa = 4,
-    ssl_auth_ecdh_rsa = 5,   /* ECDH cert with an RSA signature */
-    ssl_auth_ecdh_ecdsa = 6, /* ECDH cert with an ECDSA signature */
-    ssl_auth_rsa_sign = 7,   /* RSA PKCS#1.5 signing */
-    ssl_auth_rsa_pss = 8,
-    ssl_auth_psk = 9,
-    ssl_auth_tls13_any = 10,
-    ssl_auth_size /* number of authentication types */
-} SSLAuthType;
-
-/* This is defined for backward compatibility reasons */
-#define ssl_auth_rsa ssl_auth_rsa_decrypt
-
-typedef enum {
-    ssl_calg_null = 0,
-    ssl_calg_rc4 = 1,
-    ssl_calg_rc2 = 2,
-    ssl_calg_des = 3,
-    ssl_calg_3des = 4,
-    ssl_calg_idea = 5,
-    ssl_calg_fortezza = 6, /* deprecated, now unused */
-    ssl_calg_aes = 7,
-    ssl_calg_camellia = 8,
-    ssl_calg_seed = 9,
-    ssl_calg_aes_gcm = 10,
-    ssl_calg_chacha20 = 11
-} SSLCipherAlgorithm;
-
-typedef enum {
-    ssl_mac_null = 0,
-    ssl_mac_md5 = 1,
-    ssl_mac_sha = 2,
-    ssl_hmac_md5 = 3, /* TLS HMAC version of mac_md5 */
-    ssl_hmac_sha = 4, /* TLS HMAC version of mac_sha */
-    ssl_hmac_sha256 = 5,
-    ssl_mac_aead = 6,
-    ssl_hmac_sha384 = 7
-} SSLMACAlgorithm;
-
-typedef enum {
-    ssl_compression_null = 0,
-    ssl_compression_deflate = 1 /* RFC 3749 */
-} SSLCompressionMethod;
-
-typedef enum {
-    ssl_grp_ec_sect163k1 = 1,
-    ssl_grp_ec_sect163r1 = 2,
-    ssl_grp_ec_sect163r2 = 3,
-    ssl_grp_ec_sect193r1 = 4,
-    ssl_grp_ec_sect193r2 = 5,
-    ssl_grp_ec_sect233k1 = 6,
-    ssl_grp_ec_sect233r1 = 7,
-    ssl_grp_ec_sect239k1 = 8,
-    ssl_grp_ec_sect283k1 = 9,
-    ssl_grp_ec_sect283r1 = 10,
-    ssl_grp_ec_sect409k1 = 11,
-    ssl_grp_ec_sect409r1 = 12,
-    ssl_grp_ec_sect571k1 = 13,
-    ssl_grp_ec_sect571r1 = 14,
-    ssl_grp_ec_secp160k1 = 15,
-    ssl_grp_ec_secp160r1 = 16,
-    ssl_grp_ec_secp160r2 = 17,
-    ssl_grp_ec_secp192k1 = 18,
-    ssl_grp_ec_secp192r1 = 19,
-    ssl_grp_ec_secp224k1 = 20,
-    ssl_grp_ec_secp224r1 = 21,
-    ssl_grp_ec_secp256k1 = 22,
-    ssl_grp_ec_secp256r1 = 23,
-    ssl_grp_ec_secp384r1 = 24,
-    ssl_grp_ec_secp521r1 = 25,
-    ssl_grp_ec_curve25519 = 29, /* RFC4492 */
-    ssl_grp_ffdhe_2048 = 256,   /* RFC7919 */
-    ssl_grp_ffdhe_3072 = 257,
-    ssl_grp_ffdhe_4096 = 258,
-    ssl_grp_ffdhe_6144 = 259,
-    ssl_grp_ffdhe_8192 = 260,
-    ssl_grp_none = 65537,        /* special value */
-    ssl_grp_ffdhe_custom = 65538 /* special value */
-} SSLNamedGroup;
-
-typedef struct SSLExtraServerCertDataStr {
-    /* When this struct is passed to SSL_ConfigServerCert, and authType is set
-     * to a value other than ssl_auth_null, this limits the use of the key to
-     * the type defined; otherwise, the certificate is configured for all
-     * compatible types. */
-    SSLAuthType authType;
-    /* The remainder of the certificate chain. */
-    const CERTCertificateList* certChain;
-    /* A set of one or more stapled OCSP responses for the certificate.  This is
-     * used to generate the OCSP stapling answer provided by the server. */
-    const SECItemArray* stapledOCSPResponses;
-    /* A serialized sign_certificate_timestamp extension, used to answer
-     * requests from clients for this data. */
-    const SECItem* signedCertTimestamps;
-} SSLExtraServerCertData;
-
-typedef struct SSLChannelInfoStr {
-    /* On return, SSL_GetChannelInfo sets |length| to the smaller of
-     * the |len| argument and the length of the struct used by NSS.
-     * Callers must ensure the application uses a version of NSS that
-     * isn't older than the version used at compile time. */
-    PRUint32 length;
-    PRUint16 protocolVersion;
-    PRUint16 cipherSuite;
-
-    /* server authentication info */
-    PRUint32 authKeyBits;
-
-    /* key exchange algorithm info */
-    PRUint32 keaKeyBits;
-
-    /* session info */
-    PRUint32 creationTime;    /* seconds since Jan 1, 1970 */
-    PRUint32 lastAccessTime;  /* seconds since Jan 1, 1970 */
-    PRUint32 expirationTime;  /* seconds since Jan 1, 1970 */
-    PRUint32 sessionIDLength; /* up to 32 */
-    PRUint8 sessionID[32];
-
-    /* The following fields are added in NSS 3.12.5. */
-
-    /* compression method info */
-    const char* compressionMethodName;
-    SSLCompressionMethod compressionMethod;
-
-    /* The following fields are added in NSS 3.21.
-     * This field only has meaning in TLS < 1.3 and will be set to
-     *  PR_FALSE in TLS 1.3.
-     */
-    PRBool extendedMasterSecretUsed;
-
-    /* The following fields were added in NSS 3.25.
-     * This field only has meaning in TLS >= 1.3, and indicates on the
-     * client side that the server accepted early (0-RTT) data.
-     */
-    PRBool earlyDataAccepted;
-
-    /* The following fields were added in NSS 3.28. */
-    /* These fields have the same meaning as in SSLCipherSuiteInfo. */
-    SSLKEAType keaType;
-    SSLNamedGroup keaGroup;
-    SSLCipherAlgorithm symCipher;
-    SSLMACAlgorithm macAlgorithm;
-    SSLAuthType authType;
-    SSLSignatureScheme signatureScheme;
-
-    /* When adding new fields to this structure, please document the
-     * NSS version in which they were added. */
-} SSLChannelInfo;
-
-/* Preliminary channel info */
-#define ssl_preinfo_version (1U << 0)
-#define ssl_preinfo_cipher_suite (1U << 1)
-#define ssl_preinfo_all (ssl_preinfo_version | ssl_preinfo_cipher_suite)
-
-typedef struct SSLPreliminaryChannelInfoStr {
-    /* On return, SSL_GetPreliminaryChannelInfo sets |length| to the smaller of
-     * the |len| argument and the length of the struct used by NSS.
-     * Callers must ensure the application uses a version of NSS that
-     * isn't older than the version used at compile time. */
-    PRUint32 length;
-    /* A bitfield over SSLPreliminaryValueSet that describes which
-     * preliminary values are set (see ssl_preinfo_*). */
-    PRUint32 valuesSet;
-    /* Protocol version: test (valuesSet & ssl_preinfo_version) */
-    PRUint16 protocolVersion;
-    /* Cipher suite: test (valuesSet & ssl_preinfo_cipher_suite) */
-    PRUint16 cipherSuite;
-
-    /* When adding new fields to this structure, please document the
-     * NSS version in which they were added. */
-} SSLPreliminaryChannelInfo;
-
-typedef struct SSLCipherSuiteInfoStr {
-    /* On return, SSL_GetCipherSuitelInfo sets |length| to the smaller of
-     * the |len| argument and the length of the struct used by NSS.
-     * Callers must ensure the application uses a version of NSS that
-     * isn't older than the version used at compile time. */
-    PRUint16 length;
-    PRUint16 cipherSuite;
-
-    /* Cipher Suite Name */
-    const char* cipherSuiteName;
-
-    /* server authentication info */
-    const char* authAlgorithmName;
-    SSLAuthType authAlgorithm; /* deprecated, use |authType| */
-
-    /* key exchange algorithm info */
-    const char* keaTypeName;
-    SSLKEAType keaType;
-
-    /* symmetric encryption info */
-    const char* symCipherName;
-    SSLCipherAlgorithm symCipher;
-    PRUint16 symKeyBits;
-    PRUint16 symKeySpace;
-    PRUint16 effectiveKeyBits;
-
-    /* MAC info */
-    /* AEAD ciphers don't have a MAC. For an AEAD cipher, macAlgorithmName
-     * is "AEAD", macAlgorithm is ssl_mac_aead, and macBits is the length in
-     * bits of the authentication tag. */
-    const char* macAlgorithmName;
-    SSLMACAlgorithm macAlgorithm;
-    PRUint16 macBits;
-
-    PRUintn isFIPS : 1;
-    PRUintn isExportable : 1; /* deprecated, don't use */
-    PRUintn nonStandard : 1;
-    PRUintn reservedBits : 29;
-
-    /* The following fields were added in NSS 3.24. */
-    /* This reports the correct authentication type for the cipher suite, use
-     * this instead of |authAlgorithm|. */
-    SSLAuthType authType;
-
-    /* When adding new fields to this structure, please document the
-     * NSS version in which they were added. */
-} SSLCipherSuiteInfo;
-
-typedef enum {
-    ssl_variant_stream = 0,
-    ssl_variant_datagram = 1
-} SSLProtocolVariant;
-
-typedef struct SSLVersionRangeStr {
-    PRUint16 min;
-    PRUint16 max;
-} SSLVersionRange;
-
-typedef enum {
-    SSL_sni_host_name = 0,
-    SSL_sni_type_total
-} SSLSniNameType;
-
-/* Supported extensions. */
-/* Update SSL_MAX_EXTENSIONS whenever a new extension type is added. */
-typedef enum {
-    ssl_server_name_xtn = 0,
-    ssl_cert_status_xtn = 5,
-    ssl_supported_groups_xtn = 10,
-    ssl_ec_point_formats_xtn = 11,
-    ssl_signature_algorithms_xtn = 13,
-    ssl_use_srtp_xtn = 14,
-    ssl_app_layer_protocol_xtn = 16,
-    /* signed_certificate_timestamp extension, RFC 6962 */
-    ssl_signed_cert_timestamp_xtn = 18,
-    ssl_padding_xtn = 21,
-    ssl_extended_master_secret_xtn = 23,
-    ssl_session_ticket_xtn = 35,
-    ssl_tls13_key_share_xtn = 40,
-    ssl_tls13_pre_shared_key_xtn = 41,
-    ssl_tls13_early_data_xtn = 42,
-    ssl_tls13_supported_versions_xtn = 43,
-    ssl_tls13_cookie_xtn = 44,
-    ssl_tls13_psk_key_exchange_modes_xtn = 45,
-    ssl_tls13_ticket_early_data_info_xtn = 46,
-    ssl_next_proto_nego_xtn = 13172,
-    ssl_renegotiation_info_xtn = 0xff01,
-    ssl_tls13_short_header_xtn = 0xff03
-} SSLExtensionType;
-
-/* This is the old name for the supported_groups extensions. */
-#define ssl_elliptic_curves_xtn ssl_supported_groups_xtn
-
-/* SSL_MAX_EXTENSIONS doesn't include ssl_padding_xtn.  It includes the maximum
- * number of extensions that are supported for any single message type.  That
- * is, a ClientHello; ServerHello and TLS 1.3 NewSessionTicket and
- * HelloRetryRequest extensions are smaller. */
-#define SSL_MAX_EXTENSIONS 19
-
-/* Deprecated */
-typedef enum {
-    ssl_dhe_group_none = 0,
-    ssl_ff_dhe_2048_group = 1,
-    ssl_ff_dhe_3072_group = 2,
-    ssl_ff_dhe_4096_group = 3,
-    ssl_ff_dhe_6144_group = 4,
-    ssl_ff_dhe_8192_group = 5,
-    ssl_dhe_group_max
-} SSLDHEGroupType;
-
-#endif /* __sslt_h_ */
diff --git a/openflow/usr/include/nss/utilmodt.h b/openflow/usr/include/nss/utilmodt.h
deleted file mode 100644
index e1555f3..0000000
--- a/openflow/usr/include/nss/utilmodt.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _UTILMODT_H_
-#define _UTILMODT_H_ 1
-
-/*
- * these are SECMOD flags that would normally be in secmodt.h, but are needed
- * for the parser in util. Fort this reason we preserve the SECMOD names.
- */
-#define SECMOD_RSA_FLAG 0x00000001L
-#define SECMOD_DSA_FLAG 0x00000002L
-#define SECMOD_RC2_FLAG 0x00000004L
-#define SECMOD_RC4_FLAG 0x00000008L
-#define SECMOD_DES_FLAG 0x00000010L
-#define SECMOD_DH_FLAG 0x00000020L
-#define SECMOD_FORTEZZA_FLAG 0x00000040L
-#define SECMOD_RC5_FLAG 0x00000080L
-#define SECMOD_SHA1_FLAG 0x00000100L
-#define SECMOD_MD5_FLAG 0x00000200L
-#define SECMOD_MD2_FLAG 0x00000400L
-#define SECMOD_SSL_FLAG 0x00000800L
-#define SECMOD_TLS_FLAG 0x00001000L
-#define SECMOD_AES_FLAG 0x00002000L
-#define SECMOD_SHA256_FLAG 0x00004000L   /* also for SHA224 */
-#define SECMOD_SHA512_FLAG 0x00008000L   /* also for SHA384 */
-#define SECMOD_CAMELLIA_FLAG 0x00010000L /* = PUBLIC_MECH_CAMELLIA_FLAG */
-#define SECMOD_SEED_FLAG 0x00020000L
-#define SECMOD_ECC_FLAG 0x00040000L
-/* reserved bit for future, do not use */
-#define SECMOD_RESERVED_FLAG 0X08000000L
-#define SECMOD_FRIENDLY_FLAG 0x10000000L
-#define SECMOD_RANDOM_FLAG 0x80000000L
-
-#define PK11_OWN_PW_DEFAULTS 0x20000000L
-#define PK11_DISABLE_FLAG 0x40000000L
-
-/* need to make SECMOD and PK11 prefixes consistent. */
-#define SECMOD_OWN_PW_DEFAULTS PK11_OWN_PW_DEFAULTS
-#define SECMOD_DISABLE_FLAG PK11_DISABLE_FLAG
-
-#endif /* _UTILMODT_H_ */
diff --git a/openflow/usr/include/nss/utilpars.h b/openflow/usr/include/nss/utilpars.h
deleted file mode 100644
index 7076726..0000000
--- a/openflow/usr/include/nss/utilpars.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef _UTILPARS_H_
-#define _UTILPARS_H_ 1
-
-#include "utilparst.h"
-#include "plarena.h"
-
-/* handle a module db request */
-char **NSSUTIL_DoModuleDBFunction(unsigned long function, char *parameters, void *args);
-
-/* parsing functions */
-char *NSSUTIL_ArgFetchValue(const char *string, int *pcount);
-const char *NSSUTIL_ArgStrip(const char *c);
-char *NSSUTIL_ArgGetParamValue(const char *paramName, const char *parameters);
-const char *NSSUTIL_ArgSkipParameter(const char *string);
-char *NSSUTIL_ArgGetLabel(const char *inString, int *next);
-long NSSUTIL_ArgDecodeNumber(const char *num);
-PRBool NSSUTIL_ArgIsBlank(char c);
-PRBool NSSUTIL_ArgHasFlag(const char *label, const char *flag,
-                          const char *parameters);
-long NSSUTIL_ArgReadLong(const char *label, const char *params, long defValue,
-                         PRBool *isdefault);
-
-/* quoting functions */
-int NSSUTIL_EscapeSize(const char *string, char quote);
-char *NSSUTIL_Escape(const char *string, char quote);
-int NSSUTIL_QuoteSize(const char *string, char quote);
-char *NSSUTIL_Quote(const char *string, char quote);
-int NSSUTIL_DoubleEscapeSize(const char *string, char quote1, char quote2);
-char *NSSUTIL_DoubleEscape(const char *string, char quote1, char quote2);
-
-unsigned long NSSUTIL_ArgParseSlotFlags(const char *label, const char *params);
-struct NSSUTILPreSlotInfoStr *NSSUTIL_ArgParseSlotInfo(PLArenaPool *arena,
-                                                       const char *slotParams, int *retCount);
-char *NSSUTIL_MkSlotString(unsigned long slotID, unsigned long defaultFlags,
-                           unsigned long timeout, unsigned char askpw_in,
-                           PRBool hasRootCerts, PRBool hasRootTrust);
-SECStatus NSSUTIL_ArgParseModuleSpec(const char *modulespec, char **lib,
-                                     char **mod, char **parameters, char **nss);
-SECStatus NSSUTIL_ArgParseModuleSpecEx(const char *modulespec, char **lib,
-                                       char **mod, char **parameters, char **nss, char **config);
-char *NSSUTIL_MkModuleSpec(char *dllName, char *commonName,
-                           char *parameters, char *NSS);
-char *NSSUTIL_MkModuleSpecEx(char *dllName, char *commonName,
-                             char *parameters, char *NSS, char *config);
-void NSSUTIL_ArgParseCipherFlags(unsigned long *newCiphers,
-                                 const char *cipherList);
-char *NSSUTIL_MkNSSString(char **slotStrings, int slotCount, PRBool internal,
-                          PRBool isFIPS, PRBool isModuleDB, PRBool isModuleDBOnly,
-                          PRBool isCritical, unsigned long trustOrder,
-                          unsigned long cipherOrder, unsigned long ssl0, unsigned long ssl1);
-
-/*
- * private functions for softoken.
- */
-char *_NSSUTIL_GetSecmodName(const char *param, NSSDBType *dbType,
-                             char **appName, char **filename, PRBool *rw);
-const char *_NSSUTIL_EvaluateConfigDir(const char *configdir, NSSDBType *dbType, char **app);
-
-#endif /* _UTILPARS_H_ */
diff --git a/openflow/usr/include/nss/utilparst.h b/openflow/usr/include/nss/utilparst.h
deleted file mode 100644
index f2148e6..0000000
--- a/openflow/usr/include/nss/utilparst.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef UTILPARS_T_H
-#define UTILPARS_T_H 1
-#include "pkcs11t.h"
-
-/*
- * macros to handle parsing strings of blank sparated arguments.
- * Several NSSUTIL_HANDLE_STRING() macros should be places one after another with no intervening
- * code. The first ones have precedence over the later ones. The last Macro should be
- * NSSUTIL_HANDLE_FINAL_ARG.
- *
- *  param is the input parameters. On exit param will point to the next parameter to parse. If the
- *      last paramter has been returned, param points to a null byte (*param = '0');
- *  target is the location to store any data aquired from the parameter. Caller is responsible to free this data.
- *  value is the string value of the parameter.
- *  command is any commands you need to run to help process the parameter's data.
- */
-#define NSSUTIL_HANDLE_STRING_ARG(param, target, value, command)  \
-    if (PORT_Strncasecmp(param, value, sizeof(value) - 1) == 0) { \
-        param += sizeof(value) - 1;                               \
-        if (target)                                               \
-            PORT_Free(target);                                    \
-        target = NSSUTIL_ArgFetchValue(param, &next);             \
-        param += next;                                            \
-        command;                                                  \
-    } else
-
-#define NSSUTIL_HANDLE_FINAL_ARG(param)          \
-    {                                            \
-        param = NSSUTIL_ArgSkipParameter(param); \
-    }                                            \
-    param = NSSUTIL_ArgStrip(param);
-
-#define NSSUTIL_PATH_SEPARATOR "/"
-
-/* default module configuration strings */
-#define NSSUTIL_DEFAULT_INTERNAL_INIT1 \
-    "library= name=\"NSS Internal PKCS #11 Module\" parameters="
-#define NSSUTIL_DEFAULT_INTERNAL_INIT2 \
-    " NSS=\"Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={"
-#define NSSUTIL_DEFAULT_INTERNAL_INIT3 \
-    " askpw=any timeout=30})\""
-#define NSSUTIL_DEFAULT_SFTKN_FLAGS \
-    "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]"
-
-#define NSSUTIL_DEFAULT_CIPHER_ORDER 0
-#define NSSUTIL_DEFAULT_TRUST_ORDER 50
-#define NSSUTIL_ARG_ESCAPE '\\'
-
-/* hold slot default flags until we initialize a slot. This structure is only
- * useful between the time we define a module (either by hand or from the
- * database) and the time the module is loaded. Not reference counted  */
-struct NSSUTILPreSlotInfoStr {
-    CK_SLOT_ID slotID;          /* slot these flags are for */
-    unsigned long defaultFlags; /* bit mask of default implementation this slot
-                                 * provides */
-    int askpw;                  /* slot specific password bits */
-    long timeout;               /* slot specific timeout value */
-    char hasRootCerts;          /* is this the root cert PKCS #11 module? */
-    char hasRootTrust;          /* is this the root cert PKCS #11 module? */
-    int reserved0[2];
-    void *reserved1[2];
-};
-
-/*
- * private functions for softoken.
- */
-typedef enum {
-    NSS_DB_TYPE_NONE = 0,
-    NSS_DB_TYPE_SQL,
-    NSS_DB_TYPE_EXTERN,
-    NSS_DB_TYPE_LEGACY,
-    NSS_DB_TYPE_MULTIACCESS
-} NSSDBType;
-
-#endif /* UTILPARS_T_H */
diff --git a/openflow/usr/include/nss/utilrename.h b/openflow/usr/include/nss/utilrename.h
deleted file mode 100644
index 1aea3d2..0000000
--- a/openflow/usr/include/nss/utilrename.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * utilrename.h - rename symbols moved from libnss3 to libnssutil3
- *
- */
-
-#ifndef _LIBUTIL_H_
-#define _LIBUTIL_H_ _LIBUTIL_H__Util
-
-#ifdef USE_UTIL_DIRECTLY
-
-/* functions moved from libnss3 */
-#define ATOB_AsciiToData ATOB_AsciiToData_Util
-#define ATOB_ConvertAsciiToItem ATOB_ConvertAsciiToItem_Util
-#define BTOA_ConvertItemToAscii BTOA_ConvertItemToAscii_Util
-#define BTOA_DataToAscii BTOA_DataToAscii_Util
-#define CERT_GenTime2FormattedAscii CERT_GenTime2FormattedAscii_Util
-#define DER_AsciiToTime DER_AsciiToTime_Util
-#define DER_DecodeTimeChoice DER_DecodeTimeChoice_Util
-#define DER_Encode DER_Encode_Util
-#define DER_EncodeTimeChoice DER_EncodeTimeChoice_Util
-#define DER_GeneralizedDayToAscii DER_GeneralizedDayToAscii_Util
-#define DER_GeneralizedTimeToTime DER_GeneralizedTimeToTime_Util
-#define DER_GetInteger DER_GetInteger_Util
-#define DER_Lengths DER_Lengths_Util
-#define DER_TimeChoiceDayToAscii DER_TimeChoiceDayToAscii_Util
-#define DER_TimeToGeneralizedTime DER_TimeToGeneralizedTime_Util
-#define DER_TimeToGeneralizedTimeArena DER_TimeToGeneralizedTimeArena_Util
-#define DER_TimeToUTCTime DER_TimeToUTCTime_Util
-#define DER_UTCDayToAscii DER_UTCDayToAscii_Util
-#define DER_UTCTimeToAscii DER_UTCTimeToAscii_Util
-#define DER_UTCTimeToTime DER_UTCTimeToTime_Util
-#define NSS_PutEnv NSS_PutEnv_Util
-#define NSSBase64_DecodeBuffer NSSBase64_DecodeBuffer_Util
-#define NSSBase64_EncodeItem NSSBase64_EncodeItem_Util
-#define NSSBase64Decoder_Create NSSBase64Decoder_Create_Util
-#define NSSBase64Decoder_Destroy NSSBase64Decoder_Destroy_Util
-#define NSSBase64Decoder_Update NSSBase64Decoder_Update_Util
-#define NSSBase64Encoder_Create NSSBase64Encoder_Create_Util
-#define NSSBase64Encoder_Destroy NSSBase64Encoder_Destroy_Util
-#define NSSBase64Encoder_Update NSSBase64Encoder_Update_Util
-#define NSSRWLock_Destroy NSSRWLock_Destroy_Util
-#define NSSRWLock_HaveWriteLock NSSRWLock_HaveWriteLock_Util
-#define NSSRWLock_LockRead NSSRWLock_LockRead_Util
-#define NSSRWLock_LockWrite NSSRWLock_LockWrite_Util
-#define NSSRWLock_New NSSRWLock_New_Util
-#define NSSRWLock_UnlockRead NSSRWLock_UnlockRead_Util
-#define NSSRWLock_UnlockWrite NSSRWLock_UnlockWrite_Util
-#define PORT_Alloc PORT_Alloc_Util
-#define PORT_ArenaAlloc PORT_ArenaAlloc_Util
-#define PORT_ArenaGrow PORT_ArenaGrow_Util
-#define PORT_ArenaMark PORT_ArenaMark_Util
-#define PORT_ArenaRelease PORT_ArenaRelease_Util
-#define PORT_ArenaStrdup PORT_ArenaStrdup_Util
-#define PORT_ArenaUnmark PORT_ArenaUnmark_Util
-#define PORT_ArenaZAlloc PORT_ArenaZAlloc_Util
-#define PORT_Free PORT_Free_Util
-#define PORT_FreeArena PORT_FreeArena_Util
-#define PORT_GetError PORT_GetError_Util
-#define PORT_NewArena PORT_NewArena_Util
-#define PORT_Realloc PORT_Realloc_Util
-#define PORT_SetError PORT_SetError_Util
-#define PORT_SetUCS2_ASCIIConversionFunction PORT_SetUCS2_ASCIIConversionFunction_Util
-#define PORT_SetUCS2_UTF8ConversionFunction PORT_SetUCS2_UTF8ConversionFunction_Util
-#define PORT_SetUCS4_UTF8ConversionFunction PORT_SetUCS4_UTF8ConversionFunction_Util
-#define PORT_Strdup PORT_Strdup_Util
-#define PORT_UCS2_ASCIIConversion PORT_UCS2_ASCIIConversion_Util
-#define PORT_UCS2_UTF8Conversion PORT_UCS2_UTF8Conversion_Util
-#define PORT_ZAlloc PORT_ZAlloc_Util
-#define PORT_ZFree PORT_ZFree_Util
-#define SEC_ASN1Decode SEC_ASN1Decode_Util
-#define SEC_ASN1DecodeInteger SEC_ASN1DecodeInteger_Util
-#define SEC_ASN1DecodeItem SEC_ASN1DecodeItem_Util
-#define SEC_ASN1DecoderAbort SEC_ASN1DecoderAbort_Util
-#define SEC_ASN1DecoderClearFilterProc SEC_ASN1DecoderClearFilterProc_Util
-#define SEC_ASN1DecoderClearNotifyProc SEC_ASN1DecoderClearNotifyProc_Util
-#define SEC_ASN1DecoderFinish SEC_ASN1DecoderFinish_Util
-#define SEC_ASN1DecoderSetFilterProc SEC_ASN1DecoderSetFilterProc_Util
-#define SEC_ASN1DecoderSetNotifyProc SEC_ASN1DecoderSetNotifyProc_Util
-#define SEC_ASN1DecoderStart SEC_ASN1DecoderStart_Util
-#define SEC_ASN1DecoderUpdate SEC_ASN1DecoderUpdate_Util
-#define SEC_ASN1Encode SEC_ASN1Encode_Util
-#define SEC_ASN1EncodeInteger SEC_ASN1EncodeInteger_Util
-#define SEC_ASN1EncodeItem SEC_ASN1EncodeItem_Util
-#define SEC_ASN1EncoderAbort SEC_ASN1EncoderAbort_Util
-#define SEC_ASN1EncoderClearNotifyProc SEC_ASN1EncoderClearNotifyProc_Util
-#define SEC_ASN1EncoderClearStreaming SEC_ASN1EncoderClearStreaming_Util
-#define SEC_ASN1EncoderClearTakeFromBuf SEC_ASN1EncoderClearTakeFromBuf_Util
-#define SEC_ASN1EncoderFinish SEC_ASN1EncoderFinish_Util
-#define SEC_ASN1EncoderSetNotifyProc SEC_ASN1EncoderSetNotifyProc_Util
-#define SEC_ASN1EncoderSetStreaming SEC_ASN1EncoderSetStreaming_Util
-#define SEC_ASN1EncoderSetTakeFromBuf SEC_ASN1EncoderSetTakeFromBuf_Util
-#define SEC_ASN1EncoderStart SEC_ASN1EncoderStart_Util
-#define SEC_ASN1EncoderUpdate SEC_ASN1EncoderUpdate_Util
-#define SEC_ASN1EncodeUnsignedInteger SEC_ASN1EncodeUnsignedInteger_Util
-#define SEC_ASN1LengthLength SEC_ASN1LengthLength_Util
-#define SEC_QuickDERDecodeItem SEC_QuickDERDecodeItem_Util
-#define SECITEM_AllocItem SECITEM_AllocItem_Util
-#define SECITEM_ArenaDupItem SECITEM_ArenaDupItem_Util
-#define SECITEM_CompareItem SECITEM_CompareItem_Util
-#define SECITEM_CopyItem SECITEM_CopyItem_Util
-#define SECITEM_DupItem SECITEM_DupItem_Util
-#define SECITEM_FreeItem SECITEM_FreeItem_Util
-#define SECITEM_ItemsAreEqual SECITEM_ItemsAreEqual_Util
-#define SECITEM_ZfreeItem SECITEM_ZfreeItem_Util
-#define SECOID_AddEntry SECOID_AddEntry_Util
-#define SECOID_CompareAlgorithmID SECOID_CompareAlgorithmID_Util
-#define SECOID_CopyAlgorithmID SECOID_CopyAlgorithmID_Util
-#define SECOID_DestroyAlgorithmID SECOID_DestroyAlgorithmID_Util
-#define SECOID_FindOID SECOID_FindOID_Util
-#define SECOID_FindOIDByTag SECOID_FindOIDByTag_Util
-#define SECOID_FindOIDTag SECOID_FindOIDTag_Util
-#define SECOID_FindOIDTagDescription SECOID_FindOIDTagDescription_Util
-#define SECOID_GetAlgorithmTag SECOID_GetAlgorithmTag_Util
-#define SECOID_SetAlgorithmID SECOID_SetAlgorithmID_Util
-#define SGN_CompareDigestInfo SGN_CompareDigestInfo_Util
-#define SGN_CopyDigestInfo SGN_CopyDigestInfo_Util
-#define SGN_CreateDigestInfo SGN_CreateDigestInfo_Util
-#define SGN_DestroyDigestInfo SGN_DestroyDigestInfo_Util
-
-/* templates moved from libnss3 */
-#define NSS_Get_SEC_AnyTemplate NSS_Get_SEC_AnyTemplate_Util
-#define NSS_Get_SEC_BitStringTemplate NSS_Get_SEC_BitStringTemplate_Util
-#define NSS_Get_SEC_BMPStringTemplate NSS_Get_SEC_BMPStringTemplate_Util
-#define NSS_Get_SEC_BooleanTemplate NSS_Get_SEC_BooleanTemplate_Util
-#define NSS_Get_SEC_GeneralizedTimeTemplate NSS_Get_SEC_GeneralizedTimeTemplate_Util
-#define NSS_Get_SEC_IA5StringTemplate NSS_Get_SEC_IA5StringTemplate_Util
-#define NSS_Get_SEC_IntegerTemplate NSS_Get_SEC_IntegerTemplate_Util
-#define NSS_Get_SEC_NullTemplate NSS_Get_SEC_NullTemplate_Util
-#define NSS_Get_SEC_ObjectIDTemplate NSS_Get_SEC_ObjectIDTemplate_Util
-#define NSS_Get_SEC_OctetStringTemplate NSS_Get_SEC_OctetStringTemplate_Util
-#define NSS_Get_SEC_PointerToAnyTemplate NSS_Get_SEC_PointerToAnyTemplate_Util
-#define NSS_Get_SEC_PointerToOctetStringTemplate NSS_Get_SEC_PointerToOctetStringTemplate_Util
-#define NSS_Get_SEC_SetOfAnyTemplate NSS_Get_SEC_SetOfAnyTemplate_Util
-#define NSS_Get_SEC_UTCTimeTemplate NSS_Get_SEC_UTCTimeTemplate_Util
-#define NSS_Get_SEC_UTF8StringTemplate NSS_Get_SEC_UTF8StringTemplate_Util
-#define NSS_Get_SECOID_AlgorithmIDTemplate NSS_Get_SECOID_AlgorithmIDTemplate_Util
-#define NSS_Get_sgn_DigestInfoTemplate NSS_Get_sgn_DigestInfoTemplate_Util
-#define SEC_AnyTemplate SEC_AnyTemplate_Util
-#define SEC_BitStringTemplate SEC_BitStringTemplate_Util
-#define SEC_BMPStringTemplate SEC_BMPStringTemplate_Util
-#define SEC_BooleanTemplate SEC_BooleanTemplate_Util
-#define SEC_GeneralizedTimeTemplate SEC_GeneralizedTimeTemplate_Util
-#define SEC_IA5StringTemplate SEC_IA5StringTemplate_Util
-#define SEC_IntegerTemplate SEC_IntegerTemplate_Util
-#define SEC_NullTemplate SEC_NullTemplate_Util
-#define SEC_ObjectIDTemplate SEC_ObjectIDTemplate_Util
-#define SEC_OctetStringTemplate SEC_OctetStringTemplate_Util
-#define SEC_PointerToAnyTemplate SEC_PointerToAnyTemplate_Util
-#define SEC_PointerToOctetStringTemplate SEC_PointerToOctetStringTemplate_Util
-#define SEC_SetOfAnyTemplate SEC_SetOfAnyTemplate_Util
-#define SEC_UTCTimeTemplate SEC_UTCTimeTemplate_Util
-#define SEC_UTF8StringTemplate SEC_UTF8StringTemplate_Util
-#define SECOID_AlgorithmIDTemplate SECOID_AlgorithmIDTemplate_Util
-#define sgn_DigestInfoTemplate sgn_DigestInfoTemplate_Util
-
-#endif /* USE_UTIL_DIRECTLY */
-
-#endif /* _LIBUTIL_H_ */
diff --git a/openflow/usr/include/obstack.h b/openflow/usr/include/obstack.h
deleted file mode 100644
index 5716202..0000000
--- a/openflow/usr/include/obstack.h
+++ /dev/null
@@ -1,515 +0,0 @@
-/* obstack.h - object stack macros
-   Copyright (C) 1988-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Summary:
-
-   All the apparent functions defined here are macros. The idea
-   is that you would use these pre-tested macros to solve a
-   very specific set of problems, and they would run fast.
-   Caution: no side-effects in arguments please!! They may be
-   evaluated MANY times!!
-
-   These macros operate a stack of objects.  Each object starts life
-   small, and may grow to maturity.  (Consider building a word syllable
-   by syllable.)  An object can move while it is growing.  Once it has
-   been "finished" it never changes address again.  So the "top of the
-   stack" is typically an immature growing object, while the rest of the
-   stack is of mature, fixed size and fixed address objects.
-
-   These routines grab large chunks of memory, using a function you
-   supply, called 'obstack_chunk_alloc'.  On occasion, they free chunks,
-   by calling 'obstack_chunk_free'.  You must define them and declare
-   them before using any obstack macros.
-
-   Each independent stack is represented by a 'struct obstack'.
-   Each of the obstack macros expects a pointer to such a structure
-   as the first argument.
-
-   One motivation for this package is the problem of growing char strings
-   in symbol tables.  Unless you are "fascist pig with a read-only mind"
-   --Gosper's immortal quote from HAKMEM item 154, out of context--you
-   would not like to put any arbitrary upper limit on the length of your
-   symbols.
-
-   In practice this often means you will build many short symbols and a
-   few long symbols.  At the time you are reading a symbol you don't know
-   how long it is.  One traditional method is to read a symbol into a
-   buffer, realloc()ating the buffer every time you try to read a symbol
-   that is longer than the buffer.  This is beaut, but you still will
-   want to copy the symbol from the buffer to a more permanent
-   symbol-table entry say about half the time.
-
-   With obstacks, you can work differently.  Use one obstack for all symbol
-   names.  As you read a symbol, grow the name in the obstack gradually.
-   When the name is complete, finalize it.  Then, if the symbol exists already,
-   free the newly read name.
-
-   The way we do this is to take a large chunk, allocating memory from
-   low addresses.  When you want to build a symbol in the chunk you just
-   add chars above the current "high water mark" in the chunk.  When you
-   have finished adding chars, because you got to the end of the symbol,
-   you know how long the chars are, and you can create a new object.
-   Mostly the chars will not burst over the highest address of the chunk,
-   because you would typically expect a chunk to be (say) 100 times as
-   long as an average object.
-
-   In case that isn't clear, when we have enough chars to make up
-   the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
-   so we just point to it where it lies.  No moving of chars is
-   needed and this is the second win: potentially long strings need
-   never be explicitly shuffled. Once an object is formed, it does not
-   change its address during its lifetime.
-
-   When the chars burst over a chunk boundary, we allocate a larger
-   chunk, and then copy the partly formed object from the end of the old
-   chunk to the beginning of the new larger chunk.  We then carry on
-   accreting characters to the end of the object as we normally would.
-
-   A special macro is provided to add a single char at a time to a
-   growing object.  This allows the use of register variables, which
-   break the ordinary 'growth' macro.
-
-   Summary:
-	We allocate large chunks.
-	We carve out one object at a time from the current chunk.
-	Once carved, an object never moves.
-	We are free to append data of any size to the currently
-	  growing object.
-	Exactly one object is growing in an obstack at any one time.
-	You can run one obstack per control block.
-	You may have as many control blocks as you dare.
-	Because of the way we do it, you can "unwind" an obstack
-	  back to a previous state. (You may remove objects much
-	  as you would with a stack.)
- */
-
-
-/* Don't do the contents of this file more than once.  */
-
-#ifndef _OBSTACK_H
-#define _OBSTACK_H 1
-
-/* We need the type of a pointer subtraction.  If __PTRDIFF_TYPE__ is
-   defined, as with GNU C, use that; that way we don't pollute the
-   namespace with <stddef.h>'s symbols.  Otherwise, include <stddef.h>
-   and use ptrdiff_t.  */
-
-#ifdef __PTRDIFF_TYPE__
-# define PTR_INT_TYPE __PTRDIFF_TYPE__
-#else
-# include <stddef.h>
-# define PTR_INT_TYPE ptrdiff_t
-#endif
-
-/* If B is the base of an object addressed by P, return the result of
-   aligning P to the next multiple of A + 1.  B and P must be of type
-   char *.  A + 1 must be a power of 2.  */
-
-#define __BPTR_ALIGN(B, P, A) ((B) + (((P) - (B) + (A)) & ~(A)))
-
-/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case
-   where pointers can be converted to integers, aligned as integers,
-   and converted back again.  If PTR_INT_TYPE is narrower than a
-   pointer (e.g., the AS/400), play it safe and compute the alignment
-   relative to B.  Otherwise, use the faster strategy of computing the
-   alignment relative to 0.  */
-
-#define __PTR_ALIGN(B, P, A)						      \
-  __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \
-		P, A)
-
-#include <string.h>
-
-#ifndef __attribute_pure__
-# define __attribute_pure__ _GL_ATTRIBUTE_PURE
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _obstack_chunk           /* Lives at front of each chunk. */
-{
-  char *limit;                  /* 1 past end of this chunk */
-  struct _obstack_chunk *prev;  /* address of prior chunk or NULL */
-  char contents[4];             /* objects begin here */
-};
-
-struct obstack          /* control current object in current chunk */
-{
-  long chunk_size;              /* preferred size to allocate chunks in */
-  struct _obstack_chunk *chunk; /* address of current struct obstack_chunk */
-  char *object_base;            /* address of object we are building */
-  char *next_free;              /* where to add next char to current object */
-  char *chunk_limit;            /* address of char after current chunk */
-  union
-  {
-    PTR_INT_TYPE tempint;
-    void *tempptr;
-  } temp;                       /* Temporary for some macros.  */
-  int alignment_mask;           /* Mask of alignment for each object. */
-  /* These prototypes vary based on 'use_extra_arg', and we use
-     casts to the prototypeless function type in all assignments,
-     but having prototypes here quiets -Wstrict-prototypes.  */
-  struct _obstack_chunk *(*chunkfun) (void *, long);
-  void (*freefun) (void *, struct _obstack_chunk *);
-  void *extra_arg;              /* first arg for chunk alloc/dealloc funcs */
-  unsigned use_extra_arg : 1;     /* chunk alloc/dealloc funcs take extra arg */
-  unsigned maybe_empty_object : 1; /* There is a possibility that the current
-				      chunk contains a zero-length object.  This
-				      prevents freeing the chunk if we allocate
-				      a bigger chunk to replace it. */
-  unsigned alloc_failed : 1;      /* No longer used, as we now call the failed
-				     handler on error, but retained for binary
-				     compatibility.  */
-};
-
-/* Declare the external functions we use; they are in obstack.c.  */
-
-extern void _obstack_newchunk (struct obstack *, int);
-extern int _obstack_begin (struct obstack *, int, int,
-			   void *(*)(long), void (*)(void *));
-extern int _obstack_begin_1 (struct obstack *, int, int,
-			     void *(*)(void *, long),
-			     void (*)(void *, void *), void *);
-extern int _obstack_memory_used (struct obstack *) __attribute_pure__;
-
-/* The default name of the function for freeing a chunk is 'obstack_free',
-   but gnulib users can override this by defining '__obstack_free'.  */
-#ifndef __obstack_free
-# define __obstack_free obstack_free
-#endif
-extern void __obstack_free (struct obstack *, void *);
-
-
-/* Error handler called when 'obstack_chunk_alloc' failed to allocate
-   more memory.  This can be set to a user defined function which
-   should either abort gracefully or use longjump - but shouldn't
-   return.  The default action is to print a message and abort.  */
-extern void (*obstack_alloc_failed_handler) (void);
-
-/* Exit value used when 'print_and_abort' is used.  */
-extern int obstack_exit_failure;
-
-/* Pointer to beginning of object being allocated or to be allocated next.
-   Note that this might not be the final address of the object
-   because a new chunk might be needed to hold the final size.  */
-
-#define obstack_base(h) ((void *) (h)->object_base)
-
-/* Size for allocating ordinary chunks.  */
-
-#define obstack_chunk_size(h) ((h)->chunk_size)
-
-/* Pointer to next byte not yet allocated in current chunk.  */
-
-#define obstack_next_free(h)    ((h)->next_free)
-
-/* Mask specifying low bits that should be clear in address of an object.  */
-
-#define obstack_alignment_mask(h) ((h)->alignment_mask)
-
-/* To prevent prototype warnings provide complete argument list.  */
-#define obstack_init(h)							      \
-  _obstack_begin ((h), 0, 0,						      \
-		  (void *(*)(long))obstack_chunk_alloc,			      \
-		  (void (*)(void *))obstack_chunk_free)
-
-#define obstack_begin(h, size)						      \
-  _obstack_begin ((h), (size), 0,					      \
-		  (void *(*)(long))obstack_chunk_alloc,			      \
-		  (void (*)(void *))obstack_chunk_free)
-
-#define obstack_specify_allocation(h, size, alignment, chunkfun, freefun)  \
-  _obstack_begin ((h), (size), (alignment),				      \
-		  (void *(*)(long))(chunkfun),				      \
-		  (void (*)(void *))(freefun))
-
-#define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
-  _obstack_begin_1 ((h), (size), (alignment),				      \
-		    (void *(*)(void *, long))(chunkfun),		      \
-		    (void (*)(void *, void *))(freefun), (arg))
-
-#define obstack_chunkfun(h, newchunkfun) \
-  ((h)->chunkfun = (struct _obstack_chunk *(*)(void *, long))(newchunkfun))
-
-#define obstack_freefun(h, newfreefun) \
-  ((h)->freefun = (void (*)(void *, struct _obstack_chunk *))(newfreefun))
-
-#define obstack_1grow_fast(h, achar) (*((h)->next_free)++ = (achar))
-
-#define obstack_blank_fast(h, n) ((h)->next_free += (n))
-
-#define obstack_memory_used(h) _obstack_memory_used (h)
-
-#if defined __GNUC__
-# if ! (2 < __GNUC__ + (8 <= __GNUC_MINOR__))
-#  define __extension__
-# endif
-
-/* For GNU C, if not -traditional,
-   we can define these macros to compute all args only once
-   without using a global variable.
-   Also, we can avoid using the 'temp' slot, to make faster code.  */
-
-# define obstack_object_size(OBSTACK)					      \
-  __extension__								      \
-    ({ struct obstack const *__o = (OBSTACK);				      \
-       (unsigned) (__o->next_free - __o->object_base); })
-
-# define obstack_room(OBSTACK)						      \
-  __extension__								      \
-    ({ struct obstack const *__o = (OBSTACK);				      \
-       (unsigned) (__o->chunk_limit - __o->next_free); })
-
-# define obstack_make_room(OBSTACK, length)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->chunk_limit - __o->next_free < __len)			      \
-	 _obstack_newchunk (__o, __len);				      \
-       (void) 0; })
-
-# define obstack_empty_p(OBSTACK)					      \
-  __extension__								      \
-    ({ struct obstack const *__o = (OBSTACK);				      \
-       (__o->chunk->prev == 0						      \
-	&& __o->next_free == __PTR_ALIGN ((char *) __o->chunk,		      \
-					  __o->chunk->contents,		      \
-					  __o->alignment_mask)); })
-
-# define obstack_grow(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->next_free + __len > __o->chunk_limit)			      \
-	 _obstack_newchunk (__o, __len);				      \
-       memcpy (__o->next_free, where, __len);				      \
-       __o->next_free += __len;						      \
-       (void) 0; })
-
-# define obstack_grow0(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->next_free + __len + 1 > __o->chunk_limit)		      \
-	 _obstack_newchunk (__o, __len + 1);				      \
-       memcpy (__o->next_free, where, __len);				      \
-       __o->next_free += __len;						      \
-       *(__o->next_free)++ = 0;						      \
-       (void) 0; })
-
-# define obstack_1grow(OBSTACK, datum)					      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       if (__o->next_free + 1 > __o->chunk_limit)			      \
-	 _obstack_newchunk (__o, 1);					      \
-       obstack_1grow_fast (__o, datum);					      \
-       (void) 0; })
-
-/* These assume that the obstack alignment is good enough for pointers
-   or ints, and that the data added so far to the current object
-   shares that much alignment.  */
-
-# define obstack_ptr_grow(OBSTACK, datum)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       if (__o->next_free + sizeof (void *) > __o->chunk_limit)		      \
-	 _obstack_newchunk (__o, sizeof (void *));			      \
-       obstack_ptr_grow_fast (__o, datum); })				      \
-
-# define obstack_int_grow(OBSTACK, datum)				      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       if (__o->next_free + sizeof (int) > __o->chunk_limit)		      \
-	 _obstack_newchunk (__o, sizeof (int));				      \
-       obstack_int_grow_fast (__o, datum); })
-
-# define obstack_ptr_grow_fast(OBSTACK, aptr)				      \
-  __extension__								      \
-    ({ struct obstack *__o1 = (OBSTACK);				      \
-       void *__p1 = __o1->next_free;					      \
-       *(const void **) __p1 = (aptr);					      \
-       __o1->next_free += sizeof (const void *);			      \
-       (void) 0; })
-
-# define obstack_int_grow_fast(OBSTACK, aint)				      \
-  __extension__								      \
-    ({ struct obstack *__o1 = (OBSTACK);				      \
-       void *__p1 = __o1->next_free;					      \
-       *(int *) __p1 = (aint);						      \
-       __o1->next_free += sizeof (int);					      \
-       (void) 0; })
-
-# define obstack_blank(OBSTACK, length)					      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       int __len = (length);						      \
-       if (__o->chunk_limit - __o->next_free < __len)			      \
-	 _obstack_newchunk (__o, __len);				      \
-       obstack_blank_fast (__o, __len);					      \
-       (void) 0; })
-
-# define obstack_alloc(OBSTACK, length)					      \
-  __extension__								      \
-    ({ struct obstack *__h = (OBSTACK);					      \
-       obstack_blank (__h, (length));					      \
-       obstack_finish (__h); })
-
-# define obstack_copy(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__h = (OBSTACK);					      \
-       obstack_grow (__h, (where), (length));				      \
-       obstack_finish (__h); })
-
-# define obstack_copy0(OBSTACK, where, length)				      \
-  __extension__								      \
-    ({ struct obstack *__h = (OBSTACK);					      \
-       obstack_grow0 (__h, (where), (length));				      \
-       obstack_finish (__h); })
-
-/* The local variable is named __o1 to avoid a name conflict
-   when obstack_blank is called.  */
-# define obstack_finish(OBSTACK)					      \
-  __extension__								      \
-    ({ struct obstack *__o1 = (OBSTACK);				      \
-       void *__value = (void *) __o1->object_base;			      \
-       if (__o1->next_free == __value)					      \
-	 __o1->maybe_empty_object = 1;					      \
-       __o1->next_free							      \
-	 = __PTR_ALIGN (__o1->object_base, __o1->next_free,		      \
-			__o1->alignment_mask);				      \
-       if (__o1->next_free - (char *) __o1->chunk			      \
-	   > __o1->chunk_limit - (char *) __o1->chunk)			      \
-	 __o1->next_free = __o1->chunk_limit;				      \
-       __o1->object_base = __o1->next_free;				      \
-       __value; })
-
-# define obstack_free(OBSTACK, OBJ)					      \
-  __extension__								      \
-    ({ struct obstack *__o = (OBSTACK);					      \
-       void *__obj = (OBJ);						      \
-       if (__obj > (void *) __o->chunk && __obj < (void *) __o->chunk_limit)  \
-	 __o->next_free = __o->object_base = (char *) __obj;		      \
-       else (__obstack_free) (__o, __obj); })
-
-#else /* not __GNUC__ */
-
-# define obstack_object_size(h) \
-  (unsigned) ((h)->next_free - (h)->object_base)
-
-# define obstack_room(h)						      \
-  (unsigned) ((h)->chunk_limit - (h)->next_free)
-
-# define obstack_empty_p(h) \
-  ((h)->chunk->prev == 0						      \
-   && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk,		      \
-				     (h)->chunk->contents,		      \
-				     (h)->alignment_mask))
-
-/* Note that the call to _obstack_newchunk is enclosed in (..., 0)
-   so that we can avoid having void expressions
-   in the arms of the conditional expression.
-   Casting the third operand to void was tried before,
-   but some compilers won't accept it.  */
-
-# define obstack_make_room(h, length)					      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)		      \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0))
-
-# define obstack_grow(h, where, length)					      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)		      \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),		      \
-   memcpy ((h)->next_free, where, (h)->temp.tempint),			      \
-   (h)->next_free += (h)->temp.tempint)
-
-# define obstack_grow0(h, where, length)				      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->next_free + (h)->temp.tempint + 1 > (h)->chunk_limit)		      \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint + 1), 0) : 0),		      \
-   memcpy ((h)->next_free, where, (h)->temp.tempint),			      \
-   (h)->next_free += (h)->temp.tempint,					      \
-   *((h)->next_free)++ = 0)
-
-# define obstack_1grow(h, datum)					      \
-  ((((h)->next_free + 1 > (h)->chunk_limit)				      \
-    ? (_obstack_newchunk ((h), 1), 0) : 0),				      \
-   obstack_1grow_fast (h, datum))
-
-# define obstack_ptr_grow(h, datum)					      \
-  ((((h)->next_free + sizeof (char *) > (h)->chunk_limit)		      \
-    ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),		      \
-   obstack_ptr_grow_fast (h, datum))
-
-# define obstack_int_grow(h, datum)					      \
-  ((((h)->next_free + sizeof (int) > (h)->chunk_limit)			      \
-    ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),			      \
-   obstack_int_grow_fast (h, datum))
-
-# define obstack_ptr_grow_fast(h, aptr)					      \
-  (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr))
-
-# define obstack_int_grow_fast(h, aint)					      \
-  (((int *) ((h)->next_free += sizeof (int)))[-1] = (aint))
-
-# define obstack_blank(h, length)					      \
-  ((h)->temp.tempint = (length),					      \
-   (((h)->chunk_limit - (h)->next_free < (h)->temp.tempint)		      \
-   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),		      \
-   obstack_blank_fast (h, (h)->temp.tempint))
-
-# define obstack_alloc(h, length)					      \
-  (obstack_blank ((h), (length)), obstack_finish ((h)))
-
-# define obstack_copy(h, where, length)					      \
-  (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
-
-# define obstack_copy0(h, where, length)				      \
-  (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
-
-# define obstack_finish(h)						      \
-  (((h)->next_free == (h)->object_base					      \
-    ? (((h)->maybe_empty_object = 1), 0)				      \
-    : 0),								      \
-   (h)->temp.tempptr = (h)->object_base,				      \
-   (h)->next_free							      \
-     = __PTR_ALIGN ((h)->object_base, (h)->next_free,			      \
-		    (h)->alignment_mask),				      \
-   (((h)->next_free - (char *) (h)->chunk				      \
-     > (h)->chunk_limit - (char *) (h)->chunk)				      \
-   ? ((h)->next_free = (h)->chunk_limit) : 0),				      \
-   (h)->object_base = (h)->next_free,					      \
-   (h)->temp.tempptr)
-
-# define obstack_free(h, obj)						      \
-  ((h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk,		      \
-   ((((h)->temp.tempint > 0						      \
-      && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk))	      \
-    ? (void) ((h)->next_free = (h)->object_base				      \
-	      = (h)->temp.tempint + (char *) (h)->chunk)		      \
-    : (__obstack_free) (h, (h)->temp.tempint + (char *) (h)->chunk)))
-
-#endif /* not __GNUC__ */
-
-#ifdef __cplusplus
-}       /* C++ */
-#endif
-
-#endif /* obstack.h */
diff --git a/openflow/usr/include/openssl/aes.h b/openflow/usr/include/openssl/aes.h
deleted file mode 100644
index faa66c4..0000000
--- a/openflow/usr/include/openssl/aes.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* crypto/aes/aes.h */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_AES_H
-# define HEADER_AES_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_AES
-#  error AES is disabled.
-# endif
-
-# include <stddef.h>
-
-# define AES_ENCRYPT     1
-# define AES_DECRYPT     0
-
-/*
- * Because array size can't be a const in C, the following two are macros.
- * Both sizes are in bytes.
- */
-# define AES_MAXNR 14
-# define AES_BLOCK_SIZE 16
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* This should be a hidden type, but EVP requires that the size be known */
-struct aes_key_st {
-# ifdef AES_LONG
-    unsigned long rd_key[4 * (AES_MAXNR + 1)];
-# else
-    unsigned int rd_key[4 * (AES_MAXNR + 1)];
-# endif
-    int rounds;
-};
-typedef struct aes_key_st AES_KEY;
-
-const char *AES_options(void);
-
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key);
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key);
-
-int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                                AES_KEY *key);
-int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                                AES_KEY *key);
-
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key);
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key);
-
-void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                     const AES_KEY *key, const int enc);
-void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, const int enc);
-void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        unsigned char *ivec, int *num, const int enc);
-void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-                      size_t length, const AES_KEY *key,
-                      unsigned char *ivec, int *num, const int enc);
-void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-                      size_t length, const AES_KEY *key,
-                      unsigned char *ivec, int *num, const int enc);
-void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        unsigned char *ivec, int *num);
-void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        unsigned char ivec[AES_BLOCK_SIZE],
-                        unsigned char ecount_buf[AES_BLOCK_SIZE],
-                        unsigned int *num);
-/* NB: the IV is _two_ blocks long */
-void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, const int enc);
-/* NB: the IV is _four_ blocks long */
-void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        const AES_KEY *key2, const unsigned char *ivec,
-                        const int enc);
-
-int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
-                 unsigned char *out,
-                 const unsigned char *in, unsigned int inlen);
-int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
-                   unsigned char *out,
-                   const unsigned char *in, unsigned int inlen);
-
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif                          /* !HEADER_AES_H */
diff --git a/openflow/usr/include/openssl/asn1.h b/openflow/usr/include/openssl/asn1.h
deleted file mode 100644
index c4b37c2..0000000
--- a/openflow/usr/include/openssl/asn1.h
+++ /dev/null
@@ -1,1430 +0,0 @@
-/* crypto/asn1/asn1.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_ASN1_H
-# define HEADER_ASN1_H
-
-# include <time.h>
-# include <openssl/e_os2.h>
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/stack.h>
-# include <openssl/safestack.h>
-
-# include <openssl/symhacks.h>
-
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define V_ASN1_UNIVERSAL                0x00
-# define V_ASN1_APPLICATION              0x40
-# define V_ASN1_CONTEXT_SPECIFIC         0x80
-# define V_ASN1_PRIVATE                  0xc0
-
-# define V_ASN1_CONSTRUCTED              0x20
-# define V_ASN1_PRIMITIVE_TAG            0x1f
-# define V_ASN1_PRIMATIVE_TAG            0x1f
-
-# define V_ASN1_APP_CHOOSE               -2/* let the recipient choose */
-# define V_ASN1_OTHER                    -3/* used in ASN1_TYPE */
-# define V_ASN1_ANY                      -4/* used in ASN1 template code */
-
-# define V_ASN1_UNDEF                    -1
-/* ASN.1 tag values */
-# define V_ASN1_EOC                      0
-# define V_ASN1_BOOLEAN                  1 /**/
-# define V_ASN1_INTEGER                  2
-# define V_ASN1_BIT_STRING               3
-# define V_ASN1_OCTET_STRING             4
-# define V_ASN1_NULL                     5
-# define V_ASN1_OBJECT                   6
-# define V_ASN1_OBJECT_DESCRIPTOR        7
-# define V_ASN1_EXTERNAL                 8
-# define V_ASN1_REAL                     9
-# define V_ASN1_ENUMERATED               10
-# define V_ASN1_UTF8STRING               12
-# define V_ASN1_SEQUENCE                 16
-# define V_ASN1_SET                      17
-# define V_ASN1_NUMERICSTRING            18 /**/
-# define V_ASN1_PRINTABLESTRING          19
-# define V_ASN1_T61STRING                20
-# define V_ASN1_TELETEXSTRING            20/* alias */
-# define V_ASN1_VIDEOTEXSTRING           21 /**/
-# define V_ASN1_IA5STRING                22
-# define V_ASN1_UTCTIME                  23
-# define V_ASN1_GENERALIZEDTIME          24 /**/
-# define V_ASN1_GRAPHICSTRING            25 /**/
-# define V_ASN1_ISO64STRING              26 /**/
-# define V_ASN1_VISIBLESTRING            26/* alias */
-# define V_ASN1_GENERALSTRING            27 /**/
-# define V_ASN1_UNIVERSALSTRING          28 /**/
-# define V_ASN1_BMPSTRING                30
-
-/*
- * NB the constants below are used internally by ASN1_INTEGER
- * and ASN1_ENUMERATED to indicate the sign. They are *not* on
- * the wire tag values.
- */
-
-# define V_ASN1_NEG                      0x100
-# define V_ASN1_NEG_INTEGER              (2 | V_ASN1_NEG)
-# define V_ASN1_NEG_ENUMERATED           (10 | V_ASN1_NEG)
-
-/* For use with d2i_ASN1_type_bytes() */
-# define B_ASN1_NUMERICSTRING    0x0001
-# define B_ASN1_PRINTABLESTRING  0x0002
-# define B_ASN1_T61STRING        0x0004
-# define B_ASN1_TELETEXSTRING    0x0004
-# define B_ASN1_VIDEOTEXSTRING   0x0008
-# define B_ASN1_IA5STRING        0x0010
-# define B_ASN1_GRAPHICSTRING    0x0020
-# define B_ASN1_ISO64STRING      0x0040
-# define B_ASN1_VISIBLESTRING    0x0040
-# define B_ASN1_GENERALSTRING    0x0080
-# define B_ASN1_UNIVERSALSTRING  0x0100
-# define B_ASN1_OCTET_STRING     0x0200
-# define B_ASN1_BIT_STRING       0x0400
-# define B_ASN1_BMPSTRING        0x0800
-# define B_ASN1_UNKNOWN          0x1000
-# define B_ASN1_UTF8STRING       0x2000
-# define B_ASN1_UTCTIME          0x4000
-# define B_ASN1_GENERALIZEDTIME  0x8000
-# define B_ASN1_SEQUENCE         0x10000
-/* For use with ASN1_mbstring_copy() */
-# define MBSTRING_FLAG           0x1000
-# define MBSTRING_UTF8           (MBSTRING_FLAG)
-# define MBSTRING_ASC            (MBSTRING_FLAG|1)
-# define MBSTRING_BMP            (MBSTRING_FLAG|2)
-# define MBSTRING_UNIV           (MBSTRING_FLAG|4)
-# define SMIME_OLDMIME           0x400
-# define SMIME_CRLFEOL           0x800
-# define SMIME_STREAM            0x1000
-    struct X509_algor_st;
-DECLARE_STACK_OF(X509_ALGOR)
-
-# define DECLARE_ASN1_SET_OF(type)/* filled in by mkstack.pl */
-# define IMPLEMENT_ASN1_SET_OF(type)/* nothing, no longer needed */
-
-/*
- * We MUST make sure that, except for constness, asn1_ctx_st and
- * asn1_const_ctx are exactly the same.  Fortunately, as soon as the old ASN1
- * parsing macros are gone, we can throw this away as well...
- */
-typedef struct asn1_ctx_st {
-    unsigned char *p;           /* work char pointer */
-    int eos;                    /* end of sequence read for indefinite
-                                 * encoding */
-    int error;                  /* error code to use when returning an error */
-    int inf;                    /* constructed if 0x20, indefinite is 0x21 */
-    int tag;                    /* tag from last 'get object' */
-    int xclass;                 /* class from last 'get object' */
-    long slen;                  /* length of last 'get object' */
-    unsigned char *max;         /* largest value of p allowed */
-    unsigned char *q;           /* temporary variable */
-    unsigned char **pp;         /* variable */
-    int line;                   /* used in error processing */
-} ASN1_CTX;
-
-typedef struct asn1_const_ctx_st {
-    const unsigned char *p;     /* work char pointer */
-    int eos;                    /* end of sequence read for indefinite
-                                 * encoding */
-    int error;                  /* error code to use when returning an error */
-    int inf;                    /* constructed if 0x20, indefinite is 0x21 */
-    int tag;                    /* tag from last 'get object' */
-    int xclass;                 /* class from last 'get object' */
-    long slen;                  /* length of last 'get object' */
-    const unsigned char *max;   /* largest value of p allowed */
-    const unsigned char *q;     /* temporary variable */
-    const unsigned char **pp;   /* variable */
-    int line;                   /* used in error processing */
-} ASN1_const_CTX;
-
-/*
- * These are used internally in the ASN1_OBJECT to keep track of whether the
- * names and data need to be free()ed
- */
-# define ASN1_OBJECT_FLAG_DYNAMIC         0x01/* internal use */
-# define ASN1_OBJECT_FLAG_CRITICAL        0x02/* critical x509v3 object id */
-# define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04/* internal use */
-# define ASN1_OBJECT_FLAG_DYNAMIC_DATA    0x08/* internal use */
-struct asn1_object_st {
-    const char *sn, *ln;
-    int nid;
-    int length;
-    const unsigned char *data;  /* data remains const after init */
-    int flags;                  /* Should we free this one */
-};
-
-# define ASN1_STRING_FLAG_BITS_LEFT 0x08/* Set if 0x07 has bits left value */
-/*
- * This indicates that the ASN1_STRING is not a real value but just a place
- * holder for the location where indefinite length constructed data should be
- * inserted in the memory buffer
- */
-# define ASN1_STRING_FLAG_NDEF 0x010
-
-/*
- * This flag is used by the CMS code to indicate that a string is not
- * complete and is a place holder for content when it had all been accessed.
- * The flag will be reset when content has been written to it.
- */
-
-# define ASN1_STRING_FLAG_CONT 0x020
-/*
- * This flag is used by ASN1 code to indicate an ASN1_STRING is an MSTRING
- * type.
- */
-# define ASN1_STRING_FLAG_MSTRING 0x040
-/* This is the base type that holds just about everything :-) */
-struct asn1_string_st {
-    int length;
-    int type;
-    unsigned char *data;
-    /*
-     * The value of the following field depends on the type being held.  It
-     * is mostly being used for BIT_STRING so if the input data has a
-     * non-zero 'unused bits' value, it will be handled correctly
-     */
-    long flags;
-};
-
-/*
- * ASN1_ENCODING structure: this is used to save the received encoding of an
- * ASN1 type. This is useful to get round problems with invalid encodings
- * which can break signatures.
- */
-
-typedef struct ASN1_ENCODING_st {
-    unsigned char *enc;         /* DER encoding */
-    long len;                   /* Length of encoding */
-    int modified;               /* set to 1 if 'enc' is invalid */
-} ASN1_ENCODING;
-
-/* Used with ASN1 LONG type: if a long is set to this it is omitted */
-# define ASN1_LONG_UNDEF 0x7fffffffL
-
-# define STABLE_FLAGS_MALLOC     0x01
-# define STABLE_NO_MASK          0x02
-# define DIRSTRING_TYPE  \
- (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING)
-# define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING)
-
-typedef struct asn1_string_table_st {
-    int nid;
-    long minsize;
-    long maxsize;
-    unsigned long mask;
-    unsigned long flags;
-} ASN1_STRING_TABLE;
-
-DECLARE_STACK_OF(ASN1_STRING_TABLE)
-
-/* size limits: this stuff is taken straight from RFC2459 */
-
-# define ub_name                         32768
-# define ub_common_name                  64
-# define ub_locality_name                128
-# define ub_state_name                   128
-# define ub_organization_name            64
-# define ub_organization_unit_name       64
-# define ub_title                        64
-# define ub_email_address                128
-
-/*
- * Declarations for template structures: for full definitions see asn1t.h
- */
-typedef struct ASN1_TEMPLATE_st ASN1_TEMPLATE;
-typedef struct ASN1_TLC_st ASN1_TLC;
-/* This is just an opaque pointer */
-typedef struct ASN1_VALUE_st ASN1_VALUE;
-
-/* Declare ASN1 functions: the implement macro in in asn1t.h */
-
-# define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)
-
-# define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, type)
-
-# define DECLARE_ASN1_FUNCTIONS_name(type, name) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-        DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)
-
-# define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-        DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)
-
-# define DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \
-        type *d2i_##name(type **a, const unsigned char **in, long len); \
-        int i2d_##name(type *a, unsigned char **out); \
-        DECLARE_ASN1_ITEM(itname)
-
-# define DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
-        type *d2i_##name(type **a, const unsigned char **in, long len); \
-        int i2d_##name(const type *a, unsigned char **out); \
-        DECLARE_ASN1_ITEM(name)
-
-# define DECLARE_ASN1_NDEF_FUNCTION(name) \
-        int i2d_##name##_NDEF(name *a, unsigned char **out);
-
-# define DECLARE_ASN1_FUNCTIONS_const(name) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS(name) \
-        DECLARE_ASN1_ENCODE_FUNCTIONS_const(name, name)
-
-# define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-        type *name##_new(void); \
-        void name##_free(type *a);
-
-# define DECLARE_ASN1_PRINT_FUNCTION(stname) \
-        DECLARE_ASN1_PRINT_FUNCTION_fname(stname, stname)
-
-# define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \
-        int fname##_print_ctx(BIO *out, stname *x, int indent, \
-                                         const ASN1_PCTX *pctx);
-
-# define D2I_OF(type) type *(*)(type **,const unsigned char **,long)
-# define I2D_OF(type) int (*)(type *,unsigned char **)
-# define I2D_OF_const(type) int (*)(const type *,unsigned char **)
-
-# define CHECKED_D2I_OF(type, d2i) \
-    ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0)))
-# define CHECKED_I2D_OF(type, i2d) \
-    ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0)))
-# define CHECKED_NEW_OF(type, xnew) \
-    ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0)))
-# define CHECKED_PTR_OF(type, p) \
-    ((void*) (1 ? p : (type*)0))
-# define CHECKED_PPTR_OF(type, p) \
-    ((void**) (1 ? p : (type**)0))
-
-# define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)
-# define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)
-# define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)
-
-TYPEDEF_D2I2D_OF(void);
-
-/*-
- * The following macros and typedefs allow an ASN1_ITEM
- * to be embedded in a structure and referenced. Since
- * the ASN1_ITEM pointers need to be globally accessible
- * (possibly from shared libraries) they may exist in
- * different forms. On platforms that support it the
- * ASN1_ITEM structure itself will be globally exported.
- * Other platforms will export a function that returns
- * an ASN1_ITEM pointer.
- *
- * To handle both cases transparently the macros below
- * should be used instead of hard coding an ASN1_ITEM
- * pointer in a structure.
- *
- * The structure will look like this:
- *
- * typedef struct SOMETHING_st {
- *      ...
- *      ASN1_ITEM_EXP *iptr;
- *      ...
- * } SOMETHING;
- *
- * It would be initialised as e.g.:
- *
- * SOMETHING somevar = {...,ASN1_ITEM_ref(X509),...};
- *
- * and the actual pointer extracted with:
- *
- * const ASN1_ITEM *it = ASN1_ITEM_ptr(somevar.iptr);
- *
- * Finally an ASN1_ITEM pointer can be extracted from an
- * appropriate reference with: ASN1_ITEM_rptr(X509). This
- * would be used when a function takes an ASN1_ITEM * argument.
- *
- */
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/* ASN1_ITEM pointer exported type */
-typedef const ASN1_ITEM ASN1_ITEM_EXP;
-
-/* Macro to obtain ASN1_ITEM pointer from exported type */
-#  define ASN1_ITEM_ptr(iptr) (iptr)
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#  define ASN1_ITEM_ref(iptr) (&(iptr##_it))
-
-#  define ASN1_ITEM_rptr(ref) (&(ref##_it))
-
-#  define DECLARE_ASN1_ITEM(name) \
-        OPENSSL_EXTERN const ASN1_ITEM name##_it;
-
-# else
-
-/*
- * Platforms that can't easily handle shared global variables are declared as
- * functions returning ASN1_ITEM pointers.
- */
-
-/* ASN1_ITEM pointer exported type */
-typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
-
-/* Macro to obtain ASN1_ITEM pointer from exported type */
-#  define ASN1_ITEM_ptr(iptr) (iptr())
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#  define ASN1_ITEM_ref(iptr) (iptr##_it)
-
-#  define ASN1_ITEM_rptr(ref) (ref##_it())
-
-#  define DECLARE_ASN1_ITEM(name) \
-        const ASN1_ITEM * name##_it(void);
-
-# endif
-
-/* Parameters used by ASN1_STRING_print_ex() */
-
-/*
- * These determine which characters to escape: RFC2253 special characters,
- * control characters and MSB set characters
- */
-
-# define ASN1_STRFLGS_ESC_2253           1
-# define ASN1_STRFLGS_ESC_CTRL           2
-# define ASN1_STRFLGS_ESC_MSB            4
-
-/*
- * This flag determines how we do escaping: normally RC2253 backslash only,
- * set this to use backslash and quote.
- */
-
-# define ASN1_STRFLGS_ESC_QUOTE          8
-
-/* These three flags are internal use only. */
-
-/* Character is a valid PrintableString character */
-# define CHARTYPE_PRINTABLESTRING        0x10
-/* Character needs escaping if it is the first character */
-# define CHARTYPE_FIRST_ESC_2253         0x20
-/* Character needs escaping if it is the last character */
-# define CHARTYPE_LAST_ESC_2253          0x40
-
-/*
- * NB the internal flags are safely reused below by flags handled at the top
- * level.
- */
-
-/*
- * If this is set we convert all character strings to UTF8 first
- */
-
-# define ASN1_STRFLGS_UTF8_CONVERT       0x10
-
-/*
- * If this is set we don't attempt to interpret content: just assume all
- * strings are 1 byte per character. This will produce some pretty odd
- * looking output!
- */
-
-# define ASN1_STRFLGS_IGNORE_TYPE        0x20
-
-/* If this is set we include the string type in the output */
-# define ASN1_STRFLGS_SHOW_TYPE          0x40
-
-/*
- * This determines which strings to display and which to 'dump' (hex dump of
- * content octets or DER encoding). We can only dump non character strings or
- * everything. If we don't dump 'unknown' they are interpreted as character
- * strings with 1 octet per character and are subject to the usual escaping
- * options.
- */
-
-# define ASN1_STRFLGS_DUMP_ALL           0x80
-# define ASN1_STRFLGS_DUMP_UNKNOWN       0x100
-
-/*
- * These determine what 'dumping' does, we can dump the content octets or the
- * DER encoding: both use the RFC2253 #XXXXX notation.
- */
-
-# define ASN1_STRFLGS_DUMP_DER           0x200
-
-/*
- * All the string flags consistent with RFC2253, escaping control characters
- * isn't essential in RFC2253 but it is advisable anyway.
- */
-
-# define ASN1_STRFLGS_RFC2253    (ASN1_STRFLGS_ESC_2253 | \
-                                ASN1_STRFLGS_ESC_CTRL | \
-                                ASN1_STRFLGS_ESC_MSB | \
-                                ASN1_STRFLGS_UTF8_CONVERT | \
-                                ASN1_STRFLGS_DUMP_UNKNOWN | \
-                                ASN1_STRFLGS_DUMP_DER)
-
-DECLARE_STACK_OF(ASN1_INTEGER)
-DECLARE_ASN1_SET_OF(ASN1_INTEGER)
-
-DECLARE_STACK_OF(ASN1_GENERALSTRING)
-
-typedef struct asn1_type_st {
-    int type;
-    union {
-        char *ptr;
-        ASN1_BOOLEAN boolean;
-        ASN1_STRING *asn1_string;
-        ASN1_OBJECT *object;
-        ASN1_INTEGER *integer;
-        ASN1_ENUMERATED *enumerated;
-        ASN1_BIT_STRING *bit_string;
-        ASN1_OCTET_STRING *octet_string;
-        ASN1_PRINTABLESTRING *printablestring;
-        ASN1_T61STRING *t61string;
-        ASN1_IA5STRING *ia5string;
-        ASN1_GENERALSTRING *generalstring;
-        ASN1_BMPSTRING *bmpstring;
-        ASN1_UNIVERSALSTRING *universalstring;
-        ASN1_UTCTIME *utctime;
-        ASN1_GENERALIZEDTIME *generalizedtime;
-        ASN1_VISIBLESTRING *visiblestring;
-        ASN1_UTF8STRING *utf8string;
-        /*
-         * set and sequence are left complete and still contain the set or
-         * sequence bytes
-         */
-        ASN1_STRING *set;
-        ASN1_STRING *sequence;
-        ASN1_VALUE *asn1_value;
-    } value;
-} ASN1_TYPE;
-
-DECLARE_STACK_OF(ASN1_TYPE)
-DECLARE_ASN1_SET_OF(ASN1_TYPE)
-
-typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
-
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY)
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY)
-
-typedef struct NETSCAPE_X509_st {
-    ASN1_OCTET_STRING *header;
-    X509 *cert;
-} NETSCAPE_X509;
-
-/* This is used to contain a list of bit names */
-typedef struct BIT_STRING_BITNAME_st {
-    int bitnum;
-    const char *lname;
-    const char *sname;
-} BIT_STRING_BITNAME;
-
-# define M_ASN1_STRING_length(x) ((x)->length)
-# define M_ASN1_STRING_length_set(x, n)  ((x)->length = (n))
-# define M_ASN1_STRING_type(x)   ((x)->type)
-# define M_ASN1_STRING_data(x)   ((x)->data)
-
-/* Macros for string operations */
-# define M_ASN1_BIT_STRING_new() (ASN1_BIT_STRING *)\
-                ASN1_STRING_type_new(V_ASN1_BIT_STRING)
-# define M_ASN1_BIT_STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_BIT_STRING_dup(a) (ASN1_BIT_STRING *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_BIT_STRING_cmp(a,b) ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-# define M_ASN1_BIT_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)
-
-# define M_ASN1_INTEGER_new()    (ASN1_INTEGER *)\
-                ASN1_STRING_type_new(V_ASN1_INTEGER)
-# define M_ASN1_INTEGER_free(a)          ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_INTEGER_dup(a) (ASN1_INTEGER *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_INTEGER_cmp(a,b) ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-
-# define M_ASN1_ENUMERATED_new() (ASN1_ENUMERATED *)\
-                ASN1_STRING_type_new(V_ASN1_ENUMERATED)
-# define M_ASN1_ENUMERATED_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_ENUMERATED_cmp(a,b)      ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-
-# define M_ASN1_OCTET_STRING_new()       (ASN1_OCTET_STRING *)\
-                ASN1_STRING_type_new(V_ASN1_OCTET_STRING)
-# define M_ASN1_OCTET_STRING_free(a)     ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_OCTET_STRING_dup(a) (ASN1_OCTET_STRING *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_OCTET_STRING_cmp(a,b) ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-# define M_ASN1_OCTET_STRING_set(a,b,c)  ASN1_STRING_set((ASN1_STRING *)a,b,c)
-# define M_ASN1_OCTET_STRING_print(a,b)  ASN1_STRING_print(a,(ASN1_STRING *)b)
-# define M_i2d_ASN1_OCTET_STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_OCTET_STRING,\
-                V_ASN1_UNIVERSAL)
-
-# define B_ASN1_TIME \
-                        B_ASN1_UTCTIME | \
-                        B_ASN1_GENERALIZEDTIME
-
-# define B_ASN1_PRINTABLE \
-                        B_ASN1_NUMERICSTRING| \
-                        B_ASN1_PRINTABLESTRING| \
-                        B_ASN1_T61STRING| \
-                        B_ASN1_IA5STRING| \
-                        B_ASN1_BIT_STRING| \
-                        B_ASN1_UNIVERSALSTRING|\
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UTF8STRING|\
-                        B_ASN1_SEQUENCE|\
-                        B_ASN1_UNKNOWN
-
-# define B_ASN1_DIRECTORYSTRING \
-                        B_ASN1_PRINTABLESTRING| \
-                        B_ASN1_TELETEXSTRING|\
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UNIVERSALSTRING|\
-                        B_ASN1_UTF8STRING
-
-# define B_ASN1_DISPLAYTEXT \
-                        B_ASN1_IA5STRING| \
-                        B_ASN1_VISIBLESTRING| \
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UTF8STRING
-
-# define M_ASN1_PRINTABLE_new()  ASN1_STRING_type_new(V_ASN1_T61STRING)
-# define M_ASN1_PRINTABLE_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_PRINTABLE(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                pp,a->type,V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_PRINTABLE(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_PRINTABLE)
-
-# define M_DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-# define M_DIRECTORYSTRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                                                pp,a->type,V_ASN1_UNIVERSAL)
-# define M_d2i_DIRECTORYSTRING(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_DIRECTORYSTRING)
-
-# define M_DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-# define M_DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                                                pp,a->type,V_ASN1_UNIVERSAL)
-# define M_d2i_DISPLAYTEXT(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_DISPLAYTEXT)
-
-# define M_ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\
-                ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-# define M_ASN1_PRINTABLESTRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_PRINTABLESTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_PRINTABLESTRING,\
-                V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_PRINTABLESTRING(a,pp,l) \
-                (ASN1_PRINTABLESTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_PRINTABLESTRING)
-
-# define M_ASN1_T61STRING_new()  (ASN1_T61STRING *)\
-                ASN1_STRING_type_new(V_ASN1_T61STRING)
-# define M_ASN1_T61STRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_T61STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_T61STRING,\
-                V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_T61STRING(a,pp,l) \
-                (ASN1_T61STRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_T61STRING)
-
-# define M_ASN1_IA5STRING_new()  (ASN1_IA5STRING *)\
-                ASN1_STRING_type_new(V_ASN1_IA5STRING)
-# define M_ASN1_IA5STRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_IA5STRING_dup(a) \
-                (ASN1_IA5STRING *)ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_i2d_ASN1_IA5STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_IA5STRING(a,pp,l) \
-                (ASN1_IA5STRING *)d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l,\
-                        B_ASN1_IA5STRING)
-
-# define M_ASN1_UTCTIME_new()    (ASN1_UTCTIME *)\
-                ASN1_STRING_type_new(V_ASN1_UTCTIME)
-# define M_ASN1_UTCTIME_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_UTCTIME_dup(a) (ASN1_UTCTIME *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-
-# define M_ASN1_GENERALIZEDTIME_new()    (ASN1_GENERALIZEDTIME *)\
-                ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)
-# define M_ASN1_GENERALIZEDTIME_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\
-        (const ASN1_STRING *)a)
-
-# define M_ASN1_TIME_new()       (ASN1_TIME *)\
-                ASN1_STRING_type_new(V_ASN1_UTCTIME)
-# define M_ASN1_TIME_free(a)     ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_TIME_dup(a) (ASN1_TIME *)\
-        ASN1_STRING_dup((const ASN1_STRING *)a)
-
-# define M_ASN1_GENERALSTRING_new()      (ASN1_GENERALSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_GENERALSTRING)
-# define M_ASN1_GENERALSTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_GENERALSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_GENERALSTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_GENERALSTRING(a,pp,l) \
-                (ASN1_GENERALSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_GENERALSTRING)
-
-# define M_ASN1_UNIVERSALSTRING_new()    (ASN1_UNIVERSALSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_UNIVERSALSTRING)
-# define M_ASN1_UNIVERSALSTRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_UNIVERSALSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UNIVERSALSTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_UNIVERSALSTRING(a,pp,l) \
-                (ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING)
-
-# define M_ASN1_BMPSTRING_new()  (ASN1_BMPSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_BMPSTRING)
-# define M_ASN1_BMPSTRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_BMPSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_BMPSTRING(a,pp,l) \
-                (ASN1_BMPSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)
-
-# define M_ASN1_VISIBLESTRING_new()      (ASN1_VISIBLESTRING *)\
-                ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-# define M_ASN1_VISIBLESTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_VISIBLESTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \
-                (ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)
-
-# define M_ASN1_UTF8STRING_new() (ASN1_UTF8STRING *)\
-                ASN1_STRING_type_new(V_ASN1_UTF8STRING)
-# define M_ASN1_UTF8STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_UTF8STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_UTF8STRING(a,pp,l) \
-                (ASN1_UTF8STRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)
-
-  /* for the is_set parameter to i2d_ASN1_SET */
-# define IS_SEQUENCE     0
-# define IS_SET          1
-
-DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE)
-
-int ASN1_TYPE_get(ASN1_TYPE *a);
-void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
-int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);
-int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
-
-ASN1_OBJECT *ASN1_OBJECT_new(void);
-void ASN1_OBJECT_free(ASN1_OBJECT *a);
-int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp);
-ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-                             long length);
-ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-                             long length);
-
-DECLARE_ASN1_ITEM(ASN1_OBJECT)
-
-DECLARE_STACK_OF(ASN1_OBJECT)
-DECLARE_ASN1_SET_OF(ASN1_OBJECT)
-
-ASN1_STRING *ASN1_STRING_new(void);
-void ASN1_STRING_free(ASN1_STRING *a);
-void ASN1_STRING_clear_free(ASN1_STRING *a);
-int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
-ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *a);
-ASN1_STRING *ASN1_STRING_type_new(int type);
-int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);
-  /*
-   * Since this is used to store all sorts of things, via macros, for now,
-   * make its data void *
-   */
-int ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);
-void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);
-int ASN1_STRING_length(const ASN1_STRING *x);
-void ASN1_STRING_length_set(ASN1_STRING *x, int n);
-int ASN1_STRING_type(ASN1_STRING *x);
-unsigned char *ASN1_STRING_data(ASN1_STRING *x);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)
-int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp);
-ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
-                                     const unsigned char **pp, long length);
-int ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d, int length);
-int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);
-int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);
-int ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,
-                          unsigned char *flags, int flags_len);
-
-# ifndef OPENSSL_NO_BIO
-int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
-                               BIT_STRING_BITNAME *tbl, int indent);
-# endif
-int ASN1_BIT_STRING_num_asc(char *name, BIT_STRING_BITNAME *tbl);
-int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value,
-                            BIT_STRING_BITNAME *tbl);
-
-int i2d_ASN1_BOOLEAN(int a, unsigned char **pp);
-int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)
-int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);
-ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
-                               long length);
-ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
-                                long length);
-ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x);
-int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_ENUMERATED)
-
-int ASN1_UTCTIME_check(const ASN1_UTCTIME *a);
-ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t);
-ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
-                               int offset_day, long offset_sec);
-int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);
-int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
-# if 0
-time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);
-# endif
-
-int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *a);
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
-                                               time_t t);
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
-                                               time_t t, int offset_day,
-                                               long offset_sec);
-int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str);
-int ASN1_TIME_diff(int *pday, int *psec,
-                   const ASN1_TIME *from, const ASN1_TIME *to);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_OCTET_STRING)
-ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *a);
-int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a,
-                          const ASN1_OCTET_STRING *b);
-int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, const unsigned char *data,
-                          int len);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UTF8STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_NULL)
-DECLARE_ASN1_FUNCTIONS(ASN1_BMPSTRING)
-
-int UTF8_getc(const unsigned char *str, int len, unsigned long *val);
-int UTF8_putc(unsigned char *str, int len, unsigned long value);
-
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, ASN1_PRINTABLE)
-
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DIRECTORYSTRING)
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DISPLAYTEXT)
-DECLARE_ASN1_FUNCTIONS(ASN1_PRINTABLESTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_T61STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_IA5STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_GENERALSTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UTCTIME)
-DECLARE_ASN1_FUNCTIONS(ASN1_GENERALIZEDTIME)
-DECLARE_ASN1_FUNCTIONS(ASN1_TIME)
-
-DECLARE_ASN1_ITEM(ASN1_OCTET_STRING_NDEF)
-
-ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t);
-ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,
-                         int offset_day, long offset_sec);
-int ASN1_TIME_check(ASN1_TIME *t);
-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME
-                                                   **out);
-int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
-
-int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
-                 i2d_of_void *i2d, int ex_tag, int ex_class, int is_set);
-STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
-                                      const unsigned char **pp,
-                                      long length, d2i_of_void *d2i,
-                                      void (*free_func) (OPENSSL_BLOCK),
-                                      int ex_tag, int ex_class);
-
-# ifndef OPENSSL_NO_BIO
-int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);
-int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size);
-int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);
-int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size);
-int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a);
-int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size);
-int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type);
-# endif
-int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a);
-
-int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num);
-ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
-                                const char *sn, const char *ln);
-
-int ASN1_INTEGER_set(ASN1_INTEGER *a, long v);
-long ASN1_INTEGER_get(const ASN1_INTEGER *a);
-ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai);
-BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai, BIGNUM *bn);
-
-int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v);
-long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a);
-ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai);
-BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn);
-
-/* General */
-/* given a string, return the correct type, max is the maximum length */
-int ASN1_PRINTABLE_type(const unsigned char *s, int max);
-
-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass);
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
-                            long length, int Ptag, int Pclass);
-unsigned long ASN1_tag2bit(int tag);
-/* type is one or more of the B_ASN1_ values. */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,
-                                 long length, int type);
-
-/* PARSING */
-int asn1_Finish(ASN1_CTX *c);
-int asn1_const_Finish(ASN1_const_CTX *c);
-
-/* SPECIALS */
-int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
-                    int *pclass, long omax);
-int ASN1_check_infinite_end(unsigned char **p, long len);
-int ASN1_const_check_infinite_end(const unsigned char **p, long len);
-void ASN1_put_object(unsigned char **pp, int constructed, int length,
-                     int tag, int xclass);
-int ASN1_put_eoc(unsigned char **pp);
-int ASN1_object_size(int constructed, int length, int tag);
-
-/* Used to implement other functions */
-void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x);
-
-# define ASN1_dup_of(type,i2d,d2i,x) \
-    ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \
-                     CHECKED_D2I_OF(type, d2i), \
-                     CHECKED_PTR_OF(type, x)))
-
-# define ASN1_dup_of_const(type,i2d,d2i,x) \
-    ((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \
-                     CHECKED_D2I_OF(type, d2i), \
-                     CHECKED_PTR_OF(const type, x)))
-
-void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
-
-/* ASN1 alloc/free macros for when a type is only used internally */
-
-# define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type))
-# define M_ASN1_free_of(x, type) \
-                ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))
-
-# ifndef OPENSSL_NO_FP_API
-void *ASN1_d2i_fp(void *(*xnew) (void), d2i_of_void *d2i, FILE *in, void **x);
-
-#  define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
-    ((type*)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \
-                        CHECKED_D2I_OF(type, d2i), \
-                        in, \
-                        CHECKED_PPTR_OF(type, x)))
-
-void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
-int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x);
-
-#  define ASN1_i2d_fp_of(type,i2d,out,x) \
-    (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \
-                 out, \
-                 CHECKED_PTR_OF(type, x)))
-
-#  define ASN1_i2d_fp_of_const(type,i2d,out,x) \
-    (ASN1_i2d_fp(CHECKED_I2D_OF(const type, i2d), \
-                 out, \
-                 CHECKED_PTR_OF(const type, x)))
-
-int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
-int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
-# endif
-
-int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in);
-
-# ifndef OPENSSL_NO_BIO
-void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x);
-
-#  define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
-    ((type*)ASN1_d2i_bio( CHECKED_NEW_OF(type, xnew), \
-                          CHECKED_D2I_OF(type, d2i), \
-                          in, \
-                          CHECKED_PPTR_OF(type, x)))
-
-void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
-int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x);
-
-#  define ASN1_i2d_bio_of(type,i2d,out,x) \
-    (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \
-                  out, \
-                  CHECKED_PTR_OF(type, x)))
-
-#  define ASN1_i2d_bio_of_const(type,i2d,out,x) \
-    (ASN1_i2d_bio(CHECKED_I2D_OF(const type, i2d), \
-                  out, \
-                  CHECKED_PTR_OF(const type, x)))
-
-int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
-int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a);
-int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a);
-int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a);
-int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v);
-int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags);
-int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
-                  unsigned char *buf, int off);
-int ASN1_parse(BIO *bp, const unsigned char *pp, long len, int indent);
-int ASN1_parse_dump(BIO *bp, const unsigned char *pp, long len, int indent,
-                    int dump);
-# endif
-const char *ASN1_tag2str(int tag);
-
-/* Used to load and write netscape format cert */
-
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_X509)
-
-int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);
-
-int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len);
-int ASN1_TYPE_get_octetstring(ASN1_TYPE *a, unsigned char *data, int max_len);
-int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,
-                                  unsigned char *data, int len);
-int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num,
-                                  unsigned char *data, int max_len);
-
-STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
-                                         d2i_of_void *d2i,
-                                         void (*free_func) (OPENSSL_BLOCK));
-unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
-                             unsigned char **buf, int *len);
-void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);
-void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
-ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
-                              ASN1_OCTET_STRING **oct);
-
-# define ASN1_pack_string_of(type,obj,i2d,oct) \
-    (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \
-                      CHECKED_I2D_OF(type, i2d), \
-                      oct))
-
-ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it,
-                            ASN1_OCTET_STRING **oct);
-
-void ASN1_STRING_set_default_mask(unsigned long mask);
-int ASN1_STRING_set_default_mask_asc(const char *p);
-unsigned long ASN1_STRING_get_default_mask(void);
-int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,
-                       int inform, unsigned long mask);
-int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
-                        int inform, unsigned long mask,
-                        long minsize, long maxsize);
-
-ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
-                                    const unsigned char *in, int inlen,
-                                    int inform, int nid);
-ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid);
-int ASN1_STRING_TABLE_add(int, long, long, unsigned long, unsigned long);
-void ASN1_STRING_TABLE_cleanup(void);
-
-/* ASN1 template functions */
-
-/* Old API compatible functions */
-ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it);
-void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it);
-ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in,
-                          long len, const ASN1_ITEM *it);
-int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
-int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out,
-                       const ASN1_ITEM *it);
-
-void ASN1_add_oid_module(void);
-
-ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf);
-ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf);
-
-/* ASN1 Print flags */
-
-/* Indicate missing OPTIONAL fields */
-# define ASN1_PCTX_FLAGS_SHOW_ABSENT             0x001
-/* Mark start and end of SEQUENCE */
-# define ASN1_PCTX_FLAGS_SHOW_SEQUENCE           0x002
-/* Mark start and end of SEQUENCE/SET OF */
-# define ASN1_PCTX_FLAGS_SHOW_SSOF               0x004
-/* Show the ASN1 type of primitives */
-# define ASN1_PCTX_FLAGS_SHOW_TYPE               0x008
-/* Don't show ASN1 type of ANY */
-# define ASN1_PCTX_FLAGS_NO_ANY_TYPE             0x010
-/* Don't show ASN1 type of MSTRINGs */
-# define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE         0x020
-/* Don't show field names in SEQUENCE */
-# define ASN1_PCTX_FLAGS_NO_FIELD_NAME           0x040
-/* Show structure names of each SEQUENCE field */
-# define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME  0x080
-/* Don't show structure name even at top level */
-# define ASN1_PCTX_FLAGS_NO_STRUCT_NAME          0x100
-
-int ASN1_item_print(BIO *out, ASN1_VALUE *ifld, int indent,
-                    const ASN1_ITEM *it, const ASN1_PCTX *pctx);
-ASN1_PCTX *ASN1_PCTX_new(void);
-void ASN1_PCTX_free(ASN1_PCTX *p);
-unsigned long ASN1_PCTX_get_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_nm_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_nm_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_cert_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_cert_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_oid_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_str_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);
-
-BIO_METHOD *BIO_f_asn1(void);
-
-BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it);
-
-int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-                        const ASN1_ITEM *it);
-int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-                              const char *hdr, const ASN1_ITEM *it);
-int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
-                     int ctype_nid, int econt_nid,
-                     STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it);
-ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
-int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
-int SMIME_text(BIO *in, BIO *out);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ASN1_strings(void);
-
-/* Error codes for the ASN1 functions. */
-
-/* Function codes. */
-# define ASN1_F_A2D_ASN1_OBJECT                           100
-# define ASN1_F_A2I_ASN1_ENUMERATED                       101
-# define ASN1_F_A2I_ASN1_INTEGER                          102
-# define ASN1_F_A2I_ASN1_STRING                           103
-# define ASN1_F_APPEND_EXP                                176
-# define ASN1_F_ASN1_BIT_STRING_SET_BIT                   183
-# define ASN1_F_ASN1_CB                                   177
-# define ASN1_F_ASN1_CHECK_TLEN                           104
-# define ASN1_F_ASN1_COLLATE_PRIMITIVE                    105
-# define ASN1_F_ASN1_COLLECT                              106
-# define ASN1_F_ASN1_D2I_EX_PRIMITIVE                     108
-# define ASN1_F_ASN1_D2I_FP                               109
-# define ASN1_F_ASN1_D2I_READ_BIO                         107
-# define ASN1_F_ASN1_DIGEST                               184
-# define ASN1_F_ASN1_DO_ADB                               110
-# define ASN1_F_ASN1_DUP                                  111
-# define ASN1_F_ASN1_ENUMERATED_SET                       112
-# define ASN1_F_ASN1_ENUMERATED_TO_BN                     113
-# define ASN1_F_ASN1_EX_C2I                               204
-# define ASN1_F_ASN1_FIND_END                             190
-# define ASN1_F_ASN1_GENERALIZEDTIME_ADJ                  216
-# define ASN1_F_ASN1_GENERALIZEDTIME_SET                  185
-# define ASN1_F_ASN1_GENERATE_V3                          178
-# define ASN1_F_ASN1_GET_OBJECT                           114
-# define ASN1_F_ASN1_HEADER_NEW                           115
-# define ASN1_F_ASN1_I2D_BIO                              116
-# define ASN1_F_ASN1_I2D_FP                               117
-# define ASN1_F_ASN1_INTEGER_SET                          118
-# define ASN1_F_ASN1_INTEGER_TO_BN                        119
-# define ASN1_F_ASN1_ITEM_D2I_FP                          206
-# define ASN1_F_ASN1_ITEM_DUP                             191
-# define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW                  121
-# define ASN1_F_ASN1_ITEM_EX_D2I                          120
-# define ASN1_F_ASN1_ITEM_EX_I2D                          144
-# define ASN1_F_ASN1_ITEM_I2D_BIO                         192
-# define ASN1_F_ASN1_ITEM_I2D_FP                          193
-# define ASN1_F_ASN1_ITEM_PACK                            198
-# define ASN1_F_ASN1_ITEM_SIGN                            195
-# define ASN1_F_ASN1_ITEM_SIGN_CTX                        220
-# define ASN1_F_ASN1_ITEM_UNPACK                          199
-# define ASN1_F_ASN1_ITEM_VERIFY                          197
-# define ASN1_F_ASN1_MBSTRING_NCOPY                       122
-# define ASN1_F_ASN1_OBJECT_NEW                           123
-# define ASN1_F_ASN1_OUTPUT_DATA                          214
-# define ASN1_F_ASN1_PACK_STRING                          124
-# define ASN1_F_ASN1_PCTX_NEW                             205
-# define ASN1_F_ASN1_PKCS5_PBE_SET                        125
-# define ASN1_F_ASN1_SEQ_PACK                             126
-# define ASN1_F_ASN1_SEQ_UNPACK                           127
-# define ASN1_F_ASN1_SIGN                                 128
-# define ASN1_F_ASN1_STR2TYPE                             179
-# define ASN1_F_ASN1_STRING_SET                           186
-# define ASN1_F_ASN1_STRING_TABLE_ADD                     129
-# define ASN1_F_ASN1_STRING_TYPE_NEW                      130
-# define ASN1_F_ASN1_TEMPLATE_EX_D2I                      132
-# define ASN1_F_ASN1_TEMPLATE_NEW                         133
-# define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I                   131
-# define ASN1_F_ASN1_TIME_ADJ                             217
-# define ASN1_F_ASN1_TIME_SET                             175
-# define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING             134
-# define ASN1_F_ASN1_TYPE_GET_OCTETSTRING                 135
-# define ASN1_F_ASN1_UNPACK_STRING                        136
-# define ASN1_F_ASN1_UTCTIME_ADJ                          218
-# define ASN1_F_ASN1_UTCTIME_SET                          187
-# define ASN1_F_ASN1_VERIFY                               137
-# define ASN1_F_B64_READ_ASN1                             209
-# define ASN1_F_B64_WRITE_ASN1                            210
-# define ASN1_F_BIO_NEW_NDEF                              208
-# define ASN1_F_BITSTR_CB                                 180
-# define ASN1_F_BN_TO_ASN1_ENUMERATED                     138
-# define ASN1_F_BN_TO_ASN1_INTEGER                        139
-# define ASN1_F_C2I_ASN1_BIT_STRING                       189
-# define ASN1_F_C2I_ASN1_INTEGER                          194
-# define ASN1_F_C2I_ASN1_OBJECT                           196
-# define ASN1_F_COLLECT_DATA                              140
-# define ASN1_F_D2I_ASN1_BIT_STRING                       141
-# define ASN1_F_D2I_ASN1_BOOLEAN                          142
-# define ASN1_F_D2I_ASN1_BYTES                            143
-# define ASN1_F_D2I_ASN1_GENERALIZEDTIME                  144
-# define ASN1_F_D2I_ASN1_HEADER                           145
-# define ASN1_F_D2I_ASN1_INTEGER                          146
-# define ASN1_F_D2I_ASN1_OBJECT                           147
-# define ASN1_F_D2I_ASN1_SET                              148
-# define ASN1_F_D2I_ASN1_TYPE_BYTES                       149
-# define ASN1_F_D2I_ASN1_UINTEGER                         150
-# define ASN1_F_D2I_ASN1_UTCTIME                          151
-# define ASN1_F_D2I_AUTOPRIVATEKEY                        207
-# define ASN1_F_D2I_NETSCAPE_RSA                          152
-# define ASN1_F_D2I_NETSCAPE_RSA_2                        153
-# define ASN1_F_D2I_PRIVATEKEY                            154
-# define ASN1_F_D2I_PUBLICKEY                             155
-# define ASN1_F_D2I_RSA_NET                               200
-# define ASN1_F_D2I_RSA_NET_2                             201
-# define ASN1_F_D2I_X509                                  156
-# define ASN1_F_D2I_X509_CINF                             157
-# define ASN1_F_D2I_X509_PKEY                             159
-# define ASN1_F_I2D_ASN1_BIO_STREAM                       211
-# define ASN1_F_I2D_ASN1_SET                              188
-# define ASN1_F_I2D_ASN1_TIME                             160
-# define ASN1_F_I2D_DSA_PUBKEY                            161
-# define ASN1_F_I2D_EC_PUBKEY                             181
-# define ASN1_F_I2D_PRIVATEKEY                            163
-# define ASN1_F_I2D_PUBLICKEY                             164
-# define ASN1_F_I2D_RSA_NET                               162
-# define ASN1_F_I2D_RSA_PUBKEY                            165
-# define ASN1_F_LONG_C2I                                  166
-# define ASN1_F_OID_MODULE_INIT                           174
-# define ASN1_F_PARSE_TAGGING                             182
-# define ASN1_F_PKCS5_PBE2_SET_IV                         167
-# define ASN1_F_PKCS5_PBE_SET                             202
-# define ASN1_F_PKCS5_PBE_SET0_ALGOR                      215
-# define ASN1_F_PKCS5_PBKDF2_SET                          219
-# define ASN1_F_SMIME_READ_ASN1                           212
-# define ASN1_F_SMIME_TEXT                                213
-# define ASN1_F_X509_CINF_NEW                             168
-# define ASN1_F_X509_CRL_ADD0_REVOKED                     169
-# define ASN1_F_X509_INFO_NEW                             170
-# define ASN1_F_X509_NAME_ENCODE                          203
-# define ASN1_F_X509_NAME_EX_D2I                          158
-# define ASN1_F_X509_NAME_EX_NEW                          171
-# define ASN1_F_X509_NEW                                  172
-# define ASN1_F_X509_PKEY_NEW                             173
-
-/* Reason codes. */
-# define ASN1_R_ADDING_OBJECT                             171
-# define ASN1_R_ASN1_PARSE_ERROR                          203
-# define ASN1_R_ASN1_SIG_PARSE_ERROR                      204
-# define ASN1_R_AUX_ERROR                                 100
-# define ASN1_R_BAD_CLASS                                 101
-# define ASN1_R_BAD_OBJECT_HEADER                         102
-# define ASN1_R_BAD_TEMPLATE                              230
-# define ASN1_R_BAD_PASSWORD_READ                         103
-# define ASN1_R_BAD_TAG                                   104
-# define ASN1_R_BMPSTRING_IS_WRONG_LENGTH                 214
-# define ASN1_R_BN_LIB                                    105
-# define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                   106
-# define ASN1_R_BUFFER_TOO_SMALL                          107
-# define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER           108
-# define ASN1_R_CONTEXT_NOT_INITIALISED                   217
-# define ASN1_R_DATA_IS_WRONG                             109
-# define ASN1_R_DECODE_ERROR                              110
-# define ASN1_R_DECODING_ERROR                            111
-# define ASN1_R_DEPTH_EXCEEDED                            174
-# define ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED         198
-# define ASN1_R_ENCODE_ERROR                              112
-# define ASN1_R_ERROR_GETTING_TIME                        173
-# define ASN1_R_ERROR_LOADING_SECTION                     172
-# define ASN1_R_ERROR_PARSING_SET_ELEMENT                 113
-# define ASN1_R_ERROR_SETTING_CIPHER_PARAMS               114
-# define ASN1_R_EXPECTING_AN_INTEGER                      115
-# define ASN1_R_EXPECTING_AN_OBJECT                       116
-# define ASN1_R_EXPECTING_A_BOOLEAN                       117
-# define ASN1_R_EXPECTING_A_TIME                          118
-# define ASN1_R_EXPLICIT_LENGTH_MISMATCH                  119
-# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED              120
-# define ASN1_R_FIELD_MISSING                             121
-# define ASN1_R_FIRST_NUM_TOO_LARGE                       122
-# define ASN1_R_HEADER_TOO_LONG                           123
-# define ASN1_R_ILLEGAL_BITSTRING_FORMAT                  175
-# define ASN1_R_ILLEGAL_BOOLEAN                           176
-# define ASN1_R_ILLEGAL_CHARACTERS                        124
-# define ASN1_R_ILLEGAL_FORMAT                            177
-# define ASN1_R_ILLEGAL_HEX                               178
-# define ASN1_R_ILLEGAL_IMPLICIT_TAG                      179
-# define ASN1_R_ILLEGAL_INTEGER                           180
-# define ASN1_R_ILLEGAL_NESTED_TAGGING                    181
-# define ASN1_R_ILLEGAL_NULL                              125
-# define ASN1_R_ILLEGAL_NULL_VALUE                        182
-# define ASN1_R_ILLEGAL_OBJECT                            183
-# define ASN1_R_ILLEGAL_OPTIONAL_ANY                      126
-# define ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE          170
-# define ASN1_R_ILLEGAL_TAGGED_ANY                        127
-# define ASN1_R_ILLEGAL_TIME_VALUE                        184
-# define ASN1_R_INTEGER_NOT_ASCII_FORMAT                  185
-# define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG                128
-# define ASN1_R_INVALID_BIT_STRING_BITS_LEFT              220
-# define ASN1_R_INVALID_BMPSTRING_LENGTH                  129
-# define ASN1_R_INVALID_DIGIT                             130
-# define ASN1_R_INVALID_MIME_TYPE                         205
-# define ASN1_R_INVALID_MODIFIER                          186
-# define ASN1_R_INVALID_NUMBER                            187
-# define ASN1_R_INVALID_OBJECT_ENCODING                   216
-# define ASN1_R_INVALID_SEPARATOR                         131
-# define ASN1_R_INVALID_TIME_FORMAT                       132
-# define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH            133
-# define ASN1_R_INVALID_UTF8STRING                        134
-# define ASN1_R_IV_TOO_LARGE                              135
-# define ASN1_R_LENGTH_ERROR                              136
-# define ASN1_R_LIST_ERROR                                188
-# define ASN1_R_MIME_NO_CONTENT_TYPE                      206
-# define ASN1_R_MIME_PARSE_ERROR                          207
-# define ASN1_R_MIME_SIG_PARSE_ERROR                      208
-# define ASN1_R_MISSING_EOC                               137
-# define ASN1_R_MISSING_SECOND_NUMBER                     138
-# define ASN1_R_MISSING_VALUE                             189
-# define ASN1_R_MSTRING_NOT_UNIVERSAL                     139
-# define ASN1_R_MSTRING_WRONG_TAG                         140
-# define ASN1_R_NESTED_ASN1_STRING                        197
-# define ASN1_R_NESTED_TOO_DEEP                           219
-# define ASN1_R_NON_HEX_CHARACTERS                        141
-# define ASN1_R_NOT_ASCII_FORMAT                          190
-# define ASN1_R_NOT_ENOUGH_DATA                           142
-# define ASN1_R_NO_CONTENT_TYPE                           209
-# define ASN1_R_NO_DEFAULT_DIGEST                         201
-# define ASN1_R_NO_MATCHING_CHOICE_TYPE                   143
-# define ASN1_R_NO_MULTIPART_BODY_FAILURE                 210
-# define ASN1_R_NO_MULTIPART_BOUNDARY                     211
-# define ASN1_R_NO_SIG_CONTENT_TYPE                       212
-# define ASN1_R_NULL_IS_WRONG_LENGTH                      144
-# define ASN1_R_OBJECT_NOT_ASCII_FORMAT                   191
-# define ASN1_R_ODD_NUMBER_OF_CHARS                       145
-# define ASN1_R_PRIVATE_KEY_HEADER_MISSING                146
-# define ASN1_R_SECOND_NUMBER_TOO_LARGE                   147
-# define ASN1_R_SEQUENCE_LENGTH_MISMATCH                  148
-# define ASN1_R_SEQUENCE_NOT_CONSTRUCTED                  149
-# define ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG              192
-# define ASN1_R_SHORT_LINE                                150
-# define ASN1_R_SIG_INVALID_MIME_TYPE                     213
-# define ASN1_R_STREAMING_NOT_SUPPORTED                   202
-# define ASN1_R_STRING_TOO_LONG                           151
-# define ASN1_R_STRING_TOO_SHORT                          152
-# define ASN1_R_TAG_VALUE_TOO_HIGH                        153
-# define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154
-# define ASN1_R_TIME_NOT_ASCII_FORMAT                     193
-# define ASN1_R_TOO_LONG                                  155
-# define ASN1_R_TYPE_NOT_CONSTRUCTED                      156
-# define ASN1_R_TYPE_NOT_PRIMITIVE                        218
-# define ASN1_R_UNABLE_TO_DECODE_RSA_KEY                  157
-# define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY          158
-# define ASN1_R_UNEXPECTED_EOC                            159
-# define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH           215
-# define ASN1_R_UNKNOWN_FORMAT                            160
-# define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM          161
-# define ASN1_R_UNKNOWN_OBJECT_TYPE                       162
-# define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                   163
-# define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM               199
-# define ASN1_R_UNKNOWN_TAG                               194
-# define ASN1_R_UNKOWN_FORMAT                             195
-# define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE           164
-# define ASN1_R_UNSUPPORTED_CIPHER                        165
-# define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM          166
-# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE               167
-# define ASN1_R_UNSUPPORTED_TYPE                          196
-# define ASN1_R_WRONG_PUBLIC_KEY_TYPE                     200
-# define ASN1_R_WRONG_TAG                                 168
-# define ASN1_R_WRONG_TYPE                                169
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/asn1_mac.h b/openflow/usr/include/openssl/asn1_mac.h
deleted file mode 100644
index abc6dc3..0000000
--- a/openflow/usr/include/openssl/asn1_mac.h
+++ /dev/null
@@ -1,579 +0,0 @@
-/* crypto/asn1/asn1_mac.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_ASN1_MAC_H
-# define HEADER_ASN1_MAC_H
-
-# include <openssl/asn1.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifndef ASN1_MAC_ERR_LIB
-#  define ASN1_MAC_ERR_LIB        ERR_LIB_ASN1
-# endif
-
-# define ASN1_MAC_H_err(f,r,line) \
-        ERR_PUT_error(ASN1_MAC_ERR_LIB,(f),(r),__FILE__,(line))
-
-# define M_ASN1_D2I_vars(a,type,func) \
-        ASN1_const_CTX c; \
-        type ret=NULL; \
-        \
-        c.pp=(const unsigned char **)pp; \
-        c.q= *(const unsigned char **)pp; \
-        c.error=ERR_R_NESTED_ASN1_ERROR; \
-        if ((a == NULL) || ((*a) == NULL)) \
-                { if ((ret=(type)func()) == NULL) \
-                        { c.line=__LINE__; goto err; } } \
-        else    ret=(*a);
-
-# define M_ASN1_D2I_Init() \
-        c.p= *(const unsigned char **)pp; \
-        c.max=(length == 0)?0:(c.p+length);
-
-# define M_ASN1_D2I_Finish_2(a) \
-        if (!asn1_const_Finish(&c)) \
-                { c.line=__LINE__; goto err; } \
-        *(const unsigned char **)pp=c.p; \
-        if (a != NULL) (*a)=ret; \
-        return(ret);
-
-# define M_ASN1_D2I_Finish(a,func,e) \
-        M_ASN1_D2I_Finish_2(a); \
-err:\
-        ASN1_MAC_H_err((e),c.error,c.line); \
-        asn1_add_error(*(const unsigned char **)pp,(int)(c.q- *pp)); \
-        if ((ret != NULL) && ((a == NULL) || (*a != ret))) func(ret); \
-        return(NULL)
-
-# define M_ASN1_D2I_start_sequence() \
-        if (!asn1_GetSequence(&c,&length)) \
-                { c.line=__LINE__; goto err; }
-/* Begin reading ASN1 without a surrounding sequence */
-# define M_ASN1_D2I_begin() \
-        c.slen = length;
-
-/* End reading ASN1 with no check on length */
-# define M_ASN1_D2I_Finish_nolen(a, func, e) \
-        *pp=c.p; \
-        if (a != NULL) (*a)=ret; \
-        return(ret); \
-err:\
-        ASN1_MAC_H_err((e),c.error,c.line); \
-        asn1_add_error(*pp,(int)(c.q- *pp)); \
-        if ((ret != NULL) && ((a == NULL) || (*a != ret))) func(ret); \
-        return(NULL)
-
-# define M_ASN1_D2I_end_sequence() \
-        (((c.inf&1) == 0)?(c.slen <= 0): \
-                (c.eos=ASN1_const_check_infinite_end(&c.p,c.slen)))
-
-/* Don't use this with d2i_ASN1_BOOLEAN() */
-# define M_ASN1_D2I_get(b, func) \
-        c.q=c.p; \
-        if (func(&(b),&c.p,c.slen) == NULL) \
-                {c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-/* Don't use this with d2i_ASN1_BOOLEAN() */
-# define M_ASN1_D2I_get_x(type,b,func) \
-        c.q=c.p; \
-        if (((D2I_OF(type))func)(&(b),&c.p,c.slen) == NULL) \
-                {c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-/* use this instead () */
-# define M_ASN1_D2I_get_int(b,func) \
-        c.q=c.p; \
-        if (func(&(b),&c.p,c.slen) < 0) \
-                {c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-# define M_ASN1_D2I_get_opt(b,func,type) \
-        if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) \
-                == (V_ASN1_UNIVERSAL|(type)))) \
-                { \
-                M_ASN1_D2I_get(b,func); \
-                }
-
-# define M_ASN1_D2I_get_int_opt(b,func,type) \
-        if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) \
-                == (V_ASN1_UNIVERSAL|(type)))) \
-                { \
-                M_ASN1_D2I_get_int(b,func); \
-                }
-
-# define M_ASN1_D2I_get_imp(b,func, type) \
-        M_ASN1_next=(_tmp& V_ASN1_CONSTRUCTED)|type; \
-        c.q=c.p; \
-        if (func(&(b),&c.p,c.slen) == NULL) \
-                {c.line=__LINE__; M_ASN1_next_prev = _tmp; goto err; } \
-        c.slen-=(c.p-c.q);\
-        M_ASN1_next_prev=_tmp;
-
-# define M_ASN1_D2I_get_IMP_opt(b,func,tag,type) \
-        if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) == \
-                (V_ASN1_CONTEXT_SPECIFIC|(tag)))) \
-                { \
-                unsigned char _tmp = M_ASN1_next; \
-                M_ASN1_D2I_get_imp(b,func, type);\
-                }
-
-# define M_ASN1_D2I_get_set(r,func,free_func) \
-                M_ASN1_D2I_get_imp_set(r,func,free_func, \
-                        V_ASN1_SET,V_ASN1_UNIVERSAL);
-
-# define M_ASN1_D2I_get_set_type(type,r,func,free_func) \
-                M_ASN1_D2I_get_imp_set_type(type,r,func,free_func, \
-                        V_ASN1_SET,V_ASN1_UNIVERSAL);
-
-# define M_ASN1_D2I_get_set_opt(r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SET)))\
-                { M_ASN1_D2I_get_set(r,func,free_func); }
-
-# define M_ASN1_D2I_get_set_opt_type(type,r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SET)))\
-                { M_ASN1_D2I_get_set_type(type,r,func,free_func); }
-
-# define M_ASN1_I2D_len_SET_opt(a,f) \
-        if ((a != NULL) && (sk_num(a) != 0)) \
-                M_ASN1_I2D_len_SET(a,f);
-
-# define M_ASN1_I2D_put_SET_opt(a,f) \
-        if ((a != NULL) && (sk_num(a) != 0)) \
-                M_ASN1_I2D_put_SET(a,f);
-
-# define M_ASN1_I2D_put_SEQUENCE_opt(a,f) \
-        if ((a != NULL) && (sk_num(a) != 0)) \
-                M_ASN1_I2D_put_SEQUENCE(a,f);
-
-# define M_ASN1_I2D_put_SEQUENCE_opt_type(type,a,f) \
-        if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                M_ASN1_I2D_put_SEQUENCE_type(type,a,f);
-
-# define M_ASN1_D2I_get_IMP_set_opt(b,func,free_func,tag) \
-        if ((c.slen != 0) && \
-                (M_ASN1_next == \
-                (V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
-                { \
-                M_ASN1_D2I_get_imp_set(b,func,free_func,\
-                        tag,V_ASN1_CONTEXT_SPECIFIC); \
-                }
-
-# define M_ASN1_D2I_get_IMP_set_opt_type(type,b,func,free_func,tag) \
-        if ((c.slen != 0) && \
-                (M_ASN1_next == \
-                (V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
-                { \
-                M_ASN1_D2I_get_imp_set_type(type,b,func,free_func,\
-                        tag,V_ASN1_CONTEXT_SPECIFIC); \
-                }
-
-# define M_ASN1_D2I_get_seq(r,func,free_func) \
-                M_ASN1_D2I_get_imp_set(r,func,free_func,\
-                        V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-
-# define M_ASN1_D2I_get_seq_type(type,r,func,free_func) \
-                M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
-                                            V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
-
-# define M_ASN1_D2I_get_seq_opt(r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
-                { M_ASN1_D2I_get_seq(r,func,free_func); }
-
-# define M_ASN1_D2I_get_seq_opt_type(type,r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
-                { M_ASN1_D2I_get_seq_type(type,r,func,free_func); }
-
-# define M_ASN1_D2I_get_IMP_set(r,func,free_func,x) \
-                M_ASN1_D2I_get_imp_set(r,func,free_func,\
-                        x,V_ASN1_CONTEXT_SPECIFIC);
-
-# define M_ASN1_D2I_get_IMP_set_type(type,r,func,free_func,x) \
-                M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
-                        x,V_ASN1_CONTEXT_SPECIFIC);
-
-# define M_ASN1_D2I_get_imp_set(r,func,free_func,a,b) \
-        c.q=c.p; \
-        if (d2i_ASN1_SET(&(r),&c.p,c.slen,(char *(*)())func,\
-                (void (*)())free_func,a,b) == NULL) \
-                { c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-# define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \
-        c.q=c.p; \
-        if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,\
-                                   free_func,a,b) == NULL) \
-                { c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-# define M_ASN1_D2I_get_set_strings(r,func,a,b) \
-        c.q=c.p; \
-        if (d2i_ASN1_STRING_SET(&(r),&c.p,c.slen,a,b) == NULL) \
-                { c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-# define M_ASN1_D2I_get_EXP_opt(r,func,tag) \
-        if ((c.slen != 0L) && (M_ASN1_next == \
-                (V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-                { \
-                int Tinf,Ttag,Tclass; \
-                long Tlen; \
-                \
-                c.q=c.p; \
-                Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-                if (Tinf & 0x80) \
-                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-                        c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-                                        Tlen = c.slen - (c.p - c.q) - 2; \
-                if (func(&(r),&c.p,Tlen) == NULL) \
-                        { c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-                        Tlen = c.slen - (c.p - c.q); \
-                        if(!ASN1_const_check_infinite_end(&c.p, Tlen)) \
-                                { c.error=ERR_R_MISSING_ASN1_EOS; \
-                                c.line=__LINE__; goto err; } \
-                }\
-                c.slen-=(c.p-c.q); \
-                }
-
-# define M_ASN1_D2I_get_EXP_set_opt(r,func,free_func,tag,b) \
-        if ((c.slen != 0) && (M_ASN1_next == \
-                (V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-                { \
-                int Tinf,Ttag,Tclass; \
-                long Tlen; \
-                \
-                c.q=c.p; \
-                Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-                if (Tinf & 0x80) \
-                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-                        c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-                                        Tlen = c.slen - (c.p - c.q) - 2; \
-                if (d2i_ASN1_SET(&(r),&c.p,Tlen,(char *(*)())func, \
-                        (void (*)())free_func, \
-                        b,V_ASN1_UNIVERSAL) == NULL) \
-                        { c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-                        Tlen = c.slen - (c.p - c.q); \
-                        if(!ASN1_check_infinite_end(&c.p, Tlen)) \
-                                { c.error=ERR_R_MISSING_ASN1_EOS; \
-                                c.line=__LINE__; goto err; } \
-                }\
-                c.slen-=(c.p-c.q); \
-                }
-
-# define M_ASN1_D2I_get_EXP_set_opt_type(type,r,func,free_func,tag,b) \
-        if ((c.slen != 0) && (M_ASN1_next == \
-                (V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-                { \
-                int Tinf,Ttag,Tclass; \
-                long Tlen; \
-                \
-                c.q=c.p; \
-                Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-                if (Tinf & 0x80) \
-                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-                        c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-                                        Tlen = c.slen - (c.p - c.q) - 2; \
-                if (d2i_ASN1_SET_OF_##type(&(r),&c.p,Tlen,func, \
-                        free_func,b,V_ASN1_UNIVERSAL) == NULL) \
-                        { c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-                        Tlen = c.slen - (c.p - c.q); \
-                        if(!ASN1_check_infinite_end(&c.p, Tlen)) \
-                                { c.error=ERR_R_MISSING_ASN1_EOS; \
-                                c.line=__LINE__; goto err; } \
-                }\
-                c.slen-=(c.p-c.q); \
-                }
-
-/* New macros */
-# define M_ASN1_New_Malloc(ret,type) \
-        if ((ret=(type *)OPENSSL_malloc(sizeof(type))) == NULL) \
-                { c.line=__LINE__; goto err2; }
-
-# define M_ASN1_New(arg,func) \
-        if (((arg)=func()) == NULL) return(NULL)
-
-# define M_ASN1_New_Error(a) \
-/*-     err:    ASN1_MAC_H_err((a),ERR_R_NESTED_ASN1_ERROR,c.line); \
-                return(NULL);*/ \
-        err2:   ASN1_MAC_H_err((a),ERR_R_MALLOC_FAILURE,c.line); \
-                return(NULL)
-
-/*
- * BIG UGLY WARNING! This is so damn ugly I wanna puke.  Unfortunately, some
- * macros that use ASN1_const_CTX still insist on writing in the input
- * stream.  ARGH! ARGH! ARGH! Let's get rid of this macro package. Please? --
- * Richard Levitte
- */
-# define M_ASN1_next             (*((unsigned char *)(c.p)))
-# define M_ASN1_next_prev        (*((unsigned char *)(c.q)))
-
-/*************************************************/
-
-# define M_ASN1_I2D_vars(a)      int r=0,ret=0; \
-                                unsigned char *p; \
-                                if (a == NULL) return(0)
-
-/* Length Macros */
-# define M_ASN1_I2D_len(a,f)     ret+=f(a,NULL)
-# define M_ASN1_I2D_len_IMP_opt(a,f)     if (a != NULL) M_ASN1_I2D_len(a,f)
-
-# define M_ASN1_I2D_len_SET(a,f) \
-                ret+=i2d_ASN1_SET(a,NULL,f,V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
-
-# define M_ASN1_I2D_len_SET_type(type,a,f) \
-                ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,V_ASN1_SET, \
-                                            V_ASN1_UNIVERSAL,IS_SET);
-
-# define M_ASN1_I2D_len_SEQUENCE(a,f) \
-                ret+=i2d_ASN1_SET(a,NULL,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
-                                  IS_SEQUENCE);
-
-# define M_ASN1_I2D_len_SEQUENCE_type(type,a,f) \
-                ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,V_ASN1_SEQUENCE, \
-                                            V_ASN1_UNIVERSAL,IS_SEQUENCE)
-
-# define M_ASN1_I2D_len_SEQUENCE_opt(a,f) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        M_ASN1_I2D_len_SEQUENCE(a,f);
-
-# define M_ASN1_I2D_len_SEQUENCE_opt_type(type,a,f) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        M_ASN1_I2D_len_SEQUENCE_type(type,a,f);
-
-# define M_ASN1_I2D_len_IMP_SET(a,f,x) \
-                ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-# define M_ASN1_I2D_len_IMP_SET_type(type,a,f,x) \
-                ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-                                            V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-# define M_ASN1_I2D_len_IMP_SET_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                          IS_SET);
-
-# define M_ASN1_I2D_len_IMP_SET_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-                                               V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-# define M_ASN1_I2D_len_IMP_SEQUENCE(a,f,x) \
-                ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                  IS_SEQUENCE);
-
-# define M_ASN1_I2D_len_IMP_SEQUENCE_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                          IS_SEQUENCE);
-
-# define M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-                                                    V_ASN1_CONTEXT_SPECIFIC, \
-                                                    IS_SEQUENCE);
-
-# define M_ASN1_I2D_len_EXP_opt(a,f,mtag,v) \
-                if (a != NULL)\
-                        { \
-                        v=f(a,NULL); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-# define M_ASN1_I2D_len_EXP_SET_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0))\
-                        { \
-                        v=i2d_ASN1_SET(a,NULL,f,tag,V_ASN1_UNIVERSAL,IS_SET); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-# define M_ASN1_I2D_len_EXP_SEQUENCE_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0))\
-                        { \
-                        v=i2d_ASN1_SET(a,NULL,f,tag,V_ASN1_UNIVERSAL, \
-                                       IS_SEQUENCE); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-# define M_ASN1_I2D_len_EXP_SEQUENCE_opt_type(type,a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0))\
-                        { \
-                        v=i2d_ASN1_SET_OF_##type(a,NULL,f,tag, \
-                                                 V_ASN1_UNIVERSAL, \
-                                                 IS_SEQUENCE); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-/* Put Macros */
-# define M_ASN1_I2D_put(a,f)     f(a,&p)
-
-# define M_ASN1_I2D_put_IMP_opt(a,f,t)   \
-                if (a != NULL) \
-                        { \
-                        unsigned char *q=p; \
-                        f(a,&p); \
-                        *q=(V_ASN1_CONTEXT_SPECIFIC|t|(*q&V_ASN1_CONSTRUCTED));\
-                        }
-
-# define M_ASN1_I2D_put_SET(a,f) i2d_ASN1_SET(a,&p,f,V_ASN1_SET,\
-                        V_ASN1_UNIVERSAL,IS_SET)
-# define M_ASN1_I2D_put_SET_type(type,a,f) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET)
-# define M_ASN1_I2D_put_IMP_SET(a,f,x) i2d_ASN1_SET(a,&p,f,x,\
-                        V_ASN1_CONTEXT_SPECIFIC,IS_SET)
-# define M_ASN1_I2D_put_IMP_SET_type(type,a,f,x) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC,IS_SET)
-# define M_ASN1_I2D_put_IMP_SEQUENCE(a,f,x) i2d_ASN1_SET(a,&p,f,x,\
-                        V_ASN1_CONTEXT_SPECIFIC,IS_SEQUENCE)
-
-# define M_ASN1_I2D_put_SEQUENCE(a,f) i2d_ASN1_SET(a,&p,f,V_ASN1_SEQUENCE,\
-                                             V_ASN1_UNIVERSAL,IS_SEQUENCE)
-
-# define M_ASN1_I2D_put_SEQUENCE_type(type,a,f) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
-                            IS_SEQUENCE)
-
-# define M_ASN1_I2D_put_SEQUENCE_opt(a,f) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        M_ASN1_I2D_put_SEQUENCE(a,f);
-
-# define M_ASN1_I2D_put_IMP_SET_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { i2d_ASN1_SET(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                       IS_SET); }
-
-# define M_ASN1_I2D_put_IMP_SET_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        { i2d_ASN1_SET_OF_##type(a,&p,f,x, \
-                                                 V_ASN1_CONTEXT_SPECIFIC, \
-                                                 IS_SET); }
-
-# define M_ASN1_I2D_put_IMP_SEQUENCE_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { i2d_ASN1_SET(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                       IS_SEQUENCE); }
-
-# define M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        { i2d_ASN1_SET_OF_##type(a,&p,f,x, \
-                                                 V_ASN1_CONTEXT_SPECIFIC, \
-                                                 IS_SEQUENCE); }
-
-# define M_ASN1_I2D_put_EXP_opt(a,f,tag,v) \
-                if (a != NULL) \
-                        { \
-                        ASN1_put_object(&p,1,v,tag,V_ASN1_CONTEXT_SPECIFIC); \
-                        f(a,&p); \
-                        }
-
-# define M_ASN1_I2D_put_EXP_SET_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { \
-                        ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-                        i2d_ASN1_SET(a,&p,f,tag,V_ASN1_UNIVERSAL,IS_SET); \
-                        }
-
-# define M_ASN1_I2D_put_EXP_SEQUENCE_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { \
-                        ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-                        i2d_ASN1_SET(a,&p,f,tag,V_ASN1_UNIVERSAL,IS_SEQUENCE); \
-                        }
-
-# define M_ASN1_I2D_put_EXP_SEQUENCE_opt_type(type,a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        { \
-                        ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-                        i2d_ASN1_SET_OF_##type(a,&p,f,tag,V_ASN1_UNIVERSAL, \
-                                               IS_SEQUENCE); \
-                        }
-
-# define M_ASN1_I2D_seq_total() \
-                r=ASN1_object_size(1,ret,V_ASN1_SEQUENCE); \
-                if (pp == NULL) return(r); \
-                p= *pp; \
-                ASN1_put_object(&p,1,ret,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
-
-# define M_ASN1_I2D_INF_seq_start(tag,ctx) \
-                *(p++)=(V_ASN1_CONSTRUCTED|(tag)|(ctx)); \
-                *(p++)=0x80
-
-# define M_ASN1_I2D_INF_seq_end() *(p++)=0x00; *(p++)=0x00
-
-# define M_ASN1_I2D_finish()     *pp=p; \
-                                return(r);
-
-int asn1_GetSequence(ASN1_const_CTX *c, long *length);
-void asn1_add_error(const unsigned char *address, int offset);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/asn1t.h b/openflow/usr/include/openssl/asn1t.h
deleted file mode 100644
index 99bc0ee..0000000
--- a/openflow/usr/include/openssl/asn1t.h
+++ /dev/null
@@ -1,973 +0,0 @@
-/* asn1t.h */
-/*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
- * 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_ASN1T_H
-# define HEADER_ASN1T_H
-
-# include <stddef.h>
-# include <openssl/e_os2.h>
-# include <openssl/asn1.h>
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-/* ASN1 template defines, structures and functions */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-#  define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr))
-
-/* Macros for start and end of ASN1_ITEM definition */
-
-#  define ASN1_ITEM_start(itname) \
-        OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {
-
-#  define ASN1_ITEM_end(itname) \
-                };
-
-# else
-
-/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-#  define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr()))
-
-/* Macros for start and end of ASN1_ITEM definition */
-
-#  define ASN1_ITEM_start(itname) \
-        const ASN1_ITEM * itname##_it(void) \
-        { \
-                static const ASN1_ITEM local_it = {
-
-#  define ASN1_ITEM_end(itname) \
-                }; \
-        return &local_it; \
-        }
-
-# endif
-
-/* Macros to aid ASN1 template writing */
-
-# define ASN1_ITEM_TEMPLATE(tname) \
-        static const ASN1_TEMPLATE tname##_item_tt
-
-# define ASN1_ITEM_TEMPLATE_END(tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_PRIMITIVE,\
-                -1,\
-                &tname##_item_tt,\
-                0,\
-                NULL,\
-                0,\
-                #tname \
-        ASN1_ITEM_end(tname)
-
-/* This is a ASN1 type which just embeds a template */
-
-/*-
- * This pair helps declare a SEQUENCE. We can do:
- *
- *      ASN1_SEQUENCE(stname) = {
- *              ... SEQUENCE components ...
- *      } ASN1_SEQUENCE_END(stname)
- *
- *      This will produce an ASN1_ITEM called stname_it
- *      for a structure called stname.
- *
- *      If you want the same structure but a different
- *      name then use:
- *
- *      ASN1_SEQUENCE(itname) = {
- *              ... SEQUENCE components ...
- *      } ASN1_SEQUENCE_END_name(stname, itname)
- *
- *      This will create an item called itname_it using
- *      a structure called stname.
- */
-
-# define ASN1_SEQUENCE(tname) \
-        static const ASN1_TEMPLATE tname##_seq_tt[]
-
-# define ASN1_SEQUENCE_END(stname) ASN1_SEQUENCE_END_name(stname, stname)
-
-# define ASN1_SEQUENCE_END_name(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_NDEF_SEQUENCE(tname) \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_NDEF_SEQUENCE_cb(tname, cb) \
-        ASN1_SEQUENCE_cb(tname, cb)
-
-# define ASN1_SEQUENCE_cb(tname, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_BROKEN_SEQUENCE(tname) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_SEQUENCE_ref(tname, cb, lck) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_REFCOUNT, offsetof(tname, references), lck, cb, 0}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_SEQUENCE_enc(tname, enc, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_ENCODING, 0, 0, cb, offsetof(tname, enc)}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_NDEF_SEQUENCE_END(tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_NDEF_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(tname),\
-                #tname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_BROKEN_SEQUENCE_END(stname) ASN1_SEQUENCE_END_ref(stname, stname)
-
-# define ASN1_SEQUENCE_END_enc(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
-
-# define ASN1_SEQUENCE_END_cb(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
-
-# define ASN1_SEQUENCE_END_ref(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_NDEF_SEQUENCE_END_cb(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_NDEF_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-/*-
- * This pair helps declare a CHOICE type. We can do:
- *
- *      ASN1_CHOICE(chname) = {
- *              ... CHOICE options ...
- *      ASN1_CHOICE_END(chname)
- *
- *      This will produce an ASN1_ITEM called chname_it
- *      for a structure called chname. The structure
- *      definition must look like this:
- *      typedef struct {
- *              int type;
- *              union {
- *                      ASN1_SOMETHING *opt1;
- *                      ASN1_SOMEOTHER *opt2;
- *              } value;
- *      } chname;
- *
- *      the name of the selector must be 'type'.
- *      to use an alternative selector name use the
- *      ASN1_CHOICE_END_selector() version.
- */
-
-# define ASN1_CHOICE(tname) \
-        static const ASN1_TEMPLATE tname##_ch_tt[]
-
-# define ASN1_CHOICE_cb(tname, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
-        ASN1_CHOICE(tname)
-
-# define ASN1_CHOICE_END(stname) ASN1_CHOICE_END_name(stname, stname)
-
-# define ASN1_CHOICE_END_name(stname, tname) ASN1_CHOICE_END_selector(stname, tname, type)
-
-# define ASN1_CHOICE_END_selector(stname, tname, selname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_CHOICE,\
-                offsetof(stname,selname) ,\
-                tname##_ch_tt,\
-                sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_CHOICE_END_cb(stname, tname, selname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_CHOICE,\
-                offsetof(stname,selname) ,\
-                tname##_ch_tt,\
-                sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-/* This helps with the template wrapper form of ASN1_ITEM */
-
-# define ASN1_EX_TEMPLATE_TYPE(flags, tag, name, type) { \
-        (flags), (tag), 0,\
-        #name, ASN1_ITEM_ref(type) }
-
-/* These help with SEQUENCE or CHOICE components */
-
-/* used to declare other types */
-
-# define ASN1_EX_TYPE(flags, tag, stname, field, type) { \
-        (flags), (tag), offsetof(stname, field),\
-        #field, ASN1_ITEM_ref(type) }
-
-/* used when the structure is combined with the parent */
-
-# define ASN1_EX_COMBINE(flags, tag, type) { \
-        (flags)|ASN1_TFLG_COMBINE, (tag), 0, NULL, ASN1_ITEM_ref(type) }
-
-/* implicit and explicit helper macros */
-
-# define ASN1_IMP_EX(stname, field, type, tag, ex) \
-                ASN1_EX_TYPE(ASN1_TFLG_IMPLICIT | ex, tag, stname, field, type)
-
-# define ASN1_EXP_EX(stname, field, type, tag, ex) \
-                ASN1_EX_TYPE(ASN1_TFLG_EXPLICIT | ex, tag, stname, field, type)
-
-/* Any defined by macros: the field used is in the table itself */
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-#  define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
-#  define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
-# else
-#  define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, tblname##_adb }
-#  define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, tblname##_adb }
-# endif
-/* Plain simple type */
-# define ASN1_SIMPLE(stname, field, type) ASN1_EX_TYPE(0,0, stname, field, type)
-
-/* OPTIONAL simple type */
-# define ASN1_OPT(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* IMPLICIT tagged simple type */
-# define ASN1_IMP(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, 0)
-
-/* IMPLICIT tagged OPTIONAL simple type */
-# define ASN1_IMP_OPT(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
-
-/* Same as above but EXPLICIT */
-
-# define ASN1_EXP(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, 0)
-# define ASN1_EXP_OPT(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
-
-/* SEQUENCE OF type */
-# define ASN1_SEQUENCE_OF(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, stname, field, type)
-
-/* OPTIONAL SEQUENCE OF */
-# define ASN1_SEQUENCE_OF_OPT(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* Same as above but for SET OF */
-
-# define ASN1_SET_OF(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SET_OF, 0, stname, field, type)
-
-# define ASN1_SET_OF_OPT(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* Finally compound types of SEQUENCE, SET, IMPLICIT, EXPLICIT and OPTIONAL */
-
-# define ASN1_IMP_SET_OF(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
-
-# define ASN1_EXP_SET_OF(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
-
-# define ASN1_IMP_SET_OF_OPT(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
-
-# define ASN1_EXP_SET_OF_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
-
-# define ASN1_IMP_SEQUENCE_OF(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
-
-# define ASN1_IMP_SEQUENCE_OF_OPT(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
-
-# define ASN1_EXP_SEQUENCE_OF(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
-
-# define ASN1_EXP_SEQUENCE_OF_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
-
-/* EXPLICIT using indefinite length constructed form */
-# define ASN1_NDEF_EXP(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_NDEF)
-
-/* EXPLICIT OPTIONAL using indefinite length constructed form */
-# define ASN1_NDEF_EXP_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_NDEF)
-
-/* Macros for the ASN1_ADB structure */
-
-# define ASN1_ADB(name) \
-        static const ASN1_ADB_TABLE name##_adbtbl[]
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#  define ASN1_ADB_END(name, flags, field, app_table, def, none) \
-        ;\
-        static const ASN1_ADB name##_adb = {\
-                flags,\
-                offsetof(name, field),\
-                app_table,\
-                name##_adbtbl,\
-                sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
-                def,\
-                none\
-        }
-
-# else
-
-#  define ASN1_ADB_END(name, flags, field, app_table, def, none) \
-        ;\
-        static const ASN1_ITEM *name##_adb(void) \
-        { \
-        static const ASN1_ADB internal_adb = \
-                {\
-                flags,\
-                offsetof(name, field),\
-                app_table,\
-                name##_adbtbl,\
-                sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
-                def,\
-                none\
-                }; \
-                return (const ASN1_ITEM *) &internal_adb; \
-        } \
-        void dummy_function(void)
-
-# endif
-
-# define ADB_ENTRY(val, template) {val, template}
-
-# define ASN1_ADB_TEMPLATE(name) \
-        static const ASN1_TEMPLATE name##_tt
-
-/*
- * This is the ASN1 template structure that defines a wrapper round the
- * actual type. It determines the actual position of the field in the value
- * structure, various flags such as OPTIONAL and the field name.
- */
-
-struct ASN1_TEMPLATE_st {
-    unsigned long flags;        /* Various flags */
-    long tag;                   /* tag, not used if no tagging */
-    unsigned long offset;       /* Offset of this field in structure */
-# ifndef NO_ASN1_FIELD_NAMES
-    const char *field_name;     /* Field name */
-# endif
-    ASN1_ITEM_EXP *item;        /* Relevant ASN1_ITEM or ASN1_ADB */
-};
-
-/* Macro to extract ASN1_ITEM and ASN1_ADB pointer from ASN1_TEMPLATE */
-
-# define ASN1_TEMPLATE_item(t) (t->item_ptr)
-# define ASN1_TEMPLATE_adb(t) (t->item_ptr)
-
-typedef struct ASN1_ADB_TABLE_st ASN1_ADB_TABLE;
-typedef struct ASN1_ADB_st ASN1_ADB;
-
-struct ASN1_ADB_st {
-    unsigned long flags;        /* Various flags */
-    unsigned long offset;       /* Offset of selector field */
-    STACK_OF(ASN1_ADB_TABLE) **app_items; /* Application defined items */
-    const ASN1_ADB_TABLE *tbl;  /* Table of possible types */
-    long tblcount;              /* Number of entries in tbl */
-    const ASN1_TEMPLATE *default_tt; /* Type to use if no match */
-    const ASN1_TEMPLATE *null_tt; /* Type to use if selector is NULL */
-};
-
-struct ASN1_ADB_TABLE_st {
-    long value;                 /* NID for an object or value for an int */
-    const ASN1_TEMPLATE tt;     /* item for this value */
-};
-
-/* template flags */
-
-/* Field is optional */
-# define ASN1_TFLG_OPTIONAL      (0x1)
-
-/* Field is a SET OF */
-# define ASN1_TFLG_SET_OF        (0x1 << 1)
-
-/* Field is a SEQUENCE OF */
-# define ASN1_TFLG_SEQUENCE_OF   (0x2 << 1)
-
-/*
- * Special case: this refers to a SET OF that will be sorted into DER order
- * when encoded *and* the corresponding STACK will be modified to match the
- * new order.
- */
-# define ASN1_TFLG_SET_ORDER     (0x3 << 1)
-
-/* Mask for SET OF or SEQUENCE OF */
-# define ASN1_TFLG_SK_MASK       (0x3 << 1)
-
-/*
- * These flags mean the tag should be taken from the tag field. If EXPLICIT
- * then the underlying type is used for the inner tag.
- */
-
-/* IMPLICIT tagging */
-# define ASN1_TFLG_IMPTAG        (0x1 << 3)
-
-/* EXPLICIT tagging, inner tag from underlying type */
-# define ASN1_TFLG_EXPTAG        (0x2 << 3)
-
-# define ASN1_TFLG_TAG_MASK      (0x3 << 3)
-
-/* context specific IMPLICIT */
-# define ASN1_TFLG_IMPLICIT      ASN1_TFLG_IMPTAG|ASN1_TFLG_CONTEXT
-
-/* context specific EXPLICIT */
-# define ASN1_TFLG_EXPLICIT      ASN1_TFLG_EXPTAG|ASN1_TFLG_CONTEXT
-
-/*
- * If tagging is in force these determine the type of tag to use. Otherwise
- * the tag is determined by the underlying type. These values reflect the
- * actual octet format.
- */
-
-/* Universal tag */
-# define ASN1_TFLG_UNIVERSAL     (0x0<<6)
-/* Application tag */
-# define ASN1_TFLG_APPLICATION   (0x1<<6)
-/* Context specific tag */
-# define ASN1_TFLG_CONTEXT       (0x2<<6)
-/* Private tag */
-# define ASN1_TFLG_PRIVATE       (0x3<<6)
-
-# define ASN1_TFLG_TAG_CLASS     (0x3<<6)
-
-/*
- * These are for ANY DEFINED BY type. In this case the 'item' field points to
- * an ASN1_ADB structure which contains a table of values to decode the
- * relevant type
- */
-
-# define ASN1_TFLG_ADB_MASK      (0x3<<8)
-
-# define ASN1_TFLG_ADB_OID       (0x1<<8)
-
-# define ASN1_TFLG_ADB_INT       (0x1<<9)
-
-/*
- * This flag means a parent structure is passed instead of the field: this is
- * useful is a SEQUENCE is being combined with a CHOICE for example. Since
- * this means the structure and item name will differ we need to use the
- * ASN1_CHOICE_END_name() macro for example.
- */
-
-# define ASN1_TFLG_COMBINE       (0x1<<10)
-
-/*
- * This flag when present in a SEQUENCE OF, SET OF or EXPLICIT causes
- * indefinite length constructed encoding to be used if required.
- */
-
-# define ASN1_TFLG_NDEF          (0x1<<11)
-
-/* This is the actual ASN1 item itself */
-
-struct ASN1_ITEM_st {
-    char itype;                 /* The item type, primitive, SEQUENCE, CHOICE
-                                 * or extern */
-    long utype;                 /* underlying type */
-    const ASN1_TEMPLATE *templates; /* If SEQUENCE or CHOICE this contains
-                                     * the contents */
-    long tcount;                /* Number of templates if SEQUENCE or CHOICE */
-    const void *funcs;          /* functions that handle this type */
-    long size;                  /* Structure size (usually) */
-# ifndef NO_ASN1_FIELD_NAMES
-    const char *sname;          /* Structure name */
-# endif
-};
-
-/*-
- * These are values for the itype field and
- * determine how the type is interpreted.
- *
- * For PRIMITIVE types the underlying type
- * determines the behaviour if items is NULL.
- *
- * Otherwise templates must contain a single
- * template and the type is treated in the
- * same way as the type specified in the template.
- *
- * For SEQUENCE types the templates field points
- * to the members, the size field is the
- * structure size.
- *
- * For CHOICE types the templates field points
- * to each possible member (typically a union)
- * and the 'size' field is the offset of the
- * selector.
- *
- * The 'funcs' field is used for application
- * specific functions.
- *
- * For COMPAT types the funcs field gives a
- * set of functions that handle this type, this
- * supports the old d2i, i2d convention.
- *
- * The EXTERN type uses a new style d2i/i2d.
- * The new style should be used where possible
- * because it avoids things like the d2i IMPLICIT
- * hack.
- *
- * MSTRING is a multiple string type, it is used
- * for a CHOICE of character strings where the
- * actual strings all occupy an ASN1_STRING
- * structure. In this case the 'utype' field
- * has a special meaning, it is used as a mask
- * of acceptable types using the B_ASN1 constants.
- *
- * NDEF_SEQUENCE is the same as SEQUENCE except
- * that it will use indefinite length constructed
- * encoding if requested.
- *
- */
-
-# define ASN1_ITYPE_PRIMITIVE            0x0
-
-# define ASN1_ITYPE_SEQUENCE             0x1
-
-# define ASN1_ITYPE_CHOICE               0x2
-
-# define ASN1_ITYPE_COMPAT               0x3
-
-# define ASN1_ITYPE_EXTERN               0x4
-
-# define ASN1_ITYPE_MSTRING              0x5
-
-# define ASN1_ITYPE_NDEF_SEQUENCE        0x6
-
-/*
- * Cache for ASN1 tag and length, so we don't keep re-reading it for things
- * like CHOICE
- */
-
-struct ASN1_TLC_st {
-    char valid;                 /* Values below are valid */
-    int ret;                    /* return value */
-    long plen;                  /* length */
-    int ptag;                   /* class value */
-    int pclass;                 /* class value */
-    int hdrlen;                 /* header length */
-};
-
-/* Typedefs for ASN1 function pointers */
-
-typedef ASN1_VALUE *ASN1_new_func(void);
-typedef void ASN1_free_func(ASN1_VALUE *a);
-typedef ASN1_VALUE *ASN1_d2i_func(ASN1_VALUE **a, const unsigned char **in,
-                                  long length);
-typedef int ASN1_i2d_func(ASN1_VALUE *a, unsigned char **in);
-
-typedef int ASN1_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                        const ASN1_ITEM *it, int tag, int aclass, char opt,
-                        ASN1_TLC *ctx);
-
-typedef int ASN1_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
-                        const ASN1_ITEM *it, int tag, int aclass);
-typedef int ASN1_ex_new_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
-typedef void ASN1_ex_free_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-typedef int ASN1_ex_print_func(BIO *out, ASN1_VALUE **pval,
-                               int indent, const char *fname,
-                               const ASN1_PCTX *pctx);
-
-typedef int ASN1_primitive_i2c(ASN1_VALUE **pval, unsigned char *cont,
-                               int *putype, const ASN1_ITEM *it);
-typedef int ASN1_primitive_c2i(ASN1_VALUE **pval, const unsigned char *cont,
-                               int len, int utype, char *free_cont,
-                               const ASN1_ITEM *it);
-typedef int ASN1_primitive_print(BIO *out, ASN1_VALUE **pval,
-                                 const ASN1_ITEM *it, int indent,
-                                 const ASN1_PCTX *pctx);
-
-typedef struct ASN1_COMPAT_FUNCS_st {
-    ASN1_new_func *asn1_new;
-    ASN1_free_func *asn1_free;
-    ASN1_d2i_func *asn1_d2i;
-    ASN1_i2d_func *asn1_i2d;
-} ASN1_COMPAT_FUNCS;
-
-typedef struct ASN1_EXTERN_FUNCS_st {
-    void *app_data;
-    ASN1_ex_new_func *asn1_ex_new;
-    ASN1_ex_free_func *asn1_ex_free;
-    ASN1_ex_free_func *asn1_ex_clear;
-    ASN1_ex_d2i *asn1_ex_d2i;
-    ASN1_ex_i2d *asn1_ex_i2d;
-    ASN1_ex_print_func *asn1_ex_print;
-} ASN1_EXTERN_FUNCS;
-
-typedef struct ASN1_PRIMITIVE_FUNCS_st {
-    void *app_data;
-    unsigned long flags;
-    ASN1_ex_new_func *prim_new;
-    ASN1_ex_free_func *prim_free;
-    ASN1_ex_free_func *prim_clear;
-    ASN1_primitive_c2i *prim_c2i;
-    ASN1_primitive_i2c *prim_i2c;
-    ASN1_primitive_print *prim_print;
-} ASN1_PRIMITIVE_FUNCS;
-
-/*
- * This is the ASN1_AUX structure: it handles various miscellaneous
- * requirements. For example the use of reference counts and an informational
- * callback. The "informational callback" is called at various points during
- * the ASN1 encoding and decoding. It can be used to provide minor
- * customisation of the structures used. This is most useful where the
- * supplied routines *almost* do the right thing but need some extra help at
- * a few points. If the callback returns zero then it is assumed a fatal
- * error has occurred and the main operation should be abandoned. If major
- * changes in the default behaviour are required then an external type is
- * more appropriate.
- */
-
-typedef int ASN1_aux_cb(int operation, ASN1_VALUE **in, const ASN1_ITEM *it,
-                        void *exarg);
-
-typedef struct ASN1_AUX_st {
-    void *app_data;
-    int flags;
-    int ref_offset;             /* Offset of reference value */
-    int ref_lock;               /* Lock type to use */
-    ASN1_aux_cb *asn1_cb;
-    int enc_offset;             /* Offset of ASN1_ENCODING structure */
-} ASN1_AUX;
-
-/* For print related callbacks exarg points to this structure */
-typedef struct ASN1_PRINT_ARG_st {
-    BIO *out;
-    int indent;
-    const ASN1_PCTX *pctx;
-} ASN1_PRINT_ARG;
-
-/* For streaming related callbacks exarg points to this structure */
-typedef struct ASN1_STREAM_ARG_st {
-    /* BIO to stream through */
-    BIO *out;
-    /* BIO with filters appended */
-    BIO *ndef_bio;
-    /* Streaming I/O boundary */
-    unsigned char **boundary;
-} ASN1_STREAM_ARG;
-
-/* Flags in ASN1_AUX */
-
-/* Use a reference count */
-# define ASN1_AFLG_REFCOUNT      1
-/* Save the encoding of structure (useful for signatures) */
-# define ASN1_AFLG_ENCODING      2
-/* The Sequence length is invalid */
-# define ASN1_AFLG_BROKEN        4
-
-/* operation values for asn1_cb */
-
-# define ASN1_OP_NEW_PRE         0
-# define ASN1_OP_NEW_POST        1
-# define ASN1_OP_FREE_PRE        2
-# define ASN1_OP_FREE_POST       3
-# define ASN1_OP_D2I_PRE         4
-# define ASN1_OP_D2I_POST        5
-# define ASN1_OP_I2D_PRE         6
-# define ASN1_OP_I2D_POST        7
-# define ASN1_OP_PRINT_PRE       8
-# define ASN1_OP_PRINT_POST      9
-# define ASN1_OP_STREAM_PRE      10
-# define ASN1_OP_STREAM_POST     11
-# define ASN1_OP_DETACHED_PRE    12
-# define ASN1_OP_DETACHED_POST   13
-
-/* Macro to implement a primitive type */
-# define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)
-# define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \
-                                ASN1_ITEM_start(itname) \
-                                        ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname \
-                                ASN1_ITEM_end(itname)
-
-/* Macro to implement a multi string type */
-# define IMPLEMENT_ASN1_MSTRING(itname, mask) \
-                                ASN1_ITEM_start(itname) \
-                                        ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \
-                                ASN1_ITEM_end(itname)
-
-/* Macro to implement an ASN1_ITEM in terms of old style funcs */
-
-# define IMPLEMENT_COMPAT_ASN1(sname) IMPLEMENT_COMPAT_ASN1_type(sname, V_ASN1_SEQUENCE)
-
-# define IMPLEMENT_COMPAT_ASN1_type(sname, tag) \
-        static const ASN1_COMPAT_FUNCS sname##_ff = { \
-                (ASN1_new_func *)sname##_new, \
-                (ASN1_free_func *)sname##_free, \
-                (ASN1_d2i_func *)d2i_##sname, \
-                (ASN1_i2d_func *)i2d_##sname, \
-        }; \
-        ASN1_ITEM_start(sname) \
-                ASN1_ITYPE_COMPAT, \
-                tag, \
-                NULL, \
-                0, \
-                &sname##_ff, \
-                0, \
-                #sname \
-        ASN1_ITEM_end(sname)
-
-# define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
-        ASN1_ITEM_start(sname) \
-                ASN1_ITYPE_EXTERN, \
-                tag, \
-                NULL, \
-                0, \
-                &fptrs, \
-                0, \
-                #sname \
-        ASN1_ITEM_end(sname)
-
-/* Macro to implement standard functions in terms of ASN1_ITEM structures */
-
-# define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname)
-
-# define IMPLEMENT_ASN1_FUNCTIONS_name(stname, itname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, itname)
-
-# define IMPLEMENT_ASN1_FUNCTIONS_ENCODE_name(stname, itname) \
-                        IMPLEMENT_ASN1_FUNCTIONS_ENCODE_fname(stname, itname, itname)
-
-# define IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(stname) \
-                IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(static, stname, stname, stname)
-
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS(stname) \
-                IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, stname, stname)
-
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(pre, stname, itname, fname) \
-        pre stname *fname##_new(void) \
-        { \
-                return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
-        } \
-        pre void fname##_free(stname *a) \
-        { \
-                ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
-        }
-
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \
-        stname *fname##_new(void) \
-        { \
-                return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
-        } \
-        void fname##_free(stname *a) \
-        { \
-                ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
-        }
-
-# define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
-
-# define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
-        stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
-        { \
-                return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
-        } \
-        int i2d_##fname(stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
-        }
-
-# define IMPLEMENT_ASN1_NDEF_FUNCTION(stname) \
-        int i2d_##stname##_NDEF(stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname));\
-        }
-
-/*
- * This includes evil casts to remove const: they will go away when full ASN1
- * constification is done.
- */
-# define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
-        stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
-        { \
-                return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
-        } \
-        int i2d_##fname(const stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
-        }
-
-# define IMPLEMENT_ASN1_DUP_FUNCTION(stname) \
-        stname * stname##_dup(stname *x) \
-        { \
-        return ASN1_item_dup(ASN1_ITEM_rptr(stname), x); \
-        }
-
-# define IMPLEMENT_ASN1_PRINT_FUNCTION(stname) \
-        IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, stname, stname)
-
-# define IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, itname, fname) \
-        int fname##_print_ctx(BIO *out, stname *x, int indent, \
-                                                const ASN1_PCTX *pctx) \
-        { \
-                return ASN1_item_print(out, (ASN1_VALUE *)x, indent, \
-                        ASN1_ITEM_rptr(itname), pctx); \
-        }
-
-# define IMPLEMENT_ASN1_FUNCTIONS_const(name) \
-                IMPLEMENT_ASN1_FUNCTIONS_const_fname(name, name, name)
-
-# define IMPLEMENT_ASN1_FUNCTIONS_const_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
-
-/* external definitions for primitive types */
-
-DECLARE_ASN1_ITEM(ASN1_BOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_TBOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_FBOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_SEQUENCE)
-DECLARE_ASN1_ITEM(CBIGNUM)
-DECLARE_ASN1_ITEM(BIGNUM)
-DECLARE_ASN1_ITEM(LONG)
-DECLARE_ASN1_ITEM(ZLONG)
-
-DECLARE_STACK_OF(ASN1_VALUE)
-
-/* Functions used internally by the ASN1 code */
-
-int ASN1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
-void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int ASN1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-int ASN1_template_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                      const ASN1_TEMPLATE *tt);
-int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                     const ASN1_ITEM *it, int tag, int aclass, char opt,
-                     ASN1_TLC *ctx);
-
-int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
-                     const ASN1_ITEM *it, int tag, int aclass);
-int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out,
-                      const ASN1_TEMPLATE *tt);
-void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
-                const ASN1_ITEM *it);
-int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                int utype, char *free_cont, const ASN1_ITEM *it);
-
-int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int asn1_set_choice_selector(ASN1_VALUE **pval, int value,
-                             const ASN1_ITEM *it);
-
-ASN1_VALUE **asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-
-const ASN1_TEMPLATE *asn1_do_adb(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
-                                 int nullerr);
-
-int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it);
-
-void asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it);
-void asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval,
-                     const ASN1_ITEM *it);
-int asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen,
-                  const ASN1_ITEM *it);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/bio.h b/openflow/usr/include/openssl/bio.h
deleted file mode 100644
index 6790aed..0000000
--- a/openflow/usr/include/openssl/bio.h
+++ /dev/null
@@ -1,883 +0,0 @@
-/* crypto/bio/bio.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BIO_H
-# define HEADER_BIO_H
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_FP_API
-#  include <stdio.h>
-# endif
-# include <stdarg.h>
-
-# include <openssl/crypto.h>
-
-# ifndef OPENSSL_NO_SCTP
-#  ifndef OPENSSL_SYS_VMS
-#   include <stdint.h>
-#  else
-#   include <inttypes.h>
-#  endif
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* These are the 'types' of BIOs */
-# define BIO_TYPE_NONE           0
-# define BIO_TYPE_MEM            (1|0x0400)
-# define BIO_TYPE_FILE           (2|0x0400)
-
-# define BIO_TYPE_FD             (4|0x0400|0x0100)
-# define BIO_TYPE_SOCKET         (5|0x0400|0x0100)
-# define BIO_TYPE_NULL           (6|0x0400)
-# define BIO_TYPE_SSL            (7|0x0200)
-# define BIO_TYPE_MD             (8|0x0200)/* passive filter */
-# define BIO_TYPE_BUFFER         (9|0x0200)/* filter */
-# define BIO_TYPE_CIPHER         (10|0x0200)/* filter */
-# define BIO_TYPE_BASE64         (11|0x0200)/* filter */
-# define BIO_TYPE_CONNECT        (12|0x0400|0x0100)/* socket - connect */
-# define BIO_TYPE_ACCEPT         (13|0x0400|0x0100)/* socket for accept */
-# define BIO_TYPE_PROXY_CLIENT   (14|0x0200)/* client proxy BIO */
-# define BIO_TYPE_PROXY_SERVER   (15|0x0200)/* server proxy BIO */
-# define BIO_TYPE_NBIO_TEST      (16|0x0200)/* server proxy BIO */
-# define BIO_TYPE_NULL_FILTER    (17|0x0200)
-# define BIO_TYPE_BER            (18|0x0200)/* BER -> bin filter */
-# define BIO_TYPE_BIO            (19|0x0400)/* (half a) BIO pair */
-# define BIO_TYPE_LINEBUFFER     (20|0x0200)/* filter */
-# define BIO_TYPE_DGRAM          (21|0x0400|0x0100)
-# ifndef OPENSSL_NO_SCTP
-#  define BIO_TYPE_DGRAM_SCTP     (24|0x0400|0x0100)
-# endif
-# define BIO_TYPE_ASN1           (22|0x0200)/* filter */
-# define BIO_TYPE_COMP           (23|0x0200)/* filter */
-
-# define BIO_TYPE_DESCRIPTOR     0x0100/* socket, fd, connect or accept */
-# define BIO_TYPE_FILTER         0x0200
-# define BIO_TYPE_SOURCE_SINK    0x0400
-
-/*
- * BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
- * BIO_set_fp(in,stdin,BIO_NOCLOSE);
- */
-# define BIO_NOCLOSE             0x00
-# define BIO_CLOSE               0x01
-
-/*
- * These are used in the following macros and are passed to BIO_ctrl()
- */
-# define BIO_CTRL_RESET          1/* opt - rewind/zero etc */
-# define BIO_CTRL_EOF            2/* opt - are we at the eof */
-# define BIO_CTRL_INFO           3/* opt - extra tit-bits */
-# define BIO_CTRL_SET            4/* man - set the 'IO' type */
-# define BIO_CTRL_GET            5/* man - get the 'IO' type */
-# define BIO_CTRL_PUSH           6/* opt - internal, used to signify change */
-# define BIO_CTRL_POP            7/* opt - internal, used to signify change */
-# define BIO_CTRL_GET_CLOSE      8/* man - set the 'close' on free */
-# define BIO_CTRL_SET_CLOSE      9/* man - set the 'close' on free */
-# define BIO_CTRL_PENDING        10/* opt - is their more data buffered */
-# define BIO_CTRL_FLUSH          11/* opt - 'flush' buffered output */
-# define BIO_CTRL_DUP            12/* man - extra stuff for 'duped' BIO */
-# define BIO_CTRL_WPENDING       13/* opt - number of bytes still to write */
-/* callback is int cb(BIO *bio,state,ret); */
-# define BIO_CTRL_SET_CALLBACK   14/* opt - set callback function */
-# define BIO_CTRL_GET_CALLBACK   15/* opt - set callback function */
-
-# define BIO_CTRL_SET_FILENAME   30/* BIO_s_file special */
-
-/* dgram BIO stuff */
-# define BIO_CTRL_DGRAM_CONNECT       31/* BIO dgram special */
-# define BIO_CTRL_DGRAM_SET_CONNECTED 32/* allow for an externally connected
-                                         * socket to be passed in */
-# define BIO_CTRL_DGRAM_SET_RECV_TIMEOUT 33/* setsockopt, essentially */
-# define BIO_CTRL_DGRAM_GET_RECV_TIMEOUT 34/* getsockopt, essentially */
-# define BIO_CTRL_DGRAM_SET_SEND_TIMEOUT 35/* setsockopt, essentially */
-# define BIO_CTRL_DGRAM_GET_SEND_TIMEOUT 36/* getsockopt, essentially */
-
-# define BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP 37/* flag whether the last */
-# define BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP 38/* I/O operation tiemd out */
-
-/* #ifdef IP_MTU_DISCOVER */
-# define BIO_CTRL_DGRAM_MTU_DISCOVER       39/* set DF bit on egress packets */
-/* #endif */
-
-# define BIO_CTRL_DGRAM_QUERY_MTU          40/* as kernel for current MTU */
-# define BIO_CTRL_DGRAM_GET_FALLBACK_MTU   47
-# define BIO_CTRL_DGRAM_GET_MTU            41/* get cached value for MTU */
-# define BIO_CTRL_DGRAM_SET_MTU            42/* set cached value for MTU.
-                                              * want to use this if asking
-                                              * the kernel fails */
-
-# define BIO_CTRL_DGRAM_MTU_EXCEEDED       43/* check whether the MTU was
-                                              * exceed in the previous write
-                                              * operation */
-
-# define BIO_CTRL_DGRAM_GET_PEER           46
-# define BIO_CTRL_DGRAM_SET_PEER           44/* Destination for the data */
-
-# define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT   45/* Next DTLS handshake timeout
-                                              * to adjust socket timeouts */
-# define BIO_CTRL_DGRAM_SET_DONT_FRAG      48
-
-# define BIO_CTRL_DGRAM_GET_MTU_OVERHEAD   49
-
-# ifndef OPENSSL_NO_SCTP
-/* SCTP stuff */
-#  define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE    50
-#  define BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY                51
-#  define BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY               52
-#  define BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD               53
-#  define BIO_CTRL_DGRAM_SCTP_GET_SNDINFO         60
-#  define BIO_CTRL_DGRAM_SCTP_SET_SNDINFO         61
-#  define BIO_CTRL_DGRAM_SCTP_GET_RCVINFO         62
-#  define BIO_CTRL_DGRAM_SCTP_SET_RCVINFO         63
-#  define BIO_CTRL_DGRAM_SCTP_GET_PRINFO                  64
-#  define BIO_CTRL_DGRAM_SCTP_SET_PRINFO                  65
-#  define BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN               70
-# endif
-
-/* modifiers */
-# define BIO_FP_READ             0x02
-# define BIO_FP_WRITE            0x04
-# define BIO_FP_APPEND           0x08
-# define BIO_FP_TEXT             0x10
-
-# define BIO_FLAGS_READ          0x01
-# define BIO_FLAGS_WRITE         0x02
-# define BIO_FLAGS_IO_SPECIAL    0x04
-# define BIO_FLAGS_RWS (BIO_FLAGS_READ|BIO_FLAGS_WRITE|BIO_FLAGS_IO_SPECIAL)
-# define BIO_FLAGS_SHOULD_RETRY  0x08
-# ifndef BIO_FLAGS_UPLINK
-/*
- * "UPLINK" flag denotes file descriptors provided by application. It
- * defaults to 0, as most platforms don't require UPLINK interface.
- */
-#  define BIO_FLAGS_UPLINK        0
-# endif
-
-/* Used in BIO_gethostbyname() */
-# define BIO_GHBN_CTRL_HITS              1
-# define BIO_GHBN_CTRL_MISSES            2
-# define BIO_GHBN_CTRL_CACHE_SIZE        3
-# define BIO_GHBN_CTRL_GET_ENTRY         4
-# define BIO_GHBN_CTRL_FLUSH             5
-
-/* Mostly used in the SSL BIO */
-/*-
- * Not used anymore
- * #define BIO_FLAGS_PROTOCOL_DELAYED_READ 0x10
- * #define BIO_FLAGS_PROTOCOL_DELAYED_WRITE 0x20
- * #define BIO_FLAGS_PROTOCOL_STARTUP   0x40
- */
-
-# define BIO_FLAGS_BASE64_NO_NL  0x100
-
-/*
- * This is used with memory BIOs: it means we shouldn't free up or change the
- * data in any way.
- */
-# define BIO_FLAGS_MEM_RDONLY    0x200
-
-typedef struct bio_st BIO;
-
-void BIO_set_flags(BIO *b, int flags);
-int BIO_test_flags(const BIO *b, int flags);
-void BIO_clear_flags(BIO *b, int flags);
-
-# define BIO_get_flags(b) BIO_test_flags(b, ~(0x0))
-# define BIO_set_retry_special(b) \
-                BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_set_retry_read(b) \
-                BIO_set_flags(b, (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_set_retry_write(b) \
-                BIO_set_flags(b, (BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
-
-/* These are normally used internally in BIOs */
-# define BIO_clear_retry_flags(b) \
-                BIO_clear_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_get_retry_flags(b) \
-                BIO_test_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-
-/* These should be used by the application to tell why we should retry */
-# define BIO_should_read(a)              BIO_test_flags(a, BIO_FLAGS_READ)
-# define BIO_should_write(a)             BIO_test_flags(a, BIO_FLAGS_WRITE)
-# define BIO_should_io_special(a)        BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL)
-# define BIO_retry_type(a)               BIO_test_flags(a, BIO_FLAGS_RWS)
-# define BIO_should_retry(a)             BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY)
-
-/*
- * The next three are used in conjunction with the BIO_should_io_special()
- * condition.  After this returns true, BIO *BIO_get_retry_BIO(BIO *bio, int
- * *reason); will walk the BIO stack and return the 'reason' for the special
- * and the offending BIO. Given a BIO, BIO_get_retry_reason(bio) will return
- * the code.
- */
-/*
- * Returned from the SSL bio when the certificate retrieval code had an error
- */
-# define BIO_RR_SSL_X509_LOOKUP          0x01
-/* Returned from the connect BIO when a connect would have blocked */
-# define BIO_RR_CONNECT                  0x02
-/* Returned from the accept BIO when an accept would have blocked */
-# define BIO_RR_ACCEPT                   0x03
-
-/* These are passed by the BIO callback */
-# define BIO_CB_FREE     0x01
-# define BIO_CB_READ     0x02
-# define BIO_CB_WRITE    0x03
-# define BIO_CB_PUTS     0x04
-# define BIO_CB_GETS     0x05
-# define BIO_CB_CTRL     0x06
-
-/*
- * The callback is called before and after the underling operation, The
- * BIO_CB_RETURN flag indicates if it is after the call
- */
-# define BIO_CB_RETURN   0x80
-# define BIO_CB_return(a) ((a)|BIO_CB_RETURN)
-# define BIO_cb_pre(a)   (!((a)&BIO_CB_RETURN))
-# define BIO_cb_post(a)  ((a)&BIO_CB_RETURN)
-
-long (*BIO_get_callback(const BIO *b)) (struct bio_st *, int, const char *,
-                                        int, long, long);
-void BIO_set_callback(BIO *b,
-                      long (*callback) (struct bio_st *, int, const char *,
-                                        int, long, long));
-char *BIO_get_callback_arg(const BIO *b);
-void BIO_set_callback_arg(BIO *b, char *arg);
-
-const char *BIO_method_name(const BIO *b);
-int BIO_method_type(const BIO *b);
-
-typedef void bio_info_cb (struct bio_st *, int, const char *, int, long,
-                          long);
-
-typedef struct bio_method_st {
-    int type;
-    const char *name;
-    int (*bwrite) (BIO *, const char *, int);
-    int (*bread) (BIO *, char *, int);
-    int (*bputs) (BIO *, const char *);
-    int (*bgets) (BIO *, char *, int);
-    long (*ctrl) (BIO *, int, long, void *);
-    int (*create) (BIO *);
-    int (*destroy) (BIO *);
-    long (*callback_ctrl) (BIO *, int, bio_info_cb *);
-} BIO_METHOD;
-
-struct bio_st {
-    BIO_METHOD *method;
-    /* bio, mode, argp, argi, argl, ret */
-    long (*callback) (struct bio_st *, int, const char *, int, long, long);
-    char *cb_arg;               /* first argument for the callback */
-    int init;
-    int shutdown;
-    int flags;                  /* extra storage */
-    int retry_reason;
-    int num;
-    void *ptr;
-    struct bio_st *next_bio;    /* used by filter BIOs */
-    struct bio_st *prev_bio;    /* used by filter BIOs */
-    int references;
-    unsigned long num_read;
-    unsigned long num_write;
-    CRYPTO_EX_DATA ex_data;
-};
-
-DECLARE_STACK_OF(BIO)
-
-typedef struct bio_f_buffer_ctx_struct {
-    /*-
-     * Buffers are setup like this:
-     *
-     * <---------------------- size ----------------------->
-     * +---------------------------------------------------+
-     * | consumed | remaining          | free space        |
-     * +---------------------------------------------------+
-     * <-- off --><------- len ------->
-     */
-    /*- BIO *bio; *//*
-     * this is now in the BIO struct
-     */
-    int ibuf_size;              /* how big is the input buffer */
-    int obuf_size;              /* how big is the output buffer */
-    char *ibuf;                 /* the char array */
-    int ibuf_len;               /* how many bytes are in it */
-    int ibuf_off;               /* write/read offset */
-    char *obuf;                 /* the char array */
-    int obuf_len;               /* how many bytes are in it */
-    int obuf_off;               /* write/read offset */
-} BIO_F_BUFFER_CTX;
-
-/* Prefix and suffix callback in ASN1 BIO */
-typedef int asn1_ps_func (BIO *b, unsigned char **pbuf, int *plen,
-                          void *parg);
-
-# ifndef OPENSSL_NO_SCTP
-/* SCTP parameter structs */
-struct bio_dgram_sctp_sndinfo {
-    uint16_t snd_sid;
-    uint16_t snd_flags;
-    uint32_t snd_ppid;
-    uint32_t snd_context;
-};
-
-struct bio_dgram_sctp_rcvinfo {
-    uint16_t rcv_sid;
-    uint16_t rcv_ssn;
-    uint16_t rcv_flags;
-    uint32_t rcv_ppid;
-    uint32_t rcv_tsn;
-    uint32_t rcv_cumtsn;
-    uint32_t rcv_context;
-};
-
-struct bio_dgram_sctp_prinfo {
-    uint16_t pr_policy;
-    uint32_t pr_value;
-};
-# endif
-
-/* connect BIO stuff */
-# define BIO_CONN_S_BEFORE               1
-# define BIO_CONN_S_GET_IP               2
-# define BIO_CONN_S_GET_PORT             3
-# define BIO_CONN_S_CREATE_SOCKET        4
-# define BIO_CONN_S_CONNECT              5
-# define BIO_CONN_S_OK                   6
-# define BIO_CONN_S_BLOCKED_CONNECT      7
-# define BIO_CONN_S_NBIO                 8
-/*
- * #define BIO_CONN_get_param_hostname BIO_ctrl
- */
-
-# define BIO_C_SET_CONNECT                       100
-# define BIO_C_DO_STATE_MACHINE                  101
-# define BIO_C_SET_NBIO                          102
-# define BIO_C_SET_PROXY_PARAM                   103
-# define BIO_C_SET_FD                            104
-# define BIO_C_GET_FD                            105
-# define BIO_C_SET_FILE_PTR                      106
-# define BIO_C_GET_FILE_PTR                      107
-# define BIO_C_SET_FILENAME                      108
-# define BIO_C_SET_SSL                           109
-# define BIO_C_GET_SSL                           110
-# define BIO_C_SET_MD                            111
-# define BIO_C_GET_MD                            112
-# define BIO_C_GET_CIPHER_STATUS                 113
-# define BIO_C_SET_BUF_MEM                       114
-# define BIO_C_GET_BUF_MEM_PTR                   115
-# define BIO_C_GET_BUFF_NUM_LINES                116
-# define BIO_C_SET_BUFF_SIZE                     117
-# define BIO_C_SET_ACCEPT                        118
-# define BIO_C_SSL_MODE                          119
-# define BIO_C_GET_MD_CTX                        120
-# define BIO_C_GET_PROXY_PARAM                   121
-# define BIO_C_SET_BUFF_READ_DATA                122/* data to read first */
-# define BIO_C_GET_CONNECT                       123
-# define BIO_C_GET_ACCEPT                        124
-# define BIO_C_SET_SSL_RENEGOTIATE_BYTES         125
-# define BIO_C_GET_SSL_NUM_RENEGOTIATES          126
-# define BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT       127
-# define BIO_C_FILE_SEEK                         128
-# define BIO_C_GET_CIPHER_CTX                    129
-# define BIO_C_SET_BUF_MEM_EOF_RETURN            130/* return end of input
-                                                     * value */
-# define BIO_C_SET_BIND_MODE                     131
-# define BIO_C_GET_BIND_MODE                     132
-# define BIO_C_FILE_TELL                         133
-# define BIO_C_GET_SOCKS                         134
-# define BIO_C_SET_SOCKS                         135
-
-# define BIO_C_SET_WRITE_BUF_SIZE                136/* for BIO_s_bio */
-# define BIO_C_GET_WRITE_BUF_SIZE                137
-# define BIO_C_MAKE_BIO_PAIR                     138
-# define BIO_C_DESTROY_BIO_PAIR                  139
-# define BIO_C_GET_WRITE_GUARANTEE               140
-# define BIO_C_GET_READ_REQUEST                  141
-# define BIO_C_SHUTDOWN_WR                       142
-# define BIO_C_NREAD0                            143
-# define BIO_C_NREAD                             144
-# define BIO_C_NWRITE0                           145
-# define BIO_C_NWRITE                            146
-# define BIO_C_RESET_READ_REQUEST                147
-# define BIO_C_SET_MD_CTX                        148
-
-# define BIO_C_SET_PREFIX                        149
-# define BIO_C_GET_PREFIX                        150
-# define BIO_C_SET_SUFFIX                        151
-# define BIO_C_GET_SUFFIX                        152
-
-# define BIO_C_SET_EX_ARG                        153
-# define BIO_C_GET_EX_ARG                        154
-
-# define BIO_set_app_data(s,arg)         BIO_set_ex_data(s,0,arg)
-# define BIO_get_app_data(s)             BIO_get_ex_data(s,0)
-
-/* BIO_s_connect() and BIO_s_socks4a_connect() */
-# define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name)
-# define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
-# define BIO_set_conn_ip(b,ip)     BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)ip)
-# define BIO_set_conn_int_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,3,(char *)port)
-# define BIO_get_conn_hostname(b)  BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)
-# define BIO_get_conn_port(b)      BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)
-# define BIO_get_conn_ip(b)               BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)
-# define BIO_get_conn_int_port(b) BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)
-
-# define BIO_set_nbio(b,n)       BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
-
-/* BIO_s_accept() */
-# define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
-# define BIO_get_accept_port(b)  BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)
-/* #define BIO_set_nbio(b,n)    BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
-# define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(n)?(void *)"a":NULL)
-# define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(char *)bio)
-
-# define BIO_BIND_NORMAL                 0
-# define BIO_BIND_REUSEADDR_IF_UNUSED    1
-# define BIO_BIND_REUSEADDR              2
-# define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
-# define BIO_get_bind_mode(b,mode) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
-
-/* BIO_s_accept() and BIO_s_connect() */
-# define BIO_do_connect(b)       BIO_do_handshake(b)
-# define BIO_do_accept(b)        BIO_do_handshake(b)
-# define BIO_do_handshake(b)     BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
-
-/* BIO_s_proxy_client() */
-# define BIO_set_url(b,url)      BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,0,(char *)(url))
-# define BIO_set_proxies(b,p)    BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,1,(char *)(p))
-/* BIO_set_nbio(b,n) */
-# define BIO_set_filter_bio(b,s) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,2,(char *)(s))
-/* BIO *BIO_get_filter_bio(BIO *bio); */
-# define BIO_set_proxy_cb(b,cb) BIO_callback_ctrl(b,BIO_C_SET_PROXY_PARAM,3,(void *(*cb)()))
-# define BIO_set_proxy_header(b,sk) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,4,(char *)sk)
-# define BIO_set_no_connect_return(b,bool) BIO_int_ctrl(b,BIO_C_SET_PROXY_PARAM,5,bool)
-
-# define BIO_get_proxy_header(b,skp) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,0,(char *)skp)
-# define BIO_get_proxies(b,pxy_p) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,1,(char *)(pxy_p))
-# define BIO_get_url(b,url)      BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char *)(url))
-# define BIO_get_no_connect_return(b)    BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL)
-
-/* BIO_s_datagram(), BIO_s_fd(), BIO_s_socket(), BIO_s_accept() and BIO_s_connect() */
-# define BIO_set_fd(b,fd,c)      BIO_int_ctrl(b,BIO_C_SET_FD,c,fd)
-# define BIO_get_fd(b,c)         BIO_ctrl(b,BIO_C_GET_FD,0,(char *)c)
-
-/* BIO_s_file() */
-# define BIO_set_fp(b,fp,c)      BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
-# define BIO_get_fp(b,fpp)       BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
-
-/* BIO_s_fd() and BIO_s_file() */
-# define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
-# define BIO_tell(b)     (int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)
-
-/*
- * name is cast to lose const, but might be better to route through a
- * function so we can do it safely
- */
-# ifdef CONST_STRICT
-/*
- * If you are wondering why this isn't defined, its because CONST_STRICT is
- * purely a compile-time kludge to allow const to be checked.
- */
-int BIO_read_filename(BIO *b, const char *name);
-# else
-#  define BIO_read_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_READ,(char *)name)
-# endif
-# define BIO_write_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_WRITE,name)
-# define BIO_append_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_APPEND,name)
-# define BIO_rw_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_READ|BIO_FP_WRITE,name)
-
-/*
- * WARNING WARNING, this ups the reference count on the read bio of the SSL
- * structure.  This is because the ssl read BIO is now pointed to by the
- * next_bio field in the bio.  So when you free the BIO, make sure you are
- * doing a BIO_free_all() to catch the underlying BIO.
- */
-# define BIO_set_ssl(b,ssl,c)    BIO_ctrl(b,BIO_C_SET_SSL,c,(char *)ssl)
-# define BIO_get_ssl(b,sslp)     BIO_ctrl(b,BIO_C_GET_SSL,0,(char *)sslp)
-# define BIO_set_ssl_mode(b,client)      BIO_ctrl(b,BIO_C_SSL_MODE,client,NULL)
-# define BIO_set_ssl_renegotiate_bytes(b,num) \
-        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_BYTES,num,NULL);
-# define BIO_get_num_renegotiates(b) \
-        BIO_ctrl(b,BIO_C_GET_SSL_NUM_RENEGOTIATES,0,NULL);
-# define BIO_set_ssl_renegotiate_timeout(b,seconds) \
-        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT,seconds,NULL);
-
-/* defined in evp.h */
-/* #define BIO_set_md(b,md)     BIO_ctrl(b,BIO_C_SET_MD,1,(char *)md) */
-
-# define BIO_get_mem_data(b,pp)  BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
-# define BIO_set_mem_buf(b,bm,c) BIO_ctrl(b,BIO_C_SET_BUF_MEM,c,(char *)bm)
-# define BIO_get_mem_ptr(b,pp)   BIO_ctrl(b,BIO_C_GET_BUF_MEM_PTR,0,(char *)pp)
-# define BIO_set_mem_eof_return(b,v) \
-                                BIO_ctrl(b,BIO_C_SET_BUF_MEM_EOF_RETURN,v,NULL)
-
-/* For the BIO_f_buffer() type */
-# define BIO_get_buffer_num_lines(b)     BIO_ctrl(b,BIO_C_GET_BUFF_NUM_LINES,0,NULL)
-# define BIO_set_buffer_size(b,size)     BIO_ctrl(b,BIO_C_SET_BUFF_SIZE,size,NULL)
-# define BIO_set_read_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,0)
-# define BIO_set_write_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,1)
-# define BIO_set_buffer_read_data(b,buf,num) BIO_ctrl(b,BIO_C_SET_BUFF_READ_DATA,num,buf)
-
-/* Don't use the next one unless you know what you are doing :-) */
-# define BIO_dup_state(b,ret)    BIO_ctrl(b,BIO_CTRL_DUP,0,(char *)(ret))
-
-# define BIO_reset(b)            (int)BIO_ctrl(b,BIO_CTRL_RESET,0,NULL)
-# define BIO_eof(b)              (int)BIO_ctrl(b,BIO_CTRL_EOF,0,NULL)
-# define BIO_set_close(b,c)      (int)BIO_ctrl(b,BIO_CTRL_SET_CLOSE,(c),NULL)
-# define BIO_get_close(b)        (int)BIO_ctrl(b,BIO_CTRL_GET_CLOSE,0,NULL)
-# define BIO_pending(b)          (int)BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
-# define BIO_wpending(b)         (int)BIO_ctrl(b,BIO_CTRL_WPENDING,0,NULL)
-/* ...pending macros have inappropriate return type */
-size_t BIO_ctrl_pending(BIO *b);
-size_t BIO_ctrl_wpending(BIO *b);
-# define BIO_flush(b)            (int)BIO_ctrl(b,BIO_CTRL_FLUSH,0,NULL)
-# define BIO_get_info_callback(b,cbp) (int)BIO_ctrl(b,BIO_CTRL_GET_CALLBACK,0, \
-                                                   cbp)
-# define BIO_set_info_callback(b,cb) (int)BIO_callback_ctrl(b,BIO_CTRL_SET_CALLBACK,cb)
-
-/* For the BIO_f_buffer() type */
-# define BIO_buffer_get_num_lines(b) BIO_ctrl(b,BIO_CTRL_GET,0,NULL)
-
-/* For BIO_s_bio() */
-# define BIO_set_write_buf_size(b,size) (int)BIO_ctrl(b,BIO_C_SET_WRITE_BUF_SIZE,size,NULL)
-# define BIO_get_write_buf_size(b,size) (size_t)BIO_ctrl(b,BIO_C_GET_WRITE_BUF_SIZE,size,NULL)
-# define BIO_make_bio_pair(b1,b2)   (int)BIO_ctrl(b1,BIO_C_MAKE_BIO_PAIR,0,b2)
-# define BIO_destroy_bio_pair(b)    (int)BIO_ctrl(b,BIO_C_DESTROY_BIO_PAIR,0,NULL)
-# define BIO_shutdown_wr(b) (int)BIO_ctrl(b, BIO_C_SHUTDOWN_WR, 0, NULL)
-/* macros with inappropriate type -- but ...pending macros use int too: */
-# define BIO_get_write_guarantee(b) (int)BIO_ctrl(b,BIO_C_GET_WRITE_GUARANTEE,0,NULL)
-# define BIO_get_read_request(b)    (int)BIO_ctrl(b,BIO_C_GET_READ_REQUEST,0,NULL)
-size_t BIO_ctrl_get_write_guarantee(BIO *b);
-size_t BIO_ctrl_get_read_request(BIO *b);
-int BIO_ctrl_reset_read_request(BIO *b);
-
-/* ctrl macros for dgram */
-# define BIO_ctrl_dgram_connect(b,peer)  \
-                     (int)BIO_ctrl(b,BIO_CTRL_DGRAM_CONNECT,0, (char *)peer)
-# define BIO_ctrl_set_connected(b, state, peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_CONNECTED, state, (char *)peer)
-# define BIO_dgram_recv_timedout(b) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP, 0, NULL)
-# define BIO_dgram_send_timedout(b) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP, 0, NULL)
-# define BIO_dgram_get_peer(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_PEER, 0, (char *)peer)
-# define BIO_dgram_set_peer(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, (char *)peer)
-# define BIO_dgram_get_mtu_overhead(b) \
-         (unsigned int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_MTU_OVERHEAD, 0, NULL)
-
-/* These two aren't currently implemented */
-/* int BIO_get_ex_num(BIO *bio); */
-/* void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)()); */
-int BIO_set_ex_data(BIO *bio, int idx, void *data);
-void *BIO_get_ex_data(BIO *bio, int idx);
-int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                         CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-unsigned long BIO_number_read(BIO *bio);
-unsigned long BIO_number_written(BIO *bio);
-
-/* For BIO_f_asn1() */
-int BIO_asn1_set_prefix(BIO *b, asn1_ps_func *prefix,
-                        asn1_ps_func *prefix_free);
-int BIO_asn1_get_prefix(BIO *b, asn1_ps_func **pprefix,
-                        asn1_ps_func **pprefix_free);
-int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,
-                        asn1_ps_func *suffix_free);
-int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
-                        asn1_ps_func **psuffix_free);
-
-# ifndef OPENSSL_NO_FP_API
-BIO_METHOD *BIO_s_file(void);
-BIO *BIO_new_file(const char *filename, const char *mode);
-BIO *BIO_new_fp(FILE *stream, int close_flag);
-#  define BIO_s_file_internal    BIO_s_file
-# endif
-BIO *BIO_new(BIO_METHOD *type);
-int BIO_set(BIO *a, BIO_METHOD *type);
-int BIO_free(BIO *a);
-void BIO_vfree(BIO *a);
-int BIO_read(BIO *b, void *data, int len);
-int BIO_gets(BIO *bp, char *buf, int size);
-int BIO_write(BIO *b, const void *data, int len);
-int BIO_puts(BIO *bp, const char *buf);
-int BIO_indent(BIO *b, int indent, int max);
-long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg);
-long BIO_callback_ctrl(BIO *b, int cmd,
-                       void (*fp) (struct bio_st *, int, const char *, int,
-                                   long, long));
-char *BIO_ptr_ctrl(BIO *bp, int cmd, long larg);
-long BIO_int_ctrl(BIO *bp, int cmd, long larg, int iarg);
-BIO *BIO_push(BIO *b, BIO *append);
-BIO *BIO_pop(BIO *b);
-void BIO_free_all(BIO *a);
-BIO *BIO_find_type(BIO *b, int bio_type);
-BIO *BIO_next(BIO *b);
-BIO *BIO_get_retry_BIO(BIO *bio, int *reason);
-int BIO_get_retry_reason(BIO *bio);
-BIO *BIO_dup_chain(BIO *in);
-
-int BIO_nread0(BIO *bio, char **buf);
-int BIO_nread(BIO *bio, char **buf, int num);
-int BIO_nwrite0(BIO *bio, char **buf);
-int BIO_nwrite(BIO *bio, char **buf, int num);
-
-long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi,
-                        long argl, long ret);
-
-BIO_METHOD *BIO_s_mem(void);
-BIO *BIO_new_mem_buf(const void *buf, int len);
-BIO_METHOD *BIO_s_socket(void);
-BIO_METHOD *BIO_s_connect(void);
-BIO_METHOD *BIO_s_accept(void);
-BIO_METHOD *BIO_s_fd(void);
-# ifndef OPENSSL_SYS_OS2
-BIO_METHOD *BIO_s_log(void);
-# endif
-BIO_METHOD *BIO_s_bio(void);
-BIO_METHOD *BIO_s_null(void);
-BIO_METHOD *BIO_f_null(void);
-BIO_METHOD *BIO_f_buffer(void);
-# ifdef OPENSSL_SYS_VMS
-BIO_METHOD *BIO_f_linebuffer(void);
-# endif
-BIO_METHOD *BIO_f_nbio_test(void);
-# ifndef OPENSSL_NO_DGRAM
-BIO_METHOD *BIO_s_datagram(void);
-#  ifndef OPENSSL_NO_SCTP
-BIO_METHOD *BIO_s_datagram_sctp(void);
-#  endif
-# endif
-
-/* BIO_METHOD *BIO_f_ber(void); */
-
-int BIO_sock_should_retry(int i);
-int BIO_sock_non_fatal_error(int error);
-int BIO_dgram_non_fatal_error(int error);
-
-int BIO_fd_should_retry(int i);
-int BIO_fd_non_fatal_error(int error);
-int BIO_dump_cb(int (*cb) (const void *data, size_t len, void *u),
-                void *u, const char *s, int len);
-int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
-                       void *u, const char *s, int len, int indent);
-int BIO_dump(BIO *b, const char *bytes, int len);
-int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent);
-# ifndef OPENSSL_NO_FP_API
-int BIO_dump_fp(FILE *fp, const char *s, int len);
-int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);
-# endif
-int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,
-                   int datalen);
-
-struct hostent *BIO_gethostbyname(const char *name);
-/*-
- * We might want a thread-safe interface too:
- * struct hostent *BIO_gethostbyname_r(const char *name,
- *     struct hostent *result, void *buffer, size_t buflen);
- * or something similar (caller allocates a struct hostent,
- * pointed to by "result", and additional buffer space for the various
- * substructures; if the buffer does not suffice, NULL is returned
- * and an appropriate error code is set).
- */
-int BIO_sock_error(int sock);
-int BIO_socket_ioctl(int fd, long type, void *arg);
-int BIO_socket_nbio(int fd, int mode);
-int BIO_get_port(const char *str, unsigned short *port_ptr);
-int BIO_get_host_ip(const char *str, unsigned char *ip);
-int BIO_get_accept_socket(char *host_port, int mode);
-int BIO_accept(int sock, char **ip_port);
-int BIO_sock_init(void);
-void BIO_sock_cleanup(void);
-int BIO_set_tcp_ndelay(int sock, int turn_on);
-
-BIO *BIO_new_socket(int sock, int close_flag);
-BIO *BIO_new_dgram(int fd, int close_flag);
-# ifndef OPENSSL_NO_SCTP
-BIO *BIO_new_dgram_sctp(int fd, int close_flag);
-int BIO_dgram_is_sctp(BIO *bio);
-int BIO_dgram_sctp_notification_cb(BIO *b,
-                                   void (*handle_notifications) (BIO *bio,
-                                                                 void
-                                                                 *context,
-                                                                 void *buf),
-                                   void *context);
-int BIO_dgram_sctp_wait_for_dry(BIO *b);
-int BIO_dgram_sctp_msg_waiting(BIO *b);
-# endif
-BIO *BIO_new_fd(int fd, int close_flag);
-BIO *BIO_new_connect(const char *host_port);
-BIO *BIO_new_accept(const char *host_port);
-
-int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
-                     BIO **bio2, size_t writebuf2);
-/*
- * If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints.
- * Otherwise returns 0 and sets *bio1 and *bio2 to NULL. Size 0 uses default
- * value.
- */
-
-void BIO_copy_next_retry(BIO *b);
-
-/*
- * long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);
- */
-
-# ifdef __GNUC__
-#  define __bio_h__attr__ __attribute__
-# else
-#  define __bio_h__attr__(x)
-# endif
-int BIO_printf(BIO *bio, const char *format, ...)
-__bio_h__attr__((__format__(__printf__, 2, 3)));
-int BIO_vprintf(BIO *bio, const char *format, va_list args)
-__bio_h__attr__((__format__(__printf__, 2, 0)));
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)
-__bio_h__attr__((__format__(__printf__, 3, 4)));
-int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
-__bio_h__attr__((__format__(__printf__, 3, 0)));
-# undef __bio_h__attr__
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_BIO_strings(void);
-
-/* Error codes for the BIO functions. */
-
-/* Function codes. */
-# define BIO_F_ACPT_STATE                                 100
-# define BIO_F_BIO_ACCEPT                                 101
-# define BIO_F_BIO_BER_GET_HEADER                         102
-# define BIO_F_BIO_CALLBACK_CTRL                          131
-# define BIO_F_BIO_CTRL                                   103
-# define BIO_F_BIO_GETHOSTBYNAME                          120
-# define BIO_F_BIO_GETS                                   104
-# define BIO_F_BIO_GET_ACCEPT_SOCKET                      105
-# define BIO_F_BIO_GET_HOST_IP                            106
-# define BIO_F_BIO_GET_PORT                               107
-# define BIO_F_BIO_MAKE_PAIR                              121
-# define BIO_F_BIO_NEW                                    108
-# define BIO_F_BIO_NEW_FILE                               109
-# define BIO_F_BIO_NEW_MEM_BUF                            126
-# define BIO_F_BIO_NREAD                                  123
-# define BIO_F_BIO_NREAD0                                 124
-# define BIO_F_BIO_NWRITE                                 125
-# define BIO_F_BIO_NWRITE0                                122
-# define BIO_F_BIO_PUTS                                   110
-# define BIO_F_BIO_READ                                   111
-# define BIO_F_BIO_SOCK_INIT                              112
-# define BIO_F_BIO_WRITE                                  113
-# define BIO_F_BUFFER_CTRL                                114
-# define BIO_F_CONN_CTRL                                  127
-# define BIO_F_CONN_STATE                                 115
-# define BIO_F_DGRAM_SCTP_READ                            132
-# define BIO_F_DGRAM_SCTP_WRITE                           133
-# define BIO_F_FILE_CTRL                                  116
-# define BIO_F_FILE_READ                                  130
-# define BIO_F_LINEBUFFER_CTRL                            129
-# define BIO_F_MEM_READ                                   128
-# define BIO_F_MEM_WRITE                                  117
-# define BIO_F_SSL_NEW                                    118
-# define BIO_F_WSASTARTUP                                 119
-
-/* Reason codes. */
-# define BIO_R_ACCEPT_ERROR                               100
-# define BIO_R_BAD_FOPEN_MODE                             101
-# define BIO_R_BAD_HOSTNAME_LOOKUP                        102
-# define BIO_R_BROKEN_PIPE                                124
-# define BIO_R_CONNECT_ERROR                              103
-# define BIO_R_EOF_ON_MEMORY_BIO                          127
-# define BIO_R_ERROR_SETTING_NBIO                         104
-# define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET      105
-# define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET        106
-# define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET          107
-# define BIO_R_INVALID_ARGUMENT                           125
-# define BIO_R_INVALID_IP_ADDRESS                         108
-# define BIO_R_IN_USE                                     123
-# define BIO_R_KEEPALIVE                                  109
-# define BIO_R_NBIO_CONNECT_ERROR                         110
-# define BIO_R_NO_ACCEPT_PORT_SPECIFIED                   111
-# define BIO_R_NO_HOSTNAME_SPECIFIED                      112
-# define BIO_R_NO_PORT_DEFINED                            113
-# define BIO_R_NO_PORT_SPECIFIED                          114
-# define BIO_R_NO_SUCH_FILE                               128
-# define BIO_R_NULL_PARAMETER                             115
-# define BIO_R_TAG_MISMATCH                               116
-# define BIO_R_UNABLE_TO_BIND_SOCKET                      117
-# define BIO_R_UNABLE_TO_CREATE_SOCKET                    118
-# define BIO_R_UNABLE_TO_LISTEN_SOCKET                    119
-# define BIO_R_UNINITIALIZED                              120
-# define BIO_R_UNSUPPORTED_METHOD                         121
-# define BIO_R_WRITE_TO_READ_ONLY_BIO                     126
-# define BIO_R_WSASTARTUP                                 122
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/blowfish.h b/openflow/usr/include/openssl/blowfish.h
deleted file mode 100644
index 8329302..0000000
--- a/openflow/usr/include/openssl/blowfish.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* crypto/bf/blowfish.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BLOWFISH_H
-# define HEADER_BLOWFISH_H
-
-# include <openssl/e_os2.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_NO_BF
-#  error BF is disabled.
-# endif
-
-# define BF_ENCRYPT      1
-# define BF_DECRYPT      0
-
-/*-
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! BF_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! BF_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-# if defined(__LP32__)
-#  define BF_LONG unsigned long
-# elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#  define BF_LONG unsigned long
-#  define BF_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *                                      <appro@fy.chalmers.se>
- */
-# else
-#  define BF_LONG unsigned int
-# endif
-
-# define BF_ROUNDS       16
-# define BF_BLOCK        8
-
-typedef struct bf_key_st {
-    BF_LONG P[BF_ROUNDS + 2];
-    BF_LONG S[4 * 256];
-} BF_KEY;
-
-# ifdef OPENSSL_FIPS
-void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data);
-# endif
-void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
-
-void BF_encrypt(BF_LONG *data, const BF_KEY *key);
-void BF_decrypt(BF_LONG *data, const BF_KEY *key);
-
-void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                    const BF_KEY *key, int enc);
-void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                    const BF_KEY *schedule, unsigned char *ivec, int enc);
-void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const BF_KEY *schedule,
-                      unsigned char *ivec, int *num, int enc);
-void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const BF_KEY *schedule,
-                      unsigned char *ivec, int *num);
-const char *BF_options(void);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/bn.h b/openflow/usr/include/openssl/bn.h
deleted file mode 100644
index 86264ae..0000000
--- a/openflow/usr/include/openssl/bn.h
+++ /dev/null
@@ -1,949 +0,0 @@
-/* crypto/bn/bn.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the Eric Young open source
- * license provided above.
- *
- * The binary polynomial arithmetic software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#ifndef HEADER_BN_H
-# define HEADER_BN_H
-
-# include <limits.h>
-# include <openssl/e_os2.h>
-# ifndef OPENSSL_NO_FP_API
-#  include <stdio.h>            /* FILE */
-# endif
-# include <openssl/ossl_typ.h>
-# include <openssl/crypto.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * These preprocessor symbols control various aspects of the bignum headers
- * and library code. They're not defined by any "normal" configuration, as
- * they are intended for development and testing purposes. NB: defining all
- * three can be useful for debugging application code as well as openssl
- * itself. BN_DEBUG - turn on various debugging alterations to the bignum
- * code BN_DEBUG_RAND - uses random poisoning of unused words to trip up
- * mismanagement of bignum internals. You must also define BN_DEBUG.
- */
-/* #define BN_DEBUG */
-/* #define BN_DEBUG_RAND */
-
-# ifndef OPENSSL_SMALL_FOOTPRINT
-#  define BN_MUL_COMBA
-#  define BN_SQR_COMBA
-#  define BN_RECURSION
-# endif
-
-/*
- * This next option uses the C libraries (2 word)/(1 word) function. If it is
- * not defined, I use my C version (which is slower). The reason for this
- * flag is that when the particular C compiler library routine is used, and
- * the library is linked with a different compiler, the library is missing.
- * This mostly happens when the library is built with gcc and then linked
- * using normal cc.  This would be a common occurrence because gcc normally
- * produces code that is 2 times faster than system compilers for the big
- * number stuff. For machines with only one compiler (or shared libraries),
- * this should be on.  Again this in only really a problem on machines using
- * "long long's", are 32bit, and are not using my assembler code.
- */
-# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || \
-    defined(OPENSSL_SYS_WIN32) || defined(linux)
-#  ifndef BN_DIV2W
-#   define BN_DIV2W
-#  endif
-# endif
-
-/*
- * assuming long is 64bit - this is the DEC Alpha unsigned long long is only
- * 64 bits :-(, don't define BN_LLONG for the DEC Alpha
- */
-# ifdef SIXTY_FOUR_BIT_LONG
-#  define BN_ULLONG       unsigned long long
-#  define BN_ULONG        unsigned long
-#  define BN_LONG         long
-#  define BN_BITS         128
-#  define BN_BYTES        8
-#  define BN_BITS2        64
-#  define BN_BITS4        32
-#  define BN_MASK         (0xffffffffffffffffffffffffffffffffLL)
-#  define BN_MASK2        (0xffffffffffffffffL)
-#  define BN_MASK2l       (0xffffffffL)
-#  define BN_MASK2h       (0xffffffff00000000L)
-#  define BN_MASK2h1      (0xffffffff80000000L)
-#  define BN_TBIT         (0x8000000000000000L)
-#  define BN_DEC_CONV     (10000000000000000000UL)
-#  define BN_DEC_FMT1     "%lu"
-#  define BN_DEC_FMT2     "%019lu"
-#  define BN_DEC_NUM      19
-#  define BN_HEX_FMT1     "%lX"
-#  define BN_HEX_FMT2     "%016lX"
-# endif
-
-/*
- * This is where the long long data type is 64 bits, but long is 32. For
- * machines where there are 64bit registers, this is the mode to use. IRIX,
- * on R4000 and above should use this mode, along with the relevant assembler
- * code :-).  Do NOT define BN_LLONG.
- */
-# ifdef SIXTY_FOUR_BIT
-#  undef BN_LLONG
-#  undef BN_ULLONG
-#  define BN_ULONG        unsigned long long
-#  define BN_LONG         long long
-#  define BN_BITS         128
-#  define BN_BYTES        8
-#  define BN_BITS2        64
-#  define BN_BITS4        32
-#  define BN_MASK2        (0xffffffffffffffffLL)
-#  define BN_MASK2l       (0xffffffffL)
-#  define BN_MASK2h       (0xffffffff00000000LL)
-#  define BN_MASK2h1      (0xffffffff80000000LL)
-#  define BN_TBIT         (0x8000000000000000LL)
-#  define BN_DEC_CONV     (10000000000000000000ULL)
-#  define BN_DEC_FMT1     "%llu"
-#  define BN_DEC_FMT2     "%019llu"
-#  define BN_DEC_NUM      19
-#  define BN_HEX_FMT1     "%llX"
-#  define BN_HEX_FMT2     "%016llX"
-# endif
-
-# ifdef THIRTY_TWO_BIT
-#  ifdef BN_LLONG
-#   if defined(_WIN32) && !defined(__GNUC__)
-#    define BN_ULLONG     unsigned __int64
-#    define BN_MASK       (0xffffffffffffffffI64)
-#   else
-#    define BN_ULLONG     unsigned long long
-#    define BN_MASK       (0xffffffffffffffffLL)
-#   endif
-#  endif
-#  define BN_ULONG        unsigned int
-#  define BN_LONG         int
-#  define BN_BITS         64
-#  define BN_BYTES        4
-#  define BN_BITS2        32
-#  define BN_BITS4        16
-#  define BN_MASK2        (0xffffffffL)
-#  define BN_MASK2l       (0xffff)
-#  define BN_MASK2h1      (0xffff8000L)
-#  define BN_MASK2h       (0xffff0000L)
-#  define BN_TBIT         (0x80000000L)
-#  define BN_DEC_CONV     (1000000000L)
-#  define BN_DEC_FMT1     "%u"
-#  define BN_DEC_FMT2     "%09u"
-#  define BN_DEC_NUM      9
-#  define BN_HEX_FMT1     "%X"
-#  define BN_HEX_FMT2     "%08X"
-# endif
-
-# define BN_DEFAULT_BITS 1280
-
-# define BN_FLG_MALLOCED         0x01
-# define BN_FLG_STATIC_DATA      0x02
-
-/*
- * avoid leaking exponent information through timing,
- * BN_mod_exp_mont() will call BN_mod_exp_mont_consttime,
- * BN_div() will call BN_div_no_branch,
- * BN_mod_inverse() will call BN_mod_inverse_no_branch.
- */
-# define BN_FLG_CONSTTIME        0x04
-
-# ifdef OPENSSL_NO_DEPRECATED
-/* deprecated name for the flag */
-#  define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME
-/*
- * avoid leaking exponent information through timings
- * (BN_mod_exp_mont() will call BN_mod_exp_mont_consttime)
- */
-# endif
-
-# ifndef OPENSSL_NO_DEPRECATED
-#  define BN_FLG_FREE             0x8000
-                                       /* used for debuging */
-# endif
-# define BN_set_flags(b,n)       ((b)->flags|=(n))
-# define BN_get_flags(b,n)       ((b)->flags&(n))
-
-/*
- * get a clone of a BIGNUM with changed flags, for *temporary* use only (the
- * two BIGNUMs cannot not be used in parallel!)
- */
-# define BN_with_flags(dest,b,n)  ((dest)->d=(b)->d, \
-                                  (dest)->top=(b)->top, \
-                                  (dest)->dmax=(b)->dmax, \
-                                  (dest)->neg=(b)->neg, \
-                                  (dest)->flags=(((dest)->flags & BN_FLG_MALLOCED) \
-                                                 |  ((b)->flags & ~BN_FLG_MALLOCED) \
-                                                 |  BN_FLG_STATIC_DATA \
-                                                 |  (n)))
-
-/* Already declared in ossl_typ.h */
-# if 0
-typedef struct bignum_st BIGNUM;
-/* Used for temp variables (declaration hidden in bn_lcl.h) */
-typedef struct bignum_ctx BN_CTX;
-typedef struct bn_blinding_st BN_BLINDING;
-typedef struct bn_mont_ctx_st BN_MONT_CTX;
-typedef struct bn_recp_ctx_st BN_RECP_CTX;
-typedef struct bn_gencb_st BN_GENCB;
-# endif
-
-struct bignum_st {
-    BN_ULONG *d;                /* Pointer to an array of 'BN_BITS2' bit
-                                 * chunks. */
-    int top;                    /* Index of last used d +1. */
-    /* The next are internal book keeping for bn_expand. */
-    int dmax;                   /* Size of the d array. */
-    int neg;                    /* one if the number is negative */
-    int flags;
-};
-
-/* Used for montgomery multiplication */
-struct bn_mont_ctx_st {
-    int ri;                     /* number of bits in R */
-    BIGNUM RR;                  /* used to convert to montgomery form */
-    BIGNUM N;                   /* The modulus */
-    BIGNUM Ni;                  /* R*(1/R mod N) - N*Ni = 1 (Ni is only
-                                 * stored for bignum algorithm) */
-    BN_ULONG n0[2];             /* least significant word(s) of Ni; (type
-                                 * changed with 0.9.9, was "BN_ULONG n0;"
-                                 * before) */
-    int flags;
-};
-
-/*
- * Used for reciprocal division/mod functions It cannot be shared between
- * threads
- */
-struct bn_recp_ctx_st {
-    BIGNUM N;                   /* the divisor */
-    BIGNUM Nr;                  /* the reciprocal */
-    int num_bits;
-    int shift;
-    int flags;
-};
-
-/* Used for slow "generation" functions. */
-struct bn_gencb_st {
-    unsigned int ver;           /* To handle binary (in)compatibility */
-    void *arg;                  /* callback-specific data */
-    union {
-        /* if(ver==1) - handles old style callbacks */
-        void (*cb_1) (int, int, void *);
-        /* if(ver==2) - new callback style */
-        int (*cb_2) (int, int, BN_GENCB *);
-    } cb;
-};
-/* Wrapper function to make using BN_GENCB easier,  */
-int BN_GENCB_call(BN_GENCB *cb, int a, int b);
-/* Macro to populate a BN_GENCB structure with an "old"-style callback */
-# define BN_GENCB_set_old(gencb, callback, cb_arg) { \
-                BN_GENCB *tmp_gencb = (gencb); \
-                tmp_gencb->ver = 1; \
-                tmp_gencb->arg = (cb_arg); \
-                tmp_gencb->cb.cb_1 = (callback); }
-/* Macro to populate a BN_GENCB structure with a "new"-style callback */
-# define BN_GENCB_set(gencb, callback, cb_arg) { \
-                BN_GENCB *tmp_gencb = (gencb); \
-                tmp_gencb->ver = 2; \
-                tmp_gencb->arg = (cb_arg); \
-                tmp_gencb->cb.cb_2 = (callback); }
-
-# define BN_prime_checks 0      /* default: select number of iterations based
-                                 * on the size of the number */
-
-/*
- * number of Miller-Rabin iterations for an error rate of less than 2^-80 for
- * random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook of
- * Applied Cryptography [Menezes, van Oorschot, Vanstone; CRC Press 1996];
- * original paper: Damgaard, Landrock, Pomerance: Average case error
- * estimates for the strong probable prime test. -- Math. Comp. 61 (1993)
- * 177-194)
- */
-# define BN_prime_checks_for_size(b) ((b) >= 1300 ?  2 : \
-                                (b) >=  850 ?  3 : \
-                                (b) >=  650 ?  4 : \
-                                (b) >=  550 ?  5 : \
-                                (b) >=  450 ?  6 : \
-                                (b) >=  400 ?  7 : \
-                                (b) >=  350 ?  8 : \
-                                (b) >=  300 ?  9 : \
-                                (b) >=  250 ? 12 : \
-                                (b) >=  200 ? 15 : \
-                                (b) >=  150 ? 18 : \
-                                /* b >= 100 */ 27)
-
-# define BN_num_bytes(a) ((BN_num_bits(a)+7)/8)
-
-/* Note that BN_abs_is_word didn't work reliably for w == 0 until 0.9.8 */
-# define BN_abs_is_word(a,w) ((((a)->top == 1) && ((a)->d[0] == (BN_ULONG)(w))) || \
-                                (((w) == 0) && ((a)->top == 0)))
-# define BN_is_zero(a)       ((a)->top == 0)
-# define BN_is_one(a)        (BN_abs_is_word((a),1) && !(a)->neg)
-# define BN_is_word(a,w)     (BN_abs_is_word((a),(w)) && (!(w) || !(a)->neg))
-# define BN_is_odd(a)        (((a)->top > 0) && ((a)->d[0] & 1))
-
-# define BN_one(a)       (BN_set_word((a),1))
-# define BN_zero_ex(a) \
-        do { \
-                BIGNUM *_tmp_bn = (a); \
-                _tmp_bn->top = 0; \
-                _tmp_bn->neg = 0; \
-        } while(0)
-# ifdef OPENSSL_NO_DEPRECATED
-#  define BN_zero(a)      BN_zero_ex(a)
-# else
-#  define BN_zero(a)      (BN_set_word((a),0))
-# endif
-
-const BIGNUM *BN_value_one(void);
-char *BN_options(void);
-BN_CTX *BN_CTX_new(void);
-# ifndef OPENSSL_NO_DEPRECATED
-void BN_CTX_init(BN_CTX *c);
-# endif
-void BN_CTX_free(BN_CTX *c);
-void BN_CTX_start(BN_CTX *ctx);
-BIGNUM *BN_CTX_get(BN_CTX *ctx);
-void BN_CTX_end(BN_CTX *ctx);
-int BN_rand(BIGNUM *rnd, int bits, int top, int bottom);
-int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom);
-int BN_rand_range(BIGNUM *rnd, const BIGNUM *range);
-int BN_pseudo_rand_range(BIGNUM *rnd, const BIGNUM *range);
-int BN_num_bits(const BIGNUM *a);
-int BN_num_bits_word(BN_ULONG);
-BIGNUM *BN_new(void);
-void BN_init(BIGNUM *);
-void BN_clear_free(BIGNUM *a);
-BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b);
-void BN_swap(BIGNUM *a, BIGNUM *b);
-BIGNUM *BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret);
-int BN_bn2bin(const BIGNUM *a, unsigned char *to);
-BIGNUM *BN_mpi2bn(const unsigned char *s, int len, BIGNUM *ret);
-int BN_bn2mpi(const BIGNUM *a, unsigned char *to);
-int BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-int BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/** BN_set_negative sets sign of a BIGNUM
- * \param  b  pointer to the BIGNUM object
- * \param  n  0 if the BIGNUM b should be positive and a value != 0 otherwise
- */
-void BN_set_negative(BIGNUM *b, int n);
-/** BN_is_negative returns 1 if the BIGNUM is negative
- * \param  a  pointer to the BIGNUM object
- * \return 1 if a < 0 and 0 otherwise
- */
-# define BN_is_negative(a) ((a)->neg != 0)
-
-int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
-           BN_CTX *ctx);
-# define BN_mod(rem,m,d,ctx) BN_div(NULL,(rem),(m),(d),(ctx))
-int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx);
-int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
-int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                     const BIGNUM *m);
-int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
-int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                     const BIGNUM *m);
-int BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
-int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_lshift1(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_lshift1_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *m);
-int BN_mod_lshift(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m,
-                  BN_CTX *ctx);
-int BN_mod_lshift_quick(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m);
-
-BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w);
-BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w);
-int BN_mul_word(BIGNUM *a, BN_ULONG w);
-int BN_add_word(BIGNUM *a, BN_ULONG w);
-int BN_sub_word(BIGNUM *a, BN_ULONG w);
-int BN_set_word(BIGNUM *a, BN_ULONG w);
-BN_ULONG BN_get_word(const BIGNUM *a);
-
-int BN_cmp(const BIGNUM *a, const BIGNUM *b);
-void BN_free(BIGNUM *a);
-int BN_is_bit_set(const BIGNUM *a, int n);
-int BN_lshift(BIGNUM *r, const BIGNUM *a, int n);
-int BN_lshift1(BIGNUM *r, const BIGNUM *a);
-int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-
-int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-               const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
-                              const BIGNUM *m, BN_CTX *ctx,
-                              BN_MONT_CTX *in_mont);
-int BN_mod_exp_mont_word(BIGNUM *r, BN_ULONG a, const BIGNUM *p,
-                         const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp2_mont(BIGNUM *r, const BIGNUM *a1, const BIGNUM *p1,
-                     const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m,
-                     BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                      const BIGNUM *m, BN_CTX *ctx);
-
-int BN_mask_bits(BIGNUM *a, int n);
-# ifndef OPENSSL_NO_FP_API
-int BN_print_fp(FILE *fp, const BIGNUM *a);
-# endif
-# ifdef HEADER_BIO_H
-int BN_print(BIO *fp, const BIGNUM *a);
-# else
-int BN_print(void *fp, const BIGNUM *a);
-# endif
-int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx);
-int BN_rshift(BIGNUM *r, const BIGNUM *a, int n);
-int BN_rshift1(BIGNUM *r, const BIGNUM *a);
-void BN_clear(BIGNUM *a);
-BIGNUM *BN_dup(const BIGNUM *a);
-int BN_ucmp(const BIGNUM *a, const BIGNUM *b);
-int BN_set_bit(BIGNUM *a, int n);
-int BN_clear_bit(BIGNUM *a, int n);
-char *BN_bn2hex(const BIGNUM *a);
-char *BN_bn2dec(const BIGNUM *a);
-int BN_hex2bn(BIGNUM **a, const char *str);
-int BN_dec2bn(BIGNUM **a, const char *str);
-int BN_asc2bn(BIGNUM **a, const char *str);
-int BN_gcd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-int BN_kronecker(const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx); /* returns
-                                                                  * -2 for
-                                                                  * error */
-BIGNUM *BN_mod_inverse(BIGNUM *ret,
-                       const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
-BIGNUM *BN_mod_sqrt(BIGNUM *ret,
-                    const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
-
-void BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords);
-
-/* Deprecated versions */
-# ifndef OPENSSL_NO_DEPRECATED
-BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
-                          const BIGNUM *add, const BIGNUM *rem,
-                          void (*callback) (int, int, void *), void *cb_arg);
-int BN_is_prime(const BIGNUM *p, int nchecks,
-                void (*callback) (int, int, void *),
-                BN_CTX *ctx, void *cb_arg);
-int BN_is_prime_fasttest(const BIGNUM *p, int nchecks,
-                         void (*callback) (int, int, void *), BN_CTX *ctx,
-                         void *cb_arg, int do_trial_division);
-# endif                         /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* Newer versions */
-int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe, const BIGNUM *add,
-                         const BIGNUM *rem, BN_GENCB *cb);
-int BN_is_prime_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx, BN_GENCB *cb);
-int BN_is_prime_fasttest_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx,
-                            int do_trial_division, BN_GENCB *cb);
-
-int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx);
-
-int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
-                            const BIGNUM *Xp, const BIGNUM *Xp1,
-                            const BIGNUM *Xp2, const BIGNUM *e, BN_CTX *ctx,
-                            BN_GENCB *cb);
-int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2, BIGNUM *Xp1,
-                              BIGNUM *Xp2, const BIGNUM *Xp, const BIGNUM *e,
-                              BN_CTX *ctx, BN_GENCB *cb);
-
-BN_MONT_CTX *BN_MONT_CTX_new(void);
-void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
-int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                          BN_MONT_CTX *mont, BN_CTX *ctx);
-# define BN_to_montgomery(r,a,mont,ctx)  BN_mod_mul_montgomery(\
-        (r),(a),&((mont)->RR),(mont),(ctx))
-int BN_from_montgomery(BIGNUM *r, const BIGNUM *a,
-                       BN_MONT_CTX *mont, BN_CTX *ctx);
-void BN_MONT_CTX_free(BN_MONT_CTX *mont);
-int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx);
-BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to, BN_MONT_CTX *from);
-BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
-                                    const BIGNUM *mod, BN_CTX *ctx);
-
-/* BN_BLINDING flags */
-# define BN_BLINDING_NO_UPDATE   0x00000001
-# define BN_BLINDING_NO_RECREATE 0x00000002
-
-BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod);
-void BN_BLINDING_free(BN_BLINDING *b);
-int BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *);
-int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b,
-                          BN_CTX *);
-# ifndef OPENSSL_NO_DEPRECATED
-unsigned long BN_BLINDING_get_thread_id(const BN_BLINDING *);
-void BN_BLINDING_set_thread_id(BN_BLINDING *, unsigned long);
-# endif
-CRYPTO_THREADID *BN_BLINDING_thread_id(BN_BLINDING *);
-unsigned long BN_BLINDING_get_flags(const BN_BLINDING *);
-void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long);
-BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
-                                      const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
-                                      int (*bn_mod_exp) (BIGNUM *r,
-                                                         const BIGNUM *a,
-                                                         const BIGNUM *p,
-                                                         const BIGNUM *m,
-                                                         BN_CTX *ctx,
-                                                         BN_MONT_CTX *m_ctx),
-                                      BN_MONT_CTX *m_ctx);
-
-# ifndef OPENSSL_NO_DEPRECATED
-void BN_set_params(int mul, int high, int low, int mont);
-int BN_get_params(int which);   /* 0, mul, 1 high, 2 low, 3 mont */
-# endif
-
-void BN_RECP_CTX_init(BN_RECP_CTX *recp);
-BN_RECP_CTX *BN_RECP_CTX_new(void);
-void BN_RECP_CTX_free(BN_RECP_CTX *recp);
-int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *rdiv, BN_CTX *ctx);
-int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
-                          BN_RECP_CTX *recp, BN_CTX *ctx);
-int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                    const BIGNUM *m, BN_CTX *ctx);
-int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
-                BN_RECP_CTX *recp, BN_CTX *ctx);
-
-# ifndef OPENSSL_NO_EC2M
-
-/*
- * Functions for arithmetic over binary polynomials represented by BIGNUMs.
- * The BIGNUM::neg property of BIGNUMs representing binary polynomials is
- * ignored. Note that input arguments are not const so that their bit arrays
- * can be expanded to the appropriate size if needed.
- */
-
-/*
- * r = a + b
- */
-int BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-#  define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b)
-/*
- * r=a mod p
- */
-int BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p);
-/* r = (a * b) mod p */
-int BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
-/* r = (a * a) mod p */
-int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-/* r = (1 / b) mod p */
-int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p, BN_CTX *ctx);
-/* r = (a / b) mod p */
-int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
-/* r = (a ^ b) mod p */
-int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
-/* r = sqrt(a) mod p */
-int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                     BN_CTX *ctx);
-/* r^2 + r = a mod p */
-int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                           BN_CTX *ctx);
-#  define BN_GF2m_cmp(a, b) BN_ucmp((a), (b))
-/*-
- * Some functions allow for representation of the irreducible polynomials
- * as an unsigned int[], say p.  The irreducible f(t) is then of the form:
- *     t^p[0] + t^p[1] + ... + t^p[k]
- * where m = p[0] > p[1] > ... > p[k] = 0.
- */
-/* r = a mod p */
-int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[]);
-/* r = (a * b) mod p */
-int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p[], BN_CTX *ctx);
-/* r = (a * a) mod p */
-int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],
-                        BN_CTX *ctx);
-/* r = (1 / b) mod p */
-int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const int p[],
-                        BN_CTX *ctx);
-/* r = (a / b) mod p */
-int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p[], BN_CTX *ctx);
-/* r = (a ^ b) mod p */
-int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p[], BN_CTX *ctx);
-/* r = sqrt(a) mod p */
-int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a,
-                         const int p[], BN_CTX *ctx);
-/* r^2 + r = a mod p */
-int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,
-                               const int p[], BN_CTX *ctx);
-int BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max);
-int BN_GF2m_arr2poly(const int p[], BIGNUM *a);
-
-# endif
-
-/*
- * faster mod functions for the 'NIST primes' 0 <= a < p^2
- */
-int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-
-const BIGNUM *BN_get0_nist_prime_192(void);
-const BIGNUM *BN_get0_nist_prime_224(void);
-const BIGNUM *BN_get0_nist_prime_256(void);
-const BIGNUM *BN_get0_nist_prime_384(void);
-const BIGNUM *BN_get0_nist_prime_521(void);
-
-/* library internal functions */
-
-# define bn_expand(a,bits) \
-    ( \
-        bits > (INT_MAX - BN_BITS2 + 1) ? \
-            NULL \
-        : \
-            (((bits+BN_BITS2-1)/BN_BITS2) <= (a)->dmax) ? \
-                (a) \
-            : \
-                bn_expand2((a),(bits+BN_BITS2-1)/BN_BITS2) \
-    )
-
-# define bn_wexpand(a,words) (((words) <= (a)->dmax)?(a):bn_expand2((a),(words)))
-BIGNUM *bn_expand2(BIGNUM *a, int words);
-# ifndef OPENSSL_NO_DEPRECATED
-BIGNUM *bn_dup_expand(const BIGNUM *a, int words); /* unused */
-# endif
-
-/*-
- * Bignum consistency macros
- * There is one "API" macro, bn_fix_top(), for stripping leading zeroes from
- * bignum data after direct manipulations on the data. There is also an
- * "internal" macro, bn_check_top(), for verifying that there are no leading
- * zeroes. Unfortunately, some auditing is required due to the fact that
- * bn_fix_top() has become an overabused duct-tape because bignum data is
- * occasionally passed around in an inconsistent state. So the following
- * changes have been made to sort this out;
- * - bn_fix_top()s implementation has been moved to bn_correct_top()
- * - if BN_DEBUG isn't defined, bn_fix_top() maps to bn_correct_top(), and
- *   bn_check_top() is as before.
- * - if BN_DEBUG *is* defined;
- *   - bn_check_top() tries to pollute unused words even if the bignum 'top' is
- *     consistent. (ed: only if BN_DEBUG_RAND is defined)
- *   - bn_fix_top() maps to bn_check_top() rather than "fixing" anything.
- * The idea is to have debug builds flag up inconsistent bignums when they
- * occur. If that occurs in a bn_fix_top(), we examine the code in question; if
- * the use of bn_fix_top() was appropriate (ie. it follows directly after code
- * that manipulates the bignum) it is converted to bn_correct_top(), and if it
- * was not appropriate, we convert it permanently to bn_check_top() and track
- * down the cause of the bug. Eventually, no internal code should be using the
- * bn_fix_top() macro. External applications and libraries should try this with
- * their own code too, both in terms of building against the openssl headers
- * with BN_DEBUG defined *and* linking with a version of OpenSSL built with it
- * defined. This not only improves external code, it provides more test
- * coverage for openssl's own code.
- */
-
-# ifdef BN_DEBUG
-
-/* We only need assert() when debugging */
-#  include <assert.h>
-
-#  ifdef BN_DEBUG_RAND
-/* To avoid "make update" cvs wars due to BN_DEBUG, use some tricks */
-#   ifndef RAND_pseudo_bytes
-int RAND_pseudo_bytes(unsigned char *buf, int num);
-#    define BN_DEBUG_TRIX
-#   endif
-#   define bn_pollute(a) \
-        do { \
-                const BIGNUM *_bnum1 = (a); \
-                if(_bnum1->top < _bnum1->dmax) { \
-                        unsigned char _tmp_char; \
-                        /* We cast away const without the compiler knowing, any \
-                         * *genuinely* constant variables that aren't mutable \
-                         * wouldn't be constructed with top!=dmax. */ \
-                        BN_ULONG *_not_const; \
-                        memcpy(&_not_const, &_bnum1->d, sizeof(BN_ULONG*)); \
-                        /* Debug only - safe to ignore error return */ \
-                        RAND_pseudo_bytes(&_tmp_char, 1); \
-                        memset((unsigned char *)(_not_const + _bnum1->top), _tmp_char, \
-                                (_bnum1->dmax - _bnum1->top) * sizeof(BN_ULONG)); \
-                } \
-        } while(0)
-#   ifdef BN_DEBUG_TRIX
-#    undef RAND_pseudo_bytes
-#   endif
-#  else
-#   define bn_pollute(a)
-#  endif
-#  define bn_check_top(a) \
-        do { \
-                const BIGNUM *_bnum2 = (a); \
-                if (_bnum2 != NULL) { \
-                        assert((_bnum2->top == 0) || \
-                                (_bnum2->d[_bnum2->top - 1] != 0)); \
-                        bn_pollute(_bnum2); \
-                } \
-        } while(0)
-
-#  define bn_fix_top(a)           bn_check_top(a)
-
-#  define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits+BN_BITS2-1))/BN_BITS2)
-#  define bn_wcheck_size(bn, words) \
-        do { \
-                const BIGNUM *_bnum2 = (bn); \
-                assert((words) <= (_bnum2)->dmax && (words) >= (_bnum2)->top); \
-                /* avoid unused variable warning with NDEBUG */ \
-                (void)(_bnum2); \
-        } while(0)
-
-# else                          /* !BN_DEBUG */
-
-#  define bn_pollute(a)
-#  define bn_check_top(a)
-#  define bn_fix_top(a)           bn_correct_top(a)
-#  define bn_check_size(bn, bits)
-#  define bn_wcheck_size(bn, words)
-
-# endif
-
-# define bn_correct_top(a) \
-        { \
-        BN_ULONG *ftl; \
-        int tmp_top = (a)->top; \
-        if (tmp_top > 0) \
-                { \
-                for (ftl= &((a)->d[tmp_top-1]); tmp_top > 0; tmp_top--) \
-                        if (*(ftl--)) break; \
-                (a)->top = tmp_top; \
-                } \
-        bn_pollute(a); \
-        }
-
-BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
-                          BN_ULONG w);
-BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w);
-void bn_sqr_words(BN_ULONG *rp, const BN_ULONG *ap, int num);
-BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d);
-BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                      int num);
-BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                      int num);
-
-/* Primes from RFC 2409 */
-BIGNUM *get_rfc2409_prime_768(BIGNUM *bn);
-BIGNUM *get_rfc2409_prime_1024(BIGNUM *bn);
-
-/* Primes from RFC 3526 */
-BIGNUM *get_rfc3526_prime_1536(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_2048(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_3072(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_4096(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_6144(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_8192(BIGNUM *bn);
-
-int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_BN_strings(void);
-
-/* Error codes for the BN functions. */
-
-/* Function codes. */
-# define BN_F_BNRAND                                      127
-# define BN_F_BN_BLINDING_CONVERT_EX                      100
-# define BN_F_BN_BLINDING_CREATE_PARAM                    128
-# define BN_F_BN_BLINDING_INVERT_EX                       101
-# define BN_F_BN_BLINDING_NEW                             102
-# define BN_F_BN_BLINDING_UPDATE                          103
-# define BN_F_BN_BN2DEC                                   104
-# define BN_F_BN_BN2HEX                                   105
-# define BN_F_BN_CTX_GET                                  116
-# define BN_F_BN_CTX_NEW                                  106
-# define BN_F_BN_CTX_START                                129
-# define BN_F_BN_DIV                                      107
-# define BN_F_BN_DIV_NO_BRANCH                            138
-# define BN_F_BN_DIV_RECP                                 130
-# define BN_F_BN_EXP                                      123
-# define BN_F_BN_EXPAND2                                  108
-# define BN_F_BN_EXPAND_INTERNAL                          120
-# define BN_F_BN_GF2M_MOD                                 131
-# define BN_F_BN_GF2M_MOD_EXP                             132
-# define BN_F_BN_GF2M_MOD_MUL                             133
-# define BN_F_BN_GF2M_MOD_SOLVE_QUAD                      134
-# define BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR                  135
-# define BN_F_BN_GF2M_MOD_SQR                             136
-# define BN_F_BN_GF2M_MOD_SQRT                            137
-# define BN_F_BN_LSHIFT                                   145
-# define BN_F_BN_MOD_EXP2_MONT                            118
-# define BN_F_BN_MOD_EXP_MONT                             109
-# define BN_F_BN_MOD_EXP_MONT_CONSTTIME                   124
-# define BN_F_BN_MOD_EXP_MONT_WORD                        117
-# define BN_F_BN_MOD_EXP_RECP                             125
-# define BN_F_BN_MOD_EXP_SIMPLE                           126
-# define BN_F_BN_MOD_INVERSE                              110
-# define BN_F_BN_MOD_INVERSE_NO_BRANCH                    139
-# define BN_F_BN_MOD_LSHIFT_QUICK                         119
-# define BN_F_BN_MOD_MUL_RECIPROCAL                       111
-# define BN_F_BN_MOD_SQRT                                 121
-# define BN_F_BN_MPI2BN                                   112
-# define BN_F_BN_NEW                                      113
-# define BN_F_BN_RAND                                     114
-# define BN_F_BN_RAND_RANGE                               122
-# define BN_F_BN_RSHIFT                                   146
-# define BN_F_BN_USUB                                     115
-
-/* Reason codes. */
-# define BN_R_ARG2_LT_ARG3                                100
-# define BN_R_BAD_RECIPROCAL                              101
-# define BN_R_BIGNUM_TOO_LONG                             114
-# define BN_R_BITS_TOO_SMALL                              118
-# define BN_R_CALLED_WITH_EVEN_MODULUS                    102
-# define BN_R_DIV_BY_ZERO                                 103
-# define BN_R_ENCODING_ERROR                              104
-# define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA                105
-# define BN_R_INPUT_NOT_REDUCED                           110
-# define BN_R_INVALID_LENGTH                              106
-# define BN_R_INVALID_RANGE                               115
-# define BN_R_INVALID_SHIFT                               119
-# define BN_R_NOT_A_SQUARE                                111
-# define BN_R_NOT_INITIALIZED                             107
-# define BN_R_NO_INVERSE                                  108
-# define BN_R_NO_SOLUTION                                 116
-# define BN_R_P_IS_NOT_PRIME                              112
-# define BN_R_TOO_MANY_ITERATIONS                         113
-# define BN_R_TOO_MANY_TEMPORARY_VARIABLES                109
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/buffer.h b/openflow/usr/include/openssl/buffer.h
deleted file mode 100644
index efd240a..0000000
--- a/openflow/usr/include/openssl/buffer.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* crypto/buffer/buffer.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BUFFER_H
-# define HEADER_BUFFER_H
-
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# include <stddef.h>
-
-# if !defined(NO_SYS_TYPES_H)
-#  include <sys/types.h>
-# endif
-
-/* Already declared in ossl_typ.h */
-/* typedef struct buf_mem_st BUF_MEM; */
-
-struct buf_mem_st {
-    size_t length;              /* current number of bytes */
-    char *data;
-    size_t max;                 /* size of buffer */
-};
-
-BUF_MEM *BUF_MEM_new(void);
-void BUF_MEM_free(BUF_MEM *a);
-int BUF_MEM_grow(BUF_MEM *str, size_t len);
-int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
-size_t BUF_strnlen(const char *str, size_t maxlen);
-char *BUF_strdup(const char *str);
-
-/*
- * Like strndup, but in addition, explicitly guarantees to never read past the
- * first |siz| bytes of |str|.
- */
-char *BUF_strndup(const char *str, size_t siz);
-
-void *BUF_memdup(const void *data, size_t siz);
-void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
-
-/* safe string functions */
-size_t BUF_strlcpy(char *dst, const char *src, size_t siz);
-size_t BUF_strlcat(char *dst, const char *src, size_t siz);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_BUF_strings(void);
-
-/* Error codes for the BUF functions. */
-
-/* Function codes. */
-# define BUF_F_BUF_MEMDUP                                 103
-# define BUF_F_BUF_MEM_GROW                               100
-# define BUF_F_BUF_MEM_GROW_CLEAN                         105
-# define BUF_F_BUF_MEM_NEW                                101
-# define BUF_F_BUF_STRDUP                                 102
-# define BUF_F_BUF_STRNDUP                                104
-
-/* Reason codes. */
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/camellia.h b/openflow/usr/include/openssl/camellia.h
deleted file mode 100644
index 45e8d25..0000000
--- a/openflow/usr/include/openssl/camellia.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* crypto/camellia/camellia.h */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_CAMELLIA_H
-# define HEADER_CAMELLIA_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_CAMELLIA
-#  error CAMELLIA is disabled.
-# endif
-
-# include <stddef.h>
-
-# define CAMELLIA_ENCRYPT        1
-# define CAMELLIA_DECRYPT        0
-
-/*
- * Because array size can't be a const in C, the following two are macros.
- * Both sizes are in bytes.
- */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* This should be a hidden type, but EVP requires that the size be known */
-
-# define CAMELLIA_BLOCK_SIZE 16
-# define CAMELLIA_TABLE_BYTE_LEN 272
-# define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
-
-typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN]; /* to match
-                                                               * with WORD */
-
-struct camellia_key_st {
-    union {
-        double d;               /* ensures 64-bit align */
-        KEY_TABLE_TYPE rd_key;
-    } u;
-    int grand_rounds;
-};
-typedef struct camellia_key_st CAMELLIA_KEY;
-
-# ifdef OPENSSL_FIPS
-int private_Camellia_set_key(const unsigned char *userKey, const int bits,
-                             CAMELLIA_KEY *key);
-# endif
-int Camellia_set_key(const unsigned char *userKey, const int bits,
-                     CAMELLIA_KEY *key);
-
-void Camellia_encrypt(const unsigned char *in, unsigned char *out,
-                      const CAMELLIA_KEY *key);
-void Camellia_decrypt(const unsigned char *in, unsigned char *out,
-                      const CAMELLIA_KEY *key);
-
-void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                          const CAMELLIA_KEY *key, const int enc);
-void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                          size_t length, const CAMELLIA_KEY *key,
-                          unsigned char *ivec, const int enc);
-void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char *ivec, int *num, const int enc);
-void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t length, const CAMELLIA_KEY *key,
-                           unsigned char *ivec, int *num, const int enc);
-void Camellia_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t length, const CAMELLIA_KEY *key,
-                           unsigned char *ivec, int *num, const int enc);
-void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char *ivec, int *num);
-void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char ivec[CAMELLIA_BLOCK_SIZE],
-                             unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
-                             unsigned int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif                          /* !HEADER_Camellia_H */
diff --git a/openflow/usr/include/openssl/cast.h b/openflow/usr/include/openssl/cast.h
deleted file mode 100644
index 0003ec9..0000000
--- a/openflow/usr/include/openssl/cast.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* crypto/cast/cast.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_CAST_H
-# define HEADER_CAST_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_CAST
-#  error CAST is disabled.
-# endif
-
-# define CAST_ENCRYPT    1
-# define CAST_DECRYPT    0
-
-# define CAST_LONG unsigned int
-
-# define CAST_BLOCK      8
-# define CAST_KEY_LENGTH 16
-
-typedef struct cast_key_st {
-    CAST_LONG data[32];
-    int short_key;              /* Use reduced rounds for short key */
-} CAST_KEY;
-
-# ifdef OPENSSL_FIPS
-void private_CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
-# endif
-void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
-void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      const CAST_KEY *key, int enc);
-void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key);
-void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key);
-void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const CAST_KEY *ks, unsigned char *iv,
-                      int enc);
-void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, const CAST_KEY *schedule,
-                        unsigned char *ivec, int *num, int enc);
-void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, const CAST_KEY *schedule,
-                        unsigned char *ivec, int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/cmac.h b/openflow/usr/include/openssl/cmac.h
deleted file mode 100644
index 175be83..0000000
--- a/openflow/usr/include/openssl/cmac.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* crypto/cmac/cmac.h */
-/*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project.
- */
-/* ====================================================================
- * Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-#ifndef HEADER_CMAC_H
-# define HEADER_CMAC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# include <openssl/evp.h>
-
-/* Opaque */
-typedef struct CMAC_CTX_st CMAC_CTX;
-
-CMAC_CTX *CMAC_CTX_new(void);
-void CMAC_CTX_cleanup(CMAC_CTX *ctx);
-void CMAC_CTX_free(CMAC_CTX *ctx);
-EVP_CIPHER_CTX *CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx);
-int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in);
-
-int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
-              const EVP_CIPHER *cipher, ENGINE *impl);
-int CMAC_Update(CMAC_CTX *ctx, const void *data, size_t dlen);
-int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen);
-int CMAC_resume(CMAC_CTX *ctx);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/cms.h b/openflow/usr/include/openssl/cms.h
deleted file mode 100644
index e6c7f96..0000000
--- a/openflow/usr/include/openssl/cms.h
+++ /dev/null
@@ -1,555 +0,0 @@
-/* crypto/cms/cms.h */
-/*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project.
- */
-/* ====================================================================
- * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-#ifndef HEADER_CMS_H
-# define HEADER_CMS_H
-
-# include <openssl/x509.h>
-
-# ifdef OPENSSL_NO_CMS
-#  error CMS is disabled.
-# endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct CMS_ContentInfo_st CMS_ContentInfo;
-typedef struct CMS_SignerInfo_st CMS_SignerInfo;
-typedef struct CMS_CertificateChoices CMS_CertificateChoices;
-typedef struct CMS_RevocationInfoChoice_st CMS_RevocationInfoChoice;
-typedef struct CMS_RecipientInfo_st CMS_RecipientInfo;
-typedef struct CMS_ReceiptRequest_st CMS_ReceiptRequest;
-typedef struct CMS_Receipt_st CMS_Receipt;
-typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey;
-typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute;
-
-DECLARE_STACK_OF(CMS_SignerInfo)
-DECLARE_STACK_OF(GENERAL_NAMES)
-DECLARE_STACK_OF(CMS_RecipientEncryptedKey)
-DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)
-DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest)
-DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo)
-
-# define CMS_SIGNERINFO_ISSUER_SERIAL    0
-# define CMS_SIGNERINFO_KEYIDENTIFIER    1
-
-# define CMS_RECIPINFO_NONE              -1
-# define CMS_RECIPINFO_TRANS             0
-# define CMS_RECIPINFO_AGREE             1
-# define CMS_RECIPINFO_KEK               2
-# define CMS_RECIPINFO_PASS              3
-# define CMS_RECIPINFO_OTHER             4
-
-/* S/MIME related flags */
-
-# define CMS_TEXT                        0x1
-# define CMS_NOCERTS                     0x2
-# define CMS_NO_CONTENT_VERIFY           0x4
-# define CMS_NO_ATTR_VERIFY              0x8
-# define CMS_NOSIGS                      \
-                        (CMS_NO_CONTENT_VERIFY|CMS_NO_ATTR_VERIFY)
-# define CMS_NOINTERN                    0x10
-# define CMS_NO_SIGNER_CERT_VERIFY       0x20
-# define CMS_NOVERIFY                    0x20
-# define CMS_DETACHED                    0x40
-# define CMS_BINARY                      0x80
-# define CMS_NOATTR                      0x100
-# define CMS_NOSMIMECAP                  0x200
-# define CMS_NOOLDMIMETYPE               0x400
-# define CMS_CRLFEOL                     0x800
-# define CMS_STREAM                      0x1000
-# define CMS_NOCRL                       0x2000
-# define CMS_PARTIAL                     0x4000
-# define CMS_REUSE_DIGEST                0x8000
-# define CMS_USE_KEYID                   0x10000
-# define CMS_DEBUG_DECRYPT               0x20000
-# define CMS_KEY_PARAM                   0x40000
-
-const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms);
-
-BIO *CMS_dataInit(CMS_ContentInfo *cms, BIO *icont);
-int CMS_dataFinal(CMS_ContentInfo *cms, BIO *bio);
-
-ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
-int CMS_is_detached(CMS_ContentInfo *cms);
-int CMS_set_detached(CMS_ContentInfo *cms, int detached);
-
-# ifdef HEADER_PEM_H
-DECLARE_PEM_rw_const(CMS, CMS_ContentInfo)
-# endif
-int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms);
-CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms);
-int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms);
-
-BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms);
-int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags);
-int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in,
-                             int flags);
-CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont);
-int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags);
-
-int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont,
-              unsigned int flags);
-
-CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey,
-                          STACK_OF(X509) *certs, BIO *data,
-                          unsigned int flags);
-
-CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
-                                  X509 *signcert, EVP_PKEY *pkey,
-                                  STACK_OF(X509) *certs, unsigned int flags);
-
-int CMS_data(CMS_ContentInfo *cms, BIO *out, unsigned int flags);
-CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags);
-
-int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                      unsigned int flags);
-CMS_ContentInfo *CMS_digest_create(BIO *in, const EVP_MD *md,
-                                   unsigned int flags);
-
-int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
-                              const unsigned char *key, size_t keylen,
-                              BIO *dcont, BIO *out, unsigned int flags);
-
-CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,
-                                           const unsigned char *key,
-                                           size_t keylen, unsigned int flags);
-
-int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
-                               const unsigned char *key, size_t keylen);
-
-int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
-               X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags);
-
-int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
-                       STACK_OF(X509) *certs,
-                       X509_STORE *store, unsigned int flags);
-
-STACK_OF(X509) *CMS_get0_signers(CMS_ContentInfo *cms);
-
-CMS_ContentInfo *CMS_encrypt(STACK_OF(X509) *certs, BIO *in,
-                             const EVP_CIPHER *cipher, unsigned int flags);
-
-int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pkey, X509 *cert,
-                BIO *dcont, BIO *out, unsigned int flags);
-
-int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert);
-int CMS_decrypt_set1_key(CMS_ContentInfo *cms,
-                         unsigned char *key, size_t keylen,
-                         unsigned char *id, size_t idlen);
-int CMS_decrypt_set1_password(CMS_ContentInfo *cms,
-                              unsigned char *pass, ossl_ssize_t passlen);
-
-STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms);
-int CMS_RecipientInfo_type(CMS_RecipientInfo *ri);
-EVP_PKEY_CTX *CMS_RecipientInfo_get0_pkey_ctx(CMS_RecipientInfo *ri);
-CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher);
-CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
-                                           X509 *recip, unsigned int flags);
-int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey);
-int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert);
-int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
-                                     EVP_PKEY **pk, X509 **recip,
-                                     X509_ALGOR **palg);
-int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,
-                                          ASN1_OCTET_STRING **keyid,
-                                          X509_NAME **issuer,
-                                          ASN1_INTEGER **sno);
-
-CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
-                                          unsigned char *key, size_t keylen,
-                                          unsigned char *id, size_t idlen,
-                                          ASN1_GENERALIZEDTIME *date,
-                                          ASN1_OBJECT *otherTypeId,
-                                          ASN1_TYPE *otherType);
-
-int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,
-                                    X509_ALGOR **palg,
-                                    ASN1_OCTET_STRING **pid,
-                                    ASN1_GENERALIZEDTIME **pdate,
-                                    ASN1_OBJECT **potherid,
-                                    ASN1_TYPE **pothertype);
-
-int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri,
-                               unsigned char *key, size_t keylen);
-
-int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,
-                                   const unsigned char *id, size_t idlen);
-
-int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
-                                    unsigned char *pass,
-                                    ossl_ssize_t passlen);
-
-CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
-                                               int iter, int wrap_nid,
-                                               int pbe_nid,
-                                               unsigned char *pass,
-                                               ossl_ssize_t passlen,
-                                               const EVP_CIPHER *kekciph);
-
-int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
-int CMS_RecipientInfo_encrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
-
-int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                   unsigned int flags);
-CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags);
-
-int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid);
-const ASN1_OBJECT *CMS_get0_eContentType(CMS_ContentInfo *cms);
-
-CMS_CertificateChoices *CMS_add0_CertificateChoices(CMS_ContentInfo *cms);
-int CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert);
-int CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert);
-STACK_OF(X509) *CMS_get1_certs(CMS_ContentInfo *cms);
-
-CMS_RevocationInfoChoice *CMS_add0_RevocationInfoChoice(CMS_ContentInfo *cms);
-int CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl);
-int CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl);
-STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms);
-
-int CMS_SignedData_init(CMS_ContentInfo *cms);
-CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
-                                X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
-                                unsigned int flags);
-EVP_PKEY_CTX *CMS_SignerInfo_get0_pkey_ctx(CMS_SignerInfo *si);
-EVP_MD_CTX *CMS_SignerInfo_get0_md_ctx(CMS_SignerInfo *si);
-STACK_OF(CMS_SignerInfo) *CMS_get0_SignerInfos(CMS_ContentInfo *cms);
-
-void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer);
-int CMS_SignerInfo_get0_signer_id(CMS_SignerInfo *si,
-                                  ASN1_OCTET_STRING **keyid,
-                                  X509_NAME **issuer, ASN1_INTEGER **sno);
-int CMS_SignerInfo_cert_cmp(CMS_SignerInfo *si, X509 *cert);
-int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
-                           unsigned int flags);
-void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk,
-                              X509 **signer, X509_ALGOR **pdig,
-                              X509_ALGOR **psig);
-ASN1_OCTET_STRING *CMS_SignerInfo_get0_signature(CMS_SignerInfo *si);
-int CMS_SignerInfo_sign(CMS_SignerInfo *si);
-int CMS_SignerInfo_verify(CMS_SignerInfo *si);
-int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain);
-
-int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs);
-int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
-                            int algnid, int keysize);
-int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap);
-
-int CMS_signed_get_attr_count(const CMS_SignerInfo *si);
-int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
-                               int lastpos);
-int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
-                               int lastpos);
-X509_ATTRIBUTE *CMS_signed_get_attr(const CMS_SignerInfo *si, int loc);
-X509_ATTRIBUTE *CMS_signed_delete_attr(CMS_SignerInfo *si, int loc);
-int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
-int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
-                                const ASN1_OBJECT *obj, int type,
-                                const void *bytes, int len);
-int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
-                                int nid, int type,
-                                const void *bytes, int len);
-int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si,
-                                const char *attrname, int type,
-                                const void *bytes, int len);
-void *CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
-                                  int lastpos, int type);
-
-int CMS_unsigned_get_attr_count(const CMS_SignerInfo *si);
-int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
-                                 int lastpos);
-int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
-                                 int lastpos);
-X509_ATTRIBUTE *CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc);
-X509_ATTRIBUTE *CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc);
-int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
-int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
-                                  const ASN1_OBJECT *obj, int type,
-                                  const void *bytes, int len);
-int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
-                                  int nid, int type,
-                                  const void *bytes, int len);
-int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
-                                  const char *attrname, int type,
-                                  const void *bytes, int len);
-void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
-                                    int lastpos, int type);
-
-# ifdef HEADER_X509V3_H
-
-int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr);
-CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
-                                               int allorfirst,
-                                               STACK_OF(GENERAL_NAMES)
-                                               *receiptList, STACK_OF(GENERAL_NAMES)
-                                               *receiptsTo);
-int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr);
-void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
-                                    ASN1_STRING **pcid,
-                                    int *pallorfirst,
-                                    STACK_OF(GENERAL_NAMES) **plist,
-                                    STACK_OF(GENERAL_NAMES) **prto);
-# endif
-int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri,
-                                    X509_ALGOR **palg,
-                                    ASN1_OCTET_STRING **pukm);
-STACK_OF(CMS_RecipientEncryptedKey)
-*CMS_RecipientInfo_kari_get0_reks(CMS_RecipientInfo *ri);
-
-int CMS_RecipientInfo_kari_get0_orig_id(CMS_RecipientInfo *ri,
-                                        X509_ALGOR **pubalg,
-                                        ASN1_BIT_STRING **pubkey,
-                                        ASN1_OCTET_STRING **keyid,
-                                        X509_NAME **issuer,
-                                        ASN1_INTEGER **sno);
-
-int CMS_RecipientInfo_kari_orig_id_cmp(CMS_RecipientInfo *ri, X509 *cert);
-
-int CMS_RecipientEncryptedKey_get0_id(CMS_RecipientEncryptedKey *rek,
-                                      ASN1_OCTET_STRING **keyid,
-                                      ASN1_GENERALIZEDTIME **tm,
-                                      CMS_OtherKeyAttribute **other,
-                                      X509_NAME **issuer, ASN1_INTEGER **sno);
-int CMS_RecipientEncryptedKey_cert_cmp(CMS_RecipientEncryptedKey *rek,
-                                       X509 *cert);
-int CMS_RecipientInfo_kari_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pk);
-EVP_CIPHER_CTX *CMS_RecipientInfo_kari_get0_ctx(CMS_RecipientInfo *ri);
-int CMS_RecipientInfo_kari_decrypt(CMS_ContentInfo *cms,
-                                   CMS_RecipientInfo *ri,
-                                   CMS_RecipientEncryptedKey *rek);
-
-int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg,
-                          ASN1_OCTET_STRING *ukm, int keylen);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_CMS_strings(void);
-
-/* Error codes for the CMS functions. */
-
-/* Function codes. */
-# define CMS_F_CHECK_CONTENT                              99
-# define CMS_F_CMS_ADD0_CERT                              164
-# define CMS_F_CMS_ADD0_RECIPIENT_KEY                     100
-# define CMS_F_CMS_ADD0_RECIPIENT_PASSWORD                165
-# define CMS_F_CMS_ADD1_RECEIPTREQUEST                    158
-# define CMS_F_CMS_ADD1_RECIPIENT_CERT                    101
-# define CMS_F_CMS_ADD1_SIGNER                            102
-# define CMS_F_CMS_ADD1_SIGNINGTIME                       103
-# define CMS_F_CMS_COMPRESS                               104
-# define CMS_F_CMS_COMPRESSEDDATA_CREATE                  105
-# define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO                106
-# define CMS_F_CMS_COPY_CONTENT                           107
-# define CMS_F_CMS_COPY_MESSAGEDIGEST                     108
-# define CMS_F_CMS_DATA                                   109
-# define CMS_F_CMS_DATAFINAL                              110
-# define CMS_F_CMS_DATAINIT                               111
-# define CMS_F_CMS_DECRYPT                                112
-# define CMS_F_CMS_DECRYPT_SET1_KEY                       113
-# define CMS_F_CMS_DECRYPT_SET1_PASSWORD                  166
-# define CMS_F_CMS_DECRYPT_SET1_PKEY                      114
-# define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX               115
-# define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO               116
-# define CMS_F_CMS_DIGESTEDDATA_DO_FINAL                  117
-# define CMS_F_CMS_DIGEST_VERIFY                          118
-# define CMS_F_CMS_ENCODE_RECEIPT                         161
-# define CMS_F_CMS_ENCRYPT                                119
-# define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO              120
-# define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT                  121
-# define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT                  122
-# define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY                 123
-# define CMS_F_CMS_ENVELOPEDDATA_CREATE                   124
-# define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO                 125
-# define CMS_F_CMS_ENVELOPED_DATA_INIT                    126
-# define CMS_F_CMS_ENV_ASN1_CTRL                          171
-# define CMS_F_CMS_FINAL                                  127
-# define CMS_F_CMS_GET0_CERTIFICATE_CHOICES               128
-# define CMS_F_CMS_GET0_CONTENT                           129
-# define CMS_F_CMS_GET0_ECONTENT_TYPE                     130
-# define CMS_F_CMS_GET0_ENVELOPED                         131
-# define CMS_F_CMS_GET0_REVOCATION_CHOICES                132
-# define CMS_F_CMS_GET0_SIGNED                            133
-# define CMS_F_CMS_MSGSIGDIGEST_ADD1                      162
-# define CMS_F_CMS_RECEIPTREQUEST_CREATE0                 159
-# define CMS_F_CMS_RECEIPT_VERIFY                         160
-# define CMS_F_CMS_RECIPIENTINFO_DECRYPT                  134
-# define CMS_F_CMS_RECIPIENTINFO_ENCRYPT                  169
-# define CMS_F_CMS_RECIPIENTINFO_KARI_ENCRYPT             178
-# define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ALG            175
-# define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ORIG_ID        173
-# define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_REKS           172
-# define CMS_F_CMS_RECIPIENTINFO_KARI_ORIG_ID_CMP         174
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT            135
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT            136
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID            137
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP             138
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP            139
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT             140
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT             141
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS           142
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID      143
-# define CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT               167
-# define CMS_F_CMS_RECIPIENTINFO_SET0_KEY                 144
-# define CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD            168
-# define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY                145
-# define CMS_F_CMS_SD_ASN1_CTRL                           170
-# define CMS_F_CMS_SET1_IAS                               176
-# define CMS_F_CMS_SET1_KEYID                             177
-# define CMS_F_CMS_SET1_SIGNERIDENTIFIER                  146
-# define CMS_F_CMS_SET_DETACHED                           147
-# define CMS_F_CMS_SIGN                                   148
-# define CMS_F_CMS_SIGNED_DATA_INIT                       149
-# define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN                150
-# define CMS_F_CMS_SIGNERINFO_SIGN                        151
-# define CMS_F_CMS_SIGNERINFO_VERIFY                      152
-# define CMS_F_CMS_SIGNERINFO_VERIFY_CERT                 153
-# define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT              154
-# define CMS_F_CMS_SIGN_RECEIPT                           163
-# define CMS_F_CMS_STREAM                                 155
-# define CMS_F_CMS_UNCOMPRESS                             156
-# define CMS_F_CMS_VERIFY                                 157
-
-/* Reason codes. */
-# define CMS_R_ADD_SIGNER_ERROR                           99
-# define CMS_R_CERTIFICATE_ALREADY_PRESENT                175
-# define CMS_R_CERTIFICATE_HAS_NO_KEYID                   160
-# define CMS_R_CERTIFICATE_VERIFY_ERROR                   100
-# define CMS_R_CIPHER_INITIALISATION_ERROR                101
-# define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR      102
-# define CMS_R_CMS_DATAFINAL_ERROR                        103
-# define CMS_R_CMS_LIB                                    104
-# define CMS_R_CONTENTIDENTIFIER_MISMATCH                 170
-# define CMS_R_CONTENT_NOT_FOUND                          105
-# define CMS_R_CONTENT_TYPE_MISMATCH                      171
-# define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA           106
-# define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA            107
-# define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA               108
-# define CMS_R_CONTENT_VERIFY_ERROR                       109
-# define CMS_R_CTRL_ERROR                                 110
-# define CMS_R_CTRL_FAILURE                               111
-# define CMS_R_DECRYPT_ERROR                              112
-# define CMS_R_DIGEST_ERROR                               161
-# define CMS_R_ERROR_GETTING_PUBLIC_KEY                   113
-# define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE      114
-# define CMS_R_ERROR_SETTING_KEY                          115
-# define CMS_R_ERROR_SETTING_RECIPIENTINFO                116
-# define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH               117
-# define CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER           176
-# define CMS_R_INVALID_KEY_LENGTH                         118
-# define CMS_R_MD_BIO_INIT_ERROR                          119
-# define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH       120
-# define CMS_R_MESSAGEDIGEST_WRONG_LENGTH                 121
-# define CMS_R_MSGSIGDIGEST_ERROR                         172
-# define CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE          162
-# define CMS_R_MSGSIGDIGEST_WRONG_LENGTH                  163
-# define CMS_R_NEED_ONE_SIGNER                            164
-# define CMS_R_NOT_A_SIGNED_RECEIPT                       165
-# define CMS_R_NOT_ENCRYPTED_DATA                         122
-# define CMS_R_NOT_KEK                                    123
-# define CMS_R_NOT_KEY_AGREEMENT                          181
-# define CMS_R_NOT_KEY_TRANSPORT                          124
-# define CMS_R_NOT_PWRI                                   177
-# define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE            125
-# define CMS_R_NO_CIPHER                                  126
-# define CMS_R_NO_CONTENT                                 127
-# define CMS_R_NO_CONTENT_TYPE                            173
-# define CMS_R_NO_DEFAULT_DIGEST                          128
-# define CMS_R_NO_DIGEST_SET                              129
-# define CMS_R_NO_KEY                                     130
-# define CMS_R_NO_KEY_OR_CERT                             174
-# define CMS_R_NO_MATCHING_DIGEST                         131
-# define CMS_R_NO_MATCHING_RECIPIENT                      132
-# define CMS_R_NO_MATCHING_SIGNATURE                      166
-# define CMS_R_NO_MSGSIGDIGEST                            167
-# define CMS_R_NO_PASSWORD                                178
-# define CMS_R_NO_PRIVATE_KEY                             133
-# define CMS_R_NO_PUBLIC_KEY                              134
-# define CMS_R_NO_RECEIPT_REQUEST                         168
-# define CMS_R_NO_SIGNERS                                 135
-# define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE     136
-# define CMS_R_RECEIPT_DECODE_ERROR                       169
-# define CMS_R_RECIPIENT_ERROR                            137
-# define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND               138
-# define CMS_R_SIGNFINAL_ERROR                            139
-# define CMS_R_SMIME_TEXT_ERROR                           140
-# define CMS_R_STORE_INIT_ERROR                           141
-# define CMS_R_TYPE_NOT_COMPRESSED_DATA                   142
-# define CMS_R_TYPE_NOT_DATA                              143
-# define CMS_R_TYPE_NOT_DIGESTED_DATA                     144
-# define CMS_R_TYPE_NOT_ENCRYPTED_DATA                    145
-# define CMS_R_TYPE_NOT_ENVELOPED_DATA                    146
-# define CMS_R_UNABLE_TO_FINALIZE_CONTEXT                 147
-# define CMS_R_UNKNOWN_CIPHER                             148
-# define CMS_R_UNKNOWN_DIGEST_ALGORIHM                    149
-# define CMS_R_UNKNOWN_ID                                 150
-# define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM          151
-# define CMS_R_UNSUPPORTED_CONTENT_TYPE                   152
-# define CMS_R_UNSUPPORTED_KEK_ALGORITHM                  153
-# define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM       179
-# define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                 154
-# define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE              155
-# define CMS_R_UNSUPPORTED_TYPE                           156
-# define CMS_R_UNWRAP_ERROR                               157
-# define CMS_R_UNWRAP_FAILURE                             180
-# define CMS_R_VERIFICATION_FAILURE                       158
-# define CMS_R_WRAP_ERROR                                 159
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/comp.h b/openflow/usr/include/openssl/comp.h
deleted file mode 100644
index 406c428..0000000
--- a/openflow/usr/include/openssl/comp.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-#ifndef HEADER_COMP_H
-# define HEADER_COMP_H
-
-# include <openssl/crypto.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct comp_ctx_st COMP_CTX;
-
-typedef struct comp_method_st {
-    int type;                   /* NID for compression library */
-    const char *name;           /* A text string to identify the library */
-    int (*init) (COMP_CTX *ctx);
-    void (*finish) (COMP_CTX *ctx);
-    int (*compress) (COMP_CTX *ctx,
-                     unsigned char *out, unsigned int olen,
-                     unsigned char *in, unsigned int ilen);
-    int (*expand) (COMP_CTX *ctx,
-                   unsigned char *out, unsigned int olen,
-                   unsigned char *in, unsigned int ilen);
-    /*
-     * The following two do NOTHING, but are kept for backward compatibility
-     */
-    long (*ctrl) (void);
-    long (*callback_ctrl) (void);
-} COMP_METHOD;
-
-struct comp_ctx_st {
-    COMP_METHOD *meth;
-    unsigned long compress_in;
-    unsigned long compress_out;
-    unsigned long expand_in;
-    unsigned long expand_out;
-    CRYPTO_EX_DATA ex_data;
-};
-
-COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
-void COMP_CTX_free(COMP_CTX *ctx);
-int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
-                        unsigned char *in, int ilen);
-int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
-                      unsigned char *in, int ilen);
-COMP_METHOD *COMP_rle(void);
-COMP_METHOD *COMP_zlib(void);
-void COMP_zlib_cleanup(void);
-
-# ifdef HEADER_BIO_H
-#  ifdef ZLIB
-BIO_METHOD *BIO_f_zlib(void);
-#  endif
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_COMP_strings(void);
-
-/* Error codes for the COMP functions. */
-
-/* Function codes. */
-# define COMP_F_BIO_ZLIB_FLUSH                            99
-# define COMP_F_BIO_ZLIB_NEW                              100
-# define COMP_F_BIO_ZLIB_READ                             101
-# define COMP_F_BIO_ZLIB_WRITE                            102
-
-/* Reason codes. */
-# define COMP_R_ZLIB_DEFLATE_ERROR                        99
-# define COMP_R_ZLIB_INFLATE_ERROR                        100
-# define COMP_R_ZLIB_NOT_SUPPORTED                        101
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/conf.h b/openflow/usr/include/openssl/conf.h
deleted file mode 100644
index 8d926d5..0000000
--- a/openflow/usr/include/openssl/conf.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* crypto/conf/conf.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef  HEADER_CONF_H
-# define HEADER_CONF_H
-
-# include <openssl/bio.h>
-# include <openssl/lhash.h>
-# include <openssl/stack.h>
-# include <openssl/safestack.h>
-# include <openssl/e_os2.h>
-
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    char *section;
-    char *name;
-    char *value;
-} CONF_VALUE;
-
-DECLARE_STACK_OF(CONF_VALUE)
-DECLARE_LHASH_OF(CONF_VALUE);
-
-struct conf_st;
-struct conf_method_st;
-typedef struct conf_method_st CONF_METHOD;
-
-struct conf_method_st {
-    const char *name;
-    CONF *(*create) (CONF_METHOD *meth);
-    int (*init) (CONF *conf);
-    int (*destroy) (CONF *conf);
-    int (*destroy_data) (CONF *conf);
-    int (*load_bio) (CONF *conf, BIO *bp, long *eline);
-    int (*dump) (const CONF *conf, BIO *bp);
-    int (*is_number) (const CONF *conf, char c);
-    int (*to_int) (const CONF *conf, char c);
-    int (*load) (CONF *conf, const char *name, long *eline);
-};
-
-/* Module definitions */
-
-typedef struct conf_imodule_st CONF_IMODULE;
-typedef struct conf_module_st CONF_MODULE;
-
-DECLARE_STACK_OF(CONF_MODULE)
-DECLARE_STACK_OF(CONF_IMODULE)
-
-/* DSO module function typedefs */
-typedef int conf_init_func (CONF_IMODULE *md, const CONF *cnf);
-typedef void conf_finish_func (CONF_IMODULE *md);
-
-# define CONF_MFLAGS_IGNORE_ERRORS       0x1
-# define CONF_MFLAGS_IGNORE_RETURN_CODES 0x2
-# define CONF_MFLAGS_SILENT              0x4
-# define CONF_MFLAGS_NO_DSO              0x8
-# define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10
-# define CONF_MFLAGS_DEFAULT_SECTION     0x20
-
-int CONF_set_default_method(CONF_METHOD *meth);
-void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);
-LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
-                                long *eline);
-# ifndef OPENSSL_NO_FP_API
-LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-                                   long *eline);
-# endif
-LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
-                                    long *eline);
-STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
-                                       const char *section);
-char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
-                      const char *name);
-long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
-                     const char *name);
-void CONF_free(LHASH_OF(CONF_VALUE) *conf);
-int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);
-int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);
-
-void OPENSSL_config(const char *config_name);
-void OPENSSL_no_config(void);
-
-/*
- * New conf code.  The semantics are different from the functions above. If
- * that wasn't the case, the above functions would have been replaced
- */
-
-struct conf_st {
-    CONF_METHOD *meth;
-    void *meth_data;
-    LHASH_OF(CONF_VALUE) *data;
-};
-
-CONF *NCONF_new(CONF_METHOD *meth);
-CONF_METHOD *NCONF_default(void);
-CONF_METHOD *NCONF_WIN32(void);
-# if 0                          /* Just to give you an idea of what I have in
-                                 * mind */
-CONF_METHOD *NCONF_XML(void);
-# endif
-void NCONF_free(CONF *conf);
-void NCONF_free_data(CONF *conf);
-
-int NCONF_load(CONF *conf, const char *file, long *eline);
-# ifndef OPENSSL_NO_FP_API
-int NCONF_load_fp(CONF *conf, FILE *fp, long *eline);
-# endif
-int NCONF_load_bio(CONF *conf, BIO *bp, long *eline);
-STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,
-                                        const char *section);
-char *NCONF_get_string(const CONF *conf, const char *group, const char *name);
-int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
-                       long *result);
-int NCONF_dump_fp(const CONF *conf, FILE *out);
-int NCONF_dump_bio(const CONF *conf, BIO *out);
-
-# if 0                          /* The following function has no error
-                                 * checking, and should therefore be avoided */
-long NCONF_get_number(CONF *conf, char *group, char *name);
-# else
-#  define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r)
-# endif
-
-/* Module functions */
-
-int CONF_modules_load(const CONF *cnf, const char *appname,
-                      unsigned long flags);
-int CONF_modules_load_file(const char *filename, const char *appname,
-                           unsigned long flags);
-void CONF_modules_unload(int all);
-void CONF_modules_finish(void);
-void CONF_modules_free(void);
-int CONF_module_add(const char *name, conf_init_func *ifunc,
-                    conf_finish_func *ffunc);
-
-const char *CONF_imodule_get_name(const CONF_IMODULE *md);
-const char *CONF_imodule_get_value(const CONF_IMODULE *md);
-void *CONF_imodule_get_usr_data(const CONF_IMODULE *md);
-void CONF_imodule_set_usr_data(CONF_IMODULE *md, void *usr_data);
-CONF_MODULE *CONF_imodule_get_module(const CONF_IMODULE *md);
-unsigned long CONF_imodule_get_flags(const CONF_IMODULE *md);
-void CONF_imodule_set_flags(CONF_IMODULE *md, unsigned long flags);
-void *CONF_module_get_usr_data(CONF_MODULE *pmod);
-void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data);
-
-char *CONF_get1_default_config_file(void);
-
-int CONF_parse_list(const char *list, int sep, int nospc,
-                    int (*list_cb) (const char *elem, int len, void *usr),
-                    void *arg);
-
-void OPENSSL_load_builtin_modules(void);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_CONF_strings(void);
-
-/* Error codes for the CONF functions. */
-
-/* Function codes. */
-# define CONF_F_CONF_DUMP_FP                              104
-# define CONF_F_CONF_LOAD                                 100
-# define CONF_F_CONF_LOAD_BIO                             102
-# define CONF_F_CONF_LOAD_FP                              103
-# define CONF_F_CONF_MODULES_LOAD                         116
-# define CONF_F_CONF_PARSE_LIST                           119
-# define CONF_F_DEF_LOAD                                  120
-# define CONF_F_DEF_LOAD_BIO                              121
-# define CONF_F_MODULE_INIT                               115
-# define CONF_F_MODULE_LOAD_DSO                           117
-# define CONF_F_MODULE_RUN                                118
-# define CONF_F_NCONF_DUMP_BIO                            105
-# define CONF_F_NCONF_DUMP_FP                             106
-# define CONF_F_NCONF_GET_NUMBER                          107
-# define CONF_F_NCONF_GET_NUMBER_E                        112
-# define CONF_F_NCONF_GET_SECTION                         108
-# define CONF_F_NCONF_GET_STRING                          109
-# define CONF_F_NCONF_LOAD                                113
-# define CONF_F_NCONF_LOAD_BIO                            110
-# define CONF_F_NCONF_LOAD_FP                             114
-# define CONF_F_NCONF_NEW                                 111
-# define CONF_F_STR_COPY                                  101
-
-/* Reason codes. */
-# define CONF_R_ERROR_LOADING_DSO                         110
-# define CONF_R_LIST_CANNOT_BE_NULL                       115
-# define CONF_R_MISSING_CLOSE_SQUARE_BRACKET              100
-# define CONF_R_MISSING_EQUAL_SIGN                        101
-# define CONF_R_MISSING_FINISH_FUNCTION                   111
-# define CONF_R_MISSING_INIT_FUNCTION                     112
-# define CONF_R_MODULE_INITIALIZATION_ERROR               109
-# define CONF_R_NO_CLOSE_BRACE                            102
-# define CONF_R_NO_CONF                                   105
-# define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE           106
-# define CONF_R_NO_SECTION                                107
-# define CONF_R_NO_SUCH_FILE                              114
-# define CONF_R_NO_VALUE                                  108
-# define CONF_R_UNABLE_TO_CREATE_NEW_SECTION              103
-# define CONF_R_UNKNOWN_MODULE_NAME                       113
-# define CONF_R_VARIABLE_HAS_NO_VALUE                     104
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/conf_api.h b/openflow/usr/include/openssl/conf_api.h
deleted file mode 100644
index e478f7d..0000000
--- a/openflow/usr/include/openssl/conf_api.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* conf_api.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef  HEADER_CONF_API_H
-# define HEADER_CONF_API_H
-
-# include <openssl/lhash.h>
-# include <openssl/conf.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Up until OpenSSL 0.9.5a, this was new_section */
-CONF_VALUE *_CONF_new_section(CONF *conf, const char *section);
-/* Up until OpenSSL 0.9.5a, this was get_section */
-CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section);
-/* Up until OpenSSL 0.9.5a, this was CONF_get_section */
-STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf,
-                                               const char *section);
-
-int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value);
-char *_CONF_get_string(const CONF *conf, const char *section,
-                       const char *name);
-long _CONF_get_number(const CONF *conf, const char *section,
-                      const char *name);
-
-int _CONF_new_data(CONF *conf);
-void _CONF_free_data(CONF *conf);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/crypto.h b/openflow/usr/include/openssl/crypto.h
deleted file mode 100644
index 6c644ce..0000000
--- a/openflow/usr/include/openssl/crypto.h
+++ /dev/null
@@ -1,661 +0,0 @@
-/* crypto/crypto.h */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_CRYPTO_H
-# define HEADER_CRYPTO_H
-
-# include <stdlib.h>
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_FP_API
-#  include <stdio.h>
-# endif
-
-# include <openssl/stack.h>
-# include <openssl/safestack.h>
-# include <openssl/opensslv.h>
-# include <openssl/ossl_typ.h>
-
-# ifdef CHARSET_EBCDIC
-#  include <openssl/ebcdic.h>
-# endif
-
-/*
- * Resolve problems on some operating systems with symbol names that clash
- * one way or another
- */
-# include <openssl/symhacks.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Backward compatibility to SSLeay */
-/*
- * This is more to be used to check the correct DLL is being used in the MS
- * world.
- */
-# define SSLEAY_VERSION_NUMBER   OPENSSL_VERSION_NUMBER
-# define SSLEAY_VERSION          0
-/* #define SSLEAY_OPTIONS       1 no longer supported */
-# define SSLEAY_CFLAGS           2
-# define SSLEAY_BUILT_ON         3
-# define SSLEAY_PLATFORM         4
-# define SSLEAY_DIR              5
-
-/* Already declared in ossl_typ.h */
-# if 0
-typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
-/* Called when a new object is created */
-typedef int CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                           int idx, long argl, void *argp);
-/* Called when an object is free()ed */
-typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                             int idx, long argl, void *argp);
-/* Called when we need to dup an object */
-typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,
-                           void *from_d, int idx, long argl, void *argp);
-# endif
-
-/* A generic structure to pass assorted data in a expandable way */
-typedef struct openssl_item_st {
-    int code;
-    void *value;                /* Not used for flag attributes */
-    size_t value_size;          /* Max size of value for output, length for
-                                 * input */
-    size_t *value_length;       /* Returned length of value for output */
-} OPENSSL_ITEM;
-
-/*
- * When changing the CRYPTO_LOCK_* list, be sure to maintin the text lock
- * names in cryptlib.c
- */
-
-# define CRYPTO_LOCK_ERR                 1
-# define CRYPTO_LOCK_EX_DATA             2
-# define CRYPTO_LOCK_X509                3
-# define CRYPTO_LOCK_X509_INFO           4
-# define CRYPTO_LOCK_X509_PKEY           5
-# define CRYPTO_LOCK_X509_CRL            6
-# define CRYPTO_LOCK_X509_REQ            7
-# define CRYPTO_LOCK_DSA                 8
-# define CRYPTO_LOCK_RSA                 9
-# define CRYPTO_LOCK_EVP_PKEY            10
-# define CRYPTO_LOCK_X509_STORE          11
-# define CRYPTO_LOCK_SSL_CTX             12
-# define CRYPTO_LOCK_SSL_CERT            13
-# define CRYPTO_LOCK_SSL_SESSION         14
-# define CRYPTO_LOCK_SSL_SESS_CERT       15
-# define CRYPTO_LOCK_SSL                 16
-# define CRYPTO_LOCK_SSL_METHOD          17
-# define CRYPTO_LOCK_RAND                18
-# define CRYPTO_LOCK_RAND2               19
-# define CRYPTO_LOCK_MALLOC              20
-# define CRYPTO_LOCK_BIO                 21
-# define CRYPTO_LOCK_GETHOSTBYNAME       22
-# define CRYPTO_LOCK_GETSERVBYNAME       23
-# define CRYPTO_LOCK_READDIR             24
-# define CRYPTO_LOCK_RSA_BLINDING        25
-# define CRYPTO_LOCK_DH                  26
-# define CRYPTO_LOCK_MALLOC2             27
-# define CRYPTO_LOCK_DSO                 28
-# define CRYPTO_LOCK_DYNLOCK             29
-# define CRYPTO_LOCK_ENGINE              30
-# define CRYPTO_LOCK_UI                  31
-# define CRYPTO_LOCK_ECDSA               32
-# define CRYPTO_LOCK_EC                  33
-# define CRYPTO_LOCK_ECDH                34
-# define CRYPTO_LOCK_BN                  35
-# define CRYPTO_LOCK_EC_PRE_COMP         36
-# define CRYPTO_LOCK_STORE               37
-# define CRYPTO_LOCK_COMP                38
-# define CRYPTO_LOCK_FIPS                39
-# define CRYPTO_LOCK_FIPS2               40
-# define CRYPTO_NUM_LOCKS                41
-
-# define CRYPTO_LOCK             1
-# define CRYPTO_UNLOCK           2
-# define CRYPTO_READ             4
-# define CRYPTO_WRITE            8
-
-# ifndef OPENSSL_NO_LOCKING
-#  ifndef CRYPTO_w_lock
-#   define CRYPTO_w_lock(type)     \
-        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-#   define CRYPTO_w_unlock(type)   \
-        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-#   define CRYPTO_r_lock(type)     \
-        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-#   define CRYPTO_r_unlock(type)   \
-        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-#   define CRYPTO_add(addr,amount,type)    \
-        CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
-#  endif
-# else
-#  define CRYPTO_w_lock(a)
-#  define CRYPTO_w_unlock(a)
-#  define CRYPTO_r_lock(a)
-#  define CRYPTO_r_unlock(a)
-#  define CRYPTO_add(a,b,c)       ((*(a))+=(b))
-# endif
-
-/*
- * Some applications as well as some parts of OpenSSL need to allocate and
- * deallocate locks in a dynamic fashion.  The following typedef makes this
- * possible in a type-safe manner.
- */
-/* struct CRYPTO_dynlock_value has to be defined by the application. */
-typedef struct {
-    int references;
-    struct CRYPTO_dynlock_value *data;
-} CRYPTO_dynlock;
-
-/*
- * The following can be used to detect memory leaks in the SSLeay library. It
- * used, it turns on malloc checking
- */
-
-# define CRYPTO_MEM_CHECK_OFF    0x0/* an enume */
-# define CRYPTO_MEM_CHECK_ON     0x1/* a bit */
-# define CRYPTO_MEM_CHECK_ENABLE 0x2/* a bit */
-# define CRYPTO_MEM_CHECK_DISABLE 0x3/* an enume */
-
-/*
- * The following are bit values to turn on or off options connected to the
- * malloc checking functionality
- */
-
-/* Adds time to the memory checking information */
-# define V_CRYPTO_MDEBUG_TIME    0x1/* a bit */
-/* Adds thread number to the memory checking information */
-# define V_CRYPTO_MDEBUG_THREAD  0x2/* a bit */
-
-# define V_CRYPTO_MDEBUG_ALL (V_CRYPTO_MDEBUG_TIME | V_CRYPTO_MDEBUG_THREAD)
-
-/* predec of the BIO type */
-typedef struct bio_st BIO_dummy;
-
-struct crypto_ex_data_st {
-    STACK_OF(void) *sk;
-    /* gcc is screwing up this data structure :-( */
-    int dummy;
-};
-DECLARE_STACK_OF(void)
-
-/*
- * This stuff is basically class callback functions The current classes are
- * SSL_CTX, SSL, SSL_SESSION, and a few more
- */
-
-typedef struct crypto_ex_data_func_st {
-    long argl;                  /* Arbitary long */
-    void *argp;                 /* Arbitary void * */
-    CRYPTO_EX_new *new_func;
-    CRYPTO_EX_free *free_func;
-    CRYPTO_EX_dup *dup_func;
-} CRYPTO_EX_DATA_FUNCS;
-
-DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS)
-
-/*
- * Per class, we have a STACK of CRYPTO_EX_DATA_FUNCS for each CRYPTO_EX_DATA
- * entry.
- */
-
-# define CRYPTO_EX_INDEX_BIO             0
-# define CRYPTO_EX_INDEX_SSL             1
-# define CRYPTO_EX_INDEX_SSL_CTX         2
-# define CRYPTO_EX_INDEX_SSL_SESSION     3
-# define CRYPTO_EX_INDEX_X509_STORE      4
-# define CRYPTO_EX_INDEX_X509_STORE_CTX  5
-# define CRYPTO_EX_INDEX_RSA             6
-# define CRYPTO_EX_INDEX_DSA             7
-# define CRYPTO_EX_INDEX_DH              8
-# define CRYPTO_EX_INDEX_ENGINE          9
-# define CRYPTO_EX_INDEX_X509            10
-# define CRYPTO_EX_INDEX_UI              11
-# define CRYPTO_EX_INDEX_ECDSA           12
-# define CRYPTO_EX_INDEX_ECDH            13
-# define CRYPTO_EX_INDEX_COMP            14
-# define CRYPTO_EX_INDEX_STORE           15
-
-/*
- * Dynamically assigned indexes start from this value (don't use directly,
- * use via CRYPTO_ex_data_new_class).
- */
-# define CRYPTO_EX_INDEX_USER            100
-
-/*
- * This is the default callbacks, but we can have others as well: this is
- * needed in Win32 where the application malloc and the library malloc may
- * not be the same.
- */
-# define CRYPTO_malloc_init()    CRYPTO_set_mem_functions(\
-        malloc, realloc, free)
-
-# if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD
-#  ifndef CRYPTO_MDEBUG         /* avoid duplicate #define */
-#   define CRYPTO_MDEBUG
-#  endif
-# endif
-
-/*
- * Set standard debugging functions (not done by default unless CRYPTO_MDEBUG
- * is defined)
- */
-# define CRYPTO_malloc_debug_init()      do {\
-        CRYPTO_set_mem_debug_functions(\
-                CRYPTO_dbg_malloc,\
-                CRYPTO_dbg_realloc,\
-                CRYPTO_dbg_free,\
-                CRYPTO_dbg_set_options,\
-                CRYPTO_dbg_get_options);\
-        } while(0)
-
-int CRYPTO_mem_ctrl(int mode);
-int CRYPTO_is_mem_check_on(void);
-
-/* for applications */
-# define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)
-# define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF)
-
-/* for library-internal use */
-# define MemCheck_on()   CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE)
-# define MemCheck_off()  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)
-# define is_MemCheck_on() CRYPTO_is_mem_check_on()
-
-# define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,__FILE__,__LINE__)
-# define OPENSSL_strdup(str)     CRYPTO_strdup((str),__FILE__,__LINE__)
-# define OPENSSL_realloc(addr,num) \
-        CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)
-# define OPENSSL_realloc_clean(addr,old_num,num) \
-        CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)
-# define OPENSSL_remalloc(addr,num) \
-        CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)
-# define OPENSSL_freeFunc        CRYPTO_free
-# define OPENSSL_free(addr)      CRYPTO_free(addr)
-
-# define OPENSSL_malloc_locked(num) \
-        CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)
-# define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)
-
-const char *SSLeay_version(int type);
-unsigned long SSLeay(void);
-
-int OPENSSL_issetugid(void);
-
-/* An opaque type representing an implementation of "ex_data" support */
-typedef struct st_CRYPTO_EX_DATA_IMPL CRYPTO_EX_DATA_IMPL;
-/* Return an opaque pointer to the current "ex_data" implementation */
-const CRYPTO_EX_DATA_IMPL *CRYPTO_get_ex_data_implementation(void);
-/* Sets the "ex_data" implementation to be used (if it's not too late) */
-int CRYPTO_set_ex_data_implementation(const CRYPTO_EX_DATA_IMPL *i);
-/* Get a new "ex_data" class, and return the corresponding "class_index" */
-int CRYPTO_ex_data_new_class(void);
-/* Within a given class, get/register a new index */
-int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
-                            CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
-                            CRYPTO_EX_free *free_func);
-/*
- * Initialise/duplicate/free CRYPTO_EX_DATA variables corresponding to a
- * given class (invokes whatever per-class callbacks are applicable)
- */
-int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
-int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
-                       CRYPTO_EX_DATA *from);
-void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
-/*
- * Get/set data in a CRYPTO_EX_DATA variable corresponding to a particular
- * index (relative to the class type involved)
- */
-int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val);
-void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx);
-/*
- * This function cleans up all "ex_data" state. It mustn't be called under
- * potential race-conditions.
- */
-void CRYPTO_cleanup_all_ex_data(void);
-
-int CRYPTO_get_new_lockid(char *name);
-
-int CRYPTO_num_locks(void);     /* return CRYPTO_NUM_LOCKS (shared libs!) */
-void CRYPTO_lock(int mode, int type, const char *file, int line);
-void CRYPTO_set_locking_callback(void (*func) (int mode, int type,
-                                               const char *file, int line));
-void (*CRYPTO_get_locking_callback(void)) (int mode, int type,
-                                           const char *file, int line);
-void CRYPTO_set_add_lock_callback(int (*func)
-                                   (int *num, int mount, int type,
-                                    const char *file, int line));
-int (*CRYPTO_get_add_lock_callback(void)) (int *num, int mount, int type,
-                                           const char *file, int line);
-
-/* Don't use this structure directly. */
-typedef struct crypto_threadid_st {
-    void *ptr;
-    unsigned long val;
-} CRYPTO_THREADID;
-/* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */
-void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val);
-void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr);
-int CRYPTO_THREADID_set_callback(void (*threadid_func) (CRYPTO_THREADID *));
-void (*CRYPTO_THREADID_get_callback(void)) (CRYPTO_THREADID *);
-void CRYPTO_THREADID_current(CRYPTO_THREADID *id);
-int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, const CRYPTO_THREADID *b);
-void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, const CRYPTO_THREADID *src);
-unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id);
-# ifndef OPENSSL_NO_DEPRECATED
-void CRYPTO_set_id_callback(unsigned long (*func) (void));
-unsigned long (*CRYPTO_get_id_callback(void)) (void);
-unsigned long CRYPTO_thread_id(void);
-# endif
-
-const char *CRYPTO_get_lock_name(int type);
-int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
-                    int line);
-
-int CRYPTO_get_new_dynlockid(void);
-void CRYPTO_destroy_dynlockid(int i);
-struct CRYPTO_dynlock_value *CRYPTO_get_dynlock_value(int i);
-void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value
-                                        *(*dyn_create_function) (const char
-                                                                 *file,
-                                                                 int line));
-void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)
-                                       (int mode,
-                                        struct CRYPTO_dynlock_value *l,
-                                        const char *file, int line));
-void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)
-                                          (struct CRYPTO_dynlock_value *l,
-                                           const char *file, int line));
-struct CRYPTO_dynlock_value
-*(*CRYPTO_get_dynlock_create_callback(void)) (const char *file, int line);
-void (*CRYPTO_get_dynlock_lock_callback(void)) (int mode,
-                                                struct CRYPTO_dynlock_value
-                                                *l, const char *file,
-                                                int line);
-void (*CRYPTO_get_dynlock_destroy_callback(void)) (struct CRYPTO_dynlock_value
-                                                   *l, const char *file,
-                                                   int line);
-
-/*
- * CRYPTO_set_mem_functions includes CRYPTO_set_locked_mem_functions -- call
- * the latter last if you need different functions
- */
-int CRYPTO_set_mem_functions(void *(*m) (size_t), void *(*r) (void *, size_t),
-                             void (*f) (void *));
-int CRYPTO_set_locked_mem_functions(void *(*m) (size_t),
-                                    void (*free_func) (void *));
-int CRYPTO_set_mem_ex_functions(void *(*m) (size_t, const char *, int),
-                                void *(*r) (void *, size_t, const char *,
-                                            int), void (*f) (void *));
-int CRYPTO_set_locked_mem_ex_functions(void *(*m) (size_t, const char *, int),
-                                       void (*free_func) (void *));
-int CRYPTO_set_mem_debug_functions(void (*m)
-                                    (void *, int, const char *, int, int),
-                                   void (*r) (void *, void *, int,
-                                              const char *, int, int),
-                                   void (*f) (void *, int), void (*so) (long),
-                                   long (*go) (void));
-void CRYPTO_get_mem_functions(void *(**m) (size_t),
-                              void *(**r) (void *, size_t),
-                              void (**f) (void *));
-void CRYPTO_get_locked_mem_functions(void *(**m) (size_t),
-                                     void (**f) (void *));
-void CRYPTO_get_mem_ex_functions(void *(**m) (size_t, const char *, int),
-                                 void *(**r) (void *, size_t, const char *,
-                                              int), void (**f) (void *));
-void CRYPTO_get_locked_mem_ex_functions(void
-                                        *(**m) (size_t, const char *, int),
-                                        void (**f) (void *));
-void CRYPTO_get_mem_debug_functions(void (**m)
-                                     (void *, int, const char *, int, int),
-                                    void (**r) (void *, void *, int,
-                                                const char *, int, int),
-                                    void (**f) (void *, int),
-                                    void (**so) (long), long (**go) (void));
-
-void *CRYPTO_malloc_locked(int num, const char *file, int line);
-void CRYPTO_free_locked(void *ptr);
-void *CRYPTO_malloc(int num, const char *file, int line);
-char *CRYPTO_strdup(const char *str, const char *file, int line);
-void CRYPTO_free(void *ptr);
-void *CRYPTO_realloc(void *addr, int num, const char *file, int line);
-void *CRYPTO_realloc_clean(void *addr, int old_num, int num, const char *file,
-                           int line);
-void *CRYPTO_remalloc(void *addr, int num, const char *file, int line);
-
-void OPENSSL_cleanse(void *ptr, size_t len);
-
-void CRYPTO_set_mem_debug_options(long bits);
-long CRYPTO_get_mem_debug_options(void);
-
-# define CRYPTO_push_info(info) \
-        CRYPTO_push_info_(info, __FILE__, __LINE__);
-int CRYPTO_push_info_(const char *info, const char *file, int line);
-int CRYPTO_pop_info(void);
-int CRYPTO_remove_all_info(void);
-
-/*
- * Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro;
- * used as default in CRYPTO_MDEBUG compilations):
- */
-/*-
- * The last argument has the following significance:
- *
- * 0:   called before the actual memory allocation has taken place
- * 1:   called after the actual memory allocation has taken place
- */
-void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
-                       int before_p);
-void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num, const char *file,
-                        int line, int before_p);
-void CRYPTO_dbg_free(void *addr, int before_p);
-/*-
- * Tell the debugging code about options.  By default, the following values
- * apply:
- *
- * 0:                           Clear all options.
- * V_CRYPTO_MDEBUG_TIME (1):    Set the "Show Time" option.
- * V_CRYPTO_MDEBUG_THREAD (2):  Set the "Show Thread Number" option.
- * V_CRYPTO_MDEBUG_ALL (3):     1 + 2
- */
-void CRYPTO_dbg_set_options(long bits);
-long CRYPTO_dbg_get_options(void);
-
-# ifndef OPENSSL_NO_FP_API
-void CRYPTO_mem_leaks_fp(FILE *);
-# endif
-void CRYPTO_mem_leaks(struct bio_st *bio);
-/* unsigned long order, char *file, int line, int num_bytes, char *addr */
-typedef void *CRYPTO_MEM_LEAK_CB (unsigned long, const char *, int, int,
-                                  void *);
-void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);
-
-/* die if we have to */
-void OpenSSLDie(const char *file, int line, const char *assertion);
-# define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))
-
-unsigned long *OPENSSL_ia32cap_loc(void);
-# define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
-int OPENSSL_isservice(void);
-
-int FIPS_mode(void);
-int FIPS_mode_set(int r);
-
-void OPENSSL_init(void);
-
-# define fips_md_init(alg) fips_md_init_ctx(alg, alg)
-
-# ifdef OPENSSL_FIPS
-#  define fips_md_init_ctx(alg, cx) \
-        int alg##_Init(cx##_CTX *c) \
-        { \
-        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \
-                "Low level API call to digest " #alg " forbidden in FIPS mode!"); \
-        return private_##alg##_Init(c); \
-        } \
-        int private_##alg##_Init(cx##_CTX *c)
-
-#  define fips_cipher_abort(alg) \
-        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \
-                "Low level API call to cipher " #alg " forbidden in FIPS mode!")
-
-# else
-#  define fips_md_init_ctx(alg, cx) \
-        int alg##_Init(cx##_CTX *c)
-#  define fips_cipher_abort(alg) while(0)
-# endif
-
-/*
- * CRYPTO_memcmp returns zero iff the |len| bytes at |a| and |b| are equal.
- * It takes an amount of time dependent on |len|, but independent of the
- * contents of |a| and |b|. Unlike memcmp, it cannot be used to put elements
- * into a defined order as the return value when a != b is undefined, other
- * than to be non-zero.
- */
-int CRYPTO_memcmp(const volatile void *a, const volatile void *b, size_t len);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_CRYPTO_strings(void);
-
-/* Error codes for the CRYPTO functions. */
-
-/* Function codes. */
-# define CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX                 100
-# define CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID                103
-# define CRYPTO_F_CRYPTO_GET_NEW_LOCKID                   101
-# define CRYPTO_F_CRYPTO_SET_EX_DATA                      102
-# define CRYPTO_F_DEF_ADD_INDEX                           104
-# define CRYPTO_F_DEF_GET_CLASS                           105
-# define CRYPTO_F_FIPS_MODE_SET                           109
-# define CRYPTO_F_INT_DUP_EX_DATA                         106
-# define CRYPTO_F_INT_FREE_EX_DATA                        107
-# define CRYPTO_F_INT_NEW_EX_DATA                         108
-
-/* Reason codes. */
-# define CRYPTO_R_FIPS_MODE_NOT_SUPPORTED                 101
-# define CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK              100
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/des.h b/openflow/usr/include/openssl/des.h
deleted file mode 100644
index 1b40144..0000000
--- a/openflow/usr/include/openssl/des.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/* crypto/des/des.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_NEW_DES_H
-# define HEADER_NEW_DES_H
-
-# include <openssl/e_os2.h>     /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG
-                                 * (via openssl/opensslconf.h */
-
-# ifdef OPENSSL_NO_DES
-#  error DES is disabled.
-# endif
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef unsigned char DES_cblock[8];
-typedef /* const */ unsigned char const_DES_cblock[8];
-/*
- * With "const", gcc 2.8.1 on Solaris thinks that DES_cblock * and
- * const_DES_cblock * are incompatible pointer types.
- */
-
-typedef struct DES_ks {
-    union {
-        DES_cblock cblock;
-        /*
-         * make sure things are correct size on machines with 8 byte longs
-         */
-        DES_LONG deslong[2];
-    } ks[16];
-} DES_key_schedule;
-
-# ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
-#  ifndef OPENSSL_ENABLE_OLD_DES_SUPPORT
-#   define OPENSSL_ENABLE_OLD_DES_SUPPORT
-#  endif
-# endif
-
-# ifdef OPENSSL_ENABLE_OLD_DES_SUPPORT
-#  include <openssl/des_old.h>
-# endif
-
-# define DES_KEY_SZ      (sizeof(DES_cblock))
-# define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))
-
-# define DES_ENCRYPT     1
-# define DES_DECRYPT     0
-
-# define DES_CBC_MODE    0
-# define DES_PCBC_MODE   1
-
-# define DES_ecb2_encrypt(i,o,k1,k2,e) \
-        DES_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-# define DES_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-        DES_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-# define DES_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-        DES_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-# define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-        DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-OPENSSL_DECLARE_GLOBAL(int, DES_check_key); /* defaults to false */
-# define DES_check_key OPENSSL_GLOBAL_REF(DES_check_key)
-OPENSSL_DECLARE_GLOBAL(int, DES_rw_mode); /* defaults to DES_PCBC_MODE */
-# define DES_rw_mode OPENSSL_GLOBAL_REF(DES_rw_mode)
-
-const char *DES_options(void);
-void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
-                      DES_key_schedule *ks1, DES_key_schedule *ks2,
-                      DES_key_schedule *ks3, int enc);
-DES_LONG DES_cbc_cksum(const unsigned char *input, DES_cblock *output,
-                       long length, DES_key_schedule *schedule,
-                       const_DES_cblock *ivec);
-/* DES_cbc_encrypt does not update the IV!  Use DES_ncbc_encrypt instead. */
-void DES_cbc_encrypt(const unsigned char *input, unsigned char *output,
-                     long length, DES_key_schedule *schedule,
-                     DES_cblock *ivec, int enc);
-void DES_ncbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule,
-                      DES_cblock *ivec, int enc);
-void DES_xcbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule,
-                      DES_cblock *ivec, const_DES_cblock *inw,
-                      const_DES_cblock *outw, int enc);
-void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
-                     long length, DES_key_schedule *schedule,
-                     DES_cblock *ivec, int enc);
-void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
-                     DES_key_schedule *ks, int enc);
-
-/*
- * This is the DES encryption function that gets called by just about every
- * other DES routine in the library.  You should not use this function except
- * to implement 'modes' of DES.  I say this because the functions that call
- * this routine do the conversion from 'char *' to long, and this needs to be
- * done to make sure 'non-aligned' memory access do not occur.  The
- * characters are loaded 'little endian'. Data is a pointer to 2 unsigned
- * long's and ks is the DES_key_schedule to use.  enc, is non zero specifies
- * encryption, zero if decryption.
- */
-void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc);
-
-/*
- * This functions is the same as DES_encrypt1() except that the DES initial
- * permutation (IP) and final permutation (FP) have been left out.  As for
- * DES_encrypt1(), you should not use this function. It is used by the
- * routines in the library that implement triple DES. IP() DES_encrypt2()
- * DES_encrypt2() DES_encrypt2() FP() is the same as DES_encrypt1()
- * DES_encrypt1() DES_encrypt1() except faster :-).
- */
-void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc);
-
-void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
-                  DES_key_schedule *ks2, DES_key_schedule *ks3);
-void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
-                  DES_key_schedule *ks2, DES_key_schedule *ks3);
-void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
-                          long length,
-                          DES_key_schedule *ks1, DES_key_schedule *ks2,
-                          DES_key_schedule *ks3, DES_cblock *ivec, int enc);
-void DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
-                           long length,
-                           DES_key_schedule *ks1, DES_key_schedule *ks2,
-                           DES_key_schedule *ks3,
-                           DES_cblock *ivec1, DES_cblock *ivec2, int enc);
-void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                            long length, DES_key_schedule *ks1,
-                            DES_key_schedule *ks2, DES_key_schedule *ks3,
-                            DES_cblock *ivec, int *num, int enc);
-void DES_ede3_cfb_encrypt(const unsigned char *in, unsigned char *out,
-                          int numbits, long length, DES_key_schedule *ks1,
-                          DES_key_schedule *ks2, DES_key_schedule *ks3,
-                          DES_cblock *ivec, int enc);
-void DES_ede3_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                            long length, DES_key_schedule *ks1,
-                            DES_key_schedule *ks2, DES_key_schedule *ks3,
-                            DES_cblock *ivec, int *num);
-# if 0
-void DES_xwhite_in2out(const_DES_cblock *DES_key, const_DES_cblock *in_white,
-                       DES_cblock *out_white);
-# endif
-
-int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,
-                 DES_cblock *iv);
-int DES_enc_write(int fd, const void *buf, int len, DES_key_schedule *sched,
-                  DES_cblock *iv);
-char *DES_fcrypt(const char *buf, const char *salt, char *ret);
-char *DES_crypt(const char *buf, const char *salt);
-void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
-                     long length, DES_key_schedule *schedule,
-                     DES_cblock *ivec);
-void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule,
-                      DES_cblock *ivec, int enc);
-DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
-                        long length, int out_count, DES_cblock *seed);
-int DES_random_key(DES_cblock *ret);
-void DES_set_odd_parity(DES_cblock *key);
-int DES_check_key_parity(const_DES_cblock *key);
-int DES_is_weak_key(const_DES_cblock *key);
-/*
- * DES_set_key (= set_key = DES_key_sched = key_sched) calls
- * DES_set_key_checked if global variable DES_check_key is set,
- * DES_set_key_unchecked otherwise.
- */
-int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule);
-int DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule);
-int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule);
-void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule);
-# ifdef OPENSSL_FIPS
-void private_DES_set_key_unchecked(const_DES_cblock *key,
-                                   DES_key_schedule *schedule);
-# endif
-void DES_string_to_key(const char *str, DES_cblock *key);
-void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2);
-void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, DES_key_schedule *schedule,
-                       DES_cblock *ivec, int *num, int enc);
-void DES_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, DES_key_schedule *schedule,
-                       DES_cblock *ivec, int *num);
-
-int DES_read_password(DES_cblock *key, const char *prompt, int verify);
-int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2,
-                        const char *prompt, int verify);
-
-# define DES_fixup_key_parity DES_set_odd_parity
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/des_old.h b/openflow/usr/include/openssl/des_old.h
deleted file mode 100644
index ee7607a..0000000
--- a/openflow/usr/include/openssl/des_old.h
+++ /dev/null
@@ -1,497 +0,0 @@
-/* crypto/des/des_old.h */
-
-/*-
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- *
- * The function names in here are deprecated and are only present to
- * provide an interface compatible with openssl 0.9.6 and older as
- * well as libdes.  OpenSSL now provides functions where "des_" has
- * been replaced with "DES_" in the names, to make it possible to
- * make incompatible changes that are needed for C type security and
- * other stuff.
- *
- * This include files has two compatibility modes:
- *
- *   - If OPENSSL_DES_LIBDES_COMPATIBILITY is defined, you get an API
- *     that is compatible with libdes and SSLeay.
- *   - If OPENSSL_DES_LIBDES_COMPATIBILITY isn't defined, you get an
- *     API that is compatible with OpenSSL 0.9.5x to 0.9.6x.
- *
- * Note that these modes break earlier snapshots of OpenSSL, where
- * libdes compatibility was the only available mode or (later on) the
- * prefered compatibility mode.  However, after much consideration
- * (and more or less violent discussions with external parties), it
- * was concluded that OpenSSL should be compatible with earlier versions
- * of itself before anything else.  Also, in all honesty, libdes is
- * an old beast that shouldn't really be used any more.
- *
- * Please consider starting to use the DES_ functions rather than the
- * des_ ones.  The des_ functions will disappear completely before
- * OpenSSL 1.0!
- *
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- */
-
-/*
- * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
- * 2001.
- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_DES_H
-# define HEADER_DES_H
-
-# include <openssl/e_os2.h>     /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */
-
-# ifdef OPENSSL_NO_DES
-#  error DES is disabled.
-# endif
-
-# ifndef HEADER_NEW_DES_H
-#  error You must include des.h, not des_old.h directly.
-# endif
-
-# ifdef _KERBEROS_DES_H
-#  error <openssl/des_old.h> replaces <kerberos/des.h>.
-# endif
-
-# include <openssl/symhacks.h>
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef _
-#  undef _
-# endif
-
-typedef unsigned char _ossl_old_des_cblock[8];
-typedef struct _ossl_old_des_ks_struct {
-    union {
-        _ossl_old_des_cblock _;
-        /*
-         * make sure things are correct size on machines with 8 byte longs
-         */
-        DES_LONG pad[2];
-    } ks;
-} _ossl_old_des_key_schedule[16];
-
-# ifndef OPENSSL_DES_LIBDES_COMPATIBILITY
-#  define des_cblock DES_cblock
-#  define const_des_cblock const_DES_cblock
-#  define des_key_schedule DES_key_schedule
-#  define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
-        DES_ecb3_encrypt((i),(o),&(k1),&(k2),&(k3),(e))
-#  define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
-        DES_ede3_cbc_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(e))
-#  define des_ede3_cbcm_encrypt(i,o,l,k1,k2,k3,iv1,iv2,e)\
-        DES_ede3_cbcm_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv1),(iv2),(e))
-#  define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
-        DES_ede3_cfb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n),(e))
-#  define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
-        DES_ede3_ofb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n))
-#  define des_options()\
-        DES_options()
-#  define des_cbc_cksum(i,o,l,k,iv)\
-        DES_cbc_cksum((i),(o),(l),&(k),(iv))
-#  define des_cbc_encrypt(i,o,l,k,iv,e)\
-        DES_cbc_encrypt((i),(o),(l),&(k),(iv),(e))
-#  define des_ncbc_encrypt(i,o,l,k,iv,e)\
-        DES_ncbc_encrypt((i),(o),(l),&(k),(iv),(e))
-#  define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
-        DES_xcbc_encrypt((i),(o),(l),&(k),(iv),(inw),(outw),(e))
-#  define des_cfb_encrypt(i,o,n,l,k,iv,e)\
-        DES_cfb_encrypt((i),(o),(n),(l),&(k),(iv),(e))
-#  define des_ecb_encrypt(i,o,k,e)\
-        DES_ecb_encrypt((i),(o),&(k),(e))
-#  define des_encrypt1(d,k,e)\
-        DES_encrypt1((d),&(k),(e))
-#  define des_encrypt2(d,k,e)\
-        DES_encrypt2((d),&(k),(e))
-#  define des_encrypt3(d,k1,k2,k3)\
-        DES_encrypt3((d),&(k1),&(k2),&(k3))
-#  define des_decrypt3(d,k1,k2,k3)\
-        DES_decrypt3((d),&(k1),&(k2),&(k3))
-#  define des_xwhite_in2out(k,i,o)\
-        DES_xwhite_in2out((k),(i),(o))
-#  define des_enc_read(f,b,l,k,iv)\
-        DES_enc_read((f),(b),(l),&(k),(iv))
-#  define des_enc_write(f,b,l,k,iv)\
-        DES_enc_write((f),(b),(l),&(k),(iv))
-#  define des_fcrypt(b,s,r)\
-        DES_fcrypt((b),(s),(r))
-#  if 0
-#   define des_crypt(b,s)\
-        DES_crypt((b),(s))
-#   if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
-#    define crypt(b,s)\
-        DES_crypt((b),(s))
-#   endif
-#  endif
-#  define des_ofb_encrypt(i,o,n,l,k,iv)\
-        DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv))
-#  define des_pcbc_encrypt(i,o,l,k,iv,e)\
-        DES_pcbc_encrypt((i),(o),(l),&(k),(iv),(e))
-#  define des_quad_cksum(i,o,l,c,s)\
-        DES_quad_cksum((i),(o),(l),(c),(s))
-#  define des_random_seed(k)\
-        _ossl_096_des_random_seed((k))
-#  define des_random_key(r)\
-        DES_random_key((r))
-#  define des_read_password(k,p,v) \
-        DES_read_password((k),(p),(v))
-#  define des_read_2passwords(k1,k2,p,v) \
-        DES_read_2passwords((k1),(k2),(p),(v))
-#  define des_set_odd_parity(k)\
-        DES_set_odd_parity((k))
-#  define des_check_key_parity(k)\
-        DES_check_key_parity((k))
-#  define des_is_weak_key(k)\
-        DES_is_weak_key((k))
-#  define des_set_key(k,ks)\
-        DES_set_key((k),&(ks))
-#  define des_key_sched(k,ks)\
-        DES_key_sched((k),&(ks))
-#  define des_set_key_checked(k,ks)\
-        DES_set_key_checked((k),&(ks))
-#  define des_set_key_unchecked(k,ks)\
-        DES_set_key_unchecked((k),&(ks))
-#  define des_string_to_key(s,k)\
-        DES_string_to_key((s),(k))
-#  define des_string_to_2keys(s,k1,k2)\
-        DES_string_to_2keys((s),(k1),(k2))
-#  define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
-        DES_cfb64_encrypt((i),(o),(l),&(ks),(iv),(n),(e))
-#  define des_ofb64_encrypt(i,o,l,ks,iv,n)\
-        DES_ofb64_encrypt((i),(o),(l),&(ks),(iv),(n))
-
-#  define des_ecb2_encrypt(i,o,k1,k2,e) \
-        des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-#  define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-        des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-#  define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-        des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-#  define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-        des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-#  define des_check_key DES_check_key
-#  define des_rw_mode DES_rw_mode
-# else                          /* libdes compatibility */
-/*
- * Map all symbol names to _ossl_old_des_* form, so we avoid all clashes with
- * libdes
- */
-#  define des_cblock _ossl_old_des_cblock
-#  define des_key_schedule _ossl_old_des_key_schedule
-#  define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
-        _ossl_old_des_ecb3_encrypt((i),(o),(k1),(k2),(k3),(e))
-#  define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
-        _ossl_old_des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(e))
-#  define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
-        _ossl_old_des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n),(e))
-#  define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
-        _ossl_old_des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n))
-#  define des_options()\
-        _ossl_old_des_options()
-#  define des_cbc_cksum(i,o,l,k,iv)\
-        _ossl_old_des_cbc_cksum((i),(o),(l),(k),(iv))
-#  define des_cbc_encrypt(i,o,l,k,iv,e)\
-        _ossl_old_des_cbc_encrypt((i),(o),(l),(k),(iv),(e))
-#  define des_ncbc_encrypt(i,o,l,k,iv,e)\
-        _ossl_old_des_ncbc_encrypt((i),(o),(l),(k),(iv),(e))
-#  define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
-        _ossl_old_des_xcbc_encrypt((i),(o),(l),(k),(iv),(inw),(outw),(e))
-#  define des_cfb_encrypt(i,o,n,l,k,iv,e)\
-        _ossl_old_des_cfb_encrypt((i),(o),(n),(l),(k),(iv),(e))
-#  define des_ecb_encrypt(i,o,k,e)\
-        _ossl_old_des_ecb_encrypt((i),(o),(k),(e))
-#  define des_encrypt(d,k,e)\
-        _ossl_old_des_encrypt((d),(k),(e))
-#  define des_encrypt2(d,k,e)\
-        _ossl_old_des_encrypt2((d),(k),(e))
-#  define des_encrypt3(d,k1,k2,k3)\
-        _ossl_old_des_encrypt3((d),(k1),(k2),(k3))
-#  define des_decrypt3(d,k1,k2,k3)\
-        _ossl_old_des_decrypt3((d),(k1),(k2),(k3))
-#  define des_xwhite_in2out(k,i,o)\
-        _ossl_old_des_xwhite_in2out((k),(i),(o))
-#  define des_enc_read(f,b,l,k,iv)\
-        _ossl_old_des_enc_read((f),(b),(l),(k),(iv))
-#  define des_enc_write(f,b,l,k,iv)\
-        _ossl_old_des_enc_write((f),(b),(l),(k),(iv))
-#  define des_fcrypt(b,s,r)\
-        _ossl_old_des_fcrypt((b),(s),(r))
-#  define des_crypt(b,s)\
-        _ossl_old_des_crypt((b),(s))
-#  if 0
-#   define crypt(b,s)\
-        _ossl_old_crypt((b),(s))
-#  endif
-#  define des_ofb_encrypt(i,o,n,l,k,iv)\
-        _ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv))
-#  define des_pcbc_encrypt(i,o,l,k,iv,e)\
-        _ossl_old_des_pcbc_encrypt((i),(o),(l),(k),(iv),(e))
-#  define des_quad_cksum(i,o,l,c,s)\
-        _ossl_old_des_quad_cksum((i),(o),(l),(c),(s))
-#  define des_random_seed(k)\
-        _ossl_old_des_random_seed((k))
-#  define des_random_key(r)\
-        _ossl_old_des_random_key((r))
-#  define des_read_password(k,p,v) \
-        _ossl_old_des_read_password((k),(p),(v))
-#  define des_read_2passwords(k1,k2,p,v) \
-        _ossl_old_des_read_2passwords((k1),(k2),(p),(v))
-#  define des_set_odd_parity(k)\
-        _ossl_old_des_set_odd_parity((k))
-#  define des_is_weak_key(k)\
-        _ossl_old_des_is_weak_key((k))
-#  define des_set_key(k,ks)\
-        _ossl_old_des_set_key((k),(ks))
-#  define des_key_sched(k,ks)\
-        _ossl_old_des_key_sched((k),(ks))
-#  define des_string_to_key(s,k)\
-        _ossl_old_des_string_to_key((s),(k))
-#  define des_string_to_2keys(s,k1,k2)\
-        _ossl_old_des_string_to_2keys((s),(k1),(k2))
-#  define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
-        _ossl_old_des_cfb64_encrypt((i),(o),(l),(ks),(iv),(n),(e))
-#  define des_ofb64_encrypt(i,o,l,ks,iv,n)\
-        _ossl_old_des_ofb64_encrypt((i),(o),(l),(ks),(iv),(n))
-
-#  define des_ecb2_encrypt(i,o,k1,k2,e) \
-        des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-#  define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-        des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-#  define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-        des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-#  define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-        des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-#  define des_check_key DES_check_key
-#  define des_rw_mode DES_rw_mode
-# endif
-
-const char *_ossl_old_des_options(void);
-void _ossl_old_des_ecb3_encrypt(_ossl_old_des_cblock *input,
-                                _ossl_old_des_cblock *output,
-                                _ossl_old_des_key_schedule ks1,
-                                _ossl_old_des_key_schedule ks2,
-                                _ossl_old_des_key_schedule ks3, int enc);
-DES_LONG _ossl_old_des_cbc_cksum(_ossl_old_des_cblock *input,
-                                 _ossl_old_des_cblock *output, long length,
-                                 _ossl_old_des_key_schedule schedule,
-                                 _ossl_old_des_cblock *ivec);
-void _ossl_old_des_cbc_encrypt(_ossl_old_des_cblock *input,
-                               _ossl_old_des_cblock *output, long length,
-                               _ossl_old_des_key_schedule schedule,
-                               _ossl_old_des_cblock *ivec, int enc);
-void _ossl_old_des_ncbc_encrypt(_ossl_old_des_cblock *input,
-                                _ossl_old_des_cblock *output, long length,
-                                _ossl_old_des_key_schedule schedule,
-                                _ossl_old_des_cblock *ivec, int enc);
-void _ossl_old_des_xcbc_encrypt(_ossl_old_des_cblock *input,
-                                _ossl_old_des_cblock *output, long length,
-                                _ossl_old_des_key_schedule schedule,
-                                _ossl_old_des_cblock *ivec,
-                                _ossl_old_des_cblock *inw,
-                                _ossl_old_des_cblock *outw, int enc);
-void _ossl_old_des_cfb_encrypt(unsigned char *in, unsigned char *out,
-                               int numbits, long length,
-                               _ossl_old_des_key_schedule schedule,
-                               _ossl_old_des_cblock *ivec, int enc);
-void _ossl_old_des_ecb_encrypt(_ossl_old_des_cblock *input,
-                               _ossl_old_des_cblock *output,
-                               _ossl_old_des_key_schedule ks, int enc);
-void _ossl_old_des_encrypt(DES_LONG *data, _ossl_old_des_key_schedule ks,
-                           int enc);
-void _ossl_old_des_encrypt2(DES_LONG *data, _ossl_old_des_key_schedule ks,
-                            int enc);
-void _ossl_old_des_encrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1,
-                            _ossl_old_des_key_schedule ks2,
-                            _ossl_old_des_key_schedule ks3);
-void _ossl_old_des_decrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1,
-                            _ossl_old_des_key_schedule ks2,
-                            _ossl_old_des_key_schedule ks3);
-void _ossl_old_des_ede3_cbc_encrypt(_ossl_old_des_cblock *input,
-                                    _ossl_old_des_cblock *output, long length,
-                                    _ossl_old_des_key_schedule ks1,
-                                    _ossl_old_des_key_schedule ks2,
-                                    _ossl_old_des_key_schedule ks3,
-                                    _ossl_old_des_cblock *ivec, int enc);
-void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
-                                      long length,
-                                      _ossl_old_des_key_schedule ks1,
-                                      _ossl_old_des_key_schedule ks2,
-                                      _ossl_old_des_key_schedule ks3,
-                                      _ossl_old_des_cblock *ivec, int *num,
-                                      int enc);
-void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
-                                      long length,
-                                      _ossl_old_des_key_schedule ks1,
-                                      _ossl_old_des_key_schedule ks2,
-                                      _ossl_old_des_key_schedule ks3,
-                                      _ossl_old_des_cblock *ivec, int *num);
-# if 0
-void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key),
-                                 _ossl_old_des_cblock (*in_white),
-                                 _ossl_old_des_cblock (*out_white));
-# endif
-
-int _ossl_old_des_enc_read(int fd, char *buf, int len,
-                           _ossl_old_des_key_schedule sched,
-                           _ossl_old_des_cblock *iv);
-int _ossl_old_des_enc_write(int fd, char *buf, int len,
-                            _ossl_old_des_key_schedule sched,
-                            _ossl_old_des_cblock *iv);
-char *_ossl_old_des_fcrypt(const char *buf, const char *salt, char *ret);
-char *_ossl_old_des_crypt(const char *buf, const char *salt);
-# if !defined(PERL5) && !defined(NeXT)
-char *_ossl_old_crypt(const char *buf, const char *salt);
-# endif
-void _ossl_old_des_ofb_encrypt(unsigned char *in, unsigned char *out,
-                               int numbits, long length,
-                               _ossl_old_des_key_schedule schedule,
-                               _ossl_old_des_cblock *ivec);
-void _ossl_old_des_pcbc_encrypt(_ossl_old_des_cblock *input,
-                                _ossl_old_des_cblock *output, long length,
-                                _ossl_old_des_key_schedule schedule,
-                                _ossl_old_des_cblock *ivec, int enc);
-DES_LONG _ossl_old_des_quad_cksum(_ossl_old_des_cblock *input,
-                                  _ossl_old_des_cblock *output, long length,
-                                  int out_count, _ossl_old_des_cblock *seed);
-void _ossl_old_des_random_seed(_ossl_old_des_cblock key);
-void _ossl_old_des_random_key(_ossl_old_des_cblock ret);
-int _ossl_old_des_read_password(_ossl_old_des_cblock *key, const char *prompt,
-                                int verify);
-int _ossl_old_des_read_2passwords(_ossl_old_des_cblock *key1,
-                                  _ossl_old_des_cblock *key2,
-                                  const char *prompt, int verify);
-void _ossl_old_des_set_odd_parity(_ossl_old_des_cblock *key);
-int _ossl_old_des_is_weak_key(_ossl_old_des_cblock *key);
-int _ossl_old_des_set_key(_ossl_old_des_cblock *key,
-                          _ossl_old_des_key_schedule schedule);
-int _ossl_old_des_key_sched(_ossl_old_des_cblock *key,
-                            _ossl_old_des_key_schedule schedule);
-void _ossl_old_des_string_to_key(char *str, _ossl_old_des_cblock *key);
-void _ossl_old_des_string_to_2keys(char *str, _ossl_old_des_cblock *key1,
-                                   _ossl_old_des_cblock *key2);
-void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out,
-                                 long length,
-                                 _ossl_old_des_key_schedule schedule,
-                                 _ossl_old_des_cblock *ivec, int *num,
-                                 int enc);
-void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out,
-                                 long length,
-                                 _ossl_old_des_key_schedule schedule,
-                                 _ossl_old_des_cblock *ivec, int *num);
-
-void _ossl_096_des_random_seed(des_cblock *key);
-
-/*
- * The following definitions provide compatibility with the MIT Kerberos
- * library. The _ossl_old_des_key_schedule structure is not binary
- * compatible.
- */
-
-# define _KERBEROS_DES_H
-
-# define KRBDES_ENCRYPT DES_ENCRYPT
-# define KRBDES_DECRYPT DES_DECRYPT
-
-# ifdef KERBEROS
-#  define ENCRYPT DES_ENCRYPT
-#  define DECRYPT DES_DECRYPT
-# endif
-
-# ifndef NCOMPAT
-#  define C_Block des_cblock
-#  define Key_schedule des_key_schedule
-#  define KEY_SZ DES_KEY_SZ
-#  define string_to_key des_string_to_key
-#  define read_pw_string des_read_pw_string
-#  define random_key des_random_key
-#  define pcbc_encrypt des_pcbc_encrypt
-#  define set_key des_set_key
-#  define key_sched des_key_sched
-#  define ecb_encrypt des_ecb_encrypt
-#  define cbc_encrypt des_cbc_encrypt
-#  define ncbc_encrypt des_ncbc_encrypt
-#  define xcbc_encrypt des_xcbc_encrypt
-#  define cbc_cksum des_cbc_cksum
-#  define quad_cksum des_quad_cksum
-#  define check_parity des_check_key_parity
-# endif
-
-# define des_fixup_key_parity DES_fixup_key_parity
-
-#ifdef  __cplusplus
-}
-#endif
-
-/* for DES_read_pw_string et al */
-# include <openssl/ui_compat.h>
-
-#endif
diff --git a/openflow/usr/include/openssl/dh.h b/openflow/usr/include/openssl/dh.h
deleted file mode 100644
index a5bd901..0000000
--- a/openflow/usr/include/openssl/dh.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/* crypto/dh/dh.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_DH_H
-# define HEADER_DH_H
-
-# include <openssl/e_os2.h>
-
-# ifdef OPENSSL_NO_DH
-#  error DH is disabled.
-# endif
-
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-# ifndef OPENSSL_DH_MAX_MODULUS_BITS
-#  define OPENSSL_DH_MAX_MODULUS_BITS    10000
-# endif
-
-# define DH_FLAG_CACHE_MONT_P     0x01
-
-/*
- * new with 0.9.7h; the built-in DH
- * implementation now uses constant time
- * modular exponentiation for secret exponents
- * by default. This flag causes the
- * faster variable sliding window method to
- * be used for all exponents.
- */
-# define DH_FLAG_NO_EXP_CONSTTIME 0x02
-
-/*
- * If this flag is set the DH method is FIPS compliant and can be used in
- * FIPS mode. This is set in the validated module method. If an application
- * sets this flag in its own methods it is its reposibility to ensure the
- * result is compliant.
- */
-
-# define DH_FLAG_FIPS_METHOD                     0x0400
-
-/*
- * If this flag is set the operations normally disabled in FIPS mode are
- * permitted it is then the applications responsibility to ensure that the
- * usage is compliant.
- */
-
-# define DH_FLAG_NON_FIPS_ALLOW                  0x0400
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Already defined in ossl_typ.h */
-/* typedef struct dh_st DH; */
-/* typedef struct dh_method DH_METHOD; */
-
-struct dh_method {
-    const char *name;
-    /* Methods here */
-    int (*generate_key) (DH *dh);
-    int (*compute_key) (unsigned char *key, const BIGNUM *pub_key, DH *dh);
-    /* Can be null */
-    int (*bn_mod_exp) (const DH *dh, BIGNUM *r, const BIGNUM *a,
-                       const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-                       BN_MONT_CTX *m_ctx);
-    int (*init) (DH *dh);
-    int (*finish) (DH *dh);
-    int flags;
-    char *app_data;
-    /* If this is non-NULL, it will be used to generate parameters */
-    int (*generate_params) (DH *dh, int prime_len, int generator,
-                            BN_GENCB *cb);
-};
-
-struct dh_st {
-    /*
-     * This first argument is used to pick up errors when a DH is passed
-     * instead of a EVP_PKEY
-     */
-    int pad;
-    int version;
-    BIGNUM *p;
-    BIGNUM *g;
-    long length;                /* optional */
-    BIGNUM *pub_key;            /* g^x % p */
-    BIGNUM *priv_key;           /* x */
-    int flags;
-    BN_MONT_CTX *method_mont_p;
-    /* Place holders if we want to do X9.42 DH */
-    BIGNUM *q;
-    BIGNUM *j;
-    unsigned char *seed;
-    int seedlen;
-    BIGNUM *counter;
-    int references;
-    CRYPTO_EX_DATA ex_data;
-    const DH_METHOD *meth;
-    ENGINE *engine;
-};
-
-# define DH_GENERATOR_2          2
-/* #define DH_GENERATOR_3       3 */
-# define DH_GENERATOR_5          5
-
-/* DH_check error codes */
-# define DH_CHECK_P_NOT_PRIME            0x01
-# define DH_CHECK_P_NOT_SAFE_PRIME       0x02
-# define DH_UNABLE_TO_CHECK_GENERATOR    0x04
-# define DH_NOT_SUITABLE_GENERATOR       0x08
-# define DH_CHECK_Q_NOT_PRIME            0x10
-# define DH_CHECK_INVALID_Q_VALUE        0x20
-# define DH_CHECK_INVALID_J_VALUE        0x40
-
-/* DH_check_pub_key error codes */
-# define DH_CHECK_PUBKEY_TOO_SMALL       0x01
-# define DH_CHECK_PUBKEY_TOO_LARGE       0x02
-# define DH_CHECK_PUBKEY_INVALID         0x04
-
-/*
- * primes p where (p-1)/2 is prime too are called "safe"; we define this for
- * backward compatibility:
- */
-# define DH_CHECK_P_NOT_STRONG_PRIME     DH_CHECK_P_NOT_SAFE_PRIME
-
-# define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
-                (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x))
-# define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \
-                (unsigned char *)(x))
-# define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x)
-# define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x)
-
-DH *DHparams_dup(DH *);
-
-const DH_METHOD *DH_OpenSSL(void);
-
-void DH_set_default_method(const DH_METHOD *meth);
-const DH_METHOD *DH_get_default_method(void);
-int DH_set_method(DH *dh, const DH_METHOD *meth);
-DH *DH_new_method(ENGINE *engine);
-
-DH *DH_new(void);
-void DH_free(DH *dh);
-int DH_up_ref(DH *dh);
-int DH_size(const DH *dh);
-int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                        CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int DH_set_ex_data(DH *d, int idx, void *arg);
-void *DH_get_ex_data(DH *d, int idx);
-
-/* Deprecated version */
-# ifndef OPENSSL_NO_DEPRECATED
-DH *DH_generate_parameters(int prime_len, int generator,
-                           void (*callback) (int, int, void *), void *cb_arg);
-# endif                         /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* New version */
-int DH_generate_parameters_ex(DH *dh, int prime_len, int generator,
-                              BN_GENCB *cb);
-
-int DH_check(const DH *dh, int *codes);
-int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *codes);
-int DH_generate_key(DH *dh);
-int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);
-int DH_compute_key_padded(unsigned char *key, const BIGNUM *pub_key, DH *dh);
-DH *d2i_DHparams(DH **a, const unsigned char **pp, long length);
-int i2d_DHparams(const DH *a, unsigned char **pp);
-DH *d2i_DHxparams(DH **a, const unsigned char **pp, long length);
-int i2d_DHxparams(const DH *a, unsigned char **pp);
-# ifndef OPENSSL_NO_FP_API
-int DHparams_print_fp(FILE *fp, const DH *x);
-# endif
-# ifndef OPENSSL_NO_BIO
-int DHparams_print(BIO *bp, const DH *x);
-# else
-int DHparams_print(char *bp, const DH *x);
-# endif
-
-/* RFC 5114 parameters */
-DH *DH_get_1024_160(void);
-DH *DH_get_2048_224(void);
-DH *DH_get_2048_256(void);
-
-/* RFC2631 KDF */
-int DH_KDF_X9_42(unsigned char *out, size_t outlen,
-                 const unsigned char *Z, size_t Zlen,
-                 ASN1_OBJECT *key_oid,
-                 const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);
-
-# define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, len, NULL)
-
-# define EVP_PKEY_CTX_set_dh_paramgen_subprime_len(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_PARAMGEN_SUBPRIME_LEN, len, NULL)
-
-# define EVP_PKEY_CTX_set_dh_paramgen_type(ctx, typ) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, typ, NULL)
-
-# define EVP_PKEY_CTX_set_dh_paramgen_generator(ctx, gen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR, gen, NULL)
-
-# define EVP_PKEY_CTX_set_dh_rfc5114(ctx, gen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_RFC5114, gen, NULL)
-
-# define EVP_PKEY_CTX_set_dhx_rfc5114(ctx, gen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_RFC5114, gen, NULL)
-
-# define EVP_PKEY_CTX_set_dh_kdf_type(ctx, kdf) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_TYPE, kdf, NULL)
-
-# define EVP_PKEY_CTX_get_dh_kdf_type(ctx) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_TYPE, -2, NULL)
-
-# define EVP_PKEY_CTX_set0_dh_kdf_oid(ctx, oid) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_OID, 0, (void *)oid)
-
-# define EVP_PKEY_CTX_get0_dh_kdf_oid(ctx, poid) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_GET_DH_KDF_OID, 0, (void *)poid)
-
-# define EVP_PKEY_CTX_set_dh_kdf_md(ctx, md) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_MD, 0, (void *)md)
-
-# define EVP_PKEY_CTX_get_dh_kdf_md(ctx, pmd) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_GET_DH_KDF_MD, 0, (void *)pmd)
-
-# define EVP_PKEY_CTX_set_dh_kdf_outlen(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_OUTLEN, len, NULL)
-
-# define EVP_PKEY_CTX_get_dh_kdf_outlen(ctx, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                        EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN, 0, (void *)plen)
-
-# define EVP_PKEY_CTX_set0_dh_kdf_ukm(ctx, p, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_UKM, plen, (void *)p)
-
-# define EVP_PKEY_CTX_get0_dh_kdf_ukm(ctx, p) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_GET_DH_KDF_UKM, 0, (void *)p)
-
-# define EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN     (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR     (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_DH_RFC5114                (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_DH_PARAMGEN_SUBPRIME_LEN  (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_DH_PARAMGEN_TYPE          (EVP_PKEY_ALG_CTRL + 5)
-# define EVP_PKEY_CTRL_DH_KDF_TYPE               (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_DH_KDF_MD                 (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_GET_DH_KDF_MD             (EVP_PKEY_ALG_CTRL + 8)
-# define EVP_PKEY_CTRL_DH_KDF_OUTLEN             (EVP_PKEY_ALG_CTRL + 9)
-# define EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN         (EVP_PKEY_ALG_CTRL + 10)
-# define EVP_PKEY_CTRL_DH_KDF_UKM                (EVP_PKEY_ALG_CTRL + 11)
-# define EVP_PKEY_CTRL_GET_DH_KDF_UKM            (EVP_PKEY_ALG_CTRL + 12)
-# define EVP_PKEY_CTRL_DH_KDF_OID                (EVP_PKEY_ALG_CTRL + 13)
-# define EVP_PKEY_CTRL_GET_DH_KDF_OID            (EVP_PKEY_ALG_CTRL + 14)
-
-/* KDF types */
-# define EVP_PKEY_DH_KDF_NONE                            1
-# define EVP_PKEY_DH_KDF_X9_42                           2
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_DH_strings(void);
-
-/* Error codes for the DH functions. */
-
-/* Function codes. */
-# define DH_F_COMPUTE_KEY                                 102
-# define DH_F_DHPARAMS_PRINT_FP                           101
-# define DH_F_DH_BUILTIN_GENPARAMS                        106
-# define DH_F_DH_CMS_DECRYPT                              117
-# define DH_F_DH_CMS_SET_PEERKEY                          118
-# define DH_F_DH_CMS_SET_SHARED_INFO                      119
-# define DH_F_DH_COMPUTE_KEY                              114
-# define DH_F_DH_GENERATE_KEY                             115
-# define DH_F_DH_GENERATE_PARAMETERS_EX                   116
-# define DH_F_DH_NEW_METHOD                               105
-# define DH_F_DH_PARAM_DECODE                             107
-# define DH_F_DH_PRIV_DECODE                              110
-# define DH_F_DH_PRIV_ENCODE                              111
-# define DH_F_DH_PUB_DECODE                               108
-# define DH_F_DH_PUB_ENCODE                               109
-# define DH_F_DO_DH_PRINT                                 100
-# define DH_F_GENERATE_KEY                                103
-# define DH_F_GENERATE_PARAMETERS                         104
-# define DH_F_PKEY_DH_DERIVE                              112
-# define DH_F_PKEY_DH_KEYGEN                              113
-
-/* Reason codes. */
-# define DH_R_BAD_GENERATOR                               101
-# define DH_R_BN_DECODE_ERROR                             109
-# define DH_R_BN_ERROR                                    106
-# define DH_R_DECODE_ERROR                                104
-# define DH_R_INVALID_PUBKEY                              102
-# define DH_R_KDF_PARAMETER_ERROR                         112
-# define DH_R_KEYS_NOT_SET                                108
-# define DH_R_KEY_SIZE_TOO_SMALL                          110
-# define DH_R_MODULUS_TOO_LARGE                           103
-# define DH_R_NON_FIPS_METHOD                             111
-# define DH_R_NO_PARAMETERS_SET                           107
-# define DH_R_NO_PRIVATE_VALUE                            100
-# define DH_R_PARAMETER_ENCODING_ERROR                    105
-# define DH_R_PEER_KEY_ERROR                              113
-# define DH_R_SHARED_INFO_ERROR                           114
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/dsa.h b/openflow/usr/include/openssl/dsa.h
deleted file mode 100644
index 545358f..0000000
--- a/openflow/usr/include/openssl/dsa.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/* crypto/dsa/dsa.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/*
- * The DSS routines are based on patches supplied by
- * Steven Schoch <schoch@sheba.arc.nasa.gov>.  He basically did the
- * work and I have just tweaked them a little to fit into my
- * stylistic vision for SSLeay :-) */
-
-#ifndef HEADER_DSA_H
-# define HEADER_DSA_H
-
-# include <openssl/e_os2.h>
-
-# ifdef OPENSSL_NO_DSA
-#  error DSA is disabled.
-# endif
-
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/crypto.h>
-# include <openssl/ossl_typ.h>
-
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-#  ifndef OPENSSL_NO_DH
-#   include <openssl/dh.h>
-#  endif
-# endif
-
-# ifndef OPENSSL_DSA_MAX_MODULUS_BITS
-#  define OPENSSL_DSA_MAX_MODULUS_BITS   10000
-# endif
-
-# define DSA_FLAG_CACHE_MONT_P   0x01
-/*
- * new with 0.9.7h; the built-in DSA implementation now uses constant time
- * modular exponentiation for secret exponents by default. This flag causes
- * the faster variable sliding window method to be used for all exponents.
- */
-# define DSA_FLAG_NO_EXP_CONSTTIME       0x02
-
-/*
- * If this flag is set the DSA method is FIPS compliant and can be used in
- * FIPS mode. This is set in the validated module method. If an application
- * sets this flag in its own methods it is its reposibility to ensure the
- * result is compliant.
- */
-
-# define DSA_FLAG_FIPS_METHOD                    0x0400
-
-/*
- * If this flag is set the operations normally disabled in FIPS mode are
- * permitted it is then the applications responsibility to ensure that the
- * usage is compliant.
- */
-
-# define DSA_FLAG_NON_FIPS_ALLOW                 0x0400
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Already defined in ossl_typ.h */
-/* typedef struct dsa_st DSA; */
-/* typedef struct dsa_method DSA_METHOD; */
-
-typedef struct DSA_SIG_st {
-    BIGNUM *r;
-    BIGNUM *s;
-} DSA_SIG;
-
-struct dsa_method {
-    const char *name;
-    DSA_SIG *(*dsa_do_sign) (const unsigned char *dgst, int dlen, DSA *dsa);
-    int (*dsa_sign_setup) (DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
-                           BIGNUM **rp);
-    int (*dsa_do_verify) (const unsigned char *dgst, int dgst_len,
-                          DSA_SIG *sig, DSA *dsa);
-    int (*dsa_mod_exp) (DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1,
-                        BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx,
-                        BN_MONT_CTX *in_mont);
-    /* Can be null */
-    int (*bn_mod_exp) (DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-                       const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-    int (*init) (DSA *dsa);
-    int (*finish) (DSA *dsa);
-    int flags;
-    char *app_data;
-    /* If this is non-NULL, it is used to generate DSA parameters */
-    int (*dsa_paramgen) (DSA *dsa, int bits,
-                         const unsigned char *seed, int seed_len,
-                         int *counter_ret, unsigned long *h_ret,
-                         BN_GENCB *cb);
-    /* If this is non-NULL, it is used to generate DSA keys */
-    int (*dsa_keygen) (DSA *dsa);
-};
-
-struct dsa_st {
-    /*
-     * This first variable is used to pick up errors where a DSA is passed
-     * instead of of a EVP_PKEY
-     */
-    int pad;
-    long version;
-    int write_params;
-    BIGNUM *p;
-    BIGNUM *q;                  /* == 20 */
-    BIGNUM *g;
-    BIGNUM *pub_key;            /* y public key */
-    BIGNUM *priv_key;           /* x private key */
-    BIGNUM *kinv;               /* Signing pre-calc */
-    BIGNUM *r;                  /* Signing pre-calc */
-    int flags;
-    /* Normally used to cache montgomery values */
-    BN_MONT_CTX *method_mont_p;
-    int references;
-    CRYPTO_EX_DATA ex_data;
-    const DSA_METHOD *meth;
-    /* functional reference if 'meth' is ENGINE-provided */
-    ENGINE *engine;
-};
-
-# define d2i_DSAparams_fp(fp,x) (DSA *)ASN1_d2i_fp((char *(*)())DSA_new, \
-                (char *(*)())d2i_DSAparams,(fp),(unsigned char **)(x))
-# define i2d_DSAparams_fp(fp,x) ASN1_i2d_fp(i2d_DSAparams,(fp), \
-                (unsigned char *)(x))
-# define d2i_DSAparams_bio(bp,x) ASN1_d2i_bio_of(DSA,DSA_new,d2i_DSAparams,bp,x)
-# define i2d_DSAparams_bio(bp,x) ASN1_i2d_bio_of_const(DSA,i2d_DSAparams,bp,x)
-
-DSA *DSAparams_dup(DSA *x);
-DSA_SIG *DSA_SIG_new(void);
-void DSA_SIG_free(DSA_SIG *a);
-int i2d_DSA_SIG(const DSA_SIG *a, unsigned char **pp);
-DSA_SIG *d2i_DSA_SIG(DSA_SIG **v, const unsigned char **pp, long length);
-
-DSA_SIG *DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
-int DSA_do_verify(const unsigned char *dgst, int dgst_len,
-                  DSA_SIG *sig, DSA *dsa);
-
-const DSA_METHOD *DSA_OpenSSL(void);
-
-void DSA_set_default_method(const DSA_METHOD *);
-const DSA_METHOD *DSA_get_default_method(void);
-int DSA_set_method(DSA *dsa, const DSA_METHOD *);
-
-DSA *DSA_new(void);
-DSA *DSA_new_method(ENGINE *engine);
-void DSA_free(DSA *r);
-/* "up" the DSA object's reference count */
-int DSA_up_ref(DSA *r);
-int DSA_size(const DSA *);
-        /* next 4 return -1 on error */
-int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
-int DSA_sign(int type, const unsigned char *dgst, int dlen,
-             unsigned char *sig, unsigned int *siglen, DSA *dsa);
-int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
-               const unsigned char *sigbuf, int siglen, DSA *dsa);
-int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                         CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int DSA_set_ex_data(DSA *d, int idx, void *arg);
-void *DSA_get_ex_data(DSA *d, int idx);
-
-DSA *d2i_DSAPublicKey(DSA **a, const unsigned char **pp, long length);
-DSA *d2i_DSAPrivateKey(DSA **a, const unsigned char **pp, long length);
-DSA *d2i_DSAparams(DSA **a, const unsigned char **pp, long length);
-
-/* Deprecated version */
-# ifndef OPENSSL_NO_DEPRECATED
-DSA *DSA_generate_parameters(int bits,
-                             unsigned char *seed, int seed_len,
-                             int *counter_ret, unsigned long *h_ret, void
-                              (*callback) (int, int, void *), void *cb_arg);
-# endif                         /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* New version */
-int DSA_generate_parameters_ex(DSA *dsa, int bits,
-                               const unsigned char *seed, int seed_len,
-                               int *counter_ret, unsigned long *h_ret,
-                               BN_GENCB *cb);
-
-int DSA_generate_key(DSA *a);
-int i2d_DSAPublicKey(const DSA *a, unsigned char **pp);
-int i2d_DSAPrivateKey(const DSA *a, unsigned char **pp);
-int i2d_DSAparams(const DSA *a, unsigned char **pp);
-
-# ifndef OPENSSL_NO_BIO
-int DSAparams_print(BIO *bp, const DSA *x);
-int DSA_print(BIO *bp, const DSA *x, int off);
-# endif
-# ifndef OPENSSL_NO_FP_API
-int DSAparams_print_fp(FILE *fp, const DSA *x);
-int DSA_print_fp(FILE *bp, const DSA *x, int off);
-# endif
-
-# define DSS_prime_checks 50
-/*
- * Primality test according to FIPS PUB 186[-1], Appendix 2.1: 50 rounds of
- * Rabin-Miller
- */
-# define DSA_is_prime(n, callback, cb_arg) \
-        BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg)
-
-# ifndef OPENSSL_NO_DH
-/*
- * Convert DSA structure (key or just parameters) into DH structure (be
- * careful to avoid small subgroup attacks when using this!)
- */
-DH *DSA_dup_DH(const DSA *r);
-# endif
-
-# define EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, \
-                                EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, nbits, NULL)
-
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_BITS         (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS       (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_MD           (EVP_PKEY_ALG_CTRL + 3)
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_DSA_strings(void);
-
-/* Error codes for the DSA functions. */
-
-/* Function codes. */
-# define DSA_F_D2I_DSA_SIG                                110
-# define DSA_F_DO_DSA_PRINT                               104
-# define DSA_F_DSAPARAMS_PRINT                            100
-# define DSA_F_DSAPARAMS_PRINT_FP                         101
-# define DSA_F_DSA_BUILTIN_PARAMGEN2                      126
-# define DSA_F_DSA_DO_SIGN                                112
-# define DSA_F_DSA_DO_VERIFY                              113
-# define DSA_F_DSA_GENERATE_KEY                           124
-# define DSA_F_DSA_GENERATE_PARAMETERS_EX                 123
-# define DSA_F_DSA_NEW_METHOD                             103
-# define DSA_F_DSA_PARAM_DECODE                           119
-# define DSA_F_DSA_PRINT_FP                               105
-# define DSA_F_DSA_PRIV_DECODE                            115
-# define DSA_F_DSA_PRIV_ENCODE                            116
-# define DSA_F_DSA_PUB_DECODE                             117
-# define DSA_F_DSA_PUB_ENCODE                             118
-# define DSA_F_DSA_SIGN                                   106
-# define DSA_F_DSA_SIGN_SETUP                             107
-# define DSA_F_DSA_SIG_NEW                                109
-# define DSA_F_DSA_SIG_PRINT                              125
-# define DSA_F_DSA_VERIFY                                 108
-# define DSA_F_I2D_DSA_SIG                                111
-# define DSA_F_OLD_DSA_PRIV_DECODE                        122
-# define DSA_F_PKEY_DSA_CTRL                              120
-# define DSA_F_PKEY_DSA_KEYGEN                            121
-# define DSA_F_SIG_CB                                     114
-
-/* Reason codes. */
-# define DSA_R_BAD_Q_VALUE                                102
-# define DSA_R_BN_DECODE_ERROR                            108
-# define DSA_R_BN_ERROR                                   109
-# define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE                100
-# define DSA_R_DECODE_ERROR                               104
-# define DSA_R_INVALID_DIGEST_TYPE                        106
-# define DSA_R_INVALID_PARAMETERS                         112
-# define DSA_R_MISSING_PARAMETERS                         101
-# define DSA_R_MODULUS_TOO_LARGE                          103
-# define DSA_R_NEED_NEW_SETUP_VALUES                      110
-# define DSA_R_NON_FIPS_DSA_METHOD                        111
-# define DSA_R_NO_PARAMETERS_SET                          107
-# define DSA_R_PARAMETER_ENCODING_ERROR                   105
-# define DSA_R_Q_NOT_PRIME                                113
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/dso.h b/openflow/usr/include/openssl/dso.h
deleted file mode 100644
index c9013f5..0000000
--- a/openflow/usr/include/openssl/dso.h
+++ /dev/null
@@ -1,451 +0,0 @@
-/* dso.h */
-/*
- * Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL project
- * 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_DSO_H
-# define HEADER_DSO_H
-
-# include <openssl/crypto.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* These values are used as commands to DSO_ctrl() */
-# define DSO_CTRL_GET_FLAGS      1
-# define DSO_CTRL_SET_FLAGS      2
-# define DSO_CTRL_OR_FLAGS       3
-
-/*
- * By default, DSO_load() will translate the provided filename into a form
- * typical for the platform (more specifically the DSO_METHOD) using the
- * dso_name_converter function of the method. Eg. win32 will transform "blah"
- * into "blah.dll", and dlfcn will transform it into "libblah.so". The
- * behaviour can be overriden by setting the name_converter callback in the
- * DSO object (using DSO_set_name_converter()). This callback could even
- * utilise the DSO_METHOD's converter too if it only wants to override
- * behaviour for one or two possible DSO methods. However, the following flag
- * can be set in a DSO to prevent *any* native name-translation at all - eg.
- * if the caller has prompted the user for a path to a driver library so the
- * filename should be interpreted as-is.
- */
-# define DSO_FLAG_NO_NAME_TRANSLATION            0x01
-/*
- * An extra flag to give if only the extension should be added as
- * translation.  This is obviously only of importance on Unix and other
- * operating systems where the translation also may prefix the name with
- * something, like 'lib', and ignored everywhere else. This flag is also
- * ignored if DSO_FLAG_NO_NAME_TRANSLATION is used at the same time.
- */
-# define DSO_FLAG_NAME_TRANSLATION_EXT_ONLY      0x02
-
-/*
- * The following flag controls the translation of symbol names to upper case.
- * This is currently only being implemented for OpenVMS.
- */
-# define DSO_FLAG_UPCASE_SYMBOL                  0x10
-
-/*
- * This flag loads the library with public symbols. Meaning: The exported
- * symbols of this library are public to all libraries loaded after this
- * library. At the moment only implemented in unix.
- */
-# define DSO_FLAG_GLOBAL_SYMBOLS                 0x20
-
-typedef void (*DSO_FUNC_TYPE) (void);
-
-typedef struct dso_st DSO;
-
-/*
- * The function prototype used for method functions (or caller-provided
- * callbacks) that transform filenames. They are passed a DSO structure
- * pointer (or NULL if they are to be used independantly of a DSO object) and
- * a filename to transform. They should either return NULL (if there is an
- * error condition) or a newly allocated string containing the transformed
- * form that the caller will need to free with OPENSSL_free() when done.
- */
-typedef char *(*DSO_NAME_CONVERTER_FUNC)(DSO *, const char *);
-/*
- * The function prototype used for method functions (or caller-provided
- * callbacks) that merge two file specifications. They are passed a DSO
- * structure pointer (or NULL if they are to be used independantly of a DSO
- * object) and two file specifications to merge. They should either return
- * NULL (if there is an error condition) or a newly allocated string
- * containing the result of merging that the caller will need to free with
- * OPENSSL_free() when done. Here, merging means that bits and pieces are
- * taken from each of the file specifications and added together in whatever
- * fashion that is sensible for the DSO method in question.  The only rule
- * that really applies is that if the two specification contain pieces of the
- * same type, the copy from the first string takes priority.  One could see
- * it as the first specification is the one given by the user and the second
- * being a bunch of defaults to add on if they're missing in the first.
- */
-typedef char *(*DSO_MERGER_FUNC)(DSO *, const char *, const char *);
-
-typedef struct dso_meth_st {
-    const char *name;
-    /*
-     * Loads a shared library, NB: new DSO_METHODs must ensure that a
-     * successful load populates the loaded_filename field, and likewise a
-     * successful unload OPENSSL_frees and NULLs it out.
-     */
-    int (*dso_load) (DSO *dso);
-    /* Unloads a shared library */
-    int (*dso_unload) (DSO *dso);
-    /* Binds a variable */
-    void *(*dso_bind_var) (DSO *dso, const char *symname);
-    /*
-     * Binds a function - assumes a return type of DSO_FUNC_TYPE. This should
-     * be cast to the real function prototype by the caller. Platforms that
-     * don't have compatible representations for different prototypes (this
-     * is possible within ANSI C) are highly unlikely to have shared
-     * libraries at all, let alone a DSO_METHOD implemented for them.
-     */
-    DSO_FUNC_TYPE (*dso_bind_func) (DSO *dso, const char *symname);
-/* I don't think this would actually be used in any circumstances. */
-# if 0
-    /* Unbinds a variable */
-    int (*dso_unbind_var) (DSO *dso, char *symname, void *symptr);
-    /* Unbinds a function */
-    int (*dso_unbind_func) (DSO *dso, char *symname, DSO_FUNC_TYPE symptr);
-# endif
-    /*
-     * The generic (yuck) "ctrl()" function. NB: Negative return values
-     * (rather than zero) indicate errors.
-     */
-    long (*dso_ctrl) (DSO *dso, int cmd, long larg, void *parg);
-    /*
-     * The default DSO_METHOD-specific function for converting filenames to a
-     * canonical native form.
-     */
-    DSO_NAME_CONVERTER_FUNC dso_name_converter;
-    /*
-     * The default DSO_METHOD-specific function for converting filenames to a
-     * canonical native form.
-     */
-    DSO_MERGER_FUNC dso_merger;
-    /* [De]Initialisation handlers. */
-    int (*init) (DSO *dso);
-    int (*finish) (DSO *dso);
-    /* Return pathname of the module containing location */
-    int (*pathbyaddr) (void *addr, char *path, int sz);
-    /* Perform global symbol lookup, i.e. among *all* modules */
-    void *(*globallookup) (const char *symname);
-} DSO_METHOD;
-
-/**********************************************************************/
-/* The low-level handle type used to refer to a loaded shared library */
-
-struct dso_st {
-    DSO_METHOD *meth;
-    /*
-     * Standard dlopen uses a (void *). Win32 uses a HANDLE. VMS doesn't use
-     * anything but will need to cache the filename for use in the dso_bind
-     * handler. All in all, let each method control its own destiny.
-     * "Handles" and such go in a STACK.
-     */
-    STACK_OF(void) *meth_data;
-    int references;
-    int flags;
-    /*
-     * For use by applications etc ... use this for your bits'n'pieces, don't
-     * touch meth_data!
-     */
-    CRYPTO_EX_DATA ex_data;
-    /*
-     * If this callback function pointer is set to non-NULL, then it will be
-     * used in DSO_load() in place of meth->dso_name_converter. NB: This
-     * should normally set using DSO_set_name_converter().
-     */
-    DSO_NAME_CONVERTER_FUNC name_converter;
-    /*
-     * If this callback function pointer is set to non-NULL, then it will be
-     * used in DSO_load() in place of meth->dso_merger. NB: This should
-     * normally set using DSO_set_merger().
-     */
-    DSO_MERGER_FUNC merger;
-    /*
-     * This is populated with (a copy of) the platform-independant filename
-     * used for this DSO.
-     */
-    char *filename;
-    /*
-     * This is populated with (a copy of) the translated filename by which
-     * the DSO was actually loaded. It is NULL iff the DSO is not currently
-     * loaded. NB: This is here because the filename translation process may
-     * involve a callback being invoked more than once not only to convert to
-     * a platform-specific form, but also to try different filenames in the
-     * process of trying to perform a load. As such, this variable can be
-     * used to indicate (a) whether this DSO structure corresponds to a
-     * loaded library or not, and (b) the filename with which it was actually
-     * loaded.
-     */
-    char *loaded_filename;
-};
-
-DSO *DSO_new(void);
-DSO *DSO_new_method(DSO_METHOD *method);
-int DSO_free(DSO *dso);
-int DSO_flags(DSO *dso);
-int DSO_up_ref(DSO *dso);
-long DSO_ctrl(DSO *dso, int cmd, long larg, void *parg);
-
-/*
- * This function sets the DSO's name_converter callback. If it is non-NULL,
- * then it will be used instead of the associated DSO_METHOD's function. If
- * oldcb is non-NULL then it is set to the function pointer value being
- * replaced. Return value is non-zero for success.
- */
-int DSO_set_name_converter(DSO *dso, DSO_NAME_CONVERTER_FUNC cb,
-                           DSO_NAME_CONVERTER_FUNC *oldcb);
-/*
- * These functions can be used to get/set the platform-independant filename
- * used for a DSO. NB: set will fail if the DSO is already loaded.
- */
-const char *DSO_get_filename(DSO *dso);
-int DSO_set_filename(DSO *dso, const char *filename);
-/*
- * This function will invoke the DSO's name_converter callback to translate a
- * filename, or if the callback isn't set it will instead use the DSO_METHOD's
- * converter. If "filename" is NULL, the "filename" in the DSO itself will be
- * used. If the DSO_FLAG_NO_NAME_TRANSLATION flag is set, then the filename is
- * simply duplicated. NB: This function is usually called from within a
- * DSO_METHOD during the processing of a DSO_load() call, and is exposed so
- * that caller-created DSO_METHODs can do the same thing. A non-NULL return
- * value will need to be OPENSSL_free()'d.
- */
-char *DSO_convert_filename(DSO *dso, const char *filename);
-/*
- * This function will invoke the DSO's merger callback to merge two file
- * specifications, or if the callback isn't set it will instead use the
- * DSO_METHOD's merger.  A non-NULL return value will need to be
- * OPENSSL_free()'d.
- */
-char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2);
-/*
- * If the DSO is currently loaded, this returns the filename that it was
- * loaded under, otherwise it returns NULL. So it is also useful as a test as
- * to whether the DSO is currently loaded. NB: This will not necessarily
- * return the same value as DSO_convert_filename(dso, dso->filename), because
- * the DSO_METHOD's load function may have tried a variety of filenames (with
- * and/or without the aid of the converters) before settling on the one it
- * actually loaded.
- */
-const char *DSO_get_loaded_filename(DSO *dso);
-
-void DSO_set_default_method(DSO_METHOD *meth);
-DSO_METHOD *DSO_get_default_method(void);
-DSO_METHOD *DSO_get_method(DSO *dso);
-DSO_METHOD *DSO_set_method(DSO *dso, DSO_METHOD *meth);
-
-/*
- * The all-singing all-dancing load function, you normally pass NULL for the
- * first and third parameters. Use DSO_up and DSO_free for subsequent
- * reference count handling. Any flags passed in will be set in the
- * constructed DSO after its init() function but before the load operation.
- * If 'dso' is non-NULL, 'flags' is ignored.
- */
-DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags);
-
-/* This function binds to a variable inside a shared library. */
-void *DSO_bind_var(DSO *dso, const char *symname);
-
-/* This function binds to a function inside a shared library. */
-DSO_FUNC_TYPE DSO_bind_func(DSO *dso, const char *symname);
-
-/*
- * This method is the default, but will beg, borrow, or steal whatever method
- * should be the default on any particular platform (including
- * DSO_METH_null() if necessary).
- */
-DSO_METHOD *DSO_METHOD_openssl(void);
-
-/*
- * This method is defined for all platforms - if a platform has no DSO
- * support then this will be the only method!
- */
-DSO_METHOD *DSO_METHOD_null(void);
-
-/*
- * If DSO_DLFCN is defined, the standard dlfcn.h-style functions (dlopen,
- * dlclose, dlsym, etc) will be used and incorporated into this method. If
- * not, this method will return NULL.
- */
-DSO_METHOD *DSO_METHOD_dlfcn(void);
-
-/*
- * If DSO_DL is defined, the standard dl.h-style functions (shl_load,
- * shl_unload, shl_findsym, etc) will be used and incorporated into this
- * method. If not, this method will return NULL.
- */
-DSO_METHOD *DSO_METHOD_dl(void);
-
-/* If WIN32 is defined, use DLLs. If not, return NULL. */
-DSO_METHOD *DSO_METHOD_win32(void);
-
-/* If VMS is defined, use shared images. If not, return NULL. */
-DSO_METHOD *DSO_METHOD_vms(void);
-
-/*
- * This function writes null-terminated pathname of DSO module containing
- * 'addr' into 'sz' large caller-provided 'path' and returns the number of
- * characters [including trailing zero] written to it. If 'sz' is 0 or
- * negative, 'path' is ignored and required amount of charachers [including
- * trailing zero] to accomodate pathname is returned. If 'addr' is NULL, then
- * pathname of cryptolib itself is returned. Negative or zero return value
- * denotes error.
- */
-int DSO_pathbyaddr(void *addr, char *path, int sz);
-
-/*
- * This function should be used with caution! It looks up symbols in *all*
- * loaded modules and if module gets unloaded by somebody else attempt to
- * dereference the pointer is doomed to have fatal consequences. Primary
- * usage for this function is to probe *core* system functionality, e.g.
- * check if getnameinfo(3) is available at run-time without bothering about
- * OS-specific details such as libc.so.versioning or where does it actually
- * reside: in libc itself or libsocket.
- */
-void *DSO_global_lookup(const char *name);
-
-/* If BeOS is defined, use shared images. If not, return NULL. */
-DSO_METHOD *DSO_METHOD_beos(void);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_DSO_strings(void);
-
-/* Error codes for the DSO functions. */
-
-/* Function codes. */
-# define DSO_F_BEOS_BIND_FUNC                             144
-# define DSO_F_BEOS_BIND_VAR                              145
-# define DSO_F_BEOS_LOAD                                  146
-# define DSO_F_BEOS_NAME_CONVERTER                        147
-# define DSO_F_BEOS_UNLOAD                                148
-# define DSO_F_DLFCN_BIND_FUNC                            100
-# define DSO_F_DLFCN_BIND_VAR                             101
-# define DSO_F_DLFCN_LOAD                                 102
-# define DSO_F_DLFCN_MERGER                               130
-# define DSO_F_DLFCN_NAME_CONVERTER                       123
-# define DSO_F_DLFCN_UNLOAD                               103
-# define DSO_F_DL_BIND_FUNC                               104
-# define DSO_F_DL_BIND_VAR                                105
-# define DSO_F_DL_LOAD                                    106
-# define DSO_F_DL_MERGER                                  131
-# define DSO_F_DL_NAME_CONVERTER                          124
-# define DSO_F_DL_UNLOAD                                  107
-# define DSO_F_DSO_BIND_FUNC                              108
-# define DSO_F_DSO_BIND_VAR                               109
-# define DSO_F_DSO_CONVERT_FILENAME                       126
-# define DSO_F_DSO_CTRL                                   110
-# define DSO_F_DSO_FREE                                   111
-# define DSO_F_DSO_GET_FILENAME                           127
-# define DSO_F_DSO_GET_LOADED_FILENAME                    128
-# define DSO_F_DSO_GLOBAL_LOOKUP                          139
-# define DSO_F_DSO_LOAD                                   112
-# define DSO_F_DSO_MERGE                                  132
-# define DSO_F_DSO_NEW_METHOD                             113
-# define DSO_F_DSO_PATHBYADDR                             140
-# define DSO_F_DSO_SET_FILENAME                           129
-# define DSO_F_DSO_SET_NAME_CONVERTER                     122
-# define DSO_F_DSO_UP_REF                                 114
-# define DSO_F_GLOBAL_LOOKUP_FUNC                         138
-# define DSO_F_PATHBYADDR                                 137
-# define DSO_F_VMS_BIND_SYM                               115
-# define DSO_F_VMS_LOAD                                   116
-# define DSO_F_VMS_MERGER                                 133
-# define DSO_F_VMS_UNLOAD                                 117
-# define DSO_F_WIN32_BIND_FUNC                            118
-# define DSO_F_WIN32_BIND_VAR                             119
-# define DSO_F_WIN32_GLOBALLOOKUP                         142
-# define DSO_F_WIN32_GLOBALLOOKUP_FUNC                    143
-# define DSO_F_WIN32_JOINER                               135
-# define DSO_F_WIN32_LOAD                                 120
-# define DSO_F_WIN32_MERGER                               134
-# define DSO_F_WIN32_NAME_CONVERTER                       125
-# define DSO_F_WIN32_PATHBYADDR                           141
-# define DSO_F_WIN32_SPLITTER                             136
-# define DSO_F_WIN32_UNLOAD                               121
-
-/* Reason codes. */
-# define DSO_R_CTRL_FAILED                                100
-# define DSO_R_DSO_ALREADY_LOADED                         110
-# define DSO_R_EMPTY_FILE_STRUCTURE                       113
-# define DSO_R_FAILURE                                    114
-# define DSO_R_FILENAME_TOO_BIG                           101
-# define DSO_R_FINISH_FAILED                              102
-# define DSO_R_INCORRECT_FILE_SYNTAX                      115
-# define DSO_R_LOAD_FAILED                                103
-# define DSO_R_NAME_TRANSLATION_FAILED                    109
-# define DSO_R_NO_FILENAME                                111
-# define DSO_R_NO_FILE_SPECIFICATION                      116
-# define DSO_R_NULL_HANDLE                                104
-# define DSO_R_SET_FILENAME_FAILED                        112
-# define DSO_R_STACK_ERROR                                105
-# define DSO_R_SYM_FAILURE                                106
-# define DSO_R_UNLOAD_FAILED                              107
-# define DSO_R_UNSUPPORTED                                108
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/dtls1.h b/openflow/usr/include/openssl/dtls1.h
deleted file mode 100644
index 30bbcf2..0000000
--- a/openflow/usr/include/openssl/dtls1.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/* ssl/dtls1.h */
-/*
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_DTLS1_H
-# define HEADER_DTLS1_H
-
-# include <openssl/buffer.h>
-# include <openssl/pqueue.h>
-# ifdef OPENSSL_SYS_VMS
-#  include <resource.h>
-#  include <sys/timeb.h>
-# endif
-# ifdef OPENSSL_SYS_WIN32
-/* Needed for struct timeval */
-#  include <winsock.h>
-# elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
-#  include <sys/timeval.h>
-# else
-#  if defined(OPENSSL_SYS_VXWORKS)
-#   include <sys/times.h>
-#  else
-#   include <sys/time.h>
-#  endif
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define DTLS1_VERSION                   0xFEFF
-# define DTLS1_2_VERSION                 0xFEFD
-# define DTLS_MAX_VERSION                DTLS1_2_VERSION
-# define DTLS1_VERSION_MAJOR             0xFE
-
-# define DTLS1_BAD_VER                   0x0100
-
-/* Special value for method supporting multiple versions */
-# define DTLS_ANY_VERSION                0x1FFFF
-
-# if 0
-/* this alert description is not specified anywhere... */
-#  define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE    110
-# endif
-
-/* lengths of messages */
-# define DTLS1_COOKIE_LENGTH                     256
-
-# define DTLS1_RT_HEADER_LENGTH                  13
-
-# define DTLS1_HM_HEADER_LENGTH                  12
-
-# define DTLS1_HM_BAD_FRAGMENT                   -2
-# define DTLS1_HM_FRAGMENT_RETRY                 -3
-
-# define DTLS1_CCS_HEADER_LENGTH                  1
-
-# ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
-#  define DTLS1_AL_HEADER_LENGTH                   7
-# else
-#  define DTLS1_AL_HEADER_LENGTH                   2
-# endif
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-#  ifndef OPENSSL_NO_SCTP
-#   define DTLS1_SCTP_AUTH_LABEL   "EXPORTER_DTLS_OVER_SCTP"
-#  endif
-
-/* Max MTU overhead we know about so far is 40 for IPv6 + 8 for UDP */
-#  define DTLS1_MAX_MTU_OVERHEAD                   48
-
-typedef struct dtls1_bitmap_st {
-    unsigned long map;          /* track 32 packets on 32-bit systems and 64
-                                 * - on 64-bit systems */
-    unsigned char max_seq_num[8]; /* max record number seen so far, 64-bit
-                                   * value in big-endian encoding */
-} DTLS1_BITMAP;
-
-struct dtls1_retransmit_state {
-    EVP_CIPHER_CTX *enc_write_ctx; /* cryptographic state */
-    EVP_MD_CTX *write_hash;     /* used for mac generation */
-#  ifndef OPENSSL_NO_COMP
-    COMP_CTX *compress;         /* compression */
-#  else
-    char *compress;
-#  endif
-    SSL_SESSION *session;
-    unsigned short epoch;
-};
-
-struct hm_header_st {
-    unsigned char type;
-    unsigned long msg_len;
-    unsigned short seq;
-    unsigned long frag_off;
-    unsigned long frag_len;
-    unsigned int is_ccs;
-    struct dtls1_retransmit_state saved_retransmit_state;
-};
-
-struct ccs_header_st {
-    unsigned char type;
-    unsigned short seq;
-};
-
-struct dtls1_timeout_st {
-    /* Number of read timeouts so far */
-    unsigned int read_timeouts;
-    /* Number of write timeouts so far */
-    unsigned int write_timeouts;
-    /* Number of alerts received so far */
-    unsigned int num_alerts;
-};
-
-typedef struct record_pqueue_st {
-    unsigned short epoch;
-    pqueue q;
-} record_pqueue;
-
-typedef struct hm_fragment_st {
-    struct hm_header_st msg_header;
-    unsigned char *fragment;
-    unsigned char *reassembly;
-} hm_fragment;
-
-typedef struct dtls1_state_st {
-    unsigned int send_cookie;
-    unsigned char cookie[DTLS1_COOKIE_LENGTH];
-    unsigned char rcvd_cookie[DTLS1_COOKIE_LENGTH];
-    unsigned int cookie_len;
-    /*
-     * The current data and handshake epoch.  This is initially
-     * undefined, and starts at zero once the initial handshake is
-     * completed
-     */
-    unsigned short r_epoch;
-    unsigned short w_epoch;
-    /* records being received in the current epoch */
-    DTLS1_BITMAP bitmap;
-    /* renegotiation starts a new set of sequence numbers */
-    DTLS1_BITMAP next_bitmap;
-    /* handshake message numbers */
-    unsigned short handshake_write_seq;
-    unsigned short next_handshake_write_seq;
-    unsigned short handshake_read_seq;
-    /* save last sequence number for retransmissions */
-    unsigned char last_write_sequence[8];
-    /* Received handshake records (processed and unprocessed) */
-    record_pqueue unprocessed_rcds;
-    record_pqueue processed_rcds;
-    /* Buffered handshake messages */
-    pqueue buffered_messages;
-    /* Buffered (sent) handshake records */
-    pqueue sent_messages;
-    /*
-     * Buffered application records. Only for records between CCS and
-     * Finished to prevent either protocol violation or unnecessary message
-     * loss.
-     */
-    record_pqueue buffered_app_data;
-    /* Is set when listening for new connections with dtls1_listen() */
-    unsigned int listen;
-    unsigned int link_mtu;      /* max on-the-wire DTLS packet size */
-    unsigned int mtu;           /* max DTLS packet size */
-    struct hm_header_st w_msg_hdr;
-    struct hm_header_st r_msg_hdr;
-    struct dtls1_timeout_st timeout;
-    /*
-     * Indicates when the last handshake msg or heartbeat sent will timeout
-     */
-    struct timeval next_timeout;
-    /* Timeout duration */
-    unsigned short timeout_duration;
-    /*
-     * storage for Alert/Handshake protocol data received but not yet
-     * processed by ssl3_read_bytes:
-     */
-    unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
-    unsigned int alert_fragment_len;
-    unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH];
-    unsigned int handshake_fragment_len;
-    unsigned int retransmitting;
-    /*
-     * Set when the handshake is ready to process peer's ChangeCipherSpec message.
-     * Cleared after the message has been processed.
-     */
-    unsigned int change_cipher_spec_ok;
-#  ifndef OPENSSL_NO_SCTP
-    /* used when SSL_ST_XX_FLUSH is entered */
-    int next_state;
-    int shutdown_received;
-#  endif
-} DTLS1_STATE;
-
-typedef struct dtls1_record_data_st {
-    unsigned char *packet;
-    unsigned int packet_length;
-    SSL3_BUFFER rbuf;
-    SSL3_RECORD rrec;
-#  ifndef OPENSSL_NO_SCTP
-    struct bio_dgram_sctp_rcvinfo recordinfo;
-#  endif
-} DTLS1_RECORD_DATA;
-
-# endif
-
-/* Timeout multipliers (timeout slice is defined in apps/timeouts.h */
-# define DTLS1_TMO_READ_COUNT                      2
-# define DTLS1_TMO_WRITE_COUNT                     2
-
-# define DTLS1_TMO_ALERT_COUNT                     12
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/e_os2.h b/openflow/usr/include/openssl/e_os2.h
deleted file mode 100644
index 7be9989..0000000
--- a/openflow/usr/include/openssl/e_os2.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/* e_os2.h */
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <openssl/opensslconf.h>
-
-#ifndef HEADER_E_OS2_H
-# define HEADER_E_OS2_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************
- * Detect operating systems.  This probably needs completing.
- * The result is that at least one OPENSSL_SYS_os macro should be defined.
- * However, if none is defined, Unix is assumed.
- **/
-
-# define OPENSSL_SYS_UNIX
-
-/* ---------------------- Macintosh, before MacOS X ----------------------- */
-# if defined(__MWERKS__) && defined(macintosh) || defined(OPENSSL_SYSNAME_MAC)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_MACINTOSH_CLASSIC
-# endif
-
-/* ---------------------- NetWare ----------------------------------------- */
-# if defined(NETWARE) || defined(OPENSSL_SYSNAME_NETWARE)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_NETWARE
-# endif
-
-/* --------------------- Microsoft operating systems ---------------------- */
-
-/*
- * Note that MSDOS actually denotes 32-bit environments running on top of
- * MS-DOS, such as DJGPP one.
- */
-# if defined(OPENSSL_SYSNAME_MSDOS)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_MSDOS
-# endif
-
-/*
- * For 32 bit environment, there seems to be the CygWin environment and then
- * all the others that try to do the same thing Microsoft does...
- */
-# if defined(OPENSSL_SYSNAME_UWIN)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_WIN32_UWIN
-# else
-#  if defined(__CYGWIN__) || defined(OPENSSL_SYSNAME_CYGWIN)
-#   undef OPENSSL_SYS_UNIX
-#   define OPENSSL_SYS_WIN32_CYGWIN
-#  else
-#   if defined(_WIN32) || defined(OPENSSL_SYSNAME_WIN32)
-#    undef OPENSSL_SYS_UNIX
-#    define OPENSSL_SYS_WIN32
-#   endif
-#   if defined(_WIN64) || defined(OPENSSL_SYSNAME_WIN64)
-#    undef OPENSSL_SYS_UNIX
-#    if !defined(OPENSSL_SYS_WIN64)
-#     define OPENSSL_SYS_WIN64
-#    endif
-#   endif
-#   if defined(OPENSSL_SYSNAME_WINNT)
-#    undef OPENSSL_SYS_UNIX
-#    define OPENSSL_SYS_WINNT
-#   endif
-#   if defined(OPENSSL_SYSNAME_WINCE)
-#    undef OPENSSL_SYS_UNIX
-#    define OPENSSL_SYS_WINCE
-#   endif
-#  endif
-# endif
-
-/* Anything that tries to look like Microsoft is "Windows" */
-# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN64) || defined(OPENSSL_SYS_WINNT) || defined(OPENSSL_SYS_WINCE)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_WINDOWS
-#  ifndef OPENSSL_SYS_MSDOS
-#   define OPENSSL_SYS_MSDOS
-#  endif
-# endif
-
-/*
- * DLL settings.  This part is a bit tough, because it's up to the
- * application implementor how he or she will link the application, so it
- * requires some macro to be used.
- */
-# ifdef OPENSSL_SYS_WINDOWS
-#  ifndef OPENSSL_OPT_WINDLL
-#   if defined(_WINDLL)         /* This is used when building OpenSSL to
-                                 * indicate that DLL linkage should be used */
-#    define OPENSSL_OPT_WINDLL
-#   endif
-#  endif
-# endif
-
-/* ------------------------------- OpenVMS -------------------------------- */
-# if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYSNAME_VMS)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_VMS
-#  if defined(__DECC)
-#   define OPENSSL_SYS_VMS_DECC
-#  elif defined(__DECCXX)
-#   define OPENSSL_SYS_VMS_DECC
-#   define OPENSSL_SYS_VMS_DECCXX
-#  else
-#   define OPENSSL_SYS_VMS_NODECC
-#  endif
-# endif
-
-/* -------------------------------- OS/2 ---------------------------------- */
-# if defined(__EMX__) || defined(__OS2__)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_OS2
-# endif
-
-/* -------------------------------- Unix ---------------------------------- */
-# ifdef OPENSSL_SYS_UNIX
-#  if defined(linux) || defined(__linux__) || defined(OPENSSL_SYSNAME_LINUX)
-#   define OPENSSL_SYS_LINUX
-#  endif
-#  ifdef OPENSSL_SYSNAME_MPE
-#   define OPENSSL_SYS_MPE
-#  endif
-#  ifdef OPENSSL_SYSNAME_SNI
-#   define OPENSSL_SYS_SNI
-#  endif
-#  ifdef OPENSSL_SYSNAME_ULTRASPARC
-#   define OPENSSL_SYS_ULTRASPARC
-#  endif
-#  ifdef OPENSSL_SYSNAME_NEWS4
-#   define OPENSSL_SYS_NEWS4
-#  endif
-#  ifdef OPENSSL_SYSNAME_MACOSX
-#   define OPENSSL_SYS_MACOSX
-#  endif
-#  ifdef OPENSSL_SYSNAME_MACOSX_RHAPSODY
-#   define OPENSSL_SYS_MACOSX_RHAPSODY
-#   define OPENSSL_SYS_MACOSX
-#  endif
-#  ifdef OPENSSL_SYSNAME_SUNOS
-#   define OPENSSL_SYS_SUNOS
-#  endif
-#  if defined(_CRAY) || defined(OPENSSL_SYSNAME_CRAY)
-#   define OPENSSL_SYS_CRAY
-#  endif
-#  if defined(_AIX) || defined(OPENSSL_SYSNAME_AIX)
-#   define OPENSSL_SYS_AIX
-#  endif
-# endif
-
-/* -------------------------------- VOS ----------------------------------- */
-# if defined(__VOS__) || defined(OPENSSL_SYSNAME_VOS)
-#  define OPENSSL_SYS_VOS
-#  ifdef __HPPA__
-#   define OPENSSL_SYS_VOS_HPPA
-#  endif
-#  ifdef __IA32__
-#   define OPENSSL_SYS_VOS_IA32
-#  endif
-# endif
-
-/* ------------------------------ VxWorks --------------------------------- */
-# ifdef OPENSSL_SYSNAME_VXWORKS
-#  define OPENSSL_SYS_VXWORKS
-# endif
-
-/* -------------------------------- BeOS ---------------------------------- */
-# if defined(__BEOS__)
-#  define OPENSSL_SYS_BEOS
-#  include <sys/socket.h>
-#  if defined(BONE_VERSION)
-#   define OPENSSL_SYS_BEOS_BONE
-#  else
-#   define OPENSSL_SYS_BEOS_R5
-#  endif
-# endif
-
-/**
- * That's it for OS-specific stuff
- *****************************************************************************/
-
-/* Specials for I/O an exit */
-# ifdef OPENSSL_SYS_MSDOS
-#  define OPENSSL_UNISTD_IO <io.h>
-#  define OPENSSL_DECLARE_EXIT extern void exit(int);
-# else
-#  define OPENSSL_UNISTD_IO OPENSSL_UNISTD
-#  define OPENSSL_DECLARE_EXIT  /* declared in unistd.h */
-# endif
-
-/*-
- * Definitions of OPENSSL_GLOBAL and OPENSSL_EXTERN, to define and declare
- * certain global symbols that, with some compilers under VMS, have to be
- * defined and declared explicitely with globaldef and globalref.
- * Definitions of OPENSSL_EXPORT and OPENSSL_IMPORT, to define and declare
- * DLL exports and imports for compilers under Win32.  These are a little
- * more complicated to use.  Basically, for any library that exports some
- * global variables, the following code must be present in the header file
- * that declares them, before OPENSSL_EXTERN is used:
- *
- * #ifdef SOME_BUILD_FLAG_MACRO
- * # undef OPENSSL_EXTERN
- * # define OPENSSL_EXTERN OPENSSL_EXPORT
- * #endif
- *
- * The default is to have OPENSSL_EXPORT, OPENSSL_IMPORT and OPENSSL_GLOBAL
- * have some generally sensible values, and for OPENSSL_EXTERN to have the
- * value OPENSSL_IMPORT.
- */
-
-# if defined(OPENSSL_SYS_VMS_NODECC)
-#  define OPENSSL_EXPORT globalref
-#  define OPENSSL_IMPORT globalref
-#  define OPENSSL_GLOBAL globaldef
-# elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
-#  define OPENSSL_EXPORT extern __declspec(dllexport)
-#  define OPENSSL_IMPORT extern __declspec(dllimport)
-#  define OPENSSL_GLOBAL
-# else
-#  define OPENSSL_EXPORT extern
-#  define OPENSSL_IMPORT extern
-#  define OPENSSL_GLOBAL
-# endif
-# define OPENSSL_EXTERN OPENSSL_IMPORT
-
-/*-
- * Macros to allow global variables to be reached through function calls when
- * required (if a shared library version requires it, for example.
- * The way it's done allows definitions like this:
- *
- *      // in foobar.c
- *      OPENSSL_IMPLEMENT_GLOBAL(int,foobar,0)
- *      // in foobar.h
- *      OPENSSL_DECLARE_GLOBAL(int,foobar);
- *      #define foobar OPENSSL_GLOBAL_REF(foobar)
- */
-# ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION
-#  define OPENSSL_IMPLEMENT_GLOBAL(type,name,value)                      \
-        type *_shadow_##name(void)                                      \
-        { static type _hide_##name=value; return &_hide_##name; }
-#  define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
-#  define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
-# else
-#  define OPENSSL_IMPLEMENT_GLOBAL(type,name,value) OPENSSL_GLOBAL type _shadow_##name=value;
-#  define OPENSSL_DECLARE_GLOBAL(type,name) OPENSSL_EXPORT type _shadow_##name
-#  define OPENSSL_GLOBAL_REF(name) _shadow_##name
-# endif
-
-# if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) && macintosh==1 && !defined(MAC_OS_GUSI_SOURCE)
-#  define ossl_ssize_t long
-# endif
-
-# ifdef OPENSSL_SYS_MSDOS
-#  define ossl_ssize_t long
-# endif
-
-# if defined(NeXT) || defined(OPENSSL_SYS_NEWS4) || defined(OPENSSL_SYS_SUNOS)
-#  define ssize_t int
-# endif
-
-# if defined(__ultrix) && !defined(ssize_t)
-#  define ossl_ssize_t int
-# endif
-
-# ifndef ossl_ssize_t
-#  define ossl_ssize_t ssize_t
-# endif
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/ebcdic.h b/openflow/usr/include/openssl/ebcdic.h
deleted file mode 100644
index 4cbdfeb..0000000
--- a/openflow/usr/include/openssl/ebcdic.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* crypto/ebcdic.h */
-
-#ifndef HEADER_EBCDIC_H
-# define HEADER_EBCDIC_H
-
-# include <sys/types.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Avoid name clashes with other applications */
-# define os_toascii   _openssl_os_toascii
-# define os_toebcdic  _openssl_os_toebcdic
-# define ebcdic2ascii _openssl_ebcdic2ascii
-# define ascii2ebcdic _openssl_ascii2ebcdic
-
-extern const unsigned char os_toascii[256];
-extern const unsigned char os_toebcdic[256];
-void *ebcdic2ascii(void *dest, const void *srce, size_t count);
-void *ascii2ebcdic(void *dest, const void *srce, size_t count);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/ec.h b/openflow/usr/include/openssl/ec.h
deleted file mode 100644
index b62613d..0000000
--- a/openflow/usr/include/openssl/ec.h
+++ /dev/null
@@ -1,1284 +0,0 @@
-/* crypto/ec/ec.h */
-/*
- * Originally written by Bodo Moeller for the OpenSSL project.
- */
-/**
- * \file crypto/ec/ec.h Include file for the OpenSSL EC functions
- * \author Originally written by Bodo Moeller for the OpenSSL project
- */
-/* ====================================================================
- * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#ifndef HEADER_EC_H
-# define HEADER_EC_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_EC
-#  error EC is disabled.
-# endif
-
-# include <openssl/asn1.h>
-# include <openssl/symhacks.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-# ifdef  __cplusplus
-extern "C" {
-# elif defined(__SUNPRO_C)
-#  if __SUNPRO_C >= 0x520
-#   pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-#  endif
-# endif
-
-# ifndef OPENSSL_ECC_MAX_FIELD_BITS
-#  define OPENSSL_ECC_MAX_FIELD_BITS 661
-# endif
-
-/** Enum for the point conversion form as defined in X9.62 (ECDSA)
- *  for the encoding of a elliptic curve point (x,y) */
-typedef enum {
-        /** the point is encoded as z||x, where the octet z specifies
-         *  which solution of the quadratic equation y is  */
-    POINT_CONVERSION_COMPRESSED = 2,
-        /** the point is encoded as z||x||y, where z is the octet 0x04  */
-    POINT_CONVERSION_UNCOMPRESSED = 4,
-        /** the point is encoded as z||x||y, where the octet z specifies
-         *  which solution of the quadratic equation y is  */
-    POINT_CONVERSION_HYBRID = 6
-} point_conversion_form_t;
-
-typedef struct ec_method_st EC_METHOD;
-
-typedef struct ec_group_st
-    /*-
-     EC_METHOD *meth;
-     -- field definition
-     -- curve coefficients
-     -- optional generator with associated information (order, cofactor)
-     -- optional extra data (precomputed table for fast computation of multiples of generator)
-     -- ASN1 stuff
-    */
-    EC_GROUP;
-
-typedef struct ec_point_st EC_POINT;
-
-/********************************************************************/
-/*               EC_METHODs for curves over GF(p)                   */
-/********************************************************************/
-
-/** Returns the basic GFp ec methods which provides the basis for the
- *  optimized methods.
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_simple_method(void);
-
-/** Returns GFp methods using montgomery multiplication.
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_mont_method(void);
-
-/** Returns GFp methods using optimized methods for NIST recommended curves
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nist_method(void);
-
-# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-/** Returns 64-bit optimized methods for nistp224
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nistp224_method(void);
-
-/** Returns 64-bit optimized methods for nistp256
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nistp256_method(void);
-
-/** Returns 64-bit optimized methods for nistp521
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nistp521_method(void);
-# endif
-
-# ifndef OPENSSL_NO_EC2M
-/********************************************************************/
-/*           EC_METHOD for curves over GF(2^m)                      */
-/********************************************************************/
-
-/** Returns the basic GF2m ec method
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GF2m_simple_method(void);
-
-# endif
-
-/********************************************************************/
-/*                   EC_GROUP functions                             */
-/********************************************************************/
-
-/** Creates a new EC_GROUP object
- *  \param   meth  EC_METHOD to use
- *  \return  newly created EC_GROUP object or NULL in case of an error.
- */
-EC_GROUP *EC_GROUP_new(const EC_METHOD *meth);
-
-/** Frees a EC_GROUP object
- *  \param  group  EC_GROUP object to be freed.
- */
-void EC_GROUP_free(EC_GROUP *group);
-
-/** Clears and frees a EC_GROUP object
- *  \param  group  EC_GROUP object to be cleared and freed.
- */
-void EC_GROUP_clear_free(EC_GROUP *group);
-
-/** Copies EC_GROUP objects. Note: both EC_GROUPs must use the same EC_METHOD.
- *  \param  dst  destination EC_GROUP object
- *  \param  src  source EC_GROUP object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_GROUP_copy(EC_GROUP *dst, const EC_GROUP *src);
-
-/** Creates a new EC_GROUP object and copies the copies the content
- *  form src to the newly created EC_KEY object
- *  \param  src  source EC_GROUP object
- *  \return newly created EC_GROUP object or NULL in case of an error.
- */
-EC_GROUP *EC_GROUP_dup(const EC_GROUP *src);
-
-/** Returns the EC_METHOD of the EC_GROUP object.
- *  \param  group  EC_GROUP object
- *  \return EC_METHOD used in this EC_GROUP object.
- */
-const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *group);
-
-/** Returns the field type of the EC_METHOD.
- *  \param  meth  EC_METHOD object
- *  \return NID of the underlying field type OID.
- */
-int EC_METHOD_get_field_type(const EC_METHOD *meth);
-
-/** Sets the generator and it's order/cofactor of a EC_GROUP object.
- *  \param  group      EC_GROUP object
- *  \param  generator  EC_POINT object with the generator.
- *  \param  order      the order of the group generated by the generator.
- *  \param  cofactor   the index of the sub-group generated by the generator
- *                     in the group of all points on the elliptic curve.
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator,
-                           const BIGNUM *order, const BIGNUM *cofactor);
-
-/** Returns the generator of a EC_GROUP object.
- *  \param  group  EC_GROUP object
- *  \return the currently used generator (possibly NULL).
- */
-const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group);
-
-/** Returns the montgomery data for order(Generator)
- *  \param  group  EC_GROUP object
- *  \return the currently used generator (possibly NULL).
-*/
-BN_MONT_CTX *EC_GROUP_get_mont_data(const EC_GROUP *group);
-
-/** Gets the order of a EC_GROUP
- *  \param  group  EC_GROUP object
- *  \param  order  BIGNUM to which the order is copied
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_order(const EC_GROUP *group, BIGNUM *order, BN_CTX *ctx);
-
-/** Gets the cofactor of a EC_GROUP
- *  \param  group     EC_GROUP object
- *  \param  cofactor  BIGNUM to which the cofactor is copied
- *  \param  ctx       BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor,
-                          BN_CTX *ctx);
-
-/** Sets the name of a EC_GROUP object
- *  \param  group  EC_GROUP object
- *  \param  nid    NID of the curve name OID
- */
-void EC_GROUP_set_curve_name(EC_GROUP *group, int nid);
-
-/** Returns the curve name of a EC_GROUP object
- *  \param  group  EC_GROUP object
- *  \return NID of the curve name OID or 0 if not set.
- */
-int EC_GROUP_get_curve_name(const EC_GROUP *group);
-
-void EC_GROUP_set_asn1_flag(EC_GROUP *group, int flag);
-int EC_GROUP_get_asn1_flag(const EC_GROUP *group);
-
-void EC_GROUP_set_point_conversion_form(EC_GROUP *group,
-                                        point_conversion_form_t form);
-point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP *);
-
-unsigned char *EC_GROUP_get0_seed(const EC_GROUP *x);
-size_t EC_GROUP_get_seed_len(const EC_GROUP *);
-size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len);
-
-/** Sets the parameter of a ec over GFp defined by y^2 = x^3 + a*x + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM with the prime number
- *  \param  a      BIGNUM with parameter a of the equation
- *  \param  b      BIGNUM with parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
-                           const BIGNUM *b, BN_CTX *ctx);
-
-/** Gets the parameter of the ec over GFp defined by y^2 = x^3 + a*x + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM for the prime number
- *  \param  a      BIGNUM for parameter a of the equation
- *  \param  b      BIGNUM for parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
-                           BIGNUM *b, BN_CTX *ctx);
-
-# ifndef OPENSSL_NO_EC2M
-/** Sets the parameter of a ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM with the polynomial defining the underlying field
- *  \param  a      BIGNUM with parameter a of the equation
- *  \param  b      BIGNUM with parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
-                            const BIGNUM *b, BN_CTX *ctx);
-
-/** Gets the parameter of the ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM for the polynomial defining the underlying field
- *  \param  a      BIGNUM for parameter a of the equation
- *  \param  b      BIGNUM for parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
-                            BIGNUM *b, BN_CTX *ctx);
-# endif
-/** Returns the number of bits needed to represent a field element
- *  \param  group  EC_GROUP object
- *  \return number of bits needed to represent a field element
- */
-int EC_GROUP_get_degree(const EC_GROUP *group);
-
-/** Checks whether the parameter in the EC_GROUP define a valid ec group
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if group is a valid ec group and 0 otherwise
- */
-int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx);
-
-/** Checks whether the discriminant of the elliptic curve is zero or not
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if the discriminant is not zero and 0 otherwise
- */
-int EC_GROUP_check_discriminant(const EC_GROUP *group, BN_CTX *ctx);
-
-/** Compares two EC_GROUP objects
- *  \param  a    first EC_GROUP object
- *  \param  b    second EC_GROUP object
- *  \param  ctx  BN_CTX object (optional)
- *  \return 0 if both groups are equal and 1 otherwise
- */
-int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx);
-
-/*
- * EC_GROUP_new_GF*() calls EC_GROUP_new() and EC_GROUP_set_GF*() after
- * choosing an appropriate EC_METHOD
- */
-
-/** Creates a new EC_GROUP object with the specified parameters defined
- *  over GFp (defined by the equation y^2 = x^3 + a*x + b)
- *  \param  p    BIGNUM with the prime number
- *  \param  a    BIGNUM with the parameter a of the equation
- *  \param  b    BIGNUM with the parameter b of the equation
- *  \param  ctx  BN_CTX object (optional)
- *  \return newly created EC_GROUP object with the specified parameters
- */
-EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
-                                 const BIGNUM *b, BN_CTX *ctx);
-# ifndef OPENSSL_NO_EC2M
-/** Creates a new EC_GROUP object with the specified parameters defined
- *  over GF2m (defined by the equation y^2 + x*y = x^3 + a*x^2 + b)
- *  \param  p    BIGNUM with the polynomial defining the underlying field
- *  \param  a    BIGNUM with the parameter a of the equation
- *  \param  b    BIGNUM with the parameter b of the equation
- *  \param  ctx  BN_CTX object (optional)
- *  \return newly created EC_GROUP object with the specified parameters
- */
-EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a,
-                                  const BIGNUM *b, BN_CTX *ctx);
-# endif
-/** Creates a EC_GROUP object with a curve specified by a NID
- *  \param  nid  NID of the OID of the curve name
- *  \return newly created EC_GROUP object with specified curve or NULL
- *          if an error occurred
- */
-EC_GROUP *EC_GROUP_new_by_curve_name(int nid);
-
-/********************************************************************/
-/*               handling of internal curves                        */
-/********************************************************************/
-
-typedef struct {
-    int nid;
-    const char *comment;
-} EC_builtin_curve;
-
-/*
- * EC_builtin_curves(EC_builtin_curve *r, size_t size) returns number of all
- * available curves or zero if a error occurred. In case r ist not zero
- * nitems EC_builtin_curve structures are filled with the data of the first
- * nitems internal groups
- */
-size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
-
-const char *EC_curve_nid2nist(int nid);
-int EC_curve_nist2nid(const char *name);
-
-/********************************************************************/
-/*                    EC_POINT functions                            */
-/********************************************************************/
-
-/** Creates a new EC_POINT object for the specified EC_GROUP
- *  \param  group  EC_GROUP the underlying EC_GROUP object
- *  \return newly created EC_POINT object or NULL if an error occurred
- */
-EC_POINT *EC_POINT_new(const EC_GROUP *group);
-
-/** Frees a EC_POINT object
- *  \param  point  EC_POINT object to be freed
- */
-void EC_POINT_free(EC_POINT *point);
-
-/** Clears and frees a EC_POINT object
- *  \param  point  EC_POINT object to be cleared and freed
- */
-void EC_POINT_clear_free(EC_POINT *point);
-
-/** Copies EC_POINT object
- *  \param  dst  destination EC_POINT object
- *  \param  src  source EC_POINT object
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_copy(EC_POINT *dst, const EC_POINT *src);
-
-/** Creates a new EC_POINT object and copies the content of the supplied
- *  EC_POINT
- *  \param  src    source EC_POINT object
- *  \param  group  underlying the EC_GROUP object
- *  \return newly created EC_POINT object or NULL if an error occurred
- */
-EC_POINT *EC_POINT_dup(const EC_POINT *src, const EC_GROUP *group);
-
-/** Returns the EC_METHOD used in EC_POINT object
- *  \param  point  EC_POINT object
- *  \return the EC_METHOD used
- */
-const EC_METHOD *EC_POINT_method_of(const EC_POINT *point);
-
-/** Sets a point to infinity (neutral element)
- *  \param  group  underlying EC_GROUP object
- *  \param  point  EC_POINT to set to infinity
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point);
-
-/** Sets the jacobian projective coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  z      BIGNUM with the z-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
-                                             EC_POINT *p, const BIGNUM *x,
-                                             const BIGNUM *y, const BIGNUM *z,
-                                             BN_CTX *ctx);
-
-/** Gets the jacobian projective coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  z      BIGNUM for the z-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
-                                             const EC_POINT *p, BIGNUM *x,
-                                             BIGNUM *y, BIGNUM *z,
-                                             BN_CTX *ctx);
-
-/** Sets the affine coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
-                                        const BIGNUM *x, const BIGNUM *y,
-                                        BN_CTX *ctx);
-
-/** Gets the affine coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
-                                        const EC_POINT *p, BIGNUM *x,
-                                        BIGNUM *y, BN_CTX *ctx);
-
-/** Sets the x9.62 compressed coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with x-coordinate
- *  \param  y_bit  integer with the y-Bit (either 0 or 1)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
-                                            EC_POINT *p, const BIGNUM *x,
-                                            int y_bit, BN_CTX *ctx);
-# ifndef OPENSSL_NO_EC2M
-/** Sets the affine coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p,
-                                         const BIGNUM *x, const BIGNUM *y,
-                                         BN_CTX *ctx);
-
-/** Gets the affine coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
-                                         const EC_POINT *p, BIGNUM *x,
-                                         BIGNUM *y, BN_CTX *ctx);
-
-/** Sets the x9.62 compressed coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with x-coordinate
- *  \param  y_bit  integer with the y-Bit (either 0 or 1)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
-                                             EC_POINT *p, const BIGNUM *x,
-                                             int y_bit, BN_CTX *ctx);
-# endif
-/** Encodes a EC_POINT object to a octet string
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  form   point conversion form
- *  \param  buf    memory buffer for the result. If NULL the function returns
- *                 required buffer size.
- *  \param  len    length of the memory buffer
- *  \param  ctx    BN_CTX object (optional)
- *  \return the length of the encoded octet string or 0 if an error occurred
- */
-size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *p,
-                          point_conversion_form_t form,
-                          unsigned char *buf, size_t len, BN_CTX *ctx);
-
-/** Decodes a EC_POINT from a octet string
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  buf    memory buffer with the encoded ec point
- *  \param  len    length of the encoded ec point
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *p,
-                       const unsigned char *buf, size_t len, BN_CTX *ctx);
-
-/* other interfaces to point2oct/oct2point: */
-BIGNUM *EC_POINT_point2bn(const EC_GROUP *, const EC_POINT *,
-                          point_conversion_form_t form, BIGNUM *, BN_CTX *);
-EC_POINT *EC_POINT_bn2point(const EC_GROUP *, const BIGNUM *,
-                            EC_POINT *, BN_CTX *);
-char *EC_POINT_point2hex(const EC_GROUP *, const EC_POINT *,
-                         point_conversion_form_t form, BN_CTX *);
-EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *,
-                             EC_POINT *, BN_CTX *);
-
-/********************************************************************/
-/*         functions for doing EC_POINT arithmetic                  */
-/********************************************************************/
-
-/** Computes the sum of two EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result (r = a + b)
- *  \param  a      EC_POINT object with the first summand
- *  \param  b      EC_POINT object with the second summand
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
-                 const EC_POINT *b, BN_CTX *ctx);
-
-/** Computes the double of a EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result (r = 2 * a)
- *  \param  a      EC_POINT object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
-                 BN_CTX *ctx);
-
-/** Computes the inverse of a EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  a      EC_POINT object to be inverted (it's used for the result as well)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx);
-
-/** Checks whether the point is the neutral element of the group
- *  \param  group  the underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \return 1 if the point is the neutral element and 0 otherwise
- */
-int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *p);
-
-/** Checks whether the point is on the curve
- *  \param  group  underlying EC_GROUP object
- *  \param  point  EC_POINT object to check
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if point if on the curve and 0 otherwise
- */
-int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
-                         BN_CTX *ctx);
-
-/** Compares two EC_POINTs
- *  \param  group  underlying EC_GROUP object
- *  \param  a      first EC_POINT object
- *  \param  b      second EC_POINT object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 0 if both points are equal and a value != 0 otherwise
- */
-int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b,
-                 BN_CTX *ctx);
-
-int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx);
-int EC_POINTs_make_affine(const EC_GROUP *group, size_t num,
-                          EC_POINT *points[], BN_CTX *ctx);
-
-/** Computes r = generator * n sum_{i=0}^{num-1} p[i] * m[i]
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result
- *  \param  n      BIGNUM with the multiplier for the group generator (optional)
- *  \param  num    number futher summands
- *  \param  p      array of size num of EC_POINT objects
- *  \param  m      array of size num of BIGNUM objects
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
-                  size_t num, const EC_POINT *p[], const BIGNUM *m[],
-                  BN_CTX *ctx);
-
-/** Computes r = generator * n + q * m
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result
- *  \param  n      BIGNUM with the multiplier for the group generator (optional)
- *  \param  q      EC_POINT object with the first factor of the second summand
- *  \param  m      BIGNUM with the second factor of the second summand
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
-                 const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx);
-
-/** Stores multiples of generator for faster point multiplication
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
-
-/** Reports whether a precomputation has been done
- *  \param  group  EC_GROUP object
- *  \return 1 if a pre-computation has been done and 0 otherwise
- */
-int EC_GROUP_have_precompute_mult(const EC_GROUP *group);
-
-/********************************************************************/
-/*                       ASN1 stuff                                 */
-/********************************************************************/
-
-/*
- * EC_GROUP_get_basis_type() returns the NID of the basis type used to
- * represent the field elements
- */
-int EC_GROUP_get_basis_type(const EC_GROUP *);
-# ifndef OPENSSL_NO_EC2M
-int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k);
-int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1,
-                                   unsigned int *k2, unsigned int *k3);
-# endif
-
-# define OPENSSL_EC_NAMED_CURVE  0x001
-
-typedef struct ecpk_parameters_st ECPKPARAMETERS;
-
-EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len);
-int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
-
-# define d2i_ECPKParameters_bio(bp,x) ASN1_d2i_bio_of(EC_GROUP,NULL,d2i_ECPKParameters,bp,x)
-# define i2d_ECPKParameters_bio(bp,x) ASN1_i2d_bio_of_const(EC_GROUP,i2d_ECPKParameters,bp,x)
-# define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \
-                (char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x))
-# define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \
-                (unsigned char *)(x))
-
-# ifndef OPENSSL_NO_BIO
-int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
-# endif
-# ifndef OPENSSL_NO_FP_API
-int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
-# endif
-
-/********************************************************************/
-/*                      EC_KEY functions                            */
-/********************************************************************/
-
-typedef struct ec_key_st EC_KEY;
-
-/* some values for the encoding_flag */
-# define EC_PKEY_NO_PARAMETERS   0x001
-# define EC_PKEY_NO_PUBKEY       0x002
-
-/* some values for the flags field */
-# define EC_FLAG_NON_FIPS_ALLOW  0x1
-# define EC_FLAG_FIPS_CHECKED    0x2
-
-/** Creates a new EC_KEY object.
- *  \return EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_new(void);
-
-int EC_KEY_get_flags(const EC_KEY *key);
-
-void EC_KEY_set_flags(EC_KEY *key, int flags);
-
-void EC_KEY_clear_flags(EC_KEY *key, int flags);
-
-/** Creates a new EC_KEY object using a named curve as underlying
- *  EC_GROUP object.
- *  \param  nid  NID of the named curve.
- *  \return EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_new_by_curve_name(int nid);
-
-/** Frees a EC_KEY object.
- *  \param  key  EC_KEY object to be freed.
- */
-void EC_KEY_free(EC_KEY *key);
-
-/** Copies a EC_KEY object.
- *  \param  dst  destination EC_KEY object
- *  \param  src  src EC_KEY object
- *  \return dst or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_copy(EC_KEY *dst, const EC_KEY *src);
-
-/** Creates a new EC_KEY object and copies the content from src to it.
- *  \param  src  the source EC_KEY object
- *  \return newly created EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_dup(const EC_KEY *src);
-
-/** Increases the internal reference count of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_up_ref(EC_KEY *key);
-
-/** Returns the EC_GROUP object of a EC_KEY object
- *  \param  key  EC_KEY object
- *  \return the EC_GROUP object (possibly NULL).
- */
-const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key);
-
-/** Sets the EC_GROUP of a EC_KEY object.
- *  \param  key    EC_KEY object
- *  \param  group  EC_GROUP to use in the EC_KEY object (note: the EC_KEY
- *                 object will use an own copy of the EC_GROUP).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group);
-
-/** Returns the private key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \return a BIGNUM with the private key (possibly NULL).
- */
-const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *key);
-
-/** Sets the private key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \param  prv  BIGNUM with the private key (note: the EC_KEY object
- *               will use an own copy of the BIGNUM).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *prv);
-
-/** Returns the public key of a EC_KEY object.
- *  \param  key  the EC_KEY object
- *  \return a EC_POINT object with the public key (possibly NULL)
- */
-const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key);
-
-/** Sets the public key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \param  pub  EC_POINT object with the public key (note: the EC_KEY object
- *               will use an own copy of the EC_POINT object).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub);
-
-unsigned EC_KEY_get_enc_flags(const EC_KEY *key);
-void EC_KEY_set_enc_flags(EC_KEY *eckey, unsigned int flags);
-point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *key);
-void EC_KEY_set_conv_form(EC_KEY *eckey, point_conversion_form_t cform);
-/* functions to set/get method specific data  */
-void *EC_KEY_get_key_method_data(EC_KEY *key,
-                                 void *(*dup_func) (void *),
-                                 void (*free_func) (void *),
-                                 void (*clear_free_func) (void *));
-/** Sets the key method data of an EC_KEY object, if none has yet been set.
- *  \param  key              EC_KEY object
- *  \param  data             opaque data to install.
- *  \param  dup_func         a function that duplicates |data|.
- *  \param  free_func        a function that frees |data|.
- *  \param  clear_free_func  a function that wipes and frees |data|.
- *  \return the previously set data pointer, or NULL if |data| was inserted.
- */
-void *EC_KEY_insert_key_method_data(EC_KEY *key, void *data,
-                                    void *(*dup_func) (void *),
-                                    void (*free_func) (void *),
-                                    void (*clear_free_func) (void *));
-/* wrapper functions for the underlying EC_GROUP object */
-void EC_KEY_set_asn1_flag(EC_KEY *eckey, int asn1_flag);
-
-/** Creates a table of pre-computed multiples of the generator to
- *  accelerate further EC_KEY operations.
- *  \param  key  EC_KEY object
- *  \param  ctx  BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx);
-
-/** Creates a new ec private (and optional a new public) key.
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_generate_key(EC_KEY *key);
-
-/** Verifies that a private and/or public key is valid.
- *  \param  key  the EC_KEY object
- *  \return 1 on success and 0 otherwise.
- */
-int EC_KEY_check_key(const EC_KEY *key);
-
-/** Sets a public key from affine coordindates performing
- *  neccessary NIST PKV tests.
- *  \param  key  the EC_KEY object
- *  \param  x    public key x coordinate
- *  \param  y    public key y coordinate
- *  \return 1 on success and 0 otherwise.
- */
-int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
-                                             BIGNUM *y);
-
-/********************************************************************/
-/*        de- and encoding functions for SEC1 ECPrivateKey          */
-/********************************************************************/
-
-/** Decodes a private key from a memory buffer.
- *  \param  key  a pointer to a EC_KEY object which should be used (or NULL)
- *  \param  in   pointer to memory with the DER encoded private key
- *  \param  len  length of the DER encoded private key
- *  \return the decoded private key or NULL if an error occurred.
- */
-EC_KEY *d2i_ECPrivateKey(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes a private key object and stores the result in a buffer.
- *  \param  key  the EC_KEY object to encode
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred.
- */
-int i2d_ECPrivateKey(EC_KEY *key, unsigned char **out);
-
-/********************************************************************/
-/*        de- and encoding functions for EC parameters              */
-/********************************************************************/
-
-/** Decodes ec parameter from a memory buffer.
- *  \param  key  a pointer to a EC_KEY object which should be used (or NULL)
- *  \param  in   pointer to memory with the DER encoded ec parameters
- *  \param  len  length of the DER encoded ec parameters
- *  \return a EC_KEY object with the decoded parameters or NULL if an error
- *          occurred.
- */
-EC_KEY *d2i_ECParameters(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes ec parameter and stores the result in a buffer.
- *  \param  key  the EC_KEY object with ec paramters to encode
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred.
- */
-int i2d_ECParameters(EC_KEY *key, unsigned char **out);
-
-/********************************************************************/
-/*         de- and encoding functions for EC public key             */
-/*         (octet string, not DER -- hence 'o2i' and 'i2o')         */
-/********************************************************************/
-
-/** Decodes a ec public key from a octet string.
- *  \param  key  a pointer to a EC_KEY object which should be used
- *  \param  in   memory buffer with the encoded public key
- *  \param  len  length of the encoded public key
- *  \return EC_KEY object with decoded public key or NULL if an error
- *          occurred.
- */
-EC_KEY *o2i_ECPublicKey(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes a ec public key in an octet string.
- *  \param  key  the EC_KEY object with the public key
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred
- */
-int i2o_ECPublicKey(EC_KEY *key, unsigned char **out);
-
-# ifndef OPENSSL_NO_BIO
-/** Prints out the ec parameters on human readable form.
- *  \param  bp   BIO object to which the information is printed
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred
- */
-int ECParameters_print(BIO *bp, const EC_KEY *key);
-
-/** Prints out the contents of a EC_KEY object
- *  \param  bp   BIO object to which the information is printed
- *  \param  key  EC_KEY object
- *  \param  off  line offset
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
-
-# endif
-# ifndef OPENSSL_NO_FP_API
-/** Prints out the ec parameters on human readable form.
- *  \param  fp   file descriptor to which the information is printed
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred
- */
-int ECParameters_print_fp(FILE *fp, const EC_KEY *key);
-
-/** Prints out the contents of a EC_KEY object
- *  \param  fp   file descriptor to which the information is printed
- *  \param  key  EC_KEY object
- *  \param  off  line offset
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
-
-# endif
-
-# define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
-
-# ifndef __cplusplus
-#  if defined(__SUNPRO_C)
-#   if __SUNPRO_C >= 0x520
-#    pragma error_messages (default,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-#   endif
-#  endif
-# endif
-
-# define EVP_PKEY_CTX_set_ec_paramgen_curve_nid(ctx, nid) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_PARAMGEN|EVP_PKEY_OP_KEYGEN, \
-                                EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, nid, NULL)
-
-# define EVP_PKEY_CTX_set_ec_param_enc(ctx, flag) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_PARAMGEN|EVP_PKEY_OP_KEYGEN, \
-                                EVP_PKEY_CTRL_EC_PARAM_ENC, flag, NULL)
-
-# define EVP_PKEY_CTX_set_ecdh_cofactor_mode(ctx, flag) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_ECDH_COFACTOR, flag, NULL)
-
-# define EVP_PKEY_CTX_get_ecdh_cofactor_mode(ctx) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_ECDH_COFACTOR, -2, NULL)
-
-# define EVP_PKEY_CTX_set_ecdh_kdf_type(ctx, kdf) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_KDF_TYPE, kdf, NULL)
-
-# define EVP_PKEY_CTX_get_ecdh_kdf_type(ctx) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_KDF_TYPE, -2, NULL)
-
-# define EVP_PKEY_CTX_set_ecdh_kdf_md(ctx, md) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_KDF_MD, 0, (void *)md)
-
-# define EVP_PKEY_CTX_get_ecdh_kdf_md(ctx, pmd) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_GET_EC_KDF_MD, 0, (void *)pmd)
-
-# define EVP_PKEY_CTX_set_ecdh_kdf_outlen(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_KDF_OUTLEN, len, NULL)
-
-# define EVP_PKEY_CTX_get_ecdh_kdf_outlen(ctx, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                        EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, 0, (void *)plen)
-
-# define EVP_PKEY_CTX_set0_ecdh_kdf_ukm(ctx, p, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_KDF_UKM, plen, (void *)p)
-
-# define EVP_PKEY_CTX_get0_ecdh_kdf_ukm(ctx, p) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_GET_EC_KDF_UKM, 0, (void *)p)
-
-# define EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID             (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_EC_PARAM_ENC                      (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_EC_ECDH_COFACTOR                  (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_EC_KDF_TYPE                       (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_EC_KDF_MD                         (EVP_PKEY_ALG_CTRL + 5)
-# define EVP_PKEY_CTRL_GET_EC_KDF_MD                     (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_EC_KDF_OUTLEN                     (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN                 (EVP_PKEY_ALG_CTRL + 8)
-# define EVP_PKEY_CTRL_EC_KDF_UKM                        (EVP_PKEY_ALG_CTRL + 9)
-# define EVP_PKEY_CTRL_GET_EC_KDF_UKM                    (EVP_PKEY_ALG_CTRL + 10)
-/* KDF types */
-# define EVP_PKEY_ECDH_KDF_NONE                          1
-# define EVP_PKEY_ECDH_KDF_X9_62                         2
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-void ERR_load_EC_strings(void);
-
-/* Error codes for the EC functions. */
-
-/* Function codes. */
-# define EC_F_BN_TO_FELEM                                 224
-# define EC_F_COMPUTE_WNAF                                143
-# define EC_F_D2I_ECPARAMETERS                            144
-# define EC_F_D2I_ECPKPARAMETERS                          145
-# define EC_F_D2I_ECPRIVATEKEY                            146
-# define EC_F_DO_EC_KEY_PRINT                             221
-# define EC_F_ECDH_CMS_DECRYPT                            238
-# define EC_F_ECDH_CMS_SET_SHARED_INFO                    239
-# define EC_F_ECKEY_PARAM2TYPE                            223
-# define EC_F_ECKEY_PARAM_DECODE                          212
-# define EC_F_ECKEY_PRIV_DECODE                           213
-# define EC_F_ECKEY_PRIV_ENCODE                           214
-# define EC_F_ECKEY_PUB_DECODE                            215
-# define EC_F_ECKEY_PUB_ENCODE                            216
-# define EC_F_ECKEY_TYPE2PARAM                            220
-# define EC_F_ECPARAMETERS_PRINT                          147
-# define EC_F_ECPARAMETERS_PRINT_FP                       148
-# define EC_F_ECPKPARAMETERS_PRINT                        149
-# define EC_F_ECPKPARAMETERS_PRINT_FP                     150
-# define EC_F_ECP_NISTZ256_GET_AFFINE                     240
-# define EC_F_ECP_NISTZ256_MULT_PRECOMPUTE                243
-# define EC_F_ECP_NISTZ256_POINTS_MUL                     241
-# define EC_F_ECP_NISTZ256_PRE_COMP_NEW                   244
-# define EC_F_ECP_NISTZ256_SET_WORDS                      245
-# define EC_F_ECP_NISTZ256_WINDOWED_MUL                   242
-# define EC_F_ECP_NIST_MOD_192                            203
-# define EC_F_ECP_NIST_MOD_224                            204
-# define EC_F_ECP_NIST_MOD_256                            205
-# define EC_F_ECP_NIST_MOD_521                            206
-# define EC_F_EC_ASN1_GROUP2CURVE                         153
-# define EC_F_EC_ASN1_GROUP2FIELDID                       154
-# define EC_F_EC_ASN1_GROUP2PARAMETERS                    155
-# define EC_F_EC_ASN1_GROUP2PKPARAMETERS                  156
-# define EC_F_EC_ASN1_PARAMETERS2GROUP                    157
-# define EC_F_EC_ASN1_PKPARAMETERS2GROUP                  158
-# define EC_F_EC_EX_DATA_SET_DATA                         211
-# define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY           208
-# define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT     159
-# define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE              195
-# define EC_F_EC_GF2M_SIMPLE_OCT2POINT                    160
-# define EC_F_EC_GF2M_SIMPLE_POINT2OCT                    161
-# define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 162
-# define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 163
-# define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES   164
-# define EC_F_EC_GFP_MONT_FIELD_DECODE                    133
-# define EC_F_EC_GFP_MONT_FIELD_ENCODE                    134
-# define EC_F_EC_GFP_MONT_FIELD_MUL                       131
-# define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE                209
-# define EC_F_EC_GFP_MONT_FIELD_SQR                       132
-# define EC_F_EC_GFP_MONT_GROUP_SET_CURVE                 189
-# define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP             135
-# define EC_F_EC_GFP_NISTP224_GROUP_SET_CURVE             225
-# define EC_F_EC_GFP_NISTP224_POINTS_MUL                  228
-# define EC_F_EC_GFP_NISTP224_POINT_GET_AFFINE_COORDINATES 226
-# define EC_F_EC_GFP_NISTP256_GROUP_SET_CURVE             230
-# define EC_F_EC_GFP_NISTP256_POINTS_MUL                  231
-# define EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES 232
-# define EC_F_EC_GFP_NISTP521_GROUP_SET_CURVE             233
-# define EC_F_EC_GFP_NISTP521_POINTS_MUL                  234
-# define EC_F_EC_GFP_NISTP521_POINT_GET_AFFINE_COORDINATES 235
-# define EC_F_EC_GFP_NIST_FIELD_MUL                       200
-# define EC_F_EC_GFP_NIST_FIELD_SQR                       201
-# define EC_F_EC_GFP_NIST_GROUP_SET_CURVE                 202
-# define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT      165
-# define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE               166
-# define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP           100
-# define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR           101
-# define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE                   102
-# define EC_F_EC_GFP_SIMPLE_OCT2POINT                     103
-# define EC_F_EC_GFP_SIMPLE_POINT2OCT                     104
-# define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE            137
-# define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES  167
-# define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 105
-# define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES  168
-# define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP 128
-# define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES    169
-# define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP 129
-# define EC_F_EC_GROUP_CHECK                              170
-# define EC_F_EC_GROUP_CHECK_DISCRIMINANT                 171
-# define EC_F_EC_GROUP_COPY                               106
-# define EC_F_EC_GROUP_GET0_GENERATOR                     139
-# define EC_F_EC_GROUP_GET_COFACTOR                       140
-# define EC_F_EC_GROUP_GET_CURVE_GF2M                     172
-# define EC_F_EC_GROUP_GET_CURVE_GFP                      130
-# define EC_F_EC_GROUP_GET_DEGREE                         173
-# define EC_F_EC_GROUP_GET_ORDER                          141
-# define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS              193
-# define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS                194
-# define EC_F_EC_GROUP_NEW                                108
-# define EC_F_EC_GROUP_NEW_BY_CURVE_NAME                  174
-# define EC_F_EC_GROUP_NEW_FROM_DATA                      175
-# define EC_F_EC_GROUP_PRECOMPUTE_MULT                    142
-# define EC_F_EC_GROUP_SET_CURVE_GF2M                     176
-# define EC_F_EC_GROUP_SET_CURVE_GFP                      109
-# define EC_F_EC_GROUP_SET_EXTRA_DATA                     110
-# define EC_F_EC_GROUP_SET_GENERATOR                      111
-# define EC_F_EC_KEY_CHECK_KEY                            177
-# define EC_F_EC_KEY_COPY                                 178
-# define EC_F_EC_KEY_GENERATE_KEY                         179
-# define EC_F_EC_KEY_NEW                                  182
-# define EC_F_EC_KEY_PRINT                                180
-# define EC_F_EC_KEY_PRINT_FP                             181
-# define EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES    229
-# define EC_F_EC_POINTS_MAKE_AFFINE                       136
-# define EC_F_EC_POINT_ADD                                112
-# define EC_F_EC_POINT_CMP                                113
-# define EC_F_EC_POINT_COPY                               114
-# define EC_F_EC_POINT_DBL                                115
-# define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M        183
-# define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP         116
-# define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP    117
-# define EC_F_EC_POINT_INVERT                             210
-# define EC_F_EC_POINT_IS_AT_INFINITY                     118
-# define EC_F_EC_POINT_IS_ON_CURVE                        119
-# define EC_F_EC_POINT_MAKE_AFFINE                        120
-# define EC_F_EC_POINT_MUL                                184
-# define EC_F_EC_POINT_NEW                                121
-# define EC_F_EC_POINT_OCT2POINT                          122
-# define EC_F_EC_POINT_POINT2OCT                          123
-# define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M        185
-# define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP         124
-# define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M    186
-# define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP     125
-# define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP    126
-# define EC_F_EC_POINT_SET_TO_INFINITY                    127
-# define EC_F_EC_PRE_COMP_DUP                             207
-# define EC_F_EC_PRE_COMP_NEW                             196
-# define EC_F_EC_WNAF_MUL                                 187
-# define EC_F_EC_WNAF_PRECOMPUTE_MULT                     188
-# define EC_F_I2D_ECPARAMETERS                            190
-# define EC_F_I2D_ECPKPARAMETERS                          191
-# define EC_F_I2D_ECPRIVATEKEY                            192
-# define EC_F_I2O_ECPUBLICKEY                             151
-# define EC_F_NISTP224_PRE_COMP_NEW                       227
-# define EC_F_NISTP256_PRE_COMP_NEW                       236
-# define EC_F_NISTP521_PRE_COMP_NEW                       237
-# define EC_F_O2I_ECPUBLICKEY                             152
-# define EC_F_OLD_EC_PRIV_DECODE                          222
-# define EC_F_PKEY_EC_CTRL                                197
-# define EC_F_PKEY_EC_CTRL_STR                            198
-# define EC_F_PKEY_EC_DERIVE                              217
-# define EC_F_PKEY_EC_KEYGEN                              199
-# define EC_F_PKEY_EC_PARAMGEN                            219
-# define EC_F_PKEY_EC_SIGN                                218
-
-/* Reason codes. */
-# define EC_R_ASN1_ERROR                                  115
-# define EC_R_ASN1_UNKNOWN_FIELD                          116
-# define EC_R_BIGNUM_OUT_OF_RANGE                         144
-# define EC_R_BUFFER_TOO_SMALL                            100
-# define EC_R_COORDINATES_OUT_OF_RANGE                    146
-# define EC_R_D2I_ECPKPARAMETERS_FAILURE                  117
-# define EC_R_DECODE_ERROR                                142
-# define EC_R_DISCRIMINANT_IS_ZERO                        118
-# define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE                119
-# define EC_R_FIELD_TOO_LARGE                             143
-# define EC_R_GF2M_NOT_SUPPORTED                          147
-# define EC_R_GROUP2PKPARAMETERS_FAILURE                  120
-# define EC_R_I2D_ECPKPARAMETERS_FAILURE                  121
-# define EC_R_INCOMPATIBLE_OBJECTS                        101
-# define EC_R_INVALID_ARGUMENT                            112
-# define EC_R_INVALID_COMPRESSED_POINT                    110
-# define EC_R_INVALID_COMPRESSION_BIT                     109
-# define EC_R_INVALID_CURVE                               141
-# define EC_R_INVALID_DIGEST                              151
-# define EC_R_INVALID_DIGEST_TYPE                         138
-# define EC_R_INVALID_ENCODING                            102
-# define EC_R_INVALID_FIELD                               103
-# define EC_R_INVALID_FORM                                104
-# define EC_R_INVALID_GROUP_ORDER                         122
-# define EC_R_INVALID_PENTANOMIAL_BASIS                   132
-# define EC_R_INVALID_PRIVATE_KEY                         123
-# define EC_R_INVALID_TRINOMIAL_BASIS                     137
-# define EC_R_KDF_PARAMETER_ERROR                         148
-# define EC_R_KEYS_NOT_SET                                140
-# define EC_R_MISSING_PARAMETERS                          124
-# define EC_R_MISSING_PRIVATE_KEY                         125
-# define EC_R_NOT_A_NIST_PRIME                            135
-# define EC_R_NOT_A_SUPPORTED_NIST_PRIME                  136
-# define EC_R_NOT_IMPLEMENTED                             126
-# define EC_R_NOT_INITIALIZED                             111
-# define EC_R_NO_FIELD_MOD                                133
-# define EC_R_NO_PARAMETERS_SET                           139
-# define EC_R_PASSED_NULL_PARAMETER                       134
-# define EC_R_PEER_KEY_ERROR                              149
-# define EC_R_PKPARAMETERS2GROUP_FAILURE                  127
-# define EC_R_POINT_AT_INFINITY                           106
-# define EC_R_POINT_IS_NOT_ON_CURVE                       107
-# define EC_R_SHARED_INFO_ERROR                           150
-# define EC_R_SLOT_FULL                                   108
-# define EC_R_UNDEFINED_GENERATOR                         113
-# define EC_R_UNDEFINED_ORDER                             128
-# define EC_R_UNKNOWN_COFACTOR                            152
-# define EC_R_UNKNOWN_GROUP                               129
-# define EC_R_UNKNOWN_ORDER                               114
-# define EC_R_UNSUPPORTED_FIELD                           131
-# define EC_R_WRONG_CURVE_PARAMETERS                      145
-# define EC_R_WRONG_ORDER                                 130
-
-# ifdef  __cplusplus
-}
-# endif
-#endif
diff --git a/openflow/usr/include/openssl/ecdh.h b/openflow/usr/include/openssl/ecdh.h
deleted file mode 100644
index 25348b3..0000000
--- a/openflow/usr/include/openssl/ecdh.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* crypto/ecdh/ecdh.h */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- *
- * The ECDH software is originally written by Douglas Stebila of
- * Sun Microsystems Laboratories.
- *
- */
-/* ====================================================================
- * Copyright (c) 2000-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_ECDH_H
-# define HEADER_ECDH_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_ECDH
-#  error ECDH is disabled.
-# endif
-
-# include <openssl/ec.h>
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# define EC_FLAG_COFACTOR_ECDH   0x1000
-
-const ECDH_METHOD *ECDH_OpenSSL(void);
-
-void ECDH_set_default_method(const ECDH_METHOD *);
-const ECDH_METHOD *ECDH_get_default_method(void);
-int ECDH_set_method(EC_KEY *, const ECDH_METHOD *);
-
-int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
-                     EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen,
-                                                 void *out, size_t *outlen));
-
-int ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new
-                          *new_func, CRYPTO_EX_dup *dup_func,
-                          CRYPTO_EX_free *free_func);
-int ECDH_set_ex_data(EC_KEY *d, int idx, void *arg);
-void *ECDH_get_ex_data(EC_KEY *d, int idx);
-
-int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
-                   const unsigned char *Z, size_t Zlen,
-                   const unsigned char *sinfo, size_t sinfolen,
-                   const EVP_MD *md);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ECDH_strings(void);
-
-/* Error codes for the ECDH functions. */
-
-/* Function codes. */
-# define ECDH_F_ECDH_CHECK                                102
-# define ECDH_F_ECDH_COMPUTE_KEY                          100
-# define ECDH_F_ECDH_DATA_NEW_METHOD                      101
-
-/* Reason codes. */
-# define ECDH_R_KDF_FAILED                                102
-# define ECDH_R_NON_FIPS_METHOD                           103
-# define ECDH_R_NO_PRIVATE_VALUE                          100
-# define ECDH_R_POINT_ARITHMETIC_FAILURE                  101
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/ecdsa.h b/openflow/usr/include/openssl/ecdsa.h
deleted file mode 100644
index a6f0930..0000000
--- a/openflow/usr/include/openssl/ecdsa.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/* crypto/ecdsa/ecdsa.h */
-/**
- * \file   crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
- * \author Written by Nils Larsch for the OpenSSL project
- */
-/* ====================================================================
- * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_ECDSA_H
-# define HEADER_ECDSA_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_ECDSA
-#  error ECDSA is disabled.
-# endif
-
-# include <openssl/ec.h>
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct ECDSA_SIG_st {
-    BIGNUM *r;
-    BIGNUM *s;
-} ECDSA_SIG;
-
-/** Allocates and initialize a ECDSA_SIG structure
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_SIG_new(void);
-
-/** frees a ECDSA_SIG structure
- *  \param  sig  pointer to the ECDSA_SIG structure
- */
-void ECDSA_SIG_free(ECDSA_SIG *sig);
-
-/** DER encode content of ECDSA_SIG object (note: this function modifies *pp
- *  (*pp += length of the DER encoded signature)).
- *  \param  sig  pointer to the ECDSA_SIG object
- *  \param  pp   pointer to a unsigned char pointer for the output or NULL
- *  \return the length of the DER encoded ECDSA_SIG object or 0
- */
-int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp);
-
-/** Decodes a DER encoded ECDSA signature (note: this function changes *pp
- *  (*pp += len)).
- *  \param  sig  pointer to ECDSA_SIG pointer (may be NULL)
- *  \param  pp   memory buffer with the DER encoded signature
- *  \param  len  length of the buffer
- *  \return pointer to the decoded ECDSA_SIG structure (or NULL)
- */
-ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **sig, const unsigned char **pp, long len);
-
-/** Computes the ECDSA signature of the given hash value using
- *  the supplied private key and returns the created signature.
- *  \param  dgst      pointer to the hash value
- *  \param  dgst_len  length of the hash value
- *  \param  eckey     EC_KEY object containing a private EC key
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dgst_len,
-                         EC_KEY *eckey);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
- *  \param  rp       BIGNUM with a pre-computed rp value (optioanl),
- *                   see ECDSA_sign_setup
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen,
-                            const BIGNUM *kinv, const BIGNUM *rp,
-                            EC_KEY *eckey);
-
-/** Verifies that the supplied signature is a valid ECDSA
- *  signature of the supplied hash value using the supplied public key.
- *  \param  dgst      pointer to the hash value
- *  \param  dgst_len  length of the hash value
- *  \param  sig       ECDSA_SIG structure
- *  \param  eckey     EC_KEY object containing a public EC key
- *  \return 1 if the signature is valid, 0 if the signature is invalid
- *          and -1 on error
- */
-int ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
-                    const ECDSA_SIG *sig, EC_KEY *eckey);
-
-const ECDSA_METHOD *ECDSA_OpenSSL(void);
-
-/** Sets the default ECDSA method
- *  \param  meth  new default ECDSA_METHOD
- */
-void ECDSA_set_default_method(const ECDSA_METHOD *meth);
-
-/** Returns the default ECDSA method
- *  \return pointer to ECDSA_METHOD structure containing the default method
- */
-const ECDSA_METHOD *ECDSA_get_default_method(void);
-
-/** Sets method to be used for the ECDSA operations
- *  \param  eckey  EC_KEY object
- *  \param  meth   new method
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth);
-
-/** Returns the maximum length of the DER encoded signature
- *  \param  eckey  EC_KEY object
- *  \return numbers of bytes required for the DER encoded signature
- */
-int ECDSA_size(const EC_KEY *eckey);
-
-/** Precompute parts of the signing operation
- *  \param  eckey  EC_KEY object containing a private EC key
- *  \param  ctx    BN_CTX object (optional)
- *  \param  kinv   BIGNUM pointer for the inverse of k
- *  \param  rp     BIGNUM pointer for x coordinate of k * generator
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, BIGNUM **rp);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  sig      memory for the DER encoded created signature
- *  \param  siglen   pointer to the length of the returned signature
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_sign(int type, const unsigned char *dgst, int dgstlen,
-               unsigned char *sig, unsigned int *siglen, EC_KEY *eckey);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  sig      buffer to hold the DER encoded signature
- *  \param  siglen   pointer to the length of the returned signature
- *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
- *  \param  rp       BIGNUM with a pre-computed rp value (optioanl),
- *                   see ECDSA_sign_setup
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_sign_ex(int type, const unsigned char *dgst, int dgstlen,
-                  unsigned char *sig, unsigned int *siglen,
-                  const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey);
-
-/** Verifies that the given signature is valid ECDSA signature
- *  of the supplied hash value using the specified public key.
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value
- *  \param  dgstlen  length of the hash value
- *  \param  sig      pointer to the DER encoded signature
- *  \param  siglen   length of the DER encoded signature
- *  \param  eckey    EC_KEY object containing a public EC key
- *  \return 1 if the signature is valid, 0 if the signature is invalid
- *          and -1 on error
- */
-int ECDSA_verify(int type, const unsigned char *dgst, int dgstlen,
-                 const unsigned char *sig, int siglen, EC_KEY *eckey);
-
-/* the standard ex_data functions */
-int ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new
-                           *new_func, CRYPTO_EX_dup *dup_func,
-                           CRYPTO_EX_free *free_func);
-int ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg);
-void *ECDSA_get_ex_data(EC_KEY *d, int idx);
-
-/** Allocates and initialize a ECDSA_METHOD structure
- *  \param ecdsa_method pointer to ECDSA_METHOD to copy.  (May be NULL)
- *  \return pointer to a ECDSA_METHOD structure or NULL if an error occurred
- */
-
-ECDSA_METHOD *ECDSA_METHOD_new(const ECDSA_METHOD *ecdsa_method);
-
-/** frees a ECDSA_METHOD structure
- *  \param  ecdsa_method  pointer to the ECDSA_METHOD structure
- */
-void ECDSA_METHOD_free(ECDSA_METHOD *ecdsa_method);
-
-/**  Sets application specific data in the ECDSA_METHOD
- *   \param  ecdsa_method pointer to existing ECDSA_METHOD
- *   \param  app application specific data to set
- */
-
-void ECDSA_METHOD_set_app_data(ECDSA_METHOD *ecdsa_method, void *app);
-
-/** Returns application specific data from a ECDSA_METHOD structure
- *  \param ecdsa_method pointer to ECDSA_METHOD structure
- *  \return pointer to application specific data.
- */
-
-void *ECDSA_METHOD_get_app_data(ECDSA_METHOD *ecdsa_method);
-
-/**  Set the ECDSA_do_sign function in the ECDSA_METHOD
- *   \param  ecdsa_method  pointer to existing ECDSA_METHOD
- *   \param  ecdsa_do_sign a funtion of type ECDSA_do_sign
- */
-
-void ECDSA_METHOD_set_sign(ECDSA_METHOD *ecdsa_method,
-                           ECDSA_SIG *(*ecdsa_do_sign) (const unsigned char
-                                                        *dgst, int dgst_len,
-                                                        const BIGNUM *inv,
-                                                        const BIGNUM *rp,
-                                                        EC_KEY *eckey));
-
-/**  Set the  ECDSA_sign_setup function in the ECDSA_METHOD
- *   \param  ecdsa_method  pointer to existing ECDSA_METHOD
- *   \param  ecdsa_sign_setup a funtion of type ECDSA_sign_setup
- */
-
-void ECDSA_METHOD_set_sign_setup(ECDSA_METHOD *ecdsa_method,
-                                 int (*ecdsa_sign_setup) (EC_KEY *eckey,
-                                                          BN_CTX *ctx,
-                                                          BIGNUM **kinv,
-                                                          BIGNUM **r));
-
-/**  Set the ECDSA_do_verify function in the ECDSA_METHOD
- *   \param  ecdsa_method  pointer to existing ECDSA_METHOD
- *   \param  ecdsa_do_verify a funtion of type ECDSA_do_verify
- */
-
-void ECDSA_METHOD_set_verify(ECDSA_METHOD *ecdsa_method,
-                             int (*ecdsa_do_verify) (const unsigned char
-                                                     *dgst, int dgst_len,
-                                                     const ECDSA_SIG *sig,
-                                                     EC_KEY *eckey));
-
-void ECDSA_METHOD_set_flags(ECDSA_METHOD *ecdsa_method, int flags);
-
-/**  Set the flags field in the ECDSA_METHOD
- *   \param  ecdsa_method  pointer to existing ECDSA_METHOD
- *   \param  flags flags value to set
- */
-
-void ECDSA_METHOD_set_name(ECDSA_METHOD *ecdsa_method, char *name);
-
-/**  Set the name field in the ECDSA_METHOD
- *   \param  ecdsa_method  pointer to existing ECDSA_METHOD
- *   \param  name name to set
- */
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ECDSA_strings(void);
-
-/* Error codes for the ECDSA functions. */
-
-/* Function codes. */
-# define ECDSA_F_ECDSA_CHECK                              104
-# define ECDSA_F_ECDSA_DATA_NEW_METHOD                    100
-# define ECDSA_F_ECDSA_DO_SIGN                            101
-# define ECDSA_F_ECDSA_DO_VERIFY                          102
-# define ECDSA_F_ECDSA_METHOD_NEW                         105
-# define ECDSA_F_ECDSA_SIGN_SETUP                         103
-
-/* Reason codes. */
-# define ECDSA_R_BAD_SIGNATURE                            100
-# define ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE              101
-# define ECDSA_R_ERR_EC_LIB                               102
-# define ECDSA_R_MISSING_PARAMETERS                       103
-# define ECDSA_R_NEED_NEW_SETUP_VALUES                    106
-# define ECDSA_R_NON_FIPS_METHOD                          107
-# define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED          104
-# define ECDSA_R_SIGNATURE_MALLOC_FAILED                  105
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/engine.h b/openflow/usr/include/openssl/engine.h
deleted file mode 100644
index bd7b591..0000000
--- a/openflow/usr/include/openssl/engine.h
+++ /dev/null
@@ -1,960 +0,0 @@
-/* openssl/engine.h */
-/*
- * Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL project
- * 2000.
- */
-/* ====================================================================
- * Copyright (c) 1999-2004 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_ENGINE_H
-# define HEADER_ENGINE_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_ENGINE
-#  error ENGINE is disabled.
-# endif
-
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-#  ifndef OPENSSL_NO_RSA
-#   include <openssl/rsa.h>
-#  endif
-#  ifndef OPENSSL_NO_DSA
-#   include <openssl/dsa.h>
-#  endif
-#  ifndef OPENSSL_NO_DH
-#   include <openssl/dh.h>
-#  endif
-#  ifndef OPENSSL_NO_ECDH
-#   include <openssl/ecdh.h>
-#  endif
-#  ifndef OPENSSL_NO_ECDSA
-#   include <openssl/ecdsa.h>
-#  endif
-#  include <openssl/rand.h>
-#  include <openssl/ui.h>
-#  include <openssl/err.h>
-# endif
-
-# include <openssl/ossl_typ.h>
-# include <openssl/symhacks.h>
-
-# include <openssl/x509.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * These flags are used to control combinations of algorithm (methods) by
- * bitwise "OR"ing.
- */
-# define ENGINE_METHOD_RSA               (unsigned int)0x0001
-# define ENGINE_METHOD_DSA               (unsigned int)0x0002
-# define ENGINE_METHOD_DH                (unsigned int)0x0004
-# define ENGINE_METHOD_RAND              (unsigned int)0x0008
-# define ENGINE_METHOD_ECDH              (unsigned int)0x0010
-# define ENGINE_METHOD_ECDSA             (unsigned int)0x0020
-# define ENGINE_METHOD_CIPHERS           (unsigned int)0x0040
-# define ENGINE_METHOD_DIGESTS           (unsigned int)0x0080
-# define ENGINE_METHOD_STORE             (unsigned int)0x0100
-# define ENGINE_METHOD_PKEY_METHS        (unsigned int)0x0200
-# define ENGINE_METHOD_PKEY_ASN1_METHS   (unsigned int)0x0400
-/* Obvious all-or-nothing cases. */
-# define ENGINE_METHOD_ALL               (unsigned int)0xFFFF
-# define ENGINE_METHOD_NONE              (unsigned int)0x0000
-
-/*
- * This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used
- * internally to control registration of ENGINE implementations, and can be
- * set by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to
- * initialise registered ENGINEs if they are not already initialised.
- */
-# define ENGINE_TABLE_FLAG_NOINIT        (unsigned int)0x0001
-
-/* ENGINE flags that can be set by ENGINE_set_flags(). */
-/* Not used */
-/* #define ENGINE_FLAGS_MALLOCED        0x0001 */
-
-/*
- * This flag is for ENGINEs that wish to handle the various 'CMD'-related
- * control commands on their own. Without this flag, ENGINE_ctrl() handles
- * these control commands on behalf of the ENGINE using their "cmd_defns"
- * data.
- */
-# define ENGINE_FLAGS_MANUAL_CMD_CTRL    (int)0x0002
-
-/*
- * This flag is for ENGINEs who return new duplicate structures when found
- * via "ENGINE_by_id()". When an ENGINE must store state (eg. if
- * ENGINE_ctrl() commands are called in sequence as part of some stateful
- * process like key-generation setup and execution), it can set this flag -
- * then each attempt to obtain the ENGINE will result in it being copied into
- * a new structure. Normally, ENGINEs don't declare this flag so
- * ENGINE_by_id() just increments the existing ENGINE's structural reference
- * count.
- */
-# define ENGINE_FLAGS_BY_ID_COPY         (int)0x0004
-
-/*
- * This flag if for an ENGINE that does not want its methods registered as
- * part of ENGINE_register_all_complete() for example if the methods are not
- * usable as default methods.
- */
-
-# define ENGINE_FLAGS_NO_REGISTER_ALL    (int)0x0008
-
-/*
- * ENGINEs can support their own command types, and these flags are used in
- * ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input
- * each command expects. Currently only numeric and string input is
- * supported. If a control command supports none of the _NUMERIC, _STRING, or
- * _NO_INPUT options, then it is regarded as an "internal" control command -
- * and not for use in config setting situations. As such, they're not
- * available to the ENGINE_ctrl_cmd_string() function, only raw ENGINE_ctrl()
- * access. Changes to this list of 'command types' should be reflected
- * carefully in ENGINE_cmd_is_executable() and ENGINE_ctrl_cmd_string().
- */
-
-/* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */
-# define ENGINE_CMD_FLAG_NUMERIC         (unsigned int)0x0001
-/*
- * accepts string input (cast from 'void*' to 'const char *', 4th parameter
- * to ENGINE_ctrl)
- */
-# define ENGINE_CMD_FLAG_STRING          (unsigned int)0x0002
-/*
- * Indicates that the control command takes *no* input. Ie. the control
- * command is unparameterised.
- */
-# define ENGINE_CMD_FLAG_NO_INPUT        (unsigned int)0x0004
-/*
- * Indicates that the control command is internal. This control command won't
- * be shown in any output, and is only usable through the ENGINE_ctrl_cmd()
- * function.
- */
-# define ENGINE_CMD_FLAG_INTERNAL        (unsigned int)0x0008
-
-/*
- * NB: These 3 control commands are deprecated and should not be used.
- * ENGINEs relying on these commands should compile conditional support for
- * compatibility (eg. if these symbols are defined) but should also migrate
- * the same functionality to their own ENGINE-specific control functions that
- * can be "discovered" by calling applications. The fact these control
- * commands wouldn't be "executable" (ie. usable by text-based config)
- * doesn't change the fact that application code can find and use them
- * without requiring per-ENGINE hacking.
- */
-
-/*
- * These flags are used to tell the ctrl function what should be done. All
- * command numbers are shared between all engines, even if some don't make
- * sense to some engines.  In such a case, they do nothing but return the
- * error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED.
- */
-# define ENGINE_CTRL_SET_LOGSTREAM               1
-# define ENGINE_CTRL_SET_PASSWORD_CALLBACK       2
-# define ENGINE_CTRL_HUP                         3/* Close and reinitialise
-                                                   * any handles/connections
-                                                   * etc. */
-# define ENGINE_CTRL_SET_USER_INTERFACE          4/* Alternative to callback */
-# define ENGINE_CTRL_SET_CALLBACK_DATA           5/* User-specific data, used
-                                                   * when calling the password
-                                                   * callback and the user
-                                                   * interface */
-# define ENGINE_CTRL_LOAD_CONFIGURATION          6/* Load a configuration,
-                                                   * given a string that
-                                                   * represents a file name
-                                                   * or so */
-# define ENGINE_CTRL_LOAD_SECTION                7/* Load data from a given
-                                                   * section in the already
-                                                   * loaded configuration */
-
-/*
- * These control commands allow an application to deal with an arbitrary
- * engine in a dynamic way. Warn: Negative return values indicate errors FOR
- * THESE COMMANDS because zero is used to indicate 'end-of-list'. Other
- * commands, including ENGINE-specific command types, return zero for an
- * error. An ENGINE can choose to implement these ctrl functions, and can
- * internally manage things however it chooses - it does so by setting the
- * ENGINE_FLAGS_MANUAL_CMD_CTRL flag (using ENGINE_set_flags()). Otherwise
- * the ENGINE_ctrl() code handles this on the ENGINE's behalf using the
- * cmd_defns data (set using ENGINE_set_cmd_defns()). This means an ENGINE's
- * ctrl() handler need only implement its own commands - the above "meta"
- * commands will be taken care of.
- */
-
-/*
- * Returns non-zero if the supplied ENGINE has a ctrl() handler. If "not",
- * then all the remaining control commands will return failure, so it is
- * worth checking this first if the caller is trying to "discover" the
- * engine's capabilities and doesn't want errors generated unnecessarily.
- */
-# define ENGINE_CTRL_HAS_CTRL_FUNCTION           10
-/*
- * Returns a positive command number for the first command supported by the
- * engine. Returns zero if no ctrl commands are supported.
- */
-# define ENGINE_CTRL_GET_FIRST_CMD_TYPE          11
-/*
- * The 'long' argument specifies a command implemented by the engine, and the
- * return value is the next command supported, or zero if there are no more.
- */
-# define ENGINE_CTRL_GET_NEXT_CMD_TYPE           12
-/*
- * The 'void*' argument is a command name (cast from 'const char *'), and the
- * return value is the command that corresponds to it.
- */
-# define ENGINE_CTRL_GET_CMD_FROM_NAME           13
-/*
- * The next two allow a command to be converted into its corresponding string
- * form. In each case, the 'long' argument supplies the command. In the
- * NAME_LEN case, the return value is the length of the command name (not
- * counting a trailing EOL). In the NAME case, the 'void*' argument must be a
- * string buffer large enough, and it will be populated with the name of the
- * command (WITH a trailing EOL).
- */
-# define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD       14
-# define ENGINE_CTRL_GET_NAME_FROM_CMD           15
-/* The next two are similar but give a "short description" of a command. */
-# define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD       16
-# define ENGINE_CTRL_GET_DESC_FROM_CMD           17
-/*
- * With this command, the return value is the OR'd combination of
- * ENGINE_CMD_FLAG_*** values that indicate what kind of input a given
- * engine-specific ctrl command expects.
- */
-# define ENGINE_CTRL_GET_CMD_FLAGS               18
-
-/*
- * ENGINE implementations should start the numbering of their own control
- * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc).
- */
-# define ENGINE_CMD_BASE                         200
-
-/*
- * NB: These 2 nCipher "chil" control commands are deprecated, and their
- * functionality is now available through ENGINE-specific control commands
- * (exposed through the above-mentioned 'CMD'-handling). Code using these 2
- * commands should be migrated to the more general command handling before
- * these are removed.
- */
-
-/* Flags specific to the nCipher "chil" engine */
-# define ENGINE_CTRL_CHIL_SET_FORKCHECK          100
-        /*
-         * Depending on the value of the (long)i argument, this sets or
-         * unsets the SimpleForkCheck flag in the CHIL API to enable or
-         * disable checking and workarounds for applications that fork().
-         */
-# define ENGINE_CTRL_CHIL_NO_LOCKING             101
-        /*
-         * This prevents the initialisation function from providing mutex
-         * callbacks to the nCipher library.
-         */
-
-/*
- * If an ENGINE supports its own specific control commands and wishes the
- * framework to handle the above 'ENGINE_CMD_***'-manipulation commands on
- * its behalf, it should supply a null-terminated array of ENGINE_CMD_DEFN
- * entries to ENGINE_set_cmd_defns(). It should also implement a ctrl()
- * handler that supports the stated commands (ie. the "cmd_num" entries as
- * described by the array). NB: The array must be ordered in increasing order
- * of cmd_num. "null-terminated" means that the last ENGINE_CMD_DEFN element
- * has cmd_num set to zero and/or cmd_name set to NULL.
- */
-typedef struct ENGINE_CMD_DEFN_st {
-    unsigned int cmd_num;       /* The command number */
-    const char *cmd_name;       /* The command name itself */
-    const char *cmd_desc;       /* A short description of the command */
-    unsigned int cmd_flags;     /* The input the command expects */
-} ENGINE_CMD_DEFN;
-
-/* Generic function pointer */
-typedef int (*ENGINE_GEN_FUNC_PTR) (void);
-/* Generic function pointer taking no arguments */
-typedef int (*ENGINE_GEN_INT_FUNC_PTR) (ENGINE *);
-/* Specific control function pointer */
-typedef int (*ENGINE_CTRL_FUNC_PTR) (ENGINE *, int, long, void *,
-                                     void (*f) (void));
-/* Generic load_key function pointer */
-typedef EVP_PKEY *(*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,
-                                         UI_METHOD *ui_method,
-                                         void *callback_data);
-typedef int (*ENGINE_SSL_CLIENT_CERT_PTR) (ENGINE *, SSL *ssl,
-                                           STACK_OF(X509_NAME) *ca_dn,
-                                           X509 **pcert, EVP_PKEY **pkey,
-                                           STACK_OF(X509) **pother,
-                                           UI_METHOD *ui_method,
-                                           void *callback_data);
-/*-
- * These callback types are for an ENGINE's handler for cipher and digest logic.
- * These handlers have these prototypes;
- *   int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid);
- *   int foo(ENGINE *e, const EVP_MD **digest, const int **nids, int nid);
- * Looking at how to implement these handlers in the case of cipher support, if
- * the framework wants the EVP_CIPHER for 'nid', it will call;
- *   foo(e, &p_evp_cipher, NULL, nid);    (return zero for failure)
- * If the framework wants a list of supported 'nid's, it will call;
- *   foo(e, NULL, &p_nids, 0); (returns number of 'nids' or -1 for error)
- */
-/*
- * Returns to a pointer to the array of supported cipher 'nid's. If the
- * second parameter is non-NULL it is set to the size of the returned array.
- */
-typedef int (*ENGINE_CIPHERS_PTR) (ENGINE *, const EVP_CIPHER **,
-                                   const int **, int);
-typedef int (*ENGINE_DIGESTS_PTR) (ENGINE *, const EVP_MD **, const int **,
-                                   int);
-typedef int (*ENGINE_PKEY_METHS_PTR) (ENGINE *, EVP_PKEY_METHOD **,
-                                      const int **, int);
-typedef int (*ENGINE_PKEY_ASN1_METHS_PTR) (ENGINE *, EVP_PKEY_ASN1_METHOD **,
-                                           const int **, int);
-/*
- * STRUCTURE functions ... all of these functions deal with pointers to
- * ENGINE structures where the pointers have a "structural reference". This
- * means that their reference is to allowed access to the structure but it
- * does not imply that the structure is functional. To simply increment or
- * decrement the structural reference count, use ENGINE_by_id and
- * ENGINE_free. NB: This is not required when iterating using ENGINE_get_next
- * as it will automatically decrement the structural reference count of the
- * "current" ENGINE and increment the structural reference count of the
- * ENGINE it returns (unless it is NULL).
- */
-
-/* Get the first/last "ENGINE" type available. */
-ENGINE *ENGINE_get_first(void);
-ENGINE *ENGINE_get_last(void);
-/* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */
-ENGINE *ENGINE_get_next(ENGINE *e);
-ENGINE *ENGINE_get_prev(ENGINE *e);
-/* Add another "ENGINE" type into the array. */
-int ENGINE_add(ENGINE *e);
-/* Remove an existing "ENGINE" type from the array. */
-int ENGINE_remove(ENGINE *e);
-/* Retrieve an engine from the list by its unique "id" value. */
-ENGINE *ENGINE_by_id(const char *id);
-/* Add all the built-in engines. */
-void ENGINE_load_openssl(void);
-void ENGINE_load_dynamic(void);
-# ifndef OPENSSL_NO_STATIC_ENGINE
-void ENGINE_load_4758cca(void);
-void ENGINE_load_aep(void);
-void ENGINE_load_atalla(void);
-void ENGINE_load_chil(void);
-void ENGINE_load_cswift(void);
-void ENGINE_load_nuron(void);
-void ENGINE_load_sureware(void);
-void ENGINE_load_ubsec(void);
-void ENGINE_load_padlock(void);
-void ENGINE_load_capi(void);
-#  ifndef OPENSSL_NO_GMP
-void ENGINE_load_gmp(void);
-#  endif
-#  ifndef OPENSSL_NO_GOST
-void ENGINE_load_gost(void);
-#  endif
-# endif
-void ENGINE_load_cryptodev(void);
-void ENGINE_load_rdrand(void);
-void ENGINE_load_builtin_engines(void);
-
-/*
- * Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
- * "registry" handling.
- */
-unsigned int ENGINE_get_table_flags(void);
-void ENGINE_set_table_flags(unsigned int flags);
-
-/*- Manage registration of ENGINEs per "table". For each type, there are 3
- * functions;
- *   ENGINE_register_***(e) - registers the implementation from 'e' (if it has one)
- *   ENGINE_unregister_***(e) - unregister the implementation from 'e'
- *   ENGINE_register_all_***() - call ENGINE_register_***() for each 'e' in the list
- * Cleanup is automatically registered from each table when required, so
- * ENGINE_cleanup() will reverse any "register" operations.
- */
-
-int ENGINE_register_RSA(ENGINE *e);
-void ENGINE_unregister_RSA(ENGINE *e);
-void ENGINE_register_all_RSA(void);
-
-int ENGINE_register_DSA(ENGINE *e);
-void ENGINE_unregister_DSA(ENGINE *e);
-void ENGINE_register_all_DSA(void);
-
-int ENGINE_register_ECDH(ENGINE *e);
-void ENGINE_unregister_ECDH(ENGINE *e);
-void ENGINE_register_all_ECDH(void);
-
-int ENGINE_register_ECDSA(ENGINE *e);
-void ENGINE_unregister_ECDSA(ENGINE *e);
-void ENGINE_register_all_ECDSA(void);
-
-int ENGINE_register_DH(ENGINE *e);
-void ENGINE_unregister_DH(ENGINE *e);
-void ENGINE_register_all_DH(void);
-
-int ENGINE_register_RAND(ENGINE *e);
-void ENGINE_unregister_RAND(ENGINE *e);
-void ENGINE_register_all_RAND(void);
-
-int ENGINE_register_STORE(ENGINE *e);
-void ENGINE_unregister_STORE(ENGINE *e);
-void ENGINE_register_all_STORE(void);
-
-int ENGINE_register_ciphers(ENGINE *e);
-void ENGINE_unregister_ciphers(ENGINE *e);
-void ENGINE_register_all_ciphers(void);
-
-int ENGINE_register_digests(ENGINE *e);
-void ENGINE_unregister_digests(ENGINE *e);
-void ENGINE_register_all_digests(void);
-
-int ENGINE_register_pkey_meths(ENGINE *e);
-void ENGINE_unregister_pkey_meths(ENGINE *e);
-void ENGINE_register_all_pkey_meths(void);
-
-int ENGINE_register_pkey_asn1_meths(ENGINE *e);
-void ENGINE_unregister_pkey_asn1_meths(ENGINE *e);
-void ENGINE_register_all_pkey_asn1_meths(void);
-
-/*
- * These functions register all support from the above categories. Note, use
- * of these functions can result in static linkage of code your application
- * may not need. If you only need a subset of functionality, consider using
- * more selective initialisation.
- */
-int ENGINE_register_complete(ENGINE *e);
-int ENGINE_register_all_complete(void);
-
-/*
- * Send parametrised control commands to the engine. The possibilities to
- * send down an integer, a pointer to data or a function pointer are
- * provided. Any of the parameters may or may not be NULL, depending on the
- * command number. In actuality, this function only requires a structural
- * (rather than functional) reference to an engine, but many control commands
- * may require the engine be functional. The caller should be aware of trying
- * commands that require an operational ENGINE, and only use functional
- * references in such situations.
- */
-int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void));
-
-/*
- * This function tests if an ENGINE-specific command is usable as a
- * "setting". Eg. in an application's config file that gets processed through
- * ENGINE_ctrl_cmd_string(). If this returns zero, it is not available to
- * ENGINE_ctrl_cmd_string(), only ENGINE_ctrl().
- */
-int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
-
-/*
- * This function works like ENGINE_ctrl() with the exception of taking a
- * command name instead of a command number, and can handle optional
- * commands. See the comment on ENGINE_ctrl_cmd_string() for an explanation
- * on how to use the cmd_name and cmd_optional.
- */
-int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
-                    long i, void *p, void (*f) (void), int cmd_optional);
-
-/*
- * This function passes a command-name and argument to an ENGINE. The
- * cmd_name is converted to a command number and the control command is
- * called using 'arg' as an argument (unless the ENGINE doesn't support such
- * a command, in which case no control command is called). The command is
- * checked for input flags, and if necessary the argument will be converted
- * to a numeric value. If cmd_optional is non-zero, then if the ENGINE
- * doesn't support the given cmd_name the return value will be success
- * anyway. This function is intended for applications to use so that users
- * (or config files) can supply engine-specific config data to the ENGINE at
- * run-time to control behaviour of specific engines. As such, it shouldn't
- * be used for calling ENGINE_ctrl() functions that return data, deal with
- * binary data, or that are otherwise supposed to be used directly through
- * ENGINE_ctrl() in application code. Any "return" data from an ENGINE_ctrl()
- * operation in this function will be lost - the return value is interpreted
- * as failure if the return value is zero, success otherwise, and this
- * function returns a boolean value as a result. In other words, vendors of
- * 'ENGINE'-enabled devices should write ENGINE implementations with
- * parameterisations that work in this scheme, so that compliant ENGINE-based
- * applications can work consistently with the same configuration for the
- * same ENGINE-enabled devices, across applications.
- */
-int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
-                           int cmd_optional);
-
-/*
- * These functions are useful for manufacturing new ENGINE structures. They
- * don't address reference counting at all - one uses them to populate an
- * ENGINE structure with personalised implementations of things prior to
- * using it directly or adding it to the builtin ENGINE list in OpenSSL.
- * These are also here so that the ENGINE structure doesn't have to be
- * exposed and break binary compatibility!
- */
-ENGINE *ENGINE_new(void);
-int ENGINE_free(ENGINE *e);
-int ENGINE_up_ref(ENGINE *e);
-int ENGINE_set_id(ENGINE *e, const char *id);
-int ENGINE_set_name(ENGINE *e, const char *name);
-int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
-int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
-int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth);
-int ENGINE_set_ECDSA(ENGINE *e, const ECDSA_METHOD *ecdsa_meth);
-int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);
-int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth);
-int ENGINE_set_STORE(ENGINE *e, const STORE_METHOD *store_meth);
-int ENGINE_set_destroy_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f);
-int ENGINE_set_init_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f);
-int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f);
-int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
-int ENGINE_set_load_privkey_function(ENGINE *e,
-                                     ENGINE_LOAD_KEY_PTR loadpriv_f);
-int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
-int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
-                                             ENGINE_SSL_CLIENT_CERT_PTR
-                                             loadssl_f);
-int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
-int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
-int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);
-int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f);
-int ENGINE_set_flags(ENGINE *e, int flags);
-int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
-/* These functions allow control over any per-structure ENGINE data. */
-int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                            CRYPTO_EX_dup *dup_func,
-                            CRYPTO_EX_free *free_func);
-int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
-void *ENGINE_get_ex_data(const ENGINE *e, int idx);
-
-/*
- * This function cleans up anything that needs it. Eg. the ENGINE_add()
- * function automatically ensures the list cleanup function is registered to
- * be called from ENGINE_cleanup(). Similarly, all ENGINE_register_***
- * functions ensure ENGINE_cleanup() will clean up after them.
- */
-void ENGINE_cleanup(void);
-
-/*
- * These return values from within the ENGINE structure. These can be useful
- * with functional references as well as structural references - it depends
- * which you obtained. Using the result for functional purposes if you only
- * obtained a structural reference may be problematic!
- */
-const char *ENGINE_get_id(const ENGINE *e);
-const char *ENGINE_get_name(const ENGINE *e);
-const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e);
-const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e);
-const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e);
-const ECDSA_METHOD *ENGINE_get_ECDSA(const ENGINE *e);
-const DH_METHOD *ENGINE_get_DH(const ENGINE *e);
-const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e);
-const STORE_METHOD *ENGINE_get_STORE(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_destroy_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_init_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function(const ENGINE *e);
-ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e);
-ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE
-                                                               *e);
-ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e);
-ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e);
-ENGINE_PKEY_METHS_PTR ENGINE_get_pkey_meths(const ENGINE *e);
-ENGINE_PKEY_ASN1_METHS_PTR ENGINE_get_pkey_asn1_meths(const ENGINE *e);
-const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);
-const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);
-const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
-                                                          const char *str,
-                                                          int len);
-const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
-                                                      const char *str,
-                                                      int len);
-const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);
-int ENGINE_get_flags(const ENGINE *e);
-
-/*
- * FUNCTIONAL functions. These functions deal with ENGINE structures that
- * have (or will) be initialised for use. Broadly speaking, the structural
- * functions are useful for iterating the list of available engine types,
- * creating new engine types, and other "list" operations. These functions
- * actually deal with ENGINEs that are to be used. As such these functions
- * can fail (if applicable) when particular engines are unavailable - eg. if
- * a hardware accelerator is not attached or not functioning correctly. Each
- * ENGINE has 2 reference counts; structural and functional. Every time a
- * functional reference is obtained or released, a corresponding structural
- * reference is automatically obtained or released too.
- */
-
-/*
- * Initialise a engine type for use (or up its reference count if it's
- * already in use). This will fail if the engine is not currently operational
- * and cannot initialise.
- */
-int ENGINE_init(ENGINE *e);
-/*
- * Free a functional reference to a engine type. This does not require a
- * corresponding call to ENGINE_free as it also releases a structural
- * reference.
- */
-int ENGINE_finish(ENGINE *e);
-
-/*
- * The following functions handle keys that are stored in some secondary
- * location, handled by the engine.  The storage may be on a card or
- * whatever.
- */
-EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
-                                  UI_METHOD *ui_method, void *callback_data);
-EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
-                                 UI_METHOD *ui_method, void *callback_data);
-int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
-                                STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
-                                EVP_PKEY **ppkey, STACK_OF(X509) **pother,
-                                UI_METHOD *ui_method, void *callback_data);
-
-/*
- * This returns a pointer for the current ENGINE structure that is (by
- * default) performing any RSA operations. The value returned is an
- * incremented reference, so it should be free'd (ENGINE_finish) before it is
- * discarded.
- */
-ENGINE *ENGINE_get_default_RSA(void);
-/* Same for the other "methods" */
-ENGINE *ENGINE_get_default_DSA(void);
-ENGINE *ENGINE_get_default_ECDH(void);
-ENGINE *ENGINE_get_default_ECDSA(void);
-ENGINE *ENGINE_get_default_DH(void);
-ENGINE *ENGINE_get_default_RAND(void);
-/*
- * These functions can be used to get a functional reference to perform
- * ciphering or digesting corresponding to "nid".
- */
-ENGINE *ENGINE_get_cipher_engine(int nid);
-ENGINE *ENGINE_get_digest_engine(int nid);
-ENGINE *ENGINE_get_pkey_meth_engine(int nid);
-ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid);
-
-/*
- * This sets a new default ENGINE structure for performing RSA operations. If
- * the result is non-zero (success) then the ENGINE structure will have had
- * its reference count up'd so the caller should still free their own
- * reference 'e'.
- */
-int ENGINE_set_default_RSA(ENGINE *e);
-int ENGINE_set_default_string(ENGINE *e, const char *def_list);
-/* Same for the other "methods" */
-int ENGINE_set_default_DSA(ENGINE *e);
-int ENGINE_set_default_ECDH(ENGINE *e);
-int ENGINE_set_default_ECDSA(ENGINE *e);
-int ENGINE_set_default_DH(ENGINE *e);
-int ENGINE_set_default_RAND(ENGINE *e);
-int ENGINE_set_default_ciphers(ENGINE *e);
-int ENGINE_set_default_digests(ENGINE *e);
-int ENGINE_set_default_pkey_meths(ENGINE *e);
-int ENGINE_set_default_pkey_asn1_meths(ENGINE *e);
-
-/*
- * The combination "set" - the flags are bitwise "OR"d from the
- * ENGINE_METHOD_*** defines above. As with the "ENGINE_register_complete()"
- * function, this function can result in unnecessary static linkage. If your
- * application requires only specific functionality, consider using more
- * selective functions.
- */
-int ENGINE_set_default(ENGINE *e, unsigned int flags);
-
-void ENGINE_add_conf_module(void);
-
-/* Deprecated functions ... */
-/* int ENGINE_clear_defaults(void); */
-
-/**************************/
-/* DYNAMIC ENGINE SUPPORT */
-/**************************/
-
-/* Binary/behaviour compatibility levels */
-# define OSSL_DYNAMIC_VERSION            (unsigned long)0x00020000
-/*
- * Binary versions older than this are too old for us (whether we're a loader
- * or a loadee)
- */
-# define OSSL_DYNAMIC_OLDEST             (unsigned long)0x00020000
-
-/*
- * When compiling an ENGINE entirely as an external shared library, loadable
- * by the "dynamic" ENGINE, these types are needed. The 'dynamic_fns'
- * structure type provides the calling application's (or library's) error
- * functionality and memory management function pointers to the loaded
- * library. These should be used/set in the loaded library code so that the
- * loading application's 'state' will be used/changed in all operations. The
- * 'static_state' pointer allows the loaded library to know if it shares the
- * same static data as the calling application (or library), and thus whether
- * these callbacks need to be set or not.
- */
-typedef void *(*dyn_MEM_malloc_cb) (size_t);
-typedef void *(*dyn_MEM_realloc_cb) (void *, size_t);
-typedef void (*dyn_MEM_free_cb) (void *);
-typedef struct st_dynamic_MEM_fns {
-    dyn_MEM_malloc_cb malloc_cb;
-    dyn_MEM_realloc_cb realloc_cb;
-    dyn_MEM_free_cb free_cb;
-} dynamic_MEM_fns;
-/*
- * FIXME: Perhaps the memory and locking code (crypto.h) should declare and
- * use these types so we (and any other dependant code) can simplify a bit??
- */
-typedef void (*dyn_lock_locking_cb) (int, int, const char *, int);
-typedef int (*dyn_lock_add_lock_cb) (int *, int, int, const char *, int);
-typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb) (const char *,
-                                                               int);
-typedef void (*dyn_dynlock_lock_cb) (int, struct CRYPTO_dynlock_value *,
-                                     const char *, int);
-typedef void (*dyn_dynlock_destroy_cb) (struct CRYPTO_dynlock_value *,
-                                        const char *, int);
-typedef struct st_dynamic_LOCK_fns {
-    dyn_lock_locking_cb lock_locking_cb;
-    dyn_lock_add_lock_cb lock_add_lock_cb;
-    dyn_dynlock_create_cb dynlock_create_cb;
-    dyn_dynlock_lock_cb dynlock_lock_cb;
-    dyn_dynlock_destroy_cb dynlock_destroy_cb;
-} dynamic_LOCK_fns;
-/* The top-level structure */
-typedef struct st_dynamic_fns {
-    void *static_state;
-    const ERR_FNS *err_fns;
-    const CRYPTO_EX_DATA_IMPL *ex_data_fns;
-    dynamic_MEM_fns mem_fns;
-    dynamic_LOCK_fns lock_fns;
-} dynamic_fns;
-
-/*
- * The version checking function should be of this prototype. NB: The
- * ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading
- * code. If this function returns zero, it indicates a (potential) version
- * incompatibility and the loaded library doesn't believe it can proceed.
- * Otherwise, the returned value is the (latest) version supported by the
- * loading library. The loader may still decide that the loaded code's
- * version is unsatisfactory and could veto the load. The function is
- * expected to be implemented with the symbol name "v_check", and a default
- * implementation can be fully instantiated with
- * IMPLEMENT_DYNAMIC_CHECK_FN().
- */
-typedef unsigned long (*dynamic_v_check_fn) (unsigned long ossl_version);
-# define IMPLEMENT_DYNAMIC_CHECK_FN() \
-        OPENSSL_EXPORT unsigned long v_check(unsigned long v); \
-        OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
-                if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
-                return 0; }
-
-/*
- * This function is passed the ENGINE structure to initialise with its own
- * function and command settings. It should not adjust the structural or
- * functional reference counts. If this function returns zero, (a) the load
- * will be aborted, (b) the previous ENGINE state will be memcpy'd back onto
- * the structure, and (c) the shared library will be unloaded. So
- * implementations should do their own internal cleanup in failure
- * circumstances otherwise they could leak. The 'id' parameter, if non-NULL,
- * represents the ENGINE id that the loader is looking for. If this is NULL,
- * the shared library can choose to return failure or to initialise a
- * 'default' ENGINE. If non-NULL, the shared library must initialise only an
- * ENGINE matching the passed 'id'. The function is expected to be
- * implemented with the symbol name "bind_engine". A standard implementation
- * can be instantiated with IMPLEMENT_DYNAMIC_BIND_FN(fn) where the parameter
- * 'fn' is a callback function that populates the ENGINE structure and
- * returns an int value (zero for failure). 'fn' should have prototype;
- * [static] int fn(ENGINE *e, const char *id);
- */
-typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
-                                    const dynamic_fns *fns);
-# define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
-        OPENSSL_EXPORT \
-        int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
-        OPENSSL_EXPORT \
-        int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
-                if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
-                if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \
-                        fns->mem_fns.realloc_cb, fns->mem_fns.free_cb)) \
-                        return 0; \
-                CRYPTO_set_locking_callback(fns->lock_fns.lock_locking_cb); \
-                CRYPTO_set_add_lock_callback(fns->lock_fns.lock_add_lock_cb); \
-                CRYPTO_set_dynlock_create_callback(fns->lock_fns.dynlock_create_cb); \
-                CRYPTO_set_dynlock_lock_callback(fns->lock_fns.dynlock_lock_cb); \
-                CRYPTO_set_dynlock_destroy_callback(fns->lock_fns.dynlock_destroy_cb); \
-                if(!CRYPTO_set_ex_data_implementation(fns->ex_data_fns)) \
-                        return 0; \
-                if(!ERR_set_implementation(fns->err_fns)) return 0; \
-        skip_cbs: \
-                if(!fn(e,id)) return 0; \
-                return 1; }
-
-/*
- * If the loading application (or library) and the loaded ENGINE library
- * share the same static data (eg. they're both dynamically linked to the
- * same libcrypto.so) we need a way to avoid trying to set system callbacks -
- * this would fail, and for the same reason that it's unnecessary to try. If
- * the loaded ENGINE has (or gets from through the loader) its own copy of
- * the libcrypto static data, we will need to set the callbacks. The easiest
- * way to detect this is to have a function that returns a pointer to some
- * static data and let the loading application and loaded ENGINE compare
- * their respective values.
- */
-void *ENGINE_get_static_state(void);
-
-# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
-void ENGINE_setup_bsd_cryptodev(void);
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ENGINE_strings(void);
-
-/* Error codes for the ENGINE functions. */
-
-/* Function codes. */
-# define ENGINE_F_DYNAMIC_CTRL                            180
-# define ENGINE_F_DYNAMIC_GET_DATA_CTX                    181
-# define ENGINE_F_DYNAMIC_LOAD                            182
-# define ENGINE_F_DYNAMIC_SET_DATA_CTX                    183
-# define ENGINE_F_ENGINE_ADD                              105
-# define ENGINE_F_ENGINE_BY_ID                            106
-# define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE                170
-# define ENGINE_F_ENGINE_CTRL                             142
-# define ENGINE_F_ENGINE_CTRL_CMD                         178
-# define ENGINE_F_ENGINE_CTRL_CMD_STRING                  171
-# define ENGINE_F_ENGINE_FINISH                           107
-# define ENGINE_F_ENGINE_FREE_UTIL                        108
-# define ENGINE_F_ENGINE_GET_CIPHER                       185
-# define ENGINE_F_ENGINE_GET_DEFAULT_TYPE                 177
-# define ENGINE_F_ENGINE_GET_DIGEST                       186
-# define ENGINE_F_ENGINE_GET_NEXT                         115
-# define ENGINE_F_ENGINE_GET_PKEY_ASN1_METH               193
-# define ENGINE_F_ENGINE_GET_PKEY_METH                    192
-# define ENGINE_F_ENGINE_GET_PREV                         116
-# define ENGINE_F_ENGINE_INIT                             119
-# define ENGINE_F_ENGINE_LIST_ADD                         120
-# define ENGINE_F_ENGINE_LIST_REMOVE                      121
-# define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY                 150
-# define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY                  151
-# define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT             194
-# define ENGINE_F_ENGINE_NEW                              122
-# define ENGINE_F_ENGINE_REMOVE                           123
-# define ENGINE_F_ENGINE_SET_DEFAULT_STRING               189
-# define ENGINE_F_ENGINE_SET_DEFAULT_TYPE                 126
-# define ENGINE_F_ENGINE_SET_ID                           129
-# define ENGINE_F_ENGINE_SET_NAME                         130
-# define ENGINE_F_ENGINE_TABLE_REGISTER                   184
-# define ENGINE_F_ENGINE_UNLOAD_KEY                       152
-# define ENGINE_F_ENGINE_UNLOCKED_FINISH                  191
-# define ENGINE_F_ENGINE_UP_REF                           190
-# define ENGINE_F_INT_CTRL_HELPER                         172
-# define ENGINE_F_INT_ENGINE_CONFIGURE                    188
-# define ENGINE_F_INT_ENGINE_MODULE_INIT                  187
-# define ENGINE_F_LOG_MESSAGE                             141
-
-/* Reason codes. */
-# define ENGINE_R_ALREADY_LOADED                          100
-# define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER                133
-# define ENGINE_R_CMD_NOT_EXECUTABLE                      134
-# define ENGINE_R_COMMAND_TAKES_INPUT                     135
-# define ENGINE_R_COMMAND_TAKES_NO_INPUT                  136
-# define ENGINE_R_CONFLICTING_ENGINE_ID                   103
-# define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED            119
-# define ENGINE_R_DH_NOT_IMPLEMENTED                      139
-# define ENGINE_R_DSA_NOT_IMPLEMENTED                     140
-# define ENGINE_R_DSO_FAILURE                             104
-# define ENGINE_R_DSO_NOT_FOUND                           132
-# define ENGINE_R_ENGINES_SECTION_ERROR                   148
-# define ENGINE_R_ENGINE_CONFIGURATION_ERROR              102
-# define ENGINE_R_ENGINE_IS_NOT_IN_LIST                   105
-# define ENGINE_R_ENGINE_SECTION_ERROR                    149
-# define ENGINE_R_FAILED_LOADING_PRIVATE_KEY              128
-# define ENGINE_R_FAILED_LOADING_PUBLIC_KEY               129
-# define ENGINE_R_FINISH_FAILED                           106
-# define ENGINE_R_GET_HANDLE_FAILED                       107
-# define ENGINE_R_ID_OR_NAME_MISSING                      108
-# define ENGINE_R_INIT_FAILED                             109
-# define ENGINE_R_INTERNAL_LIST_ERROR                     110
-# define ENGINE_R_INVALID_ARGUMENT                        143
-# define ENGINE_R_INVALID_CMD_NAME                        137
-# define ENGINE_R_INVALID_CMD_NUMBER                      138
-# define ENGINE_R_INVALID_INIT_VALUE                      151
-# define ENGINE_R_INVALID_STRING                          150
-# define ENGINE_R_NOT_INITIALISED                         117
-# define ENGINE_R_NOT_LOADED                              112
-# define ENGINE_R_NO_CONTROL_FUNCTION                     120
-# define ENGINE_R_NO_INDEX                                144
-# define ENGINE_R_NO_LOAD_FUNCTION                        125
-# define ENGINE_R_NO_REFERENCE                            130
-# define ENGINE_R_NO_SUCH_ENGINE                          116
-# define ENGINE_R_NO_UNLOAD_FUNCTION                      126
-# define ENGINE_R_PROVIDE_PARAMETERS                      113
-# define ENGINE_R_RSA_NOT_IMPLEMENTED                     141
-# define ENGINE_R_UNIMPLEMENTED_CIPHER                    146
-# define ENGINE_R_UNIMPLEMENTED_DIGEST                    147
-# define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD         101
-# define ENGINE_R_VERSION_INCOMPATIBILITY                 145
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/err.h b/openflow/usr/include/openssl/err.h
deleted file mode 100644
index 585aa8b..0000000
--- a/openflow/usr/include/openssl/err.h
+++ /dev/null
@@ -1,389 +0,0 @@
-/* crypto/err/err.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_ERR_H
-# define HEADER_ERR_H
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_FP_API
-#  include <stdio.h>
-#  include <stdlib.h>
-# endif
-
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# ifndef OPENSSL_NO_LHASH
-#  include <openssl/lhash.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifndef OPENSSL_NO_ERR
-#  define ERR_PUT_error(a,b,c,d,e)        ERR_put_error(a,b,c,d,e)
-# else
-#  define ERR_PUT_error(a,b,c,d,e)        ERR_put_error(a,b,c,NULL,0)
-# endif
-
-# include <errno.h>
-
-# define ERR_TXT_MALLOCED        0x01
-# define ERR_TXT_STRING          0x02
-
-# define ERR_FLAG_MARK           0x01
-
-# define ERR_NUM_ERRORS  16
-typedef struct err_state_st {
-    CRYPTO_THREADID tid;
-    int err_flags[ERR_NUM_ERRORS];
-    unsigned long err_buffer[ERR_NUM_ERRORS];
-    char *err_data[ERR_NUM_ERRORS];
-    int err_data_flags[ERR_NUM_ERRORS];
-    const char *err_file[ERR_NUM_ERRORS];
-    int err_line[ERR_NUM_ERRORS];
-    int top, bottom;
-} ERR_STATE;
-
-/* library */
-# define ERR_LIB_NONE            1
-# define ERR_LIB_SYS             2
-# define ERR_LIB_BN              3
-# define ERR_LIB_RSA             4
-# define ERR_LIB_DH              5
-# define ERR_LIB_EVP             6
-# define ERR_LIB_BUF             7
-# define ERR_LIB_OBJ             8
-# define ERR_LIB_PEM             9
-# define ERR_LIB_DSA             10
-# define ERR_LIB_X509            11
-/* #define ERR_LIB_METH         12 */
-# define ERR_LIB_ASN1            13
-# define ERR_LIB_CONF            14
-# define ERR_LIB_CRYPTO          15
-# define ERR_LIB_EC              16
-# define ERR_LIB_SSL             20
-/* #define ERR_LIB_SSL23        21 */
-/* #define ERR_LIB_SSL2         22 */
-/* #define ERR_LIB_SSL3         23 */
-/* #define ERR_LIB_RSAREF       30 */
-/* #define ERR_LIB_PROXY        31 */
-# define ERR_LIB_BIO             32
-# define ERR_LIB_PKCS7           33
-# define ERR_LIB_X509V3          34
-# define ERR_LIB_PKCS12          35
-# define ERR_LIB_RAND            36
-# define ERR_LIB_DSO             37
-# define ERR_LIB_ENGINE          38
-# define ERR_LIB_OCSP            39
-# define ERR_LIB_UI              40
-# define ERR_LIB_COMP            41
-# define ERR_LIB_ECDSA           42
-# define ERR_LIB_ECDH            43
-# define ERR_LIB_STORE           44
-# define ERR_LIB_FIPS            45
-# define ERR_LIB_CMS             46
-# define ERR_LIB_TS              47
-# define ERR_LIB_HMAC            48
-# define ERR_LIB_JPAKE           49
-
-# define ERR_LIB_USER            128
-
-# define SYSerr(f,r)  ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__)
-# define BNerr(f,r)   ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__)
-# define RSAerr(f,r)  ERR_PUT_error(ERR_LIB_RSA,(f),(r),__FILE__,__LINE__)
-# define DHerr(f,r)   ERR_PUT_error(ERR_LIB_DH,(f),(r),__FILE__,__LINE__)
-# define EVPerr(f,r)  ERR_PUT_error(ERR_LIB_EVP,(f),(r),__FILE__,__LINE__)
-# define BUFerr(f,r)  ERR_PUT_error(ERR_LIB_BUF,(f),(r),__FILE__,__LINE__)
-# define OBJerr(f,r)  ERR_PUT_error(ERR_LIB_OBJ,(f),(r),__FILE__,__LINE__)
-# define PEMerr(f,r)  ERR_PUT_error(ERR_LIB_PEM,(f),(r),__FILE__,__LINE__)
-# define DSAerr(f,r)  ERR_PUT_error(ERR_LIB_DSA,(f),(r),__FILE__,__LINE__)
-# define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),__FILE__,__LINE__)
-# define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),__FILE__,__LINE__)
-# define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__)
-# define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__)
-# define ECerr(f,r)   ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__)
-# define SSLerr(f,r)  ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__)
-# define BIOerr(f,r)  ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__)
-# define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__)
-# define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__)
-# define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),__FILE__,__LINE__)
-# define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),__FILE__,__LINE__)
-# define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),__FILE__,__LINE__)
-# define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),__FILE__,__LINE__)
-# define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),__FILE__,__LINE__)
-# define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),__FILE__,__LINE__)
-# define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__)
-# define ECDSAerr(f,r)  ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)
-# define ECDHerr(f,r)  ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)
-# define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)
-# define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)
-# define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)
-# define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)
-# define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
-# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)
-
-/*
- * Borland C seems too stupid to be able to shift and do longs in the
- * pre-processor :-(
- */
-# define ERR_PACK(l,f,r)         (((((unsigned long)l)&0xffL)*0x1000000)| \
-                                ((((unsigned long)f)&0xfffL)*0x1000)| \
-                                ((((unsigned long)r)&0xfffL)))
-# define ERR_GET_LIB(l)          (int)((((unsigned long)l)>>24L)&0xffL)
-# define ERR_GET_FUNC(l)         (int)((((unsigned long)l)>>12L)&0xfffL)
-# define ERR_GET_REASON(l)       (int)((l)&0xfffL)
-# define ERR_FATAL_ERROR(l)      (int)((l)&ERR_R_FATAL)
-
-/* OS functions */
-# define SYS_F_FOPEN             1
-# define SYS_F_CONNECT           2
-# define SYS_F_GETSERVBYNAME     3
-# define SYS_F_SOCKET            4
-# define SYS_F_IOCTLSOCKET       5
-# define SYS_F_BIND              6
-# define SYS_F_LISTEN            7
-# define SYS_F_ACCEPT            8
-# define SYS_F_WSASTARTUP        9/* Winsock stuff */
-# define SYS_F_OPENDIR           10
-# define SYS_F_FREAD             11
-
-/* reasons */
-# define ERR_R_SYS_LIB   ERR_LIB_SYS/* 2 */
-# define ERR_R_BN_LIB    ERR_LIB_BN/* 3 */
-# define ERR_R_RSA_LIB   ERR_LIB_RSA/* 4 */
-# define ERR_R_DH_LIB    ERR_LIB_DH/* 5 */
-# define ERR_R_EVP_LIB   ERR_LIB_EVP/* 6 */
-# define ERR_R_BUF_LIB   ERR_LIB_BUF/* 7 */
-# define ERR_R_OBJ_LIB   ERR_LIB_OBJ/* 8 */
-# define ERR_R_PEM_LIB   ERR_LIB_PEM/* 9 */
-# define ERR_R_DSA_LIB   ERR_LIB_DSA/* 10 */
-# define ERR_R_X509_LIB  ERR_LIB_X509/* 11 */
-# define ERR_R_ASN1_LIB  ERR_LIB_ASN1/* 13 */
-# define ERR_R_CONF_LIB  ERR_LIB_CONF/* 14 */
-# define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO/* 15 */
-# define ERR_R_EC_LIB    ERR_LIB_EC/* 16 */
-# define ERR_R_SSL_LIB   ERR_LIB_SSL/* 20 */
-# define ERR_R_BIO_LIB   ERR_LIB_BIO/* 32 */
-# define ERR_R_PKCS7_LIB ERR_LIB_PKCS7/* 33 */
-# define ERR_R_X509V3_LIB ERR_LIB_X509V3/* 34 */
-# define ERR_R_PKCS12_LIB ERR_LIB_PKCS12/* 35 */
-# define ERR_R_RAND_LIB  ERR_LIB_RAND/* 36 */
-# define ERR_R_DSO_LIB   ERR_LIB_DSO/* 37 */
-# define ERR_R_ENGINE_LIB ERR_LIB_ENGINE/* 38 */
-# define ERR_R_OCSP_LIB  ERR_LIB_OCSP/* 39 */
-# define ERR_R_UI_LIB    ERR_LIB_UI/* 40 */
-# define ERR_R_COMP_LIB  ERR_LIB_COMP/* 41 */
-# define ERR_R_ECDSA_LIB ERR_LIB_ECDSA/* 42 */
-# define ERR_R_ECDH_LIB  ERR_LIB_ECDH/* 43 */
-# define ERR_R_STORE_LIB ERR_LIB_STORE/* 44 */
-# define ERR_R_TS_LIB    ERR_LIB_TS/* 45 */
-
-# define ERR_R_NESTED_ASN1_ERROR                 58
-# define ERR_R_BAD_ASN1_OBJECT_HEADER            59
-# define ERR_R_BAD_GET_ASN1_OBJECT_CALL          60
-# define ERR_R_EXPECTING_AN_ASN1_SEQUENCE        61
-# define ERR_R_ASN1_LENGTH_MISMATCH              62
-# define ERR_R_MISSING_ASN1_EOS                  63
-
-/* fatal error */
-# define ERR_R_FATAL                             64
-# define ERR_R_MALLOC_FAILURE                    (1|ERR_R_FATAL)
-# define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED       (2|ERR_R_FATAL)
-# define ERR_R_PASSED_NULL_PARAMETER             (3|ERR_R_FATAL)
-# define ERR_R_INTERNAL_ERROR                    (4|ERR_R_FATAL)
-# define ERR_R_DISABLED                          (5|ERR_R_FATAL)
-
-/*
- * 99 is the maximum possible ERR_R_... code, higher values are reserved for
- * the individual libraries
- */
-
-typedef struct ERR_string_data_st {
-    unsigned long error;
-    const char *string;
-} ERR_STRING_DATA;
-
-void ERR_put_error(int lib, int func, int reason, const char *file, int line);
-void ERR_set_error_data(char *data, int flags);
-
-unsigned long ERR_get_error(void);
-unsigned long ERR_get_error_line(const char **file, int *line);
-unsigned long ERR_get_error_line_data(const char **file, int *line,
-                                      const char **data, int *flags);
-unsigned long ERR_peek_error(void);
-unsigned long ERR_peek_error_line(const char **file, int *line);
-unsigned long ERR_peek_error_line_data(const char **file, int *line,
-                                       const char **data, int *flags);
-unsigned long ERR_peek_last_error(void);
-unsigned long ERR_peek_last_error_line(const char **file, int *line);
-unsigned long ERR_peek_last_error_line_data(const char **file, int *line,
-                                            const char **data, int *flags);
-void ERR_clear_error(void);
-char *ERR_error_string(unsigned long e, char *buf);
-void ERR_error_string_n(unsigned long e, char *buf, size_t len);
-const char *ERR_lib_error_string(unsigned long e);
-const char *ERR_func_error_string(unsigned long e);
-const char *ERR_reason_error_string(unsigned long e);
-void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u),
-                         void *u);
-# ifndef OPENSSL_NO_FP_API
-void ERR_print_errors_fp(FILE *fp);
-# endif
-# ifndef OPENSSL_NO_BIO
-void ERR_print_errors(BIO *bp);
-# endif
-void ERR_add_error_data(int num, ...);
-void ERR_add_error_vdata(int num, va_list args);
-void ERR_load_strings(int lib, ERR_STRING_DATA str[]);
-void ERR_unload_strings(int lib, ERR_STRING_DATA str[]);
-void ERR_load_ERR_strings(void);
-void ERR_load_crypto_strings(void);
-void ERR_free_strings(void);
-
-void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
-# ifndef OPENSSL_NO_DEPRECATED
-void ERR_remove_state(unsigned long pid); /* if zero we look it up */
-# endif
-ERR_STATE *ERR_get_state(void);
-
-# ifndef OPENSSL_NO_LHASH
-LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void);
-LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void);
-void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash);
-# endif
-
-int ERR_get_next_error_library(void);
-
-int ERR_set_mark(void);
-int ERR_pop_to_mark(void);
-
-/* Already defined in ossl_typ.h */
-/* typedef struct st_ERR_FNS ERR_FNS; */
-/*
- * An application can use this function and provide the return value to
- * loaded modules that should use the application's ERR state/functionality
- */
-const ERR_FNS *ERR_get_implementation(void);
-/*
- * A loaded module should call this function prior to any ERR operations
- * using the application's "ERR_FNS".
- */
-int ERR_set_implementation(const ERR_FNS *fns);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/evp.h b/openflow/usr/include/openssl/evp.h
deleted file mode 100644
index 369826e..0000000
--- a/openflow/usr/include/openssl/evp.h
+++ /dev/null
@@ -1,1538 +0,0 @@
-/* crypto/evp/evp.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_ENVELOPE_H
-# define HEADER_ENVELOPE_H
-
-# ifdef OPENSSL_ALGORITHM_DEFINES
-#  include <openssl/opensslconf.h>
-# else
-#  define OPENSSL_ALGORITHM_DEFINES
-#  include <openssl/opensslconf.h>
-#  undef OPENSSL_ALGORITHM_DEFINES
-# endif
-
-# include <openssl/ossl_typ.h>
-
-# include <openssl/symhacks.h>
-
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-
-/*-
-#define EVP_RC2_KEY_SIZE                16
-#define EVP_RC4_KEY_SIZE                16
-#define EVP_BLOWFISH_KEY_SIZE           16
-#define EVP_CAST5_KEY_SIZE              16
-#define EVP_RC5_32_12_16_KEY_SIZE       16
-*/
-# define EVP_MAX_MD_SIZE                 64/* longest known is SHA512 */
-# define EVP_MAX_KEY_LENGTH              64
-# define EVP_MAX_IV_LENGTH               16
-# define EVP_MAX_BLOCK_LENGTH            32
-
-# define PKCS5_SALT_LEN                  8
-/* Default PKCS#5 iteration count */
-# define PKCS5_DEFAULT_ITER              2048
-
-# include <openssl/objects.h>
-
-# define EVP_PK_RSA      0x0001
-# define EVP_PK_DSA      0x0002
-# define EVP_PK_DH       0x0004
-# define EVP_PK_EC       0x0008
-# define EVP_PKT_SIGN    0x0010
-# define EVP_PKT_ENC     0x0020
-# define EVP_PKT_EXCH    0x0040
-# define EVP_PKS_RSA     0x0100
-# define EVP_PKS_DSA     0x0200
-# define EVP_PKS_EC      0x0400
-
-# define EVP_PKEY_NONE   NID_undef
-# define EVP_PKEY_RSA    NID_rsaEncryption
-# define EVP_PKEY_RSA2   NID_rsa
-# define EVP_PKEY_DSA    NID_dsa
-# define EVP_PKEY_DSA1   NID_dsa_2
-# define EVP_PKEY_DSA2   NID_dsaWithSHA
-# define EVP_PKEY_DSA3   NID_dsaWithSHA1
-# define EVP_PKEY_DSA4   NID_dsaWithSHA1_2
-# define EVP_PKEY_DH     NID_dhKeyAgreement
-# define EVP_PKEY_DHX    NID_dhpublicnumber
-# define EVP_PKEY_EC     NID_X9_62_id_ecPublicKey
-# define EVP_PKEY_HMAC   NID_hmac
-# define EVP_PKEY_CMAC   NID_cmac
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * Type needs to be a bit field Sub-type needs to be for variations on the
- * method, as in, can it do arbitrary encryption....
- */
-struct evp_pkey_st {
-    int type;
-    int save_type;
-    int references;
-    const EVP_PKEY_ASN1_METHOD *ameth;
-    ENGINE *engine;
-    union {
-        char *ptr;
-# ifndef OPENSSL_NO_RSA
-        struct rsa_st *rsa;     /* RSA */
-# endif
-# ifndef OPENSSL_NO_DSA
-        struct dsa_st *dsa;     /* DSA */
-# endif
-# ifndef OPENSSL_NO_DH
-        struct dh_st *dh;       /* DH */
-# endif
-# ifndef OPENSSL_NO_EC
-        struct ec_key_st *ec;   /* ECC */
-# endif
-    } pkey;
-    int save_parameters;
-    STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
-} /* EVP_PKEY */ ;
-
-# define EVP_PKEY_MO_SIGN        0x0001
-# define EVP_PKEY_MO_VERIFY      0x0002
-# define EVP_PKEY_MO_ENCRYPT     0x0004
-# define EVP_PKEY_MO_DECRYPT     0x0008
-
-# ifndef EVP_MD
-struct env_md_st {
-    int type;
-    int pkey_type;
-    int md_size;
-    unsigned long flags;
-    int (*init) (EVP_MD_CTX *ctx);
-    int (*update) (EVP_MD_CTX *ctx, const void *data, size_t count);
-    int (*final) (EVP_MD_CTX *ctx, unsigned char *md);
-    int (*copy) (EVP_MD_CTX *to, const EVP_MD_CTX *from);
-    int (*cleanup) (EVP_MD_CTX *ctx);
-    /* FIXME: prototype these some day */
-    int (*sign) (int type, const unsigned char *m, unsigned int m_length,
-                 unsigned char *sigret, unsigned int *siglen, void *key);
-    int (*verify) (int type, const unsigned char *m, unsigned int m_length,
-                   const unsigned char *sigbuf, unsigned int siglen,
-                   void *key);
-    int required_pkey_type[5];  /* EVP_PKEY_xxx */
-    int block_size;
-    int ctx_size;               /* how big does the ctx->md_data need to be */
-    /* control function */
-    int (*md_ctrl) (EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
-} /* EVP_MD */ ;
-
-typedef int evp_sign_method(int type, const unsigned char *m,
-                            unsigned int m_length, unsigned char *sigret,
-                            unsigned int *siglen, void *key);
-typedef int evp_verify_method(int type, const unsigned char *m,
-                              unsigned int m_length,
-                              const unsigned char *sigbuf,
-                              unsigned int siglen, void *key);
-
-/* digest can only handle a single block */
-#  define EVP_MD_FLAG_ONESHOT     0x0001
-
-/*
- * digest is a "clone" digest used
- * which is a copy of an existing
- * one for a specific public key type.
- * EVP_dss1() etc
- */
-#  define EVP_MD_FLAG_PKEY_DIGEST 0x0002
-
-/* Digest uses EVP_PKEY_METHOD for signing instead of MD specific signing */
-
-#  define EVP_MD_FLAG_PKEY_METHOD_SIGNATURE       0x0004
-
-/* DigestAlgorithmIdentifier flags... */
-
-#  define EVP_MD_FLAG_DIGALGID_MASK               0x0018
-
-/* NULL or absent parameter accepted. Use NULL */
-
-#  define EVP_MD_FLAG_DIGALGID_NULL               0x0000
-
-/* NULL or absent parameter accepted. Use NULL for PKCS#1 otherwise absent */
-
-#  define EVP_MD_FLAG_DIGALGID_ABSENT             0x0008
-
-/* Custom handling via ctrl */
-
-#  define EVP_MD_FLAG_DIGALGID_CUSTOM             0x0018
-
-/* Note if suitable for use in FIPS mode */
-#  define EVP_MD_FLAG_FIPS        0x0400
-
-/* Digest ctrls */
-
-#  define EVP_MD_CTRL_DIGALGID                    0x1
-#  define EVP_MD_CTRL_MICALG                      0x2
-
-/* Minimum Algorithm specific ctrl value */
-
-#  define EVP_MD_CTRL_ALG_CTRL                    0x1000
-
-#  define EVP_PKEY_NULL_method    NULL,NULL,{0,0,0,0}
-
-#  ifndef OPENSSL_NO_DSA
-#   define EVP_PKEY_DSA_method     (evp_sign_method *)DSA_sign, \
-                                (evp_verify_method *)DSA_verify, \
-                                {EVP_PKEY_DSA,EVP_PKEY_DSA2,EVP_PKEY_DSA3, \
-                                        EVP_PKEY_DSA4,0}
-#  else
-#   define EVP_PKEY_DSA_method     EVP_PKEY_NULL_method
-#  endif
-
-#  ifndef OPENSSL_NO_ECDSA
-#   define EVP_PKEY_ECDSA_method   (evp_sign_method *)ECDSA_sign, \
-                                (evp_verify_method *)ECDSA_verify, \
-                                 {EVP_PKEY_EC,0,0,0}
-#  else
-#   define EVP_PKEY_ECDSA_method   EVP_PKEY_NULL_method
-#  endif
-
-#  ifndef OPENSSL_NO_RSA
-#   define EVP_PKEY_RSA_method     (evp_sign_method *)RSA_sign, \
-                                (evp_verify_method *)RSA_verify, \
-                                {EVP_PKEY_RSA,EVP_PKEY_RSA2,0,0}
-#   define EVP_PKEY_RSA_ASN1_OCTET_STRING_method \
-                                (evp_sign_method *)RSA_sign_ASN1_OCTET_STRING, \
-                                (evp_verify_method *)RSA_verify_ASN1_OCTET_STRING, \
-                                {EVP_PKEY_RSA,EVP_PKEY_RSA2,0,0}
-#  else
-#   define EVP_PKEY_RSA_method     EVP_PKEY_NULL_method
-#   define EVP_PKEY_RSA_ASN1_OCTET_STRING_method EVP_PKEY_NULL_method
-#  endif
-
-# endif                         /* !EVP_MD */
-
-struct env_md_ctx_st {
-    const EVP_MD *digest;
-    ENGINE *engine;             /* functional reference if 'digest' is
-                                 * ENGINE-provided */
-    unsigned long flags;
-    void *md_data;
-    /* Public key context for sign/verify */
-    EVP_PKEY_CTX *pctx;
-    /* Update function: usually copied from EVP_MD */
-    int (*update) (EVP_MD_CTX *ctx, const void *data, size_t count);
-} /* EVP_MD_CTX */ ;
-
-/* values for EVP_MD_CTX flags */
-
-# define EVP_MD_CTX_FLAG_ONESHOT         0x0001/* digest update will be
-                                                * called once only */
-# define EVP_MD_CTX_FLAG_CLEANED         0x0002/* context has already been
-                                                * cleaned */
-# define EVP_MD_CTX_FLAG_REUSE           0x0004/* Don't free up ctx->md_data
-                                                * in EVP_MD_CTX_cleanup */
-/*
- * FIPS and pad options are ignored in 1.0.0, definitions are here so we
- * don't accidentally reuse the values for other purposes.
- */
-
-# define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW  0x0008/* Allow use of non FIPS
-                                                * digest in FIPS mode */
-
-/*
- * The following PAD options are also currently ignored in 1.0.0, digest
- * parameters are handled through EVP_DigestSign*() and EVP_DigestVerify*()
- * instead.
- */
-# define EVP_MD_CTX_FLAG_PAD_MASK        0xF0/* RSA mode to use */
-# define EVP_MD_CTX_FLAG_PAD_PKCS1       0x00/* PKCS#1 v1.5 mode */
-# define EVP_MD_CTX_FLAG_PAD_X931        0x10/* X9.31 mode */
-# define EVP_MD_CTX_FLAG_PAD_PSS         0x20/* PSS mode */
-
-# define EVP_MD_CTX_FLAG_NO_INIT         0x0100/* Don't initialize md_data */
-
-struct evp_cipher_st {
-    int nid;
-    int block_size;
-    /* Default value for variable length ciphers */
-    int key_len;
-    int iv_len;
-    /* Various flags */
-    unsigned long flags;
-    /* init key */
-    int (*init) (EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                 const unsigned char *iv, int enc);
-    /* encrypt/decrypt data */
-    int (*do_cipher) (EVP_CIPHER_CTX *ctx, unsigned char *out,
-                      const unsigned char *in, size_t inl);
-    /* cleanup ctx */
-    int (*cleanup) (EVP_CIPHER_CTX *);
-    /* how big ctx->cipher_data needs to be */
-    int ctx_size;
-    /* Populate a ASN1_TYPE with parameters */
-    int (*set_asn1_parameters) (EVP_CIPHER_CTX *, ASN1_TYPE *);
-    /* Get parameters from a ASN1_TYPE */
-    int (*get_asn1_parameters) (EVP_CIPHER_CTX *, ASN1_TYPE *);
-    /* Miscellaneous operations */
-    int (*ctrl) (EVP_CIPHER_CTX *, int type, int arg, void *ptr);
-    /* Application data */
-    void *app_data;
-} /* EVP_CIPHER */ ;
-
-/* Values for cipher flags */
-
-/* Modes for ciphers */
-
-# define         EVP_CIPH_STREAM_CIPHER          0x0
-# define         EVP_CIPH_ECB_MODE               0x1
-# define         EVP_CIPH_CBC_MODE               0x2
-# define         EVP_CIPH_CFB_MODE               0x3
-# define         EVP_CIPH_OFB_MODE               0x4
-# define         EVP_CIPH_CTR_MODE               0x5
-# define         EVP_CIPH_GCM_MODE               0x6
-# define         EVP_CIPH_CCM_MODE               0x7
-# define         EVP_CIPH_XTS_MODE               0x10001
-# define         EVP_CIPH_WRAP_MODE              0x10002
-# define         EVP_CIPH_MODE                   0xF0007
-/* Set if variable length cipher */
-# define         EVP_CIPH_VARIABLE_LENGTH        0x8
-/* Set if the iv handling should be done by the cipher itself */
-# define         EVP_CIPH_CUSTOM_IV              0x10
-/* Set if the cipher's init() function should be called if key is NULL */
-# define         EVP_CIPH_ALWAYS_CALL_INIT       0x20
-/* Call ctrl() to init cipher parameters */
-# define         EVP_CIPH_CTRL_INIT              0x40
-/* Don't use standard key length function */
-# define         EVP_CIPH_CUSTOM_KEY_LENGTH      0x80
-/* Don't use standard block padding */
-# define         EVP_CIPH_NO_PADDING             0x100
-/* cipher handles random key generation */
-# define         EVP_CIPH_RAND_KEY               0x200
-/* cipher has its own additional copying logic */
-# define         EVP_CIPH_CUSTOM_COPY            0x400
-/* Allow use default ASN1 get/set iv */
-# define         EVP_CIPH_FLAG_DEFAULT_ASN1      0x1000
-/* Buffer length in bits not bytes: CFB1 mode only */
-# define         EVP_CIPH_FLAG_LENGTH_BITS       0x2000
-/* Note if suitable for use in FIPS mode */
-# define         EVP_CIPH_FLAG_FIPS              0x4000
-/* Allow non FIPS cipher in FIPS mode */
-# define         EVP_CIPH_FLAG_NON_FIPS_ALLOW    0x8000
-/*
- * Cipher handles any and all padding logic as well as finalisation.
- */
-# define         EVP_CIPH_FLAG_CUSTOM_CIPHER     0x100000
-# define         EVP_CIPH_FLAG_AEAD_CIPHER       0x200000
-# define         EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0x400000
-
-/*
- * Cipher context flag to indicate we can handle wrap mode: if allowed in
- * older applications it could overflow buffers.
- */
-
-# define         EVP_CIPHER_CTX_FLAG_WRAP_ALLOW  0x1
-
-/* ctrl() values */
-
-# define         EVP_CTRL_INIT                   0x0
-# define         EVP_CTRL_SET_KEY_LENGTH         0x1
-# define         EVP_CTRL_GET_RC2_KEY_BITS       0x2
-# define         EVP_CTRL_SET_RC2_KEY_BITS       0x3
-# define         EVP_CTRL_GET_RC5_ROUNDS         0x4
-# define         EVP_CTRL_SET_RC5_ROUNDS         0x5
-# define         EVP_CTRL_RAND_KEY               0x6
-# define         EVP_CTRL_PBE_PRF_NID            0x7
-# define         EVP_CTRL_COPY                   0x8
-# define         EVP_CTRL_GCM_SET_IVLEN          0x9
-# define         EVP_CTRL_GCM_GET_TAG            0x10
-# define         EVP_CTRL_GCM_SET_TAG            0x11
-# define         EVP_CTRL_GCM_SET_IV_FIXED       0x12
-# define         EVP_CTRL_GCM_IV_GEN             0x13
-# define         EVP_CTRL_CCM_SET_IVLEN          EVP_CTRL_GCM_SET_IVLEN
-# define         EVP_CTRL_CCM_GET_TAG            EVP_CTRL_GCM_GET_TAG
-# define         EVP_CTRL_CCM_SET_TAG            EVP_CTRL_GCM_SET_TAG
-# define         EVP_CTRL_CCM_SET_L              0x14
-# define         EVP_CTRL_CCM_SET_MSGLEN         0x15
-/*
- * AEAD cipher deduces payload length and returns number of bytes required to
- * store MAC and eventual padding. Subsequent call to EVP_Cipher even
- * appends/verifies MAC.
- */
-# define         EVP_CTRL_AEAD_TLS1_AAD          0x16
-/* Used by composite AEAD ciphers, no-op in GCM, CCM... */
-# define         EVP_CTRL_AEAD_SET_MAC_KEY       0x17
-/* Set the GCM invocation field, decrypt only */
-# define         EVP_CTRL_GCM_SET_IV_INV         0x18
-
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_AAD  0x19
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT      0x1a
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT      0x1b
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE  0x1c
-
-/* RFC 5246 defines additional data to be 13 bytes in length */
-# define         EVP_AEAD_TLS1_AAD_LEN           13
-
-typedef struct {
-    unsigned char *out;
-    const unsigned char *inp;
-    size_t len;
-    unsigned int interleave;
-} EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM;
-
-/* GCM TLS constants */
-/* Length of fixed part of IV derived from PRF */
-# define EVP_GCM_TLS_FIXED_IV_LEN                        4
-/* Length of explicit part of IV part of TLS records */
-# define EVP_GCM_TLS_EXPLICIT_IV_LEN                     8
-/* Length of tag for TLS */
-# define EVP_GCM_TLS_TAG_LEN                             16
-
-typedef struct evp_cipher_info_st {
-    const EVP_CIPHER *cipher;
-    unsigned char iv[EVP_MAX_IV_LENGTH];
-} EVP_CIPHER_INFO;
-
-struct evp_cipher_ctx_st {
-    const EVP_CIPHER *cipher;
-    ENGINE *engine;             /* functional reference if 'cipher' is
-                                 * ENGINE-provided */
-    int encrypt;                /* encrypt or decrypt */
-    int buf_len;                /* number we have left */
-    unsigned char oiv[EVP_MAX_IV_LENGTH]; /* original iv */
-    unsigned char iv[EVP_MAX_IV_LENGTH]; /* working iv */
-    unsigned char buf[EVP_MAX_BLOCK_LENGTH]; /* saved partial block */
-    int num;                    /* used by cfb/ofb/ctr mode */
-    void *app_data;             /* application stuff */
-    int key_len;                /* May change for variable length cipher */
-    unsigned long flags;        /* Various flags */
-    void *cipher_data;          /* per EVP data */
-    int final_used;
-    int block_mask;
-    unsigned char final[EVP_MAX_BLOCK_LENGTH]; /* possible final block */
-} /* EVP_CIPHER_CTX */ ;
-
-typedef struct evp_Encode_Ctx_st {
-    /* number saved in a partial encode/decode */
-    int num;
-    /*
-     * The length is either the output line length (in input bytes) or the
-     * shortest input line length that is ok.  Once decoding begins, the
-     * length is adjusted up each time a longer line is decoded
-     */
-    int length;
-    /* data to encode */
-    unsigned char enc_data[80];
-    /* number read on current line */
-    int line_num;
-    int expect_nl;
-} EVP_ENCODE_CTX;
-
-/* Password based encryption function */
-typedef int (EVP_PBE_KEYGEN) (EVP_CIPHER_CTX *ctx, const char *pass,
-                              int passlen, ASN1_TYPE *param,
-                              const EVP_CIPHER *cipher, const EVP_MD *md,
-                              int en_de);
-
-# ifndef OPENSSL_NO_RSA
-#  define EVP_PKEY_assign_RSA(pkey,rsa) EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
-                                        (char *)(rsa))
-# endif
-
-# ifndef OPENSSL_NO_DSA
-#  define EVP_PKEY_assign_DSA(pkey,dsa) EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
-                                        (char *)(dsa))
-# endif
-
-# ifndef OPENSSL_NO_DH
-#  define EVP_PKEY_assign_DH(pkey,dh) EVP_PKEY_assign((pkey),EVP_PKEY_DH,\
-                                        (char *)(dh))
-# endif
-
-# ifndef OPENSSL_NO_EC
-#  define EVP_PKEY_assign_EC_KEY(pkey,eckey) EVP_PKEY_assign((pkey),EVP_PKEY_EC,\
-                                        (char *)(eckey))
-# endif
-
-/* Add some extra combinations */
-# define EVP_get_digestbynid(a) EVP_get_digestbyname(OBJ_nid2sn(a))
-# define EVP_get_digestbyobj(a) EVP_get_digestbynid(OBJ_obj2nid(a))
-# define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
-# define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))
-
-int EVP_MD_type(const EVP_MD *md);
-# define EVP_MD_nid(e)                   EVP_MD_type(e)
-# define EVP_MD_name(e)                  OBJ_nid2sn(EVP_MD_nid(e))
-int EVP_MD_pkey_type(const EVP_MD *md);
-int EVP_MD_size(const EVP_MD *md);
-int EVP_MD_block_size(const EVP_MD *md);
-unsigned long EVP_MD_flags(const EVP_MD *md);
-
-const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx);
-# define EVP_MD_CTX_size(e)              EVP_MD_size(EVP_MD_CTX_md(e))
-# define EVP_MD_CTX_block_size(e)        EVP_MD_block_size(EVP_MD_CTX_md(e))
-# define EVP_MD_CTX_type(e)              EVP_MD_type(EVP_MD_CTX_md(e))
-
-int EVP_CIPHER_nid(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_name(e)              OBJ_nid2sn(EVP_CIPHER_nid(e))
-int EVP_CIPHER_block_size(const EVP_CIPHER *cipher);
-int EVP_CIPHER_key_length(const EVP_CIPHER *cipher);
-int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher);
-unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_mode(e)              (EVP_CIPHER_flags(e) & EVP_CIPH_MODE)
-
-const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
-void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);
-void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
-# define EVP_CIPHER_CTX_type(c)         EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
-unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx);
-# define EVP_CIPHER_CTX_mode(e)          (EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE)
-
-# define EVP_ENCODE_LENGTH(l)    (((l+2)/3*4)+(l/48+1)*2+80)
-# define EVP_DECODE_LENGTH(l)    ((l+3)/4*3+80)
-
-# define EVP_SignInit_ex(a,b,c)          EVP_DigestInit_ex(a,b,c)
-# define EVP_SignInit(a,b)               EVP_DigestInit(a,b)
-# define EVP_SignUpdate(a,b,c)           EVP_DigestUpdate(a,b,c)
-# define EVP_VerifyInit_ex(a,b,c)        EVP_DigestInit_ex(a,b,c)
-# define EVP_VerifyInit(a,b)             EVP_DigestInit(a,b)
-# define EVP_VerifyUpdate(a,b,c)         EVP_DigestUpdate(a,b,c)
-# define EVP_OpenUpdate(a,b,c,d,e)       EVP_DecryptUpdate(a,b,c,d,e)
-# define EVP_SealUpdate(a,b,c,d,e)       EVP_EncryptUpdate(a,b,c,d,e)
-# define EVP_DigestSignUpdate(a,b,c)     EVP_DigestUpdate(a,b,c)
-# define EVP_DigestVerifyUpdate(a,b,c)   EVP_DigestUpdate(a,b,c)
-
-# ifdef CONST_STRICT
-void BIO_set_md(BIO *, const EVP_MD *md);
-# else
-#  define BIO_set_md(b,md)               BIO_ctrl(b,BIO_C_SET_MD,0,(char *)md)
-# endif
-# define BIO_get_md(b,mdp)               BIO_ctrl(b,BIO_C_GET_MD,0,(char *)mdp)
-# define BIO_get_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(char *)mdcp)
-# define BIO_set_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_SET_MD_CTX,0,(char *)mdcp)
-# define BIO_get_cipher_status(b)        BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL)
-# define BIO_get_cipher_ctx(b,c_pp)      BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(char *)c_pp)
-
-int EVP_Cipher(EVP_CIPHER_CTX *c,
-               unsigned char *out, const unsigned char *in, unsigned int inl);
-
-# define EVP_add_cipher_alias(n,alias) \
-        OBJ_NAME_add((alias),OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS,(n))
-# define EVP_add_digest_alias(n,alias) \
-        OBJ_NAME_add((alias),OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,(n))
-# define EVP_delete_cipher_alias(alias) \
-        OBJ_NAME_remove(alias,OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS);
-# define EVP_delete_digest_alias(alias) \
-        OBJ_NAME_remove(alias,OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS);
-
-void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-EVP_MD_CTX *EVP_MD_CTX_create(void);
-void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in);
-void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags);
-void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags);
-int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags);
-int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl);
-int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d, size_t cnt);
-int EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s);
-int EVP_Digest(const void *data, size_t count,
-               unsigned char *md, unsigned int *size, const EVP_MD *type,
-               ENGINE *impl);
-
-int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
-int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
-int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s);
-
-int EVP_read_pw_string(char *buf, int length, const char *prompt, int verify);
-int EVP_read_pw_string_min(char *buf, int minlen, int maxlen,
-                           const char *prompt, int verify);
-void EVP_set_pw_prompt(const char *prompt);
-char *EVP_get_pw_prompt(void);
-
-int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
-                   const unsigned char *salt, const unsigned char *data,
-                   int datal, int count, unsigned char *key,
-                   unsigned char *iv);
-
-void EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags);
-void EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags);
-int EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags);
-
-int EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                    const unsigned char *key, const unsigned char *iv);
-int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                       ENGINE *impl, const unsigned char *key,
-                       const unsigned char *iv);
-int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-                      const unsigned char *in, int inl);
-int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-int EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-int EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                    const unsigned char *key, const unsigned char *iv);
-int EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                       ENGINE *impl, const unsigned char *key,
-                       const unsigned char *iv);
-int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-                      const unsigned char *in, int inl);
-int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-
-int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                   const unsigned char *key, const unsigned char *iv,
-                   int enc);
-int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                      ENGINE *impl, const unsigned char *key,
-                      const unsigned char *iv, int enc);
-int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-                     const unsigned char *in, int inl);
-int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-int EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-
-int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s,
-                  EVP_PKEY *pkey);
-
-int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
-                    unsigned int siglen, EVP_PKEY *pkey);
-
-int EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                       const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey);
-int EVP_DigestSignFinal(EVP_MD_CTX *ctx,
-                        unsigned char *sigret, size_t *siglen);
-
-int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                         const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey);
-int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx,
-                          const unsigned char *sig, size_t siglen);
-
-int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-                 const unsigned char *ek, int ekl, const unsigned char *iv,
-                 EVP_PKEY *priv);
-int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-                 unsigned char **ek, int *ekl, unsigned char *iv,
-                 EVP_PKEY **pubk, int npubk);
-int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-void EVP_EncodeInit(EVP_ENCODE_CTX *ctx);
-void EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-                      const unsigned char *in, int inl);
-void EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl);
-int EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int n);
-
-void EVP_DecodeInit(EVP_ENCODE_CTX *ctx);
-int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-                     const unsigned char *in, int inl);
-int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned
-                    char *out, int *outl);
-int EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n);
-
-void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
-int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
-EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
-void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a);
-int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
-int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *c, int pad);
-int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);
-int EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key);
-
-# ifndef OPENSSL_NO_BIO
-BIO_METHOD *BIO_f_md(void);
-BIO_METHOD *BIO_f_base64(void);
-BIO_METHOD *BIO_f_cipher(void);
-BIO_METHOD *BIO_f_reliable(void);
-void BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
-                    const unsigned char *i, int enc);
-# endif
-
-const EVP_MD *EVP_md_null(void);
-# ifndef OPENSSL_NO_MD2
-const EVP_MD *EVP_md2(void);
-# endif
-# ifndef OPENSSL_NO_MD4
-const EVP_MD *EVP_md4(void);
-# endif
-# ifndef OPENSSL_NO_MD5
-const EVP_MD *EVP_md5(void);
-# endif
-# ifndef OPENSSL_NO_SHA
-const EVP_MD *EVP_sha(void);
-const EVP_MD *EVP_sha1(void);
-const EVP_MD *EVP_dss(void);
-const EVP_MD *EVP_dss1(void);
-const EVP_MD *EVP_ecdsa(void);
-# endif
-# ifndef OPENSSL_NO_SHA256
-const EVP_MD *EVP_sha224(void);
-const EVP_MD *EVP_sha256(void);
-# endif
-# ifndef OPENSSL_NO_SHA512
-const EVP_MD *EVP_sha384(void);
-const EVP_MD *EVP_sha512(void);
-# endif
-# ifndef OPENSSL_NO_MDC2
-const EVP_MD *EVP_mdc2(void);
-# endif
-# ifndef OPENSSL_NO_RIPEMD
-const EVP_MD *EVP_ripemd160(void);
-# endif
-# ifndef OPENSSL_NO_WHIRLPOOL
-const EVP_MD *EVP_whirlpool(void);
-# endif
-const EVP_CIPHER *EVP_enc_null(void); /* does nothing :-) */
-# ifndef OPENSSL_NO_DES
-const EVP_CIPHER *EVP_des_ecb(void);
-const EVP_CIPHER *EVP_des_ede(void);
-const EVP_CIPHER *EVP_des_ede3(void);
-const EVP_CIPHER *EVP_des_ede_ecb(void);
-const EVP_CIPHER *EVP_des_ede3_ecb(void);
-const EVP_CIPHER *EVP_des_cfb64(void);
-#  define EVP_des_cfb EVP_des_cfb64
-const EVP_CIPHER *EVP_des_cfb1(void);
-const EVP_CIPHER *EVP_des_cfb8(void);
-const EVP_CIPHER *EVP_des_ede_cfb64(void);
-#  define EVP_des_ede_cfb EVP_des_ede_cfb64
-#  if 0
-const EVP_CIPHER *EVP_des_ede_cfb1(void);
-const EVP_CIPHER *EVP_des_ede_cfb8(void);
-#  endif
-const EVP_CIPHER *EVP_des_ede3_cfb64(void);
-#  define EVP_des_ede3_cfb EVP_des_ede3_cfb64
-const EVP_CIPHER *EVP_des_ede3_cfb1(void);
-const EVP_CIPHER *EVP_des_ede3_cfb8(void);
-const EVP_CIPHER *EVP_des_ofb(void);
-const EVP_CIPHER *EVP_des_ede_ofb(void);
-const EVP_CIPHER *EVP_des_ede3_ofb(void);
-const EVP_CIPHER *EVP_des_cbc(void);
-const EVP_CIPHER *EVP_des_ede_cbc(void);
-const EVP_CIPHER *EVP_des_ede3_cbc(void);
-const EVP_CIPHER *EVP_desx_cbc(void);
-const EVP_CIPHER *EVP_des_ede3_wrap(void);
-/*
- * This should now be supported through the dev_crypto ENGINE. But also, why
- * are rc4 and md5 declarations made here inside a "NO_DES" precompiler
- * branch?
- */
-#  if 0
-#   ifdef OPENSSL_OPENBSD_DEV_CRYPTO
-const EVP_CIPHER *EVP_dev_crypto_des_ede3_cbc(void);
-const EVP_CIPHER *EVP_dev_crypto_rc4(void);
-const EVP_MD *EVP_dev_crypto_md5(void);
-#   endif
-#  endif
-# endif
-# ifndef OPENSSL_NO_RC4
-const EVP_CIPHER *EVP_rc4(void);
-const EVP_CIPHER *EVP_rc4_40(void);
-#  ifndef OPENSSL_NO_MD5
-const EVP_CIPHER *EVP_rc4_hmac_md5(void);
-#  endif
-# endif
-# ifndef OPENSSL_NO_IDEA
-const EVP_CIPHER *EVP_idea_ecb(void);
-const EVP_CIPHER *EVP_idea_cfb64(void);
-#  define EVP_idea_cfb EVP_idea_cfb64
-const EVP_CIPHER *EVP_idea_ofb(void);
-const EVP_CIPHER *EVP_idea_cbc(void);
-# endif
-# ifndef OPENSSL_NO_RC2
-const EVP_CIPHER *EVP_rc2_ecb(void);
-const EVP_CIPHER *EVP_rc2_cbc(void);
-const EVP_CIPHER *EVP_rc2_40_cbc(void);
-const EVP_CIPHER *EVP_rc2_64_cbc(void);
-const EVP_CIPHER *EVP_rc2_cfb64(void);
-#  define EVP_rc2_cfb EVP_rc2_cfb64
-const EVP_CIPHER *EVP_rc2_ofb(void);
-# endif
-# ifndef OPENSSL_NO_BF
-const EVP_CIPHER *EVP_bf_ecb(void);
-const EVP_CIPHER *EVP_bf_cbc(void);
-const EVP_CIPHER *EVP_bf_cfb64(void);
-#  define EVP_bf_cfb EVP_bf_cfb64
-const EVP_CIPHER *EVP_bf_ofb(void);
-# endif
-# ifndef OPENSSL_NO_CAST
-const EVP_CIPHER *EVP_cast5_ecb(void);
-const EVP_CIPHER *EVP_cast5_cbc(void);
-const EVP_CIPHER *EVP_cast5_cfb64(void);
-#  define EVP_cast5_cfb EVP_cast5_cfb64
-const EVP_CIPHER *EVP_cast5_ofb(void);
-# endif
-# ifndef OPENSSL_NO_RC5
-const EVP_CIPHER *EVP_rc5_32_12_16_cbc(void);
-const EVP_CIPHER *EVP_rc5_32_12_16_ecb(void);
-const EVP_CIPHER *EVP_rc5_32_12_16_cfb64(void);
-#  define EVP_rc5_32_12_16_cfb EVP_rc5_32_12_16_cfb64
-const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
-# endif
-# ifndef OPENSSL_NO_AES
-const EVP_CIPHER *EVP_aes_128_ecb(void);
-const EVP_CIPHER *EVP_aes_128_cbc(void);
-const EVP_CIPHER *EVP_aes_128_cfb1(void);
-const EVP_CIPHER *EVP_aes_128_cfb8(void);
-const EVP_CIPHER *EVP_aes_128_cfb128(void);
-#  define EVP_aes_128_cfb EVP_aes_128_cfb128
-const EVP_CIPHER *EVP_aes_128_ofb(void);
-const EVP_CIPHER *EVP_aes_128_ctr(void);
-const EVP_CIPHER *EVP_aes_128_ccm(void);
-const EVP_CIPHER *EVP_aes_128_gcm(void);
-const EVP_CIPHER *EVP_aes_128_xts(void);
-const EVP_CIPHER *EVP_aes_128_wrap(void);
-const EVP_CIPHER *EVP_aes_192_ecb(void);
-const EVP_CIPHER *EVP_aes_192_cbc(void);
-const EVP_CIPHER *EVP_aes_192_cfb1(void);
-const EVP_CIPHER *EVP_aes_192_cfb8(void);
-const EVP_CIPHER *EVP_aes_192_cfb128(void);
-#  define EVP_aes_192_cfb EVP_aes_192_cfb128
-const EVP_CIPHER *EVP_aes_192_ofb(void);
-const EVP_CIPHER *EVP_aes_192_ctr(void);
-const EVP_CIPHER *EVP_aes_192_ccm(void);
-const EVP_CIPHER *EVP_aes_192_gcm(void);
-const EVP_CIPHER *EVP_aes_192_wrap(void);
-const EVP_CIPHER *EVP_aes_256_ecb(void);
-const EVP_CIPHER *EVP_aes_256_cbc(void);
-const EVP_CIPHER *EVP_aes_256_cfb1(void);
-const EVP_CIPHER *EVP_aes_256_cfb8(void);
-const EVP_CIPHER *EVP_aes_256_cfb128(void);
-#  define EVP_aes_256_cfb EVP_aes_256_cfb128
-const EVP_CIPHER *EVP_aes_256_ofb(void);
-const EVP_CIPHER *EVP_aes_256_ctr(void);
-const EVP_CIPHER *EVP_aes_256_ccm(void);
-const EVP_CIPHER *EVP_aes_256_gcm(void);
-const EVP_CIPHER *EVP_aes_256_xts(void);
-const EVP_CIPHER *EVP_aes_256_wrap(void);
-#  if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
-const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void);
-const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void);
-#  endif
-#  ifndef OPENSSL_NO_SHA256
-const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha256(void);
-const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void);
-#  endif
-# endif
-# ifndef OPENSSL_NO_CAMELLIA
-const EVP_CIPHER *EVP_camellia_128_ecb(void);
-const EVP_CIPHER *EVP_camellia_128_cbc(void);
-const EVP_CIPHER *EVP_camellia_128_cfb1(void);
-const EVP_CIPHER *EVP_camellia_128_cfb8(void);
-const EVP_CIPHER *EVP_camellia_128_cfb128(void);
-#  define EVP_camellia_128_cfb EVP_camellia_128_cfb128
-const EVP_CIPHER *EVP_camellia_128_ofb(void);
-const EVP_CIPHER *EVP_camellia_192_ecb(void);
-const EVP_CIPHER *EVP_camellia_192_cbc(void);
-const EVP_CIPHER *EVP_camellia_192_cfb1(void);
-const EVP_CIPHER *EVP_camellia_192_cfb8(void);
-const EVP_CIPHER *EVP_camellia_192_cfb128(void);
-#  define EVP_camellia_192_cfb EVP_camellia_192_cfb128
-const EVP_CIPHER *EVP_camellia_192_ofb(void);
-const EVP_CIPHER *EVP_camellia_256_ecb(void);
-const EVP_CIPHER *EVP_camellia_256_cbc(void);
-const EVP_CIPHER *EVP_camellia_256_cfb1(void);
-const EVP_CIPHER *EVP_camellia_256_cfb8(void);
-const EVP_CIPHER *EVP_camellia_256_cfb128(void);
-#  define EVP_camellia_256_cfb EVP_camellia_256_cfb128
-const EVP_CIPHER *EVP_camellia_256_ofb(void);
-# endif
-
-# ifndef OPENSSL_NO_SEED
-const EVP_CIPHER *EVP_seed_ecb(void);
-const EVP_CIPHER *EVP_seed_cbc(void);
-const EVP_CIPHER *EVP_seed_cfb128(void);
-#  define EVP_seed_cfb EVP_seed_cfb128
-const EVP_CIPHER *EVP_seed_ofb(void);
-# endif
-
-void OPENSSL_add_all_algorithms_noconf(void);
-void OPENSSL_add_all_algorithms_conf(void);
-
-# ifdef OPENSSL_LOAD_CONF
-#  define OpenSSL_add_all_algorithms() \
-                OPENSSL_add_all_algorithms_conf()
-# else
-#  define OpenSSL_add_all_algorithms() \
-                OPENSSL_add_all_algorithms_noconf()
-# endif
-
-void OpenSSL_add_all_ciphers(void);
-void OpenSSL_add_all_digests(void);
-# define SSLeay_add_all_algorithms() OpenSSL_add_all_algorithms()
-# define SSLeay_add_all_ciphers() OpenSSL_add_all_ciphers()
-# define SSLeay_add_all_digests() OpenSSL_add_all_digests()
-
-int EVP_add_cipher(const EVP_CIPHER *cipher);
-int EVP_add_digest(const EVP_MD *digest);
-
-const EVP_CIPHER *EVP_get_cipherbyname(const char *name);
-const EVP_MD *EVP_get_digestbyname(const char *name);
-void EVP_cleanup(void);
-
-void EVP_CIPHER_do_all(void (*fn) (const EVP_CIPHER *ciph,
-                                   const char *from, const char *to, void *x),
-                       void *arg);
-void EVP_CIPHER_do_all_sorted(void (*fn)
-                               (const EVP_CIPHER *ciph, const char *from,
-                                const char *to, void *x), void *arg);
-
-void EVP_MD_do_all(void (*fn) (const EVP_MD *ciph,
-                               const char *from, const char *to, void *x),
-                   void *arg);
-void EVP_MD_do_all_sorted(void (*fn)
-                           (const EVP_MD *ciph, const char *from,
-                            const char *to, void *x), void *arg);
-
-int EVP_PKEY_decrypt_old(unsigned char *dec_key,
-                         const unsigned char *enc_key, int enc_key_len,
-                         EVP_PKEY *private_key);
-int EVP_PKEY_encrypt_old(unsigned char *enc_key,
-                         const unsigned char *key, int key_len,
-                         EVP_PKEY *pub_key);
-int EVP_PKEY_type(int type);
-int EVP_PKEY_id(const EVP_PKEY *pkey);
-int EVP_PKEY_base_id(const EVP_PKEY *pkey);
-int EVP_PKEY_bits(EVP_PKEY *pkey);
-int EVP_PKEY_size(EVP_PKEY *pkey);
-int EVP_PKEY_set_type(EVP_PKEY *pkey, int type);
-int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
-int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
-void *EVP_PKEY_get0(EVP_PKEY *pkey);
-
-# ifndef OPENSSL_NO_RSA
-struct rsa_st;
-int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, struct rsa_st *key);
-struct rsa_st *EVP_PKEY_get1_RSA(EVP_PKEY *pkey);
-# endif
-# ifndef OPENSSL_NO_DSA
-struct dsa_st;
-int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, struct dsa_st *key);
-struct dsa_st *EVP_PKEY_get1_DSA(EVP_PKEY *pkey);
-# endif
-# ifndef OPENSSL_NO_DH
-struct dh_st;
-int EVP_PKEY_set1_DH(EVP_PKEY *pkey, struct dh_st *key);
-struct dh_st *EVP_PKEY_get1_DH(EVP_PKEY *pkey);
-# endif
-# ifndef OPENSSL_NO_EC
-struct ec_key_st;
-int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, struct ec_key_st *key);
-struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey);
-# endif
-
-EVP_PKEY *EVP_PKEY_new(void);
-void EVP_PKEY_free(EVP_PKEY *pkey);
-
-EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
-                        long length);
-int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp);
-
-EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
-                         long length);
-EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
-                             long length);
-int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp);
-
-int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from);
-int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey);
-int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode);
-int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b);
-
-int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b);
-
-int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey,
-                          int indent, ASN1_PCTX *pctx);
-int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey,
-                           int indent, ASN1_PCTX *pctx);
-int EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey,
-                          int indent, ASN1_PCTX *pctx);
-
-int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid);
-
-int EVP_CIPHER_type(const EVP_CIPHER *ctx);
-
-/* calls methods */
-int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-
-/* These are used by EVP_CIPHER methods */
-int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-
-/* PKCS5 password based encryption */
-int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                       ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                       const EVP_MD *md, int en_de);
-int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-                           const unsigned char *salt, int saltlen, int iter,
-                           int keylen, unsigned char *out);
-int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
-                      const unsigned char *salt, int saltlen, int iter,
-                      const EVP_MD *digest, int keylen, unsigned char *out);
-int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                          ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                          const EVP_MD *md, int en_de);
-
-void PKCS5_PBE_add(void);
-
-int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
-                       ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de);
-
-/* PBE type */
-
-/* Can appear as the outermost AlgorithmIdentifier */
-# define EVP_PBE_TYPE_OUTER      0x0
-/* Is an PRF type OID */
-# define EVP_PBE_TYPE_PRF        0x1
-
-int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid,
-                         int md_nid, EVP_PBE_KEYGEN *keygen);
-int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
-                    EVP_PBE_KEYGEN *keygen);
-int EVP_PBE_find(int type, int pbe_nid, int *pcnid, int *pmnid,
-                 EVP_PBE_KEYGEN **pkeygen);
-void EVP_PBE_cleanup(void);
-
-# define ASN1_PKEY_ALIAS         0x1
-# define ASN1_PKEY_DYNAMIC       0x2
-# define ASN1_PKEY_SIGPARAM_NULL 0x4
-
-# define ASN1_PKEY_CTRL_PKCS7_SIGN       0x1
-# define ASN1_PKEY_CTRL_PKCS7_ENCRYPT    0x2
-# define ASN1_PKEY_CTRL_DEFAULT_MD_NID   0x3
-# define ASN1_PKEY_CTRL_CMS_SIGN         0x5
-# define ASN1_PKEY_CTRL_CMS_ENVELOPE     0x7
-# define ASN1_PKEY_CTRL_CMS_RI_TYPE      0x8
-
-int EVP_PKEY_asn1_get_count(void);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
-                                                   const char *str, int len);
-int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth);
-int EVP_PKEY_asn1_add_alias(int to, int from);
-int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *pkey_base_id,
-                            int *ppkey_flags, const char **pinfo,
-                            const char **ppem_str,
-                            const EVP_PKEY_ASN1_METHOD *ameth);
-
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_get0_asn1(EVP_PKEY *pkey);
-EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
-                                        const char *pem_str,
-                                        const char *info);
-void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,
-                        const EVP_PKEY_ASN1_METHOD *src);
-void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth);
-void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
-                              int (*pub_decode) (EVP_PKEY *pk,
-                                                 X509_PUBKEY *pub),
-                              int (*pub_encode) (X509_PUBKEY *pub,
-                                                 const EVP_PKEY *pk),
-                              int (*pub_cmp) (const EVP_PKEY *a,
-                                              const EVP_PKEY *b),
-                              int (*pub_print) (BIO *out,
-                                                const EVP_PKEY *pkey,
-                                                int indent, ASN1_PCTX *pctx),
-                              int (*pkey_size) (const EVP_PKEY *pk),
-                              int (*pkey_bits) (const EVP_PKEY *pk));
-void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
-                               int (*priv_decode) (EVP_PKEY *pk,
-                                                   PKCS8_PRIV_KEY_INFO
-                                                   *p8inf),
-                               int (*priv_encode) (PKCS8_PRIV_KEY_INFO *p8,
-                                                   const EVP_PKEY *pk),
-                               int (*priv_print) (BIO *out,
-                                                  const EVP_PKEY *pkey,
-                                                  int indent,
-                                                  ASN1_PCTX *pctx));
-void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
-                             int (*param_decode) (EVP_PKEY *pkey,
-                                                  const unsigned char **pder,
-                                                  int derlen),
-                             int (*param_encode) (const EVP_PKEY *pkey,
-                                                  unsigned char **pder),
-                             int (*param_missing) (const EVP_PKEY *pk),
-                             int (*param_copy) (EVP_PKEY *to,
-                                                const EVP_PKEY *from),
-                             int (*param_cmp) (const EVP_PKEY *a,
-                                               const EVP_PKEY *b),
-                             int (*param_print) (BIO *out,
-                                                 const EVP_PKEY *pkey,
-                                                 int indent,
-                                                 ASN1_PCTX *pctx));
-
-void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
-                            void (*pkey_free) (EVP_PKEY *pkey));
-void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
-                            int (*pkey_ctrl) (EVP_PKEY *pkey, int op,
-                                              long arg1, void *arg2));
-void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth,
-                            int (*item_verify) (EVP_MD_CTX *ctx,
-                                                const ASN1_ITEM *it,
-                                                void *asn,
-                                                X509_ALGOR *a,
-                                                ASN1_BIT_STRING *sig,
-                                                EVP_PKEY *pkey),
-                            int (*item_sign) (EVP_MD_CTX *ctx,
-                                              const ASN1_ITEM *it,
-                                              void *asn,
-                                              X509_ALGOR *alg1,
-                                              X509_ALGOR *alg2,
-                                              ASN1_BIT_STRING *sig));
-
-# define EVP_PKEY_OP_UNDEFINED           0
-# define EVP_PKEY_OP_PARAMGEN            (1<<1)
-# define EVP_PKEY_OP_KEYGEN              (1<<2)
-# define EVP_PKEY_OP_SIGN                (1<<3)
-# define EVP_PKEY_OP_VERIFY              (1<<4)
-# define EVP_PKEY_OP_VERIFYRECOVER       (1<<5)
-# define EVP_PKEY_OP_SIGNCTX             (1<<6)
-# define EVP_PKEY_OP_VERIFYCTX           (1<<7)
-# define EVP_PKEY_OP_ENCRYPT             (1<<8)
-# define EVP_PKEY_OP_DECRYPT             (1<<9)
-# define EVP_PKEY_OP_DERIVE              (1<<10)
-
-# define EVP_PKEY_OP_TYPE_SIG    \
-        (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY | EVP_PKEY_OP_VERIFYRECOVER \
-                | EVP_PKEY_OP_SIGNCTX | EVP_PKEY_OP_VERIFYCTX)
-
-# define EVP_PKEY_OP_TYPE_CRYPT \
-        (EVP_PKEY_OP_ENCRYPT | EVP_PKEY_OP_DECRYPT)
-
-# define EVP_PKEY_OP_TYPE_NOGEN \
-        (EVP_PKEY_OP_SIG | EVP_PKEY_OP_CRYPT | EVP_PKEY_OP_DERIVE)
-
-# define EVP_PKEY_OP_TYPE_GEN \
-                (EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN)
-
-# define  EVP_PKEY_CTX_set_signature_md(ctx, md) \
-                EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,  \
-                                        EVP_PKEY_CTRL_MD, 0, (void *)md)
-
-# define  EVP_PKEY_CTX_get_signature_md(ctx, pmd)        \
-                EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,  \
-                                        EVP_PKEY_CTRL_GET_MD, 0, (void *)pmd)
-
-# define EVP_PKEY_CTRL_MD                1
-# define EVP_PKEY_CTRL_PEER_KEY          2
-
-# define EVP_PKEY_CTRL_PKCS7_ENCRYPT     3
-# define EVP_PKEY_CTRL_PKCS7_DECRYPT     4
-
-# define EVP_PKEY_CTRL_PKCS7_SIGN        5
-
-# define EVP_PKEY_CTRL_SET_MAC_KEY       6
-
-# define EVP_PKEY_CTRL_DIGESTINIT        7
-
-/* Used by GOST key encryption in TLS */
-# define EVP_PKEY_CTRL_SET_IV            8
-
-# define EVP_PKEY_CTRL_CMS_ENCRYPT       9
-# define EVP_PKEY_CTRL_CMS_DECRYPT       10
-# define EVP_PKEY_CTRL_CMS_SIGN          11
-
-# define EVP_PKEY_CTRL_CIPHER            12
-
-# define EVP_PKEY_CTRL_GET_MD            13
-
-# define EVP_PKEY_ALG_CTRL               0x1000
-
-# define EVP_PKEY_FLAG_AUTOARGLEN        2
-/*
- * Method handles all operations: don't assume any digest related defaults.
- */
-# define EVP_PKEY_FLAG_SIGCTX_CUSTOM     4
-
-const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);
-EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags);
-void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
-                             const EVP_PKEY_METHOD *meth);
-void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src);
-void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth);
-int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth);
-
-EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-EVP_PKEY_CTX *EVP_PKEY_CTX_new_id(int id, ENGINE *e);
-EVP_PKEY_CTX *EVP_PKEY_CTX_dup(EVP_PKEY_CTX *ctx);
-void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
-                      int cmd, int p1, void *p2);
-int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
-                          const char *value);
-
-int EVP_PKEY_CTX_get_operation(EVP_PKEY_CTX *ctx);
-void EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen);
-
-EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
-                               const unsigned char *key, int keylen);
-
-void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data);
-void *EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx);
-EVP_PKEY *EVP_PKEY_CTX_get0_pkey(EVP_PKEY_CTX *ctx);
-
-EVP_PKEY *EVP_PKEY_CTX_get0_peerkey(EVP_PKEY_CTX *ctx);
-
-void EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data);
-void *EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
-                  unsigned char *sig, size_t *siglen,
-                  const unsigned char *tbs, size_t tbslen);
-int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
-                    const unsigned char *sig, size_t siglen,
-                    const unsigned char *tbs, size_t tbslen);
-int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
-                            unsigned char *rout, size_t *routlen,
-                            const unsigned char *sig, size_t siglen);
-int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
-                     unsigned char *out, size_t *outlen,
-                     const unsigned char *in, size_t inlen);
-int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
-                     unsigned char *out, size_t *outlen,
-                     const unsigned char *in, size_t inlen);
-
-int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer);
-int EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
-
-typedef int EVP_PKEY_gen_cb (EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);
-int EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);
-
-void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb);
-EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx);
-
-void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
-                            int (*init) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth,
-                            int (*copy) (EVP_PKEY_CTX *dst,
-                                         EVP_PKEY_CTX *src));
-
-void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
-                               void (*cleanup) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth,
-                                int (*paramgen_init) (EVP_PKEY_CTX *ctx),
-                                int (*paramgen) (EVP_PKEY_CTX *ctx,
-                                                 EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth,
-                              int (*keygen_init) (EVP_PKEY_CTX *ctx),
-                              int (*keygen) (EVP_PKEY_CTX *ctx,
-                                             EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth,
-                            int (*sign_init) (EVP_PKEY_CTX *ctx),
-                            int (*sign) (EVP_PKEY_CTX *ctx,
-                                         unsigned char *sig, size_t *siglen,
-                                         const unsigned char *tbs,
-                                         size_t tbslen));
-
-void EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth,
-                              int (*verify_init) (EVP_PKEY_CTX *ctx),
-                              int (*verify) (EVP_PKEY_CTX *ctx,
-                                             const unsigned char *sig,
-                                             size_t siglen,
-                                             const unsigned char *tbs,
-                                             size_t tbslen));
-
-void EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth,
-                                      int (*verify_recover_init) (EVP_PKEY_CTX
-                                                                  *ctx),
-                                      int (*verify_recover) (EVP_PKEY_CTX
-                                                             *ctx,
-                                                             unsigned char
-                                                             *sig,
-                                                             size_t *siglen,
-                                                             const unsigned
-                                                             char *tbs,
-                                                             size_t tbslen));
-
-void EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth,
-                               int (*signctx_init) (EVP_PKEY_CTX *ctx,
-                                                    EVP_MD_CTX *mctx),
-                               int (*signctx) (EVP_PKEY_CTX *ctx,
-                                               unsigned char *sig,
-                                               size_t *siglen,
-                                               EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth,
-                                 int (*verifyctx_init) (EVP_PKEY_CTX *ctx,
-                                                        EVP_MD_CTX *mctx),
-                                 int (*verifyctx) (EVP_PKEY_CTX *ctx,
-                                                   const unsigned char *sig,
-                                                   int siglen,
-                                                   EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,
-                               int (*encrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (*encryptfn) (EVP_PKEY_CTX *ctx,
-                                                 unsigned char *out,
-                                                 size_t *outlen,
-                                                 const unsigned char *in,
-                                                 size_t inlen));
-
-void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,
-                               int (*decrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (*decrypt) (EVP_PKEY_CTX *ctx,
-                                               unsigned char *out,
-                                               size_t *outlen,
-                                               const unsigned char *in,
-                                               size_t inlen));
-
-void EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth,
-                              int (*derive_init) (EVP_PKEY_CTX *ctx),
-                              int (*derive) (EVP_PKEY_CTX *ctx,
-                                             unsigned char *key,
-                                             size_t *keylen));
-
-void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
-                            int (*ctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
-                                         void *p2),
-                            int (*ctrl_str) (EVP_PKEY_CTX *ctx,
-                                             const char *type,
-                                             const char *value));
-
-void EVP_add_alg_module(void);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_EVP_strings(void);
-
-/* Error codes for the EVP functions. */
-
-/* Function codes. */
-# define EVP_F_AESNI_INIT_KEY                             165
-# define EVP_F_AESNI_XTS_CIPHER                           176
-# define EVP_F_AES_INIT_KEY                               133
-# define EVP_F_AES_T4_INIT_KEY                            178
-# define EVP_F_AES_XTS                                    172
-# define EVP_F_AES_XTS_CIPHER                             175
-# define EVP_F_ALG_MODULE_INIT                            177
-# define EVP_F_CAMELLIA_INIT_KEY                          159
-# define EVP_F_CMAC_INIT                                  173
-# define EVP_F_CMLL_T4_INIT_KEY                           179
-# define EVP_F_D2I_PKEY                                   100
-# define EVP_F_DO_SIGVER_INIT                             161
-# define EVP_F_DSAPKEY2PKCS8                              134
-# define EVP_F_DSA_PKEY2PKCS8                             135
-# define EVP_F_ECDSA_PKEY2PKCS8                           129
-# define EVP_F_ECKEY_PKEY2PKCS8                           132
-# define EVP_F_EVP_CIPHERINIT_EX                          123
-# define EVP_F_EVP_CIPHER_CTX_COPY                        163
-# define EVP_F_EVP_CIPHER_CTX_CTRL                        124
-# define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH              122
-# define EVP_F_EVP_DECRYPTFINAL_EX                        101
-# define EVP_F_EVP_DECRYPTUPDATE                          166
-# define EVP_F_EVP_DIGESTINIT_EX                          128
-# define EVP_F_EVP_ENCRYPTDECRYPTUPDATE                   219
-# define EVP_F_EVP_ENCRYPTFINAL_EX                        127
-# define EVP_F_EVP_ENCRYPTUPDATE                          167
-# define EVP_F_EVP_MD_CTX_COPY_EX                         110
-# define EVP_F_EVP_MD_SIZE                                162
-# define EVP_F_EVP_OPENINIT                               102
-# define EVP_F_EVP_PBE_ALG_ADD                            115
-# define EVP_F_EVP_PBE_ALG_ADD_TYPE                       160
-# define EVP_F_EVP_PBE_CIPHERINIT                         116
-# define EVP_F_EVP_PKCS82PKEY                             111
-# define EVP_F_EVP_PKCS82PKEY_BROKEN                      136
-# define EVP_F_EVP_PKEY2PKCS8_BROKEN                      113
-# define EVP_F_EVP_PKEY_COPY_PARAMETERS                   103
-# define EVP_F_EVP_PKEY_CTX_CTRL                          137
-# define EVP_F_EVP_PKEY_CTX_CTRL_STR                      150
-# define EVP_F_EVP_PKEY_CTX_DUP                           156
-# define EVP_F_EVP_PKEY_DECRYPT                           104
-# define EVP_F_EVP_PKEY_DECRYPT_INIT                      138
-# define EVP_F_EVP_PKEY_DECRYPT_OLD                       151
-# define EVP_F_EVP_PKEY_DERIVE                            153
-# define EVP_F_EVP_PKEY_DERIVE_INIT                       154
-# define EVP_F_EVP_PKEY_DERIVE_SET_PEER                   155
-# define EVP_F_EVP_PKEY_ENCRYPT                           105
-# define EVP_F_EVP_PKEY_ENCRYPT_INIT                      139
-# define EVP_F_EVP_PKEY_ENCRYPT_OLD                       152
-# define EVP_F_EVP_PKEY_GET1_DH                           119
-# define EVP_F_EVP_PKEY_GET1_DSA                          120
-# define EVP_F_EVP_PKEY_GET1_ECDSA                        130
-# define EVP_F_EVP_PKEY_GET1_EC_KEY                       131
-# define EVP_F_EVP_PKEY_GET1_RSA                          121
-# define EVP_F_EVP_PKEY_KEYGEN                            146
-# define EVP_F_EVP_PKEY_KEYGEN_INIT                       147
-# define EVP_F_EVP_PKEY_NEW                               106
-# define EVP_F_EVP_PKEY_PARAMGEN                          148
-# define EVP_F_EVP_PKEY_PARAMGEN_INIT                     149
-# define EVP_F_EVP_PKEY_SIGN                              140
-# define EVP_F_EVP_PKEY_SIGN_INIT                         141
-# define EVP_F_EVP_PKEY_VERIFY                            142
-# define EVP_F_EVP_PKEY_VERIFY_INIT                       143
-# define EVP_F_EVP_PKEY_VERIFY_RECOVER                    144
-# define EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT               145
-# define EVP_F_EVP_RIJNDAEL                               126
-# define EVP_F_EVP_SIGNFINAL                              107
-# define EVP_F_EVP_VERIFYFINAL                            108
-# define EVP_F_FIPS_CIPHERINIT                            166
-# define EVP_F_FIPS_CIPHER_CTX_COPY                       170
-# define EVP_F_FIPS_CIPHER_CTX_CTRL                       167
-# define EVP_F_FIPS_CIPHER_CTX_SET_KEY_LENGTH             171
-# define EVP_F_FIPS_DIGESTINIT                            168
-# define EVP_F_FIPS_MD_CTX_COPY                           169
-# define EVP_F_HMAC_INIT_EX                               174
-# define EVP_F_INT_CTX_NEW                                157
-# define EVP_F_PKCS5_PBE_KEYIVGEN                         117
-# define EVP_F_PKCS5_V2_PBE_KEYIVGEN                      118
-# define EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN                   164
-# define EVP_F_PKCS8_SET_BROKEN                           112
-# define EVP_F_PKEY_SET_TYPE                              158
-# define EVP_F_RC2_MAGIC_TO_METH                          109
-# define EVP_F_RC5_CTRL                                   125
-
-/* Reason codes. */
-# define EVP_R_AES_IV_SETUP_FAILED                        162
-# define EVP_R_AES_KEY_SETUP_FAILED                       143
-# define EVP_R_ASN1_LIB                                   140
-# define EVP_R_BAD_BLOCK_LENGTH                           136
-# define EVP_R_BAD_DECRYPT                                100
-# define EVP_R_BAD_KEY_LENGTH                             137
-# define EVP_R_BN_DECODE_ERROR                            112
-# define EVP_R_BN_PUBKEY_ERROR                            113
-# define EVP_R_BUFFER_TOO_SMALL                           155
-# define EVP_R_CAMELLIA_KEY_SETUP_FAILED                  157
-# define EVP_R_CIPHER_PARAMETER_ERROR                     122
-# define EVP_R_COMMAND_NOT_SUPPORTED                      147
-# define EVP_R_CTRL_NOT_IMPLEMENTED                       132
-# define EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED             133
-# define EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH          138
-# define EVP_R_DECODE_ERROR                               114
-# define EVP_R_DIFFERENT_KEY_TYPES                        101
-# define EVP_R_DIFFERENT_PARAMETERS                       153
-# define EVP_R_DISABLED_FOR_FIPS                          163
-# define EVP_R_ENCODE_ERROR                               115
-# define EVP_R_ERROR_LOADING_SECTION                      165
-# define EVP_R_ERROR_SETTING_FIPS_MODE                    166
-# define EVP_R_EVP_PBE_CIPHERINIT_ERROR                   119
-# define EVP_R_EXPECTING_AN_RSA_KEY                       127
-# define EVP_R_EXPECTING_A_DH_KEY                         128
-# define EVP_R_EXPECTING_A_DSA_KEY                        129
-# define EVP_R_EXPECTING_A_ECDSA_KEY                      141
-# define EVP_R_EXPECTING_A_EC_KEY                         142
-# define EVP_R_FIPS_MODE_NOT_SUPPORTED                    167
-# define EVP_R_INITIALIZATION_ERROR                       134
-# define EVP_R_INPUT_NOT_INITIALIZED                      111
-# define EVP_R_INVALID_DIGEST                             152
-# define EVP_R_INVALID_FIPS_MODE                          168
-# define EVP_R_INVALID_KEY_LENGTH                         130
-# define EVP_R_INVALID_OPERATION                          148
-# define EVP_R_IV_TOO_LARGE                               102
-# define EVP_R_KEYGEN_FAILURE                             120
-# define EVP_R_MESSAGE_DIGEST_IS_NULL                     159
-# define EVP_R_METHOD_NOT_SUPPORTED                       144
-# define EVP_R_MISSING_PARAMETERS                         103
-# define EVP_R_NO_CIPHER_SET                              131
-# define EVP_R_NO_DEFAULT_DIGEST                          158
-# define EVP_R_NO_DIGEST_SET                              139
-# define EVP_R_NO_DSA_PARAMETERS                          116
-# define EVP_R_NO_KEY_SET                                 154
-# define EVP_R_NO_OPERATION_SET                           149
-# define EVP_R_NO_SIGN_FUNCTION_CONFIGURED                104
-# define EVP_R_NO_VERIFY_FUNCTION_CONFIGURED              105
-# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   150
-# define EVP_R_OPERATON_NOT_INITIALIZED                   151
-# define EVP_R_OUTPUT_WOULD_OVERFLOW                      184
-# define EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE                  117
-# define EVP_R_PRIVATE_KEY_DECODE_ERROR                   145
-# define EVP_R_PRIVATE_KEY_ENCODE_ERROR                   146
-# define EVP_R_PUBLIC_KEY_NOT_RSA                         106
-# define EVP_R_TOO_LARGE                                  164
-# define EVP_R_UNKNOWN_CIPHER                             160
-# define EVP_R_UNKNOWN_DIGEST                             161
-# define EVP_R_UNKNOWN_OPTION                             169
-# define EVP_R_UNKNOWN_PBE_ALGORITHM                      121
-# define EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS                135
-# define EVP_R_UNSUPPORTED_ALGORITHM                      156
-# define EVP_R_UNSUPPORTED_CIPHER                         107
-# define EVP_R_UNSUPPORTED_KEYLENGTH                      123
-# define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION        124
-# define EVP_R_UNSUPPORTED_KEY_SIZE                       108
-# define EVP_R_UNSUPPORTED_PRF                            125
-# define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM          118
-# define EVP_R_UNSUPPORTED_SALT_TYPE                      126
-# define EVP_R_WRAP_MODE_NOT_ALLOWED                      170
-# define EVP_R_WRONG_FINAL_BLOCK_LENGTH                   109
-# define EVP_R_WRONG_PUBLIC_KEY_TYPE                      110
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/hmac.h b/openflow/usr/include/openssl/hmac.h
deleted file mode 100644
index b8b55cd..0000000
--- a/openflow/usr/include/openssl/hmac.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* crypto/hmac/hmac.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-#ifndef HEADER_HMAC_H
-# define HEADER_HMAC_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_HMAC
-#  error HMAC is disabled.
-# endif
-
-# include <openssl/evp.h>
-
-# define HMAC_MAX_MD_CBLOCK      128/* largest known is SHA512 */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct hmac_ctx_st {
-    const EVP_MD *md;
-    EVP_MD_CTX md_ctx;
-    EVP_MD_CTX i_ctx;
-    EVP_MD_CTX o_ctx;
-    unsigned int key_length;
-    unsigned char key[HMAC_MAX_MD_CBLOCK];
-} HMAC_CTX;
-
-# define HMAC_size(e)    (EVP_MD_size((e)->md))
-
-void HMAC_CTX_init(HMAC_CTX *ctx);
-void HMAC_CTX_cleanup(HMAC_CTX *ctx);
-
-/* deprecated */
-# define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx)
-
-/* deprecated */
-int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md);
-int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-                 const EVP_MD *md, ENGINE *impl);
-int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len);
-int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
-unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-                    const unsigned char *d, size_t n, unsigned char *md,
-                    unsigned int *md_len);
-int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
-
-void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/krb5_asn.h b/openflow/usr/include/openssl/krb5_asn.h
deleted file mode 100644
index 9cf5a26..0000000
--- a/openflow/usr/include/openssl/krb5_asn.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/* krb5_asn.h */
-/*
- * Written by Vern Staats <staatsvr@asc.hpc.mil> for the OpenSSL project, **
- * using ocsp/{*.h,*asn*.c} as a starting point
- */
-
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_KRB5_ASN_H
-# define HEADER_KRB5_ASN_H
-
-/*
- * #include <krb5.h>
- */
-# include <openssl/safestack.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * ASN.1 from Kerberos RFC 1510
- */
-
-/*-     EncryptedData ::=   SEQUENCE {
- *              etype[0]                      INTEGER, -- EncryptionType
- *              kvno[1]                       INTEGER OPTIONAL,
- *              cipher[2]                     OCTET STRING -- ciphertext
- *      }
- */
-typedef struct krb5_encdata_st {
-    ASN1_INTEGER *etype;
-    ASN1_INTEGER *kvno;
-    ASN1_OCTET_STRING *cipher;
-} KRB5_ENCDATA;
-
-DECLARE_STACK_OF(KRB5_ENCDATA)
-
-/*-     PrincipalName ::=   SEQUENCE {
- *              name-type[0]                  INTEGER,
- *              name-string[1]                SEQUENCE OF GeneralString
- *      }
- */
-typedef struct krb5_princname_st {
-    ASN1_INTEGER *nametype;
-    STACK_OF(ASN1_GENERALSTRING) *namestring;
-} KRB5_PRINCNAME;
-
-DECLARE_STACK_OF(KRB5_PRINCNAME)
-
-/*-     Ticket ::=      [APPLICATION 1] SEQUENCE {
- *              tkt-vno[0]                    INTEGER,
- *              realm[1]                      Realm,
- *              sname[2]                      PrincipalName,
- *              enc-part[3]                   EncryptedData
- *      }
- */
-typedef struct krb5_tktbody_st {
-    ASN1_INTEGER *tktvno;
-    ASN1_GENERALSTRING *realm;
-    KRB5_PRINCNAME *sname;
-    KRB5_ENCDATA *encdata;
-} KRB5_TKTBODY;
-
-typedef STACK_OF(KRB5_TKTBODY) KRB5_TICKET;
-DECLARE_STACK_OF(KRB5_TKTBODY)
-
-/*-     AP-REQ ::=      [APPLICATION 14] SEQUENCE {
- *              pvno[0]                       INTEGER,
- *              msg-type[1]                   INTEGER,
- *              ap-options[2]                 APOptions,
- *              ticket[3]                     Ticket,
- *              authenticator[4]              EncryptedData
- *      }
- *
- *      APOptions ::=   BIT STRING {
- *              reserved(0), use-session-key(1), mutual-required(2) }
- */
-typedef struct krb5_ap_req_st {
-    ASN1_INTEGER *pvno;
-    ASN1_INTEGER *msgtype;
-    ASN1_BIT_STRING *apoptions;
-    KRB5_TICKET *ticket;
-    KRB5_ENCDATA *authenticator;
-} KRB5_APREQBODY;
-
-typedef STACK_OF(KRB5_APREQBODY) KRB5_APREQ;
-DECLARE_STACK_OF(KRB5_APREQBODY)
-
-/*      Authenticator Stuff     */
-
-/*-     Checksum ::=   SEQUENCE {
- *              cksumtype[0]                  INTEGER,
- *              checksum[1]                   OCTET STRING
- *      }
- */
-typedef struct krb5_checksum_st {
-    ASN1_INTEGER *ctype;
-    ASN1_OCTET_STRING *checksum;
-} KRB5_CHECKSUM;
-
-DECLARE_STACK_OF(KRB5_CHECKSUM)
-
-/*-     EncryptionKey ::=   SEQUENCE {
- *              keytype[0]                    INTEGER,
- *              keyvalue[1]                   OCTET STRING
- *      }
- */
-typedef struct krb5_encryptionkey_st {
-    ASN1_INTEGER *ktype;
-    ASN1_OCTET_STRING *keyvalue;
-} KRB5_ENCKEY;
-
-DECLARE_STACK_OF(KRB5_ENCKEY)
-
-/*-     AuthorizationData ::=   SEQUENCE OF SEQUENCE {
- *              ad-type[0]                    INTEGER,
- *              ad-data[1]                    OCTET STRING
- *      }
- */
-typedef struct krb5_authorization_st {
-    ASN1_INTEGER *adtype;
-    ASN1_OCTET_STRING *addata;
-} KRB5_AUTHDATA;
-
-DECLARE_STACK_OF(KRB5_AUTHDATA)
-
-/*-     -- Unencrypted authenticator
- *      Authenticator ::=    [APPLICATION 2] SEQUENCE    {
- *              authenticator-vno[0]          INTEGER,
- *              crealm[1]                     Realm,
- *              cname[2]                      PrincipalName,
- *              cksum[3]                      Checksum OPTIONAL,
- *              cusec[4]                      INTEGER,
- *              ctime[5]                      KerberosTime,
- *              subkey[6]                     EncryptionKey OPTIONAL,
- *              seq-number[7]                 INTEGER OPTIONAL,
- *              authorization-data[8]         AuthorizationData OPTIONAL
- *      }
- */
-typedef struct krb5_authenticator_st {
-    ASN1_INTEGER *avno;
-    ASN1_GENERALSTRING *crealm;
-    KRB5_PRINCNAME *cname;
-    KRB5_CHECKSUM *cksum;
-    ASN1_INTEGER *cusec;
-    ASN1_GENERALIZEDTIME *ctime;
-    KRB5_ENCKEY *subkey;
-    ASN1_INTEGER *seqnum;
-    KRB5_AUTHDATA *authorization;
-} KRB5_AUTHENTBODY;
-
-typedef STACK_OF(KRB5_AUTHENTBODY) KRB5_AUTHENT;
-DECLARE_STACK_OF(KRB5_AUTHENTBODY)
-
-/*-  DECLARE_ASN1_FUNCTIONS(type) = DECLARE_ASN1_FUNCTIONS_name(type, type) =
- *      type *name##_new(void);
- *      void name##_free(type *a);
- *      DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name) =
- *       DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) =
- *        type *d2i_##name(type **a, const unsigned char **in, long len);
- *        int i2d_##name(type *a, unsigned char **out);
- *        DECLARE_ASN1_ITEM(itname) = OPENSSL_EXTERN const ASN1_ITEM itname##_it
- */
-
-DECLARE_ASN1_FUNCTIONS(KRB5_ENCDATA)
-DECLARE_ASN1_FUNCTIONS(KRB5_PRINCNAME)
-DECLARE_ASN1_FUNCTIONS(KRB5_TKTBODY)
-DECLARE_ASN1_FUNCTIONS(KRB5_APREQBODY)
-DECLARE_ASN1_FUNCTIONS(KRB5_TICKET)
-DECLARE_ASN1_FUNCTIONS(KRB5_APREQ)
-
-DECLARE_ASN1_FUNCTIONS(KRB5_CHECKSUM)
-DECLARE_ASN1_FUNCTIONS(KRB5_ENCKEY)
-DECLARE_ASN1_FUNCTIONS(KRB5_AUTHDATA)
-DECLARE_ASN1_FUNCTIONS(KRB5_AUTHENTBODY)
-DECLARE_ASN1_FUNCTIONS(KRB5_AUTHENT)
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/kssl.h b/openflow/usr/include/openssl/kssl.h
deleted file mode 100644
index ae8a51f..0000000
--- a/openflow/usr/include/openssl/kssl.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ssl/kssl.h */
-/*
- * Written by Vern Staats <staatsvr@asc.hpc.mil> for the OpenSSL project
- * 2000. project 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
- **      19990701        VRS     Started.
- */
-
-#ifndef KSSL_H
-# define KSSL_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_KRB5
-
-#  include <stdio.h>
-#  include <ctype.h>
-#  include <krb5.h>
-#  ifdef OPENSSL_SYS_WIN32
-/*
- * These can sometimes get redefined indirectly by krb5 header files after
- * they get undefed in ossl_typ.h
- */
-#   undef X509_NAME
-#   undef X509_EXTENSIONS
-#   undef OCSP_REQUEST
-#   undef OCSP_RESPONSE
-#  endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- *      Depending on which KRB5 implementation used, some types from
- *      the other may be missing.  Resolve that here and now
- */
-#  ifdef KRB5_HEIMDAL
-typedef unsigned char krb5_octet;
-#   define FAR
-#  else
-
-#   ifndef FAR
-#    define FAR
-#   endif
-
-#  endif
-
-/*-
- *      Uncomment this to debug kssl problems or
- *      to trace usage of the Kerberos session key
- *
- *      #define         KSSL_DEBUG
- */
-
-#  ifndef KRB5SVC
-#   define KRB5SVC "host"
-#  endif
-
-#  ifndef KRB5KEYTAB
-#   define KRB5KEYTAB      "/etc/krb5.keytab"
-#  endif
-
-#  ifndef KRB5SENDAUTH
-#   define KRB5SENDAUTH    1
-#  endif
-
-#  ifndef KRB5CHECKAUTH
-#   define KRB5CHECKAUTH   1
-#  endif
-
-#  ifndef KSSL_CLOCKSKEW
-#   define KSSL_CLOCKSKEW  300;
-#  endif
-
-#  define KSSL_ERR_MAX    255
-typedef struct kssl_err_st {
-    int reason;
-    char text[KSSL_ERR_MAX + 1];
-} KSSL_ERR;
-
-/*-     Context for passing
- *              (1) Kerberos session key to SSL, and
- *              (2)     Config data between application and SSL lib
- */
-typedef struct kssl_ctx_st {
-    /*      used by:    disposition:            */
-    char *service_name;         /* C,S default ok (kssl) */
-    char *service_host;         /* C input, REQUIRED */
-    char *client_princ;         /* S output from krb5 ticket */
-    char *keytab_file;          /* S NULL (/etc/krb5.keytab) */
-    char *cred_cache;           /* C NULL (default) */
-    krb5_enctype enctype;
-    int length;
-    krb5_octet FAR *key;
-} KSSL_CTX;
-
-#  define KSSL_CLIENT     1
-#  define KSSL_SERVER     2
-#  define KSSL_SERVICE    3
-#  define KSSL_KEYTAB     4
-
-#  define KSSL_CTX_OK     0
-#  define KSSL_CTX_ERR    1
-#  define KSSL_NOMEM      2
-
-/* Public (for use by applications that use OpenSSL with Kerberos 5 support */
-krb5_error_code kssl_ctx_setstring(KSSL_CTX *kssl_ctx, int which, char *text);
-KSSL_CTX *kssl_ctx_new(void);
-KSSL_CTX *kssl_ctx_free(KSSL_CTX *kssl_ctx);
-void kssl_ctx_show(KSSL_CTX *kssl_ctx);
-krb5_error_code kssl_ctx_setprinc(KSSL_CTX *kssl_ctx, int which,
-                                  krb5_data *realm, krb5_data *entity,
-                                  int nentities);
-krb5_error_code kssl_cget_tkt(KSSL_CTX *kssl_ctx, krb5_data **enc_tktp,
-                              krb5_data *authenp, KSSL_ERR *kssl_err);
-krb5_error_code kssl_sget_tkt(KSSL_CTX *kssl_ctx, krb5_data *indata,
-                              krb5_ticket_times *ttimes, KSSL_ERR *kssl_err);
-krb5_error_code kssl_ctx_setkey(KSSL_CTX *kssl_ctx, krb5_keyblock *session);
-void kssl_err_set(KSSL_ERR *kssl_err, int reason, char *text);
-void kssl_krb5_free_data_contents(krb5_context context, krb5_data *data);
-krb5_error_code kssl_build_principal_2(krb5_context context,
-                                       krb5_principal *princ, int rlen,
-                                       const char *realm, int slen,
-                                       const char *svc, int hlen,
-                                       const char *host);
-krb5_error_code kssl_validate_times(krb5_timestamp atime,
-                                    krb5_ticket_times *ttimes);
-krb5_error_code kssl_check_authent(KSSL_CTX *kssl_ctx, krb5_data *authentp,
-                                   krb5_timestamp *atimep,
-                                   KSSL_ERR *kssl_err);
-unsigned char *kssl_skip_confound(krb5_enctype enctype, unsigned char *authn);
-
-void SSL_set0_kssl_ctx(SSL *s, KSSL_CTX *kctx);
-KSSL_CTX *SSL_get0_kssl_ctx(SSL *s);
-char *kssl_ctx_get0_client_princ(KSSL_CTX *kctx);
-
-#ifdef  __cplusplus
-}
-#endif
-# endif                         /* OPENSSL_NO_KRB5 */
-#endif                          /* KSSL_H */
diff --git a/openflow/usr/include/openssl/lhash.h b/openflow/usr/include/openssl/lhash.h
deleted file mode 100644
index b6c328b..0000000
--- a/openflow/usr/include/openssl/lhash.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/* crypto/lhash/lhash.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/*
- * Header for dynamic hash table routines Author - Eric Young
- */
-
-#ifndef HEADER_LHASH_H
-# define HEADER_LHASH_H
-
-# include <openssl/e_os2.h>
-# ifndef OPENSSL_NO_FP_API
-#  include <stdio.h>
-# endif
-
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct lhash_node_st {
-    void *data;
-    struct lhash_node_st *next;
-# ifndef OPENSSL_NO_HASH_COMP
-    unsigned long hash;
-# endif
-} LHASH_NODE;
-
-typedef int (*LHASH_COMP_FN_TYPE) (const void *, const void *);
-typedef unsigned long (*LHASH_HASH_FN_TYPE) (const void *);
-typedef void (*LHASH_DOALL_FN_TYPE) (void *);
-typedef void (*LHASH_DOALL_ARG_FN_TYPE) (void *, void *);
-
-/*
- * Macros for declaring and implementing type-safe wrappers for LHASH
- * callbacks. This way, callbacks can be provided to LHASH structures without
- * function pointer casting and the macro-defined callbacks provide
- * per-variable casting before deferring to the underlying type-specific
- * callbacks. NB: It is possible to place a "static" in front of both the
- * DECLARE and IMPLEMENT macros if the functions are strictly internal.
- */
-
-/* First: "hash" functions */
-# define DECLARE_LHASH_HASH_FN(name, o_type) \
-        unsigned long name##_LHASH_HASH(const void *);
-# define IMPLEMENT_LHASH_HASH_FN(name, o_type) \
-        unsigned long name##_LHASH_HASH(const void *arg) { \
-                const o_type *a = arg; \
-                return name##_hash(a); }
-# define LHASH_HASH_FN(name) name##_LHASH_HASH
-
-/* Second: "compare" functions */
-# define DECLARE_LHASH_COMP_FN(name, o_type) \
-        int name##_LHASH_COMP(const void *, const void *);
-# define IMPLEMENT_LHASH_COMP_FN(name, o_type) \
-        int name##_LHASH_COMP(const void *arg1, const void *arg2) { \
-                const o_type *a = arg1;             \
-                const o_type *b = arg2; \
-                return name##_cmp(a,b); }
-# define LHASH_COMP_FN(name) name##_LHASH_COMP
-
-/* Third: "doall" functions */
-# define DECLARE_LHASH_DOALL_FN(name, o_type) \
-        void name##_LHASH_DOALL(void *);
-# define IMPLEMENT_LHASH_DOALL_FN(name, o_type) \
-        void name##_LHASH_DOALL(void *arg) { \
-                o_type *a = arg; \
-                name##_doall(a); }
-# define LHASH_DOALL_FN(name) name##_LHASH_DOALL
-
-/* Fourth: "doall_arg" functions */
-# define DECLARE_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
-        void name##_LHASH_DOALL_ARG(void *, void *);
-# define IMPLEMENT_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
-        void name##_LHASH_DOALL_ARG(void *arg1, void *arg2) { \
-                o_type *a = arg1; \
-                a_type *b = arg2; \
-                name##_doall_arg(a, b); }
-# define LHASH_DOALL_ARG_FN(name) name##_LHASH_DOALL_ARG
-
-typedef struct lhash_st {
-    LHASH_NODE **b;
-    LHASH_COMP_FN_TYPE comp;
-    LHASH_HASH_FN_TYPE hash;
-    unsigned int num_nodes;
-    unsigned int num_alloc_nodes;
-    unsigned int p;
-    unsigned int pmax;
-    unsigned long up_load;      /* load times 256 */
-    unsigned long down_load;    /* load times 256 */
-    unsigned long num_items;
-    unsigned long num_expands;
-    unsigned long num_expand_reallocs;
-    unsigned long num_contracts;
-    unsigned long num_contract_reallocs;
-    unsigned long num_hash_calls;
-    unsigned long num_comp_calls;
-    unsigned long num_insert;
-    unsigned long num_replace;
-    unsigned long num_delete;
-    unsigned long num_no_delete;
-    unsigned long num_retrieve;
-    unsigned long num_retrieve_miss;
-    unsigned long num_hash_comps;
-    int error;
-} _LHASH;                       /* Do not use _LHASH directly, use LHASH_OF
-                                 * and friends */
-
-# define LH_LOAD_MULT    256
-
-/*
- * Indicates a malloc() error in the last call, this is only bad in
- * lh_insert().
- */
-# define lh_error(lh)    ((lh)->error)
-
-_LHASH *lh_new(LHASH_HASH_FN_TYPE h, LHASH_COMP_FN_TYPE c);
-void lh_free(_LHASH *lh);
-void *lh_insert(_LHASH *lh, void *data);
-void *lh_delete(_LHASH *lh, const void *data);
-void *lh_retrieve(_LHASH *lh, const void *data);
-void lh_doall(_LHASH *lh, LHASH_DOALL_FN_TYPE func);
-void lh_doall_arg(_LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, void *arg);
-unsigned long lh_strhash(const char *c);
-unsigned long lh_num_items(const _LHASH *lh);
-
-# ifndef OPENSSL_NO_FP_API
-void lh_stats(const _LHASH *lh, FILE *out);
-void lh_node_stats(const _LHASH *lh, FILE *out);
-void lh_node_usage_stats(const _LHASH *lh, FILE *out);
-# endif
-
-# ifndef OPENSSL_NO_BIO
-void lh_stats_bio(const _LHASH *lh, BIO *out);
-void lh_node_stats_bio(const _LHASH *lh, BIO *out);
-void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out);
-# endif
-
-/* Type checking... */
-
-# define LHASH_OF(type) struct lhash_st_##type
-
-# define DECLARE_LHASH_OF(type) LHASH_OF(type) { int dummy; }
-
-# define CHECKED_LHASH_OF(type,lh) \
-  ((_LHASH *)CHECKED_PTR_OF(LHASH_OF(type),lh))
-
-/* Define wrapper functions. */
-# define LHM_lh_new(type, name) \
-  ((LHASH_OF(type) *)lh_new(LHASH_HASH_FN(name), LHASH_COMP_FN(name)))
-# define LHM_lh_error(type, lh) \
-  lh_error(CHECKED_LHASH_OF(type,lh))
-# define LHM_lh_insert(type, lh, inst) \
-  ((type *)lh_insert(CHECKED_LHASH_OF(type, lh), \
-                     CHECKED_PTR_OF(type, inst)))
-# define LHM_lh_retrieve(type, lh, inst) \
-  ((type *)lh_retrieve(CHECKED_LHASH_OF(type, lh), \
-                       CHECKED_PTR_OF(type, inst)))
-# define LHM_lh_delete(type, lh, inst) \
-  ((type *)lh_delete(CHECKED_LHASH_OF(type, lh),                        \
-                     CHECKED_PTR_OF(type, inst)))
-# define LHM_lh_doall(type, lh,fn) lh_doall(CHECKED_LHASH_OF(type, lh), fn)
-# define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \
-  lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg))
-# define LHM_lh_num_items(type, lh) lh_num_items(CHECKED_LHASH_OF(type, lh))
-# define LHM_lh_down_load(type, lh) (CHECKED_LHASH_OF(type, lh)->down_load)
-# define LHM_lh_node_stats_bio(type, lh, out) \
-  lh_node_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-# define LHM_lh_node_usage_stats_bio(type, lh, out) \
-  lh_node_usage_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-# define LHM_lh_stats_bio(type, lh, out) \
-  lh_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-# define LHM_lh_free(type, lh) lh_free(CHECKED_LHASH_OF(type, lh))
-
-DECLARE_LHASH_OF(OPENSSL_STRING);
-DECLARE_LHASH_OF(OPENSSL_CSTRING);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/md4.h b/openflow/usr/include/openssl/md4.h
deleted file mode 100644
index 11fd712..0000000
--- a/openflow/usr/include/openssl/md4.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* crypto/md4/md4.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_MD4_H
-# define HEADER_MD4_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_NO_MD4
-#  error MD4 is disabled.
-# endif
-
-/*-
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD4_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! MD4_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-# if defined(__LP32__)
-#  define MD4_LONG unsigned long
-# elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#  define MD4_LONG unsigned long
-#  define MD4_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *                                      <appro@fy.chalmers.se>
- */
-# else
-#  define MD4_LONG unsigned int
-# endif
-
-# define MD4_CBLOCK      64
-# define MD4_LBLOCK      (MD4_CBLOCK/4)
-# define MD4_DIGEST_LENGTH 16
-
-typedef struct MD4state_st {
-    MD4_LONG A, B, C, D;
-    MD4_LONG Nl, Nh;
-    MD4_LONG data[MD4_LBLOCK];
-    unsigned int num;
-} MD4_CTX;
-
-# ifdef OPENSSL_FIPS
-int private_MD4_Init(MD4_CTX *c);
-# endif
-int MD4_Init(MD4_CTX *c);
-int MD4_Update(MD4_CTX *c, const void *data, size_t len);
-int MD4_Final(unsigned char *md, MD4_CTX *c);
-unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md);
-void MD4_Transform(MD4_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/md5.h b/openflow/usr/include/openssl/md5.h
deleted file mode 100644
index 2659038..0000000
--- a/openflow/usr/include/openssl/md5.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* crypto/md5/md5.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_MD5_H
-# define HEADER_MD5_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_NO_MD5
-#  error MD5 is disabled.
-# endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD5_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! MD5_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-# if defined(__LP32__)
-#  define MD5_LONG unsigned long
-# elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#  define MD5_LONG unsigned long
-#  define MD5_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *                                      <appro@fy.chalmers.se>
- */
-# else
-#  define MD5_LONG unsigned int
-# endif
-
-# define MD5_CBLOCK      64
-# define MD5_LBLOCK      (MD5_CBLOCK/4)
-# define MD5_DIGEST_LENGTH 16
-
-typedef struct MD5state_st {
-    MD5_LONG A, B, C, D;
-    MD5_LONG Nl, Nh;
-    MD5_LONG data[MD5_LBLOCK];
-    unsigned int num;
-} MD5_CTX;
-
-# ifdef OPENSSL_FIPS
-int private_MD5_Init(MD5_CTX *c);
-# endif
-int MD5_Init(MD5_CTX *c);
-int MD5_Update(MD5_CTX *c, const void *data, size_t len);
-int MD5_Final(unsigned char *md, MD5_CTX *c);
-unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md);
-void MD5_Transform(MD5_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/modes.h b/openflow/usr/include/openssl/modes.h
deleted file mode 100644
index fd48849..0000000
--- a/openflow/usr/include/openssl/modes.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2008 The OpenSSL Project. All rights reserved.
- *
- * Rights for redistribution and usage in source and binary
- * forms are granted according to the OpenSSL license.
- */
-
-#include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-typedef void (*block128_f) (const unsigned char in[16],
-                            unsigned char out[16], const void *key);
-
-typedef void (*cbc128_f) (const unsigned char *in, unsigned char *out,
-                          size_t len, const void *key,
-                          unsigned char ivec[16], int enc);
-
-typedef void (*ctr128_f) (const unsigned char *in, unsigned char *out,
-                          size_t blocks, const void *key,
-                          const unsigned char ivec[16]);
-
-typedef void (*ccm128_f) (const unsigned char *in, unsigned char *out,
-                          size_t blocks, const void *key,
-                          const unsigned char ivec[16],
-                          unsigned char cmac[16]);
-
-void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], block128_f block);
-void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], block128_f block);
-
-void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16],
-                           unsigned char ecount_buf[16], unsigned int *num,
-                           block128_f block);
-
-void CRYPTO_ctr128_encrypt_ctr32(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec[16],
-                                 unsigned char ecount_buf[16],
-                                 unsigned int *num, ctr128_f ctr);
-
-void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], int *num,
-                           block128_f block);
-
-void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], int *num,
-                           int enc, block128_f block);
-void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const void *key,
-                             unsigned char ivec[16], int *num,
-                             int enc, block128_f block);
-void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t bits, const void *key,
-                             unsigned char ivec[16], int *num,
-                             int enc, block128_f block);
-
-size_t CRYPTO_cts128_encrypt_block(const unsigned char *in,
-                                   unsigned char *out, size_t len,
-                                   const void *key, unsigned char ivec[16],
-                                   block128_f block);
-size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t len, const void *key,
-                             unsigned char ivec[16], cbc128_f cbc);
-size_t CRYPTO_cts128_decrypt_block(const unsigned char *in,
-                                   unsigned char *out, size_t len,
-                                   const void *key, unsigned char ivec[16],
-                                   block128_f block);
-size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
-                             size_t len, const void *key,
-                             unsigned char ivec[16], cbc128_f cbc);
-
-size_t CRYPTO_nistcts128_encrypt_block(const unsigned char *in,
-                                       unsigned char *out, size_t len,
-                                       const void *key,
-                                       unsigned char ivec[16],
-                                       block128_f block);
-size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec[16], cbc128_f cbc);
-size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in,
-                                       unsigned char *out, size_t len,
-                                       const void *key,
-                                       unsigned char ivec[16],
-                                       block128_f block);
-size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec[16], cbc128_f cbc);
-
-typedef struct gcm128_context GCM128_CONTEXT;
-
-GCM128_CONTEXT *CRYPTO_gcm128_new(void *key, block128_f block);
-void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block);
-void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx, const unsigned char *iv,
-                         size_t len);
-int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const unsigned char *aad,
-                      size_t len);
-int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
-                          const unsigned char *in, unsigned char *out,
-                          size_t len);
-int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
-                          const unsigned char *in, unsigned char *out,
-                          size_t len);
-int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
-                                const unsigned char *in, unsigned char *out,
-                                size_t len, ctr128_f stream);
-int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
-                                const unsigned char *in, unsigned char *out,
-                                size_t len, ctr128_f stream);
-int CRYPTO_gcm128_finish(GCM128_CONTEXT *ctx, const unsigned char *tag,
-                         size_t len);
-void CRYPTO_gcm128_tag(GCM128_CONTEXT *ctx, unsigned char *tag, size_t len);
-void CRYPTO_gcm128_release(GCM128_CONTEXT *ctx);
-
-typedef struct ccm128_context CCM128_CONTEXT;
-
-void CRYPTO_ccm128_init(CCM128_CONTEXT *ctx,
-                        unsigned int M, unsigned int L, void *key,
-                        block128_f block);
-int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx, const unsigned char *nonce,
-                        size_t nlen, size_t mlen);
-void CRYPTO_ccm128_aad(CCM128_CONTEXT *ctx, const unsigned char *aad,
-                       size_t alen);
-int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                          unsigned char *out, size_t len);
-int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                          unsigned char *out, size_t len);
-int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                                unsigned char *out, size_t len,
-                                ccm128_f stream);
-int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                                unsigned char *out, size_t len,
-                                ccm128_f stream);
-size_t CRYPTO_ccm128_tag(CCM128_CONTEXT *ctx, unsigned char *tag, size_t len);
-
-typedef struct xts128_context XTS128_CONTEXT;
-
-int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
-                          const unsigned char iv[16],
-                          const unsigned char *inp, unsigned char *out,
-                          size_t len, int enc);
-
-size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
-                       unsigned char *out,
-                       const unsigned char *in, size_t inlen,
-                       block128_f block);
-
-size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
-                         unsigned char *out,
-                         const unsigned char *in, size_t inlen,
-                         block128_f block);
-
-#ifdef  __cplusplus
-}
-#endif
diff --git a/openflow/usr/include/openssl/obj_mac.h b/openflow/usr/include/openssl/obj_mac.h
deleted file mode 100644
index 779c309..0000000
--- a/openflow/usr/include/openssl/obj_mac.h
+++ /dev/null
@@ -1,4194 +0,0 @@
-/* crypto/objects/obj_mac.h */
-
-/*
- * THIS FILE IS GENERATED FROM objects.txt by objects.pl via the following
- * command: perl objects.pl objects.txt obj_mac.num obj_mac.h
- */
-
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#define SN_undef                        "UNDEF"
-#define LN_undef                        "undefined"
-#define NID_undef                       0
-#define OBJ_undef                       0L
-
-#define SN_itu_t                "ITU-T"
-#define LN_itu_t                "itu-t"
-#define NID_itu_t               645
-#define OBJ_itu_t               0L
-
-#define NID_ccitt               404
-#define OBJ_ccitt               OBJ_itu_t
-
-#define SN_iso          "ISO"
-#define LN_iso          "iso"
-#define NID_iso         181
-#define OBJ_iso         1L
-
-#define SN_joint_iso_itu_t              "JOINT-ISO-ITU-T"
-#define LN_joint_iso_itu_t              "joint-iso-itu-t"
-#define NID_joint_iso_itu_t             646
-#define OBJ_joint_iso_itu_t             2L
-
-#define NID_joint_iso_ccitt             393
-#define OBJ_joint_iso_ccitt             OBJ_joint_iso_itu_t
-
-#define SN_member_body          "member-body"
-#define LN_member_body          "ISO Member Body"
-#define NID_member_body         182
-#define OBJ_member_body         OBJ_iso,2L
-
-#define SN_identified_organization              "identified-organization"
-#define NID_identified_organization             676
-#define OBJ_identified_organization             OBJ_iso,3L
-
-#define SN_hmac_md5             "HMAC-MD5"
-#define LN_hmac_md5             "hmac-md5"
-#define NID_hmac_md5            780
-#define OBJ_hmac_md5            OBJ_identified_organization,6L,1L,5L,5L,8L,1L,1L
-
-#define SN_hmac_sha1            "HMAC-SHA1"
-#define LN_hmac_sha1            "hmac-sha1"
-#define NID_hmac_sha1           781
-#define OBJ_hmac_sha1           OBJ_identified_organization,6L,1L,5L,5L,8L,1L,2L
-
-#define SN_certicom_arc         "certicom-arc"
-#define NID_certicom_arc                677
-#define OBJ_certicom_arc                OBJ_identified_organization,132L
-
-#define SN_international_organizations          "international-organizations"
-#define LN_international_organizations          "International Organizations"
-#define NID_international_organizations         647
-#define OBJ_international_organizations         OBJ_joint_iso_itu_t,23L
-
-#define SN_wap          "wap"
-#define NID_wap         678
-#define OBJ_wap         OBJ_international_organizations,43L
-
-#define SN_wap_wsg              "wap-wsg"
-#define NID_wap_wsg             679
-#define OBJ_wap_wsg             OBJ_wap,1L
-
-#define SN_selected_attribute_types             "selected-attribute-types"
-#define LN_selected_attribute_types             "Selected Attribute Types"
-#define NID_selected_attribute_types            394
-#define OBJ_selected_attribute_types            OBJ_joint_iso_itu_t,5L,1L,5L
-
-#define SN_clearance            "clearance"
-#define NID_clearance           395
-#define OBJ_clearance           OBJ_selected_attribute_types,55L
-
-#define SN_ISO_US               "ISO-US"
-#define LN_ISO_US               "ISO US Member Body"
-#define NID_ISO_US              183
-#define OBJ_ISO_US              OBJ_member_body,840L
-
-#define SN_X9_57                "X9-57"
-#define LN_X9_57                "X9.57"
-#define NID_X9_57               184
-#define OBJ_X9_57               OBJ_ISO_US,10040L
-
-#define SN_X9cm         "X9cm"
-#define LN_X9cm         "X9.57 CM ?"
-#define NID_X9cm                185
-#define OBJ_X9cm                OBJ_X9_57,4L
-
-#define SN_dsa          "DSA"
-#define LN_dsa          "dsaEncryption"
-#define NID_dsa         116
-#define OBJ_dsa         OBJ_X9cm,1L
-
-#define SN_dsaWithSHA1          "DSA-SHA1"
-#define LN_dsaWithSHA1          "dsaWithSHA1"
-#define NID_dsaWithSHA1         113
-#define OBJ_dsaWithSHA1         OBJ_X9cm,3L
-
-#define SN_ansi_X9_62           "ansi-X9-62"
-#define LN_ansi_X9_62           "ANSI X9.62"
-#define NID_ansi_X9_62          405
-#define OBJ_ansi_X9_62          OBJ_ISO_US,10045L
-
-#define OBJ_X9_62_id_fieldType          OBJ_ansi_X9_62,1L
-
-#define SN_X9_62_prime_field            "prime-field"
-#define NID_X9_62_prime_field           406
-#define OBJ_X9_62_prime_field           OBJ_X9_62_id_fieldType,1L
-
-#define SN_X9_62_characteristic_two_field               "characteristic-two-field"
-#define NID_X9_62_characteristic_two_field              407
-#define OBJ_X9_62_characteristic_two_field              OBJ_X9_62_id_fieldType,2L
-
-#define SN_X9_62_id_characteristic_two_basis            "id-characteristic-two-basis"
-#define NID_X9_62_id_characteristic_two_basis           680
-#define OBJ_X9_62_id_characteristic_two_basis           OBJ_X9_62_characteristic_two_field,3L
-
-#define SN_X9_62_onBasis                "onBasis"
-#define NID_X9_62_onBasis               681
-#define OBJ_X9_62_onBasis               OBJ_X9_62_id_characteristic_two_basis,1L
-
-#define SN_X9_62_tpBasis                "tpBasis"
-#define NID_X9_62_tpBasis               682
-#define OBJ_X9_62_tpBasis               OBJ_X9_62_id_characteristic_two_basis,2L
-
-#define SN_X9_62_ppBasis                "ppBasis"
-#define NID_X9_62_ppBasis               683
-#define OBJ_X9_62_ppBasis               OBJ_X9_62_id_characteristic_two_basis,3L
-
-#define OBJ_X9_62_id_publicKeyType              OBJ_ansi_X9_62,2L
-
-#define SN_X9_62_id_ecPublicKey         "id-ecPublicKey"
-#define NID_X9_62_id_ecPublicKey                408
-#define OBJ_X9_62_id_ecPublicKey                OBJ_X9_62_id_publicKeyType,1L
-
-#define OBJ_X9_62_ellipticCurve         OBJ_ansi_X9_62,3L
-
-#define OBJ_X9_62_c_TwoCurve            OBJ_X9_62_ellipticCurve,0L
-
-#define SN_X9_62_c2pnb163v1             "c2pnb163v1"
-#define NID_X9_62_c2pnb163v1            684
-#define OBJ_X9_62_c2pnb163v1            OBJ_X9_62_c_TwoCurve,1L
-
-#define SN_X9_62_c2pnb163v2             "c2pnb163v2"
-#define NID_X9_62_c2pnb163v2            685
-#define OBJ_X9_62_c2pnb163v2            OBJ_X9_62_c_TwoCurve,2L
-
-#define SN_X9_62_c2pnb163v3             "c2pnb163v3"
-#define NID_X9_62_c2pnb163v3            686
-#define OBJ_X9_62_c2pnb163v3            OBJ_X9_62_c_TwoCurve,3L
-
-#define SN_X9_62_c2pnb176v1             "c2pnb176v1"
-#define NID_X9_62_c2pnb176v1            687
-#define OBJ_X9_62_c2pnb176v1            OBJ_X9_62_c_TwoCurve,4L
-
-#define SN_X9_62_c2tnb191v1             "c2tnb191v1"
-#define NID_X9_62_c2tnb191v1            688
-#define OBJ_X9_62_c2tnb191v1            OBJ_X9_62_c_TwoCurve,5L
-
-#define SN_X9_62_c2tnb191v2             "c2tnb191v2"
-#define NID_X9_62_c2tnb191v2            689
-#define OBJ_X9_62_c2tnb191v2            OBJ_X9_62_c_TwoCurve,6L
-
-#define SN_X9_62_c2tnb191v3             "c2tnb191v3"
-#define NID_X9_62_c2tnb191v3            690
-#define OBJ_X9_62_c2tnb191v3            OBJ_X9_62_c_TwoCurve,7L
-
-#define SN_X9_62_c2onb191v4             "c2onb191v4"
-#define NID_X9_62_c2onb191v4            691
-#define OBJ_X9_62_c2onb191v4            OBJ_X9_62_c_TwoCurve,8L
-
-#define SN_X9_62_c2onb191v5             "c2onb191v5"
-#define NID_X9_62_c2onb191v5            692
-#define OBJ_X9_62_c2onb191v5            OBJ_X9_62_c_TwoCurve,9L
-
-#define SN_X9_62_c2pnb208w1             "c2pnb208w1"
-#define NID_X9_62_c2pnb208w1            693
-#define OBJ_X9_62_c2pnb208w1            OBJ_X9_62_c_TwoCurve,10L
-
-#define SN_X9_62_c2tnb239v1             "c2tnb239v1"
-#define NID_X9_62_c2tnb239v1            694
-#define OBJ_X9_62_c2tnb239v1            OBJ_X9_62_c_TwoCurve,11L
-
-#define SN_X9_62_c2tnb239v2             "c2tnb239v2"
-#define NID_X9_62_c2tnb239v2            695
-#define OBJ_X9_62_c2tnb239v2            OBJ_X9_62_c_TwoCurve,12L
-
-#define SN_X9_62_c2tnb239v3             "c2tnb239v3"
-#define NID_X9_62_c2tnb239v3            696
-#define OBJ_X9_62_c2tnb239v3            OBJ_X9_62_c_TwoCurve,13L
-
-#define SN_X9_62_c2onb239v4             "c2onb239v4"
-#define NID_X9_62_c2onb239v4            697
-#define OBJ_X9_62_c2onb239v4            OBJ_X9_62_c_TwoCurve,14L
-
-#define SN_X9_62_c2onb239v5             "c2onb239v5"
-#define NID_X9_62_c2onb239v5            698
-#define OBJ_X9_62_c2onb239v5            OBJ_X9_62_c_TwoCurve,15L
-
-#define SN_X9_62_c2pnb272w1             "c2pnb272w1"
-#define NID_X9_62_c2pnb272w1            699
-#define OBJ_X9_62_c2pnb272w1            OBJ_X9_62_c_TwoCurve,16L
-
-#define SN_X9_62_c2pnb304w1             "c2pnb304w1"
-#define NID_X9_62_c2pnb304w1            700
-#define OBJ_X9_62_c2pnb304w1            OBJ_X9_62_c_TwoCurve,17L
-
-#define SN_X9_62_c2tnb359v1             "c2tnb359v1"
-#define NID_X9_62_c2tnb359v1            701
-#define OBJ_X9_62_c2tnb359v1            OBJ_X9_62_c_TwoCurve,18L
-
-#define SN_X9_62_c2pnb368w1             "c2pnb368w1"
-#define NID_X9_62_c2pnb368w1            702
-#define OBJ_X9_62_c2pnb368w1            OBJ_X9_62_c_TwoCurve,19L
-
-#define SN_X9_62_c2tnb431r1             "c2tnb431r1"
-#define NID_X9_62_c2tnb431r1            703
-#define OBJ_X9_62_c2tnb431r1            OBJ_X9_62_c_TwoCurve,20L
-
-#define OBJ_X9_62_primeCurve            OBJ_X9_62_ellipticCurve,1L
-
-#define SN_X9_62_prime192v1             "prime192v1"
-#define NID_X9_62_prime192v1            409
-#define OBJ_X9_62_prime192v1            OBJ_X9_62_primeCurve,1L
-
-#define SN_X9_62_prime192v2             "prime192v2"
-#define NID_X9_62_prime192v2            410
-#define OBJ_X9_62_prime192v2            OBJ_X9_62_primeCurve,2L
-
-#define SN_X9_62_prime192v3             "prime192v3"
-#define NID_X9_62_prime192v3            411
-#define OBJ_X9_62_prime192v3            OBJ_X9_62_primeCurve,3L
-
-#define SN_X9_62_prime239v1             "prime239v1"
-#define NID_X9_62_prime239v1            412
-#define OBJ_X9_62_prime239v1            OBJ_X9_62_primeCurve,4L
-
-#define SN_X9_62_prime239v2             "prime239v2"
-#define NID_X9_62_prime239v2            413
-#define OBJ_X9_62_prime239v2            OBJ_X9_62_primeCurve,5L
-
-#define SN_X9_62_prime239v3             "prime239v3"
-#define NID_X9_62_prime239v3            414
-#define OBJ_X9_62_prime239v3            OBJ_X9_62_primeCurve,6L
-
-#define SN_X9_62_prime256v1             "prime256v1"
-#define NID_X9_62_prime256v1            415
-#define OBJ_X9_62_prime256v1            OBJ_X9_62_primeCurve,7L
-
-#define OBJ_X9_62_id_ecSigType          OBJ_ansi_X9_62,4L
-
-#define SN_ecdsa_with_SHA1              "ecdsa-with-SHA1"
-#define NID_ecdsa_with_SHA1             416
-#define OBJ_ecdsa_with_SHA1             OBJ_X9_62_id_ecSigType,1L
-
-#define SN_ecdsa_with_Recommended               "ecdsa-with-Recommended"
-#define NID_ecdsa_with_Recommended              791
-#define OBJ_ecdsa_with_Recommended              OBJ_X9_62_id_ecSigType,2L
-
-#define SN_ecdsa_with_Specified         "ecdsa-with-Specified"
-#define NID_ecdsa_with_Specified                792
-#define OBJ_ecdsa_with_Specified                OBJ_X9_62_id_ecSigType,3L
-
-#define SN_ecdsa_with_SHA224            "ecdsa-with-SHA224"
-#define NID_ecdsa_with_SHA224           793
-#define OBJ_ecdsa_with_SHA224           OBJ_ecdsa_with_Specified,1L
-
-#define SN_ecdsa_with_SHA256            "ecdsa-with-SHA256"
-#define NID_ecdsa_with_SHA256           794
-#define OBJ_ecdsa_with_SHA256           OBJ_ecdsa_with_Specified,2L
-
-#define SN_ecdsa_with_SHA384            "ecdsa-with-SHA384"
-#define NID_ecdsa_with_SHA384           795
-#define OBJ_ecdsa_with_SHA384           OBJ_ecdsa_with_Specified,3L
-
-#define SN_ecdsa_with_SHA512            "ecdsa-with-SHA512"
-#define NID_ecdsa_with_SHA512           796
-#define OBJ_ecdsa_with_SHA512           OBJ_ecdsa_with_Specified,4L
-
-#define OBJ_secg_ellipticCurve          OBJ_certicom_arc,0L
-
-#define SN_secp112r1            "secp112r1"
-#define NID_secp112r1           704
-#define OBJ_secp112r1           OBJ_secg_ellipticCurve,6L
-
-#define SN_secp112r2            "secp112r2"
-#define NID_secp112r2           705
-#define OBJ_secp112r2           OBJ_secg_ellipticCurve,7L
-
-#define SN_secp128r1            "secp128r1"
-#define NID_secp128r1           706
-#define OBJ_secp128r1           OBJ_secg_ellipticCurve,28L
-
-#define SN_secp128r2            "secp128r2"
-#define NID_secp128r2           707
-#define OBJ_secp128r2           OBJ_secg_ellipticCurve,29L
-
-#define SN_secp160k1            "secp160k1"
-#define NID_secp160k1           708
-#define OBJ_secp160k1           OBJ_secg_ellipticCurve,9L
-
-#define SN_secp160r1            "secp160r1"
-#define NID_secp160r1           709
-#define OBJ_secp160r1           OBJ_secg_ellipticCurve,8L
-
-#define SN_secp160r2            "secp160r2"
-#define NID_secp160r2           710
-#define OBJ_secp160r2           OBJ_secg_ellipticCurve,30L
-
-#define SN_secp192k1            "secp192k1"
-#define NID_secp192k1           711
-#define OBJ_secp192k1           OBJ_secg_ellipticCurve,31L
-
-#define SN_secp224k1            "secp224k1"
-#define NID_secp224k1           712
-#define OBJ_secp224k1           OBJ_secg_ellipticCurve,32L
-
-#define SN_secp224r1            "secp224r1"
-#define NID_secp224r1           713
-#define OBJ_secp224r1           OBJ_secg_ellipticCurve,33L
-
-#define SN_secp256k1            "secp256k1"
-#define NID_secp256k1           714
-#define OBJ_secp256k1           OBJ_secg_ellipticCurve,10L
-
-#define SN_secp384r1            "secp384r1"
-#define NID_secp384r1           715
-#define OBJ_secp384r1           OBJ_secg_ellipticCurve,34L
-
-#define SN_secp521r1            "secp521r1"
-#define NID_secp521r1           716
-#define OBJ_secp521r1           OBJ_secg_ellipticCurve,35L
-
-#define SN_sect113r1            "sect113r1"
-#define NID_sect113r1           717
-#define OBJ_sect113r1           OBJ_secg_ellipticCurve,4L
-
-#define SN_sect113r2            "sect113r2"
-#define NID_sect113r2           718
-#define OBJ_sect113r2           OBJ_secg_ellipticCurve,5L
-
-#define SN_sect131r1            "sect131r1"
-#define NID_sect131r1           719
-#define OBJ_sect131r1           OBJ_secg_ellipticCurve,22L
-
-#define SN_sect131r2            "sect131r2"
-#define NID_sect131r2           720
-#define OBJ_sect131r2           OBJ_secg_ellipticCurve,23L
-
-#define SN_sect163k1            "sect163k1"
-#define NID_sect163k1           721
-#define OBJ_sect163k1           OBJ_secg_ellipticCurve,1L
-
-#define SN_sect163r1            "sect163r1"
-#define NID_sect163r1           722
-#define OBJ_sect163r1           OBJ_secg_ellipticCurve,2L
-
-#define SN_sect163r2            "sect163r2"
-#define NID_sect163r2           723
-#define OBJ_sect163r2           OBJ_secg_ellipticCurve,15L
-
-#define SN_sect193r1            "sect193r1"
-#define NID_sect193r1           724
-#define OBJ_sect193r1           OBJ_secg_ellipticCurve,24L
-
-#define SN_sect193r2            "sect193r2"
-#define NID_sect193r2           725
-#define OBJ_sect193r2           OBJ_secg_ellipticCurve,25L
-
-#define SN_sect233k1            "sect233k1"
-#define NID_sect233k1           726
-#define OBJ_sect233k1           OBJ_secg_ellipticCurve,26L
-
-#define SN_sect233r1            "sect233r1"
-#define NID_sect233r1           727
-#define OBJ_sect233r1           OBJ_secg_ellipticCurve,27L
-
-#define SN_sect239k1            "sect239k1"
-#define NID_sect239k1           728
-#define OBJ_sect239k1           OBJ_secg_ellipticCurve,3L
-
-#define SN_sect283k1            "sect283k1"
-#define NID_sect283k1           729
-#define OBJ_sect283k1           OBJ_secg_ellipticCurve,16L
-
-#define SN_sect283r1            "sect283r1"
-#define NID_sect283r1           730
-#define OBJ_sect283r1           OBJ_secg_ellipticCurve,17L
-
-#define SN_sect409k1            "sect409k1"
-#define NID_sect409k1           731
-#define OBJ_sect409k1           OBJ_secg_ellipticCurve,36L
-
-#define SN_sect409r1            "sect409r1"
-#define NID_sect409r1           732
-#define OBJ_sect409r1           OBJ_secg_ellipticCurve,37L
-
-#define SN_sect571k1            "sect571k1"
-#define NID_sect571k1           733
-#define OBJ_sect571k1           OBJ_secg_ellipticCurve,38L
-
-#define SN_sect571r1            "sect571r1"
-#define NID_sect571r1           734
-#define OBJ_sect571r1           OBJ_secg_ellipticCurve,39L
-
-#define OBJ_wap_wsg_idm_ecid            OBJ_wap_wsg,4L
-
-#define SN_wap_wsg_idm_ecid_wtls1               "wap-wsg-idm-ecid-wtls1"
-#define NID_wap_wsg_idm_ecid_wtls1              735
-#define OBJ_wap_wsg_idm_ecid_wtls1              OBJ_wap_wsg_idm_ecid,1L
-
-#define SN_wap_wsg_idm_ecid_wtls3               "wap-wsg-idm-ecid-wtls3"
-#define NID_wap_wsg_idm_ecid_wtls3              736
-#define OBJ_wap_wsg_idm_ecid_wtls3              OBJ_wap_wsg_idm_ecid,3L
-
-#define SN_wap_wsg_idm_ecid_wtls4               "wap-wsg-idm-ecid-wtls4"
-#define NID_wap_wsg_idm_ecid_wtls4              737
-#define OBJ_wap_wsg_idm_ecid_wtls4              OBJ_wap_wsg_idm_ecid,4L
-
-#define SN_wap_wsg_idm_ecid_wtls5               "wap-wsg-idm-ecid-wtls5"
-#define NID_wap_wsg_idm_ecid_wtls5              738
-#define OBJ_wap_wsg_idm_ecid_wtls5              OBJ_wap_wsg_idm_ecid,5L
-
-#define SN_wap_wsg_idm_ecid_wtls6               "wap-wsg-idm-ecid-wtls6"
-#define NID_wap_wsg_idm_ecid_wtls6              739
-#define OBJ_wap_wsg_idm_ecid_wtls6              OBJ_wap_wsg_idm_ecid,6L
-
-#define SN_wap_wsg_idm_ecid_wtls7               "wap-wsg-idm-ecid-wtls7"
-#define NID_wap_wsg_idm_ecid_wtls7              740
-#define OBJ_wap_wsg_idm_ecid_wtls7              OBJ_wap_wsg_idm_ecid,7L
-
-#define SN_wap_wsg_idm_ecid_wtls8               "wap-wsg-idm-ecid-wtls8"
-#define NID_wap_wsg_idm_ecid_wtls8              741
-#define OBJ_wap_wsg_idm_ecid_wtls8              OBJ_wap_wsg_idm_ecid,8L
-
-#define SN_wap_wsg_idm_ecid_wtls9               "wap-wsg-idm-ecid-wtls9"
-#define NID_wap_wsg_idm_ecid_wtls9              742
-#define OBJ_wap_wsg_idm_ecid_wtls9              OBJ_wap_wsg_idm_ecid,9L
-
-#define SN_wap_wsg_idm_ecid_wtls10              "wap-wsg-idm-ecid-wtls10"
-#define NID_wap_wsg_idm_ecid_wtls10             743
-#define OBJ_wap_wsg_idm_ecid_wtls10             OBJ_wap_wsg_idm_ecid,10L
-
-#define SN_wap_wsg_idm_ecid_wtls11              "wap-wsg-idm-ecid-wtls11"
-#define NID_wap_wsg_idm_ecid_wtls11             744
-#define OBJ_wap_wsg_idm_ecid_wtls11             OBJ_wap_wsg_idm_ecid,11L
-
-#define SN_wap_wsg_idm_ecid_wtls12              "wap-wsg-idm-ecid-wtls12"
-#define NID_wap_wsg_idm_ecid_wtls12             745
-#define OBJ_wap_wsg_idm_ecid_wtls12             OBJ_wap_wsg_idm_ecid,12L
-
-#define SN_cast5_cbc            "CAST5-CBC"
-#define LN_cast5_cbc            "cast5-cbc"
-#define NID_cast5_cbc           108
-#define OBJ_cast5_cbc           OBJ_ISO_US,113533L,7L,66L,10L
-
-#define SN_cast5_ecb            "CAST5-ECB"
-#define LN_cast5_ecb            "cast5-ecb"
-#define NID_cast5_ecb           109
-
-#define SN_cast5_cfb64          "CAST5-CFB"
-#define LN_cast5_cfb64          "cast5-cfb"
-#define NID_cast5_cfb64         110
-
-#define SN_cast5_ofb64          "CAST5-OFB"
-#define LN_cast5_ofb64          "cast5-ofb"
-#define NID_cast5_ofb64         111
-
-#define LN_pbeWithMD5AndCast5_CBC               "pbeWithMD5AndCast5CBC"
-#define NID_pbeWithMD5AndCast5_CBC              112
-#define OBJ_pbeWithMD5AndCast5_CBC              OBJ_ISO_US,113533L,7L,66L,12L
-
-#define SN_id_PasswordBasedMAC          "id-PasswordBasedMAC"
-#define LN_id_PasswordBasedMAC          "password based MAC"
-#define NID_id_PasswordBasedMAC         782
-#define OBJ_id_PasswordBasedMAC         OBJ_ISO_US,113533L,7L,66L,13L
-
-#define SN_id_DHBasedMac                "id-DHBasedMac"
-#define LN_id_DHBasedMac                "Diffie-Hellman based MAC"
-#define NID_id_DHBasedMac               783
-#define OBJ_id_DHBasedMac               OBJ_ISO_US,113533L,7L,66L,30L
-
-#define SN_rsadsi               "rsadsi"
-#define LN_rsadsi               "RSA Data Security, Inc."
-#define NID_rsadsi              1
-#define OBJ_rsadsi              OBJ_ISO_US,113549L
-
-#define SN_pkcs         "pkcs"
-#define LN_pkcs         "RSA Data Security, Inc. PKCS"
-#define NID_pkcs                2
-#define OBJ_pkcs                OBJ_rsadsi,1L
-
-#define SN_pkcs1                "pkcs1"
-#define NID_pkcs1               186
-#define OBJ_pkcs1               OBJ_pkcs,1L
-
-#define LN_rsaEncryption                "rsaEncryption"
-#define NID_rsaEncryption               6
-#define OBJ_rsaEncryption               OBJ_pkcs1,1L
-
-#define SN_md2WithRSAEncryption         "RSA-MD2"
-#define LN_md2WithRSAEncryption         "md2WithRSAEncryption"
-#define NID_md2WithRSAEncryption                7
-#define OBJ_md2WithRSAEncryption                OBJ_pkcs1,2L
-
-#define SN_md4WithRSAEncryption         "RSA-MD4"
-#define LN_md4WithRSAEncryption         "md4WithRSAEncryption"
-#define NID_md4WithRSAEncryption                396
-#define OBJ_md4WithRSAEncryption                OBJ_pkcs1,3L
-
-#define SN_md5WithRSAEncryption         "RSA-MD5"
-#define LN_md5WithRSAEncryption         "md5WithRSAEncryption"
-#define NID_md5WithRSAEncryption                8
-#define OBJ_md5WithRSAEncryption                OBJ_pkcs1,4L
-
-#define SN_sha1WithRSAEncryption                "RSA-SHA1"
-#define LN_sha1WithRSAEncryption                "sha1WithRSAEncryption"
-#define NID_sha1WithRSAEncryption               65
-#define OBJ_sha1WithRSAEncryption               OBJ_pkcs1,5L
-
-#define SN_rsaesOaep            "RSAES-OAEP"
-#define LN_rsaesOaep            "rsaesOaep"
-#define NID_rsaesOaep           919
-#define OBJ_rsaesOaep           OBJ_pkcs1,7L
-
-#define SN_mgf1         "MGF1"
-#define LN_mgf1         "mgf1"
-#define NID_mgf1                911
-#define OBJ_mgf1                OBJ_pkcs1,8L
-
-#define SN_pSpecified           "PSPECIFIED"
-#define LN_pSpecified           "pSpecified"
-#define NID_pSpecified          935
-#define OBJ_pSpecified          OBJ_pkcs1,9L
-
-#define SN_rsassaPss            "RSASSA-PSS"
-#define LN_rsassaPss            "rsassaPss"
-#define NID_rsassaPss           912
-#define OBJ_rsassaPss           OBJ_pkcs1,10L
-
-#define SN_sha256WithRSAEncryption              "RSA-SHA256"
-#define LN_sha256WithRSAEncryption              "sha256WithRSAEncryption"
-#define NID_sha256WithRSAEncryption             668
-#define OBJ_sha256WithRSAEncryption             OBJ_pkcs1,11L
-
-#define SN_sha384WithRSAEncryption              "RSA-SHA384"
-#define LN_sha384WithRSAEncryption              "sha384WithRSAEncryption"
-#define NID_sha384WithRSAEncryption             669
-#define OBJ_sha384WithRSAEncryption             OBJ_pkcs1,12L
-
-#define SN_sha512WithRSAEncryption              "RSA-SHA512"
-#define LN_sha512WithRSAEncryption              "sha512WithRSAEncryption"
-#define NID_sha512WithRSAEncryption             670
-#define OBJ_sha512WithRSAEncryption             OBJ_pkcs1,13L
-
-#define SN_sha224WithRSAEncryption              "RSA-SHA224"
-#define LN_sha224WithRSAEncryption              "sha224WithRSAEncryption"
-#define NID_sha224WithRSAEncryption             671
-#define OBJ_sha224WithRSAEncryption             OBJ_pkcs1,14L
-
-#define SN_pkcs3                "pkcs3"
-#define NID_pkcs3               27
-#define OBJ_pkcs3               OBJ_pkcs,3L
-
-#define LN_dhKeyAgreement               "dhKeyAgreement"
-#define NID_dhKeyAgreement              28
-#define OBJ_dhKeyAgreement              OBJ_pkcs3,1L
-
-#define SN_pkcs5                "pkcs5"
-#define NID_pkcs5               187
-#define OBJ_pkcs5               OBJ_pkcs,5L
-
-#define SN_pbeWithMD2AndDES_CBC         "PBE-MD2-DES"
-#define LN_pbeWithMD2AndDES_CBC         "pbeWithMD2AndDES-CBC"
-#define NID_pbeWithMD2AndDES_CBC                9
-#define OBJ_pbeWithMD2AndDES_CBC                OBJ_pkcs5,1L
-
-#define SN_pbeWithMD5AndDES_CBC         "PBE-MD5-DES"
-#define LN_pbeWithMD5AndDES_CBC         "pbeWithMD5AndDES-CBC"
-#define NID_pbeWithMD5AndDES_CBC                10
-#define OBJ_pbeWithMD5AndDES_CBC                OBJ_pkcs5,3L
-
-#define SN_pbeWithMD2AndRC2_CBC         "PBE-MD2-RC2-64"
-#define LN_pbeWithMD2AndRC2_CBC         "pbeWithMD2AndRC2-CBC"
-#define NID_pbeWithMD2AndRC2_CBC                168
-#define OBJ_pbeWithMD2AndRC2_CBC                OBJ_pkcs5,4L
-
-#define SN_pbeWithMD5AndRC2_CBC         "PBE-MD5-RC2-64"
-#define LN_pbeWithMD5AndRC2_CBC         "pbeWithMD5AndRC2-CBC"
-#define NID_pbeWithMD5AndRC2_CBC                169
-#define OBJ_pbeWithMD5AndRC2_CBC                OBJ_pkcs5,6L
-
-#define SN_pbeWithSHA1AndDES_CBC                "PBE-SHA1-DES"
-#define LN_pbeWithSHA1AndDES_CBC                "pbeWithSHA1AndDES-CBC"
-#define NID_pbeWithSHA1AndDES_CBC               170
-#define OBJ_pbeWithSHA1AndDES_CBC               OBJ_pkcs5,10L
-
-#define SN_pbeWithSHA1AndRC2_CBC                "PBE-SHA1-RC2-64"
-#define LN_pbeWithSHA1AndRC2_CBC                "pbeWithSHA1AndRC2-CBC"
-#define NID_pbeWithSHA1AndRC2_CBC               68
-#define OBJ_pbeWithSHA1AndRC2_CBC               OBJ_pkcs5,11L
-
-#define LN_id_pbkdf2            "PBKDF2"
-#define NID_id_pbkdf2           69
-#define OBJ_id_pbkdf2           OBJ_pkcs5,12L
-
-#define LN_pbes2                "PBES2"
-#define NID_pbes2               161
-#define OBJ_pbes2               OBJ_pkcs5,13L
-
-#define LN_pbmac1               "PBMAC1"
-#define NID_pbmac1              162
-#define OBJ_pbmac1              OBJ_pkcs5,14L
-
-#define SN_pkcs7                "pkcs7"
-#define NID_pkcs7               20
-#define OBJ_pkcs7               OBJ_pkcs,7L
-
-#define LN_pkcs7_data           "pkcs7-data"
-#define NID_pkcs7_data          21
-#define OBJ_pkcs7_data          OBJ_pkcs7,1L
-
-#define LN_pkcs7_signed         "pkcs7-signedData"
-#define NID_pkcs7_signed                22
-#define OBJ_pkcs7_signed                OBJ_pkcs7,2L
-
-#define LN_pkcs7_enveloped              "pkcs7-envelopedData"
-#define NID_pkcs7_enveloped             23
-#define OBJ_pkcs7_enveloped             OBJ_pkcs7,3L
-
-#define LN_pkcs7_signedAndEnveloped             "pkcs7-signedAndEnvelopedData"
-#define NID_pkcs7_signedAndEnveloped            24
-#define OBJ_pkcs7_signedAndEnveloped            OBJ_pkcs7,4L
-
-#define LN_pkcs7_digest         "pkcs7-digestData"
-#define NID_pkcs7_digest                25
-#define OBJ_pkcs7_digest                OBJ_pkcs7,5L
-
-#define LN_pkcs7_encrypted              "pkcs7-encryptedData"
-#define NID_pkcs7_encrypted             26
-#define OBJ_pkcs7_encrypted             OBJ_pkcs7,6L
-
-#define SN_pkcs9                "pkcs9"
-#define NID_pkcs9               47
-#define OBJ_pkcs9               OBJ_pkcs,9L
-
-#define LN_pkcs9_emailAddress           "emailAddress"
-#define NID_pkcs9_emailAddress          48
-#define OBJ_pkcs9_emailAddress          OBJ_pkcs9,1L
-
-#define LN_pkcs9_unstructuredName               "unstructuredName"
-#define NID_pkcs9_unstructuredName              49
-#define OBJ_pkcs9_unstructuredName              OBJ_pkcs9,2L
-
-#define LN_pkcs9_contentType            "contentType"
-#define NID_pkcs9_contentType           50
-#define OBJ_pkcs9_contentType           OBJ_pkcs9,3L
-
-#define LN_pkcs9_messageDigest          "messageDigest"
-#define NID_pkcs9_messageDigest         51
-#define OBJ_pkcs9_messageDigest         OBJ_pkcs9,4L
-
-#define LN_pkcs9_signingTime            "signingTime"
-#define NID_pkcs9_signingTime           52
-#define OBJ_pkcs9_signingTime           OBJ_pkcs9,5L
-
-#define LN_pkcs9_countersignature               "countersignature"
-#define NID_pkcs9_countersignature              53
-#define OBJ_pkcs9_countersignature              OBJ_pkcs9,6L
-
-#define LN_pkcs9_challengePassword              "challengePassword"
-#define NID_pkcs9_challengePassword             54
-#define OBJ_pkcs9_challengePassword             OBJ_pkcs9,7L
-
-#define LN_pkcs9_unstructuredAddress            "unstructuredAddress"
-#define NID_pkcs9_unstructuredAddress           55
-#define OBJ_pkcs9_unstructuredAddress           OBJ_pkcs9,8L
-
-#define LN_pkcs9_extCertAttributes              "extendedCertificateAttributes"
-#define NID_pkcs9_extCertAttributes             56
-#define OBJ_pkcs9_extCertAttributes             OBJ_pkcs9,9L
-
-#define SN_ext_req              "extReq"
-#define LN_ext_req              "Extension Request"
-#define NID_ext_req             172
-#define OBJ_ext_req             OBJ_pkcs9,14L
-
-#define SN_SMIMECapabilities            "SMIME-CAPS"
-#define LN_SMIMECapabilities            "S/MIME Capabilities"
-#define NID_SMIMECapabilities           167
-#define OBJ_SMIMECapabilities           OBJ_pkcs9,15L
-
-#define SN_SMIME                "SMIME"
-#define LN_SMIME                "S/MIME"
-#define NID_SMIME               188
-#define OBJ_SMIME               OBJ_pkcs9,16L
-
-#define SN_id_smime_mod         "id-smime-mod"
-#define NID_id_smime_mod                189
-#define OBJ_id_smime_mod                OBJ_SMIME,0L
-
-#define SN_id_smime_ct          "id-smime-ct"
-#define NID_id_smime_ct         190
-#define OBJ_id_smime_ct         OBJ_SMIME,1L
-
-#define SN_id_smime_aa          "id-smime-aa"
-#define NID_id_smime_aa         191
-#define OBJ_id_smime_aa         OBJ_SMIME,2L
-
-#define SN_id_smime_alg         "id-smime-alg"
-#define NID_id_smime_alg                192
-#define OBJ_id_smime_alg                OBJ_SMIME,3L
-
-#define SN_id_smime_cd          "id-smime-cd"
-#define NID_id_smime_cd         193
-#define OBJ_id_smime_cd         OBJ_SMIME,4L
-
-#define SN_id_smime_spq         "id-smime-spq"
-#define NID_id_smime_spq                194
-#define OBJ_id_smime_spq                OBJ_SMIME,5L
-
-#define SN_id_smime_cti         "id-smime-cti"
-#define NID_id_smime_cti                195
-#define OBJ_id_smime_cti                OBJ_SMIME,6L
-
-#define SN_id_smime_mod_cms             "id-smime-mod-cms"
-#define NID_id_smime_mod_cms            196
-#define OBJ_id_smime_mod_cms            OBJ_id_smime_mod,1L
-
-#define SN_id_smime_mod_ess             "id-smime-mod-ess"
-#define NID_id_smime_mod_ess            197
-#define OBJ_id_smime_mod_ess            OBJ_id_smime_mod,2L
-
-#define SN_id_smime_mod_oid             "id-smime-mod-oid"
-#define NID_id_smime_mod_oid            198
-#define OBJ_id_smime_mod_oid            OBJ_id_smime_mod,3L
-
-#define SN_id_smime_mod_msg_v3          "id-smime-mod-msg-v3"
-#define NID_id_smime_mod_msg_v3         199
-#define OBJ_id_smime_mod_msg_v3         OBJ_id_smime_mod,4L
-
-#define SN_id_smime_mod_ets_eSignature_88               "id-smime-mod-ets-eSignature-88"
-#define NID_id_smime_mod_ets_eSignature_88              200
-#define OBJ_id_smime_mod_ets_eSignature_88              OBJ_id_smime_mod,5L
-
-#define SN_id_smime_mod_ets_eSignature_97               "id-smime-mod-ets-eSignature-97"
-#define NID_id_smime_mod_ets_eSignature_97              201
-#define OBJ_id_smime_mod_ets_eSignature_97              OBJ_id_smime_mod,6L
-
-#define SN_id_smime_mod_ets_eSigPolicy_88               "id-smime-mod-ets-eSigPolicy-88"
-#define NID_id_smime_mod_ets_eSigPolicy_88              202
-#define OBJ_id_smime_mod_ets_eSigPolicy_88              OBJ_id_smime_mod,7L
-
-#define SN_id_smime_mod_ets_eSigPolicy_97               "id-smime-mod-ets-eSigPolicy-97"
-#define NID_id_smime_mod_ets_eSigPolicy_97              203
-#define OBJ_id_smime_mod_ets_eSigPolicy_97              OBJ_id_smime_mod,8L
-
-#define SN_id_smime_ct_receipt          "id-smime-ct-receipt"
-#define NID_id_smime_ct_receipt         204
-#define OBJ_id_smime_ct_receipt         OBJ_id_smime_ct,1L
-
-#define SN_id_smime_ct_authData         "id-smime-ct-authData"
-#define NID_id_smime_ct_authData                205
-#define OBJ_id_smime_ct_authData                OBJ_id_smime_ct,2L
-
-#define SN_id_smime_ct_publishCert              "id-smime-ct-publishCert"
-#define NID_id_smime_ct_publishCert             206
-#define OBJ_id_smime_ct_publishCert             OBJ_id_smime_ct,3L
-
-#define SN_id_smime_ct_TSTInfo          "id-smime-ct-TSTInfo"
-#define NID_id_smime_ct_TSTInfo         207
-#define OBJ_id_smime_ct_TSTInfo         OBJ_id_smime_ct,4L
-
-#define SN_id_smime_ct_TDTInfo          "id-smime-ct-TDTInfo"
-#define NID_id_smime_ct_TDTInfo         208
-#define OBJ_id_smime_ct_TDTInfo         OBJ_id_smime_ct,5L
-
-#define SN_id_smime_ct_contentInfo              "id-smime-ct-contentInfo"
-#define NID_id_smime_ct_contentInfo             209
-#define OBJ_id_smime_ct_contentInfo             OBJ_id_smime_ct,6L
-
-#define SN_id_smime_ct_DVCSRequestData          "id-smime-ct-DVCSRequestData"
-#define NID_id_smime_ct_DVCSRequestData         210
-#define OBJ_id_smime_ct_DVCSRequestData         OBJ_id_smime_ct,7L
-
-#define SN_id_smime_ct_DVCSResponseData         "id-smime-ct-DVCSResponseData"
-#define NID_id_smime_ct_DVCSResponseData                211
-#define OBJ_id_smime_ct_DVCSResponseData                OBJ_id_smime_ct,8L
-
-#define SN_id_smime_ct_compressedData           "id-smime-ct-compressedData"
-#define NID_id_smime_ct_compressedData          786
-#define OBJ_id_smime_ct_compressedData          OBJ_id_smime_ct,9L
-
-#define SN_id_ct_asciiTextWithCRLF              "id-ct-asciiTextWithCRLF"
-#define NID_id_ct_asciiTextWithCRLF             787
-#define OBJ_id_ct_asciiTextWithCRLF             OBJ_id_smime_ct,27L
-
-#define SN_id_smime_aa_receiptRequest           "id-smime-aa-receiptRequest"
-#define NID_id_smime_aa_receiptRequest          212
-#define OBJ_id_smime_aa_receiptRequest          OBJ_id_smime_aa,1L
-
-#define SN_id_smime_aa_securityLabel            "id-smime-aa-securityLabel"
-#define NID_id_smime_aa_securityLabel           213
-#define OBJ_id_smime_aa_securityLabel           OBJ_id_smime_aa,2L
-
-#define SN_id_smime_aa_mlExpandHistory          "id-smime-aa-mlExpandHistory"
-#define NID_id_smime_aa_mlExpandHistory         214
-#define OBJ_id_smime_aa_mlExpandHistory         OBJ_id_smime_aa,3L
-
-#define SN_id_smime_aa_contentHint              "id-smime-aa-contentHint"
-#define NID_id_smime_aa_contentHint             215
-#define OBJ_id_smime_aa_contentHint             OBJ_id_smime_aa,4L
-
-#define SN_id_smime_aa_msgSigDigest             "id-smime-aa-msgSigDigest"
-#define NID_id_smime_aa_msgSigDigest            216
-#define OBJ_id_smime_aa_msgSigDigest            OBJ_id_smime_aa,5L
-
-#define SN_id_smime_aa_encapContentType         "id-smime-aa-encapContentType"
-#define NID_id_smime_aa_encapContentType                217
-#define OBJ_id_smime_aa_encapContentType                OBJ_id_smime_aa,6L
-
-#define SN_id_smime_aa_contentIdentifier                "id-smime-aa-contentIdentifier"
-#define NID_id_smime_aa_contentIdentifier               218
-#define OBJ_id_smime_aa_contentIdentifier               OBJ_id_smime_aa,7L
-
-#define SN_id_smime_aa_macValue         "id-smime-aa-macValue"
-#define NID_id_smime_aa_macValue                219
-#define OBJ_id_smime_aa_macValue                OBJ_id_smime_aa,8L
-
-#define SN_id_smime_aa_equivalentLabels         "id-smime-aa-equivalentLabels"
-#define NID_id_smime_aa_equivalentLabels                220
-#define OBJ_id_smime_aa_equivalentLabels                OBJ_id_smime_aa,9L
-
-#define SN_id_smime_aa_contentReference         "id-smime-aa-contentReference"
-#define NID_id_smime_aa_contentReference                221
-#define OBJ_id_smime_aa_contentReference                OBJ_id_smime_aa,10L
-
-#define SN_id_smime_aa_encrypKeyPref            "id-smime-aa-encrypKeyPref"
-#define NID_id_smime_aa_encrypKeyPref           222
-#define OBJ_id_smime_aa_encrypKeyPref           OBJ_id_smime_aa,11L
-
-#define SN_id_smime_aa_signingCertificate               "id-smime-aa-signingCertificate"
-#define NID_id_smime_aa_signingCertificate              223
-#define OBJ_id_smime_aa_signingCertificate              OBJ_id_smime_aa,12L
-
-#define SN_id_smime_aa_smimeEncryptCerts                "id-smime-aa-smimeEncryptCerts"
-#define NID_id_smime_aa_smimeEncryptCerts               224
-#define OBJ_id_smime_aa_smimeEncryptCerts               OBJ_id_smime_aa,13L
-
-#define SN_id_smime_aa_timeStampToken           "id-smime-aa-timeStampToken"
-#define NID_id_smime_aa_timeStampToken          225
-#define OBJ_id_smime_aa_timeStampToken          OBJ_id_smime_aa,14L
-
-#define SN_id_smime_aa_ets_sigPolicyId          "id-smime-aa-ets-sigPolicyId"
-#define NID_id_smime_aa_ets_sigPolicyId         226
-#define OBJ_id_smime_aa_ets_sigPolicyId         OBJ_id_smime_aa,15L
-
-#define SN_id_smime_aa_ets_commitmentType               "id-smime-aa-ets-commitmentType"
-#define NID_id_smime_aa_ets_commitmentType              227
-#define OBJ_id_smime_aa_ets_commitmentType              OBJ_id_smime_aa,16L
-
-#define SN_id_smime_aa_ets_signerLocation               "id-smime-aa-ets-signerLocation"
-#define NID_id_smime_aa_ets_signerLocation              228
-#define OBJ_id_smime_aa_ets_signerLocation              OBJ_id_smime_aa,17L
-
-#define SN_id_smime_aa_ets_signerAttr           "id-smime-aa-ets-signerAttr"
-#define NID_id_smime_aa_ets_signerAttr          229
-#define OBJ_id_smime_aa_ets_signerAttr          OBJ_id_smime_aa,18L
-
-#define SN_id_smime_aa_ets_otherSigCert         "id-smime-aa-ets-otherSigCert"
-#define NID_id_smime_aa_ets_otherSigCert                230
-#define OBJ_id_smime_aa_ets_otherSigCert                OBJ_id_smime_aa,19L
-
-#define SN_id_smime_aa_ets_contentTimestamp             "id-smime-aa-ets-contentTimestamp"
-#define NID_id_smime_aa_ets_contentTimestamp            231
-#define OBJ_id_smime_aa_ets_contentTimestamp            OBJ_id_smime_aa,20L
-
-#define SN_id_smime_aa_ets_CertificateRefs              "id-smime-aa-ets-CertificateRefs"
-#define NID_id_smime_aa_ets_CertificateRefs             232
-#define OBJ_id_smime_aa_ets_CertificateRefs             OBJ_id_smime_aa,21L
-
-#define SN_id_smime_aa_ets_RevocationRefs               "id-smime-aa-ets-RevocationRefs"
-#define NID_id_smime_aa_ets_RevocationRefs              233
-#define OBJ_id_smime_aa_ets_RevocationRefs              OBJ_id_smime_aa,22L
-
-#define SN_id_smime_aa_ets_certValues           "id-smime-aa-ets-certValues"
-#define NID_id_smime_aa_ets_certValues          234
-#define OBJ_id_smime_aa_ets_certValues          OBJ_id_smime_aa,23L
-
-#define SN_id_smime_aa_ets_revocationValues             "id-smime-aa-ets-revocationValues"
-#define NID_id_smime_aa_ets_revocationValues            235
-#define OBJ_id_smime_aa_ets_revocationValues            OBJ_id_smime_aa,24L
-
-#define SN_id_smime_aa_ets_escTimeStamp         "id-smime-aa-ets-escTimeStamp"
-#define NID_id_smime_aa_ets_escTimeStamp                236
-#define OBJ_id_smime_aa_ets_escTimeStamp                OBJ_id_smime_aa,25L
-
-#define SN_id_smime_aa_ets_certCRLTimestamp             "id-smime-aa-ets-certCRLTimestamp"
-#define NID_id_smime_aa_ets_certCRLTimestamp            237
-#define OBJ_id_smime_aa_ets_certCRLTimestamp            OBJ_id_smime_aa,26L
-
-#define SN_id_smime_aa_ets_archiveTimeStamp             "id-smime-aa-ets-archiveTimeStamp"
-#define NID_id_smime_aa_ets_archiveTimeStamp            238
-#define OBJ_id_smime_aa_ets_archiveTimeStamp            OBJ_id_smime_aa,27L
-
-#define SN_id_smime_aa_signatureType            "id-smime-aa-signatureType"
-#define NID_id_smime_aa_signatureType           239
-#define OBJ_id_smime_aa_signatureType           OBJ_id_smime_aa,28L
-
-#define SN_id_smime_aa_dvcs_dvc         "id-smime-aa-dvcs-dvc"
-#define NID_id_smime_aa_dvcs_dvc                240
-#define OBJ_id_smime_aa_dvcs_dvc                OBJ_id_smime_aa,29L
-
-#define SN_id_smime_alg_ESDHwith3DES            "id-smime-alg-ESDHwith3DES"
-#define NID_id_smime_alg_ESDHwith3DES           241
-#define OBJ_id_smime_alg_ESDHwith3DES           OBJ_id_smime_alg,1L
-
-#define SN_id_smime_alg_ESDHwithRC2             "id-smime-alg-ESDHwithRC2"
-#define NID_id_smime_alg_ESDHwithRC2            242
-#define OBJ_id_smime_alg_ESDHwithRC2            OBJ_id_smime_alg,2L
-
-#define SN_id_smime_alg_3DESwrap                "id-smime-alg-3DESwrap"
-#define NID_id_smime_alg_3DESwrap               243
-#define OBJ_id_smime_alg_3DESwrap               OBJ_id_smime_alg,3L
-
-#define SN_id_smime_alg_RC2wrap         "id-smime-alg-RC2wrap"
-#define NID_id_smime_alg_RC2wrap                244
-#define OBJ_id_smime_alg_RC2wrap                OBJ_id_smime_alg,4L
-
-#define SN_id_smime_alg_ESDH            "id-smime-alg-ESDH"
-#define NID_id_smime_alg_ESDH           245
-#define OBJ_id_smime_alg_ESDH           OBJ_id_smime_alg,5L
-
-#define SN_id_smime_alg_CMS3DESwrap             "id-smime-alg-CMS3DESwrap"
-#define NID_id_smime_alg_CMS3DESwrap            246
-#define OBJ_id_smime_alg_CMS3DESwrap            OBJ_id_smime_alg,6L
-
-#define SN_id_smime_alg_CMSRC2wrap              "id-smime-alg-CMSRC2wrap"
-#define NID_id_smime_alg_CMSRC2wrap             247
-#define OBJ_id_smime_alg_CMSRC2wrap             OBJ_id_smime_alg,7L
-
-#define SN_id_alg_PWRI_KEK              "id-alg-PWRI-KEK"
-#define NID_id_alg_PWRI_KEK             893
-#define OBJ_id_alg_PWRI_KEK             OBJ_id_smime_alg,9L
-
-#define SN_id_smime_cd_ldap             "id-smime-cd-ldap"
-#define NID_id_smime_cd_ldap            248
-#define OBJ_id_smime_cd_ldap            OBJ_id_smime_cd,1L
-
-#define SN_id_smime_spq_ets_sqt_uri             "id-smime-spq-ets-sqt-uri"
-#define NID_id_smime_spq_ets_sqt_uri            249
-#define OBJ_id_smime_spq_ets_sqt_uri            OBJ_id_smime_spq,1L
-
-#define SN_id_smime_spq_ets_sqt_unotice         "id-smime-spq-ets-sqt-unotice"
-#define NID_id_smime_spq_ets_sqt_unotice                250
-#define OBJ_id_smime_spq_ets_sqt_unotice                OBJ_id_smime_spq,2L
-
-#define SN_id_smime_cti_ets_proofOfOrigin               "id-smime-cti-ets-proofOfOrigin"
-#define NID_id_smime_cti_ets_proofOfOrigin              251
-#define OBJ_id_smime_cti_ets_proofOfOrigin              OBJ_id_smime_cti,1L
-
-#define SN_id_smime_cti_ets_proofOfReceipt              "id-smime-cti-ets-proofOfReceipt"
-#define NID_id_smime_cti_ets_proofOfReceipt             252
-#define OBJ_id_smime_cti_ets_proofOfReceipt             OBJ_id_smime_cti,2L
-
-#define SN_id_smime_cti_ets_proofOfDelivery             "id-smime-cti-ets-proofOfDelivery"
-#define NID_id_smime_cti_ets_proofOfDelivery            253
-#define OBJ_id_smime_cti_ets_proofOfDelivery            OBJ_id_smime_cti,3L
-
-#define SN_id_smime_cti_ets_proofOfSender               "id-smime-cti-ets-proofOfSender"
-#define NID_id_smime_cti_ets_proofOfSender              254
-#define OBJ_id_smime_cti_ets_proofOfSender              OBJ_id_smime_cti,4L
-
-#define SN_id_smime_cti_ets_proofOfApproval             "id-smime-cti-ets-proofOfApproval"
-#define NID_id_smime_cti_ets_proofOfApproval            255
-#define OBJ_id_smime_cti_ets_proofOfApproval            OBJ_id_smime_cti,5L
-
-#define SN_id_smime_cti_ets_proofOfCreation             "id-smime-cti-ets-proofOfCreation"
-#define NID_id_smime_cti_ets_proofOfCreation            256
-#define OBJ_id_smime_cti_ets_proofOfCreation            OBJ_id_smime_cti,6L
-
-#define LN_friendlyName         "friendlyName"
-#define NID_friendlyName                156
-#define OBJ_friendlyName                OBJ_pkcs9,20L
-
-#define LN_localKeyID           "localKeyID"
-#define NID_localKeyID          157
-#define OBJ_localKeyID          OBJ_pkcs9,21L
-
-#define SN_ms_csp_name          "CSPName"
-#define LN_ms_csp_name          "Microsoft CSP Name"
-#define NID_ms_csp_name         417
-#define OBJ_ms_csp_name         1L,3L,6L,1L,4L,1L,311L,17L,1L
-
-#define SN_LocalKeySet          "LocalKeySet"
-#define LN_LocalKeySet          "Microsoft Local Key set"
-#define NID_LocalKeySet         856
-#define OBJ_LocalKeySet         1L,3L,6L,1L,4L,1L,311L,17L,2L
-
-#define OBJ_certTypes           OBJ_pkcs9,22L
-
-#define LN_x509Certificate              "x509Certificate"
-#define NID_x509Certificate             158
-#define OBJ_x509Certificate             OBJ_certTypes,1L
-
-#define LN_sdsiCertificate              "sdsiCertificate"
-#define NID_sdsiCertificate             159
-#define OBJ_sdsiCertificate             OBJ_certTypes,2L
-
-#define OBJ_crlTypes            OBJ_pkcs9,23L
-
-#define LN_x509Crl              "x509Crl"
-#define NID_x509Crl             160
-#define OBJ_x509Crl             OBJ_crlTypes,1L
-
-#define OBJ_pkcs12              OBJ_pkcs,12L
-
-#define OBJ_pkcs12_pbeids               OBJ_pkcs12,1L
-
-#define SN_pbe_WithSHA1And128BitRC4             "PBE-SHA1-RC4-128"
-#define LN_pbe_WithSHA1And128BitRC4             "pbeWithSHA1And128BitRC4"
-#define NID_pbe_WithSHA1And128BitRC4            144
-#define OBJ_pbe_WithSHA1And128BitRC4            OBJ_pkcs12_pbeids,1L
-
-#define SN_pbe_WithSHA1And40BitRC4              "PBE-SHA1-RC4-40"
-#define LN_pbe_WithSHA1And40BitRC4              "pbeWithSHA1And40BitRC4"
-#define NID_pbe_WithSHA1And40BitRC4             145
-#define OBJ_pbe_WithSHA1And40BitRC4             OBJ_pkcs12_pbeids,2L
-
-#define SN_pbe_WithSHA1And3_Key_TripleDES_CBC           "PBE-SHA1-3DES"
-#define LN_pbe_WithSHA1And3_Key_TripleDES_CBC           "pbeWithSHA1And3-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And3_Key_TripleDES_CBC          146
-#define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC          OBJ_pkcs12_pbeids,3L
-
-#define SN_pbe_WithSHA1And2_Key_TripleDES_CBC           "PBE-SHA1-2DES"
-#define LN_pbe_WithSHA1And2_Key_TripleDES_CBC           "pbeWithSHA1And2-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And2_Key_TripleDES_CBC          147
-#define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC          OBJ_pkcs12_pbeids,4L
-
-#define SN_pbe_WithSHA1And128BitRC2_CBC         "PBE-SHA1-RC2-128"
-#define LN_pbe_WithSHA1And128BitRC2_CBC         "pbeWithSHA1And128BitRC2-CBC"
-#define NID_pbe_WithSHA1And128BitRC2_CBC                148
-#define OBJ_pbe_WithSHA1And128BitRC2_CBC                OBJ_pkcs12_pbeids,5L
-
-#define SN_pbe_WithSHA1And40BitRC2_CBC          "PBE-SHA1-RC2-40"
-#define LN_pbe_WithSHA1And40BitRC2_CBC          "pbeWithSHA1And40BitRC2-CBC"
-#define NID_pbe_WithSHA1And40BitRC2_CBC         149
-#define OBJ_pbe_WithSHA1And40BitRC2_CBC         OBJ_pkcs12_pbeids,6L
-
-#define OBJ_pkcs12_Version1             OBJ_pkcs12,10L
-
-#define OBJ_pkcs12_BagIds               OBJ_pkcs12_Version1,1L
-
-#define LN_keyBag               "keyBag"
-#define NID_keyBag              150
-#define OBJ_keyBag              OBJ_pkcs12_BagIds,1L
-
-#define LN_pkcs8ShroudedKeyBag          "pkcs8ShroudedKeyBag"
-#define NID_pkcs8ShroudedKeyBag         151
-#define OBJ_pkcs8ShroudedKeyBag         OBJ_pkcs12_BagIds,2L
-
-#define LN_certBag              "certBag"
-#define NID_certBag             152
-#define OBJ_certBag             OBJ_pkcs12_BagIds,3L
-
-#define LN_crlBag               "crlBag"
-#define NID_crlBag              153
-#define OBJ_crlBag              OBJ_pkcs12_BagIds,4L
-
-#define LN_secretBag            "secretBag"
-#define NID_secretBag           154
-#define OBJ_secretBag           OBJ_pkcs12_BagIds,5L
-
-#define LN_safeContentsBag              "safeContentsBag"
-#define NID_safeContentsBag             155
-#define OBJ_safeContentsBag             OBJ_pkcs12_BagIds,6L
-
-#define SN_md2          "MD2"
-#define LN_md2          "md2"
-#define NID_md2         3
-#define OBJ_md2         OBJ_rsadsi,2L,2L
-
-#define SN_md4          "MD4"
-#define LN_md4          "md4"
-#define NID_md4         257
-#define OBJ_md4         OBJ_rsadsi,2L,4L
-
-#define SN_md5          "MD5"
-#define LN_md5          "md5"
-#define NID_md5         4
-#define OBJ_md5         OBJ_rsadsi,2L,5L
-
-#define SN_md5_sha1             "MD5-SHA1"
-#define LN_md5_sha1             "md5-sha1"
-#define NID_md5_sha1            114
-
-#define LN_hmacWithMD5          "hmacWithMD5"
-#define NID_hmacWithMD5         797
-#define OBJ_hmacWithMD5         OBJ_rsadsi,2L,6L
-
-#define LN_hmacWithSHA1         "hmacWithSHA1"
-#define NID_hmacWithSHA1                163
-#define OBJ_hmacWithSHA1                OBJ_rsadsi,2L,7L
-
-#define LN_hmacWithSHA224               "hmacWithSHA224"
-#define NID_hmacWithSHA224              798
-#define OBJ_hmacWithSHA224              OBJ_rsadsi,2L,8L
-
-#define LN_hmacWithSHA256               "hmacWithSHA256"
-#define NID_hmacWithSHA256              799
-#define OBJ_hmacWithSHA256              OBJ_rsadsi,2L,9L
-
-#define LN_hmacWithSHA384               "hmacWithSHA384"
-#define NID_hmacWithSHA384              800
-#define OBJ_hmacWithSHA384              OBJ_rsadsi,2L,10L
-
-#define LN_hmacWithSHA512               "hmacWithSHA512"
-#define NID_hmacWithSHA512              801
-#define OBJ_hmacWithSHA512              OBJ_rsadsi,2L,11L
-
-#define SN_rc2_cbc              "RC2-CBC"
-#define LN_rc2_cbc              "rc2-cbc"
-#define NID_rc2_cbc             37
-#define OBJ_rc2_cbc             OBJ_rsadsi,3L,2L
-
-#define SN_rc2_ecb              "RC2-ECB"
-#define LN_rc2_ecb              "rc2-ecb"
-#define NID_rc2_ecb             38
-
-#define SN_rc2_cfb64            "RC2-CFB"
-#define LN_rc2_cfb64            "rc2-cfb"
-#define NID_rc2_cfb64           39
-
-#define SN_rc2_ofb64            "RC2-OFB"
-#define LN_rc2_ofb64            "rc2-ofb"
-#define NID_rc2_ofb64           40
-
-#define SN_rc2_40_cbc           "RC2-40-CBC"
-#define LN_rc2_40_cbc           "rc2-40-cbc"
-#define NID_rc2_40_cbc          98
-
-#define SN_rc2_64_cbc           "RC2-64-CBC"
-#define LN_rc2_64_cbc           "rc2-64-cbc"
-#define NID_rc2_64_cbc          166
-
-#define SN_rc4          "RC4"
-#define LN_rc4          "rc4"
-#define NID_rc4         5
-#define OBJ_rc4         OBJ_rsadsi,3L,4L
-
-#define SN_rc4_40               "RC4-40"
-#define LN_rc4_40               "rc4-40"
-#define NID_rc4_40              97
-
-#define SN_des_ede3_cbc         "DES-EDE3-CBC"
-#define LN_des_ede3_cbc         "des-ede3-cbc"
-#define NID_des_ede3_cbc                44
-#define OBJ_des_ede3_cbc                OBJ_rsadsi,3L,7L
-
-#define SN_rc5_cbc              "RC5-CBC"
-#define LN_rc5_cbc              "rc5-cbc"
-#define NID_rc5_cbc             120
-#define OBJ_rc5_cbc             OBJ_rsadsi,3L,8L
-
-#define SN_rc5_ecb              "RC5-ECB"
-#define LN_rc5_ecb              "rc5-ecb"
-#define NID_rc5_ecb             121
-
-#define SN_rc5_cfb64            "RC5-CFB"
-#define LN_rc5_cfb64            "rc5-cfb"
-#define NID_rc5_cfb64           122
-
-#define SN_rc5_ofb64            "RC5-OFB"
-#define LN_rc5_ofb64            "rc5-ofb"
-#define NID_rc5_ofb64           123
-
-#define SN_ms_ext_req           "msExtReq"
-#define LN_ms_ext_req           "Microsoft Extension Request"
-#define NID_ms_ext_req          171
-#define OBJ_ms_ext_req          1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
-
-#define SN_ms_code_ind          "msCodeInd"
-#define LN_ms_code_ind          "Microsoft Individual Code Signing"
-#define NID_ms_code_ind         134
-#define OBJ_ms_code_ind         1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
-
-#define SN_ms_code_com          "msCodeCom"
-#define LN_ms_code_com          "Microsoft Commercial Code Signing"
-#define NID_ms_code_com         135
-#define OBJ_ms_code_com         1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
-
-#define SN_ms_ctl_sign          "msCTLSign"
-#define LN_ms_ctl_sign          "Microsoft Trust List Signing"
-#define NID_ms_ctl_sign         136
-#define OBJ_ms_ctl_sign         1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
-
-#define SN_ms_sgc               "msSGC"
-#define LN_ms_sgc               "Microsoft Server Gated Crypto"
-#define NID_ms_sgc              137
-#define OBJ_ms_sgc              1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
-
-#define SN_ms_efs               "msEFS"
-#define LN_ms_efs               "Microsoft Encrypted File System"
-#define NID_ms_efs              138
-#define OBJ_ms_efs              1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
-
-#define SN_ms_smartcard_login           "msSmartcardLogin"
-#define LN_ms_smartcard_login           "Microsoft Smartcardlogin"
-#define NID_ms_smartcard_login          648
-#define OBJ_ms_smartcard_login          1L,3L,6L,1L,4L,1L,311L,20L,2L,2L
-
-#define SN_ms_upn               "msUPN"
-#define LN_ms_upn               "Microsoft Universal Principal Name"
-#define NID_ms_upn              649
-#define OBJ_ms_upn              1L,3L,6L,1L,4L,1L,311L,20L,2L,3L
-
-#define SN_idea_cbc             "IDEA-CBC"
-#define LN_idea_cbc             "idea-cbc"
-#define NID_idea_cbc            34
-#define OBJ_idea_cbc            1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
-
-#define SN_idea_ecb             "IDEA-ECB"
-#define LN_idea_ecb             "idea-ecb"
-#define NID_idea_ecb            36
-
-#define SN_idea_cfb64           "IDEA-CFB"
-#define LN_idea_cfb64           "idea-cfb"
-#define NID_idea_cfb64          35
-
-#define SN_idea_ofb64           "IDEA-OFB"
-#define LN_idea_ofb64           "idea-ofb"
-#define NID_idea_ofb64          46
-
-#define SN_bf_cbc               "BF-CBC"
-#define LN_bf_cbc               "bf-cbc"
-#define NID_bf_cbc              91
-#define OBJ_bf_cbc              1L,3L,6L,1L,4L,1L,3029L,1L,2L
-
-#define SN_bf_ecb               "BF-ECB"
-#define LN_bf_ecb               "bf-ecb"
-#define NID_bf_ecb              92
-
-#define SN_bf_cfb64             "BF-CFB"
-#define LN_bf_cfb64             "bf-cfb"
-#define NID_bf_cfb64            93
-
-#define SN_bf_ofb64             "BF-OFB"
-#define LN_bf_ofb64             "bf-ofb"
-#define NID_bf_ofb64            94
-
-#define SN_id_pkix              "PKIX"
-#define NID_id_pkix             127
-#define OBJ_id_pkix             1L,3L,6L,1L,5L,5L,7L
-
-#define SN_id_pkix_mod          "id-pkix-mod"
-#define NID_id_pkix_mod         258
-#define OBJ_id_pkix_mod         OBJ_id_pkix,0L
-
-#define SN_id_pe                "id-pe"
-#define NID_id_pe               175
-#define OBJ_id_pe               OBJ_id_pkix,1L
-
-#define SN_id_qt                "id-qt"
-#define NID_id_qt               259
-#define OBJ_id_qt               OBJ_id_pkix,2L
-
-#define SN_id_kp                "id-kp"
-#define NID_id_kp               128
-#define OBJ_id_kp               OBJ_id_pkix,3L
-
-#define SN_id_it                "id-it"
-#define NID_id_it               260
-#define OBJ_id_it               OBJ_id_pkix,4L
-
-#define SN_id_pkip              "id-pkip"
-#define NID_id_pkip             261
-#define OBJ_id_pkip             OBJ_id_pkix,5L
-
-#define SN_id_alg               "id-alg"
-#define NID_id_alg              262
-#define OBJ_id_alg              OBJ_id_pkix,6L
-
-#define SN_id_cmc               "id-cmc"
-#define NID_id_cmc              263
-#define OBJ_id_cmc              OBJ_id_pkix,7L
-
-#define SN_id_on                "id-on"
-#define NID_id_on               264
-#define OBJ_id_on               OBJ_id_pkix,8L
-
-#define SN_id_pda               "id-pda"
-#define NID_id_pda              265
-#define OBJ_id_pda              OBJ_id_pkix,9L
-
-#define SN_id_aca               "id-aca"
-#define NID_id_aca              266
-#define OBJ_id_aca              OBJ_id_pkix,10L
-
-#define SN_id_qcs               "id-qcs"
-#define NID_id_qcs              267
-#define OBJ_id_qcs              OBJ_id_pkix,11L
-
-#define SN_id_cct               "id-cct"
-#define NID_id_cct              268
-#define OBJ_id_cct              OBJ_id_pkix,12L
-
-#define SN_id_ppl               "id-ppl"
-#define NID_id_ppl              662
-#define OBJ_id_ppl              OBJ_id_pkix,21L
-
-#define SN_id_ad                "id-ad"
-#define NID_id_ad               176
-#define OBJ_id_ad               OBJ_id_pkix,48L
-
-#define SN_id_pkix1_explicit_88         "id-pkix1-explicit-88"
-#define NID_id_pkix1_explicit_88                269
-#define OBJ_id_pkix1_explicit_88                OBJ_id_pkix_mod,1L
-
-#define SN_id_pkix1_implicit_88         "id-pkix1-implicit-88"
-#define NID_id_pkix1_implicit_88                270
-#define OBJ_id_pkix1_implicit_88                OBJ_id_pkix_mod,2L
-
-#define SN_id_pkix1_explicit_93         "id-pkix1-explicit-93"
-#define NID_id_pkix1_explicit_93                271
-#define OBJ_id_pkix1_explicit_93                OBJ_id_pkix_mod,3L
-
-#define SN_id_pkix1_implicit_93         "id-pkix1-implicit-93"
-#define NID_id_pkix1_implicit_93                272
-#define OBJ_id_pkix1_implicit_93                OBJ_id_pkix_mod,4L
-
-#define SN_id_mod_crmf          "id-mod-crmf"
-#define NID_id_mod_crmf         273
-#define OBJ_id_mod_crmf         OBJ_id_pkix_mod,5L
-
-#define SN_id_mod_cmc           "id-mod-cmc"
-#define NID_id_mod_cmc          274
-#define OBJ_id_mod_cmc          OBJ_id_pkix_mod,6L
-
-#define SN_id_mod_kea_profile_88                "id-mod-kea-profile-88"
-#define NID_id_mod_kea_profile_88               275
-#define OBJ_id_mod_kea_profile_88               OBJ_id_pkix_mod,7L
-
-#define SN_id_mod_kea_profile_93                "id-mod-kea-profile-93"
-#define NID_id_mod_kea_profile_93               276
-#define OBJ_id_mod_kea_profile_93               OBJ_id_pkix_mod,8L
-
-#define SN_id_mod_cmp           "id-mod-cmp"
-#define NID_id_mod_cmp          277
-#define OBJ_id_mod_cmp          OBJ_id_pkix_mod,9L
-
-#define SN_id_mod_qualified_cert_88             "id-mod-qualified-cert-88"
-#define NID_id_mod_qualified_cert_88            278
-#define OBJ_id_mod_qualified_cert_88            OBJ_id_pkix_mod,10L
-
-#define SN_id_mod_qualified_cert_93             "id-mod-qualified-cert-93"
-#define NID_id_mod_qualified_cert_93            279
-#define OBJ_id_mod_qualified_cert_93            OBJ_id_pkix_mod,11L
-
-#define SN_id_mod_attribute_cert                "id-mod-attribute-cert"
-#define NID_id_mod_attribute_cert               280
-#define OBJ_id_mod_attribute_cert               OBJ_id_pkix_mod,12L
-
-#define SN_id_mod_timestamp_protocol            "id-mod-timestamp-protocol"
-#define NID_id_mod_timestamp_protocol           281
-#define OBJ_id_mod_timestamp_protocol           OBJ_id_pkix_mod,13L
-
-#define SN_id_mod_ocsp          "id-mod-ocsp"
-#define NID_id_mod_ocsp         282
-#define OBJ_id_mod_ocsp         OBJ_id_pkix_mod,14L
-
-#define SN_id_mod_dvcs          "id-mod-dvcs"
-#define NID_id_mod_dvcs         283
-#define OBJ_id_mod_dvcs         OBJ_id_pkix_mod,15L
-
-#define SN_id_mod_cmp2000               "id-mod-cmp2000"
-#define NID_id_mod_cmp2000              284
-#define OBJ_id_mod_cmp2000              OBJ_id_pkix_mod,16L
-
-#define SN_info_access          "authorityInfoAccess"
-#define LN_info_access          "Authority Information Access"
-#define NID_info_access         177
-#define OBJ_info_access         OBJ_id_pe,1L
-
-#define SN_biometricInfo                "biometricInfo"
-#define LN_biometricInfo                "Biometric Info"
-#define NID_biometricInfo               285
-#define OBJ_biometricInfo               OBJ_id_pe,2L
-
-#define SN_qcStatements         "qcStatements"
-#define NID_qcStatements                286
-#define OBJ_qcStatements                OBJ_id_pe,3L
-
-#define SN_ac_auditEntity               "ac-auditEntity"
-#define NID_ac_auditEntity              287
-#define OBJ_ac_auditEntity              OBJ_id_pe,4L
-
-#define SN_ac_targeting         "ac-targeting"
-#define NID_ac_targeting                288
-#define OBJ_ac_targeting                OBJ_id_pe,5L
-
-#define SN_aaControls           "aaControls"
-#define NID_aaControls          289
-#define OBJ_aaControls          OBJ_id_pe,6L
-
-#define SN_sbgp_ipAddrBlock             "sbgp-ipAddrBlock"
-#define NID_sbgp_ipAddrBlock            290
-#define OBJ_sbgp_ipAddrBlock            OBJ_id_pe,7L
-
-#define SN_sbgp_autonomousSysNum                "sbgp-autonomousSysNum"
-#define NID_sbgp_autonomousSysNum               291
-#define OBJ_sbgp_autonomousSysNum               OBJ_id_pe,8L
-
-#define SN_sbgp_routerIdentifier                "sbgp-routerIdentifier"
-#define NID_sbgp_routerIdentifier               292
-#define OBJ_sbgp_routerIdentifier               OBJ_id_pe,9L
-
-#define SN_ac_proxying          "ac-proxying"
-#define NID_ac_proxying         397
-#define OBJ_ac_proxying         OBJ_id_pe,10L
-
-#define SN_sinfo_access         "subjectInfoAccess"
-#define LN_sinfo_access         "Subject Information Access"
-#define NID_sinfo_access                398
-#define OBJ_sinfo_access                OBJ_id_pe,11L
-
-#define SN_proxyCertInfo                "proxyCertInfo"
-#define LN_proxyCertInfo                "Proxy Certificate Information"
-#define NID_proxyCertInfo               663
-#define OBJ_proxyCertInfo               OBJ_id_pe,14L
-
-#define SN_id_qt_cps            "id-qt-cps"
-#define LN_id_qt_cps            "Policy Qualifier CPS"
-#define NID_id_qt_cps           164
-#define OBJ_id_qt_cps           OBJ_id_qt,1L
-
-#define SN_id_qt_unotice                "id-qt-unotice"
-#define LN_id_qt_unotice                "Policy Qualifier User Notice"
-#define NID_id_qt_unotice               165
-#define OBJ_id_qt_unotice               OBJ_id_qt,2L
-
-#define SN_textNotice           "textNotice"
-#define NID_textNotice          293
-#define OBJ_textNotice          OBJ_id_qt,3L
-
-#define SN_server_auth          "serverAuth"
-#define LN_server_auth          "TLS Web Server Authentication"
-#define NID_server_auth         129
-#define OBJ_server_auth         OBJ_id_kp,1L
-
-#define SN_client_auth          "clientAuth"
-#define LN_client_auth          "TLS Web Client Authentication"
-#define NID_client_auth         130
-#define OBJ_client_auth         OBJ_id_kp,2L
-
-#define SN_code_sign            "codeSigning"
-#define LN_code_sign            "Code Signing"
-#define NID_code_sign           131
-#define OBJ_code_sign           OBJ_id_kp,3L
-
-#define SN_email_protect                "emailProtection"
-#define LN_email_protect                "E-mail Protection"
-#define NID_email_protect               132
-#define OBJ_email_protect               OBJ_id_kp,4L
-
-#define SN_ipsecEndSystem               "ipsecEndSystem"
-#define LN_ipsecEndSystem               "IPSec End System"
-#define NID_ipsecEndSystem              294
-#define OBJ_ipsecEndSystem              OBJ_id_kp,5L
-
-#define SN_ipsecTunnel          "ipsecTunnel"
-#define LN_ipsecTunnel          "IPSec Tunnel"
-#define NID_ipsecTunnel         295
-#define OBJ_ipsecTunnel         OBJ_id_kp,6L
-
-#define SN_ipsecUser            "ipsecUser"
-#define LN_ipsecUser            "IPSec User"
-#define NID_ipsecUser           296
-#define OBJ_ipsecUser           OBJ_id_kp,7L
-
-#define SN_time_stamp           "timeStamping"
-#define LN_time_stamp           "Time Stamping"
-#define NID_time_stamp          133
-#define OBJ_time_stamp          OBJ_id_kp,8L
-
-#define SN_OCSP_sign            "OCSPSigning"
-#define LN_OCSP_sign            "OCSP Signing"
-#define NID_OCSP_sign           180
-#define OBJ_OCSP_sign           OBJ_id_kp,9L
-
-#define SN_dvcs         "DVCS"
-#define LN_dvcs         "dvcs"
-#define NID_dvcs                297
-#define OBJ_dvcs                OBJ_id_kp,10L
-
-#define SN_id_it_caProtEncCert          "id-it-caProtEncCert"
-#define NID_id_it_caProtEncCert         298
-#define OBJ_id_it_caProtEncCert         OBJ_id_it,1L
-
-#define SN_id_it_signKeyPairTypes               "id-it-signKeyPairTypes"
-#define NID_id_it_signKeyPairTypes              299
-#define OBJ_id_it_signKeyPairTypes              OBJ_id_it,2L
-
-#define SN_id_it_encKeyPairTypes                "id-it-encKeyPairTypes"
-#define NID_id_it_encKeyPairTypes               300
-#define OBJ_id_it_encKeyPairTypes               OBJ_id_it,3L
-
-#define SN_id_it_preferredSymmAlg               "id-it-preferredSymmAlg"
-#define NID_id_it_preferredSymmAlg              301
-#define OBJ_id_it_preferredSymmAlg              OBJ_id_it,4L
-
-#define SN_id_it_caKeyUpdateInfo                "id-it-caKeyUpdateInfo"
-#define NID_id_it_caKeyUpdateInfo               302
-#define OBJ_id_it_caKeyUpdateInfo               OBJ_id_it,5L
-
-#define SN_id_it_currentCRL             "id-it-currentCRL"
-#define NID_id_it_currentCRL            303
-#define OBJ_id_it_currentCRL            OBJ_id_it,6L
-
-#define SN_id_it_unsupportedOIDs                "id-it-unsupportedOIDs"
-#define NID_id_it_unsupportedOIDs               304
-#define OBJ_id_it_unsupportedOIDs               OBJ_id_it,7L
-
-#define SN_id_it_subscriptionRequest            "id-it-subscriptionRequest"
-#define NID_id_it_subscriptionRequest           305
-#define OBJ_id_it_subscriptionRequest           OBJ_id_it,8L
-
-#define SN_id_it_subscriptionResponse           "id-it-subscriptionResponse"
-#define NID_id_it_subscriptionResponse          306
-#define OBJ_id_it_subscriptionResponse          OBJ_id_it,9L
-
-#define SN_id_it_keyPairParamReq                "id-it-keyPairParamReq"
-#define NID_id_it_keyPairParamReq               307
-#define OBJ_id_it_keyPairParamReq               OBJ_id_it,10L
-
-#define SN_id_it_keyPairParamRep                "id-it-keyPairParamRep"
-#define NID_id_it_keyPairParamRep               308
-#define OBJ_id_it_keyPairParamRep               OBJ_id_it,11L
-
-#define SN_id_it_revPassphrase          "id-it-revPassphrase"
-#define NID_id_it_revPassphrase         309
-#define OBJ_id_it_revPassphrase         OBJ_id_it,12L
-
-#define SN_id_it_implicitConfirm                "id-it-implicitConfirm"
-#define NID_id_it_implicitConfirm               310
-#define OBJ_id_it_implicitConfirm               OBJ_id_it,13L
-
-#define SN_id_it_confirmWaitTime                "id-it-confirmWaitTime"
-#define NID_id_it_confirmWaitTime               311
-#define OBJ_id_it_confirmWaitTime               OBJ_id_it,14L
-
-#define SN_id_it_origPKIMessage         "id-it-origPKIMessage"
-#define NID_id_it_origPKIMessage                312
-#define OBJ_id_it_origPKIMessage                OBJ_id_it,15L
-
-#define SN_id_it_suppLangTags           "id-it-suppLangTags"
-#define NID_id_it_suppLangTags          784
-#define OBJ_id_it_suppLangTags          OBJ_id_it,16L
-
-#define SN_id_regCtrl           "id-regCtrl"
-#define NID_id_regCtrl          313
-#define OBJ_id_regCtrl          OBJ_id_pkip,1L
-
-#define SN_id_regInfo           "id-regInfo"
-#define NID_id_regInfo          314
-#define OBJ_id_regInfo          OBJ_id_pkip,2L
-
-#define SN_id_regCtrl_regToken          "id-regCtrl-regToken"
-#define NID_id_regCtrl_regToken         315
-#define OBJ_id_regCtrl_regToken         OBJ_id_regCtrl,1L
-
-#define SN_id_regCtrl_authenticator             "id-regCtrl-authenticator"
-#define NID_id_regCtrl_authenticator            316
-#define OBJ_id_regCtrl_authenticator            OBJ_id_regCtrl,2L
-
-#define SN_id_regCtrl_pkiPublicationInfo                "id-regCtrl-pkiPublicationInfo"
-#define NID_id_regCtrl_pkiPublicationInfo               317
-#define OBJ_id_regCtrl_pkiPublicationInfo               OBJ_id_regCtrl,3L
-
-#define SN_id_regCtrl_pkiArchiveOptions         "id-regCtrl-pkiArchiveOptions"
-#define NID_id_regCtrl_pkiArchiveOptions                318
-#define OBJ_id_regCtrl_pkiArchiveOptions                OBJ_id_regCtrl,4L
-
-#define SN_id_regCtrl_oldCertID         "id-regCtrl-oldCertID"
-#define NID_id_regCtrl_oldCertID                319
-#define OBJ_id_regCtrl_oldCertID                OBJ_id_regCtrl,5L
-
-#define SN_id_regCtrl_protocolEncrKey           "id-regCtrl-protocolEncrKey"
-#define NID_id_regCtrl_protocolEncrKey          320
-#define OBJ_id_regCtrl_protocolEncrKey          OBJ_id_regCtrl,6L
-
-#define SN_id_regInfo_utf8Pairs         "id-regInfo-utf8Pairs"
-#define NID_id_regInfo_utf8Pairs                321
-#define OBJ_id_regInfo_utf8Pairs                OBJ_id_regInfo,1L
-
-#define SN_id_regInfo_certReq           "id-regInfo-certReq"
-#define NID_id_regInfo_certReq          322
-#define OBJ_id_regInfo_certReq          OBJ_id_regInfo,2L
-
-#define SN_id_alg_des40         "id-alg-des40"
-#define NID_id_alg_des40                323
-#define OBJ_id_alg_des40                OBJ_id_alg,1L
-
-#define SN_id_alg_noSignature           "id-alg-noSignature"
-#define NID_id_alg_noSignature          324
-#define OBJ_id_alg_noSignature          OBJ_id_alg,2L
-
-#define SN_id_alg_dh_sig_hmac_sha1              "id-alg-dh-sig-hmac-sha1"
-#define NID_id_alg_dh_sig_hmac_sha1             325
-#define OBJ_id_alg_dh_sig_hmac_sha1             OBJ_id_alg,3L
-
-#define SN_id_alg_dh_pop                "id-alg-dh-pop"
-#define NID_id_alg_dh_pop               326
-#define OBJ_id_alg_dh_pop               OBJ_id_alg,4L
-
-#define SN_id_cmc_statusInfo            "id-cmc-statusInfo"
-#define NID_id_cmc_statusInfo           327
-#define OBJ_id_cmc_statusInfo           OBJ_id_cmc,1L
-
-#define SN_id_cmc_identification                "id-cmc-identification"
-#define NID_id_cmc_identification               328
-#define OBJ_id_cmc_identification               OBJ_id_cmc,2L
-
-#define SN_id_cmc_identityProof         "id-cmc-identityProof"
-#define NID_id_cmc_identityProof                329
-#define OBJ_id_cmc_identityProof                OBJ_id_cmc,3L
-
-#define SN_id_cmc_dataReturn            "id-cmc-dataReturn"
-#define NID_id_cmc_dataReturn           330
-#define OBJ_id_cmc_dataReturn           OBJ_id_cmc,4L
-
-#define SN_id_cmc_transactionId         "id-cmc-transactionId"
-#define NID_id_cmc_transactionId                331
-#define OBJ_id_cmc_transactionId                OBJ_id_cmc,5L
-
-#define SN_id_cmc_senderNonce           "id-cmc-senderNonce"
-#define NID_id_cmc_senderNonce          332
-#define OBJ_id_cmc_senderNonce          OBJ_id_cmc,6L
-
-#define SN_id_cmc_recipientNonce                "id-cmc-recipientNonce"
-#define NID_id_cmc_recipientNonce               333
-#define OBJ_id_cmc_recipientNonce               OBJ_id_cmc,7L
-
-#define SN_id_cmc_addExtensions         "id-cmc-addExtensions"
-#define NID_id_cmc_addExtensions                334
-#define OBJ_id_cmc_addExtensions                OBJ_id_cmc,8L
-
-#define SN_id_cmc_encryptedPOP          "id-cmc-encryptedPOP"
-#define NID_id_cmc_encryptedPOP         335
-#define OBJ_id_cmc_encryptedPOP         OBJ_id_cmc,9L
-
-#define SN_id_cmc_decryptedPOP          "id-cmc-decryptedPOP"
-#define NID_id_cmc_decryptedPOP         336
-#define OBJ_id_cmc_decryptedPOP         OBJ_id_cmc,10L
-
-#define SN_id_cmc_lraPOPWitness         "id-cmc-lraPOPWitness"
-#define NID_id_cmc_lraPOPWitness                337
-#define OBJ_id_cmc_lraPOPWitness                OBJ_id_cmc,11L
-
-#define SN_id_cmc_getCert               "id-cmc-getCert"
-#define NID_id_cmc_getCert              338
-#define OBJ_id_cmc_getCert              OBJ_id_cmc,15L
-
-#define SN_id_cmc_getCRL                "id-cmc-getCRL"
-#define NID_id_cmc_getCRL               339
-#define OBJ_id_cmc_getCRL               OBJ_id_cmc,16L
-
-#define SN_id_cmc_revokeRequest         "id-cmc-revokeRequest"
-#define NID_id_cmc_revokeRequest                340
-#define OBJ_id_cmc_revokeRequest                OBJ_id_cmc,17L
-
-#define SN_id_cmc_regInfo               "id-cmc-regInfo"
-#define NID_id_cmc_regInfo              341
-#define OBJ_id_cmc_regInfo              OBJ_id_cmc,18L
-
-#define SN_id_cmc_responseInfo          "id-cmc-responseInfo"
-#define NID_id_cmc_responseInfo         342
-#define OBJ_id_cmc_responseInfo         OBJ_id_cmc,19L
-
-#define SN_id_cmc_queryPending          "id-cmc-queryPending"
-#define NID_id_cmc_queryPending         343
-#define OBJ_id_cmc_queryPending         OBJ_id_cmc,21L
-
-#define SN_id_cmc_popLinkRandom         "id-cmc-popLinkRandom"
-#define NID_id_cmc_popLinkRandom                344
-#define OBJ_id_cmc_popLinkRandom                OBJ_id_cmc,22L
-
-#define SN_id_cmc_popLinkWitness                "id-cmc-popLinkWitness"
-#define NID_id_cmc_popLinkWitness               345
-#define OBJ_id_cmc_popLinkWitness               OBJ_id_cmc,23L
-
-#define SN_id_cmc_confirmCertAcceptance         "id-cmc-confirmCertAcceptance"
-#define NID_id_cmc_confirmCertAcceptance                346
-#define OBJ_id_cmc_confirmCertAcceptance                OBJ_id_cmc,24L
-
-#define SN_id_on_personalData           "id-on-personalData"
-#define NID_id_on_personalData          347
-#define OBJ_id_on_personalData          OBJ_id_on,1L
-
-#define SN_id_on_permanentIdentifier            "id-on-permanentIdentifier"
-#define LN_id_on_permanentIdentifier            "Permanent Identifier"
-#define NID_id_on_permanentIdentifier           858
-#define OBJ_id_on_permanentIdentifier           OBJ_id_on,3L
-
-#define SN_id_pda_dateOfBirth           "id-pda-dateOfBirth"
-#define NID_id_pda_dateOfBirth          348
-#define OBJ_id_pda_dateOfBirth          OBJ_id_pda,1L
-
-#define SN_id_pda_placeOfBirth          "id-pda-placeOfBirth"
-#define NID_id_pda_placeOfBirth         349
-#define OBJ_id_pda_placeOfBirth         OBJ_id_pda,2L
-
-#define SN_id_pda_gender                "id-pda-gender"
-#define NID_id_pda_gender               351
-#define OBJ_id_pda_gender               OBJ_id_pda,3L
-
-#define SN_id_pda_countryOfCitizenship          "id-pda-countryOfCitizenship"
-#define NID_id_pda_countryOfCitizenship         352
-#define OBJ_id_pda_countryOfCitizenship         OBJ_id_pda,4L
-
-#define SN_id_pda_countryOfResidence            "id-pda-countryOfResidence"
-#define NID_id_pda_countryOfResidence           353
-#define OBJ_id_pda_countryOfResidence           OBJ_id_pda,5L
-
-#define SN_id_aca_authenticationInfo            "id-aca-authenticationInfo"
-#define NID_id_aca_authenticationInfo           354
-#define OBJ_id_aca_authenticationInfo           OBJ_id_aca,1L
-
-#define SN_id_aca_accessIdentity                "id-aca-accessIdentity"
-#define NID_id_aca_accessIdentity               355
-#define OBJ_id_aca_accessIdentity               OBJ_id_aca,2L
-
-#define SN_id_aca_chargingIdentity              "id-aca-chargingIdentity"
-#define NID_id_aca_chargingIdentity             356
-#define OBJ_id_aca_chargingIdentity             OBJ_id_aca,3L
-
-#define SN_id_aca_group         "id-aca-group"
-#define NID_id_aca_group                357
-#define OBJ_id_aca_group                OBJ_id_aca,4L
-
-#define SN_id_aca_role          "id-aca-role"
-#define NID_id_aca_role         358
-#define OBJ_id_aca_role         OBJ_id_aca,5L
-
-#define SN_id_aca_encAttrs              "id-aca-encAttrs"
-#define NID_id_aca_encAttrs             399
-#define OBJ_id_aca_encAttrs             OBJ_id_aca,6L
-
-#define SN_id_qcs_pkixQCSyntax_v1               "id-qcs-pkixQCSyntax-v1"
-#define NID_id_qcs_pkixQCSyntax_v1              359
-#define OBJ_id_qcs_pkixQCSyntax_v1              OBJ_id_qcs,1L
-
-#define SN_id_cct_crs           "id-cct-crs"
-#define NID_id_cct_crs          360
-#define OBJ_id_cct_crs          OBJ_id_cct,1L
-
-#define SN_id_cct_PKIData               "id-cct-PKIData"
-#define NID_id_cct_PKIData              361
-#define OBJ_id_cct_PKIData              OBJ_id_cct,2L
-
-#define SN_id_cct_PKIResponse           "id-cct-PKIResponse"
-#define NID_id_cct_PKIResponse          362
-#define OBJ_id_cct_PKIResponse          OBJ_id_cct,3L
-
-#define SN_id_ppl_anyLanguage           "id-ppl-anyLanguage"
-#define LN_id_ppl_anyLanguage           "Any language"
-#define NID_id_ppl_anyLanguage          664
-#define OBJ_id_ppl_anyLanguage          OBJ_id_ppl,0L
-
-#define SN_id_ppl_inheritAll            "id-ppl-inheritAll"
-#define LN_id_ppl_inheritAll            "Inherit all"
-#define NID_id_ppl_inheritAll           665
-#define OBJ_id_ppl_inheritAll           OBJ_id_ppl,1L
-
-#define SN_Independent          "id-ppl-independent"
-#define LN_Independent          "Independent"
-#define NID_Independent         667
-#define OBJ_Independent         OBJ_id_ppl,2L
-
-#define SN_ad_OCSP              "OCSP"
-#define LN_ad_OCSP              "OCSP"
-#define NID_ad_OCSP             178
-#define OBJ_ad_OCSP             OBJ_id_ad,1L
-
-#define SN_ad_ca_issuers                "caIssuers"
-#define LN_ad_ca_issuers                "CA Issuers"
-#define NID_ad_ca_issuers               179
-#define OBJ_ad_ca_issuers               OBJ_id_ad,2L
-
-#define SN_ad_timeStamping              "ad_timestamping"
-#define LN_ad_timeStamping              "AD Time Stamping"
-#define NID_ad_timeStamping             363
-#define OBJ_ad_timeStamping             OBJ_id_ad,3L
-
-#define SN_ad_dvcs              "AD_DVCS"
-#define LN_ad_dvcs              "ad dvcs"
-#define NID_ad_dvcs             364
-#define OBJ_ad_dvcs             OBJ_id_ad,4L
-
-#define SN_caRepository         "caRepository"
-#define LN_caRepository         "CA Repository"
-#define NID_caRepository                785
-#define OBJ_caRepository                OBJ_id_ad,5L
-
-#define OBJ_id_pkix_OCSP                OBJ_ad_OCSP
-
-#define SN_id_pkix_OCSP_basic           "basicOCSPResponse"
-#define LN_id_pkix_OCSP_basic           "Basic OCSP Response"
-#define NID_id_pkix_OCSP_basic          365
-#define OBJ_id_pkix_OCSP_basic          OBJ_id_pkix_OCSP,1L
-
-#define SN_id_pkix_OCSP_Nonce           "Nonce"
-#define LN_id_pkix_OCSP_Nonce           "OCSP Nonce"
-#define NID_id_pkix_OCSP_Nonce          366
-#define OBJ_id_pkix_OCSP_Nonce          OBJ_id_pkix_OCSP,2L
-
-#define SN_id_pkix_OCSP_CrlID           "CrlID"
-#define LN_id_pkix_OCSP_CrlID           "OCSP CRL ID"
-#define NID_id_pkix_OCSP_CrlID          367
-#define OBJ_id_pkix_OCSP_CrlID          OBJ_id_pkix_OCSP,3L
-
-#define SN_id_pkix_OCSP_acceptableResponses             "acceptableResponses"
-#define LN_id_pkix_OCSP_acceptableResponses             "Acceptable OCSP Responses"
-#define NID_id_pkix_OCSP_acceptableResponses            368
-#define OBJ_id_pkix_OCSP_acceptableResponses            OBJ_id_pkix_OCSP,4L
-
-#define SN_id_pkix_OCSP_noCheck         "noCheck"
-#define LN_id_pkix_OCSP_noCheck         "OCSP No Check"
-#define NID_id_pkix_OCSP_noCheck                369
-#define OBJ_id_pkix_OCSP_noCheck                OBJ_id_pkix_OCSP,5L
-
-#define SN_id_pkix_OCSP_archiveCutoff           "archiveCutoff"
-#define LN_id_pkix_OCSP_archiveCutoff           "OCSP Archive Cutoff"
-#define NID_id_pkix_OCSP_archiveCutoff          370
-#define OBJ_id_pkix_OCSP_archiveCutoff          OBJ_id_pkix_OCSP,6L
-
-#define SN_id_pkix_OCSP_serviceLocator          "serviceLocator"
-#define LN_id_pkix_OCSP_serviceLocator          "OCSP Service Locator"
-#define NID_id_pkix_OCSP_serviceLocator         371
-#define OBJ_id_pkix_OCSP_serviceLocator         OBJ_id_pkix_OCSP,7L
-
-#define SN_id_pkix_OCSP_extendedStatus          "extendedStatus"
-#define LN_id_pkix_OCSP_extendedStatus          "Extended OCSP Status"
-#define NID_id_pkix_OCSP_extendedStatus         372
-#define OBJ_id_pkix_OCSP_extendedStatus         OBJ_id_pkix_OCSP,8L
-
-#define SN_id_pkix_OCSP_valid           "valid"
-#define NID_id_pkix_OCSP_valid          373
-#define OBJ_id_pkix_OCSP_valid          OBJ_id_pkix_OCSP,9L
-
-#define SN_id_pkix_OCSP_path            "path"
-#define NID_id_pkix_OCSP_path           374
-#define OBJ_id_pkix_OCSP_path           OBJ_id_pkix_OCSP,10L
-
-#define SN_id_pkix_OCSP_trustRoot               "trustRoot"
-#define LN_id_pkix_OCSP_trustRoot               "Trust Root"
-#define NID_id_pkix_OCSP_trustRoot              375
-#define OBJ_id_pkix_OCSP_trustRoot              OBJ_id_pkix_OCSP,11L
-
-#define SN_algorithm            "algorithm"
-#define LN_algorithm            "algorithm"
-#define NID_algorithm           376
-#define OBJ_algorithm           1L,3L,14L,3L,2L
-
-#define SN_md5WithRSA           "RSA-NP-MD5"
-#define LN_md5WithRSA           "md5WithRSA"
-#define NID_md5WithRSA          104
-#define OBJ_md5WithRSA          OBJ_algorithm,3L
-
-#define SN_des_ecb              "DES-ECB"
-#define LN_des_ecb              "des-ecb"
-#define NID_des_ecb             29
-#define OBJ_des_ecb             OBJ_algorithm,6L
-
-#define SN_des_cbc              "DES-CBC"
-#define LN_des_cbc              "des-cbc"
-#define NID_des_cbc             31
-#define OBJ_des_cbc             OBJ_algorithm,7L
-
-#define SN_des_ofb64            "DES-OFB"
-#define LN_des_ofb64            "des-ofb"
-#define NID_des_ofb64           45
-#define OBJ_des_ofb64           OBJ_algorithm,8L
-
-#define SN_des_cfb64            "DES-CFB"
-#define LN_des_cfb64            "des-cfb"
-#define NID_des_cfb64           30
-#define OBJ_des_cfb64           OBJ_algorithm,9L
-
-#define SN_rsaSignature         "rsaSignature"
-#define NID_rsaSignature                377
-#define OBJ_rsaSignature                OBJ_algorithm,11L
-
-#define SN_dsa_2                "DSA-old"
-#define LN_dsa_2                "dsaEncryption-old"
-#define NID_dsa_2               67
-#define OBJ_dsa_2               OBJ_algorithm,12L
-
-#define SN_dsaWithSHA           "DSA-SHA"
-#define LN_dsaWithSHA           "dsaWithSHA"
-#define NID_dsaWithSHA          66
-#define OBJ_dsaWithSHA          OBJ_algorithm,13L
-
-#define SN_shaWithRSAEncryption         "RSA-SHA"
-#define LN_shaWithRSAEncryption         "shaWithRSAEncryption"
-#define NID_shaWithRSAEncryption                42
-#define OBJ_shaWithRSAEncryption                OBJ_algorithm,15L
-
-#define SN_des_ede_ecb          "DES-EDE"
-#define LN_des_ede_ecb          "des-ede"
-#define NID_des_ede_ecb         32
-#define OBJ_des_ede_ecb         OBJ_algorithm,17L
-
-#define SN_des_ede3_ecb         "DES-EDE3"
-#define LN_des_ede3_ecb         "des-ede3"
-#define NID_des_ede3_ecb                33
-
-#define SN_des_ede_cbc          "DES-EDE-CBC"
-#define LN_des_ede_cbc          "des-ede-cbc"
-#define NID_des_ede_cbc         43
-
-#define SN_des_ede_cfb64                "DES-EDE-CFB"
-#define LN_des_ede_cfb64                "des-ede-cfb"
-#define NID_des_ede_cfb64               60
-
-#define SN_des_ede3_cfb64               "DES-EDE3-CFB"
-#define LN_des_ede3_cfb64               "des-ede3-cfb"
-#define NID_des_ede3_cfb64              61
-
-#define SN_des_ede_ofb64                "DES-EDE-OFB"
-#define LN_des_ede_ofb64                "des-ede-ofb"
-#define NID_des_ede_ofb64               62
-
-#define SN_des_ede3_ofb64               "DES-EDE3-OFB"
-#define LN_des_ede3_ofb64               "des-ede3-ofb"
-#define NID_des_ede3_ofb64              63
-
-#define SN_desx_cbc             "DESX-CBC"
-#define LN_desx_cbc             "desx-cbc"
-#define NID_desx_cbc            80
-
-#define SN_sha          "SHA"
-#define LN_sha          "sha"
-#define NID_sha         41
-#define OBJ_sha         OBJ_algorithm,18L
-
-#define SN_sha1         "SHA1"
-#define LN_sha1         "sha1"
-#define NID_sha1                64
-#define OBJ_sha1                OBJ_algorithm,26L
-
-#define SN_dsaWithSHA1_2                "DSA-SHA1-old"
-#define LN_dsaWithSHA1_2                "dsaWithSHA1-old"
-#define NID_dsaWithSHA1_2               70
-#define OBJ_dsaWithSHA1_2               OBJ_algorithm,27L
-
-#define SN_sha1WithRSA          "RSA-SHA1-2"
-#define LN_sha1WithRSA          "sha1WithRSA"
-#define NID_sha1WithRSA         115
-#define OBJ_sha1WithRSA         OBJ_algorithm,29L
-
-#define SN_ripemd160            "RIPEMD160"
-#define LN_ripemd160            "ripemd160"
-#define NID_ripemd160           117
-#define OBJ_ripemd160           1L,3L,36L,3L,2L,1L
-
-#define SN_ripemd160WithRSA             "RSA-RIPEMD160"
-#define LN_ripemd160WithRSA             "ripemd160WithRSA"
-#define NID_ripemd160WithRSA            119
-#define OBJ_ripemd160WithRSA            1L,3L,36L,3L,3L,1L,2L
-
-#define SN_sxnet                "SXNetID"
-#define LN_sxnet                "Strong Extranet ID"
-#define NID_sxnet               143
-#define OBJ_sxnet               1L,3L,101L,1L,4L,1L
-
-#define SN_X500         "X500"
-#define LN_X500         "directory services (X.500)"
-#define NID_X500                11
-#define OBJ_X500                2L,5L
-
-#define SN_X509         "X509"
-#define NID_X509                12
-#define OBJ_X509                OBJ_X500,4L
-
-#define SN_commonName           "CN"
-#define LN_commonName           "commonName"
-#define NID_commonName          13
-#define OBJ_commonName          OBJ_X509,3L
-
-#define SN_surname              "SN"
-#define LN_surname              "surname"
-#define NID_surname             100
-#define OBJ_surname             OBJ_X509,4L
-
-#define LN_serialNumber         "serialNumber"
-#define NID_serialNumber                105
-#define OBJ_serialNumber                OBJ_X509,5L
-
-#define SN_countryName          "C"
-#define LN_countryName          "countryName"
-#define NID_countryName         14
-#define OBJ_countryName         OBJ_X509,6L
-
-#define SN_localityName         "L"
-#define LN_localityName         "localityName"
-#define NID_localityName                15
-#define OBJ_localityName                OBJ_X509,7L
-
-#define SN_stateOrProvinceName          "ST"
-#define LN_stateOrProvinceName          "stateOrProvinceName"
-#define NID_stateOrProvinceName         16
-#define OBJ_stateOrProvinceName         OBJ_X509,8L
-
-#define SN_streetAddress                "street"
-#define LN_streetAddress                "streetAddress"
-#define NID_streetAddress               660
-#define OBJ_streetAddress               OBJ_X509,9L
-
-#define SN_organizationName             "O"
-#define LN_organizationName             "organizationName"
-#define NID_organizationName            17
-#define OBJ_organizationName            OBJ_X509,10L
-
-#define SN_organizationalUnitName               "OU"
-#define LN_organizationalUnitName               "organizationalUnitName"
-#define NID_organizationalUnitName              18
-#define OBJ_organizationalUnitName              OBJ_X509,11L
-
-#define SN_title                "title"
-#define LN_title                "title"
-#define NID_title               106
-#define OBJ_title               OBJ_X509,12L
-
-#define LN_description          "description"
-#define NID_description         107
-#define OBJ_description         OBJ_X509,13L
-
-#define LN_searchGuide          "searchGuide"
-#define NID_searchGuide         859
-#define OBJ_searchGuide         OBJ_X509,14L
-
-#define LN_businessCategory             "businessCategory"
-#define NID_businessCategory            860
-#define OBJ_businessCategory            OBJ_X509,15L
-
-#define LN_postalAddress                "postalAddress"
-#define NID_postalAddress               861
-#define OBJ_postalAddress               OBJ_X509,16L
-
-#define LN_postalCode           "postalCode"
-#define NID_postalCode          661
-#define OBJ_postalCode          OBJ_X509,17L
-
-#define LN_postOfficeBox                "postOfficeBox"
-#define NID_postOfficeBox               862
-#define OBJ_postOfficeBox               OBJ_X509,18L
-
-#define LN_physicalDeliveryOfficeName           "physicalDeliveryOfficeName"
-#define NID_physicalDeliveryOfficeName          863
-#define OBJ_physicalDeliveryOfficeName          OBJ_X509,19L
-
-#define LN_telephoneNumber              "telephoneNumber"
-#define NID_telephoneNumber             864
-#define OBJ_telephoneNumber             OBJ_X509,20L
-
-#define LN_telexNumber          "telexNumber"
-#define NID_telexNumber         865
-#define OBJ_telexNumber         OBJ_X509,21L
-
-#define LN_teletexTerminalIdentifier            "teletexTerminalIdentifier"
-#define NID_teletexTerminalIdentifier           866
-#define OBJ_teletexTerminalIdentifier           OBJ_X509,22L
-
-#define LN_facsimileTelephoneNumber             "facsimileTelephoneNumber"
-#define NID_facsimileTelephoneNumber            867
-#define OBJ_facsimileTelephoneNumber            OBJ_X509,23L
-
-#define LN_x121Address          "x121Address"
-#define NID_x121Address         868
-#define OBJ_x121Address         OBJ_X509,24L
-
-#define LN_internationaliSDNNumber              "internationaliSDNNumber"
-#define NID_internationaliSDNNumber             869
-#define OBJ_internationaliSDNNumber             OBJ_X509,25L
-
-#define LN_registeredAddress            "registeredAddress"
-#define NID_registeredAddress           870
-#define OBJ_registeredAddress           OBJ_X509,26L
-
-#define LN_destinationIndicator         "destinationIndicator"
-#define NID_destinationIndicator                871
-#define OBJ_destinationIndicator                OBJ_X509,27L
-
-#define LN_preferredDeliveryMethod              "preferredDeliveryMethod"
-#define NID_preferredDeliveryMethod             872
-#define OBJ_preferredDeliveryMethod             OBJ_X509,28L
-
-#define LN_presentationAddress          "presentationAddress"
-#define NID_presentationAddress         873
-#define OBJ_presentationAddress         OBJ_X509,29L
-
-#define LN_supportedApplicationContext          "supportedApplicationContext"
-#define NID_supportedApplicationContext         874
-#define OBJ_supportedApplicationContext         OBJ_X509,30L
-
-#define SN_member               "member"
-#define NID_member              875
-#define OBJ_member              OBJ_X509,31L
-
-#define SN_owner                "owner"
-#define NID_owner               876
-#define OBJ_owner               OBJ_X509,32L
-
-#define LN_roleOccupant         "roleOccupant"
-#define NID_roleOccupant                877
-#define OBJ_roleOccupant                OBJ_X509,33L
-
-#define SN_seeAlso              "seeAlso"
-#define NID_seeAlso             878
-#define OBJ_seeAlso             OBJ_X509,34L
-
-#define LN_userPassword         "userPassword"
-#define NID_userPassword                879
-#define OBJ_userPassword                OBJ_X509,35L
-
-#define LN_userCertificate              "userCertificate"
-#define NID_userCertificate             880
-#define OBJ_userCertificate             OBJ_X509,36L
-
-#define LN_cACertificate                "cACertificate"
-#define NID_cACertificate               881
-#define OBJ_cACertificate               OBJ_X509,37L
-
-#define LN_authorityRevocationList              "authorityRevocationList"
-#define NID_authorityRevocationList             882
-#define OBJ_authorityRevocationList             OBJ_X509,38L
-
-#define LN_certificateRevocationList            "certificateRevocationList"
-#define NID_certificateRevocationList           883
-#define OBJ_certificateRevocationList           OBJ_X509,39L
-
-#define LN_crossCertificatePair         "crossCertificatePair"
-#define NID_crossCertificatePair                884
-#define OBJ_crossCertificatePair                OBJ_X509,40L
-
-#define SN_name         "name"
-#define LN_name         "name"
-#define NID_name                173
-#define OBJ_name                OBJ_X509,41L
-
-#define SN_givenName            "GN"
-#define LN_givenName            "givenName"
-#define NID_givenName           99
-#define OBJ_givenName           OBJ_X509,42L
-
-#define SN_initials             "initials"
-#define LN_initials             "initials"
-#define NID_initials            101
-#define OBJ_initials            OBJ_X509,43L
-
-#define LN_generationQualifier          "generationQualifier"
-#define NID_generationQualifier         509
-#define OBJ_generationQualifier         OBJ_X509,44L
-
-#define LN_x500UniqueIdentifier         "x500UniqueIdentifier"
-#define NID_x500UniqueIdentifier                503
-#define OBJ_x500UniqueIdentifier                OBJ_X509,45L
-
-#define SN_dnQualifier          "dnQualifier"
-#define LN_dnQualifier          "dnQualifier"
-#define NID_dnQualifier         174
-#define OBJ_dnQualifier         OBJ_X509,46L
-
-#define LN_enhancedSearchGuide          "enhancedSearchGuide"
-#define NID_enhancedSearchGuide         885
-#define OBJ_enhancedSearchGuide         OBJ_X509,47L
-
-#define LN_protocolInformation          "protocolInformation"
-#define NID_protocolInformation         886
-#define OBJ_protocolInformation         OBJ_X509,48L
-
-#define LN_distinguishedName            "distinguishedName"
-#define NID_distinguishedName           887
-#define OBJ_distinguishedName           OBJ_X509,49L
-
-#define LN_uniqueMember         "uniqueMember"
-#define NID_uniqueMember                888
-#define OBJ_uniqueMember                OBJ_X509,50L
-
-#define LN_houseIdentifier              "houseIdentifier"
-#define NID_houseIdentifier             889
-#define OBJ_houseIdentifier             OBJ_X509,51L
-
-#define LN_supportedAlgorithms          "supportedAlgorithms"
-#define NID_supportedAlgorithms         890
-#define OBJ_supportedAlgorithms         OBJ_X509,52L
-
-#define LN_deltaRevocationList          "deltaRevocationList"
-#define NID_deltaRevocationList         891
-#define OBJ_deltaRevocationList         OBJ_X509,53L
-
-#define SN_dmdName              "dmdName"
-#define NID_dmdName             892
-#define OBJ_dmdName             OBJ_X509,54L
-
-#define LN_pseudonym            "pseudonym"
-#define NID_pseudonym           510
-#define OBJ_pseudonym           OBJ_X509,65L
-
-#define SN_role         "role"
-#define LN_role         "role"
-#define NID_role                400
-#define OBJ_role                OBJ_X509,72L
-
-#define SN_X500algorithms               "X500algorithms"
-#define LN_X500algorithms               "directory services - algorithms"
-#define NID_X500algorithms              378
-#define OBJ_X500algorithms              OBJ_X500,8L
-
-#define SN_rsa          "RSA"
-#define LN_rsa          "rsa"
-#define NID_rsa         19
-#define OBJ_rsa         OBJ_X500algorithms,1L,1L
-
-#define SN_mdc2WithRSA          "RSA-MDC2"
-#define LN_mdc2WithRSA          "mdc2WithRSA"
-#define NID_mdc2WithRSA         96
-#define OBJ_mdc2WithRSA         OBJ_X500algorithms,3L,100L
-
-#define SN_mdc2         "MDC2"
-#define LN_mdc2         "mdc2"
-#define NID_mdc2                95
-#define OBJ_mdc2                OBJ_X500algorithms,3L,101L
-
-#define SN_id_ce                "id-ce"
-#define NID_id_ce               81
-#define OBJ_id_ce               OBJ_X500,29L
-
-#define SN_subject_directory_attributes         "subjectDirectoryAttributes"
-#define LN_subject_directory_attributes         "X509v3 Subject Directory Attributes"
-#define NID_subject_directory_attributes                769
-#define OBJ_subject_directory_attributes                OBJ_id_ce,9L
-
-#define SN_subject_key_identifier               "subjectKeyIdentifier"
-#define LN_subject_key_identifier               "X509v3 Subject Key Identifier"
-#define NID_subject_key_identifier              82
-#define OBJ_subject_key_identifier              OBJ_id_ce,14L
-
-#define SN_key_usage            "keyUsage"
-#define LN_key_usage            "X509v3 Key Usage"
-#define NID_key_usage           83
-#define OBJ_key_usage           OBJ_id_ce,15L
-
-#define SN_private_key_usage_period             "privateKeyUsagePeriod"
-#define LN_private_key_usage_period             "X509v3 Private Key Usage Period"
-#define NID_private_key_usage_period            84
-#define OBJ_private_key_usage_period            OBJ_id_ce,16L
-
-#define SN_subject_alt_name             "subjectAltName"
-#define LN_subject_alt_name             "X509v3 Subject Alternative Name"
-#define NID_subject_alt_name            85
-#define OBJ_subject_alt_name            OBJ_id_ce,17L
-
-#define SN_issuer_alt_name              "issuerAltName"
-#define LN_issuer_alt_name              "X509v3 Issuer Alternative Name"
-#define NID_issuer_alt_name             86
-#define OBJ_issuer_alt_name             OBJ_id_ce,18L
-
-#define SN_basic_constraints            "basicConstraints"
-#define LN_basic_constraints            "X509v3 Basic Constraints"
-#define NID_basic_constraints           87
-#define OBJ_basic_constraints           OBJ_id_ce,19L
-
-#define SN_crl_number           "crlNumber"
-#define LN_crl_number           "X509v3 CRL Number"
-#define NID_crl_number          88
-#define OBJ_crl_number          OBJ_id_ce,20L
-
-#define SN_crl_reason           "CRLReason"
-#define LN_crl_reason           "X509v3 CRL Reason Code"
-#define NID_crl_reason          141
-#define OBJ_crl_reason          OBJ_id_ce,21L
-
-#define SN_invalidity_date              "invalidityDate"
-#define LN_invalidity_date              "Invalidity Date"
-#define NID_invalidity_date             142
-#define OBJ_invalidity_date             OBJ_id_ce,24L
-
-#define SN_delta_crl            "deltaCRL"
-#define LN_delta_crl            "X509v3 Delta CRL Indicator"
-#define NID_delta_crl           140
-#define OBJ_delta_crl           OBJ_id_ce,27L
-
-#define SN_issuing_distribution_point           "issuingDistributionPoint"
-#define LN_issuing_distribution_point           "X509v3 Issuing Distrubution Point"
-#define NID_issuing_distribution_point          770
-#define OBJ_issuing_distribution_point          OBJ_id_ce,28L
-
-#define SN_certificate_issuer           "certificateIssuer"
-#define LN_certificate_issuer           "X509v3 Certificate Issuer"
-#define NID_certificate_issuer          771
-#define OBJ_certificate_issuer          OBJ_id_ce,29L
-
-#define SN_name_constraints             "nameConstraints"
-#define LN_name_constraints             "X509v3 Name Constraints"
-#define NID_name_constraints            666
-#define OBJ_name_constraints            OBJ_id_ce,30L
-
-#define SN_crl_distribution_points              "crlDistributionPoints"
-#define LN_crl_distribution_points              "X509v3 CRL Distribution Points"
-#define NID_crl_distribution_points             103
-#define OBJ_crl_distribution_points             OBJ_id_ce,31L
-
-#define SN_certificate_policies         "certificatePolicies"
-#define LN_certificate_policies         "X509v3 Certificate Policies"
-#define NID_certificate_policies                89
-#define OBJ_certificate_policies                OBJ_id_ce,32L
-
-#define SN_any_policy           "anyPolicy"
-#define LN_any_policy           "X509v3 Any Policy"
-#define NID_any_policy          746
-#define OBJ_any_policy          OBJ_certificate_policies,0L
-
-#define SN_policy_mappings              "policyMappings"
-#define LN_policy_mappings              "X509v3 Policy Mappings"
-#define NID_policy_mappings             747
-#define OBJ_policy_mappings             OBJ_id_ce,33L
-
-#define SN_authority_key_identifier             "authorityKeyIdentifier"
-#define LN_authority_key_identifier             "X509v3 Authority Key Identifier"
-#define NID_authority_key_identifier            90
-#define OBJ_authority_key_identifier            OBJ_id_ce,35L
-
-#define SN_policy_constraints           "policyConstraints"
-#define LN_policy_constraints           "X509v3 Policy Constraints"
-#define NID_policy_constraints          401
-#define OBJ_policy_constraints          OBJ_id_ce,36L
-
-#define SN_ext_key_usage                "extendedKeyUsage"
-#define LN_ext_key_usage                "X509v3 Extended Key Usage"
-#define NID_ext_key_usage               126
-#define OBJ_ext_key_usage               OBJ_id_ce,37L
-
-#define SN_freshest_crl         "freshestCRL"
-#define LN_freshest_crl         "X509v3 Freshest CRL"
-#define NID_freshest_crl                857
-#define OBJ_freshest_crl                OBJ_id_ce,46L
-
-#define SN_inhibit_any_policy           "inhibitAnyPolicy"
-#define LN_inhibit_any_policy           "X509v3 Inhibit Any Policy"
-#define NID_inhibit_any_policy          748
-#define OBJ_inhibit_any_policy          OBJ_id_ce,54L
-
-#define SN_target_information           "targetInformation"
-#define LN_target_information           "X509v3 AC Targeting"
-#define NID_target_information          402
-#define OBJ_target_information          OBJ_id_ce,55L
-
-#define SN_no_rev_avail         "noRevAvail"
-#define LN_no_rev_avail         "X509v3 No Revocation Available"
-#define NID_no_rev_avail                403
-#define OBJ_no_rev_avail                OBJ_id_ce,56L
-
-#define SN_anyExtendedKeyUsage          "anyExtendedKeyUsage"
-#define LN_anyExtendedKeyUsage          "Any Extended Key Usage"
-#define NID_anyExtendedKeyUsage         910
-#define OBJ_anyExtendedKeyUsage         OBJ_ext_key_usage,0L
-
-#define SN_netscape             "Netscape"
-#define LN_netscape             "Netscape Communications Corp."
-#define NID_netscape            57
-#define OBJ_netscape            2L,16L,840L,1L,113730L
-
-#define SN_netscape_cert_extension              "nsCertExt"
-#define LN_netscape_cert_extension              "Netscape Certificate Extension"
-#define NID_netscape_cert_extension             58
-#define OBJ_netscape_cert_extension             OBJ_netscape,1L
-
-#define SN_netscape_data_type           "nsDataType"
-#define LN_netscape_data_type           "Netscape Data Type"
-#define NID_netscape_data_type          59
-#define OBJ_netscape_data_type          OBJ_netscape,2L
-
-#define SN_netscape_cert_type           "nsCertType"
-#define LN_netscape_cert_type           "Netscape Cert Type"
-#define NID_netscape_cert_type          71
-#define OBJ_netscape_cert_type          OBJ_netscape_cert_extension,1L
-
-#define SN_netscape_base_url            "nsBaseUrl"
-#define LN_netscape_base_url            "Netscape Base Url"
-#define NID_netscape_base_url           72
-#define OBJ_netscape_base_url           OBJ_netscape_cert_extension,2L
-
-#define SN_netscape_revocation_url              "nsRevocationUrl"
-#define LN_netscape_revocation_url              "Netscape Revocation Url"
-#define NID_netscape_revocation_url             73
-#define OBJ_netscape_revocation_url             OBJ_netscape_cert_extension,3L
-
-#define SN_netscape_ca_revocation_url           "nsCaRevocationUrl"
-#define LN_netscape_ca_revocation_url           "Netscape CA Revocation Url"
-#define NID_netscape_ca_revocation_url          74
-#define OBJ_netscape_ca_revocation_url          OBJ_netscape_cert_extension,4L
-
-#define SN_netscape_renewal_url         "nsRenewalUrl"
-#define LN_netscape_renewal_url         "Netscape Renewal Url"
-#define NID_netscape_renewal_url                75
-#define OBJ_netscape_renewal_url                OBJ_netscape_cert_extension,7L
-
-#define SN_netscape_ca_policy_url               "nsCaPolicyUrl"
-#define LN_netscape_ca_policy_url               "Netscape CA Policy Url"
-#define NID_netscape_ca_policy_url              76
-#define OBJ_netscape_ca_policy_url              OBJ_netscape_cert_extension,8L
-
-#define SN_netscape_ssl_server_name             "nsSslServerName"
-#define LN_netscape_ssl_server_name             "Netscape SSL Server Name"
-#define NID_netscape_ssl_server_name            77
-#define OBJ_netscape_ssl_server_name            OBJ_netscape_cert_extension,12L
-
-#define SN_netscape_comment             "nsComment"
-#define LN_netscape_comment             "Netscape Comment"
-#define NID_netscape_comment            78
-#define OBJ_netscape_comment            OBJ_netscape_cert_extension,13L
-
-#define SN_netscape_cert_sequence               "nsCertSequence"
-#define LN_netscape_cert_sequence               "Netscape Certificate Sequence"
-#define NID_netscape_cert_sequence              79
-#define OBJ_netscape_cert_sequence              OBJ_netscape_data_type,5L
-
-#define SN_ns_sgc               "nsSGC"
-#define LN_ns_sgc               "Netscape Server Gated Crypto"
-#define NID_ns_sgc              139
-#define OBJ_ns_sgc              OBJ_netscape,4L,1L
-
-#define SN_org          "ORG"
-#define LN_org          "org"
-#define NID_org         379
-#define OBJ_org         OBJ_iso,3L
-
-#define SN_dod          "DOD"
-#define LN_dod          "dod"
-#define NID_dod         380
-#define OBJ_dod         OBJ_org,6L
-
-#define SN_iana         "IANA"
-#define LN_iana         "iana"
-#define NID_iana                381
-#define OBJ_iana                OBJ_dod,1L
-
-#define OBJ_internet            OBJ_iana
-
-#define SN_Directory            "directory"
-#define LN_Directory            "Directory"
-#define NID_Directory           382
-#define OBJ_Directory           OBJ_internet,1L
-
-#define SN_Management           "mgmt"
-#define LN_Management           "Management"
-#define NID_Management          383
-#define OBJ_Management          OBJ_internet,2L
-
-#define SN_Experimental         "experimental"
-#define LN_Experimental         "Experimental"
-#define NID_Experimental                384
-#define OBJ_Experimental                OBJ_internet,3L
-
-#define SN_Private              "private"
-#define LN_Private              "Private"
-#define NID_Private             385
-#define OBJ_Private             OBJ_internet,4L
-
-#define SN_Security             "security"
-#define LN_Security             "Security"
-#define NID_Security            386
-#define OBJ_Security            OBJ_internet,5L
-
-#define SN_SNMPv2               "snmpv2"
-#define LN_SNMPv2               "SNMPv2"
-#define NID_SNMPv2              387
-#define OBJ_SNMPv2              OBJ_internet,6L
-
-#define LN_Mail         "Mail"
-#define NID_Mail                388
-#define OBJ_Mail                OBJ_internet,7L
-
-#define SN_Enterprises          "enterprises"
-#define LN_Enterprises          "Enterprises"
-#define NID_Enterprises         389
-#define OBJ_Enterprises         OBJ_Private,1L
-
-#define SN_dcObject             "dcobject"
-#define LN_dcObject             "dcObject"
-#define NID_dcObject            390
-#define OBJ_dcObject            OBJ_Enterprises,1466L,344L
-
-#define SN_mime_mhs             "mime-mhs"
-#define LN_mime_mhs             "MIME MHS"
-#define NID_mime_mhs            504
-#define OBJ_mime_mhs            OBJ_Mail,1L
-
-#define SN_mime_mhs_headings            "mime-mhs-headings"
-#define LN_mime_mhs_headings            "mime-mhs-headings"
-#define NID_mime_mhs_headings           505
-#define OBJ_mime_mhs_headings           OBJ_mime_mhs,1L
-
-#define SN_mime_mhs_bodies              "mime-mhs-bodies"
-#define LN_mime_mhs_bodies              "mime-mhs-bodies"
-#define NID_mime_mhs_bodies             506
-#define OBJ_mime_mhs_bodies             OBJ_mime_mhs,2L
-
-#define SN_id_hex_partial_message               "id-hex-partial-message"
-#define LN_id_hex_partial_message               "id-hex-partial-message"
-#define NID_id_hex_partial_message              507
-#define OBJ_id_hex_partial_message              OBJ_mime_mhs_headings,1L
-
-#define SN_id_hex_multipart_message             "id-hex-multipart-message"
-#define LN_id_hex_multipart_message             "id-hex-multipart-message"
-#define NID_id_hex_multipart_message            508
-#define OBJ_id_hex_multipart_message            OBJ_mime_mhs_headings,2L
-
-#define SN_rle_compression              "RLE"
-#define LN_rle_compression              "run length compression"
-#define NID_rle_compression             124
-#define OBJ_rle_compression             1L,1L,1L,1L,666L,1L
-
-#define SN_zlib_compression             "ZLIB"
-#define LN_zlib_compression             "zlib compression"
-#define NID_zlib_compression            125
-#define OBJ_zlib_compression            OBJ_id_smime_alg,8L
-
-#define OBJ_csor                2L,16L,840L,1L,101L,3L
-
-#define OBJ_nistAlgorithms              OBJ_csor,4L
-
-#define OBJ_aes         OBJ_nistAlgorithms,1L
-
-#define SN_aes_128_ecb          "AES-128-ECB"
-#define LN_aes_128_ecb          "aes-128-ecb"
-#define NID_aes_128_ecb         418
-#define OBJ_aes_128_ecb         OBJ_aes,1L
-
-#define SN_aes_128_cbc          "AES-128-CBC"
-#define LN_aes_128_cbc          "aes-128-cbc"
-#define NID_aes_128_cbc         419
-#define OBJ_aes_128_cbc         OBJ_aes,2L
-
-#define SN_aes_128_ofb128               "AES-128-OFB"
-#define LN_aes_128_ofb128               "aes-128-ofb"
-#define NID_aes_128_ofb128              420
-#define OBJ_aes_128_ofb128              OBJ_aes,3L
-
-#define SN_aes_128_cfb128               "AES-128-CFB"
-#define LN_aes_128_cfb128               "aes-128-cfb"
-#define NID_aes_128_cfb128              421
-#define OBJ_aes_128_cfb128              OBJ_aes,4L
-
-#define SN_id_aes128_wrap               "id-aes128-wrap"
-#define NID_id_aes128_wrap              788
-#define OBJ_id_aes128_wrap              OBJ_aes,5L
-
-#define SN_aes_128_gcm          "id-aes128-GCM"
-#define LN_aes_128_gcm          "aes-128-gcm"
-#define NID_aes_128_gcm         895
-#define OBJ_aes_128_gcm         OBJ_aes,6L
-
-#define SN_aes_128_ccm          "id-aes128-CCM"
-#define LN_aes_128_ccm          "aes-128-ccm"
-#define NID_aes_128_ccm         896
-#define OBJ_aes_128_ccm         OBJ_aes,7L
-
-#define SN_id_aes128_wrap_pad           "id-aes128-wrap-pad"
-#define NID_id_aes128_wrap_pad          897
-#define OBJ_id_aes128_wrap_pad          OBJ_aes,8L
-
-#define SN_aes_192_ecb          "AES-192-ECB"
-#define LN_aes_192_ecb          "aes-192-ecb"
-#define NID_aes_192_ecb         422
-#define OBJ_aes_192_ecb         OBJ_aes,21L
-
-#define SN_aes_192_cbc          "AES-192-CBC"
-#define LN_aes_192_cbc          "aes-192-cbc"
-#define NID_aes_192_cbc         423
-#define OBJ_aes_192_cbc         OBJ_aes,22L
-
-#define SN_aes_192_ofb128               "AES-192-OFB"
-#define LN_aes_192_ofb128               "aes-192-ofb"
-#define NID_aes_192_ofb128              424
-#define OBJ_aes_192_ofb128              OBJ_aes,23L
-
-#define SN_aes_192_cfb128               "AES-192-CFB"
-#define LN_aes_192_cfb128               "aes-192-cfb"
-#define NID_aes_192_cfb128              425
-#define OBJ_aes_192_cfb128              OBJ_aes,24L
-
-#define SN_id_aes192_wrap               "id-aes192-wrap"
-#define NID_id_aes192_wrap              789
-#define OBJ_id_aes192_wrap              OBJ_aes,25L
-
-#define SN_aes_192_gcm          "id-aes192-GCM"
-#define LN_aes_192_gcm          "aes-192-gcm"
-#define NID_aes_192_gcm         898
-#define OBJ_aes_192_gcm         OBJ_aes,26L
-
-#define SN_aes_192_ccm          "id-aes192-CCM"
-#define LN_aes_192_ccm          "aes-192-ccm"
-#define NID_aes_192_ccm         899
-#define OBJ_aes_192_ccm         OBJ_aes,27L
-
-#define SN_id_aes192_wrap_pad           "id-aes192-wrap-pad"
-#define NID_id_aes192_wrap_pad          900
-#define OBJ_id_aes192_wrap_pad          OBJ_aes,28L
-
-#define SN_aes_256_ecb          "AES-256-ECB"
-#define LN_aes_256_ecb          "aes-256-ecb"
-#define NID_aes_256_ecb         426
-#define OBJ_aes_256_ecb         OBJ_aes,41L
-
-#define SN_aes_256_cbc          "AES-256-CBC"
-#define LN_aes_256_cbc          "aes-256-cbc"
-#define NID_aes_256_cbc         427
-#define OBJ_aes_256_cbc         OBJ_aes,42L
-
-#define SN_aes_256_ofb128               "AES-256-OFB"
-#define LN_aes_256_ofb128               "aes-256-ofb"
-#define NID_aes_256_ofb128              428
-#define OBJ_aes_256_ofb128              OBJ_aes,43L
-
-#define SN_aes_256_cfb128               "AES-256-CFB"
-#define LN_aes_256_cfb128               "aes-256-cfb"
-#define NID_aes_256_cfb128              429
-#define OBJ_aes_256_cfb128              OBJ_aes,44L
-
-#define SN_id_aes256_wrap               "id-aes256-wrap"
-#define NID_id_aes256_wrap              790
-#define OBJ_id_aes256_wrap              OBJ_aes,45L
-
-#define SN_aes_256_gcm          "id-aes256-GCM"
-#define LN_aes_256_gcm          "aes-256-gcm"
-#define NID_aes_256_gcm         901
-#define OBJ_aes_256_gcm         OBJ_aes,46L
-
-#define SN_aes_256_ccm          "id-aes256-CCM"
-#define LN_aes_256_ccm          "aes-256-ccm"
-#define NID_aes_256_ccm         902
-#define OBJ_aes_256_ccm         OBJ_aes,47L
-
-#define SN_id_aes256_wrap_pad           "id-aes256-wrap-pad"
-#define NID_id_aes256_wrap_pad          903
-#define OBJ_id_aes256_wrap_pad          OBJ_aes,48L
-
-#define SN_aes_128_cfb1         "AES-128-CFB1"
-#define LN_aes_128_cfb1         "aes-128-cfb1"
-#define NID_aes_128_cfb1                650
-
-#define SN_aes_192_cfb1         "AES-192-CFB1"
-#define LN_aes_192_cfb1         "aes-192-cfb1"
-#define NID_aes_192_cfb1                651
-
-#define SN_aes_256_cfb1         "AES-256-CFB1"
-#define LN_aes_256_cfb1         "aes-256-cfb1"
-#define NID_aes_256_cfb1                652
-
-#define SN_aes_128_cfb8         "AES-128-CFB8"
-#define LN_aes_128_cfb8         "aes-128-cfb8"
-#define NID_aes_128_cfb8                653
-
-#define SN_aes_192_cfb8         "AES-192-CFB8"
-#define LN_aes_192_cfb8         "aes-192-cfb8"
-#define NID_aes_192_cfb8                654
-
-#define SN_aes_256_cfb8         "AES-256-CFB8"
-#define LN_aes_256_cfb8         "aes-256-cfb8"
-#define NID_aes_256_cfb8                655
-
-#define SN_aes_128_ctr          "AES-128-CTR"
-#define LN_aes_128_ctr          "aes-128-ctr"
-#define NID_aes_128_ctr         904
-
-#define SN_aes_192_ctr          "AES-192-CTR"
-#define LN_aes_192_ctr          "aes-192-ctr"
-#define NID_aes_192_ctr         905
-
-#define SN_aes_256_ctr          "AES-256-CTR"
-#define LN_aes_256_ctr          "aes-256-ctr"
-#define NID_aes_256_ctr         906
-
-#define SN_aes_128_xts          "AES-128-XTS"
-#define LN_aes_128_xts          "aes-128-xts"
-#define NID_aes_128_xts         913
-
-#define SN_aes_256_xts          "AES-256-XTS"
-#define LN_aes_256_xts          "aes-256-xts"
-#define NID_aes_256_xts         914
-
-#define SN_des_cfb1             "DES-CFB1"
-#define LN_des_cfb1             "des-cfb1"
-#define NID_des_cfb1            656
-
-#define SN_des_cfb8             "DES-CFB8"
-#define LN_des_cfb8             "des-cfb8"
-#define NID_des_cfb8            657
-
-#define SN_des_ede3_cfb1                "DES-EDE3-CFB1"
-#define LN_des_ede3_cfb1                "des-ede3-cfb1"
-#define NID_des_ede3_cfb1               658
-
-#define SN_des_ede3_cfb8                "DES-EDE3-CFB8"
-#define LN_des_ede3_cfb8                "des-ede3-cfb8"
-#define NID_des_ede3_cfb8               659
-
-#define OBJ_nist_hashalgs               OBJ_nistAlgorithms,2L
-
-#define SN_sha256               "SHA256"
-#define LN_sha256               "sha256"
-#define NID_sha256              672
-#define OBJ_sha256              OBJ_nist_hashalgs,1L
-
-#define SN_sha384               "SHA384"
-#define LN_sha384               "sha384"
-#define NID_sha384              673
-#define OBJ_sha384              OBJ_nist_hashalgs,2L
-
-#define SN_sha512               "SHA512"
-#define LN_sha512               "sha512"
-#define NID_sha512              674
-#define OBJ_sha512              OBJ_nist_hashalgs,3L
-
-#define SN_sha224               "SHA224"
-#define LN_sha224               "sha224"
-#define NID_sha224              675
-#define OBJ_sha224              OBJ_nist_hashalgs,4L
-
-#define OBJ_dsa_with_sha2               OBJ_nistAlgorithms,3L
-
-#define SN_dsa_with_SHA224              "dsa_with_SHA224"
-#define NID_dsa_with_SHA224             802
-#define OBJ_dsa_with_SHA224             OBJ_dsa_with_sha2,1L
-
-#define SN_dsa_with_SHA256              "dsa_with_SHA256"
-#define NID_dsa_with_SHA256             803
-#define OBJ_dsa_with_SHA256             OBJ_dsa_with_sha2,2L
-
-#define SN_hold_instruction_code                "holdInstructionCode"
-#define LN_hold_instruction_code                "Hold Instruction Code"
-#define NID_hold_instruction_code               430
-#define OBJ_hold_instruction_code               OBJ_id_ce,23L
-
-#define OBJ_holdInstruction             OBJ_X9_57,2L
-
-#define SN_hold_instruction_none                "holdInstructionNone"
-#define LN_hold_instruction_none                "Hold Instruction None"
-#define NID_hold_instruction_none               431
-#define OBJ_hold_instruction_none               OBJ_holdInstruction,1L
-
-#define SN_hold_instruction_call_issuer         "holdInstructionCallIssuer"
-#define LN_hold_instruction_call_issuer         "Hold Instruction Call Issuer"
-#define NID_hold_instruction_call_issuer                432
-#define OBJ_hold_instruction_call_issuer                OBJ_holdInstruction,2L
-
-#define SN_hold_instruction_reject              "holdInstructionReject"
-#define LN_hold_instruction_reject              "Hold Instruction Reject"
-#define NID_hold_instruction_reject             433
-#define OBJ_hold_instruction_reject             OBJ_holdInstruction,3L
-
-#define SN_data         "data"
-#define NID_data                434
-#define OBJ_data                OBJ_itu_t,9L
-
-#define SN_pss          "pss"
-#define NID_pss         435
-#define OBJ_pss         OBJ_data,2342L
-
-#define SN_ucl          "ucl"
-#define NID_ucl         436
-#define OBJ_ucl         OBJ_pss,19200300L
-
-#define SN_pilot                "pilot"
-#define NID_pilot               437
-#define OBJ_pilot               OBJ_ucl,100L
-
-#define LN_pilotAttributeType           "pilotAttributeType"
-#define NID_pilotAttributeType          438
-#define OBJ_pilotAttributeType          OBJ_pilot,1L
-
-#define LN_pilotAttributeSyntax         "pilotAttributeSyntax"
-#define NID_pilotAttributeSyntax                439
-#define OBJ_pilotAttributeSyntax                OBJ_pilot,3L
-
-#define LN_pilotObjectClass             "pilotObjectClass"
-#define NID_pilotObjectClass            440
-#define OBJ_pilotObjectClass            OBJ_pilot,4L
-
-#define LN_pilotGroups          "pilotGroups"
-#define NID_pilotGroups         441
-#define OBJ_pilotGroups         OBJ_pilot,10L
-
-#define LN_iA5StringSyntax              "iA5StringSyntax"
-#define NID_iA5StringSyntax             442
-#define OBJ_iA5StringSyntax             OBJ_pilotAttributeSyntax,4L
-
-#define LN_caseIgnoreIA5StringSyntax            "caseIgnoreIA5StringSyntax"
-#define NID_caseIgnoreIA5StringSyntax           443
-#define OBJ_caseIgnoreIA5StringSyntax           OBJ_pilotAttributeSyntax,5L
-
-#define LN_pilotObject          "pilotObject"
-#define NID_pilotObject         444
-#define OBJ_pilotObject         OBJ_pilotObjectClass,3L
-
-#define LN_pilotPerson          "pilotPerson"
-#define NID_pilotPerson         445
-#define OBJ_pilotPerson         OBJ_pilotObjectClass,4L
-
-#define SN_account              "account"
-#define NID_account             446
-#define OBJ_account             OBJ_pilotObjectClass,5L
-
-#define SN_document             "document"
-#define NID_document            447
-#define OBJ_document            OBJ_pilotObjectClass,6L
-
-#define SN_room         "room"
-#define NID_room                448
-#define OBJ_room                OBJ_pilotObjectClass,7L
-
-#define LN_documentSeries               "documentSeries"
-#define NID_documentSeries              449
-#define OBJ_documentSeries              OBJ_pilotObjectClass,9L
-
-#define SN_Domain               "domain"
-#define LN_Domain               "Domain"
-#define NID_Domain              392
-#define OBJ_Domain              OBJ_pilotObjectClass,13L
-
-#define LN_rFC822localPart              "rFC822localPart"
-#define NID_rFC822localPart             450
-#define OBJ_rFC822localPart             OBJ_pilotObjectClass,14L
-
-#define LN_dNSDomain            "dNSDomain"
-#define NID_dNSDomain           451
-#define OBJ_dNSDomain           OBJ_pilotObjectClass,15L
-
-#define LN_domainRelatedObject          "domainRelatedObject"
-#define NID_domainRelatedObject         452
-#define OBJ_domainRelatedObject         OBJ_pilotObjectClass,17L
-
-#define LN_friendlyCountry              "friendlyCountry"
-#define NID_friendlyCountry             453
-#define OBJ_friendlyCountry             OBJ_pilotObjectClass,18L
-
-#define LN_simpleSecurityObject         "simpleSecurityObject"
-#define NID_simpleSecurityObject                454
-#define OBJ_simpleSecurityObject                OBJ_pilotObjectClass,19L
-
-#define LN_pilotOrganization            "pilotOrganization"
-#define NID_pilotOrganization           455
-#define OBJ_pilotOrganization           OBJ_pilotObjectClass,20L
-
-#define LN_pilotDSA             "pilotDSA"
-#define NID_pilotDSA            456
-#define OBJ_pilotDSA            OBJ_pilotObjectClass,21L
-
-#define LN_qualityLabelledData          "qualityLabelledData"
-#define NID_qualityLabelledData         457
-#define OBJ_qualityLabelledData         OBJ_pilotObjectClass,22L
-
-#define SN_userId               "UID"
-#define LN_userId               "userId"
-#define NID_userId              458
-#define OBJ_userId              OBJ_pilotAttributeType,1L
-
-#define LN_textEncodedORAddress         "textEncodedORAddress"
-#define NID_textEncodedORAddress                459
-#define OBJ_textEncodedORAddress                OBJ_pilotAttributeType,2L
-
-#define SN_rfc822Mailbox                "mail"
-#define LN_rfc822Mailbox                "rfc822Mailbox"
-#define NID_rfc822Mailbox               460
-#define OBJ_rfc822Mailbox               OBJ_pilotAttributeType,3L
-
-#define SN_info         "info"
-#define NID_info                461
-#define OBJ_info                OBJ_pilotAttributeType,4L
-
-#define LN_favouriteDrink               "favouriteDrink"
-#define NID_favouriteDrink              462
-#define OBJ_favouriteDrink              OBJ_pilotAttributeType,5L
-
-#define LN_roomNumber           "roomNumber"
-#define NID_roomNumber          463
-#define OBJ_roomNumber          OBJ_pilotAttributeType,6L
-
-#define SN_photo                "photo"
-#define NID_photo               464
-#define OBJ_photo               OBJ_pilotAttributeType,7L
-
-#define LN_userClass            "userClass"
-#define NID_userClass           465
-#define OBJ_userClass           OBJ_pilotAttributeType,8L
-
-#define SN_host         "host"
-#define NID_host                466
-#define OBJ_host                OBJ_pilotAttributeType,9L
-
-#define SN_manager              "manager"
-#define NID_manager             467
-#define OBJ_manager             OBJ_pilotAttributeType,10L
-
-#define LN_documentIdentifier           "documentIdentifier"
-#define NID_documentIdentifier          468
-#define OBJ_documentIdentifier          OBJ_pilotAttributeType,11L
-
-#define LN_documentTitle                "documentTitle"
-#define NID_documentTitle               469
-#define OBJ_documentTitle               OBJ_pilotAttributeType,12L
-
-#define LN_documentVersion              "documentVersion"
-#define NID_documentVersion             470
-#define OBJ_documentVersion             OBJ_pilotAttributeType,13L
-
-#define LN_documentAuthor               "documentAuthor"
-#define NID_documentAuthor              471
-#define OBJ_documentAuthor              OBJ_pilotAttributeType,14L
-
-#define LN_documentLocation             "documentLocation"
-#define NID_documentLocation            472
-#define OBJ_documentLocation            OBJ_pilotAttributeType,15L
-
-#define LN_homeTelephoneNumber          "homeTelephoneNumber"
-#define NID_homeTelephoneNumber         473
-#define OBJ_homeTelephoneNumber         OBJ_pilotAttributeType,20L
-
-#define SN_secretary            "secretary"
-#define NID_secretary           474
-#define OBJ_secretary           OBJ_pilotAttributeType,21L
-
-#define LN_otherMailbox         "otherMailbox"
-#define NID_otherMailbox                475
-#define OBJ_otherMailbox                OBJ_pilotAttributeType,22L
-
-#define LN_lastModifiedTime             "lastModifiedTime"
-#define NID_lastModifiedTime            476
-#define OBJ_lastModifiedTime            OBJ_pilotAttributeType,23L
-
-#define LN_lastModifiedBy               "lastModifiedBy"
-#define NID_lastModifiedBy              477
-#define OBJ_lastModifiedBy              OBJ_pilotAttributeType,24L
-
-#define SN_domainComponent              "DC"
-#define LN_domainComponent              "domainComponent"
-#define NID_domainComponent             391
-#define OBJ_domainComponent             OBJ_pilotAttributeType,25L
-
-#define LN_aRecord              "aRecord"
-#define NID_aRecord             478
-#define OBJ_aRecord             OBJ_pilotAttributeType,26L
-
-#define LN_pilotAttributeType27         "pilotAttributeType27"
-#define NID_pilotAttributeType27                479
-#define OBJ_pilotAttributeType27                OBJ_pilotAttributeType,27L
-
-#define LN_mXRecord             "mXRecord"
-#define NID_mXRecord            480
-#define OBJ_mXRecord            OBJ_pilotAttributeType,28L
-
-#define LN_nSRecord             "nSRecord"
-#define NID_nSRecord            481
-#define OBJ_nSRecord            OBJ_pilotAttributeType,29L
-
-#define LN_sOARecord            "sOARecord"
-#define NID_sOARecord           482
-#define OBJ_sOARecord           OBJ_pilotAttributeType,30L
-
-#define LN_cNAMERecord          "cNAMERecord"
-#define NID_cNAMERecord         483
-#define OBJ_cNAMERecord         OBJ_pilotAttributeType,31L
-
-#define LN_associatedDomain             "associatedDomain"
-#define NID_associatedDomain            484
-#define OBJ_associatedDomain            OBJ_pilotAttributeType,37L
-
-#define LN_associatedName               "associatedName"
-#define NID_associatedName              485
-#define OBJ_associatedName              OBJ_pilotAttributeType,38L
-
-#define LN_homePostalAddress            "homePostalAddress"
-#define NID_homePostalAddress           486
-#define OBJ_homePostalAddress           OBJ_pilotAttributeType,39L
-
-#define LN_personalTitle                "personalTitle"
-#define NID_personalTitle               487
-#define OBJ_personalTitle               OBJ_pilotAttributeType,40L
-
-#define LN_mobileTelephoneNumber                "mobileTelephoneNumber"
-#define NID_mobileTelephoneNumber               488
-#define OBJ_mobileTelephoneNumber               OBJ_pilotAttributeType,41L
-
-#define LN_pagerTelephoneNumber         "pagerTelephoneNumber"
-#define NID_pagerTelephoneNumber                489
-#define OBJ_pagerTelephoneNumber                OBJ_pilotAttributeType,42L
-
-#define LN_friendlyCountryName          "friendlyCountryName"
-#define NID_friendlyCountryName         490
-#define OBJ_friendlyCountryName         OBJ_pilotAttributeType,43L
-
-#define LN_organizationalStatus         "organizationalStatus"
-#define NID_organizationalStatus                491
-#define OBJ_organizationalStatus                OBJ_pilotAttributeType,45L
-
-#define LN_janetMailbox         "janetMailbox"
-#define NID_janetMailbox                492
-#define OBJ_janetMailbox                OBJ_pilotAttributeType,46L
-
-#define LN_mailPreferenceOption         "mailPreferenceOption"
-#define NID_mailPreferenceOption                493
-#define OBJ_mailPreferenceOption                OBJ_pilotAttributeType,47L
-
-#define LN_buildingName         "buildingName"
-#define NID_buildingName                494
-#define OBJ_buildingName                OBJ_pilotAttributeType,48L
-
-#define LN_dSAQuality           "dSAQuality"
-#define NID_dSAQuality          495
-#define OBJ_dSAQuality          OBJ_pilotAttributeType,49L
-
-#define LN_singleLevelQuality           "singleLevelQuality"
-#define NID_singleLevelQuality          496
-#define OBJ_singleLevelQuality          OBJ_pilotAttributeType,50L
-
-#define LN_subtreeMinimumQuality                "subtreeMinimumQuality"
-#define NID_subtreeMinimumQuality               497
-#define OBJ_subtreeMinimumQuality               OBJ_pilotAttributeType,51L
-
-#define LN_subtreeMaximumQuality                "subtreeMaximumQuality"
-#define NID_subtreeMaximumQuality               498
-#define OBJ_subtreeMaximumQuality               OBJ_pilotAttributeType,52L
-
-#define LN_personalSignature            "personalSignature"
-#define NID_personalSignature           499
-#define OBJ_personalSignature           OBJ_pilotAttributeType,53L
-
-#define LN_dITRedirect          "dITRedirect"
-#define NID_dITRedirect         500
-#define OBJ_dITRedirect         OBJ_pilotAttributeType,54L
-
-#define SN_audio                "audio"
-#define NID_audio               501
-#define OBJ_audio               OBJ_pilotAttributeType,55L
-
-#define LN_documentPublisher            "documentPublisher"
-#define NID_documentPublisher           502
-#define OBJ_documentPublisher           OBJ_pilotAttributeType,56L
-
-#define SN_id_set               "id-set"
-#define LN_id_set               "Secure Electronic Transactions"
-#define NID_id_set              512
-#define OBJ_id_set              OBJ_international_organizations,42L
-
-#define SN_set_ctype            "set-ctype"
-#define LN_set_ctype            "content types"
-#define NID_set_ctype           513
-#define OBJ_set_ctype           OBJ_id_set,0L
-
-#define SN_set_msgExt           "set-msgExt"
-#define LN_set_msgExt           "message extensions"
-#define NID_set_msgExt          514
-#define OBJ_set_msgExt          OBJ_id_set,1L
-
-#define SN_set_attr             "set-attr"
-#define NID_set_attr            515
-#define OBJ_set_attr            OBJ_id_set,3L
-
-#define SN_set_policy           "set-policy"
-#define NID_set_policy          516
-#define OBJ_set_policy          OBJ_id_set,5L
-
-#define SN_set_certExt          "set-certExt"
-#define LN_set_certExt          "certificate extensions"
-#define NID_set_certExt         517
-#define OBJ_set_certExt         OBJ_id_set,7L
-
-#define SN_set_brand            "set-brand"
-#define NID_set_brand           518
-#define OBJ_set_brand           OBJ_id_set,8L
-
-#define SN_setct_PANData                "setct-PANData"
-#define NID_setct_PANData               519
-#define OBJ_setct_PANData               OBJ_set_ctype,0L
-
-#define SN_setct_PANToken               "setct-PANToken"
-#define NID_setct_PANToken              520
-#define OBJ_setct_PANToken              OBJ_set_ctype,1L
-
-#define SN_setct_PANOnly                "setct-PANOnly"
-#define NID_setct_PANOnly               521
-#define OBJ_setct_PANOnly               OBJ_set_ctype,2L
-
-#define SN_setct_OIData         "setct-OIData"
-#define NID_setct_OIData                522
-#define OBJ_setct_OIData                OBJ_set_ctype,3L
-
-#define SN_setct_PI             "setct-PI"
-#define NID_setct_PI            523
-#define OBJ_setct_PI            OBJ_set_ctype,4L
-
-#define SN_setct_PIData         "setct-PIData"
-#define NID_setct_PIData                524
-#define OBJ_setct_PIData                OBJ_set_ctype,5L
-
-#define SN_setct_PIDataUnsigned         "setct-PIDataUnsigned"
-#define NID_setct_PIDataUnsigned                525
-#define OBJ_setct_PIDataUnsigned                OBJ_set_ctype,6L
-
-#define SN_setct_HODInput               "setct-HODInput"
-#define NID_setct_HODInput              526
-#define OBJ_setct_HODInput              OBJ_set_ctype,7L
-
-#define SN_setct_AuthResBaggage         "setct-AuthResBaggage"
-#define NID_setct_AuthResBaggage                527
-#define OBJ_setct_AuthResBaggage                OBJ_set_ctype,8L
-
-#define SN_setct_AuthRevReqBaggage              "setct-AuthRevReqBaggage"
-#define NID_setct_AuthRevReqBaggage             528
-#define OBJ_setct_AuthRevReqBaggage             OBJ_set_ctype,9L
-
-#define SN_setct_AuthRevResBaggage              "setct-AuthRevResBaggage"
-#define NID_setct_AuthRevResBaggage             529
-#define OBJ_setct_AuthRevResBaggage             OBJ_set_ctype,10L
-
-#define SN_setct_CapTokenSeq            "setct-CapTokenSeq"
-#define NID_setct_CapTokenSeq           530
-#define OBJ_setct_CapTokenSeq           OBJ_set_ctype,11L
-
-#define SN_setct_PInitResData           "setct-PInitResData"
-#define NID_setct_PInitResData          531
-#define OBJ_setct_PInitResData          OBJ_set_ctype,12L
-
-#define SN_setct_PI_TBS         "setct-PI-TBS"
-#define NID_setct_PI_TBS                532
-#define OBJ_setct_PI_TBS                OBJ_set_ctype,13L
-
-#define SN_setct_PResData               "setct-PResData"
-#define NID_setct_PResData              533
-#define OBJ_setct_PResData              OBJ_set_ctype,14L
-
-#define SN_setct_AuthReqTBS             "setct-AuthReqTBS"
-#define NID_setct_AuthReqTBS            534
-#define OBJ_setct_AuthReqTBS            OBJ_set_ctype,16L
-
-#define SN_setct_AuthResTBS             "setct-AuthResTBS"
-#define NID_setct_AuthResTBS            535
-#define OBJ_setct_AuthResTBS            OBJ_set_ctype,17L
-
-#define SN_setct_AuthResTBSX            "setct-AuthResTBSX"
-#define NID_setct_AuthResTBSX           536
-#define OBJ_setct_AuthResTBSX           OBJ_set_ctype,18L
-
-#define SN_setct_AuthTokenTBS           "setct-AuthTokenTBS"
-#define NID_setct_AuthTokenTBS          537
-#define OBJ_setct_AuthTokenTBS          OBJ_set_ctype,19L
-
-#define SN_setct_CapTokenData           "setct-CapTokenData"
-#define NID_setct_CapTokenData          538
-#define OBJ_setct_CapTokenData          OBJ_set_ctype,20L
-
-#define SN_setct_CapTokenTBS            "setct-CapTokenTBS"
-#define NID_setct_CapTokenTBS           539
-#define OBJ_setct_CapTokenTBS           OBJ_set_ctype,21L
-
-#define SN_setct_AcqCardCodeMsg         "setct-AcqCardCodeMsg"
-#define NID_setct_AcqCardCodeMsg                540
-#define OBJ_setct_AcqCardCodeMsg                OBJ_set_ctype,22L
-
-#define SN_setct_AuthRevReqTBS          "setct-AuthRevReqTBS"
-#define NID_setct_AuthRevReqTBS         541
-#define OBJ_setct_AuthRevReqTBS         OBJ_set_ctype,23L
-
-#define SN_setct_AuthRevResData         "setct-AuthRevResData"
-#define NID_setct_AuthRevResData                542
-#define OBJ_setct_AuthRevResData                OBJ_set_ctype,24L
-
-#define SN_setct_AuthRevResTBS          "setct-AuthRevResTBS"
-#define NID_setct_AuthRevResTBS         543
-#define OBJ_setct_AuthRevResTBS         OBJ_set_ctype,25L
-
-#define SN_setct_CapReqTBS              "setct-CapReqTBS"
-#define NID_setct_CapReqTBS             544
-#define OBJ_setct_CapReqTBS             OBJ_set_ctype,26L
-
-#define SN_setct_CapReqTBSX             "setct-CapReqTBSX"
-#define NID_setct_CapReqTBSX            545
-#define OBJ_setct_CapReqTBSX            OBJ_set_ctype,27L
-
-#define SN_setct_CapResData             "setct-CapResData"
-#define NID_setct_CapResData            546
-#define OBJ_setct_CapResData            OBJ_set_ctype,28L
-
-#define SN_setct_CapRevReqTBS           "setct-CapRevReqTBS"
-#define NID_setct_CapRevReqTBS          547
-#define OBJ_setct_CapRevReqTBS          OBJ_set_ctype,29L
-
-#define SN_setct_CapRevReqTBSX          "setct-CapRevReqTBSX"
-#define NID_setct_CapRevReqTBSX         548
-#define OBJ_setct_CapRevReqTBSX         OBJ_set_ctype,30L
-
-#define SN_setct_CapRevResData          "setct-CapRevResData"
-#define NID_setct_CapRevResData         549
-#define OBJ_setct_CapRevResData         OBJ_set_ctype,31L
-
-#define SN_setct_CredReqTBS             "setct-CredReqTBS"
-#define NID_setct_CredReqTBS            550
-#define OBJ_setct_CredReqTBS            OBJ_set_ctype,32L
-
-#define SN_setct_CredReqTBSX            "setct-CredReqTBSX"
-#define NID_setct_CredReqTBSX           551
-#define OBJ_setct_CredReqTBSX           OBJ_set_ctype,33L
-
-#define SN_setct_CredResData            "setct-CredResData"
-#define NID_setct_CredResData           552
-#define OBJ_setct_CredResData           OBJ_set_ctype,34L
-
-#define SN_setct_CredRevReqTBS          "setct-CredRevReqTBS"
-#define NID_setct_CredRevReqTBS         553
-#define OBJ_setct_CredRevReqTBS         OBJ_set_ctype,35L
-
-#define SN_setct_CredRevReqTBSX         "setct-CredRevReqTBSX"
-#define NID_setct_CredRevReqTBSX                554
-#define OBJ_setct_CredRevReqTBSX                OBJ_set_ctype,36L
-
-#define SN_setct_CredRevResData         "setct-CredRevResData"
-#define NID_setct_CredRevResData                555
-#define OBJ_setct_CredRevResData                OBJ_set_ctype,37L
-
-#define SN_setct_PCertReqData           "setct-PCertReqData"
-#define NID_setct_PCertReqData          556
-#define OBJ_setct_PCertReqData          OBJ_set_ctype,38L
-
-#define SN_setct_PCertResTBS            "setct-PCertResTBS"
-#define NID_setct_PCertResTBS           557
-#define OBJ_setct_PCertResTBS           OBJ_set_ctype,39L
-
-#define SN_setct_BatchAdminReqData              "setct-BatchAdminReqData"
-#define NID_setct_BatchAdminReqData             558
-#define OBJ_setct_BatchAdminReqData             OBJ_set_ctype,40L
-
-#define SN_setct_BatchAdminResData              "setct-BatchAdminResData"
-#define NID_setct_BatchAdminResData             559
-#define OBJ_setct_BatchAdminResData             OBJ_set_ctype,41L
-
-#define SN_setct_CardCInitResTBS                "setct-CardCInitResTBS"
-#define NID_setct_CardCInitResTBS               560
-#define OBJ_setct_CardCInitResTBS               OBJ_set_ctype,42L
-
-#define SN_setct_MeAqCInitResTBS                "setct-MeAqCInitResTBS"
-#define NID_setct_MeAqCInitResTBS               561
-#define OBJ_setct_MeAqCInitResTBS               OBJ_set_ctype,43L
-
-#define SN_setct_RegFormResTBS          "setct-RegFormResTBS"
-#define NID_setct_RegFormResTBS         562
-#define OBJ_setct_RegFormResTBS         OBJ_set_ctype,44L
-
-#define SN_setct_CertReqData            "setct-CertReqData"
-#define NID_setct_CertReqData           563
-#define OBJ_setct_CertReqData           OBJ_set_ctype,45L
-
-#define SN_setct_CertReqTBS             "setct-CertReqTBS"
-#define NID_setct_CertReqTBS            564
-#define OBJ_setct_CertReqTBS            OBJ_set_ctype,46L
-
-#define SN_setct_CertResData            "setct-CertResData"
-#define NID_setct_CertResData           565
-#define OBJ_setct_CertResData           OBJ_set_ctype,47L
-
-#define SN_setct_CertInqReqTBS          "setct-CertInqReqTBS"
-#define NID_setct_CertInqReqTBS         566
-#define OBJ_setct_CertInqReqTBS         OBJ_set_ctype,48L
-
-#define SN_setct_ErrorTBS               "setct-ErrorTBS"
-#define NID_setct_ErrorTBS              567
-#define OBJ_setct_ErrorTBS              OBJ_set_ctype,49L
-
-#define SN_setct_PIDualSignedTBE                "setct-PIDualSignedTBE"
-#define NID_setct_PIDualSignedTBE               568
-#define OBJ_setct_PIDualSignedTBE               OBJ_set_ctype,50L
-
-#define SN_setct_PIUnsignedTBE          "setct-PIUnsignedTBE"
-#define NID_setct_PIUnsignedTBE         569
-#define OBJ_setct_PIUnsignedTBE         OBJ_set_ctype,51L
-
-#define SN_setct_AuthReqTBE             "setct-AuthReqTBE"
-#define NID_setct_AuthReqTBE            570
-#define OBJ_setct_AuthReqTBE            OBJ_set_ctype,52L
-
-#define SN_setct_AuthResTBE             "setct-AuthResTBE"
-#define NID_setct_AuthResTBE            571
-#define OBJ_setct_AuthResTBE            OBJ_set_ctype,53L
-
-#define SN_setct_AuthResTBEX            "setct-AuthResTBEX"
-#define NID_setct_AuthResTBEX           572
-#define OBJ_setct_AuthResTBEX           OBJ_set_ctype,54L
-
-#define SN_setct_AuthTokenTBE           "setct-AuthTokenTBE"
-#define NID_setct_AuthTokenTBE          573
-#define OBJ_setct_AuthTokenTBE          OBJ_set_ctype,55L
-
-#define SN_setct_CapTokenTBE            "setct-CapTokenTBE"
-#define NID_setct_CapTokenTBE           574
-#define OBJ_setct_CapTokenTBE           OBJ_set_ctype,56L
-
-#define SN_setct_CapTokenTBEX           "setct-CapTokenTBEX"
-#define NID_setct_CapTokenTBEX          575
-#define OBJ_setct_CapTokenTBEX          OBJ_set_ctype,57L
-
-#define SN_setct_AcqCardCodeMsgTBE              "setct-AcqCardCodeMsgTBE"
-#define NID_setct_AcqCardCodeMsgTBE             576
-#define OBJ_setct_AcqCardCodeMsgTBE             OBJ_set_ctype,58L
-
-#define SN_setct_AuthRevReqTBE          "setct-AuthRevReqTBE"
-#define NID_setct_AuthRevReqTBE         577
-#define OBJ_setct_AuthRevReqTBE         OBJ_set_ctype,59L
-
-#define SN_setct_AuthRevResTBE          "setct-AuthRevResTBE"
-#define NID_setct_AuthRevResTBE         578
-#define OBJ_setct_AuthRevResTBE         OBJ_set_ctype,60L
-
-#define SN_setct_AuthRevResTBEB         "setct-AuthRevResTBEB"
-#define NID_setct_AuthRevResTBEB                579
-#define OBJ_setct_AuthRevResTBEB                OBJ_set_ctype,61L
-
-#define SN_setct_CapReqTBE              "setct-CapReqTBE"
-#define NID_setct_CapReqTBE             580
-#define OBJ_setct_CapReqTBE             OBJ_set_ctype,62L
-
-#define SN_setct_CapReqTBEX             "setct-CapReqTBEX"
-#define NID_setct_CapReqTBEX            581
-#define OBJ_setct_CapReqTBEX            OBJ_set_ctype,63L
-
-#define SN_setct_CapResTBE              "setct-CapResTBE"
-#define NID_setct_CapResTBE             582
-#define OBJ_setct_CapResTBE             OBJ_set_ctype,64L
-
-#define SN_setct_CapRevReqTBE           "setct-CapRevReqTBE"
-#define NID_setct_CapRevReqTBE          583
-#define OBJ_setct_CapRevReqTBE          OBJ_set_ctype,65L
-
-#define SN_setct_CapRevReqTBEX          "setct-CapRevReqTBEX"
-#define NID_setct_CapRevReqTBEX         584
-#define OBJ_setct_CapRevReqTBEX         OBJ_set_ctype,66L
-
-#define SN_setct_CapRevResTBE           "setct-CapRevResTBE"
-#define NID_setct_CapRevResTBE          585
-#define OBJ_setct_CapRevResTBE          OBJ_set_ctype,67L
-
-#define SN_setct_CredReqTBE             "setct-CredReqTBE"
-#define NID_setct_CredReqTBE            586
-#define OBJ_setct_CredReqTBE            OBJ_set_ctype,68L
-
-#define SN_setct_CredReqTBEX            "setct-CredReqTBEX"
-#define NID_setct_CredReqTBEX           587
-#define OBJ_setct_CredReqTBEX           OBJ_set_ctype,69L
-
-#define SN_setct_CredResTBE             "setct-CredResTBE"
-#define NID_setct_CredResTBE            588
-#define OBJ_setct_CredResTBE            OBJ_set_ctype,70L
-
-#define SN_setct_CredRevReqTBE          "setct-CredRevReqTBE"
-#define NID_setct_CredRevReqTBE         589
-#define OBJ_setct_CredRevReqTBE         OBJ_set_ctype,71L
-
-#define SN_setct_CredRevReqTBEX         "setct-CredRevReqTBEX"
-#define NID_setct_CredRevReqTBEX                590
-#define OBJ_setct_CredRevReqTBEX                OBJ_set_ctype,72L
-
-#define SN_setct_CredRevResTBE          "setct-CredRevResTBE"
-#define NID_setct_CredRevResTBE         591
-#define OBJ_setct_CredRevResTBE         OBJ_set_ctype,73L
-
-#define SN_setct_BatchAdminReqTBE               "setct-BatchAdminReqTBE"
-#define NID_setct_BatchAdminReqTBE              592
-#define OBJ_setct_BatchAdminReqTBE              OBJ_set_ctype,74L
-
-#define SN_setct_BatchAdminResTBE               "setct-BatchAdminResTBE"
-#define NID_setct_BatchAdminResTBE              593
-#define OBJ_setct_BatchAdminResTBE              OBJ_set_ctype,75L
-
-#define SN_setct_RegFormReqTBE          "setct-RegFormReqTBE"
-#define NID_setct_RegFormReqTBE         594
-#define OBJ_setct_RegFormReqTBE         OBJ_set_ctype,76L
-
-#define SN_setct_CertReqTBE             "setct-CertReqTBE"
-#define NID_setct_CertReqTBE            595
-#define OBJ_setct_CertReqTBE            OBJ_set_ctype,77L
-
-#define SN_setct_CertReqTBEX            "setct-CertReqTBEX"
-#define NID_setct_CertReqTBEX           596
-#define OBJ_setct_CertReqTBEX           OBJ_set_ctype,78L
-
-#define SN_setct_CertResTBE             "setct-CertResTBE"
-#define NID_setct_CertResTBE            597
-#define OBJ_setct_CertResTBE            OBJ_set_ctype,79L
-
-#define SN_setct_CRLNotificationTBS             "setct-CRLNotificationTBS"
-#define NID_setct_CRLNotificationTBS            598
-#define OBJ_setct_CRLNotificationTBS            OBJ_set_ctype,80L
-
-#define SN_setct_CRLNotificationResTBS          "setct-CRLNotificationResTBS"
-#define NID_setct_CRLNotificationResTBS         599
-#define OBJ_setct_CRLNotificationResTBS         OBJ_set_ctype,81L
-
-#define SN_setct_BCIDistributionTBS             "setct-BCIDistributionTBS"
-#define NID_setct_BCIDistributionTBS            600
-#define OBJ_setct_BCIDistributionTBS            OBJ_set_ctype,82L
-
-#define SN_setext_genCrypt              "setext-genCrypt"
-#define LN_setext_genCrypt              "generic cryptogram"
-#define NID_setext_genCrypt             601
-#define OBJ_setext_genCrypt             OBJ_set_msgExt,1L
-
-#define SN_setext_miAuth                "setext-miAuth"
-#define LN_setext_miAuth                "merchant initiated auth"
-#define NID_setext_miAuth               602
-#define OBJ_setext_miAuth               OBJ_set_msgExt,3L
-
-#define SN_setext_pinSecure             "setext-pinSecure"
-#define NID_setext_pinSecure            603
-#define OBJ_setext_pinSecure            OBJ_set_msgExt,4L
-
-#define SN_setext_pinAny                "setext-pinAny"
-#define NID_setext_pinAny               604
-#define OBJ_setext_pinAny               OBJ_set_msgExt,5L
-
-#define SN_setext_track2                "setext-track2"
-#define NID_setext_track2               605
-#define OBJ_setext_track2               OBJ_set_msgExt,7L
-
-#define SN_setext_cv            "setext-cv"
-#define LN_setext_cv            "additional verification"
-#define NID_setext_cv           606
-#define OBJ_setext_cv           OBJ_set_msgExt,8L
-
-#define SN_set_policy_root              "set-policy-root"
-#define NID_set_policy_root             607
-#define OBJ_set_policy_root             OBJ_set_policy,0L
-
-#define SN_setCext_hashedRoot           "setCext-hashedRoot"
-#define NID_setCext_hashedRoot          608
-#define OBJ_setCext_hashedRoot          OBJ_set_certExt,0L
-
-#define SN_setCext_certType             "setCext-certType"
-#define NID_setCext_certType            609
-#define OBJ_setCext_certType            OBJ_set_certExt,1L
-
-#define SN_setCext_merchData            "setCext-merchData"
-#define NID_setCext_merchData           610
-#define OBJ_setCext_merchData           OBJ_set_certExt,2L
-
-#define SN_setCext_cCertRequired                "setCext-cCertRequired"
-#define NID_setCext_cCertRequired               611
-#define OBJ_setCext_cCertRequired               OBJ_set_certExt,3L
-
-#define SN_setCext_tunneling            "setCext-tunneling"
-#define NID_setCext_tunneling           612
-#define OBJ_setCext_tunneling           OBJ_set_certExt,4L
-
-#define SN_setCext_setExt               "setCext-setExt"
-#define NID_setCext_setExt              613
-#define OBJ_setCext_setExt              OBJ_set_certExt,5L
-
-#define SN_setCext_setQualf             "setCext-setQualf"
-#define NID_setCext_setQualf            614
-#define OBJ_setCext_setQualf            OBJ_set_certExt,6L
-
-#define SN_setCext_PGWYcapabilities             "setCext-PGWYcapabilities"
-#define NID_setCext_PGWYcapabilities            615
-#define OBJ_setCext_PGWYcapabilities            OBJ_set_certExt,7L
-
-#define SN_setCext_TokenIdentifier              "setCext-TokenIdentifier"
-#define NID_setCext_TokenIdentifier             616
-#define OBJ_setCext_TokenIdentifier             OBJ_set_certExt,8L
-
-#define SN_setCext_Track2Data           "setCext-Track2Data"
-#define NID_setCext_Track2Data          617
-#define OBJ_setCext_Track2Data          OBJ_set_certExt,9L
-
-#define SN_setCext_TokenType            "setCext-TokenType"
-#define NID_setCext_TokenType           618
-#define OBJ_setCext_TokenType           OBJ_set_certExt,10L
-
-#define SN_setCext_IssuerCapabilities           "setCext-IssuerCapabilities"
-#define NID_setCext_IssuerCapabilities          619
-#define OBJ_setCext_IssuerCapabilities          OBJ_set_certExt,11L
-
-#define SN_setAttr_Cert         "setAttr-Cert"
-#define NID_setAttr_Cert                620
-#define OBJ_setAttr_Cert                OBJ_set_attr,0L
-
-#define SN_setAttr_PGWYcap              "setAttr-PGWYcap"
-#define LN_setAttr_PGWYcap              "payment gateway capabilities"
-#define NID_setAttr_PGWYcap             621
-#define OBJ_setAttr_PGWYcap             OBJ_set_attr,1L
-
-#define SN_setAttr_TokenType            "setAttr-TokenType"
-#define NID_setAttr_TokenType           622
-#define OBJ_setAttr_TokenType           OBJ_set_attr,2L
-
-#define SN_setAttr_IssCap               "setAttr-IssCap"
-#define LN_setAttr_IssCap               "issuer capabilities"
-#define NID_setAttr_IssCap              623
-#define OBJ_setAttr_IssCap              OBJ_set_attr,3L
-
-#define SN_set_rootKeyThumb             "set-rootKeyThumb"
-#define NID_set_rootKeyThumb            624
-#define OBJ_set_rootKeyThumb            OBJ_setAttr_Cert,0L
-
-#define SN_set_addPolicy                "set-addPolicy"
-#define NID_set_addPolicy               625
-#define OBJ_set_addPolicy               OBJ_setAttr_Cert,1L
-
-#define SN_setAttr_Token_EMV            "setAttr-Token-EMV"
-#define NID_setAttr_Token_EMV           626
-#define OBJ_setAttr_Token_EMV           OBJ_setAttr_TokenType,1L
-
-#define SN_setAttr_Token_B0Prime                "setAttr-Token-B0Prime"
-#define NID_setAttr_Token_B0Prime               627
-#define OBJ_setAttr_Token_B0Prime               OBJ_setAttr_TokenType,2L
-
-#define SN_setAttr_IssCap_CVM           "setAttr-IssCap-CVM"
-#define NID_setAttr_IssCap_CVM          628
-#define OBJ_setAttr_IssCap_CVM          OBJ_setAttr_IssCap,3L
-
-#define SN_setAttr_IssCap_T2            "setAttr-IssCap-T2"
-#define NID_setAttr_IssCap_T2           629
-#define OBJ_setAttr_IssCap_T2           OBJ_setAttr_IssCap,4L
-
-#define SN_setAttr_IssCap_Sig           "setAttr-IssCap-Sig"
-#define NID_setAttr_IssCap_Sig          630
-#define OBJ_setAttr_IssCap_Sig          OBJ_setAttr_IssCap,5L
-
-#define SN_setAttr_GenCryptgrm          "setAttr-GenCryptgrm"
-#define LN_setAttr_GenCryptgrm          "generate cryptogram"
-#define NID_setAttr_GenCryptgrm         631
-#define OBJ_setAttr_GenCryptgrm         OBJ_setAttr_IssCap_CVM,1L
-
-#define SN_setAttr_T2Enc                "setAttr-T2Enc"
-#define LN_setAttr_T2Enc                "encrypted track 2"
-#define NID_setAttr_T2Enc               632
-#define OBJ_setAttr_T2Enc               OBJ_setAttr_IssCap_T2,1L
-
-#define SN_setAttr_T2cleartxt           "setAttr-T2cleartxt"
-#define LN_setAttr_T2cleartxt           "cleartext track 2"
-#define NID_setAttr_T2cleartxt          633
-#define OBJ_setAttr_T2cleartxt          OBJ_setAttr_IssCap_T2,2L
-
-#define SN_setAttr_TokICCsig            "setAttr-TokICCsig"
-#define LN_setAttr_TokICCsig            "ICC or token signature"
-#define NID_setAttr_TokICCsig           634
-#define OBJ_setAttr_TokICCsig           OBJ_setAttr_IssCap_Sig,1L
-
-#define SN_setAttr_SecDevSig            "setAttr-SecDevSig"
-#define LN_setAttr_SecDevSig            "secure device signature"
-#define NID_setAttr_SecDevSig           635
-#define OBJ_setAttr_SecDevSig           OBJ_setAttr_IssCap_Sig,2L
-
-#define SN_set_brand_IATA_ATA           "set-brand-IATA-ATA"
-#define NID_set_brand_IATA_ATA          636
-#define OBJ_set_brand_IATA_ATA          OBJ_set_brand,1L
-
-#define SN_set_brand_Diners             "set-brand-Diners"
-#define NID_set_brand_Diners            637
-#define OBJ_set_brand_Diners            OBJ_set_brand,30L
-
-#define SN_set_brand_AmericanExpress            "set-brand-AmericanExpress"
-#define NID_set_brand_AmericanExpress           638
-#define OBJ_set_brand_AmericanExpress           OBJ_set_brand,34L
-
-#define SN_set_brand_JCB                "set-brand-JCB"
-#define NID_set_brand_JCB               639
-#define OBJ_set_brand_JCB               OBJ_set_brand,35L
-
-#define SN_set_brand_Visa               "set-brand-Visa"
-#define NID_set_brand_Visa              640
-#define OBJ_set_brand_Visa              OBJ_set_brand,4L
-
-#define SN_set_brand_MasterCard         "set-brand-MasterCard"
-#define NID_set_brand_MasterCard                641
-#define OBJ_set_brand_MasterCard                OBJ_set_brand,5L
-
-#define SN_set_brand_Novus              "set-brand-Novus"
-#define NID_set_brand_Novus             642
-#define OBJ_set_brand_Novus             OBJ_set_brand,6011L
-
-#define SN_des_cdmf             "DES-CDMF"
-#define LN_des_cdmf             "des-cdmf"
-#define NID_des_cdmf            643
-#define OBJ_des_cdmf            OBJ_rsadsi,3L,10L
-
-#define SN_rsaOAEPEncryptionSET         "rsaOAEPEncryptionSET"
-#define NID_rsaOAEPEncryptionSET                644
-#define OBJ_rsaOAEPEncryptionSET                OBJ_rsadsi,1L,1L,6L
-
-#define SN_ipsec3               "Oakley-EC2N-3"
-#define LN_ipsec3               "ipsec3"
-#define NID_ipsec3              749
-
-#define SN_ipsec4               "Oakley-EC2N-4"
-#define LN_ipsec4               "ipsec4"
-#define NID_ipsec4              750
-
-#define SN_whirlpool            "whirlpool"
-#define NID_whirlpool           804
-#define OBJ_whirlpool           OBJ_iso,0L,10118L,3L,0L,55L
-
-#define SN_cryptopro            "cryptopro"
-#define NID_cryptopro           805
-#define OBJ_cryptopro           OBJ_member_body,643L,2L,2L
-
-#define SN_cryptocom            "cryptocom"
-#define NID_cryptocom           806
-#define OBJ_cryptocom           OBJ_member_body,643L,2L,9L
-
-#define SN_id_GostR3411_94_with_GostR3410_2001          "id-GostR3411-94-with-GostR3410-2001"
-#define LN_id_GostR3411_94_with_GostR3410_2001          "GOST R 34.11-94 with GOST R 34.10-2001"
-#define NID_id_GostR3411_94_with_GostR3410_2001         807
-#define OBJ_id_GostR3411_94_with_GostR3410_2001         OBJ_cryptopro,3L
-
-#define SN_id_GostR3411_94_with_GostR3410_94            "id-GostR3411-94-with-GostR3410-94"
-#define LN_id_GostR3411_94_with_GostR3410_94            "GOST R 34.11-94 with GOST R 34.10-94"
-#define NID_id_GostR3411_94_with_GostR3410_94           808
-#define OBJ_id_GostR3411_94_with_GostR3410_94           OBJ_cryptopro,4L
-
-#define SN_id_GostR3411_94              "md_gost94"
-#define LN_id_GostR3411_94              "GOST R 34.11-94"
-#define NID_id_GostR3411_94             809
-#define OBJ_id_GostR3411_94             OBJ_cryptopro,9L
-
-#define SN_id_HMACGostR3411_94          "id-HMACGostR3411-94"
-#define LN_id_HMACGostR3411_94          "HMAC GOST 34.11-94"
-#define NID_id_HMACGostR3411_94         810
-#define OBJ_id_HMACGostR3411_94         OBJ_cryptopro,10L
-
-#define SN_id_GostR3410_2001            "gost2001"
-#define LN_id_GostR3410_2001            "GOST R 34.10-2001"
-#define NID_id_GostR3410_2001           811
-#define OBJ_id_GostR3410_2001           OBJ_cryptopro,19L
-
-#define SN_id_GostR3410_94              "gost94"
-#define LN_id_GostR3410_94              "GOST R 34.10-94"
-#define NID_id_GostR3410_94             812
-#define OBJ_id_GostR3410_94             OBJ_cryptopro,20L
-
-#define SN_id_Gost28147_89              "gost89"
-#define LN_id_Gost28147_89              "GOST 28147-89"
-#define NID_id_Gost28147_89             813
-#define OBJ_id_Gost28147_89             OBJ_cryptopro,21L
-
-#define SN_gost89_cnt           "gost89-cnt"
-#define NID_gost89_cnt          814
-
-#define SN_id_Gost28147_89_MAC          "gost-mac"
-#define LN_id_Gost28147_89_MAC          "GOST 28147-89 MAC"
-#define NID_id_Gost28147_89_MAC         815
-#define OBJ_id_Gost28147_89_MAC         OBJ_cryptopro,22L
-
-#define SN_id_GostR3411_94_prf          "prf-gostr3411-94"
-#define LN_id_GostR3411_94_prf          "GOST R 34.11-94 PRF"
-#define NID_id_GostR3411_94_prf         816
-#define OBJ_id_GostR3411_94_prf         OBJ_cryptopro,23L
-
-#define SN_id_GostR3410_2001DH          "id-GostR3410-2001DH"
-#define LN_id_GostR3410_2001DH          "GOST R 34.10-2001 DH"
-#define NID_id_GostR3410_2001DH         817
-#define OBJ_id_GostR3410_2001DH         OBJ_cryptopro,98L
-
-#define SN_id_GostR3410_94DH            "id-GostR3410-94DH"
-#define LN_id_GostR3410_94DH            "GOST R 34.10-94 DH"
-#define NID_id_GostR3410_94DH           818
-#define OBJ_id_GostR3410_94DH           OBJ_cryptopro,99L
-
-#define SN_id_Gost28147_89_CryptoPro_KeyMeshing         "id-Gost28147-89-CryptoPro-KeyMeshing"
-#define NID_id_Gost28147_89_CryptoPro_KeyMeshing                819
-#define OBJ_id_Gost28147_89_CryptoPro_KeyMeshing                OBJ_cryptopro,14L,1L
-
-#define SN_id_Gost28147_89_None_KeyMeshing              "id-Gost28147-89-None-KeyMeshing"
-#define NID_id_Gost28147_89_None_KeyMeshing             820
-#define OBJ_id_Gost28147_89_None_KeyMeshing             OBJ_cryptopro,14L,0L
-
-#define SN_id_GostR3411_94_TestParamSet         "id-GostR3411-94-TestParamSet"
-#define NID_id_GostR3411_94_TestParamSet                821
-#define OBJ_id_GostR3411_94_TestParamSet                OBJ_cryptopro,30L,0L
-
-#define SN_id_GostR3411_94_CryptoProParamSet            "id-GostR3411-94-CryptoProParamSet"
-#define NID_id_GostR3411_94_CryptoProParamSet           822
-#define OBJ_id_GostR3411_94_CryptoProParamSet           OBJ_cryptopro,30L,1L
-
-#define SN_id_Gost28147_89_TestParamSet         "id-Gost28147-89-TestParamSet"
-#define NID_id_Gost28147_89_TestParamSet                823
-#define OBJ_id_Gost28147_89_TestParamSet                OBJ_cryptopro,31L,0L
-
-#define SN_id_Gost28147_89_CryptoPro_A_ParamSet         "id-Gost28147-89-CryptoPro-A-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_A_ParamSet                824
-#define OBJ_id_Gost28147_89_CryptoPro_A_ParamSet                OBJ_cryptopro,31L,1L
-
-#define SN_id_Gost28147_89_CryptoPro_B_ParamSet         "id-Gost28147-89-CryptoPro-B-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_B_ParamSet                825
-#define OBJ_id_Gost28147_89_CryptoPro_B_ParamSet                OBJ_cryptopro,31L,2L
-
-#define SN_id_Gost28147_89_CryptoPro_C_ParamSet         "id-Gost28147-89-CryptoPro-C-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_C_ParamSet                826
-#define OBJ_id_Gost28147_89_CryptoPro_C_ParamSet                OBJ_cryptopro,31L,3L
-
-#define SN_id_Gost28147_89_CryptoPro_D_ParamSet         "id-Gost28147-89-CryptoPro-D-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_D_ParamSet                827
-#define OBJ_id_Gost28147_89_CryptoPro_D_ParamSet                OBJ_cryptopro,31L,4L
-
-#define SN_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet         "id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet                828
-#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet                OBJ_cryptopro,31L,5L
-
-#define SN_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet         "id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet                829
-#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet                OBJ_cryptopro,31L,6L
-
-#define SN_id_Gost28147_89_CryptoPro_RIC_1_ParamSet             "id-Gost28147-89-CryptoPro-RIC-1-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet            830
-#define OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet            OBJ_cryptopro,31L,7L
-
-#define SN_id_GostR3410_94_TestParamSet         "id-GostR3410-94-TestParamSet"
-#define NID_id_GostR3410_94_TestParamSet                831
-#define OBJ_id_GostR3410_94_TestParamSet                OBJ_cryptopro,32L,0L
-
-#define SN_id_GostR3410_94_CryptoPro_A_ParamSet         "id-GostR3410-94-CryptoPro-A-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_A_ParamSet                832
-#define OBJ_id_GostR3410_94_CryptoPro_A_ParamSet                OBJ_cryptopro,32L,2L
-
-#define SN_id_GostR3410_94_CryptoPro_B_ParamSet         "id-GostR3410-94-CryptoPro-B-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_B_ParamSet                833
-#define OBJ_id_GostR3410_94_CryptoPro_B_ParamSet                OBJ_cryptopro,32L,3L
-
-#define SN_id_GostR3410_94_CryptoPro_C_ParamSet         "id-GostR3410-94-CryptoPro-C-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_C_ParamSet                834
-#define OBJ_id_GostR3410_94_CryptoPro_C_ParamSet                OBJ_cryptopro,32L,4L
-
-#define SN_id_GostR3410_94_CryptoPro_D_ParamSet         "id-GostR3410-94-CryptoPro-D-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_D_ParamSet                835
-#define OBJ_id_GostR3410_94_CryptoPro_D_ParamSet                OBJ_cryptopro,32L,5L
-
-#define SN_id_GostR3410_94_CryptoPro_XchA_ParamSet              "id-GostR3410-94-CryptoPro-XchA-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchA_ParamSet             836
-#define OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet             OBJ_cryptopro,33L,1L
-
-#define SN_id_GostR3410_94_CryptoPro_XchB_ParamSet              "id-GostR3410-94-CryptoPro-XchB-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchB_ParamSet             837
-#define OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet             OBJ_cryptopro,33L,2L
-
-#define SN_id_GostR3410_94_CryptoPro_XchC_ParamSet              "id-GostR3410-94-CryptoPro-XchC-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchC_ParamSet             838
-#define OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet             OBJ_cryptopro,33L,3L
-
-#define SN_id_GostR3410_2001_TestParamSet               "id-GostR3410-2001-TestParamSet"
-#define NID_id_GostR3410_2001_TestParamSet              839
-#define OBJ_id_GostR3410_2001_TestParamSet              OBJ_cryptopro,35L,0L
-
-#define SN_id_GostR3410_2001_CryptoPro_A_ParamSet               "id-GostR3410-2001-CryptoPro-A-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_A_ParamSet              840
-#define OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet              OBJ_cryptopro,35L,1L
-
-#define SN_id_GostR3410_2001_CryptoPro_B_ParamSet               "id-GostR3410-2001-CryptoPro-B-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_B_ParamSet              841
-#define OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet              OBJ_cryptopro,35L,2L
-
-#define SN_id_GostR3410_2001_CryptoPro_C_ParamSet               "id-GostR3410-2001-CryptoPro-C-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_C_ParamSet              842
-#define OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet              OBJ_cryptopro,35L,3L
-
-#define SN_id_GostR3410_2001_CryptoPro_XchA_ParamSet            "id-GostR3410-2001-CryptoPro-XchA-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet           843
-#define OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet           OBJ_cryptopro,36L,0L
-
-#define SN_id_GostR3410_2001_CryptoPro_XchB_ParamSet            "id-GostR3410-2001-CryptoPro-XchB-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet           844
-#define OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet           OBJ_cryptopro,36L,1L
-
-#define SN_id_GostR3410_94_a            "id-GostR3410-94-a"
-#define NID_id_GostR3410_94_a           845
-#define OBJ_id_GostR3410_94_a           OBJ_id_GostR3410_94,1L
-
-#define SN_id_GostR3410_94_aBis         "id-GostR3410-94-aBis"
-#define NID_id_GostR3410_94_aBis                846
-#define OBJ_id_GostR3410_94_aBis                OBJ_id_GostR3410_94,2L
-
-#define SN_id_GostR3410_94_b            "id-GostR3410-94-b"
-#define NID_id_GostR3410_94_b           847
-#define OBJ_id_GostR3410_94_b           OBJ_id_GostR3410_94,3L
-
-#define SN_id_GostR3410_94_bBis         "id-GostR3410-94-bBis"
-#define NID_id_GostR3410_94_bBis                848
-#define OBJ_id_GostR3410_94_bBis                OBJ_id_GostR3410_94,4L
-
-#define SN_id_Gost28147_89_cc           "id-Gost28147-89-cc"
-#define LN_id_Gost28147_89_cc           "GOST 28147-89 Cryptocom ParamSet"
-#define NID_id_Gost28147_89_cc          849
-#define OBJ_id_Gost28147_89_cc          OBJ_cryptocom,1L,6L,1L
-
-#define SN_id_GostR3410_94_cc           "gost94cc"
-#define LN_id_GostR3410_94_cc           "GOST 34.10-94 Cryptocom"
-#define NID_id_GostR3410_94_cc          850
-#define OBJ_id_GostR3410_94_cc          OBJ_cryptocom,1L,5L,3L
-
-#define SN_id_GostR3410_2001_cc         "gost2001cc"
-#define LN_id_GostR3410_2001_cc         "GOST 34.10-2001 Cryptocom"
-#define NID_id_GostR3410_2001_cc                851
-#define OBJ_id_GostR3410_2001_cc                OBJ_cryptocom,1L,5L,4L
-
-#define SN_id_GostR3411_94_with_GostR3410_94_cc         "id-GostR3411-94-with-GostR3410-94-cc"
-#define LN_id_GostR3411_94_with_GostR3410_94_cc         "GOST R 34.11-94 with GOST R 34.10-94 Cryptocom"
-#define NID_id_GostR3411_94_with_GostR3410_94_cc                852
-#define OBJ_id_GostR3411_94_with_GostR3410_94_cc                OBJ_cryptocom,1L,3L,3L
-
-#define SN_id_GostR3411_94_with_GostR3410_2001_cc               "id-GostR3411-94-with-GostR3410-2001-cc"
-#define LN_id_GostR3411_94_with_GostR3410_2001_cc               "GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom"
-#define NID_id_GostR3411_94_with_GostR3410_2001_cc              853
-#define OBJ_id_GostR3411_94_with_GostR3410_2001_cc              OBJ_cryptocom,1L,3L,4L
-
-#define SN_id_GostR3410_2001_ParamSet_cc                "id-GostR3410-2001-ParamSet-cc"
-#define LN_id_GostR3410_2001_ParamSet_cc                "GOST R 3410-2001 Parameter Set Cryptocom"
-#define NID_id_GostR3410_2001_ParamSet_cc               854
-#define OBJ_id_GostR3410_2001_ParamSet_cc               OBJ_cryptocom,1L,8L,1L
-
-#define SN_camellia_128_cbc             "CAMELLIA-128-CBC"
-#define LN_camellia_128_cbc             "camellia-128-cbc"
-#define NID_camellia_128_cbc            751
-#define OBJ_camellia_128_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,2L
-
-#define SN_camellia_192_cbc             "CAMELLIA-192-CBC"
-#define LN_camellia_192_cbc             "camellia-192-cbc"
-#define NID_camellia_192_cbc            752
-#define OBJ_camellia_192_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,3L
-
-#define SN_camellia_256_cbc             "CAMELLIA-256-CBC"
-#define LN_camellia_256_cbc             "camellia-256-cbc"
-#define NID_camellia_256_cbc            753
-#define OBJ_camellia_256_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,4L
-
-#define SN_id_camellia128_wrap          "id-camellia128-wrap"
-#define NID_id_camellia128_wrap         907
-#define OBJ_id_camellia128_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,2L
-
-#define SN_id_camellia192_wrap          "id-camellia192-wrap"
-#define NID_id_camellia192_wrap         908
-#define OBJ_id_camellia192_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,3L
-
-#define SN_id_camellia256_wrap          "id-camellia256-wrap"
-#define NID_id_camellia256_wrap         909
-#define OBJ_id_camellia256_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,4L
-
-#define OBJ_ntt_ds              0L,3L,4401L,5L
-
-#define OBJ_camellia            OBJ_ntt_ds,3L,1L,9L
-
-#define SN_camellia_128_ecb             "CAMELLIA-128-ECB"
-#define LN_camellia_128_ecb             "camellia-128-ecb"
-#define NID_camellia_128_ecb            754
-#define OBJ_camellia_128_ecb            OBJ_camellia,1L
-
-#define SN_camellia_128_ofb128          "CAMELLIA-128-OFB"
-#define LN_camellia_128_ofb128          "camellia-128-ofb"
-#define NID_camellia_128_ofb128         766
-#define OBJ_camellia_128_ofb128         OBJ_camellia,3L
-
-#define SN_camellia_128_cfb128          "CAMELLIA-128-CFB"
-#define LN_camellia_128_cfb128          "camellia-128-cfb"
-#define NID_camellia_128_cfb128         757
-#define OBJ_camellia_128_cfb128         OBJ_camellia,4L
-
-#define SN_camellia_192_ecb             "CAMELLIA-192-ECB"
-#define LN_camellia_192_ecb             "camellia-192-ecb"
-#define NID_camellia_192_ecb            755
-#define OBJ_camellia_192_ecb            OBJ_camellia,21L
-
-#define SN_camellia_192_ofb128          "CAMELLIA-192-OFB"
-#define LN_camellia_192_ofb128          "camellia-192-ofb"
-#define NID_camellia_192_ofb128         767
-#define OBJ_camellia_192_ofb128         OBJ_camellia,23L
-
-#define SN_camellia_192_cfb128          "CAMELLIA-192-CFB"
-#define LN_camellia_192_cfb128          "camellia-192-cfb"
-#define NID_camellia_192_cfb128         758
-#define OBJ_camellia_192_cfb128         OBJ_camellia,24L
-
-#define SN_camellia_256_ecb             "CAMELLIA-256-ECB"
-#define LN_camellia_256_ecb             "camellia-256-ecb"
-#define NID_camellia_256_ecb            756
-#define OBJ_camellia_256_ecb            OBJ_camellia,41L
-
-#define SN_camellia_256_ofb128          "CAMELLIA-256-OFB"
-#define LN_camellia_256_ofb128          "camellia-256-ofb"
-#define NID_camellia_256_ofb128         768
-#define OBJ_camellia_256_ofb128         OBJ_camellia,43L
-
-#define SN_camellia_256_cfb128          "CAMELLIA-256-CFB"
-#define LN_camellia_256_cfb128          "camellia-256-cfb"
-#define NID_camellia_256_cfb128         759
-#define OBJ_camellia_256_cfb128         OBJ_camellia,44L
-
-#define SN_camellia_128_cfb1            "CAMELLIA-128-CFB1"
-#define LN_camellia_128_cfb1            "camellia-128-cfb1"
-#define NID_camellia_128_cfb1           760
-
-#define SN_camellia_192_cfb1            "CAMELLIA-192-CFB1"
-#define LN_camellia_192_cfb1            "camellia-192-cfb1"
-#define NID_camellia_192_cfb1           761
-
-#define SN_camellia_256_cfb1            "CAMELLIA-256-CFB1"
-#define LN_camellia_256_cfb1            "camellia-256-cfb1"
-#define NID_camellia_256_cfb1           762
-
-#define SN_camellia_128_cfb8            "CAMELLIA-128-CFB8"
-#define LN_camellia_128_cfb8            "camellia-128-cfb8"
-#define NID_camellia_128_cfb8           763
-
-#define SN_camellia_192_cfb8            "CAMELLIA-192-CFB8"
-#define LN_camellia_192_cfb8            "camellia-192-cfb8"
-#define NID_camellia_192_cfb8           764
-
-#define SN_camellia_256_cfb8            "CAMELLIA-256-CFB8"
-#define LN_camellia_256_cfb8            "camellia-256-cfb8"
-#define NID_camellia_256_cfb8           765
-
-#define SN_kisa         "KISA"
-#define LN_kisa         "kisa"
-#define NID_kisa                773
-#define OBJ_kisa                OBJ_member_body,410L,200004L
-
-#define SN_seed_ecb             "SEED-ECB"
-#define LN_seed_ecb             "seed-ecb"
-#define NID_seed_ecb            776
-#define OBJ_seed_ecb            OBJ_kisa,1L,3L
-
-#define SN_seed_cbc             "SEED-CBC"
-#define LN_seed_cbc             "seed-cbc"
-#define NID_seed_cbc            777
-#define OBJ_seed_cbc            OBJ_kisa,1L,4L
-
-#define SN_seed_cfb128          "SEED-CFB"
-#define LN_seed_cfb128          "seed-cfb"
-#define NID_seed_cfb128         779
-#define OBJ_seed_cfb128         OBJ_kisa,1L,5L
-
-#define SN_seed_ofb128          "SEED-OFB"
-#define LN_seed_ofb128          "seed-ofb"
-#define NID_seed_ofb128         778
-#define OBJ_seed_ofb128         OBJ_kisa,1L,6L
-
-#define SN_hmac         "HMAC"
-#define LN_hmac         "hmac"
-#define NID_hmac                855
-
-#define SN_cmac         "CMAC"
-#define LN_cmac         "cmac"
-#define NID_cmac                894
-
-#define SN_rc4_hmac_md5         "RC4-HMAC-MD5"
-#define LN_rc4_hmac_md5         "rc4-hmac-md5"
-#define NID_rc4_hmac_md5                915
-
-#define SN_aes_128_cbc_hmac_sha1                "AES-128-CBC-HMAC-SHA1"
-#define LN_aes_128_cbc_hmac_sha1                "aes-128-cbc-hmac-sha1"
-#define NID_aes_128_cbc_hmac_sha1               916
-
-#define SN_aes_192_cbc_hmac_sha1                "AES-192-CBC-HMAC-SHA1"
-#define LN_aes_192_cbc_hmac_sha1                "aes-192-cbc-hmac-sha1"
-#define NID_aes_192_cbc_hmac_sha1               917
-
-#define SN_aes_256_cbc_hmac_sha1                "AES-256-CBC-HMAC-SHA1"
-#define LN_aes_256_cbc_hmac_sha1                "aes-256-cbc-hmac-sha1"
-#define NID_aes_256_cbc_hmac_sha1               918
-
-#define SN_aes_128_cbc_hmac_sha256              "AES-128-CBC-HMAC-SHA256"
-#define LN_aes_128_cbc_hmac_sha256              "aes-128-cbc-hmac-sha256"
-#define NID_aes_128_cbc_hmac_sha256             948
-
-#define SN_aes_192_cbc_hmac_sha256              "AES-192-CBC-HMAC-SHA256"
-#define LN_aes_192_cbc_hmac_sha256              "aes-192-cbc-hmac-sha256"
-#define NID_aes_192_cbc_hmac_sha256             949
-
-#define SN_aes_256_cbc_hmac_sha256              "AES-256-CBC-HMAC-SHA256"
-#define LN_aes_256_cbc_hmac_sha256              "aes-256-cbc-hmac-sha256"
-#define NID_aes_256_cbc_hmac_sha256             950
-
-#define SN_dhpublicnumber               "dhpublicnumber"
-#define LN_dhpublicnumber               "X9.42 DH"
-#define NID_dhpublicnumber              920
-#define OBJ_dhpublicnumber              OBJ_ISO_US,10046L,2L,1L
-
-#define SN_brainpoolP160r1              "brainpoolP160r1"
-#define NID_brainpoolP160r1             921
-#define OBJ_brainpoolP160r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,1L
-
-#define SN_brainpoolP160t1              "brainpoolP160t1"
-#define NID_brainpoolP160t1             922
-#define OBJ_brainpoolP160t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,2L
-
-#define SN_brainpoolP192r1              "brainpoolP192r1"
-#define NID_brainpoolP192r1             923
-#define OBJ_brainpoolP192r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,3L
-
-#define SN_brainpoolP192t1              "brainpoolP192t1"
-#define NID_brainpoolP192t1             924
-#define OBJ_brainpoolP192t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,4L
-
-#define SN_brainpoolP224r1              "brainpoolP224r1"
-#define NID_brainpoolP224r1             925
-#define OBJ_brainpoolP224r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,5L
-
-#define SN_brainpoolP224t1              "brainpoolP224t1"
-#define NID_brainpoolP224t1             926
-#define OBJ_brainpoolP224t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,6L
-
-#define SN_brainpoolP256r1              "brainpoolP256r1"
-#define NID_brainpoolP256r1             927
-#define OBJ_brainpoolP256r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,7L
-
-#define SN_brainpoolP256t1              "brainpoolP256t1"
-#define NID_brainpoolP256t1             928
-#define OBJ_brainpoolP256t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,8L
-
-#define SN_brainpoolP320r1              "brainpoolP320r1"
-#define NID_brainpoolP320r1             929
-#define OBJ_brainpoolP320r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,9L
-
-#define SN_brainpoolP320t1              "brainpoolP320t1"
-#define NID_brainpoolP320t1             930
-#define OBJ_brainpoolP320t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,10L
-
-#define SN_brainpoolP384r1              "brainpoolP384r1"
-#define NID_brainpoolP384r1             931
-#define OBJ_brainpoolP384r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,11L
-
-#define SN_brainpoolP384t1              "brainpoolP384t1"
-#define NID_brainpoolP384t1             932
-#define OBJ_brainpoolP384t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,12L
-
-#define SN_brainpoolP512r1              "brainpoolP512r1"
-#define NID_brainpoolP512r1             933
-#define OBJ_brainpoolP512r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,13L
-
-#define SN_brainpoolP512t1              "brainpoolP512t1"
-#define NID_brainpoolP512t1             934
-#define OBJ_brainpoolP512t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,14L
-
-#define OBJ_x9_63_scheme                1L,3L,133L,16L,840L,63L,0L
-
-#define OBJ_secg_scheme         OBJ_certicom_arc,1L
-
-#define SN_dhSinglePass_stdDH_sha1kdf_scheme            "dhSinglePass-stdDH-sha1kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha1kdf_scheme           936
-#define OBJ_dhSinglePass_stdDH_sha1kdf_scheme           OBJ_x9_63_scheme,2L
-
-#define SN_dhSinglePass_stdDH_sha224kdf_scheme          "dhSinglePass-stdDH-sha224kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha224kdf_scheme         937
-#define OBJ_dhSinglePass_stdDH_sha224kdf_scheme         OBJ_secg_scheme,11L,0L
-
-#define SN_dhSinglePass_stdDH_sha256kdf_scheme          "dhSinglePass-stdDH-sha256kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha256kdf_scheme         938
-#define OBJ_dhSinglePass_stdDH_sha256kdf_scheme         OBJ_secg_scheme,11L,1L
-
-#define SN_dhSinglePass_stdDH_sha384kdf_scheme          "dhSinglePass-stdDH-sha384kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha384kdf_scheme         939
-#define OBJ_dhSinglePass_stdDH_sha384kdf_scheme         OBJ_secg_scheme,11L,2L
-
-#define SN_dhSinglePass_stdDH_sha512kdf_scheme          "dhSinglePass-stdDH-sha512kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha512kdf_scheme         940
-#define OBJ_dhSinglePass_stdDH_sha512kdf_scheme         OBJ_secg_scheme,11L,3L
-
-#define SN_dhSinglePass_cofactorDH_sha1kdf_scheme               "dhSinglePass-cofactorDH-sha1kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha1kdf_scheme              941
-#define OBJ_dhSinglePass_cofactorDH_sha1kdf_scheme              OBJ_x9_63_scheme,3L
-
-#define SN_dhSinglePass_cofactorDH_sha224kdf_scheme             "dhSinglePass-cofactorDH-sha224kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha224kdf_scheme            942
-#define OBJ_dhSinglePass_cofactorDH_sha224kdf_scheme            OBJ_secg_scheme,14L,0L
-
-#define SN_dhSinglePass_cofactorDH_sha256kdf_scheme             "dhSinglePass-cofactorDH-sha256kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha256kdf_scheme            943
-#define OBJ_dhSinglePass_cofactorDH_sha256kdf_scheme            OBJ_secg_scheme,14L,1L
-
-#define SN_dhSinglePass_cofactorDH_sha384kdf_scheme             "dhSinglePass-cofactorDH-sha384kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha384kdf_scheme            944
-#define OBJ_dhSinglePass_cofactorDH_sha384kdf_scheme            OBJ_secg_scheme,14L,2L
-
-#define SN_dhSinglePass_cofactorDH_sha512kdf_scheme             "dhSinglePass-cofactorDH-sha512kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha512kdf_scheme            945
-#define OBJ_dhSinglePass_cofactorDH_sha512kdf_scheme            OBJ_secg_scheme,14L,3L
-
-#define SN_dh_std_kdf           "dh-std-kdf"
-#define NID_dh_std_kdf          946
-
-#define SN_dh_cofactor_kdf              "dh-cofactor-kdf"
-#define NID_dh_cofactor_kdf             947
-
-#define SN_ct_precert_scts              "ct_precert_scts"
-#define LN_ct_precert_scts              "CT Precertificate SCTs"
-#define NID_ct_precert_scts             951
-#define OBJ_ct_precert_scts             1L,3L,6L,1L,4L,1L,11129L,2L,4L,2L
-
-#define SN_ct_precert_poison            "ct_precert_poison"
-#define LN_ct_precert_poison            "CT Precertificate Poison"
-#define NID_ct_precert_poison           952
-#define OBJ_ct_precert_poison           1L,3L,6L,1L,4L,1L,11129L,2L,4L,3L
-
-#define SN_ct_precert_signer            "ct_precert_signer"
-#define LN_ct_precert_signer            "CT Precertificate Signer"
-#define NID_ct_precert_signer           953
-#define OBJ_ct_precert_signer           1L,3L,6L,1L,4L,1L,11129L,2L,4L,4L
-
-#define SN_ct_cert_scts         "ct_cert_scts"
-#define LN_ct_cert_scts         "CT Certificate SCTs"
-#define NID_ct_cert_scts                954
-#define OBJ_ct_cert_scts                1L,3L,6L,1L,4L,1L,11129L,2L,4L,5L
-
-#define SN_jurisdictionLocalityName             "jurisdictionL"
-#define LN_jurisdictionLocalityName             "jurisdictionLocalityName"
-#define NID_jurisdictionLocalityName            955
-#define OBJ_jurisdictionLocalityName            1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,1L
-
-#define SN_jurisdictionStateOrProvinceName              "jurisdictionST"
-#define LN_jurisdictionStateOrProvinceName              "jurisdictionStateOrProvinceName"
-#define NID_jurisdictionStateOrProvinceName             956
-#define OBJ_jurisdictionStateOrProvinceName             1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,2L
-
-#define SN_jurisdictionCountryName              "jurisdictionC"
-#define LN_jurisdictionCountryName              "jurisdictionCountryName"
-#define NID_jurisdictionCountryName             957
-#define OBJ_jurisdictionCountryName             1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,3L
diff --git a/openflow/usr/include/openssl/objects.h b/openflow/usr/include/openssl/objects.h
deleted file mode 100644
index b8dafa8..0000000
--- a/openflow/usr/include/openssl/objects.h
+++ /dev/null
@@ -1,1143 +0,0 @@
-/* crypto/objects/objects.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_OBJECTS_H
-# define HEADER_OBJECTS_H
-
-# define USE_OBJ_MAC
-
-# ifdef USE_OBJ_MAC
-#  include <openssl/obj_mac.h>
-# else
-#  define SN_undef                        "UNDEF"
-#  define LN_undef                        "undefined"
-#  define NID_undef                       0
-#  define OBJ_undef                       0L
-
-#  define SN_Algorithm                    "Algorithm"
-#  define LN_algorithm                    "algorithm"
-#  define NID_algorithm                   38
-#  define OBJ_algorithm                   1L,3L,14L,3L,2L
-
-#  define LN_rsadsi                       "rsadsi"
-#  define NID_rsadsi                      1
-#  define OBJ_rsadsi                      1L,2L,840L,113549L
-
-#  define LN_pkcs                         "pkcs"
-#  define NID_pkcs                        2
-#  define OBJ_pkcs                        OBJ_rsadsi,1L
-
-#  define SN_md2                          "MD2"
-#  define LN_md2                          "md2"
-#  define NID_md2                         3
-#  define OBJ_md2                         OBJ_rsadsi,2L,2L
-
-#  define SN_md5                          "MD5"
-#  define LN_md5                          "md5"
-#  define NID_md5                         4
-#  define OBJ_md5                         OBJ_rsadsi,2L,5L
-
-#  define SN_rc4                          "RC4"
-#  define LN_rc4                          "rc4"
-#  define NID_rc4                         5
-#  define OBJ_rc4                         OBJ_rsadsi,3L,4L
-
-#  define LN_rsaEncryption                "rsaEncryption"
-#  define NID_rsaEncryption               6
-#  define OBJ_rsaEncryption               OBJ_pkcs,1L,1L
-
-#  define SN_md2WithRSAEncryption         "RSA-MD2"
-#  define LN_md2WithRSAEncryption         "md2WithRSAEncryption"
-#  define NID_md2WithRSAEncryption        7
-#  define OBJ_md2WithRSAEncryption        OBJ_pkcs,1L,2L
-
-#  define SN_md5WithRSAEncryption         "RSA-MD5"
-#  define LN_md5WithRSAEncryption         "md5WithRSAEncryption"
-#  define NID_md5WithRSAEncryption        8
-#  define OBJ_md5WithRSAEncryption        OBJ_pkcs,1L,4L
-
-#  define SN_pbeWithMD2AndDES_CBC         "PBE-MD2-DES"
-#  define LN_pbeWithMD2AndDES_CBC         "pbeWithMD2AndDES-CBC"
-#  define NID_pbeWithMD2AndDES_CBC        9
-#  define OBJ_pbeWithMD2AndDES_CBC        OBJ_pkcs,5L,1L
-
-#  define SN_pbeWithMD5AndDES_CBC         "PBE-MD5-DES"
-#  define LN_pbeWithMD5AndDES_CBC         "pbeWithMD5AndDES-CBC"
-#  define NID_pbeWithMD5AndDES_CBC        10
-#  define OBJ_pbeWithMD5AndDES_CBC        OBJ_pkcs,5L,3L
-
-#  define LN_X500                         "X500"
-#  define NID_X500                        11
-#  define OBJ_X500                        2L,5L
-
-#  define LN_X509                         "X509"
-#  define NID_X509                        12
-#  define OBJ_X509                        OBJ_X500,4L
-
-#  define SN_commonName                   "CN"
-#  define LN_commonName                   "commonName"
-#  define NID_commonName                  13
-#  define OBJ_commonName                  OBJ_X509,3L
-
-#  define SN_countryName                  "C"
-#  define LN_countryName                  "countryName"
-#  define NID_countryName                 14
-#  define OBJ_countryName                 OBJ_X509,6L
-
-#  define SN_localityName                 "L"
-#  define LN_localityName                 "localityName"
-#  define NID_localityName                15
-#  define OBJ_localityName                OBJ_X509,7L
-
-/* Postal Address? PA */
-
-/* should be "ST" (rfc1327) but MS uses 'S' */
-#  define SN_stateOrProvinceName          "ST"
-#  define LN_stateOrProvinceName          "stateOrProvinceName"
-#  define NID_stateOrProvinceName         16
-#  define OBJ_stateOrProvinceName         OBJ_X509,8L
-
-#  define SN_organizationName             "O"
-#  define LN_organizationName             "organizationName"
-#  define NID_organizationName            17
-#  define OBJ_organizationName            OBJ_X509,10L
-
-#  define SN_organizationalUnitName       "OU"
-#  define LN_organizationalUnitName       "organizationalUnitName"
-#  define NID_organizationalUnitName      18
-#  define OBJ_organizationalUnitName      OBJ_X509,11L
-
-#  define SN_rsa                          "RSA"
-#  define LN_rsa                          "rsa"
-#  define NID_rsa                         19
-#  define OBJ_rsa                         OBJ_X500,8L,1L,1L
-
-#  define LN_pkcs7                        "pkcs7"
-#  define NID_pkcs7                       20
-#  define OBJ_pkcs7                       OBJ_pkcs,7L
-
-#  define LN_pkcs7_data                   "pkcs7-data"
-#  define NID_pkcs7_data                  21
-#  define OBJ_pkcs7_data                  OBJ_pkcs7,1L
-
-#  define LN_pkcs7_signed                 "pkcs7-signedData"
-#  define NID_pkcs7_signed                22
-#  define OBJ_pkcs7_signed                OBJ_pkcs7,2L
-
-#  define LN_pkcs7_enveloped              "pkcs7-envelopedData"
-#  define NID_pkcs7_enveloped             23
-#  define OBJ_pkcs7_enveloped             OBJ_pkcs7,3L
-
-#  define LN_pkcs7_signedAndEnveloped     "pkcs7-signedAndEnvelopedData"
-#  define NID_pkcs7_signedAndEnveloped    24
-#  define OBJ_pkcs7_signedAndEnveloped    OBJ_pkcs7,4L
-
-#  define LN_pkcs7_digest                 "pkcs7-digestData"
-#  define NID_pkcs7_digest                25
-#  define OBJ_pkcs7_digest                OBJ_pkcs7,5L
-
-#  define LN_pkcs7_encrypted              "pkcs7-encryptedData"
-#  define NID_pkcs7_encrypted             26
-#  define OBJ_pkcs7_encrypted             OBJ_pkcs7,6L
-
-#  define LN_pkcs3                        "pkcs3"
-#  define NID_pkcs3                       27
-#  define OBJ_pkcs3                       OBJ_pkcs,3L
-
-#  define LN_dhKeyAgreement               "dhKeyAgreement"
-#  define NID_dhKeyAgreement              28
-#  define OBJ_dhKeyAgreement              OBJ_pkcs3,1L
-
-#  define SN_des_ecb                      "DES-ECB"
-#  define LN_des_ecb                      "des-ecb"
-#  define NID_des_ecb                     29
-#  define OBJ_des_ecb                     OBJ_algorithm,6L
-
-#  define SN_des_cfb64                    "DES-CFB"
-#  define LN_des_cfb64                    "des-cfb"
-#  define NID_des_cfb64                   30
-/* IV + num */
-#  define OBJ_des_cfb64                   OBJ_algorithm,9L
-
-#  define SN_des_cbc                      "DES-CBC"
-#  define LN_des_cbc                      "des-cbc"
-#  define NID_des_cbc                     31
-/* IV */
-#  define OBJ_des_cbc                     OBJ_algorithm,7L
-
-#  define SN_des_ede                      "DES-EDE"
-#  define LN_des_ede                      "des-ede"
-#  define NID_des_ede                     32
-/* ?? */
-#  define OBJ_des_ede                     OBJ_algorithm,17L
-
-#  define SN_des_ede3                     "DES-EDE3"
-#  define LN_des_ede3                     "des-ede3"
-#  define NID_des_ede3                    33
-
-#  define SN_idea_cbc                     "IDEA-CBC"
-#  define LN_idea_cbc                     "idea-cbc"
-#  define NID_idea_cbc                    34
-#  define OBJ_idea_cbc                    1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
-
-#  define SN_idea_cfb64                   "IDEA-CFB"
-#  define LN_idea_cfb64                   "idea-cfb"
-#  define NID_idea_cfb64                  35
-
-#  define SN_idea_ecb                     "IDEA-ECB"
-#  define LN_idea_ecb                     "idea-ecb"
-#  define NID_idea_ecb                    36
-
-#  define SN_rc2_cbc                      "RC2-CBC"
-#  define LN_rc2_cbc                      "rc2-cbc"
-#  define NID_rc2_cbc                     37
-#  define OBJ_rc2_cbc                     OBJ_rsadsi,3L,2L
-
-#  define SN_rc2_ecb                      "RC2-ECB"
-#  define LN_rc2_ecb                      "rc2-ecb"
-#  define NID_rc2_ecb                     38
-
-#  define SN_rc2_cfb64                    "RC2-CFB"
-#  define LN_rc2_cfb64                    "rc2-cfb"
-#  define NID_rc2_cfb64                   39
-
-#  define SN_rc2_ofb64                    "RC2-OFB"
-#  define LN_rc2_ofb64                    "rc2-ofb"
-#  define NID_rc2_ofb64                   40
-
-#  define SN_sha                          "SHA"
-#  define LN_sha                          "sha"
-#  define NID_sha                         41
-#  define OBJ_sha                         OBJ_algorithm,18L
-
-#  define SN_shaWithRSAEncryption         "RSA-SHA"
-#  define LN_shaWithRSAEncryption         "shaWithRSAEncryption"
-#  define NID_shaWithRSAEncryption        42
-#  define OBJ_shaWithRSAEncryption        OBJ_algorithm,15L
-
-#  define SN_des_ede_cbc                  "DES-EDE-CBC"
-#  define LN_des_ede_cbc                  "des-ede-cbc"
-#  define NID_des_ede_cbc                 43
-
-#  define SN_des_ede3_cbc                 "DES-EDE3-CBC"
-#  define LN_des_ede3_cbc                 "des-ede3-cbc"
-#  define NID_des_ede3_cbc                44
-#  define OBJ_des_ede3_cbc                OBJ_rsadsi,3L,7L
-
-#  define SN_des_ofb64                    "DES-OFB"
-#  define LN_des_ofb64                    "des-ofb"
-#  define NID_des_ofb64                   45
-#  define OBJ_des_ofb64                   OBJ_algorithm,8L
-
-#  define SN_idea_ofb64                   "IDEA-OFB"
-#  define LN_idea_ofb64                   "idea-ofb"
-#  define NID_idea_ofb64                  46
-
-#  define LN_pkcs9                        "pkcs9"
-#  define NID_pkcs9                       47
-#  define OBJ_pkcs9                       OBJ_pkcs,9L
-
-#  define SN_pkcs9_emailAddress           "Email"
-#  define LN_pkcs9_emailAddress           "emailAddress"
-#  define NID_pkcs9_emailAddress          48
-#  define OBJ_pkcs9_emailAddress          OBJ_pkcs9,1L
-
-#  define LN_pkcs9_unstructuredName       "unstructuredName"
-#  define NID_pkcs9_unstructuredName      49
-#  define OBJ_pkcs9_unstructuredName      OBJ_pkcs9,2L
-
-#  define LN_pkcs9_contentType            "contentType"
-#  define NID_pkcs9_contentType           50
-#  define OBJ_pkcs9_contentType           OBJ_pkcs9,3L
-
-#  define LN_pkcs9_messageDigest          "messageDigest"
-#  define NID_pkcs9_messageDigest         51
-#  define OBJ_pkcs9_messageDigest         OBJ_pkcs9,4L
-
-#  define LN_pkcs9_signingTime            "signingTime"
-#  define NID_pkcs9_signingTime           52
-#  define OBJ_pkcs9_signingTime           OBJ_pkcs9,5L
-
-#  define LN_pkcs9_countersignature       "countersignature"
-#  define NID_pkcs9_countersignature      53
-#  define OBJ_pkcs9_countersignature      OBJ_pkcs9,6L
-
-#  define LN_pkcs9_challengePassword      "challengePassword"
-#  define NID_pkcs9_challengePassword     54
-#  define OBJ_pkcs9_challengePassword     OBJ_pkcs9,7L
-
-#  define LN_pkcs9_unstructuredAddress    "unstructuredAddress"
-#  define NID_pkcs9_unstructuredAddress   55
-#  define OBJ_pkcs9_unstructuredAddress   OBJ_pkcs9,8L
-
-#  define LN_pkcs9_extCertAttributes      "extendedCertificateAttributes"
-#  define NID_pkcs9_extCertAttributes     56
-#  define OBJ_pkcs9_extCertAttributes     OBJ_pkcs9,9L
-
-#  define SN_netscape                     "Netscape"
-#  define LN_netscape                     "Netscape Communications Corp."
-#  define NID_netscape                    57
-#  define OBJ_netscape                    2L,16L,840L,1L,113730L
-
-#  define SN_netscape_cert_extension      "nsCertExt"
-#  define LN_netscape_cert_extension      "Netscape Certificate Extension"
-#  define NID_netscape_cert_extension     58
-#  define OBJ_netscape_cert_extension     OBJ_netscape,1L
-
-#  define SN_netscape_data_type           "nsDataType"
-#  define LN_netscape_data_type           "Netscape Data Type"
-#  define NID_netscape_data_type          59
-#  define OBJ_netscape_data_type          OBJ_netscape,2L
-
-#  define SN_des_ede_cfb64                "DES-EDE-CFB"
-#  define LN_des_ede_cfb64                "des-ede-cfb"
-#  define NID_des_ede_cfb64               60
-
-#  define SN_des_ede3_cfb64               "DES-EDE3-CFB"
-#  define LN_des_ede3_cfb64               "des-ede3-cfb"
-#  define NID_des_ede3_cfb64              61
-
-#  define SN_des_ede_ofb64                "DES-EDE-OFB"
-#  define LN_des_ede_ofb64                "des-ede-ofb"
-#  define NID_des_ede_ofb64               62
-
-#  define SN_des_ede3_ofb64               "DES-EDE3-OFB"
-#  define LN_des_ede3_ofb64               "des-ede3-ofb"
-#  define NID_des_ede3_ofb64              63
-
-/* I'm not sure about the object ID */
-#  define SN_sha1                         "SHA1"
-#  define LN_sha1                         "sha1"
-#  define NID_sha1                        64
-#  define OBJ_sha1                        OBJ_algorithm,26L
-/* 28 Jun 1996 - eay */
-/* #define OBJ_sha1                     1L,3L,14L,2L,26L,05L <- wrong */
-
-#  define SN_sha1WithRSAEncryption        "RSA-SHA1"
-#  define LN_sha1WithRSAEncryption        "sha1WithRSAEncryption"
-#  define NID_sha1WithRSAEncryption       65
-#  define OBJ_sha1WithRSAEncryption       OBJ_pkcs,1L,5L
-
-#  define SN_dsaWithSHA                   "DSA-SHA"
-#  define LN_dsaWithSHA                   "dsaWithSHA"
-#  define NID_dsaWithSHA                  66
-#  define OBJ_dsaWithSHA                  OBJ_algorithm,13L
-
-#  define SN_dsa_2                        "DSA-old"
-#  define LN_dsa_2                        "dsaEncryption-old"
-#  define NID_dsa_2                       67
-#  define OBJ_dsa_2                       OBJ_algorithm,12L
-
-/* proposed by microsoft to RSA */
-#  define SN_pbeWithSHA1AndRC2_CBC        "PBE-SHA1-RC2-64"
-#  define LN_pbeWithSHA1AndRC2_CBC        "pbeWithSHA1AndRC2-CBC"
-#  define NID_pbeWithSHA1AndRC2_CBC       68
-#  define OBJ_pbeWithSHA1AndRC2_CBC       OBJ_pkcs,5L,11L
-
-/*
- * proposed by microsoft to RSA as pbeWithSHA1AndRC4: it is now defined
- * explicitly in PKCS#5 v2.0 as id-PBKDF2 which is something completely
- * different.
- */
-#  define LN_id_pbkdf2                    "PBKDF2"
-#  define NID_id_pbkdf2                   69
-#  define OBJ_id_pbkdf2                   OBJ_pkcs,5L,12L
-
-#  define SN_dsaWithSHA1_2                "DSA-SHA1-old"
-#  define LN_dsaWithSHA1_2                "dsaWithSHA1-old"
-#  define NID_dsaWithSHA1_2               70
-/* Got this one from 'sdn706r20.pdf' which is actually an NSA document :-) */
-#  define OBJ_dsaWithSHA1_2               OBJ_algorithm,27L
-
-#  define SN_netscape_cert_type           "nsCertType"
-#  define LN_netscape_cert_type           "Netscape Cert Type"
-#  define NID_netscape_cert_type          71
-#  define OBJ_netscape_cert_type          OBJ_netscape_cert_extension,1L
-
-#  define SN_netscape_base_url            "nsBaseUrl"
-#  define LN_netscape_base_url            "Netscape Base Url"
-#  define NID_netscape_base_url           72
-#  define OBJ_netscape_base_url           OBJ_netscape_cert_extension,2L
-
-#  define SN_netscape_revocation_url      "nsRevocationUrl"
-#  define LN_netscape_revocation_url      "Netscape Revocation Url"
-#  define NID_netscape_revocation_url     73
-#  define OBJ_netscape_revocation_url     OBJ_netscape_cert_extension,3L
-
-#  define SN_netscape_ca_revocation_url   "nsCaRevocationUrl"
-#  define LN_netscape_ca_revocation_url   "Netscape CA Revocation Url"
-#  define NID_netscape_ca_revocation_url  74
-#  define OBJ_netscape_ca_revocation_url  OBJ_netscape_cert_extension,4L
-
-#  define SN_netscape_renewal_url         "nsRenewalUrl"
-#  define LN_netscape_renewal_url         "Netscape Renewal Url"
-#  define NID_netscape_renewal_url        75
-#  define OBJ_netscape_renewal_url        OBJ_netscape_cert_extension,7L
-
-#  define SN_netscape_ca_policy_url       "nsCaPolicyUrl"
-#  define LN_netscape_ca_policy_url       "Netscape CA Policy Url"
-#  define NID_netscape_ca_policy_url      76
-#  define OBJ_netscape_ca_policy_url      OBJ_netscape_cert_extension,8L
-
-#  define SN_netscape_ssl_server_name     "nsSslServerName"
-#  define LN_netscape_ssl_server_name     "Netscape SSL Server Name"
-#  define NID_netscape_ssl_server_name    77
-#  define OBJ_netscape_ssl_server_name    OBJ_netscape_cert_extension,12L
-
-#  define SN_netscape_comment             "nsComment"
-#  define LN_netscape_comment             "Netscape Comment"
-#  define NID_netscape_comment            78
-#  define OBJ_netscape_comment            OBJ_netscape_cert_extension,13L
-
-#  define SN_netscape_cert_sequence       "nsCertSequence"
-#  define LN_netscape_cert_sequence       "Netscape Certificate Sequence"
-#  define NID_netscape_cert_sequence      79
-#  define OBJ_netscape_cert_sequence      OBJ_netscape_data_type,5L
-
-#  define SN_desx_cbc                     "DESX-CBC"
-#  define LN_desx_cbc                     "desx-cbc"
-#  define NID_desx_cbc                    80
-
-#  define SN_id_ce                        "id-ce"
-#  define NID_id_ce                       81
-#  define OBJ_id_ce                       2L,5L,29L
-
-#  define SN_subject_key_identifier       "subjectKeyIdentifier"
-#  define LN_subject_key_identifier       "X509v3 Subject Key Identifier"
-#  define NID_subject_key_identifier      82
-#  define OBJ_subject_key_identifier      OBJ_id_ce,14L
-
-#  define SN_key_usage                    "keyUsage"
-#  define LN_key_usage                    "X509v3 Key Usage"
-#  define NID_key_usage                   83
-#  define OBJ_key_usage                   OBJ_id_ce,15L
-
-#  define SN_private_key_usage_period     "privateKeyUsagePeriod"
-#  define LN_private_key_usage_period     "X509v3 Private Key Usage Period"
-#  define NID_private_key_usage_period    84
-#  define OBJ_private_key_usage_period    OBJ_id_ce,16L
-
-#  define SN_subject_alt_name             "subjectAltName"
-#  define LN_subject_alt_name             "X509v3 Subject Alternative Name"
-#  define NID_subject_alt_name            85
-#  define OBJ_subject_alt_name            OBJ_id_ce,17L
-
-#  define SN_issuer_alt_name              "issuerAltName"
-#  define LN_issuer_alt_name              "X509v3 Issuer Alternative Name"
-#  define NID_issuer_alt_name             86
-#  define OBJ_issuer_alt_name             OBJ_id_ce,18L
-
-#  define SN_basic_constraints            "basicConstraints"
-#  define LN_basic_constraints            "X509v3 Basic Constraints"
-#  define NID_basic_constraints           87
-#  define OBJ_basic_constraints           OBJ_id_ce,19L
-
-#  define SN_crl_number                   "crlNumber"
-#  define LN_crl_number                   "X509v3 CRL Number"
-#  define NID_crl_number                  88
-#  define OBJ_crl_number                  OBJ_id_ce,20L
-
-#  define SN_certificate_policies         "certificatePolicies"
-#  define LN_certificate_policies         "X509v3 Certificate Policies"
-#  define NID_certificate_policies        89
-#  define OBJ_certificate_policies        OBJ_id_ce,32L
-
-#  define SN_authority_key_identifier     "authorityKeyIdentifier"
-#  define LN_authority_key_identifier     "X509v3 Authority Key Identifier"
-#  define NID_authority_key_identifier    90
-#  define OBJ_authority_key_identifier    OBJ_id_ce,35L
-
-#  define SN_bf_cbc                       "BF-CBC"
-#  define LN_bf_cbc                       "bf-cbc"
-#  define NID_bf_cbc                      91
-#  define OBJ_bf_cbc                      1L,3L,6L,1L,4L,1L,3029L,1L,2L
-
-#  define SN_bf_ecb                       "BF-ECB"
-#  define LN_bf_ecb                       "bf-ecb"
-#  define NID_bf_ecb                      92
-
-#  define SN_bf_cfb64                     "BF-CFB"
-#  define LN_bf_cfb64                     "bf-cfb"
-#  define NID_bf_cfb64                    93
-
-#  define SN_bf_ofb64                     "BF-OFB"
-#  define LN_bf_ofb64                     "bf-ofb"
-#  define NID_bf_ofb64                    94
-
-#  define SN_mdc2                         "MDC2"
-#  define LN_mdc2                         "mdc2"
-#  define NID_mdc2                        95
-#  define OBJ_mdc2                        2L,5L,8L,3L,101L
-/* An alternative?                      1L,3L,14L,3L,2L,19L */
-
-#  define SN_mdc2WithRSA                  "RSA-MDC2"
-#  define LN_mdc2WithRSA                  "mdc2withRSA"
-#  define NID_mdc2WithRSA                 96
-#  define OBJ_mdc2WithRSA                 2L,5L,8L,3L,100L
-
-#  define SN_rc4_40                       "RC4-40"
-#  define LN_rc4_40                       "rc4-40"
-#  define NID_rc4_40                      97
-
-#  define SN_rc2_40_cbc                   "RC2-40-CBC"
-#  define LN_rc2_40_cbc                   "rc2-40-cbc"
-#  define NID_rc2_40_cbc                  98
-
-#  define SN_givenName                    "G"
-#  define LN_givenName                    "givenName"
-#  define NID_givenName                   99
-#  define OBJ_givenName                   OBJ_X509,42L
-
-#  define SN_surname                      "S"
-#  define LN_surname                      "surname"
-#  define NID_surname                     100
-#  define OBJ_surname                     OBJ_X509,4L
-
-#  define SN_initials                     "I"
-#  define LN_initials                     "initials"
-#  define NID_initials                    101
-#  define OBJ_initials                    OBJ_X509,43L
-
-#  define SN_uniqueIdentifier             "UID"
-#  define LN_uniqueIdentifier             "uniqueIdentifier"
-#  define NID_uniqueIdentifier            102
-#  define OBJ_uniqueIdentifier            OBJ_X509,45L
-
-#  define SN_crl_distribution_points      "crlDistributionPoints"
-#  define LN_crl_distribution_points      "X509v3 CRL Distribution Points"
-#  define NID_crl_distribution_points     103
-#  define OBJ_crl_distribution_points     OBJ_id_ce,31L
-
-#  define SN_md5WithRSA                   "RSA-NP-MD5"
-#  define LN_md5WithRSA                   "md5WithRSA"
-#  define NID_md5WithRSA                  104
-#  define OBJ_md5WithRSA                  OBJ_algorithm,3L
-
-#  define SN_serialNumber                 "SN"
-#  define LN_serialNumber                 "serialNumber"
-#  define NID_serialNumber                105
-#  define OBJ_serialNumber                OBJ_X509,5L
-
-#  define SN_title                        "T"
-#  define LN_title                        "title"
-#  define NID_title                       106
-#  define OBJ_title                       OBJ_X509,12L
-
-#  define SN_description                  "D"
-#  define LN_description                  "description"
-#  define NID_description                 107
-#  define OBJ_description                 OBJ_X509,13L
-
-/* CAST5 is CAST-128, I'm just sticking with the documentation */
-#  define SN_cast5_cbc                    "CAST5-CBC"
-#  define LN_cast5_cbc                    "cast5-cbc"
-#  define NID_cast5_cbc                   108
-#  define OBJ_cast5_cbc                   1L,2L,840L,113533L,7L,66L,10L
-
-#  define SN_cast5_ecb                    "CAST5-ECB"
-#  define LN_cast5_ecb                    "cast5-ecb"
-#  define NID_cast5_ecb                   109
-
-#  define SN_cast5_cfb64                  "CAST5-CFB"
-#  define LN_cast5_cfb64                  "cast5-cfb"
-#  define NID_cast5_cfb64                 110
-
-#  define SN_cast5_ofb64                  "CAST5-OFB"
-#  define LN_cast5_ofb64                  "cast5-ofb"
-#  define NID_cast5_ofb64                 111
-
-#  define LN_pbeWithMD5AndCast5_CBC       "pbeWithMD5AndCast5CBC"
-#  define NID_pbeWithMD5AndCast5_CBC      112
-#  define OBJ_pbeWithMD5AndCast5_CBC      1L,2L,840L,113533L,7L,66L,12L
-
-/*-
- * This is one sun will soon be using :-(
- * id-dsa-with-sha1 ID  ::= {
- *   iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3 }
- */
-#  define SN_dsaWithSHA1                  "DSA-SHA1"
-#  define LN_dsaWithSHA1                  "dsaWithSHA1"
-#  define NID_dsaWithSHA1                 113
-#  define OBJ_dsaWithSHA1                 1L,2L,840L,10040L,4L,3L
-
-#  define NID_md5_sha1                    114
-#  define SN_md5_sha1                     "MD5-SHA1"
-#  define LN_md5_sha1                     "md5-sha1"
-
-#  define SN_sha1WithRSA                  "RSA-SHA1-2"
-#  define LN_sha1WithRSA                  "sha1WithRSA"
-#  define NID_sha1WithRSA                 115
-#  define OBJ_sha1WithRSA                 OBJ_algorithm,29L
-
-#  define SN_dsa                          "DSA"
-#  define LN_dsa                          "dsaEncryption"
-#  define NID_dsa                         116
-#  define OBJ_dsa                         1L,2L,840L,10040L,4L,1L
-
-#  define SN_ripemd160                    "RIPEMD160"
-#  define LN_ripemd160                    "ripemd160"
-#  define NID_ripemd160                   117
-#  define OBJ_ripemd160                   1L,3L,36L,3L,2L,1L
-
-/*
- * The name should actually be rsaSignatureWithripemd160, but I'm going to
- * continue using the convention I'm using with the other ciphers
- */
-#  define SN_ripemd160WithRSA             "RSA-RIPEMD160"
-#  define LN_ripemd160WithRSA             "ripemd160WithRSA"
-#  define NID_ripemd160WithRSA            119
-#  define OBJ_ripemd160WithRSA            1L,3L,36L,3L,3L,1L,2L
-
-/*-
- * Taken from rfc2040
- *  RC5_CBC_Parameters ::= SEQUENCE {
- *      version           INTEGER (v1_0(16)),
- *      rounds            INTEGER (8..127),
- *      blockSizeInBits   INTEGER (64, 128),
- *      iv                OCTET STRING OPTIONAL
- *      }
- */
-#  define SN_rc5_cbc                      "RC5-CBC"
-#  define LN_rc5_cbc                      "rc5-cbc"
-#  define NID_rc5_cbc                     120
-#  define OBJ_rc5_cbc                     OBJ_rsadsi,3L,8L
-
-#  define SN_rc5_ecb                      "RC5-ECB"
-#  define LN_rc5_ecb                      "rc5-ecb"
-#  define NID_rc5_ecb                     121
-
-#  define SN_rc5_cfb64                    "RC5-CFB"
-#  define LN_rc5_cfb64                    "rc5-cfb"
-#  define NID_rc5_cfb64                   122
-
-#  define SN_rc5_ofb64                    "RC5-OFB"
-#  define LN_rc5_ofb64                    "rc5-ofb"
-#  define NID_rc5_ofb64                   123
-
-#  define SN_rle_compression              "RLE"
-#  define LN_rle_compression              "run length compression"
-#  define NID_rle_compression             124
-#  define OBJ_rle_compression             1L,1L,1L,1L,666L,1L
-
-#  define SN_zlib_compression             "ZLIB"
-#  define LN_zlib_compression             "zlib compression"
-#  define NID_zlib_compression            125
-#  define OBJ_zlib_compression            1L,1L,1L,1L,666L,2L
-
-#  define SN_ext_key_usage                "extendedKeyUsage"
-#  define LN_ext_key_usage                "X509v3 Extended Key Usage"
-#  define NID_ext_key_usage               126
-#  define OBJ_ext_key_usage               OBJ_id_ce,37
-
-#  define SN_id_pkix                      "PKIX"
-#  define NID_id_pkix                     127
-#  define OBJ_id_pkix                     1L,3L,6L,1L,5L,5L,7L
-
-#  define SN_id_kp                        "id-kp"
-#  define NID_id_kp                       128
-#  define OBJ_id_kp                       OBJ_id_pkix,3L
-
-/* PKIX extended key usage OIDs */
-
-#  define SN_server_auth                  "serverAuth"
-#  define LN_server_auth                  "TLS Web Server Authentication"
-#  define NID_server_auth                 129
-#  define OBJ_server_auth                 OBJ_id_kp,1L
-
-#  define SN_client_auth                  "clientAuth"
-#  define LN_client_auth                  "TLS Web Client Authentication"
-#  define NID_client_auth                 130
-#  define OBJ_client_auth                 OBJ_id_kp,2L
-
-#  define SN_code_sign                    "codeSigning"
-#  define LN_code_sign                    "Code Signing"
-#  define NID_code_sign                   131
-#  define OBJ_code_sign                   OBJ_id_kp,3L
-
-#  define SN_email_protect                "emailProtection"
-#  define LN_email_protect                "E-mail Protection"
-#  define NID_email_protect               132
-#  define OBJ_email_protect               OBJ_id_kp,4L
-
-#  define SN_time_stamp                   "timeStamping"
-#  define LN_time_stamp                   "Time Stamping"
-#  define NID_time_stamp                  133
-#  define OBJ_time_stamp                  OBJ_id_kp,8L
-
-/* Additional extended key usage OIDs: Microsoft */
-
-#  define SN_ms_code_ind                  "msCodeInd"
-#  define LN_ms_code_ind                  "Microsoft Individual Code Signing"
-#  define NID_ms_code_ind                 134
-#  define OBJ_ms_code_ind                 1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
-
-#  define SN_ms_code_com                  "msCodeCom"
-#  define LN_ms_code_com                  "Microsoft Commercial Code Signing"
-#  define NID_ms_code_com                 135
-#  define OBJ_ms_code_com                 1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
-
-#  define SN_ms_ctl_sign                  "msCTLSign"
-#  define LN_ms_ctl_sign                  "Microsoft Trust List Signing"
-#  define NID_ms_ctl_sign                 136
-#  define OBJ_ms_ctl_sign                 1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
-
-#  define SN_ms_sgc                       "msSGC"
-#  define LN_ms_sgc                       "Microsoft Server Gated Crypto"
-#  define NID_ms_sgc                      137
-#  define OBJ_ms_sgc                      1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
-
-#  define SN_ms_efs                       "msEFS"
-#  define LN_ms_efs                       "Microsoft Encrypted File System"
-#  define NID_ms_efs                      138
-#  define OBJ_ms_efs                      1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
-
-/* Additional usage: Netscape */
-
-#  define SN_ns_sgc                       "nsSGC"
-#  define LN_ns_sgc                       "Netscape Server Gated Crypto"
-#  define NID_ns_sgc                      139
-#  define OBJ_ns_sgc                      OBJ_netscape,4L,1L
-
-#  define SN_delta_crl                    "deltaCRL"
-#  define LN_delta_crl                    "X509v3 Delta CRL Indicator"
-#  define NID_delta_crl                   140
-#  define OBJ_delta_crl                   OBJ_id_ce,27L
-
-#  define SN_crl_reason                   "CRLReason"
-#  define LN_crl_reason                   "CRL Reason Code"
-#  define NID_crl_reason                  141
-#  define OBJ_crl_reason                  OBJ_id_ce,21L
-
-#  define SN_invalidity_date              "invalidityDate"
-#  define LN_invalidity_date              "Invalidity Date"
-#  define NID_invalidity_date             142
-#  define OBJ_invalidity_date             OBJ_id_ce,24L
-
-#  define SN_sxnet                        "SXNetID"
-#  define LN_sxnet                        "Strong Extranet ID"
-#  define NID_sxnet                       143
-#  define OBJ_sxnet                       1L,3L,101L,1L,4L,1L
-
-/* PKCS12 and related OBJECT IDENTIFIERS */
-
-#  define OBJ_pkcs12                      OBJ_pkcs,12L
-#  define OBJ_pkcs12_pbeids               OBJ_pkcs12, 1
-
-#  define SN_pbe_WithSHA1And128BitRC4     "PBE-SHA1-RC4-128"
-#  define LN_pbe_WithSHA1And128BitRC4     "pbeWithSHA1And128BitRC4"
-#  define NID_pbe_WithSHA1And128BitRC4    144
-#  define OBJ_pbe_WithSHA1And128BitRC4    OBJ_pkcs12_pbeids, 1L
-
-#  define SN_pbe_WithSHA1And40BitRC4      "PBE-SHA1-RC4-40"
-#  define LN_pbe_WithSHA1And40BitRC4      "pbeWithSHA1And40BitRC4"
-#  define NID_pbe_WithSHA1And40BitRC4     145
-#  define OBJ_pbe_WithSHA1And40BitRC4     OBJ_pkcs12_pbeids, 2L
-
-#  define SN_pbe_WithSHA1And3_Key_TripleDES_CBC   "PBE-SHA1-3DES"
-#  define LN_pbe_WithSHA1And3_Key_TripleDES_CBC   "pbeWithSHA1And3-KeyTripleDES-CBC"
-#  define NID_pbe_WithSHA1And3_Key_TripleDES_CBC  146
-#  define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 3L
-
-#  define SN_pbe_WithSHA1And2_Key_TripleDES_CBC   "PBE-SHA1-2DES"
-#  define LN_pbe_WithSHA1And2_Key_TripleDES_CBC   "pbeWithSHA1And2-KeyTripleDES-CBC"
-#  define NID_pbe_WithSHA1And2_Key_TripleDES_CBC  147
-#  define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 4L
-
-#  define SN_pbe_WithSHA1And128BitRC2_CBC         "PBE-SHA1-RC2-128"
-#  define LN_pbe_WithSHA1And128BitRC2_CBC         "pbeWithSHA1And128BitRC2-CBC"
-#  define NID_pbe_WithSHA1And128BitRC2_CBC        148
-#  define OBJ_pbe_WithSHA1And128BitRC2_CBC        OBJ_pkcs12_pbeids, 5L
-
-#  define SN_pbe_WithSHA1And40BitRC2_CBC  "PBE-SHA1-RC2-40"
-#  define LN_pbe_WithSHA1And40BitRC2_CBC  "pbeWithSHA1And40BitRC2-CBC"
-#  define NID_pbe_WithSHA1And40BitRC2_CBC 149
-#  define OBJ_pbe_WithSHA1And40BitRC2_CBC OBJ_pkcs12_pbeids, 6L
-
-#  define OBJ_pkcs12_Version1     OBJ_pkcs12, 10L
-
-#  define OBJ_pkcs12_BagIds       OBJ_pkcs12_Version1, 1L
-
-#  define LN_keyBag               "keyBag"
-#  define NID_keyBag              150
-#  define OBJ_keyBag              OBJ_pkcs12_BagIds, 1L
-
-#  define LN_pkcs8ShroudedKeyBag  "pkcs8ShroudedKeyBag"
-#  define NID_pkcs8ShroudedKeyBag 151
-#  define OBJ_pkcs8ShroudedKeyBag OBJ_pkcs12_BagIds, 2L
-
-#  define LN_certBag              "certBag"
-#  define NID_certBag             152
-#  define OBJ_certBag             OBJ_pkcs12_BagIds, 3L
-
-#  define LN_crlBag               "crlBag"
-#  define NID_crlBag              153
-#  define OBJ_crlBag              OBJ_pkcs12_BagIds, 4L
-
-#  define LN_secretBag            "secretBag"
-#  define NID_secretBag           154
-#  define OBJ_secretBag           OBJ_pkcs12_BagIds, 5L
-
-#  define LN_safeContentsBag      "safeContentsBag"
-#  define NID_safeContentsBag     155
-#  define OBJ_safeContentsBag     OBJ_pkcs12_BagIds, 6L
-
-#  define LN_friendlyName         "friendlyName"
-#  define NID_friendlyName        156
-#  define OBJ_friendlyName        OBJ_pkcs9, 20L
-
-#  define LN_localKeyID           "localKeyID"
-#  define NID_localKeyID          157
-#  define OBJ_localKeyID          OBJ_pkcs9, 21L
-
-#  define OBJ_certTypes           OBJ_pkcs9, 22L
-
-#  define LN_x509Certificate      "x509Certificate"
-#  define NID_x509Certificate     158
-#  define OBJ_x509Certificate     OBJ_certTypes, 1L
-
-#  define LN_sdsiCertificate      "sdsiCertificate"
-#  define NID_sdsiCertificate     159
-#  define OBJ_sdsiCertificate     OBJ_certTypes, 2L
-
-#  define OBJ_crlTypes            OBJ_pkcs9, 23L
-
-#  define LN_x509Crl              "x509Crl"
-#  define NID_x509Crl             160
-#  define OBJ_x509Crl             OBJ_crlTypes, 1L
-
-/* PKCS#5 v2 OIDs */
-
-#  define LN_pbes2                "PBES2"
-#  define NID_pbes2               161
-#  define OBJ_pbes2               OBJ_pkcs,5L,13L
-
-#  define LN_pbmac1               "PBMAC1"
-#  define NID_pbmac1              162
-#  define OBJ_pbmac1              OBJ_pkcs,5L,14L
-
-#  define LN_hmacWithSHA1         "hmacWithSHA1"
-#  define NID_hmacWithSHA1        163
-#  define OBJ_hmacWithSHA1        OBJ_rsadsi,2L,7L
-
-/* Policy Qualifier Ids */
-
-#  define LN_id_qt_cps            "Policy Qualifier CPS"
-#  define SN_id_qt_cps            "id-qt-cps"
-#  define NID_id_qt_cps           164
-#  define OBJ_id_qt_cps           OBJ_id_pkix,2L,1L
-
-#  define LN_id_qt_unotice        "Policy Qualifier User Notice"
-#  define SN_id_qt_unotice        "id-qt-unotice"
-#  define NID_id_qt_unotice       165
-#  define OBJ_id_qt_unotice       OBJ_id_pkix,2L,2L
-
-#  define SN_rc2_64_cbc                   "RC2-64-CBC"
-#  define LN_rc2_64_cbc                   "rc2-64-cbc"
-#  define NID_rc2_64_cbc                  166
-
-#  define SN_SMIMECapabilities            "SMIME-CAPS"
-#  define LN_SMIMECapabilities            "S/MIME Capabilities"
-#  define NID_SMIMECapabilities           167
-#  define OBJ_SMIMECapabilities           OBJ_pkcs9,15L
-
-#  define SN_pbeWithMD2AndRC2_CBC         "PBE-MD2-RC2-64"
-#  define LN_pbeWithMD2AndRC2_CBC         "pbeWithMD2AndRC2-CBC"
-#  define NID_pbeWithMD2AndRC2_CBC        168
-#  define OBJ_pbeWithMD2AndRC2_CBC        OBJ_pkcs,5L,4L
-
-#  define SN_pbeWithMD5AndRC2_CBC         "PBE-MD5-RC2-64"
-#  define LN_pbeWithMD5AndRC2_CBC         "pbeWithMD5AndRC2-CBC"
-#  define NID_pbeWithMD5AndRC2_CBC        169
-#  define OBJ_pbeWithMD5AndRC2_CBC        OBJ_pkcs,5L,6L
-
-#  define SN_pbeWithSHA1AndDES_CBC        "PBE-SHA1-DES"
-#  define LN_pbeWithSHA1AndDES_CBC        "pbeWithSHA1AndDES-CBC"
-#  define NID_pbeWithSHA1AndDES_CBC       170
-#  define OBJ_pbeWithSHA1AndDES_CBC       OBJ_pkcs,5L,10L
-
-/* Extension request OIDs */
-
-#  define LN_ms_ext_req                   "Microsoft Extension Request"
-#  define SN_ms_ext_req                   "msExtReq"
-#  define NID_ms_ext_req                  171
-#  define OBJ_ms_ext_req                  1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
-
-#  define LN_ext_req                      "Extension Request"
-#  define SN_ext_req                      "extReq"
-#  define NID_ext_req                     172
-#  define OBJ_ext_req                     OBJ_pkcs9,14L
-
-#  define SN_name                         "name"
-#  define LN_name                         "name"
-#  define NID_name                        173
-#  define OBJ_name                        OBJ_X509,41L
-
-#  define SN_dnQualifier                  "dnQualifier"
-#  define LN_dnQualifier                  "dnQualifier"
-#  define NID_dnQualifier                 174
-#  define OBJ_dnQualifier                 OBJ_X509,46L
-
-#  define SN_id_pe                        "id-pe"
-#  define NID_id_pe                       175
-#  define OBJ_id_pe                       OBJ_id_pkix,1L
-
-#  define SN_id_ad                        "id-ad"
-#  define NID_id_ad                       176
-#  define OBJ_id_ad                       OBJ_id_pkix,48L
-
-#  define SN_info_access                  "authorityInfoAccess"
-#  define LN_info_access                  "Authority Information Access"
-#  define NID_info_access                 177
-#  define OBJ_info_access                 OBJ_id_pe,1L
-
-#  define SN_ad_OCSP                      "OCSP"
-#  define LN_ad_OCSP                      "OCSP"
-#  define NID_ad_OCSP                     178
-#  define OBJ_ad_OCSP                     OBJ_id_ad,1L
-
-#  define SN_ad_ca_issuers                "caIssuers"
-#  define LN_ad_ca_issuers                "CA Issuers"
-#  define NID_ad_ca_issuers               179
-#  define OBJ_ad_ca_issuers               OBJ_id_ad,2L
-
-#  define SN_OCSP_sign                    "OCSPSigning"
-#  define LN_OCSP_sign                    "OCSP Signing"
-#  define NID_OCSP_sign                   180
-#  define OBJ_OCSP_sign                   OBJ_id_kp,9L
-# endif                         /* USE_OBJ_MAC */
-
-# include <openssl/bio.h>
-# include <openssl/asn1.h>
-
-# define OBJ_NAME_TYPE_UNDEF             0x00
-# define OBJ_NAME_TYPE_MD_METH           0x01
-# define OBJ_NAME_TYPE_CIPHER_METH       0x02
-# define OBJ_NAME_TYPE_PKEY_METH         0x03
-# define OBJ_NAME_TYPE_COMP_METH         0x04
-# define OBJ_NAME_TYPE_NUM               0x05
-
-# define OBJ_NAME_ALIAS                  0x8000
-
-# define OBJ_BSEARCH_VALUE_ON_NOMATCH            0x01
-# define OBJ_BSEARCH_FIRST_VALUE_ON_MATCH        0x02
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct obj_name_st {
-    int type;
-    int alias;
-    const char *name;
-    const char *data;
-} OBJ_NAME;
-
-# define         OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
-
-int OBJ_NAME_init(void);
-int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *),
-                       int (*cmp_func) (const char *, const char *),
-                       void (*free_func) (const char *, int, const char *));
-const char *OBJ_NAME_get(const char *name, int type);
-int OBJ_NAME_add(const char *name, int type, const char *data);
-int OBJ_NAME_remove(const char *name, int type);
-void OBJ_NAME_cleanup(int type); /* -1 for everything */
-void OBJ_NAME_do_all(int type, void (*fn) (const OBJ_NAME *, void *arg),
-                     void *arg);
-void OBJ_NAME_do_all_sorted(int type,
-                            void (*fn) (const OBJ_NAME *, void *arg),
-                            void *arg);
-
-ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o);
-ASN1_OBJECT *OBJ_nid2obj(int n);
-const char *OBJ_nid2ln(int n);
-const char *OBJ_nid2sn(int n);
-int OBJ_obj2nid(const ASN1_OBJECT *o);
-ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name);
-int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name);
-int OBJ_txt2nid(const char *s);
-int OBJ_ln2nid(const char *s);
-int OBJ_sn2nid(const char *s);
-int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b);
-const void *OBJ_bsearch_(const void *key, const void *base, int num, int size,
-                         int (*cmp) (const void *, const void *));
-const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
-                            int size,
-                            int (*cmp) (const void *, const void *),
-                            int flags);
-
-# define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm)    \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \
-  static int nm##_cmp(type1 const *, type2 const *); \
-  scope type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
-
-# define DECLARE_OBJ_BSEARCH_CMP_FN(type1, type2, cmp)   \
-  _DECLARE_OBJ_BSEARCH_CMP_FN(static, type1, type2, cmp)
-# define DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)     \
-  type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
-
-/*-
- * Unsolved problem: if a type is actually a pointer type, like
- * nid_triple is, then its impossible to get a const where you need
- * it. Consider:
- *
- * typedef int nid_triple[3];
- * const void *a_;
- * const nid_triple const *a = a_;
- *
- * The assignement discards a const because what you really want is:
- *
- * const int const * const *a = a_;
- *
- * But if you do that, you lose the fact that a is an array of 3 ints,
- * which breaks comparison functions.
- *
- * Thus we end up having to cast, sadly, or unpack the
- * declarations. Or, as I finally did in this case, delcare nid_triple
- * to be a struct, which it should have been in the first place.
- *
- * Ben, August 2008.
- *
- * Also, strictly speaking not all types need be const, but handling
- * the non-constness means a lot of complication, and in practice
- * comparison routines do always not touch their arguments.
- */
-
-# define IMPLEMENT_OBJ_BSEARCH_CMP_FN(type1, type2, nm)  \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)    \
-      { \
-      type1 const *a = a_; \
-      type2 const *b = b_; \
-      return nm##_cmp(a,b); \
-      } \
-  static type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
-      { \
-      return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
-                                        nm##_cmp_BSEARCH_CMP_FN); \
-      } \
-      extern void dummy_prototype(void)
-
-# define IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)   \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)    \
-      { \
-      type1 const *a = a_; \
-      type2 const *b = b_; \
-      return nm##_cmp(a,b); \
-      } \
-  type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
-      { \
-      return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
-                                        nm##_cmp_BSEARCH_CMP_FN); \
-      } \
-      extern void dummy_prototype(void)
-
-# define OBJ_bsearch(type1,key,type2,base,num,cmp)                              \
-  ((type2 *)OBJ_bsearch_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
-                         num,sizeof(type2),                             \
-                         ((void)CHECKED_PTR_OF(type1,cmp##_type_1),     \
-                          (void)CHECKED_PTR_OF(type2,cmp##_type_2),     \
-                          cmp##_BSEARCH_CMP_FN)))
-
-# define OBJ_bsearch_ex(type1,key,type2,base,num,cmp,flags)                      \
-  ((type2 *)OBJ_bsearch_ex_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
-                         num,sizeof(type2),                             \
-                         ((void)CHECKED_PTR_OF(type1,cmp##_type_1),     \
-                          (void)type_2=CHECKED_PTR_OF(type2,cmp##_type_2), \
-                          cmp##_BSEARCH_CMP_FN)),flags)
-
-int OBJ_new_nid(int num);
-int OBJ_add_object(const ASN1_OBJECT *obj);
-int OBJ_create(const char *oid, const char *sn, const char *ln);
-void OBJ_cleanup(void);
-int OBJ_create_objects(BIO *in);
-
-int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid);
-int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
-int OBJ_add_sigid(int signid, int dig_id, int pkey_id);
-void OBJ_sigid_free(void);
-
-extern int obj_cleanup_defer;
-void check_defer(int nid);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_OBJ_strings(void);
-
-/* Error codes for the OBJ functions. */
-
-/* Function codes. */
-# define OBJ_F_OBJ_ADD_OBJECT                             105
-# define OBJ_F_OBJ_CREATE                                 100
-# define OBJ_F_OBJ_DUP                                    101
-# define OBJ_F_OBJ_NAME_NEW_INDEX                         106
-# define OBJ_F_OBJ_NID2LN                                 102
-# define OBJ_F_OBJ_NID2OBJ                                103
-# define OBJ_F_OBJ_NID2SN                                 104
-
-/* Reason codes. */
-# define OBJ_R_MALLOC_FAILURE                             100
-# define OBJ_R_UNKNOWN_NID                                101
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/ocsp.h b/openflow/usr/include/openssl/ocsp.h
deleted file mode 100644
index ca2ee76..0000000
--- a/openflow/usr/include/openssl/ocsp.h
+++ /dev/null
@@ -1,637 +0,0 @@
-/* ocsp.h */
-/*
- * Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
- * project.
- */
-
-/*
- * History: This file was transfered to Richard Levitte from CertCo by Kathy
- * Weinhold in mid-spring 2000 to be included in OpenSSL or released as a
- * patch kit.
- */
-
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_OCSP_H
-# define HEADER_OCSP_H
-
-# include <openssl/ossl_typ.h>
-# include <openssl/x509.h>
-# include <openssl/x509v3.h>
-# include <openssl/safestack.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Various flags and values */
-
-# define OCSP_DEFAULT_NONCE_LENGTH       16
-
-# define OCSP_NOCERTS                    0x1
-# define OCSP_NOINTERN                   0x2
-# define OCSP_NOSIGS                     0x4
-# define OCSP_NOCHAIN                    0x8
-# define OCSP_NOVERIFY                   0x10
-# define OCSP_NOEXPLICIT                 0x20
-# define OCSP_NOCASIGN                   0x40
-# define OCSP_NODELEGATED                0x80
-# define OCSP_NOCHECKS                   0x100
-# define OCSP_TRUSTOTHER                 0x200
-# define OCSP_RESPID_KEY                 0x400
-# define OCSP_NOTIME                     0x800
-
-/*-  CertID ::= SEQUENCE {
- *       hashAlgorithm            AlgorithmIdentifier,
- *       issuerNameHash     OCTET STRING, -- Hash of Issuer's DN
- *       issuerKeyHash      OCTET STRING, -- Hash of Issuers public key (excluding the tag & length fields)
- *       serialNumber       CertificateSerialNumber }
- */
-typedef struct ocsp_cert_id_st {
-    X509_ALGOR *hashAlgorithm;
-    ASN1_OCTET_STRING *issuerNameHash;
-    ASN1_OCTET_STRING *issuerKeyHash;
-    ASN1_INTEGER *serialNumber;
-} OCSP_CERTID;
-
-DECLARE_STACK_OF(OCSP_CERTID)
-
-/*-  Request ::=     SEQUENCE {
- *       reqCert                    CertID,
- *       singleRequestExtensions    [0] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_one_request_st {
-    OCSP_CERTID *reqCert;
-    STACK_OF(X509_EXTENSION) *singleRequestExtensions;
-} OCSP_ONEREQ;
-
-DECLARE_STACK_OF(OCSP_ONEREQ)
-DECLARE_ASN1_SET_OF(OCSP_ONEREQ)
-
-/*-  TBSRequest      ::=     SEQUENCE {
- *       version             [0] EXPLICIT Version DEFAULT v1,
- *       requestorName       [1] EXPLICIT GeneralName OPTIONAL,
- *       requestList             SEQUENCE OF Request,
- *       requestExtensions   [2] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_req_info_st {
-    ASN1_INTEGER *version;
-    GENERAL_NAME *requestorName;
-    STACK_OF(OCSP_ONEREQ) *requestList;
-    STACK_OF(X509_EXTENSION) *requestExtensions;
-} OCSP_REQINFO;
-
-/*-  Signature       ::=     SEQUENCE {
- *       signatureAlgorithm   AlgorithmIdentifier,
- *       signature            BIT STRING,
- *       certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- */
-typedef struct ocsp_signature_st {
-    X509_ALGOR *signatureAlgorithm;
-    ASN1_BIT_STRING *signature;
-    STACK_OF(X509) *certs;
-} OCSP_SIGNATURE;
-
-/*-  OCSPRequest     ::=     SEQUENCE {
- *       tbsRequest                  TBSRequest,
- *       optionalSignature   [0]     EXPLICIT Signature OPTIONAL }
- */
-typedef struct ocsp_request_st {
-    OCSP_REQINFO *tbsRequest;
-    OCSP_SIGNATURE *optionalSignature; /* OPTIONAL */
-} OCSP_REQUEST;
-
-/*-  OCSPResponseStatus ::= ENUMERATED {
- *       successful            (0),      --Response has valid confirmations
- *       malformedRequest      (1),      --Illegal confirmation request
- *       internalError         (2),      --Internal error in issuer
- *       tryLater              (3),      --Try again later
- *                                       --(4) is not used
- *       sigRequired           (5),      --Must sign the request
- *       unauthorized          (6)       --Request unauthorized
- *   }
- */
-# define OCSP_RESPONSE_STATUS_SUCCESSFUL          0
-# define OCSP_RESPONSE_STATUS_MALFORMEDREQUEST     1
-# define OCSP_RESPONSE_STATUS_INTERNALERROR        2
-# define OCSP_RESPONSE_STATUS_TRYLATER             3
-# define OCSP_RESPONSE_STATUS_SIGREQUIRED          5
-# define OCSP_RESPONSE_STATUS_UNAUTHORIZED         6
-
-/*-  ResponseBytes ::=       SEQUENCE {
- *       responseType   OBJECT IDENTIFIER,
- *       response       OCTET STRING }
- */
-typedef struct ocsp_resp_bytes_st {
-    ASN1_OBJECT *responseType;
-    ASN1_OCTET_STRING *response;
-} OCSP_RESPBYTES;
-
-/*-  OCSPResponse ::= SEQUENCE {
- *      responseStatus         OCSPResponseStatus,
- *      responseBytes          [0] EXPLICIT ResponseBytes OPTIONAL }
- */
-struct ocsp_response_st {
-    ASN1_ENUMERATED *responseStatus;
-    OCSP_RESPBYTES *responseBytes;
-};
-
-/*-  ResponderID ::= CHOICE {
- *      byName   [1] Name,
- *      byKey    [2] KeyHash }
- */
-# define V_OCSP_RESPID_NAME 0
-# define V_OCSP_RESPID_KEY  1
-struct ocsp_responder_id_st {
-    int type;
-    union {
-        X509_NAME *byName;
-        ASN1_OCTET_STRING *byKey;
-    } value;
-};
-
-DECLARE_STACK_OF(OCSP_RESPID)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
-
-/*-  KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key
- *                            --(excluding the tag and length fields)
- */
-
-/*-  RevokedInfo ::= SEQUENCE {
- *       revocationTime              GeneralizedTime,
- *       revocationReason    [0]     EXPLICIT CRLReason OPTIONAL }
- */
-typedef struct ocsp_revoked_info_st {
-    ASN1_GENERALIZEDTIME *revocationTime;
-    ASN1_ENUMERATED *revocationReason;
-} OCSP_REVOKEDINFO;
-
-/*-  CertStatus ::= CHOICE {
- *       good                [0]     IMPLICIT NULL,
- *       revoked             [1]     IMPLICIT RevokedInfo,
- *       unknown             [2]     IMPLICIT UnknownInfo }
- */
-# define V_OCSP_CERTSTATUS_GOOD    0
-# define V_OCSP_CERTSTATUS_REVOKED 1
-# define V_OCSP_CERTSTATUS_UNKNOWN 2
-typedef struct ocsp_cert_status_st {
-    int type;
-    union {
-        ASN1_NULL *good;
-        OCSP_REVOKEDINFO *revoked;
-        ASN1_NULL *unknown;
-    } value;
-} OCSP_CERTSTATUS;
-
-/*-  SingleResponse ::= SEQUENCE {
- *      certID                       CertID,
- *      certStatus                   CertStatus,
- *      thisUpdate                   GeneralizedTime,
- *      nextUpdate           [0]     EXPLICIT GeneralizedTime OPTIONAL,
- *      singleExtensions     [1]     EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_single_response_st {
-    OCSP_CERTID *certId;
-    OCSP_CERTSTATUS *certStatus;
-    ASN1_GENERALIZEDTIME *thisUpdate;
-    ASN1_GENERALIZEDTIME *nextUpdate;
-    STACK_OF(X509_EXTENSION) *singleExtensions;
-} OCSP_SINGLERESP;
-
-DECLARE_STACK_OF(OCSP_SINGLERESP)
-DECLARE_ASN1_SET_OF(OCSP_SINGLERESP)
-
-/*-  ResponseData ::= SEQUENCE {
- *      version              [0] EXPLICIT Version DEFAULT v1,
- *      responderID              ResponderID,
- *      producedAt               GeneralizedTime,
- *      responses                SEQUENCE OF SingleResponse,
- *      responseExtensions   [1] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_response_data_st {
-    ASN1_INTEGER *version;
-    OCSP_RESPID *responderId;
-    ASN1_GENERALIZEDTIME *producedAt;
-    STACK_OF(OCSP_SINGLERESP) *responses;
-    STACK_OF(X509_EXTENSION) *responseExtensions;
-} OCSP_RESPDATA;
-
-/*-  BasicOCSPResponse       ::= SEQUENCE {
- *      tbsResponseData      ResponseData,
- *      signatureAlgorithm   AlgorithmIdentifier,
- *      signature            BIT STRING,
- *      certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- */
-  /*
-   * Note 1: The value for "signature" is specified in the OCSP rfc2560 as
-   * follows: "The value for the signature SHALL be computed on the hash of
-   * the DER encoding ResponseData." This means that you must hash the
-   * DER-encoded tbsResponseData, and then run it through a crypto-signing
-   * function, which will (at least w/RSA) do a hash-'n'-private-encrypt
-   * operation.  This seems a bit odd, but that's the spec.  Also note that
-   * the data structures do not leave anywhere to independently specify the
-   * algorithm used for the initial hash. So, we look at the
-   * signature-specification algorithm, and try to do something intelligent.
-   * -- Kathy Weinhold, CertCo
-   */
-  /*
-   * Note 2: It seems that the mentioned passage from RFC 2560 (section
-   * 4.2.1) is open for interpretation.  I've done tests against another
-   * responder, and found that it doesn't do the double hashing that the RFC
-   * seems to say one should.  Therefore, all relevant functions take a flag
-   * saying which variant should be used.  -- Richard Levitte, OpenSSL team
-   * and CeloCom
-   */
-typedef struct ocsp_basic_response_st {
-    OCSP_RESPDATA *tbsResponseData;
-    X509_ALGOR *signatureAlgorithm;
-    ASN1_BIT_STRING *signature;
-    STACK_OF(X509) *certs;
-} OCSP_BASICRESP;
-
-/*-
- *   CRLReason ::= ENUMERATED {
- *        unspecified             (0),
- *        keyCompromise           (1),
- *        cACompromise            (2),
- *        affiliationChanged      (3),
- *        superseded              (4),
- *        cessationOfOperation    (5),
- *        certificateHold         (6),
- *        removeFromCRL           (8) }
- */
-# define OCSP_REVOKED_STATUS_NOSTATUS               -1
-# define OCSP_REVOKED_STATUS_UNSPECIFIED             0
-# define OCSP_REVOKED_STATUS_KEYCOMPROMISE           1
-# define OCSP_REVOKED_STATUS_CACOMPROMISE            2
-# define OCSP_REVOKED_STATUS_AFFILIATIONCHANGED      3
-# define OCSP_REVOKED_STATUS_SUPERSEDED              4
-# define OCSP_REVOKED_STATUS_CESSATIONOFOPERATION    5
-# define OCSP_REVOKED_STATUS_CERTIFICATEHOLD         6
-# define OCSP_REVOKED_STATUS_REMOVEFROMCRL           8
-
-/*-
- * CrlID ::= SEQUENCE {
- *     crlUrl               [0]     EXPLICIT IA5String OPTIONAL,
- *     crlNum               [1]     EXPLICIT INTEGER OPTIONAL,
- *     crlTime              [2]     EXPLICIT GeneralizedTime OPTIONAL }
- */
-typedef struct ocsp_crl_id_st {
-    ASN1_IA5STRING *crlUrl;
-    ASN1_INTEGER *crlNum;
-    ASN1_GENERALIZEDTIME *crlTime;
-} OCSP_CRLID;
-
-/*-
- * ServiceLocator ::= SEQUENCE {
- *      issuer    Name,
- *      locator   AuthorityInfoAccessSyntax OPTIONAL }
- */
-typedef struct ocsp_service_locator_st {
-    X509_NAME *issuer;
-    STACK_OF(ACCESS_DESCRIPTION) *locator;
-} OCSP_SERVICELOC;
-
-# define PEM_STRING_OCSP_REQUEST "OCSP REQUEST"
-# define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE"
-
-# define d2i_OCSP_REQUEST_bio(bp,p) ASN1_d2i_bio_of(OCSP_REQUEST,OCSP_REQUEST_new,d2i_OCSP_REQUEST,bp,p)
-
-# define d2i_OCSP_RESPONSE_bio(bp,p) ASN1_d2i_bio_of(OCSP_RESPONSE,OCSP_RESPONSE_new,d2i_OCSP_RESPONSE,bp,p)
-
-# define PEM_read_bio_OCSP_REQUEST(bp,x,cb) (OCSP_REQUEST *)PEM_ASN1_read_bio( \
-     (char *(*)())d2i_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,bp,(char **)x,cb,NULL)
-
-# define PEM_read_bio_OCSP_RESPONSE(bp,x,cb)(OCSP_RESPONSE *)PEM_ASN1_read_bio(\
-     (char *(*)())d2i_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,bp,(char **)x,cb,NULL)
-
-# define PEM_write_bio_OCSP_REQUEST(bp,o) \
-    PEM_ASN1_write_bio((int (*)())i2d_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,\
-                        bp,(char *)o, NULL,NULL,0,NULL,NULL)
-
-# define PEM_write_bio_OCSP_RESPONSE(bp,o) \
-    PEM_ASN1_write_bio((int (*)())i2d_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,\
-                        bp,(char *)o, NULL,NULL,0,NULL,NULL)
-
-# define i2d_OCSP_RESPONSE_bio(bp,o) ASN1_i2d_bio_of(OCSP_RESPONSE,i2d_OCSP_RESPONSE,bp,o)
-
-# define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o)
-
-# define OCSP_REQUEST_sign(o,pkey,md) \
-        ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\
-                o->optionalSignature->signatureAlgorithm,NULL,\
-                o->optionalSignature->signature,o->tbsRequest,pkey,md)
-
-# define OCSP_BASICRESP_sign(o,pkey,md,d) \
-        ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),o->signatureAlgorithm,NULL,\
-                o->signature,o->tbsResponseData,pkey,md)
-
-# define OCSP_REQUEST_verify(a,r) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO),\
-        a->optionalSignature->signatureAlgorithm,\
-        a->optionalSignature->signature,a->tbsRequest,r)
-
-# define OCSP_BASICRESP_verify(a,r,d) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA),\
-        a->signatureAlgorithm,a->signature,a->tbsResponseData,r)
-
-# define ASN1_BIT_STRING_digest(data,type,md,len) \
-        ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
-
-# define OCSP_CERTSTATUS_dup(cs)\
-                (OCSP_CERTSTATUS*)ASN1_dup((int(*)())i2d_OCSP_CERTSTATUS,\
-                (char *(*)())d2i_OCSP_CERTSTATUS,(char *)(cs))
-
-OCSP_CERTID *OCSP_CERTID_dup(OCSP_CERTID *id);
-
-OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, const char *path, OCSP_REQUEST *req);
-OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, const char *path, OCSP_REQUEST *req,
-                               int maxline);
-int OCSP_REQ_CTX_nbio(OCSP_REQ_CTX *rctx);
-int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx);
-OCSP_REQ_CTX *OCSP_REQ_CTX_new(BIO *io, int maxline);
-void OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx);
-void OCSP_set_max_response_length(OCSP_REQ_CTX *rctx, unsigned long len);
-int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it,
-                     ASN1_VALUE *val);
-int OCSP_REQ_CTX_nbio_d2i(OCSP_REQ_CTX *rctx, ASN1_VALUE **pval,
-                          const ASN1_ITEM *it);
-BIO *OCSP_REQ_CTX_get0_mem_bio(OCSP_REQ_CTX *rctx);
-int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it,
-                     ASN1_VALUE *val);
-int OCSP_REQ_CTX_http(OCSP_REQ_CTX *rctx, const char *op, const char *path);
-int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req);
-int OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx,
-                             const char *name, const char *value);
-
-OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
-
-OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
-                              X509_NAME *issuerName,
-                              ASN1_BIT_STRING *issuerKey,
-                              ASN1_INTEGER *serialNumber);
-
-OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid);
-
-int OCSP_request_add1_nonce(OCSP_REQUEST *req, unsigned char *val, int len);
-int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len);
-int OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs);
-int OCSP_copy_nonce(OCSP_BASICRESP *resp, OCSP_REQUEST *req);
-
-int OCSP_request_set1_name(OCSP_REQUEST *req, X509_NAME *nm);
-int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert);
-
-int OCSP_request_sign(OCSP_REQUEST *req,
-                      X509 *signer,
-                      EVP_PKEY *key,
-                      const EVP_MD *dgst,
-                      STACK_OF(X509) *certs, unsigned long flags);
-
-int OCSP_response_status(OCSP_RESPONSE *resp);
-OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp);
-
-int OCSP_resp_count(OCSP_BASICRESP *bs);
-OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx);
-int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last);
-int OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason,
-                            ASN1_GENERALIZEDTIME **revtime,
-                            ASN1_GENERALIZEDTIME **thisupd,
-                            ASN1_GENERALIZEDTIME **nextupd);
-int OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status,
-                          int *reason,
-                          ASN1_GENERALIZEDTIME **revtime,
-                          ASN1_GENERALIZEDTIME **thisupd,
-                          ASN1_GENERALIZEDTIME **nextupd);
-int OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd,
-                        ASN1_GENERALIZEDTIME *nextupd, long sec, long maxsec);
-
-int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs,
-                        X509_STORE *store, unsigned long flags);
-
-int OCSP_parse_url(const char *url, char **phost, char **pport, char **ppath,
-                   int *pssl);
-
-int OCSP_id_issuer_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
-int OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
-
-int OCSP_request_onereq_count(OCSP_REQUEST *req);
-OCSP_ONEREQ *OCSP_request_onereq_get0(OCSP_REQUEST *req, int i);
-OCSP_CERTID *OCSP_onereq_get0_id(OCSP_ONEREQ *one);
-int OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd,
-                      ASN1_OCTET_STRING **pikeyHash,
-                      ASN1_INTEGER **pserial, OCSP_CERTID *cid);
-int OCSP_request_is_signed(OCSP_REQUEST *req);
-OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs);
-OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
-                                        OCSP_CERTID *cid,
-                                        int status, int reason,
-                                        ASN1_TIME *revtime,
-                                        ASN1_TIME *thisupd,
-                                        ASN1_TIME *nextupd);
-int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert);
-int OCSP_basic_sign(OCSP_BASICRESP *brsp,
-                    X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
-                    STACK_OF(X509) *certs, unsigned long flags);
-
-X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
-
-X509_EXTENSION *OCSP_accept_responses_new(char **oids);
-
-X509_EXTENSION *OCSP_archive_cutoff_new(char *tim);
-
-X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME *issuer, char **urls);
-
-int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x);
-int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos);
-int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj,
-                                int lastpos);
-int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos);
-X509_EXTENSION *OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc);
-X509_EXTENSION *OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc);
-void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit,
-                                int *idx);
-int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
-                              unsigned long flags);
-int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x);
-int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos);
-int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, ASN1_OBJECT *obj, int lastpos);
-int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos);
-X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc);
-X509_EXTENSION *OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc);
-void *OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx);
-int OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
-                             unsigned long flags);
-int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x);
-int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos);
-int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj,
-                                  int lastpos);
-int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit,
-                                       int lastpos);
-X509_EXTENSION *OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc);
-X509_EXTENSION *OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc);
-void *OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit,
-                                  int *idx);
-int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value,
-                                int crit, unsigned long flags);
-int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x);
-int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos);
-int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, ASN1_OBJECT *obj,
-                                   int lastpos);
-int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit,
-                                        int lastpos);
-X509_EXTENSION *OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc);
-X509_EXTENSION *OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc);
-void *OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit,
-                                   int *idx);
-int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value,
-                                 int crit, unsigned long flags);
-int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc);
-
-DECLARE_ASN1_FUNCTIONS(OCSP_SINGLERESP)
-DECLARE_ASN1_FUNCTIONS(OCSP_CERTSTATUS)
-DECLARE_ASN1_FUNCTIONS(OCSP_REVOKEDINFO)
-DECLARE_ASN1_FUNCTIONS(OCSP_BASICRESP)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPDATA)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPONSE)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPBYTES)
-DECLARE_ASN1_FUNCTIONS(OCSP_ONEREQ)
-DECLARE_ASN1_FUNCTIONS(OCSP_CERTID)
-DECLARE_ASN1_FUNCTIONS(OCSP_REQUEST)
-DECLARE_ASN1_FUNCTIONS(OCSP_SIGNATURE)
-DECLARE_ASN1_FUNCTIONS(OCSP_REQINFO)
-DECLARE_ASN1_FUNCTIONS(OCSP_CRLID)
-DECLARE_ASN1_FUNCTIONS(OCSP_SERVICELOC)
-
-const char *OCSP_response_status_str(long s);
-const char *OCSP_cert_status_str(long s);
-const char *OCSP_crl_reason_str(long s);
-
-int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST *a, unsigned long flags);
-int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags);
-
-int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
-                      X509_STORE *st, unsigned long flags);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_OCSP_strings(void);
-
-/* Error codes for the OCSP functions. */
-
-/* Function codes. */
-# define OCSP_F_ASN1_STRING_ENCODE                        100
-# define OCSP_F_D2I_OCSP_NONCE                            102
-# define OCSP_F_OCSP_BASIC_ADD1_STATUS                    103
-# define OCSP_F_OCSP_BASIC_SIGN                           104
-# define OCSP_F_OCSP_BASIC_VERIFY                         105
-# define OCSP_F_OCSP_CERT_ID_NEW                          101
-# define OCSP_F_OCSP_CHECK_DELEGATED                      106
-# define OCSP_F_OCSP_CHECK_IDS                            107
-# define OCSP_F_OCSP_CHECK_ISSUER                         108
-# define OCSP_F_OCSP_CHECK_VALIDITY                       115
-# define OCSP_F_OCSP_MATCH_ISSUERID                       109
-# define OCSP_F_OCSP_PARSE_URL                            114
-# define OCSP_F_OCSP_REQUEST_SIGN                         110
-# define OCSP_F_OCSP_REQUEST_VERIFY                       116
-# define OCSP_F_OCSP_RESPONSE_GET1_BASIC                  111
-# define OCSP_F_OCSP_SENDREQ_BIO                          112
-# define OCSP_F_OCSP_SENDREQ_NBIO                         117
-# define OCSP_F_PARSE_HTTP_LINE1                          118
-# define OCSP_F_REQUEST_VERIFY                            113
-
-/* Reason codes. */
-# define OCSP_R_BAD_DATA                                  100
-# define OCSP_R_CERTIFICATE_VERIFY_ERROR                  101
-# define OCSP_R_DIGEST_ERR                                102
-# define OCSP_R_ERROR_IN_NEXTUPDATE_FIELD                 122
-# define OCSP_R_ERROR_IN_THISUPDATE_FIELD                 123
-# define OCSP_R_ERROR_PARSING_URL                         121
-# define OCSP_R_MISSING_OCSPSIGNING_USAGE                 103
-# define OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE              124
-# define OCSP_R_NOT_BASIC_RESPONSE                        104
-# define OCSP_R_NO_CERTIFICATES_IN_CHAIN                  105
-# define OCSP_R_NO_CONTENT                                106
-# define OCSP_R_NO_PUBLIC_KEY                             107
-# define OCSP_R_NO_RESPONSE_DATA                          108
-# define OCSP_R_NO_REVOKED_TIME                           109
-# define OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE    110
-# define OCSP_R_REQUEST_NOT_SIGNED                        128
-# define OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA      111
-# define OCSP_R_ROOT_CA_NOT_TRUSTED                       112
-# define OCSP_R_SERVER_READ_ERROR                         113
-# define OCSP_R_SERVER_RESPONSE_ERROR                     114
-# define OCSP_R_SERVER_RESPONSE_PARSE_ERROR               115
-# define OCSP_R_SERVER_WRITE_ERROR                        116
-# define OCSP_R_SIGNATURE_FAILURE                         117
-# define OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND              118
-# define OCSP_R_STATUS_EXPIRED                            125
-# define OCSP_R_STATUS_NOT_YET_VALID                      126
-# define OCSP_R_STATUS_TOO_OLD                            127
-# define OCSP_R_UNKNOWN_MESSAGE_DIGEST                    119
-# define OCSP_R_UNKNOWN_NID                               120
-# define OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE            129
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/opensslv.h b/openflow/usr/include/openssl/opensslv.h
deleted file mode 100644
index 4334fd1..0000000
--- a/openflow/usr/include/openssl/opensslv.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef HEADER_OPENSSLV_H
-# define HEADER_OPENSSLV_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*-
- * Numeric release version identifier:
- * MNNFFPPS: major minor fix patch status
- * The status nibble has one of the values 0 for development, 1 to e for betas
- * 1 to 14, and f for release.  The patch level is exactly that.
- * For example:
- * 0.9.3-dev      0x00903000
- * 0.9.3-beta1    0x00903001
- * 0.9.3-beta2-dev 0x00903002
- * 0.9.3-beta2    0x00903002 (same as ...beta2-dev)
- * 0.9.3          0x0090300f
- * 0.9.3a         0x0090301f
- * 0.9.4          0x0090400f
- * 1.2.3z         0x102031af
- *
- * For continuity reasons (because 0.9.5 is already out, and is coded
- * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level
- * part is slightly different, by setting the highest bit.  This means
- * that 0.9.5a looks like this: 0x0090581f.  At 0.9.6, we can start
- * with 0x0090600S...
- *
- * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.)
- * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
- *  major minor fix final patch/beta)
- */
-# define OPENSSL_VERSION_NUMBER  0x1000207fL
-# ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2g-fips  1 Mar 2016"
-# else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2g  1 Mar 2016"
-# endif
-# define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
-
-/*-
- * The macros below are to be used for shared library (.so, .dll, ...)
- * versioning.  That kind of versioning works a bit differently between
- * operating systems.  The most usual scheme is to set a major and a minor
- * number, and have the runtime loader check that the major number is equal
- * to what it was at application link time, while the minor number has to
- * be greater or equal to what it was at application link time.  With this
- * scheme, the version number is usually part of the file name, like this:
- *
- *      libcrypto.so.0.9
- *
- * Some unixen also make a softlink with the major verson number only:
- *
- *      libcrypto.so.0
- *
- * On Tru64 and IRIX 6.x it works a little bit differently.  There, the
- * shared library version is stored in the file, and is actually a series
- * of versions, separated by colons.  The rightmost version present in the
- * library when linking an application is stored in the application to be
- * matched at run time.  When the application is run, a check is done to
- * see if the library version stored in the application matches any of the
- * versions in the version string of the library itself.
- * This version string can be constructed in any way, depending on what
- * kind of matching is desired.  However, to implement the same scheme as
- * the one used in the other unixen, all compatible versions, from lowest
- * to highest, should be part of the string.  Consecutive builds would
- * give the following versions strings:
- *
- *      3.0
- *      3.0:3.1
- *      3.0:3.1:3.2
- *      4.0
- *      4.0:4.1
- *
- * Notice how version 4 is completely incompatible with version, and
- * therefore give the breach you can see.
- *
- * There may be other schemes as well that I haven't yet discovered.
- *
- * So, here's the way it works here: first of all, the library version
- * number doesn't need at all to match the overall OpenSSL version.
- * However, it's nice and more understandable if it actually does.
- * The current library version is stored in the macro SHLIB_VERSION_NUMBER,
- * which is just a piece of text in the format "M.m.e" (Major, minor, edit).
- * For the sake of Tru64, IRIX, and any other OS that behaves in similar ways,
- * we need to keep a history of version numbers, which is done in the
- * macro SHLIB_VERSION_HISTORY.  The numbers are separated by colons and
- * should only keep the versions that are binary compatible with the current.
- */
-# define SHLIB_VERSION_HISTORY ""
-# define SHLIB_VERSION_NUMBER "1.0.0"
-
-
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* HEADER_OPENSSLV_H */
diff --git a/openflow/usr/include/openssl/ossl_typ.h b/openflow/usr/include/openssl/ossl_typ.h
deleted file mode 100644
index 9144ea2..0000000
--- a/openflow/usr/include/openssl/ossl_typ.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_OPENSSL_TYPES_H
-# define HEADER_OPENSSL_TYPES_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# include <openssl/e_os2.h>
-
-# ifdef NO_ASN1_TYPEDEFS
-#  define ASN1_INTEGER            ASN1_STRING
-#  define ASN1_ENUMERATED         ASN1_STRING
-#  define ASN1_BIT_STRING         ASN1_STRING
-#  define ASN1_OCTET_STRING       ASN1_STRING
-#  define ASN1_PRINTABLESTRING    ASN1_STRING
-#  define ASN1_T61STRING          ASN1_STRING
-#  define ASN1_IA5STRING          ASN1_STRING
-#  define ASN1_UTCTIME            ASN1_STRING
-#  define ASN1_GENERALIZEDTIME    ASN1_STRING
-#  define ASN1_TIME               ASN1_STRING
-#  define ASN1_GENERALSTRING      ASN1_STRING
-#  define ASN1_UNIVERSALSTRING    ASN1_STRING
-#  define ASN1_BMPSTRING          ASN1_STRING
-#  define ASN1_VISIBLESTRING      ASN1_STRING
-#  define ASN1_UTF8STRING         ASN1_STRING
-#  define ASN1_BOOLEAN            int
-#  define ASN1_NULL               int
-# else
-typedef struct asn1_string_st ASN1_INTEGER;
-typedef struct asn1_string_st ASN1_ENUMERATED;
-typedef struct asn1_string_st ASN1_BIT_STRING;
-typedef struct asn1_string_st ASN1_OCTET_STRING;
-typedef struct asn1_string_st ASN1_PRINTABLESTRING;
-typedef struct asn1_string_st ASN1_T61STRING;
-typedef struct asn1_string_st ASN1_IA5STRING;
-typedef struct asn1_string_st ASN1_GENERALSTRING;
-typedef struct asn1_string_st ASN1_UNIVERSALSTRING;
-typedef struct asn1_string_st ASN1_BMPSTRING;
-typedef struct asn1_string_st ASN1_UTCTIME;
-typedef struct asn1_string_st ASN1_TIME;
-typedef struct asn1_string_st ASN1_GENERALIZEDTIME;
-typedef struct asn1_string_st ASN1_VISIBLESTRING;
-typedef struct asn1_string_st ASN1_UTF8STRING;
-typedef struct asn1_string_st ASN1_STRING;
-typedef int ASN1_BOOLEAN;
-typedef int ASN1_NULL;
-# endif
-
-typedef struct asn1_object_st ASN1_OBJECT;
-
-typedef struct ASN1_ITEM_st ASN1_ITEM;
-typedef struct asn1_pctx_st ASN1_PCTX;
-
-# ifdef OPENSSL_SYS_WIN32
-#  undef X509_NAME
-#  undef X509_EXTENSIONS
-#  undef X509_CERT_PAIR
-#  undef PKCS7_ISSUER_AND_SERIAL
-#  undef OCSP_REQUEST
-#  undef OCSP_RESPONSE
-# endif
-
-# ifdef BIGNUM
-#  undef BIGNUM
-# endif
-typedef struct bignum_st BIGNUM;
-typedef struct bignum_ctx BN_CTX;
-typedef struct bn_blinding_st BN_BLINDING;
-typedef struct bn_mont_ctx_st BN_MONT_CTX;
-typedef struct bn_recp_ctx_st BN_RECP_CTX;
-typedef struct bn_gencb_st BN_GENCB;
-
-typedef struct buf_mem_st BUF_MEM;
-
-typedef struct evp_cipher_st EVP_CIPHER;
-typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
-typedef struct env_md_st EVP_MD;
-typedef struct env_md_ctx_st EVP_MD_CTX;
-typedef struct evp_pkey_st EVP_PKEY;
-
-typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD;
-
-typedef struct evp_pkey_method_st EVP_PKEY_METHOD;
-typedef struct evp_pkey_ctx_st EVP_PKEY_CTX;
-
-typedef struct dh_st DH;
-typedef struct dh_method DH_METHOD;
-
-typedef struct dsa_st DSA;
-typedef struct dsa_method DSA_METHOD;
-
-typedef struct rsa_st RSA;
-typedef struct rsa_meth_st RSA_METHOD;
-
-typedef struct rand_meth_st RAND_METHOD;
-
-typedef struct ecdh_method ECDH_METHOD;
-typedef struct ecdsa_method ECDSA_METHOD;
-
-typedef struct x509_st X509;
-typedef struct X509_algor_st X509_ALGOR;
-typedef struct X509_crl_st X509_CRL;
-typedef struct x509_crl_method_st X509_CRL_METHOD;
-typedef struct x509_revoked_st X509_REVOKED;
-typedef struct X509_name_st X509_NAME;
-typedef struct X509_pubkey_st X509_PUBKEY;
-typedef struct x509_store_st X509_STORE;
-typedef struct x509_store_ctx_st X509_STORE_CTX;
-
-typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO;
-
-typedef struct v3_ext_ctx X509V3_CTX;
-typedef struct conf_st CONF;
-
-typedef struct store_st STORE;
-typedef struct store_method_st STORE_METHOD;
-
-typedef struct ui_st UI;
-typedef struct ui_method_st UI_METHOD;
-
-typedef struct st_ERR_FNS ERR_FNS;
-
-typedef struct engine_st ENGINE;
-typedef struct ssl_st SSL;
-typedef struct ssl_ctx_st SSL_CTX;
-
-typedef struct X509_POLICY_NODE_st X509_POLICY_NODE;
-typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL;
-typedef struct X509_POLICY_TREE_st X509_POLICY_TREE;
-typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE;
-
-typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID;
-typedef struct DIST_POINT_st DIST_POINT;
-typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;
-typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;
-
-  /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */
-# define DECLARE_PKCS12_STACK_OF(type)/* Nothing */
-# define IMPLEMENT_PKCS12_STACK_OF(type)/* Nothing */
-
-typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
-/* Callback types for crypto.h */
-typedef int CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                           int idx, long argl, void *argp);
-typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                             int idx, long argl, void *argp);
-typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,
-                           void *from_d, int idx, long argl, void *argp);
-
-typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
-typedef struct ocsp_response_st OCSP_RESPONSE;
-typedef struct ocsp_responder_id_st OCSP_RESPID;
-
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* def HEADER_OPENSSL_TYPES_H */
diff --git a/openflow/usr/include/openssl/pem.h b/openflow/usr/include/openssl/pem.h
deleted file mode 100644
index d3b23fc..0000000
--- a/openflow/usr/include/openssl/pem.h
+++ /dev/null
@@ -1,615 +0,0 @@
-/* crypto/pem/pem.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_PEM_H
-# define HEADER_PEM_H
-
-# include <openssl/e_os2.h>
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# ifndef OPENSSL_NO_STACK
-#  include <openssl/stack.h>
-# endif
-# include <openssl/evp.h>
-# include <openssl/x509.h>
-# include <openssl/pem2.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define PEM_BUFSIZE             1024
-
-# define PEM_OBJ_UNDEF           0
-# define PEM_OBJ_X509            1
-# define PEM_OBJ_X509_REQ        2
-# define PEM_OBJ_CRL             3
-# define PEM_OBJ_SSL_SESSION     4
-# define PEM_OBJ_PRIV_KEY        10
-# define PEM_OBJ_PRIV_RSA        11
-# define PEM_OBJ_PRIV_DSA        12
-# define PEM_OBJ_PRIV_DH         13
-# define PEM_OBJ_PUB_RSA         14
-# define PEM_OBJ_PUB_DSA         15
-# define PEM_OBJ_PUB_DH          16
-# define PEM_OBJ_DHPARAMS        17
-# define PEM_OBJ_DSAPARAMS       18
-# define PEM_OBJ_PRIV_RSA_PUBLIC 19
-# define PEM_OBJ_PRIV_ECDSA      20
-# define PEM_OBJ_PUB_ECDSA       21
-# define PEM_OBJ_ECPARAMETERS    22
-
-# define PEM_ERROR               30
-# define PEM_DEK_DES_CBC         40
-# define PEM_DEK_IDEA_CBC        45
-# define PEM_DEK_DES_EDE         50
-# define PEM_DEK_DES_ECB         60
-# define PEM_DEK_RSA             70
-# define PEM_DEK_RSA_MD2         80
-# define PEM_DEK_RSA_MD5         90
-
-# define PEM_MD_MD2              NID_md2
-# define PEM_MD_MD5              NID_md5
-# define PEM_MD_SHA              NID_sha
-# define PEM_MD_MD2_RSA          NID_md2WithRSAEncryption
-# define PEM_MD_MD5_RSA          NID_md5WithRSAEncryption
-# define PEM_MD_SHA_RSA          NID_sha1WithRSAEncryption
-
-# define PEM_STRING_X509_OLD     "X509 CERTIFICATE"
-# define PEM_STRING_X509         "CERTIFICATE"
-# define PEM_STRING_X509_PAIR    "CERTIFICATE PAIR"
-# define PEM_STRING_X509_TRUSTED "TRUSTED CERTIFICATE"
-# define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST"
-# define PEM_STRING_X509_REQ     "CERTIFICATE REQUEST"
-# define PEM_STRING_X509_CRL     "X509 CRL"
-# define PEM_STRING_EVP_PKEY     "ANY PRIVATE KEY"
-# define PEM_STRING_PUBLIC       "PUBLIC KEY"
-# define PEM_STRING_RSA          "RSA PRIVATE KEY"
-# define PEM_STRING_RSA_PUBLIC   "RSA PUBLIC KEY"
-# define PEM_STRING_DSA          "DSA PRIVATE KEY"
-# define PEM_STRING_DSA_PUBLIC   "DSA PUBLIC KEY"
-# define PEM_STRING_PKCS7        "PKCS7"
-# define PEM_STRING_PKCS7_SIGNED "PKCS #7 SIGNED DATA"
-# define PEM_STRING_PKCS8        "ENCRYPTED PRIVATE KEY"
-# define PEM_STRING_PKCS8INF     "PRIVATE KEY"
-# define PEM_STRING_DHPARAMS     "DH PARAMETERS"
-# define PEM_STRING_DHXPARAMS    "X9.42 DH PARAMETERS"
-# define PEM_STRING_SSL_SESSION  "SSL SESSION PARAMETERS"
-# define PEM_STRING_DSAPARAMS    "DSA PARAMETERS"
-# define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY"
-# define PEM_STRING_ECPARAMETERS "EC PARAMETERS"
-# define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
-# define PEM_STRING_PARAMETERS   "PARAMETERS"
-# define PEM_STRING_CMS          "CMS"
-
-  /*
-   * Note that this structure is initialised by PEM_SealInit and cleaned up
-   * by PEM_SealFinal (at least for now)
-   */
-typedef struct PEM_Encode_Seal_st {
-    EVP_ENCODE_CTX encode;
-    EVP_MD_CTX md;
-    EVP_CIPHER_CTX cipher;
-} PEM_ENCODE_SEAL_CTX;
-
-/* enc_type is one off */
-# define PEM_TYPE_ENCRYPTED      10
-# define PEM_TYPE_MIC_ONLY       20
-# define PEM_TYPE_MIC_CLEAR      30
-# define PEM_TYPE_CLEAR          40
-
-typedef struct pem_recip_st {
-    char *name;
-    X509_NAME *dn;
-    int cipher;
-    int key_enc;
-    /*      char iv[8]; unused and wrong size */
-} PEM_USER;
-
-typedef struct pem_ctx_st {
-    int type;                   /* what type of object */
-    struct {
-        int version;
-        int mode;
-    } proc_type;
-
-    char *domain;
-
-    struct {
-        int cipher;
-        /*-
-        unused, and wrong size
-        unsigned char iv[8]; */
-    } DEK_info;
-
-    PEM_USER *originator;
-
-    int num_recipient;
-    PEM_USER **recipient;
-/*-
-    XXX(ben): don#t think this is used!
-        STACK *x509_chain;      / * certificate chain */
-    EVP_MD *md;                 /* signature type */
-
-    int md_enc;                 /* is the md encrypted or not? */
-    int md_len;                 /* length of md_data */
-    char *md_data;              /* message digest, could be pkey encrypted */
-
-    EVP_CIPHER *dec;            /* date encryption cipher */
-    int key_len;                /* key length */
-    unsigned char *key;         /* key */
-  /*-
-    unused, and wrong size
-    unsigned char iv[8]; */
-
-    int data_enc;               /* is the data encrypted */
-    int data_len;
-    unsigned char *data;
-} PEM_CTX;
-
-/*
- * These macros make the PEM_read/PEM_write functions easier to maintain and
- * write. Now they are all implemented with either: IMPLEMENT_PEM_rw(...) or
- * IMPLEMENT_PEM_rw_cb(...)
- */
-
-# ifdef OPENSSL_NO_FP_API
-
-#  define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
-# else
-
-#  define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
-type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
-{ \
-return PEM_ASN1_read((d2i_of_void *)d2i_##asn1, str,fp,(void **)x,cb,u); \
-}
-
-#  define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x) \
-{ \
-return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL); \
-}
-
-#  define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, const type *x) \
-{ \
-return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(void *)x,NULL,NULL,0,NULL,NULL); \
-}
-
-#  define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, \
-                  void *u) \
-        { \
-        return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \
-        }
-
-#  define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, \
-                  void *u) \
-        { \
-        return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \
-        }
-
-# endif
-
-# define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
-{ \
-return PEM_ASN1_read_bio((d2i_of_void *)d2i_##asn1, str,bp,(void **)x,cb,u); \
-}
-
-# define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x) \
-{ \
-return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL); \
-}
-
-# define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, const type *x) \
-{ \
-return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(void *)x,NULL,NULL,0,NULL,NULL); \
-}
-
-# define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
-        { \
-        return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u); \
-        }
-
-# define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
-        { \
-        return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(void *)x,enc,kstr,klen,cb,u); \
-        }
-
-# define IMPLEMENT_PEM_write(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_fp(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_write_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_fp_const(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_write_cb(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_write_cb_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_read_fp(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_rw(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_rw_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_const(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_rw_cb(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb(name, type, str, asn1)
-
-/* These are the same except they are for the declarations */
-
-# if defined(OPENSSL_NO_FP_API)
-
-#  define DECLARE_PEM_read_fp(name, type) /**/
-#  define DECLARE_PEM_write_fp(name, type) /**/
-#  define DECLARE_PEM_write_cb_fp(name, type) /**/
-# else
-
-#  define DECLARE_PEM_read_fp(name, type) \
-        type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u);
-
-#  define DECLARE_PEM_write_fp(name, type) \
-        int PEM_write_##name(FILE *fp, type *x);
-
-#  define DECLARE_PEM_write_fp_const(name, type) \
-        int PEM_write_##name(FILE *fp, const type *x);
-
-#  define DECLARE_PEM_write_cb_fp(name, type) \
-        int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
-
-# endif
-
-# ifndef OPENSSL_NO_BIO
-#  define DECLARE_PEM_read_bio(name, type) \
-        type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u);
-
-#  define DECLARE_PEM_write_bio(name, type) \
-        int PEM_write_bio_##name(BIO *bp, type *x);
-
-#  define DECLARE_PEM_write_bio_const(name, type) \
-        int PEM_write_bio_##name(BIO *bp, const type *x);
-
-#  define DECLARE_PEM_write_cb_bio(name, type) \
-        int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
-
-# else
-
-#  define DECLARE_PEM_read_bio(name, type) /**/
-#  define DECLARE_PEM_write_bio(name, type) /**/
-#  define DECLARE_PEM_write_bio_const(name, type) /**/
-#  define DECLARE_PEM_write_cb_bio(name, type) /**/
-# endif
-# define DECLARE_PEM_write(name, type) \
-        DECLARE_PEM_write_bio(name, type) \
-        DECLARE_PEM_write_fp(name, type)
-# define DECLARE_PEM_write_const(name, type) \
-        DECLARE_PEM_write_bio_const(name, type) \
-        DECLARE_PEM_write_fp_const(name, type)
-# define DECLARE_PEM_write_cb(name, type) \
-        DECLARE_PEM_write_cb_bio(name, type) \
-        DECLARE_PEM_write_cb_fp(name, type)
-# define DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_read_bio(name, type) \
-        DECLARE_PEM_read_fp(name, type)
-# define DECLARE_PEM_rw(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write(name, type)
-# define DECLARE_PEM_rw_const(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write_const(name, type)
-# define DECLARE_PEM_rw_cb(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write_cb(name, type)
-# if 1
-/* "userdata": new with OpenSSL 0.9.4 */
-typedef int pem_password_cb (char *buf, int size, int rwflag, void *userdata);
-# else
-/* OpenSSL 0.9.3, 0.9.3a */
-typedef int pem_password_cb (char *buf, int size, int rwflag);
-# endif
-
-int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
-int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *len,
-                  pem_password_cb *callback, void *u);
-
-# ifndef OPENSSL_NO_BIO
-int PEM_read_bio(BIO *bp, char **name, char **header,
-                 unsigned char **data, long *len);
-int PEM_write_bio(BIO *bp, const char *name, const char *hdr,
-                  const unsigned char *data, long len);
-int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm,
-                       const char *name, BIO *bp, pem_password_cb *cb,
-                       void *u);
-void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
-                        pem_password_cb *cb, void *u);
-int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x,
-                       const EVP_CIPHER *enc, unsigned char *kstr, int klen,
-                       pem_password_cb *cb, void *u);
-
-STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
-                                            pem_password_cb *cb, void *u);
-int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,
-                            unsigned char *kstr, int klen,
-                            pem_password_cb *cd, void *u);
-# endif
-
-int PEM_read(FILE *fp, char **name, char **header,
-             unsigned char **data, long *len);
-int PEM_write(FILE *fp, const char *name, const char *hdr,
-              const unsigned char *data, long len);
-void *PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
-                    pem_password_cb *cb, void *u);
-int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,
-                   void *x, const EVP_CIPHER *enc, unsigned char *kstr,
-                   int klen, pem_password_cb *callback, void *u);
-STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
-                                        pem_password_cb *cb, void *u);
-
-int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,
-                 EVP_MD *md_type, unsigned char **ek, int *ekl,
-                 unsigned char *iv, EVP_PKEY **pubk, int npubk);
-void PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl,
-                    unsigned char *in, int inl);
-int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
-                  unsigned char *out, int *outl, EVP_PKEY *priv);
-
-void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type);
-void PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *d, unsigned int cnt);
-int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-                  unsigned int *siglen, EVP_PKEY *pkey);
-
-int PEM_def_callback(char *buf, int num, int w, void *key);
-void PEM_proc_type(char *buf, int type);
-void PEM_dek_info(char *buf, const char *type, int len, char *str);
-
-# include <openssl/symhacks.h>
-
-DECLARE_PEM_rw(X509, X509)
-DECLARE_PEM_rw(X509_AUX, X509)
-DECLARE_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR)
-DECLARE_PEM_rw(X509_REQ, X509_REQ)
-DECLARE_PEM_write(X509_REQ_NEW, X509_REQ)
-DECLARE_PEM_rw(X509_CRL, X509_CRL)
-DECLARE_PEM_rw(PKCS7, PKCS7)
-DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
-DECLARE_PEM_rw(PKCS8, X509_SIG)
-DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
-# ifndef OPENSSL_NO_RSA
-DECLARE_PEM_rw_cb(RSAPrivateKey, RSA)
-DECLARE_PEM_rw_const(RSAPublicKey, RSA)
-DECLARE_PEM_rw(RSA_PUBKEY, RSA)
-# endif
-# ifndef OPENSSL_NO_DSA
-DECLARE_PEM_rw_cb(DSAPrivateKey, DSA)
-DECLARE_PEM_rw(DSA_PUBKEY, DSA)
-DECLARE_PEM_rw_const(DSAparams, DSA)
-# endif
-# ifndef OPENSSL_NO_EC
-DECLARE_PEM_rw_const(ECPKParameters, EC_GROUP)
-DECLARE_PEM_rw_cb(ECPrivateKey, EC_KEY)
-DECLARE_PEM_rw(EC_PUBKEY, EC_KEY)
-# endif
-# ifndef OPENSSL_NO_DH
-DECLARE_PEM_rw_const(DHparams, DH)
-DECLARE_PEM_write_const(DHxparams, DH)
-# endif
-DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)
-DECLARE_PEM_rw(PUBKEY, EVP_PKEY)
-
-int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid,
-                                      char *kstr, int klen,
-                                      pem_password_cb *cb, void *u);
-int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *,
-                                  char *, int, pem_password_cb *, void *);
-int i2d_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                            char *kstr, int klen,
-                            pem_password_cb *cb, void *u);
-int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid,
-                                char *kstr, int klen,
-                                pem_password_cb *cb, void *u);
-EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
-                                  void *u);
-
-int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                           char *kstr, int klen,
-                           pem_password_cb *cb, void *u);
-int i2d_PKCS8PrivateKey_nid_fp(FILE *fp, EVP_PKEY *x, int nid,
-                               char *kstr, int klen,
-                               pem_password_cb *cb, void *u);
-int PEM_write_PKCS8PrivateKey_nid(FILE *fp, EVP_PKEY *x, int nid,
-                                  char *kstr, int klen,
-                                  pem_password_cb *cb, void *u);
-
-EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
-                                 void *u);
-
-int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                              char *kstr, int klen, pem_password_cb *cd,
-                              void *u);
-
-EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x);
-int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x);
-
-EVP_PKEY *b2i_PrivateKey(const unsigned char **in, long length);
-EVP_PKEY *b2i_PublicKey(const unsigned char **in, long length);
-EVP_PKEY *b2i_PrivateKey_bio(BIO *in);
-EVP_PKEY *b2i_PublicKey_bio(BIO *in);
-int i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk);
-int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk);
-# ifndef OPENSSL_NO_RC4
-EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u);
-int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
-                pem_password_cb *cb, void *u);
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_PEM_strings(void);
-
-/* Error codes for the PEM functions. */
-
-/* Function codes. */
-# define PEM_F_B2I_DSS                                    127
-# define PEM_F_B2I_PVK_BIO                                128
-# define PEM_F_B2I_RSA                                    129
-# define PEM_F_CHECK_BITLEN_DSA                           130
-# define PEM_F_CHECK_BITLEN_RSA                           131
-# define PEM_F_D2I_PKCS8PRIVATEKEY_BIO                    120
-# define PEM_F_D2I_PKCS8PRIVATEKEY_FP                     121
-# define PEM_F_DO_B2I                                     132
-# define PEM_F_DO_B2I_BIO                                 133
-# define PEM_F_DO_BLOB_HEADER                             134
-# define PEM_F_DO_PK8PKEY                                 126
-# define PEM_F_DO_PK8PKEY_FP                              125
-# define PEM_F_DO_PVK_BODY                                135
-# define PEM_F_DO_PVK_HEADER                              136
-# define PEM_F_I2B_PVK                                    137
-# define PEM_F_I2B_PVK_BIO                                138
-# define PEM_F_LOAD_IV                                    101
-# define PEM_F_PEM_ASN1_READ                              102
-# define PEM_F_PEM_ASN1_READ_BIO                          103
-# define PEM_F_PEM_ASN1_WRITE                             104
-# define PEM_F_PEM_ASN1_WRITE_BIO                         105
-# define PEM_F_PEM_DEF_CALLBACK                           100
-# define PEM_F_PEM_DO_HEADER                              106
-# define PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY            118
-# define PEM_F_PEM_GET_EVP_CIPHER_INFO                    107
-# define PEM_F_PEM_PK8PKEY                                119
-# define PEM_F_PEM_READ                                   108
-# define PEM_F_PEM_READ_BIO                               109
-# define PEM_F_PEM_READ_BIO_DHPARAMS                      141
-# define PEM_F_PEM_READ_BIO_PARAMETERS                    140
-# define PEM_F_PEM_READ_BIO_PRIVATEKEY                    123
-# define PEM_F_PEM_READ_DHPARAMS                          142
-# define PEM_F_PEM_READ_PRIVATEKEY                        124
-# define PEM_F_PEM_SEALFINAL                              110
-# define PEM_F_PEM_SEALINIT                               111
-# define PEM_F_PEM_SIGNFINAL                              112
-# define PEM_F_PEM_WRITE                                  113
-# define PEM_F_PEM_WRITE_BIO                              114
-# define PEM_F_PEM_WRITE_PRIVATEKEY                       139
-# define PEM_F_PEM_X509_INFO_READ                         115
-# define PEM_F_PEM_X509_INFO_READ_BIO                     116
-# define PEM_F_PEM_X509_INFO_WRITE_BIO                    117
-
-/* Reason codes. */
-# define PEM_R_BAD_BASE64_DECODE                          100
-# define PEM_R_BAD_DECRYPT                                101
-# define PEM_R_BAD_END_LINE                               102
-# define PEM_R_BAD_IV_CHARS                               103
-# define PEM_R_BAD_MAGIC_NUMBER                           116
-# define PEM_R_BAD_PASSWORD_READ                          104
-# define PEM_R_BAD_VERSION_NUMBER                         117
-# define PEM_R_BIO_WRITE_FAILURE                          118
-# define PEM_R_CIPHER_IS_NULL                             127
-# define PEM_R_ERROR_CONVERTING_PRIVATE_KEY               115
-# define PEM_R_EXPECTING_PRIVATE_KEY_BLOB                 119
-# define PEM_R_EXPECTING_PUBLIC_KEY_BLOB                  120
-# define PEM_R_INCONSISTENT_HEADER                        121
-# define PEM_R_KEYBLOB_HEADER_PARSE_ERROR                 122
-# define PEM_R_KEYBLOB_TOO_SHORT                          123
-# define PEM_R_NOT_DEK_INFO                               105
-# define PEM_R_NOT_ENCRYPTED                              106
-# define PEM_R_NOT_PROC_TYPE                              107
-# define PEM_R_NO_START_LINE                              108
-# define PEM_R_PROBLEMS_GETTING_PASSWORD                  109
-# define PEM_R_PUBLIC_KEY_NO_RSA                          110
-# define PEM_R_PVK_DATA_TOO_SHORT                         124
-# define PEM_R_PVK_TOO_SHORT                              125
-# define PEM_R_READ_KEY                                   111
-# define PEM_R_SHORT_HEADER                               112
-# define PEM_R_UNSUPPORTED_CIPHER                         113
-# define PEM_R_UNSUPPORTED_ENCRYPTION                     114
-# define PEM_R_UNSUPPORTED_KEY_COMPONENTS                 126
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/pem2.h b/openflow/usr/include/openssl/pem2.h
deleted file mode 100644
index 84897d5..0000000
--- a/openflow/usr/include/openssl/pem2.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
- * This header only exists to break a circular dependency between pem and err
- * Ben 30 Jan 1999.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef HEADER_PEM_H
-void ERR_load_PEM_strings(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/openflow/usr/include/openssl/pkcs12.h b/openflow/usr/include/openssl/pkcs12.h
deleted file mode 100644
index a39adf5..0000000
--- a/openflow/usr/include/openssl/pkcs12.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/* pkcs12.h */
-/*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
- * 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_PKCS12_H
-# define HEADER_PKCS12_H
-
-# include <openssl/bio.h>
-# include <openssl/x509.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# define PKCS12_KEY_ID   1
-# define PKCS12_IV_ID    2
-# define PKCS12_MAC_ID   3
-
-/* Default iteration count */
-# ifndef PKCS12_DEFAULT_ITER
-#  define PKCS12_DEFAULT_ITER     PKCS5_DEFAULT_ITER
-# endif
-
-# define PKCS12_MAC_KEY_LENGTH 20
-
-# define PKCS12_SALT_LEN 8
-
-/* Uncomment out next line for unicode password and names, otherwise ASCII */
-
-/*
- * #define PBE_UNICODE
- */
-
-# ifdef PBE_UNICODE
-#  define PKCS12_key_gen PKCS12_key_gen_uni
-#  define PKCS12_add_friendlyname PKCS12_add_friendlyname_uni
-# else
-#  define PKCS12_key_gen PKCS12_key_gen_asc
-#  define PKCS12_add_friendlyname PKCS12_add_friendlyname_asc
-# endif
-
-/* MS key usage constants */
-
-# define KEY_EX  0x10
-# define KEY_SIG 0x80
-
-typedef struct {
-    X509_SIG *dinfo;
-    ASN1_OCTET_STRING *salt;
-    ASN1_INTEGER *iter;         /* defaults to 1 */
-} PKCS12_MAC_DATA;
-
-typedef struct {
-    ASN1_INTEGER *version;
-    PKCS12_MAC_DATA *mac;
-    PKCS7 *authsafes;
-} PKCS12;
-
-typedef struct {
-    ASN1_OBJECT *type;
-    union {
-        struct pkcs12_bag_st *bag; /* secret, crl and certbag */
-        struct pkcs8_priv_key_info_st *keybag; /* keybag */
-        X509_SIG *shkeybag;     /* shrouded key bag */
-        STACK_OF(PKCS12_SAFEBAG) *safes;
-        ASN1_TYPE *other;
-    } value;
-    STACK_OF(X509_ATTRIBUTE) *attrib;
-} PKCS12_SAFEBAG;
-
-DECLARE_STACK_OF(PKCS12_SAFEBAG)
-DECLARE_ASN1_SET_OF(PKCS12_SAFEBAG)
-DECLARE_PKCS12_STACK_OF(PKCS12_SAFEBAG)
-
-typedef struct pkcs12_bag_st {
-    ASN1_OBJECT *type;
-    union {
-        ASN1_OCTET_STRING *x509cert;
-        ASN1_OCTET_STRING *x509crl;
-        ASN1_OCTET_STRING *octet;
-        ASN1_IA5STRING *sdsicert;
-        ASN1_TYPE *other;       /* Secret or other bag */
-    } value;
-} PKCS12_BAGS;
-
-# define PKCS12_ERROR    0
-# define PKCS12_OK       1
-
-/* Compatibility macros */
-
-# define M_PKCS12_x5092certbag PKCS12_x5092certbag
-# define M_PKCS12_x509crl2certbag PKCS12_x509crl2certbag
-
-# define M_PKCS12_certbag2x509 PKCS12_certbag2x509
-# define M_PKCS12_certbag2x509crl PKCS12_certbag2x509crl
-
-# define M_PKCS12_unpack_p7data PKCS12_unpack_p7data
-# define M_PKCS12_pack_authsafes PKCS12_pack_authsafes
-# define M_PKCS12_unpack_authsafes PKCS12_unpack_authsafes
-# define M_PKCS12_unpack_p7encdata PKCS12_unpack_p7encdata
-
-# define M_PKCS12_decrypt_skey PKCS12_decrypt_skey
-# define M_PKCS8_decrypt PKCS8_decrypt
-
-# define M_PKCS12_bag_type(bg) OBJ_obj2nid((bg)->type)
-# define M_PKCS12_cert_bag_type(bg) OBJ_obj2nid((bg)->value.bag->type)
-# define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type
-
-# define PKCS12_get_attr(bag, attr_nid) \
-                         PKCS12_get_attr_gen(bag->attrib, attr_nid)
-
-# define PKCS8_get_attr(p8, attr_nid) \
-                PKCS12_get_attr_gen(p8->attributes, attr_nid)
-
-# define PKCS12_mac_present(p12) ((p12)->mac ? 1 : 0)
-
-PKCS12_SAFEBAG *PKCS12_x5092certbag(X509 *x509);
-PKCS12_SAFEBAG *PKCS12_x509crl2certbag(X509_CRL *crl);
-X509 *PKCS12_certbag2x509(PKCS12_SAFEBAG *bag);
-X509_CRL *PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag);
-
-PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
-                                         int nid1, int nid2);
-PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8);
-PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass,
-                                   int passlen);
-PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag,
-                                         const char *pass, int passlen);
-X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
-                        const char *pass, int passlen, unsigned char *salt,
-                        int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8);
-PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass,
-                                     int passlen, unsigned char *salt,
-                                     int saltlen, int iter,
-                                     PKCS8_PRIV_KEY_INFO *p8);
-PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk);
-STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7);
-PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
-                             unsigned char *salt, int saltlen, int iter,
-                             STACK_OF(PKCS12_SAFEBAG) *bags);
-STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
-                                                  int passlen);
-
-int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes);
-STACK_OF(PKCS7) *PKCS12_unpack_authsafes(PKCS12 *p12);
-
-int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name,
-                          int namelen);
-int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
-                                int namelen);
-int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name,
-                           int namelen);
-int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag,
-                                const unsigned char *name, int namelen);
-int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage);
-ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid);
-char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
-unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass,
-                                int passlen, unsigned char *in, int inlen,
-                                unsigned char **data, int *datalen,
-                                int en_de);
-void *PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it,
-                              const char *pass, int passlen,
-                              ASN1_OCTET_STRING *oct, int zbuf);
-ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor,
-                                           const ASN1_ITEM *it,
-                                           const char *pass, int passlen,
-                                           void *obj, int zbuf);
-PKCS12 *PKCS12_init(int mode);
-int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
-                       int saltlen, int id, int iter, int n,
-                       unsigned char *out, const EVP_MD *md_type);
-int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
-                       int saltlen, int id, int iter, int n,
-                       unsigned char *out, const EVP_MD *md_type);
-int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                        ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                        const EVP_MD *md_type, int en_de);
-int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
-                   unsigned char *mac, unsigned int *maclen);
-int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
-int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
-                   unsigned char *salt, int saltlen, int iter,
-                   const EVP_MD *md_type);
-int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
-                     int saltlen, const EVP_MD *md_type);
-unsigned char *OPENSSL_asc2uni(const char *asc, int asclen,
-                               unsigned char **uni, int *unilen);
-char *OPENSSL_uni2asc(unsigned char *uni, int unilen);
-
-DECLARE_ASN1_FUNCTIONS(PKCS12)
-DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
-DECLARE_ASN1_FUNCTIONS(PKCS12_SAFEBAG)
-DECLARE_ASN1_FUNCTIONS(PKCS12_BAGS)
-
-DECLARE_ASN1_ITEM(PKCS12_SAFEBAGS)
-DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES)
-
-void PKCS12_PBE_add(void);
-int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
-                 STACK_OF(X509) **ca);
-PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
-                      STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
-                      int mac_iter, int keytype);
-
-PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);
-PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                               EVP_PKEY *key, int key_usage, int iter,
-                               int key_nid, char *pass);
-int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
-                    int safe_nid, int iter, char *pass);
-PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
-
-int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);
-int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);
-PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12);
-PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
-int PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_PKCS12_strings(void);
-
-/* Error codes for the PKCS12 functions. */
-
-/* Function codes. */
-# define PKCS12_F_PARSE_BAG                               129
-# define PKCS12_F_PARSE_BAGS                              103
-# define PKCS12_F_PKCS12_ADD_FRIENDLYNAME                 100
-# define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC             127
-# define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI             102
-# define PKCS12_F_PKCS12_ADD_LOCALKEYID                   104
-# define PKCS12_F_PKCS12_CREATE                           105
-# define PKCS12_F_PKCS12_GEN_MAC                          107
-# define PKCS12_F_PKCS12_INIT                             109
-# define PKCS12_F_PKCS12_ITEM_DECRYPT_D2I                 106
-# define PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT                 108
-# define PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG                117
-# define PKCS12_F_PKCS12_KEY_GEN_ASC                      110
-# define PKCS12_F_PKCS12_KEY_GEN_UNI                      111
-# define PKCS12_F_PKCS12_MAKE_KEYBAG                      112
-# define PKCS12_F_PKCS12_MAKE_SHKEYBAG                    113
-# define PKCS12_F_PKCS12_NEWPASS                          128
-# define PKCS12_F_PKCS12_PACK_P7DATA                      114
-# define PKCS12_F_PKCS12_PACK_P7ENCDATA                   115
-# define PKCS12_F_PKCS12_PARSE                            118
-# define PKCS12_F_PKCS12_PBE_CRYPT                        119
-# define PKCS12_F_PKCS12_PBE_KEYIVGEN                     120
-# define PKCS12_F_PKCS12_SETUP_MAC                        122
-# define PKCS12_F_PKCS12_SET_MAC                          123
-# define PKCS12_F_PKCS12_UNPACK_AUTHSAFES                 130
-# define PKCS12_F_PKCS12_UNPACK_P7DATA                    131
-# define PKCS12_F_PKCS12_VERIFY_MAC                       126
-# define PKCS12_F_PKCS8_ADD_KEYUSAGE                      124
-# define PKCS12_F_PKCS8_ENCRYPT                           125
-
-/* Reason codes. */
-# define PKCS12_R_CANT_PACK_STRUCTURE                     100
-# define PKCS12_R_CONTENT_TYPE_NOT_DATA                   121
-# define PKCS12_R_DECODE_ERROR                            101
-# define PKCS12_R_ENCODE_ERROR                            102
-# define PKCS12_R_ENCRYPT_ERROR                           103
-# define PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE       120
-# define PKCS12_R_INVALID_NULL_ARGUMENT                   104
-# define PKCS12_R_INVALID_NULL_PKCS12_POINTER             105
-# define PKCS12_R_IV_GEN_ERROR                            106
-# define PKCS12_R_KEY_GEN_ERROR                           107
-# define PKCS12_R_MAC_ABSENT                              108
-# define PKCS12_R_MAC_GENERATION_ERROR                    109
-# define PKCS12_R_MAC_SETUP_ERROR                         110
-# define PKCS12_R_MAC_STRING_SET_ERROR                    111
-# define PKCS12_R_MAC_VERIFY_ERROR                        112
-# define PKCS12_R_MAC_VERIFY_FAILURE                      113
-# define PKCS12_R_PARSE_ERROR                             114
-# define PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR           115
-# define PKCS12_R_PKCS12_CIPHERFINAL_ERROR                116
-# define PKCS12_R_PKCS12_PBE_CRYPT_ERROR                  117
-# define PKCS12_R_UNKNOWN_DIGEST_ALGORITHM                118
-# define PKCS12_R_UNSUPPORTED_PKCS12_MODE                 119
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/pkcs7.h b/openflow/usr/include/openssl/pkcs7.h
deleted file mode 100644
index b51b386..0000000
--- a/openflow/usr/include/openssl/pkcs7.h
+++ /dev/null
@@ -1,481 +0,0 @@
-/* crypto/pkcs7/pkcs7.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_PKCS7_H
-# define HEADER_PKCS7_H
-
-# include <openssl/asn1.h>
-# include <openssl/bio.h>
-# include <openssl/e_os2.h>
-
-# include <openssl/symhacks.h>
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_SYS_WIN32
-/* Under Win32 thes are defined in wincrypt.h */
-#  undef PKCS7_ISSUER_AND_SERIAL
-#  undef PKCS7_SIGNER_INFO
-# endif
-
-/*-
-Encryption_ID           DES-CBC
-Digest_ID               MD5
-Digest_Encryption_ID    rsaEncryption
-Key_Encryption_ID       rsaEncryption
-*/
-
-typedef struct pkcs7_issuer_and_serial_st {
-    X509_NAME *issuer;
-    ASN1_INTEGER *serial;
-} PKCS7_ISSUER_AND_SERIAL;
-
-typedef struct pkcs7_signer_info_st {
-    ASN1_INTEGER *version;      /* version 1 */
-    PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
-    X509_ALGOR *digest_alg;
-    STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */
-    X509_ALGOR *digest_enc_alg;
-    ASN1_OCTET_STRING *enc_digest;
-    STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */
-    /* The private key to sign with */
-    EVP_PKEY *pkey;
-} PKCS7_SIGNER_INFO;
-
-DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
-DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO)
-
-typedef struct pkcs7_recip_info_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
-    X509_ALGOR *key_enc_algor;
-    ASN1_OCTET_STRING *enc_key;
-    X509 *cert;                 /* get the pub-key from this */
-} PKCS7_RECIP_INFO;
-
-DECLARE_STACK_OF(PKCS7_RECIP_INFO)
-DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO)
-
-typedef struct pkcs7_signed_st {
-    ASN1_INTEGER *version;      /* version 1 */
-    STACK_OF(X509_ALGOR) *md_algs; /* md used */
-    STACK_OF(X509) *cert;       /* [ 0 ] */
-    STACK_OF(X509_CRL) *crl;    /* [ 1 ] */
-    STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
-    struct pkcs7_st *contents;
-} PKCS7_SIGNED;
-/*
- * The above structure is very very similar to PKCS7_SIGN_ENVELOPE. How about
- * merging the two
- */
-
-typedef struct pkcs7_enc_content_st {
-    ASN1_OBJECT *content_type;
-    X509_ALGOR *algorithm;
-    ASN1_OCTET_STRING *enc_data; /* [ 0 ] */
-    const EVP_CIPHER *cipher;
-} PKCS7_ENC_CONTENT;
-
-typedef struct pkcs7_enveloped_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
-    PKCS7_ENC_CONTENT *enc_data;
-} PKCS7_ENVELOPE;
-
-typedef struct pkcs7_signedandenveloped_st {
-    ASN1_INTEGER *version;      /* version 1 */
-    STACK_OF(X509_ALGOR) *md_algs; /* md used */
-    STACK_OF(X509) *cert;       /* [ 0 ] */
-    STACK_OF(X509_CRL) *crl;    /* [ 1 ] */
-    STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
-    PKCS7_ENC_CONTENT *enc_data;
-    STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
-} PKCS7_SIGN_ENVELOPE;
-
-typedef struct pkcs7_digest_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    X509_ALGOR *md;             /* md used */
-    struct pkcs7_st *contents;
-    ASN1_OCTET_STRING *digest;
-} PKCS7_DIGEST;
-
-typedef struct pkcs7_encrypted_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    PKCS7_ENC_CONTENT *enc_data;
-} PKCS7_ENCRYPT;
-
-typedef struct pkcs7_st {
-    /*
-     * The following is non NULL if it contains ASN1 encoding of this
-     * structure
-     */
-    unsigned char *asn1;
-    long length;
-# define PKCS7_S_HEADER  0
-# define PKCS7_S_BODY    1
-# define PKCS7_S_TAIL    2
-    int state;                  /* used during processing */
-    int detached;
-    ASN1_OBJECT *type;
-    /* content as defined by the type */
-    /*
-     * all encryption/message digests are applied to the 'contents', leaving
-     * out the 'type' field.
-     */
-    union {
-        char *ptr;
-        /* NID_pkcs7_data */
-        ASN1_OCTET_STRING *data;
-        /* NID_pkcs7_signed */
-        PKCS7_SIGNED *sign;
-        /* NID_pkcs7_enveloped */
-        PKCS7_ENVELOPE *enveloped;
-        /* NID_pkcs7_signedAndEnveloped */
-        PKCS7_SIGN_ENVELOPE *signed_and_enveloped;
-        /* NID_pkcs7_digest */
-        PKCS7_DIGEST *digest;
-        /* NID_pkcs7_encrypted */
-        PKCS7_ENCRYPT *encrypted;
-        /* Anything else */
-        ASN1_TYPE *other;
-    } d;
-} PKCS7;
-
-DECLARE_STACK_OF(PKCS7)
-DECLARE_ASN1_SET_OF(PKCS7)
-DECLARE_PKCS12_STACK_OF(PKCS7)
-
-# define PKCS7_OP_SET_DETACHED_SIGNATURE 1
-# define PKCS7_OP_GET_DETACHED_SIGNATURE 2
-
-# define PKCS7_get_signed_attributes(si) ((si)->auth_attr)
-# define PKCS7_get_attributes(si)        ((si)->unauth_attr)
-
-# define PKCS7_type_is_signed(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_signed)
-# define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
-# define PKCS7_type_is_enveloped(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_enveloped)
-# define PKCS7_type_is_signedAndEnveloped(a) \
-                (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)
-# define PKCS7_type_is_data(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_data)
-# define PKCS7_type_is_digest(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_digest)
-
-# define PKCS7_set_detached(p,v) \
-                PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)
-# define PKCS7_get_detached(p) \
-                PKCS7_ctrl(p,PKCS7_OP_GET_DETACHED_SIGNATURE,0,NULL)
-
-# define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
-
-/* S/MIME related flags */
-
-# define PKCS7_TEXT              0x1
-# define PKCS7_NOCERTS           0x2
-# define PKCS7_NOSIGS            0x4
-# define PKCS7_NOCHAIN           0x8
-# define PKCS7_NOINTERN          0x10
-# define PKCS7_NOVERIFY          0x20
-# define PKCS7_DETACHED          0x40
-# define PKCS7_BINARY            0x80
-# define PKCS7_NOATTR            0x100
-# define PKCS7_NOSMIMECAP        0x200
-# define PKCS7_NOOLDMIMETYPE     0x400
-# define PKCS7_CRLFEOL           0x800
-# define PKCS7_STREAM            0x1000
-# define PKCS7_NOCRL             0x2000
-# define PKCS7_PARTIAL           0x4000
-# define PKCS7_REUSE_DIGEST      0x8000
-
-/* Flags: for compatibility with older code */
-
-# define SMIME_TEXT      PKCS7_TEXT
-# define SMIME_NOCERTS   PKCS7_NOCERTS
-# define SMIME_NOSIGS    PKCS7_NOSIGS
-# define SMIME_NOCHAIN   PKCS7_NOCHAIN
-# define SMIME_NOINTERN  PKCS7_NOINTERN
-# define SMIME_NOVERIFY  PKCS7_NOVERIFY
-# define SMIME_DETACHED  PKCS7_DETACHED
-# define SMIME_BINARY    PKCS7_BINARY
-# define SMIME_NOATTR    PKCS7_NOATTR
-
-DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
-
-int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
-                                   const EVP_MD *type, unsigned char *md,
-                                   unsigned int *len);
-# ifndef OPENSSL_NO_FP_API
-PKCS7 *d2i_PKCS7_fp(FILE *fp, PKCS7 **p7);
-int i2d_PKCS7_fp(FILE *fp, PKCS7 *p7);
-# endif
-PKCS7 *PKCS7_dup(PKCS7 *p7);
-PKCS7 *d2i_PKCS7_bio(BIO *bp, PKCS7 **p7);
-int i2d_PKCS7_bio(BIO *bp, PKCS7 *p7);
-int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags);
-int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags);
-
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNER_INFO)
-DECLARE_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNED)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENC_CONTENT)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENVELOPE)
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGN_ENVELOPE)
-DECLARE_ASN1_FUNCTIONS(PKCS7_DIGEST)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENCRYPT)
-DECLARE_ASN1_FUNCTIONS(PKCS7)
-
-DECLARE_ASN1_ITEM(PKCS7_ATTR_SIGN)
-DECLARE_ASN1_ITEM(PKCS7_ATTR_VERIFY)
-
-DECLARE_ASN1_NDEF_FUNCTION(PKCS7)
-DECLARE_ASN1_PRINT_FUNCTION(PKCS7)
-
-long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
-
-int PKCS7_set_type(PKCS7 *p7, int type);
-int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other);
-int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
-int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
-                          const EVP_MD *dgst);
-int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si);
-int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i);
-int PKCS7_add_certificate(PKCS7 *p7, X509 *x509);
-int PKCS7_add_crl(PKCS7 *p7, X509_CRL *x509);
-int PKCS7_content_new(PKCS7 *p7, int nid);
-int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx,
-                     BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si);
-int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
-                          X509 *x509);
-
-BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio);
-int PKCS7_dataFinal(PKCS7 *p7, BIO *bio);
-BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert);
-
-PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509,
-                                       EVP_PKEY *pkey, const EVP_MD *dgst);
-X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
-int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md);
-STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7);
-
-PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509);
-void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
-                                 X509_ALGOR **pdig, X509_ALGOR **psig);
-void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc);
-int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri);
-int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509);
-int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher);
-int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7);
-
-PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx);
-ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk);
-int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int type,
-                               void *data);
-int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
-                        void *value);
-ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid);
-ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid);
-int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
-                                STACK_OF(X509_ATTRIBUTE) *sk);
-int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,
-                         STACK_OF(X509_ATTRIBUTE) *sk);
-
-PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
-                  BIO *data, int flags);
-
-PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7,
-                                         X509 *signcert, EVP_PKEY *pkey,
-                                         const EVP_MD *md, int flags);
-
-int PKCS7_final(PKCS7 *p7, BIO *data, int flags);
-int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
-                 BIO *indata, BIO *out, int flags);
-STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs,
-                                   int flags);
-PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher,
-                     int flags);
-int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data,
-                  int flags);
-
-int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
-                              STACK_OF(X509_ALGOR) *cap);
-STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si);
-int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg);
-
-int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid);
-int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t);
-int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
-                             const unsigned char *md, int mdlen);
-
-int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);
-PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont);
-
-BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_PKCS7_strings(void);
-
-/* Error codes for the PKCS7 functions. */
-
-/* Function codes. */
-# define PKCS7_F_B64_READ_PKCS7                           120
-# define PKCS7_F_B64_WRITE_PKCS7                          121
-# define PKCS7_F_DO_PKCS7_SIGNED_ATTRIB                   136
-# define PKCS7_F_I2D_PKCS7_BIO_STREAM                     140
-# define PKCS7_F_PKCS7_ADD0_ATTRIB_SIGNING_TIME           135
-# define PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP                118
-# define PKCS7_F_PKCS7_ADD_CERTIFICATE                    100
-# define PKCS7_F_PKCS7_ADD_CRL                            101
-# define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO                 102
-# define PKCS7_F_PKCS7_ADD_SIGNATURE                      131
-# define PKCS7_F_PKCS7_ADD_SIGNER                         103
-# define PKCS7_F_PKCS7_BIO_ADD_DIGEST                     125
-# define PKCS7_F_PKCS7_COPY_EXISTING_DIGEST               138
-# define PKCS7_F_PKCS7_CTRL                               104
-# define PKCS7_F_PKCS7_DATADECODE                         112
-# define PKCS7_F_PKCS7_DATAFINAL                          128
-# define PKCS7_F_PKCS7_DATAINIT                           105
-# define PKCS7_F_PKCS7_DATASIGN                           106
-# define PKCS7_F_PKCS7_DATAVERIFY                         107
-# define PKCS7_F_PKCS7_DECRYPT                            114
-# define PKCS7_F_PKCS7_DECRYPT_RINFO                      133
-# define PKCS7_F_PKCS7_ENCODE_RINFO                       132
-# define PKCS7_F_PKCS7_ENCRYPT                            115
-# define PKCS7_F_PKCS7_FINAL                              134
-# define PKCS7_F_PKCS7_FIND_DIGEST                        127
-# define PKCS7_F_PKCS7_GET0_SIGNERS                       124
-# define PKCS7_F_PKCS7_RECIP_INFO_SET                     130
-# define PKCS7_F_PKCS7_SET_CIPHER                         108
-# define PKCS7_F_PKCS7_SET_CONTENT                        109
-# define PKCS7_F_PKCS7_SET_DIGEST                         126
-# define PKCS7_F_PKCS7_SET_TYPE                           110
-# define PKCS7_F_PKCS7_SIGN                               116
-# define PKCS7_F_PKCS7_SIGNATUREVERIFY                    113
-# define PKCS7_F_PKCS7_SIGNER_INFO_SET                    129
-# define PKCS7_F_PKCS7_SIGNER_INFO_SIGN                   139
-# define PKCS7_F_PKCS7_SIGN_ADD_SIGNER                    137
-# define PKCS7_F_PKCS7_SIMPLE_SMIMECAP                    119
-# define PKCS7_F_PKCS7_VERIFY                             117
-# define PKCS7_F_SMIME_READ_PKCS7                         122
-# define PKCS7_F_SMIME_TEXT                               123
-
-/* Reason codes. */
-# define PKCS7_R_CERTIFICATE_VERIFY_ERROR                 117
-# define PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER          144
-# define PKCS7_R_CIPHER_NOT_INITIALIZED                   116
-# define PKCS7_R_CONTENT_AND_DATA_PRESENT                 118
-# define PKCS7_R_CTRL_ERROR                               152
-# define PKCS7_R_DECODE_ERROR                             130
-# define PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH            100
-# define PKCS7_R_DECRYPT_ERROR                            119
-# define PKCS7_R_DIGEST_FAILURE                           101
-# define PKCS7_R_ENCRYPTION_CTRL_FAILURE                  149
-# define PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 150
-# define PKCS7_R_ERROR_ADDING_RECIPIENT                   120
-# define PKCS7_R_ERROR_SETTING_CIPHER                     121
-# define PKCS7_R_INVALID_MIME_TYPE                        131
-# define PKCS7_R_INVALID_NULL_POINTER                     143
-# define PKCS7_R_INVALID_SIGNED_DATA_TYPE                 155
-# define PKCS7_R_MIME_NO_CONTENT_TYPE                     132
-# define PKCS7_R_MIME_PARSE_ERROR                         133
-# define PKCS7_R_MIME_SIG_PARSE_ERROR                     134
-# define PKCS7_R_MISSING_CERIPEND_INFO                    103
-# define PKCS7_R_NO_CONTENT                               122
-# define PKCS7_R_NO_CONTENT_TYPE                          135
-# define PKCS7_R_NO_DEFAULT_DIGEST                        151
-# define PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND            154
-# define PKCS7_R_NO_MULTIPART_BODY_FAILURE                136
-# define PKCS7_R_NO_MULTIPART_BOUNDARY                    137
-# define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE         115
-# define PKCS7_R_NO_RECIPIENT_MATCHES_KEY                 146
-# define PKCS7_R_NO_SIGNATURES_ON_DATA                    123
-# define PKCS7_R_NO_SIGNERS                               142
-# define PKCS7_R_NO_SIG_CONTENT_TYPE                      138
-# define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE     104
-# define PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR                124
-# define PKCS7_R_PKCS7_ADD_SIGNER_ERROR                   153
-# define PKCS7_R_PKCS7_DATAFINAL                          126
-# define PKCS7_R_PKCS7_DATAFINAL_ERROR                    125
-# define PKCS7_R_PKCS7_DATASIGN                           145
-# define PKCS7_R_PKCS7_PARSE_ERROR                        139
-# define PKCS7_R_PKCS7_SIG_PARSE_ERROR                    140
-# define PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE   127
-# define PKCS7_R_SIGNATURE_FAILURE                        105
-# define PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND             128
-# define PKCS7_R_SIGNING_CTRL_FAILURE                     147
-# define PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE  148
-# define PKCS7_R_SIG_INVALID_MIME_TYPE                    141
-# define PKCS7_R_SMIME_TEXT_ERROR                         129
-# define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE               106
-# define PKCS7_R_UNABLE_TO_FIND_MEM_BIO                   107
-# define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST            108
-# define PKCS7_R_UNKNOWN_DIGEST_TYPE                      109
-# define PKCS7_R_UNKNOWN_OPERATION                        110
-# define PKCS7_R_UNSUPPORTED_CIPHER_TYPE                  111
-# define PKCS7_R_UNSUPPORTED_CONTENT_TYPE                 112
-# define PKCS7_R_WRONG_CONTENT_TYPE                       113
-# define PKCS7_R_WRONG_PKCS7_TYPE                         114
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/pqueue.h b/openflow/usr/include/openssl/pqueue.h
deleted file mode 100644
index d40d9c7..0000000
--- a/openflow/usr/include/openssl/pqueue.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* crypto/pqueue/pqueue.h */
-/*
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_PQUEUE_H
-# define HEADER_PQUEUE_H
-
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-typedef struct _pqueue *pqueue;
-
-typedef struct _pitem {
-    unsigned char priority[8];  /* 64-bit value in big-endian encoding */
-    void *data;
-    struct _pitem *next;
-} pitem;
-
-typedef struct _pitem *piterator;
-
-pitem *pitem_new(unsigned char *prio64be, void *data);
-void pitem_free(pitem *item);
-
-pqueue pqueue_new(void);
-void pqueue_free(pqueue pq);
-
-pitem *pqueue_insert(pqueue pq, pitem *item);
-pitem *pqueue_peek(pqueue pq);
-pitem *pqueue_pop(pqueue pq);
-pitem *pqueue_find(pqueue pq, unsigned char *prio64be);
-pitem *pqueue_iterator(pqueue pq);
-pitem *pqueue_next(piterator *iter);
-
-void pqueue_print(pqueue pq);
-int pqueue_size(pqueue pq);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* ! HEADER_PQUEUE_H */
diff --git a/openflow/usr/include/openssl/rand.h b/openflow/usr/include/openssl/rand.h
deleted file mode 100644
index 2553afd..0000000
--- a/openflow/usr/include/openssl/rand.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* crypto/rand/rand.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RAND_H
-# define HEADER_RAND_H
-
-# include <stdlib.h>
-# include <openssl/ossl_typ.h>
-# include <openssl/e_os2.h>
-
-# if defined(OPENSSL_SYS_WINDOWS)
-#  include <windows.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# if defined(OPENSSL_FIPS)
-#  define FIPS_RAND_SIZE_T size_t
-# endif
-
-/* Already defined in ossl_typ.h */
-/* typedef struct rand_meth_st RAND_METHOD; */
-
-struct rand_meth_st {
-    void (*seed) (const void *buf, int num);
-    int (*bytes) (unsigned char *buf, int num);
-    void (*cleanup) (void);
-    void (*add) (const void *buf, int num, double entropy);
-    int (*pseudorand) (unsigned char *buf, int num);
-    int (*status) (void);
-};
-
-# ifdef BN_DEBUG
-extern int rand_predictable;
-# endif
-
-int RAND_set_rand_method(const RAND_METHOD *meth);
-const RAND_METHOD *RAND_get_rand_method(void);
-# ifndef OPENSSL_NO_ENGINE
-int RAND_set_rand_engine(ENGINE *engine);
-# endif
-RAND_METHOD *RAND_SSLeay(void);
-void RAND_cleanup(void);
-int RAND_bytes(unsigned char *buf, int num);
-int RAND_pseudo_bytes(unsigned char *buf, int num);
-void RAND_seed(const void *buf, int num);
-void RAND_add(const void *buf, int num, double entropy);
-int RAND_load_file(const char *file, long max_bytes);
-int RAND_write_file(const char *file);
-const char *RAND_file_name(char *file, size_t num);
-int RAND_status(void);
-int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes);
-int RAND_egd(const char *path);
-int RAND_egd_bytes(const char *path, int bytes);
-int RAND_poll(void);
-
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-
-void RAND_screen(void);
-int RAND_event(UINT, WPARAM, LPARAM);
-
-# endif
-
-# ifdef OPENSSL_FIPS
-void RAND_set_fips_drbg_type(int type, int flags);
-int RAND_init_fips(void);
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_RAND_strings(void);
-
-/* Error codes for the RAND functions. */
-
-/* Function codes. */
-# define RAND_F_RAND_GET_RAND_METHOD                      101
-# define RAND_F_RAND_INIT_FIPS                            102
-# define RAND_F_SSLEAY_RAND_BYTES                         100
-
-/* Reason codes. */
-# define RAND_R_DUAL_EC_DRBG_DISABLED                     104
-# define RAND_R_ERROR_INITIALISING_DRBG                   102
-# define RAND_R_ERROR_INSTANTIATING_DRBG                  103
-# define RAND_R_NO_FIPS_RANDOM_METHOD_SET                 101
-# define RAND_R_PRNG_NOT_SEEDED                           100
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/rc2.h b/openflow/usr/include/openssl/rc2.h
deleted file mode 100644
index 29d02d7..0000000
--- a/openflow/usr/include/openssl/rc2.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* crypto/rc2/rc2.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RC2_H
-# define HEADER_RC2_H
-
-# include <openssl/opensslconf.h>/* OPENSSL_NO_RC2, RC2_INT */
-# ifdef OPENSSL_NO_RC2
-#  error RC2 is disabled.
-# endif
-
-# define RC2_ENCRYPT     1
-# define RC2_DECRYPT     0
-
-# define RC2_BLOCK       8
-# define RC2_KEY_LENGTH  16
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct rc2_key_st {
-    RC2_INT data[64];
-} RC2_KEY;
-
-# ifdef OPENSSL_FIPS
-void private_RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,
-                         int bits);
-# endif
-void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits);
-void RC2_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                     RC2_KEY *key, int enc);
-void RC2_encrypt(unsigned long *data, RC2_KEY *key);
-void RC2_decrypt(unsigned long *data, RC2_KEY *key);
-void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                     RC2_KEY *ks, unsigned char *iv, int enc);
-void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, RC2_KEY *schedule, unsigned char *ivec,
-                       int *num, int enc);
-void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, RC2_KEY *schedule, unsigned char *ivec,
-                       int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/rc4.h b/openflow/usr/include/openssl/rc4.h
deleted file mode 100644
index 39162b1..0000000
--- a/openflow/usr/include/openssl/rc4.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* crypto/rc4/rc4.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RC4_H
-# define HEADER_RC4_H
-
-# include <openssl/opensslconf.h>/* OPENSSL_NO_RC4, RC4_INT */
-# ifdef OPENSSL_NO_RC4
-#  error RC4 is disabled.
-# endif
-
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct rc4_key_st {
-    RC4_INT x, y;
-    RC4_INT data[256];
-} RC4_KEY;
-
-const char *RC4_options(void);
-void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
-void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
-void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
-         unsigned char *outdata);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/ripemd.h b/openflow/usr/include/openssl/ripemd.h
deleted file mode 100644
index b88ef25..0000000
--- a/openflow/usr/include/openssl/ripemd.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* crypto/ripemd/ripemd.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RIPEMD_H
-# define HEADER_RIPEMD_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_NO_RIPEMD
-#  error RIPEMD is disabled.
-# endif
-
-# if defined(__LP32__)
-#  define RIPEMD160_LONG unsigned long
-# elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#  define RIPEMD160_LONG unsigned long
-#  define RIPEMD160_LONG_LOG2 3
-# else
-#  define RIPEMD160_LONG unsigned int
-# endif
-
-# define RIPEMD160_CBLOCK        64
-# define RIPEMD160_LBLOCK        (RIPEMD160_CBLOCK/4)
-# define RIPEMD160_DIGEST_LENGTH 20
-
-typedef struct RIPEMD160state_st {
-    RIPEMD160_LONG A, B, C, D, E;
-    RIPEMD160_LONG Nl, Nh;
-    RIPEMD160_LONG data[RIPEMD160_LBLOCK];
-    unsigned int num;
-} RIPEMD160_CTX;
-
-# ifdef OPENSSL_FIPS
-int private_RIPEMD160_Init(RIPEMD160_CTX *c);
-# endif
-int RIPEMD160_Init(RIPEMD160_CTX *c);
-int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len);
-int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
-unsigned char *RIPEMD160(const unsigned char *d, size_t n, unsigned char *md);
-void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/rsa.h b/openflow/usr/include/openssl/rsa.h
deleted file mode 100644
index d2ee374..0000000
--- a/openflow/usr/include/openssl/rsa.h
+++ /dev/null
@@ -1,664 +0,0 @@
-/* crypto/rsa/rsa.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RSA_H
-# define HEADER_RSA_H
-
-# include <openssl/asn1.h>
-
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/crypto.h>
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-# ifdef OPENSSL_NO_RSA
-#  error RSA is disabled.
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Declared already in ossl_typ.h */
-/* typedef struct rsa_st RSA; */
-/* typedef struct rsa_meth_st RSA_METHOD; */
-
-struct rsa_meth_st {
-    const char *name;
-    int (*rsa_pub_enc) (int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-    int (*rsa_pub_dec) (int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-    int (*rsa_priv_enc) (int flen, const unsigned char *from,
-                         unsigned char *to, RSA *rsa, int padding);
-    int (*rsa_priv_dec) (int flen, const unsigned char *from,
-                         unsigned char *to, RSA *rsa, int padding);
-    /* Can be null */
-    int (*rsa_mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
-    /* Can be null */
-    int (*bn_mod_exp) (BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                       const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-    /* called at new */
-    int (*init) (RSA *rsa);
-    /* called at free */
-    int (*finish) (RSA *rsa);
-    /* RSA_METHOD_FLAG_* things */
-    int flags;
-    /* may be needed! */
-    char *app_data;
-    /*
-     * New sign and verify functions: some libraries don't allow arbitrary
-     * data to be signed/verified: this allows them to be used. Note: for
-     * this to work the RSA_public_decrypt() and RSA_private_encrypt() should
-     * *NOT* be used RSA_sign(), RSA_verify() should be used instead. Note:
-     * for backwards compatibility this functionality is only enabled if the
-     * RSA_FLAG_SIGN_VER option is set in 'flags'.
-     */
-    int (*rsa_sign) (int type,
-                     const unsigned char *m, unsigned int m_length,
-                     unsigned char *sigret, unsigned int *siglen,
-                     const RSA *rsa);
-    int (*rsa_verify) (int dtype, const unsigned char *m,
-                       unsigned int m_length, const unsigned char *sigbuf,
-                       unsigned int siglen, const RSA *rsa);
-    /*
-     * If this callback is NULL, the builtin software RSA key-gen will be
-     * used. This is for behavioural compatibility whilst the code gets
-     * rewired, but one day it would be nice to assume there are no such
-     * things as "builtin software" implementations.
-     */
-    int (*rsa_keygen) (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
-};
-
-struct rsa_st {
-    /*
-     * The first parameter is used to pickup errors where this is passed
-     * instead of aEVP_PKEY, it is set to 0
-     */
-    int pad;
-    long version;
-    const RSA_METHOD *meth;
-    /* functional reference if 'meth' is ENGINE-provided */
-    ENGINE *engine;
-    BIGNUM *n;
-    BIGNUM *e;
-    BIGNUM *d;
-    BIGNUM *p;
-    BIGNUM *q;
-    BIGNUM *dmp1;
-    BIGNUM *dmq1;
-    BIGNUM *iqmp;
-    /* be careful using this if the RSA structure is shared */
-    CRYPTO_EX_DATA ex_data;
-    int references;
-    int flags;
-    /* Used to cache montgomery values */
-    BN_MONT_CTX *_method_mod_n;
-    BN_MONT_CTX *_method_mod_p;
-    BN_MONT_CTX *_method_mod_q;
-    /*
-     * all BIGNUM values are actually in the following data, if it is not
-     * NULL
-     */
-    char *bignum_data;
-    BN_BLINDING *blinding;
-    BN_BLINDING *mt_blinding;
-};
-
-# ifndef OPENSSL_RSA_MAX_MODULUS_BITS
-#  define OPENSSL_RSA_MAX_MODULUS_BITS   16384
-# endif
-
-# ifndef OPENSSL_RSA_SMALL_MODULUS_BITS
-#  define OPENSSL_RSA_SMALL_MODULUS_BITS 3072
-# endif
-# ifndef OPENSSL_RSA_MAX_PUBEXP_BITS
-
-/* exponent limit enforced for "large" modulus only */
-#  define OPENSSL_RSA_MAX_PUBEXP_BITS    64
-# endif
-
-# define RSA_3   0x3L
-# define RSA_F4  0x10001L
-
-# define RSA_METHOD_FLAG_NO_CHECK        0x0001/* don't check pub/private
-                                                * match */
-
-# define RSA_FLAG_CACHE_PUBLIC           0x0002
-# define RSA_FLAG_CACHE_PRIVATE          0x0004
-# define RSA_FLAG_BLINDING               0x0008
-# define RSA_FLAG_THREAD_SAFE            0x0010
-/*
- * This flag means the private key operations will be handled by rsa_mod_exp
- * and that they do not depend on the private key components being present:
- * for example a key stored in external hardware. Without this flag
- * bn_mod_exp gets called when private key components are absent.
- */
-# define RSA_FLAG_EXT_PKEY               0x0020
-
-/*
- * This flag in the RSA_METHOD enables the new rsa_sign, rsa_verify
- * functions.
- */
-# define RSA_FLAG_SIGN_VER               0x0040
-
-/*
- * new with 0.9.6j and 0.9.7b; the built-in
- * RSA implementation now uses blinding by
- * default (ignoring RSA_FLAG_BLINDING),
- * but other engines might not need it
- */
-# define RSA_FLAG_NO_BLINDING            0x0080
-/*
- * new with 0.9.8f; the built-in RSA
- * implementation now uses constant time
- * operations by default in private key operations,
- * e.g., constant time modular exponentiation,
- * modular inverse without leaking branches,
- * division without leaking branches. This
- * flag disables these constant time
- * operations and results in faster RSA
- * private key operations.
- */
-# define RSA_FLAG_NO_CONSTTIME           0x0100
-# ifdef OPENSSL_USE_DEPRECATED
-/* deprecated name for the flag*/
-/*
- * new with 0.9.7h; the built-in RSA
- * implementation now uses constant time
- * modular exponentiation for secret exponents
- * by default. This flag causes the
- * faster variable sliding window method to
- * be used for all exponents.
- */
-#  define RSA_FLAG_NO_EXP_CONSTTIME RSA_FLAG_NO_CONSTTIME
-# endif
-
-# define EVP_PKEY_CTX_set_rsa_padding(ctx, pad) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, EVP_PKEY_CTRL_RSA_PADDING, \
-                                pad, NULL)
-
-# define EVP_PKEY_CTX_get_rsa_padding(ctx, ppad) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, \
-                                EVP_PKEY_CTRL_GET_RSA_PADDING, 0, ppad)
-
-# define EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-                                (EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \
-                                EVP_PKEY_CTRL_RSA_PSS_SALTLEN, \
-                                len, NULL)
-
-# define EVP_PKEY_CTX_get_rsa_pss_saltlen(ctx, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-                                (EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \
-                                EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, \
-                                0, plen)
-
-# define EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, bits) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \
-                                EVP_PKEY_CTRL_RSA_KEYGEN_BITS, bits, NULL)
-
-# define EVP_PKEY_CTX_set_rsa_keygen_pubexp(ctx, pubexp) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \
-                                EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp)
-
-# define  EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, md)  \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-                        EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT, \
-                                EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)md)
-
-# define  EVP_PKEY_CTX_set_rsa_oaep_md(ctx, md)  \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
-                                EVP_PKEY_CTRL_RSA_OAEP_MD, 0, (void *)md)
-
-# define  EVP_PKEY_CTX_get_rsa_mgf1_md(ctx, pmd) \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-                        EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT, \
-                                EVP_PKEY_CTRL_GET_RSA_MGF1_MD, 0, (void *)pmd)
-
-# define  EVP_PKEY_CTX_get_rsa_oaep_md(ctx, pmd) \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
-                                EVP_PKEY_CTRL_GET_RSA_OAEP_MD, 0, (void *)pmd)
-
-# define  EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, l, llen) \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
-                                EVP_PKEY_CTRL_RSA_OAEP_LABEL, llen, (void *)l)
-
-# define  EVP_PKEY_CTX_get0_rsa_oaep_label(ctx, l)       \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
-                                EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL, 0, (void *)l)
-
-# define EVP_PKEY_CTRL_RSA_PADDING       (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_RSA_PSS_SALTLEN   (EVP_PKEY_ALG_CTRL + 2)
-
-# define EVP_PKEY_CTRL_RSA_KEYGEN_BITS   (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_RSA_MGF1_MD       (EVP_PKEY_ALG_CTRL + 5)
-
-# define EVP_PKEY_CTRL_GET_RSA_PADDING           (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN       (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_GET_RSA_MGF1_MD           (EVP_PKEY_ALG_CTRL + 8)
-
-# define EVP_PKEY_CTRL_RSA_OAEP_MD       (EVP_PKEY_ALG_CTRL + 9)
-# define EVP_PKEY_CTRL_RSA_OAEP_LABEL    (EVP_PKEY_ALG_CTRL + 10)
-
-# define EVP_PKEY_CTRL_GET_RSA_OAEP_MD   (EVP_PKEY_ALG_CTRL + 11)
-# define EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL (EVP_PKEY_ALG_CTRL + 12)
-
-# define RSA_PKCS1_PADDING       1
-# define RSA_SSLV23_PADDING      2
-# define RSA_NO_PADDING          3
-# define RSA_PKCS1_OAEP_PADDING  4
-# define RSA_X931_PADDING        5
-/* EVP_PKEY_ only */
-# define RSA_PKCS1_PSS_PADDING   6
-
-# define RSA_PKCS1_PADDING_SIZE  11
-
-# define RSA_set_app_data(s,arg)         RSA_set_ex_data(s,0,arg)
-# define RSA_get_app_data(s)             RSA_get_ex_data(s,0)
-
-RSA *RSA_new(void);
-RSA *RSA_new_method(ENGINE *engine);
-int RSA_size(const RSA *rsa);
-
-/* Deprecated version */
-# ifndef OPENSSL_NO_DEPRECATED
-RSA *RSA_generate_key(int bits, unsigned long e, void
-                       (*callback) (int, int, void *), void *cb_arg);
-# endif                         /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* New version */
-int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
-
-int RSA_check_key(const RSA *);
-        /* next 4 return -1 on error */
-int RSA_public_encrypt(int flen, const unsigned char *from,
-                       unsigned char *to, RSA *rsa, int padding);
-int RSA_private_encrypt(int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-int RSA_public_decrypt(int flen, const unsigned char *from,
-                       unsigned char *to, RSA *rsa, int padding);
-int RSA_private_decrypt(int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-void RSA_free(RSA *r);
-/* "up" the RSA object's reference count */
-int RSA_up_ref(RSA *r);
-
-int RSA_flags(const RSA *r);
-
-void RSA_set_default_method(const RSA_METHOD *meth);
-const RSA_METHOD *RSA_get_default_method(void);
-const RSA_METHOD *RSA_get_method(const RSA *rsa);
-int RSA_set_method(RSA *rsa, const RSA_METHOD *meth);
-
-/* This function needs the memory locking malloc callbacks to be installed */
-int RSA_memory_lock(RSA *r);
-
-/* these are the actual SSLeay RSA functions */
-const RSA_METHOD *RSA_PKCS1_SSLeay(void);
-
-const RSA_METHOD *RSA_null_method(void);
-
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPublicKey)
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPrivateKey)
-
-typedef struct rsa_pss_params_st {
-    X509_ALGOR *hashAlgorithm;
-    X509_ALGOR *maskGenAlgorithm;
-    ASN1_INTEGER *saltLength;
-    ASN1_INTEGER *trailerField;
-} RSA_PSS_PARAMS;
-
-DECLARE_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
-
-typedef struct rsa_oaep_params_st {
-    X509_ALGOR *hashFunc;
-    X509_ALGOR *maskGenFunc;
-    X509_ALGOR *pSourceFunc;
-} RSA_OAEP_PARAMS;
-
-DECLARE_ASN1_FUNCTIONS(RSA_OAEP_PARAMS)
-
-# ifndef OPENSSL_NO_FP_API
-int RSA_print_fp(FILE *fp, const RSA *r, int offset);
-# endif
-
-# ifndef OPENSSL_NO_BIO
-int RSA_print(BIO *bp, const RSA *r, int offset);
-# endif
-
-# ifndef OPENSSL_NO_RC4
-int i2d_RSA_NET(const RSA *a, unsigned char **pp,
-                int (*cb) (char *buf, int len, const char *prompt,
-                           int verify), int sgckey);
-RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
-                 int (*cb) (char *buf, int len, const char *prompt,
-                            int verify), int sgckey);
-
-int i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
-                     int (*cb) (char *buf, int len, const char *prompt,
-                                int verify));
-RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
-                      int (*cb) (char *buf, int len, const char *prompt,
-                                 int verify));
-# endif
-
-/*
- * The following 2 functions sign and verify a X509_SIG ASN1 object inside
- * PKCS#1 padded RSA encryption
- */
-int RSA_sign(int type, const unsigned char *m, unsigned int m_length,
-             unsigned char *sigret, unsigned int *siglen, RSA *rsa);
-int RSA_verify(int type, const unsigned char *m, unsigned int m_length,
-               const unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
-
-/*
- * The following 2 function sign and verify a ASN1_OCTET_STRING object inside
- * PKCS#1 padded RSA encryption
- */
-int RSA_sign_ASN1_OCTET_STRING(int type,
-                               const unsigned char *m, unsigned int m_length,
-                               unsigned char *sigret, unsigned int *siglen,
-                               RSA *rsa);
-int RSA_verify_ASN1_OCTET_STRING(int type, const unsigned char *m,
-                                 unsigned int m_length, unsigned char *sigbuf,
-                                 unsigned int siglen, RSA *rsa);
-
-int RSA_blinding_on(RSA *rsa, BN_CTX *ctx);
-void RSA_blinding_off(RSA *rsa);
-BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *ctx);
-
-int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl);
-int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
-                                   const unsigned char *f, int fl,
-                                   int rsa_len);
-int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl);
-int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
-                                   const unsigned char *f, int fl,
-                                   int rsa_len);
-int PKCS1_MGF1(unsigned char *mask, long len, const unsigned char *seed,
-               long seedlen, const EVP_MD *dgst);
-int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
-                               const unsigned char *f, int fl,
-                               const unsigned char *p, int pl);
-int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl, int rsa_len,
-                                 const unsigned char *p, int pl);
-int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
-                                    const unsigned char *from, int flen,
-                                    const unsigned char *param, int plen,
-                                    const EVP_MD *md, const EVP_MD *mgf1md);
-int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
-                                      const unsigned char *from, int flen,
-                                      int num, const unsigned char *param,
-                                      int plen, const EVP_MD *md,
-                                      const EVP_MD *mgf1md);
-int RSA_padding_add_SSLv23(unsigned char *to, int tlen,
-                           const unsigned char *f, int fl);
-int RSA_padding_check_SSLv23(unsigned char *to, int tlen,
-                             const unsigned char *f, int fl, int rsa_len);
-int RSA_padding_add_none(unsigned char *to, int tlen, const unsigned char *f,
-                         int fl);
-int RSA_padding_check_none(unsigned char *to, int tlen,
-                           const unsigned char *f, int fl, int rsa_len);
-int RSA_padding_add_X931(unsigned char *to, int tlen, const unsigned char *f,
-                         int fl);
-int RSA_padding_check_X931(unsigned char *to, int tlen,
-                           const unsigned char *f, int fl, int rsa_len);
-int RSA_X931_hash_id(int nid);
-
-int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash,
-                         const EVP_MD *Hash, const unsigned char *EM,
-                         int sLen);
-int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
-                              const unsigned char *mHash, const EVP_MD *Hash,
-                              int sLen);
-
-int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
-                              const EVP_MD *Hash, const EVP_MD *mgf1Hash,
-                              const unsigned char *EM, int sLen);
-
-int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
-                                   const unsigned char *mHash,
-                                   const EVP_MD *Hash, const EVP_MD *mgf1Hash,
-                                   int sLen);
-
-int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                         CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int RSA_set_ex_data(RSA *r, int idx, void *arg);
-void *RSA_get_ex_data(const RSA *r, int idx);
-
-RSA *RSAPublicKey_dup(RSA *rsa);
-RSA *RSAPrivateKey_dup(RSA *rsa);
-
-/*
- * If this flag is set the RSA method is FIPS compliant and can be used in
- * FIPS mode. This is set in the validated module method. If an application
- * sets this flag in its own methods it is its responsibility to ensure the
- * result is compliant.
- */
-
-# define RSA_FLAG_FIPS_METHOD                    0x0400
-
-/*
- * If this flag is set the operations normally disabled in FIPS mode are
- * permitted it is then the applications responsibility to ensure that the
- * usage is compliant.
- */
-
-# define RSA_FLAG_NON_FIPS_ALLOW                 0x0400
-/*
- * Application has decided PRNG is good enough to generate a key: don't
- * check.
- */
-# define RSA_FLAG_CHECKED                        0x0800
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_RSA_strings(void);
-
-/* Error codes for the RSA functions. */
-
-/* Function codes. */
-# define RSA_F_CHECK_PADDING_MD                           140
-# define RSA_F_DO_RSA_PRINT                               146
-# define RSA_F_INT_RSA_VERIFY                             145
-# define RSA_F_MEMORY_LOCK                                100
-# define RSA_F_OLD_RSA_PRIV_DECODE                        147
-# define RSA_F_PKEY_RSA_CTRL                              143
-# define RSA_F_PKEY_RSA_CTRL_STR                          144
-# define RSA_F_PKEY_RSA_SIGN                              142
-# define RSA_F_PKEY_RSA_VERIFY                            154
-# define RSA_F_PKEY_RSA_VERIFYRECOVER                     141
-# define RSA_F_RSA_ALGOR_TO_MD                            157
-# define RSA_F_RSA_BUILTIN_KEYGEN                         129
-# define RSA_F_RSA_CHECK_KEY                              123
-# define RSA_F_RSA_CMS_DECRYPT                            158
-# define RSA_F_RSA_EAY_PRIVATE_DECRYPT                    101
-# define RSA_F_RSA_EAY_PRIVATE_ENCRYPT                    102
-# define RSA_F_RSA_EAY_PUBLIC_DECRYPT                     103
-# define RSA_F_RSA_EAY_PUBLIC_ENCRYPT                     104
-# define RSA_F_RSA_GENERATE_KEY                           105
-# define RSA_F_RSA_GENERATE_KEY_EX                        155
-# define RSA_F_RSA_ITEM_VERIFY                            156
-# define RSA_F_RSA_MEMORY_LOCK                            130
-# define RSA_F_RSA_MGF1_TO_MD                             159
-# define RSA_F_RSA_NEW_METHOD                             106
-# define RSA_F_RSA_NULL                                   124
-# define RSA_F_RSA_NULL_MOD_EXP                           131
-# define RSA_F_RSA_NULL_PRIVATE_DECRYPT                   132
-# define RSA_F_RSA_NULL_PRIVATE_ENCRYPT                   133
-# define RSA_F_RSA_NULL_PUBLIC_DECRYPT                    134
-# define RSA_F_RSA_NULL_PUBLIC_ENCRYPT                    135
-# define RSA_F_RSA_PADDING_ADD_NONE                       107
-# define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP                 121
-# define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP_MGF1            160
-# define RSA_F_RSA_PADDING_ADD_PKCS1_PSS                  125
-# define RSA_F_RSA_PADDING_ADD_PKCS1_PSS_MGF1             148
-# define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1               108
-# define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2               109
-# define RSA_F_RSA_PADDING_ADD_SSLV23                     110
-# define RSA_F_RSA_PADDING_ADD_X931                       127
-# define RSA_F_RSA_PADDING_CHECK_NONE                     111
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP               122
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1          161
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1             112
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2             113
-# define RSA_F_RSA_PADDING_CHECK_SSLV23                   114
-# define RSA_F_RSA_PADDING_CHECK_X931                     128
-# define RSA_F_RSA_PRINT                                  115
-# define RSA_F_RSA_PRINT_FP                               116
-# define RSA_F_RSA_PRIVATE_DECRYPT                        150
-# define RSA_F_RSA_PRIVATE_ENCRYPT                        151
-# define RSA_F_RSA_PRIV_DECODE                            137
-# define RSA_F_RSA_PRIV_ENCODE                            138
-# define RSA_F_RSA_PSS_TO_CTX                             162
-# define RSA_F_RSA_PUBLIC_DECRYPT                         152
-# define RSA_F_RSA_PUBLIC_ENCRYPT                         153
-# define RSA_F_RSA_PUB_DECODE                             139
-# define RSA_F_RSA_SETUP_BLINDING                         136
-# define RSA_F_RSA_SIGN                                   117
-# define RSA_F_RSA_SIGN_ASN1_OCTET_STRING                 118
-# define RSA_F_RSA_VERIFY                                 119
-# define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING               120
-# define RSA_F_RSA_VERIFY_PKCS1_PSS                       126
-# define RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1                  149
-
-/* Reason codes. */
-# define RSA_R_ALGORITHM_MISMATCH                         100
-# define RSA_R_BAD_E_VALUE                                101
-# define RSA_R_BAD_FIXED_HEADER_DECRYPT                   102
-# define RSA_R_BAD_PAD_BYTE_COUNT                         103
-# define RSA_R_BAD_SIGNATURE                              104
-# define RSA_R_BLOCK_TYPE_IS_NOT_01                       106
-# define RSA_R_BLOCK_TYPE_IS_NOT_02                       107
-# define RSA_R_DATA_GREATER_THAN_MOD_LEN                  108
-# define RSA_R_DATA_TOO_LARGE                             109
-# define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE                110
-# define RSA_R_DATA_TOO_LARGE_FOR_MODULUS                 132
-# define RSA_R_DATA_TOO_SMALL                             111
-# define RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE                122
-# define RSA_R_DIGEST_DOES_NOT_MATCH                      166
-# define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY                 112
-# define RSA_R_DMP1_NOT_CONGRUENT_TO_D                    124
-# define RSA_R_DMQ1_NOT_CONGRUENT_TO_D                    125
-# define RSA_R_D_E_NOT_CONGRUENT_TO_1                     123
-# define RSA_R_FIRST_OCTET_INVALID                        133
-# define RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE        144
-# define RSA_R_INVALID_DIGEST                             160
-# define RSA_R_INVALID_DIGEST_LENGTH                      143
-# define RSA_R_INVALID_HEADER                             137
-# define RSA_R_INVALID_KEYBITS                            145
-# define RSA_R_INVALID_LABEL                              161
-# define RSA_R_INVALID_MESSAGE_LENGTH                     131
-# define RSA_R_INVALID_MGF1_MD                            156
-# define RSA_R_INVALID_OAEP_PARAMETERS                    162
-# define RSA_R_INVALID_PADDING                            138
-# define RSA_R_INVALID_PADDING_MODE                       141
-# define RSA_R_INVALID_PSS_PARAMETERS                     149
-# define RSA_R_INVALID_PSS_SALTLEN                        146
-# define RSA_R_INVALID_SALT_LENGTH                        150
-# define RSA_R_INVALID_TRAILER                            139
-# define RSA_R_INVALID_X931_DIGEST                        142
-# define RSA_R_IQMP_NOT_INVERSE_OF_Q                      126
-# define RSA_R_KEY_SIZE_TOO_SMALL                         120
-# define RSA_R_LAST_OCTET_INVALID                         134
-# define RSA_R_MODULUS_TOO_LARGE                          105
-# define RSA_R_NON_FIPS_RSA_METHOD                        157
-# define RSA_R_NO_PUBLIC_EXPONENT                         140
-# define RSA_R_NULL_BEFORE_BLOCK_MISSING                  113
-# define RSA_R_N_DOES_NOT_EQUAL_P_Q                       127
-# define RSA_R_OAEP_DECODING_ERROR                        121
-# define RSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE         158
-# define RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   148
-# define RSA_R_PADDING_CHECK_FAILED                       114
-# define RSA_R_PKCS_DECODING_ERROR                        159
-# define RSA_R_P_NOT_PRIME                                128
-# define RSA_R_Q_NOT_PRIME                                129
-# define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED               130
-# define RSA_R_SLEN_CHECK_FAILED                          136
-# define RSA_R_SLEN_RECOVERY_FAILED                       135
-# define RSA_R_SSLV3_ROLLBACK_ATTACK                      115
-# define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
-# define RSA_R_UNKNOWN_ALGORITHM_TYPE                     117
-# define RSA_R_UNKNOWN_DIGEST                             163
-# define RSA_R_UNKNOWN_MASK_DIGEST                        151
-# define RSA_R_UNKNOWN_PADDING_TYPE                       118
-# define RSA_R_UNKNOWN_PSS_DIGEST                         152
-# define RSA_R_UNSUPPORTED_ENCRYPTION_TYPE                164
-# define RSA_R_UNSUPPORTED_LABEL_SOURCE                   165
-# define RSA_R_UNSUPPORTED_MASK_ALGORITHM                 153
-# define RSA_R_UNSUPPORTED_MASK_PARAMETER                 154
-# define RSA_R_UNSUPPORTED_SIGNATURE_TYPE                 155
-# define RSA_R_VALUE_MISSING                              147
-# define RSA_R_WRONG_SIGNATURE_LENGTH                     119
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/safestack.h b/openflow/usr/include/openssl/safestack.h
deleted file mode 100644
index 1d4f87e..0000000
--- a/openflow/usr/include/openssl/safestack.h
+++ /dev/null
@@ -1,2672 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_SAFESTACK_H
-# define HEADER_SAFESTACK_H
-
-# include <openssl/stack.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# ifndef CHECKED_PTR_OF
-#  define CHECKED_PTR_OF(type, p) \
-    ((void*) (1 ? p : (type*)0))
-# endif
-
-/*
- * In C++ we get problems because an explicit cast is needed from (void *) we
- * use CHECKED_STACK_OF to ensure the correct type is passed in the macros
- * below.
- */
-
-# define CHECKED_STACK_OF(type, p) \
-    ((_STACK*) (1 ? p : (STACK_OF(type)*)0))
-
-# define CHECKED_SK_COPY_FUNC(type, p) \
-    ((void *(*)(void *)) ((1 ? p : (type *(*)(const type *))0)))
-
-# define CHECKED_SK_FREE_FUNC(type, p) \
-    ((void (*)(void *)) ((1 ? p : (void (*)(type *))0)))
-
-# define CHECKED_SK_CMP_FUNC(type, p) \
-    ((int (*)(const void *, const void *)) \
-        ((1 ? p : (int (*)(const type * const *, const type * const *))0)))
-
-# define STACK_OF(type) struct stack_st_##type
-# define PREDECLARE_STACK_OF(type) STACK_OF(type);
-
-# define DECLARE_STACK_OF(type) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
-# define DECLARE_SPECIAL_STACK_OF(type, type2) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
-
-/* nada (obsolete in new safestack approach)*/
-# define IMPLEMENT_STACK_OF(type)
-
-/*-
- * Strings are special: normally an lhash entry will point to a single
- * (somewhat) mutable object. In the case of strings:
- *
- * a) Instead of a single char, there is an array of chars, NUL-terminated.
- * b) The string may have be immutable.
- *
- * So, they need their own declarations. Especially important for
- * type-checking tools, such as Deputy.
- *
- * In practice, however, it appears to be hard to have a const
- * string. For now, I'm settling for dealing with the fact it is a
- * string at all.
- */
-typedef char *OPENSSL_STRING;
-
-typedef const char *OPENSSL_CSTRING;
-
-/*
- * Confusingly, LHASH_OF(STRING) deals with char ** throughout, but
- * STACK_OF(STRING) is really more like STACK_OF(char), only, as mentioned
- * above, instead of a single char each entry is a NUL-terminated array of
- * chars. So, we have to implement STRING specially for STACK_OF. This is
- * dealt with in the autogenerated macros below.
- */
-
-DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
-
-/*
- * Similarly, we sometimes use a block of characters, NOT nul-terminated.
- * These should also be distinguished from "normal" stacks.
- */
-typedef void *OPENSSL_BLOCK;
-DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
-
-/*
- * SKM_sk_... stack macros are internal to safestack.h: never use them
- * directly, use sk_<type>_... instead
- */
-# define SKM_sk_new(type, cmp) \
-        ((STACK_OF(type) *)sk_new(CHECKED_SK_CMP_FUNC(type, cmp)))
-# define SKM_sk_new_null(type) \
-        ((STACK_OF(type) *)sk_new_null())
-# define SKM_sk_free(type, st) \
-        sk_free(CHECKED_STACK_OF(type, st))
-# define SKM_sk_num(type, st) \
-        sk_num(CHECKED_STACK_OF(type, st))
-# define SKM_sk_value(type, st,i) \
-        ((type *)sk_value(CHECKED_STACK_OF(type, st), i))
-# define SKM_sk_set(type, st,i,val) \
-        sk_set(CHECKED_STACK_OF(type, st), i, CHECKED_PTR_OF(type, val))
-# define SKM_sk_zero(type, st) \
-        sk_zero(CHECKED_STACK_OF(type, st))
-# define SKM_sk_push(type, st, val) \
-        sk_push(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-# define SKM_sk_unshift(type, st, val) \
-        sk_unshift(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-# define SKM_sk_find(type, st, val) \
-        sk_find(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-# define SKM_sk_find_ex(type, st, val) \
-        sk_find_ex(CHECKED_STACK_OF(type, st), \
-                   CHECKED_PTR_OF(type, val))
-# define SKM_sk_delete(type, st, i) \
-        (type *)sk_delete(CHECKED_STACK_OF(type, st), i)
-# define SKM_sk_delete_ptr(type, st, ptr) \
-        (type *)sk_delete_ptr(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, ptr))
-# define SKM_sk_insert(type, st,val, i) \
-        sk_insert(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val), i)
-# define SKM_sk_set_cmp_func(type, st, cmp) \
-        ((int (*)(const type * const *,const type * const *)) \
-        sk_set_cmp_func(CHECKED_STACK_OF(type, st), CHECKED_SK_CMP_FUNC(type, cmp)))
-# define SKM_sk_dup(type, st) \
-        (STACK_OF(type) *)sk_dup(CHECKED_STACK_OF(type, st))
-# define SKM_sk_pop_free(type, st, free_func) \
-        sk_pop_free(CHECKED_STACK_OF(type, st), CHECKED_SK_FREE_FUNC(type, free_func))
-# define SKM_sk_deep_copy(type, st, copy_func, free_func) \
-        (STACK_OF(type) *)sk_deep_copy(CHECKED_STACK_OF(type, st), CHECKED_SK_COPY_FUNC(type, copy_func), CHECKED_SK_FREE_FUNC(type, free_func))
-# define SKM_sk_shift(type, st) \
-        (type *)sk_shift(CHECKED_STACK_OF(type, st))
-# define SKM_sk_pop(type, st) \
-        (type *)sk_pop(CHECKED_STACK_OF(type, st))
-# define SKM_sk_sort(type, st) \
-        sk_sort(CHECKED_STACK_OF(type, st))
-# define SKM_sk_is_sorted(type, st) \
-        sk_is_sorted(CHECKED_STACK_OF(type, st))
-# define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-  (STACK_OF(type) *)d2i_ASN1_SET( \
-                                (STACK_OF(OPENSSL_BLOCK) **)CHECKED_PTR_OF(STACK_OF(type)*, st), \
-                                pp, length, \
-                                CHECKED_D2I_OF(type, d2i_func), \
-                                CHECKED_SK_FREE_FUNC(type, free_func), \
-                                ex_tag, ex_class)
-# define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
-  i2d_ASN1_SET((STACK_OF(OPENSSL_BLOCK) *)CHECKED_STACK_OF(type, st), pp, \
-                                CHECKED_I2D_OF(type, i2d_func), \
-                                ex_tag, ex_class, is_set)
-# define SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \
-        ASN1_seq_pack(CHECKED_PTR_OF(STACK_OF(type), st), \
-                        CHECKED_I2D_OF(type, i2d_func), buf, len)
-# define SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
-        (STACK_OF(type) *)ASN1_seq_unpack(buf, len, CHECKED_D2I_OF(type, d2i_func), CHECKED_SK_FREE_FUNC(type, free_func))
-# define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \
-        (STACK_OF(type) *)PKCS12_decrypt_d2i(algor, \
-                                CHECKED_D2I_OF(type, d2i_func), \
-                                CHECKED_SK_FREE_FUNC(type, free_func), \
-                                pass, passlen, oct, seq)
-/*
- * This block of defines is updated by util/mkstack.pl, please do not touch!
- */
-# define sk_ACCESS_DESCRIPTION_new(cmp) SKM_sk_new(ACCESS_DESCRIPTION, (cmp))
-# define sk_ACCESS_DESCRIPTION_new_null() SKM_sk_new_null(ACCESS_DESCRIPTION)
-# define sk_ACCESS_DESCRIPTION_free(st) SKM_sk_free(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_num(st) SKM_sk_num(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_value(st, i) SKM_sk_value(ACCESS_DESCRIPTION, (st), (i))
-# define sk_ACCESS_DESCRIPTION_set(st, i, val) SKM_sk_set(ACCESS_DESCRIPTION, (st), (i), (val))
-# define sk_ACCESS_DESCRIPTION_zero(st) SKM_sk_zero(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_push(st, val) SKM_sk_push(ACCESS_DESCRIPTION, (st), (val))
-# define sk_ACCESS_DESCRIPTION_unshift(st, val) SKM_sk_unshift(ACCESS_DESCRIPTION, (st), (val))
-# define sk_ACCESS_DESCRIPTION_find(st, val) SKM_sk_find(ACCESS_DESCRIPTION, (st), (val))
-# define sk_ACCESS_DESCRIPTION_find_ex(st, val) SKM_sk_find_ex(ACCESS_DESCRIPTION, (st), (val))
-# define sk_ACCESS_DESCRIPTION_delete(st, i) SKM_sk_delete(ACCESS_DESCRIPTION, (st), (i))
-# define sk_ACCESS_DESCRIPTION_delete_ptr(st, ptr) SKM_sk_delete_ptr(ACCESS_DESCRIPTION, (st), (ptr))
-# define sk_ACCESS_DESCRIPTION_insert(st, val, i) SKM_sk_insert(ACCESS_DESCRIPTION, (st), (val), (i))
-# define sk_ACCESS_DESCRIPTION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ACCESS_DESCRIPTION, (st), (cmp))
-# define sk_ACCESS_DESCRIPTION_dup(st) SKM_sk_dup(ACCESS_DESCRIPTION, st)
-# define sk_ACCESS_DESCRIPTION_pop_free(st, free_func) SKM_sk_pop_free(ACCESS_DESCRIPTION, (st), (free_func))
-# define sk_ACCESS_DESCRIPTION_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ACCESS_DESCRIPTION, (st), (copy_func), (free_func))
-# define sk_ACCESS_DESCRIPTION_shift(st) SKM_sk_shift(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_pop(st) SKM_sk_pop(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_is_sorted(st) SKM_sk_is_sorted(ACCESS_DESCRIPTION, (st))
-# define sk_ASIdOrRange_new(cmp) SKM_sk_new(ASIdOrRange, (cmp))
-# define sk_ASIdOrRange_new_null() SKM_sk_new_null(ASIdOrRange)
-# define sk_ASIdOrRange_free(st) SKM_sk_free(ASIdOrRange, (st))
-# define sk_ASIdOrRange_num(st) SKM_sk_num(ASIdOrRange, (st))
-# define sk_ASIdOrRange_value(st, i) SKM_sk_value(ASIdOrRange, (st), (i))
-# define sk_ASIdOrRange_set(st, i, val) SKM_sk_set(ASIdOrRange, (st), (i), (val))
-# define sk_ASIdOrRange_zero(st) SKM_sk_zero(ASIdOrRange, (st))
-# define sk_ASIdOrRange_push(st, val) SKM_sk_push(ASIdOrRange, (st), (val))
-# define sk_ASIdOrRange_unshift(st, val) SKM_sk_unshift(ASIdOrRange, (st), (val))
-# define sk_ASIdOrRange_find(st, val) SKM_sk_find(ASIdOrRange, (st), (val))
-# define sk_ASIdOrRange_find_ex(st, val) SKM_sk_find_ex(ASIdOrRange, (st), (val))
-# define sk_ASIdOrRange_delete(st, i) SKM_sk_delete(ASIdOrRange, (st), (i))
-# define sk_ASIdOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASIdOrRange, (st), (ptr))
-# define sk_ASIdOrRange_insert(st, val, i) SKM_sk_insert(ASIdOrRange, (st), (val), (i))
-# define sk_ASIdOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASIdOrRange, (st), (cmp))
-# define sk_ASIdOrRange_dup(st) SKM_sk_dup(ASIdOrRange, st)
-# define sk_ASIdOrRange_pop_free(st, free_func) SKM_sk_pop_free(ASIdOrRange, (st), (free_func))
-# define sk_ASIdOrRange_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ASIdOrRange, (st), (copy_func), (free_func))
-# define sk_ASIdOrRange_shift(st) SKM_sk_shift(ASIdOrRange, (st))
-# define sk_ASIdOrRange_pop(st) SKM_sk_pop(ASIdOrRange, (st))
-# define sk_ASIdOrRange_sort(st) SKM_sk_sort(ASIdOrRange, (st))
-# define sk_ASIdOrRange_is_sorted(st) SKM_sk_is_sorted(ASIdOrRange, (st))
-# define sk_ASN1_GENERALSTRING_new(cmp) SKM_sk_new(ASN1_GENERALSTRING, (cmp))
-# define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING)
-# define sk_ASN1_GENERALSTRING_free(st) SKM_sk_free(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_num(st) SKM_sk_num(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_value(st, i) SKM_sk_value(ASN1_GENERALSTRING, (st), (i))
-# define sk_ASN1_GENERALSTRING_set(st, i, val) SKM_sk_set(ASN1_GENERALSTRING, (st), (i), (val))
-# define sk_ASN1_GENERALSTRING_zero(st) SKM_sk_zero(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_push(st, val) SKM_sk_push(ASN1_GENERALSTRING, (st), (val))
-# define sk_ASN1_GENERALSTRING_unshift(st, val) SKM_sk_unshift(ASN1_GENERALSTRING, (st), (val))
-# define sk_ASN1_GENERALSTRING_find(st, val) SKM_sk_find(ASN1_GENERALSTRING, (st), (val))
-# define sk_ASN1_GENERALSTRING_find_ex(st, val) SKM_sk_find_ex(ASN1_GENERALSTRING, (st), (val))
-# define sk_ASN1_GENERALSTRING_delete(st, i) SKM_sk_delete(ASN1_GENERALSTRING, (st), (i))
-# define sk_ASN1_GENERALSTRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_GENERALSTRING, (st), (ptr))
-# define sk_ASN1_GENERALSTRING_insert(st, val, i) SKM_sk_insert(ASN1_GENERALSTRING, (st), (val), (i))
-# define sk_ASN1_GENERALSTRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_GENERALSTRING, (st), (cmp))
-# define sk_ASN1_GENERALSTRING_dup(st) SKM_sk_dup(ASN1_GENERALSTRING, st)
-# define sk_ASN1_GENERALSTRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_GENERALSTRING, (st), (free_func))
-# define sk_ASN1_GENERALSTRING_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ASN1_GENERALSTRING, (st), (copy_func), (free_func))
-# define sk_ASN1_GENERALSTRING_shift(st) SKM_sk_shift(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_pop(st) SKM_sk_pop(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_sort(st) SKM_sk_sort(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_is_sorted(st) SKM_sk_is_sorted(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_INTEGER_new(cmp) SKM_sk_new(ASN1_INTEGER, (cmp))
-# define sk_ASN1_INTEGER_new_null() SKM_sk_new_null(ASN1_INTEGER)
-# define sk_ASN1_INTEGER_free(st) SKM_sk_free(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_num(st) SKM_sk_num(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_value(st, i) SKM_sk_value(ASN1_INTEGER, (st), (i))
-# define sk_ASN1_INTEGER_set(st, i, val) SKM_sk_set(ASN1_INTEGER, (st), (i), (val))
-# define sk_ASN1_INTEGER_zero(st) SKM_sk_zero(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_push(st, val) SKM_sk_push(ASN1_INTEGER, (st), (val))
-# define sk_ASN1_INTEGER_unshift(st, val) SKM_sk_unshift(ASN1_INTEGER, (st), (val))
-# define sk_ASN1_INTEGER_find(st, val) SKM_sk_find(ASN1_INTEGER, (st), (val))
-# define sk_ASN1_INTEGER_find_ex(st, val) SKM_sk_find_ex(ASN1_INTEGER, (st), (val))
-# define sk_ASN1_INTEGER_delete(st, i) SKM_sk_delete(ASN1_INTEGER, (st), (i))
-# define sk_ASN1_INTEGER_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_INTEGER, (st), (ptr))
-# define sk_ASN1_INTEGER_insert(st, val, i) SKM_sk_insert(ASN1_INTEGER, (st), (val), (i))
-# define sk_ASN1_INTEGER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_INTEGER, (st), (cmp))
-# define sk_ASN1_INTEGER_dup(st) SKM_sk_dup(ASN1_INTEGER, st)
-# define sk_ASN1_INTEGER_pop_free(st, free_func) SKM_sk_pop_free(ASN1_INTEGER, (st), (free_func))
-# define sk_ASN1_INTEGER_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ASN1_INTEGER, (st), (copy_func), (free_func))
-# define sk_ASN1_INTEGER_shift(st) SKM_sk_shift(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_pop(st) SKM_sk_pop(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_sort(st) SKM_sk_sort(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_is_sorted(st) SKM_sk_is_sorted(ASN1_INTEGER, (st))
-# define sk_ASN1_OBJECT_new(cmp) SKM_sk_new(ASN1_OBJECT, (cmp))
-# define sk_ASN1_OBJECT_new_null() SKM_sk_new_null(ASN1_OBJECT)
-# define sk_ASN1_OBJECT_free(st) SKM_sk_free(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_num(st) SKM_sk_num(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_value(st, i) SKM_sk_value(ASN1_OBJECT, (st), (i))
-# define sk_ASN1_OBJECT_set(st, i, val) SKM_sk_set(ASN1_OBJECT, (st), (i), (val))
-# define sk_ASN1_OBJECT_zero(st) SKM_sk_zero(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_push(st, val) SKM_sk_push(ASN1_OBJECT, (st), (val))
-# define sk_ASN1_OBJECT_unshift(st, val) SKM_sk_unshift(ASN1_OBJECT, (st), (val))
-# define sk_ASN1_OBJECT_find(st, val) SKM_sk_find(ASN1_OBJECT, (st), (val))
-# define sk_ASN1_OBJECT_find_ex(st, val) SKM_sk_find_ex(ASN1_OBJECT, (st), (val))
-# define sk_ASN1_OBJECT_delete(st, i) SKM_sk_delete(ASN1_OBJECT, (st), (i))
-# define sk_ASN1_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_OBJECT, (st), (ptr))
-# define sk_ASN1_OBJECT_insert(st, val, i) SKM_sk_insert(ASN1_OBJECT, (st), (val), (i))
-# define sk_ASN1_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_OBJECT, (st), (cmp))
-# define sk_ASN1_OBJECT_dup(st) SKM_sk_dup(ASN1_OBJECT, st)
-# define sk_ASN1_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(ASN1_OBJECT, (st), (free_func))
-# define sk_ASN1_OBJECT_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ASN1_OBJECT, (st), (copy_func), (free_func))
-# define sk_ASN1_OBJECT_shift(st) SKM_sk_shift(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_pop(st) SKM_sk_pop(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_sort(st) SKM_sk_sort(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_is_sorted(st) SKM_sk_is_sorted(ASN1_OBJECT, (st))
-# define sk_ASN1_STRING_TABLE_new(cmp) SKM_sk_new(ASN1_STRING_TABLE, (cmp))
-# define sk_ASN1_STRING_TABLE_new_null() SKM_sk_new_null(ASN1_STRING_TABLE)
-# define sk_ASN1_STRING_TABLE_free(st) SKM_sk_free(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_num(st) SKM_sk_num(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_value(st, i) SKM_sk_value(ASN1_STRING_TABLE, (st), (i))
-# define sk_ASN1_STRING_TABLE_set(st, i, val) SKM_sk_set(ASN1_STRING_TABLE, (st), (i), (val))
-# define sk_ASN1_STRING_TABLE_zero(st) SKM_sk_zero(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_push(st, val) SKM_sk_push(ASN1_STRING_TABLE, (st), (val))
-# define sk_ASN1_STRING_TABLE_unshift(st, val) SKM_sk_unshift(ASN1_STRING_TABLE, (st), (val))
-# define sk_ASN1_STRING_TABLE_find(st, val) SKM_sk_find(ASN1_STRING_TABLE, (st), (val))
-# define sk_ASN1_STRING_TABLE_find_ex(st, val) SKM_sk_find_ex(ASN1_STRING_TABLE, (st), (val))
-# define sk_ASN1_STRING_TABLE_delete(st, i) SKM_sk_delete(ASN1_STRING_TABLE, (st), (i))
-# define sk_ASN1_STRING_TABLE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_STRING_TABLE, (st), (ptr))
-# define sk_ASN1_STRING_TABLE_insert(st, val, i) SKM_sk_insert(ASN1_STRING_TABLE, (st), (val), (i))
-# define sk_ASN1_STRING_TABLE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_STRING_TABLE, (st), (cmp))
-# define sk_ASN1_STRING_TABLE_dup(st) SKM_sk_dup(ASN1_STRING_TABLE, st)
-# define sk_ASN1_STRING_TABLE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_STRING_TABLE, (st), (free_func))
-# define sk_ASN1_STRING_TABLE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ASN1_STRING_TABLE, (st), (copy_func), (free_func))
-# define sk_ASN1_STRING_TABLE_shift(st) SKM_sk_shift(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_pop(st) SKM_sk_pop(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_sort(st) SKM_sk_sort(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_is_sorted(st) SKM_sk_is_sorted(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_TYPE_new(cmp) SKM_sk_new(ASN1_TYPE, (cmp))
-# define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE)
-# define sk_ASN1_TYPE_free(st) SKM_sk_free(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_num(st) SKM_sk_num(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_value(st, i) SKM_sk_value(ASN1_TYPE, (st), (i))
-# define sk_ASN1_TYPE_set(st, i, val) SKM_sk_set(ASN1_TYPE, (st), (i), (val))
-# define sk_ASN1_TYPE_zero(st) SKM_sk_zero(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_push(st, val) SKM_sk_push(ASN1_TYPE, (st), (val))
-# define sk_ASN1_TYPE_unshift(st, val) SKM_sk_unshift(ASN1_TYPE, (st), (val))
-# define sk_ASN1_TYPE_find(st, val) SKM_sk_find(ASN1_TYPE, (st), (val))
-# define sk_ASN1_TYPE_find_ex(st, val) SKM_sk_find_ex(ASN1_TYPE, (st), (val))
-# define sk_ASN1_TYPE_delete(st, i) SKM_sk_delete(ASN1_TYPE, (st), (i))
-# define sk_ASN1_TYPE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_TYPE, (st), (ptr))
-# define sk_ASN1_TYPE_insert(st, val, i) SKM_sk_insert(ASN1_TYPE, (st), (val), (i))
-# define sk_ASN1_TYPE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_TYPE, (st), (cmp))
-# define sk_ASN1_TYPE_dup(st) SKM_sk_dup(ASN1_TYPE, st)
-# define sk_ASN1_TYPE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_TYPE, (st), (free_func))
-# define sk_ASN1_TYPE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ASN1_TYPE, (st), (copy_func), (free_func))
-# define sk_ASN1_TYPE_shift(st) SKM_sk_shift(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_pop(st) SKM_sk_pop(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_sort(st) SKM_sk_sort(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_is_sorted(st) SKM_sk_is_sorted(ASN1_TYPE, (st))
-# define sk_ASN1_UTF8STRING_new(cmp) SKM_sk_new(ASN1_UTF8STRING, (cmp))
-# define sk_ASN1_UTF8STRING_new_null() SKM_sk_new_null(ASN1_UTF8STRING)
-# define sk_ASN1_UTF8STRING_free(st) SKM_sk_free(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_num(st) SKM_sk_num(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_value(st, i) SKM_sk_value(ASN1_UTF8STRING, (st), (i))
-# define sk_ASN1_UTF8STRING_set(st, i, val) SKM_sk_set(ASN1_UTF8STRING, (st), (i), (val))
-# define sk_ASN1_UTF8STRING_zero(st) SKM_sk_zero(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_push(st, val) SKM_sk_push(ASN1_UTF8STRING, (st), (val))
-# define sk_ASN1_UTF8STRING_unshift(st, val) SKM_sk_unshift(ASN1_UTF8STRING, (st), (val))
-# define sk_ASN1_UTF8STRING_find(st, val) SKM_sk_find(ASN1_UTF8STRING, (st), (val))
-# define sk_ASN1_UTF8STRING_find_ex(st, val) SKM_sk_find_ex(ASN1_UTF8STRING, (st), (val))
-# define sk_ASN1_UTF8STRING_delete(st, i) SKM_sk_delete(ASN1_UTF8STRING, (st), (i))
-# define sk_ASN1_UTF8STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_UTF8STRING, (st), (ptr))
-# define sk_ASN1_UTF8STRING_insert(st, val, i) SKM_sk_insert(ASN1_UTF8STRING, (st), (val), (i))
-# define sk_ASN1_UTF8STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_UTF8STRING, (st), (cmp))
-# define sk_ASN1_UTF8STRING_dup(st) SKM_sk_dup(ASN1_UTF8STRING, st)
-# define sk_ASN1_UTF8STRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_UTF8STRING, (st), (free_func))
-# define sk_ASN1_UTF8STRING_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ASN1_UTF8STRING, (st), (copy_func), (free_func))
-# define sk_ASN1_UTF8STRING_shift(st) SKM_sk_shift(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_pop(st) SKM_sk_pop(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_sort(st) SKM_sk_sort(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_is_sorted(st) SKM_sk_is_sorted(ASN1_UTF8STRING, (st))
-# define sk_ASN1_VALUE_new(cmp) SKM_sk_new(ASN1_VALUE, (cmp))
-# define sk_ASN1_VALUE_new_null() SKM_sk_new_null(ASN1_VALUE)
-# define sk_ASN1_VALUE_free(st) SKM_sk_free(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_num(st) SKM_sk_num(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_value(st, i) SKM_sk_value(ASN1_VALUE, (st), (i))
-# define sk_ASN1_VALUE_set(st, i, val) SKM_sk_set(ASN1_VALUE, (st), (i), (val))
-# define sk_ASN1_VALUE_zero(st) SKM_sk_zero(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_push(st, val) SKM_sk_push(ASN1_VALUE, (st), (val))
-# define sk_ASN1_VALUE_unshift(st, val) SKM_sk_unshift(ASN1_VALUE, (st), (val))
-# define sk_ASN1_VALUE_find(st, val) SKM_sk_find(ASN1_VALUE, (st), (val))
-# define sk_ASN1_VALUE_find_ex(st, val) SKM_sk_find_ex(ASN1_VALUE, (st), (val))
-# define sk_ASN1_VALUE_delete(st, i) SKM_sk_delete(ASN1_VALUE, (st), (i))
-# define sk_ASN1_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_VALUE, (st), (ptr))
-# define sk_ASN1_VALUE_insert(st, val, i) SKM_sk_insert(ASN1_VALUE, (st), (val), (i))
-# define sk_ASN1_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_VALUE, (st), (cmp))
-# define sk_ASN1_VALUE_dup(st) SKM_sk_dup(ASN1_VALUE, st)
-# define sk_ASN1_VALUE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_VALUE, (st), (free_func))
-# define sk_ASN1_VALUE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ASN1_VALUE, (st), (copy_func), (free_func))
-# define sk_ASN1_VALUE_shift(st) SKM_sk_shift(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_pop(st) SKM_sk_pop(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_sort(st) SKM_sk_sort(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_is_sorted(st) SKM_sk_is_sorted(ASN1_VALUE, (st))
-# define sk_BIO_new(cmp) SKM_sk_new(BIO, (cmp))
-# define sk_BIO_new_null() SKM_sk_new_null(BIO)
-# define sk_BIO_free(st) SKM_sk_free(BIO, (st))
-# define sk_BIO_num(st) SKM_sk_num(BIO, (st))
-# define sk_BIO_value(st, i) SKM_sk_value(BIO, (st), (i))
-# define sk_BIO_set(st, i, val) SKM_sk_set(BIO, (st), (i), (val))
-# define sk_BIO_zero(st) SKM_sk_zero(BIO, (st))
-# define sk_BIO_push(st, val) SKM_sk_push(BIO, (st), (val))
-# define sk_BIO_unshift(st, val) SKM_sk_unshift(BIO, (st), (val))
-# define sk_BIO_find(st, val) SKM_sk_find(BIO, (st), (val))
-# define sk_BIO_find_ex(st, val) SKM_sk_find_ex(BIO, (st), (val))
-# define sk_BIO_delete(st, i) SKM_sk_delete(BIO, (st), (i))
-# define sk_BIO_delete_ptr(st, ptr) SKM_sk_delete_ptr(BIO, (st), (ptr))
-# define sk_BIO_insert(st, val, i) SKM_sk_insert(BIO, (st), (val), (i))
-# define sk_BIO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BIO, (st), (cmp))
-# define sk_BIO_dup(st) SKM_sk_dup(BIO, st)
-# define sk_BIO_pop_free(st, free_func) SKM_sk_pop_free(BIO, (st), (free_func))
-# define sk_BIO_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(BIO, (st), (copy_func), (free_func))
-# define sk_BIO_shift(st) SKM_sk_shift(BIO, (st))
-# define sk_BIO_pop(st) SKM_sk_pop(BIO, (st))
-# define sk_BIO_sort(st) SKM_sk_sort(BIO, (st))
-# define sk_BIO_is_sorted(st) SKM_sk_is_sorted(BIO, (st))
-# define sk_BY_DIR_ENTRY_new(cmp) SKM_sk_new(BY_DIR_ENTRY, (cmp))
-# define sk_BY_DIR_ENTRY_new_null() SKM_sk_new_null(BY_DIR_ENTRY)
-# define sk_BY_DIR_ENTRY_free(st) SKM_sk_free(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_num(st) SKM_sk_num(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_value(st, i) SKM_sk_value(BY_DIR_ENTRY, (st), (i))
-# define sk_BY_DIR_ENTRY_set(st, i, val) SKM_sk_set(BY_DIR_ENTRY, (st), (i), (val))
-# define sk_BY_DIR_ENTRY_zero(st) SKM_sk_zero(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_push(st, val) SKM_sk_push(BY_DIR_ENTRY, (st), (val))
-# define sk_BY_DIR_ENTRY_unshift(st, val) SKM_sk_unshift(BY_DIR_ENTRY, (st), (val))
-# define sk_BY_DIR_ENTRY_find(st, val) SKM_sk_find(BY_DIR_ENTRY, (st), (val))
-# define sk_BY_DIR_ENTRY_find_ex(st, val) SKM_sk_find_ex(BY_DIR_ENTRY, (st), (val))
-# define sk_BY_DIR_ENTRY_delete(st, i) SKM_sk_delete(BY_DIR_ENTRY, (st), (i))
-# define sk_BY_DIR_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_ENTRY, (st), (ptr))
-# define sk_BY_DIR_ENTRY_insert(st, val, i) SKM_sk_insert(BY_DIR_ENTRY, (st), (val), (i))
-# define sk_BY_DIR_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_ENTRY, (st), (cmp))
-# define sk_BY_DIR_ENTRY_dup(st) SKM_sk_dup(BY_DIR_ENTRY, st)
-# define sk_BY_DIR_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_ENTRY, (st), (free_func))
-# define sk_BY_DIR_ENTRY_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(BY_DIR_ENTRY, (st), (copy_func), (free_func))
-# define sk_BY_DIR_ENTRY_shift(st) SKM_sk_shift(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_pop(st) SKM_sk_pop(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_sort(st) SKM_sk_sort(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_is_sorted(st) SKM_sk_is_sorted(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_HASH_new(cmp) SKM_sk_new(BY_DIR_HASH, (cmp))
-# define sk_BY_DIR_HASH_new_null() SKM_sk_new_null(BY_DIR_HASH)
-# define sk_BY_DIR_HASH_free(st) SKM_sk_free(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_num(st) SKM_sk_num(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_value(st, i) SKM_sk_value(BY_DIR_HASH, (st), (i))
-# define sk_BY_DIR_HASH_set(st, i, val) SKM_sk_set(BY_DIR_HASH, (st), (i), (val))
-# define sk_BY_DIR_HASH_zero(st) SKM_sk_zero(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_push(st, val) SKM_sk_push(BY_DIR_HASH, (st), (val))
-# define sk_BY_DIR_HASH_unshift(st, val) SKM_sk_unshift(BY_DIR_HASH, (st), (val))
-# define sk_BY_DIR_HASH_find(st, val) SKM_sk_find(BY_DIR_HASH, (st), (val))
-# define sk_BY_DIR_HASH_find_ex(st, val) SKM_sk_find_ex(BY_DIR_HASH, (st), (val))
-# define sk_BY_DIR_HASH_delete(st, i) SKM_sk_delete(BY_DIR_HASH, (st), (i))
-# define sk_BY_DIR_HASH_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_HASH, (st), (ptr))
-# define sk_BY_DIR_HASH_insert(st, val, i) SKM_sk_insert(BY_DIR_HASH, (st), (val), (i))
-# define sk_BY_DIR_HASH_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_HASH, (st), (cmp))
-# define sk_BY_DIR_HASH_dup(st) SKM_sk_dup(BY_DIR_HASH, st)
-# define sk_BY_DIR_HASH_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_HASH, (st), (free_func))
-# define sk_BY_DIR_HASH_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(BY_DIR_HASH, (st), (copy_func), (free_func))
-# define sk_BY_DIR_HASH_shift(st) SKM_sk_shift(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_pop(st) SKM_sk_pop(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_sort(st) SKM_sk_sort(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_is_sorted(st) SKM_sk_is_sorted(BY_DIR_HASH, (st))
-# define sk_CMS_CertificateChoices_new(cmp) SKM_sk_new(CMS_CertificateChoices, (cmp))
-# define sk_CMS_CertificateChoices_new_null() SKM_sk_new_null(CMS_CertificateChoices)
-# define sk_CMS_CertificateChoices_free(st) SKM_sk_free(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_num(st) SKM_sk_num(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_value(st, i) SKM_sk_value(CMS_CertificateChoices, (st), (i))
-# define sk_CMS_CertificateChoices_set(st, i, val) SKM_sk_set(CMS_CertificateChoices, (st), (i), (val))
-# define sk_CMS_CertificateChoices_zero(st) SKM_sk_zero(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_push(st, val) SKM_sk_push(CMS_CertificateChoices, (st), (val))
-# define sk_CMS_CertificateChoices_unshift(st, val) SKM_sk_unshift(CMS_CertificateChoices, (st), (val))
-# define sk_CMS_CertificateChoices_find(st, val) SKM_sk_find(CMS_CertificateChoices, (st), (val))
-# define sk_CMS_CertificateChoices_find_ex(st, val) SKM_sk_find_ex(CMS_CertificateChoices, (st), (val))
-# define sk_CMS_CertificateChoices_delete(st, i) SKM_sk_delete(CMS_CertificateChoices, (st), (i))
-# define sk_CMS_CertificateChoices_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_CertificateChoices, (st), (ptr))
-# define sk_CMS_CertificateChoices_insert(st, val, i) SKM_sk_insert(CMS_CertificateChoices, (st), (val), (i))
-# define sk_CMS_CertificateChoices_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_CertificateChoices, (st), (cmp))
-# define sk_CMS_CertificateChoices_dup(st) SKM_sk_dup(CMS_CertificateChoices, st)
-# define sk_CMS_CertificateChoices_pop_free(st, free_func) SKM_sk_pop_free(CMS_CertificateChoices, (st), (free_func))
-# define sk_CMS_CertificateChoices_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(CMS_CertificateChoices, (st), (copy_func), (free_func))
-# define sk_CMS_CertificateChoices_shift(st) SKM_sk_shift(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_pop(st) SKM_sk_pop(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_sort(st) SKM_sk_sort(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_is_sorted(st) SKM_sk_is_sorted(CMS_CertificateChoices, (st))
-# define sk_CMS_RecipientEncryptedKey_new(cmp) SKM_sk_new(CMS_RecipientEncryptedKey, (cmp))
-# define sk_CMS_RecipientEncryptedKey_new_null() SKM_sk_new_null(CMS_RecipientEncryptedKey)
-# define sk_CMS_RecipientEncryptedKey_free(st) SKM_sk_free(CMS_RecipientEncryptedKey, (st))
-# define sk_CMS_RecipientEncryptedKey_num(st) SKM_sk_num(CMS_RecipientEncryptedKey, (st))
-# define sk_CMS_RecipientEncryptedKey_value(st, i) SKM_sk_value(CMS_RecipientEncryptedKey, (st), (i))
-# define sk_CMS_RecipientEncryptedKey_set(st, i, val) SKM_sk_set(CMS_RecipientEncryptedKey, (st), (i), (val))
-# define sk_CMS_RecipientEncryptedKey_zero(st) SKM_sk_zero(CMS_RecipientEncryptedKey, (st))
-# define sk_CMS_RecipientEncryptedKey_push(st, val) SKM_sk_push(CMS_RecipientEncryptedKey, (st), (val))
-# define sk_CMS_RecipientEncryptedKey_unshift(st, val) SKM_sk_unshift(CMS_RecipientEncryptedKey, (st), (val))
-# define sk_CMS_RecipientEncryptedKey_find(st, val) SKM_sk_find(CMS_RecipientEncryptedKey, (st), (val))
-# define sk_CMS_RecipientEncryptedKey_find_ex(st, val) SKM_sk_find_ex(CMS_RecipientEncryptedKey, (st), (val))
-# define sk_CMS_RecipientEncryptedKey_delete(st, i) SKM_sk_delete(CMS_RecipientEncryptedKey, (st), (i))
-# define sk_CMS_RecipientEncryptedKey_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RecipientEncryptedKey, (st), (ptr))
-# define sk_CMS_RecipientEncryptedKey_insert(st, val, i) SKM_sk_insert(CMS_RecipientEncryptedKey, (st), (val), (i))
-# define sk_CMS_RecipientEncryptedKey_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RecipientEncryptedKey, (st), (cmp))
-# define sk_CMS_RecipientEncryptedKey_dup(st) SKM_sk_dup(CMS_RecipientEncryptedKey, st)
-# define sk_CMS_RecipientEncryptedKey_pop_free(st, free_func) SKM_sk_pop_free(CMS_RecipientEncryptedKey, (st), (free_func))
-# define sk_CMS_RecipientEncryptedKey_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(CMS_RecipientEncryptedKey, (st), (copy_func), (free_func))
-# define sk_CMS_RecipientEncryptedKey_shift(st) SKM_sk_shift(CMS_RecipientEncryptedKey, (st))
-# define sk_CMS_RecipientEncryptedKey_pop(st) SKM_sk_pop(CMS_RecipientEncryptedKey, (st))
-# define sk_CMS_RecipientEncryptedKey_sort(st) SKM_sk_sort(CMS_RecipientEncryptedKey, (st))
-# define sk_CMS_RecipientEncryptedKey_is_sorted(st) SKM_sk_is_sorted(CMS_RecipientEncryptedKey, (st))
-# define sk_CMS_RecipientInfo_new(cmp) SKM_sk_new(CMS_RecipientInfo, (cmp))
-# define sk_CMS_RecipientInfo_new_null() SKM_sk_new_null(CMS_RecipientInfo)
-# define sk_CMS_RecipientInfo_free(st) SKM_sk_free(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_num(st) SKM_sk_num(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_value(st, i) SKM_sk_value(CMS_RecipientInfo, (st), (i))
-# define sk_CMS_RecipientInfo_set(st, i, val) SKM_sk_set(CMS_RecipientInfo, (st), (i), (val))
-# define sk_CMS_RecipientInfo_zero(st) SKM_sk_zero(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_push(st, val) SKM_sk_push(CMS_RecipientInfo, (st), (val))
-# define sk_CMS_RecipientInfo_unshift(st, val) SKM_sk_unshift(CMS_RecipientInfo, (st), (val))
-# define sk_CMS_RecipientInfo_find(st, val) SKM_sk_find(CMS_RecipientInfo, (st), (val))
-# define sk_CMS_RecipientInfo_find_ex(st, val) SKM_sk_find_ex(CMS_RecipientInfo, (st), (val))
-# define sk_CMS_RecipientInfo_delete(st, i) SKM_sk_delete(CMS_RecipientInfo, (st), (i))
-# define sk_CMS_RecipientInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RecipientInfo, (st), (ptr))
-# define sk_CMS_RecipientInfo_insert(st, val, i) SKM_sk_insert(CMS_RecipientInfo, (st), (val), (i))
-# define sk_CMS_RecipientInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RecipientInfo, (st), (cmp))
-# define sk_CMS_RecipientInfo_dup(st) SKM_sk_dup(CMS_RecipientInfo, st)
-# define sk_CMS_RecipientInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_RecipientInfo, (st), (free_func))
-# define sk_CMS_RecipientInfo_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(CMS_RecipientInfo, (st), (copy_func), (free_func))
-# define sk_CMS_RecipientInfo_shift(st) SKM_sk_shift(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_pop(st) SKM_sk_pop(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_sort(st) SKM_sk_sort(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_is_sorted(st) SKM_sk_is_sorted(CMS_RecipientInfo, (st))
-# define sk_CMS_RevocationInfoChoice_new(cmp) SKM_sk_new(CMS_RevocationInfoChoice, (cmp))
-# define sk_CMS_RevocationInfoChoice_new_null() SKM_sk_new_null(CMS_RevocationInfoChoice)
-# define sk_CMS_RevocationInfoChoice_free(st) SKM_sk_free(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_num(st) SKM_sk_num(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_value(st, i) SKM_sk_value(CMS_RevocationInfoChoice, (st), (i))
-# define sk_CMS_RevocationInfoChoice_set(st, i, val) SKM_sk_set(CMS_RevocationInfoChoice, (st), (i), (val))
-# define sk_CMS_RevocationInfoChoice_zero(st) SKM_sk_zero(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_push(st, val) SKM_sk_push(CMS_RevocationInfoChoice, (st), (val))
-# define sk_CMS_RevocationInfoChoice_unshift(st, val) SKM_sk_unshift(CMS_RevocationInfoChoice, (st), (val))
-# define sk_CMS_RevocationInfoChoice_find(st, val) SKM_sk_find(CMS_RevocationInfoChoice, (st), (val))
-# define sk_CMS_RevocationInfoChoice_find_ex(st, val) SKM_sk_find_ex(CMS_RevocationInfoChoice, (st), (val))
-# define sk_CMS_RevocationInfoChoice_delete(st, i) SKM_sk_delete(CMS_RevocationInfoChoice, (st), (i))
-# define sk_CMS_RevocationInfoChoice_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RevocationInfoChoice, (st), (ptr))
-# define sk_CMS_RevocationInfoChoice_insert(st, val, i) SKM_sk_insert(CMS_RevocationInfoChoice, (st), (val), (i))
-# define sk_CMS_RevocationInfoChoice_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RevocationInfoChoice, (st), (cmp))
-# define sk_CMS_RevocationInfoChoice_dup(st) SKM_sk_dup(CMS_RevocationInfoChoice, st)
-# define sk_CMS_RevocationInfoChoice_pop_free(st, free_func) SKM_sk_pop_free(CMS_RevocationInfoChoice, (st), (free_func))
-# define sk_CMS_RevocationInfoChoice_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(CMS_RevocationInfoChoice, (st), (copy_func), (free_func))
-# define sk_CMS_RevocationInfoChoice_shift(st) SKM_sk_shift(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_pop(st) SKM_sk_pop(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_sort(st) SKM_sk_sort(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_is_sorted(st) SKM_sk_is_sorted(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_SignerInfo_new(cmp) SKM_sk_new(CMS_SignerInfo, (cmp))
-# define sk_CMS_SignerInfo_new_null() SKM_sk_new_null(CMS_SignerInfo)
-# define sk_CMS_SignerInfo_free(st) SKM_sk_free(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_num(st) SKM_sk_num(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_value(st, i) SKM_sk_value(CMS_SignerInfo, (st), (i))
-# define sk_CMS_SignerInfo_set(st, i, val) SKM_sk_set(CMS_SignerInfo, (st), (i), (val))
-# define sk_CMS_SignerInfo_zero(st) SKM_sk_zero(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_push(st, val) SKM_sk_push(CMS_SignerInfo, (st), (val))
-# define sk_CMS_SignerInfo_unshift(st, val) SKM_sk_unshift(CMS_SignerInfo, (st), (val))
-# define sk_CMS_SignerInfo_find(st, val) SKM_sk_find(CMS_SignerInfo, (st), (val))
-# define sk_CMS_SignerInfo_find_ex(st, val) SKM_sk_find_ex(CMS_SignerInfo, (st), (val))
-# define sk_CMS_SignerInfo_delete(st, i) SKM_sk_delete(CMS_SignerInfo, (st), (i))
-# define sk_CMS_SignerInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_SignerInfo, (st), (ptr))
-# define sk_CMS_SignerInfo_insert(st, val, i) SKM_sk_insert(CMS_SignerInfo, (st), (val), (i))
-# define sk_CMS_SignerInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_SignerInfo, (st), (cmp))
-# define sk_CMS_SignerInfo_dup(st) SKM_sk_dup(CMS_SignerInfo, st)
-# define sk_CMS_SignerInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_SignerInfo, (st), (free_func))
-# define sk_CMS_SignerInfo_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(CMS_SignerInfo, (st), (copy_func), (free_func))
-# define sk_CMS_SignerInfo_shift(st) SKM_sk_shift(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_pop(st) SKM_sk_pop(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_sort(st) SKM_sk_sort(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_is_sorted(st) SKM_sk_is_sorted(CMS_SignerInfo, (st))
-# define sk_CONF_IMODULE_new(cmp) SKM_sk_new(CONF_IMODULE, (cmp))
-# define sk_CONF_IMODULE_new_null() SKM_sk_new_null(CONF_IMODULE)
-# define sk_CONF_IMODULE_free(st) SKM_sk_free(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_num(st) SKM_sk_num(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_value(st, i) SKM_sk_value(CONF_IMODULE, (st), (i))
-# define sk_CONF_IMODULE_set(st, i, val) SKM_sk_set(CONF_IMODULE, (st), (i), (val))
-# define sk_CONF_IMODULE_zero(st) SKM_sk_zero(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_push(st, val) SKM_sk_push(CONF_IMODULE, (st), (val))
-# define sk_CONF_IMODULE_unshift(st, val) SKM_sk_unshift(CONF_IMODULE, (st), (val))
-# define sk_CONF_IMODULE_find(st, val) SKM_sk_find(CONF_IMODULE, (st), (val))
-# define sk_CONF_IMODULE_find_ex(st, val) SKM_sk_find_ex(CONF_IMODULE, (st), (val))
-# define sk_CONF_IMODULE_delete(st, i) SKM_sk_delete(CONF_IMODULE, (st), (i))
-# define sk_CONF_IMODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_IMODULE, (st), (ptr))
-# define sk_CONF_IMODULE_insert(st, val, i) SKM_sk_insert(CONF_IMODULE, (st), (val), (i))
-# define sk_CONF_IMODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_IMODULE, (st), (cmp))
-# define sk_CONF_IMODULE_dup(st) SKM_sk_dup(CONF_IMODULE, st)
-# define sk_CONF_IMODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_IMODULE, (st), (free_func))
-# define sk_CONF_IMODULE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(CONF_IMODULE, (st), (copy_func), (free_func))
-# define sk_CONF_IMODULE_shift(st) SKM_sk_shift(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_pop(st) SKM_sk_pop(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_sort(st) SKM_sk_sort(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_is_sorted(st) SKM_sk_is_sorted(CONF_IMODULE, (st))
-# define sk_CONF_MODULE_new(cmp) SKM_sk_new(CONF_MODULE, (cmp))
-# define sk_CONF_MODULE_new_null() SKM_sk_new_null(CONF_MODULE)
-# define sk_CONF_MODULE_free(st) SKM_sk_free(CONF_MODULE, (st))
-# define sk_CONF_MODULE_num(st) SKM_sk_num(CONF_MODULE, (st))
-# define sk_CONF_MODULE_value(st, i) SKM_sk_value(CONF_MODULE, (st), (i))
-# define sk_CONF_MODULE_set(st, i, val) SKM_sk_set(CONF_MODULE, (st), (i), (val))
-# define sk_CONF_MODULE_zero(st) SKM_sk_zero(CONF_MODULE, (st))
-# define sk_CONF_MODULE_push(st, val) SKM_sk_push(CONF_MODULE, (st), (val))
-# define sk_CONF_MODULE_unshift(st, val) SKM_sk_unshift(CONF_MODULE, (st), (val))
-# define sk_CONF_MODULE_find(st, val) SKM_sk_find(CONF_MODULE, (st), (val))
-# define sk_CONF_MODULE_find_ex(st, val) SKM_sk_find_ex(CONF_MODULE, (st), (val))
-# define sk_CONF_MODULE_delete(st, i) SKM_sk_delete(CONF_MODULE, (st), (i))
-# define sk_CONF_MODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_MODULE, (st), (ptr))
-# define sk_CONF_MODULE_insert(st, val, i) SKM_sk_insert(CONF_MODULE, (st), (val), (i))
-# define sk_CONF_MODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_MODULE, (st), (cmp))
-# define sk_CONF_MODULE_dup(st) SKM_sk_dup(CONF_MODULE, st)
-# define sk_CONF_MODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_MODULE, (st), (free_func))
-# define sk_CONF_MODULE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(CONF_MODULE, (st), (copy_func), (free_func))
-# define sk_CONF_MODULE_shift(st) SKM_sk_shift(CONF_MODULE, (st))
-# define sk_CONF_MODULE_pop(st) SKM_sk_pop(CONF_MODULE, (st))
-# define sk_CONF_MODULE_sort(st) SKM_sk_sort(CONF_MODULE, (st))
-# define sk_CONF_MODULE_is_sorted(st) SKM_sk_is_sorted(CONF_MODULE, (st))
-# define sk_CONF_VALUE_new(cmp) SKM_sk_new(CONF_VALUE, (cmp))
-# define sk_CONF_VALUE_new_null() SKM_sk_new_null(CONF_VALUE)
-# define sk_CONF_VALUE_free(st) SKM_sk_free(CONF_VALUE, (st))
-# define sk_CONF_VALUE_num(st) SKM_sk_num(CONF_VALUE, (st))
-# define sk_CONF_VALUE_value(st, i) SKM_sk_value(CONF_VALUE, (st), (i))
-# define sk_CONF_VALUE_set(st, i, val) SKM_sk_set(CONF_VALUE, (st), (i), (val))
-# define sk_CONF_VALUE_zero(st) SKM_sk_zero(CONF_VALUE, (st))
-# define sk_CONF_VALUE_push(st, val) SKM_sk_push(CONF_VALUE, (st), (val))
-# define sk_CONF_VALUE_unshift(st, val) SKM_sk_unshift(CONF_VALUE, (st), (val))
-# define sk_CONF_VALUE_find(st, val) SKM_sk_find(CONF_VALUE, (st), (val))
-# define sk_CONF_VALUE_find_ex(st, val) SKM_sk_find_ex(CONF_VALUE, (st), (val))
-# define sk_CONF_VALUE_delete(st, i) SKM_sk_delete(CONF_VALUE, (st), (i))
-# define sk_CONF_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_VALUE, (st), (ptr))
-# define sk_CONF_VALUE_insert(st, val, i) SKM_sk_insert(CONF_VALUE, (st), (val), (i))
-# define sk_CONF_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_VALUE, (st), (cmp))
-# define sk_CONF_VALUE_dup(st) SKM_sk_dup(CONF_VALUE, st)
-# define sk_CONF_VALUE_pop_free(st, free_func) SKM_sk_pop_free(CONF_VALUE, (st), (free_func))
-# define sk_CONF_VALUE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(CONF_VALUE, (st), (copy_func), (free_func))
-# define sk_CONF_VALUE_shift(st) SKM_sk_shift(CONF_VALUE, (st))
-# define sk_CONF_VALUE_pop(st) SKM_sk_pop(CONF_VALUE, (st))
-# define sk_CONF_VALUE_sort(st) SKM_sk_sort(CONF_VALUE, (st))
-# define sk_CONF_VALUE_is_sorted(st) SKM_sk_is_sorted(CONF_VALUE, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_new(cmp) SKM_sk_new(CRYPTO_EX_DATA_FUNCS, (cmp))
-# define sk_CRYPTO_EX_DATA_FUNCS_new_null() SKM_sk_new_null(CRYPTO_EX_DATA_FUNCS)
-# define sk_CRYPTO_EX_DATA_FUNCS_free(st) SKM_sk_free(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_num(st) SKM_sk_num(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_value(st, i) SKM_sk_value(CRYPTO_EX_DATA_FUNCS, (st), (i))
-# define sk_CRYPTO_EX_DATA_FUNCS_set(st, i, val) SKM_sk_set(CRYPTO_EX_DATA_FUNCS, (st), (i), (val))
-# define sk_CRYPTO_EX_DATA_FUNCS_zero(st) SKM_sk_zero(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_push(st, val) SKM_sk_push(CRYPTO_EX_DATA_FUNCS, (st), (val))
-# define sk_CRYPTO_EX_DATA_FUNCS_unshift(st, val) SKM_sk_unshift(CRYPTO_EX_DATA_FUNCS, (st), (val))
-# define sk_CRYPTO_EX_DATA_FUNCS_find(st, val) SKM_sk_find(CRYPTO_EX_DATA_FUNCS, (st), (val))
-# define sk_CRYPTO_EX_DATA_FUNCS_find_ex(st, val) SKM_sk_find_ex(CRYPTO_EX_DATA_FUNCS, (st), (val))
-# define sk_CRYPTO_EX_DATA_FUNCS_delete(st, i) SKM_sk_delete(CRYPTO_EX_DATA_FUNCS, (st), (i))
-# define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_EX_DATA_FUNCS, (st), (ptr))
-# define sk_CRYPTO_EX_DATA_FUNCS_insert(st, val, i) SKM_sk_insert(CRYPTO_EX_DATA_FUNCS, (st), (val), (i))
-# define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_EX_DATA_FUNCS, (st), (cmp))
-# define sk_CRYPTO_EX_DATA_FUNCS_dup(st) SKM_sk_dup(CRYPTO_EX_DATA_FUNCS, st)
-# define sk_CRYPTO_EX_DATA_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_EX_DATA_FUNCS, (st), (free_func))
-# define sk_CRYPTO_EX_DATA_FUNCS_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(CRYPTO_EX_DATA_FUNCS, (st), (copy_func), (free_func))
-# define sk_CRYPTO_EX_DATA_FUNCS_shift(st) SKM_sk_shift(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_pop(st) SKM_sk_pop(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_sort(st) SKM_sk_sort(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_is_sorted(st) SKM_sk_is_sorted(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_dynlock_new(cmp) SKM_sk_new(CRYPTO_dynlock, (cmp))
-# define sk_CRYPTO_dynlock_new_null() SKM_sk_new_null(CRYPTO_dynlock)
-# define sk_CRYPTO_dynlock_free(st) SKM_sk_free(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_num(st) SKM_sk_num(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_value(st, i) SKM_sk_value(CRYPTO_dynlock, (st), (i))
-# define sk_CRYPTO_dynlock_set(st, i, val) SKM_sk_set(CRYPTO_dynlock, (st), (i), (val))
-# define sk_CRYPTO_dynlock_zero(st) SKM_sk_zero(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_push(st, val) SKM_sk_push(CRYPTO_dynlock, (st), (val))
-# define sk_CRYPTO_dynlock_unshift(st, val) SKM_sk_unshift(CRYPTO_dynlock, (st), (val))
-# define sk_CRYPTO_dynlock_find(st, val) SKM_sk_find(CRYPTO_dynlock, (st), (val))
-# define sk_CRYPTO_dynlock_find_ex(st, val) SKM_sk_find_ex(CRYPTO_dynlock, (st), (val))
-# define sk_CRYPTO_dynlock_delete(st, i) SKM_sk_delete(CRYPTO_dynlock, (st), (i))
-# define sk_CRYPTO_dynlock_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_dynlock, (st), (ptr))
-# define sk_CRYPTO_dynlock_insert(st, val, i) SKM_sk_insert(CRYPTO_dynlock, (st), (val), (i))
-# define sk_CRYPTO_dynlock_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_dynlock, (st), (cmp))
-# define sk_CRYPTO_dynlock_dup(st) SKM_sk_dup(CRYPTO_dynlock, st)
-# define sk_CRYPTO_dynlock_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_dynlock, (st), (free_func))
-# define sk_CRYPTO_dynlock_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(CRYPTO_dynlock, (st), (copy_func), (free_func))
-# define sk_CRYPTO_dynlock_shift(st) SKM_sk_shift(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_pop(st) SKM_sk_pop(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st))
-# define sk_DIST_POINT_new(cmp) SKM_sk_new(DIST_POINT, (cmp))
-# define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT)
-# define sk_DIST_POINT_free(st) SKM_sk_free(DIST_POINT, (st))
-# define sk_DIST_POINT_num(st) SKM_sk_num(DIST_POINT, (st))
-# define sk_DIST_POINT_value(st, i) SKM_sk_value(DIST_POINT, (st), (i))
-# define sk_DIST_POINT_set(st, i, val) SKM_sk_set(DIST_POINT, (st), (i), (val))
-# define sk_DIST_POINT_zero(st) SKM_sk_zero(DIST_POINT, (st))
-# define sk_DIST_POINT_push(st, val) SKM_sk_push(DIST_POINT, (st), (val))
-# define sk_DIST_POINT_unshift(st, val) SKM_sk_unshift(DIST_POINT, (st), (val))
-# define sk_DIST_POINT_find(st, val) SKM_sk_find(DIST_POINT, (st), (val))
-# define sk_DIST_POINT_find_ex(st, val) SKM_sk_find_ex(DIST_POINT, (st), (val))
-# define sk_DIST_POINT_delete(st, i) SKM_sk_delete(DIST_POINT, (st), (i))
-# define sk_DIST_POINT_delete_ptr(st, ptr) SKM_sk_delete_ptr(DIST_POINT, (st), (ptr))
-# define sk_DIST_POINT_insert(st, val, i) SKM_sk_insert(DIST_POINT, (st), (val), (i))
-# define sk_DIST_POINT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(DIST_POINT, (st), (cmp))
-# define sk_DIST_POINT_dup(st) SKM_sk_dup(DIST_POINT, st)
-# define sk_DIST_POINT_pop_free(st, free_func) SKM_sk_pop_free(DIST_POINT, (st), (free_func))
-# define sk_DIST_POINT_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(DIST_POINT, (st), (copy_func), (free_func))
-# define sk_DIST_POINT_shift(st) SKM_sk_shift(DIST_POINT, (st))
-# define sk_DIST_POINT_pop(st) SKM_sk_pop(DIST_POINT, (st))
-# define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st))
-# define sk_DIST_POINT_is_sorted(st) SKM_sk_is_sorted(DIST_POINT, (st))
-# define sk_ENGINE_new(cmp) SKM_sk_new(ENGINE, (cmp))
-# define sk_ENGINE_new_null() SKM_sk_new_null(ENGINE)
-# define sk_ENGINE_free(st) SKM_sk_free(ENGINE, (st))
-# define sk_ENGINE_num(st) SKM_sk_num(ENGINE, (st))
-# define sk_ENGINE_value(st, i) SKM_sk_value(ENGINE, (st), (i))
-# define sk_ENGINE_set(st, i, val) SKM_sk_set(ENGINE, (st), (i), (val))
-# define sk_ENGINE_zero(st) SKM_sk_zero(ENGINE, (st))
-# define sk_ENGINE_push(st, val) SKM_sk_push(ENGINE, (st), (val))
-# define sk_ENGINE_unshift(st, val) SKM_sk_unshift(ENGINE, (st), (val))
-# define sk_ENGINE_find(st, val) SKM_sk_find(ENGINE, (st), (val))
-# define sk_ENGINE_find_ex(st, val) SKM_sk_find_ex(ENGINE, (st), (val))
-# define sk_ENGINE_delete(st, i) SKM_sk_delete(ENGINE, (st), (i))
-# define sk_ENGINE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE, (st), (ptr))
-# define sk_ENGINE_insert(st, val, i) SKM_sk_insert(ENGINE, (st), (val), (i))
-# define sk_ENGINE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE, (st), (cmp))
-# define sk_ENGINE_dup(st) SKM_sk_dup(ENGINE, st)
-# define sk_ENGINE_pop_free(st, free_func) SKM_sk_pop_free(ENGINE, (st), (free_func))
-# define sk_ENGINE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ENGINE, (st), (copy_func), (free_func))
-# define sk_ENGINE_shift(st) SKM_sk_shift(ENGINE, (st))
-# define sk_ENGINE_pop(st) SKM_sk_pop(ENGINE, (st))
-# define sk_ENGINE_sort(st) SKM_sk_sort(ENGINE, (st))
-# define sk_ENGINE_is_sorted(st) SKM_sk_is_sorted(ENGINE, (st))
-# define sk_ENGINE_CLEANUP_ITEM_new(cmp) SKM_sk_new(ENGINE_CLEANUP_ITEM, (cmp))
-# define sk_ENGINE_CLEANUP_ITEM_new_null() SKM_sk_new_null(ENGINE_CLEANUP_ITEM)
-# define sk_ENGINE_CLEANUP_ITEM_free(st) SKM_sk_free(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_num(st) SKM_sk_num(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_value(st, i) SKM_sk_value(ENGINE_CLEANUP_ITEM, (st), (i))
-# define sk_ENGINE_CLEANUP_ITEM_set(st, i, val) SKM_sk_set(ENGINE_CLEANUP_ITEM, (st), (i), (val))
-# define sk_ENGINE_CLEANUP_ITEM_zero(st) SKM_sk_zero(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_push(st, val) SKM_sk_push(ENGINE_CLEANUP_ITEM, (st), (val))
-# define sk_ENGINE_CLEANUP_ITEM_unshift(st, val) SKM_sk_unshift(ENGINE_CLEANUP_ITEM, (st), (val))
-# define sk_ENGINE_CLEANUP_ITEM_find(st, val) SKM_sk_find(ENGINE_CLEANUP_ITEM, (st), (val))
-# define sk_ENGINE_CLEANUP_ITEM_find_ex(st, val) SKM_sk_find_ex(ENGINE_CLEANUP_ITEM, (st), (val))
-# define sk_ENGINE_CLEANUP_ITEM_delete(st, i) SKM_sk_delete(ENGINE_CLEANUP_ITEM, (st), (i))
-# define sk_ENGINE_CLEANUP_ITEM_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE_CLEANUP_ITEM, (st), (ptr))
-# define sk_ENGINE_CLEANUP_ITEM_insert(st, val, i) SKM_sk_insert(ENGINE_CLEANUP_ITEM, (st), (val), (i))
-# define sk_ENGINE_CLEANUP_ITEM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE_CLEANUP_ITEM, (st), (cmp))
-# define sk_ENGINE_CLEANUP_ITEM_dup(st) SKM_sk_dup(ENGINE_CLEANUP_ITEM, st)
-# define sk_ENGINE_CLEANUP_ITEM_pop_free(st, free_func) SKM_sk_pop_free(ENGINE_CLEANUP_ITEM, (st), (free_func))
-# define sk_ENGINE_CLEANUP_ITEM_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ENGINE_CLEANUP_ITEM, (st), (copy_func), (free_func))
-# define sk_ENGINE_CLEANUP_ITEM_shift(st) SKM_sk_shift(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_pop(st) SKM_sk_pop(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ESS_CERT_ID_new(cmp) SKM_sk_new(ESS_CERT_ID, (cmp))
-# define sk_ESS_CERT_ID_new_null() SKM_sk_new_null(ESS_CERT_ID)
-# define sk_ESS_CERT_ID_free(st) SKM_sk_free(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_num(st) SKM_sk_num(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_value(st, i) SKM_sk_value(ESS_CERT_ID, (st), (i))
-# define sk_ESS_CERT_ID_set(st, i, val) SKM_sk_set(ESS_CERT_ID, (st), (i), (val))
-# define sk_ESS_CERT_ID_zero(st) SKM_sk_zero(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_push(st, val) SKM_sk_push(ESS_CERT_ID, (st), (val))
-# define sk_ESS_CERT_ID_unshift(st, val) SKM_sk_unshift(ESS_CERT_ID, (st), (val))
-# define sk_ESS_CERT_ID_find(st, val) SKM_sk_find(ESS_CERT_ID, (st), (val))
-# define sk_ESS_CERT_ID_find_ex(st, val) SKM_sk_find_ex(ESS_CERT_ID, (st), (val))
-# define sk_ESS_CERT_ID_delete(st, i) SKM_sk_delete(ESS_CERT_ID, (st), (i))
-# define sk_ESS_CERT_ID_delete_ptr(st, ptr) SKM_sk_delete_ptr(ESS_CERT_ID, (st), (ptr))
-# define sk_ESS_CERT_ID_insert(st, val, i) SKM_sk_insert(ESS_CERT_ID, (st), (val), (i))
-# define sk_ESS_CERT_ID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ESS_CERT_ID, (st), (cmp))
-# define sk_ESS_CERT_ID_dup(st) SKM_sk_dup(ESS_CERT_ID, st)
-# define sk_ESS_CERT_ID_pop_free(st, free_func) SKM_sk_pop_free(ESS_CERT_ID, (st), (free_func))
-# define sk_ESS_CERT_ID_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(ESS_CERT_ID, (st), (copy_func), (free_func))
-# define sk_ESS_CERT_ID_shift(st) SKM_sk_shift(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_pop(st) SKM_sk_pop(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_sort(st) SKM_sk_sort(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_is_sorted(st) SKM_sk_is_sorted(ESS_CERT_ID, (st))
-# define sk_EVP_MD_new(cmp) SKM_sk_new(EVP_MD, (cmp))
-# define sk_EVP_MD_new_null() SKM_sk_new_null(EVP_MD)
-# define sk_EVP_MD_free(st) SKM_sk_free(EVP_MD, (st))
-# define sk_EVP_MD_num(st) SKM_sk_num(EVP_MD, (st))
-# define sk_EVP_MD_value(st, i) SKM_sk_value(EVP_MD, (st), (i))
-# define sk_EVP_MD_set(st, i, val) SKM_sk_set(EVP_MD, (st), (i), (val))
-# define sk_EVP_MD_zero(st) SKM_sk_zero(EVP_MD, (st))
-# define sk_EVP_MD_push(st, val) SKM_sk_push(EVP_MD, (st), (val))
-# define sk_EVP_MD_unshift(st, val) SKM_sk_unshift(EVP_MD, (st), (val))
-# define sk_EVP_MD_find(st, val) SKM_sk_find(EVP_MD, (st), (val))
-# define sk_EVP_MD_find_ex(st, val) SKM_sk_find_ex(EVP_MD, (st), (val))
-# define sk_EVP_MD_delete(st, i) SKM_sk_delete(EVP_MD, (st), (i))
-# define sk_EVP_MD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_MD, (st), (ptr))
-# define sk_EVP_MD_insert(st, val, i) SKM_sk_insert(EVP_MD, (st), (val), (i))
-# define sk_EVP_MD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_MD, (st), (cmp))
-# define sk_EVP_MD_dup(st) SKM_sk_dup(EVP_MD, st)
-# define sk_EVP_MD_pop_free(st, free_func) SKM_sk_pop_free(EVP_MD, (st), (free_func))
-# define sk_EVP_MD_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(EVP_MD, (st), (copy_func), (free_func))
-# define sk_EVP_MD_shift(st) SKM_sk_shift(EVP_MD, (st))
-# define sk_EVP_MD_pop(st) SKM_sk_pop(EVP_MD, (st))
-# define sk_EVP_MD_sort(st) SKM_sk_sort(EVP_MD, (st))
-# define sk_EVP_MD_is_sorted(st) SKM_sk_is_sorted(EVP_MD, (st))
-# define sk_EVP_PBE_CTL_new(cmp) SKM_sk_new(EVP_PBE_CTL, (cmp))
-# define sk_EVP_PBE_CTL_new_null() SKM_sk_new_null(EVP_PBE_CTL)
-# define sk_EVP_PBE_CTL_free(st) SKM_sk_free(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_num(st) SKM_sk_num(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_value(st, i) SKM_sk_value(EVP_PBE_CTL, (st), (i))
-# define sk_EVP_PBE_CTL_set(st, i, val) SKM_sk_set(EVP_PBE_CTL, (st), (i), (val))
-# define sk_EVP_PBE_CTL_zero(st) SKM_sk_zero(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_push(st, val) SKM_sk_push(EVP_PBE_CTL, (st), (val))
-# define sk_EVP_PBE_CTL_unshift(st, val) SKM_sk_unshift(EVP_PBE_CTL, (st), (val))
-# define sk_EVP_PBE_CTL_find(st, val) SKM_sk_find(EVP_PBE_CTL, (st), (val))
-# define sk_EVP_PBE_CTL_find_ex(st, val) SKM_sk_find_ex(EVP_PBE_CTL, (st), (val))
-# define sk_EVP_PBE_CTL_delete(st, i) SKM_sk_delete(EVP_PBE_CTL, (st), (i))
-# define sk_EVP_PBE_CTL_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PBE_CTL, (st), (ptr))
-# define sk_EVP_PBE_CTL_insert(st, val, i) SKM_sk_insert(EVP_PBE_CTL, (st), (val), (i))
-# define sk_EVP_PBE_CTL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PBE_CTL, (st), (cmp))
-# define sk_EVP_PBE_CTL_dup(st) SKM_sk_dup(EVP_PBE_CTL, st)
-# define sk_EVP_PBE_CTL_pop_free(st, free_func) SKM_sk_pop_free(EVP_PBE_CTL, (st), (free_func))
-# define sk_EVP_PBE_CTL_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(EVP_PBE_CTL, (st), (copy_func), (free_func))
-# define sk_EVP_PBE_CTL_shift(st) SKM_sk_shift(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_pop(st) SKM_sk_pop(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_sort(st) SKM_sk_sort(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_is_sorted(st) SKM_sk_is_sorted(EVP_PBE_CTL, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_ASN1_METHOD, (cmp))
-# define sk_EVP_PKEY_ASN1_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_ASN1_METHOD)
-# define sk_EVP_PKEY_ASN1_METHOD_free(st) SKM_sk_free(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_num(st) SKM_sk_num(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_ASN1_METHOD, (st), (i))
-# define sk_EVP_PKEY_ASN1_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_ASN1_METHOD, (st), (i), (val))
-# define sk_EVP_PKEY_ASN1_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_ASN1_METHOD, (st), (val))
-# define sk_EVP_PKEY_ASN1_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_ASN1_METHOD, (st), (val))
-# define sk_EVP_PKEY_ASN1_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_ASN1_METHOD, (st), (val))
-# define sk_EVP_PKEY_ASN1_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_ASN1_METHOD, (st), (val))
-# define sk_EVP_PKEY_ASN1_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_ASN1_METHOD, (st), (i))
-# define sk_EVP_PKEY_ASN1_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_ASN1_METHOD, (st), (ptr))
-# define sk_EVP_PKEY_ASN1_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_ASN1_METHOD, (st), (val), (i))
-# define sk_EVP_PKEY_ASN1_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_ASN1_METHOD, (st), (cmp))
-# define sk_EVP_PKEY_ASN1_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_ASN1_METHOD, st)
-# define sk_EVP_PKEY_ASN1_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_ASN1_METHOD, (st), (free_func))
-# define sk_EVP_PKEY_ASN1_METHOD_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(EVP_PKEY_ASN1_METHOD, (st), (copy_func), (free_func))
-# define sk_EVP_PKEY_ASN1_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_METHOD, (cmp))
-# define sk_EVP_PKEY_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_METHOD)
-# define sk_EVP_PKEY_METHOD_free(st) SKM_sk_free(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_num(st) SKM_sk_num(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_METHOD, (st), (i))
-# define sk_EVP_PKEY_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_METHOD, (st), (i), (val))
-# define sk_EVP_PKEY_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_METHOD, (st), (val))
-# define sk_EVP_PKEY_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_METHOD, (st), (val))
-# define sk_EVP_PKEY_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_METHOD, (st), (val))
-# define sk_EVP_PKEY_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_METHOD, (st), (val))
-# define sk_EVP_PKEY_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_METHOD, (st), (i))
-# define sk_EVP_PKEY_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_METHOD, (st), (ptr))
-# define sk_EVP_PKEY_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_METHOD, (st), (val), (i))
-# define sk_EVP_PKEY_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_METHOD, (st), (cmp))
-# define sk_EVP_PKEY_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_METHOD, st)
-# define sk_EVP_PKEY_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_METHOD, (st), (free_func))
-# define sk_EVP_PKEY_METHOD_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(EVP_PKEY_METHOD, (st), (copy_func), (free_func))
-# define sk_EVP_PKEY_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_METHOD, (st))
-# define sk_GENERAL_NAME_new(cmp) SKM_sk_new(GENERAL_NAME, (cmp))
-# define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME)
-# define sk_GENERAL_NAME_free(st) SKM_sk_free(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_num(st) SKM_sk_num(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_value(st, i) SKM_sk_value(GENERAL_NAME, (st), (i))
-# define sk_GENERAL_NAME_set(st, i, val) SKM_sk_set(GENERAL_NAME, (st), (i), (val))
-# define sk_GENERAL_NAME_zero(st) SKM_sk_zero(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_push(st, val) SKM_sk_push(GENERAL_NAME, (st), (val))
-# define sk_GENERAL_NAME_unshift(st, val) SKM_sk_unshift(GENERAL_NAME, (st), (val))
-# define sk_GENERAL_NAME_find(st, val) SKM_sk_find(GENERAL_NAME, (st), (val))
-# define sk_GENERAL_NAME_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAME, (st), (val))
-# define sk_GENERAL_NAME_delete(st, i) SKM_sk_delete(GENERAL_NAME, (st), (i))
-# define sk_GENERAL_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAME, (st), (ptr))
-# define sk_GENERAL_NAME_insert(st, val, i) SKM_sk_insert(GENERAL_NAME, (st), (val), (i))
-# define sk_GENERAL_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAME, (st), (cmp))
-# define sk_GENERAL_NAME_dup(st) SKM_sk_dup(GENERAL_NAME, st)
-# define sk_GENERAL_NAME_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAME, (st), (free_func))
-# define sk_GENERAL_NAME_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(GENERAL_NAME, (st), (copy_func), (free_func))
-# define sk_GENERAL_NAME_shift(st) SKM_sk_shift(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_pop(st) SKM_sk_pop(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_sort(st) SKM_sk_sort(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAME, (st))
-# define sk_GENERAL_NAMES_new(cmp) SKM_sk_new(GENERAL_NAMES, (cmp))
-# define sk_GENERAL_NAMES_new_null() SKM_sk_new_null(GENERAL_NAMES)
-# define sk_GENERAL_NAMES_free(st) SKM_sk_free(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_num(st) SKM_sk_num(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_value(st, i) SKM_sk_value(GENERAL_NAMES, (st), (i))
-# define sk_GENERAL_NAMES_set(st, i, val) SKM_sk_set(GENERAL_NAMES, (st), (i), (val))
-# define sk_GENERAL_NAMES_zero(st) SKM_sk_zero(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_push(st, val) SKM_sk_push(GENERAL_NAMES, (st), (val))
-# define sk_GENERAL_NAMES_unshift(st, val) SKM_sk_unshift(GENERAL_NAMES, (st), (val))
-# define sk_GENERAL_NAMES_find(st, val) SKM_sk_find(GENERAL_NAMES, (st), (val))
-# define sk_GENERAL_NAMES_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAMES, (st), (val))
-# define sk_GENERAL_NAMES_delete(st, i) SKM_sk_delete(GENERAL_NAMES, (st), (i))
-# define sk_GENERAL_NAMES_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAMES, (st), (ptr))
-# define sk_GENERAL_NAMES_insert(st, val, i) SKM_sk_insert(GENERAL_NAMES, (st), (val), (i))
-# define sk_GENERAL_NAMES_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAMES, (st), (cmp))
-# define sk_GENERAL_NAMES_dup(st) SKM_sk_dup(GENERAL_NAMES, st)
-# define sk_GENERAL_NAMES_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAMES, (st), (free_func))
-# define sk_GENERAL_NAMES_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(GENERAL_NAMES, (st), (copy_func), (free_func))
-# define sk_GENERAL_NAMES_shift(st) SKM_sk_shift(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_pop(st) SKM_sk_pop(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_sort(st) SKM_sk_sort(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAMES, (st))
-# define sk_GENERAL_SUBTREE_new(cmp) SKM_sk_new(GENERAL_SUBTREE, (cmp))
-# define sk_GENERAL_SUBTREE_new_null() SKM_sk_new_null(GENERAL_SUBTREE)
-# define sk_GENERAL_SUBTREE_free(st) SKM_sk_free(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_num(st) SKM_sk_num(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_value(st, i) SKM_sk_value(GENERAL_SUBTREE, (st), (i))
-# define sk_GENERAL_SUBTREE_set(st, i, val) SKM_sk_set(GENERAL_SUBTREE, (st), (i), (val))
-# define sk_GENERAL_SUBTREE_zero(st) SKM_sk_zero(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_push(st, val) SKM_sk_push(GENERAL_SUBTREE, (st), (val))
-# define sk_GENERAL_SUBTREE_unshift(st, val) SKM_sk_unshift(GENERAL_SUBTREE, (st), (val))
-# define sk_GENERAL_SUBTREE_find(st, val) SKM_sk_find(GENERAL_SUBTREE, (st), (val))
-# define sk_GENERAL_SUBTREE_find_ex(st, val) SKM_sk_find_ex(GENERAL_SUBTREE, (st), (val))
-# define sk_GENERAL_SUBTREE_delete(st, i) SKM_sk_delete(GENERAL_SUBTREE, (st), (i))
-# define sk_GENERAL_SUBTREE_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_SUBTREE, (st), (ptr))
-# define sk_GENERAL_SUBTREE_insert(st, val, i) SKM_sk_insert(GENERAL_SUBTREE, (st), (val), (i))
-# define sk_GENERAL_SUBTREE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_SUBTREE, (st), (cmp))
-# define sk_GENERAL_SUBTREE_dup(st) SKM_sk_dup(GENERAL_SUBTREE, st)
-# define sk_GENERAL_SUBTREE_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_SUBTREE, (st), (free_func))
-# define sk_GENERAL_SUBTREE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(GENERAL_SUBTREE, (st), (copy_func), (free_func))
-# define sk_GENERAL_SUBTREE_shift(st) SKM_sk_shift(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_pop(st) SKM_sk_pop(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_sort(st) SKM_sk_sort(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_is_sorted(st) SKM_sk_is_sorted(GENERAL_SUBTREE, (st))
-# define sk_IPAddressFamily_new(cmp) SKM_sk_new(IPAddressFamily, (cmp))
-# define sk_IPAddressFamily_new_null() SKM_sk_new_null(IPAddressFamily)
-# define sk_IPAddressFamily_free(st) SKM_sk_free(IPAddressFamily, (st))
-# define sk_IPAddressFamily_num(st) SKM_sk_num(IPAddressFamily, (st))
-# define sk_IPAddressFamily_value(st, i) SKM_sk_value(IPAddressFamily, (st), (i))
-# define sk_IPAddressFamily_set(st, i, val) SKM_sk_set(IPAddressFamily, (st), (i), (val))
-# define sk_IPAddressFamily_zero(st) SKM_sk_zero(IPAddressFamily, (st))
-# define sk_IPAddressFamily_push(st, val) SKM_sk_push(IPAddressFamily, (st), (val))
-# define sk_IPAddressFamily_unshift(st, val) SKM_sk_unshift(IPAddressFamily, (st), (val))
-# define sk_IPAddressFamily_find(st, val) SKM_sk_find(IPAddressFamily, (st), (val))
-# define sk_IPAddressFamily_find_ex(st, val) SKM_sk_find_ex(IPAddressFamily, (st), (val))
-# define sk_IPAddressFamily_delete(st, i) SKM_sk_delete(IPAddressFamily, (st), (i))
-# define sk_IPAddressFamily_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressFamily, (st), (ptr))
-# define sk_IPAddressFamily_insert(st, val, i) SKM_sk_insert(IPAddressFamily, (st), (val), (i))
-# define sk_IPAddressFamily_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressFamily, (st), (cmp))
-# define sk_IPAddressFamily_dup(st) SKM_sk_dup(IPAddressFamily, st)
-# define sk_IPAddressFamily_pop_free(st, free_func) SKM_sk_pop_free(IPAddressFamily, (st), (free_func))
-# define sk_IPAddressFamily_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(IPAddressFamily, (st), (copy_func), (free_func))
-# define sk_IPAddressFamily_shift(st) SKM_sk_shift(IPAddressFamily, (st))
-# define sk_IPAddressFamily_pop(st) SKM_sk_pop(IPAddressFamily, (st))
-# define sk_IPAddressFamily_sort(st) SKM_sk_sort(IPAddressFamily, (st))
-# define sk_IPAddressFamily_is_sorted(st) SKM_sk_is_sorted(IPAddressFamily, (st))
-# define sk_IPAddressOrRange_new(cmp) SKM_sk_new(IPAddressOrRange, (cmp))
-# define sk_IPAddressOrRange_new_null() SKM_sk_new_null(IPAddressOrRange)
-# define sk_IPAddressOrRange_free(st) SKM_sk_free(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_num(st) SKM_sk_num(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_value(st, i) SKM_sk_value(IPAddressOrRange, (st), (i))
-# define sk_IPAddressOrRange_set(st, i, val) SKM_sk_set(IPAddressOrRange, (st), (i), (val))
-# define sk_IPAddressOrRange_zero(st) SKM_sk_zero(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_push(st, val) SKM_sk_push(IPAddressOrRange, (st), (val))
-# define sk_IPAddressOrRange_unshift(st, val) SKM_sk_unshift(IPAddressOrRange, (st), (val))
-# define sk_IPAddressOrRange_find(st, val) SKM_sk_find(IPAddressOrRange, (st), (val))
-# define sk_IPAddressOrRange_find_ex(st, val) SKM_sk_find_ex(IPAddressOrRange, (st), (val))
-# define sk_IPAddressOrRange_delete(st, i) SKM_sk_delete(IPAddressOrRange, (st), (i))
-# define sk_IPAddressOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressOrRange, (st), (ptr))
-# define sk_IPAddressOrRange_insert(st, val, i) SKM_sk_insert(IPAddressOrRange, (st), (val), (i))
-# define sk_IPAddressOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressOrRange, (st), (cmp))
-# define sk_IPAddressOrRange_dup(st) SKM_sk_dup(IPAddressOrRange, st)
-# define sk_IPAddressOrRange_pop_free(st, free_func) SKM_sk_pop_free(IPAddressOrRange, (st), (free_func))
-# define sk_IPAddressOrRange_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(IPAddressOrRange, (st), (copy_func), (free_func))
-# define sk_IPAddressOrRange_shift(st) SKM_sk_shift(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_pop(st) SKM_sk_pop(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st))
-# define sk_KRB5_APREQBODY_new(cmp) SKM_sk_new(KRB5_APREQBODY, (cmp))
-# define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY)
-# define sk_KRB5_APREQBODY_free(st) SKM_sk_free(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_num(st) SKM_sk_num(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_value(st, i) SKM_sk_value(KRB5_APREQBODY, (st), (i))
-# define sk_KRB5_APREQBODY_set(st, i, val) SKM_sk_set(KRB5_APREQBODY, (st), (i), (val))
-# define sk_KRB5_APREQBODY_zero(st) SKM_sk_zero(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_push(st, val) SKM_sk_push(KRB5_APREQBODY, (st), (val))
-# define sk_KRB5_APREQBODY_unshift(st, val) SKM_sk_unshift(KRB5_APREQBODY, (st), (val))
-# define sk_KRB5_APREQBODY_find(st, val) SKM_sk_find(KRB5_APREQBODY, (st), (val))
-# define sk_KRB5_APREQBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_APREQBODY, (st), (val))
-# define sk_KRB5_APREQBODY_delete(st, i) SKM_sk_delete(KRB5_APREQBODY, (st), (i))
-# define sk_KRB5_APREQBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_APREQBODY, (st), (ptr))
-# define sk_KRB5_APREQBODY_insert(st, val, i) SKM_sk_insert(KRB5_APREQBODY, (st), (val), (i))
-# define sk_KRB5_APREQBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_APREQBODY, (st), (cmp))
-# define sk_KRB5_APREQBODY_dup(st) SKM_sk_dup(KRB5_APREQBODY, st)
-# define sk_KRB5_APREQBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_APREQBODY, (st), (free_func))
-# define sk_KRB5_APREQBODY_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(KRB5_APREQBODY, (st), (copy_func), (free_func))
-# define sk_KRB5_APREQBODY_shift(st) SKM_sk_shift(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_pop(st) SKM_sk_pop(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_sort(st) SKM_sk_sort(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_APREQBODY, (st))
-# define sk_KRB5_AUTHDATA_new(cmp) SKM_sk_new(KRB5_AUTHDATA, (cmp))
-# define sk_KRB5_AUTHDATA_new_null() SKM_sk_new_null(KRB5_AUTHDATA)
-# define sk_KRB5_AUTHDATA_free(st) SKM_sk_free(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_num(st) SKM_sk_num(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_value(st, i) SKM_sk_value(KRB5_AUTHDATA, (st), (i))
-# define sk_KRB5_AUTHDATA_set(st, i, val) SKM_sk_set(KRB5_AUTHDATA, (st), (i), (val))
-# define sk_KRB5_AUTHDATA_zero(st) SKM_sk_zero(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_push(st, val) SKM_sk_push(KRB5_AUTHDATA, (st), (val))
-# define sk_KRB5_AUTHDATA_unshift(st, val) SKM_sk_unshift(KRB5_AUTHDATA, (st), (val))
-# define sk_KRB5_AUTHDATA_find(st, val) SKM_sk_find(KRB5_AUTHDATA, (st), (val))
-# define sk_KRB5_AUTHDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHDATA, (st), (val))
-# define sk_KRB5_AUTHDATA_delete(st, i) SKM_sk_delete(KRB5_AUTHDATA, (st), (i))
-# define sk_KRB5_AUTHDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHDATA, (st), (ptr))
-# define sk_KRB5_AUTHDATA_insert(st, val, i) SKM_sk_insert(KRB5_AUTHDATA, (st), (val), (i))
-# define sk_KRB5_AUTHDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHDATA, (st), (cmp))
-# define sk_KRB5_AUTHDATA_dup(st) SKM_sk_dup(KRB5_AUTHDATA, st)
-# define sk_KRB5_AUTHDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHDATA, (st), (free_func))
-# define sk_KRB5_AUTHDATA_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(KRB5_AUTHDATA, (st), (copy_func), (free_func))
-# define sk_KRB5_AUTHDATA_shift(st) SKM_sk_shift(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_pop(st) SKM_sk_pop(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_sort(st) SKM_sk_sort(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHENTBODY_new(cmp) SKM_sk_new(KRB5_AUTHENTBODY, (cmp))
-# define sk_KRB5_AUTHENTBODY_new_null() SKM_sk_new_null(KRB5_AUTHENTBODY)
-# define sk_KRB5_AUTHENTBODY_free(st) SKM_sk_free(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_num(st) SKM_sk_num(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_value(st, i) SKM_sk_value(KRB5_AUTHENTBODY, (st), (i))
-# define sk_KRB5_AUTHENTBODY_set(st, i, val) SKM_sk_set(KRB5_AUTHENTBODY, (st), (i), (val))
-# define sk_KRB5_AUTHENTBODY_zero(st) SKM_sk_zero(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_push(st, val) SKM_sk_push(KRB5_AUTHENTBODY, (st), (val))
-# define sk_KRB5_AUTHENTBODY_unshift(st, val) SKM_sk_unshift(KRB5_AUTHENTBODY, (st), (val))
-# define sk_KRB5_AUTHENTBODY_find(st, val) SKM_sk_find(KRB5_AUTHENTBODY, (st), (val))
-# define sk_KRB5_AUTHENTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHENTBODY, (st), (val))
-# define sk_KRB5_AUTHENTBODY_delete(st, i) SKM_sk_delete(KRB5_AUTHENTBODY, (st), (i))
-# define sk_KRB5_AUTHENTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHENTBODY, (st), (ptr))
-# define sk_KRB5_AUTHENTBODY_insert(st, val, i) SKM_sk_insert(KRB5_AUTHENTBODY, (st), (val), (i))
-# define sk_KRB5_AUTHENTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHENTBODY, (st), (cmp))
-# define sk_KRB5_AUTHENTBODY_dup(st) SKM_sk_dup(KRB5_AUTHENTBODY, st)
-# define sk_KRB5_AUTHENTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHENTBODY, (st), (free_func))
-# define sk_KRB5_AUTHENTBODY_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(KRB5_AUTHENTBODY, (st), (copy_func), (free_func))
-# define sk_KRB5_AUTHENTBODY_shift(st) SKM_sk_shift(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_pop(st) SKM_sk_pop(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_sort(st) SKM_sk_sort(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_CHECKSUM_new(cmp) SKM_sk_new(KRB5_CHECKSUM, (cmp))
-# define sk_KRB5_CHECKSUM_new_null() SKM_sk_new_null(KRB5_CHECKSUM)
-# define sk_KRB5_CHECKSUM_free(st) SKM_sk_free(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_num(st) SKM_sk_num(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_value(st, i) SKM_sk_value(KRB5_CHECKSUM, (st), (i))
-# define sk_KRB5_CHECKSUM_set(st, i, val) SKM_sk_set(KRB5_CHECKSUM, (st), (i), (val))
-# define sk_KRB5_CHECKSUM_zero(st) SKM_sk_zero(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_push(st, val) SKM_sk_push(KRB5_CHECKSUM, (st), (val))
-# define sk_KRB5_CHECKSUM_unshift(st, val) SKM_sk_unshift(KRB5_CHECKSUM, (st), (val))
-# define sk_KRB5_CHECKSUM_find(st, val) SKM_sk_find(KRB5_CHECKSUM, (st), (val))
-# define sk_KRB5_CHECKSUM_find_ex(st, val) SKM_sk_find_ex(KRB5_CHECKSUM, (st), (val))
-# define sk_KRB5_CHECKSUM_delete(st, i) SKM_sk_delete(KRB5_CHECKSUM, (st), (i))
-# define sk_KRB5_CHECKSUM_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_CHECKSUM, (st), (ptr))
-# define sk_KRB5_CHECKSUM_insert(st, val, i) SKM_sk_insert(KRB5_CHECKSUM, (st), (val), (i))
-# define sk_KRB5_CHECKSUM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_CHECKSUM, (st), (cmp))
-# define sk_KRB5_CHECKSUM_dup(st) SKM_sk_dup(KRB5_CHECKSUM, st)
-# define sk_KRB5_CHECKSUM_pop_free(st, free_func) SKM_sk_pop_free(KRB5_CHECKSUM, (st), (free_func))
-# define sk_KRB5_CHECKSUM_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(KRB5_CHECKSUM, (st), (copy_func), (free_func))
-# define sk_KRB5_CHECKSUM_shift(st) SKM_sk_shift(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_pop(st) SKM_sk_pop(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_sort(st) SKM_sk_sort(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_is_sorted(st) SKM_sk_is_sorted(KRB5_CHECKSUM, (st))
-# define sk_KRB5_ENCDATA_new(cmp) SKM_sk_new(KRB5_ENCDATA, (cmp))
-# define sk_KRB5_ENCDATA_new_null() SKM_sk_new_null(KRB5_ENCDATA)
-# define sk_KRB5_ENCDATA_free(st) SKM_sk_free(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_num(st) SKM_sk_num(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_value(st, i) SKM_sk_value(KRB5_ENCDATA, (st), (i))
-# define sk_KRB5_ENCDATA_set(st, i, val) SKM_sk_set(KRB5_ENCDATA, (st), (i), (val))
-# define sk_KRB5_ENCDATA_zero(st) SKM_sk_zero(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_push(st, val) SKM_sk_push(KRB5_ENCDATA, (st), (val))
-# define sk_KRB5_ENCDATA_unshift(st, val) SKM_sk_unshift(KRB5_ENCDATA, (st), (val))
-# define sk_KRB5_ENCDATA_find(st, val) SKM_sk_find(KRB5_ENCDATA, (st), (val))
-# define sk_KRB5_ENCDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCDATA, (st), (val))
-# define sk_KRB5_ENCDATA_delete(st, i) SKM_sk_delete(KRB5_ENCDATA, (st), (i))
-# define sk_KRB5_ENCDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCDATA, (st), (ptr))
-# define sk_KRB5_ENCDATA_insert(st, val, i) SKM_sk_insert(KRB5_ENCDATA, (st), (val), (i))
-# define sk_KRB5_ENCDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCDATA, (st), (cmp))
-# define sk_KRB5_ENCDATA_dup(st) SKM_sk_dup(KRB5_ENCDATA, st)
-# define sk_KRB5_ENCDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCDATA, (st), (free_func))
-# define sk_KRB5_ENCDATA_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(KRB5_ENCDATA, (st), (copy_func), (free_func))
-# define sk_KRB5_ENCDATA_shift(st) SKM_sk_shift(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_pop(st) SKM_sk_pop(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_sort(st) SKM_sk_sort(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCKEY_new(cmp) SKM_sk_new(KRB5_ENCKEY, (cmp))
-# define sk_KRB5_ENCKEY_new_null() SKM_sk_new_null(KRB5_ENCKEY)
-# define sk_KRB5_ENCKEY_free(st) SKM_sk_free(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_num(st) SKM_sk_num(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_value(st, i) SKM_sk_value(KRB5_ENCKEY, (st), (i))
-# define sk_KRB5_ENCKEY_set(st, i, val) SKM_sk_set(KRB5_ENCKEY, (st), (i), (val))
-# define sk_KRB5_ENCKEY_zero(st) SKM_sk_zero(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_push(st, val) SKM_sk_push(KRB5_ENCKEY, (st), (val))
-# define sk_KRB5_ENCKEY_unshift(st, val) SKM_sk_unshift(KRB5_ENCKEY, (st), (val))
-# define sk_KRB5_ENCKEY_find(st, val) SKM_sk_find(KRB5_ENCKEY, (st), (val))
-# define sk_KRB5_ENCKEY_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCKEY, (st), (val))
-# define sk_KRB5_ENCKEY_delete(st, i) SKM_sk_delete(KRB5_ENCKEY, (st), (i))
-# define sk_KRB5_ENCKEY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCKEY, (st), (ptr))
-# define sk_KRB5_ENCKEY_insert(st, val, i) SKM_sk_insert(KRB5_ENCKEY, (st), (val), (i))
-# define sk_KRB5_ENCKEY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCKEY, (st), (cmp))
-# define sk_KRB5_ENCKEY_dup(st) SKM_sk_dup(KRB5_ENCKEY, st)
-# define sk_KRB5_ENCKEY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCKEY, (st), (free_func))
-# define sk_KRB5_ENCKEY_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(KRB5_ENCKEY, (st), (copy_func), (free_func))
-# define sk_KRB5_ENCKEY_shift(st) SKM_sk_shift(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_pop(st) SKM_sk_pop(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_sort(st) SKM_sk_sort(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCKEY, (st))
-# define sk_KRB5_PRINCNAME_new(cmp) SKM_sk_new(KRB5_PRINCNAME, (cmp))
-# define sk_KRB5_PRINCNAME_new_null() SKM_sk_new_null(KRB5_PRINCNAME)
-# define sk_KRB5_PRINCNAME_free(st) SKM_sk_free(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_num(st) SKM_sk_num(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_value(st, i) SKM_sk_value(KRB5_PRINCNAME, (st), (i))
-# define sk_KRB5_PRINCNAME_set(st, i, val) SKM_sk_set(KRB5_PRINCNAME, (st), (i), (val))
-# define sk_KRB5_PRINCNAME_zero(st) SKM_sk_zero(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_push(st, val) SKM_sk_push(KRB5_PRINCNAME, (st), (val))
-# define sk_KRB5_PRINCNAME_unshift(st, val) SKM_sk_unshift(KRB5_PRINCNAME, (st), (val))
-# define sk_KRB5_PRINCNAME_find(st, val) SKM_sk_find(KRB5_PRINCNAME, (st), (val))
-# define sk_KRB5_PRINCNAME_find_ex(st, val) SKM_sk_find_ex(KRB5_PRINCNAME, (st), (val))
-# define sk_KRB5_PRINCNAME_delete(st, i) SKM_sk_delete(KRB5_PRINCNAME, (st), (i))
-# define sk_KRB5_PRINCNAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_PRINCNAME, (st), (ptr))
-# define sk_KRB5_PRINCNAME_insert(st, val, i) SKM_sk_insert(KRB5_PRINCNAME, (st), (val), (i))
-# define sk_KRB5_PRINCNAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_PRINCNAME, (st), (cmp))
-# define sk_KRB5_PRINCNAME_dup(st) SKM_sk_dup(KRB5_PRINCNAME, st)
-# define sk_KRB5_PRINCNAME_pop_free(st, free_func) SKM_sk_pop_free(KRB5_PRINCNAME, (st), (free_func))
-# define sk_KRB5_PRINCNAME_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(KRB5_PRINCNAME, (st), (copy_func), (free_func))
-# define sk_KRB5_PRINCNAME_shift(st) SKM_sk_shift(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_pop(st) SKM_sk_pop(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_sort(st) SKM_sk_sort(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_is_sorted(st) SKM_sk_is_sorted(KRB5_PRINCNAME, (st))
-# define sk_KRB5_TKTBODY_new(cmp) SKM_sk_new(KRB5_TKTBODY, (cmp))
-# define sk_KRB5_TKTBODY_new_null() SKM_sk_new_null(KRB5_TKTBODY)
-# define sk_KRB5_TKTBODY_free(st) SKM_sk_free(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_num(st) SKM_sk_num(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_value(st, i) SKM_sk_value(KRB5_TKTBODY, (st), (i))
-# define sk_KRB5_TKTBODY_set(st, i, val) SKM_sk_set(KRB5_TKTBODY, (st), (i), (val))
-# define sk_KRB5_TKTBODY_zero(st) SKM_sk_zero(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_push(st, val) SKM_sk_push(KRB5_TKTBODY, (st), (val))
-# define sk_KRB5_TKTBODY_unshift(st, val) SKM_sk_unshift(KRB5_TKTBODY, (st), (val))
-# define sk_KRB5_TKTBODY_find(st, val) SKM_sk_find(KRB5_TKTBODY, (st), (val))
-# define sk_KRB5_TKTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_TKTBODY, (st), (val))
-# define sk_KRB5_TKTBODY_delete(st, i) SKM_sk_delete(KRB5_TKTBODY, (st), (i))
-# define sk_KRB5_TKTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_TKTBODY, (st), (ptr))
-# define sk_KRB5_TKTBODY_insert(st, val, i) SKM_sk_insert(KRB5_TKTBODY, (st), (val), (i))
-# define sk_KRB5_TKTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_TKTBODY, (st), (cmp))
-# define sk_KRB5_TKTBODY_dup(st) SKM_sk_dup(KRB5_TKTBODY, st)
-# define sk_KRB5_TKTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_TKTBODY, (st), (free_func))
-# define sk_KRB5_TKTBODY_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(KRB5_TKTBODY, (st), (copy_func), (free_func))
-# define sk_KRB5_TKTBODY_shift(st) SKM_sk_shift(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_pop(st) SKM_sk_pop(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_sort(st) SKM_sk_sort(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_TKTBODY, (st))
-# define sk_MEM_OBJECT_DATA_new(cmp) SKM_sk_new(MEM_OBJECT_DATA, (cmp))
-# define sk_MEM_OBJECT_DATA_new_null() SKM_sk_new_null(MEM_OBJECT_DATA)
-# define sk_MEM_OBJECT_DATA_free(st) SKM_sk_free(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_num(st) SKM_sk_num(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_value(st, i) SKM_sk_value(MEM_OBJECT_DATA, (st), (i))
-# define sk_MEM_OBJECT_DATA_set(st, i, val) SKM_sk_set(MEM_OBJECT_DATA, (st), (i), (val))
-# define sk_MEM_OBJECT_DATA_zero(st) SKM_sk_zero(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_push(st, val) SKM_sk_push(MEM_OBJECT_DATA, (st), (val))
-# define sk_MEM_OBJECT_DATA_unshift(st, val) SKM_sk_unshift(MEM_OBJECT_DATA, (st), (val))
-# define sk_MEM_OBJECT_DATA_find(st, val) SKM_sk_find(MEM_OBJECT_DATA, (st), (val))
-# define sk_MEM_OBJECT_DATA_find_ex(st, val) SKM_sk_find_ex(MEM_OBJECT_DATA, (st), (val))
-# define sk_MEM_OBJECT_DATA_delete(st, i) SKM_sk_delete(MEM_OBJECT_DATA, (st), (i))
-# define sk_MEM_OBJECT_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(MEM_OBJECT_DATA, (st), (ptr))
-# define sk_MEM_OBJECT_DATA_insert(st, val, i) SKM_sk_insert(MEM_OBJECT_DATA, (st), (val), (i))
-# define sk_MEM_OBJECT_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MEM_OBJECT_DATA, (st), (cmp))
-# define sk_MEM_OBJECT_DATA_dup(st) SKM_sk_dup(MEM_OBJECT_DATA, st)
-# define sk_MEM_OBJECT_DATA_pop_free(st, free_func) SKM_sk_pop_free(MEM_OBJECT_DATA, (st), (free_func))
-# define sk_MEM_OBJECT_DATA_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(MEM_OBJECT_DATA, (st), (copy_func), (free_func))
-# define sk_MEM_OBJECT_DATA_shift(st) SKM_sk_shift(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_pop(st) SKM_sk_pop(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_sort(st) SKM_sk_sort(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_is_sorted(st) SKM_sk_is_sorted(MEM_OBJECT_DATA, (st))
-# define sk_MIME_HEADER_new(cmp) SKM_sk_new(MIME_HEADER, (cmp))
-# define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)
-# define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st))
-# define sk_MIME_HEADER_num(st) SKM_sk_num(MIME_HEADER, (st))
-# define sk_MIME_HEADER_value(st, i) SKM_sk_value(MIME_HEADER, (st), (i))
-# define sk_MIME_HEADER_set(st, i, val) SKM_sk_set(MIME_HEADER, (st), (i), (val))
-# define sk_MIME_HEADER_zero(st) SKM_sk_zero(MIME_HEADER, (st))
-# define sk_MIME_HEADER_push(st, val) SKM_sk_push(MIME_HEADER, (st), (val))
-# define sk_MIME_HEADER_unshift(st, val) SKM_sk_unshift(MIME_HEADER, (st), (val))
-# define sk_MIME_HEADER_find(st, val) SKM_sk_find(MIME_HEADER, (st), (val))
-# define sk_MIME_HEADER_find_ex(st, val) SKM_sk_find_ex(MIME_HEADER, (st), (val))
-# define sk_MIME_HEADER_delete(st, i) SKM_sk_delete(MIME_HEADER, (st), (i))
-# define sk_MIME_HEADER_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_HEADER, (st), (ptr))
-# define sk_MIME_HEADER_insert(st, val, i) SKM_sk_insert(MIME_HEADER, (st), (val), (i))
-# define sk_MIME_HEADER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_HEADER, (st), (cmp))
-# define sk_MIME_HEADER_dup(st) SKM_sk_dup(MIME_HEADER, st)
-# define sk_MIME_HEADER_pop_free(st, free_func) SKM_sk_pop_free(MIME_HEADER, (st), (free_func))
-# define sk_MIME_HEADER_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(MIME_HEADER, (st), (copy_func), (free_func))
-# define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st))
-# define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st))
-# define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
-# define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))
-# define sk_MIME_PARAM_new(cmp) SKM_sk_new(MIME_PARAM, (cmp))
-# define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
-# define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))
-# define sk_MIME_PARAM_num(st) SKM_sk_num(MIME_PARAM, (st))
-# define sk_MIME_PARAM_value(st, i) SKM_sk_value(MIME_PARAM, (st), (i))
-# define sk_MIME_PARAM_set(st, i, val) SKM_sk_set(MIME_PARAM, (st), (i), (val))
-# define sk_MIME_PARAM_zero(st) SKM_sk_zero(MIME_PARAM, (st))
-# define sk_MIME_PARAM_push(st, val) SKM_sk_push(MIME_PARAM, (st), (val))
-# define sk_MIME_PARAM_unshift(st, val) SKM_sk_unshift(MIME_PARAM, (st), (val))
-# define sk_MIME_PARAM_find(st, val) SKM_sk_find(MIME_PARAM, (st), (val))
-# define sk_MIME_PARAM_find_ex(st, val) SKM_sk_find_ex(MIME_PARAM, (st), (val))
-# define sk_MIME_PARAM_delete(st, i) SKM_sk_delete(MIME_PARAM, (st), (i))
-# define sk_MIME_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_PARAM, (st), (ptr))
-# define sk_MIME_PARAM_insert(st, val, i) SKM_sk_insert(MIME_PARAM, (st), (val), (i))
-# define sk_MIME_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_PARAM, (st), (cmp))
-# define sk_MIME_PARAM_dup(st) SKM_sk_dup(MIME_PARAM, st)
-# define sk_MIME_PARAM_pop_free(st, free_func) SKM_sk_pop_free(MIME_PARAM, (st), (free_func))
-# define sk_MIME_PARAM_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(MIME_PARAM, (st), (copy_func), (free_func))
-# define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st))
-# define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st))
-# define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st))
-# define sk_MIME_PARAM_is_sorted(st) SKM_sk_is_sorted(MIME_PARAM, (st))
-# define sk_NAME_FUNCS_new(cmp) SKM_sk_new(NAME_FUNCS, (cmp))
-# define sk_NAME_FUNCS_new_null() SKM_sk_new_null(NAME_FUNCS)
-# define sk_NAME_FUNCS_free(st) SKM_sk_free(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_num(st) SKM_sk_num(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_value(st, i) SKM_sk_value(NAME_FUNCS, (st), (i))
-# define sk_NAME_FUNCS_set(st, i, val) SKM_sk_set(NAME_FUNCS, (st), (i), (val))
-# define sk_NAME_FUNCS_zero(st) SKM_sk_zero(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_push(st, val) SKM_sk_push(NAME_FUNCS, (st), (val))
-# define sk_NAME_FUNCS_unshift(st, val) SKM_sk_unshift(NAME_FUNCS, (st), (val))
-# define sk_NAME_FUNCS_find(st, val) SKM_sk_find(NAME_FUNCS, (st), (val))
-# define sk_NAME_FUNCS_find_ex(st, val) SKM_sk_find_ex(NAME_FUNCS, (st), (val))
-# define sk_NAME_FUNCS_delete(st, i) SKM_sk_delete(NAME_FUNCS, (st), (i))
-# define sk_NAME_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(NAME_FUNCS, (st), (ptr))
-# define sk_NAME_FUNCS_insert(st, val, i) SKM_sk_insert(NAME_FUNCS, (st), (val), (i))
-# define sk_NAME_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(NAME_FUNCS, (st), (cmp))
-# define sk_NAME_FUNCS_dup(st) SKM_sk_dup(NAME_FUNCS, st)
-# define sk_NAME_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(NAME_FUNCS, (st), (free_func))
-# define sk_NAME_FUNCS_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(NAME_FUNCS, (st), (copy_func), (free_func))
-# define sk_NAME_FUNCS_shift(st) SKM_sk_shift(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_pop(st) SKM_sk_pop(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_sort(st) SKM_sk_sort(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_is_sorted(st) SKM_sk_is_sorted(NAME_FUNCS, (st))
-# define sk_OCSP_CERTID_new(cmp) SKM_sk_new(OCSP_CERTID, (cmp))
-# define sk_OCSP_CERTID_new_null() SKM_sk_new_null(OCSP_CERTID)
-# define sk_OCSP_CERTID_free(st) SKM_sk_free(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_num(st) SKM_sk_num(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_value(st, i) SKM_sk_value(OCSP_CERTID, (st), (i))
-# define sk_OCSP_CERTID_set(st, i, val) SKM_sk_set(OCSP_CERTID, (st), (i), (val))
-# define sk_OCSP_CERTID_zero(st) SKM_sk_zero(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_push(st, val) SKM_sk_push(OCSP_CERTID, (st), (val))
-# define sk_OCSP_CERTID_unshift(st, val) SKM_sk_unshift(OCSP_CERTID, (st), (val))
-# define sk_OCSP_CERTID_find(st, val) SKM_sk_find(OCSP_CERTID, (st), (val))
-# define sk_OCSP_CERTID_find_ex(st, val) SKM_sk_find_ex(OCSP_CERTID, (st), (val))
-# define sk_OCSP_CERTID_delete(st, i) SKM_sk_delete(OCSP_CERTID, (st), (i))
-# define sk_OCSP_CERTID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_CERTID, (st), (ptr))
-# define sk_OCSP_CERTID_insert(st, val, i) SKM_sk_insert(OCSP_CERTID, (st), (val), (i))
-# define sk_OCSP_CERTID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_CERTID, (st), (cmp))
-# define sk_OCSP_CERTID_dup(st) SKM_sk_dup(OCSP_CERTID, st)
-# define sk_OCSP_CERTID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_CERTID, (st), (free_func))
-# define sk_OCSP_CERTID_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(OCSP_CERTID, (st), (copy_func), (free_func))
-# define sk_OCSP_CERTID_shift(st) SKM_sk_shift(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_pop(st) SKM_sk_pop(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_sort(st) SKM_sk_sort(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_is_sorted(st) SKM_sk_is_sorted(OCSP_CERTID, (st))
-# define sk_OCSP_ONEREQ_new(cmp) SKM_sk_new(OCSP_ONEREQ, (cmp))
-# define sk_OCSP_ONEREQ_new_null() SKM_sk_new_null(OCSP_ONEREQ)
-# define sk_OCSP_ONEREQ_free(st) SKM_sk_free(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_num(st) SKM_sk_num(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_value(st, i) SKM_sk_value(OCSP_ONEREQ, (st), (i))
-# define sk_OCSP_ONEREQ_set(st, i, val) SKM_sk_set(OCSP_ONEREQ, (st), (i), (val))
-# define sk_OCSP_ONEREQ_zero(st) SKM_sk_zero(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_push(st, val) SKM_sk_push(OCSP_ONEREQ, (st), (val))
-# define sk_OCSP_ONEREQ_unshift(st, val) SKM_sk_unshift(OCSP_ONEREQ, (st), (val))
-# define sk_OCSP_ONEREQ_find(st, val) SKM_sk_find(OCSP_ONEREQ, (st), (val))
-# define sk_OCSP_ONEREQ_find_ex(st, val) SKM_sk_find_ex(OCSP_ONEREQ, (st), (val))
-# define sk_OCSP_ONEREQ_delete(st, i) SKM_sk_delete(OCSP_ONEREQ, (st), (i))
-# define sk_OCSP_ONEREQ_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_ONEREQ, (st), (ptr))
-# define sk_OCSP_ONEREQ_insert(st, val, i) SKM_sk_insert(OCSP_ONEREQ, (st), (val), (i))
-# define sk_OCSP_ONEREQ_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_ONEREQ, (st), (cmp))
-# define sk_OCSP_ONEREQ_dup(st) SKM_sk_dup(OCSP_ONEREQ, st)
-# define sk_OCSP_ONEREQ_pop_free(st, free_func) SKM_sk_pop_free(OCSP_ONEREQ, (st), (free_func))
-# define sk_OCSP_ONEREQ_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(OCSP_ONEREQ, (st), (copy_func), (free_func))
-# define sk_OCSP_ONEREQ_shift(st) SKM_sk_shift(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_pop(st) SKM_sk_pop(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_sort(st) SKM_sk_sort(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_is_sorted(st) SKM_sk_is_sorted(OCSP_ONEREQ, (st))
-# define sk_OCSP_RESPID_new(cmp) SKM_sk_new(OCSP_RESPID, (cmp))
-# define sk_OCSP_RESPID_new_null() SKM_sk_new_null(OCSP_RESPID)
-# define sk_OCSP_RESPID_free(st) SKM_sk_free(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_num(st) SKM_sk_num(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_value(st, i) SKM_sk_value(OCSP_RESPID, (st), (i))
-# define sk_OCSP_RESPID_set(st, i, val) SKM_sk_set(OCSP_RESPID, (st), (i), (val))
-# define sk_OCSP_RESPID_zero(st) SKM_sk_zero(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_push(st, val) SKM_sk_push(OCSP_RESPID, (st), (val))
-# define sk_OCSP_RESPID_unshift(st, val) SKM_sk_unshift(OCSP_RESPID, (st), (val))
-# define sk_OCSP_RESPID_find(st, val) SKM_sk_find(OCSP_RESPID, (st), (val))
-# define sk_OCSP_RESPID_find_ex(st, val) SKM_sk_find_ex(OCSP_RESPID, (st), (val))
-# define sk_OCSP_RESPID_delete(st, i) SKM_sk_delete(OCSP_RESPID, (st), (i))
-# define sk_OCSP_RESPID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_RESPID, (st), (ptr))
-# define sk_OCSP_RESPID_insert(st, val, i) SKM_sk_insert(OCSP_RESPID, (st), (val), (i))
-# define sk_OCSP_RESPID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_RESPID, (st), (cmp))
-# define sk_OCSP_RESPID_dup(st) SKM_sk_dup(OCSP_RESPID, st)
-# define sk_OCSP_RESPID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_RESPID, (st), (free_func))
-# define sk_OCSP_RESPID_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(OCSP_RESPID, (st), (copy_func), (free_func))
-# define sk_OCSP_RESPID_shift(st) SKM_sk_shift(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_pop(st) SKM_sk_pop(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_sort(st) SKM_sk_sort(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_is_sorted(st) SKM_sk_is_sorted(OCSP_RESPID, (st))
-# define sk_OCSP_SINGLERESP_new(cmp) SKM_sk_new(OCSP_SINGLERESP, (cmp))
-# define sk_OCSP_SINGLERESP_new_null() SKM_sk_new_null(OCSP_SINGLERESP)
-# define sk_OCSP_SINGLERESP_free(st) SKM_sk_free(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_num(st) SKM_sk_num(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_value(st, i) SKM_sk_value(OCSP_SINGLERESP, (st), (i))
-# define sk_OCSP_SINGLERESP_set(st, i, val) SKM_sk_set(OCSP_SINGLERESP, (st), (i), (val))
-# define sk_OCSP_SINGLERESP_zero(st) SKM_sk_zero(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_push(st, val) SKM_sk_push(OCSP_SINGLERESP, (st), (val))
-# define sk_OCSP_SINGLERESP_unshift(st, val) SKM_sk_unshift(OCSP_SINGLERESP, (st), (val))
-# define sk_OCSP_SINGLERESP_find(st, val) SKM_sk_find(OCSP_SINGLERESP, (st), (val))
-# define sk_OCSP_SINGLERESP_find_ex(st, val) SKM_sk_find_ex(OCSP_SINGLERESP, (st), (val))
-# define sk_OCSP_SINGLERESP_delete(st, i) SKM_sk_delete(OCSP_SINGLERESP, (st), (i))
-# define sk_OCSP_SINGLERESP_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_SINGLERESP, (st), (ptr))
-# define sk_OCSP_SINGLERESP_insert(st, val, i) SKM_sk_insert(OCSP_SINGLERESP, (st), (val), (i))
-# define sk_OCSP_SINGLERESP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_SINGLERESP, (st), (cmp))
-# define sk_OCSP_SINGLERESP_dup(st) SKM_sk_dup(OCSP_SINGLERESP, st)
-# define sk_OCSP_SINGLERESP_pop_free(st, free_func) SKM_sk_pop_free(OCSP_SINGLERESP, (st), (free_func))
-# define sk_OCSP_SINGLERESP_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(OCSP_SINGLERESP, (st), (copy_func), (free_func))
-# define sk_OCSP_SINGLERESP_shift(st) SKM_sk_shift(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_pop(st) SKM_sk_pop(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_sort(st) SKM_sk_sort(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_is_sorted(st) SKM_sk_is_sorted(OCSP_SINGLERESP, (st))
-# define sk_PKCS12_SAFEBAG_new(cmp) SKM_sk_new(PKCS12_SAFEBAG, (cmp))
-# define sk_PKCS12_SAFEBAG_new_null() SKM_sk_new_null(PKCS12_SAFEBAG)
-# define sk_PKCS12_SAFEBAG_free(st) SKM_sk_free(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_num(st) SKM_sk_num(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_value(st, i) SKM_sk_value(PKCS12_SAFEBAG, (st), (i))
-# define sk_PKCS12_SAFEBAG_set(st, i, val) SKM_sk_set(PKCS12_SAFEBAG, (st), (i), (val))
-# define sk_PKCS12_SAFEBAG_zero(st) SKM_sk_zero(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_push(st, val) SKM_sk_push(PKCS12_SAFEBAG, (st), (val))
-# define sk_PKCS12_SAFEBAG_unshift(st, val) SKM_sk_unshift(PKCS12_SAFEBAG, (st), (val))
-# define sk_PKCS12_SAFEBAG_find(st, val) SKM_sk_find(PKCS12_SAFEBAG, (st), (val))
-# define sk_PKCS12_SAFEBAG_find_ex(st, val) SKM_sk_find_ex(PKCS12_SAFEBAG, (st), (val))
-# define sk_PKCS12_SAFEBAG_delete(st, i) SKM_sk_delete(PKCS12_SAFEBAG, (st), (i))
-# define sk_PKCS12_SAFEBAG_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS12_SAFEBAG, (st), (ptr))
-# define sk_PKCS12_SAFEBAG_insert(st, val, i) SKM_sk_insert(PKCS12_SAFEBAG, (st), (val), (i))
-# define sk_PKCS12_SAFEBAG_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS12_SAFEBAG, (st), (cmp))
-# define sk_PKCS12_SAFEBAG_dup(st) SKM_sk_dup(PKCS12_SAFEBAG, st)
-# define sk_PKCS12_SAFEBAG_pop_free(st, free_func) SKM_sk_pop_free(PKCS12_SAFEBAG, (st), (free_func))
-# define sk_PKCS12_SAFEBAG_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(PKCS12_SAFEBAG, (st), (copy_func), (free_func))
-# define sk_PKCS12_SAFEBAG_shift(st) SKM_sk_shift(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_pop(st) SKM_sk_pop(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_sort(st) SKM_sk_sort(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_is_sorted(st) SKM_sk_is_sorted(PKCS12_SAFEBAG, (st))
-# define sk_PKCS7_new(cmp) SKM_sk_new(PKCS7, (cmp))
-# define sk_PKCS7_new_null() SKM_sk_new_null(PKCS7)
-# define sk_PKCS7_free(st) SKM_sk_free(PKCS7, (st))
-# define sk_PKCS7_num(st) SKM_sk_num(PKCS7, (st))
-# define sk_PKCS7_value(st, i) SKM_sk_value(PKCS7, (st), (i))
-# define sk_PKCS7_set(st, i, val) SKM_sk_set(PKCS7, (st), (i), (val))
-# define sk_PKCS7_zero(st) SKM_sk_zero(PKCS7, (st))
-# define sk_PKCS7_push(st, val) SKM_sk_push(PKCS7, (st), (val))
-# define sk_PKCS7_unshift(st, val) SKM_sk_unshift(PKCS7, (st), (val))
-# define sk_PKCS7_find(st, val) SKM_sk_find(PKCS7, (st), (val))
-# define sk_PKCS7_find_ex(st, val) SKM_sk_find_ex(PKCS7, (st), (val))
-# define sk_PKCS7_delete(st, i) SKM_sk_delete(PKCS7, (st), (i))
-# define sk_PKCS7_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7, (st), (ptr))
-# define sk_PKCS7_insert(st, val, i) SKM_sk_insert(PKCS7, (st), (val), (i))
-# define sk_PKCS7_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7, (st), (cmp))
-# define sk_PKCS7_dup(st) SKM_sk_dup(PKCS7, st)
-# define sk_PKCS7_pop_free(st, free_func) SKM_sk_pop_free(PKCS7, (st), (free_func))
-# define sk_PKCS7_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(PKCS7, (st), (copy_func), (free_func))
-# define sk_PKCS7_shift(st) SKM_sk_shift(PKCS7, (st))
-# define sk_PKCS7_pop(st) SKM_sk_pop(PKCS7, (st))
-# define sk_PKCS7_sort(st) SKM_sk_sort(PKCS7, (st))
-# define sk_PKCS7_is_sorted(st) SKM_sk_is_sorted(PKCS7, (st))
-# define sk_PKCS7_RECIP_INFO_new(cmp) SKM_sk_new(PKCS7_RECIP_INFO, (cmp))
-# define sk_PKCS7_RECIP_INFO_new_null() SKM_sk_new_null(PKCS7_RECIP_INFO)
-# define sk_PKCS7_RECIP_INFO_free(st) SKM_sk_free(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_num(st) SKM_sk_num(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_value(st, i) SKM_sk_value(PKCS7_RECIP_INFO, (st), (i))
-# define sk_PKCS7_RECIP_INFO_set(st, i, val) SKM_sk_set(PKCS7_RECIP_INFO, (st), (i), (val))
-# define sk_PKCS7_RECIP_INFO_zero(st) SKM_sk_zero(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_push(st, val) SKM_sk_push(PKCS7_RECIP_INFO, (st), (val))
-# define sk_PKCS7_RECIP_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_RECIP_INFO, (st), (val))
-# define sk_PKCS7_RECIP_INFO_find(st, val) SKM_sk_find(PKCS7_RECIP_INFO, (st), (val))
-# define sk_PKCS7_RECIP_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_RECIP_INFO, (st), (val))
-# define sk_PKCS7_RECIP_INFO_delete(st, i) SKM_sk_delete(PKCS7_RECIP_INFO, (st), (i))
-# define sk_PKCS7_RECIP_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_RECIP_INFO, (st), (ptr))
-# define sk_PKCS7_RECIP_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_RECIP_INFO, (st), (val), (i))
-# define sk_PKCS7_RECIP_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_RECIP_INFO, (st), (cmp))
-# define sk_PKCS7_RECIP_INFO_dup(st) SKM_sk_dup(PKCS7_RECIP_INFO, st)
-# define sk_PKCS7_RECIP_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_RECIP_INFO, (st), (free_func))
-# define sk_PKCS7_RECIP_INFO_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(PKCS7_RECIP_INFO, (st), (copy_func), (free_func))
-# define sk_PKCS7_RECIP_INFO_shift(st) SKM_sk_shift(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_pop(st) SKM_sk_pop(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_sort(st) SKM_sk_sort(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_new(cmp) SKM_sk_new(PKCS7_SIGNER_INFO, (cmp))
-# define sk_PKCS7_SIGNER_INFO_new_null() SKM_sk_new_null(PKCS7_SIGNER_INFO)
-# define sk_PKCS7_SIGNER_INFO_free(st) SKM_sk_free(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_num(st) SKM_sk_num(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_value(st, i) SKM_sk_value(PKCS7_SIGNER_INFO, (st), (i))
-# define sk_PKCS7_SIGNER_INFO_set(st, i, val) SKM_sk_set(PKCS7_SIGNER_INFO, (st), (i), (val))
-# define sk_PKCS7_SIGNER_INFO_zero(st) SKM_sk_zero(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_push(st, val) SKM_sk_push(PKCS7_SIGNER_INFO, (st), (val))
-# define sk_PKCS7_SIGNER_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_SIGNER_INFO, (st), (val))
-# define sk_PKCS7_SIGNER_INFO_find(st, val) SKM_sk_find(PKCS7_SIGNER_INFO, (st), (val))
-# define sk_PKCS7_SIGNER_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_SIGNER_INFO, (st), (val))
-# define sk_PKCS7_SIGNER_INFO_delete(st, i) SKM_sk_delete(PKCS7_SIGNER_INFO, (st), (i))
-# define sk_PKCS7_SIGNER_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_SIGNER_INFO, (st), (ptr))
-# define sk_PKCS7_SIGNER_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_SIGNER_INFO, (st), (val), (i))
-# define sk_PKCS7_SIGNER_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_SIGNER_INFO, (st), (cmp))
-# define sk_PKCS7_SIGNER_INFO_dup(st) SKM_sk_dup(PKCS7_SIGNER_INFO, st)
-# define sk_PKCS7_SIGNER_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_SIGNER_INFO, (st), (free_func))
-# define sk_PKCS7_SIGNER_INFO_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(PKCS7_SIGNER_INFO, (st), (copy_func), (free_func))
-# define sk_PKCS7_SIGNER_INFO_shift(st) SKM_sk_shift(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_pop(st) SKM_sk_pop(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_sort(st) SKM_sk_sort(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_SIGNER_INFO, (st))
-# define sk_POLICYINFO_new(cmp) SKM_sk_new(POLICYINFO, (cmp))
-# define sk_POLICYINFO_new_null() SKM_sk_new_null(POLICYINFO)
-# define sk_POLICYINFO_free(st) SKM_sk_free(POLICYINFO, (st))
-# define sk_POLICYINFO_num(st) SKM_sk_num(POLICYINFO, (st))
-# define sk_POLICYINFO_value(st, i) SKM_sk_value(POLICYINFO, (st), (i))
-# define sk_POLICYINFO_set(st, i, val) SKM_sk_set(POLICYINFO, (st), (i), (val))
-# define sk_POLICYINFO_zero(st) SKM_sk_zero(POLICYINFO, (st))
-# define sk_POLICYINFO_push(st, val) SKM_sk_push(POLICYINFO, (st), (val))
-# define sk_POLICYINFO_unshift(st, val) SKM_sk_unshift(POLICYINFO, (st), (val))
-# define sk_POLICYINFO_find(st, val) SKM_sk_find(POLICYINFO, (st), (val))
-# define sk_POLICYINFO_find_ex(st, val) SKM_sk_find_ex(POLICYINFO, (st), (val))
-# define sk_POLICYINFO_delete(st, i) SKM_sk_delete(POLICYINFO, (st), (i))
-# define sk_POLICYINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYINFO, (st), (ptr))
-# define sk_POLICYINFO_insert(st, val, i) SKM_sk_insert(POLICYINFO, (st), (val), (i))
-# define sk_POLICYINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYINFO, (st), (cmp))
-# define sk_POLICYINFO_dup(st) SKM_sk_dup(POLICYINFO, st)
-# define sk_POLICYINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYINFO, (st), (free_func))
-# define sk_POLICYINFO_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(POLICYINFO, (st), (copy_func), (free_func))
-# define sk_POLICYINFO_shift(st) SKM_sk_shift(POLICYINFO, (st))
-# define sk_POLICYINFO_pop(st) SKM_sk_pop(POLICYINFO, (st))
-# define sk_POLICYINFO_sort(st) SKM_sk_sort(POLICYINFO, (st))
-# define sk_POLICYINFO_is_sorted(st) SKM_sk_is_sorted(POLICYINFO, (st))
-# define sk_POLICYQUALINFO_new(cmp) SKM_sk_new(POLICYQUALINFO, (cmp))
-# define sk_POLICYQUALINFO_new_null() SKM_sk_new_null(POLICYQUALINFO)
-# define sk_POLICYQUALINFO_free(st) SKM_sk_free(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_num(st) SKM_sk_num(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_value(st, i) SKM_sk_value(POLICYQUALINFO, (st), (i))
-# define sk_POLICYQUALINFO_set(st, i, val) SKM_sk_set(POLICYQUALINFO, (st), (i), (val))
-# define sk_POLICYQUALINFO_zero(st) SKM_sk_zero(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_push(st, val) SKM_sk_push(POLICYQUALINFO, (st), (val))
-# define sk_POLICYQUALINFO_unshift(st, val) SKM_sk_unshift(POLICYQUALINFO, (st), (val))
-# define sk_POLICYQUALINFO_find(st, val) SKM_sk_find(POLICYQUALINFO, (st), (val))
-# define sk_POLICYQUALINFO_find_ex(st, val) SKM_sk_find_ex(POLICYQUALINFO, (st), (val))
-# define sk_POLICYQUALINFO_delete(st, i) SKM_sk_delete(POLICYQUALINFO, (st), (i))
-# define sk_POLICYQUALINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYQUALINFO, (st), (ptr))
-# define sk_POLICYQUALINFO_insert(st, val, i) SKM_sk_insert(POLICYQUALINFO, (st), (val), (i))
-# define sk_POLICYQUALINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYQUALINFO, (st), (cmp))
-# define sk_POLICYQUALINFO_dup(st) SKM_sk_dup(POLICYQUALINFO, st)
-# define sk_POLICYQUALINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYQUALINFO, (st), (free_func))
-# define sk_POLICYQUALINFO_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(POLICYQUALINFO, (st), (copy_func), (free_func))
-# define sk_POLICYQUALINFO_shift(st) SKM_sk_shift(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_pop(st) SKM_sk_pop(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_sort(st) SKM_sk_sort(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_is_sorted(st) SKM_sk_is_sorted(POLICYQUALINFO, (st))
-# define sk_POLICY_MAPPING_new(cmp) SKM_sk_new(POLICY_MAPPING, (cmp))
-# define sk_POLICY_MAPPING_new_null() SKM_sk_new_null(POLICY_MAPPING)
-# define sk_POLICY_MAPPING_free(st) SKM_sk_free(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_num(st) SKM_sk_num(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_value(st, i) SKM_sk_value(POLICY_MAPPING, (st), (i))
-# define sk_POLICY_MAPPING_set(st, i, val) SKM_sk_set(POLICY_MAPPING, (st), (i), (val))
-# define sk_POLICY_MAPPING_zero(st) SKM_sk_zero(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_push(st, val) SKM_sk_push(POLICY_MAPPING, (st), (val))
-# define sk_POLICY_MAPPING_unshift(st, val) SKM_sk_unshift(POLICY_MAPPING, (st), (val))
-# define sk_POLICY_MAPPING_find(st, val) SKM_sk_find(POLICY_MAPPING, (st), (val))
-# define sk_POLICY_MAPPING_find_ex(st, val) SKM_sk_find_ex(POLICY_MAPPING, (st), (val))
-# define sk_POLICY_MAPPING_delete(st, i) SKM_sk_delete(POLICY_MAPPING, (st), (i))
-# define sk_POLICY_MAPPING_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICY_MAPPING, (st), (ptr))
-# define sk_POLICY_MAPPING_insert(st, val, i) SKM_sk_insert(POLICY_MAPPING, (st), (val), (i))
-# define sk_POLICY_MAPPING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICY_MAPPING, (st), (cmp))
-# define sk_POLICY_MAPPING_dup(st) SKM_sk_dup(POLICY_MAPPING, st)
-# define sk_POLICY_MAPPING_pop_free(st, free_func) SKM_sk_pop_free(POLICY_MAPPING, (st), (free_func))
-# define sk_POLICY_MAPPING_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(POLICY_MAPPING, (st), (copy_func), (free_func))
-# define sk_POLICY_MAPPING_shift(st) SKM_sk_shift(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_pop(st) SKM_sk_pop(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st))
-# define sk_SCT_new(cmp) SKM_sk_new(SCT, (cmp))
-# define sk_SCT_new_null() SKM_sk_new_null(SCT)
-# define sk_SCT_free(st) SKM_sk_free(SCT, (st))
-# define sk_SCT_num(st) SKM_sk_num(SCT, (st))
-# define sk_SCT_value(st, i) SKM_sk_value(SCT, (st), (i))
-# define sk_SCT_set(st, i, val) SKM_sk_set(SCT, (st), (i), (val))
-# define sk_SCT_zero(st) SKM_sk_zero(SCT, (st))
-# define sk_SCT_push(st, val) SKM_sk_push(SCT, (st), (val))
-# define sk_SCT_unshift(st, val) SKM_sk_unshift(SCT, (st), (val))
-# define sk_SCT_find(st, val) SKM_sk_find(SCT, (st), (val))
-# define sk_SCT_find_ex(st, val) SKM_sk_find_ex(SCT, (st), (val))
-# define sk_SCT_delete(st, i) SKM_sk_delete(SCT, (st), (i))
-# define sk_SCT_delete_ptr(st, ptr) SKM_sk_delete_ptr(SCT, (st), (ptr))
-# define sk_SCT_insert(st, val, i) SKM_sk_insert(SCT, (st), (val), (i))
-# define sk_SCT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SCT, (st), (cmp))
-# define sk_SCT_dup(st) SKM_sk_dup(SCT, st)
-# define sk_SCT_pop_free(st, free_func) SKM_sk_pop_free(SCT, (st), (free_func))
-# define sk_SCT_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(SCT, (st), (copy_func), (free_func))
-# define sk_SCT_shift(st) SKM_sk_shift(SCT, (st))
-# define sk_SCT_pop(st) SKM_sk_pop(SCT, (st))
-# define sk_SCT_sort(st) SKM_sk_sort(SCT, (st))
-# define sk_SCT_is_sorted(st) SKM_sk_is_sorted(SCT, (st))
-# define sk_SRP_gN_new(cmp) SKM_sk_new(SRP_gN, (cmp))
-# define sk_SRP_gN_new_null() SKM_sk_new_null(SRP_gN)
-# define sk_SRP_gN_free(st) SKM_sk_free(SRP_gN, (st))
-# define sk_SRP_gN_num(st) SKM_sk_num(SRP_gN, (st))
-# define sk_SRP_gN_value(st, i) SKM_sk_value(SRP_gN, (st), (i))
-# define sk_SRP_gN_set(st, i, val) SKM_sk_set(SRP_gN, (st), (i), (val))
-# define sk_SRP_gN_zero(st) SKM_sk_zero(SRP_gN, (st))
-# define sk_SRP_gN_push(st, val) SKM_sk_push(SRP_gN, (st), (val))
-# define sk_SRP_gN_unshift(st, val) SKM_sk_unshift(SRP_gN, (st), (val))
-# define sk_SRP_gN_find(st, val) SKM_sk_find(SRP_gN, (st), (val))
-# define sk_SRP_gN_find_ex(st, val) SKM_sk_find_ex(SRP_gN, (st), (val))
-# define sk_SRP_gN_delete(st, i) SKM_sk_delete(SRP_gN, (st), (i))
-# define sk_SRP_gN_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_gN, (st), (ptr))
-# define sk_SRP_gN_insert(st, val, i) SKM_sk_insert(SRP_gN, (st), (val), (i))
-# define sk_SRP_gN_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRP_gN, (st), (cmp))
-# define sk_SRP_gN_dup(st) SKM_sk_dup(SRP_gN, st)
-# define sk_SRP_gN_pop_free(st, free_func) SKM_sk_pop_free(SRP_gN, (st), (free_func))
-# define sk_SRP_gN_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(SRP_gN, (st), (copy_func), (free_func))
-# define sk_SRP_gN_shift(st) SKM_sk_shift(SRP_gN, (st))
-# define sk_SRP_gN_pop(st) SKM_sk_pop(SRP_gN, (st))
-# define sk_SRP_gN_sort(st) SKM_sk_sort(SRP_gN, (st))
-# define sk_SRP_gN_is_sorted(st) SKM_sk_is_sorted(SRP_gN, (st))
-# define sk_SRP_gN_cache_new(cmp) SKM_sk_new(SRP_gN_cache, (cmp))
-# define sk_SRP_gN_cache_new_null() SKM_sk_new_null(SRP_gN_cache)
-# define sk_SRP_gN_cache_free(st) SKM_sk_free(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_num(st) SKM_sk_num(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_value(st, i) SKM_sk_value(SRP_gN_cache, (st), (i))
-# define sk_SRP_gN_cache_set(st, i, val) SKM_sk_set(SRP_gN_cache, (st), (i), (val))
-# define sk_SRP_gN_cache_zero(st) SKM_sk_zero(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_push(st, val) SKM_sk_push(SRP_gN_cache, (st), (val))
-# define sk_SRP_gN_cache_unshift(st, val) SKM_sk_unshift(SRP_gN_cache, (st), (val))
-# define sk_SRP_gN_cache_find(st, val) SKM_sk_find(SRP_gN_cache, (st), (val))
-# define sk_SRP_gN_cache_find_ex(st, val) SKM_sk_find_ex(SRP_gN_cache, (st), (val))
-# define sk_SRP_gN_cache_delete(st, i) SKM_sk_delete(SRP_gN_cache, (st), (i))
-# define sk_SRP_gN_cache_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_gN_cache, (st), (ptr))
-# define sk_SRP_gN_cache_insert(st, val, i) SKM_sk_insert(SRP_gN_cache, (st), (val), (i))
-# define sk_SRP_gN_cache_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRP_gN_cache, (st), (cmp))
-# define sk_SRP_gN_cache_dup(st) SKM_sk_dup(SRP_gN_cache, st)
-# define sk_SRP_gN_cache_pop_free(st, free_func) SKM_sk_pop_free(SRP_gN_cache, (st), (free_func))
-# define sk_SRP_gN_cache_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(SRP_gN_cache, (st), (copy_func), (free_func))
-# define sk_SRP_gN_cache_shift(st) SKM_sk_shift(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_pop(st) SKM_sk_pop(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_sort(st) SKM_sk_sort(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_is_sorted(st) SKM_sk_is_sorted(SRP_gN_cache, (st))
-# define sk_SRP_user_pwd_new(cmp) SKM_sk_new(SRP_user_pwd, (cmp))
-# define sk_SRP_user_pwd_new_null() SKM_sk_new_null(SRP_user_pwd)
-# define sk_SRP_user_pwd_free(st) SKM_sk_free(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_num(st) SKM_sk_num(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_value(st, i) SKM_sk_value(SRP_user_pwd, (st), (i))
-# define sk_SRP_user_pwd_set(st, i, val) SKM_sk_set(SRP_user_pwd, (st), (i), (val))
-# define sk_SRP_user_pwd_zero(st) SKM_sk_zero(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_push(st, val) SKM_sk_push(SRP_user_pwd, (st), (val))
-# define sk_SRP_user_pwd_unshift(st, val) SKM_sk_unshift(SRP_user_pwd, (st), (val))
-# define sk_SRP_user_pwd_find(st, val) SKM_sk_find(SRP_user_pwd, (st), (val))
-# define sk_SRP_user_pwd_find_ex(st, val) SKM_sk_find_ex(SRP_user_pwd, (st), (val))
-# define sk_SRP_user_pwd_delete(st, i) SKM_sk_delete(SRP_user_pwd, (st), (i))
-# define sk_SRP_user_pwd_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_user_pwd, (st), (ptr))
-# define sk_SRP_user_pwd_insert(st, val, i) SKM_sk_insert(SRP_user_pwd, (st), (val), (i))
-# define sk_SRP_user_pwd_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRP_user_pwd, (st), (cmp))
-# define sk_SRP_user_pwd_dup(st) SKM_sk_dup(SRP_user_pwd, st)
-# define sk_SRP_user_pwd_pop_free(st, free_func) SKM_sk_pop_free(SRP_user_pwd, (st), (free_func))
-# define sk_SRP_user_pwd_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(SRP_user_pwd, (st), (copy_func), (free_func))
-# define sk_SRP_user_pwd_shift(st) SKM_sk_shift(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_pop(st) SKM_sk_pop(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_sort(st) SKM_sk_sort(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_is_sorted(st) SKM_sk_is_sorted(SRP_user_pwd, (st))
-# define sk_SRTP_PROTECTION_PROFILE_new(cmp) SKM_sk_new(SRTP_PROTECTION_PROFILE, (cmp))
-# define sk_SRTP_PROTECTION_PROFILE_new_null() SKM_sk_new_null(SRTP_PROTECTION_PROFILE)
-# define sk_SRTP_PROTECTION_PROFILE_free(st) SKM_sk_free(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_num(st) SKM_sk_num(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_value(st, i) SKM_sk_value(SRTP_PROTECTION_PROFILE, (st), (i))
-# define sk_SRTP_PROTECTION_PROFILE_set(st, i, val) SKM_sk_set(SRTP_PROTECTION_PROFILE, (st), (i), (val))
-# define sk_SRTP_PROTECTION_PROFILE_zero(st) SKM_sk_zero(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_push(st, val) SKM_sk_push(SRTP_PROTECTION_PROFILE, (st), (val))
-# define sk_SRTP_PROTECTION_PROFILE_unshift(st, val) SKM_sk_unshift(SRTP_PROTECTION_PROFILE, (st), (val))
-# define sk_SRTP_PROTECTION_PROFILE_find(st, val) SKM_sk_find(SRTP_PROTECTION_PROFILE, (st), (val))
-# define sk_SRTP_PROTECTION_PROFILE_find_ex(st, val) SKM_sk_find_ex(SRTP_PROTECTION_PROFILE, (st), (val))
-# define sk_SRTP_PROTECTION_PROFILE_delete(st, i) SKM_sk_delete(SRTP_PROTECTION_PROFILE, (st), (i))
-# define sk_SRTP_PROTECTION_PROFILE_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRTP_PROTECTION_PROFILE, (st), (ptr))
-# define sk_SRTP_PROTECTION_PROFILE_insert(st, val, i) SKM_sk_insert(SRTP_PROTECTION_PROFILE, (st), (val), (i))
-# define sk_SRTP_PROTECTION_PROFILE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRTP_PROTECTION_PROFILE, (st), (cmp))
-# define sk_SRTP_PROTECTION_PROFILE_dup(st) SKM_sk_dup(SRTP_PROTECTION_PROFILE, st)
-# define sk_SRTP_PROTECTION_PROFILE_pop_free(st, free_func) SKM_sk_pop_free(SRTP_PROTECTION_PROFILE, (st), (free_func))
-# define sk_SRTP_PROTECTION_PROFILE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(SRTP_PROTECTION_PROFILE, (st), (copy_func), (free_func))
-# define sk_SRTP_PROTECTION_PROFILE_shift(st) SKM_sk_shift(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_pop(st) SKM_sk_pop(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_sort(st) SKM_sk_sort(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_is_sorted(st) SKM_sk_is_sorted(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SSL_CIPHER_new(cmp) SKM_sk_new(SSL_CIPHER, (cmp))
-# define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)
-# define sk_SSL_CIPHER_free(st) SKM_sk_free(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_num(st) SKM_sk_num(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_value(st, i) SKM_sk_value(SSL_CIPHER, (st), (i))
-# define sk_SSL_CIPHER_set(st, i, val) SKM_sk_set(SSL_CIPHER, (st), (i), (val))
-# define sk_SSL_CIPHER_zero(st) SKM_sk_zero(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_push(st, val) SKM_sk_push(SSL_CIPHER, (st), (val))
-# define sk_SSL_CIPHER_unshift(st, val) SKM_sk_unshift(SSL_CIPHER, (st), (val))
-# define sk_SSL_CIPHER_find(st, val) SKM_sk_find(SSL_CIPHER, (st), (val))
-# define sk_SSL_CIPHER_find_ex(st, val) SKM_sk_find_ex(SSL_CIPHER, (st), (val))
-# define sk_SSL_CIPHER_delete(st, i) SKM_sk_delete(SSL_CIPHER, (st), (i))
-# define sk_SSL_CIPHER_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_CIPHER, (st), (ptr))
-# define sk_SSL_CIPHER_insert(st, val, i) SKM_sk_insert(SSL_CIPHER, (st), (val), (i))
-# define sk_SSL_CIPHER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_CIPHER, (st), (cmp))
-# define sk_SSL_CIPHER_dup(st) SKM_sk_dup(SSL_CIPHER, st)
-# define sk_SSL_CIPHER_pop_free(st, free_func) SKM_sk_pop_free(SSL_CIPHER, (st), (free_func))
-# define sk_SSL_CIPHER_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(SSL_CIPHER, (st), (copy_func), (free_func))
-# define sk_SSL_CIPHER_shift(st) SKM_sk_shift(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_pop(st) SKM_sk_pop(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_sort(st) SKM_sk_sort(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_is_sorted(st) SKM_sk_is_sorted(SSL_CIPHER, (st))
-# define sk_SSL_COMP_new(cmp) SKM_sk_new(SSL_COMP, (cmp))
-# define sk_SSL_COMP_new_null() SKM_sk_new_null(SSL_COMP)
-# define sk_SSL_COMP_free(st) SKM_sk_free(SSL_COMP, (st))
-# define sk_SSL_COMP_num(st) SKM_sk_num(SSL_COMP, (st))
-# define sk_SSL_COMP_value(st, i) SKM_sk_value(SSL_COMP, (st), (i))
-# define sk_SSL_COMP_set(st, i, val) SKM_sk_set(SSL_COMP, (st), (i), (val))
-# define sk_SSL_COMP_zero(st) SKM_sk_zero(SSL_COMP, (st))
-# define sk_SSL_COMP_push(st, val) SKM_sk_push(SSL_COMP, (st), (val))
-# define sk_SSL_COMP_unshift(st, val) SKM_sk_unshift(SSL_COMP, (st), (val))
-# define sk_SSL_COMP_find(st, val) SKM_sk_find(SSL_COMP, (st), (val))
-# define sk_SSL_COMP_find_ex(st, val) SKM_sk_find_ex(SSL_COMP, (st), (val))
-# define sk_SSL_COMP_delete(st, i) SKM_sk_delete(SSL_COMP, (st), (i))
-# define sk_SSL_COMP_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_COMP, (st), (ptr))
-# define sk_SSL_COMP_insert(st, val, i) SKM_sk_insert(SSL_COMP, (st), (val), (i))
-# define sk_SSL_COMP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_COMP, (st), (cmp))
-# define sk_SSL_COMP_dup(st) SKM_sk_dup(SSL_COMP, st)
-# define sk_SSL_COMP_pop_free(st, free_func) SKM_sk_pop_free(SSL_COMP, (st), (free_func))
-# define sk_SSL_COMP_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(SSL_COMP, (st), (copy_func), (free_func))
-# define sk_SSL_COMP_shift(st) SKM_sk_shift(SSL_COMP, (st))
-# define sk_SSL_COMP_pop(st) SKM_sk_pop(SSL_COMP, (st))
-# define sk_SSL_COMP_sort(st) SKM_sk_sort(SSL_COMP, (st))
-# define sk_SSL_COMP_is_sorted(st) SKM_sk_is_sorted(SSL_COMP, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_new(cmp) SKM_sk_new(STACK_OF_X509_NAME_ENTRY, (cmp))
-# define sk_STACK_OF_X509_NAME_ENTRY_new_null() SKM_sk_new_null(STACK_OF_X509_NAME_ENTRY)
-# define sk_STACK_OF_X509_NAME_ENTRY_free(st) SKM_sk_free(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_num(st) SKM_sk_num(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_value(st, i) SKM_sk_value(STACK_OF_X509_NAME_ENTRY, (st), (i))
-# define sk_STACK_OF_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(STACK_OF_X509_NAME_ENTRY, (st), (i), (val))
-# define sk_STACK_OF_X509_NAME_ENTRY_zero(st) SKM_sk_zero(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_push(st, val) SKM_sk_push(STACK_OF_X509_NAME_ENTRY, (st), (val))
-# define sk_STACK_OF_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(STACK_OF_X509_NAME_ENTRY, (st), (val))
-# define sk_STACK_OF_X509_NAME_ENTRY_find(st, val) SKM_sk_find(STACK_OF_X509_NAME_ENTRY, (st), (val))
-# define sk_STACK_OF_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(STACK_OF_X509_NAME_ENTRY, (st), (val))
-# define sk_STACK_OF_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(STACK_OF_X509_NAME_ENTRY, (st), (i))
-# define sk_STACK_OF_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(STACK_OF_X509_NAME_ENTRY, (st), (ptr))
-# define sk_STACK_OF_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(STACK_OF_X509_NAME_ENTRY, (st), (val), (i))
-# define sk_STACK_OF_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STACK_OF_X509_NAME_ENTRY, (st), (cmp))
-# define sk_STACK_OF_X509_NAME_ENTRY_dup(st) SKM_sk_dup(STACK_OF_X509_NAME_ENTRY, st)
-# define sk_STACK_OF_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(STACK_OF_X509_NAME_ENTRY, (st), (free_func))
-# define sk_STACK_OF_X509_NAME_ENTRY_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(STACK_OF_X509_NAME_ENTRY, (st), (copy_func), (free_func))
-# define sk_STACK_OF_X509_NAME_ENTRY_shift(st) SKM_sk_shift(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_pop(st) SKM_sk_pop(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_sort(st) SKM_sk_sort(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STORE_ATTR_INFO_new(cmp) SKM_sk_new(STORE_ATTR_INFO, (cmp))
-# define sk_STORE_ATTR_INFO_new_null() SKM_sk_new_null(STORE_ATTR_INFO)
-# define sk_STORE_ATTR_INFO_free(st) SKM_sk_free(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_num(st) SKM_sk_num(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_value(st, i) SKM_sk_value(STORE_ATTR_INFO, (st), (i))
-# define sk_STORE_ATTR_INFO_set(st, i, val) SKM_sk_set(STORE_ATTR_INFO, (st), (i), (val))
-# define sk_STORE_ATTR_INFO_zero(st) SKM_sk_zero(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_push(st, val) SKM_sk_push(STORE_ATTR_INFO, (st), (val))
-# define sk_STORE_ATTR_INFO_unshift(st, val) SKM_sk_unshift(STORE_ATTR_INFO, (st), (val))
-# define sk_STORE_ATTR_INFO_find(st, val) SKM_sk_find(STORE_ATTR_INFO, (st), (val))
-# define sk_STORE_ATTR_INFO_find_ex(st, val) SKM_sk_find_ex(STORE_ATTR_INFO, (st), (val))
-# define sk_STORE_ATTR_INFO_delete(st, i) SKM_sk_delete(STORE_ATTR_INFO, (st), (i))
-# define sk_STORE_ATTR_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_ATTR_INFO, (st), (ptr))
-# define sk_STORE_ATTR_INFO_insert(st, val, i) SKM_sk_insert(STORE_ATTR_INFO, (st), (val), (i))
-# define sk_STORE_ATTR_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_ATTR_INFO, (st), (cmp))
-# define sk_STORE_ATTR_INFO_dup(st) SKM_sk_dup(STORE_ATTR_INFO, st)
-# define sk_STORE_ATTR_INFO_pop_free(st, free_func) SKM_sk_pop_free(STORE_ATTR_INFO, (st), (free_func))
-# define sk_STORE_ATTR_INFO_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(STORE_ATTR_INFO, (st), (copy_func), (free_func))
-# define sk_STORE_ATTR_INFO_shift(st) SKM_sk_shift(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_pop(st) SKM_sk_pop(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_sort(st) SKM_sk_sort(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_is_sorted(st) SKM_sk_is_sorted(STORE_ATTR_INFO, (st))
-# define sk_STORE_OBJECT_new(cmp) SKM_sk_new(STORE_OBJECT, (cmp))
-# define sk_STORE_OBJECT_new_null() SKM_sk_new_null(STORE_OBJECT)
-# define sk_STORE_OBJECT_free(st) SKM_sk_free(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_num(st) SKM_sk_num(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_value(st, i) SKM_sk_value(STORE_OBJECT, (st), (i))
-# define sk_STORE_OBJECT_set(st, i, val) SKM_sk_set(STORE_OBJECT, (st), (i), (val))
-# define sk_STORE_OBJECT_zero(st) SKM_sk_zero(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_push(st, val) SKM_sk_push(STORE_OBJECT, (st), (val))
-# define sk_STORE_OBJECT_unshift(st, val) SKM_sk_unshift(STORE_OBJECT, (st), (val))
-# define sk_STORE_OBJECT_find(st, val) SKM_sk_find(STORE_OBJECT, (st), (val))
-# define sk_STORE_OBJECT_find_ex(st, val) SKM_sk_find_ex(STORE_OBJECT, (st), (val))
-# define sk_STORE_OBJECT_delete(st, i) SKM_sk_delete(STORE_OBJECT, (st), (i))
-# define sk_STORE_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_OBJECT, (st), (ptr))
-# define sk_STORE_OBJECT_insert(st, val, i) SKM_sk_insert(STORE_OBJECT, (st), (val), (i))
-# define sk_STORE_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_OBJECT, (st), (cmp))
-# define sk_STORE_OBJECT_dup(st) SKM_sk_dup(STORE_OBJECT, st)
-# define sk_STORE_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(STORE_OBJECT, (st), (free_func))
-# define sk_STORE_OBJECT_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(STORE_OBJECT, (st), (copy_func), (free_func))
-# define sk_STORE_OBJECT_shift(st) SKM_sk_shift(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_pop(st) SKM_sk_pop(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_sort(st) SKM_sk_sort(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_is_sorted(st) SKM_sk_is_sorted(STORE_OBJECT, (st))
-# define sk_SXNETID_new(cmp) SKM_sk_new(SXNETID, (cmp))
-# define sk_SXNETID_new_null() SKM_sk_new_null(SXNETID)
-# define sk_SXNETID_free(st) SKM_sk_free(SXNETID, (st))
-# define sk_SXNETID_num(st) SKM_sk_num(SXNETID, (st))
-# define sk_SXNETID_value(st, i) SKM_sk_value(SXNETID, (st), (i))
-# define sk_SXNETID_set(st, i, val) SKM_sk_set(SXNETID, (st), (i), (val))
-# define sk_SXNETID_zero(st) SKM_sk_zero(SXNETID, (st))
-# define sk_SXNETID_push(st, val) SKM_sk_push(SXNETID, (st), (val))
-# define sk_SXNETID_unshift(st, val) SKM_sk_unshift(SXNETID, (st), (val))
-# define sk_SXNETID_find(st, val) SKM_sk_find(SXNETID, (st), (val))
-# define sk_SXNETID_find_ex(st, val) SKM_sk_find_ex(SXNETID, (st), (val))
-# define sk_SXNETID_delete(st, i) SKM_sk_delete(SXNETID, (st), (i))
-# define sk_SXNETID_delete_ptr(st, ptr) SKM_sk_delete_ptr(SXNETID, (st), (ptr))
-# define sk_SXNETID_insert(st, val, i) SKM_sk_insert(SXNETID, (st), (val), (i))
-# define sk_SXNETID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SXNETID, (st), (cmp))
-# define sk_SXNETID_dup(st) SKM_sk_dup(SXNETID, st)
-# define sk_SXNETID_pop_free(st, free_func) SKM_sk_pop_free(SXNETID, (st), (free_func))
-# define sk_SXNETID_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(SXNETID, (st), (copy_func), (free_func))
-# define sk_SXNETID_shift(st) SKM_sk_shift(SXNETID, (st))
-# define sk_SXNETID_pop(st) SKM_sk_pop(SXNETID, (st))
-# define sk_SXNETID_sort(st) SKM_sk_sort(SXNETID, (st))
-# define sk_SXNETID_is_sorted(st) SKM_sk_is_sorted(SXNETID, (st))
-# define sk_UI_STRING_new(cmp) SKM_sk_new(UI_STRING, (cmp))
-# define sk_UI_STRING_new_null() SKM_sk_new_null(UI_STRING)
-# define sk_UI_STRING_free(st) SKM_sk_free(UI_STRING, (st))
-# define sk_UI_STRING_num(st) SKM_sk_num(UI_STRING, (st))
-# define sk_UI_STRING_value(st, i) SKM_sk_value(UI_STRING, (st), (i))
-# define sk_UI_STRING_set(st, i, val) SKM_sk_set(UI_STRING, (st), (i), (val))
-# define sk_UI_STRING_zero(st) SKM_sk_zero(UI_STRING, (st))
-# define sk_UI_STRING_push(st, val) SKM_sk_push(UI_STRING, (st), (val))
-# define sk_UI_STRING_unshift(st, val) SKM_sk_unshift(UI_STRING, (st), (val))
-# define sk_UI_STRING_find(st, val) SKM_sk_find(UI_STRING, (st), (val))
-# define sk_UI_STRING_find_ex(st, val) SKM_sk_find_ex(UI_STRING, (st), (val))
-# define sk_UI_STRING_delete(st, i) SKM_sk_delete(UI_STRING, (st), (i))
-# define sk_UI_STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(UI_STRING, (st), (ptr))
-# define sk_UI_STRING_insert(st, val, i) SKM_sk_insert(UI_STRING, (st), (val), (i))
-# define sk_UI_STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(UI_STRING, (st), (cmp))
-# define sk_UI_STRING_dup(st) SKM_sk_dup(UI_STRING, st)
-# define sk_UI_STRING_pop_free(st, free_func) SKM_sk_pop_free(UI_STRING, (st), (free_func))
-# define sk_UI_STRING_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(UI_STRING, (st), (copy_func), (free_func))
-# define sk_UI_STRING_shift(st) SKM_sk_shift(UI_STRING, (st))
-# define sk_UI_STRING_pop(st) SKM_sk_pop(UI_STRING, (st))
-# define sk_UI_STRING_sort(st) SKM_sk_sort(UI_STRING, (st))
-# define sk_UI_STRING_is_sorted(st) SKM_sk_is_sorted(UI_STRING, (st))
-# define sk_X509_new(cmp) SKM_sk_new(X509, (cmp))
-# define sk_X509_new_null() SKM_sk_new_null(X509)
-# define sk_X509_free(st) SKM_sk_free(X509, (st))
-# define sk_X509_num(st) SKM_sk_num(X509, (st))
-# define sk_X509_value(st, i) SKM_sk_value(X509, (st), (i))
-# define sk_X509_set(st, i, val) SKM_sk_set(X509, (st), (i), (val))
-# define sk_X509_zero(st) SKM_sk_zero(X509, (st))
-# define sk_X509_push(st, val) SKM_sk_push(X509, (st), (val))
-# define sk_X509_unshift(st, val) SKM_sk_unshift(X509, (st), (val))
-# define sk_X509_find(st, val) SKM_sk_find(X509, (st), (val))
-# define sk_X509_find_ex(st, val) SKM_sk_find_ex(X509, (st), (val))
-# define sk_X509_delete(st, i) SKM_sk_delete(X509, (st), (i))
-# define sk_X509_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509, (st), (ptr))
-# define sk_X509_insert(st, val, i) SKM_sk_insert(X509, (st), (val), (i))
-# define sk_X509_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509, (st), (cmp))
-# define sk_X509_dup(st) SKM_sk_dup(X509, st)
-# define sk_X509_pop_free(st, free_func) SKM_sk_pop_free(X509, (st), (free_func))
-# define sk_X509_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509, (st), (copy_func), (free_func))
-# define sk_X509_shift(st) SKM_sk_shift(X509, (st))
-# define sk_X509_pop(st) SKM_sk_pop(X509, (st))
-# define sk_X509_sort(st) SKM_sk_sort(X509, (st))
-# define sk_X509_is_sorted(st) SKM_sk_is_sorted(X509, (st))
-# define sk_X509V3_EXT_METHOD_new(cmp) SKM_sk_new(X509V3_EXT_METHOD, (cmp))
-# define sk_X509V3_EXT_METHOD_new_null() SKM_sk_new_null(X509V3_EXT_METHOD)
-# define sk_X509V3_EXT_METHOD_free(st) SKM_sk_free(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_num(st) SKM_sk_num(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_value(st, i) SKM_sk_value(X509V3_EXT_METHOD, (st), (i))
-# define sk_X509V3_EXT_METHOD_set(st, i, val) SKM_sk_set(X509V3_EXT_METHOD, (st), (i), (val))
-# define sk_X509V3_EXT_METHOD_zero(st) SKM_sk_zero(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_push(st, val) SKM_sk_push(X509V3_EXT_METHOD, (st), (val))
-# define sk_X509V3_EXT_METHOD_unshift(st, val) SKM_sk_unshift(X509V3_EXT_METHOD, (st), (val))
-# define sk_X509V3_EXT_METHOD_find(st, val) SKM_sk_find(X509V3_EXT_METHOD, (st), (val))
-# define sk_X509V3_EXT_METHOD_find_ex(st, val) SKM_sk_find_ex(X509V3_EXT_METHOD, (st), (val))
-# define sk_X509V3_EXT_METHOD_delete(st, i) SKM_sk_delete(X509V3_EXT_METHOD, (st), (i))
-# define sk_X509V3_EXT_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509V3_EXT_METHOD, (st), (ptr))
-# define sk_X509V3_EXT_METHOD_insert(st, val, i) SKM_sk_insert(X509V3_EXT_METHOD, (st), (val), (i))
-# define sk_X509V3_EXT_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509V3_EXT_METHOD, (st), (cmp))
-# define sk_X509V3_EXT_METHOD_dup(st) SKM_sk_dup(X509V3_EXT_METHOD, st)
-# define sk_X509V3_EXT_METHOD_pop_free(st, free_func) SKM_sk_pop_free(X509V3_EXT_METHOD, (st), (free_func))
-# define sk_X509V3_EXT_METHOD_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509V3_EXT_METHOD, (st), (copy_func), (free_func))
-# define sk_X509V3_EXT_METHOD_shift(st) SKM_sk_shift(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_pop(st) SKM_sk_pop(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_sort(st) SKM_sk_sort(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_is_sorted(st) SKM_sk_is_sorted(X509V3_EXT_METHOD, (st))
-# define sk_X509_ALGOR_new(cmp) SKM_sk_new(X509_ALGOR, (cmp))
-# define sk_X509_ALGOR_new_null() SKM_sk_new_null(X509_ALGOR)
-# define sk_X509_ALGOR_free(st) SKM_sk_free(X509_ALGOR, (st))
-# define sk_X509_ALGOR_num(st) SKM_sk_num(X509_ALGOR, (st))
-# define sk_X509_ALGOR_value(st, i) SKM_sk_value(X509_ALGOR, (st), (i))
-# define sk_X509_ALGOR_set(st, i, val) SKM_sk_set(X509_ALGOR, (st), (i), (val))
-# define sk_X509_ALGOR_zero(st) SKM_sk_zero(X509_ALGOR, (st))
-# define sk_X509_ALGOR_push(st, val) SKM_sk_push(X509_ALGOR, (st), (val))
-# define sk_X509_ALGOR_unshift(st, val) SKM_sk_unshift(X509_ALGOR, (st), (val))
-# define sk_X509_ALGOR_find(st, val) SKM_sk_find(X509_ALGOR, (st), (val))
-# define sk_X509_ALGOR_find_ex(st, val) SKM_sk_find_ex(X509_ALGOR, (st), (val))
-# define sk_X509_ALGOR_delete(st, i) SKM_sk_delete(X509_ALGOR, (st), (i))
-# define sk_X509_ALGOR_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ALGOR, (st), (ptr))
-# define sk_X509_ALGOR_insert(st, val, i) SKM_sk_insert(X509_ALGOR, (st), (val), (i))
-# define sk_X509_ALGOR_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ALGOR, (st), (cmp))
-# define sk_X509_ALGOR_dup(st) SKM_sk_dup(X509_ALGOR, st)
-# define sk_X509_ALGOR_pop_free(st, free_func) SKM_sk_pop_free(X509_ALGOR, (st), (free_func))
-# define sk_X509_ALGOR_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_ALGOR, (st), (copy_func), (free_func))
-# define sk_X509_ALGOR_shift(st) SKM_sk_shift(X509_ALGOR, (st))
-# define sk_X509_ALGOR_pop(st) SKM_sk_pop(X509_ALGOR, (st))
-# define sk_X509_ALGOR_sort(st) SKM_sk_sort(X509_ALGOR, (st))
-# define sk_X509_ALGOR_is_sorted(st) SKM_sk_is_sorted(X509_ALGOR, (st))
-# define sk_X509_ATTRIBUTE_new(cmp) SKM_sk_new(X509_ATTRIBUTE, (cmp))
-# define sk_X509_ATTRIBUTE_new_null() SKM_sk_new_null(X509_ATTRIBUTE)
-# define sk_X509_ATTRIBUTE_free(st) SKM_sk_free(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_num(st) SKM_sk_num(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_value(st, i) SKM_sk_value(X509_ATTRIBUTE, (st), (i))
-# define sk_X509_ATTRIBUTE_set(st, i, val) SKM_sk_set(X509_ATTRIBUTE, (st), (i), (val))
-# define sk_X509_ATTRIBUTE_zero(st) SKM_sk_zero(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_push(st, val) SKM_sk_push(X509_ATTRIBUTE, (st), (val))
-# define sk_X509_ATTRIBUTE_unshift(st, val) SKM_sk_unshift(X509_ATTRIBUTE, (st), (val))
-# define sk_X509_ATTRIBUTE_find(st, val) SKM_sk_find(X509_ATTRIBUTE, (st), (val))
-# define sk_X509_ATTRIBUTE_find_ex(st, val) SKM_sk_find_ex(X509_ATTRIBUTE, (st), (val))
-# define sk_X509_ATTRIBUTE_delete(st, i) SKM_sk_delete(X509_ATTRIBUTE, (st), (i))
-# define sk_X509_ATTRIBUTE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ATTRIBUTE, (st), (ptr))
-# define sk_X509_ATTRIBUTE_insert(st, val, i) SKM_sk_insert(X509_ATTRIBUTE, (st), (val), (i))
-# define sk_X509_ATTRIBUTE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ATTRIBUTE, (st), (cmp))
-# define sk_X509_ATTRIBUTE_dup(st) SKM_sk_dup(X509_ATTRIBUTE, st)
-# define sk_X509_ATTRIBUTE_pop_free(st, free_func) SKM_sk_pop_free(X509_ATTRIBUTE, (st), (free_func))
-# define sk_X509_ATTRIBUTE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_ATTRIBUTE, (st), (copy_func), (free_func))
-# define sk_X509_ATTRIBUTE_shift(st) SKM_sk_shift(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_pop(st) SKM_sk_pop(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_sort(st) SKM_sk_sort(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_is_sorted(st) SKM_sk_is_sorted(X509_ATTRIBUTE, (st))
-# define sk_X509_CRL_new(cmp) SKM_sk_new(X509_CRL, (cmp))
-# define sk_X509_CRL_new_null() SKM_sk_new_null(X509_CRL)
-# define sk_X509_CRL_free(st) SKM_sk_free(X509_CRL, (st))
-# define sk_X509_CRL_num(st) SKM_sk_num(X509_CRL, (st))
-# define sk_X509_CRL_value(st, i) SKM_sk_value(X509_CRL, (st), (i))
-# define sk_X509_CRL_set(st, i, val) SKM_sk_set(X509_CRL, (st), (i), (val))
-# define sk_X509_CRL_zero(st) SKM_sk_zero(X509_CRL, (st))
-# define sk_X509_CRL_push(st, val) SKM_sk_push(X509_CRL, (st), (val))
-# define sk_X509_CRL_unshift(st, val) SKM_sk_unshift(X509_CRL, (st), (val))
-# define sk_X509_CRL_find(st, val) SKM_sk_find(X509_CRL, (st), (val))
-# define sk_X509_CRL_find_ex(st, val) SKM_sk_find_ex(X509_CRL, (st), (val))
-# define sk_X509_CRL_delete(st, i) SKM_sk_delete(X509_CRL, (st), (i))
-# define sk_X509_CRL_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_CRL, (st), (ptr))
-# define sk_X509_CRL_insert(st, val, i) SKM_sk_insert(X509_CRL, (st), (val), (i))
-# define sk_X509_CRL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_CRL, (st), (cmp))
-# define sk_X509_CRL_dup(st) SKM_sk_dup(X509_CRL, st)
-# define sk_X509_CRL_pop_free(st, free_func) SKM_sk_pop_free(X509_CRL, (st), (free_func))
-# define sk_X509_CRL_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_CRL, (st), (copy_func), (free_func))
-# define sk_X509_CRL_shift(st) SKM_sk_shift(X509_CRL, (st))
-# define sk_X509_CRL_pop(st) SKM_sk_pop(X509_CRL, (st))
-# define sk_X509_CRL_sort(st) SKM_sk_sort(X509_CRL, (st))
-# define sk_X509_CRL_is_sorted(st) SKM_sk_is_sorted(X509_CRL, (st))
-# define sk_X509_EXTENSION_new(cmp) SKM_sk_new(X509_EXTENSION, (cmp))
-# define sk_X509_EXTENSION_new_null() SKM_sk_new_null(X509_EXTENSION)
-# define sk_X509_EXTENSION_free(st) SKM_sk_free(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_num(st) SKM_sk_num(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_value(st, i) SKM_sk_value(X509_EXTENSION, (st), (i))
-# define sk_X509_EXTENSION_set(st, i, val) SKM_sk_set(X509_EXTENSION, (st), (i), (val))
-# define sk_X509_EXTENSION_zero(st) SKM_sk_zero(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_push(st, val) SKM_sk_push(X509_EXTENSION, (st), (val))
-# define sk_X509_EXTENSION_unshift(st, val) SKM_sk_unshift(X509_EXTENSION, (st), (val))
-# define sk_X509_EXTENSION_find(st, val) SKM_sk_find(X509_EXTENSION, (st), (val))
-# define sk_X509_EXTENSION_find_ex(st, val) SKM_sk_find_ex(X509_EXTENSION, (st), (val))
-# define sk_X509_EXTENSION_delete(st, i) SKM_sk_delete(X509_EXTENSION, (st), (i))
-# define sk_X509_EXTENSION_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_EXTENSION, (st), (ptr))
-# define sk_X509_EXTENSION_insert(st, val, i) SKM_sk_insert(X509_EXTENSION, (st), (val), (i))
-# define sk_X509_EXTENSION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_EXTENSION, (st), (cmp))
-# define sk_X509_EXTENSION_dup(st) SKM_sk_dup(X509_EXTENSION, st)
-# define sk_X509_EXTENSION_pop_free(st, free_func) SKM_sk_pop_free(X509_EXTENSION, (st), (free_func))
-# define sk_X509_EXTENSION_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_EXTENSION, (st), (copy_func), (free_func))
-# define sk_X509_EXTENSION_shift(st) SKM_sk_shift(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_pop(st) SKM_sk_pop(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_sort(st) SKM_sk_sort(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_is_sorted(st) SKM_sk_is_sorted(X509_EXTENSION, (st))
-# define sk_X509_INFO_new(cmp) SKM_sk_new(X509_INFO, (cmp))
-# define sk_X509_INFO_new_null() SKM_sk_new_null(X509_INFO)
-# define sk_X509_INFO_free(st) SKM_sk_free(X509_INFO, (st))
-# define sk_X509_INFO_num(st) SKM_sk_num(X509_INFO, (st))
-# define sk_X509_INFO_value(st, i) SKM_sk_value(X509_INFO, (st), (i))
-# define sk_X509_INFO_set(st, i, val) SKM_sk_set(X509_INFO, (st), (i), (val))
-# define sk_X509_INFO_zero(st) SKM_sk_zero(X509_INFO, (st))
-# define sk_X509_INFO_push(st, val) SKM_sk_push(X509_INFO, (st), (val))
-# define sk_X509_INFO_unshift(st, val) SKM_sk_unshift(X509_INFO, (st), (val))
-# define sk_X509_INFO_find(st, val) SKM_sk_find(X509_INFO, (st), (val))
-# define sk_X509_INFO_find_ex(st, val) SKM_sk_find_ex(X509_INFO, (st), (val))
-# define sk_X509_INFO_delete(st, i) SKM_sk_delete(X509_INFO, (st), (i))
-# define sk_X509_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_INFO, (st), (ptr))
-# define sk_X509_INFO_insert(st, val, i) SKM_sk_insert(X509_INFO, (st), (val), (i))
-# define sk_X509_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_INFO, (st), (cmp))
-# define sk_X509_INFO_dup(st) SKM_sk_dup(X509_INFO, st)
-# define sk_X509_INFO_pop_free(st, free_func) SKM_sk_pop_free(X509_INFO, (st), (free_func))
-# define sk_X509_INFO_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_INFO, (st), (copy_func), (free_func))
-# define sk_X509_INFO_shift(st) SKM_sk_shift(X509_INFO, (st))
-# define sk_X509_INFO_pop(st) SKM_sk_pop(X509_INFO, (st))
-# define sk_X509_INFO_sort(st) SKM_sk_sort(X509_INFO, (st))
-# define sk_X509_INFO_is_sorted(st) SKM_sk_is_sorted(X509_INFO, (st))
-# define sk_X509_LOOKUP_new(cmp) SKM_sk_new(X509_LOOKUP, (cmp))
-# define sk_X509_LOOKUP_new_null() SKM_sk_new_null(X509_LOOKUP)
-# define sk_X509_LOOKUP_free(st) SKM_sk_free(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_num(st) SKM_sk_num(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_value(st, i) SKM_sk_value(X509_LOOKUP, (st), (i))
-# define sk_X509_LOOKUP_set(st, i, val) SKM_sk_set(X509_LOOKUP, (st), (i), (val))
-# define sk_X509_LOOKUP_zero(st) SKM_sk_zero(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_push(st, val) SKM_sk_push(X509_LOOKUP, (st), (val))
-# define sk_X509_LOOKUP_unshift(st, val) SKM_sk_unshift(X509_LOOKUP, (st), (val))
-# define sk_X509_LOOKUP_find(st, val) SKM_sk_find(X509_LOOKUP, (st), (val))
-# define sk_X509_LOOKUP_find_ex(st, val) SKM_sk_find_ex(X509_LOOKUP, (st), (val))
-# define sk_X509_LOOKUP_delete(st, i) SKM_sk_delete(X509_LOOKUP, (st), (i))
-# define sk_X509_LOOKUP_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_LOOKUP, (st), (ptr))
-# define sk_X509_LOOKUP_insert(st, val, i) SKM_sk_insert(X509_LOOKUP, (st), (val), (i))
-# define sk_X509_LOOKUP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_LOOKUP, (st), (cmp))
-# define sk_X509_LOOKUP_dup(st) SKM_sk_dup(X509_LOOKUP, st)
-# define sk_X509_LOOKUP_pop_free(st, free_func) SKM_sk_pop_free(X509_LOOKUP, (st), (free_func))
-# define sk_X509_LOOKUP_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_LOOKUP, (st), (copy_func), (free_func))
-# define sk_X509_LOOKUP_shift(st) SKM_sk_shift(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_pop(st) SKM_sk_pop(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_sort(st) SKM_sk_sort(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_is_sorted(st) SKM_sk_is_sorted(X509_LOOKUP, (st))
-# define sk_X509_NAME_new(cmp) SKM_sk_new(X509_NAME, (cmp))
-# define sk_X509_NAME_new_null() SKM_sk_new_null(X509_NAME)
-# define sk_X509_NAME_free(st) SKM_sk_free(X509_NAME, (st))
-# define sk_X509_NAME_num(st) SKM_sk_num(X509_NAME, (st))
-# define sk_X509_NAME_value(st, i) SKM_sk_value(X509_NAME, (st), (i))
-# define sk_X509_NAME_set(st, i, val) SKM_sk_set(X509_NAME, (st), (i), (val))
-# define sk_X509_NAME_zero(st) SKM_sk_zero(X509_NAME, (st))
-# define sk_X509_NAME_push(st, val) SKM_sk_push(X509_NAME, (st), (val))
-# define sk_X509_NAME_unshift(st, val) SKM_sk_unshift(X509_NAME, (st), (val))
-# define sk_X509_NAME_find(st, val) SKM_sk_find(X509_NAME, (st), (val))
-# define sk_X509_NAME_find_ex(st, val) SKM_sk_find_ex(X509_NAME, (st), (val))
-# define sk_X509_NAME_delete(st, i) SKM_sk_delete(X509_NAME, (st), (i))
-# define sk_X509_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME, (st), (ptr))
-# define sk_X509_NAME_insert(st, val, i) SKM_sk_insert(X509_NAME, (st), (val), (i))
-# define sk_X509_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME, (st), (cmp))
-# define sk_X509_NAME_dup(st) SKM_sk_dup(X509_NAME, st)
-# define sk_X509_NAME_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME, (st), (free_func))
-# define sk_X509_NAME_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_NAME, (st), (copy_func), (free_func))
-# define sk_X509_NAME_shift(st) SKM_sk_shift(X509_NAME, (st))
-# define sk_X509_NAME_pop(st) SKM_sk_pop(X509_NAME, (st))
-# define sk_X509_NAME_sort(st) SKM_sk_sort(X509_NAME, (st))
-# define sk_X509_NAME_is_sorted(st) SKM_sk_is_sorted(X509_NAME, (st))
-# define sk_X509_NAME_ENTRY_new(cmp) SKM_sk_new(X509_NAME_ENTRY, (cmp))
-# define sk_X509_NAME_ENTRY_new_null() SKM_sk_new_null(X509_NAME_ENTRY)
-# define sk_X509_NAME_ENTRY_free(st) SKM_sk_free(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_num(st) SKM_sk_num(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_value(st, i) SKM_sk_value(X509_NAME_ENTRY, (st), (i))
-# define sk_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(X509_NAME_ENTRY, (st), (i), (val))
-# define sk_X509_NAME_ENTRY_zero(st) SKM_sk_zero(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_push(st, val) SKM_sk_push(X509_NAME_ENTRY, (st), (val))
-# define sk_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(X509_NAME_ENTRY, (st), (val))
-# define sk_X509_NAME_ENTRY_find(st, val) SKM_sk_find(X509_NAME_ENTRY, (st), (val))
-# define sk_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(X509_NAME_ENTRY, (st), (val))
-# define sk_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(X509_NAME_ENTRY, (st), (i))
-# define sk_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME_ENTRY, (st), (ptr))
-# define sk_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(X509_NAME_ENTRY, (st), (val), (i))
-# define sk_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME_ENTRY, (st), (cmp))
-# define sk_X509_NAME_ENTRY_dup(st) SKM_sk_dup(X509_NAME_ENTRY, st)
-# define sk_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME_ENTRY, (st), (free_func))
-# define sk_X509_NAME_ENTRY_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_NAME_ENTRY, (st), (copy_func), (free_func))
-# define sk_X509_NAME_ENTRY_shift(st) SKM_sk_shift(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_pop(st) SKM_sk_pop(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_sort(st) SKM_sk_sort(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(X509_NAME_ENTRY, (st))
-# define sk_X509_OBJECT_new(cmp) SKM_sk_new(X509_OBJECT, (cmp))
-# define sk_X509_OBJECT_new_null() SKM_sk_new_null(X509_OBJECT)
-# define sk_X509_OBJECT_free(st) SKM_sk_free(X509_OBJECT, (st))
-# define sk_X509_OBJECT_num(st) SKM_sk_num(X509_OBJECT, (st))
-# define sk_X509_OBJECT_value(st, i) SKM_sk_value(X509_OBJECT, (st), (i))
-# define sk_X509_OBJECT_set(st, i, val) SKM_sk_set(X509_OBJECT, (st), (i), (val))
-# define sk_X509_OBJECT_zero(st) SKM_sk_zero(X509_OBJECT, (st))
-# define sk_X509_OBJECT_push(st, val) SKM_sk_push(X509_OBJECT, (st), (val))
-# define sk_X509_OBJECT_unshift(st, val) SKM_sk_unshift(X509_OBJECT, (st), (val))
-# define sk_X509_OBJECT_find(st, val) SKM_sk_find(X509_OBJECT, (st), (val))
-# define sk_X509_OBJECT_find_ex(st, val) SKM_sk_find_ex(X509_OBJECT, (st), (val))
-# define sk_X509_OBJECT_delete(st, i) SKM_sk_delete(X509_OBJECT, (st), (i))
-# define sk_X509_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_OBJECT, (st), (ptr))
-# define sk_X509_OBJECT_insert(st, val, i) SKM_sk_insert(X509_OBJECT, (st), (val), (i))
-# define sk_X509_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_OBJECT, (st), (cmp))
-# define sk_X509_OBJECT_dup(st) SKM_sk_dup(X509_OBJECT, st)
-# define sk_X509_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(X509_OBJECT, (st), (free_func))
-# define sk_X509_OBJECT_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_OBJECT, (st), (copy_func), (free_func))
-# define sk_X509_OBJECT_shift(st) SKM_sk_shift(X509_OBJECT, (st))
-# define sk_X509_OBJECT_pop(st) SKM_sk_pop(X509_OBJECT, (st))
-# define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st))
-# define sk_X509_OBJECT_is_sorted(st) SKM_sk_is_sorted(X509_OBJECT, (st))
-# define sk_X509_POLICY_DATA_new(cmp) SKM_sk_new(X509_POLICY_DATA, (cmp))
-# define sk_X509_POLICY_DATA_new_null() SKM_sk_new_null(X509_POLICY_DATA)
-# define sk_X509_POLICY_DATA_free(st) SKM_sk_free(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_num(st) SKM_sk_num(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_value(st, i) SKM_sk_value(X509_POLICY_DATA, (st), (i))
-# define sk_X509_POLICY_DATA_set(st, i, val) SKM_sk_set(X509_POLICY_DATA, (st), (i), (val))
-# define sk_X509_POLICY_DATA_zero(st) SKM_sk_zero(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_push(st, val) SKM_sk_push(X509_POLICY_DATA, (st), (val))
-# define sk_X509_POLICY_DATA_unshift(st, val) SKM_sk_unshift(X509_POLICY_DATA, (st), (val))
-# define sk_X509_POLICY_DATA_find(st, val) SKM_sk_find(X509_POLICY_DATA, (st), (val))
-# define sk_X509_POLICY_DATA_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_DATA, (st), (val))
-# define sk_X509_POLICY_DATA_delete(st, i) SKM_sk_delete(X509_POLICY_DATA, (st), (i))
-# define sk_X509_POLICY_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_DATA, (st), (ptr))
-# define sk_X509_POLICY_DATA_insert(st, val, i) SKM_sk_insert(X509_POLICY_DATA, (st), (val), (i))
-# define sk_X509_POLICY_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_DATA, (st), (cmp))
-# define sk_X509_POLICY_DATA_dup(st) SKM_sk_dup(X509_POLICY_DATA, st)
-# define sk_X509_POLICY_DATA_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_DATA, (st), (free_func))
-# define sk_X509_POLICY_DATA_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_POLICY_DATA, (st), (copy_func), (free_func))
-# define sk_X509_POLICY_DATA_shift(st) SKM_sk_shift(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_pop(st) SKM_sk_pop(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_sort(st) SKM_sk_sort(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_NODE_new(cmp) SKM_sk_new(X509_POLICY_NODE, (cmp))
-# define sk_X509_POLICY_NODE_new_null() SKM_sk_new_null(X509_POLICY_NODE)
-# define sk_X509_POLICY_NODE_free(st) SKM_sk_free(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_num(st) SKM_sk_num(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_value(st, i) SKM_sk_value(X509_POLICY_NODE, (st), (i))
-# define sk_X509_POLICY_NODE_set(st, i, val) SKM_sk_set(X509_POLICY_NODE, (st), (i), (val))
-# define sk_X509_POLICY_NODE_zero(st) SKM_sk_zero(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_push(st, val) SKM_sk_push(X509_POLICY_NODE, (st), (val))
-# define sk_X509_POLICY_NODE_unshift(st, val) SKM_sk_unshift(X509_POLICY_NODE, (st), (val))
-# define sk_X509_POLICY_NODE_find(st, val) SKM_sk_find(X509_POLICY_NODE, (st), (val))
-# define sk_X509_POLICY_NODE_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_NODE, (st), (val))
-# define sk_X509_POLICY_NODE_delete(st, i) SKM_sk_delete(X509_POLICY_NODE, (st), (i))
-# define sk_X509_POLICY_NODE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_NODE, (st), (ptr))
-# define sk_X509_POLICY_NODE_insert(st, val, i) SKM_sk_insert(X509_POLICY_NODE, (st), (val), (i))
-# define sk_X509_POLICY_NODE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_NODE, (st), (cmp))
-# define sk_X509_POLICY_NODE_dup(st) SKM_sk_dup(X509_POLICY_NODE, st)
-# define sk_X509_POLICY_NODE_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_NODE, (st), (free_func))
-# define sk_X509_POLICY_NODE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_POLICY_NODE, (st), (copy_func), (free_func))
-# define sk_X509_POLICY_NODE_shift(st) SKM_sk_shift(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_pop(st) SKM_sk_pop(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_sort(st) SKM_sk_sort(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_NODE, (st))
-# define sk_X509_PURPOSE_new(cmp) SKM_sk_new(X509_PURPOSE, (cmp))
-# define sk_X509_PURPOSE_new_null() SKM_sk_new_null(X509_PURPOSE)
-# define sk_X509_PURPOSE_free(st) SKM_sk_free(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_num(st) SKM_sk_num(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_value(st, i) SKM_sk_value(X509_PURPOSE, (st), (i))
-# define sk_X509_PURPOSE_set(st, i, val) SKM_sk_set(X509_PURPOSE, (st), (i), (val))
-# define sk_X509_PURPOSE_zero(st) SKM_sk_zero(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_push(st, val) SKM_sk_push(X509_PURPOSE, (st), (val))
-# define sk_X509_PURPOSE_unshift(st, val) SKM_sk_unshift(X509_PURPOSE, (st), (val))
-# define sk_X509_PURPOSE_find(st, val) SKM_sk_find(X509_PURPOSE, (st), (val))
-# define sk_X509_PURPOSE_find_ex(st, val) SKM_sk_find_ex(X509_PURPOSE, (st), (val))
-# define sk_X509_PURPOSE_delete(st, i) SKM_sk_delete(X509_PURPOSE, (st), (i))
-# define sk_X509_PURPOSE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_PURPOSE, (st), (ptr))
-# define sk_X509_PURPOSE_insert(st, val, i) SKM_sk_insert(X509_PURPOSE, (st), (val), (i))
-# define sk_X509_PURPOSE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_PURPOSE, (st), (cmp))
-# define sk_X509_PURPOSE_dup(st) SKM_sk_dup(X509_PURPOSE, st)
-# define sk_X509_PURPOSE_pop_free(st, free_func) SKM_sk_pop_free(X509_PURPOSE, (st), (free_func))
-# define sk_X509_PURPOSE_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_PURPOSE, (st), (copy_func), (free_func))
-# define sk_X509_PURPOSE_shift(st) SKM_sk_shift(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_pop(st) SKM_sk_pop(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_sort(st) SKM_sk_sort(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_is_sorted(st) SKM_sk_is_sorted(X509_PURPOSE, (st))
-# define sk_X509_REVOKED_new(cmp) SKM_sk_new(X509_REVOKED, (cmp))
-# define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED)
-# define sk_X509_REVOKED_free(st) SKM_sk_free(X509_REVOKED, (st))
-# define sk_X509_REVOKED_num(st) SKM_sk_num(X509_REVOKED, (st))
-# define sk_X509_REVOKED_value(st, i) SKM_sk_value(X509_REVOKED, (st), (i))
-# define sk_X509_REVOKED_set(st, i, val) SKM_sk_set(X509_REVOKED, (st), (i), (val))
-# define sk_X509_REVOKED_zero(st) SKM_sk_zero(X509_REVOKED, (st))
-# define sk_X509_REVOKED_push(st, val) SKM_sk_push(X509_REVOKED, (st), (val))
-# define sk_X509_REVOKED_unshift(st, val) SKM_sk_unshift(X509_REVOKED, (st), (val))
-# define sk_X509_REVOKED_find(st, val) SKM_sk_find(X509_REVOKED, (st), (val))
-# define sk_X509_REVOKED_find_ex(st, val) SKM_sk_find_ex(X509_REVOKED, (st), (val))
-# define sk_X509_REVOKED_delete(st, i) SKM_sk_delete(X509_REVOKED, (st), (i))
-# define sk_X509_REVOKED_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_REVOKED, (st), (ptr))
-# define sk_X509_REVOKED_insert(st, val, i) SKM_sk_insert(X509_REVOKED, (st), (val), (i))
-# define sk_X509_REVOKED_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_REVOKED, (st), (cmp))
-# define sk_X509_REVOKED_dup(st) SKM_sk_dup(X509_REVOKED, st)
-# define sk_X509_REVOKED_pop_free(st, free_func) SKM_sk_pop_free(X509_REVOKED, (st), (free_func))
-# define sk_X509_REVOKED_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_REVOKED, (st), (copy_func), (free_func))
-# define sk_X509_REVOKED_shift(st) SKM_sk_shift(X509_REVOKED, (st))
-# define sk_X509_REVOKED_pop(st) SKM_sk_pop(X509_REVOKED, (st))
-# define sk_X509_REVOKED_sort(st) SKM_sk_sort(X509_REVOKED, (st))
-# define sk_X509_REVOKED_is_sorted(st) SKM_sk_is_sorted(X509_REVOKED, (st))
-# define sk_X509_TRUST_new(cmp) SKM_sk_new(X509_TRUST, (cmp))
-# define sk_X509_TRUST_new_null() SKM_sk_new_null(X509_TRUST)
-# define sk_X509_TRUST_free(st) SKM_sk_free(X509_TRUST, (st))
-# define sk_X509_TRUST_num(st) SKM_sk_num(X509_TRUST, (st))
-# define sk_X509_TRUST_value(st, i) SKM_sk_value(X509_TRUST, (st), (i))
-# define sk_X509_TRUST_set(st, i, val) SKM_sk_set(X509_TRUST, (st), (i), (val))
-# define sk_X509_TRUST_zero(st) SKM_sk_zero(X509_TRUST, (st))
-# define sk_X509_TRUST_push(st, val) SKM_sk_push(X509_TRUST, (st), (val))
-# define sk_X509_TRUST_unshift(st, val) SKM_sk_unshift(X509_TRUST, (st), (val))
-# define sk_X509_TRUST_find(st, val) SKM_sk_find(X509_TRUST, (st), (val))
-# define sk_X509_TRUST_find_ex(st, val) SKM_sk_find_ex(X509_TRUST, (st), (val))
-# define sk_X509_TRUST_delete(st, i) SKM_sk_delete(X509_TRUST, (st), (i))
-# define sk_X509_TRUST_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_TRUST, (st), (ptr))
-# define sk_X509_TRUST_insert(st, val, i) SKM_sk_insert(X509_TRUST, (st), (val), (i))
-# define sk_X509_TRUST_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_TRUST, (st), (cmp))
-# define sk_X509_TRUST_dup(st) SKM_sk_dup(X509_TRUST, st)
-# define sk_X509_TRUST_pop_free(st, free_func) SKM_sk_pop_free(X509_TRUST, (st), (free_func))
-# define sk_X509_TRUST_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_TRUST, (st), (copy_func), (free_func))
-# define sk_X509_TRUST_shift(st) SKM_sk_shift(X509_TRUST, (st))
-# define sk_X509_TRUST_pop(st) SKM_sk_pop(X509_TRUST, (st))
-# define sk_X509_TRUST_sort(st) SKM_sk_sort(X509_TRUST, (st))
-# define sk_X509_TRUST_is_sorted(st) SKM_sk_is_sorted(X509_TRUST, (st))
-# define sk_X509_VERIFY_PARAM_new(cmp) SKM_sk_new(X509_VERIFY_PARAM, (cmp))
-# define sk_X509_VERIFY_PARAM_new_null() SKM_sk_new_null(X509_VERIFY_PARAM)
-# define sk_X509_VERIFY_PARAM_free(st) SKM_sk_free(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_num(st) SKM_sk_num(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_value(st, i) SKM_sk_value(X509_VERIFY_PARAM, (st), (i))
-# define sk_X509_VERIFY_PARAM_set(st, i, val) SKM_sk_set(X509_VERIFY_PARAM, (st), (i), (val))
-# define sk_X509_VERIFY_PARAM_zero(st) SKM_sk_zero(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_push(st, val) SKM_sk_push(X509_VERIFY_PARAM, (st), (val))
-# define sk_X509_VERIFY_PARAM_unshift(st, val) SKM_sk_unshift(X509_VERIFY_PARAM, (st), (val))
-# define sk_X509_VERIFY_PARAM_find(st, val) SKM_sk_find(X509_VERIFY_PARAM, (st), (val))
-# define sk_X509_VERIFY_PARAM_find_ex(st, val) SKM_sk_find_ex(X509_VERIFY_PARAM, (st), (val))
-# define sk_X509_VERIFY_PARAM_delete(st, i) SKM_sk_delete(X509_VERIFY_PARAM, (st), (i))
-# define sk_X509_VERIFY_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_VERIFY_PARAM, (st), (ptr))
-# define sk_X509_VERIFY_PARAM_insert(st, val, i) SKM_sk_insert(X509_VERIFY_PARAM, (st), (val), (i))
-# define sk_X509_VERIFY_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_VERIFY_PARAM, (st), (cmp))
-# define sk_X509_VERIFY_PARAM_dup(st) SKM_sk_dup(X509_VERIFY_PARAM, st)
-# define sk_X509_VERIFY_PARAM_pop_free(st, free_func) SKM_sk_pop_free(X509_VERIFY_PARAM, (st), (free_func))
-# define sk_X509_VERIFY_PARAM_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(X509_VERIFY_PARAM, (st), (copy_func), (free_func))
-# define sk_X509_VERIFY_PARAM_shift(st) SKM_sk_shift(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_pop(st) SKM_sk_pop(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_sort(st) SKM_sk_sort(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_is_sorted(st) SKM_sk_is_sorted(X509_VERIFY_PARAM, (st))
-# define sk_nid_triple_new(cmp) SKM_sk_new(nid_triple, (cmp))
-# define sk_nid_triple_new_null() SKM_sk_new_null(nid_triple)
-# define sk_nid_triple_free(st) SKM_sk_free(nid_triple, (st))
-# define sk_nid_triple_num(st) SKM_sk_num(nid_triple, (st))
-# define sk_nid_triple_value(st, i) SKM_sk_value(nid_triple, (st), (i))
-# define sk_nid_triple_set(st, i, val) SKM_sk_set(nid_triple, (st), (i), (val))
-# define sk_nid_triple_zero(st) SKM_sk_zero(nid_triple, (st))
-# define sk_nid_triple_push(st, val) SKM_sk_push(nid_triple, (st), (val))
-# define sk_nid_triple_unshift(st, val) SKM_sk_unshift(nid_triple, (st), (val))
-# define sk_nid_triple_find(st, val) SKM_sk_find(nid_triple, (st), (val))
-# define sk_nid_triple_find_ex(st, val) SKM_sk_find_ex(nid_triple, (st), (val))
-# define sk_nid_triple_delete(st, i) SKM_sk_delete(nid_triple, (st), (i))
-# define sk_nid_triple_delete_ptr(st, ptr) SKM_sk_delete_ptr(nid_triple, (st), (ptr))
-# define sk_nid_triple_insert(st, val, i) SKM_sk_insert(nid_triple, (st), (val), (i))
-# define sk_nid_triple_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(nid_triple, (st), (cmp))
-# define sk_nid_triple_dup(st) SKM_sk_dup(nid_triple, st)
-# define sk_nid_triple_pop_free(st, free_func) SKM_sk_pop_free(nid_triple, (st), (free_func))
-# define sk_nid_triple_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(nid_triple, (st), (copy_func), (free_func))
-# define sk_nid_triple_shift(st) SKM_sk_shift(nid_triple, (st))
-# define sk_nid_triple_pop(st) SKM_sk_pop(nid_triple, (st))
-# define sk_nid_triple_sort(st) SKM_sk_sort(nid_triple, (st))
-# define sk_nid_triple_is_sorted(st) SKM_sk_is_sorted(nid_triple, (st))
-# define sk_void_new(cmp) SKM_sk_new(void, (cmp))
-# define sk_void_new_null() SKM_sk_new_null(void)
-# define sk_void_free(st) SKM_sk_free(void, (st))
-# define sk_void_num(st) SKM_sk_num(void, (st))
-# define sk_void_value(st, i) SKM_sk_value(void, (st), (i))
-# define sk_void_set(st, i, val) SKM_sk_set(void, (st), (i), (val))
-# define sk_void_zero(st) SKM_sk_zero(void, (st))
-# define sk_void_push(st, val) SKM_sk_push(void, (st), (val))
-# define sk_void_unshift(st, val) SKM_sk_unshift(void, (st), (val))
-# define sk_void_find(st, val) SKM_sk_find(void, (st), (val))
-# define sk_void_find_ex(st, val) SKM_sk_find_ex(void, (st), (val))
-# define sk_void_delete(st, i) SKM_sk_delete(void, (st), (i))
-# define sk_void_delete_ptr(st, ptr) SKM_sk_delete_ptr(void, (st), (ptr))
-# define sk_void_insert(st, val, i) SKM_sk_insert(void, (st), (val), (i))
-# define sk_void_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(void, (st), (cmp))
-# define sk_void_dup(st) SKM_sk_dup(void, st)
-# define sk_void_pop_free(st, free_func) SKM_sk_pop_free(void, (st), (free_func))
-# define sk_void_deep_copy(st, copy_func, free_func) SKM_sk_deep_copy(void, (st), (copy_func), (free_func))
-# define sk_void_shift(st) SKM_sk_shift(void, (st))
-# define sk_void_pop(st) SKM_sk_pop(void, (st))
-# define sk_void_sort(st) SKM_sk_sort(void, (st))
-# define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))
-# define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
-# define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
-# define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-# define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-# define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_STACK_OF(OPENSSL_STRING, st), i))
-# define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
-# define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_FREE_FUNC(char, free_func))
-# define sk_OPENSSL_STRING_deep_copy(st, copy_func, free_func) ((STACK_OF(OPENSSL_STRING) *)sk_deep_copy(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_COPY_FUNC(char, copy_func), CHECKED_SK_FREE_FUNC(char, free_func)))
-# define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val), i)
-# define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
-# define sk_OPENSSL_STRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_STRING, st), i, CHECKED_PTR_OF(char, val))
-# define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
-# define sk_OPENSSL_STRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-# define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
-# define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
-# define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, ptr))
-# define sk_OPENSSL_STRING_set_cmp_func(st, cmp)  \
-        ((int (*)(const char * const *,const char * const *)) \
-        sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_CMP_FUNC(char, cmp)))
-# define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
-# define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
-# define sk_OPENSSL_STRING_pop(st) (char *)sk_pop(CHECKED_STACK_OF(OPENSSL_STRING, st))
-# define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
-# define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
-# define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
-# define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
-# define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-# define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-# define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i))
-# define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)
-# define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_FREE_FUNC(void, free_func))
-# define sk_OPENSSL_BLOCK_deep_copy(st, copy_func, free_func) ((STACK_OF(OPENSSL_BLOCK) *)sk_deep_copy(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_COPY_FUNC(void, copy_func), CHECKED_SK_FREE_FUNC(void, free_func)))
-# define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val), i)
-# define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)
-# define sk_OPENSSL_BLOCK_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i, CHECKED_PTR_OF(void, val))
-# define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))
-# define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-# define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
-# define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))
-# define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, ptr))
-# define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp)  \
-        ((int (*)(const void * const *,const void * const *)) \
-        sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_CMP_FUNC(void, cmp)))
-# define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)
-# define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))
-# define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop(CHECKED_STACK_OF(OPENSSL_BLOCK, st))
-# define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))
-# define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))
-# define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
-# define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())
-# define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-# define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-# define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i))
-# define sk_OPENSSL_PSTRING_num(st) SKM_sk_num(OPENSSL_PSTRING, st)
-# define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_FREE_FUNC(OPENSSL_STRING, free_func))
-# define sk_OPENSSL_PSTRING_deep_copy(st, copy_func, free_func) ((STACK_OF(OPENSSL_PSTRING) *)sk_deep_copy(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_COPY_FUNC(OPENSSL_STRING, copy_func), CHECKED_SK_FREE_FUNC(OPENSSL_STRING, free_func)))
-# define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)
-# define sk_OPENSSL_PSTRING_free(st) SKM_sk_free(OPENSSL_PSTRING, st)
-# define sk_OPENSSL_PSTRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))
-# define sk_OPENSSL_PSTRING_zero(st) SKM_sk_zero(OPENSSL_PSTRING, (st))
-# define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-# define sk_OPENSSL_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_CONST_PTR_OF(OPENSSL_STRING, val))
-# define sk_OPENSSL_PSTRING_delete(st, i) SKM_sk_delete(OPENSSL_PSTRING, (st), (i))
-# define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))
-# define sk_OPENSSL_PSTRING_set_cmp_func(st, cmp)  \
-        ((int (*)(const OPENSSL_STRING * const *,const OPENSSL_STRING * const *)) \
-        sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
-# define sk_OPENSSL_PSTRING_dup(st) SKM_sk_dup(OPENSSL_PSTRING, st)
-# define sk_OPENSSL_PSTRING_shift(st) SKM_sk_shift(OPENSSL_PSTRING, (st))
-# define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop(CHECKED_STACK_OF(OPENSSL_PSTRING, st))
-# define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))
-# define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))
-# define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ACCESS_DESCRIPTION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ACCESS_DESCRIPTION(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ACCESS_DESCRIPTION, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ACCESS_DESCRIPTION(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ACCESS_DESCRIPTION, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_ASN1_INTEGER(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_INTEGER, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_INTEGER(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_INTEGER, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_INTEGER(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_INTEGER, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_INTEGER(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_INTEGER, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_ASN1_OBJECT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_OBJECT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_OBJECT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_OBJECT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_OBJECT(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_OBJECT, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_OBJECT(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_OBJECT, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_ASN1_TYPE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_TYPE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_TYPE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_TYPE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_TYPE(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_TYPE, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_TYPE(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_TYPE, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_UTF8STRING, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_UTF8STRING, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_UTF8STRING(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_UTF8STRING, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_UTF8STRING(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_UTF8STRING, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_DIST_POINT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(DIST_POINT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_DIST_POINT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(DIST_POINT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_DIST_POINT(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(DIST_POINT, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_DIST_POINT(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(DIST_POINT, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_ESS_CERT_ID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ESS_CERT_ID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ESS_CERT_ID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ESS_CERT_ID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ESS_CERT_ID(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ESS_CERT_ID, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ESS_CERT_ID(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ESS_CERT_ID, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_EVP_MD(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(EVP_MD, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_EVP_MD(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(EVP_MD, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_EVP_MD(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(EVP_MD, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_EVP_MD(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(EVP_MD, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_GENERAL_NAME(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(GENERAL_NAME, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_GENERAL_NAME(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(GENERAL_NAME, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_GENERAL_NAME(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(GENERAL_NAME, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_GENERAL_NAME(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(GENERAL_NAME, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_OCSP_ONEREQ(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(OCSP_ONEREQ, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_OCSP_ONEREQ(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(OCSP_ONEREQ, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_OCSP_ONEREQ(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(OCSP_ONEREQ, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_OCSP_ONEREQ(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(OCSP_ONEREQ, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(OCSP_SINGLERESP, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(OCSP_SINGLERESP, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_OCSP_SINGLERESP(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(OCSP_SINGLERESP, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_OCSP_SINGLERESP(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(OCSP_SINGLERESP, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS12_SAFEBAG, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS12_SAFEBAG, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS12_SAFEBAG(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS12_SAFEBAG, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS12_SAFEBAG(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS12_SAFEBAG, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_PKCS7(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS7, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS7(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS7, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS7(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS7, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS7(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS7, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS7_RECIP_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS7_RECIP_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS7_RECIP_INFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS7_RECIP_INFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS7_RECIP_INFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS7_RECIP_INFO, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS7_SIGNER_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS7_SIGNER_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS7_SIGNER_INFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS7_SIGNER_INFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS7_SIGNER_INFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS7_SIGNER_INFO, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_POLICYINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(POLICYINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_POLICYINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(POLICYINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_POLICYINFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(POLICYINFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_POLICYINFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(POLICYINFO, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_POLICYQUALINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(POLICYQUALINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_POLICYQUALINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(POLICYQUALINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_POLICYQUALINFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(POLICYQUALINFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_POLICYQUALINFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(POLICYQUALINFO, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_SXNETID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(SXNETID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_SXNETID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(SXNETID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_SXNETID(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(SXNETID, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_SXNETID(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(SXNETID, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_ALGOR(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_ALGOR, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_ALGOR(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_ALGOR, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_ALGOR(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_ALGOR, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_ALGOR(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_ALGOR, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_ATTRIBUTE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_ATTRIBUTE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_ATTRIBUTE(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_ATTRIBUTE, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_ATTRIBUTE(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_ATTRIBUTE, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_CRL(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_CRL, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_CRL(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_CRL, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_CRL(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_CRL, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_CRL(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_CRL, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_EXTENSION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_EXTENSION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_EXTENSION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_EXTENSION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_EXTENSION(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_EXTENSION, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_EXTENSION(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_EXTENSION, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_NAME_ENTRY, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_NAME_ENTRY, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_NAME_ENTRY(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_NAME_ENTRY, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_NAME_ENTRY(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_NAME_ENTRY, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_REVOKED(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_REVOKED, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_REVOKED(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_REVOKED, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_REVOKED(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_REVOKED, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_REVOKED(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_REVOKED, (buf), (len), (d2i_func), (free_func))
-# define PKCS12_decrypt_d2i_PKCS12_SAFEBAG(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-        SKM_PKCS12_decrypt_d2i(PKCS12_SAFEBAG, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-# define PKCS12_decrypt_d2i_PKCS7(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-        SKM_PKCS12_decrypt_d2i(PKCS7, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-# define lh_ADDED_OBJ_new() LHM_lh_new(ADDED_OBJ,added_obj)
-# define lh_ADDED_OBJ_insert(lh,inst) LHM_lh_insert(ADDED_OBJ,lh,inst)
-# define lh_ADDED_OBJ_retrieve(lh,inst) LHM_lh_retrieve(ADDED_OBJ,lh,inst)
-# define lh_ADDED_OBJ_delete(lh,inst) LHM_lh_delete(ADDED_OBJ,lh,inst)
-# define lh_ADDED_OBJ_doall(lh,fn) LHM_lh_doall(ADDED_OBJ,lh,fn)
-# define lh_ADDED_OBJ_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ADDED_OBJ,lh,fn,arg_type,arg)
-# define lh_ADDED_OBJ_error(lh) LHM_lh_error(ADDED_OBJ,lh)
-# define lh_ADDED_OBJ_num_items(lh) LHM_lh_num_items(ADDED_OBJ,lh)
-# define lh_ADDED_OBJ_down_load(lh) LHM_lh_down_load(ADDED_OBJ,lh)
-# define lh_ADDED_OBJ_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ADDED_OBJ,lh,out)
-# define lh_ADDED_OBJ_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ADDED_OBJ,lh,out)
-# define lh_ADDED_OBJ_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ADDED_OBJ,lh,out)
-# define lh_ADDED_OBJ_free(lh) LHM_lh_free(ADDED_OBJ,lh)
-# define lh_APP_INFO_new() LHM_lh_new(APP_INFO,app_info)
-# define lh_APP_INFO_insert(lh,inst) LHM_lh_insert(APP_INFO,lh,inst)
-# define lh_APP_INFO_retrieve(lh,inst) LHM_lh_retrieve(APP_INFO,lh,inst)
-# define lh_APP_INFO_delete(lh,inst) LHM_lh_delete(APP_INFO,lh,inst)
-# define lh_APP_INFO_doall(lh,fn) LHM_lh_doall(APP_INFO,lh,fn)
-# define lh_APP_INFO_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(APP_INFO,lh,fn,arg_type,arg)
-# define lh_APP_INFO_error(lh) LHM_lh_error(APP_INFO,lh)
-# define lh_APP_INFO_num_items(lh) LHM_lh_num_items(APP_INFO,lh)
-# define lh_APP_INFO_down_load(lh) LHM_lh_down_load(APP_INFO,lh)
-# define lh_APP_INFO_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(APP_INFO,lh,out)
-# define lh_APP_INFO_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(APP_INFO,lh,out)
-# define lh_APP_INFO_stats_bio(lh,out) \
-  LHM_lh_stats_bio(APP_INFO,lh,out)
-# define lh_APP_INFO_free(lh) LHM_lh_free(APP_INFO,lh)
-# define lh_CONF_VALUE_new() LHM_lh_new(CONF_VALUE,conf_value)
-# define lh_CONF_VALUE_insert(lh,inst) LHM_lh_insert(CONF_VALUE,lh,inst)
-# define lh_CONF_VALUE_retrieve(lh,inst) LHM_lh_retrieve(CONF_VALUE,lh,inst)
-# define lh_CONF_VALUE_delete(lh,inst) LHM_lh_delete(CONF_VALUE,lh,inst)
-# define lh_CONF_VALUE_doall(lh,fn) LHM_lh_doall(CONF_VALUE,lh,fn)
-# define lh_CONF_VALUE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(CONF_VALUE,lh,fn,arg_type,arg)
-# define lh_CONF_VALUE_error(lh) LHM_lh_error(CONF_VALUE,lh)
-# define lh_CONF_VALUE_num_items(lh) LHM_lh_num_items(CONF_VALUE,lh)
-# define lh_CONF_VALUE_down_load(lh) LHM_lh_down_load(CONF_VALUE,lh)
-# define lh_CONF_VALUE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(CONF_VALUE,lh,out)
-# define lh_CONF_VALUE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(CONF_VALUE,lh,out)
-# define lh_CONF_VALUE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(CONF_VALUE,lh,out)
-# define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh)
-# define lh_ENGINE_PILE_new() LHM_lh_new(ENGINE_PILE,engine_pile)
-# define lh_ENGINE_PILE_insert(lh,inst) LHM_lh_insert(ENGINE_PILE,lh,inst)
-# define lh_ENGINE_PILE_retrieve(lh,inst) LHM_lh_retrieve(ENGINE_PILE,lh,inst)
-# define lh_ENGINE_PILE_delete(lh,inst) LHM_lh_delete(ENGINE_PILE,lh,inst)
-# define lh_ENGINE_PILE_doall(lh,fn) LHM_lh_doall(ENGINE_PILE,lh,fn)
-# define lh_ENGINE_PILE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ENGINE_PILE,lh,fn,arg_type,arg)
-# define lh_ENGINE_PILE_error(lh) LHM_lh_error(ENGINE_PILE,lh)
-# define lh_ENGINE_PILE_num_items(lh) LHM_lh_num_items(ENGINE_PILE,lh)
-# define lh_ENGINE_PILE_down_load(lh) LHM_lh_down_load(ENGINE_PILE,lh)
-# define lh_ENGINE_PILE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ENGINE_PILE,lh,out)
-# define lh_ENGINE_PILE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ENGINE_PILE,lh,out)
-# define lh_ENGINE_PILE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ENGINE_PILE,lh,out)
-# define lh_ENGINE_PILE_free(lh) LHM_lh_free(ENGINE_PILE,lh)
-# define lh_ERR_STATE_new() LHM_lh_new(ERR_STATE,err_state)
-# define lh_ERR_STATE_insert(lh,inst) LHM_lh_insert(ERR_STATE,lh,inst)
-# define lh_ERR_STATE_retrieve(lh,inst) LHM_lh_retrieve(ERR_STATE,lh,inst)
-# define lh_ERR_STATE_delete(lh,inst) LHM_lh_delete(ERR_STATE,lh,inst)
-# define lh_ERR_STATE_doall(lh,fn) LHM_lh_doall(ERR_STATE,lh,fn)
-# define lh_ERR_STATE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ERR_STATE,lh,fn,arg_type,arg)
-# define lh_ERR_STATE_error(lh) LHM_lh_error(ERR_STATE,lh)
-# define lh_ERR_STATE_num_items(lh) LHM_lh_num_items(ERR_STATE,lh)
-# define lh_ERR_STATE_down_load(lh) LHM_lh_down_load(ERR_STATE,lh)
-# define lh_ERR_STATE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ERR_STATE,lh,out)
-# define lh_ERR_STATE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ERR_STATE,lh,out)
-# define lh_ERR_STATE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ERR_STATE,lh,out)
-# define lh_ERR_STATE_free(lh) LHM_lh_free(ERR_STATE,lh)
-# define lh_ERR_STRING_DATA_new() LHM_lh_new(ERR_STRING_DATA,err_string_data)
-# define lh_ERR_STRING_DATA_insert(lh,inst) LHM_lh_insert(ERR_STRING_DATA,lh,inst)
-# define lh_ERR_STRING_DATA_retrieve(lh,inst) LHM_lh_retrieve(ERR_STRING_DATA,lh,inst)
-# define lh_ERR_STRING_DATA_delete(lh,inst) LHM_lh_delete(ERR_STRING_DATA,lh,inst)
-# define lh_ERR_STRING_DATA_doall(lh,fn) LHM_lh_doall(ERR_STRING_DATA,lh,fn)
-# define lh_ERR_STRING_DATA_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ERR_STRING_DATA,lh,fn,arg_type,arg)
-# define lh_ERR_STRING_DATA_error(lh) LHM_lh_error(ERR_STRING_DATA,lh)
-# define lh_ERR_STRING_DATA_num_items(lh) LHM_lh_num_items(ERR_STRING_DATA,lh)
-# define lh_ERR_STRING_DATA_down_load(lh) LHM_lh_down_load(ERR_STRING_DATA,lh)
-# define lh_ERR_STRING_DATA_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ERR_STRING_DATA,lh,out)
-# define lh_ERR_STRING_DATA_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ERR_STRING_DATA,lh,out)
-# define lh_ERR_STRING_DATA_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ERR_STRING_DATA,lh,out)
-# define lh_ERR_STRING_DATA_free(lh) LHM_lh_free(ERR_STRING_DATA,lh)
-# define lh_EX_CLASS_ITEM_new() LHM_lh_new(EX_CLASS_ITEM,ex_class_item)
-# define lh_EX_CLASS_ITEM_insert(lh,inst) LHM_lh_insert(EX_CLASS_ITEM,lh,inst)
-# define lh_EX_CLASS_ITEM_retrieve(lh,inst) LHM_lh_retrieve(EX_CLASS_ITEM,lh,inst)
-# define lh_EX_CLASS_ITEM_delete(lh,inst) LHM_lh_delete(EX_CLASS_ITEM,lh,inst)
-# define lh_EX_CLASS_ITEM_doall(lh,fn) LHM_lh_doall(EX_CLASS_ITEM,lh,fn)
-# define lh_EX_CLASS_ITEM_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(EX_CLASS_ITEM,lh,fn,arg_type,arg)
-# define lh_EX_CLASS_ITEM_error(lh) LHM_lh_error(EX_CLASS_ITEM,lh)
-# define lh_EX_CLASS_ITEM_num_items(lh) LHM_lh_num_items(EX_CLASS_ITEM,lh)
-# define lh_EX_CLASS_ITEM_down_load(lh) LHM_lh_down_load(EX_CLASS_ITEM,lh)
-# define lh_EX_CLASS_ITEM_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(EX_CLASS_ITEM,lh,out)
-# define lh_EX_CLASS_ITEM_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(EX_CLASS_ITEM,lh,out)
-# define lh_EX_CLASS_ITEM_stats_bio(lh,out) \
-  LHM_lh_stats_bio(EX_CLASS_ITEM,lh,out)
-# define lh_EX_CLASS_ITEM_free(lh) LHM_lh_free(EX_CLASS_ITEM,lh)
-# define lh_FUNCTION_new() LHM_lh_new(FUNCTION,function)
-# define lh_FUNCTION_insert(lh,inst) LHM_lh_insert(FUNCTION,lh,inst)
-# define lh_FUNCTION_retrieve(lh,inst) LHM_lh_retrieve(FUNCTION,lh,inst)
-# define lh_FUNCTION_delete(lh,inst) LHM_lh_delete(FUNCTION,lh,inst)
-# define lh_FUNCTION_doall(lh,fn) LHM_lh_doall(FUNCTION,lh,fn)
-# define lh_FUNCTION_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(FUNCTION,lh,fn,arg_type,arg)
-# define lh_FUNCTION_error(lh) LHM_lh_error(FUNCTION,lh)
-# define lh_FUNCTION_num_items(lh) LHM_lh_num_items(FUNCTION,lh)
-# define lh_FUNCTION_down_load(lh) LHM_lh_down_load(FUNCTION,lh)
-# define lh_FUNCTION_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(FUNCTION,lh,out)
-# define lh_FUNCTION_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(FUNCTION,lh,out)
-# define lh_FUNCTION_stats_bio(lh,out) \
-  LHM_lh_stats_bio(FUNCTION,lh,out)
-# define lh_FUNCTION_free(lh) LHM_lh_free(FUNCTION,lh)
-# define lh_MEM_new() LHM_lh_new(MEM,mem)
-# define lh_MEM_insert(lh,inst) LHM_lh_insert(MEM,lh,inst)
-# define lh_MEM_retrieve(lh,inst) LHM_lh_retrieve(MEM,lh,inst)
-# define lh_MEM_delete(lh,inst) LHM_lh_delete(MEM,lh,inst)
-# define lh_MEM_doall(lh,fn) LHM_lh_doall(MEM,lh,fn)
-# define lh_MEM_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(MEM,lh,fn,arg_type,arg)
-# define lh_MEM_error(lh) LHM_lh_error(MEM,lh)
-# define lh_MEM_num_items(lh) LHM_lh_num_items(MEM,lh)
-# define lh_MEM_down_load(lh) LHM_lh_down_load(MEM,lh)
-# define lh_MEM_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(MEM,lh,out)
-# define lh_MEM_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(MEM,lh,out)
-# define lh_MEM_stats_bio(lh,out) \
-  LHM_lh_stats_bio(MEM,lh,out)
-# define lh_MEM_free(lh) LHM_lh_free(MEM,lh)
-# define lh_OBJ_NAME_new() LHM_lh_new(OBJ_NAME,obj_name)
-# define lh_OBJ_NAME_insert(lh,inst) LHM_lh_insert(OBJ_NAME,lh,inst)
-# define lh_OBJ_NAME_retrieve(lh,inst) LHM_lh_retrieve(OBJ_NAME,lh,inst)
-# define lh_OBJ_NAME_delete(lh,inst) LHM_lh_delete(OBJ_NAME,lh,inst)
-# define lh_OBJ_NAME_doall(lh,fn) LHM_lh_doall(OBJ_NAME,lh,fn)
-# define lh_OBJ_NAME_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OBJ_NAME,lh,fn,arg_type,arg)
-# define lh_OBJ_NAME_error(lh) LHM_lh_error(OBJ_NAME,lh)
-# define lh_OBJ_NAME_num_items(lh) LHM_lh_num_items(OBJ_NAME,lh)
-# define lh_OBJ_NAME_down_load(lh) LHM_lh_down_load(OBJ_NAME,lh)
-# define lh_OBJ_NAME_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OBJ_NAME,lh,out)
-# define lh_OBJ_NAME_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OBJ_NAME,lh,out)
-# define lh_OBJ_NAME_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OBJ_NAME,lh,out)
-# define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh)
-# define lh_OPENSSL_CSTRING_new() LHM_lh_new(OPENSSL_CSTRING,openssl_cstring)
-# define lh_OPENSSL_CSTRING_insert(lh,inst) LHM_lh_insert(OPENSSL_CSTRING,lh,inst)
-# define lh_OPENSSL_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_CSTRING,lh,inst)
-# define lh_OPENSSL_CSTRING_delete(lh,inst) LHM_lh_delete(OPENSSL_CSTRING,lh,inst)
-# define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn)
-# define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg)
-# define lh_OPENSSL_CSTRING_error(lh) LHM_lh_error(OPENSSL_CSTRING,lh)
-# define lh_OPENSSL_CSTRING_num_items(lh) LHM_lh_num_items(OPENSSL_CSTRING,lh)
-# define lh_OPENSSL_CSTRING_down_load(lh) LHM_lh_down_load(OPENSSL_CSTRING,lh)
-# define lh_OPENSSL_CSTRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OPENSSL_CSTRING,lh,out)
-# define lh_OPENSSL_CSTRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OPENSSL_CSTRING,lh,out)
-# define lh_OPENSSL_CSTRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OPENSSL_CSTRING,lh,out)
-# define lh_OPENSSL_CSTRING_free(lh) LHM_lh_free(OPENSSL_CSTRING,lh)
-# define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string)
-# define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst)
-# define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst)
-# define lh_OPENSSL_STRING_delete(lh,inst) LHM_lh_delete(OPENSSL_STRING,lh,inst)
-# define lh_OPENSSL_STRING_doall(lh,fn) LHM_lh_doall(OPENSSL_STRING,lh,fn)
-# define lh_OPENSSL_STRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OPENSSL_STRING,lh,fn,arg_type,arg)
-# define lh_OPENSSL_STRING_error(lh) LHM_lh_error(OPENSSL_STRING,lh)
-# define lh_OPENSSL_STRING_num_items(lh) LHM_lh_num_items(OPENSSL_STRING,lh)
-# define lh_OPENSSL_STRING_down_load(lh) LHM_lh_down_load(OPENSSL_STRING,lh)
-# define lh_OPENSSL_STRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OPENSSL_STRING,lh,out)
-# define lh_OPENSSL_STRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OPENSSL_STRING,lh,out)
-# define lh_OPENSSL_STRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OPENSSL_STRING,lh,out)
-# define lh_OPENSSL_STRING_free(lh) LHM_lh_free(OPENSSL_STRING,lh)
-# define lh_SSL_SESSION_new() LHM_lh_new(SSL_SESSION,ssl_session)
-# define lh_SSL_SESSION_insert(lh,inst) LHM_lh_insert(SSL_SESSION,lh,inst)
-# define lh_SSL_SESSION_retrieve(lh,inst) LHM_lh_retrieve(SSL_SESSION,lh,inst)
-# define lh_SSL_SESSION_delete(lh,inst) LHM_lh_delete(SSL_SESSION,lh,inst)
-# define lh_SSL_SESSION_doall(lh,fn) LHM_lh_doall(SSL_SESSION,lh,fn)
-# define lh_SSL_SESSION_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(SSL_SESSION,lh,fn,arg_type,arg)
-# define lh_SSL_SESSION_error(lh) LHM_lh_error(SSL_SESSION,lh)
-# define lh_SSL_SESSION_num_items(lh) LHM_lh_num_items(SSL_SESSION,lh)
-# define lh_SSL_SESSION_down_load(lh) LHM_lh_down_load(SSL_SESSION,lh)
-# define lh_SSL_SESSION_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(SSL_SESSION,lh,out)
-# define lh_SSL_SESSION_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(SSL_SESSION,lh,out)
-# define lh_SSL_SESSION_stats_bio(lh,out) \
-  LHM_lh_stats_bio(SSL_SESSION,lh,out)
-# define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* !defined HEADER_SAFESTACK_H */
diff --git a/openflow/usr/include/openssl/seed.h b/openflow/usr/include/openssl/seed.h
deleted file mode 100644
index 8cbf0d9..0000000
--- a/openflow/usr/include/openssl/seed.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Neither the name of author nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-/* ====================================================================
- * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_SEED_H
-# define HEADER_SEED_H
-
-# include <openssl/opensslconf.h>
-# include <openssl/e_os2.h>
-# include <openssl/crypto.h>
-
-# ifdef OPENSSL_NO_SEED
-#  error SEED is disabled.
-# endif
-
-/* look whether we need 'long' to get 32 bits */
-# ifdef AES_LONG
-#  ifndef SEED_LONG
-#   define SEED_LONG 1
-#  endif
-# endif
-
-# if !defined(NO_SYS_TYPES_H)
-#  include <sys/types.h>
-# endif
-
-# define SEED_BLOCK_SIZE 16
-# define SEED_KEY_LENGTH 16
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct seed_key_st {
-# ifdef SEED_LONG
-    unsigned long data[32];
-# else
-    unsigned int data[32];
-# endif
-} SEED_KEY_SCHEDULE;
-
-# ifdef OPENSSL_FIPS
-void private_SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
-                          SEED_KEY_SCHEDULE *ks);
-# endif
-void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
-                  SEED_KEY_SCHEDULE *ks);
-
-void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
-                  unsigned char d[SEED_BLOCK_SIZE],
-                  const SEED_KEY_SCHEDULE *ks);
-void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
-                  unsigned char d[SEED_BLOCK_SIZE],
-                  const SEED_KEY_SCHEDULE *ks);
-
-void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      const SEED_KEY_SCHEDULE *ks, int enc);
-void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out, size_t len,
-                      const SEED_KEY_SCHEDULE *ks,
-                      unsigned char ivec[SEED_BLOCK_SIZE], int enc);
-void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                         size_t len, const SEED_KEY_SCHEDULE *ks,
-                         unsigned char ivec[SEED_BLOCK_SIZE], int *num,
-                         int enc);
-void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                         size_t len, const SEED_KEY_SCHEDULE *ks,
-                         unsigned char ivec[SEED_BLOCK_SIZE], int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif                          /* HEADER_SEED_H */
diff --git a/openflow/usr/include/openssl/sha.h b/openflow/usr/include/openssl/sha.h
deleted file mode 100644
index e5169e4..0000000
--- a/openflow/usr/include/openssl/sha.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* crypto/sha/sha.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SHA_H
-# define HEADER_SHA_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
-#  error SHA is disabled.
-# endif
-
-# if defined(OPENSSL_FIPS)
-#  define FIPS_SHA_SIZE_T size_t
-# endif
-
-/*-
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! SHA_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-# if defined(__LP32__)
-#  define SHA_LONG unsigned long
-# elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#  define SHA_LONG unsigned long
-#  define SHA_LONG_LOG2 3
-# else
-#  define SHA_LONG unsigned int
-# endif
-
-# define SHA_LBLOCK      16
-# define SHA_CBLOCK      (SHA_LBLOCK*4)/* SHA treats input data as a
-                                        * contiguous array of 32 bit wide
-                                        * big-endian values. */
-# define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
-# define SHA_DIGEST_LENGTH 20
-
-typedef struct SHAstate_st {
-    SHA_LONG h0, h1, h2, h3, h4;
-    SHA_LONG Nl, Nh;
-    SHA_LONG data[SHA_LBLOCK];
-    unsigned int num;
-} SHA_CTX;
-
-# ifndef OPENSSL_NO_SHA0
-#  ifdef OPENSSL_FIPS
-int private_SHA_Init(SHA_CTX *c);
-#  endif
-int SHA_Init(SHA_CTX *c);
-int SHA_Update(SHA_CTX *c, const void *data, size_t len);
-int SHA_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md);
-void SHA_Transform(SHA_CTX *c, const unsigned char *data);
-# endif
-# ifndef OPENSSL_NO_SHA1
-#  ifdef OPENSSL_FIPS
-int private_SHA1_Init(SHA_CTX *c);
-#  endif
-int SHA1_Init(SHA_CTX *c);
-int SHA1_Update(SHA_CTX *c, const void *data, size_t len);
-int SHA1_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
-void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
-# endif
-
-# define SHA256_CBLOCK   (SHA_LBLOCK*4)/* SHA-256 treats input data as a
-                                        * contiguous array of 32 bit wide
-                                        * big-endian values. */
-# define SHA224_DIGEST_LENGTH    28
-# define SHA256_DIGEST_LENGTH    32
-
-typedef struct SHA256state_st {
-    SHA_LONG h[8];
-    SHA_LONG Nl, Nh;
-    SHA_LONG data[SHA_LBLOCK];
-    unsigned int num, md_len;
-} SHA256_CTX;
-
-# ifndef OPENSSL_NO_SHA256
-#  ifdef OPENSSL_FIPS
-int private_SHA224_Init(SHA256_CTX *c);
-int private_SHA256_Init(SHA256_CTX *c);
-#  endif
-int SHA224_Init(SHA256_CTX *c);
-int SHA224_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA224_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA224(const unsigned char *d, size_t n, unsigned char *md);
-int SHA256_Init(SHA256_CTX *c);
-int SHA256_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA256_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md);
-void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
-# endif
-
-# define SHA384_DIGEST_LENGTH    48
-# define SHA512_DIGEST_LENGTH    64
-
-# ifndef OPENSSL_NO_SHA512
-/*
- * Unlike 32-bit digest algorithms, SHA-512 *relies* on SHA_LONG64
- * being exactly 64-bit wide. See Implementation Notes in sha512.c
- * for further details.
- */
-/*
- * SHA-512 treats input data as a
- * contiguous array of 64 bit
- * wide big-endian values.
- */
-#  define SHA512_CBLOCK   (SHA_LBLOCK*8)
-#  if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#   define SHA_LONG64 unsigned __int64
-#   define U64(C)     C##UI64
-#  elif defined(__arch64__)
-#   define SHA_LONG64 unsigned long
-#   define U64(C)     C##UL
-#  else
-#   define SHA_LONG64 unsigned long long
-#   define U64(C)     C##ULL
-#  endif
-
-typedef struct SHA512state_st {
-    SHA_LONG64 h[8];
-    SHA_LONG64 Nl, Nh;
-    union {
-        SHA_LONG64 d[SHA_LBLOCK];
-        unsigned char p[SHA512_CBLOCK];
-    } u;
-    unsigned int num, md_len;
-} SHA512_CTX;
-# endif
-
-# ifndef OPENSSL_NO_SHA512
-#  ifdef OPENSSL_FIPS
-int private_SHA384_Init(SHA512_CTX *c);
-int private_SHA512_Init(SHA512_CTX *c);
-#  endif
-int SHA384_Init(SHA512_CTX *c);
-int SHA384_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA384_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md);
-int SHA512_Init(SHA512_CTX *c);
-int SHA512_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA512_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md);
-void SHA512_Transform(SHA512_CTX *c, const unsigned char *data);
-# endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/srp.h b/openflow/usr/include/openssl/srp.h
deleted file mode 100644
index 028892a..0000000
--- a/openflow/usr/include/openssl/srp.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* crypto/srp/srp.h */
-/*
- * Written by Christophe Renou (christophe.renou@edelweb.fr) with the
- * precious help of Peter Sylvester (peter.sylvester@edelweb.fr) for the
- * EdelKey project and contributed to the OpenSSL project 2004.
- */
-/* ====================================================================
- * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef __SRP_H__
-# define __SRP_H__
-
-# ifndef OPENSSL_NO_SRP
-
-#  include <stdio.h>
-#  include <string.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#  include <openssl/safestack.h>
-#  include <openssl/bn.h>
-#  include <openssl/crypto.h>
-
-typedef struct SRP_gN_cache_st {
-    char *b64_bn;
-    BIGNUM *bn;
-} SRP_gN_cache;
-
-
-DECLARE_STACK_OF(SRP_gN_cache)
-
-typedef struct SRP_user_pwd_st {
-    /* Owned by us. */
-    char *id;
-    BIGNUM *s;
-    BIGNUM *v;
-    /* Not owned by us. */
-    const BIGNUM *g;
-    const BIGNUM *N;
-    /* Owned by us. */
-    char *info;
-} SRP_user_pwd;
-
-DECLARE_STACK_OF(SRP_user_pwd)
-
-void SRP_user_pwd_free(SRP_user_pwd *user_pwd);
-
-typedef struct SRP_VBASE_st {
-    STACK_OF(SRP_user_pwd) *users_pwd;
-    STACK_OF(SRP_gN_cache) *gN_cache;
-/* to simulate a user */
-    char *seed_key;
-    BIGNUM *default_g;
-    BIGNUM *default_N;
-} SRP_VBASE;
-
-/*
- * Structure interne pour retenir les couples N et g
- */
-typedef struct SRP_gN_st {
-    char *id;
-    BIGNUM *g;
-    BIGNUM *N;
-} SRP_gN;
-
-DECLARE_STACK_OF(SRP_gN)
-
-SRP_VBASE *SRP_VBASE_new(char *seed_key);
-int SRP_VBASE_free(SRP_VBASE *vb);
-int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file);
-
-/* This method ignores the configured seed and fails for an unknown user. */
-SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username);
-/* NOTE: unlike in SRP_VBASE_get_by_user, caller owns the returned pointer.*/
-SRP_user_pwd *SRP_VBASE_get1_by_user(SRP_VBASE *vb, char *username);
-
-char *SRP_create_verifier(const char *user, const char *pass, char **salt,
-                          char **verifier, const char *N, const char *g);
-int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
-                           BIGNUM **verifier, BIGNUM *N, BIGNUM *g);
-
-#  define SRP_NO_ERROR 0
-#  define SRP_ERR_VBASE_INCOMPLETE_FILE 1
-#  define SRP_ERR_VBASE_BN_LIB 2
-#  define SRP_ERR_OPEN_FILE 3
-#  define SRP_ERR_MEMORY 4
-
-#  define DB_srptype      0
-#  define DB_srpverifier  1
-#  define DB_srpsalt      2
-#  define DB_srpid        3
-#  define DB_srpgN        4
-#  define DB_srpinfo      5
-#  undef  DB_NUMBER
-#  define DB_NUMBER       6
-
-#  define DB_SRP_INDEX    'I'
-#  define DB_SRP_VALID    'V'
-#  define DB_SRP_REVOKED  'R'
-#  define DB_SRP_MODIF    'v'
-
-/* see srp.c */
-char *SRP_check_known_gN_param(BIGNUM *g, BIGNUM *N);
-SRP_gN *SRP_get_default_gN(const char *id);
-
-/* server side .... */
-BIGNUM *SRP_Calc_server_key(BIGNUM *A, BIGNUM *v, BIGNUM *u, BIGNUM *b,
-                            BIGNUM *N);
-BIGNUM *SRP_Calc_B(BIGNUM *b, BIGNUM *N, BIGNUM *g, BIGNUM *v);
-int SRP_Verify_A_mod_N(BIGNUM *A, BIGNUM *N);
-BIGNUM *SRP_Calc_u(BIGNUM *A, BIGNUM *B, BIGNUM *N);
-
-/* client side .... */
-BIGNUM *SRP_Calc_x(BIGNUM *s, const char *user, const char *pass);
-BIGNUM *SRP_Calc_A(BIGNUM *a, BIGNUM *N, BIGNUM *g);
-BIGNUM *SRP_Calc_client_key(BIGNUM *N, BIGNUM *B, BIGNUM *g, BIGNUM *x,
-                            BIGNUM *a, BIGNUM *u);
-int SRP_Verify_B_mod_N(BIGNUM *B, BIGNUM *N);
-
-#  define SRP_MINIMAL_N 1024
-
-#ifdef  __cplusplus
-}
-#endif
-
-# endif
-#endif
diff --git a/openflow/usr/include/openssl/srtp.h b/openflow/usr/include/openssl/srtp.h
deleted file mode 100644
index 2279c32..0000000
--- a/openflow/usr/include/openssl/srtp.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* ssl/srtp.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/*
- * DTLS code by Eric Rescorla <ekr@rtfm.com>
- *
- * Copyright (C) 2006, Network Resonance, Inc. Copyright (C) 2011, RTFM, Inc.
- */
-
-#ifndef HEADER_D1_SRTP_H
-# define HEADER_D1_SRTP_H
-
-# include <openssl/ssl.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define SRTP_AES128_CM_SHA1_80 0x0001
-# define SRTP_AES128_CM_SHA1_32 0x0002
-# define SRTP_AES128_F8_SHA1_80 0x0003
-# define SRTP_AES128_F8_SHA1_32 0x0004
-# define SRTP_NULL_SHA1_80      0x0005
-# define SRTP_NULL_SHA1_32      0x0006
-
-# ifndef OPENSSL_NO_SRTP
-
-int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
-int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles);
-
-STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
-SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
-
-# endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/ssl.h b/openflow/usr/include/openssl/ssl.h
deleted file mode 100644
index 76dfe23..0000000
--- a/openflow/usr/include/openssl/ssl.h
+++ /dev/null
@@ -1,3171 +0,0 @@
-/* ssl/ssl.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE.
- */
-
-#ifndef HEADER_SSL_H
-# define HEADER_SSL_H
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_COMP
-#  include <openssl/comp.h>
-# endif
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# ifndef OPENSSL_NO_DEPRECATED
-#  ifndef OPENSSL_NO_X509
-#   include <openssl/x509.h>
-#  endif
-#  include <openssl/crypto.h>
-#  include <openssl/lhash.h>
-#  include <openssl/buffer.h>
-# endif
-# include <openssl/pem.h>
-# include <openssl/hmac.h>
-
-# include <openssl/kssl.h>
-# include <openssl/safestack.h>
-# include <openssl/symhacks.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* SSLeay version number for ASN.1 encoding of the session information */
-/*-
- * Version 0 - initial version
- * Version 1 - added the optional peer certificate
- */
-# define SSL_SESSION_ASN1_VERSION 0x0001
-
-/* text strings for the ciphers */
-# define SSL_TXT_NULL_WITH_MD5           SSL2_TXT_NULL_WITH_MD5
-# define SSL_TXT_RC4_128_WITH_MD5        SSL2_TXT_RC4_128_WITH_MD5
-# define SSL_TXT_RC4_128_EXPORT40_WITH_MD5 SSL2_TXT_RC4_128_EXPORT40_WITH_MD5
-# define SSL_TXT_RC2_128_CBC_WITH_MD5    SSL2_TXT_RC2_128_CBC_WITH_MD5
-# define SSL_TXT_RC2_128_CBC_EXPORT40_WITH_MD5 SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5
-# define SSL_TXT_IDEA_128_CBC_WITH_MD5   SSL2_TXT_IDEA_128_CBC_WITH_MD5
-# define SSL_TXT_DES_64_CBC_WITH_MD5     SSL2_TXT_DES_64_CBC_WITH_MD5
-# define SSL_TXT_DES_64_CBC_WITH_SHA     SSL2_TXT_DES_64_CBC_WITH_SHA
-# define SSL_TXT_DES_192_EDE3_CBC_WITH_MD5 SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5
-# define SSL_TXT_DES_192_EDE3_CBC_WITH_SHA SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA
-
-/*
- * VRS Additional Kerberos5 entries
- */
-# define SSL_TXT_KRB5_DES_64_CBC_SHA   SSL3_TXT_KRB5_DES_64_CBC_SHA
-# define SSL_TXT_KRB5_DES_192_CBC3_SHA SSL3_TXT_KRB5_DES_192_CBC3_SHA
-# define SSL_TXT_KRB5_RC4_128_SHA      SSL3_TXT_KRB5_RC4_128_SHA
-# define SSL_TXT_KRB5_IDEA_128_CBC_SHA SSL3_TXT_KRB5_IDEA_128_CBC_SHA
-# define SSL_TXT_KRB5_DES_64_CBC_MD5   SSL3_TXT_KRB5_DES_64_CBC_MD5
-# define SSL_TXT_KRB5_DES_192_CBC3_MD5 SSL3_TXT_KRB5_DES_192_CBC3_MD5
-# define SSL_TXT_KRB5_RC4_128_MD5      SSL3_TXT_KRB5_RC4_128_MD5
-# define SSL_TXT_KRB5_IDEA_128_CBC_MD5 SSL3_TXT_KRB5_IDEA_128_CBC_MD5
-
-# define SSL_TXT_KRB5_DES_40_CBC_SHA   SSL3_TXT_KRB5_DES_40_CBC_SHA
-# define SSL_TXT_KRB5_RC2_40_CBC_SHA   SSL3_TXT_KRB5_RC2_40_CBC_SHA
-# define SSL_TXT_KRB5_RC4_40_SHA       SSL3_TXT_KRB5_RC4_40_SHA
-# define SSL_TXT_KRB5_DES_40_CBC_MD5   SSL3_TXT_KRB5_DES_40_CBC_MD5
-# define SSL_TXT_KRB5_RC2_40_CBC_MD5   SSL3_TXT_KRB5_RC2_40_CBC_MD5
-# define SSL_TXT_KRB5_RC4_40_MD5       SSL3_TXT_KRB5_RC4_40_MD5
-
-# define SSL_TXT_KRB5_DES_40_CBC_SHA   SSL3_TXT_KRB5_DES_40_CBC_SHA
-# define SSL_TXT_KRB5_DES_40_CBC_MD5   SSL3_TXT_KRB5_DES_40_CBC_MD5
-# define SSL_TXT_KRB5_DES_64_CBC_SHA   SSL3_TXT_KRB5_DES_64_CBC_SHA
-# define SSL_TXT_KRB5_DES_64_CBC_MD5   SSL3_TXT_KRB5_DES_64_CBC_MD5
-# define SSL_TXT_KRB5_DES_192_CBC3_SHA SSL3_TXT_KRB5_DES_192_CBC3_SHA
-# define SSL_TXT_KRB5_DES_192_CBC3_MD5 SSL3_TXT_KRB5_DES_192_CBC3_MD5
-# define SSL_MAX_KRB5_PRINCIPAL_LENGTH  256
-
-# define SSL_MAX_SSL_SESSION_ID_LENGTH           32
-# define SSL_MAX_SID_CTX_LENGTH                  32
-
-# define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES     (512/8)
-# define SSL_MAX_KEY_ARG_LENGTH                  8
-# define SSL_MAX_MASTER_KEY_LENGTH               48
-
-/* These are used to specify which ciphers to use and not to use */
-
-# define SSL_TXT_EXP40           "EXPORT40"
-# define SSL_TXT_EXP56           "EXPORT56"
-# define SSL_TXT_LOW             "LOW"
-# define SSL_TXT_MEDIUM          "MEDIUM"
-# define SSL_TXT_HIGH            "HIGH"
-# define SSL_TXT_FIPS            "FIPS"
-
-# define SSL_TXT_kFZA            "kFZA"/* unused! */
-# define SSL_TXT_aFZA            "aFZA"/* unused! */
-# define SSL_TXT_eFZA            "eFZA"/* unused! */
-# define SSL_TXT_FZA             "FZA"/* unused! */
-
-# define SSL_TXT_aNULL           "aNULL"
-# define SSL_TXT_eNULL           "eNULL"
-# define SSL_TXT_NULL            "NULL"
-
-# define SSL_TXT_kRSA            "kRSA"
-# define SSL_TXT_kDHr            "kDHr"
-# define SSL_TXT_kDHd            "kDHd"
-# define SSL_TXT_kDH             "kDH"
-# define SSL_TXT_kEDH            "kEDH"
-# define SSL_TXT_kDHE            "kDHE"/* alias for kEDH */
-# define SSL_TXT_kKRB5           "kKRB5"
-# define SSL_TXT_kECDHr          "kECDHr"
-# define SSL_TXT_kECDHe          "kECDHe"
-# define SSL_TXT_kECDH           "kECDH"
-# define SSL_TXT_kEECDH          "kEECDH"
-# define SSL_TXT_kECDHE          "kECDHE"/* alias for kEECDH */
-# define SSL_TXT_kPSK            "kPSK"
-# define SSL_TXT_kGOST           "kGOST"
-# define SSL_TXT_kSRP            "kSRP"
-
-# define SSL_TXT_aRSA            "aRSA"
-# define SSL_TXT_aDSS            "aDSS"
-# define SSL_TXT_aDH             "aDH"
-# define SSL_TXT_aECDH           "aECDH"
-# define SSL_TXT_aKRB5           "aKRB5"
-# define SSL_TXT_aECDSA          "aECDSA"
-# define SSL_TXT_aPSK            "aPSK"
-# define SSL_TXT_aGOST94 "aGOST94"
-# define SSL_TXT_aGOST01 "aGOST01"
-# define SSL_TXT_aGOST  "aGOST"
-# define SSL_TXT_aSRP            "aSRP"
-
-# define SSL_TXT_DSS             "DSS"
-# define SSL_TXT_DH              "DH"
-# define SSL_TXT_EDH             "EDH"/* same as "kEDH:-ADH" */
-# define SSL_TXT_DHE             "DHE"/* alias for EDH */
-# define SSL_TXT_ADH             "ADH"
-# define SSL_TXT_RSA             "RSA"
-# define SSL_TXT_ECDH            "ECDH"
-# define SSL_TXT_EECDH           "EECDH"/* same as "kEECDH:-AECDH" */
-# define SSL_TXT_ECDHE           "ECDHE"/* alias for ECDHE" */
-# define SSL_TXT_AECDH           "AECDH"
-# define SSL_TXT_ECDSA           "ECDSA"
-# define SSL_TXT_KRB5            "KRB5"
-# define SSL_TXT_PSK             "PSK"
-# define SSL_TXT_SRP             "SRP"
-
-# define SSL_TXT_DES             "DES"
-# define SSL_TXT_3DES            "3DES"
-# define SSL_TXT_RC4             "RC4"
-# define SSL_TXT_RC2             "RC2"
-# define SSL_TXT_IDEA            "IDEA"
-# define SSL_TXT_SEED            "SEED"
-# define SSL_TXT_AES128          "AES128"
-# define SSL_TXT_AES256          "AES256"
-# define SSL_TXT_AES             "AES"
-# define SSL_TXT_AES_GCM         "AESGCM"
-# define SSL_TXT_CAMELLIA128     "CAMELLIA128"
-# define SSL_TXT_CAMELLIA256     "CAMELLIA256"
-# define SSL_TXT_CAMELLIA        "CAMELLIA"
-
-# define SSL_TXT_MD5             "MD5"
-# define SSL_TXT_SHA1            "SHA1"
-# define SSL_TXT_SHA             "SHA"/* same as "SHA1" */
-# define SSL_TXT_GOST94          "GOST94"
-# define SSL_TXT_GOST89MAC               "GOST89MAC"
-# define SSL_TXT_SHA256          "SHA256"
-# define SSL_TXT_SHA384          "SHA384"
-
-# define SSL_TXT_SSLV2           "SSLv2"
-# define SSL_TXT_SSLV3           "SSLv3"
-# define SSL_TXT_TLSV1           "TLSv1"
-# define SSL_TXT_TLSV1_1         "TLSv1.1"
-# define SSL_TXT_TLSV1_2         "TLSv1.2"
-
-# define SSL_TXT_EXP             "EXP"
-# define SSL_TXT_EXPORT          "EXPORT"
-
-# define SSL_TXT_ALL             "ALL"
-
-/*-
- * COMPLEMENTOF* definitions. These identifiers are used to (de-select)
- * ciphers normally not being used.
- * Example: "RC4" will activate all ciphers using RC4 including ciphers
- * without authentication, which would normally disabled by DEFAULT (due
- * the "!ADH" being part of default). Therefore "RC4:!COMPLEMENTOFDEFAULT"
- * will make sure that it is also disabled in the specific selection.
- * COMPLEMENTOF* identifiers are portable between version, as adjustments
- * to the default cipher setup will also be included here.
- *
- * COMPLEMENTOFDEFAULT does not experience the same special treatment that
- * DEFAULT gets, as only selection is being done and no sorting as needed
- * for DEFAULT.
- */
-# define SSL_TXT_CMPALL          "COMPLEMENTOFALL"
-# define SSL_TXT_CMPDEF          "COMPLEMENTOFDEFAULT"
-
-/*
- * The following cipher list is used by default. It also is substituted when
- * an application-defined cipher list string starts with 'DEFAULT'.
- */
-# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!aNULL:!eNULL:!SSLv2"
-/*
- * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
- * starts with a reasonable order, and all we have to do for DEFAULT is
- * throwing out anonymous and unencrypted ciphersuites! (The latter are not
- * actually enabled by ALL, but "ALL:RSA" would enable some of them.)
- */
-
-/* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
-# define SSL_SENT_SHUTDOWN       1
-# define SSL_RECEIVED_SHUTDOWN   2
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# if (defined(OPENSSL_NO_RSA) || defined(OPENSSL_NO_MD5)) && !defined(OPENSSL_NO_SSL2)
-#  define OPENSSL_NO_SSL2
-# endif
-
-# define SSL_FILETYPE_ASN1       X509_FILETYPE_ASN1
-# define SSL_FILETYPE_PEM        X509_FILETYPE_PEM
-
-/*
- * This is needed to stop compilers complaining about the 'struct ssl_st *'
- * function parameters used to prototype callbacks in SSL_CTX.
- */
-typedef struct ssl_st *ssl_crock_st;
-typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT;
-typedef struct ssl_method_st SSL_METHOD;
-typedef struct ssl_cipher_st SSL_CIPHER;
-typedef struct ssl_session_st SSL_SESSION;
-typedef struct tls_sigalgs_st TLS_SIGALGS;
-typedef struct ssl_conf_ctx_st SSL_CONF_CTX;
-
-DECLARE_STACK_OF(SSL_CIPHER)
-
-/* SRTP protection profiles for use with the use_srtp extension (RFC 5764)*/
-typedef struct srtp_protection_profile_st {
-    const char *name;
-    unsigned long id;
-} SRTP_PROTECTION_PROFILE;
-
-DECLARE_STACK_OF(SRTP_PROTECTION_PROFILE)
-
-typedef int (*tls_session_ticket_ext_cb_fn) (SSL *s,
-                                             const unsigned char *data,
-                                             int len, void *arg);
-typedef int (*tls_session_secret_cb_fn) (SSL *s, void *secret,
-                                         int *secret_len,
-                                         STACK_OF(SSL_CIPHER) *peer_ciphers,
-                                         SSL_CIPHER **cipher, void *arg);
-
-# ifndef OPENSSL_NO_TLSEXT
-
-/* Typedefs for handling custom extensions */
-
-typedef int (*custom_ext_add_cb) (SSL *s, unsigned int ext_type,
-                                  const unsigned char **out,
-                                  size_t *outlen, int *al, void *add_arg);
-
-typedef void (*custom_ext_free_cb) (SSL *s, unsigned int ext_type,
-                                    const unsigned char *out, void *add_arg);
-
-typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type,
-                                    const unsigned char *in,
-                                    size_t inlen, int *al, void *parse_arg);
-
-# endif
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-/* used to hold info on the particular ciphers used */
-struct ssl_cipher_st {
-    int valid;
-    const char *name;           /* text name */
-    unsigned long id;           /* id, 4 bytes, first is version */
-    /*
-     * changed in 0.9.9: these four used to be portions of a single value
-     * 'algorithms'
-     */
-    unsigned long algorithm_mkey; /* key exchange algorithm */
-    unsigned long algorithm_auth; /* server authentication */
-    unsigned long algorithm_enc; /* symmetric encryption */
-    unsigned long algorithm_mac; /* symmetric authentication */
-    unsigned long algorithm_ssl; /* (major) protocol version */
-    unsigned long algo_strength; /* strength and export flags */
-    unsigned long algorithm2;   /* Extra flags */
-    int strength_bits;          /* Number of bits really used */
-    int alg_bits;               /* Number of bits for algorithm */
-};
-
-/* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */
-struct ssl_method_st {
-    int version;
-    int (*ssl_new) (SSL *s);
-    void (*ssl_clear) (SSL *s);
-    void (*ssl_free) (SSL *s);
-    int (*ssl_accept) (SSL *s);
-    int (*ssl_connect) (SSL *s);
-    int (*ssl_read) (SSL *s, void *buf, int len);
-    int (*ssl_peek) (SSL *s, void *buf, int len);
-    int (*ssl_write) (SSL *s, const void *buf, int len);
-    int (*ssl_shutdown) (SSL *s);
-    int (*ssl_renegotiate) (SSL *s);
-    int (*ssl_renegotiate_check) (SSL *s);
-    long (*ssl_get_message) (SSL *s, int st1, int stn, int mt, long
-                             max, int *ok);
-    int (*ssl_read_bytes) (SSL *s, int type, unsigned char *buf, int len,
-                           int peek);
-    int (*ssl_write_bytes) (SSL *s, int type, const void *buf_, int len);
-    int (*ssl_dispatch_alert) (SSL *s);
-    long (*ssl_ctrl) (SSL *s, int cmd, long larg, void *parg);
-    long (*ssl_ctx_ctrl) (SSL_CTX *ctx, int cmd, long larg, void *parg);
-    const SSL_CIPHER *(*get_cipher_by_char) (const unsigned char *ptr);
-    int (*put_cipher_by_char) (const SSL_CIPHER *cipher, unsigned char *ptr);
-    int (*ssl_pending) (const SSL *s);
-    int (*num_ciphers) (void);
-    const SSL_CIPHER *(*get_cipher) (unsigned ncipher);
-    const struct ssl_method_st *(*get_ssl_method) (int version);
-    long (*get_timeout) (void);
-    struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */
-    int (*ssl_version) (void);
-    long (*ssl_callback_ctrl) (SSL *s, int cb_id, void (*fp) (void));
-    long (*ssl_ctx_callback_ctrl) (SSL_CTX *s, int cb_id, void (*fp) (void));
-};
-
-/*-
- * Lets make this into an ASN.1 type structure as follows
- * SSL_SESSION_ID ::= SEQUENCE {
- *      version                 INTEGER,        -- structure version number
- *      SSLversion              INTEGER,        -- SSL version number
- *      Cipher                  OCTET STRING,   -- the 3 byte cipher ID
- *      Session_ID              OCTET STRING,   -- the Session ID
- *      Master_key              OCTET STRING,   -- the master key
- *      KRB5_principal          OCTET STRING    -- optional Kerberos principal
- *      Key_Arg [ 0 ] IMPLICIT  OCTET STRING,   -- the optional Key argument
- *      Time [ 1 ] EXPLICIT     INTEGER,        -- optional Start Time
- *      Timeout [ 2 ] EXPLICIT  INTEGER,        -- optional Timeout ins seconds
- *      Peer [ 3 ] EXPLICIT     X509,           -- optional Peer Certificate
- *      Session_ID_context [ 4 ] EXPLICIT OCTET STRING,   -- the Session ID context
- *      Verify_result [ 5 ] EXPLICIT INTEGER,   -- X509_V_... code for `Peer'
- *      HostName [ 6 ] EXPLICIT OCTET STRING,   -- optional HostName from servername TLS extension
- *      PSK_identity_hint [ 7 ] EXPLICIT OCTET STRING, -- optional PSK identity hint
- *      PSK_identity [ 8 ] EXPLICIT OCTET STRING,  -- optional PSK identity
- *      Ticket_lifetime_hint [9] EXPLICIT INTEGER, -- server's lifetime hint for session ticket
- *      Ticket [10]             EXPLICIT OCTET STRING, -- session ticket (clients only)
- *      Compression_meth [11]   EXPLICIT OCTET STRING, -- optional compression method
- *      SRP_username [ 12 ] EXPLICIT OCTET STRING -- optional SRP username
- *      }
- * Look in ssl/ssl_asn1.c for more details
- * I'm using EXPLICIT tags so I can read the damn things using asn1parse :-).
- */
-struct ssl_session_st {
-    int ssl_version;            /* what ssl version session info is being
-                                 * kept in here? */
-    /* only really used in SSLv2 */
-    unsigned int key_arg_length;
-    unsigned char key_arg[SSL_MAX_KEY_ARG_LENGTH];
-    int master_key_length;
-    unsigned char master_key[SSL_MAX_MASTER_KEY_LENGTH];
-    /* session_id - valid? */
-    unsigned int session_id_length;
-    unsigned char session_id[SSL_MAX_SSL_SESSION_ID_LENGTH];
-    /*
-     * this is used to determine whether the session is being reused in the
-     * appropriate context. It is up to the application to set this, via
-     * SSL_new
-     */
-    unsigned int sid_ctx_length;
-    unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-#  ifndef OPENSSL_NO_KRB5
-    unsigned int krb5_client_princ_len;
-    unsigned char krb5_client_princ[SSL_MAX_KRB5_PRINCIPAL_LENGTH];
-#  endif                        /* OPENSSL_NO_KRB5 */
-#  ifndef OPENSSL_NO_PSK
-    char *psk_identity_hint;
-    char *psk_identity;
-#  endif
-    /*
-     * Used to indicate that session resumption is not allowed. Applications
-     * can also set this bit for a new session via not_resumable_session_cb
-     * to disable session caching and tickets.
-     */
-    int not_resumable;
-    /* The cert is the certificate used to establish this connection */
-    struct sess_cert_st /* SESS_CERT */ *sess_cert;
-    /*
-     * This is the cert for the other end. On clients, it will be the same as
-     * sess_cert->peer_key->x509 (the latter is not enough as sess_cert is
-     * not retained in the external representation of sessions, see
-     * ssl_asn1.c).
-     */
-    X509 *peer;
-    /*
-     * when app_verify_callback accepts a session where the peer's
-     * certificate is not ok, we must remember the error for session reuse:
-     */
-    long verify_result;         /* only for servers */
-    int references;
-    long timeout;
-    long time;
-    unsigned int compress_meth; /* Need to lookup the method */
-    const SSL_CIPHER *cipher;
-    unsigned long cipher_id;    /* when ASN.1 loaded, this needs to be used
-                                 * to load the 'cipher' structure */
-    STACK_OF(SSL_CIPHER) *ciphers; /* shared ciphers? */
-    CRYPTO_EX_DATA ex_data;     /* application specific data */
-    /*
-     * These are used to make removal of session-ids more efficient and to
-     * implement a maximum cache size.
-     */
-    struct ssl_session_st *prev, *next;
-#  ifndef OPENSSL_NO_TLSEXT
-    char *tlsext_hostname;
-#   ifndef OPENSSL_NO_EC
-    size_t tlsext_ecpointformatlist_length;
-    unsigned char *tlsext_ecpointformatlist; /* peer's list */
-    size_t tlsext_ellipticcurvelist_length;
-    unsigned char *tlsext_ellipticcurvelist; /* peer's list */
-#   endif                       /* OPENSSL_NO_EC */
-    /* RFC4507 info */
-    unsigned char *tlsext_tick; /* Session ticket */
-    size_t tlsext_ticklen;      /* Session ticket length */
-    long tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */
-#  endif
-#  ifndef OPENSSL_NO_SRP
-    char *srp_username;
-#  endif
-};
-
-# endif
-
-# define SSL_OP_MICROSOFT_SESS_ID_BUG                    0x00000001L
-# define SSL_OP_NETSCAPE_CHALLENGE_BUG                   0x00000002L
-/* Allow initial connection to servers that don't support RI */
-# define SSL_OP_LEGACY_SERVER_CONNECT                    0x00000004L
-# define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG         0x00000008L
-# define SSL_OP_TLSEXT_PADDING                           0x00000010L
-# define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER               0x00000020L
-# define SSL_OP_SAFARI_ECDHE_ECDSA_BUG                   0x00000040L
-# define SSL_OP_SSLEAY_080_CLIENT_DH_BUG                 0x00000080L
-# define SSL_OP_TLS_D5_BUG                               0x00000100L
-# define SSL_OP_TLS_BLOCK_PADDING_BUG                    0x00000200L
-
-/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */
-# define SSL_OP_MSIE_SSLV2_RSA_PADDING                   0x0
-/* Refers to ancient SSLREF and SSLv2, retained for compatibility */
-# define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG              0x0
-
-/*
- * Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added in
- * OpenSSL 0.9.6d.  Usually (depending on the application protocol) the
- * workaround is not needed.  Unfortunately some broken SSL/TLS
- * implementations cannot handle it at all, which is why we include it in
- * SSL_OP_ALL.
- */
-/* added in 0.9.6e */
-# define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS              0x00000800L
-
-/*
- * SSL_OP_ALL: various bug workarounds that should be rather harmless.  This
- * used to be 0x000FFFFFL before 0.9.7.
- */
-# define SSL_OP_ALL                                      0x80000BFFL
-
-/* DTLS options */
-# define SSL_OP_NO_QUERY_MTU                 0x00001000L
-/* Turn on Cookie Exchange (on relevant for servers) */
-# define SSL_OP_COOKIE_EXCHANGE              0x00002000L
-/* Don't use RFC4507 ticket extension */
-# define SSL_OP_NO_TICKET                    0x00004000L
-/* Use Cisco's "speshul" version of DTLS_BAD_VER (as client)  */
-# define SSL_OP_CISCO_ANYCONNECT             0x00008000L
-
-/* As server, disallow session resumption on renegotiation */
-# define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION   0x00010000L
-/* Don't use compression even if supported */
-# define SSL_OP_NO_COMPRESSION                           0x00020000L
-/* Permit unsafe legacy renegotiation */
-# define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION        0x00040000L
-/* If set, always create a new key when using tmp_ecdh parameters */
-# define SSL_OP_SINGLE_ECDH_USE                          0x00080000L
-/* Does nothing: retained for compatibility */
-# define SSL_OP_SINGLE_DH_USE                            0x00100000L
-/* Does nothing: retained for compatibiity */
-# define SSL_OP_EPHEMERAL_RSA                            0x0
-/*
- * Set on servers to choose the cipher according to the server's preferences
- */
-# define SSL_OP_CIPHER_SERVER_PREFERENCE                 0x00400000L
-/*
- * If set, a server will allow a client to issue a SSLv3.0 version number as
- * latest version supported in the premaster secret, even when TLSv1.0
- * (version 3.1) was announced in the client hello. Normally this is
- * forbidden to prevent version rollback attacks.
- */
-# define SSL_OP_TLS_ROLLBACK_BUG                         0x00800000L
-
-# define SSL_OP_NO_SSLv2                                 0x01000000L
-# define SSL_OP_NO_SSLv3                                 0x02000000L
-# define SSL_OP_NO_TLSv1                                 0x04000000L
-# define SSL_OP_NO_TLSv1_2                               0x08000000L
-# define SSL_OP_NO_TLSv1_1                               0x10000000L
-
-# define SSL_OP_NO_DTLSv1                                0x04000000L
-# define SSL_OP_NO_DTLSv1_2                              0x08000000L
-
-# define SSL_OP_NO_SSL_MASK (SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|\
-        SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2)
-
-/*
- * These next two were never actually used for anything since SSLeay zap so
- * we have some more flags.
- */
-/*
- * The next flag deliberately changes the ciphertest, this is a check for the
- * PKCS#1 attack
- */
-# define SSL_OP_PKCS1_CHECK_1                            0x0
-# define SSL_OP_PKCS1_CHECK_2                            0x0
-
-# define SSL_OP_NETSCAPE_CA_DN_BUG                       0x20000000L
-# define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG          0x40000000L
-/*
- * Make server add server-hello extension from early version of cryptopro
- * draft, when GOST ciphersuite is negotiated. Required for interoperability
- * with CryptoPro CSP 3.x
- */
-# define SSL_OP_CRYPTOPRO_TLSEXT_BUG                     0x80000000L
-
-/*
- * Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
- * when just a single record has been written):
- */
-# define SSL_MODE_ENABLE_PARTIAL_WRITE       0x00000001L
-/*
- * Make it possible to retry SSL_write() with changed buffer location (buffer
- * contents must stay the same!); this is not the default to avoid the
- * misconception that non-blocking SSL_write() behaves like non-blocking
- * write():
- */
-# define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER 0x00000002L
-/*
- * Never bother the application with retries if the transport is blocking:
- */
-# define SSL_MODE_AUTO_RETRY 0x00000004L
-/* Don't attempt to automatically build certificate chain */
-# define SSL_MODE_NO_AUTO_CHAIN 0x00000008L
-/*
- * Save RAM by releasing read and write buffers when they're empty. (SSL3 and
- * TLS only.) "Released" buffers are put onto a free-list in the context or
- * just freed (depending on the context's setting for freelist_max_len).
- */
-# define SSL_MODE_RELEASE_BUFFERS 0x00000010L
-/*
- * Send the current time in the Random fields of the ClientHello and
- * ServerHello records for compatibility with hypothetical implementations
- * that require it.
- */
-# define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020L
-# define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040L
-/*
- * Send TLS_FALLBACK_SCSV in the ClientHello. To be set only by applications
- * that reconnect with a downgraded protocol version; see
- * draft-ietf-tls-downgrade-scsv-00 for details. DO NOT ENABLE THIS if your
- * application attempts a normal handshake. Only use this in explicit
- * fallback retries, following the guidance in
- * draft-ietf-tls-downgrade-scsv-00.
- */
-# define SSL_MODE_SEND_FALLBACK_SCSV 0x00000080L
-
-/* Cert related flags */
-/*
- * Many implementations ignore some aspects of the TLS standards such as
- * enforcing certifcate chain algorithms. When this is set we enforce them.
- */
-# define SSL_CERT_FLAG_TLS_STRICT                0x00000001L
-
-/* Suite B modes, takes same values as certificate verify flags */
-# define SSL_CERT_FLAG_SUITEB_128_LOS_ONLY       0x10000
-/* Suite B 192 bit only mode */
-# define SSL_CERT_FLAG_SUITEB_192_LOS            0x20000
-/* Suite B 128 bit mode allowing 192 bit algorithms */
-# define SSL_CERT_FLAG_SUITEB_128_LOS            0x30000
-
-/* Perform all sorts of protocol violations for testing purposes */
-# define SSL_CERT_FLAG_BROKEN_PROTOCOL           0x10000000
-
-/* Flags for building certificate chains */
-/* Treat any existing certificates as untrusted CAs */
-# define SSL_BUILD_CHAIN_FLAG_UNTRUSTED          0x1
-/* Don't include root CA in chain */
-# define SSL_BUILD_CHAIN_FLAG_NO_ROOT            0x2
-/* Just check certificates already there */
-# define SSL_BUILD_CHAIN_FLAG_CHECK              0x4
-/* Ignore verification errors */
-# define SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR       0x8
-/* Clear verification errors from queue */
-# define SSL_BUILD_CHAIN_FLAG_CLEAR_ERROR        0x10
-
-/* Flags returned by SSL_check_chain */
-/* Certificate can be used with this session */
-# define CERT_PKEY_VALID         0x1
-/* Certificate can also be used for signing */
-# define CERT_PKEY_SIGN          0x2
-/* EE certificate signing algorithm OK */
-# define CERT_PKEY_EE_SIGNATURE  0x10
-/* CA signature algorithms OK */
-# define CERT_PKEY_CA_SIGNATURE  0x20
-/* EE certificate parameters OK */
-# define CERT_PKEY_EE_PARAM      0x40
-/* CA certificate parameters OK */
-# define CERT_PKEY_CA_PARAM      0x80
-/* Signing explicitly allowed as opposed to SHA1 fallback */
-# define CERT_PKEY_EXPLICIT_SIGN 0x100
-/* Client CA issuer names match (always set for server cert) */
-# define CERT_PKEY_ISSUER_NAME   0x200
-/* Cert type matches client types (always set for server cert) */
-# define CERT_PKEY_CERT_TYPE     0x400
-/* Cert chain suitable to Suite B */
-# define CERT_PKEY_SUITEB        0x800
-
-# define SSL_CONF_FLAG_CMDLINE           0x1
-# define SSL_CONF_FLAG_FILE              0x2
-# define SSL_CONF_FLAG_CLIENT            0x4
-# define SSL_CONF_FLAG_SERVER            0x8
-# define SSL_CONF_FLAG_SHOW_ERRORS       0x10
-# define SSL_CONF_FLAG_CERTIFICATE       0x20
-/* Configuration value types */
-# define SSL_CONF_TYPE_UNKNOWN           0x0
-# define SSL_CONF_TYPE_STRING            0x1
-# define SSL_CONF_TYPE_FILE              0x2
-# define SSL_CONF_TYPE_DIR               0x3
-
-/*
- * Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value, they
- * cannot be used to clear bits.
- */
-
-# define SSL_CTX_set_options(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
-# define SSL_CTX_clear_options(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_OPTIONS,(op),NULL)
-# define SSL_CTX_get_options(ctx) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,0,NULL)
-# define SSL_set_options(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_OPTIONS,(op),NULL)
-# define SSL_clear_options(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_OPTIONS,(op),NULL)
-# define SSL_get_options(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_OPTIONS,0,NULL)
-
-# define SSL_CTX_set_mode(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL)
-# define SSL_CTX_clear_mode(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_MODE,(op),NULL)
-# define SSL_CTX_get_mode(ctx) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,0,NULL)
-# define SSL_clear_mode(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_MODE,(op),NULL)
-# define SSL_set_mode(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_MODE,(op),NULL)
-# define SSL_get_mode(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_MODE,0,NULL)
-# define SSL_set_mtu(ssl, mtu) \
-        SSL_ctrl((ssl),SSL_CTRL_SET_MTU,(mtu),NULL)
-# define DTLS_set_link_mtu(ssl, mtu) \
-        SSL_ctrl((ssl),DTLS_CTRL_SET_LINK_MTU,(mtu),NULL)
-# define DTLS_get_link_min_mtu(ssl) \
-        SSL_ctrl((ssl),DTLS_CTRL_GET_LINK_MIN_MTU,0,NULL)
-
-# define SSL_get_secure_renegotiation_support(ssl) \
-        SSL_ctrl((ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL)
-
-# ifndef OPENSSL_NO_HEARTBEATS
-#  define SSL_heartbeat(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_TLS_EXT_SEND_HEARTBEAT,0,NULL)
-# endif
-
-# define SSL_CTX_set_cert_flags(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CERT_FLAGS,(op),NULL)
-# define SSL_set_cert_flags(s,op) \
-        SSL_ctrl((s),SSL_CTRL_CERT_FLAGS,(op),NULL)
-# define SSL_CTX_clear_cert_flags(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_CERT_FLAGS,(op),NULL)
-# define SSL_clear_cert_flags(s,op) \
-        SSL_ctrl((s),SSL_CTRL_CLEAR_CERT_FLAGS,(op),NULL)
-
-void SSL_CTX_set_msg_callback(SSL_CTX *ctx,
-                              void (*cb) (int write_p, int version,
-                                          int content_type, const void *buf,
-                                          size_t len, SSL *ssl, void *arg));
-void SSL_set_msg_callback(SSL *ssl,
-                          void (*cb) (int write_p, int version,
-                                      int content_type, const void *buf,
-                                      size_t len, SSL *ssl, void *arg));
-# define SSL_CTX_set_msg_callback_arg(ctx, arg) SSL_CTX_ctrl((ctx), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
-# define SSL_set_msg_callback_arg(ssl, arg) SSL_ctrl((ssl), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
-
-# ifndef OPENSSL_NO_SRP
-
-#  ifndef OPENSSL_NO_SSL_INTERN
-
-typedef struct srp_ctx_st {
-    /* param for all the callbacks */
-    void *SRP_cb_arg;
-    /* set client Hello login callback */
-    int (*TLS_ext_srp_username_callback) (SSL *, int *, void *);
-    /* set SRP N/g param callback for verification */
-    int (*SRP_verify_param_callback) (SSL *, void *);
-    /* set SRP client passwd callback */
-    char *(*SRP_give_srp_client_pwd_callback) (SSL *, void *);
-    char *login;
-    BIGNUM *N, *g, *s, *B, *A;
-    BIGNUM *a, *b, *v;
-    char *info;
-    int strength;
-    unsigned long srp_Mask;
-} SRP_CTX;
-
-#  endif
-
-/* see tls_srp.c */
-int SSL_SRP_CTX_init(SSL *s);
-int SSL_CTX_SRP_CTX_init(SSL_CTX *ctx);
-int SSL_SRP_CTX_free(SSL *ctx);
-int SSL_CTX_SRP_CTX_free(SSL_CTX *ctx);
-int SSL_srp_server_param_with_username(SSL *s, int *ad);
-int SRP_generate_server_master_secret(SSL *s, unsigned char *master_key);
-int SRP_Calc_A_param(SSL *s);
-int SRP_generate_client_master_secret(SSL *s, unsigned char *master_key);
-
-# endif
-
-# if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)
-#  define SSL_MAX_CERT_LIST_DEFAULT 1024*30
-                                          /* 30k max cert list :-) */
-# else
-#  define SSL_MAX_CERT_LIST_DEFAULT 1024*100
-                                           /* 100k max cert list :-) */
-# endif
-
-# define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT      (1024*20)
-
-/*
- * This callback type is used inside SSL_CTX, SSL, and in the functions that
- * set them. It is used to override the generation of SSL/TLS session IDs in
- * a server. Return value should be zero on an error, non-zero to proceed.
- * Also, callbacks should themselves check if the id they generate is unique
- * otherwise the SSL handshake will fail with an error - callbacks can do
- * this using the 'ssl' value they're passed by;
- * SSL_has_matching_session_id(ssl, id, *id_len) The length value passed in
- * is set at the maximum size the session ID can be. In SSLv2 this is 16
- * bytes, whereas SSLv3/TLSv1 it is 32 bytes. The callback can alter this
- * length to be less if desired, but under SSLv2 session IDs are supposed to
- * be fixed at 16 bytes so the id will be padded after the callback returns
- * in this case. It is also an error for the callback to set the size to
- * zero.
- */
-typedef int (*GEN_SESSION_CB) (const SSL *ssl, unsigned char *id,
-                               unsigned int *id_len);
-
-typedef struct ssl_comp_st SSL_COMP;
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-struct ssl_comp_st {
-    int id;
-    const char *name;
-#  ifndef OPENSSL_NO_COMP
-    COMP_METHOD *method;
-#  else
-    char *method;
-#  endif
-};
-
-DECLARE_STACK_OF(SSL_COMP)
-DECLARE_LHASH_OF(SSL_SESSION);
-
-struct ssl_ctx_st {
-    const SSL_METHOD *method;
-    STACK_OF(SSL_CIPHER) *cipher_list;
-    /* same as above but sorted for lookup */
-    STACK_OF(SSL_CIPHER) *cipher_list_by_id;
-    struct x509_store_st /* X509_STORE */ *cert_store;
-    LHASH_OF(SSL_SESSION) *sessions;
-    /*
-     * Most session-ids that will be cached, default is
-     * SSL_SESSION_CACHE_MAX_SIZE_DEFAULT. 0 is unlimited.
-     */
-    unsigned long session_cache_size;
-    struct ssl_session_st *session_cache_head;
-    struct ssl_session_st *session_cache_tail;
-    /*
-     * This can have one of 2 values, ored together, SSL_SESS_CACHE_CLIENT,
-     * SSL_SESS_CACHE_SERVER, Default is SSL_SESSION_CACHE_SERVER, which
-     * means only SSL_accept which cache SSL_SESSIONS.
-     */
-    int session_cache_mode;
-    /*
-     * If timeout is not 0, it is the default timeout value set when
-     * SSL_new() is called.  This has been put in to make life easier to set
-     * things up
-     */
-    long session_timeout;
-    /*
-     * If this callback is not null, it will be called each time a session id
-     * is added to the cache.  If this function returns 1, it means that the
-     * callback will do a SSL_SESSION_free() when it has finished using it.
-     * Otherwise, on 0, it means the callback has finished with it. If
-     * remove_session_cb is not null, it will be called when a session-id is
-     * removed from the cache.  After the call, OpenSSL will
-     * SSL_SESSION_free() it.
-     */
-    int (*new_session_cb) (struct ssl_st *ssl, SSL_SESSION *sess);
-    void (*remove_session_cb) (struct ssl_ctx_st *ctx, SSL_SESSION *sess);
-    SSL_SESSION *(*get_session_cb) (struct ssl_st *ssl,
-                                    unsigned char *data, int len, int *copy);
-    struct {
-        int sess_connect;       /* SSL new conn - started */
-        int sess_connect_renegotiate; /* SSL reneg - requested */
-        int sess_connect_good;  /* SSL new conne/reneg - finished */
-        int sess_accept;        /* SSL new accept - started */
-        int sess_accept_renegotiate; /* SSL reneg - requested */
-        int sess_accept_good;   /* SSL accept/reneg - finished */
-        int sess_miss;          /* session lookup misses */
-        int sess_timeout;       /* reuse attempt on timeouted session */
-        int sess_cache_full;    /* session removed due to full cache */
-        int sess_hit;           /* session reuse actually done */
-        int sess_cb_hit;        /* session-id that was not in the cache was
-                                 * passed back via the callback.  This
-                                 * indicates that the application is
-                                 * supplying session-id's from other
-                                 * processes - spooky :-) */
-    } stats;
-
-    int references;
-
-    /* if defined, these override the X509_verify_cert() calls */
-    int (*app_verify_callback) (X509_STORE_CTX *, void *);
-    void *app_verify_arg;
-    /*
-     * before OpenSSL 0.9.7, 'app_verify_arg' was ignored
-     * ('app_verify_callback' was called with just one argument)
-     */
-
-    /* Default password callback. */
-    pem_password_cb *default_passwd_callback;
-
-    /* Default password callback user data. */
-    void *default_passwd_callback_userdata;
-
-    /* get client cert callback */
-    int (*client_cert_cb) (SSL *ssl, X509 **x509, EVP_PKEY **pkey);
-
-    /* cookie generate callback */
-    int (*app_gen_cookie_cb) (SSL *ssl, unsigned char *cookie,
-                              unsigned int *cookie_len);
-
-    /* verify cookie callback */
-    int (*app_verify_cookie_cb) (SSL *ssl, unsigned char *cookie,
-                                 unsigned int cookie_len);
-
-    CRYPTO_EX_DATA ex_data;
-
-    const EVP_MD *rsa_md5;      /* For SSLv2 - name is 'ssl2-md5' */
-    const EVP_MD *md5;          /* For SSLv3/TLSv1 'ssl3-md5' */
-    const EVP_MD *sha1;         /* For SSLv3/TLSv1 'ssl3->sha1' */
-
-    STACK_OF(X509) *extra_certs;
-    STACK_OF(SSL_COMP) *comp_methods; /* stack of SSL_COMP, SSLv3/TLSv1 */
-
-    /* Default values used when no per-SSL value is defined follow */
-
-    /* used if SSL's info_callback is NULL */
-    void (*info_callback) (const SSL *ssl, int type, int val);
-
-    /* what we put in client cert requests */
-    STACK_OF(X509_NAME) *client_CA;
-
-    /*
-     * Default values to use in SSL structures follow (these are copied by
-     * SSL_new)
-     */
-
-    unsigned long options;
-    unsigned long mode;
-    long max_cert_list;
-
-    struct cert_st /* CERT */ *cert;
-    int read_ahead;
-
-    /* callback that allows applications to peek at protocol messages */
-    void (*msg_callback) (int write_p, int version, int content_type,
-                          const void *buf, size_t len, SSL *ssl, void *arg);
-    void *msg_callback_arg;
-
-    int verify_mode;
-    unsigned int sid_ctx_length;
-    unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-    /* called 'verify_callback' in the SSL */
-    int (*default_verify_callback) (int ok, X509_STORE_CTX *ctx);
-
-    /* Default generate session ID callback. */
-    GEN_SESSION_CB generate_session_id;
-
-    X509_VERIFY_PARAM *param;
-
-#  if 0
-    int purpose;                /* Purpose setting */
-    int trust;                  /* Trust setting */
-#  endif
-
-    int quiet_shutdown;
-
-    /*
-     * Maximum amount of data to send in one fragment. actual record size can
-     * be more than this due to padding and MAC overheads.
-     */
-    unsigned int max_send_fragment;
-
-#  ifndef OPENSSL_NO_ENGINE
-    /*
-     * Engine to pass requests for client certs to
-     */
-    ENGINE *client_cert_engine;
-#  endif
-
-#  ifndef OPENSSL_NO_TLSEXT
-    /* TLS extensions servername callback */
-    int (*tlsext_servername_callback) (SSL *, int *, void *);
-    void *tlsext_servername_arg;
-    /* RFC 4507 session ticket keys */
-    unsigned char tlsext_tick_key_name[16];
-    unsigned char tlsext_tick_hmac_key[16];
-    unsigned char tlsext_tick_aes_key[16];
-    /* Callback to support customisation of ticket key setting */
-    int (*tlsext_ticket_key_cb) (SSL *ssl,
-                                 unsigned char *name, unsigned char *iv,
-                                 EVP_CIPHER_CTX *ectx,
-                                 HMAC_CTX *hctx, int enc);
-
-    /* certificate status request info */
-    /* Callback for status request */
-    int (*tlsext_status_cb) (SSL *ssl, void *arg);
-    void *tlsext_status_arg;
-
-    /* draft-rescorla-tls-opaque-prf-input-00.txt information */
-    int (*tlsext_opaque_prf_input_callback) (SSL *, void *peerinput,
-                                             size_t len, void *arg);
-    void *tlsext_opaque_prf_input_callback_arg;
-#  endif
-
-#  ifndef OPENSSL_NO_PSK
-    char *psk_identity_hint;
-    unsigned int (*psk_client_callback) (SSL *ssl, const char *hint,
-                                         char *identity,
-                                         unsigned int max_identity_len,
-                                         unsigned char *psk,
-                                         unsigned int max_psk_len);
-    unsigned int (*psk_server_callback) (SSL *ssl, const char *identity,
-                                         unsigned char *psk,
-                                         unsigned int max_psk_len);
-#  endif
-
-#  ifndef OPENSSL_NO_BUF_FREELISTS
-#   define SSL_MAX_BUF_FREELIST_LEN_DEFAULT 32
-    unsigned int freelist_max_len;
-    struct ssl3_buf_freelist_st *wbuf_freelist;
-    struct ssl3_buf_freelist_st *rbuf_freelist;
-#  endif
-#  ifndef OPENSSL_NO_SRP
-    SRP_CTX srp_ctx;            /* ctx for SRP authentication */
-#  endif
-
-#  ifndef OPENSSL_NO_TLSEXT
-
-#   ifndef OPENSSL_NO_NEXTPROTONEG
-    /* Next protocol negotiation information */
-    /* (for experimental NPN extension). */
-
-    /*
-     * For a server, this contains a callback function by which the set of
-     * advertised protocols can be provided.
-     */
-    int (*next_protos_advertised_cb) (SSL *s, const unsigned char **buf,
-                                      unsigned int *len, void *arg);
-    void *next_protos_advertised_cb_arg;
-    /*
-     * For a client, this contains a callback function that selects the next
-     * protocol from the list provided by the server.
-     */
-    int (*next_proto_select_cb) (SSL *s, unsigned char **out,
-                                 unsigned char *outlen,
-                                 const unsigned char *in,
-                                 unsigned int inlen, void *arg);
-    void *next_proto_select_cb_arg;
-#   endif
-    /* SRTP profiles we are willing to do from RFC 5764 */
-    STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles;
-
-    /*
-     * ALPN information (we are in the process of transitioning from NPN to
-     * ALPN.)
-     */
-
-    /*-
-     * For a server, this contains a callback function that allows the
-     * server to select the protocol for the connection.
-     *   out: on successful return, this must point to the raw protocol
-     *        name (without the length prefix).
-     *   outlen: on successful return, this contains the length of |*out|.
-     *   in: points to the client's list of supported protocols in
-     *       wire-format.
-     *   inlen: the length of |in|.
-     */
-    int (*alpn_select_cb) (SSL *s,
-                           const unsigned char **out,
-                           unsigned char *outlen,
-                           const unsigned char *in,
-                           unsigned int inlen, void *arg);
-    void *alpn_select_cb_arg;
-
-    /*
-     * For a client, this contains the list of supported protocols in wire
-     * format.
-     */
-    unsigned char *alpn_client_proto_list;
-    unsigned alpn_client_proto_list_len;
-
-#   ifndef OPENSSL_NO_EC
-    /* EC extension values inherited by SSL structure */
-    size_t tlsext_ecpointformatlist_length;
-    unsigned char *tlsext_ecpointformatlist;
-    size_t tlsext_ellipticcurvelist_length;
-    unsigned char *tlsext_ellipticcurvelist;
-#   endif                       /* OPENSSL_NO_EC */
-#  endif
-};
-
-# endif
-
-# define SSL_SESS_CACHE_OFF                      0x0000
-# define SSL_SESS_CACHE_CLIENT                   0x0001
-# define SSL_SESS_CACHE_SERVER                   0x0002
-# define SSL_SESS_CACHE_BOTH     (SSL_SESS_CACHE_CLIENT|SSL_SESS_CACHE_SERVER)
-# define SSL_SESS_CACHE_NO_AUTO_CLEAR            0x0080
-/* enough comments already ... see SSL_CTX_set_session_cache_mode(3) */
-# define SSL_SESS_CACHE_NO_INTERNAL_LOOKUP       0x0100
-# define SSL_SESS_CACHE_NO_INTERNAL_STORE        0x0200
-# define SSL_SESS_CACHE_NO_INTERNAL \
-        (SSL_SESS_CACHE_NO_INTERNAL_LOOKUP|SSL_SESS_CACHE_NO_INTERNAL_STORE)
-
-LHASH_OF(SSL_SESSION) *SSL_CTX_sessions(SSL_CTX *ctx);
-# define SSL_CTX_sess_number(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_NUMBER,0,NULL)
-# define SSL_CTX_sess_connect(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT,0,NULL)
-# define SSL_CTX_sess_connect_good(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_GOOD,0,NULL)
-# define SSL_CTX_sess_connect_renegotiate(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_RENEGOTIATE,0,NULL)
-# define SSL_CTX_sess_accept(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT,0,NULL)
-# define SSL_CTX_sess_accept_renegotiate(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_RENEGOTIATE,0,NULL)
-# define SSL_CTX_sess_accept_good(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_GOOD,0,NULL)
-# define SSL_CTX_sess_hits(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_HIT,0,NULL)
-# define SSL_CTX_sess_cb_hits(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CB_HIT,0,NULL)
-# define SSL_CTX_sess_misses(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_MISSES,0,NULL)
-# define SSL_CTX_sess_timeouts(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_TIMEOUTS,0,NULL)
-# define SSL_CTX_sess_cache_full(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CACHE_FULL,0,NULL)
-
-void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx,
-                             int (*new_session_cb) (struct ssl_st *ssl,
-                                                    SSL_SESSION *sess));
-int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx)) (struct ssl_st *ssl,
-                                              SSL_SESSION *sess);
-void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx,
-                                void (*remove_session_cb) (struct ssl_ctx_st
-                                                           *ctx,
-                                                           SSL_SESSION
-                                                           *sess));
-void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx)) (struct ssl_ctx_st *ctx,
-                                                  SSL_SESSION *sess);
-void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
-                             SSL_SESSION *(*get_session_cb) (struct ssl_st
-                                                             *ssl,
-                                                             unsigned char
-                                                             *data, int len,
-                                                             int *copy));
-SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx)) (struct ssl_st *ssl,
-                                                       unsigned char *Data,
-                                                       int len, int *copy);
-void SSL_CTX_set_info_callback(SSL_CTX *ctx,
-                               void (*cb) (const SSL *ssl, int type,
-                                           int val));
-void (*SSL_CTX_get_info_callback(SSL_CTX *ctx)) (const SSL *ssl, int type,
-                                                 int val);
-void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx,
-                                int (*client_cert_cb) (SSL *ssl, X509 **x509,
-                                                       EVP_PKEY **pkey));
-int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx)) (SSL *ssl, X509 **x509,
-                                                 EVP_PKEY **pkey);
-# ifndef OPENSSL_NO_ENGINE
-int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e);
-# endif
-void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx,
-                                    int (*app_gen_cookie_cb) (SSL *ssl,
-                                                              unsigned char
-                                                              *cookie,
-                                                              unsigned int
-                                                              *cookie_len));
-void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx,
-                                  int (*app_verify_cookie_cb) (SSL *ssl,
-                                                               unsigned char
-                                                               *cookie,
-                                                               unsigned int
-                                                               cookie_len));
-# ifndef OPENSSL_NO_NEXTPROTONEG
-void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s,
-                                           int (*cb) (SSL *ssl,
-                                                      const unsigned char
-                                                      **out,
-                                                      unsigned int *outlen,
-                                                      void *arg), void *arg);
-void SSL_CTX_set_next_proto_select_cb(SSL_CTX *s,
-                                      int (*cb) (SSL *ssl,
-                                                 unsigned char **out,
-                                                 unsigned char *outlen,
-                                                 const unsigned char *in,
-                                                 unsigned int inlen,
-                                                 void *arg), void *arg);
-void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data,
-                                    unsigned *len);
-# endif
-
-# ifndef OPENSSL_NO_TLSEXT
-int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
-                          const unsigned char *in, unsigned int inlen,
-                          const unsigned char *client,
-                          unsigned int client_len);
-# endif
-
-# define OPENSSL_NPN_UNSUPPORTED 0
-# define OPENSSL_NPN_NEGOTIATED  1
-# define OPENSSL_NPN_NO_OVERLAP  2
-
-int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos,
-                            unsigned protos_len);
-int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos,
-                        unsigned protos_len);
-void SSL_CTX_set_alpn_select_cb(SSL_CTX *ctx,
-                                int (*cb) (SSL *ssl,
-                                           const unsigned char **out,
-                                           unsigned char *outlen,
-                                           const unsigned char *in,
-                                           unsigned int inlen,
-                                           void *arg), void *arg);
-void SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data,
-                            unsigned *len);
-
-# ifndef OPENSSL_NO_PSK
-/*
- * the maximum length of the buffer given to callbacks containing the
- * resulting identity/psk
- */
-#  define PSK_MAX_IDENTITY_LEN 128
-#  define PSK_MAX_PSK_LEN 256
-void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx,
-                                     unsigned int (*psk_client_callback) (SSL
-                                                                          *ssl,
-                                                                          const
-                                                                          char
-                                                                          *hint,
-                                                                          char
-                                                                          *identity,
-                                                                          unsigned
-                                                                          int
-                                                                          max_identity_len,
-                                                                          unsigned
-                                                                          char
-                                                                          *psk,
-                                                                          unsigned
-                                                                          int
-                                                                          max_psk_len));
-void SSL_set_psk_client_callback(SSL *ssl,
-                                 unsigned int (*psk_client_callback) (SSL
-                                                                      *ssl,
-                                                                      const
-                                                                      char
-                                                                      *hint,
-                                                                      char
-                                                                      *identity,
-                                                                      unsigned
-                                                                      int
-                                                                      max_identity_len,
-                                                                      unsigned
-                                                                      char
-                                                                      *psk,
-                                                                      unsigned
-                                                                      int
-                                                                      max_psk_len));
-void SSL_CTX_set_psk_server_callback(SSL_CTX *ctx,
-                                     unsigned int (*psk_server_callback) (SSL
-                                                                          *ssl,
-                                                                          const
-                                                                          char
-                                                                          *identity,
-                                                                          unsigned
-                                                                          char
-                                                                          *psk,
-                                                                          unsigned
-                                                                          int
-                                                                          max_psk_len));
-void SSL_set_psk_server_callback(SSL *ssl,
-                                 unsigned int (*psk_server_callback) (SSL
-                                                                      *ssl,
-                                                                      const
-                                                                      char
-                                                                      *identity,
-                                                                      unsigned
-                                                                      char
-                                                                      *psk,
-                                                                      unsigned
-                                                                      int
-                                                                      max_psk_len));
-int SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *identity_hint);
-int SSL_use_psk_identity_hint(SSL *s, const char *identity_hint);
-const char *SSL_get_psk_identity_hint(const SSL *s);
-const char *SSL_get_psk_identity(const SSL *s);
-# endif
-
-# ifndef OPENSSL_NO_TLSEXT
-/* Register callbacks to handle custom TLS Extensions for client or server. */
-
-int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
-                                  custom_ext_add_cb add_cb,
-                                  custom_ext_free_cb free_cb,
-                                  void *add_arg,
-                                  custom_ext_parse_cb parse_cb,
-                                  void *parse_arg);
-
-int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
-                                  custom_ext_add_cb add_cb,
-                                  custom_ext_free_cb free_cb,
-                                  void *add_arg,
-                                  custom_ext_parse_cb parse_cb,
-                                  void *parse_arg);
-
-int SSL_extension_supported(unsigned int ext_type);
-
-# endif
-
-# define SSL_NOTHING     1
-# define SSL_WRITING     2
-# define SSL_READING     3
-# define SSL_X509_LOOKUP 4
-
-/* These will only be used when doing non-blocking IO */
-# define SSL_want_nothing(s)     (SSL_want(s) == SSL_NOTHING)
-# define SSL_want_read(s)        (SSL_want(s) == SSL_READING)
-# define SSL_want_write(s)       (SSL_want(s) == SSL_WRITING)
-# define SSL_want_x509_lookup(s) (SSL_want(s) == SSL_X509_LOOKUP)
-
-# define SSL_MAC_FLAG_READ_MAC_STREAM 1
-# define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-struct ssl_st {
-    /*
-     * protocol version (one of SSL2_VERSION, SSL3_VERSION, TLS1_VERSION,
-     * DTLS1_VERSION)
-     */
-    int version;
-    /* SSL_ST_CONNECT or SSL_ST_ACCEPT */
-    int type;
-    /* SSLv3 */
-    const SSL_METHOD *method;
-    /*
-     * There are 2 BIO's even though they are normally both the same.  This
-     * is so data can be read and written to different handlers
-     */
-#  ifndef OPENSSL_NO_BIO
-    /* used by SSL_read */
-    BIO *rbio;
-    /* used by SSL_write */
-    BIO *wbio;
-    /* used during session-id reuse to concatenate messages */
-    BIO *bbio;
-#  else
-    /* used by SSL_read */
-    char *rbio;
-    /* used by SSL_write */
-    char *wbio;
-    char *bbio;
-#  endif
-    /*
-     * This holds a variable that indicates what we were doing when a 0 or -1
-     * is returned.  This is needed for non-blocking IO so we know what
-     * request needs re-doing when in SSL_accept or SSL_connect
-     */
-    int rwstate;
-    /* true when we are actually in SSL_accept() or SSL_connect() */
-    int in_handshake;
-    int (*handshake_func) (SSL *);
-    /*
-     * Imagine that here's a boolean member "init" that is switched as soon
-     * as SSL_set_{accept/connect}_state is called for the first time, so
-     * that "state" and "handshake_func" are properly initialized.  But as
-     * handshake_func is == 0 until then, we use this test instead of an
-     * "init" member.
-     */
-    /* are we the server side? - mostly used by SSL_clear */
-    int server;
-    /*
-     * Generate a new session or reuse an old one.
-     * NB: For servers, the 'new' session may actually be a previously
-     * cached session or even the previous session unless
-     * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set
-     */
-    int new_session;
-    /* don't send shutdown packets */
-    int quiet_shutdown;
-    /* we have shut things down, 0x01 sent, 0x02 for received */
-    int shutdown;
-    /* where we are */
-    int state;
-    /* where we are when reading */
-    int rstate;
-    BUF_MEM *init_buf;          /* buffer used during init */
-    void *init_msg;             /* pointer to handshake message body, set by
-                                 * ssl3_get_message() */
-    int init_num;               /* amount read/written */
-    int init_off;               /* amount read/written */
-    /* used internally to point at a raw packet */
-    unsigned char *packet;
-    unsigned int packet_length;
-    struct ssl2_state_st *s2;   /* SSLv2 variables */
-    struct ssl3_state_st *s3;   /* SSLv3 variables */
-    struct dtls1_state_st *d1;  /* DTLSv1 variables */
-    int read_ahead;             /* Read as many input bytes as possible (for
-                                 * non-blocking reads) */
-    /* callback that allows applications to peek at protocol messages */
-    void (*msg_callback) (int write_p, int version, int content_type,
-                          const void *buf, size_t len, SSL *ssl, void *arg);
-    void *msg_callback_arg;
-    int hit;                    /* reusing a previous session */
-    X509_VERIFY_PARAM *param;
-#  if 0
-    int purpose;                /* Purpose setting */
-    int trust;                  /* Trust setting */
-#  endif
-    /* crypto */
-    STACK_OF(SSL_CIPHER) *cipher_list;
-    STACK_OF(SSL_CIPHER) *cipher_list_by_id;
-    /*
-     * These are the ones being used, the ones in SSL_SESSION are the ones to
-     * be 'copied' into these ones
-     */
-    int mac_flags;
-    EVP_CIPHER_CTX *enc_read_ctx; /* cryptographic state */
-    EVP_MD_CTX *read_hash;      /* used for mac generation */
-#  ifndef OPENSSL_NO_COMP
-    COMP_CTX *expand;           /* uncompress */
-#  else
-    char *expand;
-#  endif
-    EVP_CIPHER_CTX *enc_write_ctx; /* cryptographic state */
-    EVP_MD_CTX *write_hash;     /* used for mac generation */
-#  ifndef OPENSSL_NO_COMP
-    COMP_CTX *compress;         /* compression */
-#  else
-    char *compress;
-#  endif
-    /* session info */
-    /* client cert? */
-    /* This is used to hold the server certificate used */
-    struct cert_st /* CERT */ *cert;
-    /*
-     * the session_id_context is used to ensure sessions are only reused in
-     * the appropriate context
-     */
-    unsigned int sid_ctx_length;
-    unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-    /* This can also be in the session once a session is established */
-    SSL_SESSION *session;
-    /* Default generate session ID callback. */
-    GEN_SESSION_CB generate_session_id;
-    /* Used in SSL2 and SSL3 */
-    /*
-     * 0 don't care about verify failure.
-     * 1 fail if verify fails
-     */
-    int verify_mode;
-    /* fail if callback returns 0 */
-    int (*verify_callback) (int ok, X509_STORE_CTX *ctx);
-    /* optional informational callback */
-    void (*info_callback) (const SSL *ssl, int type, int val);
-    /* error bytes to be written */
-    int error;
-    /* actual code */
-    int error_code;
-#  ifndef OPENSSL_NO_KRB5
-    /* Kerberos 5 context */
-    KSSL_CTX *kssl_ctx;
-#  endif                        /* OPENSSL_NO_KRB5 */
-#  ifndef OPENSSL_NO_PSK
-    unsigned int (*psk_client_callback) (SSL *ssl, const char *hint,
-                                         char *identity,
-                                         unsigned int max_identity_len,
-                                         unsigned char *psk,
-                                         unsigned int max_psk_len);
-    unsigned int (*psk_server_callback) (SSL *ssl, const char *identity,
-                                         unsigned char *psk,
-                                         unsigned int max_psk_len);
-#  endif
-    SSL_CTX *ctx;
-    /*
-     * set this flag to 1 and a sleep(1) is put into all SSL_read() and
-     * SSL_write() calls, good for nbio debuging :-)
-     */
-    int debug;
-    /* extra application data */
-    long verify_result;
-    CRYPTO_EX_DATA ex_data;
-    /* for server side, keep the list of CA_dn we can use */
-    STACK_OF(X509_NAME) *client_CA;
-    int references;
-    /* protocol behaviour */
-    unsigned long options;
-    /* API behaviour */
-    unsigned long mode;
-    long max_cert_list;
-    int first_packet;
-    /* what was passed, used for SSLv3/TLS rollback check */
-    int client_version;
-    unsigned int max_send_fragment;
-#  ifndef OPENSSL_NO_TLSEXT
-    /* TLS extension debug callback */
-    void (*tlsext_debug_cb) (SSL *s, int client_server, int type,
-                             unsigned char *data, int len, void *arg);
-    void *tlsext_debug_arg;
-    char *tlsext_hostname;
-    /*-
-     * no further mod of servername
-     * 0 : call the servername extension callback.
-     * 1 : prepare 2, allow last ack just after in server callback.
-     * 2 : don't call servername callback, no ack in server hello
-     */
-    int servername_done;
-    /* certificate status request info */
-    /* Status type or -1 if no status type */
-    int tlsext_status_type;
-    /* Expect OCSP CertificateStatus message */
-    int tlsext_status_expected;
-    /* OCSP status request only */
-    STACK_OF(OCSP_RESPID) *tlsext_ocsp_ids;
-    X509_EXTENSIONS *tlsext_ocsp_exts;
-    /* OCSP response received or to be sent */
-    unsigned char *tlsext_ocsp_resp;
-    int tlsext_ocsp_resplen;
-    /* RFC4507 session ticket expected to be received or sent */
-    int tlsext_ticket_expected;
-#   ifndef OPENSSL_NO_EC
-    size_t tlsext_ecpointformatlist_length;
-    /* our list */
-    unsigned char *tlsext_ecpointformatlist;
-    size_t tlsext_ellipticcurvelist_length;
-    /* our list */
-    unsigned char *tlsext_ellipticcurvelist;
-#   endif                       /* OPENSSL_NO_EC */
-    /*
-     * draft-rescorla-tls-opaque-prf-input-00.txt information to be used for
-     * handshakes
-     */
-    void *tlsext_opaque_prf_input;
-    size_t tlsext_opaque_prf_input_len;
-    /* TLS Session Ticket extension override */
-    TLS_SESSION_TICKET_EXT *tlsext_session_ticket;
-    /* TLS Session Ticket extension callback */
-    tls_session_ticket_ext_cb_fn tls_session_ticket_ext_cb;
-    void *tls_session_ticket_ext_cb_arg;
-    /* TLS pre-shared secret session resumption */
-    tls_session_secret_cb_fn tls_session_secret_cb;
-    void *tls_session_secret_cb_arg;
-    SSL_CTX *initial_ctx;       /* initial ctx, used to store sessions */
-#   ifndef OPENSSL_NO_NEXTPROTONEG
-    /*
-     * Next protocol negotiation. For the client, this is the protocol that
-     * we sent in NextProtocol and is set when handling ServerHello
-     * extensions. For a server, this is the client's selected_protocol from
-     * NextProtocol and is set when handling the NextProtocol message, before
-     * the Finished message.
-     */
-    unsigned char *next_proto_negotiated;
-    unsigned char next_proto_negotiated_len;
-#   endif
-#   define session_ctx initial_ctx
-    /* What we'll do */
-    STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles;
-    /* What's been chosen */
-    SRTP_PROTECTION_PROFILE *srtp_profile;
-        /*-
-         * Is use of the Heartbeat extension negotiated?
-         * 0: disabled
-         * 1: enabled
-         * 2: enabled, but not allowed to send Requests
-         */
-    unsigned int tlsext_heartbeat;
-    /* Indicates if a HeartbeatRequest is in flight */
-    unsigned int tlsext_hb_pending;
-    /* HeartbeatRequest sequence number */
-    unsigned int tlsext_hb_seq;
-#  else
-#   define session_ctx ctx
-#  endif                        /* OPENSSL_NO_TLSEXT */
-    /*-
-     * 1 if we are renegotiating.
-     * 2 if we are a server and are inside a handshake
-     * (i.e. not just sending a HelloRequest)
-     */
-    int renegotiate;
-#  ifndef OPENSSL_NO_SRP
-    /* ctx for SRP authentication */
-    SRP_CTX srp_ctx;
-#  endif
-#  ifndef OPENSSL_NO_TLSEXT
-    /*
-     * For a client, this contains the list of supported protocols in wire
-     * format.
-     */
-    unsigned char *alpn_client_proto_list;
-    unsigned alpn_client_proto_list_len;
-#  endif                        /* OPENSSL_NO_TLSEXT */
-};
-
-# endif
-
-#ifdef __cplusplus
-}
-#endif
-
-# include <openssl/ssl2.h>
-# include <openssl/ssl3.h>
-# include <openssl/tls1.h>      /* This is mostly sslv3 with a few tweaks */
-# include <openssl/dtls1.h>     /* Datagram TLS */
-# include <openssl/ssl23.h>
-# include <openssl/srtp.h>      /* Support for the use_srtp extension */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* compatibility */
-# define SSL_set_app_data(s,arg)         (SSL_set_ex_data(s,0,(char *)arg))
-# define SSL_get_app_data(s)             (SSL_get_ex_data(s,0))
-# define SSL_SESSION_set_app_data(s,a)   (SSL_SESSION_set_ex_data(s,0,(char *)a))
-# define SSL_SESSION_get_app_data(s)     (SSL_SESSION_get_ex_data(s,0))
-# define SSL_CTX_get_app_data(ctx)       (SSL_CTX_get_ex_data(ctx,0))
-# define SSL_CTX_set_app_data(ctx,arg)   (SSL_CTX_set_ex_data(ctx,0,(char *)arg))
-
-/*
- * The following are the possible values for ssl->state are are used to
- * indicate where we are up to in the SSL connection establishment. The
- * macros that follow are about the only things you should need to use and
- * even then, only when using non-blocking IO. It can also be useful to work
- * out where you were when the connection failed
- */
-
-# define SSL_ST_CONNECT                  0x1000
-# define SSL_ST_ACCEPT                   0x2000
-# define SSL_ST_MASK                     0x0FFF
-# define SSL_ST_INIT                     (SSL_ST_CONNECT|SSL_ST_ACCEPT)
-# define SSL_ST_BEFORE                   0x4000
-# define SSL_ST_OK                       0x03
-# define SSL_ST_RENEGOTIATE              (0x04|SSL_ST_INIT)
-# define SSL_ST_ERR                      (0x05|SSL_ST_INIT)
-
-# define SSL_CB_LOOP                     0x01
-# define SSL_CB_EXIT                     0x02
-# define SSL_CB_READ                     0x04
-# define SSL_CB_WRITE                    0x08
-# define SSL_CB_ALERT                    0x4000/* used in callback */
-# define SSL_CB_READ_ALERT               (SSL_CB_ALERT|SSL_CB_READ)
-# define SSL_CB_WRITE_ALERT              (SSL_CB_ALERT|SSL_CB_WRITE)
-# define SSL_CB_ACCEPT_LOOP              (SSL_ST_ACCEPT|SSL_CB_LOOP)
-# define SSL_CB_ACCEPT_EXIT              (SSL_ST_ACCEPT|SSL_CB_EXIT)
-# define SSL_CB_CONNECT_LOOP             (SSL_ST_CONNECT|SSL_CB_LOOP)
-# define SSL_CB_CONNECT_EXIT             (SSL_ST_CONNECT|SSL_CB_EXIT)
-# define SSL_CB_HANDSHAKE_START          0x10
-# define SSL_CB_HANDSHAKE_DONE           0x20
-
-/* Is the SSL_connection established? */
-# define SSL_get_state(a)                SSL_state(a)
-# define SSL_is_init_finished(a)         (SSL_state(a) == SSL_ST_OK)
-# define SSL_in_init(a)                  (SSL_state(a)&SSL_ST_INIT)
-# define SSL_in_before(a)                (SSL_state(a)&SSL_ST_BEFORE)
-# define SSL_in_connect_init(a)          (SSL_state(a)&SSL_ST_CONNECT)
-# define SSL_in_accept_init(a)           (SSL_state(a)&SSL_ST_ACCEPT)
-
-/*
- * The following 2 states are kept in ssl->rstate when reads fail, you should
- * not need these
- */
-# define SSL_ST_READ_HEADER                      0xF0
-# define SSL_ST_READ_BODY                        0xF1
-# define SSL_ST_READ_DONE                        0xF2
-
-/*-
- * Obtain latest Finished message
- *   -- that we sent (SSL_get_finished)
- *   -- that we expected from peer (SSL_get_peer_finished).
- * Returns length (0 == no Finished so far), copies up to 'count' bytes.
- */
-size_t SSL_get_finished(const SSL *s, void *buf, size_t count);
-size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
-
-/*
- * use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options are
- * 'ored' with SSL_VERIFY_PEER if they are desired
- */
-# define SSL_VERIFY_NONE                 0x00
-# define SSL_VERIFY_PEER                 0x01
-# define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02
-# define SSL_VERIFY_CLIENT_ONCE          0x04
-
-# define OpenSSL_add_ssl_algorithms()    SSL_library_init()
-# define SSLeay_add_ssl_algorithms()     SSL_library_init()
-
-/* this is for backward compatibility */
-# if 0                          /* NEW_SSLEAY */
-#  define SSL_CTX_set_default_verify(a,b,c) SSL_CTX_set_verify(a,b,c)
-#  define SSL_set_pref_cipher(c,n)        SSL_set_cipher_list(c,n)
-#  define SSL_add_session(a,b)            SSL_CTX_add_session((a),(b))
-#  define SSL_remove_session(a,b)         SSL_CTX_remove_session((a),(b))
-#  define SSL_flush_sessions(a,b)         SSL_CTX_flush_sessions((a),(b))
-# endif
-/* More backward compatibility */
-# define SSL_get_cipher(s) \
-                SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-# define SSL_get_cipher_bits(s,np) \
-                SSL_CIPHER_get_bits(SSL_get_current_cipher(s),np)
-# define SSL_get_cipher_version(s) \
-                SSL_CIPHER_get_version(SSL_get_current_cipher(s))
-# define SSL_get_cipher_name(s) \
-                SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-# define SSL_get_time(a)         SSL_SESSION_get_time(a)
-# define SSL_set_time(a,b)       SSL_SESSION_set_time((a),(b))
-# define SSL_get_timeout(a)      SSL_SESSION_get_timeout(a)
-# define SSL_set_timeout(a,b)    SSL_SESSION_set_timeout((a),(b))
-
-# define d2i_SSL_SESSION_bio(bp,s_id) ASN1_d2i_bio_of(SSL_SESSION,SSL_SESSION_new,d2i_SSL_SESSION,bp,s_id)
-# define i2d_SSL_SESSION_bio(bp,s_id) ASN1_i2d_bio_of(SSL_SESSION,i2d_SSL_SESSION,bp,s_id)
-
-DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
-# define SSL_AD_REASON_OFFSET            1000/* offset to get SSL_R_... value
-                                              * from SSL_AD_... */
-/* These alert types are for SSLv3 and TLSv1 */
-# define SSL_AD_CLOSE_NOTIFY             SSL3_AD_CLOSE_NOTIFY
-/* fatal */
-# define SSL_AD_UNEXPECTED_MESSAGE       SSL3_AD_UNEXPECTED_MESSAGE
-/* fatal */
-# define SSL_AD_BAD_RECORD_MAC           SSL3_AD_BAD_RECORD_MAC
-# define SSL_AD_DECRYPTION_FAILED        TLS1_AD_DECRYPTION_FAILED
-# define SSL_AD_RECORD_OVERFLOW          TLS1_AD_RECORD_OVERFLOW
-/* fatal */
-# define SSL_AD_DECOMPRESSION_FAILURE    SSL3_AD_DECOMPRESSION_FAILURE
-/* fatal */
-# define SSL_AD_HANDSHAKE_FAILURE        SSL3_AD_HANDSHAKE_FAILURE
-/* Not for TLS */
-# define SSL_AD_NO_CERTIFICATE           SSL3_AD_NO_CERTIFICATE
-# define SSL_AD_BAD_CERTIFICATE          SSL3_AD_BAD_CERTIFICATE
-# define SSL_AD_UNSUPPORTED_CERTIFICATE  SSL3_AD_UNSUPPORTED_CERTIFICATE
-# define SSL_AD_CERTIFICATE_REVOKED      SSL3_AD_CERTIFICATE_REVOKED
-# define SSL_AD_CERTIFICATE_EXPIRED      SSL3_AD_CERTIFICATE_EXPIRED
-# define SSL_AD_CERTIFICATE_UNKNOWN      SSL3_AD_CERTIFICATE_UNKNOWN
-/* fatal */
-# define SSL_AD_ILLEGAL_PARAMETER        SSL3_AD_ILLEGAL_PARAMETER
-/* fatal */
-# define SSL_AD_UNKNOWN_CA               TLS1_AD_UNKNOWN_CA
-/* fatal */
-# define SSL_AD_ACCESS_DENIED            TLS1_AD_ACCESS_DENIED
-/* fatal */
-# define SSL_AD_DECODE_ERROR             TLS1_AD_DECODE_ERROR
-# define SSL_AD_DECRYPT_ERROR            TLS1_AD_DECRYPT_ERROR
-/* fatal */
-# define SSL_AD_EXPORT_RESTRICTION       TLS1_AD_EXPORT_RESTRICTION
-/* fatal */
-# define SSL_AD_PROTOCOL_VERSION         TLS1_AD_PROTOCOL_VERSION
-/* fatal */
-# define SSL_AD_INSUFFICIENT_SECURITY    TLS1_AD_INSUFFICIENT_SECURITY
-/* fatal */
-# define SSL_AD_INTERNAL_ERROR           TLS1_AD_INTERNAL_ERROR
-# define SSL_AD_USER_CANCELLED           TLS1_AD_USER_CANCELLED
-# define SSL_AD_NO_RENEGOTIATION         TLS1_AD_NO_RENEGOTIATION
-# define SSL_AD_UNSUPPORTED_EXTENSION    TLS1_AD_UNSUPPORTED_EXTENSION
-# define SSL_AD_CERTIFICATE_UNOBTAINABLE TLS1_AD_CERTIFICATE_UNOBTAINABLE
-# define SSL_AD_UNRECOGNIZED_NAME        TLS1_AD_UNRECOGNIZED_NAME
-# define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
-# define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
-/* fatal */
-# define SSL_AD_UNKNOWN_PSK_IDENTITY     TLS1_AD_UNKNOWN_PSK_IDENTITY
-/* fatal */
-# define SSL_AD_INAPPROPRIATE_FALLBACK   TLS1_AD_INAPPROPRIATE_FALLBACK
-# define SSL_ERROR_NONE                  0
-# define SSL_ERROR_SSL                   1
-# define SSL_ERROR_WANT_READ             2
-# define SSL_ERROR_WANT_WRITE            3
-# define SSL_ERROR_WANT_X509_LOOKUP      4
-# define SSL_ERROR_SYSCALL               5/* look at error stack/return
-                                           * value/errno */
-# define SSL_ERROR_ZERO_RETURN           6
-# define SSL_ERROR_WANT_CONNECT          7
-# define SSL_ERROR_WANT_ACCEPT           8
-# define SSL_CTRL_NEED_TMP_RSA                   1
-# define SSL_CTRL_SET_TMP_RSA                    2
-# define SSL_CTRL_SET_TMP_DH                     3
-# define SSL_CTRL_SET_TMP_ECDH                   4
-# define SSL_CTRL_SET_TMP_RSA_CB                 5
-# define SSL_CTRL_SET_TMP_DH_CB                  6
-# define SSL_CTRL_SET_TMP_ECDH_CB                7
-# define SSL_CTRL_GET_SESSION_REUSED             8
-# define SSL_CTRL_GET_CLIENT_CERT_REQUEST        9
-# define SSL_CTRL_GET_NUM_RENEGOTIATIONS         10
-# define SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS       11
-# define SSL_CTRL_GET_TOTAL_RENEGOTIATIONS       12
-# define SSL_CTRL_GET_FLAGS                      13
-# define SSL_CTRL_EXTRA_CHAIN_CERT               14
-# define SSL_CTRL_SET_MSG_CALLBACK               15
-# define SSL_CTRL_SET_MSG_CALLBACK_ARG           16
-/* only applies to datagram connections */
-# define SSL_CTRL_SET_MTU                17
-/* Stats */
-# define SSL_CTRL_SESS_NUMBER                    20
-# define SSL_CTRL_SESS_CONNECT                   21
-# define SSL_CTRL_SESS_CONNECT_GOOD              22
-# define SSL_CTRL_SESS_CONNECT_RENEGOTIATE       23
-# define SSL_CTRL_SESS_ACCEPT                    24
-# define SSL_CTRL_SESS_ACCEPT_GOOD               25
-# define SSL_CTRL_SESS_ACCEPT_RENEGOTIATE        26
-# define SSL_CTRL_SESS_HIT                       27
-# define SSL_CTRL_SESS_CB_HIT                    28
-# define SSL_CTRL_SESS_MISSES                    29
-# define SSL_CTRL_SESS_TIMEOUTS                  30
-# define SSL_CTRL_SESS_CACHE_FULL                31
-# define SSL_CTRL_OPTIONS                        32
-# define SSL_CTRL_MODE                           33
-# define SSL_CTRL_GET_READ_AHEAD                 40
-# define SSL_CTRL_SET_READ_AHEAD                 41
-# define SSL_CTRL_SET_SESS_CACHE_SIZE            42
-# define SSL_CTRL_GET_SESS_CACHE_SIZE            43
-# define SSL_CTRL_SET_SESS_CACHE_MODE            44
-# define SSL_CTRL_GET_SESS_CACHE_MODE            45
-# define SSL_CTRL_GET_MAX_CERT_LIST              50
-# define SSL_CTRL_SET_MAX_CERT_LIST              51
-# define SSL_CTRL_SET_MAX_SEND_FRAGMENT          52
-/* see tls1.h for macros based on these */
-# ifndef OPENSSL_NO_TLSEXT
-#  define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB       53
-#  define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG      54
-#  define SSL_CTRL_SET_TLSEXT_HOSTNAME            55
-#  define SSL_CTRL_SET_TLSEXT_DEBUG_CB            56
-#  define SSL_CTRL_SET_TLSEXT_DEBUG_ARG           57
-#  define SSL_CTRL_GET_TLSEXT_TICKET_KEYS         58
-#  define SSL_CTRL_SET_TLSEXT_TICKET_KEYS         59
-#  define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT    60
-#  define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB 61
-#  define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG 62
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB       63
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG   64
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE     65
-#  define SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS     66
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS     67
-#  define SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS      68
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS      69
-#  define SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP        70
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP        71
-#  define SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB       72
-#  define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB    75
-#  define SSL_CTRL_SET_SRP_VERIFY_PARAM_CB                76
-#  define SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB             77
-#  define SSL_CTRL_SET_SRP_ARG            78
-#  define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME               79
-#  define SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH               80
-#  define SSL_CTRL_SET_TLS_EXT_SRP_PASSWORD               81
-#  ifndef OPENSSL_NO_HEARTBEATS
-#   define SSL_CTRL_TLS_EXT_SEND_HEARTBEAT                         85
-#   define SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING          86
-#   define SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS      87
-#  endif
-# endif                         /* OPENSSL_NO_TLSEXT */
-# define DTLS_CTRL_GET_TIMEOUT           73
-# define DTLS_CTRL_HANDLE_TIMEOUT        74
-# define DTLS_CTRL_LISTEN                        75
-# define SSL_CTRL_GET_RI_SUPPORT                 76
-# define SSL_CTRL_CLEAR_OPTIONS                  77
-# define SSL_CTRL_CLEAR_MODE                     78
-# define SSL_CTRL_GET_EXTRA_CHAIN_CERTS          82
-# define SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS        83
-# define SSL_CTRL_CHAIN                          88
-# define SSL_CTRL_CHAIN_CERT                     89
-# define SSL_CTRL_GET_CURVES                     90
-# define SSL_CTRL_SET_CURVES                     91
-# define SSL_CTRL_SET_CURVES_LIST                92
-# define SSL_CTRL_GET_SHARED_CURVE               93
-# define SSL_CTRL_SET_ECDH_AUTO                  94
-# define SSL_CTRL_SET_SIGALGS                    97
-# define SSL_CTRL_SET_SIGALGS_LIST               98
-# define SSL_CTRL_CERT_FLAGS                     99
-# define SSL_CTRL_CLEAR_CERT_FLAGS               100
-# define SSL_CTRL_SET_CLIENT_SIGALGS             101
-# define SSL_CTRL_SET_CLIENT_SIGALGS_LIST        102
-# define SSL_CTRL_GET_CLIENT_CERT_TYPES          103
-# define SSL_CTRL_SET_CLIENT_CERT_TYPES          104
-# define SSL_CTRL_BUILD_CERT_CHAIN               105
-# define SSL_CTRL_SET_VERIFY_CERT_STORE          106
-# define SSL_CTRL_SET_CHAIN_CERT_STORE           107
-# define SSL_CTRL_GET_PEER_SIGNATURE_NID         108
-# define SSL_CTRL_GET_SERVER_TMP_KEY             109
-# define SSL_CTRL_GET_RAW_CIPHERLIST             110
-# define SSL_CTRL_GET_EC_POINT_FORMATS           111
-# define SSL_CTRL_GET_CHAIN_CERTS                115
-# define SSL_CTRL_SELECT_CURRENT_CERT            116
-# define SSL_CTRL_SET_CURRENT_CERT               117
-# define SSL_CTRL_CHECK_PROTO_VERSION            119
-# define DTLS_CTRL_SET_LINK_MTU                  120
-# define DTLS_CTRL_GET_LINK_MIN_MTU              121
-# define SSL_CERT_SET_FIRST                      1
-# define SSL_CERT_SET_NEXT                       2
-# define SSL_CERT_SET_SERVER                     3
-# define DTLSv1_get_timeout(ssl, arg) \
-        SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg)
-# define DTLSv1_handle_timeout(ssl) \
-        SSL_ctrl(ssl,DTLS_CTRL_HANDLE_TIMEOUT,0, NULL)
-# define DTLSv1_listen(ssl, peer) \
-        SSL_ctrl(ssl,DTLS_CTRL_LISTEN,0, (void *)peer)
-# define SSL_session_reused(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_SESSION_REUSED,0,NULL)
-# define SSL_num_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_NUM_RENEGOTIATIONS,0,NULL)
-# define SSL_clear_num_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS,0,NULL)
-# define SSL_total_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_TOTAL_RENEGOTIATIONS,0,NULL)
-# define SSL_CTX_need_tmp_RSA(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_NEED_TMP_RSA,0,NULL)
-# define SSL_CTX_set_tmp_rsa(ctx,rsa) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA,0,(char *)rsa)
-# define SSL_CTX_set_tmp_dh(ctx,dh) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH,0,(char *)dh)
-# define SSL_CTX_set_tmp_ecdh(ctx,ecdh) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh)
-# define SSL_need_tmp_RSA(ssl) \
-        SSL_ctrl(ssl,SSL_CTRL_NEED_TMP_RSA,0,NULL)
-# define SSL_set_tmp_rsa(ssl,rsa) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_RSA,0,(char *)rsa)
-# define SSL_set_tmp_dh(ssl,dh) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH,0,(char *)dh)
-# define SSL_set_tmp_ecdh(ssl,ecdh) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh)
-# define SSL_CTX_add_extra_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
-# define SSL_CTX_get_extra_chain_certs(ctx,px509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_EXTRA_CHAIN_CERTS,0,px509)
-# define SSL_CTX_get_extra_chain_certs_only(ctx,px509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_EXTRA_CHAIN_CERTS,1,px509)
-# define SSL_CTX_clear_extra_chain_certs(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS,0,NULL)
-# define SSL_CTX_set0_chain(ctx,sk) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN,0,(char *)sk)
-# define SSL_CTX_set1_chain(ctx,sk) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN,1,(char *)sk)
-# define SSL_CTX_add0_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN_CERT,0,(char *)x509)
-# define SSL_CTX_add1_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN_CERT,1,(char *)x509)
-# define SSL_CTX_get0_chain_certs(ctx,px509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERTS,0,px509)
-# define SSL_CTX_clear_chain_certs(ctx) \
-        SSL_CTX_set0_chain(ctx,NULL)
-# define SSL_CTX_build_cert_chain(ctx, flags) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
-# define SSL_CTX_select_current_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)x509)
-# define SSL_CTX_set_current_cert(ctx, op) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CURRENT_CERT, op, NULL)
-# define SSL_CTX_set0_verify_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)st)
-# define SSL_CTX_set1_verify_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)st)
-# define SSL_CTX_set0_chain_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)st)
-# define SSL_CTX_set1_chain_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)st)
-# define SSL_set0_chain(ctx,sk) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN,0,(char *)sk)
-# define SSL_set1_chain(ctx,sk) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN,1,(char *)sk)
-# define SSL_add0_chain_cert(ctx,x509) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN_CERT,0,(char *)x509)
-# define SSL_add1_chain_cert(ctx,x509) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN_CERT,1,(char *)x509)
-# define SSL_get0_chain_certs(ctx,px509) \
-        SSL_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERTS,0,px509)
-# define SSL_clear_chain_certs(ctx) \
-        SSL_set0_chain(ctx,NULL)
-# define SSL_build_cert_chain(s, flags) \
-        SSL_ctrl(s,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
-# define SSL_select_current_cert(ctx,x509) \
-        SSL_ctrl(ctx,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)x509)
-# define SSL_set_current_cert(ctx,op) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CURRENT_CERT, op, NULL)
-# define SSL_set0_verify_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)st)
-# define SSL_set1_verify_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)st)
-# define SSL_set0_chain_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)st)
-# define SSL_set1_chain_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)st)
-# define SSL_get1_curves(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_GET_CURVES,0,(char *)s)
-# define SSL_CTX_set1_curves(ctx, clist, clistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CURVES,clistlen,(char *)clist)
-# define SSL_CTX_set1_curves_list(ctx, s) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CURVES_LIST,0,(char *)s)
-# define SSL_set1_curves(ctx, clist, clistlen) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CURVES,clistlen,(char *)clist)
-# define SSL_set1_curves_list(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CURVES_LIST,0,(char *)s)
-# define SSL_get_shared_curve(s, n) \
-        SSL_ctrl(s,SSL_CTRL_GET_SHARED_CURVE,n,NULL)
-# define SSL_CTX_set_ecdh_auto(ctx, onoff) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_ECDH_AUTO,onoff,NULL)
-# define SSL_set_ecdh_auto(s, onoff) \
-        SSL_ctrl(s,SSL_CTRL_SET_ECDH_AUTO,onoff,NULL)
-# define SSL_CTX_set1_sigalgs(ctx, slist, slistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SIGALGS,slistlen,(int *)slist)
-# define SSL_CTX_set1_sigalgs_list(ctx, s) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)s)
-# define SSL_set1_sigalgs(ctx, slist, slistlen) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS,slistlen,(int *)slist)
-# define SSL_set1_sigalgs_list(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)s)
-# define SSL_CTX_set1_client_sigalgs(ctx, slist, slistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS,slistlen,(int *)slist)
-# define SSL_CTX_set1_client_sigalgs_list(ctx, s) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS_LIST,0,(char *)s)
-# define SSL_set1_client_sigalgs(ctx, slist, slistlen) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS,clistlen,(int *)slist)
-# define SSL_set1_client_sigalgs_list(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS_LIST,0,(char *)s)
-# define SSL_get0_certificate_types(s, clist) \
-        SSL_ctrl(s, SSL_CTRL_GET_CLIENT_CERT_TYPES, 0, (char *)clist)
-# define SSL_CTX_set1_client_certificate_types(ctx, clist, clistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_CERT_TYPES,clistlen,(char *)clist)
-# define SSL_set1_client_certificate_types(s, clist, clistlen) \
-        SSL_ctrl(s,SSL_CTRL_SET_CLIENT_CERT_TYPES,clistlen,(char *)clist)
-# define SSL_get_peer_signature_nid(s, pn) \
-        SSL_ctrl(s,SSL_CTRL_GET_PEER_SIGNATURE_NID,0,pn)
-# define SSL_get_server_tmp_key(s, pk) \
-        SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk)
-# define SSL_get0_raw_cipherlist(s, plst) \
-        SSL_ctrl(s,SSL_CTRL_GET_RAW_CIPHERLIST,0,(char *)plst)
-# define SSL_get0_ec_point_formats(s, plst) \
-        SSL_ctrl(s,SSL_CTRL_GET_EC_POINT_FORMATS,0,(char *)plst)
-# ifndef OPENSSL_NO_BIO
-BIO_METHOD *BIO_f_ssl(void);
-BIO *BIO_new_ssl(SSL_CTX *ctx, int client);
-BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
-BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);
-int BIO_ssl_copy_session_id(BIO *to, BIO *from);
-void BIO_ssl_shutdown(BIO *ssl_bio);
-
-# endif
-
-int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str);
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
-void SSL_CTX_free(SSL_CTX *);
-long SSL_CTX_set_timeout(SSL_CTX *ctx, long t);
-long SSL_CTX_get_timeout(const SSL_CTX *ctx);
-X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
-void SSL_CTX_set_cert_store(SSL_CTX *, X509_STORE *);
-int SSL_want(const SSL *s);
-int SSL_clear(SSL *s);
-
-void SSL_CTX_flush_sessions(SSL_CTX *ctx, long tm);
-
-const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);
-int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits);
-char *SSL_CIPHER_get_version(const SSL_CIPHER *c);
-const char *SSL_CIPHER_get_name(const SSL_CIPHER *c);
-unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c);
-
-int SSL_get_fd(const SSL *s);
-int SSL_get_rfd(const SSL *s);
-int SSL_get_wfd(const SSL *s);
-const char *SSL_get_cipher_list(const SSL *s, int n);
-char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len);
-int SSL_get_read_ahead(const SSL *s);
-int SSL_pending(const SSL *s);
-# ifndef OPENSSL_NO_SOCK
-int SSL_set_fd(SSL *s, int fd);
-int SSL_set_rfd(SSL *s, int fd);
-int SSL_set_wfd(SSL *s, int fd);
-# endif
-# ifndef OPENSSL_NO_BIO
-void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio);
-BIO *SSL_get_rbio(const SSL *s);
-BIO *SSL_get_wbio(const SSL *s);
-# endif
-int SSL_set_cipher_list(SSL *s, const char *str);
-void SSL_set_read_ahead(SSL *s, int yes);
-int SSL_get_verify_mode(const SSL *s);
-int SSL_get_verify_depth(const SSL *s);
-int (*SSL_get_verify_callback(const SSL *s)) (int, X509_STORE_CTX *);
-void SSL_set_verify(SSL *s, int mode,
-                    int (*callback) (int ok, X509_STORE_CTX *ctx));
-void SSL_set_verify_depth(SSL *s, int depth);
-void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg);
-# ifndef OPENSSL_NO_RSA
-int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
-# endif
-int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len);
-int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
-int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d,
-                            long len);
-int SSL_use_certificate(SSL *ssl, X509 *x);
-int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
-
-# ifndef OPENSSL_NO_TLSEXT
-/* Set serverinfo data for the current active cert. */
-int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,
-                           size_t serverinfo_length);
-#  ifndef OPENSSL_NO_STDIO
-int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file);
-#  endif                        /* NO_STDIO */
-
-# endif
-
-# ifndef OPENSSL_NO_STDIO
-int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
-int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
-int SSL_use_certificate_file(SSL *ssl, const char *file, int type);
-int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
-/* PEM type */
-int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file);
-STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
-int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                        const char *file);
-#  ifndef OPENSSL_SYS_VMS
-/* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */
-#   ifndef OPENSSL_SYS_MACINTOSH_CLASSIC
-int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                       const char *dir);
-#   endif
-#  endif
-
-# endif
-
-void SSL_load_error_strings(void);
-const char *SSL_state_string(const SSL *s);
-const char *SSL_rstate_string(const SSL *s);
-const char *SSL_state_string_long(const SSL *s);
-const char *SSL_rstate_string_long(const SSL *s);
-long SSL_SESSION_get_time(const SSL_SESSION *s);
-long SSL_SESSION_set_time(SSL_SESSION *s, long t);
-long SSL_SESSION_get_timeout(const SSL_SESSION *s);
-long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
-void SSL_copy_session_id(SSL *to, const SSL *from);
-X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);
-int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
-                                unsigned int sid_ctx_len);
-
-SSL_SESSION *SSL_SESSION_new(void);
-const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
-                                        unsigned int *len);
-unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);
-# ifndef OPENSSL_NO_FP_API
-int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *ses);
-# endif
-# ifndef OPENSSL_NO_BIO
-int SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses);
-# endif
-void SSL_SESSION_free(SSL_SESSION *ses);
-int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
-int SSL_set_session(SSL *to, SSL_SESSION *session);
-int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
-int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *c);
-int SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);
-int SSL_set_generate_session_id(SSL *, GEN_SESSION_CB);
-int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id,
-                                unsigned int id_len);
-SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
-                             long length);
-
-# ifdef HEADER_X509_H
-X509 *SSL_get_peer_certificate(const SSL *s);
-# endif
-
-STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s);
-
-int SSL_CTX_get_verify_mode(const SSL_CTX *ctx);
-int SSL_CTX_get_verify_depth(const SSL_CTX *ctx);
-int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx)) (int,
-                                                        X509_STORE_CTX *);
-void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
-                        int (*callback) (int, X509_STORE_CTX *));
-void SSL_CTX_set_verify_depth(SSL_CTX *ctx, int depth);
-void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,
-                                      int (*cb) (X509_STORE_CTX *, void *),
-                                      void *arg);
-void SSL_CTX_set_cert_cb(SSL_CTX *c, int (*cb) (SSL *ssl, void *arg),
-                         void *arg);
-# ifndef OPENSSL_NO_RSA
-int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
-# endif
-int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d,
-                                   long len);
-int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
-int SSL_CTX_use_PrivateKey_ASN1(int pk, SSL_CTX *ctx,
-                                const unsigned char *d, long len);
-int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
-int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,
-                                 const unsigned char *d);
-
-void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb);
-void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u);
-
-int SSL_CTX_check_private_key(const SSL_CTX *ctx);
-int SSL_check_private_key(const SSL *ctx);
-
-int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,
-                                   unsigned int sid_ctx_len);
-
-SSL *SSL_new(SSL_CTX *ctx);
-int SSL_set_session_id_context(SSL *ssl, const unsigned char *sid_ctx,
-                               unsigned int sid_ctx_len);
-
-int SSL_CTX_set_purpose(SSL_CTX *s, int purpose);
-int SSL_set_purpose(SSL *s, int purpose);
-int SSL_CTX_set_trust(SSL_CTX *s, int trust);
-int SSL_set_trust(SSL *s, int trust);
-
-int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm);
-int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm);
-
-X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx);
-X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl);
-
-# ifndef OPENSSL_NO_SRP
-int SSL_CTX_set_srp_username(SSL_CTX *ctx, char *name);
-int SSL_CTX_set_srp_password(SSL_CTX *ctx, char *password);
-int SSL_CTX_set_srp_strength(SSL_CTX *ctx, int strength);
-int SSL_CTX_set_srp_client_pwd_callback(SSL_CTX *ctx,
-                                        char *(*cb) (SSL *, void *));
-int SSL_CTX_set_srp_verify_param_callback(SSL_CTX *ctx,
-                                          int (*cb) (SSL *, void *));
-int SSL_CTX_set_srp_username_callback(SSL_CTX *ctx,
-                                      int (*cb) (SSL *, int *, void *));
-int SSL_CTX_set_srp_cb_arg(SSL_CTX *ctx, void *arg);
-
-int SSL_set_srp_server_param(SSL *s, const BIGNUM *N, const BIGNUM *g,
-                             BIGNUM *sa, BIGNUM *v, char *info);
-int SSL_set_srp_server_param_pw(SSL *s, const char *user, const char *pass,
-                                const char *grp);
-
-BIGNUM *SSL_get_srp_g(SSL *s);
-BIGNUM *SSL_get_srp_N(SSL *s);
-
-char *SSL_get_srp_username(SSL *s);
-char *SSL_get_srp_userinfo(SSL *s);
-# endif
-
-void SSL_certs_clear(SSL *s);
-void SSL_free(SSL *ssl);
-int SSL_accept(SSL *ssl);
-int SSL_connect(SSL *ssl);
-int SSL_read(SSL *ssl, void *buf, int num);
-int SSL_peek(SSL *ssl, void *buf, int num);
-int SSL_write(SSL *ssl, const void *buf, int num);
-long SSL_ctrl(SSL *ssl, int cmd, long larg, void *parg);
-long SSL_callback_ctrl(SSL *, int, void (*)(void));
-long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
-long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
-
-int SSL_get_error(const SSL *s, int ret_code);
-const char *SSL_get_version(const SSL *s);
-
-/* This sets the 'default' SSL version that SSL_new() will create */
-int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
-
-# ifndef OPENSSL_NO_SSL2
-const SSL_METHOD *SSLv2_method(void); /* SSLv2 */
-const SSL_METHOD *SSLv2_server_method(void); /* SSLv2 */
-const SSL_METHOD *SSLv2_client_method(void); /* SSLv2 */
-# endif
-
-# ifndef OPENSSL_NO_SSL3_METHOD
-const SSL_METHOD *SSLv3_method(void); /* SSLv3 */
-const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */
-const SSL_METHOD *SSLv3_client_method(void); /* SSLv3 */
-# endif
-
-const SSL_METHOD *SSLv23_method(void); /* Negotiate highest available SSL/TLS
-                                        * version */
-const SSL_METHOD *SSLv23_server_method(void); /* Negotiate highest available
-                                               * SSL/TLS version */
-const SSL_METHOD *SSLv23_client_method(void); /* Negotiate highest available
-                                               * SSL/TLS version */
-
-const SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */
-const SSL_METHOD *TLSv1_server_method(void); /* TLSv1.0 */
-const SSL_METHOD *TLSv1_client_method(void); /* TLSv1.0 */
-
-const SSL_METHOD *TLSv1_1_method(void); /* TLSv1.1 */
-const SSL_METHOD *TLSv1_1_server_method(void); /* TLSv1.1 */
-const SSL_METHOD *TLSv1_1_client_method(void); /* TLSv1.1 */
-
-const SSL_METHOD *TLSv1_2_method(void); /* TLSv1.2 */
-const SSL_METHOD *TLSv1_2_server_method(void); /* TLSv1.2 */
-const SSL_METHOD *TLSv1_2_client_method(void); /* TLSv1.2 */
-
-const SSL_METHOD *DTLSv1_method(void); /* DTLSv1.0 */
-const SSL_METHOD *DTLSv1_server_method(void); /* DTLSv1.0 */
-const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */
-
-const SSL_METHOD *DTLSv1_2_method(void); /* DTLSv1.2 */
-const SSL_METHOD *DTLSv1_2_server_method(void); /* DTLSv1.2 */
-const SSL_METHOD *DTLSv1_2_client_method(void); /* DTLSv1.2 */
-
-const SSL_METHOD *DTLS_method(void); /* DTLS 1.0 and 1.2 */
-const SSL_METHOD *DTLS_server_method(void); /* DTLS 1.0 and 1.2 */
-const SSL_METHOD *DTLS_client_method(void); /* DTLS 1.0 and 1.2 */
-
-STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
-
-int SSL_do_handshake(SSL *s);
-int SSL_renegotiate(SSL *s);
-int SSL_renegotiate_abbreviated(SSL *s);
-int SSL_renegotiate_pending(SSL *s);
-int SSL_shutdown(SSL *s);
-
-const SSL_METHOD *SSL_CTX_get_ssl_method(SSL_CTX *ctx);
-const SSL_METHOD *SSL_get_ssl_method(SSL *s);
-int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
-const char *SSL_alert_type_string_long(int value);
-const char *SSL_alert_type_string(int value);
-const char *SSL_alert_desc_string_long(int value);
-const char *SSL_alert_desc_string(int value);
-
-void SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list);
-void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list);
-STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *s);
-STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *s);
-int SSL_add_client_CA(SSL *ssl, X509 *x);
-int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x);
-
-void SSL_set_connect_state(SSL *s);
-void SSL_set_accept_state(SSL *s);
-
-long SSL_get_default_timeout(const SSL *s);
-
-int SSL_library_init(void);
-
-char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size);
-STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
-
-SSL *SSL_dup(SSL *ssl);
-
-X509 *SSL_get_certificate(const SSL *ssl);
-/*
- * EVP_PKEY
- */ struct evp_pkey_st *SSL_get_privatekey(const SSL *ssl);
-
-X509 *SSL_CTX_get0_certificate(const SSL_CTX *ctx);
-EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx);
-
-void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx, int mode);
-int SSL_CTX_get_quiet_shutdown(const SSL_CTX *ctx);
-void SSL_set_quiet_shutdown(SSL *ssl, int mode);
-int SSL_get_quiet_shutdown(const SSL *ssl);
-void SSL_set_shutdown(SSL *ssl, int mode);
-int SSL_get_shutdown(const SSL *ssl);
-int SSL_version(const SSL *ssl);
-int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
-int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
-                                  const char *CApath);
-# define SSL_get0_session SSL_get_session/* just peek at pointer */
-SSL_SESSION *SSL_get_session(const SSL *ssl);
-SSL_SESSION *SSL_get1_session(SSL *ssl); /* obtain a reference count */
-SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl);
-SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx);
-void SSL_set_info_callback(SSL *ssl,
-                           void (*cb) (const SSL *ssl, int type, int val));
-void (*SSL_get_info_callback(const SSL *ssl)) (const SSL *ssl, int type,
-                                               int val);
-int SSL_state(const SSL *ssl);
-void SSL_set_state(SSL *ssl, int state);
-
-void SSL_set_verify_result(SSL *ssl, long v);
-long SSL_get_verify_result(const SSL *ssl);
-
-int SSL_set_ex_data(SSL *ssl, int idx, void *data);
-void *SSL_get_ex_data(const SSL *ssl, int idx);
-int SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                         CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-
-int SSL_SESSION_set_ex_data(SSL_SESSION *ss, int idx, void *data);
-void *SSL_SESSION_get_ex_data(const SSL_SESSION *ss, int idx);
-int SSL_SESSION_get_ex_new_index(long argl, void *argp,
-                                 CRYPTO_EX_new *new_func,
-                                 CRYPTO_EX_dup *dup_func,
-                                 CRYPTO_EX_free *free_func);
-
-int SSL_CTX_set_ex_data(SSL_CTX *ssl, int idx, void *data);
-void *SSL_CTX_get_ex_data(const SSL_CTX *ssl, int idx);
-int SSL_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                             CRYPTO_EX_dup *dup_func,
-                             CRYPTO_EX_free *free_func);
-
-int SSL_get_ex_data_X509_STORE_CTX_idx(void);
-
-# define SSL_CTX_sess_set_cache_size(ctx,t) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_SIZE,t,NULL)
-# define SSL_CTX_sess_get_cache_size(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_SIZE,0,NULL)
-# define SSL_CTX_set_session_cache_mode(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_MODE,m,NULL)
-# define SSL_CTX_get_session_cache_mode(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_MODE,0,NULL)
-
-# define SSL_CTX_get_default_read_ahead(ctx) SSL_CTX_get_read_ahead(ctx)
-# define SSL_CTX_set_default_read_ahead(ctx,m) SSL_CTX_set_read_ahead(ctx,m)
-# define SSL_CTX_get_read_ahead(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_READ_AHEAD,0,NULL)
-# define SSL_CTX_set_read_ahead(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_READ_AHEAD,m,NULL)
-# define SSL_CTX_get_max_cert_list(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_MAX_CERT_LIST,0,NULL)
-# define SSL_CTX_set_max_cert_list(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_CERT_LIST,m,NULL)
-# define SSL_get_max_cert_list(ssl) \
-        SSL_ctrl(ssl,SSL_CTRL_GET_MAX_CERT_LIST,0,NULL)
-# define SSL_set_max_cert_list(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_MAX_CERT_LIST,m,NULL)
-
-# define SSL_CTX_set_max_send_fragment(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_SEND_FRAGMENT,m,NULL)
-# define SSL_set_max_send_fragment(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_MAX_SEND_FRAGMENT,m,NULL)
-
-     /* NB: the keylength is only applicable when is_export is true */
-# ifndef OPENSSL_NO_RSA
-void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,
-                                  RSA *(*cb) (SSL *ssl, int is_export,
-                                              int keylength));
-
-void SSL_set_tmp_rsa_callback(SSL *ssl,
-                              RSA *(*cb) (SSL *ssl, int is_export,
-                                          int keylength));
-# endif
-# ifndef OPENSSL_NO_DH
-void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,
-                                 DH *(*dh) (SSL *ssl, int is_export,
-                                            int keylength));
-void SSL_set_tmp_dh_callback(SSL *ssl,
-                             DH *(*dh) (SSL *ssl, int is_export,
-                                        int keylength));
-# endif
-# ifndef OPENSSL_NO_ECDH
-void SSL_CTX_set_tmp_ecdh_callback(SSL_CTX *ctx,
-                                   EC_KEY *(*ecdh) (SSL *ssl, int is_export,
-                                                    int keylength));
-void SSL_set_tmp_ecdh_callback(SSL *ssl,
-                               EC_KEY *(*ecdh) (SSL *ssl, int is_export,
-                                                int keylength));
-# endif
-
-# ifndef OPENSSL_NO_COMP
-const COMP_METHOD *SSL_get_current_compression(SSL *s);
-const COMP_METHOD *SSL_get_current_expansion(SSL *s);
-const char *SSL_COMP_get_name(const COMP_METHOD *comp);
-STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
-STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP)
-                                                      *meths);
-void SSL_COMP_free_compression_methods(void);
-int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm);
-# else
-const void *SSL_get_current_compression(SSL *s);
-const void *SSL_get_current_expansion(SSL *s);
-const char *SSL_COMP_get_name(const void *comp);
-void *SSL_COMP_get_compression_methods(void);
-int SSL_COMP_add_compression_method(int id, void *cm);
-# endif
-
-const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr);
-
-/* TLS extensions functions */
-int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
-
-int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
-                                  void *arg);
-
-/* Pre-shared secret session resumption functions */
-int SSL_set_session_secret_cb(SSL *s,
-                              tls_session_secret_cb_fn tls_session_secret_cb,
-                              void *arg);
-
-void SSL_set_debug(SSL *s, int debug);
-int SSL_cache_hit(SSL *s);
-int SSL_is_server(SSL *s);
-
-SSL_CONF_CTX *SSL_CONF_CTX_new(void);
-int SSL_CONF_CTX_finish(SSL_CONF_CTX *cctx);
-void SSL_CONF_CTX_free(SSL_CONF_CTX *cctx);
-unsigned int SSL_CONF_CTX_set_flags(SSL_CONF_CTX *cctx, unsigned int flags);
-unsigned int SSL_CONF_CTX_clear_flags(SSL_CONF_CTX *cctx, unsigned int flags);
-int SSL_CONF_CTX_set1_prefix(SSL_CONF_CTX *cctx, const char *pre);
-
-void SSL_CONF_CTX_set_ssl(SSL_CONF_CTX *cctx, SSL *ssl);
-void SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *cctx, SSL_CTX *ctx);
-
-int SSL_CONF_cmd(SSL_CONF_CTX *cctx, const char *cmd, const char *value);
-int SSL_CONF_cmd_argv(SSL_CONF_CTX *cctx, int *pargc, char ***pargv);
-int SSL_CONF_cmd_value_type(SSL_CONF_CTX *cctx, const char *cmd);
-
-# ifndef OPENSSL_NO_SSL_TRACE
-void SSL_trace(int write_p, int version, int content_type,
-               const void *buf, size_t len, SSL *ssl, void *arg);
-const char *SSL_CIPHER_standard_name(const SSL_CIPHER *c);
-# endif
-
-# ifndef OPENSSL_NO_UNIT_TEST
-const struct openssl_ssl_test_functions *SSL_test_functions(void);
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_SSL_strings(void);
-
-/* Error codes for the SSL functions. */
-
-/* Function codes. */
-# define SSL_F_CHECK_SUITEB_CIPHER_LIST                   331
-# define SSL_F_CLIENT_CERTIFICATE                         100
-# define SSL_F_CLIENT_FINISHED                            167
-# define SSL_F_CLIENT_HELLO                               101
-# define SSL_F_CLIENT_MASTER_KEY                          102
-# define SSL_F_D2I_SSL_SESSION                            103
-# define SSL_F_DO_DTLS1_WRITE                             245
-# define SSL_F_DO_SSL3_WRITE                              104
-# define SSL_F_DTLS1_ACCEPT                               246
-# define SSL_F_DTLS1_ADD_CERT_TO_BUF                      295
-# define SSL_F_DTLS1_BUFFER_RECORD                        247
-# define SSL_F_DTLS1_CHECK_TIMEOUT_NUM                    316
-# define SSL_F_DTLS1_CLIENT_HELLO                         248
-# define SSL_F_DTLS1_CONNECT                              249
-# define SSL_F_DTLS1_ENC                                  250
-# define SSL_F_DTLS1_GET_HELLO_VERIFY                     251
-# define SSL_F_DTLS1_GET_MESSAGE                          252
-# define SSL_F_DTLS1_GET_MESSAGE_FRAGMENT                 253
-# define SSL_F_DTLS1_GET_RECORD                           254
-# define SSL_F_DTLS1_HANDLE_TIMEOUT                       297
-# define SSL_F_DTLS1_HEARTBEAT                            305
-# define SSL_F_DTLS1_OUTPUT_CERT_CHAIN                    255
-# define SSL_F_DTLS1_PREPROCESS_FRAGMENT                  288
-# define SSL_F_DTLS1_PROCESS_BUFFERED_RECORDS             424
-# define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE           256
-# define SSL_F_DTLS1_PROCESS_RECORD                       257
-# define SSL_F_DTLS1_READ_BYTES                           258
-# define SSL_F_DTLS1_READ_FAILED                          259
-# define SSL_F_DTLS1_SEND_CERTIFICATE_REQUEST             260
-# define SSL_F_DTLS1_SEND_CLIENT_CERTIFICATE              261
-# define SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE             262
-# define SSL_F_DTLS1_SEND_CLIENT_VERIFY                   263
-# define SSL_F_DTLS1_SEND_HELLO_VERIFY_REQUEST            264
-# define SSL_F_DTLS1_SEND_SERVER_CERTIFICATE              265
-# define SSL_F_DTLS1_SEND_SERVER_HELLO                    266
-# define SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE             267
-# define SSL_F_DTLS1_WRITE_APP_DATA_BYTES                 268
-# define SSL_F_GET_CLIENT_FINISHED                        105
-# define SSL_F_GET_CLIENT_HELLO                           106
-# define SSL_F_GET_CLIENT_MASTER_KEY                      107
-# define SSL_F_GET_SERVER_FINISHED                        108
-# define SSL_F_GET_SERVER_HELLO                           109
-# define SSL_F_GET_SERVER_STATIC_DH_KEY                   340
-# define SSL_F_GET_SERVER_VERIFY                          110
-# define SSL_F_I2D_SSL_SESSION                            111
-# define SSL_F_READ_N                                     112
-# define SSL_F_REQUEST_CERTIFICATE                        113
-# define SSL_F_SERVER_FINISH                              239
-# define SSL_F_SERVER_HELLO                               114
-# define SSL_F_SERVER_VERIFY                              240
-# define SSL_F_SSL23_ACCEPT                               115
-# define SSL_F_SSL23_CLIENT_HELLO                         116
-# define SSL_F_SSL23_CONNECT                              117
-# define SSL_F_SSL23_GET_CLIENT_HELLO                     118
-# define SSL_F_SSL23_GET_SERVER_HELLO                     119
-# define SSL_F_SSL23_PEEK                                 237
-# define SSL_F_SSL23_READ                                 120
-# define SSL_F_SSL23_WRITE                                121
-# define SSL_F_SSL2_ACCEPT                                122
-# define SSL_F_SSL2_CONNECT                               123
-# define SSL_F_SSL2_ENC_INIT                              124
-# define SSL_F_SSL2_GENERATE_KEY_MATERIAL                 241
-# define SSL_F_SSL2_PEEK                                  234
-# define SSL_F_SSL2_READ                                  125
-# define SSL_F_SSL2_READ_INTERNAL                         236
-# define SSL_F_SSL2_SET_CERTIFICATE                       126
-# define SSL_F_SSL2_WRITE                                 127
-# define SSL_F_SSL3_ACCEPT                                128
-# define SSL_F_SSL3_ADD_CERT_TO_BUF                       296
-# define SSL_F_SSL3_CALLBACK_CTRL                         233
-# define SSL_F_SSL3_CHANGE_CIPHER_STATE                   129
-# define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM              130
-# define SSL_F_SSL3_CHECK_CLIENT_HELLO                    304
-# define SSL_F_SSL3_CHECK_FINISHED                        339
-# define SSL_F_SSL3_CLIENT_HELLO                          131
-# define SSL_F_SSL3_CONNECT                               132
-# define SSL_F_SSL3_CTRL                                  213
-# define SSL_F_SSL3_CTX_CTRL                              133
-# define SSL_F_SSL3_DIGEST_CACHED_RECORDS                 293
-# define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC                 292
-# define SSL_F_SSL3_ENC                                   134
-# define SSL_F_SSL3_GENERATE_KEY_BLOCK                    238
-# define SSL_F_SSL3_GENERATE_MASTER_SECRET                388
-# define SSL_F_SSL3_GET_CERTIFICATE_REQUEST               135
-# define SSL_F_SSL3_GET_CERT_STATUS                       289
-# define SSL_F_SSL3_GET_CERT_VERIFY                       136
-# define SSL_F_SSL3_GET_CLIENT_CERTIFICATE                137
-# define SSL_F_SSL3_GET_CLIENT_HELLO                      138
-# define SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE               139
-# define SSL_F_SSL3_GET_FINISHED                          140
-# define SSL_F_SSL3_GET_KEY_EXCHANGE                      141
-# define SSL_F_SSL3_GET_MESSAGE                           142
-# define SSL_F_SSL3_GET_NEW_SESSION_TICKET                283
-# define SSL_F_SSL3_GET_NEXT_PROTO                        306
-# define SSL_F_SSL3_GET_RECORD                            143
-# define SSL_F_SSL3_GET_SERVER_CERTIFICATE                144
-# define SSL_F_SSL3_GET_SERVER_DONE                       145
-# define SSL_F_SSL3_GET_SERVER_HELLO                      146
-# define SSL_F_SSL3_HANDSHAKE_MAC                         285
-# define SSL_F_SSL3_NEW_SESSION_TICKET                    287
-# define SSL_F_SSL3_OUTPUT_CERT_CHAIN                     147
-# define SSL_F_SSL3_PEEK                                  235
-# define SSL_F_SSL3_READ_BYTES                            148
-# define SSL_F_SSL3_READ_N                                149
-# define SSL_F_SSL3_SEND_CERTIFICATE_REQUEST              150
-# define SSL_F_SSL3_SEND_CLIENT_CERTIFICATE               151
-# define SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE              152
-# define SSL_F_SSL3_SEND_CLIENT_VERIFY                    153
-# define SSL_F_SSL3_SEND_SERVER_CERTIFICATE               154
-# define SSL_F_SSL3_SEND_SERVER_HELLO                     242
-# define SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE              155
-# define SSL_F_SSL3_SETUP_KEY_BLOCK                       157
-# define SSL_F_SSL3_SETUP_READ_BUFFER                     156
-# define SSL_F_SSL3_SETUP_WRITE_BUFFER                    291
-# define SSL_F_SSL3_WRITE_BYTES                           158
-# define SSL_F_SSL3_WRITE_PENDING                         159
-# define SSL_F_SSL_ADD_CERT_CHAIN                         318
-# define SSL_F_SSL_ADD_CERT_TO_BUF                        319
-# define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT        298
-# define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT                 277
-# define SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT           307
-# define SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK         215
-# define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK        216
-# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT        299
-# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT                 278
-# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT           308
-# define SSL_F_SSL_BAD_METHOD                             160
-# define SSL_F_SSL_BUILD_CERT_CHAIN                       332
-# define SSL_F_SSL_BYTES_TO_CIPHER_LIST                   161
-# define SSL_F_SSL_CERT_DUP                               221
-# define SSL_F_SSL_CERT_INST                              222
-# define SSL_F_SSL_CERT_INSTANTIATE                       214
-# define SSL_F_SSL_CERT_NEW                               162
-# define SSL_F_SSL_CHECK_PRIVATE_KEY                      163
-# define SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT               280
-# define SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG            279
-# define SSL_F_SSL_CIPHER_PROCESS_RULESTR                 230
-# define SSL_F_SSL_CIPHER_STRENGTH_SORT                   231
-# define SSL_F_SSL_CLEAR                                  164
-# define SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD            165
-# define SSL_F_SSL_CONF_CMD                               334
-# define SSL_F_SSL_CREATE_CIPHER_LIST                     166
-# define SSL_F_SSL_CTRL                                   232
-# define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY                  168
-# define SSL_F_SSL_CTX_MAKE_PROFILES                      309
-# define SSL_F_SSL_CTX_NEW                                169
-# define SSL_F_SSL_CTX_SET_CIPHER_LIST                    269
-# define SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE             290
-# define SSL_F_SSL_CTX_SET_PURPOSE                        226
-# define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT             219
-# define SSL_F_SSL_CTX_SET_SSL_VERSION                    170
-# define SSL_F_SSL_CTX_SET_TRUST                          229
-# define SSL_F_SSL_CTX_USE_CERTIFICATE                    171
-# define SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1               172
-# define SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE         220
-# define SSL_F_SSL_CTX_USE_CERTIFICATE_FILE               173
-# define SSL_F_SSL_CTX_USE_PRIVATEKEY                     174
-# define SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1                175
-# define SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE                176
-# define SSL_F_SSL_CTX_USE_PSK_IDENTITY_HINT              272
-# define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY                  177
-# define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_ASN1             178
-# define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE             179
-# define SSL_F_SSL_CTX_USE_SERVERINFO                     336
-# define SSL_F_SSL_CTX_USE_SERVERINFO_FILE                337
-# define SSL_F_SSL_DO_HANDSHAKE                           180
-# define SSL_F_SSL_GET_NEW_SESSION                        181
-# define SSL_F_SSL_GET_PREV_SESSION                       217
-# define SSL_F_SSL_GET_SERVER_CERT_INDEX                  322
-# define SSL_F_SSL_GET_SERVER_SEND_CERT                   182
-# define SSL_F_SSL_GET_SERVER_SEND_PKEY                   317
-# define SSL_F_SSL_GET_SIGN_PKEY                          183
-# define SSL_F_SSL_INIT_WBIO_BUFFER                       184
-# define SSL_F_SSL_LOAD_CLIENT_CA_FILE                    185
-# define SSL_F_SSL_NEW                                    186
-# define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT      300
-# define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT               302
-# define SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT         310
-# define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT      301
-# define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT               303
-# define SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT         311
-# define SSL_F_SSL_PEEK                                   270
-# define SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT             281
-# define SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT             282
-# define SSL_F_SSL_READ                                   223
-# define SSL_F_SSL_RSA_PRIVATE_DECRYPT                    187
-# define SSL_F_SSL_RSA_PUBLIC_ENCRYPT                     188
-# define SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT                320
-# define SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT                321
-# define SSL_F_SSL_SESSION_DUP                            348
-# define SSL_F_SSL_SESSION_NEW                            189
-# define SSL_F_SSL_SESSION_PRINT_FP                       190
-# define SSL_F_SSL_SESSION_SET1_ID_CONTEXT                312
-# define SSL_F_SSL_SESS_CERT_NEW                          225
-# define SSL_F_SSL_SET_CERT                               191
-# define SSL_F_SSL_SET_CIPHER_LIST                        271
-# define SSL_F_SSL_SET_FD                                 192
-# define SSL_F_SSL_SET_PKEY                               193
-# define SSL_F_SSL_SET_PURPOSE                            227
-# define SSL_F_SSL_SET_RFD                                194
-# define SSL_F_SSL_SET_SESSION                            195
-# define SSL_F_SSL_SET_SESSION_ID_CONTEXT                 218
-# define SSL_F_SSL_SET_SESSION_TICKET_EXT                 294
-# define SSL_F_SSL_SET_TRUST                              228
-# define SSL_F_SSL_SET_WFD                                196
-# define SSL_F_SSL_SHUTDOWN                               224
-# define SSL_F_SSL_SRP_CTX_INIT                           313
-# define SSL_F_SSL_UNDEFINED_CONST_FUNCTION               243
-# define SSL_F_SSL_UNDEFINED_FUNCTION                     197
-# define SSL_F_SSL_UNDEFINED_VOID_FUNCTION                244
-# define SSL_F_SSL_USE_CERTIFICATE                        198
-# define SSL_F_SSL_USE_CERTIFICATE_ASN1                   199
-# define SSL_F_SSL_USE_CERTIFICATE_FILE                   200
-# define SSL_F_SSL_USE_PRIVATEKEY                         201
-# define SSL_F_SSL_USE_PRIVATEKEY_ASN1                    202
-# define SSL_F_SSL_USE_PRIVATEKEY_FILE                    203
-# define SSL_F_SSL_USE_PSK_IDENTITY_HINT                  273
-# define SSL_F_SSL_USE_RSAPRIVATEKEY                      204
-# define SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1                 205
-# define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE                 206
-# define SSL_F_SSL_VERIFY_CERT_CHAIN                      207
-# define SSL_F_SSL_WRITE                                  208
-# define SSL_F_TLS12_CHECK_PEER_SIGALG                    333
-# define SSL_F_TLS1_CERT_VERIFY_MAC                       286
-# define SSL_F_TLS1_CHANGE_CIPHER_STATE                   209
-# define SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT              274
-# define SSL_F_TLS1_ENC                                   210
-# define SSL_F_TLS1_EXPORT_KEYING_MATERIAL                314
-# define SSL_F_TLS1_GET_CURVELIST                         338
-# define SSL_F_TLS1_HEARTBEAT                             315
-# define SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT            275
-# define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT            276
-# define SSL_F_TLS1_PRF                                   284
-# define SSL_F_TLS1_SETUP_KEY_BLOCK                       211
-# define SSL_F_TLS1_SET_SERVER_SIGALGS                    335
-# define SSL_F_WRITE_PENDING                              212
-
-/* Reason codes. */
-# define SSL_R_APP_DATA_IN_HANDSHAKE                      100
-# define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
-# define SSL_R_BAD_ALERT_RECORD                           101
-# define SSL_R_BAD_AUTHENTICATION_TYPE                    102
-# define SSL_R_BAD_CHANGE_CIPHER_SPEC                     103
-# define SSL_R_BAD_CHECKSUM                               104
-# define SSL_R_BAD_DATA                                   390
-# define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK              106
-# define SSL_R_BAD_DECOMPRESSION                          107
-# define SSL_R_BAD_DH_G_LENGTH                            108
-# define SSL_R_BAD_DH_G_VALUE                             375
-# define SSL_R_BAD_DH_PUB_KEY_LENGTH                      109
-# define SSL_R_BAD_DH_PUB_KEY_VALUE                       393
-# define SSL_R_BAD_DH_P_LENGTH                            110
-# define SSL_R_BAD_DH_P_VALUE                             395
-# define SSL_R_BAD_DIGEST_LENGTH                          111
-# define SSL_R_BAD_DSA_SIGNATURE                          112
-# define SSL_R_BAD_ECC_CERT                               304
-# define SSL_R_BAD_ECDSA_SIGNATURE                        305
-# define SSL_R_BAD_ECPOINT                                306
-# define SSL_R_BAD_HANDSHAKE_LENGTH                       332
-# define SSL_R_BAD_HELLO_REQUEST                          105
-# define SSL_R_BAD_LENGTH                                 271
-# define SSL_R_BAD_MAC_DECODE                             113
-# define SSL_R_BAD_MAC_LENGTH                             333
-# define SSL_R_BAD_MESSAGE_TYPE                           114
-# define SSL_R_BAD_PACKET_LENGTH                          115
-# define SSL_R_BAD_PROTOCOL_VERSION_NUMBER                116
-# define SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH               316
-# define SSL_R_BAD_RESPONSE_ARGUMENT                      117
-# define SSL_R_BAD_RSA_DECRYPT                            118
-# define SSL_R_BAD_RSA_ENCRYPT                            119
-# define SSL_R_BAD_RSA_E_LENGTH                           120
-# define SSL_R_BAD_RSA_MODULUS_LENGTH                     121
-# define SSL_R_BAD_RSA_SIGNATURE                          122
-# define SSL_R_BAD_SIGNATURE                              123
-# define SSL_R_BAD_SRP_A_LENGTH                           347
-# define SSL_R_BAD_SRP_B_LENGTH                           348
-# define SSL_R_BAD_SRP_G_LENGTH                           349
-# define SSL_R_BAD_SRP_N_LENGTH                           350
-# define SSL_R_BAD_SRP_PARAMETERS                         371
-# define SSL_R_BAD_SRP_S_LENGTH                           351
-# define SSL_R_BAD_SRTP_MKI_VALUE                         352
-# define SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST           353
-# define SSL_R_BAD_SSL_FILETYPE                           124
-# define SSL_R_BAD_SSL_SESSION_ID_LENGTH                  125
-# define SSL_R_BAD_STATE                                  126
-# define SSL_R_BAD_VALUE                                  384
-# define SSL_R_BAD_WRITE_RETRY                            127
-# define SSL_R_BIO_NOT_SET                                128
-# define SSL_R_BLOCK_CIPHER_PAD_IS_WRONG                  129
-# define SSL_R_BN_LIB                                     130
-# define SSL_R_CA_DN_LENGTH_MISMATCH                      131
-# define SSL_R_CA_DN_TOO_LONG                             132
-# define SSL_R_CCS_RECEIVED_EARLY                         133
-# define SSL_R_CERTIFICATE_VERIFY_FAILED                  134
-# define SSL_R_CERT_CB_ERROR                              377
-# define SSL_R_CERT_LENGTH_MISMATCH                       135
-# define SSL_R_CHALLENGE_IS_DIFFERENT                     136
-# define SSL_R_CIPHER_CODE_WRONG_LENGTH                   137
-# define SSL_R_CIPHER_OR_HASH_UNAVAILABLE                 138
-# define SSL_R_CIPHER_TABLE_SRC_ERROR                     139
-# define SSL_R_CLIENTHELLO_TLSEXT                         226
-# define SSL_R_COMPRESSED_LENGTH_TOO_LONG                 140
-# define SSL_R_COMPRESSION_DISABLED                       343
-# define SSL_R_COMPRESSION_FAILURE                        141
-# define SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE    307
-# define SSL_R_COMPRESSION_LIBRARY_ERROR                  142
-# define SSL_R_CONNECTION_ID_IS_DIFFERENT                 143
-# define SSL_R_CONNECTION_TYPE_NOT_SET                    144
-# define SSL_R_COOKIE_MISMATCH                            308
-# define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED              145
-# define SSL_R_DATA_LENGTH_TOO_LONG                       146
-# define SSL_R_DECRYPTION_FAILED                          147
-# define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC        281
-# define SSL_R_DH_KEY_TOO_SMALL                           372
-# define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG            148
-# define SSL_R_DIGEST_CHECK_FAILED                        149
-# define SSL_R_DTLS_MESSAGE_TOO_BIG                       334
-# define SSL_R_DUPLICATE_COMPRESSION_ID                   309
-# define SSL_R_ECC_CERT_NOT_FOR_KEY_AGREEMENT             317
-# define SSL_R_ECC_CERT_NOT_FOR_SIGNING                   318
-# define SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE         322
-# define SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE        323
-# define SSL_R_ECDH_REQUIRED_FOR_SUITEB_MODE              374
-# define SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER               310
-# define SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST         354
-# define SSL_R_ENCRYPTED_LENGTH_TOO_LONG                  150
-# define SSL_R_ERROR_GENERATING_TMP_RSA_KEY               282
-# define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              151
-# define SSL_R_EXCESSIVE_MESSAGE_SIZE                     152
-# define SSL_R_EXTRA_DATA_IN_MESSAGE                      153
-# define SSL_R_GOT_A_FIN_BEFORE_A_CCS                     154
-# define SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS                355
-# define SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION           356
-# define SSL_R_HTTPS_PROXY_REQUEST                        155
-# define SSL_R_HTTP_REQUEST                               156
-# define SSL_R_ILLEGAL_PADDING                            283
-# define SSL_R_ILLEGAL_SUITEB_DIGEST                      380
-# define SSL_R_INAPPROPRIATE_FALLBACK                     373
-# define SSL_R_INCONSISTENT_COMPRESSION                   340
-# define SSL_R_INVALID_CHALLENGE_LENGTH                   158
-# define SSL_R_INVALID_COMMAND                            280
-# define SSL_R_INVALID_COMPRESSION_ALGORITHM              341
-# define SSL_R_INVALID_NULL_CMD_NAME                      385
-# define SSL_R_INVALID_PURPOSE                            278
-# define SSL_R_INVALID_SERVERINFO_DATA                    388
-# define SSL_R_INVALID_SRP_USERNAME                       357
-# define SSL_R_INVALID_STATUS_RESPONSE                    328
-# define SSL_R_INVALID_TICKET_KEYS_LENGTH                 325
-# define SSL_R_INVALID_TRUST                              279
-# define SSL_R_KEY_ARG_TOO_LONG                           284
-# define SSL_R_KRB5                                       285
-# define SSL_R_KRB5_C_CC_PRINC                            286
-# define SSL_R_KRB5_C_GET_CRED                            287
-# define SSL_R_KRB5_C_INIT                                288
-# define SSL_R_KRB5_C_MK_REQ                              289
-# define SSL_R_KRB5_S_BAD_TICKET                          290
-# define SSL_R_KRB5_S_INIT                                291
-# define SSL_R_KRB5_S_RD_REQ                              292
-# define SSL_R_KRB5_S_TKT_EXPIRED                         293
-# define SSL_R_KRB5_S_TKT_NYV                             294
-# define SSL_R_KRB5_S_TKT_SKEW                            295
-# define SSL_R_LENGTH_MISMATCH                            159
-# define SSL_R_LENGTH_TOO_SHORT                           160
-# define SSL_R_LIBRARY_BUG                                274
-# define SSL_R_LIBRARY_HAS_NO_CIPHERS                     161
-# define SSL_R_MESSAGE_TOO_LONG                           296
-# define SSL_R_MISSING_DH_DSA_CERT                        162
-# define SSL_R_MISSING_DH_KEY                             163
-# define SSL_R_MISSING_DH_RSA_CERT                        164
-# define SSL_R_MISSING_DSA_SIGNING_CERT                   165
-# define SSL_R_MISSING_ECDH_CERT                          382
-# define SSL_R_MISSING_ECDSA_SIGNING_CERT                 381
-# define SSL_R_MISSING_EXPORT_TMP_DH_KEY                  166
-# define SSL_R_MISSING_EXPORT_TMP_RSA_KEY                 167
-# define SSL_R_MISSING_RSA_CERTIFICATE                    168
-# define SSL_R_MISSING_RSA_ENCRYPTING_CERT                169
-# define SSL_R_MISSING_RSA_SIGNING_CERT                   170
-# define SSL_R_MISSING_SRP_PARAM                          358
-# define SSL_R_MISSING_TMP_DH_KEY                         171
-# define SSL_R_MISSING_TMP_ECDH_KEY                       311
-# define SSL_R_MISSING_TMP_RSA_KEY                        172
-# define SSL_R_MISSING_TMP_RSA_PKEY                       173
-# define SSL_R_MISSING_VERIFY_MESSAGE                     174
-# define SSL_R_MULTIPLE_SGC_RESTARTS                      346
-# define SSL_R_NON_SSLV2_INITIAL_PACKET                   175
-# define SSL_R_NO_CERTIFICATES_RETURNED                   176
-# define SSL_R_NO_CERTIFICATE_ASSIGNED                    177
-# define SSL_R_NO_CERTIFICATE_RETURNED                    178
-# define SSL_R_NO_CERTIFICATE_SET                         179
-# define SSL_R_NO_CERTIFICATE_SPECIFIED                   180
-# define SSL_R_NO_CIPHERS_AVAILABLE                       181
-# define SSL_R_NO_CIPHERS_PASSED                          182
-# define SSL_R_NO_CIPHERS_SPECIFIED                       183
-# define SSL_R_NO_CIPHER_LIST                             184
-# define SSL_R_NO_CIPHER_MATCH                            185
-# define SSL_R_NO_CLIENT_CERT_METHOD                      331
-# define SSL_R_NO_CLIENT_CERT_RECEIVED                    186
-# define SSL_R_NO_COMPRESSION_SPECIFIED                   187
-# define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER           330
-# define SSL_R_NO_METHOD_SPECIFIED                        188
-# define SSL_R_NO_PEM_EXTENSIONS                          389
-# define SSL_R_NO_PRIVATEKEY                              189
-# define SSL_R_NO_PRIVATE_KEY_ASSIGNED                    190
-# define SSL_R_NO_PROTOCOLS_AVAILABLE                     191
-# define SSL_R_NO_PUBLICKEY                               192
-# define SSL_R_NO_RENEGOTIATION                           339
-# define SSL_R_NO_REQUIRED_DIGEST                         324
-# define SSL_R_NO_SHARED_CIPHER                           193
-# define SSL_R_NO_SHARED_SIGATURE_ALGORITHMS              376
-# define SSL_R_NO_SRTP_PROFILES                           359
-# define SSL_R_NO_VERIFY_CALLBACK                         194
-# define SSL_R_NULL_SSL_CTX                               195
-# define SSL_R_NULL_SSL_METHOD_PASSED                     196
-# define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED            197
-# define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344
-# define SSL_R_ONLY_DTLS_1_2_ALLOWED_IN_SUITEB_MODE       387
-# define SSL_R_ONLY_TLS_1_2_ALLOWED_IN_SUITEB_MODE        379
-# define SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE              297
-# define SSL_R_OPAQUE_PRF_INPUT_TOO_LONG                  327
-# define SSL_R_PACKET_LENGTH_TOO_LONG                     198
-# define SSL_R_PARSE_TLSEXT                               227
-# define SSL_R_PATH_TOO_LONG                              270
-# define SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE          199
-# define SSL_R_PEER_ERROR                                 200
-# define SSL_R_PEER_ERROR_CERTIFICATE                     201
-# define SSL_R_PEER_ERROR_NO_CERTIFICATE                  202
-# define SSL_R_PEER_ERROR_NO_CIPHER                       203
-# define SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE    204
-# define SSL_R_PEM_NAME_BAD_PREFIX                        391
-# define SSL_R_PEM_NAME_TOO_SHORT                         392
-# define SSL_R_PRE_MAC_LENGTH_TOO_LONG                    205
-# define SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS          206
-# define SSL_R_PROTOCOL_IS_SHUTDOWN                       207
-# define SSL_R_PSK_IDENTITY_NOT_FOUND                     223
-# define SSL_R_PSK_NO_CLIENT_CB                           224
-# define SSL_R_PSK_NO_SERVER_CB                           225
-# define SSL_R_PUBLIC_KEY_ENCRYPT_ERROR                   208
-# define SSL_R_PUBLIC_KEY_IS_NOT_RSA                      209
-# define SSL_R_PUBLIC_KEY_NOT_RSA                         210
-# define SSL_R_READ_BIO_NOT_SET                           211
-# define SSL_R_READ_TIMEOUT_EXPIRED                       312
-# define SSL_R_READ_WRONG_PACKET_TYPE                     212
-# define SSL_R_RECORD_LENGTH_MISMATCH                     213
-# define SSL_R_RECORD_TOO_LARGE                           214
-# define SSL_R_RECORD_TOO_SMALL                           298
-# define SSL_R_RENEGOTIATE_EXT_TOO_LONG                   335
-# define SSL_R_RENEGOTIATION_ENCODING_ERR                 336
-# define SSL_R_RENEGOTIATION_MISMATCH                     337
-# define SSL_R_REQUIRED_CIPHER_MISSING                    215
-# define SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING    342
-# define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO                 216
-# define SSL_R_REUSE_CERT_TYPE_NOT_ZERO                   217
-# define SSL_R_REUSE_CIPHER_LIST_NOT_ZERO                 218
-# define SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING           345
-# define SSL_R_SERVERHELLO_TLSEXT                         275
-# define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED           277
-# define SSL_R_SHORT_READ                                 219
-# define SSL_R_SHUTDOWN_WHILE_IN_INIT                     407
-# define SSL_R_SIGNATURE_ALGORITHMS_ERROR                 360
-# define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE      220
-# define SSL_R_SRP_A_CALC                                 361
-# define SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES           362
-# define SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG      363
-# define SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE            364
-# define SSL_R_SSL23_DOING_SESSION_ID_REUSE               221
-# define SSL_R_SSL2_CONNECTION_ID_TOO_LONG                299
-# define SSL_R_SSL3_EXT_INVALID_ECPOINTFORMAT             321
-# define SSL_R_SSL3_EXT_INVALID_SERVERNAME                319
-# define SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE           320
-# define SSL_R_SSL3_SESSION_ID_TOO_LONG                   300
-# define SSL_R_SSL3_SESSION_ID_TOO_SHORT                  222
-# define SSL_R_SSLV3_ALERT_BAD_CERTIFICATE                1042
-# define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC                 1020
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED            1045
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED            1044
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN            1046
-# define SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE          1030
-# define SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE              1040
-# define SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER              1047
-# define SSL_R_SSLV3_ALERT_NO_CERTIFICATE                 1041
-# define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE             1010
-# define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE        1043
-# define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION         228
-# define SSL_R_SSL_HANDSHAKE_FAILURE                      229
-# define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS                 230
-# define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED             301
-# define SSL_R_SSL_SESSION_ID_CONFLICT                    302
-# define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG            273
-# define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH              303
-# define SSL_R_SSL_SESSION_ID_IS_DIFFERENT                231
-# define SSL_R_TLSV1_ALERT_ACCESS_DENIED                  1049
-# define SSL_R_TLSV1_ALERT_DECODE_ERROR                   1050
-# define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED              1021
-# define SSL_R_TLSV1_ALERT_DECRYPT_ERROR                  1051
-# define SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION             1060
-# define SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK         1086
-# define SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY          1071
-# define SSL_R_TLSV1_ALERT_INTERNAL_ERROR                 1080
-# define SSL_R_TLSV1_ALERT_NO_RENEGOTIATION               1100
-# define SSL_R_TLSV1_ALERT_PROTOCOL_VERSION               1070
-# define SSL_R_TLSV1_ALERT_RECORD_OVERFLOW                1022
-# define SSL_R_TLSV1_ALERT_UNKNOWN_CA                     1048
-# define SSL_R_TLSV1_ALERT_USER_CANCELLED                 1090
-# define SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE           1114
-# define SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE      1113
-# define SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE             1111
-# define SSL_R_TLSV1_UNRECOGNIZED_NAME                    1112
-# define SSL_R_TLSV1_UNSUPPORTED_EXTENSION                1110
-# define SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER       232
-# define SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT           365
-# define SSL_R_TLS_HEARTBEAT_PENDING                      366
-# define SSL_R_TLS_ILLEGAL_EXPORTER_LABEL                 367
-# define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST             157
-# define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233
-# define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG    234
-# define SSL_R_TOO_MANY_WARN_ALERTS                       409
-# define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER            235
-# define SSL_R_UNABLE_TO_DECODE_DH_CERTS                  236
-# define SSL_R_UNABLE_TO_DECODE_ECDH_CERTS                313
-# define SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY               237
-# define SSL_R_UNABLE_TO_FIND_DH_PARAMETERS               238
-# define SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS             314
-# define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS       239
-# define SSL_R_UNABLE_TO_FIND_SSL_METHOD                  240
-# define SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES           241
-# define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES           242
-# define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES          243
-# define SSL_R_UNEXPECTED_MESSAGE                         244
-# define SSL_R_UNEXPECTED_RECORD                          245
-# define SSL_R_UNINITIALIZED                              276
-# define SSL_R_UNKNOWN_ALERT_TYPE                         246
-# define SSL_R_UNKNOWN_CERTIFICATE_TYPE                   247
-# define SSL_R_UNKNOWN_CIPHER_RETURNED                    248
-# define SSL_R_UNKNOWN_CIPHER_TYPE                        249
-# define SSL_R_UNKNOWN_CMD_NAME                           386
-# define SSL_R_UNKNOWN_DIGEST                             368
-# define SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE                  250
-# define SSL_R_UNKNOWN_PKEY_TYPE                          251
-# define SSL_R_UNKNOWN_PROTOCOL                           252
-# define SSL_R_UNKNOWN_REMOTE_ERROR_TYPE                  253
-# define SSL_R_UNKNOWN_SSL_VERSION                        254
-# define SSL_R_UNKNOWN_STATE                              255
-# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED       338
-# define SSL_R_UNSUPPORTED_CIPHER                         256
-# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM          257
-# define SSL_R_UNSUPPORTED_DIGEST_TYPE                    326
-# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE                 315
-# define SSL_R_UNSUPPORTED_PROTOCOL                       258
-# define SSL_R_UNSUPPORTED_SSL_VERSION                    259
-# define SSL_R_UNSUPPORTED_STATUS_TYPE                    329
-# define SSL_R_USE_SRTP_NOT_NEGOTIATED                    369
-# define SSL_R_WRITE_BIO_NOT_SET                          260
-# define SSL_R_WRONG_CERTIFICATE_TYPE                     383
-# define SSL_R_WRONG_CIPHER_RETURNED                      261
-# define SSL_R_WRONG_CURVE                                378
-# define SSL_R_WRONG_MESSAGE_TYPE                         262
-# define SSL_R_WRONG_NUMBER_OF_KEY_BITS                   263
-# define SSL_R_WRONG_SIGNATURE_LENGTH                     264
-# define SSL_R_WRONG_SIGNATURE_SIZE                       265
-# define SSL_R_WRONG_SIGNATURE_TYPE                       370
-# define SSL_R_WRONG_SSL_VERSION                          266
-# define SSL_R_WRONG_VERSION_NUMBER                       267
-# define SSL_R_X509_LIB                                   268
-# define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS           269
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/ssl2.h b/openflow/usr/include/openssl/ssl2.h
deleted file mode 100644
index 03c7dd8..0000000
--- a/openflow/usr/include/openssl/ssl2.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ssl/ssl2.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SSL2_H
-# define HEADER_SSL2_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Protocol Version Codes */
-# define SSL2_VERSION            0x0002
-# define SSL2_VERSION_MAJOR      0x00
-# define SSL2_VERSION_MINOR      0x02
-/* #define SSL2_CLIENT_VERSION  0x0002 */
-/* #define SSL2_SERVER_VERSION  0x0002 */
-
-/* Protocol Message Codes */
-# define SSL2_MT_ERROR                   0
-# define SSL2_MT_CLIENT_HELLO            1
-# define SSL2_MT_CLIENT_MASTER_KEY       2
-# define SSL2_MT_CLIENT_FINISHED         3
-# define SSL2_MT_SERVER_HELLO            4
-# define SSL2_MT_SERVER_VERIFY           5
-# define SSL2_MT_SERVER_FINISHED         6
-# define SSL2_MT_REQUEST_CERTIFICATE     7
-# define SSL2_MT_CLIENT_CERTIFICATE      8
-
-/* Error Message Codes */
-# define SSL2_PE_UNDEFINED_ERROR         0x0000
-# define SSL2_PE_NO_CIPHER               0x0001
-# define SSL2_PE_NO_CERTIFICATE          0x0002
-# define SSL2_PE_BAD_CERTIFICATE         0x0004
-# define SSL2_PE_UNSUPPORTED_CERTIFICATE_TYPE 0x0006
-
-/* Cipher Kind Values */
-# define SSL2_CK_NULL_WITH_MD5                   0x02000000/* v3 */
-# define SSL2_CK_RC4_128_WITH_MD5                0x02010080
-# define SSL2_CK_RC4_128_EXPORT40_WITH_MD5       0x02020080
-# define SSL2_CK_RC2_128_CBC_WITH_MD5            0x02030080
-# define SSL2_CK_RC2_128_CBC_EXPORT40_WITH_MD5   0x02040080
-# define SSL2_CK_IDEA_128_CBC_WITH_MD5           0x02050080
-# define SSL2_CK_DES_64_CBC_WITH_MD5             0x02060040
-# define SSL2_CK_DES_64_CBC_WITH_SHA             0x02060140/* v3 */
-# define SSL2_CK_DES_192_EDE3_CBC_WITH_MD5       0x020700c0
-# define SSL2_CK_DES_192_EDE3_CBC_WITH_SHA       0x020701c0/* v3 */
-# define SSL2_CK_RC4_64_WITH_MD5                 0x02080080/* MS hack */
-
-# define SSL2_CK_DES_64_CFB64_WITH_MD5_1         0x02ff0800/* SSLeay */
-# define SSL2_CK_NULL                            0x02ff0810/* SSLeay */
-
-# define SSL2_TXT_DES_64_CFB64_WITH_MD5_1        "DES-CFB-M1"
-# define SSL2_TXT_NULL_WITH_MD5                  "NULL-MD5"
-# define SSL2_TXT_RC4_128_WITH_MD5               "RC4-MD5"
-# define SSL2_TXT_RC4_128_EXPORT40_WITH_MD5      "EXP-RC4-MD5"
-# define SSL2_TXT_RC2_128_CBC_WITH_MD5           "RC2-CBC-MD5"
-# define SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5  "EXP-RC2-CBC-MD5"
-# define SSL2_TXT_IDEA_128_CBC_WITH_MD5          "IDEA-CBC-MD5"
-# define SSL2_TXT_DES_64_CBC_WITH_MD5            "DES-CBC-MD5"
-# define SSL2_TXT_DES_64_CBC_WITH_SHA            "DES-CBC-SHA"
-# define SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5      "DES-CBC3-MD5"
-# define SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA      "DES-CBC3-SHA"
-# define SSL2_TXT_RC4_64_WITH_MD5                "RC4-64-MD5"
-
-# define SSL2_TXT_NULL                           "NULL"
-
-/* Flags for the SSL_CIPHER.algorithm2 field */
-# define SSL2_CF_5_BYTE_ENC                      0x01
-# define SSL2_CF_8_BYTE_ENC                      0x02
-
-/* Certificate Type Codes */
-# define SSL2_CT_X509_CERTIFICATE                0x01
-
-/* Authentication Type Code */
-# define SSL2_AT_MD5_WITH_RSA_ENCRYPTION         0x01
-
-# define SSL2_MAX_SSL_SESSION_ID_LENGTH          32
-
-/* Upper/Lower Bounds */
-# define SSL2_MAX_MASTER_KEY_LENGTH_IN_BITS      256
-# ifdef OPENSSL_SYS_MPE
-#  define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER    29998u
-# else
-#  define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER    32767u
-                                                       /* 2^15-1 */
-# endif
-# define SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER    16383/* 2^14-1 */
-
-# define SSL2_CHALLENGE_LENGTH   16
-/*
- * #define SSL2_CHALLENGE_LENGTH 32
- */
-# define SSL2_MIN_CHALLENGE_LENGTH       16
-# define SSL2_MAX_CHALLENGE_LENGTH       32
-# define SSL2_CONNECTION_ID_LENGTH       16
-# define SSL2_MAX_CONNECTION_ID_LENGTH   16
-# define SSL2_SSL_SESSION_ID_LENGTH      16
-# define SSL2_MAX_CERT_CHALLENGE_LENGTH  32
-# define SSL2_MIN_CERT_CHALLENGE_LENGTH  16
-# define SSL2_MAX_KEY_MATERIAL_LENGTH    24
-
-# ifndef HEADER_SSL_LOCL_H
-#  define  CERT           char
-# endif
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-typedef struct ssl2_state_st {
-    int three_byte_header;
-    int clear_text;             /* clear text */
-    int escape;                 /* not used in SSLv2 */
-    int ssl2_rollback;          /* used if SSLv23 rolled back to SSLv2 */
-    /*
-     * non-blocking io info, used to make sure the same args were passwd
-     */
-    unsigned int wnum;          /* number of bytes sent so far */
-    int wpend_tot;
-    const unsigned char *wpend_buf;
-    int wpend_off;              /* offset to data to write */
-    int wpend_len;              /* number of bytes passwd to write */
-    int wpend_ret;              /* number of bytes to return to caller */
-    /* buffer raw data */
-    int rbuf_left;
-    int rbuf_offs;
-    unsigned char *rbuf;
-    unsigned char *wbuf;
-    unsigned char *write_ptr;   /* used to point to the start due to 2/3 byte
-                                 * header. */
-    unsigned int padding;
-    unsigned int rlength;       /* passed to ssl2_enc */
-    int ract_data_length;       /* Set when things are encrypted. */
-    unsigned int wlength;       /* passed to ssl2_enc */
-    int wact_data_length;       /* Set when things are decrypted. */
-    unsigned char *ract_data;
-    unsigned char *wact_data;
-    unsigned char *mac_data;
-    unsigned char *read_key;
-    unsigned char *write_key;
-    /* Stuff specifically to do with this SSL session */
-    unsigned int challenge_length;
-    unsigned char challenge[SSL2_MAX_CHALLENGE_LENGTH];
-    unsigned int conn_id_length;
-    unsigned char conn_id[SSL2_MAX_CONNECTION_ID_LENGTH];
-    unsigned int key_material_length;
-    unsigned char key_material[SSL2_MAX_KEY_MATERIAL_LENGTH * 2];
-    unsigned long read_sequence;
-    unsigned long write_sequence;
-    struct {
-        unsigned int conn_id_length;
-        unsigned int cert_type;
-        unsigned int cert_length;
-        unsigned int csl;
-        unsigned int clear;
-        unsigned int enc;
-        unsigned char ccl[SSL2_MAX_CERT_CHALLENGE_LENGTH];
-        unsigned int cipher_spec_length;
-        unsigned int session_id_length;
-        unsigned int clen;
-        unsigned int rlen;
-    } tmp;
-} SSL2_STATE;
-
-# endif
-
-/* SSLv2 */
-/* client */
-# define SSL2_ST_SEND_CLIENT_HELLO_A             (0x10|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_HELLO_B             (0x11|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_HELLO_A              (0x20|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_HELLO_B              (0x21|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_MASTER_KEY_A        (0x30|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_MASTER_KEY_B        (0x31|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_FINISHED_A          (0x40|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_FINISHED_B          (0x41|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_CERTIFICATE_A       (0x50|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_CERTIFICATE_B       (0x51|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_CERTIFICATE_C       (0x52|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_CERTIFICATE_D       (0x53|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_VERIFY_A             (0x60|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_VERIFY_B             (0x61|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_FINISHED_A           (0x70|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_FINISHED_B           (0x71|SSL_ST_CONNECT)
-# define SSL2_ST_CLIENT_START_ENCRYPTION         (0x80|SSL_ST_CONNECT)
-# define SSL2_ST_X509_GET_CLIENT_CERTIFICATE     (0x90|SSL_ST_CONNECT)
-/* server */
-# define SSL2_ST_GET_CLIENT_HELLO_A              (0x10|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_HELLO_B              (0x11|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_HELLO_C              (0x12|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_HELLO_A             (0x20|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_HELLO_B             (0x21|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_MASTER_KEY_A         (0x30|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_MASTER_KEY_B         (0x31|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_VERIFY_A            (0x40|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_VERIFY_B            (0x41|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_VERIFY_C            (0x42|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_FINISHED_A           (0x50|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_FINISHED_B           (0x51|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_FINISHED_A          (0x60|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_FINISHED_B          (0x61|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_REQUEST_CERTIFICATE_A      (0x70|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_REQUEST_CERTIFICATE_B      (0x71|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_REQUEST_CERTIFICATE_C      (0x72|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_REQUEST_CERTIFICATE_D      (0x73|SSL_ST_ACCEPT)
-# define SSL2_ST_SERVER_START_ENCRYPTION         (0x80|SSL_ST_ACCEPT)
-# define SSL2_ST_X509_GET_SERVER_CERTIFICATE     (0x90|SSL_ST_ACCEPT)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/ssl23.h b/openflow/usr/include/openssl/ssl23.h
deleted file mode 100644
index 9de4685..0000000
--- a/openflow/usr/include/openssl/ssl23.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ssl/ssl23.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SSL23_H
-# define HEADER_SSL23_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * client
- */
-/* write to server */
-# define SSL23_ST_CW_CLNT_HELLO_A        (0x210|SSL_ST_CONNECT)
-# define SSL23_ST_CW_CLNT_HELLO_B        (0x211|SSL_ST_CONNECT)
-/* read from server */
-# define SSL23_ST_CR_SRVR_HELLO_A        (0x220|SSL_ST_CONNECT)
-# define SSL23_ST_CR_SRVR_HELLO_B        (0x221|SSL_ST_CONNECT)
-
-/* server */
-/* read from client */
-# define SSL23_ST_SR_CLNT_HELLO_A        (0x210|SSL_ST_ACCEPT)
-# define SSL23_ST_SR_CLNT_HELLO_B        (0x211|SSL_ST_ACCEPT)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/ssl3.h b/openflow/usr/include/openssl/ssl3.h
deleted file mode 100644
index e681d50..0000000
--- a/openflow/usr/include/openssl/ssl3.h
+++ /dev/null
@@ -1,774 +0,0 @@
-/* ssl/ssl3.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_SSL3_H
-# define HEADER_SSL3_H
-
-# ifndef OPENSSL_NO_COMP
-#  include <openssl/comp.h>
-# endif
-# include <openssl/buffer.h>
-# include <openssl/evp.h>
-# include <openssl/ssl.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * Signalling cipher suite value from RFC 5746
- * (TLS_EMPTY_RENEGOTIATION_INFO_SCSV)
- */
-# define SSL3_CK_SCSV                            0x030000FF
-
-/*
- * Signalling cipher suite value from draft-ietf-tls-downgrade-scsv-00
- * (TLS_FALLBACK_SCSV)
- */
-# define SSL3_CK_FALLBACK_SCSV                   0x03005600
-
-# define SSL3_CK_RSA_NULL_MD5                    0x03000001
-# define SSL3_CK_RSA_NULL_SHA                    0x03000002
-# define SSL3_CK_RSA_RC4_40_MD5                  0x03000003
-# define SSL3_CK_RSA_RC4_128_MD5                 0x03000004
-# define SSL3_CK_RSA_RC4_128_SHA                 0x03000005
-# define SSL3_CK_RSA_RC2_40_MD5                  0x03000006
-# define SSL3_CK_RSA_IDEA_128_SHA                0x03000007
-# define SSL3_CK_RSA_DES_40_CBC_SHA              0x03000008
-# define SSL3_CK_RSA_DES_64_CBC_SHA              0x03000009
-# define SSL3_CK_RSA_DES_192_CBC3_SHA            0x0300000A
-
-# define SSL3_CK_DH_DSS_DES_40_CBC_SHA           0x0300000B
-# define SSL3_CK_DH_DSS_DES_64_CBC_SHA           0x0300000C
-# define SSL3_CK_DH_DSS_DES_192_CBC3_SHA         0x0300000D
-# define SSL3_CK_DH_RSA_DES_40_CBC_SHA           0x0300000E
-# define SSL3_CK_DH_RSA_DES_64_CBC_SHA           0x0300000F
-# define SSL3_CK_DH_RSA_DES_192_CBC3_SHA         0x03000010
-
-# define SSL3_CK_EDH_DSS_DES_40_CBC_SHA          0x03000011
-# define SSL3_CK_DHE_DSS_DES_40_CBC_SHA          SSL3_CK_EDH_DSS_DES_40_CBC_SHA
-# define SSL3_CK_EDH_DSS_DES_64_CBC_SHA          0x03000012
-# define SSL3_CK_DHE_DSS_DES_64_CBC_SHA          SSL3_CK_EDH_DSS_DES_64_CBC_SHA
-# define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA        0x03000013
-# define SSL3_CK_DHE_DSS_DES_192_CBC3_SHA        SSL3_CK_EDH_DSS_DES_192_CBC3_SHA
-# define SSL3_CK_EDH_RSA_DES_40_CBC_SHA          0x03000014
-# define SSL3_CK_DHE_RSA_DES_40_CBC_SHA          SSL3_CK_EDH_RSA_DES_40_CBC_SHA
-# define SSL3_CK_EDH_RSA_DES_64_CBC_SHA          0x03000015
-# define SSL3_CK_DHE_RSA_DES_64_CBC_SHA          SSL3_CK_EDH_RSA_DES_64_CBC_SHA
-# define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA        0x03000016
-# define SSL3_CK_DHE_RSA_DES_192_CBC3_SHA        SSL3_CK_EDH_RSA_DES_192_CBC3_SHA
-
-# define SSL3_CK_ADH_RC4_40_MD5                  0x03000017
-# define SSL3_CK_ADH_RC4_128_MD5                 0x03000018
-# define SSL3_CK_ADH_DES_40_CBC_SHA              0x03000019
-# define SSL3_CK_ADH_DES_64_CBC_SHA              0x0300001A
-# define SSL3_CK_ADH_DES_192_CBC_SHA             0x0300001B
-
-# if 0
-#  define SSL3_CK_FZA_DMS_NULL_SHA                0x0300001C
-#  define SSL3_CK_FZA_DMS_FZA_SHA                 0x0300001D
-#  if 0                         /* Because it clashes with KRB5, is never
-                                 * used any more, and is safe to remove
-                                 * according to David Hopwood
-                                 * <david.hopwood@zetnet.co.uk> of the
-                                 * ietf-tls list */
-#   define SSL3_CK_FZA_DMS_RC4_SHA                 0x0300001E
-#  endif
-# endif
-
-/*
- * VRS Additional Kerberos5 entries
- */
-# define SSL3_CK_KRB5_DES_64_CBC_SHA             0x0300001E
-# define SSL3_CK_KRB5_DES_192_CBC3_SHA           0x0300001F
-# define SSL3_CK_KRB5_RC4_128_SHA                0x03000020
-# define SSL3_CK_KRB5_IDEA_128_CBC_SHA           0x03000021
-# define SSL3_CK_KRB5_DES_64_CBC_MD5             0x03000022
-# define SSL3_CK_KRB5_DES_192_CBC3_MD5           0x03000023
-# define SSL3_CK_KRB5_RC4_128_MD5                0x03000024
-# define SSL3_CK_KRB5_IDEA_128_CBC_MD5           0x03000025
-
-# define SSL3_CK_KRB5_DES_40_CBC_SHA             0x03000026
-# define SSL3_CK_KRB5_RC2_40_CBC_SHA             0x03000027
-# define SSL3_CK_KRB5_RC4_40_SHA                 0x03000028
-# define SSL3_CK_KRB5_DES_40_CBC_MD5             0x03000029
-# define SSL3_CK_KRB5_RC2_40_CBC_MD5             0x0300002A
-# define SSL3_CK_KRB5_RC4_40_MD5                 0x0300002B
-
-# define SSL3_TXT_RSA_NULL_MD5                   "NULL-MD5"
-# define SSL3_TXT_RSA_NULL_SHA                   "NULL-SHA"
-# define SSL3_TXT_RSA_RC4_40_MD5                 "EXP-RC4-MD5"
-# define SSL3_TXT_RSA_RC4_128_MD5                "RC4-MD5"
-# define SSL3_TXT_RSA_RC4_128_SHA                "RC4-SHA"
-# define SSL3_TXT_RSA_RC2_40_MD5                 "EXP-RC2-CBC-MD5"
-# define SSL3_TXT_RSA_IDEA_128_SHA               "IDEA-CBC-SHA"
-# define SSL3_TXT_RSA_DES_40_CBC_SHA             "EXP-DES-CBC-SHA"
-# define SSL3_TXT_RSA_DES_64_CBC_SHA             "DES-CBC-SHA"
-# define SSL3_TXT_RSA_DES_192_CBC3_SHA           "DES-CBC3-SHA"
-
-# define SSL3_TXT_DH_DSS_DES_40_CBC_SHA          "EXP-DH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DH_DSS_DES_64_CBC_SHA          "DH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DH_DSS_DES_192_CBC3_SHA        "DH-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_DH_RSA_DES_40_CBC_SHA          "EXP-DH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DH_RSA_DES_64_CBC_SHA          "DH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DH_RSA_DES_192_CBC3_SHA        "DH-RSA-DES-CBC3-SHA"
-
-# define SSL3_TXT_DHE_DSS_DES_40_CBC_SHA         "EXP-DHE-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DHE_DSS_DES_64_CBC_SHA         "DHE-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DHE_DSS_DES_192_CBC3_SHA       "DHE-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_DHE_RSA_DES_40_CBC_SHA         "EXP-DHE-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DHE_RSA_DES_64_CBC_SHA         "DHE-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DHE_RSA_DES_192_CBC3_SHA       "DHE-RSA-DES-CBC3-SHA"
-
-/*
- * This next block of six "EDH" labels is for backward compatibility with
- * older versions of OpenSSL.  New code should use the six "DHE" labels above
- * instead:
- */
-# define SSL3_TXT_EDH_DSS_DES_40_CBC_SHA         "EXP-EDH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_EDH_DSS_DES_64_CBC_SHA         "EDH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA       "EDH-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_EDH_RSA_DES_40_CBC_SHA         "EXP-EDH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_EDH_RSA_DES_64_CBC_SHA         "EDH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA       "EDH-RSA-DES-CBC3-SHA"
-
-# define SSL3_TXT_ADH_RC4_40_MD5                 "EXP-ADH-RC4-MD5"
-# define SSL3_TXT_ADH_RC4_128_MD5                "ADH-RC4-MD5"
-# define SSL3_TXT_ADH_DES_40_CBC_SHA             "EXP-ADH-DES-CBC-SHA"
-# define SSL3_TXT_ADH_DES_64_CBC_SHA             "ADH-DES-CBC-SHA"
-# define SSL3_TXT_ADH_DES_192_CBC_SHA            "ADH-DES-CBC3-SHA"
-
-# if 0
-#  define SSL3_TXT_FZA_DMS_NULL_SHA               "FZA-NULL-SHA"
-#  define SSL3_TXT_FZA_DMS_FZA_SHA                "FZA-FZA-CBC-SHA"
-#  define SSL3_TXT_FZA_DMS_RC4_SHA                "FZA-RC4-SHA"
-# endif
-
-# define SSL3_TXT_KRB5_DES_64_CBC_SHA            "KRB5-DES-CBC-SHA"
-# define SSL3_TXT_KRB5_DES_192_CBC3_SHA          "KRB5-DES-CBC3-SHA"
-# define SSL3_TXT_KRB5_RC4_128_SHA               "KRB5-RC4-SHA"
-# define SSL3_TXT_KRB5_IDEA_128_CBC_SHA          "KRB5-IDEA-CBC-SHA"
-# define SSL3_TXT_KRB5_DES_64_CBC_MD5            "KRB5-DES-CBC-MD5"
-# define SSL3_TXT_KRB5_DES_192_CBC3_MD5          "KRB5-DES-CBC3-MD5"
-# define SSL3_TXT_KRB5_RC4_128_MD5               "KRB5-RC4-MD5"
-# define SSL3_TXT_KRB5_IDEA_128_CBC_MD5          "KRB5-IDEA-CBC-MD5"
-
-# define SSL3_TXT_KRB5_DES_40_CBC_SHA            "EXP-KRB5-DES-CBC-SHA"
-# define SSL3_TXT_KRB5_RC2_40_CBC_SHA            "EXP-KRB5-RC2-CBC-SHA"
-# define SSL3_TXT_KRB5_RC4_40_SHA                "EXP-KRB5-RC4-SHA"
-# define SSL3_TXT_KRB5_DES_40_CBC_MD5            "EXP-KRB5-DES-CBC-MD5"
-# define SSL3_TXT_KRB5_RC2_40_CBC_MD5            "EXP-KRB5-RC2-CBC-MD5"
-# define SSL3_TXT_KRB5_RC4_40_MD5                "EXP-KRB5-RC4-MD5"
-
-# define SSL3_SSL_SESSION_ID_LENGTH              32
-# define SSL3_MAX_SSL_SESSION_ID_LENGTH          32
-
-# define SSL3_MASTER_SECRET_SIZE                 48
-# define SSL3_RANDOM_SIZE                        32
-# define SSL3_SESSION_ID_SIZE                    32
-# define SSL3_RT_HEADER_LENGTH                   5
-
-# define SSL3_HM_HEADER_LENGTH                  4
-
-# ifndef SSL3_ALIGN_PAYLOAD
- /*
-  * Some will argue that this increases memory footprint, but it's not
-  * actually true. Point is that malloc has to return at least 64-bit aligned
-  * pointers, meaning that allocating 5 bytes wastes 3 bytes in either case.
-  * Suggested pre-gaping simply moves these wasted bytes from the end of
-  * allocated region to its front, but makes data payload aligned, which
-  * improves performance:-)
-  */
-#  define SSL3_ALIGN_PAYLOAD                     8
-# else
-#  if (SSL3_ALIGN_PAYLOAD&(SSL3_ALIGN_PAYLOAD-1))!=0
-#   error "insane SSL3_ALIGN_PAYLOAD"
-#   undef SSL3_ALIGN_PAYLOAD
-#  endif
-# endif
-
-/*
- * This is the maximum MAC (digest) size used by the SSL library. Currently
- * maximum of 20 is used by SHA1, but we reserve for future extension for
- * 512-bit hashes.
- */
-
-# define SSL3_RT_MAX_MD_SIZE                     64
-
-/*
- * Maximum block size used in all ciphersuites. Currently 16 for AES.
- */
-
-# define SSL_RT_MAX_CIPHER_BLOCK_SIZE            16
-
-# define SSL3_RT_MAX_EXTRA                       (16384)
-
-/* Maximum plaintext length: defined by SSL/TLS standards */
-# define SSL3_RT_MAX_PLAIN_LENGTH                16384
-/* Maximum compression overhead: defined by SSL/TLS standards */
-# define SSL3_RT_MAX_COMPRESSED_OVERHEAD         1024
-
-/*
- * The standards give a maximum encryption overhead of 1024 bytes. In
- * practice the value is lower than this. The overhead is the maximum number
- * of padding bytes (256) plus the mac size.
- */
-# define SSL3_RT_MAX_ENCRYPTED_OVERHEAD  (256 + SSL3_RT_MAX_MD_SIZE)
-
-/*
- * OpenSSL currently only uses a padding length of at most one block so the
- * send overhead is smaller.
- */
-
-# define SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
-                        (SSL_RT_MAX_CIPHER_BLOCK_SIZE + SSL3_RT_MAX_MD_SIZE)
-
-/* If compression isn't used don't include the compression overhead */
-
-# ifdef OPENSSL_NO_COMP
-#  define SSL3_RT_MAX_COMPRESSED_LENGTH           SSL3_RT_MAX_PLAIN_LENGTH
-# else
-#  define SSL3_RT_MAX_COMPRESSED_LENGTH   \
-                (SSL3_RT_MAX_PLAIN_LENGTH+SSL3_RT_MAX_COMPRESSED_OVERHEAD)
-# endif
-# define SSL3_RT_MAX_ENCRYPTED_LENGTH    \
-                (SSL3_RT_MAX_ENCRYPTED_OVERHEAD+SSL3_RT_MAX_COMPRESSED_LENGTH)
-# define SSL3_RT_MAX_PACKET_SIZE         \
-                (SSL3_RT_MAX_ENCRYPTED_LENGTH+SSL3_RT_HEADER_LENGTH)
-
-# define SSL3_MD_CLIENT_FINISHED_CONST   "\x43\x4C\x4E\x54"
-# define SSL3_MD_SERVER_FINISHED_CONST   "\x53\x52\x56\x52"
-
-# define SSL3_VERSION                    0x0300
-# define SSL3_VERSION_MAJOR              0x03
-# define SSL3_VERSION_MINOR              0x00
-
-# define SSL3_RT_CHANGE_CIPHER_SPEC      20
-# define SSL3_RT_ALERT                   21
-# define SSL3_RT_HANDSHAKE               22
-# define SSL3_RT_APPLICATION_DATA        23
-# define TLS1_RT_HEARTBEAT               24
-
-/* Pseudo content types to indicate additional parameters */
-# define TLS1_RT_CRYPTO                  0x1000
-# define TLS1_RT_CRYPTO_PREMASTER        (TLS1_RT_CRYPTO | 0x1)
-# define TLS1_RT_CRYPTO_CLIENT_RANDOM    (TLS1_RT_CRYPTO | 0x2)
-# define TLS1_RT_CRYPTO_SERVER_RANDOM    (TLS1_RT_CRYPTO | 0x3)
-# define TLS1_RT_CRYPTO_MASTER           (TLS1_RT_CRYPTO | 0x4)
-
-# define TLS1_RT_CRYPTO_READ             0x0000
-# define TLS1_RT_CRYPTO_WRITE            0x0100
-# define TLS1_RT_CRYPTO_MAC              (TLS1_RT_CRYPTO | 0x5)
-# define TLS1_RT_CRYPTO_KEY              (TLS1_RT_CRYPTO | 0x6)
-# define TLS1_RT_CRYPTO_IV               (TLS1_RT_CRYPTO | 0x7)
-# define TLS1_RT_CRYPTO_FIXED_IV         (TLS1_RT_CRYPTO | 0x8)
-
-/* Pseudo content type for SSL/TLS header info */
-# define SSL3_RT_HEADER                  0x100
-
-# define SSL3_AL_WARNING                 1
-# define SSL3_AL_FATAL                   2
-
-# define SSL3_AD_CLOSE_NOTIFY             0
-# define SSL3_AD_UNEXPECTED_MESSAGE      10/* fatal */
-# define SSL3_AD_BAD_RECORD_MAC          20/* fatal */
-# define SSL3_AD_DECOMPRESSION_FAILURE   30/* fatal */
-# define SSL3_AD_HANDSHAKE_FAILURE       40/* fatal */
-# define SSL3_AD_NO_CERTIFICATE          41
-# define SSL3_AD_BAD_CERTIFICATE         42
-# define SSL3_AD_UNSUPPORTED_CERTIFICATE 43
-# define SSL3_AD_CERTIFICATE_REVOKED     44
-# define SSL3_AD_CERTIFICATE_EXPIRED     45
-# define SSL3_AD_CERTIFICATE_UNKNOWN     46
-# define SSL3_AD_ILLEGAL_PARAMETER       47/* fatal */
-
-# define TLS1_HB_REQUEST         1
-# define TLS1_HB_RESPONSE        2
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-typedef struct ssl3_record_st {
-    /* type of record */
-    /*
-     * r
-     */ int type;
-    /* How many bytes available */
-    /*
-     * rw
-     */ unsigned int length;
-    /* read/write offset into 'buf' */
-    /*
-     * r
-     */ unsigned int off;
-    /* pointer to the record data */
-    /*
-     * rw
-     */ unsigned char *data;
-    /* where the decode bytes are */
-    /*
-     * rw
-     */ unsigned char *input;
-    /* only used with decompression - malloc()ed */
-    /*
-     * r
-     */ unsigned char *comp;
-    /* epoch number, needed by DTLS1 */
-    /*
-     * r
-     */ unsigned long epoch;
-    /* sequence number, needed by DTLS1 */
-    /*
-     * r
-     */ unsigned char seq_num[8];
-} SSL3_RECORD;
-
-typedef struct ssl3_buffer_st {
-    /* at least SSL3_RT_MAX_PACKET_SIZE bytes, see ssl3_setup_buffers() */
-    unsigned char *buf;
-    /* buffer size */
-    size_t len;
-    /* where to 'copy from' */
-    int offset;
-    /* how many bytes left */
-    int left;
-} SSL3_BUFFER;
-
-# endif
-
-# define SSL3_CT_RSA_SIGN                        1
-# define SSL3_CT_DSS_SIGN                        2
-# define SSL3_CT_RSA_FIXED_DH                    3
-# define SSL3_CT_DSS_FIXED_DH                    4
-# define SSL3_CT_RSA_EPHEMERAL_DH                5
-# define SSL3_CT_DSS_EPHEMERAL_DH                6
-# define SSL3_CT_FORTEZZA_DMS                    20
-/*
- * SSL3_CT_NUMBER is used to size arrays and it must be large enough to
- * contain all of the cert types defined either for SSLv3 and TLSv1.
- */
-# define SSL3_CT_NUMBER                  9
-
-# define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS       0x0001
-# define SSL3_FLAGS_DELAY_CLIENT_FINISHED        0x0002
-# define SSL3_FLAGS_POP_BUFFER                   0x0004
-# define TLS1_FLAGS_TLS_PADDING_BUG              0x0008
-# define TLS1_FLAGS_SKIP_CERT_VERIFY             0x0010
-# define TLS1_FLAGS_KEEP_HANDSHAKE               0x0020
-/*
- * Set when the handshake is ready to process peer's ChangeCipherSpec message.
- * Cleared after the message has been processed.
- */
-# define SSL3_FLAGS_CCS_OK                       0x0080
-
-/* SSL3_FLAGS_SGC_RESTART_DONE is no longer used */
-# define SSL3_FLAGS_SGC_RESTART_DONE             0x0040
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-typedef struct ssl3_state_st {
-    long flags;
-    int delay_buf_pop_ret;
-    unsigned char read_sequence[8];
-    int read_mac_secret_size;
-    unsigned char read_mac_secret[EVP_MAX_MD_SIZE];
-    unsigned char write_sequence[8];
-    int write_mac_secret_size;
-    unsigned char write_mac_secret[EVP_MAX_MD_SIZE];
-    unsigned char server_random[SSL3_RANDOM_SIZE];
-    unsigned char client_random[SSL3_RANDOM_SIZE];
-    /* flags for countermeasure against known-IV weakness */
-    int need_empty_fragments;
-    int empty_fragment_done;
-    /* The value of 'extra' when the buffers were initialized */
-    int init_extra;
-    SSL3_BUFFER rbuf;           /* read IO goes into here */
-    SSL3_BUFFER wbuf;           /* write IO goes into here */
-    SSL3_RECORD rrec;           /* each decoded record goes in here */
-    SSL3_RECORD wrec;           /* goes out from here */
-    /*
-     * storage for Alert/Handshake protocol data received but not yet
-     * processed by ssl3_read_bytes:
-     */
-    unsigned char alert_fragment[2];
-    unsigned int alert_fragment_len;
-    unsigned char handshake_fragment[4];
-    unsigned int handshake_fragment_len;
-    /* partial write - check the numbers match */
-    unsigned int wnum;          /* number of bytes sent so far */
-    int wpend_tot;              /* number bytes written */
-    int wpend_type;
-    int wpend_ret;              /* number of bytes submitted */
-    const unsigned char *wpend_buf;
-    /* used during startup, digest all incoming/outgoing packets */
-    BIO *handshake_buffer;
-    /*
-     * When set of handshake digests is determined, buffer is hashed and
-     * freed and MD_CTX-es for all required digests are stored in this array
-     */
-    EVP_MD_CTX **handshake_dgst;
-    /*
-     * Set whenever an expected ChangeCipherSpec message is processed.
-     * Unset when the peer's Finished message is received.
-     * Unexpected ChangeCipherSpec messages trigger a fatal alert.
-     */
-    int change_cipher_spec;
-    int warn_alert;
-    int fatal_alert;
-    /*
-     * we allow one fatal and one warning alert to be outstanding, send close
-     * alert via the warning alert
-     */
-    int alert_dispatch;
-    unsigned char send_alert[2];
-    /*
-     * This flag is set when we should renegotiate ASAP, basically when there
-     * is no more data in the read or write buffers
-     */
-    int renegotiate;
-    int total_renegotiations;
-    int num_renegotiations;
-    int in_read_app_data;
-    /*
-     * Opaque PRF input as used for the current handshake. These fields are
-     * used only if TLSEXT_TYPE_opaque_prf_input is defined (otherwise, they
-     * are merely present to improve binary compatibility)
-     */
-    void *client_opaque_prf_input;
-    size_t client_opaque_prf_input_len;
-    void *server_opaque_prf_input;
-    size_t server_opaque_prf_input_len;
-    struct {
-        /* actually only needs to be 16+20 */
-        unsigned char cert_verify_md[EVP_MAX_MD_SIZE * 2];
-        /* actually only need to be 16+20 for SSLv3 and 12 for TLS */
-        unsigned char finish_md[EVP_MAX_MD_SIZE * 2];
-        int finish_md_len;
-        unsigned char peer_finish_md[EVP_MAX_MD_SIZE * 2];
-        int peer_finish_md_len;
-        unsigned long message_size;
-        int message_type;
-        /* used to hold the new cipher we are going to use */
-        const SSL_CIPHER *new_cipher;
-#  ifndef OPENSSL_NO_DH
-        DH *dh;
-#  endif
-#  ifndef OPENSSL_NO_ECDH
-        EC_KEY *ecdh;           /* holds short lived ECDH key */
-#  endif
-        /* used when SSL_ST_FLUSH_DATA is entered */
-        int next_state;
-        int reuse_message;
-        /* used for certificate requests */
-        int cert_req;
-        int ctype_num;
-        char ctype[SSL3_CT_NUMBER];
-        STACK_OF(X509_NAME) *ca_names;
-        int use_rsa_tmp;
-        int key_block_length;
-        unsigned char *key_block;
-        const EVP_CIPHER *new_sym_enc;
-        const EVP_MD *new_hash;
-        int new_mac_pkey_type;
-        int new_mac_secret_size;
-#  ifndef OPENSSL_NO_COMP
-        const SSL_COMP *new_compression;
-#  else
-        char *new_compression;
-#  endif
-        int cert_request;
-    } tmp;
-
-    /* Connection binding to prevent renegotiation attacks */
-    unsigned char previous_client_finished[EVP_MAX_MD_SIZE];
-    unsigned char previous_client_finished_len;
-    unsigned char previous_server_finished[EVP_MAX_MD_SIZE];
-    unsigned char previous_server_finished_len;
-    int send_connection_binding; /* TODOEKR */
-
-#  ifndef OPENSSL_NO_NEXTPROTONEG
-    /*
-     * Set if we saw the Next Protocol Negotiation extension from our peer.
-     */
-    int next_proto_neg_seen;
-#  endif
-
-#  ifndef OPENSSL_NO_TLSEXT
-#   ifndef OPENSSL_NO_EC
-    /*
-     * This is set to true if we believe that this is a version of Safari
-     * running on OS X 10.6 or newer. We wish to know this because Safari on
-     * 10.8 .. 10.8.3 has broken ECDHE-ECDSA support.
-     */
-    char is_probably_safari;
-#   endif                       /* !OPENSSL_NO_EC */
-
-    /*
-     * ALPN information (we are in the process of transitioning from NPN to
-     * ALPN.)
-     */
-
-    /*
-     * In a server these point to the selected ALPN protocol after the
-     * ClientHello has been processed. In a client these contain the protocol
-     * that the server selected once the ServerHello has been processed.
-     */
-    unsigned char *alpn_selected;
-    unsigned alpn_selected_len;
-#  endif                        /* OPENSSL_NO_TLSEXT */
-} SSL3_STATE;
-
-# endif
-
-/* SSLv3 */
-/*
- * client
- */
-/* extra state */
-# define SSL3_ST_CW_FLUSH                (0x100|SSL_ST_CONNECT)
-# ifndef OPENSSL_NO_SCTP
-#  define DTLS1_SCTP_ST_CW_WRITE_SOCK                     (0x310|SSL_ST_CONNECT)
-#  define DTLS1_SCTP_ST_CR_READ_SOCK                      (0x320|SSL_ST_CONNECT)
-# endif
-/* write to server */
-# define SSL3_ST_CW_CLNT_HELLO_A         (0x110|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CLNT_HELLO_B         (0x111|SSL_ST_CONNECT)
-/* read from server */
-# define SSL3_ST_CR_SRVR_HELLO_A         (0x120|SSL_ST_CONNECT)
-# define SSL3_ST_CR_SRVR_HELLO_B         (0x121|SSL_ST_CONNECT)
-# define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A (0x126|SSL_ST_CONNECT)
-# define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B (0x127|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_A               (0x130|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_B               (0x131|SSL_ST_CONNECT)
-# define SSL3_ST_CR_KEY_EXCH_A           (0x140|SSL_ST_CONNECT)
-# define SSL3_ST_CR_KEY_EXCH_B           (0x141|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_REQ_A           (0x150|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_REQ_B           (0x151|SSL_ST_CONNECT)
-# define SSL3_ST_CR_SRVR_DONE_A          (0x160|SSL_ST_CONNECT)
-# define SSL3_ST_CR_SRVR_DONE_B          (0x161|SSL_ST_CONNECT)
-/* write to server */
-# define SSL3_ST_CW_CERT_A               (0x170|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CERT_B               (0x171|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CERT_C               (0x172|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CERT_D               (0x173|SSL_ST_CONNECT)
-# define SSL3_ST_CW_KEY_EXCH_A           (0x180|SSL_ST_CONNECT)
-# define SSL3_ST_CW_KEY_EXCH_B           (0x181|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CERT_VRFY_A          (0x190|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CERT_VRFY_B          (0x191|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CHANGE_A             (0x1A0|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CHANGE_B             (0x1A1|SSL_ST_CONNECT)
-# ifndef OPENSSL_NO_NEXTPROTONEG
-#  define SSL3_ST_CW_NEXT_PROTO_A         (0x200|SSL_ST_CONNECT)
-#  define SSL3_ST_CW_NEXT_PROTO_B         (0x201|SSL_ST_CONNECT)
-# endif
-# define SSL3_ST_CW_FINISHED_A           (0x1B0|SSL_ST_CONNECT)
-# define SSL3_ST_CW_FINISHED_B           (0x1B1|SSL_ST_CONNECT)
-/* read from server */
-# define SSL3_ST_CR_CHANGE_A             (0x1C0|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CHANGE_B             (0x1C1|SSL_ST_CONNECT)
-# define SSL3_ST_CR_FINISHED_A           (0x1D0|SSL_ST_CONNECT)
-# define SSL3_ST_CR_FINISHED_B           (0x1D1|SSL_ST_CONNECT)
-# define SSL3_ST_CR_SESSION_TICKET_A     (0x1E0|SSL_ST_CONNECT)
-# define SSL3_ST_CR_SESSION_TICKET_B     (0x1E1|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_STATUS_A        (0x1F0|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_STATUS_B        (0x1F1|SSL_ST_CONNECT)
-
-/* server */
-/* extra state */
-# define SSL3_ST_SW_FLUSH                (0x100|SSL_ST_ACCEPT)
-# ifndef OPENSSL_NO_SCTP
-#  define DTLS1_SCTP_ST_SW_WRITE_SOCK                     (0x310|SSL_ST_ACCEPT)
-#  define DTLS1_SCTP_ST_SR_READ_SOCK                      (0x320|SSL_ST_ACCEPT)
-# endif
-/* read from client */
-/* Do not change the number values, they do matter */
-# define SSL3_ST_SR_CLNT_HELLO_A         (0x110|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CLNT_HELLO_B         (0x111|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CLNT_HELLO_C         (0x112|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CLNT_HELLO_D         (0x115|SSL_ST_ACCEPT)
-/* write to client */
-# define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A (0x113|SSL_ST_ACCEPT)
-# define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B (0x114|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_HELLO_REQ_A          (0x120|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_HELLO_REQ_B          (0x121|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_HELLO_REQ_C          (0x122|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SRVR_HELLO_A         (0x130|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SRVR_HELLO_B         (0x131|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_A               (0x140|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_B               (0x141|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_KEY_EXCH_A           (0x150|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_KEY_EXCH_B           (0x151|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_REQ_A           (0x160|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_REQ_B           (0x161|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SRVR_DONE_A          (0x170|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SRVR_DONE_B          (0x171|SSL_ST_ACCEPT)
-/* read from client */
-# define SSL3_ST_SR_CERT_A               (0x180|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CERT_B               (0x181|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_KEY_EXCH_A           (0x190|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_KEY_EXCH_B           (0x191|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CERT_VRFY_A          (0x1A0|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CERT_VRFY_B          (0x1A1|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CHANGE_A             (0x1B0|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CHANGE_B             (0x1B1|SSL_ST_ACCEPT)
-# ifndef OPENSSL_NO_NEXTPROTONEG
-#  define SSL3_ST_SR_NEXT_PROTO_A         (0x210|SSL_ST_ACCEPT)
-#  define SSL3_ST_SR_NEXT_PROTO_B         (0x211|SSL_ST_ACCEPT)
-# endif
-# define SSL3_ST_SR_FINISHED_A           (0x1C0|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_FINISHED_B           (0x1C1|SSL_ST_ACCEPT)
-/* write to client */
-# define SSL3_ST_SW_CHANGE_A             (0x1D0|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CHANGE_B             (0x1D1|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_FINISHED_A           (0x1E0|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_FINISHED_B           (0x1E1|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SESSION_TICKET_A     (0x1F0|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SESSION_TICKET_B     (0x1F1|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_STATUS_A        (0x200|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_STATUS_B        (0x201|SSL_ST_ACCEPT)
-
-# define SSL3_MT_HELLO_REQUEST                   0
-# define SSL3_MT_CLIENT_HELLO                    1
-# define SSL3_MT_SERVER_HELLO                    2
-# define SSL3_MT_NEWSESSION_TICKET               4
-# define SSL3_MT_CERTIFICATE                     11
-# define SSL3_MT_SERVER_KEY_EXCHANGE             12
-# define SSL3_MT_CERTIFICATE_REQUEST             13
-# define SSL3_MT_SERVER_DONE                     14
-# define SSL3_MT_CERTIFICATE_VERIFY              15
-# define SSL3_MT_CLIENT_KEY_EXCHANGE             16
-# define SSL3_MT_FINISHED                        20
-# define SSL3_MT_CERTIFICATE_STATUS              22
-# ifndef OPENSSL_NO_NEXTPROTONEG
-#  define SSL3_MT_NEXT_PROTO                      67
-# endif
-# define DTLS1_MT_HELLO_VERIFY_REQUEST    3
-
-# define SSL3_MT_CCS                             1
-
-/* These are used when changing over to a new cipher */
-# define SSL3_CC_READ            0x01
-# define SSL3_CC_WRITE           0x02
-# define SSL3_CC_CLIENT          0x10
-# define SSL3_CC_SERVER          0x20
-# define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE)
-# define SSL3_CHANGE_CIPHER_SERVER_READ  (SSL3_CC_SERVER|SSL3_CC_READ)
-# define SSL3_CHANGE_CIPHER_CLIENT_READ  (SSL3_CC_CLIENT|SSL3_CC_READ)
-# define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/stack.h b/openflow/usr/include/openssl/stack.h
deleted file mode 100644
index eb07216..0000000
--- a/openflow/usr/include/openssl/stack.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* crypto/stack/stack.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_STACK_H
-# define HEADER_STACK_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct stack_st {
-    int num;
-    char **data;
-    int sorted;
-    int num_alloc;
-    int (*comp) (const void *, const void *);
-} _STACK;                       /* Use STACK_OF(...) instead */
-
-# define M_sk_num(sk)            ((sk) ? (sk)->num:-1)
-# define M_sk_value(sk,n)        ((sk) ? (sk)->data[n] : NULL)
-
-int sk_num(const _STACK *);
-void *sk_value(const _STACK *, int);
-
-void *sk_set(_STACK *, int, void *);
-
-_STACK *sk_new(int (*cmp) (const void *, const void *));
-_STACK *sk_new_null(void);
-void sk_free(_STACK *);
-void sk_pop_free(_STACK *st, void (*func) (void *));
-_STACK *sk_deep_copy(_STACK *, void *(*)(void *), void (*)(void *));
-int sk_insert(_STACK *sk, void *data, int where);
-void *sk_delete(_STACK *st, int loc);
-void *sk_delete_ptr(_STACK *st, void *p);
-int sk_find(_STACK *st, void *data);
-int sk_find_ex(_STACK *st, void *data);
-int sk_push(_STACK *st, void *data);
-int sk_unshift(_STACK *st, void *data);
-void *sk_shift(_STACK *st);
-void *sk_pop(_STACK *st);
-void sk_zero(_STACK *st);
-int (*sk_set_cmp_func(_STACK *sk, int (*c) (const void *, const void *)))
- (const void *, const void *);
-_STACK *sk_dup(_STACK *st);
-void sk_sort(_STACK *st);
-int sk_is_sorted(const _STACK *st);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/symhacks.h b/openflow/usr/include/openssl/symhacks.h
deleted file mode 100644
index 239fa4f..0000000
--- a/openflow/usr/include/openssl/symhacks.h
+++ /dev/null
@@ -1,516 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_SYMHACKS_H
-# define HEADER_SYMHACKS_H
-
-# include <openssl/e_os2.h>
-
-/*
- * Hacks to solve the problem with linkers incapable of handling very long
- * symbol names.  In the case of VMS, the limit is 31 characters on VMS for
- * VAX.
- */
-/*
- * Note that this affects util/libeay.num and util/ssleay.num...  you may
- * change those manually, but that's not recommended, as those files are
- * controlled centrally and updated on Unix, and the central definition may
- * disagree with yours, which in turn may come with shareable library
- * incompatibilities.
- */
-# ifdef OPENSSL_SYS_VMS
-
-/* Hack a long name in crypto/ex_data.c */
-#  undef CRYPTO_get_ex_data_implementation
-#  define CRYPTO_get_ex_data_implementation       CRYPTO_get_ex_data_impl
-#  undef CRYPTO_set_ex_data_implementation
-#  define CRYPTO_set_ex_data_implementation       CRYPTO_set_ex_data_impl
-
-/* Hack a long name in crypto/asn1/a_mbstr.c */
-#  undef ASN1_STRING_set_default_mask_asc
-#  define ASN1_STRING_set_default_mask_asc        ASN1_STRING_set_def_mask_asc
-
-#  if 0                         /* No longer needed, since safestack macro
-                                 * magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */
-#   undef i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO
-#   define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO       i2d_ASN1_SET_OF_PKCS7_SIGINF
-#   undef d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO
-#   define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO       d2i_ASN1_SET_OF_PKCS7_SIGINF
-#  endif
-
-#  if 0                         /* No longer needed, since safestack macro
-                                 * magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) */
-#   undef i2d_ASN1_SET_OF_PKCS7_RECIP_INFO
-#   define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO        i2d_ASN1_SET_OF_PKCS7_RECINF
-#   undef d2i_ASN1_SET_OF_PKCS7_RECIP_INFO
-#   define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO        d2i_ASN1_SET_OF_PKCS7_RECINF
-#  endif
-
-#  if 0                         /* No longer needed, since safestack macro
-                                 * magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) */
-#   undef i2d_ASN1_SET_OF_ACCESS_DESCRIPTION
-#   define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION      i2d_ASN1_SET_OF_ACC_DESC
-#   undef d2i_ASN1_SET_OF_ACCESS_DESCRIPTION
-#   define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION      d2i_ASN1_SET_OF_ACC_DESC
-#  endif
-
-/* Hack the names created with DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE) */
-#  undef PEM_read_NETSCAPE_CERT_SEQUENCE
-#  define PEM_read_NETSCAPE_CERT_SEQUENCE         PEM_read_NS_CERT_SEQ
-#  undef PEM_write_NETSCAPE_CERT_SEQUENCE
-#  define PEM_write_NETSCAPE_CERT_SEQUENCE        PEM_write_NS_CERT_SEQ
-#  undef PEM_read_bio_NETSCAPE_CERT_SEQUENCE
-#  define PEM_read_bio_NETSCAPE_CERT_SEQUENCE     PEM_read_bio_NS_CERT_SEQ
-#  undef PEM_write_bio_NETSCAPE_CERT_SEQUENCE
-#  define PEM_write_bio_NETSCAPE_CERT_SEQUENCE    PEM_write_bio_NS_CERT_SEQ
-#  undef PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE
-#  define PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE PEM_write_cb_bio_NS_CERT_SEQ
-
-/* Hack the names created with DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO) */
-#  undef PEM_read_PKCS8_PRIV_KEY_INFO
-#  define PEM_read_PKCS8_PRIV_KEY_INFO            PEM_read_P8_PRIV_KEY_INFO
-#  undef PEM_write_PKCS8_PRIV_KEY_INFO
-#  define PEM_write_PKCS8_PRIV_KEY_INFO           PEM_write_P8_PRIV_KEY_INFO
-#  undef PEM_read_bio_PKCS8_PRIV_KEY_INFO
-#  define PEM_read_bio_PKCS8_PRIV_KEY_INFO        PEM_read_bio_P8_PRIV_KEY_INFO
-#  undef PEM_write_bio_PKCS8_PRIV_KEY_INFO
-#  define PEM_write_bio_PKCS8_PRIV_KEY_INFO       PEM_write_bio_P8_PRIV_KEY_INFO
-#  undef PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO
-#  define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO    PEM_wrt_cb_bio_P8_PRIV_KEY_INFO
-
-/* Hack other PEM names */
-#  undef PEM_write_bio_PKCS8PrivateKey_nid
-#  define PEM_write_bio_PKCS8PrivateKey_nid       PEM_write_bio_PKCS8PrivKey_nid
-
-/* Hack some long X509 names */
-#  undef X509_REVOKED_get_ext_by_critical
-#  define X509_REVOKED_get_ext_by_critical        X509_REVOKED_get_ext_by_critic
-#  undef X509_policy_tree_get0_user_policies
-#  define X509_policy_tree_get0_user_policies     X509_pcy_tree_get0_usr_policies
-#  undef X509_policy_node_get0_qualifiers
-#  define X509_policy_node_get0_qualifiers        X509_pcy_node_get0_qualifiers
-#  undef X509_STORE_CTX_get_explicit_policy
-#  define X509_STORE_CTX_get_explicit_policy      X509_STORE_CTX_get_expl_policy
-#  undef X509_STORE_CTX_get0_current_issuer
-#  define X509_STORE_CTX_get0_current_issuer      X509_STORE_CTX_get0_cur_issuer
-
-/* Hack some long CRYPTO names */
-#  undef CRYPTO_set_dynlock_destroy_callback
-#  define CRYPTO_set_dynlock_destroy_callback     CRYPTO_set_dynlock_destroy_cb
-#  undef CRYPTO_set_dynlock_create_callback
-#  define CRYPTO_set_dynlock_create_callback      CRYPTO_set_dynlock_create_cb
-#  undef CRYPTO_set_dynlock_lock_callback
-#  define CRYPTO_set_dynlock_lock_callback        CRYPTO_set_dynlock_lock_cb
-#  undef CRYPTO_get_dynlock_lock_callback
-#  define CRYPTO_get_dynlock_lock_callback        CRYPTO_get_dynlock_lock_cb
-#  undef CRYPTO_get_dynlock_destroy_callback
-#  define CRYPTO_get_dynlock_destroy_callback     CRYPTO_get_dynlock_destroy_cb
-#  undef CRYPTO_get_dynlock_create_callback
-#  define CRYPTO_get_dynlock_create_callback      CRYPTO_get_dynlock_create_cb
-#  undef CRYPTO_set_locked_mem_ex_functions
-#  define CRYPTO_set_locked_mem_ex_functions      CRYPTO_set_locked_mem_ex_funcs
-#  undef CRYPTO_get_locked_mem_ex_functions
-#  define CRYPTO_get_locked_mem_ex_functions      CRYPTO_get_locked_mem_ex_funcs
-
-/* Hack some long SSL/TLS names */
-#  undef SSL_CTX_set_default_verify_paths
-#  define SSL_CTX_set_default_verify_paths        SSL_CTX_set_def_verify_paths
-#  undef SSL_get_ex_data_X509_STORE_CTX_idx
-#  define SSL_get_ex_data_X509_STORE_CTX_idx      SSL_get_ex_d_X509_STORE_CTX_idx
-#  undef SSL_add_file_cert_subjects_to_stack
-#  define SSL_add_file_cert_subjects_to_stack     SSL_add_file_cert_subjs_to_stk
-#  undef SSL_add_dir_cert_subjects_to_stack
-#  define SSL_add_dir_cert_subjects_to_stack      SSL_add_dir_cert_subjs_to_stk
-#  undef SSL_CTX_use_certificate_chain_file
-#  define SSL_CTX_use_certificate_chain_file      SSL_CTX_use_cert_chain_file
-#  undef SSL_CTX_set_cert_verify_callback
-#  define SSL_CTX_set_cert_verify_callback        SSL_CTX_set_cert_verify_cb
-#  undef SSL_CTX_set_default_passwd_cb_userdata
-#  define SSL_CTX_set_default_passwd_cb_userdata  SSL_CTX_set_def_passwd_cb_ud
-#  undef SSL_COMP_get_compression_methods
-#  define SSL_COMP_get_compression_methods        SSL_COMP_get_compress_methods
-#  undef SSL_COMP_set0_compression_methods
-#  define SSL_COMP_set0_compression_methods       SSL_COMP_set0_compress_methods
-#  undef SSL_COMP_free_compression_methods
-#  define SSL_COMP_free_compression_methods       SSL_COMP_free_compress_methods
-#  undef ssl_add_clienthello_renegotiate_ext
-#  define ssl_add_clienthello_renegotiate_ext     ssl_add_clienthello_reneg_ext
-#  undef ssl_add_serverhello_renegotiate_ext
-#  define ssl_add_serverhello_renegotiate_ext     ssl_add_serverhello_reneg_ext
-#  undef ssl_parse_clienthello_renegotiate_ext
-#  define ssl_parse_clienthello_renegotiate_ext   ssl_parse_clienthello_reneg_ext
-#  undef ssl_parse_serverhello_renegotiate_ext
-#  define ssl_parse_serverhello_renegotiate_ext   ssl_parse_serverhello_reneg_ext
-#  undef SSL_srp_server_param_with_username
-#  define SSL_srp_server_param_with_username      SSL_srp_server_param_with_un
-#  undef SSL_CTX_set_srp_client_pwd_callback
-#  define SSL_CTX_set_srp_client_pwd_callback     SSL_CTX_set_srp_client_pwd_cb
-#  undef SSL_CTX_set_srp_verify_param_callback
-#  define SSL_CTX_set_srp_verify_param_callback   SSL_CTX_set_srp_vfy_param_cb
-#  undef SSL_CTX_set_srp_username_callback
-#  define SSL_CTX_set_srp_username_callback       SSL_CTX_set_srp_un_cb
-#  undef ssl_add_clienthello_use_srtp_ext
-#  define ssl_add_clienthello_use_srtp_ext        ssl_add_clihello_use_srtp_ext
-#  undef ssl_add_serverhello_use_srtp_ext
-#  define ssl_add_serverhello_use_srtp_ext        ssl_add_serhello_use_srtp_ext
-#  undef ssl_parse_clienthello_use_srtp_ext
-#  define ssl_parse_clienthello_use_srtp_ext      ssl_parse_clihello_use_srtp_ext
-#  undef ssl_parse_serverhello_use_srtp_ext
-#  define ssl_parse_serverhello_use_srtp_ext      ssl_parse_serhello_use_srtp_ext
-#  undef SSL_CTX_set_next_protos_advertised_cb
-#  define SSL_CTX_set_next_protos_advertised_cb   SSL_CTX_set_next_protos_adv_cb
-#  undef SSL_CTX_set_next_proto_select_cb
-#  define SSL_CTX_set_next_proto_select_cb        SSL_CTX_set_next_proto_sel_cb
-
-#  undef tls1_send_server_supplemental_data
-#  define tls1_send_server_supplemental_data      tls1_send_server_suppl_data
-#  undef tls1_send_client_supplemental_data
-#  define tls1_send_client_supplemental_data      tls1_send_client_suppl_data
-#  undef tls1_get_server_supplemental_data
-#  define tls1_get_server_supplemental_data       tls1_get_server_suppl_data
-#  undef tls1_get_client_supplemental_data
-#  define tls1_get_client_supplemental_data       tls1_get_client_suppl_data
-
-#  undef ssl3_cbc_record_digest_supported
-#  define ssl3_cbc_record_digest_supported        ssl3_cbc_record_digest_support
-#  undef ssl_check_clienthello_tlsext_late
-#  define ssl_check_clienthello_tlsext_late       ssl_check_clihello_tlsext_late
-#  undef ssl_check_clienthello_tlsext_early
-#  define ssl_check_clienthello_tlsext_early      ssl_check_clihello_tlsext_early
-
-/* Hack some RSA long names */
-#  undef RSA_padding_check_PKCS1_OAEP_mgf1
-#  define RSA_padding_check_PKCS1_OAEP_mgf1       RSA_pad_check_PKCS1_OAEP_mgf1
-
-/* Hack some ENGINE long names */
-#  undef ENGINE_get_default_BN_mod_exp_crt
-#  define ENGINE_get_default_BN_mod_exp_crt       ENGINE_get_def_BN_mod_exp_crt
-#  undef ENGINE_set_default_BN_mod_exp_crt
-#  define ENGINE_set_default_BN_mod_exp_crt       ENGINE_set_def_BN_mod_exp_crt
-#  undef ENGINE_set_load_privkey_function
-#  define ENGINE_set_load_privkey_function        ENGINE_set_load_privkey_fn
-#  undef ENGINE_get_load_privkey_function
-#  define ENGINE_get_load_privkey_function        ENGINE_get_load_privkey_fn
-#  undef ENGINE_unregister_pkey_asn1_meths
-#  define ENGINE_unregister_pkey_asn1_meths       ENGINE_unreg_pkey_asn1_meths
-#  undef ENGINE_register_all_pkey_asn1_meths
-#  define ENGINE_register_all_pkey_asn1_meths     ENGINE_reg_all_pkey_asn1_meths
-#  undef ENGINE_set_default_pkey_asn1_meths
-#  define ENGINE_set_default_pkey_asn1_meths      ENGINE_set_def_pkey_asn1_meths
-#  undef ENGINE_get_pkey_asn1_meth_engine
-#  define ENGINE_get_pkey_asn1_meth_engine        ENGINE_get_pkey_asn1_meth_eng
-#  undef ENGINE_set_load_ssl_client_cert_function
-#  define ENGINE_set_load_ssl_client_cert_function \
-                                                ENGINE_set_ld_ssl_clnt_cert_fn
-#  undef ENGINE_get_ssl_client_cert_function
-#  define ENGINE_get_ssl_client_cert_function     ENGINE_get_ssl_client_cert_fn
-
-/* Hack some long OCSP names */
-#  undef OCSP_REQUEST_get_ext_by_critical
-#  define OCSP_REQUEST_get_ext_by_critical        OCSP_REQUEST_get_ext_by_crit
-#  undef OCSP_BASICRESP_get_ext_by_critical
-#  define OCSP_BASICRESP_get_ext_by_critical      OCSP_BASICRESP_get_ext_by_crit
-#  undef OCSP_SINGLERESP_get_ext_by_critical
-#  define OCSP_SINGLERESP_get_ext_by_critical     OCSP_SINGLERESP_get_ext_by_crit
-
-/* Hack some long DES names */
-#  undef _ossl_old_des_ede3_cfb64_encrypt
-#  define _ossl_old_des_ede3_cfb64_encrypt        _ossl_odes_ede3_cfb64_encrypt
-#  undef _ossl_old_des_ede3_ofb64_encrypt
-#  define _ossl_old_des_ede3_ofb64_encrypt        _ossl_odes_ede3_ofb64_encrypt
-
-/* Hack some long EVP names */
-#  undef OPENSSL_add_all_algorithms_noconf
-#  define OPENSSL_add_all_algorithms_noconf       OPENSSL_add_all_algo_noconf
-#  undef OPENSSL_add_all_algorithms_conf
-#  define OPENSSL_add_all_algorithms_conf         OPENSSL_add_all_algo_conf
-#  undef EVP_PKEY_meth_set_verify_recover
-#  define EVP_PKEY_meth_set_verify_recover        EVP_PKEY_meth_set_vrfy_recover
-
-/* Hack some long EC names */
-#  undef EC_GROUP_set_point_conversion_form
-#  define EC_GROUP_set_point_conversion_form      EC_GROUP_set_point_conv_form
-#  undef EC_GROUP_get_point_conversion_form
-#  define EC_GROUP_get_point_conversion_form      EC_GROUP_get_point_conv_form
-#  undef EC_GROUP_clear_free_all_extra_data
-#  define EC_GROUP_clear_free_all_extra_data      EC_GROUP_clr_free_all_xtra_data
-#  undef EC_KEY_set_public_key_affine_coordinates
-#  define EC_KEY_set_public_key_affine_coordinates \
-                                                EC_KEY_set_pub_key_aff_coords
-#  undef EC_POINT_set_Jprojective_coordinates_GFp
-#  define EC_POINT_set_Jprojective_coordinates_GFp \
-                                                EC_POINT_set_Jproj_coords_GFp
-#  undef EC_POINT_get_Jprojective_coordinates_GFp
-#  define EC_POINT_get_Jprojective_coordinates_GFp \
-                                                EC_POINT_get_Jproj_coords_GFp
-#  undef EC_POINT_set_affine_coordinates_GFp
-#  define EC_POINT_set_affine_coordinates_GFp     EC_POINT_set_affine_coords_GFp
-#  undef EC_POINT_get_affine_coordinates_GFp
-#  define EC_POINT_get_affine_coordinates_GFp     EC_POINT_get_affine_coords_GFp
-#  undef EC_POINT_set_compressed_coordinates_GFp
-#  define EC_POINT_set_compressed_coordinates_GFp EC_POINT_set_compr_coords_GFp
-#  undef EC_POINT_set_affine_coordinates_GF2m
-#  define EC_POINT_set_affine_coordinates_GF2m    EC_POINT_set_affine_coords_GF2m
-#  undef EC_POINT_get_affine_coordinates_GF2m
-#  define EC_POINT_get_affine_coordinates_GF2m    EC_POINT_get_affine_coords_GF2m
-#  undef EC_POINT_set_compressed_coordinates_GF2m
-#  define EC_POINT_set_compressed_coordinates_GF2m \
-                                                EC_POINT_set_compr_coords_GF2m
-#  undef ec_GF2m_simple_group_clear_finish
-#  define ec_GF2m_simple_group_clear_finish       ec_GF2m_simple_grp_clr_finish
-#  undef ec_GF2m_simple_group_check_discriminant
-#  define ec_GF2m_simple_group_check_discriminant ec_GF2m_simple_grp_chk_discrim
-#  undef ec_GF2m_simple_point_clear_finish
-#  define ec_GF2m_simple_point_clear_finish       ec_GF2m_simple_pt_clr_finish
-#  undef ec_GF2m_simple_point_set_to_infinity
-#  define ec_GF2m_simple_point_set_to_infinity    ec_GF2m_simple_pt_set_to_inf
-#  undef ec_GF2m_simple_points_make_affine
-#  define ec_GF2m_simple_points_make_affine       ec_GF2m_simple_pts_make_affine
-#  undef ec_GF2m_simple_point_set_affine_coordinates
-#  define ec_GF2m_simple_point_set_affine_coordinates \
-                                                ec_GF2m_smp_pt_set_af_coords
-#  undef ec_GF2m_simple_point_get_affine_coordinates
-#  define ec_GF2m_simple_point_get_affine_coordinates \
-                                                ec_GF2m_smp_pt_get_af_coords
-#  undef ec_GF2m_simple_set_compressed_coordinates
-#  define ec_GF2m_simple_set_compressed_coordinates \
-                                                ec_GF2m_smp_set_compr_coords
-#  undef ec_GFp_simple_group_set_curve_GFp
-#  define ec_GFp_simple_group_set_curve_GFp       ec_GFp_simple_grp_set_curve_GFp
-#  undef ec_GFp_simple_group_get_curve_GFp
-#  define ec_GFp_simple_group_get_curve_GFp       ec_GFp_simple_grp_get_curve_GFp
-#  undef ec_GFp_simple_group_clear_finish
-#  define ec_GFp_simple_group_clear_finish        ec_GFp_simple_grp_clear_finish
-#  undef ec_GFp_simple_group_set_generator
-#  define ec_GFp_simple_group_set_generator       ec_GFp_simple_grp_set_generator
-#  undef ec_GFp_simple_group_get0_generator
-#  define ec_GFp_simple_group_get0_generator      ec_GFp_simple_grp_gt0_generator
-#  undef ec_GFp_simple_group_get_cofactor
-#  define ec_GFp_simple_group_get_cofactor        ec_GFp_simple_grp_get_cofactor
-#  undef ec_GFp_simple_point_clear_finish
-#  define ec_GFp_simple_point_clear_finish        ec_GFp_simple_pt_clear_finish
-#  undef ec_GFp_simple_point_set_to_infinity
-#  define ec_GFp_simple_point_set_to_infinity     ec_GFp_simple_pt_set_to_inf
-#  undef ec_GFp_simple_points_make_affine
-#  define ec_GFp_simple_points_make_affine        ec_GFp_simple_pts_make_affine
-#  undef ec_GFp_simple_set_Jprojective_coordinates_GFp
-#  define ec_GFp_simple_set_Jprojective_coordinates_GFp \
-                                                ec_GFp_smp_set_Jproj_coords_GFp
-#  undef ec_GFp_simple_get_Jprojective_coordinates_GFp
-#  define ec_GFp_simple_get_Jprojective_coordinates_GFp \
-                                                ec_GFp_smp_get_Jproj_coords_GFp
-#  undef ec_GFp_simple_point_set_affine_coordinates_GFp
-#  define ec_GFp_simple_point_set_affine_coordinates_GFp \
-                                                ec_GFp_smp_pt_set_af_coords_GFp
-#  undef ec_GFp_simple_point_get_affine_coordinates_GFp
-#  define ec_GFp_simple_point_get_affine_coordinates_GFp \
-                                                ec_GFp_smp_pt_get_af_coords_GFp
-#  undef ec_GFp_simple_set_compressed_coordinates_GFp
-#  define ec_GFp_simple_set_compressed_coordinates_GFp \
-                                                ec_GFp_smp_set_compr_coords_GFp
-#  undef ec_GFp_simple_point_set_affine_coordinates
-#  define ec_GFp_simple_point_set_affine_coordinates \
-                                                ec_GFp_smp_pt_set_af_coords
-#  undef ec_GFp_simple_point_get_affine_coordinates
-#  define ec_GFp_simple_point_get_affine_coordinates \
-                                                ec_GFp_smp_pt_get_af_coords
-#  undef ec_GFp_simple_set_compressed_coordinates
-#  define ec_GFp_simple_set_compressed_coordinates \
-                                                ec_GFp_smp_set_compr_coords
-#  undef ec_GFp_simple_group_check_discriminant
-#  define ec_GFp_simple_group_check_discriminant  ec_GFp_simple_grp_chk_discrim
-
-/* Hack som long STORE names */
-#  undef STORE_method_set_initialise_function
-#  define STORE_method_set_initialise_function    STORE_meth_set_initialise_fn
-#  undef STORE_method_set_cleanup_function
-#  define STORE_method_set_cleanup_function       STORE_meth_set_cleanup_fn
-#  undef STORE_method_set_generate_function
-#  define STORE_method_set_generate_function      STORE_meth_set_generate_fn
-#  undef STORE_method_set_modify_function
-#  define STORE_method_set_modify_function        STORE_meth_set_modify_fn
-#  undef STORE_method_set_revoke_function
-#  define STORE_method_set_revoke_function        STORE_meth_set_revoke_fn
-#  undef STORE_method_set_delete_function
-#  define STORE_method_set_delete_function        STORE_meth_set_delete_fn
-#  undef STORE_method_set_list_start_function
-#  define STORE_method_set_list_start_function    STORE_meth_set_list_start_fn
-#  undef STORE_method_set_list_next_function
-#  define STORE_method_set_list_next_function     STORE_meth_set_list_next_fn
-#  undef STORE_method_set_list_end_function
-#  define STORE_method_set_list_end_function      STORE_meth_set_list_end_fn
-#  undef STORE_method_set_update_store_function
-#  define STORE_method_set_update_store_function  STORE_meth_set_update_store_fn
-#  undef STORE_method_set_lock_store_function
-#  define STORE_method_set_lock_store_function    STORE_meth_set_lock_store_fn
-#  undef STORE_method_set_unlock_store_function
-#  define STORE_method_set_unlock_store_function  STORE_meth_set_unlock_store_fn
-#  undef STORE_method_get_initialise_function
-#  define STORE_method_get_initialise_function    STORE_meth_get_initialise_fn
-#  undef STORE_method_get_cleanup_function
-#  define STORE_method_get_cleanup_function       STORE_meth_get_cleanup_fn
-#  undef STORE_method_get_generate_function
-#  define STORE_method_get_generate_function      STORE_meth_get_generate_fn
-#  undef STORE_method_get_modify_function
-#  define STORE_method_get_modify_function        STORE_meth_get_modify_fn
-#  undef STORE_method_get_revoke_function
-#  define STORE_method_get_revoke_function        STORE_meth_get_revoke_fn
-#  undef STORE_method_get_delete_function
-#  define STORE_method_get_delete_function        STORE_meth_get_delete_fn
-#  undef STORE_method_get_list_start_function
-#  define STORE_method_get_list_start_function    STORE_meth_get_list_start_fn
-#  undef STORE_method_get_list_next_function
-#  define STORE_method_get_list_next_function     STORE_meth_get_list_next_fn
-#  undef STORE_method_get_list_end_function
-#  define STORE_method_get_list_end_function      STORE_meth_get_list_end_fn
-#  undef STORE_method_get_update_store_function
-#  define STORE_method_get_update_store_function  STORE_meth_get_update_store_fn
-#  undef STORE_method_get_lock_store_function
-#  define STORE_method_get_lock_store_function    STORE_meth_get_lock_store_fn
-#  undef STORE_method_get_unlock_store_function
-#  define STORE_method_get_unlock_store_function  STORE_meth_get_unlock_store_fn
-
-/* Hack some long TS names */
-#  undef TS_RESP_CTX_set_status_info_cond
-#  define TS_RESP_CTX_set_status_info_cond        TS_RESP_CTX_set_stat_info_cond
-#  undef TS_RESP_CTX_set_clock_precision_digits
-#  define TS_RESP_CTX_set_clock_precision_digits  TS_RESP_CTX_set_clk_prec_digits
-#  undef TS_CONF_set_clock_precision_digits
-#  define TS_CONF_set_clock_precision_digits      TS_CONF_set_clk_prec_digits
-
-/* Hack some long CMS names */
-#  undef CMS_RecipientInfo_ktri_get0_algs
-#  define CMS_RecipientInfo_ktri_get0_algs        CMS_RecipInfo_ktri_get0_algs
-#  undef CMS_RecipientInfo_ktri_get0_signer_id
-#  define CMS_RecipientInfo_ktri_get0_signer_id   CMS_RecipInfo_ktri_get0_sigr_id
-#  undef CMS_OtherRevocationInfoFormat_it
-#  define CMS_OtherRevocationInfoFormat_it        CMS_OtherRevocInfoFormat_it
-#  undef CMS_KeyAgreeRecipientIdentifier_it
-#  define CMS_KeyAgreeRecipientIdentifier_it      CMS_KeyAgreeRecipIdentifier_it
-#  undef CMS_OriginatorIdentifierOrKey_it
-#  define CMS_OriginatorIdentifierOrKey_it        CMS_OriginatorIdOrKey_it
-#  undef cms_SignerIdentifier_get0_signer_id
-#  define cms_SignerIdentifier_get0_signer_id     cms_SignerId_get0_signer_id
-#  undef CMS_RecipientInfo_kari_get0_orig_id
-#  define CMS_RecipientInfo_kari_get0_orig_id     CMS_RecipInfo_kari_get0_orig_id
-#  undef CMS_RecipientInfo_kari_get0_reks
-#  define CMS_RecipientInfo_kari_get0_reks        CMS_RecipInfo_kari_get0_reks
-#  undef CMS_RecipientEncryptedKey_cert_cmp
-#  define CMS_RecipientEncryptedKey_cert_cmp      CMS_RecipEncryptedKey_cert_cmp
-#  undef CMS_RecipientInfo_kari_set0_pkey
-#  define CMS_RecipientInfo_kari_set0_pkey        CMS_RecipInfo_kari_set0_pkey
-#  undef CMS_RecipientEncryptedKey_get0_id
-#  define CMS_RecipientEncryptedKey_get0_id       CMS_RecipEncryptedKey_get0_id
-#  undef CMS_RecipientInfo_kari_orig_id_cmp
-#  define CMS_RecipientInfo_kari_orig_id_cmp      CMS_RecipInfo_kari_orig_id_cmp
-
-/* Hack some long DTLS1 names */
-#  undef dtls1_retransmit_buffered_messages
-#  define dtls1_retransmit_buffered_messages      dtls1_retransmit_buffered_msgs
-
-/* Hack some long SRP names */
-#  undef SRP_generate_server_master_secret
-#  define SRP_generate_server_master_secret       SRP_gen_server_master_secret
-#  undef SRP_generate_client_master_secret
-#  define SRP_generate_client_master_secret       SRP_gen_client_master_secret
-
-/* Hack some long UI names */
-#  undef UI_method_get_prompt_constructor
-#  define UI_method_get_prompt_constructor        UI_method_get_prompt_constructr
-#  undef UI_method_set_prompt_constructor
-#  define UI_method_set_prompt_constructor        UI_method_set_prompt_constructr
-
-# endif                         /* defined OPENSSL_SYS_VMS */
-
-/* Case insensitive linking causes problems.... */
-# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2)
-#  undef ERR_load_CRYPTO_strings
-#  define ERR_load_CRYPTO_strings                 ERR_load_CRYPTOlib_strings
-#  undef OCSP_crlID_new
-#  define OCSP_crlID_new                          OCSP_crlID2_new
-
-#  undef d2i_ECPARAMETERS
-#  define d2i_ECPARAMETERS                        d2i_UC_ECPARAMETERS
-#  undef i2d_ECPARAMETERS
-#  define i2d_ECPARAMETERS                        i2d_UC_ECPARAMETERS
-#  undef d2i_ECPKPARAMETERS
-#  define d2i_ECPKPARAMETERS                      d2i_UC_ECPKPARAMETERS
-#  undef i2d_ECPKPARAMETERS
-#  define i2d_ECPKPARAMETERS                      i2d_UC_ECPKPARAMETERS
-
-/*
- * These functions do not seem to exist! However, I'm paranoid... Original
- * command in x509v3.h: These functions are being redefined in another
- * directory, and clash when the linker is case-insensitive, so let's hide
- * them a little, by giving them an extra 'o' at the beginning of the name...
- */
-#  undef X509v3_cleanup_extensions
-#  define X509v3_cleanup_extensions               oX509v3_cleanup_extensions
-#  undef X509v3_add_extension
-#  define X509v3_add_extension                    oX509v3_add_extension
-#  undef X509v3_add_netscape_extensions
-#  define X509v3_add_netscape_extensions          oX509v3_add_netscape_extensions
-#  undef X509v3_add_standard_extensions
-#  define X509v3_add_standard_extensions          oX509v3_add_standard_extensions
-
-/* This one clashes with CMS_data_create */
-#  undef cms_Data_create
-#  define cms_Data_create                         priv_cms_Data_create
-
-# endif
-
-#endif                          /* ! defined HEADER_VMS_IDHACKS_H */
diff --git a/openflow/usr/include/openssl/tls1.h b/openflow/usr/include/openssl/tls1.h
deleted file mode 100644
index 7e237d0..0000000
--- a/openflow/usr/include/openssl/tls1.h
+++ /dev/null
@@ -1,810 +0,0 @@
-/* ssl/tls1.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * ECC cipher suite support in OpenSSL originally written by
- * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
- *
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE.
- */
-
-#ifndef HEADER_TLS1_H
-# define HEADER_TLS1_H
-
-# include <openssl/buffer.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES    0
-
-# define TLS1_VERSION                    0x0301
-# define TLS1_1_VERSION                  0x0302
-# define TLS1_2_VERSION                  0x0303
-# define TLS_MAX_VERSION                 TLS1_2_VERSION
-
-# define TLS1_VERSION_MAJOR              0x03
-# define TLS1_VERSION_MINOR              0x01
-
-# define TLS1_1_VERSION_MAJOR            0x03
-# define TLS1_1_VERSION_MINOR            0x02
-
-# define TLS1_2_VERSION_MAJOR            0x03
-# define TLS1_2_VERSION_MINOR            0x03
-
-# define TLS1_get_version(s) \
-                ((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0)
-
-# define TLS1_get_client_version(s) \
-                ((s->client_version >> 8) == TLS1_VERSION_MAJOR ? s->client_version : 0)
-
-# define TLS1_AD_DECRYPTION_FAILED       21
-# define TLS1_AD_RECORD_OVERFLOW         22
-# define TLS1_AD_UNKNOWN_CA              48/* fatal */
-# define TLS1_AD_ACCESS_DENIED           49/* fatal */
-# define TLS1_AD_DECODE_ERROR            50/* fatal */
-# define TLS1_AD_DECRYPT_ERROR           51
-# define TLS1_AD_EXPORT_RESTRICTION      60/* fatal */
-# define TLS1_AD_PROTOCOL_VERSION        70/* fatal */
-# define TLS1_AD_INSUFFICIENT_SECURITY   71/* fatal */
-# define TLS1_AD_INTERNAL_ERROR          80/* fatal */
-# define TLS1_AD_INAPPROPRIATE_FALLBACK  86/* fatal */
-# define TLS1_AD_USER_CANCELLED          90
-# define TLS1_AD_NO_RENEGOTIATION        100
-/* codes 110-114 are from RFC3546 */
-# define TLS1_AD_UNSUPPORTED_EXTENSION   110
-# define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111
-# define TLS1_AD_UNRECOGNIZED_NAME       112
-# define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113
-# define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114
-# define TLS1_AD_UNKNOWN_PSK_IDENTITY    115/* fatal */
-
-/* ExtensionType values from RFC3546 / RFC4366 / RFC6066 */
-# define TLSEXT_TYPE_server_name                 0
-# define TLSEXT_TYPE_max_fragment_length         1
-# define TLSEXT_TYPE_client_certificate_url      2
-# define TLSEXT_TYPE_trusted_ca_keys             3
-# define TLSEXT_TYPE_truncated_hmac              4
-# define TLSEXT_TYPE_status_request              5
-/* ExtensionType values from RFC4681 */
-# define TLSEXT_TYPE_user_mapping                6
-/* ExtensionType values from RFC5878 */
-# define TLSEXT_TYPE_client_authz                7
-# define TLSEXT_TYPE_server_authz                8
-/* ExtensionType values from RFC6091 */
-# define TLSEXT_TYPE_cert_type           9
-
-/* ExtensionType values from RFC4492 */
-# define TLSEXT_TYPE_elliptic_curves             10
-# define TLSEXT_TYPE_ec_point_formats            11
-
-/* ExtensionType value from RFC5054 */
-# define TLSEXT_TYPE_srp                         12
-
-/* ExtensionType values from RFC5246 */
-# define TLSEXT_TYPE_signature_algorithms        13
-
-/* ExtensionType value from RFC5764 */
-# define TLSEXT_TYPE_use_srtp    14
-
-/* ExtensionType value from RFC5620 */
-# define TLSEXT_TYPE_heartbeat   15
-
-/* ExtensionType value from RFC7301 */
-# define TLSEXT_TYPE_application_layer_protocol_negotiation 16
-
-/*
- * ExtensionType value for TLS padding extension.
- * http://tools.ietf.org/html/draft-agl-tls-padding
- */
-# define TLSEXT_TYPE_padding     21
-
-/* ExtensionType value from RFC4507 */
-# define TLSEXT_TYPE_session_ticket              35
-
-/* ExtensionType value from draft-rescorla-tls-opaque-prf-input-00.txt */
-# if 0
-/*
- * will have to be provided externally for now ,
- * i.e. build with -DTLSEXT_TYPE_opaque_prf_input=38183
- * using whatever extension number you'd like to try
- */
-#  define TLSEXT_TYPE_opaque_prf_input           ??
-# endif
-
-/* Temporary extension type */
-# define TLSEXT_TYPE_renegotiate                 0xff01
-
-# ifndef OPENSSL_NO_NEXTPROTONEG
-/* This is not an IANA defined extension number */
-#  define TLSEXT_TYPE_next_proto_neg              13172
-# endif
-
-/* NameType value from RFC3546 */
-# define TLSEXT_NAMETYPE_host_name 0
-/* status request value from RFC3546 */
-# define TLSEXT_STATUSTYPE_ocsp 1
-
-/* ECPointFormat values from RFC4492 */
-# define TLSEXT_ECPOINTFORMAT_first                      0
-# define TLSEXT_ECPOINTFORMAT_uncompressed               0
-# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime  1
-# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2  2
-# define TLSEXT_ECPOINTFORMAT_last                       2
-
-/* Signature and hash algorithms from RFC5246 */
-# define TLSEXT_signature_anonymous                      0
-# define TLSEXT_signature_rsa                            1
-# define TLSEXT_signature_dsa                            2
-# define TLSEXT_signature_ecdsa                          3
-
-/* Total number of different signature algorithms */
-# define TLSEXT_signature_num                            4
-
-# define TLSEXT_hash_none                                0
-# define TLSEXT_hash_md5                                 1
-# define TLSEXT_hash_sha1                                2
-# define TLSEXT_hash_sha224                              3
-# define TLSEXT_hash_sha256                              4
-# define TLSEXT_hash_sha384                              5
-# define TLSEXT_hash_sha512                              6
-
-/* Total number of different digest algorithms */
-
-# define TLSEXT_hash_num                                 7
-
-/* Flag set for unrecognised algorithms */
-# define TLSEXT_nid_unknown                              0x1000000
-
-/* ECC curves */
-
-# define TLSEXT_curve_P_256                              23
-# define TLSEXT_curve_P_384                              24
-
-# ifndef OPENSSL_NO_TLSEXT
-
-#  define TLSEXT_MAXLEN_host_name 255
-
-const char *SSL_get_servername(const SSL *s, const int type);
-int SSL_get_servername_type(const SSL *s);
-/*
- * SSL_export_keying_material exports a value derived from the master secret,
- * as specified in RFC 5705. It writes |olen| bytes to |out| given a label and
- * optional context. (Since a zero length context is allowed, the |use_context|
- * flag controls whether a context is included.) It returns 1 on success and
- * zero otherwise.
- */
-int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
-                               const char *label, size_t llen,
-                               const unsigned char *p, size_t plen,
-                               int use_context);
-
-int SSL_get_sigalgs(SSL *s, int idx,
-                    int *psign, int *phash, int *psignandhash,
-                    unsigned char *rsig, unsigned char *rhash);
-
-int SSL_get_shared_sigalgs(SSL *s, int idx,
-                           int *psign, int *phash, int *psignandhash,
-                           unsigned char *rsig, unsigned char *rhash);
-
-int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain);
-
-#  define SSL_set_tlsext_host_name(s,name) \
-SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)
-
-#  define SSL_set_tlsext_debug_callback(ssl, cb) \
-SSL_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_CB,(void (*)(void))cb)
-
-#  define SSL_set_tlsext_debug_arg(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0, (void *)arg)
-
-#  define SSL_set_tlsext_status_type(ssl, type) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type, NULL)
-
-#  define SSL_get_tlsext_status_exts(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)
-
-#  define SSL_set_tlsext_status_exts(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)
-
-#  define SSL_get_tlsext_status_ids(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)
-
-#  define SSL_set_tlsext_status_ids(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)
-
-#  define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP,0, (void *)arg)
-
-#  define SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP,arglen, (void *)arg)
-
-#  define SSL_CTX_set_tlsext_servername_callback(ctx, cb) \
-SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,(void (*)(void))cb)
-
-#  define SSL_TLSEXT_ERR_OK 0
-#  define SSL_TLSEXT_ERR_ALERT_WARNING 1
-#  define SSL_TLSEXT_ERR_ALERT_FATAL 2
-#  define SSL_TLSEXT_ERR_NOACK 3
-
-#  define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \
-SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)arg)
-
-#  define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLSEXT_TICKET_KEYS,(keylen),(keys))
-#  define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLSEXT_TICKET_KEYS,(keylen),(keys))
-
-#  define SSL_CTX_set_tlsext_status_cb(ssl, cb) \
-SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,(void (*)(void))cb)
-
-#  define SSL_CTX_set_tlsext_status_arg(ssl, arg) \
-SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg)
-
-#  define SSL_set_tlsext_opaque_prf_input(s, src, len) \
-SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT, len, src)
-#  define SSL_CTX_set_tlsext_opaque_prf_input_callback(ctx, cb) \
-SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB, (void (*)(void))cb)
-#  define SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(ctx, arg) \
-SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG, 0, arg)
-
-#  define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \
-SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
-
-#  ifndef OPENSSL_NO_HEARTBEATS
-#   define SSL_TLSEXT_HB_ENABLED                           0x01
-#   define SSL_TLSEXT_HB_DONT_SEND_REQUESTS        0x02
-#   define SSL_TLSEXT_HB_DONT_RECV_REQUESTS        0x04
-
-#   define SSL_get_tlsext_heartbeat_pending(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING,0,NULL)
-#   define SSL_set_tlsext_heartbeat_no_requests(ssl, arg) \
-        SSL_ctrl((ssl),SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS,arg,NULL)
-#  endif
-# endif
-
-/* PSK ciphersuites from 4279 */
-# define TLS1_CK_PSK_WITH_RC4_128_SHA                    0x0300008A
-# define TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA               0x0300008B
-# define TLS1_CK_PSK_WITH_AES_128_CBC_SHA                0x0300008C
-# define TLS1_CK_PSK_WITH_AES_256_CBC_SHA                0x0300008D
-
-/*
- * Additional TLS ciphersuites from expired Internet Draft
- * draft-ietf-tls-56-bit-ciphersuites-01.txt (available if
- * TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES is defined, see s3_lib.c).  We
- * actually treat them like SSL 3.0 ciphers, which we probably shouldn't.
- * Note that the first two are actually not in the IDs.
- */
-# define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5          0x03000060/* not in
-                                                                    * ID */
-# define TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5      0x03000061/* not in
-                                                                    * ID */
-# define TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA         0x03000062
-# define TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA     0x03000063
-# define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA          0x03000064
-# define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA      0x03000065
-# define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA                0x03000066
-
-/* AES ciphersuites from RFC3268 */
-# define TLS1_CK_RSA_WITH_AES_128_SHA                    0x0300002F
-# define TLS1_CK_DH_DSS_WITH_AES_128_SHA                 0x03000030
-# define TLS1_CK_DH_RSA_WITH_AES_128_SHA                 0x03000031
-# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA                0x03000032
-# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA                0x03000033
-# define TLS1_CK_ADH_WITH_AES_128_SHA                    0x03000034
-
-# define TLS1_CK_RSA_WITH_AES_256_SHA                    0x03000035
-# define TLS1_CK_DH_DSS_WITH_AES_256_SHA                 0x03000036
-# define TLS1_CK_DH_RSA_WITH_AES_256_SHA                 0x03000037
-# define TLS1_CK_DHE_DSS_WITH_AES_256_SHA                0x03000038
-# define TLS1_CK_DHE_RSA_WITH_AES_256_SHA                0x03000039
-# define TLS1_CK_ADH_WITH_AES_256_SHA                    0x0300003A
-
-/* TLS v1.2 ciphersuites */
-# define TLS1_CK_RSA_WITH_NULL_SHA256                    0x0300003B
-# define TLS1_CK_RSA_WITH_AES_128_SHA256                 0x0300003C
-# define TLS1_CK_RSA_WITH_AES_256_SHA256                 0x0300003D
-# define TLS1_CK_DH_DSS_WITH_AES_128_SHA256              0x0300003E
-# define TLS1_CK_DH_RSA_WITH_AES_128_SHA256              0x0300003F
-# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA256             0x03000040
-
-/* Camellia ciphersuites from RFC4132 */
-# define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA           0x03000041
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA        0x03000042
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA        0x03000043
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA       0x03000044
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA       0x03000045
-# define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA           0x03000046
-
-/* TLS v1.2 ciphersuites */
-# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA256             0x03000067
-# define TLS1_CK_DH_DSS_WITH_AES_256_SHA256              0x03000068
-# define TLS1_CK_DH_RSA_WITH_AES_256_SHA256              0x03000069
-# define TLS1_CK_DHE_DSS_WITH_AES_256_SHA256             0x0300006A
-# define TLS1_CK_DHE_RSA_WITH_AES_256_SHA256             0x0300006B
-# define TLS1_CK_ADH_WITH_AES_128_SHA256                 0x0300006C
-# define TLS1_CK_ADH_WITH_AES_256_SHA256                 0x0300006D
-
-/* Camellia ciphersuites from RFC4132 */
-# define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA           0x03000084
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA        0x03000085
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA        0x03000086
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA       0x03000087
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA       0x03000088
-# define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA           0x03000089
-
-/* SEED ciphersuites from RFC4162 */
-# define TLS1_CK_RSA_WITH_SEED_SHA                       0x03000096
-# define TLS1_CK_DH_DSS_WITH_SEED_SHA                    0x03000097
-# define TLS1_CK_DH_RSA_WITH_SEED_SHA                    0x03000098
-# define TLS1_CK_DHE_DSS_WITH_SEED_SHA                   0x03000099
-# define TLS1_CK_DHE_RSA_WITH_SEED_SHA                   0x0300009A
-# define TLS1_CK_ADH_WITH_SEED_SHA                       0x0300009B
-
-/* TLS v1.2 GCM ciphersuites from RFC5288 */
-# define TLS1_CK_RSA_WITH_AES_128_GCM_SHA256             0x0300009C
-# define TLS1_CK_RSA_WITH_AES_256_GCM_SHA384             0x0300009D
-# define TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256         0x0300009E
-# define TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384         0x0300009F
-# define TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256          0x030000A0
-# define TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384          0x030000A1
-# define TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256         0x030000A2
-# define TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384         0x030000A3
-# define TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256          0x030000A4
-# define TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384          0x030000A5
-# define TLS1_CK_ADH_WITH_AES_128_GCM_SHA256             0x030000A6
-# define TLS1_CK_ADH_WITH_AES_256_GCM_SHA384             0x030000A7
-
-/*
- * ECC ciphersuites from draft-ietf-tls-ecc-12.txt with changes soon to be in
- * draft 13
- */
-# define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA                0x0300C001
-# define TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA             0x0300C002
-# define TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA        0x0300C003
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA         0x0300C004
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA         0x0300C005
-
-# define TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA               0x0300C006
-# define TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA            0x0300C007
-# define TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA       0x0300C008
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA        0x0300C009
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA        0x0300C00A
-
-# define TLS1_CK_ECDH_RSA_WITH_NULL_SHA                  0x0300C00B
-# define TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA               0x0300C00C
-# define TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA          0x0300C00D
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA           0x0300C00E
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA           0x0300C00F
-
-# define TLS1_CK_ECDHE_RSA_WITH_NULL_SHA                 0x0300C010
-# define TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA              0x0300C011
-# define TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA         0x0300C012
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA          0x0300C013
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA          0x0300C014
-
-# define TLS1_CK_ECDH_anon_WITH_NULL_SHA                 0x0300C015
-# define TLS1_CK_ECDH_anon_WITH_RC4_128_SHA              0x0300C016
-# define TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA         0x0300C017
-# define TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA          0x0300C018
-# define TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA          0x0300C019
-
-/* SRP ciphersuites from RFC 5054 */
-# define TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA           0x0300C01A
-# define TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA       0x0300C01B
-# define TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA       0x0300C01C
-# define TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA            0x0300C01D
-# define TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA        0x0300C01E
-# define TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA        0x0300C01F
-# define TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA            0x0300C020
-# define TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA        0x0300C021
-# define TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA        0x0300C022
-
-/* ECDH HMAC based ciphersuites from RFC5289 */
-
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256         0x0300C023
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384         0x0300C024
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_SHA256          0x0300C025
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_SHA384          0x0300C026
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256           0x0300C027
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384           0x0300C028
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256            0x0300C029
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384            0x0300C02A
-
-/* ECDH GCM based ciphersuites from RFC5289 */
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256     0x0300C02B
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384     0x0300C02C
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_GCM_SHA256      0x0300C02D
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_GCM_SHA384      0x0300C02E
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256       0x0300C02F
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384       0x0300C030
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256        0x0300C031
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384        0x0300C032
-
-/*
- * XXX * Backward compatibility alert: + * Older versions of OpenSSL gave
- * some DHE ciphers names with "EDH" + * instead of "DHE".  Going forward, we
- * should be using DHE + * everywhere, though we may indefinitely maintain
- * aliases for users + * or configurations that used "EDH" +
- */
-# define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5         "EXP1024-RC4-MD5"
-# define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5     "EXP1024-RC2-CBC-MD5"
-# define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA        "EXP1024-DES-CBC-SHA"
-# define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA    "EXP1024-DHE-DSS-DES-CBC-SHA"
-# define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA         "EXP1024-RC4-SHA"
-# define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA     "EXP1024-DHE-DSS-RC4-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA               "DHE-DSS-RC4-SHA"
-
-/* AES ciphersuites from RFC3268 */
-# define TLS1_TXT_RSA_WITH_AES_128_SHA                   "AES128-SHA"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA                "DH-DSS-AES128-SHA"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_SHA                "DH-RSA-AES128-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA               "DHE-DSS-AES128-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA               "DHE-RSA-AES128-SHA"
-# define TLS1_TXT_ADH_WITH_AES_128_SHA                   "ADH-AES128-SHA"
-
-# define TLS1_TXT_RSA_WITH_AES_256_SHA                   "AES256-SHA"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_SHA                "DH-DSS-AES256-SHA"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_SHA                "DH-RSA-AES256-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA               "DHE-DSS-AES256-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA               "DHE-RSA-AES256-SHA"
-# define TLS1_TXT_ADH_WITH_AES_256_SHA                   "ADH-AES256-SHA"
-
-/* ECC ciphersuites from RFC4492 */
-# define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA               "ECDH-ECDSA-NULL-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA            "ECDH-ECDSA-RC4-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA       "ECDH-ECDSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA        "ECDH-ECDSA-AES128-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA        "ECDH-ECDSA-AES256-SHA"
-
-# define TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA              "ECDHE-ECDSA-NULL-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA           "ECDHE-ECDSA-RC4-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA      "ECDHE-ECDSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA       "ECDHE-ECDSA-AES128-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA       "ECDHE-ECDSA-AES256-SHA"
-
-# define TLS1_TXT_ECDH_RSA_WITH_NULL_SHA                 "ECDH-RSA-NULL-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA              "ECDH-RSA-RC4-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA         "ECDH-RSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA          "ECDH-RSA-AES128-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA          "ECDH-RSA-AES256-SHA"
-
-# define TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA                "ECDHE-RSA-NULL-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA             "ECDHE-RSA-RC4-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA        "ECDHE-RSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA         "ECDHE-RSA-AES128-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA         "ECDHE-RSA-AES256-SHA"
-
-# define TLS1_TXT_ECDH_anon_WITH_NULL_SHA                "AECDH-NULL-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA             "AECDH-RC4-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA        "AECDH-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA         "AECDH-AES128-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA         "AECDH-AES256-SHA"
-
-/* PSK ciphersuites from RFC 4279 */
-# define TLS1_TXT_PSK_WITH_RC4_128_SHA                   "PSK-RC4-SHA"
-# define TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA              "PSK-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA               "PSK-AES128-CBC-SHA"
-# define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA               "PSK-AES256-CBC-SHA"
-
-/* SRP ciphersuite from RFC 5054 */
-# define TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA          "SRP-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA      "SRP-RSA-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA      "SRP-DSS-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA           "SRP-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA       "SRP-RSA-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA       "SRP-DSS-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA           "SRP-AES-256-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA       "SRP-RSA-AES-256-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA       "SRP-DSS-AES-256-CBC-SHA"
-
-/* Camellia ciphersuites from RFC4132 */
-# define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA          "CAMELLIA128-SHA"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA       "DH-DSS-CAMELLIA128-SHA"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA       "DH-RSA-CAMELLIA128-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA      "DHE-DSS-CAMELLIA128-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA      "DHE-RSA-CAMELLIA128-SHA"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA          "ADH-CAMELLIA128-SHA"
-
-# define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA          "CAMELLIA256-SHA"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA       "DH-DSS-CAMELLIA256-SHA"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA       "DH-RSA-CAMELLIA256-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA      "DHE-DSS-CAMELLIA256-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA      "DHE-RSA-CAMELLIA256-SHA"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA          "ADH-CAMELLIA256-SHA"
-
-/* SEED ciphersuites from RFC4162 */
-# define TLS1_TXT_RSA_WITH_SEED_SHA                      "SEED-SHA"
-# define TLS1_TXT_DH_DSS_WITH_SEED_SHA                   "DH-DSS-SEED-SHA"
-# define TLS1_TXT_DH_RSA_WITH_SEED_SHA                   "DH-RSA-SEED-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_SEED_SHA                  "DHE-DSS-SEED-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_SEED_SHA                  "DHE-RSA-SEED-SHA"
-# define TLS1_TXT_ADH_WITH_SEED_SHA                      "ADH-SEED-SHA"
-
-/* TLS v1.2 ciphersuites */
-# define TLS1_TXT_RSA_WITH_NULL_SHA256                   "NULL-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_128_SHA256                "AES128-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_256_SHA256                "AES256-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA256             "DH-DSS-AES128-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_SHA256             "DH-RSA-AES128-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256            "DHE-DSS-AES128-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256            "DHE-RSA-AES128-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_SHA256             "DH-DSS-AES256-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_SHA256             "DH-RSA-AES256-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256            "DHE-DSS-AES256-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256            "DHE-RSA-AES256-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_128_SHA256                "ADH-AES128-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_256_SHA256                "ADH-AES256-SHA256"
-
-/* TLS v1.2 GCM ciphersuites from RFC5288 */
-# define TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256            "AES128-GCM-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384            "AES256-GCM-SHA384"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256        "DHE-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384        "DHE-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256         "DH-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384         "DH-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256        "DHE-DSS-AES128-GCM-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384        "DHE-DSS-AES256-GCM-SHA384"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256         "DH-DSS-AES128-GCM-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384         "DH-DSS-AES256-GCM-SHA384"
-# define TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256            "ADH-AES128-GCM-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384            "ADH-AES256-GCM-SHA384"
-
-/* ECDH HMAC based ciphersuites from RFC5289 */
-
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256    "ECDHE-ECDSA-AES128-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384    "ECDHE-ECDSA-AES256-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_SHA256     "ECDH-ECDSA-AES128-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_SHA384     "ECDH-ECDSA-AES256-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256      "ECDHE-RSA-AES128-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384      "ECDHE-RSA-AES256-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256       "ECDH-RSA-AES128-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384       "ECDH-RSA-AES256-SHA384"
-
-/* ECDH GCM based ciphersuites from RFC5289 */
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256    "ECDHE-ECDSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384    "ECDHE-ECDSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_GCM_SHA256     "ECDH-ECDSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_GCM_SHA384     "ECDH-ECDSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256      "ECDHE-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384      "ECDHE-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256       "ECDH-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384       "ECDH-RSA-AES256-GCM-SHA384"
-
-# define TLS_CT_RSA_SIGN                 1
-# define TLS_CT_DSS_SIGN                 2
-# define TLS_CT_RSA_FIXED_DH             3
-# define TLS_CT_DSS_FIXED_DH             4
-# define TLS_CT_ECDSA_SIGN               64
-# define TLS_CT_RSA_FIXED_ECDH           65
-# define TLS_CT_ECDSA_FIXED_ECDH         66
-# define TLS_CT_GOST94_SIGN              21
-# define TLS_CT_GOST01_SIGN              22
-/*
- * when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see
- * comment there)
- */
-# define TLS_CT_NUMBER                   9
-
-# define TLS1_FINISH_MAC_LENGTH          12
-
-# define TLS_MD_MAX_CONST_SIZE                   20
-# define TLS_MD_CLIENT_FINISH_CONST              "client finished"
-# define TLS_MD_CLIENT_FINISH_CONST_SIZE         15
-# define TLS_MD_SERVER_FINISH_CONST              "server finished"
-# define TLS_MD_SERVER_FINISH_CONST_SIZE         15
-# define TLS_MD_SERVER_WRITE_KEY_CONST           "server write key"
-# define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE      16
-# define TLS_MD_KEY_EXPANSION_CONST              "key expansion"
-# define TLS_MD_KEY_EXPANSION_CONST_SIZE         13
-# define TLS_MD_CLIENT_WRITE_KEY_CONST           "client write key"
-# define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE      16
-# define TLS_MD_SERVER_WRITE_KEY_CONST           "server write key"
-# define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE      16
-# define TLS_MD_IV_BLOCK_CONST                   "IV block"
-# define TLS_MD_IV_BLOCK_CONST_SIZE              8
-# define TLS_MD_MASTER_SECRET_CONST              "master secret"
-# define TLS_MD_MASTER_SECRET_CONST_SIZE         13
-
-# ifdef CHARSET_EBCDIC
-#  undef TLS_MD_CLIENT_FINISH_CONST
-/*
- * client finished
- */
-#  define TLS_MD_CLIENT_FINISH_CONST    "\x63\x6c\x69\x65\x6e\x74\x20\x66\x69\x6e\x69\x73\x68\x65\x64"
-
-#  undef TLS_MD_SERVER_FINISH_CONST
-/*
- * server finished
- */
-#  define TLS_MD_SERVER_FINISH_CONST    "\x73\x65\x72\x76\x65\x72\x20\x66\x69\x6e\x69\x73\x68\x65\x64"
-
-#  undef TLS_MD_SERVER_WRITE_KEY_CONST
-/*
- * server write key
- */
-#  define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-
-#  undef TLS_MD_KEY_EXPANSION_CONST
-/*
- * key expansion
- */
-#  define TLS_MD_KEY_EXPANSION_CONST    "\x6b\x65\x79\x20\x65\x78\x70\x61\x6e\x73\x69\x6f\x6e"
-
-#  undef TLS_MD_CLIENT_WRITE_KEY_CONST
-/*
- * client write key
- */
-#  define TLS_MD_CLIENT_WRITE_KEY_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-
-#  undef TLS_MD_SERVER_WRITE_KEY_CONST
-/*
- * server write key
- */
-#  define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-
-#  undef TLS_MD_IV_BLOCK_CONST
-/*
- * IV block
- */
-#  define TLS_MD_IV_BLOCK_CONST         "\x49\x56\x20\x62\x6c\x6f\x63\x6b"
-
-#  undef TLS_MD_MASTER_SECRET_CONST
-/*
- * master secret
- */
-#  define TLS_MD_MASTER_SECRET_CONST    "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"
-# endif
-
-/* TLS Session Ticket extension struct */
-struct tls_session_ticket_ext_st {
-    unsigned short length;
-    void *data;
-};
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/ts.h b/openflow/usr/include/openssl/ts.h
deleted file mode 100644
index 16eccbb..0000000
--- a/openflow/usr/include/openssl/ts.h
+++ /dev/null
@@ -1,862 +0,0 @@
-/* crypto/ts/ts.h */
-/*
- * Written by Zoltan Glozik (zglozik@opentsa.org) for the OpenSSL project
- * 2002, 2003, 2004.
- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_TS_H
-# define HEADER_TS_H
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# ifndef OPENSSL_NO_BUFFER
-#  include <openssl/buffer.h>
-# endif
-# ifndef OPENSSL_NO_EVP
-#  include <openssl/evp.h>
-# endif
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/stack.h>
-# include <openssl/asn1.h>
-# include <openssl/safestack.h>
-
-# ifndef OPENSSL_NO_RSA
-#  include <openssl/rsa.h>
-# endif
-
-# ifndef OPENSSL_NO_DSA
-#  include <openssl/dsa.h>
-# endif
-
-# ifndef OPENSSL_NO_DH
-#  include <openssl/dh.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef WIN32
-/* Under Win32 this is defined in wincrypt.h */
-#  undef X509_NAME
-# endif
-
-# include <openssl/x509.h>
-# include <openssl/x509v3.h>
-
-/*-
-MessageImprint ::= SEQUENCE  {
-     hashAlgorithm                AlgorithmIdentifier,
-     hashedMessage                OCTET STRING  }
-*/
-
-typedef struct TS_msg_imprint_st {
-    X509_ALGOR *hash_algo;
-    ASN1_OCTET_STRING *hashed_msg;
-} TS_MSG_IMPRINT;
-
-/*-
-TimeStampReq ::= SEQUENCE  {
-   version                  INTEGER  { v1(1) },
-   messageImprint           MessageImprint,
-     --a hash algorithm OID and the hash value of the data to be
-     --time-stamped
-   reqPolicy                TSAPolicyId                OPTIONAL,
-   nonce                    INTEGER                    OPTIONAL,
-   certReq                  BOOLEAN                    DEFAULT FALSE,
-   extensions               [0] IMPLICIT Extensions    OPTIONAL  }
-*/
-
-typedef struct TS_req_st {
-    ASN1_INTEGER *version;
-    TS_MSG_IMPRINT *msg_imprint;
-    ASN1_OBJECT *policy_id;     /* OPTIONAL */
-    ASN1_INTEGER *nonce;        /* OPTIONAL */
-    ASN1_BOOLEAN cert_req;      /* DEFAULT FALSE */
-    STACK_OF(X509_EXTENSION) *extensions; /* [0] OPTIONAL */
-} TS_REQ;
-
-/*-
-Accuracy ::= SEQUENCE {
-                seconds        INTEGER           OPTIONAL,
-                millis     [0] INTEGER  (1..999) OPTIONAL,
-                micros     [1] INTEGER  (1..999) OPTIONAL  }
-*/
-
-typedef struct TS_accuracy_st {
-    ASN1_INTEGER *seconds;
-    ASN1_INTEGER *millis;
-    ASN1_INTEGER *micros;
-} TS_ACCURACY;
-
-/*-
-TSTInfo ::= SEQUENCE  {
-    version                      INTEGER  { v1(1) },
-    policy                       TSAPolicyId,
-    messageImprint               MessageImprint,
-      -- MUST have the same value as the similar field in
-      -- TimeStampReq
-    serialNumber                 INTEGER,
-     -- Time-Stamping users MUST be ready to accommodate integers
-     -- up to 160 bits.
-    genTime                      GeneralizedTime,
-    accuracy                     Accuracy                 OPTIONAL,
-    ordering                     BOOLEAN             DEFAULT FALSE,
-    nonce                        INTEGER                  OPTIONAL,
-      -- MUST be present if the similar field was present
-      -- in TimeStampReq.  In that case it MUST have the same value.
-    tsa                          [0] GeneralName          OPTIONAL,
-    extensions                   [1] IMPLICIT Extensions  OPTIONAL   }
-*/
-
-typedef struct TS_tst_info_st {
-    ASN1_INTEGER *version;
-    ASN1_OBJECT *policy_id;
-    TS_MSG_IMPRINT *msg_imprint;
-    ASN1_INTEGER *serial;
-    ASN1_GENERALIZEDTIME *time;
-    TS_ACCURACY *accuracy;
-    ASN1_BOOLEAN ordering;
-    ASN1_INTEGER *nonce;
-    GENERAL_NAME *tsa;
-    STACK_OF(X509_EXTENSION) *extensions;
-} TS_TST_INFO;
-
-/*-
-PKIStatusInfo ::= SEQUENCE {
-    status        PKIStatus,
-    statusString  PKIFreeText     OPTIONAL,
-    failInfo      PKIFailureInfo  OPTIONAL  }
-
-From RFC 1510 - section 3.1.1:
-PKIFreeText ::= SEQUENCE SIZE (1..MAX) OF UTF8String
-        -- text encoded as UTF-8 String (note:  each UTF8String SHOULD
-        -- include an RFC 1766 language tag to indicate the language
-        -- of the contained text)
-*/
-
-/* Possible values for status. See ts_resp_print.c && ts_resp_verify.c. */
-
-# define TS_STATUS_GRANTED                       0
-# define TS_STATUS_GRANTED_WITH_MODS             1
-# define TS_STATUS_REJECTION                     2
-# define TS_STATUS_WAITING                       3
-# define TS_STATUS_REVOCATION_WARNING            4
-# define TS_STATUS_REVOCATION_NOTIFICATION       5
-
-/*
- * Possible values for failure_info. See ts_resp_print.c && ts_resp_verify.c
- */
-
-# define TS_INFO_BAD_ALG                 0
-# define TS_INFO_BAD_REQUEST             2
-# define TS_INFO_BAD_DATA_FORMAT         5
-# define TS_INFO_TIME_NOT_AVAILABLE      14
-# define TS_INFO_UNACCEPTED_POLICY       15
-# define TS_INFO_UNACCEPTED_EXTENSION    16
-# define TS_INFO_ADD_INFO_NOT_AVAILABLE  17
-# define TS_INFO_SYSTEM_FAILURE          25
-
-typedef struct TS_status_info_st {
-    ASN1_INTEGER *status;
-    STACK_OF(ASN1_UTF8STRING) *text;
-    ASN1_BIT_STRING *failure_info;
-} TS_STATUS_INFO;
-
-DECLARE_STACK_OF(ASN1_UTF8STRING)
-DECLARE_ASN1_SET_OF(ASN1_UTF8STRING)
-
-/*-
-TimeStampResp ::= SEQUENCE  {
-     status                  PKIStatusInfo,
-     timeStampToken          TimeStampToken     OPTIONAL }
-*/
-
-typedef struct TS_resp_st {
-    TS_STATUS_INFO *status_info;
-    PKCS7 *token;
-    TS_TST_INFO *tst_info;
-} TS_RESP;
-
-/* The structure below would belong to the ESS component. */
-
-/*-
-IssuerSerial ::= SEQUENCE {
-        issuer                   GeneralNames,
-        serialNumber             CertificateSerialNumber
-        }
-*/
-
-typedef struct ESS_issuer_serial {
-    STACK_OF(GENERAL_NAME) *issuer;
-    ASN1_INTEGER *serial;
-} ESS_ISSUER_SERIAL;
-
-/*-
-ESSCertID ::=  SEQUENCE {
-        certHash                 Hash,
-        issuerSerial             IssuerSerial OPTIONAL
-}
-*/
-
-typedef struct ESS_cert_id {
-    ASN1_OCTET_STRING *hash;    /* Always SHA-1 digest. */
-    ESS_ISSUER_SERIAL *issuer_serial;
-} ESS_CERT_ID;
-
-DECLARE_STACK_OF(ESS_CERT_ID)
-DECLARE_ASN1_SET_OF(ESS_CERT_ID)
-
-/*-
-SigningCertificate ::=  SEQUENCE {
-       certs        SEQUENCE OF ESSCertID,
-       policies     SEQUENCE OF PolicyInformation OPTIONAL
-}
-*/
-
-typedef struct ESS_signing_cert {
-    STACK_OF(ESS_CERT_ID) *cert_ids;
-    STACK_OF(POLICYINFO) *policy_info;
-} ESS_SIGNING_CERT;
-
-TS_REQ *TS_REQ_new(void);
-void TS_REQ_free(TS_REQ *a);
-int i2d_TS_REQ(const TS_REQ *a, unsigned char **pp);
-TS_REQ *d2i_TS_REQ(TS_REQ **a, const unsigned char **pp, long length);
-
-TS_REQ *TS_REQ_dup(TS_REQ *a);
-
-TS_REQ *d2i_TS_REQ_fp(FILE *fp, TS_REQ **a);
-int i2d_TS_REQ_fp(FILE *fp, TS_REQ *a);
-TS_REQ *d2i_TS_REQ_bio(BIO *fp, TS_REQ **a);
-int i2d_TS_REQ_bio(BIO *fp, TS_REQ *a);
-
-TS_MSG_IMPRINT *TS_MSG_IMPRINT_new(void);
-void TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a);
-int i2d_TS_MSG_IMPRINT(const TS_MSG_IMPRINT *a, unsigned char **pp);
-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT(TS_MSG_IMPRINT **a,
-                                   const unsigned char **pp, long length);
-
-TS_MSG_IMPRINT *TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *a);
-
-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a);
-int i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a);
-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT **a);
-int i2d_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT *a);
-
-TS_RESP *TS_RESP_new(void);
-void TS_RESP_free(TS_RESP *a);
-int i2d_TS_RESP(const TS_RESP *a, unsigned char **pp);
-TS_RESP *d2i_TS_RESP(TS_RESP **a, const unsigned char **pp, long length);
-TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token);
-TS_RESP *TS_RESP_dup(TS_RESP *a);
-
-TS_RESP *d2i_TS_RESP_fp(FILE *fp, TS_RESP **a);
-int i2d_TS_RESP_fp(FILE *fp, TS_RESP *a);
-TS_RESP *d2i_TS_RESP_bio(BIO *fp, TS_RESP **a);
-int i2d_TS_RESP_bio(BIO *fp, TS_RESP *a);
-
-TS_STATUS_INFO *TS_STATUS_INFO_new(void);
-void TS_STATUS_INFO_free(TS_STATUS_INFO *a);
-int i2d_TS_STATUS_INFO(const TS_STATUS_INFO *a, unsigned char **pp);
-TS_STATUS_INFO *d2i_TS_STATUS_INFO(TS_STATUS_INFO **a,
-                                   const unsigned char **pp, long length);
-TS_STATUS_INFO *TS_STATUS_INFO_dup(TS_STATUS_INFO *a);
-
-TS_TST_INFO *TS_TST_INFO_new(void);
-void TS_TST_INFO_free(TS_TST_INFO *a);
-int i2d_TS_TST_INFO(const TS_TST_INFO *a, unsigned char **pp);
-TS_TST_INFO *d2i_TS_TST_INFO(TS_TST_INFO **a, const unsigned char **pp,
-                             long length);
-TS_TST_INFO *TS_TST_INFO_dup(TS_TST_INFO *a);
-
-TS_TST_INFO *d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a);
-int i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a);
-TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *fp, TS_TST_INFO **a);
-int i2d_TS_TST_INFO_bio(BIO *fp, TS_TST_INFO *a);
-
-TS_ACCURACY *TS_ACCURACY_new(void);
-void TS_ACCURACY_free(TS_ACCURACY *a);
-int i2d_TS_ACCURACY(const TS_ACCURACY *a, unsigned char **pp);
-TS_ACCURACY *d2i_TS_ACCURACY(TS_ACCURACY **a, const unsigned char **pp,
-                             long length);
-TS_ACCURACY *TS_ACCURACY_dup(TS_ACCURACY *a);
-
-ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_new(void);
-void ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a);
-int i2d_ESS_ISSUER_SERIAL(const ESS_ISSUER_SERIAL *a, unsigned char **pp);
-ESS_ISSUER_SERIAL *d2i_ESS_ISSUER_SERIAL(ESS_ISSUER_SERIAL **a,
-                                         const unsigned char **pp,
-                                         long length);
-ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *a);
-
-ESS_CERT_ID *ESS_CERT_ID_new(void);
-void ESS_CERT_ID_free(ESS_CERT_ID *a);
-int i2d_ESS_CERT_ID(const ESS_CERT_ID *a, unsigned char **pp);
-ESS_CERT_ID *d2i_ESS_CERT_ID(ESS_CERT_ID **a, const unsigned char **pp,
-                             long length);
-ESS_CERT_ID *ESS_CERT_ID_dup(ESS_CERT_ID *a);
-
-ESS_SIGNING_CERT *ESS_SIGNING_CERT_new(void);
-void ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a);
-int i2d_ESS_SIGNING_CERT(const ESS_SIGNING_CERT *a, unsigned char **pp);
-ESS_SIGNING_CERT *d2i_ESS_SIGNING_CERT(ESS_SIGNING_CERT **a,
-                                       const unsigned char **pp, long length);
-ESS_SIGNING_CERT *ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *a);
-
-void ERR_load_TS_strings(void);
-
-int TS_REQ_set_version(TS_REQ *a, long version);
-long TS_REQ_get_version(const TS_REQ *a);
-
-int TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint);
-TS_MSG_IMPRINT *TS_REQ_get_msg_imprint(TS_REQ *a);
-
-int TS_MSG_IMPRINT_set_algo(TS_MSG_IMPRINT *a, X509_ALGOR *alg);
-X509_ALGOR *TS_MSG_IMPRINT_get_algo(TS_MSG_IMPRINT *a);
-
-int TS_MSG_IMPRINT_set_msg(TS_MSG_IMPRINT *a, unsigned char *d, int len);
-ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a);
-
-int TS_REQ_set_policy_id(TS_REQ *a, ASN1_OBJECT *policy);
-ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a);
-
-int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce);
-const ASN1_INTEGER *TS_REQ_get_nonce(const TS_REQ *a);
-
-int TS_REQ_set_cert_req(TS_REQ *a, int cert_req);
-int TS_REQ_get_cert_req(const TS_REQ *a);
-
-STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a);
-void TS_REQ_ext_free(TS_REQ *a);
-int TS_REQ_get_ext_count(TS_REQ *a);
-int TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos);
-int TS_REQ_get_ext_by_OBJ(TS_REQ *a, ASN1_OBJECT *obj, int lastpos);
-int TS_REQ_get_ext_by_critical(TS_REQ *a, int crit, int lastpos);
-X509_EXTENSION *TS_REQ_get_ext(TS_REQ *a, int loc);
-X509_EXTENSION *TS_REQ_delete_ext(TS_REQ *a, int loc);
-int TS_REQ_add_ext(TS_REQ *a, X509_EXTENSION *ex, int loc);
-void *TS_REQ_get_ext_d2i(TS_REQ *a, int nid, int *crit, int *idx);
-
-/* Function declarations for TS_REQ defined in ts/ts_req_print.c */
-
-int TS_REQ_print_bio(BIO *bio, TS_REQ *a);
-
-/* Function declarations for TS_RESP defined in ts/ts_resp_utils.c */
-
-int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *info);
-TS_STATUS_INFO *TS_RESP_get_status_info(TS_RESP *a);
-
-/* Caller loses ownership of PKCS7 and TS_TST_INFO objects. */
-void TS_RESP_set_tst_info(TS_RESP *a, PKCS7 *p7, TS_TST_INFO *tst_info);
-PKCS7 *TS_RESP_get_token(TS_RESP *a);
-TS_TST_INFO *TS_RESP_get_tst_info(TS_RESP *a);
-
-int TS_TST_INFO_set_version(TS_TST_INFO *a, long version);
-long TS_TST_INFO_get_version(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy_id);
-ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a);
-
-int TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint);
-TS_MSG_IMPRINT *TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a);
-
-int TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial);
-const ASN1_INTEGER *TS_TST_INFO_get_serial(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime);
-const ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy);
-TS_ACCURACY *TS_TST_INFO_get_accuracy(TS_TST_INFO *a);
-
-int TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds);
-const ASN1_INTEGER *TS_ACCURACY_get_seconds(const TS_ACCURACY *a);
-
-int TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis);
-const ASN1_INTEGER *TS_ACCURACY_get_millis(const TS_ACCURACY *a);
-
-int TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros);
-const ASN1_INTEGER *TS_ACCURACY_get_micros(const TS_ACCURACY *a);
-
-int TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering);
-int TS_TST_INFO_get_ordering(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce);
-const ASN1_INTEGER *TS_TST_INFO_get_nonce(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa);
-GENERAL_NAME *TS_TST_INFO_get_tsa(TS_TST_INFO *a);
-
-STACK_OF(X509_EXTENSION) *TS_TST_INFO_get_exts(TS_TST_INFO *a);
-void TS_TST_INFO_ext_free(TS_TST_INFO *a);
-int TS_TST_INFO_get_ext_count(TS_TST_INFO *a);
-int TS_TST_INFO_get_ext_by_NID(TS_TST_INFO *a, int nid, int lastpos);
-int TS_TST_INFO_get_ext_by_OBJ(TS_TST_INFO *a, ASN1_OBJECT *obj, int lastpos);
-int TS_TST_INFO_get_ext_by_critical(TS_TST_INFO *a, int crit, int lastpos);
-X509_EXTENSION *TS_TST_INFO_get_ext(TS_TST_INFO *a, int loc);
-X509_EXTENSION *TS_TST_INFO_delete_ext(TS_TST_INFO *a, int loc);
-int TS_TST_INFO_add_ext(TS_TST_INFO *a, X509_EXTENSION *ex, int loc);
-void *TS_TST_INFO_get_ext_d2i(TS_TST_INFO *a, int nid, int *crit, int *idx);
-
-/*
- * Declarations related to response generation, defined in ts/ts_resp_sign.c.
- */
-
-/* Optional flags for response generation. */
-
-/* Don't include the TSA name in response. */
-# define TS_TSA_NAME             0x01
-
-/* Set ordering to true in response. */
-# define TS_ORDERING             0x02
-
-/*
- * Include the signer certificate and the other specified certificates in
- * the ESS signing certificate attribute beside the PKCS7 signed data.
- * Only the signer certificates is included by default.
- */
-# define TS_ESS_CERT_ID_CHAIN    0x04
-
-/* Forward declaration. */
-struct TS_resp_ctx;
-
-/* This must return a unique number less than 160 bits long. */
-typedef ASN1_INTEGER *(*TS_serial_cb) (struct TS_resp_ctx *, void *);
-
-/*
- * This must return the seconds and microseconds since Jan 1, 1970 in the sec
- * and usec variables allocated by the caller. Return non-zero for success
- * and zero for failure.
- */
-typedef int (*TS_time_cb) (struct TS_resp_ctx *, void *, long *sec,
-                           long *usec);
-
-/*
- * This must process the given extension. It can modify the TS_TST_INFO
- * object of the context. Return values: !0 (processed), 0 (error, it must
- * set the status info/failure info of the response).
- */
-typedef int (*TS_extension_cb) (struct TS_resp_ctx *, X509_EXTENSION *,
-                                void *);
-
-typedef struct TS_resp_ctx {
-    X509 *signer_cert;
-    EVP_PKEY *signer_key;
-    STACK_OF(X509) *certs;      /* Certs to include in signed data. */
-    STACK_OF(ASN1_OBJECT) *policies; /* Acceptable policies. */
-    ASN1_OBJECT *default_policy; /* It may appear in policies, too. */
-    STACK_OF(EVP_MD) *mds;      /* Acceptable message digests. */
-    ASN1_INTEGER *seconds;      /* accuracy, 0 means not specified. */
-    ASN1_INTEGER *millis;       /* accuracy, 0 means not specified. */
-    ASN1_INTEGER *micros;       /* accuracy, 0 means not specified. */
-    unsigned clock_precision_digits; /* fraction of seconds in time stamp
-                                      * token. */
-    unsigned flags;             /* Optional info, see values above. */
-    /* Callback functions. */
-    TS_serial_cb serial_cb;
-    void *serial_cb_data;       /* User data for serial_cb. */
-    TS_time_cb time_cb;
-    void *time_cb_data;         /* User data for time_cb. */
-    TS_extension_cb extension_cb;
-    void *extension_cb_data;    /* User data for extension_cb. */
-    /* These members are used only while creating the response. */
-    TS_REQ *request;
-    TS_RESP *response;
-    TS_TST_INFO *tst_info;
-} TS_RESP_CTX;
-
-DECLARE_STACK_OF(EVP_MD)
-DECLARE_ASN1_SET_OF(EVP_MD)
-
-/* Creates a response context that can be used for generating responses. */
-TS_RESP_CTX *TS_RESP_CTX_new(void);
-void TS_RESP_CTX_free(TS_RESP_CTX *ctx);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *def_policy);
-
-/* No additional certs are included in the response by default. */
-int TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs);
-
-/*
- * Adds a new acceptable policy, only the default policy is accepted by
- * default.
- */
-int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *policy);
-
-/*
- * Adds a new acceptable message digest. Note that no message digests are
- * accepted by default. The md argument is shared with the caller.
- */
-int TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md);
-
-/* Accuracy is not included by default. */
-int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx,
-                             int secs, int millis, int micros);
-
-/*
- * Clock precision digits, i.e. the number of decimal digits: '0' means sec,
- * '3' msec, '6' usec, and so on. Default is 0.
- */
-int TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx,
-                                           unsigned clock_precision_digits);
-/* At most we accept usec precision. */
-# define TS_MAX_CLOCK_PRECISION_DIGITS   6
-
-/* No flags are set by default. */
-void TS_RESP_CTX_add_flags(TS_RESP_CTX *ctx, int flags);
-
-/* Default callback always returns a constant. */
-void TS_RESP_CTX_set_serial_cb(TS_RESP_CTX *ctx, TS_serial_cb cb, void *data);
-
-/* Default callback uses the gettimeofday() and gmtime() system calls. */
-void TS_RESP_CTX_set_time_cb(TS_RESP_CTX *ctx, TS_time_cb cb, void *data);
-
-/*
- * Default callback rejects all extensions. The extension callback is called
- * when the TS_TST_INFO object is already set up and not signed yet.
- */
-/* FIXME: extension handling is not tested yet. */
-void TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx,
-                                  TS_extension_cb cb, void *data);
-
-/* The following methods can be used in the callbacks. */
-int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx,
-                                int status, const char *text);
-
-/* Sets the status info only if it is still TS_STATUS_GRANTED. */
-int TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx,
-                                     int status, const char *text);
-
-int TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure);
-
-/* The get methods below can be used in the extension callback. */
-TS_REQ *TS_RESP_CTX_get_request(TS_RESP_CTX *ctx);
-
-TS_TST_INFO *TS_RESP_CTX_get_tst_info(TS_RESP_CTX *ctx);
-
-/*
- * Creates the signed TS_TST_INFO and puts it in TS_RESP.
- * In case of errors it sets the status info properly.
- * Returns NULL only in case of memory allocation/fatal error.
- */
-TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio);
-
-/*
- * Declarations related to response verification,
- * they are defined in ts/ts_resp_verify.c.
- */
-
-int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
-                             X509_STORE *store, X509 **signer_out);
-
-/* Context structure for the generic verify method. */
-
-/* Verify the signer's certificate and the signature of the response. */
-# define TS_VFY_SIGNATURE        (1u << 0)
-/* Verify the version number of the response. */
-# define TS_VFY_VERSION          (1u << 1)
-/* Verify if the policy supplied by the user matches the policy of the TSA. */
-# define TS_VFY_POLICY           (1u << 2)
-/*
- * Verify the message imprint provided by the user. This flag should not be
- * specified with TS_VFY_DATA.
- */
-# define TS_VFY_IMPRINT          (1u << 3)
-/*
- * Verify the message imprint computed by the verify method from the user
- * provided data and the MD algorithm of the response. This flag should not
- * be specified with TS_VFY_IMPRINT.
- */
-# define TS_VFY_DATA             (1u << 4)
-/* Verify the nonce value. */
-# define TS_VFY_NONCE            (1u << 5)
-/* Verify if the TSA name field matches the signer certificate. */
-# define TS_VFY_SIGNER           (1u << 6)
-/* Verify if the TSA name field equals to the user provided name. */
-# define TS_VFY_TSA_NAME         (1u << 7)
-
-/* You can use the following convenience constants. */
-# define TS_VFY_ALL_IMPRINT      (TS_VFY_SIGNATURE       \
-                                 | TS_VFY_VERSION       \
-                                 | TS_VFY_POLICY        \
-                                 | TS_VFY_IMPRINT       \
-                                 | TS_VFY_NONCE         \
-                                 | TS_VFY_SIGNER        \
-                                 | TS_VFY_TSA_NAME)
-# define TS_VFY_ALL_DATA         (TS_VFY_SIGNATURE       \
-                                 | TS_VFY_VERSION       \
-                                 | TS_VFY_POLICY        \
-                                 | TS_VFY_DATA          \
-                                 | TS_VFY_NONCE         \
-                                 | TS_VFY_SIGNER        \
-                                 | TS_VFY_TSA_NAME)
-
-typedef struct TS_verify_ctx {
-    /* Set this to the union of TS_VFY_... flags you want to carry out. */
-    unsigned flags;
-    /* Must be set only with TS_VFY_SIGNATURE. certs is optional. */
-    X509_STORE *store;
-    STACK_OF(X509) *certs;
-    /* Must be set only with TS_VFY_POLICY. */
-    ASN1_OBJECT *policy;
-    /*
-     * Must be set only with TS_VFY_IMPRINT. If md_alg is NULL, the
-     * algorithm from the response is used.
-     */
-    X509_ALGOR *md_alg;
-    unsigned char *imprint;
-    unsigned imprint_len;
-    /* Must be set only with TS_VFY_DATA. */
-    BIO *data;
-    /* Must be set only with TS_VFY_TSA_NAME. */
-    ASN1_INTEGER *nonce;
-    /* Must be set only with TS_VFY_TSA_NAME. */
-    GENERAL_NAME *tsa_name;
-} TS_VERIFY_CTX;
-
-int TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response);
-int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token);
-
-/*
- * Declarations related to response verification context,
- * they are defined in ts/ts_verify_ctx.c.
- */
-
-/* Set all fields to zero. */
-TS_VERIFY_CTX *TS_VERIFY_CTX_new(void);
-void TS_VERIFY_CTX_init(TS_VERIFY_CTX *ctx);
-void TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx);
-void TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx);
-
-/*-
- * If ctx is NULL, it allocates and returns a new object, otherwise
- * it returns ctx. It initialises all the members as follows:
- * flags = TS_VFY_ALL_IMPRINT & ~(TS_VFY_TSA_NAME | TS_VFY_SIGNATURE)
- * certs = NULL
- * store = NULL
- * policy = policy from the request or NULL if absent (in this case
- *      TS_VFY_POLICY is cleared from flags as well)
- * md_alg = MD algorithm from request
- * imprint, imprint_len = imprint from request
- * data = NULL
- * nonce, nonce_len = nonce from the request or NULL if absent (in this case
- *      TS_VFY_NONCE is cleared from flags as well)
- * tsa_name = NULL
- * Important: after calling this method TS_VFY_SIGNATURE should be added!
- */
-TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx);
-
-/* Function declarations for TS_RESP defined in ts/ts_resp_print.c */
-
-int TS_RESP_print_bio(BIO *bio, TS_RESP *a);
-int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a);
-int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a);
-
-/* Common utility functions defined in ts/ts_lib.c */
-
-int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num);
-int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj);
-int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions);
-int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg);
-int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *msg);
-
-/*
- * Function declarations for handling configuration options, defined in
- * ts/ts_conf.c
- */
-
-X509 *TS_CONF_load_cert(const char *file);
-STACK_OF(X509) *TS_CONF_load_certs(const char *file);
-EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass);
-const char *TS_CONF_get_tsa_section(CONF *conf, const char *section);
-int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
-                       TS_RESP_CTX *ctx);
-int TS_CONF_set_crypto_device(CONF *conf, const char *section,
-                              const char *device);
-int TS_CONF_set_default_engine(const char *name);
-int TS_CONF_set_signer_cert(CONF *conf, const char *section,
-                            const char *cert, TS_RESP_CTX *ctx);
-int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
-                      TS_RESP_CTX *ctx);
-int TS_CONF_set_signer_key(CONF *conf, const char *section,
-                           const char *key, const char *pass,
-                           TS_RESP_CTX *ctx);
-int TS_CONF_set_def_policy(CONF *conf, const char *section,
-                           const char *policy, TS_RESP_CTX *ctx);
-int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_clock_precision_digits(CONF *conf, const char *section,
-                                       TS_RESP_CTX *ctx);
-int TS_CONF_set_ordering(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
-                                  TS_RESP_CTX *ctx);
-
-/* -------------------------------------------------- */
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_TS_strings(void);
-
-/* Error codes for the TS functions. */
-
-/* Function codes. */
-# define TS_F_D2I_TS_RESP                                 147
-# define TS_F_DEF_SERIAL_CB                               110
-# define TS_F_DEF_TIME_CB                                 111
-# define TS_F_ESS_ADD_SIGNING_CERT                        112
-# define TS_F_ESS_CERT_ID_NEW_INIT                        113
-# define TS_F_ESS_SIGNING_CERT_NEW_INIT                   114
-# define TS_F_INT_TS_RESP_VERIFY_TOKEN                    149
-# define TS_F_PKCS7_TO_TS_TST_INFO                        148
-# define TS_F_TS_ACCURACY_SET_MICROS                      115
-# define TS_F_TS_ACCURACY_SET_MILLIS                      116
-# define TS_F_TS_ACCURACY_SET_SECONDS                     117
-# define TS_F_TS_CHECK_IMPRINTS                           100
-# define TS_F_TS_CHECK_NONCES                             101
-# define TS_F_TS_CHECK_POLICY                             102
-# define TS_F_TS_CHECK_SIGNING_CERTS                      103
-# define TS_F_TS_CHECK_STATUS_INFO                        104
-# define TS_F_TS_COMPUTE_IMPRINT                          145
-# define TS_F_TS_CONF_SET_DEFAULT_ENGINE                  146
-# define TS_F_TS_GET_STATUS_TEXT                          105
-# define TS_F_TS_MSG_IMPRINT_SET_ALGO                     118
-# define TS_F_TS_REQ_SET_MSG_IMPRINT                      119
-# define TS_F_TS_REQ_SET_NONCE                            120
-# define TS_F_TS_REQ_SET_POLICY_ID                        121
-# define TS_F_TS_RESP_CREATE_RESPONSE                     122
-# define TS_F_TS_RESP_CREATE_TST_INFO                     123
-# define TS_F_TS_RESP_CTX_ADD_FAILURE_INFO                124
-# define TS_F_TS_RESP_CTX_ADD_MD                          125
-# define TS_F_TS_RESP_CTX_ADD_POLICY                      126
-# define TS_F_TS_RESP_CTX_NEW                             127
-# define TS_F_TS_RESP_CTX_SET_ACCURACY                    128
-# define TS_F_TS_RESP_CTX_SET_CERTS                       129
-# define TS_F_TS_RESP_CTX_SET_DEF_POLICY                  130
-# define TS_F_TS_RESP_CTX_SET_SIGNER_CERT                 131
-# define TS_F_TS_RESP_CTX_SET_STATUS_INFO                 132
-# define TS_F_TS_RESP_GET_POLICY                          133
-# define TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION          134
-# define TS_F_TS_RESP_SET_STATUS_INFO                     135
-# define TS_F_TS_RESP_SET_TST_INFO                        150
-# define TS_F_TS_RESP_SIGN                                136
-# define TS_F_TS_RESP_VERIFY_SIGNATURE                    106
-# define TS_F_TS_RESP_VERIFY_TOKEN                        107
-# define TS_F_TS_TST_INFO_SET_ACCURACY                    137
-# define TS_F_TS_TST_INFO_SET_MSG_IMPRINT                 138
-# define TS_F_TS_TST_INFO_SET_NONCE                       139
-# define TS_F_TS_TST_INFO_SET_POLICY_ID                   140
-# define TS_F_TS_TST_INFO_SET_SERIAL                      141
-# define TS_F_TS_TST_INFO_SET_TIME                        142
-# define TS_F_TS_TST_INFO_SET_TSA                         143
-# define TS_F_TS_VERIFY                                   108
-# define TS_F_TS_VERIFY_CERT                              109
-# define TS_F_TS_VERIFY_CTX_NEW                           144
-
-/* Reason codes. */
-# define TS_R_BAD_PKCS7_TYPE                              132
-# define TS_R_BAD_TYPE                                    133
-# define TS_R_CERTIFICATE_VERIFY_ERROR                    100
-# define TS_R_COULD_NOT_SET_ENGINE                        127
-# define TS_R_COULD_NOT_SET_TIME                          115
-# define TS_R_D2I_TS_RESP_INT_FAILED                      128
-# define TS_R_DETACHED_CONTENT                            134
-# define TS_R_ESS_ADD_SIGNING_CERT_ERROR                  116
-# define TS_R_ESS_SIGNING_CERTIFICATE_ERROR               101
-# define TS_R_INVALID_NULL_POINTER                        102
-# define TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE          117
-# define TS_R_MESSAGE_IMPRINT_MISMATCH                    103
-# define TS_R_NONCE_MISMATCH                              104
-# define TS_R_NONCE_NOT_RETURNED                          105
-# define TS_R_NO_CONTENT                                  106
-# define TS_R_NO_TIME_STAMP_TOKEN                         107
-# define TS_R_PKCS7_ADD_SIGNATURE_ERROR                   118
-# define TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR                 119
-# define TS_R_PKCS7_TO_TS_TST_INFO_FAILED                 129
-# define TS_R_POLICY_MISMATCH                             108
-# define TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE      120
-# define TS_R_RESPONSE_SETUP_ERROR                        121
-# define TS_R_SIGNATURE_FAILURE                           109
-# define TS_R_THERE_MUST_BE_ONE_SIGNER                    110
-# define TS_R_TIME_SYSCALL_ERROR                          122
-# define TS_R_TOKEN_NOT_PRESENT                           130
-# define TS_R_TOKEN_PRESENT                               131
-# define TS_R_TSA_NAME_MISMATCH                           111
-# define TS_R_TSA_UNTRUSTED                               112
-# define TS_R_TST_INFO_SETUP_ERROR                        123
-# define TS_R_TS_DATASIGN                                 124
-# define TS_R_UNACCEPTABLE_POLICY                         125
-# define TS_R_UNSUPPORTED_MD_ALGORITHM                    126
-# define TS_R_UNSUPPORTED_VERSION                         113
-# define TS_R_WRONG_CONTENT_TYPE                          114
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/txt_db.h b/openflow/usr/include/openssl/txt_db.h
deleted file mode 100644
index 98e23a2..0000000
--- a/openflow/usr/include/openssl/txt_db.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* crypto/txt_db/txt_db.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_TXT_DB_H
-# define HEADER_TXT_DB_H
-
-# include <openssl/opensslconf.h>
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/stack.h>
-# include <openssl/lhash.h>
-
-# define DB_ERROR_OK                     0
-# define DB_ERROR_MALLOC                 1
-# define DB_ERROR_INDEX_CLASH            2
-# define DB_ERROR_INDEX_OUT_OF_RANGE     3
-# define DB_ERROR_NO_INDEX               4
-# define DB_ERROR_INSERT_INDEX_CLASH     5
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef OPENSSL_STRING *OPENSSL_PSTRING;
-DECLARE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
-
-typedef struct txt_db_st {
-    int num_fields;
-    STACK_OF(OPENSSL_PSTRING) *data;
-    LHASH_OF(OPENSSL_STRING) **index;
-    int (**qual) (OPENSSL_STRING *);
-    long error;
-    long arg1;
-    long arg2;
-    OPENSSL_STRING *arg_row;
-} TXT_DB;
-
-# ifndef OPENSSL_NO_BIO
-TXT_DB *TXT_DB_read(BIO *in, int num);
-long TXT_DB_write(BIO *out, TXT_DB *db);
-# else
-TXT_DB *TXT_DB_read(char *in, int num);
-long TXT_DB_write(char *out, TXT_DB *db);
-# endif
-int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *),
-                        LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
-void TXT_DB_free(TXT_DB *db);
-OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx,
-                                    OPENSSL_STRING *value);
-int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/ui.h b/openflow/usr/include/openssl/ui.h
deleted file mode 100644
index 0dc1633..0000000
--- a/openflow/usr/include/openssl/ui.h
+++ /dev/null
@@ -1,415 +0,0 @@
-/* crypto/ui/ui.h */
-/*
- * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
- * 2001.
- */
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_UI_H
-# define HEADER_UI_H
-
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/crypto.h>
-# endif
-# include <openssl/safestack.h>
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Declared already in ossl_typ.h */
-/* typedef struct ui_st UI; */
-/* typedef struct ui_method_st UI_METHOD; */
-
-/*
- * All the following functions return -1 or NULL on error and in some cases
- * (UI_process()) -2 if interrupted or in some other way cancelled. When
- * everything is fine, they return 0, a positive value or a non-NULL pointer,
- * all depending on their purpose.
- */
-
-/* Creators and destructor.   */
-UI *UI_new(void);
-UI *UI_new_method(const UI_METHOD *method);
-void UI_free(UI *ui);
-
-/*-
-   The following functions are used to add strings to be printed and prompt
-   strings to prompt for data.  The names are UI_{add,dup}_<function>_string
-   and UI_{add,dup}_input_boolean.
-
-   UI_{add,dup}_<function>_string have the following meanings:
-        add     add a text or prompt string.  The pointers given to these
-                functions are used verbatim, no copying is done.
-        dup     make a copy of the text or prompt string, then add the copy
-                to the collection of strings in the user interface.
-        <function>
-                The function is a name for the functionality that the given
-                string shall be used for.  It can be one of:
-                        input   use the string as data prompt.
-                        verify  use the string as verification prompt.  This
-                                is used to verify a previous input.
-                        info    use the string for informational output.
-                        error   use the string for error output.
-   Honestly, there's currently no difference between info and error for the
-   moment.
-
-   UI_{add,dup}_input_boolean have the same semantics for "add" and "dup",
-   and are typically used when one wants to prompt for a yes/no response.
-
-   All of the functions in this group take a UI and a prompt string.
-   The string input and verify addition functions also take a flag argument,
-   a buffer for the result to end up with, a minimum input size and a maximum
-   input size (the result buffer MUST be large enough to be able to contain
-   the maximum number of characters).  Additionally, the verify addition
-   functions takes another buffer to compare the result against.
-   The boolean input functions take an action description string (which should
-   be safe to ignore if the expected user action is obvious, for example with
-   a dialog box with an OK button and a Cancel button), a string of acceptable
-   characters to mean OK and to mean Cancel.  The two last strings are checked
-   to make sure they don't have common characters.  Additionally, the same
-   flag argument as for the string input is taken, as well as a result buffer.
-   The result buffer is required to be at least one byte long.  Depending on
-   the answer, the first character from the OK or the Cancel character strings
-   will be stored in the first byte of the result buffer.  No NUL will be
-   added, so the result is *not* a string.
-
-   On success, the all return an index of the added information.  That index
-   is usefull when retrieving results with UI_get0_result(). */
-int UI_add_input_string(UI *ui, const char *prompt, int flags,
-                        char *result_buf, int minsize, int maxsize);
-int UI_dup_input_string(UI *ui, const char *prompt, int flags,
-                        char *result_buf, int minsize, int maxsize);
-int UI_add_verify_string(UI *ui, const char *prompt, int flags,
-                         char *result_buf, int minsize, int maxsize,
-                         const char *test_buf);
-int UI_dup_verify_string(UI *ui, const char *prompt, int flags,
-                         char *result_buf, int minsize, int maxsize,
-                         const char *test_buf);
-int UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc,
-                         const char *ok_chars, const char *cancel_chars,
-                         int flags, char *result_buf);
-int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
-                         const char *ok_chars, const char *cancel_chars,
-                         int flags, char *result_buf);
-int UI_add_info_string(UI *ui, const char *text);
-int UI_dup_info_string(UI *ui, const char *text);
-int UI_add_error_string(UI *ui, const char *text);
-int UI_dup_error_string(UI *ui, const char *text);
-
-/* These are the possible flags.  They can be or'ed together. */
-/* Use to have echoing of input */
-# define UI_INPUT_FLAG_ECHO              0x01
-/*
- * Use a default password.  Where that password is found is completely up to
- * the application, it might for example be in the user data set with
- * UI_add_user_data().  It is not recommended to have more than one input in
- * each UI being marked with this flag, or the application might get
- * confused.
- */
-# define UI_INPUT_FLAG_DEFAULT_PWD       0x02
-
-/*-
- * The user of these routines may want to define flags of their own.  The core
- * UI won't look at those, but will pass them on to the method routines.  They
- * must use higher bits so they don't get confused with the UI bits above.
- * UI_INPUT_FLAG_USER_BASE tells which is the lowest bit to use.  A good
- * example of use is this:
- *
- *    #define MY_UI_FLAG1       (0x01 << UI_INPUT_FLAG_USER_BASE)
- *
-*/
-# define UI_INPUT_FLAG_USER_BASE 16
-
-/*-
- * The following function helps construct a prompt.  object_desc is a
- * textual short description of the object, for example "pass phrase",
- * and object_name is the name of the object (might be a card name or
- * a file name.
- * The returned string shall always be allocated on the heap with
- * OPENSSL_malloc(), and need to be free'd with OPENSSL_free().
- *
- * If the ui_method doesn't contain a pointer to a user-defined prompt
- * constructor, a default string is built, looking like this:
- *
- *       "Enter {object_desc} for {object_name}:"
- *
- * So, if object_desc has the value "pass phrase" and object_name has
- * the value "foo.key", the resulting string is:
- *
- *       "Enter pass phrase for foo.key:"
-*/
-char *UI_construct_prompt(UI *ui_method,
-                          const char *object_desc, const char *object_name);
-
-/*
- * The following function is used to store a pointer to user-specific data.
- * Any previous such pointer will be returned and replaced.
- *
- * For callback purposes, this function makes a lot more sense than using
- * ex_data, since the latter requires that different parts of OpenSSL or
- * applications share the same ex_data index.
- *
- * Note that the UI_OpenSSL() method completely ignores the user data. Other
- * methods may not, however.
- */
-void *UI_add_user_data(UI *ui, void *user_data);
-/* We need a user data retrieving function as well.  */
-void *UI_get0_user_data(UI *ui);
-
-/* Return the result associated with a prompt given with the index i. */
-const char *UI_get0_result(UI *ui, int i);
-
-/* When all strings have been added, process the whole thing. */
-int UI_process(UI *ui);
-
-/*
- * Give a user interface parametrised control commands.  This can be used to
- * send down an integer, a data pointer or a function pointer, as well as be
- * used to get information from a UI.
- */
-int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void));
-
-/* The commands */
-/*
- * Use UI_CONTROL_PRINT_ERRORS with the value 1 to have UI_process print the
- * OpenSSL error stack before printing any info or added error messages and
- * before any prompting.
- */
-# define UI_CTRL_PRINT_ERRORS            1
-/*
- * Check if a UI_process() is possible to do again with the same instance of
- * a user interface.  This makes UI_ctrl() return 1 if it is redoable, and 0
- * if not.
- */
-# define UI_CTRL_IS_REDOABLE             2
-
-/* Some methods may use extra data */
-# define UI_set_app_data(s,arg)         UI_set_ex_data(s,0,arg)
-# define UI_get_app_data(s)             UI_get_ex_data(s,0)
-int UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                        CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int UI_set_ex_data(UI *r, int idx, void *arg);
-void *UI_get_ex_data(UI *r, int idx);
-
-/* Use specific methods instead of the built-in one */
-void UI_set_default_method(const UI_METHOD *meth);
-const UI_METHOD *UI_get_default_method(void);
-const UI_METHOD *UI_get_method(UI *ui);
-const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth);
-
-/* The method with all the built-in thingies */
-UI_METHOD *UI_OpenSSL(void);
-
-/* ---------- For method writers ---------- */
-/*-
-   A method contains a number of functions that implement the low level
-   of the User Interface.  The functions are:
-
-        an opener       This function starts a session, maybe by opening
-                        a channel to a tty, or by opening a window.
-        a writer        This function is called to write a given string,
-                        maybe to the tty, maybe as a field label in a
-                        window.
-        a flusher       This function is called to flush everything that
-                        has been output so far.  It can be used to actually
-                        display a dialog box after it has been built.
-        a reader        This function is called to read a given prompt,
-                        maybe from the tty, maybe from a field in a
-                        window.  Note that it's called wth all string
-                        structures, not only the prompt ones, so it must
-                        check such things itself.
-        a closer        This function closes the session, maybe by closing
-                        the channel to the tty, or closing the window.
-
-   All these functions are expected to return:
-
-        0       on error.
-        1       on success.
-        -1      on out-of-band events, for example if some prompting has
-                been canceled (by pressing Ctrl-C, for example).  This is
-                only checked when returned by the flusher or the reader.
-
-   The way this is used, the opener is first called, then the writer for all
-   strings, then the flusher, then the reader for all strings and finally the
-   closer.  Note that if you want to prompt from a terminal or other command
-   line interface, the best is to have the reader also write the prompts
-   instead of having the writer do it.  If you want to prompt from a dialog
-   box, the writer can be used to build up the contents of the box, and the
-   flusher to actually display the box and run the event loop until all data
-   has been given, after which the reader only grabs the given data and puts
-   them back into the UI strings.
-
-   All method functions take a UI as argument.  Additionally, the writer and
-   the reader take a UI_STRING.
-*/
-
-/*
- * The UI_STRING type is the data structure that contains all the needed info
- * about a string or a prompt, including test data for a verification prompt.
- */
-typedef struct ui_string_st UI_STRING;
-DECLARE_STACK_OF(UI_STRING)
-
-/*
- * The different types of strings that are currently supported. This is only
- * needed by method authors.
- */
-enum UI_string_types {
-    UIT_NONE = 0,
-    UIT_PROMPT,                 /* Prompt for a string */
-    UIT_VERIFY,                 /* Prompt for a string and verify */
-    UIT_BOOLEAN,                /* Prompt for a yes/no response */
-    UIT_INFO,                   /* Send info to the user */
-    UIT_ERROR                   /* Send an error message to the user */
-};
-
-/* Create and manipulate methods */
-UI_METHOD *UI_create_method(char *name);
-void UI_destroy_method(UI_METHOD *ui_method);
-int UI_method_set_opener(UI_METHOD *method, int (*opener) (UI *ui));
-int UI_method_set_writer(UI_METHOD *method,
-                         int (*writer) (UI *ui, UI_STRING *uis));
-int UI_method_set_flusher(UI_METHOD *method, int (*flusher) (UI *ui));
-int UI_method_set_reader(UI_METHOD *method,
-                         int (*reader) (UI *ui, UI_STRING *uis));
-int UI_method_set_closer(UI_METHOD *method, int (*closer) (UI *ui));
-int UI_method_set_prompt_constructor(UI_METHOD *method,
-                                     char *(*prompt_constructor) (UI *ui,
-                                                                  const char
-                                                                  *object_desc,
-                                                                  const char
-                                                                  *object_name));
-int (*UI_method_get_opener(UI_METHOD *method)) (UI *);
-int (*UI_method_get_writer(UI_METHOD *method)) (UI *, UI_STRING *);
-int (*UI_method_get_flusher(UI_METHOD *method)) (UI *);
-int (*UI_method_get_reader(UI_METHOD *method)) (UI *, UI_STRING *);
-int (*UI_method_get_closer(UI_METHOD *method)) (UI *);
-char *(*UI_method_get_prompt_constructor(UI_METHOD *method)) (UI *,
-                                                              const char *,
-                                                              const char *);
-
-/*
- * The following functions are helpers for method writers to access relevant
- * data from a UI_STRING.
- */
-
-/* Return type of the UI_STRING */
-enum UI_string_types UI_get_string_type(UI_STRING *uis);
-/* Return input flags of the UI_STRING */
-int UI_get_input_flags(UI_STRING *uis);
-/* Return the actual string to output (the prompt, info or error) */
-const char *UI_get0_output_string(UI_STRING *uis);
-/*
- * Return the optional action string to output (the boolean promtp
- * instruction)
- */
-const char *UI_get0_action_string(UI_STRING *uis);
-/* Return the result of a prompt */
-const char *UI_get0_result_string(UI_STRING *uis);
-/*
- * Return the string to test the result against.  Only useful with verifies.
- */
-const char *UI_get0_test_string(UI_STRING *uis);
-/* Return the required minimum size of the result */
-int UI_get_result_minsize(UI_STRING *uis);
-/* Return the required maximum size of the result */
-int UI_get_result_maxsize(UI_STRING *uis);
-/* Set the result of a UI_STRING. */
-int UI_set_result(UI *ui, UI_STRING *uis, const char *result);
-
-/* A couple of popular utility functions */
-int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt,
-                           int verify);
-int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt,
-                    int verify);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_UI_strings(void);
-
-/* Error codes for the UI functions. */
-
-/* Function codes. */
-# define UI_F_GENERAL_ALLOCATE_BOOLEAN                    108
-# define UI_F_GENERAL_ALLOCATE_PROMPT                     109
-# define UI_F_GENERAL_ALLOCATE_STRING                     100
-# define UI_F_UI_CTRL                                     111
-# define UI_F_UI_DUP_ERROR_STRING                         101
-# define UI_F_UI_DUP_INFO_STRING                          102
-# define UI_F_UI_DUP_INPUT_BOOLEAN                        110
-# define UI_F_UI_DUP_INPUT_STRING                         103
-# define UI_F_UI_DUP_VERIFY_STRING                        106
-# define UI_F_UI_GET0_RESULT                              107
-# define UI_F_UI_NEW_METHOD                               104
-# define UI_F_UI_SET_RESULT                               105
-
-/* Reason codes. */
-# define UI_R_COMMON_OK_AND_CANCEL_CHARACTERS             104
-# define UI_R_INDEX_TOO_LARGE                             102
-# define UI_R_INDEX_TOO_SMALL                             103
-# define UI_R_NO_RESULT_BUFFER                            105
-# define UI_R_RESULT_TOO_LARGE                            100
-# define UI_R_RESULT_TOO_SMALL                            101
-# define UI_R_UNKNOWN_CONTROL_COMMAND                     106
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/ui_compat.h b/openflow/usr/include/openssl/ui_compat.h
deleted file mode 100644
index bf54154..0000000
--- a/openflow/usr/include/openssl/ui_compat.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* crypto/ui/ui.h */
-/*
- * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
- * 2001.
- */
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_UI_COMPAT_H
-# define HEADER_UI_COMPAT_H
-
-# include <openssl/opensslconf.h>
-# include <openssl/ui.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * The following functions were previously part of the DES section, and are
- * provided here for backward compatibility reasons.
- */
-
-# define des_read_pw_string(b,l,p,v) \
-        _ossl_old_des_read_pw_string((b),(l),(p),(v))
-# define des_read_pw(b,bf,s,p,v) \
-        _ossl_old_des_read_pw((b),(bf),(s),(p),(v))
-
-int _ossl_old_des_read_pw_string(char *buf, int length, const char *prompt,
-                                 int verify);
-int _ossl_old_des_read_pw(char *buf, char *buff, int size, const char *prompt,
-                          int verify);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/whrlpool.h b/openflow/usr/include/openssl/whrlpool.h
deleted file mode 100644
index 73c749d..0000000
--- a/openflow/usr/include/openssl/whrlpool.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef HEADER_WHRLPOOL_H
-# define HEADER_WHRLPOOL_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# define WHIRLPOOL_DIGEST_LENGTH (512/8)
-# define WHIRLPOOL_BBLOCK        512
-# define WHIRLPOOL_COUNTER       (256/8)
-
-typedef struct {
-    union {
-        unsigned char c[WHIRLPOOL_DIGEST_LENGTH];
-        /* double q is here to ensure 64-bit alignment */
-        double q[WHIRLPOOL_DIGEST_LENGTH / sizeof(double)];
-    } H;
-    unsigned char data[WHIRLPOOL_BBLOCK / 8];
-    unsigned int bitoff;
-    size_t bitlen[WHIRLPOOL_COUNTER / sizeof(size_t)];
-} WHIRLPOOL_CTX;
-
-# ifndef OPENSSL_NO_WHIRLPOOL
-#  ifdef OPENSSL_FIPS
-int private_WHIRLPOOL_Init(WHIRLPOOL_CTX *c);
-#  endif
-int WHIRLPOOL_Init(WHIRLPOOL_CTX *c);
-int WHIRLPOOL_Update(WHIRLPOOL_CTX *c, const void *inp, size_t bytes);
-void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *inp, size_t bits);
-int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c);
-unsigned char *WHIRLPOOL(const void *inp, size_t bytes, unsigned char *md);
-# endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/openssl/x509.h b/openflow/usr/include/openssl/x509.h
deleted file mode 100644
index 99337b8..0000000
--- a/openflow/usr/include/openssl/x509.h
+++ /dev/null
@@ -1,1327 +0,0 @@
-/* crypto/x509/x509.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_X509_H
-# define HEADER_X509_H
-
-# include <openssl/e_os2.h>
-# include <openssl/symhacks.h>
-# ifndef OPENSSL_NO_BUFFER
-#  include <openssl/buffer.h>
-# endif
-# ifndef OPENSSL_NO_EVP
-#  include <openssl/evp.h>
-# endif
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/stack.h>
-# include <openssl/asn1.h>
-# include <openssl/safestack.h>
-
-# ifndef OPENSSL_NO_EC
-#  include <openssl/ec.h>
-# endif
-
-# ifndef OPENSSL_NO_ECDSA
-#  include <openssl/ecdsa.h>
-# endif
-
-# ifndef OPENSSL_NO_ECDH
-#  include <openssl/ecdh.h>
-# endif
-
-# ifndef OPENSSL_NO_DEPRECATED
-#  ifndef OPENSSL_NO_RSA
-#   include <openssl/rsa.h>
-#  endif
-#  ifndef OPENSSL_NO_DSA
-#   include <openssl/dsa.h>
-#  endif
-#  ifndef OPENSSL_NO_DH
-#   include <openssl/dh.h>
-#  endif
-# endif
-
-# ifndef OPENSSL_NO_SHA
-#  include <openssl/sha.h>
-# endif
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_SYS_WIN32
-/* Under Win32 these are defined in wincrypt.h */
-#  undef X509_NAME
-#  undef X509_CERT_PAIR
-#  undef X509_EXTENSIONS
-# endif
-
-# define X509_FILETYPE_PEM       1
-# define X509_FILETYPE_ASN1      2
-# define X509_FILETYPE_DEFAULT   3
-
-# define X509v3_KU_DIGITAL_SIGNATURE     0x0080
-# define X509v3_KU_NON_REPUDIATION       0x0040
-# define X509v3_KU_KEY_ENCIPHERMENT      0x0020
-# define X509v3_KU_DATA_ENCIPHERMENT     0x0010
-# define X509v3_KU_KEY_AGREEMENT         0x0008
-# define X509v3_KU_KEY_CERT_SIGN         0x0004
-# define X509v3_KU_CRL_SIGN              0x0002
-# define X509v3_KU_ENCIPHER_ONLY         0x0001
-# define X509v3_KU_DECIPHER_ONLY         0x8000
-# define X509v3_KU_UNDEF                 0xffff
-
-typedef struct X509_objects_st {
-    int nid;
-    int (*a2i) (void);
-    int (*i2a) (void);
-} X509_OBJECTS;
-
-struct X509_algor_st {
-    ASN1_OBJECT *algorithm;
-    ASN1_TYPE *parameter;
-} /* X509_ALGOR */ ;
-
-DECLARE_ASN1_SET_OF(X509_ALGOR)
-
-typedef STACK_OF(X509_ALGOR) X509_ALGORS;
-
-typedef struct X509_val_st {
-    ASN1_TIME *notBefore;
-    ASN1_TIME *notAfter;
-} X509_VAL;
-
-struct X509_pubkey_st {
-    X509_ALGOR *algor;
-    ASN1_BIT_STRING *public_key;
-    EVP_PKEY *pkey;
-};
-
-typedef struct X509_sig_st {
-    X509_ALGOR *algor;
-    ASN1_OCTET_STRING *digest;
-} X509_SIG;
-
-typedef struct X509_name_entry_st {
-    ASN1_OBJECT *object;
-    ASN1_STRING *value;
-    int set;
-    int size;                   /* temp variable */
-} X509_NAME_ENTRY;
-
-DECLARE_STACK_OF(X509_NAME_ENTRY)
-DECLARE_ASN1_SET_OF(X509_NAME_ENTRY)
-
-/* we always keep X509_NAMEs in 2 forms. */
-struct X509_name_st {
-    STACK_OF(X509_NAME_ENTRY) *entries;
-    int modified;               /* true if 'bytes' needs to be built */
-# ifndef OPENSSL_NO_BUFFER
-    BUF_MEM *bytes;
-# else
-    char *bytes;
-# endif
-/*      unsigned long hash; Keep the hash around for lookups */
-    unsigned char *canon_enc;
-    int canon_enclen;
-} /* X509_NAME */ ;
-
-DECLARE_STACK_OF(X509_NAME)
-
-# define X509_EX_V_NETSCAPE_HACK         0x8000
-# define X509_EX_V_INIT                  0x0001
-typedef struct X509_extension_st {
-    ASN1_OBJECT *object;
-    ASN1_BOOLEAN critical;
-    ASN1_OCTET_STRING *value;
-} X509_EXTENSION;
-
-typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
-
-DECLARE_STACK_OF(X509_EXTENSION)
-DECLARE_ASN1_SET_OF(X509_EXTENSION)
-
-/* a sequence of these are used */
-typedef struct x509_attributes_st {
-    ASN1_OBJECT *object;
-    int single;                 /* 0 for a set, 1 for a single item (which is
-                                 * wrong) */
-    union {
-        char *ptr;
-        /*
-         * 0
-         */ STACK_OF(ASN1_TYPE) *set;
-        /*
-         * 1
-         */ ASN1_TYPE *single;
-    } value;
-} X509_ATTRIBUTE;
-
-DECLARE_STACK_OF(X509_ATTRIBUTE)
-DECLARE_ASN1_SET_OF(X509_ATTRIBUTE)
-
-typedef struct X509_req_info_st {
-    ASN1_ENCODING enc;
-    ASN1_INTEGER *version;
-    X509_NAME *subject;
-    X509_PUBKEY *pubkey;
-    /*  d=2 hl=2 l=  0 cons: cont: 00 */
-    STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
-} X509_REQ_INFO;
-
-typedef struct X509_req_st {
-    X509_REQ_INFO *req_info;
-    X509_ALGOR *sig_alg;
-    ASN1_BIT_STRING *signature;
-    int references;
-} X509_REQ;
-
-typedef struct x509_cinf_st {
-    ASN1_INTEGER *version;      /* [ 0 ] default of v1 */
-    ASN1_INTEGER *serialNumber;
-    X509_ALGOR *signature;
-    X509_NAME *issuer;
-    X509_VAL *validity;
-    X509_NAME *subject;
-    X509_PUBKEY *key;
-    ASN1_BIT_STRING *issuerUID; /* [ 1 ] optional in v2 */
-    ASN1_BIT_STRING *subjectUID; /* [ 2 ] optional in v2 */
-    STACK_OF(X509_EXTENSION) *extensions; /* [ 3 ] optional in v3 */
-    ASN1_ENCODING enc;
-} X509_CINF;
-
-/*
- * This stuff is certificate "auxiliary info" it contains details which are
- * useful in certificate stores and databases. When used this is tagged onto
- * the end of the certificate itself
- */
-
-typedef struct x509_cert_aux_st {
-    STACK_OF(ASN1_OBJECT) *trust; /* trusted uses */
-    STACK_OF(ASN1_OBJECT) *reject; /* rejected uses */
-    ASN1_UTF8STRING *alias;     /* "friendly name" */
-    ASN1_OCTET_STRING *keyid;   /* key id of private key */
-    STACK_OF(X509_ALGOR) *other; /* other unspecified info */
-} X509_CERT_AUX;
-
-struct x509_st {
-    X509_CINF *cert_info;
-    X509_ALGOR *sig_alg;
-    ASN1_BIT_STRING *signature;
-    int valid;
-    int references;
-    char *name;
-    CRYPTO_EX_DATA ex_data;
-    /* These contain copies of various extension values */
-    long ex_pathlen;
-    long ex_pcpathlen;
-    unsigned long ex_flags;
-    unsigned long ex_kusage;
-    unsigned long ex_xkusage;
-    unsigned long ex_nscert;
-    ASN1_OCTET_STRING *skid;
-    AUTHORITY_KEYID *akid;
-    X509_POLICY_CACHE *policy_cache;
-    STACK_OF(DIST_POINT) *crldp;
-    STACK_OF(GENERAL_NAME) *altname;
-    NAME_CONSTRAINTS *nc;
-# ifndef OPENSSL_NO_RFC3779
-    STACK_OF(IPAddressFamily) *rfc3779_addr;
-    struct ASIdentifiers_st *rfc3779_asid;
-# endif
-# ifndef OPENSSL_NO_SHA
-    unsigned char sha1_hash[SHA_DIGEST_LENGTH];
-# endif
-    X509_CERT_AUX *aux;
-} /* X509 */ ;
-
-DECLARE_STACK_OF(X509)
-DECLARE_ASN1_SET_OF(X509)
-
-/* This is used for a table of trust checking functions */
-
-typedef struct x509_trust_st {
-    int trust;
-    int flags;
-    int (*check_trust) (struct x509_trust_st *, X509 *, int);
-    char *name;
-    int arg1;
-    void *arg2;
-} X509_TRUST;
-
-DECLARE_STACK_OF(X509_TRUST)
-
-typedef struct x509_cert_pair_st {
-    X509 *forward;
-    X509 *reverse;
-} X509_CERT_PAIR;
-
-/* standard trust ids */
-
-# define X509_TRUST_DEFAULT      -1/* Only valid in purpose settings */
-
-# define X509_TRUST_COMPAT       1
-# define X509_TRUST_SSL_CLIENT   2
-# define X509_TRUST_SSL_SERVER   3
-# define X509_TRUST_EMAIL        4
-# define X509_TRUST_OBJECT_SIGN  5
-# define X509_TRUST_OCSP_SIGN    6
-# define X509_TRUST_OCSP_REQUEST 7
-# define X509_TRUST_TSA          8
-
-/* Keep these up to date! */
-# define X509_TRUST_MIN          1
-# define X509_TRUST_MAX          8
-
-/* trust_flags values */
-# define X509_TRUST_DYNAMIC      1
-# define X509_TRUST_DYNAMIC_NAME 2
-
-/* check_trust return codes */
-
-# define X509_TRUST_TRUSTED      1
-# define X509_TRUST_REJECTED     2
-# define X509_TRUST_UNTRUSTED    3
-
-/* Flags for X509_print_ex() */
-
-# define X509_FLAG_COMPAT                0
-# define X509_FLAG_NO_HEADER             1L
-# define X509_FLAG_NO_VERSION            (1L << 1)
-# define X509_FLAG_NO_SERIAL             (1L << 2)
-# define X509_FLAG_NO_SIGNAME            (1L << 3)
-# define X509_FLAG_NO_ISSUER             (1L << 4)
-# define X509_FLAG_NO_VALIDITY           (1L << 5)
-# define X509_FLAG_NO_SUBJECT            (1L << 6)
-# define X509_FLAG_NO_PUBKEY             (1L << 7)
-# define X509_FLAG_NO_EXTENSIONS         (1L << 8)
-# define X509_FLAG_NO_SIGDUMP            (1L << 9)
-# define X509_FLAG_NO_AUX                (1L << 10)
-# define X509_FLAG_NO_ATTRIBUTES         (1L << 11)
-# define X509_FLAG_NO_IDS                (1L << 12)
-
-/* Flags specific to X509_NAME_print_ex() */
-
-/* The field separator information */
-
-# define XN_FLAG_SEP_MASK        (0xf << 16)
-
-# define XN_FLAG_COMPAT          0/* Traditional SSLeay: use old
-                                   * X509_NAME_print */
-# define XN_FLAG_SEP_COMMA_PLUS  (1 << 16)/* RFC2253 ,+ */
-# define XN_FLAG_SEP_CPLUS_SPC   (2 << 16)/* ,+ spaced: more readable */
-# define XN_FLAG_SEP_SPLUS_SPC   (3 << 16)/* ;+ spaced */
-# define XN_FLAG_SEP_MULTILINE   (4 << 16)/* One line per field */
-
-# define XN_FLAG_DN_REV          (1 << 20)/* Reverse DN order */
-
-/* How the field name is shown */
-
-# define XN_FLAG_FN_MASK         (0x3 << 21)
-
-# define XN_FLAG_FN_SN           0/* Object short name */
-# define XN_FLAG_FN_LN           (1 << 21)/* Object long name */
-# define XN_FLAG_FN_OID          (2 << 21)/* Always use OIDs */
-# define XN_FLAG_FN_NONE         (3 << 21)/* No field names */
-
-# define XN_FLAG_SPC_EQ          (1 << 23)/* Put spaces round '=' */
-
-/*
- * This determines if we dump fields we don't recognise: RFC2253 requires
- * this.
- */
-
-# define XN_FLAG_DUMP_UNKNOWN_FIELDS (1 << 24)
-
-# define XN_FLAG_FN_ALIGN        (1 << 25)/* Align field names to 20
-                                           * characters */
-
-/* Complete set of RFC2253 flags */
-
-# define XN_FLAG_RFC2253 (ASN1_STRFLGS_RFC2253 | \
-                        XN_FLAG_SEP_COMMA_PLUS | \
-                        XN_FLAG_DN_REV | \
-                        XN_FLAG_FN_SN | \
-                        XN_FLAG_DUMP_UNKNOWN_FIELDS)
-
-/* readable oneline form */
-
-# define XN_FLAG_ONELINE (ASN1_STRFLGS_RFC2253 | \
-                        ASN1_STRFLGS_ESC_QUOTE | \
-                        XN_FLAG_SEP_CPLUS_SPC | \
-                        XN_FLAG_SPC_EQ | \
-                        XN_FLAG_FN_SN)
-
-/* readable multiline form */
-
-# define XN_FLAG_MULTILINE (ASN1_STRFLGS_ESC_CTRL | \
-                        ASN1_STRFLGS_ESC_MSB | \
-                        XN_FLAG_SEP_MULTILINE | \
-                        XN_FLAG_SPC_EQ | \
-                        XN_FLAG_FN_LN | \
-                        XN_FLAG_FN_ALIGN)
-
-struct x509_revoked_st {
-    ASN1_INTEGER *serialNumber;
-    ASN1_TIME *revocationDate;
-    STACK_OF(X509_EXTENSION) /* optional */ *extensions;
-    /* Set up if indirect CRL */
-    STACK_OF(GENERAL_NAME) *issuer;
-    /* Revocation reason */
-    int reason;
-    int sequence;               /* load sequence */
-};
-
-DECLARE_STACK_OF(X509_REVOKED)
-DECLARE_ASN1_SET_OF(X509_REVOKED)
-
-typedef struct X509_crl_info_st {
-    ASN1_INTEGER *version;
-    X509_ALGOR *sig_alg;
-    X509_NAME *issuer;
-    ASN1_TIME *lastUpdate;
-    ASN1_TIME *nextUpdate;
-    STACK_OF(X509_REVOKED) *revoked;
-    STACK_OF(X509_EXTENSION) /* [0] */ *extensions;
-    ASN1_ENCODING enc;
-} X509_CRL_INFO;
-
-struct X509_crl_st {
-    /* actual signature */
-    X509_CRL_INFO *crl;
-    X509_ALGOR *sig_alg;
-    ASN1_BIT_STRING *signature;
-    int references;
-    int flags;
-    /* Copies of various extensions */
-    AUTHORITY_KEYID *akid;
-    ISSUING_DIST_POINT *idp;
-    /* Convenient breakdown of IDP */
-    int idp_flags;
-    int idp_reasons;
-    /* CRL and base CRL numbers for delta processing */
-    ASN1_INTEGER *crl_number;
-    ASN1_INTEGER *base_crl_number;
-# ifndef OPENSSL_NO_SHA
-    unsigned char sha1_hash[SHA_DIGEST_LENGTH];
-# endif
-    STACK_OF(GENERAL_NAMES) *issuers;
-    const X509_CRL_METHOD *meth;
-    void *meth_data;
-} /* X509_CRL */ ;
-
-DECLARE_STACK_OF(X509_CRL)
-DECLARE_ASN1_SET_OF(X509_CRL)
-
-typedef struct private_key_st {
-    int version;
-    /* The PKCS#8 data types */
-    X509_ALGOR *enc_algor;
-    ASN1_OCTET_STRING *enc_pkey; /* encrypted pub key */
-    /* When decrypted, the following will not be NULL */
-    EVP_PKEY *dec_pkey;
-    /* used to encrypt and decrypt */
-    int key_length;
-    char *key_data;
-    int key_free;               /* true if we should auto free key_data */
-    /* expanded version of 'enc_algor' */
-    EVP_CIPHER_INFO cipher;
-    int references;
-} X509_PKEY;
-
-# ifndef OPENSSL_NO_EVP
-typedef struct X509_info_st {
-    X509 *x509;
-    X509_CRL *crl;
-    X509_PKEY *x_pkey;
-    EVP_CIPHER_INFO enc_cipher;
-    int enc_len;
-    char *enc_data;
-    int references;
-} X509_INFO;
-
-DECLARE_STACK_OF(X509_INFO)
-# endif
-
-/*
- * The next 2 structures and their 8 routines were sent to me by Pat Richard
- * <patr@x509.com> and are used to manipulate Netscapes spki structures -
- * useful if you are writing a CA web page
- */
-typedef struct Netscape_spkac_st {
-    X509_PUBKEY *pubkey;
-    ASN1_IA5STRING *challenge;  /* challenge sent in atlas >= PR2 */
-} NETSCAPE_SPKAC;
-
-typedef struct Netscape_spki_st {
-    NETSCAPE_SPKAC *spkac;      /* signed public key and challenge */
-    X509_ALGOR *sig_algor;
-    ASN1_BIT_STRING *signature;
-} NETSCAPE_SPKI;
-
-/* Netscape certificate sequence structure */
-typedef struct Netscape_certificate_sequence {
-    ASN1_OBJECT *type;
-    STACK_OF(X509) *certs;
-} NETSCAPE_CERT_SEQUENCE;
-
-/*- Unused (and iv length is wrong)
-typedef struct CBCParameter_st
-        {
-        unsigned char iv[8];
-        } CBC_PARAM;
-*/
-
-/* Password based encryption structure */
-
-typedef struct PBEPARAM_st {
-    ASN1_OCTET_STRING *salt;
-    ASN1_INTEGER *iter;
-} PBEPARAM;
-
-/* Password based encryption V2 structures */
-
-typedef struct PBE2PARAM_st {
-    X509_ALGOR *keyfunc;
-    X509_ALGOR *encryption;
-} PBE2PARAM;
-
-typedef struct PBKDF2PARAM_st {
-/* Usually OCTET STRING but could be anything */
-    ASN1_TYPE *salt;
-    ASN1_INTEGER *iter;
-    ASN1_INTEGER *keylength;
-    X509_ALGOR *prf;
-} PBKDF2PARAM;
-
-/* PKCS#8 private key info structure */
-
-struct pkcs8_priv_key_info_st {
-    /* Flag for various broken formats */
-    int broken;
-# define PKCS8_OK                0
-# define PKCS8_NO_OCTET          1
-# define PKCS8_EMBEDDED_PARAM    2
-# define PKCS8_NS_DB             3
-# define PKCS8_NEG_PRIVKEY       4
-    ASN1_INTEGER *version;
-    X509_ALGOR *pkeyalg;
-    /* Should be OCTET STRING but some are broken */
-    ASN1_TYPE *pkey;
-    STACK_OF(X509_ATTRIBUTE) *attributes;
-};
-
-#ifdef  __cplusplus
-}
-#endif
-
-# include <openssl/x509_vfy.h>
-# include <openssl/pkcs7.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define X509_EXT_PACK_UNKNOWN   1
-# define X509_EXT_PACK_STRING    2
-
-# define         X509_get_version(x) ASN1_INTEGER_get((x)->cert_info->version)
-/* #define      X509_get_serialNumber(x) ((x)->cert_info->serialNumber) */
-# define         X509_get_notBefore(x) ((x)->cert_info->validity->notBefore)
-# define         X509_get_notAfter(x) ((x)->cert_info->validity->notAfter)
-# define         X509_extract_key(x)     X509_get_pubkey(x)/*****/
-# define         X509_REQ_get_version(x) ASN1_INTEGER_get((x)->req_info->version)
-# define         X509_REQ_get_subject_name(x) ((x)->req_info->subject)
-# define         X509_REQ_extract_key(a) X509_REQ_get_pubkey(a)
-# define         X509_name_cmp(a,b)      X509_NAME_cmp((a),(b))
-# define         X509_get_signature_type(x) EVP_PKEY_type(OBJ_obj2nid((x)->sig_alg->algorithm))
-
-# define         X509_CRL_get_version(x) ASN1_INTEGER_get((x)->crl->version)
-# define         X509_CRL_get_lastUpdate(x) ((x)->crl->lastUpdate)
-# define         X509_CRL_get_nextUpdate(x) ((x)->crl->nextUpdate)
-# define         X509_CRL_get_issuer(x) ((x)->crl->issuer)
-# define         X509_CRL_get_REVOKED(x) ((x)->crl->revoked)
-
-void X509_CRL_set_default_method(const X509_CRL_METHOD *meth);
-X509_CRL_METHOD *X509_CRL_METHOD_new(int (*crl_init) (X509_CRL *crl),
-                                     int (*crl_free) (X509_CRL *crl),
-                                     int (*crl_lookup) (X509_CRL *crl,
-                                                        X509_REVOKED **ret,
-                                                        ASN1_INTEGER *ser,
-                                                        X509_NAME *issuer),
-                                     int (*crl_verify) (X509_CRL *crl,
-                                                        EVP_PKEY *pk));
-void X509_CRL_METHOD_free(X509_CRL_METHOD *m);
-
-void X509_CRL_set_meth_data(X509_CRL *crl, void *dat);
-void *X509_CRL_get_meth_data(X509_CRL *crl);
-
-/*
- * This one is only used so that a binary form can output, as in
- * i2d_X509_NAME(X509_get_X509_PUBKEY(x),&buf)
- */
-# define         X509_get_X509_PUBKEY(x) ((x)->cert_info->key)
-
-const char *X509_verify_cert_error_string(long n);
-
-# ifndef OPENSSL_NO_EVP
-int X509_verify(X509 *a, EVP_PKEY *r);
-
-int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r);
-int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r);
-int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r);
-
-NETSCAPE_SPKI *NETSCAPE_SPKI_b64_decode(const char *str, int len);
-char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *x);
-EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x);
-int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey);
-
-int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki);
-
-int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent);
-int X509_signature_print(BIO *bp, X509_ALGOR *alg, ASN1_STRING *sig);
-
-int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx);
-int X509_http_nbio(OCSP_REQ_CTX *rctx, X509 **pcert);
-int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx);
-int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx);
-int X509_CRL_http_nbio(OCSP_REQ_CTX *rctx, X509_CRL **pcrl);
-int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md);
-
-int X509_pubkey_digest(const X509 *data, const EVP_MD *type,
-                       unsigned char *md, unsigned int *len);
-int X509_digest(const X509 *data, const EVP_MD *type,
-                unsigned char *md, unsigned int *len);
-int X509_CRL_digest(const X509_CRL *data, const EVP_MD *type,
-                    unsigned char *md, unsigned int *len);
-int X509_REQ_digest(const X509_REQ *data, const EVP_MD *type,
-                    unsigned char *md, unsigned int *len);
-int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type,
-                     unsigned char *md, unsigned int *len);
-# endif
-
-# ifndef OPENSSL_NO_FP_API
-X509 *d2i_X509_fp(FILE *fp, X509 **x509);
-int i2d_X509_fp(FILE *fp, X509 *x509);
-X509_CRL *d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl);
-int i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl);
-X509_REQ *d2i_X509_REQ_fp(FILE *fp, X509_REQ **req);
-int i2d_X509_REQ_fp(FILE *fp, X509_REQ *req);
-#  ifndef OPENSSL_NO_RSA
-RSA *d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa);
-int i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa);
-RSA *d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa);
-int i2d_RSAPublicKey_fp(FILE *fp, RSA *rsa);
-RSA *d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa);
-int i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa);
-#  endif
-#  ifndef OPENSSL_NO_DSA
-DSA *d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa);
-int i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa);
-DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa);
-int i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa);
-#  endif
-#  ifndef OPENSSL_NO_EC
-EC_KEY *d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey);
-int i2d_EC_PUBKEY_fp(FILE *fp, EC_KEY *eckey);
-EC_KEY *d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey);
-int i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey);
-#  endif
-X509_SIG *d2i_PKCS8_fp(FILE *fp, X509_SIG **p8);
-int i2d_PKCS8_fp(FILE *fp, X509_SIG *p8);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
-                                                PKCS8_PRIV_KEY_INFO **p8inf);
-int i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO *p8inf);
-int i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, EVP_PKEY *key);
-int i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a);
-int i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a);
-# endif
-
-# ifndef OPENSSL_NO_BIO
-X509 *d2i_X509_bio(BIO *bp, X509 **x509);
-int i2d_X509_bio(BIO *bp, X509 *x509);
-X509_CRL *d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl);
-int i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl);
-X509_REQ *d2i_X509_REQ_bio(BIO *bp, X509_REQ **req);
-int i2d_X509_REQ_bio(BIO *bp, X509_REQ *req);
-#  ifndef OPENSSL_NO_RSA
-RSA *d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa);
-int i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa);
-RSA *d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa);
-int i2d_RSAPublicKey_bio(BIO *bp, RSA *rsa);
-RSA *d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa);
-int i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa);
-#  endif
-#  ifndef OPENSSL_NO_DSA
-DSA *d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa);
-int i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa);
-DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa);
-int i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa);
-#  endif
-#  ifndef OPENSSL_NO_EC
-EC_KEY *d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey);
-int i2d_EC_PUBKEY_bio(BIO *bp, EC_KEY *eckey);
-EC_KEY *d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey);
-int i2d_ECPrivateKey_bio(BIO *bp, EC_KEY *eckey);
-#  endif
-X509_SIG *d2i_PKCS8_bio(BIO *bp, X509_SIG **p8);
-int i2d_PKCS8_bio(BIO *bp, X509_SIG *p8);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
-                                                 PKCS8_PRIV_KEY_INFO **p8inf);
-int i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO *p8inf);
-int i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, EVP_PKEY *key);
-int i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a);
-int i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a);
-# endif
-
-X509 *X509_dup(X509 *x509);
-X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa);
-X509_EXTENSION *X509_EXTENSION_dup(X509_EXTENSION *ex);
-X509_CRL *X509_CRL_dup(X509_CRL *crl);
-X509_REVOKED *X509_REVOKED_dup(X509_REVOKED *rev);
-X509_REQ *X509_REQ_dup(X509_REQ *req);
-X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn);
-int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype,
-                    void *pval);
-void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,
-                     X509_ALGOR *algor);
-void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md);
-int X509_ALGOR_cmp(const X509_ALGOR *a, const X509_ALGOR *b);
-
-X509_NAME *X509_NAME_dup(X509_NAME *xn);
-X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
-
-int X509_cmp_time(const ASN1_TIME *s, time_t *t);
-int X509_cmp_current_time(const ASN1_TIME *s);
-ASN1_TIME *X509_time_adj(ASN1_TIME *s, long adj, time_t *t);
-ASN1_TIME *X509_time_adj_ex(ASN1_TIME *s,
-                            int offset_day, long offset_sec, time_t *t);
-ASN1_TIME *X509_gmtime_adj(ASN1_TIME *s, long adj);
-
-const char *X509_get_default_cert_area(void);
-const char *X509_get_default_cert_dir(void);
-const char *X509_get_default_cert_file(void);
-const char *X509_get_default_cert_dir_env(void);
-const char *X509_get_default_cert_file_env(void);
-const char *X509_get_default_private_dir(void);
-
-X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
-X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey);
-
-DECLARE_ASN1_FUNCTIONS(X509_ALGOR)
-DECLARE_ASN1_ENCODE_FUNCTIONS(X509_ALGORS, X509_ALGORS, X509_ALGORS)
-DECLARE_ASN1_FUNCTIONS(X509_VAL)
-
-DECLARE_ASN1_FUNCTIONS(X509_PUBKEY)
-
-int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey);
-EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key);
-int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain);
-int i2d_PUBKEY(EVP_PKEY *a, unsigned char **pp);
-EVP_PKEY *d2i_PUBKEY(EVP_PKEY **a, const unsigned char **pp, long length);
-# ifndef OPENSSL_NO_RSA
-int i2d_RSA_PUBKEY(RSA *a, unsigned char **pp);
-RSA *d2i_RSA_PUBKEY(RSA **a, const unsigned char **pp, long length);
-# endif
-# ifndef OPENSSL_NO_DSA
-int i2d_DSA_PUBKEY(DSA *a, unsigned char **pp);
-DSA *d2i_DSA_PUBKEY(DSA **a, const unsigned char **pp, long length);
-# endif
-# ifndef OPENSSL_NO_EC
-int i2d_EC_PUBKEY(EC_KEY *a, unsigned char **pp);
-EC_KEY *d2i_EC_PUBKEY(EC_KEY **a, const unsigned char **pp, long length);
-# endif
-
-DECLARE_ASN1_FUNCTIONS(X509_SIG)
-DECLARE_ASN1_FUNCTIONS(X509_REQ_INFO)
-DECLARE_ASN1_FUNCTIONS(X509_REQ)
-
-DECLARE_ASN1_FUNCTIONS(X509_ATTRIBUTE)
-X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value);
-
-DECLARE_ASN1_FUNCTIONS(X509_EXTENSION)
-DECLARE_ASN1_ENCODE_FUNCTIONS(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXTENSIONS)
-
-DECLARE_ASN1_FUNCTIONS(X509_NAME_ENTRY)
-
-DECLARE_ASN1_FUNCTIONS(X509_NAME)
-
-int X509_NAME_set(X509_NAME **xn, X509_NAME *name);
-
-DECLARE_ASN1_FUNCTIONS(X509_CINF)
-
-DECLARE_ASN1_FUNCTIONS(X509)
-DECLARE_ASN1_FUNCTIONS(X509_CERT_AUX)
-
-DECLARE_ASN1_FUNCTIONS(X509_CERT_PAIR)
-
-int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                          CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int X509_set_ex_data(X509 *r, int idx, void *arg);
-void *X509_get_ex_data(X509 *r, int idx);
-int i2d_X509_AUX(X509 *a, unsigned char **pp);
-X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length);
-
-int i2d_re_X509_tbs(X509 *x, unsigned char **pp);
-
-void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
-                         const X509 *x);
-int X509_get_signature_nid(const X509 *x);
-
-int X509_alias_set1(X509 *x, unsigned char *name, int len);
-int X509_keyid_set1(X509 *x, unsigned char *id, int len);
-unsigned char *X509_alias_get0(X509 *x, int *len);
-unsigned char *X509_keyid_get0(X509 *x, int *len);
-int (*X509_TRUST_set_default(int (*trust) (int, X509 *, int))) (int, X509 *,
-                                                                int);
-int X509_TRUST_set(int *t, int trust);
-int X509_add1_trust_object(X509 *x, ASN1_OBJECT *obj);
-int X509_add1_reject_object(X509 *x, ASN1_OBJECT *obj);
-void X509_trust_clear(X509 *x);
-void X509_reject_clear(X509 *x);
-
-DECLARE_ASN1_FUNCTIONS(X509_REVOKED)
-DECLARE_ASN1_FUNCTIONS(X509_CRL_INFO)
-DECLARE_ASN1_FUNCTIONS(X509_CRL)
-
-int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
-int X509_CRL_get0_by_serial(X509_CRL *crl,
-                            X509_REVOKED **ret, ASN1_INTEGER *serial);
-int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x);
-
-X509_PKEY *X509_PKEY_new(void);
-void X509_PKEY_free(X509_PKEY *a);
-int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp);
-X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp,
-                         long length);
-
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKI)
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKAC)
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_CERT_SEQUENCE)
-
-# ifndef OPENSSL_NO_EVP
-X509_INFO *X509_INFO_new(void);
-void X509_INFO_free(X509_INFO *a);
-char *X509_NAME_oneline(X509_NAME *a, char *buf, int size);
-
-int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *algor1,
-                ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey);
-
-int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
-                unsigned char *md, unsigned int *len);
-
-int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1,
-              X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
-              char *data, EVP_PKEY *pkey, const EVP_MD *type);
-
-int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *data,
-                     unsigned char *md, unsigned int *len);
-
-int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                     ASN1_BIT_STRING *signature, void *data, EVP_PKEY *pkey);
-
-int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                   X509_ALGOR *algor2, ASN1_BIT_STRING *signature, void *data,
-                   EVP_PKEY *pkey, const EVP_MD *type);
-int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                       X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
-                       void *asn, EVP_MD_CTX *ctx);
-# endif
-
-int X509_set_version(X509 *x, long version);
-int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial);
-ASN1_INTEGER *X509_get_serialNumber(X509 *x);
-int X509_set_issuer_name(X509 *x, X509_NAME *name);
-X509_NAME *X509_get_issuer_name(X509 *a);
-int X509_set_subject_name(X509 *x, X509_NAME *name);
-X509_NAME *X509_get_subject_name(X509 *a);
-int X509_set_notBefore(X509 *x, const ASN1_TIME *tm);
-int X509_set_notAfter(X509 *x, const ASN1_TIME *tm);
-int X509_set_pubkey(X509 *x, EVP_PKEY *pkey);
-EVP_PKEY *X509_get_pubkey(X509 *x);
-ASN1_BIT_STRING *X509_get0_pubkey_bitstr(const X509 *x);
-int X509_certificate_type(X509 *x, EVP_PKEY *pubkey /* optional */ );
-
-int X509_REQ_set_version(X509_REQ *x, long version);
-int X509_REQ_set_subject_name(X509_REQ *req, X509_NAME *name);
-int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);
-EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req);
-int X509_REQ_extension_nid(int nid);
-int *X509_REQ_get_extension_nids(void);
-void X509_REQ_set_extension_nids(int *nids);
-STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req);
-int X509_REQ_add_extensions_nid(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts,
-                                int nid);
-int X509_REQ_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts);
-int X509_REQ_get_attr_count(const X509_REQ *req);
-int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos);
-int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, ASN1_OBJECT *obj,
-                             int lastpos);
-X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc);
-X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc);
-int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr);
-int X509_REQ_add1_attr_by_OBJ(X509_REQ *req,
-                              const ASN1_OBJECT *obj, int type,
-                              const unsigned char *bytes, int len);
-int X509_REQ_add1_attr_by_NID(X509_REQ *req,
-                              int nid, int type,
-                              const unsigned char *bytes, int len);
-int X509_REQ_add1_attr_by_txt(X509_REQ *req,
-                              const char *attrname, int type,
-                              const unsigned char *bytes, int len);
-
-int X509_CRL_set_version(X509_CRL *x, long version);
-int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
-int X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm);
-int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm);
-int X509_CRL_sort(X509_CRL *crl);
-
-int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial);
-int X509_REVOKED_set_revocationDate(X509_REVOKED *r, ASN1_TIME *tm);
-
-X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
-                        EVP_PKEY *skey, const EVP_MD *md, unsigned int flags);
-
-int X509_REQ_check_private_key(X509_REQ *x509, EVP_PKEY *pkey);
-
-int X509_check_private_key(X509 *x509, EVP_PKEY *pkey);
-int X509_chain_check_suiteb(int *perror_depth,
-                            X509 *x, STACK_OF(X509) *chain,
-                            unsigned long flags);
-int X509_CRL_check_suiteb(X509_CRL *crl, EVP_PKEY *pk, unsigned long flags);
-STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain);
-
-int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b);
-unsigned long X509_issuer_and_serial_hash(X509 *a);
-
-int X509_issuer_name_cmp(const X509 *a, const X509 *b);
-unsigned long X509_issuer_name_hash(X509 *a);
-
-int X509_subject_name_cmp(const X509 *a, const X509 *b);
-unsigned long X509_subject_name_hash(X509 *x);
-
-# ifndef OPENSSL_NO_MD5
-unsigned long X509_issuer_name_hash_old(X509 *a);
-unsigned long X509_subject_name_hash_old(X509 *x);
-# endif
-
-int X509_cmp(const X509 *a, const X509 *b);
-int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b);
-unsigned long X509_NAME_hash(X509_NAME *x);
-unsigned long X509_NAME_hash_old(X509_NAME *x);
-
-int X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b);
-int X509_CRL_match(const X509_CRL *a, const X509_CRL *b);
-# ifndef OPENSSL_NO_FP_API
-int X509_print_ex_fp(FILE *bp, X509 *x, unsigned long nmflag,
-                     unsigned long cflag);
-int X509_print_fp(FILE *bp, X509 *x);
-int X509_CRL_print_fp(FILE *bp, X509_CRL *x);
-int X509_REQ_print_fp(FILE *bp, X509_REQ *req);
-int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent,
-                          unsigned long flags);
-# endif
-
-# ifndef OPENSSL_NO_BIO
-int X509_NAME_print(BIO *bp, X509_NAME *name, int obase);
-int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent,
-                       unsigned long flags);
-int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflag,
-                  unsigned long cflag);
-int X509_print(BIO *bp, X509 *x);
-int X509_ocspid_print(BIO *bp, X509 *x);
-int X509_CERT_AUX_print(BIO *bp, X509_CERT_AUX *x, int indent);
-int X509_CRL_print(BIO *bp, X509_CRL *x);
-int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflag,
-                      unsigned long cflag);
-int X509_REQ_print(BIO *bp, X509_REQ *req);
-# endif
-
-int X509_NAME_entry_count(X509_NAME *name);
-int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len);
-int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
-                              char *buf, int len);
-
-/*
- * NOTE: you should be passsing -1, not 0 as lastpos.  The functions that use
- * lastpos, search after that position on.
- */
-int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos);
-int X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
-                               int lastpos);
-X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc);
-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
-int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne,
-                        int loc, int set);
-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
-                               unsigned char *bytes, int len, int loc,
-                               int set);
-int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
-                               unsigned char *bytes, int len, int loc,
-                               int set);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
-                                               const char *field, int type,
-                                               const unsigned char *bytes,
-                                               int len);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
-                                               int type, unsigned char *bytes,
-                                               int len);
-int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
-                               const unsigned char *bytes, int len, int loc,
-                               int set);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
-                                               ASN1_OBJECT *obj, int type,
-                                               const unsigned char *bytes,
-                                               int len);
-int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj);
-int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
-                             const unsigned char *bytes, int len);
-ASN1_OBJECT *X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne);
-ASN1_STRING *X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);
-
-int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x);
-int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x,
-                          int nid, int lastpos);
-int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *x,
-                          ASN1_OBJECT *obj, int lastpos);
-int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *x,
-                               int crit, int lastpos);
-X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc);
-X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc);
-STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
-                                         X509_EXTENSION *ex, int loc);
-
-int X509_get_ext_count(X509 *x);
-int X509_get_ext_by_NID(X509 *x, int nid, int lastpos);
-int X509_get_ext_by_OBJ(X509 *x, ASN1_OBJECT *obj, int lastpos);
-int X509_get_ext_by_critical(X509 *x, int crit, int lastpos);
-X509_EXTENSION *X509_get_ext(X509 *x, int loc);
-X509_EXTENSION *X509_delete_ext(X509 *x, int loc);
-int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc);
-void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx);
-int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,
-                      unsigned long flags);
-
-int X509_CRL_get_ext_count(X509_CRL *x);
-int X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos);
-int X509_CRL_get_ext_by_OBJ(X509_CRL *x, ASN1_OBJECT *obj, int lastpos);
-int X509_CRL_get_ext_by_critical(X509_CRL *x, int crit, int lastpos);
-X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc);
-X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc);
-int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc);
-void *X509_CRL_get_ext_d2i(X509_CRL *x, int nid, int *crit, int *idx);
-int X509_CRL_add1_ext_i2d(X509_CRL *x, int nid, void *value, int crit,
-                          unsigned long flags);
-
-int X509_REVOKED_get_ext_count(X509_REVOKED *x);
-int X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos);
-int X509_REVOKED_get_ext_by_OBJ(X509_REVOKED *x, ASN1_OBJECT *obj,
-                                int lastpos);
-int X509_REVOKED_get_ext_by_critical(X509_REVOKED *x, int crit, int lastpos);
-X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc);
-X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc);
-int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc);
-void *X509_REVOKED_get_ext_d2i(X509_REVOKED *x, int nid, int *crit, int *idx);
-int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit,
-                              unsigned long flags);
-
-X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex,
-                                             int nid, int crit,
-                                             ASN1_OCTET_STRING *data);
-X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
-                                             ASN1_OBJECT *obj, int crit,
-                                             ASN1_OCTET_STRING *data);
-int X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj);
-int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit);
-int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data);
-ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *ex);
-ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne);
-int X509_EXTENSION_get_critical(X509_EXTENSION *ex);
-
-int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x);
-int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,
-                           int lastpos);
-int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
-                           ASN1_OBJECT *obj, int lastpos);
-X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc);
-X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
-                                           X509_ATTRIBUTE *attr);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, const ASN1_OBJECT *obj,
-                                                  int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, int nid, int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, const char *attrname,
-                                                  int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
-void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, ASN1_OBJECT *obj,
-                              int lastpos, int type);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
-                                             int atrtype, const void *data,
-                                             int len);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
-                                             const ASN1_OBJECT *obj,
-                                             int atrtype, const void *data,
-                                             int len);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr,
-                                             const char *atrname, int type,
-                                             const unsigned char *bytes,
-                                             int len);
-int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj);
-int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
-                             const void *data, int len);
-void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int atrtype,
-                               void *data);
-int X509_ATTRIBUTE_count(X509_ATTRIBUTE *attr);
-ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr);
-ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx);
-
-int EVP_PKEY_get_attr_count(const EVP_PKEY *key);
-int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos);
-int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, ASN1_OBJECT *obj,
-                             int lastpos);
-X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc);
-X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc);
-int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr);
-int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,
-                              const ASN1_OBJECT *obj, int type,
-                              const unsigned char *bytes, int len);
-int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,
-                              int nid, int type,
-                              const unsigned char *bytes, int len);
-int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key,
-                              const char *attrname, int type,
-                              const unsigned char *bytes, int len);
-
-int X509_verify_cert(X509_STORE_CTX *ctx);
-
-/* lookup a cert from a X509 STACK */
-X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name,
-                                     ASN1_INTEGER *serial);
-X509 *X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name);
-
-DECLARE_ASN1_FUNCTIONS(PBEPARAM)
-DECLARE_ASN1_FUNCTIONS(PBE2PARAM)
-DECLARE_ASN1_FUNCTIONS(PBKDF2PARAM)
-
-int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
-                         const unsigned char *salt, int saltlen);
-
-X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
-                          const unsigned char *salt, int saltlen);
-X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
-                           unsigned char *salt, int saltlen);
-X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
-                              unsigned char *salt, int saltlen,
-                              unsigned char *aiv, int prf_nid);
-
-X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
-                             int prf_nid, int keylen);
-
-/* PKCS#8 utilities */
-
-DECLARE_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO)
-
-EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8);
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey);
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken);
-PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken);
-
-int PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj,
-                    int version, int ptype, void *pval,
-                    unsigned char *penc, int penclen);
-int PKCS8_pkey_get0(ASN1_OBJECT **ppkalg,
-                    const unsigned char **pk, int *ppklen,
-                    X509_ALGOR **pa, PKCS8_PRIV_KEY_INFO *p8);
-
-int X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *aobj,
-                           int ptype, void *pval,
-                           unsigned char *penc, int penclen);
-int X509_PUBKEY_get0_param(ASN1_OBJECT **ppkalg,
-                           const unsigned char **pk, int *ppklen,
-                           X509_ALGOR **pa, X509_PUBKEY *pub);
-
-int X509_check_trust(X509 *x, int id, int flags);
-int X509_TRUST_get_count(void);
-X509_TRUST *X509_TRUST_get0(int idx);
-int X509_TRUST_get_by_id(int id);
-int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),
-                   char *name, int arg1, void *arg2);
-void X509_TRUST_cleanup(void);
-int X509_TRUST_get_flags(X509_TRUST *xp);
-char *X509_TRUST_get0_name(X509_TRUST *xp);
-int X509_TRUST_get_trust(X509_TRUST *xp);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_X509_strings(void);
-
-/* Error codes for the X509 functions. */
-
-/* Function codes. */
-# define X509_F_ADD_CERT_DIR                              100
-# define X509_F_BY_FILE_CTRL                              101
-# define X509_F_CHECK_POLICY                              145
-# define X509_F_DIR_CTRL                                  102
-# define X509_F_GET_CERT_BY_SUBJECT                       103
-# define X509_F_NETSCAPE_SPKI_B64_DECODE                  129
-# define X509_F_NETSCAPE_SPKI_B64_ENCODE                  130
-# define X509_F_X509AT_ADD1_ATTR                          135
-# define X509_F_X509V3_ADD_EXT                            104
-# define X509_F_X509_ATTRIBUTE_CREATE_BY_NID              136
-# define X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ              137
-# define X509_F_X509_ATTRIBUTE_CREATE_BY_TXT              140
-# define X509_F_X509_ATTRIBUTE_GET0_DATA                  139
-# define X509_F_X509_ATTRIBUTE_SET1_DATA                  138
-# define X509_F_X509_CHECK_PRIVATE_KEY                    128
-# define X509_F_X509_CRL_DIFF                             105
-# define X509_F_X509_CRL_PRINT_FP                         147
-# define X509_F_X509_EXTENSION_CREATE_BY_NID              108
-# define X509_F_X509_EXTENSION_CREATE_BY_OBJ              109
-# define X509_F_X509_GET_PUBKEY_PARAMETERS                110
-# define X509_F_X509_LOAD_CERT_CRL_FILE                   132
-# define X509_F_X509_LOAD_CERT_FILE                       111
-# define X509_F_X509_LOAD_CRL_FILE                        112
-# define X509_F_X509_NAME_ADD_ENTRY                       113
-# define X509_F_X509_NAME_ENTRY_CREATE_BY_NID             114
-# define X509_F_X509_NAME_ENTRY_CREATE_BY_TXT             131
-# define X509_F_X509_NAME_ENTRY_SET_OBJECT                115
-# define X509_F_X509_NAME_ONELINE                         116
-# define X509_F_X509_NAME_PRINT                           117
-# define X509_F_X509_PRINT_EX_FP                          118
-# define X509_F_X509_PUBKEY_GET                           119
-# define X509_F_X509_PUBKEY_SET                           120
-# define X509_F_X509_REQ_CHECK_PRIVATE_KEY                144
-# define X509_F_X509_REQ_PRINT_EX                         121
-# define X509_F_X509_REQ_PRINT_FP                         122
-# define X509_F_X509_REQ_TO_X509                          123
-# define X509_F_X509_STORE_ADD_CERT                       124
-# define X509_F_X509_STORE_ADD_CRL                        125
-# define X509_F_X509_STORE_CTX_GET1_ISSUER                146
-# define X509_F_X509_STORE_CTX_INIT                       143
-# define X509_F_X509_STORE_CTX_NEW                        142
-# define X509_F_X509_STORE_CTX_PURPOSE_INHERIT            134
-# define X509_F_X509_TO_X509_REQ                          126
-# define X509_F_X509_TRUST_ADD                            133
-# define X509_F_X509_TRUST_SET                            141
-# define X509_F_X509_VERIFY_CERT                          127
-
-/* Reason codes. */
-# define X509_R_AKID_MISMATCH                             110
-# define X509_R_BAD_X509_FILETYPE                         100
-# define X509_R_BASE64_DECODE_ERROR                       118
-# define X509_R_CANT_CHECK_DH_KEY                         114
-# define X509_R_CERT_ALREADY_IN_HASH_TABLE                101
-# define X509_R_CRL_ALREADY_DELTA                         127
-# define X509_R_CRL_VERIFY_FAILURE                        131
-# define X509_R_ERR_ASN1_LIB                              102
-# define X509_R_IDP_MISMATCH                              128
-# define X509_R_INVALID_DIRECTORY                         113
-# define X509_R_INVALID_FIELD_NAME                        119
-# define X509_R_INVALID_TRUST                             123
-# define X509_R_ISSUER_MISMATCH                           129
-# define X509_R_KEY_TYPE_MISMATCH                         115
-# define X509_R_KEY_VALUES_MISMATCH                       116
-# define X509_R_LOADING_CERT_DIR                          103
-# define X509_R_LOADING_DEFAULTS                          104
-# define X509_R_METHOD_NOT_SUPPORTED                      124
-# define X509_R_NEWER_CRL_NOT_NEWER                       132
-# define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY              105
-# define X509_R_NO_CRL_NUMBER                             130
-# define X509_R_PUBLIC_KEY_DECODE_ERROR                   125
-# define X509_R_PUBLIC_KEY_ENCODE_ERROR                   126
-# define X509_R_SHOULD_RETRY                              106
-# define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN        107
-# define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY            108
-# define X509_R_UNKNOWN_KEY_TYPE                          117
-# define X509_R_UNKNOWN_NID                               109
-# define X509_R_UNKNOWN_PURPOSE_ID                        121
-# define X509_R_UNKNOWN_TRUST_ID                          120
-# define X509_R_UNSUPPORTED_ALGORITHM                     111
-# define X509_R_WRONG_LOOKUP_TYPE                         112
-# define X509_R_WRONG_TYPE                                122
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/x509_vfy.h b/openflow/usr/include/openssl/x509_vfy.h
deleted file mode 100644
index 2663e1c..0000000
--- a/openflow/usr/include/openssl/x509_vfy.h
+++ /dev/null
@@ -1,647 +0,0 @@
-/* crypto/x509/x509_vfy.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_X509_H
-# include <openssl/x509.h>
-/*
- * openssl/x509.h ends up #include-ing this file at about the only
- * appropriate moment.
- */
-#endif
-
-#ifndef HEADER_X509_VFY_H
-# define HEADER_X509_VFY_H
-
-# include <openssl/opensslconf.h>
-# ifndef OPENSSL_NO_LHASH
-#  include <openssl/lhash.h>
-# endif
-# include <openssl/bio.h>
-# include <openssl/crypto.h>
-# include <openssl/symhacks.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# if 0
-/* Outer object */
-typedef struct x509_hash_dir_st {
-    int num_dirs;
-    char **dirs;
-    int *dirs_type;
-    int num_dirs_alloced;
-} X509_HASH_DIR_CTX;
-# endif
-
-typedef struct x509_file_st {
-    int num_paths;              /* number of paths to files or directories */
-    int num_alloced;
-    char **paths;               /* the list of paths or directories */
-    int *path_type;
-} X509_CERT_FILE_CTX;
-
-/*******************************/
-/*-
-SSL_CTX -> X509_STORE
-                -> X509_LOOKUP
-                        ->X509_LOOKUP_METHOD
-                -> X509_LOOKUP
-                        ->X509_LOOKUP_METHOD
-
-SSL     -> X509_STORE_CTX
-                ->X509_STORE
-
-The X509_STORE holds the tables etc for verification stuff.
-A X509_STORE_CTX is used while validating a single certificate.
-The X509_STORE has X509_LOOKUPs for looking up certs.
-The X509_STORE then calls a function to actually verify the
-certificate chain.
-*/
-
-# define X509_LU_RETRY           -1
-# define X509_LU_FAIL            0
-# define X509_LU_X509            1
-# define X509_LU_CRL             2
-# define X509_LU_PKEY            3
-
-typedef struct x509_object_st {
-    /* one of the above types */
-    int type;
-    union {
-        char *ptr;
-        X509 *x509;
-        X509_CRL *crl;
-        EVP_PKEY *pkey;
-    } data;
-} X509_OBJECT;
-
-typedef struct x509_lookup_st X509_LOOKUP;
-
-DECLARE_STACK_OF(X509_LOOKUP)
-DECLARE_STACK_OF(X509_OBJECT)
-
-/* This is a static that defines the function interface */
-typedef struct x509_lookup_method_st {
-    const char *name;
-    int (*new_item) (X509_LOOKUP *ctx);
-    void (*free) (X509_LOOKUP *ctx);
-    int (*init) (X509_LOOKUP *ctx);
-    int (*shutdown) (X509_LOOKUP *ctx);
-    int (*ctrl) (X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
-                 char **ret);
-    int (*get_by_subject) (X509_LOOKUP *ctx, int type, X509_NAME *name,
-                           X509_OBJECT *ret);
-    int (*get_by_issuer_serial) (X509_LOOKUP *ctx, int type, X509_NAME *name,
-                                 ASN1_INTEGER *serial, X509_OBJECT *ret);
-    int (*get_by_fingerprint) (X509_LOOKUP *ctx, int type,
-                               unsigned char *bytes, int len,
-                               X509_OBJECT *ret);
-    int (*get_by_alias) (X509_LOOKUP *ctx, int type, char *str, int len,
-                         X509_OBJECT *ret);
-} X509_LOOKUP_METHOD;
-
-typedef struct X509_VERIFY_PARAM_ID_st X509_VERIFY_PARAM_ID;
-
-/*
- * This structure hold all parameters associated with a verify operation by
- * including an X509_VERIFY_PARAM structure in related structures the
- * parameters used can be customized
- */
-
-typedef struct X509_VERIFY_PARAM_st {
-    char *name;
-    time_t check_time;          /* Time to use */
-    unsigned long inh_flags;    /* Inheritance flags */
-    unsigned long flags;        /* Various verify flags */
-    int purpose;                /* purpose to check untrusted certificates */
-    int trust;                  /* trust setting to check */
-    int depth;                  /* Verify depth */
-    STACK_OF(ASN1_OBJECT) *policies; /* Permissible policies */
-    X509_VERIFY_PARAM_ID *id;   /* opaque ID data */
-} X509_VERIFY_PARAM;
-
-DECLARE_STACK_OF(X509_VERIFY_PARAM)
-
-/*
- * This is used to hold everything.  It is used for all certificate
- * validation.  Once we have a certificate chain, the 'verify' function is
- * then called to actually check the cert chain.
- */
-struct x509_store_st {
-    /* The following is a cache of trusted certs */
-    int cache;                  /* if true, stash any hits */
-    STACK_OF(X509_OBJECT) *objs; /* Cache of all objects */
-    /* These are external lookup methods */
-    STACK_OF(X509_LOOKUP) *get_cert_methods;
-    X509_VERIFY_PARAM *param;
-    /* Callbacks for various operations */
-    /* called to verify a certificate */
-    int (*verify) (X509_STORE_CTX *ctx);
-    /* error callback */
-    int (*verify_cb) (int ok, X509_STORE_CTX *ctx);
-    /* get issuers cert from ctx */
-    int (*get_issuer) (X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
-    /* check issued */
-    int (*check_issued) (X509_STORE_CTX *ctx, X509 *x, X509 *issuer);
-    /* Check revocation status of chain */
-    int (*check_revocation) (X509_STORE_CTX *ctx);
-    /* retrieve CRL */
-    int (*get_crl) (X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x);
-    /* Check CRL validity */
-    int (*check_crl) (X509_STORE_CTX *ctx, X509_CRL *crl);
-    /* Check certificate against CRL */
-    int (*cert_crl) (X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x);
-    STACK_OF(X509) *(*lookup_certs) (X509_STORE_CTX *ctx, X509_NAME *nm);
-    STACK_OF(X509_CRL) *(*lookup_crls) (X509_STORE_CTX *ctx, X509_NAME *nm);
-    int (*cleanup) (X509_STORE_CTX *ctx);
-    CRYPTO_EX_DATA ex_data;
-    int references;
-} /* X509_STORE */ ;
-
-int X509_STORE_set_depth(X509_STORE *store, int depth);
-
-# define X509_STORE_set_verify_cb_func(ctx,func) ((ctx)->verify_cb=(func))
-# define X509_STORE_set_verify_func(ctx,func)    ((ctx)->verify=(func))
-
-/* This is the functions plus an instance of the local variables. */
-struct x509_lookup_st {
-    int init;                   /* have we been started */
-    int skip;                   /* don't use us. */
-    X509_LOOKUP_METHOD *method; /* the functions */
-    char *method_data;          /* method data */
-    X509_STORE *store_ctx;      /* who owns us */
-} /* X509_LOOKUP */ ;
-
-/*
- * This is a used when verifying cert chains.  Since the gathering of the
- * cert chain can take some time (and have to be 'retried', this needs to be
- * kept and passed around.
- */
-struct x509_store_ctx_st {      /* X509_STORE_CTX */
-    X509_STORE *ctx;
-    /* used when looking up certs */
-    int current_method;
-    /* The following are set by the caller */
-    /* The cert to check */
-    X509 *cert;
-    /* chain of X509s - untrusted - passed in */
-    STACK_OF(X509) *untrusted;
-    /* set of CRLs passed in */
-    STACK_OF(X509_CRL) *crls;
-    X509_VERIFY_PARAM *param;
-    /* Other info for use with get_issuer() */
-    void *other_ctx;
-    /* Callbacks for various operations */
-    /* called to verify a certificate */
-    int (*verify) (X509_STORE_CTX *ctx);
-    /* error callback */
-    int (*verify_cb) (int ok, X509_STORE_CTX *ctx);
-    /* get issuers cert from ctx */
-    int (*get_issuer) (X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
-    /* check issued */
-    int (*check_issued) (X509_STORE_CTX *ctx, X509 *x, X509 *issuer);
-    /* Check revocation status of chain */
-    int (*check_revocation) (X509_STORE_CTX *ctx);
-    /* retrieve CRL */
-    int (*get_crl) (X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x);
-    /* Check CRL validity */
-    int (*check_crl) (X509_STORE_CTX *ctx, X509_CRL *crl);
-    /* Check certificate against CRL */
-    int (*cert_crl) (X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x);
-    int (*check_policy) (X509_STORE_CTX *ctx);
-    STACK_OF(X509) *(*lookup_certs) (X509_STORE_CTX *ctx, X509_NAME *nm);
-    STACK_OF(X509_CRL) *(*lookup_crls) (X509_STORE_CTX *ctx, X509_NAME *nm);
-    int (*cleanup) (X509_STORE_CTX *ctx);
-    /* The following is built up */
-    /* if 0, rebuild chain */
-    int valid;
-    /* index of last untrusted cert */
-    int last_untrusted;
-    /* chain of X509s - built up and trusted */
-    STACK_OF(X509) *chain;
-    /* Valid policy tree */
-    X509_POLICY_TREE *tree;
-    /* Require explicit policy value */
-    int explicit_policy;
-    /* When something goes wrong, this is why */
-    int error_depth;
-    int error;
-    X509 *current_cert;
-    /* cert currently being tested as valid issuer */
-    X509 *current_issuer;
-    /* current CRL */
-    X509_CRL *current_crl;
-    /* score of current CRL */
-    int current_crl_score;
-    /* Reason mask */
-    unsigned int current_reasons;
-    /* For CRL path validation: parent context */
-    X509_STORE_CTX *parent;
-    CRYPTO_EX_DATA ex_data;
-} /* X509_STORE_CTX */ ;
-
-void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
-
-# define X509_STORE_CTX_set_app_data(ctx,data) \
-        X509_STORE_CTX_set_ex_data(ctx,0,data)
-# define X509_STORE_CTX_get_app_data(ctx) \
-        X509_STORE_CTX_get_ex_data(ctx,0)
-
-# define X509_L_FILE_LOAD        1
-# define X509_L_ADD_DIR          2
-
-# define X509_LOOKUP_load_file(x,name,type) \
-                X509_LOOKUP_ctrl((x),X509_L_FILE_LOAD,(name),(long)(type),NULL)
-
-# define X509_LOOKUP_add_dir(x,name,type) \
-                X509_LOOKUP_ctrl((x),X509_L_ADD_DIR,(name),(long)(type),NULL)
-
-# define         X509_V_OK                                       0
-# define         X509_V_ERR_UNSPECIFIED                          1
-
-# define         X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT            2
-# define         X509_V_ERR_UNABLE_TO_GET_CRL                    3
-# define         X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE     4
-# define         X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE      5
-# define         X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY   6
-# define         X509_V_ERR_CERT_SIGNATURE_FAILURE               7
-# define         X509_V_ERR_CRL_SIGNATURE_FAILURE                8
-# define         X509_V_ERR_CERT_NOT_YET_VALID                   9
-# define         X509_V_ERR_CERT_HAS_EXPIRED                     10
-# define         X509_V_ERR_CRL_NOT_YET_VALID                    11
-# define         X509_V_ERR_CRL_HAS_EXPIRED                      12
-# define         X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD       13
-# define         X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD        14
-# define         X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD       15
-# define         X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD       16
-# define         X509_V_ERR_OUT_OF_MEM                           17
-# define         X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT          18
-# define         X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN            19
-# define         X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY    20
-# define         X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE      21
-# define         X509_V_ERR_CERT_CHAIN_TOO_LONG                  22
-# define         X509_V_ERR_CERT_REVOKED                         23
-# define         X509_V_ERR_INVALID_CA                           24
-# define         X509_V_ERR_PATH_LENGTH_EXCEEDED                 25
-# define         X509_V_ERR_INVALID_PURPOSE                      26
-# define         X509_V_ERR_CERT_UNTRUSTED                       27
-# define         X509_V_ERR_CERT_REJECTED                        28
-/* These are 'informational' when looking for issuer cert */
-# define         X509_V_ERR_SUBJECT_ISSUER_MISMATCH              29
-# define         X509_V_ERR_AKID_SKID_MISMATCH                   30
-# define         X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH          31
-# define         X509_V_ERR_KEYUSAGE_NO_CERTSIGN                 32
-
-# define         X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER             33
-# define         X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION         34
-# define         X509_V_ERR_KEYUSAGE_NO_CRL_SIGN                 35
-# define         X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION     36
-# define         X509_V_ERR_INVALID_NON_CA                       37
-# define         X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED           38
-# define         X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE        39
-# define         X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED       40
-
-# define         X509_V_ERR_INVALID_EXTENSION                    41
-# define         X509_V_ERR_INVALID_POLICY_EXTENSION             42
-# define         X509_V_ERR_NO_EXPLICIT_POLICY                   43
-# define         X509_V_ERR_DIFFERENT_CRL_SCOPE                  44
-# define         X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE        45
-
-# define         X509_V_ERR_UNNESTED_RESOURCE                    46
-
-# define         X509_V_ERR_PERMITTED_VIOLATION                  47
-# define         X509_V_ERR_EXCLUDED_VIOLATION                   48
-# define         X509_V_ERR_SUBTREE_MINMAX                       49
-# define         X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE          51
-# define         X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX        52
-# define         X509_V_ERR_UNSUPPORTED_NAME_SYNTAX              53
-# define         X509_V_ERR_CRL_PATH_VALIDATION_ERROR            54
-
-/* Suite B mode algorithm violation */
-# define         X509_V_ERR_SUITE_B_INVALID_VERSION              56
-# define         X509_V_ERR_SUITE_B_INVALID_ALGORITHM            57
-# define         X509_V_ERR_SUITE_B_INVALID_CURVE                58
-# define         X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM  59
-# define         X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED              60
-# define         X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 61
-
-/* Host, email and IP check errors */
-# define         X509_V_ERR_HOSTNAME_MISMATCH                    62
-# define         X509_V_ERR_EMAIL_MISMATCH                       63
-# define         X509_V_ERR_IP_ADDRESS_MISMATCH                  64
-
-/* The application is not happy */
-# define         X509_V_ERR_APPLICATION_VERIFICATION             50
-
-/* Certificate verify flags */
-
-/* Send issuer+subject checks to verify_cb */
-# define X509_V_FLAG_CB_ISSUER_CHECK             0x1
-/* Use check time instead of current time */
-# define X509_V_FLAG_USE_CHECK_TIME              0x2
-/* Lookup CRLs */
-# define X509_V_FLAG_CRL_CHECK                   0x4
-/* Lookup CRLs for whole chain */
-# define X509_V_FLAG_CRL_CHECK_ALL               0x8
-/* Ignore unhandled critical extensions */
-# define X509_V_FLAG_IGNORE_CRITICAL             0x10
-/* Disable workarounds for broken certificates */
-# define X509_V_FLAG_X509_STRICT                 0x20
-/* Enable proxy certificate validation */
-# define X509_V_FLAG_ALLOW_PROXY_CERTS           0x40
-/* Enable policy checking */
-# define X509_V_FLAG_POLICY_CHECK                0x80
-/* Policy variable require-explicit-policy */
-# define X509_V_FLAG_EXPLICIT_POLICY             0x100
-/* Policy variable inhibit-any-policy */
-# define X509_V_FLAG_INHIBIT_ANY                 0x200
-/* Policy variable inhibit-policy-mapping */
-# define X509_V_FLAG_INHIBIT_MAP                 0x400
-/* Notify callback that policy is OK */
-# define X509_V_FLAG_NOTIFY_POLICY               0x800
-/* Extended CRL features such as indirect CRLs, alternate CRL signing keys */
-# define X509_V_FLAG_EXTENDED_CRL_SUPPORT        0x1000
-/* Delta CRL support */
-# define X509_V_FLAG_USE_DELTAS                  0x2000
-/* Check selfsigned CA signature */
-# define X509_V_FLAG_CHECK_SS_SIGNATURE          0x4000
-/* Use trusted store first */
-# define X509_V_FLAG_TRUSTED_FIRST               0x8000
-/* Suite B 128 bit only mode: not normally used */
-# define X509_V_FLAG_SUITEB_128_LOS_ONLY         0x10000
-/* Suite B 192 bit only mode */
-# define X509_V_FLAG_SUITEB_192_LOS              0x20000
-/* Suite B 128 bit mode allowing 192 bit algorithms */
-# define X509_V_FLAG_SUITEB_128_LOS              0x30000
-
-/* Allow partial chains if at least one certificate is in trusted store */
-# define X509_V_FLAG_PARTIAL_CHAIN               0x80000
-/*
- * If the initial chain is not trusted, do not attempt to build an alternative
- * chain. Alternate chain checking was introduced in 1.0.2b. Setting this flag
- * will force the behaviour to match that of previous versions.
- */
-# define X509_V_FLAG_NO_ALT_CHAINS               0x100000
-
-# define X509_VP_FLAG_DEFAULT                    0x1
-# define X509_VP_FLAG_OVERWRITE                  0x2
-# define X509_VP_FLAG_RESET_FLAGS                0x4
-# define X509_VP_FLAG_LOCKED                     0x8
-# define X509_VP_FLAG_ONCE                       0x10
-
-/* Internal use: mask of policy related options */
-# define X509_V_FLAG_POLICY_MASK (X509_V_FLAG_POLICY_CHECK \
-                                | X509_V_FLAG_EXPLICIT_POLICY \
-                                | X509_V_FLAG_INHIBIT_ANY \
-                                | X509_V_FLAG_INHIBIT_MAP)
-
-int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, int type,
-                               X509_NAME *name);
-X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,
-                                             int type, X509_NAME *name);
-X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h,
-                                        X509_OBJECT *x);
-void X509_OBJECT_up_ref_count(X509_OBJECT *a);
-void X509_OBJECT_free_contents(X509_OBJECT *a);
-X509_STORE *X509_STORE_new(void);
-void X509_STORE_free(X509_STORE *v);
-
-STACK_OF(X509) *X509_STORE_get1_certs(X509_STORE_CTX *st, X509_NAME *nm);
-STACK_OF(X509_CRL) *X509_STORE_get1_crls(X509_STORE_CTX *st, X509_NAME *nm);
-int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags);
-int X509_STORE_set_purpose(X509_STORE *ctx, int purpose);
-int X509_STORE_set_trust(X509_STORE *ctx, int trust);
-int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *pm);
-
-void X509_STORE_set_verify_cb(X509_STORE *ctx,
-                              int (*verify_cb) (int, X509_STORE_CTX *));
-
-void X509_STORE_set_lookup_crls_cb(X509_STORE *ctx,
-                                   STACK_OF(X509_CRL) *(*cb) (X509_STORE_CTX
-                                                              *ctx,
-                                                              X509_NAME *nm));
-
-X509_STORE_CTX *X509_STORE_CTX_new(void);
-
-int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
-
-void X509_STORE_CTX_free(X509_STORE_CTX *ctx);
-int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,
-                        X509 *x509, STACK_OF(X509) *chain);
-void X509_STORE_CTX_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);
-void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx);
-
-X509_STORE *X509_STORE_CTX_get0_store(X509_STORE_CTX *ctx);
-
-X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);
-
-X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);
-X509_LOOKUP_METHOD *X509_LOOKUP_file(void);
-
-int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);
-int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);
-
-int X509_STORE_get_by_subject(X509_STORE_CTX *vs, int type, X509_NAME *name,
-                              X509_OBJECT *ret);
-
-int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-                     long argl, char **ret);
-
-# ifndef OPENSSL_NO_STDIO
-int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type);
-int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type);
-int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type);
-# endif
-
-X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method);
-void X509_LOOKUP_free(X509_LOOKUP *ctx);
-int X509_LOOKUP_init(X509_LOOKUP *ctx);
-int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name,
-                           X509_OBJECT *ret);
-int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, int type, X509_NAME *name,
-                                 ASN1_INTEGER *serial, X509_OBJECT *ret);
-int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, int type,
-                               unsigned char *bytes, int len,
-                               X509_OBJECT *ret);
-int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str, int len,
-                         X509_OBJECT *ret);
-int X509_LOOKUP_shutdown(X509_LOOKUP *ctx);
-
-# ifndef OPENSSL_NO_STDIO
-int X509_STORE_load_locations(X509_STORE *ctx,
-                              const char *file, const char *dir);
-int X509_STORE_set_default_paths(X509_STORE *ctx);
-# endif
-
-int X509_STORE_CTX_get_ex_new_index(long argl, void *argp,
-                                    CRYPTO_EX_new *new_func,
-                                    CRYPTO_EX_dup *dup_func,
-                                    CRYPTO_EX_free *free_func);
-int X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx, int idx, void *data);
-void *X509_STORE_CTX_get_ex_data(X509_STORE_CTX *ctx, int idx);
-int X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set_error(X509_STORE_CTX *ctx, int s);
-int X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
-X509 *X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
-X509 *X509_STORE_CTX_get0_current_issuer(X509_STORE_CTX *ctx);
-X509_CRL *X509_STORE_CTX_get0_current_crl(X509_STORE_CTX *ctx);
-X509_STORE_CTX *X509_STORE_CTX_get0_parent_ctx(X509_STORE_CTX *ctx);
-STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
-STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set_cert(X509_STORE_CTX *c, X509 *x);
-void X509_STORE_CTX_set_chain(X509_STORE_CTX *c, STACK_OF(X509) *sk);
-void X509_STORE_CTX_set0_crls(X509_STORE_CTX *c, STACK_OF(X509_CRL) *sk);
-int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);
-int X509_STORE_CTX_set_trust(X509_STORE_CTX *ctx, int trust);
-int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
-                                   int purpose, int trust);
-void X509_STORE_CTX_set_flags(X509_STORE_CTX *ctx, unsigned long flags);
-void X509_STORE_CTX_set_time(X509_STORE_CTX *ctx, unsigned long flags,
-                             time_t t);
-void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
-                                  int (*verify_cb) (int, X509_STORE_CTX *));
-
-X509_POLICY_TREE *X509_STORE_CTX_get0_policy_tree(X509_STORE_CTX *ctx);
-int X509_STORE_CTX_get_explicit_policy(X509_STORE_CTX *ctx);
-
-X509_VERIFY_PARAM *X509_STORE_CTX_get0_param(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set0_param(X509_STORE_CTX *ctx, X509_VERIFY_PARAM *param);
-int X509_STORE_CTX_set_default(X509_STORE_CTX *ctx, const char *name);
-
-/* X509_VERIFY_PARAM functions */
-
-X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void);
-void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *to,
-                              const X509_VERIFY_PARAM *from);
-int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
-                           const X509_VERIFY_PARAM *from);
-int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name);
-int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param,
-                                unsigned long flags);
-int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
-                                  unsigned long flags);
-unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
-int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
-void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth);
-void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t);
-int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,
-                                  ASN1_OBJECT *policy);
-int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param,
-                                    STACK_OF(ASN1_OBJECT) *policies);
-
-int X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *param,
-                                const char *name, size_t namelen);
-int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param,
-                                const char *name, size_t namelen);
-void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
-                                     unsigned int flags);
-char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *);
-int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,
-                                 const char *email, size_t emaillen);
-int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param,
-                              const unsigned char *ip, size_t iplen);
-int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *param,
-                                  const char *ipasc);
-
-int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param);
-const char *X509_VERIFY_PARAM_get0_name(const X509_VERIFY_PARAM *param);
-
-int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_get_count(void);
-const X509_VERIFY_PARAM *X509_VERIFY_PARAM_get0(int id);
-const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name);
-void X509_VERIFY_PARAM_table_cleanup(void);
-
-int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy,
-                      STACK_OF(X509) *certs,
-                      STACK_OF(ASN1_OBJECT) *policy_oids, unsigned int flags);
-
-void X509_policy_tree_free(X509_POLICY_TREE *tree);
-
-int X509_policy_tree_level_count(const X509_POLICY_TREE *tree);
-X509_POLICY_LEVEL *X509_policy_tree_get0_level(const X509_POLICY_TREE *tree,
-                                               int i);
-
-STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_policies(const
-                                                           X509_POLICY_TREE
-                                                           *tree);
-
-STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_user_policies(const
-                                                                X509_POLICY_TREE
-                                                                *tree);
-
-int X509_policy_level_node_count(X509_POLICY_LEVEL *level);
-
-X509_POLICY_NODE *X509_policy_level_get0_node(X509_POLICY_LEVEL *level,
-                                              int i);
-
-const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node);
-
-STACK_OF(POLICYQUALINFO) *X509_policy_node_get0_qualifiers(const
-                                                           X509_POLICY_NODE
-                                                           *node);
-const X509_POLICY_NODE *X509_policy_node_get0_parent(const X509_POLICY_NODE
-                                                     *node);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/openssl/x509v3.h b/openflow/usr/include/openssl/x509v3.h
deleted file mode 100644
index f5c6156..0000000
--- a/openflow/usr/include/openssl/x509v3.h
+++ /dev/null
@@ -1,1055 +0,0 @@
-/* x509v3.h */
-/*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
- * 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999-2004 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_X509V3_H
-# define HEADER_X509V3_H
-
-# include <openssl/bio.h>
-# include <openssl/x509.h>
-# include <openssl/conf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_SYS_WIN32
-/* Under Win32 these are defined in wincrypt.h */
-#  undef X509_NAME
-#  undef X509_CERT_PAIR
-#  undef X509_EXTENSIONS
-# endif
-
-/* Forward reference */
-struct v3_ext_method;
-struct v3_ext_ctx;
-
-/* Useful typedefs */
-
-typedef void *(*X509V3_EXT_NEW)(void);
-typedef void (*X509V3_EXT_FREE) (void *);
-typedef void *(*X509V3_EXT_D2I)(void *, const unsigned char **, long);
-typedef int (*X509V3_EXT_I2D) (void *, unsigned char **);
-typedef STACK_OF(CONF_VALUE) *
-    (*X509V3_EXT_I2V) (const struct v3_ext_method *method, void *ext,
-                       STACK_OF(CONF_VALUE) *extlist);
-typedef void *(*X509V3_EXT_V2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx,
-                                STACK_OF(CONF_VALUE) *values);
-typedef char *(*X509V3_EXT_I2S)(const struct v3_ext_method *method,
-                                void *ext);
-typedef void *(*X509V3_EXT_S2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx, const char *str);
-typedef int (*X509V3_EXT_I2R) (const struct v3_ext_method *method, void *ext,
-                               BIO *out, int indent);
-typedef void *(*X509V3_EXT_R2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx, const char *str);
-
-/* V3 extension structure */
-
-struct v3_ext_method {
-    int ext_nid;
-    int ext_flags;
-/* If this is set the following four fields are ignored */
-    ASN1_ITEM_EXP *it;
-/* Old style ASN1 calls */
-    X509V3_EXT_NEW ext_new;
-    X509V3_EXT_FREE ext_free;
-    X509V3_EXT_D2I d2i;
-    X509V3_EXT_I2D i2d;
-/* The following pair is used for string extensions */
-    X509V3_EXT_I2S i2s;
-    X509V3_EXT_S2I s2i;
-/* The following pair is used for multi-valued extensions */
-    X509V3_EXT_I2V i2v;
-    X509V3_EXT_V2I v2i;
-/* The following are used for raw extensions */
-    X509V3_EXT_I2R i2r;
-    X509V3_EXT_R2I r2i;
-    void *usr_data;             /* Any extension specific data */
-};
-
-typedef struct X509V3_CONF_METHOD_st {
-    char *(*get_string) (void *db, char *section, char *value);
-    STACK_OF(CONF_VALUE) *(*get_section) (void *db, char *section);
-    void (*free_string) (void *db, char *string);
-    void (*free_section) (void *db, STACK_OF(CONF_VALUE) *section);
-} X509V3_CONF_METHOD;
-
-/* Context specific info */
-struct v3_ext_ctx {
-# define CTX_TEST 0x1
-    int flags;
-    X509 *issuer_cert;
-    X509 *subject_cert;
-    X509_REQ *subject_req;
-    X509_CRL *crl;
-    X509V3_CONF_METHOD *db_meth;
-    void *db;
-/* Maybe more here */
-};
-
-typedef struct v3_ext_method X509V3_EXT_METHOD;
-
-DECLARE_STACK_OF(X509V3_EXT_METHOD)
-
-/* ext_flags values */
-# define X509V3_EXT_DYNAMIC      0x1
-# define X509V3_EXT_CTX_DEP      0x2
-# define X509V3_EXT_MULTILINE    0x4
-
-typedef BIT_STRING_BITNAME ENUMERATED_NAMES;
-
-typedef struct BASIC_CONSTRAINTS_st {
-    int ca;
-    ASN1_INTEGER *pathlen;
-} BASIC_CONSTRAINTS;
-
-typedef struct PKEY_USAGE_PERIOD_st {
-    ASN1_GENERALIZEDTIME *notBefore;
-    ASN1_GENERALIZEDTIME *notAfter;
-} PKEY_USAGE_PERIOD;
-
-typedef struct otherName_st {
-    ASN1_OBJECT *type_id;
-    ASN1_TYPE *value;
-} OTHERNAME;
-
-typedef struct EDIPartyName_st {
-    ASN1_STRING *nameAssigner;
-    ASN1_STRING *partyName;
-} EDIPARTYNAME;
-
-typedef struct GENERAL_NAME_st {
-# define GEN_OTHERNAME   0
-# define GEN_EMAIL       1
-# define GEN_DNS         2
-# define GEN_X400        3
-# define GEN_DIRNAME     4
-# define GEN_EDIPARTY    5
-# define GEN_URI         6
-# define GEN_IPADD       7
-# define GEN_RID         8
-    int type;
-    union {
-        char *ptr;
-        OTHERNAME *otherName;   /* otherName */
-        ASN1_IA5STRING *rfc822Name;
-        ASN1_IA5STRING *dNSName;
-        ASN1_TYPE *x400Address;
-        X509_NAME *directoryName;
-        EDIPARTYNAME *ediPartyName;
-        ASN1_IA5STRING *uniformResourceIdentifier;
-        ASN1_OCTET_STRING *iPAddress;
-        ASN1_OBJECT *registeredID;
-        /* Old names */
-        ASN1_OCTET_STRING *ip;  /* iPAddress */
-        X509_NAME *dirn;        /* dirn */
-        ASN1_IA5STRING *ia5;    /* rfc822Name, dNSName,
-                                 * uniformResourceIdentifier */
-        ASN1_OBJECT *rid;       /* registeredID */
-        ASN1_TYPE *other;       /* x400Address */
-    } d;
-} GENERAL_NAME;
-
-typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;
-
-typedef struct ACCESS_DESCRIPTION_st {
-    ASN1_OBJECT *method;
-    GENERAL_NAME *location;
-} ACCESS_DESCRIPTION;
-
-typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
-
-typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE;
-
-DECLARE_STACK_OF(GENERAL_NAME)
-DECLARE_ASN1_SET_OF(GENERAL_NAME)
-
-DECLARE_STACK_OF(ACCESS_DESCRIPTION)
-DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION)
-
-typedef struct DIST_POINT_NAME_st {
-    int type;
-    union {
-        GENERAL_NAMES *fullname;
-        STACK_OF(X509_NAME_ENTRY) *relativename;
-    } name;
-/* If relativename then this contains the full distribution point name */
-    X509_NAME *dpname;
-} DIST_POINT_NAME;
-/* All existing reasons */
-# define CRLDP_ALL_REASONS       0x807f
-
-# define CRL_REASON_NONE                         -1
-# define CRL_REASON_UNSPECIFIED                  0
-# define CRL_REASON_KEY_COMPROMISE               1
-# define CRL_REASON_CA_COMPROMISE                2
-# define CRL_REASON_AFFILIATION_CHANGED          3
-# define CRL_REASON_SUPERSEDED                   4
-# define CRL_REASON_CESSATION_OF_OPERATION       5
-# define CRL_REASON_CERTIFICATE_HOLD             6
-# define CRL_REASON_REMOVE_FROM_CRL              8
-# define CRL_REASON_PRIVILEGE_WITHDRAWN          9
-# define CRL_REASON_AA_COMPROMISE                10
-
-struct DIST_POINT_st {
-    DIST_POINT_NAME *distpoint;
-    ASN1_BIT_STRING *reasons;
-    GENERAL_NAMES *CRLissuer;
-    int dp_reasons;
-};
-
-typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS;
-
-DECLARE_STACK_OF(DIST_POINT)
-DECLARE_ASN1_SET_OF(DIST_POINT)
-
-struct AUTHORITY_KEYID_st {
-    ASN1_OCTET_STRING *keyid;
-    GENERAL_NAMES *issuer;
-    ASN1_INTEGER *serial;
-};
-
-/* Strong extranet structures */
-
-typedef struct SXNET_ID_st {
-    ASN1_INTEGER *zone;
-    ASN1_OCTET_STRING *user;
-} SXNETID;
-
-DECLARE_STACK_OF(SXNETID)
-DECLARE_ASN1_SET_OF(SXNETID)
-
-typedef struct SXNET_st {
-    ASN1_INTEGER *version;
-    STACK_OF(SXNETID) *ids;
-} SXNET;
-
-typedef struct NOTICEREF_st {
-    ASN1_STRING *organization;
-    STACK_OF(ASN1_INTEGER) *noticenos;
-} NOTICEREF;
-
-typedef struct USERNOTICE_st {
-    NOTICEREF *noticeref;
-    ASN1_STRING *exptext;
-} USERNOTICE;
-
-typedef struct POLICYQUALINFO_st {
-    ASN1_OBJECT *pqualid;
-    union {
-        ASN1_IA5STRING *cpsuri;
-        USERNOTICE *usernotice;
-        ASN1_TYPE *other;
-    } d;
-} POLICYQUALINFO;
-
-DECLARE_STACK_OF(POLICYQUALINFO)
-DECLARE_ASN1_SET_OF(POLICYQUALINFO)
-
-typedef struct POLICYINFO_st {
-    ASN1_OBJECT *policyid;
-    STACK_OF(POLICYQUALINFO) *qualifiers;
-} POLICYINFO;
-
-typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
-
-DECLARE_STACK_OF(POLICYINFO)
-DECLARE_ASN1_SET_OF(POLICYINFO)
-
-typedef struct POLICY_MAPPING_st {
-    ASN1_OBJECT *issuerDomainPolicy;
-    ASN1_OBJECT *subjectDomainPolicy;
-} POLICY_MAPPING;
-
-DECLARE_STACK_OF(POLICY_MAPPING)
-
-typedef STACK_OF(POLICY_MAPPING) POLICY_MAPPINGS;
-
-typedef struct GENERAL_SUBTREE_st {
-    GENERAL_NAME *base;
-    ASN1_INTEGER *minimum;
-    ASN1_INTEGER *maximum;
-} GENERAL_SUBTREE;
-
-DECLARE_STACK_OF(GENERAL_SUBTREE)
-
-struct NAME_CONSTRAINTS_st {
-    STACK_OF(GENERAL_SUBTREE) *permittedSubtrees;
-    STACK_OF(GENERAL_SUBTREE) *excludedSubtrees;
-};
-
-typedef struct POLICY_CONSTRAINTS_st {
-    ASN1_INTEGER *requireExplicitPolicy;
-    ASN1_INTEGER *inhibitPolicyMapping;
-} POLICY_CONSTRAINTS;
-
-/* Proxy certificate structures, see RFC 3820 */
-typedef struct PROXY_POLICY_st {
-    ASN1_OBJECT *policyLanguage;
-    ASN1_OCTET_STRING *policy;
-} PROXY_POLICY;
-
-typedef struct PROXY_CERT_INFO_EXTENSION_st {
-    ASN1_INTEGER *pcPathLengthConstraint;
-    PROXY_POLICY *proxyPolicy;
-} PROXY_CERT_INFO_EXTENSION;
-
-DECLARE_ASN1_FUNCTIONS(PROXY_POLICY)
-DECLARE_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION)
-
-struct ISSUING_DIST_POINT_st {
-    DIST_POINT_NAME *distpoint;
-    int onlyuser;
-    int onlyCA;
-    ASN1_BIT_STRING *onlysomereasons;
-    int indirectCRL;
-    int onlyattr;
-};
-
-/* Values in idp_flags field */
-/* IDP present */
-# define IDP_PRESENT     0x1
-/* IDP values inconsistent */
-# define IDP_INVALID     0x2
-/* onlyuser true */
-# define IDP_ONLYUSER    0x4
-/* onlyCA true */
-# define IDP_ONLYCA      0x8
-/* onlyattr true */
-# define IDP_ONLYATTR    0x10
-/* indirectCRL true */
-# define IDP_INDIRECT    0x20
-/* onlysomereasons present */
-# define IDP_REASONS     0x40
-
-# define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
-",name:", val->name, ",value:", val->value);
-
-# define X509V3_set_ctx_test(ctx) \
-                        X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST)
-# define X509V3_set_ctx_nodb(ctx) (ctx)->db = NULL;
-
-# define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \
-                        0,0,0,0, \
-                        0,0, \
-                        (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \
-                        (X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \
-                        NULL, NULL, \
-                        table}
-
-# define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \
-                        0,0,0,0, \
-                        (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \
-                        (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \
-                        0,0,0,0, \
-                        NULL}
-
-# define EXT_END { -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-
-/* X509_PURPOSE stuff */
-
-# define EXFLAG_BCONS            0x1
-# define EXFLAG_KUSAGE           0x2
-# define EXFLAG_XKUSAGE          0x4
-# define EXFLAG_NSCERT           0x8
-
-# define EXFLAG_CA               0x10
-/* Really self issued not necessarily self signed */
-# define EXFLAG_SI               0x20
-# define EXFLAG_V1               0x40
-# define EXFLAG_INVALID          0x80
-# define EXFLAG_SET              0x100
-# define EXFLAG_CRITICAL         0x200
-# define EXFLAG_PROXY            0x400
-
-# define EXFLAG_INVALID_POLICY   0x800
-# define EXFLAG_FRESHEST         0x1000
-/* Self signed */
-# define EXFLAG_SS               0x2000
-
-# define KU_DIGITAL_SIGNATURE    0x0080
-# define KU_NON_REPUDIATION      0x0040
-# define KU_KEY_ENCIPHERMENT     0x0020
-# define KU_DATA_ENCIPHERMENT    0x0010
-# define KU_KEY_AGREEMENT        0x0008
-# define KU_KEY_CERT_SIGN        0x0004
-# define KU_CRL_SIGN             0x0002
-# define KU_ENCIPHER_ONLY        0x0001
-# define KU_DECIPHER_ONLY        0x8000
-
-# define NS_SSL_CLIENT           0x80
-# define NS_SSL_SERVER           0x40
-# define NS_SMIME                0x20
-# define NS_OBJSIGN              0x10
-# define NS_SSL_CA               0x04
-# define NS_SMIME_CA             0x02
-# define NS_OBJSIGN_CA           0x01
-# define NS_ANY_CA               (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA)
-
-# define XKU_SSL_SERVER          0x1
-# define XKU_SSL_CLIENT          0x2
-# define XKU_SMIME               0x4
-# define XKU_CODE_SIGN           0x8
-# define XKU_SGC                 0x10
-# define XKU_OCSP_SIGN           0x20
-# define XKU_TIMESTAMP           0x40
-# define XKU_DVCS                0x80
-# define XKU_ANYEKU              0x100
-
-# define X509_PURPOSE_DYNAMIC    0x1
-# define X509_PURPOSE_DYNAMIC_NAME       0x2
-
-typedef struct x509_purpose_st {
-    int purpose;
-    int trust;                  /* Default trust ID */
-    int flags;
-    int (*check_purpose) (const struct x509_purpose_st *, const X509 *, int);
-    char *name;
-    char *sname;
-    void *usr_data;
-} X509_PURPOSE;
-
-# define X509_PURPOSE_SSL_CLIENT         1
-# define X509_PURPOSE_SSL_SERVER         2
-# define X509_PURPOSE_NS_SSL_SERVER      3
-# define X509_PURPOSE_SMIME_SIGN         4
-# define X509_PURPOSE_SMIME_ENCRYPT      5
-# define X509_PURPOSE_CRL_SIGN           6
-# define X509_PURPOSE_ANY                7
-# define X509_PURPOSE_OCSP_HELPER        8
-# define X509_PURPOSE_TIMESTAMP_SIGN     9
-
-# define X509_PURPOSE_MIN                1
-# define X509_PURPOSE_MAX                9
-
-/* Flags for X509V3_EXT_print() */
-
-# define X509V3_EXT_UNKNOWN_MASK         (0xfL << 16)
-/* Return error for unknown extensions */
-# define X509V3_EXT_DEFAULT              0
-/* Print error for unknown extensions */
-# define X509V3_EXT_ERROR_UNKNOWN        (1L << 16)
-/* ASN1 parse unknown extensions */
-# define X509V3_EXT_PARSE_UNKNOWN        (2L << 16)
-/* BIO_dump unknown extensions */
-# define X509V3_EXT_DUMP_UNKNOWN         (3L << 16)
-
-/* Flags for X509V3_add1_i2d */
-
-# define X509V3_ADD_OP_MASK              0xfL
-# define X509V3_ADD_DEFAULT              0L
-# define X509V3_ADD_APPEND               1L
-# define X509V3_ADD_REPLACE              2L
-# define X509V3_ADD_REPLACE_EXISTING     3L
-# define X509V3_ADD_KEEP_EXISTING        4L
-# define X509V3_ADD_DELETE               5L
-# define X509V3_ADD_SILENT               0x10
-
-DECLARE_STACK_OF(X509_PURPOSE)
-
-DECLARE_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
-
-DECLARE_ASN1_FUNCTIONS(SXNET)
-DECLARE_ASN1_FUNCTIONS(SXNETID)
-
-int SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen);
-int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user,
-                       int userlen);
-int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, char *user,
-                         int userlen);
-
-ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone);
-ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone);
-ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone);
-
-DECLARE_ASN1_FUNCTIONS(AUTHORITY_KEYID)
-
-DECLARE_ASN1_FUNCTIONS(PKEY_USAGE_PERIOD)
-
-DECLARE_ASN1_FUNCTIONS(GENERAL_NAME)
-GENERAL_NAME *GENERAL_NAME_dup(GENERAL_NAME *a);
-int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b);
-
-ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                     X509V3_CTX *ctx,
-                                     STACK_OF(CONF_VALUE) *nval);
-STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                          ASN1_BIT_STRING *bits,
-                                          STACK_OF(CONF_VALUE) *extlist);
-
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
-                                       GENERAL_NAME *gen,
-                                       STACK_OF(CONF_VALUE) *ret);
-int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);
-
-DECLARE_ASN1_FUNCTIONS(GENERAL_NAMES)
-
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
-                                        GENERAL_NAMES *gen,
-                                        STACK_OF(CONF_VALUE) *extlist);
-GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
-                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-
-DECLARE_ASN1_FUNCTIONS(OTHERNAME)
-DECLARE_ASN1_FUNCTIONS(EDIPARTYNAME)
-int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b);
-void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value);
-void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype);
-int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
-                                ASN1_OBJECT *oid, ASN1_TYPE *value);
-int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen,
-                                ASN1_OBJECT **poid, ASN1_TYPE **pvalue);
-
-char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                            ASN1_OCTET_STRING *ia5);
-ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                                         X509V3_CTX *ctx, char *str);
-
-DECLARE_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
-int i2a_ACCESS_DESCRIPTION(BIO *bp, ACCESS_DESCRIPTION *a);
-
-DECLARE_ASN1_FUNCTIONS(CERTIFICATEPOLICIES)
-DECLARE_ASN1_FUNCTIONS(POLICYINFO)
-DECLARE_ASN1_FUNCTIONS(POLICYQUALINFO)
-DECLARE_ASN1_FUNCTIONS(USERNOTICE)
-DECLARE_ASN1_FUNCTIONS(NOTICEREF)
-
-DECLARE_ASN1_FUNCTIONS(CRL_DIST_POINTS)
-DECLARE_ASN1_FUNCTIONS(DIST_POINT)
-DECLARE_ASN1_FUNCTIONS(DIST_POINT_NAME)
-DECLARE_ASN1_FUNCTIONS(ISSUING_DIST_POINT)
-
-int DIST_POINT_set_dpname(DIST_POINT_NAME *dpn, X509_NAME *iname);
-
-int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc);
-
-DECLARE_ASN1_FUNCTIONS(ACCESS_DESCRIPTION)
-DECLARE_ASN1_FUNCTIONS(AUTHORITY_INFO_ACCESS)
-
-DECLARE_ASN1_ITEM(POLICY_MAPPING)
-DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
-DECLARE_ASN1_ITEM(POLICY_MAPPINGS)
-
-DECLARE_ASN1_ITEM(GENERAL_SUBTREE)
-DECLARE_ASN1_ALLOC_FUNCTIONS(GENERAL_SUBTREE)
-
-DECLARE_ASN1_ITEM(NAME_CONSTRAINTS)
-DECLARE_ASN1_ALLOC_FUNCTIONS(NAME_CONSTRAINTS)
-
-DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)
-DECLARE_ASN1_ITEM(POLICY_CONSTRAINTS)
-
-GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
-                               const X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, int gen_type, char *value,
-                               int is_nc);
-
-# ifdef HEADER_CONF_H
-GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, CONF_VALUE *cnf);
-GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
-                                  const X509V3_EXT_METHOD *method,
-                                  X509V3_CTX *ctx, CONF_VALUE *cnf,
-                                  int is_nc);
-void X509V3_conf_free(CONF_VALUE *val);
-
-X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
-                                     char *value);
-X509_EXTENSION *X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, char *name,
-                                 char *value);
-int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, char *section,
-                            STACK_OF(X509_EXTENSION) **sk);
-int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
-                         X509 *cert);
-int X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
-                             X509_REQ *req);
-int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
-                             X509_CRL *crl);
-
-X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf,
-                                    X509V3_CTX *ctx, int ext_nid,
-                                    char *value);
-X509_EXTENSION *X509V3_EXT_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                                char *name, char *value);
-int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                        char *section, X509 *cert);
-int X509V3_EXT_REQ_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                            char *section, X509_REQ *req);
-int X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                            char *section, X509_CRL *crl);
-
-int X509V3_add_value_bool_nf(char *name, int asn1_bool,
-                             STACK_OF(CONF_VALUE) **extlist);
-int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool);
-int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint);
-void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf);
-void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH_OF(CONF_VALUE) *lhash);
-# endif
-
-char *X509V3_get_string(X509V3_CTX *ctx, char *name, char *section);
-STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, char *section);
-void X509V3_string_free(X509V3_CTX *ctx, char *str);
-void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section);
-void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject,
-                    X509_REQ *req, X509_CRL *crl, int flags);
-
-int X509V3_add_value(const char *name, const char *value,
-                     STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_uchar(const char *name, const unsigned char *value,
-                           STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_bool(const char *name, int asn1_bool,
-                          STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
-                         STACK_OF(CONF_VALUE) **extlist);
-char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint);
-ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value);
-char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
-char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth,
-                                ASN1_ENUMERATED *aint);
-int X509V3_EXT_add(X509V3_EXT_METHOD *ext);
-int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist);
-int X509V3_EXT_add_alias(int nid_to, int nid_from);
-void X509V3_EXT_cleanup(void);
-
-const X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext);
-const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid);
-int X509V3_add_standard_extensions(void);
-STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line);
-void *X509V3_EXT_d2i(X509_EXTENSION *ext);
-void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
-                     int *idx);
-int X509V3_EXT_free(int nid, void *ext_data);
-
-X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
-int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
-                    int crit, unsigned long flags);
-
-char *hex_to_string(const unsigned char *buffer, long len);
-unsigned char *string_to_hex(const char *str, long *len);
-int name_cmp(const char *name, const char *cmp);
-
-void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
-                        int ml);
-int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
-                     int indent);
-int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
-
-int X509V3_extensions_print(BIO *out, char *title,
-                            STACK_OF(X509_EXTENSION) *exts,
-                            unsigned long flag, int indent);
-
-int X509_check_ca(X509 *x);
-int X509_check_purpose(X509 *x, int id, int ca);
-int X509_supported_extension(X509_EXTENSION *ex);
-int X509_PURPOSE_set(int *p, int purpose);
-int X509_check_issued(X509 *issuer, X509 *subject);
-int X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid);
-int X509_PURPOSE_get_count(void);
-X509_PURPOSE *X509_PURPOSE_get0(int idx);
-int X509_PURPOSE_get_by_sname(char *sname);
-int X509_PURPOSE_get_by_id(int id);
-int X509_PURPOSE_add(int id, int trust, int flags,
-                     int (*ck) (const X509_PURPOSE *, const X509 *, int),
-                     char *name, char *sname, void *arg);
-char *X509_PURPOSE_get0_name(X509_PURPOSE *xp);
-char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp);
-int X509_PURPOSE_get_trust(X509_PURPOSE *xp);
-void X509_PURPOSE_cleanup(void);
-int X509_PURPOSE_get_id(X509_PURPOSE *);
-
-STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x);
-STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x);
-void X509_email_free(STACK_OF(OPENSSL_STRING) *sk);
-STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x);
-/* Flags for X509_check_* functions */
-
-/*
- * Always check subject name for host match even if subject alt names present
- */
-# define X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT    0x1
-/* Disable wildcard matching for dnsName fields and common name. */
-# define X509_CHECK_FLAG_NO_WILDCARDS    0x2
-/* Wildcards must not match a partial label. */
-# define X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS 0x4
-/* Allow (non-partial) wildcards to match multiple labels. */
-# define X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS 0x8
-/* Constraint verifier subdomain patterns to match a single labels. */
-# define X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS 0x10
-/*
- * Match reference identifiers starting with "." to any sub-domain.
- * This is a non-public flag, turned on implicitly when the subject
- * reference identity is a DNS name.
- */
-# define _X509_CHECK_FLAG_DOT_SUBDOMAINS 0x8000
-
-int X509_check_host(X509 *x, const char *chk, size_t chklen,
-                    unsigned int flags, char **peername);
-int X509_check_email(X509 *x, const char *chk, size_t chklen,
-                     unsigned int flags);
-int X509_check_ip(X509 *x, const unsigned char *chk, size_t chklen,
-                  unsigned int flags);
-int X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags);
-
-ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
-ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
-int a2i_ipadd(unsigned char *ipout, const char *ipasc);
-int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
-                             unsigned long chtype);
-
-void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
-DECLARE_STACK_OF(X509_POLICY_NODE)
-
-# ifndef OPENSSL_NO_RFC3779
-
-typedef struct ASRange_st {
-    ASN1_INTEGER *min, *max;
-} ASRange;
-
-#  define ASIdOrRange_id          0
-#  define ASIdOrRange_range       1
-
-typedef struct ASIdOrRange_st {
-    int type;
-    union {
-        ASN1_INTEGER *id;
-        ASRange *range;
-    } u;
-} ASIdOrRange;
-
-typedef STACK_OF(ASIdOrRange) ASIdOrRanges;
-DECLARE_STACK_OF(ASIdOrRange)
-
-#  define ASIdentifierChoice_inherit              0
-#  define ASIdentifierChoice_asIdsOrRanges        1
-
-typedef struct ASIdentifierChoice_st {
-    int type;
-    union {
-        ASN1_NULL *inherit;
-        ASIdOrRanges *asIdsOrRanges;
-    } u;
-} ASIdentifierChoice;
-
-typedef struct ASIdentifiers_st {
-    ASIdentifierChoice *asnum, *rdi;
-} ASIdentifiers;
-
-DECLARE_ASN1_FUNCTIONS(ASRange)
-DECLARE_ASN1_FUNCTIONS(ASIdOrRange)
-DECLARE_ASN1_FUNCTIONS(ASIdentifierChoice)
-DECLARE_ASN1_FUNCTIONS(ASIdentifiers)
-
-typedef struct IPAddressRange_st {
-    ASN1_BIT_STRING *min, *max;
-} IPAddressRange;
-
-#  define IPAddressOrRange_addressPrefix  0
-#  define IPAddressOrRange_addressRange   1
-
-typedef struct IPAddressOrRange_st {
-    int type;
-    union {
-        ASN1_BIT_STRING *addressPrefix;
-        IPAddressRange *addressRange;
-    } u;
-} IPAddressOrRange;
-
-typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges;
-DECLARE_STACK_OF(IPAddressOrRange)
-
-#  define IPAddressChoice_inherit                 0
-#  define IPAddressChoice_addressesOrRanges       1
-
-typedef struct IPAddressChoice_st {
-    int type;
-    union {
-        ASN1_NULL *inherit;
-        IPAddressOrRanges *addressesOrRanges;
-    } u;
-} IPAddressChoice;
-
-typedef struct IPAddressFamily_st {
-    ASN1_OCTET_STRING *addressFamily;
-    IPAddressChoice *ipAddressChoice;
-} IPAddressFamily;
-
-typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
-DECLARE_STACK_OF(IPAddressFamily)
-
-DECLARE_ASN1_FUNCTIONS(IPAddressRange)
-DECLARE_ASN1_FUNCTIONS(IPAddressOrRange)
-DECLARE_ASN1_FUNCTIONS(IPAddressChoice)
-DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
-
-/*
- * API tag for elements of the ASIdentifer SEQUENCE.
- */
-#  define V3_ASID_ASNUM   0
-#  define V3_ASID_RDI     1
-
-/*
- * AFI values, assigned by IANA.  It'd be nice to make the AFI
- * handling code totally generic, but there are too many little things
- * that would need to be defined for other address families for it to
- * be worth the trouble.
- */
-#  define IANA_AFI_IPV4   1
-#  define IANA_AFI_IPV6   2
-
-/*
- * Utilities to construct and extract values from RFC3779 extensions,
- * since some of the encodings (particularly for IP address prefixes
- * and ranges) are a bit tedious to work with directly.
- */
-int v3_asid_add_inherit(ASIdentifiers *asid, int which);
-int v3_asid_add_id_or_range(ASIdentifiers *asid, int which,
-                            ASN1_INTEGER *min, ASN1_INTEGER *max);
-int v3_addr_add_inherit(IPAddrBlocks *addr,
-                        const unsigned afi, const unsigned *safi);
-int v3_addr_add_prefix(IPAddrBlocks *addr,
-                       const unsigned afi, const unsigned *safi,
-                       unsigned char *a, const int prefixlen);
-int v3_addr_add_range(IPAddrBlocks *addr,
-                      const unsigned afi, const unsigned *safi,
-                      unsigned char *min, unsigned char *max);
-unsigned v3_addr_get_afi(const IPAddressFamily *f);
-int v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi,
-                      unsigned char *min, unsigned char *max,
-                      const int length);
-
-/*
- * Canonical forms.
- */
-int v3_asid_is_canonical(ASIdentifiers *asid);
-int v3_addr_is_canonical(IPAddrBlocks *addr);
-int v3_asid_canonize(ASIdentifiers *asid);
-int v3_addr_canonize(IPAddrBlocks *addr);
-
-/*
- * Tests for inheritance and containment.
- */
-int v3_asid_inherits(ASIdentifiers *asid);
-int v3_addr_inherits(IPAddrBlocks *addr);
-int v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b);
-int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b);
-
-/*
- * Check whether RFC 3779 extensions nest properly in chains.
- */
-int v3_asid_validate_path(X509_STORE_CTX *);
-int v3_addr_validate_path(X509_STORE_CTX *);
-int v3_asid_validate_resource_set(STACK_OF(X509) *chain,
-                                  ASIdentifiers *ext, int allow_inheritance);
-int v3_addr_validate_resource_set(STACK_OF(X509) *chain,
-                                  IPAddrBlocks *ext, int allow_inheritance);
-
-# endif                         /* OPENSSL_NO_RFC3779 */
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_X509V3_strings(void);
-
-/* Error codes for the X509V3 functions. */
-
-/* Function codes. */
-# define X509V3_F_A2I_GENERAL_NAME                        164
-# define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE             161
-# define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL         162
-# define X509V3_F_COPY_EMAIL                              122
-# define X509V3_F_COPY_ISSUER                             123
-# define X509V3_F_DO_DIRNAME                              144
-# define X509V3_F_DO_EXT_CONF                             124
-# define X509V3_F_DO_EXT_I2D                              135
-# define X509V3_F_DO_EXT_NCONF                            151
-# define X509V3_F_DO_I2V_NAME_CONSTRAINTS                 148
-# define X509V3_F_GNAMES_FROM_SECTNAME                    156
-# define X509V3_F_HEX_TO_STRING                           111
-# define X509V3_F_I2S_ASN1_ENUMERATED                     121
-# define X509V3_F_I2S_ASN1_IA5STRING                      149
-# define X509V3_F_I2S_ASN1_INTEGER                        120
-# define X509V3_F_I2V_AUTHORITY_INFO_ACCESS               138
-# define X509V3_F_NOTICE_SECTION                          132
-# define X509V3_F_NREF_NOS                                133
-# define X509V3_F_POLICY_SECTION                          131
-# define X509V3_F_PROCESS_PCI_VALUE                       150
-# define X509V3_F_R2I_CERTPOL                             130
-# define X509V3_F_R2I_PCI                                 155
-# define X509V3_F_S2I_ASN1_IA5STRING                      100
-# define X509V3_F_S2I_ASN1_INTEGER                        108
-# define X509V3_F_S2I_ASN1_OCTET_STRING                   112
-# define X509V3_F_S2I_ASN1_SKEY_ID                        114
-# define X509V3_F_S2I_SKEY_ID                             115
-# define X509V3_F_SET_DIST_POINT_NAME                     158
-# define X509V3_F_STRING_TO_HEX                           113
-# define X509V3_F_SXNET_ADD_ID_ASC                        125
-# define X509V3_F_SXNET_ADD_ID_INTEGER                    126
-# define X509V3_F_SXNET_ADD_ID_ULONG                      127
-# define X509V3_F_SXNET_GET_ID_ASC                        128
-# define X509V3_F_SXNET_GET_ID_ULONG                      129
-# define X509V3_F_V2I_ASIDENTIFIERS                       163
-# define X509V3_F_V2I_ASN1_BIT_STRING                     101
-# define X509V3_F_V2I_AUTHORITY_INFO_ACCESS               139
-# define X509V3_F_V2I_AUTHORITY_KEYID                     119
-# define X509V3_F_V2I_BASIC_CONSTRAINTS                   102
-# define X509V3_F_V2I_CRLD                                134
-# define X509V3_F_V2I_EXTENDED_KEY_USAGE                  103
-# define X509V3_F_V2I_GENERAL_NAMES                       118
-# define X509V3_F_V2I_GENERAL_NAME_EX                     117
-# define X509V3_F_V2I_IDP                                 157
-# define X509V3_F_V2I_IPADDRBLOCKS                        159
-# define X509V3_F_V2I_ISSUER_ALT                          153
-# define X509V3_F_V2I_NAME_CONSTRAINTS                    147
-# define X509V3_F_V2I_POLICY_CONSTRAINTS                  146
-# define X509V3_F_V2I_POLICY_MAPPINGS                     145
-# define X509V3_F_V2I_SUBJECT_ALT                         154
-# define X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL          160
-# define X509V3_F_V3_GENERIC_EXTENSION                    116
-# define X509V3_F_X509V3_ADD1_I2D                         140
-# define X509V3_F_X509V3_ADD_VALUE                        105
-# define X509V3_F_X509V3_EXT_ADD                          104
-# define X509V3_F_X509V3_EXT_ADD_ALIAS                    106
-# define X509V3_F_X509V3_EXT_CONF                         107
-# define X509V3_F_X509V3_EXT_FREE                         165
-# define X509V3_F_X509V3_EXT_I2D                          136
-# define X509V3_F_X509V3_EXT_NCONF                        152
-# define X509V3_F_X509V3_GET_SECTION                      142
-# define X509V3_F_X509V3_GET_STRING                       143
-# define X509V3_F_X509V3_GET_VALUE_BOOL                   110
-# define X509V3_F_X509V3_PARSE_LIST                       109
-# define X509V3_F_X509_PURPOSE_ADD                        137
-# define X509V3_F_X509_PURPOSE_SET                        141
-
-/* Reason codes. */
-# define X509V3_R_BAD_IP_ADDRESS                          118
-# define X509V3_R_BAD_OBJECT                              119
-# define X509V3_R_BN_DEC2BN_ERROR                         100
-# define X509V3_R_BN_TO_ASN1_INTEGER_ERROR                101
-# define X509V3_R_CANNOT_FIND_FREE_FUNCTION               168
-# define X509V3_R_DIRNAME_ERROR                           149
-# define X509V3_R_DISTPOINT_ALREADY_SET                   160
-# define X509V3_R_DUPLICATE_ZONE_ID                       133
-# define X509V3_R_ERROR_CONVERTING_ZONE                   131
-# define X509V3_R_ERROR_CREATING_EXTENSION                144
-# define X509V3_R_ERROR_IN_EXTENSION                      128
-# define X509V3_R_EXPECTED_A_SECTION_NAME                 137
-# define X509V3_R_EXTENSION_EXISTS                        145
-# define X509V3_R_EXTENSION_NAME_ERROR                    115
-# define X509V3_R_EXTENSION_NOT_FOUND                     102
-# define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED         103
-# define X509V3_R_EXTENSION_VALUE_ERROR                   116
-# define X509V3_R_ILLEGAL_EMPTY_EXTENSION                 151
-# define X509V3_R_ILLEGAL_HEX_DIGIT                       113
-# define X509V3_R_INCORRECT_POLICY_SYNTAX_TAG             152
-# define X509V3_R_INVALID_ASNUMBER                        162
-# define X509V3_R_INVALID_ASRANGE                         163
-# define X509V3_R_INVALID_BOOLEAN_STRING                  104
-# define X509V3_R_INVALID_EXTENSION_STRING                105
-# define X509V3_R_INVALID_INHERITANCE                     165
-# define X509V3_R_INVALID_IPADDRESS                       166
-# define X509V3_R_INVALID_MULTIPLE_RDNS                   161
-# define X509V3_R_INVALID_NAME                            106
-# define X509V3_R_INVALID_NULL_ARGUMENT                   107
-# define X509V3_R_INVALID_NULL_NAME                       108
-# define X509V3_R_INVALID_NULL_VALUE                      109
-# define X509V3_R_INVALID_NUMBER                          140
-# define X509V3_R_INVALID_NUMBERS                         141
-# define X509V3_R_INVALID_OBJECT_IDENTIFIER               110
-# define X509V3_R_INVALID_OPTION                          138
-# define X509V3_R_INVALID_POLICY_IDENTIFIER               134
-# define X509V3_R_INVALID_PROXY_POLICY_SETTING            153
-# define X509V3_R_INVALID_PURPOSE                         146
-# define X509V3_R_INVALID_SAFI                            164
-# define X509V3_R_INVALID_SECTION                         135
-# define X509V3_R_INVALID_SYNTAX                          143
-# define X509V3_R_ISSUER_DECODE_ERROR                     126
-# define X509V3_R_MISSING_VALUE                           124
-# define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS           142
-# define X509V3_R_NO_CONFIG_DATABASE                      136
-# define X509V3_R_NO_ISSUER_CERTIFICATE                   121
-# define X509V3_R_NO_ISSUER_DETAILS                       127
-# define X509V3_R_NO_POLICY_IDENTIFIER                    139
-# define X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED   154
-# define X509V3_R_NO_PUBLIC_KEY                           114
-# define X509V3_R_NO_SUBJECT_DETAILS                      125
-# define X509V3_R_ODD_NUMBER_OF_DIGITS                    112
-# define X509V3_R_OPERATION_NOT_DEFINED                   148
-# define X509V3_R_OTHERNAME_ERROR                         147
-# define X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED         155
-# define X509V3_R_POLICY_PATH_LENGTH                      156
-# define X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED      157
-# define X509V3_R_POLICY_SYNTAX_NOT_CURRENTLY_SUPPORTED   158
-# define X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY 159
-# define X509V3_R_SECTION_NOT_FOUND                       150
-# define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS            122
-# define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID              123
-# define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT             111
-# define X509V3_R_UNKNOWN_EXTENSION                       129
-# define X509V3_R_UNKNOWN_EXTENSION_NAME                  130
-# define X509V3_R_UNKNOWN_OPTION                          120
-# define X509V3_R_UNSUPPORTED_OPTION                      117
-# define X509V3_R_UNSUPPORTED_TYPE                        167
-# define X509V3_R_USER_TOO_LONG                           132
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/openflow/usr/include/panel.h b/openflow/usr/include/panel.h
deleted file mode 100644
index 6ed2061..0000000
--- a/openflow/usr/include/panel.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995                    *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- *     and: Juergen Pfeifer                         1996-1999,2008          *
- ****************************************************************************/
-
-/* $Id: panel.h,v 1.11 2009/04/11 19:50:40 tom Exp $ */
-
-/* panel.h -- interface file for panels library */
-
-#ifndef NCURSES_PANEL_H_incl
-#define NCURSES_PANEL_H_incl 1
-
-#include <curses.h>
-
-typedef struct panel
-{
-  WINDOW *win;
-  struct panel *below;
-  struct panel *above;
-  NCURSES_CONST void *user;
-} PANEL;
-
-#if	defined(__cplusplus)
-extern "C" {
-#endif
-
-extern NCURSES_EXPORT(WINDOW*) panel_window (const PANEL *);
-extern NCURSES_EXPORT(void)    update_panels (void);
-extern NCURSES_EXPORT(int)     hide_panel (PANEL *);
-extern NCURSES_EXPORT(int)     show_panel (PANEL *);
-extern NCURSES_EXPORT(int)     del_panel (PANEL *);
-extern NCURSES_EXPORT(int)     top_panel (PANEL *);
-extern NCURSES_EXPORT(int)     bottom_panel (PANEL *);
-extern NCURSES_EXPORT(PANEL*)  new_panel (WINDOW *);
-extern NCURSES_EXPORT(PANEL*)  panel_above (const PANEL *);
-extern NCURSES_EXPORT(PANEL*)  panel_below (const PANEL *);
-extern NCURSES_EXPORT(int)     set_panel_userptr (PANEL *, NCURSES_CONST void *);
-extern NCURSES_EXPORT(NCURSES_CONST void*) panel_userptr (const PANEL *);
-extern NCURSES_EXPORT(int)     move_panel (PANEL *, int, int);
-extern NCURSES_EXPORT(int)     replace_panel (PANEL *,WINDOW *);
-extern NCURSES_EXPORT(int)     panel_hidden (const PANEL *);
-
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(PANEL *) ground_panel(SCREEN *);
-extern NCURSES_EXPORT(PANEL *) ceiling_panel(SCREEN *);
-
-extern NCURSES_EXPORT(void)    NCURSES_SP_NAME(update_panels) (SCREEN*);
-#endif
-
-#if	defined(__cplusplus)
-}
-#endif
-
-#endif /* NCURSES_PANEL_H_incl */
-
-/* end of panel.h */
diff --git a/openflow/usr/include/paths.h b/openflow/usr/include/paths.h
deleted file mode 100644
index c764e20..0000000
--- a/openflow/usr/include/paths.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)paths.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _PATHS_H_
-#define	_PATHS_H_
-
-/* Default search path. */
-#define	_PATH_DEFPATH	"/usr/bin:/bin"
-/* All standard utilities path. */
-#define	_PATH_STDPATH \
-	"/usr/bin:/bin:/usr/sbin:/sbin"
-
-#define	_PATH_BSHELL	"/bin/sh"
-#define	_PATH_CONSOLE	"/dev/console"
-#define	_PATH_CSHELL	"/bin/csh"
-#define	_PATH_DEVDB	"/var/run/dev.db"
-#define	_PATH_DEVNULL	"/dev/null"
-#define	_PATH_DRUM	"/dev/drum"
-#define	_PATH_GSHADOW	"/etc/gshadow"
-#define	_PATH_KLOG	"/proc/kmsg"
-#define	_PATH_KMEM	"/dev/kmem"
-#define	_PATH_LASTLOG	"/var/log/lastlog"
-#define	_PATH_MAILDIR	"/var/mail"
-#define	_PATH_MAN	"/usr/share/man"
-#define	_PATH_MEM	"/dev/mem"
-#define	_PATH_MNTTAB	"/etc/fstab"
-#define	_PATH_MOUNTED	"/etc/mtab"
-#define	_PATH_NOLOGIN	"/etc/nologin"
-#define	_PATH_PRESERVE	"/var/lib"
-#define	_PATH_RWHODIR	"/var/spool/rwho"
-#define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
-#define	_PATH_SHADOW	"/etc/shadow"
-#define	_PATH_SHELLS	"/etc/shells"
-#define	_PATH_TTY	"/dev/tty"
-#define	_PATH_UNIX	"/boot/vmlinux"
-#define	_PATH_UTMP	"/var/run/utmp"
-#define	_PATH_VI	"/usr/bin/vi"
-#define	_PATH_WTMP	"/var/log/wtmp"
-
-/* Provide trailing slash, since mostly used for building pathnames. */
-#define	_PATH_DEV	"/dev/"
-#define	_PATH_TMP	"/tmp/"
-#define	_PATH_VARDB	"/var/lib/misc/"
-#define	_PATH_VARRUN	"/var/run/"
-#define	_PATH_VARTMP	"/var/tmp/"
-
-#endif /* !_PATHS_H_ */
diff --git a/openflow/usr/include/pcap-bpf.h b/openflow/usr/include/pcap-bpf.h
deleted file mode 100644
index ebb64c3..0000000
--- a/openflow/usr/include/pcap-bpf.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * For backwards compatibility.
- *
- * Note to OS vendors: do NOT get rid of this file!  Some applications
- * might expect to be able to include <pcap-bpf.h>.
- */
-#include <pcap/bpf.h>
diff --git a/openflow/usr/include/pcap-namedb.h b/openflow/usr/include/pcap-namedb.h
deleted file mode 100644
index d5908c9..0000000
--- a/openflow/usr/include/pcap-namedb.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1994, 1996
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the Computer Systems
- *	Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- *    to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * For backwards compatibility.
- *
- * Note to OS vendors: do NOT get rid of this file!  Some applications
- * might expect to be able to include <pcap-namedb.h>.
- */
-#include <pcap/namedb.h>
diff --git a/openflow/usr/include/poll.h b/openflow/usr/include/poll.h
deleted file mode 100644
index 06fb41a..0000000
--- a/openflow/usr/include/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sys/poll.h>
diff --git a/openflow/usr/include/printf.h b/openflow/usr/include/printf.h
deleted file mode 100644
index d731216..0000000
--- a/openflow/usr/include/printf.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_PRINTF_H
-
-#define	_PRINTF_H	1
-#include <features.h>
-
-__BEGIN_DECLS
-
-#define	__need_FILE
-#include <stdio.h>
-#define	__need_size_t
-#define __need_wchar_t
-#include <stddef.h>
-#include <stdarg.h>
-
-
-struct printf_info
-{
-  int prec;			/* Precision.  */
-  int width;			/* Width.  */
-  wchar_t spec;			/* Format letter.  */
-  unsigned int is_long_double:1;/* L flag.  */
-  unsigned int is_short:1;	/* h flag.  */
-  unsigned int is_long:1;	/* l flag.  */
-  unsigned int alt:1;		/* # flag.  */
-  unsigned int space:1;		/* Space flag.  */
-  unsigned int left:1;		/* - flag.  */
-  unsigned int showsign:1;	/* + flag.  */
-  unsigned int group:1;		/* ' flag.  */
-  unsigned int extra:1;		/* For special use.  */
-  unsigned int is_char:1;	/* hh flag.  */
-  unsigned int wide:1;		/* Nonzero for wide character streams.  */
-  unsigned int i18n:1;		/* I flag.  */
-  unsigned int __pad:4;		/* Unused so far.  */
-  unsigned short int user;	/* Bits for user-installed modifiers.  */
-  wchar_t pad;			/* Padding character.  */
-};
-
-
-/* Type of a printf specifier-handler function.
-   STREAM is the FILE on which to write output.
-   INFO gives information about the format specification.
-   ARGS is a vector of pointers to the argument data;
-   the number of pointers will be the number returned
-   by the associated arginfo function for the same INFO.
-
-   The function should return the number of characters written,
-   or -1 for errors.  */
-
-typedef int printf_function (FILE *__stream,
-			     const struct printf_info *__info,
-			     const void *const *__args);
-
-/* Type of a printf specifier-arginfo function.
-   INFO gives information about the format specification.
-   N, ARGTYPES, *SIZE has to contain the size of the parameter for
-   user-defined types, and return value are as for parse_printf_format
-   except that -1 should be returned if the handler cannot handle
-   this case.  This allows to partially overwrite the functionality
-   of existing format specifiers.  */
-
-typedef int printf_arginfo_size_function (const struct printf_info *__info,
-					  size_t __n, int *__argtypes,
-					  int *__size);
-
-/* Old version of 'printf_arginfo_function' without a SIZE parameter.  */
-
-typedef int printf_arginfo_function (const struct printf_info *__info,
-				     size_t __n, int *__argtypes);
-
-/* Type of a function to get a value of a user-defined from the
-   variable argument list.  */
-typedef void printf_va_arg_function (void *__mem, va_list *__ap);
-
-
-/* Register FUNC to be called to format SPEC specifiers; ARGINFO must be
-   specified to determine how many arguments a SPEC conversion requires and
-   what their types are.  */
-
-extern int register_printf_specifier (int __spec, printf_function __func,
-				      printf_arginfo_size_function __arginfo)
-  __THROW;
-
-
-/* Obsolete interface similar to register_printf_specifier.  It can only
-   handle basic data types because the ARGINFO callback does not return
-   information on the size of the user-defined type.  */
-
-extern int register_printf_function (int __spec, printf_function __func,
-				     printf_arginfo_function __arginfo)
-  __THROW __attribute_deprecated__;
-
-
-/* Register a new modifier character sequence.  If the call succeeds
-   it returns a positive value representing the bit set in the USER
-   field in 'struct printf_info'.  */
-
-extern int register_printf_modifier (const wchar_t *__str) __wur __THROW;
-
-
-/* Register variable argument handler for user type.  The return value
-   is to be used in ARGINFO functions to signal the use of the
-   type.  */
-extern int register_printf_type (printf_va_arg_function __fct) __wur __THROW;
-
-
-/* Parse FMT, and fill in N elements of ARGTYPES with the
-   types needed for the conversions FMT specifies.  Returns
-   the number of arguments required by FMT.
-
-   The ARGINFO function registered with a user-defined format is passed a
-   `struct printf_info' describing the format spec being parsed.  A width
-   or precision of INT_MIN means a `*' was used to indicate that the
-   width/precision will come from an arg.  The function should fill in the
-   array it is passed with the types of the arguments it wants, and return
-   the number of arguments it wants.  */
-
-extern size_t parse_printf_format (const char *__restrict __fmt, size_t __n,
-				   int *__restrict __argtypes) __THROW;
-
-
-/* Codes returned by `parse_printf_format' for basic types.
-
-   These values cover all the standard format specifications.
-   Users can reserve new values after PA_LAST for their own types
-   using 'register_printf_type'.  */
-
-enum
-{				/* C type: */
-  PA_INT,			/* int */
-  PA_CHAR,			/* int, cast to char */
-  PA_WCHAR,			/* wide char */
-  PA_STRING,			/* const char *, a '\0'-terminated string */
-  PA_WSTRING,			/* const wchar_t *, wide character string */
-  PA_POINTER,			/* void * */
-  PA_FLOAT,			/* float */
-  PA_DOUBLE,			/* double */
-  PA_LAST
-};
-
-/* Flag bits that can be set in a type returned by `parse_printf_format'.  */
-#define	PA_FLAG_MASK		0xff00
-#define	PA_FLAG_LONG_LONG	(1 << 8)
-#define	PA_FLAG_LONG_DOUBLE	PA_FLAG_LONG_LONG
-#define	PA_FLAG_LONG		(1 << 9)
-#define	PA_FLAG_SHORT		(1 << 10)
-#define	PA_FLAG_PTR		(1 << 11)
-
-
-
-/* Function which can be registered as `printf'-handlers.  */
-
-/* Print floating point value using using abbreviations for the orders
-   of magnitude used for numbers ('k' for kilo, 'm' for mega etc).  If
-   the format specifier is a uppercase character powers of 1000 are
-   used.  Otherwise powers of 1024.  */
-extern int printf_size (FILE *__restrict __fp,
-			const struct printf_info *__info,
-			const void *const *__restrict __args) __THROW;
-
-/* This is the appropriate argument information function for `printf_size'.  */
-extern int printf_size_info (const struct printf_info *__restrict
-			     __info, size_t __n, int *__restrict __argtypes)
-     __THROW;
-
-#ifdef __LDBL_COMPAT
-# include <bits/printf-ldbl.h>
-#endif
-
-__END_DECLS
-
-#endif /* printf.h  */
diff --git a/openflow/usr/include/protocols/routed.h b/openflow/usr/include/protocols/routed.h
deleted file mode 100644
index befd865..0000000
--- a/openflow/usr/include/protocols/routed.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * Copyright (c) 1983, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)routed.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _PROTOCOLS_ROUTED_H
-#define	_PROTOCOLS_ROUTED_H 1
-
-#include <sys/socket.h>
-/*
- * Routing Information Protocol
- *
- * Derived from Xerox NS Routing Information Protocol
- * by changing 32-bit net numbers to sockaddr's and
- * padding stuff to 32-bit boundaries.
- */
-#define	RIPVERSION	1
-
-struct netinfo {
-	struct	sockaddr rip_dst;	/* destination net/host */
-	int	rip_metric;		/* cost of route */
-};
-
-struct rip {
-	u_char	rip_cmd;		/* request/response */
-	u_char	rip_vers;		/* protocol version # */
-	u_char	rip_res1[2];		/* pad to 32-bit boundary */
-	union {
-		struct	netinfo ru_nets[1];	/* variable length... */
-		char	ru_tracefile[1];	/* ditto ... */
-	} ripun;
-#define	rip_nets	ripun.ru_nets
-#define	rip_tracefile	ripun.ru_tracefile
-};
-
-/*
- * Packet types.
- */
-#define	RIPCMD_REQUEST		1	/* want info */
-#define	RIPCMD_RESPONSE		2	/* responding to request */
-#define	RIPCMD_TRACEON		3	/* turn tracing on */
-#define	RIPCMD_TRACEOFF		4	/* turn it off */
-
-#define	RIPCMD_MAX		5
-#ifdef RIPCMDS
-char *ripcmds[RIPCMD_MAX] =
-  { "#0", "REQUEST", "RESPONSE", "TRACEON", "TRACEOFF" };
-#endif
-
-#define	HOPCNT_INFINITY		16	/* per Xerox NS */
-#define	MAXPACKETSIZE		512	/* max broadcast size */
-
-/*
- * Timer values used in managing the routing table.
- * Complete tables are broadcast every SUPPLY_INTERVAL seconds.
- * If changes occur between updates, dynamic updates containing only changes
- * may be sent.  When these are sent, a timer is set for a random value
- * between MIN_WAITTIME and MAX_WAITTIME, and no additional dynamic updates
- * are sent until the timer expires.
- *
- * Every update of a routing entry forces an entry's timer to be reset.
- * After EXPIRE_TIME without updates, the entry is marked invalid,
- * but held onto until GARBAGE_TIME so that others may
- * see it "be deleted".
- */
-#define	TIMER_RATE		30	/* alarm clocks every 30 seconds */
-
-#define	SUPPLY_INTERVAL		30	/* time to supply tables */
-#define	MIN_WAITTIME		2	/* min. interval to broadcast changes */
-#define	MAX_WAITTIME		5	/* max. time to delay changes */
-
-#define	EXPIRE_TIME		180	/* time to mark entry invalid */
-#define	GARBAGE_TIME		240	/* time to garbage collect */
-
-#endif /* protocols/routed.h */
diff --git a/openflow/usr/include/protocols/rwhod.h b/openflow/usr/include/protocols/rwhod.h
deleted file mode 100644
index 446d6f9..0000000
--- a/openflow/usr/include/protocols/rwhod.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)rwhod.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _PROTOCOLS_RWHOD_H
-#define	_PROTOCOLS_RWHOD_H 1
-
-#include <sys/types.h>
-
-/*
- * rwho protocol packet format.
- */
-struct	outmp {
-	char	out_line[8];		/* tty name */
-	char	out_name[8];		/* user id */
-	int32_t	out_time;		/* time on */
-};
-
-struct	whod {
-	char	wd_vers;		/* protocol version # */
-	char	wd_type;		/* packet type, see below */
-	char	wd_pad[2];
-	int	wd_sendtime;		/* time stamp by sender */
-	int	wd_recvtime;		/* time stamp applied by receiver */
-	char	wd_hostname[32];	/* hosts's name */
-	int	wd_loadav[3];		/* load average as in uptime */
-	int	wd_boottime;		/* time system booted */
-	struct	whoent {
-		struct	outmp we_utmp;	/* active tty info */
-		int	we_idle;	/* tty idle time */
-	} wd_we[1024 / sizeof (struct whoent)];
-};
-
-#define	WHODVERSION	1
-#define	WHODTYPE_STATUS	1		/* host status */
-
-/* We used to define _PATH_RWHODIR here but it's now in <paths.h>.  */
-#include <paths.h>
-
-#endif /* protocols/rwhod.h */
diff --git a/openflow/usr/include/protocols/talkd.h b/openflow/usr/include/protocols/talkd.h
deleted file mode 100644
index a8f33b1..0000000
--- a/openflow/usr/include/protocols/talkd.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)talkd.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _PROTOCOLS_TALKD_H
-#define	_PROTOCOLS_TALKD_H 1
-
-/*
- * This describes the protocol used by the talk server and clients.
- *
- * The talk server acts a repository of invitations, responding to
- * requests by clients wishing to rendezvous for the purpose of
- * holding a conversation.  In normal operation, a client, the caller,
- * initiates a rendezvous by sending a CTL_MSG to the server of
- * type LOOK_UP.  This causes the server to search its invitation
- * tables to check if an invitation currently exists for the caller
- * (to speak to the callee specified in the message).  If the lookup
- * fails, the caller then sends an ANNOUNCE message causing the server
- * to broadcast an announcement on the callee's login ports requesting
- * contact.  When the callee responds, the local server uses the
- * recorded invitation to respond with the appropriate rendezvous
- * address and the caller and callee client programs establish a
- * stream connection through which the conversation takes place.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-/*
- * Client->server request message format.
- */
-typedef struct {
-	u_char	vers;		/* protocol version */
-	u_char	type;		/* request type, see below */
-	u_char	answer;		/* not used */
-	u_char	pad;
-	u_int32_t id_num;	/* message id */
-	struct	osockaddr addr;		/* old (4.3) style */
-	struct	osockaddr ctl_addr;	/* old (4.3) style */
-	int32_t	pid;		/* caller's process id */
-#define	NAME_SIZE	12
-	char	l_name[NAME_SIZE];/* caller's name */
-	char	r_name[NAME_SIZE];/* callee's name */
-#define	TTY_SIZE	16
-	char	r_tty[TTY_SIZE];/* callee's tty name */
-} CTL_MSG;
-
-/*
- * Server->client response message format.
- */
-typedef struct {
-	u_char	vers;		/* protocol version */
-	u_char	type;		/* type of request message, see below */
-	u_char	answer;		/* response to request message, see below */
-	u_char	pad;
-	u_int32_t id_num;	/* message id */
-	struct	osockaddr addr;	/* address for establishing conversation */
-} CTL_RESPONSE;
-
-#define	TALK_VERSION	1		/* protocol version */
-
-/* message type values */
-#define LEAVE_INVITE	0	/* leave invitation with server */
-#define LOOK_UP		1	/* check for invitation by callee */
-#define DELETE		2	/* delete invitation by caller */
-#define ANNOUNCE	3	/* announce invitation by caller */
-
-/* answer values */
-#define SUCCESS		0	/* operation completed properly */
-#define NOT_HERE	1	/* callee not logged in */
-#define FAILED		2	/* operation failed for unexplained reason */
-#define MACHINE_UNKNOWN	3	/* caller's machine name unknown */
-#define PERMISSION_DENIED 4	/* callee's tty doesn't permit announce */
-#define UNKNOWN_REQUEST	5	/* request has invalid type value */
-#define	BADVERSION	6	/* request has invalid protocol version */
-#define	BADADDR		7	/* request has invalid addr value */
-#define	BADCTLADDR	8	/* request has invalid ctl_addr value */
-
-/*
- * Operational parameters.
- */
-#define MAX_LIFE	60	/* max time daemon saves invitations */
-/* RING_WAIT should be 10's of seconds less than MAX_LIFE */
-#define RING_WAIT	30	/* time to wait before resending invitation */
-
-#endif /* protocols/talkd.h */
diff --git a/openflow/usr/include/protocols/timed.h b/openflow/usr/include/protocols/timed.h
deleted file mode 100644
index b5d4702..0000000
--- a/openflow/usr/include/protocols/timed.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)timed.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef	_PROTOCOLS_TIMED_H
-#define	_PROTOCOLS_TIMED_H 1
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-/*
- * Time Synchronization Protocol
- */
-
-#define	TSPVERSION	1
-#define ANYADDR 	NULL
-#define MAXHOSTNAMELEN	64
-
-struct tsp {
-	u_char	tsp_type;
-	u_char	tsp_vers;
-	u_short	tsp_seq;
-	union {
-		struct timeval tspu_time;
-		char tspu_hopcnt;
-	} tsp_u;
-	char tsp_name[MAXHOSTNAMELEN];
-};
-
-#define	tsp_time	tsp_u.tspu_time
-#define	tsp_hopcnt	tsp_u.tspu_hopcnt
-
-/*
- * Command types.
- */
-#define	TSP_ANY			0	/* match any types */
-#define	TSP_ADJTIME		1	/* send adjtime */
-#define	TSP_ACK			2	/* generic acknowledgement */
-#define	TSP_MASTERREQ		3	/* ask for master's name */
-#define	TSP_MASTERACK		4	/* acknowledge master request */
-#define	TSP_SETTIME		5	/* send network time */
-#define	TSP_MASTERUP		6	/* inform slaves that master is up */
-#define	TSP_SLAVEUP		7	/* slave is up but not polled */
-#define	TSP_ELECTION		8	/* advance candidature for master */
-#define	TSP_ACCEPT		9	/* support candidature of master */
-#define	TSP_REFUSE		10	/* reject candidature of master */
-#define	TSP_CONFLICT		11	/* two or more masters present */
-#define	TSP_RESOLVE		12	/* masters' conflict resolution */
-#define	TSP_QUIT		13	/* reject candidature if master is up */
-#define	TSP_DATE		14	/* reset the time (date command) */
-#define	TSP_DATEREQ		15	/* remote request to reset the time */
-#define	TSP_DATEACK		16	/* acknowledge time setting  */
-#define	TSP_TRACEON		17	/* turn tracing on */
-#define	TSP_TRACEOFF		18	/* turn tracing off */
-#define	TSP_MSITE		19	/* find out master's site */
-#define	TSP_MSITEREQ		20	/* remote master's site request */
-#define	TSP_TEST		21	/* for testing election algo */
-#define	TSP_SETDATE		22	/* New from date command */
-#define	TSP_SETDATEREQ		23	/* New remote for above */
-#define	TSP_LOOP		24	/* loop detection packet */
-
-#define	TSPTYPENUMBER		25
-
-#ifdef TSPTYPES
-char *tsptype[TSPTYPENUMBER] =
-  { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
-  "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT",
-  "DATE", "DATEREQ", "DATEACK", "TRACEON", "TRACEOFF", "MSITE", "MSITEREQ",
-  "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
-#endif
-
-#endif /* protocols/timed.h */
diff --git a/openflow/usr/include/pthread.h b/openflow/usr/include/pthread.h
deleted file mode 100644
index fd0894e..0000000
--- a/openflow/usr/include/pthread.h
+++ /dev/null
@@ -1,1161 +0,0 @@
-/* Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _PTHREAD_H
-#define _PTHREAD_H	1
-
-#include <features.h>
-#include <endian.h>
-#include <sched.h>
-#include <time.h>
-
-#include <bits/pthreadtypes.h>
-#include <bits/setjmp.h>
-#include <bits/wordsize.h>
-
-
-/* Detach state.  */
-enum
-{
-  PTHREAD_CREATE_JOINABLE,
-#define PTHREAD_CREATE_JOINABLE	PTHREAD_CREATE_JOINABLE
-  PTHREAD_CREATE_DETACHED
-#define PTHREAD_CREATE_DETACHED	PTHREAD_CREATE_DETACHED
-};
-
-
-/* Mutex types.  */
-enum
-{
-  PTHREAD_MUTEX_TIMED_NP,
-  PTHREAD_MUTEX_RECURSIVE_NP,
-  PTHREAD_MUTEX_ERRORCHECK_NP,
-  PTHREAD_MUTEX_ADAPTIVE_NP
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
-  ,
-  PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_TIMED_NP,
-  PTHREAD_MUTEX_RECURSIVE = PTHREAD_MUTEX_RECURSIVE_NP,
-  PTHREAD_MUTEX_ERRORCHECK = PTHREAD_MUTEX_ERRORCHECK_NP,
-  PTHREAD_MUTEX_DEFAULT = PTHREAD_MUTEX_NORMAL
-#endif
-#ifdef __USE_GNU
-  /* For compatibility.  */
-  , PTHREAD_MUTEX_FAST_NP = PTHREAD_MUTEX_TIMED_NP
-#endif
-};
-
-
-#ifdef __USE_XOPEN2K
-/* Robust mutex or not flags.  */
-enum
-{
-  PTHREAD_MUTEX_STALLED,
-  PTHREAD_MUTEX_STALLED_NP = PTHREAD_MUTEX_STALLED,
-  PTHREAD_MUTEX_ROBUST,
-  PTHREAD_MUTEX_ROBUST_NP = PTHREAD_MUTEX_ROBUST
-};
-#endif
-
-
-#if defined __USE_POSIX199506 || defined __USE_UNIX98
-/* Mutex protocols.  */
-enum
-{
-  PTHREAD_PRIO_NONE,
-  PTHREAD_PRIO_INHERIT,
-  PTHREAD_PRIO_PROTECT
-};
-#endif
-
-
-#ifdef __PTHREAD_MUTEX_HAVE_PREV
-# define PTHREAD_MUTEX_INITIALIZER \
-  { { 0, 0, 0, 0, 0, __PTHREAD_SPINS, { 0, 0 } } }
-# ifdef __USE_GNU
-#  define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, __PTHREAD_SPINS, { 0, 0 } } }
-#  define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, __PTHREAD_SPINS, { 0, 0 } } }
-#  define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __PTHREAD_SPINS, { 0, 0 } } }
-
-# endif
-#else
-# define PTHREAD_MUTEX_INITIALIZER \
-  { { 0, 0, 0, 0, 0, { __PTHREAD_SPINS } } }
-# ifdef __USE_GNU
-#  define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, { __PTHREAD_SPINS } } }
-#  define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, 0, { __PTHREAD_SPINS } } }
-#  define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
-  { { 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, 0, { __PTHREAD_SPINS } } }
-
-# endif
-#endif
-
-
-/* Read-write lock types.  */
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-enum
-{
-  PTHREAD_RWLOCK_PREFER_READER_NP,
-  PTHREAD_RWLOCK_PREFER_WRITER_NP,
-  PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,
-  PTHREAD_RWLOCK_DEFAULT_NP = PTHREAD_RWLOCK_PREFER_READER_NP
-};
-
-/* Define __PTHREAD_RWLOCK_INT_FLAGS_SHARED to 1 if pthread_rwlock_t
-   has the shared field.  All 64-bit architectures have the shared field
-   in pthread_rwlock_t.  */
-#ifndef __PTHREAD_RWLOCK_INT_FLAGS_SHARED
-# if __WORDSIZE == 64
-#  define __PTHREAD_RWLOCK_INT_FLAGS_SHARED 1
-# endif
-#endif
-
-/* Read-write lock initializers.  */
-# define PTHREAD_RWLOCK_INITIALIZER \
-  { { 0, 0, 0, 0, 0, 0, 0, 0, __PTHREAD_RWLOCK_ELISION_EXTRA, 0, 0 } }
-# ifdef __USE_GNU
-#  ifdef __PTHREAD_RWLOCK_INT_FLAGS_SHARED
-#   define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
-  { { 0, 0, 0, 0, 0, 0, 0, 0, __PTHREAD_RWLOCK_ELISION_EXTRA, 0,					      \
-	PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
-#  else
-#   if __BYTE_ORDER == __LITTLE_ENDIAN
-#    define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
-  { { 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, \
-      0, __PTHREAD_RWLOCK_ELISION_EXTRA, 0, 0 } }
-#   else
-#    define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
-  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,\
-      0 } }
-#   endif
-#  endif
-# endif
-#endif  /* Unix98 or XOpen2K */
-
-
-/* Scheduler inheritance.  */
-enum
-{
-  PTHREAD_INHERIT_SCHED,
-#define PTHREAD_INHERIT_SCHED   PTHREAD_INHERIT_SCHED
-  PTHREAD_EXPLICIT_SCHED
-#define PTHREAD_EXPLICIT_SCHED  PTHREAD_EXPLICIT_SCHED
-};
-
-
-/* Scope handling.  */
-enum
-{
-  PTHREAD_SCOPE_SYSTEM,
-#define PTHREAD_SCOPE_SYSTEM    PTHREAD_SCOPE_SYSTEM
-  PTHREAD_SCOPE_PROCESS
-#define PTHREAD_SCOPE_PROCESS   PTHREAD_SCOPE_PROCESS
-};
-
-
-/* Process shared or private flag.  */
-enum
-{
-  PTHREAD_PROCESS_PRIVATE,
-#define PTHREAD_PROCESS_PRIVATE PTHREAD_PROCESS_PRIVATE
-  PTHREAD_PROCESS_SHARED
-#define PTHREAD_PROCESS_SHARED  PTHREAD_PROCESS_SHARED
-};
-
-
-
-/* Conditional variable handling.  */
-#define PTHREAD_COND_INITIALIZER { { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }
-
-
-/* Cleanup buffers */
-struct _pthread_cleanup_buffer
-{
-  void (*__routine) (void *);             /* Function to call.  */
-  void *__arg;                            /* Its argument.  */
-  int __canceltype;                       /* Saved cancellation type. */
-  struct _pthread_cleanup_buffer *__prev; /* Chaining of cleanup functions.  */
-};
-
-/* Cancellation */
-enum
-{
-  PTHREAD_CANCEL_ENABLE,
-#define PTHREAD_CANCEL_ENABLE   PTHREAD_CANCEL_ENABLE
-  PTHREAD_CANCEL_DISABLE
-#define PTHREAD_CANCEL_DISABLE  PTHREAD_CANCEL_DISABLE
-};
-enum
-{
-  PTHREAD_CANCEL_DEFERRED,
-#define PTHREAD_CANCEL_DEFERRED	PTHREAD_CANCEL_DEFERRED
-  PTHREAD_CANCEL_ASYNCHRONOUS
-#define PTHREAD_CANCEL_ASYNCHRONOUS	PTHREAD_CANCEL_ASYNCHRONOUS
-};
-#define PTHREAD_CANCELED ((void *) -1)
-
-
-/* Single execution handling.  */
-#define PTHREAD_ONCE_INIT 0
-
-
-#ifdef __USE_XOPEN2K
-/* Value returned by 'pthread_barrier_wait' for one of the threads after
-   the required number of threads have called this function.
-   -1 is distinct from 0 and all errno constants */
-# define PTHREAD_BARRIER_SERIAL_THREAD -1
-#endif
-
-
-__BEGIN_DECLS
-
-/* Create a new thread, starting with execution of START-ROUTINE
-   getting passed ARG.  Creation attributed come from ATTR.  The new
-   handle is stored in *NEWTHREAD.  */
-extern int pthread_create (pthread_t *__restrict __newthread,
-			   const pthread_attr_t *__restrict __attr,
-			   void *(*__start_routine) (void *),
-			   void *__restrict __arg) __THROWNL __nonnull ((1, 3));
-
-/* Terminate calling thread.
-
-   The registered cleanup handlers are called via exception handling
-   so we cannot mark this function with __THROW.*/
-extern void pthread_exit (void *__retval) __attribute__ ((__noreturn__));
-
-/* Make calling thread wait for termination of the thread TH.  The
-   exit status of the thread is stored in *THREAD_RETURN, if THREAD_RETURN
-   is not NULL.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int pthread_join (pthread_t __th, void **__thread_return);
-
-#ifdef __USE_GNU
-/* Check whether thread TH has terminated.  If yes return the status of
-   the thread in *THREAD_RETURN, if THREAD_RETURN is not NULL.  */
-extern int pthread_tryjoin_np (pthread_t __th, void **__thread_return) __THROW;
-
-/* Make calling thread wait for termination of the thread TH, but only
-   until TIMEOUT.  The exit status of the thread is stored in
-   *THREAD_RETURN, if THREAD_RETURN is not NULL.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int pthread_timedjoin_np (pthread_t __th, void **__thread_return,
-				 const struct timespec *__abstime);
-#endif
-
-/* Indicate that the thread TH is never to be joined with PTHREAD_JOIN.
-   The resources of TH will therefore be freed immediately when it
-   terminates, instead of waiting for another thread to perform PTHREAD_JOIN
-   on it.  */
-extern int pthread_detach (pthread_t __th) __THROW;
-
-
-/* Obtain the identifier of the current thread.  */
-extern pthread_t pthread_self (void) __THROW __attribute__ ((__const__));
-
-/* Compare two thread identifiers.  */
-extern int pthread_equal (pthread_t __thread1, pthread_t __thread2)
-  __THROW __attribute__ ((__const__));
-
-
-/* Thread attribute handling.  */
-
-/* Initialize thread attribute *ATTR with default attributes
-   (detachstate is PTHREAD_JOINABLE, scheduling policy is SCHED_OTHER,
-    no user-provided stack).  */
-extern int pthread_attr_init (pthread_attr_t *__attr) __THROW __nonnull ((1));
-
-/* Destroy thread attribute *ATTR.  */
-extern int pthread_attr_destroy (pthread_attr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Get detach state attribute.  */
-extern int pthread_attr_getdetachstate (const pthread_attr_t *__attr,
-					int *__detachstate)
-     __THROW __nonnull ((1, 2));
-
-/* Set detach state attribute.  */
-extern int pthread_attr_setdetachstate (pthread_attr_t *__attr,
-					int __detachstate)
-     __THROW __nonnull ((1));
-
-
-/* Get the size of the guard area created for stack overflow protection.  */
-extern int pthread_attr_getguardsize (const pthread_attr_t *__attr,
-				      size_t *__guardsize)
-     __THROW __nonnull ((1, 2));
-
-/* Set the size of the guard area created for stack overflow protection.  */
-extern int pthread_attr_setguardsize (pthread_attr_t *__attr,
-				      size_t __guardsize)
-     __THROW __nonnull ((1));
-
-
-/* Return in *PARAM the scheduling parameters of *ATTR.  */
-extern int pthread_attr_getschedparam (const pthread_attr_t *__restrict __attr,
-				       struct sched_param *__restrict __param)
-     __THROW __nonnull ((1, 2));
-
-/* Set scheduling parameters (priority, etc) in *ATTR according to PARAM.  */
-extern int pthread_attr_setschedparam (pthread_attr_t *__restrict __attr,
-				       const struct sched_param *__restrict
-				       __param) __THROW __nonnull ((1, 2));
-
-/* Return in *POLICY the scheduling policy of *ATTR.  */
-extern int pthread_attr_getschedpolicy (const pthread_attr_t *__restrict
-					__attr, int *__restrict __policy)
-     __THROW __nonnull ((1, 2));
-
-/* Set scheduling policy in *ATTR according to POLICY.  */
-extern int pthread_attr_setschedpolicy (pthread_attr_t *__attr, int __policy)
-     __THROW __nonnull ((1));
-
-/* Return in *INHERIT the scheduling inheritance mode of *ATTR.  */
-extern int pthread_attr_getinheritsched (const pthread_attr_t *__restrict
-					 __attr, int *__restrict __inherit)
-     __THROW __nonnull ((1, 2));
-
-/* Set scheduling inheritance mode in *ATTR according to INHERIT.  */
-extern int pthread_attr_setinheritsched (pthread_attr_t *__attr,
-					 int __inherit)
-     __THROW __nonnull ((1));
-
-
-/* Return in *SCOPE the scheduling contention scope of *ATTR.  */
-extern int pthread_attr_getscope (const pthread_attr_t *__restrict __attr,
-				  int *__restrict __scope)
-     __THROW __nonnull ((1, 2));
-
-/* Set scheduling contention scope in *ATTR according to SCOPE.  */
-extern int pthread_attr_setscope (pthread_attr_t *__attr, int __scope)
-     __THROW __nonnull ((1));
-
-/* Return the previously set address for the stack.  */
-extern int pthread_attr_getstackaddr (const pthread_attr_t *__restrict
-				      __attr, void **__restrict __stackaddr)
-     __THROW __nonnull ((1, 2)) __attribute_deprecated__;
-
-/* Set the starting address of the stack of the thread to be created.
-   Depending on whether the stack grows up or down the value must either
-   be higher or lower than all the address in the memory block.  The
-   minimal size of the block must be PTHREAD_STACK_MIN.  */
-extern int pthread_attr_setstackaddr (pthread_attr_t *__attr,
-				      void *__stackaddr)
-     __THROW __nonnull ((1)) __attribute_deprecated__;
-
-/* Return the currently used minimal stack size.  */
-extern int pthread_attr_getstacksize (const pthread_attr_t *__restrict
-				      __attr, size_t *__restrict __stacksize)
-     __THROW __nonnull ((1, 2));
-
-/* Add information about the minimum stack size needed for the thread
-   to be started.  This size must never be less than PTHREAD_STACK_MIN
-   and must also not exceed the system limits.  */
-extern int pthread_attr_setstacksize (pthread_attr_t *__attr,
-				      size_t __stacksize)
-     __THROW __nonnull ((1));
-
-#ifdef __USE_XOPEN2K
-/* Return the previously set address for the stack.  */
-extern int pthread_attr_getstack (const pthread_attr_t *__restrict __attr,
-				  void **__restrict __stackaddr,
-				  size_t *__restrict __stacksize)
-     __THROW __nonnull ((1, 2, 3));
-
-/* The following two interfaces are intended to replace the last two.  They
-   require setting the address as well as the size since only setting the
-   address will make the implementation on some architectures impossible.  */
-extern int pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr,
-				  size_t __stacksize) __THROW __nonnull ((1));
-#endif
-
-#ifdef __USE_GNU
-/* Thread created with attribute ATTR will be limited to run only on
-   the processors represented in CPUSET.  */
-extern int pthread_attr_setaffinity_np (pthread_attr_t *__attr,
-					size_t __cpusetsize,
-					const cpu_set_t *__cpuset)
-     __THROW __nonnull ((1, 3));
-
-/* Get bit set in CPUSET representing the processors threads created with
-   ATTR can run on.  */
-extern int pthread_attr_getaffinity_np (const pthread_attr_t *__attr,
-					size_t __cpusetsize,
-					cpu_set_t *__cpuset)
-     __THROW __nonnull ((1, 3));
-
-/* Get the default attributes used by pthread_create in this process.  */
-extern int pthread_getattr_default_np (pthread_attr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Set the default attributes to be used by pthread_create in this
-   process.  */
-extern int pthread_setattr_default_np (const pthread_attr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Initialize thread attribute *ATTR with attributes corresponding to the
-   already running thread TH.  It shall be called on uninitialized ATTR
-   and destroyed with pthread_attr_destroy when no longer needed.  */
-extern int pthread_getattr_np (pthread_t __th, pthread_attr_t *__attr)
-     __THROW __nonnull ((2));
-#endif
-
-
-/* Functions for scheduling control.  */
-
-/* Set the scheduling parameters for TARGET_THREAD according to POLICY
-   and *PARAM.  */
-extern int pthread_setschedparam (pthread_t __target_thread, int __policy,
-				  const struct sched_param *__param)
-     __THROW __nonnull ((3));
-
-/* Return in *POLICY and *PARAM the scheduling parameters for TARGET_THREAD. */
-extern int pthread_getschedparam (pthread_t __target_thread,
-				  int *__restrict __policy,
-				  struct sched_param *__restrict __param)
-     __THROW __nonnull ((2, 3));
-
-/* Set the scheduling priority for TARGET_THREAD.  */
-extern int pthread_setschedprio (pthread_t __target_thread, int __prio)
-     __THROW;
-
-
-#ifdef __USE_GNU
-/* Get thread name visible in the kernel and its interfaces.  */
-extern int pthread_getname_np (pthread_t __target_thread, char *__buf,
-			       size_t __buflen)
-     __THROW __nonnull ((2));
-
-/* Set thread name visible in the kernel and its interfaces.  */
-extern int pthread_setname_np (pthread_t __target_thread, const char *__name)
-     __THROW __nonnull ((2));
-#endif
-
-
-#ifdef __USE_UNIX98
-/* Determine level of concurrency.  */
-extern int pthread_getconcurrency (void) __THROW;
-
-/* Set new concurrency level to LEVEL.  */
-extern int pthread_setconcurrency (int __level) __THROW;
-#endif
-
-#ifdef __USE_GNU
-/* Yield the processor to another thread or process.
-   This function is similar to the POSIX `sched_yield' function but
-   might be differently implemented in the case of a m-on-n thread
-   implementation.  */
-extern int pthread_yield (void) __THROW;
-
-
-/* Limit specified thread TH to run only on the processors represented
-   in CPUSET.  */
-extern int pthread_setaffinity_np (pthread_t __th, size_t __cpusetsize,
-				   const cpu_set_t *__cpuset)
-     __THROW __nonnull ((3));
-
-/* Get bit set in CPUSET representing the processors TH can run on.  */
-extern int pthread_getaffinity_np (pthread_t __th, size_t __cpusetsize,
-				   cpu_set_t *__cpuset)
-     __THROW __nonnull ((3));
-#endif
-
-
-/* Functions for handling initialization.  */
-
-/* Guarantee that the initialization function INIT_ROUTINE will be called
-   only once, even if pthread_once is executed several times with the
-   same ONCE_CONTROL argument. ONCE_CONTROL must point to a static or
-   extern variable initialized to PTHREAD_ONCE_INIT.
-
-   The initialization functions might throw exception which is why
-   this function is not marked with __THROW.  */
-extern int pthread_once (pthread_once_t *__once_control,
-			 void (*__init_routine) (void)) __nonnull ((1, 2));
-
-
-/* Functions for handling cancellation.
-
-   Note that these functions are explicitly not marked to not throw an
-   exception in C++ code.  If cancellation is implemented by unwinding
-   this is necessary to have the compiler generate the unwind information.  */
-
-/* Set cancelability state of current thread to STATE, returning old
-   state in *OLDSTATE if OLDSTATE is not NULL.  */
-extern int pthread_setcancelstate (int __state, int *__oldstate);
-
-/* Set cancellation state of current thread to TYPE, returning the old
-   type in *OLDTYPE if OLDTYPE is not NULL.  */
-extern int pthread_setcanceltype (int __type, int *__oldtype);
-
-/* Cancel THREAD immediately or at the next possibility.  */
-extern int pthread_cancel (pthread_t __th);
-
-/* Test for pending cancellation for the current thread and terminate
-   the thread as per pthread_exit(PTHREAD_CANCELED) if it has been
-   cancelled.  */
-extern void pthread_testcancel (void);
-
-
-/* Cancellation handling with integration into exception handling.  */
-
-typedef struct
-{
-  struct
-  {
-    __jmp_buf __cancel_jmp_buf;
-    int __mask_was_saved;
-  } __cancel_jmp_buf[1];
-  void *__pad[4];
-} __pthread_unwind_buf_t __attribute__ ((__aligned__));
-
-/* No special attributes by default.  */
-#ifndef __cleanup_fct_attribute
-# define __cleanup_fct_attribute
-#endif
-
-
-/* Structure to hold the cleanup handler information.  */
-struct __pthread_cleanup_frame
-{
-  void (*__cancel_routine) (void *);
-  void *__cancel_arg;
-  int __do_it;
-  int __cancel_type;
-};
-
-#if defined __GNUC__ && defined __EXCEPTIONS
-# ifdef __cplusplus
-/* Class to handle cancellation handler invocation.  */
-class __pthread_cleanup_class
-{
-  void (*__cancel_routine) (void *);
-  void *__cancel_arg;
-  int __do_it;
-  int __cancel_type;
-
- public:
-  __pthread_cleanup_class (void (*__fct) (void *), void *__arg)
-    : __cancel_routine (__fct), __cancel_arg (__arg), __do_it (1) { }
-  ~__pthread_cleanup_class () { if (__do_it) __cancel_routine (__cancel_arg); }
-  void __setdoit (int __newval) { __do_it = __newval; }
-  void __defer () { pthread_setcanceltype (PTHREAD_CANCEL_DEFERRED,
-					   &__cancel_type); }
-  void __restore () const { pthread_setcanceltype (__cancel_type, 0); }
-};
-
-/* Install a cleanup handler: ROUTINE will be called with arguments ARG
-   when the thread is canceled or calls pthread_exit.  ROUTINE will also
-   be called with arguments ARG when the matching pthread_cleanup_pop
-   is executed with non-zero EXECUTE argument.
-
-   pthread_cleanup_push and pthread_cleanup_pop are macros and must always
-   be used in matching pairs at the same nesting level of braces.  */
-#  define pthread_cleanup_push(routine, arg) \
-  do {									      \
-    __pthread_cleanup_class __clframe (routine, arg)
-
-/* Remove a cleanup handler installed by the matching pthread_cleanup_push.
-   If EXECUTE is non-zero, the handler function is called. */
-#  define pthread_cleanup_pop(execute) \
-    __clframe.__setdoit (execute);					      \
-  } while (0)
-
-#  ifdef __USE_GNU
-/* Install a cleanup handler as pthread_cleanup_push does, but also
-   saves the current cancellation type and sets it to deferred
-   cancellation.  */
-#   define pthread_cleanup_push_defer_np(routine, arg) \
-  do {									      \
-    __pthread_cleanup_class __clframe (routine, arg);			      \
-    __clframe.__defer ()
-
-/* Remove a cleanup handler as pthread_cleanup_pop does, but also
-   restores the cancellation type that was in effect when the matching
-   pthread_cleanup_push_defer was called.  */
-#   define pthread_cleanup_pop_restore_np(execute) \
-    __clframe.__restore ();						      \
-    __clframe.__setdoit (execute);					      \
-  } while (0)
-#  endif
-# else
-/* Function called to call the cleanup handler.  As an extern inline
-   function the compiler is free to decide inlining the change when
-   needed or fall back on the copy which must exist somewhere
-   else.  */
-__extern_inline void
-__pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame)
-{
-  if (__frame->__do_it)
-    __frame->__cancel_routine (__frame->__cancel_arg);
-}
-
-/* Install a cleanup handler: ROUTINE will be called with arguments ARG
-   when the thread is canceled or calls pthread_exit.  ROUTINE will also
-   be called with arguments ARG when the matching pthread_cleanup_pop
-   is executed with non-zero EXECUTE argument.
-
-   pthread_cleanup_push and pthread_cleanup_pop are macros and must always
-   be used in matching pairs at the same nesting level of braces.  */
-#  define pthread_cleanup_push(routine, arg) \
-  do {									      \
-    struct __pthread_cleanup_frame __clframe				      \
-      __attribute__ ((__cleanup__ (__pthread_cleanup_routine)))		      \
-      = { .__cancel_routine = (routine), .__cancel_arg = (arg),	 	      \
-	  .__do_it = 1 };
-
-/* Remove a cleanup handler installed by the matching pthread_cleanup_push.
-   If EXECUTE is non-zero, the handler function is called. */
-#  define pthread_cleanup_pop(execute) \
-    __clframe.__do_it = (execute);					      \
-  } while (0)
-
-#  ifdef __USE_GNU
-/* Install a cleanup handler as pthread_cleanup_push does, but also
-   saves the current cancellation type and sets it to deferred
-   cancellation.  */
-#   define pthread_cleanup_push_defer_np(routine, arg) \
-  do {									      \
-    struct __pthread_cleanup_frame __clframe				      \
-      __attribute__ ((__cleanup__ (__pthread_cleanup_routine)))		      \
-      = { .__cancel_routine = (routine), .__cancel_arg = (arg),		      \
-	  .__do_it = 1 };						      \
-    (void) pthread_setcanceltype (PTHREAD_CANCEL_DEFERRED,		      \
-				  &__clframe.__cancel_type)
-
-/* Remove a cleanup handler as pthread_cleanup_pop does, but also
-   restores the cancellation type that was in effect when the matching
-   pthread_cleanup_push_defer was called.  */
-#   define pthread_cleanup_pop_restore_np(execute) \
-    (void) pthread_setcanceltype (__clframe.__cancel_type, NULL);	      \
-    __clframe.__do_it = (execute);					      \
-  } while (0)
-#  endif
-# endif
-#else
-/* Install a cleanup handler: ROUTINE will be called with arguments ARG
-   when the thread is canceled or calls pthread_exit.  ROUTINE will also
-   be called with arguments ARG when the matching pthread_cleanup_pop
-   is executed with non-zero EXECUTE argument.
-
-   pthread_cleanup_push and pthread_cleanup_pop are macros and must always
-   be used in matching pairs at the same nesting level of braces.  */
-# define pthread_cleanup_push(routine, arg) \
-  do {									      \
-    __pthread_unwind_buf_t __cancel_buf;				      \
-    void (*__cancel_routine) (void *) = (routine);			      \
-    void *__cancel_arg = (arg);						      \
-    int __not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *)     \
-					__cancel_buf.__cancel_jmp_buf, 0);    \
-    if (__glibc_unlikely (__not_first_call))				      \
-      {									      \
-	__cancel_routine (__cancel_arg);				      \
-	__pthread_unwind_next (&__cancel_buf);				      \
-	/* NOTREACHED */						      \
-      }									      \
-									      \
-    __pthread_register_cancel (&__cancel_buf);				      \
-    do {
-extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
-     __cleanup_fct_attribute;
-
-/* Remove a cleanup handler installed by the matching pthread_cleanup_push.
-   If EXECUTE is non-zero, the handler function is called. */
-# define pthread_cleanup_pop(execute) \
-      do { } while (0);/* Empty to allow label before pthread_cleanup_pop.  */\
-    } while (0);							      \
-    __pthread_unregister_cancel (&__cancel_buf);			      \
-    if (execute)							      \
-      __cancel_routine (__cancel_arg);					      \
-  } while (0)
-extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
-  __cleanup_fct_attribute;
-
-# ifdef __USE_GNU
-/* Install a cleanup handler as pthread_cleanup_push does, but also
-   saves the current cancellation type and sets it to deferred
-   cancellation.  */
-#  define pthread_cleanup_push_defer_np(routine, arg) \
-  do {									      \
-    __pthread_unwind_buf_t __cancel_buf;				      \
-    void (*__cancel_routine) (void *) = (routine);			      \
-    void *__cancel_arg = (arg);						      \
-    int __not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *)     \
-					__cancel_buf.__cancel_jmp_buf, 0);    \
-    if (__glibc_unlikely (__not_first_call))				      \
-      {									      \
-	__cancel_routine (__cancel_arg);				      \
-	__pthread_unwind_next (&__cancel_buf);				      \
-	/* NOTREACHED */						      \
-      }									      \
-									      \
-    __pthread_register_cancel_defer (&__cancel_buf);			      \
-    do {
-extern void __pthread_register_cancel_defer (__pthread_unwind_buf_t *__buf)
-     __cleanup_fct_attribute;
-
-/* Remove a cleanup handler as pthread_cleanup_pop does, but also
-   restores the cancellation type that was in effect when the matching
-   pthread_cleanup_push_defer was called.  */
-#  define pthread_cleanup_pop_restore_np(execute) \
-      do { } while (0);/* Empty to allow label before pthread_cleanup_pop.  */\
-    } while (0);							      \
-    __pthread_unregister_cancel_restore (&__cancel_buf);		      \
-    if (execute)							      \
-      __cancel_routine (__cancel_arg);					      \
-  } while (0)
-extern void __pthread_unregister_cancel_restore (__pthread_unwind_buf_t *__buf)
-  __cleanup_fct_attribute;
-# endif
-
-/* Internal interface to initiate cleanup.  */
-extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf)
-     __cleanup_fct_attribute __attribute__ ((__noreturn__))
-# ifndef SHARED
-     __attribute__ ((__weak__))
-# endif
-     ;
-#endif
-
-/* Function used in the macros.  */
-struct __jmp_buf_tag;
-extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __THROWNL;
-
-
-/* Mutex handling.  */
-
-/* Initialize a mutex.  */
-extern int pthread_mutex_init (pthread_mutex_t *__mutex,
-			       const pthread_mutexattr_t *__mutexattr)
-     __THROW __nonnull ((1));
-
-/* Destroy a mutex.  */
-extern int pthread_mutex_destroy (pthread_mutex_t *__mutex)
-     __THROW __nonnull ((1));
-
-/* Try locking a mutex.  */
-extern int pthread_mutex_trylock (pthread_mutex_t *__mutex)
-     __THROWNL __nonnull ((1));
-
-/* Lock a mutex.  */
-extern int pthread_mutex_lock (pthread_mutex_t *__mutex)
-     __THROWNL __nonnull ((1));
-
-#ifdef __USE_XOPEN2K
-/* Wait until lock becomes available, or specified time passes. */
-extern int pthread_mutex_timedlock (pthread_mutex_t *__restrict __mutex,
-				    const struct timespec *__restrict
-				    __abstime) __THROWNL __nonnull ((1, 2));
-#endif
-
-/* Unlock a mutex.  */
-extern int pthread_mutex_unlock (pthread_mutex_t *__mutex)
-     __THROWNL __nonnull ((1));
-
-
-/* Get the priority ceiling of MUTEX.  */
-extern int pthread_mutex_getprioceiling (const pthread_mutex_t *
-					 __restrict __mutex,
-					 int *__restrict __prioceiling)
-     __THROW __nonnull ((1, 2));
-
-/* Set the priority ceiling of MUTEX to PRIOCEILING, return old
-   priority ceiling value in *OLD_CEILING.  */
-extern int pthread_mutex_setprioceiling (pthread_mutex_t *__restrict __mutex,
-					 int __prioceiling,
-					 int *__restrict __old_ceiling)
-     __THROW __nonnull ((1, 3));
-
-
-#ifdef __USE_XOPEN2K8
-/* Declare the state protected by MUTEX as consistent.  */
-extern int pthread_mutex_consistent (pthread_mutex_t *__mutex)
-     __THROW __nonnull ((1));
-# ifdef __USE_GNU
-extern int pthread_mutex_consistent_np (pthread_mutex_t *__mutex)
-     __THROW __nonnull ((1));
-# endif
-#endif
-
-
-/* Functions for handling mutex attributes.  */
-
-/* Initialize mutex attribute object ATTR with default attributes
-   (kind is PTHREAD_MUTEX_TIMED_NP).  */
-extern int pthread_mutexattr_init (pthread_mutexattr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Destroy mutex attribute object ATTR.  */
-extern int pthread_mutexattr_destroy (pthread_mutexattr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Get the process-shared flag of the mutex attribute ATTR.  */
-extern int pthread_mutexattr_getpshared (const pthread_mutexattr_t *
-					 __restrict __attr,
-					 int *__restrict __pshared)
-     __THROW __nonnull ((1, 2));
-
-/* Set the process-shared flag of the mutex attribute ATTR.  */
-extern int pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr,
-					 int __pshared)
-     __THROW __nonnull ((1));
-
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
-/* Return in *KIND the mutex kind attribute in *ATTR.  */
-extern int pthread_mutexattr_gettype (const pthread_mutexattr_t *__restrict
-				      __attr, int *__restrict __kind)
-     __THROW __nonnull ((1, 2));
-
-/* Set the mutex kind attribute in *ATTR to KIND (either PTHREAD_MUTEX_NORMAL,
-   PTHREAD_MUTEX_RECURSIVE, PTHREAD_MUTEX_ERRORCHECK, or
-   PTHREAD_MUTEX_DEFAULT).  */
-extern int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind)
-     __THROW __nonnull ((1));
-#endif
-
-/* Return in *PROTOCOL the mutex protocol attribute in *ATTR.  */
-extern int pthread_mutexattr_getprotocol (const pthread_mutexattr_t *
-					  __restrict __attr,
-					  int *__restrict __protocol)
-     __THROW __nonnull ((1, 2));
-
-/* Set the mutex protocol attribute in *ATTR to PROTOCOL (either
-   PTHREAD_PRIO_NONE, PTHREAD_PRIO_INHERIT, or PTHREAD_PRIO_PROTECT).  */
-extern int pthread_mutexattr_setprotocol (pthread_mutexattr_t *__attr,
-					  int __protocol)
-     __THROW __nonnull ((1));
-
-/* Return in *PRIOCEILING the mutex prioceiling attribute in *ATTR.  */
-extern int pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *
-					     __restrict __attr,
-					     int *__restrict __prioceiling)
-     __THROW __nonnull ((1, 2));
-
-/* Set the mutex prioceiling attribute in *ATTR to PRIOCEILING.  */
-extern int pthread_mutexattr_setprioceiling (pthread_mutexattr_t *__attr,
-					     int __prioceiling)
-     __THROW __nonnull ((1));
-
-#ifdef __USE_XOPEN2K
-/* Get the robustness flag of the mutex attribute ATTR.  */
-extern int pthread_mutexattr_getrobust (const pthread_mutexattr_t *__attr,
-					int *__robustness)
-     __THROW __nonnull ((1, 2));
-# ifdef __USE_GNU
-extern int pthread_mutexattr_getrobust_np (const pthread_mutexattr_t *__attr,
-					   int *__robustness)
-     __THROW __nonnull ((1, 2));
-# endif
-
-/* Set the robustness flag of the mutex attribute ATTR.  */
-extern int pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr,
-					int __robustness)
-     __THROW __nonnull ((1));
-# ifdef __USE_GNU
-extern int pthread_mutexattr_setrobust_np (pthread_mutexattr_t *__attr,
-					   int __robustness)
-     __THROW __nonnull ((1));
-# endif
-#endif
-
-
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-/* Functions for handling read-write locks.  */
-
-/* Initialize read-write lock RWLOCK using attributes ATTR, or use
-   the default values if later is NULL.  */
-extern int pthread_rwlock_init (pthread_rwlock_t *__restrict __rwlock,
-				const pthread_rwlockattr_t *__restrict
-				__attr) __THROW __nonnull ((1));
-
-/* Destroy read-write lock RWLOCK.  */
-extern int pthread_rwlock_destroy (pthread_rwlock_t *__rwlock)
-     __THROW __nonnull ((1));
-
-/* Acquire read lock for RWLOCK.  */
-extern int pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock)
-     __THROWNL __nonnull ((1));
-
-/* Try to acquire read lock for RWLOCK.  */
-extern int pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock)
-  __THROWNL __nonnull ((1));
-
-# ifdef __USE_XOPEN2K
-/* Try to acquire read lock for RWLOCK or return after specfied time.  */
-extern int pthread_rwlock_timedrdlock (pthread_rwlock_t *__restrict __rwlock,
-				       const struct timespec *__restrict
-				       __abstime) __THROWNL __nonnull ((1, 2));
-# endif
-
-/* Acquire write lock for RWLOCK.  */
-extern int pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock)
-     __THROWNL __nonnull ((1));
-
-/* Try to acquire write lock for RWLOCK.  */
-extern int pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock)
-     __THROWNL __nonnull ((1));
-
-# ifdef __USE_XOPEN2K
-/* Try to acquire write lock for RWLOCK or return after specfied time.  */
-extern int pthread_rwlock_timedwrlock (pthread_rwlock_t *__restrict __rwlock,
-				       const struct timespec *__restrict
-				       __abstime) __THROWNL __nonnull ((1, 2));
-# endif
-
-/* Unlock RWLOCK.  */
-extern int pthread_rwlock_unlock (pthread_rwlock_t *__rwlock)
-     __THROWNL __nonnull ((1));
-
-
-/* Functions for handling read-write lock attributes.  */
-
-/* Initialize attribute object ATTR with default values.  */
-extern int pthread_rwlockattr_init (pthread_rwlockattr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Destroy attribute object ATTR.  */
-extern int pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Return current setting of process-shared attribute of ATTR in PSHARED.  */
-extern int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *
-					  __restrict __attr,
-					  int *__restrict __pshared)
-     __THROW __nonnull ((1, 2));
-
-/* Set process-shared attribute of ATTR to PSHARED.  */
-extern int pthread_rwlockattr_setpshared (pthread_rwlockattr_t *__attr,
-					  int __pshared)
-     __THROW __nonnull ((1));
-
-/* Return current setting of reader/writer preference.  */
-extern int pthread_rwlockattr_getkind_np (const pthread_rwlockattr_t *
-					  __restrict __attr,
-					  int *__restrict __pref)
-     __THROW __nonnull ((1, 2));
-
-/* Set reader/write preference.  */
-extern int pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *__attr,
-					  int __pref) __THROW __nonnull ((1));
-#endif
-
-
-/* Functions for handling conditional variables.  */
-
-/* Initialize condition variable COND using attributes ATTR, or use
-   the default values if later is NULL.  */
-extern int pthread_cond_init (pthread_cond_t *__restrict __cond,
-			      const pthread_condattr_t *__restrict __cond_attr)
-     __THROW __nonnull ((1));
-
-/* Destroy condition variable COND.  */
-extern int pthread_cond_destroy (pthread_cond_t *__cond)
-     __THROW __nonnull ((1));
-
-/* Wake up one thread waiting for condition variable COND.  */
-extern int pthread_cond_signal (pthread_cond_t *__cond)
-     __THROWNL __nonnull ((1));
-
-/* Wake up all threads waiting for condition variables COND.  */
-extern int pthread_cond_broadcast (pthread_cond_t *__cond)
-     __THROWNL __nonnull ((1));
-
-/* Wait for condition variable COND to be signaled or broadcast.
-   MUTEX is assumed to be locked before.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int pthread_cond_wait (pthread_cond_t *__restrict __cond,
-			      pthread_mutex_t *__restrict __mutex)
-     __nonnull ((1, 2));
-
-/* Wait for condition variable COND to be signaled or broadcast until
-   ABSTIME.  MUTEX is assumed to be locked before.  ABSTIME is an
-   absolute time specification; zero is the beginning of the epoch
-   (00:00:00 GMT, January 1, 1970).
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond,
-				   pthread_mutex_t *__restrict __mutex,
-				   const struct timespec *__restrict __abstime)
-     __nonnull ((1, 2, 3));
-
-/* Functions for handling condition variable attributes.  */
-
-/* Initialize condition variable attribute ATTR.  */
-extern int pthread_condattr_init (pthread_condattr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Destroy condition variable attribute ATTR.  */
-extern int pthread_condattr_destroy (pthread_condattr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Get the process-shared flag of the condition variable attribute ATTR.  */
-extern int pthread_condattr_getpshared (const pthread_condattr_t *
-					__restrict __attr,
-					int *__restrict __pshared)
-     __THROW __nonnull ((1, 2));
-
-/* Set the process-shared flag of the condition variable attribute ATTR.  */
-extern int pthread_condattr_setpshared (pthread_condattr_t *__attr,
-					int __pshared) __THROW __nonnull ((1));
-
-#ifdef __USE_XOPEN2K
-/* Get the clock selected for the condition variable attribute ATTR.  */
-extern int pthread_condattr_getclock (const pthread_condattr_t *
-				      __restrict __attr,
-				      __clockid_t *__restrict __clock_id)
-     __THROW __nonnull ((1, 2));
-
-/* Set the clock selected for the condition variable attribute ATTR.  */
-extern int pthread_condattr_setclock (pthread_condattr_t *__attr,
-				      __clockid_t __clock_id)
-     __THROW __nonnull ((1));
-#endif
-
-
-#ifdef __USE_XOPEN2K
-/* Functions to handle spinlocks.  */
-
-/* Initialize the spinlock LOCK.  If PSHARED is nonzero the spinlock can
-   be shared between different processes.  */
-extern int pthread_spin_init (pthread_spinlock_t *__lock, int __pshared)
-     __THROW __nonnull ((1));
-
-/* Destroy the spinlock LOCK.  */
-extern int pthread_spin_destroy (pthread_spinlock_t *__lock)
-     __THROW __nonnull ((1));
-
-/* Wait until spinlock LOCK is retrieved.  */
-extern int pthread_spin_lock (pthread_spinlock_t *__lock)
-     __THROWNL __nonnull ((1));
-
-/* Try to lock spinlock LOCK.  */
-extern int pthread_spin_trylock (pthread_spinlock_t *__lock)
-     __THROWNL __nonnull ((1));
-
-/* Release spinlock LOCK.  */
-extern int pthread_spin_unlock (pthread_spinlock_t *__lock)
-     __THROWNL __nonnull ((1));
-
-
-/* Functions to handle barriers.  */
-
-/* Initialize BARRIER with the attributes in ATTR.  The barrier is
-   opened when COUNT waiters arrived.  */
-extern int pthread_barrier_init (pthread_barrier_t *__restrict __barrier,
-				 const pthread_barrierattr_t *__restrict
-				 __attr, unsigned int __count)
-     __THROW __nonnull ((1));
-
-/* Destroy a previously dynamically initialized barrier BARRIER.  */
-extern int pthread_barrier_destroy (pthread_barrier_t *__barrier)
-     __THROW __nonnull ((1));
-
-/* Wait on barrier BARRIER.  */
-extern int pthread_barrier_wait (pthread_barrier_t *__barrier)
-     __THROWNL __nonnull ((1));
-
-
-/* Initialize barrier attribute ATTR.  */
-extern int pthread_barrierattr_init (pthread_barrierattr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Destroy previously dynamically initialized barrier attribute ATTR.  */
-extern int pthread_barrierattr_destroy (pthread_barrierattr_t *__attr)
-     __THROW __nonnull ((1));
-
-/* Get the process-shared flag of the barrier attribute ATTR.  */
-extern int pthread_barrierattr_getpshared (const pthread_barrierattr_t *
-					   __restrict __attr,
-					   int *__restrict __pshared)
-     __THROW __nonnull ((1, 2));
-
-/* Set the process-shared flag of the barrier attribute ATTR.  */
-extern int pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr,
-					   int __pshared)
-     __THROW __nonnull ((1));
-#endif
-
-
-/* Functions for handling thread-specific data.  */
-
-/* Create a key value identifying a location in the thread-specific
-   data area.  Each thread maintains a distinct thread-specific data
-   area.  DESTR_FUNCTION, if non-NULL, is called with the value
-   associated to that key when the key is destroyed.
-   DESTR_FUNCTION is not called if the value associated is NULL when
-   the key is destroyed.  */
-extern int pthread_key_create (pthread_key_t *__key,
-			       void (*__destr_function) (void *))
-     __THROW __nonnull ((1));
-
-/* Destroy KEY.  */
-extern int pthread_key_delete (pthread_key_t __key) __THROW;
-
-/* Return current value of the thread-specific data slot identified by KEY.  */
-extern void *pthread_getspecific (pthread_key_t __key) __THROW;
-
-/* Store POINTER in the thread-specific data slot identified by KEY. */
-extern int pthread_setspecific (pthread_key_t __key,
-				const void *__pointer) __THROW ;
-
-
-#ifdef __USE_XOPEN2K
-/* Get ID of CPU-time clock for thread THREAD_ID.  */
-extern int pthread_getcpuclockid (pthread_t __thread_id,
-				  __clockid_t *__clock_id)
-     __THROW __nonnull ((2));
-#endif
-
-
-/* Install handlers to be called when a new process is created with FORK.
-   The PREPARE handler is called in the parent process just before performing
-   FORK. The PARENT handler is called in the parent process just after FORK.
-   The CHILD handler is called in the child process.  Each of the three
-   handlers can be NULL, meaning that no handler needs to be called at that
-   point.
-   PTHREAD_ATFORK can be called several times, in which case the PREPARE
-   handlers are called in LIFO order (last added with PTHREAD_ATFORK,
-   first called before FORK), and the PARENT and CHILD handlers are called
-   in FIFO (first added, first called).  */
-
-extern int pthread_atfork (void (*__prepare) (void),
-			   void (*__parent) (void),
-			   void (*__child) (void)) __THROW;
-
-
-#ifdef __USE_EXTERN_INLINES
-/* Optimizations.  */
-__extern_inline int
-__NTH (pthread_equal (pthread_t __thread1, pthread_t __thread2))
-{
-  return __thread1 == __thread2;
-}
-#endif
-
-__END_DECLS
-
-#endif	/* pthread.h */
diff --git a/openflow/usr/include/pty.h b/openflow/usr/include/pty.h
deleted file mode 100644
index e466144..0000000
--- a/openflow/usr/include/pty.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Functions for pseudo TTY handling.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _PTY_H
-#define _PTY_H	1
-
-#include <features.h>
-
-struct termios;
-struct winsize;
-
-#include <termios.h>
-#include <sys/ioctl.h>
-
-
-__BEGIN_DECLS
-
-/* Create pseudo tty master slave pair with NAME and set terminal
-   attributes according to TERMP and WINP and return handles for both
-   ends in AMASTER and ASLAVE.  */
-extern int openpty (int *__amaster, int *__aslave, char *__name,
-		    const struct termios *__termp,
-		    const struct winsize *__winp) __THROW;
-
-/* Create child process and establish the slave pseudo terminal as the
-   child's controlling terminal.  */
-extern int forkpty (int *__amaster, char *__name,
-		    const struct termios *__termp,
-		    const struct winsize *__winp) __THROW;
-
-__END_DECLS
-
-#endif	/* pty.h */
diff --git a/openflow/usr/include/pwd.h b/openflow/usr/include/pwd.h
deleted file mode 100644
index 07455e7..0000000
--- a/openflow/usr/include/pwd.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 9.2.2 User Database Access	<pwd.h>
- */
-
-#ifndef	_PWD_H
-#define	_PWD_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#include <bits/types.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-#if defined __USE_XOPEN || defined __USE_XOPEN2K
-/* The Single Unix specification says that some more types are
-   available here.  */
-# ifndef __gid_t_defined
-typedef __gid_t gid_t;
-#  define __gid_t_defined
-# endif
-
-# ifndef __uid_t_defined
-typedef __uid_t uid_t;
-#  define __uid_t_defined
-# endif
-#endif
-
-/* The passwd structure.  */
-struct passwd
-{
-  char *pw_name;		/* Username.  */
-  char *pw_passwd;		/* Password.  */
-  __uid_t pw_uid;		/* User ID.  */
-  __gid_t pw_gid;		/* Group ID.  */
-  char *pw_gecos;		/* Real name.  */
-  char *pw_dir;			/* Home directory.  */
-  char *pw_shell;		/* Shell program.  */
-};
-
-
-#ifdef __USE_MISC
-# define __need_FILE
-# include <stdio.h>
-#endif
-
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-/* Rewind the password-file stream.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void setpwent (void);
-
-/* Close the password-file stream.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void endpwent (void);
-
-/* Read an entry from the password-file stream, opening it if necessary.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct passwd *getpwent (void);
-#endif
-
-#ifdef	__USE_MISC
-/* Read an entry from STREAM.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct passwd *fgetpwent (FILE *__stream) __nonnull ((1));
-
-/* Write the given entry onto the given stream.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int putpwent (const struct passwd *__restrict __p,
-		     FILE *__restrict __f);
-#endif
-
-/* Search for an entry with a matching user ID.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct passwd *getpwuid (__uid_t __uid);
-
-/* Search for an entry with a matching username.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct passwd *getpwnam (const char *__name) __nonnull ((1));
-
-#ifdef __USE_POSIX
-
-# ifdef __USE_MISC
-/* Reasonable value for the buffer sized used in the reentrant
-   functions below.  But better use `sysconf'.  */
-#  define NSS_BUFLEN_PASSWD	1024
-# endif
-
-/* Reentrant versions of some of the functions above.
-
-   PLEASE NOTE: the `getpwent_r' function is not (yet) standardized.
-   The interface may change in later versions of this library.  But
-   the interface is designed following the principals used for the
-   other reentrant functions so the chances are good this is what the
-   POSIX people would choose.  */
-
-# ifdef __USE_MISC
-/* This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int getpwent_r (struct passwd *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct passwd **__restrict __result)
-		       __nonnull ((1, 2, 4));
-# endif
-
-extern int getpwuid_r (__uid_t __uid,
-		       struct passwd *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct passwd **__restrict __result)
-		       __nonnull ((2, 3, 5));
-
-extern int getpwnam_r (const char *__restrict __name,
-		       struct passwd *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct passwd **__restrict __result)
-		       __nonnull ((1, 2, 3, 5));
-
-
-# ifdef	__USE_MISC
-/* Read an entry from STREAM.  This function is not standardized and
-   probably never will.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int fgetpwent_r (FILE *__restrict __stream,
-			struct passwd *__restrict __resultbuf,
-			char *__restrict __buffer, size_t __buflen,
-			struct passwd **__restrict __result)
-			__nonnull ((1, 2, 3, 5));
-# endif
-
-#endif	/* POSIX or reentrant */
-
-#ifdef __USE_GNU
-/* Re-construct the password-file line for the given uid
-   in the given buffer.  This knows the format that the caller
-   will expect, but this need not be the format of the password file.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int getpw (__uid_t __uid, char *__buffer);
-#endif
-
-__END_DECLS
-
-#endif /* pwd.h  */
diff --git a/openflow/usr/include/python3.5 b/openflow/usr/include/python3.5
deleted file mode 120000
index 77ba379..0000000
--- a/openflow/usr/include/python3.5
+++ /dev/null
@@ -1 +0,0 @@
-python3.5m
\ No newline at end of file
diff --git a/openflow/usr/include/python3.5m/Python-ast.h b/openflow/usr/include/python3.5m/Python-ast.h
deleted file mode 100644
index 2d3eacb..0000000
--- a/openflow/usr/include/python3.5m/Python-ast.h
+++ /dev/null
@@ -1,601 +0,0 @@
-/* File automatically generated by Parser/asdl_c.py. */
-
-#include "asdl.h"
-
-typedef struct _mod *mod_ty;
-
-typedef struct _stmt *stmt_ty;
-
-typedef struct _expr *expr_ty;
-
-typedef enum _expr_context { Load=1, Store=2, Del=3, AugLoad=4, AugStore=5,
-                             Param=6 } expr_context_ty;
-
-typedef struct _slice *slice_ty;
-
-typedef enum _boolop { And=1, Or=2 } boolop_ty;
-
-typedef enum _operator { Add=1, Sub=2, Mult=3, MatMult=4, Div=5, Mod=6, Pow=7,
-                         LShift=8, RShift=9, BitOr=10, BitXor=11, BitAnd=12,
-                         FloorDiv=13 } operator_ty;
-
-typedef enum _unaryop { Invert=1, Not=2, UAdd=3, USub=4 } unaryop_ty;
-
-typedef enum _cmpop { Eq=1, NotEq=2, Lt=3, LtE=4, Gt=5, GtE=6, Is=7, IsNot=8,
-                      In=9, NotIn=10 } cmpop_ty;
-
-typedef struct _comprehension *comprehension_ty;
-
-typedef struct _excepthandler *excepthandler_ty;
-
-typedef struct _arguments *arguments_ty;
-
-typedef struct _arg *arg_ty;
-
-typedef struct _keyword *keyword_ty;
-
-typedef struct _alias *alias_ty;
-
-typedef struct _withitem *withitem_ty;
-
-
-enum _mod_kind {Module_kind=1, Interactive_kind=2, Expression_kind=3,
-                 Suite_kind=4};
-struct _mod {
-    enum _mod_kind kind;
-    union {
-        struct {
-            asdl_seq *body;
-        } Module;
-        
-        struct {
-            asdl_seq *body;
-        } Interactive;
-        
-        struct {
-            expr_ty body;
-        } Expression;
-        
-        struct {
-            asdl_seq *body;
-        } Suite;
-        
-    } v;
-};
-
-enum _stmt_kind {FunctionDef_kind=1, AsyncFunctionDef_kind=2, ClassDef_kind=3,
-                  Return_kind=4, Delete_kind=5, Assign_kind=6,
-                  AugAssign_kind=7, For_kind=8, AsyncFor_kind=9, While_kind=10,
-                  If_kind=11, With_kind=12, AsyncWith_kind=13, Raise_kind=14,
-                  Try_kind=15, Assert_kind=16, Import_kind=17,
-                  ImportFrom_kind=18, Global_kind=19, Nonlocal_kind=20,
-                  Expr_kind=21, Pass_kind=22, Break_kind=23, Continue_kind=24};
-struct _stmt {
-    enum _stmt_kind kind;
-    union {
-        struct {
-            identifier name;
-            arguments_ty args;
-            asdl_seq *body;
-            asdl_seq *decorator_list;
-            expr_ty returns;
-        } FunctionDef;
-        
-        struct {
-            identifier name;
-            arguments_ty args;
-            asdl_seq *body;
-            asdl_seq *decorator_list;
-            expr_ty returns;
-        } AsyncFunctionDef;
-        
-        struct {
-            identifier name;
-            asdl_seq *bases;
-            asdl_seq *keywords;
-            asdl_seq *body;
-            asdl_seq *decorator_list;
-        } ClassDef;
-        
-        struct {
-            expr_ty value;
-        } Return;
-        
-        struct {
-            asdl_seq *targets;
-        } Delete;
-        
-        struct {
-            asdl_seq *targets;
-            expr_ty value;
-        } Assign;
-        
-        struct {
-            expr_ty target;
-            operator_ty op;
-            expr_ty value;
-        } AugAssign;
-        
-        struct {
-            expr_ty target;
-            expr_ty iter;
-            asdl_seq *body;
-            asdl_seq *orelse;
-        } For;
-        
-        struct {
-            expr_ty target;
-            expr_ty iter;
-            asdl_seq *body;
-            asdl_seq *orelse;
-        } AsyncFor;
-        
-        struct {
-            expr_ty test;
-            asdl_seq *body;
-            asdl_seq *orelse;
-        } While;
-        
-        struct {
-            expr_ty test;
-            asdl_seq *body;
-            asdl_seq *orelse;
-        } If;
-        
-        struct {
-            asdl_seq *items;
-            asdl_seq *body;
-        } With;
-        
-        struct {
-            asdl_seq *items;
-            asdl_seq *body;
-        } AsyncWith;
-        
-        struct {
-            expr_ty exc;
-            expr_ty cause;
-        } Raise;
-        
-        struct {
-            asdl_seq *body;
-            asdl_seq *handlers;
-            asdl_seq *orelse;
-            asdl_seq *finalbody;
-        } Try;
-        
-        struct {
-            expr_ty test;
-            expr_ty msg;
-        } Assert;
-        
-        struct {
-            asdl_seq *names;
-        } Import;
-        
-        struct {
-            identifier module;
-            asdl_seq *names;
-            int level;
-        } ImportFrom;
-        
-        struct {
-            asdl_seq *names;
-        } Global;
-        
-        struct {
-            asdl_seq *names;
-        } Nonlocal;
-        
-        struct {
-            expr_ty value;
-        } Expr;
-        
-    } v;
-    int lineno;
-    int col_offset;
-};
-
-enum _expr_kind {BoolOp_kind=1, BinOp_kind=2, UnaryOp_kind=3, Lambda_kind=4,
-                  IfExp_kind=5, Dict_kind=6, Set_kind=7, ListComp_kind=8,
-                  SetComp_kind=9, DictComp_kind=10, GeneratorExp_kind=11,
-                  Await_kind=12, Yield_kind=13, YieldFrom_kind=14,
-                  Compare_kind=15, Call_kind=16, Num_kind=17, Str_kind=18,
-                  Bytes_kind=19, NameConstant_kind=20, Ellipsis_kind=21,
-                  Attribute_kind=22, Subscript_kind=23, Starred_kind=24,
-                  Name_kind=25, List_kind=26, Tuple_kind=27};
-struct _expr {
-    enum _expr_kind kind;
-    union {
-        struct {
-            boolop_ty op;
-            asdl_seq *values;
-        } BoolOp;
-        
-        struct {
-            expr_ty left;
-            operator_ty op;
-            expr_ty right;
-        } BinOp;
-        
-        struct {
-            unaryop_ty op;
-            expr_ty operand;
-        } UnaryOp;
-        
-        struct {
-            arguments_ty args;
-            expr_ty body;
-        } Lambda;
-        
-        struct {
-            expr_ty test;
-            expr_ty body;
-            expr_ty orelse;
-        } IfExp;
-        
-        struct {
-            asdl_seq *keys;
-            asdl_seq *values;
-        } Dict;
-        
-        struct {
-            asdl_seq *elts;
-        } Set;
-        
-        struct {
-            expr_ty elt;
-            asdl_seq *generators;
-        } ListComp;
-        
-        struct {
-            expr_ty elt;
-            asdl_seq *generators;
-        } SetComp;
-        
-        struct {
-            expr_ty key;
-            expr_ty value;
-            asdl_seq *generators;
-        } DictComp;
-        
-        struct {
-            expr_ty elt;
-            asdl_seq *generators;
-        } GeneratorExp;
-        
-        struct {
-            expr_ty value;
-        } Await;
-        
-        struct {
-            expr_ty value;
-        } Yield;
-        
-        struct {
-            expr_ty value;
-        } YieldFrom;
-        
-        struct {
-            expr_ty left;
-            asdl_int_seq *ops;
-            asdl_seq *comparators;
-        } Compare;
-        
-        struct {
-            expr_ty func;
-            asdl_seq *args;
-            asdl_seq *keywords;
-        } Call;
-        
-        struct {
-            object n;
-        } Num;
-        
-        struct {
-            string s;
-        } Str;
-        
-        struct {
-            bytes s;
-        } Bytes;
-        
-        struct {
-            singleton value;
-        } NameConstant;
-        
-        struct {
-            expr_ty value;
-            identifier attr;
-            expr_context_ty ctx;
-        } Attribute;
-        
-        struct {
-            expr_ty value;
-            slice_ty slice;
-            expr_context_ty ctx;
-        } Subscript;
-        
-        struct {
-            expr_ty value;
-            expr_context_ty ctx;
-        } Starred;
-        
-        struct {
-            identifier id;
-            expr_context_ty ctx;
-        } Name;
-        
-        struct {
-            asdl_seq *elts;
-            expr_context_ty ctx;
-        } List;
-        
-        struct {
-            asdl_seq *elts;
-            expr_context_ty ctx;
-        } Tuple;
-        
-    } v;
-    int lineno;
-    int col_offset;
-};
-
-enum _slice_kind {Slice_kind=1, ExtSlice_kind=2, Index_kind=3};
-struct _slice {
-    enum _slice_kind kind;
-    union {
-        struct {
-            expr_ty lower;
-            expr_ty upper;
-            expr_ty step;
-        } Slice;
-        
-        struct {
-            asdl_seq *dims;
-        } ExtSlice;
-        
-        struct {
-            expr_ty value;
-        } Index;
-        
-    } v;
-};
-
-struct _comprehension {
-    expr_ty target;
-    expr_ty iter;
-    asdl_seq *ifs;
-};
-
-enum _excepthandler_kind {ExceptHandler_kind=1};
-struct _excepthandler {
-    enum _excepthandler_kind kind;
-    union {
-        struct {
-            expr_ty type;
-            identifier name;
-            asdl_seq *body;
-        } ExceptHandler;
-        
-    } v;
-    int lineno;
-    int col_offset;
-};
-
-struct _arguments {
-    asdl_seq *args;
-    arg_ty vararg;
-    asdl_seq *kwonlyargs;
-    asdl_seq *kw_defaults;
-    arg_ty kwarg;
-    asdl_seq *defaults;
-};
-
-struct _arg {
-    identifier arg;
-    expr_ty annotation;
-    int lineno;
-    int col_offset;
-};
-
-struct _keyword {
-    identifier arg;
-    expr_ty value;
-};
-
-struct _alias {
-    identifier name;
-    identifier asname;
-};
-
-struct _withitem {
-    expr_ty context_expr;
-    expr_ty optional_vars;
-};
-
-
-#define Module(a0, a1) _Py_Module(a0, a1)
-mod_ty _Py_Module(asdl_seq * body, PyArena *arena);
-#define Interactive(a0, a1) _Py_Interactive(a0, a1)
-mod_ty _Py_Interactive(asdl_seq * body, PyArena *arena);
-#define Expression(a0, a1) _Py_Expression(a0, a1)
-mod_ty _Py_Expression(expr_ty body, PyArena *arena);
-#define Suite(a0, a1) _Py_Suite(a0, a1)
-mod_ty _Py_Suite(asdl_seq * body, PyArena *arena);
-#define FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_FunctionDef(identifier name, arguments_ty args, asdl_seq * body,
-                        asdl_seq * decorator_list, expr_ty returns, int lineno,
-                        int col_offset, PyArena *arena);
-#define AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7) _Py_AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_AsyncFunctionDef(identifier name, arguments_ty args, asdl_seq *
-                             body, asdl_seq * decorator_list, expr_ty returns,
-                             int lineno, int col_offset, PyArena *arena);
-#define ClassDef(a0, a1, a2, a3, a4, a5, a6, a7) _Py_ClassDef(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_ClassDef(identifier name, asdl_seq * bases, asdl_seq * keywords,
-                     asdl_seq * body, asdl_seq * decorator_list, int lineno,
-                     int col_offset, PyArena *arena);
-#define Return(a0, a1, a2, a3) _Py_Return(a0, a1, a2, a3)
-stmt_ty _Py_Return(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define Delete(a0, a1, a2, a3) _Py_Delete(a0, a1, a2, a3)
-stmt_ty _Py_Delete(asdl_seq * targets, int lineno, int col_offset, PyArena
-                   *arena);
-#define Assign(a0, a1, a2, a3, a4) _Py_Assign(a0, a1, a2, a3, a4)
-stmt_ty _Py_Assign(asdl_seq * targets, expr_ty value, int lineno, int
-                   col_offset, PyArena *arena);
-#define AugAssign(a0, a1, a2, a3, a4, a5) _Py_AugAssign(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_AugAssign(expr_ty target, operator_ty op, expr_ty value, int
-                      lineno, int col_offset, PyArena *arena);
-#define For(a0, a1, a2, a3, a4, a5, a6) _Py_For(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq *
-                orelse, int lineno, int col_offset, PyArena *arena);
-#define AsyncFor(a0, a1, a2, a3, a4, a5, a6) _Py_AsyncFor(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_AsyncFor(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq *
-                     orelse, int lineno, int col_offset, PyArena *arena);
-#define While(a0, a1, a2, a3, a4, a5) _Py_While(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
-                  int col_offset, PyArena *arena);
-#define If(a0, a1, a2, a3, a4, a5) _Py_If(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
-               int col_offset, PyArena *arena);
-#define With(a0, a1, a2, a3, a4) _Py_With(a0, a1, a2, a3, a4)
-stmt_ty _Py_With(asdl_seq * items, asdl_seq * body, int lineno, int col_offset,
-                 PyArena *arena);
-#define AsyncWith(a0, a1, a2, a3, a4) _Py_AsyncWith(a0, a1, a2, a3, a4)
-stmt_ty _Py_AsyncWith(asdl_seq * items, asdl_seq * body, int lineno, int
-                      col_offset, PyArena *arena);
-#define Raise(a0, a1, a2, a3, a4) _Py_Raise(a0, a1, a2, a3, a4)
-stmt_ty _Py_Raise(expr_ty exc, expr_ty cause, int lineno, int col_offset,
-                  PyArena *arena);
-#define Try(a0, a1, a2, a3, a4, a5, a6) _Py_Try(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_Try(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse,
-                asdl_seq * finalbody, int lineno, int col_offset, PyArena
-                *arena);
-#define Assert(a0, a1, a2, a3, a4) _Py_Assert(a0, a1, a2, a3, a4)
-stmt_ty _Py_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset,
-                   PyArena *arena);
-#define Import(a0, a1, a2, a3) _Py_Import(a0, a1, a2, a3)
-stmt_ty _Py_Import(asdl_seq * names, int lineno, int col_offset, PyArena
-                   *arena);
-#define ImportFrom(a0, a1, a2, a3, a4, a5) _Py_ImportFrom(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_ImportFrom(identifier module, asdl_seq * names, int level, int
-                       lineno, int col_offset, PyArena *arena);
-#define Global(a0, a1, a2, a3) _Py_Global(a0, a1, a2, a3)
-stmt_ty _Py_Global(asdl_seq * names, int lineno, int col_offset, PyArena
-                   *arena);
-#define Nonlocal(a0, a1, a2, a3) _Py_Nonlocal(a0, a1, a2, a3)
-stmt_ty _Py_Nonlocal(asdl_seq * names, int lineno, int col_offset, PyArena
-                     *arena);
-#define Expr(a0, a1, a2, a3) _Py_Expr(a0, a1, a2, a3)
-stmt_ty _Py_Expr(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define Pass(a0, a1, a2) _Py_Pass(a0, a1, a2)
-stmt_ty _Py_Pass(int lineno, int col_offset, PyArena *arena);
-#define Break(a0, a1, a2) _Py_Break(a0, a1, a2)
-stmt_ty _Py_Break(int lineno, int col_offset, PyArena *arena);
-#define Continue(a0, a1, a2) _Py_Continue(a0, a1, a2)
-stmt_ty _Py_Continue(int lineno, int col_offset, PyArena *arena);
-#define BoolOp(a0, a1, a2, a3, a4) _Py_BoolOp(a0, a1, a2, a3, a4)
-expr_ty _Py_BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset,
-                   PyArena *arena);
-#define BinOp(a0, a1, a2, a3, a4, a5) _Py_BinOp(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int
-                  col_offset, PyArena *arena);
-#define UnaryOp(a0, a1, a2, a3, a4) _Py_UnaryOp(a0, a1, a2, a3, a4)
-expr_ty _Py_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset,
-                    PyArena *arena);
-#define Lambda(a0, a1, a2, a3, a4) _Py_Lambda(a0, a1, a2, a3, a4)
-expr_ty _Py_Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset,
-                   PyArena *arena);
-#define IfExp(a0, a1, a2, a3, a4, a5) _Py_IfExp(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int
-                  col_offset, PyArena *arena);
-#define Dict(a0, a1, a2, a3, a4) _Py_Dict(a0, a1, a2, a3, a4)
-expr_ty _Py_Dict(asdl_seq * keys, asdl_seq * values, int lineno, int
-                 col_offset, PyArena *arena);
-#define Set(a0, a1, a2, a3) _Py_Set(a0, a1, a2, a3)
-expr_ty _Py_Set(asdl_seq * elts, int lineno, int col_offset, PyArena *arena);
-#define ListComp(a0, a1, a2, a3, a4) _Py_ListComp(a0, a1, a2, a3, a4)
-expr_ty _Py_ListComp(expr_ty elt, asdl_seq * generators, int lineno, int
-                     col_offset, PyArena *arena);
-#define SetComp(a0, a1, a2, a3, a4) _Py_SetComp(a0, a1, a2, a3, a4)
-expr_ty _Py_SetComp(expr_ty elt, asdl_seq * generators, int lineno, int
-                    col_offset, PyArena *arena);
-#define DictComp(a0, a1, a2, a3, a4, a5) _Py_DictComp(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_DictComp(expr_ty key, expr_ty value, asdl_seq * generators, int
-                     lineno, int col_offset, PyArena *arena);
-#define GeneratorExp(a0, a1, a2, a3, a4) _Py_GeneratorExp(a0, a1, a2, a3, a4)
-expr_ty _Py_GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int
-                         col_offset, PyArena *arena);
-#define Await(a0, a1, a2, a3) _Py_Await(a0, a1, a2, a3)
-expr_ty _Py_Await(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define Yield(a0, a1, a2, a3) _Py_Yield(a0, a1, a2, a3)
-expr_ty _Py_Yield(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define YieldFrom(a0, a1, a2, a3) _Py_YieldFrom(a0, a1, a2, a3)
-expr_ty _Py_YieldFrom(expr_ty value, int lineno, int col_offset, PyArena
-                      *arena);
-#define Compare(a0, a1, a2, a3, a4, a5) _Py_Compare(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators,
-                    int lineno, int col_offset, PyArena *arena);
-#define Call(a0, a1, a2, a3, a4, a5) _Py_Call(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, int
-                 lineno, int col_offset, PyArena *arena);
-#define Num(a0, a1, a2, a3) _Py_Num(a0, a1, a2, a3)
-expr_ty _Py_Num(object n, int lineno, int col_offset, PyArena *arena);
-#define Str(a0, a1, a2, a3) _Py_Str(a0, a1, a2, a3)
-expr_ty _Py_Str(string s, int lineno, int col_offset, PyArena *arena);
-#define Bytes(a0, a1, a2, a3) _Py_Bytes(a0, a1, a2, a3)
-expr_ty _Py_Bytes(bytes s, int lineno, int col_offset, PyArena *arena);
-#define NameConstant(a0, a1, a2, a3) _Py_NameConstant(a0, a1, a2, a3)
-expr_ty _Py_NameConstant(singleton value, int lineno, int col_offset, PyArena
-                         *arena);
-#define Ellipsis(a0, a1, a2) _Py_Ellipsis(a0, a1, a2)
-expr_ty _Py_Ellipsis(int lineno, int col_offset, PyArena *arena);
-#define Attribute(a0, a1, a2, a3, a4, a5) _Py_Attribute(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int
-                      lineno, int col_offset, PyArena *arena);
-#define Subscript(a0, a1, a2, a3, a4, a5) _Py_Subscript(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int
-                      lineno, int col_offset, PyArena *arena);
-#define Starred(a0, a1, a2, a3, a4) _Py_Starred(a0, a1, a2, a3, a4)
-expr_ty _Py_Starred(expr_ty value, expr_context_ty ctx, int lineno, int
-                    col_offset, PyArena *arena);
-#define Name(a0, a1, a2, a3, a4) _Py_Name(a0, a1, a2, a3, a4)
-expr_ty _Py_Name(identifier id, expr_context_ty ctx, int lineno, int
-                 col_offset, PyArena *arena);
-#define List(a0, a1, a2, a3, a4) _Py_List(a0, a1, a2, a3, a4)
-expr_ty _Py_List(asdl_seq * elts, expr_context_ty ctx, int lineno, int
-                 col_offset, PyArena *arena);
-#define Tuple(a0, a1, a2, a3, a4) _Py_Tuple(a0, a1, a2, a3, a4)
-expr_ty _Py_Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int
-                  col_offset, PyArena *arena);
-#define Slice(a0, a1, a2, a3) _Py_Slice(a0, a1, a2, a3)
-slice_ty _Py_Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena);
-#define ExtSlice(a0, a1) _Py_ExtSlice(a0, a1)
-slice_ty _Py_ExtSlice(asdl_seq * dims, PyArena *arena);
-#define Index(a0, a1) _Py_Index(a0, a1)
-slice_ty _Py_Index(expr_ty value, PyArena *arena);
-#define comprehension(a0, a1, a2, a3) _Py_comprehension(a0, a1, a2, a3)
-comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq *
-                                   ifs, PyArena *arena);
-#define ExceptHandler(a0, a1, a2, a3, a4, a5) _Py_ExceptHandler(a0, a1, a2, a3, a4, a5)
-excepthandler_ty _Py_ExceptHandler(expr_ty type, identifier name, asdl_seq *
-                                   body, int lineno, int col_offset, PyArena
-                                   *arena);
-#define arguments(a0, a1, a2, a3, a4, a5, a6) _Py_arguments(a0, a1, a2, a3, a4, a5, a6)
-arguments_ty _Py_arguments(asdl_seq * args, arg_ty vararg, asdl_seq *
-                           kwonlyargs, asdl_seq * kw_defaults, arg_ty kwarg,
-                           asdl_seq * defaults, PyArena *arena);
-#define arg(a0, a1, a2, a3, a4) _Py_arg(a0, a1, a2, a3, a4)
-arg_ty _Py_arg(identifier arg, expr_ty annotation, int lineno, int col_offset,
-               PyArena *arena);
-#define keyword(a0, a1, a2) _Py_keyword(a0, a1, a2)
-keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena);
-#define alias(a0, a1, a2) _Py_alias(a0, a1, a2)
-alias_ty _Py_alias(identifier name, identifier asname, PyArena *arena);
-#define withitem(a0, a1, a2) _Py_withitem(a0, a1, a2)
-withitem_ty _Py_withitem(expr_ty context_expr, expr_ty optional_vars, PyArena
-                         *arena);
-
-PyObject* PyAST_mod2obj(mod_ty t);
-mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode);
-int PyAST_Check(PyObject* obj);
diff --git a/openflow/usr/include/python3.5m/abstract.h b/openflow/usr/include/python3.5m/abstract.h
deleted file mode 100644
index 4ff79f2..0000000
--- a/openflow/usr/include/python3.5m/abstract.h
+++ /dev/null
@@ -1,1285 +0,0 @@
-#ifndef Py_ABSTRACTOBJECT_H
-#define Py_ABSTRACTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef PY_SSIZE_T_CLEAN
-#define PyObject_CallFunction _PyObject_CallFunction_SizeT
-#define PyObject_CallMethod _PyObject_CallMethod_SizeT
-#define _PyObject_CallMethodId _PyObject_CallMethodId_SizeT
-#endif
-
-/* Abstract Object Interface (many thanks to Jim Fulton) */
-
-/*
-   PROPOSAL: A Generic Python Object Interface for Python C Modules
-
-Problem
-
-  Python modules written in C that must access Python objects must do
-  so through routines whose interfaces are described by a set of
-  include files.  Unfortunately, these routines vary according to the
-  object accessed.  To use these routines, the C programmer must check
-  the type of the object being used and must call a routine based on
-  the object type.  For example, to access an element of a sequence,
-  the programmer must determine whether the sequence is a list or a
-  tuple:
-
-    if(is_tupleobject(o))
-      e=gettupleitem(o,i)
-    else if(is_listitem(o))
-      e=getlistitem(o,i)
-
-  If the programmer wants to get an item from another type of object
-  that provides sequence behavior, there is no clear way to do it
-  correctly.
-
-  The persistent programmer may peruse object.h and find that the
-  _typeobject structure provides a means of invoking up to (currently
-  about) 41 special operators.  So, for example, a routine can get an
-  item from any object that provides sequence behavior. However, to
-  use this mechanism, the programmer must make their code dependent on
-  the current Python implementation.
-
-  Also, certain semantics, especially memory management semantics, may
-  differ by the type of object being used.  Unfortunately, these
-  semantics are not clearly described in the current include files.
-  An abstract interface providing more consistent semantics is needed.
-
-Proposal
-
-  I propose the creation of a standard interface (with an associated
-  library of routines and/or macros) for generically obtaining the
-  services of Python objects.  This proposal can be viewed as one
-  components of a Python C interface consisting of several components.
-
-  From the viewpoint of C access to Python services, we have (as
-  suggested by Guido in off-line discussions):
-
-  - "Very high level layer": two or three functions that let you exec or
-    eval arbitrary Python code given as a string in a module whose name is
-    given, passing C values in and getting C values out using
-    mkvalue/getargs style format strings.  This does not require the user
-    to declare any variables of type "PyObject *".  This should be enough
-    to write a simple application that gets Python code from the user,
-    execs it, and returns the output or errors.  (Error handling must also
-    be part of this API.)
-
-  - "Abstract objects layer": which is the subject of this proposal.
-    It has many functions operating on objects, and lest you do many
-    things from C that you can also write in Python, without going
-    through the Python parser.
-
-  - "Concrete objects layer": This is the public type-dependent
-    interface provided by the standard built-in types, such as floats,
-    strings, and lists.  This interface exists and is currently
-    documented by the collection of include files provided with the
-    Python distributions.
-
-  From the point of view of Python accessing services provided by C
-  modules:
-
-  - "Python module interface": this interface consist of the basic
-    routines used to define modules and their members.  Most of the
-    current extensions-writing guide deals with this interface.
-
-  - "Built-in object interface": this is the interface that a new
-    built-in type must provide and the mechanisms and rules that a
-    developer of a new built-in type must use and follow.
-
-  This proposal is a "first-cut" that is intended to spur
-  discussion. See especially the lists of notes.
-
-  The Python C object interface will provide four protocols: object,
-  numeric, sequence, and mapping.  Each protocol consists of a
-  collection of related operations.  If an operation that is not
-  provided by a particular type is invoked, then a standard exception,
-  NotImplementedError is raised with an operation name as an argument.
-  In addition, for convenience this interface defines a set of
-  constructors for building objects of built-in types.  This is needed
-  so new objects can be returned from C functions that otherwise treat
-  objects generically.
-
-Memory Management
-
-  For all of the functions described in this proposal, if a function
-  retains a reference to a Python object passed as an argument, then the
-  function will increase the reference count of the object.  It is
-  unnecessary for the caller to increase the reference count of an
-  argument in anticipation of the object's retention.
-
-  All Python objects returned from functions should be treated as new
-  objects.  Functions that return objects assume that the caller will
-  retain a reference and the reference count of the object has already
-  been incremented to account for this fact.  A caller that does not
-  retain a reference to an object that is returned from a function
-  must decrement the reference count of the object (using
-  DECREF(object)) to prevent memory leaks.
-
-  Note that the behavior mentioned here is different from the current
-  behavior for some objects (e.g. lists and tuples) when certain
-  type-specific routines are called directly (e.g. setlistitem).  The
-  proposed abstraction layer will provide a consistent memory
-  management interface, correcting for inconsistent behavior for some
-  built-in types.
-
-Protocols
-
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
-
-/*  Object Protocol: */
-
-     /* Implemented elsewhere:
-
-     int PyObject_Print(PyObject *o, FILE *fp, int flags);
-
-     Print an object, o, on file, fp.  Returns -1 on
-     error.  The flags argument is used to enable certain printing
-     options. The only option currently supported is Py_Print_RAW.
-
-     (What should be said about Py_Print_RAW?)
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_HasAttrString(PyObject *o, const char *attr_name);
-
-     Returns 1 if o has the attribute attr_name, and 0 otherwise.
-     This is equivalent to the Python expression:
-     hasattr(o,attr_name).
-
-     This function always succeeds.
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject* PyObject_GetAttrString(PyObject *o, const char *attr_name);
-
-     Retrieve an attributed named attr_name form object o.
-     Returns the attribute value on success, or NULL on failure.
-     This is the equivalent of the Python expression: o.attr_name.
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_HasAttr(PyObject *o, PyObject *attr_name);
-
-     Returns 1 if o has the attribute attr_name, and 0 otherwise.
-     This is equivalent to the Python expression:
-     hasattr(o,attr_name).
-
-     This function always succeeds.
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name);
-
-     Retrieve an attributed named attr_name form object o.
-     Returns the attribute value on success, or NULL on failure.
-     This is the equivalent of the Python expression: o.attr_name.
-
-       */
-
-
-     /* Implemented elsewhere:
-
-     int PyObject_SetAttrString(PyObject *o, const char *attr_name, PyObject *v);
-
-     Set the value of the attribute named attr_name, for object o,
-     to the value v. Raise an exception and return -1 on failure; return 0 on
-     success.  This is the equivalent of the Python statement o.attr_name=v.
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v);
-
-     Set the value of the attribute named attr_name, for object o,
-     to the value v. Raise an exception and return -1 on failure; return 0 on
-     success.  This is the equivalent of the Python statement o.attr_name=v.
-
-       */
-
-     /* implemented as a macro:
-
-     int PyObject_DelAttrString(PyObject *o, const char *attr_name);
-
-     Delete attribute named attr_name, for object o. Returns
-     -1 on failure.  This is the equivalent of the Python
-     statement: del o.attr_name.
-
-       */
-#define  PyObject_DelAttrString(O,A) PyObject_SetAttrString((O),(A),NULL)
-
-     /* implemented as a macro:
-
-     int PyObject_DelAttr(PyObject *o, PyObject *attr_name);
-
-     Delete attribute named attr_name, for object o. Returns -1
-     on failure.  This is the equivalent of the Python
-     statement: del o.attr_name.
-
-       */
-#define  PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A),NULL)
-
-     /* Implemented elsewhere:
-
-     PyObject *PyObject_Repr(PyObject *o);
-
-     Compute the string representation of object, o.  Returns the
-     string representation on success, NULL on failure.  This is
-     the equivalent of the Python expression: repr(o).
-
-     Called by the repr() built-in function.
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject *PyObject_Str(PyObject *o);
-
-     Compute the string representation of object, o.  Returns the
-     string representation on success, NULL on failure.  This is
-     the equivalent of the Python expression: str(o).)
-
-     Called by the str() and print() built-in functions.
-
-       */
-
-       /* Declared elsewhere
-
-     PyAPI_FUNC(int) PyCallable_Check(PyObject *o);
-
-     Determine if the object, o, is callable.  Return 1 if the
-     object is callable and 0 otherwise.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable_object,
-                                          PyObject *args, PyObject *kw);
-
-#ifndef Py_LIMITED_API
-     PyAPI_FUNC(PyObject *) _Py_CheckFunctionResult(PyObject *func,
-                                                    PyObject *result,
-                                                    const char *where);
-#endif
-
-       /*
-     Call a callable Python object, callable_object, with
-     arguments and keywords arguments.  The 'args' argument can not be
-     NULL, but the 'kw' argument can be NULL.
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable_object,
-                                                PyObject *args);
-
-       /*
-     Call a callable Python object, callable_object, with
-     arguments given by the tuple, args.  If no arguments are
-     needed, then args may be NULL.  Returns the result of the
-     call on success, or NULL on failure.  This is the equivalent
-     of the Python expression: o(*args).
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object,
-                                                  const char *format, ...);
-
-       /*
-     Call a callable Python object, callable_object, with a
-     variable number of C arguments. The C arguments are described
-     using a mkvalue-style format string. The format may be NULL,
-     indicating that no arguments are provided.  Returns the
-     result of the call on success, or NULL on failure.  This is
-     the equivalent of the Python expression: o(*args).
-       */
-
-
-     PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o,
-                                                const char *method,
-                                                const char *format, ...);
-
-       /*
-     Call the method named m of object o with a variable number of
-     C arguments.  The C arguments are described by a mkvalue
-     format string.  The format may be NULL, indicating that no
-     arguments are provided. Returns the result of the call on
-     success, or NULL on failure.  This is the equivalent of the
-     Python expression: o.method(args).
-       */
-
-     PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *o,
-                                                   _Py_Identifier *method,
-                                                   const char *format, ...);
-
-       /*
-         Like PyObject_CallMethod, but expect a _Py_Identifier* as the
-         method name.
-       */
-
-     PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable,
-                                                         const char *format,
-                                                         ...);
-     PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o,
-                                                       const char *name,
-                                                       const char *format,
-                                                       ...);
-     PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *o,
-                                                       _Py_Identifier *name,
-                                                       const char *format,
-                                                       ...);
-
-     PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable,
-                                                         ...);
-
-       /*
-     Call a callable Python object, callable_object, with a
-     variable number of C arguments.  The C arguments are provided
-     as PyObject * values, terminated by a NULL.  Returns the
-     result of the call on success, or NULL on failure.  This is
-     the equivalent of the Python expression: o(*args).
-       */
-
-
-     PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o,
-                                                       PyObject *method, ...);
-     PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(PyObject *o,
-                                               struct _Py_Identifier *method,
-                                               ...);
-
-       /*
-     Call the method named m of object o with a variable number of
-     C arguments.  The C arguments are provided as PyObject *
-     values, terminated by NULL.  Returns the result of the call
-     on success, or NULL on failure.  This is the equivalent of
-     the Python expression: o.method(args).
-       */
-
-
-     /* Implemented elsewhere:
-
-     long PyObject_Hash(PyObject *o);
-
-     Compute and return the hash, hash_value, of an object, o.  On
-     failure, return -1.  This is the equivalent of the Python
-     expression: hash(o).
-       */
-
-
-     /* Implemented elsewhere:
-
-     int PyObject_IsTrue(PyObject *o);
-
-     Returns 1 if the object, o, is considered to be true, 0 if o is
-     considered to be false and -1 on failure. This is equivalent to the
-     Python expression: not not o
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_Not(PyObject *o);
-
-     Returns 0 if the object, o, is considered to be true, 1 if o is
-     considered to be false and -1 on failure. This is equivalent to the
-     Python expression: not o
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_Type(PyObject *o);
-
-       /*
-     On success, returns a type object corresponding to the object
-     type of object o. On failure, returns NULL.  This is
-     equivalent to the Python expression: type(o).
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PyObject_Size(PyObject *o);
-
-       /*
-     Return the size of object o.  If the object, o, provides
-     both sequence and mapping protocols, the sequence size is
-     returned. On error, -1 is returned.  This is the equivalent
-     to the Python expression: len(o).
-       */
-
-       /* For DLL compatibility */
-#undef PyObject_Length
-     PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o);
-#define PyObject_Length PyObject_Size
-
-#ifndef Py_LIMITED_API
-     PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o);
-     PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t);
-#endif
-
-       /*
-     Guess the size of object o using len(o) or o.__length_hint__().
-     If neither of those return a non-negative value, then return the
-     default value.  If one of the calls fails, this function returns -1.
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key);
-
-       /*
-     Return element of o corresponding to the object, key, or NULL
-     on failure. This is the equivalent of the Python expression:
-     o[key].
-       */
-
-     PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v);
-
-       /*
-     Map the object key to the value v.  Raise an exception and return -1
-     on failure; return 0 on success.  This is the equivalent of the Python
-     statement o[key]=v.
-       */
-
-     PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, const char *key);
-
-       /*
-     Remove the mapping for object, key, from the object *o.
-     Returns -1 on failure.  This is equivalent to
-     the Python statement: del o[key].
-       */
-
-     PyAPI_FUNC(int) PyObject_DelItem(PyObject *o, PyObject *key);
-
-       /*
-     Delete the mapping for key from *o.  Returns -1 on failure.
-     This is the equivalent of the Python statement: del o[key].
-       */
-
-    /* old buffer API
-       FIXME:  usage of these should all be replaced in Python itself
-       but for backwards compatibility we will implement them.
-       Their usage without a corresponding "unlock" mechansim
-       may create issues (but they would already be there). */
-
-     PyAPI_FUNC(int) PyObject_AsCharBuffer(PyObject *obj,
-                                           const char **buffer,
-                                           Py_ssize_t *buffer_len);
-
-       /*
-      Takes an arbitrary object which must support the (character,
-      single segment) buffer interface and returns a pointer to a
-      read-only memory location useable as character based input
-      for subsequent processing.
-
-      0 is returned on success.  buffer and buffer_len are only
-      set in case no error occurs. Otherwise, -1 is returned and
-      an exception set.
-       */
-
-     PyAPI_FUNC(int) PyObject_CheckReadBuffer(PyObject *obj);
-
-      /*
-      Checks whether an arbitrary object supports the (character,
-      single segment) buffer interface.  Returns 1 on success, 0
-      on failure.
-      */
-
-     PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj,
-                                           const void **buffer,
-                                           Py_ssize_t *buffer_len);
-
-       /*
-      Same as PyObject_AsCharBuffer() except that this API expects
-      (readable, single segment) buffer interface and returns a
-      pointer to a read-only memory location which can contain
-      arbitrary data.
-
-      0 is returned on success.  buffer and buffer_len are only
-      set in case no error occurs.  Otherwise, -1 is returned and
-      an exception set.
-       */
-
-     PyAPI_FUNC(int) PyObject_AsWriteBuffer(PyObject *obj,
-                                            void **buffer,
-                                            Py_ssize_t *buffer_len);
-
-       /*
-      Takes an arbitrary object which must support the (writable,
-      single segment) buffer interface and returns a pointer to a
-      writable memory location in buffer of size buffer_len.
-
-      0 is returned on success.  buffer and buffer_len are only
-      set in case no error occurs. Otherwise, -1 is returned and
-      an exception set.
-       */
-
-    /* new buffer API */
-
-#ifndef Py_LIMITED_API
-#define PyObject_CheckBuffer(obj) \
-    (((obj)->ob_type->tp_as_buffer != NULL) &&  \
-     ((obj)->ob_type->tp_as_buffer->bf_getbuffer != NULL))
-
-    /* Return 1 if the getbuffer function is available, otherwise
-       return 0 */
-
-     PyAPI_FUNC(int) PyObject_GetBuffer(PyObject *obj, Py_buffer *view,
-                                        int flags);
-
-    /* This is a C-API version of the getbuffer function call.  It checks
-       to make sure object has the required function pointer and issues the
-       call.  Returns -1 and raises an error on failure and returns 0 on
-       success
-    */
-
-
-     PyAPI_FUNC(void *) PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices);
-
-    /* Get the memory area pointed to by the indices for the buffer given.
-       Note that view->ndim is the assumed size of indices
-    */
-
-     PyAPI_FUNC(int) PyBuffer_SizeFromFormat(const char *);
-
-    /* Return the implied itemsize of the data-format area from a
-       struct-style description */
-
-
-
-     /* Implementation in memoryobject.c */
-     PyAPI_FUNC(int) PyBuffer_ToContiguous(void *buf, Py_buffer *view,
-                                           Py_ssize_t len, char order);
-
-     PyAPI_FUNC(int) PyBuffer_FromContiguous(Py_buffer *view, void *buf,
-                                             Py_ssize_t len, char order);
-
-
-    /* Copy len bytes of data from the contiguous chunk of memory
-       pointed to by buf into the buffer exported by obj.  Return
-       0 on success and return -1 and raise a PyBuffer_Error on
-       error (i.e. the object does not have a buffer interface or
-       it is not working).
-
-       If fort is 'F', then if the object is multi-dimensional,
-       then the data will be copied into the array in
-       Fortran-style (first dimension varies the fastest).  If
-       fort is 'C', then the data will be copied into the array
-       in C-style (last dimension varies the fastest).  If fort
-       is 'A', then it does not matter and the copy will be made
-       in whatever way is more efficient.
-
-    */
-
-     PyAPI_FUNC(int) PyObject_CopyData(PyObject *dest, PyObject *src);
-
-    /* Copy the data from the src buffer to the buffer of destination
-     */
-
-     PyAPI_FUNC(int) PyBuffer_IsContiguous(const Py_buffer *view, char fort);
-
-
-     PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims,
-                                                    Py_ssize_t *shape,
-                                                    Py_ssize_t *strides,
-                                                    int itemsize,
-                                                    char fort);
-
-    /*  Fill the strides array with byte-strides of a contiguous
-        (Fortran-style if fort is 'F' or C-style otherwise)
-        array of the given shape with the given number of bytes
-        per element.
-    */
-
-     PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, PyObject *o, void *buf,
-                                       Py_ssize_t len, int readonly,
-                                       int flags);
-
-    /* Fills in a buffer-info structure correctly for an exporter
-       that can only share a contiguous chunk of memory of
-       "unsigned bytes" of the given length. Returns 0 on success
-       and -1 (with raising an error) on error.
-     */
-
-     PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view);
-
-       /* Releases a Py_buffer obtained from getbuffer ParseTuple's s*.
-    */
-#endif /* Py_LIMITED_API */
-
-     PyAPI_FUNC(PyObject *) PyObject_Format(PyObject* obj,
-                                            PyObject *format_spec);
-       /*
-     Takes an arbitrary object and returns the result of
-     calling obj.__format__(format_spec).
-       */
-
-/* Iterators */
-
-     PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *);
-     /* Takes an object and returns an iterator for it.
-    This is typically a new iterator but if the argument
-    is an iterator, this returns itself. */
-
-#define PyIter_Check(obj) \
-    ((obj)->ob_type->tp_iternext != NULL && \
-     (obj)->ob_type->tp_iternext != &_PyObject_NextNotImplemented)
-
-     PyAPI_FUNC(PyObject *) PyIter_Next(PyObject *);
-     /* Takes an iterator object and calls its tp_iternext slot,
-    returning the next value.  If the iterator is exhausted,
-    this returns NULL without setting an exception.
-    NULL with an exception means an error occurred. */
-
-/*  Number Protocol:*/
-
-     PyAPI_FUNC(int) PyNumber_Check(PyObject *o);
-
-       /*
-     Returns 1 if the object, o, provides numeric protocols, and
-     false otherwise.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of adding o1 and o2, or null on failure.
-     This is the equivalent of the Python expression: o1+o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of subtracting o2 from o1, or null on
-     failure.  This is the equivalent of the Python expression:
-     o1-o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of multiplying o1 and o2, or null on
-     failure.  This is the equivalent of the Python expression:
-     o1*o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_MatrixMultiply(PyObject *o1, PyObject *o2);
-
-       /*
-     This is the equivalent of the Python expression: o1 @ o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_FloorDivide(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving an integral result,
-     or null on failure.
-     This is the equivalent of the Python expression: o1//o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_TrueDivide(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving a float result,
-     or null on failure.
-     This is the equivalent of the Python expression: o1/o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the remainder of dividing o1 by o2, or null on
-     failure.  This is the equivalent of the Python expression:
-     o1%o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2);
-
-       /*
-     See the built-in function divmod.  Returns NULL on failure.
-     This is the equivalent of the Python expression:
-     divmod(o1,o2).
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2,
-                                           PyObject *o3);
-
-       /*
-     See the built-in function pow.  Returns NULL on failure.
-     This is the equivalent of the Python expression:
-     pow(o1,o2,o3), where o3 is optional.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Negative(PyObject *o);
-
-       /*
-     Returns the negation of o on success, or null on failure.
-     This is the equivalent of the Python expression: -o.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Positive(PyObject *o);
-
-       /*
-     Returns the (what?) of o on success, or NULL on failure.
-     This is the equivalent of the Python expression: +o.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Absolute(PyObject *o);
-
-       /*
-     Returns the absolute value of o, or null on failure.  This is
-     the equivalent of the Python expression: abs(o).
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Invert(PyObject *o);
-
-       /*
-     Returns the bitwise negation of o on success, or NULL on
-     failure.  This is the equivalent of the Python expression:
-     ~o.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of left shifting o1 by o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1 << o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of right shifting o1 by o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1 >> o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise and of o1 and o2 on success, or
-     NULL on failure. This is the equivalent of the Python
-     expression: o1&o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the bitwise exclusive or of o1 by o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1^o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise or on o1 and o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1|o2.
-       */
-
-#define PyIndex_Check(obj) \
-   ((obj)->ob_type->tp_as_number != NULL && \
-    (obj)->ob_type->tp_as_number->nb_index != NULL)
-
-     PyAPI_FUNC(PyObject *) PyNumber_Index(PyObject *o);
-
-       /*
-     Returns the object converted to a Python int
-     or NULL with an error raised on failure.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PyNumber_AsSsize_t(PyObject *o, PyObject *exc);
-
-       /*
-    Returns the object converted to Py_ssize_t by going through
-    PyNumber_Index first.  If an overflow error occurs while
-    converting the int to Py_ssize_t, then the second argument
-    is the error-type to return.  If it is NULL, then the overflow error
-    is cleared and the value is clipped.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
-
-       /*
-     Returns the o converted to an integer object on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: int(o).
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o);
-
-       /*
-     Returns the o converted to a float object on success, or NULL
-     on failure.  This is the equivalent of the Python expression:
-     float(o).
-       */
-
-/*  In-place variants of (some of) the above number protocol functions */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceAdd(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of adding o2 to o1, possibly in-place, or null
-     on failure.  This is the equivalent of the Python expression:
-     o1 += o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceSubtract(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of subtracting o2 from o1, possibly in-place or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 -= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceMultiply(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of multiplying o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 *= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceMatrixMultiply(PyObject *o1, PyObject *o2);
-
-       /*
-     This is the equivalent of the Python expression: o1 @= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceFloorDivide(PyObject *o1,
-                                                        PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving an integral result,
-     possibly in-place, or null on failure.
-     This is the equivalent of the Python expression:
-     o1 /= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceTrueDivide(PyObject *o1,
-                                                       PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving a float result,
-     possibly in-place, or null on failure.
-     This is the equivalent of the Python expression:
-     o1 /= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the remainder of dividing o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 %= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlacePower(PyObject *o1, PyObject *o2,
-                                                  PyObject *o3);
-
-       /*
-     Returns the result of raising o1 to the power of o2, possibly
-     in-place, or null on failure.  This is the equivalent of the Python
-     expression: o1 **= o2, or pow(o1, o2, o3) if o3 is present.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceLshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of left shifting o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 <<= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceRshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of right shifting o1 by o2, possibly in-place or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 >>= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceAnd(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise and of o1 and o2, possibly in-place,
-     or null on failure. This is the equivalent of the Python
-     expression: o1 &= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceXor(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the bitwise exclusive or of o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 ^= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise or of o1 and o2, possibly in-place,
-     or null on failure.  This is the equivalent of the Python
-     expression: o1 |= o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base);
-
-       /*
-     Returns the integer n converted to a string with a base, with a base
-     marker of 0b, 0o or 0x prefixed if applicable.
-     If n is not an int object, it is converted with PyNumber_Index first.
-       */
-
-
-/*  Sequence protocol:*/
-
-     PyAPI_FUNC(int) PySequence_Check(PyObject *o);
-
-       /*
-     Return 1 if the object provides sequence protocol, and zero
-     otherwise.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject *o);
-
-       /*
-     Return the size of sequence object o, or -1 on failure.
-       */
-
-       /* For DLL compatibility */
-#undef PySequence_Length
-     PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject *o);
-#define PySequence_Length PySequence_Size
-
-
-     PyAPI_FUNC(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2);
-
-       /*
-     Return the concatenation of o1 and o2 on success, and NULL on
-     failure.   This is the equivalent of the Python
-     expression: o1+o2.
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_Repeat(PyObject *o, Py_ssize_t count);
-
-       /*
-     Return the result of repeating sequence object o count times,
-     or NULL on failure.  This is the equivalent of the Python
-     expression: o1*count.
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_GetItem(PyObject *o, Py_ssize_t i);
-
-       /*
-     Return the ith element of o, or NULL on failure. This is the
-     equivalent of the Python expression: o[i].
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
-
-       /*
-     Return the slice of sequence object o between i1 and i2, or
-     NULL on failure. This is the equivalent of the Python
-     expression: o[i1:i2].
-       */
-
-     PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v);
-
-       /*
-     Assign object v to the ith element of o.  Raise an exception and return
-     -1 on failure; return 0 on success.  This is the equivalent of the
-     Python statement o[i]=v.
-       */
-
-     PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i);
-
-       /*
-     Delete the ith element of object v.  Returns
-     -1 on failure.  This is the equivalent of the Python
-     statement: del o[i].
-       */
-
-     PyAPI_FUNC(int) PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2,
-                                         PyObject *v);
-
-       /*
-     Assign the sequence object, v, to the slice in sequence
-     object, o, from i1 to i2.  Returns -1 on failure. This is the
-     equivalent of the Python statement: o[i1:i2]=v.
-       */
-
-     PyAPI_FUNC(int) PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
-
-       /*
-     Delete the slice in sequence object, o, from i1 to i2.
-     Returns -1 on failure. This is the equivalent of the Python
-     statement: del o[i1:i2].
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_Tuple(PyObject *o);
-
-       /*
-     Returns the sequence, o, as a tuple on success, and NULL on failure.
-     This is equivalent to the Python expression: tuple(o)
-       */
-
-
-     PyAPI_FUNC(PyObject *) PySequence_List(PyObject *o);
-       /*
-     Returns the sequence, o, as a list on success, and NULL on failure.
-     This is equivalent to the Python expression: list(o)
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
-       /*
-     Return the sequence, o, as a list, unless it's already a
-     tuple or list.  Use PySequence_Fast_GET_ITEM to access the
-     members of this list, and PySequence_Fast_GET_SIZE to get its length.
-
-     Returns NULL on failure.  If the object does not support iteration,
-     raises a TypeError exception with m as the message text.
-       */
-
-#define PySequence_Fast_GET_SIZE(o) \
-    (PyList_Check(o) ? PyList_GET_SIZE(o) : PyTuple_GET_SIZE(o))
-       /*
-     Return the size of o, assuming that o was returned by
-     PySequence_Fast and is not NULL.
-       */
-
-#define PySequence_Fast_GET_ITEM(o, i)\
-     (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
-       /*
-     Return the ith element of o, assuming that o was returned by
-     PySequence_Fast, and that i is within bounds.
-       */
-
-#define PySequence_ITEM(o, i)\
-    ( Py_TYPE(o)->tp_as_sequence->sq_item(o, i) )
-       /* Assume tp_as_sequence and sq_item exist and that i does not
-      need to be corrected for a negative index
-       */
-
-#define PySequence_Fast_ITEMS(sf) \
-    (PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \
-                      : ((PyTupleObject *)(sf))->ob_item)
-    /* Return a pointer to the underlying item array for
-       an object retured by PySequence_Fast */
-
-     PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject *o, PyObject *value);
-
-       /*
-     Return the number of occurrences on value on o, that is,
-     return the number of keys for which o[key]==value.  On
-     failure, return -1.  This is equivalent to the Python
-     expression: o.count(value).
-       */
-
-     PyAPI_FUNC(int) PySequence_Contains(PyObject *seq, PyObject *ob);
-       /*
-     Return -1 if error; 1 if ob in seq; 0 if ob not in seq.
-     Use __contains__ if possible, else _PySequence_IterSearch().
-       */
-
-#ifndef Py_LIMITED_API
-#define PY_ITERSEARCH_COUNT    1
-#define PY_ITERSEARCH_INDEX    2
-#define PY_ITERSEARCH_CONTAINS 3
-     PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq,
-                                        PyObject *obj, int operation);
-#endif
-    /*
-      Iterate over seq.  Result depends on the operation:
-      PY_ITERSEARCH_COUNT:  return # of times obj appears in seq; -1 if
-        error.
-      PY_ITERSEARCH_INDEX:  return 0-based index of first occurrence of
-        obj in seq; set ValueError and return -1 if none found;
-        also return -1 on error.
-      PY_ITERSEARCH_CONTAINS:  return 1 if obj in seq, else 0; -1 on
-        error.
-    */
-
-/* For DLL-level backwards compatibility */
-#undef PySequence_In
-     PyAPI_FUNC(int) PySequence_In(PyObject *o, PyObject *value);
-
-/* For source-level backwards compatibility */
-#define PySequence_In PySequence_Contains
-
-       /*
-     Determine if o contains value.  If an item in o is equal to
-     X, return 1, otherwise return 0.  On error, return -1.  This
-     is equivalent to the Python expression: value in o.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject *o, PyObject *value);
-
-       /*
-     Return the first index for which o[i]=value.  On error,
-     return -1.    This is equivalent to the Python
-     expression: o.index(value).
-       */
-
-/* In-place versions of some of the above Sequence functions. */
-
-     PyAPI_FUNC(PyObject *) PySequence_InPlaceConcat(PyObject *o1, PyObject *o2);
-
-       /*
-     Append o2 to o1, in-place when possible. Return the resulting
-     object, which could be o1, or NULL on failure.  This is the
-     equivalent of the Python expression: o1 += o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count);
-
-       /*
-     Repeat o1 by count, in-place when possible. Return the resulting
-     object, which could be o1, or NULL on failure.  This is the
-     equivalent of the Python expression: o1 *= count.
-
-       */
-
-/*  Mapping protocol:*/
-
-     PyAPI_FUNC(int) PyMapping_Check(PyObject *o);
-
-       /*
-     Return 1 if the object provides mapping protocol, and zero
-     otherwise.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PyMapping_Size(PyObject *o);
-
-       /*
-     Returns the number of keys in object o on success, and -1 on
-     failure.  For objects that do not provide sequence protocol,
-     this is equivalent to the Python expression: len(o).
-       */
-
-       /* For DLL compatibility */
-#undef PyMapping_Length
-     PyAPI_FUNC(Py_ssize_t) PyMapping_Length(PyObject *o);
-#define PyMapping_Length PyMapping_Size
-
-
-     /* implemented as a macro:
-
-     int PyMapping_DelItemString(PyObject *o, const char *key);
-
-     Remove the mapping for object, key, from the object *o.
-     Returns -1 on failure.  This is equivalent to
-     the Python statement: del o[key].
-       */
-#define PyMapping_DelItemString(O,K) PyObject_DelItemString((O),(K))
-
-     /* implemented as a macro:
-
-     int PyMapping_DelItem(PyObject *o, PyObject *key);
-
-     Remove the mapping for object, key, from the object *o.
-     Returns -1 on failure.  This is equivalent to
-     the Python statement: del o[key].
-       */
-#define PyMapping_DelItem(O,K) PyObject_DelItem((O),(K))
-
-     PyAPI_FUNC(int) PyMapping_HasKeyString(PyObject *o, const char *key);
-
-       /*
-     On success, return 1 if the mapping object has the key, key,
-     and 0 otherwise.  This is equivalent to the Python expression:
-     key in o.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(int) PyMapping_HasKey(PyObject *o, PyObject *key);
-
-       /*
-     Return 1 if the mapping object has the key, key,
-     and 0 otherwise.  This is equivalent to the Python expression:
-     key in o.
-
-     This function always succeeds.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyMapping_Keys(PyObject *o);
-
-       /*
-     On success, return a list, a tuple or a dictionary view in case of a dict,
-     of the keys in object o. On failure, return NULL.
-       */
-
-     PyAPI_FUNC(PyObject *) PyMapping_Values(PyObject *o);
-
-       /*
-     On success, return a list, a tuple or a dictionary view in case of a dict,
-     of the values in object o. On failure, return NULL.
-       */
-
-     PyAPI_FUNC(PyObject *) PyMapping_Items(PyObject *o);
-
-       /*
-     On success, return a list, a tuple or a dictionary view in case of a dict,
-     of the items in object o, where each item is a tuple containing a key-value
-     pair. On failure, return NULL.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyMapping_GetItemString(PyObject *o,
-                                                    const char *key);
-
-       /*
-     Return element of o corresponding to the object, key, or NULL
-     on failure. This is the equivalent of the Python expression:
-     o[key].
-       */
-
-     PyAPI_FUNC(int) PyMapping_SetItemString(PyObject *o, const char *key,
-                                            PyObject *value);
-
-       /*
-     Map the object, key, to the value, v.  Returns
-     -1 on failure.  This is the equivalent of the Python
-     statement: o[key]=v.
-      */
-
-
-PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass);
-      /* isinstance(object, typeorclass) */
-
-PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass);
-      /* issubclass(object, typeorclass) */
-
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls);
-
-PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls);
-
-PyAPI_FUNC(char *const *) _PySequence_BytesToCharpArray(PyObject* self);
-
-PyAPI_FUNC(void) _Py_FreeCharPArray(char *const array[]);
-#endif
-
-/* For internal use by buffer API functions */
-PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index,
-                                        const Py_ssize_t *shape);
-PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index,
-                                        const Py_ssize_t *shape);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* Py_ABSTRACTOBJECT_H */
diff --git a/openflow/usr/include/python3.5m/bitset.h b/openflow/usr/include/python3.5m/bitset.h
deleted file mode 100644
index faeb419..0000000
--- a/openflow/usr/include/python3.5m/bitset.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#ifndef Py_BITSET_H
-#define Py_BITSET_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Bitset interface */
-
-#define BYTE		char
-
-typedef BYTE *bitset;
-
-bitset newbitset(int nbits);
-void delbitset(bitset bs);
-#define testbit(ss, ibit) (((ss)[BIT2BYTE(ibit)] & BIT2MASK(ibit)) != 0)
-int addbit(bitset bs, int ibit); /* Returns 0 if already set */
-int samebitset(bitset bs1, bitset bs2, int nbits);
-void mergebitset(bitset bs1, bitset bs2, int nbits);
-
-#define BITSPERBYTE	(8*sizeof(BYTE))
-#define NBYTES(nbits)	(((nbits) + BITSPERBYTE - 1) / BITSPERBYTE)
-
-#define BIT2BYTE(ibit)	((ibit) / BITSPERBYTE)
-#define BIT2SHIFT(ibit)	((ibit) % BITSPERBYTE)
-#define BIT2MASK(ibit)	(1 << BIT2SHIFT(ibit))
-#define BYTE2BIT(ibyte)	((ibyte) * BITSPERBYTE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BITSET_H */
diff --git a/openflow/usr/include/python3.5m/errcode.h b/openflow/usr/include/python3.5m/errcode.h
deleted file mode 100644
index 5946686..0000000
--- a/openflow/usr/include/python3.5m/errcode.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef Py_ERRCODE_H
-#define Py_ERRCODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Error codes passed around between file input, tokenizer, parser and
-   interpreter.  This is necessary so we can turn them into Python
-   exceptions at a higher level.  Note that some errors have a
-   slightly different meaning when passed from the tokenizer to the
-   parser than when passed from the parser to the interpreter; e.g.
-   the parser only returns E_EOF when it hits EOF immediately, and it
-   never returns E_OK. */
-
-#define E_OK		10	/* No error */
-#define E_EOF		11	/* End Of File */
-#define E_INTR		12	/* Interrupted */
-#define E_TOKEN		13	/* Bad token */
-#define E_SYNTAX	14	/* Syntax error */
-#define E_NOMEM		15	/* Ran out of memory */
-#define E_DONE		16	/* Parsing complete */
-#define E_ERROR		17	/* Execution error */
-#define E_TABSPACE	18	/* Inconsistent mixing of tabs and spaces */
-#define E_OVERFLOW      19	/* Node had too many children */
-#define E_TOODEEP	20	/* Too many indentation levels */
-#define E_DEDENT	21	/* No matching outer block for dedent */
-#define E_DECODE	22	/* Error in decoding into Unicode */
-#define E_EOFS		23	/* EOF in triple-quoted string */
-#define E_EOLS		24	/* EOL in single-quoted string */
-#define E_LINECONT	25	/* Unexpected characters after a line continuation */
-#define E_IDENTIFIER    26      /* Invalid characters in identifier */
-#define E_BADSINGLE	27	/* Ill-formed single statement input */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ERRCODE_H */
diff --git a/openflow/usr/include/python3.5m/eval.h b/openflow/usr/include/python3.5m/eval.h
deleted file mode 100644
index a1c6e81..0000000
--- a/openflow/usr/include/python3.5m/eval.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/* Interface to execute compiled code */
-
-#ifndef Py_EVAL_H
-#define Py_EVAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(PyObject *) PyEval_EvalCode(PyObject *, PyObject *, PyObject *);
-
-PyAPI_FUNC(PyObject *) PyEval_EvalCodeEx(PyObject *co,
-					PyObject *globals,
-					PyObject *locals,
-					PyObject **args, int argc,
-					PyObject **kwds, int kwdc,
-					PyObject **defs, int defc,
-					PyObject *kwdefs, PyObject *closure);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyEval_CallTracing(PyObject *func, PyObject *args);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_EVAL_H */
diff --git a/openflow/usr/include/python3.5m/graminit.h b/openflow/usr/include/python3.5m/graminit.h
deleted file mode 100644
index d030bc3..0000000
--- a/openflow/usr/include/python3.5m/graminit.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Generated by Parser/pgen */
-
-#define single_input 256
-#define file_input 257
-#define eval_input 258
-#define decorator 259
-#define decorators 260
-#define decorated 261
-#define async_funcdef 262
-#define funcdef 263
-#define parameters 264
-#define typedargslist 265
-#define tfpdef 266
-#define varargslist 267
-#define vfpdef 268
-#define stmt 269
-#define simple_stmt 270
-#define small_stmt 271
-#define expr_stmt 272
-#define testlist_star_expr 273
-#define augassign 274
-#define del_stmt 275
-#define pass_stmt 276
-#define flow_stmt 277
-#define break_stmt 278
-#define continue_stmt 279
-#define return_stmt 280
-#define yield_stmt 281
-#define raise_stmt 282
-#define import_stmt 283
-#define import_name 284
-#define import_from 285
-#define import_as_name 286
-#define dotted_as_name 287
-#define import_as_names 288
-#define dotted_as_names 289
-#define dotted_name 290
-#define global_stmt 291
-#define nonlocal_stmt 292
-#define assert_stmt 293
-#define compound_stmt 294
-#define async_stmt 295
-#define if_stmt 296
-#define while_stmt 297
-#define for_stmt 298
-#define try_stmt 299
-#define with_stmt 300
-#define with_item 301
-#define except_clause 302
-#define suite 303
-#define test 304
-#define test_nocond 305
-#define lambdef 306
-#define lambdef_nocond 307
-#define or_test 308
-#define and_test 309
-#define not_test 310
-#define comparison 311
-#define comp_op 312
-#define star_expr 313
-#define expr 314
-#define xor_expr 315
-#define and_expr 316
-#define shift_expr 317
-#define arith_expr 318
-#define term 319
-#define factor 320
-#define power 321
-#define atom_expr 322
-#define atom 323
-#define testlist_comp 324
-#define trailer 325
-#define subscriptlist 326
-#define subscript 327
-#define sliceop 328
-#define exprlist 329
-#define testlist 330
-#define dictorsetmaker 331
-#define classdef 332
-#define arglist 333
-#define argument 334
-#define comp_iter 335
-#define comp_for 336
-#define comp_if 337
-#define encoding_decl 338
-#define yield_expr 339
-#define yield_arg 340
diff --git a/openflow/usr/include/python3.5m/grammar.h b/openflow/usr/include/python3.5m/grammar.h
deleted file mode 100644
index 85120b9..0000000
--- a/openflow/usr/include/python3.5m/grammar.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/* Grammar interface */
-
-#ifndef Py_GRAMMAR_H
-#define Py_GRAMMAR_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "bitset.h" /* Sigh... */
-
-/* A label of an arc */
-
-typedef struct {
-    int		 lb_type;
-    char	*lb_str;
-} label;
-
-#define EMPTY 0		/* Label number 0 is by definition the empty label */
-
-/* A list of labels */
-
-typedef struct {
-    int		 ll_nlabels;
-    label	*ll_label;
-} labellist;
-
-/* An arc from one state to another */
-
-typedef struct {
-    short	a_lbl;		/* Label of this arc */
-    short	a_arrow;	/* State where this arc goes to */
-} arc;
-
-/* A state in a DFA */
-
-typedef struct {
-    int		 s_narcs;
-    arc		*s_arc;		/* Array of arcs */
-
-    /* Optional accelerators */
-    int		 s_lower;	/* Lowest label index */
-    int		 s_upper;	/* Highest label index */
-    int		*s_accel;	/* Accelerator */
-    int		 s_accept;	/* Nonzero for accepting state */
-} state;
-
-/* A DFA */
-
-typedef struct {
-    int		 d_type;	/* Non-terminal this represents */
-    char	*d_name;	/* For printing */
-    int		 d_initial;	/* Initial state */
-    int		 d_nstates;
-    state	*d_state;	/* Array of states */
-    bitset	 d_first;
-} dfa;
-
-/* A grammar */
-
-typedef struct {
-    int		 g_ndfas;
-    dfa		*g_dfa;		/* Array of DFAs */
-    labellist	 g_ll;
-    int		 g_start;	/* Start symbol of the grammar */
-    int		 g_accel;	/* Set if accelerators present */
-} grammar;
-
-/* FUNCTIONS */
-
-grammar *newgrammar(int start);
-dfa *adddfa(grammar *g, int type, const char *name);
-int addstate(dfa *d);
-void addarc(dfa *d, int from, int to, int lbl);
-dfa *PyGrammar_FindDFA(grammar *g, int type);
-
-int addlabel(labellist *ll, int type, const char *str);
-int findlabel(labellist *ll, int type, const char *str);
-const char *PyGrammar_LabelRepr(label *lb);
-void translatelabels(grammar *g);
-
-void addfirstsets(grammar *g);
-
-void PyGrammar_AddAccelerators(grammar *g);
-void PyGrammar_RemoveAccelerators(grammar *);
-
-void printgrammar(grammar *g, FILE *fp);
-void printnonterminals(grammar *g, FILE *fp);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_GRAMMAR_H */
diff --git a/openflow/usr/include/python3.5m/intrcheck.h b/openflow/usr/include/python3.5m/intrcheck.h
deleted file mode 100644
index f53fee1..0000000
--- a/openflow/usr/include/python3.5m/intrcheck.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#ifndef Py_INTRCHECK_H
-#define Py_INTRCHECK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(int) PyOS_InterruptOccurred(void);
-PyAPI_FUNC(void) PyOS_InitInterrupts(void);
-PyAPI_FUNC(void) PyOS_AfterFork(void);
-PyAPI_FUNC(int) _PyOS_IsMainThread(void);
-
-#ifdef MS_WINDOWS
-/* windows.h is not included by Python.h so use void* instead of HANDLE */
-PyAPI_FUNC(void*) _PyOS_SigintEvent(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTRCHECK_H */
diff --git a/openflow/usr/include/python3.5m/metagrammar.h b/openflow/usr/include/python3.5m/metagrammar.h
deleted file mode 100644
index 15c8ef8..0000000
--- a/openflow/usr/include/python3.5m/metagrammar.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef Py_METAGRAMMAR_H
-#define Py_METAGRAMMAR_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define MSTART 256
-#define RULE 257
-#define RHS 258
-#define ALT 259
-#define ITEM 260
-#define ATOM 261
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_METAGRAMMAR_H */
diff --git a/openflow/usr/include/python3.5m/node.h b/openflow/usr/include/python3.5m/node.h
deleted file mode 100644
index 654ad85..0000000
--- a/openflow/usr/include/python3.5m/node.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-/* Parse tree node interface */
-
-#ifndef Py_NODE_H
-#define Py_NODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _node {
-    short		n_type;
-    char		*n_str;
-    int			n_lineno;
-    int			n_col_offset;
-    int			n_nchildren;
-    struct _node	*n_child;
-} node;
-
-PyAPI_FUNC(node *) PyNode_New(int type);
-PyAPI_FUNC(int) PyNode_AddChild(node *n, int type,
-                                      char *str, int lineno, int col_offset);
-PyAPI_FUNC(void) PyNode_Free(node *n);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
-#endif
-
-/* Node access functions */
-#define NCH(n)		((n)->n_nchildren)
-
-#define CHILD(n, i)	(&(n)->n_child[i])
-#define RCHILD(n, i)	(CHILD(n, NCH(n) + i))
-#define TYPE(n)		((n)->n_type)
-#define STR(n)		((n)->n_str)
-#define LINENO(n)       ((n)->n_lineno)
-
-/* Assert that the type of a node is what we expect */
-#define REQ(n, type) assert(TYPE(n) == (type))
-
-PyAPI_FUNC(void) PyNode_ListTree(node *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_NODE_H */
diff --git a/openflow/usr/include/python3.5m/patchlevel.h b/openflow/usr/include/python3.5m/patchlevel.h
deleted file mode 100644
index 60851c1..0000000
--- a/openflow/usr/include/python3.5m/patchlevel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/* Python version identification scheme.
-
-   When the major or minor version changes, the VERSION variable in
-   configure.ac must also be changed.
-
-   There is also (independent) API version information in modsupport.h.
-*/
-
-/* Values for PY_RELEASE_LEVEL */
-#define PY_RELEASE_LEVEL_ALPHA	0xA
-#define PY_RELEASE_LEVEL_BETA	0xB
-#define PY_RELEASE_LEVEL_GAMMA	0xC     /* For release candidates */
-#define PY_RELEASE_LEVEL_FINAL	0xF	/* Serial should be 0 here */
-					/* Higher for patch releases */
-
-/* Version parsed out into numeric values */
-/*--start constants--*/
-#define PY_MAJOR_VERSION	3
-#define PY_MINOR_VERSION	5
-#define PY_MICRO_VERSION	2
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
-#define PY_RELEASE_SERIAL	0
-
-/* Version as a string */
-#define PY_VERSION      	"3.5.2"
-/*--end constants--*/
-
-/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
-   Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
-#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \
-			(PY_MINOR_VERSION << 16) | \
-			(PY_MICRO_VERSION <<  8) | \
-			(PY_RELEASE_LEVEL <<  4) | \
-			(PY_RELEASE_SERIAL << 0))
diff --git a/openflow/usr/include/python3.5m/pgen.h b/openflow/usr/include/python3.5m/pgen.h
deleted file mode 100644
index 8a325ed..0000000
--- a/openflow/usr/include/python3.5m/pgen.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef Py_PGEN_H
-#define Py_PGEN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Parser generator interface */
-
-extern grammar *meta_grammar(void);
-
-struct _node;
-extern grammar *pgen(struct _node *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PGEN_H */
diff --git a/openflow/usr/include/python3.5m/pgenheaders.h b/openflow/usr/include/python3.5m/pgenheaders.h
deleted file mode 100644
index 2049ae3..0000000
--- a/openflow/usr/include/python3.5m/pgenheaders.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef Py_PGENHEADERS_H
-#define Py_PGENHEADERS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Include files and extern declarations used by most of the parser. */
-
-#include "Python.h"
-
-PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...)
-			Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...)
-			Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-
-#define addarc _Py_addarc
-#define addbit _Py_addbit
-#define adddfa _Py_adddfa
-#define addfirstsets _Py_addfirstsets
-#define addlabel _Py_addlabel
-#define addstate _Py_addstate
-#define delbitset _Py_delbitset
-#define dumptree _Py_dumptree
-#define findlabel _Py_findlabel
-#define mergebitset _Py_mergebitset
-#define meta_grammar _Py_meta_grammar
-#define newbitset _Py_newbitset
-#define newgrammar _Py_newgrammar
-#define pgen _Py_pgen
-#define printgrammar _Py_printgrammar
-#define printnonterminals _Py_printnonterminals
-#define printtree _Py_printtree
-#define samebitset _Py_samebitset
-#define showtree _Py_showtree
-#define tok_dump _Py_tok_dump
-#define translatelabels _Py_translatelabels
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PGENHEADERS_H */
diff --git a/openflow/usr/include/python3.5m/py_curses.h b/openflow/usr/include/python3.5m/py_curses.h
deleted file mode 100644
index f2c08f6..0000000
--- a/openflow/usr/include/python3.5m/py_curses.h
+++ /dev/null
@@ -1,177 +0,0 @@
-
-#ifndef Py_CURSES_H
-#define Py_CURSES_H
-
-#ifdef __APPLE__
-/*
-** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards
-** against multiple definition of wchar_t.
-*/
-#ifdef	_BSD_WCHAR_T_DEFINED_
-#define _WCHAR_T
-#endif
-
-/* the following define is necessary for OS X 10.6; without it, the
-   Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python
-   can't get at the WINDOW flags field. */
-#define NCURSES_OPAQUE 0
-#endif /* __APPLE__ */
-
-#ifdef __FreeBSD__
-/*
-** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-** against multiple definition of wchar_t and wint_t.
-*/
-#ifdef	_XOPEN_SOURCE_EXTENDED
-#ifndef __FreeBSD_version
-#include <osreldate.h>
-#endif
-#if __FreeBSD_version >= 500000
-#ifndef __wchar_t
-#define __wchar_t
-#endif
-#ifndef __wint_t
-#define __wint_t
-#endif
-#else
-#ifndef _WCHAR_T
-#define _WCHAR_T
-#endif
-#ifndef _WINT_T
-#define _WINT_T
-#endif
-#endif
-#endif
-#endif
-
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#include <curses.h>
-#ifdef HAVE_TERM_H
-/* for tigetstr, which is not declared in SysV curses */
-#include <term.h>
-#endif
-#endif
-
-#ifdef HAVE_NCURSES_H
-/* configure was checking <curses.h>, but we will
-   use <ncurses.h>, which has all these features. */
-#ifndef WINDOW_HAS_FLAGS
-#define WINDOW_HAS_FLAGS 1
-#endif
-#ifndef MVWDELCH_IS_EXPRESSION
-#define MVWDELCH_IS_EXPRESSION 1
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PyCurses_API_pointers 4
-
-/* Type declarations */
-
-typedef struct {
-	PyObject_HEAD
-	WINDOW *win;
-	char *encoding;
-} PyCursesWindowObject;
-
-#define PyCursesWindow_Check(v)	 (Py_TYPE(v) == &PyCursesWindow_Type)
-
-#define PyCurses_CAPSULE_NAME "_curses._C_API"
-
-
-#ifdef CURSES_MODULE
-/* This section is used when compiling _cursesmodule.c */
-
-#else
-/* This section is used in modules that use the _cursesmodule API */
-
-static void **PyCurses_API;
-
-#define PyCursesWindow_Type (*(PyTypeObject *) PyCurses_API[0])
-#define PyCursesSetupTermCalled  {if (! ((int (*)(void))PyCurses_API[1]) () ) return NULL;}
-#define PyCursesInitialised      {if (! ((int (*)(void))PyCurses_API[2]) () ) return NULL;}
-#define PyCursesInitialisedColor {if (! ((int (*)(void))PyCurses_API[3]) () ) return NULL;}
-
-#define import_curses() \
-    PyCurses_API = (void **)PyCapsule_Import(PyCurses_CAPSULE_NAME, 1);
-
-#endif
-
-/* general error messages */
-static char *catchall_ERR  = "curses function returned ERR";
-static char *catchall_NULL = "curses function returned NULL";
-
-/* Function Prototype Macros - They are ugly but very, very useful. ;-)
-
-   X - function name
-   TYPE - parameter Type
-   ERGSTR - format string for construction of the return value
-   PARSESTR - format string for argument parsing
-   */
-
-#define NoArgNoReturnFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  return PyCursesCheckERR(X(), # X); }
-
-#define NoArgOrFlagNoReturnFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \
-{ \
-  int flag = 0; \
-  PyCursesInitialised \
-  switch(PyTuple_Size(args)) { \
-  case 0: \
-    return PyCursesCheckERR(X(), # X); \
-  case 1: \
-    if (!PyArg_ParseTuple(args, "i;True(1) or False(0)", &flag)) return NULL; \
-    if (flag) return PyCursesCheckERR(X(), # X); \
-    else return PyCursesCheckERR(no ## X (), # X); \
-  default: \
-    PyErr_SetString(PyExc_TypeError, # X " requires 0 or 1 arguments"); \
-    return NULL; } }
-
-#define NoArgReturnIntFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
- PyCursesInitialised \
- return PyLong_FromLong((long) X()); }
-
-
-#define NoArgReturnStringFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  return PyBytes_FromString(X()); }
-
-#define NoArgTrueFalseFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  if (X () == FALSE) { \
-    Py_INCREF(Py_False); \
-    return Py_False; \
-  } \
-  Py_INCREF(Py_True); \
-  return Py_True; }
-
-#define NoArgNoReturnVoidFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  X(); \
-  Py_INCREF(Py_None); \
-  return Py_None; }
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !defined(Py_CURSES_H) */
-
-
diff --git a/openflow/usr/include/python3.5m/pyatomic.h b/openflow/usr/include/python3.5m/pyatomic.h
deleted file mode 100644
index 89028ef..0000000
--- a/openflow/usr/include/python3.5m/pyatomic.h
+++ /dev/null
@@ -1,250 +0,0 @@
-#ifndef Py_ATOMIC_H
-#define Py_ATOMIC_H
-#ifdef Py_BUILD_CORE
-
-#include "dynamic_annotations.h"
-
-#include "pyconfig.h"
-
-#if defined(HAVE_STD_ATOMIC)
-#include <stdatomic.h>
-#endif
-
-/* This is modeled after the atomics interface from C1x, according to
- * the draft at
- * http://www.open-std.org/JTC1/SC22/wg14/www/docs/n1425.pdf.
- * Operations and types are named the same except with a _Py_ prefix
- * and have the same semantics.
- *
- * Beware, the implementations here are deep magic.
- */
-
-#if defined(HAVE_STD_ATOMIC)
-
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed = memory_order_relaxed,
-    _Py_memory_order_acquire = memory_order_acquire,
-    _Py_memory_order_release = memory_order_release,
-    _Py_memory_order_acq_rel = memory_order_acq_rel,
-    _Py_memory_order_seq_cst = memory_order_seq_cst
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    atomic_uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    atomic_int _value;
-} _Py_atomic_int;
-
-#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) \
-    atomic_signal_fence(ORDER)
-
-#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) \
-    atomic_thread_fence(ORDER)
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    atomic_store_explicit(&(ATOMIC_VAL)->_value, NEW_VAL, ORDER)
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-    atomic_load_explicit(&(ATOMIC_VAL)->_value, ORDER)
-
-/* Use builtin atomic operations in GCC >= 4.7 */
-#elif defined(HAVE_BUILTIN_ATOMIC)
-
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed = __ATOMIC_RELAXED,
-    _Py_memory_order_acquire = __ATOMIC_ACQUIRE,
-    _Py_memory_order_release = __ATOMIC_RELEASE,
-    _Py_memory_order_acq_rel = __ATOMIC_ACQ_REL,
-    _Py_memory_order_seq_cst = __ATOMIC_SEQ_CST
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    Py_uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    int _value;
-} _Py_atomic_int;
-
-#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) \
-    __atomic_signal_fence(ORDER)
-
-#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) \
-    __atomic_thread_fence(ORDER)
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    (assert((ORDER) == __ATOMIC_RELAXED                       \
-            || (ORDER) == __ATOMIC_SEQ_CST                    \
-            || (ORDER) == __ATOMIC_RELEASE),                  \
-     __atomic_store_n(&(ATOMIC_VAL)->_value, NEW_VAL, ORDER))
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER)           \
-    (assert((ORDER) == __ATOMIC_RELAXED                       \
-            || (ORDER) == __ATOMIC_SEQ_CST                    \
-            || (ORDER) == __ATOMIC_ACQUIRE                    \
-            || (ORDER) == __ATOMIC_CONSUME),                  \
-     __atomic_load_n(&(ATOMIC_VAL)->_value, ORDER))
-
-#else
-
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed,
-    _Py_memory_order_acquire,
-    _Py_memory_order_release,
-    _Py_memory_order_acq_rel,
-    _Py_memory_order_seq_cst
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    Py_uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    int _value;
-} _Py_atomic_int;
-
-/* Only support GCC (for expression statements) and x86 (for simple
- * atomic semantics) for now */
-#if defined(__GNUC__) && (defined(__i386__) || defined(__amd64))
-
-static __inline__ void
-_Py_atomic_signal_fence(_Py_memory_order order)
-{
-    if (order != _Py_memory_order_relaxed)
-        __asm__ volatile("":::"memory");
-}
-
-static __inline__ void
-_Py_atomic_thread_fence(_Py_memory_order order)
-{
-    if (order != _Py_memory_order_relaxed)
-        __asm__ volatile("mfence":::"memory");
-}
-
-/* Tell the race checker about this operation's effects. */
-static __inline__ void
-_Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
-{
-    (void)address;		/* shut up -Wunused-parameter */
-    switch(order) {
-    case _Py_memory_order_release:
-    case _Py_memory_order_acq_rel:
-    case _Py_memory_order_seq_cst:
-        _Py_ANNOTATE_HAPPENS_BEFORE(address);
-        break;
-    case _Py_memory_order_relaxed:
-    case _Py_memory_order_acquire:
-        break;
-    }
-    switch(order) {
-    case _Py_memory_order_acquire:
-    case _Py_memory_order_acq_rel:
-    case _Py_memory_order_seq_cst:
-        _Py_ANNOTATE_HAPPENS_AFTER(address);
-        break;
-    case _Py_memory_order_relaxed:
-    case _Py_memory_order_release:
-        break;
-    }
-}
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    __extension__ ({ \
-        __typeof__(ATOMIC_VAL) atomic_val = ATOMIC_VAL; \
-        __typeof__(atomic_val->_value) new_val = NEW_VAL;\
-        volatile __typeof__(new_val) *volatile_data = &atomic_val->_value; \
-        _Py_memory_order order = ORDER; \
-        _Py_ANNOTATE_MEMORY_ORDER(atomic_val, order); \
-        \
-        /* Perform the operation. */ \
-        _Py_ANNOTATE_IGNORE_WRITES_BEGIN(); \
-        switch(order) { \
-        case _Py_memory_order_release: \
-            _Py_atomic_signal_fence(_Py_memory_order_release); \
-            /* fallthrough */ \
-        case _Py_memory_order_relaxed: \
-            *volatile_data = new_val; \
-            break; \
-        \
-        case _Py_memory_order_acquire: \
-        case _Py_memory_order_acq_rel: \
-        case _Py_memory_order_seq_cst: \
-            __asm__ volatile("xchg %0, %1" \
-                         : "+r"(new_val) \
-                         : "m"(atomic_val->_value) \
-                         : "memory"); \
-            break; \
-        } \
-        _Py_ANNOTATE_IGNORE_WRITES_END(); \
-    })
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-    __extension__ ({  \
-        __typeof__(ATOMIC_VAL) atomic_val = ATOMIC_VAL; \
-        __typeof__(atomic_val->_value) result; \
-        volatile __typeof__(result) *volatile_data = &atomic_val->_value; \
-        _Py_memory_order order = ORDER; \
-        _Py_ANNOTATE_MEMORY_ORDER(atomic_val, order); \
-        \
-        /* Perform the operation. */ \
-        _Py_ANNOTATE_IGNORE_READS_BEGIN(); \
-        switch(order) { \
-        case _Py_memory_order_release: \
-        case _Py_memory_order_acq_rel: \
-        case _Py_memory_order_seq_cst: \
-            /* Loads on x86 are not releases by default, so need a */ \
-            /* thread fence. */ \
-            _Py_atomic_thread_fence(_Py_memory_order_release); \
-            break; \
-        default: \
-            /* No fence */ \
-            break; \
-        } \
-        result = *volatile_data; \
-        switch(order) { \
-        case _Py_memory_order_acquire: \
-        case _Py_memory_order_acq_rel: \
-        case _Py_memory_order_seq_cst: \
-            /* Loads on x86 are automatically acquire operations so */ \
-            /* can get by with just a compiler fence. */ \
-            _Py_atomic_signal_fence(_Py_memory_order_acquire); \
-            break; \
-        default: \
-            /* No fence */ \
-            break; \
-        } \
-        _Py_ANNOTATE_IGNORE_READS_END(); \
-        result; \
-    })
-
-#else  /* !gcc x86 */
-/* Fall back to other compilers and processors by assuming that simple
-   volatile accesses are atomic.  This is false, so people should port
-   this. */
-#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) ((void)0)
-#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) ((void)0)
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    ((ATOMIC_VAL)->_value = NEW_VAL)
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-    ((ATOMIC_VAL)->_value)
-
-#endif  /* !gcc x86 */
-#endif
-
-/* Standardized shortcuts. */
-#define _Py_atomic_store(ATOMIC_VAL, NEW_VAL) \
-    _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, _Py_memory_order_seq_cst)
-#define _Py_atomic_load(ATOMIC_VAL) \
-    _Py_atomic_load_explicit(ATOMIC_VAL, _Py_memory_order_seq_cst)
-
-/* Python-local extensions */
-
-#define _Py_atomic_store_relaxed(ATOMIC_VAL, NEW_VAL) \
-    _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, _Py_memory_order_relaxed)
-#define _Py_atomic_load_relaxed(ATOMIC_VAL) \
-    _Py_atomic_load_explicit(ATOMIC_VAL, _Py_memory_order_relaxed)
-
-#endif  /* Py_BUILD_CORE */
-#endif  /* Py_ATOMIC_H */
diff --git a/openflow/usr/include/python3.5m/pyconfig.h b/openflow/usr/include/python3.5m/pyconfig.h
deleted file mode 100644
index 6f6b5f2..0000000
--- a/openflow/usr/include/python3.5m/pyconfig.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#if defined(__linux__)
-# if defined(__x86_64__) && defined(__LP64__)
-#  include <x86_64-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__x86_64__) && defined(__ILP32__)
-#  include <x86_64-linux-gnux32/python3.5m/pyconfig.h>
-# elif defined(__i386__)
-#  include <i386-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__aarch64__) && defined(__AARCH64EL__)
-#  include <aarch64-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__alpha__)
-#  include <alpha-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
-#  include <arm-linux-gnueabihf/python3.5m/pyconfig.h>
-# elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
-#  include <arm-linux-gnueabi/python3.5m/pyconfig.h>
-# elif defined(__hppa__)
-#  include <hppa-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__ia64__)
-#  include <ia64-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__m68k__) && !defined(__mcoldfire__)
-#  include <m68k-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__mips_hard_float) && defined(_MIPSEL)
-#  if _MIPS_SIM == _ABIO32
-#   include <mipsel-linux-gnu/python3.5m/pyconfig.h>
-#  elif _MIPS_SIM == _ABIN32
-#   include <mips64el-linux-gnuabin32/python3.5m/pyconfig.h>
-#  elif _MIPS_SIM == _ABI64
-#   include <mips64el-linux-gnuabi64/python3.5m/pyconfig.h>
-#  else
-#   error unknown multiarch location for pyconfig.h
-#  endif
-# elif defined(__mips_hard_float)
-#  if _MIPS_SIM == _ABIO32
-#   include <mips-linux-gnu/python3.5m/pyconfig.h>
-#  elif _MIPS_SIM == _ABIN32
-#   include <mips64-linux-gnuabin32/python3.5m/pyconfig.h>
-#  elif _MIPS_SIM == _ABI64
-#   include <mips64-linux-gnuabi64/python3.5m/pyconfig.h>
-#  else
-#   error unknown multiarch location for pyconfig.h
-#  endif
-# elif defined(__or1k__)
-#  include <or1k-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__powerpc__) && defined(__SPE__)
-#  include <powerpc-linux-gnuspe/python3.5m/pyconfig.h>
-# elif defined(__powerpc64__)
-#  if defined(__LITTLE_ENDIAN__)
-#    include <powerpc64le-linux-gnu/python3.5m/pyconfig.h>
-#  else
-#    include <powerpc64-linux-gnu/python3.5m/pyconfig.h>
-#  endif
-# elif defined(__powerpc__)
-#  include <powerpc-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__s390x__)
-#  include <s390x-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__s390__)
-#  include <s390-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__sh__) && defined(__LITTLE_ENDIAN__)
-#  include <sh4-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__sparc__) && defined(__arch64__)
-#  include <sparc64-linux-gnu/python3.5m/pyconfig.h>
-# elif defined(__sparc__)
-#  include <sparc-linux-gnu/python3.5m/pyconfig.h>
-# else
-#   error unknown multiarch location for pyconfig.h
-# endif
-#elif defined(__FreeBSD_kernel__)
-# if defined(__LP64__)
-#  include <x86_64-kfreebsd-gnu/python3.5m/pyconfig.h>
-# elif defined(__i386__)
-#  include <i386-kfreebsd-gnu/python3.5m/pyconfig.h>
-# else
-#   error unknown multiarch location for pyconfig.h
-# endif
-#elif defined(__gnu_hurd__)
-# include <i386-gnu/python3.5m/pyconfig.h>
-#else
-# error unknown multiarch location for pyconfig.h
-#endif
diff --git a/openflow/usr/include/python3.5m/pyfpe.h b/openflow/usr/include/python3.5m/pyfpe.h
deleted file mode 100644
index e957119..0000000
--- a/openflow/usr/include/python3.5m/pyfpe.h
+++ /dev/null
@@ -1,176 +0,0 @@
-#ifndef Py_PYFPE_H
-#define Py_PYFPE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
-     ---------------------------------------------------------------------
-    /                       Copyright (c) 1996.                           \
-   |          The Regents of the University of California.                 |
-   |                        All rights reserved.                           |
-   |                                                                       |
-   |   Permission to use, copy, modify, and distribute this software for   |
-   |   any purpose without fee is hereby granted, provided that this en-   |
-   |   tire notice is included in all copies of any software which is or   |
-   |   includes  a  copy  or  modification  of  this software and in all   |
-   |   copies of the supporting documentation for such software.           |
-   |                                                                       |
-   |   This  work was produced at the University of California, Lawrence   |
-   |   Livermore National Laboratory under  contract  no.  W-7405-ENG-48   |
-   |   between  the  U.S.  Department  of  Energy and The Regents of the   |
-   |   University of California for the operation of UC LLNL.              |
-   |                                                                       |
-   |                              DISCLAIMER                               |
-   |                                                                       |
-   |   This  software was prepared as an account of work sponsored by an   |
-   |   agency of the United States Government. Neither the United States   |
-   |   Government  nor the University of California nor any of their em-   |
-   |   ployees, makes any warranty, express or implied, or  assumes  any   |
-   |   liability  or  responsibility  for the accuracy, completeness, or   |
-   |   usefulness of any information,  apparatus,  product,  or  process   |
-   |   disclosed,   or  represents  that  its  use  would  not  infringe   |
-   |   privately-owned rights. Reference herein to any specific  commer-   |
-   |   cial  products,  process,  or  service  by trade name, trademark,   |
-   |   manufacturer, or otherwise, does not  necessarily  constitute  or   |
-   |   imply  its endorsement, recommendation, or favoring by the United   |
-   |   States Government or the University of California. The views  and   |
-   |   opinions  of authors expressed herein do not necessarily state or   |
-   |   reflect those of the United States Government or  the  University   |
-   |   of  California,  and shall not be used for advertising or product   |
-    \  endorsement purposes.                                              /
-     ---------------------------------------------------------------------
-*/
-
-/*
- *       Define macros for handling SIGFPE.
- *       Lee Busby, LLNL, November, 1996
- *       busby1@llnl.gov
- * 
- *********************************************
- * Overview of the system for handling SIGFPE:
- * 
- * This file (Include/pyfpe.h) defines a couple of "wrapper" macros for
- * insertion into your Python C code of choice. Their proper use is
- * discussed below. The file Python/pyfpe.c defines a pair of global
- * variables PyFPE_jbuf and PyFPE_counter which are used by the signal
- * handler for SIGFPE to decide if a particular exception was protected
- * by the macros. The signal handler itself, and code for enabling the
- * generation of SIGFPE in the first place, is in a (new) Python module
- * named fpectl. This module is standard in every respect. It can be loaded
- * either statically or dynamically as you choose, and like any other
- * Python module, has no effect until you import it.
- * 
- * In the general case, there are three steps toward handling SIGFPE in any
- * Python code:
- * 
- * 1) Add the *_PROTECT macros to your C code as required to protect
- *    dangerous floating point sections.
- * 
- * 2) Turn on the inclusion of the code by adding the ``--with-fpectl''
- *    flag at the time you run configure.  If the fpectl or other modules
- *    which use the *_PROTECT macros are to be dynamically loaded, be
- *    sure they are compiled with WANT_SIGFPE_HANDLER defined.
- * 
- * 3) When python is built and running, import fpectl, and execute
- *    fpectl.turnon_sigfpe(). This sets up the signal handler and enables
- *    generation of SIGFPE whenever an exception occurs. From this point
- *    on, any properly trapped SIGFPE should result in the Python
- *    FloatingPointError exception.
- * 
- * Step 1 has been done already for the Python kernel code, and should be
- * done soon for the NumPy array package.  Step 2 is usually done once at
- * python install time. Python's behavior with respect to SIGFPE is not
- * changed unless you also do step 3. Thus you can control this new
- * facility at compile time, or run time, or both.
- * 
- ******************************** 
- * Using the macros in your code:
- * 
- * static PyObject *foobar(PyObject *self,PyObject *args)
- * {
- *     ....
- *     PyFPE_START_PROTECT("Error in foobar", return 0)
- *     result = dangerous_op(somearg1, somearg2, ...);
- *     PyFPE_END_PROTECT(result)
- *     ....
- * }
- * 
- * If a floating point error occurs in dangerous_op, foobar returns 0 (NULL),
- * after setting the associated value of the FloatingPointError exception to
- * "Error in foobar". ``Dangerous_op'' can be a single operation, or a block
- * of code, function calls, or any combination, so long as no alternate
- * return is possible before the PyFPE_END_PROTECT macro is reached.
- * 
- * The macros can only be used in a function context where an error return
- * can be recognized as signaling a Python exception. (Generally, most
- * functions that return a PyObject * will qualify.)
- * 
- * Guido's original design suggestion for PyFPE_START_PROTECT and
- * PyFPE_END_PROTECT had them open and close a local block, with a locally
- * defined jmp_buf and jmp_buf pointer. This would allow recursive nesting
- * of the macros. The Ansi C standard makes it clear that such local
- * variables need to be declared with the "volatile" type qualifier to keep
- * setjmp from corrupting their values. Some current implementations seem
- * to be more restrictive. For example, the HPUX man page for setjmp says
- * 
- *   Upon the return from a setjmp() call caused by a longjmp(), the
- *   values of any non-static local variables belonging to the routine
- *   from which setjmp() was called are undefined. Code which depends on
- *   such values is not guaranteed to be portable.
- * 
- * I therefore decided on a more limited form of nesting, using a counter
- * variable (PyFPE_counter) to keep track of any recursion.  If an exception
- * occurs in an ``inner'' pair of macros, the return will apparently
- * come from the outermost level.
- * 
- */
-
-#ifdef WANT_SIGFPE_HANDLER
-#include <signal.h>
-#include <setjmp.h>
-#include <math.h>
-extern jmp_buf PyFPE_jbuf;
-extern int PyFPE_counter;
-extern double PyFPE_dummy(void *);
-
-#define PyFPE_START_PROTECT(err_string, leave_stmt) \
-if (!PyFPE_counter++ && setjmp(PyFPE_jbuf)) { \
-	PyErr_SetString(PyExc_FloatingPointError, err_string); \
-	PyFPE_counter = 0; \
-	leave_stmt; \
-}
-
-/*
- * This (following) is a heck of a way to decrement a counter. However,
- * unless the macro argument is provided, code optimizers will sometimes move
- * this statement so that it gets executed *before* the unsafe expression
- * which we're trying to protect.  That pretty well messes things up,
- * of course.
- * 
- * If the expression(s) you're trying to protect don't happen to return a
- * value, you will need to manufacture a dummy result just to preserve the
- * correct ordering of statements.  Note that the macro passes the address
- * of its argument (so you need to give it something which is addressable).
- * If your expression returns multiple results, pass the last such result
- * to PyFPE_END_PROTECT.
- * 
- * Note that PyFPE_dummy returns a double, which is cast to int.
- * This seeming insanity is to tickle the Floating Point Unit (FPU).
- * If an exception has occurred in a preceding floating point operation,
- * some architectures (notably Intel 80x86) will not deliver the interrupt
- * until the *next* floating point operation.  This is painful if you've
- * already decremented PyFPE_counter.
- */
-#define PyFPE_END_PROTECT(v) PyFPE_counter -= (int)PyFPE_dummy(&(v));
-
-#else
-
-#define PyFPE_START_PROTECT(err_string, leave_stmt)
-#define PyFPE_END_PROTECT(v)
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYFPE_H */
diff --git a/openflow/usr/include/python3.5m/pygetopt.h b/openflow/usr/include/python3.5m/pygetopt.h
deleted file mode 100644
index 425c7dd..0000000
--- a/openflow/usr/include/python3.5m/pygetopt.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#ifndef Py_PYGETOPT_H
-#define Py_PYGETOPT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(int) _PyOS_opterr;
-PyAPI_DATA(int) _PyOS_optind;
-PyAPI_DATA(wchar_t *) _PyOS_optarg;
-
-PyAPI_FUNC(void) _PyOS_ResetGetOpt(void);
-#endif
-
-PyAPI_FUNC(int) _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYGETOPT_H */
diff --git a/openflow/usr/include/python3.5m/pylifecycle.h b/openflow/usr/include/python3.5m/pylifecycle.h
deleted file mode 100644
index ccdebe2..0000000
--- a/openflow/usr/include/python3.5m/pylifecycle.h
+++ /dev/null
@@ -1,124 +0,0 @@
-
-/* Interfaces to configure, query, create & destroy the Python runtime */
-
-#ifndef Py_PYLIFECYCLE_H
-#define Py_PYLIFECYCLE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(void) Py_SetProgramName(wchar_t *);
-PyAPI_FUNC(wchar_t *) Py_GetProgramName(void);
-
-PyAPI_FUNC(void) Py_SetPythonHome(wchar_t *);
-PyAPI_FUNC(wchar_t *) Py_GetPythonHome(void);
-
-#ifndef Py_LIMITED_API
-/* Only used by applications that embed the interpreter and need to
- * override the standard encoding determination mechanism
- */
-PyAPI_FUNC(int) Py_SetStandardStreamEncoding(const char *encoding,
-                                             const char *errors);
-#endif
-
-PyAPI_FUNC(void) Py_Initialize(void);
-PyAPI_FUNC(void) Py_InitializeEx(int);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _Py_InitializeEx_Private(int, int);
-#endif
-PyAPI_FUNC(void) Py_Finalize(void);
-PyAPI_FUNC(int) Py_IsInitialized(void);
-PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void);
-PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
-
-
-/* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level
- * exit functions.
- */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _Py_PyAtExit(void (*func)(void));
-#endif
-PyAPI_FUNC(int) Py_AtExit(void (*func)(void));
-
-PyAPI_FUNC(void) Py_Exit(int);
-
-/* Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _Py_RestoreSignals(void);
-
-PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *);
-#endif
-
-/* Bootstrap __main__ (defined in Modules/main.c) */
-PyAPI_FUNC(int) Py_Main(int argc, wchar_t **argv);
-
-/* In getpath.c */
-PyAPI_FUNC(wchar_t *) Py_GetProgramFullPath(void);
-PyAPI_FUNC(wchar_t *) Py_GetPrefix(void);
-PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void);
-PyAPI_FUNC(wchar_t *) Py_GetPath(void);
-PyAPI_FUNC(void)      Py_SetPath(const wchar_t *);
-#ifdef MS_WINDOWS
-int _Py_CheckPython3();
-#endif
-
-/* In their own files */
-PyAPI_FUNC(const char *) Py_GetVersion(void);
-PyAPI_FUNC(const char *) Py_GetPlatform(void);
-PyAPI_FUNC(const char *) Py_GetCopyright(void);
-PyAPI_FUNC(const char *) Py_GetCompiler(void);
-PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(const char *) _Py_hgidentifier(void);
-PyAPI_FUNC(const char *) _Py_hgversion(void);
-#endif
-
-/* Internal -- various one-time initializations */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);
-PyAPI_FUNC(PyObject *) _PySys_Init(void);
-PyAPI_FUNC(void) _PyImport_Init(void);
-PyAPI_FUNC(void) _PyExc_Init(PyObject * bltinmod);
-PyAPI_FUNC(void) _PyImportHooks_Init(void);
-PyAPI_FUNC(int) _PyFrame_Init(void);
-PyAPI_FUNC(int) _PyFloat_Init(void);
-PyAPI_FUNC(int) PyByteArray_Init(void);
-PyAPI_FUNC(void) _PyRandom_Init(void);
-#endif
-
-/* Various internal finalizers */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyExc_Fini(void);
-PyAPI_FUNC(void) _PyImport_Fini(void);
-PyAPI_FUNC(void) PyMethod_Fini(void);
-PyAPI_FUNC(void) PyFrame_Fini(void);
-PyAPI_FUNC(void) PyCFunction_Fini(void);
-PyAPI_FUNC(void) PyDict_Fini(void);
-PyAPI_FUNC(void) PyTuple_Fini(void);
-PyAPI_FUNC(void) PyList_Fini(void);
-PyAPI_FUNC(void) PySet_Fini(void);
-PyAPI_FUNC(void) PyBytes_Fini(void);
-PyAPI_FUNC(void) PyByteArray_Fini(void);
-PyAPI_FUNC(void) PyFloat_Fini(void);
-PyAPI_FUNC(void) PyOS_FiniInterrupts(void);
-PyAPI_FUNC(void) _PyGC_DumpShutdownStats(void);
-PyAPI_FUNC(void) _PyGC_Fini(void);
-PyAPI_FUNC(void) PySlice_Fini(void);
-PyAPI_FUNC(void) _PyType_Fini(void);
-PyAPI_FUNC(void) _PyRandom_Fini(void);
-
-PyAPI_DATA(PyThreadState *) _Py_Finalizing;
-#endif
-
-/* Signals */
-typedef void (*PyOS_sighandler_t)(int);
-PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int);
-PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t);
-
-/* Random */
-PyAPI_FUNC(int) _PyOS_URandom (void *buffer, Py_ssize_t size);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYLIFECYCLE_H */
diff --git a/openflow/usr/include/python3.5m/pystate.h b/openflow/usr/include/python3.5m/pystate.h
deleted file mode 100644
index 0499a74..0000000
--- a/openflow/usr/include/python3.5m/pystate.h
+++ /dev/null
@@ -1,279 +0,0 @@
-
-/* Thread and interpreter state structures and their interfaces */
-
-
-#ifndef Py_PYSTATE_H
-#define Py_PYSTATE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* State shared between threads */
-
-struct _ts; /* Forward */
-struct _is; /* Forward */
-
-#ifdef Py_LIMITED_API
-typedef struct _is PyInterpreterState;
-#else
-typedef struct _is {
-
-    struct _is *next;
-    struct _ts *tstate_head;
-
-    PyObject *modules;
-    PyObject *modules_by_index;
-    PyObject *sysdict;
-    PyObject *builtins;
-    PyObject *importlib;
-
-    PyObject *codec_search_path;
-    PyObject *codec_search_cache;
-    PyObject *codec_error_registry;
-    int codecs_initialized;
-    int fscodec_initialized;
-
-#ifdef HAVE_DLOPEN
-    int dlopenflags;
-#endif
-#ifdef WITH_TSC
-    int tscdump;
-#endif
-
-    PyObject *builtins_copy;
-} PyInterpreterState;
-#endif
-
-
-/* State unique per thread */
-
-struct _frame; /* Avoid including frameobject.h */
-
-#ifndef Py_LIMITED_API
-/* Py_tracefunc return -1 when raising an exception, or 0 for success. */
-typedef int (*Py_tracefunc)(PyObject *, struct _frame *, int, PyObject *);
-
-/* The following values are used for 'what' for tracefunc functions: */
-#define PyTrace_CALL 0
-#define PyTrace_EXCEPTION 1
-#define PyTrace_LINE 2
-#define PyTrace_RETURN 3
-#define PyTrace_C_CALL 4
-#define PyTrace_C_EXCEPTION 5
-#define PyTrace_C_RETURN 6
-#endif
-
-#ifdef Py_LIMITED_API
-typedef struct _ts PyThreadState;
-#else
-typedef struct _ts {
-    /* See Python/ceval.c for comments explaining most fields */
-
-    struct _ts *prev;
-    struct _ts *next;
-    PyInterpreterState *interp;
-
-    struct _frame *frame;
-    int recursion_depth;
-    char overflowed; /* The stack has overflowed. Allow 50 more calls
-                        to handle the runtime error. */
-    char recursion_critical; /* The current calls must not cause
-                                a stack overflow. */
-    /* 'tracing' keeps track of the execution depth when tracing/profiling.
-       This is to prevent the actual trace/profile code from being recorded in
-       the trace/profile. */
-    int tracing;
-    int use_tracing;
-
-    Py_tracefunc c_profilefunc;
-    Py_tracefunc c_tracefunc;
-    PyObject *c_profileobj;
-    PyObject *c_traceobj;
-
-    PyObject *curexc_type;
-    PyObject *curexc_value;
-    PyObject *curexc_traceback;
-
-    PyObject *exc_type;
-    PyObject *exc_value;
-    PyObject *exc_traceback;
-
-    PyObject *dict;  /* Stores per-thread state */
-
-    int gilstate_counter;
-
-    PyObject *async_exc; /* Asynchronous exception to raise */
-    long thread_id; /* Thread id where this tstate was created */
-
-    int trash_delete_nesting;
-    PyObject *trash_delete_later;
-
-    /* Called when a thread state is deleted normally, but not when it
-     * is destroyed after fork().
-     * Pain:  to prevent rare but fatal shutdown errors (issue 18808),
-     * Thread.join() must wait for the join'ed thread's tstate to be unlinked
-     * from the tstate chain.  That happens at the end of a thread's life,
-     * in pystate.c.
-     * The obvious way doesn't quite work:  create a lock which the tstate
-     * unlinking code releases, and have Thread.join() wait to acquire that
-     * lock.  The problem is that we _are_ at the end of the thread's life:
-     * if the thread holds the last reference to the lock, decref'ing the
-     * lock will delete the lock, and that may trigger arbitrary Python code
-     * if there's a weakref, with a callback, to the lock.  But by this time
-     * _PyThreadState_Current is already NULL, so only the simplest of C code
-     * can be allowed to run (in particular it must not be possible to
-     * release the GIL).
-     * So instead of holding the lock directly, the tstate holds a weakref to
-     * the lock:  that's the value of on_delete_data below.  Decref'ing a
-     * weakref is harmless.
-     * on_delete points to _threadmodule.c's static release_sentinel() function.
-     * After the tstate is unlinked, release_sentinel is called with the
-     * weakref-to-lock (on_delete_data) argument, and release_sentinel releases
-     * the indirectly held lock.
-     */
-    void (*on_delete)(void *);
-    void *on_delete_data;
-
-    PyObject *coroutine_wrapper;
-    int in_coroutine_wrapper;
-
-    /* XXX signal handlers should also be here */
-
-} PyThreadState;
-#endif
-
-
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void);
-PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *);
-PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *);
-PyAPI_FUNC(int) _PyState_AddModule(PyObject*, struct PyModuleDef*);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* New in 3.3 */
-PyAPI_FUNC(int) PyState_AddModule(PyObject*, struct PyModuleDef*);
-PyAPI_FUNC(int) PyState_RemoveModule(struct PyModuleDef*);
-#endif
-PyAPI_FUNC(PyObject*) PyState_FindModule(struct PyModuleDef*);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyState_ClearModules(void);
-#endif
-
-PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *);
-PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *);
-PyAPI_FUNC(void) _PyThreadState_Init(PyThreadState *);
-PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *);
-PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
-PyAPI_FUNC(void) _PyThreadState_DeleteExcept(PyThreadState *tstate);
-#ifdef WITH_THREAD
-PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
-PyAPI_FUNC(void) _PyGILState_Reinit(void);
-#endif
-
-/* Return the current thread state. The global interpreter lock must be held.
- * When the current thread state is NULL, this issues a fatal error (so that
- * the caller needn't check for NULL). */
-PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
-
-/* Similar to PyThreadState_Get(), but don't issue a fatal error
- * if it is NULL. */
-PyAPI_FUNC(PyThreadState *) _PyThreadState_UncheckedGet(void);
-
-PyAPI_FUNC(PyThreadState *) PyThreadState_Swap(PyThreadState *);
-PyAPI_FUNC(PyObject *) PyThreadState_GetDict(void);
-PyAPI_FUNC(int) PyThreadState_SetAsyncExc(long, PyObject *);
-
-
-/* Variable and macro for in-line access to current thread state */
-
-/* Assuming the current thread holds the GIL, this is the
-   PyThreadState for the current thread. */
-#ifdef Py_BUILD_CORE
-PyAPI_DATA(_Py_atomic_address) _PyThreadState_Current;
-#  define PyThreadState_GET() \
-             ((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current))
-#else
-#  define PyThreadState_GET() PyThreadState_Get()
-#endif
-
-typedef
-    enum {PyGILState_LOCKED, PyGILState_UNLOCKED}
-        PyGILState_STATE;
-
-#ifdef WITH_THREAD
-
-/* Ensure that the current thread is ready to call the Python
-   C API, regardless of the current state of Python, or of its
-   thread lock.  This may be called as many times as desired
-   by a thread so long as each call is matched with a call to
-   PyGILState_Release().  In general, other thread-state APIs may
-   be used between _Ensure() and _Release() calls, so long as the
-   thread-state is restored to its previous state before the Release().
-   For example, normal use of the Py_BEGIN_ALLOW_THREADS/
-   Py_END_ALLOW_THREADS macros are acceptable.
-
-   The return value is an opaque "handle" to the thread state when
-   PyGILState_Ensure() was called, and must be passed to
-   PyGILState_Release() to ensure Python is left in the same state. Even
-   though recursive calls are allowed, these handles can *not* be shared -
-   each unique call to PyGILState_Ensure must save the handle for its
-   call to PyGILState_Release.
-
-   When the function returns, the current thread will hold the GIL.
-
-   Failure is a fatal error.
-*/
-PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure(void);
-
-/* Release any resources previously acquired.  After this call, Python's
-   state will be the same as it was prior to the corresponding
-   PyGILState_Ensure() call (but generally this state will be unknown to
-   the caller, hence the use of the GILState API.)
-
-   Every call to PyGILState_Ensure must be matched by a call to
-   PyGILState_Release on the same thread.
-*/
-PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE);
-
-/* Helper/diagnostic function - get the current thread state for
-   this thread.  May return NULL if no GILState API has been used
-   on the current thread.  Note that the main thread always has such a
-   thread-state, even if no auto-thread-state call has been made
-   on the main thread.
-*/
-PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void);
-
-/* Helper/diagnostic function - return 1 if the current thread
- * currently holds the GIL, 0 otherwise
- */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) PyGILState_Check(void);
-#endif
-
-#endif   /* #ifdef WITH_THREAD */
-
-/* The implementation of sys._current_frames()  Returns a dict mapping
-   thread id to that thread's current frame.
-*/
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void);
-#endif
-
-/* Routines for advanced debuggers, requested by David Beazley.
-   Don't use unless you know what you are doing! */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void);
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *);
-PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *);
-PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *);
-
-typedef struct _frame *(*PyThreadFrameGetter)(PyThreadState *self_);
-#endif
-
-/* hook for PyEval_GetFrame(), requested for Psyco */
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyThreadFrameGetter) _PyThreadState_GetFrame;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYSTATE_H */
diff --git a/openflow/usr/include/python3.5m/pythread.h b/openflow/usr/include/python3.5m/pythread.h
deleted file mode 100644
index 6e9f303..0000000
--- a/openflow/usr/include/python3.5m/pythread.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-#ifndef Py_PYTHREAD_H
-#define Py_PYTHREAD_H
-
-typedef void *PyThread_type_lock;
-typedef void *PyThread_type_sema;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Return status codes for Python lock acquisition.  Chosen for maximum
- * backwards compatibility, ie failure -> 0, success -> 1.  */
-typedef enum PyLockStatus {
-    PY_LOCK_FAILURE = 0,
-    PY_LOCK_ACQUIRED = 1,
-    PY_LOCK_INTR
-} PyLockStatus;
-
-PyAPI_FUNC(void) PyThread_init_thread(void);
-PyAPI_FUNC(long) PyThread_start_new_thread(void (*)(void *), void *);
-PyAPI_FUNC(void) PyThread_exit_thread(void);
-PyAPI_FUNC(long) PyThread_get_thread_ident(void);
-
-PyAPI_FUNC(PyThread_type_lock) PyThread_allocate_lock(void);
-PyAPI_FUNC(void) PyThread_free_lock(PyThread_type_lock);
-PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int);
-#define WAIT_LOCK	1
-#define NOWAIT_LOCK	0
-
-/* PY_TIMEOUT_T is the integral type used to specify timeouts when waiting
-   on a lock (see PyThread_acquire_lock_timed() below).
-   PY_TIMEOUT_MAX is the highest usable value (in microseconds) of that
-   type, and depends on the system threading API.
-
-   NOTE: this isn't the same value as `_thread.TIMEOUT_MAX`.  The _thread
-   module exposes a higher-level API, with timeouts expressed in seconds
-   and floating-point numbers allowed.
-*/
-#if defined(HAVE_LONG_LONG)
-#define PY_TIMEOUT_T PY_LONG_LONG
-#define PY_TIMEOUT_MAX PY_LLONG_MAX
-#else
-#define PY_TIMEOUT_T long
-#define PY_TIMEOUT_MAX LONG_MAX
-#endif
-
-/* In the NT API, the timeout is a DWORD and is expressed in milliseconds */
-#if defined (NT_THREADS)
-#if (Py_LL(0xFFFFFFFF) * 1000 < PY_TIMEOUT_MAX)
-#undef PY_TIMEOUT_MAX
-#define PY_TIMEOUT_MAX (Py_LL(0xFFFFFFFF) * 1000)
-#endif
-#endif
-
-/* If microseconds == 0, the call is non-blocking: it returns immediately
-   even when the lock can't be acquired.
-   If microseconds > 0, the call waits up to the specified duration.
-   If microseconds < 0, the call waits until success (or abnormal failure)
-
-   microseconds must be less than PY_TIMEOUT_MAX. Behaviour otherwise is
-   undefined.
-
-   If intr_flag is true and the acquire is interrupted by a signal, then the
-   call will return PY_LOCK_INTR.  The caller may reattempt to acquire the
-   lock.
-*/
-PyAPI_FUNC(PyLockStatus) PyThread_acquire_lock_timed(PyThread_type_lock,
-                                                     PY_TIMEOUT_T microseconds,
-                                                     int intr_flag);
-
-PyAPI_FUNC(void) PyThread_release_lock(PyThread_type_lock);
-
-PyAPI_FUNC(size_t) PyThread_get_stacksize(void);
-PyAPI_FUNC(int) PyThread_set_stacksize(size_t);
-
-PyAPI_FUNC(PyObject*) PyThread_GetInfo(void);
-
-/* Thread Local Storage (TLS) API */
-PyAPI_FUNC(int) PyThread_create_key(void);
-PyAPI_FUNC(void) PyThread_delete_key(int);
-PyAPI_FUNC(int) PyThread_set_key_value(int, void *);
-PyAPI_FUNC(void *) PyThread_get_key_value(int);
-PyAPI_FUNC(void) PyThread_delete_key_value(int key);
-
-/* Cleanup after a fork */
-PyAPI_FUNC(void) PyThread_ReInitTLS(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_PYTHREAD_H */
diff --git a/openflow/usr/include/python3.5m/token.h b/openflow/usr/include/python3.5m/token.h
deleted file mode 100644
index 595afa0..0000000
--- a/openflow/usr/include/python3.5m/token.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-/* Token types */
-#ifndef Py_LIMITED_API
-#ifndef Py_TOKEN_H
-#define Py_TOKEN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef TILDE   /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */
-
-#define ENDMARKER	0
-#define NAME		1
-#define NUMBER		2
-#define STRING		3
-#define NEWLINE		4
-#define INDENT		5
-#define DEDENT		6
-#define LPAR		7
-#define RPAR		8
-#define LSQB		9
-#define RSQB		10
-#define COLON		11
-#define COMMA		12
-#define SEMI		13
-#define PLUS		14
-#define MINUS		15
-#define STAR		16
-#define SLASH		17
-#define VBAR		18
-#define AMPER		19
-#define LESS		20
-#define GREATER		21
-#define EQUAL		22
-#define DOT		23
-#define PERCENT		24
-#define LBRACE		25
-#define RBRACE		26
-#define EQEQUAL		27
-#define NOTEQUAL	28
-#define LESSEQUAL	29
-#define GREATEREQUAL	30
-#define TILDE		31
-#define CIRCUMFLEX	32
-#define LEFTSHIFT	33
-#define RIGHTSHIFT	34
-#define DOUBLESTAR	35
-#define PLUSEQUAL	36
-#define MINEQUAL	37
-#define STAREQUAL	38
-#define SLASHEQUAL	39
-#define PERCENTEQUAL	40
-#define AMPEREQUAL	41
-#define VBAREQUAL	42
-#define CIRCUMFLEXEQUAL	43
-#define LEFTSHIFTEQUAL	44
-#define RIGHTSHIFTEQUAL	45
-#define DOUBLESTAREQUAL	46
-#define DOUBLESLASH	47
-#define DOUBLESLASHEQUAL 48
-#define AT              49
-#define ATEQUAL		50
-#define RARROW          51
-#define ELLIPSIS        52
-/* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */
-#define OP		53
-#define AWAIT		54
-#define ASYNC		55
-#define ERRORTOKEN	56
-#define N_TOKENS	57
-
-/* Special definitions for cooperation with parser */
-
-#define NT_OFFSET		256
-
-#define ISTERMINAL(x)		((x) < NT_OFFSET)
-#define ISNONTERMINAL(x)	((x) >= NT_OFFSET)
-#define ISEOF(x)		((x) == ENDMARKER)
-
-
-PyAPI_DATA(const char *) _PyParser_TokenNames[]; /* Token names */
-PyAPI_FUNC(int) PyToken_OneChar(int);
-PyAPI_FUNC(int) PyToken_TwoChars(int, int);
-PyAPI_FUNC(int) PyToken_ThreeChars(int, int, int);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TOKEN_H */
-#endif /* Py_LIMITED_API */
diff --git a/openflow/usr/include/python3.5m/traceback.h b/openflow/usr/include/python3.5m/traceback.h
deleted file mode 100644
index c3ecbe2..0000000
--- a/openflow/usr/include/python3.5m/traceback.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-#ifndef Py_TRACEBACK_H
-#define Py_TRACEBACK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "pystate.h"
-
-struct _frame;
-
-/* Traceback interface */
-#ifndef Py_LIMITED_API
-typedef struct _traceback {
-    PyObject_HEAD
-    struct _traceback *tb_next;
-    struct _frame *tb_frame;
-    int tb_lasti;
-    int tb_lineno;
-} PyTracebackObject;
-#endif
-
-PyAPI_FUNC(int) PyTraceBack_Here(struct _frame *);
-PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, PyObject *, int, int);
-PyAPI_FUNC(void) _PyTraceback_Add(const char *, const char *, int);
-#endif
-
-/* Reveal traceback type so we can typecheck traceback objects */
-PyAPI_DATA(PyTypeObject) PyTraceBack_Type;
-#define PyTraceBack_Check(v) (Py_TYPE(v) == &PyTraceBack_Type)
-
-/* Write the Python traceback into the file 'fd'. For example:
-
-       Traceback (most recent call first):
-         File "xxx", line xxx in <xxx>
-         File "xxx", line xxx in <xxx>
-         ...
-         File "xxx", line xxx in <xxx>
-
-   This function is written for debug purpose only, to dump the traceback in
-   the worst case: after a segmentation fault, at fatal error, etc. That's why,
-   it is very limited. Strings are truncated to 100 characters and encoded to
-   ASCII with backslashreplace. It doesn't write the source code, only the
-   function name, filename and line number of each frame. Write only the first
-   100 frames: if the traceback is truncated, write the line " ...".
-
-   This function is signal safe. */
-
-PyAPI_FUNC(void) _Py_DumpTraceback(
-    int fd,
-    PyThreadState *tstate);
-
-/* Write the traceback of all threads into the file 'fd'. current_thread can be
-   NULL. Return NULL on success, or an error message on error.
-
-   This function is written for debug purpose only. It calls
-   _Py_DumpTraceback() for each thread, and so has the same limitations. It
-   only write the traceback of the first 100 threads: write "..." if there are
-   more threads.
-
-   This function is signal safe. */
-
-PyAPI_FUNC(const char*) _Py_DumpTracebackThreads(
-    int fd, PyInterpreterState *interp,
-    PyThreadState *current_thread);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TRACEBACK_H */
diff --git a/openflow/usr/include/quagga/buffer.h b/openflow/usr/include/quagga/buffer.h
deleted file mode 100644
index 6c3dc76..0000000
--- a/openflow/usr/include/quagga/buffer.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Buffering to output and input. 
- * Copyright (C) 1998 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_BUFFER_H
-#define _ZEBRA_BUFFER_H
-
-
-/* Create a new buffer.  Memory will be allocated in chunks of the given
-   size.  If the argument is 0, the library will supply a reasonable
-   default size suitable for buffering socket I/O. */
-extern struct buffer *buffer_new (size_t);
-
-/* Free all data in the buffer. */
-extern void buffer_reset (struct buffer *);
-
-/* This function first calls buffer_reset to release all buffered data.
-   Then it frees the struct buffer itself. */
-extern void buffer_free (struct buffer *);
-
-/* Add the given data to the end of the buffer. */
-extern void buffer_put (struct buffer *, const void *, size_t);
-/* Add a single character to the end of the buffer. */
-extern void buffer_putc (struct buffer *, u_char);
-/* Add a NUL-terminated string to the end of the buffer. */
-extern void buffer_putstr (struct buffer *, const char *);
-
-/* Combine all accumulated (and unflushed) data inside the buffer into a
-   single NUL-terminated string allocated using XMALLOC(MTYPE_TMP).  Note
-   that this function does not alter the state of the buffer, so the data
-   is still inside waiting to be flushed. */
-char *buffer_getstr (struct buffer *);
-
-/* Returns 1 if there is no pending data in the buffer.  Otherwise returns 0. */
-int buffer_empty (struct buffer *);
-
-typedef enum
-  {
-    /* An I/O error occurred.  The buffer should be destroyed and the
-       file descriptor should be closed. */
-    BUFFER_ERROR = -1,
-
-    /* The data was written successfully, and the buffer is now empty
-       (there is no pending data waiting to be flushed). */
-    BUFFER_EMPTY = 0,
-
-    /* There is pending data in the buffer waiting to be flushed.  Please
-       try flushing the buffer when select indicates that the file descriptor
-       is writeable. */
-    BUFFER_PENDING = 1
-  } buffer_status_t;
-
-/* Try to write this data to the file descriptor.  Any data that cannot
-   be written immediately is added to the buffer queue. */
-extern buffer_status_t buffer_write(struct buffer *, int fd,
-				    const void *, size_t);
-
-/* This function attempts to flush some (but perhaps not all) of 
-   the queued data to the given file descriptor. */
-extern buffer_status_t buffer_flush_available(struct buffer *, int fd);
-
-/* The following 2 functions (buffer_flush_all and buffer_flush_window)
-   are for use in lib/vty.c only.  They should not be used elsewhere. */
-
-/* Call buffer_flush_available repeatedly until either all data has been
-   flushed, or an I/O error has been encountered, or the operation would
-   block. */
-extern buffer_status_t buffer_flush_all (struct buffer *, int fd);
-
-/* Attempt to write enough data to the given fd to fill a window of the
-   given width and height (and remove the data written from the buffer).
-
-   If !no_more, then a message saying " --More-- " is appended. 
-   If erase is true, then first overwrite the previous " --More-- " message
-   with spaces.
-
-   Any write error (including EAGAIN or EINTR) will cause this function
-   to return -1 (because the logic for handling the erase and more features
-   is too complicated to retry the write later).
-*/
-extern buffer_status_t buffer_flush_window (struct buffer *, int fd, int width,
-					    int height, int erase, int no_more);
-
-#endif /* _ZEBRA_BUFFER_H */
diff --git a/openflow/usr/include/quagga/checksum.h b/openflow/usr/include/quagga/checksum.h
deleted file mode 100644
index b310f74..0000000
--- a/openflow/usr/include/quagga/checksum.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern int in_cksum(void *, int);
-#define FLETCHER_CHECKSUM_VALIDATE 0xffff
-extern u_int16_t fletcher_checksum(u_char *, const size_t len, const uint16_t offset);
diff --git a/openflow/usr/include/quagga/command.h b/openflow/usr/include/quagga/command.h
deleted file mode 100644
index 8eb0cbd..0000000
--- a/openflow/usr/include/quagga/command.h
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
- * Zebra configuration command interface routine
- * Copyright (C) 1997, 98 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- * 
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_COMMAND_H
-#define _ZEBRA_COMMAND_H
-
-#include "vector.h"
-#include "vty.h"
-#include "lib/route_types.h"
-
-/* Host configuration variable */
-struct host
-{
-  /* Host name of this router. */
-  char *name;
-
-  /* Password for vty interface. */
-  char *password;
-  char *password_encrypt;
-
-  /* Enable password */
-  char *enable;
-  char *enable_encrypt;
-
-  /* System wide terminal lines. */
-  int lines;
-
-  /* Log filename. */
-  char *logfile;
-
-  /* config file name of this host */
-  char *config;
-
-  /* Flags for services */
-  int advanced;
-  int encrypt;
-
-  /* Banner configuration. */
-  const char *motd;
-  char *motdfile;
-};
-
-/* There are some command levels which called from command node. */
-enum node_type 
-{
-  AUTH_NODE,			/* Authentication mode of vty interface. */
-  RESTRICTED_NODE,		/* Restricted view mode */ 
-  VIEW_NODE,			/* View node. Default mode of vty interface. */
-  AUTH_ENABLE_NODE,		/* Authentication mode for change enable. */
-  ENABLE_NODE,			/* Enable node. */
-  CONFIG_NODE,			/* Config node. Default mode of config file. */
-  SERVICE_NODE, 		/* Service node. */
-  DEBUG_NODE,			/* Debug node. */
-  AAA_NODE,			/* AAA node. */
-  KEYCHAIN_NODE,		/* Key-chain node. */
-  KEYCHAIN_KEY_NODE,		/* Key-chain key node. */
-  INTERFACE_NODE,		/* Interface mode node. */
-  ZEBRA_NODE,			/* zebra connection node. */
-  TABLE_NODE,			/* rtm_table selection node. */
-  RIP_NODE,			/* RIP protocol mode node. */ 
-  RIPNG_NODE,			/* RIPng protocol mode node. */
-  BABEL_NODE,			/* Babel protocol mode node. */
-  BGP_NODE,			/* BGP protocol mode which includes BGP4+ */
-  BGP_VPNV4_NODE,		/* BGP MPLS-VPN PE exchange. */
-  BGP_IPV4_NODE,		/* BGP IPv4 unicast address family.  */
-  BGP_IPV4M_NODE,		/* BGP IPv4 multicast address family.  */
-  BGP_IPV6_NODE,		/* BGP IPv6 address family */
-  BGP_IPV6M_NODE,		/* BGP IPv6 multicast address family. */
-  OSPF_NODE,			/* OSPF protocol mode */
-  OSPF6_NODE,			/* OSPF protocol for IPv6 mode */
-  ISIS_NODE,			/* ISIS protocol mode */
-  PIM_NODE,			/* PIM protocol mode */
-  MASC_NODE,			/* MASC for multicast.  */
-  IRDP_NODE,			/* ICMP Router Discovery Protocol mode. */ 
-  IP_NODE,			/* Static ip route node. */
-  ACCESS_NODE,			/* Access list node. */
-  PREFIX_NODE,			/* Prefix list node. */
-  ACCESS_IPV6_NODE,		/* Access list node. */
-  PREFIX_IPV6_NODE,		/* Prefix list node. */
-  AS_LIST_NODE,			/* AS list node. */
-  COMMUNITY_LIST_NODE,		/* Community list node. */
-  RMAP_NODE,			/* Route map node. */
-  SMUX_NODE,			/* SNMP configuration node. */
-  DUMP_NODE,			/* Packet dump node. */
-  FORWARDING_NODE,		/* IP forwarding node. */
-  PROTOCOL_NODE,                /* protocol filtering node */
-  VTY_NODE,			/* Vty node. */
-};
-
-/* Node which has some commands and prompt string and configuration
-   function pointer . */
-struct cmd_node 
-{
-  /* Node index. */
-  enum node_type node;		
-
-  /* Prompt character at vty interface. */
-  const char *prompt;			
-
-  /* Is this node's configuration goes to vtysh ? */
-  int vtysh;
-  
-  /* Node's configuration write function */
-  int (*func) (struct vty *);
-
-  /* Vector of this node's command list. */
-  vector cmd_vector;	
-};
-
-enum
-{
-  CMD_ATTR_DEPRECATED = 1,
-  CMD_ATTR_HIDDEN,
-};
-
-/* Structure of command element. */
-struct cmd_element 
-{
-  const char *string;			/* Command specification by string. */
-  int (*func) (struct cmd_element *, struct vty *, int, const char *[]);
-  const char *doc;			/* Documentation of this command. */
-  int daemon;                   /* Daemon to which this command belong. */
-  vector tokens;		/* Vector of cmd_tokens */
-  u_char attr;			/* Command attributes */
-};
-
-
-enum cmd_token_type
-{
-  TOKEN_TERMINAL = 0,
-  TOKEN_MULTIPLE,
-  TOKEN_KEYWORD,
-};
-
-/* Command description structure. */
-struct cmd_token
-{
-  enum cmd_token_type type;
-
-  /* Used for type == MULTIPLE */
-  vector multiple; /* vector of cmd_token, type == FINAL */
-
-  /* Used for type == KEYWORD */
-  vector keyword; /* vector of vector of cmd_tokens */
-
-  /* Used for type == TERMINAL */
-  char *cmd;                    /* Command string. */
-  char *desc;                    /* Command's description. */
-};
-
-/* Return value of the commands. */
-#define CMD_SUCCESS              0
-#define CMD_WARNING              1
-#define CMD_ERR_NO_MATCH         2
-#define CMD_ERR_AMBIGUOUS        3
-#define CMD_ERR_INCOMPLETE       4
-#define CMD_ERR_EXEED_ARGC_MAX   5
-#define CMD_ERR_NOTHING_TODO     6
-#define CMD_COMPLETE_FULL_MATCH  7
-#define CMD_COMPLETE_MATCH       8
-#define CMD_COMPLETE_LIST_MATCH  9
-#define CMD_SUCCESS_DAEMON      10
-
-/* Argc max counts. */
-#define CMD_ARGC_MAX   25
-
-/* Turn off these macros when uisng cpp with extract.pl */
-#ifndef VTYSH_EXTRACT_PL  
-
-/* helper defines for end-user DEFUN* macros */
-#define DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, attrs, dnum) \
-  struct cmd_element cmdname = \
-  { \
-    .string = cmdstr, \
-    .func = funcname, \
-    .doc = helpstr, \
-    .attr = attrs, \
-    .daemon = dnum, \
-  };
-
-#define DEFUN_CMD_FUNC_DECL(funcname) \
-  static int funcname (struct cmd_element *, struct vty *, int, const char *[]);
-
-#define DEFUN_CMD_FUNC_TEXT(funcname) \
-  static int funcname \
-    (struct cmd_element *self __attribute__ ((unused)), \
-     struct vty *vty __attribute__ ((unused)), \
-     int argc __attribute__ ((unused)), \
-     const char *argv[] __attribute__ ((unused)) )
-
-/* DEFUN for vty command interafce. Little bit hacky ;-).
- *
- * DEFUN(funcname, cmdname, cmdstr, helpstr)
- *
- * funcname
- * ========
- *
- * Name of the function that will be defined.
- *
- * cmdname
- * =======
- *
- * Name of the struct that will be defined for the command.
- *
- * cmdstr
- * ======
- *
- * The cmdstr defines the command syntax. It is used by the vty subsystem
- * and vtysh to perform matching and completion in the cli. So you have to take
- * care to construct it adhering to the following grammar. The names used
- * for the production rules losely represent the names used in lib/command.c
- *
- * cmdstr = cmd_token , { " " , cmd_token } ;
- *
- * cmd_token = cmd_terminal
- *           | cmd_multiple
- *           | cmd_keyword ;
- *
- * cmd_terminal_fixed = fixed_string
- *                    | variable
- *                    | range
- *                    | ipv4
- *                    | ipv4_prefix
- *                    | ipv6
- *                    | ipv6_prefix ;
- *
- * cmd_terminal = cmd_terminal_fixed
- *              | option
- *              | vararg ;
- *
- * multiple_part = cmd_terminal_fixed ;
- * cmd_multiple = "(" , multiple_part , ( "|" | { "|" , multiple_part } ) , ")" ;
- *
- * keyword_part = fixed_string , { " " , ( cmd_terminal_fixed | cmd_multiple ) } ;
- * cmd_keyword = "{" , keyword_part , { "|" , keyword_part } , "}" ;
- *
- * lowercase = "a" | ... | "z" ;
- * uppercase = "A" | ... | "Z" ;
- * digit = "0" | ... | "9" ;
- * number = digit , { digit } ;
- *
- * fixed_string = (lowercase | digit) , { lowercase | digit | uppercase | "-" | "_" } ;
- * variable = uppercase , { uppercase | "_" } ;
- * range = "<" , number , "-" , number , ">" ;
- * ipv4 = "A.B.C.D" ;
- * ipv4_prefix = "A.B.C.D/M" ;
- * ipv6 = "X:X::X:X" ;
- * ipv6_prefix = "X:X::X:X/M" ;
- * option = "[" , variable , "]" ;
- * vararg = "." , variable ;
- *
- * To put that all in a textual description: A cmdstr is a sequence of tokens,
- * separated by spaces.
- *
- * Terminal Tokens:
- *
- * A very simple cmdstring would be something like: "show ip bgp". It consists
- * of three Terminal Tokens, each containing a fixed string. When this command
- * is called, no arguments will be passed down to the function implementing it,
- * as it only consists of fixed strings.
- *
- * Apart from fixed strings, Terminal Tokens can also contain variables:
- * An example would be "show ip bgp A.B.C.D". This command expects an IPv4
- * as argument. As this is a variable, the IP address entered by the user will
- * be passed down as an argument. Apart from two exceptions, the other options
- * for Terminal Tokens behave exactly as we just discussed and only make a
- * difference for the CLI. The two exceptions will be discussed in the next
- * paragraphs.
- *
- * A Terminal Token can contain a so called option match. This is a simple
- * string variable that the user may omit. An example would be:
- * "show interface [IFNAME]". If the user calls this without an interface as
- * argument, no arguments will be passed down to the function implementing
- * this command. Otherwise, the interface name will be provided to the function
- * as a regular argument.
-
- * Also, a Terminal Token can contain a so called vararg. This is used e.g. in
- * "show ip bgp regexp .LINE". The last token is a vararg match and will
- * consume all the arguments the user inputs on the command line and append
- * those to the list of arguments passed down to the function implementing this
- * command. (Therefore, it doesn't make much sense to have any tokens after a
- * vararg because the vararg will already consume all the words the user entered
- * in the CLI)
- *
- * Multiple Tokens:
- *
- * The Multiple Token type can be used if there are multiple possibilities what
- * arguments may be used for a command, but it should map to the same function
- * nonetheless. An example would be "ip route A.B.C.D/M (reject|blackhole)"
- * In that case both "reject" and "blackhole" would be acceptable as last
- * arguments. The words matched by Multiple Tokens are always added to the
- * argument list, even if they are matched by fixed strings. Such a Multiple
- * Token can contain almost any type of token that would also be acceptable
- * for a Terminal Token, the exception are optional variables and varag.
- *
- * There is one special case that is used in some places of Quagga that should be
- * pointed out here shortly. An example would be "password (8|) WORD". This
- * construct is used to have fixed strings communicated as arguments. (The "8"
- * will be passed down as an argument in this case) It does not mean that
- * the "8" is optional. Another historic and possibly surprising property of
- * this construct is that it consumes two parts of helpstr. (Help
- * strings will be explained later)
- *
- * Keyword Tokens:
- *
- * There are commands that take a lot of different and possibly optional arguments.
- * An example from ospf would be the "default-information originate" command. This
- * command takes a lot of optional arguments that may be provided in any order.
- * To accomodate such commands, the Keyword Token has been implemented.
- * Using the keyword token, the "default-information originate" command and all
- * its possible options can be represented using this single cmdstr:
- * "default-information originate \
- *  {always|metric <0-16777214>|metric-type (1|2)|route-map WORD}"
- *
- * Keywords always start with a fixed string and may be followed by arguments.
- * Except optional variables and vararg, everything is permitted here.
- *
- * For the special case of a keyword without arguments, either NULL or the
- * keyword itself will be pushed as an argument, depending on whether the
- * keyword is present.
- * For the other keywords, arguments will be only pushed for
- * variables/Multiple Tokens. If the keyword is not present, the arguments that
- * would have been pushed will be substituted by NULL.
- *
- * A few examples:
- *   "default information originate metric-type 1 metric 1000"
- * would yield the following arguments:
- *   { NULL, "1000", "1", NULL }
- *
- *   "default information originate always route-map RMAP-DEFAULT"
- * would yield the following arguments:
- *   { "always", NULL, NULL, "RMAP-DEFAULT" }
- *
- * helpstr
- * =======
- *
- * The helpstr is used to show a short explantion for the commands that
- * are available when the user presses '?' on the CLI. It is the concatenation
- * of the helpstrings for all the tokens that make up the command.
- *
- * There should be one helpstring for each token in the cmdstr except those
- * containing other tokens, like Multiple or Keyword Tokens. For those, there
- * will only be the helpstrings of the contained tokens.
- *
- * The individual helpstrings are expected to be in the same order as their
- * respective Tokens appear in the cmdstr. They should each be terminated with
- * a linefeed. The last helpstring should be terminated with a linefeed as well.
- *
- * Care should also be taken to avoid having similar tokens with different
- * helpstrings. Imagine e.g. the commands "show ip ospf" and "show ip bgp".
- * they both contain a helpstring for "show", but only one will be displayed
- * when the user enters "sh?". If those two helpstrings differ, it is not
- * defined which one will be shown and the behavior is therefore unpredictable.
- */
-#define DEFUN(funcname, cmdname, cmdstr, helpstr) \
-  DEFUN_CMD_FUNC_DECL(funcname) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, 0, 0) \
-  DEFUN_CMD_FUNC_TEXT(funcname)
-
-#define DEFUN_ATTR(funcname, cmdname, cmdstr, helpstr, attr) \
-  DEFUN_CMD_FUNC_DECL(funcname) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, attr, 0) \
-  DEFUN_CMD_FUNC_TEXT(funcname)
-
-#define DEFUN_HIDDEN(funcname, cmdname, cmdstr, helpstr) \
-  DEFUN_ATTR (funcname, cmdname, cmdstr, helpstr, CMD_ATTR_HIDDEN)
-
-#define DEFUN_DEPRECATED(funcname, cmdname, cmdstr, helpstr) \
-  DEFUN_ATTR (funcname, cmdname, cmdstr, helpstr, CMD_ATTR_DEPRECATED) \
-
-/* DEFUN_NOSH for commands that vtysh should ignore */
-#define DEFUN_NOSH(funcname, cmdname, cmdstr, helpstr) \
-  DEFUN(funcname, cmdname, cmdstr, helpstr)
-
-/* DEFSH for vtysh. */
-#define DEFSH(daemon, cmdname, cmdstr, helpstr) \
-  DEFUN_CMD_ELEMENT(NULL, cmdname, cmdstr, helpstr, 0, daemon) \
-
-/* DEFUN + DEFSH */
-#define DEFUNSH(daemon, funcname, cmdname, cmdstr, helpstr) \
-  DEFUN_CMD_FUNC_DECL(funcname) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, 0, daemon) \
-  DEFUN_CMD_FUNC_TEXT(funcname)
-
-/* DEFUN + DEFSH with attributes */
-#define DEFUNSH_ATTR(daemon, funcname, cmdname, cmdstr, helpstr, attr) \
-  DEFUN_CMD_FUNC_DECL(funcname) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, attr, daemon) \
-  DEFUN_CMD_FUNC_TEXT(funcname)
-
-#define DEFUNSH_HIDDEN(daemon, funcname, cmdname, cmdstr, helpstr) \
-  DEFUNSH_ATTR (daemon, funcname, cmdname, cmdstr, helpstr, CMD_ATTR_HIDDEN)
-
-#define DEFUNSH_DEPRECATED(daemon, funcname, cmdname, cmdstr, helpstr) \
-  DEFUNSH_ATTR (daemon, funcname, cmdname, cmdstr, helpstr, CMD_ATTR_DEPRECATED)
-
-/* ALIAS macro which define existing command's alias. */
-#define ALIAS(funcname, cmdname, cmdstr, helpstr) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, 0, 0)
-
-#define ALIAS_ATTR(funcname, cmdname, cmdstr, helpstr, attr) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, attr, 0)
-
-#define ALIAS_HIDDEN(funcname, cmdname, cmdstr, helpstr) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, CMD_ATTR_HIDDEN, 0)
-
-#define ALIAS_DEPRECATED(funcname, cmdname, cmdstr, helpstr) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, CMD_ATTR_DEPRECATED, 0)
-
-#define ALIAS_SH(daemon, funcname, cmdname, cmdstr, helpstr) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, 0, daemon)
-
-#define ALIAS_SH_HIDDEN(daemon, funcname, cmdname, cmdstr, helpstr) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, CMD_ATTR_HIDDEN, daemon)
-
-#define ALIAS_SH_DEPRECATED(daemon, funcname, cmdname, cmdstr, helpstr) \
-  DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, CMD_ATTR_DEPRECATED, daemon)
-
-#endif /* VTYSH_EXTRACT_PL */
-
-/* Some macroes */
-#define CMD_OPTION(S)   ((S[0]) == '[')
-#define CMD_VARIABLE(S) (((S[0]) >= 'A' && (S[0]) <= 'Z') || ((S[0]) == '<'))
-#define CMD_VARARG(S)   ((S[0]) == '.')
-#define CMD_RANGE(S)	((S[0] == '<'))
-
-#define CMD_IPV4(S)	   ((strcmp ((S), "A.B.C.D") == 0))
-#define CMD_IPV4_PREFIX(S) ((strcmp ((S), "A.B.C.D/M") == 0))
-#define CMD_IPV6(S)        ((strcmp ((S), "X:X::X:X") == 0))
-#define CMD_IPV6_PREFIX(S) ((strcmp ((S), "X:X::X:X/M") == 0))
-
-/* Common descriptions. */
-#define SHOW_STR "Show running system information\n"
-#define IP_STR "IP information\n"
-#define IPV6_STR "IPv6 information\n"
-#define NO_STR "Negate a command or set its defaults\n"
-#define REDIST_STR "Redistribute information from another routing protocol\n"
-#define CLEAR_STR "Reset functions\n"
-#define RIP_STR "RIP information\n"
-#define BGP_STR "BGP information\n"
-#define OSPF_STR "OSPF information\n"
-#define NEIGHBOR_STR "Specify neighbor router\n"
-#define DEBUG_STR "Debugging functions (see also 'undebug')\n"
-#define UNDEBUG_STR "Disable debugging functions (see also 'debug')\n"
-#define ROUTER_STR "Enable a routing process\n"
-#define AS_STR "AS number\n"
-#define MBGP_STR "MBGP information\n"
-#define MATCH_STR "Match values from routing table\n"
-#define SET_STR "Set values in destination routing protocol\n"
-#define OUT_STR "Filter outgoing routing updates\n"
-#define IN_STR  "Filter incoming routing updates\n"
-#define V4NOTATION_STR "specify by IPv4 address notation(e.g. 0.0.0.0)\n"
-#define OSPF6_NUMBER_STR "Specify by number\n"
-#define INTERFACE_STR "Interface infomation\n"
-#define IFNAME_STR "Interface name(e.g. ep0)\n"
-#define IP6_STR "IPv6 Information\n"
-#define OSPF6_STR "Open Shortest Path First (OSPF) for IPv6\n"
-#define OSPF6_ROUTER_STR "Enable a routing process\n"
-#define OSPF6_INSTANCE_STR "<1-65535> Instance ID\n"
-#define SECONDS_STR "<1-65535> Seconds\n"
-#define ROUTE_STR "Routing Table\n"
-#define PREFIX_LIST_STR "Build a prefix list\n"
-#define OSPF6_DUMP_TYPE_LIST \
-"(neighbor|interface|area|lsa|zebra|config|dbex|spf|route|lsdb|redistribute|hook|asbr|prefix|abr)"
-#define ISIS_STR "IS-IS information\n"
-#define AREA_TAG_STR "[area tag]\n"
-
-#define CONF_BACKUP_EXT ".sav"
-
-/* IPv4 only machine should not accept IPv6 address for peer's IP
-   address.  So we replace VTY command string like below. */
-#ifdef HAVE_IPV6
-#define NEIGHBOR_CMD       "neighbor (A.B.C.D|X:X::X:X) "
-#define NO_NEIGHBOR_CMD    "no neighbor (A.B.C.D|X:X::X:X) "
-#define NEIGHBOR_ADDR_STR  "Neighbor address\nIPv6 address\n"
-#define NEIGHBOR_CMD2      "neighbor (A.B.C.D|X:X::X:X|WORD) "
-#define NO_NEIGHBOR_CMD2   "no neighbor (A.B.C.D|X:X::X:X|WORD) "
-#define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor IPv6 address\nNeighbor tag\n"
-#else
-#define NEIGHBOR_CMD       "neighbor A.B.C.D "
-#define NO_NEIGHBOR_CMD    "no neighbor A.B.C.D "
-#define NEIGHBOR_ADDR_STR  "Neighbor address\n"
-#define NEIGHBOR_CMD2      "neighbor (A.B.C.D|WORD) "
-#define NO_NEIGHBOR_CMD2   "no neighbor (A.B.C.D|WORD) "
-#define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor tag\n"
-#endif /* HAVE_IPV6 */
-
-/* Prototypes. */
-extern void install_node (struct cmd_node *, int (*) (struct vty *));
-extern void install_default (enum node_type);
-extern void install_element (enum node_type, struct cmd_element *);
-
-/* Concatenates argv[shift] through argv[argc-1] into a single NUL-terminated
-   string with a space between each element (allocated using
-   XMALLOC(MTYPE_TMP)).  Returns NULL if shift >= argc. */
-extern char *argv_concat (const char **argv, int argc, int shift);
-
-extern vector cmd_make_strvec (const char *);
-extern void cmd_free_strvec (vector);
-extern vector cmd_describe_command (vector, struct vty *, int *status);
-extern char **cmd_complete_command (vector, struct vty *, int *status);
-extern const char *cmd_prompt (enum node_type);
-extern int config_from_file (struct vty *, FILE *, unsigned int *line_num);
-extern enum node_type node_parent (enum node_type);
-extern int cmd_execute_command (vector, struct vty *, struct cmd_element **, int);
-extern int cmd_execute_command_strict (vector, struct vty *, struct cmd_element **);
-extern void cmd_init (int);
-extern void cmd_terminate (void);
-
-/* Export typical functions. */
-extern struct cmd_element config_end_cmd;
-extern struct cmd_element config_exit_cmd;
-extern struct cmd_element config_quit_cmd;
-extern struct cmd_element config_help_cmd;
-extern struct cmd_element config_list_cmd;
-extern char *host_config_file (void);
-extern void host_config_set (char *);
-
-extern void print_version (const char *);
-
-/* struct host global, ick */
-extern struct host host; 
-
-/* "<cr>" global */
-extern char *command_cr;
-#endif /* _ZEBRA_COMMAND_H */
diff --git a/openflow/usr/include/quagga/distribute.h b/openflow/usr/include/quagga/distribute.h
deleted file mode 100644
index 5072016..0000000
--- a/openflow/usr/include/quagga/distribute.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Distribute list functions header
- * Copyright (C) 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_DISTRIBUTE_H
-#define _ZEBRA_DISTRIBUTE_H
-
-#include <zebra.h>
-#include "if.h"
-
-/* Disctirubte list types. */
-enum distribute_type
-{
-  DISTRIBUTE_IN,
-  DISTRIBUTE_OUT,
-  DISTRIBUTE_MAX
-};
-
-struct distribute
-{
-  /* Name of the interface. */
-  char *ifname;
-
-  /* Filter name of `in' and `out' */
-  char *list[DISTRIBUTE_MAX];
-
-  /* prefix-list name of `in' and `out' */
-  char *prefix[DISTRIBUTE_MAX];
-};
-
-/* Prototypes for distribute-list. */
-extern void distribute_list_init (int);
-extern void distribute_list_reset (void);
-extern void distribute_list_add_hook (void (*) (struct distribute *));
-extern void distribute_list_delete_hook (void (*) (struct distribute *));
-extern struct distribute *distribute_lookup (const char *);
-extern int config_write_distribute (struct vty *);
-extern int config_show_distribute (struct vty *);
-
-extern enum filter_type distribute_apply_in (struct interface *, struct prefix *);
-extern enum filter_type distribute_apply_out (struct interface *, struct prefix *);
-
-#endif /* _ZEBRA_DISTRIBUTE_H */
diff --git a/openflow/usr/include/quagga/filter.h b/openflow/usr/include/quagga/filter.h
deleted file mode 100644
index 37535cb..0000000
--- a/openflow/usr/include/quagga/filter.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Route filtering function.
- * Copyright (C) 1998 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA. 
- */
-
-#ifndef _ZEBRA_FILTER_H
-#define _ZEBRA_FILTER_H
-
-#include "if.h"
-
-/* Filter type is made by `permit', `deny' and `dynamic'. */
-enum filter_type 
-{
-  FILTER_DENY,
-  FILTER_PERMIT,
-  FILTER_DYNAMIC
-};
-
-enum access_type
-{
-  ACCESS_TYPE_STRING,
-  ACCESS_TYPE_NUMBER
-};
-
-/* Access list */
-struct access_list
-{
-  char *name;
-  char *remark;
-
-  struct access_master *master;
-
-  enum access_type type;
-
-  struct access_list *next;
-  struct access_list *prev;
-
-  struct filter *head;
-  struct filter *tail;
-};
-
-/* Prototypes for access-list. */
-extern void access_list_init (void);
-extern void access_list_reset (void);
-extern void access_list_add_hook (void (*func)(struct access_list *));
-extern void access_list_delete_hook (void (*func)(struct access_list *));
-extern struct access_list *access_list_lookup (afi_t, const char *);
-extern enum filter_type access_list_apply (struct access_list *, void *);
-
-#endif /* _ZEBRA_FILTER_H */
diff --git a/openflow/usr/include/quagga/getopt.h b/openflow/usr/include/quagga/getopt.h
deleted file mode 100644
index b359a47..0000000
--- a/openflow/usr/include/quagga/getopt.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
-
-   NOTE: The canonical source of this file is maintained with the GNU C Library.
-   Bugs can be reported to bug-glibc@gnu.org.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef _GETOPT_H
-#define _GETOPT_H 1
-
-/*
- * The operating system may or may not provide getopt_long(), and if
- * so it may or may not be a version we are willing to use.  Our
- * strategy is to declare getopt here, and then provide code unless
- * the supplied version is adequate.  The difficult case is when a
- * declaration for getopt is provided, as our declaration must match.
- *
- * XXX Arguably this version should be named differently, and the
- * local names defined to refer to the system version when we choose
- * to use the system version.
- */
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int optopt;
-
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument		(or 0) if the option does not take an argument,
-   required_argument	(or 1) if the option requires an argument,
-   optional_argument 	(or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct option
-{
-#if defined (__STDC__) && __STDC__
-  const char *name;
-#else
-  char *name;
-#endif
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-#define	no_argument		0
-#define required_argument	1
-#define optional_argument	2
-
-#if defined (__STDC__) && __STDC__
-
-#if REALLY_NEED_PLAIN_GETOPT
-
-/*
- * getopt is defined in POSIX.2.  Assume that if the system defines
- * getopt that it complies with POSIX.2.  If not, an autoconf test
- * should be written to define NONPOSIX_GETOPT_DEFINITION.
- */
-#ifndef NONPOSIX_GETOPT_DEFINITION
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* NONPOSIX_GETOPT_DEFINITION */
-extern int getopt (void);
-#endif /* NONPOSIX_GETOPT_DEFINITION */
-
-#endif
-
-
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-		        const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind);
-
-/* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind,
-			     int long_only);
-#else /* not __STDC__ */
-
-#ifdef REALLY_NEED_PLAIN_GETOPT
-extern int getopt ();
-#endif /* REALLY_NEED_PLAIN_GETOPT */
-
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-
-#endif /* __STDC__ */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* getopt.h */
diff --git a/openflow/usr/include/quagga/hash.h b/openflow/usr/include/quagga/hash.h
deleted file mode 100644
index 920c668..0000000
--- a/openflow/usr/include/quagga/hash.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Hash routine.
-   Copyright (C) 1998 Kunihiro Ishiguro
-
-This file is part of GNU Zebra.
-
-GNU Zebra is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2, or (at your
-option) any later version.
-
-GNU Zebra is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Zebra; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#ifndef _ZEBRA_HASH_H
-#define _ZEBRA_HASH_H
-
-/* Default hash table size.  */ 
-#define HASH_INITIAL_SIZE     256	/* initial number of backets. */
-#define HASH_THRESHOLD	      10	/* expand when backet. */
-
-struct hash_backet
-{
-  /* Linked list.  */
-  struct hash_backet *next;
-
-  /* Hash key. */
-  unsigned int key;
-
-  /* Data.  */
-  void *data;
-};
-
-struct hash
-{
-  /* Hash backet. */
-  struct hash_backet **index;
-
-  /* Hash table size. Must be power of 2 */
-  unsigned int size;
-
-  /* If expansion failed. */
-  int no_expand;
-
-  /* Key make function. */
-  unsigned int (*hash_key) (void *);
-
-  /* Data compare function. */
-  int (*hash_cmp) (const void *, const void *);
-
-  /* Backet alloc. */
-  unsigned long count;
-};
-
-extern struct hash *hash_create (unsigned int (*) (void *), 
-				 int (*) (const void *, const void *));
-extern struct hash *hash_create_size (unsigned int, unsigned int (*) (void *), 
-                                             int (*) (const void *, const void *));
-
-extern void *hash_get (struct hash *, void *, void * (*) (void *));
-extern void *hash_alloc_intern (void *);
-extern void *hash_lookup (struct hash *, void *);
-extern void *hash_release (struct hash *, void *);
-
-extern void hash_iterate (struct hash *, 
-		   void (*) (struct hash_backet *, void *), void *);
-
-extern void hash_clean (struct hash *, void (*) (void *));
-extern void hash_free (struct hash *);
-
-extern unsigned int string_hash_make (const char *);
-
-#endif /* _ZEBRA_HASH_H */
diff --git a/openflow/usr/include/quagga/if.h b/openflow/usr/include/quagga/if.h
deleted file mode 100644
index 8081be8..0000000
--- a/openflow/usr/include/quagga/if.h
+++ /dev/null
@@ -1,324 +0,0 @@
-/* Interface related header.
-   Copyright (C) 1997, 98, 99 Kunihiro Ishiguro
-
-This file is part of GNU Zebra.
-
-GNU Zebra is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2, or (at your
-option) any later version.
-
-GNU Zebra is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Zebra; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#ifndef _ZEBRA_IF_H
-#define _ZEBRA_IF_H
-
-#include "linklist.h"
-
-/*
-  Interface name length.
-
-   Linux define value in /usr/include/linux/if.h.
-   #define IFNAMSIZ        16
-
-   FreeBSD define value in /usr/include/net/if.h.
-   #define IFNAMSIZ        16
-*/
-
-#define INTERFACE_NAMSIZ      20
-#define INTERFACE_HWADDR_MAX  20
-
-#ifdef HAVE_PROC_NET_DEV
-struct if_stats
-{
-  unsigned long rx_packets;   /* total packets received       */
-  unsigned long tx_packets;   /* total packets transmitted    */
-  unsigned long rx_bytes;     /* total bytes received         */
-  unsigned long tx_bytes;     /* total bytes transmitted      */
-  unsigned long rx_errors;    /* bad packets received         */
-  unsigned long tx_errors;    /* packet transmit problems     */
-  unsigned long rx_dropped;   /* no space in linux buffers    */
-  unsigned long tx_dropped;   /* no space available in linux  */
-  unsigned long rx_multicast; /* multicast packets received   */
-  unsigned long rx_compressed;
-  unsigned long tx_compressed;
-  unsigned long collisions;
-
-  /* detailed rx_errors: */
-  unsigned long rx_length_errors;
-  unsigned long rx_over_errors;       /* receiver ring buff overflow  */
-  unsigned long rx_crc_errors;        /* recved pkt with crc error    */
-  unsigned long rx_frame_errors;      /* recv'd frame alignment error */
-  unsigned long rx_fifo_errors;       /* recv'r fifo overrun          */
-  unsigned long rx_missed_errors;     /* receiver missed packet     */
-  /* detailed tx_errors */
-  unsigned long tx_aborted_errors;
-  unsigned long tx_carrier_errors;
-  unsigned long tx_fifo_errors;
-  unsigned long tx_heartbeat_errors;
-  unsigned long tx_window_errors;
-};
-#endif /* HAVE_PROC_NET_DEV */
-
-/* Interface structure */
-struct interface 
-{
-  /* Interface name.  This should probably never be changed after the
-     interface is created, because the configuration info for this interface
-     is associated with this structure.  For that reason, the interface
-     should also never be deleted (to avoid losing configuration info).
-     To delete, just set ifindex to IFINDEX_INTERNAL to indicate that the
-     interface does not exist in the kernel.
-   */
-  char name[INTERFACE_NAMSIZ + 1];
-
-  /* Interface index (should be IFINDEX_INTERNAL for non-kernel or
-     deleted interfaces). */
-  unsigned int ifindex;
-#define IFINDEX_INTERNAL	0
-
-  /* Zebra internal interface status */
-  u_char status;
-#define ZEBRA_INTERFACE_ACTIVE     (1 << 0)
-#define ZEBRA_INTERFACE_SUB        (1 << 1)
-#define ZEBRA_INTERFACE_LINKDETECTION (1 << 2)
-  
-  /* Interface flags. */
-  uint64_t flags;
-
-  /* Interface metric */
-  int metric;
-
-  /* Interface MTU. */
-  unsigned int mtu;    /* IPv4 MTU */
-  unsigned int mtu6;   /* IPv6 MTU - probably, but not neccessarily same as mtu */
-
-  /* Hardware address. */
-#ifdef HAVE_STRUCT_SOCKADDR_DL
-  union {
-    /* note that sdl_storage is never accessed, it only exists to make space.
-     * all actual uses refer to sdl - but use sizeof(sdl_storage)!  this fits
-     * best with C aliasing rules. */
-    struct sockaddr_dl sdl;
-    struct sockaddr_storage sdl_storage;
-  };
-#else
-  unsigned short hw_type;
-  u_char hw_addr[INTERFACE_HWADDR_MAX];
-  int hw_addr_len;
-#endif /* HAVE_STRUCT_SOCKADDR_DL */
-
-  /* interface bandwidth, kbits */
-  unsigned int bandwidth;
-  
-  /* description of the interface. */
-  char *desc;			
-
-  /* Distribute list. */
-  void *distribute_in;
-  void *distribute_out;
-
-  /* Connected address list. */
-  struct list *connected;
-
-  /* Daemon specific interface data pointer. */
-  void *info;
-
-  /* Statistics fileds. */
-#ifdef HAVE_PROC_NET_DEV
-  struct if_stats stats;
-#endif /* HAVE_PROC_NET_DEV */  
-#ifdef HAVE_NET_RT_IFLIST
-  struct if_data stats;
-#endif /* HAVE_NET_RT_IFLIST */
-};
-
-/* Connected address structure. */
-struct connected
-{
-  /* Attached interface. */
-  struct interface *ifp;
-
-  /* Flags for configuration. */
-  u_char conf;
-#define ZEBRA_IFC_REAL         (1 << 0)
-#define ZEBRA_IFC_CONFIGURED   (1 << 1)
-#define ZEBRA_IFC_QUEUED       (1 << 2)
-  /*
-     The ZEBRA_IFC_REAL flag should be set if and only if this address
-     exists in the kernel and is actually usable. (A case where it exists but
-     is not yet usable would be IPv6 with DAD)
-     The ZEBRA_IFC_CONFIGURED flag should be set if and only if this address
-     was configured by the user from inside quagga.
-     The ZEBRA_IFC_QUEUED flag should be set if and only if the address exists
-     in the kernel. It may and should be set although the address might not be
-     usable yet. (compare with ZEBRA_IFC_REAL)
-   */
-
-  /* Flags for connected address. */
-  u_char flags;
-#define ZEBRA_IFA_SECONDARY    (1 << 0)
-#define ZEBRA_IFA_PEER         (1 << 1)
-  /* N.B. the ZEBRA_IFA_PEER flag should be set if and only if
-     a peer address has been configured.  If this flag is set,
-     the destination field must contain the peer address.  
-     Otherwise, if this flag is not set, the destination address
-     will either contain a broadcast address or be NULL.
-   */
-
-  /* Address of connected network. */
-  struct prefix *address;
-
-  /* Peer or Broadcast address, depending on whether ZEBRA_IFA_PEER is set.
-     Note: destination may be NULL if ZEBRA_IFA_PEER is not set. */
-  struct prefix *destination;
-
-  /* Label for Linux 2.2.X and upper. */
-  char *label;
-};
-
-/* Does the destination field contain a peer address? */
-#define CONNECTED_PEER(C) CHECK_FLAG((C)->flags, ZEBRA_IFA_PEER)
-
-/* Prefix to insert into the RIB */
-#define CONNECTED_PREFIX(C) \
-	(CONNECTED_PEER(C) ? (C)->destination : (C)->address)
-
-/* Identifying address.  We guess that if there's a peer address, but the
-   local address is in the same prefix, then the local address may be unique. */
-#define CONNECTED_ID(C)	\
-	((CONNECTED_PEER(C) && !prefix_match((C)->destination, (C)->address)) ?\
-	 (C)->destination : (C)->address)
-
-/* Interface hook sort. */
-#define IF_NEW_HOOK   0
-#define IF_DELETE_HOOK 1
-
-/* There are some interface flags which are only supported by some
-   operating system. */
-
-#ifndef IFF_NOTRAILERS
-#define IFF_NOTRAILERS 0x0
-#endif /* IFF_NOTRAILERS */
-#ifndef IFF_OACTIVE
-#define IFF_OACTIVE 0x0
-#endif /* IFF_OACTIVE */
-#ifndef IFF_SIMPLEX
-#define IFF_SIMPLEX 0x0
-#endif /* IFF_SIMPLEX */
-#ifndef IFF_LINK0
-#define IFF_LINK0 0x0
-#endif /* IFF_LINK0 */
-#ifndef IFF_LINK1
-#define IFF_LINK1 0x0
-#endif /* IFF_LINK1 */
-#ifndef IFF_LINK2
-#define IFF_LINK2 0x0
-#endif /* IFF_LINK2 */
-#ifndef IFF_NOXMIT
-#define IFF_NOXMIT 0x0
-#endif /* IFF_NOXMIT */
-#ifndef IFF_NORTEXCH
-#define IFF_NORTEXCH 0x0
-#endif /* IFF_NORTEXCH */
-#ifndef IFF_IPV4
-#define IFF_IPV4 0x0
-#endif /* IFF_IPV4 */
-#ifndef IFF_IPV6
-#define IFF_IPV6 0x0
-#endif /* IFF_IPV6 */
-#ifndef IFF_VIRTUAL
-#define IFF_VIRTUAL 0x0
-#endif /* IFF_VIRTUAL */
-
-/* Prototypes. */
-extern int if_cmp_func (struct interface *, struct interface *);
-extern struct interface *if_create (const char *name, int namelen);
-extern struct interface *if_lookup_by_index (unsigned int);
-extern struct interface *if_lookup_exact_address (struct in_addr);
-extern struct interface *if_lookup_address (struct in_addr);
-extern struct interface *if_lookup_prefix (struct prefix *prefix);
-
-/* These 2 functions are to be used when the ifname argument is terminated
-   by a '\0' character: */
-extern struct interface *if_lookup_by_name (const char *ifname);
-extern struct interface *if_get_by_name (const char *ifname);
-
-/* For these 2 functions, the namelen argument should be the precise length
-   of the ifname string (not counting any optional trailing '\0' character).
-   In most cases, strnlen should be used to calculate the namelen value. */
-extern struct interface *if_lookup_by_name_len(const char *ifname,
-					       size_t namelen);
-extern struct interface *if_get_by_name_len(const char *ifname, size_t namelen);
-
-
-/* Delete the interface, but do not free the structure, and leave it in the
-   interface list.  It is often advisable to leave the pseudo interface 
-   structure because there may be configuration information attached. */
-extern void if_delete_retain (struct interface *);
-
-/* Delete and free the interface structure: calls if_delete_retain and then
-   deletes it from the interface list and frees the structure. */
-extern void if_delete (struct interface *);
-
-extern int if_is_up (struct interface *);
-extern int if_is_running (struct interface *);
-extern int if_is_operative (struct interface *);
-extern int if_is_loopback (struct interface *);
-extern int if_is_broadcast (struct interface *);
-extern int if_is_pointopoint (struct interface *);
-extern int if_is_multicast (struct interface *);
-extern void if_add_hook (int, int (*)(struct interface *));
-extern void if_init (void);
-extern void if_terminate (void);
-extern void if_dump_all (void);
-extern const char *if_flag_dump(unsigned long);
-
-/* Please use ifindex2ifname instead of if_indextoname where possible;
-   ifindex2ifname uses internal interface info, whereas if_indextoname must
-   make a system call. */
-extern const char *ifindex2ifname (unsigned int);
-
-/* Please use ifname2ifindex instead of if_nametoindex where possible;
-   ifname2ifindex uses internal interface info, whereas if_nametoindex must
-   make a system call. */
-extern unsigned int ifname2ifindex(const char *ifname);
-
-/* Connected address functions. */
-extern struct connected *connected_new (void);
-extern void connected_free (struct connected *);
-extern void connected_add (struct interface *, struct connected *);
-extern struct connected  *connected_add_by_prefix (struct interface *,
-                                            struct prefix *,
-                                            struct prefix *);
-extern struct connected  *connected_delete_by_prefix (struct interface *, 
-                                               struct prefix *);
-extern struct connected  *connected_lookup_address (struct interface *, 
-                                             struct in_addr);
-
-#ifndef HAVE_IF_NAMETOINDEX
-extern unsigned int if_nametoindex (const char *);
-#endif
-#ifndef HAVE_IF_INDEXTONAME
-extern char *if_indextoname (unsigned int, char *);
-#endif
-
-/* Exported variables. */
-extern struct list *iflist;
-extern struct cmd_element interface_desc_cmd;
-extern struct cmd_element no_interface_desc_cmd;
-extern struct cmd_element interface_cmd;
-extern struct cmd_element no_interface_cmd;
-extern struct cmd_element interface_pseudo_cmd;
-extern struct cmd_element no_interface_pseudo_cmd;
-extern struct cmd_element show_address_cmd;
-
-#endif /* _ZEBRA_IF_H */
diff --git a/openflow/usr/include/quagga/if_rmap.h b/openflow/usr/include/quagga/if_rmap.h
deleted file mode 100644
index e6c2966..0000000
--- a/openflow/usr/include/quagga/if_rmap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* route-map for interface.
- * Copyright (C) 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_IF_RMAP_H
-#define _ZEBRA_IF_RMAP_H
-
-enum if_rmap_type
-{
-  IF_RMAP_IN,
-  IF_RMAP_OUT,
-  IF_RMAP_MAX
-};
-
-struct if_rmap
-{
-  /* Name of the interface. */
-  char *ifname;
-
-  char *routemap[IF_RMAP_MAX];
-};
-
-extern void if_rmap_init (int);
-extern void if_rmap_reset (void);
-extern void if_rmap_hook_add (void (*) (struct if_rmap *));
-extern void if_rmap_hook_delete (void (*) (struct if_rmap *));
-extern struct if_rmap *if_rmap_lookup (const char *);
-extern int config_write_if_rmap (struct vty *);
-
-#endif /* _ZEBRA_IF_RMAP_H */
diff --git a/openflow/usr/include/quagga/jhash.h b/openflow/usr/include/quagga/jhash.h
deleted file mode 100644
index 985ac94..0000000
--- a/openflow/usr/include/quagga/jhash.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* jhash.h: Jenkins hash support.
- *
- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
- *
- * http://burtleburtle.net/bob/hash/
- *
- * These are the credits from Bob's sources:
- *
- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
- * hash(), hash2(), hash3, and mix() are externally useful functions.
- * Routines to test the hash are included if SELF_TEST is defined.
- * You can use this free for any purpose.  It has no warranty.
- *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
- *
- * I've modified Bob's hash to be useful in the Linux kernel, and
- * any bugs present are surely my fault.  -DaveM
- */
-
-#ifndef _QUAGGA_JHASH_H
-#define _QUAGGA_JHASH_H
-
-/* The most generic version, hashes an arbitrary sequence
- * of bytes.  No alignment or length assumptions are made about
- * the input key.
- */
-extern u_int32_t jhash(const void *key, u_int32_t length, u_int32_t initval);
-
-/* A special optimized version that handles 1 or more of u_int32_ts.
- * The length parameter here is the number of u_int32_ts in the key.
- */
-extern u_int32_t jhash2(const u_int32_t *k, u_int32_t length, u_int32_t initval);
-
-/* A special ultra-optimized versions that knows they are hashing exactly
- * 3, 2 or 1 word(s).
- *
- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
- *       done at the end is not done here.
- */
-extern u_int32_t jhash_3words(u_int32_t a, u_int32_t b, u_int32_t c, u_int32_t initval);
-extern u_int32_t jhash_2words(u_int32_t a, u_int32_t b, u_int32_t initval);
-extern u_int32_t jhash_1word(u_int32_t a, u_int32_t initval);
-
-#endif /* _QUAGGA_JHASH_H */
diff --git a/openflow/usr/include/quagga/keychain.h b/openflow/usr/include/quagga/keychain.h
deleted file mode 100644
index f962864..0000000
--- a/openflow/usr/include/quagga/keychain.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* key-chain for authentication.
- * Copyright (C) 2000 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_KEYCHAIN_H
-#define _ZEBRA_KEYCHAIN_H
-
-struct keychain
-{
-  char *name;
-
-  struct list *key;
-};
-
-struct key_range
-{
-  time_t start;
-  time_t end;
-
-  u_char duration;
-};
-
-struct key
-{
-  u_int32_t index;
-
-  char *string;
-
-  struct key_range send;
-  struct key_range accept;
-};
-
-extern void keychain_init (void);
-extern struct keychain *keychain_lookup (const char *);
-extern struct key *key_lookup_for_accept (const struct keychain *, u_int32_t);
-extern struct key *key_match_for_accept (const struct keychain *, const char *);
-extern struct key *key_lookup_for_send (const struct keychain *);
-
-#endif /* _ZEBRA_KEYCHAIN_H */
diff --git a/openflow/usr/include/quagga/libospf.h b/openflow/usr/include/quagga/libospf.h
deleted file mode 100644
index 2796209..0000000
--- a/openflow/usr/include/quagga/libospf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Defines and structures common to OSPFv2 and OSPFv3
- * Copyright (C) 1998, 99, 2000 Kunihiro Ishiguro, Toshiaki Takada
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _LIBOSPFD_H
-#define _LIBOSPFD_H
-
-/* IP precedence. */
-#ifndef IPTOS_PREC_INTERNETCONTROL
-#define IPTOS_PREC_INTERNETCONTROL	0xC0
-#endif /* IPTOS_PREC_INTERNETCONTROL */
-
-/* Default protocol, port number. */
-#ifndef IPPROTO_OSPFIGP
-#define IPPROTO_OSPFIGP         89
-#endif /* IPPROTO_OSPFIGP */
-
-/* Architectual Constants */
-#ifdef DEBUG
-#define OSPF_LS_REFRESH_TIME                    60
-#else
-#define OSPF_LS_REFRESH_TIME                  1800
-#endif
-#define OSPF_MIN_LS_INTERVAL                     5
-#define OSPF_MIN_LS_ARRIVAL                      1
-#define OSPF_LSA_INITIAL_AGE                     0	/* useful for debug */
-#define OSPF_LSA_MAXAGE                       3600
-#define OSPF_CHECK_AGE                         300
-#define OSPF_LSA_MAXAGE_DIFF                   900
-#define OSPF_LS_INFINITY                  0xffffff
-#define OSPF_DEFAULT_DESTINATION        0x00000000      /* 0.0.0.0 */
-#define OSPF_INITIAL_SEQUENCE_NUMBER    0x80000001U
-#define OSPF_MAX_SEQUENCE_NUMBER        0x7fffffffU
-
-/* OSPF Interface Types */
-#define OSPF_IFTYPE_NONE		0
-#define OSPF_IFTYPE_POINTOPOINT		1
-#define OSPF_IFTYPE_BROADCAST		2
-#define OSPF_IFTYPE_NBMA		3
-#define OSPF_IFTYPE_POINTOMULTIPOINT	4
-#define OSPF_IFTYPE_VIRTUALLINK		5
-#define OSPF_IFTYPE_LOOPBACK            6
-#define OSPF_IFTYPE_MAX			7
-
-/* OSPF interface default values. */
-#define OSPF_OUTPUT_COST_DEFAULT           10
-#define OSPF_OUTPUT_COST_INFINITE	   UINT16_MAX
-#define OSPF_ROUTER_DEAD_INTERVAL_DEFAULT  40
-#define OSPF_ROUTER_DEAD_INTERVAL_MINIMAL   1
-#define OSPF_HELLO_INTERVAL_DEFAULT        10
-#define OSPF_ROUTER_PRIORITY_DEFAULT        1
-#define OSPF_RETRANSMIT_INTERVAL_DEFAULT    5
-#define OSPF_TRANSMIT_DELAY_DEFAULT         1
-#define OSPF_DEFAULT_BANDWIDTH		 10000	/* Kbps */
-
-#define OSPF_DEFAULT_REF_BANDWIDTH	100000  /* Kbps */
-
-#define OSPF_POLL_INTERVAL_DEFAULT         60
-#define OSPF_NEIGHBOR_PRIORITY_DEFAULT      0
-
-#define OSPF_MTU_IGNORE_DEFAULT             0
-#define OSPF_FAST_HELLO_DEFAULT             0
-
-#define OSPF_AREA_BACKBONE              0x00000000      /* 0.0.0.0 */
-
-/* SPF Throttling timer values. */
-#define OSPF_SPF_DELAY_DEFAULT              200
-#define OSPF_SPF_HOLDTIME_DEFAULT           1000
-#define OSPF_SPF_MAX_HOLDTIME_DEFAULT	    10000
-
-#define OSPF_LSA_MAXAGE_CHECK_INTERVAL		30
-#define OSPF_LSA_MAXAGE_REMOVE_DELAY_DEFAULT	60
-
-#endif /* _LIBOSPFD_H */
diff --git a/openflow/usr/include/quagga/linklist.h b/openflow/usr/include/quagga/linklist.h
deleted file mode 100644
index 6209c8b..0000000
--- a/openflow/usr/include/quagga/linklist.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Generic linked list
- * Copyright (C) 1997, 2000 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_LINKLIST_H
-#define _ZEBRA_LINKLIST_H
-
-/* listnodes must always contain data to be valid. Adding an empty node
- * to a list is invalid
- */
-struct listnode 
-{
-  struct listnode *next;
-  struct listnode *prev;
-  
-  /* private member, use getdata() to retrieve, do not access directly */
-  void *data;
-};
-
-struct list 
-{
-  struct listnode *head;
-  struct listnode *tail;
-
-  /* invariant: count is the number of listnodes in the list */
-  unsigned int count;
-
-  /*
-   * Returns -1 if val1 < val2, 0 if equal?, 1 if val1 > val2.
-   * Used as definition of sorted for listnode_add_sort
-   */
-  int (*cmp) (void *val1, void *val2);
-
-  /* callback to free user-owned data when listnode is deleted. supplying
-   * this callback is very much encouraged!
-   */
-  void (*del) (void *val);
-};
-
-#define listnextnode(X) ((X) ? ((X)->next) : NULL)
-#define listhead(X) ((X) ? ((X)->head) : NULL)
-#define listtail(X) ((X) ? ((X)->tail) : NULL)
-#define listcount(X) ((X)->count)
-#define list_isempty(X) ((X)->head == NULL && (X)->tail == NULL)
-#define listgetdata(X) (assert((X)->data != NULL), (X)->data)
-
-/* Prototypes. */
-extern struct list *list_new(void); /* encouraged: set list.del callback on new lists */
-extern void list_free (struct list *);
-
-extern void listnode_add (struct list *, void *);
-extern void listnode_add_sort (struct list *, void *);
-extern void listnode_add_after (struct list *, struct listnode *, void *);
-extern void listnode_move_to_tail (struct list *, struct listnode *);
-extern void listnode_delete (struct list *, void *);
-extern struct listnode *listnode_lookup (struct list *, void *);
-extern void *listnode_head (struct list *);
-
-extern void list_delete (struct list *);
-extern void list_delete_all_node (struct list *);
-
-/* For ospfd and ospf6d. */
-extern void list_delete_node (struct list *, struct listnode *);
-
-/* For ospf_spf.c */
-extern void list_add_node_prev (struct list *, struct listnode *, void *);
-extern void list_add_node_next (struct list *, struct listnode *, void *);
-extern void list_add_list (struct list *, struct list *);
-
-/* List iteration macro. 
- * Usage: for (ALL_LIST_ELEMENTS (...) { ... }
- * It is safe to delete the listnode using this macro.
- */
-#define ALL_LIST_ELEMENTS(list,node,nextnode,data) \
-  (node) = listhead(list), ((data) = NULL); \
-  (node) != NULL && \
-    ((data) = listgetdata(node),(nextnode) = node->next, 1); \
-  (node) = (nextnode), ((data) = NULL)
-
-/* read-only list iteration macro.
- * Usage: as per ALL_LIST_ELEMENTS, but not safe to delete the listnode Only
- * use this macro when it is *immediately obvious* the listnode is not
- * deleted in the body of the loop. Does not have forward-reference overhead
- * of previous macro.
- */
-#define ALL_LIST_ELEMENTS_RO(list,node,data) \
-  (node) = listhead(list), ((data) = NULL);\
-  (node) != NULL && ((data) = listgetdata(node), 1); \
-  (node) = listnextnode(node), ((data) = NULL)
-
-/* these *do not* cleanup list nodes and referenced data, as the functions
- * do - these macros simply {de,at}tach a listnode from/to a list.
- */
- 
-/* List node attach macro.  */
-#define LISTNODE_ATTACH(L,N) \
-  do { \
-    (N)->prev = (L)->tail; \
-    (N)->next = NULL; \
-    if ((L)->head == NULL) \
-      (L)->head = (N); \
-    else \
-      (L)->tail->next = (N); \
-    (L)->tail = (N); \
-    (L)->count++; \
-  } while (0)
-
-/* List node detach macro.  */
-#define LISTNODE_DETACH(L,N) \
-  do { \
-    if ((N)->prev) \
-      (N)->prev->next = (N)->next; \
-    else \
-      (L)->head = (N)->next; \
-    if ((N)->next) \
-      (N)->next->prev = (N)->prev; \
-    else \
-      (L)->tail = (N)->prev; \
-    (L)->count--; \
-  } while (0)
-
-/* Deprecated: 20050406 */
-#if !defined(QUAGGA_NO_DEPRECATED_INTERFACES)
-#warning "Using deprecated libzebra interfaces"
-#define LISTNODE_ADD(L,N) LISTNODE_ATTACH(L,N)
-#define LISTNODE_DELETE(L,N) LISTNODE_DETACH(L,N)
-#define nextnode(X) ((X) = (X)->next)
-#define getdata(X) listgetdata(X)
-#define LIST_LOOP(L,V,N) \
-  for (ALL_LIST_ELEMENTS_RO (L,N,V))
-#endif /* QUAGGA_NO_DEPRECATED_INTERFACES */
-
-#endif /* _ZEBRA_LINKLIST_H */
diff --git a/openflow/usr/include/quagga/log.h b/openflow/usr/include/quagga/log.h
deleted file mode 100644
index 77cd53b..0000000
--- a/openflow/usr/include/quagga/log.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Zebra logging funcions.
- * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_LOG_H
-#define _ZEBRA_LOG_H
-
-#include <syslog.h>
-
-/* Here is some guidance on logging levels to use:
- *
- * LOG_DEBUG	- For all messages that are enabled by optional debugging
- *		  features, typically preceded by "if (IS...DEBUG...)"
- * LOG_INFO	- Information that may be of interest, but everything seems
- *		  to be working properly.
- * LOG_NOTICE	- Only for message pertaining to daemon startup or shutdown.
- * LOG_WARNING	- Warning conditions: unexpected events, but the daemon believes
- *		  it can continue to operate correctly.
- * LOG_ERR	- Error situations indicating malfunctions.  Probably require
- *		  attention.
- *
- * Note: LOG_CRIT, LOG_ALERT, and LOG_EMERG are currently not used anywhere,
- * please use LOG_ERR instead.
- */
-
-typedef enum 
-{
-  ZLOG_NONE,
-  ZLOG_DEFAULT,
-  ZLOG_ZEBRA,
-  ZLOG_RIP,
-  ZLOG_BGP,
-  ZLOG_OSPF,
-  ZLOG_RIPNG,
-  ZLOG_BABEL,
-  ZLOG_OSPF6,
-  ZLOG_ISIS,
-  ZLOG_PIM,
-  ZLOG_MASC
-} zlog_proto_t;
-
-/* If maxlvl is set to ZLOG_DISABLED, then no messages will be sent
-   to that logging destination. */
-#define ZLOG_DISABLED	(LOG_EMERG-1)
-
-typedef enum
-{
-  ZLOG_DEST_SYSLOG = 0,
-  ZLOG_DEST_STDOUT,
-  ZLOG_DEST_MONITOR,
-  ZLOG_DEST_FILE
-} zlog_dest_t;
-#define ZLOG_NUM_DESTS		(ZLOG_DEST_FILE+1)
-
-struct zlog 
-{
-  const char *ident;	/* daemon name (first arg to openlog) */
-  zlog_proto_t protocol;
-  int maxlvl[ZLOG_NUM_DESTS];	/* maximum priority to send to associated
-  				   logging destination */
-  int default_lvl;	/* maxlvl to use if none is specified */
-  FILE *fp;
-  char *filename;
-  int facility;		/* as per syslog facility */
-  int record_priority;	/* should messages logged through stdio include the
-  			   priority of the message? */
-  int syslog_options;	/* 2nd arg to openlog */
-  int timestamp_precision;	/* # of digits of subsecond precision */
-};
-
-/* Message structure. */
-struct message
-{
-  int key;
-  const char *str;
-};
-
-/* Default logging strucutre. */
-extern struct zlog *zlog_default;
-
-/* Open zlog function */
-extern struct zlog *openzlog (const char *progname, zlog_proto_t protocol,
-		              int syslog_options, int syslog_facility);
-
-/* Close zlog function. */
-extern void closezlog (struct zlog *zl);
-
-/* GCC have printf type attribute check.  */
-#ifdef __GNUC__
-#define PRINTF_ATTRIBUTE(a,b) __attribute__ ((__format__ (__printf__, a, b)))
-#else
-#define PRINTF_ATTRIBUTE(a,b)
-#endif /* __GNUC__ */
-
-/* Generic function for zlog. */
-extern void zlog (struct zlog *zl, int priority, const char *format, ...)
-  PRINTF_ATTRIBUTE(3, 4);
-
-/* Handy zlog functions. */
-extern void zlog_err (const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
-extern void zlog_warn (const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
-extern void zlog_info (const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
-extern void zlog_notice (const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
-extern void zlog_debug (const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
-
-/* For bgpd's peer oriented log. */
-extern void plog_err (struct zlog *, const char *format, ...)
-  PRINTF_ATTRIBUTE(2, 3);
-extern void plog_warn (struct zlog *, const char *format, ...)
-  PRINTF_ATTRIBUTE(2, 3);
-extern void plog_info (struct zlog *, const char *format, ...)
-  PRINTF_ATTRIBUTE(2, 3);
-extern void plog_notice (struct zlog *, const char *format, ...)
-  PRINTF_ATTRIBUTE(2, 3);
-extern void plog_debug (struct zlog *, const char *format, ...)
-  PRINTF_ATTRIBUTE(2, 3);
-
-extern void zlog_thread_info (int log_level);
-
-/* Set logging level for the given destination.  If the log_level
-   argument is ZLOG_DISABLED, then the destination is disabled.
-   This function should not be used for file logging (use zlog_set_file
-   or zlog_reset_file instead). */
-extern void zlog_set_level (struct zlog *zl, zlog_dest_t, int log_level);
-
-/* Set logging to the given filename at the specified level. */
-extern int zlog_set_file (struct zlog *zl, const char *filename, int log_level);
-/* Disable file logging. */
-extern int zlog_reset_file (struct zlog *zl);
-
-/* Rotate log. */
-extern int zlog_rotate (struct zlog *);
-
-/* For hackey message lookup and check */
-#define LOOKUP_DEF(x, y, def) mes_lookup(x, x ## _max, y, def, #x)
-#define LOOKUP(x, y) LOOKUP_DEF(x, y, "(no item found)")
-
-extern const char *lookup (const struct message *, int);
-extern const char *mes_lookup (const struct message *meslist, 
-                               int max, int index,
-                               const char *no_item, const char *mesname);
-
-extern const char *zlog_priority[];
-extern const char *zlog_proto_names[];
-
-/* Safe version of strerror -- never returns NULL. */
-extern const char *safe_strerror(int errnum);
-
-/* To be called when a fatal signal is caught. */
-extern void zlog_signal(int signo, const char *action
-#ifdef SA_SIGINFO
-			, siginfo_t *siginfo, void *program_counter
-#endif
-		       );
-
-/* Log a backtrace. */
-extern void zlog_backtrace(int priority);
-
-/* Log a backtrace, but in an async-signal-safe way.  Should not be
-   called unless the program is about to exit or abort, since it messes
-   up the state of zlog file pointers.  If program_counter is non-NULL,
-   that is logged in addition to the current backtrace. */
-extern void zlog_backtrace_sigsafe(int priority, void *program_counter);
-
-/* Puts a current timestamp in buf and returns the number of characters
-   written (not including the terminating NUL).  The purpose of
-   this function is to avoid calls to localtime appearing all over the code.
-   It caches the most recent localtime result and can therefore
-   avoid multiple calls within the same second.  If buflen is too small,
-   *buf will be set to '\0', and 0 will be returned. */
-extern size_t quagga_timestamp(int timestamp_precision /* # subsecond digits */,
-			       char *buf, size_t buflen);
-
-/* structure useful for avoiding repeated rendering of the same timestamp */
-struct timestamp_control {
-   size_t len;		/* length of rendered timestamp */
-   int precision;	/* configuration parameter */
-   int already_rendered; /* should be initialized to 0 */
-   char buf[40];	/* will contain the rendered timestamp */
-};
-
-/* Defines for use in command construction: */
-
-#define LOG_LEVELS "(emergencies|alerts|critical|errors|warnings|notifications|informational|debugging)"
-
-#define LOG_LEVEL_DESC \
-  "System is unusable\n" \
-  "Immediate action needed\n" \
-  "Critical conditions\n" \
-  "Error conditions\n" \
-  "Warning conditions\n" \
-  "Normal but significant conditions\n" \
-  "Informational messages\n" \
-  "Debugging messages\n"
-
-#define LOG_FACILITIES "(kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7)"
-
-#define LOG_FACILITY_DESC \
-       "Kernel\n" \
-       "User process\n" \
-       "Mail system\n" \
-       "System daemons\n" \
-       "Authorization system\n" \
-       "Syslog itself\n" \
-       "Line printer system\n" \
-       "USENET news\n" \
-       "Unix-to-Unix copy system\n" \
-       "Cron/at facility\n" \
-       "Local use\n" \
-       "Local use\n" \
-       "Local use\n" \
-       "Local use\n" \
-       "Local use\n" \
-       "Local use\n" \
-       "Local use\n" \
-       "Local use\n"
-
-#endif /* _ZEBRA_LOG_H */
diff --git a/openflow/usr/include/quagga/md5.h b/openflow/usr/include/quagga/md5.h
deleted file mode 100644
index 4e5ffbd..0000000
--- a/openflow/usr/include/quagga/md5.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* $USAGI: md5.h,v 1.2 2000/11/02 11:59:25 yoshfuji Exp $ */
-/*	$KAME: md5.h,v 1.4 2000/03/27 04:36:22 sumikawa Exp $	*/
-/*	$Id: md5.h,v 1.3 2006/01/17 17:40:45 paul Exp $ */
-
-/*
- * Copyright (C) 2004 6WIND
- *                          <Vincent.Jardin@6WIND.com>
- * All rights reserved.
- *
- * This MD5 code is Big endian and Little Endian compatible.
- */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _LIBZEBRA_MD5_H_
-#define _LIBZEBRA_MD5_H_
-
-#define MD5_BUFLEN	64
-
-typedef struct {
-	union {
-		uint32_t	md5_state32[4];
-		uint8_t	md5_state8[16];
-	} md5_st;
-
-#define md5_sta		md5_st.md5_state32[0]
-#define md5_stb		md5_st.md5_state32[1]
-#define md5_stc		md5_st.md5_state32[2]
-#define md5_std		md5_st.md5_state32[3]
-#define md5_st8		md5_st.md5_state8
-
-	union {
-		uint64_t	md5_count64;
-		uint8_t	md5_count8[8];
-	} md5_count;
-#define md5_n	md5_count.md5_count64
-#define md5_n8	md5_count.md5_count8
-
-	uint	md5_i;
-	uint8_t	md5_buf[MD5_BUFLEN];
-} md5_ctxt;
-
-extern void md5_init (md5_ctxt *);
-extern void md5_loop (md5_ctxt *, const void *, u_int);
-extern void md5_pad (md5_ctxt *);
-extern void md5_result (uint8_t *, md5_ctxt *);
-
-/* compatibility */
-#define MD5_CTX		md5_ctxt
-#define MD5Init(x)	md5_init((x))
-#define MD5Update(x, y, z)	md5_loop((x), (y), (z))
-#define MD5Final(x, y) \
-do {				\
-	md5_pad((y));		\
-	md5_result((x), (y));	\
-} while (0)
-
-/* From RFC 2104 */
-void hmac_md5(unsigned char* text, int text_len, unsigned char* key,
-              int key_len, uint8_t *digest);
-
-#endif /* ! _LIBZEBRA_MD5_H_*/
diff --git a/openflow/usr/include/quagga/memory.h b/openflow/usr/include/quagga/memory.h
deleted file mode 100644
index 2396223..0000000
--- a/openflow/usr/include/quagga/memory.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Memory management routine
-   Copyright (C) 1998 Kunihiro Ishiguro
-
-This file is part of GNU Zebra.
-
-GNU Zebra is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-GNU Zebra is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Zebra; see the file COPYING.  If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
-
-#ifndef _ZEBRA_MEMORY_H
-#define _ZEBRA_MEMORY_H
-
-#define array_size(ar) (sizeof(ar) / sizeof(ar[0]))
-
-/* For pretty printing of memory allocate information. */
-struct memory_list
-{
-  int index;
-  const char *format;
-};
-
-struct mlist {
-  struct memory_list *list;
-  const char *name;
-};
- 
-#include "lib/memtypes.h"
-
-extern struct mlist mlists[];
-
-/* #define MEMORY_LOG */
-#ifdef MEMORY_LOG
-#define XMALLOC(mtype, size) \
-  mtype_zmalloc (__FILE__, __LINE__, (mtype), (size))
-#define XCALLOC(mtype, size) \
-  mtype_zcalloc (__FILE__, __LINE__, (mtype), (size))
-#define XREALLOC(mtype, ptr, size)  \
-  mtype_zrealloc (__FILE__, __LINE__, (mtype), (ptr), (size))
-#define XFREE(mtype, ptr) \
-  do { \
-    mtype_zfree (__FILE__, __LINE__, (mtype), (ptr)); \
-    ptr = NULL; } \
-  while (0)
-#define XSTRDUP(mtype, str) \
-  mtype_zstrdup (__FILE__, __LINE__, (mtype), (str))
-#else
-#define XMALLOC(mtype, size)       zmalloc ((mtype), (size))
-#define XCALLOC(mtype, size)       zcalloc ((mtype), (size))
-#define XREALLOC(mtype, ptr, size) zrealloc ((mtype), (ptr), (size))
-#define XFREE(mtype, ptr)          do { \
-                                     zfree ((mtype), (ptr)); \
-                                     ptr = NULL; } \
-                                   while (0)
-#define XSTRDUP(mtype, str)        zstrdup ((mtype), (str))
-#endif /* MEMORY_LOG */
-
-/* Prototypes of memory function. */
-extern void *zmalloc (int type, size_t size);
-extern void *zcalloc (int type, size_t size);
-extern void *zrealloc (int type, void *ptr, size_t size);
-extern void  zfree (int type, void *ptr);
-extern char *zstrdup (int type, const char *str);
-
-extern void *mtype_zmalloc (const char *file, int line, int type, size_t size);
-
-extern void *mtype_zcalloc (const char *file, int line, int type, size_t size);
-
-extern void *mtype_zrealloc (const char *file, int line, int type, void *ptr,
-		             size_t size);
-
-extern void mtype_zfree (const char *file, int line, int type,
-		         void *ptr);
-
-extern char *mtype_zstrdup (const char *file, int line, int type,
-		            const char *str);
-extern void memory_init (void);
-extern void log_memstats_stderr (const char *);
-
-/* return number of allocations outstanding for the type */
-extern unsigned long mtype_stats_alloc (int);
-
-/* Human friendly string for given byte count */
-#define MTYPE_MEMSTR_LEN 20
-extern const char *mtype_memstr (char *, size_t, unsigned long);
-#endif /* _ZEBRA_MEMORY_H */
diff --git a/openflow/usr/include/quagga/memtypes.h b/openflow/usr/include/quagga/memtypes.h
deleted file mode 100644
index be0519a..0000000
--- a/openflow/usr/include/quagga/memtypes.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/* Auto-generated from memtypes.c by gawk. */
-/* Do not edit! */
-
-#ifndef _QUAGGA_MEMTYPES_H
-#define _QUAGGA_MEMTYPES_H
-
-enum
-{
-  MTYPE_TMP = 1,
-  MTYPE_STRVEC,
-  MTYPE_VECTOR,
-  MTYPE_VECTOR_INDEX,
-  MTYPE_LINK_LIST,
-  MTYPE_LINK_NODE,
-  MTYPE_THREAD,
-  MTYPE_THREAD_MASTER,
-  MTYPE_THREAD_STATS,
-  MTYPE_VTY,
-  MTYPE_VTY_OUT_BUF,
-  MTYPE_VTY_HIST,
-  MTYPE_IF,
-  MTYPE_CONNECTED,
-  MTYPE_CONNECTED_LABEL,
-  MTYPE_BUFFER,
-  MTYPE_BUFFER_DATA,
-  MTYPE_STREAM,
-  MTYPE_STREAM_DATA,
-  MTYPE_STREAM_FIFO,
-  MTYPE_PREFIX,
-  MTYPE_PREFIX_IPV4,
-  MTYPE_PREFIX_IPV6,
-  MTYPE_HASH,
-  MTYPE_HASH_BACKET,
-  MTYPE_HASH_INDEX,
-  MTYPE_ROUTE_TABLE,
-  MTYPE_ROUTE_NODE,
-  MTYPE_DISTRIBUTE,
-  MTYPE_DISTRIBUTE_IFNAME,
-  MTYPE_ACCESS_LIST,
-  MTYPE_ACCESS_LIST_STR,
-  MTYPE_ACCESS_FILTER,
-  MTYPE_PREFIX_LIST,
-  MTYPE_PREFIX_LIST_ENTRY,
-  MTYPE_PREFIX_LIST_STR,
-  MTYPE_ROUTE_MAP,
-  MTYPE_ROUTE_MAP_NAME,
-  MTYPE_ROUTE_MAP_INDEX,
-  MTYPE_ROUTE_MAP_RULE,
-  MTYPE_ROUTE_MAP_RULE_STR,
-  MTYPE_ROUTE_MAP_COMPILED,
-  MTYPE_CMD_TOKENS,
-  MTYPE_KEY,
-  MTYPE_KEYCHAIN,
-  MTYPE_IF_RMAP,
-  MTYPE_IF_RMAP_NAME,
-  MTYPE_SOCKUNION,
-  MTYPE_PRIVS,
-  MTYPE_ZLOG,
-  MTYPE_ZCLIENT,
-  MTYPE_WORK_QUEUE,
-  MTYPE_WORK_QUEUE_ITEM,
-  MTYPE_WORK_QUEUE_NAME,
-  MTYPE_PQUEUE,
-  MTYPE_PQUEUE_DATA,
-  MTYPE_HOST,
-  MTYPE_RTADV_PREFIX,
-  MTYPE_VRF,
-  MTYPE_VRF_NAME,
-  MTYPE_NEXTHOP,
-  MTYPE_RIB,
-  MTYPE_RIB_QUEUE,
-  MTYPE_STATIC_IPV4,
-  MTYPE_STATIC_IPV6,
-  MTYPE_RIB_DEST,
-  MTYPE_RIB_TABLE_INFO,
-  MTYPE_BGP,
-  MTYPE_BGP_LISTENER,
-  MTYPE_BGP_PEER,
-  MTYPE_BGP_PEER_HOST,
-  MTYPE_PEER_GROUP,
-  MTYPE_PEER_DESC,
-  MTYPE_PEER_PASSWORD,
-  MTYPE_ATTR,
-  MTYPE_ATTR_EXTRA,
-  MTYPE_AS_PATH,
-  MTYPE_AS_SEG,
-  MTYPE_AS_SEG_DATA,
-  MTYPE_AS_STR,
-  MTYPE_BGP_TABLE,
-  MTYPE_BGP_NODE,
-  MTYPE_BGP_ROUTE,
-  MTYPE_BGP_ROUTE_EXTRA,
-  MTYPE_BGP_CONN,
-  MTYPE_BGP_STATIC,
-  MTYPE_BGP_ADVERTISE_ATTR,
-  MTYPE_BGP_ADVERTISE,
-  MTYPE_BGP_SYNCHRONISE,
-  MTYPE_BGP_ADJ_IN,
-  MTYPE_BGP_ADJ_OUT,
-  MTYPE_BGP_MPATH_INFO,
-  MTYPE_AS_LIST,
-  MTYPE_AS_FILTER,
-  MTYPE_AS_FILTER_STR,
-  MTYPE_COMMUNITY,
-  MTYPE_COMMUNITY_VAL,
-  MTYPE_COMMUNITY_STR,
-  MTYPE_ECOMMUNITY,
-  MTYPE_ECOMMUNITY_VAL,
-  MTYPE_ECOMMUNITY_STR,
-  MTYPE_COMMUNITY_LIST,
-  MTYPE_COMMUNITY_LIST_NAME,
-  MTYPE_COMMUNITY_LIST_ENTRY,
-  MTYPE_COMMUNITY_LIST_CONFIG,
-  MTYPE_COMMUNITY_LIST_HANDLER,
-  MTYPE_CLUSTER,
-  MTYPE_CLUSTER_VAL,
-  MTYPE_BGP_PROCESS_QUEUE,
-  MTYPE_BGP_CLEAR_NODE_QUEUE,
-  MTYPE_TRANSIT,
-  MTYPE_TRANSIT_VAL,
-  MTYPE_BGP_DISTANCE,
-  MTYPE_BGP_NEXTHOP_CACHE,
-  MTYPE_BGP_CONFED_LIST,
-  MTYPE_PEER_UPDATE_SOURCE,
-  MTYPE_BGP_DAMP_INFO,
-  MTYPE_BGP_DAMP_ARRAY,
-  MTYPE_BGP_REGEXP,
-  MTYPE_BGP_AGGREGATE,
-  MTYPE_BGP_ADDR,
-  MTYPE_RIP,
-  MTYPE_RIP_INFO,
-  MTYPE_RIP_INTERFACE,
-  MTYPE_RIP_PEER,
-  MTYPE_RIP_OFFSET_LIST,
-  MTYPE_RIP_DISTANCE,
-  MTYPE_RIPNG,
-  MTYPE_RIPNG_ROUTE,
-  MTYPE_RIPNG_AGGREGATE,
-  MTYPE_RIPNG_PEER,
-  MTYPE_RIPNG_OFFSET_LIST,
-  MTYPE_RIPNG_RTE_DATA,
-  MTYPE_BABEL,
-  MTYPE_BABEL_IF,
-  MTYPE_OSPF_TOP,
-  MTYPE_OSPF_AREA,
-  MTYPE_OSPF_AREA_RANGE,
-  MTYPE_OSPF_NETWORK,
-  MTYPE_OSPF_NEIGHBOR_STATIC,
-  MTYPE_OSPF_IF,
-  MTYPE_OSPF_NEIGHBOR,
-  MTYPE_OSPF_ROUTE,
-  MTYPE_OSPF_TMP,
-  MTYPE_OSPF_LSA,
-  MTYPE_OSPF_LSA_DATA,
-  MTYPE_OSPF_LSDB,
-  MTYPE_OSPF_PACKET,
-  MTYPE_OSPF_FIFO,
-  MTYPE_OSPF_VERTEX,
-  MTYPE_OSPF_VERTEX_PARENT,
-  MTYPE_OSPF_NEXTHOP,
-  MTYPE_OSPF_PATH,
-  MTYPE_OSPF_VL_DATA,
-  MTYPE_OSPF_CRYPT_KEY,
-  MTYPE_OSPF_EXTERNAL_INFO,
-  MTYPE_OSPF_DISTANCE,
-  MTYPE_OSPF_IF_INFO,
-  MTYPE_OSPF_IF_PARAMS,
-  MTYPE_OSPF_MESSAGE,
-  MTYPE_OSPF6_TOP,
-  MTYPE_OSPF6_AREA,
-  MTYPE_OSPF6_IF,
-  MTYPE_OSPF6_NEIGHBOR,
-  MTYPE_OSPF6_ROUTE,
-  MTYPE_OSPF6_PREFIX,
-  MTYPE_OSPF6_MESSAGE,
-  MTYPE_OSPF6_LSA,
-  MTYPE_OSPF6_LSA_SUMMARY,
-  MTYPE_OSPF6_LSDB,
-  MTYPE_OSPF6_VERTEX,
-  MTYPE_OSPF6_SPFTREE,
-  MTYPE_OSPF6_NEXTHOP,
-  MTYPE_OSPF6_EXTERNAL_INFO,
-  MTYPE_OSPF6_OTHER,
-  MTYPE_ISIS,
-  MTYPE_ISIS_TMP,
-  MTYPE_ISIS_CIRCUIT,
-  MTYPE_ISIS_LSP,
-  MTYPE_ISIS_ADJACENCY,
-  MTYPE_ISIS_AREA,
-  MTYPE_ISIS_AREA_ADDR,
-  MTYPE_ISIS_TLV,
-  MTYPE_ISIS_DYNHN,
-  MTYPE_ISIS_SPFTREE,
-  MTYPE_ISIS_VERTEX,
-  MTYPE_ISIS_ROUTE_INFO,
-  MTYPE_ISIS_NEXTHOP,
-  MTYPE_ISIS_NEXTHOP6,
-  MTYPE_ISIS_DICT,
-  MTYPE_ISIS_DICT_NODE,
-  MTYPE_PIM_CHANNEL_OIL,
-  MTYPE_PIM_INTERFACE,
-  MTYPE_PIM_IGMP_JOIN,
-  MTYPE_PIM_IGMP_SOCKET,
-  MTYPE_PIM_IGMP_GROUP,
-  MTYPE_PIM_IGMP_GROUP_SOURCE,
-  MTYPE_PIM_NEIGHBOR,
-  MTYPE_PIM_IFCHANNEL,
-  MTYPE_PIM_UPSTREAM,
-  MTYPE_PIM_SSMPINGD,
-  MTYPE_VTYSH_CONFIG,
-  MTYPE_VTYSH_CONFIG_LINE,
-  MTYPE_MAX,
-};
-
-extern struct memory_list memory_list_lib[];
-extern struct memory_list memory_list_zebra[];
-extern struct memory_list memory_list_bgp[];
-extern struct memory_list memory_list_rip[];
-extern struct memory_list memory_list_ripng[];
-extern struct memory_list memory_list_babel[];
-extern struct memory_list memory_list_ospf[];
-extern struct memory_list memory_list_ospf6[];
-extern struct memory_list memory_list_isis[];
-extern struct memory_list memory_list_pim[];
-extern struct memory_list memory_list_vtysh[];
-
-#endif /* _QUAGGA_MEMTYPES_H */
-
diff --git a/openflow/usr/include/quagga/network.h b/openflow/usr/include/quagga/network.h
deleted file mode 100644
index 4d9c228..0000000
--- a/openflow/usr/include/quagga/network.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Network library header.
- * Copyright (C) 1998 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_NETWORK_H
-#define _ZEBRA_NETWORK_H
-
-/* Both readn and writen are deprecated and will be removed.  They are not
-   suitable for use with non-blocking file descriptors.
- */
-extern int readn (int, u_char *, int);
-extern int writen (int, const u_char *, int);
-
-/* Set the file descriptor to use non-blocking I/O.  Returns 0 for success,
-   -1 on error. */
-extern int set_nonblocking(int fd);
-
-/* Does the I/O error indicate that the operation should be retried later? */
-#define ERRNO_IO_RETRY(EN) \
-	(((EN) == EAGAIN) || ((EN) == EWOULDBLOCK) || ((EN) == EINTR))
-
-#endif /* _ZEBRA_NETWORK_H */
diff --git a/openflow/usr/include/quagga/ospfapi/ospf_apiclient.h b/openflow/usr/include/quagga/ospfapi/ospf_apiclient.h
deleted file mode 100644
index 0e74787..0000000
--- a/openflow/usr/include/quagga/ospfapi/ospf_apiclient.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Client side of OSPF API.
- * Copyright (C) 2001, 2002, 2003 Ralph Keller
- *
- * This file is part of GNU Zebra.
- * 
- * GNU Zebra is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _OSPF_APICLIENT_H
-#define _OSPF_APICLIENT_H
-
-#define MTYPE_OSPF_APICLIENT 0
-
-/* Structure for the OSPF API client */
-struct ospf_apiclient
-{
-
-  /* Sockets for sync requests and async notifications */
-  int fd_sync;
-  int fd_async;
-
-  /* Pointer to callback functions */
-  void (*ready_notify) (u_char lsa_type, u_char opaque_type,
-			struct in_addr addr);
-  void (*new_if) (struct in_addr ifaddr, struct in_addr area_id);
-  void (*del_if) (struct in_addr ifaddr);
-  void (*ism_change) (struct in_addr ifaddr, struct in_addr area_id,
-		      u_char status);
-  void (*nsm_change) (struct in_addr ifaddr, struct in_addr nbraddr,
-		      struct in_addr router_id, u_char status);
-  void (*update_notify) (struct in_addr ifaddr, struct in_addr area_id,
-			 u_char self_origin,
-			 struct lsa_header * lsa);
-  void (*delete_notify) (struct in_addr ifaddr, struct in_addr area_id,
-			 u_char self_origin,
-			 struct lsa_header * lsa);
-};
-
-
-/* ---------------------------------------------------------
- * API function prototypes.
- * --------------------------------------------------------- */
-
-/* Open connection to OSPF daemon. Two ports will be allocated on
-   client, sync channel at syncport and reverse channel at syncport+1 */
-struct ospf_apiclient *ospf_apiclient_connect (char *host, int syncport);
-
-/* Shutdown connection to OSPF daemon. */
-int ospf_apiclient_close (struct ospf_apiclient *oclient);
-
-/* Synchronous request to register opaque type. */
-int ospf_apiclient_register_opaque_type (struct ospf_apiclient *oclient,
-					 u_char ltype, u_char otype);
-
-/* Synchronous request to register event mask. */
-int ospf_apiclient_register_events (struct ospf_apiclient *oclient,
-				    u_int32_t mask);
-
-/* Register callback functions.*/
-void ospf_apiclient_register_callback (struct ospf_apiclient *oclient,
-				       void (*ready_notify) (u_char lsa_type,
-							     u_char
-							     opaque_type,
-							     struct in_addr
-							     addr),
-				       void (*new_if) (struct in_addr ifaddr,
-						       struct in_addr
-						       area_id),
-				       void (*del_if) (struct in_addr ifaddr),
-				       void (*ism_change) (struct in_addr
-							   ifaddr,
-							   struct in_addr
-							   area_id,
-							   u_char status),
-				       void (*nsm_change) (struct in_addr
-							   ifaddr,
-							   struct in_addr
-							   nbraddr,
-							   struct in_addr
-							   router_id,
-							   u_char status),
-				       void (*update_notify) (struct in_addr
-							      ifaddr,
-							      struct in_addr
-							      area_id,
-							      u_char selforig,
-							      struct
-							      lsa_header *
-							      lsa),
-				       void (*delete_notify) (struct in_addr
-							      ifaddr,
-							      struct in_addr
-							      area_id,
-							      u_char selforig,
-							      struct
-							      lsa_header *
-							      lsa));
-
-/* Synchronous request to synchronize LSDB. */
-int ospf_apiclient_sync_lsdb (struct ospf_apiclient *oclient);
-
-/* Synchronous request to originate or update opaque LSA. */
-int
-ospf_apiclient_lsa_originate(struct ospf_apiclient *oclient,
-                             struct in_addr ifaddr,
-                             struct in_addr area_id,
-                             u_char lsa_type,
-                             u_char opaque_type, u_int32_t opaque_id,
-                             void *opaquedata, int opaquelen);
-
-
-/* Synchronous request to delete opaque LSA. Parameter opaque_id is in
-   host byte order */
-int ospf_apiclient_lsa_delete (struct ospf_apiclient *oclient,
-			       struct in_addr area_id, u_char lsa_type,
-			       u_char opaque_type, u_int32_t opaque_id);
-
-/* Fetch async message and handle it  */
-int ospf_apiclient_handle_async (struct ospf_apiclient *oclient);
-
-#endif /* _OSPF_APICLIENT_H */
diff --git a/openflow/usr/include/quagga/ospfd/ospf_api.h b/openflow/usr/include/quagga/ospfd/ospf_api.h
deleted file mode 100644
index eb5ad0a..0000000
--- a/openflow/usr/include/quagga/ospfd/ospf_api.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * API message handling module for OSPF daemon and client.
- * Copyright (C) 2001, 2002 Ralph Keller
- *
- * This file is part of GNU Zebra.
- * 
- * GNU Zebra is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-/* This file is used both by the OSPFd and client applications to
-   define message formats used for communication. */
-
-#ifndef _OSPF_API_H
-#define _OSPF_API_H
-
-#define OSPF_API_VERSION           1
-
-/* MTYPE definition is not reflected to "memory.h". */
-#define MTYPE_OSPF_API_MSG      MTYPE_TMP
-#define MTYPE_OSPF_API_FIFO     MTYPE_TMP
-
-/* Default API server port to accept connection request from client-side. */
-/* This value could be overridden by "ospfapi" entry in "/etc/services". */
-#define OSPF_API_SYNC_PORT      2607
-
-/* -----------------------------------------------------------
- * Generic messages 
- * -----------------------------------------------------------
- */
-
-/* Message header structure, fields are in network byte order and
-   aligned to four octets. */
-struct apimsghdr
-{
-  u_char version;		/* OSPF API protocol version */
-  u_char msgtype;		/* Type of message */
-  u_int16_t msglen;		/* Length of message w/o header */
-  u_int32_t msgseq;		/* Sequence number */
-};
-
-/* Message representation with header and body */
-struct msg
-{
-  struct msg *next;		/* to link into fifo */
-
-  /* Message header */
-  struct apimsghdr hdr;
-
-  /* Message body */
-  struct stream *s;
-};
-
-/* Prototypes for generic messages. */
-extern struct msg *msg_new (u_char msgtype, void *msgbody,
-		     u_int32_t seqnum, u_int16_t msglen);
-extern struct msg *msg_dup (struct msg *msg);
-extern void msg_print (struct msg *msg);	/* XXX debug only */
-extern void msg_free (struct msg *msg);
-struct msg *msg_read (int fd);
-extern int msg_write (int fd, struct msg *msg);
-
-/* For requests, the message sequence number is between MIN_SEQ and
-   MAX_SEQ. For notifications, the sequence number is 0. */
-
-#define MIN_SEQ          1
-#define MAX_SEQ 2147483647
-
-extern void msg_set_seq (struct msg *msg, u_int32_t seqnr);
-extern u_int32_t msg_get_seq (struct msg *msg);
-
-/* -----------------------------------------------------------
- * Message fifo queues
- * -----------------------------------------------------------
- */
-
-/* Message queue structure. */
-struct msg_fifo
-{
-  unsigned long count;
-
-  struct msg *head;
-  struct msg *tail;
-};
-
-/* Prototype for message fifo queues. */
-extern struct msg_fifo *msg_fifo_new (void);
-extern void msg_fifo_push (struct msg_fifo *, struct msg *msg);
-extern struct msg *msg_fifo_pop (struct msg_fifo *fifo);
-extern struct msg *msg_fifo_head (struct msg_fifo *fifo);
-extern void msg_fifo_flush (struct msg_fifo *fifo);
-extern void msg_fifo_free (struct msg_fifo *fifo);
-
-/* -----------------------------------------------------------
- * Specific message type and format definitions
- * -----------------------------------------------------------
- */
-
-/* Messages to OSPF daemon. */
-#define MSG_REGISTER_OPAQUETYPE   1
-#define MSG_UNREGISTER_OPAQUETYPE 2
-#define MSG_REGISTER_EVENT        3
-#define MSG_SYNC_LSDB             4
-#define MSG_ORIGINATE_REQUEST     5
-#define MSG_DELETE_REQUEST        6
-
-/* Messages from OSPF daemon. */
-#define MSG_REPLY                10
-#define MSG_READY_NOTIFY         11
-#define MSG_LSA_UPDATE_NOTIFY    12
-#define MSG_LSA_DELETE_NOTIFY    13
-#define MSG_NEW_IF               14
-#define MSG_DEL_IF               15
-#define MSG_ISM_CHANGE           16
-#define MSG_NSM_CHANGE           17
-
-struct msg_register_opaque_type
-{
-  u_char lsatype;
-  u_char opaquetype;
-  u_char pad[2];		/* padding */
-};
-
-struct msg_unregister_opaque_type
-{
-  u_char lsatype;
-  u_char opaquetype;
-  u_char pad[2];		/* padding */
-};
-
-/* Power2 is needed to convert LSA types into bit positions,
- * see typemask below. Type definition starts at 1, so
- * Power2[0] is not used. */
-
-
-#ifdef ORIGINAL_CODING
-static const u_int16_t
-  Power2[] = { 0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
-  0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000
-};
-#else
-static const u_int16_t
-  Power2[] = { 0, (1 << 0), (1 << 1), (1 << 2), (1 << 3), (1 << 4),
-  (1 << 5), (1 << 6), (1 << 7), (1 << 8), (1 << 9),
-  (1 << 10), (1 << 11), (1 << 12), (1 << 13), (1 << 14),
-  (1 << 15)
-};
-#endif /* ORIGINAL_CODING */
-
-struct lsa_filter_type
-{
-  u_int16_t typemask;		/* bitmask for selecting LSA types (1..16) */
-  u_char origin;		/* selects according to origin. */
-#define NON_SELF_ORIGINATED	0
-#define	SELF_ORIGINATED  (OSPF_LSA_SELF)
-#define	ANY_ORIGIN 2
-
-  u_char num_areas;		/* number of areas in the filter. */
-  /* areas, if any, go here. */
-};
-
-struct msg_register_event
-{
-  struct lsa_filter_type filter;
-};
-
-struct msg_sync_lsdb
-{
-  struct lsa_filter_type filter;
-};
-
-struct msg_originate_request
-{
-  /* Used for LSA type 9 otherwise ignored */
-  struct in_addr ifaddr;
-
-  /* Used for LSA type 10 otherwise ignored */
-  struct in_addr area_id;
-
-  /* LSA header and LSA-specific part */
-  struct lsa_header data;
-};
-
-struct msg_delete_request
-{
-  struct in_addr area_id;	/* "0.0.0.0" for AS-external opaque LSAs */
-  u_char lsa_type;
-  u_char opaque_type;
-  u_char pad[2];		/* padding */
-  u_int32_t opaque_id;
-};
-
-struct msg_reply
-{
-  signed char errcode;
-#define OSPF_API_OK                         0
-#define OSPF_API_NOSUCHINTERFACE          (-1)
-#define OSPF_API_NOSUCHAREA               (-2)
-#define OSPF_API_NOSUCHLSA                (-3)
-#define OSPF_API_ILLEGALLSATYPE           (-4)
-#define OSPF_API_OPAQUETYPEINUSE          (-5)
-#define OSPF_API_OPAQUETYPENOTREGISTERED  (-6)
-#define OSPF_API_NOTREADY                 (-7)
-#define OSPF_API_NOMEMORY                 (-8)
-#define OSPF_API_ERROR                    (-9)
-#define OSPF_API_UNDEF                   (-10)
-  u_char pad[3];		/* padding to four byte alignment */
-};
-
-/* Message to tell client application that it ospf daemon is 
- * ready to accept opaque LSAs for a given interface or area. */
-
-struct msg_ready_notify
-{
-  u_char lsa_type;
-  u_char opaque_type;
-  u_char pad[2];		/* padding */
-  struct in_addr addr;		/* interface address or area address */
-};
-
-/* These messages have a dynamic length depending on the embodied LSA.
-   They are aligned to four octets. msg_lsa_change_notify is used for
-   both LSA update and LSAs delete. */
-
-struct msg_lsa_change_notify
-{
-  /* Used for LSA type 9 otherwise ignored */
-  struct in_addr ifaddr;
-  /* Area ID. Not valid for AS-External and Opaque11 LSAs. */
-  struct in_addr area_id;
-  u_char is_self_originated;	/* 1 if self originated. */
-  u_char pad[3];
-  struct lsa_header data;
-};
-
-struct msg_new_if
-{
-  struct in_addr ifaddr;	/* interface IP address */
-  struct in_addr area_id;	/* area this interface belongs to */
-};
-
-struct msg_del_if
-{
-  struct in_addr ifaddr;	/* interface IP address */
-};
-
-struct msg_ism_change
-{
-  struct in_addr ifaddr;	/* interface IP address */
-  struct in_addr area_id;	/* area this interface belongs to */
-  u_char status;		/* interface status (up/down) */
-  u_char pad[3];		/* not used */
-};
-
-struct msg_nsm_change
-{
-  struct in_addr ifaddr;	/* attached interface */
-  struct in_addr nbraddr;	/* Neighbor interface address */
-  struct in_addr router_id;	/* Router ID of neighbor */
-  u_char status;		/* NSM status */
-  u_char pad[3];
-};
-
-/* We make use of a union to define a structure that covers all
-   possible API messages. This allows us to find out how much memory
-   needs to be reserved for the largest API message. */
-struct apimsg
-{
-  struct apimsghdr hdr;
-  union
-  {
-    struct msg_register_opaque_type register_opaque_type;
-    struct msg_register_event register_event;
-    struct msg_sync_lsdb sync_lsdb;
-    struct msg_originate_request originate_request;
-    struct msg_delete_request delete_request;
-    struct msg_reply reply;
-    struct msg_ready_notify ready_notify;
-    struct msg_new_if new_if;
-    struct msg_del_if del_if;
-    struct msg_ism_change ism_change;
-    struct msg_nsm_change nsm_change;
-    struct msg_lsa_change_notify lsa_change_notify;
-  }
-  u;
-};
-
-#define OSPF_API_MAX_MSG_SIZE (sizeof(struct apimsg) + OSPF_MAX_LSA_SIZE)
-
-/* -----------------------------------------------------------
- * Prototypes for specific messages
- * -----------------------------------------------------------
- */
-
-/* For debugging only. */
-extern void api_opaque_lsa_print (struct lsa_header *data);
-
-/* Messages sent by client */
-extern struct msg *new_msg_register_opaque_type (u_int32_t seqnum,
-						 u_char ltype, u_char otype);
-extern struct msg *new_msg_register_event (u_int32_t seqnum,
-					   struct lsa_filter_type *filter);
-extern struct msg *new_msg_sync_lsdb (u_int32_t seqnum,
-				      struct lsa_filter_type *filter);
-extern struct msg *new_msg_originate_request (u_int32_t seqnum,
-					      struct in_addr ifaddr,
-					      struct in_addr area_id,
-					      struct lsa_header *data);
-extern struct msg *new_msg_delete_request (u_int32_t seqnum,
-					   struct in_addr area_id,
-					   u_char lsa_type,
-					   u_char opaque_type,
-					   u_int32_t opaque_id);
-
-/* Messages sent by OSPF daemon */
-extern struct msg *new_msg_reply (u_int32_t seqnum, u_char rc);
-
-extern struct msg *new_msg_ready_notify (u_int32_t seqnr, u_char lsa_type,
-					 u_char opaque_type,
-					 struct in_addr addr);
-
-extern struct msg *new_msg_new_if (u_int32_t seqnr,
-				   struct in_addr ifaddr,
-				   struct in_addr area);
-
-extern struct msg *new_msg_del_if (u_int32_t seqnr, struct in_addr ifaddr);
-
-extern struct msg *new_msg_ism_change (u_int32_t seqnr, struct in_addr ifaddr,
-				       struct in_addr area, u_char status);
-
-extern struct msg *new_msg_nsm_change (u_int32_t seqnr, struct in_addr ifaddr,
-				       struct in_addr nbraddr,
-				       struct in_addr router_id,
-				       u_char status);
-
-/* msgtype is MSG_LSA_UPDATE_NOTIFY or MSG_LSA_DELETE_NOTIFY */
-extern struct msg *new_msg_lsa_change_notify (u_char msgtype,
-					      u_int32_t seqnum,
-					      struct in_addr ifaddr,
-					      struct in_addr area_id,
-					      u_char is_self_originated,
-					      struct lsa_header *data);
-
-/* string printing functions */
-extern const char *ospf_api_errname (int errcode);
-extern const char *ospf_api_typename (int msgtype);
-
-#endif /* _OSPF_API_H */
diff --git a/openflow/usr/include/quagga/ospfd/ospf_asbr.h b/openflow/usr/include/quagga/ospfd/ospf_asbr.h
deleted file mode 100644
index 724acf4..0000000
--- a/openflow/usr/include/quagga/ospfd/ospf_asbr.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * OSPF AS Boundary Router functions.
- * Copyright (C) 1999, 2000 Kunihiro Ishiguro, Toshiaki Takada
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_OSPF_ASBR_H
-#define _ZEBRA_OSPF_ASBR_H
-
-struct route_map_set_values
-{
-  int32_t metric;
-  int32_t metric_type;
-};
-
-/* Redistributed external information. */
-struct external_info
-{
-  /* Type of source protocol. */
-  u_char type;
-
-  /* Prefix. */
-  struct prefix_ipv4 p;
-
-  /* Interface index. */
-  unsigned int ifindex;
-
-  /* Nexthop address. */
-  struct in_addr nexthop;
-
-  /* Additional Route tag. */
-  u_int32_t tag;
-
-  struct route_map_set_values route_map_set;
-#define ROUTEMAP_METRIC(E)      (E)->route_map_set.metric
-#define ROUTEMAP_METRIC_TYPE(E) (E)->route_map_set.metric_type
-};
-
-#define OSPF_ASBR_CHECK_DELAY 30
-
-extern void ospf_external_route_remove (struct ospf *, struct prefix_ipv4 *);
-extern struct external_info *ospf_external_info_new (u_char);
-extern void ospf_reset_route_map_set_values (struct route_map_set_values *);
-extern int ospf_route_map_set_compare (struct route_map_set_values *,
-				struct route_map_set_values *);
-extern struct external_info *ospf_external_info_add (u_char, 
-                                              struct prefix_ipv4,
-					      unsigned int, 
-					      struct in_addr);
-extern void ospf_external_info_delete (u_char, struct prefix_ipv4);
-extern struct external_info *ospf_external_info_lookup (u_char, 
-                                                 struct prefix_ipv4 *);
-extern struct ospf_route *ospf_external_route_lookup (struct ospf *, 
-                                               struct prefix_ipv4 *);
-extern void ospf_asbr_status_update (struct ospf *, u_char);
-
-extern void ospf_redistribute_withdraw (struct ospf *, u_char);
-extern void ospf_asbr_check (void);
-extern void ospf_schedule_asbr_check (void);
-extern void ospf_asbr_route_install_lsa (struct ospf_lsa *);
-extern struct ospf_lsa *ospf_external_info_find_lsa (struct ospf *,
-					      struct prefix_ipv4 *p);
-
-#endif /* _ZEBRA_OSPF_ASBR_H */
diff --git a/openflow/usr/include/quagga/ospfd/ospf_dump.h b/openflow/usr/include/quagga/ospfd/ospf_dump.h
deleted file mode 100644
index a2d5e8b..0000000
--- a/openflow/usr/include/quagga/ospfd/ospf_dump.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * OSPFd dump routine.
- * Copyright (C) 1999 Toshiaki Takada
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA. 
- */
-
-#ifndef _ZEBRA_OSPF_DUMP_H
-#define _ZEBRA_OSPF_DUMP_H
-
-/* Debug Flags. */
-#define OSPF_DEBUG_HELLO	0x01
-#define OSPF_DEBUG_DB_DESC	0x02
-#define OSPF_DEBUG_LS_REQ	0x04
-#define OSPF_DEBUG_LS_UPD	0x08
-#define OSPF_DEBUG_LS_ACK	0x10
-#define OSPF_DEBUG_ALL		0x1f
-
-#define OSPF_DEBUG_SEND		0x01
-#define OSPF_DEBUG_RECV		0x02
-#define OSPF_DEBUG_SEND_RECV    0x03
-#define OSPF_DEBUG_DETAIL	0x04
-
-#define OSPF_DEBUG_ISM_STATUS	0x01
-#define OSPF_DEBUG_ISM_EVENTS	0x02
-#define OSPF_DEBUG_ISM_TIMERS	0x04
-#define OSPF_DEBUG_ISM		0x07
-#define OSPF_DEBUG_NSM_STATUS	0x01
-#define OSPF_DEBUG_NSM_EVENTS	0x02
-#define OSPF_DEBUG_NSM_TIMERS   0x04
-#define OSPF_DEBUG_NSM		0x07
-
-#define OSPF_DEBUG_LSA_GENERATE 0x01
-#define OSPF_DEBUG_LSA_FLOODING	0x02
-#define OSPF_DEBUG_LSA_INSTALL  0x04
-#define OSPF_DEBUG_LSA_REFRESH  0x08
-#define OSPF_DEBUG_LSA		0x0F
-
-#define OSPF_DEBUG_ZEBRA_INTERFACE     0x01
-#define OSPF_DEBUG_ZEBRA_REDISTRIBUTE  0x02
-#define OSPF_DEBUG_ZEBRA	       0x03
-
-#define OSPF_DEBUG_EVENT        0x01
-#define OSPF_DEBUG_NSSA		0x02
-
-/* Macro for setting debug option. */
-#define CONF_DEBUG_PACKET_ON(a, b)	    conf_debug_ospf_packet[a] |= (b)
-#define CONF_DEBUG_PACKET_OFF(a, b)	    conf_debug_ospf_packet[a] &= ~(b)
-#define TERM_DEBUG_PACKET_ON(a, b)	    term_debug_ospf_packet[a] |= (b)
-#define TERM_DEBUG_PACKET_OFF(a, b)	    term_debug_ospf_packet[a] &= ~(b)
-#define DEBUG_PACKET_ON(a, b) \
-    do { \
-      CONF_DEBUG_PACKET_ON(a, b); \
-      TERM_DEBUG_PACKET_ON(a, b); \
-    } while (0)
-#define DEBUG_PACKET_OFF(a, b) \
-    do { \
-      CONF_DEBUG_PACKET_OFF(a, b); \
-      TERM_DEBUG_PACKET_OFF(a, b); \
-    } while (0)
-
-#define CONF_DEBUG_ON(a, b)	 conf_debug_ospf_ ## a |= (OSPF_DEBUG_ ## b)
-#define CONF_DEBUG_OFF(a, b)	 conf_debug_ospf_ ## a &= ~(OSPF_DEBUG_ ## b)
-#define TERM_DEBUG_ON(a, b)	 term_debug_ospf_ ## a |= (OSPF_DEBUG_ ## b)
-#define TERM_DEBUG_OFF(a, b)	 term_debug_ospf_ ## a &= ~(OSPF_DEBUG_ ## b)
-#define DEBUG_ON(a, b) \
-     do { \
-       CONF_DEBUG_ON(a, b); \
-       TERM_DEBUG_ON(a, b); \
-     } while (0)
-#define DEBUG_OFF(a, b) \
-     do { \
-       CONF_DEBUG_OFF(a, b); \
-       TERM_DEBUG_OFF(a, b); \
-     } while (0)
-
-/* Macro for checking debug option. */
-#define IS_DEBUG_OSPF_PACKET(a, b) \
-	(term_debug_ospf_packet[a] & OSPF_DEBUG_ ## b)
-#define IS_DEBUG_OSPF(a, b) \
-	(term_debug_ospf_ ## a & OSPF_DEBUG_ ## b)
-#define IS_DEBUG_OSPF_EVENT IS_DEBUG_OSPF(event,EVENT)
-
-#define IS_DEBUG_OSPF_NSSA  IS_DEBUG_OSPF(nssa,NSSA)
-
-#define IS_CONF_DEBUG_OSPF_PACKET(a, b) \
-	(conf_debug_ospf_packet[a] & OSPF_DEBUG_ ## b)
-#define IS_CONF_DEBUG_OSPF(a, b) \
-	(conf_debug_ospf_ ## a & OSPF_DEBUG_ ## b)
-
-#ifdef ORIGINAL_CODING
-#else /* ORIGINAL_CODING */
-struct stream;
-#endif /* ORIGINAL_CODING */
-
-#define AREA_NAME(A)    ospf_area_name_string ((A))
-#define IF_NAME(I)      ospf_if_name_string ((I))
-
-/* Extern debug flag. */
-extern unsigned long term_debug_ospf_packet[];
-extern unsigned long term_debug_ospf_event;
-extern unsigned long term_debug_ospf_ism;
-extern unsigned long term_debug_ospf_nsm;
-extern unsigned long term_debug_ospf_lsa;
-extern unsigned long term_debug_ospf_zebra;
-extern unsigned long term_debug_ospf_nssa;
-
-/* Message Strings. */
-extern char *ospf_lsa_type_str[];
-extern const struct message ospf_auth_type_str[];
-extern const size_t ospf_auth_type_str_max;
-
-/* Prototypes. */
-extern const char *ospf_area_name_string (struct ospf_area *);
-extern const char *ospf_area_desc_string (struct ospf_area *);
-extern const char *ospf_if_name_string (struct ospf_interface *);
-extern void ospf_nbr_state_message (struct ospf_neighbor *, char *, size_t);
-extern char *ospf_options_dump (u_char);
-extern const char *ospf_timer_dump (struct thread *, char *, size_t);
-extern const char *ospf_timeval_dump (struct timeval *, char *, size_t);
-extern void ospf_ip_header_dump (struct ip *);
-extern void ospf_packet_dump (struct stream *);
-extern void ospf_lsa_header_dump (struct lsa_header *);
-extern void debug_init (void);
-
-/* Appropriate buffer size to use with ospf_timer_dump and ospf_timeval_dump: */
-#define OSPF_TIME_DUMP_SIZE	16
-
-#endif /* _ZEBRA_OSPF_DUMP_H */
diff --git a/openflow/usr/include/quagga/ospfd/ospf_ism.h b/openflow/usr/include/quagga/ospfd/ospf_ism.h
deleted file mode 100644
index f0357a4..0000000
--- a/openflow/usr/include/quagga/ospfd/ospf_ism.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * OSPF version 2  Interface State Machine.
- *   From RFC2328 [OSPF Version 2]
- * Copyright (C) 1999 Toshiaki Takada
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_OSPF_ISM_H
-#define _ZEBRA_OSPF_ISM_H
-
-/* OSPF Interface State Machine Status. */
-#define ISM_DependUpon                    0
-#define ISM_Down                          1
-#define ISM_Loopback                      2
-#define ISM_Waiting                       3
-#define ISM_PointToPoint                  4
-#define ISM_DROther                       5
-#define ISM_Backup                        6
-#define ISM_DR                            7
-#define OSPF_ISM_STATE_MAX   	          8
-
-/* Because DR/DROther values are exhanged wrt RFC */
-#define ISM_SNMP(x) (((x) == ISM_DROther) ? ISM_DR : \
-                     ((x) == ISM_DR) ? ISM_DROther : (x))
-
-/* OSPF Interface State Machine Event. */
-#define ISM_NoEvent                       0
-#define ISM_InterfaceUp                   1
-#define ISM_WaitTimer                     2
-#define ISM_BackupSeen                    3
-#define ISM_NeighborChange                4
-#define ISM_LoopInd                       5
-#define ISM_UnloopInd                     6
-#define ISM_InterfaceDown                 7
-#define OSPF_ISM_EVENT_MAX                8
-
-#define OSPF_ISM_WRITE_ON(O)                                                  \
-      do                                                                      \
-        {                                                                     \
-          if (oi->on_write_q == 0)                                            \
-	    {                                                                 \
-              listnode_add ((O)->oi_write_q, oi);                             \
-	      oi->on_write_q = 1;                                             \
-	    }                                                                 \
-	  if ((O)->t_write == NULL)                                           \
-	    (O)->t_write =                                                    \
-	      thread_add_write (master, ospf_write, (O), (O)->fd);            \
-        } while (0)
-     
-/* Macro for OSPF ISM timer turn on. */
-#define OSPF_ISM_TIMER_ON(T,F,V) \
-  do { \
-    if (!(T)) \
-      (T) = thread_add_timer (master, (F), oi, (V)); \
-  } while (0)
-#define OSPF_ISM_TIMER_MSEC_ON(T,F,V) \
-  do { \
-    if (!(T)) \
-      (T) = thread_add_timer_msec (master, (F), oi, (V)); \
-  } while (0)
-
-/* convenience macro to set hello timer correctly, according to
- * whether fast-hello is set or not
- */
-#define OSPF_HELLO_TIMER_ON(O) \
-  do { \
-    if (OSPF_IF_PARAM ((O), fast_hello)) \
-        OSPF_ISM_TIMER_MSEC_ON ((O)->t_hello, ospf_hello_timer, \
-                                1000 / OSPF_IF_PARAM ((O), fast_hello)); \
-    else \
-        OSPF_ISM_TIMER_ON ((O)->t_hello, ospf_hello_timer, \
-                                OSPF_IF_PARAM ((O), v_hello)); \
-  } while (0)
-
-/* Macro for OSPF ISM timer turn off. */
-#define OSPF_ISM_TIMER_OFF(X) \
-  do { \
-    if (X) \
-      { \
-	thread_cancel (X); \
-	(X) = NULL; \
-      } \
-  } while (0)
-
-/* Macro for OSPF schedule event. */
-#define OSPF_ISM_EVENT_SCHEDULE(I,E) \
-      thread_add_event (master, ospf_ism_event, (I), (E))
-
-/* Macro for OSPF execute event. */
-#define OSPF_ISM_EVENT_EXECUTE(I,E) \
-      thread_execute (master, ospf_ism_event, (I), (E))
-
-/* Prototypes. */
-extern int ospf_ism_event (struct thread *);
-extern void ism_change_status (struct ospf_interface *, int);
-extern int ospf_hello_timer (struct thread *thread);
-
-#endif /* _ZEBRA_OSPF_ISM_H */
diff --git a/openflow/usr/include/quagga/ospfd/ospf_lsa.h b/openflow/usr/include/quagga/ospfd/ospf_lsa.h
deleted file mode 100644
index c71877d..0000000
--- a/openflow/usr/include/quagga/ospfd/ospf_lsa.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * OSPF Link State Advertisement
- * Copyright (C) 1999, 2000 Toshiaki Takada
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_OSPF_LSA_H
-#define _ZEBRA_OSPF_LSA_H
-
-#include "stream.h"
-
-/* OSPF LSA Range definition. */
-#define OSPF_MIN_LSA		1  /* begin range here */
-#if defined (HAVE_OPAQUE_LSA)
-#define OSPF_MAX_LSA           12
-#else
-#define OSPF_MAX_LSA		8
-#endif
-
-/* OSPF LSA Type definition. */
-#define OSPF_UNKNOWN_LSA	      0
-#define OSPF_ROUTER_LSA               1
-#define OSPF_NETWORK_LSA              2
-#define OSPF_SUMMARY_LSA              3
-#define OSPF_ASBR_SUMMARY_LSA         4
-#define OSPF_AS_EXTERNAL_LSA          5
-#define OSPF_GROUP_MEMBER_LSA	      6  /* Not supported. */
-#define OSPF_AS_NSSA_LSA	              7
-#define OSPF_EXTERNAL_ATTRIBUTES_LSA  8  /* Not supported. */
-#define OSPF_OPAQUE_LINK_LSA	      9
-#define OSPF_OPAQUE_AREA_LSA	     10
-#define OSPF_OPAQUE_AS_LSA	     11
-
-#define OSPF_LSA_HEADER_SIZE	     20U
-#define OSPF_ROUTER_LSA_LINK_SIZE    12U
-#define OSPF_ROUTER_LSA_TOS_SIZE      4U
-#define OSPF_MAX_LSA_SIZE	   1500U
-
-/* AS-external-LSA refresh method. */
-#define LSA_REFRESH_IF_CHANGED	0
-#define LSA_REFRESH_FORCE	1
-
-/* OSPF LSA header. */
-struct lsa_header
-{
-  u_int16_t ls_age;
-  u_char options;
-  u_char type;
-  struct in_addr id;
-  struct in_addr adv_router;
-  u_int32_t ls_seqnum;
-  u_int16_t checksum;
-  u_int16_t length;
-};
-
-/* OSPF LSA. */
-struct ospf_lsa
-{
-  /* LSA origination flag. */
-  u_char flags;
-#define OSPF_LSA_SELF		  0x01
-#define OSPF_LSA_SELF_CHECKED	  0x02
-#define OSPF_LSA_RECEIVED	  0x04
-#define OSPF_LSA_APPROVED	  0x08
-#define OSPF_LSA_DISCARD	  0x10
-#define OSPF_LSA_LOCAL_XLT	  0x20
-#define OSPF_LSA_PREMATURE_AGE	  0x40
-#define OSPF_LSA_IN_MAXAGE	  0x80
-
-  /* LSA data. */
-  struct lsa_header *data;
-
-  /* Received time stamp. */
-  struct timeval tv_recv;
-
-  /* Last time it was originated */
-  struct timeval tv_orig;
-
-  /* All of reference count, also lock to remove. */
-  int lock;
-
-  /* Flags for the SPF calculation. */
-  int stat;
-  #define LSA_SPF_NOT_EXPLORED	-1
-  #define LSA_SPF_IN_SPFTREE	-2
-  /* If stat >= 0, stat is LSA position in candidates heap. */
-  
-  /* References to this LSA in neighbor retransmission lists*/
-  int retransmit_counter;
-
-  /* Area the LSA belongs to, may be NULL if AS-external-LSA. */
-  struct ospf_area *area;
-
-  /* Parent LSDB. */
-  struct ospf_lsdb *lsdb;
-
-  /* Related Route. */
-  void *route;
-
-  /* Refreshement List or Queue */
-  int refresh_list;
-  
-  /* For Type-9 Opaque-LSAs */
-  struct ospf_interface *oi;
-};
-
-/* OSPF LSA Link Type. */
-#define LSA_LINK_TYPE_POINTOPOINT      1
-#define LSA_LINK_TYPE_TRANSIT          2
-#define LSA_LINK_TYPE_STUB             3
-#define LSA_LINK_TYPE_VIRTUALLINK      4
-
-/* OSPF Router LSA Flag. */
-#define ROUTER_LSA_BORDER	       0x01 /* The router is an ABR */
-#define ROUTER_LSA_EXTERNAL	       0x02 /* The router is an ASBR */
-#define ROUTER_LSA_VIRTUAL	       0x04 /* The router has a VL in this area */
-#define ROUTER_LSA_NT		       0x10 /* The routers always translates Type-7 */
-#define ROUTER_LSA_SHORTCUT	       0x20 /* Shortcut-ABR specific flag */
-
-#define IS_ROUTER_LSA_VIRTUAL(x)       ((x)->flags & ROUTER_LSA_VIRTUAL)
-#define IS_ROUTER_LSA_EXTERNAL(x)      ((x)->flags & ROUTER_LSA_EXTERNAL)
-#define IS_ROUTER_LSA_BORDER(x)	       ((x)->flags & ROUTER_LSA_BORDER)
-#define IS_ROUTER_LSA_SHORTCUT(x)      ((x)->flags & ROUTER_LSA_SHORTCUT)
-#define IS_ROUTER_LSA_NT(x)            ((x)->flags & ROUTER_LSA_NT)
-
-/* OSPF Router-LSA Link information. */
-struct router_lsa_link
-{
-  struct in_addr link_id;
-  struct in_addr link_data;
-  struct
-  {
-    u_char type;
-    u_char tos_count;
-    u_int16_t metric;
-  } m[1];
-};
-
-/* OSPF Router-LSAs structure. */
-#define OSPF_ROUTER_LSA_MIN_SIZE                   4U /* w/0 link descriptors */
-/* There is an edge case, when number of links in a Router-LSA may be 0 without
-   breaking the specification. A router, which has no other links to backbone
-   area besides one virtual link, will not put any VL descriptor blocks into
-   the Router-LSA generated for area 0 until a full adjacency over the VL is
-   reached (RFC2328 12.4.1.3). In this case the Router-LSA initially received
-   by the other end of the VL will have 0 link descriptor blocks, but soon will
-   be replaced with the next revision having 1 descriptor block. */
-struct router_lsa
-{
-  struct lsa_header header;
-  u_char flags;
-  u_char zero;
-  u_int16_t links;
-  struct
-  {
-    struct in_addr link_id;
-    struct in_addr link_data;
-    u_char type;
-    u_char tos;
-    u_int16_t metric;
-  } link[1];
-};
-
-/* OSPF Network-LSAs structure. */
-#define OSPF_NETWORK_LSA_MIN_SIZE                  8U /* w/1 router-ID */
-struct network_lsa
-{
-  struct lsa_header header;
-  struct in_addr mask;
-  struct in_addr routers[1];
-};
-
-/* OSPF Summary-LSAs structure. */
-#define OSPF_SUMMARY_LSA_MIN_SIZE                  8U /* w/1 TOS metric block */
-struct summary_lsa
-{
-  struct lsa_header header;
-  struct in_addr mask;
-  u_char tos;
-  u_char metric[3];
-};
-
-/* OSPF AS-external-LSAs structure. */
-#define OSPF_AS_EXTERNAL_LSA_MIN_SIZE             16U /* w/1 TOS forwarding block */
-struct as_external_lsa
-{
-  struct lsa_header header;
-  struct in_addr mask;
-  struct
-  {
-    u_char tos;
-    u_char metric[3];
-    struct in_addr fwd_addr;
-    u_int32_t route_tag;
-  } e[1];
-};
-
-#ifdef HAVE_OPAQUE_LSA
-#include "ospfd/ospf_opaque.h"
-#endif /* HAVE_OPAQUE_LSA */
-
-/* Macros. */
-#define GET_METRIC(x) get_metric(x)
-#define IS_EXTERNAL_METRIC(x)   ((x) & 0x80)
-
-#define GET_AGE(x)     (ntohs ((x)->data->ls_age) + time (NULL) - (x)->tv_recv)
-#define LS_AGE(x)      (OSPF_LSA_MAXAGE < get_age(x) ? \
-                                           OSPF_LSA_MAXAGE : get_age(x))
-#define IS_LSA_SELF(L)          (CHECK_FLAG ((L)->flags, OSPF_LSA_SELF))
-#define IS_LSA_MAXAGE(L)        (LS_AGE ((L)) == OSPF_LSA_MAXAGE)
-
-#define OSPF_LSA_UPDATE_DELAY		2
-
-#define OSPF_LSA_UPDATE_TIMER_ON(T,F) \
-      if (!(T)) \
-        (T) = thread_add_timer (master, (F), 0, 2)
-
-/* Prototypes. */
-/* XXX: Eek, time functions, similar are in lib/thread.c */
-extern struct timeval tv_adjust (struct timeval);
-extern int tv_ceil (struct timeval);
-extern int tv_floor (struct timeval);
-extern struct timeval int2tv (int);
-extern struct timeval tv_add (struct timeval, struct timeval);
-extern struct timeval tv_sub (struct timeval, struct timeval);
-extern int tv_cmp (struct timeval, struct timeval);
-
-extern int get_age (struct ospf_lsa *);
-extern u_int16_t ospf_lsa_checksum (struct lsa_header *);
-extern int ospf_lsa_checksum_valid (struct lsa_header *);
-extern int ospf_lsa_refresh_delay (struct ospf_lsa *);
-
-extern const char *dump_lsa_key (struct ospf_lsa *);
-extern u_int32_t lsa_seqnum_increment (struct ospf_lsa *);
-extern void lsa_header_set (struct stream *, u_char, u_char, struct in_addr,
-		     struct in_addr);
-extern struct ospf_neighbor *ospf_nbr_lookup_ptop (struct ospf_interface *);
-extern int ospf_check_nbr_status (struct ospf *);
-
-/* Prototype for LSA primitive. */
-extern struct ospf_lsa *ospf_lsa_new (void);
-extern struct ospf_lsa *ospf_lsa_dup (struct ospf_lsa *);
-extern void ospf_lsa_free (struct ospf_lsa *);
-extern struct ospf_lsa *ospf_lsa_lock (struct ospf_lsa *);
-extern void ospf_lsa_unlock (struct ospf_lsa **);
-extern void ospf_lsa_discard (struct ospf_lsa *);
-
-extern struct lsa_header *ospf_lsa_data_new (size_t);
-extern struct lsa_header *ospf_lsa_data_dup (struct lsa_header *);
-extern void ospf_lsa_data_free (struct lsa_header *);
-
-/* Prototype for various LSAs */
-extern int ospf_router_lsa_update (struct ospf *);
-extern int ospf_router_lsa_update_area (struct ospf_area *);
-
-extern void ospf_network_lsa_update (struct ospf_interface *);
-
-extern struct ospf_lsa *ospf_summary_lsa_originate (struct prefix_ipv4 *, u_int32_t,
-					     struct ospf_area *);
-extern struct ospf_lsa *ospf_summary_asbr_lsa_originate (struct prefix_ipv4 *,
-						  u_int32_t,
-						  struct ospf_area *);
-
-extern struct ospf_lsa *ospf_lsa_install (struct ospf *,
-				   struct ospf_interface *, struct ospf_lsa *);
-
-extern void ospf_nssa_lsa_flush (struct ospf *ospf, struct prefix_ipv4 *p);
-extern void ospf_external_lsa_flush (struct ospf *, u_char, struct prefix_ipv4 *,
-			      unsigned int /* , struct in_addr nexthop */);
-
-extern struct in_addr ospf_get_ip_from_ifp (struct ospf_interface *);
-
-extern struct ospf_lsa *ospf_external_lsa_originate (struct ospf *, struct external_info *);
-extern int ospf_external_lsa_originate_timer (struct thread *);
-extern int ospf_default_originate_timer (struct thread *);
-extern struct ospf_lsa *ospf_lsa_lookup (struct ospf_area *, u_int32_t,
-				  struct in_addr, struct in_addr);
-extern struct ospf_lsa *ospf_lsa_lookup_by_id (struct ospf_area *,
-                                        u_int32_t, 
-                                        struct in_addr);
-extern struct ospf_lsa *ospf_lsa_lookup_by_header (struct ospf_area *,
-					    struct lsa_header *);
-extern int ospf_lsa_more_recent (struct ospf_lsa *, struct ospf_lsa *);
-extern int ospf_lsa_different (struct ospf_lsa *, struct ospf_lsa *);
-extern void ospf_flush_self_originated_lsas_now (struct ospf *);
-
-extern int ospf_lsa_is_self_originated (struct ospf *, struct ospf_lsa *);
-
-extern struct ospf_lsa *ospf_lsa_lookup_by_prefix (struct ospf_lsdb *, u_char,
-					    struct prefix_ipv4 *,
-					    struct in_addr);
-
-extern void ospf_lsa_maxage (struct ospf *, struct ospf_lsa *);
-extern u_int32_t get_metric (u_char *);
-
-extern int ospf_lsa_maxage_walker (struct thread *);
-extern struct ospf_lsa *ospf_lsa_refresh (struct ospf *, struct ospf_lsa *);
- 
-extern void ospf_external_lsa_refresh_default (struct ospf *);
-
-extern void ospf_external_lsa_refresh_type (struct ospf *, u_char, int);
-extern struct ospf_lsa *ospf_external_lsa_refresh (struct ospf *,
-                                                   struct ospf_lsa *,
-                                                   struct external_info *,
-                                                   int);
-extern struct in_addr ospf_lsa_unique_id (struct ospf *, struct ospf_lsdb *, u_char,
-				   struct prefix_ipv4 *);
-extern void ospf_schedule_lsa_flood_area (struct ospf_area *, struct ospf_lsa *);
-extern void ospf_schedule_lsa_flush_area (struct ospf_area *, struct ospf_lsa *);
-
-extern void ospf_refresher_register_lsa (struct ospf *, struct ospf_lsa *);
-extern void ospf_refresher_unregister_lsa (struct ospf *, struct ospf_lsa *);
-extern int ospf_lsa_refresh_walker (struct thread *);
-
-extern void ospf_lsa_maxage_delete (struct ospf *, struct ospf_lsa *);
-
-extern void ospf_discard_from_db (struct ospf *, struct ospf_lsdb *, struct ospf_lsa*);
-extern int is_prefix_default (struct prefix_ipv4 *);
-
-extern int metric_type (struct ospf *, u_char);
-extern int metric_value (struct ospf *, u_char);
-
-extern struct in_addr ospf_get_nssa_ip (struct ospf_area *);
-extern int ospf_translated_nssa_compare (struct ospf_lsa *, struct ospf_lsa *);
-extern struct ospf_lsa *ospf_translated_nssa_refresh (struct ospf *, struct ospf_lsa *,
-                                   struct ospf_lsa *);
-extern struct ospf_lsa *ospf_translated_nssa_originate (struct ospf *, struct ospf_lsa *);
-
-#endif /* _ZEBRA_OSPF_LSA_H */
diff --git a/openflow/usr/include/quagga/ospfd/ospf_lsdb.h b/openflow/usr/include/quagga/ospfd/ospf_lsdb.h
deleted file mode 100644
index 51ae45b..0000000
--- a/openflow/usr/include/quagga/ospfd/ospf_lsdb.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * OSPF LSDB support.
- * Copyright (C) 1999, 2000 Alex Zinin, Kunihiro Ishiguro, Toshiaki Takada
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_OSPF_LSDB_H
-#define _ZEBRA_OSPF_LSDB_H
-
-/* OSPF LSDB structure. */
-struct ospf_lsdb
-{
-  struct
-  {
-    unsigned long count;
-    unsigned long count_self;
-    unsigned int checksum;
-    struct route_table *db;
-  } type[OSPF_MAX_LSA];
-  unsigned long total;
-#define MONITOR_LSDB_CHANGE 1 /* XXX */
-#ifdef MONITOR_LSDB_CHANGE
-  /* Hooks for callback functions to catch every add/del event. */
-  int (* new_lsa_hook)(struct ospf_lsa *);
-  int (* del_lsa_hook)(struct ospf_lsa *);
-#endif /* MONITOR_LSDB_CHANGE */
-};
-
-/* Macros. */
-#define LSDB_LOOP(T,N,L)                                                      \
-  if ((T) != NULL)                                                            \
-  for ((N) = route_top ((T)); ((N)); ((N)) = route_next ((N)))                \
-    if (((L) = (N)->info))
-
-#define ROUTER_LSDB(A)       ((A)->lsdb->type[OSPF_ROUTER_LSA].db)
-#define NETWORK_LSDB(A)	     ((A)->lsdb->type[OSPF_NETWORK_LSA].db)
-#define SUMMARY_LSDB(A)      ((A)->lsdb->type[OSPF_SUMMARY_LSA].db)
-#define ASBR_SUMMARY_LSDB(A) ((A)->lsdb->type[OSPF_ASBR_SUMMARY_LSA].db)
-#define EXTERNAL_LSDB(O)     ((O)->lsdb->type[OSPF_AS_EXTERNAL_LSA].db)
-#define NSSA_LSDB(A)         ((A)->lsdb->type[OSPF_AS_NSSA_LSA].db)
-#define OPAQUE_LINK_LSDB(A)  ((A)->lsdb->type[OSPF_OPAQUE_LINK_LSA].db)
-#define OPAQUE_AREA_LSDB(A)  ((A)->lsdb->type[OSPF_OPAQUE_AREA_LSA].db)
-#define OPAQUE_AS_LSDB(O)    ((O)->lsdb->type[OSPF_OPAQUE_AS_LSA].db)
-
-#define AREA_LSDB(A,T)       ((A)->lsdb->type[(T)].db)
-#define AS_LSDB(O,T)         ((O)->lsdb->type[(T)].db)
-
-/* OSPF LSDB related functions. */
-extern struct ospf_lsdb *ospf_lsdb_new (void);
-extern void ospf_lsdb_init (struct ospf_lsdb *);
-extern void ospf_lsdb_free (struct ospf_lsdb *);
-extern void ospf_lsdb_cleanup (struct ospf_lsdb *);
-extern void ls_prefix_set (struct prefix_ls *lp, struct ospf_lsa *lsa);
-extern void ospf_lsdb_add (struct ospf_lsdb *, struct ospf_lsa *);
-extern void ospf_lsdb_delete (struct ospf_lsdb *, struct ospf_lsa *);
-extern void ospf_lsdb_delete_all (struct ospf_lsdb *);
-/* Set all stats to -1 (LSA_SPF_NOT_EXPLORED). */
-extern void ospf_lsdb_clean_stat (struct ospf_lsdb *lsdb);
-extern struct ospf_lsa *ospf_lsdb_lookup (struct ospf_lsdb *, struct ospf_lsa *);
-extern struct ospf_lsa *ospf_lsdb_lookup_by_id (struct ospf_lsdb *, u_char,
-					struct in_addr, struct in_addr);
-extern struct ospf_lsa *ospf_lsdb_lookup_by_id_next (struct ospf_lsdb *, u_char,
-					     struct in_addr, struct in_addr,
-					     int);
-extern unsigned long ospf_lsdb_count_all (struct ospf_lsdb *);
-extern unsigned long ospf_lsdb_count (struct ospf_lsdb *, int);
-extern unsigned long ospf_lsdb_count_self (struct ospf_lsdb *, int);
-extern unsigned int ospf_lsdb_checksum (struct ospf_lsdb *, int);
-extern unsigned long ospf_lsdb_isempty (struct ospf_lsdb *);
-
-#endif /* _ZEBRA_OSPF_LSDB_H */
diff --git a/openflow/usr/include/quagga/ospfd/ospf_nsm.h b/openflow/usr/include/quagga/ospfd/ospf_nsm.h
deleted file mode 100644
index 9b7e14a..0000000
--- a/openflow/usr/include/quagga/ospfd/ospf_nsm.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * OSPF version 2  Neighbor State Machine
- *   From RFC2328 [OSPF Version 2]
- *   Copyright (C) 1999 Toshiaki Takada
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_OSPF_NSM_H
-#define _ZEBRA_OSPF_NSM_H
-
-/* OSPF Neighbor State Machine State. */
-#define NSM_DependUpon          0
-#define NSM_Deleted		1
-#define NSM_Down		2
-#define NSM_Attempt		3
-#define NSM_Init		4
-#define NSM_TwoWay		5
-#define NSM_ExStart		6
-#define NSM_Exchange		7
-#define NSM_Loading		8
-#define NSM_Full		9
-#define OSPF_NSM_STATE_MAX     10
-
-/* OSPF Neighbor State Machine Event. */
-#define NSM_NoEvent	        0
-#define NSM_PacketReceived	1 /* HelloReceived in the protocol */
-#define NSM_Start		2
-#define NSM_TwoWayReceived	3
-#define NSM_NegotiationDone	4
-#define NSM_ExchangeDone	5
-#define NSM_BadLSReq		6
-#define NSM_LoadingDone		7
-#define NSM_AdjOK		8
-#define NSM_SeqNumberMismatch	9
-#define NSM_OneWayReceived     10
-#define NSM_KillNbr	       11
-#define NSM_InactivityTimer    12
-#define NSM_LLDown	       13
-#define OSPF_NSM_EVENT_MAX     14
-
-/* Macro for OSPF NSM timer turn on. */
-#define OSPF_NSM_TIMER_ON(T,F,V)                                              \
-      do {                                                                    \
-        if (!(T))                                                             \
-          (T) = thread_add_timer (master, (F), nbr, (V));                     \
-      } while (0)
-
-/* Macro for OSPF NSM timer turn off. */
-#define OSPF_NSM_TIMER_OFF(X)                                                 \
-      do {                                                                    \
-        if (X)                                                                \
-          {                                                                   \
-            thread_cancel (X);                                                \
-            (X) = NULL;                                                       \
-          }                                                                   \
-      } while (0)
-
-/* Macro for OSPF NSM schedule event. */
-#define OSPF_NSM_EVENT_SCHEDULE(N,E)                                          \
-      thread_add_event (master, ospf_nsm_event, (N), (E))
-
-/* Macro for OSPF NSM execute event. */
-#define OSPF_NSM_EVENT_EXECUTE(N,E)                                           \
-      thread_execute (master, ospf_nsm_event, (N), (E))
-
-/* Prototypes. */
-extern int ospf_nsm_event (struct thread *);
-extern void ospf_check_nbr_loading (struct ospf_neighbor *);
-extern int ospf_db_summary_isempty (struct ospf_neighbor *);
-extern int ospf_db_summary_count (struct ospf_neighbor *);
-extern void ospf_db_summary_clear (struct ospf_neighbor *);
-
-#endif /* _ZEBRA_OSPF_NSM_H */
-
diff --git a/openflow/usr/include/quagga/ospfd/ospf_opaque.h b/openflow/usr/include/quagga/ospfd/ospf_opaque.h
deleted file mode 100644
index 2273064..0000000
--- a/openflow/usr/include/quagga/ospfd/ospf_opaque.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * This is an implementation of rfc2370.
- * Copyright (C) 2001 KDD R&D Laboratories, Inc.
- * http://www.kddlabs.co.jp/
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- * 
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_OSPF_OPAQUE_H
-#define _ZEBRA_OSPF_OPAQUE_H
-
-#include "vty.h"
-
-#define	IS_OPAQUE_LSA(type) \
-	((type) == OSPF_OPAQUE_LINK_LSA  || \
-	 (type) == OSPF_OPAQUE_AREA_LSA  || \
-	 (type) == OSPF_OPAQUE_AS_LSA)
-
-/*
- * Usage of Opaque-LSA administrative flags in "struct ospf".
- *
- *    7   6   5   4   3   2   1   0
- * +---+---+---+---+---+---+---+---+
- * |///|///|///|///|B11|B10|B09| O |
- * +---+---+---+---+---+---+---+---+
- *                 |<--------->| A
- *                       |       +--- Operation status (operational = 1)
- *                       +----------- Blocking status for each LSA type
- */
-
-#define IS_OPAQUE_LSA_ORIGINATION_BLOCKED(V) \
-        CHECK_FLAG((V), (OPAQUE_BLOCK_TYPE_09_LSA_BIT | \
-                         OPAQUE_BLOCK_TYPE_10_LSA_BIT | \
-                         OPAQUE_BLOCK_TYPE_11_LSA_BIT))
-
-/*
- * Opaque LSA's link state ID is redefined as follows.
- *
- *        24       16        8        0
- * +--------+--------+--------+--------+
- * |tttttttt|........|........|........|
- * +--------+--------+--------+--------+
- * |<-Type->|<------- Opaque ID ------>|
- */
-#define LSID_OPAQUE_TYPE_MASK	0xff000000	/*  8 bits */
-#define LSID_OPAQUE_ID_MASK	0x00ffffff	/* 24 bits */
-
-#define	GET_OPAQUE_TYPE(lsid) \
-	(((u_int32_t)(lsid) & LSID_OPAQUE_TYPE_MASK) >> 24)
-
-#define	GET_OPAQUE_ID(lsid) \
-	 ((u_int32_t)(lsid) & LSID_OPAQUE_ID_MASK)
-
-#define	SET_OPAQUE_LSID(type, id) \
-	((((type) << 24) & LSID_OPAQUE_TYPE_MASK) \
-	| ((id)          & LSID_OPAQUE_ID_MASK))
-
-/*
- * Opaque LSA types will be assigned by IANA.
- * <http://www.iana.org/assignments/ospf-opaque-types>
- */
-#define OPAQUE_TYPE_TRAFFIC_ENGINEERING_LSA		1
-#define OPAQUE_TYPE_SYCAMORE_OPTICAL_TOPOLOGY_DESC	2
-#define OPAQUE_TYPE_GRACE_LSA				3
-
-/* Followings types are proposed in internet-draft documents. */
-#define OPAQUE_TYPE_8021_QOSPF				129
-#define OPAQUE_TYPE_SECONDARY_NEIGHBOR_DISCOVERY	224
-#define OPAQUE_TYPE_FLOODGATE                           225
-
-/* Ugly hack to make use of an unallocated value for wildcard matching! */
-#define OPAQUE_TYPE_WILDCARD				0
-
-#define OPAQUE_TYPE_RANGE_UNASSIGNED(type) \
-	(  4 <= (type) && (type) <= 127)
-
-#define OPAQUE_TYPE_RANGE_RESERVED(type) \
-	(127 <  (type) && (type) <= 255)
-
-#define VALID_OPAQUE_INFO_LEN(lsahdr) \
-	((ntohs((lsahdr)->length) >= sizeof (struct lsa_header)) && \
-	((ntohs((lsahdr)->length) %  sizeof (u_int32_t)) == 0))
-
-/* Prototypes. */
-
-extern void ospf_opaque_init (void);
-extern void ospf_opaque_term (void);
-extern int ospf_opaque_type9_lsa_init (struct ospf_interface *oi);
-extern void ospf_opaque_type9_lsa_term (struct ospf_interface *oi);
-extern int ospf_opaque_type10_lsa_init (struct ospf_area *area);
-extern void ospf_opaque_type10_lsa_term (struct ospf_area *area);
-extern int ospf_opaque_type11_lsa_init (struct ospf *ospf);
-extern void ospf_opaque_type11_lsa_term (struct ospf *ospf);
-
-extern int
-ospf_register_opaque_functab (
-  u_char lsa_type,
-  u_char opaque_type,
-  int (* new_if_hook)(struct interface *ifp),
-  int (* del_if_hook)(struct interface *ifp),
-  void (* ism_change_hook)(struct ospf_interface *oi, int old_status),
-  void (* nsm_change_hook)(struct ospf_neighbor *nbr, int old_status),
-  void (* config_write_router)(struct vty *vty),
-  void (* config_write_if    )(struct vty *vty, struct interface *ifp),
-  void (* config_write_debug )(struct vty *vty),
-  void (* show_opaque_info   )(struct vty *vty, struct ospf_lsa *lsa),
-  int  (* lsa_originator)(void *arg),
-  struct ospf_lsa *(* lsa_refresher )(struct ospf_lsa *lsa),
-  int (* new_lsa_hook)(struct ospf_lsa *lsa),
-  int (* del_lsa_hook)(struct ospf_lsa *lsa)
-);
-extern void ospf_delete_opaque_functab (u_char lsa_type, u_char opaque_type);
-
-extern int ospf_opaque_new_if (struct interface *ifp);
-extern int ospf_opaque_del_if (struct interface *ifp);
-extern void ospf_opaque_ism_change (struct ospf_interface *oi,
-				    int old_status);
-extern void ospf_opaque_nsm_change (struct ospf_neighbor *nbr,
-				    int old_status);
-extern void ospf_opaque_config_write_router (struct vty *vty, struct ospf *);
-extern void ospf_opaque_config_write_if (struct vty *vty,
-					 struct interface *ifp);
-extern void ospf_opaque_config_write_debug (struct vty *vty);
-extern void show_opaque_info_detail (struct vty *vty, struct ospf_lsa *lsa);
-extern void ospf_opaque_lsa_dump (struct stream *s, u_int16_t length);
-
-extern void ospf_opaque_lsa_originate_schedule (struct ospf_interface *oi,
-						int *init_delay);
-extern struct ospf_lsa *ospf_opaque_lsa_install (struct ospf_lsa *,
-						 int rt_recalc);
-extern struct ospf_lsa *ospf_opaque_lsa_refresh (struct ospf_lsa *lsa);
-
-extern void ospf_opaque_lsa_reoriginate_schedule (void *lsa_type_dependent,
-						  u_char lsa_type,
-						  u_char opaque_type);
-extern void ospf_opaque_lsa_refresh_schedule (struct ospf_lsa *lsa);
-extern void ospf_opaque_lsa_flush_schedule (struct ospf_lsa *lsa);
-
-extern void ospf_opaque_adjust_lsreq (struct ospf_neighbor *nbr,
-				      struct list *lsas);
-extern void ospf_opaque_self_originated_lsa_received (struct ospf_neighbor
-						      *nbr,
-						      struct ospf_lsa *lsa);
-extern void ospf_opaque_ls_ack_received (struct ospf_neighbor *nbr,
-					 struct ospf_lsa *lsa);
-
-extern void htonf (float *src, float *dst);
-extern void ntohf (float *src, float *dst);
-extern struct ospf *oi_to_top (struct ospf_interface *oi);
-
-#endif /* _ZEBRA_OSPF_OPAQUE_H */
diff --git a/openflow/usr/include/quagga/ospfd/ospfd.h b/openflow/usr/include/quagga/ospfd/ospfd.h
deleted file mode 100644
index bf70d02..0000000
--- a/openflow/usr/include/quagga/ospfd/ospfd.h
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
- * OSPFd main header.
- * Copyright (C) 1998, 99, 2000 Kunihiro Ishiguro, Toshiaki Takada
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- * 
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_OSPFD_H
-#define _ZEBRA_OSPFD_H
-
-#include <zebra.h>
-#include "libospf.h"
-
-#include "filter.h"
-#include "log.h"
-
-#define OSPF_VERSION            2
-
-/* VTY port number. */
-#define OSPF_VTY_PORT          2604
-
-/* IP TTL for OSPF protocol. */
-#define OSPF_IP_TTL             1
-#define OSPF_VL_IP_TTL          100
-
-/* Default configuration file name for ospfd. */
-#define OSPF_DEFAULT_CONFIG   "ospfd.conf"
-
-#define OSPF_NSSA_TRANS_STABLE_DEFAULT		40
-
-#define OSPF_ALLSPFROUTERS              0xe0000005      /* 224.0.0.5 */
-#define OSPF_ALLDROUTERS                0xe0000006      /* 224.0.0.6 */
-
-
-/* OSPF Authentication Type. */
-#define OSPF_AUTH_NULL                      0
-#define OSPF_AUTH_SIMPLE                    1
-#define OSPF_AUTH_CRYPTOGRAPHIC             2
-/* For Interface authentication setting default */
-#define OSPF_AUTH_NOTSET                   -1
-/* For the consumption and sanity of the command handler */ 
-/* DO NIOT REMOVE!!! Need to detect whether a value has
-   been given or not in VLink command handlers */
-#define OSPF_AUTH_CMD_NOTSEEN              -2
-
-/* OSPF options. */
-#define OSPF_OPTION_T                    0x01  /* TOS. */
-#define OSPF_OPTION_E                    0x02
-#define OSPF_OPTION_MC                   0x04
-#define OSPF_OPTION_NP                   0x08
-#define OSPF_OPTION_EA                   0x10
-#define OSPF_OPTION_DC                   0x20
-#define OSPF_OPTION_O                    0x40
-
-/* OSPF Database Description flags. */
-#define OSPF_DD_FLAG_MS                  0x01
-#define OSPF_DD_FLAG_M                   0x02
-#define OSPF_DD_FLAG_I                   0x04
-#define OSPF_DD_FLAG_ALL                 0x07
-
-#define OSPF_LS_REFRESH_SHIFT       (60 * 15)
-#define OSPF_LS_REFRESH_JITTER      60
-
-/* OSPF master for system wide configuration and variables. */
-struct ospf_master
-{
-  /* OSPF instance. */
-  struct list *ospf;
-
-  /* OSPF thread master. */
-  struct thread_master *master;
-
-  /* Zebra interface list. */
-  struct list *iflist;
-
-  /* Redistributed external information. */
-  struct route_table *external_info[ZEBRA_ROUTE_MAX + 1];
-#define EXTERNAL_INFO(T)      om->external_info[T]
-
-  /* OSPF start time. */
-  time_t start_time;
-
-  /* Various OSPF global configuration. */
-  u_char options;
-#define OSPF_MASTER_SHUTDOWN (1 << 0) /* deferred-shutdown */  
-};
-
-/* OSPF instance structure. */
-struct ospf
-{
-  /* OSPF Router ID. */
-  struct in_addr router_id;		/* Configured automatically. */
-  struct in_addr router_id_static;	/* Configured manually. */
-
-  /* ABR/ASBR internal flags. */
-  u_char flags;
-#define OSPF_FLAG_ABR           0x0001
-#define OSPF_FLAG_ASBR          0x0002
-
-  /* ABR type. */
-  u_char abr_type;
-#define OSPF_ABR_UNKNOWN	0
-#define OSPF_ABR_STAND          1
-#define OSPF_ABR_IBM            2
-#define OSPF_ABR_CISCO          3
-#define OSPF_ABR_SHORTCUT       4
-#define OSPF_ABR_DEFAULT	OSPF_ABR_CISCO
-
-  /* NSSA ABR */
-  u_char anyNSSA;		/* Bump for every NSSA attached. */
-
-  /* Configured variables. */
-  u_char config;
-#define OSPF_RFC1583_COMPATIBLE         (1 << 0)
-#define OSPF_OPAQUE_CAPABLE		(1 << 2)
-#define OSPF_LOG_ADJACENCY_CHANGES	(1 << 3)
-#define OSPF_LOG_ADJACENCY_DETAIL	(1 << 4)
-
-#ifdef HAVE_OPAQUE_LSA
-  /* Opaque-LSA administrative flags. */
-  u_char opaque;
-#define OPAQUE_OPERATION_READY_BIT	(1 << 0)
-#define OPAQUE_BLOCK_TYPE_09_LSA_BIT	(1 << 1)
-#define OPAQUE_BLOCK_TYPE_10_LSA_BIT	(1 << 2)
-#define OPAQUE_BLOCK_TYPE_11_LSA_BIT	(1 << 3)
-#endif /* HAVE_OPAQUE_LSA */
-
-  /* RFC3137 stub router. Configured time to stay stub / max-metric */
-  unsigned int stub_router_startup_time;	/* seconds */
-  unsigned int stub_router_shutdown_time;	/* seconds */
-#define OSPF_STUB_ROUTER_UNCONFIGURED	  0
-  u_char       stub_router_admin_set;
-#define OSPF_STUB_ROUTER_ADMINISTRATIVE_SET     1
-#define OSPF_STUB_ROUTER_ADMINISTRATIVE_UNSET   0
-
-#define OSPF_STUB_MAX_METRIC_SUMMARY_COST	0x00ff0000
-
-  /* SPF parameters */
-  unsigned int spf_delay;		/* SPF delay time. */
-  unsigned int spf_holdtime;		/* SPF hold time. */
-  unsigned int spf_max_holdtime;	/* SPF maximum-holdtime */
-  unsigned int spf_hold_multiplier;	/* Adaptive multiplier for hold time */
-  
-  int default_originate;		/* Default information originate. */
-#define DEFAULT_ORIGINATE_NONE		0
-#define DEFAULT_ORIGINATE_ZEBRA		1
-#define DEFAULT_ORIGINATE_ALWAYS	2
-  u_int32_t ref_bandwidth;		/* Reference Bandwidth (Kbps). */
-  struct route_table *networks;         /* OSPF config networks. */
-  struct list *vlinks;                  /* Configured Virtual-Links. */
-  struct list *areas;                   /* OSPF areas. */
-  struct route_table *nbr_nbma;
-  struct ospf_area *backbone;           /* Pointer to the Backbone Area. */
-
-  struct list *oiflist;                 /* ospf interfaces */
-  u_char passive_interface_default;	/* passive-interface default */
-
-  /* LSDB of AS-external-LSAs. */
-  struct ospf_lsdb *lsdb;
-  
-  /* Flags. */
-  int external_origin;			/* AS-external-LSA origin flag. */
-  int ase_calc;				/* ASE calculation flag. */
-
-#ifdef HAVE_OPAQUE_LSA
-  struct list *opaque_lsa_self;		/* Type-11 Opaque-LSAs */
-#endif /* HAVE_OPAQUE_LSA */
-
-  /* Routing tables. */
-  struct route_table *old_table;        /* Old routing table. */
-  struct route_table *new_table;        /* Current routing table. */
-
-  struct route_table *old_rtrs;         /* Old ABR/ASBR RT. */
-  struct route_table *new_rtrs;         /* New ABR/ASBR RT. */
-
-  struct route_table *new_external_route;   /* New External Route. */
-  struct route_table *old_external_route;   /* Old External Route. */
-  
-  struct route_table *external_lsas;    /* Database of external LSAs,
-					   prefix is LSA's adv. network*/
-
-  /* Time stamps */
-  struct timeval ts_spf;		/* SPF calculation time stamp. */
-  struct timeval ts_spf_duration;	/* Execution time of last SPF */
-
-  struct route_table *maxage_lsa;       /* List of MaxAge LSA for deletion. */
-  int redistribute;                     /* Num of redistributed protocols. */
-
-  /* Threads. */
-  struct thread *t_abr_task;            /* ABR task timer. */
-  struct thread *t_asbr_check;          /* ASBR check timer. */
-  struct thread *t_distribute_update;   /* Distirbute list update timer. */
-  struct thread *t_spf_calc;	        /* SPF calculation timer. */
-  struct thread *t_ase_calc;		/* ASE calculation timer. */
-  struct thread *t_external_lsa;	/* AS-external-LSA origin timer. */
-#ifdef HAVE_OPAQUE_LSA
-  struct thread *t_opaque_lsa_self;	/* Type-11 Opaque-LSAs origin event. */
-#endif /* HAVE_OPAQUE_LSA */
-
-  unsigned int maxage_delay;		/* Delay on Maxage remover timer, sec */
-  struct thread *t_maxage;              /* MaxAge LSA remover timer. */
-  struct thread *t_maxage_walker;       /* MaxAge LSA checking timer. */
-
-  struct thread *t_deferred_shutdown;	/* deferred/stub-router shutdown timer*/
-
-  struct thread *t_write;
-  struct thread *t_read;
-  int fd;
-  unsigned int maxsndbuflen;
-  struct stream *ibuf;
-  struct list *oi_write_q;
-  
-  /* Distribute lists out of other route sources. */
-  struct 
-  {
-    char *name;
-    struct access_list *list;
-  } dlist[ZEBRA_ROUTE_MAX];
-#define DISTRIBUTE_NAME(O,T)    (O)->dlist[T].name
-#define DISTRIBUTE_LIST(O,T)    (O)->dlist[T].list
-
-  /* Redistribute metric info. */
-  struct 
-  {
-    int type;                   /* External metric type (E1 or E2).  */
-    int value;		        /* Value for static metric (24-bit).
-				   -1 means metric value is not set. */
-  } dmetric [ZEBRA_ROUTE_MAX + 1];
-
-  /* For redistribute route map. */
-  struct
-  {
-    char *name;
-    struct route_map *map;
-  } route_map [ZEBRA_ROUTE_MAX + 1]; /* +1 is for default-information */
-#define ROUTEMAP_NAME(O,T)   (O)->route_map[T].name
-#define ROUTEMAP(O,T)        (O)->route_map[T].map
-  
-  int default_metric;		/* Default metric for redistribute. */
-
-#define OSPF_LSA_REFRESHER_GRANULARITY 10
-#define OSPF_LSA_REFRESHER_SLOTS ((OSPF_LS_REFRESH_TIME + \
-                                  OSPF_LS_REFRESH_SHIFT)/10 + 1)
-  struct
-  {
-    u_int16_t index;
-    struct list *qs[OSPF_LSA_REFRESHER_SLOTS];
-  } lsa_refresh_queue;
-  
-  struct thread *t_lsa_refresher;
-  time_t lsa_refresher_started;
-#define OSPF_LSA_REFRESH_INTERVAL_DEFAULT 10
-  u_int16_t lsa_refresh_interval;
-  
-  /* Distance parameter. */
-  u_char distance_all;
-  u_char distance_intra;
-  u_char distance_inter;
-  u_char distance_external;
-
-  /* Statistics for LSA origination. */
-  u_int32_t lsa_originate_count;
-
-  /* Statistics for LSA used for new instantiation. */
-  u_int32_t rx_lsa_count;
- 
-  struct route_table *distance_table;
-};
-
-/* OSPF area structure. */
-struct ospf_area
-{
-  /* OSPF instance. */
-  struct ospf *ospf;
-
-  /* Zebra interface list belonging to the area. */
-  struct list *oiflist;
-
-  /* Area ID. */
-  struct in_addr area_id;
-
-  /* Area ID format. */
-  char format;
-#define OSPF_AREA_ID_FORMAT_ADDRESS         1
-#define OSPF_AREA_ID_FORMAT_DECIMAL         2
-
-  /* Address range. */
-  struct list *address_range;
-
-  /* Configured variables. */
-  int external_routing;                 /* ExternalRoutingCapability. */
-#define OSPF_AREA_DEFAULT       0
-#define OSPF_AREA_STUB          1
-#define OSPF_AREA_NSSA          2
-#define OSPF_AREA_TYPE_MAX	3
-  int no_summary;                       /* Don't inject summaries into stub.*/
-  int shortcut_configured;              /* Area configured as shortcut. */
-#define OSPF_SHORTCUT_DEFAULT	0
-#define OSPF_SHORTCUT_ENABLE	1
-#define OSPF_SHORTCUT_DISABLE	2
-  int shortcut_capability;              /* Other ABRs agree on S-bit */
-  u_int32_t default_cost;               /* StubDefaultCost. */
-  int auth_type;                        /* Authentication type. */
-  
-
-  u_char NSSATranslatorRole;          /* NSSA configured role */
-#define OSPF_NSSA_ROLE_NEVER     0
-#define OSPF_NSSA_ROLE_CANDIDATE 1
-#define OSPF_NSSA_ROLE_ALWAYS    2
-  u_char NSSATranslatorState;              /* NSSA operational role */
-#define OSPF_NSSA_TRANSLATE_DISABLED 0
-#define OSPF_NSSA_TRANSLATE_ENABLED  1
-  int NSSATranslatorStabilityInterval;
-  
-  u_char transit;			/* TransitCapability. */
-#define OSPF_TRANSIT_FALSE      0
-#define OSPF_TRANSIT_TRUE       1
-  struct route_table *ranges;		/* Configured Area Ranges. */
-  
-  /* RFC3137 stub router state flags for area */
-  u_char stub_router_state;
-#define OSPF_AREA_ADMIN_STUB_ROUTED	(1 << 0) /* admin stub-router set */
-#define OSPF_AREA_IS_STUB_ROUTED	(1 << 1) /* stub-router active */
-#define OSPF_AREA_WAS_START_STUB_ROUTED	(1 << 2) /* startup SR was done */
-  
-  /* Area related LSDBs[Type1-4]. */
-  struct ospf_lsdb *lsdb;
-
-  /* Self-originated LSAs. */
-  struct ospf_lsa *router_lsa_self;
-#ifdef HAVE_OPAQUE_LSA
-  struct list *opaque_lsa_self;		/* Type-10 Opaque-LSAs */
-#endif /* HAVE_OPAQUE_LSA */
-
-  /* Area announce list. */
-  struct 
-  {
-    char *name;
-    struct access_list *list;
-  } _export;
-#define EXPORT_NAME(A)  (A)->_export.name
-#define EXPORT_LIST(A)  (A)->_export.list
-
-  /* Area acceptance list. */
-  struct 
-  {
-    char *name;
-    struct access_list *list;
-  } import;
-#define IMPORT_NAME(A)  (A)->import.name
-#define IMPORT_LIST(A)  (A)->import.list
-
-  /* Type 3 LSA Area prefix-list. */
-  struct 
-  {
-    char *name;
-    struct prefix_list *list;
-  } plist_in;
-#define PREFIX_LIST_IN(A)   (A)->plist_in.list
-#define PREFIX_NAME_IN(A)   (A)->plist_in.name
-
-  struct
-  {
-    char *name;
-    struct prefix_list *list;
-  } plist_out;
-#define PREFIX_LIST_OUT(A)  (A)->plist_out.list
-#define PREFIX_NAME_OUT(A)  (A)->plist_out.name
-
-  /* Shortest Path Tree. */
-  struct vertex *spf;
-
-  /* Threads. */
-  struct thread *t_stub_router;    /* Stub-router timer */
-#ifdef HAVE_OPAQUE_LSA
-  struct thread *t_opaque_lsa_self;	/* Type-10 Opaque-LSAs origin. */
-#endif /* HAVE_OPAQUE_LSA */
-
-  /* Statistics field. */
-  u_int32_t spf_calculation;	/* SPF Calculation Count. */
-
-  /* Time stamps. */
-  struct timeval ts_spf;		/* SPF calculation time stamp. */
-
-  /* Router count. */
-  u_int32_t abr_count;		/* ABR router in this area. */
-  u_int32_t asbr_count;		/* ASBR router in this area. */
-
-  /* Counters. */
-  u_int32_t act_ints;		/* Active interfaces. */
-  u_int32_t full_nbrs;		/* Fully adjacent neighbors. */
-  u_int32_t full_vls;		/* Fully adjacent virtual neighbors. */
-};
-
-/* OSPF config network structure. */
-struct ospf_network
-{
-  /* Area ID. */
-  struct in_addr area_id;
-  int format;
-};
-
-/* OSPF NBMA neighbor structure. */
-struct ospf_nbr_nbma
-{
-  /* Neighbor IP address. */
-  struct in_addr addr;
-
-  /* OSPF interface. */
-  struct ospf_interface *oi;
-
-  /* OSPF neighbor structure. */
-  struct ospf_neighbor *nbr;
-
-  /* Neighbor priority. */
-  u_char priority;
-
-  /* Poll timer value. */
-  u_int32_t v_poll;
-
-  /* Poll timer thread. */
-  struct thread *t_poll;
-
-  /* State change. */
-  u_int32_t state_change;
-};
-
-/* Macro. */
-#define OSPF_AREA_SAME(X,Y) \
-        (memcmp ((X->area_id), (Y->area_id), IPV4_MAX_BYTELEN) == 0)
-
-#define IS_OSPF_ABR(O)		((O)->flags & OSPF_FLAG_ABR)
-#define IS_OSPF_ASBR(O)		((O)->flags & OSPF_FLAG_ASBR)
-
-#define OSPF_IS_AREA_ID_BACKBONE(I) ((I).s_addr == OSPF_AREA_BACKBONE)
-#define OSPF_IS_AREA_BACKBONE(A) OSPF_IS_AREA_ID_BACKBONE ((A)->area_id)
-
-#ifdef roundup
-#  define ROUNDUP(val, gran)	roundup(val, gran)
-#else /* roundup */
-#  define ROUNDUP(val, gran)	(((val) - 1 | (gran) - 1) + 1)
-#endif /* roundup */
-
-#define LSA_OPTIONS_GET(area) \
-        (((area)->external_routing == OSPF_AREA_DEFAULT) ? OSPF_OPTION_E : 0)
-#define LSA_OPTIONS_NSSA_GET(area) \
-        (((area)->external_routing == OSPF_AREA_NSSA)  ? OSPF_OPTION_NP : 0)
-
-#define OSPF_TIMER_ON(T,F,V)                                                  \
-    do {                                                                      \
-      if (!(T))                                                               \
-	(T) = thread_add_timer (master, (F), ospf, (V));                      \
-    } while (0)
-
-#define OSPF_AREA_TIMER_ON(T,F,V)                                             \
-    do {                                                                      \
-      if (!(T))                                                               \
-        (T) = thread_add_timer (master, (F), area, (V));                      \
-    } while (0)
-
-#define OSPF_POLL_TIMER_ON(T,F,V)                                             \
-    do {                                                                      \
-      if (!(T))                                                               \
-        (T) = thread_add_timer (master, (F), nbr_nbma, (V));                  \
-    } while (0)
-
-#define OSPF_POLL_TIMER_OFF(X)		OSPF_TIMER_OFF((X))
-
-#define OSPF_TIMER_OFF(X)                                                     \
-    do {                                                                      \
-      if (X)                                                                  \
-        {                                                                     \
-          thread_cancel (X);                                                  \
-          (X) = NULL;                                                         \
-        }                                                                     \
-    } while (0)
-
-/* Extern variables. */
-extern struct ospf_master *om;
-extern const struct message ospf_ism_state_msg[];
-extern const struct message ospf_nsm_state_msg[];
-extern const struct message ospf_lsa_type_msg[];
-extern const struct message ospf_link_state_id_type_msg[];
-extern const struct message ospf_network_type_msg[];
-extern const int ospf_ism_state_msg_max;
-extern const int ospf_nsm_state_msg_max;
-extern const int ospf_lsa_type_msg_max;
-extern const int ospf_link_state_id_type_msg_max;
-extern const int ospf_redistributed_proto_max;
-extern const int ospf_network_type_msg_max;
-extern struct zclient *zclient;
-extern struct thread_master *master;
-extern int ospf_zlog;
-
-/* Prototypes. */
-extern const char *ospf_redist_string(u_int route_type);
-extern struct ospf *ospf_lookup (void);
-extern struct ospf *ospf_get (void);
-extern void ospf_finish (struct ospf *);
-extern void ospf_router_id_update (struct ospf *ospf);
-extern int ospf_network_set (struct ospf *, struct prefix_ipv4 *,
-			     struct in_addr);
-extern int ospf_network_unset (struct ospf *, struct prefix_ipv4 *,
-			       struct in_addr);
-extern int ospf_area_stub_set (struct ospf *, struct in_addr);
-extern int ospf_area_stub_unset (struct ospf *, struct in_addr);
-extern int ospf_area_no_summary_set (struct ospf *, struct in_addr);
-extern int ospf_area_no_summary_unset (struct ospf *, struct in_addr);
-extern int ospf_area_nssa_set (struct ospf *, struct in_addr);
-extern int ospf_area_nssa_unset (struct ospf *, struct in_addr);
-extern int ospf_area_nssa_translator_role_set (struct ospf *, struct in_addr,
-					       int);
-extern int ospf_area_export_list_set (struct ospf *, struct ospf_area *,
-				      const char *);
-extern int ospf_area_export_list_unset (struct ospf *, struct ospf_area *);
-extern int ospf_area_import_list_set (struct ospf *, struct ospf_area *,
-				      const char *);
-extern int ospf_area_import_list_unset (struct ospf *, struct ospf_area *);
-extern int ospf_area_shortcut_set (struct ospf *, struct ospf_area *, int);
-extern int ospf_area_shortcut_unset (struct ospf *, struct ospf_area *);
-extern int ospf_timers_refresh_set (struct ospf *, int);
-extern int ospf_timers_refresh_unset (struct ospf *);
-extern int ospf_nbr_nbma_set (struct ospf *, struct in_addr);
-extern int ospf_nbr_nbma_unset (struct ospf *, struct in_addr);
-extern int ospf_nbr_nbma_priority_set (struct ospf *, struct in_addr, u_char);
-extern int ospf_nbr_nbma_priority_unset (struct ospf *, struct in_addr);
-extern int ospf_nbr_nbma_poll_interval_set (struct ospf *, struct in_addr,
-					    unsigned int);
-extern int ospf_nbr_nbma_poll_interval_unset (struct ospf *, struct in_addr);
-extern void ospf_prefix_list_update (struct prefix_list *);
-extern void ospf_init (void);
-extern void ospf_if_update (struct ospf *, struct interface *);
-extern void ospf_ls_upd_queue_empty (struct ospf_interface *);
-extern void ospf_terminate (void);
-extern void ospf_nbr_nbma_if_update (struct ospf *, struct ospf_interface *);
-extern struct ospf_nbr_nbma *ospf_nbr_nbma_lookup (struct ospf *,
-						   struct in_addr);
-extern struct ospf_nbr_nbma *ospf_nbr_nbma_lookup_next (struct ospf *,
-							struct in_addr *,
-							int);
-extern int ospf_oi_count (struct interface *);
-
-extern struct ospf_area *ospf_area_get (struct ospf *, struct in_addr, int);
-extern void ospf_area_check_free (struct ospf *, struct in_addr);
-extern struct ospf_area *ospf_area_lookup_by_area_id (struct ospf *,
-						      struct in_addr);
-extern void ospf_area_add_if (struct ospf_area *, struct ospf_interface *);
-extern void ospf_area_del_if (struct ospf_area *, struct ospf_interface *);
-
-extern void ospf_route_map_init (void);
-extern void ospf_snmp_init (void);
-
-extern void ospf_master_init (void);
-
-#endif /* _ZEBRA_OSPFD_H */
diff --git a/openflow/usr/include/quagga/plist.h b/openflow/usr/include/quagga/plist.h
deleted file mode 100644
index fb3168a..0000000
--- a/openflow/usr/include/quagga/plist.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Prefix list functions.
- * Copyright (C) 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _QUAGGA_PLIST_H
-#define _QUAGGA_PLIST_H
-
-#define AFI_ORF_PREFIX 65535
-
-enum prefix_list_type 
-{
-  PREFIX_DENY,
-  PREFIX_PERMIT,
-};
-
-enum prefix_name_type
-{
-  PREFIX_TYPE_STRING,
-  PREFIX_TYPE_NUMBER
-};
-
-struct prefix_list
-{
-  char *name;
-  char *desc;
-
-  struct prefix_master *master;
-
-  enum prefix_name_type type;
-
-  int count;
-  int rangecount;
-
-  struct prefix_list_entry *head;
-  struct prefix_list_entry *tail;
-
-  struct prefix_list *next;
-  struct prefix_list *prev;
-};
-
-struct orf_prefix
-{
-  u_int32_t seq;
-  u_char ge;
-  u_char le;
-  struct prefix p;
-};
-
-/* Prototypes. */
-extern void prefix_list_init (void);
-extern void prefix_list_reset (void);
-extern void prefix_list_add_hook (void (*func) (struct prefix_list *));
-extern void prefix_list_delete_hook (void (*func) (struct prefix_list *));
-
-extern struct prefix_list *prefix_list_lookup (afi_t, const char *);
-extern enum prefix_list_type prefix_list_apply (struct prefix_list *, void *);
-
-extern struct stream * prefix_bgp_orf_entry (struct stream *,
-                                             struct prefix_list *,
-                                             u_char, u_char, u_char);
-extern int prefix_bgp_orf_set (char *, afi_t, struct orf_prefix *, int, int);
-extern void prefix_bgp_orf_remove_all (char *);
-extern int prefix_bgp_show_prefix_list (struct vty *, afi_t, char *);
-
-#endif /* _QUAGGA_PLIST_H */
diff --git a/openflow/usr/include/quagga/pqueue.h b/openflow/usr/include/quagga/pqueue.h
deleted file mode 100644
index 8bb6961..0000000
--- a/openflow/usr/include/quagga/pqueue.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Priority queue functions.
-   Copyright (C) 2003 Yasuhiro Ohara
-
-This file is part of GNU Zebra.
-
-GNU Zebra is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2, or (at your
-option) any later version.
-
-GNU Zebra is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Zebra; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#ifndef _ZEBRA_PQUEUE_H
-#define _ZEBRA_PQUEUE_H
-
-struct pqueue
-{
-  void **array;
-  int array_size;
-  int size;
-
-  int (*cmp) (void *, void *);
-  void (*update) (void * node, int actual_position);
-};
-
-#define PQUEUE_INIT_ARRAYSIZE  32
-
-extern struct pqueue *pqueue_create (void);
-extern void pqueue_delete (struct pqueue *queue);
-
-extern void pqueue_enqueue (void *data, struct pqueue *queue);
-extern void *pqueue_dequeue (struct pqueue *queue);
-extern void pqueue_remove_at (int index, struct pqueue *queue);
-
-extern void trickle_down (int index, struct pqueue *queue);
-extern void trickle_up (int index, struct pqueue *queue);
-
-#endif /* _ZEBRA_PQUEUE_H */
diff --git a/openflow/usr/include/quagga/prefix.h b/openflow/usr/include/quagga/prefix.h
deleted file mode 100644
index 45889e0..0000000
--- a/openflow/usr/include/quagga/prefix.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Prefix structure.
- * Copyright (C) 1998 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_PREFIX_H
-#define _ZEBRA_PREFIX_H
-
-#include "sockunion.h"
-
-/*
- * A struct prefix contains an address family, a prefix length, and an
- * address.  This can represent either a 'network prefix' as defined
- * by CIDR, where the 'host bits' of the prefix are 0
- * (e.g. AF_INET:10.0.0.0/8), or an address and netmask
- * (e.g. AF_INET:10.0.0.9/8), such as might be configured on an
- * interface.
- */
-
-/* IPv4 and IPv6 unified prefix structure. */
-struct prefix
-{
-  u_char family;
-  u_char prefixlen;
-  union 
-  {
-    u_char prefix;
-    struct in_addr prefix4;
-#ifdef HAVE_IPV6
-    struct in6_addr prefix6;
-#endif /* HAVE_IPV6 */
-    struct 
-    {
-      struct in_addr id;
-      struct in_addr adv_router;
-    } lp;
-    u_char val[8];
-    uintptr_t ptr;
-  } u __attribute__ ((aligned (8)));
-};
-
-/* IPv4 prefix structure. */
-struct prefix_ipv4
-{
-  u_char family;
-  u_char prefixlen;
-  struct in_addr prefix __attribute__ ((aligned (8)));
-};
-
-/* IPv6 prefix structure. */
-#ifdef HAVE_IPV6
-struct prefix_ipv6
-{
-  u_char family;
-  u_char prefixlen;
-  struct in6_addr prefix __attribute__ ((aligned (8)));
-};
-#endif /* HAVE_IPV6 */
-
-struct prefix_ls
-{
-  u_char family;
-  u_char prefixlen;
-  struct in_addr id __attribute__ ((aligned (8)));
-  struct in_addr adv_router;
-};
-
-/* Prefix for routing distinguisher. */
-struct prefix_rd
-{
-  u_char family;
-  u_char prefixlen;
-  u_char val[8] __attribute__ ((aligned (8)));
-};
-
-/* Prefix for a generic pointer */
-struct prefix_ptr
-{
-  u_char family;
-  u_char prefixlen;
-  uintptr_t prefix __attribute__ ((aligned (8)));
-};
-
-/* helper to get type safety/avoid casts on calls
- * (w/o this, functions accepting all prefix types need casts on the caller
- * side, which strips type safety since the cast will accept any pointer
- * type.)
- */
-union prefix46ptr
-{
-  struct prefix *p;
-  struct prefix_ipv4 *p4;
-  struct prefix_ipv6 *p6;
-} __attribute__ ((transparent_union));
-
-union prefix46constptr
-{
-  const struct prefix *p;
-  const struct prefix_ipv4 *p4;
-  const struct prefix_ipv6 *p6;
-} __attribute__ ((transparent_union));
-
-#ifndef INET_ADDRSTRLEN
-#define INET_ADDRSTRLEN 16
-#endif /* INET_ADDRSTRLEN */
-
-#ifndef INET6_ADDRSTRLEN
-#define INET6_ADDRSTRLEN 46
-#endif /* INET6_ADDRSTRLEN */
-
-#ifndef INET6_BUFSIZ
-#define INET6_BUFSIZ 51
-#endif /* INET6_BUFSIZ */
-
-/* Max bit/byte length of IPv4 address. */
-#define IPV4_MAX_BYTELEN    4
-#define IPV4_MAX_BITLEN    32
-#define IPV4_MAX_PREFIXLEN 32
-#define IPV4_ADDR_CMP(D,S)   memcmp ((D), (S), IPV4_MAX_BYTELEN)
-#define IPV4_ADDR_SAME(D,S)  (memcmp ((D), (S), IPV4_MAX_BYTELEN) == 0)
-#define IPV4_ADDR_COPY(D,S)  memcpy ((D), (S), IPV4_MAX_BYTELEN)
-
-#define IPV4_NET0(a)    ((((u_int32_t) (a)) & 0xff000000) == 0x00000000)
-#define IPV4_NET127(a)  ((((u_int32_t) (a)) & 0xff000000) == 0x7f000000)
-#define IPV4_LINKLOCAL(a) ((((u_int32_t) (a)) & 0xffff0000) == 0xa9fe0000)
-#define IPV4_CLASS_DE(a)  ((((u_int32_t) (a)) & 0xe0000000) == 0xe0000000)
-
-/* Max bit/byte length of IPv6 address. */
-#define IPV6_MAX_BYTELEN    16
-#define IPV6_MAX_BITLEN    128
-#define IPV6_MAX_PREFIXLEN 128
-#define IPV6_ADDR_CMP(D,S)   memcmp ((D), (S), IPV6_MAX_BYTELEN)
-#define IPV6_ADDR_SAME(D,S)  (memcmp ((D), (S), IPV6_MAX_BYTELEN) == 0)
-#define IPV6_ADDR_COPY(D,S)  memcpy ((D), (S), IPV6_MAX_BYTELEN)
-
-/* Count prefix size from mask length */
-#define PSIZE(a) (((a) + 7) / (8))
-
-/* Prefix's family member. */
-#define PREFIX_FAMILY(p)  ((p)->family)
-
-/* Prototypes. */
-extern int afi2family (afi_t);
-extern afi_t family2afi (int);
-
-/* Check bit of the prefix. */
-extern unsigned int prefix_bit (const u_char *prefix, const u_char prefixlen);
-extern unsigned int prefix6_bit (const struct in6_addr *prefix, const u_char prefixlen);
-
-extern struct prefix *prefix_new (void);
-extern void prefix_free (struct prefix *);
-extern const char *prefix_family_str (const struct prefix *);
-extern int prefix_blen (const struct prefix *);
-extern int str2prefix (const char *, struct prefix *);
-extern int prefix2str (const struct prefix *, char *, int);
-extern int prefix_match (const struct prefix *, const struct prefix *);
-extern int prefix_same (const struct prefix *, const struct prefix *);
-extern int prefix_cmp (const struct prefix *, const struct prefix *);
-extern int prefix_common_bits (const struct prefix *, const struct prefix *);
-extern void prefix_copy (struct prefix *dest, const struct prefix *src);
-extern void apply_mask (struct prefix *);
-
-extern struct prefix *sockunion2prefix (const union sockunion *dest,
-                                        const union sockunion *mask);
-extern struct prefix *sockunion2hostprefix (const union sockunion *);
-extern void prefix2sockunion (const struct prefix *, union sockunion *);
-
-extern struct prefix_ipv4 *prefix_ipv4_new (void);
-extern void prefix_ipv4_free (struct prefix_ipv4 *);
-extern int str2prefix_ipv4 (const char *, struct prefix_ipv4 *);
-extern void apply_mask_ipv4 (struct prefix_ipv4 *);
-
-#define PREFIX_COPY_IPV4(DST, SRC)	\
-	*((struct prefix_ipv4 *)(DST)) = *((const struct prefix_ipv4 *)(SRC));
-
-extern int prefix_ipv4_any (const struct prefix_ipv4 *);
-extern void apply_classful_mask_ipv4 (struct prefix_ipv4 *);
-
-extern u_char ip_masklen (struct in_addr);
-extern void masklen2ip (const int, struct in_addr *);
-/* returns the network portion of the host address */
-extern in_addr_t ipv4_network_addr (in_addr_t hostaddr, int masklen);
-/* given the address of a host on a network and the network mask length,
- * calculate the broadcast address for that network;
- * special treatment for /31: returns the address of the other host
- * on the network by flipping the host bit */
-extern in_addr_t ipv4_broadcast_addr (in_addr_t hostaddr, int masklen);
-
-extern int netmask_str2prefix_str (const char *, const char *, char *);
-
-#ifdef HAVE_IPV6
-extern struct prefix_ipv6 *prefix_ipv6_new (void);
-extern void prefix_ipv6_free (struct prefix_ipv6 *);
-extern int str2prefix_ipv6 (const char *, struct prefix_ipv6 *);
-extern void apply_mask_ipv6 (struct prefix_ipv6 *);
-
-#define PREFIX_COPY_IPV6(DST, SRC)	\
-	*((struct prefix_ipv6 *)(DST)) = *((const struct prefix_ipv6 *)(SRC));
-
-extern int ip6_masklen (struct in6_addr);
-extern void masklen2ip6 (const int, struct in6_addr *);
-
-extern void str2in6_addr (const char *, struct in6_addr *);
-extern const char *inet6_ntoa (struct in6_addr);
-
-#endif /* HAVE_IPV6 */
-
-extern int all_digit (const char *);
-
-static inline int ipv4_martian (struct in_addr *addr)
-{
-  in_addr_t ip = addr->s_addr;
-
-  if (IPV4_NET0(ip) || IPV4_NET127(ip) || IPV4_CLASS_DE(ip)) {
-    return 1;
-  }
-  return 0;
-}
-
-#endif /* _ZEBRA_PREFIX_H */
diff --git a/openflow/usr/include/quagga/privs.h b/openflow/usr/include/quagga/privs.h
deleted file mode 100644
index 46d614e..0000000
--- a/openflow/usr/include/quagga/privs.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* 
- * Zebra privileges header.
- *
- * Copyright (C) 2003 Paul Jakma.
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_PRIVS_H
-#define _ZEBRA_PRIVS_H
-
-/* list of zebra capabilities */
-typedef enum 
-{
-  ZCAP_SETID,
-  ZCAP_BIND,
-  ZCAP_NET_ADMIN,
-  ZCAP_SYS_ADMIN,
-  ZCAP_NET_RAW,
-  ZCAP_CHROOT,
-  ZCAP_NICE,
-  ZCAP_PTRACE,
-  ZCAP_DAC_OVERRIDE,
-  ZCAP_READ_SEARCH,
-  ZCAP_FOWNER,
-  ZCAP_MAX
-} zebra_capabilities_t;
-
-typedef enum
-{
-  ZPRIVS_LOWERED,
-  ZPRIVS_RAISED,
-  ZPRIVS_UNKNOWN,
-} zebra_privs_current_t;
-
-typedef enum
-{
-  ZPRIVS_RAISE,
-  ZPRIVS_LOWER,
-} zebra_privs_ops_t;
-
-struct zebra_privs_t
-{
-  zebra_capabilities_t *caps_p;       /* caps required for operation */
-  zebra_capabilities_t *caps_i;       /* caps to allow inheritance of */
-  int cap_num_p;                      /* number of caps in arrays */
-  int cap_num_i;                    
-  const char *user;                   /* user and group to run as */
-  const char *group;
-  const char *vty_group;              /* group to chown vty socket to */
-  /* methods */
-  int 
-    (*change) (zebra_privs_ops_t);    /* change privileges, 0 on success */
-  zebra_privs_current_t 
-    (*current_state) (void);          /* current privilege state */
-};
-
-struct zprivs_ids_t
-{
-  /* -1 is undefined */
-  uid_t uid_priv;                     /* privileged uid */
-  uid_t uid_normal;                   /* normal uid */
-  gid_t gid_priv;                     /* privileged uid */
-  gid_t gid_normal;                   /* normal uid */
-  gid_t gid_vty;                      /* vty gid */
-};
-
-  /* initialise zebra privileges */
-extern void zprivs_init (struct zebra_privs_t *zprivs);
-  /* drop all and terminate privileges */ 
-extern void zprivs_terminate (struct zebra_privs_t *);
-  /* query for runtime uid's and gid's, eg vty needs this */
-extern void zprivs_get_ids(struct zprivs_ids_t *);
-
-#endif /* _ZEBRA_PRIVS_H */
diff --git a/openflow/usr/include/quagga/route_types.h b/openflow/usr/include/quagga/route_types.h
deleted file mode 100644
index d278f75..0000000
--- a/openflow/usr/include/quagga/route_types.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/* Auto-generated from route_types.txt by . */
-/* Do not edit! */
-
-#ifndef _QUAGGA_ROUTE_TYPES_H
-#define _QUAGGA_ROUTE_TYPES_H
-
-/* Zebra route's types. */
-#define ZEBRA_ROUTE_SYSTEM               0
-#define ZEBRA_ROUTE_KERNEL               1
-#define ZEBRA_ROUTE_CONNECT              2
-#define ZEBRA_ROUTE_STATIC               3
-#define ZEBRA_ROUTE_RIP                  4
-#define ZEBRA_ROUTE_RIPNG                5
-#define ZEBRA_ROUTE_OSPF                 6
-#define ZEBRA_ROUTE_OSPF6                7
-#define ZEBRA_ROUTE_ISIS                 8
-#define ZEBRA_ROUTE_BGP                  9
-#define ZEBRA_ROUTE_PIM                  10
-#define ZEBRA_ROUTE_HSLS                 11
-#define ZEBRA_ROUTE_OLSR                 12
-#define ZEBRA_ROUTE_BABEL                13
-#define ZEBRA_ROUTE_MAX                  14
-
-#define SHOW_ROUTE_V4_HEADER \
-  "Codes: K - kernel route, C - connected, S - static, R - RIP,%s" \
-  "       O - OSPF, I - IS-IS, B - BGP, P - PIM, A - Babel,%s" \
-  "       > - selected route, * - FIB route%s%s", \
-  VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE
-#define SHOW_ROUTE_V6_HEADER \
-  "Codes: K - kernel route, C - connected, S - static, R - RIPng,%s" \
-  "       O - OSPFv6, I - IS-IS, B - BGP, A - Babel,%s" \
-  "       > - selected route, * - FIB route%s%s", \
-  VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE
-
-/* babeld */
-#define QUAGGA_REDIST_STR_BABELD \
-  "(kernel|connected|static|rip|ripng|ospf|ospf6|isis|bgp|pim)"
-#define QUAGGA_REDIST_HELP_STR_BABELD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol (RIP)\n" \
-  "Routing Information Protocol next-generation (IPv6) (RIPng)\n" \
-  "Open Shortest Path First (OSPFv2)\n" \
-  "Open Shortest Path First (IPv6) (OSPFv3)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Protocol Independent Multicast (PIM)\n"
-#define QUAGGA_IP_REDIST_STR_BABELD \
-  "(kernel|connected|static|rip|ospf|isis|bgp|pim)"
-#define QUAGGA_IP_REDIST_HELP_STR_BABELD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol (RIP)\n" \
-  "Open Shortest Path First (OSPFv2)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Protocol Independent Multicast (PIM)\n"
-#define QUAGGA_IP6_REDIST_STR_BABELD \
-  "(kernel|connected|static|ripng|ospf6|isis|bgp)"
-#define QUAGGA_IP6_REDIST_HELP_STR_BABELD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol next-generation (IPv6) (RIPng)\n" \
-  "Open Shortest Path First (IPv6) (OSPFv3)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n"
-
-/* bgpd */
-#define QUAGGA_REDIST_STR_BGPD \
-  "(kernel|connected|static|rip|ripng|ospf|ospf6|isis|pim|babel)"
-#define QUAGGA_REDIST_HELP_STR_BGPD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol (RIP)\n" \
-  "Routing Information Protocol next-generation (IPv6) (RIPng)\n" \
-  "Open Shortest Path First (OSPFv2)\n" \
-  "Open Shortest Path First (IPv6) (OSPFv3)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Protocol Independent Multicast (PIM)\n" \
-  "Babel routing protocol (Babel)\n"
-#define QUAGGA_IP_REDIST_STR_BGPD \
-  "(kernel|connected|static|rip|ospf|isis|pim|babel)"
-#define QUAGGA_IP_REDIST_HELP_STR_BGPD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol (RIP)\n" \
-  "Open Shortest Path First (OSPFv2)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Protocol Independent Multicast (PIM)\n" \
-  "Babel routing protocol (Babel)\n"
-#define QUAGGA_IP6_REDIST_STR_BGPD \
-  "(kernel|connected|static|ripng|ospf6|isis|babel)"
-#define QUAGGA_IP6_REDIST_HELP_STR_BGPD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol next-generation (IPv6) (RIPng)\n" \
-  "Open Shortest Path First (IPv6) (OSPFv3)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Babel routing protocol (Babel)\n"
-
-/* isisd */
-#define QUAGGA_REDIST_STR_ISISD \
-  "(kernel|connected|static|rip|ripng|ospf|ospf6|bgp|pim|babel)"
-#define QUAGGA_REDIST_HELP_STR_ISISD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol (RIP)\n" \
-  "Routing Information Protocol next-generation (IPv6) (RIPng)\n" \
-  "Open Shortest Path First (OSPFv2)\n" \
-  "Open Shortest Path First (IPv6) (OSPFv3)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Protocol Independent Multicast (PIM)\n" \
-  "Babel routing protocol (Babel)\n"
-#define QUAGGA_IP_REDIST_STR_ISISD \
-  "(kernel|connected|static|rip|ospf|bgp|pim|babel)"
-#define QUAGGA_IP_REDIST_HELP_STR_ISISD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol (RIP)\n" \
-  "Open Shortest Path First (OSPFv2)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Protocol Independent Multicast (PIM)\n" \
-  "Babel routing protocol (Babel)\n"
-#define QUAGGA_IP6_REDIST_STR_ISISD \
-  "(kernel|connected|static|ripng|ospf6|bgp|babel)"
-#define QUAGGA_IP6_REDIST_HELP_STR_ISISD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol next-generation (IPv6) (RIPng)\n" \
-  "Open Shortest Path First (IPv6) (OSPFv3)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Babel routing protocol (Babel)\n"
-
-/* ospf6d */
-#define QUAGGA_REDIST_STR_OSPF6D \
-  "(kernel|connected|static|ripng|isis|bgp|babel)"
-#define QUAGGA_REDIST_HELP_STR_OSPF6D \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol next-generation (IPv6) (RIPng)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Babel routing protocol (Babel)\n"
-
-/* ospfd */
-#define QUAGGA_REDIST_STR_OSPFD \
-  "(kernel|connected|static|rip|isis|bgp|pim|babel)"
-#define QUAGGA_REDIST_HELP_STR_OSPFD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol (RIP)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Protocol Independent Multicast (PIM)\n" \
-  "Babel routing protocol (Babel)\n"
-
-/* pimd */
-#define QUAGGA_REDIST_STR_PIMD \
-  "(kernel|connected|static|rip|ospf|isis|bgp|babel)"
-#define QUAGGA_REDIST_HELP_STR_PIMD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol (RIP)\n" \
-  "Open Shortest Path First (OSPFv2)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Babel routing protocol (Babel)\n"
-
-/* ripd */
-#define QUAGGA_REDIST_STR_RIPD \
-  "(kernel|connected|static|ospf|isis|bgp|pim|babel)"
-#define QUAGGA_REDIST_HELP_STR_RIPD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Open Shortest Path First (OSPFv2)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Protocol Independent Multicast (PIM)\n" \
-  "Babel routing protocol (Babel)\n"
-
-/* ripngd */
-#define QUAGGA_REDIST_STR_RIPNGD \
-  "(kernel|connected|static|ospf6|isis|bgp|babel)"
-#define QUAGGA_REDIST_HELP_STR_RIPNGD \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Open Shortest Path First (IPv6) (OSPFv3)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Babel routing protocol (Babel)\n"
-
-/* zebra */
-#define QUAGGA_REDIST_STR_ZEBRA \
-  "(kernel|connected|static|rip|ripng|ospf|ospf6|isis|bgp|pim|babel)"
-#define QUAGGA_REDIST_HELP_STR_ZEBRA \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol (RIP)\n" \
-  "Routing Information Protocol next-generation (IPv6) (RIPng)\n" \
-  "Open Shortest Path First (OSPFv2)\n" \
-  "Open Shortest Path First (IPv6) (OSPFv3)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Protocol Independent Multicast (PIM)\n" \
-  "Babel routing protocol (Babel)\n"
-#define QUAGGA_IP_REDIST_STR_ZEBRA \
-  "(kernel|connected|static|rip|ospf|isis|bgp|pim|babel)"
-#define QUAGGA_IP_REDIST_HELP_STR_ZEBRA \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol (RIP)\n" \
-  "Open Shortest Path First (OSPFv2)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Protocol Independent Multicast (PIM)\n" \
-  "Babel routing protocol (Babel)\n"
-#define QUAGGA_IP6_REDIST_STR_ZEBRA \
-  "(kernel|connected|static|ripng|ospf6|isis|bgp|babel)"
-#define QUAGGA_IP6_REDIST_HELP_STR_ZEBRA \
-  "Kernel routes (not installed via the zebra RIB)\n" \
-  "Connected routes (directly attached subnet or host)\n" \
-  "Statically configured routes\n" \
-  "Routing Information Protocol next-generation (IPv6) (RIPng)\n" \
-  "Open Shortest Path First (IPv6) (OSPFv3)\n" \
-  "Intermediate System to Intermediate System (IS-IS)\n" \
-  "Border Gateway Protocol (BGP)\n" \
-  "Babel routing protocol (Babel)\n"
-
-
-#ifdef QUAGGA_DEFINE_DESC_TABLE
-
-struct zebra_desc_table
-{
-  unsigned int type;
-  const char *string;
-  char chr;
-};
-
-#define DESC_ENTRY(T,S,C) [(T)] = { (T), (S), (C) }
-static const struct zebra_desc_table route_types[] = {
-  DESC_ENTRY	(ZEBRA_ROUTE_SYSTEM,	 "system",	'X' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_KERNEL,	 "kernel",	'K' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_CONNECT,	 "connected",	'C' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_STATIC,	 "static",	'S' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_RIP,	 "rip",	'R' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_RIPNG,	 "ripng",	'R' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_OSPF,	 "ospf",	'O' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_OSPF6,	 "ospf6",	'O' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_ISIS,	 "isis",	'I' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_BGP,	 "bgp",	'B' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_PIM,	 "pim",	'P' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_HSLS,	 "hsls",	'H' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_OLSR,	 "olsr",	'o' ),
-  DESC_ENTRY	(ZEBRA_ROUTE_BABEL,	 "babel",	'A' ),
-};
-#undef DESC_ENTRY
-
-#endif /* QUAGGA_DEFINE_DESC_TABLE */
-
-#endif /* _QUAGGA_ROUTE_TYPES_H */
diff --git a/openflow/usr/include/quagga/routemap.h b/openflow/usr/include/quagga/routemap.h
deleted file mode 100644
index ba64553..0000000
--- a/openflow/usr/include/quagga/routemap.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* Route map function.
- * Copyright (C) 1998 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_ROUTEMAP_H
-#define _ZEBRA_ROUTEMAP_H
-
-/* Route map's type. */
-enum route_map_type
-{
-  RMAP_PERMIT,
-  RMAP_DENY,
-  RMAP_ANY
-};
-
-typedef enum 
-{
-  RMAP_MATCH,
-  RMAP_DENYMATCH,
-  RMAP_NOMATCH,
-  RMAP_ERROR,
-  RMAP_OKAY
-} route_map_result_t;
-
-typedef enum
-{
-  RMAP_RIP,
-  RMAP_RIPNG,
-  RMAP_BABEL,
-  RMAP_OSPF,
-  RMAP_OSPF6,
-  RMAP_BGP,
-  RMAP_ZEBRA
-} route_map_object_t;
-
-typedef enum
-{
-  RMAP_EXIT,
-  RMAP_GOTO,
-  RMAP_NEXT
-} route_map_end_t;
-
-typedef enum
-{
-  RMAP_EVENT_SET_ADDED,
-  RMAP_EVENT_SET_DELETED,
-  RMAP_EVENT_SET_REPLACED,
-  RMAP_EVENT_MATCH_ADDED,
-  RMAP_EVENT_MATCH_DELETED,
-  RMAP_EVENT_MATCH_REPLACED,
-  RMAP_EVENT_INDEX_ADDED,
-  RMAP_EVENT_INDEX_DELETED
-} route_map_event_t;
-
-/* Depth limit in RMAP recursion using RMAP_CALL. */
-#define RMAP_RECURSION_LIMIT      10
-
-/* Route map rule structure for matching and setting. */
-struct route_map_rule_cmd
-{
-  /* Route map rule name (e.g. as-path, metric) */
-  const char *str;
-
-  /* Function for value set or match. */
-  route_map_result_t (*func_apply)(void *, struct prefix *, 
-				   route_map_object_t, void *);
-
-  /* Compile argument and return result as void *. */
-  void *(*func_compile)(const char *);
-
-  /* Free allocated value by func_compile (). */
-  void (*func_free)(void *);
-};
-
-/* Route map apply error. */
-enum
-{
-  /* Route map rule is missing. */
-  RMAP_RULE_MISSING = 1,
-
-  /* Route map rule can't compile */
-  RMAP_COMPILE_ERROR
-};
-
-/* Route map rule list. */
-struct route_map_rule_list
-{
-  struct route_map_rule *head;
-  struct route_map_rule *tail;
-};
-
-/* Route map index structure. */
-struct route_map_index
-{
-  struct route_map *map;
-  char *description;
-
-  /* Preference of this route map rule. */
-  int pref;
-
-  /* Route map type permit or deny. */
-  enum route_map_type type;			
-
-  /* Do we follow old rules, or hop forward? */
-  route_map_end_t exitpolicy;
-
-  /* If we're using "GOTO", to where do we go? */
-  int nextpref;
-
-  /* If we're using "CALL", to which route-map do ew go? */
-  char *nextrm;
-
-  /* Matching rule list. */
-  struct route_map_rule_list match_list;
-  struct route_map_rule_list set_list;
-
-  /* Make linked list. */
-  struct route_map_index *next;
-  struct route_map_index *prev;
-};
-
-/* Route map list structure. */
-struct route_map
-{
-  /* Name of route map. */
-  char *name;
-
-  /* Route map's rule. */
-  struct route_map_index *head;
-  struct route_map_index *tail;
-
-  /* Make linked list. */
-  struct route_map *next;
-  struct route_map *prev;
-};
-
-/* Prototypes. */
-extern void route_map_init (void);
-extern void route_map_init_vty (void);
-extern void route_map_finish (void);
-
-/* Add match statement to route map. */
-extern int route_map_add_match (struct route_map_index *index,
-		                const char *match_name,
-		                const char *match_arg);
-
-/* Delete specified route match rule. */
-extern int route_map_delete_match (struct route_map_index *index,
-			           const char *match_name,
-			           const char *match_arg);
-
-/* Add route-map set statement to the route map. */
-extern int route_map_add_set (struct route_map_index *index, 
-		              const char *set_name,
-		              const char *set_arg);
-
-/* Delete route map set rule. */
-extern int route_map_delete_set (struct route_map_index *index,
-                                 const char *set_name,
-                                 const char *set_arg);
-
-/* Install rule command to the match list. */
-extern void route_map_install_match (struct route_map_rule_cmd *cmd);
-
-/* Install rule command to the set list. */
-extern void route_map_install_set (struct route_map_rule_cmd *cmd);
-
-/* Lookup route map by name. */
-extern struct route_map * route_map_lookup_by_name (const char *name);
-
-/* Apply route map to the object. */
-extern route_map_result_t route_map_apply (struct route_map *map,
-                                           struct prefix *,
-                                           route_map_object_t object_type,
-                                           void *object);
-
-extern void route_map_add_hook (void (*func) (const char *));
-extern void route_map_delete_hook (void (*func) (const char *));
-extern void route_map_event_hook (void (*func) (route_map_event_t, const char *));
-
-#endif /* _ZEBRA_ROUTEMAP_H */
diff --git a/openflow/usr/include/quagga/sigevent.h b/openflow/usr/include/quagga/sigevent.h
deleted file mode 100644
index 248fa2c..0000000
--- a/openflow/usr/include/quagga/sigevent.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* 
- * Quagga Signal handling header.
- *
- * Copyright (C) 2004 Paul Jakma.
- *
- * This file is part of Quagga.
- *
- * Quagga is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * Quagga is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Quagga; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _QUAGGA_SIGNAL_H
-#define _QUAGGA_SIGNAL_H
-
-#include <thread.h>
-
-#define QUAGGA_SIGNAL_TIMER_INTERVAL 2L
-
-struct quagga_signal_t
-{
-  int signal;                     /* signal number    */
-  void (*handler) (void);         /* handler to call  */
-
-  volatile sig_atomic_t caught;   /* private member   */
-};
-
-/* initialise sigevent system
- * takes:
- * - pointer to valid struct thread_master
- * - number of elements in passed in signals array
- * - array of quagga_signal_t's describing signals to handle
- *   and handlers to use for each signal
- */
-extern void signal_init (struct thread_master *m, int sigc, 
-                         struct quagga_signal_t *signals);
-
-/* check whether there are signals to handle, process any found */
-extern int quagga_sigevent_process (void);
-
-#endif /* _QUAGGA_SIGNAL_H */
diff --git a/openflow/usr/include/quagga/smux.h b/openflow/usr/include/quagga/smux.h
deleted file mode 100644
index 72b4eaf..0000000
--- a/openflow/usr/include/quagga/smux.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* SNMP support
- * Copyright (C) 1999 Kunihiro Ishiguro <kunihiro@zebra.org>
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_SNMP_H
-#define _ZEBRA_SNMP_H
-
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-#include <net-snmp/agent/snmp_vars.h>
-
-/* Structures here are mostly compatible with UCD SNMP 4.1.1 */
-#define MATCH_FAILED     (-1)
-#define MATCH_SUCCEEDED  0
-
-/* SYNTAX TruthValue from SNMPv2-TC. */
-#define SNMP_TRUE  1
-#define SNMP_FALSE 2
-
-/* SYNTAX RowStatus from SNMPv2-TC. */
-#define SNMP_VALID  1
-#define SNMP_INVALID 2
-
-#define IN_ADDR_SIZE sizeof(struct in_addr)
-
-#undef REGISTER_MIB
-#define REGISTER_MIB(descr, var, vartype, theoid)		\
-    smux_register_mib(descr, (struct variable *)var, sizeof(struct vartype), \
-    sizeof(var)/sizeof(struct vartype),			\
-    theoid, sizeof(theoid)/sizeof(oid))
-
-struct trap_object
-{
-  int namelen; /* Negative if the object is not indexed */
-  oid name[MAX_OID_LEN];
-};
-
-/* Declare SMUX return value. */
-#define SNMP_LOCAL_VARIABLES \
-  static long snmp_int_val; \
-  static struct in_addr snmp_in_addr_val;
-
-#define SNMP_INTEGER(V) \
-  ( \
-    *var_len = sizeof (snmp_int_val), \
-    snmp_int_val = V, \
-    (u_char *) &snmp_int_val \
-  )
-
-#define SNMP_IPADDRESS(V) \
-  ( \
-    *var_len = sizeof (struct in_addr), \
-    snmp_in_addr_val = V, \
-    (u_char *) &snmp_in_addr_val \
-  )
-
-extern void smux_init (struct thread_master *tm);
-extern void smux_register_mib(const char *, struct variable *, 
-                              size_t, int, oid [], size_t);
-extern int smux_header_generic (struct variable *, oid [], size_t *, 
-                                int, size_t *, WriteMethod **);
-extern int smux_header_table (struct variable *, oid *, size_t *, 
-			      int, size_t *, WriteMethod **);
-
-/* For traps, three OID are provided:
-
- 1. The enterprise OID to use (the last argument will be appended to
-    it to form the SNMP trap OID)
-
- 2. The base OID for objects to be sent in traps.
-
- 3. The index OID for objects to be sent in traps. This index is used
-    to designate a particular instance of a column.
-
- The provided trap object contains the bindings to be sent with the
- trap. The base OID will be prefixed to the provided OID and, if the
- length is positive, the requested OID is assumed to be a columnar
- object and the index OID will be appended.
-
- The two first arguments are the MIB registry used to locate the trap
- objects.
-
- The use of the arguments may differ depending on the implementation
- used.
-*/
-extern int smux_trap (struct variable *, size_t,
-		      const oid *, size_t,
-		      const oid *, size_t,
-		      const oid *, size_t,
-		      const struct trap_object *, size_t,
-		      u_char);
-
-extern int oid_compare (oid *, int, oid *, int);
-extern void oid2in_addr (oid [], int, struct in_addr *);
-extern void *oid_copy (void *, const void *, size_t);
-extern void oid_copy_addr (oid [], struct in_addr *, int);
-
-#endif /* _ZEBRA_SNMP_H */
diff --git a/openflow/usr/include/quagga/sockopt.h b/openflow/usr/include/quagga/sockopt.h
deleted file mode 100644
index aced6d4..0000000
--- a/openflow/usr/include/quagga/sockopt.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Router advertisement
- * Copyright (C) 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_SOCKOPT_H
-#define _ZEBRA_SOCKOPT_H
-
-#include "sockunion.h"
-
-extern int setsockopt_so_recvbuf (int sock, int size);
-extern int setsockopt_so_sendbuf (const int sock, int size);
-extern int getsockopt_so_sendbuf (const int sock);
-
-#ifdef HAVE_IPV6
-extern int setsockopt_ipv6_pktinfo (int, int);
-extern int setsockopt_ipv6_checksum (int, int);
-extern int setsockopt_ipv6_multicast_hops (int, int);
-extern int setsockopt_ipv6_unicast_hops (int, int);
-extern int setsockopt_ipv6_hoplimit (int, int);
-extern int setsockopt_ipv6_multicast_loop (int, int);
-extern int setsockopt_ipv6_tclass (int, int);
-#endif /* HAVE_IPV6 */
-
-/*
- * It is OK to reference in6_pktinfo here without a protecting #if
- * because this macro will only be used #if HAVE_IPV6, and in6_pktinfo
- * is not optional for HAVE_IPV6.
- */
-#define SOPT_SIZE_CMSG_PKTINFO_IPV6() (sizeof (struct in6_pktinfo));
-
-/*
- * Size defines for control messages used to get ifindex.  We define
- * values for each method, and define a macro that can be used by code
- * that is unaware of which method is in use.
- * These values are without any alignment needed (see CMSG_SPACE in RFC3542).
- */
-#if defined (IP_PKTINFO)
-/* Linux in_pktinfo. */
-#define SOPT_SIZE_CMSG_PKTINFO_IPV4()  (CMSG_SPACE(sizeof (struct in_pktinfo)))
-/* XXX This should perhaps be defined even if IP_PKTINFO is not. */
-#define SOPT_SIZE_CMSG_PKTINFO(af) \
-  ((af == AF_INET) ? SOPT_SIZE_CMSG_PKTINFO_IPV4() \
-                   : SOPT_SIZE_CMSG_PKTINFO_IPV6()
-#endif /* IP_PKTINFO */
-
-#if defined (IP_RECVIF)
-/* BSD/Solaris */
-
-#if defined (SUNOS_5)
-#define SOPT_SIZE_CMSG_RECVIF_IPV4()  (sizeof (uint_t))
-#else
-#define SOPT_SIZE_CMSG_RECVIF_IPV4()	(sizeof (struct sockaddr_dl))
-#endif /* SUNOS_5 */
-#endif /* IP_RECVIF */
-
-/* SOPT_SIZE_CMSG_IFINDEX_IPV4 - portable type */
-#if defined (SOPT_SIZE_CMSG_PKTINFO)
-#define SOPT_SIZE_CMSG_IFINDEX_IPV4() SOPT_SIZE_CMSG_PKTINFO_IPV4()
-#elif defined (SOPT_SIZE_CMSG_RECVIF_IPV4)
-#define SOPT_SIZE_CMSG_IFINDEX_IPV4() SOPT_SIZE_CMSG_RECVIF_IPV4()
-#else /* Nothing available */
-#define SOPT_SIZE_CMSG_IFINDEX_IPV4() (sizeof (char *))
-#endif /* SOPT_SIZE_CMSG_IFINDEX_IPV4 */
-
-#define SOPT_SIZE_CMSG_IFINDEX(af) \
-  (((af) == AF_INET) : SOPT_SIZE_CMSG_IFINDEX_IPV4() \
-                    ? SOPT_SIZE_CMSG_PKTINFO_IPV6())
-
-extern int setsockopt_ipv4_multicast_if(int sock,
-			             unsigned int ifindex);
-extern int setsockopt_ipv4_multicast(int sock, int optname,
-                                     unsigned int mcast_addr,
-			             unsigned int ifindex);
-extern int setsockopt_ipv4_tos(int sock, int tos);
-
-/* Ask for, and get, ifindex, by whatever method is supported. */
-extern int setsockopt_ifindex (int, int, int);
-extern int getsockopt_ifindex (int, struct msghdr *);
-
-/* swab the fields in iph between the host order and system order expected 
- * for IP_HDRINCL.
- */
-extern void sockopt_iphdrincl_swab_htosys (struct ip *iph);
-extern void sockopt_iphdrincl_swab_systoh (struct ip *iph);
-
-extern int sockopt_tcp_signature(int sock, union sockunion *su,
-                                 const char *password);
-#endif /*_ZEBRA_SOCKOPT_H */
diff --git a/openflow/usr/include/quagga/sockunion.h b/openflow/usr/include/quagga/sockunion.h
deleted file mode 100644
index b9f3514..0000000
--- a/openflow/usr/include/quagga/sockunion.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Socket union header.
- * Copyright (c) 1997 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_SOCKUNION_H
-#define _ZEBRA_SOCKUNION_H
-
-#if 0
-union sockunion {
-  struct sockinet {
-    u_char si_len;
-    u_char si_family;
-    u_short si_port;
-  } su_si;
-  struct sockaddr_in  su_sin;
-  struct sockaddr_in6 su_sin6;
-};
-#define su_len                su_si.si_len
-#define su_family     su_si.si_family
-#define su_port               su_si.si_port
-#endif /* 0 */
-
-union sockunion 
-{
-  struct sockaddr sa;
-  struct sockaddr_in sin;
-#ifdef HAVE_IPV6
-  struct sockaddr_in6 sin6;
-#endif /* HAVE_IPV6 */
-};
-
-enum connect_result
-{
-  connect_error,
-  connect_success,
-  connect_in_progress
-};
-
-/* Default address family. */
-#ifdef HAVE_IPV6
-#define AF_INET_UNION AF_INET6
-#else
-#define AF_INET_UNION AF_INET
-#endif
-
-/* Sockunion address string length.  Same as INET6_ADDRSTRLEN. */
-#define SU_ADDRSTRLEN 46
-
-/* Macro to set link local index to the IPv6 address.  For KAME IPv6
-   stack. */
-#ifdef KAME
-#define	IN6_LINKLOCAL_IFINDEX(a)  ((a).s6_addr[2] << 8 | (a).s6_addr[3])
-#define SET_IN6_LINKLOCAL_IFINDEX(a, i) \
-  do { \
-    (a).s6_addr[2] = ((i) >> 8) & 0xff; \
-    (a).s6_addr[3] = (i) & 0xff; \
-  } while (0)
-#else
-#define	IN6_LINKLOCAL_IFINDEX(a)
-#define SET_IN6_LINKLOCAL_IFINDEX(a, i)
-#endif /* KAME */
-
-#define sockunion_family(X)  (X)->sa.sa_family
-
-#define sockunion2ip(X)      (X)->sin.sin_addr.s_addr
-
-/* Prototypes. */
-extern int str2sockunion (const char *, union sockunion *);
-extern const char *sockunion2str (union sockunion *, char *, size_t);
-extern int sockunion_cmp (union sockunion *, union sockunion *);
-extern int sockunion_same (union sockunion *, union sockunion *);
-
-extern union sockunion *sockunion_str2su (const char *str);
-extern int sockunion_accept (int sock, union sockunion *);
-extern int sockunion_stream_socket (union sockunion *);
-extern int sockopt_reuseaddr (int);
-extern int sockopt_reuseport (int);
-extern int sockopt_v6only (int family, int sock);
-extern int sockunion_bind (int sock, union sockunion *, 
-                           unsigned short, union sockunion *);
-extern int sockopt_ttl (int family, int sock, int ttl);
-extern int sockopt_minttl (int family, int sock, int minttl);
-extern int sockopt_cork (int sock, int onoff);
-extern int sockunion_socket (union sockunion *su);
-extern const char *inet_sutop (union sockunion *su, char *str);
-extern enum connect_result sockunion_connect (int fd, union sockunion *su, 
-                                              unsigned short port,
-                                              unsigned int);
-extern union sockunion *sockunion_getsockname (int);
-extern union sockunion *sockunion_getpeername (int);
-extern union sockunion *sockunion_dup (union sockunion *);
-extern void sockunion_free (union sockunion *);
-
-#ifndef HAVE_INET_NTOP
-extern const char * inet_ntop (int family, const void *addrptr, 
-                               char *strptr, size_t len);
-#endif /* HAVE_INET_NTOP */
-
-#ifndef HAVE_INET_PTON
-extern int inet_pton (int family, const char *strptr, void *addrptr);
-#endif /* HAVE_INET_PTON */
-
-#ifndef HAVE_INET_ATON
-extern int inet_aton (const char *cp, struct in_addr *inaddr);
-#endif
-
-#endif /* _ZEBRA_SOCKUNION_H */
diff --git a/openflow/usr/include/quagga/str.h b/openflow/usr/include/quagga/str.h
deleted file mode 100644
index 7b83fe1..0000000
--- a/openflow/usr/include/quagga/str.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * $Id: str.h,v 1.4 2005/09/19 09:53:21 hasso Exp $
- */
-
-#ifndef _ZEBRA_STR_H
-#define _ZEBRA_STR_H
-
-#ifndef HAVE_SNPRINTF
-extern int snprintf(char *, size_t, const char *, ...);
-#endif
-
-#ifndef HAVE_VSNPRINTF
-#define vsnprintf(buf, size, format, args) vsprintf(buf, format, args)
-#endif
-
-#ifndef HAVE_STRLCPY
-extern size_t strlcpy(char *, const char *, size_t);
-#endif
-
-#ifndef HAVE_STRLCAT
-extern size_t strlcat(char *, const char *, size_t);
-#endif
-
-#ifndef HAVE_STRNLEN
-extern size_t strnlen(const char *s, size_t maxlen);
-#endif
-
-#ifndef HAVE_STRNDUP
-extern char * strndup (const char *, size_t);
-#endif
-
-#endif /* _ZEBRA_STR_H */
-
diff --git a/openflow/usr/include/quagga/stream.h b/openflow/usr/include/quagga/stream.h
deleted file mode 100644
index 1fc382d..0000000
--- a/openflow/usr/include/quagga/stream.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Packet interface
- * Copyright (C) 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_STREAM_H
-#define _ZEBRA_STREAM_H
-
-#include "prefix.h"
-
-/*
- * A stream is an arbitrary buffer, whose contents generally are assumed to
- * be in network order.
- *
- * A stream has the following attributes associated with it:
- *
- * - size: the allocated, invariant size of the buffer.
- *
- * - getp: the get position marker, denoting the offset in the stream where
- *         the next read (or 'get') will be from. This getp marker is
- *         automatically adjusted when data is read from the stream, the
- *         user may also manipulate this offset as they wish, within limits
- *         (see below)
- *
- * - endp: the end position marker, denoting the offset in the stream where
- *         valid data ends, and if the user attempted to write (or
- *         'put') data where that data would be written (or 'put') to.
- *
- * These attributes are all size_t values.
- *
- * Constraints:
- *
- * 1. getp can never exceed endp
- *
- * - hence if getp is equal to endp, there is no more valid data that can be
- *   gotten from the stream (though, the user may reposition getp to earlier in
- *   the stream, if they wish).
- *
- * 2. endp can never exceed size
- *
- * - hence, if endp is equal to size, then the stream is full, and no more
- *   data can be written to the stream.
- *
- * In other words the following must always be true, and the stream
- * abstraction is allowed internally to assert that the following property
- * holds true for a stream, as and when it wishes:
- *
- *        getp <= endp <= size
- *
- * It is the users responsibility to ensure this property is never violated.
- *
- * A stream therefore can be thought of like this:
- *
- * 	---------------------------------------------------
- * 	|XXXXXXXXXXXXXXXXXXXXXXXX                         |
- * 	---------------------------------------------------
- *               ^               ^                        ^
- *               getp            endp                     size
- *
- * This shows a stream containing data (shown as 'X') up to the endp offset.
- * The stream is empty from endp to size. Without adjusting getp, there are
- * still endp-getp bytes of valid data to be read from the stream.
- *
- * Methods are provided to get and put to/from the stream, as well as 
- * retrieve the values of the 3 markers and manipulate the getp marker.
- *
- * Note:
- * At the moment, newly allocated streams are zero filled. Hence, one can
- * use stream_forward_endp() to effectively create arbitrary zero-fill
- * padding. However, note that stream_reset() does *not* zero-out the
- * stream. This property should **not** be relied upon.
- *
- * Best practice is to use stream_put (<stream *>, NULL, <size>) to zero out
- * any part of a stream which isn't otherwise written to.
- */
-
-/* Stream buffer. */
-struct stream
-{
-  struct stream *next;
-
-  /* Remainder is ***private*** to stream
-   * direct access is frowned upon!
-   * Use the appropriate functions/macros 
-   */
-  size_t getp; 		/* next get position */
-  size_t endp;		/* last valid data position */
-  size_t size;		/* size of data segment */
-  unsigned char *data; /* data pointer */
-};
-
-/* First in first out queue structure. */
-struct stream_fifo
-{
-  size_t count;
-
-  struct stream *head;
-  struct stream *tail;
-};
-
-/* Utility macros. */
-#define STREAM_SIZE(S)  ((S)->size)
-  /* number of bytes which can still be written */
-#define STREAM_WRITEABLE(S) ((S)->size - (S)->endp)
-  /* number of bytes still to be read */
-#define STREAM_READABLE(S) ((S)->endp - (S)->getp)
-
-#define STREAM_CONCAT_REMAIN(S1, S2, size) \
-  ((size) - (S1)->endp - (S2)->endp)
-
-/* deprecated macros - do not use in new code */
-#define STREAM_PNT(S)   stream_pnt((S))
-#define STREAM_DATA(S)  ((S)->data)
-#define STREAM_REMAIN(S) STREAM_WRITEABLE((S))
-
-/* Stream prototypes. 
- * For stream_{put,get}S, the S suffix mean:
- *
- * c: character (unsigned byte)
- * w: word (two bytes)
- * l: long (two words)
- * q: quad (four words)
- */
-extern struct stream *stream_new (size_t);
-extern void stream_free (struct stream *);
-extern struct stream * stream_copy (struct stream *, struct stream *src);
-extern struct stream *stream_dup (struct stream *);
-extern size_t stream_resize (struct stream *, size_t);
-extern size_t stream_get_getp (struct stream *);
-extern size_t stream_get_endp (struct stream *);
-extern size_t stream_get_size (struct stream *);
-extern u_char *stream_get_data (struct stream *);
-
-/**
- * Create a new stream structure; copy offset bytes from s1 to the new
- * stream; copy s2 data to the new stream; copy rest of s1 data to the
- * new stream.
- */
-extern struct stream *stream_dupcat(struct stream *s1, struct stream *s2,
-				    size_t offset);
-
-extern void stream_set_getp (struct stream *, size_t);
-extern void stream_set_endp (struct stream *, size_t);
-extern void stream_forward_getp (struct stream *, size_t);
-extern void stream_forward_endp (struct stream *, size_t);
-
-/* steam_put: NULL source zeroes out size_t bytes of stream */
-extern void stream_put (struct stream *, const void *, size_t);
-extern int stream_putc (struct stream *, u_char);
-extern int stream_putc_at (struct stream *, size_t, u_char);
-extern int stream_putw (struct stream *, u_int16_t);
-extern int stream_putw_at (struct stream *, size_t, u_int16_t);
-extern int stream_putl (struct stream *, u_int32_t);
-extern int stream_putl_at (struct stream *, size_t, u_int32_t);
-extern int stream_putq (struct stream *, uint64_t);
-extern int stream_putq_at (struct stream *, size_t, uint64_t);
-extern int stream_put_ipv4 (struct stream *, u_int32_t);
-extern int stream_put_in_addr (struct stream *, struct in_addr *);
-extern int stream_put_prefix (struct stream *, struct prefix *);
-
-extern void stream_get (void *, struct stream *, size_t);
-extern u_char stream_getc (struct stream *);
-extern u_char stream_getc_from (struct stream *, size_t);
-extern u_int16_t stream_getw (struct stream *);
-extern u_int16_t stream_getw_from (struct stream *, size_t);
-extern u_int32_t stream_getl (struct stream *);
-extern u_int32_t stream_getl_from (struct stream *, size_t);
-extern uint64_t stream_getq (struct stream *);
-extern uint64_t stream_getq_from (struct stream *, size_t);
-extern u_int32_t stream_get_ipv4 (struct stream *);
-
-#undef stream_read
-#undef stream_write
-
-/* Deprecated: assumes blocking I/O.  Will be removed. 
-   Use stream_read_try instead.  */
-extern int stream_read (struct stream *, int, size_t);
-
-/* Read up to size bytes into the stream.
-   Return code:
-     >0: number of bytes read
-     0: end-of-file
-     -1: fatal error
-     -2: transient error, should retry later (i.e. EAGAIN or EINTR)
-   This is suitable for use with non-blocking file descriptors.
- */
-extern ssize_t stream_read_try(struct stream *s, int fd, size_t size);
-
-extern ssize_t stream_recvmsg (struct stream *s, int fd, struct msghdr *,
-                               int flags, size_t size);
-extern ssize_t stream_recvfrom (struct stream *s, int fd, size_t len, 
-                                int flags, struct sockaddr *from, 
-                                socklen_t *fromlen);
-extern size_t stream_write (struct stream *, const void *, size_t);
-
-/* reset the stream. See Note above */
-extern void stream_reset (struct stream *);
-extern int stream_flush (struct stream *, int);
-extern int stream_empty (struct stream *); /* is the stream empty? */
-
-/* deprecated */
-extern u_char *stream_pnt (struct stream *);
-
-/* Stream fifo. */
-extern struct stream_fifo *stream_fifo_new (void);
-extern void stream_fifo_push (struct stream_fifo *fifo, struct stream *s);
-extern struct stream *stream_fifo_pop (struct stream_fifo *fifo);
-extern struct stream *stream_fifo_head (struct stream_fifo *fifo);
-extern void stream_fifo_clean (struct stream_fifo *fifo);
-extern void stream_fifo_free (struct stream_fifo *fifo);
-
-#endif /* _ZEBRA_STREAM_H */
diff --git a/openflow/usr/include/quagga/table.h b/openflow/usr/include/quagga/table.h
deleted file mode 100644
index ab357a0..0000000
--- a/openflow/usr/include/quagga/table.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Routing Table
- * Copyright (C) 1998 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_TABLE_H
-#define _ZEBRA_TABLE_H
-
-/*
- * Forward declarations.
- */
-struct route_node;
-struct route_table;
-
-/*
- * route_table_delegate_t
- *
- * Function vector that can be used by a client to customize the
- * behavior of one or more route tables.
- */
-typedef struct route_table_delegate_t_ route_table_delegate_t;
-
-typedef struct route_node * (*route_table_create_node_func_t) 
-  (route_table_delegate_t *, struct route_table *);
-
-typedef void (*route_table_destroy_node_func_t) 
-  (route_table_delegate_t *, struct route_table *, struct route_node *);
-
-struct route_table_delegate_t_ 
-{
-  route_table_create_node_func_t create_node;
-  route_table_destroy_node_func_t destroy_node;
-};
-
-/* Routing table top structure. */
-struct route_table
-{
-  struct route_node *top;
-
-  /*
-   * Delegate that performs certain functions for this table.
-   */
-  route_table_delegate_t *delegate;
-  
-  unsigned long count;
-  
-  /*
-   * User data.
-   */
-  void *info;
-};
-
-/*
- * Macro that defines all fields in a route node.
- */
-#define ROUTE_NODE_FIELDS			\
-  /* Actual prefix of this radix. */		\
-  struct prefix p;				\
-						\
-  /* Tree link. */				\
-  struct route_table *table;			\
-  struct route_node *parent;			\
-  struct route_node *link[2];			\
-						\
-  /* Lock of this radix */			\
-  unsigned int lock;				\
-						\
-  /* Each node of route. */			\
-  void *info;					\
-						\
-  /* Aggregation. */				\
-  void *aggregate;
-
-
-/* Each routing entry. */
-struct route_node
-{
-  ROUTE_NODE_FIELDS;
-
-#define l_left   link[0]
-#define l_right  link[1]
-};
-
-typedef struct route_table_iter_t_ route_table_iter_t;
-
-typedef enum 
-{
-  RT_ITER_STATE_INIT,
-  RT_ITER_STATE_ITERATING,
-  RT_ITER_STATE_PAUSED,
-  RT_ITER_STATE_DONE
-} route_table_iter_state_t;
-
-/*
- * route_table_iter_t
- * 
- * Structure that holds state for iterating over a route table.
- */
-struct route_table_iter_t_ 
-{
-
-  route_table_iter_state_t state;
-
-  /*
-   * Routing table that we are iterating over. The caller must ensure
-   * that that table outlives the iterator.
-   */
-  struct route_table *table;
-
-  /*
-   * The node that the iterator is currently on.
-   */
-  struct route_node *current;
-
-  /*
-   * The last prefix that the iterator processed before it was paused.
-   */  
-  struct prefix pause_prefix;
-};
-
-/* Prototypes. */
-extern struct route_table *route_table_init (void);
-
-extern struct route_table *
-route_table_init_with_delegate (route_table_delegate_t *);
-
-extern void route_table_finish (struct route_table *);
-extern void route_unlock_node (struct route_node *node);
-extern struct route_node *route_top (struct route_table *);
-extern struct route_node *route_next (struct route_node *);
-extern struct route_node *route_next_until (struct route_node *,
-                                            struct route_node *);
-extern struct route_node *route_node_get (struct route_table *const,
-                                          struct prefix *);
-extern struct route_node *route_node_lookup (const struct route_table *,
-                                             struct prefix *);
-extern struct route_node *route_lock_node (struct route_node *node);
-extern struct route_node *route_node_match (const struct route_table *,
-                                            const struct prefix *);
-extern struct route_node *route_node_match_ipv4 (const struct route_table *,
-						 const struct in_addr *);
-#ifdef HAVE_IPV6
-extern struct route_node *route_node_match_ipv6 (const struct route_table *,
-						 const struct in6_addr *);
-#endif /* HAVE_IPV6 */
-
-extern unsigned long route_table_count (const struct route_table *);
-
-extern struct route_node *
-route_table_get_next (const struct route_table *table, struct prefix *p);
-extern int
-route_table_prefix_iter_cmp (struct prefix *p1, struct prefix *p2);
-
-/*
- * Iterator functions.
- */
-extern void route_table_iter_init (route_table_iter_t *iter,
-				   struct route_table *table);
-extern void route_table_iter_pause (route_table_iter_t *iter);
-extern void route_table_iter_cleanup (route_table_iter_t *iter);
-
-/*
- * Inline functions.
- */
-
-/*
- * route_table_iter_next
- *
- * Get the next node in the tree.
- */
-static inline struct route_node *
-route_table_iter_next (route_table_iter_t * iter)
-{
-  struct route_node *node;
-
-  switch (iter->state)
-    {
-
-    case RT_ITER_STATE_INIT:
-
-      /*
-       * We're just starting the iteration.
-       */
-      node = route_top (iter->table);
-      break;
-
-    case RT_ITER_STATE_ITERATING:
-      node = route_next (iter->current);
-      break;
-
-    case RT_ITER_STATE_PAUSED:
-
-      /*
-       * Start with the node following pause_prefix.
-       */
-      node = route_table_get_next (iter->table, &iter->pause_prefix);
-      break;
-
-    case RT_ITER_STATE_DONE:
-      return NULL;
-
-    default:
-      assert (0);
-    }
-
-  iter->current = node;
-  if (node)
-    iter->state = RT_ITER_STATE_ITERATING;
-  else
-    iter->state = RT_ITER_STATE_DONE;
-
-  return node;
-}
-
-/*
- * route_table_iter_is_done
- *
- * Returns TRUE if the iteration is complete.
- */
-static inline int
-route_table_iter_is_done (route_table_iter_t *iter)
-{
-  return iter->state == RT_ITER_STATE_DONE;
-}
-
-/*
- * route_table_iter_started
- *
- * Returns TRUE if this iterator has started iterating over the tree.
- */
-static inline int
-route_table_iter_started (route_table_iter_t *iter)
-{
-  return iter->state != RT_ITER_STATE_INIT;
-}
-
-#endif /* _ZEBRA_TABLE_H */
diff --git a/openflow/usr/include/quagga/thread.h b/openflow/usr/include/quagga/thread.h
deleted file mode 100644
index 43ffbf6..0000000
--- a/openflow/usr/include/quagga/thread.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/* Thread management routine header.
- * Copyright (C) 1998 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_THREAD_H
-#define _ZEBRA_THREAD_H
-
-#include <zebra.h>
-
-struct rusage_t
-{
-#ifdef HAVE_RUSAGE
-  struct rusage cpu;
-#endif
-  struct timeval real;
-};
-#define RUSAGE_T        struct rusage_t
-
-#define GETRUSAGE(X) thread_getrusage(X)
-
-/* Linked list of thread. */
-struct thread_list
-{
-  struct thread *head;
-  struct thread *tail;
-  int count;
-};
-
-struct pqueue;
-
-/* Master of the theads. */
-struct thread_master
-{
-  struct thread_list read;
-  struct thread_list write;
-  struct pqueue *timer;
-  struct thread_list event;
-  struct thread_list ready;
-  struct thread_list unuse;
-  struct pqueue *background;
-  fd_set readfd;
-  fd_set writefd;
-  fd_set exceptfd;
-  unsigned long alloc;
-};
-
-typedef unsigned char thread_type;
-
-/* Thread itself. */
-struct thread
-{
-  thread_type type;		/* thread type */
-  thread_type add_type;		/* thread type */
-  struct thread *next;		/* next pointer of the thread */   
-  struct thread *prev;		/* previous pointer of the thread */
-  struct thread_master *master;	/* pointer to the struct thread_master. */
-  int (*func) (struct thread *); /* event function */
-  void *arg;			/* event argument */
-  union {
-    int val;			/* second argument of the event. */
-    int fd;			/* file descriptor in case of read/write. */
-    struct timeval sands;	/* rest of time sands value. */
-  } u;
-  int index;			/* used for timers to store position in queue */
-  struct timeval real;
-  struct cpu_thread_history *hist; /* cache pointer to cpu_history */
-  const char *funcname;
-  const char *schedfrom;
-  int schedfrom_line;
-};
-
-struct cpu_thread_history 
-{
-  int (*func)(struct thread *);
-  unsigned int total_calls;
-  struct time_stats
-  {
-    unsigned long total, max;
-  } real;
-#ifdef HAVE_RUSAGE
-  struct time_stats cpu;
-#endif
-  thread_type types;
-  const char *funcname;
-};
-
-/* Clocks supported by Quagga */
-enum quagga_clkid {
-  QUAGGA_CLK_REALTIME = 0,	/* ala gettimeofday() */
-  QUAGGA_CLK_MONOTONIC,		/* monotonic, against an indeterminate base */
-  QUAGGA_CLK_REALTIME_STABILISED, /* like realtime, but non-decrementing */
-};
-
-/* Thread types. */
-#define THREAD_READ           0
-#define THREAD_WRITE          1
-#define THREAD_TIMER          2
-#define THREAD_EVENT          3
-#define THREAD_READY          4
-#define THREAD_BACKGROUND     5
-#define THREAD_UNUSED         6
-#define THREAD_EXECUTE        7
-
-/* Thread yield time.  */
-#define THREAD_YIELD_TIME_SLOT     10 * 1000L /* 10ms */
-
-/* Macros. */
-#define THREAD_ARG(X) ((X)->arg)
-#define THREAD_FD(X)  ((X)->u.fd)
-#define THREAD_VAL(X) ((X)->u.val)
-
-#define THREAD_READ_ON(master,thread,func,arg,sock) \
-  do { \
-    if (! thread) \
-      thread = thread_add_read (master, func, arg, sock); \
-  } while (0)
-
-#define THREAD_WRITE_ON(master,thread,func,arg,sock) \
-  do { \
-    if (! thread) \
-      thread = thread_add_write (master, func, arg, sock); \
-  } while (0)
-
-#define THREAD_TIMER_ON(master,thread,func,arg,time) \
-  do { \
-    if (! thread) \
-      thread = thread_add_timer (master, func, arg, time); \
-  } while (0)
-
-#define THREAD_TIMER_MSEC_ON(master,thread,func,arg,time) \
-  do { \
-    if (! thread) \
-      thread = thread_add_timer_msec (master, func, arg, time); \
-  } while (0)
-
-#define THREAD_OFF(thread) \
-  do { \
-    if (thread) \
-      { \
-        thread_cancel (thread); \
-        thread = NULL; \
-      } \
-  } while (0)
-
-#define THREAD_READ_OFF(thread)  THREAD_OFF(thread)
-#define THREAD_WRITE_OFF(thread)  THREAD_OFF(thread)
-#define THREAD_TIMER_OFF(thread)  THREAD_OFF(thread)
-
-#define debugargdef  const char *funcname, const char *schedfrom, int fromln
-
-#define thread_add_read(m,f,a,v) funcname_thread_add_read(m,f,a,v,#f,__FILE__,__LINE__)
-#define thread_add_write(m,f,a,v) funcname_thread_add_write(m,f,a,v,#f,__FILE__,__LINE__)
-#define thread_add_timer(m,f,a,v) funcname_thread_add_timer(m,f,a,v,#f,__FILE__,__LINE__)
-#define thread_add_timer_msec(m,f,a,v) funcname_thread_add_timer_msec(m,f,a,v,#f,__FILE__,__LINE__)
-#define thread_add_event(m,f,a,v) funcname_thread_add_event(m,f,a,v,#f,__FILE__,__LINE__)
-#define thread_execute(m,f,a,v) funcname_thread_execute(m,f,a,v,#f,__FILE__,__LINE__)
-
-/* The 4th arg to thread_add_background is the # of milliseconds to delay. */
-#define thread_add_background(m,f,a,v) funcname_thread_add_background(m,f,a,v,#f,__FILE__,__LINE__)
-
-/* Prototypes. */
-extern struct thread_master *thread_master_create (void);
-extern void thread_master_free (struct thread_master *);
-
-extern struct thread *funcname_thread_add_read (struct thread_master *, 
-				                int (*)(struct thread *),
-				                void *, int, debugargdef);
-extern struct thread *funcname_thread_add_write (struct thread_master *,
-				                 int (*)(struct thread *),
-				                 void *, int, debugargdef);
-extern struct thread *funcname_thread_add_timer (struct thread_master *,
-				                 int (*)(struct thread *),
-				                 void *, long, debugargdef);
-extern struct thread *funcname_thread_add_timer_msec (struct thread_master *,
-				                      int (*)(struct thread *),
-				                      void *, long, debugargdef);
-extern struct thread *funcname_thread_add_event (struct thread_master *,
-				                 int (*)(struct thread *),
-				                 void *, int, debugargdef);
-extern struct thread *funcname_thread_add_background (struct thread_master *,
-                                               int (*func)(struct thread *),
-				               void *arg,
-				               long milliseconds_to_delay,
-					       debugargdef);
-extern struct thread *funcname_thread_execute (struct thread_master *,
-                                               int (*)(struct thread *),
-                                               void *, int, debugargdef);
-#undef debugargdef
-
-extern void thread_cancel (struct thread *);
-extern unsigned int thread_cancel_event (struct thread_master *, void *);
-extern struct thread *thread_fetch (struct thread_master *, struct thread *);
-extern void thread_call (struct thread *);
-extern unsigned long thread_timer_remain_second (struct thread *);
-extern int thread_should_yield (struct thread *);
-extern unsigned long timeval_elapsed (struct timeval a, struct timeval b);
-
-/* Internal libzebra exports */
-extern void thread_getrusage (RUSAGE_T *);
-extern struct cmd_element show_thread_cpu_cmd;
-extern struct cmd_element clear_thread_cpu_cmd;
-
-/* replacements for the system gettimeofday(), clock_gettime() and
- * time() functions, providing support for non-decrementing clock on
- * all systems, and fully monotonic on /some/ systems.
- */
-extern int quagga_gettime (enum quagga_clkid, struct timeval *);
-extern time_t quagga_time (time_t *);
-
-/* Returns elapsed real (wall clock) time. */
-extern unsigned long thread_consumed_time(RUSAGE_T *after, RUSAGE_T *before,
-					  unsigned long *cpu_time_elapsed);
-
-/* Global variable containing a recent result from gettimeofday.  This can
-   be used instead of calling gettimeofday if a recent value is sufficient.
-   This is guaranteed to be refreshed before a thread is called. */
-extern struct timeval recent_time;
-/* Similar to recent_time, but a monotonically increasing time value */
-extern struct timeval recent_relative_time (void);
-
-/* only for use in logging functions! */
-extern struct thread *thread_current;
-
-#endif /* _ZEBRA_THREAD_H */
diff --git a/openflow/usr/include/quagga/vector.h b/openflow/usr/include/quagga/vector.h
deleted file mode 100644
index 6b27fd9..0000000
--- a/openflow/usr/include/quagga/vector.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Generic vector interface header.
- * Copyright (C) 1997, 98 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_VECTOR_H
-#define _ZEBRA_VECTOR_H
-
-/* struct for vector */
-struct _vector 
-{
-  unsigned int active;		/* number of active slots */
-  unsigned int alloced;		/* number of allocated slot */
-  void **index;			/* index to data */
-};
-typedef struct _vector *vector;
-
-#define VECTOR_MIN_SIZE 1
-
-/* (Sometimes) usefull macros.  This macro convert index expression to
- array expression. */
-/* Reference slot at given index, caller must ensure slot is active */
-#define vector_slot(V,I)  ((V)->index[(I)])
-/* Number of active slots. 
- * Note that this differs from vector_count() as it the count returned
- * will include any empty slots
- */
-#define vector_active(V) ((V)->active)
-
-/* Prototypes. */
-extern vector vector_init (unsigned int size);
-extern void vector_ensure (vector v, unsigned int num);
-extern int vector_empty_slot (vector v);
-extern int vector_set (vector v, void *val);
-extern int vector_set_index (vector v, unsigned int i, void *val);
-extern void vector_unset (vector v, unsigned int i);
-extern unsigned int vector_count (vector v);
-extern void vector_only_wrapper_free (vector v);
-extern void vector_only_index_free (void *index);
-extern void vector_free (vector v);
-extern vector vector_copy (vector v);
-
-extern void *vector_lookup (vector, unsigned int);
-extern void *vector_lookup_ensure (vector, unsigned int);
-
-#endif /* _ZEBRA_VECTOR_H */
diff --git a/openflow/usr/include/quagga/version.h b/openflow/usr/include/quagga/version.h
deleted file mode 100644
index 65eacaf..0000000
--- a/openflow/usr/include/quagga/version.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* lib/version.h.  Generated from version.h.in by configure.
- *
- * Quagga version
- * Copyright (C) 1997, 1999 Kunihiro Ishiguro
- * 
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _ZEBRA_VERSION_H
-#define _ZEBRA_VERSION_H
-
-#ifdef GIT_VERSION
-#include "gitversion.h"
-#endif
-
-#ifndef GIT_SUFFIX
-#define GIT_SUFFIX ""
-#endif
-#ifndef GIT_INFO
-#define GIT_INFO ""
-#endif
-
-#define QUAGGA_PROGNAME   "Quagga"
-
-#define QUAGGA_VERSION     "0.99.24.1" GIT_SUFFIX
-
-#define ZEBRA_BUG_ADDRESS "https://bugzilla.quagga.net"
-
-#define QUAGGA_URL "http://www.quagga.net"
-
-#define QUAGGA_COPYRIGHT "Copyright 1996-2005 Kunihiro Ishiguro, et al."
-
-#define QUAGGA_CONFIG_ARGS "--build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libexecdir=${prefix}/lib/quagga --disable-maintainer-mode --disable-dependency-tracking --enable-exampledir=/usr/share/doc/quagga/examples/ --localstatedir=/var/run/quagga --sbindir=/usr/lib/quagga --sysconfdir=/etc/quagga --enable-vtysh --enable-isisd --enable-watchquagga --enable-ospf-te --enable-opaque-lsa --enable-ipv6 --enable-ospfclient=yes --enable-ospfapi=yes --enable-multipath=64 --enable-user=quagga --enable-group=quagga --enable-vty-group=quaggavty --enable-configfile-mask=0640 --enable-logfile-mask=0640 --enable-rtadv --enable-gcc-rdynamic --enable-pimd --with-libpam CFLAGS=-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security CPPFLAGS=-Wdate-time -D_FORTIFY_SOURCE=2 CXXFLAGS=-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security FCFLAGS=-g -O2 -fPIE -fstack-protector-strong FFLAGS=-g -O2 -fPIE -fstack-protector-strong GCJFLAGS=-g -O2 -fPIE -fstack-protector-strong LDFLAGS=-Wl,-Bsymbolic-functions -fPIE -pie -Wl,-z,relro -Wl,-z,now OBJCFLAGS=-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security OBJCXXFLAGS=-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security"
-
-pid_t pid_output (const char *);
-
-#ifndef HAVE_DAEMON
-int daemon(int, int);
-#endif
-
-#endif /* _ZEBRA_VERSION_H */
diff --git a/openflow/usr/include/quagga/vty.h b/openflow/usr/include/quagga/vty.h
deleted file mode 100644
index 86eef17..0000000
--- a/openflow/usr/include/quagga/vty.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/* Virtual terminal [aka TeletYpe] interface routine
-   Copyright (C) 1997 Kunihiro Ishiguro
-
-This file is part of GNU Zebra.
-
-GNU Zebra is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-GNU Zebra is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Zebra; see the file COPYING.  If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
-
-#ifndef _ZEBRA_VTY_H
-#define _ZEBRA_VTY_H
-
-#include "thread.h"
-#include "log.h"
-#include "sockunion.h"
-
-#define VTY_MAXHIST 20
-
-/* VTY struct. */
-struct vty 
-{
-  /* File descripter of this vty. */
-  int fd;
-
-  /* Is this vty connect to file or not */
-  enum {VTY_TERM, VTY_FILE, VTY_SHELL, VTY_SHELL_SERV} type;
-
-  /* Node status of this vty */
-  int node;
-
-  /* Failure count */
-  int fail;
-
-  /* Output buffer. */
-  struct buffer *obuf;
-
-  /* Command input buffer */
-  char *buf;
-
-  /* Command cursor point */
-  int cp;
-
-  /* Command length */
-  int length;
-
-  /* Command max length. */
-  int max;
-
-  /* Histry of command */
-  char *hist[VTY_MAXHIST];
-
-  /* History lookup current point */
-  int hp;
-
-  /* History insert end point */
-  int hindex;
-
-  /* For current referencing point of interface, route-map,
-     access-list etc... */
-  void *index;
-
-  /* For multiple level index treatment such as key chain and key. */
-  void *index_sub;
-
-  /* For escape character. */
-  unsigned char escape;
-
-  /* Current vty status. */
-  enum {VTY_NORMAL, VTY_CLOSE, VTY_MORE, VTY_MORELINE} status;
-
-  /* IAC handling: was the last character received the
-     IAC (interpret-as-command) escape character (and therefore the next
-     character will be the command code)?  Refer to Telnet RFC 854. */
-  unsigned char iac;
-
-  /* IAC SB (option subnegotiation) handling */
-  unsigned char iac_sb_in_progress;
-  /* At the moment, we care only about the NAWS (window size) negotiation,
-     and that requires just a 5-character buffer (RFC 1073):
-       <NAWS char> <16-bit width> <16-bit height> */
-#define TELNET_NAWS_SB_LEN 5
-  unsigned char sb_buf[TELNET_NAWS_SB_LEN];
-  /* How many subnegotiation characters have we received?  We just drop
-     those that do not fit in the buffer. */
-  size_t sb_len;
-
-  /* Window width/height. */
-  int width;
-  int height;
-
-  /* Configure lines. */
-  int lines;
-
-  /* Terminal monitor. */
-  int monitor;
-
-  /* In configure mode. */
-  int config;
-
-  /* Read and write thread. */
-  struct thread *t_read;
-  struct thread *t_write;
-
-  /* Timeout seconds and thread. */
-  unsigned long v_timeout;
-  struct thread *t_timeout;
-
-  /* What address is this vty comming from. */
-  char address[SU_ADDRSTRLEN];
-};
-
-/* Integrated configuration file. */
-#define INTEGRATE_DEFAULT_CONFIG "Quagga.conf"
-
-/* Small macro to determine newline is newline only or linefeed needed. */
-#define VTY_NEWLINE  ((vty->type == VTY_TERM) ? "\r\n" : "\n")
-
-/* Default time out value */
-#define VTY_TIMEOUT_DEFAULT 600
-
-/* Vty read buffer size. */
-#define VTY_READ_BUFSIZ 512
-
-/* Directory separator. */
-#ifndef DIRECTORY_SEP
-#define DIRECTORY_SEP '/'
-#endif /* DIRECTORY_SEP */
-
-#ifndef IS_DIRECTORY_SEP
-#define IS_DIRECTORY_SEP(c) ((c) == DIRECTORY_SEP)
-#endif
-
-/* GCC have printf type attribute check.  */
-#ifdef __GNUC__
-#define PRINTF_ATTRIBUTE(a,b) __attribute__ ((__format__ (__printf__, a, b)))
-#else
-#define PRINTF_ATTRIBUTE(a,b)
-#endif /* __GNUC__ */
-
-/* Utility macros to convert VTY argument to unsigned long */
-#define VTY_GET_ULONG(NAME,V,STR) \
-do { \
-  char *endptr = NULL; \
-  errno = 0; \
-  (V) = strtoul ((STR), &endptr, 10); \
-  if (*(STR) == '-' || *endptr != '\0' || errno) \
-    { \
-      vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE); \
-      return CMD_WARNING; \
-    } \
-} while (0)
-
-/*
- * The logic below ((TMPL) <= ((MIN) && (TMPL) != (MIN)) is
- * done to circumvent the compiler complaining about
- * comparing unsigned numbers against zero, if MIN is zero.
- * NB: The compiler isn't smart enough to supress the warning
- * if you write (MIN) != 0 && tmpl < (MIN).
- */
-#define VTY_GET_INTEGER_RANGE_HEART(NAME,TMPL,STR,MIN,MAX)      \
-do {                                                            \
-  VTY_GET_ULONG(NAME, (TMPL), STR);                             \
-  if ( ((TMPL) <= (MIN) && (TMPL) != (MIN)) || (TMPL) > (MAX) ) \
-    {                                                           \
-      vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE);\
-      return CMD_WARNING;                                       \
-    }                                                           \
-} while (0)
-
-#define VTY_GET_INTEGER_RANGE(NAME,V,STR,MIN,MAX)               \
-do {                                                            \
-  unsigned long tmpl;                                           \
-  VTY_GET_INTEGER_RANGE_HEART(NAME,tmpl,STR,MIN,MAX);           \
-  (V) = tmpl;                                                   \
-} while (0)
-
-#define VTY_CHECK_INTEGER_RANGE(NAME,STR,MIN,MAX)               \
-do {                                                            \
-  unsigned long tmpl;                                           \
-  VTY_GET_INTEGER_RANGE_HEART(NAME,tmpl,STR,MIN,MAX);           \
-} while (0)
-
-#define VTY_GET_INTEGER(NAME,V,STR)                             \
-    VTY_GET_INTEGER_RANGE(NAME,V,STR,0U,UINT32_MAX)
-
-#define VTY_GET_IPV4_ADDRESS(NAME,V,STR)                                      \
-do {                                                                             \
-  int retv;                                                                   \
-  retv = inet_aton ((STR), &(V));                                             \
-  if (!retv)                                                                  \
-    {                                                                         \
-      vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE);              \
-      return CMD_WARNING;                                                     \
-    }                                                                         \
-} while (0)
-
-#define VTY_GET_IPV4_PREFIX(NAME,V,STR)                                       \
-do {                                                                             \
-  int retv;                                                                   \
-  retv = str2prefix_ipv4 ((STR), &(V));                                       \
-  if (retv <= 0)                                                              \
-    {                                                                         \
-      vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE);              \
-      return CMD_WARNING;                                                     \
-    }                                                                         \
-} while (0)
-
-#define VTY_WARN_EXPERIMENTAL()                                               \
-do {                                                                          \
-  vty_out (vty, "%% WARNING: this command is experimental. Both its name and" \
-                " parameters may%s%% change in a future version of Quagga,"   \
-                " possibly breaking your configuration!%s",                   \
-                VTY_NEWLINE, VTY_NEWLINE);                                    \
-} while (0)
-
-/* Exported variables */
-extern char integrate_default[];
-
-/* Prototypes. */
-extern void vty_init (struct thread_master *);
-extern void vty_init_vtysh (void);
-extern void vty_terminate (void);
-extern void vty_reset (void);
-extern struct vty *vty_new (void);
-extern int vty_out (struct vty *, const char *, ...) PRINTF_ATTRIBUTE(2, 3);
-extern void vty_read_config (char *, char *);
-extern void vty_time_print (struct vty *, int);
-extern void vty_serv_sock (const char *, unsigned short, const char *);
-extern void vty_close (struct vty *);
-extern char *vty_get_cwd (void);
-extern void vty_log (const char *level, const char *proto, 
-                     const char *fmt, struct timestamp_control *, va_list);
-extern int vty_config_lock (struct vty *);
-extern int vty_config_unlock (struct vty *);
-extern int vty_shell (struct vty *);
-extern int vty_shell_serv (struct vty *);
-extern void vty_hello (struct vty *);
-
-/* Send a fixed-size message to all vty terminal monitors; this should be
-   an async-signal-safe function. */
-extern void vty_log_fixed (char *buf, size_t len);
-
-#endif /* _ZEBRA_VTY_H */
diff --git a/openflow/usr/include/quagga/workqueue.h b/openflow/usr/include/quagga/workqueue.h
deleted file mode 100644
index f59499a..0000000
--- a/openflow/usr/include/quagga/workqueue.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* 
- * Quagga Work Queues.
- *
- * Copyright (C) 2005 Sun Microsystems, Inc.
- *
- * This file is part of Quagga.
- *
- * Quagga is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * Quagga is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Quagga; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _QUAGGA_WORK_QUEUE_H
-#define _QUAGGA_WORK_QUEUE_H
-
-/* Hold time for the initial schedule of a queue run, in  millisec */
-#define WORK_QUEUE_DEFAULT_HOLD  50 
-
-/* action value, for use by item processor and item error handlers */
-typedef enum
-{
-  WQ_SUCCESS = 0,
-  WQ_ERROR,             /* Error, run error handler if provided */
-  WQ_RETRY_NOW,         /* retry immediately */
-  WQ_RETRY_LATER,       /* retry later, cease processing work queue */
-  WQ_REQUEUE,		/* requeue item, continue processing work queue */
-  WQ_QUEUE_BLOCKED,	/* Queue cant be processed at this time.
-                         * Similar to WQ_RETRY_LATER, but doesn't penalise
-                         * the particular item.. */
-} wq_item_status;
-
-/* A single work queue item, unsurprisingly */
-struct work_queue_item
-{
-  void *data;                           /* opaque data */
-  unsigned short ran;			/* # of times item has been run */
-};
-
-#define WQ_UNPLUGGED	(1 << 0) /* available for draining */
-
-struct work_queue
-{
-  /* Everything but the specification struct is private
-   * the following may be read
-   */
-  struct thread_master *master;       /* thread master */
-  struct thread *thread;              /* thread, if one is active */
-  char *name;                         /* work queue name */
-  
-  /* Specification for this work queue.
-   * Public, must be set before use by caller. May be modified at will.
-   */
-  struct {
-    /* optional opaque user data, global to the queue. */
-    void *data;
-    
-    /* work function to process items with:
-     * First argument is the workqueue queue.
-     * Second argument is the item data
-     */
-    wq_item_status (*workfunc) (struct work_queue *, void *);
-
-    /* error handling function, optional */
-    void (*errorfunc) (struct work_queue *, struct work_queue_item *);
-    
-    /* callback to delete user specific item data */
-    void (*del_item_data) (struct work_queue *, void *);
-    
-    /* completion callback, called when queue is emptied, optional */
-    void (*completion_func) (struct work_queue *);
-    
-    /* max number of retries to make for item that errors */
-    unsigned int max_retries;	
-
-    unsigned int hold;	/* hold time for first run, in ms */
-  } spec;
-  
-  /* remaining fields should be opaque to users */
-  struct list *items;                 /* queue item list */
-  unsigned long runs;                 /* runs count */
-  
-  struct {
-    unsigned int best;
-    unsigned int granularity;
-    unsigned long total;
-  } cycles;	/* cycle counts */
-  
-  /* private state */
-  u_int16_t flags;		/* user set flag */
-};
-
-/* User API */
-
-/* create a new work queue, of given name. 
- * user must fill in the spec of the returned work queue before adding
- * anything to it
- */
-extern struct work_queue *work_queue_new (struct thread_master *,
-                                          const char *);
-/* destroy work queue */
-extern void work_queue_free (struct work_queue *);
-
-/* Add the supplied data as an item onto the workqueue */
-extern void work_queue_add (struct work_queue *, void *);
-
-/* plug the queue, ie prevent it from being drained / processed */
-extern void work_queue_plug (struct work_queue *wq);
-/* unplug the queue, allow it to be drained again */
-extern void work_queue_unplug (struct work_queue *wq);
-
-/* Helpers, exported for thread.c and command.c */
-extern int work_queue_run (struct thread *);
-extern struct cmd_element show_work_queues_cmd;
-#endif /* _QUAGGA_WORK_QUEUE_H */
diff --git a/openflow/usr/include/quagga/zassert.h b/openflow/usr/include/quagga/zassert.h
deleted file mode 100644
index bf0a851..0000000
--- a/openflow/usr/include/quagga/zassert.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $Id: zassert.h,v 1.2 2004/12/03 18:01:04 ajs Exp $
- *
- * This file is part of Quagga.
- *
- * Quagga is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * Quagga is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Quagga; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef _QUAGGA_ASSERT_H
-#define _QUAGGA_ASSERT_H
-
-extern void _zlog_assert_failed (const char *assertion, const char *file,
-				 unsigned int line, const char *function)
-				 __attribute__ ((noreturn));
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#define __ASSERT_FUNCTION    __func__
-#elif defined(__GNUC__)
-#define __ASSERT_FUNCTION    __FUNCTION__
-#else
-#define __ASSERT_FUNCTION    NULL
-#endif
-
-#define zassert(EX) ((void)((EX) ?  0 :	\
-			    (_zlog_assert_failed(#EX, __FILE__, __LINE__, \
-						 __ASSERT_FUNCTION), 0)))
-
-#undef assert
-#define assert(EX) zassert(EX)
-
-#endif /* _QUAGGA_ASSERT_H */
diff --git a/openflow/usr/include/quagga/zclient.h b/openflow/usr/include/quagga/zclient.h
deleted file mode 100644
index d0c5450..0000000
--- a/openflow/usr/include/quagga/zclient.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Zebra's client header.
- * Copyright (C) 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _ZEBRA_ZCLIENT_H
-#define _ZEBRA_ZCLIENT_H
-
-/* For struct zapi_ipv{4,6}. */
-#include "prefix.h"
-
-/* For struct interface and struct connected. */
-#include "if.h"
-
-/* For input/output buffer to zebra. */
-#define ZEBRA_MAX_PACKET_SIZ          4096
-
-/* Zebra header size. */
-#define ZEBRA_HEADER_SIZE             6
-
-/* Structure for the zebra client. */
-struct zclient
-{
-  /* Socket to zebra daemon. */
-  int sock;
-
-  /* Flag of communication to zebra is enabled or not.  Default is on.
-     This flag is disabled by `no router zebra' statement. */
-  int enable;
-
-  /* Connection failure count. */
-  int fail;
-
-  /* Input buffer for zebra message. */
-  struct stream *ibuf;
-
-  /* Output buffer for zebra message. */
-  struct stream *obuf;
-
-  /* Buffer of data waiting to be written to zebra. */
-  struct buffer *wb;
-
-  /* Read and connect thread. */
-  struct thread *t_read;
-  struct thread *t_connect;
-
-  /* Thread to write buffered data to zebra. */
-  struct thread *t_write;
-
-  /* Redistribute information. */
-  u_char redist_default;
-  u_char redist[ZEBRA_ROUTE_MAX];
-
-  /* Redistribute defauilt. */
-  u_char default_information;
-
-  /* Pointer to the callback functions. */
-  int (*router_id_update) (int, struct zclient *, uint16_t);
-  int (*interface_add) (int, struct zclient *, uint16_t);
-  int (*interface_delete) (int, struct zclient *, uint16_t);
-  int (*interface_up) (int, struct zclient *, uint16_t);
-  int (*interface_down) (int, struct zclient *, uint16_t);
-  int (*interface_address_add) (int, struct zclient *, uint16_t);
-  int (*interface_address_delete) (int, struct zclient *, uint16_t);
-  int (*ipv4_route_add) (int, struct zclient *, uint16_t);
-  int (*ipv4_route_delete) (int, struct zclient *, uint16_t);
-  int (*ipv6_route_add) (int, struct zclient *, uint16_t);
-  int (*ipv6_route_delete) (int, struct zclient *, uint16_t);
-};
-
-/* Zebra API message flag. */
-#define ZAPI_MESSAGE_NEXTHOP  0x01
-#define ZAPI_MESSAGE_IFINDEX  0x02
-#define ZAPI_MESSAGE_DISTANCE 0x04
-#define ZAPI_MESSAGE_METRIC   0x08
-
-/* Zserv protocol message header */
-struct zserv_header
-{
-  uint16_t length;
-  uint8_t marker;	/* corresponds to command field in old zserv
-                         * always set to 255 in new zserv.
-                         */
-  uint8_t version;
-#define ZSERV_VERSION	2
-  uint16_t command;
-};
-
-/* Zebra IPv4 route message API. */
-struct zapi_ipv4
-{
-  u_char type;
-
-  u_char flags;
-
-  u_char message;
-
-  safi_t safi;
-
-  u_char nexthop_num;
-  struct in_addr **nexthop;
-
-  u_char ifindex_num;
-  unsigned int *ifindex;
-
-  u_char distance;
-
-  u_int32_t metric;
-};
-
-/* Prototypes of zebra client service functions. */
-extern struct zclient *zclient_new (void);
-extern void zclient_init (struct zclient *, int);
-extern int zclient_start (struct zclient *);
-extern void zclient_stop (struct zclient *);
-extern void zclient_reset (struct zclient *);
-extern void zclient_free (struct zclient *);
-
-extern int  zclient_socket_connect (struct zclient *);
-extern void zclient_serv_path_set  (char *path);
-extern const char *const zclient_serv_path_get (void);
-
-/* Send redistribute command to zebra daemon. Do not update zclient state. */
-extern int zebra_redistribute_send (int command, struct zclient *, int type);
-
-/* If state has changed, update state and call zebra_redistribute_send. */
-extern void zclient_redistribute (int command, struct zclient *, int type);
-
-/* If state has changed, update state and send the command to zebra. */
-extern void zclient_redistribute_default (int command, struct zclient *);
-
-/* Send the message in zclient->obuf to the zebra daemon (or enqueue it).
-   Returns 0 for success or -1 on an I/O error. */
-extern int zclient_send_message(struct zclient *);
-
-/* create header for command, length to be filled in by user later */
-extern void zclient_create_header (struct stream *, uint16_t);
-
-extern struct interface *zebra_interface_add_read (struct stream *);
-extern struct interface *zebra_interface_state_read (struct stream *s);
-extern struct connected *zebra_interface_address_read (int, struct stream *);
-extern void zebra_interface_if_set_value (struct stream *, struct interface *);
-extern void zebra_router_id_update_read (struct stream *s, struct prefix *rid);
-extern int zapi_ipv4_route (u_char, struct zclient *, struct prefix_ipv4 *, 
-                            struct zapi_ipv4 *);
-
-#ifdef HAVE_IPV6
-/* IPv6 prefix add and delete function prototype. */
-
-struct zapi_ipv6
-{
-  u_char type;
-
-  u_char flags;
-
-  u_char message;
-
-  safi_t safi;
-
-  u_char nexthop_num;
-  struct in6_addr **nexthop;
-
-  u_char ifindex_num;
-  unsigned int *ifindex;
-
-  u_char distance;
-
-  u_int32_t metric;
-};
-
-extern int zapi_ipv6_route (u_char cmd, struct zclient *zclient, 
-                     struct prefix_ipv6 *p, struct zapi_ipv6 *api);
-#endif /* HAVE_IPV6 */
-
-#endif /* _ZEBRA_ZCLIENT_H */
diff --git a/openflow/usr/include/quagga/zebra.h b/openflow/usr/include/quagga/zebra.h
deleted file mode 100644
index a5ed20e..0000000
--- a/openflow/usr/include/quagga/zebra.h
+++ /dev/null
@@ -1,564 +0,0 @@
-/* Zebra common header.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Kunihiro Ishiguro
-
-This file is part of GNU Zebra.
-
-GNU Zebra is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-GNU Zebra is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Zebra; see the file COPYING.  If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
-
-#ifndef _ZEBRA_H
-#define _ZEBRA_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifdef SUNOS_5
-#define _XPG4_2
-#define __EXTENSIONS__
-typedef unsigned int    u_int32_t;
-typedef unsigned short  u_int16_t;
-typedef unsigned char   u_int8_t;
-#endif /* SUNOS_5 */
-
-#ifndef HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif /* HAVE_SOCKLEN_T */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <string.h>
-#include <pwd.h>
-#include <grp.h>
-#ifdef HAVE_STROPTS_H
-#include <stropts.h>
-#endif /* HAVE_STROPTS_H */
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif /* HAVE_SYS_SELECT_H */
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#ifdef HAVE_SYS_SYSCTL_H
-#ifdef GNU_LINUX
-#include <linux/types.h>
-#endif
-#include <sys/sysctl.h>
-#endif /* HAVE_SYS_SYSCTL_H */
-#include <sys/ioctl.h>
-#ifdef HAVE_SYS_CONF_H
-#include <sys/conf.h>
-#endif /* HAVE_SYS_CONF_H */
-#ifdef HAVE_SYS_KSYM_H
-#include <sys/ksym.h>
-#endif /* HAVE_SYS_KSYM_H */
-#include <syslog.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif /* TIME_WITH_SYS_TIME */
-#include <sys/uio.h>
-#include <sys/utsname.h>
-#ifdef HAVE_RUSAGE
-#include <sys/resource.h>
-#endif /* HAVE_RUSAGE */
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif /* HAVE_LIMITS_H */
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif /* HAVE_INTTYPES_H */
-
-/* machine dependent includes */
-#ifdef SUNOS_5
-#include <strings.h>
-#endif /* SUNOS_5 */
-
-/* machine dependent includes */
-#ifdef HAVE_LINUX_VERSION_H
-#include <linux/version.h>
-#endif /* HAVE_LINUX_VERSION_H */
-
-#ifdef HAVE_ASM_TYPES_H
-#include <asm/types.h>
-#endif /* HAVE_ASM_TYPES_H */
-
-/* misc include group */
-#include <stdarg.h>
-#if !(defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
-/* Not C99; do we need to define va_copy? */
-#ifndef va_copy
-#ifdef __va_copy
-#define va_copy(DST,SRC) __va_copy(DST,SRC)
-#else
-/* Now we are desperate; this should work on many typical platforms. 
-   But this is slightly dangerous, because the standard does not require
-   va_copy to be a macro. */
-#define va_copy(DST,SRC) memcpy(&(DST), &(SRC), sizeof(va_list))
-#warning "Not C99 and no va_copy macro available, falling back to memcpy"
-#endif /* __va_copy */
-#endif /* !va_copy */
-#endif /* !C99 */
-
-
-#ifdef HAVE_LCAPS
-#include <sys/capability.h>
-#include <sys/prctl.h>
-#endif /* HAVE_LCAPS */
-
-#ifdef HAVE_SOLARIS_CAPABILITIES
-#include <priv.h>
-#endif /* HAVE_SOLARIS_CAPABILITIES */
-
-/* network include group */
-
-#include <sys/socket.h>
-
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif /* HAVE_SYS_SOCKIO_H */
-
-#ifdef __APPLE__
-#define __APPLE_USE_RFC_3542
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif /* HAVE_NETINET_IN_H */
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-
-#ifdef HAVE_NET_NETOPT_H
-#include <net/netopt.h>
-#endif /* HAVE_NET_NETOPT_H */
-
-#include <net/if.h>
-
-#ifdef HAVE_NET_IF_DL_H
-#include <net/if_dl.h>
-#endif /* HAVE_NET_IF_DL_H */
-
-#ifdef HAVE_NET_IF_VAR_H
-#include <net/if_var.h>
-#endif /* HAVE_NET_IF_VAR_H */
-
-#ifdef HAVE_NET_ROUTE_H
-#include <net/route.h>
-#endif /* HAVE_NET_ROUTE_H */
-
-#ifdef HAVE_NETLINK
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <linux/filter.h>
-#else
-#define RT_TABLE_MAIN		0
-#endif /* HAVE_NETLINK */
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif /* HAVE_NETDB_H */
-
-#include <arpa/inet.h>
-
-#ifdef HAVE_INET_ND_H
-#include <inet/nd.h>
-#endif /* HAVE_INET_ND_H */
-
-#ifdef HAVE_NETINET_IN_VAR_H
-#include <netinet/in_var.h>
-#endif /* HAVE_NETINET_IN_VAR_H */
-
-#ifdef HAVE_NETINET6_IN6_VAR_H
-#include <netinet6/in6_var.h>
-#endif /* HAVE_NETINET6_IN6_VAR_H */
-
-#ifdef HAVE_NETINET_IN6_VAR_H
-#include <netinet/in6_var.h>
-#endif /* HAVE_NETINET_IN6_VAR_H */
-
-#ifdef HAVE_NETINET6_IN_H
-#include <netinet6/in.h>
-#endif /* HAVE_NETINET6_IN_H */
-
-
-#ifdef HAVE_NETINET6_IP6_H
-#include <netinet6/ip6.h>
-#endif /* HAVE_NETINET6_IP6_H */
-
-#ifdef HAVE_NETINET_ICMP6_H
-#include <netinet/icmp6.h>
-#endif /* HAVE_NETINET_ICMP6_H */
-
-#ifdef HAVE_NETINET6_ND6_H
-#include <netinet6/nd6.h>
-#endif /* HAVE_NETINET6_ND6_H */
-
-/* Some systems do not define UINT32_MAX, etc.. from inttypes.h
- * e.g. this makes life easier for FBSD 4.11 users.
- */
-#ifndef INT8_MAX
-#define INT8_MAX	(127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX	(32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX	(2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX	(255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX	(65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX	(4294967295U)
-#endif
-
-#ifdef HAVE_GLIBC_BACKTRACE
-#include <execinfo.h>
-#endif /* HAVE_GLIBC_BACKTRACE */
-
-/* Local includes: */
-#if !(defined(__GNUC__) || defined(VTYSH_EXTRACT_PL)) 
-#define __attribute__(x)
-#endif  /* !__GNUC__ || VTYSH_EXTRACT_PL */
-
-#include "zassert.h"
-#include "str.h"
-
-
-#ifdef HAVE_BROKEN_CMSG_FIRSTHDR
-/* This bug is present in Solaris 8 and pre-patch Solaris 9 <sys/socket.h>;
-   please refer to http://bugzilla.quagga.net/show_bug.cgi?id=142 */
-
-/* Check that msg_controllen is large enough. */
-#define ZCMSG_FIRSTHDR(mhdr) \
-  (((size_t)((mhdr)->msg_controllen) >= sizeof(struct cmsghdr)) ? \
-   CMSG_FIRSTHDR(mhdr) : (struct cmsghdr *)NULL)
-
-#warning "CMSG_FIRSTHDR is broken on this platform, using a workaround"
-
-#else /* HAVE_BROKEN_CMSG_FIRSTHDR */
-#define ZCMSG_FIRSTHDR(M) CMSG_FIRSTHDR(M)
-#endif /* HAVE_BROKEN_CMSG_FIRSTHDR */
-
-
-
-/* 
- * RFC 3542 defines several macros for using struct cmsghdr.
- * Here, we define those that are not present
- */
-
-/*
- * Internal defines, for use only in this file.
- * These are likely wrong on other than ILP32 machines, so warn.
- */
-#ifndef _CMSG_DATA_ALIGN
-#define _CMSG_DATA_ALIGN(n)           (((n) + 3) & ~3)
-#endif /* _CMSG_DATA_ALIGN */
-
-#ifndef _CMSG_HDR_ALIGN
-#define _CMSG_HDR_ALIGN(n)            (((n) + 3) & ~3)
-#endif /* _CMSG_HDR_ALIGN */
-
-/*
- * CMSG_SPACE and CMSG_LEN are required in RFC3542, but were new in that
- * version.
- */
-#ifndef CMSG_SPACE
-#define CMSG_SPACE(l)       (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + \
-                              _CMSG_HDR_ALIGN(l))
-#warning "assuming 4-byte alignment for CMSG_SPACE"
-#endif  /* CMSG_SPACE */
-
-
-#ifndef CMSG_LEN
-#define CMSG_LEN(l)         (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + (l))
-#warning "assuming 4-byte alignment for CMSG_LEN"
-#endif /* CMSG_LEN */
-
-
-/*  The definition of struct in_pktinfo is missing in old version of
-    GLIBC 2.1 (Redhat 6.1).  */
-#if defined (GNU_LINUX) && ! defined (HAVE_STRUCT_IN_PKTINFO)
-struct in_pktinfo
-{
-  int ipi_ifindex;
-  struct in_addr ipi_spec_dst;
-  struct in_addr ipi_addr;
-};
-#endif
-
-/* 
- * OSPF Fragmentation / fragmented writes
- *
- * ospfd can support writing fragmented packets, for cases where
- * kernel will not fragment IP_HDRINCL and/or multicast destined
- * packets (ie TTBOMK all kernels, BSD, SunOS, Linux). However,
- * SunOS, probably BSD too, clobber the user supplied IP ID and IP
- * flags fields, hence user-space fragmentation will not work.
- * Only Linux is known to leave IP header unmolested.
- * Further, fragmentation really should be done the kernel, which already
- * supports it, and which avoids nasty IP ID state problems.
- *
- * Fragmentation of OSPF packets can be required on networks with router
- * with many many interfaces active in one area, or on networks with links
- * with low MTUs.
- */
-#ifdef GNU_LINUX
-#define WANT_OSPF_WRITE_FRAGMENT
-#endif
-
-/* 
- * IP_HDRINCL / struct ip byte order
- *
- * Linux: network byte order
- * *BSD: network, except for length and offset. (cf Stevens)
- * SunOS: nominally as per BSD. but bug: network order on LE.
- * OpenBSD: network byte order, apart from older versions which are as per 
- *          *BSD
- */
-#if defined(__NetBSD__) \
-   || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) \
-   || (defined(__OpenBSD__) && (OpenBSD < 200311)) \
-   || (defined(__APPLE__)) \
-   || (defined(SUNOS_5) && defined(WORDS_BIGENDIAN))
-#define HAVE_IP_HDRINCL_BSD_ORDER
-#endif
-
-/* Define BYTE_ORDER, if not defined. Useful for compiler conditional
- * code, rather than preprocessor conditional.
- * Not all the world has this BSD define.
- */
-#ifndef BYTE_ORDER
-#define BIG_ENDIAN	4321	/* least-significant byte first (vax, pc) */
-#define LITTLE_ENDIAN	1234	/* most-significant byte first (IBM, net) */
-#define PDP_ENDIAN	3412	/* LSB first in word, MSW first in long (pdp) */
-
-#if defined(WORDS_BIGENDIAN)
-#define BYTE_ORDER	BIG_ENDIAN
-#else /* !WORDS_BIGENDIAN */
-#define BYTE_ORDER	LITTLE_ENDIAN
-#endif /* WORDS_BIGENDIAN */
-
-#endif /* ndef BYTE_ORDER */
-
-/* MAX / MIN are not commonly defined, but useful */
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif 
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-#define ZEBRA_NUM_OF(x) (sizeof (x) / sizeof (x[0]))
-
-/* For old definition. */
-#ifndef IN6_ARE_ADDR_EQUAL
-#define IN6_ARE_ADDR_EQUAL IN6_IS_ADDR_EQUAL
-#endif /* IN6_ARE_ADDR_EQUAL */
-
-/* default zebra TCP port for zclient */
-#define ZEBRA_PORT			2600
-
-/* Zebra message types. */
-#define ZEBRA_INTERFACE_ADD                1
-#define ZEBRA_INTERFACE_DELETE             2
-#define ZEBRA_INTERFACE_ADDRESS_ADD        3
-#define ZEBRA_INTERFACE_ADDRESS_DELETE     4
-#define ZEBRA_INTERFACE_UP                 5
-#define ZEBRA_INTERFACE_DOWN               6
-#define ZEBRA_IPV4_ROUTE_ADD               7
-#define ZEBRA_IPV4_ROUTE_DELETE            8
-#define ZEBRA_IPV6_ROUTE_ADD               9
-#define ZEBRA_IPV6_ROUTE_DELETE           10
-#define ZEBRA_REDISTRIBUTE_ADD            11
-#define ZEBRA_REDISTRIBUTE_DELETE         12
-#define ZEBRA_REDISTRIBUTE_DEFAULT_ADD    13
-#define ZEBRA_REDISTRIBUTE_DEFAULT_DELETE 14
-#define ZEBRA_IPV4_NEXTHOP_LOOKUP         15
-#define ZEBRA_IPV6_NEXTHOP_LOOKUP         16
-#define ZEBRA_IPV4_IMPORT_LOOKUP          17
-#define ZEBRA_IPV6_IMPORT_LOOKUP          18
-#define ZEBRA_INTERFACE_RENAME            19
-#define ZEBRA_ROUTER_ID_ADD               20
-#define ZEBRA_ROUTER_ID_DELETE            21
-#define ZEBRA_ROUTER_ID_UPDATE            22
-#define ZEBRA_HELLO                       23
-#define ZEBRA_IPV4_NEXTHOP_LOOKUP_MRIB    24
-#define ZEBRA_MESSAGE_MAX                 25
-
-/* Marker value used in new Zserv, in the byte location corresponding
- * the command value in the old zserv header. To allow old and new
- * Zserv headers to be distinguished from each other.
- */
-#define ZEBRA_HEADER_MARKER              255
-
-/* Zebra route's types are defined in route_types.h */
-#include "route_types.h"
-
-/* Note: whenever a new route-type or zserv-command is added the
- * corresponding {command,route}_types[] table in lib/log.c MUST be
- * updated! */
-
-/* Map a route type to a string.  For example, ZEBRA_ROUTE_RIPNG -> "ripng". */
-extern const char *zebra_route_string(unsigned int route_type);
-/* Map a route type to a char.  For example, ZEBRA_ROUTE_RIPNG -> 'R'. */
-extern char zebra_route_char(unsigned int route_type);
-/* Map a zserv command type to the same string, 
- * e.g. ZEBRA_INTERFACE_ADD -> "ZEBRA_INTERFACE_ADD" */
-/* Map a protocol name to its number. e.g. ZEBRA_ROUTE_BGP->9*/
-extern int proto_name2num(const char *s);
-/* Map redistribute X argument to protocol number.
- * unlike proto_name2num, this accepts shorthands and takes
- * an AFI value to restrict input */
-extern int proto_redistnum(int afi, const char *s);
-
-extern const char *zserv_command_string (unsigned int command);
-
-/* Zebra's family types. */
-#define ZEBRA_FAMILY_IPV4                1
-#define ZEBRA_FAMILY_IPV6                2
-#define ZEBRA_FAMILY_MAX                 3
-
-/* Error codes of zebra. */
-#define ZEBRA_ERR_NOERROR                0
-#define ZEBRA_ERR_RTEXIST               -1
-#define ZEBRA_ERR_RTUNREACH             -2
-#define ZEBRA_ERR_EPERM                 -3
-#define ZEBRA_ERR_RTNOEXIST             -4
-#define ZEBRA_ERR_KERNEL                -5
-
-/* Zebra message flags */
-#define ZEBRA_FLAG_INTERNAL           0x01
-#define ZEBRA_FLAG_SELFROUTE          0x02
-#define ZEBRA_FLAG_BLACKHOLE          0x04
-#define ZEBRA_FLAG_IBGP               0x08
-#define ZEBRA_FLAG_SELECTED           0x10
-#define ZEBRA_FLAG_CHANGED            0x20
-#define ZEBRA_FLAG_STATIC             0x40
-#define ZEBRA_FLAG_REJECT             0x80
-
-/* Zebra nexthop flags. */
-#define ZEBRA_NEXTHOP_IFINDEX            1
-#define ZEBRA_NEXTHOP_IFNAME             2
-#define ZEBRA_NEXTHOP_IPV4               3
-#define ZEBRA_NEXTHOP_IPV4_IFINDEX       4
-#define ZEBRA_NEXTHOP_IPV4_IFNAME        5
-#define ZEBRA_NEXTHOP_IPV6               6
-#define ZEBRA_NEXTHOP_IPV6_IFINDEX       7
-#define ZEBRA_NEXTHOP_IPV6_IFNAME        8
-#define ZEBRA_NEXTHOP_BLACKHOLE          9
-
-#ifndef INADDR_LOOPBACK
-#define	INADDR_LOOPBACK	0x7f000001	/* Internet address 127.0.0.1.  */
-#endif
-
-/* Address family numbers from RFC1700. */
-#define AFI_IP                    1
-#define AFI_IP6                   2
-#define AFI_MAX                   3
-
-/* Subsequent Address Family Identifier. */
-#define SAFI_UNICAST              1
-#define SAFI_MULTICAST            2
-#define SAFI_RESERVED_3           3
-#define SAFI_MPLS_VPN             4
-#define SAFI_MAX                  5
-
-/* Filter direction.  */
-#define FILTER_IN                 0
-#define FILTER_OUT                1
-#define FILTER_MAX                2
-
-/* Default Administrative Distance of each protocol. */
-#define ZEBRA_KERNEL_DISTANCE_DEFAULT      0
-#define ZEBRA_CONNECT_DISTANCE_DEFAULT     0
-#define ZEBRA_STATIC_DISTANCE_DEFAULT      1
-#define ZEBRA_RIP_DISTANCE_DEFAULT       120
-#define ZEBRA_RIPNG_DISTANCE_DEFAULT     120
-#define ZEBRA_OSPF_DISTANCE_DEFAULT      110
-#define ZEBRA_OSPF6_DISTANCE_DEFAULT     110
-#define ZEBRA_ISIS_DISTANCE_DEFAULT      115
-#define ZEBRA_IBGP_DISTANCE_DEFAULT      200
-#define ZEBRA_EBGP_DISTANCE_DEFAULT       20
-
-/* Flag manipulation macros. */
-#define CHECK_FLAG(V,F)      ((V) & (F))
-#define SET_FLAG(V,F)        (V) |= (F)
-#define UNSET_FLAG(V,F)      (V) &= ~(F)
-
-/* AFI and SAFI type. */
-typedef u_int16_t afi_t;
-typedef u_int8_t safi_t;
-
-/* Zebra types. Used in Zserv message header. */
-typedef u_int16_t zebra_size_t;
-typedef u_int16_t zebra_command_t;
-
-/* FIFO -- first in first out structure and macros.  */
-struct fifo
-{
-  struct fifo *next;
-  struct fifo *prev;
-};
-
-#define FIFO_INIT(F)                                  \
-  do {                                                \
-    struct fifo *Xfifo = (struct fifo *)(F);          \
-    Xfifo->next = Xfifo->prev = Xfifo;                \
-  } while (0)
-
-#define FIFO_ADD(F,N)                                 \
-  do {                                                \
-    struct fifo *Xfifo = (struct fifo *)(F);          \
-    struct fifo *Xnode = (struct fifo *)(N);          \
-    Xnode->next = Xfifo;                              \
-    Xnode->prev = Xfifo->prev;                        \
-    Xfifo->prev = Xfifo->prev->next = Xnode;          \
-  } while (0)
-
-#define FIFO_DEL(N)                                   \
-  do {                                                \
-    struct fifo *Xnode = (struct fifo *)(N);          \
-    Xnode->prev->next = Xnode->next;                  \
-    Xnode->next->prev = Xnode->prev;                  \
-  } while (0)
-
-#define FIFO_HEAD(F)                                  \
-  ((((struct fifo *)(F))->next == (struct fifo *)(F)) \
-  ? NULL : (F)->next)
-
-#define FIFO_EMPTY(F)                                 \
-  (((struct fifo *)(F))->next == (struct fifo *)(F))
-
-#define FIFO_TOP(F)                                   \
-  (FIFO_EMPTY(F) ? NULL : ((struct fifo *)(F))->next)
-
-#endif /* _ZEBRA_H */
diff --git a/openflow/usr/include/rdma/hfi/hfi1_user.h b/openflow/usr/include/rdma/hfi/hfi1_user.h
deleted file mode 100644
index fa77d9a..0000000
--- a/openflow/usr/include/rdma/hfi/hfi1_user.h
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2015 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * BSD LICENSE
- *
- * Copyright(c) 2015 Intel Corporation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  - Neither the name of Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
- * This file contains defines, structures, etc. that are used
- * to communicate between kernel and user code.
- */
-
-#ifndef _LINUX__HFI1_USER_H
-#define _LINUX__HFI1_USER_H
-
-#include <linux/types.h>
-
-/*
- * This version number is given to the driver by the user code during
- * initialization in the spu_userversion field of hfi1_user_info, so
- * the driver can check for compatibility with user code.
- *
- * The major version changes when data structures change in an incompatible
- * way. The driver must be the same for initialization to succeed.
- */
-#define HFI1_USER_SWMAJOR 4
-
-/*
- * Minor version differences are always compatible
- * a within a major version, however if user software is larger
- * than driver software, some new features and/or structure fields
- * may not be implemented; the user code must deal with this if it
- * cares, or it must abort after initialization reports the difference.
- */
-#define HFI1_USER_SWMINOR 0
-
-/*
- * Set of HW and driver capability/feature bits.
- * These bit values are used to configure enabled/disabled HW and
- * driver features. The same set of bits are communicated to user
- * space.
- */
-#define HFI1_CAP_DMA_RTAIL        (1UL <<  0) /* Use DMA'ed RTail value */
-#define HFI1_CAP_SDMA             (1UL <<  1) /* Enable SDMA support */
-#define HFI1_CAP_SDMA_AHG         (1UL <<  2) /* Enable SDMA AHG support */
-#define HFI1_CAP_EXTENDED_PSN     (1UL <<  3) /* Enable Extended PSN support */
-#define HFI1_CAP_HDRSUPP          (1UL <<  4) /* Enable Header Suppression */
-/* 1UL << 5 unused */
-#define HFI1_CAP_USE_SDMA_HEAD    (1UL <<  6) /* DMA Hdr Q tail vs. use CSR */
-#define HFI1_CAP_MULTI_PKT_EGR    (1UL <<  7) /* Enable multi-packet Egr buffs*/
-#define HFI1_CAP_NODROP_RHQ_FULL  (1UL <<  8) /* Don't drop on Hdr Q full */
-#define HFI1_CAP_NODROP_EGR_FULL  (1UL <<  9) /* Don't drop on EGR buffs full */
-#define HFI1_CAP_TID_UNMAP        (1UL << 10) /* Enable Expected TID caching */
-#define HFI1_CAP_PRINT_UNIMPL     (1UL << 11) /* Show for unimplemented feats */
-#define HFI1_CAP_ALLOW_PERM_JKEY  (1UL << 12) /* Allow use of permissive JKEY */
-#define HFI1_CAP_NO_INTEGRITY     (1UL << 13) /* Enable ctxt integrity checks */
-#define HFI1_CAP_PKEY_CHECK       (1UL << 14) /* Enable ctxt PKey checking */
-#define HFI1_CAP_STATIC_RATE_CTRL (1UL << 15) /* Allow PBC.StaticRateControl */
-/* 1UL << 16 unused */
-#define HFI1_CAP_SDMA_HEAD_CHECK  (1UL << 17) /* SDMA head checking */
-#define HFI1_CAP_EARLY_CREDIT_RETURN (1UL << 18) /* early credit return */
-
-#define HFI1_RCVHDR_ENTSIZE_2    (1UL << 0)
-#define HFI1_RCVHDR_ENTSIZE_16   (1UL << 1)
-#define HFI1_RCVDHR_ENTSIZE_32   (1UL << 2)
-
-/*
- * If the unit is specified via open, HFI choice is fixed.  If port is
- * specified, it's also fixed.  Otherwise we try to spread contexts
- * across ports and HFIs, using different algorithms.  WITHIN is
- * the old default, prior to this mechanism.
- */
-#define HFI1_ALG_ACROSS 0 /* round robin contexts across HFIs, then
-			  * ports; this is the default */
-#define HFI1_ALG_WITHIN 1 /* use all contexts on an HFI (round robin
-			  * active ports within), then next HFI */
-#define HFI1_ALG_COUNT  2 /* number of algorithm choices */
-
-
-/* User commands. */
-#define HFI1_CMD_ASSIGN_CTXT     1	/* allocate HFI and context */
-#define HFI1_CMD_CTXT_INFO       2	/* find out what resources we got */
-#define HFI1_CMD_USER_INFO       3	/* set up userspace */
-#define HFI1_CMD_TID_UPDATE      4	/* update expected TID entries */
-#define HFI1_CMD_TID_FREE        5	/* free expected TID entries */
-#define HFI1_CMD_CREDIT_UPD      6	/* force an update of PIO credit */
-#define HFI1_CMD_SDMA_STATUS_UPD 7       /* force update of SDMA status ring */
-
-#define HFI1_CMD_RECV_CTRL       8	/* control receipt of packets */
-#define HFI1_CMD_POLL_TYPE       9	/* set the kind of polling we want */
-#define HFI1_CMD_ACK_EVENT       10	/* ack & clear user status bits */
-#define HFI1_CMD_SET_PKEY        11      /* set context's pkey */
-#define HFI1_CMD_CTXT_RESET      12      /* reset context's HW send context */
-/* separate EPROM commands from normal PSM commands */
-#define HFI1_CMD_EP_INFO         64      /* read EPROM device ID */
-#define HFI1_CMD_EP_ERASE_CHIP   65      /* erase whole EPROM */
-#define HFI1_CMD_EP_ERASE_P0     66      /* erase EPROM partition 0 */
-#define HFI1_CMD_EP_ERASE_P1     67      /* erase EPROM partition 1 */
-#define HFI1_CMD_EP_READ_P0      68      /* read EPROM partition 0 */
-#define HFI1_CMD_EP_READ_P1      69      /* read EPROM partition 1 */
-#define HFI1_CMD_EP_WRITE_P0     70      /* write EPROM partition 0 */
-#define HFI1_CMD_EP_WRITE_P1     71      /* write EPROM partition 1 */
-
-#define _HFI1_EVENT_FROZEN_BIT       0
-#define _HFI1_EVENT_LINKDOWN_BIT     1
-#define _HFI1_EVENT_LID_CHANGE_BIT   2
-#define _HFI1_EVENT_LMC_CHANGE_BIT   3
-#define _HFI1_EVENT_SL2VL_CHANGE_BIT 4
-#define _HFI1_MAX_EVENT_BIT _HFI1_EVENT_SL2VL_CHANGE_BIT
-
-#define HFI1_EVENT_FROZEN                (1UL << _HFI1_EVENT_FROZEN_BIT)
-#define HFI1_EVENT_LINKDOWN_BIT		(1UL << _HFI1_EVENT_LINKDOWN_BIT)
-#define HFI1_EVENT_LID_CHANGE_BIT	(1UL << _HFI1_EVENT_LID_CHANGE_BIT)
-#define HFI1_EVENT_LMC_CHANGE_BIT	(1UL << _HFI1_EVENT_LMC_CHANGE_BIT)
-#define HFI1_EVENT_SL2VL_CHANGE_BIT	(1UL << _HFI1_EVENT_SL2VL_CHANGE_BIT)
-
-/*
- * These are the status bits readable (in ASCII form, 64bit value)
- * from the "status" sysfs file.  For binary compatibility, values
- * must remain as is; removed states can be reused for different
- * purposes.
- */
-#define HFI1_STATUS_INITTED       0x1    /* basic initialization done */
-/* Chip has been found and initialized */
-#define HFI1_STATUS_CHIP_PRESENT 0x20
-/* IB link is at ACTIVE, usable for data traffic */
-#define HFI1_STATUS_IB_READY     0x40
-/* link is configured, LID, MTU, etc. have been set */
-#define HFI1_STATUS_IB_CONF      0x80
-/* A Fatal hardware error has occurred. */
-#define HFI1_STATUS_HWERROR     0x200
-
-/*
- * Number of supported shared contexts.
- * This is the maximum number of software contexts that can share
- * a hardware send/receive context.
- */
-#define HFI1_MAX_SHARED_CTXTS 8
-
-/*
- * Poll types
- */
-#define HFI1_POLL_TYPE_ANYRCV     0x0
-#define HFI1_POLL_TYPE_URGENT     0x1
-
-/*
- * This structure is passed to the driver to tell it where
- * user code buffers are, sizes, etc.   The offsets and sizes of the
- * fields must remain unchanged, for binary compatibility.  It can
- * be extended, if userversion is changed so user code can tell, if needed
- */
-struct hfi1_user_info {
-	/*
-	 * version of user software, to detect compatibility issues.
-	 * Should be set to HFI1_USER_SWVERSION.
-	 */
-	__u32 userversion;
-	__u16 pad;
-	/* HFI selection algorithm, if unit has not selected */
-	__u16 hfi1_alg;
-	/*
-	 * If two or more processes wish to share a context, each process
-	 * must set the subcontext_cnt and subcontext_id to the same
-	 * values.  The only restriction on the subcontext_id is that
-	 * it be unique for a given node.
-	 */
-	__u16 subctxt_cnt;
-	__u16 subctxt_id;
-	/* 128bit UUID passed in by PSM. */
-	__u8 uuid[16];
-};
-
-struct hfi1_ctxt_info {
-	__u64 runtime_flags;    /* chip/drv runtime flags (HFI1_CAP_*) */
-	__u32 rcvegr_size;      /* size of each eager buffer */
-	__u16 num_active;       /* number of active units */
-	__u16 unit;             /* unit (chip) assigned to caller */
-	__u16 ctxt;             /* ctxt on unit assigned to caller */
-	__u16 subctxt;          /* subctxt on unit assigned to caller */
-	__u16 rcvtids;          /* number of Rcv TIDs for this context */
-	__u16 credits;          /* number of PIO credits for this context */
-	__u16 numa_node;        /* NUMA node of the assigned device */
-	__u16 rec_cpu;          /* cpu # for affinity (0xffff if none) */
-	__u16 send_ctxt;        /* send context in use by this user context */
-	__u16 egrtids;          /* number of RcvArray entries for Eager Rcvs */
-	__u16 rcvhdrq_cnt;      /* number of RcvHdrQ entries */
-	__u16 rcvhdrq_entsize;  /* size (in bytes) for each RcvHdrQ entry */
-	__u16 sdma_ring_size;   /* number of entries in SDMA request ring */
-};
-
-struct hfi1_tid_info {
-	/* virtual address of first page in transfer */
-	__u64 vaddr;
-	/* pointer to tid array. this array is big enough */
-	__u64 tidlist;
-	/* number of tids programmed by this request */
-	__u32 tidcnt;
-	/* length of transfer buffer programmed by this request */
-	__u32 length;
-	/*
-	 * pointer to bitmap of TIDs used for this call;
-	 * checked for being large enough at open
-	 */
-	__u64 tidmap;
-};
-
-struct hfi1_cmd {
-	__u32 type;        /* command type */
-	__u32 len;         /* length of struct pointed to by add */
-	__u64 addr;        /* pointer to user structure */
-};
-
-enum hfi1_sdma_comp_state {
-	FREE = 0,
-	QUEUED,
-	COMPLETE,
-	ERROR
-};
-
-/*
- * SDMA completion ring entry
- */
-struct hfi1_sdma_comp_entry {
-	__u32 status;
-	__u32 errcode;
-};
-
-/*
- * Device status and notifications from driver to user-space.
- */
-struct hfi1_status {
-	__u64 dev;      /* device/hw status bits */
-	__u64 port;     /* port state and status bits */
-	char freezemsg[0];
-};
-
-/*
- * This structure is returned by the driver immediately after
- * open to get implementation-specific info, and info specific to this
- * instance.
- *
- * This struct must have explicit pad fields where type sizes
- * may result in different alignments between 32 and 64 bit
- * programs, since the 64 bit * bit kernel requires the user code
- * to have matching offsets
- */
-struct hfi1_base_info {
-	/* version of hardware, for feature checking. */
-	__u32 hw_version;
-	/* version of software, for feature checking. */
-	__u32 sw_version;
-	/* Job key */
-	__u16 jkey;
-	__u16 padding1;
-	/*
-	 * The special QP (queue pair) value that identifies PSM
-	 * protocol packet from standard IB packets.
-	 */
-	__u32 bthqp;
-	/* PIO credit return address, */
-	__u64 sc_credits_addr;
-	/*
-	 * Base address of write-only pio buffers for this process.
-	 * Each buffer has sendpio_credits*64 bytes.
-	 */
-	__u64 pio_bufbase_sop;
-	/*
-	 * Base address of write-only pio buffers for this process.
-	 * Each buffer has sendpio_credits*64 bytes.
-	 */
-	__u64 pio_bufbase;
-	/* address where receive buffer queue is mapped into */
-	__u64 rcvhdr_bufbase;
-	/* base address of Eager receive buffers. */
-	__u64 rcvegr_bufbase;
-	/* base address of SDMA completion ring */
-	__u64 sdma_comp_bufbase;
-	/*
-	 * User register base for init code, not to be used directly by
-	 * protocol or applications.  Always maps real chip register space.
-	 * the register addresses are:
-	 * ur_rcvhdrhead, ur_rcvhdrtail, ur_rcvegrhead, ur_rcvegrtail,
-	 * ur_rcvtidflow
-	 */
-	__u64 user_regbase;
-	/* notification events */
-	__u64 events_bufbase;
-	/* status page */
-	__u64 status_bufbase;
-	/* rcvhdrtail update */
-	__u64 rcvhdrtail_base;
-	/*
-	 * shared memory pages for subctxts if ctxt is shared; these cover
-	 * all the processes in the group sharing a single context.
-	 * all have enough space for the num_subcontexts value on this job.
-	 */
-	__u64 subctxt_uregbase;
-	__u64 subctxt_rcvegrbuf;
-	__u64 subctxt_rcvhdrbuf;
-};
-
-enum sdma_req_opcode {
-	EXPECTED = 0,
-	EAGER
-};
-
-#define HFI1_SDMA_REQ_VERSION_MASK 0xF
-#define HFI1_SDMA_REQ_VERSION_SHIFT 0x0
-#define HFI1_SDMA_REQ_OPCODE_MASK 0xF
-#define HFI1_SDMA_REQ_OPCODE_SHIFT 0x4
-#define HFI1_SDMA_REQ_IOVCNT_MASK 0xFF
-#define HFI1_SDMA_REQ_IOVCNT_SHIFT 0x8
-
-struct sdma_req_info {
-	/*
-	 * bits 0-3 - version (currently unused)
-	 * bits 4-7 - opcode (enum sdma_req_opcode)
-	 * bits 8-15 - io vector count
-	 */
-	__u16 ctrl;
-	/*
-	 * Number of fragments contained in this request.
-	 * User-space has already computed how many
-	 * fragment-sized packet the user buffer will be
-	 * split into.
-	 */
-	__u16 npkts;
-	/*
-	 * Size of each fragment the user buffer will be
-	 * split into.
-	 */
-	__u16 fragsize;
-	/*
-	 * Index of the slot in the SDMA completion ring
-	 * this request should be using. User-space is
-	 * in charge of managing its own ring.
-	 */
-	__u16 comp_idx;
-} __attribute__((packed));
-
-/*
- * SW KDETH header.
- * swdata is SW defined portion.
- */
-struct hfi1_kdeth_header {
-	__le32 ver_tid_offset;
-	__le16 jkey;
-	__le16 hcrc;
-	__le32 swdata[7];
-} __attribute__((packed));
-
-/*
- * Structure describing the headers that User space uses. The
- * structure above is a subset of this one.
- */
-struct hfi1_pkt_header {
-	__le16 pbc[4];
-	__be16 lrh[4];
-	__be32 bth[3];
-	struct hfi1_kdeth_header kdeth;
-} __attribute__((packed));
-
-
-/*
- * The list of usermode accessible registers.
- */
-enum hfi1_ureg {
-	/* (RO)  DMA RcvHdr to be used next. */
-	ur_rcvhdrtail = 0,
-	/* (RW)  RcvHdr entry to be processed next by host. */
-	ur_rcvhdrhead = 1,
-	/* (RO)  Index of next Eager index to use. */
-	ur_rcvegrindextail = 2,
-	/* (RW)  Eager TID to be processed next */
-	ur_rcvegrindexhead = 3,
-	/* (RO)  Receive Eager Offset Tail */
-	ur_rcvegroffsettail = 4,
-	/* For internal use only; max register number. */
-	ur_maxreg,
-	/* (RW)  Receive TID flow table */
-	ur_rcvtidflowtable = 256
-};
-
-#endif /* _LINIUX__HFI1_USER_H */
diff --git a/openflow/usr/include/rdma/ib_user_cm.h b/openflow/usr/include/rdma/ib_user_cm.h
deleted file mode 100644
index f79014a..0000000
--- a/openflow/usr/include/rdma/ib_user_cm.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright (c) 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005 Intel Corporation.  All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef IB_USER_CM_H
-#define IB_USER_CM_H
-
-#include <linux/types.h>
-#include <rdma/ib_user_sa.h>
-
-#define IB_USER_CM_ABI_VERSION 5
-
-enum {
-	IB_USER_CM_CMD_CREATE_ID,
-	IB_USER_CM_CMD_DESTROY_ID,
-	IB_USER_CM_CMD_ATTR_ID,
-
-	IB_USER_CM_CMD_LISTEN,
-	IB_USER_CM_CMD_NOTIFY,
-
-	IB_USER_CM_CMD_SEND_REQ,
-	IB_USER_CM_CMD_SEND_REP,
-	IB_USER_CM_CMD_SEND_RTU,
-	IB_USER_CM_CMD_SEND_DREQ,
-	IB_USER_CM_CMD_SEND_DREP,
-	IB_USER_CM_CMD_SEND_REJ,
-	IB_USER_CM_CMD_SEND_MRA,
-	IB_USER_CM_CMD_SEND_LAP,
-	IB_USER_CM_CMD_SEND_APR,
-	IB_USER_CM_CMD_SEND_SIDR_REQ,
-	IB_USER_CM_CMD_SEND_SIDR_REP,
-
-	IB_USER_CM_CMD_EVENT,
-	IB_USER_CM_CMD_INIT_QP_ATTR,
-};
-/*
- * command ABI structures.
- */
-struct ib_ucm_cmd_hdr {
-	__u32 cmd;
-	__u16 in;
-	__u16 out;
-};
-
-struct ib_ucm_create_id {
-	__u64 uid;
-	__u64 response;
-};
-
-struct ib_ucm_create_id_resp {
-	__u32 id;
-};
-
-struct ib_ucm_destroy_id {
-	__u64 response;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct ib_ucm_destroy_id_resp {
-	__u32 events_reported;
-};
-
-struct ib_ucm_attr_id {
-	__u64 response;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct ib_ucm_attr_id_resp {
-	__be64 service_id;
-	__be64 service_mask;
-	__be32 local_id;
-	__be32 remote_id;
-};
-
-struct ib_ucm_init_qp_attr {
-	__u64 response;
-	__u32 id;
-	__u32 qp_state;
-};
-
-struct ib_ucm_listen {
-	__be64 service_id;
-	__be64 service_mask;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct ib_ucm_notify {
-	__u32 id;
-	__u32 event;
-};
-
-struct ib_ucm_private_data {
-	__u64 data;
-	__u32 id;
-	__u8  len;
-	__u8  reserved[3];
-};
-
-struct ib_ucm_req {
-	__u32 id;
-	__u32 qpn;
-	__u32 qp_type;
-	__u32 psn;
-	__be64 sid;
-	__u64 data;
-	__u64 primary_path;
-	__u64 alternate_path;
-	__u8  len;
-	__u8  peer_to_peer;
-	__u8  responder_resources;
-	__u8  initiator_depth;
-	__u8  remote_cm_response_timeout;
-	__u8  flow_control;
-	__u8  local_cm_response_timeout;
-	__u8  retry_count;
-	__u8  rnr_retry_count;
-	__u8  max_cm_retries;
-	__u8  srq;
-	__u8  reserved[5];
-};
-
-struct ib_ucm_rep {
-	__u64 uid;
-	__u64 data;
-	__u32 id;
-	__u32 qpn;
-	__u32 psn;
-	__u8  len;
-	__u8  responder_resources;
-	__u8  initiator_depth;
-	__u8  target_ack_delay;
-	__u8  failover_accepted;
-	__u8  flow_control;
-	__u8  rnr_retry_count;
-	__u8  srq;
-	__u8  reserved[4];
-};
-
-struct ib_ucm_info {
-	__u32 id;
-	__u32 status;
-	__u64 info;
-	__u64 data;
-	__u8  info_len;
-	__u8  data_len;
-	__u8  reserved[6];
-};
-
-struct ib_ucm_mra {
-	__u64 data;
-	__u32 id;
-	__u8  len;
-	__u8  timeout;
-	__u8  reserved[2];
-};
-
-struct ib_ucm_lap {
-	__u64 path;
-	__u64 data;
-	__u32 id;
-	__u8  len;
-	__u8  reserved[3];
-};
-
-struct ib_ucm_sidr_req {
-	__u32 id;
-	__u32 timeout;
-	__be64 sid;
-	__u64 data;
-	__u64 path;
-	__u16 reserved_pkey;
-	__u8  len;
-	__u8  max_cm_retries;
-	__u8  reserved[4];
-};
-
-struct ib_ucm_sidr_rep {
-	__u32 id;
-	__u32 qpn;
-	__u32 qkey;
-	__u32 status;
-	__u64 info;
-	__u64 data;
-	__u8  info_len;
-	__u8  data_len;
-	__u8  reserved[6];
-};
-/*
- * event notification ABI structures.
- */
-struct ib_ucm_event_get {
-	__u64 response;
-	__u64 data;
-	__u64 info;
-	__u8  data_len;
-	__u8  info_len;
-	__u8  reserved[6];
-};
-
-struct ib_ucm_req_event_resp {
-	struct ib_user_path_rec primary_path;
-	struct ib_user_path_rec alternate_path;
-	__be64                 remote_ca_guid;
-	__u32                  remote_qkey;
-	__u32                  remote_qpn;
-	__u32                  qp_type;
-	__u32                  starting_psn;
-	__u8  responder_resources;
-	__u8  initiator_depth;
-	__u8  local_cm_response_timeout;
-	__u8  flow_control;
-	__u8  remote_cm_response_timeout;
-	__u8  retry_count;
-	__u8  rnr_retry_count;
-	__u8  srq;
-	__u8  port;
-	__u8  reserved[7];
-};
-
-struct ib_ucm_rep_event_resp {
-	__be64 remote_ca_guid;
-	__u32 remote_qkey;
-	__u32 remote_qpn;
-	__u32 starting_psn;
-	__u8  responder_resources;
-	__u8  initiator_depth;
-	__u8  target_ack_delay;
-	__u8  failover_accepted;
-	__u8  flow_control;
-	__u8  rnr_retry_count;
-	__u8  srq;
-	__u8  reserved[5];
-};
-
-struct ib_ucm_rej_event_resp {
-	__u32 reason;
-	/* ari in ib_ucm_event_get info field. */
-};
-
-struct ib_ucm_mra_event_resp {
-	__u8  timeout;
-	__u8  reserved[3];
-};
-
-struct ib_ucm_lap_event_resp {
-	struct ib_user_path_rec path;
-};
-
-struct ib_ucm_apr_event_resp {
-	__u32 status;
-	/* apr info in ib_ucm_event_get info field. */
-};
-
-struct ib_ucm_sidr_req_event_resp {
-	__u16 pkey;
-	__u8  port;
-	__u8  reserved;
-};
-
-struct ib_ucm_sidr_rep_event_resp {
-	__u32 status;
-	__u32 qkey;
-	__u32 qpn;
-	/* info in ib_ucm_event_get info field. */
-};
-
-#define IB_UCM_PRES_DATA      0x01
-#define IB_UCM_PRES_INFO      0x02
-#define IB_UCM_PRES_PRIMARY   0x04
-#define IB_UCM_PRES_ALTERNATE 0x08
-
-struct ib_ucm_event_resp {
-	__u64 uid;
-	__u32 id;
-	__u32 event;
-	__u32 present;
-	__u32 reserved;
-	union {
-		struct ib_ucm_req_event_resp req_resp;
-		struct ib_ucm_rep_event_resp rep_resp;
-		struct ib_ucm_rej_event_resp rej_resp;
-		struct ib_ucm_mra_event_resp mra_resp;
-		struct ib_ucm_lap_event_resp lap_resp;
-		struct ib_ucm_apr_event_resp apr_resp;
-
-		struct ib_ucm_sidr_req_event_resp sidr_req_resp;
-		struct ib_ucm_sidr_rep_event_resp sidr_rep_resp;
-
-		__u32                             send_status;
-	} u;
-};
-
-#endif /* IB_USER_CM_H */
diff --git a/openflow/usr/include/rdma/ib_user_mad.h b/openflow/usr/include/rdma/ib_user_mad.h
deleted file mode 100644
index 09f809f..0000000
--- a/openflow/usr/include/rdma/ib_user_mad.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 2004 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005 Voltaire, Inc. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef IB_USER_MAD_H
-#define IB_USER_MAD_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-/*
- * Increment this value if any changes that break userspace ABI
- * compatibility are made.
- */
-#define IB_USER_MAD_ABI_VERSION	5
-
-/*
- * Make sure that all structs defined in this file remain laid out so
- * that they pack the same way on 32-bit and 64-bit architectures (to
- * avoid incompatibility between 32-bit userspace and 64-bit kernels).
- */
-
-/**
- * ib_user_mad_hdr_old - Old version of MAD packet header without pkey_index
- * @id - ID of agent MAD received with/to be sent with
- * @status - 0 on successful receive, ETIMEDOUT if no response
- *   received (transaction ID in data[] will be set to TID of original
- *   request) (ignored on send)
- * @timeout_ms - Milliseconds to wait for response (unset on receive)
- * @retries - Number of automatic retries to attempt
- * @qpn - Remote QP number received from/to be sent to
- * @qkey - Remote Q_Key to be sent with (unset on receive)
- * @lid - Remote lid received from/to be sent to
- * @sl - Service level received with/to be sent with
- * @path_bits - Local path bits received with/to be sent with
- * @grh_present - If set, GRH was received/should be sent
- * @gid_index - Local GID index to send with (unset on receive)
- * @hop_limit - Hop limit in GRH
- * @traffic_class - Traffic class in GRH
- * @gid - Remote GID in GRH
- * @flow_label - Flow label in GRH
- */
-struct ib_user_mad_hdr_old {
-	__u32	id;
-	__u32	status;
-	__u32	timeout_ms;
-	__u32	retries;
-	__u32	length;
-	__be32	qpn;
-	__be32  qkey;
-	__be16	lid;
-	__u8	sl;
-	__u8	path_bits;
-	__u8	grh_present;
-	__u8	gid_index;
-	__u8	hop_limit;
-	__u8	traffic_class;
-	__u8	gid[16];
-	__be32	flow_label;
-};
-
-/**
- * ib_user_mad_hdr - MAD packet header
- *   This layout allows specifying/receiving the P_Key index.  To use
- *   this capability, an application must call the
- *   IB_USER_MAD_ENABLE_PKEY ioctl on the user MAD file handle before
- *   any other actions with the file handle.
- * @id - ID of agent MAD received with/to be sent with
- * @status - 0 on successful receive, ETIMEDOUT if no response
- *   received (transaction ID in data[] will be set to TID of original
- *   request) (ignored on send)
- * @timeout_ms - Milliseconds to wait for response (unset on receive)
- * @retries - Number of automatic retries to attempt
- * @qpn - Remote QP number received from/to be sent to
- * @qkey - Remote Q_Key to be sent with (unset on receive)
- * @lid - Remote lid received from/to be sent to
- * @sl - Service level received with/to be sent with
- * @path_bits - Local path bits received with/to be sent with
- * @grh_present - If set, GRH was received/should be sent
- * @gid_index - Local GID index to send with (unset on receive)
- * @hop_limit - Hop limit in GRH
- * @traffic_class - Traffic class in GRH
- * @gid - Remote GID in GRH
- * @flow_label - Flow label in GRH
- * @pkey_index - P_Key index
- */
-struct ib_user_mad_hdr {
-	__u32	id;
-	__u32	status;
-	__u32	timeout_ms;
-	__u32	retries;
-	__u32	length;
-	__be32	qpn;
-	__be32  qkey;
-	__be16	lid;
-	__u8	sl;
-	__u8	path_bits;
-	__u8	grh_present;
-	__u8	gid_index;
-	__u8	hop_limit;
-	__u8	traffic_class;
-	__u8	gid[16];
-	__be32	flow_label;
-	__u16	pkey_index;
-	__u8	reserved[6];
-};
-
-/**
- * ib_user_mad - MAD packet
- * @hdr - MAD packet header
- * @data - Contents of MAD
- *
- */
-struct ib_user_mad {
-	struct ib_user_mad_hdr hdr;
-	__u64	data[0];
-};
-
-/*
- * Earlier versions of this interface definition declared the
- * method_mask[] member as an array of __u32 but treated it as a
- * bitmap made up of longs in the kernel.  This ambiguity meant that
- * 32-bit big-endian applications that can run on both 32-bit and
- * 64-bit kernels had no consistent ABI to rely on, and 64-bit
- * big-endian applications that treated method_mask as being made up
- * of 32-bit words would have their bitmap misinterpreted.
- *
- * To clear up this confusion, we change the declaration of
- * method_mask[] to use unsigned long and handle the conversion from
- * 32-bit userspace to 64-bit kernel for big-endian systems in the
- * compat_ioctl method.  Unfortunately, to keep the structure layout
- * the same, we need the method_mask[] array to be aligned only to 4
- * bytes even when long is 64 bits, which forces us into this ugly
- * typedef.
- */
-typedef unsigned long __attribute__((aligned(4))) packed_ulong;
-#define IB_USER_MAD_LONGS_PER_METHOD_MASK (128 / (8 * sizeof (long)))
-
-/**
- * ib_user_mad_reg_req - MAD registration request
- * @id - Set by the kernel; used to identify agent in future requests.
- * @qpn - Queue pair number; must be 0 or 1.
- * @method_mask - The caller will receive unsolicited MADs for any method
- *   where @method_mask = 1.
- * @mgmt_class - Indicates which management class of MADs should be receive
- *   by the caller.  This field is only required if the user wishes to
- *   receive unsolicited MADs, otherwise it should be 0.
- * @mgmt_class_version - Indicates which version of MADs for the given
- *   management class to receive.
- * @oui: Indicates IEEE OUI when mgmt_class is a vendor class
- *   in the range from 0x30 to 0x4f. Otherwise not used.
- * @rmpp_version: If set, indicates the RMPP version used.
- *
- */
-struct ib_user_mad_reg_req {
-	__u32	id;
-	packed_ulong method_mask[IB_USER_MAD_LONGS_PER_METHOD_MASK];
-	__u8	qpn;
-	__u8	mgmt_class;
-	__u8	mgmt_class_version;
-	__u8    oui[3];
-	__u8	rmpp_version;
-};
-
-/**
- * ib_user_mad_reg_req2 - MAD registration request
- *
- * @id                 - Set by the _kernel_; used by userspace to identify the
- *                       registered agent in future requests.
- * @qpn                - Queue pair number; must be 0 or 1.
- * @mgmt_class         - Indicates which management class of MADs should be
- *                       receive by the caller.  This field is only required if
- *                       the user wishes to receive unsolicited MADs, otherwise
- *                       it should be 0.
- * @mgmt_class_version - Indicates which version of MADs for the given
- *                       management class to receive.
- * @res                - Ignored.
- * @flags              - additional registration flags; Must be in the set of
- *                       flags defined in IB_USER_MAD_REG_FLAGS_CAP
- * @method_mask        - The caller wishes to receive unsolicited MADs for the
- *                       methods whose bit(s) is(are) set.
- * @oui                - Indicates IEEE OUI to use when mgmt_class is a vendor
- *                       class in the range from 0x30 to 0x4f. Otherwise not
- *                       used.
- * @rmpp_version       - If set, indicates the RMPP version to use.
- */
-enum {
-	IB_USER_MAD_USER_RMPP = (1 << 0),
-};
-#define IB_USER_MAD_REG_FLAGS_CAP (IB_USER_MAD_USER_RMPP)
-struct ib_user_mad_reg_req2 {
-	__u32	id;
-	__u32	qpn;
-	__u8	mgmt_class;
-	__u8	mgmt_class_version;
-	__u16   res;
-	__u32   flags;
-	__u64   method_mask[2];
-	__u32   oui;
-	__u8	rmpp_version;
-	__u8	reserved[3];
-};
-
-#define IB_IOCTL_MAGIC		0x1b
-
-#define IB_USER_MAD_REGISTER_AGENT	_IOWR(IB_IOCTL_MAGIC, 1, \
-					      struct ib_user_mad_reg_req)
-
-#define IB_USER_MAD_UNREGISTER_AGENT	_IOW(IB_IOCTL_MAGIC, 2, __u32)
-
-#define IB_USER_MAD_ENABLE_PKEY		_IO(IB_IOCTL_MAGIC, 3)
-
-#define IB_USER_MAD_REGISTER_AGENT2     _IOWR(IB_IOCTL_MAGIC, 4, \
-					      struct ib_user_mad_reg_req2)
-
-#endif /* IB_USER_MAD_H */
diff --git a/openflow/usr/include/rdma/ib_user_sa.h b/openflow/usr/include/rdma/ib_user_sa.h
deleted file mode 100644
index cfc7c9b..0000000
--- a/openflow/usr/include/rdma/ib_user_sa.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2005 Intel Corporation.  All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef IB_USER_SA_H
-#define IB_USER_SA_H
-
-#include <linux/types.h>
-
-enum {
-	IB_PATH_GMP		= 1,
-	IB_PATH_PRIMARY		= (1<<1),
-	IB_PATH_ALTERNATE	= (1<<2),
-	IB_PATH_OUTBOUND	= (1<<3),
-	IB_PATH_INBOUND		= (1<<4),
-	IB_PATH_INBOUND_REVERSE = (1<<5),
-	IB_PATH_BIDIRECTIONAL	= IB_PATH_OUTBOUND | IB_PATH_INBOUND_REVERSE
-};
-
-struct ib_path_rec_data {
-	__u32	flags;
-	__u32	reserved;
-	__u32	path_rec[16];
-};
-
-struct ib_user_path_rec {
-	__u8	dgid[16];
-	__u8	sgid[16];
-	__be16	dlid;
-	__be16	slid;
-	__u32	raw_traffic;
-	__be32	flow_label;
-	__u32	reversible;
-	__u32	mtu;
-	__be16	pkey;
-	__u8	hop_limit;
-	__u8	traffic_class;
-	__u8	numb_path;
-	__u8	sl;
-	__u8	mtu_selector;
-	__u8	rate_selector;
-	__u8	rate;
-	__u8	packet_life_time_selector;
-	__u8	packet_life_time;
-	__u8	preference;
-};
-
-#endif /* IB_USER_SA_H */
diff --git a/openflow/usr/include/rdma/ib_user_verbs.h b/openflow/usr/include/rdma/ib_user_verbs.h
deleted file mode 100644
index 8126c14..0000000
--- a/openflow/usr/include/rdma/ib_user_verbs.h
+++ /dev/null
@@ -1,948 +0,0 @@
-/*
- * Copyright (c) 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005, 2006 Cisco Systems.  All rights reserved.
- * Copyright (c) 2005 PathScale, Inc.  All rights reserved.
- * Copyright (c) 2006 Mellanox Technologies.  All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef IB_USER_VERBS_H
-#define IB_USER_VERBS_H
-
-#include <linux/types.h>
-
-/*
- * Increment this value if any changes that break userspace ABI
- * compatibility are made.
- */
-#define IB_USER_VERBS_ABI_VERSION	6
-#define IB_USER_VERBS_CMD_THRESHOLD    50
-
-enum {
-	IB_USER_VERBS_CMD_GET_CONTEXT,
-	IB_USER_VERBS_CMD_QUERY_DEVICE,
-	IB_USER_VERBS_CMD_QUERY_PORT,
-	IB_USER_VERBS_CMD_ALLOC_PD,
-	IB_USER_VERBS_CMD_DEALLOC_PD,
-	IB_USER_VERBS_CMD_CREATE_AH,
-	IB_USER_VERBS_CMD_MODIFY_AH,
-	IB_USER_VERBS_CMD_QUERY_AH,
-	IB_USER_VERBS_CMD_DESTROY_AH,
-	IB_USER_VERBS_CMD_REG_MR,
-	IB_USER_VERBS_CMD_REG_SMR,
-	IB_USER_VERBS_CMD_REREG_MR,
-	IB_USER_VERBS_CMD_QUERY_MR,
-	IB_USER_VERBS_CMD_DEREG_MR,
-	IB_USER_VERBS_CMD_ALLOC_MW,
-	IB_USER_VERBS_CMD_BIND_MW,
-	IB_USER_VERBS_CMD_DEALLOC_MW,
-	IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL,
-	IB_USER_VERBS_CMD_CREATE_CQ,
-	IB_USER_VERBS_CMD_RESIZE_CQ,
-	IB_USER_VERBS_CMD_DESTROY_CQ,
-	IB_USER_VERBS_CMD_POLL_CQ,
-	IB_USER_VERBS_CMD_PEEK_CQ,
-	IB_USER_VERBS_CMD_REQ_NOTIFY_CQ,
-	IB_USER_VERBS_CMD_CREATE_QP,
-	IB_USER_VERBS_CMD_QUERY_QP,
-	IB_USER_VERBS_CMD_MODIFY_QP,
-	IB_USER_VERBS_CMD_DESTROY_QP,
-	IB_USER_VERBS_CMD_POST_SEND,
-	IB_USER_VERBS_CMD_POST_RECV,
-	IB_USER_VERBS_CMD_ATTACH_MCAST,
-	IB_USER_VERBS_CMD_DETACH_MCAST,
-	IB_USER_VERBS_CMD_CREATE_SRQ,
-	IB_USER_VERBS_CMD_MODIFY_SRQ,
-	IB_USER_VERBS_CMD_QUERY_SRQ,
-	IB_USER_VERBS_CMD_DESTROY_SRQ,
-	IB_USER_VERBS_CMD_POST_SRQ_RECV,
-	IB_USER_VERBS_CMD_OPEN_XRCD,
-	IB_USER_VERBS_CMD_CLOSE_XRCD,
-	IB_USER_VERBS_CMD_CREATE_XSRQ,
-	IB_USER_VERBS_CMD_OPEN_QP,
-};
-
-enum {
-	IB_USER_VERBS_EX_CMD_QUERY_DEVICE = IB_USER_VERBS_CMD_QUERY_DEVICE,
-	IB_USER_VERBS_EX_CMD_CREATE_CQ = IB_USER_VERBS_CMD_CREATE_CQ,
-	IB_USER_VERBS_EX_CMD_CREATE_QP = IB_USER_VERBS_CMD_CREATE_QP,
-	IB_USER_VERBS_EX_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
-	IB_USER_VERBS_EX_CMD_DESTROY_FLOW,
-};
-
-/*
- * Make sure that all structs defined in this file remain laid out so
- * that they pack the same way on 32-bit and 64-bit architectures (to
- * avoid incompatibility between 32-bit userspace and 64-bit kernels).
- * Specifically:
- *  - Do not use pointer types -- pass pointers in __u64 instead.
- *  - Make sure that any structure larger than 4 bytes is padded to a
- *    multiple of 8 bytes.  Otherwise the structure size will be
- *    different between 32-bit and 64-bit architectures.
- */
-
-struct ib_uverbs_async_event_desc {
-	__u64 element;
-	__u32 event_type;	/* enum ib_event_type */
-	__u32 reserved;
-};
-
-struct ib_uverbs_comp_event_desc {
-	__u64 cq_handle;
-};
-
-/*
- * All commands from userspace should start with a __u32 command field
- * followed by __u16 in_words and out_words fields (which give the
- * length of the command block and response buffer if any in 32-bit
- * words).  The kernel driver will read these fields first and read
- * the rest of the command struct based on these value.
- */
-
-#define IB_USER_VERBS_CMD_COMMAND_MASK 0xff
-#define IB_USER_VERBS_CMD_FLAGS_MASK 0xff000000u
-#define IB_USER_VERBS_CMD_FLAGS_SHIFT 24
-
-#define IB_USER_VERBS_CMD_FLAG_EXTENDED 0x80
-
-struct ib_uverbs_cmd_hdr {
-	__u32 command;
-	__u16 in_words;
-	__u16 out_words;
-};
-
-struct ib_uverbs_ex_cmd_hdr {
-	__u64 response;
-	__u16 provider_in_words;
-	__u16 provider_out_words;
-	__u32 cmd_hdr_reserved;
-};
-
-struct ib_uverbs_get_context {
-	__u64 response;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_get_context_resp {
-	__u32 async_fd;
-	__u32 num_comp_vectors;
-};
-
-struct ib_uverbs_query_device {
-	__u64 response;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_query_device_resp {
-	__u64 fw_ver;
-	__be64 node_guid;
-	__be64 sys_image_guid;
-	__u64 max_mr_size;
-	__u64 page_size_cap;
-	__u32 vendor_id;
-	__u32 vendor_part_id;
-	__u32 hw_ver;
-	__u32 max_qp;
-	__u32 max_qp_wr;
-	__u32 device_cap_flags;
-	__u32 max_sge;
-	__u32 max_sge_rd;
-	__u32 max_cq;
-	__u32 max_cqe;
-	__u32 max_mr;
-	__u32 max_pd;
-	__u32 max_qp_rd_atom;
-	__u32 max_ee_rd_atom;
-	__u32 max_res_rd_atom;
-	__u32 max_qp_init_rd_atom;
-	__u32 max_ee_init_rd_atom;
-	__u32 atomic_cap;
-	__u32 max_ee;
-	__u32 max_rdd;
-	__u32 max_mw;
-	__u32 max_raw_ipv6_qp;
-	__u32 max_raw_ethy_qp;
-	__u32 max_mcast_grp;
-	__u32 max_mcast_qp_attach;
-	__u32 max_total_mcast_qp_attach;
-	__u32 max_ah;
-	__u32 max_fmr;
-	__u32 max_map_per_fmr;
-	__u32 max_srq;
-	__u32 max_srq_wr;
-	__u32 max_srq_sge;
-	__u16 max_pkeys;
-	__u8  local_ca_ack_delay;
-	__u8  phys_port_cnt;
-	__u8  reserved[4];
-};
-
-struct ib_uverbs_ex_query_device {
-	__u32 comp_mask;
-	__u32 reserved;
-};
-
-struct ib_uverbs_odp_caps {
-	__u64 general_caps;
-	struct {
-		__u32 rc_odp_caps;
-		__u32 uc_odp_caps;
-		__u32 ud_odp_caps;
-	} per_transport_caps;
-	__u32 reserved;
-};
-
-struct ib_uverbs_ex_query_device_resp {
-	struct ib_uverbs_query_device_resp base;
-	__u32 comp_mask;
-	__u32 response_length;
-	struct ib_uverbs_odp_caps odp_caps;
-	__u64 timestamp_mask;
-	__u64 hca_core_clock; /* in KHZ */
-};
-
-struct ib_uverbs_query_port {
-	__u64 response;
-	__u8  port_num;
-	__u8  reserved[7];
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_query_port_resp {
-	__u32 port_cap_flags;
-	__u32 max_msg_sz;
-	__u32 bad_pkey_cntr;
-	__u32 qkey_viol_cntr;
-	__u32 gid_tbl_len;
-	__u16 pkey_tbl_len;
-	__u16 lid;
-	__u16 sm_lid;
-	__u8  state;
-	__u8  max_mtu;
-	__u8  active_mtu;
-	__u8  lmc;
-	__u8  max_vl_num;
-	__u8  sm_sl;
-	__u8  subnet_timeout;
-	__u8  init_type_reply;
-	__u8  active_width;
-	__u8  active_speed;
-	__u8  phys_state;
-	__u8  link_layer;
-	__u8  reserved[2];
-};
-
-struct ib_uverbs_alloc_pd {
-	__u64 response;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_alloc_pd_resp {
-	__u32 pd_handle;
-};
-
-struct ib_uverbs_dealloc_pd {
-	__u32 pd_handle;
-};
-
-struct ib_uverbs_open_xrcd {
-	__u64 response;
-	__u32 fd;
-	__u32 oflags;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_open_xrcd_resp {
-	__u32 xrcd_handle;
-};
-
-struct ib_uverbs_close_xrcd {
-	__u32 xrcd_handle;
-};
-
-struct ib_uverbs_reg_mr {
-	__u64 response;
-	__u64 start;
-	__u64 length;
-	__u64 hca_va;
-	__u32 pd_handle;
-	__u32 access_flags;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_reg_mr_resp {
-	__u32 mr_handle;
-	__u32 lkey;
-	__u32 rkey;
-};
-
-struct ib_uverbs_rereg_mr {
-	__u64 response;
-	__u32 mr_handle;
-	__u32 flags;
-	__u64 start;
-	__u64 length;
-	__u64 hca_va;
-	__u32 pd_handle;
-	__u32 access_flags;
-};
-
-struct ib_uverbs_rereg_mr_resp {
-	__u32 lkey;
-	__u32 rkey;
-};
-
-struct ib_uverbs_dereg_mr {
-	__u32 mr_handle;
-};
-
-struct ib_uverbs_alloc_mw {
-	__u64 response;
-	__u32 pd_handle;
-	__u8  mw_type;
-	__u8  reserved[3];
-};
-
-struct ib_uverbs_alloc_mw_resp {
-	__u32 mw_handle;
-	__u32 rkey;
-};
-
-struct ib_uverbs_dealloc_mw {
-	__u32 mw_handle;
-};
-
-struct ib_uverbs_create_comp_channel {
-	__u64 response;
-};
-
-struct ib_uverbs_create_comp_channel_resp {
-	__u32 fd;
-};
-
-struct ib_uverbs_create_cq {
-	__u64 response;
-	__u64 user_handle;
-	__u32 cqe;
-	__u32 comp_vector;
-	__s32 comp_channel;
-	__u32 reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_ex_create_cq {
-	__u64 user_handle;
-	__u32 cqe;
-	__u32 comp_vector;
-	__s32 comp_channel;
-	__u32 comp_mask;
-	__u32 flags;
-	__u32 reserved;
-};
-
-struct ib_uverbs_create_cq_resp {
-	__u32 cq_handle;
-	__u32 cqe;
-};
-
-struct ib_uverbs_ex_create_cq_resp {
-	struct ib_uverbs_create_cq_resp base;
-	__u32 comp_mask;
-	__u32 response_length;
-};
-
-struct ib_uverbs_resize_cq {
-	__u64 response;
-	__u32 cq_handle;
-	__u32 cqe;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_resize_cq_resp {
-	__u32 cqe;
-	__u32 reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_poll_cq {
-	__u64 response;
-	__u32 cq_handle;
-	__u32 ne;
-};
-
-struct ib_uverbs_wc {
-	__u64 wr_id;
-	__u32 status;
-	__u32 opcode;
-	__u32 vendor_err;
-	__u32 byte_len;
-	union {
-		__u32 imm_data;
-		__u32 invalidate_rkey;
-	} ex;
-	__u32 qp_num;
-	__u32 src_qp;
-	__u32 wc_flags;
-	__u16 pkey_index;
-	__u16 slid;
-	__u8 sl;
-	__u8 dlid_path_bits;
-	__u8 port_num;
-	__u8 reserved;
-};
-
-struct ib_uverbs_poll_cq_resp {
-	__u32 count;
-	__u32 reserved;
-	struct ib_uverbs_wc wc[0];
-};
-
-struct ib_uverbs_req_notify_cq {
-	__u32 cq_handle;
-	__u32 solicited_only;
-};
-
-struct ib_uverbs_destroy_cq {
-	__u64 response;
-	__u32 cq_handle;
-	__u32 reserved;
-};
-
-struct ib_uverbs_destroy_cq_resp {
-	__u32 comp_events_reported;
-	__u32 async_events_reported;
-};
-
-struct ib_uverbs_global_route {
-	__u8  dgid[16];
-	__u32 flow_label;
-	__u8  sgid_index;
-	__u8  hop_limit;
-	__u8  traffic_class;
-	__u8  reserved;
-};
-
-struct ib_uverbs_ah_attr {
-	struct ib_uverbs_global_route grh;
-	__u16 dlid;
-	__u8  sl;
-	__u8  src_path_bits;
-	__u8  static_rate;
-	__u8  is_global;
-	__u8  port_num;
-	__u8  reserved;
-};
-
-struct ib_uverbs_qp_attr {
-	__u32	qp_attr_mask;
-	__u32	qp_state;
-	__u32	cur_qp_state;
-	__u32	path_mtu;
-	__u32	path_mig_state;
-	__u32	qkey;
-	__u32	rq_psn;
-	__u32	sq_psn;
-	__u32	dest_qp_num;
-	__u32	qp_access_flags;
-
-	struct ib_uverbs_ah_attr ah_attr;
-	struct ib_uverbs_ah_attr alt_ah_attr;
-
-	/* ib_qp_cap */
-	__u32	max_send_wr;
-	__u32	max_recv_wr;
-	__u32	max_send_sge;
-	__u32	max_recv_sge;
-	__u32	max_inline_data;
-
-	__u16	pkey_index;
-	__u16	alt_pkey_index;
-	__u8	en_sqd_async_notify;
-	__u8	sq_draining;
-	__u8	max_rd_atomic;
-	__u8	max_dest_rd_atomic;
-	__u8	min_rnr_timer;
-	__u8	port_num;
-	__u8	timeout;
-	__u8	retry_cnt;
-	__u8	rnr_retry;
-	__u8	alt_port_num;
-	__u8	alt_timeout;
-	__u8	reserved[5];
-};
-
-struct ib_uverbs_create_qp {
-	__u64 response;
-	__u64 user_handle;
-	__u32 pd_handle;
-	__u32 send_cq_handle;
-	__u32 recv_cq_handle;
-	__u32 srq_handle;
-	__u32 max_send_wr;
-	__u32 max_recv_wr;
-	__u32 max_send_sge;
-	__u32 max_recv_sge;
-	__u32 max_inline_data;
-	__u8  sq_sig_all;
-	__u8  qp_type;
-	__u8  is_srq;
-	__u8  reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_ex_create_qp {
-	__u64 user_handle;
-	__u32 pd_handle;
-	__u32 send_cq_handle;
-	__u32 recv_cq_handle;
-	__u32 srq_handle;
-	__u32 max_send_wr;
-	__u32 max_recv_wr;
-	__u32 max_send_sge;
-	__u32 max_recv_sge;
-	__u32 max_inline_data;
-	__u8  sq_sig_all;
-	__u8  qp_type;
-	__u8  is_srq;
-	__u8 reserved;
-	__u32 comp_mask;
-	__u32 create_flags;
-};
-
-struct ib_uverbs_open_qp {
-	__u64 response;
-	__u64 user_handle;
-	__u32 pd_handle;
-	__u32 qpn;
-	__u8  qp_type;
-	__u8  reserved[7];
-	__u64 driver_data[0];
-};
-
-/* also used for open response */
-struct ib_uverbs_create_qp_resp {
-	__u32 qp_handle;
-	__u32 qpn;
-	__u32 max_send_wr;
-	__u32 max_recv_wr;
-	__u32 max_send_sge;
-	__u32 max_recv_sge;
-	__u32 max_inline_data;
-	__u32 reserved;
-};
-
-struct ib_uverbs_ex_create_qp_resp {
-	struct ib_uverbs_create_qp_resp base;
-	__u32 comp_mask;
-	__u32 response_length;
-};
-
-/*
- * This struct needs to remain a multiple of 8 bytes to keep the
- * alignment of the modify QP parameters.
- */
-struct ib_uverbs_qp_dest {
-	__u8  dgid[16];
-	__u32 flow_label;
-	__u16 dlid;
-	__u16 reserved;
-	__u8  sgid_index;
-	__u8  hop_limit;
-	__u8  traffic_class;
-	__u8  sl;
-	__u8  src_path_bits;
-	__u8  static_rate;
-	__u8  is_global;
-	__u8  port_num;
-};
-
-struct ib_uverbs_query_qp {
-	__u64 response;
-	__u32 qp_handle;
-	__u32 attr_mask;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_query_qp_resp {
-	struct ib_uverbs_qp_dest dest;
-	struct ib_uverbs_qp_dest alt_dest;
-	__u32 max_send_wr;
-	__u32 max_recv_wr;
-	__u32 max_send_sge;
-	__u32 max_recv_sge;
-	__u32 max_inline_data;
-	__u32 qkey;
-	__u32 rq_psn;
-	__u32 sq_psn;
-	__u32 dest_qp_num;
-	__u32 qp_access_flags;
-	__u16 pkey_index;
-	__u16 alt_pkey_index;
-	__u8  qp_state;
-	__u8  cur_qp_state;
-	__u8  path_mtu;
-	__u8  path_mig_state;
-	__u8  sq_draining;
-	__u8  max_rd_atomic;
-	__u8  max_dest_rd_atomic;
-	__u8  min_rnr_timer;
-	__u8  port_num;
-	__u8  timeout;
-	__u8  retry_cnt;
-	__u8  rnr_retry;
-	__u8  alt_port_num;
-	__u8  alt_timeout;
-	__u8  sq_sig_all;
-	__u8  reserved[5];
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_modify_qp {
-	struct ib_uverbs_qp_dest dest;
-	struct ib_uverbs_qp_dest alt_dest;
-	__u32 qp_handle;
-	__u32 attr_mask;
-	__u32 qkey;
-	__u32 rq_psn;
-	__u32 sq_psn;
-	__u32 dest_qp_num;
-	__u32 qp_access_flags;
-	__u16 pkey_index;
-	__u16 alt_pkey_index;
-	__u8  qp_state;
-	__u8  cur_qp_state;
-	__u8  path_mtu;
-	__u8  path_mig_state;
-	__u8  en_sqd_async_notify;
-	__u8  max_rd_atomic;
-	__u8  max_dest_rd_atomic;
-	__u8  min_rnr_timer;
-	__u8  port_num;
-	__u8  timeout;
-	__u8  retry_cnt;
-	__u8  rnr_retry;
-	__u8  alt_port_num;
-	__u8  alt_timeout;
-	__u8  reserved[2];
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_modify_qp_resp {
-};
-
-struct ib_uverbs_destroy_qp {
-	__u64 response;
-	__u32 qp_handle;
-	__u32 reserved;
-};
-
-struct ib_uverbs_destroy_qp_resp {
-	__u32 events_reported;
-};
-
-/*
- * The ib_uverbs_sge structure isn't used anywhere, since we assume
- * the ib_sge structure is packed the same way on 32-bit and 64-bit
- * architectures in both kernel and user space.  It's just here to
- * document the ABI.
- */
-struct ib_uverbs_sge {
-	__u64 addr;
-	__u32 length;
-	__u32 lkey;
-};
-
-struct ib_uverbs_send_wr {
-	__u64 wr_id;
-	__u32 num_sge;
-	__u32 opcode;
-	__u32 send_flags;
-	union {
-		__u32 imm_data;
-		__u32 invalidate_rkey;
-	} ex;
-	union {
-		struct {
-			__u64 remote_addr;
-			__u32 rkey;
-			__u32 reserved;
-		} rdma;
-		struct {
-			__u64 remote_addr;
-			__u64 compare_add;
-			__u64 swap;
-			__u32 rkey;
-			__u32 reserved;
-		} atomic;
-		struct {
-			__u32 ah;
-			__u32 remote_qpn;
-			__u32 remote_qkey;
-			__u32 reserved;
-		} ud;
-	} wr;
-};
-
-struct ib_uverbs_post_send {
-	__u64 response;
-	__u32 qp_handle;
-	__u32 wr_count;
-	__u32 sge_count;
-	__u32 wqe_size;
-	struct ib_uverbs_send_wr send_wr[0];
-};
-
-struct ib_uverbs_post_send_resp {
-	__u32 bad_wr;
-};
-
-struct ib_uverbs_recv_wr {
-	__u64 wr_id;
-	__u32 num_sge;
-	__u32 reserved;
-};
-
-struct ib_uverbs_post_recv {
-	__u64 response;
-	__u32 qp_handle;
-	__u32 wr_count;
-	__u32 sge_count;
-	__u32 wqe_size;
-	struct ib_uverbs_recv_wr recv_wr[0];
-};
-
-struct ib_uverbs_post_recv_resp {
-	__u32 bad_wr;
-};
-
-struct ib_uverbs_post_srq_recv {
-	__u64 response;
-	__u32 srq_handle;
-	__u32 wr_count;
-	__u32 sge_count;
-	__u32 wqe_size;
-	struct ib_uverbs_recv_wr recv[0];
-};
-
-struct ib_uverbs_post_srq_recv_resp {
-	__u32 bad_wr;
-};
-
-struct ib_uverbs_create_ah {
-	__u64 response;
-	__u64 user_handle;
-	__u32 pd_handle;
-	__u32 reserved;
-	struct ib_uverbs_ah_attr attr;
-};
-
-struct ib_uverbs_create_ah_resp {
-	__u32 ah_handle;
-};
-
-struct ib_uverbs_destroy_ah {
-	__u32 ah_handle;
-};
-
-struct ib_uverbs_attach_mcast {
-	__u8  gid[16];
-	__u32 qp_handle;
-	__u16 mlid;
-	__u16 reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_detach_mcast {
-	__u8  gid[16];
-	__u32 qp_handle;
-	__u16 mlid;
-	__u16 reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_flow_spec_hdr {
-	__u32 type;
-	__u16 size;
-	__u16 reserved;
-	/* followed by flow_spec */
-	__u64 flow_spec_data[0];
-};
-
-struct ib_uverbs_flow_eth_filter {
-	__u8  dst_mac[6];
-	__u8  src_mac[6];
-	__be16 ether_type;
-	__be16 vlan_tag;
-};
-
-struct ib_uverbs_flow_spec_eth {
-	union {
-		struct ib_uverbs_flow_spec_hdr hdr;
-		struct {
-			__u32 type;
-			__u16 size;
-			__u16 reserved;
-		};
-	};
-	struct ib_uverbs_flow_eth_filter val;
-	struct ib_uverbs_flow_eth_filter mask;
-};
-
-struct ib_uverbs_flow_ipv4_filter {
-	__be32 src_ip;
-	__be32 dst_ip;
-};
-
-struct ib_uverbs_flow_spec_ipv4 {
-	union {
-		struct ib_uverbs_flow_spec_hdr hdr;
-		struct {
-			__u32 type;
-			__u16 size;
-			__u16 reserved;
-		};
-	};
-	struct ib_uverbs_flow_ipv4_filter val;
-	struct ib_uverbs_flow_ipv4_filter mask;
-};
-
-struct ib_uverbs_flow_tcp_udp_filter {
-	__be16 dst_port;
-	__be16 src_port;
-};
-
-struct ib_uverbs_flow_spec_tcp_udp {
-	union {
-		struct ib_uverbs_flow_spec_hdr hdr;
-		struct {
-			__u32 type;
-			__u16 size;
-			__u16 reserved;
-		};
-	};
-	struct ib_uverbs_flow_tcp_udp_filter val;
-	struct ib_uverbs_flow_tcp_udp_filter mask;
-};
-
-struct ib_uverbs_flow_attr {
-	__u32 type;
-	__u16 size;
-	__u16 priority;
-	__u8  num_of_specs;
-	__u8  reserved[2];
-	__u8  port;
-	__u32 flags;
-	/* Following are the optional layers according to user request
-	 * struct ib_flow_spec_xxx
-	 * struct ib_flow_spec_yyy
-	 */
-	struct ib_uverbs_flow_spec_hdr flow_specs[0];
-};
-
-struct ib_uverbs_create_flow  {
-	__u32 comp_mask;
-	__u32 qp_handle;
-	struct ib_uverbs_flow_attr flow_attr;
-};
-
-struct ib_uverbs_create_flow_resp {
-	__u32 comp_mask;
-	__u32 flow_handle;
-};
-
-struct ib_uverbs_destroy_flow  {
-	__u32 comp_mask;
-	__u32 flow_handle;
-};
-
-struct ib_uverbs_create_srq {
-	__u64 response;
-	__u64 user_handle;
-	__u32 pd_handle;
-	__u32 max_wr;
-	__u32 max_sge;
-	__u32 srq_limit;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_create_xsrq {
-	__u64 response;
-	__u64 user_handle;
-	__u32 srq_type;
-	__u32 pd_handle;
-	__u32 max_wr;
-	__u32 max_sge;
-	__u32 srq_limit;
-	__u32 reserved;
-	__u32 xrcd_handle;
-	__u32 cq_handle;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_create_srq_resp {
-	__u32 srq_handle;
-	__u32 max_wr;
-	__u32 max_sge;
-	__u32 srqn;
-};
-
-struct ib_uverbs_modify_srq {
-	__u32 srq_handle;
-	__u32 attr_mask;
-	__u32 max_wr;
-	__u32 srq_limit;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_query_srq {
-	__u64 response;
-	__u32 srq_handle;
-	__u32 reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_query_srq_resp {
-	__u32 max_wr;
-	__u32 max_sge;
-	__u32 srq_limit;
-	__u32 reserved;
-};
-
-struct ib_uverbs_destroy_srq {
-	__u64 response;
-	__u32 srq_handle;
-	__u32 reserved;
-};
-
-struct ib_uverbs_destroy_srq_resp {
-	__u32 events_reported;
-};
-
-#endif /* IB_USER_VERBS_H */
diff --git a/openflow/usr/include/rdma/rdma_netlink.h b/openflow/usr/include/rdma/rdma_netlink.h
deleted file mode 100644
index 3eb9347..0000000
--- a/openflow/usr/include/rdma/rdma_netlink.h
+++ /dev/null
@@ -1,214 +0,0 @@
-#ifndef _RDMA_NETLINK_H
-#define _RDMA_NETLINK_H
-
-#include <linux/types.h>
-
-enum {
-	RDMA_NL_RDMA_CM = 1,
-	RDMA_NL_NES,
-	RDMA_NL_C4IW,
-	RDMA_NL_LS,	/* RDMA Local Services */
-	RDMA_NL_NUM_CLIENTS
-};
-
-enum {
-	RDMA_NL_GROUP_CM = 1,
-	RDMA_NL_GROUP_IWPM,
-	RDMA_NL_GROUP_LS,
-	RDMA_NL_NUM_GROUPS
-};
-
-#define RDMA_NL_GET_CLIENT(type) ((type & (((1 << 6) - 1) << 10)) >> 10)
-#define RDMA_NL_GET_OP(type) (type & ((1 << 10) - 1))
-#define RDMA_NL_GET_TYPE(client, op) ((client << 10) + op)
-
-enum {
-	RDMA_NL_RDMA_CM_ID_STATS = 0,
-	RDMA_NL_RDMA_CM_NUM_OPS
-};
-
-enum {
-	RDMA_NL_RDMA_CM_ATTR_SRC_ADDR = 1,
-	RDMA_NL_RDMA_CM_ATTR_DST_ADDR,
-	RDMA_NL_RDMA_CM_NUM_ATTR,
-};
-
-/* iwarp port mapper op-codes */
-enum {
-	RDMA_NL_IWPM_REG_PID = 0,
-	RDMA_NL_IWPM_ADD_MAPPING,
-	RDMA_NL_IWPM_QUERY_MAPPING,
-	RDMA_NL_IWPM_REMOVE_MAPPING,
-	RDMA_NL_IWPM_REMOTE_INFO,
-	RDMA_NL_IWPM_HANDLE_ERR,
-	RDMA_NL_IWPM_MAPINFO,
-	RDMA_NL_IWPM_MAPINFO_NUM,
-	RDMA_NL_IWPM_NUM_OPS
-};
-
-struct rdma_cm_id_stats {
-	__u32	qp_num;
-	__u32	bound_dev_if;
-	__u32	port_space;
-	__s32	pid;
-	__u8	cm_state;
-	__u8	node_type;
-	__u8	port_num;
-	__u8	qp_type;
-};
-
-enum {
-	IWPM_NLA_REG_PID_UNSPEC = 0,
-	IWPM_NLA_REG_PID_SEQ,
-	IWPM_NLA_REG_IF_NAME,
-	IWPM_NLA_REG_IBDEV_NAME,
-	IWPM_NLA_REG_ULIB_NAME,
-	IWPM_NLA_REG_PID_MAX
-};
-
-enum {
-	IWPM_NLA_RREG_PID_UNSPEC = 0,
-	IWPM_NLA_RREG_PID_SEQ,
-	IWPM_NLA_RREG_IBDEV_NAME,
-	IWPM_NLA_RREG_ULIB_NAME,
-	IWPM_NLA_RREG_ULIB_VER,
-	IWPM_NLA_RREG_PID_ERR,
-	IWPM_NLA_RREG_PID_MAX
-
-};
-
-enum {
-	IWPM_NLA_MANAGE_MAPPING_UNSPEC = 0,
-	IWPM_NLA_MANAGE_MAPPING_SEQ,
-	IWPM_NLA_MANAGE_ADDR,
-	IWPM_NLA_MANAGE_MAPPED_LOC_ADDR,
-	IWPM_NLA_RMANAGE_MAPPING_ERR,
-	IWPM_NLA_RMANAGE_MAPPING_MAX
-};
-
-#define IWPM_NLA_MANAGE_MAPPING_MAX 3
-#define IWPM_NLA_QUERY_MAPPING_MAX  4
-#define IWPM_NLA_MAPINFO_SEND_MAX   3
-
-enum {
-	IWPM_NLA_QUERY_MAPPING_UNSPEC = 0,
-	IWPM_NLA_QUERY_MAPPING_SEQ,
-	IWPM_NLA_QUERY_LOCAL_ADDR,
-	IWPM_NLA_QUERY_REMOTE_ADDR,
-	IWPM_NLA_RQUERY_MAPPED_LOC_ADDR,
-	IWPM_NLA_RQUERY_MAPPED_REM_ADDR,
-	IWPM_NLA_RQUERY_MAPPING_ERR,
-	IWPM_NLA_RQUERY_MAPPING_MAX
-};
-
-enum {
-	IWPM_NLA_MAPINFO_REQ_UNSPEC = 0,
-	IWPM_NLA_MAPINFO_ULIB_NAME,
-	IWPM_NLA_MAPINFO_ULIB_VER,
-	IWPM_NLA_MAPINFO_REQ_MAX
-};
-
-enum {
-	IWPM_NLA_MAPINFO_UNSPEC = 0,
-	IWPM_NLA_MAPINFO_LOCAL_ADDR,
-	IWPM_NLA_MAPINFO_MAPPED_ADDR,
-	IWPM_NLA_MAPINFO_MAX
-};
-
-enum {
-	IWPM_NLA_MAPINFO_NUM_UNSPEC = 0,
-	IWPM_NLA_MAPINFO_SEQ,
-	IWPM_NLA_MAPINFO_SEND_NUM,
-	IWPM_NLA_MAPINFO_ACK_NUM,
-	IWPM_NLA_MAPINFO_NUM_MAX
-};
-
-enum {
-	IWPM_NLA_ERR_UNSPEC = 0,
-	IWPM_NLA_ERR_SEQ,
-	IWPM_NLA_ERR_CODE,
-	IWPM_NLA_ERR_MAX
-};
-
-/*
- * Local service operations:
- *   RESOLVE - The client requests the local service to resolve a path.
- *   SET_TIMEOUT - The local service requests the client to set the timeout.
- */
-enum {
-	RDMA_NL_LS_OP_RESOLVE = 0,
-	RDMA_NL_LS_OP_SET_TIMEOUT,
-	RDMA_NL_LS_NUM_OPS
-};
-
-/* Local service netlink message flags */
-#define RDMA_NL_LS_F_ERR	0x0100	/* Failed response */
-
-/*
- * Local service resolve operation family header.
- * The layout for the resolve operation:
- *    nlmsg header
- *    family header
- *    attributes
- */
-
-/*
- * Local service path use:
- * Specify how the path(s) will be used.
- *   ALL - For connected CM operation (6 pathrecords)
- *   UNIDIRECTIONAL - For unidirectional UD (1 pathrecord)
- *   GMP - For miscellaneous GMP like operation (at least 1 reversible
- *         pathrecord)
- */
-enum {
-	LS_RESOLVE_PATH_USE_ALL = 0,
-	LS_RESOLVE_PATH_USE_UNIDIRECTIONAL,
-	LS_RESOLVE_PATH_USE_GMP,
-	LS_RESOLVE_PATH_USE_MAX
-};
-
-#define LS_DEVICE_NAME_MAX 64
-
-struct rdma_ls_resolve_header {
-	__u8 device_name[LS_DEVICE_NAME_MAX];
-	__u8 port_num;
-	__u8 path_use;
-};
-
-/* Local service attribute type */
-#define RDMA_NLA_F_MANDATORY	(1 << 13)
-#define RDMA_NLA_TYPE_MASK	(~(NLA_F_NESTED | NLA_F_NET_BYTEORDER | \
-				  RDMA_NLA_F_MANDATORY))
-
-/*
- * Local service attributes:
- *   Attr Name       Size                       Byte order
- *   -----------------------------------------------------
- *   PATH_RECORD     struct ib_path_rec_data
- *   TIMEOUT         u32                        cpu
- *   SERVICE_ID      u64                        cpu
- *   DGID            u8[16]                     BE
- *   SGID            u8[16]                     BE
- *   TCLASS          u8
- *   PKEY            u16                        cpu
- *   QOS_CLASS       u16                        cpu
- */
-enum {
-	LS_NLA_TYPE_UNSPEC = 0,
-	LS_NLA_TYPE_PATH_RECORD,
-	LS_NLA_TYPE_TIMEOUT,
-	LS_NLA_TYPE_SERVICE_ID,
-	LS_NLA_TYPE_DGID,
-	LS_NLA_TYPE_SGID,
-	LS_NLA_TYPE_TCLASS,
-	LS_NLA_TYPE_PKEY,
-	LS_NLA_TYPE_QOS_CLASS,
-	LS_NLA_TYPE_MAX
-};
-
-/* Local service DGID/SGID attribute: big endian */
-struct rdma_nla_ls_gid {
-	__u8		gid[16];
-};
-
-#endif /* _RDMA_NETLINK_H */
diff --git a/openflow/usr/include/rdma/rdma_user_cm.h b/openflow/usr/include/rdma/rdma_user_cm.h
deleted file mode 100644
index 3066718..0000000
--- a/openflow/usr/include/rdma/rdma_user_cm.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (c) 2005-2006 Intel Corporation.  All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef RDMA_USER_CM_H
-#define RDMA_USER_CM_H
-
-#include <linux/types.h>
-#include <linux/socket.h>
-#include <linux/in6.h>
-#include <rdma/ib_user_verbs.h>
-#include <rdma/ib_user_sa.h>
-
-#define RDMA_USER_CM_ABI_VERSION	4
-
-#define RDMA_MAX_PRIVATE_DATA		256
-
-enum {
-	RDMA_USER_CM_CMD_CREATE_ID,
-	RDMA_USER_CM_CMD_DESTROY_ID,
-	RDMA_USER_CM_CMD_BIND_IP,
-	RDMA_USER_CM_CMD_RESOLVE_IP,
-	RDMA_USER_CM_CMD_RESOLVE_ROUTE,
-	RDMA_USER_CM_CMD_QUERY_ROUTE,
-	RDMA_USER_CM_CMD_CONNECT,
-	RDMA_USER_CM_CMD_LISTEN,
-	RDMA_USER_CM_CMD_ACCEPT,
-	RDMA_USER_CM_CMD_REJECT,
-	RDMA_USER_CM_CMD_DISCONNECT,
-	RDMA_USER_CM_CMD_INIT_QP_ATTR,
-	RDMA_USER_CM_CMD_GET_EVENT,
-	RDMA_USER_CM_CMD_GET_OPTION,
-	RDMA_USER_CM_CMD_SET_OPTION,
-	RDMA_USER_CM_CMD_NOTIFY,
-	RDMA_USER_CM_CMD_JOIN_IP_MCAST,
-	RDMA_USER_CM_CMD_LEAVE_MCAST,
-	RDMA_USER_CM_CMD_MIGRATE_ID,
-	RDMA_USER_CM_CMD_QUERY,
-	RDMA_USER_CM_CMD_BIND,
-	RDMA_USER_CM_CMD_RESOLVE_ADDR,
-	RDMA_USER_CM_CMD_JOIN_MCAST
-};
-
-/*
- * command ABI structures.
- */
-struct rdma_ucm_cmd_hdr {
-	__u32 cmd;
-	__u16 in;
-	__u16 out;
-};
-
-struct rdma_ucm_create_id {
-	__u64 uid;
-	__u64 response;
-	__u16 ps;
-	__u8  qp_type;
-	__u8  reserved[5];
-};
-
-struct rdma_ucm_create_id_resp {
-	__u32 id;
-};
-
-struct rdma_ucm_destroy_id {
-	__u64 response;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct rdma_ucm_destroy_id_resp {
-	__u32 events_reported;
-};
-
-struct rdma_ucm_bind_ip {
-	__u64 response;
-	struct sockaddr_in6 addr;
-	__u32 id;
-};
-
-struct rdma_ucm_bind {
-	__u32 id;
-	__u16 addr_size;
-	__u16 reserved;
-	struct sockaddr_storage addr;
-};
-
-struct rdma_ucm_resolve_ip {
-	struct sockaddr_in6 src_addr;
-	struct sockaddr_in6 dst_addr;
-	__u32 id;
-	__u32 timeout_ms;
-};
-
-struct rdma_ucm_resolve_addr {
-	__u32 id;
-	__u32 timeout_ms;
-	__u16 src_size;
-	__u16 dst_size;
-	__u32 reserved;
-	struct sockaddr_storage src_addr;
-	struct sockaddr_storage dst_addr;
-};
-
-struct rdma_ucm_resolve_route {
-	__u32 id;
-	__u32 timeout_ms;
-};
-
-enum {
-	RDMA_USER_CM_QUERY_ADDR,
-	RDMA_USER_CM_QUERY_PATH,
-	RDMA_USER_CM_QUERY_GID
-};
-
-struct rdma_ucm_query {
-	__u64 response;
-	__u32 id;
-	__u32 option;
-};
-
-struct rdma_ucm_query_route_resp {
-	__u64 node_guid;
-	struct ib_user_path_rec ib_route[2];
-	struct sockaddr_in6 src_addr;
-	struct sockaddr_in6 dst_addr;
-	__u32 num_paths;
-	__u8 port_num;
-	__u8 reserved[3];
-};
-
-struct rdma_ucm_query_addr_resp {
-	__u64 node_guid;
-	__u8  port_num;
-	__u8  reserved;
-	__u16 pkey;
-	__u16 src_size;
-	__u16 dst_size;
-	struct sockaddr_storage src_addr;
-	struct sockaddr_storage dst_addr;
-};
-
-struct rdma_ucm_query_path_resp {
-	__u32 num_paths;
-	__u32 reserved;
-	struct ib_path_rec_data path_data[0];
-};
-
-struct rdma_ucm_conn_param {
-	__u32 qp_num;
-	__u32 qkey;
-	__u8  private_data[RDMA_MAX_PRIVATE_DATA];
-	__u8  private_data_len;
-	__u8  srq;
-	__u8  responder_resources;
-	__u8  initiator_depth;
-	__u8  flow_control;
-	__u8  retry_count;
-	__u8  rnr_retry_count;
-	__u8  valid;
-};
-
-struct rdma_ucm_ud_param {
-	__u32 qp_num;
-	__u32 qkey;
-	struct ib_uverbs_ah_attr ah_attr;
-	__u8  private_data[RDMA_MAX_PRIVATE_DATA];
-	__u8  private_data_len;
-	__u8  reserved[7];
-};
-
-struct rdma_ucm_connect {
-	struct rdma_ucm_conn_param conn_param;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct rdma_ucm_listen {
-	__u32 id;
-	__u32 backlog;
-};
-
-struct rdma_ucm_accept {
-	__u64 uid;
-	struct rdma_ucm_conn_param conn_param;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct rdma_ucm_reject {
-	__u32 id;
-	__u8  private_data_len;
-	__u8  reserved[3];
-	__u8  private_data[RDMA_MAX_PRIVATE_DATA];
-};
-
-struct rdma_ucm_disconnect {
-	__u32 id;
-};
-
-struct rdma_ucm_init_qp_attr {
-	__u64 response;
-	__u32 id;
-	__u32 qp_state;
-};
-
-struct rdma_ucm_notify {
-	__u32 id;
-	__u32 event;
-};
-
-struct rdma_ucm_join_ip_mcast {
-	__u64 response;		/* rdma_ucm_create_id_resp */
-	__u64 uid;
-	struct sockaddr_in6 addr;
-	__u32 id;
-};
-
-struct rdma_ucm_join_mcast {
-	__u64 response;		/* rdma_ucma_create_id_resp */
-	__u64 uid;
-	__u32 id;
-	__u16 addr_size;
-	__u16 reserved;
-	struct sockaddr_storage addr;
-};
-
-struct rdma_ucm_get_event {
-	__u64 response;
-};
-
-struct rdma_ucm_event_resp {
-	__u64 uid;
-	__u32 id;
-	__u32 event;
-	__u32 status;
-	union {
-		struct rdma_ucm_conn_param conn;
-		struct rdma_ucm_ud_param   ud;
-	} param;
-};
-
-/* Option levels */
-enum {
-	RDMA_OPTION_ID		= 0,
-	RDMA_OPTION_IB		= 1
-};
-
-/* Option details */
-enum {
-	RDMA_OPTION_ID_TOS	 = 0,
-	RDMA_OPTION_ID_REUSEADDR = 1,
-	RDMA_OPTION_ID_AFONLY	 = 2,
-	RDMA_OPTION_IB_PATH	 = 1
-};
-
-struct rdma_ucm_set_option {
-	__u64 optval;
-	__u32 id;
-	__u32 level;
-	__u32 optname;
-	__u32 optlen;
-};
-
-struct rdma_ucm_migrate_id {
-	__u64 response;
-	__u32 id;
-	__u32 fd;
-};
-
-struct rdma_ucm_migrate_resp {
-	__u32 events_reported;
-};
-
-#endif /* RDMA_USER_CM_H */
diff --git a/openflow/usr/include/re_comp.h b/openflow/usr/include/re_comp.h
deleted file mode 100644
index 1537125..0000000
--- a/openflow/usr/include/re_comp.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*  Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _RE_COMP_H
-#define _RE_COMP_H	1
-
-/* This is only a wrapper around the <regex.h> file.  XPG4.2 mentions
-   this name.  */
-#include <regex.h>
-
-#endif /* re_comp.h */
diff --git a/openflow/usr/include/readline/chardefs.h b/openflow/usr/include/readline/chardefs.h
deleted file mode 100644
index 1904c67..0000000
--- a/openflow/usr/include/readline/chardefs.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* chardefs.h -- Character definitions for readline. */
-
-/* Copyright (C) 1994-2009 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library (Readline), a library
-   for reading lines of text with interactive input and history editing.
-
-   Readline is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Readline is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _CHARDEFS_H_
-#define _CHARDEFS_H_
-
-#include <ctype.h>
-
-#include <string.h>
-
-#ifndef whitespace
-#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-#endif
-
-#ifdef CTRL
-#  undef CTRL
-#endif
-#ifdef UNCTRL
-#  undef UNCTRL
-#endif
-
-/* Some character stuff. */
-#define control_character_threshold 0x020   /* Smaller than this is control. */
-#define control_character_mask 0x1f	    /* 0x20 - 1 */
-#define meta_character_threshold 0x07f	    /* Larger than this is Meta. */
-#define control_character_bit 0x40	    /* 0x000000, must be off. */
-#define meta_character_bit 0x080	    /* x0000000, must be on. */
-#define largest_char 255		    /* Largest character value. */
-
-#define CTRL_CHAR(c) ((c) < control_character_threshold && (((c) & 0x80) == 0))
-#define META_CHAR(c) ((c) > meta_character_threshold && (c) <= largest_char)
-
-#define CTRL(c) ((c) & control_character_mask)
-#define META(c) ((c) | meta_character_bit)
-
-#define UNMETA(c) ((c) & (~meta_character_bit))
-#define UNCTRL(c) _rl_to_upper(((c)|control_character_bit))
-
-#if defined STDC_HEADERS || (!defined (isascii) && !defined (HAVE_ISASCII))
-#  define IN_CTYPE_DOMAIN(c) 1
-#else
-#  define IN_CTYPE_DOMAIN(c) isascii(c)
-#endif
-
-#if !defined (isxdigit) && !defined (HAVE_ISXDIGIT) && !defined (__cplusplus)
-#  define isxdigit(c)   (isdigit((c)) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
-#endif
-
-#if defined (CTYPE_NON_ASCII)
-#  define NON_NEGATIVE(c) 1
-#else
-#  define NON_NEGATIVE(c) ((unsigned char)(c) == (c))
-#endif
-
-/* Some systems define these; we want our definitions. */
-#undef ISPRINT
-
-/* Beware:  these only work with single-byte ASCII characters. */
-
-#define ISALNUM(c)	(IN_CTYPE_DOMAIN (c) && isalnum (c))
-#define ISALPHA(c)	(IN_CTYPE_DOMAIN (c) && isalpha (c))
-#define ISDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isdigit (c))
-#define ISLOWER(c)	(IN_CTYPE_DOMAIN (c) && islower (c))
-#define ISPRINT(c)	(IN_CTYPE_DOMAIN (c) && isprint (c))
-#define ISUPPER(c)	(IN_CTYPE_DOMAIN (c) && isupper (c))
-#define ISXDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isxdigit (c))
-
-#define _rl_lowercase_p(c)	(NON_NEGATIVE(c) && ISLOWER(c))
-#define _rl_uppercase_p(c)	(NON_NEGATIVE(c) && ISUPPER(c))
-#define _rl_digit_p(c)		((c) >= '0' && (c) <= '9')
-
-#define _rl_pure_alphabetic(c)	(NON_NEGATIVE(c) && ISALPHA(c))
-#define ALPHABETIC(c)		(NON_NEGATIVE(c) && ISALNUM(c))
-
-#ifndef _rl_to_upper
-#  define _rl_to_upper(c) (_rl_lowercase_p(c) ? toupper((unsigned char)c) : (c))
-#  define _rl_to_lower(c) (_rl_uppercase_p(c) ? tolower((unsigned char)c) : (c))
-#endif
-
-#ifndef _rl_digit_value
-#  define _rl_digit_value(x) ((x) - '0')
-#endif
-
-#ifndef _rl_isident
-#  define _rl_isident(c) (ISALNUM(c) || (c) == '_')
-#endif
-
-#ifndef ISOCTAL
-#  define ISOCTAL(c)	((c) >= '0' && (c) <= '7')
-#endif
-#define OCTVALUE(c)	((c) - '0')
-
-#define HEXVALUE(c) \
-  (((c) >= 'a' && (c) <= 'f') \
-  	? (c)-'a'+10 \
-  	: (c) >= 'A' && (c) <= 'F' ? (c)-'A'+10 : (c)-'0')
-
-#ifndef NEWLINE
-#define NEWLINE '\n'
-#endif
-
-#ifndef RETURN
-#define RETURN CTRL('M')
-#endif
-
-#ifndef RUBOUT
-#define RUBOUT 0x7f
-#endif
-
-#ifndef TAB
-#define TAB '\t'
-#endif
-
-#ifdef ABORT_CHAR
-#undef ABORT_CHAR
-#endif
-#define ABORT_CHAR CTRL('G')
-
-#ifdef PAGE
-#undef PAGE
-#endif
-#define PAGE CTRL('L')
-
-#ifdef SPACE
-#undef SPACE
-#endif
-#define SPACE ' '	/* XXX - was 0x20 */
-
-#ifdef ESC
-#undef ESC
-#endif
-#define ESC CTRL('[')
-
-#endif  /* _CHARDEFS_H_ */
diff --git a/openflow/usr/include/readline/history.h b/openflow/usr/include/readline/history.h
deleted file mode 100644
index f25393d..0000000
--- a/openflow/usr/include/readline/history.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* history.h -- the names of functions that you can call in history. */
-
-/* Copyright (C) 1989-2009 Free Software Foundation, Inc.
-
-   This file contains the GNU History Library (History), a set of
-   routines for managing the text of previously typed lines.
-
-   History is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   History is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with History.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _HISTORY_H_
-#define _HISTORY_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <time.h>		/* XXX - for history timestamp code */
-
-#if defined READLINE_LIBRARY
-#  include "rlstdc.h"
-#  include "rltypedefs.h"
-#else
-#  include <stdio.h>
-#  include <readline/rlstdc.h>
-#  include <readline/rltypedefs.h>
-#endif
-
-#ifdef __STDC__
-typedef void *histdata_t;
-#else
-typedef char *histdata_t;
-#endif
-
-/* The structure used to store a history entry. */
-typedef struct _hist_entry {
-  char *line;
-  char *timestamp;		/* char * rather than time_t for read/write */
-  histdata_t data;
-} HIST_ENTRY;
-
-/* Size of the history-library-managed space in history entry HS. */
-#define HISTENT_BYTES(hs)	(strlen ((hs)->line) + strlen ((hs)->timestamp))
-
-/* A structure used to pass the current state of the history stuff around. */
-typedef struct _hist_state {
-  HIST_ENTRY **entries;		/* Pointer to the entries themselves. */
-  int offset;			/* The location pointer within this array. */
-  int length;			/* Number of elements within this array. */
-  int size;			/* Number of slots allocated to this array. */
-  int flags;
-} HISTORY_STATE;
-
-/* Flag values for the `flags' member of HISTORY_STATE. */
-#define HS_STIFLED	0x01
-
-/* Initialization and state management. */
-
-/* Begin a session in which the history functions might be used.  This
-   just initializes the interactive variables. */
-extern void using_history PARAMS((void));
-
-/* Return the current HISTORY_STATE of the history. */
-extern HISTORY_STATE *history_get_history_state PARAMS((void));
-
-/* Set the state of the current history array to STATE. */
-extern void history_set_history_state PARAMS((HISTORY_STATE *));
-
-/* Manage the history list. */
-
-/* Place STRING at the end of the history list.
-   The associated data field (if any) is set to NULL. */
-extern void add_history PARAMS((const char *));
-
-/* Change the timestamp associated with the most recent history entry to
-   STRING. */
-extern void add_history_time PARAMS((const char *));
-
-/* A reasonably useless function, only here for completeness.  WHICH
-   is the magic number that tells us which element to delete.  The
-   elements are numbered from 0. */
-extern HIST_ENTRY *remove_history PARAMS((int));
-
-/* Free the history entry H and return any application-specific data
-   associated with it. */
-extern histdata_t free_history_entry PARAMS((HIST_ENTRY *));
-
-/* Make the history entry at WHICH have LINE and DATA.  This returns
-   the old entry so you can dispose of the data.  In the case of an
-   invalid WHICH, a NULL pointer is returned. */
-extern HIST_ENTRY *replace_history_entry PARAMS((int, const char *, histdata_t));
-
-/* Clear the history list and start over. */
-extern void clear_history PARAMS((void));
-
-/* Stifle the history list, remembering only MAX number of entries. */
-extern void stifle_history PARAMS((int));
-
-/* Stop stifling the history.  This returns the previous amount the
-   history was stifled by.  The value is positive if the history was
-   stifled, negative if it wasn't. */
-extern int unstifle_history PARAMS((void));
-
-/* Return 1 if the history is stifled, 0 if it is not. */
-extern int history_is_stifled PARAMS((void));
-
-/* Information about the history list. */
-
-/* Return a NULL terminated array of HIST_ENTRY which is the current input
-   history.  Element 0 of this list is the beginning of time.  If there
-   is no history, return NULL. */
-extern HIST_ENTRY **history_list PARAMS((void));
-
-/* Returns the number which says what history element we are now
-   looking at.  */
-extern int where_history PARAMS((void));
-  
-/* Return the history entry at the current position, as determined by
-   history_offset.  If there is no entry there, return a NULL pointer. */
-extern HIST_ENTRY *current_history PARAMS((void));
-
-/* Return the history entry which is logically at OFFSET in the history
-   array.  OFFSET is relative to history_base. */
-extern HIST_ENTRY *history_get PARAMS((int));
-
-/* Return the timestamp associated with the HIST_ENTRY * passed as an
-   argument */
-extern time_t history_get_time PARAMS((HIST_ENTRY *));
-
-/* Return the number of bytes that the primary history entries are using.
-   This just adds up the lengths of the_history->lines. */
-extern int history_total_bytes PARAMS((void));
-
-/* Moving around the history list. */
-
-/* Set the position in the history list to POS. */
-extern int history_set_pos PARAMS((int));
-
-/* Back up history_offset to the previous history entry, and return
-   a pointer to that entry.  If there is no previous entry, return
-   a NULL pointer. */
-extern HIST_ENTRY *previous_history PARAMS((void));
-
-/* Move history_offset forward to the next item in the input_history,
-   and return the a pointer to that entry.  If there is no next entry,
-   return a NULL pointer. */
-extern HIST_ENTRY *next_history PARAMS((void));
-
-/* Searching the history list. */
-
-/* Search the history for STRING, starting at history_offset.
-   If DIRECTION < 0, then the search is through previous entries,
-   else through subsequent.  If the string is found, then
-   current_history () is the history entry, and the value of this function
-   is the offset in the line of that history entry that the string was
-   found in.  Otherwise, nothing is changed, and a -1 is returned. */
-extern int history_search PARAMS((const char *, int));
-
-/* Search the history for STRING, starting at history_offset.
-   The search is anchored: matching lines must begin with string.
-   DIRECTION is as in history_search(). */
-extern int history_search_prefix PARAMS((const char *, int));
-
-/* Search for STRING in the history list, starting at POS, an
-   absolute index into the list.  DIR, if negative, says to search
-   backwards from POS, else forwards.
-   Returns the absolute index of the history element where STRING
-   was found, or -1 otherwise. */
-extern int history_search_pos PARAMS((const char *, int, int));
-
-/* Managing the history file. */
-
-/* Add the contents of FILENAME to the history list, a line at a time.
-   If FILENAME is NULL, then read from ~/.history.  Returns 0 if
-   successful, or errno if not. */
-extern int read_history PARAMS((const char *));
-
-/* Read a range of lines from FILENAME, adding them to the history list.
-   Start reading at the FROM'th line and end at the TO'th.  If FROM
-   is zero, start at the beginning.  If TO is less than FROM, read
-   until the end of the file.  If FILENAME is NULL, then read from
-   ~/.history.  Returns 0 if successful, or errno if not. */
-extern int read_history_range PARAMS((const char *, int, int));
-
-/* Write the current history to FILENAME.  If FILENAME is NULL,
-   then write the history list to ~/.history.  Values returned
-   are as in read_history ().  */
-extern int write_history PARAMS((const char *));
-
-/* Append NELEMENT entries to FILENAME.  The entries appended are from
-   the end of the list minus NELEMENTs up to the end of the list. */
-extern int append_history PARAMS((int, const char *));
-
-/* Truncate the history file, leaving only the last NLINES lines. */
-extern int history_truncate_file PARAMS((const char *, int));
-
-/* History expansion. */
-
-/* Expand the string STRING, placing the result into OUTPUT, a pointer
-   to a string.  Returns:
-
-   0) If no expansions took place (or, if the only change in
-      the text was the de-slashifying of the history expansion
-      character)
-   1) If expansions did take place
-  -1) If there was an error in expansion.
-   2) If the returned line should just be printed.
-
-  If an error occurred in expansion, then OUTPUT contains a descriptive
-  error message. */
-extern int history_expand PARAMS((char *, char **));
-
-/* Extract a string segment consisting of the FIRST through LAST
-   arguments present in STRING.  Arguments are broken up as in
-   the shell. */
-extern char *history_arg_extract PARAMS((int, int, const char *));
-
-/* Return the text of the history event beginning at the current
-   offset into STRING.  Pass STRING with *INDEX equal to the
-   history_expansion_char that begins this specification.
-   DELIMITING_QUOTE is a character that is allowed to end the string
-   specification for what to search for in addition to the normal
-   characters `:', ` ', `\t', `\n', and sometimes `?'. */
-extern char *get_history_event PARAMS((const char *, int *, int));
-
-/* Return an array of tokens, much as the shell might.  The tokens are
-   parsed out of STRING. */
-extern char **history_tokenize PARAMS((const char *));
-
-/* Exported history variables. */
-extern int history_base;
-extern int history_length;
-extern int history_max_entries;
-extern char history_expansion_char;
-extern char history_subst_char;
-extern char *history_word_delimiters;
-extern char history_comment_char;
-extern char *history_no_expand_chars;
-extern char *history_search_delimiter_chars;
-extern int history_quotes_inhibit_expansion;
-
-extern int history_write_timestamps;
-
-/* Backwards compatibility */
-extern int max_input_history;
-
-/* If set, this function is called to decide whether or not a particular
-   history expansion should be treated as a special case for the calling
-   application and not expanded. */
-extern rl_linebuf_func_t *history_inhibit_expansion_function;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_HISTORY_H_ */
diff --git a/openflow/usr/include/readline/keymaps.h b/openflow/usr/include/readline/keymaps.h
deleted file mode 100644
index af8d5d9..0000000
--- a/openflow/usr/include/readline/keymaps.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* keymaps.h -- Manipulation of readline keymaps. */
-
-/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library (Readline), a library
-   for reading lines of text with interactive input and history editing.      
-
-   Readline is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Readline is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _KEYMAPS_H_
-#define _KEYMAPS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined (READLINE_LIBRARY)
-#  include "rlstdc.h"
-#  include "chardefs.h"
-#  include "rltypedefs.h"
-#else
-#  include <readline/rlstdc.h>
-#  include <readline/chardefs.h>
-#  include <readline/rltypedefs.h>
-#endif
-
-/* A keymap contains one entry for each key in the ASCII set.
-   Each entry consists of a type and a pointer.
-   FUNCTION is the address of a function to run, or the
-   address of a keymap to indirect through.
-   TYPE says which kind of thing FUNCTION is. */
-typedef struct _keymap_entry {
-  char type;
-  rl_command_func_t *function;
-} KEYMAP_ENTRY;
-
-/* This must be large enough to hold bindings for all of the characters
-   in a desired character set (e.g, 128 for ASCII, 256 for ISO Latin-x,
-   and so on) plus one for subsequence matching. */
-#define KEYMAP_SIZE 257
-#define ANYOTHERKEY KEYMAP_SIZE-1
-
-typedef KEYMAP_ENTRY KEYMAP_ENTRY_ARRAY[KEYMAP_SIZE];
-typedef KEYMAP_ENTRY *Keymap;
-
-/* The values that TYPE can have in a keymap entry. */
-#define ISFUNC 0
-#define ISKMAP 1
-#define ISMACR 2
-
-extern KEYMAP_ENTRY_ARRAY emacs_standard_keymap, emacs_meta_keymap, emacs_ctlx_keymap;
-extern KEYMAP_ENTRY_ARRAY vi_insertion_keymap, vi_movement_keymap;
-
-/* Return a new, empty keymap.
-   Free it with free() when you are done. */
-extern Keymap rl_make_bare_keymap PARAMS((void));
-
-/* Return a new keymap which is a copy of MAP. */
-extern Keymap rl_copy_keymap PARAMS((Keymap));
-
-/* Return a new keymap with the printing characters bound to rl_insert,
-   the lowercase Meta characters bound to run their equivalents, and
-   the Meta digits bound to produce numeric arguments. */
-extern Keymap rl_make_keymap PARAMS((void));
-
-/* Free the storage associated with a keymap. */
-extern void rl_discard_keymap PARAMS((Keymap));
-
-/* These functions actually appear in bind.c */
-
-/* Return the keymap corresponding to a given name.  Names look like
-   `emacs' or `emacs-meta' or `vi-insert'.  */
-extern Keymap rl_get_keymap_by_name PARAMS((const char *));
-
-/* Return the current keymap. */
-extern Keymap rl_get_keymap PARAMS((void));
-
-/* Set the current keymap to MAP. */
-extern void rl_set_keymap PARAMS((Keymap));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _KEYMAPS_H_ */
diff --git a/openflow/usr/include/readline/readline.h b/openflow/usr/include/readline/readline.h
deleted file mode 100644
index a1988df..0000000
--- a/openflow/usr/include/readline/readline.h
+++ /dev/null
@@ -1,924 +0,0 @@
-/* Readline.h -- the names of functions callable from within readline. */
-
-/* Copyright (C) 1987-2013 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library (Readline), a library
-   for reading lines of text with interactive input and history editing.      
-
-   Readline is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Readline is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#if !defined (_READLINE_H_)
-#define _READLINE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined (READLINE_LIBRARY)
-#  include "rlstdc.h"
-#  include "rltypedefs.h"
-#  include "keymaps.h"
-#  include "tilde.h"
-#else
-#  include <stdio.h>
-#  include <readline/rlstdc.h>
-#  include <readline/rltypedefs.h>
-#  include <readline/keymaps.h>
-#  include <readline/tilde.h>
-#endif
-
-/* Hex-encoded Readline version number. */
-#define RL_READLINE_VERSION	0x0603		/* Readline 6.3 */
-#define RL_VERSION_MAJOR	6
-#define RL_VERSION_MINOR	3
-
-/* Readline data structures. */
-
-/* Maintaining the state of undo.  We remember individual deletes and inserts
-   on a chain of things to do. */
-
-/* The actions that undo knows how to undo.  Notice that UNDO_DELETE means
-   to insert some text, and UNDO_INSERT means to delete some text.   I.e.,
-   the code tells undo what to undo, not how to undo it. */
-enum undo_code { UNDO_DELETE, UNDO_INSERT, UNDO_BEGIN, UNDO_END };
-
-/* What an element of THE_UNDO_LIST looks like. */
-typedef struct undo_list {
-  struct undo_list *next;
-  int start, end;		/* Where the change took place. */
-  char *text;			/* The text to insert, if undoing a delete. */
-  enum undo_code what;		/* Delete, Insert, Begin, End. */
-} UNDO_LIST;
-
-/* The current undo list for RL_LINE_BUFFER. */
-extern UNDO_LIST *rl_undo_list;
-
-/* The data structure for mapping textual names to code addresses. */
-typedef struct _funmap {
-  const char *name;
-  rl_command_func_t *function;
-} FUNMAP;
-
-extern FUNMAP **funmap;
-
-/* **************************************************************** */
-/*								    */
-/*	     Functions available to bind to key sequences	    */
-/*								    */
-/* **************************************************************** */
-
-/* Bindable commands for numeric arguments. */
-extern int rl_digit_argument PARAMS((int, int));
-extern int rl_universal_argument PARAMS((int, int));
-
-/* Bindable commands for moving the cursor. */
-extern int rl_forward_byte PARAMS((int, int));
-extern int rl_forward_char PARAMS((int, int));
-extern int rl_forward PARAMS((int, int));
-extern int rl_backward_byte PARAMS((int, int));
-extern int rl_backward_char PARAMS((int, int));
-extern int rl_backward PARAMS((int, int));
-extern int rl_beg_of_line PARAMS((int, int));
-extern int rl_end_of_line PARAMS((int, int));
-extern int rl_forward_word PARAMS((int, int));
-extern int rl_backward_word PARAMS((int, int));
-extern int rl_refresh_line PARAMS((int, int));
-extern int rl_clear_screen PARAMS((int, int));
-extern int rl_skip_csi_sequence PARAMS((int, int));
-extern int rl_arrow_keys PARAMS((int, int));
-
-/* Bindable commands for inserting and deleting text. */
-extern int rl_insert PARAMS((int, int));
-extern int rl_quoted_insert PARAMS((int, int));
-extern int rl_tab_insert PARAMS((int, int));
-extern int rl_newline PARAMS((int, int));
-extern int rl_do_lowercase_version PARAMS((int, int));
-extern int rl_rubout PARAMS((int, int));
-extern int rl_delete PARAMS((int, int));
-extern int rl_rubout_or_delete PARAMS((int, int));
-extern int rl_delete_horizontal_space PARAMS((int, int));
-extern int rl_delete_or_show_completions PARAMS((int, int));
-extern int rl_insert_comment PARAMS((int, int));
-
-/* Bindable commands for changing case. */
-extern int rl_upcase_word PARAMS((int, int));
-extern int rl_downcase_word PARAMS((int, int));
-extern int rl_capitalize_word PARAMS((int, int));
-
-/* Bindable commands for transposing characters and words. */
-extern int rl_transpose_words PARAMS((int, int));
-extern int rl_transpose_chars PARAMS((int, int));
-
-/* Bindable commands for searching within a line. */
-extern int rl_char_search PARAMS((int, int));
-extern int rl_backward_char_search PARAMS((int, int));
-
-/* Bindable commands for readline's interface to the command history. */
-extern int rl_beginning_of_history PARAMS((int, int));
-extern int rl_end_of_history PARAMS((int, int));
-extern int rl_get_next_history PARAMS((int, int));
-extern int rl_get_previous_history PARAMS((int, int));
-
-/* Bindable commands for managing the mark and region. */
-extern int rl_set_mark PARAMS((int, int));
-extern int rl_exchange_point_and_mark PARAMS((int, int));
-
-/* Bindable commands to set the editing mode (emacs or vi). */
-extern int rl_vi_editing_mode PARAMS((int, int));
-extern int rl_emacs_editing_mode PARAMS((int, int));
-
-/* Bindable commands to change the insert mode (insert or overwrite) */
-extern int rl_overwrite_mode PARAMS((int, int));
-
-/* Bindable commands for managing key bindings. */
-extern int rl_re_read_init_file PARAMS((int, int));
-extern int rl_dump_functions PARAMS((int, int));
-extern int rl_dump_macros PARAMS((int, int));
-extern int rl_dump_variables PARAMS((int, int));
-
-/* Bindable commands for word completion. */
-extern int rl_complete PARAMS((int, int));
-extern int rl_possible_completions PARAMS((int, int));
-extern int rl_insert_completions PARAMS((int, int));
-extern int rl_old_menu_complete PARAMS((int, int));
-extern int rl_menu_complete PARAMS((int, int));
-extern int rl_backward_menu_complete PARAMS((int, int));
-
-/* Bindable commands for killing and yanking text, and managing the kill ring. */
-extern int rl_kill_word PARAMS((int, int));
-extern int rl_backward_kill_word PARAMS((int, int));
-extern int rl_kill_line PARAMS((int, int));
-extern int rl_backward_kill_line PARAMS((int, int));
-extern int rl_kill_full_line PARAMS((int, int));
-extern int rl_unix_word_rubout PARAMS((int, int));
-extern int rl_unix_filename_rubout PARAMS((int, int));
-extern int rl_unix_line_discard PARAMS((int, int));
-extern int rl_copy_region_to_kill PARAMS((int, int));
-extern int rl_kill_region PARAMS((int, int));
-extern int rl_copy_forward_word PARAMS((int, int));
-extern int rl_copy_backward_word PARAMS((int, int));
-extern int rl_yank PARAMS((int, int));
-extern int rl_yank_pop PARAMS((int, int));
-extern int rl_yank_nth_arg PARAMS((int, int));
-extern int rl_yank_last_arg PARAMS((int, int));
-/* Not available unless __CYGWIN__ is defined. */
-#ifdef __CYGWIN__
-extern int rl_paste_from_clipboard PARAMS((int, int));
-#endif
-
-/* Bindable commands for incremental searching. */
-extern int rl_reverse_search_history PARAMS((int, int));
-extern int rl_forward_search_history PARAMS((int, int));
-
-/* Bindable keyboard macro commands. */
-extern int rl_start_kbd_macro PARAMS((int, int));
-extern int rl_end_kbd_macro PARAMS((int, int));
-extern int rl_call_last_kbd_macro PARAMS((int, int));
-extern int rl_print_last_kbd_macro PARAMS((int, int));
-
-/* Bindable undo commands. */
-extern int rl_revert_line PARAMS((int, int));
-extern int rl_undo_command PARAMS((int, int));
-
-/* Bindable tilde expansion commands. */
-extern int rl_tilde_expand PARAMS((int, int));
-
-/* Bindable terminal control commands. */
-extern int rl_restart_output PARAMS((int, int));
-extern int rl_stop_output PARAMS((int, int));
-
-/* Miscellaneous bindable commands. */
-extern int rl_abort PARAMS((int, int));
-extern int rl_tty_status PARAMS((int, int));
-
-/* Bindable commands for incremental and non-incremental history searching. */
-extern int rl_history_search_forward PARAMS((int, int));
-extern int rl_history_search_backward PARAMS((int, int));
-extern int rl_history_substr_search_forward PARAMS((int, int));
-extern int rl_history_substr_search_backward PARAMS((int, int));
-extern int rl_noninc_forward_search PARAMS((int, int));
-extern int rl_noninc_reverse_search PARAMS((int, int));
-extern int rl_noninc_forward_search_again PARAMS((int, int));
-extern int rl_noninc_reverse_search_again PARAMS((int, int));
-
-/* Bindable command used when inserting a matching close character. */
-extern int rl_insert_close PARAMS((int, int));
-
-/* Not available unless READLINE_CALLBACKS is defined. */
-extern void rl_callback_handler_install PARAMS((const char *, rl_vcpfunc_t *));
-extern void rl_callback_read_char PARAMS((void));
-extern void rl_callback_handler_remove PARAMS((void));
-
-/* Things for vi mode. Not available unless readline is compiled -DVI_MODE. */
-/* VI-mode bindable commands. */
-extern int rl_vi_redo PARAMS((int, int));
-extern int rl_vi_undo PARAMS((int, int));
-extern int rl_vi_yank_arg PARAMS((int, int));
-extern int rl_vi_fetch_history PARAMS((int, int));
-extern int rl_vi_search_again PARAMS((int, int));
-extern int rl_vi_search PARAMS((int, int));
-extern int rl_vi_complete PARAMS((int, int));
-extern int rl_vi_tilde_expand PARAMS((int, int));
-extern int rl_vi_prev_word PARAMS((int, int));
-extern int rl_vi_next_word PARAMS((int, int));
-extern int rl_vi_end_word PARAMS((int, int));
-extern int rl_vi_insert_beg PARAMS((int, int));
-extern int rl_vi_append_mode PARAMS((int, int));
-extern int rl_vi_append_eol PARAMS((int, int));
-extern int rl_vi_eof_maybe PARAMS((int, int));
-extern int rl_vi_insertion_mode PARAMS((int, int));
-extern int rl_vi_insert_mode PARAMS((int, int));
-extern int rl_vi_movement_mode PARAMS((int, int));
-extern int rl_vi_arg_digit PARAMS((int, int));
-extern int rl_vi_change_case PARAMS((int, int));
-extern int rl_vi_put PARAMS((int, int));
-extern int rl_vi_column PARAMS((int, int));
-extern int rl_vi_delete_to PARAMS((int, int));
-extern int rl_vi_change_to PARAMS((int, int));
-extern int rl_vi_yank_to PARAMS((int, int));
-extern int rl_vi_rubout PARAMS((int, int));
-extern int rl_vi_delete PARAMS((int, int));
-extern int rl_vi_back_to_indent PARAMS((int, int));
-extern int rl_vi_first_print PARAMS((int, int));
-extern int rl_vi_char_search PARAMS((int, int));
-extern int rl_vi_match PARAMS((int, int));
-extern int rl_vi_change_char PARAMS((int, int));
-extern int rl_vi_subst PARAMS((int, int));
-extern int rl_vi_overstrike PARAMS((int, int));
-extern int rl_vi_overstrike_delete PARAMS((int, int));
-extern int rl_vi_replace PARAMS((int, int));
-extern int rl_vi_set_mark PARAMS((int, int));
-extern int rl_vi_goto_mark PARAMS((int, int));
-
-/* VI-mode utility functions. */
-extern int rl_vi_check PARAMS((void));
-extern int rl_vi_domove PARAMS((int, int *));
-extern int rl_vi_bracktype PARAMS((int));
-
-extern void rl_vi_start_inserting PARAMS((int, int, int));
-
-/* VI-mode pseudo-bindable commands, used as utility functions. */
-extern int rl_vi_fWord PARAMS((int, int));
-extern int rl_vi_bWord PARAMS((int, int));
-extern int rl_vi_eWord PARAMS((int, int));
-extern int rl_vi_fword PARAMS((int, int));
-extern int rl_vi_bword PARAMS((int, int));
-extern int rl_vi_eword PARAMS((int, int));
-
-/* **************************************************************** */
-/*								    */
-/*			Well Published Functions		    */
-/*								    */
-/* **************************************************************** */
-
-/* Readline functions. */
-/* Read a line of input.  Prompt with PROMPT.  A NULL PROMPT means none. */
-extern char *readline PARAMS((const char *));
-
-extern int rl_set_prompt PARAMS((const char *));
-extern int rl_expand_prompt PARAMS((char *));
-
-extern int rl_initialize PARAMS((void));
-
-/* Undocumented; unused by readline */
-extern int rl_discard_argument PARAMS((void));
-
-/* Utility functions to bind keys to readline commands. */
-extern int rl_add_defun PARAMS((const char *, rl_command_func_t *, int));
-extern int rl_bind_key PARAMS((int, rl_command_func_t *));
-extern int rl_bind_key_in_map PARAMS((int, rl_command_func_t *, Keymap));
-extern int rl_unbind_key PARAMS((int));
-extern int rl_unbind_key_in_map PARAMS((int, Keymap));
-extern int rl_bind_key_if_unbound PARAMS((int, rl_command_func_t *));
-extern int rl_bind_key_if_unbound_in_map PARAMS((int, rl_command_func_t *, Keymap));
-extern int rl_unbind_function_in_map PARAMS((rl_command_func_t *, Keymap));
-extern int rl_unbind_command_in_map PARAMS((const char *, Keymap));
-extern int rl_bind_keyseq PARAMS((const char *, rl_command_func_t *));
-extern int rl_bind_keyseq_in_map PARAMS((const char *, rl_command_func_t *, Keymap));
-extern int rl_bind_keyseq_if_unbound PARAMS((const char *, rl_command_func_t *));
-extern int rl_bind_keyseq_if_unbound_in_map PARAMS((const char *, rl_command_func_t *, Keymap));
-extern int rl_generic_bind PARAMS((int, const char *, char *, Keymap));
-
-extern char *rl_variable_value PARAMS((const char *));
-extern int rl_variable_bind PARAMS((const char *, const char *));
-
-/* Backwards compatibility, use rl_bind_keyseq_in_map instead. */
-extern int rl_set_key PARAMS((const char *, rl_command_func_t *, Keymap));
-
-/* Backwards compatibility, use rl_generic_bind instead. */
-extern int rl_macro_bind PARAMS((const char *, const char *, Keymap));
-
-/* Undocumented in the texinfo manual; not really useful to programs. */
-extern int rl_translate_keyseq PARAMS((const char *, char *, int *));
-extern char *rl_untranslate_keyseq PARAMS((int));
-
-extern rl_command_func_t *rl_named_function PARAMS((const char *));
-extern rl_command_func_t *rl_function_of_keyseq PARAMS((const char *, Keymap, int *));
-
-extern void rl_list_funmap_names PARAMS((void));
-extern char **rl_invoking_keyseqs_in_map PARAMS((rl_command_func_t *, Keymap));
-extern char **rl_invoking_keyseqs PARAMS((rl_command_func_t *));
- 
-extern void rl_function_dumper PARAMS((int));
-extern void rl_macro_dumper PARAMS((int));
-extern void rl_variable_dumper PARAMS((int));
-
-extern int rl_read_init_file PARAMS((const char *));
-extern int rl_parse_and_bind PARAMS((char *));
-
-/* Functions for manipulating keymaps. */
-extern Keymap rl_make_bare_keymap PARAMS((void));
-extern Keymap rl_copy_keymap PARAMS((Keymap));
-extern Keymap rl_make_keymap PARAMS((void));
-extern void rl_discard_keymap PARAMS((Keymap));
-extern void rl_free_keymap PARAMS((Keymap));
-
-extern Keymap rl_get_keymap_by_name PARAMS((const char *));
-extern char *rl_get_keymap_name PARAMS((Keymap));
-extern void rl_set_keymap PARAMS((Keymap));
-extern Keymap rl_get_keymap PARAMS((void));
-/* Undocumented; used internally only. */
-extern void rl_set_keymap_from_edit_mode PARAMS((void));
-extern char *rl_get_keymap_name_from_edit_mode PARAMS((void));
-
-/* Functions for manipulating the funmap, which maps command names to functions. */
-extern int rl_add_funmap_entry PARAMS((const char *, rl_command_func_t *));
-extern const char **rl_funmap_names PARAMS((void));
-/* Undocumented, only used internally -- there is only one funmap, and this
-   function may be called only once. */
-extern void rl_initialize_funmap PARAMS((void));
-
-/* Utility functions for managing keyboard macros. */
-extern void rl_push_macro_input PARAMS((char *));
-
-/* Functions for undoing, from undo.c */
-extern void rl_add_undo PARAMS((enum undo_code, int, int, char *));
-extern void rl_free_undo_list PARAMS((void));
-extern int rl_do_undo PARAMS((void));
-extern int rl_begin_undo_group PARAMS((void));
-extern int rl_end_undo_group PARAMS((void));
-extern int rl_modifying PARAMS((int, int));
-
-/* Functions for redisplay. */
-extern void rl_redisplay PARAMS((void));
-extern int rl_on_new_line PARAMS((void));
-extern int rl_on_new_line_with_prompt PARAMS((void));
-extern int rl_forced_update_display PARAMS((void));
-extern int rl_clear_message PARAMS((void));
-extern int rl_reset_line_state PARAMS((void));
-extern int rl_crlf PARAMS((void));
-
-#if defined (USE_VARARGS) && defined (PREFER_STDARG)
-extern int rl_message (const char *, ...)  __rl_attribute__((__format__ (printf, 1, 2)));
-#else
-extern int rl_message ();
-#endif
-
-extern int rl_show_char PARAMS((int));
-
-/* Undocumented in texinfo manual. */
-extern int rl_character_len PARAMS((int, int));
-
-/* Save and restore internal prompt redisplay information. */
-extern void rl_save_prompt PARAMS((void));
-extern void rl_restore_prompt PARAMS((void));
-
-/* Modifying text. */
-extern void rl_replace_line PARAMS((const char *, int));
-extern int rl_insert_text PARAMS((const char *));
-extern int rl_delete_text PARAMS((int, int));
-extern int rl_kill_text PARAMS((int, int));
-extern char *rl_copy_text PARAMS((int, int));
-
-/* Terminal and tty mode management. */
-extern void rl_prep_terminal PARAMS((int));
-extern void rl_deprep_terminal PARAMS((void));
-extern void rl_tty_set_default_bindings PARAMS((Keymap));
-extern void rl_tty_unset_default_bindings PARAMS((Keymap));
-
-extern int rl_reset_terminal PARAMS((const char *));
-extern void rl_resize_terminal PARAMS((void));
-extern void rl_set_screen_size PARAMS((int, int));
-extern void rl_get_screen_size PARAMS((int *, int *));
-extern void rl_reset_screen_size PARAMS((void));
-
-extern char *rl_get_termcap PARAMS((const char *));
-
-/* Functions for character input. */
-extern int rl_stuff_char PARAMS((int));
-extern int rl_execute_next PARAMS((int));
-extern int rl_clear_pending_input PARAMS((void));
-extern int rl_read_key PARAMS((void));
-extern int rl_getc PARAMS((FILE *));
-extern int rl_set_keyboard_input_timeout PARAMS((int));
-
-/* `Public' utility functions . */
-extern void rl_extend_line_buffer PARAMS((int));
-extern int rl_ding PARAMS((void));
-extern int rl_alphabetic PARAMS((int));
-extern void rl_free PARAMS((void *));
-
-/* Readline signal handling, from signals.c */
-extern int rl_set_signals PARAMS((void));
-extern int rl_clear_signals PARAMS((void));
-extern void rl_cleanup_after_signal PARAMS((void));
-extern void rl_reset_after_signal PARAMS((void));
-extern void rl_free_line_state PARAMS((void));
-
-extern void rl_echo_signal_char PARAMS((int)); 
-
-extern int rl_set_paren_blink_timeout PARAMS((int));
-
-/* History management functions. */
-
-extern void rl_clear_history PARAMS((void));
-
-/* Undocumented. */
-extern int rl_maybe_save_line PARAMS((void));
-extern int rl_maybe_unsave_line PARAMS((void));
-extern int rl_maybe_replace_line PARAMS((void));
-
-/* Completion functions. */
-extern int rl_complete_internal PARAMS((int));
-extern void rl_display_match_list PARAMS((char **, int, int));
-
-extern char **rl_completion_matches PARAMS((const char *, rl_compentry_func_t *));
-extern char *rl_username_completion_function PARAMS((const char *, int));
-extern char *rl_filename_completion_function PARAMS((const char *, int));
-
-extern int rl_completion_mode PARAMS((rl_command_func_t *));
-
-#if 0
-/* Backwards compatibility (compat.c).  These will go away sometime. */
-extern void free_undo_list PARAMS((void));
-extern int maybe_save_line PARAMS((void));
-extern int maybe_unsave_line PARAMS((void));
-extern int maybe_replace_line PARAMS((void));
-
-extern int ding PARAMS((void));
-extern int alphabetic PARAMS((int));
-extern int crlf PARAMS((void));
-
-extern char **completion_matches PARAMS((char *, rl_compentry_func_t *));
-extern char *username_completion_function PARAMS((const char *, int));
-extern char *filename_completion_function PARAMS((const char *, int));
-#endif
-
-/* **************************************************************** */
-/*								    */
-/*			Well Published Variables		    */
-/*								    */
-/* **************************************************************** */
-
-/* The version of this incarnation of the readline library. */
-extern const char *rl_library_version;		/* e.g., "4.2" */
-extern int rl_readline_version;			/* e.g., 0x0402 */
-
-/* True if this is real GNU readline. */
-extern int rl_gnu_readline_p;
-
-/* Flags word encapsulating the current readline state. */
-extern int rl_readline_state;
-
-/* Says which editing mode readline is currently using.  1 means emacs mode;
-   0 means vi mode. */
-extern int rl_editing_mode;
-
-/* Insert or overwrite mode for emacs mode.  1 means insert mode; 0 means
-   overwrite mode.  Reset to insert mode on each input line. */
-extern int rl_insert_mode;
-
-/* The name of the calling program.  You should initialize this to
-   whatever was in argv[0].  It is used when parsing conditionals. */
-extern const char *rl_readline_name;
-
-/* The prompt readline uses.  This is set from the argument to
-   readline (), and should not be assigned to directly. */
-extern char *rl_prompt;
-
-/* The prompt string that is actually displayed by rl_redisplay.  Public so
-   applications can more easily supply their own redisplay functions. */
-extern char *rl_display_prompt;
-
-/* The line buffer that is in use. */
-extern char *rl_line_buffer;
-
-/* The location of point, and end. */
-extern int rl_point;
-extern int rl_end;
-
-/* The mark, or saved cursor position. */
-extern int rl_mark;
-
-/* Flag to indicate that readline has finished with the current input
-   line and should return it. */
-extern int rl_done;
-
-/* If set to a character value, that will be the next keystroke read. */
-extern int rl_pending_input;
-
-/* Non-zero if we called this function from _rl_dispatch().  It's present
-   so functions can find out whether they were called from a key binding
-   or directly from an application. */
-extern int rl_dispatching;
-
-/* Non-zero if the user typed a numeric argument before executing the
-   current function. */
-extern int rl_explicit_arg;
-
-/* The current value of the numeric argument specified by the user. */
-extern int rl_numeric_arg;
-
-/* The address of the last command function Readline executed. */
-extern rl_command_func_t *rl_last_func;
-
-/* The name of the terminal to use. */
-extern const char *rl_terminal_name;
-
-/* The input and output streams. */
-extern FILE *rl_instream;
-extern FILE *rl_outstream;
-
-/* If non-zero, Readline gives values of LINES and COLUMNS from the environment
-   greater precedence than values fetched from the kernel when computing the
-   screen dimensions. */
-extern int rl_prefer_env_winsize;
-
-/* If non-zero, then this is the address of a function to call just
-   before readline_internal () prints the first prompt. */
-extern rl_hook_func_t *rl_startup_hook;
-
-/* If non-zero, this is the address of a function to call just before
-   readline_internal_setup () returns and readline_internal starts
-   reading input characters. */
-extern rl_hook_func_t *rl_pre_input_hook;
-      
-/* The address of a function to call periodically while Readline is
-   awaiting character input, or NULL, for no event handling. */
-extern rl_hook_func_t *rl_event_hook;
-
-/* The address of a function to call if a read is interrupted by a signal. */
-extern rl_hook_func_t *rl_signal_event_hook;
-
-/* The address of a function to call if Readline needs to know whether or not
-   there is data available from the current input source. */
-extern rl_hook_func_t *rl_input_available_hook;
-
-/* The address of the function to call to fetch a character from the current
-   Readline input stream */
-extern rl_getc_func_t *rl_getc_function;
-
-extern rl_voidfunc_t *rl_redisplay_function;
-
-extern rl_vintfunc_t *rl_prep_term_function;
-extern rl_voidfunc_t *rl_deprep_term_function;
-
-/* Dispatch variables. */
-extern Keymap rl_executing_keymap;
-extern Keymap rl_binding_keymap;
-
-extern int rl_executing_key;
-extern char *rl_executing_keyseq;
-extern int rl_key_sequence_length;
-
-/* Display variables. */
-/* If non-zero, readline will erase the entire line, including any prompt,
-   if the only thing typed on an otherwise-blank line is something bound to
-   rl_newline. */
-extern int rl_erase_empty_line;
-
-/* If non-zero, the application has already printed the prompt (rl_prompt)
-   before calling readline, so readline should not output it the first time
-   redisplay is done. */
-extern int rl_already_prompted;
-
-/* A non-zero value means to read only this many characters rather than
-   up to a character bound to accept-line. */
-extern int rl_num_chars_to_read;
-
-/* The text of a currently-executing keyboard macro. */
-extern char *rl_executing_macro;
-
-/* Variables to control readline signal handling. */
-/* If non-zero, readline will install its own signal handlers for
-   SIGINT, SIGTERM, SIGQUIT, SIGALRM, SIGTSTP, SIGTTIN, and SIGTTOU. */
-extern int rl_catch_signals;
-
-/* If non-zero, readline will install a signal handler for SIGWINCH
-   that also attempts to call any calling application's SIGWINCH signal
-   handler.  Note that the terminal is not cleaned up before the
-   application's signal handler is called; use rl_cleanup_after_signal()
-   to do that. */
-extern int rl_catch_sigwinch;
-
-/* If non-zero, the readline SIGWINCH handler will modify LINES and
-   COLUMNS in the environment. */
-extern int rl_change_environment;
-
-/* Completion variables. */
-/* Pointer to the generator function for completion_matches ().
-   NULL means to use rl_filename_completion_function (), the default
-   filename completer. */
-extern rl_compentry_func_t *rl_completion_entry_function;
-
-/* Optional generator for menu completion.  Default is
-   rl_completion_entry_function (rl_filename_completion_function). */
- extern rl_compentry_func_t *rl_menu_completion_entry_function;
-
-/* If rl_ignore_some_completions_function is non-NULL it is the address
-   of a function to call after all of the possible matches have been
-   generated, but before the actual completion is done to the input line.
-   The function is called with one argument; a NULL terminated array
-   of (char *).  If your function removes any of the elements, they
-   must be free()'ed. */
-extern rl_compignore_func_t *rl_ignore_some_completions_function;
-
-/* Pointer to alternative function to create matches.
-   Function is called with TEXT, START, and END.
-   START and END are indices in RL_LINE_BUFFER saying what the boundaries
-   of TEXT are.
-   If this function exists and returns NULL then call the value of
-   rl_completion_entry_function to try to match, otherwise use the
-   array of strings returned. */
-extern rl_completion_func_t *rl_attempted_completion_function;
-
-/* The basic list of characters that signal a break between words for the
-   completer routine.  The initial contents of this variable is what
-   breaks words in the shell, i.e. "n\"\\'`@$>". */
-extern const char *rl_basic_word_break_characters;
-
-/* The list of characters that signal a break between words for
-   rl_complete_internal.  The default list is the contents of
-   rl_basic_word_break_characters.  */
-extern /*const*/ char *rl_completer_word_break_characters;
-
-/* Hook function to allow an application to set the completion word
-   break characters before readline breaks up the line.  Allows
-   position-dependent word break characters. */
-extern rl_cpvfunc_t *rl_completion_word_break_hook;
-
-/* List of characters which can be used to quote a substring of the line.
-   Completion occurs on the entire substring, and within the substring   
-   rl_completer_word_break_characters are treated as any other character,
-   unless they also appear within this list. */
-extern const char *rl_completer_quote_characters;
-
-/* List of quote characters which cause a word break. */
-extern const char *rl_basic_quote_characters;
-
-/* List of characters that need to be quoted in filenames by the completer. */
-extern const char *rl_filename_quote_characters;
-
-/* List of characters that are word break characters, but should be left
-   in TEXT when it is passed to the completion function.  The shell uses
-   this to help determine what kind of completing to do. */
-extern const char *rl_special_prefixes;
-
-/* If non-zero, then this is the address of a function to call when
-   completing on a directory name.  The function is called with
-   the address of a string (the current directory name) as an arg.  It
-   changes what is displayed when the possible completions are printed
-   or inserted.  The directory completion hook should perform
-   any necessary dequoting.  This function should return 1 if it modifies
-   the directory name pointer passed as an argument.  If the directory
-   completion hook returns 0, it should not modify the directory name
-   pointer passed as an argument. */
-extern rl_icppfunc_t *rl_directory_completion_hook;
-
-/* If non-zero, this is the address of a function to call when completing
-   a directory name.  This function takes the address of the directory name
-   to be modified as an argument.  Unlike rl_directory_completion_hook, it
-   only modifies the directory name used in opendir(2), not what is displayed
-   when the possible completions are printed or inserted.  If set, it takes
-   precedence over rl_directory_completion_hook.  The directory rewrite
-   hook should perform any necessary dequoting.  This function has the same
-   return value properties as the directory_completion_hook.
-
-   I'm not happy with how this works yet, so it's undocumented.  I'm trying
-   it in bash to see how well it goes. */
-extern rl_icppfunc_t *rl_directory_rewrite_hook;
-
-/* If non-zero, this is the address of a function for the completer to call
-   before deciding which character to append to a completed name.  It should
-   modify the directory name passed as an argument if appropriate, and return
-   non-zero if it modifies the name.  This should not worry about dequoting
-   the filename; that has already happened by the time it gets here. */
-extern rl_icppfunc_t *rl_filename_stat_hook;
-
-/* If non-zero, this is the address of a function to call when reading
-   directory entries from the filesystem for completion and comparing
-   them to the partial word to be completed.  The function should
-   either return its first argument (if no conversion takes place) or
-   newly-allocated memory.  This can, for instance, convert filenames
-   between character sets for comparison against what's typed at the
-   keyboard.  The returned value is what is added to the list of
-   matches.  The second argument is the length of the filename to be
-   converted. */
-extern rl_dequote_func_t *rl_filename_rewrite_hook;
-
-/* Backwards compatibility with previous versions of readline. */
-#define rl_symbolic_link_hook rl_directory_completion_hook
-
-/* If non-zero, then this is the address of a function to call when
-   completing a word would normally display the list of possible matches.
-   This function is called instead of actually doing the display.
-   It takes three arguments: (char **matches, int num_matches, int max_length)
-   where MATCHES is the array of strings that matched, NUM_MATCHES is the
-   number of strings in that array, and MAX_LENGTH is the length of the
-   longest string in that array. */
-extern rl_compdisp_func_t *rl_completion_display_matches_hook;
-
-/* Non-zero means that the results of the matches are to be treated
-   as filenames.  This is ALWAYS zero on entry, and can only be changed
-   within a completion entry finder function. */
-extern int rl_filename_completion_desired;
-
-/* Non-zero means that the results of the matches are to be quoted using
-   double quotes (or an application-specific quoting mechanism) if the
-   filename contains any characters in rl_word_break_chars.  This is
-   ALWAYS non-zero on entry, and can only be changed within a completion
-   entry finder function. */
-extern int rl_filename_quoting_desired;
-
-/* Set to a function to quote a filename in an application-specific fashion.
-   Called with the text to quote, the type of match found (single or multiple)
-   and a pointer to the quoting character to be used, which the function can
-   reset if desired. */
-extern rl_quote_func_t *rl_filename_quoting_function;
-
-/* Function to call to remove quoting characters from a filename.  Called
-   before completion is attempted, so the embedded quotes do not interfere
-   with matching names in the file system. */
-extern rl_dequote_func_t *rl_filename_dequoting_function;
-
-/* Function to call to decide whether or not a word break character is
-   quoted.  If a character is quoted, it does not break words for the
-   completer. */
-extern rl_linebuf_func_t *rl_char_is_quoted_p;
-
-/* Non-zero means to suppress normal filename completion after the
-   user-specified completion function has been called. */
-extern int rl_attempted_completion_over;
-
-/* Set to a character describing the type of completion being attempted by
-   rl_complete_internal; available for use by application completion
-   functions. */
-extern int rl_completion_type;
-
-/* Set to the last key used to invoke one of the completion functions */
-extern int rl_completion_invoking_key;
-
-/* Up to this many items will be displayed in response to a
-   possible-completions call.  After that, we ask the user if she
-   is sure she wants to see them all.  The default value is 100. */
-extern int rl_completion_query_items;
-
-/* Character appended to completed words when at the end of the line.  The
-   default is a space.  Nothing is added if this is '\0'. */
-extern int rl_completion_append_character;
-
-/* If set to non-zero by an application completion function,
-   rl_completion_append_character will not be appended. */
-extern int rl_completion_suppress_append;
-
-/* Set to any quote character readline thinks it finds before any application
-   completion function is called. */
-extern int rl_completion_quote_character;
-
-/* Set to a non-zero value if readline found quoting anywhere in the word to
-   be completed; set before any application completion function is called. */
-extern int rl_completion_found_quote;
-
-/* If non-zero, the completion functions don't append any closing quote.
-   This is set to 0 by rl_complete_internal and may be changed by an
-   application-specific completion function. */
-extern int rl_completion_suppress_quote;
-
-/* If non-zero, readline will sort the completion matches.  On by default. */
-extern int rl_sort_completion_matches;
-
-/* If non-zero, a slash will be appended to completed filenames that are
-   symbolic links to directory names, subject to the value of the
-   mark-directories variable (which is user-settable).  This exists so
-   that application completion functions can override the user's preference
-   (set via the mark-symlinked-directories variable) if appropriate.
-   It's set to the value of _rl_complete_mark_symlink_dirs in
-   rl_complete_internal before any application-specific completion
-   function is called, so without that function doing anything, the user's
-   preferences are honored. */
-extern int rl_completion_mark_symlink_dirs;
-
-/* If non-zero, then disallow duplicates in the matches. */
-extern int rl_ignore_completion_duplicates;
-
-/* If this is non-zero, completion is (temporarily) inhibited, and the
-   completion character will be inserted as any other. */
-extern int rl_inhibit_completion;
-
-/* Input error; can be returned by (*rl_getc_function) if readline is reading
-   a top-level command (RL_ISSTATE (RL_STATE_READCMD)). */
-#define READERR			(-2)
-
-/* Definitions available for use by readline clients. */
-#define RL_PROMPT_START_IGNORE	'\001'
-#define RL_PROMPT_END_IGNORE	'\002'
-
-/* Possible values for do_replace argument to rl_filename_quoting_function,
-   called by rl_complete_internal. */
-#define NO_MATCH        0
-#define SINGLE_MATCH    1
-#define MULT_MATCH      2
-
-/* Possible state values for rl_readline_state */
-#define RL_STATE_NONE		0x000000		/* no state; before first call */
-
-#define RL_STATE_INITIALIZING	0x0000001	/* initializing */
-#define RL_STATE_INITIALIZED	0x0000002	/* initialization done */
-#define RL_STATE_TERMPREPPED	0x0000004	/* terminal is prepped */
-#define RL_STATE_READCMD	0x0000008	/* reading a command key */
-#define RL_STATE_METANEXT	0x0000010	/* reading input after ESC */
-#define RL_STATE_DISPATCHING	0x0000020	/* dispatching to a command */
-#define RL_STATE_MOREINPUT	0x0000040	/* reading more input in a command function */
-#define RL_STATE_ISEARCH	0x0000080	/* doing incremental search */
-#define RL_STATE_NSEARCH	0x0000100	/* doing non-inc search */
-#define RL_STATE_SEARCH		0x0000200	/* doing a history search */
-#define RL_STATE_NUMERICARG	0x0000400	/* reading numeric argument */
-#define RL_STATE_MACROINPUT	0x0000800	/* getting input from a macro */
-#define RL_STATE_MACRODEF	0x0001000	/* defining keyboard macro */
-#define RL_STATE_OVERWRITE	0x0002000	/* overwrite mode */
-#define RL_STATE_COMPLETING	0x0004000	/* doing completion */
-#define RL_STATE_SIGHANDLER	0x0008000	/* in readline sighandler */
-#define RL_STATE_UNDOING	0x0010000	/* doing an undo */
-#define RL_STATE_INPUTPENDING	0x0020000	/* rl_execute_next called */
-#define RL_STATE_TTYCSAVED	0x0040000	/* tty special chars saved */
-#define RL_STATE_CALLBACK	0x0080000	/* using the callback interface */
-#define RL_STATE_VIMOTION	0x0100000	/* reading vi motion arg */
-#define RL_STATE_MULTIKEY	0x0200000	/* reading multiple-key command */
-#define RL_STATE_VICMDONCE	0x0400000	/* entered vi command mode at least once */
-#define RL_STATE_REDISPLAYING	0x0800000	/* updating terminal display */
-
-#define RL_STATE_DONE		0x1000000	/* done; accepted line */
-
-#define RL_SETSTATE(x)		(rl_readline_state |= (x))
-#define RL_UNSETSTATE(x)	(rl_readline_state &= ~(x))
-#define RL_ISSTATE(x)		(rl_readline_state & (x))
-
-struct readline_state {
-  /* line state */
-  int point;
-  int end;
-  int mark;
-  char *buffer;
-  int buflen;
-  UNDO_LIST *ul;
-  char *prompt;
-
-  /* global state */
-  int rlstate;
-  int done;
-  Keymap kmap;
-
-  /* input state */
-  rl_command_func_t *lastfunc;
-  int insmode;
-  int edmode;
-  int kseqlen;
-  FILE *inf;
-  FILE *outf;
-  int pendingin;
-  char *macro;
-
-  /* signal state */
-  int catchsigs;
-  int catchsigwinch;
-
-  /* search state */
-
-  /* completion state */
-
-  /* options state */
-
-  /* reserved for future expansion, so the struct size doesn't change */
-  char reserved[64];
-};
-
-extern int rl_save_state PARAMS((struct readline_state *));
-extern int rl_restore_state PARAMS((struct readline_state *));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _READLINE_H_ */
diff --git a/openflow/usr/include/readline/rlconf.h b/openflow/usr/include/readline/rlconf.h
deleted file mode 100644
index 1a40afc..0000000
--- a/openflow/usr/include/readline/rlconf.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* rlconf.h -- readline configuration definitions */
-
-/* Copyright (C) 1992-2012 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library (Readline), a library
-   for reading lines of text with interactive input and history editing.      
-
-   Readline is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Readline is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#if !defined (_RLCONF_H_)
-#define _RLCONF_H_
-
-/* Define this if you want the vi-mode editing available. */
-#define VI_MODE
-
-/* Define this to get an indication of file type when listing completions. */
-#define VISIBLE_STATS
-
-/* Define this to get support for colors when listing completions and in
-   other places. */
-#define COLOR_SUPPORT
-
-/* This definition is needed by readline.c, rltty.c, and signals.c. */
-/* If on, then readline handles signals in a way that doesn't suck. */
-#define HANDLE_SIGNALS
-
-/* Ugly but working hack for binding prefix meta. */
-#define PREFIX_META_HACK
-
-/* The next-to-last-ditch effort file name for a user-specific init file. */
-#define DEFAULT_INPUTRC "~/.inputrc"
-
-/* The ultimate last-ditch filenname for an init file -- system-wide. */
-#define SYS_INPUTRC "/etc/inputrc"
-
-/* If defined, expand tabs to spaces. */
-#define DISPLAY_TABS
-
-/* If defined, use the terminal escape sequence to move the cursor forward
-   over a character when updating the line rather than rewriting it. */
-/* #define HACK_TERMCAP_MOTION */
-
-/* The string inserted by the `insert comment' command. */
-#define RL_COMMENT_BEGIN_DEFAULT "#"
-
-/* Define this if you want code that allows readline to be used in an
-   X `callback' style. */
-#define READLINE_CALLBACKS
-
-/* Define this if you want the cursor to indicate insert or overwrite mode. */
-/* #define CURSOR_MODE */
-
-/* Define this if you want to enable code that talks to the Linux kernel
-   tty auditing system. */
-#define ENABLE_TTY_AUDIT_SUPPORT
-
-#endif /* _RLCONF_H_ */
diff --git a/openflow/usr/include/readline/rlstdc.h b/openflow/usr/include/readline/rlstdc.h
deleted file mode 100644
index 82b607c..0000000
--- a/openflow/usr/include/readline/rlstdc.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* stdc.h -- macros to make source compile on both ANSI C and K&R C compilers. */
-
-/* Copyright (C) 1993-2009 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library (Readline), a library
-   for reading lines of text with interactive input and history editing.      
-
-   Readline is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Readline is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#if !defined (_RL_STDC_H_)
-#define _RL_STDC_H_
-
-/* Adapted from BSD /usr/include/sys/cdefs.h. */
-
-/* A function can be defined using prototypes and compile on both ANSI C
-   and traditional C compilers with something like this:
-	extern char *func PARAMS((char *, char *, int)); */
-
-#if !defined (PARAMS)
-#  if defined (__STDC__) || defined (__GNUC__) || defined (__cplusplus)
-#    define PARAMS(protos) protos
-#  else
-#    define PARAMS(protos) ()
-#  endif
-#endif
-
-#if defined(__GNUC__) && __GNUC__ >= 2
-#  define __rl_attribute__(x) __attribute__(x)
-#else
-#  define __rl_attribute__(x)
-#endif
-
-/* Moved from config.h.in because readline.h:rl_message depends on these
-   defines. */
-#if defined (__STDC__) && defined (HAVE_STDARG_H)
-#  define PREFER_STDARG
-#  define USE_VARARGS
-#else
-#  if defined (HAVE_VARARGS_H)
-#    define PREFER_VARARGS
-#    define USE_VARARGS
-#  endif
-#endif
-
-#endif /* !_RL_STDC_H_ */
diff --git a/openflow/usr/include/readline/rltypedefs.h b/openflow/usr/include/readline/rltypedefs.h
deleted file mode 100644
index f9f5cd3..0000000
--- a/openflow/usr/include/readline/rltypedefs.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* rltypedefs.h -- Type declarations for readline functions. */
-
-/* Copyright (C) 2000-2011 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library (Readline), a library
-   for reading lines of text with interactive input and history editing.      
-
-   Readline is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Readline is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _RL_TYPEDEFS_H_
-#define _RL_TYPEDEFS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Old-style, attempt to mark as deprecated in some way people will notice. */
-
-#if !defined (_FUNCTION_DEF)
-#  define _FUNCTION_DEF
-
-#if defined(__GNUC__) || defined(__clang__)
-typedef int Function () __attribute__ ((deprecated));
-typedef void VFunction () __attribute__ ((deprecated));
-typedef char *CPFunction () __attribute__ ((deprecated));
-typedef char **CPPFunction () __attribute__ ((deprecated));
-#else
-typedef int Function ();
-typedef void VFunction ();
-typedef char *CPFunction ();
-typedef char **CPPFunction ();
-#endif
-
-#endif /* _FUNCTION_DEF */
-
-/* New style. */
-
-#if !defined (_RL_FUNCTION_TYPEDEF)
-#  define _RL_FUNCTION_TYPEDEF
-
-/* Bindable functions */
-typedef int rl_command_func_t PARAMS((int, int));
-
-/* Typedefs for the completion system */
-typedef char *rl_compentry_func_t PARAMS((const char *, int));
-typedef char **rl_completion_func_t PARAMS((const char *, int, int));
-
-typedef char *rl_quote_func_t PARAMS((char *, int, char *));
-typedef char *rl_dequote_func_t PARAMS((char *, int));
-
-typedef int rl_compignore_func_t PARAMS((char **));
-
-typedef void rl_compdisp_func_t PARAMS((char **, int, int));
-
-/* Type for input and pre-read hook functions like rl_event_hook */
-typedef int rl_hook_func_t PARAMS((void));
-
-/* Input function type */
-typedef int rl_getc_func_t PARAMS((FILE *));
-
-/* Generic function that takes a character buffer (which could be the readline
-   line buffer) and an index into it (which could be rl_point) and returns
-   an int. */
-typedef int rl_linebuf_func_t PARAMS((char *, int));
-
-/* `Generic' function pointer typedefs */
-typedef int rl_intfunc_t PARAMS((int));
-#define rl_ivoidfunc_t rl_hook_func_t
-typedef int rl_icpfunc_t PARAMS((char *));
-typedef int rl_icppfunc_t PARAMS((char **));
-
-typedef void rl_voidfunc_t PARAMS((void));
-typedef void rl_vintfunc_t PARAMS((int));
-typedef void rl_vcpfunc_t PARAMS((char *));
-typedef void rl_vcppfunc_t PARAMS((char **));
-
-typedef char *rl_cpvfunc_t PARAMS((void));
-typedef char *rl_cpifunc_t PARAMS((int));
-typedef char *rl_cpcpfunc_t PARAMS((char  *));
-typedef char *rl_cpcppfunc_t PARAMS((char  **));
-
-#endif /* _RL_FUNCTION_TYPEDEF */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RL_TYPEDEFS_H_ */
diff --git a/openflow/usr/include/readline/tilde.h b/openflow/usr/include/readline/tilde.h
deleted file mode 100644
index e26dd04..0000000
--- a/openflow/usr/include/readline/tilde.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* tilde.h: Externally available variables and function in libtilde.a. */
-
-/* Copyright (C) 1992-2009 Free Software Foundation, Inc.
-
-   This file contains the Readline Library (Readline), a set of
-   routines for providing Emacs style line input to programs that ask
-   for it.
-
-   Readline is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Readline is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#if !defined (_TILDE_H_)
-#  define _TILDE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* A function can be defined using prototypes and compile on both ANSI C
-   and traditional C compilers with something like this:
-	extern char *func PARAMS((char *, char *, int)); */
-
-#if !defined (PARAMS)
-#  if defined (__STDC__) || defined (__GNUC__) || defined (__cplusplus)
-#    define PARAMS(protos) protos
-#  else
-#    define PARAMS(protos) ()
-#  endif
-#endif
-
-typedef char *tilde_hook_func_t PARAMS((char *));
-
-/* If non-null, this contains the address of a function that the application
-   wants called before trying the standard tilde expansions.  The function
-   is called with the text sans tilde, and returns a malloc()'ed string
-   which is the expansion, or a NULL pointer if the expansion fails. */
-extern tilde_hook_func_t *tilde_expansion_preexpansion_hook;
-
-/* If non-null, this contains the address of a function to call if the
-   standard meaning for expanding a tilde fails.  The function is called
-   with the text (sans tilde, as in "foo"), and returns a malloc()'ed string
-   which is the expansion, or a NULL pointer if there is no expansion. */
-extern tilde_hook_func_t *tilde_expansion_failure_hook;
-
-/* When non-null, this is a NULL terminated array of strings which
-   are duplicates for a tilde prefix.  Bash uses this to expand
-   `=~' and `:~'. */
-extern char **tilde_additional_prefixes;
-
-/* When non-null, this is a NULL terminated array of strings which match
-   the end of a username, instead of just "/".  Bash sets this to
-   `:' and `=~'. */
-extern char **tilde_additional_suffixes;
-
-/* Return a new string which is the result of tilde expanding STRING. */
-extern char *tilde_expand PARAMS((const char *));
-
-/* Do the work of tilde expansion on FILENAME.  FILENAME starts with a
-   tilde.  If there is no expansion, call tilde_expansion_failure_hook. */
-extern char *tilde_expand_word PARAMS((const char *));
-
-/* Find the portion of the string beginning with ~ that should be expanded. */
-extern char *tilde_find_word PARAMS((const char *, int, int *));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _TILDE_H_ */
diff --git a/openflow/usr/include/regex.h b/openflow/usr/include/regex.h
deleted file mode 100644
index 90f0851..0000000
--- a/openflow/usr/include/regex.h
+++ /dev/null
@@ -1,581 +0,0 @@
-/* Definitions for data structures and routines for the regular
-   expression library.
-   Copyright (C) 1985, 1989-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _REGEX_H
-#define _REGEX_H 1
-
-#include <sys/types.h>
-
-/* Allow the use in C++ code.  */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The following two types have to be signed and unsigned integer type
-   wide enough to hold a value of a pointer.  For most ANSI compilers
-   ptrdiff_t and size_t should be likely OK.  Still size of these two
-   types is 2 for Microsoft C.  Ugh... */
-typedef long int s_reg_t;
-typedef unsigned long int active_reg_t;
-
-/* The following bits are used to determine the regexp syntax we
-   recognize.  The set/not-set meanings are chosen so that Emacs syntax
-   remains the value 0.  The bits are given in alphabetical order, and
-   the definitions shifted by one from the previous bit; thus, when we
-   add or remove a bit, only one other definition need change.  */
-typedef unsigned long int reg_syntax_t;
-
-#ifdef __USE_GNU
-/* If this bit is not set, then \ inside a bracket expression is literal.
-   If set, then such a \ quotes the following character.  */
-# define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
-
-/* If this bit is not set, then + and ? are operators, and \+ and \? are
-     literals.
-   If set, then \+ and \? are operators and + and ? are literals.  */
-# define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
-
-/* If this bit is set, then character classes are supported.  They are:
-     [:alpha:], [:upper:], [:lower:],  [:digit:], [:alnum:], [:xdigit:],
-     [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
-   If not set, then character classes are not supported.  */
-# define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
-
-/* If this bit is set, then ^ and $ are always anchors (outside bracket
-     expressions, of course).
-   If this bit is not set, then it depends:
-	^  is an anchor if it is at the beginning of a regular
-	   expression or after an open-group or an alternation operator;
-	$  is an anchor if it is at the end of a regular expression, or
-	   before a close-group or an alternation operator.
-
-   This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
-   POSIX draft 11.2 says that * etc. in leading positions is undefined.
-   We already implemented a previous draft which made those constructs
-   invalid, though, so we haven't changed the code back.  */
-# define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
-
-/* If this bit is set, then special characters are always special
-     regardless of where they are in the pattern.
-   If this bit is not set, then special characters are special only in
-     some contexts; otherwise they are ordinary.  Specifically,
-     * + ? and intervals are only special when not after the beginning,
-     open-group, or alternation operator.  */
-# define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
-
-/* If this bit is set, then *, +, ?, and { cannot be first in an re or
-     immediately after an alternation or begin-group operator.  */
-# define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
-
-/* If this bit is set, then . matches newline.
-   If not set, then it doesn't.  */
-# define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
-
-/* If this bit is set, then . doesn't match NUL.
-   If not set, then it does.  */
-# define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
-
-/* If this bit is set, nonmatching lists [^...] do not match newline.
-   If not set, they do.  */
-# define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
-
-/* If this bit is set, either \{...\} or {...} defines an
-     interval, depending on RE_NO_BK_BRACES.
-   If not set, \{, \}, {, and } are literals.  */
-# define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
-
-/* If this bit is set, +, ? and | aren't recognized as operators.
-   If not set, they are.  */
-# define RE_LIMITED_OPS (RE_INTERVALS << 1)
-
-/* If this bit is set, newline is an alternation operator.
-   If not set, newline is literal.  */
-# define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
-
-/* If this bit is set, then `{...}' defines an interval, and \{ and \}
-     are literals.
-  If not set, then `\{...\}' defines an interval.  */
-# define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
-
-/* If this bit is set, (...) defines a group, and \( and \) are literals.
-   If not set, \(...\) defines a group, and ( and ) are literals.  */
-# define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
-
-/* If this bit is set, then \<digit> matches <digit>.
-   If not set, then \<digit> is a back-reference.  */
-# define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
-
-/* If this bit is set, then | is an alternation operator, and \| is literal.
-   If not set, then \| is an alternation operator, and | is literal.  */
-# define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
-
-/* If this bit is set, then an ending range point collating higher
-     than the starting range point, as in [z-a], is invalid.
-   If not set, then when ending range point collates higher than the
-     starting range point, the range is ignored.  */
-# define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
-
-/* If this bit is set, then an unmatched ) is ordinary.
-   If not set, then an unmatched ) is invalid.  */
-# define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
-
-/* If this bit is set, succeed as soon as we match the whole pattern,
-   without further backtracking.  */
-# define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
-
-/* If this bit is set, do not process the GNU regex operators.
-   If not set, then the GNU regex operators are recognized. */
-# define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1)
-
-/* If this bit is set, turn on internal regex debugging.
-   If not set, and debugging was on, turn it off.
-   This only works if regex.c is compiled -DDEBUG.
-   We define this bit always, so that all that's needed to turn on
-   debugging is to recompile regex.c; the calling code can always have
-   this bit set, and it won't affect anything in the normal case. */
-# define RE_DEBUG (RE_NO_GNU_OPS << 1)
-
-/* If this bit is set, a syntactically invalid interval is treated as
-   a string of ordinary characters.  For example, the ERE 'a{1' is
-   treated as 'a\{1'.  */
-# define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1)
-
-/* If this bit is set, then ignore case when matching.
-   If not set, then case is significant.  */
-# define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1)
-
-/* This bit is used internally like RE_CONTEXT_INDEP_ANCHORS but only
-   for ^, because it is difficult to scan the regex backwards to find
-   whether ^ should be special.  */
-# define RE_CARET_ANCHORS_HERE (RE_ICASE << 1)
-
-/* If this bit is set, then \{ cannot be first in an bre or
-   immediately after an alternation or begin-group operator.  */
-# define RE_CONTEXT_INVALID_DUP (RE_CARET_ANCHORS_HERE << 1)
-
-/* If this bit is set, then no_sub will be set to 1 during
-   re_compile_pattern.  */
-# define RE_NO_SUB (RE_CONTEXT_INVALID_DUP << 1)
-#endif
-
-/* This global variable defines the particular regexp syntax to use (for
-   some interfaces).  When a regexp is compiled, the syntax used is
-   stored in the pattern buffer, so changing this does not affect
-   already-compiled regexps.  */
-extern reg_syntax_t re_syntax_options;
-
-#ifdef __USE_GNU
-/* Define combinations of the above bits for the standard possibilities.
-   (The [[[ comments delimit what gets put into the Texinfo file, so
-   don't delete them!)  */
-/* [[[begin syntaxes]]] */
-#define RE_SYNTAX_EMACS 0
-
-#define RE_SYNTAX_AWK							\
-  (RE_BACKSLASH_ESCAPE_IN_LISTS   | RE_DOT_NOT_NULL			\
-   | RE_NO_BK_PARENS              | RE_NO_BK_REFS			\
-   | RE_NO_BK_VBAR                | RE_NO_EMPTY_RANGES			\
-   | RE_DOT_NEWLINE		  | RE_CONTEXT_INDEP_ANCHORS		\
-   | RE_CHAR_CLASSES							\
-   | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
-
-#define RE_SYNTAX_GNU_AWK						\
-  ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
-    | RE_INVALID_INTERVAL_ORD)						\
-   & ~(RE_DOT_NOT_NULL | RE_CONTEXT_INDEP_OPS				\
-      | RE_CONTEXT_INVALID_OPS ))
-
-#define RE_SYNTAX_POSIX_AWK						\
-  (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
-   | RE_INTERVALS	    | RE_NO_GNU_OPS				\
-   | RE_INVALID_INTERVAL_ORD)
-
-#define RE_SYNTAX_GREP							\
-  (RE_BK_PLUS_QM              | RE_CHAR_CLASSES				\
-   | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS				\
-   | RE_NEWLINE_ALT)
-
-#define RE_SYNTAX_EGREP							\
-  (RE_CHAR_CLASSES        | RE_CONTEXT_INDEP_ANCHORS			\
-   | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE			\
-   | RE_NEWLINE_ALT       | RE_NO_BK_PARENS				\
-   | RE_NO_BK_VBAR)
-
-#define RE_SYNTAX_POSIX_EGREP						\
-  (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES			\
-   | RE_INVALID_INTERVAL_ORD)
-
-/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff.  */
-#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
-
-#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
-
-/* Syntax bits common to both basic and extended POSIX regex syntax.  */
-#define _RE_SYNTAX_POSIX_COMMON						\
-  (RE_CHAR_CLASSES | RE_DOT_NEWLINE      | RE_DOT_NOT_NULL		\
-   | RE_INTERVALS  | RE_NO_EMPTY_RANGES)
-
-#define RE_SYNTAX_POSIX_BASIC						\
-  (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM | RE_CONTEXT_INVALID_DUP)
-
-/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
-   RE_LIMITED_OPS, i.e., \? \+ \| are not recognized.  Actually, this
-   isn't minimal, since other operators, such as \`, aren't disabled.  */
-#define RE_SYNTAX_POSIX_MINIMAL_BASIC					\
-  (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
-
-#define RE_SYNTAX_POSIX_EXTENDED					\
-  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
-   | RE_CONTEXT_INDEP_OPS   | RE_NO_BK_BRACES				\
-   | RE_NO_BK_PARENS        | RE_NO_BK_VBAR				\
-   | RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD)
-
-/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is
-   removed and RE_NO_BK_REFS is added.  */
-#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED				\
-  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
-   | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES				\
-   | RE_NO_BK_PARENS        | RE_NO_BK_REFS				\
-   | RE_NO_BK_VBAR	    | RE_UNMATCHED_RIGHT_PAREN_ORD)
-/* [[[end syntaxes]]] */
-
-/* Maximum number of duplicates an interval can allow.  Some systems
-   (erroneously) define this in other header files, but we want our
-   value, so remove any previous define.  */
-# ifdef RE_DUP_MAX
-#  undef RE_DUP_MAX
-# endif
-/* If sizeof(int) == 2, then ((1 << 15) - 1) overflows.  */
-# define RE_DUP_MAX (0x7fff)
-#endif
-
-
-/* POSIX `cflags' bits (i.e., information for `regcomp').  */
-
-/* If this bit is set, then use extended regular expression syntax.
-   If not set, then use basic regular expression syntax.  */
-#define REG_EXTENDED 1
-
-/* If this bit is set, then ignore case when matching.
-   If not set, then case is significant.  */
-#define REG_ICASE (REG_EXTENDED << 1)
-
-/* If this bit is set, then anchors do not match at newline
-     characters in the string.
-   If not set, then anchors do match at newlines.  */
-#define REG_NEWLINE (REG_ICASE << 1)
-
-/* If this bit is set, then report only success or fail in regexec.
-   If not set, then returns differ between not matching and errors.  */
-#define REG_NOSUB (REG_NEWLINE << 1)
-
-
-/* POSIX `eflags' bits (i.e., information for regexec).  */
-
-/* If this bit is set, then the beginning-of-line operator doesn't match
-     the beginning of the string (presumably because it's not the
-     beginning of a line).
-   If not set, then the beginning-of-line operator does match the
-     beginning of the string.  */
-#define REG_NOTBOL 1
-
-/* Like REG_NOTBOL, except for the end-of-line.  */
-#define REG_NOTEOL (1 << 1)
-
-/* Use PMATCH[0] to delimit the start and end of the search in the
-   buffer.  */
-#define REG_STARTEND (1 << 2)
-
-
-/* If any error codes are removed, changed, or added, update the
-   `re_error_msg' table in regex.c.  */
-typedef enum
-{
-#if defined _XOPEN_SOURCE || defined __USE_XOPEN2K
-  REG_ENOSYS = -1,	/* This will never happen for this implementation.  */
-#endif
-
-  REG_NOERROR = 0,	/* Success.  */
-  REG_NOMATCH,		/* Didn't find a match (for regexec).  */
-
-  /* POSIX regcomp return error codes.  (In the order listed in the
-     standard.)  */
-  REG_BADPAT,		/* Invalid pattern.  */
-  REG_ECOLLATE,		/* Inalid collating element.  */
-  REG_ECTYPE,		/* Invalid character class name.  */
-  REG_EESCAPE,		/* Trailing backslash.  */
-  REG_ESUBREG,		/* Invalid back reference.  */
-  REG_EBRACK,		/* Unmatched left bracket.  */
-  REG_EPAREN,		/* Parenthesis imbalance.  */
-  REG_EBRACE,		/* Unmatched \{.  */
-  REG_BADBR,		/* Invalid contents of \{\}.  */
-  REG_ERANGE,		/* Invalid range end.  */
-  REG_ESPACE,		/* Ran out of memory.  */
-  REG_BADRPT,		/* No preceding re for repetition op.  */
-
-  /* Error codes we've added.  */
-  REG_EEND,		/* Premature end.  */
-  REG_ESIZE,		/* Compiled pattern bigger than 2^16 bytes.  */
-  REG_ERPAREN		/* Unmatched ) or \); not returned from regcomp.  */
-} reg_errcode_t;
-
-/* This data structure represents a compiled pattern.  Before calling
-   the pattern compiler, the fields `buffer', `allocated', `fastmap',
-   and `translate' can be set.  After the pattern has been compiled,
-   the fields `re_nsub', `not_bol' and `not_eol' are available.  All
-   other fields are private to the regex routines.  */
-
-#ifndef RE_TRANSLATE_TYPE
-# define __RE_TRANSLATE_TYPE unsigned char *
-# ifdef __USE_GNU
-#  define RE_TRANSLATE_TYPE __RE_TRANSLATE_TYPE
-# endif
-#endif
-
-#ifdef __USE_GNU
-# define __REPB_PREFIX(name) name
-#else
-# define __REPB_PREFIX(name) __##name
-#endif
-
-struct re_pattern_buffer
-{
-  /* Space that holds the compiled pattern.  It is declared as
-     `unsigned char *' because its elements are sometimes used as
-     array indexes.  */
-  unsigned char *__REPB_PREFIX(buffer);
-
-  /* Number of bytes to which `buffer' points.  */
-  unsigned long int __REPB_PREFIX(allocated);
-
-  /* Number of bytes actually used in `buffer'.  */
-  unsigned long int __REPB_PREFIX(used);
-
-  /* Syntax setting with which the pattern was compiled.  */
-  reg_syntax_t __REPB_PREFIX(syntax);
-
-  /* Pointer to a fastmap, if any, otherwise zero.  re_search uses the
-     fastmap, if there is one, to skip over impossible starting points
-     for matches.  */
-  char *__REPB_PREFIX(fastmap);
-
-  /* Either a translate table to apply to all characters before
-     comparing them, or zero for no translation.  The translation is
-     applied to a pattern when it is compiled and to a string when it
-     is matched.  */
-  __RE_TRANSLATE_TYPE __REPB_PREFIX(translate);
-
-  /* Number of subexpressions found by the compiler.  */
-  size_t re_nsub;
-
-  /* Zero if this pattern cannot match the empty string, one else.
-     Well, in truth it's used only in `re_search_2', to see whether or
-     not we should use the fastmap, so we don't set this absolutely
-     perfectly; see `re_compile_fastmap' (the `duplicate' case).  */
-  unsigned __REPB_PREFIX(can_be_null) : 1;
-
-  /* If REGS_UNALLOCATED, allocate space in the `regs' structure
-     for `max (RE_NREGS, re_nsub + 1)' groups.
-     If REGS_REALLOCATE, reallocate space if necessary.
-     If REGS_FIXED, use what's there.  */
-#ifdef __USE_GNU
-# define REGS_UNALLOCATED 0
-# define REGS_REALLOCATE 1
-# define REGS_FIXED 2
-#endif
-  unsigned __REPB_PREFIX(regs_allocated) : 2;
-
-  /* Set to zero when `regex_compile' compiles a pattern; set to one
-     by `re_compile_fastmap' if it updates the fastmap.  */
-  unsigned __REPB_PREFIX(fastmap_accurate) : 1;
-
-  /* If set, `re_match_2' does not return information about
-     subexpressions.  */
-  unsigned __REPB_PREFIX(no_sub) : 1;
-
-  /* If set, a beginning-of-line anchor doesn't match at the beginning
-     of the string.  */
-  unsigned __REPB_PREFIX(not_bol) : 1;
-
-  /* Similarly for an end-of-line anchor.  */
-  unsigned __REPB_PREFIX(not_eol) : 1;
-
-  /* If true, an anchor at a newline matches.  */
-  unsigned __REPB_PREFIX(newline_anchor) : 1;
-};
-
-typedef struct re_pattern_buffer regex_t;
-
-/* Type for byte offsets within the string.  POSIX mandates this.  */
-typedef int regoff_t;
-
-
-#ifdef __USE_GNU
-/* This is the structure we store register match data in.  See
-   regex.texinfo for a full description of what registers match.  */
-struct re_registers
-{
-  unsigned num_regs;
-  regoff_t *start;
-  regoff_t *end;
-};
-
-
-/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
-   `re_match_2' returns information about at least this many registers
-   the first time a `regs' structure is passed.  */
-# ifndef RE_NREGS
-#  define RE_NREGS 30
-# endif
-#endif
-
-
-/* POSIX specification for registers.  Aside from the different names than
-   `re_registers', POSIX uses an array of structures, instead of a
-   structure of arrays.  */
-typedef struct
-{
-  regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
-  regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
-} regmatch_t;
-
-/* Declarations for routines.  */
-
-#ifdef __USE_GNU
-/* Sets the current default syntax to SYNTAX, and return the old syntax.
-   You can also simply assign to the `re_syntax_options' variable.  */
-extern reg_syntax_t re_set_syntax (reg_syntax_t __syntax);
-
-/* Compile the regular expression PATTERN, with length LENGTH
-   and syntax given by the global `re_syntax_options', into the buffer
-   BUFFER.  Return NULL if successful, and an error string if not.
-
-   To free the allocated storage, you must call `regfree' on BUFFER.
-   Note that the translate table must either have been initialised by
-   `regcomp', with a malloc'ed value, or set to NULL before calling
-   `regfree'.  */
-extern const char *re_compile_pattern (const char *__pattern, size_t __length,
-				       struct re_pattern_buffer *__buffer);
-
-
-/* Compile a fastmap for the compiled pattern in BUFFER; used to
-   accelerate searches.  Return 0 if successful and -2 if was an
-   internal error.  */
-extern int re_compile_fastmap (struct re_pattern_buffer *__buffer);
-
-
-/* Search in the string STRING (with length LENGTH) for the pattern
-   compiled into BUFFER.  Start searching at position START, for RANGE
-   characters.  Return the starting position of the match, -1 for no
-   match, or -2 for an internal error.  Also return register
-   information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
-extern int re_search (struct re_pattern_buffer *__buffer, const char *__string,
-		      int __length, int __start, int __range,
-		      struct re_registers *__regs);
-
-
-/* Like `re_search', but search in the concatenation of STRING1 and
-   STRING2.  Also, stop searching at index START + STOP.  */
-extern int re_search_2 (struct re_pattern_buffer *__buffer,
-			const char *__string1, int __length1,
-			const char *__string2, int __length2, int __start,
-			int __range, struct re_registers *__regs, int __stop);
-
-
-/* Like `re_search', but return how many characters in STRING the regexp
-   in BUFFER matched, starting at position START.  */
-extern int re_match (struct re_pattern_buffer *__buffer, const char *__string,
-		     int __length, int __start, struct re_registers *__regs);
-
-
-/* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
-extern int re_match_2 (struct re_pattern_buffer *__buffer,
-		       const char *__string1, int __length1,
-		       const char *__string2, int __length2, int __start,
-		       struct re_registers *__regs, int __stop);
-
-
-/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
-   ENDS.  Subsequent matches using BUFFER and REGS will use this memory
-   for recording register information.  STARTS and ENDS must be
-   allocated with malloc, and must each be at least `NUM_REGS * sizeof
-   (regoff_t)' bytes long.
-
-   If NUM_REGS == 0, then subsequent matches should allocate their own
-   register data.
-
-   Unless this function is called, the first search or match using
-   PATTERN_BUFFER will allocate its own register data, without
-   freeing the old data.  */
-extern void re_set_registers (struct re_pattern_buffer *__buffer,
-			      struct re_registers *__regs,
-			      unsigned int __num_regs,
-			      regoff_t *__starts, regoff_t *__ends);
-#endif	/* Use GNU */
-
-#if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_MISC)
-# ifndef _CRAY
-/* 4.2 bsd compatibility.  */
-extern char *re_comp (const char *);
-extern int re_exec (const char *);
-# endif
-#endif
-
-/* GCC 2.95 and later have "__restrict"; C99 compilers have
-   "restrict", and "configure" may have defined "restrict".  */
-#ifndef __restrict
-# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
-#  if defined restrict || 199901L <= __STDC_VERSION__
-#   define __restrict restrict
-#  else
-#   define __restrict
-#  endif
-# endif
-#endif
-/* gcc 3.1 and up support the [restrict] syntax.  */
-#ifndef __restrict_arr
-# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) \
-     && !defined __GNUG__
-#  define __restrict_arr __restrict
-# else
-#  define __restrict_arr
-# endif
-#endif
-
-/* POSIX compatibility.  */
-extern int regcomp (regex_t *__restrict __preg,
-		    const char *__restrict __pattern,
-		    int __cflags);
-
-extern int regexec (const regex_t *__restrict __preg,
-		    const char *__restrict __string, size_t __nmatch,
-		    regmatch_t __pmatch[__restrict_arr],
-		    int __eflags);
-
-extern size_t regerror (int __errcode, const regex_t *__restrict __preg,
-			char *__restrict __errbuf, size_t __errbuf_size);
-
-extern void regfree (regex_t *__preg);
-
-
-#ifdef __cplusplus
-}
-#endif	/* C++ */
-
-#endif /* regex.h */
diff --git a/openflow/usr/include/regexp.h b/openflow/usr/include/regexp.h
deleted file mode 100644
index 6d3bc30..0000000
--- a/openflow/usr/include/regexp.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _REGEXP_H
-#define _REGEXP_H	1
-
-/* The contents of this header file were originally standardized in
-   the Single Unix Specification, Issue 3 (1992).  In Issue 4 (1994)
-   the header was marked as TO BE WITHDRAWN, and new applications
-   were encouraged to use <regex.h> instead.  It was officially
-   withdrawn from the standard in Issue 6 (aka POSIX.1-2001).
-
-   The GNU C Library provided this header through version 2.22. */
-
-#error "The GNU C Library no longer implements <regexp.h>."
-#error "Please update your code to use <regex.h> instead (no trailing 'p')."
-
-#endif /* regexp.h */
diff --git a/openflow/usr/include/reglib/nl80211.h b/openflow/usr/include/reglib/nl80211.h
deleted file mode 100644
index 79da871..0000000
--- a/openflow/usr/include/reglib/nl80211.h
+++ /dev/null
@@ -1,3685 +0,0 @@
-#ifndef __LINUX_NL80211_H
-#define __LINUX_NL80211_H
-/*
- * 802.11 netlink interface public header
- *
- * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2008 Michael Wu <flamingice@sourmilk.net>
- * Copyright 2008 Luis Carlos Cobo <luisca@cozybit.com>
- * Copyright 2008 Michael Buesch <m@bues.ch>
- * Copyright 2008, 2009 Luis R. Rodriguez <lrodriguez@atheros.com>
- * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
- * Copyright 2008 Colin McCabe <colin@cozybit.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include <linux/types.h>
-
-/**
- * DOC: Station handling
- *
- * Stations are added per interface, but a special case exists with VLAN
- * interfaces. When a station is bound to an AP interface, it may be moved
- * into a VLAN identified by a VLAN interface index (%NL80211_ATTR_STA_VLAN).
- * The station is still assumed to belong to the AP interface it was added
- * to.
- *
- * Station handling varies per interface type and depending on the driver's
- * capabilities.
- *
- * For drivers supporting TDLS with external setup (WIPHY_FLAG_SUPPORTS_TDLS
- * and WIPHY_FLAG_TDLS_EXTERNAL_SETUP), the station lifetime is as follows:
- *  - a setup station entry is added, not yet authorized, without any rate
- *    or capability information, this just exists to avoid race conditions
- *  - when the TDLS setup is done, a single NL80211_CMD_SET_STATION is valid
- *    to add rate and capability information to the station and at the same
- *    time mark it authorized.
- *  - %NL80211_TDLS_ENABLE_LINK is then used
- *  - after this, the only valid operation is to remove it by tearing down
- *    the TDLS link (%NL80211_TDLS_DISABLE_LINK)
- *
- * TODO: need more info for other interface types
- */
-
-/**
- * DOC: Frame transmission/registration support
- *
- * Frame transmission and registration support exists to allow userspace
- * management entities such as wpa_supplicant react to management frames
- * that are not being handled by the kernel. This includes, for example,
- * certain classes of action frames that cannot be handled in the kernel
- * for various reasons.
- *
- * Frame registration is done on a per-interface basis and registrations
- * cannot be removed other than by closing the socket. It is possible to
- * specify a registration filter to register, for example, only for a
- * certain type of action frame. In particular with action frames, those
- * that userspace registers for will not be returned as unhandled by the
- * driver, so that the registered application has to take responsibility
- * for doing that.
- *
- * The type of frame that can be registered for is also dependent on the
- * driver and interface type. The frame types are advertised in wiphy
- * attributes so applications know what to expect.
- *
- * NOTE: When an interface changes type while registrations are active,
- *       these registrations are ignored until the interface type is
- *       changed again. This means that changing the interface type can
- *       lead to a situation that couldn't otherwise be produced, but
- *       any such registrations will be dormant in the sense that they
- *       will not be serviced, i.e. they will not receive any frames.
- *
- * Frame transmission allows userspace to send for example the required
- * responses to action frames. It is subject to some sanity checking,
- * but many frames can be transmitted. When a frame was transmitted, its
- * status is indicated to the sending socket.
- *
- * For more technical details, see the corresponding command descriptions
- * below.
- */
-
-/**
- * DOC: Virtual interface / concurrency capabilities
- *
- * Some devices are able to operate with virtual MACs, they can have
- * more than one virtual interface. The capability handling for this
- * is a bit complex though, as there may be a number of restrictions
- * on the types of concurrency that are supported.
- *
- * To start with, each device supports the interface types listed in
- * the %NL80211_ATTR_SUPPORTED_IFTYPES attribute, but by listing the
- * types there no concurrency is implied.
- *
- * Once concurrency is desired, more attributes must be observed:
- * To start with, since some interface types are purely managed in
- * software, like the AP-VLAN type in mac80211 for example, there's
- * an additional list of these, they can be added at any time and
- * are only restricted by some semantic restrictions (e.g. AP-VLAN
- * cannot be added without a corresponding AP interface). This list
- * is exported in the %NL80211_ATTR_SOFTWARE_IFTYPES attribute.
- *
- * Further, the list of supported combinations is exported. This is
- * in the %NL80211_ATTR_INTERFACE_COMBINATIONS attribute. Basically,
- * it exports a list of "groups", and at any point in time the
- * interfaces that are currently active must fall into any one of
- * the advertised groups. Within each group, there are restrictions
- * on the number of interfaces of different types that are supported
- * and also the number of different channels, along with potentially
- * some other restrictions. See &enum nl80211_if_combination_attrs.
- *
- * All together, these attributes define the concurrency of virtual
- * interfaces that a given device supports.
- */
-
-/**
- * enum nl80211_commands - supported nl80211 commands
- *
- * @NL80211_CMD_UNSPEC: unspecified command to catch errors
- *
- * @NL80211_CMD_GET_WIPHY: request information about a wiphy or dump request
- *	to get a list of all present wiphys.
- * @NL80211_CMD_SET_WIPHY: set wiphy parameters, needs %NL80211_ATTR_WIPHY or
- *	%NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME,
- *	%NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ (and the
- *	attributes determining the channel width; this is used for setting
- *	monitor mode channel),  %NL80211_ATTR_WIPHY_RETRY_SHORT,
- *	%NL80211_ATTR_WIPHY_RETRY_LONG, %NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
- *	and/or %NL80211_ATTR_WIPHY_RTS_THRESHOLD.
- *	However, for setting the channel, see %NL80211_CMD_SET_CHANNEL
- *	instead, the support here is for backward compatibility only.
- * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
- *	or rename notification. Has attributes %NL80211_ATTR_WIPHY and
- *	%NL80211_ATTR_WIPHY_NAME.
- * @NL80211_CMD_DEL_WIPHY: Wiphy deleted. Has attributes
- *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME.
- *
- * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration;
- *	either a dump request on a %NL80211_ATTR_WIPHY or a specific get
- *	on an %NL80211_ATTR_IFINDEX is supported.
- * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires
- *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE.
- * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response
- *	to %NL80211_CMD_GET_INTERFACE. Has %NL80211_ATTR_IFINDEX,
- *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_IFTYPE attributes. Can also
- *	be sent from userspace to request creation of a new virtual interface,
- *	then requires attributes %NL80211_ATTR_WIPHY, %NL80211_ATTR_IFTYPE and
- *	%NL80211_ATTR_IFNAME.
- * @NL80211_CMD_DEL_INTERFACE: Virtual interface was deleted, has attributes
- *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_WIPHY. Can also be sent from
- *	userspace to request deletion of a virtual interface, then requires
- *	attribute %NL80211_ATTR_IFINDEX.
- *
- * @NL80211_CMD_GET_KEY: Get sequence counter information for a key specified
- *	by %NL80211_ATTR_KEY_IDX and/or %NL80211_ATTR_MAC.
- * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT,
- *	%NL80211_ATTR_KEY_DEFAULT_MGMT, or %NL80211_ATTR_KEY_THRESHOLD.
- * @NL80211_CMD_NEW_KEY: add a key with given %NL80211_ATTR_KEY_DATA,
- *	%NL80211_ATTR_KEY_IDX, %NL80211_ATTR_MAC, %NL80211_ATTR_KEY_CIPHER,
- *	and %NL80211_ATTR_KEY_SEQ attributes.
- * @NL80211_CMD_DEL_KEY: delete a key identified by %NL80211_ATTR_KEY_IDX
- *	or %NL80211_ATTR_MAC.
- *
- * @NL80211_CMD_GET_BEACON: (not used)
- * @NL80211_CMD_SET_BEACON: change the beacon on an access point interface
- *	using the %NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL
- *	attributes. For drivers that generate the beacon and probe responses
- *	internally, the following attributes must be provided: %NL80211_ATTR_IE,
- *	%NL80211_ATTR_IE_PROBE_RESP and %NL80211_ATTR_IE_ASSOC_RESP.
- * @NL80211_CMD_START_AP: Start AP operation on an AP interface, parameters
- *	are like for %NL80211_CMD_SET_BEACON, and additionally parameters that
- *	do not change are used, these include %NL80211_ATTR_BEACON_INTERVAL,
- *	%NL80211_ATTR_DTIM_PERIOD, %NL80211_ATTR_SSID,
- *	%NL80211_ATTR_HIDDEN_SSID, %NL80211_ATTR_CIPHERS_PAIRWISE,
- *	%NL80211_ATTR_CIPHER_GROUP, %NL80211_ATTR_WPA_VERSIONS,
- *	%NL80211_ATTR_AKM_SUITES, %NL80211_ATTR_PRIVACY,
- *	%NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_INACTIVITY_TIMEOUT,
- *	%NL80211_ATTR_ACL_POLICY and %NL80211_ATTR_MAC_ADDRS.
- *	The channel to use can be set on the interface or be given using the
- *	%NL80211_ATTR_WIPHY_FREQ and the attributes determining channel width.
- * @NL80211_CMD_NEW_BEACON: old alias for %NL80211_CMD_START_AP
- * @NL80211_CMD_STOP_AP: Stop AP operation on the given interface
- * @NL80211_CMD_DEL_BEACON: old alias for %NL80211_CMD_STOP_AP
- *
- * @NL80211_CMD_GET_STATION: Get station attributes for station identified by
- *	%NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_SET_STATION: Set station attributes for station identified by
- *	%NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_NEW_STATION: Add a station with given attributes to the
- *	the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_DEL_STATION: Remove a station identified by %NL80211_ATTR_MAC
- *	or, if no MAC address given, all stations, on the interface identified
- *	by %NL80211_ATTR_IFINDEX.
- *
- * @NL80211_CMD_GET_MPATH: Get mesh path attributes for mesh path to
- * 	destination %NL80211_ATTR_MAC on the interface identified by
- * 	%NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_SET_MPATH:  Set mesh path attributes for mesh path to
- * 	destination %NL80211_ATTR_MAC on the interface identified by
- * 	%NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_NEW_MPATH: Create a new mesh path for the destination given by
- *	%NL80211_ATTR_MAC via %NL80211_ATTR_MPATH_NEXT_HOP.
- * @NL80211_CMD_DEL_MPATH: Delete a mesh path to the destination given by
- *	%NL80211_ATTR_MAC.
- * @NL80211_CMD_NEW_PATH: Add a mesh path with given attributes to the
- *	the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_DEL_PATH: Remove a mesh path identified by %NL80211_ATTR_MAC
- *	or, if no MAC address given, all mesh paths, on the interface identified
- *	by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_SET_BSS: Set BSS attributes for BSS identified by
- *	%NL80211_ATTR_IFINDEX.
- *
- * @NL80211_CMD_GET_REG: ask the wireless core to send us its currently set
- * 	regulatory domain.
- * @NL80211_CMD_SET_REG: Set current regulatory domain. CRDA sends this command
- *	after being queried by the kernel. CRDA replies by sending a regulatory
- *	domain structure which consists of %NL80211_ATTR_REG_ALPHA set to our
- *	current alpha2 if it found a match. It also provides
- * 	NL80211_ATTR_REG_RULE_FLAGS, and a set of regulatory rules. Each
- * 	regulatory rule is a nested set of attributes  given by
- * 	%NL80211_ATTR_REG_RULE_FREQ_[START|END] and
- * 	%NL80211_ATTR_FREQ_RANGE_MAX_BW with an attached power rule given by
- * 	%NL80211_ATTR_REG_RULE_POWER_MAX_ANT_GAIN and
- * 	%NL80211_ATTR_REG_RULE_POWER_MAX_EIRP.
- * @NL80211_CMD_REQ_SET_REG: ask the wireless core to set the regulatory domain
- * 	to the specified ISO/IEC 3166-1 alpha2 country code. The core will
- * 	store this as a valid request and then query userspace for it.
- *
- * @NL80211_CMD_GET_MESH_CONFIG: Get mesh networking properties for the
- *	interface identified by %NL80211_ATTR_IFINDEX
- *
- * @NL80211_CMD_SET_MESH_CONFIG: Set mesh networking properties for the
- *      interface identified by %NL80211_ATTR_IFINDEX
- *
- * @NL80211_CMD_SET_MGMT_EXTRA_IE: Set extra IEs for management frames. The
- *	interface is identified with %NL80211_ATTR_IFINDEX and the management
- *	frame subtype with %NL80211_ATTR_MGMT_SUBTYPE. The extra IE data to be
- *	added to the end of the specified management frame is specified with
- *	%NL80211_ATTR_IE. If the command succeeds, the requested data will be
- *	added to all specified management frames generated by
- *	kernel/firmware/driver.
- *	Note: This command has been removed and it is only reserved at this
- *	point to avoid re-using existing command number. The functionality this
- *	command was planned for has been provided with cleaner design with the
- *	option to specify additional IEs in NL80211_CMD_TRIGGER_SCAN,
- *	NL80211_CMD_AUTHENTICATE, NL80211_CMD_ASSOCIATE,
- *	NL80211_CMD_DEAUTHENTICATE, and NL80211_CMD_DISASSOCIATE.
- *
- * @NL80211_CMD_GET_SCAN: get scan results
- * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
- *	%NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
- *	probe requests at CCK rate or not.
- * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
- *	NL80211_CMD_GET_SCAN and on the "scan" multicast group)
- * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
- *	partial scan results may be available
- *
- * @NL80211_CMD_START_SCHED_SCAN: start a scheduled scan at certain
- *	intervals, as specified by %NL80211_ATTR_SCHED_SCAN_INTERVAL.
- *	Like with normal scans, if SSIDs (%NL80211_ATTR_SCAN_SSIDS)
- *	are passed, they are used in the probe requests.  For
- *	broadcast, a broadcast SSID must be passed (ie. an empty
- *	string).  If no SSID is passed, no probe requests are sent and
- *	a passive scan is performed.  %NL80211_ATTR_SCAN_FREQUENCIES,
- *	if passed, define which channels should be scanned; if not
- *	passed, all channels allowed for the current regulatory domain
- *	are used.  Extra IEs can also be passed from the userspace by
- *	using the %NL80211_ATTR_IE attribute.
- * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan.  Returns -ENOENT
- *	if scheduled scan is not running.
- * @NL80211_CMD_SCHED_SCAN_RESULTS: indicates that there are scheduled scan
- *	results available.
- * @NL80211_CMD_SCHED_SCAN_STOPPED: indicates that the scheduled scan has
- *	stopped.  The driver may issue this event at any time during a
- *	scheduled scan.  One reason for stopping the scan is if the hardware
- *	does not support starting an association or a normal scan while running
- *	a scheduled scan.  This event is also sent when the
- *	%NL80211_CMD_STOP_SCHED_SCAN command is received or when the interface
- *	is brought down while a scheduled scan was running.
- *
- * @NL80211_CMD_GET_SURVEY: get survey resuls, e.g. channel occupation
- *      or noise level
- * @NL80211_CMD_NEW_SURVEY_RESULTS: survey data notification (as a reply to
- *	NL80211_CMD_GET_SURVEY and on the "scan" multicast group)
- *
- * @NL80211_CMD_SET_PMKSA: Add a PMKSA cache entry, using %NL80211_ATTR_MAC
- *	(for the BSSID) and %NL80211_ATTR_PMKID.
- * @NL80211_CMD_DEL_PMKSA: Delete a PMKSA cache entry, using %NL80211_ATTR_MAC
- *	(for the BSSID) and %NL80211_ATTR_PMKID.
- * @NL80211_CMD_FLUSH_PMKSA: Flush all PMKSA cache entries.
- *
- * @NL80211_CMD_REG_CHANGE: indicates to userspace the regulatory domain
- * 	has been changed and provides details of the request information
- * 	that caused the change such as who initiated the regulatory request
- * 	(%NL80211_ATTR_REG_INITIATOR), the wiphy_idx
- * 	(%NL80211_ATTR_REG_ALPHA2) on which the request was made from if
- * 	the initiator was %NL80211_REGDOM_SET_BY_COUNTRY_IE or
- * 	%NL80211_REGDOM_SET_BY_DRIVER, the type of regulatory domain
- * 	set (%NL80211_ATTR_REG_TYPE), if the type of regulatory domain is
- * 	%NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on
- * 	to (%NL80211_ATTR_REG_ALPHA2).
- * @NL80211_CMD_REG_BEACON_HINT: indicates to userspace that an AP beacon
- * 	has been found while world roaming thus enabling active scan or
- * 	any mode of operation that initiates TX (beacons) on a channel
- * 	where we would not have been able to do either before. As an example
- * 	if you are world roaming (regulatory domain set to world or if your
- * 	driver is using a custom world roaming regulatory domain) and while
- * 	doing a passive scan on the 5 GHz band you find an AP there (if not
- * 	on a DFS channel) you will now be able to actively scan for that AP
- * 	or use AP mode on your card on that same channel. Note that this will
- * 	never be used for channels 1-11 on the 2 GHz band as they are always
- * 	enabled world wide. This beacon hint is only sent if your device had
- * 	either disabled active scanning or beaconing on a channel. We send to
- * 	userspace the wiphy on which we removed a restriction from
- * 	(%NL80211_ATTR_WIPHY) and the channel on which this occurred
- * 	before (%NL80211_ATTR_FREQ_BEFORE) and after (%NL80211_ATTR_FREQ_AFTER)
- * 	the beacon hint was processed.
- *
- * @NL80211_CMD_AUTHENTICATE: authentication request and notification.
- *	This command is used both as a command (request to authenticate) and
- *	as an event on the "mlme" multicast group indicating completion of the
- *	authentication process.
- *	When used as a command, %NL80211_ATTR_IFINDEX is used to identify the
- *	interface. %NL80211_ATTR_MAC is used to specify PeerSTAAddress (and
- *	BSSID in case of station mode). %NL80211_ATTR_SSID is used to specify
- *	the SSID (mainly for association, but is included in authentication
- *	request, too, to help BSS selection. %NL80211_ATTR_WIPHY_FREQ is used
- *	to specify the frequence of the channel in MHz. %NL80211_ATTR_AUTH_TYPE
- *	is used to specify the authentication type. %NL80211_ATTR_IE is used to
- *	define IEs (VendorSpecificInfo, but also including RSN IE and FT IEs)
- *	to be added to the frame.
- *	When used as an event, this reports reception of an Authentication
- *	frame in station and IBSS modes when the local MLME processed the
- *	frame, i.e., it was for the local STA and was received in correct
- *	state. This is similar to MLME-AUTHENTICATE.confirm primitive in the
- *	MLME SAP interface (kernel providing MLME, userspace SME). The
- *	included %NL80211_ATTR_FRAME attribute contains the management frame
- *	(including both the header and frame body, but not FCS). This event is
- *	also used to indicate if the authentication attempt timed out. In that
- *	case the %NL80211_ATTR_FRAME attribute is replaced with a
- *	%NL80211_ATTR_TIMED_OUT flag (and %NL80211_ATTR_MAC to indicate which
- *	pending authentication timed out).
- * @NL80211_CMD_ASSOCIATE: association request and notification; like
- *	NL80211_CMD_AUTHENTICATE but for Association and Reassociation
- *	(similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request,
- *	MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives).
- * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like
- *	NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to
- *	MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication
- *	primitives).
- * @NL80211_CMD_DISASSOCIATE: disassociation request and notification; like
- *	NL80211_CMD_AUTHENTICATE but for Disassociation frames (similar to
- *	MLME-DISASSOCIATE.request and MLME-DISASSOCIATE.indication primitives).
- *
- * @NL80211_CMD_MICHAEL_MIC_FAILURE: notification of a locally detected Michael
- *	MIC (part of TKIP) failure; sent on the "mlme" multicast group; the
- *	event includes %NL80211_ATTR_MAC to describe the source MAC address of
- *	the frame with invalid MIC, %NL80211_ATTR_KEY_TYPE to show the key
- *	type, %NL80211_ATTR_KEY_IDX to indicate the key identifier, and
- *	%NL80211_ATTR_KEY_SEQ to indicate the TSC value of the frame; this
- *	event matches with MLME-MICHAELMICFAILURE.indication() primitive
- *
- * @NL80211_CMD_JOIN_IBSS: Join a new IBSS -- given at least an SSID and a
- *	FREQ attribute (for the initial frequency if no peer can be found)
- *	and optionally a MAC (as BSSID) and FREQ_FIXED attribute if those
- *	should be fixed rather than automatically determined. Can only be
- *	executed on a network interface that is UP, and fixed BSSID/FREQ
- *	may be rejected. Another optional parameter is the beacon interval,
- *	given in the %NL80211_ATTR_BEACON_INTERVAL attribute, which if not
- *	given defaults to 100 TU (102.4ms).
- * @NL80211_CMD_LEAVE_IBSS: Leave the IBSS -- no special arguments, the IBSS is
- *	determined by the network interface.
- *
- * @NL80211_CMD_TESTMODE: testmode command, takes a wiphy (or ifindex) attribute
- *	to identify the device, and the TESTDATA blob attribute to pass through
- *	to the driver.
- *
- * @NL80211_CMD_CONNECT: connection request and notification; this command
- *	requests to connect to a specified network but without separating
- *	auth and assoc steps. For this, you need to specify the SSID in a
- *	%NL80211_ATTR_SSID attribute, and can optionally specify the association
- *	IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
- *	%NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
- *	%NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
- *	%NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
- *	Background scan period can optionally be
- *	specified in %NL80211_ATTR_BG_SCAN_PERIOD,
- *	if not specified default background scan configuration
- *	in driver is used and if period value is 0, bg scan will be disabled.
- *	This attribute is ignored if driver does not support roam scan.
- *	It is also sent as an event, with the BSSID and response IEs when the
- *	connection is established or failed to be established. This can be
- *	determined by the STATUS_CODE attribute.
- * @NL80211_CMD_ROAM: request that the card roam (currently not implemented),
- *	sent as an event when the card/driver roamed by itself.
- * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
- *	userspace that a connection was dropped by the AP or due to other
- *	reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and
- *	%NL80211_ATTR_REASON_CODE attributes are used.
- *
- * @NL80211_CMD_SET_WIPHY_NETNS: Set a wiphy's netns. Note that all devices
- *	associated with this wiphy must be down and will follow.
- *
- * @NL80211_CMD_REMAIN_ON_CHANNEL: Request to remain awake on the specified
- *	channel for the specified amount of time. This can be used to do
- *	off-channel operations like transmit a Public Action frame and wait for
- *	a response while being associated to an AP on another channel.
- *	%NL80211_ATTR_IFINDEX is used to specify which interface (and thus
- *	radio) is used. %NL80211_ATTR_WIPHY_FREQ is used to specify the
- *	frequency for the operation.
- *	%NL80211_ATTR_DURATION is used to specify the duration in milliseconds
- *	to remain on the channel. This command is also used as an event to
- *	notify when the requested duration starts (it may take a while for the
- *	driver to schedule this time due to other concurrent needs for the
- *	radio).
- *	When called, this operation returns a cookie (%NL80211_ATTR_COOKIE)
- *	that will be included with any events pertaining to this request;
- *	the cookie is also used to cancel the request.
- * @NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL: This command can be used to cancel a
- *	pending remain-on-channel duration if the desired operation has been
- *	completed prior to expiration of the originally requested duration.
- *	%NL80211_ATTR_WIPHY or %NL80211_ATTR_IFINDEX is used to specify the
- *	radio. The %NL80211_ATTR_COOKIE attribute must be given as well to
- *	uniquely identify the request.
- *	This command is also used as an event to notify when a requested
- *	remain-on-channel duration has expired.
- *
- * @NL80211_CMD_SET_TX_BITRATE_MASK: Set the mask of rates to be used in TX
- *	rate selection. %NL80211_ATTR_IFINDEX is used to specify the interface
- *	and @NL80211_ATTR_TX_RATES the set of allowed rates.
- *
- * @NL80211_CMD_REGISTER_FRAME: Register for receiving certain mgmt frames
- *	(via @NL80211_CMD_FRAME) for processing in userspace. This command
- *	requires an interface index, a frame type attribute (optional for
- *	backward compatibility reasons, if not given assumes action frames)
- *	and a match attribute containing the first few bytes of the frame
- *	that should match, e.g. a single byte for only a category match or
- *	four bytes for vendor frames including the OUI. The registration
- *	cannot be dropped, but is removed automatically when the netlink
- *	socket is closed. Multiple registrations can be made.
- * @NL80211_CMD_REGISTER_ACTION: Alias for @NL80211_CMD_REGISTER_FRAME for
- *	backward compatibility
- * @NL80211_CMD_FRAME: Management frame TX request and RX notification. This
- *	command is used both as a request to transmit a management frame and
- *	as an event indicating reception of a frame that was not processed in
- *	kernel code, but is for us (i.e., which may need to be processed in a
- *	user space application). %NL80211_ATTR_FRAME is used to specify the
- *	frame contents (including header). %NL80211_ATTR_WIPHY_FREQ is used
- *	to indicate on which channel the frame is to be transmitted or was
- *	received. If this channel is not the current channel (remain-on-channel
- *	or the operational channel) the device will switch to the given channel
- *	and transmit the frame, optionally waiting for a response for the time
- *	specified using %NL80211_ATTR_DURATION. When called, this operation
- *	returns a cookie (%NL80211_ATTR_COOKIE) that will be included with the
- *	TX status event pertaining to the TX request.
- *	%NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
- *	management frames at CCK rate or not in 2GHz band.
- * @NL80211_CMD_FRAME_WAIT_CANCEL: When an off-channel TX was requested, this
- *	command may be used with the corresponding cookie to cancel the wait
- *	time if it is known that it is no longer necessary.
- * @NL80211_CMD_ACTION: Alias for @NL80211_CMD_FRAME for backward compatibility.
- * @NL80211_CMD_FRAME_TX_STATUS: Report TX status of a management frame
- *	transmitted with %NL80211_CMD_FRAME. %NL80211_ATTR_COOKIE identifies
- *	the TX command and %NL80211_ATTR_FRAME includes the contents of the
- *	frame. %NL80211_ATTR_ACK flag is included if the recipient acknowledged
- *	the frame.
- * @NL80211_CMD_ACTION_TX_STATUS: Alias for @NL80211_CMD_FRAME_TX_STATUS for
- *	backward compatibility.
- *
- * @NL80211_CMD_SET_POWER_SAVE: Set powersave, using %NL80211_ATTR_PS_STATE
- * @NL80211_CMD_GET_POWER_SAVE: Get powersave status in %NL80211_ATTR_PS_STATE
- *
- * @NL80211_CMD_SET_CQM: Connection quality monitor configuration. This command
- *	is used to configure connection quality monitoring notification trigger
- *	levels.
- * @NL80211_CMD_NOTIFY_CQM: Connection quality monitor notification. This
- *	command is used as an event to indicate the that a trigger level was
- *	reached.
- * @NL80211_CMD_SET_CHANNEL: Set the channel (using %NL80211_ATTR_WIPHY_FREQ
- *	and the attributes determining channel width) the given interface
- *	(identifed by %NL80211_ATTR_IFINDEX) shall operate on.
- *	In case multiple channels are supported by the device, the mechanism
- *	with which it switches channels is implementation-defined.
- *	When a monitor interface is given, it can only switch channel while
- *	no other interfaces are operating to avoid disturbing the operation
- *	of any other interfaces, and other interfaces will again take
- *	precedence when they are used.
- *
- * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface.
- *
- * @NL80211_CMD_JOIN_MESH: Join a mesh. The mesh ID must be given, and initial
- *	mesh config parameters may be given.
- * @NL80211_CMD_LEAVE_MESH: Leave the mesh network -- no special arguments, the
- *	network is determined by the network interface.
- *
- * @NL80211_CMD_UNPROT_DEAUTHENTICATE: Unprotected deauthentication frame
- *	notification. This event is used to indicate that an unprotected
- *	deauthentication frame was dropped when MFP is in use.
- * @NL80211_CMD_UNPROT_DISASSOCIATE: Unprotected disassociation frame
- *	notification. This event is used to indicate that an unprotected
- *	disassociation frame was dropped when MFP is in use.
- *
- * @NL80211_CMD_NEW_PEER_CANDIDATE: Notification on the reception of a
- *      beacon or probe response from a compatible mesh peer.  This is only
- *      sent while no station information (sta_info) exists for the new peer
- *      candidate and when @NL80211_MESH_SETUP_USERSPACE_AUTH,
- *      @NL80211_MESH_SETUP_USERSPACE_AMPE, or
- *      @NL80211_MESH_SETUP_USERSPACE_MPM is set.  On reception of this
- *      notification, userspace may decide to create a new station
- *      (@NL80211_CMD_NEW_STATION).  To stop this notification from
- *      reoccurring, the userspace authentication daemon may want to create the
- *      new station with the AUTHENTICATED flag unset and maybe change it later
- *      depending on the authentication result.
- *
- * @NL80211_CMD_GET_WOWLAN: get Wake-on-Wireless-LAN (WoWLAN) settings.
- * @NL80211_CMD_SET_WOWLAN: set Wake-on-Wireless-LAN (WoWLAN) settings.
- *	Since wireless is more complex than wired ethernet, it supports
- *	various triggers. These triggers can be configured through this
- *	command with the %NL80211_ATTR_WOWLAN_TRIGGERS attribute. For
- *	more background information, see
- *	http://wireless.kernel.org/en/users/Documentation/WoWLAN.
- *	The @NL80211_CMD_SET_WOWLAN command can also be used as a notification
- *	from the driver reporting the wakeup reason. In this case, the
- *	@NL80211_ATTR_WOWLAN_TRIGGERS attribute will contain the reason
- *	for the wakeup, if it was caused by wireless. If it is not present
- *	in the wakeup notification, the wireless device didn't cause the
- *	wakeup but reports that it was woken up.
- *
- * @NL80211_CMD_SET_REKEY_OFFLOAD: This command is used give the driver
- *	the necessary information for supporting GTK rekey offload. This
- *	feature is typically used during WoWLAN. The configuration data
- *	is contained in %NL80211_ATTR_REKEY_DATA (which is nested and
- *	contains the data in sub-attributes). After rekeying happened,
- *	this command may also be sent by the driver as an MLME event to
- *	inform userspace of the new replay counter.
- *
- * @NL80211_CMD_PMKSA_CANDIDATE: This is used as an event to inform userspace
- *	of PMKSA caching dandidates.
- *
- * @NL80211_CMD_TDLS_OPER: Perform a high-level TDLS command (e.g. link setup).
- *	In addition, this can be used as an event to request userspace to take
- *	actions on TDLS links (set up a new link or tear down an existing one).
- *	In such events, %NL80211_ATTR_TDLS_OPERATION indicates the requested
- *	operation, %NL80211_ATTR_MAC contains the peer MAC address, and
- *	%NL80211_ATTR_REASON_CODE the reason code to be used (only with
- *	%NL80211_TDLS_TEARDOWN).
- * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame.
- *
- * @NL80211_CMD_UNEXPECTED_FRAME: Used by an application controlling an AP
- *	(or GO) interface (i.e. hostapd) to ask for unexpected frames to
- *	implement sending deauth to stations that send unexpected class 3
- *	frames. Also used as the event sent by the kernel when such a frame
- *	is received.
- *	For the event, the %NL80211_ATTR_MAC attribute carries the TA and
- *	other attributes like the interface index are present.
- *	If used as the command it must have an interface index and you can
- *	only unsubscribe from the event by closing the socket. Subscription
- *	is also for %NL80211_CMD_UNEXPECTED_4ADDR_FRAME events.
- *
- * @NL80211_CMD_UNEXPECTED_4ADDR_FRAME: Sent as an event indicating that the
- *	associated station identified by %NL80211_ATTR_MAC sent a 4addr frame
- *	and wasn't already in a 4-addr VLAN. The event will be sent similarly
- *	to the %NL80211_CMD_UNEXPECTED_FRAME event, to the same listener.
- *
- * @NL80211_CMD_PROBE_CLIENT: Probe an associated station on an AP interface
- *	by sending a null data frame to it and reporting when the frame is
- *	acknowleged. This is used to allow timing out inactive clients. Uses
- *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_MAC. The command returns a
- *	direct reply with an %NL80211_ATTR_COOKIE that is later used to match
- *	up the event with the request. The event includes the same data and
- *	has %NL80211_ATTR_ACK set if the frame was ACKed.
- *
- * @NL80211_CMD_REGISTER_BEACONS: Register this socket to receive beacons from
- *	other BSSes when any interfaces are in AP mode. This helps implement
- *	OLBC handling in hostapd. Beacons are reported in %NL80211_CMD_FRAME
- *	messages. Note that per PHY only one application may register.
- *
- * @NL80211_CMD_SET_NOACK_MAP: sets a bitmap for the individual TIDs whether
- *      No Acknowledgement Policy should be applied.
- *
- * @NL80211_CMD_CH_SWITCH_NOTIFY: An AP or GO may decide to switch channels
- *	independently of the userspace SME, send this event indicating
- *	%NL80211_ATTR_IFINDEX is now on %NL80211_ATTR_WIPHY_FREQ and the
- *	attributes determining channel width.
- *
- * @NL80211_CMD_START_P2P_DEVICE: Start the given P2P Device, identified by
- *	its %NL80211_ATTR_WDEV identifier. It must have been created with
- *	%NL80211_CMD_NEW_INTERFACE previously. After it has been started, the
- *	P2P Device can be used for P2P operations, e.g. remain-on-channel and
- *	public action frame TX.
- * @NL80211_CMD_STOP_P2P_DEVICE: Stop the given P2P Device, identified by
- *	its %NL80211_ATTR_WDEV identifier.
- *
- * @NL80211_CMD_CONN_FAILED: connection request to an AP failed; used to
- *	notify userspace that AP has rejected the connection request from a
- *	station, due to particular reason. %NL80211_ATTR_CONN_FAILED_REASON
- *	is used for this.
- *
- * @NL80211_CMD_SET_MCAST_RATE: Change the rate used to send multicast frames
- *	for IBSS or MESH vif.
- *
- * @NL80211_CMD_SET_MAC_ACL: sets ACL for MAC address based access control.
- *	This is to be used with the drivers advertising the support of MAC
- *	address based access control. List of MAC addresses is passed in
- *	%NL80211_ATTR_MAC_ADDRS and ACL policy is passed in
- *	%NL80211_ATTR_ACL_POLICY. Driver will enable ACL with this list, if it
- *	is not already done. The new list will replace any existing list. Driver
- *	will clear its ACL when the list of MAC addresses passed is empty. This
- *	command is used in AP/P2P GO mode. Driver has to make sure to clear its
- *	ACL list during %NL80211_CMD_STOP_AP.
- *
- * @NL80211_CMD_RADAR_DETECT: Start a Channel availability check (CAC). Once
- *	a radar is detected or the channel availability scan (CAC) has finished
- *	or was aborted, or a radar was detected, usermode will be notified with
- *	this event. This command is also used to notify userspace about radars
- *	while operating on this channel.
- *	%NL80211_ATTR_RADAR_EVENT is used to inform about the type of the
- *	event.
- *
- * @NL80211_CMD_GET_PROTOCOL_FEATURES: Get global nl80211 protocol features,
- *	i.e. features for the nl80211 protocol rather than device features.
- *	Returns the features in the %NL80211_ATTR_PROTOCOL_FEATURES bitmap.
- *
- * @NL80211_CMD_UPDATE_FT_IES: Pass down the most up-to-date Fast Transition
- *	Information Element to the WLAN driver
- *
- * @NL80211_CMD_FT_EVENT: Send a Fast transition event from the WLAN driver
- *	to the supplicant. This will carry the target AP's MAC address along
- *	with the relevant Information Elements. This event is used to report
- *	received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE).
- *
- * @NL80211_CMD_MAX: highest used command number
- * @__NL80211_CMD_AFTER_LAST: internal use
- */
-enum nl80211_commands {
-/* don't change the order or add anything between, this is ABI! */
-	NL80211_CMD_UNSPEC,
-
-	NL80211_CMD_GET_WIPHY,		/* can dump */
-	NL80211_CMD_SET_WIPHY,
-	NL80211_CMD_NEW_WIPHY,
-	NL80211_CMD_DEL_WIPHY,
-
-	NL80211_CMD_GET_INTERFACE,	/* can dump */
-	NL80211_CMD_SET_INTERFACE,
-	NL80211_CMD_NEW_INTERFACE,
-	NL80211_CMD_DEL_INTERFACE,
-
-	NL80211_CMD_GET_KEY,
-	NL80211_CMD_SET_KEY,
-	NL80211_CMD_NEW_KEY,
-	NL80211_CMD_DEL_KEY,
-
-	NL80211_CMD_GET_BEACON,
-	NL80211_CMD_SET_BEACON,
-	NL80211_CMD_START_AP,
-	NL80211_CMD_NEW_BEACON = NL80211_CMD_START_AP,
-	NL80211_CMD_STOP_AP,
-	NL80211_CMD_DEL_BEACON = NL80211_CMD_STOP_AP,
-
-	NL80211_CMD_GET_STATION,
-	NL80211_CMD_SET_STATION,
-	NL80211_CMD_NEW_STATION,
-	NL80211_CMD_DEL_STATION,
-
-	NL80211_CMD_GET_MPATH,
-	NL80211_CMD_SET_MPATH,
-	NL80211_CMD_NEW_MPATH,
-	NL80211_CMD_DEL_MPATH,
-
-	NL80211_CMD_SET_BSS,
-
-	NL80211_CMD_SET_REG,
-	NL80211_CMD_REQ_SET_REG,
-
-	NL80211_CMD_GET_MESH_CONFIG,
-	NL80211_CMD_SET_MESH_CONFIG,
-
-	NL80211_CMD_SET_MGMT_EXTRA_IE /* reserved; not used */,
-
-	NL80211_CMD_GET_REG,
-
-	NL80211_CMD_GET_SCAN,
-	NL80211_CMD_TRIGGER_SCAN,
-	NL80211_CMD_NEW_SCAN_RESULTS,
-	NL80211_CMD_SCAN_ABORTED,
-
-	NL80211_CMD_REG_CHANGE,
-
-	NL80211_CMD_AUTHENTICATE,
-	NL80211_CMD_ASSOCIATE,
-	NL80211_CMD_DEAUTHENTICATE,
-	NL80211_CMD_DISASSOCIATE,
-
-	NL80211_CMD_MICHAEL_MIC_FAILURE,
-
-	NL80211_CMD_REG_BEACON_HINT,
-
-	NL80211_CMD_JOIN_IBSS,
-	NL80211_CMD_LEAVE_IBSS,
-
-	NL80211_CMD_TESTMODE,
-
-	NL80211_CMD_CONNECT,
-	NL80211_CMD_ROAM,
-	NL80211_CMD_DISCONNECT,
-
-	NL80211_CMD_SET_WIPHY_NETNS,
-
-	NL80211_CMD_GET_SURVEY,
-	NL80211_CMD_NEW_SURVEY_RESULTS,
-
-	NL80211_CMD_SET_PMKSA,
-	NL80211_CMD_DEL_PMKSA,
-	NL80211_CMD_FLUSH_PMKSA,
-
-	NL80211_CMD_REMAIN_ON_CHANNEL,
-	NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL,
-
-	NL80211_CMD_SET_TX_BITRATE_MASK,
-
-	NL80211_CMD_REGISTER_FRAME,
-	NL80211_CMD_REGISTER_ACTION = NL80211_CMD_REGISTER_FRAME,
-	NL80211_CMD_FRAME,
-	NL80211_CMD_ACTION = NL80211_CMD_FRAME,
-	NL80211_CMD_FRAME_TX_STATUS,
-	NL80211_CMD_ACTION_TX_STATUS = NL80211_CMD_FRAME_TX_STATUS,
-
-	NL80211_CMD_SET_POWER_SAVE,
-	NL80211_CMD_GET_POWER_SAVE,
-
-	NL80211_CMD_SET_CQM,
-	NL80211_CMD_NOTIFY_CQM,
-
-	NL80211_CMD_SET_CHANNEL,
-	NL80211_CMD_SET_WDS_PEER,
-
-	NL80211_CMD_FRAME_WAIT_CANCEL,
-
-	NL80211_CMD_JOIN_MESH,
-	NL80211_CMD_LEAVE_MESH,
-
-	NL80211_CMD_UNPROT_DEAUTHENTICATE,
-	NL80211_CMD_UNPROT_DISASSOCIATE,
-
-	NL80211_CMD_NEW_PEER_CANDIDATE,
-
-	NL80211_CMD_GET_WOWLAN,
-	NL80211_CMD_SET_WOWLAN,
-
-	NL80211_CMD_START_SCHED_SCAN,
-	NL80211_CMD_STOP_SCHED_SCAN,
-	NL80211_CMD_SCHED_SCAN_RESULTS,
-	NL80211_CMD_SCHED_SCAN_STOPPED,
-
-	NL80211_CMD_SET_REKEY_OFFLOAD,
-
-	NL80211_CMD_PMKSA_CANDIDATE,
-
-	NL80211_CMD_TDLS_OPER,
-	NL80211_CMD_TDLS_MGMT,
-
-	NL80211_CMD_UNEXPECTED_FRAME,
-
-	NL80211_CMD_PROBE_CLIENT,
-
-	NL80211_CMD_REGISTER_BEACONS,
-
-	NL80211_CMD_UNEXPECTED_4ADDR_FRAME,
-
-	NL80211_CMD_SET_NOACK_MAP,
-
-	NL80211_CMD_CH_SWITCH_NOTIFY,
-
-	NL80211_CMD_START_P2P_DEVICE,
-	NL80211_CMD_STOP_P2P_DEVICE,
-
-	NL80211_CMD_CONN_FAILED,
-
-	NL80211_CMD_SET_MCAST_RATE,
-
-	NL80211_CMD_SET_MAC_ACL,
-
-	NL80211_CMD_RADAR_DETECT,
-
-	NL80211_CMD_GET_PROTOCOL_FEATURES,
-
-	NL80211_CMD_UPDATE_FT_IES,
-	NL80211_CMD_FT_EVENT,
-
-	/* add new commands above here */
-
-	/* used to define NL80211_CMD_MAX below */
-	__NL80211_CMD_AFTER_LAST,
-	NL80211_CMD_MAX = __NL80211_CMD_AFTER_LAST - 1
-};
-
-/*
- * Allow user space programs to use #ifdef on new commands by defining them
- * here
- */
-#define NL80211_CMD_SET_BSS NL80211_CMD_SET_BSS
-#define NL80211_CMD_SET_MGMT_EXTRA_IE NL80211_CMD_SET_MGMT_EXTRA_IE
-#define NL80211_CMD_REG_CHANGE NL80211_CMD_REG_CHANGE
-#define NL80211_CMD_AUTHENTICATE NL80211_CMD_AUTHENTICATE
-#define NL80211_CMD_ASSOCIATE NL80211_CMD_ASSOCIATE
-#define NL80211_CMD_DEAUTHENTICATE NL80211_CMD_DEAUTHENTICATE
-#define NL80211_CMD_DISASSOCIATE NL80211_CMD_DISASSOCIATE
-#define NL80211_CMD_REG_BEACON_HINT NL80211_CMD_REG_BEACON_HINT
-
-#define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS
-
-/* source-level API compatibility */
-#define NL80211_CMD_GET_MESH_PARAMS NL80211_CMD_GET_MESH_CONFIG
-#define NL80211_CMD_SET_MESH_PARAMS NL80211_CMD_SET_MESH_CONFIG
-#define NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE NL80211_MESH_SETUP_IE
-
-/**
- * enum nl80211_attrs - nl80211 netlink attributes
- *
- * @NL80211_ATTR_UNSPEC: unspecified attribute to catch errors
- *
- * @NL80211_ATTR_WIPHY: index of wiphy to operate on, cf.
- *	/sys/class/ieee80211/<phyname>/index
- * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
- * @NL80211_ATTR_WIPHY_TXQ_PARAMS: a nested array of TX queue parameters
- * @NL80211_ATTR_WIPHY_FREQ: frequency of the selected channel in MHz,
- *	defines the channel together with the (deprecated)
- *	%NL80211_ATTR_WIPHY_CHANNEL_TYPE attribute or the attributes
- *	%NL80211_ATTR_CHANNEL_WIDTH and if needed %NL80211_ATTR_CENTER_FREQ1
- *	and %NL80211_ATTR_CENTER_FREQ2
- * @NL80211_ATTR_CHANNEL_WIDTH: u32 attribute containing one of the values
- *	of &enum nl80211_chan_width, describing the channel width. See the
- *	documentation of the enum for more information.
- * @NL80211_ATTR_CENTER_FREQ1: Center frequency of the first part of the
- *	channel, used for anything but 20 MHz bandwidth
- * @NL80211_ATTR_CENTER_FREQ2: Center frequency of the second part of the
- *	channel, used only for 80+80 MHz bandwidth
- * @NL80211_ATTR_WIPHY_CHANNEL_TYPE: included with NL80211_ATTR_WIPHY_FREQ
- *	if HT20 or HT40 are to be used (i.e., HT disabled if not included):
- *	NL80211_CHAN_NO_HT = HT not allowed (i.e., same as not including
- *		this attribute)
- *	NL80211_CHAN_HT20 = HT20 only
- *	NL80211_CHAN_HT40MINUS = secondary channel is below the primary channel
- *	NL80211_CHAN_HT40PLUS = secondary channel is above the primary channel
- *	This attribute is now deprecated.
- * @NL80211_ATTR_WIPHY_RETRY_SHORT: TX retry limit for frames whose length is
- *	less than or equal to the RTS threshold; allowed range: 1..255;
- *	dot11ShortRetryLimit; u8
- * @NL80211_ATTR_WIPHY_RETRY_LONG: TX retry limit for frames whose length is
- *	greater than the RTS threshold; allowed range: 1..255;
- *	dot11ShortLongLimit; u8
- * @NL80211_ATTR_WIPHY_FRAG_THRESHOLD: fragmentation threshold, i.e., maximum
- *	length in octets for frames; allowed range: 256..8000, disable
- *	fragmentation with (u32)-1; dot11FragmentationThreshold; u32
- * @NL80211_ATTR_WIPHY_RTS_THRESHOLD: RTS threshold (TX frames with length
- *	larger than or equal to this use RTS/CTS handshake); allowed range:
- *	0..65536, disable with (u32)-1; dot11RTSThreshold; u32
- * @NL80211_ATTR_WIPHY_COVERAGE_CLASS: Coverage Class as defined by IEEE 802.11
- *	section 7.3.2.9; dot11CoverageClass; u8
- *
- * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
- * @NL80211_ATTR_IFNAME: network interface name
- * @NL80211_ATTR_IFTYPE: type of virtual interface, see &enum nl80211_iftype
- *
- * @NL80211_ATTR_WDEV: wireless device identifier, used for pseudo-devices
- *	that don't have a netdev (u64)
- *
- * @NL80211_ATTR_MAC: MAC address (various uses)
- *
- * @NL80211_ATTR_KEY_DATA: (temporal) key data; for TKIP this consists of
- *	16 bytes encryption key followed by 8 bytes each for TX and RX MIC
- *	keys
- * @NL80211_ATTR_KEY_IDX: key ID (u8, 0-3)
- * @NL80211_ATTR_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11
- *	section 7.3.2.25.1, e.g. 0x000FAC04)
- * @NL80211_ATTR_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
- *	CCMP keys, each six bytes in little endian
- * @NL80211_ATTR_KEY_DEFAULT: Flag attribute indicating the key is default key
- * @NL80211_ATTR_KEY_DEFAULT_MGMT: Flag attribute indicating the key is the
- *	default management key
- * @NL80211_ATTR_CIPHER_SUITES_PAIRWISE: For crypto settings for connect or
- *	other commands, indicates which pairwise cipher suites are used
- * @NL80211_ATTR_CIPHER_SUITE_GROUP: For crypto settings for connect or
- *	other commands, indicates which group cipher suite is used
- *
- * @NL80211_ATTR_BEACON_INTERVAL: beacon interval in TU
- * @NL80211_ATTR_DTIM_PERIOD: DTIM period for beaconing
- * @NL80211_ATTR_BEACON_HEAD: portion of the beacon before the TIM IE
- * @NL80211_ATTR_BEACON_TAIL: portion of the beacon after the TIM IE
- *
- * @NL80211_ATTR_STA_AID: Association ID for the station (u16)
- * @NL80211_ATTR_STA_FLAGS: flags, nested element with NLA_FLAG attributes of
- *	&enum nl80211_sta_flags (deprecated, use %NL80211_ATTR_STA_FLAGS2)
- * @NL80211_ATTR_STA_LISTEN_INTERVAL: listen interval as defined by
- *	IEEE 802.11 7.3.1.6 (u16).
- * @NL80211_ATTR_STA_SUPPORTED_RATES: supported rates, array of supported
- *	rates as defined by IEEE 802.11 7.3.2.2 but without the length
- *	restriction (at most %NL80211_MAX_SUPP_RATES).
- * @NL80211_ATTR_STA_VLAN: interface index of VLAN interface to move station
- *	to, or the AP interface the station was originally added to to.
- * @NL80211_ATTR_STA_INFO: information about a station, part of station info
- *	given for %NL80211_CMD_GET_STATION, nested attribute containing
- *	info as possible, see &enum nl80211_sta_info.
- *
- * @NL80211_ATTR_WIPHY_BANDS: Information about an operating bands,
- *	consisting of a nested array.
- *
- * @NL80211_ATTR_MESH_ID: mesh id (1-32 bytes).
- * @NL80211_ATTR_STA_PLINK_ACTION: action to perform on the mesh peer link
- *	(see &enum nl80211_plink_action).
- * @NL80211_ATTR_MPATH_NEXT_HOP: MAC address of the next hop for a mesh path.
- * @NL80211_ATTR_MPATH_INFO: information about a mesh_path, part of mesh path
- * 	info given for %NL80211_CMD_GET_MPATH, nested attribute described at
- *	&enum nl80211_mpath_info.
- *
- * @NL80211_ATTR_MNTR_FLAGS: flags, nested element with NLA_FLAG attributes of
- *      &enum nl80211_mntr_flags.
- *
- * @NL80211_ATTR_REG_ALPHA2: an ISO-3166-alpha2 country code for which the
- * 	current regulatory domain should be set to or is already set to.
- * 	For example, 'CR', for Costa Rica. This attribute is used by the kernel
- * 	to query the CRDA to retrieve one regulatory domain. This attribute can
- * 	also be used by userspace to query the kernel for the currently set
- * 	regulatory domain. We chose an alpha2 as that is also used by the
- * 	IEEE-802.11d country information element to identify a country.
- * 	Users can also simply ask the wireless core to set regulatory domain
- * 	to a specific alpha2.
- * @NL80211_ATTR_REG_RULES: a nested array of regulatory domain regulatory
- *	rules.
- *
- * @NL80211_ATTR_BSS_CTS_PROT: whether CTS protection is enabled (u8, 0 or 1)
- * @NL80211_ATTR_BSS_SHORT_PREAMBLE: whether short preamble is enabled
- *	(u8, 0 or 1)
- * @NL80211_ATTR_BSS_SHORT_SLOT_TIME: whether short slot time enabled
- *	(u8, 0 or 1)
- * @NL80211_ATTR_BSS_BASIC_RATES: basic rates, array of basic
- *	rates in format defined by IEEE 802.11 7.3.2.2 but without the length
- *	restriction (at most %NL80211_MAX_SUPP_RATES).
- *
- * @NL80211_ATTR_HT_CAPABILITY: HT Capability information element (from
- *	association request when used with NL80211_CMD_NEW_STATION)
- *
- * @NL80211_ATTR_SUPPORTED_IFTYPES: nested attribute containing all
- *	supported interface types, each a flag attribute with the number
- *	of the interface mode.
- *
- * @NL80211_ATTR_MGMT_SUBTYPE: Management frame subtype for
- *	%NL80211_CMD_SET_MGMT_EXTRA_IE.
- *
- * @NL80211_ATTR_IE: Information element(s) data (used, e.g., with
- *	%NL80211_CMD_SET_MGMT_EXTRA_IE).
- *
- * @NL80211_ATTR_MAX_NUM_SCAN_SSIDS: number of SSIDs you can scan with
- *	a single scan request, a wiphy attribute.
- * @NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS: number of SSIDs you can
- *	scan with a single scheduled scan request, a wiphy attribute.
- * @NL80211_ATTR_MAX_SCAN_IE_LEN: maximum length of information elements
- *	that can be added to a scan request
- * @NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN: maximum length of information
- *	elements that can be added to a scheduled scan request
- * @NL80211_ATTR_MAX_MATCH_SETS: maximum number of sets that can be
- *	used with @NL80211_ATTR_SCHED_SCAN_MATCH, a wiphy attribute.
- *
- * @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz)
- * @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive
- *	scanning and include a zero-length SSID (wildcard) for wildcard scan
- * @NL80211_ATTR_BSS: scan result BSS
- *
- * @NL80211_ATTR_REG_INITIATOR: indicates who requested the regulatory domain
- * 	currently in effect. This could be any of the %NL80211_REGDOM_SET_BY_*
- * @NL80211_ATTR_REG_TYPE: indicates the type of the regulatory domain currently
- * 	set. This can be one of the nl80211_reg_type (%NL80211_REGDOM_TYPE_*)
- *
- * @NL80211_ATTR_SUPPORTED_COMMANDS: wiphy attribute that specifies
- *	an array of command numbers (i.e. a mapping index to command number)
- *	that the driver for the given wiphy supports.
- *
- * @NL80211_ATTR_FRAME: frame data (binary attribute), including frame header
- *	and body, but not FCS; used, e.g., with NL80211_CMD_AUTHENTICATE and
- *	NL80211_CMD_ASSOCIATE events
- * @NL80211_ATTR_SSID: SSID (binary attribute, 0..32 octets)
- * @NL80211_ATTR_AUTH_TYPE: AuthenticationType, see &enum nl80211_auth_type,
- *	represented as a u32
- * @NL80211_ATTR_REASON_CODE: ReasonCode for %NL80211_CMD_DEAUTHENTICATE and
- *	%NL80211_CMD_DISASSOCIATE, u16
- *
- * @NL80211_ATTR_KEY_TYPE: Key Type, see &enum nl80211_key_type, represented as
- *	a u32
- *
- * @NL80211_ATTR_FREQ_BEFORE: A channel which has suffered a regulatory change
- * 	due to considerations from a beacon hint. This attribute reflects
- * 	the state of the channel _before_ the beacon hint processing. This
- * 	attributes consists of a nested attribute containing
- * 	NL80211_FREQUENCY_ATTR_*
- * @NL80211_ATTR_FREQ_AFTER: A channel which has suffered a regulatory change
- * 	due to considerations from a beacon hint. This attribute reflects
- * 	the state of the channel _after_ the beacon hint processing. This
- * 	attributes consists of a nested attribute containing
- * 	NL80211_FREQUENCY_ATTR_*
- *
- * @NL80211_ATTR_CIPHER_SUITES: a set of u32 values indicating the supported
- *	cipher suites
- *
- * @NL80211_ATTR_FREQ_FIXED: a flag indicating the IBSS should not try to look
- *	for other networks on different channels
- *
- * @NL80211_ATTR_TIMED_OUT: a flag indicating than an operation timed out; this
- *	is used, e.g., with %NL80211_CMD_AUTHENTICATE event
- *
- * @NL80211_ATTR_USE_MFP: Whether management frame protection (IEEE 802.11w) is
- *	used for the association (&enum nl80211_mfp, represented as a u32);
- *	this attribute can be used
- *	with %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests
- *
- * @NL80211_ATTR_STA_FLAGS2: Attribute containing a
- *	&struct nl80211_sta_flag_update.
- *
- * @NL80211_ATTR_CONTROL_PORT: A flag indicating whether user space controls
- *	IEEE 802.1X port, i.e., sets/clears %NL80211_STA_FLAG_AUTHORIZED, in
- *	station mode. If the flag is included in %NL80211_CMD_ASSOCIATE
- *	request, the driver will assume that the port is unauthorized until
- *	authorized by user space. Otherwise, port is marked authorized by
- *	default in station mode.
- * @NL80211_ATTR_CONTROL_PORT_ETHERTYPE: A 16-bit value indicating the
- *	ethertype that will be used for key negotiation. It can be
- *	specified with the associate and connect commands. If it is not
- *	specified, the value defaults to 0x888E (PAE, 802.1X). This
- *	attribute is also used as a flag in the wiphy information to
- *	indicate that protocols other than PAE are supported.
- * @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with
- *	%NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom
- *	ethertype frames used for key negotiation must not be encrypted.
- *
- * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
- *	We recommend using nested, driver-specific attributes within this.
- *
- * @NL80211_ATTR_DISCONNECTED_BY_AP: A flag indicating that the DISCONNECT
- *	event was due to the AP disconnecting the station, and not due to
- *	a local disconnect request.
- * @NL80211_ATTR_STATUS_CODE: StatusCode for the %NL80211_CMD_CONNECT
- *	event (u16)
- * @NL80211_ATTR_PRIVACY: Flag attribute, used with connect(), indicating
- *	that protected APs should be used. This is also used with NEW_BEACON to
- *	indicate that the BSS is to use protection.
- *
- * @NL80211_ATTR_CIPHERS_PAIRWISE: Used with CONNECT, ASSOCIATE, and NEW_BEACON
- *	to indicate which unicast key ciphers will be used with the connection
- *	(an array of u32).
- * @NL80211_ATTR_CIPHER_GROUP: Used with CONNECT, ASSOCIATE, and NEW_BEACON to
- *	indicate which group key cipher will be used with the connection (a
- *	u32).
- * @NL80211_ATTR_WPA_VERSIONS: Used with CONNECT, ASSOCIATE, and NEW_BEACON to
- *	indicate which WPA version(s) the AP we want to associate with is using
- *	(a u32 with flags from &enum nl80211_wpa_versions).
- * @NL80211_ATTR_AKM_SUITES: Used with CONNECT, ASSOCIATE, and NEW_BEACON to
- *	indicate which key management algorithm(s) to use (an array of u32).
- *
- * @NL80211_ATTR_REQ_IE: (Re)association request information elements as
- *	sent out by the card, for ROAM and successful CONNECT events.
- * @NL80211_ATTR_RESP_IE: (Re)association response information elements as
- *	sent by peer, for ROAM and successful CONNECT events.
- *
- * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE
- *	commands to specify using a reassociate frame
- *
- * @NL80211_ATTR_KEY: key information in a nested attribute with
- *	%NL80211_KEY_* sub-attributes
- * @NL80211_ATTR_KEYS: array of keys for static WEP keys for connect()
- *	and join_ibss(), key information is in a nested attribute each
- *	with %NL80211_KEY_* sub-attributes
- *
- * @NL80211_ATTR_PID: Process ID of a network namespace.
- *
- * @NL80211_ATTR_GENERATION: Used to indicate consistent snapshots for
- *	dumps. This number increases whenever the object list being
- *	dumped changes, and as such userspace can verify that it has
- *	obtained a complete and consistent snapshot by verifying that
- *	all dump messages contain the same generation number. If it
- *	changed then the list changed and the dump should be repeated
- *	completely from scratch.
- *
- * @NL80211_ATTR_4ADDR: Use 4-address frames on a virtual interface
- *
- * @NL80211_ATTR_SURVEY_INFO: survey information about a channel, part of
- *      the survey response for %NL80211_CMD_GET_SURVEY, nested attribute
- *      containing info as possible, see &enum survey_info.
- *
- * @NL80211_ATTR_PMKID: PMK material for PMKSA caching.
- * @NL80211_ATTR_MAX_NUM_PMKIDS: maximum number of PMKIDs a firmware can
- *	cache, a wiphy attribute.
- *
- * @NL80211_ATTR_DURATION: Duration of an operation in milliseconds, u32.
- * @NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION: Device attribute that
- *	specifies the maximum duration that can be requested with the
- *	remain-on-channel operation, in milliseconds, u32.
- *
- * @NL80211_ATTR_COOKIE: Generic 64-bit cookie to identify objects.
- *
- * @NL80211_ATTR_TX_RATES: Nested set of attributes
- *	(enum nl80211_tx_rate_attributes) describing TX rates per band. The
- *	enum nl80211_band value is used as the index (nla_type() of the nested
- *	data. If a band is not included, it will be configured to allow all
- *	rates based on negotiated supported rates information. This attribute
- *	is used with %NL80211_CMD_SET_TX_BITRATE_MASK.
- *
- * @NL80211_ATTR_FRAME_MATCH: A binary attribute which typically must contain
- *	at least one byte, currently used with @NL80211_CMD_REGISTER_FRAME.
- * @NL80211_ATTR_FRAME_TYPE: A u16 indicating the frame type/subtype for the
- *	@NL80211_CMD_REGISTER_FRAME command.
- * @NL80211_ATTR_TX_FRAME_TYPES: wiphy capability attribute, which is a
- *	nested attribute of %NL80211_ATTR_FRAME_TYPE attributes, containing
- *	information about which frame types can be transmitted with
- *	%NL80211_CMD_FRAME.
- * @NL80211_ATTR_RX_FRAME_TYPES: wiphy capability attribute, which is a
- *	nested attribute of %NL80211_ATTR_FRAME_TYPE attributes, containing
- *	information about which frame types can be registered for RX.
- *
- * @NL80211_ATTR_ACK: Flag attribute indicating that the frame was
- *	acknowledged by the recipient.
- *
- * @NL80211_ATTR_PS_STATE: powersave state, using &enum nl80211_ps_state values.
- *
- * @NL80211_ATTR_CQM: connection quality monitor configuration in a
- *	nested attribute with %NL80211_ATTR_CQM_* sub-attributes.
- *
- * @NL80211_ATTR_LOCAL_STATE_CHANGE: Flag attribute to indicate that a command
- *	is requesting a local authentication/association state change without
- *	invoking actual management frame exchange. This can be used with
- *	NL80211_CMD_AUTHENTICATE, NL80211_CMD_DEAUTHENTICATE,
- *	NL80211_CMD_DISASSOCIATE.
- *
- * @NL80211_ATTR_AP_ISOLATE: (AP mode) Do not forward traffic between stations
- *	connected to this BSS.
- *
- * @NL80211_ATTR_WIPHY_TX_POWER_SETTING: Transmit power setting type. See
- *      &enum nl80211_tx_power_setting for possible values.
- * @NL80211_ATTR_WIPHY_TX_POWER_LEVEL: Transmit power level in signed mBm units.
- *      This is used in association with @NL80211_ATTR_WIPHY_TX_POWER_SETTING
- *      for non-automatic settings.
- *
- * @NL80211_ATTR_SUPPORT_IBSS_RSN: The device supports IBSS RSN, which mostly
- *	means support for per-station GTKs.
- *
- * @NL80211_ATTR_WIPHY_ANTENNA_TX: Bitmap of allowed antennas for transmitting.
- *	This can be used to mask out antennas which are not attached or should
- *	not be used for transmitting. If an antenna is not selected in this
- *	bitmap the hardware is not allowed to transmit on this antenna.
- *
- *	Each bit represents one antenna, starting with antenna 1 at the first
- *	bit. Depending on which antennas are selected in the bitmap, 802.11n
- *	drivers can derive which chainmasks to use (if all antennas belonging to
- *	a particular chain are disabled this chain should be disabled) and if
- *	a chain has diversity antennas wether diversity should be used or not.
- *	HT capabilities (STBC, TX Beamforming, Antenna selection) can be
- *	derived from the available chains after applying the antenna mask.
- *	Non-802.11n drivers can derive wether to use diversity or not.
- *	Drivers may reject configurations or RX/TX mask combinations they cannot
- *	support by returning -EINVAL.
- *
- * @NL80211_ATTR_WIPHY_ANTENNA_RX: Bitmap of allowed antennas for receiving.
- *	This can be used to mask out antennas which are not attached or should
- *	not be used for receiving. If an antenna is not selected in this bitmap
- *	the hardware should not be configured to receive on this antenna.
- *	For a more detailed description see @NL80211_ATTR_WIPHY_ANTENNA_TX.
- *
- * @NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX: Bitmap of antennas which are available
- *	for configuration as TX antennas via the above parameters.
- *
- * @NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX: Bitmap of antennas which are available
- *	for configuration as RX antennas via the above parameters.
- *
- * @NL80211_ATTR_MCAST_RATE: Multicast tx rate (in 100 kbps) for IBSS
- *
- * @NL80211_ATTR_OFFCHANNEL_TX_OK: For management frame TX, the frame may be
- *	transmitted on another channel when the channel given doesn't match
- *	the current channel. If the current channel doesn't match and this
- *	flag isn't set, the frame will be rejected. This is also used as an
- *	nl80211 capability flag.
- *
- * @NL80211_ATTR_BSS_HT_OPMODE: HT operation mode (u16)
- *
- * @NL80211_ATTR_KEY_DEFAULT_TYPES: A nested attribute containing flags
- *	attributes, specifying what a key should be set as default as.
- *	See &enum nl80211_key_default_types.
- *
- * @NL80211_ATTR_MESH_SETUP: Optional mesh setup parameters.  These cannot be
- *	changed once the mesh is active.
- * @NL80211_ATTR_MESH_CONFIG: Mesh configuration parameters, a nested attribute
- *	containing attributes from &enum nl80211_meshconf_params.
- * @NL80211_ATTR_SUPPORT_MESH_AUTH: Currently, this means the underlying driver
- *	allows auth frames in a mesh to be passed to userspace for processing via
- *	the @NL80211_MESH_SETUP_USERSPACE_AUTH flag.
- * @NL80211_ATTR_STA_PLINK_STATE: The state of a mesh peer link as defined in
- *	&enum nl80211_plink_state. Used when userspace is driving the peer link
- *	management state machine.  @NL80211_MESH_SETUP_USERSPACE_AMPE or
- *	@NL80211_MESH_SETUP_USERSPACE_MPM must be enabled.
- *
- * @NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED: indicates, as part of the wiphy
- *	capabilities, the supported WoWLAN triggers
- * @NL80211_ATTR_WOWLAN_TRIGGERS: used by %NL80211_CMD_SET_WOWLAN to
- *	indicate which WoW triggers should be enabled. This is also
- *	used by %NL80211_CMD_GET_WOWLAN to get the currently enabled WoWLAN
- *	triggers.
- *
- * @NL80211_ATTR_SCHED_SCAN_INTERVAL: Interval between scheduled scan
- *	cycles, in msecs.
- *
- * @NL80211_ATTR_SCHED_SCAN_MATCH: Nested attribute with one or more
- *	sets of attributes to match during scheduled scans.  Only BSSs
- *	that match any of the sets will be reported.  These are
- *	pass-thru filter rules.
- *	For a match to succeed, the BSS must match all attributes of a
- *	set.  Since not every hardware supports matching all types of
- *	attributes, there is no guarantee that the reported BSSs are
- *	fully complying with the match sets and userspace needs to be
- *	able to ignore them by itself.
- *	Thus, the implementation is somewhat hardware-dependent, but
- *	this is only an optimization and the userspace application
- *	needs to handle all the non-filtered results anyway.
- *	If the match attributes don't make sense when combined with
- *	the values passed in @NL80211_ATTR_SCAN_SSIDS (eg. if an SSID
- *	is included in the probe request, but the match attributes
- *	will never let it go through), -EINVAL may be returned.
- *	If ommited, no filtering is done.
- *
- * @NL80211_ATTR_INTERFACE_COMBINATIONS: Nested attribute listing the supported
- *	interface combinations. In each nested item, it contains attributes
- *	defined in &enum nl80211_if_combination_attrs.
- * @NL80211_ATTR_SOFTWARE_IFTYPES: Nested attribute (just like
- *	%NL80211_ATTR_SUPPORTED_IFTYPES) containing the interface types that
- *	are managed in software: interfaces of these types aren't subject to
- *	any restrictions in their number or combinations.
- *
- * @NL80211_ATTR_REKEY_DATA: nested attribute containing the information
- *	necessary for GTK rekeying in the device, see &enum nl80211_rekey_data.
- *
- * @NL80211_ATTR_SCAN_SUPP_RATES: rates per to be advertised as supported in scan,
- *	nested array attribute containing an entry for each band, with the entry
- *	being a list of supported rates as defined by IEEE 802.11 7.3.2.2 but
- *	without the length restriction (at most %NL80211_MAX_SUPP_RATES).
- *
- * @NL80211_ATTR_HIDDEN_SSID: indicates whether SSID is to be hidden from Beacon
- *	and Probe Response (when response to wildcard Probe Request); see
- *	&enum nl80211_hidden_ssid, represented as a u32
- *
- * @NL80211_ATTR_IE_PROBE_RESP: Information element(s) for Probe Response frame.
- *	This is used with %NL80211_CMD_NEW_BEACON and %NL80211_CMD_SET_BEACON to
- *	provide extra IEs (e.g., WPS/P2P IE) into Probe Response frames when the
- *	driver (or firmware) replies to Probe Request frames.
- * @NL80211_ATTR_IE_ASSOC_RESP: Information element(s) for (Re)Association
- *	Response frames. This is used with %NL80211_CMD_NEW_BEACON and
- *	%NL80211_CMD_SET_BEACON to provide extra IEs (e.g., WPS/P2P IE) into
- *	(Re)Association Response frames when the driver (or firmware) replies to
- *	(Re)Association Request frames.
- *
- * @NL80211_ATTR_STA_WME: Nested attribute containing the wme configuration
- *	of the station, see &enum nl80211_sta_wme_attr.
- * @NL80211_ATTR_SUPPORT_AP_UAPSD: the device supports uapsd when working
- *	as AP.
- *
- * @NL80211_ATTR_ROAM_SUPPORT: Indicates whether the firmware is capable of
- *	roaming to another AP in the same ESS if the signal lever is low.
- *
- * @NL80211_ATTR_PMKSA_CANDIDATE: Nested attribute containing the PMKSA caching
- *	candidate information, see &enum nl80211_pmksa_candidate_attr.
- *
- * @NL80211_ATTR_TX_NO_CCK_RATE: Indicates whether to use CCK rate or not
- *	for management frames transmission. In order to avoid p2p probe/action
- *	frames are being transmitted at CCK rate in 2GHz band, the user space
- *	applications use this attribute.
- *	This attribute is used with %NL80211_CMD_TRIGGER_SCAN and
- *	%NL80211_CMD_FRAME commands.
- *
- * @NL80211_ATTR_TDLS_ACTION: Low level TDLS action code (e.g. link setup
- *	request, link setup confirm, link teardown, etc.). Values are
- *	described in the TDLS (802.11z) specification.
- * @NL80211_ATTR_TDLS_DIALOG_TOKEN: Non-zero token for uniquely identifying a
- *	TDLS conversation between two devices.
- * @NL80211_ATTR_TDLS_OPERATION: High level TDLS operation; see
- *	&enum nl80211_tdls_operation, represented as a u8.
- * @NL80211_ATTR_TDLS_SUPPORT: A flag indicating the device can operate
- *	as a TDLS peer sta.
- * @NL80211_ATTR_TDLS_EXTERNAL_SETUP: The TDLS discovery/setup and teardown
- *	procedures should be performed by sending TDLS packets via
- *	%NL80211_CMD_TDLS_MGMT. Otherwise %NL80211_CMD_TDLS_OPER should be
- *	used for asking the driver to perform a TDLS operation.
- *
- * @NL80211_ATTR_DEVICE_AP_SME: This u32 attribute may be listed for devices
- *	that have AP support to indicate that they have the AP SME integrated
- *	with support for the features listed in this attribute, see
- *	&enum nl80211_ap_sme_features.
- *
- * @NL80211_ATTR_DONT_WAIT_FOR_ACK: Used with %NL80211_CMD_FRAME, this tells
- *	the driver to not wait for an acknowledgement. Note that due to this,
- *	it will also not give a status callback nor return a cookie. This is
- *	mostly useful for probe responses to save airtime.
- *
- * @NL80211_ATTR_FEATURE_FLAGS: This u32 attribute contains flags from
- *	&enum nl80211_feature_flags and is advertised in wiphy information.
- * @NL80211_ATTR_PROBE_RESP_OFFLOAD: Indicates that the HW responds to probe
- *	requests while operating in AP-mode.
- *	This attribute holds a bitmap of the supported protocols for
- *	offloading (see &enum nl80211_probe_resp_offload_support_attr).
- *
- * @NL80211_ATTR_PROBE_RESP: Probe Response template data. Contains the entire
- *	probe-response frame. The DA field in the 802.11 header is zero-ed out,
- *	to be filled by the FW.
- * @NL80211_ATTR_DISABLE_HT:  Force HT capable interfaces to disable
- *      this feature.  Currently, only supported in mac80211 drivers.
- * @NL80211_ATTR_HT_CAPABILITY_MASK: Specify which bits of the
- *      ATTR_HT_CAPABILITY to which attention should be paid.
- *      Currently, only mac80211 NICs support this feature.
- *      The values that may be configured are:
- *       MCS rates, MAX-AMSDU, HT-20-40 and HT_CAP_SGI_40
- *       AMPDU density and AMPDU factor.
- *      All values are treated as suggestions and may be ignored
- *      by the driver as required.  The actual values may be seen in
- *      the station debugfs ht_caps file.
- *
- * @NL80211_ATTR_DFS_REGION: region for regulatory rules which this country
- *    abides to when initiating radiation on DFS channels. A country maps
- *    to one DFS region.
- *
- * @NL80211_ATTR_NOACK_MAP: This u16 bitmap contains the No Ack Policy of
- *      up to 16 TIDs.
- *
- * @NL80211_ATTR_INACTIVITY_TIMEOUT: timeout value in seconds, this can be
- *	used by the drivers which has MLME in firmware and does not have support
- *	to report per station tx/rx activity to free up the staion entry from
- *	the list. This needs to be used when the driver advertises the
- *	capability to timeout the stations.
- *
- * @NL80211_ATTR_RX_SIGNAL_DBM: signal strength in dBm (as a 32-bit int);
- *	this attribute is (depending on the driver capabilities) added to
- *	received frames indicated with %NL80211_CMD_FRAME.
- *
- * @NL80211_ATTR_BG_SCAN_PERIOD: Background scan period in seconds
- *      or 0 to disable background scan.
- *
- * @NL80211_ATTR_USER_REG_HINT_TYPE: type of regulatory hint passed from
- *	userspace. If unset it is assumed the hint comes directly from
- *	a user. If set code could specify exactly what type of source
- *	was used to provide the hint. For the different types of
- *	allowed user regulatory hints see nl80211_user_reg_hint_type.
- *
- * @NL80211_ATTR_CONN_FAILED_REASON: The reason for which AP has rejected
- *	the connection request from a station. nl80211_connect_failed_reason
- *	enum has different reasons of connection failure.
- *
- * @NL80211_ATTR_SAE_DATA: SAE elements in Authentication frames. This starts
- *	with the Authentication transaction sequence number field.
- *
- * @NL80211_ATTR_VHT_CAPABILITY: VHT Capability information element (from
- *	association request when used with NL80211_CMD_NEW_STATION)
- *
- * @NL80211_ATTR_SCAN_FLAGS: scan request control flags (u32)
- *
- * @NL80211_ATTR_P2P_CTWINDOW: P2P GO Client Traffic Window (u8), used with
- *	the START_AP and SET_BSS commands
- * @NL80211_ATTR_P2P_OPPPS: P2P GO opportunistic PS (u8), used with the
- *	START_AP and SET_BSS commands. This can have the values 0 or 1;
- *	if not given in START_AP 0 is assumed, if not given in SET_BSS
- *	no change is made.
- *
- * @NL80211_ATTR_LOCAL_MESH_POWER_MODE: local mesh STA link-specific power mode
- *	defined in &enum nl80211_mesh_power_mode.
- *
- * @NL80211_ATTR_ACL_POLICY: ACL policy, see &enum nl80211_acl_policy,
- *	carried in a u32 attribute
- *
- * @NL80211_ATTR_MAC_ADDRS: Array of nested MAC addresses, used for
- *	MAC ACL.
- *
- * @NL80211_ATTR_MAC_ACL_MAX: u32 attribute to advertise the maximum
- *	number of MAC addresses that a device can support for MAC
- *	ACL.
- *
- * @NL80211_ATTR_RADAR_EVENT: Type of radar event for notification to userspace,
- *	contains a value of enum nl80211_radar_event (u32).
- *
- * @NL80211_ATTR_EXT_CAPA: 802.11 extended capabilities that the kernel driver
- *	has and handles. The format is the same as the IE contents. See
- *	802.11-2012 8.4.2.29 for more information.
- * @NL80211_ATTR_EXT_CAPA_MASK: Extended capabilities that the kernel driver
- *	has set in the %NL80211_ATTR_EXT_CAPA value, for multibit fields.
- *
- * @NL80211_ATTR_STA_CAPABILITY: Station capabilities (u16) are advertised to
- *	the driver, e.g., to enable TDLS power save (PU-APSD).
- *
- * @NL80211_ATTR_STA_EXT_CAPABILITY: Station extended capabilities are
- *	advertised to the driver, e.g., to enable TDLS off channel operations
- *	and PU-APSD.
- *
- * @NL80211_ATTR_PROTOCOL_FEATURES: global nl80211 feature flags, see
- *	&enum nl80211_protocol_features, the attribute is a u32.
- *
- * @NL80211_ATTR_SPLIT_WIPHY_DUMP: flag attribute, userspace supports
- *	receiving the data for a single wiphy split across multiple
- *	messages, given with wiphy dump message
- *
- * @NL80211_ATTR_MDID: Mobility Domain Identifier
- *
- * @NL80211_ATTR_IE_RIC: Resource Information Container Information
- *	Element
- *
- * @NL80211_ATTR_MAX: highest attribute number currently defined
- * @__NL80211_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_attrs {
-/* don't change the order or add anything between, this is ABI! */
-	NL80211_ATTR_UNSPEC,
-
-	NL80211_ATTR_WIPHY,
-	NL80211_ATTR_WIPHY_NAME,
-
-	NL80211_ATTR_IFINDEX,
-	NL80211_ATTR_IFNAME,
-	NL80211_ATTR_IFTYPE,
-
-	NL80211_ATTR_MAC,
-
-	NL80211_ATTR_KEY_DATA,
-	NL80211_ATTR_KEY_IDX,
-	NL80211_ATTR_KEY_CIPHER,
-	NL80211_ATTR_KEY_SEQ,
-	NL80211_ATTR_KEY_DEFAULT,
-
-	NL80211_ATTR_BEACON_INTERVAL,
-	NL80211_ATTR_DTIM_PERIOD,
-	NL80211_ATTR_BEACON_HEAD,
-	NL80211_ATTR_BEACON_TAIL,
-
-	NL80211_ATTR_STA_AID,
-	NL80211_ATTR_STA_FLAGS,
-	NL80211_ATTR_STA_LISTEN_INTERVAL,
-	NL80211_ATTR_STA_SUPPORTED_RATES,
-	NL80211_ATTR_STA_VLAN,
-	NL80211_ATTR_STA_INFO,
-
-	NL80211_ATTR_WIPHY_BANDS,
-
-	NL80211_ATTR_MNTR_FLAGS,
-
-	NL80211_ATTR_MESH_ID,
-	NL80211_ATTR_STA_PLINK_ACTION,
-	NL80211_ATTR_MPATH_NEXT_HOP,
-	NL80211_ATTR_MPATH_INFO,
-
-	NL80211_ATTR_BSS_CTS_PROT,
-	NL80211_ATTR_BSS_SHORT_PREAMBLE,
-	NL80211_ATTR_BSS_SHORT_SLOT_TIME,
-
-	NL80211_ATTR_HT_CAPABILITY,
-
-	NL80211_ATTR_SUPPORTED_IFTYPES,
-
-	NL80211_ATTR_REG_ALPHA2,
-	NL80211_ATTR_REG_RULES,
-
-	NL80211_ATTR_MESH_CONFIG,
-
-	NL80211_ATTR_BSS_BASIC_RATES,
-
-	NL80211_ATTR_WIPHY_TXQ_PARAMS,
-	NL80211_ATTR_WIPHY_FREQ,
-	NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-
-	NL80211_ATTR_KEY_DEFAULT_MGMT,
-
-	NL80211_ATTR_MGMT_SUBTYPE,
-	NL80211_ATTR_IE,
-
-	NL80211_ATTR_MAX_NUM_SCAN_SSIDS,
-
-	NL80211_ATTR_SCAN_FREQUENCIES,
-	NL80211_ATTR_SCAN_SSIDS,
-	NL80211_ATTR_GENERATION, /* replaces old SCAN_GENERATION */
-	NL80211_ATTR_BSS,
-
-	NL80211_ATTR_REG_INITIATOR,
-	NL80211_ATTR_REG_TYPE,
-
-	NL80211_ATTR_SUPPORTED_COMMANDS,
-
-	NL80211_ATTR_FRAME,
-	NL80211_ATTR_SSID,
-	NL80211_ATTR_AUTH_TYPE,
-	NL80211_ATTR_REASON_CODE,
-
-	NL80211_ATTR_KEY_TYPE,
-
-	NL80211_ATTR_MAX_SCAN_IE_LEN,
-	NL80211_ATTR_CIPHER_SUITES,
-
-	NL80211_ATTR_FREQ_BEFORE,
-	NL80211_ATTR_FREQ_AFTER,
-
-	NL80211_ATTR_FREQ_FIXED,
-
-
-	NL80211_ATTR_WIPHY_RETRY_SHORT,
-	NL80211_ATTR_WIPHY_RETRY_LONG,
-	NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
-	NL80211_ATTR_WIPHY_RTS_THRESHOLD,
-
-	NL80211_ATTR_TIMED_OUT,
-
-	NL80211_ATTR_USE_MFP,
-
-	NL80211_ATTR_STA_FLAGS2,
-
-	NL80211_ATTR_CONTROL_PORT,
-
-	NL80211_ATTR_TESTDATA,
-
-	NL80211_ATTR_PRIVACY,
-
-	NL80211_ATTR_DISCONNECTED_BY_AP,
-	NL80211_ATTR_STATUS_CODE,
-
-	NL80211_ATTR_CIPHER_SUITES_PAIRWISE,
-	NL80211_ATTR_CIPHER_SUITE_GROUP,
-	NL80211_ATTR_WPA_VERSIONS,
-	NL80211_ATTR_AKM_SUITES,
-
-	NL80211_ATTR_REQ_IE,
-	NL80211_ATTR_RESP_IE,
-
-	NL80211_ATTR_PREV_BSSID,
-
-	NL80211_ATTR_KEY,
-	NL80211_ATTR_KEYS,
-
-	NL80211_ATTR_PID,
-
-	NL80211_ATTR_4ADDR,
-
-	NL80211_ATTR_SURVEY_INFO,
-
-	NL80211_ATTR_PMKID,
-	NL80211_ATTR_MAX_NUM_PMKIDS,
-
-	NL80211_ATTR_DURATION,
-
-	NL80211_ATTR_COOKIE,
-
-	NL80211_ATTR_WIPHY_COVERAGE_CLASS,
-
-	NL80211_ATTR_TX_RATES,
-
-	NL80211_ATTR_FRAME_MATCH,
-
-	NL80211_ATTR_ACK,
-
-	NL80211_ATTR_PS_STATE,
-
-	NL80211_ATTR_CQM,
-
-	NL80211_ATTR_LOCAL_STATE_CHANGE,
-
-	NL80211_ATTR_AP_ISOLATE,
-
-	NL80211_ATTR_WIPHY_TX_POWER_SETTING,
-	NL80211_ATTR_WIPHY_TX_POWER_LEVEL,
-
-	NL80211_ATTR_TX_FRAME_TYPES,
-	NL80211_ATTR_RX_FRAME_TYPES,
-	NL80211_ATTR_FRAME_TYPE,
-
-	NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
-	NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,
-
-	NL80211_ATTR_SUPPORT_IBSS_RSN,
-
-	NL80211_ATTR_WIPHY_ANTENNA_TX,
-	NL80211_ATTR_WIPHY_ANTENNA_RX,
-
-	NL80211_ATTR_MCAST_RATE,
-
-	NL80211_ATTR_OFFCHANNEL_TX_OK,
-
-	NL80211_ATTR_BSS_HT_OPMODE,
-
-	NL80211_ATTR_KEY_DEFAULT_TYPES,
-
-	NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION,
-
-	NL80211_ATTR_MESH_SETUP,
-
-	NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX,
-	NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX,
-
-	NL80211_ATTR_SUPPORT_MESH_AUTH,
-	NL80211_ATTR_STA_PLINK_STATE,
-
-	NL80211_ATTR_WOWLAN_TRIGGERS,
-	NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED,
-
-	NL80211_ATTR_SCHED_SCAN_INTERVAL,
-
-	NL80211_ATTR_INTERFACE_COMBINATIONS,
-	NL80211_ATTR_SOFTWARE_IFTYPES,
-
-	NL80211_ATTR_REKEY_DATA,
-
-	NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS,
-	NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN,
-
-	NL80211_ATTR_SCAN_SUPP_RATES,
-
-	NL80211_ATTR_HIDDEN_SSID,
-
-	NL80211_ATTR_IE_PROBE_RESP,
-	NL80211_ATTR_IE_ASSOC_RESP,
-
-	NL80211_ATTR_STA_WME,
-	NL80211_ATTR_SUPPORT_AP_UAPSD,
-
-	NL80211_ATTR_ROAM_SUPPORT,
-
-	NL80211_ATTR_SCHED_SCAN_MATCH,
-	NL80211_ATTR_MAX_MATCH_SETS,
-
-	NL80211_ATTR_PMKSA_CANDIDATE,
-
-	NL80211_ATTR_TX_NO_CCK_RATE,
-
-	NL80211_ATTR_TDLS_ACTION,
-	NL80211_ATTR_TDLS_DIALOG_TOKEN,
-	NL80211_ATTR_TDLS_OPERATION,
-	NL80211_ATTR_TDLS_SUPPORT,
-	NL80211_ATTR_TDLS_EXTERNAL_SETUP,
-
-	NL80211_ATTR_DEVICE_AP_SME,
-
-	NL80211_ATTR_DONT_WAIT_FOR_ACK,
-
-	NL80211_ATTR_FEATURE_FLAGS,
-
-	NL80211_ATTR_PROBE_RESP_OFFLOAD,
-
-	NL80211_ATTR_PROBE_RESP,
-
-	NL80211_ATTR_DFS_REGION,
-
-	NL80211_ATTR_DISABLE_HT,
-	NL80211_ATTR_HT_CAPABILITY_MASK,
-
-	NL80211_ATTR_NOACK_MAP,
-
-	NL80211_ATTR_INACTIVITY_TIMEOUT,
-
-	NL80211_ATTR_RX_SIGNAL_DBM,
-
-	NL80211_ATTR_BG_SCAN_PERIOD,
-
-	NL80211_ATTR_WDEV,
-
-	NL80211_ATTR_USER_REG_HINT_TYPE,
-
-	NL80211_ATTR_CONN_FAILED_REASON,
-
-	NL80211_ATTR_SAE_DATA,
-
-	NL80211_ATTR_VHT_CAPABILITY,
-
-	NL80211_ATTR_SCAN_FLAGS,
-
-	NL80211_ATTR_CHANNEL_WIDTH,
-	NL80211_ATTR_CENTER_FREQ1,
-	NL80211_ATTR_CENTER_FREQ2,
-
-	NL80211_ATTR_P2P_CTWINDOW,
-	NL80211_ATTR_P2P_OPPPS,
-
-	NL80211_ATTR_LOCAL_MESH_POWER_MODE,
-
-	NL80211_ATTR_ACL_POLICY,
-
-	NL80211_ATTR_MAC_ADDRS,
-
-	NL80211_ATTR_MAC_ACL_MAX,
-
-	NL80211_ATTR_RADAR_EVENT,
-
-	NL80211_ATTR_EXT_CAPA,
-	NL80211_ATTR_EXT_CAPA_MASK,
-
-	NL80211_ATTR_STA_CAPABILITY,
-	NL80211_ATTR_STA_EXT_CAPABILITY,
-
-	NL80211_ATTR_PROTOCOL_FEATURES,
-	NL80211_ATTR_SPLIT_WIPHY_DUMP,
-
-	NL80211_ATTR_DISABLE_VHT,
-	NL80211_ATTR_VHT_CAPABILITY_MASK,
-
-	NL80211_ATTR_MDID,
-	NL80211_ATTR_IE_RIC,
-
-	/* add attributes here, update the policy in nl80211.c */
-
-	__NL80211_ATTR_AFTER_LAST,
-	NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
-};
-
-/* source-level API compatibility */
-#define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION
-#define	NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG
-
-/*
- * Allow user space programs to use #ifdef on new attributes by defining them
- * here
- */
-#define NL80211_CMD_CONNECT NL80211_CMD_CONNECT
-#define NL80211_ATTR_HT_CAPABILITY NL80211_ATTR_HT_CAPABILITY
-#define NL80211_ATTR_BSS_BASIC_RATES NL80211_ATTR_BSS_BASIC_RATES
-#define NL80211_ATTR_WIPHY_TXQ_PARAMS NL80211_ATTR_WIPHY_TXQ_PARAMS
-#define NL80211_ATTR_WIPHY_FREQ NL80211_ATTR_WIPHY_FREQ
-#define NL80211_ATTR_WIPHY_CHANNEL_TYPE NL80211_ATTR_WIPHY_CHANNEL_TYPE
-#define NL80211_ATTR_MGMT_SUBTYPE NL80211_ATTR_MGMT_SUBTYPE
-#define NL80211_ATTR_IE NL80211_ATTR_IE
-#define NL80211_ATTR_REG_INITIATOR NL80211_ATTR_REG_INITIATOR
-#define NL80211_ATTR_REG_TYPE NL80211_ATTR_REG_TYPE
-#define NL80211_ATTR_FRAME NL80211_ATTR_FRAME
-#define NL80211_ATTR_SSID NL80211_ATTR_SSID
-#define NL80211_ATTR_AUTH_TYPE NL80211_ATTR_AUTH_TYPE
-#define NL80211_ATTR_REASON_CODE NL80211_ATTR_REASON_CODE
-#define NL80211_ATTR_CIPHER_SUITES_PAIRWISE NL80211_ATTR_CIPHER_SUITES_PAIRWISE
-#define NL80211_ATTR_CIPHER_SUITE_GROUP NL80211_ATTR_CIPHER_SUITE_GROUP
-#define NL80211_ATTR_WPA_VERSIONS NL80211_ATTR_WPA_VERSIONS
-#define NL80211_ATTR_AKM_SUITES NL80211_ATTR_AKM_SUITES
-#define NL80211_ATTR_KEY NL80211_ATTR_KEY
-#define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
-#define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS
-
-#define NL80211_MAX_SUPP_RATES			32
-#define NL80211_MAX_SUPP_HT_RATES		77
-#define NL80211_MAX_SUPP_REG_RULES		32
-#define NL80211_TKIP_DATA_OFFSET_ENCR_KEY	0
-#define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY	16
-#define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY	24
-#define NL80211_HT_CAPABILITY_LEN		26
-#define NL80211_VHT_CAPABILITY_LEN		12
-
-#define NL80211_MAX_NR_CIPHER_SUITES		5
-#define NL80211_MAX_NR_AKM_SUITES		2
-
-#define NL80211_MIN_REMAIN_ON_CHANNEL_TIME	10
-
-/* default RSSI threshold for scan results if none specified. */
-#define NL80211_SCAN_RSSI_THOLD_OFF		-300
-
-#define NL80211_CQM_TXE_MAX_INTVL		1800
-
-/**
- * enum nl80211_iftype - (virtual) interface types
- *
- * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
- * @NL80211_IFTYPE_ADHOC: independent BSS member
- * @NL80211_IFTYPE_STATION: managed BSS member
- * @NL80211_IFTYPE_AP: access point
- * @NL80211_IFTYPE_AP_VLAN: VLAN interface for access points; VLAN interfaces
- *	are a bit special in that they must always be tied to a pre-existing
- *	AP type interface.
- * @NL80211_IFTYPE_WDS: wireless distribution interface
- * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames
- * @NL80211_IFTYPE_MESH_POINT: mesh point
- * @NL80211_IFTYPE_P2P_CLIENT: P2P client
- * @NL80211_IFTYPE_P2P_GO: P2P group owner
- * @NL80211_IFTYPE_P2P_DEVICE: P2P device interface type, this is not a netdev
- *	and therefore can't be created in the normal ways, use the
- *	%NL80211_CMD_START_P2P_DEVICE and %NL80211_CMD_STOP_P2P_DEVICE
- *	commands to create and destroy one
- * @NL80211_IFTYPE_MAX: highest interface type number currently defined
- * @NUM_NL80211_IFTYPES: number of defined interface types
- *
- * These values are used with the %NL80211_ATTR_IFTYPE
- * to set the type of an interface.
- *
- */
-enum nl80211_iftype {
-	NL80211_IFTYPE_UNSPECIFIED,
-	NL80211_IFTYPE_ADHOC,
-	NL80211_IFTYPE_STATION,
-	NL80211_IFTYPE_AP,
-	NL80211_IFTYPE_AP_VLAN,
-	NL80211_IFTYPE_WDS,
-	NL80211_IFTYPE_MONITOR,
-	NL80211_IFTYPE_MESH_POINT,
-	NL80211_IFTYPE_P2P_CLIENT,
-	NL80211_IFTYPE_P2P_GO,
-	NL80211_IFTYPE_P2P_DEVICE,
-
-	/* keep last */
-	NUM_NL80211_IFTYPES,
-	NL80211_IFTYPE_MAX = NUM_NL80211_IFTYPES - 1
-};
-
-/**
- * enum nl80211_sta_flags - station flags
- *
- * Station flags. When a station is added to an AP interface, it is
- * assumed to be already associated (and hence authenticated.)
- *
- * @__NL80211_STA_FLAG_INVALID: attribute number 0 is reserved
- * @NL80211_STA_FLAG_AUTHORIZED: station is authorized (802.1X)
- * @NL80211_STA_FLAG_SHORT_PREAMBLE: station is capable of receiving frames
- *	with short barker preamble
- * @NL80211_STA_FLAG_WME: station is WME/QoS capable
- * @NL80211_STA_FLAG_MFP: station uses management frame protection
- * @NL80211_STA_FLAG_AUTHENTICATED: station is authenticated
- * @NL80211_STA_FLAG_TDLS_PEER: station is a TDLS peer -- this flag should
- *	only be used in managed mode (even in the flags mask). Note that the
- *	flag can't be changed, it is only valid while adding a station, and
- *	attempts to change it will silently be ignored (rather than rejected
- *	as errors.)
- * @NL80211_STA_FLAG_ASSOCIATED: station is associated; used with drivers
- *	that support %NL80211_FEATURE_FULL_AP_CLIENT_STATE to transition a
- *	previously added station into associated state
- * @NL80211_STA_FLAG_MAX: highest station flag number currently defined
- * @__NL80211_STA_FLAG_AFTER_LAST: internal use
- */
-enum nl80211_sta_flags {
-	__NL80211_STA_FLAG_INVALID,
-	NL80211_STA_FLAG_AUTHORIZED,
-	NL80211_STA_FLAG_SHORT_PREAMBLE,
-	NL80211_STA_FLAG_WME,
-	NL80211_STA_FLAG_MFP,
-	NL80211_STA_FLAG_AUTHENTICATED,
-	NL80211_STA_FLAG_TDLS_PEER,
-	NL80211_STA_FLAG_ASSOCIATED,
-
-	/* keep last */
-	__NL80211_STA_FLAG_AFTER_LAST,
-	NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
-};
-
-#define NL80211_STA_FLAG_MAX_OLD_API	NL80211_STA_FLAG_TDLS_PEER
-
-/**
- * struct nl80211_sta_flag_update - station flags mask/set
- * @mask: mask of station flags to set
- * @set: which values to set them to
- *
- * Both mask and set contain bits as per &enum nl80211_sta_flags.
- */
-struct nl80211_sta_flag_update {
-	__u32 mask;
-	__u32 set;
-} __attribute__((packed));
-
-/**
- * enum nl80211_rate_info - bitrate information
- *
- * These attribute types are used with %NL80211_STA_INFO_TXRATE
- * when getting information about the bitrate of a station.
- * There are 2 attributes for bitrate, a legacy one that represents
- * a 16-bit value, and new one that represents a 32-bit value.
- * If the rate value fits into 16 bit, both attributes are reported
- * with the same value. If the rate is too high to fit into 16 bits
- * (>6.5535Gbps) only 32-bit attribute is included.
- * User space tools encouraged to use the 32-bit attribute and fall
- * back to the 16-bit one for compatibility with older kernels.
- *
- * @__NL80211_RATE_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_RATE_INFO_BITRATE: total bitrate (u16, 100kbit/s)
- * @NL80211_RATE_INFO_MCS: mcs index for 802.11n (u8)
- * @NL80211_RATE_INFO_40_MHZ_WIDTH: 40 MHz dualchannel bitrate
- * @NL80211_RATE_INFO_SHORT_GI: 400ns guard interval
- * @NL80211_RATE_INFO_BITRATE32: total bitrate (u32, 100kbit/s)
- * @NL80211_RATE_INFO_MAX: highest rate_info number currently defined
- * @NL80211_RATE_INFO_VHT_MCS: MCS index for VHT (u8)
- * @NL80211_RATE_INFO_VHT_NSS: number of streams in VHT (u8)
- * @NL80211_RATE_INFO_80_MHZ_WIDTH: 80 MHz VHT rate
- * @NL80211_RATE_INFO_80P80_MHZ_WIDTH: 80+80 MHz VHT rate
- * @NL80211_RATE_INFO_160_MHZ_WIDTH: 160 MHz VHT rate
- * @__NL80211_RATE_INFO_AFTER_LAST: internal use
- */
-enum nl80211_rate_info {
-	__NL80211_RATE_INFO_INVALID,
-	NL80211_RATE_INFO_BITRATE,
-	NL80211_RATE_INFO_MCS,
-	NL80211_RATE_INFO_40_MHZ_WIDTH,
-	NL80211_RATE_INFO_SHORT_GI,
-	NL80211_RATE_INFO_BITRATE32,
-	NL80211_RATE_INFO_VHT_MCS,
-	NL80211_RATE_INFO_VHT_NSS,
-	NL80211_RATE_INFO_80_MHZ_WIDTH,
-	NL80211_RATE_INFO_80P80_MHZ_WIDTH,
-	NL80211_RATE_INFO_160_MHZ_WIDTH,
-
-	/* keep last */
-	__NL80211_RATE_INFO_AFTER_LAST,
-	NL80211_RATE_INFO_MAX = __NL80211_RATE_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_sta_bss_param - BSS information collected by STA
- *
- * These attribute types are used with %NL80211_STA_INFO_BSS_PARAM
- * when getting information about the bitrate of a station.
- *
- * @__NL80211_STA_BSS_PARAM_INVALID: attribute number 0 is reserved
- * @NL80211_STA_BSS_PARAM_CTS_PROT: whether CTS protection is enabled (flag)
- * @NL80211_STA_BSS_PARAM_SHORT_PREAMBLE:  whether short preamble is enabled
- *	(flag)
- * @NL80211_STA_BSS_PARAM_SHORT_SLOT_TIME:  whether short slot time is enabled
- *	(flag)
- * @NL80211_STA_BSS_PARAM_DTIM_PERIOD: DTIM period for beaconing (u8)
- * @NL80211_STA_BSS_PARAM_BEACON_INTERVAL: Beacon interval (u16)
- * @NL80211_STA_BSS_PARAM_MAX: highest sta_bss_param number currently defined
- * @__NL80211_STA_BSS_PARAM_AFTER_LAST: internal use
- */
-enum nl80211_sta_bss_param {
-	__NL80211_STA_BSS_PARAM_INVALID,
-	NL80211_STA_BSS_PARAM_CTS_PROT,
-	NL80211_STA_BSS_PARAM_SHORT_PREAMBLE,
-	NL80211_STA_BSS_PARAM_SHORT_SLOT_TIME,
-	NL80211_STA_BSS_PARAM_DTIM_PERIOD,
-	NL80211_STA_BSS_PARAM_BEACON_INTERVAL,
-
-	/* keep last */
-	__NL80211_STA_BSS_PARAM_AFTER_LAST,
-	NL80211_STA_BSS_PARAM_MAX = __NL80211_STA_BSS_PARAM_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_sta_info - station information
- *
- * These attribute types are used with %NL80211_ATTR_STA_INFO
- * when getting information about a station.
- *
- * @__NL80211_STA_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_STA_INFO_INACTIVE_TIME: time since last activity (u32, msecs)
- * @NL80211_STA_INFO_RX_BYTES: total received bytes (u32, from this station)
- * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station)
- * @NL80211_STA_INFO_RX_BYTES64: total received bytes (u64, from this station)
- * @NL80211_STA_INFO_TX_BYTES64: total transmitted bytes (u64, to this station)
- * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
- * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
- * 	containing info as possible, see &enum nl80211_rate_info
- * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station)
- * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (u32, to this
- *	station)
- * @NL80211_STA_INFO_TX_RETRIES: total retries (u32, to this station)
- * @NL80211_STA_INFO_TX_FAILED: total failed packets (u32, to this station)
- * @NL80211_STA_INFO_SIGNAL_AVG: signal strength average (u8, dBm)
- * @NL80211_STA_INFO_LLID: the station's mesh LLID
- * @NL80211_STA_INFO_PLID: the station's mesh PLID
- * @NL80211_STA_INFO_PLINK_STATE: peer link state for the station
- *	(see %enum nl80211_plink_state)
- * @NL80211_STA_INFO_RX_BITRATE: last unicast data frame rx rate, nested
- *	attribute, like NL80211_STA_INFO_TX_BITRATE.
- * @NL80211_STA_INFO_BSS_PARAM: current station's view of BSS, nested attribute
- *     containing info as possible, see &enum nl80211_sta_bss_param
- * @NL80211_STA_INFO_CONNECTED_TIME: time since the station is last connected
- * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.
- * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)
- * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)
- * @NL80211_STA_INFO_LOCAL_PM: local mesh STA link-specific power mode
- * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
- * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
- *	non-peer STA
- * @__NL80211_STA_INFO_AFTER_LAST: internal
- * @NL80211_STA_INFO_MAX: highest possible station info attribute
- */
-enum nl80211_sta_info {
-	__NL80211_STA_INFO_INVALID,
-	NL80211_STA_INFO_INACTIVE_TIME,
-	NL80211_STA_INFO_RX_BYTES,
-	NL80211_STA_INFO_TX_BYTES,
-	NL80211_STA_INFO_LLID,
-	NL80211_STA_INFO_PLID,
-	NL80211_STA_INFO_PLINK_STATE,
-	NL80211_STA_INFO_SIGNAL,
-	NL80211_STA_INFO_TX_BITRATE,
-	NL80211_STA_INFO_RX_PACKETS,
-	NL80211_STA_INFO_TX_PACKETS,
-	NL80211_STA_INFO_TX_RETRIES,
-	NL80211_STA_INFO_TX_FAILED,
-	NL80211_STA_INFO_SIGNAL_AVG,
-	NL80211_STA_INFO_RX_BITRATE,
-	NL80211_STA_INFO_BSS_PARAM,
-	NL80211_STA_INFO_CONNECTED_TIME,
-	NL80211_STA_INFO_STA_FLAGS,
-	NL80211_STA_INFO_BEACON_LOSS,
-	NL80211_STA_INFO_T_OFFSET,
-	NL80211_STA_INFO_LOCAL_PM,
-	NL80211_STA_INFO_PEER_PM,
-	NL80211_STA_INFO_NONPEER_PM,
-	NL80211_STA_INFO_RX_BYTES64,
-	NL80211_STA_INFO_TX_BYTES64,
-
-	/* keep last */
-	__NL80211_STA_INFO_AFTER_LAST,
-	NL80211_STA_INFO_MAX = __NL80211_STA_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_mpath_flags - nl80211 mesh path flags
- *
- * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active
- * @NL80211_MPATH_FLAG_RESOLVING: the mesh path discovery process is running
- * @NL80211_MPATH_FLAG_SN_VALID: the mesh path contains a valid SN
- * @NL80211_MPATH_FLAG_FIXED: the mesh path has been manually set
- * @NL80211_MPATH_FLAG_RESOLVED: the mesh path discovery process succeeded
- */
-enum nl80211_mpath_flags {
-	NL80211_MPATH_FLAG_ACTIVE =	1<<0,
-	NL80211_MPATH_FLAG_RESOLVING =	1<<1,
-	NL80211_MPATH_FLAG_SN_VALID =	1<<2,
-	NL80211_MPATH_FLAG_FIXED =	1<<3,
-	NL80211_MPATH_FLAG_RESOLVED =	1<<4,
-};
-
-/**
- * enum nl80211_mpath_info - mesh path information
- *
- * These attribute types are used with %NL80211_ATTR_MPATH_INFO when getting
- * information about a mesh path.
- *
- * @__NL80211_MPATH_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_MPATH_INFO_FRAME_QLEN: number of queued frames for this destination
- * @NL80211_MPATH_INFO_SN: destination sequence number
- * @NL80211_MPATH_INFO_METRIC: metric (cost) of this mesh path
- * @NL80211_MPATH_INFO_EXPTIME: expiration time for the path, in msec from now
- * @NL80211_MPATH_INFO_FLAGS: mesh path flags, enumerated in
- * 	&enum nl80211_mpath_flags;
- * @NL80211_MPATH_INFO_DISCOVERY_TIMEOUT: total path discovery timeout, in msec
- * @NL80211_MPATH_INFO_DISCOVERY_RETRIES: mesh path discovery retries
- * @NL80211_MPATH_INFO_MAX: highest mesh path information attribute number
- *	currently defind
- * @__NL80211_MPATH_INFO_AFTER_LAST: internal use
- */
-enum nl80211_mpath_info {
-	__NL80211_MPATH_INFO_INVALID,
-	NL80211_MPATH_INFO_FRAME_QLEN,
-	NL80211_MPATH_INFO_SN,
-	NL80211_MPATH_INFO_METRIC,
-	NL80211_MPATH_INFO_EXPTIME,
-	NL80211_MPATH_INFO_FLAGS,
-	NL80211_MPATH_INFO_DISCOVERY_TIMEOUT,
-	NL80211_MPATH_INFO_DISCOVERY_RETRIES,
-
-	/* keep last */
-	__NL80211_MPATH_INFO_AFTER_LAST,
-	NL80211_MPATH_INFO_MAX = __NL80211_MPATH_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_band_attr - band attributes
- * @__NL80211_BAND_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_BAND_ATTR_FREQS: supported frequencies in this band,
- *	an array of nested frequency attributes
- * @NL80211_BAND_ATTR_RATES: supported bitrates in this band,
- *	an array of nested bitrate attributes
- * @NL80211_BAND_ATTR_HT_MCS_SET: 16-byte attribute containing the MCS set as
- *	defined in 802.11n
- * @NL80211_BAND_ATTR_HT_CAPA: HT capabilities, as in the HT information IE
- * @NL80211_BAND_ATTR_HT_AMPDU_FACTOR: A-MPDU factor, as in 11n
- * @NL80211_BAND_ATTR_HT_AMPDU_DENSITY: A-MPDU density, as in 11n
- * @NL80211_BAND_ATTR_VHT_MCS_SET: 32-byte attribute containing the MCS set as
- *	defined in 802.11ac
- * @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT information IE
- * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined
- * @__NL80211_BAND_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_band_attr {
-	__NL80211_BAND_ATTR_INVALID,
-	NL80211_BAND_ATTR_FREQS,
-	NL80211_BAND_ATTR_RATES,
-
-	NL80211_BAND_ATTR_HT_MCS_SET,
-	NL80211_BAND_ATTR_HT_CAPA,
-	NL80211_BAND_ATTR_HT_AMPDU_FACTOR,
-	NL80211_BAND_ATTR_HT_AMPDU_DENSITY,
-
-	NL80211_BAND_ATTR_VHT_MCS_SET,
-	NL80211_BAND_ATTR_VHT_CAPA,
-
-	/* keep last */
-	__NL80211_BAND_ATTR_AFTER_LAST,
-	NL80211_BAND_ATTR_MAX = __NL80211_BAND_ATTR_AFTER_LAST - 1
-};
-
-#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
-
-/**
- * enum nl80211_frequency_attr - frequency attributes
- * @__NL80211_FREQUENCY_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
- * @NL80211_FREQUENCY_ATTR_DISABLED: Channel is disabled in current
- *	regulatory domain.
- * @NL80211_FREQUENCY_ATTR_PASSIVE_SCAN: Only passive scanning is
- *	permitted on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_NO_IBSS: IBSS networks are not permitted
- *	on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory
- *	on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm
- *	(100 * dBm).
- * @NL80211_FREQUENCY_ATTR_DFS_STATE: current state for DFS
- *	(enum nl80211_dfs_state)
- * @NL80211_FREQUENCY_ATTR_DFS_TIME: time in miliseconds for how long
- *	this channel is in this DFS state.
- * @NL80211_FREQUENCY_ATTR_NO_HT40_MINUS: HT40- isn't possible with this
- *	channel as the control channel
- * @NL80211_FREQUENCY_ATTR_NO_HT40_PLUS: HT40+ isn't possible with this
- *	channel as the control channel
- * @NL80211_FREQUENCY_ATTR_NO_80MHZ: any 80 MHz channel using this channel
- *	as the primary or any of the secondary channels isn't possible,
- *	this includes 80+80 channels
- * @NL80211_FREQUENCY_ATTR_NO_160MHZ: any 160 MHz (but not 80+80) channel
- *	using this channel as the primary or any of the secondary channels
- *	isn't possible
- * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
- *	currently defined
- * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_frequency_attr {
-	__NL80211_FREQUENCY_ATTR_INVALID,
-	NL80211_FREQUENCY_ATTR_FREQ,
-	NL80211_FREQUENCY_ATTR_DISABLED,
-	NL80211_FREQUENCY_ATTR_PASSIVE_SCAN,
-	NL80211_FREQUENCY_ATTR_NO_IBSS,
-	NL80211_FREQUENCY_ATTR_RADAR,
-	NL80211_FREQUENCY_ATTR_MAX_TX_POWER,
-	NL80211_FREQUENCY_ATTR_DFS_STATE,
-	NL80211_FREQUENCY_ATTR_DFS_TIME,
-	NL80211_FREQUENCY_ATTR_NO_HT40_MINUS,
-	NL80211_FREQUENCY_ATTR_NO_HT40_PLUS,
-	NL80211_FREQUENCY_ATTR_NO_80MHZ,
-	NL80211_FREQUENCY_ATTR_NO_160MHZ,
-
-	/* keep last */
-	__NL80211_FREQUENCY_ATTR_AFTER_LAST,
-	NL80211_FREQUENCY_ATTR_MAX = __NL80211_FREQUENCY_ATTR_AFTER_LAST - 1
-};
-
-#define NL80211_FREQUENCY_ATTR_MAX_TX_POWER NL80211_FREQUENCY_ATTR_MAX_TX_POWER
-
-/**
- * enum nl80211_bitrate_attr - bitrate attributes
- * @__NL80211_BITRATE_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_BITRATE_ATTR_RATE: Bitrate in units of 100 kbps
- * @NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE: Short preamble supported
- *	in 2.4 GHz band.
- * @NL80211_BITRATE_ATTR_MAX: highest bitrate attribute number
- *	currently defined
- * @__NL80211_BITRATE_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_bitrate_attr {
-	__NL80211_BITRATE_ATTR_INVALID,
-	NL80211_BITRATE_ATTR_RATE,
-	NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE,
-
-	/* keep last */
-	__NL80211_BITRATE_ATTR_AFTER_LAST,
-	NL80211_BITRATE_ATTR_MAX = __NL80211_BITRATE_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_initiator - Indicates the initiator of a reg domain request
- * @NL80211_REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world
- * 	regulatory domain.
- * @NL80211_REGDOM_SET_BY_USER: User asked the wireless core to set the
- * 	regulatory domain.
- * @NL80211_REGDOM_SET_BY_DRIVER: a wireless drivers has hinted to the
- * 	wireless core it thinks its knows the regulatory domain we should be in.
- * @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an
- * 	802.11 country information element with regulatory information it
- * 	thinks we should consider. cfg80211 only processes the country
- *	code from the IE, and relies on the regulatory domain information
- *	structure passed by userspace (CRDA) from our wireless-regdb.
- *	If a channel is enabled but the country code indicates it should
- *	be disabled we disable the channel and re-enable it upon disassociation.
- */
-enum nl80211_reg_initiator {
-	NL80211_REGDOM_SET_BY_CORE,
-	NL80211_REGDOM_SET_BY_USER,
-	NL80211_REGDOM_SET_BY_DRIVER,
-	NL80211_REGDOM_SET_BY_COUNTRY_IE,
-};
-
-/**
- * enum nl80211_reg_type - specifies the type of regulatory domain
- * @NL80211_REGDOM_TYPE_COUNTRY: the regulatory domain set is one that pertains
- *	to a specific country. When this is set you can count on the
- *	ISO / IEC 3166 alpha2 country code being valid.
- * @NL80211_REGDOM_TYPE_WORLD: the regulatory set domain is the world regulatory
- * 	domain.
- * @NL80211_REGDOM_TYPE_CUSTOM_WORLD: the regulatory domain set is a custom
- * 	driver specific world regulatory domain. These do not apply system-wide
- * 	and are only applicable to the individual devices which have requested
- * 	them to be applied.
- * @NL80211_REGDOM_TYPE_INTERSECTION: the regulatory domain set is the product
- *	of an intersection between two regulatory domains -- the previously
- *	set regulatory domain on the system and the last accepted regulatory
- *	domain request to be processed.
- */
-enum nl80211_reg_type {
-	NL80211_REGDOM_TYPE_COUNTRY,
-	NL80211_REGDOM_TYPE_WORLD,
-	NL80211_REGDOM_TYPE_CUSTOM_WORLD,
-	NL80211_REGDOM_TYPE_INTERSECTION,
-};
-
-/**
- * enum nl80211_reg_rule_attr - regulatory rule attributes
- * @__NL80211_REG_RULE_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_ATTR_REG_RULE_FLAGS: a set of flags which specify additional
- * 	considerations for a given frequency range. These are the
- * 	&enum nl80211_reg_rule_flags.
- * @NL80211_ATTR_FREQ_RANGE_START: starting frequencry for the regulatory
- * 	rule in KHz. This is not a center of frequency but an actual regulatory
- * 	band edge.
- * @NL80211_ATTR_FREQ_RANGE_END: ending frequency for the regulatory rule
- * 	in KHz. This is not a center a frequency but an actual regulatory
- * 	band edge.
- * @NL80211_ATTR_FREQ_RANGE_MAX_BW: maximum allowed bandwidth for this
- * 	frequency range, in KHz.
- * @NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN: the maximum allowed antenna gain
- * 	for a given frequency range. The value is in mBi (100 * dBi).
- * 	If you don't have one then don't send this.
- * @NL80211_ATTR_POWER_RULE_MAX_EIRP: the maximum allowed EIRP for
- * 	a given frequency range. The value is in mBm (100 * dBm).
- * @NL80211_REG_RULE_ATTR_MAX: highest regulatory rule attribute number
- *	currently defined
- * @__NL80211_REG_RULE_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_reg_rule_attr {
-	__NL80211_REG_RULE_ATTR_INVALID,
-	NL80211_ATTR_REG_RULE_FLAGS,
-
-	NL80211_ATTR_FREQ_RANGE_START,
-	NL80211_ATTR_FREQ_RANGE_END,
-	NL80211_ATTR_FREQ_RANGE_MAX_BW,
-
-	NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN,
-	NL80211_ATTR_POWER_RULE_MAX_EIRP,
-
-	/* keep last */
-	__NL80211_REG_RULE_ATTR_AFTER_LAST,
-	NL80211_REG_RULE_ATTR_MAX = __NL80211_REG_RULE_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_sched_scan_match_attr - scheduled scan match attributes
- * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
- * only report BSS with matching SSID.
- * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
- *	BSS in scan results. Filtering is turned off if not specified.
- * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
- *	attribute number currently defined
- * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_sched_scan_match_attr {
-	__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID,
-
-	NL80211_SCHED_SCAN_MATCH_ATTR_SSID,
-	NL80211_SCHED_SCAN_MATCH_ATTR_RSSI,
-
-	/* keep last */
-	__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST,
-	NL80211_SCHED_SCAN_MATCH_ATTR_MAX =
-		__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST - 1
-};
-
-/* only for backward compatibility */
-#define NL80211_ATTR_SCHED_SCAN_MATCH_SSID NL80211_SCHED_SCAN_MATCH_ATTR_SSID
-
-/**
- * enum nl80211_reg_rule_flags - regulatory rule flags
- *
- * @NL80211_RRF_NO_OFDM: OFDM modulation not allowed
- * @NL80211_RRF_NO_CCK: CCK modulation not allowed
- * @NL80211_RRF_NO_INDOOR: indoor operation not allowed
- * @NL80211_RRF_NO_OUTDOOR: outdoor operation not allowed
- * @NL80211_RRF_DFS: DFS support is required to be used
- * @NL80211_RRF_PTP_ONLY: this is only for Point To Point links
- * @NL80211_RRF_PTMP_ONLY: this is only for Point To Multi Point links
- * @NL80211_RRF_PASSIVE_SCAN: passive scan is required
- * @NL80211_RRF_NO_IBSS: no IBSS is allowed
- */
-enum nl80211_reg_rule_flags {
-	NL80211_RRF_NO_OFDM		= 1<<0,
-	NL80211_RRF_NO_CCK		= 1<<1,
-	NL80211_RRF_NO_INDOOR		= 1<<2,
-	NL80211_RRF_NO_OUTDOOR		= 1<<3,
-	NL80211_RRF_DFS			= 1<<4,
-	NL80211_RRF_PTP_ONLY		= 1<<5,
-	NL80211_RRF_PTMP_ONLY		= 1<<6,
-	NL80211_RRF_PASSIVE_SCAN	= 1<<7,
-	NL80211_RRF_NO_IBSS		= 1<<8,
-};
-
-/**
- * enum nl80211_dfs_regions - regulatory DFS regions
- *
- * @NL80211_DFS_UNSET: Country has no DFS master region specified
- * @NL80211_DFS_FCC: Country follows DFS master rules from FCC
- * @NL80211_DFS_ETSI: Country follows DFS master rules from ETSI
- * @NL80211_DFS_JP: Country follows DFS master rules from JP/MKK/Telec
- */
-enum nl80211_dfs_regions {
-	NL80211_DFS_UNSET	= 0,
-	NL80211_DFS_FCC		= 1,
-	NL80211_DFS_ETSI	= 2,
-	NL80211_DFS_JP		= 3,
-};
-
-/**
- * enum nl80211_user_reg_hint_type - type of user regulatory hint
- *
- * @NL80211_USER_REG_HINT_USER: a user sent the hint. This is always
- *	assumed if the attribute is not set.
- * @NL80211_USER_REG_HINT_CELL_BASE: the hint comes from a cellular
- *	base station. Device drivers that have been tested to work
- *	properly to support this type of hint can enable these hints
- *	by setting the NL80211_FEATURE_CELL_BASE_REG_HINTS feature
- *	capability on the struct wiphy. The wireless core will
- *	ignore all cell base station hints until at least one device
- *	present has been registered with the wireless core that
- *	has listed NL80211_FEATURE_CELL_BASE_REG_HINTS as a
- *	supported feature.
- */
-enum nl80211_user_reg_hint_type {
-	NL80211_USER_REG_HINT_USER	= 0,
-	NL80211_USER_REG_HINT_CELL_BASE = 1,
-};
-
-/**
- * enum nl80211_survey_info - survey information
- *
- * These attribute types are used with %NL80211_ATTR_SURVEY_INFO
- * when getting information about a survey.
- *
- * @__NL80211_SURVEY_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
- * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
- * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used
- * @NL80211_SURVEY_INFO_CHANNEL_TIME: amount of time (in ms) that the radio
- *	spent on this channel
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY: amount of the time the primary
- *	channel was sensed busy (either due to activity or energy detect)
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY: amount of time the extension
- *	channel was sensed busy
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_RX: amount of time the radio spent
- *	receiving data
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_TX: amount of time the radio spent
- *	transmitting data
- * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
- *	currently defined
- * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
- */
-enum nl80211_survey_info {
-	__NL80211_SURVEY_INFO_INVALID,
-	NL80211_SURVEY_INFO_FREQUENCY,
-	NL80211_SURVEY_INFO_NOISE,
-	NL80211_SURVEY_INFO_IN_USE,
-	NL80211_SURVEY_INFO_CHANNEL_TIME,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_RX,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_TX,
-
-	/* keep last */
-	__NL80211_SURVEY_INFO_AFTER_LAST,
-	NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_mntr_flags - monitor configuration flags
- *
- * Monitor configuration flags.
- *
- * @__NL80211_MNTR_FLAG_INVALID: reserved
- *
- * @NL80211_MNTR_FLAG_FCSFAIL: pass frames with bad FCS
- * @NL80211_MNTR_FLAG_PLCPFAIL: pass frames with bad PLCP
- * @NL80211_MNTR_FLAG_CONTROL: pass control frames
- * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering
- * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.
- *	overrides all other flags.
- *
- * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use
- * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag
- */
-enum nl80211_mntr_flags {
-	__NL80211_MNTR_FLAG_INVALID,
-	NL80211_MNTR_FLAG_FCSFAIL,
-	NL80211_MNTR_FLAG_PLCPFAIL,
-	NL80211_MNTR_FLAG_CONTROL,
-	NL80211_MNTR_FLAG_OTHER_BSS,
-	NL80211_MNTR_FLAG_COOK_FRAMES,
-
-	/* keep last */
-	__NL80211_MNTR_FLAG_AFTER_LAST,
-	NL80211_MNTR_FLAG_MAX = __NL80211_MNTR_FLAG_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_mesh_power_mode - mesh power save modes
- *
- * @NL80211_MESH_POWER_UNKNOWN: The mesh power mode of the mesh STA is
- *	not known or has not been set yet.
- * @NL80211_MESH_POWER_ACTIVE: Active mesh power mode. The mesh STA is
- *	in Awake state all the time.
- * @NL80211_MESH_POWER_LIGHT_SLEEP: Light sleep mode. The mesh STA will
- *	alternate between Active and Doze states, but will wake up for
- *	neighbor's beacons.
- * @NL80211_MESH_POWER_DEEP_SLEEP: Deep sleep mode. The mesh STA will
- *	alternate between Active and Doze states, but may not wake up
- *	for neighbor's beacons.
- *
- * @__NL80211_MESH_POWER_AFTER_LAST - internal use
- * @NL80211_MESH_POWER_MAX - highest possible power save level
- */
-
-enum nl80211_mesh_power_mode {
-	NL80211_MESH_POWER_UNKNOWN,
-	NL80211_MESH_POWER_ACTIVE,
-	NL80211_MESH_POWER_LIGHT_SLEEP,
-	NL80211_MESH_POWER_DEEP_SLEEP,
-
-	__NL80211_MESH_POWER_AFTER_LAST,
-	NL80211_MESH_POWER_MAX = __NL80211_MESH_POWER_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_meshconf_params - mesh configuration parameters
- *
- * Mesh configuration parameters. These can be changed while the mesh is
- * active.
- *
- * @__NL80211_MESHCONF_INVALID: internal use
- *
- * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in
- *	millisecond units, used by the Peer Link Open message
- *
- * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the initial confirm timeout, in
- *	millisecond units, used by the peer link management to close a peer link
- *
- * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in
- *	millisecond units
- *
- * @NL80211_MESHCONF_MAX_PEER_LINKS: maximum number of peer links allowed
- *	on this mesh interface
- *
- * @NL80211_MESHCONF_MAX_RETRIES: specifies the maximum number of peer link
- *	open retries that can be sent to establish a new peer link instance in a
- *	mesh
- *
- * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
- *	point.
- *
- * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically open
- *	peer links when we detect compatible mesh peers. Disabled if
- *	@NL80211_MESH_SETUP_USERSPACE_MPM or @NL80211_MESH_SETUP_USERSPACE_AMPE are
- *	set.
- *
- * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
- *	containing a PREQ that an MP can send to a particular destination (path
- *	target)
- *
- * @NL80211_MESHCONF_PATH_REFRESH_TIME: how frequently to refresh mesh paths
- *	(in milliseconds)
- *
- * @NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: minimum length of time to wait
- *	until giving up on a path discovery (in milliseconds)
- *
- * @NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT: The time (in TUs) for which mesh
- *	points receiving a PREQ shall consider the forwarding information from
- *	the root to be valid. (TU = time unit)
- *
- * @NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: The minimum interval of time (in
- *	TUs) during which an MP can send only one action frame containing a PREQ
- *	reference element
- *
- * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
- *	that it takes for an HWMP information element to propagate across the
- *	mesh
- *
- * @NL80211_MESHCONF_HWMP_ROOTMODE: whether root mode is enabled or not
- *
- * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a
- *	source mesh point for path selection elements.
- *
- * @NL80211_MESHCONF_HWMP_RANN_INTERVAL:  The interval of time (in TUs) between
- *	root announcements are transmitted.
- *
- * @NL80211_MESHCONF_GATE_ANNOUNCEMENTS: Advertise that this mesh station has
- *	access to a broader network beyond the MBSS.  This is done via Root
- *	Announcement frames.
- *
- * @NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL: The minimum interval of time (in
- *	TUs) during which a mesh STA can send only one Action frame containing a
- *	PERR element.
- *
- * @NL80211_MESHCONF_FORWARDING: set Mesh STA as forwarding or non-forwarding
- *	or forwarding entity (default is TRUE - forwarding entity)
- *
- * @NL80211_MESHCONF_RSSI_THRESHOLD: RSSI threshold in dBm. This specifies the
- *	threshold for average signal strength of candidate station to establish
- *	a peer link.
- *
- * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors
- *	to synchronize to for 11s default synchronization method
- *	(see 11C.12.2.2)
- *
- * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode.
- *
- * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
- *
- * @NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT: The time (in TUs) for
- *	which mesh STAs receiving a proactive PREQ shall consider the forwarding
- *	information to the root mesh STA to be valid.
- *
- * @NL80211_MESHCONF_HWMP_ROOT_INTERVAL: The interval of time (in TUs) between
- *	proactive PREQs are transmitted.
- *
- * @NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL: The minimum interval of time
- *	(in TUs) during which a mesh STA can send only one Action frame
- *	containing a PREQ element for root path confirmation.
- *
- * @NL80211_MESHCONF_POWER_MODE: Default mesh power mode for new peer links.
- *	type &enum nl80211_mesh_power_mode (u32)
- *
- * @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs)
- *
- * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_meshconf_params {
-	__NL80211_MESHCONF_INVALID,
-	NL80211_MESHCONF_RETRY_TIMEOUT,
-	NL80211_MESHCONF_CONFIRM_TIMEOUT,
-	NL80211_MESHCONF_HOLDING_TIMEOUT,
-	NL80211_MESHCONF_MAX_PEER_LINKS,
-	NL80211_MESHCONF_MAX_RETRIES,
-	NL80211_MESHCONF_TTL,
-	NL80211_MESHCONF_AUTO_OPEN_PLINKS,
-	NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
-	NL80211_MESHCONF_PATH_REFRESH_TIME,
-	NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
-	NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
-	NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
-	NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
-	NL80211_MESHCONF_HWMP_ROOTMODE,
-	NL80211_MESHCONF_ELEMENT_TTL,
-	NL80211_MESHCONF_HWMP_RANN_INTERVAL,
-	NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
-	NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
-	NL80211_MESHCONF_FORWARDING,
-	NL80211_MESHCONF_RSSI_THRESHOLD,
-	NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
-	NL80211_MESHCONF_HT_OPMODE,
-	NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
-	NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
-	NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
-	NL80211_MESHCONF_POWER_MODE,
-	NL80211_MESHCONF_AWAKE_WINDOW,
-
-	/* keep last */
-	__NL80211_MESHCONF_ATTR_AFTER_LAST,
-	NL80211_MESHCONF_ATTR_MAX = __NL80211_MESHCONF_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_mesh_setup_params - mesh setup parameters
- *
- * Mesh setup parameters.  These are used to start/join a mesh and cannot be
- * changed while the mesh is active.
- *
- * @__NL80211_MESH_SETUP_INVALID: Internal use
- *
- * @NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL: Enable this option to use a
- *	vendor specific path selection algorithm or disable it to use the
- *	default HWMP.
- *
- * @NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC: Enable this option to use a
- *	vendor specific path metric or disable it to use the default Airtime
- *	metric.
- *
- * @NL80211_MESH_SETUP_IE: Information elements for this mesh, for instance, a
- *	robust security network ie, or a vendor specific information element
- *	that vendors will use to identify the path selection methods and
- *	metrics in use.
- *
- * @NL80211_MESH_SETUP_USERSPACE_AUTH: Enable this option if an authentication
- *	daemon will be authenticating mesh candidates.
- *
- * @NL80211_MESH_SETUP_USERSPACE_AMPE: Enable this option if an authentication
- *	daemon will be securing peer link frames.  AMPE is a secured version of
- *	Mesh Peering Management (MPM) and is implemented with the assistance of
- *	a userspace daemon.  When this flag is set, the kernel will send peer
- *	management frames to a userspace daemon that will implement AMPE
- *	functionality (security capabilities selection, key confirmation, and
- *	key management).  When the flag is unset (default), the kernel can
- *	autonomously complete (unsecured) mesh peering without the need of a
- *	userspace daemon.
- *
- * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a
- *	vendor specific synchronization method or disable it to use the default
- *	neighbor offset synchronization
- *
- * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will
- *	implement an MPM which handles peer allocation and state.
- *
- * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
- *
- * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
- */
-enum nl80211_mesh_setup_params {
-	__NL80211_MESH_SETUP_INVALID,
-	NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL,
-	NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC,
-	NL80211_MESH_SETUP_IE,
-	NL80211_MESH_SETUP_USERSPACE_AUTH,
-	NL80211_MESH_SETUP_USERSPACE_AMPE,
-	NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,
-	NL80211_MESH_SETUP_USERSPACE_MPM,
-
-	/* keep last */
-	__NL80211_MESH_SETUP_ATTR_AFTER_LAST,
-	NL80211_MESH_SETUP_ATTR_MAX = __NL80211_MESH_SETUP_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_txq_attr - TX queue parameter attributes
- * @__NL80211_TXQ_ATTR_INVALID: Attribute number 0 is reserved
- * @NL80211_TXQ_ATTR_AC: AC identifier (NL80211_AC_*)
- * @NL80211_TXQ_ATTR_TXOP: Maximum burst time in units of 32 usecs, 0 meaning
- *	disabled
- * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form
- *	2^n-1 in the range 1..32767]
- * @NL80211_TXQ_ATTR_CWMAX: Maximum contention window [a value of the form
- *	2^n-1 in the range 1..32767]
- * @NL80211_TXQ_ATTR_AIFS: Arbitration interframe space [0..255]
- * @__NL80211_TXQ_ATTR_AFTER_LAST: Internal
- * @NL80211_TXQ_ATTR_MAX: Maximum TXQ attribute number
- */
-enum nl80211_txq_attr {
-	__NL80211_TXQ_ATTR_INVALID,
-	NL80211_TXQ_ATTR_AC,
-	NL80211_TXQ_ATTR_TXOP,
-	NL80211_TXQ_ATTR_CWMIN,
-	NL80211_TXQ_ATTR_CWMAX,
-	NL80211_TXQ_ATTR_AIFS,
-
-	/* keep last */
-	__NL80211_TXQ_ATTR_AFTER_LAST,
-	NL80211_TXQ_ATTR_MAX = __NL80211_TXQ_ATTR_AFTER_LAST - 1
-};
-
-enum nl80211_ac {
-	NL80211_AC_VO,
-	NL80211_AC_VI,
-	NL80211_AC_BE,
-	NL80211_AC_BK,
-	NL80211_NUM_ACS
-};
-
-/* backward compat */
-#define NL80211_TXQ_ATTR_QUEUE	NL80211_TXQ_ATTR_AC
-#define NL80211_TXQ_Q_VO	NL80211_AC_VO
-#define NL80211_TXQ_Q_VI	NL80211_AC_VI
-#define NL80211_TXQ_Q_BE	NL80211_AC_BE
-#define NL80211_TXQ_Q_BK	NL80211_AC_BK
-
-/**
- * enum nl80211_channel_type - channel type
- * @NL80211_CHAN_NO_HT: 20 MHz, non-HT channel
- * @NL80211_CHAN_HT20: 20 MHz HT channel
- * @NL80211_CHAN_HT40MINUS: HT40 channel, secondary channel
- *	below the control channel
- * @NL80211_CHAN_HT40PLUS: HT40 channel, secondary channel
- *	above the control channel
- */
-enum nl80211_channel_type {
-	NL80211_CHAN_NO_HT,
-	NL80211_CHAN_HT20,
-	NL80211_CHAN_HT40MINUS,
-	NL80211_CHAN_HT40PLUS
-};
-
-/**
- * enum nl80211_chan_width - channel width definitions
- *
- * These values are used with the %NL80211_ATTR_CHANNEL_WIDTH
- * attribute.
- *
- * @NL80211_CHAN_WIDTH_20_NOHT: 20 MHz, non-HT channel
- * @NL80211_CHAN_WIDTH_20: 20 MHz HT channel
- * @NL80211_CHAN_WIDTH_40: 40 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
- *	attribute must be provided as well
- * @NL80211_CHAN_WIDTH_80: 80 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
- *	attribute must be provided as well
- * @NL80211_CHAN_WIDTH_80P80: 80+80 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
- *	and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well
- * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
- *	attribute must be provided as well
- */
-enum nl80211_chan_width {
-	NL80211_CHAN_WIDTH_20_NOHT,
-	NL80211_CHAN_WIDTH_20,
-	NL80211_CHAN_WIDTH_40,
-	NL80211_CHAN_WIDTH_80,
-	NL80211_CHAN_WIDTH_80P80,
-	NL80211_CHAN_WIDTH_160,
-};
-
-/**
- * enum nl80211_bss - netlink attributes for a BSS
- *
- * @__NL80211_BSS_INVALID: invalid
- * @NL80211_BSS_BSSID: BSSID of the BSS (6 octets)
- * @NL80211_BSS_FREQUENCY: frequency in MHz (u32)
- * @NL80211_BSS_TSF: TSF of the received probe response/beacon (u64)
- * @NL80211_BSS_BEACON_INTERVAL: beacon interval of the (I)BSS (u16)
- * @NL80211_BSS_CAPABILITY: capability field (CPU order, u16)
- * @NL80211_BSS_INFORMATION_ELEMENTS: binary attribute containing the
- *	raw information elements from the probe response/beacon (bin);
- *	if the %NL80211_BSS_BEACON_IES attribute is present, the IEs here are
- *	from a Probe Response frame; otherwise they are from a Beacon frame.
- *	However, if the driver does not indicate the source of the IEs, these
- *	IEs may be from either frame subtype.
- * @NL80211_BSS_SIGNAL_MBM: signal strength of probe response/beacon
- *	in mBm (100 * dBm) (s32)
- * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon
- *	in unspecified units, scaled to 0..100 (u8)
- * @NL80211_BSS_STATUS: status, if this BSS is "used"
- * @NL80211_BSS_SEEN_MS_AGO: age of this BSS entry in ms
- * @NL80211_BSS_BEACON_IES: binary attribute containing the raw information
- *	elements from a Beacon frame (bin); not present if no Beacon frame has
- *	yet been received
- * @__NL80211_BSS_AFTER_LAST: internal
- * @NL80211_BSS_MAX: highest BSS attribute
- */
-enum nl80211_bss {
-	__NL80211_BSS_INVALID,
-	NL80211_BSS_BSSID,
-	NL80211_BSS_FREQUENCY,
-	NL80211_BSS_TSF,
-	NL80211_BSS_BEACON_INTERVAL,
-	NL80211_BSS_CAPABILITY,
-	NL80211_BSS_INFORMATION_ELEMENTS,
-	NL80211_BSS_SIGNAL_MBM,
-	NL80211_BSS_SIGNAL_UNSPEC,
-	NL80211_BSS_STATUS,
-	NL80211_BSS_SEEN_MS_AGO,
-	NL80211_BSS_BEACON_IES,
-
-	/* keep last */
-	__NL80211_BSS_AFTER_LAST,
-	NL80211_BSS_MAX = __NL80211_BSS_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_bss_status - BSS "status"
- * @NL80211_BSS_STATUS_AUTHENTICATED: Authenticated with this BSS.
- * @NL80211_BSS_STATUS_ASSOCIATED: Associated with this BSS.
- * @NL80211_BSS_STATUS_IBSS_JOINED: Joined to this IBSS.
- *
- * The BSS status is a BSS attribute in scan dumps, which
- * indicates the status the interface has wrt. this BSS.
- */
-enum nl80211_bss_status {
-	NL80211_BSS_STATUS_AUTHENTICATED,
-	NL80211_BSS_STATUS_ASSOCIATED,
-	NL80211_BSS_STATUS_IBSS_JOINED,
-};
-
-/**
- * enum nl80211_auth_type - AuthenticationType
- *
- * @NL80211_AUTHTYPE_OPEN_SYSTEM: Open System authentication
- * @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only)
- * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
- * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
- * @NL80211_AUTHTYPE_SAE: Simultaneous authentication of equals
- * @__NL80211_AUTHTYPE_NUM: internal
- * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm
- * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by
- *	trying multiple times); this is invalid in netlink -- leave out
- *	the attribute for this on CONNECT commands.
- */
-enum nl80211_auth_type {
-	NL80211_AUTHTYPE_OPEN_SYSTEM,
-	NL80211_AUTHTYPE_SHARED_KEY,
-	NL80211_AUTHTYPE_FT,
-	NL80211_AUTHTYPE_NETWORK_EAP,
-	NL80211_AUTHTYPE_SAE,
-
-	/* keep last */
-	__NL80211_AUTHTYPE_NUM,
-	NL80211_AUTHTYPE_MAX = __NL80211_AUTHTYPE_NUM - 1,
-	NL80211_AUTHTYPE_AUTOMATIC
-};
-
-/**
- * enum nl80211_key_type - Key Type
- * @NL80211_KEYTYPE_GROUP: Group (broadcast/multicast) key
- * @NL80211_KEYTYPE_PAIRWISE: Pairwise (unicast/individual) key
- * @NL80211_KEYTYPE_PEERKEY: PeerKey (DLS)
- * @NUM_NL80211_KEYTYPES: number of defined key types
- */
-enum nl80211_key_type {
-	NL80211_KEYTYPE_GROUP,
-	NL80211_KEYTYPE_PAIRWISE,
-	NL80211_KEYTYPE_PEERKEY,
-
-	NUM_NL80211_KEYTYPES
-};
-
-/**
- * enum nl80211_mfp - Management frame protection state
- * @NL80211_MFP_NO: Management frame protection not used
- * @NL80211_MFP_REQUIRED: Management frame protection required
- */
-enum nl80211_mfp {
-	NL80211_MFP_NO,
-	NL80211_MFP_REQUIRED,
-};
-
-enum nl80211_wpa_versions {
-	NL80211_WPA_VERSION_1 = 1 << 0,
-	NL80211_WPA_VERSION_2 = 1 << 1,
-};
-
-/**
- * enum nl80211_key_default_types - key default types
- * @__NL80211_KEY_DEFAULT_TYPE_INVALID: invalid
- * @NL80211_KEY_DEFAULT_TYPE_UNICAST: key should be used as default
- *	unicast key
- * @NL80211_KEY_DEFAULT_TYPE_MULTICAST: key should be used as default
- *	multicast key
- * @NUM_NL80211_KEY_DEFAULT_TYPES: number of default types
- */
-enum nl80211_key_default_types {
-	__NL80211_KEY_DEFAULT_TYPE_INVALID,
-	NL80211_KEY_DEFAULT_TYPE_UNICAST,
-	NL80211_KEY_DEFAULT_TYPE_MULTICAST,
-
-	NUM_NL80211_KEY_DEFAULT_TYPES
-};
-
-/**
- * enum nl80211_key_attributes - key attributes
- * @__NL80211_KEY_INVALID: invalid
- * @NL80211_KEY_DATA: (temporal) key data; for TKIP this consists of
- *	16 bytes encryption key followed by 8 bytes each for TX and RX MIC
- *	keys
- * @NL80211_KEY_IDX: key ID (u8, 0-3)
- * @NL80211_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11
- *	section 7.3.2.25.1, e.g. 0x000FAC04)
- * @NL80211_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
- *	CCMP keys, each six bytes in little endian
- * @NL80211_KEY_DEFAULT: flag indicating default key
- * @NL80211_KEY_DEFAULT_MGMT: flag indicating default management key
- * @NL80211_KEY_TYPE: the key type from enum nl80211_key_type, if not
- *	specified the default depends on whether a MAC address was
- *	given with the command using the key or not (u32)
- * @NL80211_KEY_DEFAULT_TYPES: A nested attribute containing flags
- *	attributes, specifying what a key should be set as default as.
- *	See &enum nl80211_key_default_types.
- * @__NL80211_KEY_AFTER_LAST: internal
- * @NL80211_KEY_MAX: highest key attribute
- */
-enum nl80211_key_attributes {
-	__NL80211_KEY_INVALID,
-	NL80211_KEY_DATA,
-	NL80211_KEY_IDX,
-	NL80211_KEY_CIPHER,
-	NL80211_KEY_SEQ,
-	NL80211_KEY_DEFAULT,
-	NL80211_KEY_DEFAULT_MGMT,
-	NL80211_KEY_TYPE,
-	NL80211_KEY_DEFAULT_TYPES,
-
-	/* keep last */
-	__NL80211_KEY_AFTER_LAST,
-	NL80211_KEY_MAX = __NL80211_KEY_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_tx_rate_attributes - TX rate set attributes
- * @__NL80211_TXRATE_INVALID: invalid
- * @NL80211_TXRATE_LEGACY: Legacy (non-MCS) rates allowed for TX rate selection
- *	in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with
- *	1 = 500 kbps) but without the IE length restriction (at most
- *	%NL80211_MAX_SUPP_RATES in a single array).
- * @NL80211_TXRATE_MCS: HT (MCS) rates allowed for TX rate selection
- *	in an array of MCS numbers.
- * @__NL80211_TXRATE_AFTER_LAST: internal
- * @NL80211_TXRATE_MAX: highest TX rate attribute
- */
-enum nl80211_tx_rate_attributes {
-	__NL80211_TXRATE_INVALID,
-	NL80211_TXRATE_LEGACY,
-	NL80211_TXRATE_MCS,
-
-	/* keep last */
-	__NL80211_TXRATE_AFTER_LAST,
-	NL80211_TXRATE_MAX = __NL80211_TXRATE_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_band - Frequency band
- * @NL80211_BAND_2GHZ: 2.4 GHz ISM band
- * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)
- * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz)
- */
-enum nl80211_band {
-	NL80211_BAND_2GHZ,
-	NL80211_BAND_5GHZ,
-	NL80211_BAND_60GHZ,
-};
-
-/**
- * enum nl80211_ps_state - powersave state
- * @NL80211_PS_DISABLED: powersave is disabled
- * @NL80211_PS_ENABLED: powersave is enabled
- */
-enum nl80211_ps_state {
-	NL80211_PS_DISABLED,
-	NL80211_PS_ENABLED,
-};
-
-/**
- * enum nl80211_attr_cqm - connection quality monitor attributes
- * @__NL80211_ATTR_CQM_INVALID: invalid
- * @NL80211_ATTR_CQM_RSSI_THOLD: RSSI threshold in dBm. This value specifies
- *	the threshold for the RSSI level at which an event will be sent. Zero
- *	to disable.
- * @NL80211_ATTR_CQM_RSSI_HYST: RSSI hysteresis in dBm. This value specifies
- *	the minimum amount the RSSI level must change after an event before a
- *	new event may be issued (to reduce effects of RSSI oscillation).
- * @NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT: RSSI threshold event
- * @NL80211_ATTR_CQM_PKT_LOSS_EVENT: a u32 value indicating that this many
- *	consecutive packets were not acknowledged by the peer
- * @NL80211_ATTR_CQM_TXE_RATE: TX error rate in %. Minimum % of TX failures
- *	during the given %NL80211_ATTR_CQM_TXE_INTVL before an
- *	%NL80211_CMD_NOTIFY_CQM with reported %NL80211_ATTR_CQM_TXE_RATE and
- *	%NL80211_ATTR_CQM_TXE_PKTS is generated.
- * @NL80211_ATTR_CQM_TXE_PKTS: number of attempted packets in a given
- *	%NL80211_ATTR_CQM_TXE_INTVL before %NL80211_ATTR_CQM_TXE_RATE is
- *	checked.
- * @NL80211_ATTR_CQM_TXE_INTVL: interval in seconds. Specifies the periodic
- *	interval in which %NL80211_ATTR_CQM_TXE_PKTS and
- *	%NL80211_ATTR_CQM_TXE_RATE must be satisfied before generating an
- *	%NL80211_CMD_NOTIFY_CQM. Set to 0 to turn off TX error reporting.
- * @__NL80211_ATTR_CQM_AFTER_LAST: internal
- * @NL80211_ATTR_CQM_MAX: highest key attribute
- */
-enum nl80211_attr_cqm {
-	__NL80211_ATTR_CQM_INVALID,
-	NL80211_ATTR_CQM_RSSI_THOLD,
-	NL80211_ATTR_CQM_RSSI_HYST,
-	NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT,
-	NL80211_ATTR_CQM_PKT_LOSS_EVENT,
-	NL80211_ATTR_CQM_TXE_RATE,
-	NL80211_ATTR_CQM_TXE_PKTS,
-	NL80211_ATTR_CQM_TXE_INTVL,
-
-	/* keep last */
-	__NL80211_ATTR_CQM_AFTER_LAST,
-	NL80211_ATTR_CQM_MAX = __NL80211_ATTR_CQM_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_cqm_rssi_threshold_event - RSSI threshold event
- * @NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW: The RSSI level is lower than the
- *      configured threshold
- * @NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH: The RSSI is higher than the
- *      configured threshold
- * @NL80211_CQM_RSSI_BEACON_LOSS_EVENT: The device experienced beacon loss.
- *	(Note that deauth/disassoc will still follow if the AP is not
- *	available. This event might get used as roaming event, etc.)
- */
-enum nl80211_cqm_rssi_threshold_event {
-	NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,
-	NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,
-	NL80211_CQM_RSSI_BEACON_LOSS_EVENT,
-};
-
-
-/**
- * enum nl80211_tx_power_setting - TX power adjustment
- * @NL80211_TX_POWER_AUTOMATIC: automatically determine transmit power
- * @NL80211_TX_POWER_LIMITED: limit TX power by the mBm parameter
- * @NL80211_TX_POWER_FIXED: fix TX power to the mBm parameter
- */
-enum nl80211_tx_power_setting {
-	NL80211_TX_POWER_AUTOMATIC,
-	NL80211_TX_POWER_LIMITED,
-	NL80211_TX_POWER_FIXED,
-};
-
-/**
- * enum nl80211_wowlan_packet_pattern_attr - WoWLAN packet pattern attribute
- * @__NL80211_WOWLAN_PKTPAT_INVALID: invalid number for nested attribute
- * @NL80211_WOWLAN_PKTPAT_PATTERN: the pattern, values where the mask has
- *	a zero bit are ignored
- * @NL80211_WOWLAN_PKTPAT_MASK: pattern mask, must be long enough to have
- *	a bit for each byte in the pattern. The lowest-order bit corresponds
- *	to the first byte of the pattern, but the bytes of the pattern are
- *	in a little-endian-like format, i.e. the 9th byte of the pattern
- *	corresponds to the lowest-order bit in the second byte of the mask.
- *	For example: The match 00:xx:00:00:xx:00:00:00:00:xx:xx:xx (where
- *	xx indicates "don't care") would be represented by a pattern of
- *	twelve zero bytes, and a mask of "0xed,0x01".
- *	Note that the pattern matching is done as though frames were not
- *	802.11 frames but 802.3 frames, i.e. the frame is fully unpacked
- *	first (including SNAP header unpacking) and then matched.
- * @NL80211_WOWLAN_PKTPAT_OFFSET: packet offset, pattern is matched after
- *	these fixed number of bytes of received packet
- * @NUM_NL80211_WOWLAN_PKTPAT: number of attributes
- * @MAX_NL80211_WOWLAN_PKTPAT: max attribute number
- */
-enum nl80211_wowlan_packet_pattern_attr {
-	__NL80211_WOWLAN_PKTPAT_INVALID,
-	NL80211_WOWLAN_PKTPAT_MASK,
-	NL80211_WOWLAN_PKTPAT_PATTERN,
-	NL80211_WOWLAN_PKTPAT_OFFSET,
-
-	NUM_NL80211_WOWLAN_PKTPAT,
-	MAX_NL80211_WOWLAN_PKTPAT = NUM_NL80211_WOWLAN_PKTPAT - 1,
-};
-
-/**
- * struct nl80211_wowlan_pattern_support - pattern support information
- * @max_patterns: maximum number of patterns supported
- * @min_pattern_len: minimum length of each pattern
- * @max_pattern_len: maximum length of each pattern
- * @max_pkt_offset: maximum Rx packet offset
- *
- * This struct is carried in %NL80211_WOWLAN_TRIG_PKT_PATTERN when
- * that is part of %NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED in the
- * capability information given by the kernel to userspace.
- */
-struct nl80211_wowlan_pattern_support {
-	__u32 max_patterns;
-	__u32 min_pattern_len;
-	__u32 max_pattern_len;
-	__u32 max_pkt_offset;
-} __attribute__((packed));
-
-/**
- * enum nl80211_wowlan_triggers - WoWLAN trigger definitions
- * @__NL80211_WOWLAN_TRIG_INVALID: invalid number for nested attributes
- * @NL80211_WOWLAN_TRIG_ANY: wake up on any activity, do not really put
- *	the chip into a special state -- works best with chips that have
- *	support for low-power operation already (flag)
- * @NL80211_WOWLAN_TRIG_DISCONNECT: wake up on disconnect, the way disconnect
- *	is detected is implementation-specific (flag)
- * @NL80211_WOWLAN_TRIG_MAGIC_PKT: wake up on magic packet (6x 0xff, followed
- *	by 16 repetitions of MAC addr, anywhere in payload) (flag)
- * @NL80211_WOWLAN_TRIG_PKT_PATTERN: wake up on the specified packet patterns
- *	which are passed in an array of nested attributes, each nested attribute
- *	defining a with attributes from &struct nl80211_wowlan_trig_pkt_pattern.
- *	Each pattern defines a wakeup packet. Packet offset is associated with
- *	each pattern which is used while matching the pattern. The matching is
- *	done on the MSDU, i.e. as though the packet was an 802.3 packet, so the
- *	pattern matching is done after the packet is converted to the MSDU.
- *
- *	In %NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED, it is a binary attribute
- *	carrying a &struct nl80211_wowlan_pattern_support.
- *
- *	When reporting wakeup. it is a u32 attribute containing the 0-based
- *	index of the pattern that caused the wakeup, in the patterns passed
- *	to the kernel when configuring.
- * @NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED: Not a real trigger, and cannot be
- *	used when setting, used only to indicate that GTK rekeying is supported
- *	by the device (flag)
- * @NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE: wake up on GTK rekey failure (if
- *	done by the device) (flag)
- * @NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST: wake up on EAP Identity Request
- *	packet (flag)
- * @NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE: wake up on 4-way handshake (flag)
- * @NL80211_WOWLAN_TRIG_RFKILL_RELEASE: wake up when rfkill is released
- *	(on devices that have rfkill in the device) (flag)
- * @NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211: For wakeup reporting only, contains
- *	the 802.11 packet that caused the wakeup, e.g. a deauth frame. The frame
- *	may be truncated, the @NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211_LEN
- *	attribute contains the original length.
- * @NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211_LEN: Original length of the 802.11
- *	packet, may be bigger than the @NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211
- *	attribute if the packet was truncated somewhere.
- * @NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023: For wakeup reporting only, contains the
- *	802.11 packet that caused the wakeup, e.g. a magic packet. The frame may
- *	be truncated, the @NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023_LEN attribute
- *	contains the original length.
- * @NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023_LEN: Original length of the 802.3
- *	packet, may be bigger than the @NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023
- *	attribute if the packet was truncated somewhere.
- * @NL80211_WOWLAN_TRIG_TCP_CONNECTION: TCP connection wake, see DOC section
- *	"TCP connection wakeup" for more details. This is a nested attribute
- *	containing the exact information for establishing and keeping alive
- *	the TCP connection.
- * @NL80211_WOWLAN_TRIG_TCP_WAKEUP_MATCH: For wakeup reporting only, the
- *	wakeup packet was received on the TCP connection
- * @NL80211_WOWLAN_TRIG_WAKEUP_TCP_CONNLOST: For wakeup reporting only, the
- *	TCP connection was lost or failed to be established
- * @NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS: For wakeup reporting only,
- *	the TCP connection ran out of tokens to use for data to send to the
- *	service
- * @NUM_NL80211_WOWLAN_TRIG: number of wake on wireless triggers
- * @MAX_NL80211_WOWLAN_TRIG: highest wowlan trigger attribute number
- *
- * These nested attributes are used to configure the wakeup triggers and
- * to report the wakeup reason(s).
- */
-enum nl80211_wowlan_triggers {
-	__NL80211_WOWLAN_TRIG_INVALID,
-	NL80211_WOWLAN_TRIG_ANY,
-	NL80211_WOWLAN_TRIG_DISCONNECT,
-	NL80211_WOWLAN_TRIG_MAGIC_PKT,
-	NL80211_WOWLAN_TRIG_PKT_PATTERN,
-	NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED,
-	NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE,
-	NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST,
-	NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE,
-	NL80211_WOWLAN_TRIG_RFKILL_RELEASE,
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211,
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211_LEN,
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023,
-	NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023_LEN,
-	NL80211_WOWLAN_TRIG_TCP_CONNECTION,
-	NL80211_WOWLAN_TRIG_WAKEUP_TCP_MATCH,
-	NL80211_WOWLAN_TRIG_WAKEUP_TCP_CONNLOST,
-	NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS,
-
-	/* keep last */
-	NUM_NL80211_WOWLAN_TRIG,
-	MAX_NL80211_WOWLAN_TRIG = NUM_NL80211_WOWLAN_TRIG - 1
-};
-
-/**
- * DOC: TCP connection wakeup
- *
- * Some devices can establish a TCP connection in order to be woken up by a
- * packet coming in from outside their network segment, or behind NAT. If
- * configured, the device will establish a TCP connection to the given
- * service, and periodically send data to that service. The first data
- * packet is usually transmitted after SYN/ACK, also ACKing the SYN/ACK.
- * The data packets can optionally include a (little endian) sequence
- * number (in the TCP payload!) that is generated by the device, and, also
- * optionally, a token from a list of tokens. This serves as a keep-alive
- * with the service, and for NATed connections, etc.
- *
- * During this keep-alive period, the server doesn't send any data to the
- * client. When receiving data, it is compared against the wakeup pattern
- * (and mask) and if it matches, the host is woken up. Similarly, if the
- * connection breaks or cannot be established to start with, the host is
- * also woken up.
- *
- * Developer's note: ARP offload is required for this, otherwise TCP
- * response packets might not go through correctly.
- */
-
-/**
- * struct nl80211_wowlan_tcp_data_seq - WoWLAN TCP data sequence
- * @start: starting value
- * @offset: offset of sequence number in packet
- * @len: length of the sequence value to write, 1 through 4
- *
- * Note: don't confuse with the TCP sequence number(s), this is for the
- * keepalive packet payload. The actual value is written into the packet
- * in little endian.
- */
-struct nl80211_wowlan_tcp_data_seq {
-	__u32 start, offset, len;
-};
-
-/**
- * struct nl80211_wowlan_tcp_data_token - WoWLAN TCP data token config
- * @offset: offset of token in packet
- * @len: length of each token
- * @token_stream: stream of data to be used for the tokens, the length must
- *	be a multiple of @len for this to make sense
- */
-struct nl80211_wowlan_tcp_data_token {
-	__u32 offset, len;
-	__u8 token_stream[];
-};
-
-/**
- * struct nl80211_wowlan_tcp_data_token_feature - data token features
- * @min_len: minimum token length
- * @max_len: maximum token length
- * @bufsize: total available token buffer size (max size of @token_stream)
- */
-struct nl80211_wowlan_tcp_data_token_feature {
-	__u32 min_len, max_len, bufsize;
-};
-
-/**
- * enum nl80211_wowlan_tcp_attrs - WoWLAN TCP connection parameters
- * @__NL80211_WOWLAN_TCP_INVALID: invalid number for nested attributes
- * @NL80211_WOWLAN_TCP_SRC_IPV4: source IPv4 address (in network byte order)
- * @NL80211_WOWLAN_TCP_DST_IPV4: destination IPv4 address
- *	(in network byte order)
- * @NL80211_WOWLAN_TCP_DST_MAC: destination MAC address, this is given because
- *	route lookup when configured might be invalid by the time we suspend,
- *	and doing a route lookup when suspending is no longer possible as it
- *	might require ARP querying.
- * @NL80211_WOWLAN_TCP_SRC_PORT: source port (u16); optional, if not given a
- *	socket and port will be allocated
- * @NL80211_WOWLAN_TCP_DST_PORT: destination port (u16)
- * @NL80211_WOWLAN_TCP_DATA_PAYLOAD: data packet payload, at least one byte.
- *	For feature advertising, a u32 attribute holding the maximum length
- *	of the data payload.
- * @NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ: data packet sequence configuration
- *	(if desired), a &struct nl80211_wowlan_tcp_data_seq. For feature
- *	advertising it is just a flag
- * @NL80211_WOWLAN_TCP_DATA_PAYLOAD_TOKEN: data packet token configuration,
- *	see &struct nl80211_wowlan_tcp_data_token and for advertising see
- *	&struct nl80211_wowlan_tcp_data_token_feature.
- * @NL80211_WOWLAN_TCP_DATA_INTERVAL: data interval in seconds, maximum
- *	interval in feature advertising (u32)
- * @NL80211_WOWLAN_TCP_WAKE_PAYLOAD: wake packet payload, for advertising a
- *	u32 attribute holding the maximum length
- * @NL80211_WOWLAN_TCP_WAKE_MASK: Wake packet payload mask, not used for
- *	feature advertising. The mask works like @NL80211_WOWLAN_PKTPAT_MASK
- *	but on the TCP payload only.
- * @NUM_NL80211_WOWLAN_TCP: number of TCP attributes
- * @MAX_NL80211_WOWLAN_TCP: highest attribute number
- */
-enum nl80211_wowlan_tcp_attrs {
-	__NL80211_WOWLAN_TCP_INVALID,
-	NL80211_WOWLAN_TCP_SRC_IPV4,
-	NL80211_WOWLAN_TCP_DST_IPV4,
-	NL80211_WOWLAN_TCP_DST_MAC,
-	NL80211_WOWLAN_TCP_SRC_PORT,
-	NL80211_WOWLAN_TCP_DST_PORT,
-	NL80211_WOWLAN_TCP_DATA_PAYLOAD,
-	NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ,
-	NL80211_WOWLAN_TCP_DATA_PAYLOAD_TOKEN,
-	NL80211_WOWLAN_TCP_DATA_INTERVAL,
-	NL80211_WOWLAN_TCP_WAKE_PAYLOAD,
-	NL80211_WOWLAN_TCP_WAKE_MASK,
-
-	/* keep last */
-	NUM_NL80211_WOWLAN_TCP,
-	MAX_NL80211_WOWLAN_TCP = NUM_NL80211_WOWLAN_TCP - 1
-};
-
-/**
- * enum nl80211_iface_limit_attrs - limit attributes
- * @NL80211_IFACE_LIMIT_UNSPEC: (reserved)
- * @NL80211_IFACE_LIMIT_MAX: maximum number of interfaces that
- *	can be chosen from this set of interface types (u32)
- * @NL80211_IFACE_LIMIT_TYPES: nested attribute containing a
- *	flag attribute for each interface type in this set
- * @NUM_NL80211_IFACE_LIMIT: number of attributes
- * @MAX_NL80211_IFACE_LIMIT: highest attribute number
- */
-enum nl80211_iface_limit_attrs {
-	NL80211_IFACE_LIMIT_UNSPEC,
-	NL80211_IFACE_LIMIT_MAX,
-	NL80211_IFACE_LIMIT_TYPES,
-
-	/* keep last */
-	NUM_NL80211_IFACE_LIMIT,
-	MAX_NL80211_IFACE_LIMIT = NUM_NL80211_IFACE_LIMIT - 1
-};
-
-/**
- * enum nl80211_if_combination_attrs -- interface combination attributes
- *
- * @NL80211_IFACE_COMB_UNSPEC: (reserved)
- * @NL80211_IFACE_COMB_LIMITS: Nested attributes containing the limits
- *	for given interface types, see &enum nl80211_iface_limit_attrs.
- * @NL80211_IFACE_COMB_MAXNUM: u32 attribute giving the total number of
- *	interfaces that can be created in this group. This number doesn't
- *	apply to interfaces purely managed in software, which are listed
- *	in a separate attribute %NL80211_ATTR_INTERFACES_SOFTWARE.
- * @NL80211_IFACE_COMB_STA_AP_BI_MATCH: flag attribute specifying that
- *	beacon intervals within this group must be all the same even for
- *	infrastructure and AP/GO combinations, i.e. the GO(s) must adopt
- *	the infrastructure network's beacon interval.
- * @NL80211_IFACE_COMB_NUM_CHANNELS: u32 attribute specifying how many
- *	different channels may be used within this group.
- * @NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS: u32 attribute containing the bitmap
- *	of supported channel widths for radar detection.
- * @NUM_NL80211_IFACE_COMB: number of attributes
- * @MAX_NL80211_IFACE_COMB: highest attribute number
- *
- * Examples:
- *	limits = [ #{STA} <= 1, #{AP} <= 1 ], matching BI, channels = 1, max = 2
- *	=> allows an AP and a STA that must match BIs
- *
- *	numbers = [ #{AP, P2P-GO} <= 8 ], channels = 1, max = 8
- *	=> allows 8 of AP/GO
- *
- *	numbers = [ #{STA} <= 2 ], channels = 2, max = 2
- *	=> allows two STAs on different channels
- *
- *	numbers = [ #{STA} <= 1, #{P2P-client,P2P-GO} <= 3 ], max = 4
- *	=> allows a STA plus three P2P interfaces
- *
- * The list of these four possiblities could completely be contained
- * within the %NL80211_ATTR_INTERFACE_COMBINATIONS attribute to indicate
- * that any of these groups must match.
- *
- * "Combinations" of just a single interface will not be listed here,
- * a single interface of any valid interface type is assumed to always
- * be possible by itself. This means that implicitly, for each valid
- * interface type, the following group always exists:
- *	numbers = [ #{<type>} <= 1 ], channels = 1, max = 1
- */
-enum nl80211_if_combination_attrs {
-	NL80211_IFACE_COMB_UNSPEC,
-	NL80211_IFACE_COMB_LIMITS,
-	NL80211_IFACE_COMB_MAXNUM,
-	NL80211_IFACE_COMB_STA_AP_BI_MATCH,
-	NL80211_IFACE_COMB_NUM_CHANNELS,
-	NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
-
-	/* keep last */
-	NUM_NL80211_IFACE_COMB,
-	MAX_NL80211_IFACE_COMB = NUM_NL80211_IFACE_COMB - 1
-};
-
-
-/**
- * enum nl80211_plink_state - state of a mesh peer link finite state machine
- *
- * @NL80211_PLINK_LISTEN: initial state, considered the implicit
- *	state of non existant mesh peer links
- * @NL80211_PLINK_OPN_SNT: mesh plink open frame has been sent to
- *	this mesh peer
- * @NL80211_PLINK_OPN_RCVD: mesh plink open frame has been received
- *	from this mesh peer
- * @NL80211_PLINK_CNF_RCVD: mesh plink confirm frame has been
- *	received from this mesh peer
- * @NL80211_PLINK_ESTAB: mesh peer link is established
- * @NL80211_PLINK_HOLDING: mesh peer link is being closed or cancelled
- * @NL80211_PLINK_BLOCKED: all frames transmitted from this mesh
- *	plink are discarded
- * @NUM_NL80211_PLINK_STATES: number of peer link states
- * @MAX_NL80211_PLINK_STATES: highest numerical value of plink states
- */
-enum nl80211_plink_state {
-	NL80211_PLINK_LISTEN,
-	NL80211_PLINK_OPN_SNT,
-	NL80211_PLINK_OPN_RCVD,
-	NL80211_PLINK_CNF_RCVD,
-	NL80211_PLINK_ESTAB,
-	NL80211_PLINK_HOLDING,
-	NL80211_PLINK_BLOCKED,
-
-	/* keep last */
-	NUM_NL80211_PLINK_STATES,
-	MAX_NL80211_PLINK_STATES = NUM_NL80211_PLINK_STATES - 1
-};
-
-/**
- * enum nl80211_plink_action - actions to perform in mesh peers
- *
- * @NL80211_PLINK_ACTION_NO_ACTION: perform no action
- * @NL80211_PLINK_ACTION_OPEN: start mesh peer link establishment
- * @NL80211_PLINK_ACTION_BLOCK: block traffic from this mesh peer
- * @NUM_NL80211_PLINK_ACTIONS: number of possible actions
- */
-enum plink_actions {
-	NL80211_PLINK_ACTION_NO_ACTION,
-	NL80211_PLINK_ACTION_OPEN,
-	NL80211_PLINK_ACTION_BLOCK,
-
-	NUM_NL80211_PLINK_ACTIONS,
-};
-
-
-#define NL80211_KCK_LEN			16
-#define NL80211_KEK_LEN			16
-#define NL80211_REPLAY_CTR_LEN		8
-
-/**
- * enum nl80211_rekey_data - attributes for GTK rekey offload
- * @__NL80211_REKEY_DATA_INVALID: invalid number for nested attributes
- * @NL80211_REKEY_DATA_KEK: key encryption key (binary)
- * @NL80211_REKEY_DATA_KCK: key confirmation key (binary)
- * @NL80211_REKEY_DATA_REPLAY_CTR: replay counter (binary)
- * @NUM_NL80211_REKEY_DATA: number of rekey attributes (internal)
- * @MAX_NL80211_REKEY_DATA: highest rekey attribute (internal)
- */
-enum nl80211_rekey_data {
-	__NL80211_REKEY_DATA_INVALID,
-	NL80211_REKEY_DATA_KEK,
-	NL80211_REKEY_DATA_KCK,
-	NL80211_REKEY_DATA_REPLAY_CTR,
-
-	/* keep last */
-	NUM_NL80211_REKEY_DATA,
-	MAX_NL80211_REKEY_DATA = NUM_NL80211_REKEY_DATA - 1
-};
-
-/**
- * enum nl80211_hidden_ssid - values for %NL80211_ATTR_HIDDEN_SSID
- * @NL80211_HIDDEN_SSID_NOT_IN_USE: do not hide SSID (i.e., broadcast it in
- *	Beacon frames)
- * @NL80211_HIDDEN_SSID_ZERO_LEN: hide SSID by using zero-length SSID element
- *	in Beacon frames
- * @NL80211_HIDDEN_SSID_ZERO_CONTENTS: hide SSID by using correct length of SSID
- *	element in Beacon frames but zero out each byte in the SSID
- */
-enum nl80211_hidden_ssid {
-	NL80211_HIDDEN_SSID_NOT_IN_USE,
-	NL80211_HIDDEN_SSID_ZERO_LEN,
-	NL80211_HIDDEN_SSID_ZERO_CONTENTS
-};
-
-/**
- * enum nl80211_sta_wme_attr - station WME attributes
- * @__NL80211_STA_WME_INVALID: invalid number for nested attribute
- * @NL80211_STA_WME_UAPSD_QUEUES: bitmap of uapsd queues. the format
- *	is the same as the AC bitmap in the QoS info field.
- * @NL80211_STA_WME_MAX_SP: max service period. the format is the same
- *	as the MAX_SP field in the QoS info field (but already shifted down).
- * @__NL80211_STA_WME_AFTER_LAST: internal
- * @NL80211_STA_WME_MAX: highest station WME attribute
- */
-enum nl80211_sta_wme_attr {
-	__NL80211_STA_WME_INVALID,
-	NL80211_STA_WME_UAPSD_QUEUES,
-	NL80211_STA_WME_MAX_SP,
-
-	/* keep last */
-	__NL80211_STA_WME_AFTER_LAST,
-	NL80211_STA_WME_MAX = __NL80211_STA_WME_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_pmksa_candidate_attr - attributes for PMKSA caching candidates
- * @__NL80211_PMKSA_CANDIDATE_INVALID: invalid number for nested attributes
- * @NL80211_PMKSA_CANDIDATE_INDEX: candidate index (u32; the smaller, the higher
- *	priority)
- * @NL80211_PMKSA_CANDIDATE_BSSID: candidate BSSID (6 octets)
- * @NL80211_PMKSA_CANDIDATE_PREAUTH: RSN pre-authentication supported (flag)
- * @NUM_NL80211_PMKSA_CANDIDATE: number of PMKSA caching candidate attributes
- *	(internal)
- * @MAX_NL80211_PMKSA_CANDIDATE: highest PMKSA caching candidate attribute
- *	(internal)
- */
-enum nl80211_pmksa_candidate_attr {
-	__NL80211_PMKSA_CANDIDATE_INVALID,
-	NL80211_PMKSA_CANDIDATE_INDEX,
-	NL80211_PMKSA_CANDIDATE_BSSID,
-	NL80211_PMKSA_CANDIDATE_PREAUTH,
-
-	/* keep last */
-	NUM_NL80211_PMKSA_CANDIDATE,
-	MAX_NL80211_PMKSA_CANDIDATE = NUM_NL80211_PMKSA_CANDIDATE - 1
-};
-
-/**
- * enum nl80211_tdls_operation - values for %NL80211_ATTR_TDLS_OPERATION
- * @NL80211_TDLS_DISCOVERY_REQ: Send a TDLS discovery request
- * @NL80211_TDLS_SETUP: Setup TDLS link
- * @NL80211_TDLS_TEARDOWN: Teardown a TDLS link which is already established
- * @NL80211_TDLS_ENABLE_LINK: Enable TDLS link
- * @NL80211_TDLS_DISABLE_LINK: Disable TDLS link
- */
-enum nl80211_tdls_operation {
-	NL80211_TDLS_DISCOVERY_REQ,
-	NL80211_TDLS_SETUP,
-	NL80211_TDLS_TEARDOWN,
-	NL80211_TDLS_ENABLE_LINK,
-	NL80211_TDLS_DISABLE_LINK,
-};
-
-/*
- * enum nl80211_ap_sme_features - device-integrated AP features
- * Reserved for future use, no bits are defined in
- * NL80211_ATTR_DEVICE_AP_SME yet.
-enum nl80211_ap_sme_features {
-};
- */
-
-/**
- * enum nl80211_feature_flags - device/driver features
- * @NL80211_FEATURE_SK_TX_STATUS: This driver supports reflecting back
- *	TX status to the socket error queue when requested with the
- *	socket option.
- * @NL80211_FEATURE_HT_IBSS: This driver supports IBSS with HT datarates.
- * @NL80211_FEATURE_INACTIVITY_TIMER: This driver takes care of freeing up
- *	the connected inactive stations in AP mode.
- * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested
- *	to work properly to suppport receiving regulatory hints from
- *	cellular base stations.
- * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: If this is set, an active
- *	P2P Device (%NL80211_IFTYPE_P2P_DEVICE) requires its own channel
- *	in the interface combinations, even when it's only used for scan
- *	and remain-on-channel. This could be due to, for example, the
- *	remain-on-channel implementation requiring a channel context.
- * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of
- *	equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station
- *	mode
- * @NL80211_FEATURE_LOW_PRIORITY_SCAN: This driver supports low priority scan
- * @NL80211_FEATURE_SCAN_FLUSH: Scan flush is supported
- * @NL80211_FEATURE_AP_SCAN: Support scanning using an AP vif
- * @NL80211_FEATURE_VIF_TXPOWER: The driver supports per-vif TX power setting
- * @NL80211_FEATURE_NEED_OBSS_SCAN: The driver expects userspace to perform
- *	OBSS scans and generate 20/40 BSS coex reports. This flag is used only
- *	for drivers implementing the CONNECT API, for AUTH/ASSOC it is implied.
- * @NL80211_FEATURE_P2P_GO_CTWIN: P2P GO implementation supports CT Window
- *	setting
- * @NL80211_FEATURE_P2P_GO_OPPPS: P2P GO implementation supports opportunistic
- *	powersave
- * @NL80211_FEATURE_FULL_AP_CLIENT_STATE: The driver supports full state
- *	transitions for AP clients. Without this flag (and if the driver
- *	doesn't have the AP SME in the device) the driver supports adding
- *	stations only when they're associated and adds them in associated
- *	state (to later be transitioned into authorized), with this flag
- *	they should be added before even sending the authentication reply
- *	and then transitioned into authenticated, associated and authorized
- *	states using station flags.
- *	Note that even for drivers that support this, the default is to add
- *	stations in authenticated/associated state, so to add unauthenticated
- *	stations the authenticated/associated bits have to be set in the mask.
- * @NL80211_FEATURE_ADVERTISE_CHAN_LIMITS: cfg80211 advertises channel limits
- *	(HT40, VHT 80/160 MHz) if this flag is set
- * @NL80211_FEATURE_USERSPACE_MPM: This driver supports a userspace Mesh
- *	Peering Management entity which may be implemented by registering for
- *	beacons or NL80211_CMD_NEW_PEER_CANDIDATE events. The mesh beacon is
- *	still generated by the driver.
- */
-enum nl80211_feature_flags {
-	NL80211_FEATURE_SK_TX_STATUS			= 1 << 0,
-	NL80211_FEATURE_HT_IBSS				= 1 << 1,
-	NL80211_FEATURE_INACTIVITY_TIMER		= 1 << 2,
-	NL80211_FEATURE_CELL_BASE_REG_HINTS		= 1 << 3,
-	NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL	= 1 << 4,
-	NL80211_FEATURE_SAE				= 1 << 5,
-	NL80211_FEATURE_LOW_PRIORITY_SCAN		= 1 << 6,
-	NL80211_FEATURE_SCAN_FLUSH			= 1 << 7,
-	NL80211_FEATURE_AP_SCAN				= 1 << 8,
-	NL80211_FEATURE_VIF_TXPOWER			= 1 << 9,
-	NL80211_FEATURE_NEED_OBSS_SCAN			= 1 << 10,
-	NL80211_FEATURE_P2P_GO_CTWIN			= 1 << 11,
-	NL80211_FEATURE_P2P_GO_OPPPS			= 1 << 12,
-	/* bit 13 is reserved */
-	NL80211_FEATURE_ADVERTISE_CHAN_LIMITS		= 1 << 14,
-	NL80211_FEATURE_FULL_AP_CLIENT_STATE		= 1 << 15,
-	NL80211_FEATURE_USERSPACE_MPM			= 1 << 16,
-};
-
-/**
- * enum nl80211_probe_resp_offload_support_attr - optional supported
- *	protocols for probe-response offloading by the driver/FW.
- *	To be used with the %NL80211_ATTR_PROBE_RESP_OFFLOAD attribute.
- *	Each enum value represents a bit in the bitmap of supported
- *	protocols. Typically a subset of probe-requests belonging to a
- *	supported protocol will be excluded from offload and uploaded
- *	to the host.
- *
- * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS: Support for WPS ver. 1
- * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2: Support for WPS ver. 2
- * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P: Support for P2P
- * @NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U: Support for 802.11u
- */
-enum nl80211_probe_resp_offload_support_attr {
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS =	1<<0,
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 =	1<<1,
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P =	1<<2,
-	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U =	1<<3,
-};
-
-/**
- * enum nl80211_connect_failed_reason - connection request failed reasons
- * @NL80211_CONN_FAIL_MAX_CLIENTS: Maximum number of clients that can be
- *	handled by the AP is reached.
- * @NL80211_CONN_FAIL_BLOCKED_CLIENT: Connection request is rejected due to ACL.
- */
-enum nl80211_connect_failed_reason {
-	NL80211_CONN_FAIL_MAX_CLIENTS,
-	NL80211_CONN_FAIL_BLOCKED_CLIENT,
-};
-
-/**
- * enum nl80211_scan_flags -  scan request control flags
- *
- * Scan request control flags are used to control the handling
- * of NL80211_CMD_TRIGGER_SCAN and NL80211_CMD_START_SCHED_SCAN
- * requests.
- *
- * @NL80211_SCAN_FLAG_LOW_PRIORITY: scan request has low priority
- * @NL80211_SCAN_FLAG_FLUSH: flush cache before scanning
- * @NL80211_SCAN_FLAG_AP: force a scan even if the interface is configured
- *	as AP and the beaconing has already been configured. This attribute is
- *	dangerous because will destroy stations performance as a lot of frames
- *	will be lost while scanning off-channel, therefore it must be used only
- *	when really needed
- */
-enum nl80211_scan_flags {
-	NL80211_SCAN_FLAG_LOW_PRIORITY			= 1<<0,
-	NL80211_SCAN_FLAG_FLUSH				= 1<<1,
-	NL80211_SCAN_FLAG_AP				= 1<<2,
-};
-
-/**
- * enum nl80211_acl_policy - access control policy
- *
- * Access control policy is applied on a MAC list set by
- * %NL80211_CMD_START_AP and %NL80211_CMD_SET_MAC_ACL, to
- * be used with %NL80211_ATTR_ACL_POLICY.
- *
- * @NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED: Deny stations which are
- *	listed in ACL, i.e. allow all the stations which are not listed
- *	in ACL to authenticate.
- * @NL80211_ACL_POLICY_DENY_UNLESS_LISTED: Allow the stations which are listed
- *	in ACL, i.e. deny all the stations which are not listed in ACL.
- */
-enum nl80211_acl_policy {
-	NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED,
-	NL80211_ACL_POLICY_DENY_UNLESS_LISTED,
-};
-
-/**
- * enum nl80211_radar_event - type of radar event for DFS operation
- *
- * Type of event to be used with NL80211_ATTR_RADAR_EVENT to inform userspace
- * about detected radars or success of the channel available check (CAC)
- *
- * @NL80211_RADAR_DETECTED: A radar pattern has been detected. The channel is
- *	now unusable.
- * @NL80211_RADAR_CAC_FINISHED: Channel Availability Check has been finished,
- *	the channel is now available.
- * @NL80211_RADAR_CAC_ABORTED: Channel Availability Check has been aborted, no
- *	change to the channel status.
- * @NL80211_RADAR_NOP_FINISHED: The Non-Occupancy Period for this channel is
- *	over, channel becomes usable.
- */
-enum nl80211_radar_event {
-	NL80211_RADAR_DETECTED,
-	NL80211_RADAR_CAC_FINISHED,
-	NL80211_RADAR_CAC_ABORTED,
-	NL80211_RADAR_NOP_FINISHED,
-};
-
-/**
- * enum nl80211_dfs_state - DFS states for channels
- *
- * Channel states used by the DFS code.
- *
- * @IEEE80211_DFS_USABLE: The channel can be used, but channel availability
- *	check (CAC) must be performed before using it for AP or IBSS.
- * @IEEE80211_DFS_UNAVAILABLE: A radar has been detected on this channel, it
- *	is therefore marked as not available.
- * @IEEE80211_DFS_AVAILABLE: The channel has been CAC checked and is available.
- */
-
-enum nl80211_dfs_state {
-	NL80211_DFS_USABLE,
-	NL80211_DFS_UNAVAILABLE,
-	NL80211_DFS_AVAILABLE,
-};
-
-/**
- * enum enum nl80211_protocol_features - nl80211 protocol features
- * @NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP: nl80211 supports splitting
- *	wiphy dumps (if requested by the application with the attribute
- *	%NL80211_ATTR_SPLIT_WIPHY_DUMP. Also supported is filtering the
- *	wiphy dump by %NL80211_ATTR_WIPHY, %NL80211_ATTR_IFINDEX or
- *	%NL80211_ATTR_WDEV.
- */
-enum nl80211_protocol_features {
-	NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP =	1 << 0,
-};
-
-#endif /* __LINUX_NL80211_H */
diff --git a/openflow/usr/include/reglib/regdb.h b/openflow/usr/include/reglib/regdb.h
deleted file mode 100644
index 20f29e9..0000000
--- a/openflow/usr/include/reglib/regdb.h
+++ /dev/null
@@ -1,150 +0,0 @@
-#ifndef REG_DB_H
-#define REG_DB_H
-
-#include <stdint.h>
-
-/*
- * WARNING: This file needs to be kept in sync with
- *  - the parser (dbparse.py)
- *  - the generator code (db2bin.py)
- *
- * As it is only Linux is using these so we have a direct one to
- * one map for flags. Each respective OS flag is listed where
- * appropriate.
- */
-
-/* spells "RGDB" */
-#define REGDB_MAGIC	0x52474442
-
-/*
- * Only supported version now, start at arbitrary number
- * to have some more magic. We still consider this to be
- * "Version 1" of the file.
- */
-#define REGDB_VERSION	19
-
-/*
- * The signature at the end of the file is an RSA-signed
- * SHA-1 hash of the file.
- */
-
-/* db file starts with a struct regdb_file_header */
-
-struct regdb_file_header {
-	/* must be REGDB_MAGIC */
-	uint32_t	magic;
-	/* must be REGDB_VERSION */
-	uint32_t	version;
-	/*
-	 * Pointer (offset) into file where country list starts
-	 * and number of countries. The country list is sorted
-	 * alphabetically to allow binary searching (should it
-	 * become really huge). Each country is described by a
-	 * struct regdb_file_reg_country.
-	 */
-	uint32_t	reg_country_ptr;
-	uint32_t	reg_country_num;
-	/* length (in bytes) of the signature at the end of the file */
-	uint32_t	signature_length;
-};
-
-struct regdb_file_freq_range {
-	uint32_t	start_freq,	/* in kHz */
-		end_freq,	/* in kHz */
-		max_bandwidth;	/* in kHz */
-};
-
-/*
- * Values of zero mean "not applicable", i.e. the regulatory
- * does not limit a certain value.
- */
-struct regdb_file_power_rule {
-	/* antenna gain is in mBi (100 * dBi) */
-	uint32_t	max_antenna_gain;
-	/* this is in mBm (100 * dBm) */
-	uint32_t	max_eirp;
-};
-
-/*
- * The Linux map defined in <linux/uapi/nl80211.h> enum nl80211_reg_rule_flags
- */
-enum reg_rule_flags {
-	RRF_NO_OFDM		= 1<<0, /* OFDM modulation not allowed */
-	RRF_NO_CCK		= 1<<1, /* CCK modulation not allowed */
-	RRF_NO_INDOOR		= 1<<2, /* indoor operation not allowed */
-	RRF_NO_OUTDOOR		= 1<<3, /* outdoor operation not allowed */
-	RRF_DFS			= 1<<4, /* DFS support is required to be
-					 * used */
-	RRF_PTP_ONLY		= 1<<5, /* this is only for Point To Point
-					 * links */
-	RRF_PTMP_ONLY		= 1<<6, /* this is only for Point To Multi
-					 * Point links */
-	RRF_NO_IR		= 1<<7, /* do not initiate radiation */
-	__RRF_NO_IBSS		= 1<<8, /* old no-IBSS rule, maps to no-ir */
-};
-
-#define RRF_NO_IR_ALL	(RRF_NO_IR | __RRF_NO_IBSS)
-
-/**
- * enum regdb_dfs_regions - regulatory DFS regions
- *
- * @REGDB_DFS_UNSET: Country has no DFS master region specified
- * @REGDB_DFS_FCC: Country follows DFS master rules from FCC
- * @REGDB_DFS_ETSI: Country follows DFS master rules from ETSI
- * @REGDB_DFS_JP: Country follows DFS master rules from JP/MKK/Telec
- */
-enum regdb_dfs_regions {
-	REGDB_DFS_UNSET	= 0,
-	REGDB_DFS_FCC	= 1,
-	REGDB_DFS_ETSI	= 2,
-	REGDB_DFS_JP	= 3,
-};
-
-struct regdb_file_reg_rule {
-	/* pointers (offsets) into the file */
-	uint32_t	freq_range_ptr; /* pointer to a struct regdb_file_freq_range */
-	uint32_t	power_rule_ptr; /* pointer to a struct regdb_file_power_rule */
-	/* rule flags using enum reg_rule_flags */
-	uint32_t flags;
-};
-
-struct regdb_file_reg_rules_collection {
-	uint32_t	reg_rule_num;
-	/* pointers (offsets) into the file. There are reg_rule_num elements
-	 * in the reg_rule_ptrs array pointing to struct
-	 * regdb_file_reg_rule */
-	uint32_t	reg_rule_ptrs[];
-};
-
-struct regdb_file_reg_country {
-	uint8_t	alpha2[2];
-	uint8_t	PAD;
-	uint8_t	creqs; /* first two bits define DFS region */
-	/* pointer (offset) into the file to a struct
-	 * regdb_file_reg_rules_collection */
-	uint32_t	reg_collection_ptr;
-};
-
-
-/*
- * Verify that no unexpected padding is added to structures
- * for some reason.
- */
-
-#define ERROR_ON(cond) \
-	((void)sizeof(char[1 - 2*!!(cond)]))
-
-#define CHECK_STRUCT(name, size) \
-	ERROR_ON(sizeof(struct name) != size)
-
-static inline void check_db_binary_structs(void)
-{
-	CHECK_STRUCT(regdb_file_header, 20);
-	CHECK_STRUCT(regdb_file_freq_range, 12);
-	CHECK_STRUCT(regdb_file_power_rule, 8);
-	CHECK_STRUCT(regdb_file_reg_rule, 12);
-	CHECK_STRUCT(regdb_file_reg_rules_collection, 4);
-	CHECK_STRUCT(regdb_file_reg_country, 8);
-}
-
-#endif
diff --git a/openflow/usr/include/reglib/reglib.h b/openflow/usr/include/reglib/reglib.h
deleted file mode 100644
index d570c36..0000000
--- a/openflow/usr/include/reglib/reglib.h
+++ /dev/null
@@ -1,243 +0,0 @@
-#ifndef REG_LIB_H
-#define REG_LIB_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <sys/stat.h>
-#include <math.h>
-
-#include "regdb.h"
-
-/* Common regulatory structures, functions and helpers */
-
-/* This matches the kernel's data structures */
-struct ieee80211_freq_range {
-	uint32_t start_freq_khz;
-	uint32_t end_freq_khz;
-	uint32_t max_bandwidth_khz;
-};
-
-struct ieee80211_power_rule {
-	uint32_t max_antenna_gain;
-	uint32_t max_eirp;
-};
-
-struct ieee80211_reg_rule {
-	struct ieee80211_freq_range freq_range;
-	struct ieee80211_power_rule power_rule;
-	uint32_t flags;
-};
-
-struct ieee80211_regdomain {
-	uint32_t n_reg_rules;
-	char alpha2[2];
-	uint8_t dfs_region;
-	struct ieee80211_reg_rule reg_rules[];
-};
-
-/* Remove this once upstream nl80211.h gets this */
-#define NL80211_RRF_NO_IR (1<<7)
-
-#define REGLIB_MHZ_TO_KHZ(freq) ((freq) * 1000)
-#define REGLIB_KHZ_TO_MHZ(freq) ((freq) / 1000)
-#define REGLIB_DBI_TO_MBI(gain) ((gain) * 100)
-#define REGLIB_MBI_TO_DBI(gain) ((gain) / 100)
-#define REGLIB_DBM_TO_MBM(gain) ((gain) * 100)
-#define REGLIB_MBM_TO_DBM(gain) ((gain) / 100)
-
-#define REGLIB_MW_TO_DBM(gain) (10 * log10(gain))
-#define REGLIB_MW_TO_MBM(gain) (REGLIB_DBM_TO_MBM(REGLIB_MW_TO_DBM(gain)))
-
-/**
- * struct reglib_regdb_ctx - reglib regdb context
- *
- * This can be used to interat with reglib without
- * having to open() / close() / mmap() / munmap()
- * and check the regdb binary file for integrity and
- * authorship.
- *
- * @fd: file descriptor of the db
- * @stat: @fd fstat()
- * @db: mmap() of the db of @real_dblen
- * @real_dblen: file size in bytes of @fd
- * @siglen: size in bytes of the signature at the end of the file
- * @dblen: database lenghth, this is the @real_dblen - @siglen
- * @verified: whether or not this regdb has been RSA verified.
- * 	This value is dependent on whether or not you enabled
- * 	signature verification with gcrypt, openssl, or none
- * 	at all. If no signature verification was not compiled
- * 	in then this will always be true otherwise this will
- * 	only be true if the RSA digital signature of the SHA1
- * 	sum of the regulatory database at the end of the
- * 	regulatory database can be verified with the one of
- * 	the trusted public keys.
- */
-struct reglib_regdb_ctx {
-	int fd;
-	struct stat stat;
-	uint8_t *db;
-	uint32_t real_dblen;
-	uint32_t siglen;
-	uint32_t dblen;
-	bool verified;
-
-	struct regdb_file_header *header;
-	uint32_t num_countries;
-	struct regdb_file_reg_country *countries;
-};
-
-static inline int reglib_is_world_regdom(const char *alpha2)
-{
-	if (alpha2[0] == '0' && alpha2[1] == '0')
-		return 1;
-	return 0;
-}
-
-static inline int reglib_isalpha_upper(char letter)
-{
-	if (letter >= 'A' && letter <= 'Z')
-		return 1;
-	return 0;
-}
-
-static inline int reglib_is_alpha2(const char *alpha2)
-{
-	if (reglib_isalpha_upper(alpha2[0]) && reglib_isalpha_upper(alpha2[1]))
-		return 1;
-	return 0;
-}
-
-static inline int reglib_is_valid_regdom(const char *alpha2)
-{
-	if (!reglib_is_alpha2(alpha2) && !reglib_is_world_regdom(alpha2))
-		return 0;
-
-	return 1;
-}
-
-static inline uint32_t reglib_max(uint32_t a, uint32_t b)
-{
-	return (a > b) ? a : b;
-}
-
-static inline uint32_t reglib_min(uint32_t a, uint32_t b)
-{
-	return (a > b) ? b : a;
-}
-
-void *
-reglib_get_file_ptr(uint8_t *db, size_t dblen, size_t structlen, uint32_t ptr);
-int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen);
-
-/**
- * reglib_malloc_regdb_ctx - create a regdb context for usage with reglib
- *
- * @regdb_file: file name
- *
- * Most operations on reglib iterate over the database somehow and prior
- * to iterating over it it must check the signature. Use this context helper
- * to let you query the db within different contexts in your program and
- * just be sure to call reglib_free_regdb_ctx() when done. This helper will
- * open the file passed and mmap() it.
- */
-const struct reglib_regdb_ctx *reglib_malloc_regdb_ctx(const char *regdb_file);
-
-/**
- * reglib_free_regdb_ctx - free a regdb context used with reglib
- *
- * @regdb_ctx: the reglib regdb context created with reglib_malloc_regdb_ctx()
- *
- * This will do all the handy work to close up, munmap, and free the
- * reglib regdb context passed.
- */
-void reglib_free_regdb_ctx(const struct reglib_regdb_ctx *regdb_ctx);
-
-const struct ieee80211_regdomain *
-reglib_get_rd_idx(unsigned int idx, const struct reglib_regdb_ctx *ctx);
-
-#define reglib_for_each_country(__rd, __idx, __ctx)		\
-	for (__rd = reglib_get_rd_idx(__idx, __ctx);		\
-	     __rd != NULL;					\
-	     __rd = reglib_get_rd_idx(++__idx, __ctx))		\
-
-const struct ieee80211_regdomain *
-reglib_get_rd_alpha2(const char *alpha2, const char *file);
-
-/**
- * reglib_is_valid_rd - validate regulatory domain data structure
- *
- * @rd: regulatory domain data structure to validate
- *
- * You can use this to validate regulatory domain data structures
- * for possible inconsistencies.
- */
-int reglib_is_valid_rd(const struct ieee80211_regdomain *rd);
-
-/* reg helpers */
-void reglib_print_regdom(const struct ieee80211_regdomain *rd);
-struct ieee80211_regdomain *
-reglib_intersect_rds(const struct ieee80211_regdomain *rd1,
-		     const struct ieee80211_regdomain *rd2);
-
-/**
- * reglib_intersect_regdb - intersects a regulatory database
- *
- * @regdb_file: the regulatory database to intersect
- *
- * Goes through an entire regulatory database and intersects all regulatory
- * domains. This will skip any regulatory marked with an alpha2 of '00', which
- * is used to indicate a world regulatory domain. If intersection is able
- * to find rules that fit all regulatory domains it return a regulatory
- * domain with such rules otherwise it returns NULL.
- */
-const struct ieee80211_regdomain *
-reglib_intersect_regdb(const struct reglib_regdb_ctx *ctx);
-
-/**
- * @reglib_create_parse_stream - provide a clean new stream for processing
- *
- * @fp: FILE stream, could be stdin, or a stream from an open file.
- *
- * In order to parse a stream we recommend to create a new stream
- * using this helper. A new stream is preferred in order to work
- * with stdin, as otherwise we cannot rewind() and move around
- * the stream. This helper will create new stream using tmpfile()
- * and also remove all comments. It will be closed and the file
- * deleted when the process terminates.
- */
-FILE *reglib_create_parse_stream(FILE *fp);
-
-/**
- * @reglib_parse_country - parse stream to build a regulatory domain
- *
- * @fp: FILE stream, could be stdin, or a stream from an open file.
- *
- * Parse stream and return back a built regulatory domain. Returns
- * NULL if one could not be built.
- */
-struct ieee80211_regdomain *reglib_parse_country(FILE *fp);
-
-/**
- * @reglib_optimize_regdom - optimize a regulatory domain
- *
- * @rd: a regulatory domain to be optimized
- *
- * A regulatory domain may exist without optimal expressions
- * over its rules. This will look for regulatory rules that can
- * be combined together to reduce the size of the regulatory
- * domain and its expression.
- *
- * Regulatory rules will be combined if their max allowed
- * bandwidth, max EIRP, and flags all match.
- */
-struct ieee80211_regdomain *
-reglib_optimize_regdom(struct ieee80211_regdomain *rd);
-
-#define reglib_for_each_country_stream(__fp, __rd)		\
-	for (__rd = reglib_parse_country(__fp);			\
-	     __rd != NULL;					\
-	     __rd = reglib_parse_country(__fp))			\
-
-#endif
diff --git a/openflow/usr/include/resolv.h b/openflow/usr/include/resolv.h
deleted file mode 100644
index 53c3bba..0000000
--- a/openflow/usr/include/resolv.h
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright (c) 1983, 1987, 1989
- *    The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$BINDId: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $
- */
-
-#ifndef _RESOLV_H_
-
-/* These headers are needed for types used in the `struct res_state'
-   declaration.  */
-#include <sys/types.h>
-#include <netinet/in.h>
-
-#ifndef __need_res_state
-# define _RESOLV_H_
-
-# include <sys/param.h>
-# include <sys/cdefs.h>
-# include <stdio.h>
-# include <arpa/nameser.h>
-#endif
-
-#ifndef __res_state_defined
-# define __res_state_defined
-
-typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
-	res_sendhookact;
-
-typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns,
-					   const u_char **__query,
-					   int *__querylen,
-					   u_char *__ans,
-					   int __anssiz,
-					   int *__resplen);
-
-typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns,
-					   const u_char *__query,
-					   int __querylen,
-					   u_char *__ans,
-					   int __anssiz,
-					   int *__resplen);
-
-/*
- * Global defines and variables for resolver stub.
- */
-# define MAXNS			3	/* max # name servers we'll track */
-# define MAXDFLSRCH		3	/* # default domain levels to try */
-# define MAXDNSRCH		6	/* max # domains in search path */
-# define LOCALDOMAINPARTS	2	/* min levels in name that is "local" */
-
-# define RES_TIMEOUT		5	/* min. seconds between retries */
-# define MAXRESOLVSORT		10	/* number of net to sort on */
-# define RES_MAXNDOTS		15	/* should reflect bit field size */
-# define RES_MAXRETRANS		30	/* only for resolv.conf/RES_OPTIONS */
-# define RES_MAXRETRY		5	/* only for resolv.conf/RES_OPTIONS */
-# define RES_DFLRETRY		2	/* Default #/tries. */
-# define RES_MAXTIME		65535	/* Infinity, in milliseconds. */
-
-struct __res_state {
-	int	retrans;		/* retransmition time interval */
-	int	retry;			/* number of times to retransmit */
-	u_long	options;		/* option flags - see below. */
-	int	nscount;		/* number of name servers */
-	struct sockaddr_in
-		nsaddr_list[MAXNS];	/* address of name server */
-# define nsaddr	nsaddr_list[0]		/* for backward compatibility */
-	u_short	id;			/* current message id */
-	/* 2 byte hole here.  */
-	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
-	char	defdname[256];		/* default domain (deprecated) */
-	u_long	pfcode;			/* RES_PRF_ flags - see below. */
-	unsigned ndots:4;		/* threshold for initial abs. query */
-	unsigned nsort:4;		/* number of elements in sort_list[] */
-	unsigned ipv6_unavail:1;	/* connecting to IPv6 server failed */
-	unsigned unused:23;
-	struct {
-		struct in_addr	addr;
-		u_int32_t	mask;
-	} sort_list[MAXRESOLVSORT];
-	/* 4 byte hole here on 64-bit architectures.  */
-	res_send_qhook qhook;		/* query hook */
-	res_send_rhook rhook;		/* response hook */
-	int	res_h_errno;		/* last one set for this context */
-	int	_vcsock;		/* PRIVATE: for res_send VC i/o */
-	u_int	_flags;			/* PRIVATE: see below */
-	/* 4 byte hole here on 64-bit architectures.  */
-	union {
-		char	pad[52];	/* On an i386 this means 512b total. */
-		struct {
-			u_int16_t		nscount;
-			u_int16_t		nsmap[MAXNS];
-			int			nssocks[MAXNS];
-			u_int16_t		nscount6;
-			u_int16_t		nsinit;
-			struct sockaddr_in6	*nsaddrs[MAXNS];
-#ifdef _LIBC
-			unsigned long long int	initstamp
-			  __attribute__((packed));
-#else
-			unsigned int		_initstamp[2];
-#endif
-		} _ext;
-	} _u;
-};
-
-typedef struct __res_state *res_state;
-# undef __need_res_state
-#endif
-
-#ifdef _RESOLV_H_
-/*
- * Revision information.  This is the release date in YYYYMMDD format.
- * It can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
- * compare for equality; rather, use it to determine whether your resolver
- * is new enough to contain a certain feature.
- */
-
-#define	__RES	19991006
-
-/*
- * Resolver configuration file.
- * Normally not present, but may contain the address of the
- * inital name server(s) to query and the domain search list.
- */
-
-#ifndef _PATH_RESCONF
-#define _PATH_RESCONF        "/etc/resolv.conf"
-#endif
-
-struct res_sym {
-	int	number;		/* Identifying number, like T_MX */
-	char *	name;		/* Its symbolic name, like "MX" */
-	char *	humanname;	/* Its fun name, like "mail exchanger" */
-};
-
-/*
- * Resolver flags (used to be discrete per-module statics ints).
- */
-#define	RES_F_VC	0x00000001	/* socket is TCP */
-#define	RES_F_CONN	0x00000002	/* socket is connected */
-#define RES_F_EDNS0ERR	0x00000004	/* EDNS0 caused errors */
-
-/* res_findzonecut() options */
-#define	RES_EXHAUSTIVE	0x00000001	/* always do all queries */
-
-/*
- * Resolver options (keep these in synch with res_debug.c, please)
- */
-#define RES_INIT	0x00000001	/* address initialized */
-#define RES_DEBUG	0x00000002	/* print debug messages */
-#define RES_AAONLY	0x00000004	/* authoritative answers only (!IMPL)*/
-#define RES_USEVC	0x00000008	/* use virtual circuit */
-#define RES_PRIMARY	0x00000010	/* query primary server only (!IMPL) */
-#define RES_IGNTC	0x00000020	/* ignore trucation errors */
-#define RES_RECURSE	0x00000040	/* recursion desired */
-#define RES_DEFNAMES	0x00000080	/* use default domain name */
-#define RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
-#define RES_DNSRCH	0x00000200	/* search up local domain tree */
-#define	RES_INSECURE1	0x00000400	/* type 1 security disabled */
-#define	RES_INSECURE2	0x00000800	/* type 2 security disabled */
-#define	RES_NOALIASES	0x00001000	/* shuts off HOSTALIASES feature */
-#define	RES_USE_INET6	0x00002000	/* use/map IPv6 in gethostbyname() */
-#define RES_ROTATE	0x00004000	/* rotate ns list after each query */
-#define	RES_NOCHECKNAME	0x00008000	/* do not check names for sanity (!IMPL) */
-#define	RES_KEEPTSIG	0x00010000	/* do not strip TSIG records */
-#define	RES_BLAST	0x00020000	/* blast all recursive servers */
-#define RES_USEBSTRING	0x00040000	/* IPv6 reverse lookup with byte
-					   strings */
-#define RES_NOIP6DOTINT	0x00080000	/* Do not use .ip6.int in IPv6
-					   reverse lookup */
-#define RES_USE_EDNS0	0x00100000	/* Use EDNS0.  */
-#define RES_SNGLKUP	0x00200000	/* one outstanding request at a time */
-#define RES_SNGLKUPREOP	0x00400000	/* -"-, but open new socket for each
-					   request */
-#define RES_USE_DNSSEC	0x00800000	/* use DNSSEC using OK bit in OPT */
-#define RES_NOTLDQUERY	0x01000000	/* Do not look up unqualified name
-					   as a TLD.  */
-
-#define RES_DEFAULT	(RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)
-
-/*
- * Resolver "pfcode" values.  Used by dig.
- */
-#define RES_PRF_STATS	0x00000001
-#define RES_PRF_UPDATE	0x00000002
-#define RES_PRF_CLASS   0x00000004
-#define RES_PRF_CMD	0x00000008
-#define RES_PRF_QUES	0x00000010
-#define RES_PRF_ANS	0x00000020
-#define RES_PRF_AUTH	0x00000040
-#define RES_PRF_ADD	0x00000080
-#define RES_PRF_HEAD1	0x00000100
-#define RES_PRF_HEAD2	0x00000200
-#define RES_PRF_TTLID	0x00000400
-#define RES_PRF_HEADX	0x00000800
-#define RES_PRF_QUERY	0x00001000
-#define RES_PRF_REPLY	0x00002000
-#define RES_PRF_INIT	0x00004000
-/*			0x00008000	*/
-
-/* Things involving an internal (static) resolver context. */
-__BEGIN_DECLS
-extern struct __res_state *__res_state(void) __attribute__ ((__const__));
-__END_DECLS
-#define _res (*__res_state())
-
-#ifndef __BIND_NOSTATIC
-#define fp_nquery		__fp_nquery
-#define fp_query		__fp_query
-#define hostalias		__hostalias
-#define p_query			__p_query
-#define res_close		__res_close
-#define res_init		__res_init
-#define res_isourserver		__res_isourserver
-#define res_mkquery		__res_mkquery
-#define res_query		__res_query
-#define res_querydomain		__res_querydomain
-#define res_search		__res_search
-#define res_send		__res_send
-
-__BEGIN_DECLS
-void		fp_nquery (const u_char *, int, FILE *) __THROW;
-void		fp_query (const u_char *, FILE *) __THROW;
-const char *	hostalias (const char *) __THROW;
-void		p_query (const u_char *) __THROW;
-void		res_close (void) __THROW;
-int		res_init (void) __THROW;
-int		res_isourserver (const struct sockaddr_in *) __THROW;
-int		res_mkquery (int, const char *, int, int, const u_char *,
-			     int, const u_char *, u_char *, int) __THROW;
-int		res_query (const char *, int, int, u_char *, int) __THROW;
-int		res_querydomain (const char *, const char *, int, int,
-				 u_char *, int) __THROW;
-int		res_search (const char *, int, int, u_char *, int) __THROW;
-int		res_send (const u_char *, int, u_char *, int) __THROW;
-__END_DECLS
-#endif
-
-#define b64_ntop		__b64_ntop
-#define b64_pton		__b64_pton
-#define dn_comp			__dn_comp
-#define dn_count_labels		__dn_count_labels
-#define dn_expand		__dn_expand
-#define dn_skipname		__dn_skipname
-#define fp_resstat		__fp_resstat
-#define loc_aton		__loc_aton
-#define loc_ntoa		__loc_ntoa
-#define p_cdname		__p_cdname
-#define p_cdnname		__p_cdnname
-#define p_class			__p_class
-#define p_fqname		__p_fqname
-#define p_fqnname		__p_fqnname
-#define p_option		__p_option
-#define p_secstodate		__p_secstodate
-#define p_section		__p_section
-#define p_time			__p_time
-#define p_type			__p_type
-#define p_rcode			__p_rcode
-#define putlong			__putlong
-#define putshort		__putshort
-#define res_dnok		__res_dnok
-#define res_hnok		__res_hnok
-#define res_hostalias		__res_hostalias
-#define res_mailok		__res_mailok
-#define res_nameinquery		__res_nameinquery
-#define res_nclose		__res_nclose
-#define res_ninit		__res_ninit
-#define res_nmkquery		__res_nmkquery
-#define res_npquery		__res_npquery
-#define res_nquery		__res_nquery
-#define res_nquerydomain	__res_nquerydomain
-#define res_nsearch		__res_nsearch
-#define res_nsend		__res_nsend
-#define res_nisourserver	__res_nisourserver
-#define res_ownok		__res_ownok
-#define res_queriesmatch	__res_queriesmatch
-#define res_randomid		__res_randomid
-#define sym_ntop		__sym_ntop
-#define sym_ntos		__sym_ntos
-#define sym_ston		__sym_ston
-__BEGIN_DECLS
-int		res_hnok (const char *) __THROW;
-int		res_ownok (const char *) __THROW;
-int		res_mailok (const char *) __THROW;
-int		res_dnok (const char *) __THROW;
-int		sym_ston (const struct res_sym *, const char *, int *) __THROW;
-const char *	sym_ntos (const struct res_sym *, int, int *) __THROW;
-const char *	sym_ntop (const struct res_sym *, int, int *) __THROW;
-int		b64_ntop (u_char const *, size_t, char *, size_t) __THROW;
-int		b64_pton (char const *, u_char *, size_t) __THROW;
-int		loc_aton (const char *__ascii, u_char *__binary) __THROW;
-const char *	loc_ntoa (const u_char *__binary, char *__ascii) __THROW;
-int		dn_skipname (const u_char *, const u_char *) __THROW;
-void		putlong (u_int32_t, u_char *) __THROW;
-void		putshort (u_int16_t, u_char *) __THROW;
-const char *	p_class (int) __THROW;
-const char *	p_time (u_int32_t) __THROW;
-const char *	p_type (int) __THROW;
-const char *	p_rcode (int) __THROW;
-const u_char *	p_cdnname (const u_char *, const u_char *, int, FILE *)
-     __THROW;
-const u_char *	p_cdname (const u_char *, const u_char *, FILE *) __THROW;
-const u_char *	p_fqnname (const u_char *__cp, const u_char *__msg,
-			   int, char *, int) __THROW;
-const u_char *	p_fqname (const u_char *, const u_char *, FILE *) __THROW;
-const char *	p_option (u_long __option) __THROW;
-char *		p_secstodate (u_long) __THROW;
-int		dn_count_labels (const char *) __THROW;
-int		dn_comp (const char *, u_char *, int, u_char **, u_char **)
-     __THROW;
-int		dn_expand (const u_char *, const u_char *, const u_char *,
-			   char *, int) __THROW;
-u_int		res_randomid (void) __THROW;
-int		res_nameinquery (const char *, int, int,
-				 const u_char *, const u_char *) __THROW;
-int		res_queriesmatch (const u_char *, const u_char *,
-				  const u_char *, const u_char *) __THROW;
-const char *	p_section (int __section, int __opcode) __THROW;
-/* Things involving a resolver context. */
-int		res_ninit (res_state) __THROW;
-int		res_nisourserver (const res_state,
-				  const struct sockaddr_in *) __THROW;
-void		fp_resstat (const res_state, FILE *) __THROW;
-void		res_npquery (const res_state, const u_char *, int, FILE *)
-     __THROW;
-const char *	res_hostalias (const res_state, const char *, char *, size_t)
-     __THROW;
-int		res_nquery (res_state, const char *, int, int, u_char *, int)
-     __THROW;
-int		res_nsearch (res_state, const char *, int, int, u_char *, int)
-     __THROW;
-int		res_nquerydomain (res_state, const char *, const char *, int,
-				  int, u_char *, int) __THROW;
-int		res_nmkquery (res_state, int, const char *, int, int,
-			      const u_char *, int, const u_char *, u_char *,
-			      int) __THROW;
-int		res_nsend (res_state, const u_char *, int, u_char *, int)
-     __THROW;
-void		res_nclose (res_state) __THROW;
-__END_DECLS
-#endif
-
-#endif /* !_RESOLV_H_ */
diff --git a/openflow/usr/include/rpc/auth.h b/openflow/usr/include/rpc/auth.h
deleted file mode 100644
index b25dcfc..0000000
--- a/openflow/usr/include/rpc/auth.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * auth.h, Authentication interface.
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The data structures are completely opaque to the client.  The client
- * is required to pass a AUTH * to routines that create rpc
- * "sessions".
- */
-
-#ifndef _RPC_AUTH_H
-
-#define _RPC_AUTH_H	1
-#include <features.h>
-#include <rpc/xdr.h>
-
-__BEGIN_DECLS
-
-#define MAX_AUTH_BYTES	400
-#define MAXNETNAMELEN	255	/* maximum length of network user's name */
-
-/*
- * Status returned from authentication check
- */
-enum auth_stat {
-	AUTH_OK=0,
-	/*
-	 * failed at remote end
-	 */
-	AUTH_BADCRED=1,			/* bogus credentials (seal broken) */
-	AUTH_REJECTEDCRED=2,		/* client should begin new session */
-	AUTH_BADVERF=3,			/* bogus verifier (seal broken) */
-	AUTH_REJECTEDVERF=4,		/* verifier expired or was replayed */
-	AUTH_TOOWEAK=5,			/* rejected due to security reasons */
-	/*
-	 * failed locally
-	*/
-	AUTH_INVALIDRESP=6,		/* bogus response verifier */
-	AUTH_FAILED=7			/* some unknown reason */
-};
-
-union des_block {
-	struct {
-		u_int32_t high;
-		u_int32_t low;
-	} key;
-	char c[8];
-};
-typedef union des_block des_block;
-extern bool_t xdr_des_block (XDR *__xdrs, des_block *__blkp) __THROW;
-
-/*
- * Authentication info.  Opaque to client.
- */
-struct opaque_auth {
-	enum_t	oa_flavor;		/* flavor of auth */
-	caddr_t	oa_base;		/* address of more auth stuff */
-	u_int	oa_length;		/* not to exceed MAX_AUTH_BYTES */
-};
-
-/*
- * Auth handle, interface to client side authenticators.
- */
-typedef struct AUTH AUTH;
-struct AUTH {
-  struct opaque_auth ah_cred;
-  struct opaque_auth ah_verf;
-  union des_block ah_key;
-  struct auth_ops {
-    void (*ah_nextverf) (AUTH *);
-    int  (*ah_marshal) (AUTH *, XDR *);		/* nextverf & serialize */
-    int  (*ah_validate) (AUTH *, struct opaque_auth *);
-						/* validate verifier */
-    int  (*ah_refresh) (AUTH *);		/* refresh credentials */
-    void (*ah_destroy) (AUTH *); 	    	/* destroy this structure */
-  } *ah_ops;
-  caddr_t ah_private;
-};
-
-
-/*
- * Authentication ops.
- * The ops and the auth handle provide the interface to the authenticators.
- *
- * AUTH	*auth;
- * XDR	*xdrs;
- * struct opaque_auth verf;
- */
-#define AUTH_NEXTVERF(auth)		\
-		((*((auth)->ah_ops->ah_nextverf))(auth))
-#define auth_nextverf(auth)		\
-		((*((auth)->ah_ops->ah_nextverf))(auth))
-
-#define AUTH_MARSHALL(auth, xdrs)	\
-		((*((auth)->ah_ops->ah_marshal))(auth, xdrs))
-#define auth_marshall(auth, xdrs)	\
-		((*((auth)->ah_ops->ah_marshal))(auth, xdrs))
-
-#define AUTH_VALIDATE(auth, verfp)	\
-		((*((auth)->ah_ops->ah_validate))((auth), verfp))
-#define auth_validate(auth, verfp)	\
-		((*((auth)->ah_ops->ah_validate))((auth), verfp))
-
-#define AUTH_REFRESH(auth)		\
-		((*((auth)->ah_ops->ah_refresh))(auth))
-#define auth_refresh(auth)		\
-		((*((auth)->ah_ops->ah_refresh))(auth))
-
-#define AUTH_DESTROY(auth)		\
-		((*((auth)->ah_ops->ah_destroy))(auth))
-#define auth_destroy(auth)		\
-		((*((auth)->ah_ops->ah_destroy))(auth))
-
-
-extern struct opaque_auth _null_auth;
-
-
-/*
- * These are the various implementations of client side authenticators.
- */
-
-/*
- * Unix style authentication
- * AUTH *authunix_create(machname, uid, gid, len, aup_gids)
- *	char *machname;
- *	int uid;
- *	int gid;
- *	int len;
- *	int *aup_gids;
- */
-extern AUTH *authunix_create (char *__machname, __uid_t __uid, __gid_t __gid,
-			      int __len, __gid_t *__aup_gids);
-extern AUTH *authunix_create_default (void);
-extern AUTH *authnone_create (void) __THROW;
-extern AUTH *authdes_create (const char *__servername, u_int __window,
-			     struct sockaddr *__syncaddr, des_block *__ckey)
-     __THROW;
-extern AUTH *authdes_pk_create (const char *, netobj *, u_int,
-				struct sockaddr *, des_block *) __THROW;
-
-
-#define AUTH_NONE	0		/* no authentication */
-#define	AUTH_NULL	0		/* backward compatibility */
-#define	AUTH_SYS	1		/* unix style (uid, gids) */
-#define	AUTH_UNIX	AUTH_SYS
-#define	AUTH_SHORT	2		/* short hand unix style */
-#define AUTH_DES	3		/* des style (encrypted timestamps) */
-#define AUTH_DH		AUTH_DES	/* Diffie-Hellman (this is DES) */
-#define AUTH_KERB       4               /* kerberos style */
-
-/*
- *  Netname manipulating functions
- *
- */
-extern int getnetname (char *) __THROW;
-extern int host2netname (char *, const char *, const char *) __THROW;
-extern int user2netname (char *, const uid_t, const char *) __THROW;
-extern int netname2user (const char *, uid_t *, gid_t *, int *, gid_t *)
-     __THROW;
-extern int netname2host (const char *, char *, const int) __THROW;
-
-/*
- *
- * These routines interface to the keyserv daemon
- *
- */
-extern int key_decryptsession (char *, des_block *);
-extern int key_decryptsession_pk (char *, netobj *, des_block *);
-extern int key_encryptsession (char *, des_block *);
-extern int key_encryptsession_pk (char *, netobj *, des_block *);
-extern int key_gendes (des_block *);
-extern int key_setsecret (char *);
-extern int key_secretkey_is_set (void);
-extern int key_get_conv (char *, des_block *);
-
-/*
- * XDR an opaque authentication struct.
- */
-extern bool_t xdr_opaque_auth (XDR *, struct opaque_auth *) __THROW;
-
-__END_DECLS
-
-#endif /* rpc/auth.h */
diff --git a/openflow/usr/include/rpc/auth_des.h b/openflow/usr/include/rpc/auth_des.h
deleted file mode 100644
index 2c9f2f4..0000000
--- a/openflow/usr/include/rpc/auth_des.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _RPC_AUTH_DES_H
-#define _RPC_AUTH_DES_H	1
-
-#include <sys/cdefs.h>
-#include <rpc/auth.h>
-
-__BEGIN_DECLS
-
-/* There are two kinds of "names": fullnames and nicknames */
-enum authdes_namekind
-  {
-    ADN_FULLNAME,
-    ADN_NICKNAME
-  };
-
-/* A fullname contains the network name of the client,
-   a conversation key and the window */
-struct authdes_fullname
-  {
-    char *name;		/* network name of client, up to MAXNETNAMELEN */
-    des_block key;	/* conversation key */
-    uint32_t window;	/* associated window */
-  };
-
-/* A credential */
-struct authdes_cred
-  {
-    enum authdes_namekind adc_namekind;
-    struct authdes_fullname adc_fullname;
-    uint32_t adc_nickname;
-  };
-
-/* A timeval replacement for !32bit platforms */
-struct rpc_timeval
-  {
-    uint32_t tv_sec;            /* Seconds.  */
-    uint32_t tv_usec;           /* Microseconds.  */
-  };
-
-/* A des authentication verifier */
-struct authdes_verf
-  {
-    union
-      {
-	struct rpc_timeval adv_ctime;	/* clear time */
-	des_block adv_xtime;		/* crypt time */
-      }
-    adv_time_u;
-    uint32_t adv_int_u;
-  };
-
-/* des authentication verifier: client variety
-
-   adv_timestamp is the current time.
-   adv_winverf is the credential window + 1.
-   Both are encrypted using the conversation key. */
-#define adv_timestamp  adv_time_u.adv_ctime
-#define adv_xtimestamp adv_time_u.adv_xtime
-#define adv_winverf    adv_int_u
-
-/* des authentication verifier: server variety
-
-   adv_timeverf is the client's timestamp + client's window
-   adv_nickname is the server's nickname for the client.
-   adv_timeverf is encrypted using the conversation key. */
-#define adv_timeverf   adv_time_u.adv_ctime
-#define adv_xtimeverf  adv_time_u.adv_xtime
-#define adv_nickname   adv_int_u
-
-/* Map a des credential into a unix cred. */
-extern int authdes_getucred (const struct authdes_cred * __adc,
-			     uid_t * __uid, gid_t * __gid,
-			     short *__grouplen, gid_t * __groups) __THROW;
-
-/* Get the public key for NAME and place it in KEY.  NAME can only be
-   up to MAXNETNAMELEN bytes long and the destination buffer KEY should
-   have HEXKEYBYTES + 1 bytes long to fit all characters from the key.  */
-extern int getpublickey (const char *__name, char *__key) __THROW;
-
-/* Get the secret key for NAME and place it in KEY.  PASSWD is used to
-   decrypt the encrypted key stored in the database.  NAME can only be
-   up to MAXNETNAMELEN bytes long and the destination buffer KEY
-   should have HEXKEYBYTES + 1 bytes long to fit all characters from
-   the key.  */
-extern int getsecretkey (const char *__name, char *__key,
-			 const char *__passwd) __THROW;
-
-extern int rtime (struct sockaddr_in *__addrp, struct rpc_timeval *__timep,
-		  struct rpc_timeval *__timeout) __THROW;
-
-__END_DECLS
-
-
-#endif /* rpc/auth_des.h */
diff --git a/openflow/usr/include/rpc/auth_unix.h b/openflow/usr/include/rpc/auth_unix.h
deleted file mode 100644
index 2f4ee1d..0000000
--- a/openflow/usr/include/rpc/auth_unix.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * auth_unix.h, Protocol for UNIX style authentication parameters for RPC
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * The system is very weak.  The client uses no encryption for  it
- * credentials and only sends null verifiers.  The server sends backs
- * null verifiers or optionally a verifier that suggests a new short hand
- * for the credentials.
- */
-
-#ifndef _RPC_AUTH_UNIX_H
-#define _RPC_AUTH_UNIX_H	1
-
-#include <features.h>
-#include <sys/types.h>
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <rpc/xdr.h>
-
-__BEGIN_DECLS
-
-/* The machine name is part of a credential; it may not exceed 255 bytes */
-#define MAX_MACHINE_NAME 255
-
-/* gids compose part of a credential; there may not be more than 16 of them */
-#define NGRPS 16
-
-/*
- * Unix style credentials.
- */
-struct authunix_parms
-  {
-    u_long aup_time;
-    char *aup_machname;
-    __uid_t aup_uid;
-    __gid_t aup_gid;
-    u_int aup_len;
-    __gid_t *aup_gids;
-  };
-
-extern bool_t xdr_authunix_parms (XDR *__xdrs, struct authunix_parms *__p)
-     __THROW;
-
-/*
- * If a response verifier has flavor AUTH_SHORT,
- * then the body of the response verifier encapsulates the following structure;
- * again it is serialized in the obvious fashion.
- */
-struct short_hand_verf
-  {
-    struct opaque_auth new_cred;
-  };
-
-__END_DECLS
-
-#endif /* rpc/auth_unix.h */
diff --git a/openflow/usr/include/rpc/clnt.h b/openflow/usr/include/rpc/clnt.h
deleted file mode 100644
index f4d4a94..0000000
--- a/openflow/usr/include/rpc/clnt.h
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * clnt.h - Client side remote procedure call interface.
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RPC_CLNT_H
-#define _RPC_CLNT_H	1
-
-#include <features.h>
-#include <sys/types.h>
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <sys/un.h>
-
-__BEGIN_DECLS
-
-/*
- * Rpc calls return an enum clnt_stat.  This should be looked at more,
- * since each implementation is required to live with this (implementation
- * independent) list of errors.
- */
-enum clnt_stat {
-	RPC_SUCCESS=0,			/* call succeeded */
-	/*
-	 * local errors
-	 */
-	RPC_CANTENCODEARGS=1,		/* can't encode arguments */
-	RPC_CANTDECODERES=2,		/* can't decode results */
-	RPC_CANTSEND=3,			/* failure in sending call */
-	RPC_CANTRECV=4,			/* failure in receiving result */
-	RPC_TIMEDOUT=5,			/* call timed out */
-	/*
-	 * remote errors
-	 */
-	RPC_VERSMISMATCH=6,		/* rpc versions not compatible */
-	RPC_AUTHERROR=7,		/* authentication error */
-	RPC_PROGUNAVAIL=8,		/* program not available */
-	RPC_PROGVERSMISMATCH=9,		/* program version mismatched */
-	RPC_PROCUNAVAIL=10,		/* procedure unavailable */
-	RPC_CANTDECODEARGS=11,		/* decode arguments error */
-	RPC_SYSTEMERROR=12,		/* generic "other problem" */
-	RPC_NOBROADCAST = 21,		/* Broadcasting not supported */
-	/*
-	 * callrpc & clnt_create errors
-	 */
-	RPC_UNKNOWNHOST=13,		/* unknown host name */
-	RPC_UNKNOWNPROTO=17,		/* unknown protocol */
-	RPC_UNKNOWNADDR = 19,		/* Remote address unknown */
-
-	/*
-	 * rpcbind errors
-	 */
-	RPC_RPCBFAILURE=14,		/* portmapper failed in its call */
-#define RPC_PMAPFAILURE RPC_RPCBFAILURE
-	RPC_PROGNOTREGISTERED=15,	/* remote program is not registered */
-	RPC_N2AXLATEFAILURE = 22,	/* Name to addr translation failed */
-	/*
-	 * unspecified error
-	 */
-	RPC_FAILED=16,
-	RPC_INTR=18,
-	RPC_TLIERROR=20,
-	RPC_UDERROR=23,
-	/*
-	 * asynchronous errors
-	 */
-	RPC_INPROGRESS = 24,
-	RPC_STALERACHANDLE = 25
-};
-
-
-/*
- * Error info.
- */
-struct rpc_err {
-  enum clnt_stat re_status;
-  union {
-    int RE_errno;		/* related system error */
-    enum auth_stat RE_why;	/* why the auth error occurred */
-    struct {
-      u_long low;		/* lowest verion supported */
-      u_long high;		/* highest verion supported */
-    } RE_vers;
-    struct {			/* maybe meaningful if RPC_FAILED */
-      long s1;
-      long s2;
-    } RE_lb;			/* life boot & debugging only */
-  } ru;
-#define	re_errno	ru.RE_errno
-#define	re_why		ru.RE_why
-#define	re_vers		ru.RE_vers
-#define	re_lb		ru.RE_lb
-};
-
-
-/*
- * Client rpc handle.
- * Created by individual implementations, see e.g. rpc_udp.c.
- * Client is responsible for initializing auth, see e.g. auth_none.c.
- */
-typedef struct CLIENT CLIENT;
-struct CLIENT {
-  AUTH	*cl_auth;		 /* authenticator */
-  struct clnt_ops {
-    enum clnt_stat (*cl_call) (CLIENT *, u_long, xdrproc_t, caddr_t, xdrproc_t,
-			       caddr_t, struct timeval);
-				/* call remote procedure */
-    void (*cl_abort) (void);	/* abort a call */
-    void (*cl_geterr) (CLIENT *, struct rpc_err *);
-				/* get specific error code */
-    bool_t (*cl_freeres) (CLIENT *, xdrproc_t, caddr_t);
-				/* frees results */
-    void (*cl_destroy) (CLIENT *); /* destroy this structure */
-    bool_t (*cl_control) (CLIENT *, int, char *);
-				/* the ioctl() of rpc */
-  } *cl_ops;
-  caddr_t cl_private;		/* private stuff */
-};
-
-
-/*
- * client side rpc interface ops
- *
- * Parameter types are:
- *
- */
-
-/*
- * enum clnt_stat
- * CLNT_CALL(rh, proc, xargs, argsp, xres, resp, timeout)
- * 	CLIENT *rh;
- *	u_long proc;
- *	xdrproc_t xargs;
- *	caddr_t argsp;
- *	xdrproc_t xres;
- *	caddr_t resp;
- *	struct timeval timeout;
- */
-#define	CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs)	\
-	((*(rh)->cl_ops->cl_call)(rh, proc, xargs, argsp, xres, resp, secs))
-#define	clnt_call(rh, proc, xargs, argsp, xres, resp, secs)	\
-	((*(rh)->cl_ops->cl_call)(rh, proc, xargs, argsp, xres, resp, secs))
-
-/*
- * void
- * CLNT_ABORT(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_ABORT(rh)	((*(rh)->cl_ops->cl_abort)(rh))
-#define	clnt_abort(rh)	((*(rh)->cl_ops->cl_abort)(rh))
-
-/*
- * struct rpc_err
- * CLNT_GETERR(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_GETERR(rh,errp)	((*(rh)->cl_ops->cl_geterr)(rh, errp))
-#define	clnt_geterr(rh,errp)	((*(rh)->cl_ops->cl_geterr)(rh, errp))
-
-
-/*
- * bool_t
- * CLNT_FREERES(rh, xres, resp);
- * 	CLIENT *rh;
- *	xdrproc_t xres;
- *	caddr_t resp;
- */
-#define	CLNT_FREERES(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
-#define	clnt_freeres(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
-
-/*
- * bool_t
- * CLNT_CONTROL(cl, request, info)
- *      CLIENT *cl;
- *      u_int request;
- *      char *info;
- */
-#define	CLNT_CONTROL(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
-#define	clnt_control(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
-
-/*
- * control operations that apply to all transports
- *
- * Note: options marked XXX are no-ops in this implementation of RPC.
- * The are present in TI-RPC but can't be implemented here since they
- * depend on the presence of STREAMS/TLI, which we don't have.
- */
-#define CLSET_TIMEOUT        1    /* set timeout (timeval) */
-#define CLGET_TIMEOUT        2    /* get timeout (timeval) */
-#define CLGET_SERVER_ADDR    3    /* get server's address (sockaddr) */
-#define CLGET_FD             6    /* get connections file descriptor */
-#define CLGET_SVC_ADDR       7    /* get server's address (netbuf)      XXX */
-#define CLSET_FD_CLOSE       8    /* close fd while clnt_destroy */
-#define CLSET_FD_NCLOSE      9    /* Do not close fd while clnt_destroy*/
-#define CLGET_XID            10   /* Get xid */
-#define CLSET_XID            11   /* Set xid */
-#define CLGET_VERS           12   /* Get version number */
-#define CLSET_VERS           13   /* Set version number */
-#define CLGET_PROG           14   /* Get program number */
-#define CLSET_PROG           15   /* Set program number */
-#define CLSET_SVC_ADDR       16   /* get server's address (netbuf)      XXX */
-#define CLSET_PUSH_TIMOD     17   /* push timod if not already present  XXX */
-#define CLSET_POP_TIMOD      18   /* pop timod                          XXX */
-/*
- * Connectionless only control operations
- */
-#define CLSET_RETRY_TIMEOUT	4	/* set retry timeout (timeval) */
-#define CLGET_RETRY_TIMEOUT	5	/* get retry timeout (timeval) */
-
-/*
- * void
- * CLNT_DESTROY(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_DESTROY(rh)	((*(rh)->cl_ops->cl_destroy)(rh))
-#define	clnt_destroy(rh)	((*(rh)->cl_ops->cl_destroy)(rh))
-
-
-/*
- * RPCTEST is a test program which is accessible on every rpc
- * transport/port.  It is used for testing, performance evaluation,
- * and network administration.
- */
-
-#define RPCTEST_PROGRAM		((u_long)1)
-#define RPCTEST_VERSION		((u_long)1)
-#define RPCTEST_NULL_PROC	((u_long)2)
-#define RPCTEST_NULL_BATCH_PROC	((u_long)3)
-
-/*
- * By convention, procedure 0 takes null arguments and returns them
- */
-
-#define NULLPROC ((u_long)0)
-
-/*
- * Below are the client handle creation routines for the various
- * implementations of client side rpc.  They can return NULL if a
- * creation failure occurs.
- */
-
-/*
- * Memory based rpc (for speed check and testing)
- * CLIENT *
- * clntraw_create(prog, vers)
- *	u_long prog;
- *	u_long vers;
- */
-extern CLIENT *clntraw_create (const u_long __prog, const u_long __vers)
-     __THROW;
-
-
-/*
- * Generic client creation routine. Supported protocols are "udp", "tcp" and
- * "unix"
- * CLIENT *
- * clnt_create(host, prog, vers, prot)
- *	char *host; 	-- hostname
- *	u_long prog;	-- program number
- *	u_ong vers;	-- version number
- *	char *prot;	-- protocol
- */
-extern CLIENT *clnt_create (const char *__host, const u_long __prog,
-			    const u_long __vers, const char *__prot)
-     __THROW;
-
-
-/*
- * TCP based rpc
- * CLIENT *
- * clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
- *	struct sockaddr_in *raddr;
- *	u_long prog;
- *	u_long version;
- *	register int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
- */
-extern CLIENT *clnttcp_create (struct sockaddr_in *__raddr, u_long __prog,
-			       u_long __version, int *__sockp, u_int __sendsz,
-			       u_int __recvsz) __THROW;
-
-/*
- * UDP based rpc.
- * CLIENT *
- * clntudp_create(raddr, program, version, wait, sockp)
- *	struct sockaddr_in *raddr;
- *	u_long program;
- *	u_long version;
- *	struct timeval wait_resend;
- *	int *sockp;
- *
- * Same as above, but you specify max packet sizes.
- * CLIENT *
- * clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
- *	struct sockaddr_in *raddr;
- *	u_long program;
- *	u_long version;
- *	struct timeval wait_resend;
- *	int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
- */
-extern CLIENT *clntudp_create (struct sockaddr_in *__raddr, u_long __program,
-			       u_long __version, struct timeval __wait_resend,
-			       int *__sockp) __THROW;
-extern CLIENT *clntudp_bufcreate (struct sockaddr_in *__raddr,
-				  u_long __program, u_long __version,
-				  struct timeval __wait_resend, int *__sockp,
-				  u_int __sendsz, u_int __recvsz) __THROW;
-
-
-
-
-/*
- * AF_UNIX based rpc
- * CLIENT *
- * clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz)
- *      struct sockaddr_un *raddr;
- *      u_long prog;
- *      u_long version;
- *      register int *sockp;
- *      u_int sendsz;
- *      u_int recvsz;
- */
-extern CLIENT *clntunix_create  (struct sockaddr_un *__raddr, u_long __program,
-				 u_long __version, int *__sockp,
-				 u_int __sendsz, u_int __recvsz) __THROW;
-
-
-extern int callrpc (const char *__host, const u_long __prognum,
-		    const u_long __versnum, const u_long __procnum,
-		    const xdrproc_t __inproc, const char *__in,
-		    const xdrproc_t __outproc, char *__out) __THROW;
-extern int _rpc_dtablesize (void) __THROW;
-
-/*
- * Print why creation failed
- */
-extern void clnt_pcreateerror (const char *__msg);	/* stderr */
-extern char *clnt_spcreateerror(const char *__msg) __THROW;	/* string */
-
-/*
- * Like clnt_perror(), but is more verbose in its output
- */
-extern void clnt_perrno (enum clnt_stat __num);		/* stderr */
-
-/*
- * Print an English error message, given the client error code
- */
-extern void clnt_perror (CLIENT *__clnt, const char *__msg);
-							/* stderr */
-extern char *clnt_sperror (CLIENT *__clnt, const char *__msg) __THROW;
-							/* string */
-
-/*
- * If a creation fails, the following allows the user to figure out why.
- */
-struct rpc_createerr {
-	enum clnt_stat cf_stat;
-	struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */
-};
-
-extern struct rpc_createerr rpc_createerr;
-
-
-
-/*
- * Copy error message to buffer.
- */
-extern char *clnt_sperrno (enum clnt_stat __num) __THROW;	/* string */
-
-/*
- * get the port number on the host for the rpc program,version and proto
- */
-extern int getrpcport (const char * __host, u_long __prognum,
-		       u_long __versnum, u_int __proto) __THROW;
-
-/*
- * get the local host's IP address without consulting
- * name service library functions
- */
-extern void get_myaddress (struct sockaddr_in *) __THROW;
-
-#define UDPMSGSIZE	8800	/* rpc imposed limit on udp msg size */
-#define RPCSMALLMSGSIZE	400	/* a more reasonable packet size */
-
-__END_DECLS
-
-#endif /* rpc/clnt.h */
diff --git a/openflow/usr/include/rpc/des_crypt.h b/openflow/usr/include/rpc/des_crypt.h
deleted file mode 100644
index 77cca3c..0000000
--- a/openflow/usr/include/rpc/des_crypt.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * @(#)des_crypt.h	2.1 88/08/11 4.0 RPCSRC
- *
- * des_crypt.h, des library routine interface
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __DES_CRYPT_H__
-#define __DES_CRYPT_H__ 1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#define DES_MAXDATA 8192	/* max bytes encrypted in one call */
-#define DES_DIRMASK (1 << 0)
-#define DES_ENCRYPT (0*DES_DIRMASK)	/* Encrypt */
-#define DES_DECRYPT (1*DES_DIRMASK)	/* Decrypt */
-
-
-#define DES_DEVMASK (1 << 1)
-#define	DES_HW (0*DES_DEVMASK)	/* Use hardware device */
-#define DES_SW (1*DES_DEVMASK)	/* Use software device */
-
-
-#define DESERR_NONE 0	/* succeeded */
-#define DESERR_NOHWDEVICE 1	/* succeeded, but hw device not available */
-#define DESERR_HWERROR 2	/* failed, hardware/driver error */
-#define DESERR_BADPARAM 3	/* failed, bad parameter to call */
-
-#define DES_FAILED(err) \
-	((err) > DESERR_NOHWDEVICE)
-
-/*
- * cbc_crypt()
- * ecb_crypt()
- *
- * Encrypt (or decrypt) len bytes of a buffer buf.
- * The length must be a multiple of eight.
- * The key should have odd parity in the low bit of each byte.
- * ivec is the input vector, and is updated to the new one (cbc only).
- * The mode is created by oring together the appropriate parameters.
- * DESERR_NOHWDEVICE is returned if DES_HW was specified but
- * there was no hardware to do it on (the data will still be
- * encrypted though, in software).
- */
-
-
-/*
- * Cipher Block Chaining mode
- */
-extern int cbc_crypt (char *__key, char *__buf, unsigned __len,
-		      unsigned __mode, char *__ivec) __THROW;
-
-/*
- * Electronic Code Book mode
- */
-extern int ecb_crypt (char *__key, char *__buf, unsigned __len,
-		      unsigned __mode) __THROW;
-
-/*
- * Set des parity for a key.
- * DES parity is odd and in the low bit of each byte
- */
-extern void des_setparity (char *__key) __THROW;
-
-__END_DECLS
-
-#endif
diff --git a/openflow/usr/include/rpc/key_prot.h b/openflow/usr/include/rpc/key_prot.h
deleted file mode 100644
index 74627e6..0000000
--- a/openflow/usr/include/rpc/key_prot.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _KEY_PROT_H_RPCGEN
-#define _KEY_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-/* Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Compiled from key_prot.x using rpcgen.
- * DO NOT EDIT THIS FILE!
- * This is NOT source code!
- */
-#define PROOT 3
-#define HEXMODULUS "d4a0ba0250b6fd2ec626e7efd637df76c716e22d0944b88b"
-#define HEXKEYBYTES 48
-#define KEYSIZE 192
-#define KEYBYTES 24
-#define KEYCHECKSUMSIZE 16
-
-enum keystatus {
-	KEY_SUCCESS = 0,
-	KEY_NOSECRET = 1,
-	KEY_UNKNOWN = 2,
-	KEY_SYSTEMERR = 3,
-};
-typedef enum keystatus keystatus;
-#ifdef __cplusplus
-extern "C" bool_t xdr_keystatus(XDR *, keystatus*);
-#elif __STDC__
-extern  bool_t xdr_keystatus(XDR *, keystatus*);
-#else /* Old Style C */
-bool_t xdr_keystatus();
-#endif /* Old Style C */
-
-
-typedef char keybuf[HEXKEYBYTES];
-#ifdef __cplusplus
-extern "C" bool_t xdr_keybuf(XDR *, keybuf);
-#elif __STDC__
-extern  bool_t xdr_keybuf(XDR *, keybuf);
-#else /* Old Style C */
-bool_t xdr_keybuf();
-#endif /* Old Style C */
-
-
-typedef char *netnamestr;
-#ifdef __cplusplus
-extern "C" bool_t xdr_netnamestr(XDR *, netnamestr*);
-#elif __STDC__
-extern  bool_t xdr_netnamestr(XDR *, netnamestr*);
-#else /* Old Style C */
-bool_t xdr_netnamestr();
-#endif /* Old Style C */
-
-
-struct cryptkeyarg {
-	netnamestr remotename;
-	des_block deskey;
-};
-typedef struct cryptkeyarg cryptkeyarg;
-#ifdef __cplusplus
-extern "C" bool_t xdr_cryptkeyarg(XDR *, cryptkeyarg*);
-#elif __STDC__
-extern  bool_t xdr_cryptkeyarg(XDR *, cryptkeyarg*);
-#else /* Old Style C */
-bool_t xdr_cryptkeyarg();
-#endif /* Old Style C */
-
-
-struct cryptkeyarg2 {
-	netnamestr remotename;
-	netobj remotekey;
-	des_block deskey;
-};
-typedef struct cryptkeyarg2 cryptkeyarg2;
-#ifdef __cplusplus
-extern "C" bool_t xdr_cryptkeyarg2(XDR *, cryptkeyarg2*);
-#elif __STDC__
-extern  bool_t xdr_cryptkeyarg2(XDR *, cryptkeyarg2*);
-#else /* Old Style C */
-bool_t xdr_cryptkeyarg2();
-#endif /* Old Style C */
-
-
-struct cryptkeyres {
-	keystatus status;
-	union {
-		des_block deskey;
-	} cryptkeyres_u;
-};
-typedef struct cryptkeyres cryptkeyres;
-#ifdef __cplusplus
-extern "C" bool_t xdr_cryptkeyres(XDR *, cryptkeyres*);
-#elif __STDC__
-extern  bool_t xdr_cryptkeyres(XDR *, cryptkeyres*);
-#else /* Old Style C */
-bool_t xdr_cryptkeyres();
-#endif /* Old Style C */
-
-#define MAXGIDS 16
-
-struct unixcred {
-	u_int uid;
-	u_int gid;
-	struct {
-		u_int gids_len;
-		u_int *gids_val;
-	} gids;
-};
-typedef struct unixcred unixcred;
-#ifdef __cplusplus
-extern "C" bool_t xdr_unixcred(XDR *, unixcred*);
-#elif __STDC__
-extern  bool_t xdr_unixcred(XDR *, unixcred*);
-#else /* Old Style C */
-bool_t xdr_unixcred();
-#endif /* Old Style C */
-
-
-struct getcredres {
-	keystatus status;
-	union {
-		unixcred cred;
-	} getcredres_u;
-};
-typedef struct getcredres getcredres;
-#ifdef __cplusplus
-extern "C" bool_t xdr_getcredres(XDR *, getcredres*);
-#elif __STDC__
-extern  bool_t xdr_getcredres(XDR *, getcredres*);
-#else /* Old Style C */
-bool_t xdr_getcredres();
-#endif /* Old Style C */
-
-
-struct key_netstarg {
-	keybuf st_priv_key;
-	keybuf st_pub_key;
-	netnamestr st_netname;
-};
-typedef struct key_netstarg key_netstarg;
-#ifdef __cplusplus
-extern "C" bool_t xdr_key_netstarg(XDR *, key_netstarg*);
-#elif __STDC__
-extern  bool_t xdr_key_netstarg(XDR *, key_netstarg*);
-#else /* Old Style C */
-bool_t xdr_key_netstarg();
-#endif /* Old Style C */
-
-
-struct key_netstres {
-	keystatus status;
-	union {
-		key_netstarg knet;
-	} key_netstres_u;
-};
-typedef struct key_netstres key_netstres;
-#ifdef __cplusplus
-extern "C" bool_t xdr_key_netstres(XDR *, key_netstres*);
-#elif __STDC__
-extern  bool_t xdr_key_netstres(XDR *, key_netstres*);
-#else /* Old Style C */
-bool_t xdr_key_netstres();
-#endif /* Old Style C */
-
-
-#ifndef opaque
-#define opaque char
-#endif
-
-
-#define KEY_PROG ((u_long)100029)
-#define KEY_VERS ((u_long)1)
-
-#ifdef __cplusplus
-#define KEY_SET ((u_long)1)
-extern "C" keystatus * key_set_1(opaque *, CLIENT *);
-extern "C" keystatus * key_set_1_svc(opaque *, struct svc_req *);
-#define KEY_ENCRYPT ((u_long)2)
-extern "C" cryptkeyres * key_encrypt_1(cryptkeyarg *, CLIENT *);
-extern "C" cryptkeyres * key_encrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define KEY_DECRYPT ((u_long)3)
-extern "C" cryptkeyres * key_decrypt_1(cryptkeyarg *, CLIENT *);
-extern "C" cryptkeyres * key_decrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define KEY_GEN ((u_long)4)
-extern "C" des_block * key_gen_1(void *, CLIENT *);
-extern "C" des_block * key_gen_1_svc(void *, struct svc_req *);
-#define KEY_GETCRED ((u_long)5)
-extern "C" getcredres * key_getcred_1(netnamestr *, CLIENT *);
-extern "C" getcredres * key_getcred_1_svc(netnamestr *, struct svc_req *);
-
-#elif __STDC__
-#define KEY_SET ((u_long)1)
-extern  keystatus * key_set_1(opaque *, CLIENT *);
-extern  keystatus * key_set_1_svc(opaque *, struct svc_req *);
-#define KEY_ENCRYPT ((u_long)2)
-extern  cryptkeyres * key_encrypt_1(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_encrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define KEY_DECRYPT ((u_long)3)
-extern  cryptkeyres * key_decrypt_1(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_decrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define KEY_GEN ((u_long)4)
-extern  des_block * key_gen_1(void *, CLIENT *);
-extern  des_block * key_gen_1_svc(void *, struct svc_req *);
-#define KEY_GETCRED ((u_long)5)
-extern  getcredres * key_getcred_1(netnamestr *, CLIENT *);
-extern  getcredres * key_getcred_1_svc(netnamestr *, struct svc_req *);
-
-#else /* Old Style C */
-#define KEY_SET ((u_long)1)
-extern  keystatus * key_set_1();
-extern  keystatus * key_set_1_svc();
-#define KEY_ENCRYPT ((u_long)2)
-extern  cryptkeyres * key_encrypt_1();
-extern  cryptkeyres * key_encrypt_1_svc();
-#define KEY_DECRYPT ((u_long)3)
-extern  cryptkeyres * key_decrypt_1();
-extern  cryptkeyres * key_decrypt_1_svc();
-#define KEY_GEN ((u_long)4)
-extern  des_block * key_gen_1();
-extern  des_block * key_gen_1_svc();
-#define KEY_GETCRED ((u_long)5)
-extern  getcredres * key_getcred_1();
-extern  getcredres * key_getcred_1_svc();
-#endif /* Old Style C */
-#define KEY_VERS2 ((u_long)2)
-
-#ifdef __cplusplus
-extern "C" keystatus * key_set_2(opaque *, CLIENT *);
-extern "C" keystatus * key_set_2_svc(opaque *, struct svc_req *);
-extern "C" cryptkeyres * key_encrypt_2(cryptkeyarg *, CLIENT *);
-extern "C" cryptkeyres * key_encrypt_2_svc(cryptkeyarg *, struct svc_req *);
-extern "C" cryptkeyres * key_decrypt_2(cryptkeyarg *, CLIENT *);
-extern "C" cryptkeyres * key_decrypt_2_svc(cryptkeyarg *, struct svc_req *);
-extern "C" des_block * key_gen_2(void *, CLIENT *);
-extern "C" des_block * key_gen_2_svc(void *, struct svc_req *);
-extern "C" getcredres * key_getcred_2(netnamestr *, CLIENT *);
-extern "C" getcredres * key_getcred_2_svc(netnamestr *, struct svc_req *);
-#define KEY_ENCRYPT_PK ((u_long)6)
-extern "C" cryptkeyres * key_encrypt_pk_2(cryptkeyarg2 *, CLIENT *);
-extern "C" cryptkeyres * key_encrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define KEY_DECRYPT_PK ((u_long)7)
-extern "C" cryptkeyres * key_decrypt_pk_2(cryptkeyarg2 *, CLIENT *);
-extern "C" cryptkeyres * key_decrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define KEY_NET_PUT ((u_long)8)
-extern "C" keystatus * key_net_put_2(key_netstarg *, CLIENT *);
-extern "C" keystatus * key_net_put_2_svc(key_netstarg *, struct svc_req *);
-#define KEY_NET_GET ((u_long)9)
-extern "C" key_netstres * key_net_get_2(void *, CLIENT *);
-extern "C" key_netstres * key_net_get_2_svc(void *, struct svc_req *);
-#define KEY_GET_CONV ((u_long)10)
-extern "C" cryptkeyres * key_get_conv_2(opaque *, CLIENT *);
-extern "C" cryptkeyres * key_get_conv_2_svc(opaque *, struct svc_req *);
-
-#elif __STDC__
-extern  keystatus * key_set_2(opaque *, CLIENT *);
-extern  keystatus * key_set_2_svc(opaque *, struct svc_req *);
-extern  cryptkeyres * key_encrypt_2(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_encrypt_2_svc(cryptkeyarg *, struct svc_req *);
-extern  cryptkeyres * key_decrypt_2(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_decrypt_2_svc(cryptkeyarg *, struct svc_req *);
-extern  des_block * key_gen_2(void *, CLIENT *);
-extern  des_block * key_gen_2_svc(void *, struct svc_req *);
-extern  getcredres * key_getcred_2(netnamestr *, CLIENT *);
-extern  getcredres * key_getcred_2_svc(netnamestr *, struct svc_req *);
-#define KEY_ENCRYPT_PK ((u_long)6)
-extern  cryptkeyres * key_encrypt_pk_2(cryptkeyarg2 *, CLIENT *);
-extern  cryptkeyres * key_encrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define KEY_DECRYPT_PK ((u_long)7)
-extern  cryptkeyres * key_decrypt_pk_2(cryptkeyarg2 *, CLIENT *);
-extern  cryptkeyres * key_decrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define KEY_NET_PUT ((u_long)8)
-extern  keystatus * key_net_put_2(key_netstarg *, CLIENT *);
-extern  keystatus * key_net_put_2_svc(key_netstarg *, struct svc_req *);
-#define KEY_NET_GET ((u_long)9)
-extern  key_netstres * key_net_get_2(void *, CLIENT *);
-extern  key_netstres * key_net_get_2_svc(void *, struct svc_req *);
-#define KEY_GET_CONV ((u_long)10)
-extern  cryptkeyres * key_get_conv_2(opaque *, CLIENT *);
-extern  cryptkeyres * key_get_conv_2_svc(opaque *, struct svc_req *);
-
-#else /* Old Style C */
-extern  keystatus * key_set_2();
-extern  keystatus * key_set_2_svc();
-extern  cryptkeyres * key_encrypt_2();
-extern  cryptkeyres * key_encrypt_2_svc();
-extern  cryptkeyres * key_decrypt_2();
-extern  cryptkeyres * key_decrypt_2_svc();
-extern  des_block * key_gen_2();
-extern  des_block * key_gen_2_svc();
-extern  getcredres * key_getcred_2();
-extern  getcredres * key_getcred_2_svc();
-#define KEY_ENCRYPT_PK ((u_long)6)
-extern  cryptkeyres * key_encrypt_pk_2();
-extern  cryptkeyres * key_encrypt_pk_2_svc();
-#define KEY_DECRYPT_PK ((u_long)7)
-extern  cryptkeyres * key_decrypt_pk_2();
-extern  cryptkeyres * key_decrypt_pk_2_svc();
-#define KEY_NET_PUT ((u_long)8)
-extern  keystatus * key_net_put_2();
-extern  keystatus * key_net_put_2_svc();
-#define KEY_NET_GET ((u_long)9)
-extern  key_netstres * key_net_get_2();
-extern  key_netstres * key_net_get_2_svc();
-#define KEY_GET_CONV ((u_long)10)
-extern  cryptkeyres * key_get_conv_2();
-extern  cryptkeyres * key_get_conv_2_svc();
-#endif /* Old Style C */
-
-#endif /* !_KEY_PROT_H_RPCGEN */
diff --git a/openflow/usr/include/rpc/netdb.h b/openflow/usr/include/rpc/netdb.h
deleted file mode 100644
index 529a4ad..0000000
--- a/openflow/usr/include/rpc/netdb.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* @(#)netdb.h	2.1 88/07/29 3.9 RPCSRC */
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* Cleaned up for GNU C library roland@gnu.ai.mit.edu:
-   added multiple inclusion protection and use of <sys/cdefs.h>.
-   In GNU this file is #include'd by <netdb.h>.  */
-
-#ifndef _RPC_NETDB_H
-#define _RPC_NETDB_H	1
-
-#include <features.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-__BEGIN_DECLS
-
-struct rpcent
-{
-  char *r_name;		/* Name of server for this rpc program.  */
-  char **r_aliases;	/* Alias list.  */
-  int r_number;		/* RPC program number.  */
-};
-
-extern void setrpcent (int __stayopen) __THROW;
-extern void endrpcent (void) __THROW;
-extern struct rpcent *getrpcbyname (const char *__name) __THROW;
-extern struct rpcent *getrpcbynumber (int __number) __THROW;
-extern struct rpcent *getrpcent (void) __THROW;
-
-#ifdef __USE_MISC
-extern int getrpcbyname_r (const char *__name, struct rpcent *__result_buf,
-			   char *__buffer, size_t __buflen,
-			   struct rpcent **__result) __THROW;
-
-extern int getrpcbynumber_r (int __number, struct rpcent *__result_buf,
-			     char *__buffer, size_t __buflen,
-			     struct rpcent **__result) __THROW;
-
-extern int getrpcent_r (struct rpcent *__result_buf, char *__buffer,
-			size_t __buflen, struct rpcent **__result) __THROW;
-#endif
-
-__END_DECLS
-
-#endif /* rpc/netdb.h */
diff --git a/openflow/usr/include/rpc/pmap_clnt.h b/openflow/usr/include/rpc/pmap_clnt.h
deleted file mode 100644
index 1cc94b8..0000000
--- a/openflow/usr/include/rpc/pmap_clnt.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * pmap_clnt.h
- * Supplies C routines to get to portmap services.
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RPC_PMAP_CLNT_H
-#define _RPC_PMAP_CLNT_H	1
-
-#include <features.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/clnt.h>
-
-__BEGIN_DECLS
-
-typedef bool_t (*resultproc_t) (caddr_t __resp, struct sockaddr_in *__raddr);
-
-/*
- * Usage:
- *	success = pmap_set(program, version, protocol, port);
- *	success = pmap_unset(program, version);
- *	port = pmap_getport(address, program, version, protocol);
- *	head = pmap_getmaps(address);
- *	clnt_stat = pmap_rmtcall(address, program, version, procedure,
- *		xdrargs, argsp, xdrres, resp, tout, port_ptr)
- *		(works for udp only.)
- * 	clnt_stat = clnt_broadcast(program, version, procedure,
- *		xdrargs, argsp,	xdrres, resp, eachresult)
- *		(like pmap_rmtcall, except the call is broadcasted to all
- *		locally connected nets.  For each valid response received,
- *		the procedure eachresult is called.  Its form is:
- *	done = eachresult(resp, raddr)
- *		bool_t done;
- *		caddr_t resp;
- *		struct sockaddr_in raddr;
- *		where resp points to the results of the call and raddr is the
- *		address if the responder to the broadcast.
- */
-
-extern bool_t pmap_set (const u_long __program, const u_long __vers,
-			int __protocol, u_short __port) __THROW;
-extern bool_t pmap_unset (const u_long __program, const u_long __vers)
-     __THROW;
-extern struct pmaplist *pmap_getmaps (struct sockaddr_in *__address) __THROW;
-extern enum clnt_stat pmap_rmtcall (struct sockaddr_in *__addr,
-				    const u_long __prog,
-				    const u_long __vers,
-				    const u_long __proc,
-				    xdrproc_t __xdrargs,
-				    caddr_t __argsp, xdrproc_t __xdrres,
-				    caddr_t __resp, struct timeval __tout,
-				    u_long *__port_ptr) __THROW;
-extern enum clnt_stat clnt_broadcast (const u_long __prog,
-				      const u_long __vers,
-				      const u_long __proc, xdrproc_t __xargs,
-				      caddr_t __argsp, xdrproc_t __xresults,
-				      caddr_t __resultsp,
-				      resultproc_t __eachresult) __THROW;
-extern u_short pmap_getport (struct sockaddr_in *__address,
-			     const u_long __program,
-			     const u_long __version, u_int __protocol)
-     __THROW;
-
-__END_DECLS
-
-#endif /* rpc/pmap_clnt.h */
diff --git a/openflow/usr/include/rpc/pmap_prot.h b/openflow/usr/include/rpc/pmap_prot.h
deleted file mode 100644
index e5fd7cb..0000000
--- a/openflow/usr/include/rpc/pmap_prot.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * pmap_prot.h
- * Protocol for the local binder service, or pmap.
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RPC_PMAP_PROT_H
-#define _RPC_PMAP_PROT_H	1
-
-#include <features.h>
-
-#include <rpc/xdr.h>
-
-__BEGIN_DECLS
-
-/* The following procedures are supported by the protocol:
- *
- * PMAPPROC_NULL() returns ()
- *	takes nothing, returns nothing
- *
- * PMAPPROC_SET(struct pmap) returns (bool_t)
- *	TRUE is success, FALSE is failure.  Registers the tuple
- *	[prog, vers, prot, port].
- *
- * PMAPPROC_UNSET(struct pmap) returns (bool_t)
- *	TRUE is success, FALSE is failure.  Un-registers pair
- *	[prog, vers].  prot and port are ignored.
- *
- * PMAPPROC_GETPORT(struct pmap) returns (long unsigned).
- *	0 is failure.  Otherwise returns the port number where the pair
- *	[prog, vers] is registered.  It may lie!
- *
- * PMAPPROC_DUMP() RETURNS (struct pmaplist *)
- *
- * PMAPPROC_CALLIT(unsigned, unsigned, unsigned, string<>)
- *	RETURNS (port, string<>);
- * usage: encapsulatedresults = PMAPPROC_CALLIT(prog, vers, proc, encapsulatedargs);
- *	Calls the procedure on the local machine.  If it is not registered,
- *	this procedure is quite; ie it does not return error information!!!
- *	This procedure only is supported on rpc/udp and calls via
- *	rpc/udp.  This routine only passes null authentication parameters.
- *	This file has no interface to xdr routines for PMAPPROC_CALLIT.
- *
- * The service supports remote procedure calls on udp/ip or tcp/ip socket 111.
- */
-
-#define PMAPPORT		((u_short)111)
-#define PMAPPROG		((u_long)100000)
-#define PMAPVERS		((u_long)2)
-#define PMAPVERS_PROTO		((u_long)2)
-#define PMAPVERS_ORIG		((u_long)1)
-#define PMAPPROC_NULL		((u_long)0)
-#define PMAPPROC_SET		((u_long)1)
-#define PMAPPROC_UNSET		((u_long)2)
-#define PMAPPROC_GETPORT	((u_long)3)
-#define PMAPPROC_DUMP		((u_long)4)
-#define PMAPPROC_CALLIT		((u_long)5)
-
-struct pmap {
-	long unsigned pm_prog;
-	long unsigned pm_vers;
-	long unsigned pm_prot;
-	long unsigned pm_port;
-};
-
-extern bool_t xdr_pmap (XDR *__xdrs, struct pmap *__regs) __THROW;
-
-struct pmaplist {
-	struct pmap	pml_map;
-	struct pmaplist *pml_next;
-};
-
-extern bool_t xdr_pmaplist (XDR *__xdrs, struct pmaplist **__rp) __THROW;
-
-__END_DECLS
-
-#endif /* rpc/pmap_prot.h */
diff --git a/openflow/usr/include/rpc/pmap_rmt.h b/openflow/usr/include/rpc/pmap_rmt.h
deleted file mode 100644
index f868014..0000000
--- a/openflow/usr/include/rpc/pmap_rmt.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Structures and XDR routines for parameters to and replies from
- * the portmapper remote-call-service.
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RPC_PMAP_RMT_H
-#define _RPC_PMAP_RMT_H	1
-
-#include <features.h>
-#include <sys/types.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-__BEGIN_DECLS
-
-struct rmtcallargs {
-	u_long prog, vers, proc, arglen;
-	caddr_t args_ptr;
-	xdrproc_t xdr_args;
-};
-
-extern bool_t xdr_rmtcall_args (XDR *__xdrs, struct rmtcallargs *__crp)
-     __THROW;
-
-struct rmtcallres {
-	u_long *port_ptr;
-	u_long resultslen;
-	caddr_t results_ptr;
-	xdrproc_t xdr_results;
-};
-
-extern bool_t xdr_rmtcallres (XDR *__xdrs, struct rmtcallres *__crp) __THROW;
-
-__END_DECLS
-
-#endif /* rpc/pmap_rmt.h */
diff --git a/openflow/usr/include/rpc/rpc.h b/openflow/usr/include/rpc/rpc.h
deleted file mode 100644
index 173a4e3..0000000
--- a/openflow/usr/include/rpc/rpc.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * rpc.h, Just includes the billions of rpc header files necessary to
- * do remote procedure calling.
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RPC_RPC_H
-#define _RPC_RPC_H 1
-
-#include <rpc/types.h>		/* some typedefs */
-#include <netinet/in.h>
-
-/* external data representation interfaces */
-#include <rpc/xdr.h>		/* generic (de)serializer */
-
-/* Client side only authentication */
-#include <rpc/auth.h>		/* generic authenticator (client side) */
-
-/* Client side (mostly) remote procedure call */
-#include <rpc/clnt.h>		/* generic rpc stuff */
-
-/* semi-private protocol headers */
-#include <rpc/rpc_msg.h>	/* protocol for rpc messages */
-#include <rpc/auth_unix.h>	/* protocol for unix style cred */
-#include <rpc/auth_des.h>	/* protocol for des style cred */
-
-/* Server side only remote procedure callee */
-#include <rpc/svc.h>		/* service manager and multiplexer */
-#include <rpc/svc_auth.h>	/* service side authenticator */
-
-/*
- * COMMENT OUT THE NEXT INCLUDE IF RUNNING ON SUN OS OR ON A VERSION
- * OF UNIX BASED ON NFSSRC.  These systems will already have the structures
- * defined by <rpc/netdb.h> included in <netdb.h>.
- */
-/* routines for parsing /etc/rpc */
-#include <rpc/netdb.h>		/* structures and routines to parse /etc/rpc */
-
-__BEGIN_DECLS
-
-/* Global variables, protected for multi-threaded applications.  */
-extern fd_set *__rpc_thread_svc_fdset (void) __attribute__ ((__const__));
-#define svc_fdset (*__rpc_thread_svc_fdset ())
-
-extern struct rpc_createerr *__rpc_thread_createerr (void)
-     __attribute__ ((__const__));
-#define get_rpc_createerr() (*__rpc_thread_createerr ())
-/* The people who "engineered" RPC should bee punished for naming the
-   data structure and the variable the same.  We cannot always define the
-   macro 'rpc_createerr' because this would prevent people from defining
-   object of type 'struct rpc_createerr'.  So we leave it up to the user
-   to select transparent replacement also of this variable.  */
-#ifdef _RPC_MT_VARS
-# define rpc_createerr (*__rpc_thread_createerr ())
-#endif
-
-extern struct pollfd **__rpc_thread_svc_pollfd (void)
-     __attribute__ ((__const__));
-#define svc_pollfd (*__rpc_thread_svc_pollfd ())
-
-extern int *__rpc_thread_svc_max_pollfd (void) __attribute__ ((__const__));
-#define svc_max_pollfd (*__rpc_thread_svc_max_pollfd ())
-
-__END_DECLS
-
-#endif /* rpc/rpc.h */
diff --git a/openflow/usr/include/rpc/rpc_des.h b/openflow/usr/include/rpc/rpc_des.h
deleted file mode 100644
index 4b3c426..0000000
--- a/openflow/usr/include/rpc/rpc_des.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Generic DES driver interface
- * Keep this file hardware independent!
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _DES_H
-#define _DES_H
-
-#include <sys/types.h>
-
-#define DES_MAXLEN	65536	/* maximum # of bytes to encrypt  */
-#define DES_QUICKLEN	16	/* maximum # of bytes to encrypt quickly */
-
-enum desdir
-  {
-    ENCRYPT, DECRYPT
-  };
-enum desmode
-  {
-    CBC, ECB
-  };
-
-/*
- * parameters to ioctl call
- */
-struct desparams
-  {
-    u_char des_key[8];		/* key (with low bit parity) */
-    enum desdir des_dir;	/* direction */
-    enum desmode des_mode;	/* mode */
-    u_char des_ivec[8];		/* input vector */
-    unsigned des_len;		/* number of bytes to crypt */
-    union
-      {
-	u_char UDES_data[DES_QUICKLEN];
-	u_char *UDES_buf;
-      }
-    UDES;
-#define des_data UDES.UDES_data	/* direct data here if quick */
-#define des_buf	UDES.UDES_buf	/* otherwise, pointer to data */
-  };
-
-#endif
diff --git a/openflow/usr/include/rpc/rpc_msg.h b/openflow/usr/include/rpc/rpc_msg.h
deleted file mode 100644
index 273b187..0000000
--- a/openflow/usr/include/rpc/rpc_msg.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * rpc_msg.h
- * rpc message definition
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RPC_MSG_H
-#define _RPC_MSG_H 1
-
-#include <sys/cdefs.h>
-
-#include <rpc/xdr.h>
-#include <rpc/clnt.h>
-
-#define RPC_MSG_VERSION		((u_long) 2)
-#define RPC_SERVICE_PORT	((u_short) 2048)
-
-__BEGIN_DECLS
-
-/*
- * Bottom up definition of an rpc message.
- * NOTE: call and reply use the same overall struct but
- * different parts of unions within it.
- */
-
-enum msg_type {
-	CALL=0,
-	REPLY=1
-};
-
-enum reply_stat {
-	MSG_ACCEPTED=0,
-	MSG_DENIED=1
-};
-
-enum accept_stat {
-	SUCCESS=0,
-	PROG_UNAVAIL=1,
-	PROG_MISMATCH=2,
-	PROC_UNAVAIL=3,
-	GARBAGE_ARGS=4,
-	SYSTEM_ERR=5
-};
-
-enum reject_stat {
-	RPC_MISMATCH=0,
-	AUTH_ERROR=1
-};
-
-/*
- * Reply part of an rpc exchange
- */
-
-/*
- * Reply to an rpc request that was accepted by the server.
- * Note: there could be an error even though the request was
- * accepted.
- */
-struct accepted_reply {
-	struct opaque_auth	ar_verf;
-	enum accept_stat	ar_stat;
-	union {
-		struct {
-			u_long	low;
-			u_long	high;
-		} AR_versions;
-		struct {
-			caddr_t	where;
-			xdrproc_t proc;
-		} AR_results;
-		/* and many other null cases */
-	} ru;
-#define	ar_results	ru.AR_results
-#define	ar_vers		ru.AR_versions
-};
-
-/*
- * Reply to an rpc request that was rejected by the server.
- */
-struct rejected_reply {
-	enum reject_stat rj_stat;
-	union {
-		struct {
-			u_long low;
-			u_long high;
-		} RJ_versions;
-		enum auth_stat RJ_why;  /* why authentication did not work */
-	} ru;
-#define	rj_vers	ru.RJ_versions
-#define	rj_why	ru.RJ_why
-};
-
-/*
- * Body of a reply to an rpc request.
- */
-struct reply_body {
-	enum reply_stat rp_stat;
-	union {
-		struct accepted_reply RP_ar;
-		struct rejected_reply RP_dr;
-	} ru;
-#define	rp_acpt	ru.RP_ar
-#define	rp_rjct	ru.RP_dr
-};
-
-/*
- * Body of an rpc request call.
- */
-struct call_body {
-	u_long cb_rpcvers;	/* must be equal to two */
-	u_long cb_prog;
-	u_long cb_vers;
-	u_long cb_proc;
-	struct opaque_auth cb_cred;
-	struct opaque_auth cb_verf; /* protocol specific - provided by client */
-};
-
-/*
- * The rpc message
- */
-struct rpc_msg {
-	u_long			rm_xid;
-	enum msg_type		rm_direction;
-	union {
-		struct call_body RM_cmb;
-		struct reply_body RM_rmb;
-	} ru;
-#define	rm_call		ru.RM_cmb
-#define	rm_reply	ru.RM_rmb
-};
-#define	acpted_rply	ru.RM_rmb.ru.RP_ar
-#define	rjcted_rply	ru.RM_rmb.ru.RP_dr
-
-
-/*
- * XDR routine to handle a rpc message.
- * xdr_callmsg(xdrs, cmsg)
- * 	XDR *xdrs;
- * 	struct rpc_msg *cmsg;
- */
-extern bool_t	xdr_callmsg (XDR *__xdrs, struct rpc_msg *__cmsg) __THROW;
-
-/*
- * XDR routine to pre-serialize the static part of a rpc message.
- * xdr_callhdr(xdrs, cmsg)
- * 	XDR *xdrs;
- * 	struct rpc_msg *cmsg;
- */
-extern bool_t	xdr_callhdr (XDR *__xdrs, struct rpc_msg *__cmsg) __THROW;
-
-/*
- * XDR routine to handle a rpc reply.
- * xdr_replymsg(xdrs, rmsg)
- * 	XDR *xdrs;
- * 	struct rpc_msg *rmsg;
- */
-extern bool_t	xdr_replymsg (XDR *__xdrs, struct rpc_msg *__rmsg) __THROW;
-
-/*
- * Fills in the error part of a reply message.
- * _seterr_reply(msg, error)
- * 	struct rpc_msg *msg;
- * 	struct rpc_err *error;
- */
-extern void	_seterr_reply (struct rpc_msg *__msg, struct rpc_err *__error)
-     __THROW;
-
-__END_DECLS
-
-#endif /* rpc/rpc_msg.h */
diff --git a/openflow/usr/include/rpc/svc.h b/openflow/usr/include/rpc/svc.h
deleted file mode 100644
index 1879fd2..0000000
--- a/openflow/usr/include/rpc/svc.h
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * svc.h, Server-side remote procedure call interface.
- *
- * Copyright (C) 2012-2016 Free Software Foundation, Inc.
- * This file is part of the GNU C Library.
- *
- * The GNU C Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * The GNU C Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the GNU C Library; if not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RPC_SVC_H
-#define _RPC_SVC_H 1
-
-#include <features.h>
-#include <rpc/rpc_msg.h>
-
-__BEGIN_DECLS
-
-/*
- * This interface must manage two items concerning remote procedure calling:
- *
- * 1) An arbitrary number of transport connections upon which rpc requests
- * are received.  The two most notable transports are TCP and UDP;  they are
- * created and registered by routines in svc_tcp.c and svc_udp.c, respectively;
- * they in turn call xprt_register and xprt_unregister.
- *
- * 2) An arbitrary number of locally registered services.  Services are
- * described by the following four data: program number, version number,
- * "service dispatch" function, a transport handle, and a boolean that
- * indicates whether or not the exported program should be registered with a
- * local binder service;  if true the program's number and version and the
- * port number from the transport handle are registered with the binder.
- * These data are registered with the rpc svc system via svc_register.
- *
- * A service's dispatch function is called whenever an rpc request comes in
- * on a transport.  The request's program and version numbers must match
- * those of the registered service.  The dispatch function is passed two
- * parameters, struct svc_req * and SVCXPRT *, defined below.
- */
-
-enum xprt_stat {
-	XPRT_DIED,
-	XPRT_MOREREQS,
-	XPRT_IDLE
-};
-
-/*
- * Server side transport handle
- */
-typedef struct SVCXPRT SVCXPRT;
-struct SVCXPRT {
-  int xp_sock;
-  u_short xp_port;		/* associated port number */
-  const struct xp_ops {
-    bool_t	(*xp_recv) (SVCXPRT *__xprt, struct rpc_msg *__msg);
-				/* receive incoming requests */
-    enum xprt_stat (*xp_stat) (SVCXPRT *__xprt);
-				/* get transport status */
-    bool_t	(*xp_getargs) (SVCXPRT *__xprt, xdrproc_t __xdr_args,
-			       caddr_t __args_ptr); /* get arguments */
-    bool_t	(*xp_reply) (SVCXPRT *__xprt, struct rpc_msg *__msg);
-				/* send reply */
-    bool_t	(*xp_freeargs) (SVCXPRT *__xprt, xdrproc_t __xdr_args,
-				caddr_t __args_ptr);
-				/* free mem allocated for args */
-    void	(*xp_destroy) (SVCXPRT *__xprt);
-				/* destroy this struct */
-  } *xp_ops;
-  int		xp_addrlen;	 /* length of remote address */
-  struct sockaddr_in xp_raddr;	 /* remote address */
-  struct opaque_auth xp_verf;	 /* raw response verifier */
-  caddr_t		xp_p1;		 /* private */
-  caddr_t		xp_p2;		 /* private */
-  char		xp_pad [256];	/* padding, internal use */
-};
-
-/*
- *  Approved way of getting address of caller
- */
-#define svc_getcaller(x) (&(x)->xp_raddr)
-
-/*
- * Operations defined on an SVCXPRT handle
- *
- * SVCXPRT		*xprt;
- * struct rpc_msg	*msg;
- * xdrproc_t		 xargs;
- * caddr_t		 argsp;
- */
-#define SVC_RECV(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_recv)((xprt), (msg))
-#define svc_recv(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_recv)((xprt), (msg))
-
-#define SVC_STAT(xprt)					\
-	(*(xprt)->xp_ops->xp_stat)(xprt)
-#define svc_stat(xprt)					\
-	(*(xprt)->xp_ops->xp_stat)(xprt)
-
-#define SVC_GETARGS(xprt, xargs, argsp)			\
-	(*(xprt)->xp_ops->xp_getargs)((xprt), (xargs), (argsp))
-#define svc_getargs(xprt, xargs, argsp)			\
-	(*(xprt)->xp_ops->xp_getargs)((xprt), (xargs), (argsp))
-
-#define SVC_REPLY(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_reply) ((xprt), (msg))
-#define svc_reply(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_reply) ((xprt), (msg))
-
-#define SVC_FREEARGS(xprt, xargs, argsp)		\
-	(*(xprt)->xp_ops->xp_freeargs)((xprt), (xargs), (argsp))
-#define svc_freeargs(xprt, xargs, argsp)		\
-	(*(xprt)->xp_ops->xp_freeargs)((xprt), (xargs), (argsp))
-
-#define SVC_DESTROY(xprt)				\
-	(*(xprt)->xp_ops->xp_destroy)(xprt)
-#define svc_destroy(xprt)				\
-	(*(xprt)->xp_ops->xp_destroy)(xprt)
-
-
-/*
- * Service request
- */
-struct svc_req {
-  rpcprog_t rq_prog;            /* service program number */
-  rpcvers_t rq_vers;            /* service protocol version */
-  rpcproc_t rq_proc;            /* the desired procedure */
-  struct opaque_auth rq_cred;   /* raw creds from the wire */
-  caddr_t rq_clntcred;          /* read only cooked cred */
-  SVCXPRT *rq_xprt;             /* associated transport */
-};
-
-#ifndef __DISPATCH_FN_T
-#define __DISPATCH_FN_T
-typedef void (*__dispatch_fn_t) (struct svc_req*, SVCXPRT*);
-#endif
-
-/*
- * Service registration
- *
- * svc_register(xprt, prog, vers, dispatch, protocol)
- *	SVCXPRT *xprt;
- *	rpcprog_t prog;
- *	rpcvers_t vers;
- *	void (*dispatch)(struct svc_req*, SVCXPRT*);
- *	rpcprot_t protocol;  like TCP or UDP, zero means do not register
- */
-extern bool_t svc_register (SVCXPRT *__xprt, rpcprog_t __prog,
-			    rpcvers_t __vers, __dispatch_fn_t __dispatch,
-			    rpcprot_t __protocol) __THROW;
-
-/*
- * Service un-registration
- *
- * svc_unregister(prog, vers)
- *	rpcprog_t prog;
- *	rpcvers_t vers;
- */
-extern void svc_unregister (rpcprog_t __prog, rpcvers_t __vers) __THROW;
-
-/*
- * Transport registration.
- *
- * xprt_register(xprt)
- *	SVCXPRT *xprt;
- */
-extern void xprt_register (SVCXPRT *__xprt) __THROW;
-
-/*
- * Transport un-register
- *
- * xprt_unregister(xprt)
- *	SVCXPRT *xprt;
- */
-extern void xprt_unregister (SVCXPRT *__xprt) __THROW;
-
-
-/*
- * When the service routine is called, it must first check to see if it
- * knows about the procedure;  if not, it should call svcerr_noproc
- * and return.  If so, it should deserialize its arguments via
- * SVC_GETARGS (defined above).  If the deserialization does not work,
- * svcerr_decode should be called followed by a return.  Successful
- * decoding of the arguments should be followed the execution of the
- * procedure's code and a call to svc_sendreply.
- *
- * Also, if the service refuses to execute the procedure due to too-
- * weak authentication parameters, svcerr_weakauth should be called.
- * Note: do not confuse access-control failure with weak authentication!
- *
- * NB: In pure implementations of rpc, the caller always waits for a reply
- * msg.  This message is sent when svc_sendreply is called.
- * Therefore pure service implementations should always call
- * svc_sendreply even if the function logically returns void;  use
- * xdr.h - xdr_void for the xdr routine.  HOWEVER, tcp based rpc allows
- * for the abuse of pure rpc via batched calling or pipelining.  In the
- * case of a batched call, svc_sendreply should NOT be called since
- * this would send a return message, which is what batching tries to avoid.
- * It is the service/protocol writer's responsibility to know which calls are
- * batched and which are not.  Warning: responding to batch calls may
- * deadlock the caller and server processes!
- */
-
-extern bool_t	svc_sendreply (SVCXPRT *__xprt, xdrproc_t __xdr_results,
-			       caddr_t __xdr_location) __THROW;
-
-extern void	svcerr_decode (SVCXPRT *__xprt) __THROW;
-
-extern void	svcerr_weakauth (SVCXPRT *__xprt) __THROW;
-
-extern void	svcerr_noproc (SVCXPRT *__xprt) __THROW;
-
-extern void	svcerr_progvers (SVCXPRT *__xprt, rpcvers_t __low_vers,
-				 rpcvers_t __high_vers) __THROW;
-
-extern void	svcerr_auth (SVCXPRT *__xprt, enum auth_stat __why) __THROW;
-
-extern void	svcerr_noprog (SVCXPRT *__xprt) __THROW;
-
-extern void	svcerr_systemerr (SVCXPRT *__xprt) __THROW;
-
-/*
- * Lowest level dispatching -OR- who owns this process anyway.
- * Somebody has to wait for incoming requests and then call the correct
- * service routine.  The routine svc_run does infinite waiting; i.e.,
- * svc_run never returns.
- * Since another (coexistent) package may wish to selectively wait for
- * incoming calls or other events outside of the rpc architecture, the
- * routine svc_getreq is provided.  It must be passed readfds, the
- * "in-place" results of a select system call (see select, section 2).
- */
-
-/*
- * Global keeper of rpc service descriptors in use
- * dynamic; must be inspected before each call to select
- */
-
-extern struct pollfd *svc_pollfd;
-extern int svc_max_pollfd;
-extern fd_set svc_fdset;
-#define svc_fds svc_fdset.fds_bits[0]	/* compatibility */
-
-/*
- * a small program implemented by the svc_rpc implementation itself;
- * also see clnt.h for protocol numbers.
- */
-extern void svc_getreq (int __rdfds) __THROW;
-extern void svc_getreq_common (const int __fd) __THROW;
-extern void svc_getreqset (fd_set *__readfds) __THROW;
-extern void svc_getreq_poll (struct pollfd *, const int) __THROW;
-extern void svc_exit (void) __THROW;
-extern void svc_run (void) __THROW;
-
-/*
- * Socket to use on svcxxx_create call to get default socket
- */
-#define	RPC_ANYSOCK	-1
-
-/*
- * These are the existing service side transport implementations
- */
-
-/*
- * Memory based rpc for testing and timing.
- */
-extern SVCXPRT *svcraw_create (void) __THROW;
-
-/*
- * Udp based rpc.
- */
-extern SVCXPRT *svcudp_create (int __sock) __THROW;
-extern SVCXPRT *svcudp_bufcreate (int __sock, u_int __sendsz, u_int __recvsz)
-     __THROW;
-
-/*
- * Tcp based rpc.
- */
-extern SVCXPRT *svctcp_create (int __sock, u_int __sendsize, u_int __recvsize)
-     __THROW;
-
-/*
- * FD based rpc.
- */
-extern SVCXPRT *svcfd_create (int __sock, u_int __sendsize, u_int __recvsize)
-     __THROW;
-
-/*
- * Unix based rpc.
- */
-extern SVCXPRT *svcunix_create (int __sock, u_int __sendsize, u_int __recvsize,
-				char *__path) __THROW;
-
-
-__END_DECLS
-
-#endif /* rpc/svc.h */
diff --git a/openflow/usr/include/rpc/svc_auth.h b/openflow/usr/include/rpc/svc_auth.h
deleted file mode 100644
index 4ba2741..0000000
--- a/openflow/usr/include/rpc/svc_auth.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * svc_auth.h, Service side of rpc authentication.
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RPC_SVC_AUTH_H
-#define _RPC_SVC_AUTH_H	1
-
-#include <features.h>
-#include <rpc/svc.h>
-
-__BEGIN_DECLS
-
-/*
- * Server side authenticator
- */
-extern enum auth_stat _authenticate (struct svc_req *__rqst,
-				     struct rpc_msg *__msg) __THROW;
-
-__END_DECLS
-
-#endif /* rpc/svc_auth.h */
diff --git a/openflow/usr/include/rpc/types.h b/openflow/usr/include/rpc/types.h
deleted file mode 100644
index beded52..0000000
--- a/openflow/usr/include/rpc/types.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/* fixincludes should not add extern "C" to this file */
-/*
- * Rpc additions to <sys/types.h>
- */
-#ifndef _RPC_TYPES_H
-#define _RPC_TYPES_H 1
-
-typedef int bool_t;
-typedef int enum_t;
-/* This needs to be changed to uint32_t in the future */
-typedef unsigned long rpcprog_t;
-typedef unsigned long rpcvers_t;
-typedef unsigned long rpcproc_t;
-typedef unsigned long rpcprot_t;
-typedef unsigned long rpcport_t;
-
-#define        __dontcare__    -1
-
-#ifndef FALSE
-#      define  FALSE   (0)
-#endif
-
-#ifndef TRUE
-#      define  TRUE    (1)
-#endif
-
-#ifndef NULL
-#      define  NULL 0
-#endif
-
-#include <stdlib.h>		/* For malloc decl.  */
-#define mem_alloc(bsize)	malloc(bsize)
-/*
- * XXX: This must not use the second argument, or code in xdr_array.c needs
- * to be modified.
- */
-#define mem_free(ptr, bsize)	free(ptr)
-
-#ifndef makedev /* ie, we haven't already included it */
-#include <sys/types.h>
-#endif
-
-#if defined __APPLE_CC__ || defined __FreeBSD__
-# define __u_char_defined
-# define __daddr_t_defined
-#endif
-
-#ifndef __u_char_defined
-typedef __u_char u_char;
-typedef __u_short u_short;
-typedef __u_int u_int;
-typedef __u_long u_long;
-typedef __quad_t quad_t;
-typedef __u_quad_t u_quad_t;
-typedef __fsid_t fsid_t;
-# define __u_char_defined
-#endif
-#ifndef __daddr_t_defined
-typedef __daddr_t daddr_t;
-typedef __caddr_t caddr_t;
-# define __daddr_t_defined
-#endif
-
-#include <sys/time.h>
-#include <sys/param.h>
-
-#include <netinet/in.h>
-
-#ifndef INADDR_LOOPBACK
-#define       INADDR_LOOPBACK         (u_long)0x7F000001
-#endif
-#ifndef MAXHOSTNAMELEN
-#define        MAXHOSTNAMELEN  64
-#endif
-
-#endif /* rpc/types.h */
diff --git a/openflow/usr/include/rpc/xdr.h b/openflow/usr/include/rpc/xdr.h
deleted file mode 100644
index d80d8f7..0000000
--- a/openflow/usr/include/rpc/xdr.h
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * xdr.h, External Data Representation Serialization Routines.
- *
- * Copyright (c) 2010, 2012, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RPC_XDR_H
-#define _RPC_XDR_H 1
-
-#include <features.h>
-#include <sys/types.h>
-#include <rpc/types.h>
-
-/* We need FILE.  */
-#include <stdio.h>
-
-__BEGIN_DECLS
-
-/*
- * XDR provides a conventional way for converting between C data
- * types and an external bit-string representation.  Library supplied
- * routines provide for the conversion on built-in C data types.  These
- * routines and utility routines defined here are used to help implement
- * a type encode/decode routine for each user-defined type.
- *
- * Each data type provides a single procedure which takes two arguments:
- *
- *      bool_t
- *      xdrproc(xdrs, argresp)
- *              XDR *xdrs;
- *              <type> *argresp;
- *
- * xdrs is an instance of a XDR handle, to which or from which the data
- * type is to be converted.  argresp is a pointer to the structure to be
- * converted.  The XDR handle contains an operation field which indicates
- * which of the operations (ENCODE, DECODE * or FREE) is to be performed.
- *
- * XDR_DECODE may allocate space if the pointer argresp is null.  This
- * data can be freed with the XDR_FREE operation.
- *
- * We write only one procedure per data type to make it easy
- * to keep the encode and decode procedures for a data type consistent.
- * In many cases the same code performs all operations on a user defined type,
- * because all the hard work is done in the component type routines.
- * decode as a series of calls on the nested data types.
- */
-
-/*
- * Xdr operations.  XDR_ENCODE causes the type to be encoded into the
- * stream.  XDR_DECODE causes the type to be extracted from the stream.
- * XDR_FREE can be used to release the space allocated by an XDR_DECODE
- * request.
- */
-enum xdr_op {
-  XDR_ENCODE = 0,
-  XDR_DECODE = 1,
-  XDR_FREE = 2
-};
-
-/*
- * This is the number of bytes per unit of external data.
- */
-#define BYTES_PER_XDR_UNIT	(4)
-/*
- * This only works if the above is a power of 2.  But it's defined to be
- * 4 by the appropriate RFCs.  So it will work.  And it's normally quicker
- * than the old routine.
- */
-#if 1
-#define RNDUP(x)  (((x) + BYTES_PER_XDR_UNIT - 1) & ~(BYTES_PER_XDR_UNIT - 1))
-#else /* this is the old routine */
-#define RNDUP(x)  ((((x) + BYTES_PER_XDR_UNIT - 1) / BYTES_PER_XDR_UNIT) \
-		    * BYTES_PER_XDR_UNIT)
-#endif
-
-/*
- * The XDR handle.
- * Contains operation which is being applied to the stream,
- * an operations vector for the particular implementation (e.g. see xdr_mem.c),
- * and two private fields for the use of the particular implementation.
- */
-typedef struct XDR XDR;
-struct XDR
-  {
-    enum xdr_op x_op;		/* operation; fast additional param */
-    struct xdr_ops
-      {
-	bool_t (*x_getlong) (XDR *__xdrs, long *__lp);
-	/* get a long from underlying stream */
-	bool_t (*x_putlong) (XDR *__xdrs, const long *__lp);
-	/* put a long to " */
-	bool_t (*x_getbytes) (XDR *__xdrs, caddr_t __addr, u_int __len);
-	/* get some bytes from " */
-	bool_t (*x_putbytes) (XDR *__xdrs, const char *__addr, u_int __len);
-	/* put some bytes to " */
-	u_int (*x_getpostn) (const XDR *__xdrs);
-	/* returns bytes off from beginning */
-	bool_t (*x_setpostn) (XDR *__xdrs, u_int __pos);
-	/* lets you reposition the stream */
-	int32_t *(*x_inline) (XDR *__xdrs, u_int __len);
-	/* buf quick ptr to buffered data */
-	void (*x_destroy) (XDR *__xdrs);
-	/* free privates of this xdr_stream */
-	bool_t (*x_getint32) (XDR *__xdrs, int32_t *__ip);
-	/* get a int from underlying stream */
-	bool_t (*x_putint32) (XDR *__xdrs, const int32_t *__ip);
-	/* put a int to " */
-      }
-     *x_ops;
-    caddr_t x_public;		/* users' data */
-    caddr_t x_private;		/* pointer to private data */
-    caddr_t x_base;		/* private used for position info */
-    u_int x_handy;		/* extra private word */
-  };
-
-/*
- * A xdrproc_t exists for each data type which is to be encoded or decoded.
- *
- * The second argument to the xdrproc_t is a pointer to an opaque pointer.
- * The opaque pointer generally points to a structure of the data type
- * to be decoded.  If this pointer is 0, then the type routines should
- * allocate dynamic storage of the appropriate size and return it.
- * bool_t       (*xdrproc_t)(XDR *, caddr_t *);
- */
-typedef bool_t (*xdrproc_t) (XDR *, void *,...);
-
-
-/*
- * Operations defined on a XDR handle
- *
- * XDR          *xdrs;
- * int32_t      *int32p;
- * long         *longp;
- * caddr_t       addr;
- * u_int         len;
- * u_int         pos;
- */
-#define XDR_GETINT32(xdrs, int32p)                      \
-	(*(xdrs)->x_ops->x_getint32)(xdrs, int32p)
-#define xdr_getint32(xdrs, int32p)                      \
-	(*(xdrs)->x_ops->x_getint32)(xdrs, int32p)
-
-#define XDR_PUTINT32(xdrs, int32p)                      \
-	(*(xdrs)->x_ops->x_putint32)(xdrs, int32p)
-#define xdr_putint32(xdrs, int32p)                      \
-	(*(xdrs)->x_ops->x_putint32)(xdrs, int32p)
-
-#define XDR_GETLONG(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-#define xdr_getlong(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-
-#define XDR_PUTLONG(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-#define xdr_putlong(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-
-#define XDR_GETBYTES(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-#define xdr_getbytes(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-
-#define XDR_PUTBYTES(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-#define xdr_putbytes(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-
-#define XDR_GETPOS(xdrs)				\
-	(*(xdrs)->x_ops->x_getpostn)(xdrs)
-#define xdr_getpos(xdrs)				\
-	(*(xdrs)->x_ops->x_getpostn)(xdrs)
-
-#define XDR_SETPOS(xdrs, pos)				\
-	(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-#define xdr_setpos(xdrs, pos)				\
-	(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-
-#define	XDR_INLINE(xdrs, len)				\
-	(*(xdrs)->x_ops->x_inline)(xdrs, len)
-#define	xdr_inline(xdrs, len)				\
-	(*(xdrs)->x_ops->x_inline)(xdrs, len)
-
-#define	XDR_DESTROY(xdrs)					\
-	do {							\
-		if ((xdrs)->x_ops->x_destroy)			\
-			(*(xdrs)->x_ops->x_destroy)(xdrs);	\
-	} while (0)
-#define	xdr_destroy(xdrs)					\
-	do {							\
-		if ((xdrs)->x_ops->x_destroy)			\
-			(*(xdrs)->x_ops->x_destroy)(xdrs);	\
-	} while (0)
-
-/*
- * Support struct for discriminated unions.
- * You create an array of xdrdiscrim structures, terminated with
- * an entry with a null procedure pointer.  The xdr_union routine gets
- * the discriminant value and then searches the array of structures
- * for a matching value.  If a match is found the associated xdr routine
- * is called to handle that part of the union.  If there is
- * no match, then a default routine may be called.
- * If there is no match and no default routine it is an error.
- */
-#define NULL_xdrproc_t ((xdrproc_t)0)
-struct xdr_discrim
-{
-  int value;
-  xdrproc_t proc;
-};
-
-/*
- * Inline routines for fast encode/decode of primitive data types.
- * Caveat emptor: these use single memory cycles to get the
- * data from the underlying buffer, and will fail to operate
- * properly if the data is not aligned.  The standard way to use these
- * is to say:
- *      if ((buf = XDR_INLINE(xdrs, count)) == NULL)
- *              return (FALSE);
- *      <<< macro calls >>>
- * where ``count'' is the number of bytes of data occupied
- * by the primitive data types.
- *
- * N.B. and frozen for all time: each data type here uses 4 bytes
- * of external representation.
- */
-
-#define IXDR_GET_INT32(buf)           ((int32_t)ntohl((uint32_t)*(buf)++))
-#define IXDR_PUT_INT32(buf, v)        (*(buf)++ = (int32_t)htonl((uint32_t)(v)))
-#define IXDR_GET_U_INT32(buf)         ((uint32_t)IXDR_GET_INT32(buf))
-#define IXDR_PUT_U_INT32(buf, v)      IXDR_PUT_INT32(buf, (int32_t)(v))
-
-/* WARNING: The IXDR_*_LONG defines are removed by Sun for new platforms
- * and shouldn't be used any longer. Code which use this defines or longs
- * in the RPC code will not work on 64bit Solaris platforms !
- */
-#define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))
-#define IXDR_PUT_LONG(buf, v) ((long)IXDR_PUT_INT32(buf, (long)(v)))
-#define IXDR_GET_U_LONG(buf)	      ((u_long)IXDR_GET_LONG(buf))
-#define IXDR_PUT_U_LONG(buf, v)	      IXDR_PUT_LONG(buf, (long)(v))
-
-
-#define IXDR_GET_BOOL(buf)            ((bool_t)IXDR_GET_LONG(buf))
-#define IXDR_GET_ENUM(buf, t)         ((t)IXDR_GET_LONG(buf))
-#define IXDR_GET_SHORT(buf)           ((short)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_SHORT(buf)         ((u_short)IXDR_GET_LONG(buf))
-
-#define IXDR_PUT_BOOL(buf, v)         IXDR_PUT_LONG(buf, (long)(v))
-#define IXDR_PUT_ENUM(buf, v)         IXDR_PUT_LONG(buf, (long)(v))
-#define IXDR_PUT_SHORT(buf, v)        IXDR_PUT_LONG(buf, (long)(v))
-#define IXDR_PUT_U_SHORT(buf, v)      IXDR_PUT_LONG(buf, (long)(v))
-
-/*
- * These are the "generic" xdr routines.
- * None of these can have const applied because it's not possible to
- * know whether the call is a read or a write to the passed parameter
- * also, the XDR structure is always updated by some of these calls.
- */
-extern bool_t xdr_void (void) __THROW;
-extern bool_t xdr_short (XDR *__xdrs, short *__sp) __THROW;
-extern bool_t xdr_u_short (XDR *__xdrs, u_short *__usp) __THROW;
-extern bool_t xdr_int (XDR *__xdrs, int *__ip) __THROW;
-extern bool_t xdr_u_int (XDR *__xdrs, u_int *__up) __THROW;
-extern bool_t xdr_long (XDR *__xdrs, long *__lp) __THROW;
-extern bool_t xdr_u_long (XDR *__xdrs, u_long *__ulp) __THROW;
-extern bool_t xdr_hyper (XDR *__xdrs, quad_t *__llp) __THROW;
-extern bool_t xdr_u_hyper (XDR *__xdrs, u_quad_t *__ullp) __THROW;
-extern bool_t xdr_longlong_t (XDR *__xdrs, quad_t *__llp) __THROW;
-extern bool_t xdr_u_longlong_t (XDR *__xdrs, u_quad_t *__ullp) __THROW;
-extern bool_t xdr_int8_t (XDR *__xdrs, int8_t *__ip) __THROW;
-extern bool_t xdr_uint8_t (XDR *__xdrs, uint8_t *__up) __THROW;
-extern bool_t xdr_int16_t (XDR *__xdrs, int16_t *__ip) __THROW;
-extern bool_t xdr_uint16_t (XDR *__xdrs, uint16_t *__up) __THROW;
-extern bool_t xdr_int32_t (XDR *__xdrs, int32_t *__ip) __THROW;
-extern bool_t xdr_uint32_t (XDR *__xdrs, uint32_t *__up) __THROW;
-extern bool_t xdr_int64_t (XDR *__xdrs, int64_t *__ip) __THROW;
-extern bool_t xdr_uint64_t (XDR *__xdrs, uint64_t *__up) __THROW;
-extern bool_t xdr_quad_t (XDR *__xdrs, quad_t *__ip) __THROW;
-extern bool_t xdr_u_quad_t (XDR *__xdrs, u_quad_t *__up) __THROW;
-extern bool_t xdr_bool (XDR *__xdrs, bool_t *__bp) __THROW;
-extern bool_t xdr_enum (XDR *__xdrs, enum_t *__ep) __THROW;
-extern bool_t xdr_array (XDR * _xdrs, caddr_t *__addrp, u_int *__sizep,
-			 u_int __maxsize, u_int __elsize, xdrproc_t __elproc)
-     __THROW;
-extern bool_t xdr_bytes (XDR *__xdrs, char **__cpp, u_int *__sizep,
-			 u_int __maxsize) __THROW;
-extern bool_t xdr_opaque (XDR *__xdrs, caddr_t __cp, u_int __cnt) __THROW;
-extern bool_t xdr_string (XDR *__xdrs, char **__cpp, u_int __maxsize) __THROW;
-extern bool_t xdr_union (XDR *__xdrs, enum_t *__dscmp, char *__unp,
-			 const struct xdr_discrim *__choices,
-			 xdrproc_t __dfault) __THROW;
-extern bool_t xdr_char (XDR *__xdrs, char *__cp) __THROW;
-extern bool_t xdr_u_char (XDR *__xdrs, u_char *__cp) __THROW;
-extern bool_t xdr_vector (XDR *__xdrs, char *__basep, u_int __nelem,
-			  u_int __elemsize, xdrproc_t __xdr_elem) __THROW;
-extern bool_t xdr_float (XDR *__xdrs, float *__fp) __THROW;
-extern bool_t xdr_double (XDR *__xdrs, double *__dp) __THROW;
-extern bool_t xdr_reference (XDR *__xdrs, caddr_t *__xpp, u_int __size,
-			     xdrproc_t __proc) __THROW;
-extern bool_t xdr_pointer (XDR *__xdrs, char **__objpp,
-			   u_int __obj_size, xdrproc_t __xdr_obj) __THROW;
-extern bool_t xdr_wrapstring (XDR *__xdrs, char **__cpp) __THROW;
-extern u_long xdr_sizeof (xdrproc_t, void *) __THROW;
-
-/*
- * Common opaque bytes objects used by many rpc protocols;
- * declared here due to commonality.
- */
-#define MAX_NETOBJ_SZ 1024
-struct netobj
-{
-  u_int n_len;
-  char *n_bytes;
-};
-typedef struct netobj netobj;
-extern bool_t xdr_netobj (XDR *__xdrs, struct netobj *__np) __THROW;
-
-/*
- * These are the public routines for the various implementations of
- * xdr streams.
- */
-
-/* XDR using memory buffers */
-extern void xdrmem_create (XDR *__xdrs, const caddr_t __addr,
-			   u_int __size, enum xdr_op __xop) __THROW;
-
-/* XDR using stdio library */
-extern void xdrstdio_create (XDR *__xdrs, FILE *__file, enum xdr_op __xop)
-     __THROW;
-
-/* XDR pseudo records for tcp */
-extern void xdrrec_create (XDR *__xdrs, u_int __sendsize,
-			   u_int __recvsize, caddr_t __tcp_handle,
-			   int (*__readit) (char *, char *, int),
-			   int (*__writeit) (char *, char *, int)) __THROW;
-
-/* make end of xdr record */
-extern bool_t xdrrec_endofrecord (XDR *__xdrs, bool_t __sendnow) __THROW;
-
-/* move to beginning of next record */
-extern bool_t xdrrec_skiprecord (XDR *__xdrs) __THROW;
-
-/* true if no more input */
-extern bool_t xdrrec_eof (XDR *__xdrs) __THROW;
-
-/* free memory buffers for xdr */
-extern void xdr_free (xdrproc_t __proc, char *__objp) __THROW;
-
-__END_DECLS
-
-#endif /* rpc/xdr.h */
diff --git a/openflow/usr/include/rpcsvc/bootparam.h b/openflow/usr/include/rpcsvc/bootparam.h
deleted file mode 100644
index 0351a79..0000000
--- a/openflow/usr/include/rpcsvc/bootparam.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (C) 1999-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _RPCSVC_BOOTPARAM_H
-#define _RPCSVC_BOOTPARAM_H
-
-#include <rpcsvc/bootparam_prot.h>
-
-#endif  /* _RPCSVC_BOOTPARAM_H */
diff --git a/openflow/usr/include/rpcsvc/bootparam_prot.h b/openflow/usr/include/rpcsvc/bootparam_prot.h
deleted file mode 100644
index fbed446..0000000
--- a/openflow/usr/include/rpcsvc/bootparam_prot.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _BOOTPARAM_PROT_H_RPCGEN
-#define _BOOTPARAM_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rpc/types.h>
-#include <sys/time.h>
-#include <sys/errno.h>
-#include <nfs/nfs.h>
-#define MAX_MACHINE_NAME 255
-#define MAX_PATH_LEN 1024
-#define MAX_FILEID 32
-#define IP_ADDR_TYPE 1
-
-typedef char *bp_machine_name_t;
-
-typedef char *bp_path_t;
-
-typedef char *bp_fileid_t;
-
-struct ip_addr_t {
-	char net;
-	char host;
-	char lh;
-	char impno;
-};
-typedef struct ip_addr_t ip_addr_t;
-
-struct bp_address {
-	int address_type;
-	union {
-		ip_addr_t ip_addr;
-	} bp_address_u;
-};
-typedef struct bp_address bp_address;
-
-struct bp_whoami_arg {
-	bp_address client_address;
-};
-typedef struct bp_whoami_arg bp_whoami_arg;
-
-struct bp_whoami_res {
-	bp_machine_name_t client_name;
-	bp_machine_name_t domain_name;
-	bp_address router_address;
-};
-typedef struct bp_whoami_res bp_whoami_res;
-
-struct bp_getfile_arg {
-	bp_machine_name_t client_name;
-	bp_fileid_t file_id;
-};
-typedef struct bp_getfile_arg bp_getfile_arg;
-
-struct bp_getfile_res {
-	bp_machine_name_t server_name;
-	bp_address server_address;
-	bp_path_t server_path;
-};
-typedef struct bp_getfile_res bp_getfile_res;
-
-#define BOOTPARAMPROG 100026
-#define BOOTPARAMVERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define BOOTPARAMPROC_WHOAMI 1
-extern  bp_whoami_res * bootparamproc_whoami_1(bp_whoami_arg *, CLIENT *);
-extern  bp_whoami_res * bootparamproc_whoami_1_svc(bp_whoami_arg *, struct svc_req *);
-#define BOOTPARAMPROC_GETFILE 2
-extern  bp_getfile_res * bootparamproc_getfile_1(bp_getfile_arg *, CLIENT *);
-extern  bp_getfile_res * bootparamproc_getfile_1_svc(bp_getfile_arg *, struct svc_req *);
-extern int bootparamprog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define BOOTPARAMPROC_WHOAMI 1
-extern  bp_whoami_res * bootparamproc_whoami_1();
-extern  bp_whoami_res * bootparamproc_whoami_1_svc();
-#define BOOTPARAMPROC_GETFILE 2
-extern  bp_getfile_res * bootparamproc_getfile_1();
-extern  bp_getfile_res * bootparamproc_getfile_1_svc();
-extern int bootparamprog_1_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_bp_machine_name_t (XDR *, bp_machine_name_t*);
-extern  bool_t xdr_bp_path_t (XDR *, bp_path_t*);
-extern  bool_t xdr_bp_fileid_t (XDR *, bp_fileid_t*);
-extern  bool_t xdr_ip_addr_t (XDR *, ip_addr_t*);
-extern  bool_t xdr_bp_address (XDR *, bp_address*);
-extern  bool_t xdr_bp_whoami_arg (XDR *, bp_whoami_arg*);
-extern  bool_t xdr_bp_whoami_res (XDR *, bp_whoami_res*);
-extern  bool_t xdr_bp_getfile_arg (XDR *, bp_getfile_arg*);
-extern  bool_t xdr_bp_getfile_res (XDR *, bp_getfile_res*);
-
-#else /* K&R C */
-extern bool_t xdr_bp_machine_name_t ();
-extern bool_t xdr_bp_path_t ();
-extern bool_t xdr_bp_fileid_t ();
-extern bool_t xdr_ip_addr_t ();
-extern bool_t xdr_bp_address ();
-extern bool_t xdr_bp_whoami_arg ();
-extern bool_t xdr_bp_whoami_res ();
-extern bool_t xdr_bp_getfile_arg ();
-extern bool_t xdr_bp_getfile_res ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_BOOTPARAM_PROT_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/bootparam_prot.x b/openflow/usr/include/rpcsvc/bootparam_prot.x
deleted file mode 100644
index 117e428..0000000
--- a/openflow/usr/include/rpcsvc/bootparam_prot.x
+++ /dev/null
@@ -1,97 +0,0 @@
-/* @(#)bootparam_prot.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * RPC for bootparms service.
- * There are two procedures:
- *   WHOAMI takes a net address and returns a client name and also a
- *	likely net address for routing
- *   GETFILE takes a client name and file identifier and returns the
- *	server name, server net address and pathname for the file.
- *   file identifiers typically include root, swap, pub and dump
- */
-
-#ifdef RPC_HDR
-%#include <rpc/types.h>
-%#include <sys/time.h>
-%#include <sys/errno.h>
-%#include <nfs/nfs.h>
-#endif
-
-const MAX_MACHINE_NAME  = 255;
-const MAX_PATH_LEN	= 1024;
-const MAX_FILEID	= 32;
-const IP_ADDR_TYPE	= 1;
-
-typedef	string	bp_machine_name_t<MAX_MACHINE_NAME>;
-typedef	string	bp_path_t<MAX_PATH_LEN>;
-typedef	string	bp_fileid_t<MAX_FILEID>;
-
-struct	ip_addr_t {
-	char	net;
-	char	host;
-	char	lh;
-	char	impno;
-};
-
-union bp_address switch (int address_type) {
-	case IP_ADDR_TYPE:
-		ip_addr_t	ip_addr;
-};
-
-struct bp_whoami_arg {
-	bp_address		client_address;
-};
-
-struct bp_whoami_res {
-	bp_machine_name_t	client_name;
-	bp_machine_name_t	domain_name;
-	bp_address		router_address;
-};
-
-struct bp_getfile_arg {
-	bp_machine_name_t	client_name;
-	bp_fileid_t		file_id;
-};
-
-struct bp_getfile_res {
-	bp_machine_name_t	server_name;
-	bp_address		server_address;
-	bp_path_t		server_path;
-};
-
-program BOOTPARAMPROG {
-	version BOOTPARAMVERS {
-		bp_whoami_res	BOOTPARAMPROC_WHOAMI(bp_whoami_arg) = 1;
-		bp_getfile_res	BOOTPARAMPROC_GETFILE(bp_getfile_arg) = 2;
-	} = 1;
-} = 100026;
diff --git a/openflow/usr/include/rpcsvc/key_prot.h b/openflow/usr/include/rpcsvc/key_prot.h
deleted file mode 100644
index 4fbdbf4..0000000
--- a/openflow/usr/include/rpcsvc/key_prot.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _KEY_PROT_H_RPCGEN
-#define _KEY_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if 0
-#pragma ident "@(#)key_prot.x	1.7	94/04/29 SMI"
-#endif
-
-/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
-
-/*
- * Compiled from key_prot.x using rpcgen.
- * DO NOT EDIT THIS FILE!
- * This is NOT source code!
- */
-#define PROOT 3
-#define HEXMODULUS "d4a0ba0250b6fd2ec626e7efd637df76c716e22d0944b88b"
-#define HEXKEYBYTES 48
-#define KEYSIZE 192
-#define KEYBYTES 24
-#define KEYCHECKSUMSIZE 16
-
-enum keystatus {
-	KEY_SUCCESS = 0,
-	KEY_NOSECRET = 1,
-	KEY_UNKNOWN = 2,
-	KEY_SYSTEMERR = 3,
-};
-typedef enum keystatus keystatus;
-
-typedef char keybuf[HEXKEYBYTES];
-
-typedef char *netnamestr;
-
-struct cryptkeyarg {
-	netnamestr remotename;
-	des_block deskey;
-};
-typedef struct cryptkeyarg cryptkeyarg;
-
-struct cryptkeyarg2 {
-	netnamestr remotename;
-	netobj remotekey;
-	des_block deskey;
-};
-typedef struct cryptkeyarg2 cryptkeyarg2;
-
-struct cryptkeyres {
-	keystatus status;
-	union {
-		des_block deskey;
-	} cryptkeyres_u;
-};
-typedef struct cryptkeyres cryptkeyres;
-#define MAXGIDS 16
-
-struct unixcred {
-	u_int uid;
-	u_int gid;
-	struct {
-		u_int gids_len;
-		u_int *gids_val;
-	} gids;
-};
-typedef struct unixcred unixcred;
-
-struct getcredres {
-	keystatus status;
-	union {
-		unixcred cred;
-	} getcredres_u;
-};
-typedef struct getcredres getcredres;
-
-struct key_netstarg {
-	keybuf st_priv_key;
-	keybuf st_pub_key;
-	netnamestr st_netname;
-};
-typedef struct key_netstarg key_netstarg;
-
-struct key_netstres {
-	keystatus status;
-	union {
-		key_netstarg knet;
-	} key_netstres_u;
-};
-typedef struct key_netstres key_netstres;
-
-#ifndef opaque
-#define opaque char
-#endif
-
-
-#define KEY_PROG 100029
-#define KEY_VERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define KEY_SET 1
-extern  keystatus * key_set_1(char *, CLIENT *);
-extern  keystatus * key_set_1_svc(char *, struct svc_req *);
-#define KEY_ENCRYPT 2
-extern  cryptkeyres * key_encrypt_1(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_encrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define KEY_DECRYPT 3
-extern  cryptkeyres * key_decrypt_1(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_decrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define KEY_GEN 4
-extern  des_block * key_gen_1(void *, CLIENT *);
-extern  des_block * key_gen_1_svc(void *, struct svc_req *);
-#define KEY_GETCRED 5
-extern  getcredres * key_getcred_1(netnamestr *, CLIENT *);
-extern  getcredres * key_getcred_1_svc(netnamestr *, struct svc_req *);
-extern int key_prog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define KEY_SET 1
-extern  keystatus * key_set_1();
-extern  keystatus * key_set_1_svc();
-#define KEY_ENCRYPT 2
-extern  cryptkeyres * key_encrypt_1();
-extern  cryptkeyres * key_encrypt_1_svc();
-#define KEY_DECRYPT 3
-extern  cryptkeyres * key_decrypt_1();
-extern  cryptkeyres * key_decrypt_1_svc();
-#define KEY_GEN 4
-extern  des_block * key_gen_1();
-extern  des_block * key_gen_1_svc();
-#define KEY_GETCRED 5
-extern  getcredres * key_getcred_1();
-extern  getcredres * key_getcred_1_svc();
-extern int key_prog_1_freeresult ();
-#endif /* K&R C */
-#define KEY_VERS2 2
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  keystatus * key_set_2(char *, CLIENT *);
-extern  keystatus * key_set_2_svc(char *, struct svc_req *);
-extern  cryptkeyres * key_encrypt_2(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_encrypt_2_svc(cryptkeyarg *, struct svc_req *);
-extern  cryptkeyres * key_decrypt_2(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_decrypt_2_svc(cryptkeyarg *, struct svc_req *);
-extern  des_block * key_gen_2(void *, CLIENT *);
-extern  des_block * key_gen_2_svc(void *, struct svc_req *);
-extern  getcredres * key_getcred_2(netnamestr *, CLIENT *);
-extern  getcredres * key_getcred_2_svc(netnamestr *, struct svc_req *);
-#define KEY_ENCRYPT_PK 6
-extern  cryptkeyres * key_encrypt_pk_2(cryptkeyarg2 *, CLIENT *);
-extern  cryptkeyres * key_encrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define KEY_DECRYPT_PK 7
-extern  cryptkeyres * key_decrypt_pk_2(cryptkeyarg2 *, CLIENT *);
-extern  cryptkeyres * key_decrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define KEY_NET_PUT 8
-extern  keystatus * key_net_put_2(key_netstarg *, CLIENT *);
-extern  keystatus * key_net_put_2_svc(key_netstarg *, struct svc_req *);
-#define KEY_NET_GET 9
-extern  key_netstres * key_net_get_2(void *, CLIENT *);
-extern  key_netstres * key_net_get_2_svc(void *, struct svc_req *);
-#define KEY_GET_CONV 10
-extern  cryptkeyres * key_get_conv_2(char *, CLIENT *);
-extern  cryptkeyres * key_get_conv_2_svc(char *, struct svc_req *);
-extern int key_prog_2_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-extern  keystatus * key_set_2();
-extern  keystatus * key_set_2_svc();
-extern  cryptkeyres * key_encrypt_2();
-extern  cryptkeyres * key_encrypt_2_svc();
-extern  cryptkeyres * key_decrypt_2();
-extern  cryptkeyres * key_decrypt_2_svc();
-extern  des_block * key_gen_2();
-extern  des_block * key_gen_2_svc();
-extern  getcredres * key_getcred_2();
-extern  getcredres * key_getcred_2_svc();
-#define KEY_ENCRYPT_PK 6
-extern  cryptkeyres * key_encrypt_pk_2();
-extern  cryptkeyres * key_encrypt_pk_2_svc();
-#define KEY_DECRYPT_PK 7
-extern  cryptkeyres * key_decrypt_pk_2();
-extern  cryptkeyres * key_decrypt_pk_2_svc();
-#define KEY_NET_PUT 8
-extern  keystatus * key_net_put_2();
-extern  keystatus * key_net_put_2_svc();
-#define KEY_NET_GET 9
-extern  key_netstres * key_net_get_2();
-extern  key_netstres * key_net_get_2_svc();
-#define KEY_GET_CONV 10
-extern  cryptkeyres * key_get_conv_2();
-extern  cryptkeyres * key_get_conv_2_svc();
-extern int key_prog_2_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_keystatus (XDR *, keystatus*);
-extern  bool_t xdr_keybuf (XDR *, keybuf);
-extern  bool_t xdr_netnamestr (XDR *, netnamestr*);
-extern  bool_t xdr_cryptkeyarg (XDR *, cryptkeyarg*);
-extern  bool_t xdr_cryptkeyarg2 (XDR *, cryptkeyarg2*);
-extern  bool_t xdr_cryptkeyres (XDR *, cryptkeyres*);
-extern  bool_t xdr_unixcred (XDR *, unixcred*);
-extern  bool_t xdr_getcredres (XDR *, getcredres*);
-extern  bool_t xdr_key_netstarg (XDR *, key_netstarg*);
-extern  bool_t xdr_key_netstres (XDR *, key_netstres*);
-
-#else /* K&R C */
-extern bool_t xdr_keystatus ();
-extern bool_t xdr_keybuf ();
-extern bool_t xdr_netnamestr ();
-extern bool_t xdr_cryptkeyarg ();
-extern bool_t xdr_cryptkeyarg2 ();
-extern bool_t xdr_cryptkeyres ();
-extern bool_t xdr_unixcred ();
-extern bool_t xdr_getcredres ();
-extern bool_t xdr_key_netstarg ();
-extern bool_t xdr_key_netstres ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_KEY_PROT_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/key_prot.x b/openflow/usr/include/rpcsvc/key_prot.x
deleted file mode 100644
index 9baf943..0000000
--- a/openflow/usr/include/rpcsvc/key_prot.x
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Key server protocol definition
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The keyserver is a public key storage/encryption/decryption service
- * The encryption method used is based on the Diffie-Hellman exponential
- * key exchange technology.
- *
- * The key server is local to each machine, akin to the portmapper.
- * Under TI-RPC, communication with the keyserver is through the
- * loopback transport.
- *
- * NOTE: This .x file generates the USER level headers for the keyserver.
- * the KERNEL level headers are created by hand as they kernel has special
- * requirements.
- */
-
-%#if 0
-%#pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI"
-%#endif
-%
-%/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
-%
-%/*
-% * Compiled from key_prot.x using rpcgen.
-% * DO NOT EDIT THIS FILE!
-% * This is NOT source code!
-% */
-
-/*
- * PROOT and MODULUS define the way the Diffie-Hellman key is generated.
- *
- * MODULUS should be chosen as a prime of the form: MODULUS == 2*p + 1,
- * where p is also prime.
- *
- * PROOT satisfies the following two conditions:
- * (1) (PROOT ** 2) % MODULUS != 1
- * (2) (PROOT ** p) % MODULUS != 1
- *
- */
-
-const PROOT = 3;
-const HEXMODULUS = "d4a0ba0250b6fd2ec626e7efd637df76c716e22d0944b88b";
-
-const HEXKEYBYTES = 48;		/* HEXKEYBYTES == strlen(HEXMODULUS) */
-const KEYSIZE = 192;		/* KEYSIZE == bit length of key */
-const KEYBYTES = 24;		/* byte length of key */
-
-/*
- * The first 16 hex digits of the encrypted secret key are used as
- * a checksum in the database.
- */
-const KEYCHECKSUMSIZE = 16;
-
-/*
- * status of operation
- */
-enum keystatus {
-	KEY_SUCCESS,	/* no problems */
-	KEY_NOSECRET,	/* no secret key stored */
-	KEY_UNKNOWN,	/* unknown netname */
-	KEY_SYSTEMERR 	/* system error (out of memory, encryption failure) */
-};
-
-typedef opaque keybuf[HEXKEYBYTES];	/* store key in hex */
-
-typedef string netnamestr<MAXNETNAMELEN>;
-
-/*
- * Argument to ENCRYPT or DECRYPT
- */
-struct cryptkeyarg {
-	netnamestr remotename;
-	des_block deskey;
-};
-
-/*
- * Argument to ENCRYPT_PK or DECRYPT_PK
- */
-struct cryptkeyarg2 {
-	netnamestr remotename;
-	netobj	remotekey;	/* Contains a length up to 1024 bytes */
-	des_block deskey;
-};
-
-
-/*
- * Result of ENCRYPT, DECRYPT, ENCRYPT_PK, and DECRYPT_PK
- */
-union cryptkeyres switch (keystatus status) {
-case KEY_SUCCESS:
-	des_block deskey;
-default:
-	void;
-};
-
-const MAXGIDS  = 16;	/* max number of gids in gid list */
-
-/*
- * Unix credential
- */
-struct unixcred {
-	u_int uid;
-	u_int gid;
-	u_int gids<MAXGIDS>;
-};
-
-/*
- * Result returned from GETCRED
- */
-union getcredres switch (keystatus status) {
-case KEY_SUCCESS:
-	unixcred cred;
-default:
-	void;
-};
-/*
- * key_netstarg;
- */
-
-struct key_netstarg {
-	keybuf st_priv_key;
-	keybuf st_pub_key;
-	netnamestr st_netname;
-};
-
-union key_netstres switch (keystatus status){
-case KEY_SUCCESS:
-	key_netstarg knet;
-default:
-	void;
-};
-
-#ifdef RPC_HDR
-%
-%#ifndef opaque
-%#define opaque char
-%#endif
-%
-#endif
-program KEY_PROG {
-	version KEY_VERS {
-
-		/*
-		 * This is my secret key.
-	 	 * Store it for me.
-		 */
-		keystatus
-		KEY_SET(keybuf) = 1;
-
-		/*
-		 * I want to talk to X.
-		 * Encrypt a conversation key for me.
-	 	 */
-		cryptkeyres
-		KEY_ENCRYPT(cryptkeyarg) = 2;
-
-		/*
-		 * X just sent me a message.
-		 * Decrypt the conversation key for me.
-		 */
-		cryptkeyres
-		KEY_DECRYPT(cryptkeyarg) = 3;
-
-		/*
-		 * Generate a secure conversation key for me
-		 */
-		des_block
-		KEY_GEN(void) = 4;
-
-		/*
-		 * Get me the uid, gid and group-access-list associated
-		 * with this netname (for kernel which cannot use NIS)
-		 */
-		getcredres
-		KEY_GETCRED(netnamestr) = 5;
-	} = 1;
-	version KEY_VERS2 {
-
-		/*
-		 * #######
-		 * Procedures 1-5 are identical to version 1
-		 * #######
-		 */
-
-		/*
-		 * This is my secret key.
-	 	 * Store it for me.
-		 */
-		keystatus
-		KEY_SET(keybuf) = 1;
-
-		/*
-		 * I want to talk to X.
-		 * Encrypt a conversation key for me.
-	 	 */
-		cryptkeyres
-		KEY_ENCRYPT(cryptkeyarg) = 2;
-
-		/*
-		 * X just sent me a message.
-		 * Decrypt the conversation key for me.
-		 */
-		cryptkeyres
-		KEY_DECRYPT(cryptkeyarg) = 3;
-
-		/*
-		 * Generate a secure conversation key for me
-		 */
-		des_block
-		KEY_GEN(void) = 4;
-
-		/*
-		 * Get me the uid, gid and group-access-list associated
-		 * with this netname (for kernel which cannot use NIS)
-		 */
-		getcredres
-		KEY_GETCRED(netnamestr) = 5;
-
-		/*
-		 * I want to talk to X. and I know X's public key
-		 * Encrypt a conversation key for me.
-	 	 */
-		cryptkeyres
-		KEY_ENCRYPT_PK(cryptkeyarg2) = 6;
-
-		/*
-		 * X just sent me a message. and I know X's public key
-		 * Decrypt the conversation key for me.
-		 */
-		cryptkeyres
-		KEY_DECRYPT_PK(cryptkeyarg2) = 7;
-
-		/*
-		 * Store my public key, netname and private key.
-		 */
-		keystatus
-		KEY_NET_PUT(key_netstarg) = 8;
-
-		/*
-		 * Retrieve my public key, netname and private key.
-		 */
- 		key_netstres
-		KEY_NET_GET(void) = 9;
-
-		/*
-		 * Return me the conversation key that is constructed
-		 * from my secret key and this publickey.
-		 */
-
-		cryptkeyres
-		KEY_GET_CONV(keybuf) = 10;
-
-
-	} = 2;
-} = 100029;
diff --git a/openflow/usr/include/rpcsvc/klm_prot.h b/openflow/usr/include/rpcsvc/klm_prot.h
deleted file mode 100644
index 6ec281e..0000000
--- a/openflow/usr/include/rpcsvc/klm_prot.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _KLM_PROT_H_RPCGEN
-#define _KLM_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LM_MAXSTRLEN 1024
-
-enum klm_stats {
-	klm_granted = 0,
-	klm_denied = 1,
-	klm_denied_nolocks = 2,
-	klm_working = 3,
-};
-typedef enum klm_stats klm_stats;
-
-struct klm_lock {
-	char *server_name;
-	netobj fh;
-	int pid;
-	u_int l_offset;
-	u_int l_len;
-};
-typedef struct klm_lock klm_lock;
-
-struct klm_holder {
-	bool_t exclusive;
-	int svid;
-	u_int l_offset;
-	u_int l_len;
-};
-typedef struct klm_holder klm_holder;
-
-struct klm_stat {
-	klm_stats stat;
-};
-typedef struct klm_stat klm_stat;
-
-struct klm_testrply {
-	klm_stats stat;
-	union {
-		struct klm_holder holder;
-	} klm_testrply_u;
-};
-typedef struct klm_testrply klm_testrply;
-
-struct klm_lockargs {
-	bool_t block;
-	bool_t exclusive;
-	struct klm_lock alock;
-};
-typedef struct klm_lockargs klm_lockargs;
-
-struct klm_testargs {
-	bool_t exclusive;
-	struct klm_lock alock;
-};
-typedef struct klm_testargs klm_testargs;
-
-struct klm_unlockargs {
-	struct klm_lock alock;
-};
-typedef struct klm_unlockargs klm_unlockargs;
-
-#define KLM_PROG 100020
-#define KLM_VERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define KLM_TEST 1
-extern  klm_testrply * klm_test_1(struct klm_testargs *, CLIENT *);
-extern  klm_testrply * klm_test_1_svc(struct klm_testargs *, struct svc_req *);
-#define KLM_LOCK 2
-extern  klm_stat * klm_lock_1(struct klm_lockargs *, CLIENT *);
-extern  klm_stat * klm_lock_1_svc(struct klm_lockargs *, struct svc_req *);
-#define KLM_CANCEL 3
-extern  klm_stat * klm_cancel_1(struct klm_lockargs *, CLIENT *);
-extern  klm_stat * klm_cancel_1_svc(struct klm_lockargs *, struct svc_req *);
-#define KLM_UNLOCK 4
-extern  klm_stat * klm_unlock_1(struct klm_unlockargs *, CLIENT *);
-extern  klm_stat * klm_unlock_1_svc(struct klm_unlockargs *, struct svc_req *);
-extern int klm_prog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define KLM_TEST 1
-extern  klm_testrply * klm_test_1();
-extern  klm_testrply * klm_test_1_svc();
-#define KLM_LOCK 2
-extern  klm_stat * klm_lock_1();
-extern  klm_stat * klm_lock_1_svc();
-#define KLM_CANCEL 3
-extern  klm_stat * klm_cancel_1();
-extern  klm_stat * klm_cancel_1_svc();
-#define KLM_UNLOCK 4
-extern  klm_stat * klm_unlock_1();
-extern  klm_stat * klm_unlock_1_svc();
-extern int klm_prog_1_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_klm_stats (XDR *, klm_stats*);
-extern  bool_t xdr_klm_lock (XDR *, klm_lock*);
-extern  bool_t xdr_klm_holder (XDR *, klm_holder*);
-extern  bool_t xdr_klm_stat (XDR *, klm_stat*);
-extern  bool_t xdr_klm_testrply (XDR *, klm_testrply*);
-extern  bool_t xdr_klm_lockargs (XDR *, klm_lockargs*);
-extern  bool_t xdr_klm_testargs (XDR *, klm_testargs*);
-extern  bool_t xdr_klm_unlockargs (XDR *, klm_unlockargs*);
-
-#else /* K&R C */
-extern bool_t xdr_klm_stats ();
-extern bool_t xdr_klm_lock ();
-extern bool_t xdr_klm_holder ();
-extern bool_t xdr_klm_stat ();
-extern bool_t xdr_klm_testrply ();
-extern bool_t xdr_klm_lockargs ();
-extern bool_t xdr_klm_testargs ();
-extern bool_t xdr_klm_unlockargs ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_KLM_PROT_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/klm_prot.x b/openflow/usr/include/rpcsvc/klm_prot.x
deleted file mode 100644
index aee5b1a..0000000
--- a/openflow/usr/include/rpcsvc/klm_prot.x
+++ /dev/null
@@ -1,130 +0,0 @@
-/* @(#)klm_prot.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*
- * Kernel/lock manager protocol definition
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * protocol used between the UNIX kernel (the "client") and the
- * local lock manager.  The local lock manager is a deamon running
- * above the kernel.
- */
-
-const	LM_MAXSTRLEN = 1024;
-
-/*
- * lock manager status returns
- */
-enum klm_stats {
-	klm_granted = 0,	/* lock is granted */
-	klm_denied = 1,		/* lock is denied */
-	klm_denied_nolocks = 2, /* no lock entry available */
-	klm_working = 3		/* lock is being processed */
-};
-
-/*
- * lock manager lock identifier
- */
-struct klm_lock {
-	string server_name<LM_MAXSTRLEN>;
-	netobj fh;		/* a counted file handle */
-	int pid;		/* holder of the lock */
-	unsigned l_offset;	/* beginning offset of the lock */
-	unsigned l_len;		/* byte length of the lock;
-				 * zero means through end of file */
-};
-
-/*
- * lock holder identifier
- */
-struct klm_holder {
-	bool exclusive;		/* FALSE if shared lock */
-	int svid;		/* holder of the lock (pid) */
-	unsigned l_offset;	/* beginning offset of the lock */
-	unsigned l_len;		/* byte length of the lock;
-				 * zero means through end of file */
-};
-
-/*
- * reply to KLM_LOCK / KLM_UNLOCK / KLM_CANCEL
- */
-struct klm_stat {
-	klm_stats stat;
-};
-
-/*
- * reply to a KLM_TEST call
- */
-union klm_testrply switch (klm_stats stat) {
-	case klm_denied:
-		struct klm_holder holder;
-	default: /* All other cases return no arguments */
-		void;
-};
-
-
-/*
- * arguments to KLM_LOCK
- */
-struct klm_lockargs {
-	bool block;
-	bool exclusive;
-	struct klm_lock alock;
-};
-
-/*
- * arguments to KLM_TEST
- */
-struct klm_testargs {
-	bool exclusive;
-	struct klm_lock alock;
-};
-
-/*
- * arguments to KLM_UNLOCK
- */
-struct klm_unlockargs {
-	struct klm_lock alock;
-};
-
-program KLM_PROG {
-	version KLM_VERS {
-
-		klm_testrply	KLM_TEST (struct klm_testargs) =	1;
-
-		klm_stat	KLM_LOCK (struct klm_lockargs) =	2;
-
-		klm_stat	KLM_CANCEL (struct klm_lockargs) =	3;
-		/* klm_granted=> the cancel request fails due to lock is already granted */
-		/* klm_denied=> the cancel request successfully aborts
-lock request  */
-
-		klm_stat	KLM_UNLOCK (struct klm_unlockargs) =	4;
-	} = 1;
-} = 100020;
diff --git a/openflow/usr/include/rpcsvc/mount.h b/openflow/usr/include/rpcsvc/mount.h
deleted file mode 100644
index de22f29..0000000
--- a/openflow/usr/include/rpcsvc/mount.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _MOUNT_H_RPCGEN
-#define _MOUNT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MNTPATHLEN 1024
-#define MNTNAMLEN 255
-#define FHSIZE 32
-
-typedef char fhandle[FHSIZE];
-
-struct fhstatus {
-	u_int fhs_status;
-	union {
-		fhandle fhs_fhandle;
-	} fhstatus_u;
-};
-typedef struct fhstatus fhstatus;
-
-typedef char *dirpath;
-
-typedef char *name;
-
-typedef struct mountbody *mountlist;
-
-struct mountbody {
-	name ml_hostname;
-	dirpath ml_directory;
-	mountlist ml_next;
-};
-typedef struct mountbody mountbody;
-
-typedef struct groupnode *groups;
-
-struct groupnode {
-	name gr_name;
-	groups gr_next;
-};
-typedef struct groupnode groupnode;
-
-typedef struct exportnode *exports;
-
-struct exportnode {
-	dirpath ex_dir;
-	groups ex_groups;
-	exports ex_next;
-};
-typedef struct exportnode exportnode;
-
-#define MOUNTPROG 100005
-#define MOUNTVERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define MOUNTPROC_NULL 0
-extern  void * mountproc_null_1(void *, CLIENT *);
-extern  void * mountproc_null_1_svc(void *, struct svc_req *);
-#define MOUNTPROC_MNT 1
-extern  fhstatus * mountproc_mnt_1(dirpath *, CLIENT *);
-extern  fhstatus * mountproc_mnt_1_svc(dirpath *, struct svc_req *);
-#define MOUNTPROC_DUMP 2
-extern  mountlist * mountproc_dump_1(void *, CLIENT *);
-extern  mountlist * mountproc_dump_1_svc(void *, struct svc_req *);
-#define MOUNTPROC_UMNT 3
-extern  void * mountproc_umnt_1(dirpath *, CLIENT *);
-extern  void * mountproc_umnt_1_svc(dirpath *, struct svc_req *);
-#define MOUNTPROC_UMNTALL 4
-extern  void * mountproc_umntall_1(void *, CLIENT *);
-extern  void * mountproc_umntall_1_svc(void *, struct svc_req *);
-#define MOUNTPROC_EXPORT 5
-extern  exports * mountproc_export_1(void *, CLIENT *);
-extern  exports * mountproc_export_1_svc(void *, struct svc_req *);
-#define MOUNTPROC_EXPORTALL 6
-extern  exports * mountproc_exportall_1(void *, CLIENT *);
-extern  exports * mountproc_exportall_1_svc(void *, struct svc_req *);
-extern int mountprog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define MOUNTPROC_NULL 0
-extern  void * mountproc_null_1();
-extern  void * mountproc_null_1_svc();
-#define MOUNTPROC_MNT 1
-extern  fhstatus * mountproc_mnt_1();
-extern  fhstatus * mountproc_mnt_1_svc();
-#define MOUNTPROC_DUMP 2
-extern  mountlist * mountproc_dump_1();
-extern  mountlist * mountproc_dump_1_svc();
-#define MOUNTPROC_UMNT 3
-extern  void * mountproc_umnt_1();
-extern  void * mountproc_umnt_1_svc();
-#define MOUNTPROC_UMNTALL 4
-extern  void * mountproc_umntall_1();
-extern  void * mountproc_umntall_1_svc();
-#define MOUNTPROC_EXPORT 5
-extern  exports * mountproc_export_1();
-extern  exports * mountproc_export_1_svc();
-#define MOUNTPROC_EXPORTALL 6
-extern  exports * mountproc_exportall_1();
-extern  exports * mountproc_exportall_1_svc();
-extern int mountprog_1_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_fhandle (XDR *, fhandle);
-extern  bool_t xdr_fhstatus (XDR *, fhstatus*);
-extern  bool_t xdr_dirpath (XDR *, dirpath*);
-extern  bool_t xdr_name (XDR *, name*);
-extern  bool_t xdr_mountlist (XDR *, mountlist*);
-extern  bool_t xdr_mountbody (XDR *, mountbody*);
-extern  bool_t xdr_groups (XDR *, groups*);
-extern  bool_t xdr_groupnode (XDR *, groupnode*);
-extern  bool_t xdr_exports (XDR *, exports*);
-extern  bool_t xdr_exportnode (XDR *, exportnode*);
-
-#else /* K&R C */
-extern bool_t xdr_fhandle ();
-extern bool_t xdr_fhstatus ();
-extern bool_t xdr_dirpath ();
-extern bool_t xdr_name ();
-extern bool_t xdr_mountlist ();
-extern bool_t xdr_mountbody ();
-extern bool_t xdr_groups ();
-extern bool_t xdr_groupnode ();
-extern bool_t xdr_exports ();
-extern bool_t xdr_exportnode ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_MOUNT_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/mount.x b/openflow/usr/include/rpcsvc/mount.x
deleted file mode 100644
index ed3b339..0000000
--- a/openflow/usr/include/rpcsvc/mount.x
+++ /dev/null
@@ -1,161 +0,0 @@
-/* @(#)mount.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Protocol description for the mount program
- */
-
-
-const MNTPATHLEN = 1024;	/* maximum bytes in a pathname argument */
-const MNTNAMLEN = 255;		/* maximum bytes in a name argument */
-const FHSIZE = 32;		/* size in bytes of a file handle */
-
-/*
- * The fhandle is the file handle that the server passes to the client.
- * All file operations are done using the file handles to refer to a file
- * or a directory. The file handle can contain whatever information the
- * server needs to distinguish an individual file.
- */
-typedef opaque fhandle[FHSIZE];
-
-/*
- * If a status of zero is returned, the call completed successfully, and
- * a file handle for the directory follows. A non-zero status indicates
- * some sort of error. The status corresponds with UNIX error numbers.
- */
-union fhstatus switch (unsigned fhs_status) {
-case 0:
-	fhandle fhs_fhandle;
-default:
-	void;
-};
-
-/*
- * The type dirpath is the pathname of a directory
- */
-typedef string dirpath<MNTPATHLEN>;
-
-/*
- * The type name is used for arbitrary names (hostnames, groupnames)
- */
-typedef string name<MNTNAMLEN>;
-
-/*
- * A list of who has what mounted
- */
-typedef struct mountbody *mountlist;
-struct mountbody {
-	name ml_hostname;
-	dirpath ml_directory;
-	mountlist ml_next;
-};
-
-/*
- * A list of netgroups
- */
-typedef struct groupnode *groups;
-struct groupnode {
-	name gr_name;
-	groups gr_next;
-};
-
-/*
- * A list of what is exported and to whom
- */
-typedef struct exportnode *exports;
-struct exportnode {
-	dirpath ex_dir;
-	groups ex_groups;
-	exports ex_next;
-};
-
-program MOUNTPROG {
-	/*
-	 * Version one of the mount protocol communicates with version two
-	 * of the NFS protocol. The only connecting point is the fhandle
-	 * structure, which is the same for both protocols.
-	 */
-	version MOUNTVERS {
-		/*
-		 * Does no work. It is made available in all RPC services
-		 * to allow server response testing and timing
-		 */
-		void
-		MOUNTPROC_NULL(void) = 0;
-
-		/*
-		 * If fhs_status is 0, then fhs_fhandle contains the
-		 * file handle for the directory. This file handle may
-		 * be used in the NFS protocol. This procedure also adds
-		 * a new entry to the mount list for this client mounting
-		 * the directory.
-		 * Unix authentication required.
-		 */
-		fhstatus
-		MOUNTPROC_MNT(dirpath) = 1;
-
-		/*
-		 * Returns the list of remotely mounted filesystems. The
-		 * mountlist contains one entry for each hostname and
-		 * directory pair.
-		 */
-		mountlist
-		MOUNTPROC_DUMP(void) = 2;
-
-		/*
-		 * Removes the mount list entry for the directory
-		 * Unix authentication required.
-		 */
-		void
-		MOUNTPROC_UMNT(dirpath) = 3;
-
-		/*
-		 * Removes all of the mount list entries for this client
-		 * Unix authentication required.
-		 */
-		void
-		MOUNTPROC_UMNTALL(void) = 4;
-
-		/*
-		 * Returns a list of all the exported filesystems, and which
-		 * machines are allowed to import it.
-		 */
-		exports
-		MOUNTPROC_EXPORT(void)  = 5;
-
-		/*
-		 * Identical to MOUNTPROC_EXPORT above
-		 */
-		exports
-		MOUNTPROC_EXPORTALL(void) = 6;
-	} = 1;
-} = 100005;
diff --git a/openflow/usr/include/rpcsvc/nfs_prot.h b/openflow/usr/include/rpcsvc/nfs_prot.h
deleted file mode 100644
index 6cf626a..0000000
--- a/openflow/usr/include/rpcsvc/nfs_prot.h
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NFS_PROT_H_RPCGEN
-#define _NFS_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define NFS_PORT 2049
-#define NFS_MAXDATA 8192
-#define NFS_MAXPATHLEN 1024
-#define NFS_MAXNAMLEN 255
-#define NFS_FHSIZE 32
-#define NFS_COOKIESIZE 4
-#define NFS_FIFO_DEV -1
-#define NFSMODE_FMT 0170000
-#define NFSMODE_DIR 0040000
-#define NFSMODE_CHR 0020000
-#define NFSMODE_BLK 0060000
-#define NFSMODE_REG 0100000
-#define NFSMODE_LNK 0120000
-#define NFSMODE_SOCK 0140000
-#define NFSMODE_FIFO 0010000
-
-enum nfsstat {
-	NFS_OK = 0,
-	NFSERR_PERM = 1,
-	NFSERR_NOENT = 2,
-	NFSERR_IO = 5,
-	NFSERR_NXIO = 6,
-	NFSERR_ACCES = 13,
-	NFSERR_EXIST = 17,
-	NFSERR_NODEV = 19,
-	NFSERR_NOTDIR = 20,
-	NFSERR_ISDIR = 21,
-	NFSERR_FBIG = 27,
-	NFSERR_NOSPC = 28,
-	NFSERR_ROFS = 30,
-	NFSERR_NAMETOOLONG = 63,
-	NFSERR_NOTEMPTY = 66,
-	NFSERR_DQUOT = 69,
-	NFSERR_STALE = 70,
-	NFSERR_WFLUSH = 99,
-};
-typedef enum nfsstat nfsstat;
-
-enum ftype {
-	NFNON = 0,
-	NFREG = 1,
-	NFDIR = 2,
-	NFBLK = 3,
-	NFCHR = 4,
-	NFLNK = 5,
-	NFSOCK = 6,
-	NFBAD = 7,
-	NFFIFO = 8,
-};
-typedef enum ftype ftype;
-
-struct nfs_fh {
-	char data[NFS_FHSIZE];
-};
-typedef struct nfs_fh nfs_fh;
-
-struct nfstime {
-	u_int seconds;
-	u_int useconds;
-};
-typedef struct nfstime nfstime;
-
-struct fattr {
-	ftype type;
-	u_int mode;
-	u_int nlink;
-	u_int uid;
-	u_int gid;
-	u_int size;
-	u_int blocksize;
-	u_int rdev;
-	u_int blocks;
-	u_int fsid;
-	u_int fileid;
-	nfstime atime;
-	nfstime mtime;
-	nfstime ctime;
-};
-typedef struct fattr fattr;
-
-struct sattr {
-	u_int mode;
-	u_int uid;
-	u_int gid;
-	u_int size;
-	nfstime atime;
-	nfstime mtime;
-};
-typedef struct sattr sattr;
-
-typedef char *filename;
-
-typedef char *nfspath;
-
-struct attrstat {
-	nfsstat status;
-	union {
-		fattr attributes;
-	} attrstat_u;
-};
-typedef struct attrstat attrstat;
-
-struct sattrargs {
-	nfs_fh file;
-	sattr attributes;
-};
-typedef struct sattrargs sattrargs;
-
-struct diropargs {
-	nfs_fh dir;
-	filename name;
-};
-typedef struct diropargs diropargs;
-
-struct diropokres {
-	nfs_fh file;
-	fattr attributes;
-};
-typedef struct diropokres diropokres;
-
-struct diropres {
-	nfsstat status;
-	union {
-		diropokres diropres;
-	} diropres_u;
-};
-typedef struct diropres diropres;
-
-struct readlinkres {
-	nfsstat status;
-	union {
-		nfspath data;
-	} readlinkres_u;
-};
-typedef struct readlinkres readlinkres;
-
-struct readargs {
-	nfs_fh file;
-	u_int offset;
-	u_int count;
-	u_int totalcount;
-};
-typedef struct readargs readargs;
-
-struct readokres {
-	fattr attributes;
-	struct {
-		u_int data_len;
-		char *data_val;
-	} data;
-};
-typedef struct readokres readokres;
-
-struct readres {
-	nfsstat status;
-	union {
-		readokres reply;
-	} readres_u;
-};
-typedef struct readres readres;
-
-struct writeargs {
-	nfs_fh file;
-	u_int beginoffset;
-	u_int offset;
-	u_int totalcount;
-	struct {
-		u_int data_len;
-		char *data_val;
-	} data;
-};
-typedef struct writeargs writeargs;
-
-struct createargs {
-	diropargs where;
-	sattr attributes;
-};
-typedef struct createargs createargs;
-
-struct renameargs {
-	diropargs from;
-	diropargs to;
-};
-typedef struct renameargs renameargs;
-
-struct linkargs {
-	nfs_fh from;
-	diropargs to;
-};
-typedef struct linkargs linkargs;
-
-struct symlinkargs {
-	diropargs from;
-	nfspath to;
-	sattr attributes;
-};
-typedef struct symlinkargs symlinkargs;
-
-typedef char nfscookie[NFS_COOKIESIZE];
-
-struct readdirargs {
-	nfs_fh dir;
-	nfscookie cookie;
-	u_int count;
-};
-typedef struct readdirargs readdirargs;
-
-struct entry {
-	u_int fileid;
-	filename name;
-	nfscookie cookie;
-	struct entry *nextentry;
-};
-typedef struct entry entry;
-
-struct dirlist {
-	entry *entries;
-	bool_t eof;
-};
-typedef struct dirlist dirlist;
-
-struct readdirres {
-	nfsstat status;
-	union {
-		dirlist reply;
-	} readdirres_u;
-};
-typedef struct readdirres readdirres;
-
-struct statfsokres {
-	u_int tsize;
-	u_int bsize;
-	u_int blocks;
-	u_int bfree;
-	u_int bavail;
-};
-typedef struct statfsokres statfsokres;
-
-struct statfsres {
-	nfsstat status;
-	union {
-		statfsokres reply;
-	} statfsres_u;
-};
-typedef struct statfsres statfsres;
-
-#define NFS_PROGRAM 100003
-#define NFS_VERSION 2
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define NFSPROC_NULL 0
-extern  void * nfsproc_null_2(void *, CLIENT *);
-extern  void * nfsproc_null_2_svc(void *, struct svc_req *);
-#define NFSPROC_GETATTR 1
-extern  attrstat * nfsproc_getattr_2(nfs_fh *, CLIENT *);
-extern  attrstat * nfsproc_getattr_2_svc(nfs_fh *, struct svc_req *);
-#define NFSPROC_SETATTR 2
-extern  attrstat * nfsproc_setattr_2(sattrargs *, CLIENT *);
-extern  attrstat * nfsproc_setattr_2_svc(sattrargs *, struct svc_req *);
-#define NFSPROC_ROOT 3
-extern  void * nfsproc_root_2(void *, CLIENT *);
-extern  void * nfsproc_root_2_svc(void *, struct svc_req *);
-#define NFSPROC_LOOKUP 4
-extern  diropres * nfsproc_lookup_2(diropargs *, CLIENT *);
-extern  diropres * nfsproc_lookup_2_svc(diropargs *, struct svc_req *);
-#define NFSPROC_READLINK 5
-extern  readlinkres * nfsproc_readlink_2(nfs_fh *, CLIENT *);
-extern  readlinkres * nfsproc_readlink_2_svc(nfs_fh *, struct svc_req *);
-#define NFSPROC_READ 6
-extern  readres * nfsproc_read_2(readargs *, CLIENT *);
-extern  readres * nfsproc_read_2_svc(readargs *, struct svc_req *);
-#define NFSPROC_WRITECACHE 7
-extern  void * nfsproc_writecache_2(void *, CLIENT *);
-extern  void * nfsproc_writecache_2_svc(void *, struct svc_req *);
-#define NFSPROC_WRITE 8
-extern  attrstat * nfsproc_write_2(writeargs *, CLIENT *);
-extern  attrstat * nfsproc_write_2_svc(writeargs *, struct svc_req *);
-#define NFSPROC_CREATE 9
-extern  diropres * nfsproc_create_2(createargs *, CLIENT *);
-extern  diropres * nfsproc_create_2_svc(createargs *, struct svc_req *);
-#define NFSPROC_REMOVE 10
-extern  nfsstat * nfsproc_remove_2(diropargs *, CLIENT *);
-extern  nfsstat * nfsproc_remove_2_svc(diropargs *, struct svc_req *);
-#define NFSPROC_RENAME 11
-extern  nfsstat * nfsproc_rename_2(renameargs *, CLIENT *);
-extern  nfsstat * nfsproc_rename_2_svc(renameargs *, struct svc_req *);
-#define NFSPROC_LINK 12
-extern  nfsstat * nfsproc_link_2(linkargs *, CLIENT *);
-extern  nfsstat * nfsproc_link_2_svc(linkargs *, struct svc_req *);
-#define NFSPROC_SYMLINK 13
-extern  nfsstat * nfsproc_symlink_2(symlinkargs *, CLIENT *);
-extern  nfsstat * nfsproc_symlink_2_svc(symlinkargs *, struct svc_req *);
-#define NFSPROC_MKDIR 14
-extern  diropres * nfsproc_mkdir_2(createargs *, CLIENT *);
-extern  diropres * nfsproc_mkdir_2_svc(createargs *, struct svc_req *);
-#define NFSPROC_RMDIR 15
-extern  nfsstat * nfsproc_rmdir_2(diropargs *, CLIENT *);
-extern  nfsstat * nfsproc_rmdir_2_svc(diropargs *, struct svc_req *);
-#define NFSPROC_READDIR 16
-extern  readdirres * nfsproc_readdir_2(readdirargs *, CLIENT *);
-extern  readdirres * nfsproc_readdir_2_svc(readdirargs *, struct svc_req *);
-#define NFSPROC_STATFS 17
-extern  statfsres * nfsproc_statfs_2(nfs_fh *, CLIENT *);
-extern  statfsres * nfsproc_statfs_2_svc(nfs_fh *, struct svc_req *);
-extern int nfs_program_2_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define NFSPROC_NULL 0
-extern  void * nfsproc_null_2();
-extern  void * nfsproc_null_2_svc();
-#define NFSPROC_GETATTR 1
-extern  attrstat * nfsproc_getattr_2();
-extern  attrstat * nfsproc_getattr_2_svc();
-#define NFSPROC_SETATTR 2
-extern  attrstat * nfsproc_setattr_2();
-extern  attrstat * nfsproc_setattr_2_svc();
-#define NFSPROC_ROOT 3
-extern  void * nfsproc_root_2();
-extern  void * nfsproc_root_2_svc();
-#define NFSPROC_LOOKUP 4
-extern  diropres * nfsproc_lookup_2();
-extern  diropres * nfsproc_lookup_2_svc();
-#define NFSPROC_READLINK 5
-extern  readlinkres * nfsproc_readlink_2();
-extern  readlinkres * nfsproc_readlink_2_svc();
-#define NFSPROC_READ 6
-extern  readres * nfsproc_read_2();
-extern  readres * nfsproc_read_2_svc();
-#define NFSPROC_WRITECACHE 7
-extern  void * nfsproc_writecache_2();
-extern  void * nfsproc_writecache_2_svc();
-#define NFSPROC_WRITE 8
-extern  attrstat * nfsproc_write_2();
-extern  attrstat * nfsproc_write_2_svc();
-#define NFSPROC_CREATE 9
-extern  diropres * nfsproc_create_2();
-extern  diropres * nfsproc_create_2_svc();
-#define NFSPROC_REMOVE 10
-extern  nfsstat * nfsproc_remove_2();
-extern  nfsstat * nfsproc_remove_2_svc();
-#define NFSPROC_RENAME 11
-extern  nfsstat * nfsproc_rename_2();
-extern  nfsstat * nfsproc_rename_2_svc();
-#define NFSPROC_LINK 12
-extern  nfsstat * nfsproc_link_2();
-extern  nfsstat * nfsproc_link_2_svc();
-#define NFSPROC_SYMLINK 13
-extern  nfsstat * nfsproc_symlink_2();
-extern  nfsstat * nfsproc_symlink_2_svc();
-#define NFSPROC_MKDIR 14
-extern  diropres * nfsproc_mkdir_2();
-extern  diropres * nfsproc_mkdir_2_svc();
-#define NFSPROC_RMDIR 15
-extern  nfsstat * nfsproc_rmdir_2();
-extern  nfsstat * nfsproc_rmdir_2_svc();
-#define NFSPROC_READDIR 16
-extern  readdirres * nfsproc_readdir_2();
-extern  readdirres * nfsproc_readdir_2_svc();
-#define NFSPROC_STATFS 17
-extern  statfsres * nfsproc_statfs_2();
-extern  statfsres * nfsproc_statfs_2_svc();
-extern int nfs_program_2_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_nfsstat (XDR *, nfsstat*);
-extern  bool_t xdr_ftype (XDR *, ftype*);
-extern  bool_t xdr_nfs_fh (XDR *, nfs_fh*);
-extern  bool_t xdr_nfstime (XDR *, nfstime*);
-extern  bool_t xdr_fattr (XDR *, fattr*);
-extern  bool_t xdr_sattr (XDR *, sattr*);
-extern  bool_t xdr_filename (XDR *, filename*);
-extern  bool_t xdr_nfspath (XDR *, nfspath*);
-extern  bool_t xdr_attrstat (XDR *, attrstat*);
-extern  bool_t xdr_sattrargs (XDR *, sattrargs*);
-extern  bool_t xdr_diropargs (XDR *, diropargs*);
-extern  bool_t xdr_diropokres (XDR *, diropokres*);
-extern  bool_t xdr_diropres (XDR *, diropres*);
-extern  bool_t xdr_readlinkres (XDR *, readlinkres*);
-extern  bool_t xdr_readargs (XDR *, readargs*);
-extern  bool_t xdr_readokres (XDR *, readokres*);
-extern  bool_t xdr_readres (XDR *, readres*);
-extern  bool_t xdr_writeargs (XDR *, writeargs*);
-extern  bool_t xdr_createargs (XDR *, createargs*);
-extern  bool_t xdr_renameargs (XDR *, renameargs*);
-extern  bool_t xdr_linkargs (XDR *, linkargs*);
-extern  bool_t xdr_symlinkargs (XDR *, symlinkargs*);
-extern  bool_t xdr_nfscookie (XDR *, nfscookie);
-extern  bool_t xdr_readdirargs (XDR *, readdirargs*);
-extern  bool_t xdr_entry (XDR *, entry*);
-extern  bool_t xdr_dirlist (XDR *, dirlist*);
-extern  bool_t xdr_readdirres (XDR *, readdirres*);
-extern  bool_t xdr_statfsokres (XDR *, statfsokres*);
-extern  bool_t xdr_statfsres (XDR *, statfsres*);
-
-#else /* K&R C */
-extern bool_t xdr_nfsstat ();
-extern bool_t xdr_ftype ();
-extern bool_t xdr_nfs_fh ();
-extern bool_t xdr_nfstime ();
-extern bool_t xdr_fattr ();
-extern bool_t xdr_sattr ();
-extern bool_t xdr_filename ();
-extern bool_t xdr_nfspath ();
-extern bool_t xdr_attrstat ();
-extern bool_t xdr_sattrargs ();
-extern bool_t xdr_diropargs ();
-extern bool_t xdr_diropokres ();
-extern bool_t xdr_diropres ();
-extern bool_t xdr_readlinkres ();
-extern bool_t xdr_readargs ();
-extern bool_t xdr_readokres ();
-extern bool_t xdr_readres ();
-extern bool_t xdr_writeargs ();
-extern bool_t xdr_createargs ();
-extern bool_t xdr_renameargs ();
-extern bool_t xdr_linkargs ();
-extern bool_t xdr_symlinkargs ();
-extern bool_t xdr_nfscookie ();
-extern bool_t xdr_readdirargs ();
-extern bool_t xdr_entry ();
-extern bool_t xdr_dirlist ();
-extern bool_t xdr_readdirres ();
-extern bool_t xdr_statfsokres ();
-extern bool_t xdr_statfsres ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NFS_PROT_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/nfs_prot.x b/openflow/usr/include/rpcsvc/nfs_prot.x
deleted file mode 100644
index ad992e2..0000000
--- a/openflow/usr/include/rpcsvc/nfs_prot.x
+++ /dev/null
@@ -1,352 +0,0 @@
-/* @(#)nfs_prot.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*
- * nfs_prot.x 1.2 87/10/12
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-const NFS_PORT          = 2049;
-const NFS_MAXDATA       = 8192;
-const NFS_MAXPATHLEN    = 1024;
-const NFS_MAXNAMLEN	= 255;
-const NFS_FHSIZE	= 32;
-const NFS_COOKIESIZE	= 4;
-const NFS_FIFO_DEV	= -1;	/* size kludge for named pipes */
-
-/*
- * File types
- */
-const NFSMODE_FMT  = 0170000;	/* type of file */
-const NFSMODE_DIR  = 0040000;	/* directory */
-const NFSMODE_CHR  = 0020000;	/* character special */
-const NFSMODE_BLK  = 0060000;	/* block special */
-const NFSMODE_REG  = 0100000;	/* regular */
-const NFSMODE_LNK  = 0120000;	/* symbolic link */
-const NFSMODE_SOCK = 0140000;	/* socket */
-const NFSMODE_FIFO = 0010000;	/* fifo */
-
-/*
- * Error status
- */
-enum nfsstat {
-	NFS_OK= 0,		/* no error */
-	NFSERR_PERM=1,		/* Not owner */
-	NFSERR_NOENT=2,		/* No such file or directory */
-	NFSERR_IO=5,		/* I/O error */
-	NFSERR_NXIO=6,		/* No such device or address */
-	NFSERR_ACCES=13,	/* Permission denied */
-	NFSERR_EXIST=17,	/* File exists */
-	NFSERR_NODEV=19,	/* No such device */
-	NFSERR_NOTDIR=20,	/* Not a directory*/
-	NFSERR_ISDIR=21,	/* Is a directory */
-	NFSERR_FBIG=27,		/* File too large */
-	NFSERR_NOSPC=28,	/* No space left on device */
-	NFSERR_ROFS=30,		/* Read-only file system */
-	NFSERR_NAMETOOLONG=63,	/* File name too long */
-	NFSERR_NOTEMPTY=66,	/* Directory not empty */
-	NFSERR_DQUOT=69,	/* Disc quota exceeded */
-	NFSERR_STALE=70,	/* Stale NFS file handle */
-	NFSERR_WFLUSH=99	/* write cache flushed */
-};
-
-/*
- * File types
- */
-enum ftype {
-	NFNON = 0,	/* non-file */
-	NFREG = 1,	/* regular file */
-	NFDIR = 2,	/* directory */
-	NFBLK = 3,	/* block special */
-	NFCHR = 4,	/* character special */
-	NFLNK = 5,	/* symbolic link */
-	NFSOCK = 6,	/* unix domain sockets */
-	NFBAD = 7,	/* unused */
-	NFFIFO = 8 	/* named pipe */
-};
-
-/*
- * File access handle
- */
-struct nfs_fh {
-	opaque data[NFS_FHSIZE];
-};
-
-/*
- * Timeval
- */
-struct nfstime {
-	unsigned seconds;
-	unsigned useconds;
-};
-
-
-/*
- * File attributes
- */
-struct fattr {
-	ftype type;		/* file type */
-	unsigned mode;		/* protection mode bits */
-	unsigned nlink;		/* # hard links */
-	unsigned uid;		/* owner user id */
-	unsigned gid;		/* owner group id */
-	unsigned size;		/* file size in bytes */
-	unsigned blocksize;	/* preferred block size */
-	unsigned rdev;		/* special device # */
-	unsigned blocks;	/* Kb of disk used by file */
-	unsigned fsid;		/* device # */
-	unsigned fileid;	/* inode # */
-	nfstime	atime;		/* time of last access */
-	nfstime	mtime;		/* time of last modification */
-	nfstime	ctime;		/* time of last change */
-};
-
-/*
- * File attributes which can be set
- */
-struct sattr {
-	unsigned mode;	/* protection mode bits */
-	unsigned uid;	/* owner user id */
-	unsigned gid;	/* owner group id */
-	unsigned size;	/* file size in bytes */
-	nfstime	atime;	/* time of last access */
-	nfstime	mtime;	/* time of last modification */
-};
-
-
-typedef string filename<NFS_MAXNAMLEN>;
-typedef string nfspath<NFS_MAXPATHLEN>;
-
-/*
- * Reply status with file attributes
- */
-union attrstat switch (nfsstat status) {
-case NFS_OK:
-	fattr attributes;
-default:
-	void;
-};
-
-struct sattrargs {
-	nfs_fh file;
-	sattr attributes;
-};
-
-/*
- * Arguments for directory operations
- */
-struct diropargs {
-	nfs_fh	dir;	/* directory file handle */
-	filename name;		/* name (up to NFS_MAXNAMLEN bytes) */
-};
-
-struct diropokres {
-	nfs_fh file;
-	fattr attributes;
-};
-
-/*
- * Results from directory operation
- */
-union diropres switch (nfsstat status) {
-case NFS_OK:
-	diropokres diropres;
-default:
-	void;
-};
-
-union readlinkres switch (nfsstat status) {
-case NFS_OK:
-	nfspath data;
-default:
-	void;
-};
-
-/*
- * Arguments to remote read
- */
-struct readargs {
-	nfs_fh file;		/* handle for file */
-	unsigned offset;	/* byte offset in file */
-	unsigned count;		/* immediate read count */
-	unsigned totalcount;	/* total read count (from this offset)*/
-};
-
-/*
- * Status OK portion of remote read reply
- */
-struct readokres {
-	fattr	attributes;	/* attributes, need for pagin*/
-	opaque data<NFS_MAXDATA>;
-};
-
-union readres switch (nfsstat status) {
-case NFS_OK:
-	readokres reply;
-default:
-	void;
-};
-
-/*
- * Arguments to remote write
- */
-struct writeargs {
-	nfs_fh	file;		/* handle for file */
-	unsigned beginoffset;	/* beginning byte offset in file */
-	unsigned offset;	/* current byte offset in file */
-	unsigned totalcount;	/* total write count (to this offset)*/
-	opaque data<NFS_MAXDATA>;
-};
-
-struct createargs {
-	diropargs where;
-	sattr attributes;
-};
-
-struct renameargs {
-	diropargs from;
-	diropargs to;
-};
-
-struct linkargs {
-	nfs_fh from;
-	diropargs to;
-};
-
-struct symlinkargs {
-	diropargs from;
-	nfspath to;
-	sattr attributes;
-};
-
-
-typedef opaque nfscookie[NFS_COOKIESIZE];
-
-/*
- * Arguments to readdir
- */
-struct readdirargs {
-	nfs_fh dir;		/* directory handle */
-	nfscookie cookie;
-	unsigned count;		/* number of directory bytes to read */
-};
-
-struct entry {
-	unsigned fileid;
-	filename name;
-	nfscookie cookie;
-	entry *nextentry;
-};
-
-struct dirlist {
-	entry *entries;
-	bool eof;
-};
-
-union readdirres switch (nfsstat status) {
-case NFS_OK:
-	dirlist reply;
-default:
-	void;
-};
-
-struct statfsokres {
-	unsigned tsize;	/* preferred transfer size in bytes */
-	unsigned bsize;	/* fundamental file system block size */
-	unsigned blocks;	/* total blocks in file system */
-	unsigned bfree;	/* free blocks in fs */
-	unsigned bavail;	/* free blocks avail to non-superuser */
-};
-
-union statfsres switch (nfsstat status) {
-case NFS_OK:
-	statfsokres reply;
-default:
-	void;
-};
-
-/*
- * Remote file service routines
- */
-program NFS_PROGRAM {
-	version NFS_VERSION {
-		void
-		NFSPROC_NULL(void) = 0;
-
-		attrstat
-		NFSPROC_GETATTR(nfs_fh) =	1;
-
-		attrstat
-		NFSPROC_SETATTR(sattrargs) = 2;
-
-		void
-		NFSPROC_ROOT(void) = 3;
-
-		diropres
-		NFSPROC_LOOKUP(diropargs) = 4;
-
-		readlinkres
-		NFSPROC_READLINK(nfs_fh) = 5;
-
-		readres
-		NFSPROC_READ(readargs) = 6;
-
-		void
-		NFSPROC_WRITECACHE(void) = 7;
-
-		attrstat
-		NFSPROC_WRITE(writeargs) = 8;
-
-		diropres
-		NFSPROC_CREATE(createargs) = 9;
-
-		nfsstat
-		NFSPROC_REMOVE(diropargs) = 10;
-
-		nfsstat
-		NFSPROC_RENAME(renameargs) = 11;
-
-		nfsstat
-		NFSPROC_LINK(linkargs) = 12;
-
-		nfsstat
-		NFSPROC_SYMLINK(symlinkargs) = 13;
-
-		diropres
-		NFSPROC_MKDIR(createargs) = 14;
-
-		nfsstat
-		NFSPROC_RMDIR(diropargs) = 15;
-
-		readdirres
-		NFSPROC_READDIR(readdirargs) = 16;
-
-		statfsres
-		NFSPROC_STATFS(nfs_fh) = 17;
-	} = 2;
-} = 100003;
diff --git a/openflow/usr/include/rpcsvc/nis.h b/openflow/usr/include/rpcsvc/nis.h
deleted file mode 100644
index 933c4d9..0000000
--- a/openflow/usr/include/rpcsvc/nis.h
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RPCSVC_NIS_H
-#define _RPCSVC_NIS_H 1
-
-#include <features.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/nis_tags.h>
-
-__BEGIN_DECLS
-
-/*
- *	nis.h
- *
- *	This file is the main include file for NIS clients. It contains
- *	both the client library function defines and the various data
- *	structures used by the NIS service. It includes the file nis_tags.h
- *	which defines the tag values. This allows the tags to change without
- *	having to change the nis.x file.
- *
- *	NOTE : THIS FILE IS NOT GENERATED WITH RPCGEN ! SO YOU HAVE TO
- *             ADD ALL THE CHANGES ON nis_*.x FILES HERE AGAIN !
- *
- *      I have removed all the Solaris internal structs and variables,
- *      because they are not supported, Sun changed them between various
- *      releases and they shouldn't be used in user programs.
- *                                              <kukuk@suse.de>
- */
-
-
-#ifndef __nis_object_h
-#define __nis_object_h
-
-#define NIS_MAXSTRINGLEN 255
-#define NIS_MAXNAMELEN 1024
-#define NIS_MAXATTRNAME 32
-#define NIS_MAXATTRVAL 2048
-#define NIS_MAXCOLUMNS 64
-#define NIS_MAXATTR 16
-#define NIS_MAXPATH 1024
-#define NIS_MAXREPLICAS 128
-#define NIS_MAXLINKS 16
-#define NIS_PK_NONE 0
-#define NIS_PK_DH 1
-#define NIS_PK_RSA 2
-#define NIS_PK_KERB 3
-#define NIS_PK_DHEXT 4
-
-struct nis_attr {
-	char *zattr_ndx;
-	struct {
-		u_int zattr_val_len;
-		char *zattr_val_val;
-	} zattr_val;
-};
-typedef struct nis_attr nis_attr;
-
-typedef char *nis_name;
-
-enum zotypes {
-	BOGUS_OBJ = 0,
-	NO_OBJ = 1,
-	DIRECTORY_OBJ = 2,
-	GROUP_OBJ = 3,
-	TABLE_OBJ = 4,
-	ENTRY_OBJ = 5,
-	LINK_OBJ = 6,
-	PRIVATE_OBJ = 7,
-	NIS_BOGUS_OBJ = 0,
-	NIS_NO_OBJ = 1,
-	NIS_DIRECTORY_OBJ = 2,
-	NIS_GROUP_OBJ = 3,
-	NIS_TABLE_OBJ = 4,
-	NIS_ENTRY_OBJ = 5,
-	NIS_LINK_OBJ = 6,
-	NIS_PRIVATE_OBJ = 7
-};
-typedef enum zotypes zotypes;
-
-enum nstype {
-	UNKNOWN = 0,
-	NIS = 1,
-	SUNYP = 2,
-	IVY = 3,
-	DNS = 4,
-	X500 = 5,
-	DNANS = 6,
-	XCHS = 7,
-	CDS = 8,
-};
-typedef enum nstype nstype;
-
-struct oar_mask {
-	uint32_t oa_rights;
-	zotypes oa_otype;
-};
-typedef struct oar_mask oar_mask;
-
-struct endpoint {
-	char *uaddr;
-	char *family;
-	char *proto;
-};
-typedef struct endpoint endpoint;
-
-struct nis_server {
-	nis_name name;
-	struct {
-		u_int ep_len;
-		endpoint *ep_val;
-	} ep;
-	uint32_t key_type;
-	netobj pkey;
-};
-typedef struct nis_server nis_server;
-
-struct directory_obj {
-	nis_name do_name;
-	nstype do_type;
-	struct {
-		u_int do_servers_len;
-		nis_server *do_servers_val;
-	} do_servers;
-	uint32_t do_ttl;
-	struct {
-		u_int do_armask_len;
-		oar_mask *do_armask_val;
-	} do_armask;
-};
-typedef struct directory_obj directory_obj;
-
-#define EN_BINARY 1
-#define EN_CRYPT 2
-#define EN_XDR 4
-#define EN_MODIFIED 8
-#define EN_ASN1 64
-
-struct entry_col {
-	uint32_t ec_flags;
-	struct {
-		u_int ec_value_len;
-		char *ec_value_val;
-	} ec_value;
-};
-typedef struct entry_col entry_col;
-
-struct entry_obj {
-	char *en_type;
-	struct {
-		u_int en_cols_len;
-		entry_col *en_cols_val;
-	} en_cols;
-};
-typedef struct entry_obj entry_obj;
-
-struct group_obj {
-	uint32_t gr_flags;
-	struct {
-		u_int gr_members_len;
-		nis_name *gr_members_val;
-	} gr_members;
-};
-typedef struct group_obj group_obj;
-
-struct link_obj {
-	zotypes li_rtype;
-	struct {
-		u_int li_attrs_len;
-		nis_attr *li_attrs_val;
-	} li_attrs;
-	nis_name li_name;
-};
-typedef struct link_obj link_obj;
-
-#define TA_BINARY 1
-#define TA_CRYPT 2
-#define TA_XDR 4
-#define TA_SEARCHABLE 8
-#define TA_CASE 16
-#define TA_MODIFIED 32
-#define TA_ASN1 64
-
-struct table_col {
-	char *tc_name;
-	uint32_t tc_flags;
-	uint32_t tc_rights;
-};
-typedef struct table_col table_col;
-
-struct table_obj {
-	char *ta_type;
-	int ta_maxcol;
-	u_char ta_sep;
-	struct {
-		u_int ta_cols_len;
-		table_col *ta_cols_val;
-	} ta_cols;
-	char *ta_path;
-};
-typedef struct table_obj table_obj;
-
-struct objdata {
-	zotypes zo_type;
-	union {
-		struct directory_obj di_data;
-		struct group_obj gr_data;
-		struct table_obj ta_data;
-		struct entry_obj en_data;
-		struct link_obj li_data;
-		struct {
-			u_int po_data_len;
-			char *po_data_val;
-		} po_data;
-	} objdata_u;
-};
-typedef struct objdata objdata;
-
-struct nis_oid {
-	uint32_t ctime;
-	uint32_t mtime;
-};
-typedef struct nis_oid nis_oid;
-
-struct nis_object {
-	nis_oid zo_oid;
-	nis_name zo_name;
-	nis_name zo_owner;
-	nis_name zo_group;
-	nis_name zo_domain;
-	uint32_t zo_access;
-	uint32_t zo_ttl;
-	objdata zo_data;
-};
-typedef struct nis_object nis_object;
-
-#endif /* if __nis_object_h */
-
-enum nis_error {
-	NIS_SUCCESS = 0,
-	NIS_S_SUCCESS = 1,
-	NIS_NOTFOUND = 2,
-	NIS_S_NOTFOUND = 3,
-	NIS_CACHEEXPIRED = 4,
-	NIS_NAMEUNREACHABLE = 5,
-	NIS_UNKNOWNOBJ = 6,
-	NIS_TRYAGAIN = 7,
-	NIS_SYSTEMERROR = 8,
-	NIS_CHAINBROKEN = 9,
-	NIS_PERMISSION = 10,
-	NIS_NOTOWNER = 11,
-	NIS_NOT_ME = 12,
-	NIS_NOMEMORY = 13,
-	NIS_NAMEEXISTS = 14,
-	NIS_NOTMASTER = 15,
-	NIS_INVALIDOBJ = 16,
-	NIS_BADNAME = 17,
-	NIS_NOCALLBACK = 18,
-	NIS_CBRESULTS = 19,
-	NIS_NOSUCHNAME = 20,
-	NIS_NOTUNIQUE = 21,
-	NIS_IBMODERROR = 22,
-	NIS_NOSUCHTABLE = 23,
-	NIS_TYPEMISMATCH = 24,
-	NIS_LINKNAMEERROR = 25,
-	NIS_PARTIAL = 26,
-	NIS_TOOMANYATTRS = 27,
-	NIS_RPCERROR = 28,
-	NIS_BADATTRIBUTE = 29,
-	NIS_NOTSEARCHABLE = 30,
-	NIS_CBERROR = 31,
-	NIS_FOREIGNNS = 32,
-	NIS_BADOBJECT = 33,
-	NIS_NOTSAMEOBJ = 34,
-	NIS_MODFAIL = 35,
-	NIS_BADREQUEST = 36,
-	NIS_NOTEMPTY = 37,
-	NIS_COLDSTART_ERR = 38,
-	NIS_RESYNC = 39,
-	NIS_FAIL = 40,
-	NIS_UNAVAIL = 41,
-	NIS_RES2BIG = 42,
-	NIS_SRVAUTH = 43,
-	NIS_CLNTAUTH = 44,
-	NIS_NOFILESPACE = 45,
-	NIS_NOPROC = 46,
-	NIS_DUMPLATER = 47,
-};
-typedef enum nis_error nis_error;
-
-struct nis_result {
-	nis_error status;
-	struct {
-		u_int objects_len;
-		nis_object *objects_val;
-	} objects;
-	netobj cookie;
-	uint32_t zticks;
-	uint32_t dticks;
-	uint32_t aticks;
-	uint32_t cticks;
-};
-typedef struct nis_result nis_result;
-
-struct ns_request {
-	nis_name ns_name;
-	struct {
-		u_int ns_object_len;
-		nis_object *ns_object_val;
-	} ns_object;
-};
-typedef struct ns_request ns_request;
-
-struct ib_request {
-	nis_name ibr_name;
-	struct {
-		u_int ibr_srch_len;
-		nis_attr *ibr_srch_val;
-	} ibr_srch;
-	uint32_t ibr_flags;
-	struct {
-		u_int ibr_obj_len;
-		nis_object *ibr_obj_val;
-	} ibr_obj;
-	struct {
-		u_int ibr_cbhost_len;
-		nis_server *ibr_cbhost_val;
-	} ibr_cbhost;
-	u_int ibr_bufsize;
-	netobj ibr_cookie;
-};
-typedef struct ib_request ib_request;
-
-struct ping_args {
-	nis_name dir;
-	uint32_t stamp;
-};
-typedef struct ping_args ping_args;
-
-enum log_entry_t {
-	LOG_NOP = 0,
-	ADD_NAME = 1,
-	REM_NAME = 2,
-	MOD_NAME_OLD = 3,
-	MOD_NAME_NEW = 4,
-	ADD_IBASE = 5,
-	REM_IBASE = 6,
-	MOD_IBASE = 7,
-	UPD_STAMP = 8,
-};
-typedef enum log_entry_t log_entry_t;
-
-struct log_entry {
-	uint32_t le_time;
-	log_entry_t le_type;
-	nis_name le_princp;
-	nis_name le_name;
-	struct {
-		u_int le_attrs_len;
-		nis_attr *le_attrs_val;
-	} le_attrs;
-	nis_object le_object;
-};
-typedef struct log_entry log_entry;
-
-struct log_result {
-	nis_error lr_status;
-	netobj lr_cookie;
-	struct {
-		u_int lr_entries_len;
-		log_entry *lr_entries_val;
-	} lr_entries;
-};
-typedef struct log_result log_result;
-
-struct cp_result {
-	nis_error cp_status;
-	uint32_t cp_zticks;
-	uint32_t cp_dticks;
-};
-typedef struct cp_result cp_result;
-
-struct nis_tag {
-	uint32_t tag_type;
-	char *tag_val;
-};
-typedef struct nis_tag nis_tag;
-
-struct nis_taglist {
-	struct {
-		u_int tags_len;
-		nis_tag *tags_val;
-	} tags;
-};
-typedef struct nis_taglist nis_taglist;
-
-struct dump_args {
-	nis_name da_dir;
-	uint32_t da_time;
-	struct {
-		u_int da_cbhost_len;
-		nis_server *da_cbhost_val;
-	} da_cbhost;
-};
-typedef struct dump_args dump_args;
-
-struct fd_args {
-	nis_name dir_name;
-	nis_name requester;
-};
-typedef struct fd_args fd_args;
-
-struct fd_result {
-	nis_error status;
-	nis_name source;
-	struct {
-		u_int dir_data_len;
-		char *dir_data_val;
-	} dir_data;
-	struct {
-		u_int signature_len;
-		char *signature_val;
-	} signature;
-};
-typedef struct fd_result fd_result;
-
-/* Generic client creating flags */
-#define ZMH_VC		1
-#define ZMH_DG		2
-#define ZMH_AUTH	4
-
-/* Testing Access rights for objects */
-
-#define NIS_READ_ACC		1
-#define NIS_MODIFY_ACC		2
-#define NIS_CREATE_ACC		4
-#define NIS_DESTROY_ACC	8
-/* Test macros. a == access rights, m == desired rights. */
-#define NIS_WORLD(a, m)        (((a) & (m)) != 0)
-#define NIS_GROUP(a, m)        (((a) & ((m) << 8)) != 0)
-#define NIS_OWNER(a, m)        (((a) & ((m) << 16)) != 0)
-#define NIS_NOBODY(a, m)       (((a) & ((m) << 24)) != 0)
-/*
- * EOL Alert - The following non-prefixed test macros are
- * here for backward compatibility, and will be not be present
- * in future releases - use the NIS_*() macros above.
- */
-#define WORLD(a, m)	(((a) & (m)) != 0)
-#define GROUP(a, m)	(((a) & ((m) << 8)) != 0)
-#define OWNER(a, m)	(((a) & ((m) << 16)) != 0)
-#define NOBODY(a, m)	(((a) & ((m) << 24)) != 0)
-
-#define OATYPE(d, n) (((d)->do_armask.do_armask_val+n)->oa_otype)
-#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
-#define WORLD_DEFAULT (NIS_READ_ACC)
-#define GROUP_DEFAULT (NIS_READ_ACC << 8)
-#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC +\
-			NIS_DESTROY_ACC) << 16)
-#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
-
-/* Result manipulation defines ... */
-#define NIS_RES_NUMOBJ(x)	((x)->objects.objects_len)
-#define NIS_RES_OBJECT(x)	((x)->objects.objects_val)
-#define NIS_RES_COOKIE(x)	((x)->cookie)
-#define NIS_RES_STATUS(x)	((x)->status)
-
-/* These defines make getting at the variant part of the object easier. */
-#define TA_data zo_data.objdata_u.ta_data
-#define EN_data zo_data.objdata_u.en_data
-#define DI_data zo_data.objdata_u.di_data
-#define LI_data zo_data.objdata_u.li_data
-#define GR_data zo_data.objdata_u.gr_data
-
-#define __type_of(o) ((o)->zo_data.zo_type)
-
-/* Declarations for the internal subroutines in nislib.c */
-enum name_pos {SAME_NAME, HIGHER_NAME, LOWER_NAME, NOT_SEQUENTIAL, BAD_NAME};
-typedef enum name_pos name_pos;
-
-/*
- * Defines for getting at column data in entry objects. Because RPCGEN
- * generates some rather wordy structures, we create some defines that
- * collapse the needed keystrokes to access a particular value using
- * these definitions they take an nis_object *, and an int and return
- * a u_char * for Value, and an int for length.
- */
-#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
-#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
-
-
-/* Prototypes, and extern declarations for the NIS library functions. */
-#include <rpcsvc/nislib.h>
-#endif
-
-/*
- * nis_3.h
- *
- * This file contains definitions that are only of interest to the actual
- * service daemon and client stubs. Normal users of NIS will not include
- * this file.
- *
- * NOTE : This include file is automatically created by a combination
- * of rpcgen and sed. DO NOT EDIT IT, change the nis.x file instead
- * and then remake this file.
- */
-#ifndef __nis_3_h
-#define __nis_3_h
-
-#define NIS_PROG 100300
-#define NIS_VERSION 3
-
-#define NIS_LOOKUP 1
-extern  nis_result * nis_lookup_3 (ns_request *, CLIENT *) __THROW;
-extern  nis_result * nis_lookup_3_svc (ns_request *, struct svc_req *) __THROW;
-#define NIS_ADD 2
-extern  nis_result * nis_add_3 (ns_request *, CLIENT *) __THROW;
-extern  nis_result * nis_add_3_svc (ns_request *, struct svc_req *) __THROW;
-#define NIS_MODIFY 3
-extern  nis_result * nis_modify_3 (ns_request *, CLIENT *) __THROW;
-extern  nis_result * nis_modify_3_svc (ns_request *, struct svc_req *) __THROW;
-#define NIS_REMOVE 4
-extern  nis_result * nis_remove_3 (ns_request *, CLIENT *) __THROW;
-extern  nis_result * nis_remove_3_svc (ns_request *, struct svc_req *) __THROW;
-#define NIS_IBLIST 5
-extern  nis_result * nis_iblist_3 (ib_request *, CLIENT *) __THROW;
-extern  nis_result * nis_iblist_3_svc (ib_request *, struct svc_req *) __THROW;
-#define NIS_IBADD 6
-extern  nis_result * nis_ibadd_3 (ib_request *, CLIENT *) __THROW;
-extern  nis_result * nis_ibadd_3_svc (ib_request *, struct svc_req *) __THROW;
-#define NIS_IBMODIFY 7
-extern  nis_result * nis_ibmodify_3 (ib_request *, CLIENT *) __THROW;
-extern  nis_result * nis_ibmodify_3_svc (ib_request *, struct svc_req *)
-     __THROW;
-#define NIS_IBREMOVE 8
-extern  nis_result * nis_ibremove_3 (ib_request *, CLIENT *) __THROW;
-extern  nis_result * nis_ibremove_3_svc (ib_request *, struct svc_req *)
-     __THROW;
-#define NIS_IBFIRST 9
-extern  nis_result * nis_ibfirst_3 (ib_request *, CLIENT *) __THROW;
-extern  nis_result * nis_ibfirst_3_svc (ib_request *, struct svc_req *)
-     __THROW;
-#define NIS_IBNEXT 10
-extern  nis_result * nis_ibnext_3 (ib_request *, CLIENT *) __THROW;
-extern  nis_result * nis_ibnext_3_svc (ib_request *, struct svc_req *) __THROW;
-#define NIS_FINDDIRECTORY 12
-extern  fd_result * nis_finddirectory_3 (fd_args *, CLIENT *) __THROW;
-extern  fd_result * nis_finddirectory_3_svc (fd_args *,
-					     struct svc_req *) __THROW;
-#define NIS_STATUS 14
-extern  nis_taglist * nis_status_3 (nis_taglist *, CLIENT *) __THROW;
-extern  nis_taglist * nis_status_3_svc (nis_taglist *, struct svc_req *)
-     __THROW;
-#define NIS_DUMPLOG 15
-extern  log_result * nis_dumplog_3 (dump_args *, CLIENT *) __THROW;
-extern  log_result * nis_dumplog_3_svc (dump_args *, struct svc_req *) __THROW;
-#define NIS_DUMP 16
-extern  log_result * nis_dump_3 (dump_args *, CLIENT *) __THROW;
-extern  log_result * nis_dump_3_svc (dump_args *, struct svc_req *) __THROW;
-#define NIS_CALLBACK 17
-extern  bool_t * nis_callback_3 (netobj *, CLIENT *) __THROW;
-extern  bool_t * nis_callback_3_svc (netobj *, struct svc_req *) __THROW;
-#define NIS_CPTIME 18
-extern  uint32_t * nis_cptime_3 (nis_name *, CLIENT *) __THROW;
-extern  uint32_t * nis_cptime_3_svc (nis_name *, struct svc_req *) __THROW;
-#define NIS_CHECKPOINT 19
-extern  cp_result * nis_checkpoint_3 (nis_name *, CLIENT *) __THROW;
-extern  cp_result * nis_checkpoint_3_svc (nis_name *, struct svc_req *)
-     __THROW;
-#define NIS_PING 20
-extern  void * nis_ping_3 (ping_args *, CLIENT *) __THROW;
-extern  void * nis_ping_3_svc (ping_args *, struct svc_req *) __THROW;
-#define NIS_SERVSTATE 21
-extern  nis_taglist * nis_servstate_3 (nis_taglist *, CLIENT *) __THROW;
-extern  nis_taglist * nis_servstate_3_svc (nis_taglist *,
-					   struct svc_req *) __THROW;
-#define NIS_MKDIR 22
-extern  nis_error * nis_mkdir_3 (nis_name *, CLIENT *) __THROW;
-extern  nis_error * nis_mkdir_3_svc (nis_name *, struct svc_req *) __THROW;
-#define NIS_RMDIR 23
-extern  nis_error * nis_rmdir_3 (nis_name *, CLIENT *) __THROW;
-extern  nis_error * nis_rmdir_3_svc (nis_name *, struct svc_req *) __THROW;
-#define NIS_UPDKEYS 24
-extern  nis_error * nis_updkeys_3 (nis_name *, CLIENT *) __THROW;
-extern  nis_error * nis_updkeys_3_svc (nis_name *, struct svc_req *) __THROW;
-
-__END_DECLS
-
-#endif /* ! _RPCSVC_NIS_H */
diff --git a/openflow/usr/include/rpcsvc/nis.x b/openflow/usr/include/rpcsvc/nis.x
deleted file mode 100644
index e318af2..0000000
--- a/openflow/usr/include/rpcsvc/nis.x
+++ /dev/null
@@ -1,474 +0,0 @@
-%/*
-% * Copyright (c) 2010, Oracle America, Inc.
-% *
-% * Redistribution and use in source and binary forms, with or without
-% * modification, are permitted provided that the following conditions are
-% * met:
-% *
-% *     * Redistributions of source code must retain the above copyright
-% *       notice, this list of conditions and the following disclaimer.
-% *     * Redistributions in binary form must reproduce the above
-% *       copyright notice, this list of conditions and the following
-% *       disclaimer in the documentation and/or other materials
-% *       provided with the distribution.
-% *     * Neither the name of the "Oracle America, Inc." nor the names of its
-% *       contributors may be used to endorse or promote products derived
-% *       from this software without specific prior written permission.
-% *
-% *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-% *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-% *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-% *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-% *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-% *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-% *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-% *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-% *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-% *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-% *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-% *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-% */
-
-#ifdef RPC_HDR
-%/*
-% *	nis.h
-% *
-% *	This file is the main include file for NIS clients. It contains
-% *	both the client library function defines and the various data
-% *	structures used by the NIS service. It includes the file nis_tags.h
-% *	which defines the tag values. This allows the tags to change without
-% *	having to change the nis.x file.
-% *
-% *	NOTE : DO NOT EDIT THIS FILE! It is automatically generated when
-% *	       rpcgen is run on the nis.x file. Note that there is a
-% *	       simple sed script to remove some unneeded lines. (See the
-% *	       Makefile target nis.h)
-% *
-% */
-%#include <rpcsvc/nis_tags.h>
-#endif
-
-/* This gets stuffed into the source files. */
-#if RPC_HDR
-%#include <rpc/xdr.h>
-#endif
-
-/* Include the RPC Language description of NIS objects */
-#include "nis_object.x"
-
-/* Errors  that can be returned by the service */
-enum nis_error {
-	NIS_SUCCESS = 0,	/* A-ok, let's rock n roll	*/
-	NIS_S_SUCCESS = 1,	/* Name found (maybe)		*/
-	NIS_NOTFOUND = 2,	/* Name definitely not found	*/
-	NIS_S_NOTFOUND = 3,	/* Name maybe not found		*/
-	NIS_CACHEEXPIRED = 4,	/* Name exists but cache out of date */
-	NIS_NAMEUNREACHABLE = 5, /* Can't get there from here */
-	NIS_UNKNOWNOBJ = 6,	/* Object type is bogus */
-	NIS_TRYAGAIN = 7,	/* I'm busy, call back */
-	NIS_SYSTEMERROR = 8,	/* Generic system error */
-	NIS_CHAINBROKEN = 9,	/* First/Next warning */
-	NIS_PERMISSION = 10,	/* Not enough permission to access */
-	NIS_NOTOWNER = 11,	/* You don't own it, sorry */
-	NIS_NOT_ME = 12,	/* I don't serve this name */
-	NIS_NOMEMORY = 13,	/* Outta VM! Help! */
-	NIS_NAMEEXISTS = 14,	/* Can't create over another name */
-	NIS_NOTMASTER = 15,	/* I'm justa secondaray, don't ask me */
-	NIS_INVALIDOBJ = 16,	/* Object is broken somehow */
-	NIS_BADNAME = 17,	/* Unparsable name */
-	NIS_NOCALLBACK = 18,	/* Couldn't talk to call back proc */
-	NIS_CBRESULTS = 19,	/* Results being called back to you */
-	NIS_NOSUCHNAME = 20,	/* Name unknown */
-	NIS_NOTUNIQUE = 21,	/* Value is not uniques (entry) */
-	NIS_IBMODERROR = 22,	/* Inf. Base. Modify error. */
-	NIS_NOSUCHTABLE = 23,	/* Name for table was wrong */
-	NIS_TYPEMISMATCH = 24,	/* Entry and table type mismatch */
-	NIS_LINKNAMEERROR = 25,	/* Link points to bogus name */
-	NIS_PARTIAL = 26,	/* Partial success, found table */
-	NIS_TOOMANYATTRS = 27,	/* Too many attributes */
-	NIS_RPCERROR = 28,	/* RPC error encountered */
-	NIS_BADATTRIBUTE = 29,	/* Bad or invalid attribute */
-	NIS_NOTSEARCHABLE = 30,	/* Non-searchable object searched */
-	NIS_CBERROR = 31,	/* Error during callback (svc crash) */
-	NIS_FOREIGNNS = 32,	/* Foreign Namespace */
-	NIS_BADOBJECT = 33,	/* Malformed object structure */
-	NIS_NOTSAMEOBJ = 34,	/* Object swapped during deletion */
-	NIS_MODFAIL = 35,	/* Failure during a Modify. */
-	NIS_BADREQUEST = 36,	/* Illegal query for table */
-	NIS_NOTEMPTY = 37,	/* Attempt to remove a non-empty tbl */
-	NIS_COLDSTART_ERR = 38, /* Error accesing the cold start file */
-	NIS_RESYNC = 39,	/* Transaction log too far out of date */
-	NIS_FAIL = 40,		/* NIS operation failed. */
-	NIS_UNAVAIL = 41,	/* NIS+ service is unavailable (client) */
-	NIS_RES2BIG = 42,	/* NIS+ result too big for datagram */
-	NIS_SRVAUTH = 43,	/* NIS+ server wasn't authenticated. */
-	NIS_CLNTAUTH = 44,	/* NIS+ Client wasn't authenticated. */
-	NIS_NOFILESPACE = 45,	/* NIS+ server ran out of disk space */
-	NIS_NOPROC = 46,	/* NIS+ server couldn't create new proc */
-	NIS_DUMPLATER = 47	/* NIS+ server already has dump child */
-};
-
-
-/*
- * Structure definitions for the parameters and results of the actual
- * NIS RPC calls.
- *
- * This is the standard result (in the protocol) of most of the nis
- * requests.
- */
-
-struct nis_result {
-	nis_error	status;		/* Status of the response */
-	nis_object	objects<>;	/* objects found	  */
-	netobj		cookie;		/* Cookie Data		  */
-	uint32_t	zticks;		/* server ticks		  */
-	uint32_t	dticks;		/* DBM ticks.		  */
-	uint32_t	aticks;		/* Cache (accel) ticks	  */
-	uint32_t	cticks;		/* Client ticks		  */
-};
-
-/*
- * A Name Service request
- * This request is used to access the name space, ns_name is the name
- * of the object within the namespace and the object is it's value, for
- * add/modify, a copy of the original for remove.
- */
-
-struct ns_request {
-	nis_name	ns_name;	/* Name in the NIS name space	*/
-	nis_object	ns_object<1>;	/* Optional Object (add/remove)	*/
-};
-
-/*
- * An information base request
- * This request includes the NIS name of the table we wish to search, the
- * search criteria in the form of attribute/value pairs and an optional
- * callback program number. If the callback program number is provided
- * the server will send back objects one at a time, otherwise it will
- * return them all in the response.
- */
-
-struct ib_request {
-	nis_name	ibr_name;	/* The name of the Table	*/
-	nis_attr	ibr_srch<>;	/* The search critereia		*/
-	uint32_t	ibr_flags;	/* Optional flags		*/
-	nis_object	ibr_obj<1>;	/* optional object (add/modify) */
-	nis_server	ibr_cbhost<1>;	/* Optional callback info	*/
-	u_int		ibr_bufsize;	/* Optional first/next bufsize	*/
-	netobj		ibr_cookie;	/* The first/next cookie	*/
-};
-
-/*
- * This argument to the PING call notifies the replicas that something in
- * a directory has changed and this is it's timestamp. The replica will use
- * the timestamp to determine if its resync operation was successful.
- */
-struct ping_args {
-	nis_name	dir;	/* Directory that had the change */
-	uint32_t	stamp;	/* timestamp of the transaction  */
-};
-
-/*
- * These are the type of entries that are stored in the transaction log,
- * note that modifications will appear as two entries, for names, they have
- * a "OLD" entry followed by a "NEW" entry. For entries in tables, there
- * is a remove followed by an add. It is done this way so that we can read
- * the log backwards to back out transactions and forwards to propogate
- * updated.
- */
-enum log_entry_t {
-	LOG_NOP = 0,
-	ADD_NAME = 1,		/* Name Added to name space		  */
-	REM_NAME = 2,		/* Name removed from name space		  */
-	MOD_NAME_OLD = 3,	/* Name was modified in the name space	  */
-	MOD_NAME_NEW = 4,	/* Name was modified in the name space	  */
-	ADD_IBASE = 5,		/* Entry added to information base	  */
-	REM_IBASE = 6,		/* Entry removed from information base    */
-	MOD_IBASE = 7,		/* Entry was modified in information base */
-	UPD_STAMP = 8		/* Update timestamp (used as fenceposts)  */
-};
-
-/*
- * This result is returned from the name service when it is requested to
- * dump logged entries from its transaction log. Information base updates
- * will have the name of the information base in the le_name field and
- * a canonical set of attribute/value pairs to fully specify the entry's
- * 'name'.
- */
-struct log_entry {
-	uint32_t	le_time;	/* Time in seconds		*/
-	log_entry_t	le_type;	/* Type of log entry		*/
-	nis_name	le_princp;	/* Principal making the change	*/
-	nis_name	le_name;	/* Name of table/dir involved	*/
-	nis_attr	le_attrs<>;	/* List of AV pairs.		*/
-	nis_object	le_object;	/* Actual object value		*/
-};
-
-struct log_result {
-	nis_error	lr_status;	/* The status itself		*/
-	netobj		lr_cookie;	/* Used by the dump callback	*/
-	log_entry	lr_entries<>;	/* zero or more entries	*/
-};
-
-struct cp_result {
-	nis_error	cp_status;	/* Status of the checkpoint	*/
-	uint32_t	cp_zticks;	/* Service 'ticks'		*/
-	uint32_t	cp_dticks;	/* Database 'ticks'		*/
-};
-
-/*
- * This structure defines a generic NIS tag list. The taglist contains
- * zero or tags, each of which is a type and a value. (u_int).
- * These are used to report statistics (see tag definitions below)
- * and to set or reset state variables.
- */
-struct nis_tag {
-	uint32_t	tag_type;	/* Statistic tag (may vary)	 */
-	string		tag_val<>;	/* Statistic value may also vary */
-};
-
-struct nis_taglist {
-	nis_tag tags<>;			/* List of tags */
-};
-
-struct dump_args {
-	nis_name	da_dir;		/* Directory to dump	*/
-	uint32_t	da_time;	/* From this timestamp	*/
-	nis_server	da_cbhost<1>;	/* Callback to use.	*/
-};
-
-struct fd_args {
-	nis_name	dir_name;  /* The directory we're looking for */
-	nis_name	requester; /* Host principal name for signature */
-};
-
-struct fd_result {
-	nis_error	status;		/* Status returned by function	*/
-	nis_name	source;		/* Source of this answer	*/
-	opaque		dir_data<>;	/* Directory Data (XDR'ed)	*/
-	opaque		signature<>;	/* Signature of the source	*/
-};
-
-%/*
-% * Structures used for server binding.
-% */
-struct nis_bound_endpoint {
-	endpoint ep;
-	int generation;
-	int rank;
-	uint32_t flags;
-	int hostnum;
-	int epnum;
-	nis_name uaddr;
-	endpoint cbep;
-};
-typedef struct nis_bound_endpoint nis_bound_endpoint;
-
-struct nis_bound_directory {
-	int generation;
-	int min_rank;           /* minimum rank of bound endpoints */
-	int optimal_rank;       /* best possible rank of all endpoints */
-	directory_obj dobj;
-	nis_bound_endpoint BEP<>;
-};
-typedef struct nis_bound_directory nis_bound_directory;
-%#define bep_len BEP.BEP_len
-%#define bep_val BEP.BEP_val
-
-struct nis_active_endpoint {
-	endpoint ep;
-	nis_name hostname;
-	int rank;
-	int uaddr_generation;
-	nis_name uaddr;
-	int cbep_generation;
-	endpoint cbep;
-};
-typedef struct nis_active_endpoint nis_active_endpoint;
-
-%/* defines for nis_bound_endpoint.flags */
-%#define NIS_BOUND 0x1
-%#define NIS_TRANSIENT_ERRORS 0x2
-
-program  NIS_PROG {
-
-	/* RPC Language description of the NIS+ protocol */
-	version NIS_VERSION {
-		/* The name service functions */
-		nis_result  NIS_LOOKUP(ns_request) = 1;
-		nis_result  NIS_ADD(ns_request) = 2;
-		nis_result  NIS_MODIFY(ns_request) = 3;
-		nis_result  NIS_REMOVE(ns_request) = 4;
-
-		/* The information base functions */
-		nis_result  NIS_IBLIST(ib_request) = 5;
-		nis_result  NIS_IBADD(ib_request) = 6;
-		nis_result  NIS_IBMODIFY(ib_request) = 7;
-		nis_result  NIS_IBREMOVE(ib_request) = 8;
-		nis_result  NIS_IBFIRST(ib_request) = 9;
-		nis_result  NIS_IBNEXT(ib_request) = 10;
-
-		/* NIS Administrative functions */
-		fd_result   NIS_FINDDIRECTORY(fd_args) = 12;
-
-		/* If fetch and optionally reset statistics */
-		nis_taglist  NIS_STATUS(nis_taglist) = 14;
-
-		/* Dump changes to directory since time in da_time */
-		log_result  NIS_DUMPLOG(dump_args) = 15;
-
-		/* Dump contents of directory named */
-		log_result  NIS_DUMP(dump_args) = 16;
-
-		/* Check status of callback thread */
-		bool	    NIS_CALLBACK(netobj) = 17;
-
-		/* Return last update time for named dir */
-		uint32_t    NIS_CPTIME(nis_name) = 18;
-
-		/* Checkpoint directory or table named */
-		cp_result   NIS_CHECKPOINT(nis_name) = 19;
-
-		/* Send 'status changed' ping to replicates */
-		void	    NIS_PING(ping_args) = 20;
-
-		/* Modify server behaviour (such as debugging) */
-		nis_taglist NIS_SERVSTATE(nis_taglist) = 21;
-
-		/* Create a Directory */
-		nis_error   NIS_MKDIR(nis_name) = 22;
-
-		/* Remove a Directory */
-		nis_error   NIS_RMDIR(nis_name) = 23;
-
-		/* Update public keys of a directory object */
-		nis_error   NIS_UPDKEYS(nis_name) = 24;
-	} = 3;
-} = 100300;
-
-/*
- * Included below are the defines that become part of nis.h,
- * they are technically not part of the protocol, but do define
- * key aspects of the implementation and are therefore useful
- * in building a conforming server or client.
- */
-#if RPC_HDR
-%/*
-% * Generic "hash" datastructures, used by all types of hashed data.
-% */
-%struct nis_hash_data {
-%	nis_name		name;	   /* NIS name of hashed item      */
-%	int			keychain;  /* It's hash key (for pop)      */
-%	struct nis_hash_data	*next;	   /* Hash collision pointer       */
-%	struct nis_hash_data	*prv_item; /* A serial, doubly linked list */
-%	struct nis_hash_data	*nxt_item; /* of items in the hash table   */
-%};
-%typedef struct nis_hash_data NIS_HASH_ITEM;
-%
-%struct nis_hash_table {
-%	NIS_HASH_ITEM	*keys[64];	/* A hash table of items           */
-%	NIS_HASH_ITEM	*first;		/* The first "item" in serial list */
-%};
-%typedef struct nis_hash_table NIS_HASH_TABLE;
-%
-%/* Structure for storing dynamically allocated static data */
-%struct nis_sdata {
-%	void	*buf;	/* Memory allocation pointer	*/
-%	u_int	size;	/* Buffer size			*/
-%};
-%
-%/* Generic client creating flags */
-%#define ZMH_VC		1
-%#define ZMH_DG		2
-%#define ZMH_AUTH	4
-%
-%/* Testing Access rights for objects */
-%
-%#define NIS_READ_ACC		1
-%#define NIS_MODIFY_ACC		2
-%#define NIS_CREATE_ACC		4
-%#define NIS_DESTROY_ACC	8
-%/* Test macros. a == access rights, m == desired rights. */
-%#define NIS_WORLD(a, m)	(((a) & (m)) != 0)
-%#define NIS_GROUP(a, m)	(((a) & ((m) << 8)) != 0)
-%#define NIS_OWNER(a, m)	(((a) & ((m) << 16)) != 0)
-%#define NIS_NOBODY(a, m)	(((a) & ((m) << 24)) != 0)
-%/*
-% * EOL Alert - The following non-prefixed test macros are
-% * here for backward compatability, and will be not be present
-% * in future releases - use the NIS_*() macros above.
-% */
-%#define WORLD(a, m)	(((a) & (m)) != 0)
-%#define GROUP(a, m)	(((a) & ((m) << 8)) != 0)
-%#define OWNER(a, m)	(((a) & ((m) << 16)) != 0)
-%#define NOBODY(a, m)	(((a) & ((m) << 24)) != 0)
-%
-%#define OATYPE(d, n) (((d)->do_armask.do_armask_val+n)->oa_otype)
-%#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
-%#define WORLD_DEFAULT (NIS_READ_ACC)
-%#define GROUP_DEFAULT (NIS_READ_ACC << 8)
-%#define OWNER_DEFAULT ((NIS_READ_ACC +\
-			 NIS_MODIFY_ACC +\
-			 NIS_CREATE_ACC +\
-			 NIS_DESTROY_ACC) << 16)
-%#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
-%
-%/* Result manipulation defines ... */
-%#define NIS_RES_NUMOBJ(x)	((x)->objects.objects_len)
-%#define NIS_RES_OBJECT(x)	((x)->objects.objects_val)
-%#define NIS_RES_COOKIE(x)	((x)->cookie)
-%#define NIS_RES_STATUS(x)	((x)->status)
-%
-%/* These defines make getting at the variant part of the object easier. */
-%#define TA_data zo_data.objdata_u.ta_data
-%#define EN_data zo_data.objdata_u.en_data
-%#define DI_data zo_data.objdata_u.di_data
-%#define LI_data zo_data.objdata_u.li_data
-%#define GR_data zo_data.objdata_u.gr_data
-%
-%#define __type_of(o) ((o)->zo_data.zo_type)
-%
-%/* Declarations for the internal subroutines in nislib.c */
-%enum name_pos {SAME_NAME, HIGHER_NAME, LOWER_NAME, NOT_SEQUENTIAL, BAD_NAME};
-%typedef enum name_pos name_pos;
-%
-%/*
-% * Defines for getting at column data in entry objects. Because RPCGEN
-% * generates some rather wordy structures, we create some defines that
-% * collapse the needed keystrokes to access a particular value using
-% * these definitions they take an nis_object *, and an int and return
-% * a u_char * for Value, and an int for length.
-% */
-%#define ENTRY_VAL(obj, col) \
-%	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
-%#define ENTRY_LEN(obj, col) \
-%	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
-%
-%
-%
-%#ifdef __cplusplus
-%}
-%#endif
-%
-%/* Prototypes, and extern declarations for the NIS library functions. */
-%#include <rpcsvc/nislib.h>
-%#endif /* __NIS_RPCGEN_H */
-%/* EDIT_START */
-%
-%/*
-% * nis_3.h
-% *
-% * This file contains definitions that are only of interest to the actual
-% * service daemon and client stubs. Normal users of NIS will not include
-% * this file.
-% *
-% * NOTE : This include file is automatically created by a combination
-% * of rpcgen and sed. DO NOT EDIT IT, change the nis.x file instead
-% * and then remake this file.
-% */
-%#ifndef __nis_3_h
-%#define __nis_3_h
-%#ifdef __cplusplus
-%extern "C" {
-%#endif
-#endif
diff --git a/openflow/usr/include/rpcsvc/nis_callback.h b/openflow/usr/include/rpcsvc/nis_callback.h
deleted file mode 100644
index 6f05728..0000000
--- a/openflow/usr/include/rpcsvc/nis_callback.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _RPCSVC_NIS_CALLBACK_H
-#define _RPCSVC_NIS_CALLBACK_H 1
-
-#include <rpc/rpc.h>
-#include <rpcsvc/nis.h>
-
-__BEGIN_DECLS
-
-typedef nis_object *obj_p;
-
-struct cback_data {
-	struct {
-		u_int entries_len;
-		obj_p *entries_val;
-	} entries;
-};
-typedef struct cback_data cback_data;
-
-#define CB_PROG 100302
-#define CB_VERS 1
-
-#define CBPROC_RECEIVE 1
-extern  bool_t * cbproc_receive_1 (cback_data *, CLIENT *) __THROW;
-extern  bool_t * cbproc_receive_1_svc (cback_data *, struct svc_req *) __THROW;
-
-#define CBPROC_FINISH 2
-extern  void * cbproc_finish_1 (void *, CLIENT *) __THROW;
-extern  void * cbproc_finish_1_svc (void *, struct svc_req *) __THROW;
-
-#define CBPROC_ERROR 3
-extern  void * cbproc_error_1 (nis_error *, CLIENT *) __THROW;
-extern  void * cbproc_error_1_svc (nis_error *, struct svc_req *) __THROW;
-extern int cb_prog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t) __THROW;
-
-/* the xdr functions */
-
-extern  bool_t xdr_obj_p (XDR *, obj_p*) __THROW;
-extern  bool_t xdr_cback_data (XDR *, cback_data*) __THROW;
-
-__END_DECLS
-
-#endif /* !_RPCVSC_NIS_CALLBACK_H */
diff --git a/openflow/usr/include/rpcsvc/nis_callback.x b/openflow/usr/include/rpcsvc/nis_callback.x
deleted file mode 100644
index 0fdca9e..0000000
--- a/openflow/usr/include/rpcsvc/nis_callback.x
+++ /dev/null
@@ -1,63 +0,0 @@
-%/*
-% * Copyright (c) 2010, Oracle America, Inc.
-% *
-% * Redistribution and use in source and binary forms, with or without
-% * modification, are permitted provided that the following conditions are
-% * met:
-% *
-% *     * Redistributions of source code must retain the above copyright
-% *       notice, this list of conditions and the following disclaimer.
-% *     * Redistributions in binary form must reproduce the above
-% *       copyright notice, this list of conditions and the following
-% *       disclaimer in the documentation and/or other materials
-% *       provided with the distribution.
-% *     * Neither the name of the "Oracle America, Inc." nor the names of its
-% *       contributors may be used to endorse or promote products derived
-% *       from this software without specific prior written permission.
-% *
-% *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-% *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-% *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-% *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-% *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-% *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-% *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-% *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-% *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-% *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-% *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-% *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-% */
-
-/*
- *	nis_callback.x
- */
-
-%#pragma ident	"@(#)nis_callback.x	1.7	94/05/03"
-
-/*
- * "@(#)zns_cback.x 1.2 90/09/10"
- *
- * RPCL description of the Callback Service.
- */
-
-#ifdef RPC_HDR
-%#include <rpcsvc/nis.h>
-#endif
-#ifdef RPC_XDR
-%#include "nis_clnt.h"
-#endif
-
-typedef nis_object	*obj_p;
-
-struct cback_data {
-	obj_p		entries<>;	/* List of objects */
-};
-
-program CB_PROG {
-	version CB_VERS {
-		bool	CBPROC_RECEIVE(cback_data) = 1;
-		void	CBPROC_FINISH(void) = 2;
-		void	CBPROC_ERROR(nis_error) = 3;
-	} = 1;
-} = 100302;
diff --git a/openflow/usr/include/rpcsvc/nis_object.x b/openflow/usr/include/rpcsvc/nis_object.x
deleted file mode 100644
index 774b38f..0000000
--- a/openflow/usr/include/rpcsvc/nis_object.x
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- *	nis_object.x
- *
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-%#pragma ident	"@(#)nis_object.x	1.12	97/11/19"
-
-#if RPC_HDR
-%
-%#ifndef __nis_object_h
-%#define __nis_object_h
-%
-#endif
-/*
- *	This file defines the format for a NIS object in RPC language.
- * It is included by the main .x file and the database access protocol
- * file. It is common because both of them need to deal with the same
- * type of object. Generating the actual code though is a bit messy because
- * the nis.x file and the nis_dba.x file will generate xdr routines to
- * encode/decode objects when only one set is needed. Such is life when
- * one is using rpcgen.
- *
- * Note, the protocol doesn't specify any limits on such things as
- * maximum name length, number of attributes, etc. These are enforced
- * by the database backend. When you hit them you will no. Also see
- * the db_getlimits() function for fetching the limit values.
- *
- */
-
-/* Some manifest constants, chosen to maximize flexibility without
- * plugging the wire full of data.
- */
-const NIS_MAXSTRINGLEN = 255;
-const NIS_MAXNAMELEN   = 1024;
-const NIS_MAXATTRNAME  = 32;
-const NIS_MAXATTRVAL   = 2048;
-const NIS_MAXCOLUMNS   = 64;
-const NIS_MAXATTR      = 16;
-const NIS_MAXPATH      = 1024;
-const NIS_MAXREPLICAS  = 128;
-const NIS_MAXLINKS     = 16;
-
-const NIS_PK_NONE      = 0;	/* no public key (unix/sys auth) */
-const NIS_PK_DH	       = 1;	/* Public key is Diffie-Hellman type */
-const NIS_PK_RSA       = 2;	/* Public key if RSA type */
-const NIS_PK_KERB      = 3;	/* Use kerberos style authentication */
-const NIS_PK_DHEXT     = 4;	/* Extended Diffie-Hellman for RPC-GSS */
-
-/*
- * The fundamental name type of NIS. The name may consist of two parts,
- * the first being the fully qualified name, and the second being an
- * optional set of attribute/value pairs.
- */
-struct nis_attr {
-	string	zattr_ndx<>;	/* name of the index		*/
-	opaque	zattr_val<>;	/* Value for the attribute.	*/
-};
-
-typedef string nis_name<>;	/* The NIS name itself. */
-
-/* NIS object types are defined by the following enumeration. The numbers
- * they use are based on the following scheme :
- *		     0 - 1023 are reserved for Sun,
- *		1024 - 2047 are defined to be private to a particular tree.
- *		2048 - 4095 are defined to be user defined.
- *		4096 - ...  are reserved for future use.
- *
- * EOL Alert - The non-prefixed names are present for backward
- * compatability only, and will not exist in future releases. Use
- * the NIS_* names for future compatability.
- */
-
-enum zotypes {
-
-	BOGUS_OBJ	= 0,	/* Uninitialized object structure	*/
-	NO_OBJ		= 1,	/* NULL object (no data)		*/
-	DIRECTORY_OBJ	= 2,	/* Directory object describing domain	*/
-	GROUP_OBJ	= 3,	/* Group object (a list of names)	*/
-	TABLE_OBJ	= 4,	/* Table object (a database schema)	*/
-	ENTRY_OBJ	= 5,	/* Entry object (a database record)	*/
-	LINK_OBJ	= 6,	/* A name link.				*/
-	PRIVATE_OBJ	= 7,	/* Private object (all opaque data)	*/
-
-	NIS_BOGUS_OBJ	= 0,	/* Uninitialized object structure	*/
-	NIS_NO_OBJ	= 1,	/* NULL object (no data)		*/
-	NIS_DIRECTORY_OBJ = 2, /* Directory object describing domain	*/
-	NIS_GROUP_OBJ	= 3,	/* Group object (a list of names)	*/
-	NIS_TABLE_OBJ	= 4,	/* Table object (a database schema)	*/
-	NIS_ENTRY_OBJ	= 5,	/* Entry object (a database record)	*/
-	NIS_LINK_OBJ	= 6,	/* A name link.				*/
-	NIS_PRIVATE_OBJ  = 7 /* Private object (all opaque data) */
-};
-
-/*
- * The types of Name services NIS knows about. They are enumerated
- * here. The Binder code will use this type to determine if it has
- * a set of library routines that will access the indicated name service.
- */
-enum nstype {
-	UNKNOWN = 0,
-	NIS = 1,	/* Nis Plus Service		*/
-	SUNYP = 2,	/* Old NIS Service		*/
-	IVY = 3,	/* Nis Plus Plus Service	*/
-	DNS = 4,	/* Domain Name Service		*/
-	X500 = 5,	/* ISO/CCCIT X.500 Service	*/
-	DNANS = 6,	/* Digital DECNet Name Service	*/
-	XCHS = 7,	/* Xerox ClearingHouse Service	*/
-	CDS= 8
-};
-
-/*
- * DIRECTORY - The name service object. These objects identify other name
- * servers that are serving some portion of the name space. Each has a
- * type associated with it. The resolver library will note whether or not
- * is has the needed routines to access that type of service.
- * The oarmask structure defines an access rights mask on a per object
- * type basis for the name spaces. The only bits currently used are
- * create and destroy. By enabling or disabling these access rights for
- * a specific object type for a one of the accessor entities (owner,
- * group, world) the administrator can control what types of objects
- * may be freely added to the name space and which require the
- * administrator's approval.
- */
-struct oar_mask {
-	uint32_t	oa_rights;	/* Access rights mask	*/
-	zotypes		oa_otype;	/* Object type		*/
-};
-
-struct endpoint {
-	string		uaddr<>;
-	string		family<>;   /* Transport family (INET, OSI, etc) */
-	string		proto<>;    /* Protocol (TCP, UDP, CLNP,  etc)   */
-};
-
-/*
- * Note: pkey is a netobj which is limited to 1024 bytes which limits the
- * keysize to 8192 bits. This is consider to be a reasonable limit for
- * the expected lifetime of this service.
- */
-struct nis_server {
-	nis_name	name;		/* Principal name of the server  */
-	endpoint	ep<>;		/* Universal addr(s) for server  */
-	uint32_t	key_type;	/* Public key type		 */
-	netobj		pkey;		/* server's public key		 */
-};
-
-struct directory_obj {
-	nis_name   do_name;	 /* Name of the directory being served   */
-	nstype	   do_type;	 /* one of NIS, DNS, IVY, YP, or X.500	 */
-	nis_server do_servers<>; /* <0> == Primary name server		 */
-	uint32_t   do_ttl;	 /* Time To Live (for caches)		 */
-	oar_mask   do_armask<>;  /* Create/Destroy rights by object type */
-};
-
-/*
- * ENTRY - This is one row of data from an information base.
- * The type value is used by the client library to convert the entry to
- * it's internal structure representation. The Table name is a back pointer
- * to the table where the entry is stored. This allows the client library
- * to determine where to send a request if the client wishes to change this
- * entry but got to it through a LINK rather than directly.
- * If the entry is a "standalone" entry then this field is void.
- */
-const EN_BINARY   = 1;	/* Indicates value is binary data	*/
-const EN_CRYPT    = 2;	/* Indicates the value is encrypted	*/
-const EN_XDR      = 4;	/* Indicates the value is XDR encoded	*/
-const EN_MODIFIED = 8;	/* Indicates entry is modified.	*/
-const EN_ASN1     = 64;	/* Means contents use ASN.1 encoding    */
-
-struct entry_col {
-	uint32_t	ec_flags;	/* Flags for this value */
-	opaque		ec_value<>;	/* It's textual value	*/
-};
-
-struct entry_obj {
-	string	en_type<>;	/* Type of entry such as "passwd" */
-	entry_col en_cols<>;	/* Value for the entry		  */
-};
-
-/*
- * GROUP - The group object contains a list of NIS principal names. Groups
- * are used to authorize principals. Each object has a set of access rights
- * for members of its group. Principal names in groups are in the form
- * name.directory and recursive groups are expressed as @groupname.directory
- */
-struct group_obj {
-	uint32_t	gr_flags;	/* Flags controlling group	*/
-	nis_name	gr_members<>;	/* List of names in group	*/
-};
-
-/*
- * LINK - This is the LINK object. It is quite similar to a symbolic link
- * in the UNIX filesystem. The attributes in the main object structure are
- * relative to the LINK data and not what it points to (like the file system)
- * "modify" privleges here indicate the right to modify what the link points
- * at and not to modify that actual object pointed to by the link.
- */
-struct link_obj {
-	zotypes	 li_rtype;	/* Real type of the object	*/
-	nis_attr li_attrs<>;	/* Attribute/Values for tables	*/
-	nis_name li_name;	/* The object's real NIS name	*/
-};
-
-/*
- * TABLE - This is the table object. It implements a simple
- * data base that applications and use for configuration or
- * administration purposes. The role of the table is to group together
- * a set of related entries. Tables are the simple database component
- * of NIS. Like many databases, tables are logically divided into columns
- * and rows. The columns are labeled with indexes and each ENTRY makes
- * up a row. Rows may be addressed within the table by selecting one
- * or more indexes, and values for those indexes. Each row which has
- * a value for the given index that matches the desired value is returned.
- * Within the definition of each column there is a flags variable, this
- * variable contains flags which determine whether or not the column is
- * searchable, contains binary data, and access rights for the entry objects
- * column value.
- */
-
-const TA_BINARY     = 1;	/* Means table data is binary		*/
-const TA_CRYPT      = 2;	/* Means value should be encrypted	*/
-const TA_XDR        = 4;	/* Means value is XDR encoded		*/
-const TA_SEARCHABLE = 8;	/* Means this column is searchable	*/
-const TA_CASE       = 16;	/* Means this column is Case Sensitive	*/
-const TA_MODIFIED   = 32;	/* Means this columns attrs are modified*/
-const TA_ASN1       = 64;	/* Means contents use ASN.1 encoding     */
-
-struct table_col {
-	string		tc_name<64>;	/* Column Name		   */
-	uint32_t	tc_flags;	/* control flags	   */
-	uint32_t	tc_rights;	/* Access rights mask	   */
-};
-
-struct table_obj {
-	string	  ta_type<64>;	 /* Table type such as "passwd"	*/
-	int	  ta_maxcol;	 /* Total number of columns	*/
-	u_char	  ta_sep;	 /* Separator character		*/
-	table_col ta_cols<>;	 /* The number of table indexes */
-	string	  ta_path<>;	 /* A search path for this table */
-};
-
-/*
- * This union joins together all of the currently known objects.
- */
-union objdata switch (zotypes zo_type) {
-	case NIS_DIRECTORY_OBJ :
-		struct directory_obj di_data;
-	case NIS_GROUP_OBJ :
-		struct group_obj gr_data;
-	case NIS_TABLE_OBJ :
-		struct table_obj ta_data;
-	case NIS_ENTRY_OBJ:
-		struct entry_obj en_data;
-	case NIS_LINK_OBJ :
-		struct link_obj li_data;
-	case NIS_PRIVATE_OBJ :
-		opaque	po_data<>;
-	case NIS_NO_OBJ :
-		void;
-	case NIS_BOGUS_OBJ :
-		void;
-	default :
-		void;
-};
-
-/*
- * This is the basic NIS object data type. It consists of a generic part
- * which all objects contain, and a specialized part which varies depending
- * on the type of the object. All of the specialized sections have been
- * described above. You might have wondered why they all start with an
- * integer size, followed by the useful data. The answer is, when the
- * server doesn't recognize the type returned it treats it as opaque data.
- * And the definition for opaque data is {int size; char *data;}. In this
- * way, servers and utility routines that do not understand a given type
- * may still pass it around. One has to be careful in setting
- * this variable accurately, it must take into account such things as
- * XDR padding of structures etc. The best way to set it is to note one's
- * position in the XDR encoding stream, encode the structure, look at the
- * new position and calculate the size.
- */
-struct nis_oid {
-	uint32_t ctime;		/* Time of objects creation	*/
-	uint32_t mtime;		/* Time of objects modification */
-};
-
-struct nis_object {
-	nis_oid	 zo_oid;	/* object identity verifier.		*/
-	nis_name zo_name;	/* The NIS name for this object		*/
-	nis_name zo_owner;	/* NIS name of object owner.		*/
-	nis_name zo_group;	/* NIS name of access group.		*/
-	nis_name zo_domain;	/* The administrator for the object	*/
-	uint32_t zo_access;	/* Access rights (owner, group, world)	*/
-	uint32_t zo_ttl;	/* Object's time to live in seconds.	*/
-	objdata	 zo_data;	/* Data structure for this type		*/
-};
-#if RPC_HDR
-%
-%#endif /* if __nis_object_h */
-%
-#endif
diff --git a/openflow/usr/include/rpcsvc/nis_tags.h b/openflow/usr/include/rpcsvc/nis_tags.h
deleted file mode 100644
index c2dc7fd..0000000
--- a/openflow/usr/include/rpcsvc/nis_tags.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- *	nis_tags.h
- *
- *	This file contains the tags and statistics definitions. It is
- *	automatically included by nis.h
- */
-
-#ifndef	_RPCSVC_NIS_TAGS_H
-#define	_RPCSVC_NIS_TAGS_H
-
-#if 0
-#pragma ident	"@(#)nis_tags.h	1.16	96/10/25"
-#endif
-/* from file: zns_tags.h	1.7 */
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-
-#define	NIS_DIR	"data"
-
-/* Lookup and List function flags */
-#define	FOLLOW_LINKS	(1<<0)	/* Follow link objects			*/
-#define	FOLLOW_PATH	(1<<1)	/* Follow the path in a table		*/
-#define	HARD_LOOKUP	(1<<2)	/* Block until successful		*/
-#define	ALL_RESULTS	(1<<3)	/* Retrieve all results			*/
-#define	NO_CACHE	(1<<4)	/* Do not return 'cached' results	*/
-#define	MASTER_ONLY	(1<<5)	/* Get value only from master server	*/
-#define	EXPAND_NAME	(1<<6)	/* Expand partitially qualified names	*/
-
-/* Semantic modification for table operations flags */
-#define	RETURN_RESULT	(1<<7)	/* Return resulting object to client    */
-#define	ADD_OVERWRITE	(1<<8)	/* Allow overwrites on ADD		*/
-#define	REM_MULTIPLE	(1<<9)	/* Allow wildcard deletes		*/
-#define	MOD_SAMEOBJ	(1<<10)	/* Check modified object before write	*/
-#define	ADD_RESERVED	(1<<11)	/* Spare ADD semantic			*/
-#define	REM_RESERVED	(1<<12)	/* Spare REM semantic			*/
-#define	MOD_EXCLUSIVE	(1<<13)	/* Modify no overwrite on modified keys */
-
-/* Lookup and List function flags (continued) */
-#define	SOFT_LOOKUP	(1<<14)	/* The "old default" return on failure  */
-
-/* Transport specific modifications to the operation */
-#define	USE_DGRAM	(1<<16) /* Use a datagram transport		*/
-#define	NO_AUTHINFO	(1<<17) /* Don't bother attaching auth info	*/
-
-/*
- * Declarations for "standard" NIS+ tags
- * State variable tags have values	0 - 2047
- * Statistic tags have values		2048 - 65535
- * User Tags have values		>2^16
- */
-#define	TAG_DEBUG	1	/* set debug level		*/
-#define	TAG_STATS	2	/* Enable/disable statistics	*/
-#define	TAG_GCACHE	3	/* Flush the Group Cache	*/
-#define	TAG_GCACHE_ALL	TAG_GCACHE
-#define	TAG_DCACHE	4	/* Flush the directory cache	*/
-#define	TAG_DCACHE_ONE	TAG_DCACHE
-#define	TAG_OCACHE	5	/* Flush the Object Cache	*/
-#define	TAG_SECURE	6	/* Set the security level	*/
-#define	TAG_TCACHE_ONE	7	/* Flush the table cache	*/
-#define	TAG_DCACHE_ALL	8	/* Flush entire directory cache	*/
-#define	TAG_TCACHE_ALL	9	/* Flush entire table cache	*/
-#define	TAG_GCACHE_ONE	10	/* Flush one group object	*/
-#define	TAG_DCACHE_ONE_REFRESH 11 /* Flush and refresh one DO	*/
-#define	TAG_READONLY	12	/* Set read only mode		*/
-#define	TAG_READWRITE	14	/* Reset read-write mode	*/
-
-#define	TAG_OPSTATS	2048	/* NIS+ operations statistics   */
-#define	TAG_THREADS	2049	/* Child process/thread status  */
-#define	TAG_HEAP	2050	/* Heap usage statistics	*/
-#define	TAG_UPDATES	2051	/* Updates to this service	*/
-#define	TAG_VISIBLE	2052	/* First update that isn't replicated */
-#define	TAG_S_DCACHE	2053	/* Directory cache statistics	*/
-#define	TAG_S_OCACHE	2054	/* Object cache statistics	*/
-#define	TAG_S_GCACHE	2055	/* Group cache statistics	*/
-#define	TAG_S_STORAGE	2056	/* Group cache statistics	*/
-#define	TAG_UPTIME	2057	/* Time that server has been up */
-#define	TAG_DIRLIST	2058	/* Dir served by this server    */
-#define	TAG_NISCOMPAT	2059	/* Whether supports NIS compat mode */
-#define	TAG_DNSFORWARDING 2060	/* Whether DNS forwarding supported */
-#define	TAG_SECURITY_LEVEL 2061	/* Security level of the server	*/
-#define	TAG_ROOTSERVER	2062	/* Whether root server		*/
-
-/*
- * Declarations for the Group object flags. Currently
- * there are only 3.
- */
-#define	IMPMEM_GROUPS  1	/* Implicit Membership allowed	*/
-#define	RECURS_GROUPS  2	/* Recursive Groups allowed	*/
-#define	NEGMEM_GROUPS  4	/* Negative Groups allowed	*/
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _RPCSVC_NIS_TAGS_H */
diff --git a/openflow/usr/include/rpcsvc/nislib.h b/openflow/usr/include/rpcsvc/nislib.h
deleted file mode 100644
index 21a8e48..0000000
--- a/openflow/usr/include/rpcsvc/nislib.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	__RPCSVC_NISLIB_H__
-#define	__RPCSVC_NISLIB_H__
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-typedef const char *const_nis_name;
-
-/* nis_names: These functions are used to locate and manipulate all NIS+
- * objects except the NIS+ entry objects.
- *
- * nis_lookup (name, flags) resolves a NIS+ name and returns a copy of
- *                          that object  from a NIS+ server.
- *    const nis_name name: name of the object to be resolved
- *    unsigned int flags: logically ORing zero or more flags (FOLLOW_LINKS,
- *                          HARD_LOOKUP, [NO_CACHE], MASTER_ONLY, EXPAND_NAME)
- *
- * nis_add (name, obj) adds objects to the NIS+ namespace.
- *    const nis_name name: fully qualified NIS+ name.
- *    const nis_object *obj: object members zo_name and zo_domain will be
- *                           constructed from name.
- *
- * nis_remove (name, obj) removes objects from the NIS+ namespace.
- *    const nis_name name: fully qualified NIS+ name.
- *    const nis_object *obj: if not NULL, it is assumed to point to a copy
- *                           of the object being removed. In this case, if
- *                           the object on the server does not have the same
- *                           object identifier as the  object  being  passed,
- *                           the operation will fail with the NIS_NOTSAMEOBJ
- *                           error.
- *
- * nis_modify (name, obj) can change specific attributes of an object
- *                        that already exists in the namespace.
- */
-extern nis_result *nis_lookup (const_nis_name name, unsigned int flags)
-     __THROW;
-extern nis_result *nis_add (const_nis_name name, const nis_object *obj)
-     __THROW;
-extern nis_result *nis_remove (const_nis_name name,
-			       const nis_object *obj) __THROW;
-extern nis_result *nis_modify (const_nis_name name,
-			       const nis_object *obj) __THROW;
-
-/* nis_tables: These functions are used to search and modify NIS+ tables.
- *
- * nis_list (table_name, flags, callback(table_name, obj, userdata), userdata)
- *           search a table in the NIS+ namespace.
- *    const nis_name table_name: indexed name ([xx=yy],table.dir)
- *    unsigned int flags: logically ORing one or more flags (FOLLOW_LINKS,
- *                      [FOLLOW_PATH], HARD_LOOKUP, [ALL_RESULTS], [NO_CACHE],
- *                      MASTER_ONLY, EXPAND_NAME, RETURN_RESULT)
- *    callback(): callback is an optional pointer to a function that will
- *                process the ENTRY type objects that are returned from the
- *                search. If this pointer is NULL, then all entries that match
- *                the search criteria are returned in the nis_result structure,
- *                otherwise  this  function  will  be  called once for each
- *                entry returned.
- *    void *userdata: passed to callback function along with the returned
- *                    entry object.
- *
- * nis_add_entry (table_name, obj, flags) will add the NIS+ object to the
- *                                        NIS+ table_name.
- *    const nis_name table_name
- *    const nis_object *obj
- *    unsigned int flags: 0, ADD_OVERWRITE, RETURN_RESULT
- *
- * nis_modify_entry (name, obj, flags) modifies an object identified by name.
- *    const nis_name name: object identifier
- *    const nis_object *obj: should point to an entry with the EN_MODIFIED
- *                           flag set in each column that contains new
- *                           information.
- *    unsigned int flags: 0, MOD_SAMEOBJ, RETURN_RESULT
- *
- * nis_remove_entry (table_name, obj, flags) removes a set of entries
- *                                 identified by table_name from the table.
- *    const nis_name table_name: indexed NIS+ name
- *    const nis_object *obj: if obj is non-null, it is presumed to point to
- *                           a cached copy of the entry. When the removal is
- *                           attempted, and the object that would be removed
- *                           is not the same as the cached object pointed to
- *                           by object then the operation will fail with an
- *                           NIS_NOTSAMEOBJ error
- *    unsigned int flags: 0, REM_MULTIPLE
- *
- * nis_first_entry (table_name) fetches entries from a table one at a time.
- *    const nis_name table_name
- *
- * nis_next_entry (table_name, cookie) retrieves the "next" entry from a
- *                                     table specified by table_name.
- *    const nis_name table_name:
- *    const netobj *cookie: The value of cookie from the nis_result structure
- *                          form the previous call.
- */
-extern nis_result *nis_list (const_nis_name __name, unsigned int __flags,
-			     int (*__callback)(const_nis_name __table_name,
-					       const nis_object *__obj,
-					       const void *__userdata),
-			     const void *__userdata) __THROW;
-extern nis_result *nis_add_entry (const_nis_name __table_name,
-				  const nis_object *__obj,
-				  unsigned int __flags) __THROW;
-extern nis_result *nis_modify_entry (const_nis_name __name,
-				     const nis_object *__obj,
-				     unsigned int __flags) __THROW;
-extern nis_result *nis_remove_entry (const_nis_name __table_name,
-				     const nis_object *__obj,
-				     unsigned int __flags) __THROW;
-extern nis_result *nis_first_entry (const_nis_name __table_name) __THROW;
-extern nis_result *nis_next_entry (const_nis_name __table_name,
-				   const netobj *__cookie) __THROW;
-/*
-** nis_server
-*/
-extern nis_error nis_mkdir (const_nis_name __dirname,
-			    const nis_server *__machine) __THROW;
-extern nis_error nis_rmdir (const_nis_name __dirname,
-			    const nis_server *__machine) __THROW;
-extern nis_error nis_servstate (const nis_server *__machine,
-				const nis_tag *__tags, int __numtags,
-				nis_tag **__result) __THROW;
-extern nis_error nis_stats (const nis_server *__machine,
-			    const nis_tag *__tags, int __numtags,
-			    nis_tag **__result) __THROW;
-extern void nis_freetags (nis_tag *__tags, int __numtags) __THROW;
-extern nis_server **nis_getservlist (const_nis_name __dirname) __THROW;
-extern void nis_freeservlist (nis_server **__machines) __THROW;
-
-/*
-** nis_subr
-*/
-extern nis_name nis_leaf_of (const_nis_name __name) __THROW;
-extern nis_name nis_leaf_of_r (const_nis_name __name, char *__buffer,
-			       size_t __buflen) __THROW;
-extern nis_name nis_name_of (const_nis_name __name) __THROW;
-extern nis_name nis_name_of_r (const_nis_name __name, char *__buffer,
-			       size_t __buflen) __THROW;
-extern nis_name nis_domain_of (const_nis_name __name) __THROW;
-extern nis_name nis_domain_of_r (const_nis_name __name, char *__buffer,
-				 size_t __buflen) __THROW;
-extern nis_name *nis_getnames (const_nis_name __name) __THROW;
-extern void nis_freenames (nis_name *__namelist) __THROW;
-extern name_pos nis_dir_cmp (const_nis_name __n1, const_nis_name __n2) __THROW;
-extern nis_object *nis_clone_object (const nis_object *__src,
-				     nis_object *__dest) __THROW;
-extern void nis_destroy_object (nis_object *__obj) __THROW;
-extern void nis_print_object (const nis_object *__obj) __THROW;
-
-/*
-** nis_local_names
-*/
-extern nis_name nis_local_group (void) __THROW;
-extern nis_name nis_local_directory (void) __THROW;
-extern nis_name nis_local_principal (void) __THROW;
-extern nis_name nis_local_host (void) __THROW;
-
-/*
-** nis_error
-*/
-extern const char *nis_sperrno (const nis_error __status) __THROW;
-extern void nis_perror (const nis_error __status, const char *__label) __THROW;
-extern void nis_lerror (const nis_error __status, const char *__label) __THROW;
-extern char *nis_sperror (const nis_error status, const char *__label) __THROW;
-extern char *nis_sperror_r (const nis_error __status, const char *__label,
-			    char *__buffer, size_t __buflen) __THROW;
-/*
-** nis_groups
-*/
-extern bool_t nis_ismember (const_nis_name __principal,
-			    const_nis_name __group) __THROW;
-extern nis_error nis_addmember (const_nis_name __member,
-				const_nis_name __group) __THROW;
-extern nis_error nis_removemember (const_nis_name __member,
-				   const_nis_name __group) __THROW;
-extern nis_error nis_creategroup (const_nis_name __group,
-				  unsigned int __flags) __THROW;
-extern nis_error nis_destroygroup (const_nis_name __group) __THROW;
-extern void nis_print_group_entry (const_nis_name __group) __THROW;
-extern nis_error nis_verifygroup (const_nis_name __group) __THROW;
-
-/*
-** nis_ping
-*/
-extern void nis_ping (const_nis_name __dirname, uint32_t __utime,
-		      const nis_object *__dirobj) __THROW;
-extern nis_result *nis_checkpoint (const_nis_name __dirname) __THROW;
-
-/*
-** nis_print (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!)
-*/
-extern void nis_print_result (const nis_result *__result) __THROW;
-extern void nis_print_rights (unsigned int __rights) __THROW;
-extern void nis_print_directory (const directory_obj *__dirobj) __THROW;
-extern void nis_print_group (const group_obj *__grpobj) __THROW;
-extern void nis_print_table (const table_obj *__tblobj) __THROW;
-extern void nis_print_link (const link_obj *__lnkobj) __THROW;
-extern void nis_print_entry (const entry_obj *__enobj) __THROW;
-
-/*
-** nis_file (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!)
-*/
-extern directory_obj *readColdStartFile (void) __THROW;
-extern bool_t writeColdStartFile (const directory_obj *__dirobj) __THROW;
-extern nis_object *nis_read_obj (const char *__obj) __THROW;
-extern bool_t nis_write_obj (const char *__file, const nis_object *__obj) __THROW;
-
-/*
-** nis_clone - (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!)
-*/
-extern directory_obj *nis_clone_directory (const directory_obj *__src,
-					   directory_obj *__dest) __THROW;
-extern nis_result *nis_clone_result (const nis_result *__src,
-				     nis_result *__dest) __THROW;
-
-/* nis_free - nis_freeresult */
-extern void nis_freeresult (nis_result *__result) __THROW;
-/* (XXX THE FOLLOWING ARE INTERNAL FUNCTIONS, SHOULD NOT BE USED !!) */
-extern void nis_free_request (ib_request *__req) __THROW;
-extern void nis_free_directory (directory_obj *__dirobj) __THROW;
-extern void nis_free_object (nis_object *__obj) __THROW;
-
-/* (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!) */
-extern nis_name __nis_default_owner (char *) __THROW;
-extern nis_name __nis_default_group (char *) __THROW;
-extern uint32_t __nis_default_ttl (char *) __THROW;
-extern unsigned int __nis_default_access (char *, unsigned int) __THROW;
-extern fd_result *__nis_finddirectory (directory_obj *, const_nis_name) __THROW;
-extern void __free_fdresult (fd_result *) __THROW;
-extern uint32_t __nis_hash (const void *__keyarg, size_t __len) __THROW;
-
-/* NIS+ cache locking */
-extern int __nis_lock_cache (void) __THROW;
-extern int __nis_unlock_cache (void) __THROW;
-
-/* (XXX INTERNAL FUNCTIONS, ONLY FOR rpc.nisd AND glibc !!) */
-#if defined (NIS_INTERNAL) || defined (_LIBC)
-
-struct dir_binding
-{
-  CLIENT *clnt;                  /* RPC CLIENT handle */
-  nis_server *server_val;        /* List of servers */
-  unsigned int server_len;       /* # of servers */
-  unsigned int server_used;      /* Which server we are bind in the moment ? */
-  unsigned int current_ep;       /* Which endpoint of the server are in use? */
-  unsigned int trys;             /* How many server have we tried ? */
-  unsigned int class;            /* From which class is server_val ? */
-  bool_t master_only;            /* Is only binded to the master */
-  bool_t use_auth;               /* Do we use AUTH ? */
-  bool_t use_udp;                /* Do we use UDP ? */
-  struct sockaddr_in addr;       /* Server's IP address */
-  int socket;                    /* Server's local socket */
-};
-typedef struct dir_binding dir_binding;
-
-extern nis_error __nisbind_create (dir_binding *, const nis_server *,
-				   unsigned int, unsigned int, unsigned int,
-				   unsigned int) __THROW;
-extern nis_error __nisbind_connect (dir_binding *) __THROW;
-extern nis_error __nisbind_next (dir_binding *) __THROW;
-extern void __nisbind_destroy (dir_binding *) __THROW;
-extern nis_error __nisfind_server (const_nis_name, int, directory_obj **,
-				   dir_binding *, unsigned int) __THROW;
-
-#endif
-
-__END_DECLS
-
-#endif	/* __RPCSVC_NISLIB_H__ */
diff --git a/openflow/usr/include/rpcsvc/nlm_prot.h b/openflow/usr/include/rpcsvc/nlm_prot.h
deleted file mode 100644
index 5420a6c..0000000
--- a/openflow/usr/include/rpcsvc/nlm_prot.h
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NLM_PROT_H_RPCGEN
-#define _NLM_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LM_MAXSTRLEN 1024
-#define MAXNAMELEN LM_MAXSTRLEN+1
-
-enum nlm_stats {
-	nlm_granted = 0,
-	nlm_denied = 1,
-	nlm_denied_nolocks = 2,
-	nlm_blocked = 3,
-	nlm_denied_grace_period = 4,
-};
-typedef enum nlm_stats nlm_stats;
-
-struct nlm_holder {
-	bool_t exclusive;
-	int svid;
-	netobj oh;
-	u_int l_offset;
-	u_int l_len;
-};
-typedef struct nlm_holder nlm_holder;
-
-struct nlm_testrply {
-	nlm_stats stat;
-	union {
-		struct nlm_holder holder;
-	} nlm_testrply_u;
-};
-typedef struct nlm_testrply nlm_testrply;
-
-struct nlm_stat {
-	nlm_stats stat;
-};
-typedef struct nlm_stat nlm_stat;
-
-struct nlm_res {
-	netobj cookie;
-	nlm_stat stat;
-};
-typedef struct nlm_res nlm_res;
-
-struct nlm_testres {
-	netobj cookie;
-	nlm_testrply stat;
-};
-typedef struct nlm_testres nlm_testres;
-
-struct nlm_lock {
-	char *caller_name;
-	netobj fh;
-	netobj oh;
-	int svid;
-	u_int l_offset;
-	u_int l_len;
-};
-typedef struct nlm_lock nlm_lock;
-
-struct nlm_lockargs {
-	netobj cookie;
-	bool_t block;
-	bool_t exclusive;
-	struct nlm_lock alock;
-	bool_t reclaim;
-	int state;
-};
-typedef struct nlm_lockargs nlm_lockargs;
-
-struct nlm_cancargs {
-	netobj cookie;
-	bool_t block;
-	bool_t exclusive;
-	struct nlm_lock alock;
-};
-typedef struct nlm_cancargs nlm_cancargs;
-
-struct nlm_testargs {
-	netobj cookie;
-	bool_t exclusive;
-	struct nlm_lock alock;
-};
-typedef struct nlm_testargs nlm_testargs;
-
-struct nlm_unlockargs {
-	netobj cookie;
-	struct nlm_lock alock;
-};
-typedef struct nlm_unlockargs nlm_unlockargs;
-/*
- * The following enums are actually bit encoded for efficient
- * boolean algebra.... DON'T change them.....
- */
-
-enum fsh_mode {
-	fsm_DN = 0,
-	fsm_DR = 1,
-	fsm_DW = 2,
-	fsm_DRW = 3,
-};
-typedef enum fsh_mode fsh_mode;
-
-enum fsh_access {
-	fsa_NONE = 0,
-	fsa_R = 1,
-	fsa_W = 2,
-	fsa_RW = 3,
-};
-typedef enum fsh_access fsh_access;
-
-struct nlm_share {
-	char *caller_name;
-	netobj fh;
-	netobj oh;
-	fsh_mode mode;
-	fsh_access access;
-};
-typedef struct nlm_share nlm_share;
-
-struct nlm_shareargs {
-	netobj cookie;
-	nlm_share share;
-	bool_t reclaim;
-};
-typedef struct nlm_shareargs nlm_shareargs;
-
-struct nlm_shareres {
-	netobj cookie;
-	nlm_stats stat;
-	int sequence;
-};
-typedef struct nlm_shareres nlm_shareres;
-
-struct nlm_notify {
-	char *name;
-	long state;
-};
-typedef struct nlm_notify nlm_notify;
-
-#define NLM_PROG 100021
-#define NLM_VERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define NLM_TEST 1
-extern  nlm_testres * nlm_test_1(struct nlm_testargs *, CLIENT *);
-extern  nlm_testres * nlm_test_1_svc(struct nlm_testargs *, struct svc_req *);
-#define NLM_LOCK 2
-extern  nlm_res * nlm_lock_1(struct nlm_lockargs *, CLIENT *);
-extern  nlm_res * nlm_lock_1_svc(struct nlm_lockargs *, struct svc_req *);
-#define NLM_CANCEL 3
-extern  nlm_res * nlm_cancel_1(struct nlm_cancargs *, CLIENT *);
-extern  nlm_res * nlm_cancel_1_svc(struct nlm_cancargs *, struct svc_req *);
-#define NLM_UNLOCK 4
-extern  nlm_res * nlm_unlock_1(struct nlm_unlockargs *, CLIENT *);
-extern  nlm_res * nlm_unlock_1_svc(struct nlm_unlockargs *, struct svc_req *);
-#define NLM_GRANTED 5
-extern  nlm_res * nlm_granted_1(struct nlm_testargs *, CLIENT *);
-extern  nlm_res * nlm_granted_1_svc(struct nlm_testargs *, struct svc_req *);
-#define NLM_TEST_MSG 6
-extern  void * nlm_test_msg_1(struct nlm_testargs *, CLIENT *);
-extern  void * nlm_test_msg_1_svc(struct nlm_testargs *, struct svc_req *);
-#define NLM_LOCK_MSG 7
-extern  void * nlm_lock_msg_1(struct nlm_lockargs *, CLIENT *);
-extern  void * nlm_lock_msg_1_svc(struct nlm_lockargs *, struct svc_req *);
-#define NLM_CANCEL_MSG 8
-extern  void * nlm_cancel_msg_1(struct nlm_cancargs *, CLIENT *);
-extern  void * nlm_cancel_msg_1_svc(struct nlm_cancargs *, struct svc_req *);
-#define NLM_UNLOCK_MSG 9
-extern  void * nlm_unlock_msg_1(struct nlm_unlockargs *, CLIENT *);
-extern  void * nlm_unlock_msg_1_svc(struct nlm_unlockargs *, struct svc_req *);
-#define NLM_GRANTED_MSG 10
-extern  void * nlm_granted_msg_1(struct nlm_testargs *, CLIENT *);
-extern  void * nlm_granted_msg_1_svc(struct nlm_testargs *, struct svc_req *);
-#define NLM_TEST_RES 11
-extern  void * nlm_test_res_1(nlm_testres *, CLIENT *);
-extern  void * nlm_test_res_1_svc(nlm_testres *, struct svc_req *);
-#define NLM_LOCK_RES 12
-extern  void * nlm_lock_res_1(nlm_res *, CLIENT *);
-extern  void * nlm_lock_res_1_svc(nlm_res *, struct svc_req *);
-#define NLM_CANCEL_RES 13
-extern  void * nlm_cancel_res_1(nlm_res *, CLIENT *);
-extern  void * nlm_cancel_res_1_svc(nlm_res *, struct svc_req *);
-#define NLM_UNLOCK_RES 14
-extern  void * nlm_unlock_res_1(nlm_res *, CLIENT *);
-extern  void * nlm_unlock_res_1_svc(nlm_res *, struct svc_req *);
-#define NLM_GRANTED_RES 15
-extern  void * nlm_granted_res_1(nlm_res *, CLIENT *);
-extern  void * nlm_granted_res_1_svc(nlm_res *, struct svc_req *);
-extern int nlm_prog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define NLM_TEST 1
-extern  nlm_testres * nlm_test_1();
-extern  nlm_testres * nlm_test_1_svc();
-#define NLM_LOCK 2
-extern  nlm_res * nlm_lock_1();
-extern  nlm_res * nlm_lock_1_svc();
-#define NLM_CANCEL 3
-extern  nlm_res * nlm_cancel_1();
-extern  nlm_res * nlm_cancel_1_svc();
-#define NLM_UNLOCK 4
-extern  nlm_res * nlm_unlock_1();
-extern  nlm_res * nlm_unlock_1_svc();
-#define NLM_GRANTED 5
-extern  nlm_res * nlm_granted_1();
-extern  nlm_res * nlm_granted_1_svc();
-#define NLM_TEST_MSG 6
-extern  void * nlm_test_msg_1();
-extern  void * nlm_test_msg_1_svc();
-#define NLM_LOCK_MSG 7
-extern  void * nlm_lock_msg_1();
-extern  void * nlm_lock_msg_1_svc();
-#define NLM_CANCEL_MSG 8
-extern  void * nlm_cancel_msg_1();
-extern  void * nlm_cancel_msg_1_svc();
-#define NLM_UNLOCK_MSG 9
-extern  void * nlm_unlock_msg_1();
-extern  void * nlm_unlock_msg_1_svc();
-#define NLM_GRANTED_MSG 10
-extern  void * nlm_granted_msg_1();
-extern  void * nlm_granted_msg_1_svc();
-#define NLM_TEST_RES 11
-extern  void * nlm_test_res_1();
-extern  void * nlm_test_res_1_svc();
-#define NLM_LOCK_RES 12
-extern  void * nlm_lock_res_1();
-extern  void * nlm_lock_res_1_svc();
-#define NLM_CANCEL_RES 13
-extern  void * nlm_cancel_res_1();
-extern  void * nlm_cancel_res_1_svc();
-#define NLM_UNLOCK_RES 14
-extern  void * nlm_unlock_res_1();
-extern  void * nlm_unlock_res_1_svc();
-#define NLM_GRANTED_RES 15
-extern  void * nlm_granted_res_1();
-extern  void * nlm_granted_res_1_svc();
-extern int nlm_prog_1_freeresult ();
-#endif /* K&R C */
-#define NLM_VERSX 3
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define NLM_SHARE 20
-extern  nlm_shareres * nlm_share_3(nlm_shareargs *, CLIENT *);
-extern  nlm_shareres * nlm_share_3_svc(nlm_shareargs *, struct svc_req *);
-#define NLM_UNSHARE 21
-extern  nlm_shareres * nlm_unshare_3(nlm_shareargs *, CLIENT *);
-extern  nlm_shareres * nlm_unshare_3_svc(nlm_shareargs *, struct svc_req *);
-#define NLM_NM_LOCK 22
-extern  nlm_res * nlm_nm_lock_3(nlm_lockargs *, CLIENT *);
-extern  nlm_res * nlm_nm_lock_3_svc(nlm_lockargs *, struct svc_req *);
-#define NLM_FREE_ALL 23
-extern  void * nlm_free_all_3(nlm_notify *, CLIENT *);
-extern  void * nlm_free_all_3_svc(nlm_notify *, struct svc_req *);
-extern int nlm_prog_3_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define NLM_SHARE 20
-extern  nlm_shareres * nlm_share_3();
-extern  nlm_shareres * nlm_share_3_svc();
-#define NLM_UNSHARE 21
-extern  nlm_shareres * nlm_unshare_3();
-extern  nlm_shareres * nlm_unshare_3_svc();
-#define NLM_NM_LOCK 22
-extern  nlm_res * nlm_nm_lock_3();
-extern  nlm_res * nlm_nm_lock_3_svc();
-#define NLM_FREE_ALL 23
-extern  void * nlm_free_all_3();
-extern  void * nlm_free_all_3_svc();
-extern int nlm_prog_3_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_nlm_stats (XDR *, nlm_stats*);
-extern  bool_t xdr_nlm_holder (XDR *, nlm_holder*);
-extern  bool_t xdr_nlm_testrply (XDR *, nlm_testrply*);
-extern  bool_t xdr_nlm_stat (XDR *, nlm_stat*);
-extern  bool_t xdr_nlm_res (XDR *, nlm_res*);
-extern  bool_t xdr_nlm_testres (XDR *, nlm_testres*);
-extern  bool_t xdr_nlm_lock (XDR *, nlm_lock*);
-extern  bool_t xdr_nlm_lockargs (XDR *, nlm_lockargs*);
-extern  bool_t xdr_nlm_cancargs (XDR *, nlm_cancargs*);
-extern  bool_t xdr_nlm_testargs (XDR *, nlm_testargs*);
-extern  bool_t xdr_nlm_unlockargs (XDR *, nlm_unlockargs*);
-extern  bool_t xdr_fsh_mode (XDR *, fsh_mode*);
-extern  bool_t xdr_fsh_access (XDR *, fsh_access*);
-extern  bool_t xdr_nlm_share (XDR *, nlm_share*);
-extern  bool_t xdr_nlm_shareargs (XDR *, nlm_shareargs*);
-extern  bool_t xdr_nlm_shareres (XDR *, nlm_shareres*);
-extern  bool_t xdr_nlm_notify (XDR *, nlm_notify*);
-
-#else /* K&R C */
-extern bool_t xdr_nlm_stats ();
-extern bool_t xdr_nlm_holder ();
-extern bool_t xdr_nlm_testrply ();
-extern bool_t xdr_nlm_stat ();
-extern bool_t xdr_nlm_res ();
-extern bool_t xdr_nlm_testres ();
-extern bool_t xdr_nlm_lock ();
-extern bool_t xdr_nlm_lockargs ();
-extern bool_t xdr_nlm_cancargs ();
-extern bool_t xdr_nlm_testargs ();
-extern bool_t xdr_nlm_unlockargs ();
-extern bool_t xdr_fsh_mode ();
-extern bool_t xdr_fsh_access ();
-extern bool_t xdr_nlm_share ();
-extern bool_t xdr_nlm_shareargs ();
-extern bool_t xdr_nlm_shareres ();
-extern bool_t xdr_nlm_notify ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NLM_PROT_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/nlm_prot.x b/openflow/usr/include/rpcsvc/nlm_prot.x
deleted file mode 100644
index 81ff137..0000000
--- a/openflow/usr/include/rpcsvc/nlm_prot.x
+++ /dev/null
@@ -1,203 +0,0 @@
-/* @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*
- * Network lock manager protocol definition
- * Copyright (c) 2010, Oracle America, Inc.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * protocol used between local lock manager and remote lock manager
- */
-
-#ifdef RPC_HDR
-%#define LM_MAXSTRLEN	1024
-%#define MAXNAMELEN	LM_MAXSTRLEN+1
-#endif
-
-/*
- * status of a call to the lock manager
- */
-enum nlm_stats {
-	nlm_granted = 0,
-	nlm_denied = 1,
-	nlm_denied_nolocks = 2,
-	nlm_blocked = 3,
-	nlm_denied_grace_period = 4
-};
-
-struct nlm_holder {
-	bool exclusive;
-	int svid;
-	netobj oh;
-	unsigned l_offset;
-	unsigned l_len;
-};
-
-union nlm_testrply switch (nlm_stats stat) {
-	case nlm_denied:
-		struct nlm_holder holder;
-	default:
-		void;
-};
-
-struct nlm_stat {
-	nlm_stats stat;
-};
-
-struct nlm_res {
-	netobj cookie;
-	nlm_stat stat;
-};
-
-struct nlm_testres {
-	netobj cookie;
-	nlm_testrply stat;
-};
-
-struct nlm_lock {
-	string caller_name<LM_MAXSTRLEN>;
-	netobj fh;		/* identify a file */
-	netobj oh;		/* identify owner of a lock */
-	int svid;		/* generated from pid for svid */
-	unsigned l_offset;
-	unsigned l_len;
-};
-
-struct nlm_lockargs {
-	netobj cookie;
-	bool block;
-	bool exclusive;
-	struct nlm_lock alock;
-	bool reclaim;		/* used for recovering locks */
-	int state;		/* specify local status monitor state */
-};
-
-struct nlm_cancargs {
-	netobj cookie;
-	bool block;
-	bool exclusive;
-	struct nlm_lock alock;
-};
-
-struct nlm_testargs {
-	netobj cookie;
-	bool exclusive;
-	struct nlm_lock alock;
-};
-
-struct nlm_unlockargs {
-	netobj cookie;
-	struct nlm_lock alock;
-};
-
-
-#ifdef RPC_HDR
-%/*
-% * The following enums are actually bit encoded for efficient
-% * boolean algebra.... DON'T change them.....
-% */
-#endif
-enum	fsh_mode {
-	fsm_DN  = 0,	/* deny none */
-	fsm_DR  = 1,	/* deny read */
-	fsm_DW  = 2,	/* deny write */
-	fsm_DRW = 3	/* deny read/write */
-};
-
-enum	fsh_access {
-	fsa_NONE = 0,	/* for completeness */
-	fsa_R    = 1,	/* read only */
-	fsa_W    = 2,	/* write only */
-	fsa_RW   = 3	/* read/write */
-};
-
-struct	nlm_share {
-	string caller_name<LM_MAXSTRLEN>;
-	netobj	fh;
-	netobj	oh;
-	fsh_mode	mode;
-	fsh_access	access;
-};
-
-struct	nlm_shareargs {
-	netobj	cookie;
-	nlm_share	share;
-	bool	reclaim;
-};
-
-struct	nlm_shareres {
-	netobj	cookie;
-	nlm_stats	stat;
-	int	sequence;
-};
-
-struct	nlm_notify {
-	string name<MAXNAMELEN>;
-	long state;
-};
-
-/*
- * Over-the-wire protocol used between the network lock managers
- */
-
-program NLM_PROG {
-	version NLM_VERS {
-
-		nlm_testres	NLM_TEST(struct nlm_testargs) =	1;
-
-		nlm_res		NLM_LOCK(struct nlm_lockargs) =	2;
-
-		nlm_res		NLM_CANCEL(struct nlm_cancargs) = 3;
-		nlm_res		NLM_UNLOCK(struct nlm_unlockargs) =	4;
-
-		/*
-		 * remote lock manager call-back to grant lock
-		 */
-		nlm_res		NLM_GRANTED(struct nlm_testargs)= 5;
-		/*
-		 * message passing style of requesting lock
-		 */
-		void		NLM_TEST_MSG(struct nlm_testargs) = 6;
-		void		NLM_LOCK_MSG(struct nlm_lockargs) = 7;
-		void		NLM_CANCEL_MSG(struct nlm_cancargs) =8;
-		void		NLM_UNLOCK_MSG(struct nlm_unlockargs) = 9;
-		void		NLM_GRANTED_MSG(struct nlm_testargs) = 10;
-		void		NLM_TEST_RES(nlm_testres) = 11;
-		void		NLM_LOCK_RES(nlm_res) = 12;
-		void		NLM_CANCEL_RES(nlm_res) = 13;
-		void		NLM_UNLOCK_RES(nlm_res) = 14;
-		void		NLM_GRANTED_RES(nlm_res) = 15;
-	} = 1;
-
-	version NLM_VERSX {
-		nlm_shareres	NLM_SHARE(nlm_shareargs) = 20;
-		nlm_shareres	NLM_UNSHARE(nlm_shareargs) = 21;
-		nlm_res		NLM_NM_LOCK(nlm_lockargs) = 22;
-		void		NLM_FREE_ALL(nlm_notify) = 23;
-	} = 3;
-
-} = 100021;
diff --git a/openflow/usr/include/rpcsvc/rex.h b/openflow/usr/include/rpcsvc/rex.h
deleted file mode 100644
index 3c80ce7..0000000
--- a/openflow/usr/include/rpcsvc/rex.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _REX_H_RPCGEN
-#define _REX_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define STRINGSIZE 1024
-
-typedef char *rexstring;
-#define SIGINT 2
-#define REX_INTERACTIVE 1
-
-struct rex_start {
-	struct {
-		u_int rst_cmd_len;
-		rexstring *rst_cmd_val;
-	} rst_cmd;
-	rexstring rst_host;
-	rexstring rst_fsname;
-	rexstring rst_dirwithin;
-	struct {
-		u_int rst_env_len;
-		rexstring *rst_env_val;
-	} rst_env;
-	u_int rst_port0;
-	u_int rst_port1;
-	u_int rst_port2;
-	u_int rst_flags;
-};
-typedef struct rex_start rex_start;
-
-struct rex_result {
-	int rlt_stat;
-	rexstring rlt_message;
-};
-typedef struct rex_result rex_result;
-
-struct sgttyb {
-	u_int four;
-	char chars[4];
-	u_int flags;
-};
-typedef struct sgttyb sgttyb;
-#define B0 0
-#define B50 1
-#define B75 2
-#define B110 3
-#define B134 4
-#define B150 5
-#define B200 6
-#define B300 7
-#define B600 8
-#define B1200 9
-#define B1800 10
-#define B2400 11
-#define B4800 12
-#define B9600 13
-#define B19200 14
-#define B38400 15
-#define TANDEM 0x00000001
-#define CBREAK 0x00000002
-#define LCASE 0x00000004
-#define ECHO 0x00000008
-#define CRMOD 0x00000010
-#define RAW 0x00000020
-#define ODDP 0x00000040
-#define EVENP 0x00000080
-#define ANYP 0x000000c0
-#define NLDELAY 0x00000300
-#define NL0 0x00000000
-#define NL1 0x00000100
-#define NL2 0x00000200
-#define NL3 0x00000300
-#define TBDELAY 0x00000c00
-#define TAB0 0x00000000
-#define TAB1 0x00000400
-#define TAB2 0x00000800
-#define XTABS 0x00000c00
-#define CRDELAY 0x00003000
-#define CR0 0x00000000
-#define CR1 0x00001000
-#define CR2 0x00002000
-#define CR3 0x00003000
-#define VTDELAY 0x00004000
-#define FF0 0x00000000
-#define FF1 0x00004000
-#define BSDELAY 0x00008000
-#define BS0 0x00000000
-#define BS1 0x00008000
-#define CRTBS 0x00010000
-#define PRTERA 0x00020000
-#define CRTERA 0x00040000
-#define TILDE 0x00080000
-#define MDMBUF 0x00100000
-#define LITOUT 0x00200000
-#define TOSTOP 0x00400000
-#define FLUSHO 0x00800000
-#define NOHANG 0x01000000
-#define L001000 0x02000000
-#define CRTKIL 0x04000000
-#define PASS8 0x08000000
-#define CTLECH 0x10000000
-#define PENDIN 0x20000000
-#define DECCTQ 0x40000000
-#define NOFLSH 0x80000000
-
-struct tchars {
-	u_int six;
-	char chars[6];
-};
-typedef struct tchars tchars;
-
-struct ltchars {
-	u_int six;
-	char chars[6];
-	u_int mode;
-};
-typedef struct ltchars ltchars;
-
-struct rex_ttysize {
-	int ts_lines;
-	int ts_cols;
-};
-typedef struct rex_ttysize rex_ttysize;
-
-struct rex_ttymode {
-	sgttyb basic;
-	tchars more;
-	ltchars yetmore;
-	u_int andmore;
-};
-typedef struct rex_ttymode rex_ttymode;
-#define LCRTBS 0x0001
-#define LPRTERA 0x0002
-#define LCRTERA 0x0004
-#define LTILDE 0x0008
-#define LMDMBUF 0x0010
-#define LLITOUT 0x0020
-#define LTOSTOP 0x0040
-#define LFLUSHO 0x0080
-#define LNOHANG 0x0100
-#define LL001000 0x0200
-#define LCRTKIL 0x0400
-#define LPASS8 0x0800
-#define LCTLECH 0x1000
-#define LPENDIN 0x2000
-#define LDECCTQ 0x4000
-#define LNOFLSH 0x8000
-
-#define REXPROG 100017
-#define REXVERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define REXPROC_START 1
-extern  rex_result * rexproc_start_1(rex_start *, CLIENT *);
-extern  rex_result * rexproc_start_1_svc(rex_start *, struct svc_req *);
-#define REXPROC_WAIT 2
-extern  rex_result * rexproc_wait_1(void *, CLIENT *);
-extern  rex_result * rexproc_wait_1_svc(void *, struct svc_req *);
-#define REXPROC_MODES 3
-extern  void * rexproc_modes_1(rex_ttymode *, CLIENT *);
-extern  void * rexproc_modes_1_svc(rex_ttymode *, struct svc_req *);
-#define REXPROC_WINCH 4
-extern  void * rexproc_winch_1(rex_ttysize *, CLIENT *);
-extern  void * rexproc_winch_1_svc(rex_ttysize *, struct svc_req *);
-#define REXPROC_SIGNAL 5
-extern  void * rexproc_signal_1(int *, CLIENT *);
-extern  void * rexproc_signal_1_svc(int *, struct svc_req *);
-extern int rexprog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define REXPROC_START 1
-extern  rex_result * rexproc_start_1();
-extern  rex_result * rexproc_start_1_svc();
-#define REXPROC_WAIT 2
-extern  rex_result * rexproc_wait_1();
-extern  rex_result * rexproc_wait_1_svc();
-#define REXPROC_MODES 3
-extern  void * rexproc_modes_1();
-extern  void * rexproc_modes_1_svc();
-#define REXPROC_WINCH 4
-extern  void * rexproc_winch_1();
-extern  void * rexproc_winch_1_svc();
-#define REXPROC_SIGNAL 5
-extern  void * rexproc_signal_1();
-extern  void * rexproc_signal_1_svc();
-extern int rexprog_1_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_rexstring (XDR *, rexstring*);
-extern  bool_t xdr_rex_start (XDR *, rex_start*);
-extern  bool_t xdr_rex_result (XDR *, rex_result*);
-extern  bool_t xdr_sgttyb (XDR *, sgttyb*);
-extern  bool_t xdr_tchars (XDR *, tchars*);
-extern  bool_t xdr_ltchars (XDR *, ltchars*);
-extern  bool_t xdr_rex_ttysize (XDR *, rex_ttysize*);
-extern  bool_t xdr_rex_ttymode (XDR *, rex_ttymode*);
-
-#else /* K&R C */
-extern bool_t xdr_rexstring ();
-extern bool_t xdr_rex_start ();
-extern bool_t xdr_rex_result ();
-extern bool_t xdr_sgttyb ();
-extern bool_t xdr_tchars ();
-extern bool_t xdr_ltchars ();
-extern bool_t xdr_rex_ttysize ();
-extern bool_t xdr_rex_ttymode ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_REX_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/rex.x b/openflow/usr/include/rpcsvc/rex.x
deleted file mode 100644
index b5baf15..0000000
--- a/openflow/usr/include/rpcsvc/rex.x
+++ /dev/null
@@ -1,229 +0,0 @@
-/* @(#)rex.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Remote execution (rex) protocol specification
- */
-
-const STRINGSIZE = 1024;
-typedef string rexstring<1024>;
-
-/*
- * values to pass to REXPROC_SIGNAL
- */
-const SIGINT = 2;	/* interrupt */
-
-/*
- * Values for rst_flags, below
- */
-const REX_INTERACTIVE = 1;	/* interactive mode */
-
-struct rex_start {
-	rexstring rst_cmd<>;	/* list of command and args */
-	rexstring rst_host;	/* working directory host name */
-	rexstring rst_fsname;	/* working directory file system name */
-	rexstring rst_dirwithin;/* working directory within file system */
-	rexstring rst_env<>;	/* list of environment */
-	unsigned int rst_port0;	/* port for stdin */
-	unsigned int rst_port1;	/* port for stdout */
-	unsigned int rst_port2;	/* port for stderr */
-	unsigned int rst_flags;	/* options - see const above */
-};
-
-struct rex_result {
-   	int rlt_stat;		/* integer status code */
-	rexstring rlt_message;	/* string message for human consumption */
-};
-
-
-struct sgttyb {
-	unsigned four;	/* always equals 4 */
-	opaque chars[4];
-	/* chars[0] == input speed */
-	/* chars[1] == output speed */
-	/* chars[2] == kill character */
-	/* chars[3] == erase character */
-	unsigned flags;
-};
-/* values for speeds above (baud rates)  */
-const B0  = 0;
-const B50 = 1;
-const B75 = 2;
-const B110 = 3;
-const B134 = 4;
-const B150 = 5;
-const B200 = 6;
-const B300 = 7;
-const B600 = 8;
-const B1200 = 9;
-const B1800 = 10;
-const B2400 = 11;
-const B4800 = 12;
-const B9600 = 13;
-const B19200 = 14;
-const B38400 = 15;
-
-/* values for flags above */
-const TANDEM = 0x00000001; /* send stopc on out q full */
-const CBREAK = 0x00000002; /* half-cooked mode */
-const LCASE = 0x00000004; /* simulate lower case */
-const ECHO = 0x00000008; /* echo input */
-const CRMOD = 0x00000010; /* map \r to \r\n on output */
-const RAW = 0x00000020; /* no i/o processing */
-const ODDP = 0x00000040; /* get/send odd parity */
-const EVENP = 0x00000080; /* get/send even parity */
-const ANYP = 0x000000c0; /* get any parity/send none */
-const NLDELAY = 0x00000300; /* \n delay */
-const  NL0 = 0x00000000;
-const  NL1 = 0x00000100; /* tty 37 */
-const  NL2 = 0x00000200; /* vt05 */
-const  NL3 = 0x00000300;
-const TBDELAY = 0x00000c00; /* horizontal tab delay */
-const  TAB0 = 0x00000000;
-const  TAB1 = 0x00000400; /* tty 37 */
-const  TAB2 = 0x00000800;
-const XTABS = 0x00000c00; /* expand tabs on output */
-const CRDELAY = 0x00003000; /* \r delay */
-const  CR0 = 0x00000000;
-const  CR1 = 0x00001000; /* tn 300 */
-const  CR2 = 0x00002000; /* tty 37 */
-const  CR3 = 0x00003000; /* concept 100 */
-const VTDELAY = 0x00004000; /* vertical tab delay */
-const  FF0 = 0x00000000;
-const  FF1 = 0x00004000; /* tty 37 */
-const BSDELAY = 0x00008000; /* \b delay */
-const  BS0 = 0x00000000;
-const  BS1 = 0x00008000;
-const CRTBS = 0x00010000; /* do backspacing for crt */
-const PRTERA = 0x00020000; /* \ ... / erase */
-const CRTERA = 0x00040000; /* " \b " to wipe out char */
-const TILDE = 0x00080000; /* hazeltine tilde kludge */
-const MDMBUF = 0x00100000; /* start/stop output on carrier intr */
-const LITOUT = 0x00200000; /* literal output */
-const TOSTOP = 0x00400000; /* SIGTTOU on background output */
-const FLUSHO = 0x00800000; /* flush output to terminal */
-const NOHANG = 0x01000000; /* no SIGHUP on carrier drop */
-const L001000 = 0x02000000;
-const CRTKIL = 0x04000000; /* kill line with " \b " */
-const PASS8 = 0x08000000;
-const CTLECH = 0x10000000; /* echo control chars as ^X */
-const PENDIN = 0x20000000; /* tp->t_rawq needs reread */
-const DECCTQ = 0x40000000; /* only ^Q starts after ^S */
-const NOFLSH = 0x80000000; /* no output flush on signal */
-
-struct tchars {
-	unsigned six;	/* always equals 6 */
-	opaque chars[6];
-	/* chars[0] == interrupt char */
-	/* chars[1] == quit char */
-	/* chars[2] == start output char */
-	/* chars[3] == stop output char */
-	/* chars[4] == end-of-file char */
-	/* chars[5] == input delimiter (like nl) */
-};
-
-struct ltchars {
-	unsigned six;	/* always equals 6 */
-	opaque chars[6];
-	/* chars[0] == stop process signal */
-	/* chars[1] == delayed stop process signal */
-	/* chars[2] == reprint line */
-	/* chars[3] == flush output */
-	/* chars[4] == word erase */
-	/* chars[5] == literal next character */
-	unsigned mode;
-};
-
-struct rex_ttysize {
-	int ts_lines;
-	int ts_cols;
-};
-
-struct rex_ttymode {
-    sgttyb basic;    /* standard unix tty flags */
-    tchars more; /* interrupt, kill characters, etc. */
-    ltchars yetmore; /* special Berkeley characters */
-    unsigned andmore;     /* and Berkeley modes */
-};
-
-/* values for andmore above */
-const LCRTBS = 0x0001;	/* do backspacing for crt */
-const LPRTERA = 0x0002;	/* \ ... / erase */
-const LCRTERA = 0x0004;	/* " \b " to wipe out char */
-const LTILDE = 0x0008;	/* hazeltine tilde kludge */
-const LMDMBUF = 0x0010;	/* start/stop output on carrier intr */
-const LLITOUT = 0x0020;	/* literal output */
-const LTOSTOP = 0x0040;	/* SIGTTOU on background output */
-const LFLUSHO = 0x0080;	/* flush output to terminal */
-const LNOHANG = 0x0100;	/* no SIGHUP on carrier drop */
-const LL001000 = 0x0200;
-const LCRTKIL = 0x0400;	/* kill line with " \b " */
-const LPASS8 = 0x0800;
-const LCTLECH = 0x1000;	/* echo control chars as ^X */
-const LPENDIN = 0x2000;	/* needs reread */
-const LDECCTQ = 0x4000;	/* only ^Q starts after ^S */
-const LNOFLSH = 0x8000;	/* no output flush on signal */
-
-program REXPROG {
-	version REXVERS {
-
-		/*
-		 * Start remote execution
-		 */
-		rex_result
-		REXPROC_START(rex_start) = 1;
-
-		/*
-		 * Wait for remote execution to terminate
-		 */
-		rex_result
-		REXPROC_WAIT(void) = 2;
-
-		/*
-		 * Send tty modes
-		 */
-		void
-		REXPROC_MODES(rex_ttymode) = 3;
-
-		/*
-		 * Send window size change
-		 */
-		void
-		REXPROC_WINCH(rex_ttysize) = 4;
-
-		/*
-		 * Send other signal
-		 */
-		void
-		REXPROC_SIGNAL(int) = 5;
-	} = 1;
-} = 100017;
diff --git a/openflow/usr/include/rpcsvc/rquota.h b/openflow/usr/include/rpcsvc/rquota.h
deleted file mode 100644
index b506460..0000000
--- a/openflow/usr/include/rpcsvc/rquota.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _RQUOTA_H_RPCGEN
-#define _RQUOTA_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define RQ_PATHLEN 1024
-
-struct getquota_args {
-	char *gqa_pathp;
-	int gqa_uid;
-};
-typedef struct getquota_args getquota_args;
-
-struct rquota {
-	int rq_bsize;
-	bool_t rq_active;
-	u_int rq_bhardlimit;
-	u_int rq_bsoftlimit;
-	u_int rq_curblocks;
-	u_int rq_fhardlimit;
-	u_int rq_fsoftlimit;
-	u_int rq_curfiles;
-	u_int rq_btimeleft;
-	u_int rq_ftimeleft;
-};
-typedef struct rquota rquota;
-
-enum gqr_status {
-	Q_OK = 1,
-	Q_NOQUOTA = 2,
-	Q_EPERM = 3,
-};
-typedef enum gqr_status gqr_status;
-
-struct getquota_rslt {
-	gqr_status status;
-	union {
-		rquota gqr_rquota;
-	} getquota_rslt_u;
-};
-typedef struct getquota_rslt getquota_rslt;
-
-#define RQUOTAPROG 100011
-#define RQUOTAVERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define RQUOTAPROC_GETQUOTA 1
-extern  getquota_rslt * rquotaproc_getquota_1(getquota_args *, CLIENT *);
-extern  getquota_rslt * rquotaproc_getquota_1_svc(getquota_args *, struct svc_req *);
-#define RQUOTAPROC_GETACTIVEQUOTA 2
-extern  getquota_rslt * rquotaproc_getactivequota_1(getquota_args *, CLIENT *);
-extern  getquota_rslt * rquotaproc_getactivequota_1_svc(getquota_args *, struct svc_req *);
-extern int rquotaprog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define RQUOTAPROC_GETQUOTA 1
-extern  getquota_rslt * rquotaproc_getquota_1();
-extern  getquota_rslt * rquotaproc_getquota_1_svc();
-#define RQUOTAPROC_GETACTIVEQUOTA 2
-extern  getquota_rslt * rquotaproc_getactivequota_1();
-extern  getquota_rslt * rquotaproc_getactivequota_1_svc();
-extern int rquotaprog_1_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_getquota_args (XDR *, getquota_args*);
-extern  bool_t xdr_rquota (XDR *, rquota*);
-extern  bool_t xdr_gqr_status (XDR *, gqr_status*);
-extern  bool_t xdr_getquota_rslt (XDR *, getquota_rslt*);
-
-#else /* K&R C */
-extern bool_t xdr_getquota_args ();
-extern bool_t xdr_rquota ();
-extern bool_t xdr_gqr_status ();
-extern bool_t xdr_getquota_rslt ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RQUOTA_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/rquota.x b/openflow/usr/include/rpcsvc/rquota.x
deleted file mode 100644
index c457524..0000000
--- a/openflow/usr/include/rpcsvc/rquota.x
+++ /dev/null
@@ -1,61 +0,0 @@
-/* @(#)rquota.x	2.1 88/08/01 4.0 RPCSRC */
-/* @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro */
-
-/*
- * Remote quota protocol
- * Requires unix authentication
- */
-
-const RQ_PATHLEN = 1024;
-
-struct getquota_args {
-	string gqa_pathp<RQ_PATHLEN>;  	/* path to filesystem of interest */
-	int gqa_uid;	        	/* inquire about quota for uid */
-};
-
-/*
- * remote quota structure
- */
-struct rquota {
-	int rq_bsize;			/* block size for block counts */
-	bool rq_active;  		/* indicates whether quota is active */
-	unsigned int rq_bhardlimit;	/* absolute limit on disk blks alloc */
-	unsigned int rq_bsoftlimit;	/* preferred limit on disk blks */
-	unsigned int rq_curblocks;	/* current block count */
-	unsigned int rq_fhardlimit;	/* absolute limit on allocated files */
-	unsigned int rq_fsoftlimit;	/* preferred file limit */
-	unsigned int rq_curfiles;	/* current # allocated files */
-	unsigned int rq_btimeleft;	/* time left for excessive disk use */
-	unsigned int rq_ftimeleft;	/* time left for excessive files */
-};
-
-enum gqr_status {
-	Q_OK = 1,		/* quota returned */
-	Q_NOQUOTA = 2,  	/* noquota for uid */
-	Q_EPERM = 3		/* no permission to access quota */
-};
-
-union getquota_rslt switch (gqr_status status) {
-case Q_OK:
-	rquota gqr_rquota;	/* valid if status == Q_OK */
-case Q_NOQUOTA:
-	void;
-case Q_EPERM:
-	void;
-};
-
-program RQUOTAPROG {
-	version RQUOTAVERS {
-		/*
-		 * Get all quotas
-		 */
-		getquota_rslt
-		RQUOTAPROC_GETQUOTA(getquota_args) = 1;
-
-		/*
-	 	 * Get active quotas only
-		 */
-		getquota_rslt
-		RQUOTAPROC_GETACTIVEQUOTA(getquota_args) = 2;
-	} = 1;
-} = 100011;
diff --git a/openflow/usr/include/rpcsvc/rstat.h b/openflow/usr/include/rpcsvc/rstat.h
deleted file mode 100644
index abc0ba8..0000000
--- a/openflow/usr/include/rpcsvc/rstat.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _RSTAT_H_RPCGEN
-#define _RSTAT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef FSCALE
-/*
- * Scale factor for scaled integers used to count load averages.
- */
-#define FSHIFT 8 /* bits to right of fixed binary point */
-#define FSCALE (1<<FSHIFT)
-
-#endif /* ndef FSCALE */
-#define CPUSTATES 4
-#define DK_NDRIVE 4
-
-struct rstat_timeval {
-	u_int tv_sec;
-	u_int tv_usec;
-};
-typedef struct rstat_timeval rstat_timeval;
-
-struct statstime {
-	int cp_time[CPUSTATES];
-	int dk_xfer[DK_NDRIVE];
-	u_int v_pgpgin;
-	u_int v_pgpgout;
-	u_int v_pswpin;
-	u_int v_pswpout;
-	u_int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	u_int v_swtch;
-	int avenrun[3];
-	rstat_timeval boottime;
-	rstat_timeval curtime;
-	int if_opackets;
-};
-typedef struct statstime statstime;
-
-struct statsswtch {
-	int cp_time[CPUSTATES];
-	int dk_xfer[DK_NDRIVE];
-	u_int v_pgpgin;
-	u_int v_pgpgout;
-	u_int v_pswpin;
-	u_int v_pswpout;
-	u_int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	u_int v_swtch;
-	u_int avenrun[3];
-	rstat_timeval boottime;
-	int if_opackets;
-};
-typedef struct statsswtch statsswtch;
-
-struct stats {
-	int cp_time[CPUSTATES];
-	int dk_xfer[DK_NDRIVE];
-	u_int v_pgpgin;
-	u_int v_pgpgout;
-	u_int v_pswpin;
-	u_int v_pswpout;
-	u_int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	int if_opackets;
-};
-typedef struct stats stats;
-
-#define RSTATPROG 100001
-#define RSTATVERS_TIME 3
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define RSTATPROC_STATS 1
-extern  statstime * rstatproc_stats_3(void *, CLIENT *);
-extern  statstime * rstatproc_stats_3_svc(void *, struct svc_req *);
-#define RSTATPROC_HAVEDISK 2
-extern  u_int * rstatproc_havedisk_3(void *, CLIENT *);
-extern  u_int * rstatproc_havedisk_3_svc(void *, struct svc_req *);
-extern int rstatprog_3_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define RSTATPROC_STATS 1
-extern  statstime * rstatproc_stats_3();
-extern  statstime * rstatproc_stats_3_svc();
-#define RSTATPROC_HAVEDISK 2
-extern  u_int * rstatproc_havedisk_3();
-extern  u_int * rstatproc_havedisk_3_svc();
-extern int rstatprog_3_freeresult ();
-#endif /* K&R C */
-#define RSTATVERS_SWTCH 2
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  statsswtch * rstatproc_stats_2(void *, CLIENT *);
-extern  statsswtch * rstatproc_stats_2_svc(void *, struct svc_req *);
-extern  u_int * rstatproc_havedisk_2(void *, CLIENT *);
-extern  u_int * rstatproc_havedisk_2_svc(void *, struct svc_req *);
-extern int rstatprog_2_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-extern  statsswtch * rstatproc_stats_2();
-extern  statsswtch * rstatproc_stats_2_svc();
-extern  u_int * rstatproc_havedisk_2();
-extern  u_int * rstatproc_havedisk_2_svc();
-extern int rstatprog_2_freeresult ();
-#endif /* K&R C */
-#define RSTATVERS_ORIG 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  stats * rstatproc_stats_1(void *, CLIENT *);
-extern  stats * rstatproc_stats_1_svc(void *, struct svc_req *);
-extern  u_int * rstatproc_havedisk_1(void *, CLIENT *);
-extern  u_int * rstatproc_havedisk_1_svc(void *, struct svc_req *);
-extern int rstatprog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-extern  stats * rstatproc_stats_1();
-extern  stats * rstatproc_stats_1_svc();
-extern  u_int * rstatproc_havedisk_1();
-extern  u_int * rstatproc_havedisk_1_svc();
-extern int rstatprog_1_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_rstat_timeval (XDR *, rstat_timeval*);
-extern  bool_t xdr_statstime (XDR *, statstime*);
-extern  bool_t xdr_statsswtch (XDR *, statsswtch*);
-extern  bool_t xdr_stats (XDR *, stats*);
-
-#else /* K&R C */
-extern bool_t xdr_rstat_timeval ();
-extern bool_t xdr_statstime ();
-extern bool_t xdr_statsswtch ();
-extern bool_t xdr_stats ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RSTAT_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/rstat.x b/openflow/usr/include/rpcsvc/rstat.x
deleted file mode 100644
index 9b7b102..0000000
--- a/openflow/usr/include/rpcsvc/rstat.x
+++ /dev/null
@@ -1,145 +0,0 @@
-/* @(#)rstat.x	2.2 88/08/01 4.0 RPCSRC */
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Gather statistics on remote machines
- */
-
-#ifdef RPC_HDR
-
-%#ifndef FSCALE
-%/*
-% * Scale factor for scaled integers used to count load averages.
-% */
-%#define FSHIFT  8               /* bits to right of fixed binary point */
-%#define FSCALE  (1<<FSHIFT)
-%
-%#endif /* ndef FSCALE */
-
-#endif /* def RPC_HDR */
-
-const CPUSTATES = 4;
-const DK_NDRIVE = 4;
-
-/*
- * GMT since 0:00, January 1, 1970
- */
-struct rstat_timeval {
-	unsigned int tv_sec;	/* seconds */
-	unsigned int tv_usec;	/* and microseconds */
-};
-
-struct statstime {				/* RSTATVERS_TIME */
-	int cp_time[CPUSTATES];
-	int dk_xfer[DK_NDRIVE];
-	unsigned int v_pgpgin;	/* these are cumulative sum */
-	unsigned int v_pgpgout;
-	unsigned int v_pswpin;
-	unsigned int v_pswpout;
-	unsigned int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	unsigned int v_swtch;
-	int avenrun[3];         /* scaled by FSCALE */
-	rstat_timeval boottime;
-	rstat_timeval curtime;
-	int if_opackets;
-};
-
-struct statsswtch {			/* RSTATVERS_SWTCH */
-	int cp_time[CPUSTATES];
-	int dk_xfer[DK_NDRIVE];
-	unsigned int v_pgpgin;	/* these are cumulative sum */
-	unsigned int v_pgpgout;
-	unsigned int v_pswpin;
-	unsigned int v_pswpout;
-	unsigned int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	unsigned int v_swtch;
-	unsigned int avenrun[3];/* scaled by FSCALE */
-	rstat_timeval boottime;
-	int if_opackets;
-};
-
-struct stats {				/* RSTATVERS_ORIG */
-	int cp_time[CPUSTATES];
-	int dk_xfer[DK_NDRIVE];
-	unsigned int v_pgpgin;	/* these are cumulative sum */
-	unsigned int v_pgpgout;
-	unsigned int v_pswpin;
-	unsigned int v_pswpout;
-	unsigned int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	int if_opackets;
-};
-
-
-program RSTATPROG {
-	/*
-	 * Newest version includes current time and context switching info
-	 */
-	version RSTATVERS_TIME {
-		statstime
-		RSTATPROC_STATS(void) = 1;
-
-		unsigned int
-		RSTATPROC_HAVEDISK(void) = 2;
-	} = 3;
-	/*
-	 * Does not have current time
-	 */
-	version RSTATVERS_SWTCH {
-		statsswtch
-		RSTATPROC_STATS(void) = 1;
-
-		unsigned int
-		RSTATPROC_HAVEDISK(void) = 2;
-	} = 2;
-	/*
-	 * Old version has no info about current time or context switching
-	 */
-	version RSTATVERS_ORIG {
-		stats
-		RSTATPROC_STATS(void) = 1;
-
-		unsigned int
-		RSTATPROC_HAVEDISK(void) = 2;
-	} = 1;
-} = 100001;
diff --git a/openflow/usr/include/rpcsvc/rusers.h b/openflow/usr/include/rpcsvc/rusers.h
deleted file mode 100644
index dc2d3b0..0000000
--- a/openflow/usr/include/rpcsvc/rusers.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _RUSERS_H_RPCGEN
-#define _RUSERS_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Find out about remote users
- */
-#define RUSERS_MAXUSERLEN 32
-#define RUSERS_MAXLINELEN 32
-#define RUSERS_MAXHOSTLEN 257
-
-struct rusers_utmp {
-	char *ut_user;
-	char *ut_line;
-	char *ut_host;
-	int ut_type;
-	int ut_time;
-	u_int ut_idle;
-};
-typedef struct rusers_utmp rusers_utmp;
-
-typedef struct {
-	u_int utmp_array_len;
-	rusers_utmp *utmp_array_val;
-} utmp_array;
-
-/*
- * Values for ut_type field above.
- */
-#define RUSERS_EMPTY 0
-#define RUSERS_RUN_LVL 1
-#define RUSERS_BOOT_TIME 2
-#define RUSERS_OLD_TIME 3
-#define RUSERS_NEW_TIME 4
-#define RUSERS_INIT_PROCESS 5
-#define RUSERS_LOGIN_PROCESS 6
-#define RUSERS_USER_PROCESS 7
-#define RUSERS_DEAD_PROCESS 8
-#define RUSERS_ACCOUNTING 9
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rpc/xdr.h>
-
-/*
- * The following structures are used by version 2 of the rusersd protocol.
- * They were not developed with rpcgen, so they do not appear as RPCL.
- */
-
-#define RUSERSVERS_IDLE 2
-#define RUSERSVERS 3 /* current version */
-#define MAXUSERS 100
-
-/*
- * This is the structure used in version 2 of the rusersd RPC service.
- * It corresponds to the utmp structure for BSD systems.
- */
-struct ru_utmp {
- char ut_line[8]; /* tty name */
- char ut_name[8]; /* user id */
- char ut_host[16]; /* host name, if remote */
- long int ut_time; /* time on */
-};
-
-struct utmparr {
- struct ru_utmp **uta_arr;
- int uta_cnt;
-};
-typedef struct utmparr utmparr;
-
-extern bool_t xdr_utmparr (XDR *xdrs, struct utmparr *objp) __THROW;
-
-struct utmpidle {
- struct ru_utmp ui_utmp;
- unsigned int ui_idle;
-};
-
-struct utmpidlearr {
- struct utmpidle **uia_arr;
- int uia_cnt;
-};
-
-extern bool_t xdr_utmpidlearr (XDR *xdrs, struct utmpidlearr *objp) __THROW;
-
-#ifdef __cplusplus
-}
-#endif
-
-#define RUSERSPROG 100002
-#define RUSERSVERS_3 3
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define RUSERSPROC_NUM 1
-extern  int * rusersproc_num_3(void *, CLIENT *);
-extern  int * rusersproc_num_3_svc(void *, struct svc_req *);
-#define RUSERSPROC_NAMES 2
-extern  utmp_array * rusersproc_names_3(void *, CLIENT *);
-extern  utmp_array * rusersproc_names_3_svc(void *, struct svc_req *);
-#define RUSERSPROC_ALLNAMES 3
-extern  utmp_array * rusersproc_allnames_3(void *, CLIENT *);
-extern  utmp_array * rusersproc_allnames_3_svc(void *, struct svc_req *);
-extern int rusersprog_3_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define RUSERSPROC_NUM 1
-extern  int * rusersproc_num_3();
-extern  int * rusersproc_num_3_svc();
-#define RUSERSPROC_NAMES 2
-extern  utmp_array * rusersproc_names_3();
-extern  utmp_array * rusersproc_names_3_svc();
-#define RUSERSPROC_ALLNAMES 3
-extern  utmp_array * rusersproc_allnames_3();
-extern  utmp_array * rusersproc_allnames_3_svc();
-extern int rusersprog_3_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_rusers_utmp (XDR *, rusers_utmp*);
-extern  bool_t xdr_utmp_array (XDR *, utmp_array*);
-
-#else /* K&R C */
-extern bool_t xdr_rusers_utmp ();
-extern bool_t xdr_utmp_array ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RUSERS_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/rusers.x b/openflow/usr/include/rpcsvc/rusers.x
deleted file mode 100644
index 5bbfe97..0000000
--- a/openflow/usr/include/rpcsvc/rusers.x
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-%/*
-% * Find out about remote users
-% */
-
-const RUSERS_MAXUSERLEN = 32;
-const RUSERS_MAXLINELEN = 32;
-const RUSERS_MAXHOSTLEN = 257;
-
-struct rusers_utmp {
-	string ut_user<RUSERS_MAXUSERLEN>;	/* aka ut_name */
-	string ut_line<RUSERS_MAXLINELEN>;	/* device */
-	string ut_host<RUSERS_MAXHOSTLEN>;	/* host user logged on from */
-	int ut_type;				/* type of entry */
-	int ut_time;				/* time entry was made */
-	unsigned int ut_idle;			/* minutes idle */
-};
-
-typedef rusers_utmp utmp_array<>;
-
-#ifdef RPC_HDR
-%
-%/*
-% * Values for ut_type field above.
-% */
-#endif
-const	RUSERS_EMPTY = 0;
-const	RUSERS_RUN_LVL = 1;
-const	RUSERS_BOOT_TIME = 2;
-const	RUSERS_OLD_TIME = 3;
-const	RUSERS_NEW_TIME = 4;
-const	RUSERS_INIT_PROCESS = 5;
-const	RUSERS_LOGIN_PROCESS = 6;
-const	RUSERS_USER_PROCESS = 7;
-const	RUSERS_DEAD_PROCESS = 8;
-const	RUSERS_ACCOUNTING = 9;
-
-program RUSERSPROG {
-
-	version RUSERSVERS_3 {
-		int
-		RUSERSPROC_NUM(void) = 1;
-
-		utmp_array
-		RUSERSPROC_NAMES(void) = 2;
-
-		utmp_array
-		RUSERSPROC_ALLNAMES(void) = 3;
-	} = 3;
-
-} = 100002;
-
-#ifdef RPC_HDR
-%
-%
-%#ifdef	__cplusplus
-%extern "C" {
-%#endif
-%
-%#include <rpc/xdr.h>
-%
-%/*
-% * The following structures are used by version 2 of the rusersd protocol.
-% * They were not developed with rpcgen, so they do not appear as RPCL.
-% */
-%
-%#define	RUSERSVERS_IDLE 2
-%#define	RUSERSVERS 3		/* current version */
-%#define	MAXUSERS 100
-%
-%/*
-% * This is the structure used in version 2 of the rusersd RPC service.
-% * It corresponds to the utmp structure for BSD systems.
-% */
-%struct ru_utmp {
-%	char	ut_line[8];		/* tty name */
-%	char	ut_name[8];		/* user id */
-%	char	ut_host[16];		/* host name, if remote */
-%	long int ut_time;		/* time on */
-%};
-%
-%struct utmparr {
-%       struct ru_utmp **uta_arr;
-%       int uta_cnt;
-%};
-%typedef struct utmparr utmparr;
-%
-%extern bool_t xdr_utmparr (XDR *xdrs, struct utmparr *objp) __THROW;
-%
-%struct utmpidle {
-%	struct ru_utmp ui_utmp;
-%	unsigned int ui_idle;
-%};
-%
-%struct utmpidlearr {
-%	struct utmpidle **uia_arr;
-%	int uia_cnt;
-%};
-%
-%extern bool_t xdr_utmpidlearr (XDR *xdrs, struct utmpidlearr *objp) __THROW;
-%
-%#ifdef	__cplusplus
-%}
-%#endif
-#endif
-
-
-#ifdef	RPC_XDR
-%bool_t xdr_utmp (XDR *xdrs, struct ru_utmp *objp);
-%
-%bool_t
-%xdr_utmp (XDR *xdrs, struct ru_utmp *objp)
-%{
-%	/* Since the fields are char foo [xxx], we should not free them. */
-%	if (xdrs->x_op != XDR_FREE)
-%	{
-%		char *ptr;
-%		unsigned int size;
-%		ptr = objp->ut_line;
-%		size = sizeof (objp->ut_line);
-%		if (!xdr_bytes (xdrs, &ptr, &size, size)) {
-%			return (FALSE);
-%		}
-%		ptr = objp->ut_name;
-%		size = sizeof (objp->ut_name);
-%		if (!xdr_bytes (xdrs, &ptr, &size, size)) {
-%			return (FALSE);
-%		}
-%		ptr = objp->ut_host;
-%		size = sizeof (objp->ut_host);
-%		if (!xdr_bytes (xdrs, &ptr, &size, size)) {
-%			return (FALSE);
-%		}
-%	}
-%	if (!xdr_long(xdrs, &objp->ut_time)) {
-%		return (FALSE);
-%	}
-%	return (TRUE);
-%}
-%
-%bool_t xdr_utmpptr(XDR *xdrs, struct ru_utmp **objpp);
-%
-%bool_t
-%xdr_utmpptr (XDR *xdrs, struct ru_utmp **objpp)
-%{
-%	if (!xdr_reference(xdrs, (char **) objpp, sizeof (struct ru_utmp),
-%			   (xdrproc_t) xdr_utmp)) {
-%		return (FALSE);
-%	}
-%	return (TRUE);
-%}
-%
-%bool_t
-%xdr_utmparr (XDR *xdrs, struct utmparr *objp)
-%{
-%	if (!xdr_array(xdrs, (char **)&objp->uta_arr, (u_int *)&objp->uta_cnt,
-%		       MAXUSERS, sizeof(struct ru_utmp *),
-%		       (xdrproc_t) xdr_utmpptr)) {
-%		return (FALSE);
-%	}
-%	return (TRUE);
-%}
-%
-%bool_t xdr_utmpidle(XDR *xdrs, struct utmpidle *objp);
-%
-%bool_t
-%xdr_utmpidle (XDR *xdrs, struct utmpidle *objp)
-%{
-%	if (!xdr_utmp(xdrs, &objp->ui_utmp)) {
-%		return (FALSE);
-%	}
-%	if (!xdr_u_int(xdrs, &objp->ui_idle)) {
-%		return (FALSE);
-%	}
-%	return (TRUE);
-%}
-%
-%bool_t xdr_utmpidleptr(XDR *xdrs, struct utmpidle **objp);
-%
-%bool_t
-%xdr_utmpidleptr (XDR *xdrs, struct utmpidle **objpp)
-%{
-%	if (!xdr_reference(xdrs, (char **) objpp, sizeof (struct utmpidle),
-%			   (xdrproc_t) xdr_utmpidle)) {
-%		return (FALSE);
-%	}
-%	return (TRUE);
-%}
-%
-%bool_t
-%xdr_utmpidlearr (XDR *xdrs, struct utmpidlearr *objp)
-%{
-%	if (!xdr_array(xdrs, (char **)&objp->uia_arr, (u_int *)&objp->uia_cnt,
-%		       MAXUSERS, sizeof(struct utmpidle *),
-%		       (xdrproc_t) xdr_utmpidleptr)) {
-%		return (FALSE);
-%	}
-%	return (TRUE);
-%}
-#endif
diff --git a/openflow/usr/include/rpcsvc/sm_inter.h b/openflow/usr/include/rpcsvc/sm_inter.h
deleted file mode 100644
index d4bc3e1..0000000
--- a/openflow/usr/include/rpcsvc/sm_inter.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _SM_INTER_H_RPCGEN
-#define _SM_INTER_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SM_MAXSTRLEN 1024
-
-struct sm_name {
-	char *mon_name;
-};
-typedef struct sm_name sm_name;
-
-struct my_id {
-	char *my_name;
-	int my_prog;
-	int my_vers;
-	int my_proc;
-};
-typedef struct my_id my_id;
-
-struct mon_id {
-	char *mon_name;
-	struct my_id my_id;
-};
-typedef struct mon_id mon_id;
-
-struct mon {
-	struct mon_id mon_id;
-	char priv[16];
-};
-typedef struct mon mon;
-
-struct sm_stat {
-	int state;
-};
-typedef struct sm_stat sm_stat;
-
-enum res {
-	stat_succ = 0,
-	stat_fail = 1,
-};
-typedef enum res res;
-
-struct sm_stat_res {
-	res res_stat;
-	int state;
-};
-typedef struct sm_stat_res sm_stat_res;
-
-struct status {
-	char *mon_name;
-	int state;
-	char priv[16];
-};
-typedef struct status status;
-
-#define SM_PROG 100024
-#define SM_VERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define SM_STAT 1
-extern  struct sm_stat_res * sm_stat_1(struct sm_name *, CLIENT *);
-extern  struct sm_stat_res * sm_stat_1_svc(struct sm_name *, struct svc_req *);
-#define SM_MON 2
-extern  struct sm_stat_res * sm_mon_1(struct mon *, CLIENT *);
-extern  struct sm_stat_res * sm_mon_1_svc(struct mon *, struct svc_req *);
-#define SM_UNMON 3
-extern  struct sm_stat * sm_unmon_1(struct mon_id *, CLIENT *);
-extern  struct sm_stat * sm_unmon_1_svc(struct mon_id *, struct svc_req *);
-#define SM_UNMON_ALL 4
-extern  struct sm_stat * sm_unmon_all_1(struct my_id *, CLIENT *);
-extern  struct sm_stat * sm_unmon_all_1_svc(struct my_id *, struct svc_req *);
-#define SM_SIMU_CRASH 5
-extern  void * sm_simu_crash_1(void *, CLIENT *);
-extern  void * sm_simu_crash_1_svc(void *, struct svc_req *);
-extern int sm_prog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define SM_STAT 1
-extern  struct sm_stat_res * sm_stat_1();
-extern  struct sm_stat_res * sm_stat_1_svc();
-#define SM_MON 2
-extern  struct sm_stat_res * sm_mon_1();
-extern  struct sm_stat_res * sm_mon_1_svc();
-#define SM_UNMON 3
-extern  struct sm_stat * sm_unmon_1();
-extern  struct sm_stat * sm_unmon_1_svc();
-#define SM_UNMON_ALL 4
-extern  struct sm_stat * sm_unmon_all_1();
-extern  struct sm_stat * sm_unmon_all_1_svc();
-#define SM_SIMU_CRASH 5
-extern  void * sm_simu_crash_1();
-extern  void * sm_simu_crash_1_svc();
-extern int sm_prog_1_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_sm_name (XDR *, sm_name*);
-extern  bool_t xdr_my_id (XDR *, my_id*);
-extern  bool_t xdr_mon_id (XDR *, mon_id*);
-extern  bool_t xdr_mon (XDR *, mon*);
-extern  bool_t xdr_sm_stat (XDR *, sm_stat*);
-extern  bool_t xdr_res (XDR *, res*);
-extern  bool_t xdr_sm_stat_res (XDR *, sm_stat_res*);
-extern  bool_t xdr_status (XDR *, status*);
-
-#else /* K&R C */
-extern bool_t xdr_sm_name ();
-extern bool_t xdr_my_id ();
-extern bool_t xdr_mon_id ();
-extern bool_t xdr_mon ();
-extern bool_t xdr_sm_stat ();
-extern bool_t xdr_res ();
-extern bool_t xdr_sm_stat_res ();
-extern bool_t xdr_status ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_SM_INTER_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/sm_inter.x b/openflow/usr/include/rpcsvc/sm_inter.x
deleted file mode 100644
index 767f0e0..0000000
--- a/openflow/usr/include/rpcsvc/sm_inter.x
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Status monitor protocol specification
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-program SM_PROG {
-	version SM_VERS  {
-		/* res_stat = stat_succ if status monitor agrees to monitor */
-		/* res_stat = stat_fail if status monitor cannot monitor */
-		/* if res_stat == stat_succ, state = state number of site sm_name */
-		struct sm_stat_res			 SM_STAT(struct sm_name) = 1;
-
-		/* res_stat = stat_succ if status monitor agrees to monitor */
-		/* res_stat = stat_fail if status monitor cannot monitor */
-		/* stat consists of state number of local site */
-		struct sm_stat_res			 SM_MON(struct mon) = 2;
-
-		/* stat consists of state number of local site */
-		struct sm_stat				 SM_UNMON(struct mon_id) = 3;
-
-		/* stat consists of state number of local site */
-		struct sm_stat				 SM_UNMON_ALL(struct my_id) = 4;
-
-		void					 SM_SIMU_CRASH(void) = 5;
-
-	} = 1;
-} = 100024;
-
-const	SM_MAXSTRLEN = 1024;
-
-struct sm_name {
-	string mon_name<SM_MAXSTRLEN>;
-};
-
-struct my_id {
-	string	 my_name<SM_MAXSTRLEN>;		/* name of the site initiating the monitoring request*/
-	int	my_prog;			/* rpc program # of the requesting process */
-	int	my_vers;			/* rpc version # of the requesting process */
-	int	my_proc;			/* rpc procedure # of the requesting process */
-};
-
-struct mon_id {
-	string	mon_name<SM_MAXSTRLEN>;		/* name of the site to be monitored */
-	struct my_id my_id;
-};
-
-
-struct mon{
-	struct mon_id mon_id;
-	opaque priv[16]; 		/* private information to store at monitor for requesting process */
-};
-
-
-/*
- * state # of status monitor monotonically increases each time
- * status of the site changes:
- * an even number (>= 0) indicates the site is down and
- * an odd number (> 0) indicates the site is up;
- */
-struct sm_stat {
-	int state;		/* state # of status monitor */
-};
-
-enum res {
-	stat_succ = 0,		/* status monitor agrees to monitor */
-	stat_fail = 1		/* status monitor cannot monitor */
-};
-
-struct sm_stat_res {
-	res res_stat;
-	int state;
-};
-
-/*
- * structure of the status message sent back by the status monitor
- * when monitor site status changes
- */
-struct status {
-	string mon_name<SM_MAXSTRLEN>;
-	int state;
-	opaque priv[16];		/* stored private information */
-};
diff --git a/openflow/usr/include/rpcsvc/spray.h b/openflow/usr/include/rpcsvc/spray.h
deleted file mode 100644
index b19e402..0000000
--- a/openflow/usr/include/rpcsvc/spray.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _SPRAY_H_RPCGEN
-#define _SPRAY_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SPRAYMAX 8845
-
-struct spraytimeval {
-	u_int sec;
-	u_int usec;
-};
-typedef struct spraytimeval spraytimeval;
-
-struct spraycumul {
-	u_int counter;
-	spraytimeval clock;
-};
-typedef struct spraycumul spraycumul;
-
-typedef struct {
-	u_int sprayarr_len;
-	char *sprayarr_val;
-} sprayarr;
-
-#define SPRAYPROG 100012
-#define SPRAYVERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define SPRAYPROC_SPRAY 1
-extern  void * sprayproc_spray_1(sprayarr *, CLIENT *);
-extern  void * sprayproc_spray_1_svc(sprayarr *, struct svc_req *);
-#define SPRAYPROC_GET 2
-extern  spraycumul * sprayproc_get_1(void *, CLIENT *);
-extern  spraycumul * sprayproc_get_1_svc(void *, struct svc_req *);
-#define SPRAYPROC_CLEAR 3
-extern  void * sprayproc_clear_1(void *, CLIENT *);
-extern  void * sprayproc_clear_1_svc(void *, struct svc_req *);
-extern int sprayprog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define SPRAYPROC_SPRAY 1
-extern  void * sprayproc_spray_1();
-extern  void * sprayproc_spray_1_svc();
-#define SPRAYPROC_GET 2
-extern  spraycumul * sprayproc_get_1();
-extern  spraycumul * sprayproc_get_1_svc();
-#define SPRAYPROC_CLEAR 3
-extern  void * sprayproc_clear_1();
-extern  void * sprayproc_clear_1_svc();
-extern int sprayprog_1_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_spraytimeval (XDR *, spraytimeval*);
-extern  bool_t xdr_spraycumul (XDR *, spraycumul*);
-extern  bool_t xdr_sprayarr (XDR *, sprayarr*);
-
-#else /* K&R C */
-extern bool_t xdr_spraytimeval ();
-extern bool_t xdr_spraycumul ();
-extern bool_t xdr_sprayarr ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_SPRAY_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/spray.x b/openflow/usr/include/rpcsvc/spray.x
deleted file mode 100644
index 68b7c48..0000000
--- a/openflow/usr/include/rpcsvc/spray.x
+++ /dev/null
@@ -1,84 +0,0 @@
-/* @(#)spray.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Spray a server with packets
- * Useful for testing flakiness of network interfaces
- */
-
-const SPRAYMAX = 8845;	/* max amount can spray */
-
-/*
- * GMT since 0:00, 1 January 1970
- */
-struct spraytimeval {
-	unsigned int sec;
-	unsigned int usec;
-};
-
-/*
- * spray statistics
- */
-struct spraycumul {
-	unsigned int counter;
-	spraytimeval clock;
-};
-
-/*
- * spray data
- */
-typedef opaque sprayarr<SPRAYMAX>;
-
-program SPRAYPROG {
-	version SPRAYVERS {
-		/*
-		 * Just throw away the data and increment the counter
-		 * This call never returns, so the client should always
-		 * time it out.
-		 */
-		void
-		SPRAYPROC_SPRAY(sprayarr) = 1;
-
-		/*
-		 * Get the value of the counter and elapsed time  since
-		 * last CLEAR.
-		 */
-		spraycumul
-		SPRAYPROC_GET(void) = 2;
-
-		/*
-		 * Clear the counter and reset the elapsed time
-		 */
-		void
-		SPRAYPROC_CLEAR(void) = 3;
-	} = 1;
-} = 100012;
diff --git a/openflow/usr/include/rpcsvc/yp.h b/openflow/usr/include/rpcsvc/yp.h
deleted file mode 100644
index 968b74c..0000000
--- a/openflow/usr/include/rpcsvc/yp.h
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __RPCSVC_YP_H__
-#define __RPCSVC_YP_H__
-
-#include <features.h>
-#include <rpc/rpc.h>
-
-#define YPMAXRECORD 1024
-#define YPMAXDOMAIN 64
-#define YPMAXMAP 64
-#define YPMAXPEER 64
-
-enum ypstat {
-	YP_TRUE = 1,
-	YP_NOMORE = 2,
-	YP_FALSE = 0,
-	YP_NOMAP = -1,
-	YP_NODOM = -2,
-	YP_NOKEY = -3,
-	YP_BADOP = -4,
-	YP_BADDB = -5,
-	YP_YPERR = -6,
-	YP_BADARGS = -7,
-	YP_VERS = -8,
-};
-typedef enum ypstat ypstat;
-
-enum ypxfrstat {
-	YPXFR_SUCC = 1,
-	YPXFR_AGE = 2,
-	YPXFR_NOMAP = -1,
-	YPXFR_NODOM = -2,
-	YPXFR_RSRC = -3,
-	YPXFR_RPC = -4,
-	YPXFR_MADDR = -5,
-	YPXFR_YPERR = -6,
-	YPXFR_BADARGS = -7,
-	YPXFR_DBM = -8,
-	YPXFR_FILE = -9,
-	YPXFR_SKEW = -10,
-	YPXFR_CLEAR = -11,
-	YPXFR_FORCE = -12,
-	YPXFR_XFRERR = -13,
-	YPXFR_REFUSED = -14,
-};
-typedef enum ypxfrstat ypxfrstat;
-
-typedef char *domainname;
-typedef char *mapname;
-typedef char *peername;
-
-typedef struct {
-  u_int keydat_len;
-  char *keydat_val;
-} keydat;
-
-typedef struct {
-  u_int valdat_len;
-  char *valdat_val;
-} valdat;
-
-struct ypmap_parms {
-  domainname domain;
-  mapname map;
-  u_int ordernum;
-  peername peer;
-};
-typedef struct ypmap_parms ypmap_parms;
-
-struct ypreq_key {
-  domainname domain;
-  mapname map;
-  keydat key;
-};
-typedef struct ypreq_key ypreq_key;
-
-struct ypreq_nokey {
-  domainname domain;
-  mapname map;
-};
-typedef struct ypreq_nokey ypreq_nokey;
-
-struct ypreq_xfr {
-  ypmap_parms map_parms;
-  u_int transid;
-  u_int prog;
-  u_int port;
-};
-typedef struct ypreq_xfr ypreq_xfr;
-
-struct ypresp_val {
-  ypstat stat;
-  valdat val;
-};
-typedef struct ypresp_val ypresp_val;
-
-struct ypresp_key_val {
-  ypstat stat;
-#ifdef STUPID_SUN_BUG
-  /* This is the form as distributed by Sun.  But even the Sun NIS
-     servers expect the values in the other order.  So their
-     implementation somehow must change the order internally.  We
-     don't want to follow this bad example since the user should be
-     able to use rpcgen on this file.  */
-  keydat key;
-  valdat val;
-#else
-  valdat val;
-  keydat key;
-#endif
-};
-typedef struct ypresp_key_val ypresp_key_val;
-
-struct ypresp_master {
-  ypstat stat;
-  peername peer;
-};
-typedef struct ypresp_master ypresp_master;
-
-struct ypresp_order {
-  ypstat stat;
-  u_int ordernum;
-};
-typedef struct ypresp_order ypresp_order;
-
-struct ypresp_all {
-  bool_t more;
-  union {
-    ypresp_key_val val;
-  } ypresp_all_u;
-};
-typedef struct ypresp_all ypresp_all;
-
-struct ypresp_xfr {
-  u_int transid;
-  ypxfrstat xfrstat;
-};
-typedef struct ypresp_xfr ypresp_xfr;
-
-struct ypmaplist {
-  mapname map;
-  struct ypmaplist *next;
-};
-typedef struct ypmaplist ypmaplist;
-
-struct ypresp_maplist {
-  ypstat stat;
-  ypmaplist *maps;
-};
-typedef struct ypresp_maplist ypresp_maplist;
-
-enum yppush_status {
-  YPPUSH_SUCC = 1,
-  YPPUSH_AGE = 2,
-  YPPUSH_NOMAP = -1,
-  YPPUSH_NODOM = -2,
-  YPPUSH_RSRC = -3,
-  YPPUSH_RPC = -4,
-  YPPUSH_MADDR = -5,
-  YPPUSH_YPERR = -6,
-  YPPUSH_BADARGS = -7,
-  YPPUSH_DBM = -8,
-  YPPUSH_FILE = -9,
-  YPPUSH_SKEW = -10,
-  YPPUSH_CLEAR = -11,
-  YPPUSH_FORCE = -12,
-  YPPUSH_XFRERR = -13,
-  YPPUSH_REFUSED = -14,
-};
-typedef enum yppush_status yppush_status;
-
-struct yppushresp_xfr {
-  u_int transid;
-  yppush_status status;
-};
-typedef struct yppushresp_xfr yppushresp_xfr;
-
-enum ypbind_resptype {
-  YPBIND_SUCC_VAL = 1,
-  YPBIND_FAIL_VAL = 2,
-};
-typedef enum ypbind_resptype ypbind_resptype;
-
-struct ypbind_binding {
-  char ypbind_binding_addr[4];
-  char ypbind_binding_port[2];
-};
-typedef struct ypbind_binding ypbind_binding;
-
-struct ypbind_resp {
-  ypbind_resptype ypbind_status;
-  union {
-    u_int ypbind_error;
-    ypbind_binding ypbind_bindinfo;
-  } ypbind_resp_u;
-};
-typedef struct ypbind_resp ypbind_resp;
-
-#define YPBIND_ERR_ERR 1
-#define YPBIND_ERR_NOSERV 2
-#define YPBIND_ERR_RESC 3
-
-struct ypbind_setdom {
-  domainname ypsetdom_domain;
-  ypbind_binding ypsetdom_binding;
-  u_int ypsetdom_vers;
-};
-typedef struct ypbind_setdom ypbind_setdom;
-
-__BEGIN_DECLS
-
-#define YPPROG 100004
-#define YPVERS 2
-
-#define YPPROC_NULL 0
-extern  void *ypproc_null_2 (void *, CLIENT *);
-extern  void *ypproc_null_2_svc (void *, struct svc_req *);
-#define YPPROC_DOMAIN 1
-extern  bool_t *ypproc_domain_2 (domainname *, CLIENT *);
-extern  bool_t *ypproc_domain_2_svc (domainname *, struct svc_req *);
-#define YPPROC_DOMAIN_NONACK 2
-extern  bool_t *ypproc_domain_nonack_2 (domainname *, CLIENT *);
-extern  bool_t *ypproc_domain_nonack_2_svc (domainname *, struct svc_req *);
-#define YPPROC_MATCH 3
-extern  ypresp_val *ypproc_match_2 (ypreq_key *, CLIENT *);
-extern  ypresp_val *ypproc_match_2_svc (ypreq_key *, struct svc_req *);
-#define YPPROC_FIRST 4
-extern  ypresp_key_val *ypproc_first_2 (ypreq_key *, CLIENT *);
-extern  ypresp_key_val *ypproc_first_2_svc (ypreq_key *, struct svc_req *);
-#define YPPROC_NEXT 5
-extern  ypresp_key_val *ypproc_next_2 (ypreq_key *, CLIENT *);
-extern  ypresp_key_val *ypproc_next_2_svc (ypreq_key *, struct svc_req *);
-#define YPPROC_XFR 6
-extern  ypresp_xfr *ypproc_xfr_2 (ypreq_xfr *, CLIENT *);
-extern  ypresp_xfr *ypproc_xfr_2_svc (ypreq_xfr *, struct svc_req *);
-#define YPPROC_CLEAR 7
-extern  void *ypproc_clear_2 (void *, CLIENT *);
-extern  void *ypproc_clear_2_svc (void *, struct svc_req *);
-#define YPPROC_ALL 8
-extern  ypresp_all *ypproc_all_2 (ypreq_nokey *, CLIENT *);
-extern  ypresp_all *ypproc_all_2_svc (ypreq_nokey *, struct svc_req *);
-#define YPPROC_MASTER 9
-extern  ypresp_master *ypproc_master_2 (ypreq_nokey *, CLIENT *);
-extern  ypresp_master *ypproc_master_2_svc (ypreq_nokey *, struct svc_req *);
-#define YPPROC_ORDER 10
-extern  ypresp_order *ypproc_order_2 (ypreq_nokey *, CLIENT *);
-extern  ypresp_order *ypproc_order_2_svc (ypreq_nokey *, struct svc_req *);
-#define YPPROC_MAPLIST 11
-extern  ypresp_maplist *ypproc_maplist_2 (domainname *, CLIENT *);
-extern  ypresp_maplist *ypproc_maplist_2_svc (domainname *, struct svc_req *);
-extern int ypprog_2_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-
-#define YPPUSH_XFRRESPPROG (0x40000000)
-#define YPPUSH_XFRRESPVERS 1
-
-#define YPPUSHPROC_NULL 0
-extern  void *yppushproc_null_1 (void *, CLIENT *);
-extern  void *yppushproc_null_1_svc (void *, struct svc_req *);
-#define YPPUSHPROC_XFRRESP 1
-extern  void *yppushproc_xfrresp_1 (yppushresp_xfr *, CLIENT *);
-extern  void *yppushproc_xfrresp_1_svc (yppushresp_xfr *, struct svc_req *);
-extern int yppush_xfrrespprog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-
-#define YPBINDPROG 100007
-#define YPBINDVERS 2
-
-#define YPBINDPROC_NULL 0
-extern  void *ypbindproc_null_2 (void *, CLIENT *);
-extern  void *ypbindproc_null_2_svc (void *, struct svc_req *);
-#define YPBINDPROC_DOMAIN 1
-extern  ypbind_resp *ypbindproc_domain_2 (domainname *, CLIENT *);
-extern  ypbind_resp *ypbindproc_domain_2_svc (domainname *, struct svc_req *);
-#define YPBINDPROC_SETDOM 2
-extern  void *ypbindproc_setdom_2 (ypbind_setdom *, CLIENT *);
-extern  void *ypbindproc_setdom_2_svc (ypbind_setdom *, struct svc_req *);
-extern int ypbindprog_2_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-
-extern  bool_t xdr_ypstat (XDR *, ypstat*);
-extern  bool_t xdr_ypxfrstat (XDR *, ypxfrstat*);
-extern  bool_t xdr_domainname (XDR *, domainname*);
-extern  bool_t xdr_mapname (XDR *, mapname*);
-extern  bool_t xdr_peername (XDR *, peername*);
-extern  bool_t xdr_keydat (XDR *, keydat*);
-extern  bool_t xdr_valdat (XDR *, valdat*);
-extern  bool_t xdr_ypmap_parms (XDR *, ypmap_parms*);
-extern  bool_t xdr_ypreq_key (XDR *, ypreq_key*);
-extern  bool_t xdr_ypreq_nokey (XDR *, ypreq_nokey*);
-extern  bool_t xdr_ypreq_xfr (XDR *, ypreq_xfr*);
-extern  bool_t xdr_ypresp_val (XDR *, ypresp_val*);
-extern  bool_t xdr_ypresp_key_val (XDR *, ypresp_key_val*);
-extern  bool_t xdr_ypresp_master (XDR *, ypresp_master*);
-extern  bool_t xdr_ypresp_order (XDR *, ypresp_order*);
-extern  bool_t xdr_ypresp_all (XDR *, ypresp_all*);
-extern  bool_t xdr_ypresp_xfr (XDR *, ypresp_xfr*);
-extern  bool_t xdr_ypmaplist (XDR *, ypmaplist*);
-extern  bool_t xdr_ypresp_maplist (XDR *, ypresp_maplist*);
-extern  bool_t xdr_yppush_status (XDR *, yppush_status*);
-extern  bool_t xdr_yppushresp_xfr (XDR *, yppushresp_xfr*);
-extern  bool_t xdr_ypbind_resptype (XDR *, ypbind_resptype*);
-extern  bool_t xdr_ypbind_binding (XDR *, ypbind_binding*);
-extern  bool_t xdr_ypbind_resp (XDR *, ypbind_resp*);
-extern  bool_t xdr_ypbind_setdom (XDR *, ypbind_setdom*);
-
-__END_DECLS
-
-#endif /* !__RPCSVC_YP_H__ */
diff --git a/openflow/usr/include/rpcsvc/yp.x b/openflow/usr/include/rpcsvc/yp.x
deleted file mode 100644
index 269ae6f..0000000
--- a/openflow/usr/include/rpcsvc/yp.x
+++ /dev/null
@@ -1,311 +0,0 @@
-/* @(#)yp.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Protocol description file for the Yellow Pages Service
- */
-
-const YPMAXRECORD = 1024;
-const YPMAXDOMAIN = 64;
-const YPMAXMAP = 64;
-const YPMAXPEER = 64;
-
-
-enum ypstat {
-	YP_TRUE		=  1,
-	YP_NOMORE	=  2,
-	YP_FALSE	=  0,
-	YP_NOMAP	= -1,
-	YP_NODOM	= -2,
-	YP_NOKEY	= -3,
-	YP_BADOP	= -4,
-	YP_BADDB	= -5,
-	YP_YPERR	= -6,
-	YP_BADARGS	= -7,
-	YP_VERS		= -8
-};
-
-
-enum ypxfrstat {
-	YPXFR_SUCC	=  1,
-	YPXFR_AGE	=  2,
-	YPXFR_NOMAP	= -1,
-	YPXFR_NODOM	= -2,
-	YPXFR_RSRC	= -3,
-	YPXFR_RPC	= -4,
-	YPXFR_MADDR	= -5,
-	YPXFR_YPERR	= -6,
-	YPXFR_BADARGS	= -7,
-	YPXFR_DBM	= -8,
-	YPXFR_FILE	= -9,
-	YPXFR_SKEW	= -10,
-	YPXFR_CLEAR	= -11,
-	YPXFR_FORCE	= -12,
-	YPXFR_XFRERR	= -13,
-	YPXFR_REFUSED	= -14
-};
-
-
-typedef string domainname<YPMAXDOMAIN>;
-typedef string mapname<YPMAXMAP>;
-typedef string peername<YPMAXPEER>;
-typedef opaque keydat<YPMAXRECORD>;
-typedef opaque valdat<YPMAXRECORD>;
-
-
-struct ypmap_parms {
-	domainname domain;
-	mapname map;
-	unsigned int ordernum;
-	peername peer;
-};
-
-struct ypreq_key {
-	domainname domain;
-	mapname map;
-	keydat key;
-};
-
-struct ypreq_nokey {
-	domainname domain;
-	mapname map;
-};
-
-struct ypreq_xfr {
-	ypmap_parms map_parms;
-	unsigned int transid;
-	unsigned int prog;
-	unsigned int port;
-};
-
-
-struct ypresp_val {
-	ypstat stat;
-	valdat val;
-};
-
-struct ypresp_key_val {
-	ypstat stat;
-#ifdef STUPID_SUN_BUG
-	/* This is the form as distributed by Sun.  But even the Sun NIS
-	   servers expect the values in the other order.  So their
-	   implementation somehow must change the order internally.  We
-	   don't want to follow this bad example since the user should be
-	   able to use rpcgen on this file.  */
-	keydat key;
-	valdat val;
-#else
-	valdat val;
-	keydat key;
-#endif
-};
-
-
-struct ypresp_master {
-	ypstat stat;
-	peername peer;
-};
-
-struct ypresp_order {
-	ypstat stat;
-	unsigned int ordernum;
-};
-
-union ypresp_all switch (bool more) {
-case TRUE:
-	ypresp_key_val val;
-case FALSE:
-	void;
-};
-
-struct ypresp_xfr {
-	unsigned int transid;
-	ypxfrstat xfrstat;
-};
-
-struct ypmaplist {
-	mapname map;
-	ypmaplist *next;
-};
-
-struct ypresp_maplist {
-	ypstat stat;
-	ypmaplist *maps;
-};
-
-enum yppush_status {
-	YPPUSH_SUCC	=  1,	/* Success */
-	YPPUSH_AGE	=  2,	/* Master's version not newer */
-	YPPUSH_NOMAP	= -1,	/* Can't find server for map */
-	YPPUSH_NODOM	= -2,	/* Domain not supported */
-	YPPUSH_RSRC	= -3,	/* Local resource alloc failure */
-	YPPUSH_RPC	= -4,	/* RPC failure talking to server */
-	YPPUSH_MADDR	= -5,	/* Can't get master address */
-	YPPUSH_YPERR	= -6,	/* YP server/map db error */
-	YPPUSH_BADARGS	= -7,	/* Request arguments bad */
-	YPPUSH_DBM	= -8,	/* Local dbm operation failed */
-	YPPUSH_FILE	= -9,	/* Local file I/O operation failed */
-	YPPUSH_SKEW	= -10,	/* Map version skew during transfer */
-	YPPUSH_CLEAR	= -11,	/* Can't send "Clear" req to local ypserv */
-	YPPUSH_FORCE	= -12,	/* No local order number in map  use -f flag. */
-	YPPUSH_XFRERR	= -13,	/* ypxfr error */
-	YPPUSH_REFUSED	= -14	/* Transfer request refused by ypserv */
-};
-
-struct yppushresp_xfr {
-	unsigned transid;
-	yppush_status status;
-};
-
-/*
- * Response structure and overall result status codes.  Success and failure
- * represent two separate response message types.
- */
-
-enum ypbind_resptype {
-	YPBIND_SUCC_VAL = 1,
-	YPBIND_FAIL_VAL = 2
-};
-
-struct ypbind_binding {
-    opaque ypbind_binding_addr[4]; /* In network order */
-    opaque ypbind_binding_port[2]; /* In network order */
-};
-
-union ypbind_resp switch (ypbind_resptype ypbind_status) {
-case YPBIND_FAIL_VAL:
-	unsigned ypbind_error;
-case YPBIND_SUCC_VAL:
-	ypbind_binding ypbind_bindinfo;
-};
-
-/* Detailed failure reason codes for response field ypbind_error*/
-
-const YPBIND_ERR_ERR    = 1;	/* Internal error */
-const YPBIND_ERR_NOSERV = 2;	/* No bound server for passed domain */
-const YPBIND_ERR_RESC   = 3;	/* System resource allocation failure */
-
-
-/*
- * Request data structure for ypbind "Set domain" procedure.
- */
-struct ypbind_setdom {
-	domainname ypsetdom_domain;
-	ypbind_binding ypsetdom_binding;
-	unsigned ypsetdom_vers;
-};
-
-
-/*
- * YP access protocol
- */
-program YPPROG {
-	version YPVERS {
-		void
-		YPPROC_NULL(void) = 0;
-
-		bool
-		YPPROC_DOMAIN(domainname) = 1;
-
-		bool
-		YPPROC_DOMAIN_NONACK(domainname) = 2;
-
-		ypresp_val
-		YPPROC_MATCH(ypreq_key) = 3;
-
-		ypresp_key_val
-		YPPROC_FIRST(ypreq_key) = 4;
-
-		ypresp_key_val
-		YPPROC_NEXT(ypreq_key) = 5;
-
-		ypresp_xfr
-		YPPROC_XFR(ypreq_xfr) = 6;
-
-		void
-		YPPROC_CLEAR(void) = 7;
-
-		ypresp_all
-		YPPROC_ALL(ypreq_nokey) = 8;
-
-		ypresp_master
-		YPPROC_MASTER(ypreq_nokey) = 9;
-
-		ypresp_order
-		YPPROC_ORDER(ypreq_nokey) = 10;
-
-		ypresp_maplist
-		YPPROC_MAPLIST(domainname) = 11;
-	} = 2;
-} = 100004;
-
-
-/*
- * YPPUSHPROC_XFRRESP is the callback routine for result of YPPROC_XFR
- */
-program YPPUSH_XFRRESPPROG {
-	version YPPUSH_XFRRESPVERS {
-		void
-		YPPUSHPROC_NULL(void) = 0;
-
-#ifdef STUPID_SUN_BUG
-		/* This is the form as distributed by Sun.  But even
-		   the Sun NIS servers expect the values in the other
-		   order.  So their implementation somehow must change
-		   the order internally.  We don't want to follow this
-		   bad example since the user should be able to use
-		   rpcgen on this file.  */
-		yppushresp_xfr
-		YPPUSHPROC_XFRRESP(void) = 1;
-#else
-		void
-		YPPUSHPROC_XFRRESP(yppushresp_xfr) = 1;
-#endif
-	} = 1;
-} = 0x40000000;	/* transient: could be anything up to 0x5fffffff */
-
-/*
- * YP binding protocol
- */
-program YPBINDPROG {
-	version YPBINDVERS {
-		void
-		YPBINDPROC_NULL(void) = 0;
-
-		ypbind_resp
-		YPBINDPROC_DOMAIN(domainname) = 1;
-
-		void
-		YPBINDPROC_SETDOM(ypbind_setdom) = 2;
-	} = 2;
-} = 100007;
diff --git a/openflow/usr/include/rpcsvc/yp_prot.h b/openflow/usr/include/rpcsvc/yp_prot.h
deleted file mode 100644
index ae0db36..0000000
--- a/openflow/usr/include/rpcsvc/yp_prot.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * This file contains symbols and structures defining the rpc protocol
- * between the NIS clients and the NIS servers.  The servers
- * are the NIS database servers, and the NIS binders.
- */
-
-#ifndef _RPCSVC_YP_PROT_H
-#define _RPCSVC_YP_PROT_H
-
-#include <features.h>
-
-#include <rpc/rpc.h>
-#include <rpcsvc/ypclnt.h>
-
-__BEGIN_DECLS
-
-/*
- * The following procedures are supported by the protocol:
- *
- * YPPROC_NULL() returns () takes nothing, returns nothing.  This indicates
- * that the NIS server is alive.
- *
- * YPPROC_DOMAIN (char *) returns (bool_t) TRUE.  Indicates that the
- * responding NIS server does serve the named domain; FALSE indicates no
- * support.
- *
- * YPPROC_DOMAIN_NONACK (char *) returns (TRUE) if the NIS server does serve
- * the named domain, otherwise does not return.  Used in the broadcast case.
- *
- * YPPROC_MATCH (struct ypreq_key) returns (struct ypresp_val).  Returns the
- * right-hand value for a passed left-hand key, within a named map and
- * domain.
- *
- * YPPROC_FIRST (struct ypreq_nokey) returns (struct ypresp_key_val).
- * Returns the first key-value pair from a named domain and map.
- *
- * YPPROC_NEXT (struct ypreq_key) returns (struct ypresp_key_val).  Returns
- * the key-value pair following a passed key-value pair within a named
- * domain and map.
- *
- * YPPROC_XFR (struct ypreq_xfr) returns nothing.  Indicates to a server that
- * a map should be updated.
- *
- * YPPROC_CLEAR	takes nothing, returns nothing.  Instructs a NIS server to
- * close the current map, so that old versions of the disk file don't get
- * held open.
- *
- * YPPROC_ALL (struct ypreq_nokey), returns
- * 	union switch (bool_t more) {
- *		TRUE:	(struct ypresp_key_val);
- *		FALSE:	(struct) {};
- *	}
- *
- * YPPROC_MASTER (struct ypreq_nokey), returns (ypresp_master)
- *
- * YPPROC_ORDER (struct ypreq_nokey), returns (ypresp_order)
- *
- * YPPROC_MAPLIST (char *), returns (struct ypmaplist *)
- */
-
-/* Program and version symbols, magic numbers */
-
-#define YPPROG		100004
-#define YPVERS		2
-#define YPVERS_ORIG	1
-#define YPMAXRECORD	1024
-#define YPMAXDOMAIN	64 /* XXX orig. yp_prot.h defines 256 */
-#define YPMAXMAP	64
-#define YPMAXPEER	64 /* XXX orig. yp_prot.h defines 256 */
-
-/* byte size of a large NIS packet */
-#define YPMSGSZ		1600
-
-typedef struct {
-  u_int keydat_len;
-  char *keydat_val;
-} keydat_t;
-
-typedef struct {
-  u_int valdat_len;
-  char *valdat_val;
-} valdat_t;
-
-struct ypmap_parms {
-  char *domain;			/* Null string means not available */
-  char *map;			/* Null string means not available */
-  unsigned int ordernum;	/* 0 means not available */
-  char *owner;			/* Null string means not available */
-};
-
-/*
- * Request parameter structures
- */
-
-struct ypreq_key {
-  const char *domain;
-  const char *map;
-  keydat_t keydat;
-};
-
-struct ypreq_nokey {
-  char *domain;
-  char *map;
-};
-
-struct ypreq_xfr {
-  struct ypmap_parms map_parms;
-  u_int transid;
-  u_int proto;
-  u_int port;
-};
-
-#define ypxfr_domain map_parms.domain
-#define ypxfr_map map_parms.map
-#define ypxfr_ordernum map_parms.ordernum
-#define ypxfr_owner map_parms.owner
-
-/* Return status values */
-
-enum ypstat {
-  YP_TRUE = 1,		/* General purpose success code */
-#define YP_TRUE YP_TRUE
-  YP_NOMORE = 2,	/* No more entries in map */
-#define YP_NOMORE YP_NOMORE
-  YP_FALSE = 0,		/* General purpose failure code */
-#define YP_FALSE YP_FALSE
-  YP_NOMAP = -1,	/* No such map in domain */
-#define YP_NOMAP YP_NOMAP
-  YP_NODOM = -2,	/* Domain not supported */
-#define YP_NODOM YP_NODOM
-  YP_NOKEY = -3,	/* No such key in map */
-#define YP_NOKEY YP_NOKEY
-  YP_BADOP = -4,	/* Invalid operation */
-#define YP_BADOP YP_BADOP
-  YP_BADDB = -5,	/* Server data base is bad */
-#define YP_BADDB YP_BADDB
-  YP_YPERR = -6,	/* NIS server error */
-#define YP_YPERR YP_YPERR
-  YP_BADARGS = -7,	/* Request arguments bad */
-#define YP_BADARGS YP_BADARGS
-  YP_VERS = -8,		/* NIS server version mismatch - server can't supply
-			   requested service. */
-#define YP_VERS YP_VERS
-};
-
-/*
- * Response parameter structures
- */
-
-typedef enum ypstat ypstat;
-
-struct ypresp_val {
-  ypstat status;
-  valdat_t valdat;
-};
-
-struct ypresp_key_val {
-  ypstat status;
-#ifdef STUPID_SUN_BUG
-  /* This is the form as distributed by Sun.  But even the Sun NIS
-     servers expect the values in the other order.  So their
-     implementation somehow must change the order internally.  We
-     don't want to follow this bad example since the user should be
-     able to use rpcgen on this file.  */
-  keydat_t keydat;
-  valdat_t valdat;
-#else
-  valdat_t valdat;
-  keydat_t keydat;
-#endif
-};
-
-struct ypresp_master {
-  ypstat status;
-  char *master;
-};
-
-struct ypresp_order {
-  ypstat status;
-  u_int ordernum;
-};
-
-struct ypmaplist {
-  char *map;
-#define ypml_name map
-  struct ypmaplist *next;
-#define ypml_next next
-};
-
-struct ypresp_maplist {
-  ypstat status;
-  struct ypmaplist *list;
-};
-
-/*
- * Procedure symbols.  YPPROC_NULL, YPPROC_DOMAIN, and YPPROC_DOMAIN_NONACK
- * must keep the same values (0, 1, and 2) that they had in the first version
- * of the protocol.
- */
-
-#define YPPROC_NULL	0
-#define YPPROC_DOMAIN	1
-#define YPPROC_DOMAIN_NONACK 2
-#define YPPROC_MATCH	3
-#define YPPROC_FIRST	4
-#define YPPROC_NEXT	5
-#define YPPROC_XFR	6
-#define YPPROC_CLEAR	7
-#define YPPROC_ALL	8
-#define YPPROC_MASTER	9
-#define YPPROC_ORDER	10
-#define YPPROC_MAPLIST	11
-#define	YPPROC_NEWXFR	12
-
-/*
- *		Protocol between clients and NIS binder servers
- */
-
-/*
- * The following procedures are supported by the protocol:
- *
- * YPBINDPROC_NULL() returns ()
- * 	takes nothing, returns nothing
- *
- * YPBINDPROC_DOMAIN takes (char *) returns (struct ypbind_resp)
- *
- * YPBINDPROC_SETDOM takes (struct ypbind_setdom) returns nothing
- */
-
-/* Program and version symbols, magic numbers */
-
-#define YPBINDPROG		100007
-#define YPBINDVERS		2
-#define YPBINDVERS_ORIG		1
-
-/* Procedure symbols */
-
-#define YPBINDPROC_NULL		0
-#define YPBINDPROC_DOMAIN	1
-#define YPBINDPROC_SETDOM	2
-/*
- * Response structure and overall result status codes.  Success and failure
- * represent two separate response message types.
- */
-
-enum ypbind_resptype {YPBIND_SUCC_VAL = 1, YPBIND_FAIL_VAL = 2};
-
-struct ypbind_binding {
-  struct in_addr ypbind_binding_addr;	        /* In network order */
-  unsigned short int ypbind_binding_port;	/* In network order */
-};
-
-struct ypbind_resp {
-  enum ypbind_resptype ypbind_status;
-  union {
-    u_int ypbind_error;
-    struct ypbind_binding ypbind_bindinfo;
-  } ypbind_respbody;
-};
-
-
-/* Detailed failure reason codes for response field ypbind_error*/
-
-#define YPBIND_ERR_ERR 1		/* Internal error */
-#define YPBIND_ERR_NOSERV 2		/* No bound server for passed domain */
-#define YPBIND_ERR_RESC 3		/* System resource allocation failure */
-
-/*
- * Request data structure for ypbind "Set domain" procedure.
- */
-struct ypbind_setdom {
-  char *ypsetdom_domain;
-  struct ypbind_binding ypsetdom_binding;
-  u_int ypsetdom_vers;
-};
-#define ypsetdom_addr ypsetdom_binding.ypbind_binding_addr
-#define ypsetdom_port ypsetdom_binding.ypbind_binding_port
-
-/*
- *		Protocol between clients (ypxfr, only) and yppush
- *		yppush speaks a protocol in the transient range, which
- *		is supplied to ypxfr as a command-line parameter when it
- *		is activated by ypserv.
- */
-#define YPPUSHVERS		1
-#define YPPUSHVERS_ORIG		1
-
-/* Procedure symbols */
-
-#define YPPUSHPROC_NULL		0
-#define YPPUSHPROC_XFRRESP	1
-
-/* Status values for yppushresp_xfr.status */
-
-enum yppush_status {
-  YPPUSH_SUCC = 1,		/* Success */
-#define YPPUSH_SUCC	YPPUSH_SUCC
-  YPPUSH_AGE = 2,		/* Master's version not newer */
-#define YPPUSH_AGE	YPPUSH_AGE
-  YPPUSH_NOMAP = -1,		/* Can't find server for map */
-#define YPPUSH_NOMAP 	YPPUSH_NOMAP
-  YPPUSH_NODOM = -2,		/* Domain not supported */
-#define YPPUSH_NODOM 	YPPUSH_NODOM
-  YPPUSH_RSRC = -3,		/* Local resouce alloc failure */
-#define YPPUSH_RSRC 	YPPUSH_RSRC
-  YPPUSH_RPC = -4,		/* RPC failure talking to server */
-#define YPPUSH_RPC 	YPPUSH_RPC
-  YPPUSH_MADDR = -5,		/* Can't get master address */
-#define YPPUSH_MADDR	YPPUSH_MADDR
-  YPPUSH_YPERR = -6,		/* NIS server/map db error */
-#define YPPUSH_YPERR 	YPPUSH_YPERR
-  YPPUSH_BADARGS = -7,		/* Request arguments bad */
-#define YPPUSH_BADARGS 	YPPUSH_BADARGS
-  YPPUSH_DBM = -8,		/* Local dbm operation failed */
-#define YPPUSH_DBM	YPPUSH_DBM
-  YPPUSH_FILE = -9,		/* Local file I/O operation failed */
-#define YPPUSH_FILE	YPPUSH_FILE
-  YPPUSH_SKEW = -10,		/* Map version skew during transfer */
-#define YPPUSH_SKEW	YPPUSH_SKEW
-  YPPUSH_CLEAR = -11,		/* Can't send "Clear" req to local ypserv */
-#define YPPUSH_CLEAR	YPPUSH_CLEAR
-  YPPUSH_FORCE = -12,		/* No local order number in map - use -f flag*/
-#define YPPUSH_FORCE	YPPUSH_FORCE
-  YPPUSH_XFRERR = -13,		/* ypxfr error */
-#define YPPUSH_XFRERR	YPPUSH_XFRERR
-  YPPUSH_REFUSED = -14,		/* Transfer request refused by ypserv */
-#define YPPUSH_REFUSED	YPPUSH_REFUSED
-  YPPUSH_NOALIAS = -15		/* Alias not found for map or domain */
-#define	YPPUSH_NOALIAS	YPPUSH_NOALIAS
-};
-typedef enum yppush_status yppush_status;
-
-struct yppushresp_xfr {
-  u_int transid;
-  yppush_status status;
-};
-
-struct ypresp_all {
-  bool_t more;
-  union {
-    struct ypresp_key_val val;
-  } ypresp_all_u;
-};
-
-extern bool_t xdr_ypreq_key (XDR *__xdrs, struct ypreq_key * __objp);
-extern bool_t xdr_ypreq_nokey (XDR *__xdrs, struct ypreq_nokey * __objp);
-extern bool_t xdr_ypreq_xfr (XDR *__xdrs, struct ypreq_xfr * __objp);
-extern bool_t xdr_ypresp_val (XDR *__xdrs, struct ypresp_val * __objp);
-extern bool_t xdr_ypresp_key_val (XDR *__xdrs, struct ypresp_key_val * __objp);
-extern bool_t xdr_ypbind_resp (XDR *__xdrs, struct ypbind_resp * __objp);
-extern bool_t xdr_ypbind_setdom (XDR *__xdrs, struct ypbind_setdom * __objp);
-extern bool_t xdr_ypmap_parms (XDR *__xdrs, struct ypmap_parms * __objp);
-extern bool_t xdr_yppushresp_xfr (XDR *__xdrs, struct yppushresp_xfr * __objp);
-extern bool_t xdr_ypresp_order (XDR *__xdrs, struct ypresp_order  * __objp);
-extern bool_t xdr_ypresp_master (XDR *__xdrs, struct ypresp_master * __objp);
-extern bool_t xdr_ypall (XDR *__xdrs, struct ypall_callback * __objp);
-extern bool_t xdr_ypresp_maplist (XDR *__xdrs, struct ypresp_maplist * __objp);
-extern bool_t xdr_ypbind_binding (XDR *__xdrs, struct ypbind_binding * __objp);
-extern bool_t xdr_ypbind_resptype (XDR *__xdrs, enum ypbind_resptype * __objp);
-extern bool_t xdr_ypstat (XDR *__xdrs, enum ypbind_resptype * __objp);
-extern bool_t xdr_ypresp_all (XDR *__xdrs, struct ypresp_all  * __objp);
-extern bool_t xdr_domainname (XDR *__xdrs, char ** __objp);
-
-__END_DECLS
-
-#endif	/* _RPCSVC_YP_PROT_H */
diff --git a/openflow/usr/include/rpcsvc/ypclnt.h b/openflow/usr/include/rpcsvc/ypclnt.h
deleted file mode 100644
index 4c64e23..0000000
--- a/openflow/usr/include/rpcsvc/ypclnt.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-
-#ifndef	__RPCSVC_YPCLNT_H__
-#define	__RPCSVC_YPCLNT_H__
-
-#include <features.h>
-
-/* Some defines */
-#define YPERR_SUCCESS	0		/* There is no error */
-#define	YPERR_BADARGS	1		/* Args to function are bad */
-#define	YPERR_RPC 	2		/* RPC failure */
-#define	YPERR_DOMAIN	3		/* Can't bind to a server with this domain */
-#define	YPERR_MAP	4		/* No such map in server's domain */
-#define	YPERR_KEY	5		/* No such key in map */
-#define	YPERR_YPERR	6		/* Internal yp server or client error */
-#define	YPERR_RESRC	7		/* Local resource allocation failure */
-#define	YPERR_NOMORE	8		/* No more records in map database */
-#define	YPERR_PMAP	9		/* Can't communicate with portmapper */
-#define	YPERR_YPBIND	10		/* Can't communicate with ypbind */
-#define	YPERR_YPSERV	11		/* Can't communicate with ypserv */
-#define	YPERR_NODOM	12		/* Local domain name not set */
-#define	YPERR_BADDB	13		/* yp data base is bad */
-#define	YPERR_VERS	14		/* YP version mismatch */
-#define	YPERR_ACCESS	15		/* Access violation */
-#define	YPERR_BUSY	16		/* Database is busy */
-
-/* Types of update operations */
-#define	YPOP_CHANGE	1		/* Change, do not add */
-#define	YPOP_INSERT	2		/* Add, do not change */
-#define	YPOP_DELETE	3		/* Delete this entry */
-#define	YPOP_STORE	4		/* Add, or change */
-
-__BEGIN_DECLS
-
-/* struct ypall_callback * is the arg which must be passed to yp_all.  */
-struct ypall_callback
-  {
-    int (*foreach) (int __status, char *__key, int __keylen,
-		    char *__val, int __vallen, char *__data);
-    char *data;
-  };
-
-/* External NIS client function references.  */
-extern int yp_bind (const char *) __THROW;
-extern void yp_unbind (const char *) __THROW;
-extern int yp_get_default_domain (char **) __THROW;
-extern int yp_match (const char *, const char *, const char *,
-		     const int, char **, int *) __THROW;
-extern int yp_first (const char *, const char *, char **,
-		     int *, char **, int *) __THROW;
-extern int yp_next (const char *, const char *, const char *,
-		    const int, char **, int *, char **, int *) __THROW;
-extern int yp_master (const char *, const char *, char **) __THROW;
-extern int yp_order (const char *, const char *, unsigned int *) __THROW;
-extern int yp_all (const char *, const char *,
-		   const struct ypall_callback *) __THROW;
-extern const char *yperr_string (const int) __THROW;
-extern const char *ypbinderr_string (const int) __THROW;
-extern int ypprot_err (const int) __THROW;
-extern int yp_update (char *, char *, unsigned int,  char *,
-		      int, char *, int) __THROW;
-#if 0
-extern int yp_maplist (const char *, struct ypmaplist **) __THROW;
-#endif
-
-/* This functions exists only under BSD and Linux systems.  */
-extern int __yp_check (char **) __THROW;
-
-__END_DECLS
-
-#endif	/* __RPCSVC_YPCLNT_H__ */
diff --git a/openflow/usr/include/rpcsvc/yppasswd.h b/openflow/usr/include/rpcsvc/yppasswd.h
deleted file mode 100644
index adbe9b3..0000000
--- a/openflow/usr/include/rpcsvc/yppasswd.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _YPPASSWD_H_RPCGEN
-#define _YPPASSWD_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-struct passwd {
-	char *pw_name;
-	char *pw_passwd;
-	int pw_uid;
-	int pw_gid;
-	char *pw_gecos;
-	char *pw_dir;
-	char *pw_shell;
-};
-typedef struct passwd passwd;
-
-struct yppasswd {
-	char *oldpass;
-	passwd newpw;
-};
-typedef struct yppasswd yppasswd;
-
-#define YPPASSWDPROG 100009
-#define YPPASSWDVERS 1
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define YPPASSWDPROC_UPDATE 1
-extern  int * yppasswdproc_update_1(yppasswd *, CLIENT *);
-extern  int * yppasswdproc_update_1_svc(yppasswd *, struct svc_req *);
-extern int yppasswdprog_1_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define YPPASSWDPROC_UPDATE 1
-extern  int * yppasswdproc_update_1();
-extern  int * yppasswdproc_update_1_svc();
-extern int yppasswdprog_1_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_passwd (XDR *, passwd*);
-extern  bool_t xdr_yppasswd (XDR *, yppasswd*);
-
-#else /* K&R C */
-extern bool_t xdr_passwd ();
-extern bool_t xdr_yppasswd ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_YPPASSWD_H_RPCGEN */
diff --git a/openflow/usr/include/rpcsvc/yppasswd.x b/openflow/usr/include/rpcsvc/yppasswd.x
deleted file mode 100644
index 34e3efe..0000000
--- a/openflow/usr/include/rpcsvc/yppasswd.x
+++ /dev/null
@@ -1,61 +0,0 @@
-/* @(#)yppasswd.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * YP password update protocol
- * Requires unix authentication
- */
-program YPPASSWDPROG {
-	version YPPASSWDVERS {
-		/*
-		 * Update my passwd entry
-		 */
-		int
-		YPPASSWDPROC_UPDATE(yppasswd) = 1;
-	} = 1;
-} = 100009;
-
-
-struct passwd {
-	string pw_name<>;	/* username */
-	string pw_passwd<>;	/* encrypted password */
-	int pw_uid;		/* user id */
-	int pw_gid;		/* group id */
-	string pw_gecos<>;	/* in real life name */
-	string pw_dir<>;	/* home directory */
-	string pw_shell<>;	/* default shell */
-};
-
-struct yppasswd {
-	string oldpass<>;	/* unencrypted old password */
-	passwd newpw;		/* new passwd entry */
-};
diff --git a/openflow/usr/include/rpcsvc/ypupd.h b/openflow/usr/include/rpcsvc/ypupd.h
deleted file mode 100644
index d07fd4d..0000000
--- a/openflow/usr/include/rpcsvc/ypupd.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/* from @(#)ypupdate_prot.x	1.3 91/03/11 TIRPC 1.0 */
-
-#ifndef __RPCSVC_YPUPD_H__
-#define __RPCSVC_YPUPD_H__
-
-#include <features.h>
-
-#include <rpc/rpc.h>
-
-#define MAXMAPNAMELEN 255
-#define MAXYPDATALEN 1023
-#define MAXERRMSGLEN 255
-
-__BEGIN_DECLS
-
-typedef struct {
-	u_int yp_buf_len;
-	char *yp_buf_val;
-} yp_buf;
-
-extern  bool_t xdr_yp_buf (XDR *, yp_buf*);
-
-struct ypupdate_args {
-	char *mapname;
-	yp_buf key;
-	yp_buf datum;
-};
-typedef struct ypupdate_args ypupdate_args;
-
-extern  bool_t xdr_ypupdate_args (XDR *, ypupdate_args*);
-
-struct ypdelete_args {
-	char *mapname;
-	yp_buf key;
-};
-typedef struct ypdelete_args ypdelete_args;
-
-extern  bool_t xdr_ypdelete_args (XDR *, ypdelete_args*);
-
-#define YPU_PROG 100028
-#define YPU_VERS 1
-
-#define YPU_CHANGE 1
-extern  u_int * ypu_change_1 (ypupdate_args *, CLIENT *);
-extern  u_int * ypu_change_1_svc (ypupdate_args *, struct svc_req *);
-#define YPU_INSERT 2
-extern  u_int * ypu_insert_1 (ypupdate_args *, CLIENT *);
-extern  u_int * ypu_insert_1_svc (ypupdate_args *, struct svc_req *);
-#define YPU_DELETE 3
-extern  u_int * ypu_delete_1 (ypdelete_args *, CLIENT *);
-extern  u_int * ypu_delete_1_svc (ypdelete_args *, struct svc_req *);
-#define YPU_STORE 4
-extern  u_int * ypu_store_1 (ypupdate_args *, CLIENT *);
-extern  u_int * ypu_store_1_svc (ypupdate_args *, struct svc_req *);
-
-__END_DECLS
-
-#endif /* !__RPCSVC_YPUPD_H__ */
diff --git a/openflow/usr/include/sched.h b/openflow/usr/include/sched.h
deleted file mode 100644
index 253c963..0000000
--- a/openflow/usr/include/sched.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Definitions for POSIX 1003.1b-1993 (aka POSIX.4) scheduling interface.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SCHED_H
-#define	_SCHED_H	1
-
-#include <features.h>
-
-/* Get type definitions.  */
-#include <bits/types.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-#ifdef __USE_XOPEN2K
-# define __need_time_t
-# define __need_timespec
-#endif
-#include <time.h>
-
-#ifndef __pid_t_defined
-typedef __pid_t pid_t;
-# define __pid_t_defined
-#endif
-
-
-/* Get system specific constant and data structure definitions.  */
-#include <bits/sched.h>
-/* Define the real names for the elements of `struct sched_param'.  */
-#define sched_priority	__sched_priority
-
-
-__BEGIN_DECLS
-
-/* Set scheduling parameters for a process.  */
-extern int sched_setparam (__pid_t __pid, const struct sched_param *__param)
-     __THROW;
-
-/* Retrieve scheduling parameters for a particular process.  */
-extern int sched_getparam (__pid_t __pid, struct sched_param *__param) __THROW;
-
-/* Set scheduling algorithm and/or parameters for a process.  */
-extern int sched_setscheduler (__pid_t __pid, int __policy,
-			       const struct sched_param *__param) __THROW;
-
-/* Retrieve scheduling algorithm for a particular purpose.  */
-extern int sched_getscheduler (__pid_t __pid) __THROW;
-
-/* Yield the processor.  */
-extern int sched_yield (void) __THROW;
-
-/* Get maximum priority value for a scheduler.  */
-extern int sched_get_priority_max (int __algorithm) __THROW;
-
-/* Get minimum priority value for a scheduler.  */
-extern int sched_get_priority_min (int __algorithm) __THROW;
-
-/* Get the SCHED_RR interval for the named process.  */
-extern int sched_rr_get_interval (__pid_t __pid, struct timespec *__t) __THROW;
-
-
-#ifdef __USE_GNU
-/* Access macros for `cpu_set'.  */
-# define CPU_SETSIZE __CPU_SETSIZE
-# define CPU_SET(cpu, cpusetp)	 __CPU_SET_S (cpu, sizeof (cpu_set_t), cpusetp)
-# define CPU_CLR(cpu, cpusetp)	 __CPU_CLR_S (cpu, sizeof (cpu_set_t), cpusetp)
-# define CPU_ISSET(cpu, cpusetp) __CPU_ISSET_S (cpu, sizeof (cpu_set_t), \
-						cpusetp)
-# define CPU_ZERO(cpusetp)	 __CPU_ZERO_S (sizeof (cpu_set_t), cpusetp)
-# define CPU_COUNT(cpusetp)	 __CPU_COUNT_S (sizeof (cpu_set_t), cpusetp)
-
-# define CPU_SET_S(cpu, setsize, cpusetp)   __CPU_SET_S (cpu, setsize, cpusetp)
-# define CPU_CLR_S(cpu, setsize, cpusetp)   __CPU_CLR_S (cpu, setsize, cpusetp)
-# define CPU_ISSET_S(cpu, setsize, cpusetp) __CPU_ISSET_S (cpu, setsize, \
-							   cpusetp)
-# define CPU_ZERO_S(setsize, cpusetp)	    __CPU_ZERO_S (setsize, cpusetp)
-# define CPU_COUNT_S(setsize, cpusetp)	    __CPU_COUNT_S (setsize, cpusetp)
-
-# define CPU_EQUAL(cpusetp1, cpusetp2) \
-  __CPU_EQUAL_S (sizeof (cpu_set_t), cpusetp1, cpusetp2)
-# define CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-  __CPU_EQUAL_S (setsize, cpusetp1, cpusetp2)
-
-# define CPU_AND(destset, srcset1, srcset2) \
-  __CPU_OP_S (sizeof (cpu_set_t), destset, srcset1, srcset2, &)
-# define CPU_OR(destset, srcset1, srcset2) \
-  __CPU_OP_S (sizeof (cpu_set_t), destset, srcset1, srcset2, |)
-# define CPU_XOR(destset, srcset1, srcset2) \
-  __CPU_OP_S (sizeof (cpu_set_t), destset, srcset1, srcset2, ^)
-# define CPU_AND_S(setsize, destset, srcset1, srcset2) \
-  __CPU_OP_S (setsize, destset, srcset1, srcset2, &)
-# define CPU_OR_S(setsize, destset, srcset1, srcset2) \
-  __CPU_OP_S (setsize, destset, srcset1, srcset2, |)
-# define CPU_XOR_S(setsize, destset, srcset1, srcset2) \
-  __CPU_OP_S (setsize, destset, srcset1, srcset2, ^)
-
-# define CPU_ALLOC_SIZE(count) __CPU_ALLOC_SIZE (count)
-# define CPU_ALLOC(count) __CPU_ALLOC (count)
-# define CPU_FREE(cpuset) __CPU_FREE (cpuset)
-
-
-/* Set the CPU affinity for a task */
-extern int sched_setaffinity (__pid_t __pid, size_t __cpusetsize,
-			      const cpu_set_t *__cpuset) __THROW;
-
-/* Get the CPU affinity for a task */
-extern int sched_getaffinity (__pid_t __pid, size_t __cpusetsize,
-			      cpu_set_t *__cpuset) __THROW;
-#endif
-
-__END_DECLS
-
-#endif /* sched.h */
diff --git a/openflow/usr/include/scsi/cxlflash_ioctl.h b/openflow/usr/include/scsi/cxlflash_ioctl.h
deleted file mode 100644
index 2302f3c..0000000
--- a/openflow/usr/include/scsi/cxlflash_ioctl.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * CXL Flash Device Driver
- *
- * Written by: Manoj N. Kumar <manoj@linux.vnet.ibm.com>, IBM Corporation
- *             Matthew R. Ochs <mrochs@linux.vnet.ibm.com>, IBM Corporation
- *
- * Copyright (C) 2015 IBM Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _CXLFLASH_IOCTL_H
-#define _CXLFLASH_IOCTL_H
-
-#include <linux/types.h>
-
-/*
- * Structure and flag definitions CXL Flash superpipe ioctls
- */
-
-#define DK_CXLFLASH_VERSION_0	0
-
-struct dk_cxlflash_hdr {
-	__u16 version;			/* Version data */
-	__u16 rsvd[3];			/* Reserved for future use */
-	__u64 flags;			/* Input flags */
-	__u64 return_flags;		/* Returned flags */
-};
-
-/*
- * Return flag definitions available to all ioctls
- *
- * Similar to the input flags, these are grown from the bottom-up with the
- * intention that ioctl-specific return flag definitions would grow from the
- * top-down, allowing the two sets to co-exist. While not required/enforced
- * at this time, this provides future flexibility.
- */
-#define DK_CXLFLASH_ALL_PORTS_ACTIVE	0x0000000000000001ULL
-
-/*
- * Notes:
- * -----
- * The 'context_id' field of all ioctl structures contains the context
- * identifier for a context in the lower 32-bits (upper 32-bits are not
- * to be used when identifying a context to the AFU). That said, the value
- * in its entirety (all 64-bits) is to be treated as an opaque cookie and
- * should be presented as such when issuing ioctls.
- *
- * For DK_CXLFLASH_ATTACH ioctl, user specifies read/write access
- * permissions via the O_RDONLY, O_WRONLY, and O_RDWR flags defined in
- * the fcntl.h header file.
- */
-#define DK_CXLFLASH_ATTACH_REUSE_CONTEXT	0x8000000000000000ULL
-
-struct dk_cxlflash_attach {
-	struct dk_cxlflash_hdr hdr;	/* Common fields */
-	__u64 num_interrupts;		/* Requested number of interrupts */
-	__u64 context_id;		/* Returned context */
-	__u64 mmio_size;		/* Returned size of MMIO area */
-	__u64 block_size;		/* Returned block size, in bytes */
-	__u64 adap_fd;			/* Returned adapter file descriptor */
-	__u64 last_lba;			/* Returned last LBA on the device */
-	__u64 max_xfer;			/* Returned max transfer size, blocks */
-	__u64 reserved[8];		/* Reserved for future use */
-};
-
-struct dk_cxlflash_detach {
-	struct dk_cxlflash_hdr hdr;	/* Common fields */
-	__u64 context_id;		/* Context to detach */
-	__u64 reserved[8];		/* Reserved for future use */
-};
-
-struct dk_cxlflash_udirect {
-	struct dk_cxlflash_hdr hdr;	/* Common fields */
-	__u64 context_id;		/* Context to own physical resources */
-	__u64 rsrc_handle;		/* Returned resource handle */
-	__u64 last_lba;			/* Returned last LBA on the device */
-	__u64 reserved[8];		/* Reserved for future use */
-};
-
-#define DK_CXLFLASH_UVIRTUAL_NEED_WRITE_SAME	0x8000000000000000ULL
-
-struct dk_cxlflash_uvirtual {
-	struct dk_cxlflash_hdr hdr;	/* Common fields */
-	__u64 context_id;		/* Context to own virtual resources */
-	__u64 lun_size;			/* Requested size, in 4K blocks */
-	__u64 rsrc_handle;		/* Returned resource handle */
-	__u64 last_lba;			/* Returned last LBA of LUN */
-	__u64 reserved[8];		/* Reserved for future use */
-};
-
-struct dk_cxlflash_release {
-	struct dk_cxlflash_hdr hdr;	/* Common fields */
-	__u64 context_id;		/* Context owning resources */
-	__u64 rsrc_handle;		/* Resource handle to release */
-	__u64 reserved[8];		/* Reserved for future use */
-};
-
-struct dk_cxlflash_resize {
-	struct dk_cxlflash_hdr hdr;	/* Common fields */
-	__u64 context_id;		/* Context owning resources */
-	__u64 rsrc_handle;		/* Resource handle of LUN to resize */
-	__u64 req_size;			/* New requested size, in 4K blocks */
-	__u64 last_lba;			/* Returned last LBA of LUN */
-	__u64 reserved[8];		/* Reserved for future use */
-};
-
-struct dk_cxlflash_clone {
-	struct dk_cxlflash_hdr hdr;	/* Common fields */
-	__u64 context_id_src;		/* Context to clone from */
-	__u64 context_id_dst;		/* Context to clone to */
-	__u64 adap_fd_src;		/* Source context adapter fd */
-	__u64 reserved[8];		/* Reserved for future use */
-};
-
-#define DK_CXLFLASH_VERIFY_SENSE_LEN	18
-#define DK_CXLFLASH_VERIFY_HINT_SENSE	0x8000000000000000ULL
-
-struct dk_cxlflash_verify {
-	struct dk_cxlflash_hdr hdr;	/* Common fields */
-	__u64 context_id;		/* Context owning resources to verify */
-	__u64 rsrc_handle;		/* Resource handle of LUN */
-	__u64 hint;			/* Reasons for verify */
-	__u64 last_lba;			/* Returned last LBA of device */
-	__u8 sense_data[DK_CXLFLASH_VERIFY_SENSE_LEN]; /* SCSI sense data */
-	__u8 pad[6];			/* Pad to next 8-byte boundary */
-	__u64 reserved[8];		/* Reserved for future use */
-};
-
-#define DK_CXLFLASH_RECOVER_AFU_CONTEXT_RESET	0x8000000000000000ULL
-
-struct dk_cxlflash_recover_afu {
-	struct dk_cxlflash_hdr hdr;	/* Common fields */
-	__u64 reason;			/* Reason for recovery request */
-	__u64 context_id;		/* Context to recover / updated ID */
-	__u64 mmio_size;		/* Returned size of MMIO area */
-	__u64 adap_fd;			/* Returned adapter file descriptor */
-	__u64 reserved[8];		/* Reserved for future use */
-};
-
-#define DK_CXLFLASH_MANAGE_LUN_WWID_LEN			16
-#define DK_CXLFLASH_MANAGE_LUN_ENABLE_SUPERPIPE		0x8000000000000000ULL
-#define DK_CXLFLASH_MANAGE_LUN_DISABLE_SUPERPIPE	0x4000000000000000ULL
-#define DK_CXLFLASH_MANAGE_LUN_ALL_PORTS_ACCESSIBLE	0x2000000000000000ULL
-
-struct dk_cxlflash_manage_lun {
-	struct dk_cxlflash_hdr hdr;			/* Common fields */
-	__u8 wwid[DK_CXLFLASH_MANAGE_LUN_WWID_LEN];	/* Page83 WWID, NAA-6 */
-	__u64 reserved[8];				/* Rsvd, future use */
-};
-
-union cxlflash_ioctls {
-	struct dk_cxlflash_attach attach;
-	struct dk_cxlflash_detach detach;
-	struct dk_cxlflash_udirect udirect;
-	struct dk_cxlflash_uvirtual uvirtual;
-	struct dk_cxlflash_release release;
-	struct dk_cxlflash_resize resize;
-	struct dk_cxlflash_clone clone;
-	struct dk_cxlflash_verify verify;
-	struct dk_cxlflash_recover_afu recover_afu;
-	struct dk_cxlflash_manage_lun manage_lun;
-};
-
-#define MAX_CXLFLASH_IOCTL_SZ	(sizeof(union cxlflash_ioctls))
-
-#define CXL_MAGIC 0xCA
-#define CXL_IOWR(_n, _s)	_IOWR(CXL_MAGIC, _n, struct _s)
-
-#define DK_CXLFLASH_ATTACH		CXL_IOWR(0x80, dk_cxlflash_attach)
-#define DK_CXLFLASH_USER_DIRECT		CXL_IOWR(0x81, dk_cxlflash_udirect)
-#define DK_CXLFLASH_RELEASE		CXL_IOWR(0x82, dk_cxlflash_release)
-#define DK_CXLFLASH_DETACH		CXL_IOWR(0x83, dk_cxlflash_detach)
-#define DK_CXLFLASH_VERIFY		CXL_IOWR(0x84, dk_cxlflash_verify)
-#define DK_CXLFLASH_RECOVER_AFU		CXL_IOWR(0x85, dk_cxlflash_recover_afu)
-#define DK_CXLFLASH_MANAGE_LUN		CXL_IOWR(0x86, dk_cxlflash_manage_lun)
-#define DK_CXLFLASH_USER_VIRTUAL	CXL_IOWR(0x87, dk_cxlflash_uvirtual)
-#define DK_CXLFLASH_VLUN_RESIZE		CXL_IOWR(0x88, dk_cxlflash_resize)
-#define DK_CXLFLASH_VLUN_CLONE		CXL_IOWR(0x89, dk_cxlflash_clone)
-
-#endif /* ifndef _CXLFLASH_IOCTL_H */
diff --git a/openflow/usr/include/scsi/fc/fc_els.h b/openflow/usr/include/scsi/fc/fc_els.h
deleted file mode 100644
index 481abbd..0000000
--- a/openflow/usr/include/scsi/fc/fc_els.h
+++ /dev/null
@@ -1,831 +0,0 @@
-/*
- * Copyright(c) 2007 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Maintained at www.Open-FCoE.org
- */
-
-#ifndef _FC_ELS_H_
-#define	_FC_ELS_H_
-
-#include <linux/types.h>
-
-/*
- * Fibre Channel Switch - Enhanced Link Services definitions.
- * From T11 FC-LS Rev 1.2 June 7, 2005.
- */
-
-/*
- * ELS Command codes - byte 0 of the frame payload
- */
-enum fc_els_cmd {
-	ELS_LS_RJT =	0x01,	/* ESL reject */
-	ELS_LS_ACC =	0x02,	/* ESL Accept */
-	ELS_PLOGI =	0x03,	/* N_Port login */
-	ELS_FLOGI =	0x04,	/* F_Port login */
-	ELS_LOGO =	0x05,	/* Logout */
-	ELS_ABTX =	0x06,	/* Abort exchange - obsolete */
-	ELS_RCS =	0x07,	/* read connection status */
-	ELS_RES =	0x08,	/* read exchange status block */
-	ELS_RSS =	0x09,	/* read sequence status block */
-	ELS_RSI =	0x0a,	/* read sequence initiative */
-	ELS_ESTS =	0x0b,	/* establish streaming */
-	ELS_ESTC =	0x0c,	/* estimate credit */
-	ELS_ADVC =	0x0d,	/* advise credit */
-	ELS_RTV =	0x0e,	/* read timeout value */
-	ELS_RLS =	0x0f,	/* read link error status block */
-	ELS_ECHO =	0x10,	/* echo */
-	ELS_TEST =	0x11,	/* test */
-	ELS_RRQ =	0x12,	/* reinstate recovery qualifier */
-	ELS_REC =	0x13,	/* read exchange concise */
-	ELS_SRR =	0x14,	/* sequence retransmission request */
-	ELS_PRLI =	0x20,	/* process login */
-	ELS_PRLO =	0x21,	/* process logout */
-	ELS_SCN =	0x22,	/* state change notification */
-	ELS_TPLS =	0x23,	/* test process login state */
-	ELS_TPRLO =	0x24,	/* third party process logout */
-	ELS_LCLM =	0x25,	/* login control list mgmt (obs) */
-	ELS_GAID =	0x30,	/* get alias_ID */
-	ELS_FACT =	0x31,	/* fabric activate alias_id */
-	ELS_FDACDT =	0x32,	/* fabric deactivate alias_id */
-	ELS_NACT =	0x33,	/* N-port activate alias_id */
-	ELS_NDACT =	0x34,	/* N-port deactivate alias_id */
-	ELS_QOSR =	0x40,	/* quality of service request */
-	ELS_RVCS =	0x41,	/* read virtual circuit status */
-	ELS_PDISC =	0x50,	/* discover N_port service params */
-	ELS_FDISC =	0x51,	/* discover F_port service params */
-	ELS_ADISC =	0x52,	/* discover address */
-	ELS_RNC =	0x53,	/* report node cap (obs) */
-	ELS_FARP_REQ =	0x54,	/* FC ARP request */
-	ELS_FARP_REPL =	0x55,	/* FC ARP reply */
-	ELS_RPS =	0x56,	/* read port status block */
-	ELS_RPL =	0x57,	/* read port list */
-	ELS_RPBC =	0x58,	/* read port buffer condition */
-	ELS_FAN =	0x60,	/* fabric address notification */
-	ELS_RSCN =	0x61,	/* registered state change notification */
-	ELS_SCR =	0x62,	/* state change registration */
-	ELS_RNFT =	0x63,	/* report node FC-4 types */
-	ELS_CSR =	0x68,	/* clock synch. request */
-	ELS_CSU =	0x69,	/* clock synch. update */
-	ELS_LINIT =	0x70,	/* loop initialize */
-	ELS_LSTS =	0x72,	/* loop status */
-	ELS_RNID =	0x78,	/* request node ID data */
-	ELS_RLIR =	0x79,	/* registered link incident report */
-	ELS_LIRR =	0x7a,	/* link incident record registration */
-	ELS_SRL =	0x7b,	/* scan remote loop */
-	ELS_SBRP =	0x7c,	/* set bit-error reporting params */
-	ELS_RPSC =	0x7d,	/* report speed capabilities */
-	ELS_QSA =	0x7e,	/* query security attributes */
-	ELS_EVFP =	0x7f,	/* exchange virt. fabrics params */
-	ELS_LKA =	0x80,	/* link keep-alive */
-	ELS_AUTH_ELS =	0x90,	/* authentication ELS */
-};
-
-/*
- * Initializer useful for decoding table.
- * Please keep this in sync with the above definitions.
- */
-#define	FC_ELS_CMDS_INIT {			\
-	[ELS_LS_RJT] =	"LS_RJT",		\
-	[ELS_LS_ACC] =	"LS_ACC",		\
-	[ELS_PLOGI] =	"PLOGI",		\
-	[ELS_FLOGI] =	"FLOGI",		\
-	[ELS_LOGO] =	"LOGO",			\
-	[ELS_ABTX] =	"ABTX",			\
-	[ELS_RCS] =	"RCS",			\
-	[ELS_RES] =	"RES",			\
-	[ELS_RSS] =	"RSS",			\
-	[ELS_RSI] =	"RSI",			\
-	[ELS_ESTS] =	"ESTS",			\
-	[ELS_ESTC] =	"ESTC",			\
-	[ELS_ADVC] =	"ADVC",			\
-	[ELS_RTV] =	"RTV",			\
-	[ELS_RLS] =	"RLS",			\
-	[ELS_ECHO] =	"ECHO",			\
-	[ELS_TEST] =	"TEST",			\
-	[ELS_RRQ] =	"RRQ",			\
-	[ELS_REC] =	"REC",			\
-	[ELS_SRR] =	"SRR",			\
-	[ELS_PRLI] =	"PRLI",			\
-	[ELS_PRLO] =	"PRLO",			\
-	[ELS_SCN] =	"SCN",			\
-	[ELS_TPLS] =	"TPLS",			\
-	[ELS_TPRLO] =	"TPRLO",		\
-	[ELS_LCLM] =	"LCLM",			\
-	[ELS_GAID] =	"GAID",			\
-	[ELS_FACT] =	"FACT",			\
-	[ELS_FDACDT] =	"FDACDT",		\
-	[ELS_NACT] =	"NACT",			\
-	[ELS_NDACT] =	"NDACT",		\
-	[ELS_QOSR] =	"QOSR",			\
-	[ELS_RVCS] =	"RVCS",			\
-	[ELS_PDISC] =	"PDISC",		\
-	[ELS_FDISC] =	"FDISC",		\
-	[ELS_ADISC] =	"ADISC",		\
-	[ELS_RNC] =	"RNC",			\
-	[ELS_FARP_REQ] = "FARP_REQ",		\
-	[ELS_FARP_REPL] =  "FARP_REPL",		\
-	[ELS_RPS] =	"RPS",			\
-	[ELS_RPL] =	"RPL",			\
-	[ELS_RPBC] =	"RPBC",			\
-	[ELS_FAN] =	"FAN",			\
-	[ELS_RSCN] =	"RSCN",			\
-	[ELS_SCR] =	"SCR",			\
-	[ELS_RNFT] =	"RNFT",			\
-	[ELS_CSR] =	"CSR",			\
-	[ELS_CSU] =	"CSU",			\
-	[ELS_LINIT] =	"LINIT",		\
-	[ELS_LSTS] =	"LSTS",			\
-	[ELS_RNID] =	"RNID",			\
-	[ELS_RLIR] =	"RLIR",			\
-	[ELS_LIRR] =	"LIRR",			\
-	[ELS_SRL] =	"SRL",			\
-	[ELS_SBRP] =	"SBRP",			\
-	[ELS_RPSC] =	"RPSC",			\
-	[ELS_QSA] =	"QSA",			\
-	[ELS_EVFP] =	"EVFP",			\
-	[ELS_LKA] =	"LKA",			\
-	[ELS_AUTH_ELS] = "AUTH_ELS",		\
-}
-
-/*
- * LS_ACC payload.
- */
-struct fc_els_ls_acc {
-	__u8          la_cmd;		/* command code ELS_LS_ACC */
-	__u8          la_resv[3];	/* reserved */
-};
-
-/*
- * ELS reject payload.
- */
-struct fc_els_ls_rjt {
-	__u8	er_cmd;		/* command code ELS_LS_RJT */
-	__u8	er_resv[4];	/* reserved must be zero */
-	__u8	er_reason;	/* reason (enum fc_els_rjt_reason below) */
-	__u8	er_explan;	/* explanation (enum fc_els_rjt_explan below) */
-	__u8	er_vendor;	/* vendor specific code */
-};
-
-/*
- * ELS reject reason codes (er_reason).
- */
-enum fc_els_rjt_reason {
-	ELS_RJT_NONE =		0,	/* no reject - not to be sent */
-	ELS_RJT_INVAL =		0x01,	/* invalid ELS command code */
-	ELS_RJT_LOGIC =		0x03,	/* logical error */
-	ELS_RJT_BUSY =		0x05,	/* logical busy */
-	ELS_RJT_PROT =		0x07,	/* protocol error */
-	ELS_RJT_UNAB =		0x09,	/* unable to perform command request */
-	ELS_RJT_UNSUP =		0x0b,	/* command not supported */
-	ELS_RJT_INPROG =	0x0e,	/* command already in progress */
-	ELS_RJT_FIP =		0x20,	/* FIP error */
-	ELS_RJT_VENDOR =	0xff,	/* vendor specific error */
-};
-
-
-/*
- * reason code explanation (er_explan).
- */
-enum fc_els_rjt_explan {
-	ELS_EXPL_NONE =		0x00,	/* No additional explanation */
-	ELS_EXPL_SPP_OPT_ERR =	0x01,	/* service parameter error - options */
-	ELS_EXPL_SPP_ICTL_ERR =	0x03,	/* service parm error - initiator ctl */
-	ELS_EXPL_AH =		0x11,	/* invalid association header */
-	ELS_EXPL_AH_REQ =	0x13,	/* association_header required */
-	ELS_EXPL_SID =		0x15,	/* invalid originator S_ID */
-	ELS_EXPL_OXID_RXID =	0x17,	/* invalid OX_ID-RX_ID combination */
-	ELS_EXPL_INPROG =	0x19,	/* Request already in progress */
-	ELS_EXPL_PLOGI_REQD =	0x1e,	/* N_Port login required */
-	ELS_EXPL_INSUF_RES =	0x29,	/* insufficient resources */
-	ELS_EXPL_UNAB_DATA =	0x2a,	/* unable to supply requested data */
-	ELS_EXPL_UNSUPR =	0x2c,	/* Request not supported */
-	ELS_EXPL_INV_LEN =	0x2d,	/* Invalid payload length */
-	ELS_EXPL_NOT_NEIGHBOR = 0x62,	/* VN2VN_Port not in neighbor set */
-	/* TBD - above definitions incomplete */
-};
-
-/*
- * Common service parameters (N ports).
- */
-struct fc_els_csp {
-	__u8		sp_hi_ver;	/* highest version supported (obs.) */
-	__u8		sp_lo_ver;	/* highest version supported (obs.) */
-	__be16		sp_bb_cred;	/* buffer-to-buffer credits */
-	__be16		sp_features;	/* common feature flags */
-	__be16		sp_bb_data;	/* b-b state number and data field sz */
-	union {
-		struct {
-			__be16	_sp_tot_seq; /* total concurrent sequences */
-			__be16	_sp_rel_off; /* rel. offset by info cat */
-		} sp_plogi;
-		struct {
-			__be32	_sp_r_a_tov; /* resource alloc. timeout msec */
-		} sp_flogi_acc;
-	} sp_u;
-	__be32		sp_e_d_tov;	/* error detect timeout value */
-};
-#define	sp_tot_seq	sp_u.sp_plogi._sp_tot_seq
-#define	sp_rel_off	sp_u.sp_plogi._sp_rel_off
-#define	sp_r_a_tov	sp_u.sp_flogi_acc._sp_r_a_tov
-
-#define	FC_SP_BB_DATA_MASK 0xfff /* mask for data field size in sp_bb_data */
-
-/*
- * Minimum and maximum values for max data field size in service parameters.
- */
-#define	FC_SP_MIN_MAX_PAYLOAD	FC_MIN_MAX_PAYLOAD
-#define	FC_SP_MAX_MAX_PAYLOAD	FC_MAX_PAYLOAD
-
-/*
- * sp_features
- */
-#define	FC_SP_FT_NPIV	0x8000	/* multiple N_Port_ID support (FLOGI) */
-#define	FC_SP_FT_CIRO	0x8000	/* continuously increasing rel off (PLOGI) */
-#define	FC_SP_FT_CLAD	0x8000	/* clean address (in FLOGI LS_ACC) */
-#define	FC_SP_FT_RAND	0x4000	/* random relative offset */
-#define	FC_SP_FT_VAL	0x2000	/* valid vendor version level */
-#define	FC_SP_FT_NPIV_ACC	0x2000	/* NPIV assignment (FLOGI LS_ACC) */
-#define	FC_SP_FT_FPORT	0x1000	/* F port (1) vs. N port (0) */
-#define	FC_SP_FT_ABB	0x0800	/* alternate BB_credit management */
-#define	FC_SP_FT_EDTR	0x0400	/* E_D_TOV Resolution is nanoseconds */
-#define	FC_SP_FT_MCAST	0x0200	/* multicast */
-#define	FC_SP_FT_BCAST	0x0100	/* broadcast */
-#define	FC_SP_FT_HUNT	0x0080	/* hunt group */
-#define	FC_SP_FT_SIMP	0x0040	/* dedicated simplex */
-#define	FC_SP_FT_SEC	0x0020	/* reserved for security */
-#define	FC_SP_FT_CSYN	0x0010	/* clock synch. supported */
-#define	FC_SP_FT_RTTOV	0x0008	/* R_T_TOV value 100 uS, else 100 mS */
-#define	FC_SP_FT_HALF	0x0004	/* dynamic half duplex */
-#define	FC_SP_FT_SEQC	0x0002	/* SEQ_CNT */
-#define	FC_SP_FT_PAYL	0x0001	/* FLOGI payload length 256, else 116 */
-
-/*
- * Class-specific service parameters.
- */
-struct fc_els_cssp {
-	__be16		cp_class;	/* class flags */
-	__be16		cp_init;	/* initiator flags */
-	__be16		cp_recip;	/* recipient flags */
-	__be16		cp_rdfs;	/* receive data field size */
-	__be16		cp_con_seq;	/* concurrent sequences */
-	__be16		cp_ee_cred;	/* N-port end-to-end credit */
-	__u8		cp_resv1;	/* reserved */
-	__u8		cp_open_seq;	/* open sequences per exchange */
-	__u8		_cp_resv2[2];	/* reserved */
-};
-
-/*
- * cp_class flags.
- */
-#define	FC_CPC_VALID	0x8000		/* class valid */
-#define	FC_CPC_IMIX	0x4000		/* intermix mode */
-#define	FC_CPC_SEQ	0x0800		/* sequential delivery */
-#define	FC_CPC_CAMP	0x0200		/* camp-on */
-#define	FC_CPC_PRI	0x0080		/* priority */
-
-/*
- * cp_init flags.
- * (TBD: not all flags defined here).
- */
-#define	FC_CPI_CSYN	0x0010		/* clock synch. capable */
-
-/*
- * cp_recip flags.
- */
-#define	FC_CPR_CSYN	0x0008		/* clock synch. capable */
-
-/*
- * NFC_ELS_FLOGI: Fabric login request.
- * NFC_ELS_PLOGI: Port login request (same format).
- */
-struct fc_els_flogi {
-	__u8		fl_cmd;		/* command */
-	__u8		_fl_resvd[3];	/* must be zero */
-	struct fc_els_csp fl_csp;	/* common service parameters */
-	__be64		fl_wwpn;	/* port name */
-	__be64		fl_wwnn;	/* node name */
-	struct fc_els_cssp fl_cssp[4];	/* class 1-4 service parameters */
-	__u8		fl_vend[16];	/* vendor version level */
-} __attribute__((__packed__));
-
-/*
- * Process login service parameter page.
- */
-struct fc_els_spp {
-	__u8		spp_type;	/* type code or common service params */
-	__u8		spp_type_ext;	/* type code extension */
-	__u8		spp_flags;
-	__u8		_spp_resvd;
-	__be32		spp_orig_pa;	/* originator process associator */
-	__be32		spp_resp_pa;	/* responder process associator */
-	__be32		spp_params;	/* service parameters */
-};
-
-/*
- * spp_flags.
- */
-#define	FC_SPP_OPA_VAL	    0x80	/* originator proc. assoc. valid */
-#define	FC_SPP_RPA_VAL	    0x40	/* responder proc. assoc. valid */
-#define	FC_SPP_EST_IMG_PAIR 0x20	/* establish image pair */
-#define	FC_SPP_RESP_MASK    0x0f	/* mask for response code (below) */
-
-/*
- * SPP response code in spp_flags - lower 4 bits.
- */
-enum fc_els_spp_resp {
-	FC_SPP_RESP_ACK	=	1,	/* request executed */
-	FC_SPP_RESP_RES =	2,	/* unable due to lack of resources */
-	FC_SPP_RESP_INIT =	3,	/* initialization not complete */
-	FC_SPP_RESP_NO_PA = 	4,	/* unknown process associator */
-	FC_SPP_RESP_CONF = 	5,	/* configuration precludes image pair */
-	FC_SPP_RESP_COND = 	6,	/* request completed conditionally */
-	FC_SPP_RESP_MULT = 	7,	/* unable to handle multiple SPPs */
-	FC_SPP_RESP_INVL = 	8,	/* SPP is invalid */
-};
-
-/*
- * ELS_RRQ - Reinstate Recovery Qualifier
- */
-struct fc_els_rrq {
-	__u8		rrq_cmd;	/* command (0x12) */
-	__u8		rrq_zero[3];	/* specified as zero - part of cmd */
-	__u8		rrq_resvd;	/* reserved */
-	__u8		rrq_s_id[3];	/* originator FID */
-	__be16		rrq_ox_id;	/* originator exchange ID */
-	__be16		rrq_rx_id;	/* responders exchange ID */
-};
-
-/*
- * ELS_REC - Read exchange concise.
- */
-struct fc_els_rec {
-	__u8		rec_cmd;	/* command (0x13) */
-	__u8		rec_zero[3];	/* specified as zero - part of cmd */
-	__u8		rec_resvd;	/* reserved */
-	__u8		rec_s_id[3];	/* originator FID */
-	__be16		rec_ox_id;	/* originator exchange ID */
-	__be16		rec_rx_id;	/* responders exchange ID */
-};
-
-/*
- * ELS_REC LS_ACC payload.
- */
-struct fc_els_rec_acc {
-	__u8		reca_cmd;	/* accept (0x02) */
-	__u8		reca_zero[3];	/* specified as zero - part of cmd */
-	__be16		reca_ox_id;	/* originator exchange ID */
-	__be16		reca_rx_id;	/* responders exchange ID */
-	__u8		reca_resvd1;	/* reserved */
-	__u8		reca_ofid[3];	/* originator FID */
-	__u8		reca_resvd2;	/* reserved */
-	__u8		reca_rfid[3];	/* responder FID */
-	__be32		reca_fc4value;	/* FC4 value */
-	__be32		reca_e_stat;	/* ESB (exchange status block) status */
-};
-
-/*
- * ELS_PRLI - Process login request and response.
- */
-struct fc_els_prli {
-	__u8		prli_cmd;	/* command */
-	__u8		prli_spp_len;	/* length of each serv. parm. page */
-	__be16		prli_len;	/* length of entire payload */
-	/* service parameter pages follow */
-};
-
-/*
- * ELS_PRLO - Process logout request and response.
- */
-struct fc_els_prlo {
-	__u8            prlo_cmd;       /* command */
-	__u8            prlo_obs;       /* obsolete, but shall be set to 10h */
-	__be16          prlo_len;       /* payload length */
-};
-
-/*
- * ELS_ADISC payload
- */
-struct fc_els_adisc {
-	__u8		adisc_cmd;
-	__u8		adisc_resv[3];
-	__u8            adisc_resv1;
-	__u8            adisc_hard_addr[3];
-	__be64          adisc_wwpn;
-	__be64          adisc_wwnn;
-	__u8            adisc_resv2;
-	__u8            adisc_port_id[3];
-} __attribute__((__packed__));
-
-/*
- * ELS_LOGO - process or fabric logout.
- */
-struct fc_els_logo {
-	__u8		fl_cmd;		/* command code */
-	__u8		fl_zero[3];	/* specified as zero - part of cmd */
-	__u8		fl_resvd;	/* reserved */
-	__u8		fl_n_port_id[3];/* N port ID */
-	__be64		fl_n_port_wwn;	/* port name */
-};
-
-/*
- * ELS_RTV - read timeout value.
- */
-struct fc_els_rtv {
-	__u8		rtv_cmd;	/* command code 0x0e */
-	__u8		rtv_zero[3];	/* specified as zero - part of cmd */
-};
-
-/*
- * LS_ACC for ELS_RTV - read timeout value.
- */
-struct fc_els_rtv_acc {
-	__u8		rtv_cmd;	/* command code 0x02 */
-	__u8		rtv_zero[3];	/* specified as zero - part of cmd */
-	__be32		rtv_r_a_tov;	/* resource allocation timeout value */
-	__be32		rtv_e_d_tov;	/* error detection timeout value */
-	__be32		rtv_toq;	/* timeout qualifier (see below) */
-};
-
-/*
- * rtv_toq bits.
- */
-#define	FC_ELS_RTV_EDRES (1 << 26)	/* E_D_TOV resolution is nS else mS */
-#define	FC_ELS_RTV_RTTOV (1 << 19)	/* R_T_TOV is 100 uS else 100 mS */
-
-/*
- * ELS_SCR - state change registration payload.
- */
-struct fc_els_scr {
-	__u8		scr_cmd;	/* command code */
-	__u8		scr_resv[6];	/* reserved */
-	__u8		scr_reg_func;	/* registration function (see below) */
-};
-
-enum fc_els_scr_func {
-	ELS_SCRF_FAB =	1,	/* fabric-detected registration */
-	ELS_SCRF_NPORT = 2,	/* Nx_Port-detected registration */
-	ELS_SCRF_FULL =	3,	/* full registration */
-	ELS_SCRF_CLEAR = 255,	/* remove any current registrations */
-};
-
-/*
- * ELS_RSCN - registered state change notification payload.
- */
-struct fc_els_rscn {
-	__u8		rscn_cmd;	/* RSCN opcode (0x61) */
-	__u8		rscn_page_len;	/* page length (4) */
-	__be16		rscn_plen;	/* payload length including this word */
-
-	/* followed by 4-byte generic affected Port_ID pages */
-};
-
-struct fc_els_rscn_page {
-	__u8		rscn_page_flags; /* event and address format */
-	__u8		rscn_fid[3];	/* fabric ID */
-};
-
-#define	ELS_RSCN_EV_QUAL_BIT	2	/* shift count for event qualifier */
-#define	ELS_RSCN_EV_QUAL_MASK	0xf	/* mask for event qualifier */
-#define	ELS_RSCN_ADDR_FMT_BIT	0	/* shift count for address format */
-#define	ELS_RSCN_ADDR_FMT_MASK	0x3	/* mask for address format */
-
-enum fc_els_rscn_ev_qual {
-	ELS_EV_QUAL_NONE = 0,		/* unspecified */
-	ELS_EV_QUAL_NS_OBJ = 1,		/* changed name server object */
-	ELS_EV_QUAL_PORT_ATTR = 2,	/* changed port attribute */
-	ELS_EV_QUAL_SERV_OBJ = 3,	/* changed service object */
-	ELS_EV_QUAL_SW_CONFIG = 4,	/* changed switch configuration */
-	ELS_EV_QUAL_REM_OBJ = 5,	/* removed object */
-};
-
-enum fc_els_rscn_addr_fmt {
-	ELS_ADDR_FMT_PORT = 0,	/* rscn_fid is a port address */
-	ELS_ADDR_FMT_AREA = 1,	/* rscn_fid is a area address */
-	ELS_ADDR_FMT_DOM = 2,	/* rscn_fid is a domain address */
-	ELS_ADDR_FMT_FAB = 3,	/* anything on fabric may have changed */
-};
-
-/*
- * ELS_RNID - request Node ID.
- */
-struct fc_els_rnid {
-	__u8		rnid_cmd;	/* RNID opcode (0x78) */
-	__u8		rnid_resv[3];	/* reserved */
-	__u8		rnid_fmt;	/* data format */
-	__u8		rnid_resv2[3];	/* reserved */
-};
-
-/*
- * Node Identification Data formats (rnid_fmt)
- */
-enum fc_els_rnid_fmt {
-	ELS_RNIDF_NONE = 0,		/* no specific identification data */
-	ELS_RNIDF_GEN = 0xdf,		/* general topology discovery format */
-};
-
-/*
- * ELS_RNID response.
- */
-struct fc_els_rnid_resp {
-	__u8		rnid_cmd;	/* response code (LS_ACC) */
-	__u8		rnid_resv[3];	/* reserved */
-	__u8		rnid_fmt;	/* data format */
-	__u8		rnid_cid_len;	/* common ID data length */
-	__u8		rnid_resv2;	/* reserved */
-	__u8		rnid_sid_len;	/* specific ID data length */
-};
-
-struct fc_els_rnid_cid {
-	__be64		rnid_wwpn;	/* N port name */
-	__be64		rnid_wwnn;	/* node name */
-};
-
-struct fc_els_rnid_gen {
-	__u8		rnid_vend_id[16]; /* vendor-unique ID */
-	__be32		rnid_atype;	/* associated type (see below) */
-	__be32		rnid_phys_port;	/* physical port number */
-	__be32		rnid_att_nodes;	/* number of attached nodes */
-	__u8		rnid_node_mgmt;	/* node management (see below) */
-	__u8		rnid_ip_ver;	/* IP version (see below) */
-	__be16		rnid_prot_port;	/* UDP / TCP port number */
-	__be32		rnid_ip_addr[4]; /* IP address */
-	__u8		rnid_resvd[2];	/* reserved */
-	__be16		rnid_vend_spec;	/* vendor-specific field */
-};
-
-enum fc_els_rnid_atype {
-	ELS_RNIDA_UNK =		0x01,	/* unknown */
-	ELS_RNIDA_OTHER =	0x02,	/* none of the following */
-	ELS_RNIDA_HUB =		0x03,
-	ELS_RNIDA_SWITCH =	0x04,
-	ELS_RNIDA_GATEWAY =	0x05,
-	ELS_RNIDA_CONV =	0x06,   /* Obsolete, do not use this value */
-	ELS_RNIDA_HBA =	        0x07,   /* Obsolete, do not use this value */
-	ELS_RNIDA_PROXY =       0x08,   /* Obsolete, do not use this value */
-	ELS_RNIDA_STORAGE =	0x09,
-	ELS_RNIDA_HOST =	0x0a,
-	ELS_RNIDA_SUBSYS =	0x0b,	/* storage subsystem (e.g., RAID) */
-	ELS_RNIDA_ACCESS =	0x0e,	/* access device (e.g. media changer) */
-	ELS_RNIDA_NAS =		0x11,	/* NAS server */
-	ELS_RNIDA_BRIDGE =	0x12,	/* bridge */
-	ELS_RNIDA_VIRT =	0x13,	/* virtualization device */
-	ELS_RNIDA_MF =		0xff,	/* multifunction device (bits below) */
-	ELS_RNIDA_MF_HUB =	1UL << 31, 	/* hub */
-	ELS_RNIDA_MF_SW =	1UL << 30, 	/* switch */
-	ELS_RNIDA_MF_GW =	1UL << 29,	/* gateway */
-	ELS_RNIDA_MF_ST =	1UL << 28,	/* storage */
-	ELS_RNIDA_MF_HOST =	1UL << 27,	/* host */
-	ELS_RNIDA_MF_SUB =	1UL << 26,	/* storage subsystem */
-	ELS_RNIDA_MF_ACC =	1UL << 25,	/* storage access dev */
-	ELS_RNIDA_MF_WDM =	1UL << 24,	/* wavelength division mux */
-	ELS_RNIDA_MF_NAS =	1UL << 23,	/* NAS server */
-	ELS_RNIDA_MF_BR =	1UL << 22,	/* bridge */
-	ELS_RNIDA_MF_VIRT =	1UL << 21,	/* virtualization device */
-};
-
-enum fc_els_rnid_mgmt {
-	ELS_RNIDM_SNMP =	0,
-	ELS_RNIDM_TELNET =	1,
-	ELS_RNIDM_HTTP =	2,
-	ELS_RNIDM_HTTPS =	3,
-	ELS_RNIDM_XML =		4,	/* HTTP + XML */
-};
-
-enum fc_els_rnid_ipver {
-	ELS_RNIDIP_NONE =	0,	/* no IP support or node mgmt. */
-	ELS_RNIDIP_V4 =		1,	/* IPv4 */
-	ELS_RNIDIP_V6 =		2,	/* IPv6 */
-};
-
-/*
- * ELS RPL - Read Port List.
- */
-struct fc_els_rpl {
-	__u8		rpl_cmd;	/* command */
-	__u8		rpl_resv[5];	/* reserved - must be zero */
-	__be16		rpl_max_size;	/* maximum response size or zero */
-	__u8		rpl_resv1;	/* reserved - must be zero */
-	__u8		rpl_index[3];	/* starting index */
-};
-
-/*
- * Port number block in RPL response.
- */
-struct fc_els_pnb {
-	__be32		pnb_phys_pn;	/* physical port number */
-	__u8		pnb_resv;	/* reserved */
-	__u8		pnb_port_id[3];	/* port ID */
-	__be64		pnb_wwpn;	/* port name */
-};
-
-/*
- * RPL LS_ACC response.
- */
-struct fc_els_rpl_resp {
-	__u8		rpl_cmd;	/* ELS_LS_ACC */
-	__u8		rpl_resv1;	/* reserved - must be zero */
-	__be16		rpl_plen;	/* payload length */
-	__u8		rpl_resv2;	/* reserved - must be zero */
-	__u8		rpl_llen[3];	/* list length */
-	__u8		rpl_resv3;	/* reserved - must be zero */
-	__u8		rpl_index[3];	/* starting index */
-	struct fc_els_pnb rpl_pnb[1];	/* variable number of PNBs */
-};
-
-/*
- * Link Error Status Block.
- */
-struct fc_els_lesb {
-	__be32		lesb_link_fail;	/* link failure count */
-	__be32		lesb_sync_loss;	/* loss of synchronization count */
-	__be32		lesb_sig_loss;	/* loss of signal count */
-	__be32		lesb_prim_err;	/* primitive sequence error count */
-	__be32		lesb_inv_word;	/* invalid transmission word count */
-	__be32		lesb_inv_crc;	/* invalid CRC count */
-};
-
-/*
- * ELS RPS - Read Port Status Block request.
- */
-struct fc_els_rps {
-	__u8		rps_cmd;	/* command */
-	__u8		rps_resv[2];	/* reserved - must be zero */
-	__u8		rps_flag;	/* flag - see below */
-	__be64		rps_port_spec;	/* port selection */
-};
-
-enum fc_els_rps_flag {
-	FC_ELS_RPS_DID =	0x00,	/* port identified by D_ID of req. */
-	FC_ELS_RPS_PPN =	0x01,	/* port_spec is physical port number */
-	FC_ELS_RPS_WWPN =	0x02,	/* port_spec is port WWN */
-};
-
-/*
- * ELS RPS LS_ACC response.
- */
-struct fc_els_rps_resp {
-	__u8		rps_cmd;	/* command - LS_ACC */
-	__u8		rps_resv[2];	/* reserved - must be zero */
-	__u8		rps_flag;	/* flag - see below */
-	__u8		rps_resv2[2];	/* reserved */
-	__be16		rps_status;	/* port status - see below */
-	struct fc_els_lesb rps_lesb;	/* link error status block */
-};
-
-enum fc_els_rps_resp_flag {
-	FC_ELS_RPS_LPEV =	0x01,	/* L_port extension valid */
-};
-
-enum fc_els_rps_resp_status {
-	FC_ELS_RPS_PTP =	1 << 5,	/* point-to-point connection */
-	FC_ELS_RPS_LOOP =	1 << 4,	/* loop mode */
-	FC_ELS_RPS_FAB =	1 << 3,	/* fabric present */
-	FC_ELS_RPS_NO_SIG =	1 << 2,	/* loss of signal */
-	FC_ELS_RPS_NO_SYNC =	1 << 1,	/* loss of synchronization */
-	FC_ELS_RPS_RESET =	1 << 0,	/* in link reset protocol */
-};
-
-/*
- * ELS LIRR - Link Incident Record Registration request.
- */
-struct fc_els_lirr {
-	__u8		lirr_cmd;	/* command */
-	__u8		lirr_resv[3];	/* reserved - must be zero */
-	__u8		lirr_func;	/* registration function */
-	__u8		lirr_fmt;	/* FC-4 type of RLIR requested */
-	__u8		lirr_resv2[2];	/* reserved - must be zero */
-};
-
-enum fc_els_lirr_func {
-	ELS_LIRR_SET_COND = 	0x01,	/* set - conditionally receive */
-	ELS_LIRR_SET_UNCOND = 	0x02,	/* set - unconditionally receive */
-	ELS_LIRR_CLEAR = 	0xff	/* clear registration */
-};
-
-/*
- * ELS SRL - Scan Remote Loop request.
- */
-struct fc_els_srl {
-	__u8		srl_cmd;	/* command */
-	__u8		srl_resv[3];	/* reserved - must be zero */
-	__u8		srl_flag;	/* flag - see below */
-	__u8		srl_flag_param[3];	/* flag parameter */
-};
-
-enum fc_els_srl_flag {
-	FC_ELS_SRL_ALL =	0x00,	/* scan all FL ports */
-	FC_ELS_SRL_ONE =	0x01,	/* scan specified loop */
-	FC_ELS_SRL_EN_PER =	0x02,	/* enable periodic scanning (param) */
-	FC_ELS_SRL_DIS_PER =	0x03,	/* disable periodic scanning */
-};
-
-/*
- * ELS RLS - Read Link Error Status Block request.
- */
-struct fc_els_rls {
-	__u8		rls_cmd;	/* command */
-	__u8		rls_resv[4];	/* reserved - must be zero */
-	__u8		rls_port_id[3];	/* port ID */
-};
-
-/*
- * ELS RLS LS_ACC Response.
- */
-struct fc_els_rls_resp {
-	__u8		rls_cmd;	/* ELS_LS_ACC */
-	__u8		rls_resv[3];	/* reserved - must be zero */
-	struct fc_els_lesb rls_lesb;	/* link error status block */
-};
-
-/*
- * ELS RLIR - Registered Link Incident Report.
- * This is followed by the CLIR and the CLID, described below.
- */
-struct fc_els_rlir {
-	__u8		rlir_cmd;	/* command */
-	__u8		rlir_resv[3];	/* reserved - must be zero */
-	__u8		rlir_fmt;	/* format (FC4-type if type specific) */
-	__u8		rlir_clr_len;	/* common link incident record length */
-	__u8		rlir_cld_len;	/* common link incident desc. length */
-	__u8		rlir_slr_len;	/* spec. link incident record length */
-};
-
-/*
- * CLIR - Common Link Incident Record Data. - Sent via RLIR.
- */
-struct fc_els_clir {
-	__be64		clir_wwpn;	/* incident port name */
-	__be64		clir_wwnn;	/* incident port node name */
-	__u8		clir_port_type;	/* incident port type */
-	__u8		clir_port_id[3];	/* incident port ID */
-
-	__be64		clir_conn_wwpn;	/* connected port name */
-	__be64		clir_conn_wwnn;	/* connected node name */
-	__be64		clir_fab_name;	/* fabric name */
-	__be32		clir_phys_port;	/* physical port number */
-	__be32		clir_trans_id;	/* transaction ID */
-	__u8		clir_resv[3];	/* reserved */
-	__u8		clir_ts_fmt;	/* time stamp format */
-	__be64		clir_timestamp;	/* time stamp */
-};
-
-/*
- * CLIR clir_ts_fmt - time stamp format values.
- */
-enum fc_els_clir_ts_fmt {
-	ELS_CLIR_TS_UNKNOWN = 	0,	/* time stamp field unknown */
-	ELS_CLIR_TS_SEC_FRAC = 	1,	/* time in seconds and fractions */
-	ELS_CLIR_TS_CSU =	2,	/* time in clock synch update format */
-};
-
-/*
- * Common Link Incident Descriptor - sent via RLIR.
- */
-struct fc_els_clid {
-	__u8		clid_iq;	/* incident qualifier flags */
-	__u8		clid_ic;	/* incident code */
-	__be16		clid_epai;	/* domain/area of ISL */
-};
-
-/*
- * CLID incident qualifier flags.
- */
-enum fc_els_clid_iq {
-	ELS_CLID_SWITCH =	0x20,	/* incident port is a switch node */
-	ELS_CLID_E_PORT =	0x10,	/* incident is an ISL (E) port */
-	ELS_CLID_SEV_MASK =	0x0c,	/* severity 2-bit field mask */
-	ELS_CLID_SEV_INFO =	0x00,	/* report is informational */
-	ELS_CLID_SEV_INOP =	0x08,	/* link not operational */
-	ELS_CLID_SEV_DEG =	0x04,	/* link degraded but operational */
-	ELS_CLID_LASER =	0x02,	/* subassembly is a laser */
-	ELS_CLID_FRU =		0x01,	/* format can identify a FRU */
-};
-
-/*
- * CLID incident code.
- */
-enum fc_els_clid_ic {
-	ELS_CLID_IC_IMPL =	1,	/* implicit incident */
-	ELS_CLID_IC_BER =	2,	/* bit-error-rate threshold exceeded */
-	ELS_CLID_IC_LOS =	3,	/* loss of synch or signal */
-	ELS_CLID_IC_NOS =	4,	/* non-operational primitive sequence */
-	ELS_CLID_IC_PST =	5,	/* primitive sequence timeout */
-	ELS_CLID_IC_INVAL =	6,	/* invalid primitive sequence */
-	ELS_CLID_IC_LOOP_TO =	7,	/* loop initialization time out */
-	ELS_CLID_IC_LIP =	8,	/* receiving LIP */
-};
-
-#endif /* _FC_ELS_H_ */
diff --git a/openflow/usr/include/scsi/fc/fc_fs.h b/openflow/usr/include/scsi/fc/fc_fs.h
deleted file mode 100644
index 50f28b1..0000000
--- a/openflow/usr/include/scsi/fc/fc_fs.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright(c) 2007 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Maintained at www.Open-FCoE.org
- */
-
-#ifndef _FC_FS_H_
-#define _FC_FS_H_
-
-#include <linux/types.h>
-
-/*
- * Fibre Channel Framing and Signalling definitions.
- * From T11 FC-FS-2 Rev 0.90 - 9 August 2005.
- */
-
-/*
- * Frame header
- */
-struct fc_frame_header {
-	__u8          fh_r_ctl;	/* routing control */
-	__u8          fh_d_id[3];	/* Destination ID */
-
-	__u8          fh_cs_ctl;	/* class of service control / pri */
-	__u8          fh_s_id[3];	/* Source ID */
-
-	__u8          fh_type;		/* see enum fc_fh_type below */
-	__u8          fh_f_ctl[3];	/* frame control */
-
-	__u8          fh_seq_id;	/* sequence ID */
-	__u8          fh_df_ctl;	/* data field control */
-	__be16        fh_seq_cnt;	/* sequence count */
-
-	__be16        fh_ox_id;		/* originator exchange ID */
-	__be16        fh_rx_id;		/* responder exchange ID */
-	__be32        fh_parm_offset;	/* parameter or relative offset */
-};
-
-#define FC_FRAME_HEADER_LEN 24	/* expected length of structure */
-
-#define FC_MAX_PAYLOAD  2112U		/* max payload length in bytes */
-#define FC_MIN_MAX_PAYLOAD  256U 	/* lower limit on max payload */
-
-#define FC_MAX_FRAME	(FC_MAX_PAYLOAD + FC_FRAME_HEADER_LEN)
-#define FC_MIN_MAX_FRAME (FC_MIN_MAX_PAYLOAD + FC_FRAME_HEADER_LEN)
-
-/*
- * fh_r_ctl - Routing control definitions.
- */
-    /*
-     * FC-4 device_data.
-     */
-enum fc_rctl {
-	FC_RCTL_DD_UNCAT = 0x00,	/* uncategorized information */
-	FC_RCTL_DD_SOL_DATA = 0x01,	/* solicited data */
-	FC_RCTL_DD_UNSOL_CTL = 0x02,	/* unsolicited control */
-	FC_RCTL_DD_SOL_CTL = 0x03,	/* solicited control or reply */
-	FC_RCTL_DD_UNSOL_DATA = 0x04,	/* unsolicited data */
-	FC_RCTL_DD_DATA_DESC = 0x05,	/* data descriptor */
-	FC_RCTL_DD_UNSOL_CMD = 0x06,	/* unsolicited command */
-	FC_RCTL_DD_CMD_STATUS = 0x07,	/* command status */
-
-#define FC_RCTL_ILS_REQ FC_RCTL_DD_UNSOL_CTL	/* ILS request */
-#define FC_RCTL_ILS_REP FC_RCTL_DD_SOL_CTL	/* ILS reply */
-
-	/*
-	 * Extended Link_Data
-	 */
-	FC_RCTL_ELS_REQ = 0x22,	/* extended link services request */
-	FC_RCTL_ELS_REP = 0x23,	/* extended link services reply */
-	FC_RCTL_ELS4_REQ = 0x32, /* FC-4 ELS request */
-	FC_RCTL_ELS4_REP = 0x33, /* FC-4 ELS reply */
-	/*
-	 * Optional Extended Headers
-	 */
-	FC_RCTL_VFTH = 0x50,	/* virtual fabric tagging header */
-	FC_RCTL_IFRH = 0x51,	/* inter-fabric routing header */
-	FC_RCTL_ENCH = 0x52,	/* encapsulation header */
-	/*
-	 * Basic Link Services fh_r_ctl values.
-	 */
-	FC_RCTL_BA_NOP = 0x80,	/* basic link service NOP */
-	FC_RCTL_BA_ABTS = 0x81,	/* basic link service abort */
-	FC_RCTL_BA_RMC = 0x82,	/* remove connection */
-	FC_RCTL_BA_ACC = 0x84,	/* basic accept */
-	FC_RCTL_BA_RJT = 0x85,	/* basic reject */
-	FC_RCTL_BA_PRMT = 0x86,	/* dedicated connection preempted */
-	/*
-	 * Link Control Information.
-	 */
-	FC_RCTL_ACK_1 = 0xc0,	/* acknowledge_1 */
-	FC_RCTL_ACK_0 = 0xc1,	/* acknowledge_0 */
-	FC_RCTL_P_RJT = 0xc2,	/* port reject */
-	FC_RCTL_F_RJT = 0xc3,	/* fabric reject */
-	FC_RCTL_P_BSY = 0xc4,	/* port busy */
-	FC_RCTL_F_BSY = 0xc5,	/* fabric busy to data frame */
-	FC_RCTL_F_BSYL = 0xc6,	/* fabric busy to link control frame */
-	FC_RCTL_LCR = 0xc7,	/* link credit reset */
-	FC_RCTL_END = 0xc9,	/* end */
-};
-				    /* incomplete list of definitions */
-
-/*
- * R_CTL names initializer.
- * Please keep this matching the above definitions.
- */
-#define FC_RCTL_NAMES_INIT { \
-	[FC_RCTL_DD_UNCAT] =		"uncat",			\
-	[FC_RCTL_DD_SOL_DATA] =		"sol data",			\
-	[FC_RCTL_DD_UNSOL_CTL] =	"unsol ctl",			\
-	[FC_RCTL_DD_SOL_CTL] =		"sol ctl/reply",		\
-	[FC_RCTL_DD_UNSOL_DATA] =	"unsol data",			\
-	[FC_RCTL_DD_DATA_DESC] =	"data desc",			\
-	[FC_RCTL_DD_UNSOL_CMD] =	"unsol cmd",			\
-	[FC_RCTL_DD_CMD_STATUS] =	"cmd status",			\
-	[FC_RCTL_ELS_REQ] =		"ELS req",			\
-	[FC_RCTL_ELS_REP] =		"ELS rep",			\
-	[FC_RCTL_ELS4_REQ] =		"FC-4 ELS req",			\
-	[FC_RCTL_ELS4_REP] =		"FC-4 ELS rep",			\
-	[FC_RCTL_BA_NOP] =		"BLS NOP",			\
-	[FC_RCTL_BA_ABTS] =		"BLS abort",			\
-	[FC_RCTL_BA_RMC] =		"BLS remove connection",	\
-	[FC_RCTL_BA_ACC] =		"BLS accept",			\
-	[FC_RCTL_BA_RJT] =		"BLS reject",			\
-	[FC_RCTL_BA_PRMT] =		"BLS dedicated connection preempted", \
-	[FC_RCTL_ACK_1] =		"LC ACK_1",			\
-	[FC_RCTL_ACK_0] =		"LC ACK_0",			\
-	[FC_RCTL_P_RJT] =		"LC port reject",		\
-	[FC_RCTL_F_RJT] =		"LC fabric reject",		\
-	[FC_RCTL_P_BSY] =		"LC port busy",			\
-	[FC_RCTL_F_BSY] =		"LC fabric busy to data frame",	\
-	[FC_RCTL_F_BSYL] =		"LC fabric busy to link control frame",\
-	[FC_RCTL_LCR] =			"LC link credit reset",		\
-	[FC_RCTL_END] =			"LC end",			\
-}
-
-/*
- * Well-known fabric addresses.
- */
-enum fc_well_known_fid {
-	FC_FID_NONE =           0x000000,       /* No destination */
-	FC_FID_BCAST =		0xffffff,	/* broadcast */
-	FC_FID_FLOGI =		0xfffffe,	/* fabric login */
-	FC_FID_FCTRL =		0xfffffd,	/* fabric controller */
-	FC_FID_DIR_SERV =	0xfffffc,	/* directory server */
-	FC_FID_TIME_SERV =	0xfffffb,	/* time server */
-	FC_FID_MGMT_SERV =	0xfffffa,	/* management server */
-	FC_FID_QOS =		0xfffff9,	/* QoS Facilitator */
-	FC_FID_ALIASES =	0xfffff8,	/* alias server (FC-PH2) */
-	FC_FID_SEC_KEY =	0xfffff7,	/* Security key dist. server */
-	FC_FID_CLOCK =		0xfffff6,	/* clock synch server */
-	FC_FID_MCAST_SERV =	0xfffff5,	/* multicast server */
-};
-
-#define	FC_FID_WELL_KNOWN_MAX	0xffffff /* highest well-known fabric ID */
-#define	FC_FID_WELL_KNOWN_BASE	0xfffff5 /* start of well-known fabric ID */
-
-/*
- * Other well-known addresses, outside the above contiguous range.
- */
-#define	FC_FID_DOM_MGR		0xfffc00	/* domain manager base */
-
-/*
- * Fabric ID bytes.
- */
-#define	FC_FID_DOMAIN		0
-#define	FC_FID_PORT		1
-#define	FC_FID_LINK		2
-
-/*
- * fh_type codes
- */
-enum fc_fh_type {
-	FC_TYPE_BLS =	0x00,	/* basic link service */
-	FC_TYPE_ELS =	0x01,	/* extended link service */
-	FC_TYPE_IP =	0x05,	/* IP over FC, RFC 4338 */
-	FC_TYPE_FCP =	0x08,	/* SCSI FCP */
-	FC_TYPE_CT =	0x20,	/* Fibre Channel Services (FC-CT) */
-	FC_TYPE_ILS =	0x22,	/* internal link service */
-};
-
-/*
- * FC_TYPE names initializer.
- * Please keep this matching the above definitions.
- */
-#define FC_TYPE_NAMES_INIT {				\
-	[FC_TYPE_BLS] =		"BLS",			\
-	[FC_TYPE_ELS] =		"ELS",			\
-	[FC_TYPE_IP] =		"IP",			\
-	[FC_TYPE_FCP] =		"FCP",			\
-	[FC_TYPE_CT] =		"CT",			\
-	[FC_TYPE_ILS] =		"ILS",			\
-}
-
-/*
- * Exchange IDs.
- */
-#define FC_XID_UNKNOWN  0xffff	/* unknown exchange ID */
-#define FC_XID_MIN	0x0	/* supported min exchange ID */
-#define FC_XID_MAX	0xfffe	/* supported max exchange ID */
-
-/*
- * fh_f_ctl - Frame control flags.
- */
-#define	FC_FC_EX_CTX	(1 << 23)	/* sent by responder to exchange */
-#define	FC_FC_SEQ_CTX	(1 << 22)	/* sent by responder to sequence */
-#define	FC_FC_FIRST_SEQ (1 << 21)	/* first sequence of this exchange */
-#define	FC_FC_LAST_SEQ	(1 << 20)	/* last sequence of this exchange */
-#define	FC_FC_END_SEQ	(1 << 19)	/* last frame of sequence */
-#define	FC_FC_END_CONN	(1 << 18)	/* end of class 1 connection pending */
-#define	FC_FC_RES_B17	(1 << 17)	/* reserved */
-#define	FC_FC_SEQ_INIT	(1 << 16)	/* transfer of sequence initiative */
-#define	FC_FC_X_ID_REASS (1 << 15)	/* exchange ID has been changed */
-#define	FC_FC_X_ID_INVAL (1 << 14)	/* exchange ID invalidated */
-
-#define	FC_FC_ACK_1	(1 << 12)	/* 13:12 = 1: ACK_1 expected */
-#define	FC_FC_ACK_N	(2 << 12)	/* 13:12 = 2: ACK_N expected */
-#define	FC_FC_ACK_0	(3 << 12)	/* 13:12 = 3: ACK_0 expected */
-
-#define	FC_FC_RES_B11	(1 << 11)	/* reserved */
-#define	FC_FC_RES_B10	(1 << 10)	/* reserved */
-#define	FC_FC_RETX_SEQ	(1 << 9)	/* retransmitted sequence */
-#define	FC_FC_UNI_TX	(1 << 8)	/* unidirectional transmit (class 1) */
-#define	FC_FC_CONT_SEQ(i) ((i) << 6)
-#define	FC_FC_ABT_SEQ(i) ((i) << 4)
-#define	FC_FC_REL_OFF	(1 << 3)	/* parameter is relative offset */
-#define	FC_FC_RES2	(1 << 2)	/* reserved */
-#define	FC_FC_FILL(i)	((i) & 3)	/* 1:0: bytes of trailing fill */
-
-/*
- * BA_ACC payload.
- */
-struct fc_ba_acc {
-	__u8		ba_seq_id_val;	/* SEQ_ID validity */
-#define FC_BA_SEQ_ID_VAL 0x80
-	__u8		ba_seq_id;	/* SEQ_ID of seq last deliverable */
-	__u8		ba_resvd[2];	/* reserved */
-	__be16		ba_ox_id;	/* OX_ID for aborted seq or exch */
-	__be16		ba_rx_id;	/* RX_ID for aborted seq or exch */
-	__be16		ba_low_seq_cnt;	/* low SEQ_CNT of aborted seq */
-	__be16		ba_high_seq_cnt; /* high SEQ_CNT of aborted seq */
-};
-
-/*
- * BA_RJT: Basic Reject payload.
- */
-struct fc_ba_rjt {
-	__u8		br_resvd;	/* reserved */
-	__u8		br_reason;	/* reason code */
-	__u8		br_explan;	/* reason explanation */
-	__u8		br_vendor;	/* vendor unique code */
-};
-
-/*
- * BA_RJT reason codes.
- * From FS-2.
- */
-enum fc_ba_rjt_reason {
-	FC_BA_RJT_NONE =	0,	/* in software this means no reject */
-	FC_BA_RJT_INVL_CMD =	0x01,	/* invalid command code */
-	FC_BA_RJT_LOG_ERR =	0x03,	/* logical error */
-	FC_BA_RJT_LOG_BUSY =	0x05,	/* logical busy */
-	FC_BA_RJT_PROTO_ERR =	0x07,	/* protocol error */
-	FC_BA_RJT_UNABLE =	0x09,	/* unable to perform request */
-	FC_BA_RJT_VENDOR =	0xff,	/* vendor-specific (see br_vendor) */
-};
-
-/*
- * BA_RJT reason code explanations.
- */
-enum fc_ba_rjt_explan {
-	FC_BA_RJT_EXP_NONE =	0x00,	/* no additional expanation */
-	FC_BA_RJT_INV_XID =	0x03,	/* invalid OX_ID-RX_ID combination */
-	FC_BA_RJT_ABT =		0x05,	/* sequence aborted, no seq info */
-};
-
-/*
- * P_RJT or F_RJT: Port Reject or Fabric Reject parameter field.
- */
-struct fc_pf_rjt {
-	__u8		rj_action;	/* reserved */
-	__u8		rj_reason;	/* reason code */
-	__u8		rj_resvd;	/* reserved */
-	__u8		rj_vendor;	/* vendor unique code */
-};
-
-/*
- * P_RJT and F_RJT reject reason codes.
- */
-enum fc_pf_rjt_reason {
-	FC_RJT_NONE =		0,	/* non-reject (reserved by standard) */
-	FC_RJT_INVL_DID =	0x01,	/* invalid destination ID */
-	FC_RJT_INVL_SID =	0x02,	/* invalid source ID */
-	FC_RJT_P_UNAV_T =	0x03,	/* port unavailable, temporary */
-	FC_RJT_P_UNAV =		0x04,	/* port unavailable, permanent */
-	FC_RJT_CLS_UNSUP =	0x05,	/* class not supported */
-	FC_RJT_DEL_USAGE =	0x06,	/* delimiter usage error */
-	FC_RJT_TYPE_UNSUP =	0x07,	/* type not supported */
-	FC_RJT_LINK_CTL =	0x08,	/* invalid link control */
-	FC_RJT_R_CTL =		0x09,	/* invalid R_CTL field */
-	FC_RJT_F_CTL =		0x0a,	/* invalid F_CTL field */
-	FC_RJT_OX_ID =		0x0b,	/* invalid originator exchange ID */
-	FC_RJT_RX_ID =		0x0c,	/* invalid responder exchange ID */
-	FC_RJT_SEQ_ID =		0x0d,	/* invalid sequence ID */
-	FC_RJT_DF_CTL =		0x0e,	/* invalid DF_CTL field */
-	FC_RJT_SEQ_CNT =	0x0f,	/* invalid SEQ_CNT field */
-	FC_RJT_PARAM =		0x10,	/* invalid parameter field */
-	FC_RJT_EXCH_ERR =	0x11,	/* exchange error */
-	FC_RJT_PROTO =		0x12,	/* protocol error */
-	FC_RJT_LEN =		0x13,	/* incorrect length */
-	FC_RJT_UNEXP_ACK =	0x14,	/* unexpected ACK */
-	FC_RJT_FAB_CLASS =	0x15,	/* class unsupported by fabric entity */
-	FC_RJT_LOGI_REQ =	0x16,	/* login required */
-	FC_RJT_SEQ_XS =		0x17,	/* excessive sequences attempted */
-	FC_RJT_EXCH_EST =	0x18,	/* unable to establish exchange */
-	FC_RJT_FAB_UNAV =	0x1a,	/* fabric unavailable */
-	FC_RJT_VC_ID =		0x1b,	/* invalid VC_ID (class 4) */
-	FC_RJT_CS_CTL =		0x1c,	/* invalid CS_CTL field */
-	FC_RJT_INSUF_RES =	0x1d,	/* insuff. resources for VC (Class 4) */
-	FC_RJT_INVL_CLS =	0x1f,	/* invalid class of service */
-	FC_RJT_PREEMT_RJT =	0x20,	/* preemption request rejected */
-	FC_RJT_PREEMT_DIS =	0x21,	/* preemption not enabled */
-	FC_RJT_MCAST_ERR =	0x22,	/* multicast error */
-	FC_RJT_MCAST_ET =	0x23,	/* multicast error terminate */
-	FC_RJT_PRLI_REQ =	0x24,	/* process login required */
-	FC_RJT_INVL_ATT =	0x25,	/* invalid attachment */
-	FC_RJT_VENDOR =		0xff,	/* vendor specific reject */
-};
-
-/* default timeout values */
-
-#define FC_DEF_E_D_TOV	2000UL
-#define FC_DEF_R_A_TOV	10000UL
-
-#endif /* _FC_FS_H_ */
diff --git a/openflow/usr/include/scsi/fc/fc_gs.h b/openflow/usr/include/scsi/fc/fc_gs.h
deleted file mode 100644
index a37346d..0000000
--- a/openflow/usr/include/scsi/fc/fc_gs.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright(c) 2007 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Maintained at www.Open-FCoE.org
- */
-
-#ifndef _FC_GS_H_
-#define	_FC_GS_H_
-
-#include <linux/types.h>
-
-/*
- * Fibre Channel Services - Common Transport.
- * From T11.org FC-GS-2 Rev 5.3 November 1998.
- */
-
-struct fc_ct_hdr {
-	__u8		ct_rev;		/* revision */
-	__u8		ct_in_id[3];	/* N_Port ID of original requestor */
-	__u8		ct_fs_type;	/* type of fibre channel service */
-	__u8		ct_fs_subtype;	/* subtype */
-	__u8		ct_options;
-	__u8		_ct_resvd1;
-	__be16		ct_cmd;		/* command / response code */
-	__be16		ct_mr_size;	/* maximum / residual size */
-	__u8		_ct_resvd2;
-	__u8		ct_reason;	/* reject reason */
-	__u8		ct_explan;	/* reason code explanation */
-	__u8		ct_vendor;	/* vendor unique data */
-};
-
-#define	FC_CT_HDR_LEN	16	/* expected sizeof (struct fc_ct_hdr) */
-
-enum fc_ct_rev {
-	FC_CT_REV = 1		/* common transport revision */
-};
-
-/*
- * ct_fs_type values.
- */
-enum fc_ct_fs_type {
-	FC_FST_ALIAS =	0xf8,	/* alias service */
-	FC_FST_MGMT =	0xfa,	/* management service */
-	FC_FST_TIME =	0xfb,	/* time service */
-	FC_FST_DIR =	0xfc,	/* directory service */
-};
-
-/*
- * ct_cmd: Command / response codes
- */
-enum fc_ct_cmd {
-	FC_FS_RJT =	0x8001,	/* reject */
-	FC_FS_ACC =	0x8002,	/* accept */
-};
-
-/*
- * FS_RJT reason codes.
- */
-enum fc_ct_reason {
-	FC_FS_RJT_CMD =		0x01,	/* invalid command code */
-	FC_FS_RJT_VER =		0x02,	/* invalid version level */
-	FC_FS_RJT_LOG =		0x03,	/* logical error */
-	FC_FS_RJT_IUSIZ =	0x04,	/* invalid IU size */
-	FC_FS_RJT_BSY =		0x05,	/* logical busy */
-	FC_FS_RJT_PROTO =	0x07,	/* protocol error */
-	FC_FS_RJT_UNABL =	0x09,	/* unable to perform command request */
-	FC_FS_RJT_UNSUP =	0x0b,	/* command not supported */
-};
-
-/*
- * FS_RJT reason code explanations.
- */
-enum fc_ct_explan {
-	FC_FS_EXP_NONE =	0x00,	/* no additional explanation */
-	FC_FS_EXP_PID =		0x01,	/* port ID not registered */
-	FC_FS_EXP_PNAM =	0x02,	/* port name not registered */
-	FC_FS_EXP_NNAM =	0x03,	/* node name not registered */
-	FC_FS_EXP_COS =		0x04,	/* class of service not registered */
-	FC_FS_EXP_FTNR =	0x07,	/* FC-4 types not registered */
-	/* definitions not complete */
-};
-
-#endif /* _FC_GS_H_ */
diff --git a/openflow/usr/include/scsi/fc/fc_ns.h b/openflow/usr/include/scsi/fc/fc_ns.h
deleted file mode 100644
index f7751d5..0000000
--- a/openflow/usr/include/scsi/fc/fc_ns.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright(c) 2007 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Maintained at www.Open-FCoE.org
- */
-
-#ifndef _FC_NS_H_
-#define	_FC_NS_H_
-
-#include <linux/types.h>
-
-/*
- * Fibre Channel Services - Name Service (dNS)
- * From T11.org FC-GS-2 Rev 5.3 November 1998.
- */
-
-/*
- * Common-transport sub-type for Name Server.
- */
-#define	FC_NS_SUBTYPE	    2	/* fs_ct_hdr.ct_fs_subtype */
-
-/*
- * Name server Requests.
- * Note:  this is an incomplete list, some unused requests are omitted.
- */
-enum fc_ns_req {
-	FC_NS_GA_NXT =	0x0100,		/* get all next */
-	FC_NS_GI_A =	0x0101,		/* get identifiers - scope */
-	FC_NS_GPN_ID =	0x0112,		/* get port name by ID */
-	FC_NS_GNN_ID =	0x0113,		/* get node name by ID */
-	FC_NS_GSPN_ID = 0x0118,		/* get symbolic port name */
-	FC_NS_GID_PN =	0x0121,		/* get ID for port name */
-	FC_NS_GID_NN =	0x0131,		/* get IDs for node name */
-	FC_NS_GID_FT =	0x0171,		/* get IDs by FC4 type */
-	FC_NS_GPN_FT =	0x0172,		/* get port names by FC4 type */
-	FC_NS_GID_PT =	0x01a1,		/* get IDs by port type */
-	FC_NS_RPN_ID =	0x0212,		/* reg port name for ID */
-	FC_NS_RNN_ID =	0x0213,		/* reg node name for ID */
-	FC_NS_RFT_ID =	0x0217,		/* reg FC4 type for ID */
-	FC_NS_RSPN_ID =	0x0218,		/* reg symbolic port name */
-	FC_NS_RFF_ID =	0x021f,		/* reg FC4 Features for ID */
-	FC_NS_RSNN_NN =	0x0239,		/* reg symbolic node name */
-};
-
-/*
- * Port type values.
- */
-enum fc_ns_pt {
-	FC_NS_UNID_PORT = 0x00,	/* unidentified */
-	FC_NS_N_PORT =	0x01,	/* N port */
-	FC_NS_NL_PORT =	0x02,	/* NL port */
-	FC_NS_FNL_PORT = 0x03,	/* F/NL port */
-	FC_NS_NX_PORT =	0x7f,	/* Nx port */
-	FC_NS_F_PORT =	0x81,	/* F port */
-	FC_NS_FL_PORT =	0x82,	/* FL port */
-	FC_NS_E_PORT =	0x84,	/* E port */
-	FC_NS_B_PORT =	0x85,	/* B port */
-};
-
-/*
- * Port type object.
- */
-struct fc_ns_pt_obj {
-	__u8		pt_type;
-};
-
-/*
- * Port ID object
- */
-struct fc_ns_fid {
-	__u8		fp_flags;	/* flags for responses only */
-	__u8		fp_fid[3];
-};
-
-/*
- * fp_flags in port ID object, for responses only.
- */
-#define	FC_NS_FID_LAST	0x80		/* last object */
-
-/*
- * FC4-types object.
- */
-#define	FC_NS_TYPES	256	/* number of possible FC-4 types */
-#define	FC_NS_BPW	32	/* bits per word in bitmap */
-
-struct fc_ns_fts {
-	__be32	ff_type_map[FC_NS_TYPES / FC_NS_BPW]; /* bitmap of FC-4 types */
-};
-
-/*
- * FC4-features object.
- */
-struct fc_ns_ff	{
-	__be32	fd_feat[FC_NS_TYPES * 4 / FC_NS_BPW]; /* 4-bits per FC-type */
-};
-
-/*
- * GID_PT request.
- */
-struct fc_ns_gid_pt {
-	__u8		fn_pt_type;
-	__u8		fn_domain_id_scope;
-	__u8		fn_area_id_scope;
-	__u8		fn_resvd;
-};
-
-/*
- * GID_FT or GPN_FT request.
- */
-struct fc_ns_gid_ft {
-	__u8		fn_resvd;
-	__u8		fn_domain_id_scope;
-	__u8		fn_area_id_scope;
-	__u8		fn_fc4_type;
-};
-
-/*
- * GPN_FT response.
- */
-struct fc_gpn_ft_resp {
-	__u8		fp_flags;	/* see fp_flags definitions above */
-	__u8		fp_fid[3];	/* port ID */
-	__be32		fp_resvd;
-	__be64		fp_wwpn;	/* port name */
-};
-
-/*
- * GID_PN request
- */
-struct fc_ns_gid_pn {
-	__be64     fn_wwpn;    /* port name */
-};
-
-/*
- * GID_PN response or GSPN_ID request
- */
-struct fc_gid_pn_resp {
-	__u8      fp_resvd;
-	__u8      fp_fid[3];     /* port ID */
-};
-
-/*
- * GSPN_ID response
- */
-struct fc_gspn_resp {
-	__u8	fp_name_len;
-	char	fp_name[];
-};
-
-/*
- * RFT_ID request - register FC-4 types for ID.
- */
-struct fc_ns_rft_id {
-	struct fc_ns_fid fr_fid;	/* port ID object */
-	struct fc_ns_fts fr_fts;	/* FC-4 types object */
-};
-
-/*
- * RPN_ID request - register port name for ID.
- * RNN_ID request - register node name for ID.
- */
-struct fc_ns_rn_id {
-	struct fc_ns_fid fr_fid;	/* port ID object */
-	__be64		fr_wwn;		/* node name or port name */
-} __attribute__((__packed__));
-
-/*
- * RSNN_NN request - register symbolic node name
- */
-struct fc_ns_rsnn {
-	__be64		fr_wwn;		/* node name */
-	__u8		fr_name_len;
-	char		fr_name[];
-} __attribute__((__packed__));
-
-/*
- * RSPN_ID request - register symbolic port name
- */
-struct fc_ns_rspn {
-	struct fc_ns_fid fr_fid;	/* port ID object */
-	__u8		fr_name_len;
-	char		fr_name[];
-} __attribute__((__packed__));
-
-/*
- * RFF_ID request - register FC-4 Features for ID.
- */
-struct fc_ns_rff_id {
-	struct fc_ns_fid fr_fid;	/* port ID object */
-	__u8		fr_resvd[2];
-	__u8		fr_feat;	/* FC-4 Feature bits */
-	__u8		fr_type;	/* FC-4 type */
-} __attribute__((__packed__));
-
-#endif /* _FC_NS_H_ */
diff --git a/openflow/usr/include/scsi/scsi.h b/openflow/usr/include/scsi/scsi.h
deleted file mode 100644
index ecee08c..0000000
--- a/openflow/usr/include/scsi/scsi.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- * This header file contains public constants and structures used by
- * the scsi code for linux.
- */
-
-#ifndef _SCSI_SCSI_H
-#define _SCSI_SCSI_H	1
-
-#include <features.h>
-
-/*
- *      SCSI opcodes
- */
-
-#define TEST_UNIT_READY       0x00
-#define REZERO_UNIT           0x01
-#define REQUEST_SENSE         0x03
-#define FORMAT_UNIT           0x04
-#define READ_BLOCK_LIMITS     0x05
-#define REASSIGN_BLOCKS       0x07
-#define READ_6                0x08
-#define WRITE_6               0x0a
-#define SEEK_6                0x0b
-#define READ_REVERSE          0x0f
-#define WRITE_FILEMARKS       0x10
-#define SPACE                 0x11
-#define INQUIRY               0x12
-#define RECOVER_BUFFERED_DATA 0x14
-#define MODE_SELECT           0x15
-#define RESERVE               0x16
-#define RELEASE               0x17
-#define COPY                  0x18
-#define ERASE                 0x19
-#define MODE_SENSE            0x1a
-#define START_STOP            0x1b
-#define RECEIVE_DIAGNOSTIC    0x1c
-#define SEND_DIAGNOSTIC       0x1d
-#define ALLOW_MEDIUM_REMOVAL  0x1e
-
-#define SET_WINDOW            0x24
-#define READ_CAPACITY         0x25
-#define READ_10               0x28
-#define WRITE_10              0x2a
-#define SEEK_10               0x2b
-#define WRITE_VERIFY          0x2e
-#define VERIFY                0x2f
-#define SEARCH_HIGH           0x30
-#define SEARCH_EQUAL          0x31
-#define SEARCH_LOW            0x32
-#define SET_LIMITS            0x33
-#define PRE_FETCH             0x34
-#define READ_POSITION         0x34
-#define SYNCHRONIZE_CACHE     0x35
-#define LOCK_UNLOCK_CACHE     0x36
-#define READ_DEFECT_DATA      0x37
-#define MEDIUM_SCAN           0x38
-#define COMPARE               0x39
-#define COPY_VERIFY           0x3a
-#define WRITE_BUFFER          0x3b
-#define READ_BUFFER           0x3c
-#define UPDATE_BLOCK          0x3d
-#define READ_LONG             0x3e
-#define WRITE_LONG            0x3f
-#define CHANGE_DEFINITION     0x40
-#define WRITE_SAME            0x41
-#define READ_TOC              0x43
-#define LOG_SELECT            0x4c
-#define LOG_SENSE             0x4d
-#define MODE_SELECT_10        0x55
-#define RESERVE_10            0x56
-#define RELEASE_10            0x57
-#define MODE_SENSE_10         0x5a
-#define PERSISTENT_RESERVE_IN 0x5e
-#define PERSISTENT_RESERVE_OUT 0x5f
-#define MOVE_MEDIUM           0xa5
-#define READ_12               0xa8
-#define WRITE_12              0xaa
-#define WRITE_VERIFY_12       0xae
-#define SEARCH_HIGH_12        0xb0
-#define SEARCH_EQUAL_12       0xb1
-#define SEARCH_LOW_12         0xb2
-#define READ_ELEMENT_STATUS   0xb8
-#define SEND_VOLUME_TAG       0xb6
-#define WRITE_LONG_2          0xea
-
-/*
- *  Status codes
- */
-
-#define GOOD                 0x00
-#define CHECK_CONDITION      0x01
-#define CONDITION_GOOD       0x02
-#define BUSY                 0x04
-#define INTERMEDIATE_GOOD    0x08
-#define INTERMEDIATE_C_GOOD  0x0a
-#define RESERVATION_CONFLICT 0x0c
-#define COMMAND_TERMINATED   0x11
-#define QUEUE_FULL           0x14
-
-#define STATUS_MASK          0x3e
-
-/*
- *  SENSE KEYS
- */
-
-#define NO_SENSE            0x00
-#define RECOVERED_ERROR     0x01
-#define NOT_READY           0x02
-#define MEDIUM_ERROR        0x03
-#define HARDWARE_ERROR      0x04
-#define ILLEGAL_REQUEST     0x05
-#define UNIT_ATTENTION      0x06
-#define DATA_PROTECT        0x07
-#define BLANK_CHECK         0x08
-#define COPY_ABORTED        0x0a
-#define ABORTED_COMMAND     0x0b
-#define VOLUME_OVERFLOW     0x0d
-#define MISCOMPARE          0x0e
-
-
-/*
- *  DEVICE TYPES
- */
-
-#define TYPE_DISK           0x00
-#define TYPE_TAPE           0x01
-#define TYPE_PROCESSOR      0x03    /* HP scanners use this */
-#define TYPE_WORM           0x04    /* Treated as ROM by our system */
-#define TYPE_ROM            0x05
-#define TYPE_SCANNER        0x06
-#define TYPE_MOD            0x07    /* Magneto-optical disk -
-				     * - treated as TYPE_DISK */
-#define TYPE_MEDIUM_CHANGER 0x08
-#define TYPE_ENCLOSURE	    0x0d    /* Enclosure Services Device */
-#define TYPE_NO_LUN         0x7f
-
-/*
- * standard mode-select header prepended to all mode-select commands
- *
- * moved here from cdrom.h -- kraxel
- */
-
-struct ccs_modesel_head
-  {
-    unsigned char _r1;			/* reserved.  */
-    unsigned char medium;		/* device-specific medium type.  */
-    unsigned char _r2;			/* reserved.  */
-    unsigned char block_desc_length;	/* block descriptor length.  */
-    unsigned char density;		/* device-specific density code.  */
-    unsigned char number_blocks_hi;	/* number of blocks in this block
-					   desc.  */
-    unsigned char number_blocks_med;
-    unsigned char number_blocks_lo;
-    unsigned char _r3;
-    unsigned char block_length_hi;	/* block length for blocks in this
-					   desc.  */
-    unsigned char block_length_med;
-    unsigned char block_length_lo;
-  };
-
-/*
- *  MESSAGE CODES
- */
-
-#define COMMAND_COMPLETE    0x00
-#define EXTENDED_MESSAGE    0x01
-#define     EXTENDED_MODIFY_DATA_POINTER    0x00
-#define     EXTENDED_SDTR                   0x01
-#define     EXTENDED_EXTENDED_IDENTIFY      0x02    /* SCSI-I only */
-#define     EXTENDED_WDTR                   0x03
-#define SAVE_POINTERS       0x02
-#define RESTORE_POINTERS    0x03
-#define DISCONNECT          0x04
-#define INITIATOR_ERROR     0x05
-#define ABORT               0x06
-#define MESSAGE_REJECT      0x07
-#define NOP                 0x08
-#define MSG_PARITY_ERROR    0x09
-#define LINKED_CMD_COMPLETE 0x0a
-#define LINKED_FLG_CMD_COMPLETE 0x0b
-#define BUS_DEVICE_RESET    0x0c
-
-#define INITIATE_RECOVERY   0x0f            /* SCSI-II only */
-#define RELEASE_RECOVERY    0x10            /* SCSI-II only */
-
-#define SIMPLE_QUEUE_TAG    0x20
-#define HEAD_OF_QUEUE_TAG   0x21
-#define ORDERED_QUEUE_TAG   0x22
-
-/*
- * Here are some scsi specific ioctl commands which are sometimes useful.
- */
-/* These are a few other constants only used by scsi devices.  */
-
-#define SCSI_IOCTL_GET_IDLUN 0x5382
-
-/* Used to turn on and off tagged queuing for scsi devices.  */
-
-#define SCSI_IOCTL_TAGGED_ENABLE 0x5383
-#define SCSI_IOCTL_TAGGED_DISABLE 0x5384
-
-/* Used to obtain the host number of a device.  */
-#define SCSI_IOCTL_PROBE_HOST 0x5385
-
-/* Used to get the bus number for a device.  */
-#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386
-
-#endif /* scsi/scsi.h */
diff --git a/openflow/usr/include/scsi/scsi_bsg_fc.h b/openflow/usr/include/scsi/scsi_bsg_fc.h
deleted file mode 100644
index 3031b90..0000000
--- a/openflow/usr/include/scsi/scsi_bsg_fc.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- *  FC Transport BSG Interface
- *
- *  Copyright (C) 2008   James Smart, Emulex Corporation
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#ifndef SCSI_BSG_FC_H
-#define SCSI_BSG_FC_H
-
-/*
- * This file intended to be included by both kernel and user space
- */
-
-/*
- * FC Transport SGIO v4 BSG Message Support
- */
-
-/* Default BSG request timeout (in seconds) */
-#define FC_DEFAULT_BSG_TIMEOUT		(10 * HZ)
-
-
-/*
- * Request Message Codes supported by the FC Transport
- */
-
-/* define the class masks for the message codes */
-#define FC_BSG_CLS_MASK		0xF0000000	/* find object class */
-#define FC_BSG_HST_MASK		0x80000000	/* fc host class */
-#define FC_BSG_RPT_MASK		0x40000000	/* fc rport class */
-
-	/* fc_host Message Codes */
-#define FC_BSG_HST_ADD_RPORT		(FC_BSG_HST_MASK | 0x00000001)
-#define FC_BSG_HST_DEL_RPORT		(FC_BSG_HST_MASK | 0x00000002)
-#define FC_BSG_HST_ELS_NOLOGIN		(FC_BSG_HST_MASK | 0x00000003)
-#define FC_BSG_HST_CT			(FC_BSG_HST_MASK | 0x00000004)
-#define FC_BSG_HST_VENDOR		(FC_BSG_HST_MASK | 0x000000FF)
-
-	/* fc_rport Message Codes */
-#define FC_BSG_RPT_ELS			(FC_BSG_RPT_MASK | 0x00000001)
-#define FC_BSG_RPT_CT			(FC_BSG_RPT_MASK | 0x00000002)
-
-
-
-/*
- * FC Address Identifiers in Message Structures :
- *
- *   Whenever a command payload contains a FC Address Identifier
- *   (aka port_id), the value is effectively in big-endian
- *   order, thus the array elements are decoded as follows:
- *     element [0] is bits 23:16 of the FC Address Identifier
- *     element [1] is bits 15:8 of the FC Address Identifier
- *     element [2] is bits 7:0 of the FC Address Identifier
- */
-
-
-/*
- * FC Host Messages
- */
-
-/* FC_BSG_HST_ADDR_PORT : */
-
-/* Request:
- * This message requests the FC host to login to the remote port
- * at the specified N_Port_Id.  The remote port is to be enumerated
- * with the transport upon completion of the login.
- */
-struct fc_bsg_host_add_rport {
-	uint8_t		reserved;
-
-	/* FC Address Identier of the remote port to login to */
-	uint8_t		port_id[3];
-};
-
-/* Response:
- * There is no additional response data - fc_bsg_reply->result is sufficient
- */
-
-
-/* FC_BSG_HST_DEL_RPORT : */
-
-/* Request:
- * This message requests the FC host to remove an enumerated
- * remote port and to terminate the login to it.
- *
- * Note: The driver is free to reject this request if it desires to
- * remain logged in with the remote port.
- */
-struct fc_bsg_host_del_rport {
-	uint8_t		reserved;
-
-	/* FC Address Identier of the remote port to logout of */
-	uint8_t		port_id[3];
-};
-
-/* Response:
- * There is no additional response data - fc_bsg_reply->result is sufficient
- */
-
-
-/* FC_BSG_HST_ELS_NOLOGIN : */
-
-/* Request:
- * This message requests the FC_Host to send an ELS to a specific
- * N_Port_ID. The host does not need to log into the remote port,
- * nor does it need to enumerate the rport for further traffic
- * (although, the FC host is free to do so if it desires).
- */
-struct fc_bsg_host_els {
-	/*
-	 * ELS Command Code being sent (must be the same as byte 0
-	 * of the payload)
-	 */
-	uint8_t 	command_code;
-
-	/* FC Address Identier of the remote port to send the ELS to */
-	uint8_t		port_id[3];
-};
-
-/* Response:
- */
-/* fc_bsg_ctels_reply->status values */
-#define FC_CTELS_STATUS_OK	0x00000000
-#define FC_CTELS_STATUS_REJECT	0x00000001
-#define FC_CTELS_STATUS_P_RJT	0x00000002
-#define FC_CTELS_STATUS_F_RJT	0x00000003
-#define FC_CTELS_STATUS_P_BSY	0x00000004
-#define FC_CTELS_STATUS_F_BSY	0x00000006
-struct fc_bsg_ctels_reply {
-	/*
-	 * Note: An ELS LS_RJT may be reported in 2 ways:
-	 *  a) A status of FC_CTELS_STATUS_OK is returned. The caller
-	 *     is to look into the ELS receive payload to determine
-	 *     LS_ACC or LS_RJT (by contents of word 0). The reject
-	 *     data will be in word 1.
-	 *  b) A status of FC_CTELS_STATUS_REJECT is returned, The
-	 *     rjt_data field will contain valid data.
-	 *
-	 * Note: ELS LS_ACC is determined by an FC_CTELS_STATUS_OK, and
-	 *   the receive payload word 0 indicates LS_ACC
-	 *   (e.g. value is 0x02xxxxxx).
-	 *
-	 * Note: Similarly, a CT Reject may be reported in 2 ways:
-	 *  a) A status of FC_CTELS_STATUS_OK is returned. The caller
-	 *     is to look into the CT receive payload to determine
-	 *     Accept or Reject (by contents of word 2). The reject
-	 *     data will be in word 3.
-	 *  b) A status of FC_CTELS_STATUS_REJECT is returned, The
-	 *     rjt_data field will contain valid data.
-	 *
-	 * Note: x_RJT/BSY status will indicae that the rjt_data field
-	 *   is valid and contains the reason/explanation values.
-	 */
-	uint32_t	status;		/* See FC_CTELS_STATUS_xxx */
-
-	/* valid if status is not FC_CTELS_STATUS_OK */
-	struct	{
-		uint8_t	action;		/* fragment_id for CT REJECT */
-		uint8_t	reason_code;
-		uint8_t	reason_explanation;
-		uint8_t	vendor_unique;
-	} rjt_data;
-};
-
-
-/* FC_BSG_HST_CT : */
-
-/* Request:
- * This message requests that a CT Request be performed with the
- * indicated N_Port_ID. The driver is responsible for logging in with
- * the fabric and/or N_Port_ID, etc as per FC rules. This request does
- * not mandate that the driver must enumerate the destination in the
- * transport. The driver is allowed to decide whether to enumerate it,
- * and whether to tear it down after the request.
- */
-struct fc_bsg_host_ct {
-	uint8_t		reserved;
-
-	/* FC Address Identier of the remote port to send the ELS to */
-	uint8_t		port_id[3];
-
-	/*
-	 * We need words 0-2 of the generic preamble for the LLD's
-	 */
-	uint32_t	preamble_word0;	/* revision & IN_ID */
-	uint32_t	preamble_word1;	/* GS_Type, GS_SubType, Options, Rsvd */
-	uint32_t	preamble_word2;	/* Cmd Code, Max Size */
-
-};
-/* Response:
- *
- * The reply structure is an fc_bsg_ctels_reply structure
- */
-
-
-/* FC_BSG_HST_VENDOR : */
-
-/* Request:
- * Note: When specifying vendor_id, be sure to read the Vendor Type and ID
- *   formatting requirements specified in scsi_netlink.h
- */
-struct fc_bsg_host_vendor {
-	/*
-	 * Identifies the vendor that the message is formatted for. This
-	 * should be the recipient of the message.
-	 */
-	uint64_t vendor_id;
-
-	/* start of vendor command area */
-	uint32_t vendor_cmd[0];
-};
-
-/* Response:
- */
-struct fc_bsg_host_vendor_reply {
-	/* start of vendor response area */
-	uint32_t vendor_rsp[0];
-};
-
-
-
-/*
- * FC Remote Port Messages
- */
-
-/* FC_BSG_RPT_ELS : */
-
-/* Request:
- * This message requests that an ELS be performed with the rport.
- */
-struct fc_bsg_rport_els {
-	/*
-	 * ELS Command Code being sent (must be the same as
-	 * byte 0 of the payload)
-	 */
-	uint8_t els_code;
-};
-
-/* Response:
- *
- * The reply structure is an fc_bsg_ctels_reply structure
- */
-
-
-/* FC_BSG_RPT_CT : */
-
-/* Request:
- * This message requests that a CT Request be performed with the rport.
- */
-struct fc_bsg_rport_ct {
-	/*
-	 * We need words 0-2 of the generic preamble for the LLD's
-	 */
-	uint32_t	preamble_word0;	/* revision & IN_ID */
-	uint32_t	preamble_word1;	/* GS_Type, GS_SubType, Options, Rsvd */
-	uint32_t	preamble_word2;	/* Cmd Code, Max Size */
-};
-/* Response:
- *
- * The reply structure is an fc_bsg_ctels_reply structure
- */
-
-
-
-
-/* request (CDB) structure of the sg_io_v4 */
-struct fc_bsg_request {
-	uint32_t msgcode;
-	union {
-		struct fc_bsg_host_add_rport	h_addrport;
-		struct fc_bsg_host_del_rport	h_delrport;
-		struct fc_bsg_host_els		h_els;
-		struct fc_bsg_host_ct		h_ct;
-		struct fc_bsg_host_vendor	h_vendor;
-
-		struct fc_bsg_rport_els		r_els;
-		struct fc_bsg_rport_ct		r_ct;
-	} rqst_data;
-} __attribute__((packed));
-
-
-/* response (request sense data) structure of the sg_io_v4 */
-struct fc_bsg_reply {
-	/*
-	 * The completion result. Result exists in two forms:
-	 *  if negative, it is an -Exxx system errno value. There will
-	 *    be no further reply information supplied.
-	 *  else, it's the 4-byte scsi error result, with driver, host,
-	 *    msg and status fields. The per-msgcode reply structure
-	 *    will contain valid data.
-	 */
-	uint32_t result;
-
-	/* If there was reply_payload, how much was recevied ? */
-	uint32_t reply_payload_rcv_len;
-
-	union {
-		struct fc_bsg_host_vendor_reply		vendor_reply;
-
-		struct fc_bsg_ctels_reply		ctels_reply;
-	} reply_data;
-};
-
-
-#endif /* SCSI_BSG_FC_H */
-
diff --git a/openflow/usr/include/scsi/scsi_ioctl.h b/openflow/usr/include/scsi/scsi_ioctl.h
deleted file mode 100644
index 529aade..0000000
--- a/openflow/usr/include/scsi/scsi_ioctl.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 1999-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SCSI_IOCTL_H
-#define _SCSI_IOCTL_H
-
-/* IOCTLs for SCSI.  */
-#define SCSI_IOCTL_SEND_COMMAND		1	/* Send a command to the SCSI host.  */
-#define SCSI_IOCTL_TEST_UNIT_READY	2	/* Test if unit is ready.  */
-#define SCSI_IOCTL_BENCHMARK_COMMAND	3
-#define SCSI_IOCTL_SYNC			4	/* Request synchronous parameters.  */
-#define SCSI_IOCTL_START_UNIT		5
-#define SCSI_IOCTL_STOP_UNIT		6
-#define SCSI_IOCTL_DOORLOCK		0x5380	/* Lock the eject mechanism.  */
-#define SCSI_IOCTL_DOORUNLOCK		0x5381	/* Unlock the mechanism.  */
-
-#endif
diff --git a/openflow/usr/include/scsi/scsi_netlink.h b/openflow/usr/include/scsi/scsi_netlink.h
deleted file mode 100644
index 62b4eda..0000000
--- a/openflow/usr/include/scsi/scsi_netlink.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *  SCSI Transport Netlink Interface
- *    Used for the posting of outbound SCSI transport events
- *
- *  Copyright (C) 2006   James Smart, Emulex Corporation
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#ifndef SCSI_NETLINK_H
-#define SCSI_NETLINK_H
-
-#include <linux/netlink.h>
-#include <linux/types.h>
-
-/*
- * This file intended to be included by both kernel and user space
- */
-
-/* Single Netlink Message type to send all SCSI Transport messages */
-#define SCSI_TRANSPORT_MSG		NLMSG_MIN_TYPE + 1
-
-/* SCSI Transport Broadcast Groups */
-	/* leaving groups 0 and 1 unassigned */
-#define SCSI_NL_GRP_FC_EVENTS		(1<<2)		/* Group 2 */
-#define SCSI_NL_GRP_CNT			3
-
-
-/* SCSI_TRANSPORT_MSG event message header */
-struct scsi_nl_hdr {
-	uint8_t version;
-	uint8_t transport;
-	uint16_t magic;
-	uint16_t msgtype;
-	uint16_t msglen;
-} __attribute__((aligned(sizeof(uint64_t))));
-
-/* scsi_nl_hdr->version value */
-#define SCSI_NL_VERSION				1
-
-/* scsi_nl_hdr->magic value */
-#define SCSI_NL_MAGIC				0xA1B2
-
-/* scsi_nl_hdr->transport value */
-#define SCSI_NL_TRANSPORT			0
-#define SCSI_NL_TRANSPORT_FC			1
-#define SCSI_NL_MAX_TRANSPORTS			2
-
-/* Transport-based scsi_nl_hdr->msgtype values are defined in each transport */
-
-/*
- * GENERIC SCSI scsi_nl_hdr->msgtype Values
- */
-	/* kernel -> user */
-#define SCSI_NL_SHOST_VENDOR			0x0001
-	/* user -> kernel */
-/* SCSI_NL_SHOST_VENDOR msgtype is kernel->user and user->kernel */
-
-
-/*
- * Message Structures :
- */
-
-/* macro to round up message lengths to 8byte boundary */
-#define SCSI_NL_MSGALIGN(len)		(((len) + 7) & ~7)
-
-
-/*
- * SCSI HOST Vendor Unique messages :
- *   SCSI_NL_SHOST_VENDOR
- *
- * Note: The Vendor Unique message payload will begin directly after
- * 	 this structure, with the length of the payload per vmsg_datalen.
- *
- * Note: When specifying vendor_id, be sure to read the Vendor Type and ID
- *   formatting requirements specified below
- */
-struct scsi_nl_host_vendor_msg {
-	struct scsi_nl_hdr snlh;		/* must be 1st element ! */
-	uint64_t vendor_id;
-	uint16_t host_no;
-	uint16_t vmsg_datalen;
-} __attribute__((aligned(sizeof(uint64_t))));
-
-
-/*
- * Vendor ID:
- *   If transports post vendor-unique events, they must pass a well-known
- *   32-bit vendor identifier. This identifier consists of 8 bits indicating
- *   the "type" of identifier contained, and 24 bits of id data.
- *
- *   Identifiers for each type:
- *    PCI :  ID data is the 16 bit PCI Registered Vendor ID
- */
-#define SCSI_NL_VID_TYPE_SHIFT		56
-#define SCSI_NL_VID_TYPE_MASK		((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
-#define SCSI_NL_VID_TYPE_PCI		((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
-#define SCSI_NL_VID_ID_MASK		(~ SCSI_NL_VID_TYPE_MASK)
-
-
-#define INIT_SCSI_NL_HDR(hdr, t, mtype, mlen)			\
-	{							\
-	(hdr)->version = SCSI_NL_VERSION;			\
-	(hdr)->transport = t;					\
-	(hdr)->magic = SCSI_NL_MAGIC;				\
-	(hdr)->msgtype = mtype;					\
-	(hdr)->msglen = mlen;					\
-	}
-
-#endif /* SCSI_NETLINK_H */
-
diff --git a/openflow/usr/include/scsi/scsi_netlink_fc.h b/openflow/usr/include/scsi/scsi_netlink_fc.h
deleted file mode 100644
index cbf76e4..0000000
--- a/openflow/usr/include/scsi/scsi_netlink_fc.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  FC Transport Netlink Interface
- *
- *  Copyright (C) 2006   James Smart, Emulex Corporation
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#ifndef SCSI_NETLINK_FC_H
-#define SCSI_NETLINK_FC_H
-
-#include <scsi/scsi_netlink.h>
-
-/*
- * This file intended to be included by both kernel and user space
- */
-
-/*
- * FC Transport Message Types
- */
-	/* kernel -> user */
-#define FC_NL_ASYNC_EVENT			0x0100
-	/* user -> kernel */
-/* none */
-
-
-/*
- * Message Structures :
- */
-
-/* macro to round up message lengths to 8byte boundary */
-#define FC_NL_MSGALIGN(len)		(((len) + 7) & ~7)
-
-
-/*
- * FC Transport Broadcast Event Message :
- *   FC_NL_ASYNC_EVENT
- *
- * Note: if Vendor Unique message, &event_data will be  start of
- * 	 vendor unique payload, and the length of the payload is
- *       per event_datalen
- *
- * Note: When specifying vendor_id, be sure to read the Vendor Type and ID
- *   formatting requirements specified in scsi_netlink.h
- */
-struct fc_nl_event {
-	struct scsi_nl_hdr snlh;		/* must be 1st element ! */
-	uint64_t seconds;
-	uint64_t vendor_id;
-	uint16_t host_no;
-	uint16_t event_datalen;
-	uint32_t event_num;
-	uint32_t event_code;
-	uint32_t event_data;
-} __attribute__((aligned(sizeof(uint64_t))));
-
-
-#endif /* SCSI_NETLINK_FC_H */
-
diff --git a/openflow/usr/include/scsi/sg.h b/openflow/usr/include/scsi/sg.h
deleted file mode 100644
index e3b1c6a..0000000
--- a/openflow/usr/include/scsi/sg.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
-   History:
-    Started: Aug 9 by Lawrence Foard (entropy@world.std.com), to allow user
-     process control of SCSI devices.
-    Development Sponsored by Killy Corp. NY NY
-*/
-
-#ifndef _SCSI_SG_H
-#define _SCSI_SG_H	1
-
-#include <features.h>
-#define __need_size_t
-#include <stddef.h>
-
-
-/* New interface introduced in the 3.x SG drivers follows */
-
-/* Same structure as used by readv() Linux system call. It defines one
-   scatter-gather element. */
-typedef struct sg_iovec
-{
-  void * iov_base;            /* Starting address  */
-  size_t iov_len;             /* Length in bytes  */
-} sg_iovec_t;
-
-
-typedef struct sg_io_hdr
-{
-  int interface_id;           /* [i] 'S' for SCSI generic (required) */
-  int dxfer_direction;        /* [i] data transfer direction  */
-  unsigned char cmd_len;      /* [i] SCSI command length ( <= 16 bytes) */
-  unsigned char mx_sb_len;    /* [i] max length to write to sbp */
-  unsigned short int iovec_count; /* [i] 0 implies no scatter gather */
-  unsigned int dxfer_len;     /* [i] byte count of data transfer */
-  void * dxferp;              /* [i], [*io] points to data transfer memory
-				 or scatter gather list */
-  unsigned char * cmdp;       /* [i], [*i] points to command to perform */
-  unsigned char * sbp;        /* [i], [*o] points to sense_buffer memory */
-  unsigned int timeout;       /* [i] MAX_UINT->no timeout (unit: millisec) */
-  unsigned int flags;         /* [i] 0 -> default, see SG_FLAG... */
-  int pack_id;                /* [i->o] unused internally (normally) */
-  void * usr_ptr;             /* [i->o] unused internally */
-  unsigned char status;       /* [o] scsi status */
-  unsigned char masked_status;/* [o] shifted, masked scsi status */
-  unsigned char msg_status;   /* [o] messaging level data (optional) */
-  unsigned char sb_len_wr;    /* [o] byte count actually written to sbp */
-  unsigned short int host_status; /* [o] errors from host adapter */
-  unsigned short int driver_status;/* [o] errors from software driver */
-  int resid;                  /* [o] dxfer_len - actual_transferred */
-  unsigned int duration;      /* [o] time taken by cmd (unit: millisec) */
-  unsigned int info;          /* [o] auxiliary information */
-} sg_io_hdr_t;
-
-
-/* Use negative values to flag difference from original sg_header structure.  */
-#define SG_DXFER_NONE -1        /* e.g. a SCSI Test Unit Ready command */
-#define SG_DXFER_TO_DEV -2      /* e.g. a SCSI WRITE command */
-#define SG_DXFER_FROM_DEV -3    /* e.g. a SCSI READ command */
-#define SG_DXFER_TO_FROM_DEV -4 /* treated like SG_DXFER_FROM_DEV with the
-				   additional property than during indirect
-				   IO the user buffer is copied into the
-				   kernel buffers before the transfer */
-
-
-/* following flag values can be "or"-ed together */
-#define SG_FLAG_DIRECT_IO 1     /* default is indirect IO */
-#define SG_FLAG_LUN_INHIBIT 2   /* default is to put device's lun into */
-				/* the 2nd byte of SCSI command */
-#define SG_FLAG_NO_DXFER 0x10000 /* no transfer of kernel buffers to/from */
-				/* user space (debug indirect IO) */
-
-/* The following 'info' values are "or"-ed together.  */
-#define SG_INFO_OK_MASK	0x1
-#define SG_INFO_OK	0x0	/* no sense, host nor driver "noise" */
-#define SG_INFO_CHECK	0x1     /* something abnormal happened */
-
-#define SG_INFO_DIRECT_IO_MASK	0x6
-#define SG_INFO_INDIRECT_IO 	0x0	/* data xfer via kernel buffers (or no xfer) */
-#define SG_INFO_DIRECT_IO 	0x2	/* direct IO requested and performed */
-#define SG_INFO_MIXED_IO 	0x4	/* part direct, part indirect IO */
-
-
-/* Request information about a specific SG device, used by
-   SG_GET_SCSI_ID ioctl ().  */
-struct sg_scsi_id {
-  /* Host number as in "scsi<n>" where 'n' is one of 0, 1, 2 etc.  */
-  int host_no;
-  int channel;
-  /* SCSI id of target device.  */
-  int scsi_id;
-  int lun;
-  /* TYPE_... defined in <scsi/scsi.h>.  */
-  int scsi_type;
-  /* Host (adapter) maximum commands per lun.  */
-  short int h_cmd_per_lun;
-  /* Device (or adapter) maximum queue length.  */
-  short int d_queue_depth;
-  /* Unused, set to 0 for now.  */
-  int unused[2];
-};
-
-/* Used by SG_GET_REQUEST_TABLE ioctl().  */
-typedef struct sg_req_info {
-    char req_state;     /* 0 -> not used, 1 -> written, 2 -> ready to read */
-    char orphan;        /* 0 -> normal request, 1 -> from interruped SG_IO */
-    char sg_io_owned;   /* 0 -> complete with read(), 1 -> owned by SG_IO */
-    char problem;       /* 0 -> no problem detected, 1 -> error to report */
-    int pack_id;        /* pack_id associated with request */
-    void * usr_ptr;     /* user provided pointer (in new interface) */
-    unsigned int duration; /* millisecs elapsed since written (req_state==1)
-			      or request duration (req_state==2) */
-    int unused;
-} sg_req_info_t;
-
-
-/* IOCTLs: Those ioctls that are relevant to the SG 3.x drivers follow.
- [Those that only apply to the SG 2.x drivers are at the end of the file.]
- (_GET_s yield result via 'int *' 3rd argument unless otherwise indicated) */
-
-#define SG_EMULATED_HOST 0x2203 /* true for emulated host adapter (ATAPI) */
-
-/* Used to configure SCSI command transformation layer for ATAPI devices */
-/* Only supported by the ide-scsi driver */
-#define SG_SET_TRANSFORM 0x2204 /* N.B. 3rd arg is not pointer but value: */
-		      /* 3rd arg = 0 to disable transform, 1 to enable it */
-#define SG_GET_TRANSFORM 0x2205
-
-#define SG_SET_RESERVED_SIZE 0x2275  /* request a new reserved buffer size */
-#define SG_GET_RESERVED_SIZE 0x2272  /* actual size of reserved buffer */
-
-/* The following ioctl has a 'sg_scsi_id_t *' object as its 3rd argument. */
-#define SG_GET_SCSI_ID 0x2276   /* Yields fd's bus, chan, dev, lun + type */
-/* SCSI id information can also be obtained from SCSI_IOCTL_GET_IDLUN */
-
-/* Override host setting and always DMA using low memory ( <16MB on i386) */
-#define SG_SET_FORCE_LOW_DMA 0x2279  /* 0-> use adapter setting, 1-> force */
-#define SG_GET_LOW_DMA 0x227a   /* 0-> use all ram for dma; 1-> low dma ram */
-
-/* When SG_SET_FORCE_PACK_ID set to 1, pack_id is input to read() which
-   tries to fetch a packet with a matching pack_id, waits, or returns EAGAIN.
-   If pack_id is -1 then read oldest waiting. When ...FORCE_PACK_ID set to 0
-   then pack_id ignored by read() and oldest readable fetched. */
-#define SG_SET_FORCE_PACK_ID 0x227b
-#define SG_GET_PACK_ID 0x227c /* Yields oldest readable pack_id (or -1) */
-
-#define SG_GET_NUM_WAITING 0x227d /* Number of commands awaiting read() */
-
-/* Yields max scatter gather tablesize allowed by current host adapter */
-#define SG_GET_SG_TABLESIZE 0x227F  /* 0 implies can't do scatter gather */
-
-#define SG_GET_VERSION_NUM 0x2282 /* Example: version 2.1.34 yields 20134 */
-
-/* Returns -EBUSY if occupied. 3rd argument pointer to int (see next) */
-#define SG_SCSI_RESET 0x2284
-/* Associated values that can be given to SG_SCSI_RESET follow */
-#define SG_SCSI_RESET_NOTHING	0
-#define SG_SCSI_RESET_DEVICE	1
-#define SG_SCSI_RESET_BUS	2
-#define SG_SCSI_RESET_HOST	3
-
-/* synchronous SCSI command ioctl, (only in version 3 interface) */
-#define SG_IO 0x2285   /* similar effect as write() followed by read() */
-
-#define SG_GET_REQUEST_TABLE 0x2286   /* yields table of active requests */
-
-/* How to treat EINTR during SG_IO ioctl(), only in SG 3.x series */
-#define SG_SET_KEEP_ORPHAN 0x2287 /* 1 -> hold for read(), 0 -> drop (def) */
-#define SG_GET_KEEP_ORPHAN 0x2288
-
-
-#define SG_SCATTER_SZ (8 * 4096)  /* PAGE_SIZE not available to user */
-/* Largest size (in bytes) a single scatter-gather list element can have.
-   The value must be a power of 2 and <= (PAGE_SIZE * 32) [131072 bytes on
-   i386]. The minimum value is PAGE_SIZE. If scatter-gather not supported
-   by adapter then this value is the largest data block that can be
-   read/written by a single scsi command. The user can find the value of
-   PAGE_SIZE by calling getpagesize() defined in unistd.h . */
-
-#define SG_DEFAULT_RETRIES 1
-
-/* Defaults, commented if they differ from original sg driver */
-#define SG_DEF_FORCE_LOW_DMA 0  /* was 1 -> memory below 16MB on i386 */
-#define SG_DEF_FORCE_PACK_ID 0
-#define SG_DEF_KEEP_ORPHAN 0
-#define SG_DEF_RESERVED_SIZE SG_SCATTER_SZ /* load time option */
-
-/* maximum outstanding requests, write() yields EDOM if exceeded */
-#define SG_MAX_QUEUE 16
-
-#define SG_BIG_BUFF SG_DEF_RESERVED_SIZE    /* for backward compatibility */
-
-/* Alternate style type names, "..._t" variants preferred */
-typedef struct sg_io_hdr Sg_io_hdr;
-typedef struct sg_io_vec Sg_io_vec;
-typedef struct sg_scsi_id Sg_scsi_id;
-typedef struct sg_req_info Sg_req_info;
-
-
-/* vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv */
-/*   The older SG interface based on the 'sg_header' structure follows.   */
-/* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
-
-#define SG_MAX_SENSE 16   /* this only applies to the sg_header interface */
-
-struct sg_header
- {
-   /* Length of incoming packet (including header).  */
-   int pack_len;
-   /* Maximal length of expected reply.  */
-   int reply_len;
-   /* Id number of packet.  */
-   int pack_id;
-   /* 0==ok, otherwise error number.  */
-   int result;
-   /* Force 12 byte command length for group 6 & 7 commands.  */
-   unsigned int twelve_byte:1;
-   /* SCSI status from target.  */
-   unsigned int target_status:5;
-   /* Host status (see "DID" codes).  */
-   unsigned int host_status:8;
-   /* Driver status+suggestion.  */
-   unsigned int driver_status:8;
-   /* Unused.  */
-   unsigned int other_flags:10;
-   /* Output in 3 cases:
-      when target_status is CHECK_CONDITION or
-      when target_status is COMMAND_TERMINATED or
-      when (driver_status & DRIVER_SENSE) is true.  */
-   unsigned char sense_buffer[SG_MAX_SENSE];
- };
-
-
-/* IOCTLs: The following are not required (or ignored) when the sg_io_hdr_t
-	   interface is used. They are kept for backward compatibility with
-	   the original and version 2 drivers. */
-
-#define SG_SET_TIMEOUT		0x2201	/* Set timeout; *(int *)arg==timeout.  */
-#define SG_GET_TIMEOUT		0x2202	/* Get timeout; return timeout.  */
-
-/* Get/set command queuing state per fd (default is SG_DEF_COMMAND_Q). */
-#define SG_GET_COMMAND_Q	0x2270	/* Yields 0 (queuing off) or 1 (on).  */
-#define SG_SET_COMMAND_Q 	0x2271	/* Change queuing state with 0 or 1.  */
-
-/* Turn on error sense trace (1..8), dump this device to log/console (9)
-   or dump all sg device states ( >9 ) to log/console.  */
-#define SG_SET_DEBUG		0x227e	/* 0 -> turn off debug */
-
-#define SG_NEXT_CMD_LEN		0x2283	/* Override SCSI command length with given
-					   number on the next write() on this file
-					   descriptor.  */
-
-/* Defaults, commented if they differ from original sg driver */
-#define SG_DEFAULT_TIMEOUT (60*HZ) /* HZ == 'jiffies in 1 second' */
-#define SG_DEF_COMMAND_Q 0     /* command queuing is always on when
-				  the new interface is used */
-#define SG_DEF_UNDERRUN_FLAG 0
-
-
-#endif	/* scsi/sg.h */
diff --git a/openflow/usr/include/search.h b/openflow/usr/include/search.h
deleted file mode 100644
index bbf4b1d..0000000
--- a/openflow/usr/include/search.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Declarations for System V style searching functions.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SEARCH_H
-#define	_SEARCH_H 1
-
-#include <features.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-__BEGIN_DECLS
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-/* Prototype structure for a linked-list data structure.
-   This is the type used by the `insque' and `remque' functions.  */
-
-# ifdef __USE_GNU
-struct qelem
-  {
-    struct qelem *q_forw;
-    struct qelem *q_back;
-    char q_data[1];
-  };
-# endif
-
-
-/* Insert ELEM into a doubly-linked list, after PREV.  */
-extern void insque (void *__elem, void *__prev) __THROW;
-
-/* Unlink ELEM from the doubly-linked list that it is in.  */
-extern void remque (void *__elem) __THROW;
-#endif
-
-
-/* For use with hsearch(3).  */
-#ifndef __COMPAR_FN_T
-# define __COMPAR_FN_T
-typedef int (*__compar_fn_t) (const void *, const void *);
-
-# ifdef	__USE_GNU
-typedef __compar_fn_t comparison_fn_t;
-# endif
-#endif
-
-/* Action which shall be performed in the call the hsearch.  */
-typedef enum
-  {
-    FIND,
-    ENTER
-  }
-ACTION;
-
-typedef struct entry
-  {
-    char *key;
-    void *data;
-  }
-ENTRY;
-
-/* Opaque type for internal use.  */
-struct _ENTRY;
-
-/* Family of hash table handling functions.  The functions also
-   have reentrant counterparts ending with _r.  The non-reentrant
-   functions all work on a signle internal hashing table.  */
-
-/* Search for entry matching ITEM.key in internal hash table.  If
-   ACTION is `FIND' return found entry or signal error by returning
-   NULL.  If ACTION is `ENTER' replace existing data (if any) with
-   ITEM.data.  */
-extern ENTRY *hsearch (ENTRY __item, ACTION __action) __THROW;
-
-/* Create a new hashing table which will at most contain NEL elements.  */
-extern int hcreate (size_t __nel) __THROW;
-
-/* Destroy current internal hashing table.  */
-extern void hdestroy (void) __THROW;
-
-#ifdef __USE_GNU
-/* Data type for reentrant functions.  */
-struct hsearch_data
-  {
-    struct _ENTRY *table;
-    unsigned int size;
-    unsigned int filled;
-  };
-
-/* Reentrant versions which can handle multiple hashing tables at the
-   same time.  */
-extern int hsearch_r (ENTRY __item, ACTION __action, ENTRY **__retval,
-		      struct hsearch_data *__htab) __THROW;
-extern int hcreate_r (size_t __nel, struct hsearch_data *__htab) __THROW;
-extern void hdestroy_r (struct hsearch_data *__htab) __THROW;
-#endif
-
-
-/* The tsearch routines are very interesting. They make many
-   assumptions about the compiler.  It assumes that the first field
-   in node must be the "key" field, which points to the datum.
-   Everything depends on that.  */
-/* For tsearch */
-typedef enum
-{
-  preorder,
-  postorder,
-  endorder,
-  leaf
-}
-VISIT;
-
-/* Search for an entry matching the given KEY in the tree pointed to
-   by *ROOTP and insert a new element if not found.  */
-extern void *tsearch (const void *__key, void **__rootp,
-		      __compar_fn_t __compar);
-
-/* Search for an entry matching the given KEY in the tree pointed to
-   by *ROOTP.  If no matching entry is available return NULL.  */
-extern void *tfind (const void *__key, void *const *__rootp,
-		    __compar_fn_t __compar);
-
-/* Remove the element matching KEY from the tree pointed to by *ROOTP.  */
-extern void *tdelete (const void *__restrict __key,
-		      void **__restrict __rootp,
-		      __compar_fn_t __compar);
-
-#ifndef __ACTION_FN_T
-# define __ACTION_FN_T
-typedef void (*__action_fn_t) (const void *__nodep, VISIT __value,
-			       int __level);
-#endif
-
-/* Walk through the whole tree and call the ACTION callback for every node
-   or leaf.  */
-extern void twalk (const void *__root, __action_fn_t __action);
-
-#ifdef __USE_GNU
-/* Callback type for function to free a tree node.  If the keys are atomic
-   data this function should do nothing.  */
-typedef void (*__free_fn_t) (void *__nodep);
-
-/* Destroy the whole tree, call FREEFCT for each node or leaf.  */
-extern void tdestroy (void *__root, __free_fn_t __freefct);
-#endif
-
-
-/* Perform linear search for KEY by comparing by COMPAR in an array
-   [BASE,BASE+NMEMB*SIZE).  */
-extern void *lfind (const void *__key, const void *__base,
-		    size_t *__nmemb, size_t __size, __compar_fn_t __compar);
-
-/* Perform linear search for KEY by comparing by COMPAR function in
-   array [BASE,BASE+NMEMB*SIZE) and insert entry if not found.  */
-extern void *lsearch (const void *__key, void *__base,
-		      size_t *__nmemb, size_t __size, __compar_fn_t __compar);
-
-__END_DECLS
-
-#endif /* search.h */
diff --git a/openflow/usr/include/semaphore.h b/openflow/usr/include/semaphore.h
deleted file mode 100644
index 9927db7..0000000
--- a/openflow/usr/include/semaphore.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright (C) 2002-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _SEMAPHORE_H
-#define _SEMAPHORE_H	1
-
-#include <features.h>
-#include <sys/types.h>
-#ifdef __USE_XOPEN2K
-# define __need_timespec
-# include <time.h>
-#endif
-
-/* Get the definition for sem_t.  */
-#include <bits/semaphore.h>
-
-
-__BEGIN_DECLS
-
-/* Initialize semaphore object SEM to VALUE.  If PSHARED then share it
-   with other processes.  */
-extern int sem_init (sem_t *__sem, int __pshared, unsigned int __value)
-     __THROW;
-/* Free resources associated with semaphore object SEM.  */
-extern int sem_destroy (sem_t *__sem) __THROW;
-
-/* Open a named semaphore NAME with open flags OFLAG.  */
-extern sem_t *sem_open (const char *__name, int __oflag, ...) __THROW;
-
-/* Close descriptor for named semaphore SEM.  */
-extern int sem_close (sem_t *__sem) __THROW;
-
-/* Remove named semaphore NAME.  */
-extern int sem_unlink (const char *__name) __THROW;
-
-/* Wait for SEM being posted.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int sem_wait (sem_t *__sem);
-
-#ifdef __USE_XOPEN2K
-/* Similar to `sem_wait' but wait only until ABSTIME.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int sem_timedwait (sem_t *__restrict __sem,
-			  const struct timespec *__restrict __abstime);
-#endif
-
-/* Test whether SEM is posted.  */
-extern int sem_trywait (sem_t *__sem) __THROWNL;
-
-/* Post SEM.  */
-extern int sem_post (sem_t *__sem) __THROWNL;
-
-/* Get current value of SEM and store it in *SVAL.  */
-extern int sem_getvalue (sem_t *__restrict __sem, int *__restrict __sval)
-     __THROW;
-
-
-__END_DECLS
-
-#endif	/* semaphore.h */
diff --git a/openflow/usr/include/setjmp.h b/openflow/usr/include/setjmp.h
deleted file mode 100644
index ccfb70a..0000000
--- a/openflow/usr/include/setjmp.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.13 Nonlocal jumps	<setjmp.h>
- */
-
-#ifndef	_SETJMP_H
-#define	_SETJMP_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#include <bits/setjmp.h>		/* Get `__jmp_buf'.  */
-#include <bits/sigset.h>		/* Get `__sigset_t'.  */
-
-
-/* Calling environment, plus possibly a saved signal mask.  */
-struct __jmp_buf_tag
-  {
-    /* NOTE: The machine-dependent definitions of `__sigsetjmp'
-       assume that a `jmp_buf' begins with a `__jmp_buf' and that
-       `__mask_was_saved' follows it.  Do not move these members
-       or add others before it.  */
-    __jmp_buf __jmpbuf;		/* Calling environment.  */
-    int __mask_was_saved;	/* Saved the signal mask?  */
-    __sigset_t __saved_mask;	/* Saved signal mask.  */
-  };
-
-
-__BEGIN_NAMESPACE_STD
-
-typedef struct __jmp_buf_tag jmp_buf[1];
-
-/* Store the calling environment in ENV, also saving the signal mask.
-   Return 0.  */
-extern int setjmp (jmp_buf __env) __THROWNL;
-
-__END_NAMESPACE_STD
-
-/* Store the calling environment in ENV, also saving the
-   signal mask if SAVEMASK is nonzero.  Return 0.
-   This is the internal name for `sigsetjmp'.  */
-extern int __sigsetjmp (struct __jmp_buf_tag __env[1], int __savemask) __THROWNL;
-
-/* Store the calling environment in ENV, not saving the signal mask.
-   Return 0.  */
-extern int _setjmp (struct __jmp_buf_tag __env[1]) __THROWNL;
-
-/* Do not save the signal mask.  This is equivalent to the `_setjmp'
-   BSD function.  */
-#define setjmp(env)	_setjmp (env)
-
-
-__BEGIN_NAMESPACE_STD
-
-/* Jump to the environment saved in ENV, making the
-   `setjmp' call there return VAL, or 1 if VAL is 0.  */
-extern void longjmp (struct __jmp_buf_tag __env[1], int __val)
-     __THROWNL __attribute__ ((__noreturn__));
-
-__END_NAMESPACE_STD
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* Same.  Usually `_longjmp' is used with `_setjmp', which does not save
-   the signal mask.  But it is how ENV was saved that determines whether
-   `longjmp' restores the mask; `_longjmp' is just an alias.  */
-extern void _longjmp (struct __jmp_buf_tag __env[1], int __val)
-     __THROWNL __attribute__ ((__noreturn__));
-#endif
-
-
-#ifdef	__USE_POSIX
-/* Use the same type for `jmp_buf' and `sigjmp_buf'.
-   The `__mask_was_saved' flag determines whether
-   or not `longjmp' will restore the signal mask.  */
-typedef struct __jmp_buf_tag sigjmp_buf[1];
-
-/* Store the calling environment in ENV, also saving the
-   signal mask if SAVEMASK is nonzero.  Return 0.  */
-# define sigsetjmp(env, savemask)	__sigsetjmp (env, savemask)
-
-/* Jump to the environment saved in ENV, making the
-   sigsetjmp call there return VAL, or 1 if VAL is 0.
-   Restore the signal mask if that sigsetjmp call saved it.
-   This is just an alias `longjmp'.  */
-extern void siglongjmp (sigjmp_buf __env, int __val)
-     __THROWNL __attribute__ ((__noreturn__));
-#endif /* Use POSIX.  */
-
-
-/* Define helper functions to catch unsafe code.  */
-#if __USE_FORTIFY_LEVEL > 0
-# include <bits/setjmp2.h>
-#endif
-
-__END_DECLS
-
-#endif /* setjmp.h  */
diff --git a/openflow/usr/include/sgtty.h b/openflow/usr/include/sgtty.h
deleted file mode 100644
index 121cd26..0000000
--- a/openflow/usr/include/sgtty.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SGTTY_H
-#define	_SGTTY_H	1
-
-#include <features.h>
-
-#include <sys/ioctl.h>
-
-/* On some systems this type is not defined by <bits/ioctl-types.h>;
-   in that case, the functions are just stubs that return ENOSYS.  */
-struct sgttyb;
-
-__BEGIN_DECLS
-
-/* Fill in *PARAMS with terminal parameters associated with FD.  */
-extern int gtty (int __fd, struct sgttyb *__params) __THROW;
-
-/* Set the terminal parameters associated with FD to *PARAMS.  */
-extern int stty (int __fd, const struct sgttyb *__params) __THROW;
-
-
-__END_DECLS
-
-#endif /* sgtty.h  */
diff --git a/openflow/usr/include/shadow.h b/openflow/usr/include/shadow.h
deleted file mode 100644
index 010949f..0000000
--- a/openflow/usr/include/shadow.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Declaration of types and functions for shadow password suite.  */
-
-#ifndef _SHADOW_H
-#define _SHADOW_H	1
-
-#include <features.h>
-
-#include <paths.h>
-
-#define	__need_FILE
-#include <stdio.h>
-#define __need_size_t
-#include <stddef.h>
-
-/* Paths to the user database files.  */
-#define	SHADOW _PATH_SHADOW
-
-
-__BEGIN_DECLS
-
-/* Structure of the password file.  */
-struct spwd
-  {
-    char *sp_namp;		/* Login name.  */
-    char *sp_pwdp;		/* Encrypted password.  */
-    long int sp_lstchg;		/* Date of last change.  */
-    long int sp_min;		/* Minimum number of days between changes.  */
-    long int sp_max;		/* Maximum number of days between changes.  */
-    long int sp_warn;		/* Number of days to warn user to change
-				   the password.  */
-    long int sp_inact;		/* Number of days the account may be
-				   inactive.  */
-    long int sp_expire;		/* Number of days since 1970-01-01 until
-				   account expires.  */
-    unsigned long int sp_flag;	/* Reserved.  */
-  };
-
-
-/* Open database for reading.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern void setspent (void);
-
-/* Close database.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern void endspent (void);
-
-/* Get next entry from database, perhaps after opening the file.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct spwd *getspent (void);
-
-/* Get shadow entry matching NAME.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct spwd *getspnam (const char *__name);
-
-/* Read shadow entry from STRING.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct spwd *sgetspent (const char *__string);
-
-/* Read next shadow entry from STREAM.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern struct spwd *fgetspent (FILE *__stream);
-
-/* Write line containing shadow password entry to stream.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int putspent (const struct spwd *__p, FILE *__stream);
-
-
-#ifdef __USE_MISC
-/* Reentrant versions of some of the functions above.
-
-   These functions are not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation they are cancellation points and
-   therefore not marked with __THROW.  */
-extern int getspent_r (struct spwd *__result_buf, char *__buffer,
-		       size_t __buflen, struct spwd **__result);
-
-extern int getspnam_r (const char *__name, struct spwd *__result_buf,
-		       char *__buffer, size_t __buflen,
-		       struct spwd **__result);
-
-extern int sgetspent_r (const char *__string, struct spwd *__result_buf,
-			char *__buffer, size_t __buflen,
-			struct spwd **__result);
-
-extern int fgetspent_r (FILE *__stream, struct spwd *__result_buf,
-			char *__buffer, size_t __buflen,
-			struct spwd **__result);
-#endif	/* misc */
-
-
-/* The simple locking functionality provided here is not suitable for
-   multi-threaded applications.  */
-
-/* Protect password file against multi writers.  */
-extern int lckpwdf (void) __THROW;
-
-/* Unlock password file.  */
-extern int ulckpwdf (void) __THROW;
-
-__END_DECLS
-
-#endif /* shadow.h */
diff --git a/openflow/usr/include/signal.h b/openflow/usr/include/signal.h
deleted file mode 100644
index 47e995a..0000000
--- a/openflow/usr/include/signal.h
+++ /dev/null
@@ -1,377 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.14 Signal handling <signal.h>
- */
-
-#ifndef	_SIGNAL_H
-
-#if !defined __need_sig_atomic_t && !defined __need_sigset_t
-# define _SIGNAL_H
-#endif
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#include <bits/sigset.h>		/* __sigset_t, __sig_atomic_t.  */
-
-/* An integral type that can be modified atomically, without the
-   possibility of a signal arriving in the middle of the operation.  */
-#if defined __need_sig_atomic_t || defined _SIGNAL_H
-# ifndef __sig_atomic_t_defined
-#  define __sig_atomic_t_defined
-__BEGIN_NAMESPACE_STD
-typedef __sig_atomic_t sig_atomic_t;
-__END_NAMESPACE_STD
-# endif
-# undef __need_sig_atomic_t
-#endif
-
-#if defined __need_sigset_t || (defined _SIGNAL_H && defined __USE_POSIX)
-# ifndef __sigset_t_defined
-#  define __sigset_t_defined
-typedef __sigset_t sigset_t;
-# endif
-# undef __need_sigset_t
-#endif
-
-#ifdef _SIGNAL_H
-
-#include <bits/types.h>
-#include <bits/signum.h>
-
-#if defined __USE_XOPEN || defined __USE_XOPEN2K
-# ifndef __pid_t_defined
-typedef __pid_t pid_t;
-#  define __pid_t_defined
-#endif
-#ifdef __USE_XOPEN
-# endif
-# ifndef __uid_t_defined
-typedef __uid_t uid_t;
-#  define __uid_t_defined
-# endif
-#endif	/* Unix98 */
-
-#ifdef __USE_POSIX199309
-/* We need `struct timespec' later on.  */
-# define __need_timespec
-# include <time.h>
-#endif
-
-#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED
-/* Get the `siginfo_t' type plus the needed symbols.  */
-# include <bits/siginfo.h>
-#endif
-
-
-/* Type of a signal handler.  */
-typedef void (*__sighandler_t) (int);
-
-/* The X/Open definition of `signal' specifies the SVID semantic.  Use
-   the additional function `sysv_signal' when X/Open compatibility is
-   requested.  */
-extern __sighandler_t __sysv_signal (int __sig, __sighandler_t __handler)
-     __THROW;
-#ifdef __USE_GNU
-extern __sighandler_t sysv_signal (int __sig, __sighandler_t __handler)
-     __THROW;
-#endif
-
-/* Set the handler for the signal SIG to HANDLER, returning the old
-   handler, or SIG_ERR on error.
-   By default `signal' has the BSD semantic.  */
-__BEGIN_NAMESPACE_STD
-#ifdef __USE_MISC
-extern __sighandler_t signal (int __sig, __sighandler_t __handler)
-     __THROW;
-#else
-/* Make sure the used `signal' implementation is the SVID version. */
-# ifdef __REDIRECT_NTH
-extern __sighandler_t __REDIRECT_NTH (signal,
-				      (int __sig, __sighandler_t __handler),
-				      __sysv_signal);
-# else
-#  define signal __sysv_signal
-# endif
-#endif
-__END_NAMESPACE_STD
-
-#ifdef __USE_XOPEN
-/* The X/Open definition of `signal' conflicts with the BSD version.
-   So they defined another function `bsd_signal'.  */
-extern __sighandler_t bsd_signal (int __sig, __sighandler_t __handler)
-     __THROW;
-#endif
-
-/* Send signal SIG to process number PID.  If PID is zero,
-   send SIG to all processes in the current process's process group.
-   If PID is < -1, send SIG to all processes in process group - PID.  */
-#ifdef __USE_POSIX
-extern int kill (__pid_t __pid, int __sig) __THROW;
-#endif /* Use POSIX.  */
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-/* Send SIG to all processes in process group PGRP.
-   If PGRP is zero, send SIG to all processes in
-   the current process's process group.  */
-extern int killpg (__pid_t __pgrp, int __sig) __THROW;
-#endif /* Use misc || X/Open Unix.  */
-
-__BEGIN_NAMESPACE_STD
-/* Raise signal SIG, i.e., send SIG to yourself.  */
-extern int raise (int __sig) __THROW;
-__END_NAMESPACE_STD
-
-#ifdef __USE_MISC
-/* SVID names for the same things.  */
-extern __sighandler_t ssignal (int __sig, __sighandler_t __handler)
-     __THROW;
-extern int gsignal (int __sig) __THROW;
-#endif /* Use misc.  */
-
-#ifdef __USE_XOPEN2K8
-/* Print a message describing the meaning of the given signal number.  */
-extern void psignal (int __sig, const char *__s);
-
-/* Print a message describing the meaning of the given signal information.  */
-extern void psiginfo (const siginfo_t *__pinfo, const char *__s);
-#endif /* POSIX 2008.  */
-
-
-
-/* The `sigpause' function in X/Open defines the argument as the
-   signal number.  This requires redirecting to another function
-   because the default version in glibc uses an old BSD interface.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-
-#ifdef __USE_XOPEN
-# ifdef __GNUC__
-extern int sigpause (int __sig) __asm__ ("__xpg_sigpause");
-# else
-extern int __sigpause (int __sig_or_mask, int __is_sig);
-/* Remove a signal from the signal mask and suspend the process.  */
-#  define sigpause(sig) __sigpause ((sig), 1)
-# endif
-#endif
-
-
-#ifdef __USE_MISC
-/* None of the following functions should be used anymore.  They are here
-   only for compatibility.  A single word (`int') is not guaranteed to be
-   enough to hold a complete signal mask and therefore these functions
-   simply do not work in many situations.  Use `sigprocmask' instead.  */
-
-/* Compute mask for signal SIG.  */
-# define sigmask(sig)	__sigmask(sig)
-
-/* Block signals in MASK, returning the old mask.  */
-extern int sigblock (int __mask) __THROW __attribute_deprecated__;
-
-/* Set the mask of blocked signals to MASK, returning the old mask.  */
-extern int sigsetmask (int __mask) __THROW __attribute_deprecated__;
-
-/* Return currently selected signal mask.  */
-extern int siggetmask (void) __THROW __attribute_deprecated__;
-#endif /* Use misc.  */
-
-
-#ifdef __USE_MISC
-# define NSIG	_NSIG
-#endif
-
-#ifdef __USE_GNU
-typedef __sighandler_t sighandler_t;
-#endif
-
-/* 4.4 BSD uses the name `sig_t' for this.  */
-#ifdef __USE_MISC
-typedef __sighandler_t sig_t;
-#endif
-
-#ifdef __USE_POSIX
-
-/* Clear all signals from SET.  */
-extern int sigemptyset (sigset_t *__set) __THROW __nonnull ((1));
-
-/* Set all signals in SET.  */
-extern int sigfillset (sigset_t *__set) __THROW __nonnull ((1));
-
-/* Add SIGNO to SET.  */
-extern int sigaddset (sigset_t *__set, int __signo) __THROW __nonnull ((1));
-
-/* Remove SIGNO from SET.  */
-extern int sigdelset (sigset_t *__set, int __signo) __THROW __nonnull ((1));
-
-/* Return 1 if SIGNO is in SET, 0 if not.  */
-extern int sigismember (const sigset_t *__set, int __signo)
-     __THROW __nonnull ((1));
-
-# ifdef __USE_GNU
-/* Return non-empty value is SET is not empty.  */
-extern int sigisemptyset (const sigset_t *__set) __THROW __nonnull ((1));
-
-/* Build new signal set by combining the two inputs set using logical AND.  */
-extern int sigandset (sigset_t *__set, const sigset_t *__left,
-		      const sigset_t *__right) __THROW __nonnull ((1, 2, 3));
-
-/* Build new signal set by combining the two inputs set using logical OR.  */
-extern int sigorset (sigset_t *__set, const sigset_t *__left,
-		     const sigset_t *__right) __THROW __nonnull ((1, 2, 3));
-# endif /* GNU */
-
-/* Get the system-specific definitions of `struct sigaction'
-   and the `SA_*' and `SIG_*'. constants.  */
-# include <bits/sigaction.h>
-
-/* Get and/or change the set of blocked signals.  */
-extern int sigprocmask (int __how, const sigset_t *__restrict __set,
-			sigset_t *__restrict __oset) __THROW;
-
-/* Change the set of blocked signals to SET,
-   wait until a signal arrives, and restore the set of blocked signals.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int sigsuspend (const sigset_t *__set) __nonnull ((1));
-
-/* Get and/or set the action for signal SIG.  */
-extern int sigaction (int __sig, const struct sigaction *__restrict __act,
-		      struct sigaction *__restrict __oact) __THROW;
-
-/* Put in SET all signals that are blocked and waiting to be delivered.  */
-extern int sigpending (sigset_t *__set) __THROW __nonnull ((1));
-
-
-/* Select any of pending signals from SET or wait for any to arrive.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int sigwait (const sigset_t *__restrict __set, int *__restrict __sig)
-     __nonnull ((1, 2));
-
-# ifdef __USE_POSIX199309
-/* Select any of pending signals from SET and place information in INFO.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int sigwaitinfo (const sigset_t *__restrict __set,
-			siginfo_t *__restrict __info) __nonnull ((1));
-
-/* Select any of pending signals from SET and place information in INFO.
-   Wait the time specified by TIMEOUT if no signal is pending.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int sigtimedwait (const sigset_t *__restrict __set,
-			 siginfo_t *__restrict __info,
-			 const struct timespec *__restrict __timeout)
-     __nonnull ((1));
-
-/* Send signal SIG to the process PID.  Associate data in VAL with the
-   signal.  */
-extern int sigqueue (__pid_t __pid, int __sig, const union sigval __val)
-     __THROW;
-# endif	/* Use POSIX 199306.  */
-
-#endif /* Use POSIX.  */
-
-#ifdef __USE_MISC
-
-/* Names of the signals.  This variable exists only for compatibility.
-   Use `strsignal' instead (see <string.h>).  */
-extern const char *const _sys_siglist[_NSIG];
-extern const char *const sys_siglist[_NSIG];
-
-
-/* Get machine-dependent `struct sigcontext' and signal subcodes.  */
-# include <bits/sigcontext.h>
-
-/* Restore the state saved in SCP.  */
-extern int sigreturn (struct sigcontext *__scp) __THROW;
-
-#endif /* Use misc.  */
-
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-# define __need_size_t
-# include <stddef.h>
-
-/* If INTERRUPT is nonzero, make signal SIG interrupt system calls
-   (causing them to fail with EINTR); if INTERRUPT is zero, make system
-   calls be restarted after signal SIG.  */
-extern int siginterrupt (int __sig, int __interrupt) __THROW;
-
-# include <bits/sigstack.h>
-# if defined __USE_XOPEN || defined __USE_XOPEN2K8
-/* This will define `ucontext_t' and `mcontext_t'.  */
-#  include <sys/ucontext.h>
-# endif
-
-/* Run signals handlers on the stack specified by SS (if not NULL).
-   If OSS is not NULL, it is filled in with the old signal stack status.
-   This interface is obsolete and on many platform not implemented.  */
-extern int sigstack (struct sigstack *__ss, struct sigstack *__oss)
-     __THROW __attribute_deprecated__;
-
-/* Alternate signal handler stack interface.
-   This interface should always be preferred over `sigstack'.  */
-extern int sigaltstack (const struct sigaltstack *__restrict __ss,
-			struct sigaltstack *__restrict __oss) __THROW;
-
-#endif /* Use POSIX.1-2008 or X/Open Unix.  */
-
-#ifdef __USE_XOPEN_EXTENDED
-/* Simplified interface for signal management.  */
-
-/* Add SIG to the calling process' signal mask.  */
-extern int sighold (int __sig) __THROW;
-
-/* Remove SIG from the calling process' signal mask.  */
-extern int sigrelse (int __sig) __THROW;
-
-/* Set the disposition of SIG to SIG_IGN.  */
-extern int sigignore (int __sig) __THROW;
-
-/* Set the disposition of SIG.  */
-extern __sighandler_t sigset (int __sig, __sighandler_t __disp) __THROW;
-#endif
-
-#if defined __USE_POSIX199506 || defined __USE_UNIX98
-/* Some of the functions for handling signals in threaded programs must
-   be defined here.  */
-# include <bits/pthreadtypes.h>
-# include <bits/sigthread.h>
-#endif /* use Unix98 */
-
-/* The following functions are used internally in the C library and in
-   other code which need deep insights.  */
-
-/* Return number of available real-time signal with highest priority.  */
-extern int __libc_current_sigrtmin (void) __THROW;
-/* Return number of available real-time signal with lowest priority.  */
-extern int __libc_current_sigrtmax (void) __THROW;
-
-#endif /* signal.h  */
-
-__END_DECLS
-
-#endif /* not signal.h */
diff --git a/openflow/usr/include/sound/asequencer.h b/openflow/usr/include/sound/asequencer.h
deleted file mode 100644
index 71f9079..0000000
--- a/openflow/usr/include/sound/asequencer.h
+++ /dev/null
@@ -1,615 +0,0 @@
-/*
- *  Main header file for the ALSA sequencer
- *  Copyright (c) 1998-1999 by Frank van de Pol <fvdpol@coil.demon.nl>
- *            (c) 1998-1999 by Jaroslav Kysela <perex@perex.cz>
- *
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-#ifndef __SOUND_ASEQUENCER_H
-#define __SOUND_ASEQUENCER_H
-
-#include <sound/asound.h>
-
-/** version of the sequencer */
-#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1)
-
-/**
- * definition of sequencer event types
- */
-
-/** system messages
- * event data type = #snd_seq_result
- */
-#define SNDRV_SEQ_EVENT_SYSTEM		0
-#define SNDRV_SEQ_EVENT_RESULT		1
-
-/** note messages (channel specific)
- * event data type = #snd_seq_ev_note
- */
-#define SNDRV_SEQ_EVENT_NOTE		5
-#define SNDRV_SEQ_EVENT_NOTEON		6
-#define SNDRV_SEQ_EVENT_NOTEOFF		7
-#define SNDRV_SEQ_EVENT_KEYPRESS	8
-	
-/** control messages (channel specific)
- * event data type = #snd_seq_ev_ctrl
- */
-#define SNDRV_SEQ_EVENT_CONTROLLER	10
-#define SNDRV_SEQ_EVENT_PGMCHANGE	11
-#define SNDRV_SEQ_EVENT_CHANPRESS	12
-#define SNDRV_SEQ_EVENT_PITCHBEND	13	/**< from -8192 to 8191 */
-#define SNDRV_SEQ_EVENT_CONTROL14	14	/**< 14 bit controller value */
-#define SNDRV_SEQ_EVENT_NONREGPARAM	15	/**< 14 bit NRPN address + 14 bit unsigned value */
-#define SNDRV_SEQ_EVENT_REGPARAM	16	/**< 14 bit RPN address + 14 bit unsigned value */
-
-/** synchronisation messages
- * event data type = #snd_seq_ev_ctrl
- */
-#define SNDRV_SEQ_EVENT_SONGPOS		20	/* Song Position Pointer with LSB and MSB values */
-#define SNDRV_SEQ_EVENT_SONGSEL		21	/* Song Select with song ID number */
-#define SNDRV_SEQ_EVENT_QFRAME		22	/* midi time code quarter frame */
-#define SNDRV_SEQ_EVENT_TIMESIGN	23	/* SMF Time Signature event */
-#define SNDRV_SEQ_EVENT_KEYSIGN		24	/* SMF Key Signature event */
-	        
-/** timer messages
- * event data type = snd_seq_ev_queue_control
- */
-#define SNDRV_SEQ_EVENT_START		30	/* midi Real Time Start message */
-#define SNDRV_SEQ_EVENT_CONTINUE	31	/* midi Real Time Continue message */
-#define SNDRV_SEQ_EVENT_STOP		32	/* midi Real Time Stop message */	
-#define	SNDRV_SEQ_EVENT_SETPOS_TICK	33	/* set tick queue position */
-#define SNDRV_SEQ_EVENT_SETPOS_TIME	34	/* set realtime queue position */
-#define SNDRV_SEQ_EVENT_TEMPO		35	/* (SMF) Tempo event */
-#define SNDRV_SEQ_EVENT_CLOCK		36	/* midi Real Time Clock message */
-#define SNDRV_SEQ_EVENT_TICK		37	/* midi Real Time Tick message */
-#define SNDRV_SEQ_EVENT_QUEUE_SKEW	38	/* skew queue tempo */
-
-/** others
- * event data type = none
- */
-#define SNDRV_SEQ_EVENT_TUNE_REQUEST	40	/* tune request */
-#define SNDRV_SEQ_EVENT_RESET		41	/* reset to power-on state */
-#define SNDRV_SEQ_EVENT_SENSING		42	/* "active sensing" event */
-
-/** echo back, kernel private messages
- * event data type = any type
- */
-#define SNDRV_SEQ_EVENT_ECHO		50	/* echo event */
-#define SNDRV_SEQ_EVENT_OSS		51	/* OSS raw event */
-
-/** system status messages (broadcast for subscribers)
- * event data type = snd_seq_addr
- */
-#define SNDRV_SEQ_EVENT_CLIENT_START	60	/* new client has connected */
-#define SNDRV_SEQ_EVENT_CLIENT_EXIT	61	/* client has left the system */
-#define SNDRV_SEQ_EVENT_CLIENT_CHANGE	62	/* client status/info has changed */
-#define SNDRV_SEQ_EVENT_PORT_START	63	/* new port was created */
-#define SNDRV_SEQ_EVENT_PORT_EXIT	64	/* port was deleted from system */
-#define SNDRV_SEQ_EVENT_PORT_CHANGE	65	/* port status/info has changed */
-
-/** port connection changes
- * event data type = snd_seq_connect
- */
-#define SNDRV_SEQ_EVENT_PORT_SUBSCRIBED	66	/* ports connected */
-#define SNDRV_SEQ_EVENT_PORT_UNSUBSCRIBED 67	/* ports disconnected */
-
-/* 70-89:  synthesizer events - obsoleted */
-
-/** user-defined events with fixed length
- * event data type = any
- */
-#define SNDRV_SEQ_EVENT_USR0		90
-#define SNDRV_SEQ_EVENT_USR1		91
-#define SNDRV_SEQ_EVENT_USR2		92
-#define SNDRV_SEQ_EVENT_USR3		93
-#define SNDRV_SEQ_EVENT_USR4		94
-#define SNDRV_SEQ_EVENT_USR5		95
-#define SNDRV_SEQ_EVENT_USR6		96
-#define SNDRV_SEQ_EVENT_USR7		97
-#define SNDRV_SEQ_EVENT_USR8		98
-#define SNDRV_SEQ_EVENT_USR9		99
-
-/* 100-118: instrument layer - obsoleted */
-/* 119-129: reserved */
-
-/* 130-139: variable length events
- * event data type = snd_seq_ev_ext
- * (SNDRV_SEQ_EVENT_LENGTH_VARIABLE must be set)
- */
-#define SNDRV_SEQ_EVENT_SYSEX		130	/* system exclusive data (variable length) */
-#define SNDRV_SEQ_EVENT_BOUNCE		131	/* error event */
-/* 132-134: reserved */
-#define SNDRV_SEQ_EVENT_USR_VAR0	135
-#define SNDRV_SEQ_EVENT_USR_VAR1	136
-#define SNDRV_SEQ_EVENT_USR_VAR2	137
-#define SNDRV_SEQ_EVENT_USR_VAR3	138
-#define SNDRV_SEQ_EVENT_USR_VAR4	139
-
-/* 150-151: kernel events with quote - DO NOT use in user clients */
-#define SNDRV_SEQ_EVENT_KERNEL_ERROR	150
-#define SNDRV_SEQ_EVENT_KERNEL_QUOTE	151	/* obsolete */
-
-/* 152-191: reserved */
-
-/* 192-254: hardware specific events */
-
-/* 255: special event */
-#define SNDRV_SEQ_EVENT_NONE		255
-
-
-typedef unsigned char snd_seq_event_type_t;
-
-/** event address */
-struct snd_seq_addr {
-	unsigned char client;	/**< Client number:         0..255, 255 = broadcast to all clients */
-	unsigned char port;	/**< Port within client:    0..255, 255 = broadcast to all ports */
-};
-
-/** port connection */
-struct snd_seq_connect {
-	struct snd_seq_addr sender;
-	struct snd_seq_addr dest;
-};
-
-
-#define SNDRV_SEQ_ADDRESS_UNKNOWN	253	/* unknown source */
-#define SNDRV_SEQ_ADDRESS_SUBSCRIBERS	254	/* send event to all subscribed ports */
-#define SNDRV_SEQ_ADDRESS_BROADCAST	255	/* send event to all queues/clients/ports/channels */
-#define SNDRV_SEQ_QUEUE_DIRECT		253	/* direct dispatch */
-
-	/* event mode flag - NOTE: only 8 bits available! */
-#define SNDRV_SEQ_TIME_STAMP_TICK	(0<<0) /* timestamp in clock ticks */
-#define SNDRV_SEQ_TIME_STAMP_REAL	(1<<0) /* timestamp in real time */
-#define SNDRV_SEQ_TIME_STAMP_MASK	(1<<0)
-
-#define SNDRV_SEQ_TIME_MODE_ABS		(0<<1)	/* absolute timestamp */
-#define SNDRV_SEQ_TIME_MODE_REL		(1<<1)	/* relative to current time */
-#define SNDRV_SEQ_TIME_MODE_MASK	(1<<1)
-
-#define SNDRV_SEQ_EVENT_LENGTH_FIXED	(0<<2)	/* fixed event size */
-#define SNDRV_SEQ_EVENT_LENGTH_VARIABLE	(1<<2)	/* variable event size */
-#define SNDRV_SEQ_EVENT_LENGTH_VARUSR	(2<<2)	/* variable event size - user memory space */
-#define SNDRV_SEQ_EVENT_LENGTH_MASK	(3<<2)
-
-#define SNDRV_SEQ_PRIORITY_NORMAL	(0<<4)	/* normal priority */
-#define SNDRV_SEQ_PRIORITY_HIGH		(1<<4)	/* event should be processed before others */
-#define SNDRV_SEQ_PRIORITY_MASK		(1<<4)
-
-
-	/* note event */
-struct snd_seq_ev_note {
-	unsigned char channel;
-	unsigned char note;
-	unsigned char velocity;
-	unsigned char off_velocity;	/* only for SNDRV_SEQ_EVENT_NOTE */
-	unsigned int duration;		/* only for SNDRV_SEQ_EVENT_NOTE */
-};
-
-	/* controller event */
-struct snd_seq_ev_ctrl {
-	unsigned char channel;
-	unsigned char unused1, unused2, unused3;	/* pad */
-	unsigned int param;
-	signed int value;
-};
-
-	/* generic set of bytes (12x8 bit) */
-struct snd_seq_ev_raw8 {
-	unsigned char d[12];	/* 8 bit value */
-};
-
-	/* generic set of integers (3x32 bit) */
-struct snd_seq_ev_raw32 {
-	unsigned int d[3];	/* 32 bit value */
-};
-
-	/* external stored data */
-struct snd_seq_ev_ext {
-	unsigned int len;	/* length of data */
-	void *ptr;		/* pointer to data (note: maybe 64-bit) */
-} __attribute__((packed));
-
-struct snd_seq_result {
-	int event;		/* processed event type */
-	int result;
-};
-
-
-struct snd_seq_real_time {
-	unsigned int tv_sec;	/* seconds */
-	unsigned int tv_nsec;	/* nanoseconds */
-};
-
-typedef unsigned int snd_seq_tick_time_t;	/* midi ticks */
-
-union snd_seq_timestamp {
-	snd_seq_tick_time_t tick;
-	struct snd_seq_real_time time;
-};
-
-struct snd_seq_queue_skew {
-	unsigned int value;
-	unsigned int base;
-};
-
-	/* queue timer control */
-struct snd_seq_ev_queue_control {
-	unsigned char queue;			/* affected queue */
-	unsigned char pad[3];			/* reserved */
-	union {
-		signed int value;		/* affected value (e.g. tempo) */
-		union snd_seq_timestamp time;	/* time */
-		unsigned int position;		/* sync position */
-		struct snd_seq_queue_skew skew;
-		unsigned int d32[2];
-		unsigned char d8[8];
-	} param;
-};
-
-	/* quoted event - inside the kernel only */
-struct snd_seq_ev_quote {
-	struct snd_seq_addr origin;		/* original sender */
-	unsigned short value;		/* optional data */
-	struct snd_seq_event *event;		/* quoted event */
-} __attribute__((packed));
-
-
-	/* sequencer event */
-struct snd_seq_event {
-	snd_seq_event_type_t type;	/* event type */
-	unsigned char flags;		/* event flags */
-	char tag;
-	
-	unsigned char queue;		/* schedule queue */
-	union snd_seq_timestamp time;	/* schedule time */
-
-
-	struct snd_seq_addr source;	/* source address */
-	struct snd_seq_addr dest;	/* destination address */
-
-	union {				/* event data... */
-		struct snd_seq_ev_note note;
-		struct snd_seq_ev_ctrl control;
-		struct snd_seq_ev_raw8 raw8;
-		struct snd_seq_ev_raw32 raw32;
-		struct snd_seq_ev_ext ext;
-		struct snd_seq_ev_queue_control queue;
-		union snd_seq_timestamp time;
-		struct snd_seq_addr addr;
-		struct snd_seq_connect connect;
-		struct snd_seq_result result;
-		struct snd_seq_ev_quote quote;
-	} data;
-};
-
-
-/*
- * bounce event - stored as variable size data
- */
-struct snd_seq_event_bounce {
-	int err;
-	struct snd_seq_event event;
-	/* external data follows here. */
-};
-
-
-	/* system information */
-struct snd_seq_system_info {
-	int queues;			/* maximum queues count */
-	int clients;			/* maximum clients count */
-	int ports;			/* maximum ports per client */
-	int channels;			/* maximum channels per port */
-	int cur_clients;		/* current clients */
-	int cur_queues;			/* current queues */
-	char reserved[24];
-};
-
-
-	/* system running information */
-struct snd_seq_running_info {
-	unsigned char client;		/* client id */
-	unsigned char big_endian;	/* 1 = big-endian */
-	unsigned char cpu_mode;		/* 4 = 32bit, 8 = 64bit */
-	unsigned char pad;		/* reserved */
-	unsigned char reserved[12];
-};
-
-
-	/* known client numbers */
-#define SNDRV_SEQ_CLIENT_SYSTEM		0
-	/* internal client numbers */
-#define SNDRV_SEQ_CLIENT_DUMMY		14	/* midi through */
-#define SNDRV_SEQ_CLIENT_OSS		15	/* oss sequencer emulator */
-
-
-	/* client types */
-typedef int __bitwise snd_seq_client_type_t;
-#define	NO_CLIENT	((snd_seq_client_type_t) 0)
-#define	USER_CLIENT	((snd_seq_client_type_t) 1)
-#define	KERNEL_CLIENT	((snd_seq_client_type_t) 2)
-                        
-	/* event filter flags */
-#define SNDRV_SEQ_FILTER_BROADCAST	(1<<0)	/* accept broadcast messages */
-#define SNDRV_SEQ_FILTER_MULTICAST	(1<<1)	/* accept multicast messages */
-#define SNDRV_SEQ_FILTER_BOUNCE		(1<<2)	/* accept bounce event in error */
-#define SNDRV_SEQ_FILTER_USE_EVENT	(1<<31)	/* use event filter */
-
-struct snd_seq_client_info {
-	int client;			/* client number to inquire */
-	snd_seq_client_type_t type;	/* client type */
-	char name[64];			/* client name */
-	unsigned int filter;		/* filter flags */
-	unsigned char multicast_filter[8]; /* multicast filter bitmap */
-	unsigned char event_filter[32];	/* event filter bitmap */
-	int num_ports;			/* RO: number of ports */
-	int event_lost;			/* number of lost events */
-	char reserved[64];		/* for future use */
-};
-
-
-/* client pool size */
-struct snd_seq_client_pool {
-	int client;			/* client number to inquire */
-	int output_pool;		/* outgoing (write) pool size */
-	int input_pool;			/* incoming (read) pool size */
-	int output_room;		/* minimum free pool size for select/blocking mode */
-	int output_free;		/* unused size */
-	int input_free;			/* unused size */
-	char reserved[64];
-};
-
-
-/* Remove events by specified criteria */
-
-#define SNDRV_SEQ_REMOVE_INPUT		(1<<0)	/* Flush input queues */
-#define SNDRV_SEQ_REMOVE_OUTPUT		(1<<1)	/* Flush output queues */
-#define SNDRV_SEQ_REMOVE_DEST		(1<<2)	/* Restrict by destination q:client:port */
-#define SNDRV_SEQ_REMOVE_DEST_CHANNEL	(1<<3)	/* Restrict by channel */
-#define SNDRV_SEQ_REMOVE_TIME_BEFORE	(1<<4)	/* Restrict to before time */
-#define SNDRV_SEQ_REMOVE_TIME_AFTER	(1<<5)	/* Restrict to time or after */
-#define SNDRV_SEQ_REMOVE_TIME_TICK	(1<<6)	/* Time is in ticks */
-#define SNDRV_SEQ_REMOVE_EVENT_TYPE	(1<<7)	/* Restrict to event type */
-#define SNDRV_SEQ_REMOVE_IGNORE_OFF 	(1<<8)	/* Do not flush off events */
-#define SNDRV_SEQ_REMOVE_TAG_MATCH 	(1<<9)	/* Restrict to events with given tag */
-
-struct snd_seq_remove_events {
-	unsigned int  remove_mode;	/* Flags that determine what gets removed */
-
-	union snd_seq_timestamp time;
-
-	unsigned char queue;	/* Queue for REMOVE_DEST */
-	struct snd_seq_addr dest;	/* Address for REMOVE_DEST */
-	unsigned char channel;	/* Channel for REMOVE_DEST */
-
-	int  type;	/* For REMOVE_EVENT_TYPE */
-	char  tag;	/* Tag for REMOVE_TAG */
-
-	int  reserved[10];	/* To allow for future binary compatibility */
-
-};
-
-
-	/* known port numbers */
-#define SNDRV_SEQ_PORT_SYSTEM_TIMER	0
-#define SNDRV_SEQ_PORT_SYSTEM_ANNOUNCE	1
-
-	/* port capabilities (32 bits) */
-#define SNDRV_SEQ_PORT_CAP_READ		(1<<0)	/* readable from this port */
-#define SNDRV_SEQ_PORT_CAP_WRITE	(1<<1)	/* writable to this port */
-
-#define SNDRV_SEQ_PORT_CAP_SYNC_READ	(1<<2)
-#define SNDRV_SEQ_PORT_CAP_SYNC_WRITE	(1<<3)
-
-#define SNDRV_SEQ_PORT_CAP_DUPLEX	(1<<4)
-
-#define SNDRV_SEQ_PORT_CAP_SUBS_READ	(1<<5)	/* allow read subscription */
-#define SNDRV_SEQ_PORT_CAP_SUBS_WRITE	(1<<6)	/* allow write subscription */
-#define SNDRV_SEQ_PORT_CAP_NO_EXPORT	(1<<7)	/* routing not allowed */
-
-	/* port type */
-#define SNDRV_SEQ_PORT_TYPE_SPECIFIC	(1<<0)	/* hardware specific */
-#define SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC (1<<1)	/* generic MIDI device */
-#define SNDRV_SEQ_PORT_TYPE_MIDI_GM	(1<<2)	/* General MIDI compatible device */
-#define SNDRV_SEQ_PORT_TYPE_MIDI_GS	(1<<3)	/* GS compatible device */
-#define SNDRV_SEQ_PORT_TYPE_MIDI_XG	(1<<4)	/* XG compatible device */
-#define SNDRV_SEQ_PORT_TYPE_MIDI_MT32	(1<<5)	/* MT-32 compatible device */
-#define SNDRV_SEQ_PORT_TYPE_MIDI_GM2	(1<<6)	/* General MIDI 2 compatible device */
-
-/* other standards...*/
-#define SNDRV_SEQ_PORT_TYPE_SYNTH	(1<<10)	/* Synth device (no MIDI compatible - direct wavetable) */
-#define SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE (1<<11)	/* Sampling device (support sample download) */
-#define SNDRV_SEQ_PORT_TYPE_SAMPLE	(1<<12)	/* Sampling device (sample can be downloaded at any time) */
-/*...*/
-#define SNDRV_SEQ_PORT_TYPE_HARDWARE	(1<<16)	/* driver for a hardware device */
-#define SNDRV_SEQ_PORT_TYPE_SOFTWARE	(1<<17)	/* implemented in software */
-#define SNDRV_SEQ_PORT_TYPE_SYNTHESIZER	(1<<18)	/* generates sound */
-#define SNDRV_SEQ_PORT_TYPE_PORT	(1<<19)	/* connects to other device(s) */
-#define SNDRV_SEQ_PORT_TYPE_APPLICATION	(1<<20)	/* application (sequencer/editor) */
-
-/* misc. conditioning flags */
-#define SNDRV_SEQ_PORT_FLG_GIVEN_PORT	(1<<0)
-#define SNDRV_SEQ_PORT_FLG_TIMESTAMP	(1<<1)
-#define SNDRV_SEQ_PORT_FLG_TIME_REAL	(1<<2)
-
-struct snd_seq_port_info {
-	struct snd_seq_addr addr;	/* client/port numbers */
-	char name[64];			/* port name */
-
-	unsigned int capability;	/* port capability bits */
-	unsigned int type;		/* port type bits */
-	int midi_channels;		/* channels per MIDI port */
-	int midi_voices;		/* voices per MIDI port */
-	int synth_voices;		/* voices per SYNTH port */
-
-	int read_use;			/* R/O: subscribers for output (from this port) */
-	int write_use;			/* R/O: subscribers for input (to this port) */
-
-	void *kernel;			/* reserved for kernel use (must be NULL) */
-	unsigned int flags;		/* misc. conditioning */
-	unsigned char time_queue;	/* queue # for timestamping */
-	char reserved[59];		/* for future use */
-};
-
-
-/* queue flags */
-#define SNDRV_SEQ_QUEUE_FLG_SYNC	(1<<0)	/* sync enabled */
-
-/* queue information */
-struct snd_seq_queue_info {
-	int queue;		/* queue id */
-
-	/*
-	 *  security settings, only owner of this queue can start/stop timer
-	 *  etc. if the queue is locked for other clients
-	 */
-	int owner;		/* client id for owner of the queue */
-	unsigned locked:1;	/* timing queue locked for other queues */
-	char name[64];		/* name of this queue */
-	unsigned int flags;	/* flags */
-	char reserved[60];	/* for future use */
-
-};
-
-/* queue info/status */
-struct snd_seq_queue_status {
-	int queue;			/* queue id */
-	int events;			/* read-only - queue size */
-	snd_seq_tick_time_t tick;	/* current tick */
-	struct snd_seq_real_time time;	/* current time */
-	int running;			/* running state of queue */
-	int flags;			/* various flags */
-	char reserved[64];		/* for the future */
-};
-
-
-/* queue tempo */
-struct snd_seq_queue_tempo {
-	int queue;			/* sequencer queue */
-	unsigned int tempo;		/* current tempo, us/tick */
-	int ppq;			/* time resolution, ticks/quarter */
-	unsigned int skew_value;	/* queue skew */
-	unsigned int skew_base;		/* queue skew base */
-	char reserved[24];		/* for the future */
-};
-
-
-/* sequencer timer sources */
-#define SNDRV_SEQ_TIMER_ALSA		0	/* ALSA timer */
-#define SNDRV_SEQ_TIMER_MIDI_CLOCK	1	/* Midi Clock (CLOCK event) */
-#define SNDRV_SEQ_TIMER_MIDI_TICK	2	/* Midi Timer Tick (TICK event) */
-
-/* queue timer info */
-struct snd_seq_queue_timer {
-	int queue;			/* sequencer queue */
-	int type;			/* source timer type */
-	union {
-		struct {
-			struct snd_timer_id id;	/* ALSA's timer ID */
-			unsigned int resolution;	/* resolution in Hz */
-		} alsa;
-	} u;
-	char reserved[64];		/* for the future use */
-};
-
-
-struct snd_seq_queue_client {
-	int queue;		/* sequencer queue */
-	int client;		/* sequencer client */
-	int used;		/* queue is used with this client
-				   (must be set for accepting events) */
-	/* per client watermarks */
-	char reserved[64];	/* for future use */
-};
-
-
-#define SNDRV_SEQ_PORT_SUBS_EXCLUSIVE	(1<<0)	/* exclusive connection */
-#define SNDRV_SEQ_PORT_SUBS_TIMESTAMP	(1<<1)
-#define SNDRV_SEQ_PORT_SUBS_TIME_REAL	(1<<2)
-
-struct snd_seq_port_subscribe {
-	struct snd_seq_addr sender;	/* sender address */
-	struct snd_seq_addr dest;	/* destination address */
-	unsigned int voices;		/* number of voices to be allocated (0 = don't care) */
-	unsigned int flags;		/* modes */
-	unsigned char queue;		/* input time-stamp queue (optional) */
-	unsigned char pad[3];		/* reserved */
-	char reserved[64];
-};
-
-/* type of query subscription */
-#define SNDRV_SEQ_QUERY_SUBS_READ	0
-#define SNDRV_SEQ_QUERY_SUBS_WRITE	1
-
-struct snd_seq_query_subs {
-	struct snd_seq_addr root;	/* client/port id to be searched */
-	int type;		/* READ or WRITE */
-	int index;		/* 0..N-1 */
-	int num_subs;		/* R/O: number of subscriptions on this port */
-	struct snd_seq_addr addr;	/* R/O: result */
-	unsigned char queue;	/* R/O: result */
-	unsigned int flags;	/* R/O: result */
-	char reserved[64];	/* for future use */
-};
-
-
-/*
- *  IOCTL commands
- */
-
-#define SNDRV_SEQ_IOCTL_PVERSION	_IOR ('S', 0x00, int)
-#define SNDRV_SEQ_IOCTL_CLIENT_ID	_IOR ('S', 0x01, int)
-#define SNDRV_SEQ_IOCTL_SYSTEM_INFO	_IOWR('S', 0x02, struct snd_seq_system_info)
-#define SNDRV_SEQ_IOCTL_RUNNING_MODE	_IOWR('S', 0x03, struct snd_seq_running_info)
-
-#define SNDRV_SEQ_IOCTL_GET_CLIENT_INFO	_IOWR('S', 0x10, struct snd_seq_client_info)
-#define SNDRV_SEQ_IOCTL_SET_CLIENT_INFO	_IOW ('S', 0x11, struct snd_seq_client_info)
-
-#define SNDRV_SEQ_IOCTL_CREATE_PORT	_IOWR('S', 0x20, struct snd_seq_port_info)
-#define SNDRV_SEQ_IOCTL_DELETE_PORT	_IOW ('S', 0x21, struct snd_seq_port_info)
-#define SNDRV_SEQ_IOCTL_GET_PORT_INFO	_IOWR('S', 0x22, struct snd_seq_port_info)
-#define SNDRV_SEQ_IOCTL_SET_PORT_INFO	_IOW ('S', 0x23, struct snd_seq_port_info)
-
-#define SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT	_IOW ('S', 0x30, struct snd_seq_port_subscribe)
-#define SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT _IOW ('S', 0x31, struct snd_seq_port_subscribe)
-
-#define SNDRV_SEQ_IOCTL_CREATE_QUEUE	_IOWR('S', 0x32, struct snd_seq_queue_info)
-#define SNDRV_SEQ_IOCTL_DELETE_QUEUE	_IOW ('S', 0x33, struct snd_seq_queue_info)
-#define SNDRV_SEQ_IOCTL_GET_QUEUE_INFO	_IOWR('S', 0x34, struct snd_seq_queue_info)
-#define SNDRV_SEQ_IOCTL_SET_QUEUE_INFO	_IOWR('S', 0x35, struct snd_seq_queue_info)
-#define SNDRV_SEQ_IOCTL_GET_NAMED_QUEUE	_IOWR('S', 0x36, struct snd_seq_queue_info)
-#define SNDRV_SEQ_IOCTL_GET_QUEUE_STATUS _IOWR('S', 0x40, struct snd_seq_queue_status)
-#define SNDRV_SEQ_IOCTL_GET_QUEUE_TEMPO	_IOWR('S', 0x41, struct snd_seq_queue_tempo)
-#define SNDRV_SEQ_IOCTL_SET_QUEUE_TEMPO	_IOW ('S', 0x42, struct snd_seq_queue_tempo)
-#define SNDRV_SEQ_IOCTL_GET_QUEUE_OWNER	_IOWR('S', 0x43, struct snd_seq_queue_owner)
-#define SNDRV_SEQ_IOCTL_SET_QUEUE_OWNER	_IOW ('S', 0x44, struct snd_seq_queue_owner)
-#define SNDRV_SEQ_IOCTL_GET_QUEUE_TIMER	_IOWR('S', 0x45, struct snd_seq_queue_timer)
-#define SNDRV_SEQ_IOCTL_SET_QUEUE_TIMER	_IOW ('S', 0x46, struct snd_seq_queue_timer)
-/* XXX
-#define SNDRV_SEQ_IOCTL_GET_QUEUE_SYNC	_IOWR('S', 0x53, struct snd_seq_queue_sync)
-#define SNDRV_SEQ_IOCTL_SET_QUEUE_SYNC	_IOW ('S', 0x54, struct snd_seq_queue_sync)
-*/
-#define SNDRV_SEQ_IOCTL_GET_QUEUE_CLIENT	_IOWR('S', 0x49, struct snd_seq_queue_client)
-#define SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT	_IOW ('S', 0x4a, struct snd_seq_queue_client)
-#define SNDRV_SEQ_IOCTL_GET_CLIENT_POOL	_IOWR('S', 0x4b, struct snd_seq_client_pool)
-#define SNDRV_SEQ_IOCTL_SET_CLIENT_POOL	_IOW ('S', 0x4c, struct snd_seq_client_pool)
-#define SNDRV_SEQ_IOCTL_REMOVE_EVENTS	_IOW ('S', 0x4e, struct snd_seq_remove_events)
-#define SNDRV_SEQ_IOCTL_QUERY_SUBS	_IOWR('S', 0x4f, struct snd_seq_query_subs)
-#define SNDRV_SEQ_IOCTL_GET_SUBSCRIPTION	_IOWR('S', 0x50, struct snd_seq_port_subscribe)
-#define SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT	_IOWR('S', 0x51, struct snd_seq_client_info)
-#define SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT	_IOWR('S', 0x52, struct snd_seq_port_info)
-
-#endif /* __SOUND_ASEQUENCER_H */
diff --git a/openflow/usr/include/sound/asound.h b/openflow/usr/include/sound/asound.h
deleted file mode 100644
index f5f74e9..0000000
--- a/openflow/usr/include/sound/asound.h
+++ /dev/null
@@ -1,1015 +0,0 @@
-/*
- *  Advanced Linux Sound Architecture - ALSA - Driver
- *  Copyright (c) 1994-2003 by Jaroslav Kysela <perex@perex.cz>,
- *                             Abramo Bagnara <abramo@alsa-project.org>
- *
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-
-#ifndef __SOUND_ASOUND_H
-#define __SOUND_ASOUND_H
-
-#include <linux/types.h>
-
-#include <stdlib.h>
-
-/*
- *  protocol version
- */
-
-#define SNDRV_PROTOCOL_VERSION(major, minor, subminor) (((major)<<16)|((minor)<<8)|(subminor))
-#define SNDRV_PROTOCOL_MAJOR(version) (((version)>>16)&0xffff)
-#define SNDRV_PROTOCOL_MINOR(version) (((version)>>8)&0xff)
-#define SNDRV_PROTOCOL_MICRO(version) ((version)&0xff)
-#define SNDRV_PROTOCOL_INCOMPATIBLE(kversion, uversion) \
-	(SNDRV_PROTOCOL_MAJOR(kversion) != SNDRV_PROTOCOL_MAJOR(uversion) || \
-	 (SNDRV_PROTOCOL_MAJOR(kversion) == SNDRV_PROTOCOL_MAJOR(uversion) && \
-	   SNDRV_PROTOCOL_MINOR(kversion) != SNDRV_PROTOCOL_MINOR(uversion)))
-
-/****************************************************************************
- *                                                                          *
- *        Digital audio interface					    *
- *                                                                          *
- ****************************************************************************/
-
-struct snd_aes_iec958 {
-	unsigned char status[24];	/* AES/IEC958 channel status bits */
-	unsigned char subcode[147];	/* AES/IEC958 subcode bits */
-	unsigned char pad;		/* nothing */
-	unsigned char dig_subframe[4];	/* AES/IEC958 subframe bits */
-};
-
-/****************************************************************************
- *                                                                          *
- *        CEA-861 Audio InfoFrame. Used in HDMI and DisplayPort		    *
- *                                                                          *
- ****************************************************************************/
-
-struct snd_cea_861_aud_if {
-	unsigned char db1_ct_cc; /* coding type and channel count */
-	unsigned char db2_sf_ss; /* sample frequency and size */
-	unsigned char db3; /* not used, all zeros */
-	unsigned char db4_ca; /* channel allocation code */
-	unsigned char db5_dminh_lsv; /* downmix inhibit & level-shit values */
-};
-
-/****************************************************************************
- *                                                                          *
- *      Section for driver hardware dependent interface - /dev/snd/hw?      *
- *                                                                          *
- ****************************************************************************/
-
-#define SNDRV_HWDEP_VERSION		SNDRV_PROTOCOL_VERSION(1, 0, 1)
-
-enum {
-	SNDRV_HWDEP_IFACE_OPL2 = 0,
-	SNDRV_HWDEP_IFACE_OPL3,
-	SNDRV_HWDEP_IFACE_OPL4,
-	SNDRV_HWDEP_IFACE_SB16CSP,	/* Creative Signal Processor */
-	SNDRV_HWDEP_IFACE_EMU10K1,	/* FX8010 processor in EMU10K1 chip */
-	SNDRV_HWDEP_IFACE_YSS225,	/* Yamaha FX processor */
-	SNDRV_HWDEP_IFACE_ICS2115,	/* Wavetable synth */
-	SNDRV_HWDEP_IFACE_SSCAPE,	/* Ensoniq SoundScape ISA card (MC68EC000) */
-	SNDRV_HWDEP_IFACE_VX,		/* Digigram VX cards */
-	SNDRV_HWDEP_IFACE_MIXART,	/* Digigram miXart cards */
-	SNDRV_HWDEP_IFACE_USX2Y,	/* Tascam US122, US224 & US428 usb */
-	SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */	
-	SNDRV_HWDEP_IFACE_BLUETOOTH,	/* Bluetooth audio */
-	SNDRV_HWDEP_IFACE_USX2Y_PCM,	/* Tascam US122, US224 & US428 rawusb pcm */
-	SNDRV_HWDEP_IFACE_PCXHR,	/* Digigram PCXHR */
-	SNDRV_HWDEP_IFACE_SB_RC,	/* SB Extigy/Audigy2NX remote control */
-	SNDRV_HWDEP_IFACE_HDA,		/* HD-audio */
-	SNDRV_HWDEP_IFACE_USB_STREAM,	/* direct access to usb stream */
-	SNDRV_HWDEP_IFACE_FW_DICE,	/* TC DICE FireWire device */
-	SNDRV_HWDEP_IFACE_FW_FIREWORKS,	/* Echo Audio Fireworks based device */
-	SNDRV_HWDEP_IFACE_FW_BEBOB,	/* BridgeCo BeBoB based device */
-	SNDRV_HWDEP_IFACE_FW_OXFW,	/* Oxford OXFW970/971 based device */
-	SNDRV_HWDEP_IFACE_FW_DIGI00X,	/* Digidesign Digi 002/003 family */
-	SNDRV_HWDEP_IFACE_FW_TASCAM,	/* TASCAM FireWire series */
-
-	/* Don't forget to change the following: */
-	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_TASCAM
-};
-
-struct snd_hwdep_info {
-	unsigned int device;		/* WR: device number */
-	int card;			/* R: card number */
-	unsigned char id[64];		/* ID (user selectable) */
-	unsigned char name[80];		/* hwdep name */
-	int iface;			/* hwdep interface */
-	unsigned char reserved[64];	/* reserved for future */
-};
-
-/* generic DSP loader */
-struct snd_hwdep_dsp_status {
-	unsigned int version;		/* R: driver-specific version */
-	unsigned char id[32];		/* R: driver-specific ID string */
-	unsigned int num_dsps;		/* R: number of DSP images to transfer */
-	unsigned int dsp_loaded;	/* R: bit flags indicating the loaded DSPs */
-	unsigned int chip_ready;	/* R: 1 = initialization finished */
-	unsigned char reserved[16];	/* reserved for future use */
-};
-
-struct snd_hwdep_dsp_image {
-	unsigned int index;		/* W: DSP index */
-	unsigned char name[64];		/* W: ID (e.g. file name) */
-	unsigned char *image;	/* W: binary image */
-	size_t length;			/* W: size of image in bytes */
-	unsigned long driver_data;	/* W: driver-specific data */
-};
-
-#define SNDRV_HWDEP_IOCTL_PVERSION	_IOR ('H', 0x00, int)
-#define SNDRV_HWDEP_IOCTL_INFO		_IOR ('H', 0x01, struct snd_hwdep_info)
-#define SNDRV_HWDEP_IOCTL_DSP_STATUS	_IOR('H', 0x02, struct snd_hwdep_dsp_status)
-#define SNDRV_HWDEP_IOCTL_DSP_LOAD	_IOW('H', 0x03, struct snd_hwdep_dsp_image)
-
-/*****************************************************************************
- *                                                                           *
- *             Digital Audio (PCM) interface - /dev/snd/pcm??                *
- *                                                                           *
- *****************************************************************************/
-
-#define SNDRV_PCM_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 13)
-
-typedef unsigned long snd_pcm_uframes_t;
-typedef signed long snd_pcm_sframes_t;
-
-enum {
-	SNDRV_PCM_CLASS_GENERIC = 0,	/* standard mono or stereo device */
-	SNDRV_PCM_CLASS_MULTI,		/* multichannel device */
-	SNDRV_PCM_CLASS_MODEM,		/* software modem class */
-	SNDRV_PCM_CLASS_DIGITIZER,	/* digitizer class */
-	/* Don't forget to change the following: */
-	SNDRV_PCM_CLASS_LAST = SNDRV_PCM_CLASS_DIGITIZER,
-};
-
-enum {
-	SNDRV_PCM_SUBCLASS_GENERIC_MIX = 0, /* mono or stereo subdevices are mixed together */
-	SNDRV_PCM_SUBCLASS_MULTI_MIX,	/* multichannel subdevices are mixed together */
-	/* Don't forget to change the following: */
-	SNDRV_PCM_SUBCLASS_LAST = SNDRV_PCM_SUBCLASS_MULTI_MIX,
-};
-
-enum {
-	SNDRV_PCM_STREAM_PLAYBACK = 0,
-	SNDRV_PCM_STREAM_CAPTURE,
-	SNDRV_PCM_STREAM_LAST = SNDRV_PCM_STREAM_CAPTURE,
-};
-
-typedef int __bitwise snd_pcm_access_t;
-#define	SNDRV_PCM_ACCESS_MMAP_INTERLEAVED	((snd_pcm_access_t) 0) /* interleaved mmap */
-#define	SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED	((snd_pcm_access_t) 1) /* noninterleaved mmap */
-#define	SNDRV_PCM_ACCESS_MMAP_COMPLEX		((snd_pcm_access_t) 2) /* complex mmap */
-#define	SNDRV_PCM_ACCESS_RW_INTERLEAVED		((snd_pcm_access_t) 3) /* readi/writei */
-#define	SNDRV_PCM_ACCESS_RW_NONINTERLEAVED	((snd_pcm_access_t) 4) /* readn/writen */
-#define	SNDRV_PCM_ACCESS_LAST		SNDRV_PCM_ACCESS_RW_NONINTERLEAVED
-
-typedef int __bitwise snd_pcm_format_t;
-#define	SNDRV_PCM_FORMAT_S8	((snd_pcm_format_t) 0)
-#define	SNDRV_PCM_FORMAT_U8	((snd_pcm_format_t) 1)
-#define	SNDRV_PCM_FORMAT_S16_LE	((snd_pcm_format_t) 2)
-#define	SNDRV_PCM_FORMAT_S16_BE	((snd_pcm_format_t) 3)
-#define	SNDRV_PCM_FORMAT_U16_LE	((snd_pcm_format_t) 4)
-#define	SNDRV_PCM_FORMAT_U16_BE	((snd_pcm_format_t) 5)
-#define	SNDRV_PCM_FORMAT_S24_LE	((snd_pcm_format_t) 6) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_S24_BE	((snd_pcm_format_t) 7) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_U24_LE	((snd_pcm_format_t) 8) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_U24_BE	((snd_pcm_format_t) 9) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_S32_LE	((snd_pcm_format_t) 10)
-#define	SNDRV_PCM_FORMAT_S32_BE	((snd_pcm_format_t) 11)
-#define	SNDRV_PCM_FORMAT_U32_LE	((snd_pcm_format_t) 12)
-#define	SNDRV_PCM_FORMAT_U32_BE	((snd_pcm_format_t) 13)
-#define	SNDRV_PCM_FORMAT_FLOAT_LE	((snd_pcm_format_t) 14) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_FLOAT_BE	((snd_pcm_format_t) 15) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_FLOAT64_LE	((snd_pcm_format_t) 16) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_FLOAT64_BE	((snd_pcm_format_t) 17) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE ((snd_pcm_format_t) 18) /* IEC-958 subframe, Little Endian */
-#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE ((snd_pcm_format_t) 19) /* IEC-958 subframe, Big Endian */
-#define	SNDRV_PCM_FORMAT_MU_LAW		((snd_pcm_format_t) 20)
-#define	SNDRV_PCM_FORMAT_A_LAW		((snd_pcm_format_t) 21)
-#define	SNDRV_PCM_FORMAT_IMA_ADPCM	((snd_pcm_format_t) 22)
-#define	SNDRV_PCM_FORMAT_MPEG		((snd_pcm_format_t) 23)
-#define	SNDRV_PCM_FORMAT_GSM		((snd_pcm_format_t) 24)
-#define	SNDRV_PCM_FORMAT_SPECIAL	((snd_pcm_format_t) 31)
-#define	SNDRV_PCM_FORMAT_S24_3LE	((snd_pcm_format_t) 32)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S24_3BE	((snd_pcm_format_t) 33)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U24_3LE	((snd_pcm_format_t) 34)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U24_3BE	((snd_pcm_format_t) 35)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S20_3LE	((snd_pcm_format_t) 36)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S20_3BE	((snd_pcm_format_t) 37)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U20_3LE	((snd_pcm_format_t) 38)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U20_3BE	((snd_pcm_format_t) 39)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S18_3LE	((snd_pcm_format_t) 40)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S18_3BE	((snd_pcm_format_t) 41)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U18_3LE	((snd_pcm_format_t) 42)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U18_3BE	((snd_pcm_format_t) 43)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_G723_24	((snd_pcm_format_t) 44) /* 8 samples in 3 bytes */
-#define	SNDRV_PCM_FORMAT_G723_24_1B	((snd_pcm_format_t) 45) /* 1 sample in 1 byte */
-#define	SNDRV_PCM_FORMAT_G723_40	((snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
-#define	SNDRV_PCM_FORMAT_G723_40_1B	((snd_pcm_format_t) 47) /* 1 sample in 1 byte */
-#define	SNDRV_PCM_FORMAT_DSD_U8		((snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */
-#define	SNDRV_PCM_FORMAT_DSD_U16_LE	((snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */
-#define	SNDRV_PCM_FORMAT_DSD_U32_LE	((snd_pcm_format_t) 50) /* DSD, 4-byte samples DSD (x32), little endian */
-#define	SNDRV_PCM_FORMAT_DSD_U16_BE	((snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */
-#define	SNDRV_PCM_FORMAT_DSD_U32_BE	((snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */
-#define	SNDRV_PCM_FORMAT_LAST		SNDRV_PCM_FORMAT_DSD_U32_BE
-
-#ifdef SNDRV_LITTLE_ENDIAN
-#define	SNDRV_PCM_FORMAT_S16		SNDRV_PCM_FORMAT_S16_LE
-#define	SNDRV_PCM_FORMAT_U16		SNDRV_PCM_FORMAT_U16_LE
-#define	SNDRV_PCM_FORMAT_S24		SNDRV_PCM_FORMAT_S24_LE
-#define	SNDRV_PCM_FORMAT_U24		SNDRV_PCM_FORMAT_U24_LE
-#define	SNDRV_PCM_FORMAT_S32		SNDRV_PCM_FORMAT_S32_LE
-#define	SNDRV_PCM_FORMAT_U32		SNDRV_PCM_FORMAT_U32_LE
-#define	SNDRV_PCM_FORMAT_FLOAT		SNDRV_PCM_FORMAT_FLOAT_LE
-#define	SNDRV_PCM_FORMAT_FLOAT64	SNDRV_PCM_FORMAT_FLOAT64_LE
-#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE
-#endif
-#ifdef SNDRV_BIG_ENDIAN
-#define	SNDRV_PCM_FORMAT_S16		SNDRV_PCM_FORMAT_S16_BE
-#define	SNDRV_PCM_FORMAT_U16		SNDRV_PCM_FORMAT_U16_BE
-#define	SNDRV_PCM_FORMAT_S24		SNDRV_PCM_FORMAT_S24_BE
-#define	SNDRV_PCM_FORMAT_U24		SNDRV_PCM_FORMAT_U24_BE
-#define	SNDRV_PCM_FORMAT_S32		SNDRV_PCM_FORMAT_S32_BE
-#define	SNDRV_PCM_FORMAT_U32		SNDRV_PCM_FORMAT_U32_BE
-#define	SNDRV_PCM_FORMAT_FLOAT		SNDRV_PCM_FORMAT_FLOAT_BE
-#define	SNDRV_PCM_FORMAT_FLOAT64	SNDRV_PCM_FORMAT_FLOAT64_BE
-#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE
-#endif
-
-typedef int __bitwise snd_pcm_subformat_t;
-#define	SNDRV_PCM_SUBFORMAT_STD		((snd_pcm_subformat_t) 0)
-#define	SNDRV_PCM_SUBFORMAT_LAST	SNDRV_PCM_SUBFORMAT_STD
-
-#define SNDRV_PCM_INFO_MMAP		0x00000001	/* hardware supports mmap */
-#define SNDRV_PCM_INFO_MMAP_VALID	0x00000002	/* period data are valid during transfer */
-#define SNDRV_PCM_INFO_DOUBLE		0x00000004	/* Double buffering needed for PCM start/stop */
-#define SNDRV_PCM_INFO_BATCH		0x00000010	/* double buffering */
-#define SNDRV_PCM_INFO_INTERLEAVED	0x00000100	/* channels are interleaved */
-#define SNDRV_PCM_INFO_NONINTERLEAVED	0x00000200	/* channels are not interleaved */
-#define SNDRV_PCM_INFO_COMPLEX		0x00000400	/* complex frame organization (mmap only) */
-#define SNDRV_PCM_INFO_BLOCK_TRANSFER	0x00010000	/* hardware transfer block of samples */
-#define SNDRV_PCM_INFO_OVERRANGE	0x00020000	/* hardware supports ADC (capture) overrange detection */
-#define SNDRV_PCM_INFO_RESUME		0x00040000	/* hardware supports stream resume after suspend */
-#define SNDRV_PCM_INFO_PAUSE		0x00080000	/* pause ioctl is supported */
-#define SNDRV_PCM_INFO_HALF_DUPLEX	0x00100000	/* only half duplex */
-#define SNDRV_PCM_INFO_JOINT_DUPLEX	0x00200000	/* playback and capture stream are somewhat correlated */
-#define SNDRV_PCM_INFO_SYNC_START	0x00400000	/* pcm support some kind of sync go */
-#define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP	0x00800000	/* period wakeup can be disabled */
-#define SNDRV_PCM_INFO_HAS_WALL_CLOCK   0x01000000      /* (Deprecated)has audio wall clock for audio/system time sync */
-#define SNDRV_PCM_INFO_HAS_LINK_ATIME              0x01000000  /* report hardware link audio time, reset on startup */
-#define SNDRV_PCM_INFO_HAS_LINK_ABSOLUTE_ATIME     0x02000000  /* report absolute hardware link audio time, not reset on startup */
-#define SNDRV_PCM_INFO_HAS_LINK_ESTIMATED_ATIME    0x04000000  /* report estimated link audio time */
-#define SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME 0x08000000  /* report synchronized audio/system time */
-
-#define SNDRV_PCM_INFO_DRAIN_TRIGGER	0x40000000		/* internal kernel flag - trigger in drain */
-#define SNDRV_PCM_INFO_FIFO_IN_FRAMES	0x80000000	/* internal kernel flag - FIFO size is in frames */
-
-
-
-typedef int __bitwise snd_pcm_state_t;
-#define	SNDRV_PCM_STATE_OPEN		((snd_pcm_state_t) 0) /* stream is open */
-#define	SNDRV_PCM_STATE_SETUP		((snd_pcm_state_t) 1) /* stream has a setup */
-#define	SNDRV_PCM_STATE_PREPARED	((snd_pcm_state_t) 2) /* stream is ready to start */
-#define	SNDRV_PCM_STATE_RUNNING		((snd_pcm_state_t) 3) /* stream is running */
-#define	SNDRV_PCM_STATE_XRUN		((snd_pcm_state_t) 4) /* stream reached an xrun */
-#define	SNDRV_PCM_STATE_DRAINING	((snd_pcm_state_t) 5) /* stream is draining */
-#define	SNDRV_PCM_STATE_PAUSED		((snd_pcm_state_t) 6) /* stream is paused */
-#define	SNDRV_PCM_STATE_SUSPENDED	((snd_pcm_state_t) 7) /* hardware is suspended */
-#define	SNDRV_PCM_STATE_DISCONNECTED	((snd_pcm_state_t) 8) /* hardware is disconnected */
-#define	SNDRV_PCM_STATE_LAST		SNDRV_PCM_STATE_DISCONNECTED
-
-enum {
-	SNDRV_PCM_MMAP_OFFSET_DATA = 0x00000000,
-	SNDRV_PCM_MMAP_OFFSET_STATUS = 0x80000000,
-	SNDRV_PCM_MMAP_OFFSET_CONTROL = 0x81000000,
-};
-
-union snd_pcm_sync_id {
-	unsigned char id[16];
-	unsigned short id16[8];
-	unsigned int id32[4];
-};
-
-struct snd_pcm_info {
-	unsigned int device;		/* RO/WR (control): device number */
-	unsigned int subdevice;		/* RO/WR (control): subdevice number */
-	int stream;			/* RO/WR (control): stream direction */
-	int card;			/* R: card number */
-	unsigned char id[64];		/* ID (user selectable) */
-	unsigned char name[80];		/* name of this device */
-	unsigned char subname[32];	/* subdevice name */
-	int dev_class;			/* SNDRV_PCM_CLASS_* */
-	int dev_subclass;		/* SNDRV_PCM_SUBCLASS_* */
-	unsigned int subdevices_count;
-	unsigned int subdevices_avail;
-	union snd_pcm_sync_id sync;	/* hardware synchronization ID */
-	unsigned char reserved[64];	/* reserved for future... */
-};
-
-typedef int snd_pcm_hw_param_t;
-#define	SNDRV_PCM_HW_PARAM_ACCESS	0	/* Access type */
-#define	SNDRV_PCM_HW_PARAM_FORMAT	1	/* Format */
-#define	SNDRV_PCM_HW_PARAM_SUBFORMAT	2	/* Subformat */
-#define	SNDRV_PCM_HW_PARAM_FIRST_MASK	SNDRV_PCM_HW_PARAM_ACCESS
-#define	SNDRV_PCM_HW_PARAM_LAST_MASK	SNDRV_PCM_HW_PARAM_SUBFORMAT
-
-#define	SNDRV_PCM_HW_PARAM_SAMPLE_BITS	8	/* Bits per sample */
-#define	SNDRV_PCM_HW_PARAM_FRAME_BITS	9	/* Bits per frame */
-#define	SNDRV_PCM_HW_PARAM_CHANNELS	10	/* Channels */
-#define	SNDRV_PCM_HW_PARAM_RATE		11	/* Approx rate */
-#define	SNDRV_PCM_HW_PARAM_PERIOD_TIME	12	/* Approx distance between
-						 * interrupts in us
-						 */
-#define	SNDRV_PCM_HW_PARAM_PERIOD_SIZE	13	/* Approx frames between
-						 * interrupts
-						 */
-#define	SNDRV_PCM_HW_PARAM_PERIOD_BYTES	14	/* Approx bytes between
-						 * interrupts
-						 */
-#define	SNDRV_PCM_HW_PARAM_PERIODS	15	/* Approx interrupts per
-						 * buffer
-						 */
-#define	SNDRV_PCM_HW_PARAM_BUFFER_TIME	16	/* Approx duration of buffer
-						 * in us
-						 */
-#define	SNDRV_PCM_HW_PARAM_BUFFER_SIZE	17	/* Size of buffer in frames */
-#define	SNDRV_PCM_HW_PARAM_BUFFER_BYTES	18	/* Size of buffer in bytes */
-#define	SNDRV_PCM_HW_PARAM_TICK_TIME	19	/* Approx tick duration in us */
-#define	SNDRV_PCM_HW_PARAM_FIRST_INTERVAL	SNDRV_PCM_HW_PARAM_SAMPLE_BITS
-#define	SNDRV_PCM_HW_PARAM_LAST_INTERVAL	SNDRV_PCM_HW_PARAM_TICK_TIME
-
-#define SNDRV_PCM_HW_PARAMS_NORESAMPLE	(1<<0)	/* avoid rate resampling */
-#define SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER	(1<<1)	/* export buffer */
-#define SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP	(1<<2)	/* disable period wakeups */
-
-struct snd_interval {
-	unsigned int min, max;
-	unsigned int openmin:1,
-		     openmax:1,
-		     integer:1,
-		     empty:1;
-};
-
-#define SNDRV_MASK_MAX	256
-
-struct snd_mask {
-	__u32 bits[(SNDRV_MASK_MAX+31)/32];
-};
-
-struct snd_pcm_hw_params {
-	unsigned int flags;
-	struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 
-			       SNDRV_PCM_HW_PARAM_FIRST_MASK + 1];
-	struct snd_mask mres[5];	/* reserved masks */
-	struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL -
-				        SNDRV_PCM_HW_PARAM_FIRST_INTERVAL + 1];
-	struct snd_interval ires[9];	/* reserved intervals */
-	unsigned int rmask;		/* W: requested masks */
-	unsigned int cmask;		/* R: changed masks */
-	unsigned int info;		/* R: Info flags for returned setup */
-	unsigned int msbits;		/* R: used most significant bits */
-	unsigned int rate_num;		/* R: rate numerator */
-	unsigned int rate_den;		/* R: rate denominator */
-	snd_pcm_uframes_t fifo_size;	/* R: chip FIFO size in frames */
-	unsigned char reserved[64];	/* reserved for future */
-};
-
-enum {
-	SNDRV_PCM_TSTAMP_NONE = 0,
-	SNDRV_PCM_TSTAMP_ENABLE,
-	SNDRV_PCM_TSTAMP_LAST = SNDRV_PCM_TSTAMP_ENABLE,
-};
-
-struct snd_pcm_sw_params {
-	int tstamp_mode;			/* timestamp mode */
-	unsigned int period_step;
-	unsigned int sleep_min;			/* min ticks to sleep */
-	snd_pcm_uframes_t avail_min;		/* min avail frames for wakeup */
-	snd_pcm_uframes_t xfer_align;		/* obsolete: xfer size need to be a multiple */
-	snd_pcm_uframes_t start_threshold;	/* min hw_avail frames for automatic start */
-	snd_pcm_uframes_t stop_threshold;	/* min avail frames for automatic stop */
-	snd_pcm_uframes_t silence_threshold;	/* min distance from noise for silence filling */
-	snd_pcm_uframes_t silence_size;		/* silence block size */
-	snd_pcm_uframes_t boundary;		/* pointers wrap point */
-	unsigned int proto;			/* protocol version */
-	unsigned int tstamp_type;		/* timestamp type (req. proto >= 2.0.12) */
-	unsigned char reserved[56];		/* reserved for future */
-};
-
-struct snd_pcm_channel_info {
-	unsigned int channel;
-	__kernel_off_t offset;		/* mmap offset */
-	unsigned int first;		/* offset to first sample in bits */
-	unsigned int step;		/* samples distance in bits */
-};
-
-enum {
-	/*
-	 *  first definition for backwards compatibility only,
-	 *  maps to wallclock/link time for HDAudio playback and DEFAULT/DMA time for everything else
-	 */
-	SNDRV_PCM_AUDIO_TSTAMP_TYPE_COMPAT = 0,
-
-	/* timestamp definitions */
-	SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT = 1,           /* DMA time, reported as per hw_ptr */
-	SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK = 2,	           /* link time reported by sample or wallclock counter, reset on startup */
-	SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE = 3,	   /* link time reported by sample or wallclock counter, not reset on startup */
-	SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED = 4,    /* link time estimated indirectly */
-	SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED = 5, /* link time synchronized with system time */
-	SNDRV_PCM_AUDIO_TSTAMP_TYPE_LAST = SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED
-};
-
-struct snd_pcm_status {
-	snd_pcm_state_t state;		/* stream state */
-	struct timespec trigger_tstamp;	/* time when stream was started/stopped/paused */
-	struct timespec tstamp;		/* reference timestamp */
-	snd_pcm_uframes_t appl_ptr;	/* appl ptr */
-	snd_pcm_uframes_t hw_ptr;	/* hw ptr */
-	snd_pcm_sframes_t delay;	/* current delay in frames */
-	snd_pcm_uframes_t avail;	/* number of frames available */
-	snd_pcm_uframes_t avail_max;	/* max frames available on hw since last status */
-	snd_pcm_uframes_t overrange;	/* count of ADC (capture) overrange detections from last status */
-	snd_pcm_state_t suspended_state; /* suspended stream state */
-	__u32 audio_tstamp_data;	 /* needed for 64-bit alignment, used for configs/report to/from userspace */
-	struct timespec audio_tstamp;	/* sample counter, wall clock, PHC or on-demand sync'ed */
-	struct timespec driver_tstamp;	/* useful in case reference system tstamp is reported with delay */
-	__u32 audio_tstamp_accuracy;	/* in ns units, only valid if indicated in audio_tstamp_data */
-	unsigned char reserved[52-2*sizeof(struct timespec)]; /* must be filled with zero */
-};
-
-struct snd_pcm_mmap_status {
-	snd_pcm_state_t state;		/* RO: state - SNDRV_PCM_STATE_XXXX */
-	int pad1;			/* Needed for 64 bit alignment */
-	snd_pcm_uframes_t hw_ptr;	/* RO: hw ptr (0...boundary-1) */
-	struct timespec tstamp;		/* Timestamp */
-	snd_pcm_state_t suspended_state; /* RO: suspended stream state */
-	struct timespec audio_tstamp;	/* from sample counter or wall clock */
-};
-
-struct snd_pcm_mmap_control {
-	snd_pcm_uframes_t appl_ptr;	/* RW: appl ptr (0...boundary-1) */
-	snd_pcm_uframes_t avail_min;	/* RW: min available frames for wakeup */
-};
-
-#define SNDRV_PCM_SYNC_PTR_HWSYNC	(1<<0)	/* execute hwsync */
-#define SNDRV_PCM_SYNC_PTR_APPL		(1<<1)	/* get appl_ptr from driver (r/w op) */
-#define SNDRV_PCM_SYNC_PTR_AVAIL_MIN	(1<<2)	/* get avail_min from driver */
-
-struct snd_pcm_sync_ptr {
-	unsigned int flags;
-	union {
-		struct snd_pcm_mmap_status status;
-		unsigned char reserved[64];
-	} s;
-	union {
-		struct snd_pcm_mmap_control control;
-		unsigned char reserved[64];
-	} c;
-};
-
-struct snd_xferi {
-	snd_pcm_sframes_t result;
-	void *buf;
-	snd_pcm_uframes_t frames;
-};
-
-struct snd_xfern {
-	snd_pcm_sframes_t result;
-	void * *bufs;
-	snd_pcm_uframes_t frames;
-};
-
-enum {
-	SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0,	/* gettimeofday equivalent */
-	SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,	/* posix_clock_monotonic equivalent */
-	SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW,    /* monotonic_raw (no NTP) */
-	SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW,
-};
-
-/* channel positions */
-enum {
-	SNDRV_CHMAP_UNKNOWN = 0,
-	SNDRV_CHMAP_NA,		/* N/A, silent */
-	SNDRV_CHMAP_MONO,	/* mono stream */
-	/* this follows the alsa-lib mixer channel value + 3 */
-	SNDRV_CHMAP_FL,		/* front left */
-	SNDRV_CHMAP_FR,		/* front right */
-	SNDRV_CHMAP_RL,		/* rear left */
-	SNDRV_CHMAP_RR,		/* rear right */
-	SNDRV_CHMAP_FC,		/* front center */
-	SNDRV_CHMAP_LFE,	/* LFE */
-	SNDRV_CHMAP_SL,		/* side left */
-	SNDRV_CHMAP_SR,		/* side right */
-	SNDRV_CHMAP_RC,		/* rear center */
-	/* new definitions */
-	SNDRV_CHMAP_FLC,	/* front left center */
-	SNDRV_CHMAP_FRC,	/* front right center */
-	SNDRV_CHMAP_RLC,	/* rear left center */
-	SNDRV_CHMAP_RRC,	/* rear right center */
-	SNDRV_CHMAP_FLW,	/* front left wide */
-	SNDRV_CHMAP_FRW,	/* front right wide */
-	SNDRV_CHMAP_FLH,	/* front left high */
-	SNDRV_CHMAP_FCH,	/* front center high */
-	SNDRV_CHMAP_FRH,	/* front right high */
-	SNDRV_CHMAP_TC,		/* top center */
-	SNDRV_CHMAP_TFL,	/* top front left */
-	SNDRV_CHMAP_TFR,	/* top front right */
-	SNDRV_CHMAP_TFC,	/* top front center */
-	SNDRV_CHMAP_TRL,	/* top rear left */
-	SNDRV_CHMAP_TRR,	/* top rear right */
-	SNDRV_CHMAP_TRC,	/* top rear center */
-	/* new definitions for UAC2 */
-	SNDRV_CHMAP_TFLC,	/* top front left center */
-	SNDRV_CHMAP_TFRC,	/* top front right center */
-	SNDRV_CHMAP_TSL,	/* top side left */
-	SNDRV_CHMAP_TSR,	/* top side right */
-	SNDRV_CHMAP_LLFE,	/* left LFE */
-	SNDRV_CHMAP_RLFE,	/* right LFE */
-	SNDRV_CHMAP_BC,		/* bottom center */
-	SNDRV_CHMAP_BLC,	/* bottom left center */
-	SNDRV_CHMAP_BRC,	/* bottom right center */
-	SNDRV_CHMAP_LAST = SNDRV_CHMAP_BRC,
-};
-
-#define SNDRV_CHMAP_POSITION_MASK	0xffff
-#define SNDRV_CHMAP_PHASE_INVERSE	(0x01 << 16)
-#define SNDRV_CHMAP_DRIVER_SPEC		(0x02 << 16)
-
-#define SNDRV_PCM_IOCTL_PVERSION	_IOR('A', 0x00, int)
-#define SNDRV_PCM_IOCTL_INFO		_IOR('A', 0x01, struct snd_pcm_info)
-#define SNDRV_PCM_IOCTL_TSTAMP		_IOW('A', 0x02, int)
-#define SNDRV_PCM_IOCTL_TTSTAMP		_IOW('A', 0x03, int)
-#define SNDRV_PCM_IOCTL_HW_REFINE	_IOWR('A', 0x10, struct snd_pcm_hw_params)
-#define SNDRV_PCM_IOCTL_HW_PARAMS	_IOWR('A', 0x11, struct snd_pcm_hw_params)
-#define SNDRV_PCM_IOCTL_HW_FREE		_IO('A', 0x12)
-#define SNDRV_PCM_IOCTL_SW_PARAMS	_IOWR('A', 0x13, struct snd_pcm_sw_params)
-#define SNDRV_PCM_IOCTL_STATUS		_IOR('A', 0x20, struct snd_pcm_status)
-#define SNDRV_PCM_IOCTL_DELAY		_IOR('A', 0x21, snd_pcm_sframes_t)
-#define SNDRV_PCM_IOCTL_HWSYNC		_IO('A', 0x22)
-#define SNDRV_PCM_IOCTL_SYNC_PTR	_IOWR('A', 0x23, struct snd_pcm_sync_ptr)
-#define SNDRV_PCM_IOCTL_STATUS_EXT	_IOWR('A', 0x24, struct snd_pcm_status)
-#define SNDRV_PCM_IOCTL_CHANNEL_INFO	_IOR('A', 0x32, struct snd_pcm_channel_info)
-#define SNDRV_PCM_IOCTL_PREPARE		_IO('A', 0x40)
-#define SNDRV_PCM_IOCTL_RESET		_IO('A', 0x41)
-#define SNDRV_PCM_IOCTL_START		_IO('A', 0x42)
-#define SNDRV_PCM_IOCTL_DROP		_IO('A', 0x43)
-#define SNDRV_PCM_IOCTL_DRAIN		_IO('A', 0x44)
-#define SNDRV_PCM_IOCTL_PAUSE		_IOW('A', 0x45, int)
-#define SNDRV_PCM_IOCTL_REWIND		_IOW('A', 0x46, snd_pcm_uframes_t)
-#define SNDRV_PCM_IOCTL_RESUME		_IO('A', 0x47)
-#define SNDRV_PCM_IOCTL_XRUN		_IO('A', 0x48)
-#define SNDRV_PCM_IOCTL_FORWARD		_IOW('A', 0x49, snd_pcm_uframes_t)
-#define SNDRV_PCM_IOCTL_WRITEI_FRAMES	_IOW('A', 0x50, struct snd_xferi)
-#define SNDRV_PCM_IOCTL_READI_FRAMES	_IOR('A', 0x51, struct snd_xferi)
-#define SNDRV_PCM_IOCTL_WRITEN_FRAMES	_IOW('A', 0x52, struct snd_xfern)
-#define SNDRV_PCM_IOCTL_READN_FRAMES	_IOR('A', 0x53, struct snd_xfern)
-#define SNDRV_PCM_IOCTL_LINK		_IOW('A', 0x60, int)
-#define SNDRV_PCM_IOCTL_UNLINK		_IO('A', 0x61)
-
-/*****************************************************************************
- *                                                                           *
- *                            MIDI v1.0 interface                            *
- *                                                                           *
- *****************************************************************************/
-
-/*
- *  Raw MIDI section - /dev/snd/midi??
- */
-
-#define SNDRV_RAWMIDI_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 0)
-
-enum {
-	SNDRV_RAWMIDI_STREAM_OUTPUT = 0,
-	SNDRV_RAWMIDI_STREAM_INPUT,
-	SNDRV_RAWMIDI_STREAM_LAST = SNDRV_RAWMIDI_STREAM_INPUT,
-};
-
-#define SNDRV_RAWMIDI_INFO_OUTPUT		0x00000001
-#define SNDRV_RAWMIDI_INFO_INPUT		0x00000002
-#define SNDRV_RAWMIDI_INFO_DUPLEX		0x00000004
-
-struct snd_rawmidi_info {
-	unsigned int device;		/* RO/WR (control): device number */
-	unsigned int subdevice;		/* RO/WR (control): subdevice number */
-	int stream;			/* WR: stream */
-	int card;			/* R: card number */
-	unsigned int flags;		/* SNDRV_RAWMIDI_INFO_XXXX */
-	unsigned char id[64];		/* ID (user selectable) */
-	unsigned char name[80];		/* name of device */
-	unsigned char subname[32];	/* name of active or selected subdevice */
-	unsigned int subdevices_count;
-	unsigned int subdevices_avail;
-	unsigned char reserved[64];	/* reserved for future use */
-};
-
-struct snd_rawmidi_params {
-	int stream;
-	size_t buffer_size;		/* queue size in bytes */
-	size_t avail_min;		/* minimum avail bytes for wakeup */
-	unsigned int no_active_sensing: 1; /* do not send active sensing byte in close() */
-	unsigned char reserved[16];	/* reserved for future use */
-};
-
-struct snd_rawmidi_status {
-	int stream;
-	struct timespec tstamp;		/* Timestamp */
-	size_t avail;			/* available bytes */
-	size_t xruns;			/* count of overruns since last status (in bytes) */
-	unsigned char reserved[16];	/* reserved for future use */
-};
-
-#define SNDRV_RAWMIDI_IOCTL_PVERSION	_IOR('W', 0x00, int)
-#define SNDRV_RAWMIDI_IOCTL_INFO	_IOR('W', 0x01, struct snd_rawmidi_info)
-#define SNDRV_RAWMIDI_IOCTL_PARAMS	_IOWR('W', 0x10, struct snd_rawmidi_params)
-#define SNDRV_RAWMIDI_IOCTL_STATUS	_IOWR('W', 0x20, struct snd_rawmidi_status)
-#define SNDRV_RAWMIDI_IOCTL_DROP	_IOW('W', 0x30, int)
-#define SNDRV_RAWMIDI_IOCTL_DRAIN	_IOW('W', 0x31, int)
-
-/*
- *  Timer section - /dev/snd/timer
- */
-
-#define SNDRV_TIMER_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 6)
-
-enum {
-	SNDRV_TIMER_CLASS_NONE = -1,
-	SNDRV_TIMER_CLASS_SLAVE = 0,
-	SNDRV_TIMER_CLASS_GLOBAL,
-	SNDRV_TIMER_CLASS_CARD,
-	SNDRV_TIMER_CLASS_PCM,
-	SNDRV_TIMER_CLASS_LAST = SNDRV_TIMER_CLASS_PCM,
-};
-
-/* slave timer classes */
-enum {
-	SNDRV_TIMER_SCLASS_NONE = 0,
-	SNDRV_TIMER_SCLASS_APPLICATION,
-	SNDRV_TIMER_SCLASS_SEQUENCER,		/* alias */
-	SNDRV_TIMER_SCLASS_OSS_SEQUENCER,	/* alias */
-	SNDRV_TIMER_SCLASS_LAST = SNDRV_TIMER_SCLASS_OSS_SEQUENCER,
-};
-
-/* global timers (device member) */
-#define SNDRV_TIMER_GLOBAL_SYSTEM	0
-#define SNDRV_TIMER_GLOBAL_RTC		1
-#define SNDRV_TIMER_GLOBAL_HPET		2
-#define SNDRV_TIMER_GLOBAL_HRTIMER	3
-
-/* info flags */
-#define SNDRV_TIMER_FLG_SLAVE		(1<<0)	/* cannot be controlled */
-
-struct snd_timer_id {
-	int dev_class;
-	int dev_sclass;
-	int card;
-	int device;
-	int subdevice;
-};
-
-struct snd_timer_ginfo {
-	struct snd_timer_id tid;	/* requested timer ID */
-	unsigned int flags;		/* timer flags - SNDRV_TIMER_FLG_* */
-	int card;			/* card number */
-	unsigned char id[64];		/* timer identification */
-	unsigned char name[80];		/* timer name */
-	unsigned long reserved0;	/* reserved for future use */
-	unsigned long resolution;	/* average period resolution in ns */
-	unsigned long resolution_min;	/* minimal period resolution in ns */
-	unsigned long resolution_max;	/* maximal period resolution in ns */
-	unsigned int clients;		/* active timer clients */
-	unsigned char reserved[32];
-};
-
-struct snd_timer_gparams {
-	struct snd_timer_id tid;	/* requested timer ID */
-	unsigned long period_num;	/* requested precise period duration (in seconds) - numerator */
-	unsigned long period_den;	/* requested precise period duration (in seconds) - denominator */
-	unsigned char reserved[32];
-};
-
-struct snd_timer_gstatus {
-	struct snd_timer_id tid;	/* requested timer ID */
-	unsigned long resolution;	/* current period resolution in ns */
-	unsigned long resolution_num;	/* precise current period resolution (in seconds) - numerator */
-	unsigned long resolution_den;	/* precise current period resolution (in seconds) - denominator */
-	unsigned char reserved[32];
-};
-
-struct snd_timer_select {
-	struct snd_timer_id id;	/* bind to timer ID */
-	unsigned char reserved[32];	/* reserved */
-};
-
-struct snd_timer_info {
-	unsigned int flags;		/* timer flags - SNDRV_TIMER_FLG_* */
-	int card;			/* card number */
-	unsigned char id[64];		/* timer identificator */
-	unsigned char name[80];		/* timer name */
-	unsigned long reserved0;	/* reserved for future use */
-	unsigned long resolution;	/* average period resolution in ns */
-	unsigned char reserved[64];	/* reserved */
-};
-
-#define SNDRV_TIMER_PSFLG_AUTO		(1<<0)	/* auto start, otherwise one-shot */
-#define SNDRV_TIMER_PSFLG_EXCLUSIVE	(1<<1)	/* exclusive use, precise start/stop/pause/continue */
-#define SNDRV_TIMER_PSFLG_EARLY_EVENT	(1<<2)	/* write early event to the poll queue */
-
-struct snd_timer_params {
-	unsigned int flags;		/* flags - SNDRV_MIXER_PSFLG_* */
-	unsigned int ticks;		/* requested resolution in ticks */
-	unsigned int queue_size;	/* total size of queue (32-1024) */
-	unsigned int reserved0;		/* reserved, was: failure locations */
-	unsigned int filter;		/* event filter (bitmask of SNDRV_TIMER_EVENT_*) */
-	unsigned char reserved[60];	/* reserved */
-};
-
-struct snd_timer_status {
-	struct timespec tstamp;		/* Timestamp - last update */
-	unsigned int resolution;	/* current period resolution in ns */
-	unsigned int lost;		/* counter of master tick lost */
-	unsigned int overrun;		/* count of read queue overruns */
-	unsigned int queue;		/* used queue size */
-	unsigned char reserved[64];	/* reserved */
-};
-
-#define SNDRV_TIMER_IOCTL_PVERSION	_IOR('T', 0x00, int)
-#define SNDRV_TIMER_IOCTL_NEXT_DEVICE	_IOWR('T', 0x01, struct snd_timer_id)
-#define SNDRV_TIMER_IOCTL_TREAD		_IOW('T', 0x02, int)
-#define SNDRV_TIMER_IOCTL_GINFO		_IOWR('T', 0x03, struct snd_timer_ginfo)
-#define SNDRV_TIMER_IOCTL_GPARAMS	_IOW('T', 0x04, struct snd_timer_gparams)
-#define SNDRV_TIMER_IOCTL_GSTATUS	_IOWR('T', 0x05, struct snd_timer_gstatus)
-#define SNDRV_TIMER_IOCTL_SELECT	_IOW('T', 0x10, struct snd_timer_select)
-#define SNDRV_TIMER_IOCTL_INFO		_IOR('T', 0x11, struct snd_timer_info)
-#define SNDRV_TIMER_IOCTL_PARAMS	_IOW('T', 0x12, struct snd_timer_params)
-#define SNDRV_TIMER_IOCTL_STATUS	_IOR('T', 0x14, struct snd_timer_status)
-/* The following four ioctls are changed since 1.0.9 due to confliction */
-#define SNDRV_TIMER_IOCTL_START		_IO('T', 0xa0)
-#define SNDRV_TIMER_IOCTL_STOP		_IO('T', 0xa1)
-#define SNDRV_TIMER_IOCTL_CONTINUE	_IO('T', 0xa2)
-#define SNDRV_TIMER_IOCTL_PAUSE		_IO('T', 0xa3)
-
-struct snd_timer_read {
-	unsigned int resolution;
-	unsigned int ticks;
-};
-
-enum {
-	SNDRV_TIMER_EVENT_RESOLUTION = 0,	/* val = resolution in ns */
-	SNDRV_TIMER_EVENT_TICK,			/* val = ticks */
-	SNDRV_TIMER_EVENT_START,		/* val = resolution in ns */
-	SNDRV_TIMER_EVENT_STOP,			/* val = 0 */
-	SNDRV_TIMER_EVENT_CONTINUE,		/* val = resolution in ns */
-	SNDRV_TIMER_EVENT_PAUSE,		/* val = 0 */
-	SNDRV_TIMER_EVENT_EARLY,		/* val = 0, early event */
-	SNDRV_TIMER_EVENT_SUSPEND,		/* val = 0 */
-	SNDRV_TIMER_EVENT_RESUME,		/* val = resolution in ns */
-	/* master timer events for slave timer instances */
-	SNDRV_TIMER_EVENT_MSTART = SNDRV_TIMER_EVENT_START + 10,
-	SNDRV_TIMER_EVENT_MSTOP = SNDRV_TIMER_EVENT_STOP + 10,
-	SNDRV_TIMER_EVENT_MCONTINUE = SNDRV_TIMER_EVENT_CONTINUE + 10,
-	SNDRV_TIMER_EVENT_MPAUSE = SNDRV_TIMER_EVENT_PAUSE + 10,
-	SNDRV_TIMER_EVENT_MSUSPEND = SNDRV_TIMER_EVENT_SUSPEND + 10,
-	SNDRV_TIMER_EVENT_MRESUME = SNDRV_TIMER_EVENT_RESUME + 10,
-};
-
-struct snd_timer_tread {
-	int event;
-	struct timespec tstamp;
-	unsigned int val;
-};
-
-/****************************************************************************
- *                                                                          *
- *        Section for driver control interface - /dev/snd/control?          *
- *                                                                          *
- ****************************************************************************/
-
-#define SNDRV_CTL_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 7)
-
-struct snd_ctl_card_info {
-	int card;			/* card number */
-	int pad;			/* reserved for future (was type) */
-	unsigned char id[16];		/* ID of card (user selectable) */
-	unsigned char driver[16];	/* Driver name */
-	unsigned char name[32];		/* Short name of soundcard */
-	unsigned char longname[80];	/* name + info text about soundcard */
-	unsigned char reserved_[16];	/* reserved for future (was ID of mixer) */
-	unsigned char mixername[80];	/* visual mixer identification */
-	unsigned char components[128];	/* card components / fine identification, delimited with one space (AC97 etc..) */
-};
-
-typedef int __bitwise snd_ctl_elem_type_t;
-#define	SNDRV_CTL_ELEM_TYPE_NONE	((snd_ctl_elem_type_t) 0) /* invalid */
-#define	SNDRV_CTL_ELEM_TYPE_BOOLEAN	((snd_ctl_elem_type_t) 1) /* boolean type */
-#define	SNDRV_CTL_ELEM_TYPE_INTEGER	((snd_ctl_elem_type_t) 2) /* integer type */
-#define	SNDRV_CTL_ELEM_TYPE_ENUMERATED	((snd_ctl_elem_type_t) 3) /* enumerated type */
-#define	SNDRV_CTL_ELEM_TYPE_BYTES	((snd_ctl_elem_type_t) 4) /* byte array */
-#define	SNDRV_CTL_ELEM_TYPE_IEC958	((snd_ctl_elem_type_t) 5) /* IEC958 (S/PDIF) setup */
-#define	SNDRV_CTL_ELEM_TYPE_INTEGER64	((snd_ctl_elem_type_t) 6) /* 64-bit integer type */
-#define	SNDRV_CTL_ELEM_TYPE_LAST	SNDRV_CTL_ELEM_TYPE_INTEGER64
-
-typedef int __bitwise snd_ctl_elem_iface_t;
-#define	SNDRV_CTL_ELEM_IFACE_CARD	((snd_ctl_elem_iface_t) 0) /* global control */
-#define	SNDRV_CTL_ELEM_IFACE_HWDEP	((snd_ctl_elem_iface_t) 1) /* hardware dependent device */
-#define	SNDRV_CTL_ELEM_IFACE_MIXER	((snd_ctl_elem_iface_t) 2) /* virtual mixer device */
-#define	SNDRV_CTL_ELEM_IFACE_PCM	((snd_ctl_elem_iface_t) 3) /* PCM device */
-#define	SNDRV_CTL_ELEM_IFACE_RAWMIDI	((snd_ctl_elem_iface_t) 4) /* RawMidi device */
-#define	SNDRV_CTL_ELEM_IFACE_TIMER	((snd_ctl_elem_iface_t) 5) /* timer device */
-#define	SNDRV_CTL_ELEM_IFACE_SEQUENCER	((snd_ctl_elem_iface_t) 6) /* sequencer client */
-#define	SNDRV_CTL_ELEM_IFACE_LAST	SNDRV_CTL_ELEM_IFACE_SEQUENCER
-
-#define SNDRV_CTL_ELEM_ACCESS_READ		(1<<0)
-#define SNDRV_CTL_ELEM_ACCESS_WRITE		(1<<1)
-#define SNDRV_CTL_ELEM_ACCESS_READWRITE		(SNDRV_CTL_ELEM_ACCESS_READ|SNDRV_CTL_ELEM_ACCESS_WRITE)
-#define SNDRV_CTL_ELEM_ACCESS_VOLATILE		(1<<2)	/* control value may be changed without a notification */
-#define SNDRV_CTL_ELEM_ACCESS_TIMESTAMP		(1<<3)	/* when was control changed */
-#define SNDRV_CTL_ELEM_ACCESS_TLV_READ		(1<<4)	/* TLV read is possible */
-#define SNDRV_CTL_ELEM_ACCESS_TLV_WRITE		(1<<5)	/* TLV write is possible */
-#define SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE	(SNDRV_CTL_ELEM_ACCESS_TLV_READ|SNDRV_CTL_ELEM_ACCESS_TLV_WRITE)
-#define SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND	(1<<6)	/* TLV command is possible */
-#define SNDRV_CTL_ELEM_ACCESS_INACTIVE		(1<<8)	/* control does actually nothing, but may be updated */
-#define SNDRV_CTL_ELEM_ACCESS_LOCK		(1<<9)	/* write lock */
-#define SNDRV_CTL_ELEM_ACCESS_OWNER		(1<<10)	/* write lock owner */
-#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK	(1<<28)	/* kernel use a TLV callback */ 
-#define SNDRV_CTL_ELEM_ACCESS_USER		(1<<29) /* user space element */
-/* bits 30 and 31 are obsoleted (for indirect access) */
-
-/* for further details see the ACPI and PCI power management specification */
-#define SNDRV_CTL_POWER_D0		0x0000	/* full On */
-#define SNDRV_CTL_POWER_D1		0x0100	/* partial On */
-#define SNDRV_CTL_POWER_D2		0x0200	/* partial On */
-#define SNDRV_CTL_POWER_D3		0x0300	/* Off */
-#define SNDRV_CTL_POWER_D3hot		(SNDRV_CTL_POWER_D3|0x0000)	/* Off, with power */
-#define SNDRV_CTL_POWER_D3cold		(SNDRV_CTL_POWER_D3|0x0001)	/* Off, without power */
-
-#define SNDRV_CTL_ELEM_ID_NAME_MAXLEN	44
-
-struct snd_ctl_elem_id {
-	unsigned int numid;		/* numeric identifier, zero = invalid */
-	snd_ctl_elem_iface_t iface;	/* interface identifier */
-	unsigned int device;		/* device/client number */
-	unsigned int subdevice;		/* subdevice (substream) number */
-	unsigned char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];		/* ASCII name of item */
-	unsigned int index;		/* index of item */
-};
-
-struct snd_ctl_elem_list {
-	unsigned int offset;		/* W: first element ID to get */
-	unsigned int space;		/* W: count of element IDs to get */
-	unsigned int used;		/* R: count of element IDs set */
-	unsigned int count;		/* R: count of all elements */
-	struct snd_ctl_elem_id *pids; /* R: IDs */
-	unsigned char reserved[50];
-};
-
-struct snd_ctl_elem_info {
-	struct snd_ctl_elem_id id;	/* W: element ID */
-	snd_ctl_elem_type_t type;	/* R: value type - SNDRV_CTL_ELEM_TYPE_* */
-	unsigned int access;		/* R: value access (bitmask) - SNDRV_CTL_ELEM_ACCESS_* */
-	unsigned int count;		/* count of values */
-	__kernel_pid_t owner;		/* owner's PID of this control */
-	union {
-		struct {
-			long min;		/* R: minimum value */
-			long max;		/* R: maximum value */
-			long step;		/* R: step (0 variable) */
-		} integer;
-		struct {
-			long long min;		/* R: minimum value */
-			long long max;		/* R: maximum value */
-			long long step;		/* R: step (0 variable) */
-		} integer64;
-		struct {
-			unsigned int items;	/* R: number of items */
-			unsigned int item;	/* W: item number */
-			char name[64];		/* R: value name */
-			__u64 names_ptr;	/* W: names list (ELEM_ADD only) */
-			unsigned int names_length;
-		} enumerated;
-		unsigned char reserved[128];
-	} value;
-	union {
-		unsigned short d[4];		/* dimensions */
-		unsigned short *d_ptr;		/* indirect - obsoleted */
-	} dimen;
-	unsigned char reserved[64-4*sizeof(unsigned short)];
-};
-
-struct snd_ctl_elem_value {
-	struct snd_ctl_elem_id id;	/* W: element ID */
-	unsigned int indirect: 1;	/* W: indirect access - obsoleted */
-	union {
-		union {
-			long value[128];
-			long *value_ptr;	/* obsoleted */
-		} integer;
-		union {
-			long long value[64];
-			long long *value_ptr;	/* obsoleted */
-		} integer64;
-		union {
-			unsigned int item[128];
-			unsigned int *item_ptr;	/* obsoleted */
-		} enumerated;
-		union {
-			unsigned char data[512];
-			unsigned char *data_ptr;	/* obsoleted */
-		} bytes;
-		struct snd_aes_iec958 iec958;
-	} value;		/* RO */
-	struct timespec tstamp;
-	unsigned char reserved[128-sizeof(struct timespec)];
-};
-
-struct snd_ctl_tlv {
-	unsigned int numid;	/* control element numeric identification */
-	unsigned int length;	/* in bytes aligned to 4 */
-	unsigned int tlv[0];	/* first TLV */
-};
-
-#define SNDRV_CTL_IOCTL_PVERSION	_IOR('U', 0x00, int)
-#define SNDRV_CTL_IOCTL_CARD_INFO	_IOR('U', 0x01, struct snd_ctl_card_info)
-#define SNDRV_CTL_IOCTL_ELEM_LIST	_IOWR('U', 0x10, struct snd_ctl_elem_list)
-#define SNDRV_CTL_IOCTL_ELEM_INFO	_IOWR('U', 0x11, struct snd_ctl_elem_info)
-#define SNDRV_CTL_IOCTL_ELEM_READ	_IOWR('U', 0x12, struct snd_ctl_elem_value)
-#define SNDRV_CTL_IOCTL_ELEM_WRITE	_IOWR('U', 0x13, struct snd_ctl_elem_value)
-#define SNDRV_CTL_IOCTL_ELEM_LOCK	_IOW('U', 0x14, struct snd_ctl_elem_id)
-#define SNDRV_CTL_IOCTL_ELEM_UNLOCK	_IOW('U', 0x15, struct snd_ctl_elem_id)
-#define SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS _IOWR('U', 0x16, int)
-#define SNDRV_CTL_IOCTL_ELEM_ADD	_IOWR('U', 0x17, struct snd_ctl_elem_info)
-#define SNDRV_CTL_IOCTL_ELEM_REPLACE	_IOWR('U', 0x18, struct snd_ctl_elem_info)
-#define SNDRV_CTL_IOCTL_ELEM_REMOVE	_IOWR('U', 0x19, struct snd_ctl_elem_id)
-#define SNDRV_CTL_IOCTL_TLV_READ	_IOWR('U', 0x1a, struct snd_ctl_tlv)
-#define SNDRV_CTL_IOCTL_TLV_WRITE	_IOWR('U', 0x1b, struct snd_ctl_tlv)
-#define SNDRV_CTL_IOCTL_TLV_COMMAND	_IOWR('U', 0x1c, struct snd_ctl_tlv)
-#define SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE _IOWR('U', 0x20, int)
-#define SNDRV_CTL_IOCTL_HWDEP_INFO	_IOR('U', 0x21, struct snd_hwdep_info)
-#define SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE	_IOR('U', 0x30, int)
-#define SNDRV_CTL_IOCTL_PCM_INFO	_IOWR('U', 0x31, struct snd_pcm_info)
-#define SNDRV_CTL_IOCTL_PCM_PREFER_SUBDEVICE _IOW('U', 0x32, int)
-#define SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE _IOWR('U', 0x40, int)
-#define SNDRV_CTL_IOCTL_RAWMIDI_INFO	_IOWR('U', 0x41, struct snd_rawmidi_info)
-#define SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE _IOW('U', 0x42, int)
-#define SNDRV_CTL_IOCTL_POWER		_IOWR('U', 0xd0, int)
-#define SNDRV_CTL_IOCTL_POWER_STATE	_IOR('U', 0xd1, int)
-
-/*
- *  Read interface.
- */
-
-enum sndrv_ctl_event_type {
-	SNDRV_CTL_EVENT_ELEM = 0,
-	SNDRV_CTL_EVENT_LAST = SNDRV_CTL_EVENT_ELEM,
-};
-
-#define SNDRV_CTL_EVENT_MASK_VALUE	(1<<0)	/* element value was changed */
-#define SNDRV_CTL_EVENT_MASK_INFO	(1<<1)	/* element info was changed */
-#define SNDRV_CTL_EVENT_MASK_ADD	(1<<2)	/* element was added */
-#define SNDRV_CTL_EVENT_MASK_TLV	(1<<3)	/* element TLV tree was changed */
-#define SNDRV_CTL_EVENT_MASK_REMOVE	(~0U)	/* element was removed */
-
-struct snd_ctl_event {
-	int type;	/* event type - SNDRV_CTL_EVENT_* */
-	union {
-		struct {
-			unsigned int mask;
-			struct snd_ctl_elem_id id;
-		} elem;
-		unsigned char data8[60];
-	} data;
-};
-
-/*
- *  Control names
- */
-
-#define SNDRV_CTL_NAME_NONE				""
-#define SNDRV_CTL_NAME_PLAYBACK				"Playback "
-#define SNDRV_CTL_NAME_CAPTURE				"Capture "
-
-#define SNDRV_CTL_NAME_IEC958_NONE			""
-#define SNDRV_CTL_NAME_IEC958_SWITCH			"Switch"
-#define SNDRV_CTL_NAME_IEC958_VOLUME			"Volume"
-#define SNDRV_CTL_NAME_IEC958_DEFAULT			"Default"
-#define SNDRV_CTL_NAME_IEC958_MASK			"Mask"
-#define SNDRV_CTL_NAME_IEC958_CON_MASK			"Con Mask"
-#define SNDRV_CTL_NAME_IEC958_PRO_MASK			"Pro Mask"
-#define SNDRV_CTL_NAME_IEC958_PCM_STREAM		"PCM Stream"
-#define SNDRV_CTL_NAME_IEC958(expl,direction,what)	"IEC958 " expl SNDRV_CTL_NAME_##direction SNDRV_CTL_NAME_IEC958_##what
-
-#endif /* __SOUND_ASOUND_H */
diff --git a/openflow/usr/include/sound/asound_fm.h b/openflow/usr/include/sound/asound_fm.h
deleted file mode 100644
index c2a4b96..0000000
--- a/openflow/usr/include/sound/asound_fm.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#ifndef __SOUND_ASOUND_FM_H
-#define __SOUND_ASOUND_FM_H
-
-/*
- *  Advanced Linux Sound Architecture - ALSA
- *
- *  Interface file between ALSA driver & user space
- *  Copyright (c) 1994-98 by Jaroslav Kysela <perex@perex.cz>,
- *                           4Front Technologies
- *
- *  Direct FM control
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-
-#define SNDRV_DM_FM_MODE_OPL2	0x00
-#define SNDRV_DM_FM_MODE_OPL3	0x01
-
-struct snd_dm_fm_info {
-	unsigned char fm_mode;		/* OPL mode, see SNDRV_DM_FM_MODE_XXX */
-	unsigned char rhythm;		/* percussion mode flag */
-};
-
-/*
- *  Data structure composing an FM "note" or sound event.
- */
-
-struct snd_dm_fm_voice {
-	unsigned char op;		/* operator cell (0 or 1) */
-	unsigned char voice;		/* FM voice (0 to 17) */
-
-	unsigned char am;		/* amplitude modulation */
-	unsigned char vibrato;		/* vibrato effect */
-	unsigned char do_sustain;	/* sustain phase */
-	unsigned char kbd_scale;	/* keyboard scaling */
-	unsigned char harmonic;		/* 4 bits: harmonic and multiplier */
-	unsigned char scale_level;	/* 2 bits: decrease output freq rises */
-	unsigned char volume;		/* 6 bits: volume */
-
-	unsigned char attack;		/* 4 bits: attack rate */
-	unsigned char decay;		/* 4 bits: decay rate */
-	unsigned char sustain;		/* 4 bits: sustain level */
-	unsigned char release;		/* 4 bits: release rate */
-
-	unsigned char feedback;		/* 3 bits: feedback for op0 */
-	unsigned char connection;	/* 0 for serial, 1 for parallel */
-	unsigned char left;		/* stereo left */
-	unsigned char right;		/* stereo right */
-	unsigned char waveform;		/* 3 bits: waveform shape */
-};
-
-/*
- *  This describes an FM note by its voice, octave, frequency number (10bit)
- *  and key on/off.
- */
-
-struct snd_dm_fm_note {
-	unsigned char voice;	/* 0-17 voice channel */
-	unsigned char octave;	/* 3 bits: what octave to play */
-	unsigned int fnum;	/* 10 bits: frequency number */
-	unsigned char key_on;	/* set for active, clear for silent */
-};
-
-/*
- *  FM parameters that apply globally to all voices, and thus are not "notes"
- */
-
-struct snd_dm_fm_params {
-	unsigned char am_depth;		/* amplitude modulation depth (1=hi) */
-	unsigned char vib_depth;	/* vibrato depth (1=hi) */
-	unsigned char kbd_split;	/* keyboard split */
-	unsigned char rhythm;		/* percussion mode select */
-
-	/* This block is the percussion instrument data */
-	unsigned char bass;
-	unsigned char snare;
-	unsigned char tomtom;
-	unsigned char cymbal;
-	unsigned char hihat;
-};
-
-/*
- *  FM mode ioctl settings
- */
-
-#define SNDRV_DM_FM_IOCTL_INFO		_IOR('H', 0x20, struct snd_dm_fm_info)
-#define SNDRV_DM_FM_IOCTL_RESET		_IO ('H', 0x21)
-#define SNDRV_DM_FM_IOCTL_PLAY_NOTE	_IOW('H', 0x22, struct snd_dm_fm_note)
-#define SNDRV_DM_FM_IOCTL_SET_VOICE	_IOW('H', 0x23, struct snd_dm_fm_voice)
-#define SNDRV_DM_FM_IOCTL_SET_PARAMS	_IOW('H', 0x24, struct snd_dm_fm_params)
-#define SNDRV_DM_FM_IOCTL_SET_MODE	_IOW('H', 0x25, int)
-/* for OPL3 only */
-#define SNDRV_DM_FM_IOCTL_SET_CONNECTION	_IOW('H', 0x26, int)
-/* SBI patch management */
-#define SNDRV_DM_FM_IOCTL_CLEAR_PATCHES	_IO ('H', 0x40)
-
-#define SNDRV_DM_FM_OSS_IOCTL_RESET		0x20
-#define SNDRV_DM_FM_OSS_IOCTL_PLAY_NOTE		0x21
-#define SNDRV_DM_FM_OSS_IOCTL_SET_VOICE		0x22
-#define SNDRV_DM_FM_OSS_IOCTL_SET_PARAMS	0x23
-#define SNDRV_DM_FM_OSS_IOCTL_SET_MODE		0x24
-#define SNDRV_DM_FM_OSS_IOCTL_SET_OPL		0x25
-
-/*
- * Patch Record - fixed size for write
- */
-
-#define FM_KEY_SBI	"SBI\032"
-#define FM_KEY_2OP	"2OP\032"
-#define FM_KEY_4OP	"4OP\032"
-
-struct sbi_patch {
-	unsigned char prog;
-	unsigned char bank;
-	char key[4];
-	char name[25];
-	char extension[7];
-	unsigned char data[32];
-};
-
-#endif /* __SOUND_ASOUND_FM_H */
diff --git a/openflow/usr/include/sound/compress_offload.h b/openflow/usr/include/sound/compress_offload.h
deleted file mode 100644
index e00d8cb..0000000
--- a/openflow/usr/include/sound/compress_offload.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- *  compress_offload.h - compress offload header definations
- *
- *  Copyright (C) 2011 Intel Corporation
- *  Authors:	Vinod Koul <vinod.koul@linux.intel.com>
- *		Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- */
-#ifndef __COMPRESS_OFFLOAD_H
-#define __COMPRESS_OFFLOAD_H
-
-#include <linux/types.h>
-#include <sound/asound.h>
-#include <sound/compress_params.h>
-
-
-#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 2)
-/**
- * struct snd_compressed_buffer - compressed buffer
- * @fragment_size: size of buffer fragment in bytes
- * @fragments: number of such fragments
- */
-struct snd_compressed_buffer {
-	__u32 fragment_size;
-	__u32 fragments;
-} __attribute__((packed, aligned(4)));
-
-/**
- * struct snd_compr_params - compressed stream params
- * @buffer: buffer description
- * @codec: codec parameters
- * @no_wake_mode: dont wake on fragment elapsed
- */
-struct snd_compr_params {
-	struct snd_compressed_buffer buffer;
-	struct snd_codec codec;
-	__u8 no_wake_mode;
-} __attribute__((packed, aligned(4)));
-
-/**
- * struct snd_compr_tstamp - timestamp descriptor
- * @byte_offset: Byte offset in ring buffer to DSP
- * @copied_total: Total number of bytes copied from/to ring buffer to/by DSP
- * @pcm_frames: Frames decoded or encoded by DSP. This field will evolve by
- *	large steps and should only be used to monitor encoding/decoding
- *	progress. It shall not be used for timing estimates.
- * @pcm_io_frames: Frames rendered or received by DSP into a mixer or an audio
- * output/input. This field should be used for A/V sync or time estimates.
- * @sampling_rate: sampling rate of audio
- */
-struct snd_compr_tstamp {
-	__u32 byte_offset;
-	__u32 copied_total;
-	__u32 pcm_frames;
-	__u32 pcm_io_frames;
-	__u32 sampling_rate;
-} __attribute__((packed, aligned(4)));
-
-/**
- * struct snd_compr_avail - avail descriptor
- * @avail: Number of bytes available in ring buffer for writing/reading
- * @tstamp: timestamp information
- */
-struct snd_compr_avail {
-	__u64 avail;
-	struct snd_compr_tstamp tstamp;
-} __attribute__((packed, aligned(4)));
-
-enum snd_compr_direction {
-	SND_COMPRESS_PLAYBACK = 0,
-	SND_COMPRESS_CAPTURE
-};
-
-/**
- * struct snd_compr_caps - caps descriptor
- * @codecs: pointer to array of codecs
- * @direction: direction supported. Of type snd_compr_direction
- * @min_fragment_size: minimum fragment supported by DSP
- * @max_fragment_size: maximum fragment supported by DSP
- * @min_fragments: min fragments supported by DSP
- * @max_fragments: max fragments supported by DSP
- * @num_codecs: number of codecs supported
- * @reserved: reserved field
- */
-struct snd_compr_caps {
-	__u32 num_codecs;
-	__u32 direction;
-	__u32 min_fragment_size;
-	__u32 max_fragment_size;
-	__u32 min_fragments;
-	__u32 max_fragments;
-	__u32 codecs[MAX_NUM_CODECS];
-	__u32 reserved[11];
-} __attribute__((packed, aligned(4)));
-
-/**
- * struct snd_compr_codec_caps - query capability of codec
- * @codec: codec for which capability is queried
- * @num_descriptors: number of codec descriptors
- * @descriptor: array of codec capability descriptor
- */
-struct snd_compr_codec_caps {
-	__u32 codec;
-	__u32 num_descriptors;
-	struct snd_codec_desc descriptor[MAX_NUM_CODEC_DESCRIPTORS];
-} __attribute__((packed, aligned(4)));
-
-/**
- * enum sndrv_compress_encoder
- * @SNDRV_COMPRESS_ENCODER_PADDING: no of samples appended by the encoder at the
- * end of the track
- * @SNDRV_COMPRESS_ENCODER_DELAY: no of samples inserted by the encoder at the
- * beginning of the track
- */
-enum sndrv_compress_encoder {
-	SNDRV_COMPRESS_ENCODER_PADDING = 1,
-	SNDRV_COMPRESS_ENCODER_DELAY = 2,
-};
-
-/**
- * struct snd_compr_metadata - compressed stream metadata
- * @key: key id
- * @value: key value
- */
-struct snd_compr_metadata {
-	 __u32 key;
-	 __u32 value[8];
-} __attribute__((packed, aligned(4)));
-
-/**
- * compress path ioctl definitions
- * SNDRV_COMPRESS_GET_CAPS: Query capability of DSP
- * SNDRV_COMPRESS_GET_CODEC_CAPS: Query capability of a codec
- * SNDRV_COMPRESS_SET_PARAMS: Set codec and stream parameters
- * Note: only codec params can be changed runtime and stream params cant be
- * SNDRV_COMPRESS_GET_PARAMS: Query codec params
- * SNDRV_COMPRESS_TSTAMP: get the current timestamp value
- * SNDRV_COMPRESS_AVAIL: get the current buffer avail value.
- * This also queries the tstamp properties
- * SNDRV_COMPRESS_PAUSE: Pause the running stream
- * SNDRV_COMPRESS_RESUME: resume a paused stream
- * SNDRV_COMPRESS_START: Start a stream
- * SNDRV_COMPRESS_STOP: stop a running stream, discarding ring buffer content
- * and the buffers currently with DSP
- * SNDRV_COMPRESS_DRAIN: Play till end of buffers and stop after that
- * SNDRV_COMPRESS_IOCTL_VERSION: Query the API version
- */
-#define SNDRV_COMPRESS_IOCTL_VERSION	_IOR('C', 0x00, int)
-#define SNDRV_COMPRESS_GET_CAPS		_IOWR('C', 0x10, struct snd_compr_caps)
-#define SNDRV_COMPRESS_GET_CODEC_CAPS	_IOWR('C', 0x11,\
-						struct snd_compr_codec_caps)
-#define SNDRV_COMPRESS_SET_PARAMS	_IOW('C', 0x12, struct snd_compr_params)
-#define SNDRV_COMPRESS_GET_PARAMS	_IOR('C', 0x13, struct snd_codec)
-#define SNDRV_COMPRESS_SET_METADATA	_IOW('C', 0x14,\
-						 struct snd_compr_metadata)
-#define SNDRV_COMPRESS_GET_METADATA	_IOWR('C', 0x15,\
-						 struct snd_compr_metadata)
-#define SNDRV_COMPRESS_TSTAMP		_IOR('C', 0x20, struct snd_compr_tstamp)
-#define SNDRV_COMPRESS_AVAIL		_IOR('C', 0x21, struct snd_compr_avail)
-#define SNDRV_COMPRESS_PAUSE		_IO('C', 0x30)
-#define SNDRV_COMPRESS_RESUME		_IO('C', 0x31)
-#define SNDRV_COMPRESS_START		_IO('C', 0x32)
-#define SNDRV_COMPRESS_STOP		_IO('C', 0x33)
-#define SNDRV_COMPRESS_DRAIN		_IO('C', 0x34)
-#define SNDRV_COMPRESS_NEXT_TRACK	_IO('C', 0x35)
-#define SNDRV_COMPRESS_PARTIAL_DRAIN	_IO('C', 0x36)
-/*
- * TODO
- * 1. add mmap support
- *
- */
-#define SND_COMPR_TRIGGER_DRAIN 7 /*FIXME move this to pcm.h */
-#define SND_COMPR_TRIGGER_NEXT_TRACK 8
-#define SND_COMPR_TRIGGER_PARTIAL_DRAIN 9
-#endif
diff --git a/openflow/usr/include/sound/compress_params.h b/openflow/usr/include/sound/compress_params.h
deleted file mode 100644
index d9bd9ca..0000000
--- a/openflow/usr/include/sound/compress_params.h
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- *  compress_params.h - codec types and parameters for compressed data
- *  streaming interface
- *
- *  Copyright (C) 2011 Intel Corporation
- *  Authors:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
- *              Vinod Koul <vinod.koul@linux.intel.com>
- *
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * The definitions in this file are derived from the OpenMAX AL version 1.1
- * and OpenMAX IL v 1.1.2 header files which contain the copyright notice below.
- *
- * Copyright (c) 2007-2010 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and/or associated documentation files (the
- * "Materials "), to deal in the Materials without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Materials, and to
- * permit persons to whom the Materials are furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Materials.
- *
- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
- *
- */
-#ifndef __SND_COMPRESS_PARAMS_H
-#define __SND_COMPRESS_PARAMS_H
-
-#include <linux/types.h>
-
-/* AUDIO CODECS SUPPORTED */
-#define MAX_NUM_CODECS 32
-#define MAX_NUM_CODEC_DESCRIPTORS 32
-#define MAX_NUM_BITRATES 32
-#define MAX_NUM_SAMPLE_RATES 32
-
-/* Codecs are listed linearly to allow for extensibility */
-#define SND_AUDIOCODEC_PCM                   ((__u32) 0x00000001)
-#define SND_AUDIOCODEC_MP3                   ((__u32) 0x00000002)
-#define SND_AUDIOCODEC_AMR                   ((__u32) 0x00000003)
-#define SND_AUDIOCODEC_AMRWB                 ((__u32) 0x00000004)
-#define SND_AUDIOCODEC_AMRWBPLUS             ((__u32) 0x00000005)
-#define SND_AUDIOCODEC_AAC                   ((__u32) 0x00000006)
-#define SND_AUDIOCODEC_WMA                   ((__u32) 0x00000007)
-#define SND_AUDIOCODEC_REAL                  ((__u32) 0x00000008)
-#define SND_AUDIOCODEC_VORBIS                ((__u32) 0x00000009)
-#define SND_AUDIOCODEC_FLAC                  ((__u32) 0x0000000A)
-#define SND_AUDIOCODEC_IEC61937              ((__u32) 0x0000000B)
-#define SND_AUDIOCODEC_G723_1                ((__u32) 0x0000000C)
-#define SND_AUDIOCODEC_G729                  ((__u32) 0x0000000D)
-#define SND_AUDIOCODEC_MAX                   SND_AUDIOCODEC_G729
-
-/*
- * Profile and modes are listed with bit masks. This allows for a
- * more compact representation of fields that will not evolve
- * (in contrast to the list of codecs)
- */
-
-#define SND_AUDIOPROFILE_PCM                 ((__u32) 0x00000001)
-
-/* MP3 modes are only useful for encoders */
-#define SND_AUDIOCHANMODE_MP3_MONO           ((__u32) 0x00000001)
-#define SND_AUDIOCHANMODE_MP3_STEREO         ((__u32) 0x00000002)
-#define SND_AUDIOCHANMODE_MP3_JOINTSTEREO    ((__u32) 0x00000004)
-#define SND_AUDIOCHANMODE_MP3_DUAL           ((__u32) 0x00000008)
-
-#define SND_AUDIOPROFILE_AMR                 ((__u32) 0x00000001)
-
-/* AMR modes are only useful for encoders */
-#define SND_AUDIOMODE_AMR_DTX_OFF            ((__u32) 0x00000001)
-#define SND_AUDIOMODE_AMR_VAD1               ((__u32) 0x00000002)
-#define SND_AUDIOMODE_AMR_VAD2               ((__u32) 0x00000004)
-
-#define SND_AUDIOSTREAMFORMAT_UNDEFINED	     ((__u32) 0x00000000)
-#define SND_AUDIOSTREAMFORMAT_CONFORMANCE    ((__u32) 0x00000001)
-#define SND_AUDIOSTREAMFORMAT_IF1            ((__u32) 0x00000002)
-#define SND_AUDIOSTREAMFORMAT_IF2            ((__u32) 0x00000004)
-#define SND_AUDIOSTREAMFORMAT_FSF            ((__u32) 0x00000008)
-#define SND_AUDIOSTREAMFORMAT_RTPPAYLOAD     ((__u32) 0x00000010)
-#define SND_AUDIOSTREAMFORMAT_ITU            ((__u32) 0x00000020)
-
-#define SND_AUDIOPROFILE_AMRWB               ((__u32) 0x00000001)
-
-/* AMRWB modes are only useful for encoders */
-#define SND_AUDIOMODE_AMRWB_DTX_OFF          ((__u32) 0x00000001)
-#define SND_AUDIOMODE_AMRWB_VAD1             ((__u32) 0x00000002)
-#define SND_AUDIOMODE_AMRWB_VAD2             ((__u32) 0x00000004)
-
-#define SND_AUDIOPROFILE_AMRWBPLUS           ((__u32) 0x00000001)
-
-#define SND_AUDIOPROFILE_AAC                 ((__u32) 0x00000001)
-
-/* AAC modes are required for encoders and decoders */
-#define SND_AUDIOMODE_AAC_MAIN               ((__u32) 0x00000001)
-#define SND_AUDIOMODE_AAC_LC                 ((__u32) 0x00000002)
-#define SND_AUDIOMODE_AAC_SSR                ((__u32) 0x00000004)
-#define SND_AUDIOMODE_AAC_LTP                ((__u32) 0x00000008)
-#define SND_AUDIOMODE_AAC_HE                 ((__u32) 0x00000010)
-#define SND_AUDIOMODE_AAC_SCALABLE           ((__u32) 0x00000020)
-#define SND_AUDIOMODE_AAC_ERLC               ((__u32) 0x00000040)
-#define SND_AUDIOMODE_AAC_LD                 ((__u32) 0x00000080)
-#define SND_AUDIOMODE_AAC_HE_PS              ((__u32) 0x00000100)
-#define SND_AUDIOMODE_AAC_HE_MPS             ((__u32) 0x00000200)
-
-/* AAC formats are required for encoders and decoders */
-#define SND_AUDIOSTREAMFORMAT_MP2ADTS        ((__u32) 0x00000001)
-#define SND_AUDIOSTREAMFORMAT_MP4ADTS        ((__u32) 0x00000002)
-#define SND_AUDIOSTREAMFORMAT_MP4LOAS        ((__u32) 0x00000004)
-#define SND_AUDIOSTREAMFORMAT_MP4LATM        ((__u32) 0x00000008)
-#define SND_AUDIOSTREAMFORMAT_ADIF           ((__u32) 0x00000010)
-#define SND_AUDIOSTREAMFORMAT_MP4FF          ((__u32) 0x00000020)
-#define SND_AUDIOSTREAMFORMAT_RAW            ((__u32) 0x00000040)
-
-#define SND_AUDIOPROFILE_WMA7                ((__u32) 0x00000001)
-#define SND_AUDIOPROFILE_WMA8                ((__u32) 0x00000002)
-#define SND_AUDIOPROFILE_WMA9                ((__u32) 0x00000004)
-#define SND_AUDIOPROFILE_WMA10               ((__u32) 0x00000008)
-
-#define SND_AUDIOMODE_WMA_LEVEL1             ((__u32) 0x00000001)
-#define SND_AUDIOMODE_WMA_LEVEL2             ((__u32) 0x00000002)
-#define SND_AUDIOMODE_WMA_LEVEL3             ((__u32) 0x00000004)
-#define SND_AUDIOMODE_WMA_LEVEL4             ((__u32) 0x00000008)
-#define SND_AUDIOMODE_WMAPRO_LEVELM0         ((__u32) 0x00000010)
-#define SND_AUDIOMODE_WMAPRO_LEVELM1         ((__u32) 0x00000020)
-#define SND_AUDIOMODE_WMAPRO_LEVELM2         ((__u32) 0x00000040)
-#define SND_AUDIOMODE_WMAPRO_LEVELM3         ((__u32) 0x00000080)
-
-#define SND_AUDIOSTREAMFORMAT_WMA_ASF        ((__u32) 0x00000001)
-/*
- * Some implementations strip the ASF header and only send ASF packets
- * to the DSP
- */
-#define SND_AUDIOSTREAMFORMAT_WMA_NOASF_HDR  ((__u32) 0x00000002)
-
-#define SND_AUDIOPROFILE_REALAUDIO           ((__u32) 0x00000001)
-
-#define SND_AUDIOMODE_REALAUDIO_G2           ((__u32) 0x00000001)
-#define SND_AUDIOMODE_REALAUDIO_8            ((__u32) 0x00000002)
-#define SND_AUDIOMODE_REALAUDIO_10           ((__u32) 0x00000004)
-#define SND_AUDIOMODE_REALAUDIO_SURROUND     ((__u32) 0x00000008)
-
-#define SND_AUDIOPROFILE_VORBIS              ((__u32) 0x00000001)
-
-#define SND_AUDIOMODE_VORBIS                 ((__u32) 0x00000001)
-
-#define SND_AUDIOPROFILE_FLAC                ((__u32) 0x00000001)
-
-/*
- * Define quality levels for FLAC encoders, from LEVEL0 (fast)
- * to LEVEL8 (best)
- */
-#define SND_AUDIOMODE_FLAC_LEVEL0            ((__u32) 0x00000001)
-#define SND_AUDIOMODE_FLAC_LEVEL1            ((__u32) 0x00000002)
-#define SND_AUDIOMODE_FLAC_LEVEL2            ((__u32) 0x00000004)
-#define SND_AUDIOMODE_FLAC_LEVEL3            ((__u32) 0x00000008)
-#define SND_AUDIOMODE_FLAC_LEVEL4            ((__u32) 0x00000010)
-#define SND_AUDIOMODE_FLAC_LEVEL5            ((__u32) 0x00000020)
-#define SND_AUDIOMODE_FLAC_LEVEL6            ((__u32) 0x00000040)
-#define SND_AUDIOMODE_FLAC_LEVEL7            ((__u32) 0x00000080)
-#define SND_AUDIOMODE_FLAC_LEVEL8            ((__u32) 0x00000100)
-
-#define SND_AUDIOSTREAMFORMAT_FLAC           ((__u32) 0x00000001)
-#define SND_AUDIOSTREAMFORMAT_FLAC_OGG       ((__u32) 0x00000002)
-
-/* IEC61937 payloads without CUVP and preambles */
-#define SND_AUDIOPROFILE_IEC61937            ((__u32) 0x00000001)
-/* IEC61937 with S/PDIF preambles+CUVP bits in 32-bit containers */
-#define SND_AUDIOPROFILE_IEC61937_SPDIF      ((__u32) 0x00000002)
-
-/*
- * IEC modes are mandatory for decoders. Format autodetection
- * will only happen on the DSP side with mode 0. The PCM mode should
- * not be used, the PCM codec should be used instead.
- */
-#define SND_AUDIOMODE_IEC_REF_STREAM_HEADER  ((__u32) 0x00000000)
-#define SND_AUDIOMODE_IEC_LPCM		     ((__u32) 0x00000001)
-#define SND_AUDIOMODE_IEC_AC3		     ((__u32) 0x00000002)
-#define SND_AUDIOMODE_IEC_MPEG1		     ((__u32) 0x00000004)
-#define SND_AUDIOMODE_IEC_MP3		     ((__u32) 0x00000008)
-#define SND_AUDIOMODE_IEC_MPEG2		     ((__u32) 0x00000010)
-#define SND_AUDIOMODE_IEC_AACLC		     ((__u32) 0x00000020)
-#define SND_AUDIOMODE_IEC_DTS		     ((__u32) 0x00000040)
-#define SND_AUDIOMODE_IEC_ATRAC		     ((__u32) 0x00000080)
-#define SND_AUDIOMODE_IEC_SACD		     ((__u32) 0x00000100)
-#define SND_AUDIOMODE_IEC_EAC3		     ((__u32) 0x00000200)
-#define SND_AUDIOMODE_IEC_DTS_HD	     ((__u32) 0x00000400)
-#define SND_AUDIOMODE_IEC_MLP		     ((__u32) 0x00000800)
-#define SND_AUDIOMODE_IEC_DST		     ((__u32) 0x00001000)
-#define SND_AUDIOMODE_IEC_WMAPRO	     ((__u32) 0x00002000)
-#define SND_AUDIOMODE_IEC_REF_CXT            ((__u32) 0x00004000)
-#define SND_AUDIOMODE_IEC_HE_AAC	     ((__u32) 0x00008000)
-#define SND_AUDIOMODE_IEC_HE_AAC2	     ((__u32) 0x00010000)
-#define SND_AUDIOMODE_IEC_MPEG_SURROUND	     ((__u32) 0x00020000)
-
-#define SND_AUDIOPROFILE_G723_1              ((__u32) 0x00000001)
-
-#define SND_AUDIOMODE_G723_1_ANNEX_A         ((__u32) 0x00000001)
-#define SND_AUDIOMODE_G723_1_ANNEX_B         ((__u32) 0x00000002)
-#define SND_AUDIOMODE_G723_1_ANNEX_C         ((__u32) 0x00000004)
-
-#define SND_AUDIOPROFILE_G729                ((__u32) 0x00000001)
-
-#define SND_AUDIOMODE_G729_ANNEX_A           ((__u32) 0x00000001)
-#define SND_AUDIOMODE_G729_ANNEX_B           ((__u32) 0x00000002)
-
-/* <FIXME: multichannel encoders aren't supported for now. Would need
-   an additional definition of channel arrangement> */
-
-/* VBR/CBR definitions */
-#define SND_RATECONTROLMODE_CONSTANTBITRATE  ((__u32) 0x00000001)
-#define SND_RATECONTROLMODE_VARIABLEBITRATE  ((__u32) 0x00000002)
-
-/* Encoder options */
-
-struct snd_enc_wma {
-	__u32 super_block_align; /* WMA Type-specific data */
-};
-
-
-/**
- * struct snd_enc_vorbis
- * @quality: Sets encoding quality to n, between -1 (low) and 10 (high).
- * In the default mode of operation, the quality level is 3.
- * Normal quality range is 0 - 10.
- * @managed: Boolean. Set  bitrate  management  mode. This turns off the
- * normal VBR encoding, but allows hard or soft bitrate constraints to be
- * enforced by the encoder. This mode can be slower, and may also be
- * lower quality. It is primarily useful for streaming.
- * @max_bit_rate: Enabled only if managed is TRUE
- * @min_bit_rate: Enabled only if managed is TRUE
- * @downmix: Boolean. Downmix input from stereo to mono (has no effect on
- * non-stereo streams). Useful for lower-bitrate encoding.
- *
- * These options were extracted from the OpenMAX IL spec and Gstreamer vorbisenc
- * properties
- *
- * For best quality users should specify VBR mode and set quality levels.
- */
-
-struct snd_enc_vorbis {
-	__s32 quality;
-	__u32 managed;
-	__u32 max_bit_rate;
-	__u32 min_bit_rate;
-	__u32 downmix;
-} __attribute__((packed, aligned(4)));
-
-
-/**
- * struct snd_enc_real
- * @quant_bits: number of coupling quantization bits in the stream
- * @start_region: coupling start region in the stream
- * @num_regions: number of regions value
- *
- * These options were extracted from the OpenMAX IL spec
- */
-
-struct snd_enc_real {
-	__u32 quant_bits;
-	__u32 start_region;
-	__u32 num_regions;
-} __attribute__((packed, aligned(4)));
-
-/**
- * struct snd_enc_flac
- * @num: serial number, valid only for OGG formats
- *	needs to be set by application
- * @gain: Add replay gain tags
- *
- * These options were extracted from the FLAC online documentation
- * at http://flac.sourceforge.net/documentation_tools_flac.html
- *
- * To make the API simpler, it is assumed that the user will select quality
- * profiles. Additional options that affect encoding quality and speed can
- * be added at a later stage if needed.
- *
- * By default the Subset format is used by encoders.
- *
- * TAGS such as pictures, etc, cannot be handled by an offloaded encoder and are
- * not supported in this API.
- */
-
-struct snd_enc_flac {
-	__u32 num;
-	__u32 gain;
-} __attribute__((packed, aligned(4)));
-
-struct snd_enc_generic {
-	__u32 bw;	/* encoder bandwidth */
-	__s32 reserved[15];
-} __attribute__((packed, aligned(4)));
-
-union snd_codec_options {
-	struct snd_enc_wma wma;
-	struct snd_enc_vorbis vorbis;
-	struct snd_enc_real real;
-	struct snd_enc_flac flac;
-	struct snd_enc_generic generic;
-} __attribute__((packed, aligned(4)));
-
-/** struct snd_codec_desc - description of codec capabilities
- * @max_ch: Maximum number of audio channels
- * @sample_rates: Sampling rates in Hz, use values like 48000 for this
- * @num_sample_rates: Number of valid values in sample_rates array
- * @bit_rate: Indexed array containing supported bit rates
- * @num_bitrates: Number of valid values in bit_rate array
- * @rate_control: value is specified by SND_RATECONTROLMODE defines.
- * @profiles: Supported profiles. See SND_AUDIOPROFILE defines.
- * @modes: Supported modes. See SND_AUDIOMODE defines
- * @formats: Supported formats. See SND_AUDIOSTREAMFORMAT defines
- * @min_buffer: Minimum buffer size handled by codec implementation
- * @reserved: reserved for future use
- *
- * This structure provides a scalar value for profiles, modes and stream
- * format fields.
- * If an implementation supports multiple combinations, they will be listed as
- * codecs with different descriptors, for example there would be 2 descriptors
- * for AAC-RAW and AAC-ADTS.
- * This entails some redundancy but makes it easier to avoid invalid
- * configurations.
- *
- */
-
-struct snd_codec_desc {
-	__u32 max_ch;
-	__u32 sample_rates[MAX_NUM_SAMPLE_RATES];
-	__u32 num_sample_rates;
-	__u32 bit_rate[MAX_NUM_BITRATES];
-	__u32 num_bitrates;
-	__u32 rate_control;
-	__u32 profiles;
-	__u32 modes;
-	__u32 formats;
-	__u32 min_buffer;
-	__u32 reserved[15];
-} __attribute__((packed, aligned(4)));
-
-/** struct snd_codec
- * @id: Identifies the supported audio encoder/decoder.
- *		See SND_AUDIOCODEC macros.
- * @ch_in: Number of input audio channels
- * @ch_out: Number of output channels. In case of contradiction between
- *		this field and the channelMode field, the channelMode field
- *		overrides.
- * @sample_rate: Audio sample rate of input data in Hz, use values like 48000
- *		for this.
- * @bit_rate: Bitrate of encoded data. May be ignored by decoders
- * @rate_control: Encoding rate control. See SND_RATECONTROLMODE defines.
- *               Encoders may rely on profiles for quality levels.
- *		 May be ignored by decoders.
- * @profile: Mandatory for encoders, can be mandatory for specific
- *		decoders as well. See SND_AUDIOPROFILE defines.
- * @level: Supported level (Only used by WMA at the moment)
- * @ch_mode: Channel mode for encoder. See SND_AUDIOCHANMODE defines
- * @format: Format of encoded bistream. Mandatory when defined.
- *		See SND_AUDIOSTREAMFORMAT defines.
- * @align: Block alignment in bytes of an audio sample.
- *		Only required for PCM or IEC formats.
- * @options: encoder-specific settings
- * @reserved: reserved for future use
- */
-
-struct snd_codec {
-	__u32 id;
-	__u32 ch_in;
-	__u32 ch_out;
-	__u32 sample_rate;
-	__u32 bit_rate;
-	__u32 rate_control;
-	__u32 profile;
-	__u32 level;
-	__u32 ch_mode;
-	__u32 format;
-	__u32 align;
-	union snd_codec_options options;
-	__u32 reserved[3];
-} __attribute__((packed, aligned(4)));
-
-#endif
diff --git a/openflow/usr/include/sound/emu10k1.h b/openflow/usr/include/sound/emu10k1.h
deleted file mode 100644
index 833aa69..0000000
--- a/openflow/usr/include/sound/emu10k1.h
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
- *		     Creative Labs, Inc.
- *  Definitions for EMU10K1 (SB Live!) chips
- *
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-#ifndef __SOUND_EMU10K1_H
-#define __SOUND_EMU10K1_H
-
-#include <linux/types.h>
-#include <sound/asound.h>
-
-/*
- * ---- FX8010 ----
- */
-
-#define EMU10K1_CARD_CREATIVE			0x00000000
-#define EMU10K1_CARD_EMUAPS			0x00000001
-
-#define EMU10K1_FX8010_PCM_COUNT		8
-
-/*
- * Following definition is copied from linux/types.h to support compiling
- * this header file in userspace since they are not generally available for
- * uapi headers.
- */
-#define __EMU10K1_DECLARE_BITMAP(name,bits) \
-	unsigned long name[(bits) / (sizeof(unsigned long) * 8)]
-
-/* instruction set */
-#define iMAC0	 0x00	/* R = A + (X * Y >> 31)   ; saturation */
-#define iMAC1	 0x01	/* R = A + (-X * Y >> 31)  ; saturation */
-#define iMAC2	 0x02	/* R = A + (X * Y >> 31)   ; wraparound */
-#define iMAC3	 0x03	/* R = A + (-X * Y >> 31)  ; wraparound */
-#define iMACINT0 0x04	/* R = A + X * Y	   ; saturation */
-#define iMACINT1 0x05	/* R = A + X * Y	   ; wraparound (31-bit) */
-#define iACC3	 0x06	/* R = A + X + Y	   ; saturation */
-#define iMACMV   0x07	/* R = A, acc += X * Y >> 31 */
-#define iANDXOR  0x08	/* R = (A & X) ^ Y */
-#define iTSTNEG  0x09	/* R = (A >= Y) ? X : ~X */
-#define iLIMITGE 0x0a	/* R = (A >= Y) ? X : Y */
-#define iLIMITLT 0x0b	/* R = (A < Y) ? X : Y */
-#define iLOG	 0x0c	/* R = linear_data, A (log_data), X (max_exp), Y (format_word) */
-#define iEXP	 0x0d	/* R = log_data, A (linear_data), X (max_exp), Y (format_word) */
-#define iINTERP  0x0e	/* R = A + (X * (Y - A) >> 31)  ; saturation */
-#define iSKIP    0x0f	/* R = A (cc_reg), X (count), Y (cc_test) */
-
-/* GPRs */
-#define FXBUS(x)	(0x00 + (x))	/* x = 0x00 - 0x0f */
-#define EXTIN(x)	(0x10 + (x))	/* x = 0x00 - 0x0f */
-#define EXTOUT(x)	(0x20 + (x))	/* x = 0x00 - 0x0f physical outs -> FXWC low 16 bits */
-#define FXBUS2(x)	(0x30 + (x))	/* x = 0x00 - 0x0f copies of fx buses for capture -> FXWC high 16 bits */
-					/* NB: 0x31 and 0x32 are shared with Center/LFE on SB live 5.1 */
-
-#define C_00000000	0x40
-#define C_00000001	0x41
-#define C_00000002	0x42
-#define C_00000003	0x43
-#define C_00000004	0x44
-#define C_00000008	0x45
-#define C_00000010	0x46
-#define C_00000020	0x47
-#define C_00000100	0x48
-#define C_00010000	0x49
-#define C_00080000	0x4a
-#define C_10000000	0x4b
-#define C_20000000	0x4c
-#define C_40000000	0x4d
-#define C_80000000	0x4e
-#define C_7fffffff	0x4f
-#define C_ffffffff	0x50
-#define C_fffffffe	0x51
-#define C_c0000000	0x52
-#define C_4f1bbcdc	0x53
-#define C_5a7ef9db	0x54
-#define C_00100000	0x55		/* ?? */
-#define GPR_ACCU	0x56		/* ACCUM, accumulator */
-#define GPR_COND	0x57		/* CCR, condition register */
-#define GPR_NOISE0	0x58		/* noise source */
-#define GPR_NOISE1	0x59		/* noise source */
-#define GPR_IRQ		0x5a		/* IRQ register */
-#define GPR_DBAC	0x5b		/* TRAM Delay Base Address Counter */
-#define GPR(x)		(FXGPREGBASE + (x)) /* free GPRs: x = 0x00 - 0xff */
-#define ITRAM_DATA(x)	(TANKMEMDATAREGBASE + 0x00 + (x)) /* x = 0x00 - 0x7f */
-#define ETRAM_DATA(x)	(TANKMEMDATAREGBASE + 0x80 + (x)) /* x = 0x00 - 0x1f */
-#define ITRAM_ADDR(x)	(TANKMEMADDRREGBASE + 0x00 + (x)) /* x = 0x00 - 0x7f */
-#define ETRAM_ADDR(x)	(TANKMEMADDRREGBASE + 0x80 + (x)) /* x = 0x00 - 0x1f */
-
-#define A_ITRAM_DATA(x)	(TANKMEMDATAREGBASE + 0x00 + (x)) /* x = 0x00 - 0xbf */
-#define A_ETRAM_DATA(x)	(TANKMEMDATAREGBASE + 0xc0 + (x)) /* x = 0x00 - 0x3f */
-#define A_ITRAM_ADDR(x)	(TANKMEMADDRREGBASE + 0x00 + (x)) /* x = 0x00 - 0xbf */
-#define A_ETRAM_ADDR(x)	(TANKMEMADDRREGBASE + 0xc0 + (x)) /* x = 0x00 - 0x3f */
-#define A_ITRAM_CTL(x)	(A_TANKMEMCTLREGBASE + 0x00 + (x)) /* x = 0x00 - 0xbf */
-#define A_ETRAM_CTL(x)	(A_TANKMEMCTLREGBASE + 0xc0 + (x)) /* x = 0x00 - 0x3f */
-
-#define A_FXBUS(x)	(0x00 + (x))	/* x = 0x00 - 0x3f FX buses */
-#define A_EXTIN(x)	(0x40 + (x))	/* x = 0x00 - 0x0f physical ins */
-#define A_P16VIN(x)	(0x50 + (x))	/* x = 0x00 - 0x0f p16v ins (A2 only) "EMU32 inputs" */
-#define A_EXTOUT(x)	(0x60 + (x))	/* x = 0x00 - 0x1f physical outs -> A_FXWC1 0x79-7f unknown   */
-#define A_FXBUS2(x)	(0x80 + (x))	/* x = 0x00 - 0x1f extra outs used for EFX capture -> A_FXWC2 */
-#define A_EMU32OUTH(x)	(0xa0 + (x))	/* x = 0x00 - 0x0f "EMU32_OUT_10 - _1F" - ??? */
-#define A_EMU32OUTL(x)	(0xb0 + (x))	/* x = 0x00 - 0x0f "EMU32_OUT_1 - _F" - ??? */
-#define A3_EMU32IN(x)	(0x160 + (x))	/* x = 0x00 - 0x3f "EMU32_IN_00 - _3F" - Only when .device = 0x0008 */
-#define A3_EMU32OUT(x)	(0x1E0 + (x))	/* x = 0x00 - 0x0f "EMU32_OUT_00 - _3F" - Only when .device = 0x0008 */
-#define A_GPR(x)	(A_FXGPREGBASE + (x))
-
-/* cc_reg constants */
-#define CC_REG_NORMALIZED C_00000001
-#define CC_REG_BORROW	C_00000002
-#define CC_REG_MINUS	C_00000004
-#define CC_REG_ZERO	C_00000008
-#define CC_REG_SATURATE	C_00000010
-#define CC_REG_NONZERO	C_00000100
-
-/* FX buses */
-#define FXBUS_PCM_LEFT		0x00
-#define FXBUS_PCM_RIGHT		0x01
-#define FXBUS_PCM_LEFT_REAR	0x02
-#define FXBUS_PCM_RIGHT_REAR	0x03
-#define FXBUS_MIDI_LEFT		0x04
-#define FXBUS_MIDI_RIGHT	0x05
-#define FXBUS_PCM_CENTER	0x06
-#define FXBUS_PCM_LFE		0x07
-#define FXBUS_PCM_LEFT_FRONT	0x08
-#define FXBUS_PCM_RIGHT_FRONT	0x09
-#define FXBUS_MIDI_REVERB	0x0c
-#define FXBUS_MIDI_CHORUS	0x0d
-#define FXBUS_PCM_LEFT_SIDE	0x0e
-#define FXBUS_PCM_RIGHT_SIDE	0x0f
-#define FXBUS_PT_LEFT		0x14
-#define FXBUS_PT_RIGHT		0x15
-
-/* Inputs */
-#define EXTIN_AC97_L	   0x00	/* AC'97 capture channel - left */
-#define EXTIN_AC97_R	   0x01	/* AC'97 capture channel - right */
-#define EXTIN_SPDIF_CD_L   0x02	/* internal S/PDIF CD - onboard - left */
-#define EXTIN_SPDIF_CD_R   0x03	/* internal S/PDIF CD - onboard - right */
-#define EXTIN_ZOOM_L	   0x04	/* Zoom Video I2S - left */
-#define EXTIN_ZOOM_R	   0x05	/* Zoom Video I2S - right */
-#define EXTIN_TOSLINK_L	   0x06	/* LiveDrive - TOSLink Optical - left */
-#define EXTIN_TOSLINK_R    0x07	/* LiveDrive - TOSLink Optical - right */
-#define EXTIN_LINE1_L	   0x08	/* LiveDrive - Line/Mic 1 - left */
-#define EXTIN_LINE1_R	   0x09	/* LiveDrive - Line/Mic 1 - right */
-#define EXTIN_COAX_SPDIF_L 0x0a	/* LiveDrive - Coaxial S/PDIF - left */
-#define EXTIN_COAX_SPDIF_R 0x0b /* LiveDrive - Coaxial S/PDIF - right */
-#define EXTIN_LINE2_L	   0x0c	/* LiveDrive - Line/Mic 2 - left */
-#define EXTIN_LINE2_R	   0x0d	/* LiveDrive - Line/Mic 2 - right */
-
-/* Outputs */
-#define EXTOUT_AC97_L	   0x00	/* AC'97 playback channel - left */
-#define EXTOUT_AC97_R	   0x01	/* AC'97 playback channel - right */
-#define EXTOUT_TOSLINK_L   0x02	/* LiveDrive - TOSLink Optical - left */
-#define EXTOUT_TOSLINK_R   0x03	/* LiveDrive - TOSLink Optical - right */
-#define EXTOUT_AC97_CENTER 0x04	/* SB Live 5.1 - center */
-#define EXTOUT_AC97_LFE	   0x05 /* SB Live 5.1 - LFE */
-#define EXTOUT_HEADPHONE_L 0x06	/* LiveDrive - Headphone - left */
-#define EXTOUT_HEADPHONE_R 0x07	/* LiveDrive - Headphone - right */
-#define EXTOUT_REAR_L	   0x08	/* Rear channel - left */
-#define EXTOUT_REAR_R	   0x09	/* Rear channel - right */
-#define EXTOUT_ADC_CAP_L   0x0a	/* ADC Capture buffer - left */
-#define EXTOUT_ADC_CAP_R   0x0b	/* ADC Capture buffer - right */
-#define EXTOUT_MIC_CAP	   0x0c	/* MIC Capture buffer */
-#define EXTOUT_AC97_REAR_L 0x0d	/* SB Live 5.1 (c) 2003 - Rear Left */
-#define EXTOUT_AC97_REAR_R 0x0e	/* SB Live 5.1 (c) 2003 - Rear Right */
-#define EXTOUT_ACENTER	   0x11 /* Analog Center */
-#define EXTOUT_ALFE	   0x12 /* Analog LFE */
-
-/* Audigy Inputs */
-#define A_EXTIN_AC97_L		0x00	/* AC'97 capture channel - left */
-#define A_EXTIN_AC97_R		0x01	/* AC'97 capture channel - right */
-#define A_EXTIN_SPDIF_CD_L	0x02	/* digital CD left */
-#define A_EXTIN_SPDIF_CD_R	0x03	/* digital CD left */
-#define A_EXTIN_OPT_SPDIF_L     0x04    /* audigy drive Optical SPDIF - left */
-#define A_EXTIN_OPT_SPDIF_R     0x05    /*                              right */ 
-#define A_EXTIN_LINE2_L		0x08	/* audigy drive line2/mic2 - left */
-#define A_EXTIN_LINE2_R		0x09	/*                           right */
-#define A_EXTIN_ADC_L		0x0a    /* Philips ADC - left */
-#define A_EXTIN_ADC_R		0x0b    /*               right */
-#define A_EXTIN_AUX2_L		0x0c	/* audigy drive aux2 - left */
-#define A_EXTIN_AUX2_R		0x0d	/*                   - right */
-
-/* Audigiy Outputs */
-#define A_EXTOUT_FRONT_L	0x00	/* digital front left */
-#define A_EXTOUT_FRONT_R	0x01	/*               right */
-#define A_EXTOUT_CENTER		0x02	/* digital front center */
-#define A_EXTOUT_LFE		0x03	/* digital front lfe */
-#define A_EXTOUT_HEADPHONE_L	0x04	/* headphone audigy drive left */
-#define A_EXTOUT_HEADPHONE_R	0x05	/*                        right */
-#define A_EXTOUT_REAR_L		0x06	/* digital rear left */
-#define A_EXTOUT_REAR_R		0x07	/*              right */
-#define A_EXTOUT_AFRONT_L	0x08	/* analog front left */
-#define A_EXTOUT_AFRONT_R	0x09	/*              right */
-#define A_EXTOUT_ACENTER	0x0a	/* analog center */
-#define A_EXTOUT_ALFE		0x0b	/* analog LFE */
-#define A_EXTOUT_ASIDE_L	0x0c	/* analog side left  - Audigy 2 ZS */
-#define A_EXTOUT_ASIDE_R	0x0d	/*             right - Audigy 2 ZS */
-#define A_EXTOUT_AREAR_L	0x0e	/* analog rear left */
-#define A_EXTOUT_AREAR_R	0x0f	/*             right */
-#define A_EXTOUT_AC97_L		0x10	/* AC97 left (front) */
-#define A_EXTOUT_AC97_R		0x11	/*      right */
-#define A_EXTOUT_ADC_CAP_L	0x16	/* ADC capture buffer left */
-#define A_EXTOUT_ADC_CAP_R	0x17	/*                    right */
-#define A_EXTOUT_MIC_CAP	0x18	/* Mic capture buffer */
-
-/* Audigy constants */
-#define A_C_00000000	0xc0
-#define A_C_00000001	0xc1
-#define A_C_00000002	0xc2
-#define A_C_00000003	0xc3
-#define A_C_00000004	0xc4
-#define A_C_00000008	0xc5
-#define A_C_00000010	0xc6
-#define A_C_00000020	0xc7
-#define A_C_00000100	0xc8
-#define A_C_00010000	0xc9
-#define A_C_00000800	0xca
-#define A_C_10000000	0xcb
-#define A_C_20000000	0xcc
-#define A_C_40000000	0xcd
-#define A_C_80000000	0xce
-#define A_C_7fffffff	0xcf
-#define A_C_ffffffff	0xd0
-#define A_C_fffffffe	0xd1
-#define A_C_c0000000	0xd2
-#define A_C_4f1bbcdc	0xd3
-#define A_C_5a7ef9db	0xd4
-#define A_C_00100000	0xd5
-#define A_GPR_ACCU	0xd6		/* ACCUM, accumulator */
-#define A_GPR_COND	0xd7		/* CCR, condition register */
-#define A_GPR_NOISE0	0xd8		/* noise source */
-#define A_GPR_NOISE1	0xd9		/* noise source */
-#define A_GPR_IRQ	0xda		/* IRQ register */
-#define A_GPR_DBAC	0xdb		/* TRAM Delay Base Address Counter - internal */
-#define A_GPR_DBACE	0xde		/* TRAM Delay Base Address Counter - external */
-
-/* definitions for debug register */
-#define EMU10K1_DBG_ZC			0x80000000	/* zero tram counter */
-#define EMU10K1_DBG_SATURATION_OCCURED	0x02000000	/* saturation control */
-#define EMU10K1_DBG_SATURATION_ADDR	0x01ff0000	/* saturation address */
-#define EMU10K1_DBG_SINGLE_STEP		0x00008000	/* single step mode */
-#define EMU10K1_DBG_STEP		0x00004000	/* start single step */
-#define EMU10K1_DBG_CONDITION_CODE	0x00003e00	/* condition code */
-#define EMU10K1_DBG_SINGLE_STEP_ADDR	0x000001ff	/* single step address */
-
-/* tank memory address line */
-#define TANKMEMADDRREG_ADDR_MASK 0x000fffff	/* 20 bit tank address field			*/
-#define TANKMEMADDRREG_CLEAR	 0x00800000	/* Clear tank memory				*/
-#define TANKMEMADDRREG_ALIGN	 0x00400000	/* Align read or write relative to tank access	*/
-#define TANKMEMADDRREG_WRITE	 0x00200000	/* Write to tank memory				*/
-#define TANKMEMADDRREG_READ	 0x00100000	/* Read from tank memory			*/
-
-struct snd_emu10k1_fx8010_info {
-	unsigned int internal_tram_size;	/* in samples */
-	unsigned int external_tram_size;	/* in samples */
-	char fxbus_names[16][32];		/* names of FXBUSes */
-	char extin_names[16][32];		/* names of external inputs */
-	char extout_names[32][32];		/* names of external outputs */
-	unsigned int gpr_controls;		/* count of GPR controls */
-};
-
-#define EMU10K1_GPR_TRANSLATION_NONE		0
-#define EMU10K1_GPR_TRANSLATION_TABLE100	1
-#define EMU10K1_GPR_TRANSLATION_BASS		2
-#define EMU10K1_GPR_TRANSLATION_TREBLE		3
-#define EMU10K1_GPR_TRANSLATION_ONOFF		4
-
-struct snd_emu10k1_fx8010_control_gpr {
-	struct snd_ctl_elem_id id;		/* full control ID definition */
-	unsigned int vcount;		/* visible count */
-	unsigned int count;		/* count of GPR (1..16) */
-	unsigned short gpr[32];		/* GPR number(s) */
-	unsigned int value[32];		/* initial values */
-	unsigned int min;		/* minimum range */
-	unsigned int max;		/* maximum range */
-	unsigned int translation;	/* translation type (EMU10K1_GPR_TRANSLATION*) */
-	const unsigned int *tlv;
-};
-
-/* old ABI without TLV support */
-struct snd_emu10k1_fx8010_control_old_gpr {
-	struct snd_ctl_elem_id id;
-	unsigned int vcount;
-	unsigned int count;
-	unsigned short gpr[32];
-	unsigned int value[32];
-	unsigned int min;
-	unsigned int max;
-	unsigned int translation;
-};
-
-struct snd_emu10k1_fx8010_code {
-	char name[128];
-
-	__EMU10K1_DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
-	__u32 *gpr_map;		/* initializers */
-
-	unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */
-	struct snd_emu10k1_fx8010_control_gpr *gpr_add_controls; /* GPR controls to add/replace */
-
-	unsigned int gpr_del_control_count; /* count of GPR controls to remove */
-	struct snd_ctl_elem_id *gpr_del_controls; /* IDs of GPR controls to remove */
-
-	unsigned int gpr_list_control_count; /* count of GPR controls to list */
-	unsigned int gpr_list_control_total; /* total count of GPR controls */
-	struct snd_emu10k1_fx8010_control_gpr *gpr_list_controls; /* listed GPR controls */
-
-	__EMU10K1_DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */
-	__u32 *tram_data_map;	  /* data initializers */
-	__u32 *tram_addr_map;	  /* map initializers */
-
-	__EMU10K1_DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */
-	__u32 *code;		  /* one instruction - 64 bits */
-};
-
-struct snd_emu10k1_fx8010_tram {
-	unsigned int address;		/* 31.bit == 1 -> external TRAM */
-	unsigned int size;		/* size in samples (4 bytes) */
-	unsigned int *samples;		/* pointer to samples (20-bit) */
-					/* NULL->clear memory */
-};
-
-struct snd_emu10k1_fx8010_pcm_rec {
-	unsigned int substream;		/* substream number */
-	unsigned int res1;		/* reserved */
-	unsigned int channels;		/* 16-bit channels count, zero = remove this substream */
-	unsigned int tram_start;	/* ring buffer position in TRAM (in samples) */
-	unsigned int buffer_size;	/* count of buffered samples */
-	unsigned short gpr_size;		/* GPR containing size of ringbuffer in samples (host) */
-	unsigned short gpr_ptr;		/* GPR containing current pointer in the ring buffer (host = reset, FX8010) */
-	unsigned short gpr_count;	/* GPR containing count of samples between two interrupts (host) */
-	unsigned short gpr_tmpcount;	/* GPR containing current count of samples to interrupt (host = set, FX8010) */
-	unsigned short gpr_trigger;	/* GPR containing trigger (activate) information (host) */
-	unsigned short gpr_running;	/* GPR containing info if PCM is running (FX8010) */
-	unsigned char pad;		/* reserved */
-	unsigned char etram[32];	/* external TRAM address & data (one per channel) */
-	unsigned int res2;		/* reserved */
-};
-
-#define SNDRV_EMU10K1_VERSION		SNDRV_PROTOCOL_VERSION(1, 0, 1)
-
-#define SNDRV_EMU10K1_IOCTL_INFO	_IOR ('H', 0x10, struct snd_emu10k1_fx8010_info)
-#define SNDRV_EMU10K1_IOCTL_CODE_POKE	_IOW ('H', 0x11, struct snd_emu10k1_fx8010_code)
-#define SNDRV_EMU10K1_IOCTL_CODE_PEEK	_IOWR('H', 0x12, struct snd_emu10k1_fx8010_code)
-#define SNDRV_EMU10K1_IOCTL_TRAM_SETUP	_IOW ('H', 0x20, int)
-#define SNDRV_EMU10K1_IOCTL_TRAM_POKE	_IOW ('H', 0x21, struct snd_emu10k1_fx8010_tram)
-#define SNDRV_EMU10K1_IOCTL_TRAM_PEEK	_IOWR('H', 0x22, struct snd_emu10k1_fx8010_tram)
-#define SNDRV_EMU10K1_IOCTL_PCM_POKE	_IOW ('H', 0x30, struct snd_emu10k1_fx8010_pcm_rec)
-#define SNDRV_EMU10K1_IOCTL_PCM_PEEK	_IOWR('H', 0x31, struct snd_emu10k1_fx8010_pcm_rec)
-#define SNDRV_EMU10K1_IOCTL_PVERSION	_IOR ('H', 0x40, int)
-#define SNDRV_EMU10K1_IOCTL_STOP	_IO  ('H', 0x80)
-#define SNDRV_EMU10K1_IOCTL_CONTINUE	_IO  ('H', 0x81)
-#define SNDRV_EMU10K1_IOCTL_ZERO_TRAM_COUNTER _IO ('H', 0x82)
-#define SNDRV_EMU10K1_IOCTL_SINGLE_STEP	_IOW ('H', 0x83, int)
-#define SNDRV_EMU10K1_IOCTL_DBG_READ	_IOR ('H', 0x84, int)
-
-/* typedefs for compatibility to user-space */
-typedef struct snd_emu10k1_fx8010_info emu10k1_fx8010_info_t;
-typedef struct snd_emu10k1_fx8010_control_gpr emu10k1_fx8010_control_gpr_t;
-typedef struct snd_emu10k1_fx8010_code emu10k1_fx8010_code_t;
-typedef struct snd_emu10k1_fx8010_tram emu10k1_fx8010_tram_t;
-typedef struct snd_emu10k1_fx8010_pcm_rec emu10k1_fx8010_pcm_t;
-
-#endif /* __SOUND_EMU10K1_H */
diff --git a/openflow/usr/include/sound/firewire.h b/openflow/usr/include/sound/firewire.h
deleted file mode 100644
index 2da0160..0000000
--- a/openflow/usr/include/sound/firewire.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef _SOUND_FIREWIRE_H_INCLUDED
-#define _SOUND_FIREWIRE_H_INCLUDED
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-/* events can be read() from the hwdep device */
-
-#define SNDRV_FIREWIRE_EVENT_LOCK_STATUS	0x000010cc
-#define SNDRV_FIREWIRE_EVENT_DICE_NOTIFICATION	0xd1ce004e
-#define SNDRV_FIREWIRE_EVENT_EFW_RESPONSE	0x4e617475
-#define SNDRV_FIREWIRE_EVENT_DIGI00X_MESSAGE	0x746e736c
-
-struct snd_firewire_event_common {
-	unsigned int type; /* SNDRV_FIREWIRE_EVENT_xxx */
-};
-
-struct snd_firewire_event_lock_status {
-	unsigned int type;
-	unsigned int status; /* 0/1 = unlocked/locked */
-};
-
-struct snd_firewire_event_dice_notification {
-	unsigned int type;
-	unsigned int notification; /* DICE-specific bits */
-};
-
-#define SND_EFW_TRANSACTION_USER_SEQNUM_MAX	((__u32)((__u16)~0) - 1)
-/* each field should be in big endian */
-struct snd_efw_transaction {
-	__be32 length;
-	__be32 version;
-	__be32 seqnum;
-	__be32 category;
-	__be32 command;
-	__be32 status;
-	__be32 params[0];
-};
-struct snd_firewire_event_efw_response {
-	unsigned int type;
-	__be32 response[0];	/* some responses */
-};
-
-struct snd_firewire_event_digi00x_message {
-	unsigned int type;
-	__u32 message;	/* Digi00x-specific message */
-};
-
-union snd_firewire_event {
-	struct snd_firewire_event_common            common;
-	struct snd_firewire_event_lock_status       lock_status;
-	struct snd_firewire_event_dice_notification dice_notification;
-	struct snd_firewire_event_efw_response      efw_response;
-	struct snd_firewire_event_digi00x_message   digi00x_message;
-};
-
-
-#define SNDRV_FIREWIRE_IOCTL_GET_INFO _IOR('H', 0xf8, struct snd_firewire_get_info)
-#define SNDRV_FIREWIRE_IOCTL_LOCK      _IO('H', 0xf9)
-#define SNDRV_FIREWIRE_IOCTL_UNLOCK    _IO('H', 0xfa)
-
-#define SNDRV_FIREWIRE_TYPE_DICE	1
-#define SNDRV_FIREWIRE_TYPE_FIREWORKS	2
-#define SNDRV_FIREWIRE_TYPE_BEBOB	3
-#define SNDRV_FIREWIRE_TYPE_OXFW	4
-#define SNDRV_FIREWIRE_TYPE_DIGI00X	5
-#define SNDRV_FIREWIRE_TYPE_TASCAM	6
-/* RME, MOTU, ... */
-
-struct snd_firewire_get_info {
-	unsigned int type; /* SNDRV_FIREWIRE_TYPE_xxx */
-	unsigned int card; /* same as fw_cdev_get_info.card */
-	unsigned char guid[8];
-	char device_name[16]; /* device node in /dev */
-};
-
-/*
- * SNDRV_FIREWIRE_IOCTL_LOCK prevents the driver from streaming.
- * Returns -EBUSY if the driver is already streaming.
- */
-
-#endif /* _SOUND_FIREWIRE_H_INCLUDED */
diff --git a/openflow/usr/include/sound/hdsp.h b/openflow/usr/include/sound/hdsp.h
deleted file mode 100644
index 56b11a7..0000000
--- a/openflow/usr/include/sound/hdsp.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef __SOUND_HDSP_H
-#define __SOUND_HDSP_H
-
-/*
- *   Copyright (C) 2003 Thomas Charbonnel (thomas@undata.org)
- *    
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/types.h>
-
-#define HDSP_MATRIX_MIXER_SIZE 2048
-
-enum HDSP_IO_Type {
-	Digiface,
-	Multiface,
-	H9652,
-	H9632,
-	RPM,
-	Undefined,
-};
-
-struct hdsp_peak_rms {
-	__u32 input_peaks[26];
-	__u32 playback_peaks[26];
-	__u32 output_peaks[28];
-	__u64 input_rms[26];
-	__u64 playback_rms[26];
-	/* These are only used for H96xx cards */
-	__u64 output_rms[26];
-};
-
-#define SNDRV_HDSP_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, struct hdsp_peak_rms)
-
-struct hdsp_config_info {
-	unsigned char pref_sync_ref;
-	unsigned char wordclock_sync_check;
-	unsigned char spdif_sync_check;
-	unsigned char adatsync_sync_check;
-	unsigned char adat_sync_check[3];
-	unsigned char spdif_in;
-	unsigned char spdif_out;
-	unsigned char spdif_professional;
-	unsigned char spdif_emphasis;
-	unsigned char spdif_nonaudio;
-	unsigned int spdif_sample_rate;
-	unsigned int system_sample_rate;
-	unsigned int autosync_sample_rate;
-	unsigned char system_clock_mode;
-	unsigned char clock_source;
-	unsigned char autosync_ref;
-	unsigned char line_out;
-	unsigned char passthru; 
-	unsigned char da_gain;
-	unsigned char ad_gain;
-	unsigned char phone_gain;
-	unsigned char xlr_breakout_cable;
-	unsigned char analog_extension_board;
-};
-
-#define SNDRV_HDSP_IOCTL_GET_CONFIG_INFO _IOR('H', 0x41, struct hdsp_config_info)
-
-struct hdsp_firmware {
-	void *firmware_data;	/* 24413 x 4 bytes */
-};
-
-#define SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE _IOW('H', 0x42, struct hdsp_firmware)
-
-struct hdsp_version {
-	enum HDSP_IO_Type io_type;
-	unsigned short firmware_rev;
-};
-
-#define SNDRV_HDSP_IOCTL_GET_VERSION _IOR('H', 0x43, struct hdsp_version)
-
-struct hdsp_mixer {
-	unsigned short matrix[HDSP_MATRIX_MIXER_SIZE];
-};
-
-#define SNDRV_HDSP_IOCTL_GET_MIXER _IOR('H', 0x44, struct hdsp_mixer)
-
-struct hdsp_9632_aeb {
-	int aebi;
-	int aebo;
-};
-
-#define SNDRV_HDSP_IOCTL_GET_9632_AEB _IOR('H', 0x45, struct hdsp_9632_aeb)
-
-/* typedefs for compatibility to user-space */
-typedef enum HDSP_IO_Type HDSP_IO_Type;
-typedef struct hdsp_peak_rms hdsp_peak_rms_t;
-typedef struct hdsp_config_info hdsp_config_info_t;
-typedef struct hdsp_firmware hdsp_firmware_t;
-typedef struct hdsp_version hdsp_version_t;
-typedef struct hdsp_mixer hdsp_mixer_t;
-typedef struct hdsp_9632_aeb hdsp_9632_aeb_t;
-
-#endif /* __SOUND_HDSP_H */
diff --git a/openflow/usr/include/sound/hdspm.h b/openflow/usr/include/sound/hdspm.h
deleted file mode 100644
index c4db6f5..0000000
--- a/openflow/usr/include/sound/hdspm.h
+++ /dev/null
@@ -1,231 +0,0 @@
-#ifndef __SOUND_HDSPM_H
-#define __SOUND_HDSPM_H
-/*
- *   Copyright (C) 2003 Winfried Ritsch (IEM)
- *   based on hdsp.h from Thomas Charbonnel (thomas@undata.org)
- *
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/types.h>
-
-/* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */
-#define HDSPM_MAX_CHANNELS      64
-
-enum hdspm_io_type {
-	MADI,
-	MADIface,
-	AIO,
-	AES32,
-	RayDAT
-};
-
-enum hdspm_speed {
-	ss,
-	ds,
-	qs
-};
-
-/* -------------------- IOCTL Peak/RMS Meters -------------------- */
-
-struct hdspm_peak_rms {
-	__u32 input_peaks[64];
-	__u32 playback_peaks[64];
-	__u32 output_peaks[64];
-
-	__u64 input_rms[64];
-	__u64 playback_rms[64];
-	__u64 output_rms[64];
-
-	__u8 speed; /* enum {ss, ds, qs} */
-	int status2;
-};
-
-#define SNDRV_HDSPM_IOCTL_GET_PEAK_RMS \
-	_IOR('H', 0x42, struct hdspm_peak_rms)
-
-/* ------------ CONFIG block IOCTL ---------------------- */
-
-struct hdspm_config {
-	unsigned char pref_sync_ref;
-	unsigned char wordclock_sync_check;
-	unsigned char madi_sync_check;
-	unsigned int system_sample_rate;
-	unsigned int autosync_sample_rate;
-	unsigned char system_clock_mode;
-	unsigned char clock_source;
-	unsigned char autosync_ref;
-	unsigned char line_out;
-	unsigned int passthru;
-	unsigned int analog_out;
-};
-
-#define SNDRV_HDSPM_IOCTL_GET_CONFIG \
-	_IOR('H', 0x41, struct hdspm_config)
-
-/*
- * If there's a TCO (TimeCode Option) board installed,
- * there are further options and status data available.
- * The hdspm_ltc structure contains the current SMPTE
- * timecode and some status information and can be
- * obtained via SNDRV_HDSPM_IOCTL_GET_LTC or in the
- * hdspm_status struct.
- */
-
-enum hdspm_ltc_format {
-	format_invalid,
-	fps_24,
-	fps_25,
-	fps_2997,
-	fps_30
-};
-
-enum hdspm_ltc_frame {
-	frame_invalid,
-	drop_frame,
-	full_frame
-};
-
-enum hdspm_ltc_input_format {
-	ntsc,
-	pal,
-	no_video
-};
-
-struct hdspm_ltc {
-	unsigned int ltc;
-
-	enum hdspm_ltc_format format;
-	enum hdspm_ltc_frame frame;
-	enum hdspm_ltc_input_format input_format;
-};
-
-#define SNDRV_HDSPM_IOCTL_GET_LTC _IOR('H', 0x46, struct hdspm_ltc)
-
-/*
- * The status data reflects the device's current state
- * as determined by the card's configuration and
- * connection status.
- */
-
-enum hdspm_sync {
-	hdspm_sync_no_lock = 0,
-	hdspm_sync_lock = 1,
-	hdspm_sync_sync = 2
-};
-
-enum hdspm_madi_input {
-	hdspm_input_optical = 0,
-	hdspm_input_coax = 1
-};
-
-enum hdspm_madi_channel_format {
-	hdspm_format_ch_64 = 0,
-	hdspm_format_ch_56 = 1
-};
-
-enum hdspm_madi_frame_format {
-	hdspm_frame_48 = 0,
-	hdspm_frame_96 = 1
-};
-
-enum hdspm_syncsource {
-	syncsource_wc = 0,
-	syncsource_madi = 1,
-	syncsource_tco = 2,
-	syncsource_sync = 3,
-	syncsource_none = 4
-};
-
-struct hdspm_status {
-	__u8 card_type; /* enum hdspm_io_type */
-	enum hdspm_syncsource autosync_source;
-
-	__u64 card_clock;
-	__u32 master_period;
-
-	union {
-		struct {
-			__u8 sync_wc; /* enum hdspm_sync */
-			__u8 sync_madi; /* enum hdspm_sync */
-			__u8 sync_tco; /* enum hdspm_sync */
-			__u8 sync_in; /* enum hdspm_sync */
-			__u8 madi_input; /* enum hdspm_madi_input */
-			__u8 channel_format; /* enum hdspm_madi_channel_format */
-			__u8 frame_format; /* enum hdspm_madi_frame_format */
-		} madi;
-	} card_specific;
-};
-
-#define SNDRV_HDSPM_IOCTL_GET_STATUS \
-	_IOR('H', 0x47, struct hdspm_status)
-
-/*
- * Get information about the card and its add-ons.
- */
-
-#define HDSPM_ADDON_TCO 1
-
-struct hdspm_version {
-	__u8 card_type; /* enum hdspm_io_type */
-	char cardname[20];
-	unsigned int serial;
-	unsigned short firmware_rev;
-	int addons;
-};
-
-#define SNDRV_HDSPM_IOCTL_GET_VERSION _IOR('H', 0x48, struct hdspm_version)
-
-/* ------------- get Matrix Mixer IOCTL --------------- */
-
-/* MADI mixer: 64inputs+64playback in 64outputs = 8192 => *4Byte =
- * 32768 Bytes
- */
-
-/* organisation is 64 channelfader in a continuous memory block */
-/* equivalent to hardware definition, maybe for future feature of mmap of
- * them
- */
-/* each of 64 outputs has 64 infader and 64 outfader:
-   Ins to Outs mixer[out].in[in], Outstreams to Outs mixer[out].pb[pb] */
-
-#define HDSPM_MIXER_CHANNELS HDSPM_MAX_CHANNELS
-
-struct hdspm_channelfader {
-	unsigned int in[HDSPM_MIXER_CHANNELS];
-	unsigned int pb[HDSPM_MIXER_CHANNELS];
-};
-
-struct hdspm_mixer {
-	struct hdspm_channelfader ch[HDSPM_MIXER_CHANNELS];
-};
-
-struct hdspm_mixer_ioctl {
-	struct hdspm_mixer *mixer;
-};
-
-/* use indirect access due to the limit of ioctl bit size */
-#define SNDRV_HDSPM_IOCTL_GET_MIXER _IOR('H', 0x44, struct hdspm_mixer_ioctl)
-
-/* typedefs for compatibility to user-space */
-typedef struct hdspm_peak_rms hdspm_peak_rms_t;
-typedef struct hdspm_config_info hdspm_config_info_t;
-typedef struct hdspm_version hdspm_version_t;
-typedef struct hdspm_channelfader snd_hdspm_channelfader_t;
-typedef struct hdspm_mixer hdspm_mixer_t;
-
-
-#endif
diff --git a/openflow/usr/include/sound/sb16_csp.h b/openflow/usr/include/sound/sb16_csp.h
deleted file mode 100644
index 255f69c..0000000
--- a/openflow/usr/include/sound/sb16_csp.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  Copyright (c) 1999 by Uros Bizjak <uros@kss-loka.si>
- *                        Takashi Iwai <tiwai@suse.de>
- *
- *  SB16ASP/AWE32 CSP control
- *
- *   This program is free software; you can redistribute it and/or modify 
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-#ifndef __SOUND_SB16_CSP_H
-#define __SOUND_SB16_CSP_H
-
-
-/* CSP modes */
-#define SNDRV_SB_CSP_MODE_NONE		0x00
-#define SNDRV_SB_CSP_MODE_DSP_READ	0x01	/* Record from DSP */
-#define SNDRV_SB_CSP_MODE_DSP_WRITE	0x02	/* Play to DSP */
-#define SNDRV_SB_CSP_MODE_QSOUND		0x04	/* QSound */
-
-/* CSP load flags */
-#define SNDRV_SB_CSP_LOAD_FROMUSER	0x01
-#define SNDRV_SB_CSP_LOAD_INITBLOCK	0x02
-
-/* CSP sample width */
-#define SNDRV_SB_CSP_SAMPLE_8BIT		0x01
-#define SNDRV_SB_CSP_SAMPLE_16BIT		0x02
-
-/* CSP channels */
-#define SNDRV_SB_CSP_MONO			0x01
-#define SNDRV_SB_CSP_STEREO		0x02
-
-/* CSP rates */
-#define SNDRV_SB_CSP_RATE_8000		0x01
-#define SNDRV_SB_CSP_RATE_11025		0x02
-#define SNDRV_SB_CSP_RATE_22050		0x04
-#define SNDRV_SB_CSP_RATE_44100		0x08
-#define SNDRV_SB_CSP_RATE_ALL		0x0f
-
-/* CSP running state */
-#define SNDRV_SB_CSP_ST_IDLE		0x00
-#define SNDRV_SB_CSP_ST_LOADED		0x01
-#define SNDRV_SB_CSP_ST_RUNNING		0x02
-#define SNDRV_SB_CSP_ST_PAUSED		0x04
-#define SNDRV_SB_CSP_ST_AUTO		0x08
-#define SNDRV_SB_CSP_ST_QSOUND		0x10
-
-/* maximum QSound value (180 degrees right) */
-#define SNDRV_SB_CSP_QSOUND_MAX_RIGHT	0x20
-
-/* maximum microcode RIFF file size */
-#define SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE	0x3000
-
-/* microcode header */
-struct snd_sb_csp_mc_header {
-	char codec_name[16];		/* id name of codec */
-	unsigned short func_req;	/* requested function */
-};
-
-/* microcode to be loaded */
-struct snd_sb_csp_microcode {
-	struct snd_sb_csp_mc_header info;
-	unsigned char data[SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE];
-};
-
-/* start CSP with sample_width in mono/stereo */
-struct snd_sb_csp_start {
-	int sample_width;	/* sample width, look above */
-	int channels;		/* channels, look above */
-};
-
-/* CSP information */
-struct snd_sb_csp_info {
-	char codec_name[16];		/* id name of codec */
-	unsigned short func_nr;		/* function number */
-	unsigned int acc_format;	/* accepted PCM formats */
-	unsigned short acc_channels;	/* accepted channels */
-	unsigned short acc_width;	/* accepted sample width */
-	unsigned short acc_rates;	/* accepted sample rates */
-	unsigned short csp_mode;	/* CSP mode, see above */
-	unsigned short run_channels;	/* current channels  */
-	unsigned short run_width;	/* current sample width */
-	unsigned short version;		/* version id: 0x10 - 0x1f */
-	unsigned short state;		/* state bits */
-};
-
-/* HWDEP controls */
-/* get CSP information */
-#define SNDRV_SB_CSP_IOCTL_INFO		_IOR('H', 0x10, struct snd_sb_csp_info)
-/* load microcode to CSP */
-/* NOTE: struct snd_sb_csp_microcode overflows the max size (13 bits)
- * defined for some architectures like MIPS, and it leads to build errors.
- * (x86 and co have 14-bit size, thus it's valid, though.)
- * As a workaround for skipping the size-limit check, here we don't use the
- * normal _IOW() macro but _IOC() with the manual argument.
- */
-#define SNDRV_SB_CSP_IOCTL_LOAD_CODE	\
-	_IOC(_IOC_WRITE, 'H', 0x11, sizeof(struct snd_sb_csp_microcode))
-/* unload microcode from CSP */
-#define SNDRV_SB_CSP_IOCTL_UNLOAD_CODE	_IO('H', 0x12)
-/* start CSP */
-#define SNDRV_SB_CSP_IOCTL_START		_IOW('H', 0x13, struct snd_sb_csp_start)
-/* stop CSP */
-#define SNDRV_SB_CSP_IOCTL_STOP		_IO('H', 0x14)
-/* pause CSP and DMA transfer */
-#define SNDRV_SB_CSP_IOCTL_PAUSE		_IO('H', 0x15)
-/* restart CSP and DMA transfer */
-#define SNDRV_SB_CSP_IOCTL_RESTART	_IO('H', 0x16)
-
-
-#endif /* __SOUND_SB16_CSP_H */
diff --git a/openflow/usr/include/sound/sfnt_info.h b/openflow/usr/include/sound/sfnt_info.h
deleted file mode 100644
index 1bce7fd..0000000
--- a/openflow/usr/include/sound/sfnt_info.h
+++ /dev/null
@@ -1,212 +0,0 @@
-#ifndef __SOUND_SFNT_INFO_H
-#define __SOUND_SFNT_INFO_H
-
-/*
- *  Patch record compatible with AWE driver on OSS
- *
- *  Copyright (C) 1999-2000 Takashi Iwai
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-
-#include <sound/asound.h>
-
-/*
- * patch information record
- */
-
-#ifdef SNDRV_BIG_ENDIAN
-#define SNDRV_OSS_PATCHKEY(id) (0xfd00|id)
-#else
-#define SNDRV_OSS_PATCHKEY(id) ((id<<8)|0xfd)
-#endif
-
-/* patch interface header: 16 bytes */
-struct soundfont_patch_info {
-	unsigned short key;		/* use the key below */
-#define SNDRV_OSS_SOUNDFONT_PATCH		SNDRV_OSS_PATCHKEY(0x07)
-
-	short device_no;		/* synthesizer number */
-	unsigned short sf_id;		/* file id (should be zero) */
-	short optarg;			/* optional argument */
-	int len;			/* data length (without this header) */
-
-	short type;			/* patch operation type */
-#define SNDRV_SFNT_LOAD_INFO		0	/* awe_voice_rec */
-#define SNDRV_SFNT_LOAD_DATA		1	/* awe_sample_info */
-#define SNDRV_SFNT_OPEN_PATCH	2	/* awe_open_parm */
-#define SNDRV_SFNT_CLOSE_PATCH	3	/* none */
-	/* 4 is obsolete */
-#define SNDRV_SFNT_REPLACE_DATA	5	/* awe_sample_info (optarg=#channels)*/
-#define SNDRV_SFNT_MAP_PRESET	6	/* awe_voice_map */
-	/* 7 is not used */
-#define SNDRV_SFNT_PROBE_DATA		8	/* optarg=sample */
-#define SNDRV_SFNT_REMOVE_INFO		9	/* optarg=(bank<<8)|instr */
-
-	short reserved;			/* word alignment data */
-
-	/* the actual patch data begins after this */
-};
-
-
-/*
- * open patch
- */
-
-#define SNDRV_SFNT_PATCH_NAME_LEN	32
-
-struct soundfont_open_parm {
-	unsigned short type;		/* sample type */
-#define SNDRV_SFNT_PAT_TYPE_MISC	0
-#define SNDRV_SFNT_PAT_TYPE_GUS	6
-#define SNDRV_SFNT_PAT_TYPE_MAP	7
-#define SNDRV_SFNT_PAT_LOCKED	0x100	/* lock the samples */
-#define SNDRV_SFNT_PAT_SHARED	0x200	/* sample is shared */
-
-	short reserved;
-	char name[SNDRV_SFNT_PATCH_NAME_LEN];
-};
-
-
-/*
- * raw voice information record
- */
-
-/* wave table envelope & effect parameters to control EMU8000 */
-struct soundfont_voice_parm {
-	unsigned short moddelay;	/* modulation delay (0x8000) */
-	unsigned short modatkhld;	/* modulation attack & hold time (0x7f7f) */
-	unsigned short moddcysus;	/* modulation decay & sustain (0x7f7f) */
-	unsigned short modrelease;	/* modulation release time (0x807f) */
-	short modkeyhold, modkeydecay;	/* envelope change per key (not used) */
-	unsigned short voldelay;	/* volume delay (0x8000) */
-	unsigned short volatkhld;	/* volume attack & hold time (0x7f7f) */
-	unsigned short voldcysus;	/* volume decay & sustain (0x7f7f) */
-	unsigned short volrelease;	/* volume release time (0x807f) */
-	short volkeyhold, volkeydecay;	/* envelope change per key (not used) */
-	unsigned short lfo1delay;	/* LFO1 delay (0x8000) */
-	unsigned short lfo2delay;	/* LFO2 delay (0x8000) */
-	unsigned short pefe;		/* modulation pitch & cutoff (0x0000) */
-	unsigned short fmmod;		/* LFO1 pitch & cutoff (0x0000) */
-	unsigned short tremfrq;		/* LFO1 volume & freq (0x0000) */
-	unsigned short fm2frq2;		/* LFO2 pitch & freq (0x0000) */
-	unsigned char cutoff;		/* initial cutoff (0xff) */
-	unsigned char filterQ;		/* initial filter Q [0-15] (0x0) */
-	unsigned char chorus;		/* chorus send (0x00) */
-	unsigned char reverb;		/* reverb send (0x00) */
-	unsigned short reserved[4];	/* not used */
-};
-
-
-/* wave table parameters: 92 bytes */
-struct soundfont_voice_info {
-	unsigned short sf_id;		/* file id (should be zero) */
-	unsigned short sample;		/* sample id */
-	int start, end;			/* sample offset correction */
-	int loopstart, loopend;		/* loop offset correction */
-	short rate_offset;		/* sample rate pitch offset */
-	unsigned short mode;		/* sample mode */
-#define SNDRV_SFNT_MODE_ROMSOUND		0x8000
-#define SNDRV_SFNT_MODE_STEREO		1
-#define SNDRV_SFNT_MODE_LOOPING		2
-#define SNDRV_SFNT_MODE_NORELEASE		4	/* obsolete */
-#define SNDRV_SFNT_MODE_INIT_PARM		8
-
-	short root;			/* midi root key */
-	short tune;			/* pitch tuning (in cents) */
-	unsigned char low, high;	/* key note range */
-	unsigned char vellow, velhigh;	/* velocity range */
-	signed char fixkey, fixvel;	/* fixed key, velocity */
-	signed char pan, fixpan;	/* panning, fixed panning */
-	short exclusiveClass;		/* exclusive class (0 = none) */
-	unsigned char amplitude;	/* sample volume (127 max) */
-	unsigned char attenuation;	/* attenuation (0.375dB) */
-	short scaleTuning;		/* pitch scale tuning(%), normally 100 */
-	struct soundfont_voice_parm parm;	/* voice envelope parameters */
-	unsigned short sample_mode;	/* sample mode_flag (set by driver) */
-};
-
-
-/* instrument info header: 4 bytes */
-struct soundfont_voice_rec_hdr {
-	unsigned char bank;		/* midi bank number */
-	unsigned char instr;		/* midi preset number */
-	char nvoices;			/* number of voices */
-	char write_mode;		/* write mode; normally 0 */
-#define SNDRV_SFNT_WR_APPEND		0	/* append anyway */
-#define SNDRV_SFNT_WR_EXCLUSIVE		1	/* skip if already exists */
-#define SNDRV_SFNT_WR_REPLACE		2	/* replace if already exists */
-};
-
-
-/*
- * sample wave information
- */
-
-/* wave table sample header: 32 bytes */
-struct soundfont_sample_info {
-	unsigned short sf_id;		/* file id (should be zero) */
-	unsigned short sample;		/* sample id */
-	int start, end;			/* start & end offset */
-	int loopstart, loopend;		/* loop start & end offset */
-	int size;			/* size (0 = ROM) */
-	short dummy;			/* not used */
-	unsigned short mode_flags;	/* mode flags */
-#define SNDRV_SFNT_SAMPLE_8BITS		1	/* wave data is 8bits */
-#define SNDRV_SFNT_SAMPLE_UNSIGNED	2	/* wave data is unsigned */
-#define SNDRV_SFNT_SAMPLE_NO_BLANK	4	/* no blank loop is attached */
-#define SNDRV_SFNT_SAMPLE_SINGLESHOT	8	/* single-shot w/o loop */
-#define SNDRV_SFNT_SAMPLE_BIDIR_LOOP	16	/* bidirectional looping */
-#define SNDRV_SFNT_SAMPLE_STEREO_LEFT	32	/* stereo left sound */
-#define SNDRV_SFNT_SAMPLE_STEREO_RIGHT	64	/* stereo right sound */
-#define SNDRV_SFNT_SAMPLE_REVERSE_LOOP	128	/* reverse looping */
-	unsigned int truesize;		/* used memory size (set by driver) */
-};
-
-
-/*
- * voice preset mapping (aliasing)
- */
-
-struct soundfont_voice_map {
-	int map_bank, map_instr, map_key;	/* key = -1 means all keys */
-	int src_bank, src_instr, src_key;
-};
-
-
-/*
- * ioctls for hwdep
- */
-
-#define SNDRV_EMUX_HWDEP_NAME	"Emux WaveTable"
-
-#define SNDRV_EMUX_VERSION	((1 << 16) | (0 << 8) | 0)	/* 1.0.0 */
-
-struct snd_emux_misc_mode {
-	int port;	/* -1 = all */
-	int mode;
-	int value;
-	int value2;	/* reserved */
-};
-
-#define SNDRV_EMUX_IOCTL_VERSION	_IOR('H', 0x80, unsigned int)
-#define SNDRV_EMUX_IOCTL_LOAD_PATCH	_IOWR('H', 0x81, struct soundfont_patch_info)
-#define SNDRV_EMUX_IOCTL_RESET_SAMPLES	_IO('H', 0x82)
-#define SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES _IO('H', 0x83)
-#define SNDRV_EMUX_IOCTL_MEM_AVAIL	_IOW('H', 0x84, int)
-#define SNDRV_EMUX_IOCTL_MISC_MODE	_IOWR('H', 0x84, struct snd_emux_misc_mode)
-
-#endif /* __SOUND_SFNT_INFO_H */
diff --git a/openflow/usr/include/spawn.h b/openflow/usr/include/spawn.h
deleted file mode 100644
index f46e8c2..0000000
--- a/openflow/usr/include/spawn.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Definitions for POSIX spawn interface.
-   Copyright (C) 2000-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_SPAWN_H
-#define	_SPAWN_H	1
-
-#include <features.h>
-#include <sched.h>
-#define __need_sigset_t
-#include <signal.h>
-#include <sys/types.h>
-
-
-/* Data structure to contain attributes for thread creation.  */
-typedef struct
-{
-  short int __flags;
-  pid_t __pgrp;
-  sigset_t __sd;
-  sigset_t __ss;
-  struct sched_param __sp;
-  int __policy;
-  int __pad[16];
-} posix_spawnattr_t;
-
-
-/* Data structure to contain information about the actions to be
-   performed in the new process with respect to file descriptors.  */
-typedef struct
-{
-  int __allocated;
-  int __used;
-  struct __spawn_action *__actions;
-  int __pad[16];
-} posix_spawn_file_actions_t;
-
-
-/* Flags to be set in the `posix_spawnattr_t'.  */
-#define POSIX_SPAWN_RESETIDS		0x01
-#define POSIX_SPAWN_SETPGROUP		0x02
-#define POSIX_SPAWN_SETSIGDEF		0x04
-#define POSIX_SPAWN_SETSIGMASK		0x08
-#define POSIX_SPAWN_SETSCHEDPARAM	0x10
-#define POSIX_SPAWN_SETSCHEDULER	0x20
-#ifdef __USE_GNU
-# define POSIX_SPAWN_USEVFORK		0x40
-#endif
-
-
-__BEGIN_DECLS
-
-/* Spawn a new process executing PATH with the attributes describes in *ATTRP.
-   Before running the process perform the actions described in FILE-ACTIONS.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW. */
-extern int posix_spawn (pid_t *__restrict __pid,
-			const char *__restrict __path,
-			const posix_spawn_file_actions_t *__restrict
-			__file_actions,
-			const posix_spawnattr_t *__restrict __attrp,
-			char *const __argv[__restrict_arr],
-			char *const __envp[__restrict_arr]);
-
-/* Similar to `posix_spawn' but search for FILE in the PATH.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int posix_spawnp (pid_t *__pid, const char *__file,
-			 const posix_spawn_file_actions_t *__file_actions,
-			 const posix_spawnattr_t *__attrp,
-			 char *const __argv[], char *const __envp[]);
-
-
-/* Initialize data structure with attributes for `spawn' to default values.  */
-extern int posix_spawnattr_init (posix_spawnattr_t *__attr) __THROW;
-
-/* Free resources associated with ATTR.  */
-extern int posix_spawnattr_destroy (posix_spawnattr_t *__attr) __THROW;
-
-/* Store signal mask for signals with default handling from ATTR in
-   SIGDEFAULT.  */
-extern int posix_spawnattr_getsigdefault (const posix_spawnattr_t *
-					  __restrict __attr,
-					  sigset_t *__restrict __sigdefault)
-     __THROW;
-
-/* Set signal mask for signals with default handling in ATTR to SIGDEFAULT.  */
-extern int posix_spawnattr_setsigdefault (posix_spawnattr_t *__restrict __attr,
-					  const sigset_t *__restrict
-					  __sigdefault)
-     __THROW;
-
-/* Store signal mask for the new process from ATTR in SIGMASK.  */
-extern int posix_spawnattr_getsigmask (const posix_spawnattr_t *__restrict
-				       __attr,
-				       sigset_t *__restrict __sigmask) __THROW;
-
-/* Set signal mask for the new process in ATTR to SIGMASK.  */
-extern int posix_spawnattr_setsigmask (posix_spawnattr_t *__restrict __attr,
-				       const sigset_t *__restrict __sigmask)
-     __THROW;
-
-/* Get flag word from the attribute structure.  */
-extern int posix_spawnattr_getflags (const posix_spawnattr_t *__restrict
-				     __attr,
-				     short int *__restrict __flags) __THROW;
-
-/* Store flags in the attribute structure.  */
-extern int posix_spawnattr_setflags (posix_spawnattr_t *_attr,
-				     short int __flags) __THROW;
-
-/* Get process group ID from the attribute structure.  */
-extern int posix_spawnattr_getpgroup (const posix_spawnattr_t *__restrict
-				      __attr, pid_t *__restrict __pgroup)
-     __THROW;
-
-/* Store process group ID in the attribute structure.  */
-extern int posix_spawnattr_setpgroup (posix_spawnattr_t *__attr,
-				      pid_t __pgroup) __THROW;
-
-/* Get scheduling policy from the attribute structure.  */
-extern int posix_spawnattr_getschedpolicy (const posix_spawnattr_t *
-					   __restrict __attr,
-					   int *__restrict __schedpolicy)
-     __THROW;
-
-/* Store scheduling policy in the attribute structure.  */
-extern int posix_spawnattr_setschedpolicy (posix_spawnattr_t *__attr,
-					   int __schedpolicy) __THROW;
-
-/* Get scheduling parameters from the attribute structure.  */
-extern int posix_spawnattr_getschedparam (const posix_spawnattr_t *
-					  __restrict __attr,
-					  struct sched_param *__restrict
-					  __schedparam) __THROW;
-
-/* Store scheduling parameters in the attribute structure.  */
-extern int posix_spawnattr_setschedparam (posix_spawnattr_t *__restrict __attr,
-					  const struct sched_param *
-					  __restrict __schedparam) __THROW;
-
-
-/* Initialize data structure for file attribute for `spawn' call.  */
-extern int posix_spawn_file_actions_init (posix_spawn_file_actions_t *
-					  __file_actions) __THROW;
-
-/* Free resources associated with FILE-ACTIONS.  */
-extern int posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *
-					     __file_actions) __THROW;
-
-/* Add an action to FILE-ACTIONS which tells the implementation to call
-   `open' for the given file during the `spawn' call.  */
-extern int posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *
-					     __restrict __file_actions,
-					     int __fd,
-					     const char *__restrict __path,
-					     int __oflag, mode_t __mode)
-     __THROW;
-
-/* Add an action to FILE-ACTIONS which tells the implementation to call
-   `close' for the given file descriptor during the `spawn' call.  */
-extern int posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *
-					      __file_actions, int __fd)
-     __THROW;
-
-/* Add an action to FILE-ACTIONS which tells the implementation to call
-   `dup2' for the given file descriptors during the `spawn' call.  */
-extern int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *
-					     __file_actions,
-					     int __fd, int __newfd) __THROW;
-
-__END_DECLS
-
-#endif /* spawn.h */
diff --git a/openflow/usr/include/sqlite3.h b/openflow/usr/include/sqlite3.h
deleted file mode 100644
index bb35f29..0000000
--- a/openflow/usr/include/sqlite3.h
+++ /dev/null
@@ -1,8815 +0,0 @@
-/*
-** 2001 September 15
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This header file defines the interface that the SQLite library
-** presents to client programs.  If a C-function, structure, datatype,
-** or constant definition does not appear in this file, then it is
-** not a published API of SQLite, is subject to change without
-** notice, and should not be referenced by programs that use SQLite.
-**
-** Some of the definitions that are in this file are marked as
-** "experimental".  Experimental interfaces are normally new
-** features recently added to SQLite.  We do not anticipate changes
-** to experimental interfaces but reserve the right to make minor changes
-** if experience from use "in the wild" suggest such changes are prudent.
-**
-** The official C-language API documentation for SQLite is derived
-** from comments in this file.  This file is the authoritative source
-** on how SQLite interfaces are supposed to operate.
-**
-** The name of this file under configuration management is "sqlite.h.in".
-** The makefile makes some minor changes to this file (such as inserting
-** the version number) and changes its name to "sqlite3.h" as
-** part of the build process.
-*/
-#ifndef _SQLITE3_H_
-#define _SQLITE3_H_
-#include <stdarg.h>     /* Needed for the definition of va_list */
-
-/*
-** Make sure we can call this stuff from C++.
-*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
-** Provide the ability to override linkage features of the interface.
-*/
-#ifndef SQLITE_EXTERN
-# define SQLITE_EXTERN extern
-#endif
-#ifndef SQLITE_API
-# define SQLITE_API
-#endif
-#ifndef SQLITE_CDECL
-# define SQLITE_CDECL
-#endif
-#ifndef SQLITE_STDCALL
-# define SQLITE_STDCALL
-#endif
-
-/*
-** These no-op macros are used in front of interfaces to mark those
-** interfaces as either deprecated or experimental.  New applications
-** should not use deprecated interfaces - they are supported for backwards
-** compatibility only.  Application writers should be aware that
-** experimental interfaces are subject to change in point releases.
-**
-** These macros used to resolve to various kinds of compiler magic that
-** would generate warning messages when they were used.  But that
-** compiler magic ended up generating such a flurry of bug reports
-** that we have taken it all out and gone back to using simple
-** noop macros.
-*/
-#define SQLITE_DEPRECATED
-#define SQLITE_EXPERIMENTAL
-
-/*
-** Ensure these symbols were not defined by some previous header file.
-*/
-#ifdef SQLITE_VERSION
-# undef SQLITE_VERSION
-#endif
-#ifdef SQLITE_VERSION_NUMBER
-# undef SQLITE_VERSION_NUMBER
-#endif
-
-/*
-** CAPI3REF: Compile-Time Library Version Numbers
-**
-** ^(The [SQLITE_VERSION] C preprocessor macro in the sqlite3.h header
-** evaluates to a string literal that is the SQLite version in the
-** format "X.Y.Z" where X is the major version number (always 3 for
-** SQLite3) and Y is the minor version number and Z is the release number.)^
-** ^(The [SQLITE_VERSION_NUMBER] C preprocessor macro resolves to an integer
-** with the value (X*1000000 + Y*1000 + Z) where X, Y, and Z are the same
-** numbers used in [SQLITE_VERSION].)^
-** The SQLITE_VERSION_NUMBER for any given release of SQLite will also
-** be larger than the release from which it is derived.  Either Y will
-** be held constant and Z will be incremented or else Y will be incremented
-** and Z will be reset to zero.
-**
-** Since version 3.6.18, SQLite source code has been stored in the
-** <a href="http://www.fossil-scm.org/">Fossil configuration management
-** system</a>.  ^The SQLITE_SOURCE_ID macro evaluates to
-** a string which identifies a particular check-in of SQLite
-** within its configuration management system.  ^The SQLITE_SOURCE_ID
-** string contains the date and time of the check-in (UTC) and an SHA1
-** hash of the entire source tree.
-**
-** See also: [sqlite3_libversion()],
-** [sqlite3_libversion_number()], [sqlite3_sourceid()],
-** [sqlite_version()] and [sqlite_source_id()].
-*/
-#define SQLITE_VERSION        "3.11.0"
-#define SQLITE_VERSION_NUMBER 3011000
-#define SQLITE_SOURCE_ID      "2016-02-15 17:29:24 3d862f207e3adc00f78066799ac5a8c282430a5f"
-
-/*
-** CAPI3REF: Run-Time Library Version Numbers
-** KEYWORDS: sqlite3_version, sqlite3_sourceid
-**
-** These interfaces provide the same information as the [SQLITE_VERSION],
-** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros
-** but are associated with the library instead of the header file.  ^(Cautious
-** programmers might include assert() statements in their application to
-** verify that values returned by these interfaces match the macros in
-** the header, and thus ensure that the application is
-** compiled with matching library and header files.
-**
-** <blockquote><pre>
-** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
-** assert( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)==0 );
-** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
-** </pre></blockquote>)^
-**
-** ^The sqlite3_version[] string constant contains the text of [SQLITE_VERSION]
-** macro.  ^The sqlite3_libversion() function returns a pointer to the
-** to the sqlite3_version[] string constant.  The sqlite3_libversion()
-** function is provided for use in DLLs since DLL users usually do not have
-** direct access to string constants within the DLL.  ^The
-** sqlite3_libversion_number() function returns an integer equal to
-** [SQLITE_VERSION_NUMBER].  ^The sqlite3_sourceid() function returns 
-** a pointer to a string constant whose value is the same as the 
-** [SQLITE_SOURCE_ID] C preprocessor macro.
-**
-** See also: [sqlite_version()] and [sqlite_source_id()].
-*/
-SQLITE_API SQLITE_EXTERN const char sqlite3_version[];
-SQLITE_API const char *SQLITE_STDCALL sqlite3_libversion(void);
-SQLITE_API const char *SQLITE_STDCALL sqlite3_sourceid(void);
-SQLITE_API int SQLITE_STDCALL sqlite3_libversion_number(void);
-
-/*
-** CAPI3REF: Run-Time Library Compilation Options Diagnostics
-**
-** ^The sqlite3_compileoption_used() function returns 0 or 1 
-** indicating whether the specified option was defined at 
-** compile time.  ^The SQLITE_ prefix may be omitted from the 
-** option name passed to sqlite3_compileoption_used().  
-**
-** ^The sqlite3_compileoption_get() function allows iterating
-** over the list of options that were defined at compile time by
-** returning the N-th compile time option string.  ^If N is out of range,
-** sqlite3_compileoption_get() returns a NULL pointer.  ^The SQLITE_ 
-** prefix is omitted from any strings returned by 
-** sqlite3_compileoption_get().
-**
-** ^Support for the diagnostic functions sqlite3_compileoption_used()
-** and sqlite3_compileoption_get() may be omitted by specifying the 
-** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
-**
-** See also: SQL functions [sqlite_compileoption_used()] and
-** [sqlite_compileoption_get()] and the [compile_options pragma].
-*/
-#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
-SQLITE_API int SQLITE_STDCALL sqlite3_compileoption_used(const char *zOptName);
-SQLITE_API const char *SQLITE_STDCALL sqlite3_compileoption_get(int N);
-#endif
-
-/*
-** CAPI3REF: Test To See If The Library Is Threadsafe
-**
-** ^The sqlite3_threadsafe() function returns zero if and only if
-** SQLite was compiled with mutexing code omitted due to the
-** [SQLITE_THREADSAFE] compile-time option being set to 0.
-**
-** SQLite can be compiled with or without mutexes.  When
-** the [SQLITE_THREADSAFE] C preprocessor macro is 1 or 2, mutexes
-** are enabled and SQLite is threadsafe.  When the
-** [SQLITE_THREADSAFE] macro is 0, 
-** the mutexes are omitted.  Without the mutexes, it is not safe
-** to use SQLite concurrently from more than one thread.
-**
-** Enabling mutexes incurs a measurable performance penalty.
-** So if speed is of utmost importance, it makes sense to disable
-** the mutexes.  But for maximum safety, mutexes should be enabled.
-** ^The default behavior is for mutexes to be enabled.
-**
-** This interface can be used by an application to make sure that the
-** version of SQLite that it is linking against was compiled with
-** the desired setting of the [SQLITE_THREADSAFE] macro.
-**
-** This interface only reports on the compile-time mutex setting
-** of the [SQLITE_THREADSAFE] flag.  If SQLite is compiled with
-** SQLITE_THREADSAFE=1 or =2 then mutexes are enabled by default but
-** can be fully or partially disabled using a call to [sqlite3_config()]
-** with the verbs [SQLITE_CONFIG_SINGLETHREAD], [SQLITE_CONFIG_MULTITHREAD],
-** or [SQLITE_CONFIG_SERIALIZED].  ^(The return value of the
-** sqlite3_threadsafe() function shows only the compile-time setting of
-** thread safety, not any run-time changes to that setting made by
-** sqlite3_config(). In other words, the return value from sqlite3_threadsafe()
-** is unchanged by calls to sqlite3_config().)^
-**
-** See the [threading mode] documentation for additional information.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_threadsafe(void);
-
-/*
-** CAPI3REF: Database Connection Handle
-** KEYWORDS: {database connection} {database connections}
-**
-** Each open SQLite database is represented by a pointer to an instance of
-** the opaque structure named "sqlite3".  It is useful to think of an sqlite3
-** pointer as an object.  The [sqlite3_open()], [sqlite3_open16()], and
-** [sqlite3_open_v2()] interfaces are its constructors, and [sqlite3_close()]
-** and [sqlite3_close_v2()] are its destructors.  There are many other
-** interfaces (such as
-** [sqlite3_prepare_v2()], [sqlite3_create_function()], and
-** [sqlite3_busy_timeout()] to name but three) that are methods on an
-** sqlite3 object.
-*/
-typedef struct sqlite3 sqlite3;
-
-/*
-** CAPI3REF: 64-Bit Integer Types
-** KEYWORDS: sqlite_int64 sqlite_uint64
-**
-** Because there is no cross-platform way to specify 64-bit integer types
-** SQLite includes typedefs for 64-bit signed and unsigned integers.
-**
-** The sqlite3_int64 and sqlite3_uint64 are the preferred type definitions.
-** The sqlite_int64 and sqlite_uint64 types are supported for backwards
-** compatibility only.
-**
-** ^The sqlite3_int64 and sqlite_int64 types can store integer values
-** between -9223372036854775808 and +9223372036854775807 inclusive.  ^The
-** sqlite3_uint64 and sqlite_uint64 types can store integer values 
-** between 0 and +18446744073709551615 inclusive.
-*/
-#ifdef SQLITE_INT64_TYPE
-  typedef SQLITE_INT64_TYPE sqlite_int64;
-  typedef unsigned SQLITE_INT64_TYPE sqlite_uint64;
-#elif defined(_MSC_VER) || defined(__BORLANDC__)
-  typedef __int64 sqlite_int64;
-  typedef unsigned __int64 sqlite_uint64;
-#else
-  typedef long long int sqlite_int64;
-  typedef unsigned long long int sqlite_uint64;
-#endif
-typedef sqlite_int64 sqlite3_int64;
-typedef sqlite_uint64 sqlite3_uint64;
-
-/*
-** If compiling for a processor that lacks floating point support,
-** substitute integer for floating-point.
-*/
-#ifdef SQLITE_OMIT_FLOATING_POINT
-# define double sqlite3_int64
-#endif
-
-/*
-** CAPI3REF: Closing A Database Connection
-** DESTRUCTOR: sqlite3
-**
-** ^The sqlite3_close() and sqlite3_close_v2() routines are destructors
-** for the [sqlite3] object.
-** ^Calls to sqlite3_close() and sqlite3_close_v2() return [SQLITE_OK] if
-** the [sqlite3] object is successfully destroyed and all associated
-** resources are deallocated.
-**
-** ^If the database connection is associated with unfinalized prepared
-** statements or unfinished sqlite3_backup objects then sqlite3_close()
-** will leave the database connection open and return [SQLITE_BUSY].
-** ^If sqlite3_close_v2() is called with unfinalized prepared statements
-** and/or unfinished sqlite3_backups, then the database connection becomes
-** an unusable "zombie" which will automatically be deallocated when the
-** last prepared statement is finalized or the last sqlite3_backup is
-** finished.  The sqlite3_close_v2() interface is intended for use with
-** host languages that are garbage collected, and where the order in which
-** destructors are called is arbitrary.
-**
-** Applications should [sqlite3_finalize | finalize] all [prepared statements],
-** [sqlite3_blob_close | close] all [BLOB handles], and 
-** [sqlite3_backup_finish | finish] all [sqlite3_backup] objects associated
-** with the [sqlite3] object prior to attempting to close the object.  ^If
-** sqlite3_close_v2() is called on a [database connection] that still has
-** outstanding [prepared statements], [BLOB handles], and/or
-** [sqlite3_backup] objects then it returns [SQLITE_OK] and the deallocation
-** of resources is deferred until all [prepared statements], [BLOB handles],
-** and [sqlite3_backup] objects are also destroyed.
-**
-** ^If an [sqlite3] object is destroyed while a transaction is open,
-** the transaction is automatically rolled back.
-**
-** The C parameter to [sqlite3_close(C)] and [sqlite3_close_v2(C)]
-** must be either a NULL
-** pointer or an [sqlite3] object pointer obtained
-** from [sqlite3_open()], [sqlite3_open16()], or
-** [sqlite3_open_v2()], and not previously closed.
-** ^Calling sqlite3_close() or sqlite3_close_v2() with a NULL pointer
-** argument is a harmless no-op.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_close(sqlite3*);
-SQLITE_API int SQLITE_STDCALL sqlite3_close_v2(sqlite3*);
-
-/*
-** The type for a callback function.
-** This is legacy and deprecated.  It is included for historical
-** compatibility and is not documented.
-*/
-typedef int (*sqlite3_callback)(void*,int,char**, char**);
-
-/*
-** CAPI3REF: One-Step Query Execution Interface
-** METHOD: sqlite3
-**
-** The sqlite3_exec() interface is a convenience wrapper around
-** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
-** that allows an application to run multiple statements of SQL
-** without having to use a lot of C code. 
-**
-** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
-** semicolon-separate SQL statements passed into its 2nd argument,
-** in the context of the [database connection] passed in as its 1st
-** argument.  ^If the callback function of the 3rd argument to
-** sqlite3_exec() is not NULL, then it is invoked for each result row
-** coming out of the evaluated SQL statements.  ^The 4th argument to
-** sqlite3_exec() is relayed through to the 1st argument of each
-** callback invocation.  ^If the callback pointer to sqlite3_exec()
-** is NULL, then no callback is ever invoked and result rows are
-** ignored.
-**
-** ^If an error occurs while evaluating the SQL statements passed into
-** sqlite3_exec(), then execution of the current statement stops and
-** subsequent statements are skipped.  ^If the 5th parameter to sqlite3_exec()
-** is not NULL then any error message is written into memory obtained
-** from [sqlite3_malloc()] and passed back through the 5th parameter.
-** To avoid memory leaks, the application should invoke [sqlite3_free()]
-** on error message strings returned through the 5th parameter of
-** sqlite3_exec() after the error message string is no longer needed.
-** ^If the 5th parameter to sqlite3_exec() is not NULL and no errors
-** occur, then sqlite3_exec() sets the pointer in its 5th parameter to
-** NULL before returning.
-**
-** ^If an sqlite3_exec() callback returns non-zero, the sqlite3_exec()
-** routine returns SQLITE_ABORT without invoking the callback again and
-** without running any subsequent SQL statements.
-**
-** ^The 2nd argument to the sqlite3_exec() callback function is the
-** number of columns in the result.  ^The 3rd argument to the sqlite3_exec()
-** callback is an array of pointers to strings obtained as if from
-** [sqlite3_column_text()], one for each column.  ^If an element of a
-** result row is NULL then the corresponding string pointer for the
-** sqlite3_exec() callback is a NULL pointer.  ^The 4th argument to the
-** sqlite3_exec() callback is an array of pointers to strings where each
-** entry represents the name of corresponding result column as obtained
-** from [sqlite3_column_name()].
-**
-** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
-** to an empty string, or a pointer that contains only whitespace and/or 
-** SQL comments, then no SQL statements are evaluated and the database
-** is not changed.
-**
-** Restrictions:
-**
-** <ul>
-** <li> The application must ensure that the 1st parameter to sqlite3_exec()
-**      is a valid and open [database connection].
-** <li> The application must not close the [database connection] specified by
-**      the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
-** <li> The application must not modify the SQL statement text passed into
-**      the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running.
-** </ul>
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_exec(
-  sqlite3*,                                  /* An open database */
-  const char *sql,                           /* SQL to be evaluated */
-  int (*callback)(void*,int,char**,char**),  /* Callback function */
-  void *,                                    /* 1st argument to callback */
-  char **errmsg                              /* Error msg written here */
-);
-
-/*
-** CAPI3REF: Result Codes
-** KEYWORDS: {result code definitions}
-**
-** Many SQLite functions return an integer result code from the set shown
-** here in order to indicate success or failure.
-**
-** New error codes may be added in future versions of SQLite.
-**
-** See also: [extended result code definitions]
-*/
-#define SQLITE_OK           0   /* Successful result */
-/* beginning-of-error-codes */
-#define SQLITE_ERROR        1   /* SQL error or missing database */
-#define SQLITE_INTERNAL     2   /* Internal logic error in SQLite */
-#define SQLITE_PERM         3   /* Access permission denied */
-#define SQLITE_ABORT        4   /* Callback routine requested an abort */
-#define SQLITE_BUSY         5   /* The database file is locked */
-#define SQLITE_LOCKED       6   /* A table in the database is locked */
-#define SQLITE_NOMEM        7   /* A malloc() failed */
-#define SQLITE_READONLY     8   /* Attempt to write a readonly database */
-#define SQLITE_INTERRUPT    9   /* Operation terminated by sqlite3_interrupt()*/
-#define SQLITE_IOERR       10   /* Some kind of disk I/O error occurred */
-#define SQLITE_CORRUPT     11   /* The database disk image is malformed */
-#define SQLITE_NOTFOUND    12   /* Unknown opcode in sqlite3_file_control() */
-#define SQLITE_FULL        13   /* Insertion failed because database is full */
-#define SQLITE_CANTOPEN    14   /* Unable to open the database file */
-#define SQLITE_PROTOCOL    15   /* Database lock protocol error */
-#define SQLITE_EMPTY       16   /* Database is empty */
-#define SQLITE_SCHEMA      17   /* The database schema changed */
-#define SQLITE_TOOBIG      18   /* String or BLOB exceeds size limit */
-#define SQLITE_CONSTRAINT  19   /* Abort due to constraint violation */
-#define SQLITE_MISMATCH    20   /* Data type mismatch */
-#define SQLITE_MISUSE      21   /* Library used incorrectly */
-#define SQLITE_NOLFS       22   /* Uses OS features not supported on host */
-#define SQLITE_AUTH        23   /* Authorization denied */
-#define SQLITE_FORMAT      24   /* Auxiliary database format error */
-#define SQLITE_RANGE       25   /* 2nd parameter to sqlite3_bind out of range */
-#define SQLITE_NOTADB      26   /* File opened that is not a database file */
-#define SQLITE_NOTICE      27   /* Notifications from sqlite3_log() */
-#define SQLITE_WARNING     28   /* Warnings from sqlite3_log() */
-#define SQLITE_ROW         100  /* sqlite3_step() has another row ready */
-#define SQLITE_DONE        101  /* sqlite3_step() has finished executing */
-/* end-of-error-codes */
-
-/*
-** CAPI3REF: Extended Result Codes
-** KEYWORDS: {extended result code definitions}
-**
-** In its default configuration, SQLite API routines return one of 30 integer
-** [result codes].  However, experience has shown that many of
-** these result codes are too coarse-grained.  They do not provide as
-** much information about problems as programmers might like.  In an effort to
-** address this, newer versions of SQLite (version 3.3.8 and later) include
-** support for additional result codes that provide more detailed information
-** about errors. These [extended result codes] are enabled or disabled
-** on a per database connection basis using the
-** [sqlite3_extended_result_codes()] API.  Or, the extended code for
-** the most recent error can be obtained using
-** [sqlite3_extended_errcode()].
-*/
-#define SQLITE_IOERR_READ              (SQLITE_IOERR | (1<<8))
-#define SQLITE_IOERR_SHORT_READ        (SQLITE_IOERR | (2<<8))
-#define SQLITE_IOERR_WRITE             (SQLITE_IOERR | (3<<8))
-#define SQLITE_IOERR_FSYNC             (SQLITE_IOERR | (4<<8))
-#define SQLITE_IOERR_DIR_FSYNC         (SQLITE_IOERR | (5<<8))
-#define SQLITE_IOERR_TRUNCATE          (SQLITE_IOERR | (6<<8))
-#define SQLITE_IOERR_FSTAT             (SQLITE_IOERR | (7<<8))
-#define SQLITE_IOERR_UNLOCK            (SQLITE_IOERR | (8<<8))
-#define SQLITE_IOERR_RDLOCK            (SQLITE_IOERR | (9<<8))
-#define SQLITE_IOERR_DELETE            (SQLITE_IOERR | (10<<8))
-#define SQLITE_IOERR_BLOCKED           (SQLITE_IOERR | (11<<8))
-#define SQLITE_IOERR_NOMEM             (SQLITE_IOERR | (12<<8))
-#define SQLITE_IOERR_ACCESS            (SQLITE_IOERR | (13<<8))
-#define SQLITE_IOERR_CHECKRESERVEDLOCK (SQLITE_IOERR | (14<<8))
-#define SQLITE_IOERR_LOCK              (SQLITE_IOERR | (15<<8))
-#define SQLITE_IOERR_CLOSE             (SQLITE_IOERR | (16<<8))
-#define SQLITE_IOERR_DIR_CLOSE         (SQLITE_IOERR | (17<<8))
-#define SQLITE_IOERR_SHMOPEN           (SQLITE_IOERR | (18<<8))
-#define SQLITE_IOERR_SHMSIZE           (SQLITE_IOERR | (19<<8))
-#define SQLITE_IOERR_SHMLOCK           (SQLITE_IOERR | (20<<8))
-#define SQLITE_IOERR_SHMMAP            (SQLITE_IOERR | (21<<8))
-#define SQLITE_IOERR_SEEK              (SQLITE_IOERR | (22<<8))
-#define SQLITE_IOERR_DELETE_NOENT      (SQLITE_IOERR | (23<<8))
-#define SQLITE_IOERR_MMAP              (SQLITE_IOERR | (24<<8))
-#define SQLITE_IOERR_GETTEMPPATH       (SQLITE_IOERR | (25<<8))
-#define SQLITE_IOERR_CONVPATH          (SQLITE_IOERR | (26<<8))
-#define SQLITE_IOERR_VNODE             (SQLITE_IOERR | (27<<8))
-#define SQLITE_IOERR_AUTH              (SQLITE_IOERR | (28<<8))
-#define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
-#define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
-#define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
-#define SQLITE_CANTOPEN_NOTEMPDIR      (SQLITE_CANTOPEN | (1<<8))
-#define SQLITE_CANTOPEN_ISDIR          (SQLITE_CANTOPEN | (2<<8))
-#define SQLITE_CANTOPEN_FULLPATH       (SQLITE_CANTOPEN | (3<<8))
-#define SQLITE_CANTOPEN_CONVPATH       (SQLITE_CANTOPEN | (4<<8))
-#define SQLITE_CORRUPT_VTAB            (SQLITE_CORRUPT | (1<<8))
-#define SQLITE_READONLY_RECOVERY       (SQLITE_READONLY | (1<<8))
-#define SQLITE_READONLY_CANTLOCK       (SQLITE_READONLY | (2<<8))
-#define SQLITE_READONLY_ROLLBACK       (SQLITE_READONLY | (3<<8))
-#define SQLITE_READONLY_DBMOVED        (SQLITE_READONLY | (4<<8))
-#define SQLITE_ABORT_ROLLBACK          (SQLITE_ABORT | (2<<8))
-#define SQLITE_CONSTRAINT_CHECK        (SQLITE_CONSTRAINT | (1<<8))
-#define SQLITE_CONSTRAINT_COMMITHOOK   (SQLITE_CONSTRAINT | (2<<8))
-#define SQLITE_CONSTRAINT_FOREIGNKEY   (SQLITE_CONSTRAINT | (3<<8))
-#define SQLITE_CONSTRAINT_FUNCTION     (SQLITE_CONSTRAINT | (4<<8))
-#define SQLITE_CONSTRAINT_NOTNULL      (SQLITE_CONSTRAINT | (5<<8))
-#define SQLITE_CONSTRAINT_PRIMARYKEY   (SQLITE_CONSTRAINT | (6<<8))
-#define SQLITE_CONSTRAINT_TRIGGER      (SQLITE_CONSTRAINT | (7<<8))
-#define SQLITE_CONSTRAINT_UNIQUE       (SQLITE_CONSTRAINT | (8<<8))
-#define SQLITE_CONSTRAINT_VTAB         (SQLITE_CONSTRAINT | (9<<8))
-#define SQLITE_CONSTRAINT_ROWID        (SQLITE_CONSTRAINT |(10<<8))
-#define SQLITE_NOTICE_RECOVER_WAL      (SQLITE_NOTICE | (1<<8))
-#define SQLITE_NOTICE_RECOVER_ROLLBACK (SQLITE_NOTICE | (2<<8))
-#define SQLITE_WARNING_AUTOINDEX       (SQLITE_WARNING | (1<<8))
-#define SQLITE_AUTH_USER               (SQLITE_AUTH | (1<<8))
-
-/*
-** CAPI3REF: Flags For File Open Operations
-**
-** These bit values are intended for use in the
-** 3rd parameter to the [sqlite3_open_v2()] interface and
-** in the 4th parameter to the [sqlite3_vfs.xOpen] method.
-*/
-#define SQLITE_OPEN_READONLY         0x00000001  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_READWRITE        0x00000002  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_CREATE           0x00000004  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_DELETEONCLOSE    0x00000008  /* VFS only */
-#define SQLITE_OPEN_EXCLUSIVE        0x00000010  /* VFS only */
-#define SQLITE_OPEN_AUTOPROXY        0x00000020  /* VFS only */
-#define SQLITE_OPEN_URI              0x00000040  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_MEMORY           0x00000080  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_MAIN_DB          0x00000100  /* VFS only */
-#define SQLITE_OPEN_TEMP_DB          0x00000200  /* VFS only */
-#define SQLITE_OPEN_TRANSIENT_DB     0x00000400  /* VFS only */
-#define SQLITE_OPEN_MAIN_JOURNAL     0x00000800  /* VFS only */
-#define SQLITE_OPEN_TEMP_JOURNAL     0x00001000  /* VFS only */
-#define SQLITE_OPEN_SUBJOURNAL       0x00002000  /* VFS only */
-#define SQLITE_OPEN_MASTER_JOURNAL   0x00004000  /* VFS only */
-#define SQLITE_OPEN_NOMUTEX          0x00008000  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_FULLMUTEX        0x00010000  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_SHAREDCACHE      0x00020000  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_PRIVATECACHE     0x00040000  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_WAL              0x00080000  /* VFS only */
-
-/* Reserved:                         0x00F00000 */
-
-/*
-** CAPI3REF: Device Characteristics
-**
-** The xDeviceCharacteristics method of the [sqlite3_io_methods]
-** object returns an integer which is a vector of these
-** bit values expressing I/O characteristics of the mass storage
-** device that holds the file that the [sqlite3_io_methods]
-** refers to.
-**
-** The SQLITE_IOCAP_ATOMIC property means that all writes of
-** any size are atomic.  The SQLITE_IOCAP_ATOMICnnn values
-** mean that writes of blocks that are nnn bytes in size and
-** are aligned to an address which is an integer multiple of
-** nnn are atomic.  The SQLITE_IOCAP_SAFE_APPEND value means
-** that when data is appended to a file, the data is appended
-** first then the size of the file is extended, never the other
-** way around.  The SQLITE_IOCAP_SEQUENTIAL property means that
-** information is written to disk in the same order as calls
-** to xWrite().  The SQLITE_IOCAP_POWERSAFE_OVERWRITE property means that
-** after reboot following a crash or power loss, the only bytes in a
-** file that were written at the application level might have changed
-** and that adjacent bytes, even bytes within the same sector are
-** guaranteed to be unchanged.  The SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN
-** flag indicate that a file cannot be deleted when open.  The
-** SQLITE_IOCAP_IMMUTABLE flag indicates that the file is on
-** read-only media and cannot be changed even by processes with
-** elevated privileges.
-*/
-#define SQLITE_IOCAP_ATOMIC                 0x00000001
-#define SQLITE_IOCAP_ATOMIC512              0x00000002
-#define SQLITE_IOCAP_ATOMIC1K               0x00000004
-#define SQLITE_IOCAP_ATOMIC2K               0x00000008
-#define SQLITE_IOCAP_ATOMIC4K               0x00000010
-#define SQLITE_IOCAP_ATOMIC8K               0x00000020
-#define SQLITE_IOCAP_ATOMIC16K              0x00000040
-#define SQLITE_IOCAP_ATOMIC32K              0x00000080
-#define SQLITE_IOCAP_ATOMIC64K              0x00000100
-#define SQLITE_IOCAP_SAFE_APPEND            0x00000200
-#define SQLITE_IOCAP_SEQUENTIAL             0x00000400
-#define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN  0x00000800
-#define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
-#define SQLITE_IOCAP_IMMUTABLE              0x00002000
-
-/*
-** CAPI3REF: File Locking Levels
-**
-** SQLite uses one of these integer values as the second
-** argument to calls it makes to the xLock() and xUnlock() methods
-** of an [sqlite3_io_methods] object.
-*/
-#define SQLITE_LOCK_NONE          0
-#define SQLITE_LOCK_SHARED        1
-#define SQLITE_LOCK_RESERVED      2
-#define SQLITE_LOCK_PENDING       3
-#define SQLITE_LOCK_EXCLUSIVE     4
-
-/*
-** CAPI3REF: Synchronization Type Flags
-**
-** When SQLite invokes the xSync() method of an
-** [sqlite3_io_methods] object it uses a combination of
-** these integer values as the second argument.
-**
-** When the SQLITE_SYNC_DATAONLY flag is used, it means that the
-** sync operation only needs to flush data to mass storage.  Inode
-** information need not be flushed. If the lower four bits of the flag
-** equal SQLITE_SYNC_NORMAL, that means to use normal fsync() semantics.
-** If the lower four bits equal SQLITE_SYNC_FULL, that means
-** to use Mac OS X style fullsync instead of fsync().
-**
-** Do not confuse the SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL flags
-** with the [PRAGMA synchronous]=NORMAL and [PRAGMA synchronous]=FULL
-** settings.  The [synchronous pragma] determines when calls to the
-** xSync VFS method occur and applies uniformly across all platforms.
-** The SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL flags determine how
-** energetic or rigorous or forceful the sync operations are and
-** only make a difference on Mac OSX for the default SQLite code.
-** (Third-party VFS implementations might also make the distinction
-** between SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL, but among the
-** operating systems natively supported by SQLite, only Mac OSX
-** cares about the difference.)
-*/
-#define SQLITE_SYNC_NORMAL        0x00002
-#define SQLITE_SYNC_FULL          0x00003
-#define SQLITE_SYNC_DATAONLY      0x00010
-
-/*
-** CAPI3REF: OS Interface Open File Handle
-**
-** An [sqlite3_file] object represents an open file in the 
-** [sqlite3_vfs | OS interface layer].  Individual OS interface
-** implementations will
-** want to subclass this object by appending additional fields
-** for their own use.  The pMethods entry is a pointer to an
-** [sqlite3_io_methods] object that defines methods for performing
-** I/O operations on the open file.
-*/
-typedef struct sqlite3_file sqlite3_file;
-struct sqlite3_file {
-  const struct sqlite3_io_methods *pMethods;  /* Methods for an open file */
-};
-
-/*
-** CAPI3REF: OS Interface File Virtual Methods Object
-**
-** Every file opened by the [sqlite3_vfs.xOpen] method populates an
-** [sqlite3_file] object (or, more commonly, a subclass of the
-** [sqlite3_file] object) with a pointer to an instance of this object.
-** This object defines the methods used to perform various operations
-** against the open file represented by the [sqlite3_file] object.
-**
-** If the [sqlite3_vfs.xOpen] method sets the sqlite3_file.pMethods element 
-** to a non-NULL pointer, then the sqlite3_io_methods.xClose method
-** may be invoked even if the [sqlite3_vfs.xOpen] reported that it failed.  The
-** only way to prevent a call to xClose following a failed [sqlite3_vfs.xOpen]
-** is for the [sqlite3_vfs.xOpen] to set the sqlite3_file.pMethods element
-** to NULL.
-**
-** The flags argument to xSync may be one of [SQLITE_SYNC_NORMAL] or
-** [SQLITE_SYNC_FULL].  The first choice is the normal fsync().
-** The second choice is a Mac OS X style fullsync.  The [SQLITE_SYNC_DATAONLY]
-** flag may be ORed in to indicate that only the data of the file
-** and not its inode needs to be synced.
-**
-** The integer values to xLock() and xUnlock() are one of
-** <ul>
-** <li> [SQLITE_LOCK_NONE],
-** <li> [SQLITE_LOCK_SHARED],
-** <li> [SQLITE_LOCK_RESERVED],
-** <li> [SQLITE_LOCK_PENDING], or
-** <li> [SQLITE_LOCK_EXCLUSIVE].
-** </ul>
-** xLock() increases the lock. xUnlock() decreases the lock.
-** The xCheckReservedLock() method checks whether any database connection,
-** either in this process or in some other process, is holding a RESERVED,
-** PENDING, or EXCLUSIVE lock on the file.  It returns true
-** if such a lock exists and false otherwise.
-**
-** The xFileControl() method is a generic interface that allows custom
-** VFS implementations to directly control an open file using the
-** [sqlite3_file_control()] interface.  The second "op" argument is an
-** integer opcode.  The third argument is a generic pointer intended to
-** point to a structure that may contain arguments or space in which to
-** write return values.  Potential uses for xFileControl() might be
-** functions to enable blocking locks with timeouts, to change the
-** locking strategy (for example to use dot-file locks), to inquire
-** about the status of a lock, or to break stale locks.  The SQLite
-** core reserves all opcodes less than 100 for its own use.
-** A [file control opcodes | list of opcodes] less than 100 is available.
-** Applications that define a custom xFileControl method should use opcodes
-** greater than 100 to avoid conflicts.  VFS implementations should
-** return [SQLITE_NOTFOUND] for file control opcodes that they do not
-** recognize.
-**
-** The xSectorSize() method returns the sector size of the
-** device that underlies the file.  The sector size is the
-** minimum write that can be performed without disturbing
-** other bytes in the file.  The xDeviceCharacteristics()
-** method returns a bit vector describing behaviors of the
-** underlying device:
-**
-** <ul>
-** <li> [SQLITE_IOCAP_ATOMIC]
-** <li> [SQLITE_IOCAP_ATOMIC512]
-** <li> [SQLITE_IOCAP_ATOMIC1K]
-** <li> [SQLITE_IOCAP_ATOMIC2K]
-** <li> [SQLITE_IOCAP_ATOMIC4K]
-** <li> [SQLITE_IOCAP_ATOMIC8K]
-** <li> [SQLITE_IOCAP_ATOMIC16K]
-** <li> [SQLITE_IOCAP_ATOMIC32K]
-** <li> [SQLITE_IOCAP_ATOMIC64K]
-** <li> [SQLITE_IOCAP_SAFE_APPEND]
-** <li> [SQLITE_IOCAP_SEQUENTIAL]
-** </ul>
-**
-** The SQLITE_IOCAP_ATOMIC property means that all writes of
-** any size are atomic.  The SQLITE_IOCAP_ATOMICnnn values
-** mean that writes of blocks that are nnn bytes in size and
-** are aligned to an address which is an integer multiple of
-** nnn are atomic.  The SQLITE_IOCAP_SAFE_APPEND value means
-** that when data is appended to a file, the data is appended
-** first then the size of the file is extended, never the other
-** way around.  The SQLITE_IOCAP_SEQUENTIAL property means that
-** information is written to disk in the same order as calls
-** to xWrite().
-**
-** If xRead() returns SQLITE_IOERR_SHORT_READ it must also fill
-** in the unread portions of the buffer with zeros.  A VFS that
-** fails to zero-fill short reads might seem to work.  However,
-** failure to zero-fill short reads will eventually lead to
-** database corruption.
-*/
-typedef struct sqlite3_io_methods sqlite3_io_methods;
-struct sqlite3_io_methods {
-  int iVersion;
-  int (*xClose)(sqlite3_file*);
-  int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
-  int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst);
-  int (*xTruncate)(sqlite3_file*, sqlite3_int64 size);
-  int (*xSync)(sqlite3_file*, int flags);
-  int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize);
-  int (*xLock)(sqlite3_file*, int);
-  int (*xUnlock)(sqlite3_file*, int);
-  int (*xCheckReservedLock)(sqlite3_file*, int *pResOut);
-  int (*xFileControl)(sqlite3_file*, int op, void *pArg);
-  int (*xSectorSize)(sqlite3_file*);
-  int (*xDeviceCharacteristics)(sqlite3_file*);
-  /* Methods above are valid for version 1 */
-  int (*xShmMap)(sqlite3_file*, int iPg, int pgsz, int, void volatile**);
-  int (*xShmLock)(sqlite3_file*, int offset, int n, int flags);
-  void (*xShmBarrier)(sqlite3_file*);
-  int (*xShmUnmap)(sqlite3_file*, int deleteFlag);
-  /* Methods above are valid for version 2 */
-  int (*xFetch)(sqlite3_file*, sqlite3_int64 iOfst, int iAmt, void **pp);
-  int (*xUnfetch)(sqlite3_file*, sqlite3_int64 iOfst, void *p);
-  /* Methods above are valid for version 3 */
-  /* Additional methods may be added in future releases */
-};
-
-/*
-** CAPI3REF: Standard File Control Opcodes
-** KEYWORDS: {file control opcodes} {file control opcode}
-**
-** These integer constants are opcodes for the xFileControl method
-** of the [sqlite3_io_methods] object and for the [sqlite3_file_control()]
-** interface.
-**
-** <ul>
-** <li>[[SQLITE_FCNTL_LOCKSTATE]]
-** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging.  This
-** opcode causes the xFileControl method to write the current state of
-** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
-** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
-** into an integer that the pArg argument points to. This capability
-** is used during testing and is only available when the SQLITE_TEST
-** compile-time option is used.
-**
-** <li>[[SQLITE_FCNTL_SIZE_HINT]]
-** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
-** layer a hint of how large the database file will grow to be during the
-** current transaction.  This hint is not guaranteed to be accurate but it
-** is often close.  The underlying VFS might choose to preallocate database
-** file space based on this hint in order to help writes to the database
-** file run faster.
-**
-** <li>[[SQLITE_FCNTL_CHUNK_SIZE]]
-** The [SQLITE_FCNTL_CHUNK_SIZE] opcode is used to request that the VFS
-** extends and truncates the database file in chunks of a size specified
-** by the user. The fourth argument to [sqlite3_file_control()] should 
-** point to an integer (type int) containing the new chunk-size to use
-** for the nominated database. Allocating database file space in large
-** chunks (say 1MB at a time), may reduce file-system fragmentation and
-** improve performance on some systems.
-**
-** <li>[[SQLITE_FCNTL_FILE_POINTER]]
-** The [SQLITE_FCNTL_FILE_POINTER] opcode is used to obtain a pointer
-** to the [sqlite3_file] object associated with a particular database
-** connection.  See also [SQLITE_FCNTL_JOURNAL_POINTER].
-**
-** <li>[[SQLITE_FCNTL_JOURNAL_POINTER]]
-** The [SQLITE_FCNTL_JOURNAL_POINTER] opcode is used to obtain a pointer
-** to the [sqlite3_file] object associated with the journal file (either
-** the [rollback journal] or the [write-ahead log]) for a particular database
-** connection.  See also [SQLITE_FCNTL_FILE_POINTER].
-**
-** <li>[[SQLITE_FCNTL_SYNC_OMITTED]]
-** No longer in use.
-**
-** <li>[[SQLITE_FCNTL_SYNC]]
-** The [SQLITE_FCNTL_SYNC] opcode is generated internally by SQLite and
-** sent to the VFS immediately before the xSync method is invoked on a
-** database file descriptor. Or, if the xSync method is not invoked 
-** because the user has configured SQLite with 
-** [PRAGMA synchronous | PRAGMA synchronous=OFF] it is invoked in place 
-** of the xSync method. In most cases, the pointer argument passed with
-** this file-control is NULL. However, if the database file is being synced
-** as part of a multi-database commit, the argument points to a nul-terminated
-** string containing the transactions master-journal file name. VFSes that 
-** do not need this signal should silently ignore this opcode. Applications 
-** should not call [sqlite3_file_control()] with this opcode as doing so may 
-** disrupt the operation of the specialized VFSes that do require it.  
-**
-** <li>[[SQLITE_FCNTL_COMMIT_PHASETWO]]
-** The [SQLITE_FCNTL_COMMIT_PHASETWO] opcode is generated internally by SQLite
-** and sent to the VFS after a transaction has been committed immediately
-** but before the database is unlocked. VFSes that do not need this signal
-** should silently ignore this opcode. Applications should not call
-** [sqlite3_file_control()] with this opcode as doing so may disrupt the 
-** operation of the specialized VFSes that do require it.  
-**
-** <li>[[SQLITE_FCNTL_WIN32_AV_RETRY]]
-** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic
-** retry counts and intervals for certain disk I/O operations for the
-** windows [VFS] in order to provide robustness in the presence of
-** anti-virus programs.  By default, the windows VFS will retry file read,
-** file write, and file delete operations up to 10 times, with a delay
-** of 25 milliseconds before the first retry and with the delay increasing
-** by an additional 25 milliseconds with each subsequent retry.  This
-** opcode allows these two values (10 retries and 25 milliseconds of delay)
-** to be adjusted.  The values are changed for all database connections
-** within the same process.  The argument is a pointer to an array of two
-** integers where the first integer i the new retry count and the second
-** integer is the delay.  If either integer is negative, then the setting
-** is not changed but instead the prior value of that setting is written
-** into the array entry, allowing the current retry settings to be
-** interrogated.  The zDbName parameter is ignored.
-**
-** <li>[[SQLITE_FCNTL_PERSIST_WAL]]
-** ^The [SQLITE_FCNTL_PERSIST_WAL] opcode is used to set or query the
-** persistent [WAL | Write Ahead Log] setting.  By default, the auxiliary
-** write ahead log and shared memory files used for transaction control
-** are automatically deleted when the latest connection to the database
-** closes.  Setting persistent WAL mode causes those files to persist after
-** close.  Persisting the files is useful when other processes that do not
-** have write permission on the directory containing the database file want
-** to read the database file, as the WAL and shared memory files must exist
-** in order for the database to be readable.  The fourth parameter to
-** [sqlite3_file_control()] for this opcode should be a pointer to an integer.
-** That integer is 0 to disable persistent WAL mode or 1 to enable persistent
-** WAL mode.  If the integer is -1, then it is overwritten with the current
-** WAL persistence setting.
-**
-** <li>[[SQLITE_FCNTL_POWERSAFE_OVERWRITE]]
-** ^The [SQLITE_FCNTL_POWERSAFE_OVERWRITE] opcode is used to set or query the
-** persistent "powersafe-overwrite" or "PSOW" setting.  The PSOW setting
-** determines the [SQLITE_IOCAP_POWERSAFE_OVERWRITE] bit of the
-** xDeviceCharacteristics methods. The fourth parameter to
-** [sqlite3_file_control()] for this opcode should be a pointer to an integer.
-** That integer is 0 to disable zero-damage mode or 1 to enable zero-damage
-** mode.  If the integer is -1, then it is overwritten with the current
-** zero-damage mode setting.
-**
-** <li>[[SQLITE_FCNTL_OVERWRITE]]
-** ^The [SQLITE_FCNTL_OVERWRITE] opcode is invoked by SQLite after opening
-** a write transaction to indicate that, unless it is rolled back for some
-** reason, the entire database file will be overwritten by the current 
-** transaction. This is used by VACUUM operations.
-**
-** <li>[[SQLITE_FCNTL_VFSNAME]]
-** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of
-** all [VFSes] in the VFS stack.  The names are of all VFS shims and the
-** final bottom-level VFS are written into memory obtained from 
-** [sqlite3_malloc()] and the result is stored in the char* variable
-** that the fourth parameter of [sqlite3_file_control()] points to.
-** The caller is responsible for freeing the memory when done.  As with
-** all file-control actions, there is no guarantee that this will actually
-** do anything.  Callers should initialize the char* variable to a NULL
-** pointer in case this file-control is not implemented.  This file-control
-** is intended for diagnostic use only.
-**
-** <li>[[SQLITE_FCNTL_VFS_POINTER]]
-** ^The [SQLITE_FCNTL_VFS_POINTER] opcode finds a pointer to the top-level
-** [VFSes] currently in use.  ^(The argument X in
-** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
-** of type "[sqlite3_vfs] **".  This opcodes will set *X
-** to a pointer to the top-level VFS.)^
-** ^When there are multiple VFS shims in the stack, this opcode finds the
-** upper-most shim only.
-**
-** <li>[[SQLITE_FCNTL_PRAGMA]]
-** ^Whenever a [PRAGMA] statement is parsed, an [SQLITE_FCNTL_PRAGMA] 
-** file control is sent to the open [sqlite3_file] object corresponding
-** to the database file to which the pragma statement refers. ^The argument
-** to the [SQLITE_FCNTL_PRAGMA] file control is an array of
-** pointers to strings (char**) in which the second element of the array
-** is the name of the pragma and the third element is the argument to the
-** pragma or NULL if the pragma has no argument.  ^The handler for an
-** [SQLITE_FCNTL_PRAGMA] file control can optionally make the first element
-** of the char** argument point to a string obtained from [sqlite3_mprintf()]
-** or the equivalent and that string will become the result of the pragma or
-** the error message if the pragma fails. ^If the
-** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal 
-** [PRAGMA] processing continues.  ^If the [SQLITE_FCNTL_PRAGMA]
-** file control returns [SQLITE_OK], then the parser assumes that the
-** VFS has handled the PRAGMA itself and the parser generates a no-op
-** prepared statement if result string is NULL, or that returns a copy
-** of the result string if the string is non-NULL.
-** ^If the [SQLITE_FCNTL_PRAGMA] file control returns
-** any result code other than [SQLITE_OK] or [SQLITE_NOTFOUND], that means
-** that the VFS encountered an error while handling the [PRAGMA] and the
-** compilation of the PRAGMA fails with an error.  ^The [SQLITE_FCNTL_PRAGMA]
-** file control occurs at the beginning of pragma statement analysis and so
-** it is able to override built-in [PRAGMA] statements.
-**
-** <li>[[SQLITE_FCNTL_BUSYHANDLER]]
-** ^The [SQLITE_FCNTL_BUSYHANDLER]
-** file-control may be invoked by SQLite on the database file handle
-** shortly after it is opened in order to provide a custom VFS with access
-** to the connections busy-handler callback. The argument is of type (void **)
-** - an array of two (void *) values. The first (void *) actually points
-** to a function of type (int (*)(void *)). In order to invoke the connections
-** busy-handler, this function should be invoked with the second (void *) in
-** the array as the only argument. If it returns non-zero, then the operation
-** should be retried. If it returns zero, the custom VFS should abandon the
-** current operation.
-**
-** <li>[[SQLITE_FCNTL_TEMPFILENAME]]
-** ^Application can invoke the [SQLITE_FCNTL_TEMPFILENAME] file-control
-** to have SQLite generate a
-** temporary filename using the same algorithm that is followed to generate
-** temporary filenames for TEMP tables and other internal uses.  The
-** argument should be a char** which will be filled with the filename
-** written into memory obtained from [sqlite3_malloc()].  The caller should
-** invoke [sqlite3_free()] on the result to avoid a memory leak.
-**
-** <li>[[SQLITE_FCNTL_MMAP_SIZE]]
-** The [SQLITE_FCNTL_MMAP_SIZE] file control is used to query or set the
-** maximum number of bytes that will be used for memory-mapped I/O.
-** The argument is a pointer to a value of type sqlite3_int64 that
-** is an advisory maximum number of bytes in the file to memory map.  The
-** pointer is overwritten with the old value.  The limit is not changed if
-** the value originally pointed to is negative, and so the current limit 
-** can be queried by passing in a pointer to a negative number.  This
-** file-control is used internally to implement [PRAGMA mmap_size].
-**
-** <li>[[SQLITE_FCNTL_TRACE]]
-** The [SQLITE_FCNTL_TRACE] file control provides advisory information
-** to the VFS about what the higher layers of the SQLite stack are doing.
-** This file control is used by some VFS activity tracing [shims].
-** The argument is a zero-terminated string.  Higher layers in the
-** SQLite stack may generate instances of this file control if
-** the [SQLITE_USE_FCNTL_TRACE] compile-time option is enabled.
-**
-** <li>[[SQLITE_FCNTL_HAS_MOVED]]
-** The [SQLITE_FCNTL_HAS_MOVED] file control interprets its argument as a
-** pointer to an integer and it writes a boolean into that integer depending
-** on whether or not the file has been renamed, moved, or deleted since it
-** was first opened.
-**
-** <li>[[SQLITE_FCNTL_WIN32_SET_HANDLE]]
-** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging.  This
-** opcode causes the xFileControl method to swap the file handle with the one
-** pointed to by the pArg argument.  This capability is used during testing
-** and only needs to be supported when SQLITE_TEST is defined.
-**
-** <li>[[SQLITE_FCNTL_WAL_BLOCK]]
-** The [SQLITE_FCNTL_WAL_BLOCK] is a signal to the VFS layer that it might
-** be advantageous to block on the next WAL lock if the lock is not immediately
-** available.  The WAL subsystem issues this signal during rare
-** circumstances in order to fix a problem with priority inversion.
-** Applications should <em>not</em> use this file-control.
-**
-** <li>[[SQLITE_FCNTL_ZIPVFS]]
-** The [SQLITE_FCNTL_ZIPVFS] opcode is implemented by zipvfs only. All other
-** VFS should return SQLITE_NOTFOUND for this opcode.
-**
-** <li>[[SQLITE_FCNTL_RBU]]
-** The [SQLITE_FCNTL_RBU] opcode is implemented by the special VFS used by
-** the RBU extension only.  All other VFS should return SQLITE_NOTFOUND for
-** this opcode.  
-** </ul>
-*/
-#define SQLITE_FCNTL_LOCKSTATE               1
-#define SQLITE_FCNTL_GET_LOCKPROXYFILE       2
-#define SQLITE_FCNTL_SET_LOCKPROXYFILE       3
-#define SQLITE_FCNTL_LAST_ERRNO              4
-#define SQLITE_FCNTL_SIZE_HINT               5
-#define SQLITE_FCNTL_CHUNK_SIZE              6
-#define SQLITE_FCNTL_FILE_POINTER            7
-#define SQLITE_FCNTL_SYNC_OMITTED            8
-#define SQLITE_FCNTL_WIN32_AV_RETRY          9
-#define SQLITE_FCNTL_PERSIST_WAL            10
-#define SQLITE_FCNTL_OVERWRITE              11
-#define SQLITE_FCNTL_VFSNAME                12
-#define SQLITE_FCNTL_POWERSAFE_OVERWRITE    13
-#define SQLITE_FCNTL_PRAGMA                 14
-#define SQLITE_FCNTL_BUSYHANDLER            15
-#define SQLITE_FCNTL_TEMPFILENAME           16
-#define SQLITE_FCNTL_MMAP_SIZE              18
-#define SQLITE_FCNTL_TRACE                  19
-#define SQLITE_FCNTL_HAS_MOVED              20
-#define SQLITE_FCNTL_SYNC                   21
-#define SQLITE_FCNTL_COMMIT_PHASETWO        22
-#define SQLITE_FCNTL_WIN32_SET_HANDLE       23
-#define SQLITE_FCNTL_WAL_BLOCK              24
-#define SQLITE_FCNTL_ZIPVFS                 25
-#define SQLITE_FCNTL_RBU                    26
-#define SQLITE_FCNTL_VFS_POINTER            27
-#define SQLITE_FCNTL_JOURNAL_POINTER        28
-
-/* deprecated names */
-#define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
-#define SQLITE_SET_LOCKPROXYFILE      SQLITE_FCNTL_SET_LOCKPROXYFILE
-#define SQLITE_LAST_ERRNO             SQLITE_FCNTL_LAST_ERRNO
-
-
-/*
-** CAPI3REF: Mutex Handle
-**
-** The mutex module within SQLite defines [sqlite3_mutex] to be an
-** abstract type for a mutex object.  The SQLite core never looks
-** at the internal representation of an [sqlite3_mutex].  It only
-** deals with pointers to the [sqlite3_mutex] object.
-**
-** Mutexes are created using [sqlite3_mutex_alloc()].
-*/
-typedef struct sqlite3_mutex sqlite3_mutex;
-
-/*
-** CAPI3REF: OS Interface Object
-**
-** An instance of the sqlite3_vfs object defines the interface between
-** the SQLite core and the underlying operating system.  The "vfs"
-** in the name of the object stands for "virtual file system".  See
-** the [VFS | VFS documentation] for further information.
-**
-** The value of the iVersion field is initially 1 but may be larger in
-** future versions of SQLite.  Additional fields may be appended to this
-** object when the iVersion value is increased.  Note that the structure
-** of the sqlite3_vfs object changes in the transaction between
-** SQLite version 3.5.9 and 3.6.0 and yet the iVersion field was not
-** modified.
-**
-** The szOsFile field is the size of the subclassed [sqlite3_file]
-** structure used by this VFS.  mxPathname is the maximum length of
-** a pathname in this VFS.
-**
-** Registered sqlite3_vfs objects are kept on a linked list formed by
-** the pNext pointer.  The [sqlite3_vfs_register()]
-** and [sqlite3_vfs_unregister()] interfaces manage this list
-** in a thread-safe way.  The [sqlite3_vfs_find()] interface
-** searches the list.  Neither the application code nor the VFS
-** implementation should use the pNext pointer.
-**
-** The pNext field is the only field in the sqlite3_vfs
-** structure that SQLite will ever modify.  SQLite will only access
-** or modify this field while holding a particular static mutex.
-** The application should never modify anything within the sqlite3_vfs
-** object once the object has been registered.
-**
-** The zName field holds the name of the VFS module.  The name must
-** be unique across all VFS modules.
-**
-** [[sqlite3_vfs.xOpen]]
-** ^SQLite guarantees that the zFilename parameter to xOpen
-** is either a NULL pointer or string obtained
-** from xFullPathname() with an optional suffix added.
-** ^If a suffix is added to the zFilename parameter, it will
-** consist of a single "-" character followed by no more than
-** 11 alphanumeric and/or "-" characters.
-** ^SQLite further guarantees that
-** the string will be valid and unchanged until xClose() is
-** called. Because of the previous sentence,
-** the [sqlite3_file] can safely store a pointer to the
-** filename if it needs to remember the filename for some reason.
-** If the zFilename parameter to xOpen is a NULL pointer then xOpen
-** must invent its own temporary name for the file.  ^Whenever the 
-** xFilename parameter is NULL it will also be the case that the
-** flags parameter will include [SQLITE_OPEN_DELETEONCLOSE].
-**
-** The flags argument to xOpen() includes all bits set in
-** the flags argument to [sqlite3_open_v2()].  Or if [sqlite3_open()]
-** or [sqlite3_open16()] is used, then flags includes at least
-** [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]. 
-** If xOpen() opens a file read-only then it sets *pOutFlags to
-** include [SQLITE_OPEN_READONLY].  Other bits in *pOutFlags may be set.
-**
-** ^(SQLite will also add one of the following flags to the xOpen()
-** call, depending on the object being opened:
-**
-** <ul>
-** <li>  [SQLITE_OPEN_MAIN_DB]
-** <li>  [SQLITE_OPEN_MAIN_JOURNAL]
-** <li>  [SQLITE_OPEN_TEMP_DB]
-** <li>  [SQLITE_OPEN_TEMP_JOURNAL]
-** <li>  [SQLITE_OPEN_TRANSIENT_DB]
-** <li>  [SQLITE_OPEN_SUBJOURNAL]
-** <li>  [SQLITE_OPEN_MASTER_JOURNAL]
-** <li>  [SQLITE_OPEN_WAL]
-** </ul>)^
-**
-** The file I/O implementation can use the object type flags to
-** change the way it deals with files.  For example, an application
-** that does not care about crash recovery or rollback might make
-** the open of a journal file a no-op.  Writes to this journal would
-** also be no-ops, and any attempt to read the journal would return
-** SQLITE_IOERR.  Or the implementation might recognize that a database
-** file will be doing page-aligned sector reads and writes in a random
-** order and set up its I/O subsystem accordingly.
-**
-** SQLite might also add one of the following flags to the xOpen method:
-**
-** <ul>
-** <li> [SQLITE_OPEN_DELETEONCLOSE]
-** <li> [SQLITE_OPEN_EXCLUSIVE]
-** </ul>
-**
-** The [SQLITE_OPEN_DELETEONCLOSE] flag means the file should be
-** deleted when it is closed.  ^The [SQLITE_OPEN_DELETEONCLOSE]
-** will be set for TEMP databases and their journals, transient
-** databases, and subjournals.
-**
-** ^The [SQLITE_OPEN_EXCLUSIVE] flag is always used in conjunction
-** with the [SQLITE_OPEN_CREATE] flag, which are both directly
-** analogous to the O_EXCL and O_CREAT flags of the POSIX open()
-** API.  The SQLITE_OPEN_EXCLUSIVE flag, when paired with the 
-** SQLITE_OPEN_CREATE, is used to indicate that file should always
-** be created, and that it is an error if it already exists.
-** It is <i>not</i> used to indicate the file should be opened 
-** for exclusive access.
-**
-** ^At least szOsFile bytes of memory are allocated by SQLite
-** to hold the  [sqlite3_file] structure passed as the third
-** argument to xOpen.  The xOpen method does not have to
-** allocate the structure; it should just fill it in.  Note that
-** the xOpen method must set the sqlite3_file.pMethods to either
-** a valid [sqlite3_io_methods] object or to NULL.  xOpen must do
-** this even if the open fails.  SQLite expects that the sqlite3_file.pMethods
-** element will be valid after xOpen returns regardless of the success
-** or failure of the xOpen call.
-**
-** [[sqlite3_vfs.xAccess]]
-** ^The flags argument to xAccess() may be [SQLITE_ACCESS_EXISTS]
-** to test for the existence of a file, or [SQLITE_ACCESS_READWRITE] to
-** test whether a file is readable and writable, or [SQLITE_ACCESS_READ]
-** to test whether a file is at least readable.   The file can be a
-** directory.
-**
-** ^SQLite will always allocate at least mxPathname+1 bytes for the
-** output buffer xFullPathname.  The exact size of the output buffer
-** is also passed as a parameter to both  methods. If the output buffer
-** is not large enough, [SQLITE_CANTOPEN] should be returned. Since this is
-** handled as a fatal error by SQLite, vfs implementations should endeavor
-** to prevent this by setting mxPathname to a sufficiently large value.
-**
-** The xRandomness(), xSleep(), xCurrentTime(), and xCurrentTimeInt64()
-** interfaces are not strictly a part of the filesystem, but they are
-** included in the VFS structure for completeness.
-** The xRandomness() function attempts to return nBytes bytes
-** of good-quality randomness into zOut.  The return value is
-** the actual number of bytes of randomness obtained.
-** The xSleep() method causes the calling thread to sleep for at
-** least the number of microseconds given.  ^The xCurrentTime()
-** method returns a Julian Day Number for the current date and time as
-** a floating point value.
-** ^The xCurrentTimeInt64() method returns, as an integer, the Julian
-** Day Number multiplied by 86400000 (the number of milliseconds in 
-** a 24-hour day).  
-** ^SQLite will use the xCurrentTimeInt64() method to get the current
-** date and time if that method is available (if iVersion is 2 or 
-** greater and the function pointer is not NULL) and will fall back
-** to xCurrentTime() if xCurrentTimeInt64() is unavailable.
-**
-** ^The xSetSystemCall(), xGetSystemCall(), and xNestSystemCall() interfaces
-** are not used by the SQLite core.  These optional interfaces are provided
-** by some VFSes to facilitate testing of the VFS code. By overriding 
-** system calls with functions under its control, a test program can
-** simulate faults and error conditions that would otherwise be difficult
-** or impossible to induce.  The set of system calls that can be overridden
-** varies from one VFS to another, and from one version of the same VFS to the
-** next.  Applications that use these interfaces must be prepared for any
-** or all of these interfaces to be NULL or for their behavior to change
-** from one release to the next.  Applications must not attempt to access
-** any of these methods if the iVersion of the VFS is less than 3.
-*/
-typedef struct sqlite3_vfs sqlite3_vfs;
-typedef void (*sqlite3_syscall_ptr)(void);
-struct sqlite3_vfs {
-  int iVersion;            /* Structure version number (currently 3) */
-  int szOsFile;            /* Size of subclassed sqlite3_file */
-  int mxPathname;          /* Maximum file pathname length */
-  sqlite3_vfs *pNext;      /* Next registered VFS */
-  const char *zName;       /* Name of this virtual file system */
-  void *pAppData;          /* Pointer to application-specific data */
-  int (*xOpen)(sqlite3_vfs*, const char *zName, sqlite3_file*,
-               int flags, int *pOutFlags);
-  int (*xDelete)(sqlite3_vfs*, const char *zName, int syncDir);
-  int (*xAccess)(sqlite3_vfs*, const char *zName, int flags, int *pResOut);
-  int (*xFullPathname)(sqlite3_vfs*, const char *zName, int nOut, char *zOut);
-  void *(*xDlOpen)(sqlite3_vfs*, const char *zFilename);
-  void (*xDlError)(sqlite3_vfs*, int nByte, char *zErrMsg);
-  void (*(*xDlSym)(sqlite3_vfs*,void*, const char *zSymbol))(void);
-  void (*xDlClose)(sqlite3_vfs*, void*);
-  int (*xRandomness)(sqlite3_vfs*, int nByte, char *zOut);
-  int (*xSleep)(sqlite3_vfs*, int microseconds);
-  int (*xCurrentTime)(sqlite3_vfs*, double*);
-  int (*xGetLastError)(sqlite3_vfs*, int, char *);
-  /*
-  ** The methods above are in version 1 of the sqlite_vfs object
-  ** definition.  Those that follow are added in version 2 or later
-  */
-  int (*xCurrentTimeInt64)(sqlite3_vfs*, sqlite3_int64*);
-  /*
-  ** The methods above are in versions 1 and 2 of the sqlite_vfs object.
-  ** Those below are for version 3 and greater.
-  */
-  int (*xSetSystemCall)(sqlite3_vfs*, const char *zName, sqlite3_syscall_ptr);
-  sqlite3_syscall_ptr (*xGetSystemCall)(sqlite3_vfs*, const char *zName);
-  const char *(*xNextSystemCall)(sqlite3_vfs*, const char *zName);
-  /*
-  ** The methods above are in versions 1 through 3 of the sqlite_vfs object.
-  ** New fields may be appended in figure versions.  The iVersion
-  ** value will increment whenever this happens. 
-  */
-};
-
-/*
-** CAPI3REF: Flags for the xAccess VFS method
-**
-** These integer constants can be used as the third parameter to
-** the xAccess method of an [sqlite3_vfs] object.  They determine
-** what kind of permissions the xAccess method is looking for.
-** With SQLITE_ACCESS_EXISTS, the xAccess method
-** simply checks whether the file exists.
-** With SQLITE_ACCESS_READWRITE, the xAccess method
-** checks whether the named directory is both readable and writable
-** (in other words, if files can be added, removed, and renamed within
-** the directory).
-** The SQLITE_ACCESS_READWRITE constant is currently used only by the
-** [temp_store_directory pragma], though this could change in a future
-** release of SQLite.
-** With SQLITE_ACCESS_READ, the xAccess method
-** checks whether the file is readable.  The SQLITE_ACCESS_READ constant is
-** currently unused, though it might be used in a future release of
-** SQLite.
-*/
-#define SQLITE_ACCESS_EXISTS    0
-#define SQLITE_ACCESS_READWRITE 1   /* Used by PRAGMA temp_store_directory */
-#define SQLITE_ACCESS_READ      2   /* Unused */
-
-/*
-** CAPI3REF: Flags for the xShmLock VFS method
-**
-** These integer constants define the various locking operations
-** allowed by the xShmLock method of [sqlite3_io_methods].  The
-** following are the only legal combinations of flags to the
-** xShmLock method:
-**
-** <ul>
-** <li>  SQLITE_SHM_LOCK | SQLITE_SHM_SHARED
-** <li>  SQLITE_SHM_LOCK | SQLITE_SHM_EXCLUSIVE
-** <li>  SQLITE_SHM_UNLOCK | SQLITE_SHM_SHARED
-** <li>  SQLITE_SHM_UNLOCK | SQLITE_SHM_EXCLUSIVE
-** </ul>
-**
-** When unlocking, the same SHARED or EXCLUSIVE flag must be supplied as
-** was given on the corresponding lock.  
-**
-** The xShmLock method can transition between unlocked and SHARED or
-** between unlocked and EXCLUSIVE.  It cannot transition between SHARED
-** and EXCLUSIVE.
-*/
-#define SQLITE_SHM_UNLOCK       1
-#define SQLITE_SHM_LOCK         2
-#define SQLITE_SHM_SHARED       4
-#define SQLITE_SHM_EXCLUSIVE    8
-
-/*
-** CAPI3REF: Maximum xShmLock index
-**
-** The xShmLock method on [sqlite3_io_methods] may use values
-** between 0 and this upper bound as its "offset" argument.
-** The SQLite core will never attempt to acquire or release a
-** lock outside of this range
-*/
-#define SQLITE_SHM_NLOCK        8
-
-
-/*
-** CAPI3REF: Initialize The SQLite Library
-**
-** ^The sqlite3_initialize() routine initializes the
-** SQLite library.  ^The sqlite3_shutdown() routine
-** deallocates any resources that were allocated by sqlite3_initialize().
-** These routines are designed to aid in process initialization and
-** shutdown on embedded systems.  Workstation applications using
-** SQLite normally do not need to invoke either of these routines.
-**
-** A call to sqlite3_initialize() is an "effective" call if it is
-** the first time sqlite3_initialize() is invoked during the lifetime of
-** the process, or if it is the first time sqlite3_initialize() is invoked
-** following a call to sqlite3_shutdown().  ^(Only an effective call
-** of sqlite3_initialize() does any initialization.  All other calls
-** are harmless no-ops.)^
-**
-** A call to sqlite3_shutdown() is an "effective" call if it is the first
-** call to sqlite3_shutdown() since the last sqlite3_initialize().  ^(Only
-** an effective call to sqlite3_shutdown() does any deinitialization.
-** All other valid calls to sqlite3_shutdown() are harmless no-ops.)^
-**
-** The sqlite3_initialize() interface is threadsafe, but sqlite3_shutdown()
-** is not.  The sqlite3_shutdown() interface must only be called from a
-** single thread.  All open [database connections] must be closed and all
-** other SQLite resources must be deallocated prior to invoking
-** sqlite3_shutdown().
-**
-** Among other things, ^sqlite3_initialize() will invoke
-** sqlite3_os_init().  Similarly, ^sqlite3_shutdown()
-** will invoke sqlite3_os_end().
-**
-** ^The sqlite3_initialize() routine returns [SQLITE_OK] on success.
-** ^If for some reason, sqlite3_initialize() is unable to initialize
-** the library (perhaps it is unable to allocate a needed resource such
-** as a mutex) it returns an [error code] other than [SQLITE_OK].
-**
-** ^The sqlite3_initialize() routine is called internally by many other
-** SQLite interfaces so that an application usually does not need to
-** invoke sqlite3_initialize() directly.  For example, [sqlite3_open()]
-** calls sqlite3_initialize() so the SQLite library will be automatically
-** initialized when [sqlite3_open()] is called if it has not be initialized
-** already.  ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
-** compile-time option, then the automatic calls to sqlite3_initialize()
-** are omitted and the application must call sqlite3_initialize() directly
-** prior to using any other SQLite interface.  For maximum portability,
-** it is recommended that applications always invoke sqlite3_initialize()
-** directly prior to using any other SQLite interface.  Future releases
-** of SQLite may require this.  In other words, the behavior exhibited
-** when SQLite is compiled with [SQLITE_OMIT_AUTOINIT] might become the
-** default behavior in some future release of SQLite.
-**
-** The sqlite3_os_init() routine does operating-system specific
-** initialization of the SQLite library.  The sqlite3_os_end()
-** routine undoes the effect of sqlite3_os_init().  Typical tasks
-** performed by these routines include allocation or deallocation
-** of static resources, initialization of global variables,
-** setting up a default [sqlite3_vfs] module, or setting up
-** a default configuration using [sqlite3_config()].
-**
-** The application should never invoke either sqlite3_os_init()
-** or sqlite3_os_end() directly.  The application should only invoke
-** sqlite3_initialize() and sqlite3_shutdown().  The sqlite3_os_init()
-** interface is called automatically by sqlite3_initialize() and
-** sqlite3_os_end() is called by sqlite3_shutdown().  Appropriate
-** implementations for sqlite3_os_init() and sqlite3_os_end()
-** are built into SQLite when it is compiled for Unix, Windows, or OS/2.
-** When [custom builds | built for other platforms]
-** (using the [SQLITE_OS_OTHER=1] compile-time
-** option) the application must supply a suitable implementation for
-** sqlite3_os_init() and sqlite3_os_end().  An application-supplied
-** implementation of sqlite3_os_init() or sqlite3_os_end()
-** must return [SQLITE_OK] on success and some other [error code] upon
-** failure.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_initialize(void);
-SQLITE_API int SQLITE_STDCALL sqlite3_shutdown(void);
-SQLITE_API int SQLITE_STDCALL sqlite3_os_init(void);
-SQLITE_API int SQLITE_STDCALL sqlite3_os_end(void);
-
-/*
-** CAPI3REF: Configuring The SQLite Library
-**
-** The sqlite3_config() interface is used to make global configuration
-** changes to SQLite in order to tune SQLite to the specific needs of
-** the application.  The default configuration is recommended for most
-** applications and so this routine is usually not necessary.  It is
-** provided to support rare applications with unusual needs.
-**
-** <b>The sqlite3_config() interface is not threadsafe. The application
-** must ensure that no other SQLite interfaces are invoked by other
-** threads while sqlite3_config() is running.</b>
-**
-** The sqlite3_config() interface
-** may only be invoked prior to library initialization using
-** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
-** ^If sqlite3_config() is called after [sqlite3_initialize()] and before
-** [sqlite3_shutdown()] then it will return SQLITE_MISUSE.
-** Note, however, that ^sqlite3_config() can be called as part of the
-** implementation of an application-defined [sqlite3_os_init()].
-**
-** The first argument to sqlite3_config() is an integer
-** [configuration option] that determines
-** what property of SQLite is to be configured.  Subsequent arguments
-** vary depending on the [configuration option]
-** in the first argument.
-**
-** ^When a configuration option is set, sqlite3_config() returns [SQLITE_OK].
-** ^If the option is unknown or SQLite is unable to set the option
-** then this routine returns a non-zero [error code].
-*/
-SQLITE_API int SQLITE_CDECL sqlite3_config(int, ...);
-
-/*
-** CAPI3REF: Configure database connections
-** METHOD: sqlite3
-**
-** The sqlite3_db_config() interface is used to make configuration
-** changes to a [database connection].  The interface is similar to
-** [sqlite3_config()] except that the changes apply to a single
-** [database connection] (specified in the first argument).
-**
-** The second argument to sqlite3_db_config(D,V,...)  is the
-** [SQLITE_DBCONFIG_LOOKASIDE | configuration verb] - an integer code 
-** that indicates what aspect of the [database connection] is being configured.
-** Subsequent arguments vary depending on the configuration verb.
-**
-** ^Calls to sqlite3_db_config() return SQLITE_OK if and only if
-** the call is considered successful.
-*/
-SQLITE_API int SQLITE_CDECL sqlite3_db_config(sqlite3*, int op, ...);
-
-/*
-** CAPI3REF: Memory Allocation Routines
-**
-** An instance of this object defines the interface between SQLite
-** and low-level memory allocation routines.
-**
-** This object is used in only one place in the SQLite interface.
-** A pointer to an instance of this object is the argument to
-** [sqlite3_config()] when the configuration option is
-** [SQLITE_CONFIG_MALLOC] or [SQLITE_CONFIG_GETMALLOC].  
-** By creating an instance of this object
-** and passing it to [sqlite3_config]([SQLITE_CONFIG_MALLOC])
-** during configuration, an application can specify an alternative
-** memory allocation subsystem for SQLite to use for all of its
-** dynamic memory needs.
-**
-** Note that SQLite comes with several [built-in memory allocators]
-** that are perfectly adequate for the overwhelming majority of applications
-** and that this object is only useful to a tiny minority of applications
-** with specialized memory allocation requirements.  This object is
-** also used during testing of SQLite in order to specify an alternative
-** memory allocator that simulates memory out-of-memory conditions in
-** order to verify that SQLite recovers gracefully from such
-** conditions.
-**
-** The xMalloc, xRealloc, and xFree methods must work like the
-** malloc(), realloc() and free() functions from the standard C library.
-** ^SQLite guarantees that the second argument to
-** xRealloc is always a value returned by a prior call to xRoundup.
-**
-** xSize should return the allocated size of a memory allocation
-** previously obtained from xMalloc or xRealloc.  The allocated size
-** is always at least as big as the requested size but may be larger.
-**
-** The xRoundup method returns what would be the allocated size of
-** a memory allocation given a particular requested size.  Most memory
-** allocators round up memory allocations at least to the next multiple
-** of 8.  Some allocators round up to a larger multiple or to a power of 2.
-** Every memory allocation request coming in through [sqlite3_malloc()]
-** or [sqlite3_realloc()] first calls xRoundup.  If xRoundup returns 0, 
-** that causes the corresponding memory allocation to fail.
-**
-** The xInit method initializes the memory allocator.  For example,
-** it might allocate any require mutexes or initialize internal data
-** structures.  The xShutdown method is invoked (indirectly) by
-** [sqlite3_shutdown()] and should deallocate any resources acquired
-** by xInit.  The pAppData pointer is used as the only parameter to
-** xInit and xShutdown.
-**
-** SQLite holds the [SQLITE_MUTEX_STATIC_MASTER] mutex when it invokes
-** the xInit method, so the xInit method need not be threadsafe.  The
-** xShutdown method is only called from [sqlite3_shutdown()] so it does
-** not need to be threadsafe either.  For all other methods, SQLite
-** holds the [SQLITE_MUTEX_STATIC_MEM] mutex as long as the
-** [SQLITE_CONFIG_MEMSTATUS] configuration option is turned on (which
-** it is by default) and so the methods are automatically serialized.
-** However, if [SQLITE_CONFIG_MEMSTATUS] is disabled, then the other
-** methods must be threadsafe or else make their own arrangements for
-** serialization.
-**
-** SQLite will never invoke xInit() more than once without an intervening
-** call to xShutdown().
-*/
-typedef struct sqlite3_mem_methods sqlite3_mem_methods;
-struct sqlite3_mem_methods {
-  void *(*xMalloc)(int);         /* Memory allocation function */
-  void (*xFree)(void*);          /* Free a prior allocation */
-  void *(*xRealloc)(void*,int);  /* Resize an allocation */
-  int (*xSize)(void*);           /* Return the size of an allocation */
-  int (*xRoundup)(int);          /* Round up request size to allocation size */
-  int (*xInit)(void*);           /* Initialize the memory allocator */
-  void (*xShutdown)(void*);      /* Deinitialize the memory allocator */
-  void *pAppData;                /* Argument to xInit() and xShutdown() */
-};
-
-/*
-** CAPI3REF: Configuration Options
-** KEYWORDS: {configuration option}
-**
-** These constants are the available integer configuration options that
-** can be passed as the first argument to the [sqlite3_config()] interface.
-**
-** New configuration options may be added in future releases of SQLite.
-** Existing configuration options might be discontinued.  Applications
-** should check the return code from [sqlite3_config()] to make sure that
-** the call worked.  The [sqlite3_config()] interface will return a
-** non-zero [error code] if a discontinued or unsupported configuration option
-** is invoked.
-**
-** <dl>
-** [[SQLITE_CONFIG_SINGLETHREAD]] <dt>SQLITE_CONFIG_SINGLETHREAD</dt>
-** <dd>There are no arguments to this option.  ^This option sets the
-** [threading mode] to Single-thread.  In other words, it disables
-** all mutexing and puts SQLite into a mode where it can only be used
-** by a single thread.   ^If SQLite is compiled with
-** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
-** it is not possible to change the [threading mode] from its default
-** value of Single-thread and so [sqlite3_config()] will return 
-** [SQLITE_ERROR] if called with the SQLITE_CONFIG_SINGLETHREAD
-** configuration option.</dd>
-**
-** [[SQLITE_CONFIG_MULTITHREAD]] <dt>SQLITE_CONFIG_MULTITHREAD</dt>
-** <dd>There are no arguments to this option.  ^This option sets the
-** [threading mode] to Multi-thread.  In other words, it disables
-** mutexing on [database connection] and [prepared statement] objects.
-** The application is responsible for serializing access to
-** [database connections] and [prepared statements].  But other mutexes
-** are enabled so that SQLite will be safe to use in a multi-threaded
-** environment as long as no two threads attempt to use the same
-** [database connection] at the same time.  ^If SQLite is compiled with
-** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
-** it is not possible to set the Multi-thread [threading mode] and
-** [sqlite3_config()] will return [SQLITE_ERROR] if called with the
-** SQLITE_CONFIG_MULTITHREAD configuration option.</dd>
-**
-** [[SQLITE_CONFIG_SERIALIZED]] <dt>SQLITE_CONFIG_SERIALIZED</dt>
-** <dd>There are no arguments to this option.  ^This option sets the
-** [threading mode] to Serialized. In other words, this option enables
-** all mutexes including the recursive
-** mutexes on [database connection] and [prepared statement] objects.
-** In this mode (which is the default when SQLite is compiled with
-** [SQLITE_THREADSAFE=1]) the SQLite library will itself serialize access
-** to [database connections] and [prepared statements] so that the
-** application is free to use the same [database connection] or the
-** same [prepared statement] in different threads at the same time.
-** ^If SQLite is compiled with
-** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
-** it is not possible to set the Serialized [threading mode] and
-** [sqlite3_config()] will return [SQLITE_ERROR] if called with the
-** SQLITE_CONFIG_SERIALIZED configuration option.</dd>
-**
-** [[SQLITE_CONFIG_MALLOC]] <dt>SQLITE_CONFIG_MALLOC</dt>
-** <dd> ^(The SQLITE_CONFIG_MALLOC option takes a single argument which is 
-** a pointer to an instance of the [sqlite3_mem_methods] structure.
-** The argument specifies
-** alternative low-level memory allocation routines to be used in place of
-** the memory allocation routines built into SQLite.)^ ^SQLite makes
-** its own private copy of the content of the [sqlite3_mem_methods] structure
-** before the [sqlite3_config()] call returns.</dd>
-**
-** [[SQLITE_CONFIG_GETMALLOC]] <dt>SQLITE_CONFIG_GETMALLOC</dt>
-** <dd> ^(The SQLITE_CONFIG_GETMALLOC option takes a single argument which
-** is a pointer to an instance of the [sqlite3_mem_methods] structure.
-** The [sqlite3_mem_methods]
-** structure is filled with the currently defined memory allocation routines.)^
-** This option can be used to overload the default memory allocation
-** routines with a wrapper that simulations memory allocation failure or
-** tracks memory usage, for example. </dd>
-**
-** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
-** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
-** interpreted as a boolean, which enables or disables the collection of
-** memory allocation statistics. ^(When memory allocation statistics are
-** disabled, the following SQLite interfaces become non-operational:
-**   <ul>
-**   <li> [sqlite3_memory_used()]
-**   <li> [sqlite3_memory_highwater()]
-**   <li> [sqlite3_soft_heap_limit64()]
-**   <li> [sqlite3_status64()]
-**   </ul>)^
-** ^Memory allocation statistics are enabled by default unless SQLite is
-** compiled with [SQLITE_DEFAULT_MEMSTATUS]=0 in which case memory
-** allocation statistics are disabled by default.
-** </dd>
-**
-** [[SQLITE_CONFIG_SCRATCH]] <dt>SQLITE_CONFIG_SCRATCH</dt>
-** <dd> ^The SQLITE_CONFIG_SCRATCH option specifies a static memory buffer
-** that SQLite can use for scratch memory.  ^(There are three arguments
-** to SQLITE_CONFIG_SCRATCH:  A pointer an 8-byte
-** aligned memory buffer from which the scratch allocations will be
-** drawn, the size of each scratch allocation (sz),
-** and the maximum number of scratch allocations (N).)^
-** The first argument must be a pointer to an 8-byte aligned buffer
-** of at least sz*N bytes of memory.
-** ^SQLite will not use more than one scratch buffers per thread.
-** ^SQLite will never request a scratch buffer that is more than 6
-** times the database page size.
-** ^If SQLite needs needs additional
-** scratch memory beyond what is provided by this configuration option, then 
-** [sqlite3_malloc()] will be used to obtain the memory needed.<p>
-** ^When the application provides any amount of scratch memory using
-** SQLITE_CONFIG_SCRATCH, SQLite avoids unnecessary large
-** [sqlite3_malloc|heap allocations].
-** This can help [Robson proof|prevent memory allocation failures] due to heap
-** fragmentation in low-memory embedded systems.
-** </dd>
-**
-** [[SQLITE_CONFIG_PAGECACHE]] <dt>SQLITE_CONFIG_PAGECACHE</dt>
-** <dd> ^The SQLITE_CONFIG_PAGECACHE option specifies a memory pool
-** that SQLite can use for the database page cache with the default page
-** cache implementation.  
-** This configuration option is a no-op if an application-define page
-** cache implementation is loaded using the [SQLITE_CONFIG_PCACHE2].
-** ^There are three arguments to SQLITE_CONFIG_PAGECACHE: A pointer to
-** 8-byte aligned memory (pMem), the size of each page cache line (sz),
-** and the number of cache lines (N).
-** The sz argument should be the size of the largest database page
-** (a power of two between 512 and 65536) plus some extra bytes for each
-** page header.  ^The number of extra bytes needed by the page header
-** can be determined using [SQLITE_CONFIG_PCACHE_HDRSZ].
-** ^It is harmless, apart from the wasted memory,
-** for the sz parameter to be larger than necessary.  The pMem
-** argument must be either a NULL pointer or a pointer to an 8-byte
-** aligned block of memory of at least sz*N bytes, otherwise
-** subsequent behavior is undefined.
-** ^When pMem is not NULL, SQLite will strive to use the memory provided
-** to satisfy page cache needs, falling back to [sqlite3_malloc()] if
-** a page cache line is larger than sz bytes or if all of the pMem buffer
-** is exhausted.
-** ^If pMem is NULL and N is non-zero, then each database connection
-** does an initial bulk allocation for page cache memory
-** from [sqlite3_malloc()] sufficient for N cache lines if N is positive or
-** of -1024*N bytes if N is negative, . ^If additional
-** page cache memory is needed beyond what is provided by the initial
-** allocation, then SQLite goes to [sqlite3_malloc()] separately for each
-** additional cache line. </dd>
-**
-** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
-** <dd> ^The SQLITE_CONFIG_HEAP option specifies a static memory buffer 
-** that SQLite will use for all of its dynamic memory allocation needs
-** beyond those provided for by [SQLITE_CONFIG_SCRATCH] and
-** [SQLITE_CONFIG_PAGECACHE].
-** ^The SQLITE_CONFIG_HEAP option is only available if SQLite is compiled
-** with either [SQLITE_ENABLE_MEMSYS3] or [SQLITE_ENABLE_MEMSYS5] and returns
-** [SQLITE_ERROR] if invoked otherwise.
-** ^There are three arguments to SQLITE_CONFIG_HEAP:
-** An 8-byte aligned pointer to the memory,
-** the number of bytes in the memory buffer, and the minimum allocation size.
-** ^If the first pointer (the memory pointer) is NULL, then SQLite reverts
-** to using its default memory allocator (the system malloc() implementation),
-** undoing any prior invocation of [SQLITE_CONFIG_MALLOC].  ^If the
-** memory pointer is not NULL then the alternative memory
-** allocator is engaged to handle all of SQLites memory allocation needs.
-** The first pointer (the memory pointer) must be aligned to an 8-byte
-** boundary or subsequent behavior of SQLite will be undefined.
-** The minimum allocation size is capped at 2**12. Reasonable values
-** for the minimum allocation size are 2**5 through 2**8.</dd>
-**
-** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt>
-** <dd> ^(The SQLITE_CONFIG_MUTEX option takes a single argument which is a
-** pointer to an instance of the [sqlite3_mutex_methods] structure.
-** The argument specifies alternative low-level mutex routines to be used
-** in place the mutex routines built into SQLite.)^  ^SQLite makes a copy of
-** the content of the [sqlite3_mutex_methods] structure before the call to
-** [sqlite3_config()] returns. ^If SQLite is compiled with
-** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
-** the entire mutexing subsystem is omitted from the build and hence calls to
-** [sqlite3_config()] with the SQLITE_CONFIG_MUTEX configuration option will
-** return [SQLITE_ERROR].</dd>
-**
-** [[SQLITE_CONFIG_GETMUTEX]] <dt>SQLITE_CONFIG_GETMUTEX</dt>
-** <dd> ^(The SQLITE_CONFIG_GETMUTEX option takes a single argument which
-** is a pointer to an instance of the [sqlite3_mutex_methods] structure.  The
-** [sqlite3_mutex_methods]
-** structure is filled with the currently defined mutex routines.)^
-** This option can be used to overload the default mutex allocation
-** routines with a wrapper used to track mutex usage for performance
-** profiling or testing, for example.   ^If SQLite is compiled with
-** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
-** the entire mutexing subsystem is omitted from the build and hence calls to
-** [sqlite3_config()] with the SQLITE_CONFIG_GETMUTEX configuration option will
-** return [SQLITE_ERROR].</dd>
-**
-** [[SQLITE_CONFIG_LOOKASIDE]] <dt>SQLITE_CONFIG_LOOKASIDE</dt>
-** <dd> ^(The SQLITE_CONFIG_LOOKASIDE option takes two arguments that determine
-** the default size of lookaside memory on each [database connection].
-** The first argument is the
-** size of each lookaside buffer slot and the second is the number of
-** slots allocated to each database connection.)^  ^(SQLITE_CONFIG_LOOKASIDE
-** sets the <i>default</i> lookaside size. The [SQLITE_DBCONFIG_LOOKASIDE]
-** option to [sqlite3_db_config()] can be used to change the lookaside
-** configuration on individual connections.)^ </dd>
-**
-** [[SQLITE_CONFIG_PCACHE2]] <dt>SQLITE_CONFIG_PCACHE2</dt>
-** <dd> ^(The SQLITE_CONFIG_PCACHE2 option takes a single argument which is 
-** a pointer to an [sqlite3_pcache_methods2] object.  This object specifies
-** the interface to a custom page cache implementation.)^
-** ^SQLite makes a copy of the [sqlite3_pcache_methods2] object.</dd>
-**
-** [[SQLITE_CONFIG_GETPCACHE2]] <dt>SQLITE_CONFIG_GETPCACHE2</dt>
-** <dd> ^(The SQLITE_CONFIG_GETPCACHE2 option takes a single argument which
-** is a pointer to an [sqlite3_pcache_methods2] object.  SQLite copies of
-** the current page cache implementation into that object.)^ </dd>
-**
-** [[SQLITE_CONFIG_LOG]] <dt>SQLITE_CONFIG_LOG</dt>
-** <dd> The SQLITE_CONFIG_LOG option is used to configure the SQLite
-** global [error log].
-** (^The SQLITE_CONFIG_LOG option takes two arguments: a pointer to a
-** function with a call signature of void(*)(void*,int,const char*), 
-** and a pointer to void. ^If the function pointer is not NULL, it is
-** invoked by [sqlite3_log()] to process each logging event.  ^If the
-** function pointer is NULL, the [sqlite3_log()] interface becomes a no-op.
-** ^The void pointer that is the second argument to SQLITE_CONFIG_LOG is
-** passed through as the first parameter to the application-defined logger
-** function whenever that function is invoked.  ^The second parameter to
-** the logger function is a copy of the first parameter to the corresponding
-** [sqlite3_log()] call and is intended to be a [result code] or an
-** [extended result code].  ^The third parameter passed to the logger is
-** log message after formatting via [sqlite3_snprintf()].
-** The SQLite logging interface is not reentrant; the logger function
-** supplied by the application must not invoke any SQLite interface.
-** In a multi-threaded application, the application-defined logger
-** function must be threadsafe. </dd>
-**
-** [[SQLITE_CONFIG_URI]] <dt>SQLITE_CONFIG_URI
-** <dd>^(The SQLITE_CONFIG_URI option takes a single argument of type int.
-** If non-zero, then URI handling is globally enabled. If the parameter is zero,
-** then URI handling is globally disabled.)^ ^If URI handling is globally
-** enabled, all filenames passed to [sqlite3_open()], [sqlite3_open_v2()],
-** [sqlite3_open16()] or
-** specified as part of [ATTACH] commands are interpreted as URIs, regardless
-** of whether or not the [SQLITE_OPEN_URI] flag is set when the database
-** connection is opened. ^If it is globally disabled, filenames are
-** only interpreted as URIs if the SQLITE_OPEN_URI flag is set when the
-** database connection is opened. ^(By default, URI handling is globally
-** disabled. The default value may be changed by compiling with the
-** [SQLITE_USE_URI] symbol defined.)^
-**
-** [[SQLITE_CONFIG_COVERING_INDEX_SCAN]] <dt>SQLITE_CONFIG_COVERING_INDEX_SCAN
-** <dd>^The SQLITE_CONFIG_COVERING_INDEX_SCAN option takes a single integer
-** argument which is interpreted as a boolean in order to enable or disable
-** the use of covering indices for full table scans in the query optimizer.
-** ^The default setting is determined
-** by the [SQLITE_ALLOW_COVERING_INDEX_SCAN] compile-time option, or is "on"
-** if that compile-time option is omitted.
-** The ability to disable the use of covering indices for full table scans
-** is because some incorrectly coded legacy applications might malfunction
-** when the optimization is enabled.  Providing the ability to
-** disable the optimization allows the older, buggy application code to work
-** without change even with newer versions of SQLite.
-**
-** [[SQLITE_CONFIG_PCACHE]] [[SQLITE_CONFIG_GETPCACHE]]
-** <dt>SQLITE_CONFIG_PCACHE and SQLITE_CONFIG_GETPCACHE
-** <dd> These options are obsolete and should not be used by new code.
-** They are retained for backwards compatibility but are now no-ops.
-** </dd>
-**
-** [[SQLITE_CONFIG_SQLLOG]]
-** <dt>SQLITE_CONFIG_SQLLOG
-** <dd>This option is only available if sqlite is compiled with the
-** [SQLITE_ENABLE_SQLLOG] pre-processor macro defined. The first argument should
-** be a pointer to a function of type void(*)(void*,sqlite3*,const char*, int).
-** The second should be of type (void*). The callback is invoked by the library
-** in three separate circumstances, identified by the value passed as the
-** fourth parameter. If the fourth parameter is 0, then the database connection
-** passed as the second argument has just been opened. The third argument
-** points to a buffer containing the name of the main database file. If the
-** fourth parameter is 1, then the SQL statement that the third parameter
-** points to has just been executed. Or, if the fourth parameter is 2, then
-** the connection being passed as the second parameter is being closed. The
-** third parameter is passed NULL In this case.  An example of using this
-** configuration option can be seen in the "test_sqllog.c" source file in
-** the canonical SQLite source tree.</dd>
-**
-** [[SQLITE_CONFIG_MMAP_SIZE]]
-** <dt>SQLITE_CONFIG_MMAP_SIZE
-** <dd>^SQLITE_CONFIG_MMAP_SIZE takes two 64-bit integer (sqlite3_int64) values
-** that are the default mmap size limit (the default setting for
-** [PRAGMA mmap_size]) and the maximum allowed mmap size limit.
-** ^The default setting can be overridden by each database connection using
-** either the [PRAGMA mmap_size] command, or by using the
-** [SQLITE_FCNTL_MMAP_SIZE] file control.  ^(The maximum allowed mmap size
-** will be silently truncated if necessary so that it does not exceed the
-** compile-time maximum mmap size set by the
-** [SQLITE_MAX_MMAP_SIZE] compile-time option.)^
-** ^If either argument to this option is negative, then that argument is
-** changed to its compile-time default.
-**
-** [[SQLITE_CONFIG_WIN32_HEAPSIZE]]
-** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
-** <dd>^The SQLITE_CONFIG_WIN32_HEAPSIZE option is only available if SQLite is
-** compiled for Windows with the [SQLITE_WIN32_MALLOC] pre-processor macro
-** defined. ^SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
-** that specifies the maximum size of the created heap.
-**
-** [[SQLITE_CONFIG_PCACHE_HDRSZ]]
-** <dt>SQLITE_CONFIG_PCACHE_HDRSZ
-** <dd>^The SQLITE_CONFIG_PCACHE_HDRSZ option takes a single parameter which
-** is a pointer to an integer and writes into that integer the number of extra
-** bytes per page required for each page in [SQLITE_CONFIG_PAGECACHE].
-** The amount of extra space required can change depending on the compiler,
-** target platform, and SQLite version.
-**
-** [[SQLITE_CONFIG_PMASZ]]
-** <dt>SQLITE_CONFIG_PMASZ
-** <dd>^The SQLITE_CONFIG_PMASZ option takes a single parameter which
-** is an unsigned integer and sets the "Minimum PMA Size" for the multithreaded
-** sorter to that integer.  The default minimum PMA Size is set by the
-** [SQLITE_SORTER_PMASZ] compile-time option.  New threads are launched
-** to help with sort operations when multithreaded sorting
-** is enabled (using the [PRAGMA threads] command) and the amount of content
-** to be sorted exceeds the page size times the minimum of the
-** [PRAGMA cache_size] setting and this value.
-** </dl>
-*/
-#define SQLITE_CONFIG_SINGLETHREAD  1  /* nil */
-#define SQLITE_CONFIG_MULTITHREAD   2  /* nil */
-#define SQLITE_CONFIG_SERIALIZED    3  /* nil */
-#define SQLITE_CONFIG_MALLOC        4  /* sqlite3_mem_methods* */
-#define SQLITE_CONFIG_GETMALLOC     5  /* sqlite3_mem_methods* */
-#define SQLITE_CONFIG_SCRATCH       6  /* void*, int sz, int N */
-#define SQLITE_CONFIG_PAGECACHE     7  /* void*, int sz, int N */
-#define SQLITE_CONFIG_HEAP          8  /* void*, int nByte, int min */
-#define SQLITE_CONFIG_MEMSTATUS     9  /* boolean */
-#define SQLITE_CONFIG_MUTEX        10  /* sqlite3_mutex_methods* */
-#define SQLITE_CONFIG_GETMUTEX     11  /* sqlite3_mutex_methods* */
-/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */ 
-#define SQLITE_CONFIG_LOOKASIDE    13  /* int int */
-#define SQLITE_CONFIG_PCACHE       14  /* no-op */
-#define SQLITE_CONFIG_GETPCACHE    15  /* no-op */
-#define SQLITE_CONFIG_LOG          16  /* xFunc, void* */
-#define SQLITE_CONFIG_URI          17  /* int */
-#define SQLITE_CONFIG_PCACHE2      18  /* sqlite3_pcache_methods2* */
-#define SQLITE_CONFIG_GETPCACHE2   19  /* sqlite3_pcache_methods2* */
-#define SQLITE_CONFIG_COVERING_INDEX_SCAN 20  /* int */
-#define SQLITE_CONFIG_SQLLOG       21  /* xSqllog, void* */
-#define SQLITE_CONFIG_MMAP_SIZE    22  /* sqlite3_int64, sqlite3_int64 */
-#define SQLITE_CONFIG_WIN32_HEAPSIZE      23  /* int nByte */
-#define SQLITE_CONFIG_PCACHE_HDRSZ        24  /* int *psz */
-#define SQLITE_CONFIG_PMASZ               25  /* unsigned int szPma */
-
-/*
-** CAPI3REF: Database Connection Configuration Options
-**
-** These constants are the available integer configuration options that
-** can be passed as the second argument to the [sqlite3_db_config()] interface.
-**
-** New configuration options may be added in future releases of SQLite.
-** Existing configuration options might be discontinued.  Applications
-** should check the return code from [sqlite3_db_config()] to make sure that
-** the call worked.  ^The [sqlite3_db_config()] interface will return a
-** non-zero [error code] if a discontinued or unsupported configuration option
-** is invoked.
-**
-** <dl>
-** <dt>SQLITE_DBCONFIG_LOOKASIDE</dt>
-** <dd> ^This option takes three additional arguments that determine the 
-** [lookaside memory allocator] configuration for the [database connection].
-** ^The first argument (the third parameter to [sqlite3_db_config()] is a
-** pointer to a memory buffer to use for lookaside memory.
-** ^The first argument after the SQLITE_DBCONFIG_LOOKASIDE verb
-** may be NULL in which case SQLite will allocate the
-** lookaside buffer itself using [sqlite3_malloc()]. ^The second argument is the
-** size of each lookaside buffer slot.  ^The third argument is the number of
-** slots.  The size of the buffer in the first argument must be greater than
-** or equal to the product of the second and third arguments.  The buffer
-** must be aligned to an 8-byte boundary.  ^If the second argument to
-** SQLITE_DBCONFIG_LOOKASIDE is not a multiple of 8, it is internally
-** rounded down to the next smaller multiple of 8.  ^(The lookaside memory
-** configuration for a database connection can only be changed when that
-** connection is not currently using lookaside memory, or in other words
-** when the "current value" returned by
-** [sqlite3_db_status](D,[SQLITE_CONFIG_LOOKASIDE],...) is zero.
-** Any attempt to change the lookaside memory configuration when lookaside
-** memory is in use leaves the configuration unchanged and returns 
-** [SQLITE_BUSY].)^</dd>
-**
-** <dt>SQLITE_DBCONFIG_ENABLE_FKEY</dt>
-** <dd> ^This option is used to enable or disable the enforcement of
-** [foreign key constraints].  There should be two additional arguments.
-** The first argument is an integer which is 0 to disable FK enforcement,
-** positive to enable FK enforcement or negative to leave FK enforcement
-** unchanged.  The second parameter is a pointer to an integer into which
-** is written 0 or 1 to indicate whether FK enforcement is off or on
-** following this call.  The second parameter may be a NULL pointer, in
-** which case the FK enforcement setting is not reported back. </dd>
-**
-** <dt>SQLITE_DBCONFIG_ENABLE_TRIGGER</dt>
-** <dd> ^This option is used to enable or disable [CREATE TRIGGER | triggers].
-** There should be two additional arguments.
-** The first argument is an integer which is 0 to disable triggers,
-** positive to enable triggers or negative to leave the setting unchanged.
-** The second parameter is a pointer to an integer into which
-** is written 0 or 1 to indicate whether triggers are disabled or enabled
-** following this call.  The second parameter may be a NULL pointer, in
-** which case the trigger setting is not reported back. </dd>
-**
-** </dl>
-*/
-#define SQLITE_DBCONFIG_LOOKASIDE       1001  /* void* int int */
-#define SQLITE_DBCONFIG_ENABLE_FKEY     1002  /* int int* */
-#define SQLITE_DBCONFIG_ENABLE_TRIGGER  1003  /* int int* */
-
-
-/*
-** CAPI3REF: Enable Or Disable Extended Result Codes
-** METHOD: sqlite3
-**
-** ^The sqlite3_extended_result_codes() routine enables or disables the
-** [extended result codes] feature of SQLite. ^The extended result
-** codes are disabled by default for historical compatibility.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_extended_result_codes(sqlite3*, int onoff);
-
-/*
-** CAPI3REF: Last Insert Rowid
-** METHOD: sqlite3
-**
-** ^Each entry in most SQLite tables (except for [WITHOUT ROWID] tables)
-** has a unique 64-bit signed
-** integer key called the [ROWID | "rowid"]. ^The rowid is always available
-** as an undeclared column named ROWID, OID, or _ROWID_ as long as those
-** names are not also used by explicitly declared columns. ^If
-** the table has a column of type [INTEGER PRIMARY KEY] then that column
-** is another alias for the rowid.
-**
-** ^The sqlite3_last_insert_rowid(D) interface returns the [rowid] of the 
-** most recent successful [INSERT] into a rowid table or [virtual table]
-** on database connection D.
-** ^Inserts into [WITHOUT ROWID] tables are not recorded.
-** ^If no successful [INSERT]s into rowid tables
-** have ever occurred on the database connection D, 
-** then sqlite3_last_insert_rowid(D) returns zero.
-**
-** ^(If an [INSERT] occurs within a trigger or within a [virtual table]
-** method, then this routine will return the [rowid] of the inserted
-** row as long as the trigger or virtual table method is running.
-** But once the trigger or virtual table method ends, the value returned 
-** by this routine reverts to what it was before the trigger or virtual
-** table method began.)^
-**
-** ^An [INSERT] that fails due to a constraint violation is not a
-** successful [INSERT] and does not change the value returned by this
-** routine.  ^Thus INSERT OR FAIL, INSERT OR IGNORE, INSERT OR ROLLBACK,
-** and INSERT OR ABORT make no changes to the return value of this
-** routine when their insertion fails.  ^(When INSERT OR REPLACE
-** encounters a constraint violation, it does not fail.  The
-** INSERT continues to completion after deleting rows that caused
-** the constraint problem so INSERT OR REPLACE will always change
-** the return value of this interface.)^
-**
-** ^For the purposes of this routine, an [INSERT] is considered to
-** be successful even if it is subsequently rolled back.
-**
-** This function is accessible to SQL statements via the
-** [last_insert_rowid() SQL function].
-**
-** If a separate thread performs a new [INSERT] on the same
-** database connection while the [sqlite3_last_insert_rowid()]
-** function is running and thus changes the last insert [rowid],
-** then the value returned by [sqlite3_last_insert_rowid()] is
-** unpredictable and might not equal either the old or the new
-** last insert [rowid].
-*/
-SQLITE_API sqlite3_int64 SQLITE_STDCALL sqlite3_last_insert_rowid(sqlite3*);
-
-/*
-** CAPI3REF: Count The Number Of Rows Modified
-** METHOD: sqlite3
-**
-** ^This function returns the number of rows modified, inserted or
-** deleted by the most recently completed INSERT, UPDATE or DELETE
-** statement on the database connection specified by the only parameter.
-** ^Executing any other type of SQL statement does not modify the value
-** returned by this function.
-**
-** ^Only changes made directly by the INSERT, UPDATE or DELETE statement are
-** considered - auxiliary changes caused by [CREATE TRIGGER | triggers], 
-** [foreign key actions] or [REPLACE] constraint resolution are not counted.
-** 
-** Changes to a view that are intercepted by 
-** [INSTEAD OF trigger | INSTEAD OF triggers] are not counted. ^The value 
-** returned by sqlite3_changes() immediately after an INSERT, UPDATE or 
-** DELETE statement run on a view is always zero. Only changes made to real 
-** tables are counted.
-**
-** Things are more complicated if the sqlite3_changes() function is
-** executed while a trigger program is running. This may happen if the
-** program uses the [changes() SQL function], or if some other callback
-** function invokes sqlite3_changes() directly. Essentially:
-** 
-** <ul>
-**   <li> ^(Before entering a trigger program the value returned by
-**        sqlite3_changes() function is saved. After the trigger program 
-**        has finished, the original value is restored.)^
-** 
-**   <li> ^(Within a trigger program each INSERT, UPDATE and DELETE 
-**        statement sets the value returned by sqlite3_changes() 
-**        upon completion as normal. Of course, this value will not include 
-**        any changes performed by sub-triggers, as the sqlite3_changes() 
-**        value will be saved and restored after each sub-trigger has run.)^
-** </ul>
-** 
-** ^This means that if the changes() SQL function (or similar) is used
-** by the first INSERT, UPDATE or DELETE statement within a trigger, it 
-** returns the value as set when the calling statement began executing.
-** ^If it is used by the second or subsequent such statement within a trigger 
-** program, the value returned reflects the number of rows modified by the 
-** previous INSERT, UPDATE or DELETE statement within the same trigger.
-**
-** See also the [sqlite3_total_changes()] interface, the
-** [count_changes pragma], and the [changes() SQL function].
-**
-** If a separate thread makes changes on the same database connection
-** while [sqlite3_changes()] is running then the value returned
-** is unpredictable and not meaningful.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_changes(sqlite3*);
-
-/*
-** CAPI3REF: Total Number Of Rows Modified
-** METHOD: sqlite3
-**
-** ^This function returns the total number of rows inserted, modified or
-** deleted by all [INSERT], [UPDATE] or [DELETE] statements completed
-** since the database connection was opened, including those executed as
-** part of trigger programs. ^Executing any other type of SQL statement
-** does not affect the value returned by sqlite3_total_changes().
-** 
-** ^Changes made as part of [foreign key actions] are included in the
-** count, but those made as part of REPLACE constraint resolution are
-** not. ^Changes to a view that are intercepted by INSTEAD OF triggers 
-** are not counted.
-** 
-** See also the [sqlite3_changes()] interface, the
-** [count_changes pragma], and the [total_changes() SQL function].
-**
-** If a separate thread makes changes on the same database connection
-** while [sqlite3_total_changes()] is running then the value
-** returned is unpredictable and not meaningful.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_total_changes(sqlite3*);
-
-/*
-** CAPI3REF: Interrupt A Long-Running Query
-** METHOD: sqlite3
-**
-** ^This function causes any pending database operation to abort and
-** return at its earliest opportunity. This routine is typically
-** called in response to a user action such as pressing "Cancel"
-** or Ctrl-C where the user wants a long query operation to halt
-** immediately.
-**
-** ^It is safe to call this routine from a thread different from the
-** thread that is currently running the database operation.  But it
-** is not safe to call this routine with a [database connection] that
-** is closed or might close before sqlite3_interrupt() returns.
-**
-** ^If an SQL operation is very nearly finished at the time when
-** sqlite3_interrupt() is called, then it might not have an opportunity
-** to be interrupted and might continue to completion.
-**
-** ^An SQL operation that is interrupted will return [SQLITE_INTERRUPT].
-** ^If the interrupted SQL operation is an INSERT, UPDATE, or DELETE
-** that is inside an explicit transaction, then the entire transaction
-** will be rolled back automatically.
-**
-** ^The sqlite3_interrupt(D) call is in effect until all currently running
-** SQL statements on [database connection] D complete.  ^Any new SQL statements
-** that are started after the sqlite3_interrupt() call and before the 
-** running statements reaches zero are interrupted as if they had been
-** running prior to the sqlite3_interrupt() call.  ^New SQL statements
-** that are started after the running statement count reaches zero are
-** not effected by the sqlite3_interrupt().
-** ^A call to sqlite3_interrupt(D) that occurs when there are no running
-** SQL statements is a no-op and has no effect on SQL statements
-** that are started after the sqlite3_interrupt() call returns.
-**
-** If the database connection closes while [sqlite3_interrupt()]
-** is running then bad things will likely happen.
-*/
-SQLITE_API void SQLITE_STDCALL sqlite3_interrupt(sqlite3*);
-
-/*
-** CAPI3REF: Determine If An SQL Statement Is Complete
-**
-** These routines are useful during command-line input to determine if the
-** currently entered text seems to form a complete SQL statement or
-** if additional input is needed before sending the text into
-** SQLite for parsing.  ^These routines return 1 if the input string
-** appears to be a complete SQL statement.  ^A statement is judged to be
-** complete if it ends with a semicolon token and is not a prefix of a
-** well-formed CREATE TRIGGER statement.  ^Semicolons that are embedded within
-** string literals or quoted identifier names or comments are not
-** independent tokens (they are part of the token in which they are
-** embedded) and thus do not count as a statement terminator.  ^Whitespace
-** and comments that follow the final semicolon are ignored.
-**
-** ^These routines return 0 if the statement is incomplete.  ^If a
-** memory allocation fails, then SQLITE_NOMEM is returned.
-**
-** ^These routines do not parse the SQL statements thus
-** will not detect syntactically incorrect SQL.
-**
-** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior 
-** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
-** automatically by sqlite3_complete16().  If that initialization fails,
-** then the return value from sqlite3_complete16() will be non-zero
-** regardless of whether or not the input SQL is complete.)^
-**
-** The input to [sqlite3_complete()] must be a zero-terminated
-** UTF-8 string.
-**
-** The input to [sqlite3_complete16()] must be a zero-terminated
-** UTF-16 string in native byte order.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_complete(const char *sql);
-SQLITE_API int SQLITE_STDCALL sqlite3_complete16(const void *sql);
-
-/*
-** CAPI3REF: Register A Callback To Handle SQLITE_BUSY Errors
-** KEYWORDS: {busy-handler callback} {busy handler}
-** METHOD: sqlite3
-**
-** ^The sqlite3_busy_handler(D,X,P) routine sets a callback function X
-** that might be invoked with argument P whenever
-** an attempt is made to access a database table associated with
-** [database connection] D when another thread
-** or process has the table locked.
-** The sqlite3_busy_handler() interface is used to implement
-** [sqlite3_busy_timeout()] and [PRAGMA busy_timeout].
-**
-** ^If the busy callback is NULL, then [SQLITE_BUSY]
-** is returned immediately upon encountering the lock.  ^If the busy callback
-** is not NULL, then the callback might be invoked with two arguments.
-**
-** ^The first argument to the busy handler is a copy of the void* pointer which
-** is the third argument to sqlite3_busy_handler().  ^The second argument to
-** the busy handler callback is the number of times that the busy handler has
-** been invoked previously for the same locking event.  ^If the
-** busy callback returns 0, then no additional attempts are made to
-** access the database and [SQLITE_BUSY] is returned
-** to the application.
-** ^If the callback returns non-zero, then another attempt
-** is made to access the database and the cycle repeats.
-**
-** The presence of a busy handler does not guarantee that it will be invoked
-** when there is lock contention. ^If SQLite determines that invoking the busy
-** handler could result in a deadlock, it will go ahead and return [SQLITE_BUSY]
-** to the application instead of invoking the 
-** busy handler.
-** Consider a scenario where one process is holding a read lock that
-** it is trying to promote to a reserved lock and
-** a second process is holding a reserved lock that it is trying
-** to promote to an exclusive lock.  The first process cannot proceed
-** because it is blocked by the second and the second process cannot
-** proceed because it is blocked by the first.  If both processes
-** invoke the busy handlers, neither will make any progress.  Therefore,
-** SQLite returns [SQLITE_BUSY] for the first process, hoping that this
-** will induce the first process to release its read lock and allow
-** the second process to proceed.
-**
-** ^The default busy callback is NULL.
-**
-** ^(There can only be a single busy handler defined for each
-** [database connection].  Setting a new busy handler clears any
-** previously set handler.)^  ^Note that calling [sqlite3_busy_timeout()]
-** or evaluating [PRAGMA busy_timeout=N] will change the
-** busy handler and thus clear any previously set busy handler.
-**
-** The busy callback should not take any actions which modify the
-** database connection that invoked the busy handler.  In other words,
-** the busy handler is not reentrant.  Any such actions
-** result in undefined behavior.
-** 
-** A busy handler must not close the database connection
-** or [prepared statement] that invoked the busy handler.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_busy_handler(sqlite3*, int(*)(void*,int), void*);
-
-/*
-** CAPI3REF: Set A Busy Timeout
-** METHOD: sqlite3
-**
-** ^This routine sets a [sqlite3_busy_handler | busy handler] that sleeps
-** for a specified amount of time when a table is locked.  ^The handler
-** will sleep multiple times until at least "ms" milliseconds of sleeping
-** have accumulated.  ^After at least "ms" milliseconds of sleeping,
-** the handler returns 0 which causes [sqlite3_step()] to return
-** [SQLITE_BUSY].
-**
-** ^Calling this routine with an argument less than or equal to zero
-** turns off all busy handlers.
-**
-** ^(There can only be a single busy handler for a particular
-** [database connection] at any given moment.  If another busy handler
-** was defined  (using [sqlite3_busy_handler()]) prior to calling
-** this routine, that other busy handler is cleared.)^
-**
-** See also:  [PRAGMA busy_timeout]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_busy_timeout(sqlite3*, int ms);
-
-/*
-** CAPI3REF: Convenience Routines For Running Queries
-** METHOD: sqlite3
-**
-** This is a legacy interface that is preserved for backwards compatibility.
-** Use of this interface is not recommended.
-**
-** Definition: A <b>result table</b> is memory data structure created by the
-** [sqlite3_get_table()] interface.  A result table records the
-** complete query results from one or more queries.
-**
-** The table conceptually has a number of rows and columns.  But
-** these numbers are not part of the result table itself.  These
-** numbers are obtained separately.  Let N be the number of rows
-** and M be the number of columns.
-**
-** A result table is an array of pointers to zero-terminated UTF-8 strings.
-** There are (N+1)*M elements in the array.  The first M pointers point
-** to zero-terminated strings that  contain the names of the columns.
-** The remaining entries all point to query results.  NULL values result
-** in NULL pointers.  All other values are in their UTF-8 zero-terminated
-** string representation as returned by [sqlite3_column_text()].
-**
-** A result table might consist of one or more memory allocations.
-** It is not safe to pass a result table directly to [sqlite3_free()].
-** A result table should be deallocated using [sqlite3_free_table()].
-**
-** ^(As an example of the result table format, suppose a query result
-** is as follows:
-**
-** <blockquote><pre>
-**        Name        | Age
-**        -----------------------
-**        Alice       | 43
-**        Bob         | 28
-**        Cindy       | 21
-** </pre></blockquote>
-**
-** There are two column (M==2) and three rows (N==3).  Thus the
-** result table has 8 entries.  Suppose the result table is stored
-** in an array names azResult.  Then azResult holds this content:
-**
-** <blockquote><pre>
-**        azResult&#91;0] = "Name";
-**        azResult&#91;1] = "Age";
-**        azResult&#91;2] = "Alice";
-**        azResult&#91;3] = "43";
-**        azResult&#91;4] = "Bob";
-**        azResult&#91;5] = "28";
-**        azResult&#91;6] = "Cindy";
-**        azResult&#91;7] = "21";
-** </pre></blockquote>)^
-**
-** ^The sqlite3_get_table() function evaluates one or more
-** semicolon-separated SQL statements in the zero-terminated UTF-8
-** string of its 2nd parameter and returns a result table to the
-** pointer given in its 3rd parameter.
-**
-** After the application has finished with the result from sqlite3_get_table(),
-** it must pass the result table pointer to sqlite3_free_table() in order to
-** release the memory that was malloced.  Because of the way the
-** [sqlite3_malloc()] happens within sqlite3_get_table(), the calling
-** function must not try to call [sqlite3_free()] directly.  Only
-** [sqlite3_free_table()] is able to release the memory properly and safely.
-**
-** The sqlite3_get_table() interface is implemented as a wrapper around
-** [sqlite3_exec()].  The sqlite3_get_table() routine does not have access
-** to any internal data structures of SQLite.  It uses only the public
-** interface defined here.  As a consequence, errors that occur in the
-** wrapper layer outside of the internal [sqlite3_exec()] call are not
-** reflected in subsequent calls to [sqlite3_errcode()] or
-** [sqlite3_errmsg()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_get_table(
-  sqlite3 *db,          /* An open database */
-  const char *zSql,     /* SQL to be evaluated */
-  char ***pazResult,    /* Results of the query */
-  int *pnRow,           /* Number of result rows written here */
-  int *pnColumn,        /* Number of result columns written here */
-  char **pzErrmsg       /* Error msg written here */
-);
-SQLITE_API void SQLITE_STDCALL sqlite3_free_table(char **result);
-
-/*
-** CAPI3REF: Formatted String Printing Functions
-**
-** These routines are work-alikes of the "printf()" family of functions
-** from the standard C library.
-** These routines understand most of the common K&R formatting options,
-** plus some additional non-standard formats, detailed below.
-** Note that some of the more obscure formatting options from recent
-** C-library standards are omitted from this implementation.
-**
-** ^The sqlite3_mprintf() and sqlite3_vmprintf() routines write their
-** results into memory obtained from [sqlite3_malloc()].
-** The strings returned by these two routines should be
-** released by [sqlite3_free()].  ^Both routines return a
-** NULL pointer if [sqlite3_malloc()] is unable to allocate enough
-** memory to hold the resulting string.
-**
-** ^(The sqlite3_snprintf() routine is similar to "snprintf()" from
-** the standard C library.  The result is written into the
-** buffer supplied as the second parameter whose size is given by
-** the first parameter. Note that the order of the
-** first two parameters is reversed from snprintf().)^  This is an
-** historical accident that cannot be fixed without breaking
-** backwards compatibility.  ^(Note also that sqlite3_snprintf()
-** returns a pointer to its buffer instead of the number of
-** characters actually written into the buffer.)^  We admit that
-** the number of characters written would be a more useful return
-** value but we cannot change the implementation of sqlite3_snprintf()
-** now without breaking compatibility.
-**
-** ^As long as the buffer size is greater than zero, sqlite3_snprintf()
-** guarantees that the buffer is always zero-terminated.  ^The first
-** parameter "n" is the total size of the buffer, including space for
-** the zero terminator.  So the longest string that can be completely
-** written will be n-1 characters.
-**
-** ^The sqlite3_vsnprintf() routine is a varargs version of sqlite3_snprintf().
-**
-** These routines all implement some additional formatting
-** options that are useful for constructing SQL statements.
-** All of the usual printf() formatting options apply.  In addition, there
-** is are "%q", "%Q", "%w" and "%z" options.
-**
-** ^(The %q option works like %s in that it substitutes a nul-terminated
-** string from the argument list.  But %q also doubles every '\'' character.
-** %q is designed for use inside a string literal.)^  By doubling each '\''
-** character it escapes that character and allows it to be inserted into
-** the string.
-**
-** For example, assume the string variable zText contains text as follows:
-**
-** <blockquote><pre>
-**  char *zText = "It's a happy day!";
-** </pre></blockquote>
-**
-** One can use this text in an SQL statement as follows:
-**
-** <blockquote><pre>
-**  char *zSQL = sqlite3_mprintf("INSERT INTO table VALUES('%q')", zText);
-**  sqlite3_exec(db, zSQL, 0, 0, 0);
-**  sqlite3_free(zSQL);
-** </pre></blockquote>
-**
-** Because the %q format string is used, the '\'' character in zText
-** is escaped and the SQL generated is as follows:
-**
-** <blockquote><pre>
-**  INSERT INTO table1 VALUES('It''s a happy day!')
-** </pre></blockquote>
-**
-** This is correct.  Had we used %s instead of %q, the generated SQL
-** would have looked like this:
-**
-** <blockquote><pre>
-**  INSERT INTO table1 VALUES('It's a happy day!');
-** </pre></blockquote>
-**
-** This second example is an SQL syntax error.  As a general rule you should
-** always use %q instead of %s when inserting text into a string literal.
-**
-** ^(The %Q option works like %q except it also adds single quotes around
-** the outside of the total string.  Additionally, if the parameter in the
-** argument list is a NULL pointer, %Q substitutes the text "NULL" (without
-** single quotes).)^  So, for example, one could say:
-**
-** <blockquote><pre>
-**  char *zSQL = sqlite3_mprintf("INSERT INTO table VALUES(%Q)", zText);
-**  sqlite3_exec(db, zSQL, 0, 0, 0);
-**  sqlite3_free(zSQL);
-** </pre></blockquote>
-**
-** The code above will render a correct SQL statement in the zSQL
-** variable even if the zText variable is a NULL pointer.
-**
-** ^(The "%w" formatting option is like "%q" except that it expects to
-** be contained within double-quotes instead of single quotes, and it
-** escapes the double-quote character instead of the single-quote
-** character.)^  The "%w" formatting option is intended for safely inserting
-** table and column names into a constructed SQL statement.
-**
-** ^(The "%z" formatting option works like "%s" but with the
-** addition that after the string has been read and copied into
-** the result, [sqlite3_free()] is called on the input string.)^
-*/
-SQLITE_API char *SQLITE_CDECL sqlite3_mprintf(const char*,...);
-SQLITE_API char *SQLITE_STDCALL sqlite3_vmprintf(const char*, va_list);
-SQLITE_API char *SQLITE_CDECL sqlite3_snprintf(int,char*,const char*, ...);
-SQLITE_API char *SQLITE_STDCALL sqlite3_vsnprintf(int,char*,const char*, va_list);
-
-/*
-** CAPI3REF: Memory Allocation Subsystem
-**
-** The SQLite core uses these three routines for all of its own
-** internal memory allocation needs. "Core" in the previous sentence
-** does not include operating-system specific VFS implementation.  The
-** Windows VFS uses native malloc() and free() for some operations.
-**
-** ^The sqlite3_malloc() routine returns a pointer to a block
-** of memory at least N bytes in length, where N is the parameter.
-** ^If sqlite3_malloc() is unable to obtain sufficient free
-** memory, it returns a NULL pointer.  ^If the parameter N to
-** sqlite3_malloc() is zero or negative then sqlite3_malloc() returns
-** a NULL pointer.
-**
-** ^The sqlite3_malloc64(N) routine works just like
-** sqlite3_malloc(N) except that N is an unsigned 64-bit integer instead
-** of a signed 32-bit integer.
-**
-** ^Calling sqlite3_free() with a pointer previously returned
-** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
-** that it might be reused.  ^The sqlite3_free() routine is
-** a no-op if is called with a NULL pointer.  Passing a NULL pointer
-** to sqlite3_free() is harmless.  After being freed, memory
-** should neither be read nor written.  Even reading previously freed
-** memory might result in a segmentation fault or other severe error.
-** Memory corruption, a segmentation fault, or other severe error
-** might result if sqlite3_free() is called with a non-NULL pointer that
-** was not obtained from sqlite3_malloc() or sqlite3_realloc().
-**
-** ^The sqlite3_realloc(X,N) interface attempts to resize a
-** prior memory allocation X to be at least N bytes.
-** ^If the X parameter to sqlite3_realloc(X,N)
-** is a NULL pointer then its behavior is identical to calling
-** sqlite3_malloc(N).
-** ^If the N parameter to sqlite3_realloc(X,N) is zero or
-** negative then the behavior is exactly the same as calling
-** sqlite3_free(X).
-** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
-** of at least N bytes in size or NULL if insufficient memory is available.
-** ^If M is the size of the prior allocation, then min(N,M) bytes
-** of the prior allocation are copied into the beginning of buffer returned
-** by sqlite3_realloc(X,N) and the prior allocation is freed.
-** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
-** prior allocation is not freed.
-**
-** ^The sqlite3_realloc64(X,N) interfaces works the same as
-** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
-** of a 32-bit signed integer.
-**
-** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
-** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
-** sqlite3_msize(X) returns the size of that memory allocation in bytes.
-** ^The value returned by sqlite3_msize(X) might be larger than the number
-** of bytes requested when X was allocated.  ^If X is a NULL pointer then
-** sqlite3_msize(X) returns zero.  If X points to something that is not
-** the beginning of memory allocation, or if it points to a formerly
-** valid memory allocation that has now been freed, then the behavior
-** of sqlite3_msize(X) is undefined and possibly harmful.
-**
-** ^The memory returned by sqlite3_malloc(), sqlite3_realloc(),
-** sqlite3_malloc64(), and sqlite3_realloc64()
-** is always aligned to at least an 8 byte boundary, or to a
-** 4 byte boundary if the [SQLITE_4_BYTE_ALIGNED_MALLOC] compile-time
-** option is used.
-**
-** In SQLite version 3.5.0 and 3.5.1, it was possible to define
-** the SQLITE_OMIT_MEMORY_ALLOCATION which would cause the built-in
-** implementation of these routines to be omitted.  That capability
-** is no longer provided.  Only built-in memory allocators can be used.
-**
-** Prior to SQLite version 3.7.10, the Windows OS interface layer called
-** the system malloc() and free() directly when converting
-** filenames between the UTF-8 encoding used by SQLite
-** and whatever filename encoding is used by the particular Windows
-** installation.  Memory allocation errors were detected, but
-** they were reported back as [SQLITE_CANTOPEN] or
-** [SQLITE_IOERR] rather than [SQLITE_NOMEM].
-**
-** The pointer arguments to [sqlite3_free()] and [sqlite3_realloc()]
-** must be either NULL or else pointers obtained from a prior
-** invocation of [sqlite3_malloc()] or [sqlite3_realloc()] that have
-** not yet been released.
-**
-** The application must not read or write any part of
-** a block of memory after it has been released using
-** [sqlite3_free()] or [sqlite3_realloc()].
-*/
-SQLITE_API void *SQLITE_STDCALL sqlite3_malloc(int);
-SQLITE_API void *SQLITE_STDCALL sqlite3_malloc64(sqlite3_uint64);
-SQLITE_API void *SQLITE_STDCALL sqlite3_realloc(void*, int);
-SQLITE_API void *SQLITE_STDCALL sqlite3_realloc64(void*, sqlite3_uint64);
-SQLITE_API void SQLITE_STDCALL sqlite3_free(void*);
-SQLITE_API sqlite3_uint64 SQLITE_STDCALL sqlite3_msize(void*);
-
-/*
-** CAPI3REF: Memory Allocator Statistics
-**
-** SQLite provides these two interfaces for reporting on the status
-** of the [sqlite3_malloc()], [sqlite3_free()], and [sqlite3_realloc()]
-** routines, which form the built-in memory allocation subsystem.
-**
-** ^The [sqlite3_memory_used()] routine returns the number of bytes
-** of memory currently outstanding (malloced but not freed).
-** ^The [sqlite3_memory_highwater()] routine returns the maximum
-** value of [sqlite3_memory_used()] since the high-water mark
-** was last reset.  ^The values returned by [sqlite3_memory_used()] and
-** [sqlite3_memory_highwater()] include any overhead
-** added by SQLite in its implementation of [sqlite3_malloc()],
-** but not overhead added by the any underlying system library
-** routines that [sqlite3_malloc()] may call.
-**
-** ^The memory high-water mark is reset to the current value of
-** [sqlite3_memory_used()] if and only if the parameter to
-** [sqlite3_memory_highwater()] is true.  ^The value returned
-** by [sqlite3_memory_highwater(1)] is the high-water mark
-** prior to the reset.
-*/
-SQLITE_API sqlite3_int64 SQLITE_STDCALL sqlite3_memory_used(void);
-SQLITE_API sqlite3_int64 SQLITE_STDCALL sqlite3_memory_highwater(int resetFlag);
-
-/*
-** CAPI3REF: Pseudo-Random Number Generator
-**
-** SQLite contains a high-quality pseudo-random number generator (PRNG) used to
-** select random [ROWID | ROWIDs] when inserting new records into a table that
-** already uses the largest possible [ROWID].  The PRNG is also used for
-** the build-in random() and randomblob() SQL functions.  This interface allows
-** applications to access the same PRNG for other purposes.
-**
-** ^A call to this routine stores N bytes of randomness into buffer P.
-** ^The P parameter can be a NULL pointer.
-**
-** ^If this routine has not been previously called or if the previous
-** call had N less than one or a NULL pointer for P, then the PRNG is
-** seeded using randomness obtained from the xRandomness method of
-** the default [sqlite3_vfs] object.
-** ^If the previous call to this routine had an N of 1 or more and a
-** non-NULL P then the pseudo-randomness is generated
-** internally and without recourse to the [sqlite3_vfs] xRandomness
-** method.
-*/
-SQLITE_API void SQLITE_STDCALL sqlite3_randomness(int N, void *P);
-
-/*
-** CAPI3REF: Compile-Time Authorization Callbacks
-** METHOD: sqlite3
-**
-** ^This routine registers an authorizer callback with a particular
-** [database connection], supplied in the first argument.
-** ^The authorizer callback is invoked as SQL statements are being compiled
-** by [sqlite3_prepare()] or its variants [sqlite3_prepare_v2()],
-** [sqlite3_prepare16()] and [sqlite3_prepare16_v2()].  ^At various
-** points during the compilation process, as logic is being created
-** to perform various actions, the authorizer callback is invoked to
-** see if those actions are allowed.  ^The authorizer callback should
-** return [SQLITE_OK] to allow the action, [SQLITE_IGNORE] to disallow the
-** specific action but allow the SQL statement to continue to be
-** compiled, or [SQLITE_DENY] to cause the entire SQL statement to be
-** rejected with an error.  ^If the authorizer callback returns
-** any value other than [SQLITE_IGNORE], [SQLITE_OK], or [SQLITE_DENY]
-** then the [sqlite3_prepare_v2()] or equivalent call that triggered
-** the authorizer will fail with an error message.
-**
-** When the callback returns [SQLITE_OK], that means the operation
-** requested is ok.  ^When the callback returns [SQLITE_DENY], the
-** [sqlite3_prepare_v2()] or equivalent call that triggered the
-** authorizer will fail with an error message explaining that
-** access is denied. 
-**
-** ^The first parameter to the authorizer callback is a copy of the third
-** parameter to the sqlite3_set_authorizer() interface. ^The second parameter
-** to the callback is an integer [SQLITE_COPY | action code] that specifies
-** the particular action to be authorized. ^The third through sixth parameters
-** to the callback are zero-terminated strings that contain additional
-** details about the action to be authorized.
-**
-** ^If the action code is [SQLITE_READ]
-** and the callback returns [SQLITE_IGNORE] then the
-** [prepared statement] statement is constructed to substitute
-** a NULL value in place of the table column that would have
-** been read if [SQLITE_OK] had been returned.  The [SQLITE_IGNORE]
-** return can be used to deny an untrusted user access to individual
-** columns of a table.
-** ^If the action code is [SQLITE_DELETE] and the callback returns
-** [SQLITE_IGNORE] then the [DELETE] operation proceeds but the
-** [truncate optimization] is disabled and all rows are deleted individually.
-**
-** An authorizer is used when [sqlite3_prepare | preparing]
-** SQL statements from an untrusted source, to ensure that the SQL statements
-** do not try to access data they are not allowed to see, or that they do not
-** try to execute malicious statements that damage the database.  For
-** example, an application may allow a user to enter arbitrary
-** SQL queries for evaluation by a database.  But the application does
-** not want the user to be able to make arbitrary changes to the
-** database.  An authorizer could then be put in place while the
-** user-entered SQL is being [sqlite3_prepare | prepared] that
-** disallows everything except [SELECT] statements.
-**
-** Applications that need to process SQL from untrusted sources
-** might also consider lowering resource limits using [sqlite3_limit()]
-** and limiting database size using the [max_page_count] [PRAGMA]
-** in addition to using an authorizer.
-**
-** ^(Only a single authorizer can be in place on a database connection
-** at a time.  Each call to sqlite3_set_authorizer overrides the
-** previous call.)^  ^Disable the authorizer by installing a NULL callback.
-** The authorizer is disabled by default.
-**
-** The authorizer callback must not do anything that will modify
-** the database connection that invoked the authorizer callback.
-** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
-** database connections for the meaning of "modify" in this paragraph.
-**
-** ^When [sqlite3_prepare_v2()] is used to prepare a statement, the
-** statement might be re-prepared during [sqlite3_step()] due to a 
-** schema change.  Hence, the application should ensure that the
-** correct authorizer callback remains in place during the [sqlite3_step()].
-**
-** ^Note that the authorizer callback is invoked only during
-** [sqlite3_prepare()] or its variants.  Authorization is not
-** performed during statement evaluation in [sqlite3_step()], unless
-** as stated in the previous paragraph, sqlite3_step() invokes
-** sqlite3_prepare_v2() to reprepare a statement after a schema change.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_set_authorizer(
-  sqlite3*,
-  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
-  void *pUserData
-);
-
-/*
-** CAPI3REF: Authorizer Return Codes
-**
-** The [sqlite3_set_authorizer | authorizer callback function] must
-** return either [SQLITE_OK] or one of these two constants in order
-** to signal SQLite whether or not the action is permitted.  See the
-** [sqlite3_set_authorizer | authorizer documentation] for additional
-** information.
-**
-** Note that SQLITE_IGNORE is also used as a [conflict resolution mode]
-** returned from the [sqlite3_vtab_on_conflict()] interface.
-*/
-#define SQLITE_DENY   1   /* Abort the SQL statement with an error */
-#define SQLITE_IGNORE 2   /* Don't allow access, but don't generate an error */
-
-/*
-** CAPI3REF: Authorizer Action Codes
-**
-** The [sqlite3_set_authorizer()] interface registers a callback function
-** that is invoked to authorize certain SQL statement actions.  The
-** second parameter to the callback is an integer code that specifies
-** what action is being authorized.  These are the integer action codes that
-** the authorizer callback may be passed.
-**
-** These action code values signify what kind of operation is to be
-** authorized.  The 3rd and 4th parameters to the authorization
-** callback function will be parameters or NULL depending on which of these
-** codes is used as the second parameter.  ^(The 5th parameter to the
-** authorizer callback is the name of the database ("main", "temp",
-** etc.) if applicable.)^  ^The 6th parameter to the authorizer callback
-** is the name of the inner-most trigger or view that is responsible for
-** the access attempt or NULL if this access attempt is directly from
-** top-level SQL code.
-*/
-/******************************************* 3rd ************ 4th ***********/
-#define SQLITE_CREATE_INDEX          1   /* Index Name      Table Name      */
-#define SQLITE_CREATE_TABLE          2   /* Table Name      NULL            */
-#define SQLITE_CREATE_TEMP_INDEX     3   /* Index Name      Table Name      */
-#define SQLITE_CREATE_TEMP_TABLE     4   /* Table Name      NULL            */
-#define SQLITE_CREATE_TEMP_TRIGGER   5   /* Trigger Name    Table Name      */
-#define SQLITE_CREATE_TEMP_VIEW      6   /* View Name       NULL            */
-#define SQLITE_CREATE_TRIGGER        7   /* Trigger Name    Table Name      */
-#define SQLITE_CREATE_VIEW           8   /* View Name       NULL            */
-#define SQLITE_DELETE                9   /* Table Name      NULL            */
-#define SQLITE_DROP_INDEX           10   /* Index Name      Table Name      */
-#define SQLITE_DROP_TABLE           11   /* Table Name      NULL            */
-#define SQLITE_DROP_TEMP_INDEX      12   /* Index Name      Table Name      */
-#define SQLITE_DROP_TEMP_TABLE      13   /* Table Name      NULL            */
-#define SQLITE_DROP_TEMP_TRIGGER    14   /* Trigger Name    Table Name      */
-#define SQLITE_DROP_TEMP_VIEW       15   /* View Name       NULL            */
-#define SQLITE_DROP_TRIGGER         16   /* Trigger Name    Table Name      */
-#define SQLITE_DROP_VIEW            17   /* View Name       NULL            */
-#define SQLITE_INSERT               18   /* Table Name      NULL            */
-#define SQLITE_PRAGMA               19   /* Pragma Name     1st arg or NULL */
-#define SQLITE_READ                 20   /* Table Name      Column Name     */
-#define SQLITE_SELECT               21   /* NULL            NULL            */
-#define SQLITE_TRANSACTION          22   /* Operation       NULL            */
-#define SQLITE_UPDATE               23   /* Table Name      Column Name     */
-#define SQLITE_ATTACH               24   /* Filename        NULL            */
-#define SQLITE_DETACH               25   /* Database Name   NULL            */
-#define SQLITE_ALTER_TABLE          26   /* Database Name   Table Name      */
-#define SQLITE_REINDEX              27   /* Index Name      NULL            */
-#define SQLITE_ANALYZE              28   /* Table Name      NULL            */
-#define SQLITE_CREATE_VTABLE        29   /* Table Name      Module Name     */
-#define SQLITE_DROP_VTABLE          30   /* Table Name      Module Name     */
-#define SQLITE_FUNCTION             31   /* NULL            Function Name   */
-#define SQLITE_SAVEPOINT            32   /* Operation       Savepoint Name  */
-#define SQLITE_COPY                  0   /* No longer used */
-#define SQLITE_RECURSIVE            33   /* NULL            NULL            */
-
-/*
-** CAPI3REF: Tracing And Profiling Functions
-** METHOD: sqlite3
-**
-** These routines register callback functions that can be used for
-** tracing and profiling the execution of SQL statements.
-**
-** ^The callback function registered by sqlite3_trace() is invoked at
-** various times when an SQL statement is being run by [sqlite3_step()].
-** ^The sqlite3_trace() callback is invoked with a UTF-8 rendering of the
-** SQL statement text as the statement first begins executing.
-** ^(Additional sqlite3_trace() callbacks might occur
-** as each triggered subprogram is entered.  The callbacks for triggers
-** contain a UTF-8 SQL comment that identifies the trigger.)^
-**
-** The [SQLITE_TRACE_SIZE_LIMIT] compile-time option can be used to limit
-** the length of [bound parameter] expansion in the output of sqlite3_trace().
-**
-** ^The callback function registered by sqlite3_profile() is invoked
-** as each SQL statement finishes.  ^The profile callback contains
-** the original statement text and an estimate of wall-clock time
-** of how long that statement took to run.  ^The profile callback
-** time is in units of nanoseconds, however the current implementation
-** is only capable of millisecond resolution so the six least significant
-** digits in the time are meaningless.  Future versions of SQLite
-** might provide greater resolution on the profiler callback.  The
-** sqlite3_profile() function is considered experimental and is
-** subject to change in future versions of SQLite.
-*/
-SQLITE_API void *SQLITE_STDCALL sqlite3_trace(sqlite3*, void(*xTrace)(void*,const char*), void*);
-SQLITE_API SQLITE_EXPERIMENTAL void *SQLITE_STDCALL sqlite3_profile(sqlite3*,
-   void(*xProfile)(void*,const char*,sqlite3_uint64), void*);
-
-/*
-** CAPI3REF: Query Progress Callbacks
-** METHOD: sqlite3
-**
-** ^The sqlite3_progress_handler(D,N,X,P) interface causes the callback
-** function X to be invoked periodically during long running calls to
-** [sqlite3_exec()], [sqlite3_step()] and [sqlite3_get_table()] for
-** database connection D.  An example use for this
-** interface is to keep a GUI updated during a large query.
-**
-** ^The parameter P is passed through as the only parameter to the 
-** callback function X.  ^The parameter N is the approximate number of 
-** [virtual machine instructions] that are evaluated between successive
-** invocations of the callback X.  ^If N is less than one then the progress
-** handler is disabled.
-**
-** ^Only a single progress handler may be defined at one time per
-** [database connection]; setting a new progress handler cancels the
-** old one.  ^Setting parameter X to NULL disables the progress handler.
-** ^The progress handler is also disabled by setting N to a value less
-** than 1.
-**
-** ^If the progress callback returns non-zero, the operation is
-** interrupted.  This feature can be used to implement a
-** "Cancel" button on a GUI progress dialog box.
-**
-** The progress handler callback must not do anything that will modify
-** the database connection that invoked the progress handler.
-** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
-** database connections for the meaning of "modify" in this paragraph.
-**
-*/
-SQLITE_API void SQLITE_STDCALL sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
-
-/*
-** CAPI3REF: Opening A New Database Connection
-** CONSTRUCTOR: sqlite3
-**
-** ^These routines open an SQLite database file as specified by the 
-** filename argument. ^The filename argument is interpreted as UTF-8 for
-** sqlite3_open() and sqlite3_open_v2() and as UTF-16 in the native byte
-** order for sqlite3_open16(). ^(A [database connection] handle is usually
-** returned in *ppDb, even if an error occurs.  The only exception is that
-** if SQLite is unable to allocate memory to hold the [sqlite3] object,
-** a NULL will be written into *ppDb instead of a pointer to the [sqlite3]
-** object.)^ ^(If the database is opened (and/or created) successfully, then
-** [SQLITE_OK] is returned.  Otherwise an [error code] is returned.)^ ^The
-** [sqlite3_errmsg()] or [sqlite3_errmsg16()] routines can be used to obtain
-** an English language description of the error following a failure of any
-** of the sqlite3_open() routines.
-**
-** ^The default encoding will be UTF-8 for databases created using
-** sqlite3_open() or sqlite3_open_v2().  ^The default encoding for databases
-** created using sqlite3_open16() will be UTF-16 in the native byte order.
-**
-** Whether or not an error occurs when it is opened, resources
-** associated with the [database connection] handle should be released by
-** passing it to [sqlite3_close()] when it is no longer required.
-**
-** The sqlite3_open_v2() interface works like sqlite3_open()
-** except that it accepts two additional parameters for additional control
-** over the new database connection.  ^(The flags parameter to
-** sqlite3_open_v2() can take one of
-** the following three values, optionally combined with the 
-** [SQLITE_OPEN_NOMUTEX], [SQLITE_OPEN_FULLMUTEX], [SQLITE_OPEN_SHAREDCACHE],
-** [SQLITE_OPEN_PRIVATECACHE], and/or [SQLITE_OPEN_URI] flags:)^
-**
-** <dl>
-** ^(<dt>[SQLITE_OPEN_READONLY]</dt>
-** <dd>The database is opened in read-only mode.  If the database does not
-** already exist, an error is returned.</dd>)^
-**
-** ^(<dt>[SQLITE_OPEN_READWRITE]</dt>
-** <dd>The database is opened for reading and writing if possible, or reading
-** only if the file is write protected by the operating system.  In either
-** case the database must already exist, otherwise an error is returned.</dd>)^
-**
-** ^(<dt>[SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]</dt>
-** <dd>The database is opened for reading and writing, and is created if
-** it does not already exist. This is the behavior that is always used for
-** sqlite3_open() and sqlite3_open16().</dd>)^
-** </dl>
-**
-** If the 3rd parameter to sqlite3_open_v2() is not one of the
-** combinations shown above optionally combined with other
-** [SQLITE_OPEN_READONLY | SQLITE_OPEN_* bits]
-** then the behavior is undefined.
-**
-** ^If the [SQLITE_OPEN_NOMUTEX] flag is set, then the database connection
-** opens in the multi-thread [threading mode] as long as the single-thread
-** mode has not been set at compile-time or start-time.  ^If the
-** [SQLITE_OPEN_FULLMUTEX] flag is set then the database connection opens
-** in the serialized [threading mode] unless single-thread was
-** previously selected at compile-time or start-time.
-** ^The [SQLITE_OPEN_SHAREDCACHE] flag causes the database connection to be
-** eligible to use [shared cache mode], regardless of whether or not shared
-** cache is enabled using [sqlite3_enable_shared_cache()].  ^The
-** [SQLITE_OPEN_PRIVATECACHE] flag causes the database connection to not
-** participate in [shared cache mode] even if it is enabled.
-**
-** ^The fourth parameter to sqlite3_open_v2() is the name of the
-** [sqlite3_vfs] object that defines the operating system interface that
-** the new database connection should use.  ^If the fourth parameter is
-** a NULL pointer then the default [sqlite3_vfs] object is used.
-**
-** ^If the filename is ":memory:", then a private, temporary in-memory database
-** is created for the connection.  ^This in-memory database will vanish when
-** the database connection is closed.  Future versions of SQLite might
-** make use of additional special filenames that begin with the ":" character.
-** It is recommended that when a database filename actually does begin with
-** a ":" character you should prefix the filename with a pathname such as
-** "./" to avoid ambiguity.
-**
-** ^If the filename is an empty string, then a private, temporary
-** on-disk database will be created.  ^This private database will be
-** automatically deleted as soon as the database connection is closed.
-**
-** [[URI filenames in sqlite3_open()]] <h3>URI Filenames</h3>
-**
-** ^If [URI filename] interpretation is enabled, and the filename argument
-** begins with "file:", then the filename is interpreted as a URI. ^URI
-** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
-** set in the fourth argument to sqlite3_open_v2(), or if it has
-** been enabled globally using the [SQLITE_CONFIG_URI] option with the
-** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
-** As of SQLite version 3.7.7, URI filename interpretation is turned off
-** by default, but future releases of SQLite might enable URI filename
-** interpretation by default.  See "[URI filenames]" for additional
-** information.
-**
-** URI filenames are parsed according to RFC 3986. ^If the URI contains an
-** authority, then it must be either an empty string or the string 
-** "localhost". ^If the authority is not an empty string or "localhost", an 
-** error is returned to the caller. ^The fragment component of a URI, if 
-** present, is ignored.
-**
-** ^SQLite uses the path component of the URI as the name of the disk file
-** which contains the database. ^If the path begins with a '/' character, 
-** then it is interpreted as an absolute path. ^If the path does not begin 
-** with a '/' (meaning that the authority section is omitted from the URI)
-** then the path is interpreted as a relative path. 
-** ^(On windows, the first component of an absolute path 
-** is a drive specification (e.g. "C:").)^
-**
-** [[core URI query parameters]]
-** The query component of a URI may contain parameters that are interpreted
-** either by SQLite itself, or by a [VFS | custom VFS implementation].
-** SQLite and its built-in [VFSes] interpret the
-** following query parameters:
-**
-** <ul>
-**   <li> <b>vfs</b>: ^The "vfs" parameter may be used to specify the name of
-**     a VFS object that provides the operating system interface that should
-**     be used to access the database file on disk. ^If this option is set to
-**     an empty string the default VFS object is used. ^Specifying an unknown
-**     VFS is an error. ^If sqlite3_open_v2() is used and the vfs option is
-**     present, then the VFS specified by the option takes precedence over
-**     the value passed as the fourth parameter to sqlite3_open_v2().
-**
-**   <li> <b>mode</b>: ^(The mode parameter may be set to either "ro", "rw",
-**     "rwc", or "memory". Attempting to set it to any other value is
-**     an error)^. 
-**     ^If "ro" is specified, then the database is opened for read-only 
-**     access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the 
-**     third argument to sqlite3_open_v2(). ^If the mode option is set to 
-**     "rw", then the database is opened for read-write (but not create) 
-**     access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had 
-**     been set. ^Value "rwc" is equivalent to setting both 
-**     SQLITE_OPEN_READWRITE and SQLITE_OPEN_CREATE.  ^If the mode option is
-**     set to "memory" then a pure [in-memory database] that never reads
-**     or writes from disk is used. ^It is an error to specify a value for
-**     the mode parameter that is less restrictive than that specified by
-**     the flags passed in the third parameter to sqlite3_open_v2().
-**
-**   <li> <b>cache</b>: ^The cache parameter may be set to either "shared" or
-**     "private". ^Setting it to "shared" is equivalent to setting the
-**     SQLITE_OPEN_SHAREDCACHE bit in the flags argument passed to
-**     sqlite3_open_v2(). ^Setting the cache parameter to "private" is 
-**     equivalent to setting the SQLITE_OPEN_PRIVATECACHE bit.
-**     ^If sqlite3_open_v2() is used and the "cache" parameter is present in
-**     a URI filename, its value overrides any behavior requested by setting
-**     SQLITE_OPEN_PRIVATECACHE or SQLITE_OPEN_SHAREDCACHE flag.
-**
-**  <li> <b>psow</b>: ^The psow parameter indicates whether or not the
-**     [powersafe overwrite] property does or does not apply to the
-**     storage media on which the database file resides.
-**
-**  <li> <b>nolock</b>: ^The nolock parameter is a boolean query parameter
-**     which if set disables file locking in rollback journal modes.  This
-**     is useful for accessing a database on a filesystem that does not
-**     support locking.  Caution:  Database corruption might result if two
-**     or more processes write to the same database and any one of those
-**     processes uses nolock=1.
-**
-**  <li> <b>immutable</b>: ^The immutable parameter is a boolean query
-**     parameter that indicates that the database file is stored on
-**     read-only media.  ^When immutable is set, SQLite assumes that the
-**     database file cannot be changed, even by a process with higher
-**     privilege, and so the database is opened read-only and all locking
-**     and change detection is disabled.  Caution: Setting the immutable
-**     property on a database file that does in fact change can result
-**     in incorrect query results and/or [SQLITE_CORRUPT] errors.
-**     See also: [SQLITE_IOCAP_IMMUTABLE].
-**       
-** </ul>
-**
-** ^Specifying an unknown parameter in the query component of a URI is not an
-** error.  Future versions of SQLite might understand additional query
-** parameters.  See "[query parameters with special meaning to SQLite]" for
-** additional information.
-**
-** [[URI filename examples]] <h3>URI filename examples</h3>
-**
-** <table border="1" align=center cellpadding=5>
-** <tr><th> URI filenames <th> Results
-** <tr><td> file:data.db <td> 
-**          Open the file "data.db" in the current directory.
-** <tr><td> file:/home/fred/data.db<br>
-**          file:///home/fred/data.db <br> 
-**          file://localhost/home/fred/data.db <br> <td> 
-**          Open the database file "/home/fred/data.db".
-** <tr><td> file://darkstar/home/fred/data.db <td> 
-**          An error. "darkstar" is not a recognized authority.
-** <tr><td style="white-space:nowrap"> 
-**          file:///C:/Documents%20and%20Settings/fred/Desktop/data.db
-**     <td> Windows only: Open the file "data.db" on fred's desktop on drive
-**          C:. Note that the %20 escaping in this example is not strictly 
-**          necessary - space characters can be used literally
-**          in URI filenames.
-** <tr><td> file:data.db?mode=ro&cache=private <td> 
-**          Open file "data.db" in the current directory for read-only access.
-**          Regardless of whether or not shared-cache mode is enabled by
-**          default, use a private cache.
-** <tr><td> file:/home/fred/data.db?vfs=unix-dotfile <td>
-**          Open file "/home/fred/data.db". Use the special VFS "unix-dotfile"
-**          that uses dot-files in place of posix advisory locking.
-** <tr><td> file:data.db?mode=readonly <td> 
-**          An error. "readonly" is not a valid option for the "mode" parameter.
-** </table>
-**
-** ^URI hexadecimal escape sequences (%HH) are supported within the path and
-** query components of a URI. A hexadecimal escape sequence consists of a
-** percent sign - "%" - followed by exactly two hexadecimal digits 
-** specifying an octet value. ^Before the path or query components of a
-** URI filename are interpreted, they are encoded using UTF-8 and all 
-** hexadecimal escape sequences replaced by a single byte containing the
-** corresponding octet. If this process generates an invalid UTF-8 encoding,
-** the results are undefined.
-**
-** <b>Note to Windows users:</b>  The encoding used for the filename argument
-** of sqlite3_open() and sqlite3_open_v2() must be UTF-8, not whatever
-** codepage is currently defined.  Filenames containing international
-** characters must be converted to UTF-8 prior to passing them into
-** sqlite3_open() or sqlite3_open_v2().
-**
-** <b>Note to Windows Runtime users:</b>  The temporary directory must be set
-** prior to calling sqlite3_open() or sqlite3_open_v2().  Otherwise, various
-** features that require the use of temporary files may fail.
-**
-** See also: [sqlite3_temp_directory]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_open(
-  const char *filename,   /* Database filename (UTF-8) */
-  sqlite3 **ppDb          /* OUT: SQLite db handle */
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_open16(
-  const void *filename,   /* Database filename (UTF-16) */
-  sqlite3 **ppDb          /* OUT: SQLite db handle */
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_open_v2(
-  const char *filename,   /* Database filename (UTF-8) */
-  sqlite3 **ppDb,         /* OUT: SQLite db handle */
-  int flags,              /* Flags */
-  const char *zVfs        /* Name of VFS module to use */
-);
-
-/*
-** CAPI3REF: Obtain Values For URI Parameters
-**
-** These are utility routines, useful to VFS implementations, that check
-** to see if a database file was a URI that contained a specific query 
-** parameter, and if so obtains the value of that query parameter.
-**
-** If F is the database filename pointer passed into the xOpen() method of 
-** a VFS implementation when the flags parameter to xOpen() has one or 
-** more of the [SQLITE_OPEN_URI] or [SQLITE_OPEN_MAIN_DB] bits set and
-** P is the name of the query parameter, then
-** sqlite3_uri_parameter(F,P) returns the value of the P
-** parameter if it exists or a NULL pointer if P does not appear as a 
-** query parameter on F.  If P is a query parameter of F
-** has no explicit value, then sqlite3_uri_parameter(F,P) returns
-** a pointer to an empty string.
-**
-** The sqlite3_uri_boolean(F,P,B) routine assumes that P is a boolean
-** parameter and returns true (1) or false (0) according to the value
-** of P.  The sqlite3_uri_boolean(F,P,B) routine returns true (1) if the
-** value of query parameter P is one of "yes", "true", or "on" in any
-** case or if the value begins with a non-zero number.  The 
-** sqlite3_uri_boolean(F,P,B) routines returns false (0) if the value of
-** query parameter P is one of "no", "false", or "off" in any case or
-** if the value begins with a numeric zero.  If P is not a query
-** parameter on F or if the value of P is does not match any of the
-** above, then sqlite3_uri_boolean(F,P,B) returns (B!=0).
-**
-** The sqlite3_uri_int64(F,P,D) routine converts the value of P into a
-** 64-bit signed integer and returns that integer, or D if P does not
-** exist.  If the value of P is something other than an integer, then
-** zero is returned.
-** 
-** If F is a NULL pointer, then sqlite3_uri_parameter(F,P) returns NULL and
-** sqlite3_uri_boolean(F,P,B) returns B.  If F is not a NULL pointer and
-** is not a database file pathname pointer that SQLite passed into the xOpen
-** VFS method, then the behavior of this routine is undefined and probably
-** undesirable.
-*/
-SQLITE_API const char *SQLITE_STDCALL sqlite3_uri_parameter(const char *zFilename, const char *zParam);
-SQLITE_API int SQLITE_STDCALL sqlite3_uri_boolean(const char *zFile, const char *zParam, int bDefault);
-SQLITE_API sqlite3_int64 SQLITE_STDCALL sqlite3_uri_int64(const char*, const char*, sqlite3_int64);
-
-
-/*
-** CAPI3REF: Error Codes And Messages
-** METHOD: sqlite3
-**
-** ^If the most recent sqlite3_* API call associated with 
-** [database connection] D failed, then the sqlite3_errcode(D) interface
-** returns the numeric [result code] or [extended result code] for that
-** API call.
-** If the most recent API call was successful,
-** then the return value from sqlite3_errcode() is undefined.
-** ^The sqlite3_extended_errcode()
-** interface is the same except that it always returns the 
-** [extended result code] even when extended result codes are
-** disabled.
-**
-** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
-** text that describes the error, as either UTF-8 or UTF-16 respectively.
-** ^(Memory to hold the error message string is managed internally.
-** The application does not need to worry about freeing the result.
-** However, the error string might be overwritten or deallocated by
-** subsequent calls to other SQLite interface functions.)^
-**
-** ^The sqlite3_errstr() interface returns the English-language text
-** that describes the [result code], as UTF-8.
-** ^(Memory to hold the error message string is managed internally
-** and must not be freed by the application)^.
-**
-** When the serialized [threading mode] is in use, it might be the
-** case that a second error occurs on a separate thread in between
-** the time of the first error and the call to these interfaces.
-** When that happens, the second error will be reported since these
-** interfaces always report the most recent result.  To avoid
-** this, each thread can obtain exclusive use of the [database connection] D
-** by invoking [sqlite3_mutex_enter]([sqlite3_db_mutex](D)) before beginning
-** to use D and invoking [sqlite3_mutex_leave]([sqlite3_db_mutex](D)) after
-** all calls to the interfaces listed here are completed.
-**
-** If an interface fails with SQLITE_MISUSE, that means the interface
-** was invoked incorrectly by the application.  In that case, the
-** error code and message may or may not be set.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_errcode(sqlite3 *db);
-SQLITE_API int SQLITE_STDCALL sqlite3_extended_errcode(sqlite3 *db);
-SQLITE_API const char *SQLITE_STDCALL sqlite3_errmsg(sqlite3*);
-SQLITE_API const void *SQLITE_STDCALL sqlite3_errmsg16(sqlite3*);
-SQLITE_API const char *SQLITE_STDCALL sqlite3_errstr(int);
-
-/*
-** CAPI3REF: Prepared Statement Object
-** KEYWORDS: {prepared statement} {prepared statements}
-**
-** An instance of this object represents a single SQL statement that
-** has been compiled into binary form and is ready to be evaluated.
-**
-** Think of each SQL statement as a separate computer program.  The
-** original SQL text is source code.  A prepared statement object 
-** is the compiled object code.  All SQL must be converted into a
-** prepared statement before it can be run.
-**
-** The life-cycle of a prepared statement object usually goes like this:
-**
-** <ol>
-** <li> Create the prepared statement object using [sqlite3_prepare_v2()].
-** <li> Bind values to [parameters] using the sqlite3_bind_*()
-**      interfaces.
-** <li> Run the SQL by calling [sqlite3_step()] one or more times.
-** <li> Reset the prepared statement using [sqlite3_reset()] then go back
-**      to step 2.  Do this zero or more times.
-** <li> Destroy the object using [sqlite3_finalize()].
-** </ol>
-*/
-typedef struct sqlite3_stmt sqlite3_stmt;
-
-/*
-** CAPI3REF: Run-time Limits
-** METHOD: sqlite3
-**
-** ^(This interface allows the size of various constructs to be limited
-** on a connection by connection basis.  The first parameter is the
-** [database connection] whose limit is to be set or queried.  The
-** second parameter is one of the [limit categories] that define a
-** class of constructs to be size limited.  The third parameter is the
-** new limit for that construct.)^
-**
-** ^If the new limit is a negative number, the limit is unchanged.
-** ^(For each limit category SQLITE_LIMIT_<i>NAME</i> there is a 
-** [limits | hard upper bound]
-** set at compile-time by a C preprocessor macro called
-** [limits | SQLITE_MAX_<i>NAME</i>].
-** (The "_LIMIT_" in the name is changed to "_MAX_".))^
-** ^Attempts to increase a limit above its hard upper bound are
-** silently truncated to the hard upper bound.
-**
-** ^Regardless of whether or not the limit was changed, the 
-** [sqlite3_limit()] interface returns the prior value of the limit.
-** ^Hence, to find the current value of a limit without changing it,
-** simply invoke this interface with the third parameter set to -1.
-**
-** Run-time limits are intended for use in applications that manage
-** both their own internal database and also databases that are controlled
-** by untrusted external sources.  An example application might be a
-** web browser that has its own databases for storing history and
-** separate databases controlled by JavaScript applications downloaded
-** off the Internet.  The internal databases can be given the
-** large, default limits.  Databases managed by external sources can
-** be given much smaller limits designed to prevent a denial of service
-** attack.  Developers might also want to use the [sqlite3_set_authorizer()]
-** interface to further control untrusted SQL.  The size of the database
-** created by an untrusted script can be contained using the
-** [max_page_count] [PRAGMA].
-**
-** New run-time limit categories may be added in future releases.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_limit(sqlite3*, int id, int newVal);
-
-/*
-** CAPI3REF: Run-Time Limit Categories
-** KEYWORDS: {limit category} {*limit categories}
-**
-** These constants define various performance limits
-** that can be lowered at run-time using [sqlite3_limit()].
-** The synopsis of the meanings of the various limits is shown below.
-** Additional information is available at [limits | Limits in SQLite].
-**
-** <dl>
-** [[SQLITE_LIMIT_LENGTH]] ^(<dt>SQLITE_LIMIT_LENGTH</dt>
-** <dd>The maximum size of any string or BLOB or table row, in bytes.<dd>)^
-**
-** [[SQLITE_LIMIT_SQL_LENGTH]] ^(<dt>SQLITE_LIMIT_SQL_LENGTH</dt>
-** <dd>The maximum length of an SQL statement, in bytes.</dd>)^
-**
-** [[SQLITE_LIMIT_COLUMN]] ^(<dt>SQLITE_LIMIT_COLUMN</dt>
-** <dd>The maximum number of columns in a table definition or in the
-** result set of a [SELECT] or the maximum number of columns in an index
-** or in an ORDER BY or GROUP BY clause.</dd>)^
-**
-** [[SQLITE_LIMIT_EXPR_DEPTH]] ^(<dt>SQLITE_LIMIT_EXPR_DEPTH</dt>
-** <dd>The maximum depth of the parse tree on any expression.</dd>)^
-**
-** [[SQLITE_LIMIT_COMPOUND_SELECT]] ^(<dt>SQLITE_LIMIT_COMPOUND_SELECT</dt>
-** <dd>The maximum number of terms in a compound SELECT statement.</dd>)^
-**
-** [[SQLITE_LIMIT_VDBE_OP]] ^(<dt>SQLITE_LIMIT_VDBE_OP</dt>
-** <dd>The maximum number of instructions in a virtual machine program
-** used to implement an SQL statement.  This limit is not currently
-** enforced, though that might be added in some future release of
-** SQLite.</dd>)^
-**
-** [[SQLITE_LIMIT_FUNCTION_ARG]] ^(<dt>SQLITE_LIMIT_FUNCTION_ARG</dt>
-** <dd>The maximum number of arguments on a function.</dd>)^
-**
-** [[SQLITE_LIMIT_ATTACHED]] ^(<dt>SQLITE_LIMIT_ATTACHED</dt>
-** <dd>The maximum number of [ATTACH | attached databases].)^</dd>
-**
-** [[SQLITE_LIMIT_LIKE_PATTERN_LENGTH]]
-** ^(<dt>SQLITE_LIMIT_LIKE_PATTERN_LENGTH</dt>
-** <dd>The maximum length of the pattern argument to the [LIKE] or
-** [GLOB] operators.</dd>)^
-**
-** [[SQLITE_LIMIT_VARIABLE_NUMBER]]
-** ^(<dt>SQLITE_LIMIT_VARIABLE_NUMBER</dt>
-** <dd>The maximum index number of any [parameter] in an SQL statement.)^
-**
-** [[SQLITE_LIMIT_TRIGGER_DEPTH]] ^(<dt>SQLITE_LIMIT_TRIGGER_DEPTH</dt>
-** <dd>The maximum depth of recursion for triggers.</dd>)^
-**
-** [[SQLITE_LIMIT_WORKER_THREADS]] ^(<dt>SQLITE_LIMIT_WORKER_THREADS</dt>
-** <dd>The maximum number of auxiliary worker threads that a single
-** [prepared statement] may start.</dd>)^
-** </dl>
-*/
-#define SQLITE_LIMIT_LENGTH                    0
-#define SQLITE_LIMIT_SQL_LENGTH                1
-#define SQLITE_LIMIT_COLUMN                    2
-#define SQLITE_LIMIT_EXPR_DEPTH                3
-#define SQLITE_LIMIT_COMPOUND_SELECT           4
-#define SQLITE_LIMIT_VDBE_OP                   5
-#define SQLITE_LIMIT_FUNCTION_ARG              6
-#define SQLITE_LIMIT_ATTACHED                  7
-#define SQLITE_LIMIT_LIKE_PATTERN_LENGTH       8
-#define SQLITE_LIMIT_VARIABLE_NUMBER           9
-#define SQLITE_LIMIT_TRIGGER_DEPTH            10
-#define SQLITE_LIMIT_WORKER_THREADS           11
-
-/*
-** CAPI3REF: Compiling An SQL Statement
-** KEYWORDS: {SQL statement compiler}
-** METHOD: sqlite3
-** CONSTRUCTOR: sqlite3_stmt
-**
-** To execute an SQL query, it must first be compiled into a byte-code
-** program using one of these routines.
-**
-** The first argument, "db", is a [database connection] obtained from a
-** prior successful call to [sqlite3_open()], [sqlite3_open_v2()] or
-** [sqlite3_open16()].  The database connection must not have been closed.
-**
-** The second argument, "zSql", is the statement to be compiled, encoded
-** as either UTF-8 or UTF-16.  The sqlite3_prepare() and sqlite3_prepare_v2()
-** interfaces use UTF-8, and sqlite3_prepare16() and sqlite3_prepare16_v2()
-** use UTF-16.
-**
-** ^If the nByte argument is negative, then zSql is read up to the
-** first zero terminator. ^If nByte is positive, then it is the
-** number of bytes read from zSql.  ^If nByte is zero, then no prepared
-** statement is generated.
-** If the caller knows that the supplied string is nul-terminated, then
-** there is a small performance advantage to passing an nByte parameter that
-** is the number of bytes in the input string <i>including</i>
-** the nul-terminator.
-**
-** ^If pzTail is not NULL then *pzTail is made to point to the first byte
-** past the end of the first SQL statement in zSql.  These routines only
-** compile the first statement in zSql, so *pzTail is left pointing to
-** what remains uncompiled.
-**
-** ^*ppStmt is left pointing to a compiled [prepared statement] that can be
-** executed using [sqlite3_step()].  ^If there is an error, *ppStmt is set
-** to NULL.  ^If the input text contains no SQL (if the input is an empty
-** string or a comment) then *ppStmt is set to NULL.
-** The calling procedure is responsible for deleting the compiled
-** SQL statement using [sqlite3_finalize()] after it has finished with it.
-** ppStmt may not be NULL.
-**
-** ^On success, the sqlite3_prepare() family of routines return [SQLITE_OK];
-** otherwise an [error code] is returned.
-**
-** The sqlite3_prepare_v2() and sqlite3_prepare16_v2() interfaces are
-** recommended for all new programs. The two older interfaces are retained
-** for backwards compatibility, but their use is discouraged.
-** ^In the "v2" interfaces, the prepared statement
-** that is returned (the [sqlite3_stmt] object) contains a copy of the
-** original SQL text. This causes the [sqlite3_step()] interface to
-** behave differently in three ways:
-**
-** <ol>
-** <li>
-** ^If the database schema changes, instead of returning [SQLITE_SCHEMA] as it
-** always used to do, [sqlite3_step()] will automatically recompile the SQL
-** statement and try to run it again. As many as [SQLITE_MAX_SCHEMA_RETRY]
-** retries will occur before sqlite3_step() gives up and returns an error.
-** </li>
-**
-** <li>
-** ^When an error occurs, [sqlite3_step()] will return one of the detailed
-** [error codes] or [extended error codes].  ^The legacy behavior was that
-** [sqlite3_step()] would only return a generic [SQLITE_ERROR] result code
-** and the application would have to make a second call to [sqlite3_reset()]
-** in order to find the underlying cause of the problem. With the "v2" prepare
-** interfaces, the underlying reason for the error is returned immediately.
-** </li>
-**
-** <li>
-** ^If the specific value bound to [parameter | host parameter] in the 
-** WHERE clause might influence the choice of query plan for a statement,
-** then the statement will be automatically recompiled, as if there had been 
-** a schema change, on the first  [sqlite3_step()] call following any change
-** to the [sqlite3_bind_text | bindings] of that [parameter]. 
-** ^The specific value of WHERE-clause [parameter] might influence the 
-** choice of query plan if the parameter is the left-hand side of a [LIKE]
-** or [GLOB] operator or if the parameter is compared to an indexed column
-** and the [SQLITE_ENABLE_STAT3] compile-time option is enabled.
-** </li>
-** </ol>
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_prepare(
-  sqlite3 *db,            /* Database handle */
-  const char *zSql,       /* SQL statement, UTF-8 encoded */
-  int nByte,              /* Maximum length of zSql in bytes. */
-  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_prepare_v2(
-  sqlite3 *db,            /* Database handle */
-  const char *zSql,       /* SQL statement, UTF-8 encoded */
-  int nByte,              /* Maximum length of zSql in bytes. */
-  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_prepare16(
-  sqlite3 *db,            /* Database handle */
-  const void *zSql,       /* SQL statement, UTF-16 encoded */
-  int nByte,              /* Maximum length of zSql in bytes. */
-  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_prepare16_v2(
-  sqlite3 *db,            /* Database handle */
-  const void *zSql,       /* SQL statement, UTF-16 encoded */
-  int nByte,              /* Maximum length of zSql in bytes. */
-  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
-);
-
-/*
-** CAPI3REF: Retrieving Statement SQL
-** METHOD: sqlite3_stmt
-**
-** ^This interface can be used to retrieve a saved copy of the original
-** SQL text used to create a [prepared statement] if that statement was
-** compiled using either [sqlite3_prepare_v2()] or [sqlite3_prepare16_v2()].
-*/
-SQLITE_API const char *SQLITE_STDCALL sqlite3_sql(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Determine If An SQL Statement Writes The Database
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_stmt_readonly(X) interface returns true (non-zero) if
-** and only if the [prepared statement] X makes no direct changes to
-** the content of the database file.
-**
-** Note that [application-defined SQL functions] or
-** [virtual tables] might change the database indirectly as a side effect.  
-** ^(For example, if an application defines a function "eval()" that 
-** calls [sqlite3_exec()], then the following SQL statement would
-** change the database file through side-effects:
-**
-** <blockquote><pre>
-**    SELECT eval('DELETE FROM t1') FROM t2;
-** </pre></blockquote>
-**
-** But because the [SELECT] statement does not change the database file
-** directly, sqlite3_stmt_readonly() would still return true.)^
-**
-** ^Transaction control statements such as [BEGIN], [COMMIT], [ROLLBACK],
-** [SAVEPOINT], and [RELEASE] cause sqlite3_stmt_readonly() to return true,
-** since the statements themselves do not actually modify the database but
-** rather they control the timing of when other statements modify the 
-** database.  ^The [ATTACH] and [DETACH] statements also cause
-** sqlite3_stmt_readonly() to return true since, while those statements
-** change the configuration of a database connection, they do not make 
-** changes to the content of the database files on disk.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_stmt_readonly(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Determine If A Prepared Statement Has Been Reset
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_stmt_busy(S) interface returns true (non-zero) if the
-** [prepared statement] S has been stepped at least once using 
-** [sqlite3_step(S)] but has neither run to completion (returned
-** [SQLITE_DONE] from [sqlite3_step(S)]) nor
-** been reset using [sqlite3_reset(S)].  ^The sqlite3_stmt_busy(S)
-** interface returns false if S is a NULL pointer.  If S is not a 
-** NULL pointer and is not a pointer to a valid [prepared statement]
-** object, then the behavior is undefined and probably undesirable.
-**
-** This interface can be used in combination [sqlite3_next_stmt()]
-** to locate all prepared statements associated with a database 
-** connection that are in need of being reset.  This can be used,
-** for example, in diagnostic routines to search for prepared 
-** statements that are holding a transaction open.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_stmt_busy(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Dynamically Typed Value Object
-** KEYWORDS: {protected sqlite3_value} {unprotected sqlite3_value}
-**
-** SQLite uses the sqlite3_value object to represent all values
-** that can be stored in a database table. SQLite uses dynamic typing
-** for the values it stores.  ^Values stored in sqlite3_value objects
-** can be integers, floating point values, strings, BLOBs, or NULL.
-**
-** An sqlite3_value object may be either "protected" or "unprotected".
-** Some interfaces require a protected sqlite3_value.  Other interfaces
-** will accept either a protected or an unprotected sqlite3_value.
-** Every interface that accepts sqlite3_value arguments specifies
-** whether or not it requires a protected sqlite3_value.  The
-** [sqlite3_value_dup()] interface can be used to construct a new 
-** protected sqlite3_value from an unprotected sqlite3_value.
-**
-** The terms "protected" and "unprotected" refer to whether or not
-** a mutex is held.  An internal mutex is held for a protected
-** sqlite3_value object but no mutex is held for an unprotected
-** sqlite3_value object.  If SQLite is compiled to be single-threaded
-** (with [SQLITE_THREADSAFE=0] and with [sqlite3_threadsafe()] returning 0)
-** or if SQLite is run in one of reduced mutex modes 
-** [SQLITE_CONFIG_SINGLETHREAD] or [SQLITE_CONFIG_MULTITHREAD]
-** then there is no distinction between protected and unprotected
-** sqlite3_value objects and they can be used interchangeably.  However,
-** for maximum code portability it is recommended that applications
-** still make the distinction between protected and unprotected
-** sqlite3_value objects even when not strictly required.
-**
-** ^The sqlite3_value objects that are passed as parameters into the
-** implementation of [application-defined SQL functions] are protected.
-** ^The sqlite3_value object returned by
-** [sqlite3_column_value()] is unprotected.
-** Unprotected sqlite3_value objects may only be used with
-** [sqlite3_result_value()] and [sqlite3_bind_value()].
-** The [sqlite3_value_blob | sqlite3_value_type()] family of
-** interfaces require protected sqlite3_value objects.
-*/
-typedef struct Mem sqlite3_value;
-
-/*
-** CAPI3REF: SQL Function Context Object
-**
-** The context in which an SQL function executes is stored in an
-** sqlite3_context object.  ^A pointer to an sqlite3_context object
-** is always first parameter to [application-defined SQL functions].
-** The application-defined SQL function implementation will pass this
-** pointer through into calls to [sqlite3_result_int | sqlite3_result()],
-** [sqlite3_aggregate_context()], [sqlite3_user_data()],
-** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
-** and/or [sqlite3_set_auxdata()].
-*/
-typedef struct sqlite3_context sqlite3_context;
-
-/*
-** CAPI3REF: Binding Values To Prepared Statements
-** KEYWORDS: {host parameter} {host parameters} {host parameter name}
-** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
-** METHOD: sqlite3_stmt
-**
-** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
-** literals may be replaced by a [parameter] that matches one of following
-** templates:
-**
-** <ul>
-** <li>  ?
-** <li>  ?NNN
-** <li>  :VVV
-** <li>  @VVV
-** <li>  $VVV
-** </ul>
-**
-** In the templates above, NNN represents an integer literal,
-** and VVV represents an alphanumeric identifier.)^  ^The values of these
-** parameters (also called "host parameter names" or "SQL parameters")
-** can be set using the sqlite3_bind_*() routines defined here.
-**
-** ^The first argument to the sqlite3_bind_*() routines is always
-** a pointer to the [sqlite3_stmt] object returned from
-** [sqlite3_prepare_v2()] or its variants.
-**
-** ^The second argument is the index of the SQL parameter to be set.
-** ^The leftmost SQL parameter has an index of 1.  ^When the same named
-** SQL parameter is used more than once, second and subsequent
-** occurrences have the same index as the first occurrence.
-** ^The index for named parameters can be looked up using the
-** [sqlite3_bind_parameter_index()] API if desired.  ^The index
-** for "?NNN" parameters is the value of NNN.
-** ^The NNN value must be between 1 and the [sqlite3_limit()]
-** parameter [SQLITE_LIMIT_VARIABLE_NUMBER] (default value: 999).
-**
-** ^The third argument is the value to bind to the parameter.
-** ^If the third parameter to sqlite3_bind_text() or sqlite3_bind_text16()
-** or sqlite3_bind_blob() is a NULL pointer then the fourth parameter
-** is ignored and the end result is the same as sqlite3_bind_null().
-**
-** ^(In those routines that have a fourth argument, its value is the
-** number of bytes in the parameter.  To be clear: the value is the
-** number of <u>bytes</u> in the value, not the number of characters.)^
-** ^If the fourth parameter to sqlite3_bind_text() or sqlite3_bind_text16()
-** is negative, then the length of the string is
-** the number of bytes up to the first zero terminator.
-** If the fourth parameter to sqlite3_bind_blob() is negative, then
-** the behavior is undefined.
-** If a non-negative fourth parameter is provided to sqlite3_bind_text()
-** or sqlite3_bind_text16() or sqlite3_bind_text64() then
-** that parameter must be the byte offset
-** where the NUL terminator would occur assuming the string were NUL
-** terminated.  If any NUL characters occur at byte offsets less than 
-** the value of the fourth parameter then the resulting string value will
-** contain embedded NULs.  The result of expressions involving strings
-** with embedded NULs is undefined.
-**
-** ^The fifth argument to the BLOB and string binding interfaces
-** is a destructor used to dispose of the BLOB or
-** string after SQLite has finished with it.  ^The destructor is called
-** to dispose of the BLOB or string even if the call to bind API fails.
-** ^If the fifth argument is
-** the special value [SQLITE_STATIC], then SQLite assumes that the
-** information is in static, unmanaged space and does not need to be freed.
-** ^If the fifth argument has the value [SQLITE_TRANSIENT], then
-** SQLite makes its own private copy of the data immediately, before
-** the sqlite3_bind_*() routine returns.
-**
-** ^The sixth argument to sqlite3_bind_text64() must be one of
-** [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE]
-** to specify the encoding of the text in the third parameter.  If
-** the sixth argument to sqlite3_bind_text64() is not one of the
-** allowed values shown above, or if the text encoding is different
-** from the encoding specified by the sixth parameter, then the behavior
-** is undefined.
-**
-** ^The sqlite3_bind_zeroblob() routine binds a BLOB of length N that
-** is filled with zeroes.  ^A zeroblob uses a fixed amount of memory
-** (just an integer to hold its size) while it is being processed.
-** Zeroblobs are intended to serve as placeholders for BLOBs whose
-** content is later written using
-** [sqlite3_blob_open | incremental BLOB I/O] routines.
-** ^A negative value for the zeroblob results in a zero-length BLOB.
-**
-** ^If any of the sqlite3_bind_*() routines are called with a NULL pointer
-** for the [prepared statement] or with a prepared statement for which
-** [sqlite3_step()] has been called more recently than [sqlite3_reset()],
-** then the call will return [SQLITE_MISUSE].  If any sqlite3_bind_()
-** routine is passed a [prepared statement] that has been finalized, the
-** result is undefined and probably harmful.
-**
-** ^Bindings are not cleared by the [sqlite3_reset()] routine.
-** ^Unbound parameters are interpreted as NULL.
-**
-** ^The sqlite3_bind_* routines return [SQLITE_OK] on success or an
-** [error code] if anything goes wrong.
-** ^[SQLITE_TOOBIG] might be returned if the size of a string or BLOB
-** exceeds limits imposed by [sqlite3_limit]([SQLITE_LIMIT_LENGTH]) or
-** [SQLITE_MAX_LENGTH].
-** ^[SQLITE_RANGE] is returned if the parameter
-** index is out of range.  ^[SQLITE_NOMEM] is returned if malloc() fails.
-**
-** See also: [sqlite3_bind_parameter_count()],
-** [sqlite3_bind_parameter_name()], and [sqlite3_bind_parameter_index()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void(*)(void*));
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_blob64(sqlite3_stmt*, int, const void*, sqlite3_uint64,
-                        void(*)(void*));
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_double(sqlite3_stmt*, int, double);
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_int(sqlite3_stmt*, int, int);
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_int64(sqlite3_stmt*, int, sqlite3_int64);
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_null(sqlite3_stmt*, int);
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_text(sqlite3_stmt*,int,const char*,int,void(*)(void*));
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_text16(sqlite3_stmt*, int, const void*, int, void(*)(void*));
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_text64(sqlite3_stmt*, int, const char*, sqlite3_uint64,
-                         void(*)(void*), unsigned char encoding);
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_zeroblob(sqlite3_stmt*, int, int n);
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_zeroblob64(sqlite3_stmt*, int, sqlite3_uint64);
-
-/*
-** CAPI3REF: Number Of SQL Parameters
-** METHOD: sqlite3_stmt
-**
-** ^This routine can be used to find the number of [SQL parameters]
-** in a [prepared statement].  SQL parameters are tokens of the
-** form "?", "?NNN", ":AAA", "$AAA", or "@AAA" that serve as
-** placeholders for values that are [sqlite3_bind_blob | bound]
-** to the parameters at a later time.
-**
-** ^(This routine actually returns the index of the largest (rightmost)
-** parameter. For all forms except ?NNN, this will correspond to the
-** number of unique parameters.  If parameters of the ?NNN form are used,
-** there may be gaps in the list.)^
-**
-** See also: [sqlite3_bind_blob|sqlite3_bind()],
-** [sqlite3_bind_parameter_name()], and
-** [sqlite3_bind_parameter_index()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_parameter_count(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Name Of A Host Parameter
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_bind_parameter_name(P,N) interface returns
-** the name of the N-th [SQL parameter] in the [prepared statement] P.
-** ^(SQL parameters of the form "?NNN" or ":AAA" or "@AAA" or "$AAA"
-** have a name which is the string "?NNN" or ":AAA" or "@AAA" or "$AAA"
-** respectively.
-** In other words, the initial ":" or "$" or "@" or "?"
-** is included as part of the name.)^
-** ^Parameters of the form "?" without a following integer have no name
-** and are referred to as "nameless" or "anonymous parameters".
-**
-** ^The first host parameter has an index of 1, not 0.
-**
-** ^If the value N is out of range or if the N-th parameter is
-** nameless, then NULL is returned.  ^The returned string is
-** always in UTF-8 encoding even if the named parameter was
-** originally specified as UTF-16 in [sqlite3_prepare16()] or
-** [sqlite3_prepare16_v2()].
-**
-** See also: [sqlite3_bind_blob|sqlite3_bind()],
-** [sqlite3_bind_parameter_count()], and
-** [sqlite3_bind_parameter_index()].
-*/
-SQLITE_API const char *SQLITE_STDCALL sqlite3_bind_parameter_name(sqlite3_stmt*, int);
-
-/*
-** CAPI3REF: Index Of A Parameter With A Given Name
-** METHOD: sqlite3_stmt
-**
-** ^Return the index of an SQL parameter given its name.  ^The
-** index value returned is suitable for use as the second
-** parameter to [sqlite3_bind_blob|sqlite3_bind()].  ^A zero
-** is returned if no matching parameter is found.  ^The parameter
-** name must be given in UTF-8 even if the original statement
-** was prepared from UTF-16 text using [sqlite3_prepare16_v2()].
-**
-** See also: [sqlite3_bind_blob|sqlite3_bind()],
-** [sqlite3_bind_parameter_count()], and
-** [sqlite3_bind_parameter_name()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_bind_parameter_index(sqlite3_stmt*, const char *zName);
-
-/*
-** CAPI3REF: Reset All Bindings On A Prepared Statement
-** METHOD: sqlite3_stmt
-**
-** ^Contrary to the intuition of many, [sqlite3_reset()] does not reset
-** the [sqlite3_bind_blob | bindings] on a [prepared statement].
-** ^Use this routine to reset all host parameters to NULL.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_clear_bindings(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Number Of Columns In A Result Set
-** METHOD: sqlite3_stmt
-**
-** ^Return the number of columns in the result set returned by the
-** [prepared statement]. ^This routine returns 0 if pStmt is an SQL
-** statement that does not return data (for example an [UPDATE]).
-**
-** See also: [sqlite3_data_count()]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_column_count(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Column Names In A Result Set
-** METHOD: sqlite3_stmt
-**
-** ^These routines return the name assigned to a particular column
-** in the result set of a [SELECT] statement.  ^The sqlite3_column_name()
-** interface returns a pointer to a zero-terminated UTF-8 string
-** and sqlite3_column_name16() returns a pointer to a zero-terminated
-** UTF-16 string.  ^The first parameter is the [prepared statement]
-** that implements the [SELECT] statement. ^The second parameter is the
-** column number.  ^The leftmost column is number 0.
-**
-** ^The returned string pointer is valid until either the [prepared statement]
-** is destroyed by [sqlite3_finalize()] or until the statement is automatically
-** reprepared by the first call to [sqlite3_step()] for a particular run
-** or until the next call to
-** sqlite3_column_name() or sqlite3_column_name16() on the same column.
-**
-** ^If sqlite3_malloc() fails during the processing of either routine
-** (for example during a conversion from UTF-8 to UTF-16) then a
-** NULL pointer is returned.
-**
-** ^The name of a result column is the value of the "AS" clause for
-** that column, if there is an AS clause.  If there is no AS clause
-** then the name of the column is unspecified and may change from
-** one release of SQLite to the next.
-*/
-SQLITE_API const char *SQLITE_STDCALL sqlite3_column_name(sqlite3_stmt*, int N);
-SQLITE_API const void *SQLITE_STDCALL sqlite3_column_name16(sqlite3_stmt*, int N);
-
-/*
-** CAPI3REF: Source Of Data In A Query Result
-** METHOD: sqlite3_stmt
-**
-** ^These routines provide a means to determine the database, table, and
-** table column that is the origin of a particular result column in
-** [SELECT] statement.
-** ^The name of the database or table or column can be returned as
-** either a UTF-8 or UTF-16 string.  ^The _database_ routines return
-** the database name, the _table_ routines return the table name, and
-** the origin_ routines return the column name.
-** ^The returned string is valid until the [prepared statement] is destroyed
-** using [sqlite3_finalize()] or until the statement is automatically
-** reprepared by the first call to [sqlite3_step()] for a particular run
-** or until the same information is requested
-** again in a different encoding.
-**
-** ^The names returned are the original un-aliased names of the
-** database, table, and column.
-**
-** ^The first argument to these interfaces is a [prepared statement].
-** ^These functions return information about the Nth result column returned by
-** the statement, where N is the second function argument.
-** ^The left-most column is column 0 for these routines.
-**
-** ^If the Nth column returned by the statement is an expression or
-** subquery and is not a column value, then all of these functions return
-** NULL.  ^These routine might also return NULL if a memory allocation error
-** occurs.  ^Otherwise, they return the name of the attached database, table,
-** or column that query result column was extracted from.
-**
-** ^As with all other SQLite APIs, those whose names end with "16" return
-** UTF-16 encoded strings and the other functions return UTF-8.
-**
-** ^These APIs are only available if the library was compiled with the
-** [SQLITE_ENABLE_COLUMN_METADATA] C-preprocessor symbol.
-**
-** If two or more threads call one or more of these routines against the same
-** prepared statement and column at the same time then the results are
-** undefined.
-**
-** If two or more threads call one or more
-** [sqlite3_column_database_name | column metadata interfaces]
-** for the same [prepared statement] and result column
-** at the same time then the results are undefined.
-*/
-SQLITE_API const char *SQLITE_STDCALL sqlite3_column_database_name(sqlite3_stmt*,int);
-SQLITE_API const void *SQLITE_STDCALL sqlite3_column_database_name16(sqlite3_stmt*,int);
-SQLITE_API const char *SQLITE_STDCALL sqlite3_column_table_name(sqlite3_stmt*,int);
-SQLITE_API const void *SQLITE_STDCALL sqlite3_column_table_name16(sqlite3_stmt*,int);
-SQLITE_API const char *SQLITE_STDCALL sqlite3_column_origin_name(sqlite3_stmt*,int);
-SQLITE_API const void *SQLITE_STDCALL sqlite3_column_origin_name16(sqlite3_stmt*,int);
-
-/*
-** CAPI3REF: Declared Datatype Of A Query Result
-** METHOD: sqlite3_stmt
-**
-** ^(The first parameter is a [prepared statement].
-** If this statement is a [SELECT] statement and the Nth column of the
-** returned result set of that [SELECT] is a table column (not an
-** expression or subquery) then the declared type of the table
-** column is returned.)^  ^If the Nth column of the result set is an
-** expression or subquery, then a NULL pointer is returned.
-** ^The returned string is always UTF-8 encoded.
-**
-** ^(For example, given the database schema:
-**
-** CREATE TABLE t1(c1 VARIANT);
-**
-** and the following statement to be compiled:
-**
-** SELECT c1 + 1, c1 FROM t1;
-**
-** this routine would return the string "VARIANT" for the second result
-** column (i==1), and a NULL pointer for the first result column (i==0).)^
-**
-** ^SQLite uses dynamic run-time typing.  ^So just because a column
-** is declared to contain a particular type does not mean that the
-** data stored in that column is of the declared type.  SQLite is
-** strongly typed, but the typing is dynamic not static.  ^Type
-** is associated with individual values, not with the containers
-** used to hold those values.
-*/
-SQLITE_API const char *SQLITE_STDCALL sqlite3_column_decltype(sqlite3_stmt*,int);
-SQLITE_API const void *SQLITE_STDCALL sqlite3_column_decltype16(sqlite3_stmt*,int);
-
-/*
-** CAPI3REF: Evaluate An SQL Statement
-** METHOD: sqlite3_stmt
-**
-** After a [prepared statement] has been prepared using either
-** [sqlite3_prepare_v2()] or [sqlite3_prepare16_v2()] or one of the legacy
-** interfaces [sqlite3_prepare()] or [sqlite3_prepare16()], this function
-** must be called one or more times to evaluate the statement.
-**
-** The details of the behavior of the sqlite3_step() interface depend
-** on whether the statement was prepared using the newer "v2" interface
-** [sqlite3_prepare_v2()] and [sqlite3_prepare16_v2()] or the older legacy
-** interface [sqlite3_prepare()] and [sqlite3_prepare16()].  The use of the
-** new "v2" interface is recommended for new applications but the legacy
-** interface will continue to be supported.
-**
-** ^In the legacy interface, the return value will be either [SQLITE_BUSY],
-** [SQLITE_DONE], [SQLITE_ROW], [SQLITE_ERROR], or [SQLITE_MISUSE].
-** ^With the "v2" interface, any of the other [result codes] or
-** [extended result codes] might be returned as well.
-**
-** ^[SQLITE_BUSY] means that the database engine was unable to acquire the
-** database locks it needs to do its job.  ^If the statement is a [COMMIT]
-** or occurs outside of an explicit transaction, then you can retry the
-** statement.  If the statement is not a [COMMIT] and occurs within an
-** explicit transaction then you should rollback the transaction before
-** continuing.
-**
-** ^[SQLITE_DONE] means that the statement has finished executing
-** successfully.  sqlite3_step() should not be called again on this virtual
-** machine without first calling [sqlite3_reset()] to reset the virtual
-** machine back to its initial state.
-**
-** ^If the SQL statement being executed returns any data, then [SQLITE_ROW]
-** is returned each time a new row of data is ready for processing by the
-** caller. The values may be accessed using the [column access functions].
-** sqlite3_step() is called again to retrieve the next row of data.
-**
-** ^[SQLITE_ERROR] means that a run-time error (such as a constraint
-** violation) has occurred.  sqlite3_step() should not be called again on
-** the VM. More information may be found by calling [sqlite3_errmsg()].
-** ^With the legacy interface, a more specific error code (for example,
-** [SQLITE_INTERRUPT], [SQLITE_SCHEMA], [SQLITE_CORRUPT], and so forth)
-** can be obtained by calling [sqlite3_reset()] on the
-** [prepared statement].  ^In the "v2" interface,
-** the more specific error code is returned directly by sqlite3_step().
-**
-** [SQLITE_MISUSE] means that the this routine was called inappropriately.
-** Perhaps it was called on a [prepared statement] that has
-** already been [sqlite3_finalize | finalized] or on one that had
-** previously returned [SQLITE_ERROR] or [SQLITE_DONE].  Or it could
-** be the case that the same database connection is being used by two or
-** more threads at the same moment in time.
-**
-** For all versions of SQLite up to and including 3.6.23.1, a call to
-** [sqlite3_reset()] was required after sqlite3_step() returned anything
-** other than [SQLITE_ROW] before any subsequent invocation of
-** sqlite3_step().  Failure to reset the prepared statement using 
-** [sqlite3_reset()] would result in an [SQLITE_MISUSE] return from
-** sqlite3_step().  But after version 3.6.23.1, sqlite3_step() began
-** calling [sqlite3_reset()] automatically in this circumstance rather
-** than returning [SQLITE_MISUSE].  This is not considered a compatibility
-** break because any application that ever receives an SQLITE_MISUSE error
-** is broken by definition.  The [SQLITE_OMIT_AUTORESET] compile-time option
-** can be used to restore the legacy behavior.
-**
-** <b>Goofy Interface Alert:</b> In the legacy interface, the sqlite3_step()
-** API always returns a generic error code, [SQLITE_ERROR], following any
-** error other than [SQLITE_BUSY] and [SQLITE_MISUSE].  You must call
-** [sqlite3_reset()] or [sqlite3_finalize()] in order to find one of the
-** specific [error codes] that better describes the error.
-** We admit that this is a goofy design.  The problem has been fixed
-** with the "v2" interface.  If you prepare all of your SQL statements
-** using either [sqlite3_prepare_v2()] or [sqlite3_prepare16_v2()] instead
-** of the legacy [sqlite3_prepare()] and [sqlite3_prepare16()] interfaces,
-** then the more specific [error codes] are returned directly
-** by sqlite3_step().  The use of the "v2" interface is recommended.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_step(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Number of columns in a result set
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_data_count(P) interface returns the number of columns in the
-** current row of the result set of [prepared statement] P.
-** ^If prepared statement P does not have results ready to return
-** (via calls to the [sqlite3_column_int | sqlite3_column_*()] of
-** interfaces) then sqlite3_data_count(P) returns 0.
-** ^The sqlite3_data_count(P) routine also returns 0 if P is a NULL pointer.
-** ^The sqlite3_data_count(P) routine returns 0 if the previous call to
-** [sqlite3_step](P) returned [SQLITE_DONE].  ^The sqlite3_data_count(P)
-** will return non-zero if previous call to [sqlite3_step](P) returned
-** [SQLITE_ROW], except in the case of the [PRAGMA incremental_vacuum]
-** where it always returns zero since each step of that multi-step
-** pragma returns 0 columns of data.
-**
-** See also: [sqlite3_column_count()]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_data_count(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Fundamental Datatypes
-** KEYWORDS: SQLITE_TEXT
-**
-** ^(Every value in SQLite has one of five fundamental datatypes:
-**
-** <ul>
-** <li> 64-bit signed integer
-** <li> 64-bit IEEE floating point number
-** <li> string
-** <li> BLOB
-** <li> NULL
-** </ul>)^
-**
-** These constants are codes for each of those types.
-**
-** Note that the SQLITE_TEXT constant was also used in SQLite version 2
-** for a completely different meaning.  Software that links against both
-** SQLite version 2 and SQLite version 3 should use SQLITE3_TEXT, not
-** SQLITE_TEXT.
-*/
-#define SQLITE_INTEGER  1
-#define SQLITE_FLOAT    2
-#define SQLITE_BLOB     4
-#define SQLITE_NULL     5
-#ifdef SQLITE_TEXT
-# undef SQLITE_TEXT
-#else
-# define SQLITE_TEXT     3
-#endif
-#define SQLITE3_TEXT     3
-
-/*
-** CAPI3REF: Result Values From A Query
-** KEYWORDS: {column access functions}
-** METHOD: sqlite3_stmt
-**
-** ^These routines return information about a single column of the current
-** result row of a query.  ^In every case the first argument is a pointer
-** to the [prepared statement] that is being evaluated (the [sqlite3_stmt*]
-** that was returned from [sqlite3_prepare_v2()] or one of its variants)
-** and the second argument is the index of the column for which information
-** should be returned. ^The leftmost column of the result set has the index 0.
-** ^The number of columns in the result can be determined using
-** [sqlite3_column_count()].
-**
-** If the SQL statement does not currently point to a valid row, or if the
-** column index is out of range, the result is undefined.
-** These routines may only be called when the most recent call to
-** [sqlite3_step()] has returned [SQLITE_ROW] and neither
-** [sqlite3_reset()] nor [sqlite3_finalize()] have been called subsequently.
-** If any of these routines are called after [sqlite3_reset()] or
-** [sqlite3_finalize()] or after [sqlite3_step()] has returned
-** something other than [SQLITE_ROW], the results are undefined.
-** If [sqlite3_step()] or [sqlite3_reset()] or [sqlite3_finalize()]
-** are called from a different thread while any of these routines
-** are pending, then the results are undefined.
-**
-** ^The sqlite3_column_type() routine returns the
-** [SQLITE_INTEGER | datatype code] for the initial data type
-** of the result column.  ^The returned value is one of [SQLITE_INTEGER],
-** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL].  The value
-** returned by sqlite3_column_type() is only meaningful if no type
-** conversions have occurred as described below.  After a type conversion,
-** the value returned by sqlite3_column_type() is undefined.  Future
-** versions of SQLite may change the behavior of sqlite3_column_type()
-** following a type conversion.
-**
-** ^If the result is a BLOB or UTF-8 string then the sqlite3_column_bytes()
-** routine returns the number of bytes in that BLOB or string.
-** ^If the result is a UTF-16 string, then sqlite3_column_bytes() converts
-** the string to UTF-8 and then returns the number of bytes.
-** ^If the result is a numeric value then sqlite3_column_bytes() uses
-** [sqlite3_snprintf()] to convert that value to a UTF-8 string and returns
-** the number of bytes in that string.
-** ^If the result is NULL, then sqlite3_column_bytes() returns zero.
-**
-** ^If the result is a BLOB or UTF-16 string then the sqlite3_column_bytes16()
-** routine returns the number of bytes in that BLOB or string.
-** ^If the result is a UTF-8 string, then sqlite3_column_bytes16() converts
-** the string to UTF-16 and then returns the number of bytes.
-** ^If the result is a numeric value then sqlite3_column_bytes16() uses
-** [sqlite3_snprintf()] to convert that value to a UTF-16 string and returns
-** the number of bytes in that string.
-** ^If the result is NULL, then sqlite3_column_bytes16() returns zero.
-**
-** ^The values returned by [sqlite3_column_bytes()] and 
-** [sqlite3_column_bytes16()] do not include the zero terminators at the end
-** of the string.  ^For clarity: the values returned by
-** [sqlite3_column_bytes()] and [sqlite3_column_bytes16()] are the number of
-** bytes in the string, not the number of characters.
-**
-** ^Strings returned by sqlite3_column_text() and sqlite3_column_text16(),
-** even empty strings, are always zero-terminated.  ^The return
-** value from sqlite3_column_blob() for a zero-length BLOB is a NULL pointer.
-**
-** <b>Warning:</b> ^The object returned by [sqlite3_column_value()] is an
-** [unprotected sqlite3_value] object.  In a multithreaded environment,
-** an unprotected sqlite3_value object may only be used safely with
-** [sqlite3_bind_value()] and [sqlite3_result_value()].
-** If the [unprotected sqlite3_value] object returned by
-** [sqlite3_column_value()] is used in any other way, including calls
-** to routines like [sqlite3_value_int()], [sqlite3_value_text()],
-** or [sqlite3_value_bytes()], the behavior is not threadsafe.
-**
-** These routines attempt to convert the value where appropriate.  ^For
-** example, if the internal representation is FLOAT and a text result
-** is requested, [sqlite3_snprintf()] is used internally to perform the
-** conversion automatically.  ^(The following table details the conversions
-** that are applied:
-**
-** <blockquote>
-** <table border="1">
-** <tr><th> Internal<br>Type <th> Requested<br>Type <th>  Conversion
-**
-** <tr><td>  NULL    <td> INTEGER   <td> Result is 0
-** <tr><td>  NULL    <td>  FLOAT    <td> Result is 0.0
-** <tr><td>  NULL    <td>   TEXT    <td> Result is a NULL pointer
-** <tr><td>  NULL    <td>   BLOB    <td> Result is a NULL pointer
-** <tr><td> INTEGER  <td>  FLOAT    <td> Convert from integer to float
-** <tr><td> INTEGER  <td>   TEXT    <td> ASCII rendering of the integer
-** <tr><td> INTEGER  <td>   BLOB    <td> Same as INTEGER->TEXT
-** <tr><td>  FLOAT   <td> INTEGER   <td> [CAST] to INTEGER
-** <tr><td>  FLOAT   <td>   TEXT    <td> ASCII rendering of the float
-** <tr><td>  FLOAT   <td>   BLOB    <td> [CAST] to BLOB
-** <tr><td>  TEXT    <td> INTEGER   <td> [CAST] to INTEGER
-** <tr><td>  TEXT    <td>  FLOAT    <td> [CAST] to REAL
-** <tr><td>  TEXT    <td>   BLOB    <td> No change
-** <tr><td>  BLOB    <td> INTEGER   <td> [CAST] to INTEGER
-** <tr><td>  BLOB    <td>  FLOAT    <td> [CAST] to REAL
-** <tr><td>  BLOB    <td>   TEXT    <td> Add a zero terminator if needed
-** </table>
-** </blockquote>)^
-**
-** Note that when type conversions occur, pointers returned by prior
-** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or
-** sqlite3_column_text16() may be invalidated.
-** Type conversions and pointer invalidations might occur
-** in the following cases:
-**
-** <ul>
-** <li> The initial content is a BLOB and sqlite3_column_text() or
-**      sqlite3_column_text16() is called.  A zero-terminator might
-**      need to be added to the string.</li>
-** <li> The initial content is UTF-8 text and sqlite3_column_bytes16() or
-**      sqlite3_column_text16() is called.  The content must be converted
-**      to UTF-16.</li>
-** <li> The initial content is UTF-16 text and sqlite3_column_bytes() or
-**      sqlite3_column_text() is called.  The content must be converted
-**      to UTF-8.</li>
-** </ul>
-**
-** ^Conversions between UTF-16be and UTF-16le are always done in place and do
-** not invalidate a prior pointer, though of course the content of the buffer
-** that the prior pointer references will have been modified.  Other kinds
-** of conversion are done in place when it is possible, but sometimes they
-** are not possible and in those cases prior pointers are invalidated.
-**
-** The safest policy is to invoke these routines
-** in one of the following ways:
-**
-** <ul>
-**  <li>sqlite3_column_text() followed by sqlite3_column_bytes()</li>
-**  <li>sqlite3_column_blob() followed by sqlite3_column_bytes()</li>
-**  <li>sqlite3_column_text16() followed by sqlite3_column_bytes16()</li>
-** </ul>
-**
-** In other words, you should call sqlite3_column_text(),
-** sqlite3_column_blob(), or sqlite3_column_text16() first to force the result
-** into the desired format, then invoke sqlite3_column_bytes() or
-** sqlite3_column_bytes16() to find the size of the result.  Do not mix calls
-** to sqlite3_column_text() or sqlite3_column_blob() with calls to
-** sqlite3_column_bytes16(), and do not mix calls to sqlite3_column_text16()
-** with calls to sqlite3_column_bytes().
-**
-** ^The pointers returned are valid until a type conversion occurs as
-** described above, or until [sqlite3_step()] or [sqlite3_reset()] or
-** [sqlite3_finalize()] is called.  ^The memory space used to hold strings
-** and BLOBs is freed automatically.  Do <em>not</em> pass the pointers returned
-** from [sqlite3_column_blob()], [sqlite3_column_text()], etc. into
-** [sqlite3_free()].
-**
-** ^(If a memory allocation error occurs during the evaluation of any
-** of these routines, a default value is returned.  The default value
-** is either the integer 0, the floating point number 0.0, or a NULL
-** pointer.  Subsequent calls to [sqlite3_errcode()] will return
-** [SQLITE_NOMEM].)^
-*/
-SQLITE_API const void *SQLITE_STDCALL sqlite3_column_blob(sqlite3_stmt*, int iCol);
-SQLITE_API int SQLITE_STDCALL sqlite3_column_bytes(sqlite3_stmt*, int iCol);
-SQLITE_API int SQLITE_STDCALL sqlite3_column_bytes16(sqlite3_stmt*, int iCol);
-SQLITE_API double SQLITE_STDCALL sqlite3_column_double(sqlite3_stmt*, int iCol);
-SQLITE_API int SQLITE_STDCALL sqlite3_column_int(sqlite3_stmt*, int iCol);
-SQLITE_API sqlite3_int64 SQLITE_STDCALL sqlite3_column_int64(sqlite3_stmt*, int iCol);
-SQLITE_API const unsigned char *SQLITE_STDCALL sqlite3_column_text(sqlite3_stmt*, int iCol);
-SQLITE_API const void *SQLITE_STDCALL sqlite3_column_text16(sqlite3_stmt*, int iCol);
-SQLITE_API int SQLITE_STDCALL sqlite3_column_type(sqlite3_stmt*, int iCol);
-SQLITE_API sqlite3_value *SQLITE_STDCALL sqlite3_column_value(sqlite3_stmt*, int iCol);
-
-/*
-** CAPI3REF: Destroy A Prepared Statement Object
-** DESTRUCTOR: sqlite3_stmt
-**
-** ^The sqlite3_finalize() function is called to delete a [prepared statement].
-** ^If the most recent evaluation of the statement encountered no errors
-** or if the statement is never been evaluated, then sqlite3_finalize() returns
-** SQLITE_OK.  ^If the most recent evaluation of statement S failed, then
-** sqlite3_finalize(S) returns the appropriate [error code] or
-** [extended error code].
-**
-** ^The sqlite3_finalize(S) routine can be called at any point during
-** the life cycle of [prepared statement] S:
-** before statement S is ever evaluated, after
-** one or more calls to [sqlite3_reset()], or after any call
-** to [sqlite3_step()] regardless of whether or not the statement has
-** completed execution.
-**
-** ^Invoking sqlite3_finalize() on a NULL pointer is a harmless no-op.
-**
-** The application must finalize every [prepared statement] in order to avoid
-** resource leaks.  It is a grievous error for the application to try to use
-** a prepared statement after it has been finalized.  Any use of a prepared
-** statement after it has been finalized can result in undefined and
-** undesirable behavior such as segfaults and heap corruption.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_finalize(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Reset A Prepared Statement Object
-** METHOD: sqlite3_stmt
-**
-** The sqlite3_reset() function is called to reset a [prepared statement]
-** object back to its initial state, ready to be re-executed.
-** ^Any SQL statement variables that had values bound to them using
-** the [sqlite3_bind_blob | sqlite3_bind_*() API] retain their values.
-** Use [sqlite3_clear_bindings()] to reset the bindings.
-**
-** ^The [sqlite3_reset(S)] interface resets the [prepared statement] S
-** back to the beginning of its program.
-**
-** ^If the most recent call to [sqlite3_step(S)] for the
-** [prepared statement] S returned [SQLITE_ROW] or [SQLITE_DONE],
-** or if [sqlite3_step(S)] has never before been called on S,
-** then [sqlite3_reset(S)] returns [SQLITE_OK].
-**
-** ^If the most recent call to [sqlite3_step(S)] for the
-** [prepared statement] S indicated an error, then
-** [sqlite3_reset(S)] returns an appropriate [error code].
-**
-** ^The [sqlite3_reset(S)] interface does not change the values
-** of any [sqlite3_bind_blob|bindings] on the [prepared statement] S.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_reset(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Create Or Redefine SQL Functions
-** KEYWORDS: {function creation routines}
-** KEYWORDS: {application-defined SQL function}
-** KEYWORDS: {application-defined SQL functions}
-** METHOD: sqlite3
-**
-** ^These functions (collectively known as "function creation routines")
-** are used to add SQL functions or aggregates or to redefine the behavior
-** of existing SQL functions or aggregates.  The only differences between
-** these routines are the text encoding expected for
-** the second parameter (the name of the function being created)
-** and the presence or absence of a destructor callback for
-** the application data pointer.
-**
-** ^The first parameter is the [database connection] to which the SQL
-** function is to be added.  ^If an application uses more than one database
-** connection then application-defined SQL functions must be added
-** to each database connection separately.
-**
-** ^The second parameter is the name of the SQL function to be created or
-** redefined.  ^The length of the name is limited to 255 bytes in a UTF-8
-** representation, exclusive of the zero-terminator.  ^Note that the name
-** length limit is in UTF-8 bytes, not characters nor UTF-16 bytes.  
-** ^Any attempt to create a function with a longer name
-** will result in [SQLITE_MISUSE] being returned.
-**
-** ^The third parameter (nArg)
-** is the number of arguments that the SQL function or
-** aggregate takes. ^If this parameter is -1, then the SQL function or
-** aggregate may take any number of arguments between 0 and the limit
-** set by [sqlite3_limit]([SQLITE_LIMIT_FUNCTION_ARG]).  If the third
-** parameter is less than -1 or greater than 127 then the behavior is
-** undefined.
-**
-** ^The fourth parameter, eTextRep, specifies what
-** [SQLITE_UTF8 | text encoding] this SQL function prefers for
-** its parameters.  The application should set this parameter to
-** [SQLITE_UTF16LE] if the function implementation invokes 
-** [sqlite3_value_text16le()] on an input, or [SQLITE_UTF16BE] if the
-** implementation invokes [sqlite3_value_text16be()] on an input, or
-** [SQLITE_UTF16] if [sqlite3_value_text16()] is used, or [SQLITE_UTF8]
-** otherwise.  ^The same SQL function may be registered multiple times using
-** different preferred text encodings, with different implementations for
-** each encoding.
-** ^When multiple implementations of the same function are available, SQLite
-** will pick the one that involves the least amount of data conversion.
-**
-** ^The fourth parameter may optionally be ORed with [SQLITE_DETERMINISTIC]
-** to signal that the function will always return the same result given
-** the same inputs within a single SQL statement.  Most SQL functions are
-** deterministic.  The built-in [random()] SQL function is an example of a
-** function that is not deterministic.  The SQLite query planner is able to
-** perform additional optimizations on deterministic functions, so use
-** of the [SQLITE_DETERMINISTIC] flag is recommended where possible.
-**
-** ^(The fifth parameter is an arbitrary pointer.  The implementation of the
-** function can gain access to this pointer using [sqlite3_user_data()].)^
-**
-** ^The sixth, seventh and eighth parameters, xFunc, xStep and xFinal, are
-** pointers to C-language functions that implement the SQL function or
-** aggregate. ^A scalar SQL function requires an implementation of the xFunc
-** callback only; NULL pointers must be passed as the xStep and xFinal
-** parameters. ^An aggregate SQL function requires an implementation of xStep
-** and xFinal and NULL pointer must be passed for xFunc. ^To delete an existing
-** SQL function or aggregate, pass NULL pointers for all three function
-** callbacks.
-**
-** ^(If the ninth parameter to sqlite3_create_function_v2() is not NULL,
-** then it is destructor for the application data pointer. 
-** The destructor is invoked when the function is deleted, either by being
-** overloaded or when the database connection closes.)^
-** ^The destructor is also invoked if the call to
-** sqlite3_create_function_v2() fails.
-** ^When the destructor callback of the tenth parameter is invoked, it
-** is passed a single argument which is a copy of the application data 
-** pointer which was the fifth parameter to sqlite3_create_function_v2().
-**
-** ^It is permitted to register multiple implementations of the same
-** functions with the same name but with either differing numbers of
-** arguments or differing preferred text encodings.  ^SQLite will use
-** the implementation that most closely matches the way in which the
-** SQL function is used.  ^A function implementation with a non-negative
-** nArg parameter is a better match than a function implementation with
-** a negative nArg.  ^A function where the preferred text encoding
-** matches the database encoding is a better
-** match than a function where the encoding is different.  
-** ^A function where the encoding difference is between UTF16le and UTF16be
-** is a closer match than a function where the encoding difference is
-** between UTF8 and UTF16.
-**
-** ^Built-in functions may be overloaded by new application-defined functions.
-**
-** ^An application-defined function is permitted to call other
-** SQLite interfaces.  However, such calls must not
-** close the database connection nor finalize or reset the prepared
-** statement in which the function is running.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_create_function(
-  sqlite3 *db,
-  const char *zFunctionName,
-  int nArg,
-  int eTextRep,
-  void *pApp,
-  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
-  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
-  void (*xFinal)(sqlite3_context*)
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_create_function16(
-  sqlite3 *db,
-  const void *zFunctionName,
-  int nArg,
-  int eTextRep,
-  void *pApp,
-  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
-  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
-  void (*xFinal)(sqlite3_context*)
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_create_function_v2(
-  sqlite3 *db,
-  const char *zFunctionName,
-  int nArg,
-  int eTextRep,
-  void *pApp,
-  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
-  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
-  void (*xFinal)(sqlite3_context*),
-  void(*xDestroy)(void*)
-);
-
-/*
-** CAPI3REF: Text Encodings
-**
-** These constant define integer codes that represent the various
-** text encodings supported by SQLite.
-*/
-#define SQLITE_UTF8           1    /* IMP: R-37514-35566 */
-#define SQLITE_UTF16LE        2    /* IMP: R-03371-37637 */
-#define SQLITE_UTF16BE        3    /* IMP: R-51971-34154 */
-#define SQLITE_UTF16          4    /* Use native byte order */
-#define SQLITE_ANY            5    /* Deprecated */
-#define SQLITE_UTF16_ALIGNED  8    /* sqlite3_create_collation only */
-
-/*
-** CAPI3REF: Function Flags
-**
-** These constants may be ORed together with the 
-** [SQLITE_UTF8 | preferred text encoding] as the fourth argument
-** to [sqlite3_create_function()], [sqlite3_create_function16()], or
-** [sqlite3_create_function_v2()].
-*/
-#define SQLITE_DETERMINISTIC    0x800
-
-/*
-** CAPI3REF: Deprecated Functions
-** DEPRECATED
-**
-** These functions are [deprecated].  In order to maintain
-** backwards compatibility with older code, these functions continue 
-** to be supported.  However, new applications should avoid
-** the use of these functions.  To encourage programmers to avoid
-** these functions, we will not explain what they do.
-*/
-#ifndef SQLITE_OMIT_DEPRECATED
-SQLITE_API SQLITE_DEPRECATED int SQLITE_STDCALL sqlite3_aggregate_count(sqlite3_context*);
-SQLITE_API SQLITE_DEPRECATED int SQLITE_STDCALL sqlite3_expired(sqlite3_stmt*);
-SQLITE_API SQLITE_DEPRECATED int SQLITE_STDCALL sqlite3_transfer_bindings(sqlite3_stmt*, sqlite3_stmt*);
-SQLITE_API SQLITE_DEPRECATED int SQLITE_STDCALL sqlite3_global_recover(void);
-SQLITE_API SQLITE_DEPRECATED void SQLITE_STDCALL sqlite3_thread_cleanup(void);
-SQLITE_API SQLITE_DEPRECATED int SQLITE_STDCALL sqlite3_memory_alarm(void(*)(void*,sqlite3_int64,int),
-                      void*,sqlite3_int64);
-#endif
-
-/*
-** CAPI3REF: Obtaining SQL Values
-** METHOD: sqlite3_value
-**
-** The C-language implementation of SQL functions and aggregates uses
-** this set of interface routines to access the parameter values on
-** the function or aggregate.  
-**
-** The xFunc (for scalar functions) or xStep (for aggregates) parameters
-** to [sqlite3_create_function()] and [sqlite3_create_function16()]
-** define callbacks that implement the SQL functions and aggregates.
-** The 3rd parameter to these callbacks is an array of pointers to
-** [protected sqlite3_value] objects.  There is one [sqlite3_value] object for
-** each parameter to the SQL function.  These routines are used to
-** extract values from the [sqlite3_value] objects.
-**
-** These routines work only with [protected sqlite3_value] objects.
-** Any attempt to use these routines on an [unprotected sqlite3_value]
-** object results in undefined behavior.
-**
-** ^These routines work just like the corresponding [column access functions]
-** except that these routines take a single [protected sqlite3_value] object
-** pointer instead of a [sqlite3_stmt*] pointer and an integer column number.
-**
-** ^The sqlite3_value_text16() interface extracts a UTF-16 string
-** in the native byte-order of the host machine.  ^The
-** sqlite3_value_text16be() and sqlite3_value_text16le() interfaces
-** extract UTF-16 strings as big-endian and little-endian respectively.
-**
-** ^(The sqlite3_value_numeric_type() interface attempts to apply
-** numeric affinity to the value.  This means that an attempt is
-** made to convert the value to an integer or floating point.  If
-** such a conversion is possible without loss of information (in other
-** words, if the value is a string that looks like a number)
-** then the conversion is performed.  Otherwise no conversion occurs.
-** The [SQLITE_INTEGER | datatype] after conversion is returned.)^
-**
-** Please pay particular attention to the fact that the pointer returned
-** from [sqlite3_value_blob()], [sqlite3_value_text()], or
-** [sqlite3_value_text16()] can be invalidated by a subsequent call to
-** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite3_value_text()],
-** or [sqlite3_value_text16()].
-**
-** These routines must be called from the same thread as
-** the SQL function that supplied the [sqlite3_value*] parameters.
-*/
-SQLITE_API const void *SQLITE_STDCALL sqlite3_value_blob(sqlite3_value*);
-SQLITE_API int SQLITE_STDCALL sqlite3_value_bytes(sqlite3_value*);
-SQLITE_API int SQLITE_STDCALL sqlite3_value_bytes16(sqlite3_value*);
-SQLITE_API double SQLITE_STDCALL sqlite3_value_double(sqlite3_value*);
-SQLITE_API int SQLITE_STDCALL sqlite3_value_int(sqlite3_value*);
-SQLITE_API sqlite3_int64 SQLITE_STDCALL sqlite3_value_int64(sqlite3_value*);
-SQLITE_API const unsigned char *SQLITE_STDCALL sqlite3_value_text(sqlite3_value*);
-SQLITE_API const void *SQLITE_STDCALL sqlite3_value_text16(sqlite3_value*);
-SQLITE_API const void *SQLITE_STDCALL sqlite3_value_text16le(sqlite3_value*);
-SQLITE_API const void *SQLITE_STDCALL sqlite3_value_text16be(sqlite3_value*);
-SQLITE_API int SQLITE_STDCALL sqlite3_value_type(sqlite3_value*);
-SQLITE_API int SQLITE_STDCALL sqlite3_value_numeric_type(sqlite3_value*);
-
-/*
-** CAPI3REF: Finding The Subtype Of SQL Values
-** METHOD: sqlite3_value
-**
-** The sqlite3_value_subtype(V) function returns the subtype for
-** an [application-defined SQL function] argument V.  The subtype
-** information can be used to pass a limited amount of context from
-** one SQL function to another.  Use the [sqlite3_result_subtype()]
-** routine to set the subtype for the return value of an SQL function.
-**
-** SQLite makes no use of subtype itself.  It merely passes the subtype
-** from the result of one [application-defined SQL function] into the
-** input of another.
-*/
-SQLITE_API unsigned int SQLITE_STDCALL sqlite3_value_subtype(sqlite3_value*);
-
-/*
-** CAPI3REF: Copy And Free SQL Values
-** METHOD: sqlite3_value
-**
-** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
-** object D and returns a pointer to that copy.  ^The [sqlite3_value] returned
-** is a [protected sqlite3_value] object even if the input is not.
-** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
-** memory allocation fails.
-**
-** ^The sqlite3_value_free(V) interface frees an [sqlite3_value] object
-** previously obtained from [sqlite3_value_dup()].  ^If V is a NULL pointer
-** then sqlite3_value_free(V) is a harmless no-op.
-*/
-SQLITE_API sqlite3_value *SQLITE_STDCALL sqlite3_value_dup(const sqlite3_value*);
-SQLITE_API void SQLITE_STDCALL sqlite3_value_free(sqlite3_value*);
-
-/*
-** CAPI3REF: Obtain Aggregate Function Context
-** METHOD: sqlite3_context
-**
-** Implementations of aggregate SQL functions use this
-** routine to allocate memory for storing their state.
-**
-** ^The first time the sqlite3_aggregate_context(C,N) routine is called 
-** for a particular aggregate function, SQLite
-** allocates N of memory, zeroes out that memory, and returns a pointer
-** to the new memory. ^On second and subsequent calls to
-** sqlite3_aggregate_context() for the same aggregate function instance,
-** the same buffer is returned.  Sqlite3_aggregate_context() is normally
-** called once for each invocation of the xStep callback and then one
-** last time when the xFinal callback is invoked.  ^(When no rows match
-** an aggregate query, the xStep() callback of the aggregate function
-** implementation is never called and xFinal() is called exactly once.
-** In those cases, sqlite3_aggregate_context() might be called for the
-** first time from within xFinal().)^
-**
-** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer 
-** when first called if N is less than or equal to zero or if a memory
-** allocate error occurs.
-**
-** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
-** determined by the N parameter on first successful call.  Changing the
-** value of N in subsequent call to sqlite3_aggregate_context() within
-** the same aggregate function instance will not resize the memory
-** allocation.)^  Within the xFinal callback, it is customary to set
-** N=0 in calls to sqlite3_aggregate_context(C,N) so that no 
-** pointless memory allocations occur.
-**
-** ^SQLite automatically frees the memory allocated by 
-** sqlite3_aggregate_context() when the aggregate query concludes.
-**
-** The first parameter must be a copy of the
-** [sqlite3_context | SQL function context] that is the first parameter
-** to the xStep or xFinal callback routine that implements the aggregate
-** function.
-**
-** This routine must be called from the same thread in which
-** the aggregate SQL function is running.
-*/
-SQLITE_API void *SQLITE_STDCALL sqlite3_aggregate_context(sqlite3_context*, int nBytes);
-
-/*
-** CAPI3REF: User Data For Functions
-** METHOD: sqlite3_context
-**
-** ^The sqlite3_user_data() interface returns a copy of
-** the pointer that was the pUserData parameter (the 5th parameter)
-** of the [sqlite3_create_function()]
-** and [sqlite3_create_function16()] routines that originally
-** registered the application defined function.
-**
-** This routine must be called from the same thread in which
-** the application-defined function is running.
-*/
-SQLITE_API void *SQLITE_STDCALL sqlite3_user_data(sqlite3_context*);
-
-/*
-** CAPI3REF: Database Connection For Functions
-** METHOD: sqlite3_context
-**
-** ^The sqlite3_context_db_handle() interface returns a copy of
-** the pointer to the [database connection] (the 1st parameter)
-** of the [sqlite3_create_function()]
-** and [sqlite3_create_function16()] routines that originally
-** registered the application defined function.
-*/
-SQLITE_API sqlite3 *SQLITE_STDCALL sqlite3_context_db_handle(sqlite3_context*);
-
-/*
-** CAPI3REF: Function Auxiliary Data
-** METHOD: sqlite3_context
-**
-** These functions may be used by (non-aggregate) SQL functions to
-** associate metadata with argument values. If the same value is passed to
-** multiple invocations of the same SQL function during query execution, under
-** some circumstances the associated metadata may be preserved.  An example
-** of where this might be useful is in a regular-expression matching
-** function. The compiled version of the regular expression can be stored as
-** metadata associated with the pattern string.  
-** Then as long as the pattern string remains the same,
-** the compiled regular expression can be reused on multiple
-** invocations of the same function.
-**
-** ^The sqlite3_get_auxdata() interface returns a pointer to the metadata
-** associated by the sqlite3_set_auxdata() function with the Nth argument
-** value to the application-defined function. ^If there is no metadata
-** associated with the function argument, this sqlite3_get_auxdata() interface
-** returns a NULL pointer.
-**
-** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th
-** argument of the application-defined function.  ^Subsequent
-** calls to sqlite3_get_auxdata(C,N) return P from the most recent
-** sqlite3_set_auxdata(C,N,P,X) call if the metadata is still valid or
-** NULL if the metadata has been discarded.
-** ^After each call to sqlite3_set_auxdata(C,N,P,X) where X is not NULL,
-** SQLite will invoke the destructor function X with parameter P exactly
-** once, when the metadata is discarded.
-** SQLite is free to discard the metadata at any time, including: <ul>
-** <li> when the corresponding function parameter changes, or
-** <li> when [sqlite3_reset()] or [sqlite3_finalize()] is called for the
-**      SQL statement, or
-** <li> when sqlite3_set_auxdata() is invoked again on the same parameter, or
-** <li> during the original sqlite3_set_auxdata() call when a memory 
-**      allocation error occurs. </ul>)^
-**
-** Note the last bullet in particular.  The destructor X in 
-** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the
-** sqlite3_set_auxdata() interface even returns.  Hence sqlite3_set_auxdata()
-** should be called near the end of the function implementation and the
-** function implementation should not make any use of P after
-** sqlite3_set_auxdata() has been called.
-**
-** ^(In practice, metadata is preserved between function calls for
-** function parameters that are compile-time constants, including literal
-** values and [parameters] and expressions composed from the same.)^
-**
-** These routines must be called from the same thread in which
-** the SQL function is running.
-*/
-SQLITE_API void *SQLITE_STDCALL sqlite3_get_auxdata(sqlite3_context*, int N);
-SQLITE_API void SQLITE_STDCALL sqlite3_set_auxdata(sqlite3_context*, int N, void*, void (*)(void*));
-
-
-/*
-** CAPI3REF: Constants Defining Special Destructor Behavior
-**
-** These are special values for the destructor that is passed in as the
-** final argument to routines like [sqlite3_result_blob()].  ^If the destructor
-** argument is SQLITE_STATIC, it means that the content pointer is constant
-** and will never change.  It does not need to be destroyed.  ^The
-** SQLITE_TRANSIENT value means that the content will likely change in
-** the near future and that SQLite should make its own private copy of
-** the content before returning.
-**
-** The typedef is necessary to work around problems in certain
-** C++ compilers.
-*/
-typedef void (*sqlite3_destructor_type)(void*);
-#define SQLITE_STATIC      ((sqlite3_destructor_type)0)
-#define SQLITE_TRANSIENT   ((sqlite3_destructor_type)-1)
-
-/*
-** CAPI3REF: Setting The Result Of An SQL Function
-** METHOD: sqlite3_context
-**
-** These routines are used by the xFunc or xFinal callbacks that
-** implement SQL functions and aggregates.  See
-** [sqlite3_create_function()] and [sqlite3_create_function16()]
-** for additional information.
-**
-** These functions work very much like the [parameter binding] family of
-** functions used to bind values to host parameters in prepared statements.
-** Refer to the [SQL parameter] documentation for additional information.
-**
-** ^The sqlite3_result_blob() interface sets the result from
-** an application-defined function to be the BLOB whose content is pointed
-** to by the second parameter and which is N bytes long where N is the
-** third parameter.
-**
-** ^The sqlite3_result_zeroblob(C,N) and sqlite3_result_zeroblob64(C,N)
-** interfaces set the result of the application-defined function to be
-** a BLOB containing all zero bytes and N bytes in size.
-**
-** ^The sqlite3_result_double() interface sets the result from
-** an application-defined function to be a floating point value specified
-** by its 2nd argument.
-**
-** ^The sqlite3_result_error() and sqlite3_result_error16() functions
-** cause the implemented SQL function to throw an exception.
-** ^SQLite uses the string pointed to by the
-** 2nd parameter of sqlite3_result_error() or sqlite3_result_error16()
-** as the text of an error message.  ^SQLite interprets the error
-** message string from sqlite3_result_error() as UTF-8. ^SQLite
-** interprets the string from sqlite3_result_error16() as UTF-16 in native
-** byte order.  ^If the third parameter to sqlite3_result_error()
-** or sqlite3_result_error16() is negative then SQLite takes as the error
-** message all text up through the first zero character.
-** ^If the third parameter to sqlite3_result_error() or
-** sqlite3_result_error16() is non-negative then SQLite takes that many
-** bytes (not characters) from the 2nd parameter as the error message.
-** ^The sqlite3_result_error() and sqlite3_result_error16()
-** routines make a private copy of the error message text before
-** they return.  Hence, the calling function can deallocate or
-** modify the text after they return without harm.
-** ^The sqlite3_result_error_code() function changes the error code
-** returned by SQLite as a result of an error in a function.  ^By default,
-** the error code is SQLITE_ERROR.  ^A subsequent call to sqlite3_result_error()
-** or sqlite3_result_error16() resets the error code to SQLITE_ERROR.
-**
-** ^The sqlite3_result_error_toobig() interface causes SQLite to throw an
-** error indicating that a string or BLOB is too long to represent.
-**
-** ^The sqlite3_result_error_nomem() interface causes SQLite to throw an
-** error indicating that a memory allocation failed.
-**
-** ^The sqlite3_result_int() interface sets the return value
-** of the application-defined function to be the 32-bit signed integer
-** value given in the 2nd argument.
-** ^The sqlite3_result_int64() interface sets the return value
-** of the application-defined function to be the 64-bit signed integer
-** value given in the 2nd argument.
-**
-** ^The sqlite3_result_null() interface sets the return value
-** of the application-defined function to be NULL.
-**
-** ^The sqlite3_result_text(), sqlite3_result_text16(),
-** sqlite3_result_text16le(), and sqlite3_result_text16be() interfaces
-** set the return value of the application-defined function to be
-** a text string which is represented as UTF-8, UTF-16 native byte order,
-** UTF-16 little endian, or UTF-16 big endian, respectively.
-** ^The sqlite3_result_text64() interface sets the return value of an
-** application-defined function to be a text string in an encoding
-** specified by the fifth (and last) parameter, which must be one
-** of [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE].
-** ^SQLite takes the text result from the application from
-** the 2nd parameter of the sqlite3_result_text* interfaces.
-** ^If the 3rd parameter to the sqlite3_result_text* interfaces
-** is negative, then SQLite takes result text from the 2nd parameter
-** through the first zero character.
-** ^If the 3rd parameter to the sqlite3_result_text* interfaces
-** is non-negative, then as many bytes (not characters) of the text
-** pointed to by the 2nd parameter are taken as the application-defined
-** function result.  If the 3rd parameter is non-negative, then it
-** must be the byte offset into the string where the NUL terminator would
-** appear if the string where NUL terminated.  If any NUL characters occur
-** in the string at a byte offset that is less than the value of the 3rd
-** parameter, then the resulting string will contain embedded NULs and the
-** result of expressions operating on strings with embedded NULs is undefined.
-** ^If the 4th parameter to the sqlite3_result_text* interfaces
-** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
-** function as the destructor on the text or BLOB result when it has
-** finished using that result.
-** ^If the 4th parameter to the sqlite3_result_text* interfaces or to
-** sqlite3_result_blob is the special constant SQLITE_STATIC, then SQLite
-** assumes that the text or BLOB result is in constant space and does not
-** copy the content of the parameter nor call a destructor on the content
-** when it has finished using that result.
-** ^If the 4th parameter to the sqlite3_result_text* interfaces
-** or sqlite3_result_blob is the special constant SQLITE_TRANSIENT
-** then SQLite makes a copy of the result into space obtained from
-** from [sqlite3_malloc()] before it returns.
-**
-** ^The sqlite3_result_value() interface sets the result of
-** the application-defined function to be a copy of the
-** [unprotected sqlite3_value] object specified by the 2nd parameter.  ^The
-** sqlite3_result_value() interface makes a copy of the [sqlite3_value]
-** so that the [sqlite3_value] specified in the parameter may change or
-** be deallocated after sqlite3_result_value() returns without harm.
-** ^A [protected sqlite3_value] object may always be used where an
-** [unprotected sqlite3_value] object is required, so either
-** kind of [sqlite3_value] object can be used with this interface.
-**
-** If these routines are called from within the different thread
-** than the one containing the application-defined function that received
-** the [sqlite3_context] pointer, the results are undefined.
-*/
-SQLITE_API void SQLITE_STDCALL sqlite3_result_blob(sqlite3_context*, const void*, int, void(*)(void*));
-SQLITE_API void SQLITE_STDCALL sqlite3_result_blob64(sqlite3_context*,const void*,
-                           sqlite3_uint64,void(*)(void*));
-SQLITE_API void SQLITE_STDCALL sqlite3_result_double(sqlite3_context*, double);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_error(sqlite3_context*, const char*, int);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_error16(sqlite3_context*, const void*, int);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_error_toobig(sqlite3_context*);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_error_nomem(sqlite3_context*);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_error_code(sqlite3_context*, int);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_int(sqlite3_context*, int);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_int64(sqlite3_context*, sqlite3_int64);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_null(sqlite3_context*);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_text(sqlite3_context*, const char*, int, void(*)(void*));
-SQLITE_API void SQLITE_STDCALL sqlite3_result_text64(sqlite3_context*, const char*,sqlite3_uint64,
-                           void(*)(void*), unsigned char encoding);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_text16(sqlite3_context*, const void*, int, void(*)(void*));
-SQLITE_API void SQLITE_STDCALL sqlite3_result_text16le(sqlite3_context*, const void*, int,void(*)(void*));
-SQLITE_API void SQLITE_STDCALL sqlite3_result_text16be(sqlite3_context*, const void*, int,void(*)(void*));
-SQLITE_API void SQLITE_STDCALL sqlite3_result_value(sqlite3_context*, sqlite3_value*);
-SQLITE_API void SQLITE_STDCALL sqlite3_result_zeroblob(sqlite3_context*, int n);
-SQLITE_API int SQLITE_STDCALL sqlite3_result_zeroblob64(sqlite3_context*, sqlite3_uint64 n);
-
-
-/*
-** CAPI3REF: Setting The Subtype Of An SQL Function
-** METHOD: sqlite3_context
-**
-** The sqlite3_result_subtype(C,T) function causes the subtype of
-** the result from the [application-defined SQL function] with 
-** [sqlite3_context] C to be the value T.  Only the lower 8 bits 
-** of the subtype T are preserved in current versions of SQLite;
-** higher order bits are discarded.
-** The number of subtype bytes preserved by SQLite might increase
-** in future releases of SQLite.
-*/
-SQLITE_API void SQLITE_STDCALL sqlite3_result_subtype(sqlite3_context*,unsigned int);
-
-/*
-** CAPI3REF: Define New Collating Sequences
-** METHOD: sqlite3
-**
-** ^These functions add, remove, or modify a [collation] associated
-** with the [database connection] specified as the first argument.
-**
-** ^The name of the collation is a UTF-8 string
-** for sqlite3_create_collation() and sqlite3_create_collation_v2()
-** and a UTF-16 string in native byte order for sqlite3_create_collation16().
-** ^Collation names that compare equal according to [sqlite3_strnicmp()] are
-** considered to be the same name.
-**
-** ^(The third argument (eTextRep) must be one of the constants:
-** <ul>
-** <li> [SQLITE_UTF8],
-** <li> [SQLITE_UTF16LE],
-** <li> [SQLITE_UTF16BE],
-** <li> [SQLITE_UTF16], or
-** <li> [SQLITE_UTF16_ALIGNED].
-** </ul>)^
-** ^The eTextRep argument determines the encoding of strings passed
-** to the collating function callback, xCallback.
-** ^The [SQLITE_UTF16] and [SQLITE_UTF16_ALIGNED] values for eTextRep
-** force strings to be UTF16 with native byte order.
-** ^The [SQLITE_UTF16_ALIGNED] value for eTextRep forces strings to begin
-** on an even byte address.
-**
-** ^The fourth argument, pArg, is an application data pointer that is passed
-** through as the first argument to the collating function callback.
-**
-** ^The fifth argument, xCallback, is a pointer to the collating function.
-** ^Multiple collating functions can be registered using the same name but
-** with different eTextRep parameters and SQLite will use whichever
-** function requires the least amount of data transformation.
-** ^If the xCallback argument is NULL then the collating function is
-** deleted.  ^When all collating functions having the same name are deleted,
-** that collation is no longer usable.
-**
-** ^The collating function callback is invoked with a copy of the pArg 
-** application data pointer and with two strings in the encoding specified
-** by the eTextRep argument.  The collating function must return an
-** integer that is negative, zero, or positive
-** if the first string is less than, equal to, or greater than the second,
-** respectively.  A collating function must always return the same answer
-** given the same inputs.  If two or more collating functions are registered
-** to the same collation name (using different eTextRep values) then all
-** must give an equivalent answer when invoked with equivalent strings.
-** The collating function must obey the following properties for all
-** strings A, B, and C:
-**
-** <ol>
-** <li> If A==B then B==A.
-** <li> If A==B and B==C then A==C.
-** <li> If A&lt;B THEN B&gt;A.
-** <li> If A&lt;B and B&lt;C then A&lt;C.
-** </ol>
-**
-** If a collating function fails any of the above constraints and that
-** collating function is  registered and used, then the behavior of SQLite
-** is undefined.
-**
-** ^The sqlite3_create_collation_v2() works like sqlite3_create_collation()
-** with the addition that the xDestroy callback is invoked on pArg when
-** the collating function is deleted.
-** ^Collating functions are deleted when they are overridden by later
-** calls to the collation creation functions or when the
-** [database connection] is closed using [sqlite3_close()].
-**
-** ^The xDestroy callback is <u>not</u> called if the 
-** sqlite3_create_collation_v2() function fails.  Applications that invoke
-** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should 
-** check the return code and dispose of the application data pointer
-** themselves rather than expecting SQLite to deal with it for them.
-** This is different from every other SQLite interface.  The inconsistency 
-** is unfortunate but cannot be changed without breaking backwards 
-** compatibility.
-**
-** See also:  [sqlite3_collation_needed()] and [sqlite3_collation_needed16()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_create_collation(
-  sqlite3*, 
-  const char *zName, 
-  int eTextRep, 
-  void *pArg,
-  int(*xCompare)(void*,int,const void*,int,const void*)
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_create_collation_v2(
-  sqlite3*, 
-  const char *zName, 
-  int eTextRep, 
-  void *pArg,
-  int(*xCompare)(void*,int,const void*,int,const void*),
-  void(*xDestroy)(void*)
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_create_collation16(
-  sqlite3*, 
-  const void *zName,
-  int eTextRep, 
-  void *pArg,
-  int(*xCompare)(void*,int,const void*,int,const void*)
-);
-
-/*
-** CAPI3REF: Collation Needed Callbacks
-** METHOD: sqlite3
-**
-** ^To avoid having to register all collation sequences before a database
-** can be used, a single callback function may be registered with the
-** [database connection] to be invoked whenever an undefined collation
-** sequence is required.
-**
-** ^If the function is registered using the sqlite3_collation_needed() API,
-** then it is passed the names of undefined collation sequences as strings
-** encoded in UTF-8. ^If sqlite3_collation_needed16() is used,
-** the names are passed as UTF-16 in machine native byte order.
-** ^A call to either function replaces the existing collation-needed callback.
-**
-** ^(When the callback is invoked, the first argument passed is a copy
-** of the second argument to sqlite3_collation_needed() or
-** sqlite3_collation_needed16().  The second argument is the database
-** connection.  The third argument is one of [SQLITE_UTF8], [SQLITE_UTF16BE],
-** or [SQLITE_UTF16LE], indicating the most desirable form of the collation
-** sequence function required.  The fourth parameter is the name of the
-** required collation sequence.)^
-**
-** The callback function should register the desired collation using
-** [sqlite3_create_collation()], [sqlite3_create_collation16()], or
-** [sqlite3_create_collation_v2()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_collation_needed(
-  sqlite3*, 
-  void*, 
-  void(*)(void*,sqlite3*,int eTextRep,const char*)
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_collation_needed16(
-  sqlite3*, 
-  void*,
-  void(*)(void*,sqlite3*,int eTextRep,const void*)
-);
-
-#ifdef SQLITE_HAS_CODEC
-/*
-** Specify the key for an encrypted database.  This routine should be
-** called right after sqlite3_open().
-**
-** The code to implement this API is not available in the public release
-** of SQLite.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_key(
-  sqlite3 *db,                   /* Database to be rekeyed */
-  const void *pKey, int nKey     /* The key */
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_key_v2(
-  sqlite3 *db,                   /* Database to be rekeyed */
-  const char *zDbName,           /* Name of the database */
-  const void *pKey, int nKey     /* The key */
-);
-
-/*
-** Change the key on an open database.  If the current database is not
-** encrypted, this routine will encrypt it.  If pNew==0 or nNew==0, the
-** database is decrypted.
-**
-** The code to implement this API is not available in the public release
-** of SQLite.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_rekey(
-  sqlite3 *db,                   /* Database to be rekeyed */
-  const void *pKey, int nKey     /* The new key */
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_rekey_v2(
-  sqlite3 *db,                   /* Database to be rekeyed */
-  const char *zDbName,           /* Name of the database */
-  const void *pKey, int nKey     /* The new key */
-);
-
-/*
-** Specify the activation key for a SEE database.  Unless 
-** activated, none of the SEE routines will work.
-*/
-SQLITE_API void SQLITE_STDCALL sqlite3_activate_see(
-  const char *zPassPhrase        /* Activation phrase */
-);
-#endif
-
-#ifdef SQLITE_ENABLE_CEROD
-/*
-** Specify the activation key for a CEROD database.  Unless 
-** activated, none of the CEROD routines will work.
-*/
-SQLITE_API void SQLITE_STDCALL sqlite3_activate_cerod(
-  const char *zPassPhrase        /* Activation phrase */
-);
-#endif
-
-/*
-** CAPI3REF: Suspend Execution For A Short Time
-**
-** The sqlite3_sleep() function causes the current thread to suspend execution
-** for at least a number of milliseconds specified in its parameter.
-**
-** If the operating system does not support sleep requests with
-** millisecond time resolution, then the time will be rounded up to
-** the nearest second. The number of milliseconds of sleep actually
-** requested from the operating system is returned.
-**
-** ^SQLite implements this interface by calling the xSleep()
-** method of the default [sqlite3_vfs] object.  If the xSleep() method
-** of the default VFS is not implemented correctly, or not implemented at
-** all, then the behavior of sqlite3_sleep() may deviate from the description
-** in the previous paragraphs.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_sleep(int);
-
-/*
-** CAPI3REF: Name Of The Folder Holding Temporary Files
-**
-** ^(If this global variable is made to point to a string which is
-** the name of a folder (a.k.a. directory), then all temporary files
-** created by SQLite when using a built-in [sqlite3_vfs | VFS]
-** will be placed in that directory.)^  ^If this variable
-** is a NULL pointer, then SQLite performs a search for an appropriate
-** temporary file directory.
-**
-** Applications are strongly discouraged from using this global variable.
-** It is required to set a temporary folder on Windows Runtime (WinRT).
-** But for all other platforms, it is highly recommended that applications
-** neither read nor write this variable.  This global variable is a relic
-** that exists for backwards compatibility of legacy applications and should
-** be avoided in new projects.
-**
-** It is not safe to read or modify this variable in more than one
-** thread at a time.  It is not safe to read or modify this variable
-** if a [database connection] is being used at the same time in a separate
-** thread.
-** It is intended that this variable be set once
-** as part of process initialization and before any SQLite interface
-** routines have been called and that this variable remain unchanged
-** thereafter.
-**
-** ^The [temp_store_directory pragma] may modify this variable and cause
-** it to point to memory obtained from [sqlite3_malloc].  ^Furthermore,
-** the [temp_store_directory pragma] always assumes that any string
-** that this variable points to is held in memory obtained from 
-** [sqlite3_malloc] and the pragma may attempt to free that memory
-** using [sqlite3_free].
-** Hence, if this variable is modified directly, either it should be
-** made NULL or made to point to memory obtained from [sqlite3_malloc]
-** or else the use of the [temp_store_directory pragma] should be avoided.
-** Except when requested by the [temp_store_directory pragma], SQLite
-** does not free the memory that sqlite3_temp_directory points to.  If
-** the application wants that memory to be freed, it must do
-** so itself, taking care to only do so after all [database connection]
-** objects have been destroyed.
-**
-** <b>Note to Windows Runtime users:</b>  The temporary directory must be set
-** prior to calling [sqlite3_open] or [sqlite3_open_v2].  Otherwise, various
-** features that require the use of temporary files may fail.  Here is an
-** example of how to do this using C++ with the Windows Runtime:
-**
-** <blockquote><pre>
-** LPCWSTR zPath = Windows::Storage::ApplicationData::Current->
-** &nbsp;     TemporaryFolder->Path->Data();
-** char zPathBuf&#91;MAX_PATH + 1&#93;;
-** memset(zPathBuf, 0, sizeof(zPathBuf));
-** WideCharToMultiByte(CP_UTF8, 0, zPath, -1, zPathBuf, sizeof(zPathBuf),
-** &nbsp;     NULL, NULL);
-** sqlite3_temp_directory = sqlite3_mprintf("%s", zPathBuf);
-** </pre></blockquote>
-*/
-SQLITE_API SQLITE_EXTERN char *sqlite3_temp_directory;
-
-/*
-** CAPI3REF: Name Of The Folder Holding Database Files
-**
-** ^(If this global variable is made to point to a string which is
-** the name of a folder (a.k.a. directory), then all database files
-** specified with a relative pathname and created or accessed by
-** SQLite when using a built-in windows [sqlite3_vfs | VFS] will be assumed
-** to be relative to that directory.)^ ^If this variable is a NULL
-** pointer, then SQLite assumes that all database files specified
-** with a relative pathname are relative to the current directory
-** for the process.  Only the windows VFS makes use of this global
-** variable; it is ignored by the unix VFS.
-**
-** Changing the value of this variable while a database connection is
-** open can result in a corrupt database.
-**
-** It is not safe to read or modify this variable in more than one
-** thread at a time.  It is not safe to read or modify this variable
-** if a [database connection] is being used at the same time in a separate
-** thread.
-** It is intended that this variable be set once
-** as part of process initialization and before any SQLite interface
-** routines have been called and that this variable remain unchanged
-** thereafter.
-**
-** ^The [data_store_directory pragma] may modify this variable and cause
-** it to point to memory obtained from [sqlite3_malloc].  ^Furthermore,
-** the [data_store_directory pragma] always assumes that any string
-** that this variable points to is held in memory obtained from 
-** [sqlite3_malloc] and the pragma may attempt to free that memory
-** using [sqlite3_free].
-** Hence, if this variable is modified directly, either it should be
-** made NULL or made to point to memory obtained from [sqlite3_malloc]
-** or else the use of the [data_store_directory pragma] should be avoided.
-*/
-SQLITE_API SQLITE_EXTERN char *sqlite3_data_directory;
-
-/*
-** CAPI3REF: Test For Auto-Commit Mode
-** KEYWORDS: {autocommit mode}
-** METHOD: sqlite3
-**
-** ^The sqlite3_get_autocommit() interface returns non-zero or
-** zero if the given database connection is or is not in autocommit mode,
-** respectively.  ^Autocommit mode is on by default.
-** ^Autocommit mode is disabled by a [BEGIN] statement.
-** ^Autocommit mode is re-enabled by a [COMMIT] or [ROLLBACK].
-**
-** If certain kinds of errors occur on a statement within a multi-statement
-** transaction (errors including [SQLITE_FULL], [SQLITE_IOERR],
-** [SQLITE_NOMEM], [SQLITE_BUSY], and [SQLITE_INTERRUPT]) then the
-** transaction might be rolled back automatically.  The only way to
-** find out whether SQLite automatically rolled back the transaction after
-** an error is to use this function.
-**
-** If another thread changes the autocommit status of the database
-** connection while this routine is running, then the return value
-** is undefined.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_get_autocommit(sqlite3*);
-
-/*
-** CAPI3REF: Find The Database Handle Of A Prepared Statement
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_db_handle interface returns the [database connection] handle
-** to which a [prepared statement] belongs.  ^The [database connection]
-** returned by sqlite3_db_handle is the same [database connection]
-** that was the first argument
-** to the [sqlite3_prepare_v2()] call (or its variants) that was used to
-** create the statement in the first place.
-*/
-SQLITE_API sqlite3 *SQLITE_STDCALL sqlite3_db_handle(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Return The Filename For A Database Connection
-** METHOD: sqlite3
-**
-** ^The sqlite3_db_filename(D,N) interface returns a pointer to a filename
-** associated with database N of connection D.  ^The main database file
-** has the name "main".  If there is no attached database N on the database
-** connection D, or if database N is a temporary or in-memory database, then
-** a NULL pointer is returned.
-**
-** ^The filename returned by this function is the output of the
-** xFullPathname method of the [VFS].  ^In other words, the filename
-** will be an absolute pathname, even if the filename used
-** to open the database originally was a URI or relative pathname.
-*/
-SQLITE_API const char *SQLITE_STDCALL sqlite3_db_filename(sqlite3 *db, const char *zDbName);
-
-/*
-** CAPI3REF: Determine if a database is read-only
-** METHOD: sqlite3
-**
-** ^The sqlite3_db_readonly(D,N) interface returns 1 if the database N
-** of connection D is read-only, 0 if it is read/write, or -1 if N is not
-** the name of a database on connection D.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_db_readonly(sqlite3 *db, const char *zDbName);
-
-/*
-** CAPI3REF: Find the next prepared statement
-** METHOD: sqlite3
-**
-** ^This interface returns a pointer to the next [prepared statement] after
-** pStmt associated with the [database connection] pDb.  ^If pStmt is NULL
-** then this interface returns a pointer to the first prepared statement
-** associated with the database connection pDb.  ^If no prepared statement
-** satisfies the conditions of this routine, it returns NULL.
-**
-** The [database connection] pointer D in a call to
-** [sqlite3_next_stmt(D,S)] must refer to an open database
-** connection and in particular must not be a NULL pointer.
-*/
-SQLITE_API sqlite3_stmt *SQLITE_STDCALL sqlite3_next_stmt(sqlite3 *pDb, sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Commit And Rollback Notification Callbacks
-** METHOD: sqlite3
-**
-** ^The sqlite3_commit_hook() interface registers a callback
-** function to be invoked whenever a transaction is [COMMIT | committed].
-** ^Any callback set by a previous call to sqlite3_commit_hook()
-** for the same database connection is overridden.
-** ^The sqlite3_rollback_hook() interface registers a callback
-** function to be invoked whenever a transaction is [ROLLBACK | rolled back].
-** ^Any callback set by a previous call to sqlite3_rollback_hook()
-** for the same database connection is overridden.
-** ^The pArg argument is passed through to the callback.
-** ^If the callback on a commit hook function returns non-zero,
-** then the commit is converted into a rollback.
-**
-** ^The sqlite3_commit_hook(D,C,P) and sqlite3_rollback_hook(D,C,P) functions
-** return the P argument from the previous call of the same function
-** on the same [database connection] D, or NULL for
-** the first call for each function on D.
-**
-** The commit and rollback hook callbacks are not reentrant.
-** The callback implementation must not do anything that will modify
-** the database connection that invoked the callback.  Any actions
-** to modify the database connection must be deferred until after the
-** completion of the [sqlite3_step()] call that triggered the commit
-** or rollback hook in the first place.
-** Note that running any other SQL statements, including SELECT statements,
-** or merely calling [sqlite3_prepare_v2()] and [sqlite3_step()] will modify
-** the database connections for the meaning of "modify" in this paragraph.
-**
-** ^Registering a NULL function disables the callback.
-**
-** ^When the commit hook callback routine returns zero, the [COMMIT]
-** operation is allowed to continue normally.  ^If the commit hook
-** returns non-zero, then the [COMMIT] is converted into a [ROLLBACK].
-** ^The rollback hook is invoked on a rollback that results from a commit
-** hook returning non-zero, just as it would be with any other rollback.
-**
-** ^For the purposes of this API, a transaction is said to have been
-** rolled back if an explicit "ROLLBACK" statement is executed, or
-** an error or constraint causes an implicit rollback to occur.
-** ^The rollback callback is not invoked if a transaction is
-** automatically rolled back because the database connection is closed.
-**
-** See also the [sqlite3_update_hook()] interface.
-*/
-SQLITE_API void *SQLITE_STDCALL sqlite3_commit_hook(sqlite3*, int(*)(void*), void*);
-SQLITE_API void *SQLITE_STDCALL sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
-
-/*
-** CAPI3REF: Data Change Notification Callbacks
-** METHOD: sqlite3
-**
-** ^The sqlite3_update_hook() interface registers a callback function
-** with the [database connection] identified by the first argument
-** to be invoked whenever a row is updated, inserted or deleted in
-** a rowid table.
-** ^Any callback set by a previous call to this function
-** for the same database connection is overridden.
-**
-** ^The second argument is a pointer to the function to invoke when a
-** row is updated, inserted or deleted in a rowid table.
-** ^The first argument to the callback is a copy of the third argument
-** to sqlite3_update_hook().
-** ^The second callback argument is one of [SQLITE_INSERT], [SQLITE_DELETE],
-** or [SQLITE_UPDATE], depending on the operation that caused the callback
-** to be invoked.
-** ^The third and fourth arguments to the callback contain pointers to the
-** database and table name containing the affected row.
-** ^The final callback parameter is the [rowid] of the row.
-** ^In the case of an update, this is the [rowid] after the update takes place.
-**
-** ^(The update hook is not invoked when internal system tables are
-** modified (i.e. sqlite_master and sqlite_sequence).)^
-** ^The update hook is not invoked when [WITHOUT ROWID] tables are modified.
-**
-** ^In the current implementation, the update hook
-** is not invoked when duplication rows are deleted because of an
-** [ON CONFLICT | ON CONFLICT REPLACE] clause.  ^Nor is the update hook
-** invoked when rows are deleted using the [truncate optimization].
-** The exceptions defined in this paragraph might change in a future
-** release of SQLite.
-**
-** The update hook implementation must not do anything that will modify
-** the database connection that invoked the update hook.  Any actions
-** to modify the database connection must be deferred until after the
-** completion of the [sqlite3_step()] call that triggered the update hook.
-** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
-** database connections for the meaning of "modify" in this paragraph.
-**
-** ^The sqlite3_update_hook(D,C,P) function
-** returns the P argument from the previous call
-** on the same [database connection] D, or NULL for
-** the first call on D.
-**
-** See also the [sqlite3_commit_hook()] and [sqlite3_rollback_hook()]
-** interfaces.
-*/
-SQLITE_API void *SQLITE_STDCALL sqlite3_update_hook(
-  sqlite3*, 
-  void(*)(void *,int ,char const *,char const *,sqlite3_int64),
-  void*
-);
-
-/*
-** CAPI3REF: Enable Or Disable Shared Pager Cache
-**
-** ^(This routine enables or disables the sharing of the database cache
-** and schema data structures between [database connection | connections]
-** to the same database. Sharing is enabled if the argument is true
-** and disabled if the argument is false.)^
-**
-** ^Cache sharing is enabled and disabled for an entire process.
-** This is a change as of SQLite version 3.5.0. In prior versions of SQLite,
-** sharing was enabled or disabled for each thread separately.
-**
-** ^(The cache sharing mode set by this interface effects all subsequent
-** calls to [sqlite3_open()], [sqlite3_open_v2()], and [sqlite3_open16()].
-** Existing database connections continue use the sharing mode
-** that was in effect at the time they were opened.)^
-**
-** ^(This routine returns [SQLITE_OK] if shared cache was enabled or disabled
-** successfully.  An [error code] is returned otherwise.)^
-**
-** ^Shared cache is disabled by default. But this might change in
-** future releases of SQLite.  Applications that care about shared
-** cache setting should set it explicitly.
-**
-** Note: This method is disabled on MacOS X 10.7 and iOS version 5.0
-** and will always return SQLITE_MISUSE. On those systems, 
-** shared cache mode should be enabled per-database connection via 
-** [sqlite3_open_v2()] with [SQLITE_OPEN_SHAREDCACHE].
-**
-** This interface is threadsafe on processors where writing a
-** 32-bit integer is atomic.
-**
-** See Also:  [SQLite Shared-Cache Mode]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_enable_shared_cache(int);
-
-/*
-** CAPI3REF: Attempt To Free Heap Memory
-**
-** ^The sqlite3_release_memory() interface attempts to free N bytes
-** of heap memory by deallocating non-essential memory allocations
-** held by the database library.   Memory used to cache database
-** pages to improve performance is an example of non-essential memory.
-** ^sqlite3_release_memory() returns the number of bytes actually freed,
-** which might be more or less than the amount requested.
-** ^The sqlite3_release_memory() routine is a no-op returning zero
-** if SQLite is not compiled with [SQLITE_ENABLE_MEMORY_MANAGEMENT].
-**
-** See also: [sqlite3_db_release_memory()]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_release_memory(int);
-
-/*
-** CAPI3REF: Free Memory Used By A Database Connection
-** METHOD: sqlite3
-**
-** ^The sqlite3_db_release_memory(D) interface attempts to free as much heap
-** memory as possible from database connection D. Unlike the
-** [sqlite3_release_memory()] interface, this interface is in effect even
-** when the [SQLITE_ENABLE_MEMORY_MANAGEMENT] compile-time option is
-** omitted.
-**
-** See also: [sqlite3_release_memory()]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_db_release_memory(sqlite3*);
-
-/*
-** CAPI3REF: Impose A Limit On Heap Size
-**
-** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
-** soft limit on the amount of heap memory that may be allocated by SQLite.
-** ^SQLite strives to keep heap memory utilization below the soft heap
-** limit by reducing the number of pages held in the page cache
-** as heap memory usages approaches the limit.
-** ^The soft heap limit is "soft" because even though SQLite strives to stay
-** below the limit, it will exceed the limit rather than generate
-** an [SQLITE_NOMEM] error.  In other words, the soft heap limit 
-** is advisory only.
-**
-** ^The return value from sqlite3_soft_heap_limit64() is the size of
-** the soft heap limit prior to the call, or negative in the case of an
-** error.  ^If the argument N is negative
-** then no change is made to the soft heap limit.  Hence, the current
-** size of the soft heap limit can be determined by invoking
-** sqlite3_soft_heap_limit64() with a negative argument.
-**
-** ^If the argument N is zero then the soft heap limit is disabled.
-**
-** ^(The soft heap limit is not enforced in the current implementation
-** if one or more of following conditions are true:
-**
-** <ul>
-** <li> The soft heap limit is set to zero.
-** <li> Memory accounting is disabled using a combination of the
-**      [sqlite3_config]([SQLITE_CONFIG_MEMSTATUS],...) start-time option and
-**      the [SQLITE_DEFAULT_MEMSTATUS] compile-time option.
-** <li> An alternative page cache implementation is specified using
-**      [sqlite3_config]([SQLITE_CONFIG_PCACHE2],...).
-** <li> The page cache allocates from its own memory pool supplied
-**      by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
-**      from the heap.
-** </ul>)^
-**
-** Beginning with SQLite version 3.7.3, the soft heap limit is enforced
-** regardless of whether or not the [SQLITE_ENABLE_MEMORY_MANAGEMENT]
-** compile-time option is invoked.  With [SQLITE_ENABLE_MEMORY_MANAGEMENT],
-** the soft heap limit is enforced on every memory allocation.  Without
-** [SQLITE_ENABLE_MEMORY_MANAGEMENT], the soft heap limit is only enforced
-** when memory is allocated by the page cache.  Testing suggests that because
-** the page cache is the predominate memory user in SQLite, most
-** applications will achieve adequate soft heap limit enforcement without
-** the use of [SQLITE_ENABLE_MEMORY_MANAGEMENT].
-**
-** The circumstances under which SQLite will enforce the soft heap limit may
-** changes in future releases of SQLite.
-*/
-SQLITE_API sqlite3_int64 SQLITE_STDCALL sqlite3_soft_heap_limit64(sqlite3_int64 N);
-
-/*
-** CAPI3REF: Deprecated Soft Heap Limit Interface
-** DEPRECATED
-**
-** This is a deprecated version of the [sqlite3_soft_heap_limit64()]
-** interface.  This routine is provided for historical compatibility
-** only.  All new applications should use the
-** [sqlite3_soft_heap_limit64()] interface rather than this one.
-*/
-SQLITE_API SQLITE_DEPRECATED void SQLITE_STDCALL sqlite3_soft_heap_limit(int N);
-
-
-/*
-** CAPI3REF: Extract Metadata About A Column Of A Table
-** METHOD: sqlite3
-**
-** ^(The sqlite3_table_column_metadata(X,D,T,C,....) routine returns
-** information about column C of table T in database D
-** on [database connection] X.)^  ^The sqlite3_table_column_metadata()
-** interface returns SQLITE_OK and fills in the non-NULL pointers in
-** the final five arguments with appropriate values if the specified
-** column exists.  ^The sqlite3_table_column_metadata() interface returns
-** SQLITE_ERROR and if the specified column does not exist.
-** ^If the column-name parameter to sqlite3_table_column_metadata() is a
-** NULL pointer, then this routine simply checks for the existance of the
-** table and returns SQLITE_OK if the table exists and SQLITE_ERROR if it
-** does not.
-**
-** ^The column is identified by the second, third and fourth parameters to
-** this function. ^(The second parameter is either the name of the database
-** (i.e. "main", "temp", or an attached database) containing the specified
-** table or NULL.)^ ^If it is NULL, then all attached databases are searched
-** for the table using the same algorithm used by the database engine to
-** resolve unqualified table references.
-**
-** ^The third and fourth parameters to this function are the table and column
-** name of the desired column, respectively.
-**
-** ^Metadata is returned by writing to the memory locations passed as the 5th
-** and subsequent parameters to this function. ^Any of these arguments may be
-** NULL, in which case the corresponding element of metadata is omitted.
-**
-** ^(<blockquote>
-** <table border="1">
-** <tr><th> Parameter <th> Output<br>Type <th>  Description
-**
-** <tr><td> 5th <td> const char* <td> Data type
-** <tr><td> 6th <td> const char* <td> Name of default collation sequence
-** <tr><td> 7th <td> int         <td> True if column has a NOT NULL constraint
-** <tr><td> 8th <td> int         <td> True if column is part of the PRIMARY KEY
-** <tr><td> 9th <td> int         <td> True if column is [AUTOINCREMENT]
-** </table>
-** </blockquote>)^
-**
-** ^The memory pointed to by the character pointers returned for the
-** declaration type and collation sequence is valid until the next
-** call to any SQLite API function.
-**
-** ^If the specified table is actually a view, an [error code] is returned.
-**
-** ^If the specified column is "rowid", "oid" or "_rowid_" and the table 
-** is not a [WITHOUT ROWID] table and an
-** [INTEGER PRIMARY KEY] column has been explicitly declared, then the output
-** parameters are set for the explicitly declared column. ^(If there is no
-** [INTEGER PRIMARY KEY] column, then the outputs
-** for the [rowid] are set as follows:
-**
-** <pre>
-**     data type: "INTEGER"
-**     collation sequence: "BINARY"
-**     not null: 0
-**     primary key: 1
-**     auto increment: 0
-** </pre>)^
-**
-** ^This function causes all database schemas to be read from disk and
-** parsed, if that has not already been done, and returns an error if
-** any errors are encountered while loading the schema.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_table_column_metadata(
-  sqlite3 *db,                /* Connection handle */
-  const char *zDbName,        /* Database name or NULL */
-  const char *zTableName,     /* Table name */
-  const char *zColumnName,    /* Column name */
-  char const **pzDataType,    /* OUTPUT: Declared data type */
-  char const **pzCollSeq,     /* OUTPUT: Collation sequence name */
-  int *pNotNull,              /* OUTPUT: True if NOT NULL constraint exists */
-  int *pPrimaryKey,           /* OUTPUT: True if column part of PK */
-  int *pAutoinc               /* OUTPUT: True if column is auto-increment */
-);
-
-/*
-** CAPI3REF: Load An Extension
-** METHOD: sqlite3
-**
-** ^This interface loads an SQLite extension library from the named file.
-**
-** ^The sqlite3_load_extension() interface attempts to load an
-** [SQLite extension] library contained in the file zFile.  If
-** the file cannot be loaded directly, attempts are made to load
-** with various operating-system specific extensions added.
-** So for example, if "samplelib" cannot be loaded, then names like
-** "samplelib.so" or "samplelib.dylib" or "samplelib.dll" might
-** be tried also.
-**
-** ^The entry point is zProc.
-** ^(zProc may be 0, in which case SQLite will try to come up with an
-** entry point name on its own.  It first tries "sqlite3_extension_init".
-** If that does not work, it constructs a name "sqlite3_X_init" where the
-** X is consists of the lower-case equivalent of all ASCII alphabetic
-** characters in the filename from the last "/" to the first following
-** "." and omitting any initial "lib".)^
-** ^The sqlite3_load_extension() interface returns
-** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
-** ^If an error occurs and pzErrMsg is not 0, then the
-** [sqlite3_load_extension()] interface shall attempt to
-** fill *pzErrMsg with error message text stored in memory
-** obtained from [sqlite3_malloc()]. The calling function
-** should free this memory by calling [sqlite3_free()].
-**
-** ^Extension loading must be enabled using
-** [sqlite3_enable_load_extension()] prior to calling this API,
-** otherwise an error will be returned.
-**
-** See also the [load_extension() SQL function].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_load_extension(
-  sqlite3 *db,          /* Load the extension into this database connection */
-  const char *zFile,    /* Name of the shared library containing extension */
-  const char *zProc,    /* Entry point.  Derived from zFile if 0 */
-  char **pzErrMsg       /* Put error message here if not 0 */
-);
-
-/*
-** CAPI3REF: Enable Or Disable Extension Loading
-** METHOD: sqlite3
-**
-** ^So as not to open security holes in older applications that are
-** unprepared to deal with [extension loading], and as a means of disabling
-** [extension loading] while evaluating user-entered SQL, the following API
-** is provided to turn the [sqlite3_load_extension()] mechanism on and off.
-**
-** ^Extension loading is off by default.
-** ^Call the sqlite3_enable_load_extension() routine with onoff==1
-** to turn extension loading on and call it with onoff==0 to turn
-** it back off again.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_enable_load_extension(sqlite3 *db, int onoff);
-
-/*
-** CAPI3REF: Automatically Load Statically Linked Extensions
-**
-** ^This interface causes the xEntryPoint() function to be invoked for
-** each new [database connection] that is created.  The idea here is that
-** xEntryPoint() is the entry point for a statically linked [SQLite extension]
-** that is to be automatically loaded into all new database connections.
-**
-** ^(Even though the function prototype shows that xEntryPoint() takes
-** no arguments and returns void, SQLite invokes xEntryPoint() with three
-** arguments and expects and integer result as if the signature of the
-** entry point where as follows:
-**
-** <blockquote><pre>
-** &nbsp;  int xEntryPoint(
-** &nbsp;    sqlite3 *db,
-** &nbsp;    const char **pzErrMsg,
-** &nbsp;    const struct sqlite3_api_routines *pThunk
-** &nbsp;  );
-** </pre></blockquote>)^
-**
-** If the xEntryPoint routine encounters an error, it should make *pzErrMsg
-** point to an appropriate error message (obtained from [sqlite3_mprintf()])
-** and return an appropriate [error code].  ^SQLite ensures that *pzErrMsg
-** is NULL before calling the xEntryPoint().  ^SQLite will invoke
-** [sqlite3_free()] on *pzErrMsg after xEntryPoint() returns.  ^If any
-** xEntryPoint() returns an error, the [sqlite3_open()], [sqlite3_open16()],
-** or [sqlite3_open_v2()] call that provoked the xEntryPoint() will fail.
-**
-** ^Calling sqlite3_auto_extension(X) with an entry point X that is already
-** on the list of automatic extensions is a harmless no-op. ^No entry point
-** will be called more than once for each database connection that is opened.
-**
-** See also: [sqlite3_reset_auto_extension()]
-** and [sqlite3_cancel_auto_extension()]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_auto_extension(void (*xEntryPoint)(void));
-
-/*
-** CAPI3REF: Cancel Automatic Extension Loading
-**
-** ^The [sqlite3_cancel_auto_extension(X)] interface unregisters the
-** initialization routine X that was registered using a prior call to
-** [sqlite3_auto_extension(X)].  ^The [sqlite3_cancel_auto_extension(X)]
-** routine returns 1 if initialization routine X was successfully 
-** unregistered and it returns 0 if X was not on the list of initialization
-** routines.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_cancel_auto_extension(void (*xEntryPoint)(void));
-
-/*
-** CAPI3REF: Reset Automatic Extension Loading
-**
-** ^This interface disables all automatic extensions previously
-** registered using [sqlite3_auto_extension()].
-*/
-SQLITE_API void SQLITE_STDCALL sqlite3_reset_auto_extension(void);
-
-/*
-** The interface to the virtual-table mechanism is currently considered
-** to be experimental.  The interface might change in incompatible ways.
-** If this is a problem for you, do not use the interface at this time.
-**
-** When the virtual-table mechanism stabilizes, we will declare the
-** interface fixed, support it indefinitely, and remove this comment.
-*/
-
-/*
-** Structures used by the virtual table interface
-*/
-typedef struct sqlite3_vtab sqlite3_vtab;
-typedef struct sqlite3_index_info sqlite3_index_info;
-typedef struct sqlite3_vtab_cursor sqlite3_vtab_cursor;
-typedef struct sqlite3_module sqlite3_module;
-
-/*
-** CAPI3REF: Virtual Table Object
-** KEYWORDS: sqlite3_module {virtual table module}
-**
-** This structure, sometimes called a "virtual table module", 
-** defines the implementation of a [virtual tables].  
-** This structure consists mostly of methods for the module.
-**
-** ^A virtual table module is created by filling in a persistent
-** instance of this structure and passing a pointer to that instance
-** to [sqlite3_create_module()] or [sqlite3_create_module_v2()].
-** ^The registration remains valid until it is replaced by a different
-** module or until the [database connection] closes.  The content
-** of this structure must not change while it is registered with
-** any database connection.
-*/
-struct sqlite3_module {
-  int iVersion;
-  int (*xCreate)(sqlite3*, void *pAux,
-               int argc, const char *const*argv,
-               sqlite3_vtab **ppVTab, char**);
-  int (*xConnect)(sqlite3*, void *pAux,
-               int argc, const char *const*argv,
-               sqlite3_vtab **ppVTab, char**);
-  int (*xBestIndex)(sqlite3_vtab *pVTab, sqlite3_index_info*);
-  int (*xDisconnect)(sqlite3_vtab *pVTab);
-  int (*xDestroy)(sqlite3_vtab *pVTab);
-  int (*xOpen)(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor);
-  int (*xClose)(sqlite3_vtab_cursor*);
-  int (*xFilter)(sqlite3_vtab_cursor*, int idxNum, const char *idxStr,
-                int argc, sqlite3_value **argv);
-  int (*xNext)(sqlite3_vtab_cursor*);
-  int (*xEof)(sqlite3_vtab_cursor*);
-  int (*xColumn)(sqlite3_vtab_cursor*, sqlite3_context*, int);
-  int (*xRowid)(sqlite3_vtab_cursor*, sqlite3_int64 *pRowid);
-  int (*xUpdate)(sqlite3_vtab *, int, sqlite3_value **, sqlite3_int64 *);
-  int (*xBegin)(sqlite3_vtab *pVTab);
-  int (*xSync)(sqlite3_vtab *pVTab);
-  int (*xCommit)(sqlite3_vtab *pVTab);
-  int (*xRollback)(sqlite3_vtab *pVTab);
-  int (*xFindFunction)(sqlite3_vtab *pVtab, int nArg, const char *zName,
-                       void (**pxFunc)(sqlite3_context*,int,sqlite3_value**),
-                       void **ppArg);
-  int (*xRename)(sqlite3_vtab *pVtab, const char *zNew);
-  /* The methods above are in version 1 of the sqlite_module object. Those 
-  ** below are for version 2 and greater. */
-  int (*xSavepoint)(sqlite3_vtab *pVTab, int);
-  int (*xRelease)(sqlite3_vtab *pVTab, int);
-  int (*xRollbackTo)(sqlite3_vtab *pVTab, int);
-};
-
-/*
-** CAPI3REF: Virtual Table Indexing Information
-** KEYWORDS: sqlite3_index_info
-**
-** The sqlite3_index_info structure and its substructures is used as part
-** of the [virtual table] interface to
-** pass information into and receive the reply from the [xBestIndex]
-** method of a [virtual table module].  The fields under **Inputs** are the
-** inputs to xBestIndex and are read-only.  xBestIndex inserts its
-** results into the **Outputs** fields.
-**
-** ^(The aConstraint[] array records WHERE clause constraints of the form:
-**
-** <blockquote>column OP expr</blockquote>
-**
-** where OP is =, &lt;, &lt;=, &gt;, or &gt;=.)^  ^(The particular operator is
-** stored in aConstraint[].op using one of the
-** [SQLITE_INDEX_CONSTRAINT_EQ | SQLITE_INDEX_CONSTRAINT_ values].)^
-** ^(The index of the column is stored in
-** aConstraint[].iColumn.)^  ^(aConstraint[].usable is TRUE if the
-** expr on the right-hand side can be evaluated (and thus the constraint
-** is usable) and false if it cannot.)^
-**
-** ^The optimizer automatically inverts terms of the form "expr OP column"
-** and makes other simplifications to the WHERE clause in an attempt to
-** get as many WHERE clause terms into the form shown above as possible.
-** ^The aConstraint[] array only reports WHERE clause terms that are
-** relevant to the particular virtual table being queried.
-**
-** ^Information about the ORDER BY clause is stored in aOrderBy[].
-** ^Each term of aOrderBy records a column of the ORDER BY clause.
-**
-** The colUsed field indicates which columns of the virtual table may be
-** required by the current scan. Virtual table columns are numbered from
-** zero in the order in which they appear within the CREATE TABLE statement
-** passed to sqlite3_declare_vtab(). For the first 63 columns (columns 0-62),
-** the corresponding bit is set within the colUsed mask if the column may be
-** required by SQLite. If the table has at least 64 columns and any column
-** to the right of the first 63 is required, then bit 63 of colUsed is also
-** set. In other words, column iCol may be required if the expression
-** (colUsed & ((sqlite3_uint64)1 << (iCol>=63 ? 63 : iCol))) evaluates to 
-** non-zero.
-**
-** The [xBestIndex] method must fill aConstraintUsage[] with information
-** about what parameters to pass to xFilter.  ^If argvIndex>0 then
-** the right-hand side of the corresponding aConstraint[] is evaluated
-** and becomes the argvIndex-th entry in argv.  ^(If aConstraintUsage[].omit
-** is true, then the constraint is assumed to be fully handled by the
-** virtual table and is not checked again by SQLite.)^
-**
-** ^The idxNum and idxPtr values are recorded and passed into the
-** [xFilter] method.
-** ^[sqlite3_free()] is used to free idxPtr if and only if
-** needToFreeIdxPtr is true.
-**
-** ^The orderByConsumed means that output from [xFilter]/[xNext] will occur in
-** the correct order to satisfy the ORDER BY clause so that no separate
-** sorting step is required.
-**
-** ^The estimatedCost value is an estimate of the cost of a particular
-** strategy. A cost of N indicates that the cost of the strategy is similar
-** to a linear scan of an SQLite table with N rows. A cost of log(N) 
-** indicates that the expense of the operation is similar to that of a
-** binary search on a unique indexed field of an SQLite table with N rows.
-**
-** ^The estimatedRows value is an estimate of the number of rows that
-** will be returned by the strategy.
-**
-** The xBestIndex method may optionally populate the idxFlags field with a 
-** mask of SQLITE_INDEX_SCAN_* flags. Currently there is only one such flag -
-** SQLITE_INDEX_SCAN_UNIQUE. If the xBestIndex method sets this flag, SQLite
-** assumes that the strategy may visit at most one row. 
-**
-** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
-** SQLite also assumes that if a call to the xUpdate() method is made as
-** part of the same statement to delete or update a virtual table row and the
-** implementation returns SQLITE_CONSTRAINT, then there is no need to rollback
-** any database changes. In other words, if the xUpdate() returns
-** SQLITE_CONSTRAINT, the database contents must be exactly as they were
-** before xUpdate was called. By contrast, if SQLITE_INDEX_SCAN_UNIQUE is not
-** set and xUpdate returns SQLITE_CONSTRAINT, any database changes made by
-** the xUpdate method are automatically rolled back by SQLite.
-**
-** IMPORTANT: The estimatedRows field was added to the sqlite3_index_info
-** structure for SQLite version 3.8.2. If a virtual table extension is
-** used with an SQLite version earlier than 3.8.2, the results of attempting 
-** to read or write the estimatedRows field are undefined (but are likely 
-** to included crashing the application). The estimatedRows field should
-** therefore only be used if [sqlite3_libversion_number()] returns a
-** value greater than or equal to 3008002. Similarly, the idxFlags field
-** was added for version 3.9.0. It may therefore only be used if
-** sqlite3_libversion_number() returns a value greater than or equal to
-** 3009000.
-*/
-struct sqlite3_index_info {
-  /* Inputs */
-  int nConstraint;           /* Number of entries in aConstraint */
-  struct sqlite3_index_constraint {
-     int iColumn;              /* Column constrained.  -1 for ROWID */
-     unsigned char op;         /* Constraint operator */
-     unsigned char usable;     /* True if this constraint is usable */
-     int iTermOffset;          /* Used internally - xBestIndex should ignore */
-  } *aConstraint;            /* Table of WHERE clause constraints */
-  int nOrderBy;              /* Number of terms in the ORDER BY clause */
-  struct sqlite3_index_orderby {
-     int iColumn;              /* Column number */
-     unsigned char desc;       /* True for DESC.  False for ASC. */
-  } *aOrderBy;               /* The ORDER BY clause */
-  /* Outputs */
-  struct sqlite3_index_constraint_usage {
-    int argvIndex;           /* if >0, constraint is part of argv to xFilter */
-    unsigned char omit;      /* Do not code a test for this constraint */
-  } *aConstraintUsage;
-  int idxNum;                /* Number used to identify the index */
-  char *idxStr;              /* String, possibly obtained from sqlite3_malloc */
-  int needToFreeIdxStr;      /* Free idxStr using sqlite3_free() if true */
-  int orderByConsumed;       /* True if output is already ordered */
-  double estimatedCost;           /* Estimated cost of using this index */
-  /* Fields below are only available in SQLite 3.8.2 and later */
-  sqlite3_int64 estimatedRows;    /* Estimated number of rows returned */
-  /* Fields below are only available in SQLite 3.9.0 and later */
-  int idxFlags;              /* Mask of SQLITE_INDEX_SCAN_* flags */
-  /* Fields below are only available in SQLite 3.10.0 and later */
-  sqlite3_uint64 colUsed;    /* Input: Mask of columns used by statement */
-};
-
-/*
-** CAPI3REF: Virtual Table Scan Flags
-*/
-#define SQLITE_INDEX_SCAN_UNIQUE      1     /* Scan visits at most 1 row */
-
-/*
-** CAPI3REF: Virtual Table Constraint Operator Codes
-**
-** These macros defined the allowed values for the
-** [sqlite3_index_info].aConstraint[].op field.  Each value represents
-** an operator that is part of a constraint term in the wHERE clause of
-** a query that uses a [virtual table].
-*/
-#define SQLITE_INDEX_CONSTRAINT_EQ      2
-#define SQLITE_INDEX_CONSTRAINT_GT      4
-#define SQLITE_INDEX_CONSTRAINT_LE      8
-#define SQLITE_INDEX_CONSTRAINT_LT     16
-#define SQLITE_INDEX_CONSTRAINT_GE     32
-#define SQLITE_INDEX_CONSTRAINT_MATCH  64
-#define SQLITE_INDEX_CONSTRAINT_LIKE   65
-#define SQLITE_INDEX_CONSTRAINT_GLOB   66
-#define SQLITE_INDEX_CONSTRAINT_REGEXP 67
-
-/*
-** CAPI3REF: Register A Virtual Table Implementation
-** METHOD: sqlite3
-**
-** ^These routines are used to register a new [virtual table module] name.
-** ^Module names must be registered before
-** creating a new [virtual table] using the module and before using a
-** preexisting [virtual table] for the module.
-**
-** ^The module name is registered on the [database connection] specified
-** by the first parameter.  ^The name of the module is given by the 
-** second parameter.  ^The third parameter is a pointer to
-** the implementation of the [virtual table module].   ^The fourth
-** parameter is an arbitrary client data pointer that is passed through
-** into the [xCreate] and [xConnect] methods of the virtual table module
-** when a new virtual table is be being created or reinitialized.
-**
-** ^The sqlite3_create_module_v2() interface has a fifth parameter which
-** is a pointer to a destructor for the pClientData.  ^SQLite will
-** invoke the destructor function (if it is not NULL) when SQLite
-** no longer needs the pClientData pointer.  ^The destructor will also
-** be invoked if the call to sqlite3_create_module_v2() fails.
-** ^The sqlite3_create_module()
-** interface is equivalent to sqlite3_create_module_v2() with a NULL
-** destructor.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_create_module(
-  sqlite3 *db,               /* SQLite connection to register module with */
-  const char *zName,         /* Name of the module */
-  const sqlite3_module *p,   /* Methods for the module */
-  void *pClientData          /* Client data for xCreate/xConnect */
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_create_module_v2(
-  sqlite3 *db,               /* SQLite connection to register module with */
-  const char *zName,         /* Name of the module */
-  const sqlite3_module *p,   /* Methods for the module */
-  void *pClientData,         /* Client data for xCreate/xConnect */
-  void(*xDestroy)(void*)     /* Module destructor function */
-);
-
-/*
-** CAPI3REF: Virtual Table Instance Object
-** KEYWORDS: sqlite3_vtab
-**
-** Every [virtual table module] implementation uses a subclass
-** of this object to describe a particular instance
-** of the [virtual table].  Each subclass will
-** be tailored to the specific needs of the module implementation.
-** The purpose of this superclass is to define certain fields that are
-** common to all module implementations.
-**
-** ^Virtual tables methods can set an error message by assigning a
-** string obtained from [sqlite3_mprintf()] to zErrMsg.  The method should
-** take care that any prior string is freed by a call to [sqlite3_free()]
-** prior to assigning a new string to zErrMsg.  ^After the error message
-** is delivered up to the client application, the string will be automatically
-** freed by sqlite3_free() and the zErrMsg field will be zeroed.
-*/
-struct sqlite3_vtab {
-  const sqlite3_module *pModule;  /* The module for this virtual table */
-  int nRef;                       /* Number of open cursors */
-  char *zErrMsg;                  /* Error message from sqlite3_mprintf() */
-  /* Virtual table implementations will typically add additional fields */
-};
-
-/*
-** CAPI3REF: Virtual Table Cursor Object
-** KEYWORDS: sqlite3_vtab_cursor {virtual table cursor}
-**
-** Every [virtual table module] implementation uses a subclass of the
-** following structure to describe cursors that point into the
-** [virtual table] and are used
-** to loop through the virtual table.  Cursors are created using the
-** [sqlite3_module.xOpen | xOpen] method of the module and are destroyed
-** by the [sqlite3_module.xClose | xClose] method.  Cursors are used
-** by the [xFilter], [xNext], [xEof], [xColumn], and [xRowid] methods
-** of the module.  Each module implementation will define
-** the content of a cursor structure to suit its own needs.
-**
-** This superclass exists in order to define fields of the cursor that
-** are common to all implementations.
-*/
-struct sqlite3_vtab_cursor {
-  sqlite3_vtab *pVtab;      /* Virtual table of this cursor */
-  /* Virtual table implementations will typically add additional fields */
-};
-
-/*
-** CAPI3REF: Declare The Schema Of A Virtual Table
-**
-** ^The [xCreate] and [xConnect] methods of a
-** [virtual table module] call this interface
-** to declare the format (the names and datatypes of the columns) of
-** the virtual tables they implement.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_declare_vtab(sqlite3*, const char *zSQL);
-
-/*
-** CAPI3REF: Overload A Function For A Virtual Table
-** METHOD: sqlite3
-**
-** ^(Virtual tables can provide alternative implementations of functions
-** using the [xFindFunction] method of the [virtual table module].  
-** But global versions of those functions
-** must exist in order to be overloaded.)^
-**
-** ^(This API makes sure a global version of a function with a particular
-** name and number of parameters exists.  If no such function exists
-** before this API is called, a new function is created.)^  ^The implementation
-** of the new function always causes an exception to be thrown.  So
-** the new function is not good for anything by itself.  Its only
-** purpose is to be a placeholder function that can be overloaded
-** by a [virtual table].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_overload_function(sqlite3*, const char *zFuncName, int nArg);
-
-/*
-** The interface to the virtual-table mechanism defined above (back up
-** to a comment remarkably similar to this one) is currently considered
-** to be experimental.  The interface might change in incompatible ways.
-** If this is a problem for you, do not use the interface at this time.
-**
-** When the virtual-table mechanism stabilizes, we will declare the
-** interface fixed, support it indefinitely, and remove this comment.
-*/
-
-/*
-** CAPI3REF: A Handle To An Open BLOB
-** KEYWORDS: {BLOB handle} {BLOB handles}
-**
-** An instance of this object represents an open BLOB on which
-** [sqlite3_blob_open | incremental BLOB I/O] can be performed.
-** ^Objects of this type are created by [sqlite3_blob_open()]
-** and destroyed by [sqlite3_blob_close()].
-** ^The [sqlite3_blob_read()] and [sqlite3_blob_write()] interfaces
-** can be used to read or write small subsections of the BLOB.
-** ^The [sqlite3_blob_bytes()] interface returns the size of the BLOB in bytes.
-*/
-typedef struct sqlite3_blob sqlite3_blob;
-
-/*
-** CAPI3REF: Open A BLOB For Incremental I/O
-** METHOD: sqlite3
-** CONSTRUCTOR: sqlite3_blob
-**
-** ^(This interfaces opens a [BLOB handle | handle] to the BLOB located
-** in row iRow, column zColumn, table zTable in database zDb;
-** in other words, the same BLOB that would be selected by:
-**
-** <pre>
-**     SELECT zColumn FROM zDb.zTable WHERE [rowid] = iRow;
-** </pre>)^
-**
-** ^(Parameter zDb is not the filename that contains the database, but 
-** rather the symbolic name of the database. For attached databases, this is
-** the name that appears after the AS keyword in the [ATTACH] statement.
-** For the main database file, the database name is "main". For TEMP
-** tables, the database name is "temp".)^
-**
-** ^If the flags parameter is non-zero, then the BLOB is opened for read
-** and write access. ^If the flags parameter is zero, the BLOB is opened for
-** read-only access.
-**
-** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
-** in *ppBlob. Otherwise an [error code] is returned and, unless the error
-** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
-** the API is not misused, it is always safe to call [sqlite3_blob_close()] 
-** on *ppBlob after this function it returns.
-**
-** This function fails with SQLITE_ERROR if any of the following are true:
-** <ul>
-**   <li> ^(Database zDb does not exist)^, 
-**   <li> ^(Table zTable does not exist within database zDb)^, 
-**   <li> ^(Table zTable is a WITHOUT ROWID table)^, 
-**   <li> ^(Column zColumn does not exist)^,
-**   <li> ^(Row iRow is not present in the table)^,
-**   <li> ^(The specified column of row iRow contains a value that is not
-**         a TEXT or BLOB value)^,
-**   <li> ^(Column zColumn is part of an index, PRIMARY KEY or UNIQUE 
-**         constraint and the blob is being opened for read/write access)^,
-**   <li> ^([foreign key constraints | Foreign key constraints] are enabled, 
-**         column zColumn is part of a [child key] definition and the blob is
-**         being opened for read/write access)^.
-** </ul>
-**
-** ^Unless it returns SQLITE_MISUSE, this function sets the 
-** [database connection] error code and message accessible via 
-** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions. 
-**
-**
-** ^(If the row that a BLOB handle points to is modified by an
-** [UPDATE], [DELETE], or by [ON CONFLICT] side-effects
-** then the BLOB handle is marked as "expired".
-** This is true if any column of the row is changed, even a column
-** other than the one the BLOB handle is open on.)^
-** ^Calls to [sqlite3_blob_read()] and [sqlite3_blob_write()] for
-** an expired BLOB handle fail with a return code of [SQLITE_ABORT].
-** ^(Changes written into a BLOB prior to the BLOB expiring are not
-** rolled back by the expiration of the BLOB.  Such changes will eventually
-** commit if the transaction continues to completion.)^
-**
-** ^Use the [sqlite3_blob_bytes()] interface to determine the size of
-** the opened blob.  ^The size of a blob may not be changed by this
-** interface.  Use the [UPDATE] SQL command to change the size of a
-** blob.
-**
-** ^The [sqlite3_bind_zeroblob()] and [sqlite3_result_zeroblob()] interfaces
-** and the built-in [zeroblob] SQL function may be used to create a 
-** zero-filled blob to read or write using the incremental-blob interface.
-**
-** To avoid a resource leak, every open [BLOB handle] should eventually
-** be released by a call to [sqlite3_blob_close()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_blob_open(
-  sqlite3*,
-  const char *zDb,
-  const char *zTable,
-  const char *zColumn,
-  sqlite3_int64 iRow,
-  int flags,
-  sqlite3_blob **ppBlob
-);
-
-/*
-** CAPI3REF: Move a BLOB Handle to a New Row
-** METHOD: sqlite3_blob
-**
-** ^This function is used to move an existing blob handle so that it points
-** to a different row of the same database table. ^The new row is identified
-** by the rowid value passed as the second argument. Only the row can be
-** changed. ^The database, table and column on which the blob handle is open
-** remain the same. Moving an existing blob handle to a new row can be
-** faster than closing the existing handle and opening a new one.
-**
-** ^(The new row must meet the same criteria as for [sqlite3_blob_open()] -
-** it must exist and there must be either a blob or text value stored in
-** the nominated column.)^ ^If the new row is not present in the table, or if
-** it does not contain a blob or text value, or if another error occurs, an
-** SQLite error code is returned and the blob handle is considered aborted.
-** ^All subsequent calls to [sqlite3_blob_read()], [sqlite3_blob_write()] or
-** [sqlite3_blob_reopen()] on an aborted blob handle immediately return
-** SQLITE_ABORT. ^Calling [sqlite3_blob_bytes()] on an aborted blob handle
-** always returns zero.
-**
-** ^This function sets the database handle error code and message.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64);
-
-/*
-** CAPI3REF: Close A BLOB Handle
-** DESTRUCTOR: sqlite3_blob
-**
-** ^This function closes an open [BLOB handle]. ^(The BLOB handle is closed
-** unconditionally.  Even if this routine returns an error code, the 
-** handle is still closed.)^
-**
-** ^If the blob handle being closed was opened for read-write access, and if
-** the database is in auto-commit mode and there are no other open read-write
-** blob handles or active write statements, the current transaction is
-** committed. ^If an error occurs while committing the transaction, an error
-** code is returned and the transaction rolled back.
-**
-** Calling this function with an argument that is not a NULL pointer or an
-** open blob handle results in undefined behaviour. ^Calling this routine 
-** with a null pointer (such as would be returned by a failed call to 
-** [sqlite3_blob_open()]) is a harmless no-op. ^Otherwise, if this function
-** is passed a valid open blob handle, the values returned by the 
-** sqlite3_errcode() and sqlite3_errmsg() functions are set before returning.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_blob_close(sqlite3_blob *);
-
-/*
-** CAPI3REF: Return The Size Of An Open BLOB
-** METHOD: sqlite3_blob
-**
-** ^Returns the size in bytes of the BLOB accessible via the 
-** successfully opened [BLOB handle] in its only argument.  ^The
-** incremental blob I/O routines can only read or overwriting existing
-** blob content; they cannot change the size of a blob.
-**
-** This routine only works on a [BLOB handle] which has been created
-** by a prior successful call to [sqlite3_blob_open()] and which has not
-** been closed by [sqlite3_blob_close()].  Passing any other pointer in
-** to this routine results in undefined and probably undesirable behavior.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_blob_bytes(sqlite3_blob *);
-
-/*
-** CAPI3REF: Read Data From A BLOB Incrementally
-** METHOD: sqlite3_blob
-**
-** ^(This function is used to read data from an open [BLOB handle] into a
-** caller-supplied buffer. N bytes of data are copied into buffer Z
-** from the open BLOB, starting at offset iOffset.)^
-**
-** ^If offset iOffset is less than N bytes from the end of the BLOB,
-** [SQLITE_ERROR] is returned and no data is read.  ^If N or iOffset is
-** less than zero, [SQLITE_ERROR] is returned and no data is read.
-** ^The size of the blob (and hence the maximum value of N+iOffset)
-** can be determined using the [sqlite3_blob_bytes()] interface.
-**
-** ^An attempt to read from an expired [BLOB handle] fails with an
-** error code of [SQLITE_ABORT].
-**
-** ^(On success, sqlite3_blob_read() returns SQLITE_OK.
-** Otherwise, an [error code] or an [extended error code] is returned.)^
-**
-** This routine only works on a [BLOB handle] which has been created
-** by a prior successful call to [sqlite3_blob_open()] and which has not
-** been closed by [sqlite3_blob_close()].  Passing any other pointer in
-** to this routine results in undefined and probably undesirable behavior.
-**
-** See also: [sqlite3_blob_write()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int iOffset);
-
-/*
-** CAPI3REF: Write Data Into A BLOB Incrementally
-** METHOD: sqlite3_blob
-**
-** ^(This function is used to write data into an open [BLOB handle] from a
-** caller-supplied buffer. N bytes of data are copied from the buffer Z
-** into the open BLOB, starting at offset iOffset.)^
-**
-** ^(On success, sqlite3_blob_write() returns SQLITE_OK.
-** Otherwise, an  [error code] or an [extended error code] is returned.)^
-** ^Unless SQLITE_MISUSE is returned, this function sets the 
-** [database connection] error code and message accessible via 
-** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions. 
-**
-** ^If the [BLOB handle] passed as the first argument was not opened for
-** writing (the flags parameter to [sqlite3_blob_open()] was zero),
-** this function returns [SQLITE_READONLY].
-**
-** This function may only modify the contents of the BLOB; it is
-** not possible to increase the size of a BLOB using this API.
-** ^If offset iOffset is less than N bytes from the end of the BLOB,
-** [SQLITE_ERROR] is returned and no data is written. The size of the 
-** BLOB (and hence the maximum value of N+iOffset) can be determined 
-** using the [sqlite3_blob_bytes()] interface. ^If N or iOffset are less 
-** than zero [SQLITE_ERROR] is returned and no data is written.
-**
-** ^An attempt to write to an expired [BLOB handle] fails with an
-** error code of [SQLITE_ABORT].  ^Writes to the BLOB that occurred
-** before the [BLOB handle] expired are not rolled back by the
-** expiration of the handle, though of course those changes might
-** have been overwritten by the statement that expired the BLOB handle
-** or by other independent statements.
-**
-** This routine only works on a [BLOB handle] which has been created
-** by a prior successful call to [sqlite3_blob_open()] and which has not
-** been closed by [sqlite3_blob_close()].  Passing any other pointer in
-** to this routine results in undefined and probably undesirable behavior.
-**
-** See also: [sqlite3_blob_read()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset);
-
-/*
-** CAPI3REF: Virtual File System Objects
-**
-** A virtual filesystem (VFS) is an [sqlite3_vfs] object
-** that SQLite uses to interact
-** with the underlying operating system.  Most SQLite builds come with a
-** single default VFS that is appropriate for the host computer.
-** New VFSes can be registered and existing VFSes can be unregistered.
-** The following interfaces are provided.
-**
-** ^The sqlite3_vfs_find() interface returns a pointer to a VFS given its name.
-** ^Names are case sensitive.
-** ^Names are zero-terminated UTF-8 strings.
-** ^If there is no match, a NULL pointer is returned.
-** ^If zVfsName is NULL then the default VFS is returned.
-**
-** ^New VFSes are registered with sqlite3_vfs_register().
-** ^Each new VFS becomes the default VFS if the makeDflt flag is set.
-** ^The same VFS can be registered multiple times without injury.
-** ^To make an existing VFS into the default VFS, register it again
-** with the makeDflt flag set.  If two different VFSes with the
-** same name are registered, the behavior is undefined.  If a
-** VFS is registered with a name that is NULL or an empty string,
-** then the behavior is undefined.
-**
-** ^Unregister a VFS with the sqlite3_vfs_unregister() interface.
-** ^(If the default VFS is unregistered, another VFS is chosen as
-** the default.  The choice for the new VFS is arbitrary.)^
-*/
-SQLITE_API sqlite3_vfs *SQLITE_STDCALL sqlite3_vfs_find(const char *zVfsName);
-SQLITE_API int SQLITE_STDCALL sqlite3_vfs_register(sqlite3_vfs*, int makeDflt);
-SQLITE_API int SQLITE_STDCALL sqlite3_vfs_unregister(sqlite3_vfs*);
-
-/*
-** CAPI3REF: Mutexes
-**
-** The SQLite core uses these routines for thread
-** synchronization. Though they are intended for internal
-** use by SQLite, code that links against SQLite is
-** permitted to use any of these routines.
-**
-** The SQLite source code contains multiple implementations
-** of these mutex routines.  An appropriate implementation
-** is selected automatically at compile-time.  The following
-** implementations are available in the SQLite core:
-**
-** <ul>
-** <li>   SQLITE_MUTEX_PTHREADS
-** <li>   SQLITE_MUTEX_W32
-** <li>   SQLITE_MUTEX_NOOP
-** </ul>
-**
-** The SQLITE_MUTEX_NOOP implementation is a set of routines
-** that does no real locking and is appropriate for use in
-** a single-threaded application.  The SQLITE_MUTEX_PTHREADS and
-** SQLITE_MUTEX_W32 implementations are appropriate for use on Unix
-** and Windows.
-**
-** If SQLite is compiled with the SQLITE_MUTEX_APPDEF preprocessor
-** macro defined (with "-DSQLITE_MUTEX_APPDEF=1"), then no mutex
-** implementation is included with the library. In this case the
-** application must supply a custom mutex implementation using the
-** [SQLITE_CONFIG_MUTEX] option of the sqlite3_config() function
-** before calling sqlite3_initialize() or any other public sqlite3_
-** function that calls sqlite3_initialize().
-**
-** ^The sqlite3_mutex_alloc() routine allocates a new
-** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
-** routine returns NULL if it is unable to allocate the requested
-** mutex.  The argument to sqlite3_mutex_alloc() must one of these
-** integer constants:
-**
-** <ul>
-** <li>  SQLITE_MUTEX_FAST
-** <li>  SQLITE_MUTEX_RECURSIVE
-** <li>  SQLITE_MUTEX_STATIC_MASTER
-** <li>  SQLITE_MUTEX_STATIC_MEM
-** <li>  SQLITE_MUTEX_STATIC_OPEN
-** <li>  SQLITE_MUTEX_STATIC_PRNG
-** <li>  SQLITE_MUTEX_STATIC_LRU
-** <li>  SQLITE_MUTEX_STATIC_PMEM
-** <li>  SQLITE_MUTEX_STATIC_APP1
-** <li>  SQLITE_MUTEX_STATIC_APP2
-** <li>  SQLITE_MUTEX_STATIC_APP3
-** <li>  SQLITE_MUTEX_STATIC_VFS1
-** <li>  SQLITE_MUTEX_STATIC_VFS2
-** <li>  SQLITE_MUTEX_STATIC_VFS3
-** </ul>
-**
-** ^The first two constants (SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE)
-** cause sqlite3_mutex_alloc() to create
-** a new mutex.  ^The new mutex is recursive when SQLITE_MUTEX_RECURSIVE
-** is used but not necessarily so when SQLITE_MUTEX_FAST is used.
-** The mutex implementation does not need to make a distinction
-** between SQLITE_MUTEX_RECURSIVE and SQLITE_MUTEX_FAST if it does
-** not want to.  SQLite will only request a recursive mutex in
-** cases where it really needs one.  If a faster non-recursive mutex
-** implementation is available on the host platform, the mutex subsystem
-** might return such a mutex in response to SQLITE_MUTEX_FAST.
-**
-** ^The other allowed parameters to sqlite3_mutex_alloc() (anything other
-** than SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE) each return
-** a pointer to a static preexisting mutex.  ^Nine static mutexes are
-** used by the current version of SQLite.  Future versions of SQLite
-** may add additional static mutexes.  Static mutexes are for internal
-** use by SQLite only.  Applications that use SQLite mutexes should
-** use only the dynamic mutexes returned by SQLITE_MUTEX_FAST or
-** SQLITE_MUTEX_RECURSIVE.
-**
-** ^Note that if one of the dynamic mutex parameters (SQLITE_MUTEX_FAST
-** or SQLITE_MUTEX_RECURSIVE) is used then sqlite3_mutex_alloc()
-** returns a different mutex on every call.  ^For the static
-** mutex types, the same mutex is returned on every call that has
-** the same type number.
-**
-** ^The sqlite3_mutex_free() routine deallocates a previously
-** allocated dynamic mutex.  Attempting to deallocate a static
-** mutex results in undefined behavior.
-**
-** ^The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
-** to enter a mutex.  ^If another thread is already within the mutex,
-** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
-** SQLITE_BUSY.  ^The sqlite3_mutex_try() interface returns [SQLITE_OK]
-** upon successful entry.  ^(Mutexes created using
-** SQLITE_MUTEX_RECURSIVE can be entered multiple times by the same thread.
-** In such cases, the
-** mutex must be exited an equal number of times before another thread
-** can enter.)^  If the same thread tries to enter any mutex other
-** than an SQLITE_MUTEX_RECURSIVE more than once, the behavior is undefined.
-**
-** ^(Some systems (for example, Windows 95) do not support the operation
-** implemented by sqlite3_mutex_try().  On those systems, sqlite3_mutex_try()
-** will always return SQLITE_BUSY. The SQLite core only ever uses
-** sqlite3_mutex_try() as an optimization so this is acceptable 
-** behavior.)^
-**
-** ^The sqlite3_mutex_leave() routine exits a mutex that was
-** previously entered by the same thread.   The behavior
-** is undefined if the mutex is not currently entered by the
-** calling thread or is not currently allocated.
-**
-** ^If the argument to sqlite3_mutex_enter(), sqlite3_mutex_try(), or
-** sqlite3_mutex_leave() is a NULL pointer, then all three routines
-** behave as no-ops.
-**
-** See also: [sqlite3_mutex_held()] and [sqlite3_mutex_notheld()].
-*/
-SQLITE_API sqlite3_mutex *SQLITE_STDCALL sqlite3_mutex_alloc(int);
-SQLITE_API void SQLITE_STDCALL sqlite3_mutex_free(sqlite3_mutex*);
-SQLITE_API void SQLITE_STDCALL sqlite3_mutex_enter(sqlite3_mutex*);
-SQLITE_API int SQLITE_STDCALL sqlite3_mutex_try(sqlite3_mutex*);
-SQLITE_API void SQLITE_STDCALL sqlite3_mutex_leave(sqlite3_mutex*);
-
-/*
-** CAPI3REF: Mutex Methods Object
-**
-** An instance of this structure defines the low-level routines
-** used to allocate and use mutexes.
-**
-** Usually, the default mutex implementations provided by SQLite are
-** sufficient, however the application has the option of substituting a custom
-** implementation for specialized deployments or systems for which SQLite
-** does not provide a suitable implementation. In this case, the application
-** creates and populates an instance of this structure to pass
-** to sqlite3_config() along with the [SQLITE_CONFIG_MUTEX] option.
-** Additionally, an instance of this structure can be used as an
-** output variable when querying the system for the current mutex
-** implementation, using the [SQLITE_CONFIG_GETMUTEX] option.
-**
-** ^The xMutexInit method defined by this structure is invoked as
-** part of system initialization by the sqlite3_initialize() function.
-** ^The xMutexInit routine is called by SQLite exactly once for each
-** effective call to [sqlite3_initialize()].
-**
-** ^The xMutexEnd method defined by this structure is invoked as
-** part of system shutdown by the sqlite3_shutdown() function. The
-** implementation of this method is expected to release all outstanding
-** resources obtained by the mutex methods implementation, especially
-** those obtained by the xMutexInit method.  ^The xMutexEnd()
-** interface is invoked exactly once for each call to [sqlite3_shutdown()].
-**
-** ^(The remaining seven methods defined by this structure (xMutexAlloc,
-** xMutexFree, xMutexEnter, xMutexTry, xMutexLeave, xMutexHeld and
-** xMutexNotheld) implement the following interfaces (respectively):
-**
-** <ul>
-**   <li>  [sqlite3_mutex_alloc()] </li>
-**   <li>  [sqlite3_mutex_free()] </li>
-**   <li>  [sqlite3_mutex_enter()] </li>
-**   <li>  [sqlite3_mutex_try()] </li>
-**   <li>  [sqlite3_mutex_leave()] </li>
-**   <li>  [sqlite3_mutex_held()] </li>
-**   <li>  [sqlite3_mutex_notheld()] </li>
-** </ul>)^
-**
-** The only difference is that the public sqlite3_XXX functions enumerated
-** above silently ignore any invocations that pass a NULL pointer instead
-** of a valid mutex handle. The implementations of the methods defined
-** by this structure are not required to handle this case, the results
-** of passing a NULL pointer instead of a valid mutex handle are undefined
-** (i.e. it is acceptable to provide an implementation that segfaults if
-** it is passed a NULL pointer).
-**
-** The xMutexInit() method must be threadsafe.  It must be harmless to
-** invoke xMutexInit() multiple times within the same process and without
-** intervening calls to xMutexEnd().  Second and subsequent calls to
-** xMutexInit() must be no-ops.
-**
-** xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
-** and its associates).  Similarly, xMutexAlloc() must not use SQLite memory
-** allocation for a static mutex.  ^However xMutexAlloc() may use SQLite
-** memory allocation for a fast or recursive mutex.
-**
-** ^SQLite will invoke the xMutexEnd() method when [sqlite3_shutdown()] is
-** called, but only if the prior call to xMutexInit returned SQLITE_OK.
-** If xMutexInit fails in any way, it is expected to clean up after itself
-** prior to returning.
-*/
-typedef struct sqlite3_mutex_methods sqlite3_mutex_methods;
-struct sqlite3_mutex_methods {
-  int (*xMutexInit)(void);
-  int (*xMutexEnd)(void);
-  sqlite3_mutex *(*xMutexAlloc)(int);
-  void (*xMutexFree)(sqlite3_mutex *);
-  void (*xMutexEnter)(sqlite3_mutex *);
-  int (*xMutexTry)(sqlite3_mutex *);
-  void (*xMutexLeave)(sqlite3_mutex *);
-  int (*xMutexHeld)(sqlite3_mutex *);
-  int (*xMutexNotheld)(sqlite3_mutex *);
-};
-
-/*
-** CAPI3REF: Mutex Verification Routines
-**
-** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routines
-** are intended for use inside assert() statements.  The SQLite core
-** never uses these routines except inside an assert() and applications
-** are advised to follow the lead of the core.  The SQLite core only
-** provides implementations for these routines when it is compiled
-** with the SQLITE_DEBUG flag.  External mutex implementations
-** are only required to provide these routines if SQLITE_DEBUG is
-** defined and if NDEBUG is not defined.
-**
-** These routines should return true if the mutex in their argument
-** is held or not held, respectively, by the calling thread.
-**
-** The implementation is not required to provide versions of these
-** routines that actually work. If the implementation does not provide working
-** versions of these routines, it should at least provide stubs that always
-** return true so that one does not get spurious assertion failures.
-**
-** If the argument to sqlite3_mutex_held() is a NULL pointer then
-** the routine should return 1.   This seems counter-intuitive since
-** clearly the mutex cannot be held if it does not exist.  But
-** the reason the mutex does not exist is because the build is not
-** using mutexes.  And we do not want the assert() containing the
-** call to sqlite3_mutex_held() to fail, so a non-zero return is
-** the appropriate thing to do.  The sqlite3_mutex_notheld()
-** interface should also return 1 when given a NULL pointer.
-*/
-#ifndef NDEBUG
-SQLITE_API int SQLITE_STDCALL sqlite3_mutex_held(sqlite3_mutex*);
-SQLITE_API int SQLITE_STDCALL sqlite3_mutex_notheld(sqlite3_mutex*);
-#endif
-
-/*
-** CAPI3REF: Mutex Types
-**
-** The [sqlite3_mutex_alloc()] interface takes a single argument
-** which is one of these integer constants.
-**
-** The set of static mutexes may change from one SQLite release to the
-** next.  Applications that override the built-in mutex logic must be
-** prepared to accommodate additional static mutexes.
-*/
-#define SQLITE_MUTEX_FAST             0
-#define SQLITE_MUTEX_RECURSIVE        1
-#define SQLITE_MUTEX_STATIC_MASTER    2
-#define SQLITE_MUTEX_STATIC_MEM       3  /* sqlite3_malloc() */
-#define SQLITE_MUTEX_STATIC_MEM2      4  /* NOT USED */
-#define SQLITE_MUTEX_STATIC_OPEN      4  /* sqlite3BtreeOpen() */
-#define SQLITE_MUTEX_STATIC_PRNG      5  /* sqlite3_random() */
-#define SQLITE_MUTEX_STATIC_LRU       6  /* lru page list */
-#define SQLITE_MUTEX_STATIC_LRU2      7  /* NOT USED */
-#define SQLITE_MUTEX_STATIC_PMEM      7  /* sqlite3PageMalloc() */
-#define SQLITE_MUTEX_STATIC_APP1      8  /* For use by application */
-#define SQLITE_MUTEX_STATIC_APP2      9  /* For use by application */
-#define SQLITE_MUTEX_STATIC_APP3     10  /* For use by application */
-#define SQLITE_MUTEX_STATIC_VFS1     11  /* For use by built-in VFS */
-#define SQLITE_MUTEX_STATIC_VFS2     12  /* For use by extension VFS */
-#define SQLITE_MUTEX_STATIC_VFS3     13  /* For use by application VFS */
-
-/*
-** CAPI3REF: Retrieve the mutex for a database connection
-** METHOD: sqlite3
-**
-** ^This interface returns a pointer the [sqlite3_mutex] object that 
-** serializes access to the [database connection] given in the argument
-** when the [threading mode] is Serialized.
-** ^If the [threading mode] is Single-thread or Multi-thread then this
-** routine returns a NULL pointer.
-*/
-SQLITE_API sqlite3_mutex *SQLITE_STDCALL sqlite3_db_mutex(sqlite3*);
-
-/*
-** CAPI3REF: Low-Level Control Of Database Files
-** METHOD: sqlite3
-**
-** ^The [sqlite3_file_control()] interface makes a direct call to the
-** xFileControl method for the [sqlite3_io_methods] object associated
-** with a particular database identified by the second argument. ^The
-** name of the database is "main" for the main database or "temp" for the
-** TEMP database, or the name that appears after the AS keyword for
-** databases that are added using the [ATTACH] SQL command.
-** ^A NULL pointer can be used in place of "main" to refer to the
-** main database file.
-** ^The third and fourth parameters to this routine
-** are passed directly through to the second and third parameters of
-** the xFileControl method.  ^The return value of the xFileControl
-** method becomes the return value of this routine.
-**
-** ^The SQLITE_FCNTL_FILE_POINTER value for the op parameter causes
-** a pointer to the underlying [sqlite3_file] object to be written into
-** the space pointed to by the 4th parameter.  ^The SQLITE_FCNTL_FILE_POINTER
-** case is a short-circuit path which does not actually invoke the
-** underlying sqlite3_io_methods.xFileControl method.
-**
-** ^If the second parameter (zDbName) does not match the name of any
-** open database file, then SQLITE_ERROR is returned.  ^This error
-** code is not remembered and will not be recalled by [sqlite3_errcode()]
-** or [sqlite3_errmsg()].  The underlying xFileControl method might
-** also return SQLITE_ERROR.  There is no way to distinguish between
-** an incorrect zDbName and an SQLITE_ERROR return from the underlying
-** xFileControl method.
-**
-** See also: [SQLITE_FCNTL_LOCKSTATE]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_file_control(sqlite3*, const char *zDbName, int op, void*);
-
-/*
-** CAPI3REF: Testing Interface
-**
-** ^The sqlite3_test_control() interface is used to read out internal
-** state of SQLite and to inject faults into SQLite for testing
-** purposes.  ^The first parameter is an operation code that determines
-** the number, meaning, and operation of all subsequent parameters.
-**
-** This interface is not for use by applications.  It exists solely
-** for verifying the correct operation of the SQLite library.  Depending
-** on how the SQLite library is compiled, this interface might not exist.
-**
-** The details of the operation codes, their meanings, the parameters
-** they take, and what they do are all subject to change without notice.
-** Unlike most of the SQLite API, this function is not guaranteed to
-** operate consistently from one release to the next.
-*/
-SQLITE_API int SQLITE_CDECL sqlite3_test_control(int op, ...);
-
-/*
-** CAPI3REF: Testing Interface Operation Codes
-**
-** These constants are the valid operation code parameters used
-** as the first argument to [sqlite3_test_control()].
-**
-** These parameters and their meanings are subject to change
-** without notice.  These values are for testing purposes only.
-** Applications should not use any of these parameters or the
-** [sqlite3_test_control()] interface.
-*/
-#define SQLITE_TESTCTRL_FIRST                    5
-#define SQLITE_TESTCTRL_PRNG_SAVE                5
-#define SQLITE_TESTCTRL_PRNG_RESTORE             6
-#define SQLITE_TESTCTRL_PRNG_RESET               7
-#define SQLITE_TESTCTRL_BITVEC_TEST              8
-#define SQLITE_TESTCTRL_FAULT_INSTALL            9
-#define SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS     10
-#define SQLITE_TESTCTRL_PENDING_BYTE            11
-#define SQLITE_TESTCTRL_ASSERT                  12
-#define SQLITE_TESTCTRL_ALWAYS                  13
-#define SQLITE_TESTCTRL_RESERVE                 14
-#define SQLITE_TESTCTRL_OPTIMIZATIONS           15
-#define SQLITE_TESTCTRL_ISKEYWORD               16
-#define SQLITE_TESTCTRL_SCRATCHMALLOC           17
-#define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
-#define SQLITE_TESTCTRL_EXPLAIN_STMT            19  /* NOT USED */
-#define SQLITE_TESTCTRL_NEVER_CORRUPT           20
-#define SQLITE_TESTCTRL_VDBE_COVERAGE           21
-#define SQLITE_TESTCTRL_BYTEORDER               22
-#define SQLITE_TESTCTRL_ISINIT                  23
-#define SQLITE_TESTCTRL_SORTER_MMAP             24
-#define SQLITE_TESTCTRL_IMPOSTER                25
-#define SQLITE_TESTCTRL_LAST                    25
-
-/*
-** CAPI3REF: Dynamic String Object
-** KEYWORDS: {dynamic string}
-**
-** An instance of the sqlite3_str object contains a dynamically-sized
-** string under construction.
-**
-** The lifecycle of an sqlite3_str object is as follows:
-** <ol>
-** <li> The sqlite3_str object is created using [sqlite3_str_new()].
-** <li> Text is appended to the sqlite3_str object using various
-** methods, such as [sqlite3_str_appendf()].
-** <li> The sqlite3_str object is destroyed and the string it created
-** is returned using the [sqlite3_str_finish()] interface.
-** </ol>
-*/
-typedef struct sqlite3_str sqlite3_str;
-
-/*
-** CAPI3REF: Create A New Dynamic String Object
-** CONSTRUCTOR: sqlite3_str
-**
-** The [sqlite3_str_new(D)] allocates and initializes a new [sqlite3_str]
-** object.  The [sqlite3_str_new(D)] interface returns NULL on an out-of-memory
-** condition.  To avoid memory leaks, the object returned by
-** [sqlite3_str_new(D)] must be freed by a subsequent call to 
-** [sqlite3_str_finish(S)].
-**
-** If the D argument to [sqlite3_str_new(D)] is NULL then memory used to
-** construct the string is always taken from the global memory pool used
-** by [sqlite3_malloc64()].  If D is not NULL, then a private memory pool
-** used by connection D might also be used.  This private memory pool is
-** faster, but is limited in space, and should only be used for transient
-** allocations.  The final string returned by [sqlite3_str_finish(X)] is
-** always stored in space obtained from [sqlite3_malloc64()] regardless
-** of whether or not the private per-connection memory pool is used during
-** its construction.
-*/
-SQLITE_API sqlite3_str *SQLITE_STDCALL sqlite3_str_new(sqlite3*);
-
-/*
-** CAPI3REF: Finalize A Dynamic String
-** DESTRUCTOR: sqlite3_str
-**
-** The [sqlite3_str_finish(X)] interface destroys the sqlite3_str object X
-** and returns a pointer to a memory buffer obtained from [sqlite3_malloc64()]
-** that contains the constructed string.  The calling application should
-** pass the returned value to [sqlite3_free()] to avoid a memory leak.
-** The [sqlite3_str_finish(X)] interface may return a NULL pointer if any
-** errors were encountered during construction of the string.  The
-** [sqlite3_str_finish(X)] interface will also return a NULL pointer if the
-** string in [sqlite3_str] object X is zero bytes long.
-*/
-SQLITE_API char *SQLITE_STDCALL sqlite3_str_finish(sqlite3_str*);
-
-/*
-** CAPI3REF: Add Content To A Dynamic String
-** METHOD: sqlite3_str
-**
-** These interfaces add content to an sqlite3_str object previously obtained
-** from [sqlite3_str_new()].
-**
-** The [sqlite3_str_appendf(X,F,...)] and 
-** [sqlite3_str_vappendf(X,F,V)] interfaces uses the [built-in printf]
-** functionality of SQLite to append formatted text onto the end of 
-** [sqlite3_str] object X.
-**
-** The [sqlite3_str_append(X,S,N)] method appends exactly N bytes from string S
-** onto the end of the [sqlite3_str] object X.  N must be non-negative.
-** S must contain at least N non-zero bytes of content.  To append a
-** zero-terminated string in its entirety, use the [sqlite3_str_appendall()]
-** method instead.
-**
-** The [sqlite3_str_appendall(X,S)] method the complete content of
-** zero-terminated string S onto the end of [sqlite3_str] object X.
-**
-** The [sqlite3_str_appendchar(X,N,C)] method appends N copies of the
-** single-byte character C onto the end of [sqlite3_str] object X.
-** This method can be used, for example, to add whitespace indentation.
-**
-** The [sqlite3_str_reset(X)] method resets the string under construction
-** inside [sqlite3_str] object X back to zero bytes in length.  
-**
-** These methods do not return a result code.  If an error occurs, that fact
-** is recorded in the [sqlite3_str] object and can be recovered by a
-** subsequent call to [sqlite3_str_errcode(X)].
-*/
-SQLITE_API void SQLITE_STDCALL sqlite3_str_appendf(sqlite3_str*, const char *zFormat, ...);
-SQLITE_API void SQLITE_STDCALL sqlite3_str_vappendf(sqlite3_str*, const char *zFormat, va_list);
-SQLITE_API void SQLITE_STDCALL sqlite3_str_append(sqlite3_str*, const char *zIn, int N);
-SQLITE_API void SQLITE_STDCALL sqlite3_str_appendall(sqlite3_str*, const char *zIn);
-SQLITE_API void SQLITE_STDCALL sqlite3_str_appendchar(sqlite3_str*, int N, char C);
-SQLITE_API void SQLITE_STDCALL sqlite3_str_reset(sqlite3_str*);
-
-/*
-** CAPI3REF: Status Of A Dynamic String
-** METHOD: sqlite3_str
-**
-** These interfaces return the current status of an [sqlite3_str] object.
-**
-** If any prior errors have occurred while constructing the dynamic string
-** in sqlite3_str X, then the [sqlite3_str_errcode(X)] method will return
-** an appropriate error code.  The [sqlite3_str_errcode(X)] method returns
-** [SQLITE_NOMEM] following any out-of-memory error, or
-** [SQLITE_TOOBIG] if the size of the dynamic string exceeds
-** [SQLITE_MAX_LENGTH], or [SQLITE_OK] if there have been no errors.
-**
-** The [sqlite3_str_length(X)] method returns the current length, in bytes,
-** of the dynamic string under construction in [sqlite3_str] object X.
-** The length returned by [sqlite3_str_length(X)] does not include the
-** zero-termination byte.
-**
-** The [sqlite3_str_value(X)] method returns a pointer to the current
-** content of the dynamic string under construction in X.  The value
-** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
-** and might be freed or altered by any subsequent method on the same
-** [sqlite3_str] object.  Applications must not used the pointer returned
-** [sqlite3_str_value(X)] after any subsequent method call on the same
-** object.  Applications may change the content of the string returned
-** by [sqlite3_str_value(X)] as long as they do not write into any bytes
-** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
-** write any byte after any subsequent sqlite3_str method call.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_str_errcode(sqlite3_str*);
-SQLITE_API int SQLITE_STDCALL sqlite3_str_length(sqlite3_str*);
-SQLITE_API char *SQLITE_STDCALL sqlite3_str_value(sqlite3_str*);
-
-/*
-** CAPI3REF: SQLite Runtime Status
-**
-** ^These interfaces are used to retrieve runtime status information
-** about the performance of SQLite, and optionally to reset various
-** highwater marks.  ^The first argument is an integer code for
-** the specific parameter to measure.  ^(Recognized integer codes
-** are of the form [status parameters | SQLITE_STATUS_...].)^
-** ^The current value of the parameter is returned into *pCurrent.
-** ^The highest recorded value is returned in *pHighwater.  ^If the
-** resetFlag is true, then the highest record value is reset after
-** *pHighwater is written.  ^(Some parameters do not record the highest
-** value.  For those parameters
-** nothing is written into *pHighwater and the resetFlag is ignored.)^
-** ^(Other parameters record only the highwater mark and not the current
-** value.  For these latter parameters nothing is written into *pCurrent.)^
-**
-** ^The sqlite3_status() and sqlite3_status64() routines return
-** SQLITE_OK on success and a non-zero [error code] on failure.
-**
-** If either the current value or the highwater mark is too large to
-** be represented by a 32-bit integer, then the values returned by
-** sqlite3_status() are undefined.
-**
-** See also: [sqlite3_db_status()]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag);
-SQLITE_API int SQLITE_STDCALL sqlite3_status64(
-  int op,
-  sqlite3_int64 *pCurrent,
-  sqlite3_int64 *pHighwater,
-  int resetFlag
-);
-
-
-/*
-** CAPI3REF: Status Parameters
-** KEYWORDS: {status parameters}
-**
-** These integer constants designate various run-time status parameters
-** that can be returned by [sqlite3_status()].
-**
-** <dl>
-** [[SQLITE_STATUS_MEMORY_USED]] ^(<dt>SQLITE_STATUS_MEMORY_USED</dt>
-** <dd>This parameter is the current amount of memory checked out
-** using [sqlite3_malloc()], either directly or indirectly.  The
-** figure includes calls made to [sqlite3_malloc()] by the application
-** and internal memory usage by the SQLite library.  Scratch memory
-** controlled by [SQLITE_CONFIG_SCRATCH] and auxiliary page-cache
-** memory controlled by [SQLITE_CONFIG_PAGECACHE] is not included in
-** this parameter.  The amount returned is the sum of the allocation
-** sizes as reported by the xSize method in [sqlite3_mem_methods].</dd>)^
-**
-** [[SQLITE_STATUS_MALLOC_SIZE]] ^(<dt>SQLITE_STATUS_MALLOC_SIZE</dt>
-** <dd>This parameter records the largest memory allocation request
-** handed to [sqlite3_malloc()] or [sqlite3_realloc()] (or their
-** internal equivalents).  Only the value returned in the
-** *pHighwater parameter to [sqlite3_status()] is of interest.  
-** The value written into the *pCurrent parameter is undefined.</dd>)^
-**
-** [[SQLITE_STATUS_MALLOC_COUNT]] ^(<dt>SQLITE_STATUS_MALLOC_COUNT</dt>
-** <dd>This parameter records the number of separate memory allocations
-** currently checked out.</dd>)^
-**
-** [[SQLITE_STATUS_PAGECACHE_USED]] ^(<dt>SQLITE_STATUS_PAGECACHE_USED</dt>
-** <dd>This parameter returns the number of pages used out of the
-** [pagecache memory allocator] that was configured using 
-** [SQLITE_CONFIG_PAGECACHE].  The
-** value returned is in pages, not in bytes.</dd>)^
-**
-** [[SQLITE_STATUS_PAGECACHE_OVERFLOW]] 
-** ^(<dt>SQLITE_STATUS_PAGECACHE_OVERFLOW</dt>
-** <dd>This parameter returns the number of bytes of page cache
-** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]
-** buffer and where forced to overflow to [sqlite3_malloc()].  The
-** returned value includes allocations that overflowed because they
-** where too large (they were larger than the "sz" parameter to
-** [SQLITE_CONFIG_PAGECACHE]) and allocations that overflowed because
-** no space was left in the page cache.</dd>)^
-**
-** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(<dt>SQLITE_STATUS_PAGECACHE_SIZE</dt>
-** <dd>This parameter records the largest memory allocation request
-** handed to [pagecache memory allocator].  Only the value returned in the
-** *pHighwater parameter to [sqlite3_status()] is of interest.  
-** The value written into the *pCurrent parameter is undefined.</dd>)^
-**
-** [[SQLITE_STATUS_SCRATCH_USED]] ^(<dt>SQLITE_STATUS_SCRATCH_USED</dt>
-** <dd>This parameter returns the number of allocations used out of the
-** [scratch memory allocator] configured using
-** [SQLITE_CONFIG_SCRATCH].  The value returned is in allocations, not
-** in bytes.  Since a single thread may only have one scratch allocation
-** outstanding at time, this parameter also reports the number of threads
-** using scratch memory at the same time.</dd>)^
-**
-** [[SQLITE_STATUS_SCRATCH_OVERFLOW]] ^(<dt>SQLITE_STATUS_SCRATCH_OVERFLOW</dt>
-** <dd>This parameter returns the number of bytes of scratch memory
-** allocation which could not be satisfied by the [SQLITE_CONFIG_SCRATCH]
-** buffer and where forced to overflow to [sqlite3_malloc()].  The values
-** returned include overflows because the requested allocation was too
-** larger (that is, because the requested allocation was larger than the
-** "sz" parameter to [SQLITE_CONFIG_SCRATCH]) and because no scratch buffer
-** slots were available.
-** </dd>)^
-**
-** [[SQLITE_STATUS_SCRATCH_SIZE]] ^(<dt>SQLITE_STATUS_SCRATCH_SIZE</dt>
-** <dd>This parameter records the largest memory allocation request
-** handed to [scratch memory allocator].  Only the value returned in the
-** *pHighwater parameter to [sqlite3_status()] is of interest.  
-** The value written into the *pCurrent parameter is undefined.</dd>)^
-**
-** [[SQLITE_STATUS_PARSER_STACK]] ^(<dt>SQLITE_STATUS_PARSER_STACK</dt>
-** <dd>The *pHighwater parameter records the deepest parser stack. 
-** The *pCurrent value is undefined.  The *pHighwater value is only
-** meaningful if SQLite is compiled with [YYTRACKMAXSTACKDEPTH].</dd>)^
-** </dl>
-**
-** New status parameters may be added from time to time.
-*/
-#define SQLITE_STATUS_MEMORY_USED          0
-#define SQLITE_STATUS_PAGECACHE_USED       1
-#define SQLITE_STATUS_PAGECACHE_OVERFLOW   2
-#define SQLITE_STATUS_SCRATCH_USED         3
-#define SQLITE_STATUS_SCRATCH_OVERFLOW     4
-#define SQLITE_STATUS_MALLOC_SIZE          5
-#define SQLITE_STATUS_PARSER_STACK         6
-#define SQLITE_STATUS_PAGECACHE_SIZE       7
-#define SQLITE_STATUS_SCRATCH_SIZE         8
-#define SQLITE_STATUS_MALLOC_COUNT         9
-
-/*
-** CAPI3REF: Database Connection Status
-** METHOD: sqlite3
-**
-** ^This interface is used to retrieve runtime status information 
-** about a single [database connection].  ^The first argument is the
-** database connection object to be interrogated.  ^The second argument
-** is an integer constant, taken from the set of
-** [SQLITE_DBSTATUS options], that
-** determines the parameter to interrogate.  The set of 
-** [SQLITE_DBSTATUS options] is likely
-** to grow in future releases of SQLite.
-**
-** ^The current value of the requested parameter is written into *pCur
-** and the highest instantaneous value is written into *pHiwtr.  ^If
-** the resetFlg is true, then the highest instantaneous value is
-** reset back down to the current value.
-**
-** ^The sqlite3_db_status() routine returns SQLITE_OK on success and a
-** non-zero [error code] on failure.
-**
-** See also: [sqlite3_status()] and [sqlite3_stmt_status()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg);
-
-/*
-** CAPI3REF: Status Parameters for database connections
-** KEYWORDS: {SQLITE_DBSTATUS options}
-**
-** These constants are the available integer "verbs" that can be passed as
-** the second argument to the [sqlite3_db_status()] interface.
-**
-** New verbs may be added in future releases of SQLite. Existing verbs
-** might be discontinued. Applications should check the return code from
-** [sqlite3_db_status()] to make sure that the call worked.
-** The [sqlite3_db_status()] interface will return a non-zero error code
-** if a discontinued or unsupported verb is invoked.
-**
-** <dl>
-** [[SQLITE_DBSTATUS_LOOKASIDE_USED]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_USED</dt>
-** <dd>This parameter returns the number of lookaside memory slots currently
-** checked out.</dd>)^
-**
-** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>
-** <dd>This parameter returns the number malloc attempts that were 
-** satisfied using lookaside memory. Only the high-water value is meaningful;
-** the current value is always zero.)^
-**
-** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE]]
-** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</dt>
-** <dd>This parameter returns the number malloc attempts that might have
-** been satisfied using lookaside memory but failed due to the amount of
-** memory requested being larger than the lookaside slot size.
-** Only the high-water value is meaningful;
-** the current value is always zero.)^
-**
-** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL]]
-** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</dt>
-** <dd>This parameter returns the number malloc attempts that might have
-** been satisfied using lookaside memory but failed due to all lookaside
-** memory already being in use.
-** Only the high-water value is meaningful;
-** the current value is always zero.)^
-**
-** [[SQLITE_DBSTATUS_CACHE_USED]] ^(<dt>SQLITE_DBSTATUS_CACHE_USED</dt>
-** <dd>This parameter returns the approximate number of bytes of heap
-** memory used by all pager caches associated with the database connection.)^
-** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0.
-**
-** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(<dt>SQLITE_DBSTATUS_SCHEMA_USED</dt>
-** <dd>This parameter returns the approximate number of bytes of heap
-** memory used to store the schema for all databases associated
-** with the connection - main, temp, and any [ATTACH]-ed databases.)^ 
-** ^The full amount of memory used by the schemas is reported, even if the
-** schema memory is shared with other database connections due to
-** [shared cache mode] being enabled.
-** ^The highwater mark associated with SQLITE_DBSTATUS_SCHEMA_USED is always 0.
-**
-** [[SQLITE_DBSTATUS_STMT_USED]] ^(<dt>SQLITE_DBSTATUS_STMT_USED</dt>
-** <dd>This parameter returns the approximate number of bytes of heap
-** and lookaside memory used by all prepared statements associated with
-** the database connection.)^
-** ^The highwater mark associated with SQLITE_DBSTATUS_STMT_USED is always 0.
-** </dd>
-**
-** [[SQLITE_DBSTATUS_CACHE_HIT]] ^(<dt>SQLITE_DBSTATUS_CACHE_HIT</dt>
-** <dd>This parameter returns the number of pager cache hits that have
-** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_HIT 
-** is always 0.
-** </dd>
-**
-** [[SQLITE_DBSTATUS_CACHE_MISS]] ^(<dt>SQLITE_DBSTATUS_CACHE_MISS</dt>
-** <dd>This parameter returns the number of pager cache misses that have
-** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_MISS 
-** is always 0.
-** </dd>
-**
-** [[SQLITE_DBSTATUS_CACHE_WRITE]] ^(<dt>SQLITE_DBSTATUS_CACHE_WRITE</dt>
-** <dd>This parameter returns the number of dirty cache entries that have
-** been written to disk. Specifically, the number of pages written to the
-** wal file in wal mode databases, or the number of pages written to the
-** database file in rollback mode databases. Any pages written as part of
-** transaction rollback or database recovery operations are not included.
-** If an IO or other error occurs while writing a page to disk, the effect
-** on subsequent SQLITE_DBSTATUS_CACHE_WRITE requests is undefined.)^ ^The
-** highwater mark associated with SQLITE_DBSTATUS_CACHE_WRITE is always 0.
-** </dd>
-**
-** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(<dt>SQLITE_DBSTATUS_DEFERRED_FKS</dt>
-** <dd>This parameter returns zero for the current value if and only if
-** all foreign key constraints (deferred or immediate) have been
-** resolved.)^  ^The highwater mark is always 0.
-** </dd>
-** </dl>
-*/
-#define SQLITE_DBSTATUS_LOOKASIDE_USED       0
-#define SQLITE_DBSTATUS_CACHE_USED           1
-#define SQLITE_DBSTATUS_SCHEMA_USED          2
-#define SQLITE_DBSTATUS_STMT_USED            3
-#define SQLITE_DBSTATUS_LOOKASIDE_HIT        4
-#define SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE  5
-#define SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL  6
-#define SQLITE_DBSTATUS_CACHE_HIT            7
-#define SQLITE_DBSTATUS_CACHE_MISS           8
-#define SQLITE_DBSTATUS_CACHE_WRITE          9
-#define SQLITE_DBSTATUS_DEFERRED_FKS        10
-#define SQLITE_DBSTATUS_MAX                 10   /* Largest defined DBSTATUS */
-
-
-/*
-** CAPI3REF: Prepared Statement Status
-** METHOD: sqlite3_stmt
-**
-** ^(Each prepared statement maintains various
-** [SQLITE_STMTSTATUS counters] that measure the number
-** of times it has performed specific operations.)^  These counters can
-** be used to monitor the performance characteristics of the prepared
-** statements.  For example, if the number of table steps greatly exceeds
-** the number of table searches or result rows, that would tend to indicate
-** that the prepared statement is using a full table scan rather than
-** an index.  
-**
-** ^(This interface is used to retrieve and reset counter values from
-** a [prepared statement].  The first argument is the prepared statement
-** object to be interrogated.  The second argument
-** is an integer code for a specific [SQLITE_STMTSTATUS counter]
-** to be interrogated.)^
-** ^The current value of the requested counter is returned.
-** ^If the resetFlg is true, then the counter is reset to zero after this
-** interface call returns.
-**
-** See also: [sqlite3_status()] and [sqlite3_db_status()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);
-
-/*
-** CAPI3REF: Status Parameters for prepared statements
-** KEYWORDS: {SQLITE_STMTSTATUS counter} {SQLITE_STMTSTATUS counters}
-**
-** These preprocessor macros define integer codes that name counter
-** values associated with the [sqlite3_stmt_status()] interface.
-** The meanings of the various counters are as follows:
-**
-** <dl>
-** [[SQLITE_STMTSTATUS_FULLSCAN_STEP]] <dt>SQLITE_STMTSTATUS_FULLSCAN_STEP</dt>
-** <dd>^This is the number of times that SQLite has stepped forward in
-** a table as part of a full table scan.  Large numbers for this counter
-** may indicate opportunities for performance improvement through 
-** careful use of indices.</dd>
-**
-** [[SQLITE_STMTSTATUS_SORT]] <dt>SQLITE_STMTSTATUS_SORT</dt>
-** <dd>^This is the number of sort operations that have occurred.
-** A non-zero value in this counter may indicate an opportunity to
-** improvement performance through careful use of indices.</dd>
-**
-** [[SQLITE_STMTSTATUS_AUTOINDEX]] <dt>SQLITE_STMTSTATUS_AUTOINDEX</dt>
-** <dd>^This is the number of rows inserted into transient indices that
-** were created automatically in order to help joins run faster.
-** A non-zero value in this counter may indicate an opportunity to
-** improvement performance by adding permanent indices that do not
-** need to be reinitialized each time the statement is run.</dd>
-**
-** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
-** <dd>^This is the number of virtual machine operations executed
-** by the prepared statement if that number is less than or equal
-** to 2147483647.  The number of virtual machine operations can be 
-** used as a proxy for the total work done by the prepared statement.
-** If the number of virtual machine operations exceeds 2147483647
-** then the value returned by this statement status code is undefined.
-** </dd>
-** </dl>
-*/
-#define SQLITE_STMTSTATUS_FULLSCAN_STEP     1
-#define SQLITE_STMTSTATUS_SORT              2
-#define SQLITE_STMTSTATUS_AUTOINDEX         3
-#define SQLITE_STMTSTATUS_VM_STEP           4
-
-/*
-** CAPI3REF: Custom Page Cache Object
-**
-** The sqlite3_pcache type is opaque.  It is implemented by
-** the pluggable module.  The SQLite core has no knowledge of
-** its size or internal structure and never deals with the
-** sqlite3_pcache object except by holding and passing pointers
-** to the object.
-**
-** See [sqlite3_pcache_methods2] for additional information.
-*/
-typedef struct sqlite3_pcache sqlite3_pcache;
-
-/*
-** CAPI3REF: Custom Page Cache Object
-**
-** The sqlite3_pcache_page object represents a single page in the
-** page cache.  The page cache will allocate instances of this
-** object.  Various methods of the page cache use pointers to instances
-** of this object as parameters or as their return value.
-**
-** See [sqlite3_pcache_methods2] for additional information.
-*/
-typedef struct sqlite3_pcache_page sqlite3_pcache_page;
-struct sqlite3_pcache_page {
-  void *pBuf;        /* The content of the page */
-  void *pExtra;      /* Extra information associated with the page */
-};
-
-/*
-** CAPI3REF: Application Defined Page Cache.
-** KEYWORDS: {page cache}
-**
-** ^(The [sqlite3_config]([SQLITE_CONFIG_PCACHE2], ...) interface can
-** register an alternative page cache implementation by passing in an 
-** instance of the sqlite3_pcache_methods2 structure.)^
-** In many applications, most of the heap memory allocated by 
-** SQLite is used for the page cache.
-** By implementing a 
-** custom page cache using this API, an application can better control
-** the amount of memory consumed by SQLite, the way in which 
-** that memory is allocated and released, and the policies used to 
-** determine exactly which parts of a database file are cached and for 
-** how long.
-**
-** The alternative page cache mechanism is an
-** extreme measure that is only needed by the most demanding applications.
-** The built-in page cache is recommended for most uses.
-**
-** ^(The contents of the sqlite3_pcache_methods2 structure are copied to an
-** internal buffer by SQLite within the call to [sqlite3_config].  Hence
-** the application may discard the parameter after the call to
-** [sqlite3_config()] returns.)^
-**
-** [[the xInit() page cache method]]
-** ^(The xInit() method is called once for each effective 
-** call to [sqlite3_initialize()])^
-** (usually only once during the lifetime of the process). ^(The xInit()
-** method is passed a copy of the sqlite3_pcache_methods2.pArg value.)^
-** The intent of the xInit() method is to set up global data structures 
-** required by the custom page cache implementation. 
-** ^(If the xInit() method is NULL, then the 
-** built-in default page cache is used instead of the application defined
-** page cache.)^
-**
-** [[the xShutdown() page cache method]]
-** ^The xShutdown() method is called by [sqlite3_shutdown()].
-** It can be used to clean up 
-** any outstanding resources before process shutdown, if required.
-** ^The xShutdown() method may be NULL.
-**
-** ^SQLite automatically serializes calls to the xInit method,
-** so the xInit method need not be threadsafe.  ^The
-** xShutdown method is only called from [sqlite3_shutdown()] so it does
-** not need to be threadsafe either.  All other methods must be threadsafe
-** in multithreaded applications.
-**
-** ^SQLite will never invoke xInit() more than once without an intervening
-** call to xShutdown().
-**
-** [[the xCreate() page cache methods]]
-** ^SQLite invokes the xCreate() method to construct a new cache instance.
-** SQLite will typically create one cache instance for each open database file,
-** though this is not guaranteed. ^The
-** first parameter, szPage, is the size in bytes of the pages that must
-** be allocated by the cache.  ^szPage will always a power of two.  ^The
-** second parameter szExtra is a number of bytes of extra storage 
-** associated with each page cache entry.  ^The szExtra parameter will
-** a number less than 250.  SQLite will use the
-** extra szExtra bytes on each page to store metadata about the underlying
-** database page on disk.  The value passed into szExtra depends
-** on the SQLite version, the target platform, and how SQLite was compiled.
-** ^The third argument to xCreate(), bPurgeable, is true if the cache being
-** created will be used to cache database pages of a file stored on disk, or
-** false if it is used for an in-memory database. The cache implementation
-** does not have to do anything special based with the value of bPurgeable;
-** it is purely advisory.  ^On a cache where bPurgeable is false, SQLite will
-** never invoke xUnpin() except to deliberately delete a page.
-** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
-** false will always have the "discard" flag set to true.  
-** ^Hence, a cache created with bPurgeable false will
-** never contain any unpinned pages.
-**
-** [[the xCachesize() page cache method]]
-** ^(The xCachesize() method may be called at any time by SQLite to set the
-** suggested maximum cache-size (number of pages stored by) the cache
-** instance passed as the first argument. This is the value configured using
-** the SQLite "[PRAGMA cache_size]" command.)^  As with the bPurgeable
-** parameter, the implementation is not required to do anything with this
-** value; it is advisory only.
-**
-** [[the xPagecount() page cache methods]]
-** The xPagecount() method must return the number of pages currently
-** stored in the cache, both pinned and unpinned.
-** 
-** [[the xFetch() page cache methods]]
-** The xFetch() method locates a page in the cache and returns a pointer to 
-** an sqlite3_pcache_page object associated with that page, or a NULL pointer.
-** The pBuf element of the returned sqlite3_pcache_page object will be a
-** pointer to a buffer of szPage bytes used to store the content of a 
-** single database page.  The pExtra element of sqlite3_pcache_page will be
-** a pointer to the szExtra bytes of extra storage that SQLite has requested
-** for each entry in the page cache.
-**
-** The page to be fetched is determined by the key. ^The minimum key value
-** is 1.  After it has been retrieved using xFetch, the page is considered
-** to be "pinned".
-**
-** If the requested page is already in the page cache, then the page cache
-** implementation must return a pointer to the page buffer with its content
-** intact.  If the requested page is not already in the cache, then the
-** cache implementation should use the value of the createFlag
-** parameter to help it determined what action to take:
-**
-** <table border=1 width=85% align=center>
-** <tr><th> createFlag <th> Behavior when page is not already in cache
-** <tr><td> 0 <td> Do not allocate a new page.  Return NULL.
-** <tr><td> 1 <td> Allocate a new page if it easy and convenient to do so.
-**                 Otherwise return NULL.
-** <tr><td> 2 <td> Make every effort to allocate a new page.  Only return
-**                 NULL if allocating a new page is effectively impossible.
-** </table>
-**
-** ^(SQLite will normally invoke xFetch() with a createFlag of 0 or 1.  SQLite
-** will only use a createFlag of 2 after a prior call with a createFlag of 1
-** failed.)^  In between the to xFetch() calls, SQLite may
-** attempt to unpin one or more cache pages by spilling the content of
-** pinned pages to disk and synching the operating system disk cache.
-**
-** [[the xUnpin() page cache method]]
-** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
-** as its second argument.  If the third parameter, discard, is non-zero,
-** then the page must be evicted from the cache.
-** ^If the discard parameter is
-** zero, then the page may be discarded or retained at the discretion of
-** page cache implementation. ^The page cache implementation
-** may choose to evict unpinned pages at any time.
-**
-** The cache must not perform any reference counting. A single 
-** call to xUnpin() unpins the page regardless of the number of prior calls 
-** to xFetch().
-**
-** [[the xRekey() page cache methods]]
-** The xRekey() method is used to change the key value associated with the
-** page passed as the second argument. If the cache
-** previously contains an entry associated with newKey, it must be
-** discarded. ^Any prior cache entry associated with newKey is guaranteed not
-** to be pinned.
-**
-** When SQLite calls the xTruncate() method, the cache must discard all
-** existing cache entries with page numbers (keys) greater than or equal
-** to the value of the iLimit parameter passed to xTruncate(). If any
-** of these pages are pinned, they are implicitly unpinned, meaning that
-** they can be safely discarded.
-**
-** [[the xDestroy() page cache method]]
-** ^The xDestroy() method is used to delete a cache allocated by xCreate().
-** All resources associated with the specified cache should be freed. ^After
-** calling the xDestroy() method, SQLite considers the [sqlite3_pcache*]
-** handle invalid, and will not use it with any other sqlite3_pcache_methods2
-** functions.
-**
-** [[the xShrink() page cache method]]
-** ^SQLite invokes the xShrink() method when it wants the page cache to
-** free up as much of heap memory as possible.  The page cache implementation
-** is not obligated to free any memory, but well-behaved implementations should
-** do their best.
-*/
-typedef struct sqlite3_pcache_methods2 sqlite3_pcache_methods2;
-struct sqlite3_pcache_methods2 {
-  int iVersion;
-  void *pArg;
-  int (*xInit)(void*);
-  void (*xShutdown)(void*);
-  sqlite3_pcache *(*xCreate)(int szPage, int szExtra, int bPurgeable);
-  void (*xCachesize)(sqlite3_pcache*, int nCachesize);
-  int (*xPagecount)(sqlite3_pcache*);
-  sqlite3_pcache_page *(*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
-  void (*xUnpin)(sqlite3_pcache*, sqlite3_pcache_page*, int discard);
-  void (*xRekey)(sqlite3_pcache*, sqlite3_pcache_page*, 
-      unsigned oldKey, unsigned newKey);
-  void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
-  void (*xDestroy)(sqlite3_pcache*);
-  void (*xShrink)(sqlite3_pcache*);
-};
-
-/*
-** This is the obsolete pcache_methods object that has now been replaced
-** by sqlite3_pcache_methods2.  This object is not used by SQLite.  It is
-** retained in the header file for backwards compatibility only.
-*/
-typedef struct sqlite3_pcache_methods sqlite3_pcache_methods;
-struct sqlite3_pcache_methods {
-  void *pArg;
-  int (*xInit)(void*);
-  void (*xShutdown)(void*);
-  sqlite3_pcache *(*xCreate)(int szPage, int bPurgeable);
-  void (*xCachesize)(sqlite3_pcache*, int nCachesize);
-  int (*xPagecount)(sqlite3_pcache*);
-  void *(*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
-  void (*xUnpin)(sqlite3_pcache*, void*, int discard);
-  void (*xRekey)(sqlite3_pcache*, void*, unsigned oldKey, unsigned newKey);
-  void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
-  void (*xDestroy)(sqlite3_pcache*);
-};
-
-
-/*
-** CAPI3REF: Online Backup Object
-**
-** The sqlite3_backup object records state information about an ongoing
-** online backup operation.  ^The sqlite3_backup object is created by
-** a call to [sqlite3_backup_init()] and is destroyed by a call to
-** [sqlite3_backup_finish()].
-**
-** See Also: [Using the SQLite Online Backup API]
-*/
-typedef struct sqlite3_backup sqlite3_backup;
-
-/*
-** CAPI3REF: Online Backup API.
-**
-** The backup API copies the content of one database into another.
-** It is useful either for creating backups of databases or
-** for copying in-memory databases to or from persistent files. 
-**
-** See Also: [Using the SQLite Online Backup API]
-**
-** ^SQLite holds a write transaction open on the destination database file
-** for the duration of the backup operation.
-** ^The source database is read-locked only while it is being read;
-** it is not locked continuously for the entire backup operation.
-** ^Thus, the backup may be performed on a live source database without
-** preventing other database connections from
-** reading or writing to the source database while the backup is underway.
-** 
-** ^(To perform a backup operation: 
-**   <ol>
-**     <li><b>sqlite3_backup_init()</b> is called once to initialize the
-**         backup, 
-**     <li><b>sqlite3_backup_step()</b> is called one or more times to transfer 
-**         the data between the two databases, and finally
-**     <li><b>sqlite3_backup_finish()</b> is called to release all resources 
-**         associated with the backup operation. 
-**   </ol>)^
-** There should be exactly one call to sqlite3_backup_finish() for each
-** successful call to sqlite3_backup_init().
-**
-** [[sqlite3_backup_init()]] <b>sqlite3_backup_init()</b>
-**
-** ^The D and N arguments to sqlite3_backup_init(D,N,S,M) are the 
-** [database connection] associated with the destination database 
-** and the database name, respectively.
-** ^The database name is "main" for the main database, "temp" for the
-** temporary database, or the name specified after the AS keyword in
-** an [ATTACH] statement for an attached database.
-** ^The S and M arguments passed to 
-** sqlite3_backup_init(D,N,S,M) identify the [database connection]
-** and database name of the source database, respectively.
-** ^The source and destination [database connections] (parameters S and D)
-** must be different or else sqlite3_backup_init(D,N,S,M) will fail with
-** an error.
-**
-** ^A call to sqlite3_backup_init() will fail, returning SQLITE_ERROR, if 
-** there is already a read or read-write transaction open on the 
-** destination database.
-**
-** ^If an error occurs within sqlite3_backup_init(D,N,S,M), then NULL is
-** returned and an error code and error message are stored in the
-** destination [database connection] D.
-** ^The error code and message for the failed call to sqlite3_backup_init()
-** can be retrieved using the [sqlite3_errcode()], [sqlite3_errmsg()], and/or
-** [sqlite3_errmsg16()] functions.
-** ^A successful call to sqlite3_backup_init() returns a pointer to an
-** [sqlite3_backup] object.
-** ^The [sqlite3_backup] object may be used with the sqlite3_backup_step() and
-** sqlite3_backup_finish() functions to perform the specified backup 
-** operation.
-**
-** [[sqlite3_backup_step()]] <b>sqlite3_backup_step()</b>
-**
-** ^Function sqlite3_backup_step(B,N) will copy up to N pages between 
-** the source and destination databases specified by [sqlite3_backup] object B.
-** ^If N is negative, all remaining source pages are copied. 
-** ^If sqlite3_backup_step(B,N) successfully copies N pages and there
-** are still more pages to be copied, then the function returns [SQLITE_OK].
-** ^If sqlite3_backup_step(B,N) successfully finishes copying all pages
-** from source to destination, then it returns [SQLITE_DONE].
-** ^If an error occurs while running sqlite3_backup_step(B,N),
-** then an [error code] is returned. ^As well as [SQLITE_OK] and
-** [SQLITE_DONE], a call to sqlite3_backup_step() may return [SQLITE_READONLY],
-** [SQLITE_NOMEM], [SQLITE_BUSY], [SQLITE_LOCKED], or an
-** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX] extended error code.
-**
-** ^(The sqlite3_backup_step() might return [SQLITE_READONLY] if
-** <ol>
-** <li> the destination database was opened read-only, or
-** <li> the destination database is using write-ahead-log journaling
-** and the destination and source page sizes differ, or
-** <li> the destination database is an in-memory database and the
-** destination and source page sizes differ.
-** </ol>)^
-**
-** ^If sqlite3_backup_step() cannot obtain a required file-system lock, then
-** the [sqlite3_busy_handler | busy-handler function]
-** is invoked (if one is specified). ^If the 
-** busy-handler returns non-zero before the lock is available, then 
-** [SQLITE_BUSY] is returned to the caller. ^In this case the call to
-** sqlite3_backup_step() can be retried later. ^If the source
-** [database connection]
-** is being used to write to the source database when sqlite3_backup_step()
-** is called, then [SQLITE_LOCKED] is returned immediately. ^Again, in this
-** case the call to sqlite3_backup_step() can be retried later on. ^(If
-** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX], [SQLITE_NOMEM], or
-** [SQLITE_READONLY] is returned, then 
-** there is no point in retrying the call to sqlite3_backup_step(). These 
-** errors are considered fatal.)^  The application must accept 
-** that the backup operation has failed and pass the backup operation handle 
-** to the sqlite3_backup_finish() to release associated resources.
-**
-** ^The first call to sqlite3_backup_step() obtains an exclusive lock
-** on the destination file. ^The exclusive lock is not released until either 
-** sqlite3_backup_finish() is called or the backup operation is complete 
-** and sqlite3_backup_step() returns [SQLITE_DONE].  ^Every call to
-** sqlite3_backup_step() obtains a [shared lock] on the source database that
-** lasts for the duration of the sqlite3_backup_step() call.
-** ^Because the source database is not locked between calls to
-** sqlite3_backup_step(), the source database may be modified mid-way
-** through the backup process.  ^If the source database is modified by an
-** external process or via a database connection other than the one being
-** used by the backup operation, then the backup will be automatically
-** restarted by the next call to sqlite3_backup_step(). ^If the source 
-** database is modified by the using the same database connection as is used
-** by the backup operation, then the backup database is automatically
-** updated at the same time.
-**
-** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
-**
-** When sqlite3_backup_step() has returned [SQLITE_DONE], or when the 
-** application wishes to abandon the backup operation, the application
-** should destroy the [sqlite3_backup] by passing it to sqlite3_backup_finish().
-** ^The sqlite3_backup_finish() interfaces releases all
-** resources associated with the [sqlite3_backup] object. 
-** ^If sqlite3_backup_step() has not yet returned [SQLITE_DONE], then any
-** active write-transaction on the destination database is rolled back.
-** The [sqlite3_backup] object is invalid
-** and may not be used following a call to sqlite3_backup_finish().
-**
-** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
-** sqlite3_backup_step() errors occurred, regardless or whether or not
-** sqlite3_backup_step() completed.
-** ^If an out-of-memory condition or IO error occurred during any prior
-** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
-** sqlite3_backup_finish() returns the corresponding [error code].
-**
-** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
-** is not a permanent error and does not affect the return value of
-** sqlite3_backup_finish().
-**
-** [[sqlite3_backup_remaining()]] [[sqlite3_backup_pagecount()]]
-** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
-**
-** ^The sqlite3_backup_remaining() routine returns the number of pages still
-** to be backed up at the conclusion of the most recent sqlite3_backup_step().
-** ^The sqlite3_backup_pagecount() routine returns the total number of pages
-** in the source database at the conclusion of the most recent
-** sqlite3_backup_step().
-** ^(The values returned by these functions are only updated by
-** sqlite3_backup_step(). If the source database is modified in a way that
-** changes the size of the source database or the number of pages remaining,
-** those changes are not reflected in the output of sqlite3_backup_pagecount()
-** and sqlite3_backup_remaining() until after the next
-** sqlite3_backup_step().)^
-**
-** <b>Concurrent Usage of Database Handles</b>
-**
-** ^The source [database connection] may be used by the application for other
-** purposes while a backup operation is underway or being initialized.
-** ^If SQLite is compiled and configured to support threadsafe database
-** connections, then the source database connection may be used concurrently
-** from within other threads.
-**
-** However, the application must guarantee that the destination 
-** [database connection] is not passed to any other API (by any thread) after 
-** sqlite3_backup_init() is called and before the corresponding call to
-** sqlite3_backup_finish().  SQLite does not currently check to see
-** if the application incorrectly accesses the destination [database connection]
-** and so no error code is reported, but the operations may malfunction
-** nevertheless.  Use of the destination database connection while a
-** backup is in progress might also also cause a mutex deadlock.
-**
-** If running in [shared cache mode], the application must
-** guarantee that the shared cache used by the destination database
-** is not accessed while the backup is running. In practice this means
-** that the application must guarantee that the disk file being 
-** backed up to is not accessed by any connection within the process,
-** not just the specific connection that was passed to sqlite3_backup_init().
-**
-** The [sqlite3_backup] object itself is partially threadsafe. Multiple 
-** threads may safely make multiple concurrent calls to sqlite3_backup_step().
-** However, the sqlite3_backup_remaining() and sqlite3_backup_pagecount()
-** APIs are not strictly speaking threadsafe. If they are invoked at the
-** same time as another thread is invoking sqlite3_backup_step() it is
-** possible that they return invalid values.
-*/
-SQLITE_API sqlite3_backup *SQLITE_STDCALL sqlite3_backup_init(
-  sqlite3 *pDest,                        /* Destination database handle */
-  const char *zDestName,                 /* Destination database name */
-  sqlite3 *pSource,                      /* Source database handle */
-  const char *zSourceName                /* Source database name */
-);
-SQLITE_API int SQLITE_STDCALL sqlite3_backup_step(sqlite3_backup *p, int nPage);
-SQLITE_API int SQLITE_STDCALL sqlite3_backup_finish(sqlite3_backup *p);
-SQLITE_API int SQLITE_STDCALL sqlite3_backup_remaining(sqlite3_backup *p);
-SQLITE_API int SQLITE_STDCALL sqlite3_backup_pagecount(sqlite3_backup *p);
-
-/*
-** CAPI3REF: Unlock Notification
-** METHOD: sqlite3
-**
-** ^When running in shared-cache mode, a database operation may fail with
-** an [SQLITE_LOCKED] error if the required locks on the shared-cache or
-** individual tables within the shared-cache cannot be obtained. See
-** [SQLite Shared-Cache Mode] for a description of shared-cache locking. 
-** ^This API may be used to register a callback that SQLite will invoke 
-** when the connection currently holding the required lock relinquishes it.
-** ^This API is only available if the library was compiled with the
-** [SQLITE_ENABLE_UNLOCK_NOTIFY] C-preprocessor symbol defined.
-**
-** See Also: [Using the SQLite Unlock Notification Feature].
-**
-** ^Shared-cache locks are released when a database connection concludes
-** its current transaction, either by committing it or rolling it back. 
-**
-** ^When a connection (known as the blocked connection) fails to obtain a
-** shared-cache lock and SQLITE_LOCKED is returned to the caller, the
-** identity of the database connection (the blocking connection) that
-** has locked the required resource is stored internally. ^After an 
-** application receives an SQLITE_LOCKED error, it may call the
-** sqlite3_unlock_notify() method with the blocked connection handle as 
-** the first argument to register for a callback that will be invoked
-** when the blocking connections current transaction is concluded. ^The
-** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
-** call that concludes the blocking connections transaction.
-**
-** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
-** there is a chance that the blocking connection will have already
-** concluded its transaction by the time sqlite3_unlock_notify() is invoked.
-** If this happens, then the specified callback is invoked immediately,
-** from within the call to sqlite3_unlock_notify().)^
-**
-** ^If the blocked connection is attempting to obtain a write-lock on a
-** shared-cache table, and more than one other connection currently holds
-** a read-lock on the same table, then SQLite arbitrarily selects one of 
-** the other connections to use as the blocking connection.
-**
-** ^(There may be at most one unlock-notify callback registered by a 
-** blocked connection. If sqlite3_unlock_notify() is called when the
-** blocked connection already has a registered unlock-notify callback,
-** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
-** called with a NULL pointer as its second argument, then any existing
-** unlock-notify callback is canceled. ^The blocked connections 
-** unlock-notify callback may also be canceled by closing the blocked
-** connection using [sqlite3_close()].
-**
-** The unlock-notify callback is not reentrant. If an application invokes
-** any sqlite3_xxx API functions from within an unlock-notify callback, a
-** crash or deadlock may be the result.
-**
-** ^Unless deadlock is detected (see below), sqlite3_unlock_notify() always
-** returns SQLITE_OK.
-**
-** <b>Callback Invocation Details</b>
-**
-** When an unlock-notify callback is registered, the application provides a 
-** single void* pointer that is passed to the callback when it is invoked.
-** However, the signature of the callback function allows SQLite to pass
-** it an array of void* context pointers. The first argument passed to
-** an unlock-notify callback is a pointer to an array of void* pointers,
-** and the second is the number of entries in the array.
-**
-** When a blocking connections transaction is concluded, there may be
-** more than one blocked connection that has registered for an unlock-notify
-** callback. ^If two or more such blocked connections have specified the
-** same callback function, then instead of invoking the callback function
-** multiple times, it is invoked once with the set of void* context pointers
-** specified by the blocked connections bundled together into an array.
-** This gives the application an opportunity to prioritize any actions 
-** related to the set of unblocked database connections.
-**
-** <b>Deadlock Detection</b>
-**
-** Assuming that after registering for an unlock-notify callback a 
-** database waits for the callback to be issued before taking any further
-** action (a reasonable assumption), then using this API may cause the
-** application to deadlock. For example, if connection X is waiting for
-** connection Y's transaction to be concluded, and similarly connection
-** Y is waiting on connection X's transaction, then neither connection
-** will proceed and the system may remain deadlocked indefinitely.
-**
-** To avoid this scenario, the sqlite3_unlock_notify() performs deadlock
-** detection. ^If a given call to sqlite3_unlock_notify() would put the
-** system in a deadlocked state, then SQLITE_LOCKED is returned and no
-** unlock-notify callback is registered. The system is said to be in
-** a deadlocked state if connection A has registered for an unlock-notify
-** callback on the conclusion of connection B's transaction, and connection
-** B has itself registered for an unlock-notify callback when connection
-** A's transaction is concluded. ^Indirect deadlock is also detected, so
-** the system is also considered to be deadlocked if connection B has
-** registered for an unlock-notify callback on the conclusion of connection
-** C's transaction, where connection C is waiting on connection A. ^Any
-** number of levels of indirection are allowed.
-**
-** <b>The "DROP TABLE" Exception</b>
-**
-** When a call to [sqlite3_step()] returns SQLITE_LOCKED, it is almost 
-** always appropriate to call sqlite3_unlock_notify(). There is however,
-** one exception. When executing a "DROP TABLE" or "DROP INDEX" statement,
-** SQLite checks if there are any currently executing SELECT statements
-** that belong to the same connection. If there are, SQLITE_LOCKED is
-** returned. In this case there is no "blocking connection", so invoking
-** sqlite3_unlock_notify() results in the unlock-notify callback being
-** invoked immediately. If the application then re-attempts the "DROP TABLE"
-** or "DROP INDEX" query, an infinite loop might be the result.
-**
-** One way around this problem is to check the extended error code returned
-** by an sqlite3_step() call. ^(If there is a blocking connection, then the
-** extended error code is set to SQLITE_LOCKED_SHAREDCACHE. Otherwise, in
-** the special "DROP TABLE/INDEX" case, the extended error code is just 
-** SQLITE_LOCKED.)^
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_unlock_notify(
-  sqlite3 *pBlocked,                          /* Waiting connection */
-  void (*xNotify)(void **apArg, int nArg),    /* Callback function to invoke */
-  void *pNotifyArg                            /* Argument to pass to xNotify */
-);
-
-
-/*
-** CAPI3REF: String Comparison
-**
-** ^The [sqlite3_stricmp()] and [sqlite3_strnicmp()] APIs allow applications
-** and extensions to compare the contents of two buffers containing UTF-8
-** strings in a case-independent fashion, using the same definition of "case
-** independence" that SQLite uses internally when comparing identifiers.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_stricmp(const char *, const char *);
-SQLITE_API int SQLITE_STDCALL sqlite3_strnicmp(const char *, const char *, int);
-
-/*
-** CAPI3REF: String Globbing
-*
-** ^The [sqlite3_strglob(P,X)] interface returns zero if and only if
-** string X matches the [GLOB] pattern P.
-** ^The definition of [GLOB] pattern matching used in
-** [sqlite3_strglob(P,X)] is the same as for the "X GLOB P" operator in the
-** SQL dialect understood by SQLite.  ^The [sqlite3_strglob(P,X)] function
-** is case sensitive.
-**
-** Note that this routine returns zero on a match and non-zero if the strings
-** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()].
-**
-** See also: [sqlite3_strlike()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_strglob(const char *zGlob, const char *zStr);
-
-/*
-** CAPI3REF: String LIKE Matching
-*
-** ^The [sqlite3_strlike(P,X,E)] interface returns zero if and only if
-** string X matches the [LIKE] pattern P with escape character E.
-** ^The definition of [LIKE] pattern matching used in
-** [sqlite3_strlike(P,X,E)] is the same as for the "X LIKE P ESCAPE E"
-** operator in the SQL dialect understood by SQLite.  ^For "X LIKE P" without
-** the ESCAPE clause, set the E parameter of [sqlite3_strlike(P,X,E)] to 0.
-** ^As with the LIKE operator, the [sqlite3_strlike(P,X,E)] function is case
-** insensitive - equivalent upper and lower case ASCII characters match
-** one another.
-**
-** ^The [sqlite3_strlike(P,X,E)] function matches Unicode characters, though
-** only ASCII characters are case folded.
-**
-** Note that this routine returns zero on a match and non-zero if the strings
-** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()].
-**
-** See also: [sqlite3_strglob()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_strlike(const char *zGlob, const char *zStr, unsigned int cEsc);
-
-/*
-** CAPI3REF: Error Logging Interface
-**
-** ^The [sqlite3_log()] interface writes a message into the [error log]
-** established by the [SQLITE_CONFIG_LOG] option to [sqlite3_config()].
-** ^If logging is enabled, the zFormat string and subsequent arguments are
-** used with [sqlite3_snprintf()] to generate the final output string.
-**
-** The sqlite3_log() interface is intended for use by extensions such as
-** virtual tables, collating functions, and SQL functions.  While there is
-** nothing to prevent an application from calling sqlite3_log(), doing so
-** is considered bad form.
-**
-** The zFormat string must not be NULL.
-**
-** To avoid deadlocks and other threading problems, the sqlite3_log() routine
-** will not use dynamically allocated memory.  The log message is stored in
-** a fixed-length buffer on the stack.  If the log message is longer than
-** a few hundred characters, it will be truncated to the length of the
-** buffer.
-*/
-SQLITE_API void SQLITE_CDECL sqlite3_log(int iErrCode, const char *zFormat, ...);
-
-/*
-** CAPI3REF: Write-Ahead Log Commit Hook
-** METHOD: sqlite3
-**
-** ^The [sqlite3_wal_hook()] function is used to register a callback that
-** is invoked each time data is committed to a database in wal mode.
-**
-** ^(The callback is invoked by SQLite after the commit has taken place and 
-** the associated write-lock on the database released)^, so the implementation 
-** may read, write or [checkpoint] the database as required.
-**
-** ^The first parameter passed to the callback function when it is invoked
-** is a copy of the third parameter passed to sqlite3_wal_hook() when
-** registering the callback. ^The second is a copy of the database handle.
-** ^The third parameter is the name of the database that was written to -
-** either "main" or the name of an [ATTACH]-ed database. ^The fourth parameter
-** is the number of pages currently in the write-ahead log file,
-** including those that were just committed.
-**
-** The callback function should normally return [SQLITE_OK].  ^If an error
-** code is returned, that error will propagate back up through the
-** SQLite code base to cause the statement that provoked the callback
-** to report an error, though the commit will have still occurred. If the
-** callback returns [SQLITE_ROW] or [SQLITE_DONE], or if it returns a value
-** that does not correspond to any valid SQLite error code, the results
-** are undefined.
-**
-** A single database handle may have at most a single write-ahead log callback 
-** registered at one time. ^Calling [sqlite3_wal_hook()] replaces any
-** previously registered write-ahead log callback. ^Note that the
-** [sqlite3_wal_autocheckpoint()] interface and the
-** [wal_autocheckpoint pragma] both invoke [sqlite3_wal_hook()] and will
-** those overwrite any prior [sqlite3_wal_hook()] settings.
-*/
-SQLITE_API void *SQLITE_STDCALL sqlite3_wal_hook(
-  sqlite3*, 
-  int(*)(void *,sqlite3*,const char*,int),
-  void*
-);
-
-/*
-** CAPI3REF: Configure an auto-checkpoint
-** METHOD: sqlite3
-**
-** ^The [sqlite3_wal_autocheckpoint(D,N)] is a wrapper around
-** [sqlite3_wal_hook()] that causes any database on [database connection] D
-** to automatically [checkpoint]
-** after committing a transaction if there are N or
-** more frames in the [write-ahead log] file.  ^Passing zero or 
-** a negative value as the nFrame parameter disables automatic
-** checkpoints entirely.
-**
-** ^The callback registered by this function replaces any existing callback
-** registered using [sqlite3_wal_hook()].  ^Likewise, registering a callback
-** using [sqlite3_wal_hook()] disables the automatic checkpoint mechanism
-** configured by this function.
-**
-** ^The [wal_autocheckpoint pragma] can be used to invoke this interface
-** from SQL.
-**
-** ^Checkpoints initiated by this mechanism are
-** [sqlite3_wal_checkpoint_v2|PASSIVE].
-**
-** ^Every new [database connection] defaults to having the auto-checkpoint
-** enabled with a threshold of 1000 or [SQLITE_DEFAULT_WAL_AUTOCHECKPOINT]
-** pages.  The use of this interface
-** is only necessary if the default setting is found to be suboptimal
-** for a particular application.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_wal_autocheckpoint(sqlite3 *db, int N);
-
-/*
-** CAPI3REF: Checkpoint a database
-** METHOD: sqlite3
-**
-** ^(The sqlite3_wal_checkpoint(D,X) is equivalent to
-** [sqlite3_wal_checkpoint_v2](D,X,[SQLITE_CHECKPOINT_PASSIVE],0,0).)^
-**
-** In brief, sqlite3_wal_checkpoint(D,X) causes the content in the 
-** [write-ahead log] for database X on [database connection] D to be
-** transferred into the database file and for the write-ahead log to
-** be reset.  See the [checkpointing] documentation for addition
-** information.
-**
-** This interface used to be the only way to cause a checkpoint to
-** occur.  But then the newer and more powerful [sqlite3_wal_checkpoint_v2()]
-** interface was added.  This interface is retained for backwards
-** compatibility and as a convenience for applications that need to manually
-** start a callback but which do not need the full power (and corresponding
-** complication) of [sqlite3_wal_checkpoint_v2()].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb);
-
-/*
-** CAPI3REF: Checkpoint a database
-** METHOD: sqlite3
-**
-** ^(The sqlite3_wal_checkpoint_v2(D,X,M,L,C) interface runs a checkpoint
-** operation on database X of [database connection] D in mode M.  Status
-** information is written back into integers pointed to by L and C.)^
-** ^(The M parameter must be a valid [checkpoint mode]:)^
-**
-** <dl>
-** <dt>SQLITE_CHECKPOINT_PASSIVE<dd>
-**   ^Checkpoint as many frames as possible without waiting for any database 
-**   readers or writers to finish, then sync the database file if all frames 
-**   in the log were checkpointed. ^The [busy-handler callback]
-**   is never invoked in the SQLITE_CHECKPOINT_PASSIVE mode.  
-**   ^On the other hand, passive mode might leave the checkpoint unfinished
-**   if there are concurrent readers or writers.
-**
-** <dt>SQLITE_CHECKPOINT_FULL<dd>
-**   ^This mode blocks (it invokes the
-**   [sqlite3_busy_handler|busy-handler callback]) until there is no
-**   database writer and all readers are reading from the most recent database
-**   snapshot. ^It then checkpoints all frames in the log file and syncs the
-**   database file. ^This mode blocks new database writers while it is pending,
-**   but new database readers are allowed to continue unimpeded.
-**
-** <dt>SQLITE_CHECKPOINT_RESTART<dd>
-**   ^This mode works the same way as SQLITE_CHECKPOINT_FULL with the addition
-**   that after checkpointing the log file it blocks (calls the 
-**   [busy-handler callback])
-**   until all readers are reading from the database file only. ^This ensures 
-**   that the next writer will restart the log file from the beginning.
-**   ^Like SQLITE_CHECKPOINT_FULL, this mode blocks new
-**   database writer attempts while it is pending, but does not impede readers.
-**
-** <dt>SQLITE_CHECKPOINT_TRUNCATE<dd>
-**   ^This mode works the same way as SQLITE_CHECKPOINT_RESTART with the
-**   addition that it also truncates the log file to zero bytes just prior
-**   to a successful return.
-** </dl>
-**
-** ^If pnLog is not NULL, then *pnLog is set to the total number of frames in
-** the log file or to -1 if the checkpoint could not run because
-** of an error or because the database is not in [WAL mode]. ^If pnCkpt is not
-** NULL,then *pnCkpt is set to the total number of checkpointed frames in the
-** log file (including any that were already checkpointed before the function
-** was called) or to -1 if the checkpoint could not run due to an error or
-** because the database is not in WAL mode. ^Note that upon successful
-** completion of an SQLITE_CHECKPOINT_TRUNCATE, the log file will have been
-** truncated to zero bytes and so both *pnLog and *pnCkpt will be set to zero.
-**
-** ^All calls obtain an exclusive "checkpoint" lock on the database file. ^If
-** any other process is running a checkpoint operation at the same time, the 
-** lock cannot be obtained and SQLITE_BUSY is returned. ^Even if there is a 
-** busy-handler configured, it will not be invoked in this case.
-**
-** ^The SQLITE_CHECKPOINT_FULL, RESTART and TRUNCATE modes also obtain the 
-** exclusive "writer" lock on the database file. ^If the writer lock cannot be
-** obtained immediately, and a busy-handler is configured, it is invoked and
-** the writer lock retried until either the busy-handler returns 0 or the lock
-** is successfully obtained. ^The busy-handler is also invoked while waiting for
-** database readers as described above. ^If the busy-handler returns 0 before
-** the writer lock is obtained or while waiting for database readers, the
-** checkpoint operation proceeds from that point in the same way as 
-** SQLITE_CHECKPOINT_PASSIVE - checkpointing as many frames as possible 
-** without blocking any further. ^SQLITE_BUSY is returned in this case.
-**
-** ^If parameter zDb is NULL or points to a zero length string, then the
-** specified operation is attempted on all WAL databases [attached] to 
-** [database connection] db.  In this case the
-** values written to output parameters *pnLog and *pnCkpt are undefined. ^If 
-** an SQLITE_BUSY error is encountered when processing one or more of the 
-** attached WAL databases, the operation is still attempted on any remaining 
-** attached databases and SQLITE_BUSY is returned at the end. ^If any other 
-** error occurs while processing an attached database, processing is abandoned 
-** and the error code is returned to the caller immediately. ^If no error 
-** (SQLITE_BUSY or otherwise) is encountered while processing the attached 
-** databases, SQLITE_OK is returned.
-**
-** ^If database zDb is the name of an attached database that is not in WAL
-** mode, SQLITE_OK is returned and both *pnLog and *pnCkpt set to -1. ^If
-** zDb is not NULL (or a zero length string) and is not the name of any
-** attached database, SQLITE_ERROR is returned to the caller.
-**
-** ^Unless it returns SQLITE_MISUSE,
-** the sqlite3_wal_checkpoint_v2() interface
-** sets the error information that is queried by
-** [sqlite3_errcode()] and [sqlite3_errmsg()].
-**
-** ^The [PRAGMA wal_checkpoint] command can be used to invoke this interface
-** from SQL.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_wal_checkpoint_v2(
-  sqlite3 *db,                    /* Database handle */
-  const char *zDb,                /* Name of attached database (or NULL) */
-  int eMode,                      /* SQLITE_CHECKPOINT_* value */
-  int *pnLog,                     /* OUT: Size of WAL log in frames */
-  int *pnCkpt                     /* OUT: Total number of frames checkpointed */
-);
-
-/*
-** CAPI3REF: Checkpoint Mode Values
-** KEYWORDS: {checkpoint mode}
-**
-** These constants define all valid values for the "checkpoint mode" passed
-** as the third parameter to the [sqlite3_wal_checkpoint_v2()] interface.
-** See the [sqlite3_wal_checkpoint_v2()] documentation for details on the
-** meaning of each of these checkpoint modes.
-*/
-#define SQLITE_CHECKPOINT_PASSIVE  0  /* Do as much as possible w/o blocking */
-#define SQLITE_CHECKPOINT_FULL     1  /* Wait for writers, then checkpoint */
-#define SQLITE_CHECKPOINT_RESTART  2  /* Like FULL but wait for for readers */
-#define SQLITE_CHECKPOINT_TRUNCATE 3  /* Like RESTART but also truncate WAL */
-
-/*
-** CAPI3REF: Virtual Table Interface Configuration
-**
-** This function may be called by either the [xConnect] or [xCreate] method
-** of a [virtual table] implementation to configure
-** various facets of the virtual table interface.
-**
-** If this interface is invoked outside the context of an xConnect or
-** xCreate virtual table method then the behavior is undefined.
-**
-** At present, there is only one option that may be configured using
-** this function. (See [SQLITE_VTAB_CONSTRAINT_SUPPORT].)  Further options
-** may be added in the future.
-*/
-SQLITE_API int SQLITE_CDECL sqlite3_vtab_config(sqlite3*, int op, ...);
-
-/*
-** CAPI3REF: Virtual Table Configuration Options
-**
-** These macros define the various options to the
-** [sqlite3_vtab_config()] interface that [virtual table] implementations
-** can use to customize and optimize their behavior.
-**
-** <dl>
-** <dt>SQLITE_VTAB_CONSTRAINT_SUPPORT
-** <dd>Calls of the form
-** [sqlite3_vtab_config](db,SQLITE_VTAB_CONSTRAINT_SUPPORT,X) are supported,
-** where X is an integer.  If X is zero, then the [virtual table] whose
-** [xCreate] or [xConnect] method invoked [sqlite3_vtab_config()] does not
-** support constraints.  In this configuration (which is the default) if
-** a call to the [xUpdate] method returns [SQLITE_CONSTRAINT], then the entire
-** statement is rolled back as if [ON CONFLICT | OR ABORT] had been
-** specified as part of the users SQL statement, regardless of the actual
-** ON CONFLICT mode specified.
-**
-** If X is non-zero, then the virtual table implementation guarantees
-** that if [xUpdate] returns [SQLITE_CONSTRAINT], it will do so before
-** any modifications to internal or persistent data structures have been made.
-** If the [ON CONFLICT] mode is ABORT, FAIL, IGNORE or ROLLBACK, SQLite 
-** is able to roll back a statement or database transaction, and abandon
-** or continue processing the current SQL statement as appropriate. 
-** If the ON CONFLICT mode is REPLACE and the [xUpdate] method returns
-** [SQLITE_CONSTRAINT], SQLite handles this as if the ON CONFLICT mode
-** had been ABORT.
-**
-** Virtual table implementations that are required to handle OR REPLACE
-** must do so within the [xUpdate] method. If a call to the 
-** [sqlite3_vtab_on_conflict()] function indicates that the current ON 
-** CONFLICT policy is REPLACE, the virtual table implementation should 
-** silently replace the appropriate rows within the xUpdate callback and
-** return SQLITE_OK. Or, if this is not possible, it may return
-** SQLITE_CONSTRAINT, in which case SQLite falls back to OR ABORT 
-** constraint handling.
-** </dl>
-*/
-#define SQLITE_VTAB_CONSTRAINT_SUPPORT 1
-
-/*
-** CAPI3REF: Determine The Virtual Table Conflict Policy
-**
-** This function may only be called from within a call to the [xUpdate] method
-** of a [virtual table] implementation for an INSERT or UPDATE operation. ^The
-** value returned is one of [SQLITE_ROLLBACK], [SQLITE_IGNORE], [SQLITE_FAIL],
-** [SQLITE_ABORT], or [SQLITE_REPLACE], according to the [ON CONFLICT] mode
-** of the SQL statement that triggered the call to the [xUpdate] method of the
-** [virtual table].
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_vtab_on_conflict(sqlite3 *);
-
-/*
-** CAPI3REF: Conflict resolution modes
-** KEYWORDS: {conflict resolution mode}
-**
-** These constants are returned by [sqlite3_vtab_on_conflict()] to
-** inform a [virtual table] implementation what the [ON CONFLICT] mode
-** is for the SQL statement being evaluated.
-**
-** Note that the [SQLITE_IGNORE] constant is also used as a potential
-** return value from the [sqlite3_set_authorizer()] callback and that
-** [SQLITE_ABORT] is also a [result code].
-*/
-#define SQLITE_ROLLBACK 1
-/* #define SQLITE_IGNORE 2 // Also used by sqlite3_authorizer() callback */
-#define SQLITE_FAIL     3
-/* #define SQLITE_ABORT 4  // Also an error code */
-#define SQLITE_REPLACE  5
-
-/*
-** CAPI3REF: Prepared Statement Scan Status Opcodes
-** KEYWORDS: {scanstatus options}
-**
-** The following constants can be used for the T parameter to the
-** [sqlite3_stmt_scanstatus(S,X,T,V)] interface.  Each constant designates a
-** different metric for sqlite3_stmt_scanstatus() to return.
-**
-** When the value returned to V is a string, space to hold that string is
-** managed by the prepared statement S and will be automatically freed when
-** S is finalized.
-**
-** <dl>
-** [[SQLITE_SCANSTAT_NLOOP]] <dt>SQLITE_SCANSTAT_NLOOP</dt>
-** <dd>^The [sqlite3_int64] variable pointed to by the T parameter will be
-** set to the total number of times that the X-th loop has run.</dd>
-**
-** [[SQLITE_SCANSTAT_NVISIT]] <dt>SQLITE_SCANSTAT_NVISIT</dt>
-** <dd>^The [sqlite3_int64] variable pointed to by the T parameter will be set
-** to the total number of rows examined by all iterations of the X-th loop.</dd>
-**
-** [[SQLITE_SCANSTAT_EST]] <dt>SQLITE_SCANSTAT_EST</dt>
-** <dd>^The "double" variable pointed to by the T parameter will be set to the
-** query planner's estimate for the average number of rows output from each
-** iteration of the X-th loop.  If the query planner's estimates was accurate,
-** then this value will approximate the quotient NVISIT/NLOOP and the
-** product of this value for all prior loops with the same SELECTID will
-** be the NLOOP value for the current loop.
-**
-** [[SQLITE_SCANSTAT_NAME]] <dt>SQLITE_SCANSTAT_NAME</dt>
-** <dd>^The "const char *" variable pointed to by the T parameter will be set
-** to a zero-terminated UTF-8 string containing the name of the index or table
-** used for the X-th loop.
-**
-** [[SQLITE_SCANSTAT_EXPLAIN]] <dt>SQLITE_SCANSTAT_EXPLAIN</dt>
-** <dd>^The "const char *" variable pointed to by the T parameter will be set
-** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
-** description for the X-th loop.
-**
-** [[SQLITE_SCANSTAT_SELECTID]] <dt>SQLITE_SCANSTAT_SELECT</dt>
-** <dd>^The "int" variable pointed to by the T parameter will be set to the
-** "select-id" for the X-th loop.  The select-id identifies which query or
-** subquery the loop is part of.  The main query has a select-id of zero.
-** The select-id is the same value as is output in the first column
-** of an [EXPLAIN QUERY PLAN] query.
-** </dl>
-*/
-#define SQLITE_SCANSTAT_NLOOP    0
-#define SQLITE_SCANSTAT_NVISIT   1
-#define SQLITE_SCANSTAT_EST      2
-#define SQLITE_SCANSTAT_NAME     3
-#define SQLITE_SCANSTAT_EXPLAIN  4
-#define SQLITE_SCANSTAT_SELECTID 5
-
-/*
-** CAPI3REF: Prepared Statement Scan Status
-** METHOD: sqlite3_stmt
-**
-** This interface returns information about the predicted and measured
-** performance for pStmt.  Advanced applications can use this
-** interface to compare the predicted and the measured performance and
-** issue warnings and/or rerun [ANALYZE] if discrepancies are found.
-**
-** Since this interface is expected to be rarely used, it is only
-** available if SQLite is compiled using the [SQLITE_ENABLE_STMT_SCANSTATUS]
-** compile-time option.
-**
-** The "iScanStatusOp" parameter determines which status information to return.
-** The "iScanStatusOp" must be one of the [scanstatus options] or the behavior
-** of this interface is undefined.
-** ^The requested measurement is written into a variable pointed to by
-** the "pOut" parameter.
-** Parameter "idx" identifies the specific loop to retrieve statistics for.
-** Loops are numbered starting from zero. ^If idx is out of range - less than
-** zero or greater than or equal to the total number of loops used to implement
-** the statement - a non-zero value is returned and the variable that pOut
-** points to is unchanged.
-**
-** ^Statistics might not be available for all loops in all statements. ^In cases
-** where there exist loops with no available statistics, this function behaves
-** as if the loop did not exist - it returns non-zero and leave the variable
-** that pOut points to unchanged.
-**
-** See also: [sqlite3_stmt_scanstatus_reset()]
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_stmt_scanstatus(
-  sqlite3_stmt *pStmt,      /* Prepared statement for which info desired */
-  int idx,                  /* Index of loop to report on */
-  int iScanStatusOp,        /* Information desired.  SQLITE_SCANSTAT_* */
-  void *pOut                /* Result written here */
-);     
-
-/*
-** CAPI3REF: Zero Scan-Status Counters
-** METHOD: sqlite3_stmt
-**
-** ^Zero all [sqlite3_stmt_scanstatus()] related event counters.
-**
-** This API is only available if the library is built with pre-processor
-** symbol [SQLITE_ENABLE_STMT_SCANSTATUS] defined.
-*/
-SQLITE_API void SQLITE_STDCALL sqlite3_stmt_scanstatus_reset(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Flush caches to disk mid-transaction
-**
-** ^If a write-transaction is open on [database connection] D when the
-** [sqlite3_db_cacheflush(D)] interface invoked, any dirty
-** pages in the pager-cache that are not currently in use are written out 
-** to disk. A dirty page may be in use if a database cursor created by an
-** active SQL statement is reading from it, or if it is page 1 of a database
-** file (page 1 is always "in use").  ^The [sqlite3_db_cacheflush(D)]
-** interface flushes caches for all schemas - "main", "temp", and
-** any [attached] databases.
-**
-** ^If this function needs to obtain extra database locks before dirty pages 
-** can be flushed to disk, it does so. ^If those locks cannot be obtained 
-** immediately and there is a busy-handler callback configured, it is invoked
-** in the usual manner. ^If the required lock still cannot be obtained, then
-** the database is skipped and an attempt made to flush any dirty pages
-** belonging to the next (if any) database. ^If any databases are skipped
-** because locks cannot be obtained, but no other error occurs, this
-** function returns SQLITE_BUSY.
-**
-** ^If any other error occurs while flushing dirty pages to disk (for
-** example an IO error or out-of-memory condition), then processing is
-** abandoned and an SQLite [error code] is returned to the caller immediately.
-**
-** ^Otherwise, if no error occurs, [sqlite3_db_cacheflush()] returns SQLITE_OK.
-**
-** ^This function does not set the database handle error code or message
-** returned by the [sqlite3_errcode()] and [sqlite3_errmsg()] functions.
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_db_cacheflush(sqlite3*);
-
-/*
-** CAPI3REF: Database Snapshot
-** KEYWORDS: {snapshot}
-** EXPERIMENTAL
-**
-** An instance of the snapshot object records the state of a [WAL mode]
-** database for some specific point in history.
-**
-** In [WAL mode], multiple [database connections] that are open on the
-** same database file can each be reading a different historical version
-** of the database file.  When a [database connection] begins a read
-** transaction, that connection sees an unchanging copy of the database
-** as it existed for the point in time when the transaction first started.
-** Subsequent changes to the database from other connections are not seen
-** by the reader until a new read transaction is started.
-**
-** The sqlite3_snapshot object records state information about an historical
-** version of the database file so that it is possible to later open a new read
-** transaction that sees that historical version of the database rather than
-** the most recent version.
-**
-** The constructor for this object is [sqlite3_snapshot_get()].  The
-** [sqlite3_snapshot_open()] method causes a fresh read transaction to refer
-** to an historical snapshot (if possible).  The destructor for 
-** sqlite3_snapshot objects is [sqlite3_snapshot_free()].
-*/
-typedef struct sqlite3_snapshot sqlite3_snapshot;
-
-/*
-** CAPI3REF: Record A Database Snapshot
-** EXPERIMENTAL
-**
-** ^The [sqlite3_snapshot_get(D,S,P)] interface attempts to make a
-** new [sqlite3_snapshot] object that records the current state of
-** schema S in database connection D.  ^On success, the
-** [sqlite3_snapshot_get(D,S,P)] interface writes a pointer to the newly
-** created [sqlite3_snapshot] object into *P and returns SQLITE_OK.
-** ^If schema S of [database connection] D is not a [WAL mode] database
-** that is in a read transaction, then [sqlite3_snapshot_get(D,S,P)]
-** leaves the *P value unchanged and returns an appropriate [error code].
-**
-** The [sqlite3_snapshot] object returned from a successful call to
-** [sqlite3_snapshot_get()] must be freed using [sqlite3_snapshot_free()]
-** to avoid a memory leak.
-**
-** The [sqlite3_snapshot_get()] interface is only available when the
-** SQLITE_ENABLE_SNAPSHOT compile-time option is used.
-*/
-SQLITE_API SQLITE_EXPERIMENTAL int SQLITE_STDCALL sqlite3_snapshot_get(
-  sqlite3 *db,
-  const char *zSchema,
-  sqlite3_snapshot **ppSnapshot
-);
-
-/*
-** CAPI3REF: Start a read transaction on an historical snapshot
-** EXPERIMENTAL
-**
-** ^The [sqlite3_snapshot_open(D,S,P)] interface attempts to move the
-** read transaction that is currently open on schema S of
-** [database connection] D so that it refers to historical [snapshot] P.
-** ^The [sqlite3_snapshot_open()] interface returns SQLITE_OK on success
-** or an appropriate [error code] if it fails.
-**
-** ^In order to succeed, a call to [sqlite3_snapshot_open(D,S,P)] must be
-** the first operation, apart from other sqlite3_snapshot_open() calls,
-** following the [BEGIN] that starts a new read transaction.
-** ^A [snapshot] will fail to open if it has been overwritten by a 
-** [checkpoint].  
-**
-** The [sqlite3_snapshot_open()] interface is only available when the
-** SQLITE_ENABLE_SNAPSHOT compile-time option is used.
-*/
-SQLITE_API SQLITE_EXPERIMENTAL int SQLITE_STDCALL sqlite3_snapshot_open(
-  sqlite3 *db,
-  const char *zSchema,
-  sqlite3_snapshot *pSnapshot
-);
-
-/*
-** CAPI3REF: Destroy a snapshot
-** EXPERIMENTAL
-**
-** ^The [sqlite3_snapshot_free(P)] interface destroys [sqlite3_snapshot] P.
-** The application must eventually free every [sqlite3_snapshot] object
-** using this routine to avoid a memory leak.
-**
-** The [sqlite3_snapshot_free()] interface is only available when the
-** SQLITE_ENABLE_SNAPSHOT compile-time option is used.
-*/
-SQLITE_API SQLITE_EXPERIMENTAL void SQLITE_STDCALL sqlite3_snapshot_free(sqlite3_snapshot*);
-
-/*
-** Undo the hack that converts floating point types to integer for
-** builds on processors without floating point support.
-*/
-#ifdef SQLITE_OMIT_FLOATING_POINT
-# undef double
-#endif
-
-#ifdef __cplusplus
-}  /* End of the 'extern "C"' block */
-#endif
-#endif /* _SQLITE3_H_ */
-
-/*
-** 2010 August 30
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-*/
-
-#ifndef _SQLITE3RTREE_H_
-#define _SQLITE3RTREE_H_
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct sqlite3_rtree_geometry sqlite3_rtree_geometry;
-typedef struct sqlite3_rtree_query_info sqlite3_rtree_query_info;
-
-/* The double-precision datatype used by RTree depends on the
-** SQLITE_RTREE_INT_ONLY compile-time option.
-*/
-#ifdef SQLITE_RTREE_INT_ONLY
-  typedef sqlite3_int64 sqlite3_rtree_dbl;
-#else
-  typedef double sqlite3_rtree_dbl;
-#endif
-
-/*
-** Register a geometry callback named zGeom that can be used as part of an
-** R-Tree geometry query as follows:
-**
-**   SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zGeom(... params ...)
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_rtree_geometry_callback(
-  sqlite3 *db,
-  const char *zGeom,
-  int (*xGeom)(sqlite3_rtree_geometry*, int, sqlite3_rtree_dbl*,int*),
-  void *pContext
-);
-
-
-/*
-** A pointer to a structure of the following type is passed as the first
-** argument to callbacks registered using rtree_geometry_callback().
-*/
-struct sqlite3_rtree_geometry {
-  void *pContext;                 /* Copy of pContext passed to s_r_g_c() */
-  int nParam;                     /* Size of array aParam[] */
-  sqlite3_rtree_dbl *aParam;      /* Parameters passed to SQL geom function */
-  void *pUser;                    /* Callback implementation user data */
-  void (*xDelUser)(void *);       /* Called by SQLite to clean up pUser */
-};
-
-/*
-** Register a 2nd-generation geometry callback named zScore that can be 
-** used as part of an R-Tree geometry query as follows:
-**
-**   SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zQueryFunc(... params ...)
-*/
-SQLITE_API int SQLITE_STDCALL sqlite3_rtree_query_callback(
-  sqlite3 *db,
-  const char *zQueryFunc,
-  int (*xQueryFunc)(sqlite3_rtree_query_info*),
-  void *pContext,
-  void (*xDestructor)(void*)
-);
-
-
-/*
-** A pointer to a structure of the following type is passed as the 
-** argument to scored geometry callback registered using
-** sqlite3_rtree_query_callback().
-**
-** Note that the first 5 fields of this structure are identical to
-** sqlite3_rtree_geometry.  This structure is a subclass of
-** sqlite3_rtree_geometry.
-*/
-struct sqlite3_rtree_query_info {
-  void *pContext;                   /* pContext from when function registered */
-  int nParam;                       /* Number of function parameters */
-  sqlite3_rtree_dbl *aParam;        /* value of function parameters */
-  void *pUser;                      /* callback can use this, if desired */
-  void (*xDelUser)(void*);          /* function to free pUser */
-  sqlite3_rtree_dbl *aCoord;        /* Coordinates of node or entry to check */
-  unsigned int *anQueue;            /* Number of pending entries in the queue */
-  int nCoord;                       /* Number of coordinates */
-  int iLevel;                       /* Level of current node or entry */
-  int mxLevel;                      /* The largest iLevel value in the tree */
-  sqlite3_int64 iRowid;             /* Rowid for current entry */
-  sqlite3_rtree_dbl rParentScore;   /* Score of parent node */
-  int eParentWithin;                /* Visibility of parent node */
-  int eWithin;                      /* OUT: Visiblity */
-  sqlite3_rtree_dbl rScore;         /* OUT: Write the score here */
-  /* The following fields are only available in 3.8.11 and later */
-  sqlite3_value **apSqlParam;       /* Original SQL values of parameters */
-};
-
-/*
-** Allowed values for sqlite3_rtree_query.eWithin and .eParentWithin.
-*/
-#define NOT_WITHIN       0   /* Object completely outside of query region */
-#define PARTLY_WITHIN    1   /* Object partially overlaps query region */
-#define FULLY_WITHIN     2   /* Object fully contained within query region */
-
-
-#ifdef __cplusplus
-}  /* end of the 'extern "C"' block */
-#endif
-
-#endif  /* ifndef _SQLITE3RTREE_H_ */
-
-/*
-** 2014 May 31
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-******************************************************************************
-**
-** Interfaces to extend FTS5. Using the interfaces defined in this file, 
-** FTS5 may be extended with:
-**
-**     * custom tokenizers, and
-**     * custom auxiliary functions.
-*/
-
-
-#ifndef _FTS5_H
-#define _FTS5_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*************************************************************************
-** CUSTOM AUXILIARY FUNCTIONS
-**
-** Virtual table implementations may overload SQL functions by implementing
-** the sqlite3_module.xFindFunction() method.
-*/
-
-typedef struct Fts5ExtensionApi Fts5ExtensionApi;
-typedef struct Fts5Context Fts5Context;
-typedef struct Fts5PhraseIter Fts5PhraseIter;
-
-typedef void (*fts5_extension_function)(
-  const Fts5ExtensionApi *pApi,   /* API offered by current FTS version */
-  Fts5Context *pFts,              /* First arg to pass to pApi functions */
-  sqlite3_context *pCtx,          /* Context for returning result/error */
-  int nVal,                       /* Number of values in apVal[] array */
-  sqlite3_value **apVal           /* Array of trailing arguments */
-);
-
-struct Fts5PhraseIter {
-  const unsigned char *a;
-  const unsigned char *b;
-};
-
-/*
-** EXTENSION API FUNCTIONS
-**
-** xUserData(pFts):
-**   Return a copy of the context pointer the extension function was 
-**   registered with.
-**
-** xColumnTotalSize(pFts, iCol, pnToken):
-**   If parameter iCol is less than zero, set output variable *pnToken
-**   to the total number of tokens in the FTS5 table. Or, if iCol is
-**   non-negative but less than the number of columns in the table, return
-**   the total number of tokens in column iCol, considering all rows in 
-**   the FTS5 table.
-**
-**   If parameter iCol is greater than or equal to the number of columns
-**   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
-**   an OOM condition or IO error), an appropriate SQLite error code is 
-**   returned.
-**
-** xColumnCount(pFts):
-**   Return the number of columns in the table.
-**
-** xColumnSize(pFts, iCol, pnToken):
-**   If parameter iCol is less than zero, set output variable *pnToken
-**   to the total number of tokens in the current row. Or, if iCol is
-**   non-negative but less than the number of columns in the table, set
-**   *pnToken to the number of tokens in column iCol of the current row.
-**
-**   If parameter iCol is greater than or equal to the number of columns
-**   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
-**   an OOM condition or IO error), an appropriate SQLite error code is 
-**   returned.
-**
-**   This function may be quite inefficient if used with an FTS5 table
-**   created with the "columnsize=0" option.
-**
-** xColumnText:
-**   This function attempts to retrieve the text of column iCol of the
-**   current document. If successful, (*pz) is set to point to a buffer
-**   containing the text in utf-8 encoding, (*pn) is set to the size in bytes
-**   (not characters) of the buffer and SQLITE_OK is returned. Otherwise,
-**   if an error occurs, an SQLite error code is returned and the final values
-**   of (*pz) and (*pn) are undefined.
-**
-** xPhraseCount:
-**   Returns the number of phrases in the current query expression.
-**
-** xPhraseSize:
-**   Returns the number of tokens in phrase iPhrase of the query. Phrases
-**   are numbered starting from zero.
-**
-** xInstCount:
-**   Set *pnInst to the total number of occurrences of all phrases within
-**   the query within the current row. Return SQLITE_OK if successful, or
-**   an error code (i.e. SQLITE_NOMEM) if an error occurs.
-**
-**   This API can be quite slow if used with an FTS5 table created with the
-**   "detail=none" or "detail=column" option. If the FTS5 table is created 
-**   with either "detail=none" or "detail=column" and "content=" option 
-**   (i.e. if it is a contentless table), then this API always returns 0.
-**
-** xInst:
-**   Query for the details of phrase match iIdx within the current row.
-**   Phrase matches are numbered starting from zero, so the iIdx argument
-**   should be greater than or equal to zero and smaller than the value
-**   output by xInstCount().
-**
-**   Usually, output parameter *piPhrase is set to the phrase number, *piCol
-**   to the column in which it occurs and *piOff the token offset of the
-**   first token of the phrase. The exception is if the table was created
-**   with the offsets=0 option specified. In this case *piOff is always
-**   set to -1.
-**
-**   Returns SQLITE_OK if successful, or an error code (i.e. SQLITE_NOMEM) 
-**   if an error occurs.
-**
-**   This API can be quite slow if used with an FTS5 table created with the
-**   "detail=none" or "detail=column" option. 
-**
-** xRowid:
-**   Returns the rowid of the current row.
-**
-** xTokenize:
-**   Tokenize text using the tokenizer belonging to the FTS5 table.
-**
-** xQueryPhrase(pFts5, iPhrase, pUserData, xCallback):
-**   This API function is used to query the FTS table for phrase iPhrase
-**   of the current query. Specifically, a query equivalent to:
-**
-**       ... FROM ftstable WHERE ftstable MATCH $p ORDER BY rowid
-**
-**   with $p set to a phrase equivalent to the phrase iPhrase of the
-**   current query is executed. For each row visited, the callback function
-**   passed as the fourth argument is invoked. The context and API objects 
-**   passed to the callback function may be used to access the properties of
-**   each matched row. Invoking Api.xUserData() returns a copy of the pointer
-**   passed as the third argument to pUserData.
-**
-**   If the callback function returns any value other than SQLITE_OK, the
-**   query is abandoned and the xQueryPhrase function returns immediately.
-**   If the returned value is SQLITE_DONE, xQueryPhrase returns SQLITE_OK.
-**   Otherwise, the error code is propagated upwards.
-**
-**   If the query runs to completion without incident, SQLITE_OK is returned.
-**   Or, if some error occurs before the query completes or is aborted by
-**   the callback, an SQLite error code is returned.
-**
-**
-** xSetAuxdata(pFts5, pAux, xDelete)
-**
-**   Save the pointer passed as the second argument as the extension functions 
-**   "auxiliary data". The pointer may then be retrieved by the current or any
-**   future invocation of the same fts5 extension function made as part of
-**   of the same MATCH query using the xGetAuxdata() API.
-**
-**   Each extension function is allocated a single auxiliary data slot for
-**   each FTS query (MATCH expression). If the extension function is invoked 
-**   more than once for a single FTS query, then all invocations share a 
-**   single auxiliary data context.
-**
-**   If there is already an auxiliary data pointer when this function is
-**   invoked, then it is replaced by the new pointer. If an xDelete callback
-**   was specified along with the original pointer, it is invoked at this
-**   point.
-**
-**   The xDelete callback, if one is specified, is also invoked on the
-**   auxiliary data pointer after the FTS5 query has finished.
-**
-**   If an error (e.g. an OOM condition) occurs within this function, an
-**   the auxiliary data is set to NULL and an error code returned. If the
-**   xDelete parameter was not NULL, it is invoked on the auxiliary data
-**   pointer before returning.
-**
-**
-** xGetAuxdata(pFts5, bClear)
-**
-**   Returns the current auxiliary data pointer for the fts5 extension 
-**   function. See the xSetAuxdata() method for details.
-**
-**   If the bClear argument is non-zero, then the auxiliary data is cleared
-**   (set to NULL) before this function returns. In this case the xDelete,
-**   if any, is not invoked.
-**
-**
-** xRowCount(pFts5, pnRow)
-**
-**   This function is used to retrieve the total number of rows in the table.
-**   In other words, the same value that would be returned by:
-**
-**        SELECT count(*) FROM ftstable;
-**
-** xPhraseFirst()
-**   This function is used, along with type Fts5PhraseIter and the xPhraseNext
-**   method, to iterate through all instances of a single query phrase within
-**   the current row. This is the same information as is accessible via the
-**   xInstCount/xInst APIs. While the xInstCount/xInst APIs are more convenient
-**   to use, this API may be faster under some circumstances. To iterate 
-**   through instances of phrase iPhrase, use the following code:
-**
-**       Fts5PhraseIter iter;
-**       int iCol, iOff;
-**       for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff);
-**           iCol>=0;
-**           pApi->xPhraseNext(pFts, &iter, &iCol, &iOff)
-**       ){
-**         // An instance of phrase iPhrase at offset iOff of column iCol
-**       }
-**
-**   The Fts5PhraseIter structure is defined above. Applications should not
-**   modify this structure directly - it should only be used as shown above
-**   with the xPhraseFirst() and xPhraseNext() API methods (and by
-**   xPhraseFirstColumn() and xPhraseNextColumn() as illustrated below).
-**
-**   This API can be quite slow if used with an FTS5 table created with the
-**   "detail=none" or "detail=column" option. If the FTS5 table is created 
-**   with either "detail=none" or "detail=column" and "content=" option 
-**   (i.e. if it is a contentless table), then this API always iterates
-**   through an empty set (all calls to xPhraseFirst() set iCol to -1).
-**
-** xPhraseNext()
-**   See xPhraseFirst above.
-**
-** xPhraseFirstColumn()
-**   This function and xPhraseNextColumn() are similar to the xPhraseFirst()
-**   and xPhraseNext() APIs described above. The difference is that instead
-**   of iterating through all instances of a phrase in the current row, these
-**   APIs are used to iterate through the set of columns in the current row
-**   that contain one or more instances of a specified phrase. For example:
-**
-**       Fts5PhraseIter iter;
-**       int iCol;
-**       for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol);
-**           iCol>=0;
-**           pApi->xPhraseNextColumn(pFts, &iter, &iCol)
-**       ){
-**         // Column iCol contains at least one instance of phrase iPhrase
-**       }
-**
-**   This API can be quite slow if used with an FTS5 table created with the
-**   "detail=none" option. If the FTS5 table is created with either 
-**   "detail=none" "content=" option (i.e. if it is a contentless table), 
-**   then this API always iterates through an empty set (all calls to 
-**   xPhraseFirstColumn() set iCol to -1).
-**
-**   The information accessed using this API and its companion
-**   xPhraseFirstColumn() may also be obtained using xPhraseFirst/xPhraseNext
-**   (or xInst/xInstCount). The chief advantage of this API is that it is
-**   significantly more efficient than those alternatives when used with
-**   "detail=column" tables.  
-**
-** xPhraseNextColumn()
-**   See xPhraseFirstColumn above.
-*/
-struct Fts5ExtensionApi {
-  int iVersion;                   /* Currently always set to 3 */
-
-  void *(*xUserData)(Fts5Context*);
-
-  int (*xColumnCount)(Fts5Context*);
-  int (*xRowCount)(Fts5Context*, sqlite3_int64 *pnRow);
-  int (*xColumnTotalSize)(Fts5Context*, int iCol, sqlite3_int64 *pnToken);
-
-  int (*xTokenize)(Fts5Context*, 
-    const char *pText, int nText, /* Text to tokenize */
-    void *pCtx,                   /* Context passed to xToken() */
-    int (*xToken)(void*, int, const char*, int, int, int)       /* Callback */
-  );
-
-  int (*xPhraseCount)(Fts5Context*);
-  int (*xPhraseSize)(Fts5Context*, int iPhrase);
-
-  int (*xInstCount)(Fts5Context*, int *pnInst);
-  int (*xInst)(Fts5Context*, int iIdx, int *piPhrase, int *piCol, int *piOff);
-
-  sqlite3_int64 (*xRowid)(Fts5Context*);
-  int (*xColumnText)(Fts5Context*, int iCol, const char **pz, int *pn);
-  int (*xColumnSize)(Fts5Context*, int iCol, int *pnToken);
-
-  int (*xQueryPhrase)(Fts5Context*, int iPhrase, void *pUserData,
-    int(*)(const Fts5ExtensionApi*,Fts5Context*,void*)
-  );
-  int (*xSetAuxdata)(Fts5Context*, void *pAux, void(*xDelete)(void*));
-  void *(*xGetAuxdata)(Fts5Context*, int bClear);
-
-  int (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*);
-  void (*xPhraseNext)(Fts5Context*, Fts5PhraseIter*, int *piCol, int *piOff);
-
-  int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*);
-  void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol);
-};
-
-/* 
-** CUSTOM AUXILIARY FUNCTIONS
-*************************************************************************/
-
-/*************************************************************************
-** CUSTOM TOKENIZERS
-**
-** Applications may also register custom tokenizer types. A tokenizer 
-** is registered by providing fts5 with a populated instance of the 
-** following structure. All structure methods must be defined, setting
-** any member of the fts5_tokenizer struct to NULL leads to undefined
-** behaviour. The structure methods are expected to function as follows:
-**
-** xCreate:
-**   This function is used to allocate and inititalize a tokenizer instance.
-**   A tokenizer instance is required to actually tokenize text.
-**
-**   The first argument passed to this function is a copy of the (void*)
-**   pointer provided by the application when the fts5_tokenizer object
-**   was registered with FTS5 (the third argument to xCreateTokenizer()). 
-**   The second and third arguments are an array of nul-terminated strings
-**   containing the tokenizer arguments, if any, specified following the
-**   tokenizer name as part of the CREATE VIRTUAL TABLE statement used
-**   to create the FTS5 table.
-**
-**   The final argument is an output variable. If successful, (*ppOut) 
-**   should be set to point to the new tokenizer handle and SQLITE_OK
-**   returned. If an error occurs, some value other than SQLITE_OK should
-**   be returned. In this case, fts5 assumes that the final value of *ppOut 
-**   is undefined.
-**
-** xDelete:
-**   This function is invoked to delete a tokenizer handle previously
-**   allocated using xCreate(). Fts5 guarantees that this function will
-**   be invoked exactly once for each successful call to xCreate().
-**
-** xTokenize:
-**   This function is expected to tokenize the nText byte string indicated 
-**   by argument pText. pText may or may not be nul-terminated. The first
-**   argument passed to this function is a pointer to an Fts5Tokenizer object
-**   returned by an earlier call to xCreate().
-**
-**   The second argument indicates the reason that FTS5 is requesting
-**   tokenization of the supplied text. This is always one of the following
-**   four values:
-**
-**   <ul><li> <b>FTS5_TOKENIZE_DOCUMENT</b> - A document is being inserted into
-**            or removed from the FTS table. The tokenizer is being invoked to
-**            determine the set of tokens to add to (or delete from) the
-**            FTS index.
-**
-**       <li> <b>FTS5_TOKENIZE_QUERY</b> - A MATCH query is being executed 
-**            against the FTS index. The tokenizer is being called to tokenize 
-**            a bareword or quoted string specified as part of the query.
-**
-**       <li> <b>(FTS5_TOKENIZE_QUERY | FTS5_TOKENIZE_PREFIX)</b> - Same as
-**            FTS5_TOKENIZE_QUERY, except that the bareword or quoted string is
-**            followed by a "*" character, indicating that the last token
-**            returned by the tokenizer will be treated as a token prefix.
-**
-**       <li> <b>FTS5_TOKENIZE_AUX</b> - The tokenizer is being invoked to 
-**            satisfy an fts5_api.xTokenize() request made by an auxiliary
-**            function. Or an fts5_api.xColumnSize() request made by the same
-**            on a columnsize=0 database.  
-**   </ul>
-**
-**   For each token in the input string, the supplied callback xToken() must
-**   be invoked. The first argument to it should be a copy of the pointer
-**   passed as the second argument to xTokenize(). The third and fourth
-**   arguments are a pointer to a buffer containing the token text, and the
-**   size of the token in bytes. The 4th and 5th arguments are the byte offsets
-**   of the first byte of and first byte immediately following the text from
-**   which the token is derived within the input.
-**
-**   The second argument passed to the xToken() callback ("tflags") should
-**   normally be set to 0. The exception is if the tokenizer supports 
-**   synonyms. In this case see the discussion below for details.
-**
-**   FTS5 assumes the xToken() callback is invoked for each token in the 
-**   order that they occur within the input text.
-**
-**   If an xToken() callback returns any value other than SQLITE_OK, then
-**   the tokenization should be abandoned and the xTokenize() method should
-**   immediately return a copy of the xToken() return value. Or, if the
-**   input buffer is exhausted, xTokenize() should return SQLITE_OK. Finally,
-**   if an error occurs with the xTokenize() implementation itself, it
-**   may abandon the tokenization and return any error code other than
-**   SQLITE_OK or SQLITE_DONE.
-**
-** SYNONYM SUPPORT
-**
-**   Custom tokenizers may also support synonyms. Consider a case in which a
-**   user wishes to query for a phrase such as "first place". Using the 
-**   built-in tokenizers, the FTS5 query 'first + place' will match instances
-**   of "first place" within the document set, but not alternative forms
-**   such as "1st place". In some applications, it would be better to match
-**   all instances of "first place" or "1st place" regardless of which form
-**   the user specified in the MATCH query text.
-**
-**   There are several ways to approach this in FTS5:
-**
-**   <ol><li> By mapping all synonyms to a single token. In this case, the 
-**            In the above example, this means that the tokenizer returns the
-**            same token for inputs "first" and "1st". Say that token is in
-**            fact "first", so that when the user inserts the document "I won
-**            1st place" entries are added to the index for tokens "i", "won",
-**            "first" and "place". If the user then queries for '1st + place',
-**            the tokenizer substitutes "first" for "1st" and the query works
-**            as expected.
-**
-**       <li> By adding multiple synonyms for a single term to the FTS index.
-**            In this case, when tokenizing query text, the tokenizer may 
-**            provide multiple synonyms for a single term within the document.
-**            FTS5 then queries the index for each synonym individually. For
-**            example, faced with the query:
-**
-**   <codeblock>
-**     ... MATCH 'first place'</codeblock>
-**
-**            the tokenizer offers both "1st" and "first" as synonyms for the
-**            first token in the MATCH query and FTS5 effectively runs a query 
-**            similar to:
-**
-**   <codeblock>
-**     ... MATCH '(first OR 1st) place'</codeblock>
-**
-**            except that, for the purposes of auxiliary functions, the query
-**            still appears to contain just two phrases - "(first OR 1st)" 
-**            being treated as a single phrase.
-**
-**       <li> By adding multiple synonyms for a single term to the FTS index.
-**            Using this method, when tokenizing document text, the tokenizer
-**            provides multiple synonyms for each token. So that when a 
-**            document such as "I won first place" is tokenized, entries are
-**            added to the FTS index for "i", "won", "first", "1st" and
-**            "place".
-**
-**            This way, even if the tokenizer does not provide synonyms
-**            when tokenizing query text (it should not - to do would be
-**            inefficient), it doesn't matter if the user queries for 
-**            'first + place' or '1st + place', as there are entires in the
-**            FTS index corresponding to both forms of the first token.
-**   </ol>
-**
-**   Whether it is parsing document or query text, any call to xToken that
-**   specifies a <i>tflags</i> argument with the FTS5_TOKEN_COLOCATED bit
-**   is considered to supply a synonym for the previous token. For example,
-**   when parsing the document "I won first place", a tokenizer that supports
-**   synonyms would call xToken() 5 times, as follows:
-**
-**   <codeblock>
-**       xToken(pCtx, 0, "i",                      1,  0,  1);
-**       xToken(pCtx, 0, "won",                    3,  2,  5);
-**       xToken(pCtx, 0, "first",                  5,  6, 11);
-**       xToken(pCtx, FTS5_TOKEN_COLOCATED, "1st", 3,  6, 11);
-**       xToken(pCtx, 0, "place",                  5, 12, 17);
-**</codeblock>
-**
-**   It is an error to specify the FTS5_TOKEN_COLOCATED flag the first time
-**   xToken() is called. Multiple synonyms may be specified for a single token
-**   by making multiple calls to xToken(FTS5_TOKEN_COLOCATED) in sequence. 
-**   There is no limit to the number of synonyms that may be provided for a
-**   single token.
-**
-**   In many cases, method (1) above is the best approach. It does not add 
-**   extra data to the FTS index or require FTS5 to query for multiple terms,
-**   so it is efficient in terms of disk space and query speed. However, it
-**   does not support prefix queries very well. If, as suggested above, the
-**   token "first" is subsituted for "1st" by the tokenizer, then the query:
-**
-**   <codeblock>
-**     ... MATCH '1s*'</codeblock>
-**
-**   will not match documents that contain the token "1st" (as the tokenizer
-**   will probably not map "1s" to any prefix of "first").
-**
-**   For full prefix support, method (3) may be preferred. In this case, 
-**   because the index contains entries for both "first" and "1st", prefix
-**   queries such as 'fi*' or '1s*' will match correctly. However, because
-**   extra entries are added to the FTS index, this method uses more space
-**   within the database.
-**
-**   Method (2) offers a midpoint between (1) and (3). Using this method,
-**   a query such as '1s*' will match documents that contain the literal 
-**   token "1st", but not "first" (assuming the tokenizer is not able to
-**   provide synonyms for prefixes). However, a non-prefix query like '1st'
-**   will match against "1st" and "first". This method does not require
-**   extra disk space, as no extra entries are added to the FTS index. 
-**   On the other hand, it may require more CPU cycles to run MATCH queries,
-**   as separate queries of the FTS index are required for each synonym.
-**
-**   When using methods (2) or (3), it is important that the tokenizer only
-**   provide synonyms when tokenizing document text (method (2)) or query
-**   text (method (3)), not both. Doing so will not cause any errors, but is
-**   inefficient.
-*/
-typedef struct Fts5Tokenizer Fts5Tokenizer;
-typedef struct fts5_tokenizer fts5_tokenizer;
-struct fts5_tokenizer {
-  int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
-  void (*xDelete)(Fts5Tokenizer*);
-  int (*xTokenize)(Fts5Tokenizer*, 
-      void *pCtx,
-      int flags,            /* Mask of FTS5_TOKENIZE_* flags */
-      const char *pText, int nText, 
-      int (*xToken)(
-        void *pCtx,         /* Copy of 2nd argument to xTokenize() */
-        int tflags,         /* Mask of FTS5_TOKEN_* flags */
-        const char *pToken, /* Pointer to buffer containing token */
-        int nToken,         /* Size of token in bytes */
-        int iStart,         /* Byte offset of token within input text */
-        int iEnd            /* Byte offset of end of token within input text */
-      )
-  );
-};
-
-/* Flags that may be passed as the third argument to xTokenize() */
-#define FTS5_TOKENIZE_QUERY     0x0001
-#define FTS5_TOKENIZE_PREFIX    0x0002
-#define FTS5_TOKENIZE_DOCUMENT  0x0004
-#define FTS5_TOKENIZE_AUX       0x0008
-
-/* Flags that may be passed by the tokenizer implementation back to FTS5
-** as the third argument to the supplied xToken callback. */
-#define FTS5_TOKEN_COLOCATED    0x0001      /* Same position as prev. token */
-
-/*
-** END OF CUSTOM TOKENIZERS
-*************************************************************************/
-
-/*************************************************************************
-** FTS5 EXTENSION REGISTRATION API
-*/
-typedef struct fts5_api fts5_api;
-struct fts5_api {
-  int iVersion;                   /* Currently always set to 2 */
-
-  /* Create a new tokenizer */
-  int (*xCreateTokenizer)(
-    fts5_api *pApi,
-    const char *zName,
-    void *pContext,
-    fts5_tokenizer *pTokenizer,
-    void (*xDestroy)(void*)
-  );
-
-  /* Find an existing tokenizer */
-  int (*xFindTokenizer)(
-    fts5_api *pApi,
-    const char *zName,
-    void **ppContext,
-    fts5_tokenizer *pTokenizer
-  );
-
-  /* Create a new auxiliary function */
-  int (*xCreateFunction)(
-    fts5_api *pApi,
-    const char *zName,
-    void *pContext,
-    fts5_extension_function xFunction,
-    void (*xDestroy)(void*)
-  );
-};
-
-/*
-** END OF REGISTRATION API
-*************************************************************************/
-
-#ifdef __cplusplus
-}  /* end of the 'extern "C"' block */
-#endif
-
-#endif /* _FTS5_H */
-
-
diff --git a/openflow/usr/include/sqlite3ext.h b/openflow/usr/include/sqlite3ext.h
deleted file mode 100644
index 2e1c764..0000000
--- a/openflow/usr/include/sqlite3ext.h
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
-** 2006 June 7
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This header file defines the SQLite interface for use by
-** shared libraries that want to be imported as extensions into
-** an SQLite instance.  Shared libraries that intend to be loaded
-** as extensions by SQLite should #include this file instead of 
-** sqlite3.h.
-*/
-#ifndef _SQLITE3EXT_H_
-#define _SQLITE3EXT_H_
-#include "sqlite3.h"
-
-typedef struct sqlite3_api_routines sqlite3_api_routines;
-
-/*
-** The following structure holds pointers to all of the SQLite API
-** routines.
-**
-** WARNING:  In order to maintain backwards compatibility, add new
-** interfaces to the end of this structure only.  If you insert new
-** interfaces in the middle of this structure, then older different
-** versions of SQLite will not be able to load each other's shared
-** libraries!
-*/
-struct sqlite3_api_routines {
-  void * (*aggregate_context)(sqlite3_context*,int nBytes);
-  int  (*aggregate_count)(sqlite3_context*);
-  int  (*bind_blob)(sqlite3_stmt*,int,const void*,int n,void(*)(void*));
-  int  (*bind_double)(sqlite3_stmt*,int,double);
-  int  (*bind_int)(sqlite3_stmt*,int,int);
-  int  (*bind_int64)(sqlite3_stmt*,int,sqlite_int64);
-  int  (*bind_null)(sqlite3_stmt*,int);
-  int  (*bind_parameter_count)(sqlite3_stmt*);
-  int  (*bind_parameter_index)(sqlite3_stmt*,const char*zName);
-  const char * (*bind_parameter_name)(sqlite3_stmt*,int);
-  int  (*bind_text)(sqlite3_stmt*,int,const char*,int n,void(*)(void*));
-  int  (*bind_text16)(sqlite3_stmt*,int,const void*,int,void(*)(void*));
-  int  (*bind_value)(sqlite3_stmt*,int,const sqlite3_value*);
-  int  (*busy_handler)(sqlite3*,int(*)(void*,int),void*);
-  int  (*busy_timeout)(sqlite3*,int ms);
-  int  (*changes)(sqlite3*);
-  int  (*close)(sqlite3*);
-  int  (*collation_needed)(sqlite3*,void*,void(*)(void*,sqlite3*,
-                           int eTextRep,const char*));
-  int  (*collation_needed16)(sqlite3*,void*,void(*)(void*,sqlite3*,
-                             int eTextRep,const void*));
-  const void * (*column_blob)(sqlite3_stmt*,int iCol);
-  int  (*column_bytes)(sqlite3_stmt*,int iCol);
-  int  (*column_bytes16)(sqlite3_stmt*,int iCol);
-  int  (*column_count)(sqlite3_stmt*pStmt);
-  const char * (*column_database_name)(sqlite3_stmt*,int);
-  const void * (*column_database_name16)(sqlite3_stmt*,int);
-  const char * (*column_decltype)(sqlite3_stmt*,int i);
-  const void * (*column_decltype16)(sqlite3_stmt*,int);
-  double  (*column_double)(sqlite3_stmt*,int iCol);
-  int  (*column_int)(sqlite3_stmt*,int iCol);
-  sqlite_int64  (*column_int64)(sqlite3_stmt*,int iCol);
-  const char * (*column_name)(sqlite3_stmt*,int);
-  const void * (*column_name16)(sqlite3_stmt*,int);
-  const char * (*column_origin_name)(sqlite3_stmt*,int);
-  const void * (*column_origin_name16)(sqlite3_stmt*,int);
-  const char * (*column_table_name)(sqlite3_stmt*,int);
-  const void * (*column_table_name16)(sqlite3_stmt*,int);
-  const unsigned char * (*column_text)(sqlite3_stmt*,int iCol);
-  const void * (*column_text16)(sqlite3_stmt*,int iCol);
-  int  (*column_type)(sqlite3_stmt*,int iCol);
-  sqlite3_value* (*column_value)(sqlite3_stmt*,int iCol);
-  void * (*commit_hook)(sqlite3*,int(*)(void*),void*);
-  int  (*complete)(const char*sql);
-  int  (*complete16)(const void*sql);
-  int  (*create_collation)(sqlite3*,const char*,int,void*,
-                           int(*)(void*,int,const void*,int,const void*));
-  int  (*create_collation16)(sqlite3*,const void*,int,void*,
-                             int(*)(void*,int,const void*,int,const void*));
-  int  (*create_function)(sqlite3*,const char*,int,int,void*,
-                          void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
-                          void (*xStep)(sqlite3_context*,int,sqlite3_value**),
-                          void (*xFinal)(sqlite3_context*));
-  int  (*create_function16)(sqlite3*,const void*,int,int,void*,
-                            void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
-                            void (*xStep)(sqlite3_context*,int,sqlite3_value**),
-                            void (*xFinal)(sqlite3_context*));
-  int (*create_module)(sqlite3*,const char*,const sqlite3_module*,void*);
-  int  (*data_count)(sqlite3_stmt*pStmt);
-  sqlite3 * (*db_handle)(sqlite3_stmt*);
-  int (*declare_vtab)(sqlite3*,const char*);
-  int  (*enable_shared_cache)(int);
-  int  (*errcode)(sqlite3*db);
-  const char * (*errmsg)(sqlite3*);
-  const void * (*errmsg16)(sqlite3*);
-  int  (*exec)(sqlite3*,const char*,sqlite3_callback,void*,char**);
-  int  (*expired)(sqlite3_stmt*);
-  int  (*finalize)(sqlite3_stmt*pStmt);
-  void  (*free)(void*);
-  void  (*free_table)(char**result);
-  int  (*get_autocommit)(sqlite3*);
-  void * (*get_auxdata)(sqlite3_context*,int);
-  int  (*get_table)(sqlite3*,const char*,char***,int*,int*,char**);
-  int  (*global_recover)(void);
-  void  (*interruptx)(sqlite3*);
-  sqlite_int64  (*last_insert_rowid)(sqlite3*);
-  const char * (*libversion)(void);
-  int  (*libversion_number)(void);
-  void *(*malloc)(int);
-  char * (*mprintf)(const char*,...);
-  int  (*open)(const char*,sqlite3**);
-  int  (*open16)(const void*,sqlite3**);
-  int  (*prepare)(sqlite3*,const char*,int,sqlite3_stmt**,const char**);
-  int  (*prepare16)(sqlite3*,const void*,int,sqlite3_stmt**,const void**);
-  void * (*profile)(sqlite3*,void(*)(void*,const char*,sqlite_uint64),void*);
-  void  (*progress_handler)(sqlite3*,int,int(*)(void*),void*);
-  void *(*realloc)(void*,int);
-  int  (*reset)(sqlite3_stmt*pStmt);
-  void  (*result_blob)(sqlite3_context*,const void*,int,void(*)(void*));
-  void  (*result_double)(sqlite3_context*,double);
-  void  (*result_error)(sqlite3_context*,const char*,int);
-  void  (*result_error16)(sqlite3_context*,const void*,int);
-  void  (*result_int)(sqlite3_context*,int);
-  void  (*result_int64)(sqlite3_context*,sqlite_int64);
-  void  (*result_null)(sqlite3_context*);
-  void  (*result_text)(sqlite3_context*,const char*,int,void(*)(void*));
-  void  (*result_text16)(sqlite3_context*,const void*,int,void(*)(void*));
-  void  (*result_text16be)(sqlite3_context*,const void*,int,void(*)(void*));
-  void  (*result_text16le)(sqlite3_context*,const void*,int,void(*)(void*));
-  void  (*result_value)(sqlite3_context*,sqlite3_value*);
-  void * (*rollback_hook)(sqlite3*,void(*)(void*),void*);
-  int  (*set_authorizer)(sqlite3*,int(*)(void*,int,const char*,const char*,
-                         const char*,const char*),void*);
-  void  (*set_auxdata)(sqlite3_context*,int,void*,void (*)(void*));
-  char * (*snprintf)(int,char*,const char*,...);
-  int  (*step)(sqlite3_stmt*);
-  int  (*table_column_metadata)(sqlite3*,const char*,const char*,const char*,
-                                char const**,char const**,int*,int*,int*);
-  void  (*thread_cleanup)(void);
-  int  (*total_changes)(sqlite3*);
-  void * (*trace)(sqlite3*,void(*xTrace)(void*,const char*),void*);
-  int  (*transfer_bindings)(sqlite3_stmt*,sqlite3_stmt*);
-  void * (*update_hook)(sqlite3*,void(*)(void*,int ,char const*,char const*,
-                                         sqlite_int64),void*);
-  void * (*user_data)(sqlite3_context*);
-  const void * (*value_blob)(sqlite3_value*);
-  int  (*value_bytes)(sqlite3_value*);
-  int  (*value_bytes16)(sqlite3_value*);
-  double  (*value_double)(sqlite3_value*);
-  int  (*value_int)(sqlite3_value*);
-  sqlite_int64  (*value_int64)(sqlite3_value*);
-  int  (*value_numeric_type)(sqlite3_value*);
-  const unsigned char * (*value_text)(sqlite3_value*);
-  const void * (*value_text16)(sqlite3_value*);
-  const void * (*value_text16be)(sqlite3_value*);
-  const void * (*value_text16le)(sqlite3_value*);
-  int  (*value_type)(sqlite3_value*);
-  char *(*vmprintf)(const char*,va_list);
-  /* Added ??? */
-  int (*overload_function)(sqlite3*, const char *zFuncName, int nArg);
-  /* Added by 3.3.13 */
-  int (*prepare_v2)(sqlite3*,const char*,int,sqlite3_stmt**,const char**);
-  int (*prepare16_v2)(sqlite3*,const void*,int,sqlite3_stmt**,const void**);
-  int (*clear_bindings)(sqlite3_stmt*);
-  /* Added by 3.4.1 */
-  int (*create_module_v2)(sqlite3*,const char*,const sqlite3_module*,void*,
-                          void (*xDestroy)(void *));
-  /* Added by 3.5.0 */
-  int (*bind_zeroblob)(sqlite3_stmt*,int,int);
-  int (*blob_bytes)(sqlite3_blob*);
-  int (*blob_close)(sqlite3_blob*);
-  int (*blob_open)(sqlite3*,const char*,const char*,const char*,sqlite3_int64,
-                   int,sqlite3_blob**);
-  int (*blob_read)(sqlite3_blob*,void*,int,int);
-  int (*blob_write)(sqlite3_blob*,const void*,int,int);
-  int (*create_collation_v2)(sqlite3*,const char*,int,void*,
-                             int(*)(void*,int,const void*,int,const void*),
-                             void(*)(void*));
-  int (*file_control)(sqlite3*,const char*,int,void*);
-  sqlite3_int64 (*memory_highwater)(int);
-  sqlite3_int64 (*memory_used)(void);
-  sqlite3_mutex *(*mutex_alloc)(int);
-  void (*mutex_enter)(sqlite3_mutex*);
-  void (*mutex_free)(sqlite3_mutex*);
-  void (*mutex_leave)(sqlite3_mutex*);
-  int (*mutex_try)(sqlite3_mutex*);
-  int (*open_v2)(const char*,sqlite3**,int,const char*);
-  int (*release_memory)(int);
-  void (*result_error_nomem)(sqlite3_context*);
-  void (*result_error_toobig)(sqlite3_context*);
-  int (*sleep)(int);
-  void (*soft_heap_limit)(int);
-  sqlite3_vfs *(*vfs_find)(const char*);
-  int (*vfs_register)(sqlite3_vfs*,int);
-  int (*vfs_unregister)(sqlite3_vfs*);
-  int (*xthreadsafe)(void);
-  void (*result_zeroblob)(sqlite3_context*,int);
-  void (*result_error_code)(sqlite3_context*,int);
-  int (*test_control)(int, ...);
-  void (*randomness)(int,void*);
-  sqlite3 *(*context_db_handle)(sqlite3_context*);
-  int (*extended_result_codes)(sqlite3*,int);
-  int (*limit)(sqlite3*,int,int);
-  sqlite3_stmt *(*next_stmt)(sqlite3*,sqlite3_stmt*);
-  const char *(*sql)(sqlite3_stmt*);
-  int (*status)(int,int*,int*,int);
-  int (*backup_finish)(sqlite3_backup*);
-  sqlite3_backup *(*backup_init)(sqlite3*,const char*,sqlite3*,const char*);
-  int (*backup_pagecount)(sqlite3_backup*);
-  int (*backup_remaining)(sqlite3_backup*);
-  int (*backup_step)(sqlite3_backup*,int);
-  const char *(*compileoption_get)(int);
-  int (*compileoption_used)(const char*);
-  int (*create_function_v2)(sqlite3*,const char*,int,int,void*,
-                            void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
-                            void (*xStep)(sqlite3_context*,int,sqlite3_value**),
-                            void (*xFinal)(sqlite3_context*),
-                            void(*xDestroy)(void*));
-  int (*db_config)(sqlite3*,int,...);
-  sqlite3_mutex *(*db_mutex)(sqlite3*);
-  int (*db_status)(sqlite3*,int,int*,int*,int);
-  int (*extended_errcode)(sqlite3*);
-  void (*log)(int,const char*,...);
-  sqlite3_int64 (*soft_heap_limit64)(sqlite3_int64);
-  const char *(*sourceid)(void);
-  int (*stmt_status)(sqlite3_stmt*,int,int);
-  int (*strnicmp)(const char*,const char*,int);
-  int (*unlock_notify)(sqlite3*,void(*)(void**,int),void*);
-  int (*wal_autocheckpoint)(sqlite3*,int);
-  int (*wal_checkpoint)(sqlite3*,const char*);
-  void *(*wal_hook)(sqlite3*,int(*)(void*,sqlite3*,const char*,int),void*);
-  int (*blob_reopen)(sqlite3_blob*,sqlite3_int64);
-  int (*vtab_config)(sqlite3*,int op,...);
-  int (*vtab_on_conflict)(sqlite3*);
-  /* Version 3.7.16 and later */
-  int (*close_v2)(sqlite3*);
-  const char *(*db_filename)(sqlite3*,const char*);
-  int (*db_readonly)(sqlite3*,const char*);
-  int (*db_release_memory)(sqlite3*);
-  const char *(*errstr)(int);
-  int (*stmt_busy)(sqlite3_stmt*);
-  int (*stmt_readonly)(sqlite3_stmt*);
-  int (*stricmp)(const char*,const char*);
-  int (*uri_boolean)(const char*,const char*,int);
-  sqlite3_int64 (*uri_int64)(const char*,const char*,sqlite3_int64);
-  const char *(*uri_parameter)(const char*,const char*);
-  char *(*vsnprintf)(int,char*,const char*,va_list);
-  int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*);
-  /* Version 3.8.7 and later */
-  int (*auto_extension)(void(*)(void));
-  int (*bind_blob64)(sqlite3_stmt*,int,const void*,sqlite3_uint64,
-                     void(*)(void*));
-  int (*bind_text64)(sqlite3_stmt*,int,const char*,sqlite3_uint64,
-                      void(*)(void*),unsigned char);
-  int (*cancel_auto_extension)(void(*)(void));
-  int (*load_extension)(sqlite3*,const char*,const char*,char**);
-  void *(*malloc64)(sqlite3_uint64);
-  sqlite3_uint64 (*msize)(void*);
-  void *(*realloc64)(void*,sqlite3_uint64);
-  void (*reset_auto_extension)(void);
-  void (*result_blob64)(sqlite3_context*,const void*,sqlite3_uint64,
-                        void(*)(void*));
-  void (*result_text64)(sqlite3_context*,const char*,sqlite3_uint64,
-                         void(*)(void*), unsigned char);
-  int (*strglob)(const char*,const char*);
-  /* Version 3.8.11 and later */
-  sqlite3_value *(*value_dup)(const sqlite3_value*);
-  void (*value_free)(sqlite3_value*);
-  int (*result_zeroblob64)(sqlite3_context*,sqlite3_uint64);
-  int (*bind_zeroblob64)(sqlite3_stmt*, int, sqlite3_uint64);
-  /* Version 3.9.0 and later */
-  unsigned int (*value_subtype)(sqlite3_value*);
-  void (*result_subtype)(sqlite3_context*,unsigned int);
-  /* Version 3.10.0 and later */
-  int (*status64)(int,sqlite3_int64*,sqlite3_int64*,int);
-  int (*strlike)(const char*,const char*,unsigned int);
-  int (*db_cacheflush)(sqlite3*);
-};
-
-/*
-** The following macros redefine the API routines so that they are
-** redirected through the global sqlite3_api structure.
-**
-** This header file is also used by the loadext.c source file
-** (part of the main SQLite library - not an extension) so that
-** it can get access to the sqlite3_api_routines structure
-** definition.  But the main library does not want to redefine
-** the API.  So the redefinition macros are only valid if the
-** SQLITE_CORE macros is undefined.
-*/
-#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
-#define sqlite3_aggregate_context      sqlite3_api->aggregate_context
-#ifndef SQLITE_OMIT_DEPRECATED
-#define sqlite3_aggregate_count        sqlite3_api->aggregate_count
-#endif
-#define sqlite3_bind_blob              sqlite3_api->bind_blob
-#define sqlite3_bind_double            sqlite3_api->bind_double
-#define sqlite3_bind_int               sqlite3_api->bind_int
-#define sqlite3_bind_int64             sqlite3_api->bind_int64
-#define sqlite3_bind_null              sqlite3_api->bind_null
-#define sqlite3_bind_parameter_count   sqlite3_api->bind_parameter_count
-#define sqlite3_bind_parameter_index   sqlite3_api->bind_parameter_index
-#define sqlite3_bind_parameter_name    sqlite3_api->bind_parameter_name
-#define sqlite3_bind_text              sqlite3_api->bind_text
-#define sqlite3_bind_text16            sqlite3_api->bind_text16
-#define sqlite3_bind_value             sqlite3_api->bind_value
-#define sqlite3_busy_handler           sqlite3_api->busy_handler
-#define sqlite3_busy_timeout           sqlite3_api->busy_timeout
-#define sqlite3_changes                sqlite3_api->changes
-#define sqlite3_close                  sqlite3_api->close
-#define sqlite3_collation_needed       sqlite3_api->collation_needed
-#define sqlite3_collation_needed16     sqlite3_api->collation_needed16
-#define sqlite3_column_blob            sqlite3_api->column_blob
-#define sqlite3_column_bytes           sqlite3_api->column_bytes
-#define sqlite3_column_bytes16         sqlite3_api->column_bytes16
-#define sqlite3_column_count           sqlite3_api->column_count
-#define sqlite3_column_database_name   sqlite3_api->column_database_name
-#define sqlite3_column_database_name16 sqlite3_api->column_database_name16
-#define sqlite3_column_decltype        sqlite3_api->column_decltype
-#define sqlite3_column_decltype16      sqlite3_api->column_decltype16
-#define sqlite3_column_double          sqlite3_api->column_double
-#define sqlite3_column_int             sqlite3_api->column_int
-#define sqlite3_column_int64           sqlite3_api->column_int64
-#define sqlite3_column_name            sqlite3_api->column_name
-#define sqlite3_column_name16          sqlite3_api->column_name16
-#define sqlite3_column_origin_name     sqlite3_api->column_origin_name
-#define sqlite3_column_origin_name16   sqlite3_api->column_origin_name16
-#define sqlite3_column_table_name      sqlite3_api->column_table_name
-#define sqlite3_column_table_name16    sqlite3_api->column_table_name16
-#define sqlite3_column_text            sqlite3_api->column_text
-#define sqlite3_column_text16          sqlite3_api->column_text16
-#define sqlite3_column_type            sqlite3_api->column_type
-#define sqlite3_column_value           sqlite3_api->column_value
-#define sqlite3_commit_hook            sqlite3_api->commit_hook
-#define sqlite3_complete               sqlite3_api->complete
-#define sqlite3_complete16             sqlite3_api->complete16
-#define sqlite3_create_collation       sqlite3_api->create_collation
-#define sqlite3_create_collation16     sqlite3_api->create_collation16
-#define sqlite3_create_function        sqlite3_api->create_function
-#define sqlite3_create_function16      sqlite3_api->create_function16
-#define sqlite3_create_module          sqlite3_api->create_module
-#define sqlite3_create_module_v2       sqlite3_api->create_module_v2
-#define sqlite3_data_count             sqlite3_api->data_count
-#define sqlite3_db_handle              sqlite3_api->db_handle
-#define sqlite3_declare_vtab           sqlite3_api->declare_vtab
-#define sqlite3_enable_shared_cache    sqlite3_api->enable_shared_cache
-#define sqlite3_errcode                sqlite3_api->errcode
-#define sqlite3_errmsg                 sqlite3_api->errmsg
-#define sqlite3_errmsg16               sqlite3_api->errmsg16
-#define sqlite3_exec                   sqlite3_api->exec
-#ifndef SQLITE_OMIT_DEPRECATED
-#define sqlite3_expired                sqlite3_api->expired
-#endif
-#define sqlite3_finalize               sqlite3_api->finalize
-#define sqlite3_free                   sqlite3_api->free
-#define sqlite3_free_table             sqlite3_api->free_table
-#define sqlite3_get_autocommit         sqlite3_api->get_autocommit
-#define sqlite3_get_auxdata            sqlite3_api->get_auxdata
-#define sqlite3_get_table              sqlite3_api->get_table
-#ifndef SQLITE_OMIT_DEPRECATED
-#define sqlite3_global_recover         sqlite3_api->global_recover
-#endif
-#define sqlite3_interrupt              sqlite3_api->interruptx
-#define sqlite3_last_insert_rowid      sqlite3_api->last_insert_rowid
-#define sqlite3_libversion             sqlite3_api->libversion
-#define sqlite3_libversion_number      sqlite3_api->libversion_number
-#define sqlite3_malloc                 sqlite3_api->malloc
-#define sqlite3_mprintf                sqlite3_api->mprintf
-#define sqlite3_open                   sqlite3_api->open
-#define sqlite3_open16                 sqlite3_api->open16
-#define sqlite3_prepare                sqlite3_api->prepare
-#define sqlite3_prepare16              sqlite3_api->prepare16
-#define sqlite3_prepare_v2             sqlite3_api->prepare_v2
-#define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
-#define sqlite3_profile                sqlite3_api->profile
-#define sqlite3_progress_handler       sqlite3_api->progress_handler
-#define sqlite3_realloc                sqlite3_api->realloc
-#define sqlite3_reset                  sqlite3_api->reset
-#define sqlite3_result_blob            sqlite3_api->result_blob
-#define sqlite3_result_double          sqlite3_api->result_double
-#define sqlite3_result_error           sqlite3_api->result_error
-#define sqlite3_result_error16         sqlite3_api->result_error16
-#define sqlite3_result_int             sqlite3_api->result_int
-#define sqlite3_result_int64           sqlite3_api->result_int64
-#define sqlite3_result_null            sqlite3_api->result_null
-#define sqlite3_result_text            sqlite3_api->result_text
-#define sqlite3_result_text16          sqlite3_api->result_text16
-#define sqlite3_result_text16be        sqlite3_api->result_text16be
-#define sqlite3_result_text16le        sqlite3_api->result_text16le
-#define sqlite3_result_value           sqlite3_api->result_value
-#define sqlite3_rollback_hook          sqlite3_api->rollback_hook
-#define sqlite3_set_authorizer         sqlite3_api->set_authorizer
-#define sqlite3_set_auxdata            sqlite3_api->set_auxdata
-#define sqlite3_snprintf               sqlite3_api->snprintf
-#define sqlite3_step                   sqlite3_api->step
-#define sqlite3_table_column_metadata  sqlite3_api->table_column_metadata
-#define sqlite3_thread_cleanup         sqlite3_api->thread_cleanup
-#define sqlite3_total_changes          sqlite3_api->total_changes
-#define sqlite3_trace                  sqlite3_api->trace
-#ifndef SQLITE_OMIT_DEPRECATED
-#define sqlite3_transfer_bindings      sqlite3_api->transfer_bindings
-#endif
-#define sqlite3_update_hook            sqlite3_api->update_hook
-#define sqlite3_user_data              sqlite3_api->user_data
-#define sqlite3_value_blob             sqlite3_api->value_blob
-#define sqlite3_value_bytes            sqlite3_api->value_bytes
-#define sqlite3_value_bytes16          sqlite3_api->value_bytes16
-#define sqlite3_value_double           sqlite3_api->value_double
-#define sqlite3_value_int              sqlite3_api->value_int
-#define sqlite3_value_int64            sqlite3_api->value_int64
-#define sqlite3_value_numeric_type     sqlite3_api->value_numeric_type
-#define sqlite3_value_text             sqlite3_api->value_text
-#define sqlite3_value_text16           sqlite3_api->value_text16
-#define sqlite3_value_text16be         sqlite3_api->value_text16be
-#define sqlite3_value_text16le         sqlite3_api->value_text16le
-#define sqlite3_value_type             sqlite3_api->value_type
-#define sqlite3_vmprintf               sqlite3_api->vmprintf
-#define sqlite3_vsnprintf              sqlite3_api->vsnprintf
-#define sqlite3_overload_function      sqlite3_api->overload_function
-#define sqlite3_prepare_v2             sqlite3_api->prepare_v2
-#define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
-#define sqlite3_clear_bindings         sqlite3_api->clear_bindings
-#define sqlite3_bind_zeroblob          sqlite3_api->bind_zeroblob
-#define sqlite3_blob_bytes             sqlite3_api->blob_bytes
-#define sqlite3_blob_close             sqlite3_api->blob_close
-#define sqlite3_blob_open              sqlite3_api->blob_open
-#define sqlite3_blob_read              sqlite3_api->blob_read
-#define sqlite3_blob_write             sqlite3_api->blob_write
-#define sqlite3_create_collation_v2    sqlite3_api->create_collation_v2
-#define sqlite3_file_control           sqlite3_api->file_control
-#define sqlite3_memory_highwater       sqlite3_api->memory_highwater
-#define sqlite3_memory_used            sqlite3_api->memory_used
-#define sqlite3_mutex_alloc            sqlite3_api->mutex_alloc
-#define sqlite3_mutex_enter            sqlite3_api->mutex_enter
-#define sqlite3_mutex_free             sqlite3_api->mutex_free
-#define sqlite3_mutex_leave            sqlite3_api->mutex_leave
-#define sqlite3_mutex_try              sqlite3_api->mutex_try
-#define sqlite3_open_v2                sqlite3_api->open_v2
-#define sqlite3_release_memory         sqlite3_api->release_memory
-#define sqlite3_result_error_nomem     sqlite3_api->result_error_nomem
-#define sqlite3_result_error_toobig    sqlite3_api->result_error_toobig
-#define sqlite3_sleep                  sqlite3_api->sleep
-#define sqlite3_soft_heap_limit        sqlite3_api->soft_heap_limit
-#define sqlite3_vfs_find               sqlite3_api->vfs_find
-#define sqlite3_vfs_register           sqlite3_api->vfs_register
-#define sqlite3_vfs_unregister         sqlite3_api->vfs_unregister
-#define sqlite3_threadsafe             sqlite3_api->xthreadsafe
-#define sqlite3_result_zeroblob        sqlite3_api->result_zeroblob
-#define sqlite3_result_error_code      sqlite3_api->result_error_code
-#define sqlite3_test_control           sqlite3_api->test_control
-#define sqlite3_randomness             sqlite3_api->randomness
-#define sqlite3_context_db_handle      sqlite3_api->context_db_handle
-#define sqlite3_extended_result_codes  sqlite3_api->extended_result_codes
-#define sqlite3_limit                  sqlite3_api->limit
-#define sqlite3_next_stmt              sqlite3_api->next_stmt
-#define sqlite3_sql                    sqlite3_api->sql
-#define sqlite3_status                 sqlite3_api->status
-#define sqlite3_backup_finish          sqlite3_api->backup_finish
-#define sqlite3_backup_init            sqlite3_api->backup_init
-#define sqlite3_backup_pagecount       sqlite3_api->backup_pagecount
-#define sqlite3_backup_remaining       sqlite3_api->backup_remaining
-#define sqlite3_backup_step            sqlite3_api->backup_step
-#define sqlite3_compileoption_get      sqlite3_api->compileoption_get
-#define sqlite3_compileoption_used     sqlite3_api->compileoption_used
-#define sqlite3_create_function_v2     sqlite3_api->create_function_v2
-#define sqlite3_db_config              sqlite3_api->db_config
-#define sqlite3_db_mutex               sqlite3_api->db_mutex
-#define sqlite3_db_status              sqlite3_api->db_status
-#define sqlite3_extended_errcode       sqlite3_api->extended_errcode
-#define sqlite3_log                    sqlite3_api->log
-#define sqlite3_soft_heap_limit64      sqlite3_api->soft_heap_limit64
-#define sqlite3_sourceid               sqlite3_api->sourceid
-#define sqlite3_stmt_status            sqlite3_api->stmt_status
-#define sqlite3_strnicmp               sqlite3_api->strnicmp
-#define sqlite3_unlock_notify          sqlite3_api->unlock_notify
-#define sqlite3_wal_autocheckpoint     sqlite3_api->wal_autocheckpoint
-#define sqlite3_wal_checkpoint         sqlite3_api->wal_checkpoint
-#define sqlite3_wal_hook               sqlite3_api->wal_hook
-#define sqlite3_blob_reopen            sqlite3_api->blob_reopen
-#define sqlite3_vtab_config            sqlite3_api->vtab_config
-#define sqlite3_vtab_on_conflict       sqlite3_api->vtab_on_conflict
-/* Version 3.7.16 and later */
-#define sqlite3_close_v2               sqlite3_api->close_v2
-#define sqlite3_db_filename            sqlite3_api->db_filename
-#define sqlite3_db_readonly            sqlite3_api->db_readonly
-#define sqlite3_db_release_memory      sqlite3_api->db_release_memory
-#define sqlite3_errstr                 sqlite3_api->errstr
-#define sqlite3_stmt_busy              sqlite3_api->stmt_busy
-#define sqlite3_stmt_readonly          sqlite3_api->stmt_readonly
-#define sqlite3_stricmp                sqlite3_api->stricmp
-#define sqlite3_uri_boolean            sqlite3_api->uri_boolean
-#define sqlite3_uri_int64              sqlite3_api->uri_int64
-#define sqlite3_uri_parameter          sqlite3_api->uri_parameter
-#define sqlite3_uri_vsnprintf          sqlite3_api->vsnprintf
-#define sqlite3_wal_checkpoint_v2      sqlite3_api->wal_checkpoint_v2
-/* Version 3.8.7 and later */
-#define sqlite3_auto_extension         sqlite3_api->auto_extension
-#define sqlite3_bind_blob64            sqlite3_api->bind_blob64
-#define sqlite3_bind_text64            sqlite3_api->bind_text64
-#define sqlite3_cancel_auto_extension  sqlite3_api->cancel_auto_extension
-#define sqlite3_load_extension         sqlite3_api->load_extension
-#define sqlite3_malloc64               sqlite3_api->malloc64
-#define sqlite3_msize                  sqlite3_api->msize
-#define sqlite3_realloc64              sqlite3_api->realloc64
-#define sqlite3_reset_auto_extension   sqlite3_api->reset_auto_extension
-#define sqlite3_result_blob64          sqlite3_api->result_blob64
-#define sqlite3_result_text64          sqlite3_api->result_text64
-#define sqlite3_strglob                sqlite3_api->strglob
-/* Version 3.8.11 and later */
-#define sqlite3_value_dup              sqlite3_api->value_dup
-#define sqlite3_value_free             sqlite3_api->value_free
-#define sqlite3_result_zeroblob64      sqlite3_api->result_zeroblob64
-#define sqlite3_bind_zeroblob64        sqlite3_api->bind_zeroblob64
-/* Version 3.9.0 and later */
-#define sqlite3_value_subtype          sqlite3_api->value_subtype
-#define sqlite3_result_subtype         sqlite3_api->result_subtype
-/* Version 3.10.0 and later */
-#define sqlite3_status64               sqlite3_api->status64
-#define sqlite3_strlike                sqlite3_api->strlike
-#define sqlite3_db_cacheflush          sqlite3_api->db_cacheflush
-#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
-
-#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
-  /* This case when the file really is being compiled as a loadable 
-  ** extension */
-# define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api=0;
-# define SQLITE_EXTENSION_INIT2(v)  sqlite3_api=v;
-# define SQLITE_EXTENSION_INIT3     \
-    extern const sqlite3_api_routines *sqlite3_api;
-#else
-  /* This case when the file is being statically linked into the 
-  ** application */
-# define SQLITE_EXTENSION_INIT1     /*no-op*/
-# define SQLITE_EXTENSION_INIT2(v)  (void)v; /* unused parameter */
-# define SQLITE_EXTENSION_INIT3     /*no-op*/
-#endif
-
-#endif /* _SQLITE3EXT_H_ */
diff --git a/openflow/usr/include/stab.h b/openflow/usr/include/stab.h
deleted file mode 100644
index 9dc3c32..0000000
--- a/openflow/usr/include/stab.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __GNU_STAB__
-
-/* Indicate the GNU stab.h is in use.  */
-
-#define __GNU_STAB__
-
-#define __define_stab(NAME, CODE, STRING) NAME=CODE,
-
-enum __stab_debug_code
-{
-#include <bits/stab.def>
-LAST_UNUSED_STAB_CODE
-};
-
-#undef __define_stab
-
-#endif /* __GNU_STAB_ */
diff --git a/openflow/usr/include/stdc-predef.h b/openflow/usr/include/stdc-predef.h
deleted file mode 100644
index f9f7f73..0000000
--- a/openflow/usr/include/stdc-predef.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_STDC_PREDEF_H
-#define	_STDC_PREDEF_H	1
-
-/* This header is separate from features.h so that the compiler can
-   include it implicitly at the start of every compilation.  It must
-   not itself include <features.h> or any other header that includes
-   <features.h> because the implicit include comes before any feature
-   test macros that may be defined in a source file before it first
-   explicitly includes a system header.  GCC knows the name of this
-   header in order to preinclude it.  */
-
-/* glibc's intent is to support the IEC 559 math functionality, real
-   and complex.  If the GCC (4.9 and later) predefined macros
-   specifying compiler intent are available, use them to determine
-   whether the overall intent is to support these features; otherwise,
-   presume an older compiler has intent to support these features and
-   define these macros by default.  */
-
-#ifdef __GCC_IEC_559
-# if __GCC_IEC_559 > 0
-#  define __STDC_IEC_559__		1
-# endif
-#else
-# define __STDC_IEC_559__		1
-#endif
-
-#ifdef __GCC_IEC_559_COMPLEX
-# if __GCC_IEC_559_COMPLEX > 0
-#  define __STDC_IEC_559_COMPLEX__	1
-# endif
-#else
-# define __STDC_IEC_559_COMPLEX__	1
-#endif
-
-/* wchar_t uses Unicode 8.0.0.  Version 8.0 of the Unicode Standard is
-   synchronized with ISO/IEC 10646:2014, plus Amendment 1 (published
-   2015-05-15).  */
-#define __STDC_ISO_10646__		201505L
-
-/* We do not support C11 <threads.h>.  */
-#define __STDC_NO_THREADS__		1
-
-#endif
diff --git a/openflow/usr/include/stdint.h b/openflow/usr/include/stdint.h
deleted file mode 100644
index 4427627..0000000
--- a/openflow/usr/include/stdint.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99: 7.18 Integer types <stdint.h>
- */
-
-#ifndef _STDINT_H
-#define _STDINT_H	1
-
-#include <features.h>
-#include <bits/wchar.h>
-#include <bits/wordsize.h>
-
-/* Exact integral types.  */
-
-/* Signed.  */
-
-/* There is some amount of overlap with <sys/types.h> as known by inet code */
-#ifndef __int8_t_defined
-# define __int8_t_defined
-typedef signed char		int8_t;
-typedef short int		int16_t;
-typedef int			int32_t;
-# if __WORDSIZE == 64
-typedef long int		int64_t;
-# else
-__extension__
-typedef long long int		int64_t;
-# endif
-#endif
-
-/* Unsigned.  */
-typedef unsigned char		uint8_t;
-typedef unsigned short int	uint16_t;
-#ifndef __uint32_t_defined
-typedef unsigned int		uint32_t;
-# define __uint32_t_defined
-#endif
-#if __WORDSIZE == 64
-typedef unsigned long int	uint64_t;
-#else
-__extension__
-typedef unsigned long long int	uint64_t;
-#endif
-
-
-/* Small types.  */
-
-/* Signed.  */
-typedef signed char		int_least8_t;
-typedef short int		int_least16_t;
-typedef int			int_least32_t;
-#if __WORDSIZE == 64
-typedef long int		int_least64_t;
-#else
-__extension__
-typedef long long int		int_least64_t;
-#endif
-
-/* Unsigned.  */
-typedef unsigned char		uint_least8_t;
-typedef unsigned short int	uint_least16_t;
-typedef unsigned int		uint_least32_t;
-#if __WORDSIZE == 64
-typedef unsigned long int	uint_least64_t;
-#else
-__extension__
-typedef unsigned long long int	uint_least64_t;
-#endif
-
-
-/* Fast types.  */
-
-/* Signed.  */
-typedef signed char		int_fast8_t;
-#if __WORDSIZE == 64
-typedef long int		int_fast16_t;
-typedef long int		int_fast32_t;
-typedef long int		int_fast64_t;
-#else
-typedef int			int_fast16_t;
-typedef int			int_fast32_t;
-__extension__
-typedef long long int		int_fast64_t;
-#endif
-
-/* Unsigned.  */
-typedef unsigned char		uint_fast8_t;
-#if __WORDSIZE == 64
-typedef unsigned long int	uint_fast16_t;
-typedef unsigned long int	uint_fast32_t;
-typedef unsigned long int	uint_fast64_t;
-#else
-typedef unsigned int		uint_fast16_t;
-typedef unsigned int		uint_fast32_t;
-__extension__
-typedef unsigned long long int	uint_fast64_t;
-#endif
-
-
-/* Types for `void *' pointers.  */
-#if __WORDSIZE == 64
-# ifndef __intptr_t_defined
-typedef long int		intptr_t;
-#  define __intptr_t_defined
-# endif
-typedef unsigned long int	uintptr_t;
-#else
-# ifndef __intptr_t_defined
-typedef int			intptr_t;
-#  define __intptr_t_defined
-# endif
-typedef unsigned int		uintptr_t;
-#endif
-
-
-/* Largest integral types.  */
-#if __WORDSIZE == 64
-typedef long int		intmax_t;
-typedef unsigned long int	uintmax_t;
-#else
-__extension__
-typedef long long int		intmax_t;
-__extension__
-typedef unsigned long long int	uintmax_t;
-#endif
-
-
-# if __WORDSIZE == 64
-#  define __INT64_C(c)	c ## L
-#  define __UINT64_C(c)	c ## UL
-# else
-#  define __INT64_C(c)	c ## LL
-#  define __UINT64_C(c)	c ## ULL
-# endif
-
-/* Limits of integral types.  */
-
-/* Minimum of signed integral types.  */
-# define INT8_MIN		(-128)
-# define INT16_MIN		(-32767-1)
-# define INT32_MIN		(-2147483647-1)
-# define INT64_MIN		(-__INT64_C(9223372036854775807)-1)
-/* Maximum of signed integral types.  */
-# define INT8_MAX		(127)
-# define INT16_MAX		(32767)
-# define INT32_MAX		(2147483647)
-# define INT64_MAX		(__INT64_C(9223372036854775807))
-
-/* Maximum of unsigned integral types.  */
-# define UINT8_MAX		(255)
-# define UINT16_MAX		(65535)
-# define UINT32_MAX		(4294967295U)
-# define UINT64_MAX		(__UINT64_C(18446744073709551615))
-
-
-/* Minimum of signed integral types having a minimum size.  */
-# define INT_LEAST8_MIN		(-128)
-# define INT_LEAST16_MIN	(-32767-1)
-# define INT_LEAST32_MIN	(-2147483647-1)
-# define INT_LEAST64_MIN	(-__INT64_C(9223372036854775807)-1)
-/* Maximum of signed integral types having a minimum size.  */
-# define INT_LEAST8_MAX		(127)
-# define INT_LEAST16_MAX	(32767)
-# define INT_LEAST32_MAX	(2147483647)
-# define INT_LEAST64_MAX	(__INT64_C(9223372036854775807))
-
-/* Maximum of unsigned integral types having a minimum size.  */
-# define UINT_LEAST8_MAX	(255)
-# define UINT_LEAST16_MAX	(65535)
-# define UINT_LEAST32_MAX	(4294967295U)
-# define UINT_LEAST64_MAX	(__UINT64_C(18446744073709551615))
-
-
-/* Minimum of fast signed integral types having a minimum size.  */
-# define INT_FAST8_MIN		(-128)
-# if __WORDSIZE == 64
-#  define INT_FAST16_MIN	(-9223372036854775807L-1)
-#  define INT_FAST32_MIN	(-9223372036854775807L-1)
-# else
-#  define INT_FAST16_MIN	(-2147483647-1)
-#  define INT_FAST32_MIN	(-2147483647-1)
-# endif
-# define INT_FAST64_MIN		(-__INT64_C(9223372036854775807)-1)
-/* Maximum of fast signed integral types having a minimum size.  */
-# define INT_FAST8_MAX		(127)
-# if __WORDSIZE == 64
-#  define INT_FAST16_MAX	(9223372036854775807L)
-#  define INT_FAST32_MAX	(9223372036854775807L)
-# else
-#  define INT_FAST16_MAX	(2147483647)
-#  define INT_FAST32_MAX	(2147483647)
-# endif
-# define INT_FAST64_MAX		(__INT64_C(9223372036854775807))
-
-/* Maximum of fast unsigned integral types having a minimum size.  */
-# define UINT_FAST8_MAX		(255)
-# if __WORDSIZE == 64
-#  define UINT_FAST16_MAX	(18446744073709551615UL)
-#  define UINT_FAST32_MAX	(18446744073709551615UL)
-# else
-#  define UINT_FAST16_MAX	(4294967295U)
-#  define UINT_FAST32_MAX	(4294967295U)
-# endif
-# define UINT_FAST64_MAX	(__UINT64_C(18446744073709551615))
-
-
-/* Values to test for integral types holding `void *' pointer.  */
-# if __WORDSIZE == 64
-#  define INTPTR_MIN		(-9223372036854775807L-1)
-#  define INTPTR_MAX		(9223372036854775807L)
-#  define UINTPTR_MAX		(18446744073709551615UL)
-# else
-#  define INTPTR_MIN		(-2147483647-1)
-#  define INTPTR_MAX		(2147483647)
-#  define UINTPTR_MAX		(4294967295U)
-# endif
-
-
-/* Minimum for largest signed integral type.  */
-# define INTMAX_MIN		(-__INT64_C(9223372036854775807)-1)
-/* Maximum for largest signed integral type.  */
-# define INTMAX_MAX		(__INT64_C(9223372036854775807))
-
-/* Maximum for largest unsigned integral type.  */
-# define UINTMAX_MAX		(__UINT64_C(18446744073709551615))
-
-
-/* Limits of other integer types.  */
-
-/* Limits of `ptrdiff_t' type.  */
-# if __WORDSIZE == 64
-#  define PTRDIFF_MIN		(-9223372036854775807L-1)
-#  define PTRDIFF_MAX		(9223372036854775807L)
-# else
-#  define PTRDIFF_MIN		(-2147483647-1)
-#  define PTRDIFF_MAX		(2147483647)
-# endif
-
-/* Limits of `sig_atomic_t'.  */
-# define SIG_ATOMIC_MIN		(-2147483647-1)
-# define SIG_ATOMIC_MAX		(2147483647)
-
-/* Limit of `size_t' type.  */
-# if __WORDSIZE == 64
-#  define SIZE_MAX		(18446744073709551615UL)
-# else
-#  ifdef __WORDSIZE32_SIZE_ULONG
-#   define SIZE_MAX		(4294967295UL)
-#  else
-#   define SIZE_MAX		(4294967295U)
-#  endif
-# endif
-
-/* Limits of `wchar_t'.  */
-# ifndef WCHAR_MIN
-/* These constants might also be defined in <wchar.h>.  */
-#  define WCHAR_MIN		__WCHAR_MIN
-#  define WCHAR_MAX		__WCHAR_MAX
-# endif
-
-/* Limits of `wint_t'.  */
-# define WINT_MIN		(0u)
-# define WINT_MAX		(4294967295u)
-
-/* Signed.  */
-# define INT8_C(c)	c
-# define INT16_C(c)	c
-# define INT32_C(c)	c
-# if __WORDSIZE == 64
-#  define INT64_C(c)	c ## L
-# else
-#  define INT64_C(c)	c ## LL
-# endif
-
-/* Unsigned.  */
-# define UINT8_C(c)	c
-# define UINT16_C(c)	c
-# define UINT32_C(c)	c ## U
-# if __WORDSIZE == 64
-#  define UINT64_C(c)	c ## UL
-# else
-#  define UINT64_C(c)	c ## ULL
-# endif
-
-/* Maximal type.  */
-# if __WORDSIZE == 64
-#  define INTMAX_C(c)	c ## L
-#  define UINTMAX_C(c)	c ## UL
-# else
-#  define INTMAX_C(c)	c ## LL
-#  define UINTMAX_C(c)	c ## ULL
-# endif
-
-#endif /* stdint.h */
diff --git a/openflow/usr/include/stdio.h b/openflow/usr/include/stdio.h
deleted file mode 100644
index d8d7fa0..0000000
--- a/openflow/usr/include/stdio.h
+++ /dev/null
@@ -1,946 +0,0 @@
-/* Define ISO C stdio on top of C++ iostreams.
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.19 Input/output	<stdio.h>
- */
-
-#ifndef _STDIO_H
-
-#if !defined __need_FILE && !defined __need___FILE
-# define _STDIO_H	1
-# include <features.h>
-
-__BEGIN_DECLS
-
-# define __need_size_t
-# define __need_NULL
-# include <stddef.h>
-
-# include <bits/types.h>
-# define __need_FILE
-# define __need___FILE
-#endif /* Don't need FILE.  */
-
-
-#if !defined __FILE_defined && defined __need_FILE
-
-/* Define outside of namespace so the C++ is happy.  */
-struct _IO_FILE;
-
-__BEGIN_NAMESPACE_STD
-/* The opaque type of streams.  This is the definition used elsewhere.  */
-typedef struct _IO_FILE FILE;
-__END_NAMESPACE_STD
-#if defined __USE_LARGEFILE64 || defined __USE_POSIX \
-    || defined __USE_ISOC99 || defined __USE_XOPEN \
-    || defined __USE_POSIX2
-__USING_NAMESPACE_STD(FILE)
-#endif
-
-# define __FILE_defined	1
-#endif /* FILE not defined.  */
-#undef	__need_FILE
-
-
-#if !defined ____FILE_defined && defined __need___FILE
-
-/* The opaque type of streams.  This is the definition used elsewhere.  */
-typedef struct _IO_FILE __FILE;
-
-# define ____FILE_defined	1
-#endif /* __FILE not defined.  */
-#undef	__need___FILE
-
-
-#ifdef	_STDIO_H
-#define _STDIO_USES_IOSTREAM
-
-#include <libio.h>
-
-#if defined __USE_XOPEN || defined __USE_XOPEN2K8
-# ifdef __GNUC__
-#  ifndef _VA_LIST_DEFINED
-typedef _G_va_list va_list;
-#   define _VA_LIST_DEFINED
-#  endif
-# else
-#  include <stdarg.h>
-# endif
-#endif
-
-#ifdef __USE_XOPEN2K8
-# ifndef __off_t_defined
-# ifndef __USE_FILE_OFFSET64
-typedef __off_t off_t;
-# else
-typedef __off64_t off_t;
-# endif
-# define __off_t_defined
-# endif
-# if defined __USE_LARGEFILE64 && !defined __off64_t_defined
-typedef __off64_t off64_t;
-# define __off64_t_defined
-# endif
-
-# ifndef __ssize_t_defined
-typedef __ssize_t ssize_t;
-# define __ssize_t_defined
-# endif
-#endif
-
-/* The type of the second argument to `fgetpos' and `fsetpos'.  */
-__BEGIN_NAMESPACE_STD
-#ifndef __USE_FILE_OFFSET64
-typedef _G_fpos_t fpos_t;
-#else
-typedef _G_fpos64_t fpos_t;
-#endif
-__END_NAMESPACE_STD
-#ifdef __USE_LARGEFILE64
-typedef _G_fpos64_t fpos64_t;
-#endif
-
-/* The possibilities for the third argument to `setvbuf'.  */
-#define _IOFBF 0		/* Fully buffered.  */
-#define _IOLBF 1		/* Line buffered.  */
-#define _IONBF 2		/* No buffering.  */
-
-
-/* Default buffer size.  */
-#ifndef BUFSIZ
-# define BUFSIZ _IO_BUFSIZ
-#endif
-
-
-/* End of file character.
-   Some things throughout the library rely on this being -1.  */
-#ifndef EOF
-# define EOF (-1)
-#endif
-
-
-/* The possibilities for the third argument to `fseek'.
-   These values should not be changed.  */
-#define SEEK_SET	0	/* Seek from beginning of file.  */
-#define SEEK_CUR	1	/* Seek from current position.  */
-#define SEEK_END	2	/* Seek from end of file.  */
-#ifdef __USE_GNU
-# define SEEK_DATA	3	/* Seek to next data.  */
-# define SEEK_HOLE	4	/* Seek to next hole.  */
-#endif
-
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* Default path prefix for `tempnam' and `tmpnam'.  */
-# define P_tmpdir	"/tmp"
-#endif
-
-
-/* Get the values:
-   L_tmpnam	How long an array of chars must be to be passed to `tmpnam'.
-   TMP_MAX	The minimum number of unique filenames generated by tmpnam
-		(and tempnam when it uses tmpnam's name space),
-		or tempnam (the two are separate).
-   L_ctermid	How long an array to pass to `ctermid'.
-   L_cuserid	How long an array to pass to `cuserid'.
-   FOPEN_MAX	Minimum number of files that can be open at once.
-   FILENAME_MAX	Maximum length of a filename.  */
-#include <bits/stdio_lim.h>
-
-
-/* Standard streams.  */
-extern struct _IO_FILE *stdin;		/* Standard input stream.  */
-extern struct _IO_FILE *stdout;		/* Standard output stream.  */
-extern struct _IO_FILE *stderr;		/* Standard error output stream.  */
-/* C89/C99 say they're macros.  Make them happy.  */
-#define stdin stdin
-#define stdout stdout
-#define stderr stderr
-
-__BEGIN_NAMESPACE_STD
-/* Remove file FILENAME.  */
-extern int remove (const char *__filename) __THROW;
-/* Rename file OLD to NEW.  */
-extern int rename (const char *__old, const char *__new) __THROW;
-__END_NAMESPACE_STD
-
-#ifdef __USE_ATFILE
-/* Rename file OLD relative to OLDFD to NEW relative to NEWFD.  */
-extern int renameat (int __oldfd, const char *__old, int __newfd,
-		     const char *__new) __THROW;
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Create a temporary file and open it read/write.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-#ifndef __USE_FILE_OFFSET64
-extern FILE *tmpfile (void) __wur;
-#else
-# ifdef __REDIRECT
-extern FILE *__REDIRECT (tmpfile, (void), tmpfile64) __wur;
-# else
-#  define tmpfile tmpfile64
-# endif
-#endif
-
-#ifdef __USE_LARGEFILE64
-extern FILE *tmpfile64 (void) __wur;
-#endif
-
-/* Generate a temporary filename.  */
-extern char *tmpnam (char *__s) __THROW __wur;
-__END_NAMESPACE_STD
-
-#ifdef __USE_MISC
-/* This is the reentrant variant of `tmpnam'.  The only difference is
-   that it does not allow S to be NULL.  */
-extern char *tmpnam_r (char *__s) __THROW __wur;
-#endif
-
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* Generate a unique temporary filename using up to five characters of PFX
-   if it is not NULL.  The directory to put this file in is searched for
-   as follows: First the environment variable "TMPDIR" is checked.
-   If it contains the name of a writable directory, that directory is used.
-   If not and if DIR is not NULL, that value is checked.  If that fails,
-   P_tmpdir is tried and finally "/tmp".  The storage for the filename
-   is allocated by `malloc'.  */
-extern char *tempnam (const char *__dir, const char *__pfx)
-     __THROW __attribute_malloc__ __wur;
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Close STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fclose (FILE *__stream);
-/* Flush STREAM, or all streams if STREAM is NULL.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fflush (FILE *__stream);
-__END_NAMESPACE_STD
-
-#ifdef __USE_MISC
-/* Faster versions when locking is not required.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int fflush_unlocked (FILE *__stream);
-#endif
-
-#ifdef __USE_GNU
-/* Close all streams.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int fcloseall (void);
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-#ifndef __USE_FILE_OFFSET64
-/* Open a file and create a new stream for it.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern FILE *fopen (const char *__restrict __filename,
-		    const char *__restrict __modes) __wur;
-/* Open a file, replacing an existing stream with it.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern FILE *freopen (const char *__restrict __filename,
-		      const char *__restrict __modes,
-		      FILE *__restrict __stream) __wur;
-#else
-# ifdef __REDIRECT
-extern FILE *__REDIRECT (fopen, (const char *__restrict __filename,
-				 const char *__restrict __modes), fopen64)
-  __wur;
-extern FILE *__REDIRECT (freopen, (const char *__restrict __filename,
-				   const char *__restrict __modes,
-				   FILE *__restrict __stream), freopen64)
-  __wur;
-# else
-#  define fopen fopen64
-#  define freopen freopen64
-# endif
-#endif
-__END_NAMESPACE_STD
-#ifdef __USE_LARGEFILE64
-extern FILE *fopen64 (const char *__restrict __filename,
-		      const char *__restrict __modes) __wur;
-extern FILE *freopen64 (const char *__restrict __filename,
-			const char *__restrict __modes,
-			FILE *__restrict __stream) __wur;
-#endif
-
-#ifdef	__USE_POSIX
-/* Create a new stream that refers to an existing system file descriptor.  */
-extern FILE *fdopen (int __fd, const char *__modes) __THROW __wur;
-#endif
-
-#ifdef	__USE_GNU
-/* Create a new stream that refers to the given magic cookie,
-   and uses the given functions for input and output.  */
-extern FILE *fopencookie (void *__restrict __magic_cookie,
-			  const char *__restrict __modes,
-			  _IO_cookie_io_functions_t __io_funcs) __THROW __wur;
-#endif
-
-#ifdef __USE_XOPEN2K8
-/* Create a new stream that refers to a memory buffer.  */
-extern FILE *fmemopen (void *__s, size_t __len, const char *__modes)
-  __THROW __wur;
-
-/* Open a stream that writes into a malloc'd buffer that is expanded as
-   necessary.  *BUFLOC and *SIZELOC are updated with the buffer's location
-   and the number of characters written on fflush or fclose.  */
-extern FILE *open_memstream (char **__bufloc, size_t *__sizeloc) __THROW __wur;
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* If BUF is NULL, make STREAM unbuffered.
-   Else make it use buffer BUF, of size BUFSIZ.  */
-extern void setbuf (FILE *__restrict __stream, char *__restrict __buf) __THROW;
-/* Make STREAM use buffering mode MODE.
-   If BUF is not NULL, use N bytes of it for buffering;
-   else allocate an internal buffer N bytes long.  */
-extern int setvbuf (FILE *__restrict __stream, char *__restrict __buf,
-		    int __modes, size_t __n) __THROW;
-__END_NAMESPACE_STD
-
-#ifdef	__USE_MISC
-/* If BUF is NULL, make STREAM unbuffered.
-   Else make it use SIZE bytes of BUF for buffering.  */
-extern void setbuffer (FILE *__restrict __stream, char *__restrict __buf,
-		       size_t __size) __THROW;
-
-/* Make STREAM line-buffered.  */
-extern void setlinebuf (FILE *__stream) __THROW;
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Write formatted output to STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fprintf (FILE *__restrict __stream,
-		    const char *__restrict __format, ...);
-/* Write formatted output to stdout.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int printf (const char *__restrict __format, ...);
-/* Write formatted output to S.  */
-extern int sprintf (char *__restrict __s,
-		    const char *__restrict __format, ...) __THROWNL;
-
-/* Write formatted output to S from argument list ARG.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int vfprintf (FILE *__restrict __s, const char *__restrict __format,
-		     _G_va_list __arg);
-/* Write formatted output to stdout from argument list ARG.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int vprintf (const char *__restrict __format, _G_va_list __arg);
-/* Write formatted output to S from argument list ARG.  */
-extern int vsprintf (char *__restrict __s, const char *__restrict __format,
-		     _G_va_list __arg) __THROWNL;
-__END_NAMESPACE_STD
-
-#if defined __USE_ISOC99 || defined __USE_UNIX98
-__BEGIN_NAMESPACE_C99
-/* Maximum chars of output to write in MAXLEN.  */
-extern int snprintf (char *__restrict __s, size_t __maxlen,
-		     const char *__restrict __format, ...)
-     __THROWNL __attribute__ ((__format__ (__printf__, 3, 4)));
-
-extern int vsnprintf (char *__restrict __s, size_t __maxlen,
-		      const char *__restrict __format, _G_va_list __arg)
-     __THROWNL __attribute__ ((__format__ (__printf__, 3, 0)));
-__END_NAMESPACE_C99
-#endif
-
-#ifdef __USE_GNU
-/* Write formatted output to a string dynamically allocated with `malloc'.
-   Store the address of the string in *PTR.  */
-extern int vasprintf (char **__restrict __ptr, const char *__restrict __f,
-		      _G_va_list __arg)
-     __THROWNL __attribute__ ((__format__ (__printf__, 2, 0))) __wur;
-extern int __asprintf (char **__restrict __ptr,
-		       const char *__restrict __fmt, ...)
-     __THROWNL __attribute__ ((__format__ (__printf__, 2, 3))) __wur;
-extern int asprintf (char **__restrict __ptr,
-		     const char *__restrict __fmt, ...)
-     __THROWNL __attribute__ ((__format__ (__printf__, 2, 3))) __wur;
-#endif
-
-#ifdef __USE_XOPEN2K8
-/* Write formatted output to a file descriptor.  */
-extern int vdprintf (int __fd, const char *__restrict __fmt,
-		     _G_va_list __arg)
-     __attribute__ ((__format__ (__printf__, 2, 0)));
-extern int dprintf (int __fd, const char *__restrict __fmt, ...)
-     __attribute__ ((__format__ (__printf__, 2, 3)));
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Read formatted input from STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fscanf (FILE *__restrict __stream,
-		   const char *__restrict __format, ...) __wur;
-/* Read formatted input from stdin.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int scanf (const char *__restrict __format, ...) __wur;
-/* Read formatted input from S.  */
-extern int sscanf (const char *__restrict __s,
-		   const char *__restrict __format, ...) __THROW;
-
-#if defined __USE_ISOC99 && !defined __USE_GNU \
-    && (!defined __LDBL_COMPAT || !defined __REDIRECT) \
-    && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
-# ifdef __REDIRECT
-/* For strict ISO C99 or POSIX compliance disallow %as, %aS and %a[
-   GNU extension which conflicts with valid %a followed by letter
-   s, S or [.  */
-extern int __REDIRECT (fscanf, (FILE *__restrict __stream,
-				const char *__restrict __format, ...),
-		       __isoc99_fscanf) __wur;
-extern int __REDIRECT (scanf, (const char *__restrict __format, ...),
-		       __isoc99_scanf) __wur;
-extern int __REDIRECT_NTH (sscanf, (const char *__restrict __s,
-				    const char *__restrict __format, ...),
-			   __isoc99_sscanf);
-# else
-extern int __isoc99_fscanf (FILE *__restrict __stream,
-			    const char *__restrict __format, ...) __wur;
-extern int __isoc99_scanf (const char *__restrict __format, ...) __wur;
-extern int __isoc99_sscanf (const char *__restrict __s,
-			    const char *__restrict __format, ...) __THROW;
-#  define fscanf __isoc99_fscanf
-#  define scanf __isoc99_scanf
-#  define sscanf __isoc99_sscanf
-# endif
-#endif
-
-__END_NAMESPACE_STD
-
-#ifdef	__USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Read formatted input from S into argument list ARG.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int vfscanf (FILE *__restrict __s, const char *__restrict __format,
-		    _G_va_list __arg)
-     __attribute__ ((__format__ (__scanf__, 2, 0))) __wur;
-
-/* Read formatted input from stdin into argument list ARG.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int vscanf (const char *__restrict __format, _G_va_list __arg)
-     __attribute__ ((__format__ (__scanf__, 1, 0))) __wur;
-
-/* Read formatted input from S into argument list ARG.  */
-extern int vsscanf (const char *__restrict __s,
-		    const char *__restrict __format, _G_va_list __arg)
-     __THROW __attribute__ ((__format__ (__scanf__, 2, 0)));
-
-# if !defined __USE_GNU \
-     && (!defined __LDBL_COMPAT || !defined __REDIRECT) \
-     && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
-#  ifdef __REDIRECT
-/* For strict ISO C99 or POSIX compliance disallow %as, %aS and %a[
-   GNU extension which conflicts with valid %a followed by letter
-   s, S or [.  */
-extern int __REDIRECT (vfscanf,
-		       (FILE *__restrict __s,
-			const char *__restrict __format, _G_va_list __arg),
-		       __isoc99_vfscanf)
-     __attribute__ ((__format__ (__scanf__, 2, 0))) __wur;
-extern int __REDIRECT (vscanf, (const char *__restrict __format,
-				_G_va_list __arg), __isoc99_vscanf)
-     __attribute__ ((__format__ (__scanf__, 1, 0))) __wur;
-extern int __REDIRECT_NTH (vsscanf,
-			   (const char *__restrict __s,
-			    const char *__restrict __format,
-			    _G_va_list __arg), __isoc99_vsscanf)
-     __attribute__ ((__format__ (__scanf__, 2, 0)));
-#  else
-extern int __isoc99_vfscanf (FILE *__restrict __s,
-			     const char *__restrict __format,
-			     _G_va_list __arg) __wur;
-extern int __isoc99_vscanf (const char *__restrict __format,
-			    _G_va_list __arg) __wur;
-extern int __isoc99_vsscanf (const char *__restrict __s,
-			     const char *__restrict __format,
-			     _G_va_list __arg) __THROW;
-#   define vfscanf __isoc99_vfscanf
-#   define vscanf __isoc99_vscanf
-#   define vsscanf __isoc99_vsscanf
-#  endif
-# endif
-
-__END_NAMESPACE_C99
-#endif /* Use ISO C9x.  */
-
-
-__BEGIN_NAMESPACE_STD
-/* Read a character from STREAM.
-
-   These functions are possible cancellation points and therefore not
-   marked with __THROW.  */
-extern int fgetc (FILE *__stream);
-extern int getc (FILE *__stream);
-
-/* Read a character from stdin.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int getchar (void);
-__END_NAMESPACE_STD
-
-/* The C standard explicitly says this is a macro, so we always do the
-   optimization for it.  */
-#define getc(_fp) _IO_getc (_fp)
-
-#ifdef __USE_POSIX
-/* These are defined in POSIX.1:1996.
-
-   These functions are possible cancellation points and therefore not
-   marked with __THROW.  */
-extern int getc_unlocked (FILE *__stream);
-extern int getchar_unlocked (void);
-#endif /* Use POSIX.  */
-
-#ifdef __USE_MISC
-/* Faster version when locking is not necessary.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int fgetc_unlocked (FILE *__stream);
-#endif /* Use MISC.  */
-
-
-__BEGIN_NAMESPACE_STD
-/* Write a character to STREAM.
-
-   These functions are possible cancellation points and therefore not
-   marked with __THROW.
-
-   These functions is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fputc (int __c, FILE *__stream);
-extern int putc (int __c, FILE *__stream);
-
-/* Write a character to stdout.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int putchar (int __c);
-__END_NAMESPACE_STD
-
-/* The C standard explicitly says this can be a macro,
-   so we always do the optimization for it.  */
-#define putc(_ch, _fp) _IO_putc (_ch, _fp)
-
-#ifdef __USE_MISC
-/* Faster version when locking is not necessary.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int fputc_unlocked (int __c, FILE *__stream);
-#endif /* Use MISC.  */
-
-#ifdef __USE_POSIX
-/* These are defined in POSIX.1:1996.
-
-   These functions are possible cancellation points and therefore not
-   marked with __THROW.  */
-extern int putc_unlocked (int __c, FILE *__stream);
-extern int putchar_unlocked (int __c);
-#endif /* Use POSIX.  */
-
-
-#if defined __USE_MISC \
-    || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
-/* Get a word (int) from STREAM.  */
-extern int getw (FILE *__stream);
-
-/* Write a word (int) to STREAM.  */
-extern int putw (int __w, FILE *__stream);
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Get a newline-terminated string of finite length from STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern char *fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
-     __wur;
-
-#if !defined __USE_ISOC11 \
-    || (defined __cplusplus && __cplusplus <= 201103L)
-/* Get a newline-terminated string from stdin, removing the newline.
-   DO NOT USE THIS FUNCTION!!  There is no limit on how much it will read.
-
-   The function has been officially removed in ISO C11.  This opportunity
-   is used to also remove it from the GNU feature list.  It is now only
-   available when explicitly using an old ISO C, Unix, or POSIX standard.
-   GCC defines _GNU_SOURCE when building C++ code and the function is still
-   in C++11, so it is also available for C++.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern char *gets (char *__s) __wur __attribute_deprecated__;
-#endif
-__END_NAMESPACE_STD
-
-#ifdef __USE_GNU
-/* This function does the same as `fgets' but does not lock the stream.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern char *fgets_unlocked (char *__restrict __s, int __n,
-			     FILE *__restrict __stream) __wur;
-#endif
-
-
-#ifdef	__USE_XOPEN2K8
-/* Read up to (and including) a DELIMITER from STREAM into *LINEPTR
-   (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
-   NULL), pointing to *N characters of space.  It is realloc'd as
-   necessary.  Returns the number of characters read (not including the
-   null terminator), or -1 on error or EOF.
-
-   These functions are not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation they are cancellation points and
-   therefore not marked with __THROW.  */
-extern _IO_ssize_t __getdelim (char **__restrict __lineptr,
-			       size_t *__restrict __n, int __delimiter,
-			       FILE *__restrict __stream) __wur;
-extern _IO_ssize_t getdelim (char **__restrict __lineptr,
-			     size_t *__restrict __n, int __delimiter,
-			     FILE *__restrict __stream) __wur;
-
-/* Like `getdelim', but reads up to a newline.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern _IO_ssize_t getline (char **__restrict __lineptr,
-			    size_t *__restrict __n,
-			    FILE *__restrict __stream) __wur;
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Write a string to STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fputs (const char *__restrict __s, FILE *__restrict __stream);
-
-/* Write a string, followed by a newline, to stdout.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int puts (const char *__s);
-
-
-/* Push a character back onto the input buffer of STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int ungetc (int __c, FILE *__stream);
-
-
-/* Read chunks of generic data from STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern size_t fread (void *__restrict __ptr, size_t __size,
-		     size_t __n, FILE *__restrict __stream) __wur;
-/* Write chunks of generic data to STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern size_t fwrite (const void *__restrict __ptr, size_t __size,
-		      size_t __n, FILE *__restrict __s);
-__END_NAMESPACE_STD
-
-#ifdef __USE_GNU
-/* This function does the same as `fputs' but does not lock the stream.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int fputs_unlocked (const char *__restrict __s,
-			   FILE *__restrict __stream);
-#endif
-
-#ifdef __USE_MISC
-/* Faster versions when locking is not necessary.
-
-   These functions are not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation they are cancellation points and
-   therefore not marked with __THROW.  */
-extern size_t fread_unlocked (void *__restrict __ptr, size_t __size,
-			      size_t __n, FILE *__restrict __stream) __wur;
-extern size_t fwrite_unlocked (const void *__restrict __ptr, size_t __size,
-			       size_t __n, FILE *__restrict __stream);
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Seek to a certain position on STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fseek (FILE *__stream, long int __off, int __whence);
-/* Return the current position of STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern long int ftell (FILE *__stream) __wur;
-/* Rewind to the beginning of STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void rewind (FILE *__stream);
-__END_NAMESPACE_STD
-
-/* The Single Unix Specification, Version 2, specifies an alternative,
-   more adequate interface for the two functions above which deal with
-   file offset.  `long int' is not the right type.  These definitions
-   are originally defined in the Large File Support API.  */
-
-#if defined __USE_LARGEFILE || defined __USE_XOPEN2K
-# ifndef __USE_FILE_OFFSET64
-/* Seek to a certain position on STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fseeko (FILE *__stream, __off_t __off, int __whence);
-/* Return the current position of STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern __off_t ftello (FILE *__stream) __wur;
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (fseeko,
-		       (FILE *__stream, __off64_t __off, int __whence),
-		       fseeko64);
-extern __off64_t __REDIRECT (ftello, (FILE *__stream), ftello64);
-#  else
-#   define fseeko fseeko64
-#   define ftello ftello64
-#  endif
-# endif
-#endif
-
-__BEGIN_NAMESPACE_STD
-#ifndef __USE_FILE_OFFSET64
-/* Get STREAM's position.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fgetpos (FILE *__restrict __stream, fpos_t *__restrict __pos);
-/* Set STREAM's position.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fsetpos (FILE *__stream, const fpos_t *__pos);
-#else
-# ifdef __REDIRECT
-extern int __REDIRECT (fgetpos, (FILE *__restrict __stream,
-				 fpos_t *__restrict __pos), fgetpos64);
-extern int __REDIRECT (fsetpos,
-		       (FILE *__stream, const fpos_t *__pos), fsetpos64);
-# else
-#  define fgetpos fgetpos64
-#  define fsetpos fsetpos64
-# endif
-#endif
-__END_NAMESPACE_STD
-
-#ifdef __USE_LARGEFILE64
-extern int fseeko64 (FILE *__stream, __off64_t __off, int __whence);
-extern __off64_t ftello64 (FILE *__stream) __wur;
-extern int fgetpos64 (FILE *__restrict __stream, fpos64_t *__restrict __pos);
-extern int fsetpos64 (FILE *__stream, const fpos64_t *__pos);
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Clear the error and EOF indicators for STREAM.  */
-extern void clearerr (FILE *__stream) __THROW;
-/* Return the EOF indicator for STREAM.  */
-extern int feof (FILE *__stream) __THROW __wur;
-/* Return the error indicator for STREAM.  */
-extern int ferror (FILE *__stream) __THROW __wur;
-__END_NAMESPACE_STD
-
-#ifdef __USE_MISC
-/* Faster versions when locking is not required.  */
-extern void clearerr_unlocked (FILE *__stream) __THROW;
-extern int feof_unlocked (FILE *__stream) __THROW __wur;
-extern int ferror_unlocked (FILE *__stream) __THROW __wur;
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Print a message describing the meaning of the value of errno.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void perror (const char *__s);
-__END_NAMESPACE_STD
-
-/* Provide the declarations for `sys_errlist' and `sys_nerr' if they
-   are available on this system.  Even if available, these variables
-   should not be used directly.  The `strerror' function provides
-   all the necessary functionality.  */
-#include <bits/sys_errlist.h>
-
-
-#ifdef	__USE_POSIX
-/* Return the system file descriptor for STREAM.  */
-extern int fileno (FILE *__stream) __THROW __wur;
-#endif /* Use POSIX.  */
-
-#ifdef __USE_MISC
-/* Faster version when locking is not required.  */
-extern int fileno_unlocked (FILE *__stream) __THROW __wur;
-#endif
-
-
-#ifdef __USE_POSIX2
-/* Create a new stream connected to a pipe running the given command.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern FILE *popen (const char *__command, const char *__modes) __wur;
-
-/* Close a stream opened by popen and return the status of its child.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int pclose (FILE *__stream);
-#endif
-
-
-#ifdef	__USE_POSIX
-/* Return the name of the controlling terminal.  */
-extern char *ctermid (char *__s) __THROW;
-#endif /* Use POSIX.  */
-
-
-#ifdef __USE_XOPEN
-/* Return the name of the current user.  */
-extern char *cuserid (char *__s);
-#endif /* Use X/Open, but not issue 6.  */
-
-
-#ifdef	__USE_GNU
-struct obstack;			/* See <obstack.h>.  */
-
-/* Write formatted output to an obstack.  */
-extern int obstack_printf (struct obstack *__restrict __obstack,
-			   const char *__restrict __format, ...)
-     __THROWNL __attribute__ ((__format__ (__printf__, 2, 3)));
-extern int obstack_vprintf (struct obstack *__restrict __obstack,
-			    const char *__restrict __format,
-			    _G_va_list __args)
-     __THROWNL __attribute__ ((__format__ (__printf__, 2, 0)));
-#endif /* Use GNU.  */
-
-
-#ifdef __USE_POSIX
-/* These are defined in POSIX.1:1996.  */
-
-/* Acquire ownership of STREAM.  */
-extern void flockfile (FILE *__stream) __THROW;
-
-/* Try to acquire ownership of STREAM but do not block if it is not
-   possible.  */
-extern int ftrylockfile (FILE *__stream) __THROW __wur;
-
-/* Relinquish the ownership granted for STREAM.  */
-extern void funlockfile (FILE *__stream) __THROW;
-#endif /* POSIX */
-
-#if defined __USE_XOPEN && !defined __USE_XOPEN2K && !defined __USE_GNU
-/* The X/Open standard requires some functions and variables to be
-   declared here which do not belong into this header.  But we have to
-   follow.  In GNU mode we don't do this nonsense.  */
-# define __need_getopt
-# include <getopt.h>
-#endif	/* X/Open, but not issue 6 and not for GNU.  */
-
-/* If we are compiling with optimizing read this file.  It contains
-   several optimizing inline functions and macros.  */
-#ifdef __USE_EXTERN_INLINES
-# include <bits/stdio.h>
-#endif
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-# include <bits/stdio2.h>
-#endif
-#ifdef __LDBL_COMPAT
-# include <bits/stdio-ldbl.h>
-#endif
-
-__END_DECLS
-
-#endif /* <stdio.h> included.  */
-
-#endif /* !_STDIO_H */
diff --git a/openflow/usr/include/stdio_ext.h b/openflow/usr/include/stdio_ext.h
deleted file mode 100644
index eca2b19..0000000
--- a/openflow/usr/include/stdio_ext.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Functions to access FILE structure internals.
-   Copyright (C) 2000-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* This header contains the same definitions as the header of the same name
-   on Sun's Solaris OS.  */
-
-#ifndef _STDIO_EXT_H
-#define _STDIO_EXT_H	1
-
-#include <stdio.h>
-
-enum
-{
-  /* Query current state of the locking status.  */
-  FSETLOCKING_QUERY = 0,
-#define FSETLOCKING_QUERY	FSETLOCKING_QUERY
-  /* The library protects all uses of the stream functions, except for
-     uses of the *_unlocked functions, by calls equivalent to flockfile().  */
-  FSETLOCKING_INTERNAL,
-#define FSETLOCKING_INTERNAL	FSETLOCKING_INTERNAL
-  /* The user will take care of locking.  */
-  FSETLOCKING_BYCALLER
-#define FSETLOCKING_BYCALLER	FSETLOCKING_BYCALLER
-};
-
-
-__BEGIN_DECLS
-
-/* Return the size of the buffer of FP in bytes currently in use by
-   the given stream.  */
-extern size_t __fbufsize (FILE *__fp) __THROW;
-
-
-/* Return non-zero value iff the stream FP is opened readonly, or if the
-   last operation on the stream was a read operation.  */
-extern int __freading (FILE *__fp) __THROW;
-
-/* Return non-zero value iff the stream FP is opened write-only or
-   append-only, or if the last operation on the stream was a write
-   operation.  */
-extern int __fwriting (FILE *__fp) __THROW;
-
-
-/* Return non-zero value iff stream FP is not opened write-only or
-   append-only.  */
-extern int __freadable (FILE *__fp) __THROW;
-
-/* Return non-zero value iff stream FP is not opened read-only.  */
-extern int __fwritable (FILE *__fp) __THROW;
-
-
-/* Return non-zero value iff the stream FP is line-buffered.  */
-extern int __flbf (FILE *__fp) __THROW;
-
-
-/* Discard all pending buffered I/O on the stream FP.  */
-extern void __fpurge (FILE *__fp) __THROW;
-
-/* Return amount of output in bytes pending on a stream FP.  */
-extern size_t __fpending (FILE *__fp) __THROW;
-
-/* Flush all line-buffered files.  */
-extern void _flushlbf (void);
-
-
-/* Set locking status of stream FP to TYPE.  */
-extern int __fsetlocking (FILE *__fp, int __type) __THROW;
-
-__END_DECLS
-
-#endif	/* stdio_ext.h */
diff --git a/openflow/usr/include/stdlib.h b/openflow/usr/include/stdlib.h
deleted file mode 100644
index cc77708..0000000
--- a/openflow/usr/include/stdlib.h
+++ /dev/null
@@ -1,969 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.20 General utilities	<stdlib.h>
- */
-
-#ifndef	_STDLIB_H
-
-#include <features.h>
-
-/* Get size_t, wchar_t and NULL from <stddef.h>.  */
-#define		__need_size_t
-#ifndef __need_malloc_and_calloc
-# define	__need_wchar_t
-# define	__need_NULL
-#endif
-#include <stddef.h>
-
-__BEGIN_DECLS
-
-#ifndef __need_malloc_and_calloc
-#define	_STDLIB_H	1
-
-#if (defined __USE_XOPEN || defined __USE_XOPEN2K8) && !defined _SYS_WAIT_H
-/* XPG requires a few symbols from <sys/wait.h> being defined.  */
-# include <bits/waitflags.h>
-# include <bits/waitstatus.h>
-
-# ifdef __USE_MISC
-
-/* Lots of hair to allow traditional BSD use of `union wait'
-   as well as POSIX.1 use of `int' for the status word.  */
-
-#  if defined __GNUC__ && !defined __cplusplus
-#   define __WAIT_INT(status) \
-  (__extension__ (((union { __typeof(status) __in; int __i; }) \
-		   { .__in = (status) }).__i))
-#  else
-#   define __WAIT_INT(status)	(*(int *) &(status))
-#  endif
-
-/* This is the type of the argument to `wait'.  The funky union
-   causes redeclarations with either `int *' or `union wait *' to be
-   allowed without complaint.  __WAIT_STATUS_DEFN is the type used in
-   the actual function definitions.  */
-
-#  if !defined __GNUC__ || __GNUC__ < 2 || defined __cplusplus
-#   define __WAIT_STATUS	void *
-#   define __WAIT_STATUS_DEFN	void *
-#  else
-/* This works in GCC 2.6.1 and later.  */
-typedef union
-  {
-    union wait *__uptr;
-    int *__iptr;
-  } __WAIT_STATUS __attribute__ ((__transparent_union__));
-#   define __WAIT_STATUS_DEFN	int *
-#  endif
-
-# else /* Don't use misc.  */
-
-#  define __WAIT_INT(status)	(status)
-#  define __WAIT_STATUS		int *
-#  define __WAIT_STATUS_DEFN	int *
-
-# endif /* Use misc.  */
-
-/* Define the macros <sys/wait.h> also would define this way.  */
-# define WEXITSTATUS(status)	__WEXITSTATUS (__WAIT_INT (status))
-# define WTERMSIG(status)	__WTERMSIG (__WAIT_INT (status))
-# define WSTOPSIG(status)	__WSTOPSIG (__WAIT_INT (status))
-# define WIFEXITED(status)	__WIFEXITED (__WAIT_INT (status))
-# define WIFSIGNALED(status)	__WIFSIGNALED (__WAIT_INT (status))
-# define WIFSTOPPED(status)	__WIFSTOPPED (__WAIT_INT (status))
-# ifdef __WIFCONTINUED
-#  define WIFCONTINUED(status)	__WIFCONTINUED (__WAIT_INT (status))
-# endif
-#endif	/* X/Open or XPG7 and <sys/wait.h> not included.  */
-
-__BEGIN_NAMESPACE_STD
-/* Returned by `div'.  */
-typedef struct
-  {
-    int quot;			/* Quotient.  */
-    int rem;			/* Remainder.  */
-  } div_t;
-
-/* Returned by `ldiv'.  */
-#ifndef __ldiv_t_defined
-typedef struct
-  {
-    long int quot;		/* Quotient.  */
-    long int rem;		/* Remainder.  */
-  } ldiv_t;
-# define __ldiv_t_defined	1
-#endif
-__END_NAMESPACE_STD
-
-#if defined __USE_ISOC99 && !defined __lldiv_t_defined
-__BEGIN_NAMESPACE_C99
-/* Returned by `lldiv'.  */
-__extension__ typedef struct
-  {
-    long long int quot;		/* Quotient.  */
-    long long int rem;		/* Remainder.  */
-  } lldiv_t;
-# define __lldiv_t_defined	1
-__END_NAMESPACE_C99
-#endif
-
-
-/* The largest number rand will return (same as INT_MAX).  */
-#define	RAND_MAX	2147483647
-
-
-/* We define these the same for all machines.
-   Changes from this to the outside world should be done in `_exit'.  */
-#define	EXIT_FAILURE	1	/* Failing exit status.  */
-#define	EXIT_SUCCESS	0	/* Successful exit status.  */
-
-
-/* Maximum length of a multibyte character in the current locale.  */
-#define	MB_CUR_MAX	(__ctype_get_mb_cur_max ())
-extern size_t __ctype_get_mb_cur_max (void) __THROW __wur;
-
-
-__BEGIN_NAMESPACE_STD
-/* Convert a string to a floating-point number.  */
-extern double atof (const char *__nptr)
-     __THROW __attribute_pure__ __nonnull ((1)) __wur;
-/* Convert a string to an integer.  */
-extern int atoi (const char *__nptr)
-     __THROW __attribute_pure__ __nonnull ((1)) __wur;
-/* Convert a string to a long integer.  */
-extern long int atol (const char *__nptr)
-     __THROW __attribute_pure__ __nonnull ((1)) __wur;
-__END_NAMESPACE_STD
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Convert a string to a long long integer.  */
-__extension__ extern long long int atoll (const char *__nptr)
-     __THROW __attribute_pure__ __nonnull ((1)) __wur;
-__END_NAMESPACE_C99
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Convert a string to a floating-point number.  */
-extern double strtod (const char *__restrict __nptr,
-		      char **__restrict __endptr)
-     __THROW __nonnull ((1));
-__END_NAMESPACE_STD
-
-#ifdef	__USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Likewise for `float' and `long double' sizes of floating-point numbers.  */
-extern float strtof (const char *__restrict __nptr,
-		     char **__restrict __endptr) __THROW __nonnull ((1));
-
-extern long double strtold (const char *__restrict __nptr,
-			    char **__restrict __endptr)
-     __THROW __nonnull ((1));
-__END_NAMESPACE_C99
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Convert a string to a long integer.  */
-extern long int strtol (const char *__restrict __nptr,
-			char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1));
-/* Convert a string to an unsigned long integer.  */
-extern unsigned long int strtoul (const char *__restrict __nptr,
-				  char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1));
-__END_NAMESPACE_STD
-
-#ifdef __USE_MISC
-/* Convert a string to a quadword integer.  */
-__extension__
-extern long long int strtoq (const char *__restrict __nptr,
-			     char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1));
-/* Convert a string to an unsigned quadword integer.  */
-__extension__
-extern unsigned long long int strtouq (const char *__restrict __nptr,
-				       char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1));
-#endif /* Use misc.  */
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Convert a string to a quadword integer.  */
-__extension__
-extern long long int strtoll (const char *__restrict __nptr,
-			      char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1));
-/* Convert a string to an unsigned quadword integer.  */
-__extension__
-extern unsigned long long int strtoull (const char *__restrict __nptr,
-					char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1));
-__END_NAMESPACE_C99
-#endif /* ISO C99 or use MISC.  */
-
-
-#ifdef __USE_GNU
-/* The concept of one static locale per category is not very well
-   thought out.  Many applications will need to process its data using
-   information from several different locales.  Another problem is
-   the implementation of the internationalization handling in the
-   ISO C++ standard library.  To support this another set of
-   the functions using locale data exist which take an additional
-   argument.
-
-   Attention: even though several *_l interfaces are part of POSIX:2008,
-   these are not.  */
-
-/* Structure for reentrant locale using functions.  This is an
-   (almost) opaque type for the user level programs.  */
-# include <xlocale.h>
-
-/* Special versions of the functions above which take the locale to
-   use as an additional parameter.  */
-extern long int strtol_l (const char *__restrict __nptr,
-			  char **__restrict __endptr, int __base,
-			  __locale_t __loc) __THROW __nonnull ((1, 4));
-
-extern unsigned long int strtoul_l (const char *__restrict __nptr,
-				    char **__restrict __endptr,
-				    int __base, __locale_t __loc)
-     __THROW __nonnull ((1, 4));
-
-__extension__
-extern long long int strtoll_l (const char *__restrict __nptr,
-				char **__restrict __endptr, int __base,
-				__locale_t __loc)
-     __THROW __nonnull ((1, 4));
-
-__extension__
-extern unsigned long long int strtoull_l (const char *__restrict __nptr,
-					  char **__restrict __endptr,
-					  int __base, __locale_t __loc)
-     __THROW __nonnull ((1, 4));
-
-extern double strtod_l (const char *__restrict __nptr,
-			char **__restrict __endptr, __locale_t __loc)
-     __THROW __nonnull ((1, 3));
-
-extern float strtof_l (const char *__restrict __nptr,
-		       char **__restrict __endptr, __locale_t __loc)
-     __THROW __nonnull ((1, 3));
-
-extern long double strtold_l (const char *__restrict __nptr,
-			      char **__restrict __endptr,
-			      __locale_t __loc)
-     __THROW __nonnull ((1, 3));
-#endif /* GNU */
-
-
-#ifdef __USE_EXTERN_INLINES
-__BEGIN_NAMESPACE_STD
-__extern_inline int
-__NTH (atoi (const char *__nptr))
-{
-  return (int) strtol (__nptr, (char **) NULL, 10);
-}
-__extern_inline long int
-__NTH (atol (const char *__nptr))
-{
-  return strtol (__nptr, (char **) NULL, 10);
-}
-__END_NAMESPACE_STD
-
-# ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-__extension__ __extern_inline long long int
-__NTH (atoll (const char *__nptr))
-{
-  return strtoll (__nptr, (char **) NULL, 10);
-}
-__END_NAMESPACE_C99
-# endif
-#endif /* Optimizing and Inlining.  */
-
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-/* Convert N to base 64 using the digits "./0-9A-Za-z", least-significant
-   digit first.  Returns a pointer to static storage overwritten by the
-   next call.  */
-extern char *l64a (long int __n) __THROW __wur;
-
-/* Read a number from a string S in base 64 as above.  */
-extern long int a64l (const char *__s)
-     __THROW __attribute_pure__ __nonnull ((1)) __wur;
-
-#endif	/* Use misc || extended X/Open.  */
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-# include <sys/types.h>	/* we need int32_t... */
-
-/* These are the functions that actually do things.  The `random', `srandom',
-   `initstate' and `setstate' functions are those from BSD Unices.
-   The `rand' and `srand' functions are required by the ANSI standard.
-   We provide both interfaces to the same random number generator.  */
-/* Return a random long integer between 0 and RAND_MAX inclusive.  */
-extern long int random (void) __THROW;
-
-/* Seed the random number generator with the given number.  */
-extern void srandom (unsigned int __seed) __THROW;
-
-/* Initialize the random number generator to use state buffer STATEBUF,
-   of length STATELEN, and seed it with SEED.  Optimal lengths are 8, 16,
-   32, 64, 128 and 256, the bigger the better; values less than 8 will
-   cause an error and values greater than 256 will be rounded down.  */
-extern char *initstate (unsigned int __seed, char *__statebuf,
-			size_t __statelen) __THROW __nonnull ((2));
-
-/* Switch the random number generator to state buffer STATEBUF,
-   which should have been previously initialized by `initstate'.  */
-extern char *setstate (char *__statebuf) __THROW __nonnull ((1));
-
-
-# ifdef __USE_MISC
-/* Reentrant versions of the `random' family of functions.
-   These functions all use the following data structure to contain
-   state, rather than global state variables.  */
-
-struct random_data
-  {
-    int32_t *fptr;		/* Front pointer.  */
-    int32_t *rptr;		/* Rear pointer.  */
-    int32_t *state;		/* Array of state values.  */
-    int rand_type;		/* Type of random number generator.  */
-    int rand_deg;		/* Degree of random number generator.  */
-    int rand_sep;		/* Distance between front and rear.  */
-    int32_t *end_ptr;		/* Pointer behind state table.  */
-  };
-
-extern int random_r (struct random_data *__restrict __buf,
-		     int32_t *__restrict __result) __THROW __nonnull ((1, 2));
-
-extern int srandom_r (unsigned int __seed, struct random_data *__buf)
-     __THROW __nonnull ((2));
-
-extern int initstate_r (unsigned int __seed, char *__restrict __statebuf,
-			size_t __statelen,
-			struct random_data *__restrict __buf)
-     __THROW __nonnull ((2, 4));
-
-extern int setstate_r (char *__restrict __statebuf,
-		       struct random_data *__restrict __buf)
-     __THROW __nonnull ((1, 2));
-# endif	/* Use misc.  */
-#endif	/* Use extended X/Open || misc. */
-
-
-__BEGIN_NAMESPACE_STD
-/* Return a random integer between 0 and RAND_MAX inclusive.  */
-extern int rand (void) __THROW;
-/* Seed the random number generator with the given number.  */
-extern void srand (unsigned int __seed) __THROW;
-__END_NAMESPACE_STD
-
-#ifdef __USE_POSIX
-/* Reentrant interface according to POSIX.1.  */
-extern int rand_r (unsigned int *__seed) __THROW;
-#endif
-
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* System V style 48-bit random number generator functions.  */
-
-/* Return non-negative, double-precision floating-point value in [0.0,1.0).  */
-extern double drand48 (void) __THROW;
-extern double erand48 (unsigned short int __xsubi[3]) __THROW __nonnull ((1));
-
-/* Return non-negative, long integer in [0,2^31).  */
-extern long int lrand48 (void) __THROW;
-extern long int nrand48 (unsigned short int __xsubi[3])
-     __THROW __nonnull ((1));
-
-/* Return signed, long integers in [-2^31,2^31).  */
-extern long int mrand48 (void) __THROW;
-extern long int jrand48 (unsigned short int __xsubi[3])
-     __THROW __nonnull ((1));
-
-/* Seed random number generator.  */
-extern void srand48 (long int __seedval) __THROW;
-extern unsigned short int *seed48 (unsigned short int __seed16v[3])
-     __THROW __nonnull ((1));
-extern void lcong48 (unsigned short int __param[7]) __THROW __nonnull ((1));
-
-# ifdef __USE_MISC
-/* Data structure for communication with thread safe versions.  This
-   type is to be regarded as opaque.  It's only exported because users
-   have to allocate objects of this type.  */
-struct drand48_data
-  {
-    unsigned short int __x[3];	/* Current state.  */
-    unsigned short int __old_x[3]; /* Old state.  */
-    unsigned short int __c;	/* Additive const. in congruential formula.  */
-    unsigned short int __init;	/* Flag for initializing.  */
-    __extension__ unsigned long long int __a;	/* Factor in congruential
-						   formula.  */
-  };
-
-/* Return non-negative, double-precision floating-point value in [0.0,1.0).  */
-extern int drand48_r (struct drand48_data *__restrict __buffer,
-		      double *__restrict __result) __THROW __nonnull ((1, 2));
-extern int erand48_r (unsigned short int __xsubi[3],
-		      struct drand48_data *__restrict __buffer,
-		      double *__restrict __result) __THROW __nonnull ((1, 2));
-
-/* Return non-negative, long integer in [0,2^31).  */
-extern int lrand48_r (struct drand48_data *__restrict __buffer,
-		      long int *__restrict __result)
-     __THROW __nonnull ((1, 2));
-extern int nrand48_r (unsigned short int __xsubi[3],
-		      struct drand48_data *__restrict __buffer,
-		      long int *__restrict __result)
-     __THROW __nonnull ((1, 2));
-
-/* Return signed, long integers in [-2^31,2^31).  */
-extern int mrand48_r (struct drand48_data *__restrict __buffer,
-		      long int *__restrict __result)
-     __THROW __nonnull ((1, 2));
-extern int jrand48_r (unsigned short int __xsubi[3],
-		      struct drand48_data *__restrict __buffer,
-		      long int *__restrict __result)
-     __THROW __nonnull ((1, 2));
-
-/* Seed random number generator.  */
-extern int srand48_r (long int __seedval, struct drand48_data *__buffer)
-     __THROW __nonnull ((2));
-
-extern int seed48_r (unsigned short int __seed16v[3],
-		     struct drand48_data *__buffer) __THROW __nonnull ((1, 2));
-
-extern int lcong48_r (unsigned short int __param[7],
-		      struct drand48_data *__buffer)
-     __THROW __nonnull ((1, 2));
-# endif	/* Use misc.  */
-#endif	/* Use misc or X/Open.  */
-
-#endif /* don't just need malloc and calloc */
-
-#ifndef __malloc_and_calloc_defined
-# define __malloc_and_calloc_defined
-__BEGIN_NAMESPACE_STD
-/* Allocate SIZE bytes of memory.  */
-extern void *malloc (size_t __size) __THROW __attribute_malloc__ __wur;
-/* Allocate NMEMB elements of SIZE bytes each, all initialized to 0.  */
-extern void *calloc (size_t __nmemb, size_t __size)
-     __THROW __attribute_malloc__ __wur;
-__END_NAMESPACE_STD
-#endif
-
-#ifndef __need_malloc_and_calloc
-__BEGIN_NAMESPACE_STD
-/* Re-allocate the previously allocated block
-   in PTR, making the new block SIZE bytes long.  */
-/* __attribute_malloc__ is not used, because if realloc returns
-   the same pointer that was passed to it, aliasing needs to be allowed
-   between objects pointed by the old and new pointers.  */
-extern void *realloc (void *__ptr, size_t __size)
-     __THROW __attribute_warn_unused_result__;
-/* Free a block allocated by `malloc', `realloc' or `calloc'.  */
-extern void free (void *__ptr) __THROW;
-__END_NAMESPACE_STD
-
-#ifdef	__USE_MISC
-/* Free a block.  An alias for `free'.	(Sun Unices).  */
-extern void cfree (void *__ptr) __THROW;
-#endif /* Use misc.  */
-
-#ifdef __USE_MISC
-# include <alloca.h>
-#endif /* Use misc.  */
-
-#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \
-    || defined __USE_MISC
-/* Allocate SIZE bytes on a page boundary.  The storage cannot be freed.  */
-extern void *valloc (size_t __size) __THROW __attribute_malloc__ __wur;
-#endif
-
-#ifdef __USE_XOPEN2K
-/* Allocate memory of SIZE bytes with an alignment of ALIGNMENT.  */
-extern int posix_memalign (void **__memptr, size_t __alignment, size_t __size)
-     __THROW __nonnull ((1)) __wur;
-#endif
-
-#ifdef __USE_ISOC11
-/* ISO C variant of aligned allocation.  */
-extern void *aligned_alloc (size_t __alignment, size_t __size)
-     __THROW __attribute_malloc__ __attribute_alloc_size__ ((2)) __wur;
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Abort execution and generate a core-dump.  */
-extern void abort (void) __THROW __attribute__ ((__noreturn__));
-
-
-/* Register a function to be called when `exit' is called.  */
-extern int atexit (void (*__func) (void)) __THROW __nonnull ((1));
-
-#if defined __USE_ISOC11 || defined __USE_ISOCXX11
-/* Register a function to be called when `quick_exit' is called.  */
-# ifdef __cplusplus
-extern "C++" int at_quick_exit (void (*__func) (void))
-     __THROW __asm ("at_quick_exit") __nonnull ((1));
-# else
-extern int at_quick_exit (void (*__func) (void)) __THROW __nonnull ((1));
-# endif
-#endif
-__END_NAMESPACE_STD
-
-#ifdef	__USE_MISC
-/* Register a function to be called with the status
-   given to `exit' and the given argument.  */
-extern int on_exit (void (*__func) (int __status, void *__arg), void *__arg)
-     __THROW __nonnull ((1));
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Call all functions registered with `atexit' and `on_exit',
-   in the reverse of the order in which they were registered,
-   perform stdio cleanup, and terminate program execution with STATUS.  */
-extern void exit (int __status) __THROW __attribute__ ((__noreturn__));
-
-#if defined __USE_ISOC11 || defined __USE_ISOCXX11
-/* Call all functions registered with `at_quick_exit' in the reverse
-   of the order in which they were registered and terminate program
-   execution with STATUS.  */
-extern void quick_exit (int __status) __THROW __attribute__ ((__noreturn__));
-#endif
-__END_NAMESPACE_STD
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Terminate the program with STATUS without calling any of the
-   functions registered with `atexit' or `on_exit'.  */
-extern void _Exit (int __status) __THROW __attribute__ ((__noreturn__));
-__END_NAMESPACE_C99
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Return the value of envariable NAME, or NULL if it doesn't exist.  */
-extern char *getenv (const char *__name) __THROW __nonnull ((1)) __wur;
-__END_NAMESPACE_STD
-
-#ifdef __USE_GNU
-/* This function is similar to the above but returns NULL if the
-   programs is running with SUID or SGID enabled.  */
-extern char *secure_getenv (const char *__name)
-     __THROW __nonnull ((1)) __wur;
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* The SVID says this is in <stdio.h>, but this seems a better place.	*/
-/* Put STRING, which is of the form "NAME=VALUE", in the environment.
-   If there is no `=', remove NAME from the environment.  */
-extern int putenv (char *__string) __THROW __nonnull ((1));
-#endif
-
-#ifdef __USE_XOPEN2K
-/* Set NAME to VALUE in the environment.
-   If REPLACE is nonzero, overwrite an existing value.  */
-extern int setenv (const char *__name, const char *__value, int __replace)
-     __THROW __nonnull ((2));
-
-/* Remove the variable NAME from the environment.  */
-extern int unsetenv (const char *__name) __THROW __nonnull ((1));
-#endif
-
-#ifdef	__USE_MISC
-/* The `clearenv' was planned to be added to POSIX.1 but probably
-   never made it.  Nevertheless the POSIX.9 standard (POSIX bindings
-   for Fortran 77) requires this function.  */
-extern int clearenv (void) __THROW;
-#endif
-
-
-#if defined __USE_MISC \
-    || (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8)
-/* Generate a unique temporary file name from TEMPLATE.
-   The last six characters of TEMPLATE must be "XXXXXX";
-   they are replaced with a string that makes the file name unique.
-   Always returns TEMPLATE, it's either a temporary file name or a null
-   string if it cannot get a unique file name.  */
-extern char *mktemp (char *__template) __THROW __nonnull ((1));
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-/* Generate a unique temporary file name from TEMPLATE.
-   The last six characters of TEMPLATE must be "XXXXXX";
-   they are replaced with a string that makes the filename unique.
-   Returns a file descriptor open on the file for reading and writing,
-   or -1 if it cannot create a uniquely-named file.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-# ifndef __USE_FILE_OFFSET64
-extern int mkstemp (char *__template) __nonnull ((1)) __wur;
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (mkstemp, (char *__template), mkstemp64)
-     __nonnull ((1)) __wur;
-#  else
-#   define mkstemp mkstemp64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int mkstemp64 (char *__template) __nonnull ((1)) __wur;
-# endif
-#endif
-
-#ifdef __USE_MISC
-/* Similar to mkstemp, but the template can have a suffix after the
-   XXXXXX.  The length of the suffix is specified in the second
-   parameter.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-# ifndef __USE_FILE_OFFSET64
-extern int mkstemps (char *__template, int __suffixlen) __nonnull ((1)) __wur;
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (mkstemps, (char *__template, int __suffixlen),
-		       mkstemps64) __nonnull ((1)) __wur;
-#  else
-#   define mkstemps mkstemps64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int mkstemps64 (char *__template, int __suffixlen)
-     __nonnull ((1)) __wur;
-# endif
-#endif
-
-#ifdef __USE_XOPEN2K8
-/* Create a unique temporary directory from TEMPLATE.
-   The last six characters of TEMPLATE must be "XXXXXX";
-   they are replaced with a string that makes the directory name unique.
-   Returns TEMPLATE, or a null pointer if it cannot get a unique name.
-   The directory is created mode 700.  */
-extern char *mkdtemp (char *__template) __THROW __nonnull ((1)) __wur;
-#endif
-
-#ifdef __USE_GNU
-/* Generate a unique temporary file name from TEMPLATE similar to
-   mkstemp.  But allow the caller to pass additional flags which are
-   used in the open call to create the file..
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-# ifndef __USE_FILE_OFFSET64
-extern int mkostemp (char *__template, int __flags) __nonnull ((1)) __wur;
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (mkostemp, (char *__template, int __flags), mkostemp64)
-     __nonnull ((1)) __wur;
-#  else
-#   define mkostemp mkostemp64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int mkostemp64 (char *__template, int __flags) __nonnull ((1)) __wur;
-# endif
-
-/* Similar to mkostemp, but the template can have a suffix after the
-   XXXXXX.  The length of the suffix is specified in the second
-   parameter.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-# ifndef __USE_FILE_OFFSET64
-extern int mkostemps (char *__template, int __suffixlen, int __flags)
-     __nonnull ((1)) __wur;
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (mkostemps, (char *__template, int __suffixlen,
-				   int __flags), mkostemps64)
-     __nonnull ((1)) __wur;
-#  else
-#   define mkostemps mkostemps64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int mkostemps64 (char *__template, int __suffixlen, int __flags)
-     __nonnull ((1)) __wur;
-# endif
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Execute the given line as a shell command.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int system (const char *__command) __wur;
-__END_NAMESPACE_STD
-
-
-#ifdef	__USE_GNU
-/* Return a malloc'd string containing the canonical absolute name of the
-   existing named file.  */
-extern char *canonicalize_file_name (const char *__name)
-     __THROW __nonnull ((1)) __wur;
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-/* Return the canonical absolute name of file NAME.  If RESOLVED is
-   null, the result is malloc'd; otherwise, if the canonical name is
-   PATH_MAX chars or more, returns null with `errno' set to
-   ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars,
-   returns the name in RESOLVED.  */
-extern char *realpath (const char *__restrict __name,
-		       char *__restrict __resolved) __THROW __wur;
-#endif
-
-
-/* Shorthand for type of comparison functions.  */
-#ifndef __COMPAR_FN_T
-# define __COMPAR_FN_T
-typedef int (*__compar_fn_t) (const void *, const void *);
-
-# ifdef	__USE_GNU
-typedef __compar_fn_t comparison_fn_t;
-# endif
-#endif
-#ifdef __USE_GNU
-typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Do a binary search for KEY in BASE, which consists of NMEMB elements
-   of SIZE bytes each, using COMPAR to perform the comparisons.  */
-extern void *bsearch (const void *__key, const void *__base,
-		      size_t __nmemb, size_t __size, __compar_fn_t __compar)
-     __nonnull ((1, 2, 5)) __wur;
-
-#ifdef __USE_EXTERN_INLINES
-# include <bits/stdlib-bsearch.h>
-#endif
-
-/* Sort NMEMB elements of BASE, of SIZE bytes each,
-   using COMPAR to perform the comparisons.  */
-extern void qsort (void *__base, size_t __nmemb, size_t __size,
-		   __compar_fn_t __compar) __nonnull ((1, 4));
-#ifdef __USE_GNU
-extern void qsort_r (void *__base, size_t __nmemb, size_t __size,
-		     __compar_d_fn_t __compar, void *__arg)
-  __nonnull ((1, 4));
-#endif
-
-
-/* Return the absolute value of X.  */
-extern int abs (int __x) __THROW __attribute__ ((__const__)) __wur;
-extern long int labs (long int __x) __THROW __attribute__ ((__const__)) __wur;
-__END_NAMESPACE_STD
-
-#ifdef __USE_ISOC99
-__extension__ extern long long int llabs (long long int __x)
-     __THROW __attribute__ ((__const__)) __wur;
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Return the `div_t', `ldiv_t' or `lldiv_t' representation
-   of the value of NUMER over DENOM. */
-/* GCC may have built-ins for these someday.  */
-extern div_t div (int __numer, int __denom)
-     __THROW __attribute__ ((__const__)) __wur;
-extern ldiv_t ldiv (long int __numer, long int __denom)
-     __THROW __attribute__ ((__const__)) __wur;
-__END_NAMESPACE_STD
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-__extension__ extern lldiv_t lldiv (long long int __numer,
-				    long long int __denom)
-     __THROW __attribute__ ((__const__)) __wur;
-__END_NAMESPACE_C99
-#endif
-
-
-#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8) \
-    || defined __USE_MISC
-/* Convert floating point numbers to strings.  The returned values are
-   valid only until another call to the same function.  */
-
-/* Convert VALUE to a string with NDIGIT digits and return a pointer to
-   this.  Set *DECPT with the position of the decimal character and *SIGN
-   with the sign of the number.  */
-extern char *ecvt (double __value, int __ndigit, int *__restrict __decpt,
-		   int *__restrict __sign) __THROW __nonnull ((3, 4)) __wur;
-
-/* Convert VALUE to a string rounded to NDIGIT decimal digits.  Set *DECPT
-   with the position of the decimal character and *SIGN with the sign of
-   the number.  */
-extern char *fcvt (double __value, int __ndigit, int *__restrict __decpt,
-		   int *__restrict __sign) __THROW __nonnull ((3, 4)) __wur;
-
-/* If possible convert VALUE to a string with NDIGIT significant digits.
-   Otherwise use exponential representation.  The resulting string will
-   be written to BUF.  */
-extern char *gcvt (double __value, int __ndigit, char *__buf)
-     __THROW __nonnull ((3)) __wur;
-#endif
-
-#ifdef __USE_MISC
-/* Long double versions of above functions.  */
-extern char *qecvt (long double __value, int __ndigit,
-		    int *__restrict __decpt, int *__restrict __sign)
-     __THROW __nonnull ((3, 4)) __wur;
-extern char *qfcvt (long double __value, int __ndigit,
-		    int *__restrict __decpt, int *__restrict __sign)
-     __THROW __nonnull ((3, 4)) __wur;
-extern char *qgcvt (long double __value, int __ndigit, char *__buf)
-     __THROW __nonnull ((3)) __wur;
-
-
-/* Reentrant version of the functions above which provide their own
-   buffers.  */
-extern int ecvt_r (double __value, int __ndigit, int *__restrict __decpt,
-		   int *__restrict __sign, char *__restrict __buf,
-		   size_t __len) __THROW __nonnull ((3, 4, 5));
-extern int fcvt_r (double __value, int __ndigit, int *__restrict __decpt,
-		   int *__restrict __sign, char *__restrict __buf,
-		   size_t __len) __THROW __nonnull ((3, 4, 5));
-
-extern int qecvt_r (long double __value, int __ndigit,
-		    int *__restrict __decpt, int *__restrict __sign,
-		    char *__restrict __buf, size_t __len)
-     __THROW __nonnull ((3, 4, 5));
-extern int qfcvt_r (long double __value, int __ndigit,
-		    int *__restrict __decpt, int *__restrict __sign,
-		    char *__restrict __buf, size_t __len)
-     __THROW __nonnull ((3, 4, 5));
-#endif	/* misc */
-
-
-__BEGIN_NAMESPACE_STD
-/* Return the length of the multibyte character
-   in S, which is no longer than N.  */
-extern int mblen (const char *__s, size_t __n) __THROW;
-/* Return the length of the given multibyte character,
-   putting its `wchar_t' representation in *PWC.  */
-extern int mbtowc (wchar_t *__restrict __pwc,
-		   const char *__restrict __s, size_t __n) __THROW;
-/* Put the multibyte character represented
-   by WCHAR in S, returning its length.  */
-extern int wctomb (char *__s, wchar_t __wchar) __THROW;
-
-
-/* Convert a multibyte string to a wide char string.  */
-extern size_t mbstowcs (wchar_t *__restrict  __pwcs,
-			const char *__restrict __s, size_t __n) __THROW;
-/* Convert a wide char string to multibyte string.  */
-extern size_t wcstombs (char *__restrict __s,
-			const wchar_t *__restrict __pwcs, size_t __n)
-     __THROW;
-__END_NAMESPACE_STD
-
-
-#ifdef __USE_MISC
-/* Determine whether the string value of RESPONSE matches the affirmation
-   or negative response expression as specified by the LC_MESSAGES category
-   in the program's current locale.  Returns 1 if affirmative, 0 if
-   negative, and -1 if not matching.  */
-extern int rpmatch (const char *__response) __THROW __nonnull ((1)) __wur;
-#endif
-
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-/* Parse comma separated suboption from *OPTIONP and match against
-   strings in TOKENS.  If found return index and set *VALUEP to
-   optional value introduced by an equal sign.  If the suboption is
-   not part of TOKENS return in *VALUEP beginning of unknown
-   suboption.  On exit *OPTIONP is set to the beginning of the next
-   token or at the terminating NUL character.  */
-extern int getsubopt (char **__restrict __optionp,
-		      char *const *__restrict __tokens,
-		      char **__restrict __valuep)
-     __THROW __nonnull ((1, 2, 3)) __wur;
-#endif
-
-
-#ifdef __USE_XOPEN
-/* Setup DES tables according KEY.  */
-extern void setkey (const char *__key) __THROW __nonnull ((1));
-#endif
-
-
-/* X/Open pseudo terminal handling.  */
-
-#ifdef __USE_XOPEN2KXSI
-/* Return a master pseudo-terminal handle.  */
-extern int posix_openpt (int __oflag) __wur;
-#endif
-
-#ifdef __USE_XOPEN
-/* The next four functions all take a master pseudo-tty fd and
-   perform an operation on the associated slave:  */
-
-/* Chown the slave to the calling user.  */
-extern int grantpt (int __fd) __THROW;
-
-/* Release an internal lock so the slave can be opened.
-   Call after grantpt().  */
-extern int unlockpt (int __fd) __THROW;
-
-/* Return the pathname of the pseudo terminal slave associated with
-   the master FD is open on, or NULL on errors.
-   The returned storage is good until the next call to this function.  */
-extern char *ptsname (int __fd) __THROW __wur;
-#endif
-
-#ifdef __USE_GNU
-/* Store at most BUFLEN characters of the pathname of the slave pseudo
-   terminal associated with the master FD is open on in BUF.
-   Return 0 on success, otherwise an error number.  */
-extern int ptsname_r (int __fd, char *__buf, size_t __buflen)
-     __THROW __nonnull ((2));
-
-/* Open a master pseudo terminal and return its file descriptor.  */
-extern int getpt (void);
-#endif
-
-#ifdef __USE_MISC
-/* Put the 1 minute, 5 minute and 15 minute load averages into the first
-   NELEM elements of LOADAVG.  Return the number written (never more than
-   three, but may be less than NELEM), or -1 if an error occurred.  */
-extern int getloadavg (double __loadavg[], int __nelem)
-     __THROW __nonnull ((1));
-#endif
-
-#include <bits/stdlib-float.h>
-
-/* Define some macros helping to catch buffer overflows.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-# include <bits/stdlib.h>
-#endif
-#ifdef __LDBL_COMPAT
-# include <bits/stdlib-ldbl.h>
-#endif
-
-#endif /* don't just need malloc and calloc */
-#undef __need_malloc_and_calloc
-
-__END_DECLS
-
-#endif /* stdlib.h  */
diff --git a/openflow/usr/include/string.h b/openflow/usr/include/string.h
deleted file mode 100644
index 1f3e348..0000000
--- a/openflow/usr/include/string.h
+++ /dev/null
@@ -1,660 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.21 String handling	<string.h>
- */
-
-#ifndef	_STRING_H
-#define	_STRING_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* Get size_t and NULL from <stddef.h>.  */
-#define	__need_size_t
-#define	__need_NULL
-#include <stddef.h>
-
-/* Tell the caller that we provide correct C++ prototypes.  */
-#if defined __cplusplus && __GNUC_PREREQ (4, 4)
-# define __CORRECT_ISO_CPP_STRING_H_PROTO
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Copy N bytes of SRC to DEST.  */
-extern void *memcpy (void *__restrict __dest, const void *__restrict __src,
-		     size_t __n) __THROW __nonnull ((1, 2));
-/* Copy N bytes of SRC to DEST, guaranteeing
-   correct behavior for overlapping strings.  */
-extern void *memmove (void *__dest, const void *__src, size_t __n)
-     __THROW __nonnull ((1, 2));
-__END_NAMESPACE_STD
-
-/* Copy no more than N bytes of SRC to DEST, stopping when C is found.
-   Return the position in DEST one byte past where C was copied,
-   or NULL if C was not found in the first N bytes of SRC.  */
-#if defined __USE_MISC || defined __USE_XOPEN
-extern void *memccpy (void *__restrict __dest, const void *__restrict __src,
-		      int __c, size_t __n)
-     __THROW __nonnull ((1, 2));
-#endif /* Misc || X/Open.  */
-
-
-__BEGIN_NAMESPACE_STD
-/* Set N bytes of S to C.  */
-extern void *memset (void *__s, int __c, size_t __n) __THROW __nonnull ((1));
-
-/* Compare N bytes of S1 and S2.  */
-extern int memcmp (const void *__s1, const void *__s2, size_t __n)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-
-/* Search N bytes of S for C.  */
-#ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++"
-{
-extern void *memchr (void *__s, int __c, size_t __n)
-      __THROW __asm ("memchr") __attribute_pure__ __nonnull ((1));
-extern const void *memchr (const void *__s, int __c, size_t __n)
-      __THROW __asm ("memchr") __attribute_pure__ __nonnull ((1));
-
-# ifdef __OPTIMIZE__
-__extern_always_inline void *
-memchr (void *__s, int __c, size_t __n) __THROW
-{
-  return __builtin_memchr (__s, __c, __n);
-}
-
-__extern_always_inline const void *
-memchr (const void *__s, int __c, size_t __n) __THROW
-{
-  return __builtin_memchr (__s, __c, __n);
-}
-# endif
-}
-#else
-extern void *memchr (const void *__s, int __c, size_t __n)
-      __THROW __attribute_pure__ __nonnull ((1));
-#endif
-__END_NAMESPACE_STD
-
-#ifdef __USE_GNU
-/* Search in S for C.  This is similar to `memchr' but there is no
-   length limit.  */
-# ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++" void *rawmemchr (void *__s, int __c)
-     __THROW __asm ("rawmemchr") __attribute_pure__ __nonnull ((1));
-extern "C++" const void *rawmemchr (const void *__s, int __c)
-     __THROW __asm ("rawmemchr") __attribute_pure__ __nonnull ((1));
-# else
-extern void *rawmemchr (const void *__s, int __c)
-     __THROW __attribute_pure__ __nonnull ((1));
-# endif
-
-/* Search N bytes of S for the final occurrence of C.  */
-# ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++" void *memrchr (void *__s, int __c, size_t __n)
-      __THROW __asm ("memrchr") __attribute_pure__ __nonnull ((1));
-extern "C++" const void *memrchr (const void *__s, int __c, size_t __n)
-      __THROW __asm ("memrchr") __attribute_pure__ __nonnull ((1));
-# else
-extern void *memrchr (const void *__s, int __c, size_t __n)
-      __THROW __attribute_pure__ __nonnull ((1));
-# endif
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Copy SRC to DEST.  */
-extern char *strcpy (char *__restrict __dest, const char *__restrict __src)
-     __THROW __nonnull ((1, 2));
-/* Copy no more than N characters of SRC to DEST.  */
-extern char *strncpy (char *__restrict __dest,
-		      const char *__restrict __src, size_t __n)
-     __THROW __nonnull ((1, 2));
-
-/* Append SRC onto DEST.  */
-extern char *strcat (char *__restrict __dest, const char *__restrict __src)
-     __THROW __nonnull ((1, 2));
-/* Append no more than N characters from SRC onto DEST.  */
-extern char *strncat (char *__restrict __dest, const char *__restrict __src,
-		      size_t __n) __THROW __nonnull ((1, 2));
-
-/* Compare S1 and S2.  */
-extern int strcmp (const char *__s1, const char *__s2)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-/* Compare N characters of S1 and S2.  */
-extern int strncmp (const char *__s1, const char *__s2, size_t __n)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-
-/* Compare the collated forms of S1 and S2.  */
-extern int strcoll (const char *__s1, const char *__s2)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-/* Put a transformation of SRC into no more than N bytes of DEST.  */
-extern size_t strxfrm (char *__restrict __dest,
-		       const char *__restrict __src, size_t __n)
-     __THROW __nonnull ((2));
-__END_NAMESPACE_STD
-
-#ifdef __USE_XOPEN2K8
-/* The following functions are equivalent to the both above but they
-   take the locale they use for the collation as an extra argument.
-   This is not standardsized but something like will come.  */
-# include <xlocale.h>
-
-/* Compare the collated forms of S1 and S2 using rules from L.  */
-extern int strcoll_l (const char *__s1, const char *__s2, __locale_t __l)
-     __THROW __attribute_pure__ __nonnull ((1, 2, 3));
-/* Put a transformation of SRC into no more than N bytes of DEST.  */
-extern size_t strxfrm_l (char *__dest, const char *__src, size_t __n,
-			 __locale_t __l) __THROW __nonnull ((2, 4));
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-/* Duplicate S, returning an identical malloc'd string.  */
-extern char *strdup (const char *__s)
-     __THROW __attribute_malloc__ __nonnull ((1));
-#endif
-
-/* Return a malloc'd copy of at most N bytes of STRING.  The
-   resultant string is terminated even if no null terminator
-   appears before STRING[N].  */
-#if defined __USE_XOPEN2K8
-extern char *strndup (const char *__string, size_t __n)
-     __THROW __attribute_malloc__ __nonnull ((1));
-#endif
-
-#if defined __USE_GNU && defined __GNUC__
-/* Duplicate S, returning an identical alloca'd string.  */
-# define strdupa(s)							      \
-  (__extension__							      \
-    ({									      \
-      const char *__old = (s);						      \
-      size_t __len = strlen (__old) + 1;				      \
-      char *__new = (char *) __builtin_alloca (__len);			      \
-      (char *) memcpy (__new, __old, __len);				      \
-    }))
-
-/* Return an alloca'd copy of at most N bytes of string.  */
-# define strndupa(s, n)							      \
-  (__extension__							      \
-    ({									      \
-      const char *__old = (s);						      \
-      size_t __len = strnlen (__old, (n));				      \
-      char *__new = (char *) __builtin_alloca (__len + 1);		      \
-      __new[__len] = '\0';						      \
-      (char *) memcpy (__new, __old, __len);				      \
-    }))
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Find the first occurrence of C in S.  */
-#ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++"
-{
-extern char *strchr (char *__s, int __c)
-     __THROW __asm ("strchr") __attribute_pure__ __nonnull ((1));
-extern const char *strchr (const char *__s, int __c)
-     __THROW __asm ("strchr") __attribute_pure__ __nonnull ((1));
-
-# ifdef __OPTIMIZE__
-__extern_always_inline char *
-strchr (char *__s, int __c) __THROW
-{
-  return __builtin_strchr (__s, __c);
-}
-
-__extern_always_inline const char *
-strchr (const char *__s, int __c) __THROW
-{
-  return __builtin_strchr (__s, __c);
-}
-# endif
-}
-#else
-extern char *strchr (const char *__s, int __c)
-     __THROW __attribute_pure__ __nonnull ((1));
-#endif
-/* Find the last occurrence of C in S.  */
-#ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++"
-{
-extern char *strrchr (char *__s, int __c)
-     __THROW __asm ("strrchr") __attribute_pure__ __nonnull ((1));
-extern const char *strrchr (const char *__s, int __c)
-     __THROW __asm ("strrchr") __attribute_pure__ __nonnull ((1));
-
-# ifdef __OPTIMIZE__
-__extern_always_inline char *
-strrchr (char *__s, int __c) __THROW
-{
-  return __builtin_strrchr (__s, __c);
-}
-
-__extern_always_inline const char *
-strrchr (const char *__s, int __c) __THROW
-{
-  return __builtin_strrchr (__s, __c);
-}
-# endif
-}
-#else
-extern char *strrchr (const char *__s, int __c)
-     __THROW __attribute_pure__ __nonnull ((1));
-#endif
-__END_NAMESPACE_STD
-
-#ifdef __USE_GNU
-/* This function is similar to `strchr'.  But it returns a pointer to
-   the closing NUL byte in case C is not found in S.  */
-# ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++" char *strchrnul (char *__s, int __c)
-     __THROW __asm ("strchrnul") __attribute_pure__ __nonnull ((1));
-extern "C++" const char *strchrnul (const char *__s, int __c)
-     __THROW __asm ("strchrnul") __attribute_pure__ __nonnull ((1));
-# else
-extern char *strchrnul (const char *__s, int __c)
-     __THROW __attribute_pure__ __nonnull ((1));
-# endif
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Return the length of the initial segment of S which
-   consists entirely of characters not in REJECT.  */
-extern size_t strcspn (const char *__s, const char *__reject)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-/* Return the length of the initial segment of S which
-   consists entirely of characters in ACCEPT.  */
-extern size_t strspn (const char *__s, const char *__accept)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-/* Find the first occurrence in S of any character in ACCEPT.  */
-#ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++"
-{
-extern char *strpbrk (char *__s, const char *__accept)
-     __THROW __asm ("strpbrk") __attribute_pure__ __nonnull ((1, 2));
-extern const char *strpbrk (const char *__s, const char *__accept)
-     __THROW __asm ("strpbrk") __attribute_pure__ __nonnull ((1, 2));
-
-# ifdef __OPTIMIZE__
-__extern_always_inline char *
-strpbrk (char *__s, const char *__accept) __THROW
-{
-  return __builtin_strpbrk (__s, __accept);
-}
-
-__extern_always_inline const char *
-strpbrk (const char *__s, const char *__accept) __THROW
-{
-  return __builtin_strpbrk (__s, __accept);
-}
-# endif
-}
-#else
-extern char *strpbrk (const char *__s, const char *__accept)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-#endif
-/* Find the first occurrence of NEEDLE in HAYSTACK.  */
-#ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++"
-{
-extern char *strstr (char *__haystack, const char *__needle)
-     __THROW __asm ("strstr") __attribute_pure__ __nonnull ((1, 2));
-extern const char *strstr (const char *__haystack, const char *__needle)
-     __THROW __asm ("strstr") __attribute_pure__ __nonnull ((1, 2));
-
-# ifdef __OPTIMIZE__
-__extern_always_inline char *
-strstr (char *__haystack, const char *__needle) __THROW
-{
-  return __builtin_strstr (__haystack, __needle);
-}
-
-__extern_always_inline const char *
-strstr (const char *__haystack, const char *__needle) __THROW
-{
-  return __builtin_strstr (__haystack, __needle);
-}
-# endif
-}
-#else
-extern char *strstr (const char *__haystack, const char *__needle)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-#endif
-
-
-/* Divide S into tokens separated by characters in DELIM.  */
-extern char *strtok (char *__restrict __s, const char *__restrict __delim)
-     __THROW __nonnull ((2));
-__END_NAMESPACE_STD
-
-/* Divide S into tokens separated by characters in DELIM.  Information
-   passed between calls are stored in SAVE_PTR.  */
-extern char *__strtok_r (char *__restrict __s,
-			 const char *__restrict __delim,
-			 char **__restrict __save_ptr)
-     __THROW __nonnull ((2, 3));
-#ifdef __USE_POSIX
-extern char *strtok_r (char *__restrict __s, const char *__restrict __delim,
-		       char **__restrict __save_ptr)
-     __THROW __nonnull ((2, 3));
-#endif
-
-#ifdef __USE_GNU
-/* Similar to `strstr' but this function ignores the case of both strings.  */
-# ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++" char *strcasestr (char *__haystack, const char *__needle)
-     __THROW __asm ("strcasestr") __attribute_pure__ __nonnull ((1, 2));
-extern "C++" const char *strcasestr (const char *__haystack,
-				     const char *__needle)
-     __THROW __asm ("strcasestr") __attribute_pure__ __nonnull ((1, 2));
-# else
-extern char *strcasestr (const char *__haystack, const char *__needle)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-# endif
-#endif
-
-#ifdef __USE_GNU
-/* Find the first occurrence of NEEDLE in HAYSTACK.
-   NEEDLE is NEEDLELEN bytes long;
-   HAYSTACK is HAYSTACKLEN bytes long.  */
-extern void *memmem (const void *__haystack, size_t __haystacklen,
-		     const void *__needle, size_t __needlelen)
-     __THROW __attribute_pure__ __nonnull ((1, 3));
-
-/* Copy N bytes of SRC to DEST, return pointer to bytes after the
-   last written byte.  */
-extern void *__mempcpy (void *__restrict __dest,
-			const void *__restrict __src, size_t __n)
-     __THROW __nonnull ((1, 2));
-extern void *mempcpy (void *__restrict __dest,
-		      const void *__restrict __src, size_t __n)
-     __THROW __nonnull ((1, 2));
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Return the length of S.  */
-extern size_t strlen (const char *__s)
-     __THROW __attribute_pure__ __nonnull ((1));
-__END_NAMESPACE_STD
-
-#ifdef	__USE_XOPEN2K8
-/* Find the length of STRING, but scan at most MAXLEN characters.
-   If no '\0' terminator is found in that many characters, return MAXLEN.  */
-extern size_t strnlen (const char *__string, size_t __maxlen)
-     __THROW __attribute_pure__ __nonnull ((1));
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Return a string describing the meaning of the `errno' code in ERRNUM.  */
-extern char *strerror (int __errnum) __THROW;
-__END_NAMESPACE_STD
-#ifdef __USE_XOPEN2K
-/* Reentrant version of `strerror'.
-   There are 2 flavors of `strerror_r', GNU which returns the string
-   and may or may not use the supplied temporary buffer and POSIX one
-   which fills the string into the buffer.
-   To use the POSIX version, -D_XOPEN_SOURCE=600 or -D_POSIX_C_SOURCE=200112L
-   without -D_GNU_SOURCE is needed, otherwise the GNU version is
-   preferred.  */
-# if defined __USE_XOPEN2K && !defined __USE_GNU
-/* Fill BUF with a string describing the meaning of the `errno' code in
-   ERRNUM.  */
-#  ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (strerror_r,
-			   (int __errnum, char *__buf, size_t __buflen),
-			   __xpg_strerror_r) __nonnull ((2));
-#  else
-extern int __xpg_strerror_r (int __errnum, char *__buf, size_t __buflen)
-     __THROW __nonnull ((2));
-#   define strerror_r __xpg_strerror_r
-#  endif
-# else
-/* If a temporary buffer is required, at most BUFLEN bytes of BUF will be
-   used.  */
-extern char *strerror_r (int __errnum, char *__buf, size_t __buflen)
-     __THROW __nonnull ((2)) __wur;
-# endif
-#endif
-
-#ifdef __USE_XOPEN2K8
-/* Translate error number to string according to the locale L.  */
-extern char *strerror_l (int __errnum, __locale_t __l) __THROW;
-#endif
-
-
-/* We define this function always since `bzero' is sometimes needed when
-   the namespace rules does not allow this.  */
-extern void __bzero (void *__s, size_t __n) __THROW __nonnull ((1));
-
-#ifdef __USE_MISC
-/* Copy N bytes of SRC to DEST (like memmove, but args reversed).  */
-extern void bcopy (const void *__src, void *__dest, size_t __n)
-     __THROW __nonnull ((1, 2));
-
-/* Set N bytes of S to 0.  */
-extern void bzero (void *__s, size_t __n) __THROW __nonnull ((1));
-
-/* Compare N bytes of S1 and S2 (same as memcmp).  */
-extern int bcmp (const void *__s1, const void *__s2, size_t __n)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-
-/* Find the first occurrence of C in S (same as strchr).  */
-# ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++"
-{
-extern char *index (char *__s, int __c)
-     __THROW __asm ("index") __attribute_pure__ __nonnull ((1));
-extern const char *index (const char *__s, int __c)
-     __THROW __asm ("index") __attribute_pure__ __nonnull ((1));
-
-#  if defined __OPTIMIZE__ && !defined __CORRECT_ISO_CPP_STRINGS_H_PROTO
-__extern_always_inline char *
-index (char *__s, int __c) __THROW
-{
-  return __builtin_index (__s, __c);
-}
-
-__extern_always_inline const char *
-index (const char *__s, int __c) __THROW
-{
-  return __builtin_index (__s, __c);
-}
-#  endif
-}
-# else
-extern char *index (const char *__s, int __c)
-     __THROW __attribute_pure__ __nonnull ((1));
-# endif
-
-/* Find the last occurrence of C in S (same as strrchr).  */
-# ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++"
-{
-extern char *rindex (char *__s, int __c)
-     __THROW __asm ("rindex") __attribute_pure__ __nonnull ((1));
-extern const char *rindex (const char *__s, int __c)
-     __THROW __asm ("rindex") __attribute_pure__ __nonnull ((1));
-
-#  if defined __OPTIMIZE__ && !defined __CORRECT_ISO_CPP_STRINGS_H_PROTO
-__extern_always_inline char *
-rindex (char *__s, int __c) __THROW
-{
-  return __builtin_rindex (__s, __c);
-}
-
-__extern_always_inline const char *
-rindex (const char *__s, int __c) __THROW
-{
-  return __builtin_rindex (__s, __c);
-}
-#endif
-}
-# else
-extern char *rindex (const char *__s, int __c)
-     __THROW __attribute_pure__ __nonnull ((1));
-# endif
-
-/* Return the position of the first bit set in I, or 0 if none are set.
-   The least-significant bit is position 1, the most-significant 32.  */
-extern int ffs (int __i) __THROW __attribute__ ((__const__));
-
-/* The following two functions are non-standard but necessary for non-32 bit
-   platforms.  */
-# ifdef	__USE_GNU
-extern int ffsl (long int __l) __THROW __attribute__ ((__const__));
-__extension__ extern int ffsll (long long int __ll)
-     __THROW __attribute__ ((__const__));
-# endif
-
-/* Compare S1 and S2, ignoring case.  */
-extern int strcasecmp (const char *__s1, const char *__s2)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-
-/* Compare no more than N chars of S1 and S2, ignoring case.  */
-extern int strncasecmp (const char *__s1, const char *__s2, size_t __n)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-#endif /* Use misc.  */
-
-#ifdef	__USE_GNU
-/* Again versions of a few functions which use the given locale instead
-   of the global one.  */
-extern int strcasecmp_l (const char *__s1, const char *__s2,
-			 __locale_t __loc)
-     __THROW __attribute_pure__ __nonnull ((1, 2, 3));
-
-extern int strncasecmp_l (const char *__s1, const char *__s2,
-			  size_t __n, __locale_t __loc)
-     __THROW __attribute_pure__ __nonnull ((1, 2, 4));
-#endif
-
-#ifdef	__USE_MISC
-/* Return the next DELIM-delimited token from *STRINGP,
-   terminating it with a '\0', and update *STRINGP to point past it.  */
-extern char *strsep (char **__restrict __stringp,
-		     const char *__restrict __delim)
-     __THROW __nonnull ((1, 2));
-#endif
-
-#ifdef	__USE_XOPEN2K8
-/* Return a string describing the meaning of the signal number in SIG.  */
-extern char *strsignal (int __sig) __THROW;
-
-/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
-extern char *__stpcpy (char *__restrict __dest, const char *__restrict __src)
-     __THROW __nonnull ((1, 2));
-extern char *stpcpy (char *__restrict __dest, const char *__restrict __src)
-     __THROW __nonnull ((1, 2));
-
-/* Copy no more than N characters of SRC to DEST, returning the address of
-   the last character written into DEST.  */
-extern char *__stpncpy (char *__restrict __dest,
-			const char *__restrict __src, size_t __n)
-     __THROW __nonnull ((1, 2));
-extern char *stpncpy (char *__restrict __dest,
-		      const char *__restrict __src, size_t __n)
-     __THROW __nonnull ((1, 2));
-#endif
-
-#ifdef	__USE_GNU
-/* Compare S1 and S2 as strings holding name & indices/version numbers.  */
-extern int strverscmp (const char *__s1, const char *__s2)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-
-/* Sautee STRING briskly.  */
-extern char *strfry (char *__string) __THROW __nonnull ((1));
-
-/* Frobnicate N bytes of S.  */
-extern void *memfrob (void *__s, size_t __n) __THROW __nonnull ((1));
-
-# ifndef basename
-/* Return the file name within directory of FILENAME.  We don't
-   declare the function if the `basename' macro is available (defined
-   in <libgen.h>) which makes the XPG version of this function
-   available.  */
-#  ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
-extern "C++" char *basename (char *__filename)
-     __THROW __asm ("basename") __nonnull ((1));
-extern "C++" const char *basename (const char *__filename)
-     __THROW __asm ("basename") __nonnull ((1));
-#  else
-extern char *basename (const char *__filename) __THROW __nonnull ((1));
-#  endif
-# endif
-#endif
-
-
-#if defined __GNUC__ && __GNUC__ >= 2
-# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \
-     && !defined __NO_INLINE__ && !defined __cplusplus
-/* When using GNU CC we provide some optimized versions of selected
-   functions from this header.  There are two kinds of optimizations:
-
-   - machine-dependent optimizations, most probably using inline
-     assembler code; these might be quite expensive since the code
-     size can increase significantly.
-     These optimizations are not used unless the symbol
-	__USE_STRING_INLINES
-     is defined before including this header.
-
-   - machine-independent optimizations which do not increase the
-     code size significantly and which optimize mainly situations
-     where one or more arguments are compile-time constants.
-     These optimizations are used always when the compiler is
-     taught to optimize.
-
-   One can inhibit all optimizations by defining __NO_STRING_INLINES.  */
-
-/* Get the machine-dependent optimizations (if any).  */
-#  include <bits/string.h>
-
-/* These are generic optimizations which do not add too much inline code.  */
-#  include <bits/string2.h>
-# endif
-
-# if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-/* Functions with security checks.  */
-#  include <bits/string3.h>
-# endif
-#endif
-
-#if defined __USE_GNU && defined __OPTIMIZE__ \
-    && defined __extern_always_inline && __GNUC_PREREQ (3,2)
-# if !defined _FORCE_INLINES && !defined _HAVE_STRING_ARCH_mempcpy
-
-#undef mempcpy
-#undef __mempcpy
-#define mempcpy(dest, src, n) __mempcpy_inline (dest, src, n)
-#define __mempcpy(dest, src, n) __mempcpy_inline (dest, src, n)
-
-__extern_always_inline void *
-__mempcpy_inline (void *__restrict __dest,
-		  const void *__restrict __src, size_t __n)
-{
-  return (char *) memcpy (__dest, __src, __n) + __n;
-}
-
-# endif
-#endif
-
-__END_DECLS
-
-#endif /* string.h  */
diff --git a/openflow/usr/include/strings.h b/openflow/usr/include/strings.h
deleted file mode 100644
index e372a33..0000000
--- a/openflow/usr/include/strings.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_STRINGS_H
-#define	_STRINGS_H	1
-
-/* We don't need and should not read this file if <string.h> was already
-   read. The one exception being that if __USE_MISC isn't defined, then
-   these aren't defined in string.h, so we need to define them here.  */
-#if !defined _STRING_H || !defined __USE_MISC
-
-# include <features.h>
-# define __need_size_t
-# include <stddef.h>
-
-/* Tell the caller that we provide correct C++ prototypes.  */
-# if defined __cplusplus && __GNUC_PREREQ (4, 4)
-#  define __CORRECT_ISO_CPP_STRINGS_H_PROTO
-# endif
-
-__BEGIN_DECLS
-
-# if defined __USE_MISC || !defined __USE_XOPEN2K8
-/* Compare N bytes of S1 and S2 (same as memcmp).  */
-extern int bcmp (const void *__s1, const void *__s2, size_t __n)
-     __THROW __attribute_pure__;
-
-/* Copy N bytes of SRC to DEST (like memmove, but args reversed).  */
-extern void bcopy (const void *__src, void *__dest, size_t __n) __THROW;
-
-/* Set N bytes of S to 0.  */
-extern void bzero (void *__s, size_t __n) __THROW;
-
-/* Find the first occurrence of C in S (same as strchr).  */
-#  ifdef __CORRECT_ISO_CPP_STRINGS_H_PROTO
-extern "C++"
-{
-extern char *index (char *__s, int __c)
-     __THROW __asm ("index") __attribute_pure__ __nonnull ((1));
-extern const char *index (const char *__s, int __c)
-     __THROW __asm ("index") __attribute_pure__ __nonnull ((1));
-
-#   if defined __OPTIMIZE__ && !defined __CORRECT_ISO_CPP_STRING_H_PROTO
-__extern_always_inline char *
-index (char *__s, int __c) __THROW
-{
-  return __builtin_index (__s, __c);
-}
-
-__extern_always_inline const char *
-index (const char *__s, int __c) __THROW
-{
-  return __builtin_index (__s, __c);
-}
-#   endif
-}
-#  else
-extern char *index (const char *__s, int __c)
-     __THROW __attribute_pure__ __nonnull ((1));
-#  endif
-
-/* Find the last occurrence of C in S (same as strrchr).  */
-#  ifdef __CORRECT_ISO_CPP_STRINGS_H_PROTO
-extern "C++"
-{
-extern char *rindex (char *__s, int __c)
-     __THROW __asm ("rindex") __attribute_pure__ __nonnull ((1));
-extern const char *rindex (const char *__s, int __c)
-     __THROW __asm ("rindex") __attribute_pure__ __nonnull ((1));
-
-#   if defined __OPTIMIZE__ && !defined __CORRECT_ISO_CPP_STRING_H_PROTO
-__extern_always_inline char *
-rindex (char *__s, int __c) __THROW
-{
-  return __builtin_rindex (__s, __c);
-}
-
-__extern_always_inline const char *
-rindex (const char *__s, int __c) __THROW
-{
-  return __builtin_rindex (__s, __c);
-}
-#   endif
-}
-#  else
-extern char *rindex (const char *__s, int __c)
-     __THROW __attribute_pure__ __nonnull ((1));
-#  endif
-# endif
-
-#if defined __USE_MISC || !defined __USE_XOPEN2K8 || defined __USE_XOPEN2K8XSI
-/* Return the position of the first bit set in I, or 0 if none are set.
-   The least-significant bit is position 1, the most-significant 32.  */
-extern int ffs (int __i) __THROW __attribute__ ((const));
-#endif
-
-/* Compare S1 and S2, ignoring case.  */
-extern int strcasecmp (const char *__s1, const char *__s2)
-     __THROW __attribute_pure__;
-
-/* Compare no more than N chars of S1 and S2, ignoring case.  */
-extern int strncasecmp (const char *__s1, const char *__s2, size_t __n)
-     __THROW __attribute_pure__;
-
-#ifdef	__USE_XOPEN2K8
-/* The following functions are equivalent to the both above but they
-   take the locale they use for the collation as an extra argument.
-   This is not standardsized but something like will come.  */
-# include <xlocale.h>
-
-/* Again versions of a few functions which use the given locale instead
-   of the global one.  */
-extern int strcasecmp_l (const char *__s1, const char *__s2, __locale_t __loc)
-     __THROW __attribute_pure__ __nonnull ((1, 2, 3));
-
-extern int strncasecmp_l (const char *__s1, const char *__s2,
-			  size_t __n, __locale_t __loc)
-     __THROW __attribute_pure__ __nonnull ((1, 2, 4));
-#endif
-
-__END_DECLS
-
-#endif	/* string.h  */
-
-#endif	/* strings.h  */
diff --git a/openflow/usr/include/stropts.h b/openflow/usr/include/stropts.h
deleted file mode 100644
index 72cc3b7..0000000
--- a/openflow/usr/include/stropts.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright (C) 1998-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _STROPTS_H
-#define _STROPTS_H	1
-
-#include <features.h>
-#include <bits/types.h>
-#include <bits/xtitypes.h>
-
-#ifndef __gid_t_defined
-typedef __gid_t gid_t;
-# define __gid_t_defined
-#endif
-
-#ifndef __uid_t_defined
-typedef __uid_t uid_t;
-# define __uid_t_defined
-#endif
-
-typedef __t_scalar_t t_scalar_t;
-typedef __t_uscalar_t t_uscalar_t;
-
-/* Get system specific constants.  */
-#include <bits/stropts.h>
-
-
-__BEGIN_DECLS
-
-/* Test whether FILDES is associated with a STREAM-based file.  */
-extern int isastream (int __fildes) __THROW;
-
-/* Receive next message from a STREAMS file.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int getmsg (int __fildes, struct strbuf *__restrict __ctlptr,
-		   struct strbuf *__restrict __dataptr,
-		   int *__restrict __flagsp);
-
-/* Receive next message from a STREAMS file, with *FLAGSP allowing to
-   control which message.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int getpmsg (int __fildes, struct strbuf *__restrict __ctlptr,
-		    struct strbuf *__restrict __dataptr,
-		    int *__restrict __bandp, int *__restrict __flagsp);
-
-/* Perform the I/O control operation specified by REQUEST on FD.
-   One argument may follow; its presence and type depend on REQUEST.
-   Return value depends on REQUEST.  Usually -1 indicates error.  */
-extern int ioctl (int __fd, unsigned long int __request, ...) __THROW;
-
-/* Send a message on a STREAM.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int putmsg (int __fildes, const struct strbuf *__ctlptr,
-		   const struct strbuf *__dataptr, int __flags);
-
-/* Send a message on a STREAM to the BAND.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int putpmsg (int __fildes, const struct strbuf *__ctlptr,
-		    const struct strbuf *__dataptr, int __band, int __flags);
-
-/* Attach a STREAMS-based file descriptor FILDES to a file PATH in the
-   file system name space.  */
-extern int fattach (int __fildes, const char *__path) __THROW;
-
-/* Detach a name PATH from a STREAMS-based file descriptor.  */
-extern int fdetach (const char *__path) __THROW;
-
-__END_DECLS
-
-#endif /* stropts.h */
diff --git a/openflow/usr/include/sudo_plugin.h b/openflow/usr/include/sudo_plugin.h
deleted file mode 100644
index e00b54f..0000000
--- a/openflow/usr/include/sudo_plugin.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef SUDO_PLUGIN_H
-#define SUDO_PLUGIN_H
-
-/* API version major/minor */
-#define SUDO_API_VERSION_MAJOR 1
-#define SUDO_API_VERSION_MINOR 9
-#define SUDO_API_MKVERSION(x, y) (((x) << 16) | (y))
-#define SUDO_API_VERSION SUDO_API_MKVERSION(SUDO_API_VERSION_MAJOR, SUDO_API_VERSION_MINOR)
-
-/* Getters and setters for plugin API versions */
-#define SUDO_API_VERSION_GET_MAJOR(v) ((v) >> 16)
-#define SUDO_API_VERSION_GET_MINOR(v) ((v) & 0xffffU)
-#define SUDO_API_VERSION_SET_MAJOR(vp, n) do { \
-    *(vp) = (*(vp) & 0x0000ffffU) | ((n) << 16); \
-} while(0)
-#define SUDO_API_VERSION_SET_MINOR(vp, n) do { \
-    *(vp) = (*(vp) & 0xffff0000U) | (n); \
-} while(0)
-
-/* Conversation function types and defines */
-struct sudo_conv_message {
-#define SUDO_CONV_PROMPT_ECHO_OFF   0x0001  /* do not echo user input */
-#define SUDO_CONV_PROMPT_ECHO_ON    0x0002  /* echo user input */
-#define SUDO_CONV_ERROR_MSG	    0x0003  /* error message */
-#define SUDO_CONV_INFO_MSG	    0x0004  /* informational message */
-#define SUDO_CONV_PROMPT_MASK	    0x0005  /* mask user input */
-#define SUDO_CONV_PROMPT_ECHO_OK    0x1000  /* flag: allow echo if no tty */
-    int msg_type;
-    int timeout;
-    const char *msg;
-};
-
-/*
- * Maximum length of a reply (not including the trailing NUL) when
- * conversing with the user.  In practical terms, this is the longest
- * password sudo will support.  This means that a buffer of size
- * SUDO_CONV_REPL_MAX+1 is guaranteed to be able to hold any reply
- * from the conversation function.  It is also useful as a max value
- * for memset_s() when clearing passwords returned by the conversation
- * function.
- */
-#define SUDO_CONV_REPL_MAX	255
-
-struct sudo_conv_reply {
-    char *reply;
-};
-
-/* Conversation callback API version major/minor */
-#define SUDO_CONV_CALLBACK_VERSION_MAJOR	1
-#define SUDO_CONV_CALLBACK_VERSION_MINOR	0
-#define SUDO_CONV_CALLBACK_VERSION SUDO_API_MKVERSION(SUDO_CONV_CALLBACK_VERSION_MAJOR, SUDO_CONV_CALLBACK_VERSION_MINOR)
-
-/*
- * Callback struct to be passed to the conversation function.
- * Can be used to perform operations on suspend/resume such
- * as dropping/acquiring locks.
- */
-typedef int (*sudo_conv_callback_fn_t)(int signo, void *closure);
-struct sudo_conv_callback {
-    unsigned int version;
-    void *closure;
-    sudo_conv_callback_fn_t on_suspend;
-    sudo_conv_callback_fn_t on_resume;
-};
-
-typedef int (*sudo_conv_t)(int num_msgs, const struct sudo_conv_message msgs[],
-	struct sudo_conv_reply replies[], struct sudo_conv_callback *callback);
-typedef int (*sudo_printf_t)(int msg_type, const char *fmt, ...);
-
-/*
- * Hooks allow a plugin to hook into specific sudo and/or libc functions.
- */
-
-/* Hook functions typedefs. */
-typedef int (*sudo_hook_fn_t)();
-typedef int (*sudo_hook_fn_setenv_t)(const char *name, const char *value, int overwrite, void *closure);
-typedef int (*sudo_hook_fn_putenv_t)(char *string, void *closure);
-typedef int (*sudo_hook_fn_getenv_t)(const char *name, char **value, void *closure);
-typedef int (*sudo_hook_fn_unsetenv_t)(const char *name, void *closure);
-
-/* Hook structure definition. */
-struct sudo_hook {
-    unsigned int hook_version;
-    unsigned int hook_type;
-    sudo_hook_fn_t hook_fn;
-    void *closure;
-};
-
-/* Hook API version major/minor */
-#define SUDO_HOOK_VERSION_MAJOR	1
-#define SUDO_HOOK_VERSION_MINOR	0
-#define SUDO_HOOK_VERSION SUDO_API_MKVERSION(SUDO_HOOK_VERSION_MAJOR, SUDO_HOOK_VERSION_MINOR)
-
-/*
- * Hook function return values.
- */
-#define SUDO_HOOK_RET_ERROR	-1	/* error */
-#define SUDO_HOOK_RET_NEXT	0	/* go to the next hook in the list */
-#define SUDO_HOOK_RET_STOP	1	/* stop hook processing for this type */
-
-/*
- * Hooks for setenv/unsetenv/putenv/getenv.
- * This allows the plugin to be notified when a PAM module modifies
- * the environment so it can update the copy of the environment that
- * is passed to execve().
- */
-#define SUDO_HOOK_SETENV	1
-#define SUDO_HOOK_UNSETENV	2
-#define SUDO_HOOK_PUTENV	3
-#define SUDO_HOOK_GETENV	4
-
-/* Policy plugin type and defines */
-struct passwd;
-struct policy_plugin {
-#define SUDO_POLICY_PLUGIN     1
-    unsigned int type; /* always SUDO_POLICY_PLUGIN */
-    unsigned int version; /* always SUDO_API_VERSION */
-    int (*open)(unsigned int version, sudo_conv_t conversation,
-	sudo_printf_t sudo_printf, char * const settings[],
-	char * const user_info[], char * const user_env[],
-	char * const plugin_plugins[]);
-    void (*close)(int exit_status, int error); /* wait status or error */
-    int (*show_version)(int verbose);
-    int (*check_policy)(int argc, char * const argv[],
-	char *env_add[], char **command_info[],
-	char **argv_out[], char **user_env_out[]);
-    int (*list)(int argc, char * const argv[], int verbose,
-	const char *list_user);
-    int (*validate)(void);
-    void (*invalidate)(int remove);
-    int (*init_session)(struct passwd *pwd, char **user_env_out[]);
-    void (*register_hooks)(int version, int (*register_hook)(struct sudo_hook *hook));
-    void (*deregister_hooks)(int version, int (*deregister_hook)(struct sudo_hook *hook));
-};
-
-/* I/O plugin type and defines */
-struct io_plugin {
-#define SUDO_IO_PLUGIN	    2
-    unsigned int type; /* always SUDO_IO_PLUGIN */
-    unsigned int version; /* always SUDO_API_VERSION */
-    int (*open)(unsigned int version, sudo_conv_t conversation,
-	sudo_printf_t sudo_printf, char * const settings[],
-	char * const user_info[], char * const command_info[],
-	int argc, char * const argv[], char * const user_env[],
-	char * const plugin_plugins[]);
-    void (*close)(int exit_status, int error); /* wait status or error */
-    int (*show_version)(int verbose);
-    int (*log_ttyin)(const char *buf, unsigned int len);
-    int (*log_ttyout)(const char *buf, unsigned int len);
-    int (*log_stdin)(const char *buf, unsigned int len);
-    int (*log_stdout)(const char *buf, unsigned int len);
-    int (*log_stderr)(const char *buf, unsigned int len);
-    void (*register_hooks)(int version, int (*register_hook)(struct sudo_hook *hook));
-    void (*deregister_hooks)(int version, int (*deregister_hook)(struct sudo_hook *hook));
-};
-
-/* Sudoers group plugin version major/minor */
-#define GROUP_API_VERSION_MAJOR 1
-#define GROUP_API_VERSION_MINOR 0
-#define GROUP_API_VERSION SUDO_API_MKVERSION(GROUP_API_VERSION_MAJOR, GROUP_API_VERSION_MINOR)
-
-/* Getters and setters for group version (for source compat only) */
-#define GROUP_API_VERSION_GET_MAJOR(v) SUDO_API_VERSION_GET_MAJOR(v)
-#define GROUP_API_VERSION_GET_MINOR(v) SUDO_API_VERSION_GET_MINOR(v)
-#define GROUP_API_VERSION_SET_MAJOR(vp, n) SUDO_API_VERSION_SET_MAJOR(vp, n)
-#define GROUP_API_VERSION_SET_MINOR(vp, n) SUDO_API_VERSION_SET_MINOR(vp, n)
-
-/*
- * version: for compatibility checking
- * group_init: return 1 on success, 0 if unconfigured, -1 on error.
- * group_cleanup: called to clean up resources used by provider
- * user_in_group: returns 1 if user is in group, 0 if not.
- *                note that pwd may be NULL if the user is not in passwd.
- */
-struct sudoers_group_plugin {
-    unsigned int version;
-    int (*init)(int version, sudo_printf_t sudo_printf, char *const argv[]);
-    void (*cleanup)(void);
-    int (*query)(const char *user, const char *group, const struct passwd *pwd);
-};
-
-#endif /* SUDO_PLUGIN_H */
diff --git a/openflow/usr/include/syscall.h b/openflow/usr/include/syscall.h
deleted file mode 100644
index 4c30578..0000000
--- a/openflow/usr/include/syscall.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sys/syscall.h>
diff --git a/openflow/usr/include/sysexits.h b/openflow/usr/include/sysexits.h
deleted file mode 100644
index 37246b6..0000000
--- a/openflow/usr/include/sysexits.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sysexits.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef	_SYSEXITS_H
-#define	_SYSEXITS_H 1
-
-/*
- *  SYSEXITS.H -- Exit status codes for system programs.
- *
- *	This include file attempts to categorize possible error
- *	exit statuses for system programs, notably delivermail
- *	and the Berkeley network.
- *
- *	Error numbers begin at EX__BASE to reduce the possibility of
- *	clashing with other exit statuses that random programs may
- *	already return.  The meaning of the codes is approximately
- *	as follows:
- *
- *	EX_USAGE -- The command was used incorrectly, e.g., with
- *		the wrong number of arguments, a bad flag, a bad
- *		syntax in a parameter, or whatever.
- *	EX_DATAERR -- The input data was incorrect in some way.
- *		This should only be used for user's data & not
- *		system files.
- *	EX_NOINPUT -- An input file (not a system file) did not
- *		exist or was not readable.  This could also include
- *		errors like "No message" to a mailer (if it cared
- *		to catch it).
- *	EX_NOUSER -- The user specified did not exist.  This might
- *		be used for mail addresses or remote logins.
- *	EX_NOHOST -- The host specified did not exist.  This is used
- *		in mail addresses or network requests.
- *	EX_UNAVAILABLE -- A service is unavailable.  This can occur
- *		if a support program or file does not exist.  This
- *		can also be used as a catchall message when something
- *		you wanted to do doesn't work, but you don't know
- *		why.
- *	EX_SOFTWARE -- An internal software error has been detected.
- *		This should be limited to non-operating system related
- *		errors as possible.
- *	EX_OSERR -- An operating system error has been detected.
- *		This is intended to be used for such things as "cannot
- *		fork", "cannot create pipe", or the like.  It includes
- *		things like getuid returning a user that does not
- *		exist in the passwd file.
- *	EX_OSFILE -- Some system file (e.g., /etc/passwd, /etc/utmp,
- *		etc.) does not exist, cannot be opened, or has some
- *		sort of error (e.g., syntax error).
- *	EX_CANTCREAT -- A (user specified) output file cannot be
- *		created.
- *	EX_IOERR -- An error occurred while doing I/O on some file.
- *	EX_TEMPFAIL -- temporary failure, indicating something that
- *		is not really an error.  In sendmail, this means
- *		that a mailer (e.g.) could not create a connection,
- *		and the request should be reattempted later.
- *	EX_PROTOCOL -- the remote system returned something that
- *		was "not possible" during a protocol exchange.
- *	EX_NOPERM -- You did not have sufficient permission to
- *		perform the operation.  This is not intended for
- *		file system problems, which should use NOINPUT or
- *		CANTCREAT, but rather for higher level permissions.
- */
-
-#define EX_OK		0	/* successful termination */
-
-#define EX__BASE	64	/* base value for error messages */
-
-#define EX_USAGE	64	/* command line usage error */
-#define EX_DATAERR	65	/* data format error */
-#define EX_NOINPUT	66	/* cannot open input */
-#define EX_NOUSER	67	/* addressee unknown */
-#define EX_NOHOST	68	/* host name unknown */
-#define EX_UNAVAILABLE	69	/* service unavailable */
-#define EX_SOFTWARE	70	/* internal software error */
-#define EX_OSERR	71	/* system error (e.g., can't fork) */
-#define EX_OSFILE	72	/* critical OS file missing */
-#define EX_CANTCREAT	73	/* can't create (user) output file */
-#define EX_IOERR	74	/* input/output error */
-#define EX_TEMPFAIL	75	/* temp failure; user is invited to retry */
-#define EX_PROTOCOL	76	/* remote error in protocol */
-#define EX_NOPERM	77	/* permission denied */
-#define EX_CONFIG	78	/* configuration error */
-
-#define EX__MAX	78	/* maximum listed value */
-
-#endif /* sysexits.h */
diff --git a/openflow/usr/include/syslog.h b/openflow/usr/include/syslog.h
deleted file mode 100644
index 830b492..0000000
--- a/openflow/usr/include/syslog.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sys/syslog.h>
diff --git a/openflow/usr/include/tar.h b/openflow/usr/include/tar.h
deleted file mode 100644
index 321c19e..0000000
--- a/openflow/usr/include/tar.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Extended tar format from POSIX.1.
-   Copyright (C) 1992-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by David J. MacKenzie.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_TAR_H
-#define	_TAR_H	1
-
-#include <features.h>
-
-
-/* A tar archive consists of 512-byte blocks.
-   Each file in the archive has a header block followed by 0+ data blocks.
-   Two blocks of NUL bytes indicate the end of the archive.  */
-
-/* The fields of header blocks:
-   All strings are stored as ISO 646 (approximately ASCII) strings.
-
-   Fields are numeric unless otherwise noted below; numbers are ISO 646
-   representations of octal numbers, with leading zeros as needed.
-
-   linkname is only valid when typeflag==LNKTYPE.  It doesn't use prefix;
-   files that are links to pathnames >100 chars long can not be stored
-   in a tar archive.
-
-   If typeflag=={LNKTYPE,SYMTYPE,DIRTYPE} then size must be 0.
-
-   devmajor and devminor are only valid for typeflag=={BLKTYPE,CHRTYPE}.
-
-   chksum contains the sum of all 512 bytes in the header block,
-   treating each byte as an 8-bit unsigned value and treating the
-   8 bytes of chksum as blank characters.
-
-   uname and gname are used in preference to uid and gid, if those
-   names exist locally.
-
-   Field Name	Byte Offset	Length in Bytes	Field Type
-   name		0		100		NUL-terminated if NUL fits
-   mode		100		8
-   uid		108		8
-   gid		116		8
-   size		124		12
-   mtime	136		12
-   chksum	148		8
-   typeflag	156		1		see below
-   linkname	157		100		NUL-terminated if NUL fits
-   magic	257		6		must be TMAGIC (NUL term.)
-   version	263		2		must be TVERSION
-   uname	265		32		NUL-terminated
-   gname	297		32		NUL-terminated
-   devmajor	329		8
-   devminor	337		8
-   prefix	345		155		NUL-terminated if NUL fits
-
-   If the first character of prefix is '\0', the file name is name;
-   otherwise, it is prefix/name.  Files whose pathnames don't fit in that
-   length can not be stored in a tar archive.  */
-
-/* The bits in mode: */
-#define TSUID	04000
-#define TSGID	02000
-#if defined __USE_XOPEN || !defined __USE_XOPEN2K
-# define TSVTX	01000
-#endif
-#define TUREAD	00400
-#define TUWRITE	00200
-#define TUEXEC	00100
-#define TGREAD	00040
-#define TGWRITE	00020
-#define TGEXEC	00010
-#define TOREAD	00004
-#define TOWRITE	00002
-#define TOEXEC	00001
-
-/* The values for typeflag:
-   Values 'A'-'Z' are reserved for custom implementations.
-   All other values are reserved for future POSIX.1 revisions.  */
-
-#define REGTYPE		'0'	/* Regular file (preferred code).  */
-#define AREGTYPE	'\0'	/* Regular file (alternate code).  */
-#define LNKTYPE		'1'	/* Hard link.  */
-#define SYMTYPE		'2'	/* Symbolic link (hard if not supported).  */
-#define CHRTYPE		'3'	/* Character special.  */
-#define BLKTYPE		'4'	/* Block special.  */
-#define DIRTYPE		'5'	/* Directory.  */
-#define FIFOTYPE	'6'	/* Named pipe.  */
-#define CONTTYPE	'7'	/* Contiguous file */
- /* (regular file if not supported).  */
-
-/* Contents of magic field and its length.  */
-#define TMAGIC	"ustar"
-#define TMAGLEN	6
-
-/* Contents of the version field and its length.  */
-#define TVERSION	"00"
-#define TVERSLEN	2
-
-#endif /* tar.h */
diff --git a/openflow/usr/include/term.h b/openflow/usr/include/term.h
deleted file mode 100644
index f3d5783..0000000
--- a/openflow/usr/include/term.h
+++ /dev/null
@@ -1,806 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2011,2013 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************/
-/* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995                */
-/*    and: Eric S. Raymond <esr@snark.thyrsus.com>                          */
-/*    and: Thomas E. Dickey                        1995-on                  */
-/****************************************************************************/
-
-/* $Id: MKterm.h.awk.in,v 1.62 2013/08/17 19:21:56 tom Exp $ */
-
-/*
-**	term.h -- Definition of struct term
-*/
-
-#ifndef NCURSES_TERM_H_incl
-#define NCURSES_TERM_H_incl 1
-
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "6.0"
-
-#include <ncurses_dll.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Make this file self-contained by providing defaults for the HAVE_TERMIO[S]_H
- * definition (based on the system for which this was configured).
- */
-
-#undef  NCURSES_CONST
-#define NCURSES_CONST const
-
-#undef  NCURSES_SBOOL
-#define NCURSES_SBOOL char
-
-#undef  NCURSES_USE_DATABASE
-#define NCURSES_USE_DATABASE 1
-
-#undef  NCURSES_USE_TERMCAP
-#define NCURSES_USE_TERMCAP 0
-
-#undef  NCURSES_XNAMES
-#define NCURSES_XNAMES 1
-
-/* We will use these symbols to hide differences between
- * termios/termio/sgttyb interfaces.
- */
-#undef  TTY
-#undef  SET_TTY
-#undef  GET_TTY
-
-/* Assume POSIX termio if we have the header and function */
-/* #if HAVE_TERMIOS_H && HAVE_TCGETATTR */
-#if 1 && 1
-
-#undef  TERMIOS
-#define TERMIOS 1
-
-#include <termios.h>
-#define TTY struct termios
-
-#else /* !HAVE_TERMIOS_H */
-
-/* #if HAVE_TERMIO_H */
-#if 1
-
-#undef  TERMIOS
-#define TERMIOS 1
-
-#include <termio.h>
-#define TTY struct termio
-
-#else /* !HAVE_TERMIO_H */
-
-#if __MINGW32__
-#  include <ncurses_mingw.h>
-#  define TTY struct termios
-#else
-#undef TERMIOS
-#include <sgtty.h>
-#include <sys/ioctl.h>
-#define TTY struct sgttyb
-#endif /* MINGW32 */
-#endif /* HAVE_TERMIO_H */
-
-#endif /* HAVE_TERMIOS_H */
-
-#ifdef TERMIOS
-#define GET_TTY(fd, buf) tcgetattr(fd, buf)
-#define SET_TTY(fd, buf) tcsetattr(fd, TCSADRAIN, buf)
-#else
-#define GET_TTY(fd, buf) gtty(fd, buf)
-#define SET_TTY(fd, buf) stty(fd, buf)
-#endif
-
-#define NAMESIZE 256
-
-#define CUR cur_term->type.
-
-#define auto_left_margin               CUR Booleans[0]
-#define auto_right_margin              CUR Booleans[1]
-#define no_esc_ctlc                    CUR Booleans[2]
-#define ceol_standout_glitch           CUR Booleans[3]
-#define eat_newline_glitch             CUR Booleans[4]
-#define erase_overstrike               CUR Booleans[5]
-#define generic_type                   CUR Booleans[6]
-#define hard_copy                      CUR Booleans[7]
-#define has_meta_key                   CUR Booleans[8]
-#define has_status_line                CUR Booleans[9]
-#define insert_null_glitch             CUR Booleans[10]
-#define memory_above                   CUR Booleans[11]
-#define memory_below                   CUR Booleans[12]
-#define move_insert_mode               CUR Booleans[13]
-#define move_standout_mode             CUR Booleans[14]
-#define over_strike                    CUR Booleans[15]
-#define status_line_esc_ok             CUR Booleans[16]
-#define dest_tabs_magic_smso           CUR Booleans[17]
-#define tilde_glitch                   CUR Booleans[18]
-#define transparent_underline          CUR Booleans[19]
-#define xon_xoff                       CUR Booleans[20]
-#define needs_xon_xoff                 CUR Booleans[21]
-#define prtr_silent                    CUR Booleans[22]
-#define hard_cursor                    CUR Booleans[23]
-#define non_rev_rmcup                  CUR Booleans[24]
-#define no_pad_char                    CUR Booleans[25]
-#define non_dest_scroll_region         CUR Booleans[26]
-#define can_change                     CUR Booleans[27]
-#define back_color_erase               CUR Booleans[28]
-#define hue_lightness_saturation       CUR Booleans[29]
-#define col_addr_glitch                CUR Booleans[30]
-#define cr_cancels_micro_mode          CUR Booleans[31]
-#define has_print_wheel                CUR Booleans[32]
-#define row_addr_glitch                CUR Booleans[33]
-#define semi_auto_right_margin         CUR Booleans[34]
-#define cpi_changes_res                CUR Booleans[35]
-#define lpi_changes_res                CUR Booleans[36]
-#define columns                        CUR Numbers[0]
-#define init_tabs                      CUR Numbers[1]
-#define lines                          CUR Numbers[2]
-#define lines_of_memory                CUR Numbers[3]
-#define magic_cookie_glitch            CUR Numbers[4]
-#define padding_baud_rate              CUR Numbers[5]
-#define virtual_terminal               CUR Numbers[6]
-#define width_status_line              CUR Numbers[7]
-#define num_labels                     CUR Numbers[8]
-#define label_height                   CUR Numbers[9]
-#define label_width                    CUR Numbers[10]
-#define max_attributes                 CUR Numbers[11]
-#define maximum_windows                CUR Numbers[12]
-#define max_colors                     CUR Numbers[13]
-#define max_pairs                      CUR Numbers[14]
-#define no_color_video                 CUR Numbers[15]
-#define buffer_capacity                CUR Numbers[16]
-#define dot_vert_spacing               CUR Numbers[17]
-#define dot_horz_spacing               CUR Numbers[18]
-#define max_micro_address              CUR Numbers[19]
-#define max_micro_jump                 CUR Numbers[20]
-#define micro_col_size                 CUR Numbers[21]
-#define micro_line_size                CUR Numbers[22]
-#define number_of_pins                 CUR Numbers[23]
-#define output_res_char                CUR Numbers[24]
-#define output_res_line                CUR Numbers[25]
-#define output_res_horz_inch           CUR Numbers[26]
-#define output_res_vert_inch           CUR Numbers[27]
-#define print_rate                     CUR Numbers[28]
-#define wide_char_size                 CUR Numbers[29]
-#define buttons                        CUR Numbers[30]
-#define bit_image_entwining            CUR Numbers[31]
-#define bit_image_type                 CUR Numbers[32]
-#define back_tab                       CUR Strings[0]
-#define bell                           CUR Strings[1]
-#define carriage_return                CUR Strings[2]
-#define change_scroll_region           CUR Strings[3]
-#define clear_all_tabs                 CUR Strings[4]
-#define clear_screen                   CUR Strings[5]
-#define clr_eol                        CUR Strings[6]
-#define clr_eos                        CUR Strings[7]
-#define column_address                 CUR Strings[8]
-#define command_character              CUR Strings[9]
-#define cursor_address                 CUR Strings[10]
-#define cursor_down                    CUR Strings[11]
-#define cursor_home                    CUR Strings[12]
-#define cursor_invisible               CUR Strings[13]
-#define cursor_left                    CUR Strings[14]
-#define cursor_mem_address             CUR Strings[15]
-#define cursor_normal                  CUR Strings[16]
-#define cursor_right                   CUR Strings[17]
-#define cursor_to_ll                   CUR Strings[18]
-#define cursor_up                      CUR Strings[19]
-#define cursor_visible                 CUR Strings[20]
-#define delete_character               CUR Strings[21]
-#define delete_line                    CUR Strings[22]
-#define dis_status_line                CUR Strings[23]
-#define down_half_line                 CUR Strings[24]
-#define enter_alt_charset_mode         CUR Strings[25]
-#define enter_blink_mode               CUR Strings[26]
-#define enter_bold_mode                CUR Strings[27]
-#define enter_ca_mode                  CUR Strings[28]
-#define enter_delete_mode              CUR Strings[29]
-#define enter_dim_mode                 CUR Strings[30]
-#define enter_insert_mode              CUR Strings[31]
-#define enter_secure_mode              CUR Strings[32]
-#define enter_protected_mode           CUR Strings[33]
-#define enter_reverse_mode             CUR Strings[34]
-#define enter_standout_mode            CUR Strings[35]
-#define enter_underline_mode           CUR Strings[36]
-#define erase_chars                    CUR Strings[37]
-#define exit_alt_charset_mode          CUR Strings[38]
-#define exit_attribute_mode            CUR Strings[39]
-#define exit_ca_mode                   CUR Strings[40]
-#define exit_delete_mode               CUR Strings[41]
-#define exit_insert_mode               CUR Strings[42]
-#define exit_standout_mode             CUR Strings[43]
-#define exit_underline_mode            CUR Strings[44]
-#define flash_screen                   CUR Strings[45]
-#define form_feed                      CUR Strings[46]
-#define from_status_line               CUR Strings[47]
-#define init_1string                   CUR Strings[48]
-#define init_2string                   CUR Strings[49]
-#define init_3string                   CUR Strings[50]
-#define init_file                      CUR Strings[51]
-#define insert_character               CUR Strings[52]
-#define insert_line                    CUR Strings[53]
-#define insert_padding                 CUR Strings[54]
-#define key_backspace                  CUR Strings[55]
-#define key_catab                      CUR Strings[56]
-#define key_clear                      CUR Strings[57]
-#define key_ctab                       CUR Strings[58]
-#define key_dc                         CUR Strings[59]
-#define key_dl                         CUR Strings[60]
-#define key_down                       CUR Strings[61]
-#define key_eic                        CUR Strings[62]
-#define key_eol                        CUR Strings[63]
-#define key_eos                        CUR Strings[64]
-#define key_f0                         CUR Strings[65]
-#define key_f1                         CUR Strings[66]
-#define key_f10                        CUR Strings[67]
-#define key_f2                         CUR Strings[68]
-#define key_f3                         CUR Strings[69]
-#define key_f4                         CUR Strings[70]
-#define key_f5                         CUR Strings[71]
-#define key_f6                         CUR Strings[72]
-#define key_f7                         CUR Strings[73]
-#define key_f8                         CUR Strings[74]
-#define key_f9                         CUR Strings[75]
-#define key_home                       CUR Strings[76]
-#define key_ic                         CUR Strings[77]
-#define key_il                         CUR Strings[78]
-#define key_left                       CUR Strings[79]
-#define key_ll                         CUR Strings[80]
-#define key_npage                      CUR Strings[81]
-#define key_ppage                      CUR Strings[82]
-#define key_right                      CUR Strings[83]
-#define key_sf                         CUR Strings[84]
-#define key_sr                         CUR Strings[85]
-#define key_stab                       CUR Strings[86]
-#define key_up                         CUR Strings[87]
-#define keypad_local                   CUR Strings[88]
-#define keypad_xmit                    CUR Strings[89]
-#define lab_f0                         CUR Strings[90]
-#define lab_f1                         CUR Strings[91]
-#define lab_f10                        CUR Strings[92]
-#define lab_f2                         CUR Strings[93]
-#define lab_f3                         CUR Strings[94]
-#define lab_f4                         CUR Strings[95]
-#define lab_f5                         CUR Strings[96]
-#define lab_f6                         CUR Strings[97]
-#define lab_f7                         CUR Strings[98]
-#define lab_f8                         CUR Strings[99]
-#define lab_f9                         CUR Strings[100]
-#define meta_off                       CUR Strings[101]
-#define meta_on                        CUR Strings[102]
-#define newline                        CUR Strings[103]
-#define pad_char                       CUR Strings[104]
-#define parm_dch                       CUR Strings[105]
-#define parm_delete_line               CUR Strings[106]
-#define parm_down_cursor               CUR Strings[107]
-#define parm_ich                       CUR Strings[108]
-#define parm_index                     CUR Strings[109]
-#define parm_insert_line               CUR Strings[110]
-#define parm_left_cursor               CUR Strings[111]
-#define parm_right_cursor              CUR Strings[112]
-#define parm_rindex                    CUR Strings[113]
-#define parm_up_cursor                 CUR Strings[114]
-#define pkey_key                       CUR Strings[115]
-#define pkey_local                     CUR Strings[116]
-#define pkey_xmit                      CUR Strings[117]
-#define print_screen                   CUR Strings[118]
-#define prtr_off                       CUR Strings[119]
-#define prtr_on                        CUR Strings[120]
-#define repeat_char                    CUR Strings[121]
-#define reset_1string                  CUR Strings[122]
-#define reset_2string                  CUR Strings[123]
-#define reset_3string                  CUR Strings[124]
-#define reset_file                     CUR Strings[125]
-#define restore_cursor                 CUR Strings[126]
-#define row_address                    CUR Strings[127]
-#define save_cursor                    CUR Strings[128]
-#define scroll_forward                 CUR Strings[129]
-#define scroll_reverse                 CUR Strings[130]
-#define set_attributes                 CUR Strings[131]
-#define set_tab                        CUR Strings[132]
-#define set_window                     CUR Strings[133]
-#define tab                            CUR Strings[134]
-#define to_status_line                 CUR Strings[135]
-#define underline_char                 CUR Strings[136]
-#define up_half_line                   CUR Strings[137]
-#define init_prog                      CUR Strings[138]
-#define key_a1                         CUR Strings[139]
-#define key_a3                         CUR Strings[140]
-#define key_b2                         CUR Strings[141]
-#define key_c1                         CUR Strings[142]
-#define key_c3                         CUR Strings[143]
-#define prtr_non                       CUR Strings[144]
-#define char_padding                   CUR Strings[145]
-#define acs_chars                      CUR Strings[146]
-#define plab_norm                      CUR Strings[147]
-#define key_btab                       CUR Strings[148]
-#define enter_xon_mode                 CUR Strings[149]
-#define exit_xon_mode                  CUR Strings[150]
-#define enter_am_mode                  CUR Strings[151]
-#define exit_am_mode                   CUR Strings[152]
-#define xon_character                  CUR Strings[153]
-#define xoff_character                 CUR Strings[154]
-#define ena_acs                        CUR Strings[155]
-#define label_on                       CUR Strings[156]
-#define label_off                      CUR Strings[157]
-#define key_beg                        CUR Strings[158]
-#define key_cancel                     CUR Strings[159]
-#define key_close                      CUR Strings[160]
-#define key_command                    CUR Strings[161]
-#define key_copy                       CUR Strings[162]
-#define key_create                     CUR Strings[163]
-#define key_end                        CUR Strings[164]
-#define key_enter                      CUR Strings[165]
-#define key_exit                       CUR Strings[166]
-#define key_find                       CUR Strings[167]
-#define key_help                       CUR Strings[168]
-#define key_mark                       CUR Strings[169]
-#define key_message                    CUR Strings[170]
-#define key_move                       CUR Strings[171]
-#define key_next                       CUR Strings[172]
-#define key_open                       CUR Strings[173]
-#define key_options                    CUR Strings[174]
-#define key_previous                   CUR Strings[175]
-#define key_print                      CUR Strings[176]
-#define key_redo                       CUR Strings[177]
-#define key_reference                  CUR Strings[178]
-#define key_refresh                    CUR Strings[179]
-#define key_replace                    CUR Strings[180]
-#define key_restart                    CUR Strings[181]
-#define key_resume                     CUR Strings[182]
-#define key_save                       CUR Strings[183]
-#define key_suspend                    CUR Strings[184]
-#define key_undo                       CUR Strings[185]
-#define key_sbeg                       CUR Strings[186]
-#define key_scancel                    CUR Strings[187]
-#define key_scommand                   CUR Strings[188]
-#define key_scopy                      CUR Strings[189]
-#define key_screate                    CUR Strings[190]
-#define key_sdc                        CUR Strings[191]
-#define key_sdl                        CUR Strings[192]
-#define key_select                     CUR Strings[193]
-#define key_send                       CUR Strings[194]
-#define key_seol                       CUR Strings[195]
-#define key_sexit                      CUR Strings[196]
-#define key_sfind                      CUR Strings[197]
-#define key_shelp                      CUR Strings[198]
-#define key_shome                      CUR Strings[199]
-#define key_sic                        CUR Strings[200]
-#define key_sleft                      CUR Strings[201]
-#define key_smessage                   CUR Strings[202]
-#define key_smove                      CUR Strings[203]
-#define key_snext                      CUR Strings[204]
-#define key_soptions                   CUR Strings[205]
-#define key_sprevious                  CUR Strings[206]
-#define key_sprint                     CUR Strings[207]
-#define key_sredo                      CUR Strings[208]
-#define key_sreplace                   CUR Strings[209]
-#define key_sright                     CUR Strings[210]
-#define key_srsume                     CUR Strings[211]
-#define key_ssave                      CUR Strings[212]
-#define key_ssuspend                   CUR Strings[213]
-#define key_sundo                      CUR Strings[214]
-#define req_for_input                  CUR Strings[215]
-#define key_f11                        CUR Strings[216]
-#define key_f12                        CUR Strings[217]
-#define key_f13                        CUR Strings[218]
-#define key_f14                        CUR Strings[219]
-#define key_f15                        CUR Strings[220]
-#define key_f16                        CUR Strings[221]
-#define key_f17                        CUR Strings[222]
-#define key_f18                        CUR Strings[223]
-#define key_f19                        CUR Strings[224]
-#define key_f20                        CUR Strings[225]
-#define key_f21                        CUR Strings[226]
-#define key_f22                        CUR Strings[227]
-#define key_f23                        CUR Strings[228]
-#define key_f24                        CUR Strings[229]
-#define key_f25                        CUR Strings[230]
-#define key_f26                        CUR Strings[231]
-#define key_f27                        CUR Strings[232]
-#define key_f28                        CUR Strings[233]
-#define key_f29                        CUR Strings[234]
-#define key_f30                        CUR Strings[235]
-#define key_f31                        CUR Strings[236]
-#define key_f32                        CUR Strings[237]
-#define key_f33                        CUR Strings[238]
-#define key_f34                        CUR Strings[239]
-#define key_f35                        CUR Strings[240]
-#define key_f36                        CUR Strings[241]
-#define key_f37                        CUR Strings[242]
-#define key_f38                        CUR Strings[243]
-#define key_f39                        CUR Strings[244]
-#define key_f40                        CUR Strings[245]
-#define key_f41                        CUR Strings[246]
-#define key_f42                        CUR Strings[247]
-#define key_f43                        CUR Strings[248]
-#define key_f44                        CUR Strings[249]
-#define key_f45                        CUR Strings[250]
-#define key_f46                        CUR Strings[251]
-#define key_f47                        CUR Strings[252]
-#define key_f48                        CUR Strings[253]
-#define key_f49                        CUR Strings[254]
-#define key_f50                        CUR Strings[255]
-#define key_f51                        CUR Strings[256]
-#define key_f52                        CUR Strings[257]
-#define key_f53                        CUR Strings[258]
-#define key_f54                        CUR Strings[259]
-#define key_f55                        CUR Strings[260]
-#define key_f56                        CUR Strings[261]
-#define key_f57                        CUR Strings[262]
-#define key_f58                        CUR Strings[263]
-#define key_f59                        CUR Strings[264]
-#define key_f60                        CUR Strings[265]
-#define key_f61                        CUR Strings[266]
-#define key_f62                        CUR Strings[267]
-#define key_f63                        CUR Strings[268]
-#define clr_bol                        CUR Strings[269]
-#define clear_margins                  CUR Strings[270]
-#define set_left_margin                CUR Strings[271]
-#define set_right_margin               CUR Strings[272]
-#define label_format                   CUR Strings[273]
-#define set_clock                      CUR Strings[274]
-#define display_clock                  CUR Strings[275]
-#define remove_clock                   CUR Strings[276]
-#define create_window                  CUR Strings[277]
-#define goto_window                    CUR Strings[278]
-#define hangup                         CUR Strings[279]
-#define dial_phone                     CUR Strings[280]
-#define quick_dial                     CUR Strings[281]
-#define tone                           CUR Strings[282]
-#define pulse                          CUR Strings[283]
-#define flash_hook                     CUR Strings[284]
-#define fixed_pause                    CUR Strings[285]
-#define wait_tone                      CUR Strings[286]
-#define user0                          CUR Strings[287]
-#define user1                          CUR Strings[288]
-#define user2                          CUR Strings[289]
-#define user3                          CUR Strings[290]
-#define user4                          CUR Strings[291]
-#define user5                          CUR Strings[292]
-#define user6                          CUR Strings[293]
-#define user7                          CUR Strings[294]
-#define user8                          CUR Strings[295]
-#define user9                          CUR Strings[296]
-#define orig_pair                      CUR Strings[297]
-#define orig_colors                    CUR Strings[298]
-#define initialize_color               CUR Strings[299]
-#define initialize_pair                CUR Strings[300]
-#define set_color_pair                 CUR Strings[301]
-#define set_foreground                 CUR Strings[302]
-#define set_background                 CUR Strings[303]
-#define change_char_pitch              CUR Strings[304]
-#define change_line_pitch              CUR Strings[305]
-#define change_res_horz                CUR Strings[306]
-#define change_res_vert                CUR Strings[307]
-#define define_char                    CUR Strings[308]
-#define enter_doublewide_mode          CUR Strings[309]
-#define enter_draft_quality            CUR Strings[310]
-#define enter_italics_mode             CUR Strings[311]
-#define enter_leftward_mode            CUR Strings[312]
-#define enter_micro_mode               CUR Strings[313]
-#define enter_near_letter_quality      CUR Strings[314]
-#define enter_normal_quality           CUR Strings[315]
-#define enter_shadow_mode              CUR Strings[316]
-#define enter_subscript_mode           CUR Strings[317]
-#define enter_superscript_mode         CUR Strings[318]
-#define enter_upward_mode              CUR Strings[319]
-#define exit_doublewide_mode           CUR Strings[320]
-#define exit_italics_mode              CUR Strings[321]
-#define exit_leftward_mode             CUR Strings[322]
-#define exit_micro_mode                CUR Strings[323]
-#define exit_shadow_mode               CUR Strings[324]
-#define exit_subscript_mode            CUR Strings[325]
-#define exit_superscript_mode          CUR Strings[326]
-#define exit_upward_mode               CUR Strings[327]
-#define micro_column_address           CUR Strings[328]
-#define micro_down                     CUR Strings[329]
-#define micro_left                     CUR Strings[330]
-#define micro_right                    CUR Strings[331]
-#define micro_row_address              CUR Strings[332]
-#define micro_up                       CUR Strings[333]
-#define order_of_pins                  CUR Strings[334]
-#define parm_down_micro                CUR Strings[335]
-#define parm_left_micro                CUR Strings[336]
-#define parm_right_micro               CUR Strings[337]
-#define parm_up_micro                  CUR Strings[338]
-#define select_char_set                CUR Strings[339]
-#define set_bottom_margin              CUR Strings[340]
-#define set_bottom_margin_parm         CUR Strings[341]
-#define set_left_margin_parm           CUR Strings[342]
-#define set_right_margin_parm          CUR Strings[343]
-#define set_top_margin                 CUR Strings[344]
-#define set_top_margin_parm            CUR Strings[345]
-#define start_bit_image                CUR Strings[346]
-#define start_char_set_def             CUR Strings[347]
-#define stop_bit_image                 CUR Strings[348]
-#define stop_char_set_def              CUR Strings[349]
-#define subscript_characters           CUR Strings[350]
-#define superscript_characters         CUR Strings[351]
-#define these_cause_cr                 CUR Strings[352]
-#define zero_motion                    CUR Strings[353]
-#define char_set_names                 CUR Strings[354]
-#define key_mouse                      CUR Strings[355]
-#define mouse_info                     CUR Strings[356]
-#define req_mouse_pos                  CUR Strings[357]
-#define get_mouse                      CUR Strings[358]
-#define set_a_foreground               CUR Strings[359]
-#define set_a_background               CUR Strings[360]
-#define pkey_plab                      CUR Strings[361]
-#define device_type                    CUR Strings[362]
-#define code_set_init                  CUR Strings[363]
-#define set0_des_seq                   CUR Strings[364]
-#define set1_des_seq                   CUR Strings[365]
-#define set2_des_seq                   CUR Strings[366]
-#define set3_des_seq                   CUR Strings[367]
-#define set_lr_margin                  CUR Strings[368]
-#define set_tb_margin                  CUR Strings[369]
-#define bit_image_repeat               CUR Strings[370]
-#define bit_image_newline              CUR Strings[371]
-#define bit_image_carriage_return      CUR Strings[372]
-#define color_names                    CUR Strings[373]
-#define define_bit_image_region        CUR Strings[374]
-#define end_bit_image_region           CUR Strings[375]
-#define set_color_band                 CUR Strings[376]
-#define set_page_length                CUR Strings[377]
-#define display_pc_char                CUR Strings[378]
-#define enter_pc_charset_mode          CUR Strings[379]
-#define exit_pc_charset_mode           CUR Strings[380]
-#define enter_scancode_mode            CUR Strings[381]
-#define exit_scancode_mode             CUR Strings[382]
-#define pc_term_options                CUR Strings[383]
-#define scancode_escape                CUR Strings[384]
-#define alt_scancode_esc               CUR Strings[385]
-#define enter_horizontal_hl_mode       CUR Strings[386]
-#define enter_left_hl_mode             CUR Strings[387]
-#define enter_low_hl_mode              CUR Strings[388]
-#define enter_right_hl_mode            CUR Strings[389]
-#define enter_top_hl_mode              CUR Strings[390]
-#define enter_vertical_hl_mode         CUR Strings[391]
-#define set_a_attributes               CUR Strings[392]
-#define set_pglen_inch                 CUR Strings[393]
-
-#define BOOLWRITE 37
-#define NUMWRITE  33
-#define STRWRITE  394
-
-/* older synonyms for some capabilities */
-#define beehive_glitch	no_esc_ctlc
-#define teleray_glitch	dest_tabs_magic_smso
-#define micro_char_size micro_col_size
-
-#ifdef __INTERNAL_CAPS_VISIBLE
-#define termcap_init2                  CUR Strings[394]
-#define termcap_reset                  CUR Strings[395]
-#define magic_cookie_glitch_ul         CUR Numbers[33]
-#define backspaces_with_bs             CUR Booleans[37]
-#define crt_no_scrolling               CUR Booleans[38]
-#define no_correctly_working_cr        CUR Booleans[39]
-#define carriage_return_delay          CUR Numbers[34]
-#define new_line_delay                 CUR Numbers[35]
-#define linefeed_if_not_lf             CUR Strings[396]
-#define backspace_if_not_bs            CUR Strings[397]
-#define gnu_has_meta_key               CUR Booleans[40]
-#define linefeed_is_newline            CUR Booleans[41]
-#define backspace_delay                CUR Numbers[36]
-#define horizontal_tab_delay           CUR Numbers[37]
-#define number_of_function_keys        CUR Numbers[38]
-#define other_non_function_keys        CUR Strings[398]
-#define arrow_key_map                  CUR Strings[399]
-#define has_hardware_tabs              CUR Booleans[42]
-#define return_does_clr_eol            CUR Booleans[43]
-#define acs_ulcorner                   CUR Strings[400]
-#define acs_llcorner                   CUR Strings[401]
-#define acs_urcorner                   CUR Strings[402]
-#define acs_lrcorner                   CUR Strings[403]
-#define acs_ltee                       CUR Strings[404]
-#define acs_rtee                       CUR Strings[405]
-#define acs_btee                       CUR Strings[406]
-#define acs_ttee                       CUR Strings[407]
-#define acs_hline                      CUR Strings[408]
-#define acs_vline                      CUR Strings[409]
-#define acs_plus                       CUR Strings[410]
-#define memory_lock                    CUR Strings[411]
-#define memory_unlock                  CUR Strings[412]
-#define box_chars_1                    CUR Strings[413]
-#endif /* __INTERNAL_CAPS_VISIBLE */
-
-
-/*
- * Predefined terminfo array sizes
- */
-#define BOOLCOUNT 44
-#define NUMCOUNT  39
-#define STRCOUNT  414
-
-/* used by code for comparing entries */
-#define acs_chars_index	 146
-
-typedef struct termtype {	/* in-core form of terminfo data */
-    char  *term_names;		/* str_table offset of term names */
-    char  *str_table;		/* pointer to string table */
-    NCURSES_SBOOL  *Booleans;	/* array of boolean values */
-    short *Numbers;		/* array of integer values */
-    char  **Strings;		/* array of string offsets */
-
-#if NCURSES_XNAMES
-    char  *ext_str_table;	/* pointer to extended string table */
-    char  **ext_Names;		/* corresponding names */
-
-    unsigned short num_Booleans;/* count total Booleans */
-    unsigned short num_Numbers;	/* count total Numbers */
-    unsigned short num_Strings;	/* count total Strings */
-
-    unsigned short ext_Booleans;/* count extensions to Booleans */
-    unsigned short ext_Numbers;	/* count extensions to Numbers */
-    unsigned short ext_Strings;	/* count extensions to Strings */
-#endif /* NCURSES_XNAMES */
-
-} TERMTYPE;
-
-typedef struct term {		/* describe an actual terminal */
-    TERMTYPE	type;		/* terminal type description */
-    short	Filedes;	/* file description being written to */
-    TTY		Ottyb,		/* original state of the terminal */
-		Nttyb;		/* current state of the terminal */
-    int		_baudrate;	/* used to compute padding */
-    char *      _termname;      /* used for termname() */
-} TERMINAL;
-
-#if 0 && !0
-extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;
-#elif 0
-NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);
-#define cur_term   NCURSES_PUBLIC_VAR(cur_term())
-#else
-extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;
-#endif
-
-#if 0 || 0
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numcodes);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numfnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);
-
-#define boolnames  NCURSES_PUBLIC_VAR(boolnames())
-#define boolcodes  NCURSES_PUBLIC_VAR(boolcodes())
-#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())
-#define numnames   NCURSES_PUBLIC_VAR(numnames())
-#define numcodes   NCURSES_PUBLIC_VAR(numcodes())
-#define numfnames  NCURSES_PUBLIC_VAR(numfnames())
-#define strnames   NCURSES_PUBLIC_VAR(strnames())
-#define strcodes   NCURSES_PUBLIC_VAR(strcodes())
-#define strfnames  NCURSES_PUBLIC_VAR(strfnames())
-
-#else
-
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numcodes[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numfnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strcodes[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strfnames[];
-
-#endif
-
-/* internals */
-extern NCURSES_EXPORT(int) _nc_set_tty_mode (TTY *buf);
-extern NCURSES_EXPORT(int) _nc_get_tty_mode (TTY *buf);
-extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);
-extern NCURSES_EXPORT(int) _nc_read_file_entry (const char *const, TERMTYPE *);
-extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE *const);
-extern NCURSES_EXPORT(int) _nc_read_termtype (TERMTYPE *, char *, int);
-extern NCURSES_EXPORT(char *) _nc_first_name (const char *const);
-extern NCURSES_EXPORT(int) _nc_name_match (const char *const, const char *const, const char *const);
-extern NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *);
-
-/* entry points */
-extern NCURSES_EXPORT(TERMINAL *) set_curterm (TERMINAL *);
-extern NCURSES_EXPORT(int) del_curterm (TERMINAL *);
-
-/* miscellaneous entry points */
-extern NCURSES_EXPORT(int) restartterm (NCURSES_CONST char *, int, int *);
-extern NCURSES_EXPORT(int) setupterm (NCURSES_CONST char *,int,int *);
-
-/* terminfo entry points, also declared in curses.h */
-#if !defined(__NCURSES_H)
-extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);
-extern NCURSES_EXPORT_VAR(char) ttytype[];
-extern NCURSES_EXPORT(int) putp (const char *);
-extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);
-
-#if 1 /* NCURSES_TPARM_VARARGS */
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */
-#else
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */
-extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
-#endif
-
-extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */
-
-#endif /* __NCURSES_H */
-
-/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */
-#if !defined(NCURSES_TERMCAP_H_incl)
-extern NCURSES_EXPORT(char *) tgetstr (NCURSES_CONST char *, char **);
-extern NCURSES_EXPORT(char *) tgoto (const char *, int, int);
-extern NCURSES_EXPORT(int) tgetent (char *, const char *);
-extern NCURSES_EXPORT(int) tgetflag (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tgetnum (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tputs (const char *, int, int (*)(int));
-#endif /* NCURSES_TERMCAP_H_incl */
-
-/*
- * Include curses.h before term.h to enable these extensions.
- */
-#if defined(NCURSES_SP_FUNCS) && (NCURSES_SP_FUNCS != 0)
-
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tigetstr) (SCREEN*, NCURSES_CONST char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(putp) (SCREEN*, const char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tigetflag) (SCREEN*, NCURSES_CONST char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tigetnum) (SCREEN*, NCURSES_CONST char *);
-
-#if 1 /* NCURSES_TPARM_VARARGS */
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tparm) (SCREEN*, NCURSES_CONST char *, ...);	/* special */
-#else
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tparm) (SCREEN*, NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tparm_varargs) (SCREEN*, NCURSES_CONST char *, ...);	/* special */
-#endif
-
-/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tgetstr) (SCREEN*, NCURSES_CONST char *, char **);
-extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tgoto) (SCREEN*, const char *, int, int);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetent) (SCREEN*, char *, const char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetflag) (SCREEN*, NCURSES_CONST char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetnum) (SCREEN*, NCURSES_CONST char *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tputs) (SCREEN*, const char *, int, NCURSES_SP_OUTC);
-
-extern NCURSES_EXPORT(TERMINAL *) NCURSES_SP_NAME(set_curterm) (SCREEN*, TERMINAL *);
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(del_curterm) (SCREEN*, TERMINAL *);
-
-extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(restartterm) (SCREEN*, NCURSES_CONST char *, int, int *);
-#endif /* NCURSES_SP_FUNCS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NCURSES_TERM_H_incl */
diff --git a/openflow/usr/include/term_entry.h b/openflow/usr/include/term_entry.h
deleted file mode 100644
index 0223f40..0000000
--- a/openflow/usr/include/term_entry.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- *     and: Thomas E. Dickey                        1998-on                 *
- ****************************************************************************/
-
-/* $Id: term_entry.h,v 1.47 2015/08/30 00:41:20 tom Exp $ */
-
-/*
- *	term_entry.h -- interface to entry-manipulation code
- */
-
-#ifndef NCURSES_TERM_ENTRY_H_incl
-#define NCURSES_TERM_ENTRY_H_incl 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <term.h>
-
-    /*
-     * see db_iterator.c - this enumeration lists the places searched for a
-     * terminal description and defines the order in which they are searched.
-     */
-    typedef enum {
-	dbdTIC = 0,		/* special, used by tic when writing entry */
-#if NCURSES_USE_DATABASE
-	dbdEnvOnce,		/* the $TERMINFO environment variable */
-	dbdHome,		/* $HOME/.terminfo */
-	dbdEnvList,		/* the $TERMINFO_DIRS environment variable */
-	dbdCfgList,		/* the compiled-in TERMINFO_DIRS value */
-	dbdCfgOnce,		/* the compiled-in TERMINFO value */
-#endif
-#if NCURSES_USE_TERMCAP
-	dbdEnvOnce2,		/* the $TERMCAP environment variable */
-	dbdEnvList2,		/* the $TERMPATH environment variable */
-	dbdCfgList2,		/* the compiled-in TERMPATH */
-#endif
-	dbdLAST
-    } DBDIRS;
-
-#define MAX_USES	32
-#define MAX_CROSSLINKS	16
-
-    typedef struct entry {
-	TERMTYPE tterm;
-	unsigned nuses;
-	struct {
-	    char *name;
-	    struct entry *link;
-	    long line;
-	} uses[MAX_USES];
-	int ncrosslinks;
-	struct entry *crosslinks[MAX_CROSSLINKS];
-	long cstart, cend;
-	long startline;
-	struct entry *next;
-	struct entry *last;
-    } ENTRY;
-/* *INDENT-OFF* */
-#if NCURSES_XNAMES
-#define NUM_BOOLEANS(tp) (tp)->num_Booleans
-#define NUM_NUMBERS(tp)  (tp)->num_Numbers
-#define NUM_STRINGS(tp)  (tp)->num_Strings
-#define EXT_NAMES(tp,i,limit,index,table) (i >= limit) ? tp->ext_Names[index] : table[i]
-#else
-#define NUM_BOOLEANS(tp) BOOLCOUNT
-#define NUM_NUMBERS(tp)  NUMCOUNT
-#define NUM_STRINGS(tp)  STRCOUNT
-#define EXT_NAMES(tp,i,limit,index,table) table[i]
-#endif
-
-#define NUM_EXT_NAMES(tp) (unsigned) ((tp)->ext_Booleans + (tp)->ext_Numbers + (tp)->ext_Strings)
-
-#define for_each_boolean(n,tp) for(n = 0; n < NUM_BOOLEANS(tp); n++)
-#define for_each_number(n,tp)  for(n = 0; n < NUM_NUMBERS(tp);  n++)
-#define for_each_string(n,tp)  for(n = 0; n < NUM_STRINGS(tp);  n++)
-
-#if NCURSES_XNAMES
-#define for_each_ext_boolean(n,tp) for(n = BOOLCOUNT; (int) n < (int) NUM_BOOLEANS(tp); n++)
-#define for_each_ext_number(n,tp)  for(n = NUMCOUNT; (int) n < (int) NUM_NUMBERS(tp);  n++)
-#define for_each_ext_string(n,tp)  for(n = STRCOUNT; (int) n < (int) NUM_STRINGS(tp);  n++)
-#endif
-
-#define ExtBoolname(tp,i,names) EXT_NAMES(tp, i, BOOLCOUNT, (i - (tp->num_Booleans - tp->ext_Booleans)), names)
-#define ExtNumname(tp,i,names)  EXT_NAMES(tp, i, NUMCOUNT, (i - (tp->num_Numbers - tp->ext_Numbers)) + tp->ext_Booleans, names)
-#define ExtStrname(tp,i,names)  EXT_NAMES(tp, i, STRCOUNT, (i - (tp->num_Strings - tp->ext_Strings)) + (tp->ext_Numbers + tp->ext_Booleans), names)
-
-extern NCURSES_EXPORT_VAR(ENTRY *) _nc_head;
-extern NCURSES_EXPORT_VAR(ENTRY *) _nc_tail;
-#define for_entry_list(qp)	for (qp = _nc_head; qp; qp = qp->next)
-
-#define MAX_LINE	132
-
-#define NULLHOOK        (bool(*)(ENTRY *))0
-
-/*
- * Note that WANTED and PRESENT are not simple inverses!  If a capability
- * has been explicitly cancelled, it's not considered WANTED.
- */
-#define WANTED(s)	((s) == ABSENT_STRING)
-#define PRESENT(s)	(((s) != ABSENT_STRING) && ((s) != CANCELLED_STRING))
-
-#define ANDMISSING(p,q) \
-		{if (PRESENT(p) && !PRESENT(q)) _nc_warning(#p " but no " #q);}
-
-#define PAIRED(p,q) \
-		{ \
-		if (PRESENT(q) && !PRESENT(p)) \
-			_nc_warning(#q " but no " #p); \
-		if (PRESENT(p) && !PRESENT(q)) \
-			_nc_warning(#p " but no " #q); \
-		}
-
-/* alloc_entry.c: elementary allocation code */
-extern NCURSES_EXPORT(ENTRY *) _nc_copy_entry (ENTRY *oldp);
-extern NCURSES_EXPORT(char *) _nc_save_str (const char *const);
-extern NCURSES_EXPORT(void) _nc_init_entry (TERMTYPE *const);
-extern NCURSES_EXPORT(void) _nc_merge_entry (TERMTYPE *const, TERMTYPE *const);
-extern NCURSES_EXPORT(void) _nc_wrap_entry (ENTRY *const, bool);
-
-/* alloc_ttype.c: elementary allocation code */
-extern NCURSES_EXPORT(void) _nc_align_termtype (TERMTYPE *, TERMTYPE *);
-extern NCURSES_EXPORT(void) _nc_copy_termtype (TERMTYPE *, const TERMTYPE *);
-
-/* free_ttype.c: elementary allocation code */
-extern NCURSES_EXPORT(void) _nc_free_termtype (TERMTYPE *);
-
-/* lib_acs.c */
-extern NCURSES_EXPORT(void) _nc_init_acs (void);	/* corresponds to traditional 'init_acs()' */
-
-/* lib_termcap.c: trim sgr0 string for termcap users */
-extern NCURSES_EXPORT(char *) _nc_trim_sgr0 (TERMTYPE *);
-
-/* parse_entry.c: entry-parsing code */
-#if NCURSES_XNAMES
-extern NCURSES_EXPORT_VAR(bool) _nc_user_definable;
-extern NCURSES_EXPORT_VAR(bool) _nc_disable_period;
-#endif
-extern NCURSES_EXPORT(int) _nc_parse_entry (ENTRY *, int, bool);
-extern NCURSES_EXPORT(int) _nc_capcmp (const char *, const char *);
-
-/* write_entry.c: writing an entry to the file system */
-extern NCURSES_EXPORT(void) _nc_set_writedir (const char *);
-extern NCURSES_EXPORT(void) _nc_write_entry (TERMTYPE *const);
-extern NCURSES_EXPORT(int) _nc_write_object(TERMTYPE *, char *, unsigned *, unsigned);
-
-/* comp_parse.c: entry list handling */
-extern NCURSES_EXPORT(void) _nc_read_entry_source (FILE*, char*, int, bool, bool (*)(ENTRY*));
-extern NCURSES_EXPORT(bool) _nc_entry_match (char *, char *);
-extern NCURSES_EXPORT(int) _nc_resolve_uses (bool); /* obs 20040705 */
-extern NCURSES_EXPORT(int) _nc_resolve_uses2 (bool, bool);
-extern NCURSES_EXPORT(void) _nc_free_entries (ENTRY *);
-extern NCURSES_IMPEXP void NCURSES_API (*_nc_check_termtype)(TERMTYPE *); /* obs 20040705 */
-extern NCURSES_IMPEXP void NCURSES_API (*_nc_check_termtype2)(TERMTYPE *, bool);
-
-/* trace_xnames.c */
-extern NCURSES_EXPORT(void) _nc_trace_xnames (TERMTYPE *);
-/* *INDENT-ON* */
-
-#ifdef __cplusplus
-}
-#endif
-#endif				/* NCURSES_TERM_ENTRY_H_incl */
diff --git a/openflow/usr/include/termcap.h b/openflow/usr/include/termcap.h
deleted file mode 100644
index 909c708..0000000
--- a/openflow/usr/include/termcap.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- ****************************************************************************/
-
-/* $Id: termcap.h.in,v 1.16 2001/03/24 21:53:27 tom Exp $ */
-
-#ifndef NCURSES_TERMCAP_H_incl
-#define NCURSES_TERMCAP_H_incl	1
-
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "6.0"
-
-#include <ncurses_dll.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <sys/types.h>
-
-#undef  NCURSES_CONST 
-#define NCURSES_CONST const 
-
-#undef  NCURSES_OSPEED 
-#define NCURSES_OSPEED short 
-
-extern NCURSES_EXPORT_VAR(char) PC;
-extern NCURSES_EXPORT_VAR(char *) UP;
-extern NCURSES_EXPORT_VAR(char *) BC;
-extern NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed; 
-
-#if !defined(NCURSES_TERM_H_incl)
-extern NCURSES_EXPORT(char *) tgetstr (NCURSES_CONST char *, char **);
-extern NCURSES_EXPORT(char *) tgoto (const char *, int, int);
-extern NCURSES_EXPORT(int) tgetent (char *, const char *);
-extern NCURSES_EXPORT(int) tgetflag (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tgetnum (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tputs (const char *, int, int (*)(int));
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NCURSES_TERMCAP_H_incl */
diff --git a/openflow/usr/include/termio.h b/openflow/usr/include/termio.h
deleted file mode 100644
index 0e610f0..0000000
--- a/openflow/usr/include/termio.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Compatible <termio.h> for old `struct termio' ioctl interface.
-   This is obsolete; use the POSIX.1 `struct termios' interface
-   defined in <termios.h> instead.  */
-
-#include <termios.h>
-#include <sys/ioctl.h>
diff --git a/openflow/usr/include/termios.h b/openflow/usr/include/termios.h
deleted file mode 100644
index a56bb88..0000000
--- a/openflow/usr/include/termios.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 7.1-2 General Terminal Interface	<termios.h>
- */
-
-#ifndef	_TERMIOS_H
-#define	_TERMIOS_H	1
-
-#include <features.h>
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
-/* We need `pid_t'.  */
-# include <bits/types.h>
-# ifndef __pid_t_defined
-typedef __pid_t pid_t;
-#  define __pid_t_defined
-# endif
-#endif
-
-__BEGIN_DECLS
-
-/* Get the system-dependent definitions of `struct termios', `tcflag_t',
-   `cc_t', `speed_t', and all the macros specifying the flag bits.  */
-#include <bits/termios.h>
-
-#ifdef __USE_MISC
-/* Compare a character C to a value VAL from the `c_cc' array in a
-   `struct termios'.  If VAL is _POSIX_VDISABLE, no character can match it.  */
-# define CCEQ(val, c)	((c) == (val) && (val) != _POSIX_VDISABLE)
-#endif
-
-/* Return the output baud rate stored in *TERMIOS_P.  */
-extern speed_t cfgetospeed (const struct termios *__termios_p) __THROW;
-
-/* Return the input baud rate stored in *TERMIOS_P.  */
-extern speed_t cfgetispeed (const struct termios *__termios_p) __THROW;
-
-/* Set the output baud rate stored in *TERMIOS_P to SPEED.  */
-extern int cfsetospeed (struct termios *__termios_p, speed_t __speed) __THROW;
-
-/* Set the input baud rate stored in *TERMIOS_P to SPEED.  */
-extern int cfsetispeed (struct termios *__termios_p, speed_t __speed) __THROW;
-
-#ifdef	__USE_MISC
-/* Set both the input and output baud rates in *TERMIOS_OP to SPEED.  */
-extern int cfsetspeed (struct termios *__termios_p, speed_t __speed) __THROW;
-#endif
-
-
-/* Put the state of FD into *TERMIOS_P.  */
-extern int tcgetattr (int __fd, struct termios *__termios_p) __THROW;
-
-/* Set the state of FD to *TERMIOS_P.
-   Values for OPTIONAL_ACTIONS (TCSA*) are in <bits/termios.h>.  */
-extern int tcsetattr (int __fd, int __optional_actions,
-		      const struct termios *__termios_p) __THROW;
-
-
-#ifdef	__USE_MISC
-/* Set *TERMIOS_P to indicate raw mode.  */
-extern void cfmakeraw (struct termios *__termios_p) __THROW;
-#endif
-
-/* Send zero bits on FD.  */
-extern int tcsendbreak (int __fd, int __duration) __THROW;
-
-/* Wait for pending output to be written on FD.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int tcdrain (int __fd);
-
-/* Flush pending data on FD.
-   Values for QUEUE_SELECTOR (TC{I,O,IO}FLUSH) are in <bits/termios.h>.  */
-extern int tcflush (int __fd, int __queue_selector) __THROW;
-
-/* Suspend or restart transmission on FD.
-   Values for ACTION (TC[IO]{OFF,ON}) are in <bits/termios.h>.  */
-extern int tcflow (int __fd, int __action) __THROW;
-
-
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
-/* Get process group ID for session leader for controlling terminal FD.  */
-extern __pid_t tcgetsid (int __fd) __THROW;
-#endif
-
-
-#ifdef __USE_MISC
-# include <sys/ttydefaults.h>
-#endif
-
-__END_DECLS
-
-#endif /* termios.h  */
diff --git a/openflow/usr/include/tgmath.h b/openflow/usr/include/tgmath.h
deleted file mode 100644
index ea2b611..0000000
--- a/openflow/usr/include/tgmath.h
+++ /dev/null
@@ -1,454 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.22 Type-generic math	<tgmath.h>
- */
-
-#ifndef _TGMATH_H
-#define _TGMATH_H	1
-
-/* Include the needed headers.  */
-#include <math.h>
-#include <complex.h>
-
-
-/* Since `complex' is currently not really implemented in most C compilers
-   and if it is implemented, the implementations differ.  This makes it
-   quite difficult to write a generic implementation of this header.  We
-   do not try this for now and instead concentrate only on GNU CC.  Once
-   we have more information support for other compilers might follow.  */
-
-#if __GNUC_PREREQ (2, 7)
-
-# ifdef __NO_LONG_DOUBLE_MATH
-#  define __tgml(fct) fct
-# else
-#  define __tgml(fct) fct ## l
-# endif
-
-/* This is ugly but unless gcc gets appropriate builtins we have to do
-   something like this.  Don't ask how it works.  */
-
-/* 1 if 'type' is a floating type, 0 if 'type' is an integer type.
-   Allows for _Bool.  Expands to an integer constant expression.  */
-# if __GNUC_PREREQ (3, 1)
-#  define __floating_type(type) \
-  (__builtin_classify_type ((type) 0) == 8 \
-   || (__builtin_classify_type ((type) 0) == 9 \
-       && __builtin_classify_type (__real__ ((type) 0)) == 8))
-# else
-#  define __floating_type(type) (((type) 0.25) && ((type) 0.25 - 1))
-# endif
-
-/* The tgmath real type for T, where E is 0 if T is an integer type and
-   1 for a floating type.  */
-# define __tgmath_real_type_sub(T, E) \
-  __typeof__ (*(0 ? (__typeof__ (0 ? (double *) 0 : (void *) (E))) 0	      \
-		  : (__typeof__ (0 ? (T *) 0 : (void *) (!(E)))) 0))
-
-/* The tgmath real type of EXPR.  */
-# define __tgmath_real_type(expr) \
-  __tgmath_real_type_sub (__typeof__ ((__typeof__ (expr)) 0),		      \
-			  __floating_type (__typeof__ (expr)))
-
-
-/* We have two kinds of generic macros: to support functions which are
-   only defined on real valued parameters and those which are defined
-   for complex functions as well.  */
-# define __TGMATH_UNARY_REAL_ONLY(Val, Fct) \
-     (__extension__ ((sizeof (Val) == sizeof (double)			      \
-		      || __builtin_classify_type (Val) != 8)		      \
-		     ? (__tgmath_real_type (Val)) Fct (Val)		      \
-		     : (sizeof (Val) == sizeof (float))			      \
-		     ? (__tgmath_real_type (Val)) Fct##f (Val)		      \
-		     : (__tgmath_real_type (Val)) __tgml(Fct) (Val)))
-
-# define __TGMATH_UNARY_REAL_RET_ONLY(Val, RetType, Fct) \
-     (__extension__ ((sizeof (Val) == sizeof (double)			      \
-		      || __builtin_classify_type (Val) != 8)		      \
-		     ? (RetType) Fct (Val)				      \
-		     : (sizeof (Val) == sizeof (float))			      \
-		     ? (RetType) Fct##f (Val)				      \
-		     : (RetType) __tgml(Fct) (Val)))
-
-# define __TGMATH_BINARY_FIRST_REAL_ONLY(Val1, Val2, Fct) \
-     (__extension__ ((sizeof (Val1) == sizeof (double)			      \
-		      || __builtin_classify_type (Val1) != 8)		      \
-		     ? (__tgmath_real_type (Val1)) Fct (Val1, Val2)	      \
-		     : (sizeof (Val1) == sizeof (float))		      \
-		     ? (__tgmath_real_type (Val1)) Fct##f (Val1, Val2)	      \
-		     : (__tgmath_real_type (Val1)) __tgml(Fct) (Val1, Val2)))
-
-# define __TGMATH_BINARY_REAL_ONLY(Val1, Val2, Fct) \
-     (__extension__ (((sizeof (Val1) > sizeof (double)			      \
-		       || sizeof (Val2) > sizeof (double))		      \
-		      && __builtin_classify_type ((Val1) + (Val2)) == 8)      \
-		     ? (__typeof ((__tgmath_real_type (Val1)) 0		      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-		       __tgml(Fct) (Val1, Val2)				      \
-		     : (sizeof (Val1) == sizeof (double)		      \
-			|| sizeof (Val2) == sizeof (double)		      \
-			|| __builtin_classify_type (Val1) != 8		      \
-			|| __builtin_classify_type (Val2) != 8)		      \
-		     ? (__typeof ((__tgmath_real_type (Val1)) 0		      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-		       Fct (Val1, Val2)					      \
-		     : (__typeof ((__tgmath_real_type (Val1)) 0		      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-		       Fct##f (Val1, Val2)))
-
-# define __TGMATH_TERNARY_FIRST_SECOND_REAL_ONLY(Val1, Val2, Val3, Fct) \
-     (__extension__ (((sizeof (Val1) > sizeof (double)			      \
-		       || sizeof (Val2) > sizeof (double))		      \
-		      && __builtin_classify_type ((Val1) + (Val2)) == 8)      \
-		     ? (__typeof ((__tgmath_real_type (Val1)) 0		      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-		       __tgml(Fct) (Val1, Val2, Val3)			      \
-		     : (sizeof (Val1) == sizeof (double)		      \
-			|| sizeof (Val2) == sizeof (double)		      \
-			|| __builtin_classify_type (Val1) != 8		      \
-			|| __builtin_classify_type (Val2) != 8)		      \
-		     ? (__typeof ((__tgmath_real_type (Val1)) 0		      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-		       Fct (Val1, Val2, Val3)				      \
-		     : (__typeof ((__tgmath_real_type (Val1)) 0		      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-		       Fct##f (Val1, Val2, Val3)))
-
-# define __TGMATH_TERNARY_REAL_ONLY(Val1, Val2, Val3, Fct) \
-     (__extension__ (((sizeof (Val1) > sizeof (double)			      \
-		       || sizeof (Val2) > sizeof (double)		      \
-		       || sizeof (Val3) > sizeof (double))		      \
-		      && __builtin_classify_type ((Val1) + (Val2) + (Val3))   \
-			 == 8)						      \
-		     ? (__typeof ((__tgmath_real_type (Val1)) 0		      \
-				   + (__tgmath_real_type (Val2)) 0	      \
-				   + (__tgmath_real_type (Val3)) 0))	      \
-		       __tgml(Fct) (Val1, Val2, Val3)			      \
-		     : (sizeof (Val1) == sizeof (double)		      \
-			|| sizeof (Val2) == sizeof (double)		      \
-			|| sizeof (Val3) == sizeof (double)		      \
-			|| __builtin_classify_type (Val1) != 8		      \
-			|| __builtin_classify_type (Val2) != 8		      \
-			|| __builtin_classify_type (Val3) != 8)		      \
-		     ? (__typeof ((__tgmath_real_type (Val1)) 0		      \
-				   + (__tgmath_real_type (Val2)) 0	      \
-				   + (__tgmath_real_type (Val3)) 0))	      \
-		       Fct (Val1, Val2, Val3)				      \
-		     : (__typeof ((__tgmath_real_type (Val1)) 0		      \
-				   + (__tgmath_real_type (Val2)) 0	      \
-				   + (__tgmath_real_type (Val3)) 0))	      \
-		       Fct##f (Val1, Val2, Val3)))
-
-/* XXX This definition has to be changed as soon as the compiler understands
-   the imaginary keyword.  */
-# define __TGMATH_UNARY_REAL_IMAG(Val, Fct, Cfct) \
-     (__extension__ ((sizeof (__real__ (Val)) == sizeof (double)	      \
-		      || __builtin_classify_type (__real__ (Val)) != 8)	      \
-		     ? ((sizeof (__real__ (Val)) == sizeof (Val))	      \
-			? (__tgmath_real_type (Val)) Fct (Val)		      \
-			: (__tgmath_real_type (Val)) Cfct (Val))	      \
-		     : (sizeof (__real__ (Val)) == sizeof (float))	      \
-		     ? ((sizeof (__real__ (Val)) == sizeof (Val))	      \
-			? (__tgmath_real_type (Val)) Fct##f (Val)	      \
-			: (__tgmath_real_type (Val)) Cfct##f (Val))	      \
-		     : ((sizeof (__real__ (Val)) == sizeof (Val))	      \
-			? (__tgmath_real_type (Val)) __tgml(Fct) (Val)	      \
-			: (__tgmath_real_type (Val)) __tgml(Cfct) (Val))))
-
-# define __TGMATH_UNARY_IMAG(Val, Cfct) \
-     (__extension__ ((sizeof (__real__ (Val)) == sizeof (double)	      \
-		      || __builtin_classify_type (__real__ (Val)) != 8)	      \
-		     ? (__typeof__ ((__tgmath_real_type (Val)) 0	      \
-				    + _Complex_I)) Cfct (Val)		      \
-		     : (sizeof (__real__ (Val)) == sizeof (float))	      \
-		     ? (__typeof__ ((__tgmath_real_type (Val)) 0	      \
-				    + _Complex_I)) Cfct##f (Val)	      \
-		     : (__typeof__ ((__tgmath_real_type (Val)) 0	      \
-				    + _Complex_I)) __tgml(Cfct) (Val)))
-
-/* XXX This definition has to be changed as soon as the compiler understands
-   the imaginary keyword.  */
-# define __TGMATH_UNARY_REAL_IMAG_RET_REAL(Val, Fct, Cfct) \
-     (__extension__ ((sizeof (__real__ (Val)) == sizeof (double)	      \
-		      || __builtin_classify_type (__real__ (Val)) != 8)	      \
-		     ? ((sizeof (__real__ (Val)) == sizeof (Val))	      \
-			? (__typeof__ (__real__ (__tgmath_real_type (Val)) 0))\
-			  Fct (Val)					      \
-			: (__typeof__ (__real__ (__tgmath_real_type (Val)) 0))\
-			  Cfct (Val))					      \
-		     : (sizeof (__real__ (Val)) == sizeof (float))	      \
-		     ? ((sizeof (__real__ (Val)) == sizeof (Val))	      \
-			? (__typeof__ (__real__ (__tgmath_real_type (Val)) 0))\
-			  Fct##f (Val)					      \
-			: (__typeof__ (__real__ (__tgmath_real_type (Val)) 0))\
-			  Cfct##f (Val))				      \
-		     : ((sizeof (__real__ (Val)) == sizeof (Val))	      \
-			? (__typeof__ (__real__ (__tgmath_real_type (Val)) 0))\
-			  __tgml(Fct) (Val)				      \
-			: (__typeof__ (__real__ (__tgmath_real_type (Val)) 0))\
-			  __tgml(Cfct) (Val))))
-
-/* XXX This definition has to be changed as soon as the compiler understands
-   the imaginary keyword.  */
-# define __TGMATH_BINARY_REAL_IMAG(Val1, Val2, Fct, Cfct) \
-     (__extension__ (((sizeof (__real__ (Val1)) > sizeof (double)	      \
-		       || sizeof (__real__ (Val2)) > sizeof (double))	      \
-		      && __builtin_classify_type (__real__ (Val1)	      \
-						  + __real__ (Val2)) == 8)    \
-		     ? ((sizeof (__real__ (Val1)) == sizeof (Val1)	      \
-			 && sizeof (__real__ (Val2)) == sizeof (Val2))	      \
-			? (__typeof ((__tgmath_real_type (Val1)) 0	      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-			  __tgml(Fct) (Val1, Val2)			      \
-			: (__typeof ((__tgmath_real_type (Val1)) 0	      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-			  __tgml(Cfct) (Val1, Val2))			      \
-		     : (sizeof (__real__ (Val1)) == sizeof (double)	      \
-			|| sizeof (__real__ (Val2)) == sizeof (double)	      \
-			|| __builtin_classify_type (__real__ (Val1)) != 8     \
-			|| __builtin_classify_type (__real__ (Val2)) != 8)    \
-		     ? ((sizeof (__real__ (Val1)) == sizeof (Val1)	      \
-			 && sizeof (__real__ (Val2)) == sizeof (Val2))	      \
-			? (__typeof ((__tgmath_real_type (Val1)) 0	      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-			  Fct (Val1, Val2)				      \
-			: (__typeof ((__tgmath_real_type (Val1)) 0	      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-			  Cfct (Val1, Val2))				      \
-		     : ((sizeof (__real__ (Val1)) == sizeof (Val1)	      \
-			 && sizeof (__real__ (Val2)) == sizeof (Val2))	      \
-			? (__typeof ((__tgmath_real_type (Val1)) 0	      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-			  Fct##f (Val1, Val2)				      \
-			: (__typeof ((__tgmath_real_type (Val1)) 0	      \
-				   + (__tgmath_real_type (Val2)) 0))	      \
-			  Cfct##f (Val1, Val2))))
-#else
-# error "Unsupported compiler; you cannot use <tgmath.h>"
-#endif
-
-
-/* Unary functions defined for real and complex values.  */
-
-
-/* Trigonometric functions.  */
-
-/* Arc cosine of X.  */
-#define acos(Val) __TGMATH_UNARY_REAL_IMAG (Val, acos, cacos)
-/* Arc sine of X.  */
-#define asin(Val) __TGMATH_UNARY_REAL_IMAG (Val, asin, casin)
-/* Arc tangent of X.  */
-#define atan(Val) __TGMATH_UNARY_REAL_IMAG (Val, atan, catan)
-/* Arc tangent of Y/X.  */
-#define atan2(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, atan2)
-
-/* Cosine of X.  */
-#define cos(Val) __TGMATH_UNARY_REAL_IMAG (Val, cos, ccos)
-/* Sine of X.  */
-#define sin(Val) __TGMATH_UNARY_REAL_IMAG (Val, sin, csin)
-/* Tangent of X.  */
-#define tan(Val) __TGMATH_UNARY_REAL_IMAG (Val, tan, ctan)
-
-
-/* Hyperbolic functions.  */
-
-/* Hyperbolic arc cosine of X.  */
-#define acosh(Val) __TGMATH_UNARY_REAL_IMAG (Val, acosh, cacosh)
-/* Hyperbolic arc sine of X.  */
-#define asinh(Val) __TGMATH_UNARY_REAL_IMAG (Val, asinh, casinh)
-/* Hyperbolic arc tangent of X.  */
-#define atanh(Val) __TGMATH_UNARY_REAL_IMAG (Val, atanh, catanh)
-
-/* Hyperbolic cosine of X.  */
-#define cosh(Val) __TGMATH_UNARY_REAL_IMAG (Val, cosh, ccosh)
-/* Hyperbolic sine of X.  */
-#define sinh(Val) __TGMATH_UNARY_REAL_IMAG (Val, sinh, csinh)
-/* Hyperbolic tangent of X.  */
-#define tanh(Val) __TGMATH_UNARY_REAL_IMAG (Val, tanh, ctanh)
-
-
-/* Exponential and logarithmic functions.  */
-
-/* Exponential function of X.  */
-#define exp(Val) __TGMATH_UNARY_REAL_IMAG (Val, exp, cexp)
-
-/* Break VALUE into a normalized fraction and an integral power of 2.  */
-#define frexp(Val1, Val2) __TGMATH_BINARY_FIRST_REAL_ONLY (Val1, Val2, frexp)
-
-/* X times (two to the EXP power).  */
-#define ldexp(Val1, Val2) __TGMATH_BINARY_FIRST_REAL_ONLY (Val1, Val2, ldexp)
-
-/* Natural logarithm of X.  */
-#define log(Val) __TGMATH_UNARY_REAL_IMAG (Val, log, clog)
-
-/* Base-ten logarithm of X.  */
-#ifdef __USE_GNU
-# define log10(Val) __TGMATH_UNARY_REAL_IMAG (Val, log10, __clog10)
-#else
-# define log10(Val) __TGMATH_UNARY_REAL_ONLY (Val, log10)
-#endif
-
-/* Return exp(X) - 1.  */
-#define expm1(Val) __TGMATH_UNARY_REAL_ONLY (Val, expm1)
-
-/* Return log(1 + X).  */
-#define log1p(Val) __TGMATH_UNARY_REAL_ONLY (Val, log1p)
-
-/* Return the base 2 signed integral exponent of X.  */
-#define logb(Val) __TGMATH_UNARY_REAL_ONLY (Val, logb)
-
-/* Compute base-2 exponential of X.  */
-#define exp2(Val) __TGMATH_UNARY_REAL_ONLY (Val, exp2)
-
-/* Compute base-2 logarithm of X.  */
-#define log2(Val) __TGMATH_UNARY_REAL_ONLY (Val, log2)
-
-
-/* Power functions.  */
-
-/* Return X to the Y power.  */
-#define pow(Val1, Val2) __TGMATH_BINARY_REAL_IMAG (Val1, Val2, pow, cpow)
-
-/* Return the square root of X.  */
-#define sqrt(Val) __TGMATH_UNARY_REAL_IMAG (Val, sqrt, csqrt)
-
-/* Return `sqrt(X*X + Y*Y)'.  */
-#define hypot(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, hypot)
-
-/* Return the cube root of X.  */
-#define cbrt(Val) __TGMATH_UNARY_REAL_ONLY (Val, cbrt)
-
-
-/* Nearest integer, absolute value, and remainder functions.  */
-
-/* Smallest integral value not less than X.  */
-#define ceil(Val) __TGMATH_UNARY_REAL_ONLY (Val, ceil)
-
-/* Absolute value of X.  */
-#define fabs(Val) __TGMATH_UNARY_REAL_IMAG_RET_REAL (Val, fabs, cabs)
-
-/* Largest integer not greater than X.  */
-#define floor(Val) __TGMATH_UNARY_REAL_ONLY (Val, floor)
-
-/* Floating-point modulo remainder of X/Y.  */
-#define fmod(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, fmod)
-
-/* Round X to integral valuein floating-point format using current
-   rounding direction, but do not raise inexact exception.  */
-#define nearbyint(Val) __TGMATH_UNARY_REAL_ONLY (Val, nearbyint)
-
-/* Round X to nearest integral value, rounding halfway cases away from
-   zero.  */
-#define round(Val) __TGMATH_UNARY_REAL_ONLY (Val, round)
-
-/* Round X to the integral value in floating-point format nearest but
-   not larger in magnitude.  */
-#define trunc(Val) __TGMATH_UNARY_REAL_ONLY (Val, trunc)
-
-/* Compute remainder of X and Y and put in *QUO a value with sign of x/y
-   and magnitude congruent `mod 2^n' to the magnitude of the integral
-   quotient x/y, with n >= 3.  */
-#define remquo(Val1, Val2, Val3) \
-     __TGMATH_TERNARY_FIRST_SECOND_REAL_ONLY (Val1, Val2, Val3, remquo)
-
-/* Round X to nearest integral value according to current rounding
-   direction.  */
-#define lrint(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, long int, lrint)
-#define llrint(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, long long int, llrint)
-
-/* Round X to nearest integral value, rounding halfway cases away from
-   zero.  */
-#define lround(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, long int, lround)
-#define llround(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, long long int, llround)
-
-
-/* Return X with its signed changed to Y's.  */
-#define copysign(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, copysign)
-
-/* Error and gamma functions.  */
-#define erf(Val) __TGMATH_UNARY_REAL_ONLY (Val, erf)
-#define erfc(Val) __TGMATH_UNARY_REAL_ONLY (Val, erfc)
-#define tgamma(Val) __TGMATH_UNARY_REAL_ONLY (Val, tgamma)
-#define lgamma(Val) __TGMATH_UNARY_REAL_ONLY (Val, lgamma)
-
-
-/* Return the integer nearest X in the direction of the
-   prevailing rounding mode.  */
-#define rint(Val) __TGMATH_UNARY_REAL_ONLY (Val, rint)
-
-/* Return X + epsilon if X < Y, X - epsilon if X > Y.  */
-#define nextafter(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, nextafter)
-#define nexttoward(Val1, Val2) \
-     __TGMATH_BINARY_FIRST_REAL_ONLY (Val1, Val2, nexttoward)
-
-/* Return the remainder of integer divison X / Y with infinite precision.  */
-#define remainder(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, remainder)
-
-/* Return X times (2 to the Nth power).  */
-#ifdef __USE_MISC
-# define scalb(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, scalb)
-#endif
-
-/* Return X times (2 to the Nth power).  */
-#define scalbn(Val1, Val2) __TGMATH_BINARY_FIRST_REAL_ONLY (Val1, Val2, scalbn)
-
-/* Return X times (2 to the Nth power).  */
-#define scalbln(Val1, Val2) \
-     __TGMATH_BINARY_FIRST_REAL_ONLY (Val1, Val2, scalbln)
-
-/* Return the binary exponent of X, which must be nonzero.  */
-#define ilogb(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, int, ilogb)
-
-
-/* Return positive difference between X and Y.  */
-#define fdim(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, fdim)
-
-/* Return maximum numeric value from X and Y.  */
-#define fmax(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, fmax)
-
-/* Return minimum numeric value from X and Y.  */
-#define fmin(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, fmin)
-
-
-/* Multiply-add function computed as a ternary operation.  */
-#define fma(Val1, Val2, Val3) \
-     __TGMATH_TERNARY_REAL_ONLY (Val1, Val2, Val3, fma)
-
-
-/* Absolute value, conjugates, and projection.  */
-
-/* Argument value of Z.  */
-#define carg(Val) __TGMATH_UNARY_REAL_IMAG_RET_REAL (Val, carg, carg)
-
-/* Complex conjugate of Z.  */
-#define conj(Val) __TGMATH_UNARY_IMAG (Val, conj)
-
-/* Projection of Z onto the Riemann sphere.  */
-#define cproj(Val) __TGMATH_UNARY_IMAG (Val, cproj)
-
-
-/* Decomposing complex values.  */
-
-/* Imaginary part of Z.  */
-#define cimag(Val) __TGMATH_UNARY_REAL_IMAG_RET_REAL (Val, cimag, cimag)
-
-/* Real part of Z.  */
-#define creal(Val) __TGMATH_UNARY_REAL_IMAG_RET_REAL (Val, creal, creal)
-
-#endif /* tgmath.h */
diff --git a/openflow/usr/include/thread_db.h b/openflow/usr/include/thread_db.h
deleted file mode 100644
index abb95df..0000000
--- a/openflow/usr/include/thread_db.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/* thread_db.h -- interface to libthread_db.so library for debugging -lpthread
-   Copyright (C) 1999-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _THREAD_DB_H
-#define _THREAD_DB_H	1
-
-/* This is the debugger interface for the NPTL library.  It is
-   modelled closely after the interface with same names in Solaris
-   with the goal to share the same code in the debugger.  */
-#include <pthread.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <sys/procfs.h>
-
-
-/* Error codes of the library.  */
-typedef enum
-{
-  TD_OK,	  /* No error.  */
-  TD_ERR,	  /* No further specified error.  */
-  TD_NOTHR,	  /* No matching thread found.  */
-  TD_NOSV,	  /* No matching synchronization handle found.  */
-  TD_NOLWP,	  /* No matching light-weighted process found.  */
-  TD_BADPH,	  /* Invalid process handle.  */
-  TD_BADTH,	  /* Invalid thread handle.  */
-  TD_BADSH,	  /* Invalid synchronization handle.  */
-  TD_BADTA,	  /* Invalid thread agent.  */
-  TD_BADKEY,	  /* Invalid key.  */
-  TD_NOMSG,	  /* No event available.  */
-  TD_NOFPREGS,	  /* No floating-point register content available.  */
-  TD_NOLIBTHREAD, /* Application not linked with thread library.  */
-  TD_NOEVENT,	  /* Requested event is not supported.  */
-  TD_NOCAPAB,	  /* Capability not available.  */
-  TD_DBERR,	  /* Internal debug library error.  */
-  TD_NOAPLIC,	  /* Operation is not applicable.  */
-  TD_NOTSD,	  /* No thread-specific data available.  */
-  TD_MALLOC,	  /* Out of memory.  */
-  TD_PARTIALREG,  /* Not entire register set was read or written.  */
-  TD_NOXREGS,	  /* X register set not available for given thread.  */
-  TD_TLSDEFER,	  /* Thread has not yet allocated TLS for given module.  */
-  TD_NOTALLOC = TD_TLSDEFER,
-  TD_VERSION,	  /* Version if libpthread and libthread_db do not match.  */
-  TD_NOTLS	  /* There is no TLS segment in the given module.  */
-} td_err_e;
-
-
-/* Possible thread states.  TD_THR_ANY_STATE is a pseudo-state used to
-   select threads regardless of state in td_ta_thr_iter().  */
-typedef enum
-{
-  TD_THR_ANY_STATE,
-  TD_THR_UNKNOWN,
-  TD_THR_STOPPED,
-  TD_THR_RUN,
-  TD_THR_ACTIVE,
-  TD_THR_ZOMBIE,
-  TD_THR_SLEEP,
-  TD_THR_STOPPED_ASLEEP
-} td_thr_state_e;
-
-/* Thread type: user or system.  TD_THR_ANY_TYPE is a pseudo-type used
-   to select threads regardless of type in td_ta_thr_iter().  */
-typedef enum
-{
-  TD_THR_ANY_TYPE,
-  TD_THR_USER,
-  TD_THR_SYSTEM
-} td_thr_type_e;
-
-
-/* Types of the debugging library.  */
-
-/* Handle for a process.  This type is opaque.  */
-typedef struct td_thragent td_thragent_t;
-
-/* The actual thread handle type.  This is also opaque.  */
-typedef struct td_thrhandle
-{
-  td_thragent_t *th_ta_p;
-  psaddr_t th_unique;
-} td_thrhandle_t;
-
-
-/* Forward declaration of a type defined by and for the dynamic linker.  */
-struct link_map;
-
-
-/* Flags for `td_ta_thr_iter'.  */
-#define TD_THR_ANY_USER_FLAGS	0xffffffff
-#define TD_THR_LOWEST_PRIORITY	-20
-#define TD_SIGNO_MASK		NULL
-
-
-#define TD_EVENTSIZE	2
-#define BT_UISHIFT	5 /* log base 2 of BT_NBIPUI, to extract word index */
-#define BT_NBIPUI	(1 << BT_UISHIFT)       /* n bits per uint */
-#define BT_UIMASK	(BT_NBIPUI - 1)         /* to extract bit index */
-
-/* Bitmask of enabled events. */
-typedef struct td_thr_events
-{
-  uint32_t event_bits[TD_EVENTSIZE];
-} td_thr_events_t;
-
-/* Event set manipulation macros. */
-#define __td_eventmask(n) \
-  (UINT32_C (1) << (((n) - 1) & BT_UIMASK))
-#define __td_eventword(n) \
-  ((UINT32_C ((n) - 1)) >> BT_UISHIFT)
-
-#define td_event_emptyset(setp) \
-  do {									      \
-    int __i;								      \
-    for (__i = TD_EVENTSIZE; __i > 0; --__i)				      \
-      (setp)->event_bits[__i - 1] = 0;					      \
-  } while (0)
-
-#define td_event_fillset(setp) \
-  do {									      \
-    int __i;								      \
-    for (__i = TD_EVENTSIZE; __i > 0; --__i)				      \
-      (setp)->event_bits[__i - 1] = UINT32_C (0xffffffff);		      \
-  } while (0)
-
-#define td_event_addset(setp, n) \
-  (((setp)->event_bits[__td_eventword (n)]) |= __td_eventmask (n))
-#define td_event_delset(setp, n) \
-  (((setp)->event_bits[__td_eventword (n)]) &= ~__td_eventmask (n))
-#define td_eventismember(setp, n) \
-  (__td_eventmask (n) & ((setp)->event_bits[__td_eventword (n)]))
-#if TD_EVENTSIZE == 2
-# define td_eventisempty(setp) \
-  (!((setp)->event_bits[0]) && !((setp)->event_bits[1]))
-#else
-# error "td_eventisempty must be changed to match TD_EVENTSIZE"
-#endif
-
-/* Events reportable by the thread implementation.  */
-typedef enum
-{
-  TD_ALL_EVENTS,		 /* Pseudo-event number.  */
-  TD_EVENT_NONE = TD_ALL_EVENTS, /* Depends on context.  */
-  TD_READY,			 /* Is executable now. */
-  TD_SLEEP,			 /* Blocked in a synchronization obj.  */
-  TD_SWITCHTO,			 /* Now assigned to a process.  */
-  TD_SWITCHFROM,		 /* Not anymore assigned to a process.  */
-  TD_LOCK_TRY,			 /* Trying to get an unavailable lock.  */
-  TD_CATCHSIG,			 /* Signal posted to the thread.  */
-  TD_IDLE,			 /* Process getting idle.  */
-  TD_CREATE,			 /* New thread created.  */
-  TD_DEATH,			 /* Thread terminated.  */
-  TD_PREEMPT,			 /* Preempted.  */
-  TD_PRI_INHERIT,		 /* Inherited elevated priority.  */
-  TD_REAP,			 /* Reaped.  */
-  TD_CONCURRENCY,		 /* Number of processes changing.  */
-  TD_TIMEOUT,			 /* Conditional variable wait timed out.  */
-  TD_MIN_EVENT_NUM = TD_READY,
-  TD_MAX_EVENT_NUM = TD_TIMEOUT,
-  TD_EVENTS_ENABLE = 31		/* Event reporting enabled.  */
-} td_event_e;
-
-/* Values representing the different ways events are reported.  */
-typedef enum
-{
-  NOTIFY_BPT,			/* User must insert breakpoint at u.bptaddr. */
-  NOTIFY_AUTOBPT,		/* Breakpoint at u.bptaddr is automatically
-				   inserted.  */
-  NOTIFY_SYSCALL		/* System call u.syscallno will be invoked.  */
-} td_notify_e;
-
-/* Description how event type is reported.  */
-typedef struct td_notify
-{
-  td_notify_e type;		/* Way the event is reported.  */
-  union
-  {
-    psaddr_t bptaddr;		/* Address of breakpoint.  */
-    int syscallno;		/* Number of system call used.  */
-  } u;
-} td_notify_t;
-
-/* Structure used to report event.  */
-typedef struct td_event_msg
-{
-  td_event_e event;		/* Event type being reported.  */
-  const td_thrhandle_t *th_p;	/* Thread reporting the event.  */
-  union
-  {
-# if 0
-    td_synchandle_t *sh;	/* Handle of synchronization object.  */
-#endif
-    uintptr_t data;		/* Event specific data.  */
-  } msg;
-} td_event_msg_t;
-
-/* Structure containing event data available in each thread structure.  */
-typedef struct
-{
-  td_thr_events_t eventmask;	/* Mask of enabled events.  */
-  td_event_e eventnum;		/* Number of last event.  */
-  void *eventdata;		/* Data associated with event.  */
-} td_eventbuf_t;
-
-
-/* Gathered statistics about the process.  */
-typedef struct td_ta_stats
-{
-  int nthreads;       		/* Total number of threads in use.  */
-  int r_concurrency;		/* Concurrency level requested by user.  */
-  int nrunnable_num;		/* Average runnable threads, numerator.  */
-  int nrunnable_den;		/* Average runnable threads, denominator.  */
-  int a_concurrency_num;	/* Achieved concurrency level, numerator.  */
-  int a_concurrency_den;	/* Achieved concurrency level, denominator.  */
-  int nlwps_num;		/* Average number of processes in use,
-				   numerator.  */
-  int nlwps_den;		/* Average number of processes in use,
-				   denominator.  */
-  int nidle_num;		/* Average number of idling processes,
-				   numerator.  */
-  int nidle_den;		/* Average number of idling processes,
-				   denominator.  */
-} td_ta_stats_t;
-
-
-/* Since Sun's library is based on Solaris threads we have to define a few
-   types to map them to POSIX threads.  */
-typedef pthread_t thread_t;
-typedef pthread_key_t thread_key_t;
-
-
-/* Callback for iteration over threads.  */
-typedef int td_thr_iter_f (const td_thrhandle_t *, void *);
-
-/* Callback for iteration over thread local data.  */
-typedef int td_key_iter_f (thread_key_t, void (*) (void *), void *);
-
-
-
-/* Forward declaration.  This has to be defined by the user.  */
-struct ps_prochandle;
-
-
-/* Information about the thread.  */
-typedef struct td_thrinfo
-{
-  td_thragent_t *ti_ta_p;		/* Process handle.  */
-  unsigned int ti_user_flags;		/* Unused.  */
-  thread_t ti_tid;			/* Thread ID returned by
-					   pthread_create().  */
-  char *ti_tls;				/* Pointer to thread-local data.  */
-  psaddr_t ti_startfunc;		/* Start function passed to
-					   pthread_create().  */
-  psaddr_t ti_stkbase;			/* Base of thread's stack.  */
-  long int ti_stksize;			/* Size of thread's stack.  */
-  psaddr_t ti_ro_area;			/* Unused.  */
-  int ti_ro_size;			/* Unused.  */
-  td_thr_state_e ti_state;		/* Thread state.  */
-  unsigned char ti_db_suspended;	/* Nonzero if suspended by debugger. */
-  td_thr_type_e ti_type;		/* Type of the thread (system vs
-					   user thread).  */
-  intptr_t ti_pc;			/* Unused.  */
-  intptr_t ti_sp;			/* Unused.  */
-  short int ti_flags;			/* Unused.  */
-  int ti_pri;				/* Thread priority.  */
-  lwpid_t ti_lid;			/* Kernel PID for this thread.  */
-  sigset_t ti_sigmask;			/* Signal mask.  */
-  unsigned char ti_traceme;		/* Nonzero if event reporting
-					   enabled.  */
-  unsigned char ti_preemptflag;		/* Unused.  */
-  unsigned char ti_pirecflag;		/* Unused.  */
-  sigset_t ti_pending;			/* Set of pending signals.  */
-  td_thr_events_t ti_events;		/* Set of enabled events.  */
-} td_thrinfo_t;
-
-
-
-/* Prototypes for exported library functions.  */
-
-/* Initialize the thread debug support library.  */
-extern td_err_e td_init (void);
-
-/* Historical relict.  Should not be used anymore.  */
-extern td_err_e td_log (void);
-
-/* Return list of symbols the library can request.  */
-extern const char **td_symbol_list (void);
-
-/* Generate new thread debug library handle for process PS.  */
-extern td_err_e td_ta_new (struct ps_prochandle *__ps, td_thragent_t **__ta);
-
-/* Free resources allocated for TA.  */
-extern td_err_e td_ta_delete (td_thragent_t *__ta);
-
-/* Get number of currently running threads in process associated with TA.  */
-extern td_err_e td_ta_get_nthreads (const td_thragent_t *__ta, int *__np);
-
-/* Return process handle passed in `td_ta_new' for process associated with
-   TA.  */
-extern td_err_e td_ta_get_ph (const td_thragent_t *__ta,
-			      struct ps_prochandle **__ph);
-
-/* Map thread library handle PT to thread debug library handle for process
-   associated with TA and store result in *TH.  */
-extern td_err_e td_ta_map_id2thr (const td_thragent_t *__ta, pthread_t __pt,
-				  td_thrhandle_t *__th);
-
-/* Map process ID LWPID to thread debug library handle for process
-   associated with TA and store result in *TH.  */
-extern td_err_e td_ta_map_lwp2thr (const td_thragent_t *__ta, lwpid_t __lwpid,
-				   td_thrhandle_t *__th);
-
-
-/* Call for each thread in a process associated with TA the callback function
-   CALLBACK.  */
-extern td_err_e td_ta_thr_iter (const td_thragent_t *__ta,
-				td_thr_iter_f *__callback, void *__cbdata_p,
-				td_thr_state_e __state, int __ti_pri,
-				sigset_t *__ti_sigmask_p,
-				unsigned int __ti_user_flags);
-
-/* Call for each defined thread local data entry the callback function KI.  */
-extern td_err_e td_ta_tsd_iter (const td_thragent_t *__ta, td_key_iter_f *__ki,
-				void *__p);
-
-
-/* Get event address for EVENT.  */
-extern td_err_e td_ta_event_addr (const td_thragent_t *__ta,
-				  td_event_e __event, td_notify_t *__ptr);
-
-/* Enable EVENT in global mask.  */
-extern td_err_e td_ta_set_event (const td_thragent_t *__ta,
-				 td_thr_events_t *__event);
-
-/* Disable EVENT in global mask.  */
-extern td_err_e td_ta_clear_event (const td_thragent_t *__ta,
-				   td_thr_events_t *__event);
-
-/* Return information about last event.  */
-extern td_err_e td_ta_event_getmsg (const td_thragent_t *__ta,
-				    td_event_msg_t *__msg);
-
-
-/* Set suggested concurrency level for process associated with TA.  */
-extern td_err_e td_ta_setconcurrency (const td_thragent_t *__ta, int __level);
-
-
-/* Enable collecting statistics for process associated with TA.  */
-extern td_err_e td_ta_enable_stats (const td_thragent_t *__ta, int __enable);
-
-/* Reset statistics.  */
-extern td_err_e td_ta_reset_stats (const td_thragent_t *__ta);
-
-/* Retrieve statistics from process associated with TA.  */
-extern td_err_e td_ta_get_stats (const td_thragent_t *__ta,
-				 td_ta_stats_t *__statsp);
-
-
-/* Validate that TH is a thread handle.  */
-extern td_err_e td_thr_validate (const td_thrhandle_t *__th);
-
-/* Return information about thread TH.  */
-extern td_err_e td_thr_get_info (const td_thrhandle_t *__th,
-				 td_thrinfo_t *__infop);
-
-/* Retrieve floating-point register contents of process running thread TH.  */
-extern td_err_e td_thr_getfpregs (const td_thrhandle_t *__th,
-				  prfpregset_t *__regset);
-
-/* Retrieve general register contents of process running thread TH.  */
-extern td_err_e td_thr_getgregs (const td_thrhandle_t *__th,
-				 prgregset_t __gregs);
-
-/* Retrieve extended register contents of process running thread TH.  */
-extern td_err_e td_thr_getxregs (const td_thrhandle_t *__th, void *__xregs);
-
-/* Get size of extended register set of process running thread TH.  */
-extern td_err_e td_thr_getxregsize (const td_thrhandle_t *__th, int *__sizep);
-
-/* Set floating-point register contents of process running thread TH.  */
-extern td_err_e td_thr_setfpregs (const td_thrhandle_t *__th,
-				  const prfpregset_t *__fpregs);
-
-/* Set general register contents of process running thread TH.  */
-extern td_err_e td_thr_setgregs (const td_thrhandle_t *__th,
-				 prgregset_t __gregs);
-
-/* Set extended register contents of process running thread TH.  */
-extern td_err_e td_thr_setxregs (const td_thrhandle_t *__th,
-				 const void *__addr);
-
-
-/* Get address of the given module's TLS storage area for the given thread.  */
-extern td_err_e td_thr_tlsbase (const td_thrhandle_t *__th,
-				unsigned long int __modid,
-				psaddr_t *__base);
-
-/* Get address of thread local variable.  */
-extern td_err_e td_thr_tls_get_addr (const td_thrhandle_t *__th,
-				     psaddr_t __map_address, size_t __offset,
-				     psaddr_t *__address);
-
-
-/* Enable reporting for EVENT for thread TH.  */
-extern td_err_e td_thr_event_enable (const td_thrhandle_t *__th, int __event);
-
-/* Enable EVENT for thread TH.  */
-extern td_err_e td_thr_set_event (const td_thrhandle_t *__th,
-				  td_thr_events_t *__event);
-
-/* Disable EVENT for thread TH.  */
-extern td_err_e td_thr_clear_event (const td_thrhandle_t *__th,
-				    td_thr_events_t *__event);
-
-/* Get event message for thread TH.  */
-extern td_err_e td_thr_event_getmsg (const td_thrhandle_t *__th,
-				     td_event_msg_t *__msg);
-
-
-/* Set priority of thread TH.  */
-extern td_err_e td_thr_setprio (const td_thrhandle_t *__th, int __prio);
-
-
-/* Set pending signals for thread TH.  */
-extern td_err_e td_thr_setsigpending (const td_thrhandle_t *__th,
-				      unsigned char __n, const sigset_t *__ss);
-
-/* Set signal mask for thread TH.  */
-extern td_err_e td_thr_sigsetmask (const td_thrhandle_t *__th,
-				   const sigset_t *__ss);
-
-
-/* Return thread local data associated with key TK in thread TH.  */
-extern td_err_e td_thr_tsd (const td_thrhandle_t *__th,
-			    const thread_key_t __tk, void **__data);
-
-
-/* Suspend execution of thread TH.  */
-extern td_err_e td_thr_dbsuspend (const td_thrhandle_t *__th);
-
-/* Resume execution of thread TH.  */
-extern td_err_e td_thr_dbresume (const td_thrhandle_t *__th);
-
-#endif	/* thread_db.h */
diff --git a/openflow/usr/include/tic.h b/openflow/usr/include/tic.h
deleted file mode 100644
index 528a1b7..0000000
--- a/openflow/usr/include/tic.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- *     and: Thomas E. Dickey 1996 on                                        *
- ****************************************************************************/
-
-/*
- * $Id: tic.h,v 1.69 2012/03/17 18:22:10 tom Exp $
- *	tic.h - Global variables and structures for the terminfo
- *			compiler.
- */
-
-#ifndef __TIC_H
-#define __TIC_H
-/* *INDENT-OFF* */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <curses.h>	/* for the _tracef() prototype, ERR/OK, bool defs */
-
-/*
-** The format of compiled terminfo files is as follows:
-**
-**		Header (12 bytes), containing information given below
-**		Names Section, containing the names of the terminal
-**		Boolean Section, containing the values of all of the
-**				boolean capabilities
-**				A null byte may be inserted here to make
-**				sure that the Number Section begins on an
-**				even word boundary.
-**		Number Section, containing the values of all of the numeric
-**				capabilities, each as a short integer
-**		String Section, containing short integer offsets into the
-**				String Table, one per string capability
-**		String Table, containing the actual characters of the string
-**				capabilities.
-**
-**	NOTE that all short integers in the file are stored using VAX/PDP-style
-**	byte-order, i.e., least-significant byte first.
-**
-**	There is no structure definition here because it would only confuse
-**	matters.  Terminfo format is a raw byte layout, not a structure
-**	dump.  If you happen to be on a little-endian machine with 16-bit
-**	shorts that requires no padding between short members in a struct,
-**	then there is a natural C structure that captures the header, but
-**	not very helpfully.
-*/
-
-#define MAGIC		0432	/* first two bytes of a compiled entry */
-
-#undef  BYTE
-#define BYTE(p,n)	(unsigned char)((p)[n])
-
-#define IS_NEG1(p)	((BYTE(p,0) == 0377) && (BYTE(p,1) == 0377))
-#define IS_NEG2(p)	((BYTE(p,0) == 0376) && (BYTE(p,1) == 0377))
-#define LOW_MSB(p)	(BYTE(p,0) + 256*BYTE(p,1))
-
-#define IS_TIC_MAGIC(p)	(LOW_MSB(p) == MAGIC)
-
-/*
- * The "maximum" here is misleading; XSI guarantees minimum values, which a
- * given implementation may exceed.
- */
-#define MAX_NAME_SIZE	512	/* maximum legal name field size (XSI:127) */
-#define MAX_ENTRY_SIZE	4096	/* maximum legal entry size */
-
-/*
- * The maximum size of individual name or alias is guaranteed in XSI to be at
- * least 14, since that corresponds to the older filename lengths.  Newer
- * systems allow longer aliases, though not many terminal descriptions are
- * written to use them.  The MAX_ALIAS symbol is used for warnings.
- */
-#if HAVE_LONG_FILE_NAMES
-#define MAX_ALIAS	32	/* smaller than POSIX minimum for PATH_MAX */
-#else
-#define MAX_ALIAS	14	/* SVr3 filename length */
-#endif
-
-/* location of user's personal info directory */
-#define PRIVATE_INFO	"%s/.terminfo"	/* plug getenv("HOME") into %s */
-
-/*
- * Some traces are designed to be used via tic's verbose option (and similar in
- * infocmp and toe) rather than the 'trace()' function.  So we use the bits
- * above the normal trace() parameter as a debug-level.
- */
-
-#define MAX_DEBUG_LEVEL 15
-#define DEBUG_LEVEL(n)	((n) << TRACE_SHIFT)
-
-#define set_trace_level(n) \
-	_nc_tracing &= DEBUG_LEVEL(MAX_DEBUG_LEVEL), \
-	_nc_tracing |= DEBUG_LEVEL(n)
-
-#ifdef TRACE
-#define DEBUG(n, a)	if (_nc_tracing >= DEBUG_LEVEL(n)) _tracef a
-#else
-#define DEBUG(n, a)	/*nothing*/
-#endif
-
-extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
-extern NCURSES_EXPORT(void) _nc_tracef (char *, ...) GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
-extern NCURSES_EXPORT(const char *) _nc_visbuf2 (int, const char *);
-
-/*
- * These are the types of tokens returned by the scanner.  The first
- * three are also used in the hash table of capability names.  The scanner
- * returns one of these values after loading the specifics into the global
- * structure curr_token.
- */
-
-#define BOOLEAN 0		/* Boolean capability */
-#define NUMBER 1		/* Numeric capability */
-#define STRING 2		/* String-valued capability */
-#define CANCEL 3		/* Capability to be cancelled in following tc's */
-#define NAMES  4		/* The names for a terminal type */
-#define UNDEF  5		/* Undefined */
-
-#define NO_PUSHBACK	-1	/* used in pushtype to indicate no pushback */
-
-	/*
-	 *	The global structure in which the specific parts of a
-	 *	scanned token are returned.
-	 *
-	 */
-
-struct token
-{
-	char	*tk_name;		/* name of capability */
-	int	tk_valnumber;	/* value of capability (if a number) */
-	char	*tk_valstring;	/* value of capability (if a string) */
-};
-
-extern NCURSES_EXPORT_VAR(struct token)	_nc_curr_token;
-
-	/*
-	 * Offsets to string capabilities, with the corresponding functionkey
-	 * codes.
-	 */
-struct tinfo_fkeys {
-	unsigned offset;
-	chtype code;
-	};
-
-#if	BROKEN_LINKER
-
-#define	_nc_tinfo_fkeys	_nc_tinfo_fkeysf()
-extern NCURSES_EXPORT(const struct tinfo_fkeys *) _nc_tinfo_fkeysf (void);
-
-#else
-
-extern NCURSES_EXPORT_VAR(const struct tinfo_fkeys) _nc_tinfo_fkeys[];
-
-#endif
-
-typedef short HashValue;
-
-	/*
-	 * The file comp_captab.c contains an array of these structures, one
-	 * per possible capability.  These are indexed by a hash table array of
-	 * pointers to the same structures for use by the parser.
-	 */
-
-struct name_table_entry
-{
-	const char *nte_name;	/* name to hash on */
-	int	nte_type;	/* BOOLEAN, NUMBER or STRING */
-	HashValue nte_index;	/* index of associated variable in its array */
-	HashValue nte_link;	/* index in table of next hash, or -1 */
-};
-
-	/*
-	 * Use this structure to hide differences between terminfo and termcap
-	 * tables.
-	 */
-typedef struct {
-	unsigned table_size;
-	const HashValue *table_data;
-	HashValue (*hash_of)(const char *);
-	int (*compare_names)(const char *, const char *);
-} HashData;
-
-struct alias
-{
-	const char	*from;
-	const char	*to;
-	const char	*source;
-};
-
-extern NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool);
-extern NCURSES_EXPORT(const HashData *) _nc_get_hash_info (bool);
-extern NCURSES_EXPORT(const HashValue *) _nc_get_hash_table (bool);
-extern NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool);
-
-#define NOTFOUND	((struct name_table_entry *) 0)
-
-/*
- * The casts are required for correct sign-propagation with systems such as
- * AIX, IRIX64, Solaris which default to unsigned characters.  The C standard
- * leaves this detail unspecified.
- */
-
-/* out-of-band values for representing absent capabilities */
-#define ABSENT_BOOLEAN		((signed char)-1)	/* 255 */
-#define ABSENT_NUMERIC		(-1)
-#define ABSENT_STRING		(char *)0
-
-/* out-of-band values for representing cancels */
-#define CANCELLED_BOOLEAN	((signed char)-2)	/* 254 */
-#define CANCELLED_NUMERIC	(-2)
-#define CANCELLED_STRING	(char *)(-1)
-
-#define VALID_BOOLEAN(s) ((unsigned char)(s) <= 1) /* reject "-1" */
-#define VALID_NUMERIC(s) ((s) >= 0)
-#define VALID_STRING(s)  ((s) != CANCELLED_STRING && (s) != ABSENT_STRING)
-
-/* termcap entries longer than this may break old binaries */
-#define MAX_TERMCAP_LENGTH	1023
-
-/* this is a documented limitation of terminfo */
-#define MAX_TERMINFO_LENGTH	4096
-
-#ifndef TERMINFO
-#define TERMINFO "/usr/share/terminfo"
-#endif
-
-#ifdef NCURSES_TERM_ENTRY_H_incl
-
-/* access.c */
-extern NCURSES_EXPORT(unsigned) _nc_pathlast (const char *);
-extern NCURSES_EXPORT(bool) _nc_is_abs_path (const char *);
-extern NCURSES_EXPORT(bool) _nc_is_dir_path (const char *);
-extern NCURSES_EXPORT(bool) _nc_is_file_path (const char *);
-extern NCURSES_EXPORT(char *) _nc_basename (char *);
-extern NCURSES_EXPORT(char *) _nc_rootname (char *);
-
-/* comp_hash.c: name lookup */
-extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry
-	(const char *, const HashValue *);
-extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_type_entry
-	(const char *, int, bool);
-
-/* comp_scan.c: lexical analysis */
-extern NCURSES_EXPORT(int)  _nc_get_token (bool);
-extern NCURSES_EXPORT(void) _nc_panic_mode (char);
-extern NCURSES_EXPORT(void) _nc_push_token (int);
-extern NCURSES_EXPORT(void) _nc_reset_input (FILE *, char *);
-extern NCURSES_EXPORT_VAR(int) _nc_curr_col;
-extern NCURSES_EXPORT_VAR(int) _nc_curr_line;
-extern NCURSES_EXPORT_VAR(int) _nc_syntax;
-extern NCURSES_EXPORT_VAR(int) _nc_strict_bsd;
-extern NCURSES_EXPORT_VAR(long) _nc_comment_end;
-extern NCURSES_EXPORT_VAR(long) _nc_comment_start;
-extern NCURSES_EXPORT_VAR(long) _nc_curr_file_pos;
-extern NCURSES_EXPORT_VAR(long) _nc_start_line;
-#define SYN_TERMINFO	0
-#define SYN_TERMCAP	1
-
-/* comp_error.c: warning & abort messages */
-extern NCURSES_EXPORT(const char *) _nc_get_source (void);
-extern NCURSES_EXPORT(void) _nc_err_abort (const char *const,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
-extern NCURSES_EXPORT(void) _nc_get_type (char *name);
-extern NCURSES_EXPORT(void) _nc_set_source (const char *const);
-extern NCURSES_EXPORT(void) _nc_set_type (const char *const);
-extern NCURSES_EXPORT(void) _nc_syserr_abort (const char *const,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
-extern NCURSES_EXPORT(void) _nc_warning (const char *const,...) GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings;
-
-/* comp_expand.c: expand string into readable form */
-extern NCURSES_EXPORT(char *) _nc_tic_expand (const char *, bool, int);
-
-/* comp_scan.c: decode string from readable form */
-extern NCURSES_EXPORT(int) _nc_trans_string (char *, char *);
-
-/* captoinfo.c: capability conversion */
-extern NCURSES_EXPORT(char *) _nc_captoinfo (const char *, const char *, int const);
-extern NCURSES_EXPORT(char *) _nc_infotocap (const char *, const char *, int const);
-
-/* home_terminfo.c */
-extern NCURSES_EXPORT(char *) _nc_home_terminfo (void);
-
-/* lib_tparm.c */
-#define NUM_PARM 9
-
-extern NCURSES_EXPORT_VAR(int) _nc_tparm_err;
-
-extern NCURSES_EXPORT(int) _nc_tparm_analyze(const char *, char **, int *);
-
-/* lib_tputs.c */
-extern NCURSES_EXPORT_VAR(int) _nc_nulls_sent;		/* Add one for every null sent */
-
-/* comp_main.c: compiler main */
-extern const char * _nc_progname;
-
-/* db_iterator.c */
-extern NCURSES_EXPORT(const char *) _nc_next_db(DBDIRS *, int *);
-extern NCURSES_EXPORT(const char *) _nc_tic_dir (const char *);
-extern NCURSES_EXPORT(void) _nc_first_db(DBDIRS *, int *);
-extern NCURSES_EXPORT(void) _nc_last_db(void);
-
-/* write_entry.c */
-extern NCURSES_EXPORT(int) _nc_tic_written (void);
-
-#endif /* NCURSES_TERM_ENTRY_H_incl */
-
-#ifdef __cplusplus
-}
-#endif
-
-/* *INDENT-ON* */
-#endif /* __TIC_H */
diff --git a/openflow/usr/include/time.h b/openflow/usr/include/time.h
deleted file mode 100644
index cc93917..0000000
--- a/openflow/usr/include/time.h
+++ /dev/null
@@ -1,434 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.23 Date and time	<time.h>
- */
-
-#ifndef	_TIME_H
-
-#if (! defined __need_time_t && !defined __need_clock_t && \
-     ! defined __need_timespec)
-# define _TIME_H	1
-# include <features.h>
-
-__BEGIN_DECLS
-
-#endif
-
-#ifdef	_TIME_H
-/* Get size_t and NULL from <stddef.h>.  */
-# define __need_size_t
-# define __need_NULL
-# include <stddef.h>
-
-/* This defines CLOCKS_PER_SEC, which is the number of processor clock
-   ticks per second.  */
-# include <bits/time.h>
-
-/* This is the obsolete POSIX.1-1988 name for the same constant.  */
-# if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K
-#  ifndef CLK_TCK
-#   define CLK_TCK	CLOCKS_PER_SEC
-#  endif
-# endif
-
-#endif /* <time.h> included.  */
-
-#if !defined __clock_t_defined && (defined _TIME_H || defined __need_clock_t)
-# define __clock_t_defined	1
-
-# include <bits/types.h>
-
-__BEGIN_NAMESPACE_STD
-/* Returned by `clock'.  */
-typedef __clock_t clock_t;
-__END_NAMESPACE_STD
-#if defined __USE_XOPEN || defined __USE_POSIX
-__USING_NAMESPACE_STD(clock_t)
-#endif
-
-#endif /* clock_t not defined and <time.h> or need clock_t.  */
-#undef	__need_clock_t
-
-#if !defined __time_t_defined && (defined _TIME_H || defined __need_time_t)
-# define __time_t_defined	1
-
-# include <bits/types.h>
-
-__BEGIN_NAMESPACE_STD
-/* Returned by `time'.  */
-typedef __time_t time_t;
-__END_NAMESPACE_STD
-#ifdef __USE_POSIX
-__USING_NAMESPACE_STD(time_t)
-#endif
-
-#endif /* time_t not defined and <time.h> or need time_t.  */
-#undef	__need_time_t
-
-#if !defined __clockid_t_defined && \
-   ((defined _TIME_H && defined __USE_POSIX199309) || defined __need_clockid_t)
-# define __clockid_t_defined	1
-
-# include <bits/types.h>
-
-/* Clock ID used in clock and timer functions.  */
-typedef __clockid_t clockid_t;
-
-#endif /* clockid_t not defined and <time.h> or need clockid_t.  */
-#undef	__clockid_time_t
-
-#if !defined __timer_t_defined && \
-    ((defined _TIME_H && defined __USE_POSIX199309) || defined __need_timer_t)
-# define __timer_t_defined	1
-
-# include <bits/types.h>
-
-/* Timer ID returned by `timer_create'.  */
-typedef __timer_t timer_t;
-
-#endif /* timer_t not defined and <time.h> or need timer_t.  */
-#undef	__need_timer_t
-
-
-#if (!defined __timespec_defined					\
-     && ((defined _TIME_H						\
-	  && (defined __USE_POSIX199309					\
-	      || defined __USE_ISOC11))					\
-	 || defined __need_timespec))
-# define __timespec_defined	1
-
-# include <bits/types.h>	/* This defines __time_t for us.  */
-
-/* POSIX.1b structure for a time value.  This is like a `struct timeval' but
-   has nanoseconds instead of microseconds.  */
-struct timespec
-  {
-    __time_t tv_sec;		/* Seconds.  */
-    __syscall_slong_t tv_nsec;	/* Nanoseconds.  */
-  };
-
-#endif /* timespec not defined and <time.h> or need timespec.  */
-#undef	__need_timespec
-
-
-#ifdef	_TIME_H
-__BEGIN_NAMESPACE_STD
-/* Used by other time functions.  */
-struct tm
-{
-  int tm_sec;			/* Seconds.	[0-60] (1 leap second) */
-  int tm_min;			/* Minutes.	[0-59] */
-  int tm_hour;			/* Hours.	[0-23] */
-  int tm_mday;			/* Day.		[1-31] */
-  int tm_mon;			/* Month.	[0-11] */
-  int tm_year;			/* Year	- 1900.  */
-  int tm_wday;			/* Day of week.	[0-6] */
-  int tm_yday;			/* Days in year.[0-365]	*/
-  int tm_isdst;			/* DST.		[-1/0/1]*/
-
-# ifdef	__USE_MISC
-  long int tm_gmtoff;		/* Seconds east of UTC.  */
-  const char *tm_zone;		/* Timezone abbreviation.  */
-# else
-  long int __tm_gmtoff;		/* Seconds east of UTC.  */
-  const char *__tm_zone;	/* Timezone abbreviation.  */
-# endif
-};
-__END_NAMESPACE_STD
-#if defined __USE_XOPEN || defined __USE_POSIX
-__USING_NAMESPACE_STD(tm)
-#endif
-
-
-# ifdef __USE_POSIX199309
-/* POSIX.1b structure for timer start values and intervals.  */
-struct itimerspec
-  {
-    struct timespec it_interval;
-    struct timespec it_value;
-  };
-
-/* We can use a simple forward declaration.  */
-struct sigevent;
-
-# endif	/* POSIX.1b */
-
-# ifdef __USE_XOPEN2K
-#  ifndef __pid_t_defined
-typedef __pid_t pid_t;
-#   define __pid_t_defined
-#  endif
-# endif
-
-
-# ifdef __USE_ISOC11
-/* Time base values for timespec_get.  */
-# define TIME_UTC 1
-# endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Time used by the program so far (user time + system time).
-   The result / CLOCKS_PER_SECOND is program time in seconds.  */
-extern clock_t clock (void) __THROW;
-
-/* Return the current time and put it in *TIMER if TIMER is not NULL.  */
-extern time_t time (time_t *__timer) __THROW;
-
-/* Return the difference between TIME1 and TIME0.  */
-extern double difftime (time_t __time1, time_t __time0)
-     __THROW __attribute__ ((__const__));
-
-/* Return the `time_t' representation of TP and normalize TP.  */
-extern time_t mktime (struct tm *__tp) __THROW;
-
-
-/* Format TP into S according to FORMAT.
-   Write no more than MAXSIZE characters and return the number
-   of characters written, or 0 if it would exceed MAXSIZE.  */
-extern size_t strftime (char *__restrict __s, size_t __maxsize,
-			const char *__restrict __format,
-			const struct tm *__restrict __tp) __THROW;
-__END_NAMESPACE_STD
-
-# ifdef __USE_XOPEN
-/* Parse S according to FORMAT and store binary time information in TP.
-   The return value is a pointer to the first unparsed character in S.  */
-extern char *strptime (const char *__restrict __s,
-		       const char *__restrict __fmt, struct tm *__tp)
-     __THROW;
-# endif
-
-# ifdef __USE_XOPEN2K8
-/* Similar to the two functions above but take the information from
-   the provided locale and not the global locale.  */
-# include <xlocale.h>
-
-extern size_t strftime_l (char *__restrict __s, size_t __maxsize,
-			  const char *__restrict __format,
-			  const struct tm *__restrict __tp,
-			  __locale_t __loc) __THROW;
-# endif
-
-# ifdef __USE_GNU
-extern char *strptime_l (const char *__restrict __s,
-			 const char *__restrict __fmt, struct tm *__tp,
-			 __locale_t __loc) __THROW;
-# endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Return the `struct tm' representation of *TIMER
-   in Universal Coordinated Time (aka Greenwich Mean Time).  */
-extern struct tm *gmtime (const time_t *__timer) __THROW;
-
-/* Return the `struct tm' representation
-   of *TIMER in the local timezone.  */
-extern struct tm *localtime (const time_t *__timer) __THROW;
-__END_NAMESPACE_STD
-
-# ifdef __USE_POSIX
-/* Return the `struct tm' representation of *TIMER in UTC,
-   using *TP to store the result.  */
-extern struct tm *gmtime_r (const time_t *__restrict __timer,
-			    struct tm *__restrict __tp) __THROW;
-
-/* Return the `struct tm' representation of *TIMER in local time,
-   using *TP to store the result.  */
-extern struct tm *localtime_r (const time_t *__restrict __timer,
-			       struct tm *__restrict __tp) __THROW;
-# endif	/* POSIX */
-
-__BEGIN_NAMESPACE_STD
-/* Return a string of the form "Day Mon dd hh:mm:ss yyyy\n"
-   that is the representation of TP in this format.  */
-extern char *asctime (const struct tm *__tp) __THROW;
-
-/* Equivalent to `asctime (localtime (timer))'.  */
-extern char *ctime (const time_t *__timer) __THROW;
-__END_NAMESPACE_STD
-
-# ifdef __USE_POSIX
-/* Reentrant versions of the above functions.  */
-
-/* Return in BUF a string of the form "Day Mon dd hh:mm:ss yyyy\n"
-   that is the representation of TP in this format.  */
-extern char *asctime_r (const struct tm *__restrict __tp,
-			char *__restrict __buf) __THROW;
-
-/* Equivalent to `asctime_r (localtime_r (timer, *TMP*), buf)'.  */
-extern char *ctime_r (const time_t *__restrict __timer,
-		      char *__restrict __buf) __THROW;
-# endif	/* POSIX */
-
-
-/* Defined in localtime.c.  */
-extern char *__tzname[2];	/* Current timezone names.  */
-extern int __daylight;		/* If daylight-saving time is ever in use.  */
-extern long int __timezone;	/* Seconds west of UTC.  */
-
-
-# ifdef	__USE_POSIX
-/* Same as above.  */
-extern char *tzname[2];
-
-/* Set time conversion information from the TZ environment variable.
-   If TZ is not defined, a locale-dependent default is used.  */
-extern void tzset (void) __THROW;
-# endif
-
-# if defined __USE_MISC || defined __USE_XOPEN
-extern int daylight;
-extern long int timezone;
-# endif
-
-# ifdef __USE_MISC
-/* Set the system time to *WHEN.
-   This call is restricted to the superuser.  */
-extern int stime (const time_t *__when) __THROW;
-# endif
-
-
-/* Nonzero if YEAR is a leap year (every 4 years,
-   except every 100th isn't, and every 400th is).  */
-# define __isleap(year)	\
-  ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
-
-
-# ifdef __USE_MISC
-/* Miscellaneous functions many Unices inherited from the public domain
-   localtime package.  These are included only for compatibility.  */
-
-/* Like `mktime', but for TP represents Universal Time, not local time.  */
-extern time_t timegm (struct tm *__tp) __THROW;
-
-/* Another name for `mktime'.  */
-extern time_t timelocal (struct tm *__tp) __THROW;
-
-/* Return the number of days in YEAR.  */
-extern int dysize (int __year) __THROW  __attribute__ ((__const__));
-# endif
-
-
-# ifdef __USE_POSIX199309
-/* Pause execution for a number of nanoseconds.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int nanosleep (const struct timespec *__requested_time,
-		      struct timespec *__remaining);
-
-
-/* Get resolution of clock CLOCK_ID.  */
-extern int clock_getres (clockid_t __clock_id, struct timespec *__res) __THROW;
-
-/* Get current value of clock CLOCK_ID and store it in TP.  */
-extern int clock_gettime (clockid_t __clock_id, struct timespec *__tp) __THROW;
-
-/* Set clock CLOCK_ID to value TP.  */
-extern int clock_settime (clockid_t __clock_id, const struct timespec *__tp)
-     __THROW;
-
-#  ifdef __USE_XOPEN2K
-/* High-resolution sleep with the specified clock.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int clock_nanosleep (clockid_t __clock_id, int __flags,
-			    const struct timespec *__req,
-			    struct timespec *__rem);
-
-/* Return clock ID for CPU-time clock.  */
-extern int clock_getcpuclockid (pid_t __pid, clockid_t *__clock_id) __THROW;
-#  endif
-
-
-/* Create new per-process timer using CLOCK_ID.  */
-extern int timer_create (clockid_t __clock_id,
-			 struct sigevent *__restrict __evp,
-			 timer_t *__restrict __timerid) __THROW;
-
-/* Delete timer TIMERID.  */
-extern int timer_delete (timer_t __timerid) __THROW;
-
-/* Set timer TIMERID to VALUE, returning old value in OVALUE.  */
-extern int timer_settime (timer_t __timerid, int __flags,
-			  const struct itimerspec *__restrict __value,
-			  struct itimerspec *__restrict __ovalue) __THROW;
-
-/* Get current value of timer TIMERID and store it in VALUE.  */
-extern int timer_gettime (timer_t __timerid, struct itimerspec *__value)
-     __THROW;
-
-/* Get expiration overrun for timer TIMERID.  */
-extern int timer_getoverrun (timer_t __timerid) __THROW;
-# endif
-
-
-# ifdef __USE_ISOC11
-/* Set TS to calendar time based in time base BASE.  */
-extern int timespec_get (struct timespec *__ts, int __base)
-     __THROW __nonnull ((1));
-# endif
-
-
-# ifdef __USE_XOPEN_EXTENDED
-/* Set to one of the following values to indicate an error.
-     1  the DATEMSK environment variable is null or undefined,
-     2  the template file cannot be opened for reading,
-     3  failed to get file status information,
-     4  the template file is not a regular file,
-     5  an error is encountered while reading the template file,
-     6  memory allication failed (not enough memory available),
-     7  there is no line in the template that matches the input,
-     8  invalid input specification Example: February 31 or a time is
-	specified that can not be represented in a time_t (representing
-	the time in seconds since 00:00:00 UTC, January 1, 1970) */
-extern int getdate_err;
-
-/* Parse the given string as a date specification and return a value
-   representing the value.  The templates from the file identified by
-   the environment variable DATEMSK are used.  In case of an error
-   `getdate_err' is set.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct tm *getdate (const char *__string);
-# endif
-
-# ifdef __USE_GNU
-/* Since `getdate' is not reentrant because of the use of `getdate_err'
-   and the static buffer to return the result in, we provide a thread-safe
-   variant.  The functionality is the same.  The result is returned in
-   the buffer pointed to by RESBUFP and in case of an error the return
-   value is != 0 with the same values as given above for `getdate_err'.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int getdate_r (const char *__restrict __string,
-		      struct tm *__restrict __resbufp);
-# endif
-
-__END_DECLS
-
-#endif /* <time.h> included.  */
-
-#endif /* <time.h> not already included.  */
diff --git a/openflow/usr/include/ttyent.h b/openflow/usr/include/ttyent.h
deleted file mode 100644
index fe418a5..0000000
--- a/openflow/usr/include/ttyent.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ttyent.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef	_TTYENT_H
-#define	_TTYENT_H	1
-
-#include <features.h>
-
-#define	_PATH_TTYS	"/etc/ttys"
-
-#define	_TTYS_OFF	"off"
-#define	_TTYS_ON	"on"
-#define	_TTYS_SECURE	"secure"
-#define	_TTYS_WINDOW	"window"
-
-struct ttyent {
-	char	*ty_name;	/* terminal device name */
-	char	*ty_getty;	/* command to execute, usually getty */
-	char	*ty_type;	/* terminal type for termcap */
-#define	TTY_ON		0x01	/* enable logins (start ty_getty program) */
-#define	TTY_SECURE	0x02	/* allow uid of 0 to login */
-	int	ty_status;	/* status flags */
-	char 	*ty_window;	/* command to start up window manager */
-	char	*ty_comment;	/* comment field */
-};
-
-
-__BEGIN_DECLS
-
-extern struct ttyent *getttyent (void) __THROW;
-extern struct ttyent *getttynam (const char *__tty) __THROW;
-extern int setttyent (void) __THROW;
-extern int endttyent (void) __THROW;
-
-__END_DECLS
-
-#endif /* ttyent.h */
diff --git a/openflow/usr/include/uchar.h b/openflow/usr/include/uchar.h
deleted file mode 100644
index ce92b25..0000000
--- a/openflow/usr/include/uchar.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *      ISO C11 Standard: 7.28
- *	Unicode utilities	<uchar.h>
- */
-
-#ifndef _UCHAR_H
-#define _UCHAR_H	1
-
-#include <features.h>
-
-#define __need_size_t
-#include <stddef.h>
-#define __need_mbstate_t
-#include <wchar.h>
-
-#ifndef __mbstate_t_defined
-__BEGIN_NAMESPACE_C99
-/* Public type.  */
-typedef __mbstate_t mbstate_t;
-__END_NAMESPACE_C99
-# define __mbstate_t_defined 1
-#endif
-
-
-#if defined __GNUC__ && !defined __USE_ISOCXX11
-/* Define the 16-bit and 32-bit character types.  Use the information
-   provided by the compiler.  */
-# if !defined __CHAR16_TYPE__ || !defined __CHAR32_TYPE__
-#  if defined __STDC_VERSION__ && __STDC_VERSION__ < 201000L
-#   error "<uchar.h> requires ISO C11 mode"
-#  else
-#   error "definitions of __CHAR16_TYPE__ and/or __CHAR32_TYPE__ missing"
-#  endif
-# endif
-typedef __CHAR16_TYPE__ char16_t;
-typedef __CHAR32_TYPE__ char32_t;
-#endif
-
-
-__BEGIN_DECLS
-
-/* Write char16_t representation of multibyte character pointed
-   to by S to PC16.  */
-extern size_t mbrtoc16 (char16_t *__restrict __pc16,
-			const char *__restrict __s, size_t __n,
-			mbstate_t *__restrict __p) __THROW;
-
-/* Write multibyte representation of char16_t C16 to S.  */
-extern size_t c16rtomb (char *__restrict __s, char16_t __c16,
-			mbstate_t *__restrict __ps) __THROW;
-
-
-
-/* Write char32_t representation of multibyte character pointed
-   to by S to PC32.  */
-extern size_t mbrtoc32 (char32_t *__restrict __pc32,
-			const char *__restrict __s, size_t __n,
-			mbstate_t *__restrict __p) __THROW;
-
-/* Write multibyte representation of char32_t C32 to S.  */
-extern size_t c32rtomb (char *__restrict __s, char32_t __c32,
-			mbstate_t *__restrict __ps) __THROW;
-
-__END_DECLS
-
-#endif	/* uchar.h */
diff --git a/openflow/usr/include/ucontext.h b/openflow/usr/include/ucontext.h
deleted file mode 100644
index 813a24d..0000000
--- a/openflow/usr/include/ucontext.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* System V ABI compliant user-level context switching support.  */
-
-#ifndef _UCONTEXT_H
-#define _UCONTEXT_H	1
-
-#include <features.h>
-
-/* Get machine dependent definition of data structures.  */
-#include <sys/ucontext.h>
-
-__BEGIN_DECLS
-
-/* Get user context and store it in variable pointed to by UCP.  */
-extern int getcontext (ucontext_t *__ucp) __THROWNL;
-
-/* Set user context from information of variable pointed to by UCP.  */
-extern int setcontext (const ucontext_t *__ucp) __THROWNL;
-
-/* Save current context in context variable pointed to by OUCP and set
-   context from variable pointed to by UCP.  */
-extern int swapcontext (ucontext_t *__restrict __oucp,
-			const ucontext_t *__restrict __ucp) __THROWNL;
-
-/* Manipulate user context UCP to continue with calling functions FUNC
-   and the ARGC-1 parameters following ARGC when the context is used
-   the next time in `setcontext' or `swapcontext'.
-
-   We cannot say anything about the parameters FUNC takes; `void'
-   is as good as any other choice.  */
-extern void makecontext (ucontext_t *__ucp, void (*__func) (void),
-			 int __argc, ...) __THROW;
-
-__END_DECLS
-
-#endif /* ucontext.h */
diff --git a/openflow/usr/include/ulimit.h b/openflow/usr/include/ulimit.h
deleted file mode 100644
index aefc1b9..0000000
--- a/openflow/usr/include/ulimit.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ULIMIT_H
-#define _ULIMIT_H	1
-
-#include <features.h>
-
-/* Constants used as the first parameter for `ulimit'.  They denote limits
-   which can be set or retrieved using this function.  */
-enum
-{
-  UL_GETFSIZE = 1,			/* Return limit on the size of a file,
-					   in units of 512 bytes.  */
-#define UL_GETFSIZE	UL_GETFSIZE
-  UL_SETFSIZE,				/* Set limit on the size of a file to
-					   second argument.  */
-#define UL_SETFSIZE	UL_SETFSIZE
-  __UL_GETMAXBRK,			/* Return the maximum possible address
-					   of the data segment.  */
-  __UL_GETOPENMAX			/* Return the maximum number of files
-					   that the calling process can open.*/
-};
-
-
-__BEGIN_DECLS
-
-/* Control process limits according to CMD.  */
-extern long int ulimit (int __cmd, ...) __THROW;
-
-__END_DECLS
-
-#endif /* ulimit.h */
diff --git a/openflow/usr/include/unctrl.h b/openflow/usr/include/unctrl.h
deleted file mode 100644
index aecb7cb..0000000
--- a/openflow/usr/include/unctrl.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- ****************************************************************************/
-
-/*
- * unctrl.h
- *
- * Display a printable version of a control character.
- * Control characters are displayed in caret notation (^x), DELETE is displayed
- * as ^?. Printable characters are displayed as is.
- */
-
-/* $Id: unctrl.h.in,v 1.11 2009/04/18 21:00:52 tom Exp $ */
-
-#ifndef NCURSES_UNCTRL_H_incl
-#define NCURSES_UNCTRL_H_incl	1
-
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "6.0"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <curses.h>
-
-#undef unctrl
-NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype);
-
-#if 0
-NCURSES_EXPORT(NCURSES_CONST char *) NCURSES_SP_NAME(unctrl) (SCREEN*, chtype);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NCURSES_UNCTRL_H_incl */
diff --git a/openflow/usr/include/unistd.h b/openflow/usr/include/unistd.h
deleted file mode 100644
index 405638c..0000000
--- a/openflow/usr/include/unistd.h
+++ /dev/null
@@ -1,1156 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 2.10 Symbolic Constants		<unistd.h>
- */
-
-#ifndef	_UNISTD_H
-#define	_UNISTD_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-/* These may be used to determine what facilities are present at compile time.
-   Their values can be obtained at run time from `sysconf'.  */
-
-#ifdef __USE_XOPEN2K8
-/* POSIX Standard approved as ISO/IEC 9945-1 as of September 2008.  */
-# define _POSIX_VERSION	200809L
-#elif defined __USE_XOPEN2K
-/* POSIX Standard approved as ISO/IEC 9945-1 as of December 2001.  */
-# define _POSIX_VERSION	200112L
-#elif defined __USE_POSIX199506
-/* POSIX Standard approved as ISO/IEC 9945-1 as of June 1995.  */
-# define _POSIX_VERSION	199506L
-#elif defined __USE_POSIX199309
-/* POSIX Standard approved as ISO/IEC 9945-1 as of September 1993.  */
-# define _POSIX_VERSION	199309L
-#else
-/* POSIX Standard approved as ISO/IEC 9945-1 as of September 1990.  */
-# define _POSIX_VERSION	199009L
-#endif
-
-/* These are not #ifdef __USE_POSIX2 because they are
-   in the theoretically application-owned namespace.  */
-
-#ifdef __USE_XOPEN2K8
-# define __POSIX2_THIS_VERSION	200809L
-/* The utilities on GNU systems also correspond to this version.  */
-#elif defined __USE_XOPEN2K
-/* The utilities on GNU systems also correspond to this version.  */
-# define __POSIX2_THIS_VERSION	200112L
-#elif defined __USE_POSIX199506
-/* The utilities on GNU systems also correspond to this version.  */
-# define __POSIX2_THIS_VERSION	199506L
-#else
-/* The utilities on GNU systems also correspond to this version.  */
-# define __POSIX2_THIS_VERSION	199209L
-#endif
-
-/* The utilities on GNU systems also correspond to this version.  */
-#define _POSIX2_VERSION	__POSIX2_THIS_VERSION
-
-/* This symbol was required until the 2001 edition of POSIX.  */
-#define	_POSIX2_C_VERSION	__POSIX2_THIS_VERSION
-
-/* If defined, the implementation supports the
-   C Language Bindings Option.  */
-#define	_POSIX2_C_BIND	__POSIX2_THIS_VERSION
-
-/* If defined, the implementation supports the
-   C Language Development Utilities Option.  */
-#define	_POSIX2_C_DEV	__POSIX2_THIS_VERSION
-
-/* If defined, the implementation supports the
-   Software Development Utilities Option.  */
-#define	_POSIX2_SW_DEV	__POSIX2_THIS_VERSION
-
-/* If defined, the implementation supports the
-   creation of locales with the localedef utility.  */
-#define _POSIX2_LOCALEDEF       __POSIX2_THIS_VERSION
-
-/* X/Open version number to which the library conforms.  It is selectable.  */
-#ifdef __USE_XOPEN2K8
-# define _XOPEN_VERSION	700
-#elif defined __USE_XOPEN2K
-# define _XOPEN_VERSION	600
-#elif defined __USE_UNIX98
-# define _XOPEN_VERSION	500
-#else
-# define _XOPEN_VERSION	4
-#endif
-
-/* Commands and utilities from XPG4 are available.  */
-#define _XOPEN_XCU_VERSION	4
-
-/* We are compatible with the old published standards as well.  */
-#define _XOPEN_XPG2	1
-#define _XOPEN_XPG3	1
-#define _XOPEN_XPG4	1
-
-/* The X/Open Unix extensions are available.  */
-#define _XOPEN_UNIX	1
-
-/* Encryption is present.  */
-#define	_XOPEN_CRYPT	1
-
-/* The enhanced internationalization capabilities according to XPG4.2
-   are present.  */
-#define	_XOPEN_ENH_I18N	1
-
-/* The legacy interfaces are also available.  */
-#define _XOPEN_LEGACY	1
-
-
-/* Get values of POSIX options:
-
-   If these symbols are defined, the corresponding features are
-   always available.  If not, they may be available sometimes.
-   The current values can be obtained with `sysconf'.
-
-   _POSIX_JOB_CONTROL		Job control is supported.
-   _POSIX_SAVED_IDS		Processes have a saved set-user-ID
-				and a saved set-group-ID.
-   _POSIX_REALTIME_SIGNALS	Real-time, queued signals are supported.
-   _POSIX_PRIORITY_SCHEDULING	Priority scheduling is supported.
-   _POSIX_TIMERS		POSIX.4 clocks and timers are supported.
-   _POSIX_ASYNCHRONOUS_IO	Asynchronous I/O is supported.
-   _POSIX_PRIORITIZED_IO	Prioritized asynchronous I/O is supported.
-   _POSIX_SYNCHRONIZED_IO	Synchronizing file data is supported.
-   _POSIX_FSYNC			The fsync function is present.
-   _POSIX_MAPPED_FILES		Mapping of files to memory is supported.
-   _POSIX_MEMLOCK		Locking of all memory is supported.
-   _POSIX_MEMLOCK_RANGE		Locking of ranges of memory is supported.
-   _POSIX_MEMORY_PROTECTION	Setting of memory protections is supported.
-   _POSIX_MESSAGE_PASSING	POSIX.4 message queues are supported.
-   _POSIX_SEMAPHORES		POSIX.4 counting semaphores are supported.
-   _POSIX_SHARED_MEMORY_OBJECTS	POSIX.4 shared memory objects are supported.
-   _POSIX_THREADS		POSIX.1c pthreads are supported.
-   _POSIX_THREAD_ATTR_STACKADDR	Thread stack address attribute option supported.
-   _POSIX_THREAD_ATTR_STACKSIZE	Thread stack size attribute option supported.
-   _POSIX_THREAD_SAFE_FUNCTIONS	Thread-safe functions are supported.
-   _POSIX_THREAD_PRIORITY_SCHEDULING
-				POSIX.1c thread execution scheduling supported.
-   _POSIX_THREAD_PRIO_INHERIT	Thread priority inheritance option supported.
-   _POSIX_THREAD_PRIO_PROTECT	Thread priority protection option supported.
-   _POSIX_THREAD_PROCESS_SHARED	Process-shared synchronization supported.
-   _POSIX_PII			Protocol-independent interfaces are supported.
-   _POSIX_PII_XTI		XTI protocol-indep. interfaces are supported.
-   _POSIX_PII_SOCKET		Socket protocol-indep. interfaces are supported.
-   _POSIX_PII_INTERNET		Internet family of protocols supported.
-   _POSIX_PII_INTERNET_STREAM	Connection-mode Internet protocol supported.
-   _POSIX_PII_INTERNET_DGRAM	Connectionless Internet protocol supported.
-   _POSIX_PII_OSI		ISO/OSI family of protocols supported.
-   _POSIX_PII_OSI_COTS		Connection-mode ISO/OSI service supported.
-   _POSIX_PII_OSI_CLTS		Connectionless ISO/OSI service supported.
-   _POSIX_POLL			Implementation supports `poll' function.
-   _POSIX_SELECT		Implementation supports `select' and `pselect'.
-
-   _XOPEN_REALTIME		X/Open realtime support is available.
-   _XOPEN_REALTIME_THREADS	X/Open realtime thread support is available.
-   _XOPEN_SHM			Shared memory interface according to XPG4.2.
-
-   _XBS5_ILP32_OFF32		Implementation provides environment with 32-bit
-				int, long, pointer, and off_t types.
-   _XBS5_ILP32_OFFBIG		Implementation provides environment with 32-bit
-				int, long, and pointer and off_t with at least
-				64 bits.
-   _XBS5_LP64_OFF64		Implementation provides environment with 32-bit
-				int, and 64-bit long, pointer, and off_t types.
-   _XBS5_LPBIG_OFFBIG		Implementation provides environment with at
-				least 32 bits int and long, pointer, and off_t
-				with at least 64 bits.
-
-   If any of these symbols is defined as -1, the corresponding option is not
-   true for any file.  If any is defined as other than -1, the corresponding
-   option is true for all files.  If a symbol is not defined at all, the value
-   for a specific file can be obtained from `pathconf' and `fpathconf'.
-
-   _POSIX_CHOWN_RESTRICTED	Only the super user can use `chown' to change
-				the owner of a file.  `chown' can only be used
-				to change the group ID of a file to a group of
-				which the calling process is a member.
-   _POSIX_NO_TRUNC		Pathname components longer than
-				NAME_MAX generate an error.
-   _POSIX_VDISABLE		If defined, if the value of an element of the
-				`c_cc' member of `struct termios' is
-				_POSIX_VDISABLE, no character will have the
-				effect associated with that element.
-   _POSIX_SYNC_IO		Synchronous I/O may be performed.
-   _POSIX_ASYNC_IO		Asynchronous I/O may be performed.
-   _POSIX_PRIO_IO		Prioritized Asynchronous I/O may be performed.
-
-   Support for the Large File Support interface is not generally available.
-   If it is available the following constants are defined to one.
-   _LFS64_LARGEFILE		Low-level I/O supports large files.
-   _LFS64_STDIO			Standard I/O supports large files.
-   */
-
-#include <bits/posix_opt.h>
-
-/* Get the environment definitions from Unix98.  */
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-# include <bits/environments.h>
-#endif
-
-/* Standard file descriptors.  */
-#define	STDIN_FILENO	0	/* Standard input.  */
-#define	STDOUT_FILENO	1	/* Standard output.  */
-#define	STDERR_FILENO	2	/* Standard error output.  */
-
-
-/* All functions that are not declared anywhere else.  */
-
-#include <bits/types.h>
-
-#ifndef	__ssize_t_defined
-typedef __ssize_t ssize_t;
-# define __ssize_t_defined
-#endif
-
-#define	__need_size_t
-#define __need_NULL
-#include <stddef.h>
-
-#if defined __USE_XOPEN || defined __USE_XOPEN2K
-/* The Single Unix specification says that some more types are
-   available here.  */
-# ifndef __gid_t_defined
-typedef __gid_t gid_t;
-#  define __gid_t_defined
-# endif
-
-# ifndef __uid_t_defined
-typedef __uid_t uid_t;
-#  define __uid_t_defined
-# endif
-
-# ifndef __off_t_defined
-#  ifndef __USE_FILE_OFFSET64
-typedef __off_t off_t;
-#  else
-typedef __off64_t off_t;
-#  endif
-#  define __off_t_defined
-# endif
-# if defined __USE_LARGEFILE64 && !defined __off64_t_defined
-typedef __off64_t off64_t;
-#  define __off64_t_defined
-# endif
-
-# ifndef __useconds_t_defined
-typedef __useconds_t useconds_t;
-#  define __useconds_t_defined
-# endif
-
-# ifndef __pid_t_defined
-typedef __pid_t pid_t;
-#  define __pid_t_defined
-# endif
-#endif	/* X/Open */
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
-# ifndef __intptr_t_defined
-typedef __intptr_t intptr_t;
-#  define __intptr_t_defined
-# endif
-#endif
-
-#if defined __USE_MISC || defined __USE_XOPEN
-# ifndef __socklen_t_defined
-typedef __socklen_t socklen_t;
-#  define __socklen_t_defined
-# endif
-#endif
-
-/* Values for the second argument to access.
-   These may be OR'd together.  */
-#define	R_OK	4		/* Test for read permission.  */
-#define	W_OK	2		/* Test for write permission.  */
-#define	X_OK	1		/* Test for execute permission.  */
-#define	F_OK	0		/* Test for existence.  */
-
-/* Test for access to NAME using the real UID and real GID.  */
-extern int access (const char *__name, int __type) __THROW __nonnull ((1));
-
-#ifdef __USE_GNU
-/* Test for access to NAME using the effective UID and GID
-   (as normal file operations use).  */
-extern int euidaccess (const char *__name, int __type)
-     __THROW __nonnull ((1));
-
-/* An alias for `euidaccess', used by some other systems.  */
-extern int eaccess (const char *__name, int __type)
-     __THROW __nonnull ((1));
-#endif
-
-#ifdef __USE_ATFILE
-/* Test for access to FILE relative to the directory FD is open on.
-   If AT_EACCESS is set in FLAG, then use effective IDs like `eaccess',
-   otherwise use real IDs like `access'.  */
-extern int faccessat (int __fd, const char *__file, int __type, int __flag)
-     __THROW __nonnull ((2)) __wur;
-#endif /* Use GNU.  */
-
-
-/* Values for the WHENCE argument to lseek.  */
-#ifndef	_STDIO_H		/* <stdio.h> has the same definitions.  */
-# define SEEK_SET	0	/* Seek from beginning of file.  */
-# define SEEK_CUR	1	/* Seek from current position.  */
-# define SEEK_END	2	/* Seek from end of file.  */
-# ifdef __USE_GNU
-#  define SEEK_DATA	3	/* Seek to next data.  */
-#  define SEEK_HOLE	4	/* Seek to next hole.  */
-# endif
-#endif
-
-#if defined __USE_MISC && !defined L_SET
-/* Old BSD names for the same constants; just for compatibility.  */
-# define L_SET		SEEK_SET
-# define L_INCR		SEEK_CUR
-# define L_XTND		SEEK_END
-#endif
-
-
-/* Move FD's file position to OFFSET bytes from the
-   beginning of the file (if WHENCE is SEEK_SET),
-   the current position (if WHENCE is SEEK_CUR),
-   or the end of the file (if WHENCE is SEEK_END).
-   Return the new file position.  */
-#ifndef __USE_FILE_OFFSET64
-extern __off_t lseek (int __fd, __off_t __offset, int __whence) __THROW;
-#else
-# ifdef __REDIRECT_NTH
-extern __off64_t __REDIRECT_NTH (lseek,
-				 (int __fd, __off64_t __offset, int __whence),
-				 lseek64);
-# else
-#  define lseek lseek64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern __off64_t lseek64 (int __fd, __off64_t __offset, int __whence)
-     __THROW;
-#endif
-
-/* Close the file descriptor FD.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int close (int __fd);
-
-/* Read NBYTES into BUF from FD.  Return the
-   number read, -1 for errors or 0 for EOF.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t read (int __fd, void *__buf, size_t __nbytes) __wur;
-
-/* Write N bytes of BUF to FD.  Return the number written, or -1.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t write (int __fd, const void *__buf, size_t __n) __wur;
-
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
-# ifndef __USE_FILE_OFFSET64
-/* Read NBYTES into BUF from FD at the given position OFFSET without
-   changing the file pointer.  Return the number read, -1 for errors
-   or 0 for EOF.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t pread (int __fd, void *__buf, size_t __nbytes,
-		      __off_t __offset) __wur;
-
-/* Write N bytes of BUF to FD at the given position OFFSET without
-   changing the file pointer.  Return the number written, or -1.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern ssize_t pwrite (int __fd, const void *__buf, size_t __n,
-		       __off_t __offset) __wur;
-# else
-#  ifdef __REDIRECT
-extern ssize_t __REDIRECT (pread, (int __fd, void *__buf, size_t __nbytes,
-				   __off64_t __offset),
-			   pread64) __wur;
-extern ssize_t __REDIRECT (pwrite, (int __fd, const void *__buf,
-				    size_t __nbytes, __off64_t __offset),
-			   pwrite64) __wur;
-#  else
-#   define pread pread64
-#   define pwrite pwrite64
-#  endif
-# endif
-
-# ifdef __USE_LARGEFILE64
-/* Read NBYTES into BUF from FD at the given position OFFSET without
-   changing the file pointer.  Return the number read, -1 for errors
-   or 0 for EOF.  */
-extern ssize_t pread64 (int __fd, void *__buf, size_t __nbytes,
-			__off64_t __offset) __wur;
-/* Write N bytes of BUF to FD at the given position OFFSET without
-   changing the file pointer.  Return the number written, or -1.  */
-extern ssize_t pwrite64 (int __fd, const void *__buf, size_t __n,
-			 __off64_t __offset) __wur;
-# endif
-#endif
-
-/* Create a one-way communication channel (pipe).
-   If successful, two file descriptors are stored in PIPEDES;
-   bytes written on PIPEDES[1] can be read from PIPEDES[0].
-   Returns 0 if successful, -1 if not.  */
-extern int pipe (int __pipedes[2]) __THROW __wur;
-
-#ifdef __USE_GNU
-/* Same as pipe but apply flags passed in FLAGS to the new file
-   descriptors.  */
-extern int pipe2 (int __pipedes[2], int __flags) __THROW __wur;
-#endif
-
-/* Schedule an alarm.  In SECONDS seconds, the process will get a SIGALRM.
-   If SECONDS is zero, any currently scheduled alarm will be cancelled.
-   The function returns the number of seconds remaining until the last
-   alarm scheduled would have signaled, or zero if there wasn't one.
-   There is no return value to indicate an error, but you can set `errno'
-   to 0 and check its value after calling `alarm', and this might tell you.
-   The signal may come late due to processor scheduling.  */
-extern unsigned int alarm (unsigned int __seconds) __THROW;
-
-/* Make the process sleep for SECONDS seconds, or until a signal arrives
-   and is not ignored.  The function returns the number of seconds less
-   than SECONDS which it actually slept (thus zero if it slept the full time).
-   If a signal handler does a `longjmp' or modifies the handling of the
-   SIGALRM signal while inside `sleep' call, the handling of the SIGALRM
-   signal afterwards is undefined.  There is no return value to indicate
-   error, but if `sleep' returns SECONDS, it probably didn't work.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern unsigned int sleep (unsigned int __seconds);
-
-#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8) \
-    || defined __USE_MISC
-/* Set an alarm to go off (generating a SIGALRM signal) in VALUE
-   microseconds.  If INTERVAL is nonzero, when the alarm goes off, the
-   timer is reset to go off every INTERVAL microseconds thereafter.
-   Returns the number of microseconds remaining before the alarm.  */
-extern __useconds_t ualarm (__useconds_t __value, __useconds_t __interval)
-     __THROW;
-
-/* Sleep USECONDS microseconds, or until a signal arrives that is not blocked
-   or ignored.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int usleep (__useconds_t __useconds);
-#endif
-
-
-/* Suspend the process until a signal arrives.
-   This always returns -1 and sets `errno' to EINTR.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int pause (void);
-
-
-/* Change the owner and group of FILE.  */
-extern int chown (const char *__file, __uid_t __owner, __gid_t __group)
-     __THROW __nonnull ((1)) __wur;
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-/* Change the owner and group of the file that FD is open on.  */
-extern int fchown (int __fd, __uid_t __owner, __gid_t __group) __THROW __wur;
-
-
-/* Change owner and group of FILE, if it is a symbolic
-   link the ownership of the symbolic link is changed.  */
-extern int lchown (const char *__file, __uid_t __owner, __gid_t __group)
-     __THROW __nonnull ((1)) __wur;
-
-#endif /* Use X/Open Unix.  */
-
-#ifdef __USE_ATFILE
-/* Change the owner and group of FILE relative to the directory FD is open
-   on.  */
-extern int fchownat (int __fd, const char *__file, __uid_t __owner,
-		     __gid_t __group, int __flag)
-     __THROW __nonnull ((2)) __wur;
-#endif /* Use GNU.  */
-
-/* Change the process's working directory to PATH.  */
-extern int chdir (const char *__path) __THROW __nonnull ((1)) __wur;
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-/* Change the process's working directory to the one FD is open on.  */
-extern int fchdir (int __fd) __THROW __wur;
-#endif
-
-/* Get the pathname of the current working directory,
-   and put it in SIZE bytes of BUF.  Returns NULL if the
-   directory couldn't be determined or SIZE was too small.
-   If successful, returns BUF.  In GNU, if BUF is NULL,
-   an array is allocated with `malloc'; the array is SIZE
-   bytes long, unless SIZE == 0, in which case it is as
-   big as necessary.  */
-extern char *getcwd (char *__buf, size_t __size) __THROW __wur;
-
-#ifdef	__USE_GNU
-/* Return a malloc'd string containing the current directory name.
-   If the environment variable `PWD' is set, and its value is correct,
-   that value is used.  */
-extern char *get_current_dir_name (void) __THROW;
-#endif
-
-#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8) \
-    || defined __USE_MISC
-/* Put the absolute pathname of the current working directory in BUF.
-   If successful, return BUF.  If not, put an error message in
-   BUF and return NULL.  BUF should be at least PATH_MAX bytes long.  */
-extern char *getwd (char *__buf)
-     __THROW __nonnull ((1)) __attribute_deprecated__ __wur;
-#endif
-
-
-/* Duplicate FD, returning a new file descriptor on the same file.  */
-extern int dup (int __fd) __THROW __wur;
-
-/* Duplicate FD to FD2, closing FD2 and making it open on the same file.  */
-extern int dup2 (int __fd, int __fd2) __THROW;
-
-#ifdef __USE_GNU
-/* Duplicate FD to FD2, closing FD2 and making it open on the same
-   file while setting flags according to FLAGS.  */
-extern int dup3 (int __fd, int __fd2, int __flags) __THROW;
-#endif
-
-/* NULL-terminated array of "NAME=VALUE" environment variables.  */
-extern char **__environ;
-#ifdef __USE_GNU
-extern char **environ;
-#endif
-
-
-/* Replace the current process, executing PATH with arguments ARGV and
-   environment ENVP.  ARGV and ENVP are terminated by NULL pointers.  */
-extern int execve (const char *__path, char *const __argv[],
-		   char *const __envp[]) __THROW __nonnull ((1, 2));
-
-#ifdef __USE_XOPEN2K8
-/* Execute the file FD refers to, overlaying the running program image.
-   ARGV and ENVP are passed to the new program, as for `execve'.  */
-extern int fexecve (int __fd, char *const __argv[], char *const __envp[])
-     __THROW __nonnull ((2));
-#endif
-
-
-/* Execute PATH with arguments ARGV and environment from `environ'.  */
-extern int execv (const char *__path, char *const __argv[])
-     __THROW __nonnull ((1, 2));
-
-/* Execute PATH with all arguments after PATH until a NULL pointer,
-   and the argument after that for environment.  */
-extern int execle (const char *__path, const char *__arg, ...)
-     __THROW __nonnull ((1, 2));
-
-/* Execute PATH with all arguments after PATH until
-   a NULL pointer and environment from `environ'.  */
-extern int execl (const char *__path, const char *__arg, ...)
-     __THROW __nonnull ((1, 2));
-
-/* Execute FILE, searching in the `PATH' environment variable if it contains
-   no slashes, with arguments ARGV and environment from `environ'.  */
-extern int execvp (const char *__file, char *const __argv[])
-     __THROW __nonnull ((1, 2));
-
-/* Execute FILE, searching in the `PATH' environment variable if
-   it contains no slashes, with all arguments after FILE until a
-   NULL pointer and environment from `environ'.  */
-extern int execlp (const char *__file, const char *__arg, ...)
-     __THROW __nonnull ((1, 2));
-
-#ifdef __USE_GNU
-/* Execute FILE, searching in the `PATH' environment variable if it contains
-   no slashes, with arguments ARGV and environment from `environ'.  */
-extern int execvpe (const char *__file, char *const __argv[],
-		    char *const __envp[])
-     __THROW __nonnull ((1, 2));
-#endif
-
-
-#if defined __USE_MISC || defined __USE_XOPEN
-/* Add INC to priority of the current process.  */
-extern int nice (int __inc) __THROW __wur;
-#endif
-
-
-/* Terminate program execution with the low-order 8 bits of STATUS.  */
-extern void _exit (int __status) __attribute__ ((__noreturn__));
-
-
-/* Get the `_PC_*' symbols for the NAME argument to `pathconf' and `fpathconf';
-   the `_SC_*' symbols for the NAME argument to `sysconf';
-   and the `_CS_*' symbols for the NAME argument to `confstr'.  */
-#include <bits/confname.h>
-
-/* Get file-specific configuration information about PATH.  */
-extern long int pathconf (const char *__path, int __name)
-     __THROW __nonnull ((1));
-
-/* Get file-specific configuration about descriptor FD.  */
-extern long int fpathconf (int __fd, int __name) __THROW;
-
-/* Get the value of the system variable NAME.  */
-extern long int sysconf (int __name) __THROW;
-
-#ifdef	__USE_POSIX2
-/* Get the value of the string-valued system variable NAME.  */
-extern size_t confstr (int __name, char *__buf, size_t __len) __THROW;
-#endif
-
-
-/* Get the process ID of the calling process.  */
-extern __pid_t getpid (void) __THROW;
-
-/* Get the process ID of the calling process's parent.  */
-extern __pid_t getppid (void) __THROW;
-
-/* Get the process group ID of the calling process.  */
-extern __pid_t getpgrp (void) __THROW;
-
-/* Get the process group ID of process PID.  */
-extern __pid_t __getpgid (__pid_t __pid) __THROW;
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-extern __pid_t getpgid (__pid_t __pid) __THROW;
-#endif
-
-
-/* Set the process group ID of the process matching PID to PGID.
-   If PID is zero, the current process's process group ID is set.
-   If PGID is zero, the process ID of the process is used.  */
-extern int setpgid (__pid_t __pid, __pid_t __pgid) __THROW;
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-/* Both System V and BSD have `setpgrp' functions, but with different
-   calling conventions.  The BSD function is the same as POSIX.1 `setpgid'
-   (above).  The System V function takes no arguments and puts the calling
-   process in its on group like `setpgid (0, 0)'.
-
-   New programs should always use `setpgid' instead.
-
-   GNU provides the POSIX.1 function.  */
-
-/* Set the process group ID of the calling process to its own PID.
-   This is exactly the same as `setpgid (0, 0)'.  */
-extern int setpgrp (void) __THROW;
-
-#endif	/* Use misc or X/Open.  */
-
-/* Create a new session with the calling process as its leader.
-   The process group IDs of the session and the calling process
-   are set to the process ID of the calling process, which is returned.  */
-extern __pid_t setsid (void) __THROW;
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-/* Return the session ID of the given process.  */
-extern __pid_t getsid (__pid_t __pid) __THROW;
-#endif
-
-/* Get the real user ID of the calling process.  */
-extern __uid_t getuid (void) __THROW;
-
-/* Get the effective user ID of the calling process.  */
-extern __uid_t geteuid (void) __THROW;
-
-/* Get the real group ID of the calling process.  */
-extern __gid_t getgid (void) __THROW;
-
-/* Get the effective group ID of the calling process.  */
-extern __gid_t getegid (void) __THROW;
-
-/* If SIZE is zero, return the number of supplementary groups
-   the calling process is in.  Otherwise, fill in the group IDs
-   of its supplementary groups in LIST and return the number written.  */
-extern int getgroups (int __size, __gid_t __list[]) __THROW __wur;
-
-#ifdef	__USE_GNU
-/* Return nonzero iff the calling process is in group GID.  */
-extern int group_member (__gid_t __gid) __THROW;
-#endif
-
-/* Set the user ID of the calling process to UID.
-   If the calling process is the super-user, set the real
-   and effective user IDs, and the saved set-user-ID to UID;
-   if not, the effective user ID is set to UID.  */
-extern int setuid (__uid_t __uid) __THROW __wur;
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-/* Set the real user ID of the calling process to RUID,
-   and the effective user ID of the calling process to EUID.  */
-extern int setreuid (__uid_t __ruid, __uid_t __euid) __THROW __wur;
-#endif
-
-#ifdef __USE_XOPEN2K
-/* Set the effective user ID of the calling process to UID.  */
-extern int seteuid (__uid_t __uid) __THROW __wur;
-#endif /* Use POSIX.1-2001.  */
-
-/* Set the group ID of the calling process to GID.
-   If the calling process is the super-user, set the real
-   and effective group IDs, and the saved set-group-ID to GID;
-   if not, the effective group ID is set to GID.  */
-extern int setgid (__gid_t __gid) __THROW __wur;
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-/* Set the real group ID of the calling process to RGID,
-   and the effective group ID of the calling process to EGID.  */
-extern int setregid (__gid_t __rgid, __gid_t __egid) __THROW __wur;
-#endif
-
-#ifdef __USE_XOPEN2K
-/* Set the effective group ID of the calling process to GID.  */
-extern int setegid (__gid_t __gid) __THROW __wur;
-#endif /* Use POSIX.1-2001.  */
-
-#ifdef __USE_GNU
-/* Fetch the real user ID, effective user ID, and saved-set user ID,
-   of the calling process.  */
-extern int getresuid (__uid_t *__ruid, __uid_t *__euid, __uid_t *__suid)
-     __THROW;
-
-/* Fetch the real group ID, effective group ID, and saved-set group ID,
-   of the calling process.  */
-extern int getresgid (__gid_t *__rgid, __gid_t *__egid, __gid_t *__sgid)
-     __THROW;
-
-/* Set the real user ID, effective user ID, and saved-set user ID,
-   of the calling process to RUID, EUID, and SUID, respectively.  */
-extern int setresuid (__uid_t __ruid, __uid_t __euid, __uid_t __suid)
-     __THROW __wur;
-
-/* Set the real group ID, effective group ID, and saved-set group ID,
-   of the calling process to RGID, EGID, and SGID, respectively.  */
-extern int setresgid (__gid_t __rgid, __gid_t __egid, __gid_t __sgid)
-     __THROW __wur;
-#endif
-
-
-/* Clone the calling process, creating an exact copy.
-   Return -1 for errors, 0 to the new process,
-   and the process ID of the new process to the old process.  */
-extern __pid_t fork (void) __THROWNL;
-
-#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8) \
-    || defined __USE_MISC
-/* Clone the calling process, but without copying the whole address space.
-   The calling process is suspended until the new process exits or is
-   replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
-   and the process ID of the new process to the old process.  */
-extern __pid_t vfork (void) __THROW;
-#endif /* Use misc or XPG < 7. */
-
-
-/* Return the pathname of the terminal FD is open on, or NULL on errors.
-   The returned storage is good only until the next call to this function.  */
-extern char *ttyname (int __fd) __THROW;
-
-/* Store at most BUFLEN characters of the pathname of the terminal FD is
-   open on in BUF.  Return 0 on success, otherwise an error number.  */
-extern int ttyname_r (int __fd, char *__buf, size_t __buflen)
-     __THROW __nonnull ((2)) __wur;
-
-/* Return 1 if FD is a valid descriptor associated
-   with a terminal, zero if not.  */
-extern int isatty (int __fd) __THROW;
-
-#if defined __USE_MISC \
-    || (defined __USE_XOPEN_EXTENDED && !defined __USE_UNIX98)
-/* Return the index into the active-logins file (utmp) for
-   the controlling terminal.  */
-extern int ttyslot (void) __THROW;
-#endif
-
-
-/* Make a link to FROM named TO.  */
-extern int link (const char *__from, const char *__to)
-     __THROW __nonnull ((1, 2)) __wur;
-
-#ifdef __USE_ATFILE
-/* Like link but relative paths in TO and FROM are interpreted relative
-   to FROMFD and TOFD respectively.  */
-extern int linkat (int __fromfd, const char *__from, int __tofd,
-		   const char *__to, int __flags)
-     __THROW __nonnull ((2, 4)) __wur;
-#endif
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
-/* Make a symbolic link to FROM named TO.  */
-extern int symlink (const char *__from, const char *__to)
-     __THROW __nonnull ((1, 2)) __wur;
-
-/* Read the contents of the symbolic link PATH into no more than
-   LEN bytes of BUF.  The contents are not null-terminated.
-   Returns the number of characters read, or -1 for errors.  */
-extern ssize_t readlink (const char *__restrict __path,
-			 char *__restrict __buf, size_t __len)
-     __THROW __nonnull ((1, 2)) __wur;
-#endif /* Use POSIX.1-2001.  */
-
-#ifdef __USE_ATFILE
-/* Like symlink but a relative path in TO is interpreted relative to TOFD.  */
-extern int symlinkat (const char *__from, int __tofd,
-		      const char *__to) __THROW __nonnull ((1, 3)) __wur;
-
-/* Like readlink but a relative PATH is interpreted relative to FD.  */
-extern ssize_t readlinkat (int __fd, const char *__restrict __path,
-			   char *__restrict __buf, size_t __len)
-     __THROW __nonnull ((2, 3)) __wur;
-#endif
-
-/* Remove the link NAME.  */
-extern int unlink (const char *__name) __THROW __nonnull ((1));
-
-#ifdef __USE_ATFILE
-/* Remove the link NAME relative to FD.  */
-extern int unlinkat (int __fd, const char *__name, int __flag)
-     __THROW __nonnull ((2));
-#endif
-
-/* Remove the directory PATH.  */
-extern int rmdir (const char *__path) __THROW __nonnull ((1));
-
-
-/* Return the foreground process group ID of FD.  */
-extern __pid_t tcgetpgrp (int __fd) __THROW;
-
-/* Set the foreground process group ID of FD set PGRP_ID.  */
-extern int tcsetpgrp (int __fd, __pid_t __pgrp_id) __THROW;
-
-
-/* Return the login name of the user.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern char *getlogin (void);
-#if defined __USE_REENTRANT || defined __USE_POSIX199506
-/* Return at most NAME_LEN characters of the login name of the user in NAME.
-   If it cannot be determined or some other error occurred, return the error
-   code.  Otherwise return 0.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int getlogin_r (char *__name, size_t __name_len) __nonnull ((1));
-#endif
-
-#ifdef	__USE_MISC
-/* Set the login name returned by `getlogin'.  */
-extern int setlogin (const char *__name) __THROW __nonnull ((1));
-#endif
-
-
-#ifdef	__USE_POSIX2
-/* Get definitions and prototypes for functions to process the
-   arguments in ARGV (ARGC of them, minus the program name) for
-   options given in OPTS.  */
-# define __need_getopt
-# include <getopt.h>
-#endif
-
-
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-/* Put the name of the current host in no more than LEN bytes of NAME.
-   The result is null-terminated if LEN is large enough for the full
-   name and the terminator.  */
-extern int gethostname (char *__name, size_t __len) __THROW __nonnull ((1));
-#endif
-
-
-#if defined __USE_MISC
-/* Set the name of the current host to NAME, which is LEN bytes long.
-   This call is restricted to the super-user.  */
-extern int sethostname (const char *__name, size_t __len)
-     __THROW __nonnull ((1)) __wur;
-
-/* Set the current machine's Internet number to ID.
-   This call is restricted to the super-user.  */
-extern int sethostid (long int __id) __THROW __wur;
-
-
-/* Get and set the NIS (aka YP) domain name, if any.
-   Called just like `gethostname' and `sethostname'.
-   The NIS domain name is usually the empty string when not using NIS.  */
-extern int getdomainname (char *__name, size_t __len)
-     __THROW __nonnull ((1)) __wur;
-extern int setdomainname (const char *__name, size_t __len)
-     __THROW __nonnull ((1)) __wur;
-
-
-/* Revoke access permissions to all processes currently communicating
-   with the control terminal, and then send a SIGHUP signal to the process
-   group of the control terminal.  */
-extern int vhangup (void) __THROW;
-
-/* Revoke the access of all descriptors currently open on FILE.  */
-extern int revoke (const char *__file) __THROW __nonnull ((1)) __wur;
-
-
-/* Enable statistical profiling, writing samples of the PC into at most
-   SIZE bytes of SAMPLE_BUFFER; every processor clock tick while profiling
-   is enabled, the system examines the user PC and increments
-   SAMPLE_BUFFER[((PC - OFFSET) / 2) * SCALE / 65536].  If SCALE is zero,
-   disable profiling.  Returns zero on success, -1 on error.  */
-extern int profil (unsigned short int *__sample_buffer, size_t __size,
-		   size_t __offset, unsigned int __scale)
-     __THROW __nonnull ((1));
-
-
-/* Turn accounting on if NAME is an existing file.  The system will then write
-   a record for each process as it terminates, to this file.  If NAME is NULL,
-   turn accounting off.  This call is restricted to the super-user.  */
-extern int acct (const char *__name) __THROW;
-
-
-/* Successive calls return the shells listed in `/etc/shells'.  */
-extern char *getusershell (void) __THROW;
-extern void endusershell (void) __THROW; /* Discard cached info.  */
-extern void setusershell (void) __THROW; /* Rewind and re-read the file.  */
-
-
-/* Put the program in the background, and dissociate from the controlling
-   terminal.  If NOCHDIR is zero, do `chdir ("/")'.  If NOCLOSE is zero,
-   redirects stdin, stdout, and stderr to /dev/null.  */
-extern int daemon (int __nochdir, int __noclose) __THROW __wur;
-#endif /* Use misc.  */
-
-
-#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
-/* Make PATH be the root directory (the starting point for absolute paths).
-   This call is restricted to the super-user.  */
-extern int chroot (const char *__path) __THROW __nonnull ((1)) __wur;
-
-/* Prompt with PROMPT and read a string from the terminal without echoing.
-   Uses /dev/tty if possible; otherwise stderr and stdin.  */
-extern char *getpass (const char *__prompt) __nonnull ((1));
-#endif /* Use misc || X/Open.  */
-
-
-/* Make all changes done to FD actually appear on disk.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-extern int fsync (int __fd);
-
-
-#ifdef __USE_GNU
-/* Make all changes done to all files on the file system associated
-   with FD actually appear on disk.  */
-extern int syncfs (int __fd) __THROW;
-#endif
-
-
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-
-/* Return identifier for the current host.  */
-extern long int gethostid (void);
-
-/* Make all changes done to all files actually appear on disk.  */
-extern void sync (void) __THROW;
-
-
-# if defined __USE_MISC || !defined __USE_XOPEN2K
-/* Return the number of bytes in a page.  This is the system's page size,
-   which is not necessarily the same as the hardware page size.  */
-extern int getpagesize (void)  __THROW __attribute__ ((__const__));
-
-
-/* Return the maximum number of file descriptors
-   the current process could possibly have.  */
-extern int getdtablesize (void) __THROW;
-# endif
-
-#endif /* Use misc || X/Open Unix.  */
-
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-
-/* Truncate FILE to LENGTH bytes.  */
-# ifndef __USE_FILE_OFFSET64
-extern int truncate (const char *__file, __off_t __length)
-     __THROW __nonnull ((1)) __wur;
-# else
-#  ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (truncate,
-			   (const char *__file, __off64_t __length),
-			   truncate64) __nonnull ((1)) __wur;
-#  else
-#   define truncate truncate64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int truncate64 (const char *__file, __off64_t __length)
-     __THROW __nonnull ((1)) __wur;
-# endif
-
-#endif /* Use X/Open Unix || POSIX 2008.  */
-
-#if defined __USE_POSIX199309 \
-    || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
-
-/* Truncate the file FD is open on to LENGTH bytes.  */
-# ifndef __USE_FILE_OFFSET64
-extern int ftruncate (int __fd, __off_t __length) __THROW __wur;
-# else
-#  ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (ftruncate, (int __fd, __off64_t __length),
-			   ftruncate64) __wur;
-#  else
-#   define ftruncate ftruncate64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int ftruncate64 (int __fd, __off64_t __length) __THROW __wur;
-# endif
-
-#endif /* Use POSIX.1b || X/Open Unix || XPG6.  */
-
-
-#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \
-    || defined __USE_MISC
-
-/* Set the end of accessible data space (aka "the break") to ADDR.
-   Returns zero on success and -1 for errors (with errno set).  */
-extern int brk (void *__addr) __THROW __wur;
-
-/* Increase or decrease the end of accessible data space by DELTA bytes.
-   If successful, returns the address the previous end of data space
-   (i.e. the beginning of the new space, if DELTA > 0);
-   returns (void *) -1 for errors (with errno set).  */
-extern void *sbrk (intptr_t __delta) __THROW;
-#endif
-
-
-#ifdef __USE_MISC
-/* Invoke `system call' number SYSNO, passing it the remaining arguments.
-   This is completely system-dependent, and not often useful.
-
-   In Unix, `syscall' sets `errno' for all errors and most calls return -1
-   for errors; in many systems you cannot pass arguments or get return
-   values for all system calls (`pipe', `fork', and `getppid' typically
-   among them).
-
-   In Mach, all system calls take normal arguments and always return an
-   error code (zero for success).  */
-extern long int syscall (long int __sysno, ...) __THROW;
-
-#endif	/* Use misc.  */
-
-
-#if (defined __USE_MISC || defined __USE_XOPEN_EXTENDED) && !defined F_LOCK
-/* NOTE: These declarations also appear in <fcntl.h>; be sure to keep both
-   files consistent.  Some systems have them there and some here, and some
-   software depends on the macros being defined without including both.  */
-
-/* `lockf' is a simpler interface to the locking facilities of `fcntl'.
-   LEN is always relative to the current file position.
-   The CMD argument is one of the following.
-
-   This function is a cancellation point and therefore not marked with
-   __THROW.  */
-
-# define F_ULOCK 0	/* Unlock a previously locked region.  */
-# define F_LOCK  1	/* Lock a region for exclusive use.  */
-# define F_TLOCK 2	/* Test and lock a region for exclusive use.  */
-# define F_TEST  3	/* Test a region for other processes locks.  */
-
-# ifndef __USE_FILE_OFFSET64
-extern int lockf (int __fd, int __cmd, __off_t __len) __wur;
-# else
-#  ifdef __REDIRECT
-extern int __REDIRECT (lockf, (int __fd, int __cmd, __off64_t __len),
-		       lockf64) __wur;
-#  else
-#   define lockf lockf64
-#  endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int lockf64 (int __fd, int __cmd, __off64_t __len) __wur;
-# endif
-#endif /* Use misc and F_LOCK not already defined.  */
-
-
-#ifdef __USE_GNU
-
-/* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno'
-   set to EINTR.  */
-
-# define TEMP_FAILURE_RETRY(expression) \
-  (__extension__							      \
-    ({ long int __result;						      \
-       do __result = (long int) (expression);				      \
-       while (__result == -1L && errno == EINTR);			      \
-       __result; }))
-#endif
-
-#if defined __USE_POSIX199309 || defined __USE_UNIX98
-/* Synchronize at least the data part of a file with the underlying
-   media.  */
-extern int fdatasync (int __fildes);
-#endif /* Use POSIX199309 */
-
-
-/* XPG4.2 specifies that prototypes for the encryption functions must
-   be defined here.  */
-#ifdef	__USE_XOPEN
-/* Encrypt at most 8 characters from KEY using salt to perturb DES.  */
-extern char *crypt (const char *__key, const char *__salt)
-     __THROW __nonnull ((1, 2));
-
-/* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt
-   block in place.  */
-extern void encrypt (char *__glibc_block, int __edflag)
-     __THROW __nonnull ((1));
-
-
-/* Swab pairs bytes in the first N bytes of the area pointed to by
-   FROM and copy the result to TO.  The value of TO must not be in the
-   range [FROM - N + 1, FROM - 1].  If N is odd the first byte in FROM
-   is without partner.  */
-extern void swab (const void *__restrict __from, void *__restrict __to,
-		  ssize_t __n) __THROW __nonnull ((1, 2));
-#endif
-
-
-/* The Single Unix specification demands this prototype to be here.
-   It is also found in <stdio.h>.  */
-#if defined __USE_XOPEN && !defined __USE_XOPEN2K
-/* Return the name of the controlling terminal.  */
-extern char *ctermid (char *__s) __THROW;
-#endif
-
-
-/* Define some macros helping to catch buffer overflows.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-# include <bits/unistd.h>
-#endif
-
-__END_DECLS
-
-#endif /* unistd.h  */
diff --git a/openflow/usr/include/ustat.h b/openflow/usr/include/ustat.h
deleted file mode 100644
index cba150e..0000000
--- a/openflow/usr/include/ustat.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sys/ustat.h>
diff --git a/openflow/usr/include/utime.h b/openflow/usr/include/utime.h
deleted file mode 100644
index 3cc0d5e..0000000
--- a/openflow/usr/include/utime.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	POSIX Standard: 5.6.6 Set File Access and Modification Times  <utime.h>
- */
-
-#ifndef	_UTIME_H
-#define	_UTIME_H	1
-
-#include <features.h>
-
-__BEGIN_DECLS
-
-#include <bits/types.h>
-
-#if defined __USE_XOPEN || defined __USE_XOPEN2K
-# define __need_time_t
-# include <time.h>
-#endif
-
-/* Structure describing file times.  */
-struct utimbuf
-  {
-    __time_t actime;		/* Access time.  */
-    __time_t modtime;		/* Modification time.  */
-  };
-
-/* Set the access and modification times of FILE to those given in
-   *FILE_TIMES.  If FILE_TIMES is NULL, set them to the current time.  */
-extern int utime (const char *__file,
-		  const struct utimbuf *__file_times)
-     __THROW __nonnull ((1));
-
-__END_DECLS
-
-#endif /* utime.h */
diff --git a/openflow/usr/include/utmp.h b/openflow/usr/include/utmp.h
deleted file mode 100644
index 83e892d..0000000
--- a/openflow/usr/include/utmp.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright (C) 1993-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_UTMP_H
-#define	_UTMP_H	1
-
-#include <features.h>
-
-#include <sys/types.h>
-
-
-__BEGIN_DECLS
-
-/* Get system dependent values and data structures.  */
-#include <bits/utmp.h>
-
-/* Compatibility names for the strings of the canonical file names.  */
-#define UTMP_FILE	_PATH_UTMP
-#define UTMP_FILENAME	_PATH_UTMP
-#define WTMP_FILE	_PATH_WTMP
-#define WTMP_FILENAME	_PATH_WTMP
-
-
-
-/* Make FD be the controlling terminal, stdin, stdout, and stderr;
-   then close FD.  Returns 0 on success, nonzero on error.  */
-extern int login_tty (int __fd) __THROW;
-
-
-/* Write the given entry into utmp and wtmp.  */
-extern void login (const struct utmp *__entry) __THROW;
-
-/* Write the utmp entry to say the user on UT_LINE has logged out.  */
-extern int logout (const char *__ut_line) __THROW;
-
-/* Append to wtmp an entry for the current time and the given info.  */
-extern void logwtmp (const char *__ut_line, const char *__ut_name,
-		     const char *__ut_host) __THROW;
-
-/* Append entry UTMP to the wtmp-like file WTMP_FILE.  */
-extern void updwtmp (const char *__wtmp_file, const struct utmp *__utmp)
-     __THROW;
-
-/* Change name of the utmp file to be examined.  */
-extern int utmpname (const char *__file) __THROW;
-
-/* Read next entry from a utmp-like file.  */
-extern struct utmp *getutent (void) __THROW;
-
-/* Reset the input stream to the beginning of the file.  */
-extern void setutent (void) __THROW;
-
-/* Close the current open file.  */
-extern void endutent (void) __THROW;
-
-/* Search forward from the current point in the utmp file until the
-   next entry with a ut_type matching ID->ut_type.  */
-extern struct utmp *getutid (const struct utmp *__id) __THROW;
-
-/* Search forward from the current point in the utmp file until the
-   next entry with a ut_line matching LINE->ut_line.  */
-extern struct utmp *getutline (const struct utmp *__line) __THROW;
-
-/* Write out entry pointed to by UTMP_PTR into the utmp file.  */
-extern struct utmp *pututline (const struct utmp *__utmp_ptr) __THROW;
-
-
-#ifdef	__USE_MISC
-/* Reentrant versions of the file for handling utmp files.  */
-extern int getutent_r (struct utmp *__buffer, struct utmp **__result) __THROW;
-
-extern int getutid_r (const struct utmp *__id, struct utmp *__buffer,
-		      struct utmp **__result) __THROW;
-
-extern int getutline_r (const struct utmp *__line,
-			struct utmp *__buffer, struct utmp **__result) __THROW;
-
-#endif	/* Use misc.  */
-
-__END_DECLS
-
-#endif /* utmp.h  */
diff --git a/openflow/usr/include/utmpx.h b/openflow/usr/include/utmpx.h
deleted file mode 100644
index 3c45ba3..0000000
--- a/openflow/usr/include/utmpx.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_UTMPX_H
-#define	_UTMPX_H	1
-
-#include <features.h>
-#include <sys/time.h>
-
-/* Required according to Unix98.  */
-#ifndef __pid_t_defined
-typedef __pid_t pid_t;
-# define __pid_t_defined
-#endif
-
-/* Get system dependent values and data structures.  */
-#include <bits/utmpx.h>
-
-#ifdef __USE_GNU
-/* Compatibility names for the strings of the canonical file names.  */
-# define UTMPX_FILE	_PATH_UTMPX
-# define UTMPX_FILENAME	_PATH_UTMPX
-# define WTMPX_FILE	_PATH_WTMPX
-# define WTMPX_FILENAME	_PATH_WTMPX
-#endif
-
-/* For the getutmp{,x} functions we need the `struct utmp'.  */
-#ifdef __USE_GNU
-struct utmp;
-#endif
-
-
-__BEGIN_DECLS
-
-/* Open user accounting database.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void setutxent (void);
-
-/* Close user accounting database.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern void endutxent (void);
-
-/* Get the next entry from the user accounting database.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct utmpx *getutxent (void);
-
-/* Get the user accounting database entry corresponding to ID.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct utmpx *getutxid (const struct utmpx *__id);
-
-/* Get the user accounting database entry corresponding to LINE.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct utmpx *getutxline (const struct utmpx *__line);
-
-/* Write the entry UTMPX into the user accounting database.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern struct utmpx *pututxline (const struct utmpx *__utmpx);
-
-
-#ifdef __USE_GNU
-/* Change name of the utmpx file to be examined.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int utmpxname (const char *__file);
-
-/* Append entry UTMP to the wtmpx-like file WTMPX_FILE.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern void updwtmpx (const char *__wtmpx_file,
-		      const struct utmpx *__utmpx);
-
-
-/* Copy the information in UTMPX to UTMP.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern void getutmp (const struct utmpx *__utmpx,
-		     struct utmp *__utmp);
-
-/* Copy the information in UTMP to UTMPX.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern void getutmpx (const struct utmp *__utmp, struct utmpx *__utmpx);
-#endif
-
-__END_DECLS
-
-#endif /* utmpx.h  */
diff --git a/openflow/usr/include/values.h b/openflow/usr/include/values.h
deleted file mode 100644
index 5ae2ead..0000000
--- a/openflow/usr/include/values.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Old compatibility names for <limits.h> and <float.h> constants.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* This interface is obsolete.  New programs should use
-   <limits.h> and/or <float.h> instead of <values.h>.  */
-
-#ifndef	_VALUES_H
-#define	_VALUES_H	1
-
-#include <features.h>
-
-#include <limits.h>
-
-#define _TYPEBITS(type)	(sizeof (type) * CHAR_BIT)
-
-#define CHARBITS	_TYPEBITS (char)
-#define SHORTBITS	_TYPEBITS (short int)
-#define INTBITS		_TYPEBITS (int)
-#define LONGBITS	_TYPEBITS (long int)
-#define PTRBITS		_TYPEBITS (char *)
-#define DOUBLEBITS	_TYPEBITS (double)
-#define FLOATBITS	_TYPEBITS (float)
-
-#define MINSHORT	SHRT_MIN
-#define	MININT		INT_MIN
-#define	MINLONG		LONG_MIN
-
-#define	MAXSHORT	SHRT_MAX
-#define	MAXINT		INT_MAX
-#define	MAXLONG		LONG_MAX
-
-#define HIBITS		MINSHORT
-#define HIBITL		MINLONG
-
-
-#include <float.h>
-
-#define	MAXDOUBLE	DBL_MAX
-#define	MAXFLOAT	FLT_MAX
-#define	MINDOUBLE	DBL_MIN
-#define	MINFLOAT	FLT_MIN
-#define	DMINEXP		DBL_MIN_EXP
-#define	FMINEXP		FLT_MIN_EXP
-#define	DMAXEXP		DBL_MAX_EXP
-#define	FMAXEXP		FLT_MAX_EXP
-
-
-#ifdef __USE_MISC
-/* Some systems define this name instead of CHAR_BIT or CHARBITS.  */
-# define BITSPERBYTE	CHAR_BIT
-#endif
-
-#endif	/* values.h */
diff --git a/openflow/usr/include/video/edid.h b/openflow/usr/include/video/edid.h
deleted file mode 100644
index 6aeb974..0000000
--- a/openflow/usr/include/video/edid.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __linux_video_edid_h__
-#define __linux_video_edid_h__
-
-struct edid_info {
-	unsigned char dummy[128];
-};
-
-
-#endif /* __linux_video_edid_h__ */
diff --git a/openflow/usr/include/video/sisfb.h b/openflow/usr/include/video/sisfb.h
deleted file mode 100644
index e9b8e2c..0000000
--- a/openflow/usr/include/video/sisfb.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * sisfb.h - definitions for the SiS framebuffer driver
- *
- * Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the named License,
- * or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef _LINUX_SISFB_H_
-#define _LINUX_SISFB_H_
-
-#include <linux/types.h>
-#include <asm/ioctl.h>
-
-/**********************************************/
-/*                   PUBLIC                   */
-/**********************************************/
-
-/* vbflags, public (others in sis.h) */
-#define CRT2_DEFAULT		0x00000001
-#define CRT2_LCD		0x00000002
-#define CRT2_TV			0x00000004
-#define CRT2_VGA		0x00000008
-#define TV_NTSC			0x00000010
-#define TV_PAL			0x00000020
-#define TV_HIVISION		0x00000040
-#define TV_YPBPR		0x00000080
-#define TV_AVIDEO		0x00000100
-#define TV_SVIDEO		0x00000200
-#define TV_SCART		0x00000400
-#define TV_PALM			0x00001000
-#define TV_PALN			0x00002000
-#define TV_NTSCJ		0x00001000
-#define TV_CHSCART		0x00008000
-#define TV_CHYPBPR525I		0x00010000
-#define CRT1_VGA		0x00000000
-#define CRT1_LCDA		0x00020000
-#define VGA2_CONNECTED          0x00040000
-#define VB_DISPTYPE_CRT1	0x00080000	/* CRT1 connected and used */
-#define VB_SINGLE_MODE		0x20000000	/* CRT1 or CRT2; determined by DISPTYPE_CRTx */
-#define VB_MIRROR_MODE		0x40000000	/* CRT1 + CRT2 identical (mirror mode) */
-#define VB_DUALVIEW_MODE	0x80000000	/* CRT1 + CRT2 independent (dual head mode) */
-
-/* Aliases: */
-#define CRT2_ENABLE		(CRT2_LCD | CRT2_TV | CRT2_VGA)
-#define TV_STANDARD		(TV_NTSC | TV_PAL | TV_PALM | TV_PALN | TV_NTSCJ)
-#define TV_INTERFACE		(TV_AVIDEO|TV_SVIDEO|TV_SCART|TV_HIVISION|TV_YPBPR|TV_CHSCART|TV_CHYPBPR525I)
-
-/* Only if TV_YPBPR is set: */
-#define TV_YPBPR525I		TV_NTSC
-#define TV_YPBPR525P		TV_PAL
-#define TV_YPBPR750P		TV_PALM
-#define TV_YPBPR1080I		TV_PALN
-#define TV_YPBPRALL 		(TV_YPBPR525I | TV_YPBPR525P | TV_YPBPR750P | TV_YPBPR1080I)
-
-#define VB_DISPTYPE_DISP2	CRT2_ENABLE
-#define VB_DISPTYPE_CRT2	CRT2_ENABLE
-#define VB_DISPTYPE_DISP1	VB_DISPTYPE_CRT1
-#define VB_DISPMODE_SINGLE	VB_SINGLE_MODE
-#define VB_DISPMODE_MIRROR	VB_MIRROR_MODE
-#define VB_DISPMODE_DUAL	VB_DUALVIEW_MODE
-#define VB_DISPLAY_MODE		(SINGLE_MODE | MIRROR_MODE | DUALVIEW_MODE)
-
-/* Structure argument for SISFB_GET_INFO ioctl  */
-struct sisfb_info {
-	__u32	sisfb_id;		/* for identifying sisfb */
-#ifndef SISFB_ID
-#define SISFB_ID	  0x53495346    /* Identify myself with 'SISF' */
-#endif
-	__u32   chip_id;		/* PCI-ID of detected chip */
-	__u32   memory;			/* total video memory in KB */
-	__u32   heapstart;		/* heap start offset in KB */
-	__u8    fbvidmode;		/* current sisfb mode */
-
-	__u8	sisfb_version;
-	__u8	sisfb_revision;
-	__u8	sisfb_patchlevel;
-
-	__u8	sisfb_caps;		/* sisfb capabilities */
-
-	__u32	sisfb_tqlen;		/* turbo queue length (in KB) */
-
-	__u32	sisfb_pcibus;		/* The card's PCI ID */
-	__u32	sisfb_pcislot;
-	__u32	sisfb_pcifunc;
-
-	__u8	sisfb_lcdpdc;		/* PanelDelayCompensation */
-
-	__u8	sisfb_lcda;		/* Detected status of LCDA for low res/text modes */
-
-	__u32	sisfb_vbflags;
-	__u32	sisfb_currentvbflags;
-
-	__u32	sisfb_scalelcd;
-	__u32	sisfb_specialtiming;
-
-	__u8	sisfb_haveemi;
-	__u8	sisfb_emi30,sisfb_emi31,sisfb_emi32,sisfb_emi33;
-	__u8	sisfb_haveemilcd;
-
-	__u8	sisfb_lcdpdca;		/* PanelDelayCompensation for LCD-via-CRT1 */
-
-	__u16	sisfb_tvxpos, sisfb_tvypos;	/* Warning: Values + 32 ! */
-
-	__u32	sisfb_heapsize;		/* heap size (in KB) */
-	__u32	sisfb_videooffset;	/* Offset of viewport in video memory (in bytes) */
-
-	__u32	sisfb_curfstn;		/* currently running FSTN/DSTN mode */
-	__u32	sisfb_curdstn;
-
-	__u16	sisfb_pci_vendor;	/* PCI vendor (SiS or XGI) */
-
-	__u32	sisfb_vbflags2;		/* ivideo->vbflags2 */
-
-	__u8	sisfb_can_post;		/* sisfb can POST this card */
-	__u8	sisfb_card_posted;	/* card is POSTED */
-	__u8	sisfb_was_boot_device;	/* This card was the boot video device (ie is primary) */
-
-	__u8	reserved[183];		/* for future use */
-};
-
-#define SISFB_CMD_GETVBFLAGS	0x55AA0001	/* no arg; result[1] = vbflags */
-#define SISFB_CMD_SWITCHCRT1	0x55AA0010	/* arg[0]: 99 = query, 0 = off, 1 = on */
-/* more to come */
-
-#define SISFB_CMD_ERR_OK	0x80000000	/* command succeeded */
-#define SISFB_CMD_ERR_LOCKED	0x80000001	/* sisfb is locked */
-#define SISFB_CMD_ERR_EARLY	0x80000002	/* request before sisfb took over gfx system */
-#define SISFB_CMD_ERR_NOVB	0x80000003	/* No video bridge */
-#define SISFB_CMD_ERR_NOCRT2	0x80000004	/* can't change CRT1 status, CRT2 disabled */
-/* more to come */
-#define SISFB_CMD_ERR_UNKNOWN   0x8000ffff	/* Unknown command */
-#define SISFB_CMD_ERR_OTHER	0x80010000	/* Other error */
-
-/* Argument for SISFB_CMD ioctl */
-struct sisfb_cmd {
-	__u32  sisfb_cmd;
-	__u32  sisfb_arg[16];
-	__u32  sisfb_result[4];
-};
-
-/* Additional IOCTLs for communication sisfb <> X driver                */
-/* If changing this, vgatypes.h must also be changed (for X driver)    */
-
-/* ioctl for identifying and giving some info (esp. memory heap start) */
-#define SISFB_GET_INFO_SIZE	_IOR(0xF3,0x00,__u32)
-#define SISFB_GET_INFO		_IOR(0xF3,0x01,struct sisfb_info)
-
-/* ioctrl to get current vertical retrace status */
-#define SISFB_GET_VBRSTATUS	_IOR(0xF3,0x02,__u32)
-
-/* ioctl to enable/disable panning auto-maximize (like nomax parameter) */
-#define SISFB_GET_AUTOMAXIMIZE	_IOR(0xF3,0x03,__u32)
-#define SISFB_SET_AUTOMAXIMIZE	_IOW(0xF3,0x03,__u32)
-
-/* ioctls to relocate TV output (x=D[31:16], y=D[15:0], + 32)*/
-#define SISFB_GET_TVPOSOFFSET	_IOR(0xF3,0x04,__u32)
-#define SISFB_SET_TVPOSOFFSET	_IOW(0xF3,0x04,__u32)
-
-/* ioctl for internal sisfb commands (sisfbctrl) */
-#define SISFB_COMMAND		_IOWR(0xF3,0x05,struct sisfb_cmd)
-
-/* ioctl for locking sisfb (no register access during lock) */
-/* As of now, only used to avoid register access during
- * the ioctls listed above.
- */
-#define SISFB_SET_LOCK		_IOW(0xF3,0x06,__u32)
-
-/* ioctls 0xF3 up to 0x3F reserved for sisfb */
-
-/****************************************************************/
-/* The following are deprecated and should not be used anymore: */
-/****************************************************************/
-/* ioctl for identifying and giving some info (esp. memory heap start) */
-#define SISFB_GET_INFO_OLD	   _IOR('n',0xF8,__u32)
-/* ioctrl to get current vertical retrace status */
-#define SISFB_GET_VBRSTATUS_OLD	   _IOR('n',0xF9,__u32)
-/* ioctl to enable/disable panning auto-maximize (like nomax parameter) */
-#define SISFB_GET_AUTOMAXIMIZE_OLD _IOR('n',0xFA,__u32)
-#define SISFB_SET_AUTOMAXIMIZE_OLD _IOW('n',0xFA,__u32)
-/****************************************************************/
-/*               End of deprecated ioctl numbers                */
-/****************************************************************/
-
-/* For fb memory manager (FBIO_ALLOC, FBIO_FREE) */
-struct sis_memreq {
-	__u32	offset;
-	__u32	size;
-};
-
-/**********************************************/
-/*                  PRIVATE                   */
-/*         (for IN-KERNEL usage only)         */
-/**********************************************/
-
-
-#endif /* _LINUX_SISFB_H_ */
diff --git a/openflow/usr/include/video/uvesafb.h b/openflow/usr/include/video/uvesafb.h
deleted file mode 100644
index 79e281b..0000000
--- a/openflow/usr/include/video/uvesafb.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _UVESAFB_H
-#define _UVESAFB_H
-
-#include <linux/types.h>
-
-struct v86_regs {
-	__u32 ebx;
-	__u32 ecx;
-	__u32 edx;
-	__u32 esi;
-	__u32 edi;
-	__u32 ebp;
-	__u32 eax;
-	__u32 eip;
-	__u32 eflags;
-	__u32 esp;
-	__u16 cs;
-	__u16 ss;
-	__u16 es;
-	__u16 ds;
-	__u16 fs;
-	__u16 gs;
-};
-
-/* Task flags */
-#define TF_VBEIB	0x01
-#define TF_BUF_ESDI	0x02
-#define TF_BUF_ESBX	0x04
-#define TF_BUF_RET	0x08
-#define TF_EXIT		0x10
-
-struct uvesafb_task {
-	__u8 flags;
-	int buf_len;
-	struct v86_regs regs;
-};
-
-/* Constants for the capabilities field
- * in vbe_ib */
-#define VBE_CAP_CAN_SWITCH_DAC	0x01
-#define VBE_CAP_VGACOMPAT	0x02
-
-/* The VBE Info Block */
-struct vbe_ib {
-	char  vbe_signature[4];
-	__u16 vbe_version;
-	__u32 oem_string_ptr;
-	__u32 capabilities;
-	__u32 mode_list_ptr;
-	__u16 total_memory;
-	__u16 oem_software_rev;
-	__u32 oem_vendor_name_ptr;
-	__u32 oem_product_name_ptr;
-	__u32 oem_product_rev_ptr;
-	__u8  reserved[222];
-	char  oem_data[256];
-	char  misc_data[512];
-} __attribute__ ((packed));
-
-#endif /* _UVESAFB_H */
diff --git a/openflow/usr/include/wait.h b/openflow/usr/include/wait.h
deleted file mode 100644
index d01b811..0000000
--- a/openflow/usr/include/wait.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sys/wait.h>
diff --git a/openflow/usr/include/wchar.h b/openflow/usr/include/wchar.h
deleted file mode 100644
index e413416..0000000
--- a/openflow/usr/include/wchar.h
+++ /dev/null
@@ -1,903 +0,0 @@
-/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *      ISO C99 Standard: 7.24
- *	Extended multibyte and wide character utilities	<wchar.h>
- */
-
-#ifndef _WCHAR_H
-
-#if !defined __need_mbstate_t && !defined __need_wint_t
-# define _WCHAR_H 1
-# include <features.h>
-#endif
-
-#ifdef _WCHAR_H
-/* Get FILE definition.  */
-# define __need___FILE
-# if defined __USE_UNIX98 || defined __USE_XOPEN2K
-#  define __need_FILE
-# endif
-# include <stdio.h>
-/* Get va_list definition.  */
-# define __need___va_list
-# include <stdarg.h>
-
-# include <bits/wchar.h>
-
-/* Get size_t, wchar_t, wint_t and NULL from <stddef.h>.  */
-# define __need_size_t
-# define __need_wchar_t
-# define __need_NULL
-#endif
-#if defined _WCHAR_H || defined __need_wint_t || !defined __WINT_TYPE__
-# undef __need_wint_t
-# define __need_wint_t
-# include <stddef.h>
-
-/* We try to get wint_t from <stddef.h>, but not all GCC versions define it
-   there.  So define it ourselves if it remains undefined.  */
-# ifndef _WINT_T
-/* Integral type unchanged by default argument promotions that can
-   hold any value corresponding to members of the extended character
-   set, as well as at least one value that does not correspond to any
-   member of the extended character set.  */
-#  define _WINT_T
-typedef unsigned int wint_t;
-# else
-/* Work around problems with the <stddef.h> file which doesn't put
-   wint_t in the std namespace.  */
-#  if defined __cplusplus && defined _GLIBCPP_USE_NAMESPACES \
-      && defined __WINT_TYPE__
-__BEGIN_NAMESPACE_STD
-typedef __WINT_TYPE__ wint_t;
-__END_NAMESPACE_STD
-#  endif
-# endif
-
-/* Tell the caller that we provide correct C++ prototypes.  */
-# if defined __cplusplus && __GNUC_PREREQ (4, 4)
-#  define __CORRECT_ISO_CPP_WCHAR_H_PROTO
-# endif
-#endif
-
-#if (defined _WCHAR_H || defined __need_mbstate_t) && !defined ____mbstate_t_defined
-# define ____mbstate_t_defined	1
-/* Conversion state information.  */
-typedef struct
-{
-  int __count;
-  union
-  {
-# ifdef __WINT_TYPE__
-    __WINT_TYPE__ __wch;
-# else
-    wint_t __wch;
-# endif
-    char __wchb[4];
-  } __value;		/* Value so far.  */
-} __mbstate_t;
-#endif
-#undef __need_mbstate_t
-
-
-/* The rest of the file is only used if used if __need_mbstate_t is not
-   defined.  */
-#ifdef _WCHAR_H
-
-# ifndef __mbstate_t_defined
-__BEGIN_NAMESPACE_C99
-/* Public type.  */
-typedef __mbstate_t mbstate_t;
-__END_NAMESPACE_C99
-#  define __mbstate_t_defined 1
-# endif
-
-#ifdef __USE_GNU
-__USING_NAMESPACE_C99(mbstate_t)
-#endif
-
-#ifndef WCHAR_MIN
-/* These constants might also be defined in <inttypes.h>.  */
-# define WCHAR_MIN __WCHAR_MIN
-# define WCHAR_MAX __WCHAR_MAX
-#endif
-
-#ifndef WEOF
-# define WEOF (0xffffffffu)
-#endif
-
-/* For XPG4 compliance we have to define the stuff from <wctype.h> here
-   as well.  */
-#if defined __USE_XOPEN && !defined __USE_UNIX98
-# include <wctype.h>
-#endif
-
-
-__BEGIN_DECLS
-
-__BEGIN_NAMESPACE_STD
-/* This incomplete type is defined in <time.h> but needed here because
-   of `wcsftime'.  */
-struct tm;
-__END_NAMESPACE_STD
-/* XXX We have to clean this up at some point.  Since tm is in the std
-   namespace but wcsftime is in __c99 the type wouldn't be found
-   without inserting it in the global namespace.  */
-__USING_NAMESPACE_STD(tm)
-
-
-__BEGIN_NAMESPACE_STD
-/* Copy SRC to DEST.  */
-extern wchar_t *wcscpy (wchar_t *__restrict __dest,
-			const wchar_t *__restrict __src)
-     __THROW __nonnull ((1, 2));
-
-/* Copy no more than N wide-characters of SRC to DEST.  */
-extern wchar_t *wcsncpy (wchar_t *__restrict __dest,
-			 const wchar_t *__restrict __src, size_t __n)
-     __THROW __nonnull ((1, 2));
-
-/* Append SRC onto DEST.  */
-extern wchar_t *wcscat (wchar_t *__restrict __dest,
-			const wchar_t *__restrict __src)
-     __THROW __nonnull ((1, 2));
-/* Append no more than N wide-characters of SRC onto DEST.  */
-extern wchar_t *wcsncat (wchar_t *__restrict __dest,
-			 const wchar_t *__restrict __src, size_t __n)
-     __THROW __nonnull ((1, 2));
-
-/* Compare S1 and S2.  */
-extern int wcscmp (const wchar_t *__s1, const wchar_t *__s2)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-/* Compare N wide-characters of S1 and S2.  */
-extern int wcsncmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n)
-     __THROW __attribute_pure__ __nonnull ((1, 2));
-__END_NAMESPACE_STD
-
-#ifdef __USE_XOPEN2K8
-/* Compare S1 and S2, ignoring case.  */
-extern int wcscasecmp (const wchar_t *__s1, const wchar_t *__s2) __THROW;
-
-/* Compare no more than N chars of S1 and S2, ignoring case.  */
-extern int wcsncasecmp (const wchar_t *__s1, const wchar_t *__s2,
-			size_t __n) __THROW;
-
-/* Similar to the two functions above but take the information from
-   the provided locale and not the global locale.  */
-# include <xlocale.h>
-
-extern int wcscasecmp_l (const wchar_t *__s1, const wchar_t *__s2,
-			 __locale_t __loc) __THROW;
-
-extern int wcsncasecmp_l (const wchar_t *__s1, const wchar_t *__s2,
-			  size_t __n, __locale_t __loc) __THROW;
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Compare S1 and S2, both interpreted as appropriate to the
-   LC_COLLATE category of the current locale.  */
-extern int wcscoll (const wchar_t *__s1, const wchar_t *__s2) __THROW;
-/* Transform S2 into array pointed to by S1 such that if wcscmp is
-   applied to two transformed strings the result is the as applying
-   `wcscoll' to the original strings.  */
-extern size_t wcsxfrm (wchar_t *__restrict __s1,
-		       const wchar_t *__restrict __s2, size_t __n) __THROW;
-__END_NAMESPACE_STD
-
-#ifdef __USE_XOPEN2K8
-/* Similar to the two functions above but take the information from
-   the provided locale and not the global locale.  */
-
-/* Compare S1 and S2, both interpreted as appropriate to the
-   LC_COLLATE category of the given locale.  */
-extern int wcscoll_l (const wchar_t *__s1, const wchar_t *__s2,
-		      __locale_t __loc) __THROW;
-
-/* Transform S2 into array pointed to by S1 such that if wcscmp is
-   applied to two transformed strings the result is the as applying
-   `wcscoll' to the original strings.  */
-extern size_t wcsxfrm_l (wchar_t *__s1, const wchar_t *__s2,
-			 size_t __n, __locale_t __loc) __THROW;
-
-/* Duplicate S, returning an identical malloc'd string.  */
-extern wchar_t *wcsdup (const wchar_t *__s) __THROW __attribute_malloc__;
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Find the first occurrence of WC in WCS.  */
-#ifdef __CORRECT_ISO_CPP_WCHAR_H_PROTO
-extern "C++" wchar_t *wcschr (wchar_t *__wcs, wchar_t __wc)
-     __THROW __asm ("wcschr") __attribute_pure__;
-extern "C++" const wchar_t *wcschr (const wchar_t *__wcs, wchar_t __wc)
-     __THROW __asm ("wcschr") __attribute_pure__;
-#else
-extern wchar_t *wcschr (const wchar_t *__wcs, wchar_t __wc)
-     __THROW __attribute_pure__;
-#endif
-/* Find the last occurrence of WC in WCS.  */
-#ifdef __CORRECT_ISO_CPP_WCHAR_H_PROTO
-extern "C++" wchar_t *wcsrchr (wchar_t *__wcs, wchar_t __wc)
-     __THROW __asm ("wcsrchr") __attribute_pure__;
-extern "C++" const wchar_t *wcsrchr (const wchar_t *__wcs, wchar_t __wc)
-     __THROW __asm ("wcsrchr") __attribute_pure__;
-#else
-extern wchar_t *wcsrchr (const wchar_t *__wcs, wchar_t __wc)
-     __THROW __attribute_pure__;
-#endif
-__END_NAMESPACE_STD
-
-#ifdef __USE_GNU
-/* This function is similar to `wcschr'.  But it returns a pointer to
-   the closing NUL wide character in case C is not found in S.  */
-extern wchar_t *wcschrnul (const wchar_t *__s, wchar_t __wc)
-     __THROW __attribute_pure__;
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Return the length of the initial segmet of WCS which
-   consists entirely of wide characters not in REJECT.  */
-extern size_t wcscspn (const wchar_t *__wcs, const wchar_t *__reject)
-     __THROW __attribute_pure__;
-/* Return the length of the initial segmet of WCS which
-   consists entirely of wide characters in  ACCEPT.  */
-extern size_t wcsspn (const wchar_t *__wcs, const wchar_t *__accept)
-     __THROW __attribute_pure__;
-/* Find the first occurrence in WCS of any character in ACCEPT.  */
-#ifdef __CORRECT_ISO_CPP_WCHAR_H_PROTO
-extern "C++" wchar_t *wcspbrk (wchar_t *__wcs, const wchar_t *__accept)
-     __THROW __asm ("wcspbrk") __attribute_pure__;
-extern "C++" const wchar_t *wcspbrk (const wchar_t *__wcs,
-				     const wchar_t *__accept)
-     __THROW __asm ("wcspbrk") __attribute_pure__;
-#else
-extern wchar_t *wcspbrk (const wchar_t *__wcs, const wchar_t *__accept)
-     __THROW __attribute_pure__;
-#endif
-/* Find the first occurrence of NEEDLE in HAYSTACK.  */
-#ifdef __CORRECT_ISO_CPP_WCHAR_H_PROTO
-extern "C++" wchar_t *wcsstr (wchar_t *__haystack, const wchar_t *__needle)
-     __THROW __asm ("wcsstr") __attribute_pure__;
-extern "C++" const wchar_t *wcsstr (const wchar_t *__haystack,
-				    const wchar_t *__needle)
-     __THROW __asm ("wcsstr") __attribute_pure__;
-#else
-extern wchar_t *wcsstr (const wchar_t *__haystack, const wchar_t *__needle)
-     __THROW __attribute_pure__;
-#endif
-
-/* Divide WCS into tokens separated by characters in DELIM.  */
-extern wchar_t *wcstok (wchar_t *__restrict __s,
-			const wchar_t *__restrict __delim,
-			wchar_t **__restrict __ptr) __THROW;
-
-/* Return the number of wide characters in S.  */
-extern size_t wcslen (const wchar_t *__s) __THROW __attribute_pure__;
-__END_NAMESPACE_STD
-
-#ifdef __USE_XOPEN
-/* Another name for `wcsstr' from XPG4.  */
-# ifdef __CORRECT_ISO_CPP_WCHAR_H_PROTO
-extern "C++" wchar_t *wcswcs (wchar_t *__haystack, const wchar_t *__needle)
-     __THROW __asm ("wcswcs") __attribute_pure__;
-extern "C++" const wchar_t *wcswcs (const wchar_t *__haystack,
-				    const wchar_t *__needle)
-     __THROW __asm ("wcswcs") __attribute_pure__;
-# else
-extern wchar_t *wcswcs (const wchar_t *__haystack, const wchar_t *__needle)
-     __THROW __attribute_pure__;
-# endif
-#endif
-
-#ifdef __USE_XOPEN2K8
-/* Return the number of wide characters in S, but at most MAXLEN.  */
-extern size_t wcsnlen (const wchar_t *__s, size_t __maxlen)
-     __THROW __attribute_pure__;
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Search N wide characters of S for C.  */
-#ifdef __CORRECT_ISO_CPP_WCHAR_H_PROTO
-extern "C++" wchar_t *wmemchr (wchar_t *__s, wchar_t __c, size_t __n)
-     __THROW __asm ("wmemchr") __attribute_pure__;
-extern "C++" const wchar_t *wmemchr (const wchar_t *__s, wchar_t __c,
-				     size_t __n)
-     __THROW __asm ("wmemchr") __attribute_pure__;
-#else
-extern wchar_t *wmemchr (const wchar_t *__s, wchar_t __c, size_t __n)
-     __THROW __attribute_pure__;
-#endif
-
-/* Compare N wide characters of S1 and S2.  */
-extern int wmemcmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n)
-     __THROW __attribute_pure__;
-
-/* Copy N wide characters of SRC to DEST.  */
-extern wchar_t *wmemcpy (wchar_t *__restrict __s1,
-			 const wchar_t *__restrict __s2, size_t __n) __THROW;
-
-/* Copy N wide characters of SRC to DEST, guaranteeing
-   correct behavior for overlapping strings.  */
-extern wchar_t *wmemmove (wchar_t *__s1, const wchar_t *__s2, size_t __n)
-     __THROW;
-
-/* Set N wide characters of S to C.  */
-extern wchar_t *wmemset (wchar_t *__s, wchar_t __c, size_t __n) __THROW;
-__END_NAMESPACE_STD
-
-#ifdef __USE_GNU
-/* Copy N wide characters of SRC to DEST and return pointer to following
-   wide character.  */
-extern wchar_t *wmempcpy (wchar_t *__restrict __s1,
-			  const wchar_t *__restrict __s2, size_t __n)
-     __THROW;
-#endif
-
-
-__BEGIN_NAMESPACE_STD
-/* Determine whether C constitutes a valid (one-byte) multibyte
-   character.  */
-extern wint_t btowc (int __c) __THROW;
-
-/* Determine whether C corresponds to a member of the extended
-   character set whose multibyte representation is a single byte.  */
-extern int wctob (wint_t __c) __THROW;
-
-/* Determine whether PS points to an object representing the initial
-   state.  */
-extern int mbsinit (const mbstate_t *__ps) __THROW __attribute_pure__;
-
-/* Write wide character representation of multibyte character pointed
-   to by S to PWC.  */
-extern size_t mbrtowc (wchar_t *__restrict __pwc,
-		       const char *__restrict __s, size_t __n,
-		       mbstate_t *__restrict __p) __THROW;
-
-/* Write multibyte representation of wide character WC to S.  */
-extern size_t wcrtomb (char *__restrict __s, wchar_t __wc,
-		       mbstate_t *__restrict __ps) __THROW;
-
-/* Return number of bytes in multibyte character pointed to by S.  */
-extern size_t __mbrlen (const char *__restrict __s, size_t __n,
-			mbstate_t *__restrict __ps) __THROW;
-extern size_t mbrlen (const char *__restrict __s, size_t __n,
-		      mbstate_t *__restrict __ps) __THROW;
-__END_NAMESPACE_STD
-
-#ifdef __USE_EXTERN_INLINES
-/* Define inline function as optimization.  */
-
-/* We can use the BTOWC and WCTOB optimizations since we know that all
-   locales must use ASCII encoding for the values in the ASCII range
-   and because the wchar_t encoding is always ISO 10646.  */
-extern wint_t __btowc_alias (int __c) __asm ("btowc");
-__extern_inline wint_t
-__NTH (btowc (int __c))
-{ return (__builtin_constant_p (__c) && __c >= '\0' && __c <= '\x7f'
-	  ? (wint_t) __c : __btowc_alias (__c)); }
-
-extern int __wctob_alias (wint_t __c) __asm ("wctob");
-__extern_inline int
-__NTH (wctob (wint_t __wc))
-{ return (__builtin_constant_p (__wc) && __wc >= L'\0' && __wc <= L'\x7f'
-	  ? (int) __wc : __wctob_alias (__wc)); }
-
-__extern_inline size_t
-__NTH (mbrlen (const char *__restrict __s, size_t __n,
-	       mbstate_t *__restrict __ps))
-{ return (__ps != NULL
-	  ? mbrtowc (NULL, __s, __n, __ps) : __mbrlen (__s, __n, NULL)); }
-#endif
-
-__BEGIN_NAMESPACE_STD
-/* Write wide character representation of multibyte character string
-   SRC to DST.  */
-extern size_t mbsrtowcs (wchar_t *__restrict __dst,
-			 const char **__restrict __src, size_t __len,
-			 mbstate_t *__restrict __ps) __THROW;
-
-/* Write multibyte character representation of wide character string
-   SRC to DST.  */
-extern size_t wcsrtombs (char *__restrict __dst,
-			 const wchar_t **__restrict __src, size_t __len,
-			 mbstate_t *__restrict __ps) __THROW;
-__END_NAMESPACE_STD
-
-
-#ifdef	__USE_XOPEN2K8
-/* Write wide character representation of at most NMC bytes of the
-   multibyte character string SRC to DST.  */
-extern size_t mbsnrtowcs (wchar_t *__restrict __dst,
-			  const char **__restrict __src, size_t __nmc,
-			  size_t __len, mbstate_t *__restrict __ps) __THROW;
-
-/* Write multibyte character representation of at most NWC characters
-   from the wide character string SRC to DST.  */
-extern size_t wcsnrtombs (char *__restrict __dst,
-			  const wchar_t **__restrict __src,
-			  size_t __nwc, size_t __len,
-			  mbstate_t *__restrict __ps) __THROW;
-#endif	/* use POSIX 2008 */
-
-
-/* The following functions are extensions found in X/Open CAE.  */
-#ifdef __USE_XOPEN
-/* Determine number of column positions required for C.  */
-extern int wcwidth (wchar_t __c) __THROW;
-
-/* Determine number of column positions required for first N wide
-   characters (or fewer if S ends before this) in S.  */
-extern int wcswidth (const wchar_t *__s, size_t __n) __THROW;
-#endif	/* Use X/Open.  */
-
-
-__BEGIN_NAMESPACE_STD
-/* Convert initial portion of the wide string NPTR to `double'
-   representation.  */
-extern double wcstod (const wchar_t *__restrict __nptr,
-		      wchar_t **__restrict __endptr) __THROW;
-__END_NAMESPACE_STD
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Likewise for `float' and `long double' sizes of floating-point numbers.  */
-extern float wcstof (const wchar_t *__restrict __nptr,
-		     wchar_t **__restrict __endptr) __THROW;
-extern long double wcstold (const wchar_t *__restrict __nptr,
-			    wchar_t **__restrict __endptr) __THROW;
-__END_NAMESPACE_C99
-#endif /* C99 */
-
-
-__BEGIN_NAMESPACE_STD
-/* Convert initial portion of wide string NPTR to `long int'
-   representation.  */
-extern long int wcstol (const wchar_t *__restrict __nptr,
-			wchar_t **__restrict __endptr, int __base) __THROW;
-
-/* Convert initial portion of wide string NPTR to `unsigned long int'
-   representation.  */
-extern unsigned long int wcstoul (const wchar_t *__restrict __nptr,
-				  wchar_t **__restrict __endptr, int __base)
-     __THROW;
-__END_NAMESPACE_STD
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Convert initial portion of wide string NPTR to `long long int'
-   representation.  */
-__extension__
-extern long long int wcstoll (const wchar_t *__restrict __nptr,
-			      wchar_t **__restrict __endptr, int __base)
-     __THROW;
-
-/* Convert initial portion of wide string NPTR to `unsigned long long int'
-   representation.  */
-__extension__
-extern unsigned long long int wcstoull (const wchar_t *__restrict __nptr,
-					wchar_t **__restrict __endptr,
-					int __base) __THROW;
-__END_NAMESPACE_C99
-#endif /* ISO C99.  */
-
-#ifdef __USE_GNU
-/* Convert initial portion of wide string NPTR to `long long int'
-   representation.  */
-__extension__
-extern long long int wcstoq (const wchar_t *__restrict __nptr,
-			     wchar_t **__restrict __endptr, int __base)
-     __THROW;
-
-/* Convert initial portion of wide string NPTR to `unsigned long long int'
-   representation.  */
-__extension__
-extern unsigned long long int wcstouq (const wchar_t *__restrict __nptr,
-				       wchar_t **__restrict __endptr,
-				       int __base) __THROW;
-#endif /* Use GNU.  */
-
-#ifdef __USE_GNU
-/* The concept of one static locale per category is not very well
-   thought out.  Many applications will need to process its data using
-   information from several different locales.  Another application is
-   the implementation of the internationalization handling in the
-   upcoming ISO C++ standard library.  To support this another set of
-   the functions using locale data exist which have an additional
-   argument.
-
-   Attention: all these functions are *not* standardized in any form.
-   This is a proof-of-concept implementation.  */
-
-/* Structure for reentrant locale using functions.  This is an
-   (almost) opaque type for the user level programs.  */
-# include <xlocale.h>
-
-/* Special versions of the functions above which take the locale to
-   use as an additional parameter.  */
-extern long int wcstol_l (const wchar_t *__restrict __nptr,
-			  wchar_t **__restrict __endptr, int __base,
-			  __locale_t __loc) __THROW;
-
-extern unsigned long int wcstoul_l (const wchar_t *__restrict __nptr,
-				    wchar_t **__restrict __endptr,
-				    int __base, __locale_t __loc) __THROW;
-
-__extension__
-extern long long int wcstoll_l (const wchar_t *__restrict __nptr,
-				wchar_t **__restrict __endptr,
-				int __base, __locale_t __loc) __THROW;
-
-__extension__
-extern unsigned long long int wcstoull_l (const wchar_t *__restrict __nptr,
-					  wchar_t **__restrict __endptr,
-					  int __base, __locale_t __loc)
-     __THROW;
-
-extern double wcstod_l (const wchar_t *__restrict __nptr,
-			wchar_t **__restrict __endptr, __locale_t __loc)
-     __THROW;
-
-extern float wcstof_l (const wchar_t *__restrict __nptr,
-		       wchar_t **__restrict __endptr, __locale_t __loc)
-     __THROW;
-
-extern long double wcstold_l (const wchar_t *__restrict __nptr,
-			      wchar_t **__restrict __endptr,
-			      __locale_t __loc) __THROW;
-#endif	/* use GNU */
-
-
-#ifdef __USE_XOPEN2K8
-/* Copy SRC to DEST, returning the address of the terminating L'\0' in
-   DEST.  */
-extern wchar_t *wcpcpy (wchar_t *__restrict __dest,
-			const wchar_t *__restrict __src) __THROW;
-
-/* Copy no more than N characters of SRC to DEST, returning the address of
-   the last character written into DEST.  */
-extern wchar_t *wcpncpy (wchar_t *__restrict __dest,
-			 const wchar_t *__restrict __src, size_t __n)
-     __THROW;
-
-
-/* Wide character I/O functions.  */
-
-/* Like OPEN_MEMSTREAM, but the stream is wide oriented and produces
-   a wide character string.  */
-extern __FILE *open_wmemstream (wchar_t **__bufloc, size_t *__sizeloc) __THROW;
-#endif
-
-#if defined __USE_ISOC95 || defined __USE_UNIX98
-__BEGIN_NAMESPACE_STD
-
-/* Select orientation for stream.  */
-extern int fwide (__FILE *__fp, int __mode) __THROW;
-
-
-/* Write formatted output to STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fwprintf (__FILE *__restrict __stream,
-		     const wchar_t *__restrict __format, ...)
-     /* __attribute__ ((__format__ (__wprintf__, 2, 3))) */;
-/* Write formatted output to stdout.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int wprintf (const wchar_t *__restrict __format, ...)
-     /* __attribute__ ((__format__ (__wprintf__, 1, 2))) */;
-/* Write formatted output of at most N characters to S.  */
-extern int swprintf (wchar_t *__restrict __s, size_t __n,
-		     const wchar_t *__restrict __format, ...)
-     __THROW /* __attribute__ ((__format__ (__wprintf__, 3, 4))) */;
-
-/* Write formatted output to S from argument list ARG.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int vfwprintf (__FILE *__restrict __s,
-		      const wchar_t *__restrict __format,
-		      __gnuc_va_list __arg)
-     /* __attribute__ ((__format__ (__wprintf__, 2, 0))) */;
-/* Write formatted output to stdout from argument list ARG.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int vwprintf (const wchar_t *__restrict __format,
-		     __gnuc_va_list __arg)
-     /* __attribute__ ((__format__ (__wprintf__, 1, 0))) */;
-/* Write formatted output of at most N character to S from argument
-   list ARG.  */
-extern int vswprintf (wchar_t *__restrict __s, size_t __n,
-		      const wchar_t *__restrict __format,
-		      __gnuc_va_list __arg)
-     __THROW /* __attribute__ ((__format__ (__wprintf__, 3, 0))) */;
-
-
-/* Read formatted input from STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fwscanf (__FILE *__restrict __stream,
-		    const wchar_t *__restrict __format, ...)
-     /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
-/* Read formatted input from stdin.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int wscanf (const wchar_t *__restrict __format, ...)
-     /* __attribute__ ((__format__ (__wscanf__, 1, 2))) */;
-/* Read formatted input from S.  */
-extern int swscanf (const wchar_t *__restrict __s,
-		    const wchar_t *__restrict __format, ...)
-     __THROW /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
-
-# if defined __USE_ISOC99 && !defined __USE_GNU \
-     && (!defined __LDBL_COMPAT || !defined __REDIRECT) \
-     && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
-#  ifdef __REDIRECT
-/* For strict ISO C99 or POSIX compliance disallow %as, %aS and %a[
-   GNU extension which conflicts with valid %a followed by letter
-   s, S or [.  */
-extern int __REDIRECT (fwscanf, (__FILE *__restrict __stream,
-				 const wchar_t *__restrict __format, ...),
-		       __isoc99_fwscanf)
-     /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
-extern int __REDIRECT (wscanf, (const wchar_t *__restrict __format, ...),
-		       __isoc99_wscanf)
-     /* __attribute__ ((__format__ (__wscanf__, 1, 2))) */;
-extern int __REDIRECT_NTH (swscanf, (const wchar_t *__restrict __s,
-				     const wchar_t *__restrict __format,
-				     ...), __isoc99_swscanf)
-     /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
-#  else
-extern int __isoc99_fwscanf (__FILE *__restrict __stream,
-			     const wchar_t *__restrict __format, ...);
-extern int __isoc99_wscanf (const wchar_t *__restrict __format, ...);
-extern int __isoc99_swscanf (const wchar_t *__restrict __s,
-			     const wchar_t *__restrict __format, ...)
-     __THROW;
-#   define fwscanf __isoc99_fwscanf
-#   define wscanf __isoc99_wscanf
-#   define swscanf __isoc99_swscanf
-#  endif
-# endif
-
-__END_NAMESPACE_STD
-#endif /* Use ISO C95, C99 and Unix98. */
-
-#ifdef __USE_ISOC99
-__BEGIN_NAMESPACE_C99
-/* Read formatted input from S into argument list ARG.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int vfwscanf (__FILE *__restrict __s,
-		     const wchar_t *__restrict __format,
-		     __gnuc_va_list __arg)
-     /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
-/* Read formatted input from stdin into argument list ARG.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int vwscanf (const wchar_t *__restrict __format,
-		    __gnuc_va_list __arg)
-     /* __attribute__ ((__format__ (__wscanf__, 1, 0))) */;
-/* Read formatted input from S into argument list ARG.  */
-extern int vswscanf (const wchar_t *__restrict __s,
-		     const wchar_t *__restrict __format,
-		     __gnuc_va_list __arg)
-     __THROW /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
-
-# if !defined __USE_GNU \
-     && (!defined __LDBL_COMPAT || !defined __REDIRECT) \
-     && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
-#  ifdef __REDIRECT
-extern int __REDIRECT (vfwscanf, (__FILE *__restrict __s,
-				  const wchar_t *__restrict __format,
-				  __gnuc_va_list __arg), __isoc99_vfwscanf)
-     /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
-extern int __REDIRECT (vwscanf, (const wchar_t *__restrict __format,
-				 __gnuc_va_list __arg), __isoc99_vwscanf)
-     /* __attribute__ ((__format__ (__wscanf__, 1, 0))) */;
-extern int __REDIRECT_NTH (vswscanf, (const wchar_t *__restrict __s,
-				      const wchar_t *__restrict __format,
-				      __gnuc_va_list __arg), __isoc99_vswscanf)
-     /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
-#  else
-extern int __isoc99_vfwscanf (__FILE *__restrict __s,
-			      const wchar_t *__restrict __format,
-			      __gnuc_va_list __arg);
-extern int __isoc99_vwscanf (const wchar_t *__restrict __format,
-			     __gnuc_va_list __arg);
-extern int __isoc99_vswscanf (const wchar_t *__restrict __s,
-			      const wchar_t *__restrict __format,
-			      __gnuc_va_list __arg) __THROW;
-#   define vfwscanf __isoc99_vfwscanf
-#   define vwscanf __isoc99_vwscanf
-#   define vswscanf __isoc99_vswscanf
-#  endif
-# endif
-
-__END_NAMESPACE_C99
-#endif /* Use ISO C99. */
-
-
-__BEGIN_NAMESPACE_STD
-/* Read a character from STREAM.
-
-   These functions are possible cancellation points and therefore not
-   marked with __THROW.  */
-extern wint_t fgetwc (__FILE *__stream);
-extern wint_t getwc (__FILE *__stream);
-
-/* Read a character from stdin.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern wint_t getwchar (void);
-
-
-/* Write a character to STREAM.
-
-   These functions are possible cancellation points and therefore not
-   marked with __THROW.  */
-extern wint_t fputwc (wchar_t __wc, __FILE *__stream);
-extern wint_t putwc (wchar_t __wc, __FILE *__stream);
-
-/* Write a character to stdout.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern wint_t putwchar (wchar_t __wc);
-
-
-/* Get a newline-terminated wide character string of finite length
-   from STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern wchar_t *fgetws (wchar_t *__restrict __ws, int __n,
-			__FILE *__restrict __stream);
-
-/* Write a string to STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern int fputws (const wchar_t *__restrict __ws,
-		   __FILE *__restrict __stream);
-
-
-/* Push a character back onto the input buffer of STREAM.
-
-   This function is a possible cancellation point and therefore not
-   marked with __THROW.  */
-extern wint_t ungetwc (wint_t __wc, __FILE *__stream);
-__END_NAMESPACE_STD
-
-
-#ifdef __USE_GNU
-/* These are defined to be equivalent to the `char' functions defined
-   in POSIX.1:1996.
-
-   These functions are not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation they are cancellation points and
-   therefore not marked with __THROW.  */
-extern wint_t getwc_unlocked (__FILE *__stream);
-extern wint_t getwchar_unlocked (void);
-
-/* This is the wide character version of a GNU extension.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern wint_t fgetwc_unlocked (__FILE *__stream);
-
-/* Faster version when locking is not necessary.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern wint_t fputwc_unlocked (wchar_t __wc, __FILE *__stream);
-
-/* These are defined to be equivalent to the `char' functions defined
-   in POSIX.1:1996.
-
-   These functions are not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation they are cancellation points and
-   therefore not marked with __THROW.  */
-extern wint_t putwc_unlocked (wchar_t __wc, __FILE *__stream);
-extern wint_t putwchar_unlocked (wchar_t __wc);
-
-
-/* This function does the same as `fgetws' but does not lock the stream.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern wchar_t *fgetws_unlocked (wchar_t *__restrict __ws, int __n,
-				 __FILE *__restrict __stream);
-
-/* This function does the same as `fputws' but does not lock the stream.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int fputws_unlocked (const wchar_t *__restrict __ws,
-			    __FILE *__restrict __stream);
-#endif
-
-
-__BEGIN_NAMESPACE_C99
-/* Format TP into S according to FORMAT.
-   Write no more than MAXSIZE wide characters and return the number
-   of wide characters written, or 0 if it would exceed MAXSIZE.  */
-extern size_t wcsftime (wchar_t *__restrict __s, size_t __maxsize,
-			const wchar_t *__restrict __format,
-			const struct tm *__restrict __tp) __THROW;
-__END_NAMESPACE_C99
-
-# ifdef __USE_GNU
-# include <xlocale.h>
-
-/* Similar to `wcsftime' but takes the information from
-   the provided locale and not the global locale.  */
-extern size_t wcsftime_l (wchar_t *__restrict __s, size_t __maxsize,
-			  const wchar_t *__restrict __format,
-			  const struct tm *__restrict __tp,
-			  __locale_t __loc) __THROW;
-# endif
-
-/* The X/Open standard demands that most of the functions defined in
-   the <wctype.h> header must also appear here.  This is probably
-   because some X/Open members wrote their implementation before the
-   ISO C standard was published and introduced the better solution.
-   We have to provide these definitions for compliance reasons but we
-   do this nonsense only if really necessary.  */
-#if defined __USE_UNIX98 && !defined __USE_GNU
-# define __need_iswxxx
-# include <wctype.h>
-#endif
-
-/* Define some macros helping to catch buffer overflows.  */
-#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
-# include <bits/wchar2.h>
-#endif
-
-#ifdef __LDBL_COMPAT
-# include <bits/wchar-ldbl.h>
-#endif
-
-__END_DECLS
-
-#endif	/* _WCHAR_H defined */
-
-#endif /* wchar.h  */
-
-/* Undefine all __need_* constants in case we are included to get those
-   constants but the whole file was already read.  */
-#undef __need_mbstate_t
-#undef __need_wint_t
diff --git a/openflow/usr/include/wctype.h b/openflow/usr/include/wctype.h
deleted file mode 100644
index acbd8df..0000000
--- a/openflow/usr/include/wctype.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/*
- *	ISO C99 Standard: 7.25
- *	Wide character classification and mapping utilities  <wctype.h>
- */
-
-#ifndef _WCTYPE_H
-
-#include <features.h>
-#include <bits/types.h>
-
-#ifndef __need_iswxxx
-# define _WCTYPE_H	1
-
-/* Get wint_t from <wchar.h>.  */
-# define __need_wint_t
-# include <wchar.h>
-
-/* Constant expression of type `wint_t' whose value does not correspond
-   to any member of the extended character set.  */
-# ifndef WEOF
-#  define WEOF (0xffffffffu)
-# endif
-#endif
-#undef __need_iswxxx
-
-
-/* The following part is also used in the <wcsmbs.h> header when compiled
-   in the Unix98 compatibility mode.  */
-#ifndef __iswxxx_defined
-# define __iswxxx_defined	1
-
-__BEGIN_NAMESPACE_C99
-/* Scalar type that can hold values which represent locale-specific
-   character classifications.  */
-typedef unsigned long int wctype_t;
-__END_NAMESPACE_C99
-
-# ifndef _ISwbit
-/* The characteristics are stored always in network byte order (big
-   endian).  We define the bit value interpretations here dependent on the
-   machine's byte order.  */
-
-#  include <endian.h>
-#  if __BYTE_ORDER == __BIG_ENDIAN
-#   define _ISwbit(bit)	(1 << (bit))
-#  else /* __BYTE_ORDER == __LITTLE_ENDIAN */
-#   define _ISwbit(bit)	\
-	((bit) < 8 ? (int) ((1UL << (bit)) << 24)			      \
-	 : ((bit) < 16 ? (int) ((1UL << (bit)) << 8)			      \
-	    : ((bit) < 24 ? (int) ((1UL << (bit)) >> 8)			      \
-	       : (int) ((1UL << (bit)) >> 24))))
-#  endif
-
-enum
-{
-  __ISwupper = 0,			/* UPPERCASE.  */
-  __ISwlower = 1,			/* lowercase.  */
-  __ISwalpha = 2,			/* Alphabetic.  */
-  __ISwdigit = 3,			/* Numeric.  */
-  __ISwxdigit = 4,			/* Hexadecimal numeric.  */
-  __ISwspace = 5,			/* Whitespace.  */
-  __ISwprint = 6,			/* Printing.  */
-  __ISwgraph = 7,			/* Graphical.  */
-  __ISwblank = 8,			/* Blank (usually SPC and TAB).  */
-  __ISwcntrl = 9,			/* Control character.  */
-  __ISwpunct = 10,			/* Punctuation.  */
-  __ISwalnum = 11,			/* Alphanumeric.  */
-
-  _ISwupper = _ISwbit (__ISwupper),	/* UPPERCASE.  */
-  _ISwlower = _ISwbit (__ISwlower),	/* lowercase.  */
-  _ISwalpha = _ISwbit (__ISwalpha),	/* Alphabetic.  */
-  _ISwdigit = _ISwbit (__ISwdigit),	/* Numeric.  */
-  _ISwxdigit = _ISwbit (__ISwxdigit),	/* Hexadecimal numeric.  */
-  _ISwspace = _ISwbit (__ISwspace),	/* Whitespace.  */
-  _ISwprint = _ISwbit (__ISwprint),	/* Printing.  */
-  _ISwgraph = _ISwbit (__ISwgraph),	/* Graphical.  */
-  _ISwblank = _ISwbit (__ISwblank),	/* Blank (usually SPC and TAB).  */
-  _ISwcntrl = _ISwbit (__ISwcntrl),	/* Control character.  */
-  _ISwpunct = _ISwbit (__ISwpunct),	/* Punctuation.  */
-  _ISwalnum = _ISwbit (__ISwalnum)	/* Alphanumeric.  */
-};
-# endif /* Not _ISwbit  */
-
-
-__BEGIN_DECLS
-
-__BEGIN_NAMESPACE_C99
-/*
- * Wide-character classification functions: 7.15.2.1.
- */
-
-/* Test for any wide character for which `iswalpha' or `iswdigit' is
-   true.  */
-extern int iswalnum (wint_t __wc) __THROW;
-
-/* Test for any wide character for which `iswupper' or 'iswlower' is
-   true, or any wide character that is one of a locale-specific set of
-   wide-characters for which none of `iswcntrl', `iswdigit',
-   `iswpunct', or `iswspace' is true.  */
-extern int iswalpha (wint_t __wc) __THROW;
-
-/* Test for any control wide character.  */
-extern int iswcntrl (wint_t __wc) __THROW;
-
-/* Test for any wide character that corresponds to a decimal-digit
-   character.  */
-extern int iswdigit (wint_t __wc) __THROW;
-
-/* Test for any wide character for which `iswprint' is true and
-   `iswspace' is false.  */
-extern int iswgraph (wint_t __wc) __THROW;
-
-/* Test for any wide character that corresponds to a lowercase letter
-   or is one of a locale-specific set of wide characters for which
-   none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true.  */
-extern int iswlower (wint_t __wc) __THROW;
-
-/* Test for any printing wide character.  */
-extern int iswprint (wint_t __wc) __THROW;
-
-/* Test for any printing wide character that is one of a
-   locale-specific et of wide characters for which neither `iswspace'
-   nor `iswalnum' is true.  */
-extern int iswpunct (wint_t __wc) __THROW;
-
-/* Test for any wide character that corresponds to a locale-specific
-   set of wide characters for which none of `iswalnum', `iswgraph', or
-   `iswpunct' is true.  */
-extern int iswspace (wint_t __wc) __THROW;
-
-/* Test for any wide character that corresponds to an uppercase letter
-   or is one of a locale-specific set of wide character for which none
-   of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true.  */
-extern int iswupper (wint_t __wc) __THROW;
-
-/* Test for any wide character that corresponds to a hexadecimal-digit
-   character equivalent to that performed be the functions described
-   in the previous subclause.  */
-extern int iswxdigit (wint_t __wc) __THROW;
-
-/* Test for any wide character that corresponds to a standard blank
-   wide character or a locale-specific set of wide characters for
-   which `iswalnum' is false.  */
-# ifdef __USE_ISOC99
-extern int iswblank (wint_t __wc) __THROW;
-# endif
-
-/*
- * Extensible wide-character classification functions: 7.15.2.2.
- */
-
-/* Construct value that describes a class of wide characters identified
-   by the string argument PROPERTY.  */
-extern wctype_t wctype (const char *__property) __THROW;
-
-/* Determine whether the wide-character WC has the property described by
-   DESC.  */
-extern int iswctype (wint_t __wc, wctype_t __desc) __THROW;
-__END_NAMESPACE_C99
-
-
-/*
- * Wide-character case-mapping functions: 7.15.3.1.
- */
-
-__BEGIN_NAMESPACE_C99
-/* Scalar type that can hold values which represent locale-specific
-   character mappings.  */
-typedef const __int32_t *wctrans_t;
-__END_NAMESPACE_C99
-#ifdef __USE_GNU
-__USING_NAMESPACE_C99(wctrans_t)
-#endif
-
-__BEGIN_NAMESPACE_C99
-/* Converts an uppercase letter to the corresponding lowercase letter.  */
-extern wint_t towlower (wint_t __wc) __THROW;
-
-/* Converts an lowercase letter to the corresponding uppercase letter.  */
-extern wint_t towupper (wint_t __wc) __THROW;
-__END_NAMESPACE_C99
-
-__END_DECLS
-
-#endif	/* need iswxxx.  */
-
-
-/* The remaining definitions and declarations must not appear in the
-   <wchar.h> header.  */
-#ifdef _WCTYPE_H
-
-/*
- * Extensible wide-character mapping functions: 7.15.3.2.
- */
-
-__BEGIN_DECLS
-
-__BEGIN_NAMESPACE_C99
-/* Construct value that describes a mapping between wide characters
-   identified by the string argument PROPERTY.  */
-extern wctrans_t wctrans (const char *__property) __THROW;
-
-/* Map the wide character WC using the mapping described by DESC.  */
-extern wint_t towctrans (wint_t __wc, wctrans_t __desc) __THROW;
-__END_NAMESPACE_C99
-
-# ifdef __USE_XOPEN2K8
-/* Declare the interface to extended locale model.  */
-#  include <xlocale.h>
-
-/* Test for any wide character for which `iswalpha' or `iswdigit' is
-   true.  */
-extern int iswalnum_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any wide character for which `iswupper' or 'iswlower' is
-   true, or any wide character that is one of a locale-specific set of
-   wide-characters for which none of `iswcntrl', `iswdigit',
-   `iswpunct', or `iswspace' is true.  */
-extern int iswalpha_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any control wide character.  */
-extern int iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any wide character that corresponds to a decimal-digit
-   character.  */
-extern int iswdigit_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any wide character for which `iswprint' is true and
-   `iswspace' is false.  */
-extern int iswgraph_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any wide character that corresponds to a lowercase letter
-   or is one of a locale-specific set of wide characters for which
-   none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true.  */
-extern int iswlower_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any printing wide character.  */
-extern int iswprint_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any printing wide character that is one of a
-   locale-specific et of wide characters for which neither `iswspace'
-   nor `iswalnum' is true.  */
-extern int iswpunct_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any wide character that corresponds to a locale-specific
-   set of wide characters for which none of `iswalnum', `iswgraph', or
-   `iswpunct' is true.  */
-extern int iswspace_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any wide character that corresponds to an uppercase letter
-   or is one of a locale-specific set of wide character for which none
-   of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true.  */
-extern int iswupper_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any wide character that corresponds to a hexadecimal-digit
-   character equivalent to that performed be the functions described
-   in the previous subclause.  */
-extern int iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Test for any wide character that corresponds to a standard blank
-   wide character or a locale-specific set of wide characters for
-   which `iswalnum' is false.  */
-extern int iswblank_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Construct value that describes a class of wide characters identified
-   by the string argument PROPERTY.  */
-extern wctype_t wctype_l (const char *__property, __locale_t __locale)
-     __THROW;
-
-/* Determine whether the wide-character WC has the property described by
-   DESC.  */
-extern int iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale)
-     __THROW;
-
-
-/*
- * Wide-character case-mapping functions.
- */
-
-/* Converts an uppercase letter to the corresponding lowercase letter.  */
-extern wint_t towlower_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Converts an lowercase letter to the corresponding uppercase letter.  */
-extern wint_t towupper_l (wint_t __wc, __locale_t __locale) __THROW;
-
-/* Construct value that describes a mapping between wide characters
-   identified by the string argument PROPERTY.  */
-extern wctrans_t wctrans_l (const char *__property, __locale_t __locale)
-     __THROW;
-
-/* Map the wide character WC using the mapping described by DESC.  */
-extern wint_t towctrans_l (wint_t __wc, wctrans_t __desc,
-			   __locale_t __locale) __THROW;
-
-# endif /* Use POSIX 2008.  */
-
-__END_DECLS
-
-#endif	/* __WCTYPE_H defined.  */
-
-#endif /* wctype.h  */
diff --git a/openflow/usr/include/wordexp.h b/openflow/usr/include/wordexp.h
deleted file mode 100644
index 92dfa9f..0000000
--- a/openflow/usr/include/wordexp.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef	_WORDEXP_H
-#define	_WORDEXP_H	1
-
-#include <features.h>
-#define __need_size_t
-#include <stddef.h>
-
-__BEGIN_DECLS
-
-/* Bits set in the FLAGS argument to `wordexp'.  */
-enum
-  {
-    WRDE_DOOFFS = (1 << 0),	/* Insert PWORDEXP->we_offs NULLs.  */
-    WRDE_APPEND = (1 << 1),	/* Append to results of a previous call.  */
-    WRDE_NOCMD = (1 << 2),	/* Don't do command substitution.  */
-    WRDE_REUSE = (1 << 3),	/* Reuse storage in PWORDEXP.  */
-    WRDE_SHOWERR = (1 << 4),	/* Don't redirect stderr to /dev/null.  */
-    WRDE_UNDEF = (1 << 5),	/* Error for expanding undefined variables.  */
-    __WRDE_FLAGS = (WRDE_DOOFFS | WRDE_APPEND | WRDE_NOCMD |
-		    WRDE_REUSE | WRDE_SHOWERR | WRDE_UNDEF)
-  };
-
-/* Structure describing a word-expansion run.  */
-typedef struct
-  {
-    size_t we_wordc;		/* Count of words matched.  */
-    char **we_wordv;		/* List of expanded words.  */
-    size_t we_offs;		/* Slots to reserve in `we_wordv'.  */
-  } wordexp_t;
-
-/* Possible nonzero return values from `wordexp'.  */
-enum
-  {
-#ifdef __USE_XOPEN
-    WRDE_NOSYS = -1,		/* Never used since we support `wordexp'.  */
-#endif
-    WRDE_NOSPACE = 1,		/* Ran out of memory.  */
-    WRDE_BADCHAR,		/* A metachar appears in the wrong place.  */
-    WRDE_BADVAL,		/* Undefined var reference with WRDE_UNDEF.  */
-    WRDE_CMDSUB,		/* Command substitution with WRDE_NOCMD.  */
-    WRDE_SYNTAX			/* Shell syntax error.  */
-  };
-
-/* Do word expansion of WORDS into PWORDEXP.  */
-extern int wordexp (const char *__restrict __words,
-		    wordexp_t *__restrict __pwordexp, int __flags);
-
-/* Free the storage allocated by a `wordexp' call.  */
-extern void wordfree (wordexp_t *__wordexp) __THROW;
-
-__END_DECLS
-
-#endif /* wordexp.h  */
diff --git a/openflow/usr/include/xcb/bigreq.h b/openflow/usr/include/xcb/bigreq.h
deleted file mode 100644
index 88401e0..0000000
--- a/openflow/usr/include/xcb/bigreq.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * This file generated automatically from bigreq.xml by c_client.py.
- * Edit at your peril.
- */
-
-/**
- * @defgroup XCB_BigRequests_API XCB BigRequests API
- * @brief BigRequests XCB Protocol Implementation.
- * @{
- **/
-
-#ifndef __BIGREQ_H
-#define __BIGREQ_H
-
-#include "xcb.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define XCB_BIGREQUESTS_MAJOR_VERSION 0
-#define XCB_BIGREQUESTS_MINOR_VERSION 0
-
-extern xcb_extension_t xcb_big_requests_id;
-
-/**
- * @brief xcb_big_requests_enable_cookie_t
- **/
-typedef struct xcb_big_requests_enable_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_big_requests_enable_cookie_t;
-
-/** Opcode for xcb_big_requests_enable. */
-#define XCB_BIG_REQUESTS_ENABLE 0
-
-/**
- * @brief xcb_big_requests_enable_request_t
- **/
-typedef struct xcb_big_requests_enable_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  minor_opcode; /**<  */
-    uint16_t length; /**<  */
-} xcb_big_requests_enable_request_t;
-
-/**
- * @brief xcb_big_requests_enable_reply_t
- **/
-typedef struct xcb_big_requests_enable_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint32_t maximum_request_length; /**<  */
-} xcb_big_requests_enable_reply_t;
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_big_requests_enable_cookie_t
-xcb_big_requests_enable (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_big_requests_enable_cookie_t
-xcb_big_requests_enable_unchecked (xcb_connection_t *c  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_big_requests_enable_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_big_requests_enable_reply_t *
-xcb_big_requests_enable_reply (xcb_connection_t                  *c  /**< */,
-                               xcb_big_requests_enable_cookie_t   cookie  /**< */,
-                               xcb_generic_error_t              **e  /**< */);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/**
- * @}
- */
diff --git a/openflow/usr/include/xcb/xc_misc.h b/openflow/usr/include/xcb/xc_misc.h
deleted file mode 100644
index 5df599f..0000000
--- a/openflow/usr/include/xcb/xc_misc.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * This file generated automatically from xc_misc.xml by c_client.py.
- * Edit at your peril.
- */
-
-/**
- * @defgroup XCB_XCMisc_API XCB XCMisc API
- * @brief XCMisc XCB Protocol Implementation.
- * @{
- **/
-
-#ifndef __XC_MISC_H
-#define __XC_MISC_H
-
-#include "xcb.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define XCB_XCMISC_MAJOR_VERSION 1
-#define XCB_XCMISC_MINOR_VERSION 1
-
-extern xcb_extension_t xcb_xc_misc_id;
-
-/**
- * @brief xcb_xc_misc_get_version_cookie_t
- **/
-typedef struct xcb_xc_misc_get_version_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_xc_misc_get_version_cookie_t;
-
-/** Opcode for xcb_xc_misc_get_version. */
-#define XCB_XC_MISC_GET_VERSION 0
-
-/**
- * @brief xcb_xc_misc_get_version_request_t
- **/
-typedef struct xcb_xc_misc_get_version_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  minor_opcode; /**<  */
-    uint16_t length; /**<  */
-    uint16_t client_major_version; /**<  */
-    uint16_t client_minor_version; /**<  */
-} xcb_xc_misc_get_version_request_t;
-
-/**
- * @brief xcb_xc_misc_get_version_reply_t
- **/
-typedef struct xcb_xc_misc_get_version_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t server_major_version; /**<  */
-    uint16_t server_minor_version; /**<  */
-} xcb_xc_misc_get_version_reply_t;
-
-/**
- * @brief xcb_xc_misc_get_xid_range_cookie_t
- **/
-typedef struct xcb_xc_misc_get_xid_range_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_xc_misc_get_xid_range_cookie_t;
-
-/** Opcode for xcb_xc_misc_get_xid_range. */
-#define XCB_XC_MISC_GET_XID_RANGE 1
-
-/**
- * @brief xcb_xc_misc_get_xid_range_request_t
- **/
-typedef struct xcb_xc_misc_get_xid_range_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  minor_opcode; /**<  */
-    uint16_t length; /**<  */
-} xcb_xc_misc_get_xid_range_request_t;
-
-/**
- * @brief xcb_xc_misc_get_xid_range_reply_t
- **/
-typedef struct xcb_xc_misc_get_xid_range_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint32_t start_id; /**<  */
-    uint32_t count; /**<  */
-} xcb_xc_misc_get_xid_range_reply_t;
-
-/**
- * @brief xcb_xc_misc_get_xid_list_cookie_t
- **/
-typedef struct xcb_xc_misc_get_xid_list_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_xc_misc_get_xid_list_cookie_t;
-
-/** Opcode for xcb_xc_misc_get_xid_list. */
-#define XCB_XC_MISC_GET_XID_LIST 2
-
-/**
- * @brief xcb_xc_misc_get_xid_list_request_t
- **/
-typedef struct xcb_xc_misc_get_xid_list_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  minor_opcode; /**<  */
-    uint16_t length; /**<  */
-    uint32_t count; /**<  */
-} xcb_xc_misc_get_xid_list_request_t;
-
-/**
- * @brief xcb_xc_misc_get_xid_list_reply_t
- **/
-typedef struct xcb_xc_misc_get_xid_list_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint32_t ids_len; /**<  */
-    uint8_t  pad1[20]; /**<  */
-} xcb_xc_misc_get_xid_list_reply_t;
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_xc_misc_get_version_cookie_t
-xcb_xc_misc_get_version (xcb_connection_t *c  /**< */,
-                         uint16_t          client_major_version  /**< */,
-                         uint16_t          client_minor_version  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_xc_misc_get_version_cookie_t
-xcb_xc_misc_get_version_unchecked (xcb_connection_t *c  /**< */,
-                                   uint16_t          client_major_version  /**< */,
-                                   uint16_t          client_minor_version  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_xc_misc_get_version_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_xc_misc_get_version_reply_t *
-xcb_xc_misc_get_version_reply (xcb_connection_t                  *c  /**< */,
-                               xcb_xc_misc_get_version_cookie_t   cookie  /**< */,
-                               xcb_generic_error_t              **e  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_xc_misc_get_xid_range_cookie_t
-xcb_xc_misc_get_xid_range (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_xc_misc_get_xid_range_cookie_t
-xcb_xc_misc_get_xid_range_unchecked (xcb_connection_t *c  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_xc_misc_get_xid_range_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_xc_misc_get_xid_range_reply_t *
-xcb_xc_misc_get_xid_range_reply (xcb_connection_t                    *c  /**< */,
-                                 xcb_xc_misc_get_xid_range_cookie_t   cookie  /**< */,
-                                 xcb_generic_error_t                **e  /**< */);
-
-int
-xcb_xc_misc_get_xid_list_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_xc_misc_get_xid_list_cookie_t
-xcb_xc_misc_get_xid_list (xcb_connection_t *c  /**< */,
-                          uint32_t          count  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_xc_misc_get_xid_list_cookie_t
-xcb_xc_misc_get_xid_list_unchecked (xcb_connection_t *c  /**< */,
-                                    uint32_t          count  /**< */);
-
-uint32_t *
-xcb_xc_misc_get_xid_list_ids (const xcb_xc_misc_get_xid_list_reply_t *R  /**< */);
-
-int
-xcb_xc_misc_get_xid_list_ids_length (const xcb_xc_misc_get_xid_list_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_xc_misc_get_xid_list_ids_end (const xcb_xc_misc_get_xid_list_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_xc_misc_get_xid_list_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_xc_misc_get_xid_list_reply_t *
-xcb_xc_misc_get_xid_list_reply (xcb_connection_t                   *c  /**< */,
-                                xcb_xc_misc_get_xid_list_cookie_t   cookie  /**< */,
-                                xcb_generic_error_t               **e  /**< */);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/**
- * @}
- */
diff --git a/openflow/usr/include/xcb/xcb.h b/openflow/usr/include/xcb/xcb.h
deleted file mode 100644
index 86eb1bc..0000000
--- a/openflow/usr/include/xcb/xcb.h
+++ /dev/null
@@ -1,599 +0,0 @@
-/*
- * Copyright (C) 2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the names of the authors or their
- * institutions shall not be used in advertising or otherwise to promote the
- * sale, use or other dealings in this Software without prior written
- * authorization from the authors.
- */
-
-#ifndef __XCB_H__
-#define __XCB_H__
-#include <sys/types.h>
-
-#if defined(__solaris__)
-#include <inttypes.h>
-#else
-#include <stdint.h>
-#endif
-
-#ifndef _WIN32
-#include <sys/uio.h>
-#else
-#include "xcb_windefs.h"
-#endif
-#include <pthread.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @file xcb.h
- */
-
-#define XCB_PACKED __attribute__((__packed__))
-
-/**
- * @defgroup XCB_Core_API XCB Core API
- * @brief Core API of the XCB library.
- *
- * @{
- */
-
-/* Pre-defined constants */
-
-/** Current protocol version */
-#define X_PROTOCOL 11
-
-/** Current minor version */
-#define X_PROTOCOL_REVISION 0
-
-/** X_TCP_PORT + display number = server port for TCP transport */
-#define X_TCP_PORT 6000
-
-/** xcb connection errors because of socket, pipe and other stream errors. */
-#define XCB_CONN_ERROR 1
-
-/** xcb connection shutdown because of extension not supported */
-#define XCB_CONN_CLOSED_EXT_NOTSUPPORTED 2
-
-/** malloc(), calloc() and realloc() error upon failure, for eg ENOMEM */
-#define XCB_CONN_CLOSED_MEM_INSUFFICIENT 3
-
-/** Connection closed, exceeding request length that server accepts. */
-#define XCB_CONN_CLOSED_REQ_LEN_EXCEED 4
-
-/** Connection closed, error during parsing display string. */
-#define XCB_CONN_CLOSED_PARSE_ERR 5
-
-/** Connection closed because the server does not have a screen matching the display. */
-#define XCB_CONN_CLOSED_INVALID_SCREEN 6
-
-/** Connection closed because some FD passing operation failed */
-#define XCB_CONN_CLOSED_FDPASSING_FAILED 7
-
-#define XCB_TYPE_PAD(T,I) (-(I) & (sizeof(T) > 4 ? 3 : sizeof(T) - 1))
-
-/* Opaque structures */
-
-/**
- * @brief XCB Connection structure.
- *
- * A structure that contain all data that  XCB needs to communicate with an X server.
- */
-typedef struct xcb_connection_t xcb_connection_t;  /**< Opaque structure containing all data that  XCB needs to communicate with an X server. */
-
-
-/* Other types */
-
-/**
- * @brief Generic iterator.
- *
- * A generic iterator structure.
- */
-typedef struct {
-    void *data;   /**< Data of the current iterator */
-    int rem;    /**< remaining elements */
-    int index;  /**< index of the current iterator */
-} xcb_generic_iterator_t;
-
-/**
- * @brief Generic reply.
- *
- * A generic reply structure.
- */
-typedef struct {
-    uint8_t   response_type;  /**< Type of the response */
-    uint8_t  pad0;           /**< Padding */
-    uint16_t sequence;       /**< Sequence number */
-    uint32_t length;         /**< Length of the response */
-} xcb_generic_reply_t;
-
-/**
- * @brief Generic event.
- *
- * A generic event structure.
- */
-typedef struct {
-    uint8_t   response_type;  /**< Type of the response */
-    uint8_t  pad0;           /**< Padding */
-    uint16_t sequence;       /**< Sequence number */
-    uint32_t pad[7];         /**< Padding */
-    uint32_t full_sequence;  /**< full sequence */
-} xcb_generic_event_t;
-
-/**
- * @brief GE event
- *
- * An event as sent by the XGE extension. The length field specifies the
- * number of 4-byte blocks trailing the struct.
- *
- * @deprecated Since some fields in this struct have unfortunate names, it is
- * recommended to use xcb_ge_generic_event_t instead.
- */
-typedef struct {
-    uint8_t  response_type;  /**< Type of the response */
-    uint8_t  pad0;           /**< Padding */
-    uint16_t sequence;       /**< Sequence number */
-    uint32_t length;
-    uint16_t event_type;
-    uint16_t pad1;
-    uint32_t pad[5];         /**< Padding */
-    uint32_t full_sequence;  /**< full sequence */
-} xcb_ge_event_t;
-
-/**
- * @brief Generic error.
- *
- * A generic error structure.
- */
-typedef struct {
-    uint8_t   response_type;  /**< Type of the response */
-    uint8_t   error_code;     /**< Error code */
-    uint16_t sequence;       /**< Sequence number */
-    uint32_t resource_id;     /** < Resource ID for requests with side effects only */
-    uint16_t minor_code;      /** < Minor opcode of the failed request */
-    uint8_t major_code;       /** < Major opcode of the failed request */
-    uint8_t pad0;
-    uint32_t pad[5];         /**< Padding */
-    uint32_t full_sequence;  /**< full sequence */
-} xcb_generic_error_t;
-
-/**
- * @brief Generic cookie.
- *
- * A generic cookie structure.
- */
-typedef struct {
-    unsigned int sequence;  /**< Sequence number */
-} xcb_void_cookie_t;
-
-
-/* Include the generated xproto header. */
-#include "xproto.h"
-
-
-/** XCB_NONE is the universal null resource or null atom parameter value for many core X requests */
-#define XCB_NONE 0L
-
-/** XCB_COPY_FROM_PARENT can be used for many xcb_create_window parameters */
-#define XCB_COPY_FROM_PARENT 0L
-
-/** XCB_CURRENT_TIME can be used in most requests that take an xcb_timestamp_t */
-#define XCB_CURRENT_TIME 0L
-
-/** XCB_NO_SYMBOL fills in unused entries in xcb_keysym_t tables */
-#define XCB_NO_SYMBOL 0L
-
-
-/* xcb_auth.c */
-
-/**
- * @brief Container for authorization information.
- *
- * A container for authorization information to be sent to the X server.
- */
-typedef struct xcb_auth_info_t {
-    int   namelen;  /**< Length of the string name (as returned by strlen). */
-    char *name;     /**< String containing the authentication protocol name, such as "MIT-MAGIC-COOKIE-1" or "XDM-AUTHORIZATION-1". */
-    int   datalen;  /**< Length of the data member. */
-    char *data;   /**< Data interpreted in a protocol-specific manner. */
-} xcb_auth_info_t;
-
-
-/* xcb_out.c */
-
-/**
- * @brief Forces any buffered output to be written to the server.
- * @param c: The connection to the X server.
- * @return > @c 0 on success, <= @c 0 otherwise.
- *
- * Forces any buffered output to be written to the server. Blocks
- * until the write is complete.
- */
-int xcb_flush(xcb_connection_t *c);
-
-/**
- * @brief Returns the maximum request length that this server accepts.
- * @param c: The connection to the X server.
- * @return The maximum request length field.
- *
- * In the absence of the BIG-REQUESTS extension, returns the
- * maximum request length field from the connection setup data, which
- * may be as much as 65535. If the server supports BIG-REQUESTS, then
- * the maximum request length field from the reply to the
- * BigRequestsEnable request will be returned instead.
- *
- * Note that this length is measured in four-byte units, making the
- * theoretical maximum lengths roughly 256kB without BIG-REQUESTS and
- * 16GB with.
- */
-uint32_t xcb_get_maximum_request_length(xcb_connection_t *c);
-
-/**
- * @brief Prefetch the maximum request length without blocking.
- * @param c: The connection to the X server.
- *
- * Without blocking, does as much work as possible toward computing
- * the maximum request length accepted by the X server.
- *
- * Invoking this function may cause a call to xcb_big_requests_enable,
- * but will not block waiting for the reply.
- * xcb_get_maximum_request_length will return the prefetched data
- * after possibly blocking while the reply is retrieved.
- *
- * Note that in order for this function to be fully non-blocking, the
- * application must previously have called
- * xcb_prefetch_extension_data(c, &xcb_big_requests_id) and the reply
- * must have already arrived.
- */
-void xcb_prefetch_maximum_request_length(xcb_connection_t *c);
-
-
-/* xcb_in.c */
-
-/**
- * @brief Returns the next event or error from the server.
- * @param c: The connection to the X server.
- * @return The next event from the server.
- *
- * Returns the next event or error from the server, or returns null in
- * the event of an I/O error. Blocks until either an event or error
- * arrive, or an I/O error occurs.
- */
-xcb_generic_event_t *xcb_wait_for_event(xcb_connection_t *c);
-
-/**
- * @brief Returns the next event or error from the server.
- * @param c: The connection to the X server.
- * @return The next event from the server.
- *
- * Returns the next event or error from the server, if one is
- * available, or returns @c NULL otherwise. If no event is available, that
- * might be because an I/O error like connection close occurred while
- * attempting to read the next event, in which case the connection is
- * shut down when this function returns.
- */
-xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t *c);
-
-/**
- * @brief Returns the next event without reading from the connection.
- * @param c: The connection to the X server.
- * @return The next already queued event from the server.
- *
- * This is a version of xcb_poll_for_event that only examines the
- * event queue for new events. The function doesn't try to read new
- * events from the connection if no queued events are found.
- *
- * This function is useful for callers that know in advance that all
- * interesting events have already been read from the connection. For
- * example, callers might use xcb_wait_for_reply and be interested
- * only of events that preceded a specific reply.
- */
-xcb_generic_event_t *xcb_poll_for_queued_event(xcb_connection_t *c);
-
-typedef struct xcb_special_event xcb_special_event_t;
-
-/**
- * @brief Returns the next event from a special queue
- */
-xcb_generic_event_t *xcb_poll_for_special_event(xcb_connection_t *c,
-                                                xcb_special_event_t *se);
-
-/**
- * @brief Returns the next event from a special queue, blocking until one arrives
- */
-xcb_generic_event_t *xcb_wait_for_special_event(xcb_connection_t *c,
-                                                xcb_special_event_t *se);
-/**
- * @typedef typedef struct xcb_extension_t xcb_extension_t
- */
-typedef struct xcb_extension_t xcb_extension_t;  /**< Opaque structure used as key for xcb_get_extension_data_t. */
-
-/**
- * @brief Listen for a special event
- */
-xcb_special_event_t *xcb_register_for_special_xge(xcb_connection_t *c,
-                                                  xcb_extension_t *ext,
-                                                  uint32_t eid,
-                                                  uint32_t *stamp);
-
-/**
- * @brief Stop listening for a special event
- */
-void xcb_unregister_for_special_event(xcb_connection_t *c,
-                                      xcb_special_event_t *se);
-
-/**
- * @brief Return the error for a request, or NULL if none can ever arrive.
- * @param c: The connection to the X server.
- * @param cookie: The request cookie.
- * @return The error for the request, or NULL if none can ever arrive.
- *
- * The xcb_void_cookie_t cookie supplied to this function must have resulted
- * from a call to xcb_[request_name]_checked().  This function will block
- * until one of two conditions happens.  If an error is received, it will be
- * returned.  If a reply to a subsequent request has already arrived, no error
- * can arrive for this request, so this function will return NULL.
- *
- * Note that this function will perform a sync if needed to ensure that the
- * sequence number will advance beyond that provided in cookie; this is a
- * convenience to avoid races in determining whether the sync is needed.
- */
-xcb_generic_error_t *xcb_request_check(xcb_connection_t *c, xcb_void_cookie_t cookie);
-
-/**
- * @brief Discards the reply for a request.
- * @param c: The connection to the X server.
- * @param sequence: The request sequence number from a cookie.
- *
- * Discards the reply for a request. Additionally, any error generated
- * by the request is also discarded (unless it was an _unchecked request
- * and the error has already arrived).
- *
- * This function will not block even if the reply is not yet available.
- *
- * Note that the sequence really does have to come from an xcb cookie;
- * this function is not designed to operate on socket-handoff replies.
- */
-void xcb_discard_reply(xcb_connection_t *c, unsigned int sequence);
-
-/**
- * @brief Discards the reply for a request, given by a 64bit sequence number
- * @param c: The connection to the X server.
- * @param sequence: 64-bit sequence number as returned by xcb_send_request64().
- *
- * Discards the reply for a request. Additionally, any error generated
- * by the request is also discarded (unless it was an _unchecked request
- * and the error has already arrived).
- *
- * This function will not block even if the reply is not yet available.
- *
- * Note that the sequence really does have to come from xcb_send_request64();
- * the cookie sequence number is defined as "unsigned" int and therefore
- * not 64-bit on all platforms.
- * This function is not designed to operate on socket-handoff replies.
- *
- * Unlike its xcb_discard_reply() counterpart, the given sequence number is not
- * automatically "widened" to 64-bit.
- */
-void xcb_discard_reply64(xcb_connection_t *c, uint64_t sequence);
-
-/* xcb_ext.c */
-
-/**
- * @brief Caches reply information from QueryExtension requests.
- * @param c: The connection.
- * @param ext: The extension data.
- * @return A pointer to the xcb_query_extension_reply_t for the extension.
- *
- * This function is the primary interface to the "extension cache",
- * which caches reply information from QueryExtension
- * requests. Invoking this function may cause a call to
- * xcb_query_extension to retrieve extension information from the
- * server, and may block until extension data is received from the
- * server.
- *
- * The result must not be freed. This storage is managed by the cache
- * itself.
- */
-const struct xcb_query_extension_reply_t *xcb_get_extension_data(xcb_connection_t *c, xcb_extension_t *ext);
-
-/**
- * @brief Prefetch of extension data into the extension cache
- * @param c: The connection.
- * @param ext: The extension data.
- *
- * This function allows a "prefetch" of extension data into the
- * extension cache. Invoking the function may cause a call to
- * xcb_query_extension, but will not block waiting for the
- * reply. xcb_get_extension_data will return the prefetched data after
- * possibly blocking while it is retrieved.
- */
-void xcb_prefetch_extension_data(xcb_connection_t *c, xcb_extension_t *ext);
-
-
-/* xcb_conn.c */
-
-/**
- * @brief Access the data returned by the server.
- * @param c: The connection.
- * @return A pointer to an xcb_setup_t structure.
- *
- * Accessor for the data returned by the server when the xcb_connection_t
- * was initialized. This data includes
- * - the server's required format for images,
- * - a list of available visuals,
- * - a list of available screens,
- * - the server's maximum request length (in the absence of the
- * BIG-REQUESTS extension),
- * - and other assorted information.
- *
- * See the X protocol specification for more details.
- *
- * The result must not be freed.
- */
-const struct xcb_setup_t *xcb_get_setup(xcb_connection_t *c);
-
-/**
- * @brief Access the file descriptor of the connection.
- * @param c: The connection.
- * @return The file descriptor.
- *
- * Accessor for the file descriptor that was passed to the
- * xcb_connect_to_fd call that returned @p c.
- */
-int xcb_get_file_descriptor(xcb_connection_t *c);
-
-/**
- * @brief Test whether the connection has shut down due to a fatal error.
- * @param c: The connection.
- * @return > 0 if the connection is in an error state; 0 otherwise.
- *
- * Some errors that occur in the context of an xcb_connection_t
- * are unrecoverable. When such an error occurs, the
- * connection is shut down and further operations on the
- * xcb_connection_t have no effect, but memory will not be freed until
- * xcb_disconnect() is called on the xcb_connection_t.
- *
- * @return XCB_CONN_ERROR, because of socket errors, pipe errors or other stream errors.
- * @return XCB_CONN_CLOSED_EXT_NOTSUPPORTED, when extension not supported.
- * @return XCB_CONN_CLOSED_MEM_INSUFFICIENT, when memory not available.
- * @return XCB_CONN_CLOSED_REQ_LEN_EXCEED, exceeding request length that server accepts.
- * @return XCB_CONN_CLOSED_PARSE_ERR, error during parsing display string.
- * @return XCB_CONN_CLOSED_INVALID_SCREEN, because the server does not have a screen matching the display.
- */
-int xcb_connection_has_error(xcb_connection_t *c);
-
-/**
- * @brief Connects to the X server.
- * @param fd: The file descriptor.
- * @param auth_info: Authentication data.
- * @return A newly allocated xcb_connection_t structure.
- *
- * Connects to an X server, given the open socket @p fd and the
- * xcb_auth_info_t @p auth_info. The file descriptor @p fd is
- * bidirectionally connected to an X server. If the connection
- * should be unauthenticated, @p auth_info must be @c
- * NULL.
- *
- * Always returns a non-NULL pointer to a xcb_connection_t, even on failure.
- * Callers need to use xcb_connection_has_error() to check for failure.
- * When finished, use xcb_disconnect() to close the connection and free
- * the structure.
- */
-xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info);
-
-/**
- * @brief Closes the connection.
- * @param c: The connection.
- *
- * Closes the file descriptor and frees all memory associated with the
- * connection @c c. If @p c is @c NULL, nothing is done.
- */
-void xcb_disconnect(xcb_connection_t *c);
-
-
-/* xcb_util.c */
-
-/**
- * @brief Parses a display string name in the form documented by X(7x).
- * @param name: The name of the display.
- * @param host: A pointer to a malloc'd copy of the hostname.
- * @param display: A pointer to the display number.
- * @param screen: A pointer to the screen number.
- * @return 0 on failure, non 0 otherwise.
- *
- * Parses the display string name @p display_name in the form
- * documented by X(7x). Has no side effects on failure. If
- * @p displayname is @c NULL or empty, it uses the environment
- * variable DISPLAY. @p hostp is a pointer to a newly allocated string
- * that contain the host name. @p displayp is set to the display
- * number and @p screenp to the preferred screen number. @p screenp
- * can be @c NULL. If @p displayname does not contain a screen number,
- * it is set to @c 0.
- */
-int xcb_parse_display(const char *name, char **host, int *display, int *screen);
-
-/**
- * @brief Connects to the X server.
- * @param displayname: The name of the display.
- * @param screenp: A pointer to a preferred screen number.
- * @return A newly allocated xcb_connection_t structure.
- *
- * Connects to the X server specified by @p displayname. If @p
- * displayname is @c NULL, uses the value of the DISPLAY environment
- * variable. If a particular screen on that server is preferred, the
- * int pointed to by @p screenp (if not @c NULL) will be set to that
- * screen; otherwise the screen will be set to 0.
- *
- * Always returns a non-NULL pointer to a xcb_connection_t, even on failure.
- * Callers need to use xcb_connection_has_error() to check for failure.
- * When finished, use xcb_disconnect() to close the connection and free
- * the structure.
- */
-xcb_connection_t *xcb_connect(const char *displayname, int *screenp);
-
-/**
- * @brief Connects to the X server, using an authorization information.
- * @param display: The name of the display.
- * @param auth: The authorization information.
- * @param screen: A pointer to a preferred screen number.
- * @return A newly allocated xcb_connection_t structure.
- *
- * Connects to the X server specified by @p displayname, using the
- * authorization @p auth. If a particular screen on that server is
- * preferred, the int pointed to by @p screenp (if not @c NULL) will
- * be set to that screen; otherwise @p screenp will be set to 0.
- *
- * Always returns a non-NULL pointer to a xcb_connection_t, even on failure.
- * Callers need to use xcb_connection_has_error() to check for failure.
- * When finished, use xcb_disconnect() to close the connection and free
- * the structure.
- */
-xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *display, xcb_auth_info_t *auth, int *screen);
-
-
-/* xcb_xid.c */
-
-/**
- * @brief Allocates an XID for a new object.
- * @param c: The connection.
- * @return A newly allocated XID.
- *
- * Allocates an XID for a new object. Typically used just prior to
- * various object creation functions, such as xcb_create_window.
- */
-uint32_t xcb_generate_id(xcb_connection_t *c);
-
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* __XCB_H__ */
diff --git a/openflow/usr/include/xcb/xcbext.h b/openflow/usr/include/xcb/xcbext.h
deleted file mode 100644
index b2575f7..0000000
--- a/openflow/usr/include/xcb/xcbext.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (C) 2001-2004 Bart Massey and Jamey Sharp.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- * Except as contained in this notice, the names of the authors or their
- * institutions shall not be used in advertising or otherwise to promote the
- * sale, use or other dealings in this Software without prior written
- * authorization from the authors.
- */
-
-#ifndef __XCBEXT_H
-#define __XCBEXT_H
-
-#include "xcb.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* xcb_ext.c */
-
-struct xcb_extension_t {
-    const char *name;
-    int global_id;
-};
-
-
-/* xcb_out.c */
-
-typedef struct {
-    size_t count;
-    xcb_extension_t *ext;
-    uint8_t opcode;
-    uint8_t isvoid;
-} xcb_protocol_request_t;
-
-enum xcb_send_request_flags_t {
-    XCB_REQUEST_CHECKED = 1 << 0,
-    XCB_REQUEST_RAW = 1 << 1,
-    XCB_REQUEST_DISCARD_REPLY = 1 << 2,
-    XCB_REQUEST_REPLY_FDS = 1 << 3
-};
-
-/**
- * @brief Send a request to the server.
- * @param c: The connection to the X server.
- * @param flags: A combination of flags from the xcb_send_request_flags_t enumeration.
- * @param vector: Data to send; must have two iovecs before start for internal use.
- * @param request: Information about the request to be sent.
- * @return The request's sequence number on success, 0 otherwise.
- *
- * This function sends a new request to the X server. The data of the request is
- * given as an array of @c iovecs in the @p vector argument. The length of that
- * array and the neccessary management information are given in the @p request
- * argument.
- *
- * When this function returns, the request might or might not be sent already.
- * Use xcb_flush() to make sure that it really was sent.
- *
- * Please note that this function is not the prefered way for sending requests.
- * It's better to use the generated wrapper functions.
- *
- * Please note that xcb might use index -1 and -2 of the @p vector array internally,
- * so they must be valid!
- */
-unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vector, const xcb_protocol_request_t *request);
-
-/**
- * @brief Send a request to the server, with 64-bit sequence number returned.
- * @param c: The connection to the X server.
- * @param flags: A combination of flags from the xcb_send_request_flags_t enumeration.
- * @param vector: Data to send; must have two iovecs before start for internal use.
- * @param request: Information about the request to be sent.
- * @return The request's sequence number on success, 0 otherwise.
- *
- * This function sends a new request to the X server. The data of the request is
- * given as an array of @c iovecs in the @p vector argument. The length of that
- * array and the neccessary management information are given in the @p request
- * argument.
- *
- * When this function returns, the request might or might not be sent already.
- * Use xcb_flush() to make sure that it really was sent.
- *
- * Please note that this function is not the prefered way for sending requests.
- * It's better to use the generated wrapper functions.
- *
- * Please note that xcb might use index -1 and -2 of the @p vector array internally,
- * so they must be valid!
- */
-uint64_t xcb_send_request64(xcb_connection_t *c, int flags, struct iovec *vector, const xcb_protocol_request_t *request);
-
-/**
- * @brief Send a file descriptor to the server in the next call to xcb_send_request.
- * @param c: The connection to the X server.
- * @param fd: The file descriptor to send.
- *
- * After this function returns, the file descriptor given is owned by xcb and
- * will be closed eventually.
- *
- * FIXME: How the heck is this supposed to work in a thread-safe way? There is a
- * race between two threads doing xcb_send_fd(); xcb_send_request(); at the same
- * time.
- */
-void xcb_send_fd(xcb_connection_t *c, int fd);
-
-/**
- * @brief Take over the write side of the socket
- * @param c: The connection to the X server.
- * @param return_socket: Callback function that will be called when xcb wants
- *                        to use the socket again.
- * @param closure: Argument to the callback function.
- * @param flags: A combination of flags from the xcb_send_request_flags_t enumeration.
- * @param sent: Location to the sequence number of the last sequence request.
- *              Must not be NULL.
- * @return 1 on success, else 0.
- *
- * xcb_take_socket allows external code to ask XCB for permission to
- * take over the write side of the socket and send raw data with
- * xcb_writev. xcb_take_socket provides the sequence number of the last
- * request XCB sent. The caller of xcb_take_socket must supply a
- * callback which XCB can call when it wants the write side of the
- * socket back to make a request. This callback synchronizes with the
- * external socket owner and flushes any output queues if appropriate.
- * If you are sending requests which won't cause a reply, please note the
- * comment for xcb_writev which explains some sequence number wrap issues.
- *
- * All replies that are generated while the socket is owned externally have
- * @p flags applied to them. For example, use XCB_REQUEST_CHECK if you don't
- * want errors to go to xcb's normal error handling, but instead having to be
- * picked up via xcb_wait_for_reply(), xcb_poll_for_reply() or
- * xcb_request_check().
- */
-int xcb_take_socket(xcb_connection_t *c, void (*return_socket)(void *closure), void *closure, int flags, uint64_t *sent);
-
-/**
- * @brief Send raw data to the X server.
- * @param c: The connection to the X server.
- * @param vector: Array of data to be sent.
- * @param count: Number of entries in @p vector.
- * @param requests: Number of requests that are being sent.
- * @return 1 on success, else 0.
- *
- * You must own the write-side of the socket (you've called
- * xcb_take_socket, and haven't returned from return_socket yet) to call
- * xcb_writev. Also, the iovec must have at least 1 byte of data in it.
- * You have to make sure that xcb can detect sequence number wraps correctly.
- * This means that the first request you send after xcb_take_socket must cause a
- * reply (e.g. just insert a GetInputFocus request). After every (1 << 16) - 1
- * requests without a reply, you have to insert a request which will cause a
- * reply. You can again use GetInputFocus for this. You do not have to wait for
- * any of the GetInputFocus replies, but can instead handle them via
- * xcb_discard_reply().
- */
-int xcb_writev(xcb_connection_t *c, struct iovec *vector, int count, uint64_t requests);
-
-
-/* xcb_in.c */
-
-/**
- * @brief Wait for the reply of a given request.
- * @param c: The connection to the X server.
- * @param request: Sequence number of the request as returned by xcb_send_request().
- * @param e: Location to store errors in, or NULL. Ignored for unchecked requests.
- *
- * Returns the reply to the given request or returns null in the event of
- * errors. Blocks until the reply or error for the request arrives, or an I/O
- * error occurs.
- */
-void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_error_t **e);
-
-/**
- * @brief Wait for the reply of a given request, with 64-bit sequence number
- * @param c: The connection to the X server.
- * @param request: 64-bit sequence number of the request as returned by xcb_send_request64().
- * @param e: Location to store errors in, or NULL. Ignored for unchecked requests.
- *
- * Returns the reply to the given request or returns null in the event of
- * errors. Blocks until the reply or error for the request arrives, or an I/O
- * error occurs.
- *
- * Unlike its xcb_wait_for_reply() counterpart, the given sequence number is not
- * automatically "widened" to 64-bit.
- */
-void *xcb_wait_for_reply64(xcb_connection_t *c, uint64_t request, xcb_generic_error_t **e);
-
-/**
- * @brief Poll for the reply of a given request.
- * @param c: The connection to the X server.
- * @param request: Sequence number of the request as returned by xcb_send_request().
- * @param reply: Location to store the reply in, must not be NULL.
- * @param e: Location to store errors in, or NULL. Ignored for unchecked requests.
- * @return 1 when the reply to the request was returned, else 0.
- *
- * Checks if the reply to the given request already received. Does not block.
- */
-int xcb_poll_for_reply(xcb_connection_t *c, unsigned int request, void **reply, xcb_generic_error_t **error);
-
-/**
- * @brief Poll for the reply of a given request, with 64-bit sequence number.
- * @param c: The connection to the X server.
- * @param request: 64-bit sequence number of the request as returned by xcb_send_request().
- * @param reply: Location to store the reply in, must not be NULL.
- * @param e: Location to store errors in, or NULL. Ignored for unchecked requests.
- * @return 1 when the reply to the request was returned, else 0.
- *
- * Checks if the reply to the given request already received. Does not block.
- *
- * Unlike its xcb_poll_for_reply() counterpart, the given sequence number is not
- * automatically "widened" to 64-bit.
- */
-int xcb_poll_for_reply64(xcb_connection_t *c, uint64_t request, void **reply, xcb_generic_error_t **error);
-
-/**
- * @brief Don't use this, only needed by the generated code.
- * @param c: The connection to the X server.
- * @param reply: A reply that was received from the server
- * @param replylen: The size of the reply.
- * @return Pointer to the location where received file descriptors are stored.
- */
-int *xcb_get_reply_fds(xcb_connection_t *c, void *reply, size_t replylen);
-
-
-/* xcb_util.c */
-
-/**
- * @param mask: The mask to check
- * @return The number of set bits in the mask
- */
-int xcb_popcount(uint32_t mask);
-
-/**
- * @param list: The base of an array
- * @param len: The length of the array
- * @return The sum of all entries in the array.
- */
-int xcb_sumof(uint8_t *list, int len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/openflow/usr/include/xcb/xproto.h b/openflow/usr/include/xcb/xproto.h
deleted file mode 100644
index d164324..0000000
--- a/openflow/usr/include/xcb/xproto.h
+++ /dev/null
@@ -1,11864 +0,0 @@
-/*
- * This file generated automatically from xproto.xml by c_client.py.
- * Edit at your peril.
- */
-
-/**
- * @defgroup XCB__API XCB  API
- * @brief  XCB Protocol Implementation.
- * @{
- **/
-
-#ifndef __XPROTO_H
-#define __XPROTO_H
-
-#include "xcb.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief xcb_char2b_t
- **/
-typedef struct xcb_char2b_t {
-    uint8_t byte1; /**<  */
-    uint8_t byte2; /**<  */
-} xcb_char2b_t;
-
-/**
- * @brief xcb_char2b_iterator_t
- **/
-typedef struct xcb_char2b_iterator_t {
-    xcb_char2b_t *data; /**<  */
-    int           rem; /**<  */
-    int           index; /**<  */
-} xcb_char2b_iterator_t;
-
-typedef uint32_t xcb_window_t;
-
-/**
- * @brief xcb_window_iterator_t
- **/
-typedef struct xcb_window_iterator_t {
-    xcb_window_t *data; /**<  */
-    int           rem; /**<  */
-    int           index; /**<  */
-} xcb_window_iterator_t;
-
-typedef uint32_t xcb_pixmap_t;
-
-/**
- * @brief xcb_pixmap_iterator_t
- **/
-typedef struct xcb_pixmap_iterator_t {
-    xcb_pixmap_t *data; /**<  */
-    int           rem; /**<  */
-    int           index; /**<  */
-} xcb_pixmap_iterator_t;
-
-typedef uint32_t xcb_cursor_t;
-
-/**
- * @brief xcb_cursor_iterator_t
- **/
-typedef struct xcb_cursor_iterator_t {
-    xcb_cursor_t *data; /**<  */
-    int           rem; /**<  */
-    int           index; /**<  */
-} xcb_cursor_iterator_t;
-
-typedef uint32_t xcb_font_t;
-
-/**
- * @brief xcb_font_iterator_t
- **/
-typedef struct xcb_font_iterator_t {
-    xcb_font_t *data; /**<  */
-    int         rem; /**<  */
-    int         index; /**<  */
-} xcb_font_iterator_t;
-
-typedef uint32_t xcb_gcontext_t;
-
-/**
- * @brief xcb_gcontext_iterator_t
- **/
-typedef struct xcb_gcontext_iterator_t {
-    xcb_gcontext_t *data; /**<  */
-    int             rem; /**<  */
-    int             index; /**<  */
-} xcb_gcontext_iterator_t;
-
-typedef uint32_t xcb_colormap_t;
-
-/**
- * @brief xcb_colormap_iterator_t
- **/
-typedef struct xcb_colormap_iterator_t {
-    xcb_colormap_t *data; /**<  */
-    int             rem; /**<  */
-    int             index; /**<  */
-} xcb_colormap_iterator_t;
-
-typedef uint32_t xcb_atom_t;
-
-/**
- * @brief xcb_atom_iterator_t
- **/
-typedef struct xcb_atom_iterator_t {
-    xcb_atom_t *data; /**<  */
-    int         rem; /**<  */
-    int         index; /**<  */
-} xcb_atom_iterator_t;
-
-typedef uint32_t xcb_drawable_t;
-
-/**
- * @brief xcb_drawable_iterator_t
- **/
-typedef struct xcb_drawable_iterator_t {
-    xcb_drawable_t *data; /**<  */
-    int             rem; /**<  */
-    int             index; /**<  */
-} xcb_drawable_iterator_t;
-
-typedef uint32_t xcb_fontable_t;
-
-/**
- * @brief xcb_fontable_iterator_t
- **/
-typedef struct xcb_fontable_iterator_t {
-    xcb_fontable_t *data; /**<  */
-    int             rem; /**<  */
-    int             index; /**<  */
-} xcb_fontable_iterator_t;
-
-typedef uint32_t xcb_visualid_t;
-
-/**
- * @brief xcb_visualid_iterator_t
- **/
-typedef struct xcb_visualid_iterator_t {
-    xcb_visualid_t *data; /**<  */
-    int             rem; /**<  */
-    int             index; /**<  */
-} xcb_visualid_iterator_t;
-
-typedef uint32_t xcb_timestamp_t;
-
-/**
- * @brief xcb_timestamp_iterator_t
- **/
-typedef struct xcb_timestamp_iterator_t {
-    xcb_timestamp_t *data; /**<  */
-    int              rem; /**<  */
-    int              index; /**<  */
-} xcb_timestamp_iterator_t;
-
-typedef uint32_t xcb_keysym_t;
-
-/**
- * @brief xcb_keysym_iterator_t
- **/
-typedef struct xcb_keysym_iterator_t {
-    xcb_keysym_t *data; /**<  */
-    int           rem; /**<  */
-    int           index; /**<  */
-} xcb_keysym_iterator_t;
-
-typedef uint8_t xcb_keycode_t;
-
-/**
- * @brief xcb_keycode_iterator_t
- **/
-typedef struct xcb_keycode_iterator_t {
-    xcb_keycode_t *data; /**<  */
-    int            rem; /**<  */
-    int            index; /**<  */
-} xcb_keycode_iterator_t;
-
-typedef uint8_t xcb_button_t;
-
-/**
- * @brief xcb_button_iterator_t
- **/
-typedef struct xcb_button_iterator_t {
-    xcb_button_t *data; /**<  */
-    int           rem; /**<  */
-    int           index; /**<  */
-} xcb_button_iterator_t;
-
-/**
- * @brief xcb_point_t
- **/
-typedef struct xcb_point_t {
-    int16_t x; /**<  */
-    int16_t y; /**<  */
-} xcb_point_t;
-
-/**
- * @brief xcb_point_iterator_t
- **/
-typedef struct xcb_point_iterator_t {
-    xcb_point_t *data; /**<  */
-    int          rem; /**<  */
-    int          index; /**<  */
-} xcb_point_iterator_t;
-
-/**
- * @brief xcb_rectangle_t
- **/
-typedef struct xcb_rectangle_t {
-    int16_t  x; /**<  */
-    int16_t  y; /**<  */
-    uint16_t width; /**<  */
-    uint16_t height; /**<  */
-} xcb_rectangle_t;
-
-/**
- * @brief xcb_rectangle_iterator_t
- **/
-typedef struct xcb_rectangle_iterator_t {
-    xcb_rectangle_t *data; /**<  */
-    int              rem; /**<  */
-    int              index; /**<  */
-} xcb_rectangle_iterator_t;
-
-/**
- * @brief xcb_arc_t
- **/
-typedef struct xcb_arc_t {
-    int16_t  x; /**<  */
-    int16_t  y; /**<  */
-    uint16_t width; /**<  */
-    uint16_t height; /**<  */
-    int16_t  angle1; /**<  */
-    int16_t  angle2; /**<  */
-} xcb_arc_t;
-
-/**
- * @brief xcb_arc_iterator_t
- **/
-typedef struct xcb_arc_iterator_t {
-    xcb_arc_t *data; /**<  */
-    int        rem; /**<  */
-    int        index; /**<  */
-} xcb_arc_iterator_t;
-
-/**
- * @brief xcb_format_t
- **/
-typedef struct xcb_format_t {
-    uint8_t depth; /**<  */
-    uint8_t bits_per_pixel; /**<  */
-    uint8_t scanline_pad; /**<  */
-    uint8_t pad0[5]; /**<  */
-} xcb_format_t;
-
-/**
- * @brief xcb_format_iterator_t
- **/
-typedef struct xcb_format_iterator_t {
-    xcb_format_t *data; /**<  */
-    int           rem; /**<  */
-    int           index; /**<  */
-} xcb_format_iterator_t;
-
-typedef enum xcb_visual_class_t {
-    XCB_VISUAL_CLASS_STATIC_GRAY = 0,
-    XCB_VISUAL_CLASS_GRAY_SCALE = 1,
-    XCB_VISUAL_CLASS_STATIC_COLOR = 2,
-    XCB_VISUAL_CLASS_PSEUDO_COLOR = 3,
-    XCB_VISUAL_CLASS_TRUE_COLOR = 4,
-    XCB_VISUAL_CLASS_DIRECT_COLOR = 5
-} xcb_visual_class_t;
-
-/**
- * @brief xcb_visualtype_t
- **/
-typedef struct xcb_visualtype_t {
-    xcb_visualid_t visual_id; /**<  */
-    uint8_t        _class; /**<  */
-    uint8_t        bits_per_rgb_value; /**<  */
-    uint16_t       colormap_entries; /**<  */
-    uint32_t       red_mask; /**<  */
-    uint32_t       green_mask; /**<  */
-    uint32_t       blue_mask; /**<  */
-    uint8_t        pad0[4]; /**<  */
-} xcb_visualtype_t;
-
-/**
- * @brief xcb_visualtype_iterator_t
- **/
-typedef struct xcb_visualtype_iterator_t {
-    xcb_visualtype_t *data; /**<  */
-    int               rem; /**<  */
-    int               index; /**<  */
-} xcb_visualtype_iterator_t;
-
-/**
- * @brief xcb_depth_t
- **/
-typedef struct xcb_depth_t {
-    uint8_t  depth; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t visuals_len; /**<  */
-    uint8_t  pad1[4]; /**<  */
-} xcb_depth_t;
-
-/**
- * @brief xcb_depth_iterator_t
- **/
-typedef struct xcb_depth_iterator_t {
-    xcb_depth_t *data; /**<  */
-    int          rem; /**<  */
-    int          index; /**<  */
-} xcb_depth_iterator_t;
-
-typedef enum xcb_event_mask_t {
-    XCB_EVENT_MASK_NO_EVENT = 0,
-    XCB_EVENT_MASK_KEY_PRESS = 1,
-    XCB_EVENT_MASK_KEY_RELEASE = 2,
-    XCB_EVENT_MASK_BUTTON_PRESS = 4,
-    XCB_EVENT_MASK_BUTTON_RELEASE = 8,
-    XCB_EVENT_MASK_ENTER_WINDOW = 16,
-    XCB_EVENT_MASK_LEAVE_WINDOW = 32,
-    XCB_EVENT_MASK_POINTER_MOTION = 64,
-    XCB_EVENT_MASK_POINTER_MOTION_HINT = 128,
-    XCB_EVENT_MASK_BUTTON_1_MOTION = 256,
-    XCB_EVENT_MASK_BUTTON_2_MOTION = 512,
-    XCB_EVENT_MASK_BUTTON_3_MOTION = 1024,
-    XCB_EVENT_MASK_BUTTON_4_MOTION = 2048,
-    XCB_EVENT_MASK_BUTTON_5_MOTION = 4096,
-    XCB_EVENT_MASK_BUTTON_MOTION = 8192,
-    XCB_EVENT_MASK_KEYMAP_STATE = 16384,
-    XCB_EVENT_MASK_EXPOSURE = 32768,
-    XCB_EVENT_MASK_VISIBILITY_CHANGE = 65536,
-    XCB_EVENT_MASK_STRUCTURE_NOTIFY = 131072,
-    XCB_EVENT_MASK_RESIZE_REDIRECT = 262144,
-    XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY = 524288,
-    XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT = 1048576,
-    XCB_EVENT_MASK_FOCUS_CHANGE = 2097152,
-    XCB_EVENT_MASK_PROPERTY_CHANGE = 4194304,
-    XCB_EVENT_MASK_COLOR_MAP_CHANGE = 8388608,
-    XCB_EVENT_MASK_OWNER_GRAB_BUTTON = 16777216
-} xcb_event_mask_t;
-
-typedef enum xcb_backing_store_t {
-    XCB_BACKING_STORE_NOT_USEFUL = 0,
-    XCB_BACKING_STORE_WHEN_MAPPED = 1,
-    XCB_BACKING_STORE_ALWAYS = 2
-} xcb_backing_store_t;
-
-/**
- * @brief xcb_screen_t
- **/
-typedef struct xcb_screen_t {
-    xcb_window_t   root; /**<  */
-    xcb_colormap_t default_colormap; /**<  */
-    uint32_t       white_pixel; /**<  */
-    uint32_t       black_pixel; /**<  */
-    uint32_t       current_input_masks; /**<  */
-    uint16_t       width_in_pixels; /**<  */
-    uint16_t       height_in_pixels; /**<  */
-    uint16_t       width_in_millimeters; /**<  */
-    uint16_t       height_in_millimeters; /**<  */
-    uint16_t       min_installed_maps; /**<  */
-    uint16_t       max_installed_maps; /**<  */
-    xcb_visualid_t root_visual; /**<  */
-    uint8_t        backing_stores; /**<  */
-    uint8_t        save_unders; /**<  */
-    uint8_t        root_depth; /**<  */
-    uint8_t        allowed_depths_len; /**<  */
-} xcb_screen_t;
-
-/**
- * @brief xcb_screen_iterator_t
- **/
-typedef struct xcb_screen_iterator_t {
-    xcb_screen_t *data; /**<  */
-    int           rem; /**<  */
-    int           index; /**<  */
-} xcb_screen_iterator_t;
-
-/**
- * @brief xcb_setup_request_t
- **/
-typedef struct xcb_setup_request_t {
-    uint8_t  byte_order; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t protocol_major_version; /**<  */
-    uint16_t protocol_minor_version; /**<  */
-    uint16_t authorization_protocol_name_len; /**<  */
-    uint16_t authorization_protocol_data_len; /**<  */
-    uint8_t  pad1[2]; /**<  */
-} xcb_setup_request_t;
-
-/**
- * @brief xcb_setup_request_iterator_t
- **/
-typedef struct xcb_setup_request_iterator_t {
-    xcb_setup_request_t *data; /**<  */
-    int                  rem; /**<  */
-    int                  index; /**<  */
-} xcb_setup_request_iterator_t;
-
-/**
- * @brief xcb_setup_failed_t
- **/
-typedef struct xcb_setup_failed_t {
-    uint8_t  status; /**<  */
-    uint8_t  reason_len; /**<  */
-    uint16_t protocol_major_version; /**<  */
-    uint16_t protocol_minor_version; /**<  */
-    uint16_t length; /**<  */
-} xcb_setup_failed_t;
-
-/**
- * @brief xcb_setup_failed_iterator_t
- **/
-typedef struct xcb_setup_failed_iterator_t {
-    xcb_setup_failed_t *data; /**<  */
-    int                 rem; /**<  */
-    int                 index; /**<  */
-} xcb_setup_failed_iterator_t;
-
-/**
- * @brief xcb_setup_authenticate_t
- **/
-typedef struct xcb_setup_authenticate_t {
-    uint8_t  status; /**<  */
-    uint8_t  pad0[5]; /**<  */
-    uint16_t length; /**<  */
-} xcb_setup_authenticate_t;
-
-/**
- * @brief xcb_setup_authenticate_iterator_t
- **/
-typedef struct xcb_setup_authenticate_iterator_t {
-    xcb_setup_authenticate_t *data; /**<  */
-    int                       rem; /**<  */
-    int                       index; /**<  */
-} xcb_setup_authenticate_iterator_t;
-
-typedef enum xcb_image_order_t {
-    XCB_IMAGE_ORDER_LSB_FIRST = 0,
-    XCB_IMAGE_ORDER_MSB_FIRST = 1
-} xcb_image_order_t;
-
-/**
- * @brief xcb_setup_t
- **/
-typedef struct xcb_setup_t {
-    uint8_t       status; /**<  */
-    uint8_t       pad0; /**<  */
-    uint16_t      protocol_major_version; /**<  */
-    uint16_t      protocol_minor_version; /**<  */
-    uint16_t      length; /**<  */
-    uint32_t      release_number; /**<  */
-    uint32_t      resource_id_base; /**<  */
-    uint32_t      resource_id_mask; /**<  */
-    uint32_t      motion_buffer_size; /**<  */
-    uint16_t      vendor_len; /**<  */
-    uint16_t      maximum_request_length; /**<  */
-    uint8_t       roots_len; /**<  */
-    uint8_t       pixmap_formats_len; /**<  */
-    uint8_t       image_byte_order; /**<  */
-    uint8_t       bitmap_format_bit_order; /**<  */
-    uint8_t       bitmap_format_scanline_unit; /**<  */
-    uint8_t       bitmap_format_scanline_pad; /**<  */
-    xcb_keycode_t min_keycode; /**<  */
-    xcb_keycode_t max_keycode; /**<  */
-    uint8_t       pad1[4]; /**<  */
-} xcb_setup_t;
-
-/**
- * @brief xcb_setup_iterator_t
- **/
-typedef struct xcb_setup_iterator_t {
-    xcb_setup_t *data; /**<  */
-    int          rem; /**<  */
-    int          index; /**<  */
-} xcb_setup_iterator_t;
-
-typedef enum xcb_mod_mask_t {
-    XCB_MOD_MASK_SHIFT = 1,
-    XCB_MOD_MASK_LOCK = 2,
-    XCB_MOD_MASK_CONTROL = 4,
-    XCB_MOD_MASK_1 = 8,
-    XCB_MOD_MASK_2 = 16,
-    XCB_MOD_MASK_3 = 32,
-    XCB_MOD_MASK_4 = 64,
-    XCB_MOD_MASK_5 = 128,
-    XCB_MOD_MASK_ANY = 32768
-} xcb_mod_mask_t;
-
-typedef enum xcb_key_but_mask_t {
-    XCB_KEY_BUT_MASK_SHIFT = 1,
-    XCB_KEY_BUT_MASK_LOCK = 2,
-    XCB_KEY_BUT_MASK_CONTROL = 4,
-    XCB_KEY_BUT_MASK_MOD_1 = 8,
-    XCB_KEY_BUT_MASK_MOD_2 = 16,
-    XCB_KEY_BUT_MASK_MOD_3 = 32,
-    XCB_KEY_BUT_MASK_MOD_4 = 64,
-    XCB_KEY_BUT_MASK_MOD_5 = 128,
-    XCB_KEY_BUT_MASK_BUTTON_1 = 256,
-    XCB_KEY_BUT_MASK_BUTTON_2 = 512,
-    XCB_KEY_BUT_MASK_BUTTON_3 = 1024,
-    XCB_KEY_BUT_MASK_BUTTON_4 = 2048,
-    XCB_KEY_BUT_MASK_BUTTON_5 = 4096
-} xcb_key_but_mask_t;
-
-typedef enum xcb_window_enum_t {
-    XCB_WINDOW_NONE = 0
-} xcb_window_enum_t;
-
-/** Opcode for xcb_key_press. */
-#define XCB_KEY_PRESS 2
-
-/**
- * @brief xcb_key_press_event_t
- **/
-typedef struct xcb_key_press_event_t {
-    uint8_t         response_type; /**<  */
-    xcb_keycode_t   detail; /**<  */
-    uint16_t        sequence; /**<  */
-    xcb_timestamp_t time; /**<  */
-    xcb_window_t    root; /**<  */
-    xcb_window_t    event; /**<  */
-    xcb_window_t    child; /**<  */
-    int16_t         root_x; /**<  */
-    int16_t         root_y; /**<  */
-    int16_t         event_x; /**<  */
-    int16_t         event_y; /**<  */
-    uint16_t        state; /**<  */
-    uint8_t         same_screen; /**<  */
-    uint8_t         pad0; /**<  */
-} xcb_key_press_event_t;
-
-/** Opcode for xcb_key_release. */
-#define XCB_KEY_RELEASE 3
-
-typedef xcb_key_press_event_t xcb_key_release_event_t;
-
-typedef enum xcb_button_mask_t {
-    XCB_BUTTON_MASK_1 = 256,
-    XCB_BUTTON_MASK_2 = 512,
-    XCB_BUTTON_MASK_3 = 1024,
-    XCB_BUTTON_MASK_4 = 2048,
-    XCB_BUTTON_MASK_5 = 4096,
-    XCB_BUTTON_MASK_ANY = 32768
-} xcb_button_mask_t;
-
-/** Opcode for xcb_button_press. */
-#define XCB_BUTTON_PRESS 4
-
-/**
- * @brief xcb_button_press_event_t
- **/
-typedef struct xcb_button_press_event_t {
-    uint8_t         response_type; /**<  */
-    xcb_button_t    detail; /**<  */
-    uint16_t        sequence; /**<  */
-    xcb_timestamp_t time; /**<  */
-    xcb_window_t    root; /**<  */
-    xcb_window_t    event; /**<  */
-    xcb_window_t    child; /**<  */
-    int16_t         root_x; /**<  */
-    int16_t         root_y; /**<  */
-    int16_t         event_x; /**<  */
-    int16_t         event_y; /**<  */
-    uint16_t        state; /**<  */
-    uint8_t         same_screen; /**<  */
-    uint8_t         pad0; /**<  */
-} xcb_button_press_event_t;
-
-/** Opcode for xcb_button_release. */
-#define XCB_BUTTON_RELEASE 5
-
-typedef xcb_button_press_event_t xcb_button_release_event_t;
-
-typedef enum xcb_motion_t {
-    XCB_MOTION_NORMAL = 0,
-    XCB_MOTION_HINT = 1
-} xcb_motion_t;
-
-/** Opcode for xcb_motion_notify. */
-#define XCB_MOTION_NOTIFY 6
-
-/**
- * @brief xcb_motion_notify_event_t
- **/
-typedef struct xcb_motion_notify_event_t {
-    uint8_t         response_type; /**<  */
-    uint8_t         detail; /**<  */
-    uint16_t        sequence; /**<  */
-    xcb_timestamp_t time; /**<  */
-    xcb_window_t    root; /**<  */
-    xcb_window_t    event; /**<  */
-    xcb_window_t    child; /**<  */
-    int16_t         root_x; /**<  */
-    int16_t         root_y; /**<  */
-    int16_t         event_x; /**<  */
-    int16_t         event_y; /**<  */
-    uint16_t        state; /**<  */
-    uint8_t         same_screen; /**<  */
-    uint8_t         pad0; /**<  */
-} xcb_motion_notify_event_t;
-
-typedef enum xcb_notify_detail_t {
-    XCB_NOTIFY_DETAIL_ANCESTOR = 0,
-    XCB_NOTIFY_DETAIL_VIRTUAL = 1,
-    XCB_NOTIFY_DETAIL_INFERIOR = 2,
-    XCB_NOTIFY_DETAIL_NONLINEAR = 3,
-    XCB_NOTIFY_DETAIL_NONLINEAR_VIRTUAL = 4,
-    XCB_NOTIFY_DETAIL_POINTER = 5,
-    XCB_NOTIFY_DETAIL_POINTER_ROOT = 6,
-    XCB_NOTIFY_DETAIL_NONE = 7
-} xcb_notify_detail_t;
-
-typedef enum xcb_notify_mode_t {
-    XCB_NOTIFY_MODE_NORMAL = 0,
-    XCB_NOTIFY_MODE_GRAB = 1,
-    XCB_NOTIFY_MODE_UNGRAB = 2,
-    XCB_NOTIFY_MODE_WHILE_GRABBED = 3
-} xcb_notify_mode_t;
-
-/** Opcode for xcb_enter_notify. */
-#define XCB_ENTER_NOTIFY 7
-
-/**
- * @brief xcb_enter_notify_event_t
- **/
-typedef struct xcb_enter_notify_event_t {
-    uint8_t         response_type; /**<  */
-    uint8_t         detail; /**<  */
-    uint16_t        sequence; /**<  */
-    xcb_timestamp_t time; /**<  */
-    xcb_window_t    root; /**<  */
-    xcb_window_t    event; /**<  */
-    xcb_window_t    child; /**<  */
-    int16_t         root_x; /**<  */
-    int16_t         root_y; /**<  */
-    int16_t         event_x; /**<  */
-    int16_t         event_y; /**<  */
-    uint16_t        state; /**<  */
-    uint8_t         mode; /**<  */
-    uint8_t         same_screen_focus; /**<  */
-} xcb_enter_notify_event_t;
-
-/** Opcode for xcb_leave_notify. */
-#define XCB_LEAVE_NOTIFY 8
-
-typedef xcb_enter_notify_event_t xcb_leave_notify_event_t;
-
-/** Opcode for xcb_focus_in. */
-#define XCB_FOCUS_IN 9
-
-/**
- * @brief xcb_focus_in_event_t
- **/
-typedef struct xcb_focus_in_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      detail; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t event; /**<  */
-    uint8_t      mode; /**<  */
-    uint8_t      pad0[3]; /**<  */
-} xcb_focus_in_event_t;
-
-/** Opcode for xcb_focus_out. */
-#define XCB_FOCUS_OUT 10
-
-typedef xcb_focus_in_event_t xcb_focus_out_event_t;
-
-/** Opcode for xcb_keymap_notify. */
-#define XCB_KEYMAP_NOTIFY 11
-
-/**
- * @brief xcb_keymap_notify_event_t
- **/
-typedef struct xcb_keymap_notify_event_t {
-    uint8_t response_type; /**<  */
-    uint8_t keys[31]; /**<  */
-} xcb_keymap_notify_event_t;
-
-/** Opcode for xcb_expose. */
-#define XCB_EXPOSE 12
-
-/**
- * @brief xcb_expose_event_t
- **/
-typedef struct xcb_expose_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t window; /**<  */
-    uint16_t     x; /**<  */
-    uint16_t     y; /**<  */
-    uint16_t     width; /**<  */
-    uint16_t     height; /**<  */
-    uint16_t     count; /**<  */
-    uint8_t      pad1[2]; /**<  */
-} xcb_expose_event_t;
-
-/** Opcode for xcb_graphics_exposure. */
-#define XCB_GRAPHICS_EXPOSURE 13
-
-/**
- * @brief xcb_graphics_exposure_event_t
- **/
-typedef struct xcb_graphics_exposure_event_t {
-    uint8_t        response_type; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       sequence; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    uint16_t       x; /**<  */
-    uint16_t       y; /**<  */
-    uint16_t       width; /**<  */
-    uint16_t       height; /**<  */
-    uint16_t       minor_opcode; /**<  */
-    uint16_t       count; /**<  */
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad1[3]; /**<  */
-} xcb_graphics_exposure_event_t;
-
-/** Opcode for xcb_no_exposure. */
-#define XCB_NO_EXPOSURE 14
-
-/**
- * @brief xcb_no_exposure_event_t
- **/
-typedef struct xcb_no_exposure_event_t {
-    uint8_t        response_type; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       sequence; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    uint16_t       minor_opcode; /**<  */
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad1; /**<  */
-} xcb_no_exposure_event_t;
-
-typedef enum xcb_visibility_t {
-    XCB_VISIBILITY_UNOBSCURED = 0,
-    XCB_VISIBILITY_PARTIALLY_OBSCURED = 1,
-    XCB_VISIBILITY_FULLY_OBSCURED = 2
-} xcb_visibility_t;
-
-/** Opcode for xcb_visibility_notify. */
-#define XCB_VISIBILITY_NOTIFY 15
-
-/**
- * @brief xcb_visibility_notify_event_t
- **/
-typedef struct xcb_visibility_notify_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t window; /**<  */
-    uint8_t      state; /**<  */
-    uint8_t      pad1[3]; /**<  */
-} xcb_visibility_notify_event_t;
-
-/** Opcode for xcb_create_notify. */
-#define XCB_CREATE_NOTIFY 16
-
-/**
- * @brief xcb_create_notify_event_t
- **/
-typedef struct xcb_create_notify_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t parent; /**<  */
-    xcb_window_t window; /**<  */
-    int16_t      x; /**<  */
-    int16_t      y; /**<  */
-    uint16_t     width; /**<  */
-    uint16_t     height; /**<  */
-    uint16_t     border_width; /**<  */
-    uint8_t      override_redirect; /**<  */
-    uint8_t      pad1; /**<  */
-} xcb_create_notify_event_t;
-
-/** Opcode for xcb_destroy_notify. */
-#define XCB_DESTROY_NOTIFY 17
-
-/**
- * @brief xcb_destroy_notify_event_t
- **/
-typedef struct xcb_destroy_notify_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t event; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_destroy_notify_event_t;
-
-/** Opcode for xcb_unmap_notify. */
-#define XCB_UNMAP_NOTIFY 18
-
-/**
- * @brief xcb_unmap_notify_event_t
- **/
-typedef struct xcb_unmap_notify_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t event; /**<  */
-    xcb_window_t window; /**<  */
-    uint8_t      from_configure; /**<  */
-    uint8_t      pad1[3]; /**<  */
-} xcb_unmap_notify_event_t;
-
-/** Opcode for xcb_map_notify. */
-#define XCB_MAP_NOTIFY 19
-
-/**
- * @brief xcb_map_notify_event_t
- **/
-typedef struct xcb_map_notify_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t event; /**<  */
-    xcb_window_t window; /**<  */
-    uint8_t      override_redirect; /**<  */
-    uint8_t      pad1[3]; /**<  */
-} xcb_map_notify_event_t;
-
-/** Opcode for xcb_map_request. */
-#define XCB_MAP_REQUEST 20
-
-/**
- * @brief xcb_map_request_event_t
- **/
-typedef struct xcb_map_request_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t parent; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_map_request_event_t;
-
-/** Opcode for xcb_reparent_notify. */
-#define XCB_REPARENT_NOTIFY 21
-
-/**
- * @brief xcb_reparent_notify_event_t
- **/
-typedef struct xcb_reparent_notify_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t event; /**<  */
-    xcb_window_t window; /**<  */
-    xcb_window_t parent; /**<  */
-    int16_t      x; /**<  */
-    int16_t      y; /**<  */
-    uint8_t      override_redirect; /**<  */
-    uint8_t      pad1[3]; /**<  */
-} xcb_reparent_notify_event_t;
-
-/** Opcode for xcb_configure_notify. */
-#define XCB_CONFIGURE_NOTIFY 22
-
-/**
- * @brief xcb_configure_notify_event_t
- **/
-typedef struct xcb_configure_notify_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t event; /**<  */
-    xcb_window_t window; /**<  */
-    xcb_window_t above_sibling; /**<  */
-    int16_t      x; /**<  */
-    int16_t      y; /**<  */
-    uint16_t     width; /**<  */
-    uint16_t     height; /**<  */
-    uint16_t     border_width; /**<  */
-    uint8_t      override_redirect; /**<  */
-    uint8_t      pad1; /**<  */
-} xcb_configure_notify_event_t;
-
-/** Opcode for xcb_configure_request. */
-#define XCB_CONFIGURE_REQUEST 23
-
-/**
- * @brief xcb_configure_request_event_t
- **/
-typedef struct xcb_configure_request_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      stack_mode; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t parent; /**<  */
-    xcb_window_t window; /**<  */
-    xcb_window_t sibling; /**<  */
-    int16_t      x; /**<  */
-    int16_t      y; /**<  */
-    uint16_t     width; /**<  */
-    uint16_t     height; /**<  */
-    uint16_t     border_width; /**<  */
-    uint16_t     value_mask; /**<  */
-} xcb_configure_request_event_t;
-
-/** Opcode for xcb_gravity_notify. */
-#define XCB_GRAVITY_NOTIFY 24
-
-/**
- * @brief xcb_gravity_notify_event_t
- **/
-typedef struct xcb_gravity_notify_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t event; /**<  */
-    xcb_window_t window; /**<  */
-    int16_t      x; /**<  */
-    int16_t      y; /**<  */
-} xcb_gravity_notify_event_t;
-
-/** Opcode for xcb_resize_request. */
-#define XCB_RESIZE_REQUEST 25
-
-/**
- * @brief xcb_resize_request_event_t
- **/
-typedef struct xcb_resize_request_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t window; /**<  */
-    uint16_t     width; /**<  */
-    uint16_t     height; /**<  */
-} xcb_resize_request_event_t;
-
-typedef enum xcb_place_t {
-    XCB_PLACE_ON_TOP = 0,
-/**< The window is now on top of all siblings. */
-
-    XCB_PLACE_ON_BOTTOM = 1
-/**< The window is now below all siblings. */
-
-} xcb_place_t;
-
-/** Opcode for xcb_circulate_notify. */
-#define XCB_CIRCULATE_NOTIFY 26
-
-/**
- * @brief xcb_circulate_notify_event_t
- **/
-typedef struct xcb_circulate_notify_event_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    xcb_window_t event; /**<  */
-    xcb_window_t window; /**<  */
-    uint8_t      pad1[4]; /**<  */
-    uint8_t      place; /**<  */
-    uint8_t      pad2[3]; /**<  */
-} xcb_circulate_notify_event_t;
-
-/** Opcode for xcb_circulate_request. */
-#define XCB_CIRCULATE_REQUEST 27
-
-typedef xcb_circulate_notify_event_t xcb_circulate_request_event_t;
-
-typedef enum xcb_property_t {
-    XCB_PROPERTY_NEW_VALUE = 0,
-    XCB_PROPERTY_DELETE = 1
-} xcb_property_t;
-
-/** Opcode for xcb_property_notify. */
-#define XCB_PROPERTY_NOTIFY 28
-
-/**
- * @brief xcb_property_notify_event_t
- **/
-typedef struct xcb_property_notify_event_t {
-    uint8_t         response_type; /**<  */
-    uint8_t         pad0; /**<  */
-    uint16_t        sequence; /**<  */
-    xcb_window_t    window; /**<  */
-    xcb_atom_t      atom; /**<  */
-    xcb_timestamp_t time; /**<  */
-    uint8_t         state; /**<  */
-    uint8_t         pad1[3]; /**<  */
-} xcb_property_notify_event_t;
-
-/** Opcode for xcb_selection_clear. */
-#define XCB_SELECTION_CLEAR 29
-
-/**
- * @brief xcb_selection_clear_event_t
- **/
-typedef struct xcb_selection_clear_event_t {
-    uint8_t         response_type; /**<  */
-    uint8_t         pad0; /**<  */
-    uint16_t        sequence; /**<  */
-    xcb_timestamp_t time; /**<  */
-    xcb_window_t    owner; /**<  */
-    xcb_atom_t      selection; /**<  */
-} xcb_selection_clear_event_t;
-
-typedef enum xcb_time_t {
-    XCB_TIME_CURRENT_TIME = 0
-} xcb_time_t;
-
-typedef enum xcb_atom_enum_t {
-    XCB_ATOM_NONE = 0,
-    XCB_ATOM_ANY = 0,
-    XCB_ATOM_PRIMARY = 1,
-    XCB_ATOM_SECONDARY = 2,
-    XCB_ATOM_ARC = 3,
-    XCB_ATOM_ATOM = 4,
-    XCB_ATOM_BITMAP = 5,
-    XCB_ATOM_CARDINAL = 6,
-    XCB_ATOM_COLORMAP = 7,
-    XCB_ATOM_CURSOR = 8,
-    XCB_ATOM_CUT_BUFFER0 = 9,
-    XCB_ATOM_CUT_BUFFER1 = 10,
-    XCB_ATOM_CUT_BUFFER2 = 11,
-    XCB_ATOM_CUT_BUFFER3 = 12,
-    XCB_ATOM_CUT_BUFFER4 = 13,
-    XCB_ATOM_CUT_BUFFER5 = 14,
-    XCB_ATOM_CUT_BUFFER6 = 15,
-    XCB_ATOM_CUT_BUFFER7 = 16,
-    XCB_ATOM_DRAWABLE = 17,
-    XCB_ATOM_FONT = 18,
-    XCB_ATOM_INTEGER = 19,
-    XCB_ATOM_PIXMAP = 20,
-    XCB_ATOM_POINT = 21,
-    XCB_ATOM_RECTANGLE = 22,
-    XCB_ATOM_RESOURCE_MANAGER = 23,
-    XCB_ATOM_RGB_COLOR_MAP = 24,
-    XCB_ATOM_RGB_BEST_MAP = 25,
-    XCB_ATOM_RGB_BLUE_MAP = 26,
-    XCB_ATOM_RGB_DEFAULT_MAP = 27,
-    XCB_ATOM_RGB_GRAY_MAP = 28,
-    XCB_ATOM_RGB_GREEN_MAP = 29,
-    XCB_ATOM_RGB_RED_MAP = 30,
-    XCB_ATOM_STRING = 31,
-    XCB_ATOM_VISUALID = 32,
-    XCB_ATOM_WINDOW = 33,
-    XCB_ATOM_WM_COMMAND = 34,
-    XCB_ATOM_WM_HINTS = 35,
-    XCB_ATOM_WM_CLIENT_MACHINE = 36,
-    XCB_ATOM_WM_ICON_NAME = 37,
-    XCB_ATOM_WM_ICON_SIZE = 38,
-    XCB_ATOM_WM_NAME = 39,
-    XCB_ATOM_WM_NORMAL_HINTS = 40,
-    XCB_ATOM_WM_SIZE_HINTS = 41,
-    XCB_ATOM_WM_ZOOM_HINTS = 42,
-    XCB_ATOM_MIN_SPACE = 43,
-    XCB_ATOM_NORM_SPACE = 44,
-    XCB_ATOM_MAX_SPACE = 45,
-    XCB_ATOM_END_SPACE = 46,
-    XCB_ATOM_SUPERSCRIPT_X = 47,
-    XCB_ATOM_SUPERSCRIPT_Y = 48,
-    XCB_ATOM_SUBSCRIPT_X = 49,
-    XCB_ATOM_SUBSCRIPT_Y = 50,
-    XCB_ATOM_UNDERLINE_POSITION = 51,
-    XCB_ATOM_UNDERLINE_THICKNESS = 52,
-    XCB_ATOM_STRIKEOUT_ASCENT = 53,
-    XCB_ATOM_STRIKEOUT_DESCENT = 54,
-    XCB_ATOM_ITALIC_ANGLE = 55,
-    XCB_ATOM_X_HEIGHT = 56,
-    XCB_ATOM_QUAD_WIDTH = 57,
-    XCB_ATOM_WEIGHT = 58,
-    XCB_ATOM_POINT_SIZE = 59,
-    XCB_ATOM_RESOLUTION = 60,
-    XCB_ATOM_COPYRIGHT = 61,
-    XCB_ATOM_NOTICE = 62,
-    XCB_ATOM_FONT_NAME = 63,
-    XCB_ATOM_FAMILY_NAME = 64,
-    XCB_ATOM_FULL_NAME = 65,
-    XCB_ATOM_CAP_HEIGHT = 66,
-    XCB_ATOM_WM_CLASS = 67,
-    XCB_ATOM_WM_TRANSIENT_FOR = 68
-} xcb_atom_enum_t;
-
-/** Opcode for xcb_selection_request. */
-#define XCB_SELECTION_REQUEST 30
-
-/**
- * @brief xcb_selection_request_event_t
- **/
-typedef struct xcb_selection_request_event_t {
-    uint8_t         response_type; /**<  */
-    uint8_t         pad0; /**<  */
-    uint16_t        sequence; /**<  */
-    xcb_timestamp_t time; /**<  */
-    xcb_window_t    owner; /**<  */
-    xcb_window_t    requestor; /**<  */
-    xcb_atom_t      selection; /**<  */
-    xcb_atom_t      target; /**<  */
-    xcb_atom_t      property; /**<  */
-} xcb_selection_request_event_t;
-
-/** Opcode for xcb_selection_notify. */
-#define XCB_SELECTION_NOTIFY 31
-
-/**
- * @brief xcb_selection_notify_event_t
- **/
-typedef struct xcb_selection_notify_event_t {
-    uint8_t         response_type; /**<  */
-    uint8_t         pad0; /**<  */
-    uint16_t        sequence; /**<  */
-    xcb_timestamp_t time; /**<  */
-    xcb_window_t    requestor; /**<  */
-    xcb_atom_t      selection; /**<  */
-    xcb_atom_t      target; /**<  */
-    xcb_atom_t      property; /**<  */
-} xcb_selection_notify_event_t;
-
-typedef enum xcb_colormap_state_t {
-    XCB_COLORMAP_STATE_UNINSTALLED = 0,
-/**< The colormap was uninstalled. */
-
-    XCB_COLORMAP_STATE_INSTALLED = 1
-/**< The colormap was installed. */
-
-} xcb_colormap_state_t;
-
-typedef enum xcb_colormap_enum_t {
-    XCB_COLORMAP_NONE = 0
-} xcb_colormap_enum_t;
-
-/** Opcode for xcb_colormap_notify. */
-#define XCB_COLORMAP_NOTIFY 32
-
-/**
- * @brief xcb_colormap_notify_event_t
- **/
-typedef struct xcb_colormap_notify_event_t {
-    uint8_t        response_type; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       sequence; /**<  */
-    xcb_window_t   window; /**<  */
-    xcb_colormap_t colormap; /**<  */
-    uint8_t        _new; /**<  */
-    uint8_t        state; /**<  */
-    uint8_t        pad1[2]; /**<  */
-} xcb_colormap_notify_event_t;
-
-/**
- * @brief xcb_client_message_data_t
- **/
-typedef union xcb_client_message_data_t {
-    uint8_t  data8[20]; /**<  */
-    uint16_t data16[10]; /**<  */
-    uint32_t data32[5]; /**<  */
-} xcb_client_message_data_t;
-
-/**
- * @brief xcb_client_message_data_iterator_t
- **/
-typedef struct xcb_client_message_data_iterator_t {
-    xcb_client_message_data_t *data; /**<  */
-    int                        rem; /**<  */
-    int                        index; /**<  */
-} xcb_client_message_data_iterator_t;
-
-/** Opcode for xcb_client_message. */
-#define XCB_CLIENT_MESSAGE 33
-
-/**
- * @brief xcb_client_message_event_t
- **/
-typedef struct xcb_client_message_event_t {
-    uint8_t                   response_type; /**<  */
-    uint8_t                   format; /**<  */
-    uint16_t                  sequence; /**<  */
-    xcb_window_t              window; /**<  */
-    xcb_atom_t                type; /**<  */
-    xcb_client_message_data_t data; /**<  */
-} xcb_client_message_event_t;
-
-typedef enum xcb_mapping_t {
-    XCB_MAPPING_MODIFIER = 0,
-    XCB_MAPPING_KEYBOARD = 1,
-    XCB_MAPPING_POINTER = 2
-} xcb_mapping_t;
-
-/** Opcode for xcb_mapping_notify. */
-#define XCB_MAPPING_NOTIFY 34
-
-/**
- * @brief xcb_mapping_notify_event_t
- **/
-typedef struct xcb_mapping_notify_event_t {
-    uint8_t       response_type; /**<  */
-    uint8_t       pad0; /**<  */
-    uint16_t      sequence; /**<  */
-    uint8_t       request; /**<  */
-    xcb_keycode_t first_keycode; /**<  */
-    uint8_t       count; /**<  */
-    uint8_t       pad1; /**<  */
-} xcb_mapping_notify_event_t;
-
-/** Opcode for xcb_ge_generic. */
-#define XCB_GE_GENERIC 35
-
-/**
- * @brief xcb_ge_generic_event_t
- **/
-typedef struct xcb_ge_generic_event_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  extension; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t event_type; /**<  */
-    uint8_t  pad0[22]; /**<  */
-    uint32_t full_sequence; /**<  */
-} xcb_ge_generic_event_t;
-
-/** Opcode for xcb_request. */
-#define XCB_REQUEST 1
-
-/**
- * @brief xcb_request_error_t
- **/
-typedef struct xcb_request_error_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  error_code; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t bad_value; /**<  */
-    uint16_t minor_opcode; /**<  */
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-} xcb_request_error_t;
-
-/** Opcode for xcb_value. */
-#define XCB_VALUE 2
-
-/**
- * @brief xcb_value_error_t
- **/
-typedef struct xcb_value_error_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  error_code; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t bad_value; /**<  */
-    uint16_t minor_opcode; /**<  */
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-} xcb_value_error_t;
-
-/** Opcode for xcb_window. */
-#define XCB_WINDOW 3
-
-typedef xcb_value_error_t xcb_window_error_t;
-
-/** Opcode for xcb_pixmap. */
-#define XCB_PIXMAP 4
-
-typedef xcb_value_error_t xcb_pixmap_error_t;
-
-/** Opcode for xcb_atom. */
-#define XCB_ATOM 5
-
-typedef xcb_value_error_t xcb_atom_error_t;
-
-/** Opcode for xcb_cursor. */
-#define XCB_CURSOR 6
-
-typedef xcb_value_error_t xcb_cursor_error_t;
-
-/** Opcode for xcb_font. */
-#define XCB_FONT 7
-
-typedef xcb_value_error_t xcb_font_error_t;
-
-/** Opcode for xcb_match. */
-#define XCB_MATCH 8
-
-typedef xcb_request_error_t xcb_match_error_t;
-
-/** Opcode for xcb_drawable. */
-#define XCB_DRAWABLE 9
-
-typedef xcb_value_error_t xcb_drawable_error_t;
-
-/** Opcode for xcb_access. */
-#define XCB_ACCESS 10
-
-typedef xcb_request_error_t xcb_access_error_t;
-
-/** Opcode for xcb_alloc. */
-#define XCB_ALLOC 11
-
-typedef xcb_request_error_t xcb_alloc_error_t;
-
-/** Opcode for xcb_colormap. */
-#define XCB_COLORMAP 12
-
-typedef xcb_value_error_t xcb_colormap_error_t;
-
-/** Opcode for xcb_g_context. */
-#define XCB_G_CONTEXT 13
-
-typedef xcb_value_error_t xcb_g_context_error_t;
-
-/** Opcode for xcb_id_choice. */
-#define XCB_ID_CHOICE 14
-
-typedef xcb_value_error_t xcb_id_choice_error_t;
-
-/** Opcode for xcb_name. */
-#define XCB_NAME 15
-
-typedef xcb_request_error_t xcb_name_error_t;
-
-/** Opcode for xcb_length. */
-#define XCB_LENGTH 16
-
-typedef xcb_request_error_t xcb_length_error_t;
-
-/** Opcode for xcb_implementation. */
-#define XCB_IMPLEMENTATION 17
-
-typedef xcb_request_error_t xcb_implementation_error_t;
-
-typedef enum xcb_window_class_t {
-    XCB_WINDOW_CLASS_COPY_FROM_PARENT = 0,
-    XCB_WINDOW_CLASS_INPUT_OUTPUT = 1,
-    XCB_WINDOW_CLASS_INPUT_ONLY = 2
-} xcb_window_class_t;
-
-typedef enum xcb_cw_t {
-    XCB_CW_BACK_PIXMAP = 1,
-/**< Overrides the default background-pixmap. The background pixmap and window must
-have the same root and same depth. Any size pixmap can be used, although some
-sizes may be faster than others.
-
-If `XCB_BACK_PIXMAP_NONE` is specified, the window has no defined background.
-The server may fill the contents with the previous screen contents or with
-contents of its own choosing.
-
-If `XCB_BACK_PIXMAP_PARENT_RELATIVE` is specified, the parent's background is
-used, but the window must have the same depth as the parent (or a Match error
-results).   The parent's background is tracked, and the current version is
-used each time the window background is required. */
-
-    XCB_CW_BACK_PIXEL = 2,
-/**< Overrides `BackPixmap`. A pixmap of undefined size filled with the specified
-background pixel is used for the background. Range-checking is not performed,
-the background pixel is truncated to the appropriate number of bits. */
-
-    XCB_CW_BORDER_PIXMAP = 4,
-/**< Overrides the default border-pixmap. The border pixmap and window must have the
-same root and the same depth. Any size pixmap can be used, although some sizes
-may be faster than others.
-
-The special value `XCB_COPY_FROM_PARENT` means the parent's border pixmap is
-copied (subsequent changes to the parent's border attribute do not affect the
-child), but the window must have the same depth as the parent. */
-
-    XCB_CW_BORDER_PIXEL = 8,
-/**< Overrides `BorderPixmap`. A pixmap of undefined size filled with the specified
-border pixel is used for the border. Range checking is not performed on the
-border-pixel value, it is truncated to the appropriate number of bits. */
-
-    XCB_CW_BIT_GRAVITY = 16,
-/**< Defines which region of the window should be retained if the window is resized. */
-
-    XCB_CW_WIN_GRAVITY = 32,
-/**< Defines how the window should be repositioned if the parent is resized (see
-`ConfigureWindow`). */
-
-    XCB_CW_BACKING_STORE = 64,
-/**< A backing-store of `WhenMapped` advises the server that maintaining contents of
-obscured regions when the window is mapped would be beneficial. A backing-store
-of `Always` advises the server that maintaining contents even when the window
-is unmapped would be beneficial. In this case, the server may generate an
-exposure event when the window is created. A value of `NotUseful` advises the
-server that maintaining contents is unnecessary, although a server may still
-choose to maintain contents while the window is mapped. Note that if the server
-maintains contents, then the server should maintain complete contents not just
-the region within the parent boundaries, even if the window is larger than its
-parent. While the server maintains contents, exposure events will not normally
-be generated, but the server may stop maintaining contents at any time. */
-
-    XCB_CW_BACKING_PLANES = 128,
-/**< The backing-planes indicates (with bits set to 1) which bit planes of the
-window hold dynamic data that must be preserved in backing-stores and during
-save-unders. */
-
-    XCB_CW_BACKING_PIXEL = 256,
-/**< The backing-pixel specifies what value to use in planes not covered by
-backing-planes. The server is free to save only the specified bit planes in the
-backing-store or save-under and regenerate the remaining planes with the
-specified pixel value. Any bits beyond the specified depth of the window in
-these values are simply ignored. */
-
-    XCB_CW_OVERRIDE_REDIRECT = 512,
-/**< The override-redirect specifies whether map and configure requests on this
-window should override a SubstructureRedirect on the parent, typically to
-inform a window manager not to tamper with the window. */
-
-    XCB_CW_SAVE_UNDER = 1024,
-/**< If 1, the server is advised that when this window is mapped, saving the
-contents of windows it obscures would be beneficial. */
-
-    XCB_CW_EVENT_MASK = 2048,
-/**< The event-mask defines which events the client is interested in for this window
-(or for some event types, inferiors of the window). */
-
-    XCB_CW_DONT_PROPAGATE = 4096,
-/**< The do-not-propagate-mask defines which events should not be propagated to
-ancestor windows when no client has the event type selected in this window. */
-
-    XCB_CW_COLORMAP = 8192,
-/**< The colormap specifies the colormap that best reflects the true colors of the window. Servers
-capable of supporting multiple hardware colormaps may use this information, and window man-
-agers may use it for InstallColormap requests. The colormap must have the same visual type
-and root as the window (or a Match error results). If CopyFromParent is specified, the parent's
-colormap is copied (subsequent changes to the parent's colormap attribute do not affect the child).
-However, the window must have the same visual type as the parent (or a Match error results),
-and the parent must not have a colormap of None (or a Match error results). For an explanation
-of None, see FreeColormap request. The colormap is copied by sharing the colormap object
-between the child and the parent, not by making a complete copy of the colormap contents. */
-
-    XCB_CW_CURSOR = 16384
-/**< If a cursor is specified, it will be used whenever the pointer is in the window. If None is speci-
-fied, the parent's cursor will be used when the pointer is in the window, and any change in the
-parent's cursor will cause an immediate change in the displayed cursor. */
-
-} xcb_cw_t;
-
-typedef enum xcb_back_pixmap_t {
-    XCB_BACK_PIXMAP_NONE = 0,
-    XCB_BACK_PIXMAP_PARENT_RELATIVE = 1
-} xcb_back_pixmap_t;
-
-typedef enum xcb_gravity_t {
-    XCB_GRAVITY_BIT_FORGET = 0,
-    XCB_GRAVITY_WIN_UNMAP = 0,
-    XCB_GRAVITY_NORTH_WEST = 1,
-    XCB_GRAVITY_NORTH = 2,
-    XCB_GRAVITY_NORTH_EAST = 3,
-    XCB_GRAVITY_WEST = 4,
-    XCB_GRAVITY_CENTER = 5,
-    XCB_GRAVITY_EAST = 6,
-    XCB_GRAVITY_SOUTH_WEST = 7,
-    XCB_GRAVITY_SOUTH = 8,
-    XCB_GRAVITY_SOUTH_EAST = 9,
-    XCB_GRAVITY_STATIC = 10
-} xcb_gravity_t;
-
-/** Opcode for xcb_create_window. */
-#define XCB_CREATE_WINDOW 1
-
-/**
- * @brief xcb_create_window_request_t
- **/
-typedef struct xcb_create_window_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        depth; /**<  */
-    uint16_t       length; /**<  */
-    xcb_window_t   wid; /**<  */
-    xcb_window_t   parent; /**<  */
-    int16_t        x; /**<  */
-    int16_t        y; /**<  */
-    uint16_t       width; /**<  */
-    uint16_t       height; /**<  */
-    uint16_t       border_width; /**<  */
-    uint16_t       _class; /**<  */
-    xcb_visualid_t visual; /**<  */
-    uint32_t       value_mask; /**<  */
-} xcb_create_window_request_t;
-
-/** Opcode for xcb_change_window_attributes. */
-#define XCB_CHANGE_WINDOW_ATTRIBUTES 2
-
-/**
- * @brief xcb_change_window_attributes_request_t
- **/
-typedef struct xcb_change_window_attributes_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-    uint32_t     value_mask; /**<  */
-} xcb_change_window_attributes_request_t;
-
-typedef enum xcb_map_state_t {
-    XCB_MAP_STATE_UNMAPPED = 0,
-    XCB_MAP_STATE_UNVIEWABLE = 1,
-    XCB_MAP_STATE_VIEWABLE = 2
-} xcb_map_state_t;
-
-/**
- * @brief xcb_get_window_attributes_cookie_t
- **/
-typedef struct xcb_get_window_attributes_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_window_attributes_cookie_t;
-
-/** Opcode for xcb_get_window_attributes. */
-#define XCB_GET_WINDOW_ATTRIBUTES 3
-
-/**
- * @brief xcb_get_window_attributes_request_t
- **/
-typedef struct xcb_get_window_attributes_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_get_window_attributes_request_t;
-
-/**
- * @brief xcb_get_window_attributes_reply_t
- **/
-typedef struct xcb_get_window_attributes_reply_t {
-    uint8_t        response_type; /**<  */
-    uint8_t        backing_store; /**<  */
-    uint16_t       sequence; /**<  */
-    uint32_t       length; /**<  */
-    xcb_visualid_t visual; /**<  */
-    uint16_t       _class; /**<  */
-    uint8_t        bit_gravity; /**<  */
-    uint8_t        win_gravity; /**<  */
-    uint32_t       backing_planes; /**<  */
-    uint32_t       backing_pixel; /**<  */
-    uint8_t        save_under; /**<  */
-    uint8_t        map_is_installed; /**<  */
-    uint8_t        map_state; /**<  */
-    uint8_t        override_redirect; /**<  */
-    xcb_colormap_t colormap; /**<  */
-    uint32_t       all_event_masks; /**<  */
-    uint32_t       your_event_mask; /**<  */
-    uint16_t       do_not_propagate_mask; /**<  */
-    uint8_t        pad0[2]; /**<  */
-} xcb_get_window_attributes_reply_t;
-
-/** Opcode for xcb_destroy_window. */
-#define XCB_DESTROY_WINDOW 4
-
-/**
- * @brief xcb_destroy_window_request_t
- **/
-typedef struct xcb_destroy_window_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_destroy_window_request_t;
-
-/** Opcode for xcb_destroy_subwindows. */
-#define XCB_DESTROY_SUBWINDOWS 5
-
-/**
- * @brief xcb_destroy_subwindows_request_t
- **/
-typedef struct xcb_destroy_subwindows_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_destroy_subwindows_request_t;
-
-typedef enum xcb_set_mode_t {
-    XCB_SET_MODE_INSERT = 0,
-    XCB_SET_MODE_DELETE = 1
-} xcb_set_mode_t;
-
-/** Opcode for xcb_change_save_set. */
-#define XCB_CHANGE_SAVE_SET 6
-
-/**
- * @brief xcb_change_save_set_request_t
- **/
-typedef struct xcb_change_save_set_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      mode; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_change_save_set_request_t;
-
-/** Opcode for xcb_reparent_window. */
-#define XCB_REPARENT_WINDOW 7
-
-/**
- * @brief xcb_reparent_window_request_t
- **/
-typedef struct xcb_reparent_window_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-    xcb_window_t parent; /**<  */
-    int16_t      x; /**<  */
-    int16_t      y; /**<  */
-} xcb_reparent_window_request_t;
-
-/** Opcode for xcb_map_window. */
-#define XCB_MAP_WINDOW 8
-
-/**
- * @brief xcb_map_window_request_t
- **/
-typedef struct xcb_map_window_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_map_window_request_t;
-
-/** Opcode for xcb_map_subwindows. */
-#define XCB_MAP_SUBWINDOWS 9
-
-/**
- * @brief xcb_map_subwindows_request_t
- **/
-typedef struct xcb_map_subwindows_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_map_subwindows_request_t;
-
-/** Opcode for xcb_unmap_window. */
-#define XCB_UNMAP_WINDOW 10
-
-/**
- * @brief xcb_unmap_window_request_t
- **/
-typedef struct xcb_unmap_window_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_unmap_window_request_t;
-
-/** Opcode for xcb_unmap_subwindows. */
-#define XCB_UNMAP_SUBWINDOWS 11
-
-/**
- * @brief xcb_unmap_subwindows_request_t
- **/
-typedef struct xcb_unmap_subwindows_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_unmap_subwindows_request_t;
-
-typedef enum xcb_config_window_t {
-    XCB_CONFIG_WINDOW_X = 1,
-    XCB_CONFIG_WINDOW_Y = 2,
-    XCB_CONFIG_WINDOW_WIDTH = 4,
-    XCB_CONFIG_WINDOW_HEIGHT = 8,
-    XCB_CONFIG_WINDOW_BORDER_WIDTH = 16,
-    XCB_CONFIG_WINDOW_SIBLING = 32,
-    XCB_CONFIG_WINDOW_STACK_MODE = 64
-} xcb_config_window_t;
-
-typedef enum xcb_stack_mode_t {
-    XCB_STACK_MODE_ABOVE = 0,
-    XCB_STACK_MODE_BELOW = 1,
-    XCB_STACK_MODE_TOP_IF = 2,
-    XCB_STACK_MODE_BOTTOM_IF = 3,
-    XCB_STACK_MODE_OPPOSITE = 4
-} xcb_stack_mode_t;
-
-/** Opcode for xcb_configure_window. */
-#define XCB_CONFIGURE_WINDOW 12
-
-/**
- * @brief xcb_configure_window_request_t
- **/
-typedef struct xcb_configure_window_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-    uint16_t     value_mask; /**<  */
-    uint8_t      pad1[2]; /**<  */
-} xcb_configure_window_request_t;
-
-typedef enum xcb_circulate_t {
-    XCB_CIRCULATE_RAISE_LOWEST = 0,
-    XCB_CIRCULATE_LOWER_HIGHEST = 1
-} xcb_circulate_t;
-
-/** Opcode for xcb_circulate_window. */
-#define XCB_CIRCULATE_WINDOW 13
-
-/**
- * @brief xcb_circulate_window_request_t
- **/
-typedef struct xcb_circulate_window_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      direction; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_circulate_window_request_t;
-
-/**
- * @brief xcb_get_geometry_cookie_t
- **/
-typedef struct xcb_get_geometry_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_geometry_cookie_t;
-
-/** Opcode for xcb_get_geometry. */
-#define XCB_GET_GEOMETRY 14
-
-/**
- * @brief xcb_get_geometry_request_t
- **/
-typedef struct xcb_get_geometry_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-} xcb_get_geometry_request_t;
-
-/**
- * @brief xcb_get_geometry_reply_t
- **/
-typedef struct xcb_get_geometry_reply_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      depth; /**<  */
-    uint16_t     sequence; /**<  */
-    uint32_t     length; /**<  */
-    xcb_window_t root; /**<  */
-    int16_t      x; /**<  */
-    int16_t      y; /**<  */
-    uint16_t     width; /**<  */
-    uint16_t     height; /**<  */
-    uint16_t     border_width; /**<  */
-    uint8_t      pad0[2]; /**<  */
-} xcb_get_geometry_reply_t;
-
-/**
- * @brief xcb_query_tree_cookie_t
- **/
-typedef struct xcb_query_tree_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_query_tree_cookie_t;
-
-/** Opcode for xcb_query_tree. */
-#define XCB_QUERY_TREE 15
-
-/**
- * @brief xcb_query_tree_request_t
- **/
-typedef struct xcb_query_tree_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_query_tree_request_t;
-
-/**
- * @brief xcb_query_tree_reply_t
- **/
-typedef struct xcb_query_tree_reply_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    uint32_t     length; /**<  */
-    xcb_window_t root; /**<  */
-    xcb_window_t parent; /**<  */
-    uint16_t     children_len; /**<  */
-    uint8_t      pad1[14]; /**<  */
-} xcb_query_tree_reply_t;
-
-/**
- * @brief xcb_intern_atom_cookie_t
- **/
-typedef struct xcb_intern_atom_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_intern_atom_cookie_t;
-
-/** Opcode for xcb_intern_atom. */
-#define XCB_INTERN_ATOM 16
-
-/**
- * @brief xcb_intern_atom_request_t
- **/
-typedef struct xcb_intern_atom_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  only_if_exists; /**<  */
-    uint16_t length; /**<  */
-    uint16_t name_len; /**<  */
-    uint8_t  pad0[2]; /**<  */
-} xcb_intern_atom_request_t;
-
-/**
- * @brief xcb_intern_atom_reply_t
- **/
-typedef struct xcb_intern_atom_reply_t {
-    uint8_t    response_type; /**<  */
-    uint8_t    pad0; /**<  */
-    uint16_t   sequence; /**<  */
-    uint32_t   length; /**<  */
-    xcb_atom_t atom; /**<  */
-} xcb_intern_atom_reply_t;
-
-/**
- * @brief xcb_get_atom_name_cookie_t
- **/
-typedef struct xcb_get_atom_name_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_atom_name_cookie_t;
-
-/** Opcode for xcb_get_atom_name. */
-#define XCB_GET_ATOM_NAME 17
-
-/**
- * @brief xcb_get_atom_name_request_t
- **/
-typedef struct xcb_get_atom_name_request_t {
-    uint8_t    major_opcode; /**<  */
-    uint8_t    pad0; /**<  */
-    uint16_t   length; /**<  */
-    xcb_atom_t atom; /**<  */
-} xcb_get_atom_name_request_t;
-
-/**
- * @brief xcb_get_atom_name_reply_t
- **/
-typedef struct xcb_get_atom_name_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t name_len; /**<  */
-    uint8_t  pad1[22]; /**<  */
-} xcb_get_atom_name_reply_t;
-
-typedef enum xcb_prop_mode_t {
-    XCB_PROP_MODE_REPLACE = 0,
-/**< Discard the previous property value and store the new data. */
-
-    XCB_PROP_MODE_PREPEND = 1,
-/**< Insert the new data before the beginning of existing data. The `format` must
-match existing property value. If the property is undefined, it is treated as
-defined with the correct type and format with zero-length data. */
-
-    XCB_PROP_MODE_APPEND = 2
-/**< Insert the new data after the beginning of existing data. The `format` must
-match existing property value. If the property is undefined, it is treated as
-defined with the correct type and format with zero-length data. */
-
-} xcb_prop_mode_t;
-
-/** Opcode for xcb_change_property. */
-#define XCB_CHANGE_PROPERTY 18
-
-/**
- * @brief xcb_change_property_request_t
- **/
-typedef struct xcb_change_property_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      mode; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-    xcb_atom_t   property; /**<  */
-    xcb_atom_t   type; /**<  */
-    uint8_t      format; /**<  */
-    uint8_t      pad0[3]; /**<  */
-    uint32_t     data_len; /**<  */
-} xcb_change_property_request_t;
-
-/** Opcode for xcb_delete_property. */
-#define XCB_DELETE_PROPERTY 19
-
-/**
- * @brief xcb_delete_property_request_t
- **/
-typedef struct xcb_delete_property_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-    xcb_atom_t   property; /**<  */
-} xcb_delete_property_request_t;
-
-typedef enum xcb_get_property_type_t {
-    XCB_GET_PROPERTY_TYPE_ANY = 0
-} xcb_get_property_type_t;
-
-/**
- * @brief xcb_get_property_cookie_t
- **/
-typedef struct xcb_get_property_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_property_cookie_t;
-
-/** Opcode for xcb_get_property. */
-#define XCB_GET_PROPERTY 20
-
-/**
- * @brief xcb_get_property_request_t
- **/
-typedef struct xcb_get_property_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      _delete; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-    xcb_atom_t   property; /**<  */
-    xcb_atom_t   type; /**<  */
-    uint32_t     long_offset; /**<  */
-    uint32_t     long_length; /**<  */
-} xcb_get_property_request_t;
-
-/**
- * @brief xcb_get_property_reply_t
- **/
-typedef struct xcb_get_property_reply_t {
-    uint8_t    response_type; /**<  */
-    uint8_t    format; /**<  */
-    uint16_t   sequence; /**<  */
-    uint32_t   length; /**<  */
-    xcb_atom_t type; /**<  */
-    uint32_t   bytes_after; /**<  */
-    uint32_t   value_len; /**<  */
-    uint8_t    pad0[12]; /**<  */
-} xcb_get_property_reply_t;
-
-/**
- * @brief xcb_list_properties_cookie_t
- **/
-typedef struct xcb_list_properties_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_list_properties_cookie_t;
-
-/** Opcode for xcb_list_properties. */
-#define XCB_LIST_PROPERTIES 21
-
-/**
- * @brief xcb_list_properties_request_t
- **/
-typedef struct xcb_list_properties_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_list_properties_request_t;
-
-/**
- * @brief xcb_list_properties_reply_t
- **/
-typedef struct xcb_list_properties_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t atoms_len; /**<  */
-    uint8_t  pad1[22]; /**<  */
-} xcb_list_properties_reply_t;
-
-/** Opcode for xcb_set_selection_owner. */
-#define XCB_SET_SELECTION_OWNER 22
-
-/**
- * @brief xcb_set_selection_owner_request_t
- **/
-typedef struct xcb_set_selection_owner_request_t {
-    uint8_t         major_opcode; /**<  */
-    uint8_t         pad0; /**<  */
-    uint16_t        length; /**<  */
-    xcb_window_t    owner; /**<  */
-    xcb_atom_t      selection; /**<  */
-    xcb_timestamp_t time; /**<  */
-} xcb_set_selection_owner_request_t;
-
-/**
- * @brief xcb_get_selection_owner_cookie_t
- **/
-typedef struct xcb_get_selection_owner_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_selection_owner_cookie_t;
-
-/** Opcode for xcb_get_selection_owner. */
-#define XCB_GET_SELECTION_OWNER 23
-
-/**
- * @brief xcb_get_selection_owner_request_t
- **/
-typedef struct xcb_get_selection_owner_request_t {
-    uint8_t    major_opcode; /**<  */
-    uint8_t    pad0; /**<  */
-    uint16_t   length; /**<  */
-    xcb_atom_t selection; /**<  */
-} xcb_get_selection_owner_request_t;
-
-/**
- * @brief xcb_get_selection_owner_reply_t
- **/
-typedef struct xcb_get_selection_owner_reply_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     sequence; /**<  */
-    uint32_t     length; /**<  */
-    xcb_window_t owner; /**<  */
-} xcb_get_selection_owner_reply_t;
-
-/** Opcode for xcb_convert_selection. */
-#define XCB_CONVERT_SELECTION 24
-
-/**
- * @brief xcb_convert_selection_request_t
- **/
-typedef struct xcb_convert_selection_request_t {
-    uint8_t         major_opcode; /**<  */
-    uint8_t         pad0; /**<  */
-    uint16_t        length; /**<  */
-    xcb_window_t    requestor; /**<  */
-    xcb_atom_t      selection; /**<  */
-    xcb_atom_t      target; /**<  */
-    xcb_atom_t      property; /**<  */
-    xcb_timestamp_t time; /**<  */
-} xcb_convert_selection_request_t;
-
-typedef enum xcb_send_event_dest_t {
-    XCB_SEND_EVENT_DEST_POINTER_WINDOW = 0,
-    XCB_SEND_EVENT_DEST_ITEM_FOCUS = 1
-} xcb_send_event_dest_t;
-
-/** Opcode for xcb_send_event. */
-#define XCB_SEND_EVENT 25
-
-/**
- * @brief xcb_send_event_request_t
- **/
-typedef struct xcb_send_event_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      propagate; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t destination; /**<  */
-    uint32_t     event_mask; /**<  */
-    char         event[32]; /**<  */
-} xcb_send_event_request_t;
-
-typedef enum xcb_grab_mode_t {
-    XCB_GRAB_MODE_SYNC = 0,
-/**< The state of the keyboard appears to freeze: No further keyboard events are
-generated by the server until the grabbing client issues a releasing
-`AllowEvents` request or until the keyboard grab is released. */
-
-    XCB_GRAB_MODE_ASYNC = 1
-/**< Keyboard event processing continues normally. */
-
-} xcb_grab_mode_t;
-
-typedef enum xcb_grab_status_t {
-    XCB_GRAB_STATUS_SUCCESS = 0,
-    XCB_GRAB_STATUS_ALREADY_GRABBED = 1,
-    XCB_GRAB_STATUS_INVALID_TIME = 2,
-    XCB_GRAB_STATUS_NOT_VIEWABLE = 3,
-    XCB_GRAB_STATUS_FROZEN = 4
-} xcb_grab_status_t;
-
-typedef enum xcb_cursor_enum_t {
-    XCB_CURSOR_NONE = 0
-} xcb_cursor_enum_t;
-
-/**
- * @brief xcb_grab_pointer_cookie_t
- **/
-typedef struct xcb_grab_pointer_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_grab_pointer_cookie_t;
-
-/** Opcode for xcb_grab_pointer. */
-#define XCB_GRAB_POINTER 26
-
-/**
- * @brief xcb_grab_pointer_request_t
- **/
-typedef struct xcb_grab_pointer_request_t {
-    uint8_t         major_opcode; /**<  */
-    uint8_t         owner_events; /**<  */
-    uint16_t        length; /**<  */
-    xcb_window_t    grab_window; /**<  */
-    uint16_t        event_mask; /**<  */
-    uint8_t         pointer_mode; /**<  */
-    uint8_t         keyboard_mode; /**<  */
-    xcb_window_t    confine_to; /**<  */
-    xcb_cursor_t    cursor; /**<  */
-    xcb_timestamp_t time; /**<  */
-} xcb_grab_pointer_request_t;
-
-/**
- * @brief xcb_grab_pointer_reply_t
- **/
-typedef struct xcb_grab_pointer_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  status; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-} xcb_grab_pointer_reply_t;
-
-/** Opcode for xcb_ungrab_pointer. */
-#define XCB_UNGRAB_POINTER 27
-
-/**
- * @brief xcb_ungrab_pointer_request_t
- **/
-typedef struct xcb_ungrab_pointer_request_t {
-    uint8_t         major_opcode; /**<  */
-    uint8_t         pad0; /**<  */
-    uint16_t        length; /**<  */
-    xcb_timestamp_t time; /**<  */
-} xcb_ungrab_pointer_request_t;
-
-typedef enum xcb_button_index_t {
-    XCB_BUTTON_INDEX_ANY = 0,
-/**< Any of the following (or none): */
-
-    XCB_BUTTON_INDEX_1 = 1,
-/**< The left mouse button. */
-
-    XCB_BUTTON_INDEX_2 = 2,
-/**< The right mouse button. */
-
-    XCB_BUTTON_INDEX_3 = 3,
-/**< The middle mouse button. */
-
-    XCB_BUTTON_INDEX_4 = 4,
-/**< Scroll wheel. TODO: direction? */
-
-    XCB_BUTTON_INDEX_5 = 5
-/**< Scroll wheel. TODO: direction? */
-
-} xcb_button_index_t;
-
-/** Opcode for xcb_grab_button. */
-#define XCB_GRAB_BUTTON 28
-
-/**
- * @brief xcb_grab_button_request_t
- **/
-typedef struct xcb_grab_button_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      owner_events; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t grab_window; /**<  */
-    uint16_t     event_mask; /**<  */
-    uint8_t      pointer_mode; /**<  */
-    uint8_t      keyboard_mode; /**<  */
-    xcb_window_t confine_to; /**<  */
-    xcb_cursor_t cursor; /**<  */
-    uint8_t      button; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     modifiers; /**<  */
-} xcb_grab_button_request_t;
-
-/** Opcode for xcb_ungrab_button. */
-#define XCB_UNGRAB_BUTTON 29
-
-/**
- * @brief xcb_ungrab_button_request_t
- **/
-typedef struct xcb_ungrab_button_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      button; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t grab_window; /**<  */
-    uint16_t     modifiers; /**<  */
-    uint8_t      pad0[2]; /**<  */
-} xcb_ungrab_button_request_t;
-
-/** Opcode for xcb_change_active_pointer_grab. */
-#define XCB_CHANGE_ACTIVE_POINTER_GRAB 30
-
-/**
- * @brief xcb_change_active_pointer_grab_request_t
- **/
-typedef struct xcb_change_active_pointer_grab_request_t {
-    uint8_t         major_opcode; /**<  */
-    uint8_t         pad0; /**<  */
-    uint16_t        length; /**<  */
-    xcb_cursor_t    cursor; /**<  */
-    xcb_timestamp_t time; /**<  */
-    uint16_t        event_mask; /**<  */
-    uint8_t         pad1[2]; /**<  */
-} xcb_change_active_pointer_grab_request_t;
-
-/**
- * @brief xcb_grab_keyboard_cookie_t
- **/
-typedef struct xcb_grab_keyboard_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_grab_keyboard_cookie_t;
-
-/** Opcode for xcb_grab_keyboard. */
-#define XCB_GRAB_KEYBOARD 31
-
-/**
- * @brief xcb_grab_keyboard_request_t
- **/
-typedef struct xcb_grab_keyboard_request_t {
-    uint8_t         major_opcode; /**<  */
-    uint8_t         owner_events; /**<  */
-    uint16_t        length; /**<  */
-    xcb_window_t    grab_window; /**<  */
-    xcb_timestamp_t time; /**<  */
-    uint8_t         pointer_mode; /**<  */
-    uint8_t         keyboard_mode; /**<  */
-    uint8_t         pad0[2]; /**<  */
-} xcb_grab_keyboard_request_t;
-
-/**
- * @brief xcb_grab_keyboard_reply_t
- **/
-typedef struct xcb_grab_keyboard_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  status; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-} xcb_grab_keyboard_reply_t;
-
-/** Opcode for xcb_ungrab_keyboard. */
-#define XCB_UNGRAB_KEYBOARD 32
-
-/**
- * @brief xcb_ungrab_keyboard_request_t
- **/
-typedef struct xcb_ungrab_keyboard_request_t {
-    uint8_t         major_opcode; /**<  */
-    uint8_t         pad0; /**<  */
-    uint16_t        length; /**<  */
-    xcb_timestamp_t time; /**<  */
-} xcb_ungrab_keyboard_request_t;
-
-typedef enum xcb_grab_t {
-    XCB_GRAB_ANY = 0
-} xcb_grab_t;
-
-/** Opcode for xcb_grab_key. */
-#define XCB_GRAB_KEY 33
-
-/**
- * @brief xcb_grab_key_request_t
- **/
-typedef struct xcb_grab_key_request_t {
-    uint8_t       major_opcode; /**<  */
-    uint8_t       owner_events; /**<  */
-    uint16_t      length; /**<  */
-    xcb_window_t  grab_window; /**<  */
-    uint16_t      modifiers; /**<  */
-    xcb_keycode_t key; /**<  */
-    uint8_t       pointer_mode; /**<  */
-    uint8_t       keyboard_mode; /**<  */
-    uint8_t       pad0[3]; /**<  */
-} xcb_grab_key_request_t;
-
-/** Opcode for xcb_ungrab_key. */
-#define XCB_UNGRAB_KEY 34
-
-/**
- * @brief xcb_ungrab_key_request_t
- **/
-typedef struct xcb_ungrab_key_request_t {
-    uint8_t       major_opcode; /**<  */
-    xcb_keycode_t key; /**<  */
-    uint16_t      length; /**<  */
-    xcb_window_t  grab_window; /**<  */
-    uint16_t      modifiers; /**<  */
-    uint8_t       pad0[2]; /**<  */
-} xcb_ungrab_key_request_t;
-
-typedef enum xcb_allow_t {
-    XCB_ALLOW_ASYNC_POINTER = 0,
-/**< For AsyncPointer, if the pointer is frozen by the client, pointer event
-processing continues normally. If the pointer is frozen twice by the client on
-behalf of two separate grabs, AsyncPointer thaws for both. AsyncPointer has no
-effect if the pointer is not frozen by the client, but the pointer need not be
-grabbed by the client.
-
-TODO: rewrite this in more understandable terms. */
-
-    XCB_ALLOW_SYNC_POINTER = 1,
-/**< For SyncPointer, if the pointer is frozen and actively grabbed by the client,
-pointer event processing continues normally until the next ButtonPress or
-ButtonRelease event is reported to the client, at which time the pointer again
-appears to freeze. However, if the reported event causes the pointer grab to be
-released, then the pointer does not freeze. SyncPointer has no effect if the
-pointer is not frozen by the client or if the pointer is not grabbed by the
-client. */
-
-    XCB_ALLOW_REPLAY_POINTER = 2,
-/**< For ReplayPointer, if the pointer is actively grabbed by the client and is
-frozen as the result of an event having been sent to the client (either from
-the activation of a GrabButton or from a previous AllowEvents with mode
-SyncPointer but not from a GrabPointer), then the pointer grab is released and
-that event is completely reprocessed, this time ignoring any passive grabs at
-or above (towards the root) the grab-window of the grab just released. The
-request has no effect if the pointer is not grabbed by the client or if the
-pointer is not frozen as the result of an event. */
-
-    XCB_ALLOW_ASYNC_KEYBOARD = 3,
-/**< For AsyncKeyboard, if the keyboard is frozen by the client, keyboard event
-processing continues normally. If the keyboard is frozen twice by the client on
-behalf of two separate grabs, AsyncKeyboard thaws for both. AsyncKeyboard has
-no effect if the keyboard is not frozen by the client, but the keyboard need
-not be grabbed by the client. */
-
-    XCB_ALLOW_SYNC_KEYBOARD = 4,
-/**< For SyncKeyboard, if the keyboard is frozen and actively grabbed by the client,
-keyboard event processing continues normally until the next KeyPress or
-KeyRelease event is reported to the client, at which time the keyboard again
-appears to freeze. However, if the reported event causes the keyboard grab to
-be released, then the keyboard does not freeze. SyncKeyboard has no effect if
-the keyboard is not frozen by the client or if the keyboard is not grabbed by
-the client. */
-
-    XCB_ALLOW_REPLAY_KEYBOARD = 5,
-/**< For ReplayKeyboard, if the keyboard is actively grabbed by the client and is
-frozen as the result of an event having been sent to the client (either from
-the activation of a GrabKey or from a previous AllowEvents with mode
-SyncKeyboard but not from a GrabKeyboard), then the keyboard grab is released
-and that event is completely reprocessed, this time ignoring any passive grabs
-at or above (towards the root) the grab-window of the grab just released. The
-request has no effect if the keyboard is not grabbed by the client or if the
-keyboard is not frozen as the result of an event. */
-
-    XCB_ALLOW_ASYNC_BOTH = 6,
-/**< For AsyncBoth, if the pointer and the keyboard are frozen by the client, event
-processing for both devices continues normally. If a device is frozen twice by
-the client on behalf of two separate grabs, AsyncBoth thaws for both. AsyncBoth
-has no effect unless both pointer and keyboard are frozen by the client. */
-
-    XCB_ALLOW_SYNC_BOTH = 7
-/**< For SyncBoth, if both pointer and keyboard are frozen by the client, event
-processing (for both devices) continues normally until the next ButtonPress,
-ButtonRelease, KeyPress, or KeyRelease event is reported to the client for a
-grabbed device (button event for the pointer, key event for the keyboard), at
-which time the devices again appear to freeze. However, if the reported event
-causes the grab to be released, then the devices do not freeze (but if the
-other device is still grabbed, then a subsequent event for it will still cause
-both devices to freeze). SyncBoth has no effect unless both pointer and
-keyboard are frozen by the client. If the pointer or keyboard is frozen twice
-by the client on behalf of two separate grabs, SyncBoth thaws for both (but a
-subsequent freeze for SyncBoth will only freeze each device once). */
-
-} xcb_allow_t;
-
-/** Opcode for xcb_allow_events. */
-#define XCB_ALLOW_EVENTS 35
-
-/**
- * @brief xcb_allow_events_request_t
- **/
-typedef struct xcb_allow_events_request_t {
-    uint8_t         major_opcode; /**<  */
-    uint8_t         mode; /**<  */
-    uint16_t        length; /**<  */
-    xcb_timestamp_t time; /**<  */
-} xcb_allow_events_request_t;
-
-/** Opcode for xcb_grab_server. */
-#define XCB_GRAB_SERVER 36
-
-/**
- * @brief xcb_grab_server_request_t
- **/
-typedef struct xcb_grab_server_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_grab_server_request_t;
-
-/** Opcode for xcb_ungrab_server. */
-#define XCB_UNGRAB_SERVER 37
-
-/**
- * @brief xcb_ungrab_server_request_t
- **/
-typedef struct xcb_ungrab_server_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_ungrab_server_request_t;
-
-/**
- * @brief xcb_query_pointer_cookie_t
- **/
-typedef struct xcb_query_pointer_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_query_pointer_cookie_t;
-
-/** Opcode for xcb_query_pointer. */
-#define XCB_QUERY_POINTER 38
-
-/**
- * @brief xcb_query_pointer_request_t
- **/
-typedef struct xcb_query_pointer_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_query_pointer_request_t;
-
-/**
- * @brief xcb_query_pointer_reply_t
- **/
-typedef struct xcb_query_pointer_reply_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      same_screen; /**<  */
-    uint16_t     sequence; /**<  */
-    uint32_t     length; /**<  */
-    xcb_window_t root; /**<  */
-    xcb_window_t child; /**<  */
-    int16_t      root_x; /**<  */
-    int16_t      root_y; /**<  */
-    int16_t      win_x; /**<  */
-    int16_t      win_y; /**<  */
-    uint16_t     mask; /**<  */
-    uint8_t      pad0[2]; /**<  */
-} xcb_query_pointer_reply_t;
-
-/**
- * @brief xcb_timecoord_t
- **/
-typedef struct xcb_timecoord_t {
-    xcb_timestamp_t time; /**<  */
-    int16_t         x; /**<  */
-    int16_t         y; /**<  */
-} xcb_timecoord_t;
-
-/**
- * @brief xcb_timecoord_iterator_t
- **/
-typedef struct xcb_timecoord_iterator_t {
-    xcb_timecoord_t *data; /**<  */
-    int              rem; /**<  */
-    int              index; /**<  */
-} xcb_timecoord_iterator_t;
-
-/**
- * @brief xcb_get_motion_events_cookie_t
- **/
-typedef struct xcb_get_motion_events_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_motion_events_cookie_t;
-
-/** Opcode for xcb_get_motion_events. */
-#define XCB_GET_MOTION_EVENTS 39
-
-/**
- * @brief xcb_get_motion_events_request_t
- **/
-typedef struct xcb_get_motion_events_request_t {
-    uint8_t         major_opcode; /**<  */
-    uint8_t         pad0; /**<  */
-    uint16_t        length; /**<  */
-    xcb_window_t    window; /**<  */
-    xcb_timestamp_t start; /**<  */
-    xcb_timestamp_t stop; /**<  */
-} xcb_get_motion_events_request_t;
-
-/**
- * @brief xcb_get_motion_events_reply_t
- **/
-typedef struct xcb_get_motion_events_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint32_t events_len; /**<  */
-    uint8_t  pad1[20]; /**<  */
-} xcb_get_motion_events_reply_t;
-
-/**
- * @brief xcb_translate_coordinates_cookie_t
- **/
-typedef struct xcb_translate_coordinates_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_translate_coordinates_cookie_t;
-
-/** Opcode for xcb_translate_coordinates. */
-#define XCB_TRANSLATE_COORDINATES 40
-
-/**
- * @brief xcb_translate_coordinates_request_t
- **/
-typedef struct xcb_translate_coordinates_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t src_window; /**<  */
-    xcb_window_t dst_window; /**<  */
-    int16_t      src_x; /**<  */
-    int16_t      src_y; /**<  */
-} xcb_translate_coordinates_request_t;
-
-/**
- * @brief xcb_translate_coordinates_reply_t
- **/
-typedef struct xcb_translate_coordinates_reply_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      same_screen; /**<  */
-    uint16_t     sequence; /**<  */
-    uint32_t     length; /**<  */
-    xcb_window_t child; /**<  */
-    int16_t      dst_x; /**<  */
-    int16_t      dst_y; /**<  */
-} xcb_translate_coordinates_reply_t;
-
-/** Opcode for xcb_warp_pointer. */
-#define XCB_WARP_POINTER 41
-
-/**
- * @brief xcb_warp_pointer_request_t
- **/
-typedef struct xcb_warp_pointer_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t src_window; /**<  */
-    xcb_window_t dst_window; /**<  */
-    int16_t      src_x; /**<  */
-    int16_t      src_y; /**<  */
-    uint16_t     src_width; /**<  */
-    uint16_t     src_height; /**<  */
-    int16_t      dst_x; /**<  */
-    int16_t      dst_y; /**<  */
-} xcb_warp_pointer_request_t;
-
-typedef enum xcb_input_focus_t {
-    XCB_INPUT_FOCUS_NONE = 0,
-/**< The focus reverts to `XCB_NONE`, so no window will have the input focus. */
-
-    XCB_INPUT_FOCUS_POINTER_ROOT = 1,
-/**< The focus reverts to `XCB_POINTER_ROOT` respectively. When the focus reverts,
-FocusIn and FocusOut events are generated, but the last-focus-change time is
-not changed. */
-
-    XCB_INPUT_FOCUS_PARENT = 2,
-/**< The focus reverts to the parent (or closest viewable ancestor) and the new
-revert_to value is `XCB_INPUT_FOCUS_NONE`. */
-
-    XCB_INPUT_FOCUS_FOLLOW_KEYBOARD = 3
-/**< NOT YET DOCUMENTED. Only relevant for the xinput extension. */
-
-} xcb_input_focus_t;
-
-/** Opcode for xcb_set_input_focus. */
-#define XCB_SET_INPUT_FOCUS 42
-
-/**
- * @brief xcb_set_input_focus_request_t
- **/
-typedef struct xcb_set_input_focus_request_t {
-    uint8_t         major_opcode; /**<  */
-    uint8_t         revert_to; /**<  */
-    uint16_t        length; /**<  */
-    xcb_window_t    focus; /**<  */
-    xcb_timestamp_t time; /**<  */
-} xcb_set_input_focus_request_t;
-
-/**
- * @brief xcb_get_input_focus_cookie_t
- **/
-typedef struct xcb_get_input_focus_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_input_focus_cookie_t;
-
-/** Opcode for xcb_get_input_focus. */
-#define XCB_GET_INPUT_FOCUS 43
-
-/**
- * @brief xcb_get_input_focus_request_t
- **/
-typedef struct xcb_get_input_focus_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_get_input_focus_request_t;
-
-/**
- * @brief xcb_get_input_focus_reply_t
- **/
-typedef struct xcb_get_input_focus_reply_t {
-    uint8_t      response_type; /**<  */
-    uint8_t      revert_to; /**<  */
-    uint16_t     sequence; /**<  */
-    uint32_t     length; /**<  */
-    xcb_window_t focus; /**<  */
-} xcb_get_input_focus_reply_t;
-
-/**
- * @brief xcb_query_keymap_cookie_t
- **/
-typedef struct xcb_query_keymap_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_query_keymap_cookie_t;
-
-/** Opcode for xcb_query_keymap. */
-#define XCB_QUERY_KEYMAP 44
-
-/**
- * @brief xcb_query_keymap_request_t
- **/
-typedef struct xcb_query_keymap_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_query_keymap_request_t;
-
-/**
- * @brief xcb_query_keymap_reply_t
- **/
-typedef struct xcb_query_keymap_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint8_t  keys[32]; /**<  */
-} xcb_query_keymap_reply_t;
-
-/** Opcode for xcb_open_font. */
-#define XCB_OPEN_FONT 45
-
-/**
- * @brief xcb_open_font_request_t
- **/
-typedef struct xcb_open_font_request_t {
-    uint8_t    major_opcode; /**<  */
-    uint8_t    pad0; /**<  */
-    uint16_t   length; /**<  */
-    xcb_font_t fid; /**<  */
-    uint16_t   name_len; /**<  */
-    uint8_t    pad1[2]; /**<  */
-} xcb_open_font_request_t;
-
-/** Opcode for xcb_close_font. */
-#define XCB_CLOSE_FONT 46
-
-/**
- * @brief xcb_close_font_request_t
- **/
-typedef struct xcb_close_font_request_t {
-    uint8_t    major_opcode; /**<  */
-    uint8_t    pad0; /**<  */
-    uint16_t   length; /**<  */
-    xcb_font_t font; /**<  */
-} xcb_close_font_request_t;
-
-typedef enum xcb_font_draw_t {
-    XCB_FONT_DRAW_LEFT_TO_RIGHT = 0,
-    XCB_FONT_DRAW_RIGHT_TO_LEFT = 1
-} xcb_font_draw_t;
-
-/**
- * @brief xcb_fontprop_t
- **/
-typedef struct xcb_fontprop_t {
-    xcb_atom_t name; /**<  */
-    uint32_t   value; /**<  */
-} xcb_fontprop_t;
-
-/**
- * @brief xcb_fontprop_iterator_t
- **/
-typedef struct xcb_fontprop_iterator_t {
-    xcb_fontprop_t *data; /**<  */
-    int             rem; /**<  */
-    int             index; /**<  */
-} xcb_fontprop_iterator_t;
-
-/**
- * @brief xcb_charinfo_t
- **/
-typedef struct xcb_charinfo_t {
-    int16_t  left_side_bearing; /**<  */
-    int16_t  right_side_bearing; /**<  */
-    int16_t  character_width; /**<  */
-    int16_t  ascent; /**<  */
-    int16_t  descent; /**<  */
-    uint16_t attributes; /**<  */
-} xcb_charinfo_t;
-
-/**
- * @brief xcb_charinfo_iterator_t
- **/
-typedef struct xcb_charinfo_iterator_t {
-    xcb_charinfo_t *data; /**<  */
-    int             rem; /**<  */
-    int             index; /**<  */
-} xcb_charinfo_iterator_t;
-
-/**
- * @brief xcb_query_font_cookie_t
- **/
-typedef struct xcb_query_font_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_query_font_cookie_t;
-
-/** Opcode for xcb_query_font. */
-#define XCB_QUERY_FONT 47
-
-/**
- * @brief xcb_query_font_request_t
- **/
-typedef struct xcb_query_font_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_fontable_t font; /**<  */
-} xcb_query_font_request_t;
-
-/**
- * @brief xcb_query_font_reply_t
- **/
-typedef struct xcb_query_font_reply_t {
-    uint8_t        response_type; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       sequence; /**<  */
-    uint32_t       length; /**<  */
-    xcb_charinfo_t min_bounds; /**<  */
-    uint8_t        pad1[4]; /**<  */
-    xcb_charinfo_t max_bounds; /**<  */
-    uint8_t        pad2[4]; /**<  */
-    uint16_t       min_char_or_byte2; /**<  */
-    uint16_t       max_char_or_byte2; /**<  */
-    uint16_t       default_char; /**<  */
-    uint16_t       properties_len; /**<  */
-    uint8_t        draw_direction; /**<  */
-    uint8_t        min_byte1; /**<  */
-    uint8_t        max_byte1; /**<  */
-    uint8_t        all_chars_exist; /**<  */
-    int16_t        font_ascent; /**<  */
-    int16_t        font_descent; /**<  */
-    uint32_t       char_infos_len; /**<  */
-} xcb_query_font_reply_t;
-
-/**
- * @brief xcb_query_text_extents_cookie_t
- **/
-typedef struct xcb_query_text_extents_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_query_text_extents_cookie_t;
-
-/** Opcode for xcb_query_text_extents. */
-#define XCB_QUERY_TEXT_EXTENTS 48
-
-/**
- * @brief xcb_query_text_extents_request_t
- **/
-typedef struct xcb_query_text_extents_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        odd_length; /**<  */
-    uint16_t       length; /**<  */
-    xcb_fontable_t font; /**<  */
-} xcb_query_text_extents_request_t;
-
-/**
- * @brief xcb_query_text_extents_reply_t
- **/
-typedef struct xcb_query_text_extents_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  draw_direction; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    int16_t  font_ascent; /**<  */
-    int16_t  font_descent; /**<  */
-    int16_t  overall_ascent; /**<  */
-    int16_t  overall_descent; /**<  */
-    int32_t  overall_width; /**<  */
-    int32_t  overall_left; /**<  */
-    int32_t  overall_right; /**<  */
-} xcb_query_text_extents_reply_t;
-
-/**
- * @brief xcb_str_t
- **/
-typedef struct xcb_str_t {
-    uint8_t name_len; /**<  */
-} xcb_str_t;
-
-/**
- * @brief xcb_str_iterator_t
- **/
-typedef struct xcb_str_iterator_t {
-    xcb_str_t *data; /**<  */
-    int        rem; /**<  */
-    int        index; /**<  */
-} xcb_str_iterator_t;
-
-/**
- * @brief xcb_list_fonts_cookie_t
- **/
-typedef struct xcb_list_fonts_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_list_fonts_cookie_t;
-
-/** Opcode for xcb_list_fonts. */
-#define XCB_LIST_FONTS 49
-
-/**
- * @brief xcb_list_fonts_request_t
- **/
-typedef struct xcb_list_fonts_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-    uint16_t max_names; /**<  */
-    uint16_t pattern_len; /**<  */
-} xcb_list_fonts_request_t;
-
-/**
- * @brief xcb_list_fonts_reply_t
- **/
-typedef struct xcb_list_fonts_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t names_len; /**<  */
-    uint8_t  pad1[22]; /**<  */
-} xcb_list_fonts_reply_t;
-
-/**
- * @brief xcb_list_fonts_with_info_cookie_t
- **/
-typedef struct xcb_list_fonts_with_info_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_list_fonts_with_info_cookie_t;
-
-/** Opcode for xcb_list_fonts_with_info. */
-#define XCB_LIST_FONTS_WITH_INFO 50
-
-/**
- * @brief xcb_list_fonts_with_info_request_t
- **/
-typedef struct xcb_list_fonts_with_info_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-    uint16_t max_names; /**<  */
-    uint16_t pattern_len; /**<  */
-} xcb_list_fonts_with_info_request_t;
-
-/**
- * @brief xcb_list_fonts_with_info_reply_t
- **/
-typedef struct xcb_list_fonts_with_info_reply_t {
-    uint8_t        response_type; /**<  */
-    uint8_t        name_len; /**<  */
-    uint16_t       sequence; /**<  */
-    uint32_t       length; /**<  */
-    xcb_charinfo_t min_bounds; /**<  */
-    uint8_t        pad0[4]; /**<  */
-    xcb_charinfo_t max_bounds; /**<  */
-    uint8_t        pad1[4]; /**<  */
-    uint16_t       min_char_or_byte2; /**<  */
-    uint16_t       max_char_or_byte2; /**<  */
-    uint16_t       default_char; /**<  */
-    uint16_t       properties_len; /**<  */
-    uint8_t        draw_direction; /**<  */
-    uint8_t        min_byte1; /**<  */
-    uint8_t        max_byte1; /**<  */
-    uint8_t        all_chars_exist; /**<  */
-    int16_t        font_ascent; /**<  */
-    int16_t        font_descent; /**<  */
-    uint32_t       replies_hint; /**<  */
-} xcb_list_fonts_with_info_reply_t;
-
-/** Opcode for xcb_set_font_path. */
-#define XCB_SET_FONT_PATH 51
-
-/**
- * @brief xcb_set_font_path_request_t
- **/
-typedef struct xcb_set_font_path_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-    uint16_t font_qty; /**<  */
-    uint8_t  pad1[2]; /**<  */
-} xcb_set_font_path_request_t;
-
-/**
- * @brief xcb_get_font_path_cookie_t
- **/
-typedef struct xcb_get_font_path_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_font_path_cookie_t;
-
-/** Opcode for xcb_get_font_path. */
-#define XCB_GET_FONT_PATH 52
-
-/**
- * @brief xcb_get_font_path_request_t
- **/
-typedef struct xcb_get_font_path_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_get_font_path_request_t;
-
-/**
- * @brief xcb_get_font_path_reply_t
- **/
-typedef struct xcb_get_font_path_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t path_len; /**<  */
-    uint8_t  pad1[22]; /**<  */
-} xcb_get_font_path_reply_t;
-
-/** Opcode for xcb_create_pixmap. */
-#define XCB_CREATE_PIXMAP 53
-
-/**
- * @brief xcb_create_pixmap_request_t
- **/
-typedef struct xcb_create_pixmap_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        depth; /**<  */
-    uint16_t       length; /**<  */
-    xcb_pixmap_t   pid; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    uint16_t       width; /**<  */
-    uint16_t       height; /**<  */
-} xcb_create_pixmap_request_t;
-
-/** Opcode for xcb_free_pixmap. */
-#define XCB_FREE_PIXMAP 54
-
-/**
- * @brief xcb_free_pixmap_request_t
- **/
-typedef struct xcb_free_pixmap_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_pixmap_t pixmap; /**<  */
-} xcb_free_pixmap_request_t;
-
-typedef enum xcb_gc_t {
-    XCB_GC_FUNCTION = 1,
-/**< TODO: Refer to GX */
-
-    XCB_GC_PLANE_MASK = 2,
-/**< In graphics operations, given a source and destination pixel, the result is
-computed bitwise on corresponding bits of the pixels; that is, a Boolean
-operation is performed in each bit plane. The plane-mask restricts the
-operation to a subset of planes, so the result is:
-
-        ((src FUNC dst) AND plane-mask) OR (dst AND (NOT plane-mask)) */
-
-    XCB_GC_FOREGROUND = 4,
-/**< Foreground colorpixel. */
-
-    XCB_GC_BACKGROUND = 8,
-/**< Background colorpixel. */
-
-    XCB_GC_LINE_WIDTH = 16,
-/**< The line-width is measured in pixels and can be greater than or equal to one, a wide line, or the
-special value zero, a thin line. */
-
-    XCB_GC_LINE_STYLE = 32,
-/**< The line-style defines which sections of a line are drawn:
-Solid                The full path of the line is drawn.
-DoubleDash           The full path of the line is drawn, but the even dashes are filled differently
-                     than the odd dashes (see fill-style), with Butt cap-style used where even and
-                     odd dashes meet.
-OnOffDash            Only the even dashes are drawn, and cap-style applies to all internal ends of
-                     the individual dashes (except NotLast is treated as Butt). */
-
-    XCB_GC_CAP_STYLE = 64,
-/**< The cap-style defines how the endpoints of a path are drawn:
-NotLast    The result is equivalent to Butt, except that for a line-width of zero the final
-           endpoint is not drawn.
-Butt       The result is square at the endpoint (perpendicular to the slope of the line)
-           with no projection beyond.
-Round      The result is a circular arc with its diameter equal to the line-width, centered
-           on the endpoint; it is equivalent to Butt for line-width zero.
-Projecting The result is square at the end, but the path continues beyond the endpoint for
-           a distance equal to half the line-width; it is equivalent to Butt for line-width
-           zero. */
-
-    XCB_GC_JOIN_STYLE = 128,
-/**< The join-style defines how corners are drawn for wide lines:
-Miter               The outer edges of the two lines extend to meet at an angle. However, if the
-                    angle is less than 11 degrees, a Bevel join-style is used instead.
-Round               The result is a circular arc with a diameter equal to the line-width, centered
-                    on the joinpoint.
-Bevel               The result is Butt endpoint styles, and then the triangular notch is filled. */
-
-    XCB_GC_FILL_STYLE = 256,
-/**< The fill-style defines the contents of the source for line, text, and fill requests. For all text and fill
-requests (for example, PolyText8, PolyText16, PolyFillRectangle, FillPoly, and PolyFillArc)
-as well as for line requests with line-style Solid, (for example, PolyLine, PolySegment,
-PolyRectangle, PolyArc) and for the even dashes for line requests with line-style OnOffDash
-or DoubleDash:
-Solid                     Foreground
-Tiled                     Tile
-OpaqueStippled            A tile with the same width and height as stipple but with background
-                          everywhere stipple has a zero and with foreground everywhere stipple
-                          has a one
-Stippled                  Foreground masked by stipple
-For the odd dashes for line requests with line-style DoubleDash:
-Solid                     Background
-Tiled                     Same as for even dashes
-OpaqueStippled            Same as for even dashes
-Stippled                  Background masked by stipple */
-
-    XCB_GC_FILL_RULE = 512,
-/**<  */
-
-    XCB_GC_TILE = 1024,
-/**< The tile/stipple represents an infinite two-dimensional plane with the tile/stipple replicated in all
-dimensions. When that plane is superimposed on the drawable for use in a graphics operation,
-the upper-left corner of some instance of the tile/stipple is at the coordinates within the drawable
-specified by the tile/stipple origin. The tile/stipple and clip origins are interpreted relative to the
-origin of whatever destination drawable is specified in a graphics request.
-The tile pixmap must have the same root and depth as the gcontext (or a Match error results).
-The stipple pixmap must have depth one and must have the same root as the gcontext (or a
-Match error results). For fill-style Stippled (but not fill-style
-OpaqueStippled), the stipple pattern is tiled in a single plane and acts as an
-additional clip mask to be ANDed with the clip-mask.
-Any size pixmap can be used for tiling or stippling, although some sizes may be faster to use than
-others. */
-
-    XCB_GC_STIPPLE = 2048,
-/**< The tile/stipple represents an infinite two-dimensional plane with the tile/stipple replicated in all
-dimensions. When that plane is superimposed on the drawable for use in a graphics operation,
-the upper-left corner of some instance of the tile/stipple is at the coordinates within the drawable
-specified by the tile/stipple origin. The tile/stipple and clip origins are interpreted relative to the
-origin of whatever destination drawable is specified in a graphics request.
-The tile pixmap must have the same root and depth as the gcontext (or a Match error results).
-The stipple pixmap must have depth one and must have the same root as the gcontext (or a
-Match error results). For fill-style Stippled (but not fill-style
-OpaqueStippled), the stipple pattern is tiled in a single plane and acts as an
-additional clip mask to be ANDed with the clip-mask.
-Any size pixmap can be used for tiling or stippling, although some sizes may be faster to use than
-others. */
-
-    XCB_GC_TILE_STIPPLE_ORIGIN_X = 4096,
-/**< TODO */
-
-    XCB_GC_TILE_STIPPLE_ORIGIN_Y = 8192,
-/**< TODO */
-
-    XCB_GC_FONT = 16384,
-/**< Which font to use for the `ImageText8` and `ImageText16` requests. */
-
-    XCB_GC_SUBWINDOW_MODE = 32768,
-/**< For ClipByChildren, both source and destination windows are additionally
-clipped by all viewable InputOutput children. For IncludeInferiors, neither
-source nor destination window is
-clipped by inferiors. This will result in including subwindow contents in the source and drawing
-through subwindow boundaries of the destination. The use of IncludeInferiors with a source or
-destination window of one depth with mapped inferiors of differing depth is not illegal, but the
-semantics is undefined by the core protocol. */
-
-    XCB_GC_GRAPHICS_EXPOSURES = 65536,
-/**< Whether ExposureEvents should be generated (1) or not (0).
-
-The default is 1. */
-
-    XCB_GC_CLIP_ORIGIN_X = 131072,
-/**< TODO */
-
-    XCB_GC_CLIP_ORIGIN_Y = 262144,
-/**< TODO */
-
-    XCB_GC_CLIP_MASK = 524288,
-/**< The clip-mask restricts writes to the destination drawable. Only pixels where the clip-mask has
-bits set to 1 are drawn. Pixels are not drawn outside the area covered by the clip-mask or where
-the clip-mask has bits set to 0. The clip-mask affects all graphics requests, but it does not clip
-sources. The clip-mask origin is interpreted relative to the origin of whatever destination drawable is specified in a graphics request. If a pixmap is specified as the clip-mask, it must have
-depth 1 and have the same root as the gcontext (or a Match error results). If clip-mask is None,
-then pixels are always drawn, regardless of the clip origin. The clip-mask can also be set with the
-SetClipRectangles request. */
-
-    XCB_GC_DASH_OFFSET = 1048576,
-/**< TODO */
-
-    XCB_GC_DASH_LIST = 2097152,
-/**< TODO */
-
-    XCB_GC_ARC_MODE = 4194304
-/**< TODO */
-
-} xcb_gc_t;
-
-typedef enum xcb_gx_t {
-    XCB_GX_CLEAR = 0,
-    XCB_GX_AND = 1,
-    XCB_GX_AND_REVERSE = 2,
-    XCB_GX_COPY = 3,
-    XCB_GX_AND_INVERTED = 4,
-    XCB_GX_NOOP = 5,
-    XCB_GX_XOR = 6,
-    XCB_GX_OR = 7,
-    XCB_GX_NOR = 8,
-    XCB_GX_EQUIV = 9,
-    XCB_GX_INVERT = 10,
-    XCB_GX_OR_REVERSE = 11,
-    XCB_GX_COPY_INVERTED = 12,
-    XCB_GX_OR_INVERTED = 13,
-    XCB_GX_NAND = 14,
-    XCB_GX_SET = 15
-} xcb_gx_t;
-
-typedef enum xcb_line_style_t {
-    XCB_LINE_STYLE_SOLID = 0,
-    XCB_LINE_STYLE_ON_OFF_DASH = 1,
-    XCB_LINE_STYLE_DOUBLE_DASH = 2
-} xcb_line_style_t;
-
-typedef enum xcb_cap_style_t {
-    XCB_CAP_STYLE_NOT_LAST = 0,
-    XCB_CAP_STYLE_BUTT = 1,
-    XCB_CAP_STYLE_ROUND = 2,
-    XCB_CAP_STYLE_PROJECTING = 3
-} xcb_cap_style_t;
-
-typedef enum xcb_join_style_t {
-    XCB_JOIN_STYLE_MITER = 0,
-    XCB_JOIN_STYLE_ROUND = 1,
-    XCB_JOIN_STYLE_BEVEL = 2
-} xcb_join_style_t;
-
-typedef enum xcb_fill_style_t {
-    XCB_FILL_STYLE_SOLID = 0,
-    XCB_FILL_STYLE_TILED = 1,
-    XCB_FILL_STYLE_STIPPLED = 2,
-    XCB_FILL_STYLE_OPAQUE_STIPPLED = 3
-} xcb_fill_style_t;
-
-typedef enum xcb_fill_rule_t {
-    XCB_FILL_RULE_EVEN_ODD = 0,
-    XCB_FILL_RULE_WINDING = 1
-} xcb_fill_rule_t;
-
-typedef enum xcb_subwindow_mode_t {
-    XCB_SUBWINDOW_MODE_CLIP_BY_CHILDREN = 0,
-    XCB_SUBWINDOW_MODE_INCLUDE_INFERIORS = 1
-} xcb_subwindow_mode_t;
-
-typedef enum xcb_arc_mode_t {
-    XCB_ARC_MODE_CHORD = 0,
-    XCB_ARC_MODE_PIE_SLICE = 1
-} xcb_arc_mode_t;
-
-/** Opcode for xcb_create_gc. */
-#define XCB_CREATE_GC 55
-
-/**
- * @brief xcb_create_gc_request_t
- **/
-typedef struct xcb_create_gc_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_gcontext_t cid; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    uint32_t       value_mask; /**<  */
-} xcb_create_gc_request_t;
-
-/** Opcode for xcb_change_gc. */
-#define XCB_CHANGE_GC 56
-
-/**
- * @brief xcb_change_gc_request_t
- **/
-typedef struct xcb_change_gc_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    uint32_t       value_mask; /**<  */
-} xcb_change_gc_request_t;
-
-/** Opcode for xcb_copy_gc. */
-#define XCB_COPY_GC 57
-
-/**
- * @brief xcb_copy_gc_request_t
- **/
-typedef struct xcb_copy_gc_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_gcontext_t src_gc; /**<  */
-    xcb_gcontext_t dst_gc; /**<  */
-    uint32_t       value_mask; /**<  */
-} xcb_copy_gc_request_t;
-
-/** Opcode for xcb_set_dashes. */
-#define XCB_SET_DASHES 58
-
-/**
- * @brief xcb_set_dashes_request_t
- **/
-typedef struct xcb_set_dashes_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    uint16_t       dash_offset; /**<  */
-    uint16_t       dashes_len; /**<  */
-} xcb_set_dashes_request_t;
-
-typedef enum xcb_clip_ordering_t {
-    XCB_CLIP_ORDERING_UNSORTED = 0,
-    XCB_CLIP_ORDERING_Y_SORTED = 1,
-    XCB_CLIP_ORDERING_YX_SORTED = 2,
-    XCB_CLIP_ORDERING_YX_BANDED = 3
-} xcb_clip_ordering_t;
-
-/** Opcode for xcb_set_clip_rectangles. */
-#define XCB_SET_CLIP_RECTANGLES 59
-
-/**
- * @brief xcb_set_clip_rectangles_request_t
- **/
-typedef struct xcb_set_clip_rectangles_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        ordering; /**<  */
-    uint16_t       length; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    int16_t        clip_x_origin; /**<  */
-    int16_t        clip_y_origin; /**<  */
-} xcb_set_clip_rectangles_request_t;
-
-/** Opcode for xcb_free_gc. */
-#define XCB_FREE_GC 60
-
-/**
- * @brief xcb_free_gc_request_t
- **/
-typedef struct xcb_free_gc_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_gcontext_t gc; /**<  */
-} xcb_free_gc_request_t;
-
-/** Opcode for xcb_clear_area. */
-#define XCB_CLEAR_AREA 61
-
-/**
- * @brief xcb_clear_area_request_t
- **/
-typedef struct xcb_clear_area_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      exposures; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-    int16_t      x; /**<  */
-    int16_t      y; /**<  */
-    uint16_t     width; /**<  */
-    uint16_t     height; /**<  */
-} xcb_clear_area_request_t;
-
-/** Opcode for xcb_copy_area. */
-#define XCB_COPY_AREA 62
-
-/**
- * @brief xcb_copy_area_request_t
- **/
-typedef struct xcb_copy_area_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t src_drawable; /**<  */
-    xcb_drawable_t dst_drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    int16_t        src_x; /**<  */
-    int16_t        src_y; /**<  */
-    int16_t        dst_x; /**<  */
-    int16_t        dst_y; /**<  */
-    uint16_t       width; /**<  */
-    uint16_t       height; /**<  */
-} xcb_copy_area_request_t;
-
-/** Opcode for xcb_copy_plane. */
-#define XCB_COPY_PLANE 63
-
-/**
- * @brief xcb_copy_plane_request_t
- **/
-typedef struct xcb_copy_plane_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t src_drawable; /**<  */
-    xcb_drawable_t dst_drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    int16_t        src_x; /**<  */
-    int16_t        src_y; /**<  */
-    int16_t        dst_x; /**<  */
-    int16_t        dst_y; /**<  */
-    uint16_t       width; /**<  */
-    uint16_t       height; /**<  */
-    uint32_t       bit_plane; /**<  */
-} xcb_copy_plane_request_t;
-
-typedef enum xcb_coord_mode_t {
-    XCB_COORD_MODE_ORIGIN = 0,
-/**< Treats all coordinates as relative to the origin. */
-
-    XCB_COORD_MODE_PREVIOUS = 1
-/**< Treats all coordinates after the first as relative to the previous coordinate. */
-
-} xcb_coord_mode_t;
-
-/** Opcode for xcb_poly_point. */
-#define XCB_POLY_POINT 64
-
-/**
- * @brief xcb_poly_point_request_t
- **/
-typedef struct xcb_poly_point_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        coordinate_mode; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-} xcb_poly_point_request_t;
-
-/** Opcode for xcb_poly_line. */
-#define XCB_POLY_LINE 65
-
-/**
- * @brief xcb_poly_line_request_t
- **/
-typedef struct xcb_poly_line_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        coordinate_mode; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-} xcb_poly_line_request_t;
-
-/**
- * @brief xcb_segment_t
- **/
-typedef struct xcb_segment_t {
-    int16_t x1; /**<  */
-    int16_t y1; /**<  */
-    int16_t x2; /**<  */
-    int16_t y2; /**<  */
-} xcb_segment_t;
-
-/**
- * @brief xcb_segment_iterator_t
- **/
-typedef struct xcb_segment_iterator_t {
-    xcb_segment_t *data; /**<  */
-    int            rem; /**<  */
-    int            index; /**<  */
-} xcb_segment_iterator_t;
-
-/** Opcode for xcb_poly_segment. */
-#define XCB_POLY_SEGMENT 66
-
-/**
- * @brief xcb_poly_segment_request_t
- **/
-typedef struct xcb_poly_segment_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-} xcb_poly_segment_request_t;
-
-/** Opcode for xcb_poly_rectangle. */
-#define XCB_POLY_RECTANGLE 67
-
-/**
- * @brief xcb_poly_rectangle_request_t
- **/
-typedef struct xcb_poly_rectangle_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-} xcb_poly_rectangle_request_t;
-
-/** Opcode for xcb_poly_arc. */
-#define XCB_POLY_ARC 68
-
-/**
- * @brief xcb_poly_arc_request_t
- **/
-typedef struct xcb_poly_arc_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-} xcb_poly_arc_request_t;
-
-typedef enum xcb_poly_shape_t {
-    XCB_POLY_SHAPE_COMPLEX = 0,
-    XCB_POLY_SHAPE_NONCONVEX = 1,
-    XCB_POLY_SHAPE_CONVEX = 2
-} xcb_poly_shape_t;
-
-/** Opcode for xcb_fill_poly. */
-#define XCB_FILL_POLY 69
-
-/**
- * @brief xcb_fill_poly_request_t
- **/
-typedef struct xcb_fill_poly_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    uint8_t        shape; /**<  */
-    uint8_t        coordinate_mode; /**<  */
-    uint8_t        pad1[2]; /**<  */
-} xcb_fill_poly_request_t;
-
-/** Opcode for xcb_poly_fill_rectangle. */
-#define XCB_POLY_FILL_RECTANGLE 70
-
-/**
- * @brief xcb_poly_fill_rectangle_request_t
- **/
-typedef struct xcb_poly_fill_rectangle_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-} xcb_poly_fill_rectangle_request_t;
-
-/** Opcode for xcb_poly_fill_arc. */
-#define XCB_POLY_FILL_ARC 71
-
-/**
- * @brief xcb_poly_fill_arc_request_t
- **/
-typedef struct xcb_poly_fill_arc_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-} xcb_poly_fill_arc_request_t;
-
-typedef enum xcb_image_format_t {
-    XCB_IMAGE_FORMAT_XY_BITMAP = 0,
-    XCB_IMAGE_FORMAT_XY_PIXMAP = 1,
-    XCB_IMAGE_FORMAT_Z_PIXMAP = 2
-} xcb_image_format_t;
-
-/** Opcode for xcb_put_image. */
-#define XCB_PUT_IMAGE 72
-
-/**
- * @brief xcb_put_image_request_t
- **/
-typedef struct xcb_put_image_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        format; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    uint16_t       width; /**<  */
-    uint16_t       height; /**<  */
-    int16_t        dst_x; /**<  */
-    int16_t        dst_y; /**<  */
-    uint8_t        left_pad; /**<  */
-    uint8_t        depth; /**<  */
-    uint8_t        pad0[2]; /**<  */
-} xcb_put_image_request_t;
-
-/**
- * @brief xcb_get_image_cookie_t
- **/
-typedef struct xcb_get_image_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_image_cookie_t;
-
-/** Opcode for xcb_get_image. */
-#define XCB_GET_IMAGE 73
-
-/**
- * @brief xcb_get_image_request_t
- **/
-typedef struct xcb_get_image_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        format; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    int16_t        x; /**<  */
-    int16_t        y; /**<  */
-    uint16_t       width; /**<  */
-    uint16_t       height; /**<  */
-    uint32_t       plane_mask; /**<  */
-} xcb_get_image_request_t;
-
-/**
- * @brief xcb_get_image_reply_t
- **/
-typedef struct xcb_get_image_reply_t {
-    uint8_t        response_type; /**<  */
-    uint8_t        depth; /**<  */
-    uint16_t       sequence; /**<  */
-    uint32_t       length; /**<  */
-    xcb_visualid_t visual; /**<  */
-    uint8_t        pad0[20]; /**<  */
-} xcb_get_image_reply_t;
-
-/** Opcode for xcb_poly_text_8. */
-#define XCB_POLY_TEXT_8 74
-
-/**
- * @brief xcb_poly_text_8_request_t
- **/
-typedef struct xcb_poly_text_8_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    int16_t        x; /**<  */
-    int16_t        y; /**<  */
-} xcb_poly_text_8_request_t;
-
-/** Opcode for xcb_poly_text_16. */
-#define XCB_POLY_TEXT_16 75
-
-/**
- * @brief xcb_poly_text_16_request_t
- **/
-typedef struct xcb_poly_text_16_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    int16_t        x; /**<  */
-    int16_t        y; /**<  */
-} xcb_poly_text_16_request_t;
-
-/** Opcode for xcb_image_text_8. */
-#define XCB_IMAGE_TEXT_8 76
-
-/**
- * @brief xcb_image_text_8_request_t
- **/
-typedef struct xcb_image_text_8_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        string_len; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    int16_t        x; /**<  */
-    int16_t        y; /**<  */
-} xcb_image_text_8_request_t;
-
-/** Opcode for xcb_image_text_16. */
-#define XCB_IMAGE_TEXT_16 77
-
-/**
- * @brief xcb_image_text_16_request_t
- **/
-typedef struct xcb_image_text_16_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        string_len; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    xcb_gcontext_t gc; /**<  */
-    int16_t        x; /**<  */
-    int16_t        y; /**<  */
-} xcb_image_text_16_request_t;
-
-typedef enum xcb_colormap_alloc_t {
-    XCB_COLORMAP_ALLOC_NONE = 0,
-    XCB_COLORMAP_ALLOC_ALL = 1
-} xcb_colormap_alloc_t;
-
-/** Opcode for xcb_create_colormap. */
-#define XCB_CREATE_COLORMAP 78
-
-/**
- * @brief xcb_create_colormap_request_t
- **/
-typedef struct xcb_create_colormap_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        alloc; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t mid; /**<  */
-    xcb_window_t   window; /**<  */
-    xcb_visualid_t visual; /**<  */
-} xcb_create_colormap_request_t;
-
-/** Opcode for xcb_free_colormap. */
-#define XCB_FREE_COLORMAP 79
-
-/**
- * @brief xcb_free_colormap_request_t
- **/
-typedef struct xcb_free_colormap_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-} xcb_free_colormap_request_t;
-
-/** Opcode for xcb_copy_colormap_and_free. */
-#define XCB_COPY_COLORMAP_AND_FREE 80
-
-/**
- * @brief xcb_copy_colormap_and_free_request_t
- **/
-typedef struct xcb_copy_colormap_and_free_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t mid; /**<  */
-    xcb_colormap_t src_cmap; /**<  */
-} xcb_copy_colormap_and_free_request_t;
-
-/** Opcode for xcb_install_colormap. */
-#define XCB_INSTALL_COLORMAP 81
-
-/**
- * @brief xcb_install_colormap_request_t
- **/
-typedef struct xcb_install_colormap_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-} xcb_install_colormap_request_t;
-
-/** Opcode for xcb_uninstall_colormap. */
-#define XCB_UNINSTALL_COLORMAP 82
-
-/**
- * @brief xcb_uninstall_colormap_request_t
- **/
-typedef struct xcb_uninstall_colormap_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-} xcb_uninstall_colormap_request_t;
-
-/**
- * @brief xcb_list_installed_colormaps_cookie_t
- **/
-typedef struct xcb_list_installed_colormaps_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_list_installed_colormaps_cookie_t;
-
-/** Opcode for xcb_list_installed_colormaps. */
-#define XCB_LIST_INSTALLED_COLORMAPS 83
-
-/**
- * @brief xcb_list_installed_colormaps_request_t
- **/
-typedef struct xcb_list_installed_colormaps_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-} xcb_list_installed_colormaps_request_t;
-
-/**
- * @brief xcb_list_installed_colormaps_reply_t
- **/
-typedef struct xcb_list_installed_colormaps_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t cmaps_len; /**<  */
-    uint8_t  pad1[22]; /**<  */
-} xcb_list_installed_colormaps_reply_t;
-
-/**
- * @brief xcb_alloc_color_cookie_t
- **/
-typedef struct xcb_alloc_color_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_alloc_color_cookie_t;
-
-/** Opcode for xcb_alloc_color. */
-#define XCB_ALLOC_COLOR 84
-
-/**
- * @brief xcb_alloc_color_request_t
- **/
-typedef struct xcb_alloc_color_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-    uint16_t       red; /**<  */
-    uint16_t       green; /**<  */
-    uint16_t       blue; /**<  */
-    uint8_t        pad1[2]; /**<  */
-} xcb_alloc_color_request_t;
-
-/**
- * @brief xcb_alloc_color_reply_t
- **/
-typedef struct xcb_alloc_color_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t red; /**<  */
-    uint16_t green; /**<  */
-    uint16_t blue; /**<  */
-    uint8_t  pad1[2]; /**<  */
-    uint32_t pixel; /**<  */
-} xcb_alloc_color_reply_t;
-
-/**
- * @brief xcb_alloc_named_color_cookie_t
- **/
-typedef struct xcb_alloc_named_color_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_alloc_named_color_cookie_t;
-
-/** Opcode for xcb_alloc_named_color. */
-#define XCB_ALLOC_NAMED_COLOR 85
-
-/**
- * @brief xcb_alloc_named_color_request_t
- **/
-typedef struct xcb_alloc_named_color_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-    uint16_t       name_len; /**<  */
-    uint8_t        pad1[2]; /**<  */
-} xcb_alloc_named_color_request_t;
-
-/**
- * @brief xcb_alloc_named_color_reply_t
- **/
-typedef struct xcb_alloc_named_color_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint32_t pixel; /**<  */
-    uint16_t exact_red; /**<  */
-    uint16_t exact_green; /**<  */
-    uint16_t exact_blue; /**<  */
-    uint16_t visual_red; /**<  */
-    uint16_t visual_green; /**<  */
-    uint16_t visual_blue; /**<  */
-} xcb_alloc_named_color_reply_t;
-
-/**
- * @brief xcb_alloc_color_cells_cookie_t
- **/
-typedef struct xcb_alloc_color_cells_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_alloc_color_cells_cookie_t;
-
-/** Opcode for xcb_alloc_color_cells. */
-#define XCB_ALLOC_COLOR_CELLS 86
-
-/**
- * @brief xcb_alloc_color_cells_request_t
- **/
-typedef struct xcb_alloc_color_cells_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        contiguous; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-    uint16_t       colors; /**<  */
-    uint16_t       planes; /**<  */
-} xcb_alloc_color_cells_request_t;
-
-/**
- * @brief xcb_alloc_color_cells_reply_t
- **/
-typedef struct xcb_alloc_color_cells_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t pixels_len; /**<  */
-    uint16_t masks_len; /**<  */
-    uint8_t  pad1[20]; /**<  */
-} xcb_alloc_color_cells_reply_t;
-
-/**
- * @brief xcb_alloc_color_planes_cookie_t
- **/
-typedef struct xcb_alloc_color_planes_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_alloc_color_planes_cookie_t;
-
-/** Opcode for xcb_alloc_color_planes. */
-#define XCB_ALLOC_COLOR_PLANES 87
-
-/**
- * @brief xcb_alloc_color_planes_request_t
- **/
-typedef struct xcb_alloc_color_planes_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        contiguous; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-    uint16_t       colors; /**<  */
-    uint16_t       reds; /**<  */
-    uint16_t       greens; /**<  */
-    uint16_t       blues; /**<  */
-} xcb_alloc_color_planes_request_t;
-
-/**
- * @brief xcb_alloc_color_planes_reply_t
- **/
-typedef struct xcb_alloc_color_planes_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t pixels_len; /**<  */
-    uint8_t  pad1[2]; /**<  */
-    uint32_t red_mask; /**<  */
-    uint32_t green_mask; /**<  */
-    uint32_t blue_mask; /**<  */
-    uint8_t  pad2[8]; /**<  */
-} xcb_alloc_color_planes_reply_t;
-
-/** Opcode for xcb_free_colors. */
-#define XCB_FREE_COLORS 88
-
-/**
- * @brief xcb_free_colors_request_t
- **/
-typedef struct xcb_free_colors_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-    uint32_t       plane_mask; /**<  */
-} xcb_free_colors_request_t;
-
-typedef enum xcb_color_flag_t {
-    XCB_COLOR_FLAG_RED = 1,
-    XCB_COLOR_FLAG_GREEN = 2,
-    XCB_COLOR_FLAG_BLUE = 4
-} xcb_color_flag_t;
-
-/**
- * @brief xcb_coloritem_t
- **/
-typedef struct xcb_coloritem_t {
-    uint32_t pixel; /**<  */
-    uint16_t red; /**<  */
-    uint16_t green; /**<  */
-    uint16_t blue; /**<  */
-    uint8_t  flags; /**<  */
-    uint8_t  pad0; /**<  */
-} xcb_coloritem_t;
-
-/**
- * @brief xcb_coloritem_iterator_t
- **/
-typedef struct xcb_coloritem_iterator_t {
-    xcb_coloritem_t *data; /**<  */
-    int              rem; /**<  */
-    int              index; /**<  */
-} xcb_coloritem_iterator_t;
-
-/** Opcode for xcb_store_colors. */
-#define XCB_STORE_COLORS 89
-
-/**
- * @brief xcb_store_colors_request_t
- **/
-typedef struct xcb_store_colors_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-} xcb_store_colors_request_t;
-
-/** Opcode for xcb_store_named_color. */
-#define XCB_STORE_NAMED_COLOR 90
-
-/**
- * @brief xcb_store_named_color_request_t
- **/
-typedef struct xcb_store_named_color_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        flags; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-    uint32_t       pixel; /**<  */
-    uint16_t       name_len; /**<  */
-    uint8_t        pad0[2]; /**<  */
-} xcb_store_named_color_request_t;
-
-/**
- * @brief xcb_rgb_t
- **/
-typedef struct xcb_rgb_t {
-    uint16_t red; /**<  */
-    uint16_t green; /**<  */
-    uint16_t blue; /**<  */
-    uint8_t  pad0[2]; /**<  */
-} xcb_rgb_t;
-
-/**
- * @brief xcb_rgb_iterator_t
- **/
-typedef struct xcb_rgb_iterator_t {
-    xcb_rgb_t *data; /**<  */
-    int        rem; /**<  */
-    int        index; /**<  */
-} xcb_rgb_iterator_t;
-
-/**
- * @brief xcb_query_colors_cookie_t
- **/
-typedef struct xcb_query_colors_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_query_colors_cookie_t;
-
-/** Opcode for xcb_query_colors. */
-#define XCB_QUERY_COLORS 91
-
-/**
- * @brief xcb_query_colors_request_t
- **/
-typedef struct xcb_query_colors_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-} xcb_query_colors_request_t;
-
-/**
- * @brief xcb_query_colors_reply_t
- **/
-typedef struct xcb_query_colors_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t colors_len; /**<  */
-    uint8_t  pad1[22]; /**<  */
-} xcb_query_colors_reply_t;
-
-/**
- * @brief xcb_lookup_color_cookie_t
- **/
-typedef struct xcb_lookup_color_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_lookup_color_cookie_t;
-
-/** Opcode for xcb_lookup_color. */
-#define XCB_LOOKUP_COLOR 92
-
-/**
- * @brief xcb_lookup_color_request_t
- **/
-typedef struct xcb_lookup_color_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        pad0; /**<  */
-    uint16_t       length; /**<  */
-    xcb_colormap_t cmap; /**<  */
-    uint16_t       name_len; /**<  */
-    uint8_t        pad1[2]; /**<  */
-} xcb_lookup_color_request_t;
-
-/**
- * @brief xcb_lookup_color_reply_t
- **/
-typedef struct xcb_lookup_color_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t exact_red; /**<  */
-    uint16_t exact_green; /**<  */
-    uint16_t exact_blue; /**<  */
-    uint16_t visual_red; /**<  */
-    uint16_t visual_green; /**<  */
-    uint16_t visual_blue; /**<  */
-} xcb_lookup_color_reply_t;
-
-typedef enum xcb_pixmap_enum_t {
-    XCB_PIXMAP_NONE = 0
-} xcb_pixmap_enum_t;
-
-/** Opcode for xcb_create_cursor. */
-#define XCB_CREATE_CURSOR 93
-
-/**
- * @brief xcb_create_cursor_request_t
- **/
-typedef struct xcb_create_cursor_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_cursor_t cid; /**<  */
-    xcb_pixmap_t source; /**<  */
-    xcb_pixmap_t mask; /**<  */
-    uint16_t     fore_red; /**<  */
-    uint16_t     fore_green; /**<  */
-    uint16_t     fore_blue; /**<  */
-    uint16_t     back_red; /**<  */
-    uint16_t     back_green; /**<  */
-    uint16_t     back_blue; /**<  */
-    uint16_t     x; /**<  */
-    uint16_t     y; /**<  */
-} xcb_create_cursor_request_t;
-
-typedef enum xcb_font_enum_t {
-    XCB_FONT_NONE = 0
-} xcb_font_enum_t;
-
-/** Opcode for xcb_create_glyph_cursor. */
-#define XCB_CREATE_GLYPH_CURSOR 94
-
-/**
- * @brief xcb_create_glyph_cursor_request_t
- **/
-typedef struct xcb_create_glyph_cursor_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_cursor_t cid; /**<  */
-    xcb_font_t   source_font; /**<  */
-    xcb_font_t   mask_font; /**<  */
-    uint16_t     source_char; /**<  */
-    uint16_t     mask_char; /**<  */
-    uint16_t     fore_red; /**<  */
-    uint16_t     fore_green; /**<  */
-    uint16_t     fore_blue; /**<  */
-    uint16_t     back_red; /**<  */
-    uint16_t     back_green; /**<  */
-    uint16_t     back_blue; /**<  */
-} xcb_create_glyph_cursor_request_t;
-
-/** Opcode for xcb_free_cursor. */
-#define XCB_FREE_CURSOR 95
-
-/**
- * @brief xcb_free_cursor_request_t
- **/
-typedef struct xcb_free_cursor_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_cursor_t cursor; /**<  */
-} xcb_free_cursor_request_t;
-
-/** Opcode for xcb_recolor_cursor. */
-#define XCB_RECOLOR_CURSOR 96
-
-/**
- * @brief xcb_recolor_cursor_request_t
- **/
-typedef struct xcb_recolor_cursor_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_cursor_t cursor; /**<  */
-    uint16_t     fore_red; /**<  */
-    uint16_t     fore_green; /**<  */
-    uint16_t     fore_blue; /**<  */
-    uint16_t     back_red; /**<  */
-    uint16_t     back_green; /**<  */
-    uint16_t     back_blue; /**<  */
-} xcb_recolor_cursor_request_t;
-
-typedef enum xcb_query_shape_of_t {
-    XCB_QUERY_SHAPE_OF_LARGEST_CURSOR = 0,
-    XCB_QUERY_SHAPE_OF_FASTEST_TILE = 1,
-    XCB_QUERY_SHAPE_OF_FASTEST_STIPPLE = 2
-} xcb_query_shape_of_t;
-
-/**
- * @brief xcb_query_best_size_cookie_t
- **/
-typedef struct xcb_query_best_size_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_query_best_size_cookie_t;
-
-/** Opcode for xcb_query_best_size. */
-#define XCB_QUERY_BEST_SIZE 97
-
-/**
- * @brief xcb_query_best_size_request_t
- **/
-typedef struct xcb_query_best_size_request_t {
-    uint8_t        major_opcode; /**<  */
-    uint8_t        _class; /**<  */
-    uint16_t       length; /**<  */
-    xcb_drawable_t drawable; /**<  */
-    uint16_t       width; /**<  */
-    uint16_t       height; /**<  */
-} xcb_query_best_size_request_t;
-
-/**
- * @brief xcb_query_best_size_reply_t
- **/
-typedef struct xcb_query_best_size_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t width; /**<  */
-    uint16_t height; /**<  */
-} xcb_query_best_size_reply_t;
-
-/**
- * @brief xcb_query_extension_cookie_t
- **/
-typedef struct xcb_query_extension_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_query_extension_cookie_t;
-
-/** Opcode for xcb_query_extension. */
-#define XCB_QUERY_EXTENSION 98
-
-/**
- * @brief xcb_query_extension_request_t
- **/
-typedef struct xcb_query_extension_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-    uint16_t name_len; /**<  */
-    uint8_t  pad1[2]; /**<  */
-} xcb_query_extension_request_t;
-
-/**
- * @brief xcb_query_extension_reply_t
- **/
-typedef struct xcb_query_extension_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint8_t  present; /**<  */
-    uint8_t  major_opcode; /**<  */
-    uint8_t  first_event; /**<  */
-    uint8_t  first_error; /**<  */
-} xcb_query_extension_reply_t;
-
-/**
- * @brief xcb_list_extensions_cookie_t
- **/
-typedef struct xcb_list_extensions_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_list_extensions_cookie_t;
-
-/** Opcode for xcb_list_extensions. */
-#define XCB_LIST_EXTENSIONS 99
-
-/**
- * @brief xcb_list_extensions_request_t
- **/
-typedef struct xcb_list_extensions_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_list_extensions_request_t;
-
-/**
- * @brief xcb_list_extensions_reply_t
- **/
-typedef struct xcb_list_extensions_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  names_len; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint8_t  pad0[24]; /**<  */
-} xcb_list_extensions_reply_t;
-
-/** Opcode for xcb_change_keyboard_mapping. */
-#define XCB_CHANGE_KEYBOARD_MAPPING 100
-
-/**
- * @brief xcb_change_keyboard_mapping_request_t
- **/
-typedef struct xcb_change_keyboard_mapping_request_t {
-    uint8_t       major_opcode; /**<  */
-    uint8_t       keycode_count; /**<  */
-    uint16_t      length; /**<  */
-    xcb_keycode_t first_keycode; /**<  */
-    uint8_t       keysyms_per_keycode; /**<  */
-    uint8_t       pad0[2]; /**<  */
-} xcb_change_keyboard_mapping_request_t;
-
-/**
- * @brief xcb_get_keyboard_mapping_cookie_t
- **/
-typedef struct xcb_get_keyboard_mapping_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_keyboard_mapping_cookie_t;
-
-/** Opcode for xcb_get_keyboard_mapping. */
-#define XCB_GET_KEYBOARD_MAPPING 101
-
-/**
- * @brief xcb_get_keyboard_mapping_request_t
- **/
-typedef struct xcb_get_keyboard_mapping_request_t {
-    uint8_t       major_opcode; /**<  */
-    uint8_t       pad0; /**<  */
-    uint16_t      length; /**<  */
-    xcb_keycode_t first_keycode; /**<  */
-    uint8_t       count; /**<  */
-} xcb_get_keyboard_mapping_request_t;
-
-/**
- * @brief xcb_get_keyboard_mapping_reply_t
- **/
-typedef struct xcb_get_keyboard_mapping_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  keysyms_per_keycode; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint8_t  pad0[24]; /**<  */
-} xcb_get_keyboard_mapping_reply_t;
-
-typedef enum xcb_kb_t {
-    XCB_KB_KEY_CLICK_PERCENT = 1,
-    XCB_KB_BELL_PERCENT = 2,
-    XCB_KB_BELL_PITCH = 4,
-    XCB_KB_BELL_DURATION = 8,
-    XCB_KB_LED = 16,
-    XCB_KB_LED_MODE = 32,
-    XCB_KB_KEY = 64,
-    XCB_KB_AUTO_REPEAT_MODE = 128
-} xcb_kb_t;
-
-typedef enum xcb_led_mode_t {
-    XCB_LED_MODE_OFF = 0,
-    XCB_LED_MODE_ON = 1
-} xcb_led_mode_t;
-
-typedef enum xcb_auto_repeat_mode_t {
-    XCB_AUTO_REPEAT_MODE_OFF = 0,
-    XCB_AUTO_REPEAT_MODE_ON = 1,
-    XCB_AUTO_REPEAT_MODE_DEFAULT = 2
-} xcb_auto_repeat_mode_t;
-
-/** Opcode for xcb_change_keyboard_control. */
-#define XCB_CHANGE_KEYBOARD_CONTROL 102
-
-/**
- * @brief xcb_change_keyboard_control_request_t
- **/
-typedef struct xcb_change_keyboard_control_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-    uint32_t value_mask; /**<  */
-} xcb_change_keyboard_control_request_t;
-
-/**
- * @brief xcb_get_keyboard_control_cookie_t
- **/
-typedef struct xcb_get_keyboard_control_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_keyboard_control_cookie_t;
-
-/** Opcode for xcb_get_keyboard_control. */
-#define XCB_GET_KEYBOARD_CONTROL 103
-
-/**
- * @brief xcb_get_keyboard_control_request_t
- **/
-typedef struct xcb_get_keyboard_control_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_get_keyboard_control_request_t;
-
-/**
- * @brief xcb_get_keyboard_control_reply_t
- **/
-typedef struct xcb_get_keyboard_control_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  global_auto_repeat; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint32_t led_mask; /**<  */
-    uint8_t  key_click_percent; /**<  */
-    uint8_t  bell_percent; /**<  */
-    uint16_t bell_pitch; /**<  */
-    uint16_t bell_duration; /**<  */
-    uint8_t  pad0[2]; /**<  */
-    uint8_t  auto_repeats[32]; /**<  */
-} xcb_get_keyboard_control_reply_t;
-
-/** Opcode for xcb_bell. */
-#define XCB_BELL 104
-
-/**
- * @brief xcb_bell_request_t
- **/
-typedef struct xcb_bell_request_t {
-    uint8_t  major_opcode; /**<  */
-    int8_t   percent; /**<  */
-    uint16_t length; /**<  */
-} xcb_bell_request_t;
-
-/** Opcode for xcb_change_pointer_control. */
-#define XCB_CHANGE_POINTER_CONTROL 105
-
-/**
- * @brief xcb_change_pointer_control_request_t
- **/
-typedef struct xcb_change_pointer_control_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-    int16_t  acceleration_numerator; /**<  */
-    int16_t  acceleration_denominator; /**<  */
-    int16_t  threshold; /**<  */
-    uint8_t  do_acceleration; /**<  */
-    uint8_t  do_threshold; /**<  */
-} xcb_change_pointer_control_request_t;
-
-/**
- * @brief xcb_get_pointer_control_cookie_t
- **/
-typedef struct xcb_get_pointer_control_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_pointer_control_cookie_t;
-
-/** Opcode for xcb_get_pointer_control. */
-#define XCB_GET_POINTER_CONTROL 106
-
-/**
- * @brief xcb_get_pointer_control_request_t
- **/
-typedef struct xcb_get_pointer_control_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_get_pointer_control_request_t;
-
-/**
- * @brief xcb_get_pointer_control_reply_t
- **/
-typedef struct xcb_get_pointer_control_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t acceleration_numerator; /**<  */
-    uint16_t acceleration_denominator; /**<  */
-    uint16_t threshold; /**<  */
-    uint8_t  pad1[18]; /**<  */
-} xcb_get_pointer_control_reply_t;
-
-typedef enum xcb_blanking_t {
-    XCB_BLANKING_NOT_PREFERRED = 0,
-    XCB_BLANKING_PREFERRED = 1,
-    XCB_BLANKING_DEFAULT = 2
-} xcb_blanking_t;
-
-typedef enum xcb_exposures_t {
-    XCB_EXPOSURES_NOT_ALLOWED = 0,
-    XCB_EXPOSURES_ALLOWED = 1,
-    XCB_EXPOSURES_DEFAULT = 2
-} xcb_exposures_t;
-
-/** Opcode for xcb_set_screen_saver. */
-#define XCB_SET_SCREEN_SAVER 107
-
-/**
- * @brief xcb_set_screen_saver_request_t
- **/
-typedef struct xcb_set_screen_saver_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-    int16_t  timeout; /**<  */
-    int16_t  interval; /**<  */
-    uint8_t  prefer_blanking; /**<  */
-    uint8_t  allow_exposures; /**<  */
-} xcb_set_screen_saver_request_t;
-
-/**
- * @brief xcb_get_screen_saver_cookie_t
- **/
-typedef struct xcb_get_screen_saver_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_screen_saver_cookie_t;
-
-/** Opcode for xcb_get_screen_saver. */
-#define XCB_GET_SCREEN_SAVER 108
-
-/**
- * @brief xcb_get_screen_saver_request_t
- **/
-typedef struct xcb_get_screen_saver_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_get_screen_saver_request_t;
-
-/**
- * @brief xcb_get_screen_saver_reply_t
- **/
-typedef struct xcb_get_screen_saver_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t timeout; /**<  */
-    uint16_t interval; /**<  */
-    uint8_t  prefer_blanking; /**<  */
-    uint8_t  allow_exposures; /**<  */
-    uint8_t  pad1[18]; /**<  */
-} xcb_get_screen_saver_reply_t;
-
-typedef enum xcb_host_mode_t {
-    XCB_HOST_MODE_INSERT = 0,
-    XCB_HOST_MODE_DELETE = 1
-} xcb_host_mode_t;
-
-typedef enum xcb_family_t {
-    XCB_FAMILY_INTERNET = 0,
-    XCB_FAMILY_DECNET = 1,
-    XCB_FAMILY_CHAOS = 2,
-    XCB_FAMILY_SERVER_INTERPRETED = 5,
-    XCB_FAMILY_INTERNET_6 = 6
-} xcb_family_t;
-
-/** Opcode for xcb_change_hosts. */
-#define XCB_CHANGE_HOSTS 109
-
-/**
- * @brief xcb_change_hosts_request_t
- **/
-typedef struct xcb_change_hosts_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  mode; /**<  */
-    uint16_t length; /**<  */
-    uint8_t  family; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t address_len; /**<  */
-} xcb_change_hosts_request_t;
-
-/**
- * @brief xcb_host_t
- **/
-typedef struct xcb_host_t {
-    uint8_t  family; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t address_len; /**<  */
-} xcb_host_t;
-
-/**
- * @brief xcb_host_iterator_t
- **/
-typedef struct xcb_host_iterator_t {
-    xcb_host_t *data; /**<  */
-    int         rem; /**<  */
-    int         index; /**<  */
-} xcb_host_iterator_t;
-
-/**
- * @brief xcb_list_hosts_cookie_t
- **/
-typedef struct xcb_list_hosts_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_list_hosts_cookie_t;
-
-/** Opcode for xcb_list_hosts. */
-#define XCB_LIST_HOSTS 110
-
-/**
- * @brief xcb_list_hosts_request_t
- **/
-typedef struct xcb_list_hosts_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_list_hosts_request_t;
-
-/**
- * @brief xcb_list_hosts_reply_t
- **/
-typedef struct xcb_list_hosts_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  mode; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint16_t hosts_len; /**<  */
-    uint8_t  pad0[22]; /**<  */
-} xcb_list_hosts_reply_t;
-
-typedef enum xcb_access_control_t {
-    XCB_ACCESS_CONTROL_DISABLE = 0,
-    XCB_ACCESS_CONTROL_ENABLE = 1
-} xcb_access_control_t;
-
-/** Opcode for xcb_set_access_control. */
-#define XCB_SET_ACCESS_CONTROL 111
-
-/**
- * @brief xcb_set_access_control_request_t
- **/
-typedef struct xcb_set_access_control_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  mode; /**<  */
-    uint16_t length; /**<  */
-} xcb_set_access_control_request_t;
-
-typedef enum xcb_close_down_t {
-    XCB_CLOSE_DOWN_DESTROY_ALL = 0,
-    XCB_CLOSE_DOWN_RETAIN_PERMANENT = 1,
-    XCB_CLOSE_DOWN_RETAIN_TEMPORARY = 2
-} xcb_close_down_t;
-
-/** Opcode for xcb_set_close_down_mode. */
-#define XCB_SET_CLOSE_DOWN_MODE 112
-
-/**
- * @brief xcb_set_close_down_mode_request_t
- **/
-typedef struct xcb_set_close_down_mode_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  mode; /**<  */
-    uint16_t length; /**<  */
-} xcb_set_close_down_mode_request_t;
-
-typedef enum xcb_kill_t {
-    XCB_KILL_ALL_TEMPORARY = 0
-} xcb_kill_t;
-
-/** Opcode for xcb_kill_client. */
-#define XCB_KILL_CLIENT 113
-
-/**
- * @brief xcb_kill_client_request_t
- **/
-typedef struct xcb_kill_client_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-    uint32_t resource; /**<  */
-} xcb_kill_client_request_t;
-
-/** Opcode for xcb_rotate_properties. */
-#define XCB_ROTATE_PROPERTIES 114
-
-/**
- * @brief xcb_rotate_properties_request_t
- **/
-typedef struct xcb_rotate_properties_request_t {
-    uint8_t      major_opcode; /**<  */
-    uint8_t      pad0; /**<  */
-    uint16_t     length; /**<  */
-    xcb_window_t window; /**<  */
-    uint16_t     atoms_len; /**<  */
-    int16_t      delta; /**<  */
-} xcb_rotate_properties_request_t;
-
-typedef enum xcb_screen_saver_t {
-    XCB_SCREEN_SAVER_RESET = 0,
-    XCB_SCREEN_SAVER_ACTIVE = 1
-} xcb_screen_saver_t;
-
-/** Opcode for xcb_force_screen_saver. */
-#define XCB_FORCE_SCREEN_SAVER 115
-
-/**
- * @brief xcb_force_screen_saver_request_t
- **/
-typedef struct xcb_force_screen_saver_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  mode; /**<  */
-    uint16_t length; /**<  */
-} xcb_force_screen_saver_request_t;
-
-typedef enum xcb_mapping_status_t {
-    XCB_MAPPING_STATUS_SUCCESS = 0,
-    XCB_MAPPING_STATUS_BUSY = 1,
-    XCB_MAPPING_STATUS_FAILURE = 2
-} xcb_mapping_status_t;
-
-/**
- * @brief xcb_set_pointer_mapping_cookie_t
- **/
-typedef struct xcb_set_pointer_mapping_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_set_pointer_mapping_cookie_t;
-
-/** Opcode for xcb_set_pointer_mapping. */
-#define XCB_SET_POINTER_MAPPING 116
-
-/**
- * @brief xcb_set_pointer_mapping_request_t
- **/
-typedef struct xcb_set_pointer_mapping_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  map_len; /**<  */
-    uint16_t length; /**<  */
-} xcb_set_pointer_mapping_request_t;
-
-/**
- * @brief xcb_set_pointer_mapping_reply_t
- **/
-typedef struct xcb_set_pointer_mapping_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  status; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-} xcb_set_pointer_mapping_reply_t;
-
-/**
- * @brief xcb_get_pointer_mapping_cookie_t
- **/
-typedef struct xcb_get_pointer_mapping_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_pointer_mapping_cookie_t;
-
-/** Opcode for xcb_get_pointer_mapping. */
-#define XCB_GET_POINTER_MAPPING 117
-
-/**
- * @brief xcb_get_pointer_mapping_request_t
- **/
-typedef struct xcb_get_pointer_mapping_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_get_pointer_mapping_request_t;
-
-/**
- * @brief xcb_get_pointer_mapping_reply_t
- **/
-typedef struct xcb_get_pointer_mapping_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  map_len; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint8_t  pad0[24]; /**<  */
-} xcb_get_pointer_mapping_reply_t;
-
-typedef enum xcb_map_index_t {
-    XCB_MAP_INDEX_SHIFT = 0,
-    XCB_MAP_INDEX_LOCK = 1,
-    XCB_MAP_INDEX_CONTROL = 2,
-    XCB_MAP_INDEX_1 = 3,
-    XCB_MAP_INDEX_2 = 4,
-    XCB_MAP_INDEX_3 = 5,
-    XCB_MAP_INDEX_4 = 6,
-    XCB_MAP_INDEX_5 = 7
-} xcb_map_index_t;
-
-/**
- * @brief xcb_set_modifier_mapping_cookie_t
- **/
-typedef struct xcb_set_modifier_mapping_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_set_modifier_mapping_cookie_t;
-
-/** Opcode for xcb_set_modifier_mapping. */
-#define XCB_SET_MODIFIER_MAPPING 118
-
-/**
- * @brief xcb_set_modifier_mapping_request_t
- **/
-typedef struct xcb_set_modifier_mapping_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  keycodes_per_modifier; /**<  */
-    uint16_t length; /**<  */
-} xcb_set_modifier_mapping_request_t;
-
-/**
- * @brief xcb_set_modifier_mapping_reply_t
- **/
-typedef struct xcb_set_modifier_mapping_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  status; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-} xcb_set_modifier_mapping_reply_t;
-
-/**
- * @brief xcb_get_modifier_mapping_cookie_t
- **/
-typedef struct xcb_get_modifier_mapping_cookie_t {
-    unsigned int sequence; /**<  */
-} xcb_get_modifier_mapping_cookie_t;
-
-/** Opcode for xcb_get_modifier_mapping. */
-#define XCB_GET_MODIFIER_MAPPING 119
-
-/**
- * @brief xcb_get_modifier_mapping_request_t
- **/
-typedef struct xcb_get_modifier_mapping_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_get_modifier_mapping_request_t;
-
-/**
- * @brief xcb_get_modifier_mapping_reply_t
- **/
-typedef struct xcb_get_modifier_mapping_reply_t {
-    uint8_t  response_type; /**<  */
-    uint8_t  keycodes_per_modifier; /**<  */
-    uint16_t sequence; /**<  */
-    uint32_t length; /**<  */
-    uint8_t  pad0[24]; /**<  */
-} xcb_get_modifier_mapping_reply_t;
-
-/** Opcode for xcb_no_operation. */
-#define XCB_NO_OPERATION 127
-
-/**
- * @brief xcb_no_operation_request_t
- **/
-typedef struct xcb_no_operation_request_t {
-    uint8_t  major_opcode; /**<  */
-    uint8_t  pad0; /**<  */
-    uint16_t length; /**<  */
-} xcb_no_operation_request_t;
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_char2b_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_char2b_t)
- */
-void
-xcb_char2b_next (xcb_char2b_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_char2b_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_char2b_end (xcb_char2b_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_window_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_window_t)
- */
-void
-xcb_window_next (xcb_window_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_window_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_window_end (xcb_window_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_pixmap_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_pixmap_t)
- */
-void
-xcb_pixmap_next (xcb_pixmap_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_pixmap_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_pixmap_end (xcb_pixmap_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_cursor_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_cursor_t)
- */
-void
-xcb_cursor_next (xcb_cursor_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_cursor_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_cursor_end (xcb_cursor_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_font_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_font_t)
- */
-void
-xcb_font_next (xcb_font_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_font_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_font_end (xcb_font_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_gcontext_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_gcontext_t)
- */
-void
-xcb_gcontext_next (xcb_gcontext_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_gcontext_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_gcontext_end (xcb_gcontext_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_colormap_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_colormap_t)
- */
-void
-xcb_colormap_next (xcb_colormap_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_colormap_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_colormap_end (xcb_colormap_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_atom_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_atom_t)
- */
-void
-xcb_atom_next (xcb_atom_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_atom_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_atom_end (xcb_atom_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_drawable_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_drawable_t)
- */
-void
-xcb_drawable_next (xcb_drawable_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_drawable_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_drawable_end (xcb_drawable_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_fontable_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_fontable_t)
- */
-void
-xcb_fontable_next (xcb_fontable_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_fontable_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_fontable_end (xcb_fontable_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_visualid_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_visualid_t)
- */
-void
-xcb_visualid_next (xcb_visualid_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_visualid_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_visualid_end (xcb_visualid_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_timestamp_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_timestamp_t)
- */
-void
-xcb_timestamp_next (xcb_timestamp_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_timestamp_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_timestamp_end (xcb_timestamp_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_keysym_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_keysym_t)
- */
-void
-xcb_keysym_next (xcb_keysym_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_keysym_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_keysym_end (xcb_keysym_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_keycode_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_keycode_t)
- */
-void
-xcb_keycode_next (xcb_keycode_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_keycode_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_keycode_end (xcb_keycode_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_button_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_button_t)
- */
-void
-xcb_button_next (xcb_button_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_button_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_button_end (xcb_button_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_point_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_point_t)
- */
-void
-xcb_point_next (xcb_point_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_point_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_point_end (xcb_point_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_rectangle_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_rectangle_t)
- */
-void
-xcb_rectangle_next (xcb_rectangle_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_rectangle_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_rectangle_end (xcb_rectangle_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_arc_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_arc_t)
- */
-void
-xcb_arc_next (xcb_arc_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_arc_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_arc_end (xcb_arc_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_format_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_format_t)
- */
-void
-xcb_format_next (xcb_format_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_format_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_format_end (xcb_format_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_visualtype_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_visualtype_t)
- */
-void
-xcb_visualtype_next (xcb_visualtype_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_visualtype_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_visualtype_end (xcb_visualtype_iterator_t i  /**< */);
-
-int
-xcb_depth_sizeof (const void  *_buffer  /**< */);
-
-xcb_visualtype_t *
-xcb_depth_visuals (const xcb_depth_t *R  /**< */);
-
-int
-xcb_depth_visuals_length (const xcb_depth_t *R  /**< */);
-
-xcb_visualtype_iterator_t
-xcb_depth_visuals_iterator (const xcb_depth_t *R  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_depth_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_depth_t)
- */
-void
-xcb_depth_next (xcb_depth_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_depth_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_depth_end (xcb_depth_iterator_t i  /**< */);
-
-int
-xcb_screen_sizeof (const void  *_buffer  /**< */);
-
-int
-xcb_screen_allowed_depths_length (const xcb_screen_t *R  /**< */);
-
-xcb_depth_iterator_t
-xcb_screen_allowed_depths_iterator (const xcb_screen_t *R  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_screen_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_screen_t)
- */
-void
-xcb_screen_next (xcb_screen_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_screen_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_screen_end (xcb_screen_iterator_t i  /**< */);
-
-int
-xcb_setup_request_sizeof (const void  *_buffer  /**< */);
-
-char *
-xcb_setup_request_authorization_protocol_name (const xcb_setup_request_t *R  /**< */);
-
-int
-xcb_setup_request_authorization_protocol_name_length (const xcb_setup_request_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_setup_request_authorization_protocol_name_end (const xcb_setup_request_t *R  /**< */);
-
-char *
-xcb_setup_request_authorization_protocol_data (const xcb_setup_request_t *R  /**< */);
-
-int
-xcb_setup_request_authorization_protocol_data_length (const xcb_setup_request_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_setup_request_authorization_protocol_data_end (const xcb_setup_request_t *R  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_setup_request_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_setup_request_t)
- */
-void
-xcb_setup_request_next (xcb_setup_request_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_setup_request_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_setup_request_end (xcb_setup_request_iterator_t i  /**< */);
-
-int
-xcb_setup_failed_sizeof (const void  *_buffer  /**< */);
-
-char *
-xcb_setup_failed_reason (const xcb_setup_failed_t *R  /**< */);
-
-int
-xcb_setup_failed_reason_length (const xcb_setup_failed_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_setup_failed_reason_end (const xcb_setup_failed_t *R  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_setup_failed_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_setup_failed_t)
- */
-void
-xcb_setup_failed_next (xcb_setup_failed_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_setup_failed_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_setup_failed_end (xcb_setup_failed_iterator_t i  /**< */);
-
-int
-xcb_setup_authenticate_sizeof (const void  *_buffer  /**< */);
-
-char *
-xcb_setup_authenticate_reason (const xcb_setup_authenticate_t *R  /**< */);
-
-int
-xcb_setup_authenticate_reason_length (const xcb_setup_authenticate_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_setup_authenticate_reason_end (const xcb_setup_authenticate_t *R  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_setup_authenticate_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_setup_authenticate_t)
- */
-void
-xcb_setup_authenticate_next (xcb_setup_authenticate_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_setup_authenticate_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_setup_authenticate_end (xcb_setup_authenticate_iterator_t i  /**< */);
-
-int
-xcb_setup_sizeof (const void  *_buffer  /**< */);
-
-char *
-xcb_setup_vendor (const xcb_setup_t *R  /**< */);
-
-int
-xcb_setup_vendor_length (const xcb_setup_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_setup_vendor_end (const xcb_setup_t *R  /**< */);
-
-xcb_format_t *
-xcb_setup_pixmap_formats (const xcb_setup_t *R  /**< */);
-
-int
-xcb_setup_pixmap_formats_length (const xcb_setup_t *R  /**< */);
-
-xcb_format_iterator_t
-xcb_setup_pixmap_formats_iterator (const xcb_setup_t *R  /**< */);
-
-int
-xcb_setup_roots_length (const xcb_setup_t *R  /**< */);
-
-xcb_screen_iterator_t
-xcb_setup_roots_iterator (const xcb_setup_t *R  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_setup_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_setup_t)
- */
-void
-xcb_setup_next (xcb_setup_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_setup_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_setup_end (xcb_setup_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_client_message_data_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_client_message_data_t)
- */
-void
-xcb_client_message_data_next (xcb_client_message_data_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_client_message_data_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_client_message_data_end (xcb_client_message_data_iterator_t i  /**< */);
-
-int
-xcb_create_window_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief Creates a window
- *
- * @param c The connection
- * @param depth Specifies the new window's depth (TODO: what unit?).
- * \n
- * The special value `XCB_COPY_FROM_PARENT` means the depth is taken from the
- * \a parent window.
- * @param wid The ID with which you will refer to the new window, created by
- * `xcb_generate_id`.
- * @param parent The parent window of the new window.
- * @param x The X coordinate of the new window.
- * @param y The Y coordinate of the new window.
- * @param width The width of the new window.
- * @param height The height of the new window.
- * @param border_width TODO:
- * \n
- * Must be zero if the `class` is `InputOnly` or a `xcb_match_error_t` occurs.
- * @param _class A bitmask of #xcb_window_class_t values.
- * @param _class \n
- * @param visual Specifies the id for the new window's visual.
- * \n
- * The special value `XCB_COPY_FROM_PARENT` means the visual is taken from the
- * \a parent window.
- * @param value_mask A bitmask of #xcb_cw_t values.
- * @return A cookie
- *
- * Creates an unmapped window as child of the specified \a parent window. A
- * CreateNotify event will be generated. The new window is placed on top in the
- * stacking order with respect to siblings.
- * 
- * The coordinate system has the X axis horizontal and the Y axis vertical with
- * the origin [0, 0] at the upper-left corner. Coordinates are integral, in terms
- * of pixels, and coincide with pixel centers. Each window and pixmap has its own
- * coordinate system. For a window, the origin is inside the border at the inside,
- * upper-left corner.
- * 
- * The created window is not yet displayed (mapped), call `xcb_map_window` to
- * display it.
- * 
- * The created window will initially use the same cursor as its parent.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_create_window_checked (xcb_connection_t *c  /**< */,
-                           uint8_t           depth  /**< */,
-                           xcb_window_t      wid  /**< */,
-                           xcb_window_t      parent  /**< */,
-                           int16_t           x  /**< */,
-                           int16_t           y  /**< */,
-                           uint16_t          width  /**< */,
-                           uint16_t          height  /**< */,
-                           uint16_t          border_width  /**< */,
-                           uint16_t          _class  /**< */,
-                           xcb_visualid_t    visual  /**< */,
-                           uint32_t          value_mask  /**< */,
-                           const uint32_t   *value_list  /**< */);
-
-/**
- * @brief Creates a window
- *
- * @param c The connection
- * @param depth Specifies the new window's depth (TODO: what unit?).
- * \n
- * The special value `XCB_COPY_FROM_PARENT` means the depth is taken from the
- * \a parent window.
- * @param wid The ID with which you will refer to the new window, created by
- * `xcb_generate_id`.
- * @param parent The parent window of the new window.
- * @param x The X coordinate of the new window.
- * @param y The Y coordinate of the new window.
- * @param width The width of the new window.
- * @param height The height of the new window.
- * @param border_width TODO:
- * \n
- * Must be zero if the `class` is `InputOnly` or a `xcb_match_error_t` occurs.
- * @param _class A bitmask of #xcb_window_class_t values.
- * @param _class \n
- * @param visual Specifies the id for the new window's visual.
- * \n
- * The special value `XCB_COPY_FROM_PARENT` means the visual is taken from the
- * \a parent window.
- * @param value_mask A bitmask of #xcb_cw_t values.
- * @return A cookie
- *
- * Creates an unmapped window as child of the specified \a parent window. A
- * CreateNotify event will be generated. The new window is placed on top in the
- * stacking order with respect to siblings.
- * 
- * The coordinate system has the X axis horizontal and the Y axis vertical with
- * the origin [0, 0] at the upper-left corner. Coordinates are integral, in terms
- * of pixels, and coincide with pixel centers. Each window and pixmap has its own
- * coordinate system. For a window, the origin is inside the border at the inside,
- * upper-left corner.
- * 
- * The created window is not yet displayed (mapped), call `xcb_map_window` to
- * display it.
- * 
- * The created window will initially use the same cursor as its parent.
- *
- */
-xcb_void_cookie_t
-xcb_create_window (xcb_connection_t *c  /**< */,
-                   uint8_t           depth  /**< */,
-                   xcb_window_t      wid  /**< */,
-                   xcb_window_t      parent  /**< */,
-                   int16_t           x  /**< */,
-                   int16_t           y  /**< */,
-                   uint16_t          width  /**< */,
-                   uint16_t          height  /**< */,
-                   uint16_t          border_width  /**< */,
-                   uint16_t          _class  /**< */,
-                   xcb_visualid_t    visual  /**< */,
-                   uint32_t          value_mask  /**< */,
-                   const uint32_t   *value_list  /**< */);
-
-int
-xcb_change_window_attributes_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief change window attributes
- *
- * @param c The connection
- * @param window The window to change.
- * @param value_mask A bitmask of #xcb_cw_t values.
- * @param value_mask \n
- * @param value_list Values for each of the attributes specified in the bitmask \a value_mask. The
- * order has to correspond to the order of possible \a value_mask bits. See the
- * example.
- * @return A cookie
- *
- * Changes the attributes specified by \a value_mask for the specified \a window.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_change_window_attributes_checked (xcb_connection_t *c  /**< */,
-                                      xcb_window_t      window  /**< */,
-                                      uint32_t          value_mask  /**< */,
-                                      const uint32_t   *value_list  /**< */);
-
-/**
- * @brief change window attributes
- *
- * @param c The connection
- * @param window The window to change.
- * @param value_mask A bitmask of #xcb_cw_t values.
- * @param value_mask \n
- * @param value_list Values for each of the attributes specified in the bitmask \a value_mask. The
- * order has to correspond to the order of possible \a value_mask bits. See the
- * example.
- * @return A cookie
- *
- * Changes the attributes specified by \a value_mask for the specified \a window.
- *
- */
-xcb_void_cookie_t
-xcb_change_window_attributes (xcb_connection_t *c  /**< */,
-                              xcb_window_t      window  /**< */,
-                              uint32_t          value_mask  /**< */,
-                              const uint32_t   *value_list  /**< */);
-
-/**
- * @brief Gets window attributes
- *
- * @param c The connection
- * @param window The window to get the attributes from.
- * @return A cookie
- *
- * Gets the current attributes for the specified \a window.
- *
- */
-xcb_get_window_attributes_cookie_t
-xcb_get_window_attributes (xcb_connection_t *c  /**< */,
-                           xcb_window_t      window  /**< */);
-
-/**
- * @brief Gets window attributes
- *
- * @param c The connection
- * @param window The window to get the attributes from.
- * @return A cookie
- *
- * Gets the current attributes for the specified \a window.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_window_attributes_cookie_t
-xcb_get_window_attributes_unchecked (xcb_connection_t *c  /**< */,
-                                     xcb_window_t      window  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_window_attributes_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_window_attributes_reply_t *
-xcb_get_window_attributes_reply (xcb_connection_t                    *c  /**< */,
-                                 xcb_get_window_attributes_cookie_t   cookie  /**< */,
-                                 xcb_generic_error_t                **e  /**< */);
-
-/**
- * @brief Destroys a window
- *
- * @param c The connection
- * @param window The window to destroy.
- * @return A cookie
- *
- * Destroys the specified window and all of its subwindows. A DestroyNotify event
- * is generated for each destroyed window (a DestroyNotify event is first generated
- * for any given window's inferiors). If the window was mapped, it will be
- * automatically unmapped before destroying.
- * 
- * Calling DestroyWindow on the root window will do nothing.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_destroy_window_checked (xcb_connection_t *c  /**< */,
-                            xcb_window_t      window  /**< */);
-
-/**
- * @brief Destroys a window
- *
- * @param c The connection
- * @param window The window to destroy.
- * @return A cookie
- *
- * Destroys the specified window and all of its subwindows. A DestroyNotify event
- * is generated for each destroyed window (a DestroyNotify event is first generated
- * for any given window's inferiors). If the window was mapped, it will be
- * automatically unmapped before destroying.
- * 
- * Calling DestroyWindow on the root window will do nothing.
- *
- */
-xcb_void_cookie_t
-xcb_destroy_window (xcb_connection_t *c  /**< */,
-                    xcb_window_t      window  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_destroy_subwindows_checked (xcb_connection_t *c  /**< */,
-                                xcb_window_t      window  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_destroy_subwindows (xcb_connection_t *c  /**< */,
-                        xcb_window_t      window  /**< */);
-
-/**
- * @brief Changes a client's save set
- *
- * @param c The connection
- * @param mode A bitmask of #xcb_set_mode_t values.
- * @param mode Insert to add the specified window to the save set or Delete to delete it from the save set.
- * @param window The window to add or delete to/from your save set.
- * @return A cookie
- *
- * TODO: explain what the save set is for.
- * 
- * This function either adds or removes the specified window to the client's (your
- * application's) save set.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_change_save_set_checked (xcb_connection_t *c  /**< */,
-                             uint8_t           mode  /**< */,
-                             xcb_window_t      window  /**< */);
-
-/**
- * @brief Changes a client's save set
- *
- * @param c The connection
- * @param mode A bitmask of #xcb_set_mode_t values.
- * @param mode Insert to add the specified window to the save set or Delete to delete it from the save set.
- * @param window The window to add or delete to/from your save set.
- * @return A cookie
- *
- * TODO: explain what the save set is for.
- * 
- * This function either adds or removes the specified window to the client's (your
- * application's) save set.
- *
- */
-xcb_void_cookie_t
-xcb_change_save_set (xcb_connection_t *c  /**< */,
-                     uint8_t           mode  /**< */,
-                     xcb_window_t      window  /**< */);
-
-/**
- * @brief Reparents a window
- *
- * @param c The connection
- * @param window The window to reparent.
- * @param parent The new parent of the window.
- * @param x The X position of the window within its new parent.
- * @param y The Y position of the window within its new parent.
- * @return A cookie
- *
- * Makes the specified window a child of the specified parent window. If the
- * window is mapped, it will automatically be unmapped before reparenting and
- * re-mapped after reparenting. The window is placed in the stacking order on top
- * with respect to sibling windows.
- * 
- * After reparenting, a ReparentNotify event is generated.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_reparent_window_checked (xcb_connection_t *c  /**< */,
-                             xcb_window_t      window  /**< */,
-                             xcb_window_t      parent  /**< */,
-                             int16_t           x  /**< */,
-                             int16_t           y  /**< */);
-
-/**
- * @brief Reparents a window
- *
- * @param c The connection
- * @param window The window to reparent.
- * @param parent The new parent of the window.
- * @param x The X position of the window within its new parent.
- * @param y The Y position of the window within its new parent.
- * @return A cookie
- *
- * Makes the specified window a child of the specified parent window. If the
- * window is mapped, it will automatically be unmapped before reparenting and
- * re-mapped after reparenting. The window is placed in the stacking order on top
- * with respect to sibling windows.
- * 
- * After reparenting, a ReparentNotify event is generated.
- *
- */
-xcb_void_cookie_t
-xcb_reparent_window (xcb_connection_t *c  /**< */,
-                     xcb_window_t      window  /**< */,
-                     xcb_window_t      parent  /**< */,
-                     int16_t           x  /**< */,
-                     int16_t           y  /**< */);
-
-/**
- * @brief Makes a window visible
- *
- * @param c The connection
- * @param window The window to make visible.
- * @return A cookie
- *
- * Maps the specified window. This means making the window visible (as long as its
- * parent is visible).
- * 
- * This MapWindow request will be translated to a MapRequest request if a window
- * manager is running. The window manager then decides to either map the window or
- * not. Set the override-redirect window attribute to true if you want to bypass
- * this mechanism.
- * 
- * If the window manager decides to map the window (or if no window manager is
- * running), a MapNotify event is generated.
- * 
- * If the window becomes viewable and no earlier contents for it are remembered,
- * the X server tiles the window with its background. If the window's background
- * is undefined, the existing screen contents are not altered, and the X server
- * generates zero or more Expose events.
- * 
- * If the window type is InputOutput, an Expose event will be generated when the
- * window becomes visible. The normal response to an Expose event should be to
- * repaint the window.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_map_window_checked (xcb_connection_t *c  /**< */,
-                        xcb_window_t      window  /**< */);
-
-/**
- * @brief Makes a window visible
- *
- * @param c The connection
- * @param window The window to make visible.
- * @return A cookie
- *
- * Maps the specified window. This means making the window visible (as long as its
- * parent is visible).
- * 
- * This MapWindow request will be translated to a MapRequest request if a window
- * manager is running. The window manager then decides to either map the window or
- * not. Set the override-redirect window attribute to true if you want to bypass
- * this mechanism.
- * 
- * If the window manager decides to map the window (or if no window manager is
- * running), a MapNotify event is generated.
- * 
- * If the window becomes viewable and no earlier contents for it are remembered,
- * the X server tiles the window with its background. If the window's background
- * is undefined, the existing screen contents are not altered, and the X server
- * generates zero or more Expose events.
- * 
- * If the window type is InputOutput, an Expose event will be generated when the
- * window becomes visible. The normal response to an Expose event should be to
- * repaint the window.
- *
- */
-xcb_void_cookie_t
-xcb_map_window (xcb_connection_t *c  /**< */,
-                xcb_window_t      window  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_map_subwindows_checked (xcb_connection_t *c  /**< */,
-                            xcb_window_t      window  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_map_subwindows (xcb_connection_t *c  /**< */,
-                    xcb_window_t      window  /**< */);
-
-/**
- * @brief Makes a window invisible
- *
- * @param c The connection
- * @param window The window to make invisible.
- * @return A cookie
- *
- * Unmaps the specified window. This means making the window invisible (and all
- * its child windows).
- * 
- * Unmapping a window leads to the `UnmapNotify` event being generated. Also,
- * `Expose` events are generated for formerly obscured windows.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_unmap_window_checked (xcb_connection_t *c  /**< */,
-                          xcb_window_t      window  /**< */);
-
-/**
- * @brief Makes a window invisible
- *
- * @param c The connection
- * @param window The window to make invisible.
- * @return A cookie
- *
- * Unmaps the specified window. This means making the window invisible (and all
- * its child windows).
- * 
- * Unmapping a window leads to the `UnmapNotify` event being generated. Also,
- * `Expose` events are generated for formerly obscured windows.
- *
- */
-xcb_void_cookie_t
-xcb_unmap_window (xcb_connection_t *c  /**< */,
-                  xcb_window_t      window  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_unmap_subwindows_checked (xcb_connection_t *c  /**< */,
-                              xcb_window_t      window  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_unmap_subwindows (xcb_connection_t *c  /**< */,
-                      xcb_window_t      window  /**< */);
-
-int
-xcb_configure_window_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief Configures window attributes
- *
- * @param c The connection
- * @param window The window to configure.
- * @param value_mask Bitmask of attributes to change.
- * @param value_list New values, corresponding to the attributes in value_mask. The order has to
- * correspond to the order of possible \a value_mask bits. See the example.
- * @return A cookie
- *
- * Configures a window's size, position, border width and stacking order.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_configure_window_checked (xcb_connection_t *c  /**< */,
-                              xcb_window_t      window  /**< */,
-                              uint16_t          value_mask  /**< */,
-                              const uint32_t   *value_list  /**< */);
-
-/**
- * @brief Configures window attributes
- *
- * @param c The connection
- * @param window The window to configure.
- * @param value_mask Bitmask of attributes to change.
- * @param value_list New values, corresponding to the attributes in value_mask. The order has to
- * correspond to the order of possible \a value_mask bits. See the example.
- * @return A cookie
- *
- * Configures a window's size, position, border width and stacking order.
- *
- */
-xcb_void_cookie_t
-xcb_configure_window (xcb_connection_t *c  /**< */,
-                      xcb_window_t      window  /**< */,
-                      uint16_t          value_mask  /**< */,
-                      const uint32_t   *value_list  /**< */);
-
-/**
- * @brief Change window stacking order
- *
- * @param c The connection
- * @param direction A bitmask of #xcb_circulate_t values.
- * @param direction \n
- * @param window The window to raise/lower (depending on \a direction).
- * @return A cookie
- *
- * If \a direction is `XCB_CIRCULATE_RAISE_LOWEST`, the lowest mapped child (if
- * any) will be raised to the top of the stack.
- * 
- * If \a direction is `XCB_CIRCULATE_LOWER_HIGHEST`, the highest mapped child will
- * be lowered to the bottom of the stack.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_circulate_window_checked (xcb_connection_t *c  /**< */,
-                              uint8_t           direction  /**< */,
-                              xcb_window_t      window  /**< */);
-
-/**
- * @brief Change window stacking order
- *
- * @param c The connection
- * @param direction A bitmask of #xcb_circulate_t values.
- * @param direction \n
- * @param window The window to raise/lower (depending on \a direction).
- * @return A cookie
- *
- * If \a direction is `XCB_CIRCULATE_RAISE_LOWEST`, the lowest mapped child (if
- * any) will be raised to the top of the stack.
- * 
- * If \a direction is `XCB_CIRCULATE_LOWER_HIGHEST`, the highest mapped child will
- * be lowered to the bottom of the stack.
- *
- */
-xcb_void_cookie_t
-xcb_circulate_window (xcb_connection_t *c  /**< */,
-                      uint8_t           direction  /**< */,
-                      xcb_window_t      window  /**< */);
-
-/**
- * @brief Get current window geometry
- *
- * @param c The connection
- * @param drawable The drawable (`Window` or `Pixmap`) of which the geometry will be received.
- * @return A cookie
- *
- * Gets the current geometry of the specified drawable (either `Window` or `Pixmap`).
- *
- */
-xcb_get_geometry_cookie_t
-xcb_get_geometry (xcb_connection_t *c  /**< */,
-                  xcb_drawable_t    drawable  /**< */);
-
-/**
- * @brief Get current window geometry
- *
- * @param c The connection
- * @param drawable The drawable (`Window` or `Pixmap`) of which the geometry will be received.
- * @return A cookie
- *
- * Gets the current geometry of the specified drawable (either `Window` or `Pixmap`).
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_geometry_cookie_t
-xcb_get_geometry_unchecked (xcb_connection_t *c  /**< */,
-                            xcb_drawable_t    drawable  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_geometry_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_geometry_reply_t *
-xcb_get_geometry_reply (xcb_connection_t           *c  /**< */,
-                        xcb_get_geometry_cookie_t   cookie  /**< */,
-                        xcb_generic_error_t       **e  /**< */);
-
-int
-xcb_query_tree_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief query the window tree
- *
- * @param c The connection
- * @param window The \a window to query.
- * @return A cookie
- *
- * Gets the root window ID, parent window ID and list of children windows for the
- * specified \a window. The children are listed in bottom-to-top stacking order.
- *
- */
-xcb_query_tree_cookie_t
-xcb_query_tree (xcb_connection_t *c  /**< */,
-                xcb_window_t      window  /**< */);
-
-/**
- * @brief query the window tree
- *
- * @param c The connection
- * @param window The \a window to query.
- * @return A cookie
- *
- * Gets the root window ID, parent window ID and list of children windows for the
- * specified \a window. The children are listed in bottom-to-top stacking order.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_query_tree_cookie_t
-xcb_query_tree_unchecked (xcb_connection_t *c  /**< */,
-                          xcb_window_t      window  /**< */);
-
-xcb_window_t *
-xcb_query_tree_children (const xcb_query_tree_reply_t *R  /**< */);
-
-int
-xcb_query_tree_children_length (const xcb_query_tree_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_query_tree_children_end (const xcb_query_tree_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_query_tree_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_query_tree_reply_t *
-xcb_query_tree_reply (xcb_connection_t         *c  /**< */,
-                      xcb_query_tree_cookie_t   cookie  /**< */,
-                      xcb_generic_error_t     **e  /**< */);
-
-int
-xcb_intern_atom_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief Get atom identifier by name
- *
- * @param c The connection
- * @param only_if_exists Return a valid atom id only if the atom already exists.
- * @param name_len The length of the following \a name.
- * @param name The name of the atom.
- * @return A cookie
- *
- * Retrieves the identifier (xcb_atom_t TODO) for the atom with the specified
- * name. Atoms are used in protocols like EWMH, for example to store window titles
- * (`_NET_WM_NAME` atom) as property of a window.
- * 
- * If \a only_if_exists is 0, the atom will be created if it does not already exist.
- * If \a only_if_exists is 1, `XCB_ATOM_NONE` will be returned if the atom does
- * not yet exist.
- *
- */
-xcb_intern_atom_cookie_t
-xcb_intern_atom (xcb_connection_t *c  /**< */,
-                 uint8_t           only_if_exists  /**< */,
-                 uint16_t          name_len  /**< */,
-                 const char       *name  /**< */);
-
-/**
- * @brief Get atom identifier by name
- *
- * @param c The connection
- * @param only_if_exists Return a valid atom id only if the atom already exists.
- * @param name_len The length of the following \a name.
- * @param name The name of the atom.
- * @return A cookie
- *
- * Retrieves the identifier (xcb_atom_t TODO) for the atom with the specified
- * name. Atoms are used in protocols like EWMH, for example to store window titles
- * (`_NET_WM_NAME` atom) as property of a window.
- * 
- * If \a only_if_exists is 0, the atom will be created if it does not already exist.
- * If \a only_if_exists is 1, `XCB_ATOM_NONE` will be returned if the atom does
- * not yet exist.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_intern_atom_cookie_t
-xcb_intern_atom_unchecked (xcb_connection_t *c  /**< */,
-                           uint8_t           only_if_exists  /**< */,
-                           uint16_t          name_len  /**< */,
-                           const char       *name  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_intern_atom_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_intern_atom_reply_t *
-xcb_intern_atom_reply (xcb_connection_t          *c  /**< */,
-                       xcb_intern_atom_cookie_t   cookie  /**< */,
-                       xcb_generic_error_t      **e  /**< */);
-
-int
-xcb_get_atom_name_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_atom_name_cookie_t
-xcb_get_atom_name (xcb_connection_t *c  /**< */,
-                   xcb_atom_t        atom  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_atom_name_cookie_t
-xcb_get_atom_name_unchecked (xcb_connection_t *c  /**< */,
-                             xcb_atom_t        atom  /**< */);
-
-char *
-xcb_get_atom_name_name (const xcb_get_atom_name_reply_t *R  /**< */);
-
-int
-xcb_get_atom_name_name_length (const xcb_get_atom_name_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_get_atom_name_name_end (const xcb_get_atom_name_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_atom_name_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_atom_name_reply_t *
-xcb_get_atom_name_reply (xcb_connection_t            *c  /**< */,
-                         xcb_get_atom_name_cookie_t   cookie  /**< */,
-                         xcb_generic_error_t        **e  /**< */);
-
-int
-xcb_change_property_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief Changes a window property
- *
- * @param c The connection
- * @param mode A bitmask of #xcb_prop_mode_t values.
- * @param mode \n
- * @param window The window whose property you want to change.
- * @param property The property you want to change (an atom).
- * @param type The type of the property you want to change (an atom).
- * @param format Specifies whether the data should be viewed as a list of 8-bit, 16-bit or
- * 32-bit quantities. Possible values are 8, 16 and 32. This information allows
- * the X server to correctly perform byte-swap operations as necessary.
- * @param data_len Specifies the number of elements (see \a format).
- * @param data The property data.
- * @return A cookie
- *
- * Sets or updates a property on the specified \a window. Properties are for
- * example the window title (`WM_NAME`) or its minimum size (`WM_NORMAL_HINTS`).
- * Protocols such as EWMH also use properties - for example EWMH defines the
- * window title, encoded as UTF-8 string, in the `_NET_WM_NAME` property.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_change_property_checked (xcb_connection_t *c  /**< */,
-                             uint8_t           mode  /**< */,
-                             xcb_window_t      window  /**< */,
-                             xcb_atom_t        property  /**< */,
-                             xcb_atom_t        type  /**< */,
-                             uint8_t           format  /**< */,
-                             uint32_t          data_len  /**< */,
-                             const void       *data  /**< */);
-
-/**
- * @brief Changes a window property
- *
- * @param c The connection
- * @param mode A bitmask of #xcb_prop_mode_t values.
- * @param mode \n
- * @param window The window whose property you want to change.
- * @param property The property you want to change (an atom).
- * @param type The type of the property you want to change (an atom).
- * @param format Specifies whether the data should be viewed as a list of 8-bit, 16-bit or
- * 32-bit quantities. Possible values are 8, 16 and 32. This information allows
- * the X server to correctly perform byte-swap operations as necessary.
- * @param data_len Specifies the number of elements (see \a format).
- * @param data The property data.
- * @return A cookie
- *
- * Sets or updates a property on the specified \a window. Properties are for
- * example the window title (`WM_NAME`) or its minimum size (`WM_NORMAL_HINTS`).
- * Protocols such as EWMH also use properties - for example EWMH defines the
- * window title, encoded as UTF-8 string, in the `_NET_WM_NAME` property.
- *
- */
-xcb_void_cookie_t
-xcb_change_property (xcb_connection_t *c  /**< */,
-                     uint8_t           mode  /**< */,
-                     xcb_window_t      window  /**< */,
-                     xcb_atom_t        property  /**< */,
-                     xcb_atom_t        type  /**< */,
-                     uint8_t           format  /**< */,
-                     uint32_t          data_len  /**< */,
-                     const void       *data  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_delete_property_checked (xcb_connection_t *c  /**< */,
-                             xcb_window_t      window  /**< */,
-                             xcb_atom_t        property  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_delete_property (xcb_connection_t *c  /**< */,
-                     xcb_window_t      window  /**< */,
-                     xcb_atom_t        property  /**< */);
-
-int
-xcb_get_property_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief Gets a window property
- *
- * @param c The connection
- * @param _delete Whether the property should actually be deleted. For deleting a property, the
- * specified \a type has to match the actual property type.
- * @param window The window whose property you want to get.
- * @param property The property you want to get (an atom).
- * @param type The type of the property you want to get (an atom).
- * @param long_offset Specifies the offset (in 32-bit multiples) in the specified property where the
- * data is to be retrieved.
- * @param long_length Specifies how many 32-bit multiples of data should be retrieved (e.g. if you
- * set \a long_length to 4, you will receive 16 bytes of data).
- * @return A cookie
- *
- * Gets the specified \a property from the specified \a window. Properties are for
- * example the window title (`WM_NAME`) or its minimum size (`WM_NORMAL_HINTS`).
- * Protocols such as EWMH also use properties - for example EWMH defines the
- * window title, encoded as UTF-8 string, in the `_NET_WM_NAME` property.
- * 
- * TODO: talk about \a type
- * 
- * TODO: talk about `delete`
- * 
- * TODO: talk about the offset/length thing. what's a valid use case?
- *
- */
-xcb_get_property_cookie_t
-xcb_get_property (xcb_connection_t *c  /**< */,
-                  uint8_t           _delete  /**< */,
-                  xcb_window_t      window  /**< */,
-                  xcb_atom_t        property  /**< */,
-                  xcb_atom_t        type  /**< */,
-                  uint32_t          long_offset  /**< */,
-                  uint32_t          long_length  /**< */);
-
-/**
- * @brief Gets a window property
- *
- * @param c The connection
- * @param _delete Whether the property should actually be deleted. For deleting a property, the
- * specified \a type has to match the actual property type.
- * @param window The window whose property you want to get.
- * @param property The property you want to get (an atom).
- * @param type The type of the property you want to get (an atom).
- * @param long_offset Specifies the offset (in 32-bit multiples) in the specified property where the
- * data is to be retrieved.
- * @param long_length Specifies how many 32-bit multiples of data should be retrieved (e.g. if you
- * set \a long_length to 4, you will receive 16 bytes of data).
- * @return A cookie
- *
- * Gets the specified \a property from the specified \a window. Properties are for
- * example the window title (`WM_NAME`) or its minimum size (`WM_NORMAL_HINTS`).
- * Protocols such as EWMH also use properties - for example EWMH defines the
- * window title, encoded as UTF-8 string, in the `_NET_WM_NAME` property.
- * 
- * TODO: talk about \a type
- * 
- * TODO: talk about `delete`
- * 
- * TODO: talk about the offset/length thing. what's a valid use case?
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_property_cookie_t
-xcb_get_property_unchecked (xcb_connection_t *c  /**< */,
-                            uint8_t           _delete  /**< */,
-                            xcb_window_t      window  /**< */,
-                            xcb_atom_t        property  /**< */,
-                            xcb_atom_t        type  /**< */,
-                            uint32_t          long_offset  /**< */,
-                            uint32_t          long_length  /**< */);
-
-void *
-xcb_get_property_value (const xcb_get_property_reply_t *R  /**< */);
-
-int
-xcb_get_property_value_length (const xcb_get_property_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_get_property_value_end (const xcb_get_property_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_property_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_property_reply_t *
-xcb_get_property_reply (xcb_connection_t           *c  /**< */,
-                        xcb_get_property_cookie_t   cookie  /**< */,
-                        xcb_generic_error_t       **e  /**< */);
-
-int
-xcb_list_properties_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_list_properties_cookie_t
-xcb_list_properties (xcb_connection_t *c  /**< */,
-                     xcb_window_t      window  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_list_properties_cookie_t
-xcb_list_properties_unchecked (xcb_connection_t *c  /**< */,
-                               xcb_window_t      window  /**< */);
-
-xcb_atom_t *
-xcb_list_properties_atoms (const xcb_list_properties_reply_t *R  /**< */);
-
-int
-xcb_list_properties_atoms_length (const xcb_list_properties_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_list_properties_atoms_end (const xcb_list_properties_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_list_properties_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_list_properties_reply_t *
-xcb_list_properties_reply (xcb_connection_t              *c  /**< */,
-                           xcb_list_properties_cookie_t   cookie  /**< */,
-                           xcb_generic_error_t          **e  /**< */);
-
-/**
- * @brief Sets the owner of a selection
- *
- * @param c The connection
- * @param owner The new owner of the selection.
- * \n
- * The special value `XCB_NONE` means that the selection will have no owner.
- * @param selection The selection.
- * @param time Timestamp to avoid race conditions when running X over the network.
- * \n
- * The selection will not be changed if \a time is earlier than the current
- * last-change time of the \a selection or is later than the current X server time.
- * Otherwise, the last-change time is set to the specified time.
- * \n
- * The special value `XCB_CURRENT_TIME` will be replaced with the current server
- * time.
- * @return A cookie
- *
- * Makes `window` the owner of the selection \a selection and updates the
- * last-change time of the specified selection.
- * 
- * TODO: briefly explain what a selection is.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_set_selection_owner_checked (xcb_connection_t *c  /**< */,
-                                 xcb_window_t      owner  /**< */,
-                                 xcb_atom_t        selection  /**< */,
-                                 xcb_timestamp_t   time  /**< */);
-
-/**
- * @brief Sets the owner of a selection
- *
- * @param c The connection
- * @param owner The new owner of the selection.
- * \n
- * The special value `XCB_NONE` means that the selection will have no owner.
- * @param selection The selection.
- * @param time Timestamp to avoid race conditions when running X over the network.
- * \n
- * The selection will not be changed if \a time is earlier than the current
- * last-change time of the \a selection or is later than the current X server time.
- * Otherwise, the last-change time is set to the specified time.
- * \n
- * The special value `XCB_CURRENT_TIME` will be replaced with the current server
- * time.
- * @return A cookie
- *
- * Makes `window` the owner of the selection \a selection and updates the
- * last-change time of the specified selection.
- * 
- * TODO: briefly explain what a selection is.
- *
- */
-xcb_void_cookie_t
-xcb_set_selection_owner (xcb_connection_t *c  /**< */,
-                         xcb_window_t      owner  /**< */,
-                         xcb_atom_t        selection  /**< */,
-                         xcb_timestamp_t   time  /**< */);
-
-/**
- * @brief Gets the owner of a selection
- *
- * @param c The connection
- * @param selection The selection.
- * @return A cookie
- *
- * Gets the owner of the specified selection.
- * 
- * TODO: briefly explain what a selection is.
- *
- */
-xcb_get_selection_owner_cookie_t
-xcb_get_selection_owner (xcb_connection_t *c  /**< */,
-                         xcb_atom_t        selection  /**< */);
-
-/**
- * @brief Gets the owner of a selection
- *
- * @param c The connection
- * @param selection The selection.
- * @return A cookie
- *
- * Gets the owner of the specified selection.
- * 
- * TODO: briefly explain what a selection is.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_selection_owner_cookie_t
-xcb_get_selection_owner_unchecked (xcb_connection_t *c  /**< */,
-                                   xcb_atom_t        selection  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_selection_owner_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_selection_owner_reply_t *
-xcb_get_selection_owner_reply (xcb_connection_t                  *c  /**< */,
-                               xcb_get_selection_owner_cookie_t   cookie  /**< */,
-                               xcb_generic_error_t              **e  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_convert_selection_checked (xcb_connection_t *c  /**< */,
-                               xcb_window_t      requestor  /**< */,
-                               xcb_atom_t        selection  /**< */,
-                               xcb_atom_t        target  /**< */,
-                               xcb_atom_t        property  /**< */,
-                               xcb_timestamp_t   time  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_convert_selection (xcb_connection_t *c  /**< */,
-                       xcb_window_t      requestor  /**< */,
-                       xcb_atom_t        selection  /**< */,
-                       xcb_atom_t        target  /**< */,
-                       xcb_atom_t        property  /**< */,
-                       xcb_timestamp_t   time  /**< */);
-
-/**
- * @brief send an event
- *
- * @param c The connection
- * @param propagate If \a propagate is true and no clients have selected any event on \a destination,
- * the destination is replaced with the closest ancestor of \a destination for
- * which some client has selected a type in \a event_mask and for which no
- * intervening window has that type in its do-not-propagate-mask. If no such
- * window exists or if the window is an ancestor of the focus window and
- * `InputFocus` was originally specified as the destination, the event is not sent
- * to any clients. Otherwise, the event is reported to every client selecting on
- * the final destination any of the types specified in \a event_mask.
- * @param destination The window to send this event to. Every client which selects any event within
- * \a event_mask on \a destination will get the event.
- * \n
- * The special value `XCB_SEND_EVENT_DEST_POINTER_WINDOW` refers to the window
- * that contains the mouse pointer.
- * \n
- * The special value `XCB_SEND_EVENT_DEST_ITEM_FOCUS` refers to the window which
- * has the keyboard focus.
- * @param event_mask Event_mask for determining which clients should receive the specified event.
- * See \a destination and \a propagate.
- * @param event The event to send to the specified \a destination.
- * @return A cookie
- *
- * Identifies the \a destination window, determines which clients should receive
- * the specified event and ignores any active grabs.
- * 
- * The \a event must be one of the core events or an event defined by an extension,
- * so that the X server can correctly byte-swap the contents as necessary. The
- * contents of \a event are otherwise unaltered and unchecked except for the
- * `send_event` field which is forced to 'true'.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_send_event_checked (xcb_connection_t *c  /**< */,
-                        uint8_t           propagate  /**< */,
-                        xcb_window_t      destination  /**< */,
-                        uint32_t          event_mask  /**< */,
-                        const char       *event  /**< */);
-
-/**
- * @brief send an event
- *
- * @param c The connection
- * @param propagate If \a propagate is true and no clients have selected any event on \a destination,
- * the destination is replaced with the closest ancestor of \a destination for
- * which some client has selected a type in \a event_mask and for which no
- * intervening window has that type in its do-not-propagate-mask. If no such
- * window exists or if the window is an ancestor of the focus window and
- * `InputFocus` was originally specified as the destination, the event is not sent
- * to any clients. Otherwise, the event is reported to every client selecting on
- * the final destination any of the types specified in \a event_mask.
- * @param destination The window to send this event to. Every client which selects any event within
- * \a event_mask on \a destination will get the event.
- * \n
- * The special value `XCB_SEND_EVENT_DEST_POINTER_WINDOW` refers to the window
- * that contains the mouse pointer.
- * \n
- * The special value `XCB_SEND_EVENT_DEST_ITEM_FOCUS` refers to the window which
- * has the keyboard focus.
- * @param event_mask Event_mask for determining which clients should receive the specified event.
- * See \a destination and \a propagate.
- * @param event The event to send to the specified \a destination.
- * @return A cookie
- *
- * Identifies the \a destination window, determines which clients should receive
- * the specified event and ignores any active grabs.
- * 
- * The \a event must be one of the core events or an event defined by an extension,
- * so that the X server can correctly byte-swap the contents as necessary. The
- * contents of \a event are otherwise unaltered and unchecked except for the
- * `send_event` field which is forced to 'true'.
- *
- */
-xcb_void_cookie_t
-xcb_send_event (xcb_connection_t *c  /**< */,
-                uint8_t           propagate  /**< */,
-                xcb_window_t      destination  /**< */,
-                uint32_t          event_mask  /**< */,
-                const char       *event  /**< */);
-
-/**
- * @brief Grab the pointer
- *
- * @param c The connection
- * @param owner_events If 1, the \a grab_window will still get the pointer events. If 0, events are not
- * reported to the \a grab_window.
- * @param grab_window Specifies the window on which the pointer should be grabbed.
- * @param event_mask Specifies which pointer events are reported to the client.
- * \n
- * TODO: which values?
- * @param pointer_mode A bitmask of #xcb_grab_mode_t values.
- * @param pointer_mode \n
- * @param keyboard_mode A bitmask of #xcb_grab_mode_t values.
- * @param keyboard_mode \n
- * @param confine_to Specifies the window to confine the pointer in (the user will not be able to
- * move the pointer out of that window).
- * \n
- * The special value `XCB_NONE` means don't confine the pointer.
- * @param cursor Specifies the cursor that should be displayed or `XCB_NONE` to not change the
- * cursor.
- * @param time The time argument allows you to avoid certain circumstances that come up if
- * applications take a long time to respond or if there are long network delays.
- * Consider a situation where you have two applications, both of which normally
- * grab the pointer when clicked on. If both applications specify the timestamp
- * from the event, the second application may wake up faster and successfully grab
- * the pointer before the first application. The first application then will get
- * an indication that the other application grabbed the pointer before its request
- * was processed.
- * \n
- * The special value `XCB_CURRENT_TIME` will be replaced with the current server
- * time.
- * @return A cookie
- *
- * Actively grabs control of the pointer. Further pointer events are reported only to the grabbing client. Overrides any active pointer grab by this client.
- *
- */
-xcb_grab_pointer_cookie_t
-xcb_grab_pointer (xcb_connection_t *c  /**< */,
-                  uint8_t           owner_events  /**< */,
-                  xcb_window_t      grab_window  /**< */,
-                  uint16_t          event_mask  /**< */,
-                  uint8_t           pointer_mode  /**< */,
-                  uint8_t           keyboard_mode  /**< */,
-                  xcb_window_t      confine_to  /**< */,
-                  xcb_cursor_t      cursor  /**< */,
-                  xcb_timestamp_t   time  /**< */);
-
-/**
- * @brief Grab the pointer
- *
- * @param c The connection
- * @param owner_events If 1, the \a grab_window will still get the pointer events. If 0, events are not
- * reported to the \a grab_window.
- * @param grab_window Specifies the window on which the pointer should be grabbed.
- * @param event_mask Specifies which pointer events are reported to the client.
- * \n
- * TODO: which values?
- * @param pointer_mode A bitmask of #xcb_grab_mode_t values.
- * @param pointer_mode \n
- * @param keyboard_mode A bitmask of #xcb_grab_mode_t values.
- * @param keyboard_mode \n
- * @param confine_to Specifies the window to confine the pointer in (the user will not be able to
- * move the pointer out of that window).
- * \n
- * The special value `XCB_NONE` means don't confine the pointer.
- * @param cursor Specifies the cursor that should be displayed or `XCB_NONE` to not change the
- * cursor.
- * @param time The time argument allows you to avoid certain circumstances that come up if
- * applications take a long time to respond or if there are long network delays.
- * Consider a situation where you have two applications, both of which normally
- * grab the pointer when clicked on. If both applications specify the timestamp
- * from the event, the second application may wake up faster and successfully grab
- * the pointer before the first application. The first application then will get
- * an indication that the other application grabbed the pointer before its request
- * was processed.
- * \n
- * The special value `XCB_CURRENT_TIME` will be replaced with the current server
- * time.
- * @return A cookie
- *
- * Actively grabs control of the pointer. Further pointer events are reported only to the grabbing client. Overrides any active pointer grab by this client.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_grab_pointer_cookie_t
-xcb_grab_pointer_unchecked (xcb_connection_t *c  /**< */,
-                            uint8_t           owner_events  /**< */,
-                            xcb_window_t      grab_window  /**< */,
-                            uint16_t          event_mask  /**< */,
-                            uint8_t           pointer_mode  /**< */,
-                            uint8_t           keyboard_mode  /**< */,
-                            xcb_window_t      confine_to  /**< */,
-                            xcb_cursor_t      cursor  /**< */,
-                            xcb_timestamp_t   time  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_grab_pointer_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_grab_pointer_reply_t *
-xcb_grab_pointer_reply (xcb_connection_t           *c  /**< */,
-                        xcb_grab_pointer_cookie_t   cookie  /**< */,
-                        xcb_generic_error_t       **e  /**< */);
-
-/**
- * @brief release the pointer
- *
- * @param c The connection
- * @param time Timestamp to avoid race conditions when running X over the network.
- * \n
- * The pointer will not be released if \a time is earlier than the
- * last-pointer-grab time or later than the current X server time.
- * @return A cookie
- *
- * Releases the pointer and any queued events if you actively grabbed the pointer
- * before using `xcb_grab_pointer`, `xcb_grab_button` or within a normal button
- * press.
- * 
- * EnterNotify and LeaveNotify events are generated.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_ungrab_pointer_checked (xcb_connection_t *c  /**< */,
-                            xcb_timestamp_t   time  /**< */);
-
-/**
- * @brief release the pointer
- *
- * @param c The connection
- * @param time Timestamp to avoid race conditions when running X over the network.
- * \n
- * The pointer will not be released if \a time is earlier than the
- * last-pointer-grab time or later than the current X server time.
- * @return A cookie
- *
- * Releases the pointer and any queued events if you actively grabbed the pointer
- * before using `xcb_grab_pointer`, `xcb_grab_button` or within a normal button
- * press.
- * 
- * EnterNotify and LeaveNotify events are generated.
- *
- */
-xcb_void_cookie_t
-xcb_ungrab_pointer (xcb_connection_t *c  /**< */,
-                    xcb_timestamp_t   time  /**< */);
-
-/**
- * @brief Grab pointer button(s)
- *
- * @param c The connection
- * @param owner_events If 1, the \a grab_window will still get the pointer events. If 0, events are not
- * reported to the \a grab_window.
- * @param grab_window Specifies the window on which the pointer should be grabbed.
- * @param event_mask Specifies which pointer events are reported to the client.
- * \n
- * TODO: which values?
- * @param pointer_mode A bitmask of #xcb_grab_mode_t values.
- * @param pointer_mode \n
- * @param keyboard_mode A bitmask of #xcb_grab_mode_t values.
- * @param keyboard_mode \n
- * @param confine_to Specifies the window to confine the pointer in (the user will not be able to
- * move the pointer out of that window).
- * \n
- * The special value `XCB_NONE` means don't confine the pointer.
- * @param cursor Specifies the cursor that should be displayed or `XCB_NONE` to not change the
- * cursor.
- * @param button A bitmask of #xcb_button_index_t values.
- * @param button \n
- * @param modifiers The modifiers to grab.
- * \n
- * Using the special value `XCB_MOD_MASK_ANY` means grab the pointer with all
- * possible modifier combinations.
- * @return A cookie
- *
- * This request establishes a passive grab. The pointer is actively grabbed as
- * described in GrabPointer, the last-pointer-grab time is set to the time at
- * which the button was pressed (as transmitted in the ButtonPress event), and the
- * ButtonPress event is reported if all of the following conditions are true:
- * 
- * The pointer is not grabbed and the specified button is logically pressed when
- * the specified modifier keys are logically down, and no other buttons or
- * modifier keys are logically down.
- * 
- * The grab-window contains the pointer.
- * 
- * The confine-to window (if any) is viewable.
- * 
- * A passive grab on the same button/key combination does not exist on any
- * ancestor of grab-window.
- * 
- * The interpretation of the remaining arguments is the same as for GrabPointer.
- * The active grab is terminated automatically when the logical state of the
- * pointer has all buttons released, independent of the logical state of modifier
- * keys. Note that the logical state of a device (as seen by means of the
- * protocol) may lag the physical state if device event processing is frozen. This
- * request overrides all previous passive grabs by the same client on the same
- * button/key combinations on the same window. A modifier of AnyModifier is
- * equivalent to issuing the request for all possible modifier combinations
- * (including the combination of no modifiers). It is not required that all
- * specified modifiers have currently assigned keycodes. A button of AnyButton is
- * equivalent to issuing the request for all possible buttons. Otherwise, it is
- * not required that the button specified currently be assigned to a physical
- * button.
- * 
- * An Access error is generated if some other client has already issued a
- * GrabButton request with the same button/key combination on the same window.
- * When using AnyModifier or AnyButton, the request fails completely (no grabs are
- * established), and an Access error is generated if there is a conflicting grab
- * for any combination. The request has no effect on an active grab.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_grab_button_checked (xcb_connection_t *c  /**< */,
-                         uint8_t           owner_events  /**< */,
-                         xcb_window_t      grab_window  /**< */,
-                         uint16_t          event_mask  /**< */,
-                         uint8_t           pointer_mode  /**< */,
-                         uint8_t           keyboard_mode  /**< */,
-                         xcb_window_t      confine_to  /**< */,
-                         xcb_cursor_t      cursor  /**< */,
-                         uint8_t           button  /**< */,
-                         uint16_t          modifiers  /**< */);
-
-/**
- * @brief Grab pointer button(s)
- *
- * @param c The connection
- * @param owner_events If 1, the \a grab_window will still get the pointer events. If 0, events are not
- * reported to the \a grab_window.
- * @param grab_window Specifies the window on which the pointer should be grabbed.
- * @param event_mask Specifies which pointer events are reported to the client.
- * \n
- * TODO: which values?
- * @param pointer_mode A bitmask of #xcb_grab_mode_t values.
- * @param pointer_mode \n
- * @param keyboard_mode A bitmask of #xcb_grab_mode_t values.
- * @param keyboard_mode \n
- * @param confine_to Specifies the window to confine the pointer in (the user will not be able to
- * move the pointer out of that window).
- * \n
- * The special value `XCB_NONE` means don't confine the pointer.
- * @param cursor Specifies the cursor that should be displayed or `XCB_NONE` to not change the
- * cursor.
- * @param button A bitmask of #xcb_button_index_t values.
- * @param button \n
- * @param modifiers The modifiers to grab.
- * \n
- * Using the special value `XCB_MOD_MASK_ANY` means grab the pointer with all
- * possible modifier combinations.
- * @return A cookie
- *
- * This request establishes a passive grab. The pointer is actively grabbed as
- * described in GrabPointer, the last-pointer-grab time is set to the time at
- * which the button was pressed (as transmitted in the ButtonPress event), and the
- * ButtonPress event is reported if all of the following conditions are true:
- * 
- * The pointer is not grabbed and the specified button is logically pressed when
- * the specified modifier keys are logically down, and no other buttons or
- * modifier keys are logically down.
- * 
- * The grab-window contains the pointer.
- * 
- * The confine-to window (if any) is viewable.
- * 
- * A passive grab on the same button/key combination does not exist on any
- * ancestor of grab-window.
- * 
- * The interpretation of the remaining arguments is the same as for GrabPointer.
- * The active grab is terminated automatically when the logical state of the
- * pointer has all buttons released, independent of the logical state of modifier
- * keys. Note that the logical state of a device (as seen by means of the
- * protocol) may lag the physical state if device event processing is frozen. This
- * request overrides all previous passive grabs by the same client on the same
- * button/key combinations on the same window. A modifier of AnyModifier is
- * equivalent to issuing the request for all possible modifier combinations
- * (including the combination of no modifiers). It is not required that all
- * specified modifiers have currently assigned keycodes. A button of AnyButton is
- * equivalent to issuing the request for all possible buttons. Otherwise, it is
- * not required that the button specified currently be assigned to a physical
- * button.
- * 
- * An Access error is generated if some other client has already issued a
- * GrabButton request with the same button/key combination on the same window.
- * When using AnyModifier or AnyButton, the request fails completely (no grabs are
- * established), and an Access error is generated if there is a conflicting grab
- * for any combination. The request has no effect on an active grab.
- *
- */
-xcb_void_cookie_t
-xcb_grab_button (xcb_connection_t *c  /**< */,
-                 uint8_t           owner_events  /**< */,
-                 xcb_window_t      grab_window  /**< */,
-                 uint16_t          event_mask  /**< */,
-                 uint8_t           pointer_mode  /**< */,
-                 uint8_t           keyboard_mode  /**< */,
-                 xcb_window_t      confine_to  /**< */,
-                 xcb_cursor_t      cursor  /**< */,
-                 uint8_t           button  /**< */,
-                 uint16_t          modifiers  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_ungrab_button_checked (xcb_connection_t *c  /**< */,
-                           uint8_t           button  /**< */,
-                           xcb_window_t      grab_window  /**< */,
-                           uint16_t          modifiers  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_ungrab_button (xcb_connection_t *c  /**< */,
-                   uint8_t           button  /**< */,
-                   xcb_window_t      grab_window  /**< */,
-                   uint16_t          modifiers  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_change_active_pointer_grab_checked (xcb_connection_t *c  /**< */,
-                                        xcb_cursor_t      cursor  /**< */,
-                                        xcb_timestamp_t   time  /**< */,
-                                        uint16_t          event_mask  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_change_active_pointer_grab (xcb_connection_t *c  /**< */,
-                                xcb_cursor_t      cursor  /**< */,
-                                xcb_timestamp_t   time  /**< */,
-                                uint16_t          event_mask  /**< */);
-
-/**
- * @brief Grab the keyboard
- *
- * @param c The connection
- * @param owner_events If 1, the \a grab_window will still get the pointer events. If 0, events are not
- * reported to the \a grab_window.
- * @param grab_window Specifies the window on which the pointer should be grabbed.
- * @param time Timestamp to avoid race conditions when running X over the network.
- * \n
- * The special value `XCB_CURRENT_TIME` will be replaced with the current server
- * time.
- * @param pointer_mode A bitmask of #xcb_grab_mode_t values.
- * @param pointer_mode \n
- * @param keyboard_mode A bitmask of #xcb_grab_mode_t values.
- * @param keyboard_mode \n
- * @return A cookie
- *
- * Actively grabs control of the keyboard and generates FocusIn and FocusOut
- * events. Further key events are reported only to the grabbing client.
- * 
- * Any active keyboard grab by this client is overridden. If the keyboard is
- * actively grabbed by some other client, `AlreadyGrabbed` is returned. If
- * \a grab_window is not viewable, `GrabNotViewable` is returned. If the keyboard
- * is frozen by an active grab of another client, `GrabFrozen` is returned. If the
- * specified \a time is earlier than the last-keyboard-grab time or later than the
- * current X server time, `GrabInvalidTime` is returned. Otherwise, the
- * last-keyboard-grab time is set to the specified time.
- *
- */
-xcb_grab_keyboard_cookie_t
-xcb_grab_keyboard (xcb_connection_t *c  /**< */,
-                   uint8_t           owner_events  /**< */,
-                   xcb_window_t      grab_window  /**< */,
-                   xcb_timestamp_t   time  /**< */,
-                   uint8_t           pointer_mode  /**< */,
-                   uint8_t           keyboard_mode  /**< */);
-
-/**
- * @brief Grab the keyboard
- *
- * @param c The connection
- * @param owner_events If 1, the \a grab_window will still get the pointer events. If 0, events are not
- * reported to the \a grab_window.
- * @param grab_window Specifies the window on which the pointer should be grabbed.
- * @param time Timestamp to avoid race conditions when running X over the network.
- * \n
- * The special value `XCB_CURRENT_TIME` will be replaced with the current server
- * time.
- * @param pointer_mode A bitmask of #xcb_grab_mode_t values.
- * @param pointer_mode \n
- * @param keyboard_mode A bitmask of #xcb_grab_mode_t values.
- * @param keyboard_mode \n
- * @return A cookie
- *
- * Actively grabs control of the keyboard and generates FocusIn and FocusOut
- * events. Further key events are reported only to the grabbing client.
- * 
- * Any active keyboard grab by this client is overridden. If the keyboard is
- * actively grabbed by some other client, `AlreadyGrabbed` is returned. If
- * \a grab_window is not viewable, `GrabNotViewable` is returned. If the keyboard
- * is frozen by an active grab of another client, `GrabFrozen` is returned. If the
- * specified \a time is earlier than the last-keyboard-grab time or later than the
- * current X server time, `GrabInvalidTime` is returned. Otherwise, the
- * last-keyboard-grab time is set to the specified time.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_grab_keyboard_cookie_t
-xcb_grab_keyboard_unchecked (xcb_connection_t *c  /**< */,
-                             uint8_t           owner_events  /**< */,
-                             xcb_window_t      grab_window  /**< */,
-                             xcb_timestamp_t   time  /**< */,
-                             uint8_t           pointer_mode  /**< */,
-                             uint8_t           keyboard_mode  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_grab_keyboard_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_grab_keyboard_reply_t *
-xcb_grab_keyboard_reply (xcb_connection_t            *c  /**< */,
-                         xcb_grab_keyboard_cookie_t   cookie  /**< */,
-                         xcb_generic_error_t        **e  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_ungrab_keyboard_checked (xcb_connection_t *c  /**< */,
-                             xcb_timestamp_t   time  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_ungrab_keyboard (xcb_connection_t *c  /**< */,
-                     xcb_timestamp_t   time  /**< */);
-
-/**
- * @brief Grab keyboard key(s)
- *
- * @param c The connection
- * @param owner_events If 1, the \a grab_window will still get the pointer events. If 0, events are not
- * reported to the \a grab_window.
- * @param grab_window Specifies the window on which the pointer should be grabbed.
- * @param modifiers The modifiers to grab.
- * \n
- * Using the special value `XCB_MOD_MASK_ANY` means grab the pointer with all
- * possible modifier combinations.
- * @param key The keycode of the key to grab.
- * \n
- * The special value `XCB_GRAB_ANY` means grab any key.
- * @param pointer_mode A bitmask of #xcb_grab_mode_t values.
- * @param pointer_mode \n
- * @param keyboard_mode A bitmask of #xcb_grab_mode_t values.
- * @param keyboard_mode \n
- * @return A cookie
- *
- * Establishes a passive grab on the keyboard. In the future, the keyboard is
- * actively grabbed (as for `GrabKeyboard`), the last-keyboard-grab time is set to
- * the time at which the key was pressed (as transmitted in the KeyPress event),
- * and the KeyPress event is reported if all of the following conditions are true:
- * 
- * The keyboard is not grabbed and the specified key (which can itself be a
- * modifier key) is logically pressed when the specified modifier keys are
- * logically down, and no other modifier keys are logically down.
- * 
- * Either the grab_window is an ancestor of (or is) the focus window, or the
- * grab_window is a descendant of the focus window and contains the pointer.
- * 
- * A passive grab on the same key combination does not exist on any ancestor of
- * grab_window.
- * 
- * The interpretation of the remaining arguments is as for XGrabKeyboard.  The active grab is terminated
- * automatically when the logical state of the keyboard has the specified key released (independent of the
- * logical state of the modifier keys), at which point a KeyRelease event is reported to the grabbing window.
- * 
- * Note that the logical state of a device (as seen by client applications) may lag the physical state if
- * device event processing is frozen.
- * 
- * A modifiers argument of AnyModifier is equivalent to issuing the request for all possible modifier combinations (including the combination of no modifiers).  It is not required that all modifiers specified
- * have currently assigned KeyCodes.  A keycode argument of AnyKey is equivalent to issuing the request for
- * all possible KeyCodes.  Otherwise, the specified keycode must be in the range specified by min_keycode
- * and max_keycode in the connection setup, or a BadValue error results.
- * 
- * If some other client has issued a XGrabKey with the same key combination on the same window, a BadAccess
- * error results.  When using AnyModifier or AnyKey, the request fails completely, and a BadAccess error
- * results (no grabs are established) if there is a conflicting grab for any combination.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_grab_key_checked (xcb_connection_t *c  /**< */,
-                      uint8_t           owner_events  /**< */,
-                      xcb_window_t      grab_window  /**< */,
-                      uint16_t          modifiers  /**< */,
-                      xcb_keycode_t     key  /**< */,
-                      uint8_t           pointer_mode  /**< */,
-                      uint8_t           keyboard_mode  /**< */);
-
-/**
- * @brief Grab keyboard key(s)
- *
- * @param c The connection
- * @param owner_events If 1, the \a grab_window will still get the pointer events. If 0, events are not
- * reported to the \a grab_window.
- * @param grab_window Specifies the window on which the pointer should be grabbed.
- * @param modifiers The modifiers to grab.
- * \n
- * Using the special value `XCB_MOD_MASK_ANY` means grab the pointer with all
- * possible modifier combinations.
- * @param key The keycode of the key to grab.
- * \n
- * The special value `XCB_GRAB_ANY` means grab any key.
- * @param pointer_mode A bitmask of #xcb_grab_mode_t values.
- * @param pointer_mode \n
- * @param keyboard_mode A bitmask of #xcb_grab_mode_t values.
- * @param keyboard_mode \n
- * @return A cookie
- *
- * Establishes a passive grab on the keyboard. In the future, the keyboard is
- * actively grabbed (as for `GrabKeyboard`), the last-keyboard-grab time is set to
- * the time at which the key was pressed (as transmitted in the KeyPress event),
- * and the KeyPress event is reported if all of the following conditions are true:
- * 
- * The keyboard is not grabbed and the specified key (which can itself be a
- * modifier key) is logically pressed when the specified modifier keys are
- * logically down, and no other modifier keys are logically down.
- * 
- * Either the grab_window is an ancestor of (or is) the focus window, or the
- * grab_window is a descendant of the focus window and contains the pointer.
- * 
- * A passive grab on the same key combination does not exist on any ancestor of
- * grab_window.
- * 
- * The interpretation of the remaining arguments is as for XGrabKeyboard.  The active grab is terminated
- * automatically when the logical state of the keyboard has the specified key released (independent of the
- * logical state of the modifier keys), at which point a KeyRelease event is reported to the grabbing window.
- * 
- * Note that the logical state of a device (as seen by client applications) may lag the physical state if
- * device event processing is frozen.
- * 
- * A modifiers argument of AnyModifier is equivalent to issuing the request for all possible modifier combinations (including the combination of no modifiers).  It is not required that all modifiers specified
- * have currently assigned KeyCodes.  A keycode argument of AnyKey is equivalent to issuing the request for
- * all possible KeyCodes.  Otherwise, the specified keycode must be in the range specified by min_keycode
- * and max_keycode in the connection setup, or a BadValue error results.
- * 
- * If some other client has issued a XGrabKey with the same key combination on the same window, a BadAccess
- * error results.  When using AnyModifier or AnyKey, the request fails completely, and a BadAccess error
- * results (no grabs are established) if there is a conflicting grab for any combination.
- *
- */
-xcb_void_cookie_t
-xcb_grab_key (xcb_connection_t *c  /**< */,
-              uint8_t           owner_events  /**< */,
-              xcb_window_t      grab_window  /**< */,
-              uint16_t          modifiers  /**< */,
-              xcb_keycode_t     key  /**< */,
-              uint8_t           pointer_mode  /**< */,
-              uint8_t           keyboard_mode  /**< */);
-
-/**
- * @brief release a key combination
- *
- * @param c The connection
- * @param key The keycode of the specified key combination.
- * \n
- * Using the special value `XCB_GRAB_ANY` means releasing all possible key codes.
- * @param grab_window The window on which the grabbed key combination will be released.
- * @param modifiers The modifiers of the specified key combination.
- * \n
- * Using the special value `XCB_MOD_MASK_ANY` means releasing the key combination
- * with every possible modifier combination.
- * @return A cookie
- *
- * Releases the key combination on \a grab_window if you grabbed it using
- * `xcb_grab_key` before.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_ungrab_key_checked (xcb_connection_t *c  /**< */,
-                        xcb_keycode_t     key  /**< */,
-                        xcb_window_t      grab_window  /**< */,
-                        uint16_t          modifiers  /**< */);
-
-/**
- * @brief release a key combination
- *
- * @param c The connection
- * @param key The keycode of the specified key combination.
- * \n
- * Using the special value `XCB_GRAB_ANY` means releasing all possible key codes.
- * @param grab_window The window on which the grabbed key combination will be released.
- * @param modifiers The modifiers of the specified key combination.
- * \n
- * Using the special value `XCB_MOD_MASK_ANY` means releasing the key combination
- * with every possible modifier combination.
- * @return A cookie
- *
- * Releases the key combination on \a grab_window if you grabbed it using
- * `xcb_grab_key` before.
- *
- */
-xcb_void_cookie_t
-xcb_ungrab_key (xcb_connection_t *c  /**< */,
-                xcb_keycode_t     key  /**< */,
-                xcb_window_t      grab_window  /**< */,
-                uint16_t          modifiers  /**< */);
-
-/**
- * @brief release queued events
- *
- * @param c The connection
- * @param mode A bitmask of #xcb_allow_t values.
- * @param mode \n
- * @param time Timestamp to avoid race conditions when running X over the network.
- * \n
- * The special value `XCB_CURRENT_TIME` will be replaced with the current server
- * time.
- * @return A cookie
- *
- * Releases queued events if the client has caused a device (pointer/keyboard) to
- * freeze due to grabbing it actively. This request has no effect if \a time is
- * earlier than the last-grab time of the most recent active grab for this client
- * or if \a time is later than the current X server time.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_allow_events_checked (xcb_connection_t *c  /**< */,
-                          uint8_t           mode  /**< */,
-                          xcb_timestamp_t   time  /**< */);
-
-/**
- * @brief release queued events
- *
- * @param c The connection
- * @param mode A bitmask of #xcb_allow_t values.
- * @param mode \n
- * @param time Timestamp to avoid race conditions when running X over the network.
- * \n
- * The special value `XCB_CURRENT_TIME` will be replaced with the current server
- * time.
- * @return A cookie
- *
- * Releases queued events if the client has caused a device (pointer/keyboard) to
- * freeze due to grabbing it actively. This request has no effect if \a time is
- * earlier than the last-grab time of the most recent active grab for this client
- * or if \a time is later than the current X server time.
- *
- */
-xcb_void_cookie_t
-xcb_allow_events (xcb_connection_t *c  /**< */,
-                  uint8_t           mode  /**< */,
-                  xcb_timestamp_t   time  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_grab_server_checked (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_grab_server (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_ungrab_server_checked (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_ungrab_server (xcb_connection_t *c  /**< */);
-
-/**
- * @brief get pointer coordinates
- *
- * @param c The connection
- * @param window A window to check if the pointer is on the same screen as \a window (see the
- * `same_screen` field in the reply).
- * @return A cookie
- *
- * Gets the root window the pointer is logically on and the pointer coordinates
- * relative to the root window's origin.
- *
- */
-xcb_query_pointer_cookie_t
-xcb_query_pointer (xcb_connection_t *c  /**< */,
-                   xcb_window_t      window  /**< */);
-
-/**
- * @brief get pointer coordinates
- *
- * @param c The connection
- * @param window A window to check if the pointer is on the same screen as \a window (see the
- * `same_screen` field in the reply).
- * @return A cookie
- *
- * Gets the root window the pointer is logically on and the pointer coordinates
- * relative to the root window's origin.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_query_pointer_cookie_t
-xcb_query_pointer_unchecked (xcb_connection_t *c  /**< */,
-                             xcb_window_t      window  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_query_pointer_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_query_pointer_reply_t *
-xcb_query_pointer_reply (xcb_connection_t            *c  /**< */,
-                         xcb_query_pointer_cookie_t   cookie  /**< */,
-                         xcb_generic_error_t        **e  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_timecoord_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_timecoord_t)
- */
-void
-xcb_timecoord_next (xcb_timecoord_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_timecoord_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_timecoord_end (xcb_timecoord_iterator_t i  /**< */);
-
-int
-xcb_get_motion_events_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_motion_events_cookie_t
-xcb_get_motion_events (xcb_connection_t *c  /**< */,
-                       xcb_window_t      window  /**< */,
-                       xcb_timestamp_t   start  /**< */,
-                       xcb_timestamp_t   stop  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_motion_events_cookie_t
-xcb_get_motion_events_unchecked (xcb_connection_t *c  /**< */,
-                                 xcb_window_t      window  /**< */,
-                                 xcb_timestamp_t   start  /**< */,
-                                 xcb_timestamp_t   stop  /**< */);
-
-xcb_timecoord_t *
-xcb_get_motion_events_events (const xcb_get_motion_events_reply_t *R  /**< */);
-
-int
-xcb_get_motion_events_events_length (const xcb_get_motion_events_reply_t *R  /**< */);
-
-xcb_timecoord_iterator_t
-xcb_get_motion_events_events_iterator (const xcb_get_motion_events_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_motion_events_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_motion_events_reply_t *
-xcb_get_motion_events_reply (xcb_connection_t                *c  /**< */,
-                             xcb_get_motion_events_cookie_t   cookie  /**< */,
-                             xcb_generic_error_t            **e  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_translate_coordinates_cookie_t
-xcb_translate_coordinates (xcb_connection_t *c  /**< */,
-                           xcb_window_t      src_window  /**< */,
-                           xcb_window_t      dst_window  /**< */,
-                           int16_t           src_x  /**< */,
-                           int16_t           src_y  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_translate_coordinates_cookie_t
-xcb_translate_coordinates_unchecked (xcb_connection_t *c  /**< */,
-                                     xcb_window_t      src_window  /**< */,
-                                     xcb_window_t      dst_window  /**< */,
-                                     int16_t           src_x  /**< */,
-                                     int16_t           src_y  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_translate_coordinates_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_translate_coordinates_reply_t *
-xcb_translate_coordinates_reply (xcb_connection_t                    *c  /**< */,
-                                 xcb_translate_coordinates_cookie_t   cookie  /**< */,
-                                 xcb_generic_error_t                **e  /**< */);
-
-/**
- * @brief move mouse pointer
- *
- * @param c The connection
- * @param src_window If \a src_window is not `XCB_NONE` (TODO), the move will only take place if the
- * pointer is inside \a src_window and within the rectangle specified by (\a src_x,
- * \a src_y, \a src_width, \a src_height). The rectangle coordinates are relative to
- * \a src_window.
- * @param dst_window If \a dst_window is not `XCB_NONE` (TODO), the pointer will be moved to the
- * offsets (\a dst_x, \a dst_y) relative to \a dst_window. If \a dst_window is
- * `XCB_NONE` (TODO), the pointer will be moved by the offsets (\a dst_x, \a dst_y)
- * relative to the current position of the pointer.
- * @return A cookie
- *
- * Moves the mouse pointer to the specified position.
- * 
- * If \a src_window is not `XCB_NONE` (TODO), the move will only take place if the
- * pointer is inside \a src_window and within the rectangle specified by (\a src_x,
- * \a src_y, \a src_width, \a src_height). The rectangle coordinates are relative to
- * \a src_window.
- * 
- * If \a dst_window is not `XCB_NONE` (TODO), the pointer will be moved to the
- * offsets (\a dst_x, \a dst_y) relative to \a dst_window. If \a dst_window is
- * `XCB_NONE` (TODO), the pointer will be moved by the offsets (\a dst_x, \a dst_y)
- * relative to the current position of the pointer.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_warp_pointer_checked (xcb_connection_t *c  /**< */,
-                          xcb_window_t      src_window  /**< */,
-                          xcb_window_t      dst_window  /**< */,
-                          int16_t           src_x  /**< */,
-                          int16_t           src_y  /**< */,
-                          uint16_t          src_width  /**< */,
-                          uint16_t          src_height  /**< */,
-                          int16_t           dst_x  /**< */,
-                          int16_t           dst_y  /**< */);
-
-/**
- * @brief move mouse pointer
- *
- * @param c The connection
- * @param src_window If \a src_window is not `XCB_NONE` (TODO), the move will only take place if the
- * pointer is inside \a src_window and within the rectangle specified by (\a src_x,
- * \a src_y, \a src_width, \a src_height). The rectangle coordinates are relative to
- * \a src_window.
- * @param dst_window If \a dst_window is not `XCB_NONE` (TODO), the pointer will be moved to the
- * offsets (\a dst_x, \a dst_y) relative to \a dst_window. If \a dst_window is
- * `XCB_NONE` (TODO), the pointer will be moved by the offsets (\a dst_x, \a dst_y)
- * relative to the current position of the pointer.
- * @return A cookie
- *
- * Moves the mouse pointer to the specified position.
- * 
- * If \a src_window is not `XCB_NONE` (TODO), the move will only take place if the
- * pointer is inside \a src_window and within the rectangle specified by (\a src_x,
- * \a src_y, \a src_width, \a src_height). The rectangle coordinates are relative to
- * \a src_window.
- * 
- * If \a dst_window is not `XCB_NONE` (TODO), the pointer will be moved to the
- * offsets (\a dst_x, \a dst_y) relative to \a dst_window. If \a dst_window is
- * `XCB_NONE` (TODO), the pointer will be moved by the offsets (\a dst_x, \a dst_y)
- * relative to the current position of the pointer.
- *
- */
-xcb_void_cookie_t
-xcb_warp_pointer (xcb_connection_t *c  /**< */,
-                  xcb_window_t      src_window  /**< */,
-                  xcb_window_t      dst_window  /**< */,
-                  int16_t           src_x  /**< */,
-                  int16_t           src_y  /**< */,
-                  uint16_t          src_width  /**< */,
-                  uint16_t          src_height  /**< */,
-                  int16_t           dst_x  /**< */,
-                  int16_t           dst_y  /**< */);
-
-/**
- * @brief Sets input focus
- *
- * @param c The connection
- * @param revert_to A bitmask of #xcb_input_focus_t values.
- * @param revert_to Specifies what happens when the \a focus window becomes unviewable (if \a focus
- * is neither `XCB_NONE` nor `XCB_POINTER_ROOT`).
- * @param focus The window to focus. All keyboard events will be reported to this window. The
- * window must be viewable (TODO), or a `xcb_match_error_t` occurs (TODO).
- * \n
- * If \a focus is `XCB_NONE` (TODO), all keyboard events are
- * discarded until a new focus window is set.
- * \n
- * If \a focus is `XCB_POINTER_ROOT` (TODO), focus is on the root window of the
- * screen on which the pointer is on currently.
- * @param time Timestamp to avoid race conditions when running X over the network.
- * \n
- * The special value `XCB_CURRENT_TIME` will be replaced with the current server
- * time.
- * @return A cookie
- *
- * Changes the input focus and the last-focus-change time. If the specified \a time
- * is earlier than the current last-focus-change time, the request is ignored (to
- * avoid race conditions when running X over the network).
- * 
- * A FocusIn and FocusOut event is generated when focus is changed.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_set_input_focus_checked (xcb_connection_t *c  /**< */,
-                             uint8_t           revert_to  /**< */,
-                             xcb_window_t      focus  /**< */,
-                             xcb_timestamp_t   time  /**< */);
-
-/**
- * @brief Sets input focus
- *
- * @param c The connection
- * @param revert_to A bitmask of #xcb_input_focus_t values.
- * @param revert_to Specifies what happens when the \a focus window becomes unviewable (if \a focus
- * is neither `XCB_NONE` nor `XCB_POINTER_ROOT`).
- * @param focus The window to focus. All keyboard events will be reported to this window. The
- * window must be viewable (TODO), or a `xcb_match_error_t` occurs (TODO).
- * \n
- * If \a focus is `XCB_NONE` (TODO), all keyboard events are
- * discarded until a new focus window is set.
- * \n
- * If \a focus is `XCB_POINTER_ROOT` (TODO), focus is on the root window of the
- * screen on which the pointer is on currently.
- * @param time Timestamp to avoid race conditions when running X over the network.
- * \n
- * The special value `XCB_CURRENT_TIME` will be replaced with the current server
- * time.
- * @return A cookie
- *
- * Changes the input focus and the last-focus-change time. If the specified \a time
- * is earlier than the current last-focus-change time, the request is ignored (to
- * avoid race conditions when running X over the network).
- * 
- * A FocusIn and FocusOut event is generated when focus is changed.
- *
- */
-xcb_void_cookie_t
-xcb_set_input_focus (xcb_connection_t *c  /**< */,
-                     uint8_t           revert_to  /**< */,
-                     xcb_window_t      focus  /**< */,
-                     xcb_timestamp_t   time  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_input_focus_cookie_t
-xcb_get_input_focus (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_input_focus_cookie_t
-xcb_get_input_focus_unchecked (xcb_connection_t *c  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_input_focus_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_input_focus_reply_t *
-xcb_get_input_focus_reply (xcb_connection_t              *c  /**< */,
-                           xcb_get_input_focus_cookie_t   cookie  /**< */,
-                           xcb_generic_error_t          **e  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_query_keymap_cookie_t
-xcb_query_keymap (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_query_keymap_cookie_t
-xcb_query_keymap_unchecked (xcb_connection_t *c  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_query_keymap_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_query_keymap_reply_t *
-xcb_query_keymap_reply (xcb_connection_t           *c  /**< */,
-                        xcb_query_keymap_cookie_t   cookie  /**< */,
-                        xcb_generic_error_t       **e  /**< */);
-
-int
-xcb_open_font_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief opens a font
- *
- * @param c The connection
- * @param fid The ID with which you will refer to the font, created by `xcb_generate_id`.
- * @param name_len Length (in bytes) of \a name.
- * @param name A pattern describing an X core font.
- * @return A cookie
- *
- * Opens any X core font matching the given \a name (for example "-misc-fixed-*").
- * 
- * Note that X core fonts are deprecated (but still supported) in favor of
- * client-side rendering using Xft.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_open_font_checked (xcb_connection_t *c  /**< */,
-                       xcb_font_t        fid  /**< */,
-                       uint16_t          name_len  /**< */,
-                       const char       *name  /**< */);
-
-/**
- * @brief opens a font
- *
- * @param c The connection
- * @param fid The ID with which you will refer to the font, created by `xcb_generate_id`.
- * @param name_len Length (in bytes) of \a name.
- * @param name A pattern describing an X core font.
- * @return A cookie
- *
- * Opens any X core font matching the given \a name (for example "-misc-fixed-*").
- * 
- * Note that X core fonts are deprecated (but still supported) in favor of
- * client-side rendering using Xft.
- *
- */
-xcb_void_cookie_t
-xcb_open_font (xcb_connection_t *c  /**< */,
-               xcb_font_t        fid  /**< */,
-               uint16_t          name_len  /**< */,
-               const char       *name  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_close_font_checked (xcb_connection_t *c  /**< */,
-                        xcb_font_t        font  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_close_font (xcb_connection_t *c  /**< */,
-                xcb_font_t        font  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_fontprop_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_fontprop_t)
- */
-void
-xcb_fontprop_next (xcb_fontprop_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_fontprop_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_fontprop_end (xcb_fontprop_iterator_t i  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_charinfo_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_charinfo_t)
- */
-void
-xcb_charinfo_next (xcb_charinfo_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_charinfo_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_charinfo_end (xcb_charinfo_iterator_t i  /**< */);
-
-int
-xcb_query_font_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief query font metrics
- *
- * @param c The connection
- * @param font The fontable (Font or Graphics Context) to query.
- * @return A cookie
- *
- * Queries information associated with the font.
- *
- */
-xcb_query_font_cookie_t
-xcb_query_font (xcb_connection_t *c  /**< */,
-                xcb_fontable_t    font  /**< */);
-
-/**
- * @brief query font metrics
- *
- * @param c The connection
- * @param font The fontable (Font or Graphics Context) to query.
- * @return A cookie
- *
- * Queries information associated with the font.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_query_font_cookie_t
-xcb_query_font_unchecked (xcb_connection_t *c  /**< */,
-                          xcb_fontable_t    font  /**< */);
-
-xcb_fontprop_t *
-xcb_query_font_properties (const xcb_query_font_reply_t *R  /**< */);
-
-int
-xcb_query_font_properties_length (const xcb_query_font_reply_t *R  /**< */);
-
-xcb_fontprop_iterator_t
-xcb_query_font_properties_iterator (const xcb_query_font_reply_t *R  /**< */);
-
-xcb_charinfo_t *
-xcb_query_font_char_infos (const xcb_query_font_reply_t *R  /**< */);
-
-int
-xcb_query_font_char_infos_length (const xcb_query_font_reply_t *R  /**< */);
-
-xcb_charinfo_iterator_t
-xcb_query_font_char_infos_iterator (const xcb_query_font_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_query_font_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_query_font_reply_t *
-xcb_query_font_reply (xcb_connection_t         *c  /**< */,
-                      xcb_query_font_cookie_t   cookie  /**< */,
-                      xcb_generic_error_t     **e  /**< */);
-
-int
-xcb_query_text_extents_sizeof (const void  *_buffer  /**< */,
-                               uint32_t     string_len  /**< */);
-
-/**
- * @brief get text extents
- *
- * @param c The connection
- * @param font The \a font to calculate text extents in. You can also pass a graphics context.
- * @param string_len The number of characters in \a string.
- * @param string The text to get text extents for.
- * @return A cookie
- *
- * Query text extents from the X11 server. This request returns the bounding box
- * of the specified 16-bit character string in the specified \a font or the font
- * contained in the specified graphics context.
- * 
- * `font_ascent` is set to the maximum of the ascent metrics of all characters in
- * the string. `font_descent` is set to the maximum of the descent metrics.
- * `overall_width` is set to the sum of the character-width metrics of all
- * characters in the string. For each character in the string, let W be the sum of
- * the character-width metrics of all characters preceding it in the string. Let L
- * be the left-side-bearing metric of the character plus W. Let R be the
- * right-side-bearing metric of the character plus W. The lbearing member is set
- * to the minimum L of all characters in the string. The rbearing member is set to
- * the maximum R.
- * 
- * For fonts defined with linear indexing rather than 2-byte matrix indexing, each
- * `xcb_char2b_t` structure is interpreted as a 16-bit number with byte1 as the
- * most significant byte. If the font has no defined default character, undefined
- * characters in the string are taken to have all zero metrics.
- * 
- * Characters with all zero metrics are ignored. If the font has no defined
- * default_char, the undefined characters in the string are also ignored.
- *
- */
-xcb_query_text_extents_cookie_t
-xcb_query_text_extents (xcb_connection_t   *c  /**< */,
-                        xcb_fontable_t      font  /**< */,
-                        uint32_t            string_len  /**< */,
-                        const xcb_char2b_t *string  /**< */);
-
-/**
- * @brief get text extents
- *
- * @param c The connection
- * @param font The \a font to calculate text extents in. You can also pass a graphics context.
- * @param string_len The number of characters in \a string.
- * @param string The text to get text extents for.
- * @return A cookie
- *
- * Query text extents from the X11 server. This request returns the bounding box
- * of the specified 16-bit character string in the specified \a font or the font
- * contained in the specified graphics context.
- * 
- * `font_ascent` is set to the maximum of the ascent metrics of all characters in
- * the string. `font_descent` is set to the maximum of the descent metrics.
- * `overall_width` is set to the sum of the character-width metrics of all
- * characters in the string. For each character in the string, let W be the sum of
- * the character-width metrics of all characters preceding it in the string. Let L
- * be the left-side-bearing metric of the character plus W. Let R be the
- * right-side-bearing metric of the character plus W. The lbearing member is set
- * to the minimum L of all characters in the string. The rbearing member is set to
- * the maximum R.
- * 
- * For fonts defined with linear indexing rather than 2-byte matrix indexing, each
- * `xcb_char2b_t` structure is interpreted as a 16-bit number with byte1 as the
- * most significant byte. If the font has no defined default character, undefined
- * characters in the string are taken to have all zero metrics.
- * 
- * Characters with all zero metrics are ignored. If the font has no defined
- * default_char, the undefined characters in the string are also ignored.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_query_text_extents_cookie_t
-xcb_query_text_extents_unchecked (xcb_connection_t   *c  /**< */,
-                                  xcb_fontable_t      font  /**< */,
-                                  uint32_t            string_len  /**< */,
-                                  const xcb_char2b_t *string  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_query_text_extents_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_query_text_extents_reply_t *
-xcb_query_text_extents_reply (xcb_connection_t                 *c  /**< */,
-                              xcb_query_text_extents_cookie_t   cookie  /**< */,
-                              xcb_generic_error_t             **e  /**< */);
-
-int
-xcb_str_sizeof (const void  *_buffer  /**< */);
-
-char *
-xcb_str_name (const xcb_str_t *R  /**< */);
-
-int
-xcb_str_name_length (const xcb_str_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_str_name_end (const xcb_str_t *R  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_str_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_str_t)
- */
-void
-xcb_str_next (xcb_str_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_str_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_str_end (xcb_str_iterator_t i  /**< */);
-
-int
-xcb_list_fonts_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief get matching font names
- *
- * @param c The connection
- * @param max_names The maximum number of fonts to be returned.
- * @param pattern_len The length (in bytes) of \a pattern.
- * @param pattern A font pattern, for example "-misc-fixed-*".
- * \n
- * The asterisk (*) is a wildcard for any number of characters. The question mark
- * (?) is a wildcard for a single character. Use of uppercase or lowercase does
- * not matter.
- * @return A cookie
- *
- * Gets a list of available font names which match the given \a pattern.
- *
- */
-xcb_list_fonts_cookie_t
-xcb_list_fonts (xcb_connection_t *c  /**< */,
-                uint16_t          max_names  /**< */,
-                uint16_t          pattern_len  /**< */,
-                const char       *pattern  /**< */);
-
-/**
- * @brief get matching font names
- *
- * @param c The connection
- * @param max_names The maximum number of fonts to be returned.
- * @param pattern_len The length (in bytes) of \a pattern.
- * @param pattern A font pattern, for example "-misc-fixed-*".
- * \n
- * The asterisk (*) is a wildcard for any number of characters. The question mark
- * (?) is a wildcard for a single character. Use of uppercase or lowercase does
- * not matter.
- * @return A cookie
- *
- * Gets a list of available font names which match the given \a pattern.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_list_fonts_cookie_t
-xcb_list_fonts_unchecked (xcb_connection_t *c  /**< */,
-                          uint16_t          max_names  /**< */,
-                          uint16_t          pattern_len  /**< */,
-                          const char       *pattern  /**< */);
-
-int
-xcb_list_fonts_names_length (const xcb_list_fonts_reply_t *R  /**< */);
-
-xcb_str_iterator_t
-xcb_list_fonts_names_iterator (const xcb_list_fonts_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_list_fonts_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_list_fonts_reply_t *
-xcb_list_fonts_reply (xcb_connection_t         *c  /**< */,
-                      xcb_list_fonts_cookie_t   cookie  /**< */,
-                      xcb_generic_error_t     **e  /**< */);
-
-int
-xcb_list_fonts_with_info_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief get matching font names and information
- *
- * @param c The connection
- * @param max_names The maximum number of fonts to be returned.
- * @param pattern_len The length (in bytes) of \a pattern.
- * @param pattern A font pattern, for example "-misc-fixed-*".
- * \n
- * The asterisk (*) is a wildcard for any number of characters. The question mark
- * (?) is a wildcard for a single character. Use of uppercase or lowercase does
- * not matter.
- * @return A cookie
- *
- * Gets a list of available font names which match the given \a pattern.
- *
- */
-xcb_list_fonts_with_info_cookie_t
-xcb_list_fonts_with_info (xcb_connection_t *c  /**< */,
-                          uint16_t          max_names  /**< */,
-                          uint16_t          pattern_len  /**< */,
-                          const char       *pattern  /**< */);
-
-/**
- * @brief get matching font names and information
- *
- * @param c The connection
- * @param max_names The maximum number of fonts to be returned.
- * @param pattern_len The length (in bytes) of \a pattern.
- * @param pattern A font pattern, for example "-misc-fixed-*".
- * \n
- * The asterisk (*) is a wildcard for any number of characters. The question mark
- * (?) is a wildcard for a single character. Use of uppercase or lowercase does
- * not matter.
- * @return A cookie
- *
- * Gets a list of available font names which match the given \a pattern.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_list_fonts_with_info_cookie_t
-xcb_list_fonts_with_info_unchecked (xcb_connection_t *c  /**< */,
-                                    uint16_t          max_names  /**< */,
-                                    uint16_t          pattern_len  /**< */,
-                                    const char       *pattern  /**< */);
-
-xcb_fontprop_t *
-xcb_list_fonts_with_info_properties (const xcb_list_fonts_with_info_reply_t *R  /**< */);
-
-int
-xcb_list_fonts_with_info_properties_length (const xcb_list_fonts_with_info_reply_t *R  /**< */);
-
-xcb_fontprop_iterator_t
-xcb_list_fonts_with_info_properties_iterator (const xcb_list_fonts_with_info_reply_t *R  /**< */);
-
-char *
-xcb_list_fonts_with_info_name (const xcb_list_fonts_with_info_reply_t *R  /**< */);
-
-int
-xcb_list_fonts_with_info_name_length (const xcb_list_fonts_with_info_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_list_fonts_with_info_name_end (const xcb_list_fonts_with_info_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_list_fonts_with_info_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_list_fonts_with_info_reply_t *
-xcb_list_fonts_with_info_reply (xcb_connection_t                   *c  /**< */,
-                                xcb_list_fonts_with_info_cookie_t   cookie  /**< */,
-                                xcb_generic_error_t               **e  /**< */);
-
-int
-xcb_set_font_path_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_set_font_path_checked (xcb_connection_t *c  /**< */,
-                           uint16_t          font_qty  /**< */,
-                           const xcb_str_t  *font  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_set_font_path (xcb_connection_t *c  /**< */,
-                   uint16_t          font_qty  /**< */,
-                   const xcb_str_t  *font  /**< */);
-
-int
-xcb_get_font_path_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_font_path_cookie_t
-xcb_get_font_path (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_font_path_cookie_t
-xcb_get_font_path_unchecked (xcb_connection_t *c  /**< */);
-
-int
-xcb_get_font_path_path_length (const xcb_get_font_path_reply_t *R  /**< */);
-
-xcb_str_iterator_t
-xcb_get_font_path_path_iterator (const xcb_get_font_path_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_font_path_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_font_path_reply_t *
-xcb_get_font_path_reply (xcb_connection_t            *c  /**< */,
-                         xcb_get_font_path_cookie_t   cookie  /**< */,
-                         xcb_generic_error_t        **e  /**< */);
-
-/**
- * @brief Creates a pixmap
- *
- * @param c The connection
- * @param depth TODO
- * @param pid The ID with which you will refer to the new pixmap, created by
- * `xcb_generate_id`.
- * @param drawable Drawable to get the screen from.
- * @param width The width of the new pixmap.
- * @param height The height of the new pixmap.
- * @return A cookie
- *
- * Creates a pixmap. The pixmap can only be used on the same screen as \a drawable
- * is on and only with drawables of the same \a depth.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_create_pixmap_checked (xcb_connection_t *c  /**< */,
-                           uint8_t           depth  /**< */,
-                           xcb_pixmap_t      pid  /**< */,
-                           xcb_drawable_t    drawable  /**< */,
-                           uint16_t          width  /**< */,
-                           uint16_t          height  /**< */);
-
-/**
- * @brief Creates a pixmap
- *
- * @param c The connection
- * @param depth TODO
- * @param pid The ID with which you will refer to the new pixmap, created by
- * `xcb_generate_id`.
- * @param drawable Drawable to get the screen from.
- * @param width The width of the new pixmap.
- * @param height The height of the new pixmap.
- * @return A cookie
- *
- * Creates a pixmap. The pixmap can only be used on the same screen as \a drawable
- * is on and only with drawables of the same \a depth.
- *
- */
-xcb_void_cookie_t
-xcb_create_pixmap (xcb_connection_t *c  /**< */,
-                   uint8_t           depth  /**< */,
-                   xcb_pixmap_t      pid  /**< */,
-                   xcb_drawable_t    drawable  /**< */,
-                   uint16_t          width  /**< */,
-                   uint16_t          height  /**< */);
-
-/**
- * @brief Destroys a pixmap
- *
- * @param c The connection
- * @param pixmap The pixmap to destroy.
- * @return A cookie
- *
- * Deletes the association between the pixmap ID and the pixmap. The pixmap
- * storage will be freed when there are no more references to it.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_free_pixmap_checked (xcb_connection_t *c  /**< */,
-                         xcb_pixmap_t      pixmap  /**< */);
-
-/**
- * @brief Destroys a pixmap
- *
- * @param c The connection
- * @param pixmap The pixmap to destroy.
- * @return A cookie
- *
- * Deletes the association between the pixmap ID and the pixmap. The pixmap
- * storage will be freed when there are no more references to it.
- *
- */
-xcb_void_cookie_t
-xcb_free_pixmap (xcb_connection_t *c  /**< */,
-                 xcb_pixmap_t      pixmap  /**< */);
-
-int
-xcb_create_gc_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief Creates a graphics context
- *
- * @param c The connection
- * @param cid The ID with which you will refer to the graphics context, created by
- * `xcb_generate_id`.
- * @param drawable Drawable to get the root/depth from.
- * @return A cookie
- *
- * Creates a graphics context. The graphics context can be used with any drawable
- * that has the same root and depth as the specified drawable.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_create_gc_checked (xcb_connection_t *c  /**< */,
-                       xcb_gcontext_t    cid  /**< */,
-                       xcb_drawable_t    drawable  /**< */,
-                       uint32_t          value_mask  /**< */,
-                       const uint32_t   *value_list  /**< */);
-
-/**
- * @brief Creates a graphics context
- *
- * @param c The connection
- * @param cid The ID with which you will refer to the graphics context, created by
- * `xcb_generate_id`.
- * @param drawable Drawable to get the root/depth from.
- * @return A cookie
- *
- * Creates a graphics context. The graphics context can be used with any drawable
- * that has the same root and depth as the specified drawable.
- *
- */
-xcb_void_cookie_t
-xcb_create_gc (xcb_connection_t *c  /**< */,
-               xcb_gcontext_t    cid  /**< */,
-               xcb_drawable_t    drawable  /**< */,
-               uint32_t          value_mask  /**< */,
-               const uint32_t   *value_list  /**< */);
-
-int
-xcb_change_gc_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief change graphics context components
- *
- * @param c The connection
- * @param gc The graphics context to change.
- * @param value_mask A bitmask of #xcb_gc_t values.
- * @param value_mask \n
- * @param value_list Values for each of the components specified in the bitmask \a value_mask. The
- * order has to correspond to the order of possible \a value_mask bits. See the
- * example.
- * @return A cookie
- *
- * Changes the components specified by \a value_mask for the specified graphics context.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_change_gc_checked (xcb_connection_t *c  /**< */,
-                       xcb_gcontext_t    gc  /**< */,
-                       uint32_t          value_mask  /**< */,
-                       const uint32_t   *value_list  /**< */);
-
-/**
- * @brief change graphics context components
- *
- * @param c The connection
- * @param gc The graphics context to change.
- * @param value_mask A bitmask of #xcb_gc_t values.
- * @param value_mask \n
- * @param value_list Values for each of the components specified in the bitmask \a value_mask. The
- * order has to correspond to the order of possible \a value_mask bits. See the
- * example.
- * @return A cookie
- *
- * Changes the components specified by \a value_mask for the specified graphics context.
- *
- */
-xcb_void_cookie_t
-xcb_change_gc (xcb_connection_t *c  /**< */,
-               xcb_gcontext_t    gc  /**< */,
-               uint32_t          value_mask  /**< */,
-               const uint32_t   *value_list  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_copy_gc_checked (xcb_connection_t *c  /**< */,
-                     xcb_gcontext_t    src_gc  /**< */,
-                     xcb_gcontext_t    dst_gc  /**< */,
-                     uint32_t          value_mask  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_copy_gc (xcb_connection_t *c  /**< */,
-             xcb_gcontext_t    src_gc  /**< */,
-             xcb_gcontext_t    dst_gc  /**< */,
-             uint32_t          value_mask  /**< */);
-
-int
-xcb_set_dashes_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_set_dashes_checked (xcb_connection_t *c  /**< */,
-                        xcb_gcontext_t    gc  /**< */,
-                        uint16_t          dash_offset  /**< */,
-                        uint16_t          dashes_len  /**< */,
-                        const uint8_t    *dashes  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_set_dashes (xcb_connection_t *c  /**< */,
-                xcb_gcontext_t    gc  /**< */,
-                uint16_t          dash_offset  /**< */,
-                uint16_t          dashes_len  /**< */,
-                const uint8_t    *dashes  /**< */);
-
-int
-xcb_set_clip_rectangles_sizeof (const void  *_buffer  /**< */,
-                                uint32_t     rectangles_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_set_clip_rectangles_checked (xcb_connection_t      *c  /**< */,
-                                 uint8_t                ordering  /**< */,
-                                 xcb_gcontext_t         gc  /**< */,
-                                 int16_t                clip_x_origin  /**< */,
-                                 int16_t                clip_y_origin  /**< */,
-                                 uint32_t               rectangles_len  /**< */,
-                                 const xcb_rectangle_t *rectangles  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_set_clip_rectangles (xcb_connection_t      *c  /**< */,
-                         uint8_t                ordering  /**< */,
-                         xcb_gcontext_t         gc  /**< */,
-                         int16_t                clip_x_origin  /**< */,
-                         int16_t                clip_y_origin  /**< */,
-                         uint32_t               rectangles_len  /**< */,
-                         const xcb_rectangle_t *rectangles  /**< */);
-
-/**
- * @brief Destroys a graphics context
- *
- * @param c The connection
- * @param gc The graphics context to destroy.
- * @return A cookie
- *
- * Destroys the specified \a gc and all associated storage.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_free_gc_checked (xcb_connection_t *c  /**< */,
-                     xcb_gcontext_t    gc  /**< */);
-
-/**
- * @brief Destroys a graphics context
- *
- * @param c The connection
- * @param gc The graphics context to destroy.
- * @return A cookie
- *
- * Destroys the specified \a gc and all associated storage.
- *
- */
-xcb_void_cookie_t
-xcb_free_gc (xcb_connection_t *c  /**< */,
-             xcb_gcontext_t    gc  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_clear_area_checked (xcb_connection_t *c  /**< */,
-                        uint8_t           exposures  /**< */,
-                        xcb_window_t      window  /**< */,
-                        int16_t           x  /**< */,
-                        int16_t           y  /**< */,
-                        uint16_t          width  /**< */,
-                        uint16_t          height  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_clear_area (xcb_connection_t *c  /**< */,
-                uint8_t           exposures  /**< */,
-                xcb_window_t      window  /**< */,
-                int16_t           x  /**< */,
-                int16_t           y  /**< */,
-                uint16_t          width  /**< */,
-                uint16_t          height  /**< */);
-
-/**
- * @brief copy areas
- *
- * @param c The connection
- * @param src_drawable The source drawable (Window or Pixmap).
- * @param dst_drawable The destination drawable (Window or Pixmap).
- * @param gc The graphics context to use.
- * @param src_x The source X coordinate.
- * @param src_y The source Y coordinate.
- * @param dst_x The destination X coordinate.
- * @param dst_y The destination Y coordinate.
- * @param width The width of the area to copy (in pixels).
- * @param height The height of the area to copy (in pixels).
- * @return A cookie
- *
- * Copies the specified rectangle from \a src_drawable to \a dst_drawable.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_copy_area_checked (xcb_connection_t *c  /**< */,
-                       xcb_drawable_t    src_drawable  /**< */,
-                       xcb_drawable_t    dst_drawable  /**< */,
-                       xcb_gcontext_t    gc  /**< */,
-                       int16_t           src_x  /**< */,
-                       int16_t           src_y  /**< */,
-                       int16_t           dst_x  /**< */,
-                       int16_t           dst_y  /**< */,
-                       uint16_t          width  /**< */,
-                       uint16_t          height  /**< */);
-
-/**
- * @brief copy areas
- *
- * @param c The connection
- * @param src_drawable The source drawable (Window or Pixmap).
- * @param dst_drawable The destination drawable (Window or Pixmap).
- * @param gc The graphics context to use.
- * @param src_x The source X coordinate.
- * @param src_y The source Y coordinate.
- * @param dst_x The destination X coordinate.
- * @param dst_y The destination Y coordinate.
- * @param width The width of the area to copy (in pixels).
- * @param height The height of the area to copy (in pixels).
- * @return A cookie
- *
- * Copies the specified rectangle from \a src_drawable to \a dst_drawable.
- *
- */
-xcb_void_cookie_t
-xcb_copy_area (xcb_connection_t *c  /**< */,
-               xcb_drawable_t    src_drawable  /**< */,
-               xcb_drawable_t    dst_drawable  /**< */,
-               xcb_gcontext_t    gc  /**< */,
-               int16_t           src_x  /**< */,
-               int16_t           src_y  /**< */,
-               int16_t           dst_x  /**< */,
-               int16_t           dst_y  /**< */,
-               uint16_t          width  /**< */,
-               uint16_t          height  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_copy_plane_checked (xcb_connection_t *c  /**< */,
-                        xcb_drawable_t    src_drawable  /**< */,
-                        xcb_drawable_t    dst_drawable  /**< */,
-                        xcb_gcontext_t    gc  /**< */,
-                        int16_t           src_x  /**< */,
-                        int16_t           src_y  /**< */,
-                        int16_t           dst_x  /**< */,
-                        int16_t           dst_y  /**< */,
-                        uint16_t          width  /**< */,
-                        uint16_t          height  /**< */,
-                        uint32_t          bit_plane  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_copy_plane (xcb_connection_t *c  /**< */,
-                xcb_drawable_t    src_drawable  /**< */,
-                xcb_drawable_t    dst_drawable  /**< */,
-                xcb_gcontext_t    gc  /**< */,
-                int16_t           src_x  /**< */,
-                int16_t           src_y  /**< */,
-                int16_t           dst_x  /**< */,
-                int16_t           dst_y  /**< */,
-                uint16_t          width  /**< */,
-                uint16_t          height  /**< */,
-                uint32_t          bit_plane  /**< */);
-
-int
-xcb_poly_point_sizeof (const void  *_buffer  /**< */,
-                       uint32_t     points_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_poly_point_checked (xcb_connection_t  *c  /**< */,
-                        uint8_t            coordinate_mode  /**< */,
-                        xcb_drawable_t     drawable  /**< */,
-                        xcb_gcontext_t     gc  /**< */,
-                        uint32_t           points_len  /**< */,
-                        const xcb_point_t *points  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_poly_point (xcb_connection_t  *c  /**< */,
-                uint8_t            coordinate_mode  /**< */,
-                xcb_drawable_t     drawable  /**< */,
-                xcb_gcontext_t     gc  /**< */,
-                uint32_t           points_len  /**< */,
-                const xcb_point_t *points  /**< */);
-
-int
-xcb_poly_line_sizeof (const void  *_buffer  /**< */,
-                      uint32_t     points_len  /**< */);
-
-/**
- * @brief draw lines
- *
- * @param c The connection
- * @param coordinate_mode A bitmask of #xcb_coord_mode_t values.
- * @param coordinate_mode \n
- * @param drawable The drawable to draw the line(s) on.
- * @param gc The graphics context to use.
- * @param points_len The number of `xcb_point_t` structures in \a points.
- * @param points An array of points.
- * @return A cookie
- *
- * Draws \a points_len-1 lines between each pair of points (point[i], point[i+1])
- * in the \a points array. The lines are drawn in the order listed in the array.
- * They join correctly at all intermediate points, and if the first and last
- * points coincide, the first and last lines also join correctly. For any given
- * line, a pixel is not drawn more than once. If thin (zero line-width) lines
- * intersect, the intersecting pixels are drawn multiple times. If wide lines
- * intersect, the intersecting pixels are drawn only once, as though the entire
- * request were a single, filled shape.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_poly_line_checked (xcb_connection_t  *c  /**< */,
-                       uint8_t            coordinate_mode  /**< */,
-                       xcb_drawable_t     drawable  /**< */,
-                       xcb_gcontext_t     gc  /**< */,
-                       uint32_t           points_len  /**< */,
-                       const xcb_point_t *points  /**< */);
-
-/**
- * @brief draw lines
- *
- * @param c The connection
- * @param coordinate_mode A bitmask of #xcb_coord_mode_t values.
- * @param coordinate_mode \n
- * @param drawable The drawable to draw the line(s) on.
- * @param gc The graphics context to use.
- * @param points_len The number of `xcb_point_t` structures in \a points.
- * @param points An array of points.
- * @return A cookie
- *
- * Draws \a points_len-1 lines between each pair of points (point[i], point[i+1])
- * in the \a points array. The lines are drawn in the order listed in the array.
- * They join correctly at all intermediate points, and if the first and last
- * points coincide, the first and last lines also join correctly. For any given
- * line, a pixel is not drawn more than once. If thin (zero line-width) lines
- * intersect, the intersecting pixels are drawn multiple times. If wide lines
- * intersect, the intersecting pixels are drawn only once, as though the entire
- * request were a single, filled shape.
- *
- */
-xcb_void_cookie_t
-xcb_poly_line (xcb_connection_t  *c  /**< */,
-               uint8_t            coordinate_mode  /**< */,
-               xcb_drawable_t     drawable  /**< */,
-               xcb_gcontext_t     gc  /**< */,
-               uint32_t           points_len  /**< */,
-               const xcb_point_t *points  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_segment_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_segment_t)
- */
-void
-xcb_segment_next (xcb_segment_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_segment_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_segment_end (xcb_segment_iterator_t i  /**< */);
-
-int
-xcb_poly_segment_sizeof (const void  *_buffer  /**< */,
-                         uint32_t     segments_len  /**< */);
-
-/**
- * @brief draw lines
- *
- * @param c The connection
- * @param drawable A drawable (Window or Pixmap) to draw on.
- * @param gc The graphics context to use.
- * \n
- * TODO: document which attributes of a gc are used
- * @param segments_len The number of `xcb_segment_t` structures in \a segments.
- * @param segments An array of `xcb_segment_t` structures.
- * @return A cookie
- *
- * Draws multiple, unconnected lines. For each segment, a line is drawn between
- * (x1, y1) and (x2, y2). The lines are drawn in the order listed in the array of
- * `xcb_segment_t` structures and does not perform joining at coincident
- * endpoints. For any given line, a pixel is not drawn more than once. If lines
- * intersect, the intersecting pixels are drawn multiple times.
- * 
- * TODO: include the xcb_segment_t data structure
- * 
- * TODO: an example
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_poly_segment_checked (xcb_connection_t    *c  /**< */,
-                          xcb_drawable_t       drawable  /**< */,
-                          xcb_gcontext_t       gc  /**< */,
-                          uint32_t             segments_len  /**< */,
-                          const xcb_segment_t *segments  /**< */);
-
-/**
- * @brief draw lines
- *
- * @param c The connection
- * @param drawable A drawable (Window or Pixmap) to draw on.
- * @param gc The graphics context to use.
- * \n
- * TODO: document which attributes of a gc are used
- * @param segments_len The number of `xcb_segment_t` structures in \a segments.
- * @param segments An array of `xcb_segment_t` structures.
- * @return A cookie
- *
- * Draws multiple, unconnected lines. For each segment, a line is drawn between
- * (x1, y1) and (x2, y2). The lines are drawn in the order listed in the array of
- * `xcb_segment_t` structures and does not perform joining at coincident
- * endpoints. For any given line, a pixel is not drawn more than once. If lines
- * intersect, the intersecting pixels are drawn multiple times.
- * 
- * TODO: include the xcb_segment_t data structure
- * 
- * TODO: an example
- *
- */
-xcb_void_cookie_t
-xcb_poly_segment (xcb_connection_t    *c  /**< */,
-                  xcb_drawable_t       drawable  /**< */,
-                  xcb_gcontext_t       gc  /**< */,
-                  uint32_t             segments_len  /**< */,
-                  const xcb_segment_t *segments  /**< */);
-
-int
-xcb_poly_rectangle_sizeof (const void  *_buffer  /**< */,
-                           uint32_t     rectangles_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_poly_rectangle_checked (xcb_connection_t      *c  /**< */,
-                            xcb_drawable_t         drawable  /**< */,
-                            xcb_gcontext_t         gc  /**< */,
-                            uint32_t               rectangles_len  /**< */,
-                            const xcb_rectangle_t *rectangles  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_poly_rectangle (xcb_connection_t      *c  /**< */,
-                    xcb_drawable_t         drawable  /**< */,
-                    xcb_gcontext_t         gc  /**< */,
-                    uint32_t               rectangles_len  /**< */,
-                    const xcb_rectangle_t *rectangles  /**< */);
-
-int
-xcb_poly_arc_sizeof (const void  *_buffer  /**< */,
-                     uint32_t     arcs_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_poly_arc_checked (xcb_connection_t *c  /**< */,
-                      xcb_drawable_t    drawable  /**< */,
-                      xcb_gcontext_t    gc  /**< */,
-                      uint32_t          arcs_len  /**< */,
-                      const xcb_arc_t  *arcs  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_poly_arc (xcb_connection_t *c  /**< */,
-              xcb_drawable_t    drawable  /**< */,
-              xcb_gcontext_t    gc  /**< */,
-              uint32_t          arcs_len  /**< */,
-              const xcb_arc_t  *arcs  /**< */);
-
-int
-xcb_fill_poly_sizeof (const void  *_buffer  /**< */,
-                      uint32_t     points_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_fill_poly_checked (xcb_connection_t  *c  /**< */,
-                       xcb_drawable_t     drawable  /**< */,
-                       xcb_gcontext_t     gc  /**< */,
-                       uint8_t            shape  /**< */,
-                       uint8_t            coordinate_mode  /**< */,
-                       uint32_t           points_len  /**< */,
-                       const xcb_point_t *points  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_fill_poly (xcb_connection_t  *c  /**< */,
-               xcb_drawable_t     drawable  /**< */,
-               xcb_gcontext_t     gc  /**< */,
-               uint8_t            shape  /**< */,
-               uint8_t            coordinate_mode  /**< */,
-               uint32_t           points_len  /**< */,
-               const xcb_point_t *points  /**< */);
-
-int
-xcb_poly_fill_rectangle_sizeof (const void  *_buffer  /**< */,
-                                uint32_t     rectangles_len  /**< */);
-
-/**
- * @brief Fills rectangles
- *
- * @param c The connection
- * @param drawable The drawable (Window or Pixmap) to draw on.
- * @param gc The graphics context to use.
- * \n
- * The following graphics context components are used: function, plane-mask,
- * fill-style, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
- * \n
- * The following graphics context mode-dependent components are used:
- * foreground, background, tile, stipple, tile-stipple-x-origin, and
- * tile-stipple-y-origin.
- * @param rectangles_len The number of `xcb_rectangle_t` structures in \a rectangles.
- * @param rectangles The rectangles to fill.
- * @return A cookie
- *
- * Fills the specified rectangle(s) in the order listed in the array. For any
- * given rectangle, each pixel is not drawn more than once. If rectangles
- * intersect, the intersecting pixels are drawn multiple times.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_poly_fill_rectangle_checked (xcb_connection_t      *c  /**< */,
-                                 xcb_drawable_t         drawable  /**< */,
-                                 xcb_gcontext_t         gc  /**< */,
-                                 uint32_t               rectangles_len  /**< */,
-                                 const xcb_rectangle_t *rectangles  /**< */);
-
-/**
- * @brief Fills rectangles
- *
- * @param c The connection
- * @param drawable The drawable (Window or Pixmap) to draw on.
- * @param gc The graphics context to use.
- * \n
- * The following graphics context components are used: function, plane-mask,
- * fill-style, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
- * \n
- * The following graphics context mode-dependent components are used:
- * foreground, background, tile, stipple, tile-stipple-x-origin, and
- * tile-stipple-y-origin.
- * @param rectangles_len The number of `xcb_rectangle_t` structures in \a rectangles.
- * @param rectangles The rectangles to fill.
- * @return A cookie
- *
- * Fills the specified rectangle(s) in the order listed in the array. For any
- * given rectangle, each pixel is not drawn more than once. If rectangles
- * intersect, the intersecting pixels are drawn multiple times.
- *
- */
-xcb_void_cookie_t
-xcb_poly_fill_rectangle (xcb_connection_t      *c  /**< */,
-                         xcb_drawable_t         drawable  /**< */,
-                         xcb_gcontext_t         gc  /**< */,
-                         uint32_t               rectangles_len  /**< */,
-                         const xcb_rectangle_t *rectangles  /**< */);
-
-int
-xcb_poly_fill_arc_sizeof (const void  *_buffer  /**< */,
-                          uint32_t     arcs_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_poly_fill_arc_checked (xcb_connection_t *c  /**< */,
-                           xcb_drawable_t    drawable  /**< */,
-                           xcb_gcontext_t    gc  /**< */,
-                           uint32_t          arcs_len  /**< */,
-                           const xcb_arc_t  *arcs  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_poly_fill_arc (xcb_connection_t *c  /**< */,
-                   xcb_drawable_t    drawable  /**< */,
-                   xcb_gcontext_t    gc  /**< */,
-                   uint32_t          arcs_len  /**< */,
-                   const xcb_arc_t  *arcs  /**< */);
-
-int
-xcb_put_image_sizeof (const void  *_buffer  /**< */,
-                      uint32_t     data_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_put_image_checked (xcb_connection_t *c  /**< */,
-                       uint8_t           format  /**< */,
-                       xcb_drawable_t    drawable  /**< */,
-                       xcb_gcontext_t    gc  /**< */,
-                       uint16_t          width  /**< */,
-                       uint16_t          height  /**< */,
-                       int16_t           dst_x  /**< */,
-                       int16_t           dst_y  /**< */,
-                       uint8_t           left_pad  /**< */,
-                       uint8_t           depth  /**< */,
-                       uint32_t          data_len  /**< */,
-                       const uint8_t    *data  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_put_image (xcb_connection_t *c  /**< */,
-               uint8_t           format  /**< */,
-               xcb_drawable_t    drawable  /**< */,
-               xcb_gcontext_t    gc  /**< */,
-               uint16_t          width  /**< */,
-               uint16_t          height  /**< */,
-               int16_t           dst_x  /**< */,
-               int16_t           dst_y  /**< */,
-               uint8_t           left_pad  /**< */,
-               uint8_t           depth  /**< */,
-               uint32_t          data_len  /**< */,
-               const uint8_t    *data  /**< */);
-
-int
-xcb_get_image_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_image_cookie_t
-xcb_get_image (xcb_connection_t *c  /**< */,
-               uint8_t           format  /**< */,
-               xcb_drawable_t    drawable  /**< */,
-               int16_t           x  /**< */,
-               int16_t           y  /**< */,
-               uint16_t          width  /**< */,
-               uint16_t          height  /**< */,
-               uint32_t          plane_mask  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_image_cookie_t
-xcb_get_image_unchecked (xcb_connection_t *c  /**< */,
-                         uint8_t           format  /**< */,
-                         xcb_drawable_t    drawable  /**< */,
-                         int16_t           x  /**< */,
-                         int16_t           y  /**< */,
-                         uint16_t          width  /**< */,
-                         uint16_t          height  /**< */,
-                         uint32_t          plane_mask  /**< */);
-
-uint8_t *
-xcb_get_image_data (const xcb_get_image_reply_t *R  /**< */);
-
-int
-xcb_get_image_data_length (const xcb_get_image_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_get_image_data_end (const xcb_get_image_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_image_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_image_reply_t *
-xcb_get_image_reply (xcb_connection_t        *c  /**< */,
-                     xcb_get_image_cookie_t   cookie  /**< */,
-                     xcb_generic_error_t    **e  /**< */);
-
-int
-xcb_poly_text_8_sizeof (const void  *_buffer  /**< */,
-                        uint32_t     items_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_poly_text_8_checked (xcb_connection_t *c  /**< */,
-                         xcb_drawable_t    drawable  /**< */,
-                         xcb_gcontext_t    gc  /**< */,
-                         int16_t           x  /**< */,
-                         int16_t           y  /**< */,
-                         uint32_t          items_len  /**< */,
-                         const uint8_t    *items  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_poly_text_8 (xcb_connection_t *c  /**< */,
-                 xcb_drawable_t    drawable  /**< */,
-                 xcb_gcontext_t    gc  /**< */,
-                 int16_t           x  /**< */,
-                 int16_t           y  /**< */,
-                 uint32_t          items_len  /**< */,
-                 const uint8_t    *items  /**< */);
-
-int
-xcb_poly_text_16_sizeof (const void  *_buffer  /**< */,
-                         uint32_t     items_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_poly_text_16_checked (xcb_connection_t *c  /**< */,
-                          xcb_drawable_t    drawable  /**< */,
-                          xcb_gcontext_t    gc  /**< */,
-                          int16_t           x  /**< */,
-                          int16_t           y  /**< */,
-                          uint32_t          items_len  /**< */,
-                          const uint8_t    *items  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_poly_text_16 (xcb_connection_t *c  /**< */,
-                  xcb_drawable_t    drawable  /**< */,
-                  xcb_gcontext_t    gc  /**< */,
-                  int16_t           x  /**< */,
-                  int16_t           y  /**< */,
-                  uint32_t          items_len  /**< */,
-                  const uint8_t    *items  /**< */);
-
-int
-xcb_image_text_8_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief Draws text
- *
- * @param c The connection
- * @param string_len The length of the \a string. Note that this parameter limited by 255 due to
- * using 8 bits!
- * @param drawable The drawable (Window or Pixmap) to draw text on.
- * @param gc The graphics context to use.
- * \n
- * The following graphics context components are used: plane-mask, foreground,
- * background, font, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
- * @param x The x coordinate of the first character, relative to the origin of \a drawable.
- * @param y The y coordinate of the first character, relative to the origin of \a drawable.
- * @param string The string to draw. Only the first 255 characters are relevant due to the data
- * type of \a string_len.
- * @return A cookie
- *
- * Fills the destination rectangle with the background pixel from \a gc, then
- * paints the text with the foreground pixel from \a gc. The upper-left corner of
- * the filled rectangle is at [x, y - font-ascent]. The width is overall-width,
- * the height is font-ascent + font-descent. The overall-width, font-ascent and
- * font-descent are as returned by `xcb_query_text_extents` (TODO).
- * 
- * Note that using X core fonts is deprecated (but still supported) in favor of
- * client-side rendering using Xft.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_image_text_8_checked (xcb_connection_t *c  /**< */,
-                          uint8_t           string_len  /**< */,
-                          xcb_drawable_t    drawable  /**< */,
-                          xcb_gcontext_t    gc  /**< */,
-                          int16_t           x  /**< */,
-                          int16_t           y  /**< */,
-                          const char       *string  /**< */);
-
-/**
- * @brief Draws text
- *
- * @param c The connection
- * @param string_len The length of the \a string. Note that this parameter limited by 255 due to
- * using 8 bits!
- * @param drawable The drawable (Window or Pixmap) to draw text on.
- * @param gc The graphics context to use.
- * \n
- * The following graphics context components are used: plane-mask, foreground,
- * background, font, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
- * @param x The x coordinate of the first character, relative to the origin of \a drawable.
- * @param y The y coordinate of the first character, relative to the origin of \a drawable.
- * @param string The string to draw. Only the first 255 characters are relevant due to the data
- * type of \a string_len.
- * @return A cookie
- *
- * Fills the destination rectangle with the background pixel from \a gc, then
- * paints the text with the foreground pixel from \a gc. The upper-left corner of
- * the filled rectangle is at [x, y - font-ascent]. The width is overall-width,
- * the height is font-ascent + font-descent. The overall-width, font-ascent and
- * font-descent are as returned by `xcb_query_text_extents` (TODO).
- * 
- * Note that using X core fonts is deprecated (but still supported) in favor of
- * client-side rendering using Xft.
- *
- */
-xcb_void_cookie_t
-xcb_image_text_8 (xcb_connection_t *c  /**< */,
-                  uint8_t           string_len  /**< */,
-                  xcb_drawable_t    drawable  /**< */,
-                  xcb_gcontext_t    gc  /**< */,
-                  int16_t           x  /**< */,
-                  int16_t           y  /**< */,
-                  const char       *string  /**< */);
-
-int
-xcb_image_text_16_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief Draws text
- *
- * @param c The connection
- * @param string_len The length of the \a string in characters. Note that this parameter limited by
- * 255 due to using 8 bits!
- * @param drawable The drawable (Window or Pixmap) to draw text on.
- * @param gc The graphics context to use.
- * \n
- * The following graphics context components are used: plane-mask, foreground,
- * background, font, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
- * @param x The x coordinate of the first character, relative to the origin of \a drawable.
- * @param y The y coordinate of the first character, relative to the origin of \a drawable.
- * @param string The string to draw. Only the first 255 characters are relevant due to the data
- * type of \a string_len. Every character uses 2 bytes (hence the 16 in this
- * request's name).
- * @return A cookie
- *
- * Fills the destination rectangle with the background pixel from \a gc, then
- * paints the text with the foreground pixel from \a gc. The upper-left corner of
- * the filled rectangle is at [x, y - font-ascent]. The width is overall-width,
- * the height is font-ascent + font-descent. The overall-width, font-ascent and
- * font-descent are as returned by `xcb_query_text_extents` (TODO).
- * 
- * Note that using X core fonts is deprecated (but still supported) in favor of
- * client-side rendering using Xft.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_image_text_16_checked (xcb_connection_t   *c  /**< */,
-                           uint8_t             string_len  /**< */,
-                           xcb_drawable_t      drawable  /**< */,
-                           xcb_gcontext_t      gc  /**< */,
-                           int16_t             x  /**< */,
-                           int16_t             y  /**< */,
-                           const xcb_char2b_t *string  /**< */);
-
-/**
- * @brief Draws text
- *
- * @param c The connection
- * @param string_len The length of the \a string in characters. Note that this parameter limited by
- * 255 due to using 8 bits!
- * @param drawable The drawable (Window or Pixmap) to draw text on.
- * @param gc The graphics context to use.
- * \n
- * The following graphics context components are used: plane-mask, foreground,
- * background, font, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
- * @param x The x coordinate of the first character, relative to the origin of \a drawable.
- * @param y The y coordinate of the first character, relative to the origin of \a drawable.
- * @param string The string to draw. Only the first 255 characters are relevant due to the data
- * type of \a string_len. Every character uses 2 bytes (hence the 16 in this
- * request's name).
- * @return A cookie
- *
- * Fills the destination rectangle with the background pixel from \a gc, then
- * paints the text with the foreground pixel from \a gc. The upper-left corner of
- * the filled rectangle is at [x, y - font-ascent]. The width is overall-width,
- * the height is font-ascent + font-descent. The overall-width, font-ascent and
- * font-descent are as returned by `xcb_query_text_extents` (TODO).
- * 
- * Note that using X core fonts is deprecated (but still supported) in favor of
- * client-side rendering using Xft.
- *
- */
-xcb_void_cookie_t
-xcb_image_text_16 (xcb_connection_t   *c  /**< */,
-                   uint8_t             string_len  /**< */,
-                   xcb_drawable_t      drawable  /**< */,
-                   xcb_gcontext_t      gc  /**< */,
-                   int16_t             x  /**< */,
-                   int16_t             y  /**< */,
-                   const xcb_char2b_t *string  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_create_colormap_checked (xcb_connection_t *c  /**< */,
-                             uint8_t           alloc  /**< */,
-                             xcb_colormap_t    mid  /**< */,
-                             xcb_window_t      window  /**< */,
-                             xcb_visualid_t    visual  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_create_colormap (xcb_connection_t *c  /**< */,
-                     uint8_t           alloc  /**< */,
-                     xcb_colormap_t    mid  /**< */,
-                     xcb_window_t      window  /**< */,
-                     xcb_visualid_t    visual  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_free_colormap_checked (xcb_connection_t *c  /**< */,
-                           xcb_colormap_t    cmap  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_free_colormap (xcb_connection_t *c  /**< */,
-                   xcb_colormap_t    cmap  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_copy_colormap_and_free_checked (xcb_connection_t *c  /**< */,
-                                    xcb_colormap_t    mid  /**< */,
-                                    xcb_colormap_t    src_cmap  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_copy_colormap_and_free (xcb_connection_t *c  /**< */,
-                            xcb_colormap_t    mid  /**< */,
-                            xcb_colormap_t    src_cmap  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_install_colormap_checked (xcb_connection_t *c  /**< */,
-                              xcb_colormap_t    cmap  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_install_colormap (xcb_connection_t *c  /**< */,
-                      xcb_colormap_t    cmap  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_uninstall_colormap_checked (xcb_connection_t *c  /**< */,
-                                xcb_colormap_t    cmap  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_uninstall_colormap (xcb_connection_t *c  /**< */,
-                        xcb_colormap_t    cmap  /**< */);
-
-int
-xcb_list_installed_colormaps_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_list_installed_colormaps_cookie_t
-xcb_list_installed_colormaps (xcb_connection_t *c  /**< */,
-                              xcb_window_t      window  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_list_installed_colormaps_cookie_t
-xcb_list_installed_colormaps_unchecked (xcb_connection_t *c  /**< */,
-                                        xcb_window_t      window  /**< */);
-
-xcb_colormap_t *
-xcb_list_installed_colormaps_cmaps (const xcb_list_installed_colormaps_reply_t *R  /**< */);
-
-int
-xcb_list_installed_colormaps_cmaps_length (const xcb_list_installed_colormaps_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_list_installed_colormaps_cmaps_end (const xcb_list_installed_colormaps_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_list_installed_colormaps_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_list_installed_colormaps_reply_t *
-xcb_list_installed_colormaps_reply (xcb_connection_t                       *c  /**< */,
-                                    xcb_list_installed_colormaps_cookie_t   cookie  /**< */,
-                                    xcb_generic_error_t                   **e  /**< */);
-
-/**
- * @brief Allocate a color
- *
- * @param c The connection
- * @param cmap TODO
- * @param red The red value of your color.
- * @param green The green value of your color.
- * @param blue The blue value of your color.
- * @return A cookie
- *
- * Allocates a read-only colormap entry corresponding to the closest RGB value
- * supported by the hardware. If you are using TrueColor, you can take a shortcut
- * and directly calculate the color pixel value to avoid the round trip. But, for
- * example, on 16-bit color setups (VNC), you can easily get the closest supported
- * RGB value to the RGB value you are specifying.
- *
- */
-xcb_alloc_color_cookie_t
-xcb_alloc_color (xcb_connection_t *c  /**< */,
-                 xcb_colormap_t    cmap  /**< */,
-                 uint16_t          red  /**< */,
-                 uint16_t          green  /**< */,
-                 uint16_t          blue  /**< */);
-
-/**
- * @brief Allocate a color
- *
- * @param c The connection
- * @param cmap TODO
- * @param red The red value of your color.
- * @param green The green value of your color.
- * @param blue The blue value of your color.
- * @return A cookie
- *
- * Allocates a read-only colormap entry corresponding to the closest RGB value
- * supported by the hardware. If you are using TrueColor, you can take a shortcut
- * and directly calculate the color pixel value to avoid the round trip. But, for
- * example, on 16-bit color setups (VNC), you can easily get the closest supported
- * RGB value to the RGB value you are specifying.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_alloc_color_cookie_t
-xcb_alloc_color_unchecked (xcb_connection_t *c  /**< */,
-                           xcb_colormap_t    cmap  /**< */,
-                           uint16_t          red  /**< */,
-                           uint16_t          green  /**< */,
-                           uint16_t          blue  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_alloc_color_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_alloc_color_reply_t *
-xcb_alloc_color_reply (xcb_connection_t          *c  /**< */,
-                       xcb_alloc_color_cookie_t   cookie  /**< */,
-                       xcb_generic_error_t      **e  /**< */);
-
-int
-xcb_alloc_named_color_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_alloc_named_color_cookie_t
-xcb_alloc_named_color (xcb_connection_t *c  /**< */,
-                       xcb_colormap_t    cmap  /**< */,
-                       uint16_t          name_len  /**< */,
-                       const char       *name  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_alloc_named_color_cookie_t
-xcb_alloc_named_color_unchecked (xcb_connection_t *c  /**< */,
-                                 xcb_colormap_t    cmap  /**< */,
-                                 uint16_t          name_len  /**< */,
-                                 const char       *name  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_alloc_named_color_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_alloc_named_color_reply_t *
-xcb_alloc_named_color_reply (xcb_connection_t                *c  /**< */,
-                             xcb_alloc_named_color_cookie_t   cookie  /**< */,
-                             xcb_generic_error_t            **e  /**< */);
-
-int
-xcb_alloc_color_cells_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_alloc_color_cells_cookie_t
-xcb_alloc_color_cells (xcb_connection_t *c  /**< */,
-                       uint8_t           contiguous  /**< */,
-                       xcb_colormap_t    cmap  /**< */,
-                       uint16_t          colors  /**< */,
-                       uint16_t          planes  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_alloc_color_cells_cookie_t
-xcb_alloc_color_cells_unchecked (xcb_connection_t *c  /**< */,
-                                 uint8_t           contiguous  /**< */,
-                                 xcb_colormap_t    cmap  /**< */,
-                                 uint16_t          colors  /**< */,
-                                 uint16_t          planes  /**< */);
-
-uint32_t *
-xcb_alloc_color_cells_pixels (const xcb_alloc_color_cells_reply_t *R  /**< */);
-
-int
-xcb_alloc_color_cells_pixels_length (const xcb_alloc_color_cells_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_alloc_color_cells_pixels_end (const xcb_alloc_color_cells_reply_t *R  /**< */);
-
-uint32_t *
-xcb_alloc_color_cells_masks (const xcb_alloc_color_cells_reply_t *R  /**< */);
-
-int
-xcb_alloc_color_cells_masks_length (const xcb_alloc_color_cells_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_alloc_color_cells_masks_end (const xcb_alloc_color_cells_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_alloc_color_cells_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_alloc_color_cells_reply_t *
-xcb_alloc_color_cells_reply (xcb_connection_t                *c  /**< */,
-                             xcb_alloc_color_cells_cookie_t   cookie  /**< */,
-                             xcb_generic_error_t            **e  /**< */);
-
-int
-xcb_alloc_color_planes_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_alloc_color_planes_cookie_t
-xcb_alloc_color_planes (xcb_connection_t *c  /**< */,
-                        uint8_t           contiguous  /**< */,
-                        xcb_colormap_t    cmap  /**< */,
-                        uint16_t          colors  /**< */,
-                        uint16_t          reds  /**< */,
-                        uint16_t          greens  /**< */,
-                        uint16_t          blues  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_alloc_color_planes_cookie_t
-xcb_alloc_color_planes_unchecked (xcb_connection_t *c  /**< */,
-                                  uint8_t           contiguous  /**< */,
-                                  xcb_colormap_t    cmap  /**< */,
-                                  uint16_t          colors  /**< */,
-                                  uint16_t          reds  /**< */,
-                                  uint16_t          greens  /**< */,
-                                  uint16_t          blues  /**< */);
-
-uint32_t *
-xcb_alloc_color_planes_pixels (const xcb_alloc_color_planes_reply_t *R  /**< */);
-
-int
-xcb_alloc_color_planes_pixels_length (const xcb_alloc_color_planes_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_alloc_color_planes_pixels_end (const xcb_alloc_color_planes_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_alloc_color_planes_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_alloc_color_planes_reply_t *
-xcb_alloc_color_planes_reply (xcb_connection_t                 *c  /**< */,
-                              xcb_alloc_color_planes_cookie_t   cookie  /**< */,
-                              xcb_generic_error_t             **e  /**< */);
-
-int
-xcb_free_colors_sizeof (const void  *_buffer  /**< */,
-                        uint32_t     pixels_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_free_colors_checked (xcb_connection_t *c  /**< */,
-                         xcb_colormap_t    cmap  /**< */,
-                         uint32_t          plane_mask  /**< */,
-                         uint32_t          pixels_len  /**< */,
-                         const uint32_t   *pixels  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_free_colors (xcb_connection_t *c  /**< */,
-                 xcb_colormap_t    cmap  /**< */,
-                 uint32_t          plane_mask  /**< */,
-                 uint32_t          pixels_len  /**< */,
-                 const uint32_t   *pixels  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_coloritem_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_coloritem_t)
- */
-void
-xcb_coloritem_next (xcb_coloritem_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_coloritem_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_coloritem_end (xcb_coloritem_iterator_t i  /**< */);
-
-int
-xcb_store_colors_sizeof (const void  *_buffer  /**< */,
-                         uint32_t     items_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_store_colors_checked (xcb_connection_t      *c  /**< */,
-                          xcb_colormap_t         cmap  /**< */,
-                          uint32_t               items_len  /**< */,
-                          const xcb_coloritem_t *items  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_store_colors (xcb_connection_t      *c  /**< */,
-                  xcb_colormap_t         cmap  /**< */,
-                  uint32_t               items_len  /**< */,
-                  const xcb_coloritem_t *items  /**< */);
-
-int
-xcb_store_named_color_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_store_named_color_checked (xcb_connection_t *c  /**< */,
-                               uint8_t           flags  /**< */,
-                               xcb_colormap_t    cmap  /**< */,
-                               uint32_t          pixel  /**< */,
-                               uint16_t          name_len  /**< */,
-                               const char       *name  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_store_named_color (xcb_connection_t *c  /**< */,
-                       uint8_t           flags  /**< */,
-                       xcb_colormap_t    cmap  /**< */,
-                       uint32_t          pixel  /**< */,
-                       uint16_t          name_len  /**< */,
-                       const char       *name  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_rgb_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_rgb_t)
- */
-void
-xcb_rgb_next (xcb_rgb_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_rgb_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_rgb_end (xcb_rgb_iterator_t i  /**< */);
-
-int
-xcb_query_colors_sizeof (const void  *_buffer  /**< */,
-                         uint32_t     pixels_len  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_query_colors_cookie_t
-xcb_query_colors (xcb_connection_t *c  /**< */,
-                  xcb_colormap_t    cmap  /**< */,
-                  uint32_t          pixels_len  /**< */,
-                  const uint32_t   *pixels  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_query_colors_cookie_t
-xcb_query_colors_unchecked (xcb_connection_t *c  /**< */,
-                            xcb_colormap_t    cmap  /**< */,
-                            uint32_t          pixels_len  /**< */,
-                            const uint32_t   *pixels  /**< */);
-
-xcb_rgb_t *
-xcb_query_colors_colors (const xcb_query_colors_reply_t *R  /**< */);
-
-int
-xcb_query_colors_colors_length (const xcb_query_colors_reply_t *R  /**< */);
-
-xcb_rgb_iterator_t
-xcb_query_colors_colors_iterator (const xcb_query_colors_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_query_colors_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_query_colors_reply_t *
-xcb_query_colors_reply (xcb_connection_t           *c  /**< */,
-                        xcb_query_colors_cookie_t   cookie  /**< */,
-                        xcb_generic_error_t       **e  /**< */);
-
-int
-xcb_lookup_color_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_lookup_color_cookie_t
-xcb_lookup_color (xcb_connection_t *c  /**< */,
-                  xcb_colormap_t    cmap  /**< */,
-                  uint16_t          name_len  /**< */,
-                  const char       *name  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_lookup_color_cookie_t
-xcb_lookup_color_unchecked (xcb_connection_t *c  /**< */,
-                            xcb_colormap_t    cmap  /**< */,
-                            uint16_t          name_len  /**< */,
-                            const char       *name  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_lookup_color_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_lookup_color_reply_t *
-xcb_lookup_color_reply (xcb_connection_t           *c  /**< */,
-                        xcb_lookup_color_cookie_t   cookie  /**< */,
-                        xcb_generic_error_t       **e  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_create_cursor_checked (xcb_connection_t *c  /**< */,
-                           xcb_cursor_t      cid  /**< */,
-                           xcb_pixmap_t      source  /**< */,
-                           xcb_pixmap_t      mask  /**< */,
-                           uint16_t          fore_red  /**< */,
-                           uint16_t          fore_green  /**< */,
-                           uint16_t          fore_blue  /**< */,
-                           uint16_t          back_red  /**< */,
-                           uint16_t          back_green  /**< */,
-                           uint16_t          back_blue  /**< */,
-                           uint16_t          x  /**< */,
-                           uint16_t          y  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_create_cursor (xcb_connection_t *c  /**< */,
-                   xcb_cursor_t      cid  /**< */,
-                   xcb_pixmap_t      source  /**< */,
-                   xcb_pixmap_t      mask  /**< */,
-                   uint16_t          fore_red  /**< */,
-                   uint16_t          fore_green  /**< */,
-                   uint16_t          fore_blue  /**< */,
-                   uint16_t          back_red  /**< */,
-                   uint16_t          back_green  /**< */,
-                   uint16_t          back_blue  /**< */,
-                   uint16_t          x  /**< */,
-                   uint16_t          y  /**< */);
-
-/**
- * @brief create cursor
- *
- * @param c The connection
- * @param cid The ID with which you will refer to the cursor, created by `xcb_generate_id`.
- * @param source_font In which font to look for the cursor glyph.
- * @param mask_font In which font to look for the mask glyph.
- * @param source_char The glyph of \a source_font to use.
- * @param mask_char The glyph of \a mask_font to use as a mask: Pixels which are set to 1 define
- * which source pixels are displayed. All pixels which are set to 0 are not
- * displayed.
- * @param fore_red The red value of the foreground color.
- * @param fore_green The green value of the foreground color.
- * @param fore_blue The blue value of the foreground color.
- * @param back_red The red value of the background color.
- * @param back_green The green value of the background color.
- * @param back_blue The blue value of the background color.
- * @return A cookie
- *
- * Creates a cursor from a font glyph. X provides a set of standard cursor shapes
- * in a special font named cursor. Applications are encouraged to use this
- * interface for their cursors because the font can be customized for the
- * individual display type.
- * 
- * All pixels which are set to 1 in the source will use the foreground color (as
- * specified by \a fore_red, \a fore_green and \a fore_blue). All pixels set to 0
- * will use the background color (as specified by \a back_red, \a back_green and
- * \a back_blue).
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_create_glyph_cursor_checked (xcb_connection_t *c  /**< */,
-                                 xcb_cursor_t      cid  /**< */,
-                                 xcb_font_t        source_font  /**< */,
-                                 xcb_font_t        mask_font  /**< */,
-                                 uint16_t          source_char  /**< */,
-                                 uint16_t          mask_char  /**< */,
-                                 uint16_t          fore_red  /**< */,
-                                 uint16_t          fore_green  /**< */,
-                                 uint16_t          fore_blue  /**< */,
-                                 uint16_t          back_red  /**< */,
-                                 uint16_t          back_green  /**< */,
-                                 uint16_t          back_blue  /**< */);
-
-/**
- * @brief create cursor
- *
- * @param c The connection
- * @param cid The ID with which you will refer to the cursor, created by `xcb_generate_id`.
- * @param source_font In which font to look for the cursor glyph.
- * @param mask_font In which font to look for the mask glyph.
- * @param source_char The glyph of \a source_font to use.
- * @param mask_char The glyph of \a mask_font to use as a mask: Pixels which are set to 1 define
- * which source pixels are displayed. All pixels which are set to 0 are not
- * displayed.
- * @param fore_red The red value of the foreground color.
- * @param fore_green The green value of the foreground color.
- * @param fore_blue The blue value of the foreground color.
- * @param back_red The red value of the background color.
- * @param back_green The green value of the background color.
- * @param back_blue The blue value of the background color.
- * @return A cookie
- *
- * Creates a cursor from a font glyph. X provides a set of standard cursor shapes
- * in a special font named cursor. Applications are encouraged to use this
- * interface for their cursors because the font can be customized for the
- * individual display type.
- * 
- * All pixels which are set to 1 in the source will use the foreground color (as
- * specified by \a fore_red, \a fore_green and \a fore_blue). All pixels set to 0
- * will use the background color (as specified by \a back_red, \a back_green and
- * \a back_blue).
- *
- */
-xcb_void_cookie_t
-xcb_create_glyph_cursor (xcb_connection_t *c  /**< */,
-                         xcb_cursor_t      cid  /**< */,
-                         xcb_font_t        source_font  /**< */,
-                         xcb_font_t        mask_font  /**< */,
-                         uint16_t          source_char  /**< */,
-                         uint16_t          mask_char  /**< */,
-                         uint16_t          fore_red  /**< */,
-                         uint16_t          fore_green  /**< */,
-                         uint16_t          fore_blue  /**< */,
-                         uint16_t          back_red  /**< */,
-                         uint16_t          back_green  /**< */,
-                         uint16_t          back_blue  /**< */);
-
-/**
- * @brief Deletes a cursor
- *
- * @param c The connection
- * @param cursor The cursor to destroy.
- * @return A cookie
- *
- * Deletes the association between the cursor resource ID and the specified
- * cursor. The cursor is freed when no other resource references it.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_free_cursor_checked (xcb_connection_t *c  /**< */,
-                         xcb_cursor_t      cursor  /**< */);
-
-/**
- * @brief Deletes a cursor
- *
- * @param c The connection
- * @param cursor The cursor to destroy.
- * @return A cookie
- *
- * Deletes the association between the cursor resource ID and the specified
- * cursor. The cursor is freed when no other resource references it.
- *
- */
-xcb_void_cookie_t
-xcb_free_cursor (xcb_connection_t *c  /**< */,
-                 xcb_cursor_t      cursor  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_recolor_cursor_checked (xcb_connection_t *c  /**< */,
-                            xcb_cursor_t      cursor  /**< */,
-                            uint16_t          fore_red  /**< */,
-                            uint16_t          fore_green  /**< */,
-                            uint16_t          fore_blue  /**< */,
-                            uint16_t          back_red  /**< */,
-                            uint16_t          back_green  /**< */,
-                            uint16_t          back_blue  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_recolor_cursor (xcb_connection_t *c  /**< */,
-                    xcb_cursor_t      cursor  /**< */,
-                    uint16_t          fore_red  /**< */,
-                    uint16_t          fore_green  /**< */,
-                    uint16_t          fore_blue  /**< */,
-                    uint16_t          back_red  /**< */,
-                    uint16_t          back_green  /**< */,
-                    uint16_t          back_blue  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_query_best_size_cookie_t
-xcb_query_best_size (xcb_connection_t *c  /**< */,
-                     uint8_t           _class  /**< */,
-                     xcb_drawable_t    drawable  /**< */,
-                     uint16_t          width  /**< */,
-                     uint16_t          height  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_query_best_size_cookie_t
-xcb_query_best_size_unchecked (xcb_connection_t *c  /**< */,
-                               uint8_t           _class  /**< */,
-                               xcb_drawable_t    drawable  /**< */,
-                               uint16_t          width  /**< */,
-                               uint16_t          height  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_query_best_size_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_query_best_size_reply_t *
-xcb_query_best_size_reply (xcb_connection_t              *c  /**< */,
-                           xcb_query_best_size_cookie_t   cookie  /**< */,
-                           xcb_generic_error_t          **e  /**< */);
-
-int
-xcb_query_extension_sizeof (const void  *_buffer  /**< */);
-
-/**
- * @brief check if extension is present
- *
- * @param c The connection
- * @param name_len The length of \a name in bytes.
- * @param name The name of the extension to query, for example "RANDR". This is case
- * sensitive!
- * @return A cookie
- *
- * Determines if the specified extension is present on this X11 server.
- * 
- * Every extension has a unique `major_opcode` to identify requests, the minor
- * opcodes and request formats are extension-specific. If the extension provides
- * events and errors, the `first_event` and `first_error` fields in the reply are
- * set accordingly.
- * 
- * There should rarely be a need to use this request directly, XCB provides the
- * `xcb_get_extension_data` function instead.
- *
- */
-xcb_query_extension_cookie_t
-xcb_query_extension (xcb_connection_t *c  /**< */,
-                     uint16_t          name_len  /**< */,
-                     const char       *name  /**< */);
-
-/**
- * @brief check if extension is present
- *
- * @param c The connection
- * @param name_len The length of \a name in bytes.
- * @param name The name of the extension to query, for example "RANDR". This is case
- * sensitive!
- * @return A cookie
- *
- * Determines if the specified extension is present on this X11 server.
- * 
- * Every extension has a unique `major_opcode` to identify requests, the minor
- * opcodes and request formats are extension-specific. If the extension provides
- * events and errors, the `first_event` and `first_error` fields in the reply are
- * set accordingly.
- * 
- * There should rarely be a need to use this request directly, XCB provides the
- * `xcb_get_extension_data` function instead.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_query_extension_cookie_t
-xcb_query_extension_unchecked (xcb_connection_t *c  /**< */,
-                               uint16_t          name_len  /**< */,
-                               const char       *name  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_query_extension_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_query_extension_reply_t *
-xcb_query_extension_reply (xcb_connection_t              *c  /**< */,
-                           xcb_query_extension_cookie_t   cookie  /**< */,
-                           xcb_generic_error_t          **e  /**< */);
-
-int
-xcb_list_extensions_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_list_extensions_cookie_t
-xcb_list_extensions (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_list_extensions_cookie_t
-xcb_list_extensions_unchecked (xcb_connection_t *c  /**< */);
-
-int
-xcb_list_extensions_names_length (const xcb_list_extensions_reply_t *R  /**< */);
-
-xcb_str_iterator_t
-xcb_list_extensions_names_iterator (const xcb_list_extensions_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_list_extensions_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_list_extensions_reply_t *
-xcb_list_extensions_reply (xcb_connection_t              *c  /**< */,
-                           xcb_list_extensions_cookie_t   cookie  /**< */,
-                           xcb_generic_error_t          **e  /**< */);
-
-int
-xcb_change_keyboard_mapping_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_change_keyboard_mapping_checked (xcb_connection_t   *c  /**< */,
-                                     uint8_t             keycode_count  /**< */,
-                                     xcb_keycode_t       first_keycode  /**< */,
-                                     uint8_t             keysyms_per_keycode  /**< */,
-                                     const xcb_keysym_t *keysyms  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_change_keyboard_mapping (xcb_connection_t   *c  /**< */,
-                             uint8_t             keycode_count  /**< */,
-                             xcb_keycode_t       first_keycode  /**< */,
-                             uint8_t             keysyms_per_keycode  /**< */,
-                             const xcb_keysym_t *keysyms  /**< */);
-
-int
-xcb_get_keyboard_mapping_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_keyboard_mapping_cookie_t
-xcb_get_keyboard_mapping (xcb_connection_t *c  /**< */,
-                          xcb_keycode_t     first_keycode  /**< */,
-                          uint8_t           count  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_keyboard_mapping_cookie_t
-xcb_get_keyboard_mapping_unchecked (xcb_connection_t *c  /**< */,
-                                    xcb_keycode_t     first_keycode  /**< */,
-                                    uint8_t           count  /**< */);
-
-xcb_keysym_t *
-xcb_get_keyboard_mapping_keysyms (const xcb_get_keyboard_mapping_reply_t *R  /**< */);
-
-int
-xcb_get_keyboard_mapping_keysyms_length (const xcb_get_keyboard_mapping_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_get_keyboard_mapping_keysyms_end (const xcb_get_keyboard_mapping_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_keyboard_mapping_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_keyboard_mapping_reply_t *
-xcb_get_keyboard_mapping_reply (xcb_connection_t                   *c  /**< */,
-                                xcb_get_keyboard_mapping_cookie_t   cookie  /**< */,
-                                xcb_generic_error_t               **e  /**< */);
-
-int
-xcb_change_keyboard_control_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_change_keyboard_control_checked (xcb_connection_t *c  /**< */,
-                                     uint32_t          value_mask  /**< */,
-                                     const uint32_t   *value_list  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_change_keyboard_control (xcb_connection_t *c  /**< */,
-                             uint32_t          value_mask  /**< */,
-                             const uint32_t   *value_list  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_keyboard_control_cookie_t
-xcb_get_keyboard_control (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_keyboard_control_cookie_t
-xcb_get_keyboard_control_unchecked (xcb_connection_t *c  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_keyboard_control_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_keyboard_control_reply_t *
-xcb_get_keyboard_control_reply (xcb_connection_t                   *c  /**< */,
-                                xcb_get_keyboard_control_cookie_t   cookie  /**< */,
-                                xcb_generic_error_t               **e  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_bell_checked (xcb_connection_t *c  /**< */,
-                  int8_t            percent  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_bell (xcb_connection_t *c  /**< */,
-          int8_t            percent  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_change_pointer_control_checked (xcb_connection_t *c  /**< */,
-                                    int16_t           acceleration_numerator  /**< */,
-                                    int16_t           acceleration_denominator  /**< */,
-                                    int16_t           threshold  /**< */,
-                                    uint8_t           do_acceleration  /**< */,
-                                    uint8_t           do_threshold  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_change_pointer_control (xcb_connection_t *c  /**< */,
-                            int16_t           acceleration_numerator  /**< */,
-                            int16_t           acceleration_denominator  /**< */,
-                            int16_t           threshold  /**< */,
-                            uint8_t           do_acceleration  /**< */,
-                            uint8_t           do_threshold  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_pointer_control_cookie_t
-xcb_get_pointer_control (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_pointer_control_cookie_t
-xcb_get_pointer_control_unchecked (xcb_connection_t *c  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_pointer_control_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_pointer_control_reply_t *
-xcb_get_pointer_control_reply (xcb_connection_t                  *c  /**< */,
-                               xcb_get_pointer_control_cookie_t   cookie  /**< */,
-                               xcb_generic_error_t              **e  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_set_screen_saver_checked (xcb_connection_t *c  /**< */,
-                              int16_t           timeout  /**< */,
-                              int16_t           interval  /**< */,
-                              uint8_t           prefer_blanking  /**< */,
-                              uint8_t           allow_exposures  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_set_screen_saver (xcb_connection_t *c  /**< */,
-                      int16_t           timeout  /**< */,
-                      int16_t           interval  /**< */,
-                      uint8_t           prefer_blanking  /**< */,
-                      uint8_t           allow_exposures  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_screen_saver_cookie_t
-xcb_get_screen_saver (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_screen_saver_cookie_t
-xcb_get_screen_saver_unchecked (xcb_connection_t *c  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_screen_saver_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_screen_saver_reply_t *
-xcb_get_screen_saver_reply (xcb_connection_t               *c  /**< */,
-                            xcb_get_screen_saver_cookie_t   cookie  /**< */,
-                            xcb_generic_error_t           **e  /**< */);
-
-int
-xcb_change_hosts_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_change_hosts_checked (xcb_connection_t *c  /**< */,
-                          uint8_t           mode  /**< */,
-                          uint8_t           family  /**< */,
-                          uint16_t          address_len  /**< */,
-                          const uint8_t    *address  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_change_hosts (xcb_connection_t *c  /**< */,
-                  uint8_t           mode  /**< */,
-                  uint8_t           family  /**< */,
-                  uint16_t          address_len  /**< */,
-                  const uint8_t    *address  /**< */);
-
-int
-xcb_host_sizeof (const void  *_buffer  /**< */);
-
-uint8_t *
-xcb_host_address (const xcb_host_t *R  /**< */);
-
-int
-xcb_host_address_length (const xcb_host_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_host_address_end (const xcb_host_t *R  /**< */);
-
-/**
- * Get the next element of the iterator
- * @param i Pointer to a xcb_host_iterator_t
- *
- * Get the next element in the iterator. The member rem is
- * decreased by one. The member data points to the next
- * element. The member index is increased by sizeof(xcb_host_t)
- */
-void
-xcb_host_next (xcb_host_iterator_t *i  /**< */);
-
-/**
- * Return the iterator pointing to the last element
- * @param i An xcb_host_iterator_t
- * @return  The iterator pointing to the last element
- *
- * Set the current element in the iterator to the last element.
- * The member rem is set to 0. The member data points to the
- * last element.
- */
-xcb_generic_iterator_t
-xcb_host_end (xcb_host_iterator_t i  /**< */);
-
-int
-xcb_list_hosts_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_list_hosts_cookie_t
-xcb_list_hosts (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_list_hosts_cookie_t
-xcb_list_hosts_unchecked (xcb_connection_t *c  /**< */);
-
-int
-xcb_list_hosts_hosts_length (const xcb_list_hosts_reply_t *R  /**< */);
-
-xcb_host_iterator_t
-xcb_list_hosts_hosts_iterator (const xcb_list_hosts_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_list_hosts_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_list_hosts_reply_t *
-xcb_list_hosts_reply (xcb_connection_t         *c  /**< */,
-                      xcb_list_hosts_cookie_t   cookie  /**< */,
-                      xcb_generic_error_t     **e  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_set_access_control_checked (xcb_connection_t *c  /**< */,
-                                uint8_t           mode  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_set_access_control (xcb_connection_t *c  /**< */,
-                        uint8_t           mode  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_set_close_down_mode_checked (xcb_connection_t *c  /**< */,
-                                 uint8_t           mode  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_set_close_down_mode (xcb_connection_t *c  /**< */,
-                         uint8_t           mode  /**< */);
-
-/**
- * @brief kills a client
- *
- * @param c The connection
- * @param resource Any resource belonging to the client (for example a Window), used to identify
- * the client connection.
- * \n
- * The special value of `XCB_KILL_ALL_TEMPORARY`, the resources of all clients
- * that have terminated in `RetainTemporary` (TODO) are destroyed.
- * @return A cookie
- *
- * Forces a close down of the client that created the specified \a resource.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_kill_client_checked (xcb_connection_t *c  /**< */,
-                         uint32_t          resource  /**< */);
-
-/**
- * @brief kills a client
- *
- * @param c The connection
- * @param resource Any resource belonging to the client (for example a Window), used to identify
- * the client connection.
- * \n
- * The special value of `XCB_KILL_ALL_TEMPORARY`, the resources of all clients
- * that have terminated in `RetainTemporary` (TODO) are destroyed.
- * @return A cookie
- *
- * Forces a close down of the client that created the specified \a resource.
- *
- */
-xcb_void_cookie_t
-xcb_kill_client (xcb_connection_t *c  /**< */,
-                 uint32_t          resource  /**< */);
-
-int
-xcb_rotate_properties_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_rotate_properties_checked (xcb_connection_t *c  /**< */,
-                               xcb_window_t      window  /**< */,
-                               uint16_t          atoms_len  /**< */,
-                               int16_t           delta  /**< */,
-                               const xcb_atom_t *atoms  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_rotate_properties (xcb_connection_t *c  /**< */,
-                       xcb_window_t      window  /**< */,
-                       uint16_t          atoms_len  /**< */,
-                       int16_t           delta  /**< */,
-                       const xcb_atom_t *atoms  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_force_screen_saver_checked (xcb_connection_t *c  /**< */,
-                                uint8_t           mode  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_force_screen_saver (xcb_connection_t *c  /**< */,
-                        uint8_t           mode  /**< */);
-
-int
-xcb_set_pointer_mapping_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_set_pointer_mapping_cookie_t
-xcb_set_pointer_mapping (xcb_connection_t *c  /**< */,
-                         uint8_t           map_len  /**< */,
-                         const uint8_t    *map  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_set_pointer_mapping_cookie_t
-xcb_set_pointer_mapping_unchecked (xcb_connection_t *c  /**< */,
-                                   uint8_t           map_len  /**< */,
-                                   const uint8_t    *map  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_set_pointer_mapping_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_set_pointer_mapping_reply_t *
-xcb_set_pointer_mapping_reply (xcb_connection_t                  *c  /**< */,
-                               xcb_set_pointer_mapping_cookie_t   cookie  /**< */,
-                               xcb_generic_error_t              **e  /**< */);
-
-int
-xcb_get_pointer_mapping_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_pointer_mapping_cookie_t
-xcb_get_pointer_mapping (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_pointer_mapping_cookie_t
-xcb_get_pointer_mapping_unchecked (xcb_connection_t *c  /**< */);
-
-uint8_t *
-xcb_get_pointer_mapping_map (const xcb_get_pointer_mapping_reply_t *R  /**< */);
-
-int
-xcb_get_pointer_mapping_map_length (const xcb_get_pointer_mapping_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_get_pointer_mapping_map_end (const xcb_get_pointer_mapping_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_pointer_mapping_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_pointer_mapping_reply_t *
-xcb_get_pointer_mapping_reply (xcb_connection_t                  *c  /**< */,
-                               xcb_get_pointer_mapping_cookie_t   cookie  /**< */,
-                               xcb_generic_error_t              **e  /**< */);
-
-int
-xcb_set_modifier_mapping_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_set_modifier_mapping_cookie_t
-xcb_set_modifier_mapping (xcb_connection_t    *c  /**< */,
-                          uint8_t              keycodes_per_modifier  /**< */,
-                          const xcb_keycode_t *keycodes  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_set_modifier_mapping_cookie_t
-xcb_set_modifier_mapping_unchecked (xcb_connection_t    *c  /**< */,
-                                    uint8_t              keycodes_per_modifier  /**< */,
-                                    const xcb_keycode_t *keycodes  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_set_modifier_mapping_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_set_modifier_mapping_reply_t *
-xcb_set_modifier_mapping_reply (xcb_connection_t                   *c  /**< */,
-                                xcb_set_modifier_mapping_cookie_t   cookie  /**< */,
-                                xcb_generic_error_t               **e  /**< */);
-
-int
-xcb_get_modifier_mapping_sizeof (const void  *_buffer  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_get_modifier_mapping_cookie_t
-xcb_get_modifier_mapping (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will cause
- * a reply to be generated. Any returned error will be
- * placed in the event queue.
- */
-xcb_get_modifier_mapping_cookie_t
-xcb_get_modifier_mapping_unchecked (xcb_connection_t *c  /**< */);
-
-xcb_keycode_t *
-xcb_get_modifier_mapping_keycodes (const xcb_get_modifier_mapping_reply_t *R  /**< */);
-
-int
-xcb_get_modifier_mapping_keycodes_length (const xcb_get_modifier_mapping_reply_t *R  /**< */);
-
-xcb_generic_iterator_t
-xcb_get_modifier_mapping_keycodes_end (const xcb_get_modifier_mapping_reply_t *R  /**< */);
-
-/**
- * Return the reply
- * @param c      The connection
- * @param cookie The cookie
- * @param e      The xcb_generic_error_t supplied
- *
- * Returns the reply of the request asked by
- *
- * The parameter @p e supplied to this function must be NULL if
- * xcb_get_modifier_mapping_unchecked(). is used.
- * Otherwise, it stores the error if any.
- *
- * The returned value must be freed by the caller using free().
- */
-xcb_get_modifier_mapping_reply_t *
-xcb_get_modifier_mapping_reply (xcb_connection_t                   *c  /**< */,
-                                xcb_get_modifier_mapping_cookie_t   cookie  /**< */,
-                                xcb_generic_error_t               **e  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- * This form can be used only if the request will not cause
- * a reply to be generated. Any returned error will be
- * saved for handling by xcb_request_check().
- */
-xcb_void_cookie_t
-xcb_no_operation_checked (xcb_connection_t *c  /**< */);
-
-/**
- *
- * @param c The connection
- * @return A cookie
- *
- * Delivers a request to the X server.
- *
- */
-xcb_void_cookie_t
-xcb_no_operation (xcb_connection_t *c  /**< */);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/**
- * @}
- */
diff --git a/openflow/usr/include/xen/evtchn.h b/openflow/usr/include/xen/evtchn.h
deleted file mode 100644
index 14e833e..0000000
--- a/openflow/usr/include/xen/evtchn.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/******************************************************************************
- * evtchn.h
- *
- * Interface to /dev/xen/evtchn.
- *
- * Copyright (c) 2003-2005, K A Fraser
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation; or, when distributed
- * separately from the Linux kernel or incorporated into other
- * software packages, subject to the following license:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this source file (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#ifndef __LINUX_PUBLIC_EVTCHN_H__
-#define __LINUX_PUBLIC_EVTCHN_H__
-
-/*
- * Bind a fresh port to VIRQ @virq.
- * Return allocated port.
- */
-#define IOCTL_EVTCHN_BIND_VIRQ				\
-	_IOC(_IOC_NONE, 'E', 0, sizeof(struct ioctl_evtchn_bind_virq))
-struct ioctl_evtchn_bind_virq {
-	unsigned int virq;
-};
-
-/*
- * Bind a fresh port to remote <@remote_domain, @remote_port>.
- * Return allocated port.
- */
-#define IOCTL_EVTCHN_BIND_INTERDOMAIN			\
-	_IOC(_IOC_NONE, 'E', 1, sizeof(struct ioctl_evtchn_bind_interdomain))
-struct ioctl_evtchn_bind_interdomain {
-	unsigned int remote_domain, remote_port;
-};
-
-/*
- * Allocate a fresh port for binding to @remote_domain.
- * Return allocated port.
- */
-#define IOCTL_EVTCHN_BIND_UNBOUND_PORT			\
-	_IOC(_IOC_NONE, 'E', 2, sizeof(struct ioctl_evtchn_bind_unbound_port))
-struct ioctl_evtchn_bind_unbound_port {
-	unsigned int remote_domain;
-};
-
-/*
- * Unbind previously allocated @port.
- */
-#define IOCTL_EVTCHN_UNBIND				\
-	_IOC(_IOC_NONE, 'E', 3, sizeof(struct ioctl_evtchn_unbind))
-struct ioctl_evtchn_unbind {
-	unsigned int port;
-};
-
-/*
- * Unbind previously allocated @port.
- */
-#define IOCTL_EVTCHN_NOTIFY				\
-	_IOC(_IOC_NONE, 'E', 4, sizeof(struct ioctl_evtchn_notify))
-struct ioctl_evtchn_notify {
-	unsigned int port;
-};
-
-/* Clear and reinitialise the event buffer. Clear error condition. */
-#define IOCTL_EVTCHN_RESET				\
-	_IOC(_IOC_NONE, 'E', 5, 0)
-
-#endif /* __LINUX_PUBLIC_EVTCHN_H__ */
diff --git a/openflow/usr/include/xen/gntalloc.h b/openflow/usr/include/xen/gntalloc.h
deleted file mode 100644
index 48d2790..0000000
--- a/openflow/usr/include/xen/gntalloc.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/******************************************************************************
- * gntalloc.h
- *
- * Interface to /dev/xen/gntalloc.
- *
- * Author: Daniel De Graaf <dgdegra@tycho.nsa.gov>
- *
- * This file is in the public domain.
- */
-
-#ifndef __LINUX_PUBLIC_GNTALLOC_H__
-#define __LINUX_PUBLIC_GNTALLOC_H__
-
-#include <linux/types.h>
-
-/*
- * Allocates a new page and creates a new grant reference.
- */
-#define IOCTL_GNTALLOC_ALLOC_GREF \
-_IOC(_IOC_NONE, 'G', 5, sizeof(struct ioctl_gntalloc_alloc_gref))
-struct ioctl_gntalloc_alloc_gref {
-	/* IN parameters */
-	/* The ID of the domain to be given access to the grants. */
-	__u16 domid;
-	/* Flags for this mapping */
-	__u16 flags;
-	/* Number of pages to map */
-	__u32 count;
-	/* OUT parameters */
-	/* The offset to be used on a subsequent call to mmap(). */
-	__u64 index;
-	/* The grant references of the newly created grant, one per page */
-	/* Variable size, depending on count */
-	__u32 gref_ids[1];
-};
-
-#define GNTALLOC_FLAG_WRITABLE 1
-
-/*
- * Deallocates the grant reference, allowing the associated page to be freed if
- * no other domains are using it.
- */
-#define IOCTL_GNTALLOC_DEALLOC_GREF \
-_IOC(_IOC_NONE, 'G', 6, sizeof(struct ioctl_gntalloc_dealloc_gref))
-struct ioctl_gntalloc_dealloc_gref {
-	/* IN parameters */
-	/* The offset returned in the map operation */
-	__u64 index;
-	/* Number of references to unmap */
-	__u32 count;
-};
-
-/*
- * Sets up an unmap notification within the page, so that the other side can do
- * cleanup if this side crashes. Required to implement cross-domain robust
- * mutexes or close notification on communication channels.
- *
- * Each mapped page only supports one notification; multiple calls referring to
- * the same page overwrite the previous notification. You must clear the
- * notification prior to the IOCTL_GNTALLOC_DEALLOC_GREF if you do not want it
- * to occur.
- */
-#define IOCTL_GNTALLOC_SET_UNMAP_NOTIFY \
-_IOC(_IOC_NONE, 'G', 7, sizeof(struct ioctl_gntalloc_unmap_notify))
-struct ioctl_gntalloc_unmap_notify {
-	/* IN parameters */
-	/* Offset in the file descriptor for a byte within the page (same as
-	 * used in mmap). If using UNMAP_NOTIFY_CLEAR_BYTE, this is the byte to
-	 * be cleared. Otherwise, it can be any byte in the page whose
-	 * notification we are adjusting.
-	 */
-	__u64 index;
-	/* Action(s) to take on unmap */
-	__u32 action;
-	/* Event channel to notify */
-	__u32 event_channel_port;
-};
-
-/* Clear (set to zero) the byte specified by index */
-#define UNMAP_NOTIFY_CLEAR_BYTE 0x1
-/* Send an interrupt on the indicated event channel */
-#define UNMAP_NOTIFY_SEND_EVENT 0x2
-
-#endif /* __LINUX_PUBLIC_GNTALLOC_H__ */
diff --git a/openflow/usr/include/xen/gntdev.h b/openflow/usr/include/xen/gntdev.h
deleted file mode 100644
index aa7610a..0000000
--- a/openflow/usr/include/xen/gntdev.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/******************************************************************************
- * gntdev.h
- * 
- * Interface to /dev/xen/gntdev.
- * 
- * Copyright (c) 2007, D G Murray
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation; or, when distributed
- * separately from the Linux kernel or incorporated into other
- * software packages, subject to the following license:
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this source file (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#ifndef __LINUX_PUBLIC_GNTDEV_H__
-#define __LINUX_PUBLIC_GNTDEV_H__
-
-#include <linux/types.h>
-
-struct ioctl_gntdev_grant_ref {
-	/* The domain ID of the grant to be mapped. */
-	__u32 domid;
-	/* The grant reference of the grant to be mapped. */
-	__u32 ref;
-};
-
-/*
- * Inserts the grant references into the mapping table of an instance
- * of gntdev. N.B. This does not perform the mapping, which is deferred
- * until mmap() is called with @index as the offset.
- */
-#define IOCTL_GNTDEV_MAP_GRANT_REF \
-_IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))
-struct ioctl_gntdev_map_grant_ref {
-	/* IN parameters */
-	/* The number of grants to be mapped. */
-	__u32 count;
-	__u32 pad;
-	/* OUT parameters */
-	/* The offset to be used on a subsequent call to mmap(). */
-	__u64 index;
-	/* Variable IN parameter. */
-	/* Array of grant references, of size @count. */
-	struct ioctl_gntdev_grant_ref refs[1];
-};
-
-/*
- * Removes the grant references from the mapping table of an instance of
- * of gntdev. N.B. munmap() must be called on the relevant virtual address(es)
- * before this ioctl is called, or an error will result.
- */
-#define IOCTL_GNTDEV_UNMAP_GRANT_REF \
-_IOC(_IOC_NONE, 'G', 1, sizeof(struct ioctl_gntdev_unmap_grant_ref))
-struct ioctl_gntdev_unmap_grant_ref {
-	/* IN parameters */
-	/* The offset was returned by the corresponding map operation. */
-	__u64 index;
-	/* The number of pages to be unmapped. */
-	__u32 count;
-	__u32 pad;
-};
-
-/*
- * Returns the offset in the driver's address space that corresponds
- * to @vaddr. This can be used to perform a munmap(), followed by an
- * UNMAP_GRANT_REF ioctl, where no state about the offset is retained by
- * the caller. The number of pages that were allocated at the same time as
- * @vaddr is returned in @count.
- *
- * N.B. Where more than one page has been mapped into a contiguous range, the
- *      supplied @vaddr must correspond to the start of the range; otherwise
- *      an error will result. It is only possible to munmap() the entire
- *      contiguously-allocated range at once, and not any subrange thereof.
- */
-#define IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR \
-_IOC(_IOC_NONE, 'G', 2, sizeof(struct ioctl_gntdev_get_offset_for_vaddr))
-struct ioctl_gntdev_get_offset_for_vaddr {
-	/* IN parameters */
-	/* The virtual address of the first mapped page in a range. */
-	__u64 vaddr;
-	/* OUT parameters */
-	/* The offset that was used in the initial mmap() operation. */
-	__u64 offset;
-	/* The number of pages mapped in the VM area that begins at @vaddr. */
-	__u32 count;
-	__u32 pad;
-};
-
-/*
- * Sets the maximum number of grants that may mapped at once by this gntdev
- * instance.
- *
- * N.B. This must be called before any other ioctl is performed on the device.
- */
-#define IOCTL_GNTDEV_SET_MAX_GRANTS \
-_IOC(_IOC_NONE, 'G', 3, sizeof(struct ioctl_gntdev_set_max_grants))
-struct ioctl_gntdev_set_max_grants {
-	/* IN parameter */
-	/* The maximum number of grants that may be mapped at once. */
-	__u32 count;
-};
-
-/*
- * Sets up an unmap notification within the page, so that the other side can do
- * cleanup if this side crashes. Required to implement cross-domain robust
- * mutexes or close notification on communication channels.
- *
- * Each mapped page only supports one notification; multiple calls referring to
- * the same page overwrite the previous notification. You must clear the
- * notification prior to the IOCTL_GNTALLOC_DEALLOC_GREF if you do not want it
- * to occur.
- */
-#define IOCTL_GNTDEV_SET_UNMAP_NOTIFY \
-_IOC(_IOC_NONE, 'G', 7, sizeof(struct ioctl_gntdev_unmap_notify))
-struct ioctl_gntdev_unmap_notify {
-	/* IN parameters */
-	/* Offset in the file descriptor for a byte within the page (same as
-	 * used in mmap). If using UNMAP_NOTIFY_CLEAR_BYTE, this is the byte to
-	 * be cleared. Otherwise, it can be any byte in the page whose
-	 * notification we are adjusting.
-	 */
-	__u64 index;
-	/* Action(s) to take on unmap */
-	__u32 action;
-	/* Event channel to notify */
-	__u32 event_channel_port;
-};
-
-/* Clear (set to zero) the byte specified by index */
-#define UNMAP_NOTIFY_CLEAR_BYTE 0x1
-/* Send an interrupt on the indicated event channel */
-#define UNMAP_NOTIFY_SEND_EVENT 0x2
-
-#endif /* __LINUX_PUBLIC_GNTDEV_H__ */
diff --git a/openflow/usr/include/xen/privcmd.h b/openflow/usr/include/xen/privcmd.h
deleted file mode 100644
index 7e0a6bc..0000000
--- a/openflow/usr/include/xen/privcmd.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/******************************************************************************
- * privcmd.h
- *
- * Interface to /proc/xen/privcmd.
- *
- * Copyright (c) 2003-2005, K A Fraser
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation; or, when distributed
- * separately from the Linux kernel or incorporated into other
- * software packages, subject to the following license:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this source file (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#ifndef __LINUX_PUBLIC_PRIVCMD_H__
-#define __LINUX_PUBLIC_PRIVCMD_H__
-
-#include <linux/types.h>
-
-#include <xen/interface/xen.h>
-
-struct privcmd_hypercall {
-	__u64 op;
-	__u64 arg[5];
-};
-
-struct privcmd_mmap_entry {
-	__u64 va;
-	/*
-	 * This should be a GFN. It's not possible to change the name because
-	 * it's exposed to the user-space.
-	 */
-	__u64 mfn;
-	__u64 npages;
-};
-
-struct privcmd_mmap {
-	int num;
-	domid_t dom; /* target domain */
-	struct privcmd_mmap_entry *entry;
-};
-
-struct privcmd_mmapbatch {
-	int num;     /* number of pages to populate */
-	domid_t dom; /* target domain */
-	__u64 addr;  /* virtual address */
-	xen_pfn_t *arr; /* array of mfns - or'd with
-				  PRIVCMD_MMAPBATCH_*_ERROR on err */
-};
-
-#define PRIVCMD_MMAPBATCH_MFN_ERROR     0xf0000000U
-#define PRIVCMD_MMAPBATCH_PAGED_ERROR   0x80000000U
-
-struct privcmd_mmapbatch_v2 {
-	unsigned int num; /* number of pages to populate */
-	domid_t dom;      /* target domain */
-	__u64 addr;       /* virtual address */
-	const xen_pfn_t *arr; /* array of mfns */
-	int *err;  /* array of error codes */
-};
-
-/*
- * @cmd: IOCTL_PRIVCMD_HYPERCALL
- * @arg: &privcmd_hypercall_t
- * Return: Value returned from execution of the specified hypercall.
- *
- * @cmd: IOCTL_PRIVCMD_MMAPBATCH_V2
- * @arg: &struct privcmd_mmapbatch_v2
- * Return: 0 on success (i.e., arg->err contains valid error codes for
- * each frame).  On an error other than a failed frame remap, -1 is
- * returned and errno is set to EINVAL, EFAULT etc.  As an exception,
- * if the operation was otherwise successful but any frame failed with
- * -ENOENT, then -1 is returned and errno is set to ENOENT.
- */
-#define IOCTL_PRIVCMD_HYPERCALL					\
-	_IOC(_IOC_NONE, 'P', 0, sizeof(struct privcmd_hypercall))
-#define IOCTL_PRIVCMD_MMAP					\
-	_IOC(_IOC_NONE, 'P', 2, sizeof(struct privcmd_mmap))
-#define IOCTL_PRIVCMD_MMAPBATCH					\
-	_IOC(_IOC_NONE, 'P', 3, sizeof(struct privcmd_mmapbatch))
-#define IOCTL_PRIVCMD_MMAPBATCH_V2				\
-	_IOC(_IOC_NONE, 'P', 4, sizeof(struct privcmd_mmapbatch_v2))
-
-#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
diff --git a/openflow/usr/include/xlocale.h b/openflow/usr/include/xlocale.h
deleted file mode 100644
index e4408e2..0000000
--- a/openflow/usr/include/xlocale.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Definition of locale datatype.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _XLOCALE_H
-#define _XLOCALE_H	1
-
-/* Structure for reentrant locale using functions.  This is an
-   (almost) opaque type for the user level programs.  The file and
-   this data structure is not standardized.  Don't rely on it.  It can
-   go away without warning.  */
-typedef struct __locale_struct
-{
-  /* Note: LC_ALL is not a valid index into this array.  */
-  struct __locale_data *__locales[13]; /* 13 = __LC_LAST. */
-
-  /* To increase the speed of this solution we add some special members.  */
-  const unsigned short int *__ctype_b;
-  const int *__ctype_tolower;
-  const int *__ctype_toupper;
-
-  /* Note: LC_ALL is not a valid index into this array.  */
-  const char *__names[13];
-} *__locale_t;
-
-/* POSIX 2008 makes locale_t official.  */
-typedef __locale_t locale_t;
-
-#endif /* xlocale.h */
diff --git a/openflow/usr/include/zconf.h b/openflow/usr/include/zconf.h
deleted file mode 100644
index 996fff2..0000000
--- a/openflow/usr/include/zconf.h
+++ /dev/null
@@ -1,511 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#if 1    /* was set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#if 1    /* was set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/openflow/usr/include/zlib.h b/openflow/usr/include/zlib.h
deleted file mode 100644
index 3e0c767..0000000
--- a/openflow/usr/include/zlib.h
+++ /dev/null
@@ -1,1768 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
-
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
-#define ZLIB_VER_SUBREVISION 0
-
-/*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
-
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-    The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-    The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-    This library can optionally read and write gzip streams in memory as well.
-
-    The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    z_const Bytef *next_in;     /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total number of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total number of bytes output so far */
-
-    z_const char *msg;  /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
-
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
-   opaque value.
-
-     zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-     On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this if
-   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
-   returned by zalloc for objects of exactly 65536 bytes *must* have their
-   offset normalized to zero.  The default allocation function provided by this
-   library ensures this (see zutil.c).  To reduce memory requirements and avoid
-   any allocation of 64K objects, at the expense of compression ratio, compile
-   the library with -DMAX_WBITS=14 (see zconf.h).
-
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-#define Z_TREES         6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-   allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows.  deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
-
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
-  not return Z_STREAM_END, and it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression.  The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows.  inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
-
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
-  operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to
-  inform inflate that a faster approach can be used for the single inflate()
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
-  on the return value of inflate() as noted below, when inflate() returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-  memory for a sliding window when Z_FINISH is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
-
-     The method parameter is the compression method.  It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm.  Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
-
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
-   function must be called immediately after deflateInit, deflateInit2 or
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
-   function must be called either before any call of deflate, or immediately
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
-
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are Z_NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
-
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-     If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter.  The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
-   time to set the dictionary.  If the provided dictionary is smaller than the
-   window and there is already data in the window, then the provided dictionary
-   will amend what's there.  The application must insure that the dictionary
-   that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
-/*
-     Returns the sliding dictionary being maintained by inflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If inflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-     Skips invalid compressed data until a possible full flush point (see above
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurrences of this
-   pattern are full flush points.
-
-     inflateSync returns Z_OK if a possible full flush point has been found,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
-
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
-   the windowBits parameter is invalid.
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
-
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above or -1 << 16 if the provided
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
-
-     The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not Z_NULL and the respective field is not
-   present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-     If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is potentially more efficient than
-   inflate() for file i/o applications, in that it avoids copying between the
-   output and the sliding window by simply making the window itself the output
-   buffer.  inflate() can be faster on modern CPUs when used with large
-   buffers.  inflateBack() trusts the application to not change the output
-   buffer passed by the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be Z_NULL only if in() returned an error.  If
-   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
-   cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-#ifndef Z_SOLO
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer.  The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
-*/
-
-                        /* gzip file access functions */
-
-/*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
-
-/*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
-   request transparent writing or appending with no compression and not using
-   the gzip format.
-
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
-
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
-
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
-/*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
-/*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
-
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file is not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
-   concatenated in the input file, and will all be decompressed by gzread().
-   If something other than a gzip stream is encountered after a gzip stream,
-   that remaining trailing garbage is ignored (and no error is returned).
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
-*/
-
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
-*/
-
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-     Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
-*/
-
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
-/*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
-   returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
-/*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
-*/
-
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
-/*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
-
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-     gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
-
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-   last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-#endif /* !Z_SOLO */
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster.
-
-   Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-/*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-/*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
-
-#ifndef Z_SOLO
-
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
-struct gzFile_s {
-    unsigned have;
-    unsigned char *next;
-    z_off64_t pos;
-};
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#else
-#  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#endif
-
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-#endif
-
-#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-#  ifdef Z_PREFIX_SET
-#    define z_gzopen z_gzopen64
-#    define z_gzseek z_gzseek64
-#    define z_gztell z_gztell64
-#    define z_gzoffset z_gzoffset64
-#    define z_adler32_combine z_adler32_combine64
-#    define z_crc32_combine z_crc32_combine64
-#  else
-#    define gzopen gzopen64
-#    define gzseek gzseek64
-#    define gztell gztell64
-#    define gzoffset gzoffset64
-#    define adler32_combine adler32_combine64
-#    define crc32_combine crc32_combine64
-#  endif
-#  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#  endif
-#else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
-
-#else /* Z_SOLO */
-
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-
-#endif /* !Z_SOLO */
-
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
-/* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
-#  endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */